From 82942d9cce6b4c3b93d147bcac8ca4a599017fec Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Dec 1998 22:00:30 +0000
Subject: [PATCH 0001/8469] Initial checkin of distutils source files.

---
 __init__.py |   0
 version.py  | 301 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)
 create mode 100644 __init__.py
 create mode 100644 version.py

diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/version.py b/version.py
new file mode 100644
index 0000000000..918a1ded43
--- /dev/null
+++ b/version.py
@@ -0,0 +1,301 @@
+#
+# distutils/version.py
+#
+# Implements multiple version numbering conventions for the
+# Python Module Distribution Utilities.
+#
+# written by Greg Ward, 1998/12/17
+#
+# $Id$
+#
+
+"""Provides classes to represent module version numbers (one class for
+each style of version numbering).  There are currently two such classes
+implemented: StrictVersion and LooseVersion.
+
+Every version number class implements the following interface:
+  * the 'parse' method takes a string and parses it to some internal
+    representation; if the string is an invalid version number,
+    'parse' raises a ValueError exception
+  * the class constructor takes an optional string argument which,
+    if supplied, is passed to 'parse'
+  * __str__ reconstructs the string that was passed to 'parse' (or
+    an equivalent string -- ie. one that will generate an equivalent
+    version number instance)
+  * __repr__ generates Python code to recreate the version number instance
+  * __cmp__ compares the current instance with either another instance
+    of the same class or a string (which will be parsed to an instance
+    of the same class, thus must follow the same rules)
+"""
+
+import string, re
+from types import StringType
+
+class Version:
+    """Abstract base class for version numbering classes.  Just provides
+    constructor (__init__) and reproducer (__repr__), because those
+    seem to be the same for all version numbering classes.
+    """
+
+    def __init__ (self, vstring=None):
+        if vstring:
+            self.parse (vstring)
+
+    def __repr__ (self):
+        return "%s ('%s')" % (self.__class__.__name__, str (self))
+
+
+# Interface for version-number classes -- must be implemented
+# by the following classes (the concrete ones -- Version should
+# be treated as an abstract class).
+#    __init__ (string) - create and take same action as 'parse'
+#                        (string parameter is optional)
+#    parse (string)    - convert a string representation to whatever
+#                        internal representation is appropriate for
+#                        this style of version numbering
+#    __str__ (self)    - convert back to a string; should be very similar
+#                        (if not identical to) the string supplied to parse
+#    __repr__ (self)   - generate Python code to recreate
+#                        the instance
+#    __cmp__ (self, other) - compare two version numbers ('other' may
+#                        be an unparsed version string, or another
+#                        instance of your version class)
+
+
+class StrictVersion (Version):
+
+    """Version numbering for anal retentives and software idealists.
+    Implements the standard interface for version number classes as
+    described above.  A version number consists of two or three
+    dot-separated numeric components, with an optional "pre-release" tag
+    on the end.  The pre-release tag consists of the letter 'a' or 'b'
+    followed by a number.  If the numeric components of two version
+    numbers are equal, then one with a pre-release tag will always
+    be deemed earlier (lesser) than one without.
+
+    The following are valid version numbers (shown in the order that
+    would be obtained by sorting according to the supplied cmp function):
+
+        0.4       0.4.0  (these two are equivalent)
+        0.4.1
+        0.5a1
+        0.5b3
+        0.5
+        0.9.6
+        1.0
+        1.0.4a3
+        1.0.4b1
+        1.0.4
+
+    The following are examples of invalid version numbers:
+
+        1
+        2.7.2.2
+        1.3.a4
+        1.3pl1
+        1.3c4
+
+    The rationale for this version numbering system will be explained
+    in the distutils documentation.
+    """
+    
+    version_re = re.compile (r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
+                             re.VERBOSE)
+
+
+    def parse (self, vstring):
+        match = self.version_re.match (vstring)
+        if not match:
+            raise ValueError, "invalid version number '%s'" % vstring
+
+        (major, minor, patch, prerelease, prerelease_num) = \
+            match.group (1, 2, 4, 5, 6)
+
+        if patch:
+            self.version = tuple (map (string.atoi, [major, minor, patch]))
+        else:
+            self.version = tuple (map (string.atoi, [major, minor]) + [0])
+
+        if prerelease:
+            self.prerelease = (prerelease[0], string.atoi (prerelease_num))
+        else:
+            self.prerelease = None
+
+
+    def __str__ (self):
+        
+        if self.version[2] == 0:
+            vstring = string.join (map (str, self.version[0:2]), '.')
+        else:
+            vstring = string.join (map (str, self.version), '.')
+
+        if self.prerelease:
+            vstring = vstring + self.prerelease[0] + str (self.prerelease[1])
+
+        return vstring
+    
+
+    def __cmp__ (self, other):
+        if isinstance (other, StringType):
+            other = StrictVersion (other)
+
+        compare = cmp (self.version, other.version)
+        if (compare == 0):              # have to compare prerelease
+
+            # case 1: neither has prerelease; they're equal
+            # case 2: self has prerelease, other doesn't; other is greater
+            # case 3: self doesn't have prerelease, other does: self is greater
+            # case 4: both have prerelease: must compare them!
+
+            if (not self.prerelease and not other.prerelease):
+                return 0
+            elif (self.prerelease and not other.prerelease):
+                return -1
+            elif (not self.prerelease and other.prerelease):
+                return 1
+            elif (self.prerelease and other.prerelease):
+                return cmp (self.prerelease, other.prerelease)
+
+        else:                           # numeric versions don't match --
+            return compare              # prerelease stuff doesn't matter
+
+
+# end class StrictVersion
+
+
+# The rules according to Greg Stein:
+# 1) a version number has 1 or more numbers separate by a period or by
+#    sequences of letters. If only periods, then these are compared
+#    left-to-right to determine an ordering.
+# 2) sequences of letters are part of the tuple for comparison and are
+#    compared lexicographically
+# 3) recognize the numeric components may have leading zeroes
+# 
+# The LooseVersion class below implements these rules: a version number
+# string is split up into a tuple of integer and string components, and
+# comparison is a simple tuple comparison.  This means that version
+# numbers behave in a predictable and obvious way, but a way that might
+# not necessarily be how people *want* version numbers to behave.  There
+# wouldn't be a problem if people could stick to purely numeric version
+# numbers: just split on period and compare the numbers as tuples.
+# However, people insist on putting letters into their version numbers;
+# the most common purpose seems to be:
+#   - indicating a "pre-release" version
+#     ('alpha', 'beta', 'a', 'b', 'pre', 'p')
+#   - indicating a post-release patch ('p', 'pl', 'patch')
+# but of course this can't cover all version number schemes, and there's
+# no way to know what a programmer means without asking him.
+# 
+# The problem is what to do with letters (and other non-numeric
+# characters) in a version number.  The current implementation does the
+# obvious and predictable thing: keep them as strings and compare
+# lexically within a tuple comparison.  This has the desired effect if
+# an appended letter sequence implies something "post-release":
+# eg. "0.99" < "0.99pl14" < "1.0", and "5.001" < "5.001m" < "5.002".
+#
+# However, if letters in a version number imply a pre-release version,
+# the "obvious" thing isn't correct.  Eg. you would expect that
+# "1.5.1" < "1.5.2a2" < "1.5.2", but under the tuple/lexical comparison
+# implemented here, this just isn't so.
+#
+# Two possible solutions come to mind.  The first is to tie the
+# comparison algorithm to a particular set of semantic rules, as has
+# been done in the StrictVersion class above.  This works great as long
+# as everyone can go along with bondage and discipline.  Hopefully a
+# (large) subset of Python module programmers will agree that the
+# particular flavour of bondage and discipline provided by StrictVersion
+# provides enough benefit to be worth using, and will submit their
+# version numbering scheme to its domination.  The free-thinking
+# anarchists in the lot will never give in, though, and something needs
+# to be done to accomodate them.
+# 
+# Perhaps a "moderately strict" version class could be implemented that
+# lets almost anything slide (syntactically), and makes some heuristic
+# assumptions about non-digits in version number strings.  This could
+# sink into special-case-hell, though; if I was as talented and
+# idiosyncratic as Larry Wall, I'd go ahead and implement a class that
+# somehow knows that "1.2.1" < "1.2.2a2" < "1.2.2" < "1.2.2pl3", and is
+# just as happy dealing with things like "2g6" and "1.13++".  I don't
+# think I'm smart enough to do it right though.
+# 
+# In any case, I've coded the test suite for this module (see
+# ../test/test_version.py) specifically to fail on things like comparing
+# "1.2a2" and "1.2".  That's not because the *code* is doing anything
+# wrong, it's because the simple, obvious design doesn't match my
+# complicated, hairy expectations for real-world version numbers.  It
+# would be a snap to fix the test suite to say, "Yep, LooseVersion does
+# the Right Thing" (ie. the code matches the conception).  But I'd rather
+# have a conception that matches common notions about version numbers.
+
+class LooseVersion (Version):
+
+    """Version numbering for anarchists and software realists.
+    Implements the standard interface for version number classes as
+    described above.  A version number consists of a series of numbers,
+    separated by either periods or strings of letters.  When comparing
+    version numbers, the numeric components will be compared
+    numerically, and the alphabetic components lexically.  The following
+    are all valid version numbers, in no particular order:
+
+        1.5.1
+        1.5.2b2
+        161
+        3.10a
+        8.02
+        3.4j
+        1996.07.12
+        3.2.pl0
+        3.1.1.6
+        2g6
+        11g
+        0.960923
+        2.2beta29
+        1.13++
+        5.5.kw
+        2.0b1pl0
+
+    In fact, there is no such thing as an invalid version number under
+    this scheme; the rules for comparison are simple and predictable,
+    but may not always give the results you want (for some definition
+    of "want").
+    """
+
+    component_re = re.compile(r'(\d+ | [a-z]+ | \.)', re.VERBOSE)
+
+    def __init__ (self, vstring=None):
+        if vstring:
+            self.parse (vstring)
+
+
+    def parse (self, vstring):
+        # I've given up on thinking I can reconstruct the version string
+        # from the parsed tuple -- so I just store the string here for
+        # use by __str__
+        self.vstring = vstring
+        components = filter (lambda x: x and x != '.',
+                             self.component_re.split (vstring))
+        for i in range (len (components)):
+            try:
+                components[i] = int (components[i])
+            except ValueError:
+                pass
+
+        self.version = components
+
+
+    def __str__ (self):
+        return self.vstring
+
+
+    def __repr__ (self):
+        return "LooseVersion ('%s')" % str (self)
+
+
+    def __cmp__ (self, other):
+        if isinstance (other, StringType):
+            other = LooseVersion (other)
+
+        return cmp (self.version, other.version)
+        
+
+# end class LooseVersion

From 5e72268255a51c78cbeb6ef82a66af3c7b90cef8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Dec 1998 23:46:33 +0000
Subject: [PATCH 0002/8469] Fred's sysconfig module.

---
 sysconfig.py | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 sysconfig.py

diff --git a/sysconfig.py b/sysconfig.py
new file mode 100644
index 0000000000..b5fe1874e1
--- /dev/null
+++ b/sysconfig.py
@@ -0,0 +1,106 @@
+"""Prototype sysconfig module that loads information when run as a script,
+but only defines constants when imported.
+
+This should be run as a script as one of the last steps of the Python
+installation process.
+
+Written by:   Fred L. Drake, Jr.
+Email:        <fdrake@acm.org>
+Initial date: 17-Dec-1998
+"""
+
+__version__ = "$Revision$"
+
+
+def _init_posix():
+    import os
+    import re
+    import sys
+
+    g = globals()
+
+    version = sys.version[:3]
+    config_dir = os.path.join(
+        sys.exec_prefix, "lib", "python" + version, "config")
+
+    # load the installed config.h:
+    define_rx = re.compile("#define ([A-Z][A-Z0-9_]+) (.*)\n")
+    undef_rx = re.compile("/[*] #undef ([A-Z][A-Z0-9_]+) [*]/\n")
+    fp = open(os.path.join(config_dir, "config.h"))
+
+    while 1:
+        line = fp.readline()
+        if not line:
+            break
+        m = define_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            if v == "1":
+                g[n] = 1
+            else:
+                g[n] = v
+        else:
+            m = undef_rx.match(line)
+            if m:
+                g[m.group(1)] = 0
+
+    # load the installed Makefile.pre.in:
+    variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)\n")
+    done = {}
+    notdone = {}
+    fp = open(os.path.join(config_dir, "Makefile"))
+
+    while 1:
+        line = fp.readline()
+        if not line:
+            break
+        m = variable_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            if "$" in v:
+                notdone[n] = v
+            else:
+                done[n] = v
+
+    # do variable interpolation here
+    findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)")
+    findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
+    while notdone:
+        for name in notdone.keys():
+            value = notdone[name]
+            m = findvar1_rx.search(value)
+            if not m:
+                m = findvar2_rx.search(value)
+            if m:
+                n = m.group(1)
+                if done.has_key(n):
+                    after = value[m.end():]
+                    value = value[:m.start()] + done[n] + after
+                    if "$" in after:
+                        notdone[name] = value
+                    else:
+                        done[name] = value
+                        del notdone[name]
+                elif notdone.has_key(n):
+                    # get it on a subsequent round
+                    pass
+                else:
+                    done[n] = ""
+                    after = value[m.end():]
+                    value = value[:m.start()] + after
+                    if "$" in after:
+                        notdone[name] = value
+                    else:
+                        done[name] = value
+                        del notdone[name]
+            else:
+                del notdone[name]
+
+    # save the results in the global dictionary
+    g.update(done)
+
+
+import os
+exec "_init_%s()" % os.name
+del os
+del _init_posix

From 53be0347c57aecd9b1144d71edeb727f86d6ffa0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 22 Dec 1998 12:42:04 +0000
Subject: [PATCH 0003/8469] Applied Fred's patch to fix the bugs that John
 Skaller noticed.

---
 sysconfig.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index b5fe1874e1..3eee9b3507 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -15,6 +15,7 @@
 def _init_posix():
     import os
     import re
+    import string
     import sys
 
     g = globals()
@@ -35,10 +36,9 @@ def _init_posix():
         m = define_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            if v == "1":
-                g[n] = 1
-            else:
-                g[n] = v
+            try: v = string.atoi(v)
+            except ValueError: pass
+            g[n] = v
         else:
             m = undef_rx.match(line)
             if m:
@@ -57,9 +57,12 @@ def _init_posix():
         m = variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
+            v = string.strip(v)
             if "$" in v:
                 notdone[n] = v
             else:
+                try: v = string.atoi(v)
+                except ValueError: pass
                 done[n] = v
 
     # do variable interpolation here
@@ -79,7 +82,9 @@ def _init_posix():
                     if "$" in after:
                         notdone[name] = value
                     else:
-                        done[name] = value
+                        try: value = string.atoi(value)
+                        except ValueError: pass
+                        done[name] = string.strip(value)
                         del notdone[name]
                 elif notdone.has_key(n):
                     # get it on a subsequent round
@@ -91,9 +96,12 @@ def _init_posix():
                     if "$" in after:
                         notdone[name] = value
                     else:
-                        done[name] = value
+                        try: value = string.atoi(value)
+                        except ValueError: pass
+                        done[name] = string.strip(value)
                         del notdone[name]
             else:
+                # bogus variable reference; just drop it since we can't deal
                 del notdone[name]
 
     # save the results in the global dictionary

From bb0ab0bba658a8f0467ed870bcc687aab0d1d4ff Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 6 Jan 1999 14:46:06 +0000
Subject: [PATCH 0004/8469] Another patch from Fred: factored _init_posix into
 get_config_h_filename, get_makefile_filename, parse_config_h, and
 parse_makefile.

---
 sysconfig.py | 55 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3eee9b3507..1d8231abc7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -11,24 +11,26 @@
 
 __version__ = "$Revision$"
 
+import os
+import re
+import string
+import sys
 
-def _init_posix():
-    import os
-    import re
-    import string
-    import sys
 
-    g = globals()
+def get_config_h_filename():
+    return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
+                        "config", "config.h")
 
-    version = sys.version[:3]
-    config_dir = os.path.join(
-        sys.exec_prefix, "lib", "python" + version, "config")
+def get_makefile_filename():
+    return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
+                        "config", "Makefile")
 
-    # load the installed config.h:
+def parse_config_h(fp, g=None):
+    if g is None:
+        g = {}
     define_rx = re.compile("#define ([A-Z][A-Z0-9_]+) (.*)\n")
     undef_rx = re.compile("/[*] #undef ([A-Z][A-Z0-9_]+) [*]/\n")
-    fp = open(os.path.join(config_dir, "config.h"))
-
+    #
     while 1:
         line = fp.readline()
         if not line:
@@ -43,13 +45,15 @@ def _init_posix():
             m = undef_rx.match(line)
             if m:
                 g[m.group(1)] = 0
+    return g
 
-    # load the installed Makefile.pre.in:
+def parse_makefile(fp, g=None):
+    if g is None:
+        g = {}
     variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)\n")
     done = {}
     notdone = {}
-    fp = open(os.path.join(config_dir, "Makefile"))
-
+    #
     while 1:
         line = fp.readline()
         if not line:
@@ -106,9 +110,24 @@ def _init_posix():
 
     # save the results in the global dictionary
     g.update(done)
+    return g
 
 
-import os
-exec "_init_%s()" % os.name
-del os
+def _init_posix():
+    g = globals()
+    # load the installed config.h:
+    parse_config_h(open(get_config_h_filename()), g)
+    # load the installed Makefile.pre.in:
+    parse_makefile(open(get_makefile_filename()), g)
+
+
+
+try:
+    exec "_init_" + os.name
+except NameError:
+    # not needed for this platform
+    pass
+else:
+    exec "_init_%s()" % os.name
+
 del _init_posix

From 4698daf69a1f9760e8870609c995bb18c14c7a62 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Wed, 6 Jan 1999 16:28:34 +0000
Subject: [PATCH 0005/8469] Update and add docstrings.

---
 sysconfig.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 1d8231abc7..04551a77aa 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -1,8 +1,5 @@
-"""Prototype sysconfig module that loads information when run as a script,
-but only defines constants when imported.
-
-This should be run as a script as one of the last steps of the Python
-installation process.
+"""Provide access to Python's configuration information.  The specific names
+defined in the module depend heavily on the platform and configuration.
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
@@ -18,14 +15,20 @@
 
 
 def get_config_h_filename():
+    """Return full pathname of installed config.h file."""
     return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
                         "config", "config.h")
 
 def get_makefile_filename():
+    """Return full pathname of installed Makefile from the Python build."""
     return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
                         "config", "Makefile")
 
 def parse_config_h(fp, g=None):
+    """Parse a config.h-style file.  A dictionary containing name/value
+    pairs is returned.  If an optional dictionary is passed in as the second
+    argument, it is used instead of a new dictionary.
+    """
     if g is None:
         g = {}
     define_rx = re.compile("#define ([A-Z][A-Z0-9_]+) (.*)\n")
@@ -48,6 +51,10 @@ def parse_config_h(fp, g=None):
     return g
 
 def parse_makefile(fp, g=None):
+    """Parse a Makefile-style file.  A dictionary containing name/value
+    pairs is returned.  If an optional dictionary is passed in as the second
+    argument, it is used instead of a new dictionary.
+    """
     if g is None:
         g = {}
     variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)\n")
@@ -114,6 +121,7 @@ def parse_makefile(fp, g=None):
 
 
 def _init_posix():
+    """Initialize the module as appropriate for POSIX systems."""
     g = globals()
     # load the installed config.h:
     parse_config_h(open(get_config_h_filename()), g)

From 18d23e41a229ed4ec07f17ed7499bd1cdbfab606 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 11 Jan 1999 15:34:55 +0000
Subject: [PATCH 0006/8469] get_config_h_filename():  Fix to work with current
 Python 	installations; it was picking up a stale config.h from an 
 overwritten installation.

---
 sysconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 04551a77aa..e71ae4668a 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -16,8 +16,8 @@
 
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
-                        "config", "config.h")
+    return os.path.join(sys.exec_prefix, "include", "python" + sys.version[:3],
+                        "config.h")
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""

From 7c5088ade77bf14bf5ca03309fd684093733c1e9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 13 Jan 1999 16:12:04 +0000
Subject: [PATCH 0007/8469] Added: mems.lib.text_file: provides TextFile class
 for parsing text files with (optional) comment stripping, blank line
 skipping, whitespace removal, and line joining with trailing backslashes.

---
 text_file.py | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 text_file.py

diff --git a/text_file.py b/text_file.py
new file mode 100644
index 0000000000..9fff941ec9
--- /dev/null
+++ b/text_file.py
@@ -0,0 +1,206 @@
+"""text_file
+
+provides the TextFile class, which gives an interface to text files
+that (optionally) takes care of stripping comments, ignoring blank
+lines, and joining lines with backslashes."""
+
+# created 1999/01/12, Greg Ward
+
+__revision__ = "$Id$"
+
+from types import *
+import os, string, re
+
+
+class TextFile:
+    filename = None
+    file = None
+    current_line = None
+
+    default_options = { 'strip_comments': 1,
+                        'comment_re':     re.compile (r'\s*#.*'),
+                        'skip_blanks':    1,
+                        'join_lines':     0,
+                        'lstrip_ws':      0,
+                        'rstrip_ws':      1,
+                      }
+
+    def __init__ (self, filename=None, **options):
+
+        # set values for all options -- either from client option hash
+        # or fallback to default_options
+        for opt in self.default_options.keys():
+            if options.has_key (opt):
+                if opt == 'comment_re' and type (options[opt]) is StringType:
+                    self.comment_re = re.compile (options[opt])
+                else:
+                    setattr (self, opt, options[opt])
+
+            else:
+                setattr (self, opt, self.default_options[opt])
+
+        # sanity check client option hash
+        for opt in options.keys():
+            if not self.default_options.has_key (opt):
+                raise KeyError, "invalid TextFile option '%s'" % opt
+
+        self.filename = filename
+        if self.filename:
+            self.open ()
+        
+
+    def open (self, filename=None):
+        if not self.filename:
+            if not filename:
+                raise RuntimeError, "must provide a filename somehow"
+
+            self.filename = filename
+
+        self.file = open (self.filename, 'r')
+        self.current_line = 0
+
+
+    def close (self):
+        self.file.close ()
+        self.file = None
+        self.filename = None
+        self.current_line = None
+
+
+    def readline (self):
+
+        buildup_line = ''
+
+        while 1:
+            # read the line, optionally strip comments
+            line = self.file.readline()
+            if self.strip_comments and line:
+                line = self.comment_re.sub ('', line)
+
+            # did previous line end with a backslash? then accumulate
+            if self.join_lines and buildup_line:
+                # oops: end of file
+                if not line:
+                    self.warn ("continuation line immediately precedes "
+                               "end-of-file")
+                    return buildup_line
+
+                line = buildup_line + line
+
+                # careful: pay attention to line number when incrementing it
+                if type (self.current_line) is ListType:
+                    self.current_line[1] = self.current_line[1] + 1
+                else:
+                    self.current_line = [self.current_line, self.current_line+1]
+            # just an ordinary line, read it as usual
+            else:
+                if not line:
+                    return None
+
+                # still have to be careful about incrementing the line number!
+                if type (self.current_line) is ListType:
+                    self.current_line = self.current_line[1] + 1
+                else:
+                    self.current_line = self.current_line + 1
+                
+
+            # strip whitespace however the client wants (leading and
+            # trailing, or one or the other, or neither)
+            if self.lstrip_ws and self.rstrip_ws:
+                line = string.strip (line)
+            else:
+                if self.lstrip_ws:
+                    line = string.lstrip (line)
+                if self.rstrip_ws:
+                    line = string.rstrip (line)
+
+            # blank line (whether we rstrip'ed or not)? skip to next line
+            # if appropriate
+            if line == '' or line == '\n' and self.skip_blanks:
+                continue
+
+            if self.join_lines:
+                if line[-1] == '\\':
+                    buildup_line = line[:-1]
+                    continue
+
+                if line[-2:] == '\\\n':
+                    buildup_line = line[0:-2] + '\n'
+                    continue
+
+            # well, I guess there's some actual content there: return it
+            return line
+
+    # end readline
+
+
+    def readlines (self):
+        lines = []
+        while 1:
+            line = self.readline()
+            if line is None:
+                return lines
+            lines.append (line)
+
+
+if __name__ == "__main__":
+    test_data = """# test file
+
+line 3 \\
+continues on next line
+"""
+
+    # result 1: no fancy options
+    result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
+
+    # result 2: just strip comments
+    result2 = ["\n", "\n", "line 3 \\\n", "continues on next line\n"]
+
+    # result 3: just strip blank lines
+    result3 = ["# test file\n", "line 3 \\\n", "continues on next line\n"]
+
+    # result 4: default, strip comments, blank lines, and trailing whitespace
+    result4 = ["line 3 \\", "continues on next line"]
+
+    # result 5: full processing, strip comments and blanks, plus join lines
+    result5 = ["line 3 continues on next line"]
+
+    def test_input (count, description, file, expected_result):
+        result = file.readlines ()
+        # result = string.join (result, '')
+        if result == expected_result:
+            print "ok %d (%s)" % (count, description)
+        else:
+            print "not ok %d (%s):" % (count, description)
+            print "** expected:"
+            print expected_result
+            print "** received:"
+            print result
+            
+
+    filename = "test.txt"
+    out_file = open (filename, "w")
+    out_file.write (test_data)
+    out_file.close ()
+
+    in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
+                   lstrip_ws=0, rstrip_ws=0)
+    test_input (1, "no processing", in_file, result1)
+
+    in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
+                   lstrip_ws=0, rstrip_ws=0)
+    test_input (2, "strip comments", in_file, result2)
+
+    in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
+                   lstrip_ws=0, rstrip_ws=0)
+    test_input (3, "strip blanks", in_file, result3)
+
+    in_file = TextFile (filename)
+    test_input (4, "default processing", in_file, result4)
+
+    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                        join_lines=1, rstrip_ws=1)
+    test_input (5, "full processing", in_file, result5)
+
+    os.remove (filename)
+    

From e57683381739ada3b56e7fc02e52b4c81f7defea Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 18 Jan 1999 17:08:16 +0000
Subject: [PATCH 0008/8469] Added 'warn' method.

---
 text_file.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/text_file.py b/text_file.py
index 9fff941ec9..9e1a73b798 100644
--- a/text_file.py
+++ b/text_file.py
@@ -9,7 +9,7 @@
 __revision__ = "$Id$"
 
 from types import *
-import os, string, re
+import sys, os, string, re
 
 
 class TextFile:
@@ -67,6 +67,15 @@ def close (self):
         self.current_line = None
 
 
+    def warn (self, msg):
+        sys.stderr.write (self.filename + ", ")
+        if type (self.current_line) is ListType:
+            sys.stderr.write ("lines %d-%d: " % tuple (self.current_line))
+        else:
+            sys.stderr.write ("line %d: " % self.current_line)
+        sys.stderr.write (msg + "\n")
+
+
     def readline (self):
 
         buildup_line = ''

From ecab4f612281cac63885b065866195177947e5e3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 8 Mar 1999 21:46:11 +0000
Subject: [PATCH 0009/8469] Added collapse_ws option.

---
 text_file.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/text_file.py b/text_file.py
index 9e1a73b798..eab498d76c 100644
--- a/text_file.py
+++ b/text_file.py
@@ -23,6 +23,7 @@ class TextFile:
                         'join_lines':     0,
                         'lstrip_ws':      0,
                         'rstrip_ws':      1,
+                        'collapse_ws':    0,
                       }
 
     def __init__ (self, filename=None, **options):
@@ -137,6 +138,10 @@ def readline (self):
                     buildup_line = line[0:-2] + '\n'
                     continue
 
+            # collapse internal whitespace (*after* joining lines!)
+            if self.collapse_ws:
+                line = re.sub (r'(\S)\s+(\S)', r'\1 \2', line)            
+
             # well, I guess there's some actual content there: return it
             return line
 

From 681a078a9561a64f87802bbe5d7d1e3f7abb4208 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 22 Mar 1999 14:52:19 +0000
Subject: [PATCH 0010/8469] First checkin of real Distutils code.

---
 core.py         | 597 ++++++++++++++++++++++++++++++++++++++++++++++++
 errors.py       |  63 +++++
 fancy_getopt.py | 115 ++++++++++
 options.py      | 111 +++++++++
 util.py         | 245 ++++++++++++++++++++
 5 files changed, 1131 insertions(+)
 create mode 100644 core.py
 create mode 100644 errors.py
 create mode 100644 fancy_getopt.py
 create mode 100644 options.py
 create mode 100644 util.py

diff --git a/core.py b/core.py
new file mode 100644
index 0000000000..3a7443c78e
--- /dev/null
+++ b/core.py
@@ -0,0 +1,597 @@
+"""distutils.core
+
+The only module that needs to be imported to use the Distutils; provides
+the 'setup' function (which must be called); the 'Distribution' class
+(which may be subclassed if additional functionality is desired), and
+the 'Command' class (which is used both internally by Distutils, and
+may be subclassed by clients for still more flexibility)."""
+
+# created 1999/03/01, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys
+import string, re
+from distutils.errors import *
+from distutils.fancy_getopt import fancy_getopt
+
+# This is not *quite* the same as a Python NAME; I don't allow leading
+# underscores.  The fact that they're very similar is no coincidence...
+command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
+
+# Defining this as a global is probably inadequate -- what about
+# listing the available options (or even commands, which can vary
+# quite late as well)
+usage = '%s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]' % sys.argv[0]
+
+
+
+def setup (**attrs):
+    """The gateway to the Distutils: do everything your setup script
+       needs to do, in a highly flexible and user-driven way.  Briefly:
+       create a Distribution instance; parse the command-line, creating
+       and customizing instances of the command class for each command
+       found on the command-line; run each of those commands.
+
+       The Distribution instance might be an instance of a class
+       supplied via the 'distclass' keyword argument to 'setup'; if no
+       such class is supplied, then the 'Distribution' class (also in
+       this module) is instantiated.  All other arguments to 'setup'
+       (except for 'cmdclass') are used to set attributes of the
+       Distribution instance.
+
+       The 'cmdclass' argument, if supplied, is a dictionary mapping
+       command names to command classes.  Each command encountered on the
+       command line will be turned into a command class, which is in turn
+       instantiated; any class found in 'cmdclass' is used in place of the
+       default, which is (for command 'foo_bar') class 'FooBar' in module
+       'distutils.command.foo_bar'.  The command object must provide an
+       'options' attribute which is a list of option specifiers for
+       'distutils.fancy_getopt'.  Any command-line options between the
+       current and the next command are used to set attributes in the
+       current command object.
+
+       When the entire command-line has been successfully parsed, calls the
+       'run' method on each command object in turn.  This method will be
+       driven entirely by the Distribution object (which each command
+       object has a reference to, thanks to its constructor), and the
+       command-specific options that became attributes of each command
+       object."""
+
+    # Determine the distribution class -- either caller-supplied or
+    # our Distribution (see below).
+    klass = attrs.get ('distclass')
+    if klass:
+        del attrs['distclass']
+    else:
+        klass = Distribution
+
+    # Create the Distribution instance, using the remaining arguments
+    # (ie. everything except distclass) to initialize it
+    dist = klass (attrs)
+
+    # Get it to parse the command line; any command-line errors are
+    # the end-users fault, so turn them into SystemExit to suppress
+    # tracebacks.
+    try:
+        dist.parse_command_line (sys.argv[1:])
+    except DistutilsArgError, msg:
+        raise SystemExit, msg
+
+    # And finally, run all the commands found on the command line.
+    dist.run_commands ()
+
+# setup ()
+
+
+class Distribution:
+    """The core of the Distutils.  Most of the work hiding behind
+       'setup' is really done within a Distribution instance, which
+       farms the work out to the Distutils commands specified on the
+       command line.
+
+       Clients will almost never instantiate Distribution directly,
+       unless the 'setup' function is totally inadequate to their needs.
+       However, it is conceivable that a client might wish to subclass
+       Distribution for some specialized purpose, and then pass the
+       subclass to 'setup' as the 'distclass' keyword argument.  If so,
+       it is necessary to respect the expectations that 'setup' has of
+       Distribution: it must have a constructor and methods
+       'parse_command_line()' and 'run_commands()' with signatures like
+       those described below."""
+
+
+    # 'global_options' describes the command-line options that may
+    # be supplied to the client (setup.py) prior to any actual
+    # commands.  Eg. "./setup.py -nv" or "./setup.py --verbose"
+    # both take advantage of these global options.
+    global_options = [('verbose', 'v', "run verbosely"),
+                      ('dry-run', 'n', "don't actually do anything"),
+                     ]
+
+
+    # -- Creation/initialization methods -------------------------------
+    
+    def __init__ (self, attrs=None):
+        """Construct a new Distribution instance: initialize all the
+           attributes of a Distribution, and then uses 'attrs' (a
+           dictionary mapping attribute names to values) to assign
+           some of those attributes their "real" values.  (Any attributes
+           not mentioned in 'attrs' will be assigned to some null
+           value: 0, None, an empty list or dictionary, etc.)  Most
+           importantly, initialize the 'command_obj' attribute
+           to the empty dictionary; this will be filled in with real
+           command objects by 'parse_command_line()'."""
+
+        # Default values for our command-line options
+        self.verbose = 0
+        self.dry_run = 0
+
+        # And for all other attributes (stuff that might be passed in
+        # from setup.py, rather than from the end-user)
+        self.name = None
+        self.version = None
+        self.author = None
+        self.licence = None
+        self.description = None
+
+        self.cmdclass = {}
+
+        # The rest of these are really the business of various commands,
+        # rather than of the Distribution itself.  However, they have
+        # to be here as a conduit to the relevant command class.        
+        self.py_modules = None
+        self.ext_modules = None
+        self.package = None
+
+        # Now we'll use the attrs dictionary to possibly override
+        # any or all of these distribution options
+        if attrs:
+            for k in attrs.keys():
+                setattr (self, k, attrs[k])
+
+        # And now initialize bookkeeping stuff that can't be supplied by
+        # the caller at all
+        self.command_obj = {}
+
+    # __init__ ()
+
+
+    def parse_command_line (self, args):
+        """Parse the client's command line: set any Distribution
+           attributes tied to command-line options, create all command
+           objects, and set their options from the command-line.  'args'
+           must be a list of command-line arguments, most likely
+           'sys.argv[1:]' (see the 'setup()' function).  This list is
+           first processed for "global options" -- options that set
+           attributes of the Distribution instance.  Then, it is
+           alternately scanned for Distutils command and options for
+           that command.  Each new command terminates the options for
+           the previous command.  The allowed options for a command are
+           determined by the 'options' attribute of the command object
+           -- thus, we instantiate (and cache) every command object
+           here, in order to access its 'options' attribute.  Any error
+           in that 'options' attribute raises DistutilsGetoptError; any
+           error on the command-line raises DistutilsArgError.  If no
+           Distutils commands were found on the command line, raises
+           DistutilsArgError."""
+
+        # We have to parse the command line a bit at a time -- global
+        # options, then the first command, then its options, and so on --
+        # because each command will be handled by a different class, and
+        # the options that are valid for a particular class aren't
+        # known until we instantiate the command class, which doesn't
+        # happen until we know what the command is.
+
+        self.commands = []
+        args = fancy_getopt (self.global_options, self, sys.argv[1:])
+
+        while args:
+            # Pull the current command from the head of the command line
+            command = args[0]
+            if not command_re.match (command):
+                raise SystemExit, "invalid command name '%s'" % command
+            self.commands.append (command)
+
+            # Have to instantiate the command class now, so we have a
+            # way to get its valid options and somewhere to put the
+            # results of parsing its share of the command-line
+            cmd_obj = self.create_command_obj (command)
+
+            # Require that the command class be derived from Command --
+            # that way, we can be sure that we at least have the 'run'
+            # and 'get_option' methods.
+            if not isinstance (cmd_obj, Command):
+                raise DistutilsClassError, \
+                      "command class %s must subclass Command" % \
+                      cmd_obj.__class__
+
+            # XXX this assumes that cmd_obj provides an 'options'
+            # attribute, but we're not enforcing that anywhere!
+            args = fancy_getopt (cmd_obj.options, cmd_obj, args[1:])
+            self.command_obj[command] = cmd_obj
+
+        # while args
+
+        # Oops, no commands found -- an end-user error
+        if not self.commands:
+            sys.stderr.write (usage + "\n")
+            raise DistutilsArgError, "no commands supplied"
+
+    # parse_command_line()
+
+
+    # -- Command class/object methods ----------------------------------
+
+    # This is a method just so it can be overridden if desired; it doesn't
+    # actually use or change any attributes of the Distribution instance.
+    def find_command_class (self, command):
+        """Given a command, derives the names of the module and class
+           expected to implement the command: eg. 'foo_bar' becomes
+           'distutils.command.foo_bar' (the module) and 'FooBar' (the
+           class within that module).  Loads the module, extracts the
+           class from it, and returns the class object.
+
+           Raises DistutilsModuleError with a semi-user-targeted error
+           message if the expected module could not be loaded, or the
+           expected class was not found in it."""
+
+        module_name = 'distutils.command.' + command
+        klass_name = string.join \
+            (map (string.capitalize, string.split (command, '_')), '')
+
+        try:
+            __import__ (module_name)
+            module = sys.modules[module_name]
+        except ImportError:
+            raise DistutilsModuleError, \
+                  "invalid command '%s' (no module named %s)" % \
+                  (command, module_name)
+
+        try:
+            klass = vars(module)[klass_name]
+        except KeyError:
+            raise DistutilsModuleError, \
+                  "invalid command '%s' (no class '%s' in module '%s')" \
+                  % (command, klass_name, module_name)
+
+        return klass
+
+    # find_command_class ()
+
+
+    def create_command_obj (self, command):
+        """Figure out the class that should implement a command,
+           instantiate it, cache and return the new "command object".
+           The "command class" is determined either by looking it up in
+           the 'cmdclass' attribute (this is the mechanism whereby
+           clients may override default Distutils commands or add their
+           own), or by calling the 'find_command_class()' method (if the
+           command name is not in 'cmdclass'."""
+
+        # Determine the command class -- either it's in the command_class
+        # dictionary, or we have to divine the module and class name
+        klass = self.cmdclass.get(command)
+        if not klass:
+            klass = self.find_command_class (command)
+            self.cmdclass[command] = klass
+
+        # Found the class OK -- instantiate it 
+        cmd_obj = klass (self)
+        return cmd_obj
+    
+
+    def find_command_obj (self, command, create=1):
+        """Look up and return a command object in the cache maintained by
+           'create_command_obj()'.  If none found, the action taken
+           depends on 'create': if true (the default), create a new
+           command object by calling 'create_command_obj()' and return
+           it; otherwise, return None."""
+
+        cmd_obj = self.command_obj.get (command)
+        if not cmd_obj and create:
+            cmd_obj = self.create_command_obj (command)
+            self.command_obj[command] = cmd_obj
+
+        return cmd_obj
+
+        
+    # -- Methods that operate on the Distribution ----------------------
+
+    def announce (self, msg, level=1):
+        """Print 'msg' if 'level' is greater than or equal to the verbosity
+           level recorded in the 'verbose' attribute (which, currently,
+           can be only 0 or 1)."""
+
+        if self.verbose >= level:
+            print msg
+
+
+    def run_commands (self):
+        """Run each command that was seen on the client command line.
+           Uses the list of commands found and cache of command objects
+           created by 'create_command_obj()'."""
+
+        for cmd in self.commands:
+            self.run_command (cmd)
+
+
+    def get_option (self, option):
+        """Return the value of a distribution option.  Raise
+           DistutilsOptionError if 'option' is not known."""
+
+        try:
+            return getattr (self, opt)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "unknown distribution option %s" % option
+
+
+    def get_options (self, *options):
+        """Return (as a tuple) the values of several distribution
+           options.  Raise DistutilsOptionError if any element of
+           'options' is not known."""
+        
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (self, opt))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "unknown distribution option %s" % name
+
+        return tuple (values)
+
+
+    # -- Methods that operate on its Commands --------------------------
+
+    def run_command (self, command):
+        """Create a command object for 'command' if necessary, and
+           run the command by invoking its 'run()' method."""
+
+        self.announce ("running " + command)
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.run ()
+
+
+    def get_command_option (self, command, option):
+        """Create a command object for 'command' if necessary, finalize
+           its option values by invoking its 'set_final_options()'
+           method, and return the value of its 'option' option.  Raise
+           DistutilsOptionError if 'option' is not known for
+           that 'command'."""
+
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.set_final_options ()
+        return cmd_obj.get_option (option)
+        try:
+            return getattr (cmd_obj, option)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % (command, option)
+
+
+    def get_command_options (self, command, *options):
+        """Create a command object for 'command' if necessary, finalize
+           its option values by invoking its 'set_final_options()'
+           method, and return the values of all the options listed in
+           'options' for that command.  Raise DistutilsOptionError if
+           'option' is not known for that 'command'."""
+
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.set_final_options ()
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (cmd_obj, option))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % (command, name)
+
+        return tuple (values)
+
+# end class Distribution
+
+
+class Command:
+    """Abstract base class for defining command classes, the "worker bees"
+       of the Distutils.  A useful analogy for command classes is to
+       think of them as subroutines with local variables called
+       "options".  The options are "declared" in 'set_initial_options()'
+       and "initialized" (given their real values) in
+       'set_final_options()', both of which must be defined by every
+       command class.  The distinction between the two is necessary
+       because option values might come from the outside world (command
+       line, option file, ...), and any options dependent on other
+       options must be computed *after* these outside influences have
+       been processed -- hence 'set_final_values()'.  The "body" of the
+       subroutine, where it does all its work based on the values of its
+       options, is the 'run()' method, which must also be implemented by
+       every command class."""
+
+    # -- Creation/initialization methods -------------------------------
+
+    def __init__ (self, dist):
+        """Create and initialize a new Command object.  Most importantly,
+           invokes the 'set_default_options()' method, which is the
+           real initializer and depends on the actual command being
+           instantiated."""
+
+        if not isinstance (dist, Distribution):
+            raise TypeError, "dist must be a Distribution instance"
+        if self.__class__ is Command:
+            raise RuntimeError, "Command is an abstract class"
+
+        self.distribution = dist
+        self.set_default_options ()
+
+    # end __init__ ()
+
+    # Subclasses must define:
+    #   set_default_options()
+    #     provide default values for all options; may be overridden
+    #     by Distutils client, by command-line options, or by options
+    #     from option file
+    #   set_final_options()
+    #     decide on the final values for all options; this is called
+    #     after all possible intervention from the outside world
+    #     (command-line, option file, etc.) has been processed
+    #   run()
+    #     run the command: do whatever it is we're here to do,
+    #     controlled by the command's various option values
+
+    def set_default_options (self):
+        """Set default values for all the options that this command
+           supports.  Note that these defaults may be overridden
+           by the command-line supplied by the user; thus, this is
+           not the place to code dependencies between options; generally,
+           'set_default_options()' implementations are just a bunch
+           of "self.foo = None" assignments.
+           
+           This method must be implemented by all command classes."""
+           
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+        
+    def set_final_options (self):
+        """Set final values for all the options that this command
+           supports.  This is always called as late as possible, ie.
+           after any option assignments from the command-line or from
+           other commands have been done.  Thus, this is the place to to
+           code option dependencies: if 'foo' depends on 'bar', then it
+           is safe to set 'foo' from 'bar' as long as 'foo' still has
+           the same value it was assigned in 'set_default_options()'.
+
+           This method must be implemented by all command classes."""
+           
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+
+    def run (self):
+        """A command's raison d'etre: carry out the action it exists
+           to perform, controlled by the options initialized in
+           'set_initial_options()', customized by the user and other
+           commands, and finalized in 'set_final_options()'.  All
+           terminal output and filesystem interaction should be done by
+           'run()'.
+
+           This method must be implemented by all command classes."""
+
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+
+    def announce (self, msg, level=1):
+        """If the Distribution instance to which this command belongs
+           has a verbosity level of greater than or equal to 'level'
+           print 'msg' to stdout."""
+        if self.distribution.verbose >= level:
+            print msg
+
+
+    # -- Option query/set methods --------------------------------------
+
+    def get_option (self, option):
+        """Return the value of a single option for this command.  Raise
+           DistutilsOptionError if 'option' is not known."""
+        try:
+            return getattr (self, option)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % \
+                  (self.command_name(), option)
+
+
+    def get_options (self, *options):
+        """Return (as a tuple) the values of several options for this
+           command.  Raise DistutilsOptionError if any of the options in
+           'options' are not known."""
+
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (self, opt))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % \
+                  (self.command_name(), name)
+            
+        return tuple (values)
+    
+
+    def set_option (self, option, value):
+        """Set the value of a single option for this command.  Raise
+           DistutilsOptionError if 'option' is not known."""
+
+        if not hasattr (self, option):
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % \
+                  (self.command_name(), option)
+        if value is not None:
+            setattr (self, option, value)
+
+    def set_options (self, **optval):
+        """Set the values of several options for this command.  Raise
+           DistutilsOptionError if any of the options specified as
+           keyword arguments are not known."""
+
+        for k in optval.keys():
+            if optval[k] is not None:
+                self.set_option (k, optval[k])
+
+
+    # -- Convenience methods for commands ------------------------------
+
+    def set_undefined_options (self, src_cmd, *option_pairs):
+        """Set the values of any "undefined" options from corresponding
+           option values in some other command object.  "Undefined" here
+           means "is None", which is the convention used to indicate
+           that an option has not been changed between
+           'set_initial_values()' and 'set_final_values()'.  Usually
+           called from 'set_final_values()' for options that depend on
+           some other command rather than another option of the same
+           command.  'src_cmd' is the other command from which option
+           values will be taken (a command object will be created for it
+           if necessary); the remaining arguments are
+           '(src_option,dst_option)' tuples which mean "take the value
+           of 'src_option' in the 'src_cmd' command object, and copy it
+           to 'dst_option' in the current command object"."""
+
+        # Option_pairs: list of (src_option, dst_option) tuples
+
+        src_cmd_obj = self.distribution.find_command_obj (src_cmd)
+        src_cmd_obj.set_final_options ()
+        try:
+            for (src_option, dst_option) in option_pairs:
+                if getattr (self, dst_option) is None:
+                    self.set_option (dst_option,
+                                     src_cmd_obj.get_option (src_option))
+        except AttributeError, name:
+            # duh, which command?
+            raise DistutilsOptionError, "unknown option %s" % name
+
+
+    def set_peer_option (self, command, option, value):
+        """Attempt to simulate a command-line override of some option
+           value in another command.  Creates a command object for
+           'command' if necessary, sets 'option' to 'value', and invokes
+           'set_final_options()' on that command object.  This will only
+           have the desired effect if the command object for 'command'
+           has not previously been created.  Generally this is used to
+           ensure that the options in 'command' dependent on 'option'
+           are computed, hopefully (but not necessarily) deriving from
+           'value'.  It might be more accurate to call this method
+           'influence_dependent_peer_options()'."""        
+
+        cmd_obj = self.distribution.find_command_obj (command)
+        cmd_obj.set_option (option, value)
+        cmd_obj.set_final_options ()
+
+
+    def run_peer (self, command):
+        """Run some other command: uses the 'run_command()' method of
+           Distribution, which creates the command object if necessary
+           and then invokes its 'run()' method."""
+
+        self.distribution.run_command (command)
+
+# end class Command
diff --git a/errors.py b/errors.py
new file mode 100644
index 0000000000..6605ad2cb1
--- /dev/null
+++ b/errors.py
@@ -0,0 +1,63 @@
+"""distutils.errors
+
+Provides exceptions used by the Distutils modules.  Note that Distutils
+modules may raise standard exceptions; in particular, SystemExit is
+usually raised for errors that are obviously the end-user's fault
+(eg. bad command-line arguments).
+
+This module safe to use in "from ... import *" mode; it only exports
+symbols whose names start with "Distutils" and end with "Error"."""
+
+# created 1999/03/03, Greg Ward
+
+__rcsid__ = "$Id$"
+
+from types import *
+
+if type (RuntimeError) is ClassType:
+
+    # DistutilsError is the root of all Distutils evil.
+    class DistutilsError (Exception):
+        pass
+
+    # DistutilsModuleError is raised if we are unable to load an expected
+    # module, or find an expected class within some module
+    class DistutilsModuleError (DistutilsError):
+        pass
+
+    # DistutilsClassError is raised if we encounter a distribution or command
+    # class that's not holding up its end of the bargain.
+    class DistutilsClassError (DistutilsError):
+        pass
+
+    # DistutilsGetoptError (help me -- I have JavaProgrammersDisease!) is
+    # raised if the option table provided to fancy_getopt is bogus.
+    class DistutilsGetoptError (DistutilsError):
+        pass
+
+    # DistutilsArgError is raised by fancy_getopt in response to getopt.error;
+    # distutils.core then turns around and raises SystemExit from that.  (Thus
+    # client code should never see DistutilsArgError.)
+    class DistutilsArgError (DistutilsError):
+        pass
+
+    # DistutilsFileError is raised for any problems in the filesystem:
+    # expected file not found, etc.
+    class DistutilsFileError (DistutilsError):
+        pass
+
+    # DistutilsOptionError is raised anytime an attempt is made to access
+    # (get or set) an option that does not exist for a particular command
+    # (or for the distribution itself).
+    class DistutilsOptionError (DistutilsError):
+        pass
+
+# String-based exceptions
+else:
+    DistutilsError = 'DistutilsError'
+    DistutilsModuleError = 'DistutilsModuleError'
+    DistutilsClassError = 'DistutilsClassError'
+    DistutilsGetoptError = 'DistutilsGetoptError'
+    DistutilsArgError = 'DistutilsArgError'
+    DistutilsFileError = 'DistutilsFileError'
+    DistutilsOptionError = 'DistutilsOptionError'
diff --git a/fancy_getopt.py b/fancy_getopt.py
new file mode 100644
index 0000000000..c63ce61b8e
--- /dev/null
+++ b/fancy_getopt.py
@@ -0,0 +1,115 @@
+"""distutils.fancy_getopt
+
+Wrapper around the standard getopt module that provides the following
+additional features:
+  * short and long options are tied together
+  * options have help strings, so fancy_getopt could potentially
+    create a complete usage summary
+  * options set attributes of a passed-in object
+"""
+
+# created 1999/03/03, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import string, re
+from types import *
+import getopt
+from distutils.errors import *
+
+# Much like command_re in distutils.core, this is close to but not quite
+# the same as a Python NAME -- except, in the spirit of most GNU
+# utilities, we use '-' in place of '_'.  (The spirit of LISP lives on!)
+# The similarities to NAME are again not a coincidence...
+longopt_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9-]*)$')
+
+# This is used to translate long options to legitimate Python identifiers
+# (for use as attributes of some object).
+longopt_xlate = string.maketrans ('-', '_')
+
+
+def fancy_getopt (options, object, args):
+
+    # The 'options' table is a list of 3-tuples:
+    #   (long_option, short_option, help_string)
+    # if an option takes an argument, its long_option should have '='
+    # appended; short_option should just be a single character, no ':' in
+    # any case.  If a long_option doesn't have a corresponding
+    # short_option, short_option should be None.  All option tuples must
+    # have long options.
+
+    # Build the short_opts string and long_opts list, remembering how
+    # the two are tied together
+
+    short_opts = []                     # we'll join 'em when done
+    long_opts = []
+    short2long = {}
+    attr_name = {}
+    takes_arg = {}
+
+    for (long, short, help) in options:
+        # Type-check the option names
+        if type (long) is not StringType or len (long) < 2:
+            raise DistutilsGetoptError, \
+                  "long option must be a string of length >= 2"
+
+        if (not ((short is None) or
+                 (type (short) is StringType and len (short) == 1))):
+            raise DistutilsGetoptError, \
+                  "short option must be None or string of length 1"
+
+        long_opts.append (long)
+
+        if long[-1] == '=':             # option takes an argument?
+            if short: short = short + ':'
+            long = long[0:-1]
+            takes_arg[long] = 1
+        else:
+            takes_arg[long] = 0
+
+        # Now enforce some bondage on the long option name, so we can later
+        # translate it to an attribute name in 'object'.  Have to do this a
+        # bit late to make sure we've removed any trailing '='.
+        if not longopt_re.match (long):
+            raise DistutilsGetoptError, \
+                  ("invalid long option name '%s' " +
+                   "(must be letters, numbers, hyphens only") % long
+
+        attr_name[long] = string.translate (long, longopt_xlate)
+        if short:
+            short_opts.append (short)
+            short2long[short[0]] = long
+
+    # end loop over 'options'
+
+    short_opts = string.join (short_opts)
+    try:
+        (opts, args) = getopt.getopt (args, short_opts, long_opts)
+    except getopt.error, msg:
+        raise DistutilsArgError, msg
+
+    for (opt, val) in opts:
+        if len (opt) == 2 and opt[0] == '-': # it's a short option
+            opt = short2long[opt[1]]
+
+        elif len (opt) > 2 and opt[0:2] == '--':
+            opt = opt[2:]
+
+        else:
+            raise RuntimeError, "getopt lies! (bad option string '%s')" % \
+                  opt
+
+        attr = attr_name[opt]
+        if takes_arg[opt]:
+            setattr (object, attr, val)
+        else:
+            if val == '':
+                setattr (object, attr, 1)
+            else:
+                raise RuntimeError, "getopt lies! (bad value '%s')" % value
+
+    # end loop over options found in 'args'
+
+    return args
+
+# end fancy_getopt()
diff --git a/options.py b/options.py
new file mode 100644
index 0000000000..f6cae82dc5
--- /dev/null
+++ b/options.py
@@ -0,0 +1,111 @@
+# XXX this is ridiculous! if commands need to pass options around,
+# they can just pass them via the 'run' method... what we REALLY need
+# is a way for commands to get at each other, via the Distribution!
+
+class Options:
+    """Used by Distribution and Command to encapsulate distribution
+       and command options -- parsing them from command-line arguments,
+       passing them between the distribution and command objects, etc."""
+
+    # -- Creation/initialization methods -------------------------------
+
+    def __init__ (self, owner):
+
+        # 'owner' is the object (presumably either a Distribution
+        # or Command instance) to which this set of options applies.
+        self.owner = owner
+
+        # The option table: maps option names to dictionaries, which
+        # look something like:
+        #    { 'longopt': long command-line option string (optional)
+        #      'shortopt': short option (1 char) (optional)
+        #      'type': 'string', 'boolean', or 'list'
+        #      'description': text description (eg. for help strings)
+        #      'default': default value for the option
+        #      'send': list of (cmd,option) tuples: send option down the line
+        #      'receive': (cmd,option) tuple: pull option from upstream
+        #    }
+        self.table = {}
+
+
+    def set_basic_options (self, *options):
+        """Add very basic options: no separate longopt, no fancy typing, no
+           send targets or receive destination.  The arguments should just
+           be {1..4}-tuples of
+              (name [, shortopt [, description [, default]]])
+           If name ends with '=', the option takes a string argument;
+           otherwise it's boolean."""
+
+        for opt in options:
+            if not (type (opt) is TupleType and 1 <= len (opt) <= 4):
+                raise ValueError, \
+                      ("invalid basic option record '%s': " + \
+                       "must be tuple of length 1 .. 4") % opt
+
+            elements = ('name', 'shortopt', 'description', 'default')
+            name = opt[0]
+            self.table[name] = {}
+            for i in range (1,4):
+                if len (opt) >= i:
+                    self.table[name][elements[i]] = opt[i]
+                else:
+                    break
+
+    # set_basic_options ()
+
+
+    def add_option (self, name, **args):
+
+        # XXX should probably sanity-check the keys of args
+        self.table[name] = args
+
+
+    # ------------------------------------------------------------------
+
+    # These are in the order that they will execute in to ensure proper
+    # prioritizing of option sources -- the default value is the most
+    # basic; it can be overridden by "client options" (the keyword args
+    # passed from setup.py to the 'setup' function); they in turn lose to
+    # options passed in "from above" (ie. from the Distribution, or from
+    # higher-level Commands); these in turn may be overridden by
+    # command-line arguments (which come from the end-user, the runner of
+    # setup.py).  Only when all this is done can we pass options down to
+    # other Commands.
+
+    # Hmmm, it also matters in which order Commands are processed: should a
+    # command-line option to 'make_blib' take precedence over the
+    # corresponding value passed down from its boss, 'build'?
+
+    def set_defaults (self):
+        pass
+
+    def set_client_options (self, options):
+        # 'self' should be a Distribution instance for this one --
+        # this is to process the kw args passed to 'setup'
+        pass
+
+    def receive_option (self, option, value):
+        # do we need to know the identity of the sender? don't
+        # think we should -- too much B&D
+
+        # oh, 'self' should be anything *but* a Distribution (ie.
+        # a Command instance) -- only Commands take orders from above!
+        # (ironically enough)
+        pass
+
+    def parse_command_line (self, args):
+        # here, 'self' can usefully be either a Distribution (for parsing
+        # "global" command-line options) or a Command (for "command-specific"
+        # options)
+        pass
+
+           
+    def send_option (self, option, dest):
+        # perhaps this should not take a dest, but send the option
+        # to all possible receivers?
+        pass
+
+
+    # ------------------------------------------------------------------
+
+# class Options
diff --git a/util.py b/util.py
new file mode 100644
index 0000000000..7c13abe09d
--- /dev/null
+++ b/util.py
@@ -0,0 +1,245 @@
+"""distutils.util
+
+General-purpose utility functions used throughout the Distutils
+(especially in command classes).  Mostly filesystem manipulation, but
+not limited to that.  The functions in this module generally raise
+DistutilsFileError when they have problems with the filesystem, because
+os.error in pre-1.5.2 Python only gives the error message and not the
+file causing it."""
+
+# created 1999/03/08, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import os
+from distutils.errors import *
+
+
+# I don't use os.makedirs because a) it's new to Python 1.5.2, and
+# b) it blows up if the directory already exists (I want to silently
+# succeed in that case).
+def mkpath (name, mode=0777, verbose=0):
+    """Create a directory and any missing ancestor directories.  If the
+       directory already exists, return silently.  Raise
+       DistutilsFileError if unable to create some directory along the
+       way (eg. some sub-path exists, but is a file rather than a
+       directory).  If 'verbose' is true, print a one-line summary of
+       each mkdir to stdout."""
+
+    # XXX what's the better way to handle verbosity? print as we create
+    # each directory in the path (the current behaviour), or only announce
+    # the creation of the whole path, and force verbose=0 on all sub-calls?
+
+    if os.path.isdir (name):
+        return
+
+    (head, tail) = os.path.split (name)
+    tails = [tail]                      # stack of lone dirs to create
+    
+    while head and tail and not os.path.isdir (head):
+        #print "splitting '%s': " % head,
+        (head, tail) = os.path.split (head)
+        #print "to ('%s','%s')" % (head, tail)
+        tails.insert (0, tail)          # push next higher dir onto stack
+
+    #print "stack of tails:", tails
+
+    # now 'head' contains the highest directory that already exists
+    for d in tails:
+        #print "head = %s, d = %s: " % (head, d),
+        head = os.path.join (head, d)
+        if verbose:
+            print "creating", head
+        try:
+            os.mkdir (head)
+        except os.error, (errno, errstr):
+            raise DistutilsFileError, "%s: %s" % (head, errstr)
+
+# mkpath ()
+
+
+def newer (file1, file2):
+    """Return true if file1 exists and is more recently modified than
+       file2, or if file1 exists and file2 doesn't.  Return false if both
+       exist and file2 is the same age or younger than file1.  Raises
+       DistutilsFileError if file1 does not exist."""
+
+    if not os.path.exists (file1):
+        raise DistutilsFileError, "file '%s' does not exist" % file1
+    if not os.path.exists (file2):
+        return 1
+
+    from stat import *
+    mtime1 = os.stat(file1)[ST_MTIME]
+    mtime2 = os.stat(file2)[ST_MTIME]
+
+    return mtime1 > mtime2
+
+# newer ()
+
+
+def make_file (src, dst, func, args,
+               verbose=0, update_message=None, noupdate_message=None):
+    """Makes 'dst' from 'src' (both filenames) by calling 'func' with
+       'args', but only if it needs to: i.e. if 'dst' does not exist or
+       'src' is newer than 'dst'."""
+
+    if newer (src, dst):
+        if verbose and update_message:
+            print update_message
+        apply (func, args)
+    else:
+        if verbose and noupdate_message:
+            print noupdate_message
+
+# make_file ()
+
+
+def _copy_file_contents (src, dst, buffer_size=16*1024):
+    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
+       opening either file, reading from 'src', or writing to 'dst',
+       raises DistutilsFileError.  Data is read/written in chunks of
+       'buffer_size' bytes (default 16k).  No attempt is made to handle
+       anything apart from regular files."""
+
+    # Stolen from shutil module in the standard library, but with
+    # custom error-handling added.
+
+    fsrc = None
+    fdst = None
+    try:
+        try:
+            fsrc = open(src, 'rb')
+        except os.error, (errno, errstr):
+            raise DistutilsFileError, "could not open %s: %s" % (src, errstr)
+        
+        try:
+            fdst = open(dst, 'wb')
+        except os.error, (errno, errstr):
+            raise DistutilsFileError, "could not create %s: %s" % (dst, errstr)
+        
+        while 1:
+            try:
+                buf = fsrc.read (buffer_size)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, \
+                      "could not read from %s: %s" % (src, errstr)
+            
+            if not buf:
+                break
+
+            try:
+                fdst.write(buf)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, \
+                      "could not write to %s: %s" % (dst, errstr)
+            
+    finally:
+        if fdst:
+            fdst.close()
+        if fsrc:
+            fsrc.close()
+
+# _copy_file_contents()
+
+
+def copy_file (src, dst,
+               preserve_mode=1,
+               preserve_times=1,
+               update=0,
+               verbose=0):
+
+    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src'
+       is copied there with the same name; otherwise, it must be a
+       filename.  (If the file exists, it will be ruthlessly clobbered.)
+       If 'preserve_mode' is true (the default), the file's mode (type
+       and permission bits, or whatever is analogous on the current
+       platform) is copied.  If 'preserve_times' is true (the default),
+       the last-modified and last-access times are copied as well.  If
+       'update' is true, 'src' will only be copied if 'dst' does not
+       exist, or if 'dst' does exist but is older than 'src'.  If
+       'verbose' is true, then a one-line summary of the copy will be
+       printed to stdout."""
+
+    # XXX doesn't copy Mac-specific metadata
+       
+    from shutil import copyfile
+    from stat import *
+
+    if not os.path.isfile (src):
+        raise DistutilsFileError, \
+              "can't copy %s:not a regular file" % src
+
+    if os.path.isdir (dst):
+        dir = dst
+        dst = os.path.join (dst, os.path.basename (src))
+    else:
+        dir = os.path.dirname (dst)
+
+    if update and not newer (src, dst):
+        return
+
+    if verbose:
+        print "copying %s -> %s" % (src, dir)
+
+    copyfile (src, dst)
+    if preserve_mode or preserve_times:
+        st = os.stat (src)
+        if preserve_mode:
+            os.chmod (dst, S_IMODE (st[ST_MODE]))
+        if preserve_times:
+            os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
+
+# copy_file ()
+
+
+def copy_tree (src, dst,
+               preserve_mode=1,
+               preserve_times=1,
+               preserve_symlinks=0,
+               update=0,
+               verbose=0):               
+
+    """Copy an entire directory tree 'src' to a new location 'dst'.  Both
+       'src' and 'dst' must be directory names.  If 'src' is not a
+       directory, raise DistutilsFileError.  If 'dst' does not exist, it
+       is created with 'mkpath'.  The endresult of the copy is that
+       every file in 'src' is copied to 'dst', and directories under
+       'src' are recursively copied to 'dst'.
+
+       'preserve_mode' and 'preserve_times' are the same as for
+       'copy_file'; note that they only apply to regular files, not to
+       directories.  If 'preserve_symlinks' is true, symlinks will be
+       copied as symlinks (on platforms that support them!); otherwise
+       (the default), the destination of the symlink will be copied.
+       'update' and 'verbose' are the same as for 'copy_file'."""
+
+    if not os.path.isdir (src):
+        raise DistutilsFileError, \
+              "cannot copy tree %s: not a directory" % src    
+    try:
+        names = os.listdir (src)
+    except os.error, (errno, errstr):
+        raise DistutilsFileError, \
+              "error listing files in %s: %s" % (src, errstr)
+
+        
+    mkpath (dst, verbose=verbose)
+
+    for n in names:
+        src_name = os.path.join (src, n)
+        dst_name = os.path.join (dst, n)
+
+        if preserve_symlinks and os.path.islink (src_name):
+            link_dest = os.readlink (src_name)
+            os.symlink (link_dest, dst_name)
+        elif os.path.isdir (src_name):
+            copy_tree (src_name, dst_name,
+                       preserve_mode, preserve_times, preserve_symlinks,
+                       update, verbose)
+        else:
+            copy_file (src_name, dst_name,
+                       preserve_mode, preserve_times,
+                       update, verbose)
+
+# copy_tree ()

From cc115bf7157ec6636b0baa75630f61f03ddc6906 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 22 Mar 1999 14:54:09 +0000
Subject: [PATCH 0011/8469] Obsolete source file -- command options are
 actually implemented in a much less formalistic way.  Just keeping this
 around for possible future reference.

---
 options.py | 111 -----------------------------------------------------
 1 file changed, 111 deletions(-)
 delete mode 100644 options.py

diff --git a/options.py b/options.py
deleted file mode 100644
index f6cae82dc5..0000000000
--- a/options.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# XXX this is ridiculous! if commands need to pass options around,
-# they can just pass them via the 'run' method... what we REALLY need
-# is a way for commands to get at each other, via the Distribution!
-
-class Options:
-    """Used by Distribution and Command to encapsulate distribution
-       and command options -- parsing them from command-line arguments,
-       passing them between the distribution and command objects, etc."""
-
-    # -- Creation/initialization methods -------------------------------
-
-    def __init__ (self, owner):
-
-        # 'owner' is the object (presumably either a Distribution
-        # or Command instance) to which this set of options applies.
-        self.owner = owner
-
-        # The option table: maps option names to dictionaries, which
-        # look something like:
-        #    { 'longopt': long command-line option string (optional)
-        #      'shortopt': short option (1 char) (optional)
-        #      'type': 'string', 'boolean', or 'list'
-        #      'description': text description (eg. for help strings)
-        #      'default': default value for the option
-        #      'send': list of (cmd,option) tuples: send option down the line
-        #      'receive': (cmd,option) tuple: pull option from upstream
-        #    }
-        self.table = {}
-
-
-    def set_basic_options (self, *options):
-        """Add very basic options: no separate longopt, no fancy typing, no
-           send targets or receive destination.  The arguments should just
-           be {1..4}-tuples of
-              (name [, shortopt [, description [, default]]])
-           If name ends with '=', the option takes a string argument;
-           otherwise it's boolean."""
-
-        for opt in options:
-            if not (type (opt) is TupleType and 1 <= len (opt) <= 4):
-                raise ValueError, \
-                      ("invalid basic option record '%s': " + \
-                       "must be tuple of length 1 .. 4") % opt
-
-            elements = ('name', 'shortopt', 'description', 'default')
-            name = opt[0]
-            self.table[name] = {}
-            for i in range (1,4):
-                if len (opt) >= i:
-                    self.table[name][elements[i]] = opt[i]
-                else:
-                    break
-
-    # set_basic_options ()
-
-
-    def add_option (self, name, **args):
-
-        # XXX should probably sanity-check the keys of args
-        self.table[name] = args
-
-
-    # ------------------------------------------------------------------
-
-    # These are in the order that they will execute in to ensure proper
-    # prioritizing of option sources -- the default value is the most
-    # basic; it can be overridden by "client options" (the keyword args
-    # passed from setup.py to the 'setup' function); they in turn lose to
-    # options passed in "from above" (ie. from the Distribution, or from
-    # higher-level Commands); these in turn may be overridden by
-    # command-line arguments (which come from the end-user, the runner of
-    # setup.py).  Only when all this is done can we pass options down to
-    # other Commands.
-
-    # Hmmm, it also matters in which order Commands are processed: should a
-    # command-line option to 'make_blib' take precedence over the
-    # corresponding value passed down from its boss, 'build'?
-
-    def set_defaults (self):
-        pass
-
-    def set_client_options (self, options):
-        # 'self' should be a Distribution instance for this one --
-        # this is to process the kw args passed to 'setup'
-        pass
-
-    def receive_option (self, option, value):
-        # do we need to know the identity of the sender? don't
-        # think we should -- too much B&D
-
-        # oh, 'self' should be anything *but* a Distribution (ie.
-        # a Command instance) -- only Commands take orders from above!
-        # (ironically enough)
-        pass
-
-    def parse_command_line (self, args):
-        # here, 'self' can usefully be either a Distribution (for parsing
-        # "global" command-line options) or a Command (for "command-specific"
-        # options)
-        pass
-
-           
-    def send_option (self, option, dest):
-        # perhaps this should not take a dest, but send the option
-        # to all possible receivers?
-        pass
-
-
-    # ------------------------------------------------------------------
-
-# class Options

From df17f2c56422e29ed2b2bc07dfaf373b2f24eede Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 22 Mar 1999 14:55:25 +0000
Subject: [PATCH 0012/8469] First checkin of real Distutils command modules.

---
 command/__init__.py    |   6 ++
 command/build.py       |  56 ++++++++++++
 command/build_py.py    | 113 ++++++++++++++++++++++++
 command/install.py     | 189 +++++++++++++++++++++++++++++++++++++++++
 command/install_lib.py |  42 +++++++++
 command/install_py.py  |  42 +++++++++
 6 files changed, 448 insertions(+)
 create mode 100644 command/__init__.py
 create mode 100644 command/build.py
 create mode 100644 command/build_py.py
 create mode 100644 command/install.py
 create mode 100644 command/install_lib.py
 create mode 100644 command/install_py.py

diff --git a/command/__init__.py b/command/__init__.py
new file mode 100644
index 0000000000..9567fd13fb
--- /dev/null
+++ b/command/__init__.py
@@ -0,0 +1,6 @@
+# this is solely for debugging convenience
+
+__all__ = ['build',
+           'build_py',
+           'make_blib',
+          ]
diff --git a/command/build.py b/command/build.py
new file mode 100644
index 0000000000..788609282d
--- /dev/null
+++ b/command/build.py
@@ -0,0 +1,56 @@
+"""distutils.command.build
+
+Implements the Distutils 'build' command."""
+
+# created 1999/03/08, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import os
+from distutils.core import Command
+
+
+class Build (Command):
+
+    options = [('basedir=', 'b', "base directory for build library"),
+               ('libdir=', 'l', "directory for platform-shared files"),
+               ('platdir=', 'p', "directory for platform-specific files"),
+
+               # Flags for 'build_py'
+               ('compile-py', None, "compile .py to .pyc"),
+               ('optimize-py', None, "compile .py to .pyo (optimized)"),
+              ]
+
+    def set_default_options (self):
+        self.basedir = 'build'
+        # these are decided only after 'basedir' has its final value
+        # (unless overridden by the user or client)
+        self.libdir = None
+        self.platdir = None
+
+        self.compile_py = 1
+        self.optimize_py = 1
+
+    def set_final_options (self):
+        # 'libdir' and 'platdir' just default to 'lib' and 'plat' under
+        # the base build directory
+        if self.libdir is None:
+            self.libdir = os.path.join (self.basedir, 'lib')
+        if self.platdir is None:
+            self.platdir = os.path.join (self.basedir, 'plat')
+
+
+    def run (self):
+
+        self.set_final_options ()
+
+        # For now, "build" means "build_py" then "build_ext".  (Eventually
+        # it should also build documentation.)
+
+        # Invoke the 'build_py' command
+        self.run_peer ('build_py')
+
+        # And now 'build_ext'
+        #self.run_peer ('build_ext')
+
+# end class Build
diff --git a/command/build_py.py b/command/build_py.py
new file mode 100644
index 0000000000..ae133f9c2a
--- /dev/null
+++ b/command/build_py.py
@@ -0,0 +1,113 @@
+"""distutils.command.build_py
+
+Implements the Distutils 'build_py' command."""
+
+# created 1999/03/08, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import string, os
+from distutils.core import Command
+from distutils.errors import *
+from distutils.util import mkpath, newer, make_file, copy_file
+
+
+class BuildPy (Command):
+
+    options = [('dir=', 'd', "directory for platform-shared files"),
+               ('compile', 'c', "compile .py to .pyc"),
+               ('optimize', 'o', "compile .py to .pyo (optimized)"),
+              ]
+
+
+    def set_default_options (self):
+        self.dir = None
+        self.compile = 1
+        self.optimize = 1
+
+    def set_final_options (self):
+        self.set_undefined_options ('build',
+                                    ('libdir', 'dir'),
+                                    ('compile_py', 'compile'),
+                                    ('optimize_py', 'optimize'))
+
+
+    def run (self):
+
+        # XXX copy_file by default preserves all stat info -- mode, atime,
+        # and mtime.  IMHO this is the right thing to do, but perhaps it
+        # should be an option -- in particular, a site administrator might
+        # want installed files to reflect the time of installation rather
+        # than the last modification time before the installed release.
+
+        # XXX copy_file does *not* preserve MacOS-specific file metadata.
+        # If this is a problem for building/installing Python modules, then
+        # we'll have to fix copy_file.  (And what about installing scripts,
+        # when the time comes for that -- does MacOS use its special
+        # metadata to know that a file is meant to be interpreted by
+        # Python?)
+
+        self.set_final_options ()
+
+        (modules, package) = \
+            self.distribution.get_options ('py_modules', 'package')
+        package = package or ''
+
+        infiles = []
+        outfiles = []
+        missing = []
+
+        # Loop over the list of "pure Python" modules, deriving
+        # input and output filenames and checking for missing
+        # input files.
+
+        # XXX we should allow for wildcards, so eg. the Distutils setup.py
+        # file would just have to say
+        #   py_modules = ['distutils.*', 'distutils.command.*']
+        # without having to list each one explicitly.
+        for m in modules:
+            fn = apply (os.path.join, tuple (string.split (m, '.'))) + '.py'
+            if not os.path.exists (fn):
+                missing.append (fn)
+            else:
+                infiles.append (fn)
+                outfiles.append (os.path.join (self.dir, package, fn))
+
+        # Blow up if any input files were not found.
+        if missing:
+            raise DistutilsFileError, \
+                  "missing files: " + string.join (missing, ' ')
+
+        # Loop over the list of input files, copying them to their
+        # temporary (build) destination.
+        created = {}
+        for i in range (len (infiles)):
+            outdir = os.path.split (outfiles[i])[0]
+            if not created.get(outdir):
+                mkpath (outdir, verbose=self.distribution.verbose)
+                created[outdir] = 1
+
+            copy_file (infiles[i], outfiles[i],
+                       update=1, verbose=self.distribution.verbose)
+
+        # (Optionally) compile .py to .pyc
+        # XXX hey! we can't control whether we optimize or not; that's up
+        # to the invocation of the current Python interpreter (at least
+        # according to the py_compile docs).  That sucks.
+
+        if self.compile:
+            from py_compile import compile
+
+            for f in outfiles:
+                # XXX can't assume this filename mapping!
+                out_fn = string.replace (f, '.py', '.pyc')
+                
+                make_file (f, out_fn, compile, (f,),
+                           verbose=self.distribution.verbose,
+                           update_message="compiling %s" % f)
+
+        # XXX ignore self.optimize for now, since we don't really know if
+        # we're compiling optimally or not, and couldn't pick what to do
+        # even if we did know.  ;-(
+                       
+# end class BuildPy
diff --git a/command/install.py b/command/install.py
new file mode 100644
index 0000000000..1f457807e1
--- /dev/null
+++ b/command/install.py
@@ -0,0 +1,189 @@
+"""distutils.command.install
+
+Implements the Distutils 'install' command."""
+
+# created 1999/03/13, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys, os, string
+from distutils import sysconfig
+from distutils.core import Command
+
+
+class Install (Command):
+
+    options = [('prefix=', None, "installation prefix"),
+               ('execprefix=', None,
+                "prefix for platform-specific files"),
+
+               # Build directories: where to install from
+               ('build-base=', None,
+                "base build directory"),
+               ('build-lib=', None,
+                "build directory for non-platform-specific library files"),
+               ('build-platlib=', None,
+                "build directory for platform-specific library files"),
+
+               # Installation directories: where to put modules and packages
+               ('install-lib=', None,
+                "base Python library directory"),
+               ('install-platlib=', None,
+                "platform-specific Python library directory"),
+               ('install-site-lib=', None,
+                "directory for site-specific packages and modules"),
+               ('install-site-platlib=', None,
+                "platform-specific site directory"),
+               ('install-scheme=', None,
+                "install to 'system' or 'site' library directory?"),
+
+               # Where to install documentation (eventually!)
+               ('doc-format=', None, "format of documentation to generate"),
+               ('install-man=', None, "directory for Unix man pages"),
+               ('install-html=', None, "directory for HTML documentation"),
+               ('install-info=', None, "directory for GNU info files"),
+               
+              ]
+
+    def set_default_options (self):
+
+        self.build_base = None
+        self.build_lib = None
+        self.build_platlib = None
+
+        # Don't define 'prefix' or 'exec_prefix' so we can know when the
+        # command is run whether the user supplied values
+        self.prefix = None
+        self.exec_prefix = None
+
+        # These two, we can supply real values for! (because they're
+        # not directories, and don't have a confusing multitude of
+        # possible derivations)
+        #self.install_scheme = 'site'
+        self.doc_format = None
+
+        # The actual installation directories are determined only at
+        # run-time, so the user can supply just prefix (and exec_prefix?)
+        # as a base for everything else
+        self.install_lib = None
+        self.install_platlib = None
+        self.install_site_lib = None
+        self.install_site_platlib = None
+
+        self.install_man = None
+        self.install_html = None
+        self.install_info = None
+
+
+    def set_final_options (self):
+
+        # Figure out the build directories, ie. where to install from
+        self.set_peer_option ('build', 'basedir', self.build_base)
+        self.set_undefined_options ('build',
+                                    ('basedir', 'build_base'),
+                                    ('libdir', 'build_lib'),
+                                    ('platdir', 'build_platlib'))
+
+        # Figure out actual installation directories; the basic principle
+        # is: if the user supplied nothing, then use the directories that
+        # Python was built and installed with (ie. the compiled-in prefix
+        # and exec_prefix, and the actual installation directories gleaned
+        # by sysconfig).  If the user supplied a prefix (and possibly
+        # exec_prefix), then we generate our own installation directories,
+        # following any pattern gleaned from sysconfig's findings.  If no
+        # such pattern can be gleaned, then we'll just make do and try to
+        # ape the behaviour of Python's configure script.
+
+        if self.prefix is None:         # user didn't override
+            self.prefix = sys.prefix
+        if self.exec_prefix is None:
+            self.exec_prefix = sys.exec_prefix
+
+        if self.install_lib is None:
+            self.install_lib = \
+                self.replace_sys_prefix ('LIBDEST', ('lib','python1.5'))
+        if self.install_platlib is None:
+            # XXX this should probably be DESTSHARED -- but why is there no
+            # equivalent to DESTSHARED for the "site-packages" dir"?
+            self.install_platlib = \
+                self.replace_sys_prefix ('BINLIBDEST', ('lib','python1.5'), 1)
+
+        if self.install_site_lib is None:
+            self.install_site_lib = \
+                os.path.join (self.install_lib, 'site-packages')
+        if self.install_site_platlib is None:
+            # XXX ugh! this puts platform-specific files in with shared files,
+            # with no nice way to override it! (this might be a Python
+            # problem, though, not a Distutils problem...)
+            self.install_site_platlib = \
+                os.path.join (self.install_lib, 'site-packages')
+
+        #if self.install_scheme == 'site':
+        #    install_lib = self.install_site_lib
+        #    install_platlib = self.install_site_platlib
+        #elif self.install_scheme == 'system':
+        #    install_lib = self.install_lib
+        #    install_platlib = self.install_platlib
+        #else:
+        #    # XXX new exception for this kind of misbehaviour?
+        #    raise DistutilsArgError, \
+        #          "invalid install scheme '%s'" % self.install_scheme
+            
+
+        # Punt on doc directories for now -- after all, we're punting on
+        # documentation completely!
+
+    # set_final_options ()
+
+
+    def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
+        """Attempts to glean a simple pattern from an installation
+           directory available as a 'sysconfig' attribute: if the
+           directory name starts with the "system prefix" (the one
+           hard-coded in the Makefile and compiled into Python),
+           then replace it with the current installation prefix and
+           return the "relocated" installation directory."""
+
+        if use_exec:
+            sys_prefix = sys.exec_prefix
+            my_prefix = self.exec_prefix
+        else:
+            sys_prefix = sys.prefix
+            my_prefix = self.prefix
+
+        val = getattr (sysconfig, config_attr)
+        if string.find (val, sys_prefix) == 0:
+            # If the sysconfig directory starts with the system prefix,
+            # then we can "relocate" it to the user-supplied prefix --
+            # assuming, of course, it is different from the system prefix.
+
+            if sys_prefix == my_prefix:
+                return val
+            else:
+                return my_prefix + val[len(sys_prefix):]
+
+        else:
+            # Otherwise, just tack the "fallback postfix" onto the
+            # user-specified prefix.
+
+            return apply (os.join, (my_prefix,) + fallback_postfix)
+
+    # replace_sys_prefix ()
+    
+
+    def run (self):
+
+        self.set_final_options ()
+
+        # Install modules in two steps: "platform-shared" files (ie. pure
+        # python modules) and platform-specific files (compiled C
+        # extensions).
+
+        self.run_peer ('install_py')
+
+        # don't have an 'install_ext' command just yet!
+        #self.run_peer ('install_ext'))
+
+    # run ()
+
+# class Install
diff --git a/command/install_lib.py b/command/install_lib.py
new file mode 100644
index 0000000000..f2fa842087
--- /dev/null
+++ b/command/install_lib.py
@@ -0,0 +1,42 @@
+# created 1999/03/13, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys
+from distutils.core import Command
+from distutils.util import copy_tree
+
+class InstallPy (Command):
+
+    options = [('dir=', 'd', "directory to install to"),
+               ('build-dir=' 'b', "build directory (where to install from)")]
+
+    def set_default_options (self):
+        # let the 'install' command dictate our installation directory
+        self.dir = None
+        self.build_dir = None
+
+    def set_final_options (self):
+        # If we don't have a 'dir' value, we'll have to ask the 'install'
+        # command for one.  (This usually means the user ran 'install_py'
+        # directly, rather than going through 'install' -- so in reality,
+        # 'find_command_obj()' will create an 'install' command object,
+        # which we then query.
+
+        self.set_undefined_options ('install',
+                                    ('build_lib', 'build_dir'),
+                                    ('install_site_lib', 'dir'))
+
+    def run (self):
+
+        self.set_final_options ()
+
+        # Dump entire contents of the build directory to the installation
+        # directory (that's the beauty of having a build directory!)
+        copy_tree (self.build_dir, self.dir,
+                   verbose=self.distribution.verbose,
+                   update=1)
+                   
+    # run ()
+
+# class InstallPy
diff --git a/command/install_py.py b/command/install_py.py
new file mode 100644
index 0000000000..f2fa842087
--- /dev/null
+++ b/command/install_py.py
@@ -0,0 +1,42 @@
+# created 1999/03/13, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys
+from distutils.core import Command
+from distutils.util import copy_tree
+
+class InstallPy (Command):
+
+    options = [('dir=', 'd', "directory to install to"),
+               ('build-dir=' 'b', "build directory (where to install from)")]
+
+    def set_default_options (self):
+        # let the 'install' command dictate our installation directory
+        self.dir = None
+        self.build_dir = None
+
+    def set_final_options (self):
+        # If we don't have a 'dir' value, we'll have to ask the 'install'
+        # command for one.  (This usually means the user ran 'install_py'
+        # directly, rather than going through 'install' -- so in reality,
+        # 'find_command_obj()' will create an 'install' command object,
+        # which we then query.
+
+        self.set_undefined_options ('install',
+                                    ('build_lib', 'build_dir'),
+                                    ('install_site_lib', 'dir'))
+
+    def run (self):
+
+        self.set_final_options ()
+
+        # Dump entire contents of the build directory to the installation
+        # directory (that's the beauty of having a build directory!)
+        copy_tree (self.build_dir, self.dir,
+                   verbose=self.distribution.verbose,
+                   update=1)
+                   
+    # run ()
+
+# class InstallPy

From 99942c9809e7014fa412f7d73d0121dd9c70f68c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 Mar 1999 14:00:06 +0000
Subject: [PATCH 0013/8469] Changes to allow passing an open file to the
 constructor (to support ProcessHierarchy's changes to support reading from a
 remote URL in ProcessDatabase).

---
 text_file.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/text_file.py b/text_file.py
index eab498d76c..6153dea3df 100644
--- a/text_file.py
+++ b/text_file.py
@@ -13,9 +13,6 @@
 
 
 class TextFile:
-    filename = None
-    file = None
-    current_line = None
 
     default_options = { 'strip_comments': 1,
                         'comment_re':     re.compile (r'\s*#.*'),
@@ -26,7 +23,11 @@ class TextFile:
                         'collapse_ws':    0,
                       }
 
-    def __init__ (self, filename=None, **options):
+    def __init__ (self, filename=None, file=None, **options):
+
+        if filename is None and file is None:
+            raise RuntimeError, \
+                  "you must supply either or both of 'filename' and 'file'" 
 
         # set values for all options -- either from client option hash
         # or fallback to default_options
@@ -45,18 +46,16 @@ def __init__ (self, filename=None, **options):
             if not self.default_options.has_key (opt):
                 raise KeyError, "invalid TextFile option '%s'" % opt
 
-        self.filename = filename
-        if self.filename:
-            self.open ()
-        
-
-    def open (self, filename=None):
-        if not self.filename:
-            if not filename:
-                raise RuntimeError, "must provide a filename somehow"
-
+        if file is None:
+            self.open (filename)
+        else:
             self.filename = filename
+            self.file = file
+            self.current_line = 0       # assuming that file is at BOF!
+        
 
+    def open (self, filename):
+        self.filename = filename
         self.file = open (self.filename, 'r')
         self.current_line = 0
 

From 6c18a676e72670f94bd1f1a625d33d627fabb119 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 26 Mar 1999 21:48:59 +0000
Subject: [PATCH 0014/8469] Added 'linestart' array and 'unreadline()' method
 (makes parsing a lot easier).

---
 text_file.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/text_file.py b/text_file.py
index 6153dea3df..1d579565d5 100644
--- a/text_file.py
+++ b/text_file.py
@@ -52,6 +52,11 @@ def __init__ (self, filename=None, file=None, **options):
             self.filename = filename
             self.file = file
             self.current_line = 0       # assuming that file is at BOF!
+
+        # 'linestart' stores the file offset of the start of each logical
+        # line; it is used to back up the file pointer when the caller
+        # wants to "unread" a line
+        self.linestart = []
         
 
     def open (self, filename):
@@ -81,6 +86,11 @@ def readline (self):
         buildup_line = ''
 
         while 1:
+            # record current file position; this will be appended to
+            # the linestart array *unless* we're accumulating a
+            # continued logical line
+            current_pos = self.file.tell()
+
             # read the line, optionally strip comments
             line = self.file.readline()
             if self.strip_comments and line:
@@ -101,6 +111,11 @@ def readline (self):
                     self.current_line[1] = self.current_line[1] + 1
                 else:
                     self.current_line = [self.current_line, self.current_line+1]
+
+                # Forget current position: don't want to save it in the
+                # middle of a logical line
+                current_pos = None
+
             # just an ordinary line, read it as usual
             else:
                 if not line:
@@ -111,7 +126,7 @@ def readline (self):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
-                
+
 
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
@@ -128,6 +143,12 @@ def readline (self):
             if line == '' or line == '\n' and self.skip_blanks:
                 continue
 
+            # if we're still here and have kept the current position,
+            # then this physical line starts a logical line; record its
+            # starting offset
+            if current_pos is not None:
+                self.linestart.append (current_pos)
+                
             if self.join_lines:
                 if line[-1] == '\\':
                     buildup_line = line[:-1]
@@ -147,6 +168,14 @@ def readline (self):
     # end readline
 
 
+    def unreadline (self):
+        if not self.linestart:
+            raise IOError, "at beginning of file -- can't unreadline"
+        pos = self.linestart[-1]
+        del self.linestart[-1]
+        self.file.seek (pos)        
+
+
     def readlines (self):
         lines = []
         while 1:

From b7509c18d82c99dc663763d51209a091f7306763 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 29 Mar 1999 18:01:49 +0000
Subject: [PATCH 0015/8469] Replaced the last attempt at an "unreadline" with
 one that actually works on non-seekable file-like objects, such as URLs. 
 (Oops.)

---
 text_file.py | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/text_file.py b/text_file.py
index 1d579565d5..bc56a4906b 100644
--- a/text_file.py
+++ b/text_file.py
@@ -53,10 +53,10 @@ def __init__ (self, filename=None, file=None, **options):
             self.file = file
             self.current_line = 0       # assuming that file is at BOF!
 
-        # 'linestart' stores the file offset of the start of each logical
-        # line; it is used to back up the file pointer when the caller
-        # wants to "unread" a line
-        self.linestart = []
+        # 'linebuf' is a stack of lines that will be emptied before we
+        # actually read from the file; it's only populated by an
+        # 'unreadline()' operation
+        self.linebuf = []
         
 
     def open (self, filename):
@@ -83,14 +83,18 @@ def warn (self, msg):
 
     def readline (self):
 
+        # If any "unread" lines waiting in 'linebuf', return the top
+        # one.  (We don't actually buffer read-ahead data -- lines only
+        # get put in 'linebuf' if the client explicitly does an
+        # 'unreadline()'.
+        if self.linebuf:
+            line = self.linebuf[-1]
+            del self.linebuf[-1]
+            return line
+
         buildup_line = ''
 
         while 1:
-            # record current file position; this will be appended to
-            # the linestart array *unless* we're accumulating a
-            # continued logical line
-            current_pos = self.file.tell()
-
             # read the line, optionally strip comments
             line = self.file.readline()
             if self.strip_comments and line:
@@ -111,11 +115,6 @@ def readline (self):
                     self.current_line[1] = self.current_line[1] + 1
                 else:
                     self.current_line = [self.current_line, self.current_line+1]
-
-                # Forget current position: don't want to save it in the
-                # middle of a logical line
-                current_pos = None
-
             # just an ordinary line, read it as usual
             else:
                 if not line:
@@ -126,7 +125,7 @@ def readline (self):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
-
+                
 
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
@@ -143,12 +142,6 @@ def readline (self):
             if line == '' or line == '\n' and self.skip_blanks:
                 continue
 
-            # if we're still here and have kept the current position,
-            # then this physical line starts a logical line; record its
-            # starting offset
-            if current_pos is not None:
-                self.linestart.append (current_pos)
-                
             if self.join_lines:
                 if line[-1] == '\\':
                     buildup_line = line[:-1]
@@ -168,14 +161,6 @@ def readline (self):
     # end readline
 
 
-    def unreadline (self):
-        if not self.linestart:
-            raise IOError, "at beginning of file -- can't unreadline"
-        pos = self.linestart[-1]
-        del self.linestart[-1]
-        self.file.seek (pos)        
-
-
     def readlines (self):
         lines = []
         while 1:
@@ -185,6 +170,10 @@ def readlines (self):
             lines.append (line)
 
 
+    def unreadline (self, line):
+        self.linebuf.append (line)
+
+
 if __name__ == "__main__":
     test_data = """# test file
 

From a3af0a0d6a3cd60ff4a97d970b7ebe0a2dd6748b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Apr 1999 02:46:29 +0000
Subject: [PATCH 0016/8469] Changed to use the method versions of
 'copy_file()', 'copy_tree()', and 'make_file()'-- that way, the verbose and
 dry-run flags are handled for free.

---
 command/build_py.py    | 11 +++++------
 command/install_lib.py |  4 +---
 command/install_py.py  |  4 +---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index ae133f9c2a..0ed8486ea0 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -84,11 +84,10 @@ def run (self):
         for i in range (len (infiles)):
             outdir = os.path.split (outfiles[i])[0]
             if not created.get(outdir):
-                mkpath (outdir, verbose=self.distribution.verbose)
+                self.mkpath (outdir)
                 created[outdir] = 1
 
-            copy_file (infiles[i], outfiles[i],
-                       update=1, verbose=self.distribution.verbose)
+            self.copy_file (infiles[i], outfiles[i])
 
         # (Optionally) compile .py to .pyc
         # XXX hey! we can't control whether we optimize or not; that's up
@@ -102,9 +101,9 @@ def run (self):
                 # XXX can't assume this filename mapping!
                 out_fn = string.replace (f, '.py', '.pyc')
                 
-                make_file (f, out_fn, compile, (f,),
-                           verbose=self.distribution.verbose,
-                           update_message="compiling %s" % f)
+                self.make_file (f, out_fn, compile, (f,),
+                                "compiling %s -> %s" % (f, out_fn),
+                                "compilation of %s skipped" % f)
 
         # XXX ignore self.optimize for now, since we don't really know if
         # we're compiling optimally or not, and couldn't pick what to do
diff --git a/command/install_lib.py b/command/install_lib.py
index f2fa842087..22ab71e799 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -33,9 +33,7 @@ def run (self):
 
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        copy_tree (self.build_dir, self.dir,
-                   verbose=self.distribution.verbose,
-                   update=1)
+        self.copy_tree (self.build_dir, self.dir)
                    
     # run ()
 
diff --git a/command/install_py.py b/command/install_py.py
index f2fa842087..22ab71e799 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -33,9 +33,7 @@ def run (self):
 
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        copy_tree (self.build_dir, self.dir,
-                   verbose=self.distribution.verbose,
-                   update=1)
+        self.copy_tree (self.build_dir, self.dir)
                    
     # run ()
 

From 4e091bdd15624bc17b8f1f45091848e23e8be099 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Apr 1999 02:54:20 +0000
Subject: [PATCH 0017/8469] Added 'dry_run' flag to most functions (to support
 the "shadow methods"   that wrap them in the Command class). Fixed
 'copy_file()' to use '_copy_file_contents()', not 'copyfile()'   from shutil
 module -- no reference to shutil anymore. Added "not copying" announcement in
 'copy_file()'. Wee comment fix.

---
 util.py | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/util.py b/util.py
index 7c13abe09d..f4a1df791f 100644
--- a/util.py
+++ b/util.py
@@ -18,7 +18,7 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0777, verbose=0):
+def mkpath (name, mode=0777, verbose=0, dry_run=0):
     """Create a directory and any missing ancestor directories.  If the
        directory already exists, return silently.  Raise
        DistutilsFileError if unable to create some directory along the
@@ -44,16 +44,20 @@ def mkpath (name, mode=0777, verbose=0):
 
     #print "stack of tails:", tails
 
-    # now 'head' contains the highest directory that already exists
+    # now 'head' contains the deepest directory that already exists
+    # (that is, the child of 'head' in 'name' is the highest directory
+    # that does *not* exist)
     for d in tails:
         #print "head = %s, d = %s: " % (head, d),
         head = os.path.join (head, d)
         if verbose:
             print "creating", head
-        try:
-            os.mkdir (head)
-        except os.error, (errno, errstr):
-            raise DistutilsFileError, "%s: %s" % (head, errstr)
+
+        if not dry_run:
+            try:
+                os.mkdir (head)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, "%s: %s" % (head, errstr)
 
 # mkpath ()
 
@@ -147,7 +151,8 @@ def copy_file (src, dst,
                preserve_mode=1,
                preserve_times=1,
                update=0,
-               verbose=0):
+               verbose=0,
+               dry_run=0):
 
     """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src'
        is copied there with the same name; otherwise, it must be a
@@ -163,7 +168,6 @@ def copy_file (src, dst,
 
     # XXX doesn't copy Mac-specific metadata
        
-    from shutil import copyfile
     from stat import *
 
     if not os.path.isfile (src):
@@ -177,12 +181,16 @@ def copy_file (src, dst,
         dir = os.path.dirname (dst)
 
     if update and not newer (src, dst):
+        print "not copying %s (output up-to-date)" % src
         return
 
     if verbose:
         print "copying %s -> %s" % (src, dir)
 
-    copyfile (src, dst)
+    if dry_run:
+        return
+
+    _copy_file_contents (src, dst)
     if preserve_mode or preserve_times:
         st = os.stat (src)
         if preserve_mode:
@@ -198,7 +206,9 @@ def copy_tree (src, dst,
                preserve_times=1,
                preserve_symlinks=0,
                update=0,
-               verbose=0):               
+               verbose=0,
+               dry_run=0):
+
 
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
        'src' and 'dst' must be directory names.  If 'src' is not a
@@ -223,8 +233,8 @@ def copy_tree (src, dst,
         raise DistutilsFileError, \
               "error listing files in %s: %s" % (src, errstr)
 
-        
-    mkpath (dst, verbose=verbose)
+    if not dry_run:
+        mkpath (dst, verbose=verbose)
 
     for n in names:
         src_name = os.path.join (src, n)
@@ -232,14 +242,17 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink (src_name):
             link_dest = os.readlink (src_name)
-            os.symlink (link_dest, dst_name)
+            if verbose:
+                print "linking %s -> %s" % (dst_name, link_dest)
+            if not dry_run:
+                os.symlink (link_dest, dst_name)
         elif os.path.isdir (src_name):
             copy_tree (src_name, dst_name,
                        preserve_mode, preserve_times, preserve_symlinks,
-                       update, verbose)
+                       update, verbose, dry_run)
         else:
             copy_file (src_name, dst_name,
                        preserve_mode, preserve_times,
-                       update, verbose)
+                       update, verbose, dry_run)
 
 # copy_tree ()

From 542cc6a75696e8edf46dd30c53b1fe5b73e86a2e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Apr 1999 02:58:07 +0000
Subject: [PATCH 0018/8469] Added all the "external action" methods (to make
 handling the verbose and dry-run flags consistently painless): 'execute()',
 'mkpath()', 'copy_file()', 'copy_tree()', 'make_file()', and stub for
 'make_files()' (not sure yet if it's useful).

---
 core.py | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 3a7443c78e..980ba5b30d 100644
--- a/core.py
+++ b/core.py
@@ -10,10 +10,11 @@
 
 __rcsid__ = "$Id$"
 
-import sys
+import sys, os
 import string, re
 from distutils.errors import *
 from distutils.fancy_getopt import fancy_getopt
+from distutils import util
 
 # This is not *quite* the same as a Python NAME; I don't allow leading
 # underscores.  The fact that they're very similar is no coincidence...
@@ -594,4 +595,133 @@ def run_peer (self, command):
 
         self.distribution.run_command (command)
 
+
+    # -- External world manipulation -----------------------------------
+
+    def execute (self, func, args, msg=None, level=1):
+        """Perform some action that affects the outside world (eg.
+           by writing to the filesystem).  Such actions are special because
+           they should be disabled by the "dry run" flag (carried around by
+           the Command's Distribution), and should announce themselves if
+           the current verbosity level is high enough.  This method takes
+           care of all that bureaucracy for you; all you have to do is
+           supply the funtion to call and an argument tuple for it (to
+           embody the "external action" being performed), a message to
+           print if the verbosity level is high enough, and an optional
+           verbosity threshold."""
+
+
+        # Generate a message if we weren't passed one
+        if msg is None:
+            msg = "%s %s" % (func.__name__, `args`)
+            if msg[-2:] == ',)':        # correct for singleton tuple 
+                msg = msg[0:-2] + ')'
+
+        # Print it if verbosity level is high enough
+        self.announce (msg, level)
+
+        # And do it, as long as we're not in dry-run mode
+        if not self.distribution.dry_run:
+            apply (func, args)
+
+    # execute()
+
+
+    def mkpath (self, name, mode=0777):
+        util.mkpath (name, mode,
+                     self.distribution.verbose, self.distribution.dry_run)
+
+
+    def copy_file (self, infile, outfile,
+                   preserve_mode=1, preserve_times=1, update=1, level=1):
+        """Copy a file respecting verbose and dry-run flags."""
+
+        util.copy_file (infile, outfile,
+                        preserve_mode, preserve_times,
+                        update, self.distribution.verbose >= level,
+                        self.distribution.dry_run)
+
+
+    def copy_tree (self, infile, outfile,
+                   preserve_mode=1, preserve_times=1, preserve_symlinks=0,
+                   update=1, level=1):
+        """Copy an entire directory tree respecting verbose and dry-run
+           flags."""
+
+        util.copy_tree (infile, outfile, 
+                        preserve_mode, preserve_times, preserve_symlinks,
+                        update, self.distribution.verbose >= level,
+                        self.distribution.dry_run)
+
+
+    def make_file (self, infiles, outfile, func, args,
+                    exec_msg=None, skip_msg=None, level=1):
+
+        """Special case of 'execute()' for operations that process one or
+           more input files and generate one output file.  Works just like
+           'execute()', except the operation is skipped and a different
+           message printed if 'outfile' already exists and is newer than
+           all files listed in 'infiles'."""
+
+
+        if exec_msg is None:
+            exec_msg = "generating %s from %s" % \
+                       (outfile, string.join (infiles, ', '))
+        if skip_msg is None:
+            skip_msg = "skipping %s (inputs unchanged)" % outfile
+        
+
+        # Allow 'infiles' to be a single string
+        if type (infiles) is StringType:
+            infiles = (infiles,)
+        elif type (infiles) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'infiles' must be a string, or a list or tuple of strings"
+
+        # XXX this stuff should probably be moved off to a function
+        # in 'distutils.util'
+        from stat import *
+
+        if os.path.exists (outfile):
+            out_mtime = os.stat (outfile)[ST_MTIME]
+
+            # Loop over all infiles.  If any infile is newer than outfile,
+            # then we'll have to regenerate outfile
+            for f in infiles:
+                in_mtime = os.stat (f)[ST_MTIME]
+                if in_mtime > out_mtime:
+                    runit = 1
+                    break
+            else:
+                runit = 0
+
+        else:
+            runit = 1
+
+        # If we determined that 'outfile' must be regenerated, then
+        # perform the action that presumably regenerates it
+        if runit:
+            self.execute (func, args, exec_msg, level)
+
+        # Otherwise, print the "skip" message
+        else:
+            self.announce (skip_msg, level)
+
+    # make_file ()
+
+
+#     def make_files (self, infiles, outfiles, func, args,
+#                     exec_msg=None, skip_msg=None, level=1):
+
+#         """Special case of 'execute()' for operations that process one or
+#            more input files and generate one or more output files.  Works
+#            just like 'execute()', except the operation is skipped and a
+#            different message printed if all files listed in 'outfiles'
+#            already exist and are newer than all files listed in
+#            'infiles'."""
+
+#         pass
+    
+    
+
 # end class Command

From 8806d89547055f3a8b1246bf100338c5270b9fe9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 15 Apr 1999 17:50:19 +0000
Subject: [PATCH 0019/8469] 'warn()' method now takes an optional line number.

---
 text_file.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/text_file.py b/text_file.py
index bc56a4906b..a27df06d45 100644
--- a/text_file.py
+++ b/text_file.py
@@ -72,12 +72,14 @@ def close (self):
         self.current_line = None
 
 
-    def warn (self, msg):
+    def warn (self, msg, line=None):
+        if line is None:
+            line = self.current_line
         sys.stderr.write (self.filename + ", ")
-        if type (self.current_line) is ListType:
-            sys.stderr.write ("lines %d-%d: " % tuple (self.current_line))
+        if type (line) is ListType:
+            sys.stderr.write ("lines %d-%d: " % tuple (line))
         else:
-            sys.stderr.write ("line %d: " % self.current_line)
+            sys.stderr.write ("line %d: " % line)
         sys.stderr.write (msg + "\n")
 
 

From 4da83200ca7258a4c4d175c53f7b1b310db013cb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 2 May 1999 21:39:13 +0000
Subject: [PATCH 0020/8469] Rearranged things so that compilation of .py files
 is the responsibility of the 'install_py' command rather than 'build_py'. 
 Obviously, this meant that the 'build_py' and 'install_py' modules had to
 change; less obviously, so did 'install' and 'build', since these
 higher-level commands must make options available to control the lower-level
 commands, and some compilation-related options had to migrate with the code.

---
 command/build.py       |  7 -------
 command/build_py.py    | 28 +---------------------------
 command/install.py     |  6 ++++++
 command/install_lib.py | 37 +++++++++++++++++++++++++++++++++----
 command/install_py.py  | 37 +++++++++++++++++++++++++++++++++----
 5 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/command/build.py b/command/build.py
index 788609282d..d0e939e9b6 100644
--- a/command/build.py
+++ b/command/build.py
@@ -15,10 +15,6 @@ class Build (Command):
     options = [('basedir=', 'b', "base directory for build library"),
                ('libdir=', 'l', "directory for platform-shared files"),
                ('platdir=', 'p', "directory for platform-specific files"),
-
-               # Flags for 'build_py'
-               ('compile-py', None, "compile .py to .pyc"),
-               ('optimize-py', None, "compile .py to .pyo (optimized)"),
               ]
 
     def set_default_options (self):
@@ -28,9 +24,6 @@ def set_default_options (self):
         self.libdir = None
         self.platdir = None
 
-        self.compile_py = 1
-        self.optimize_py = 1
-
     def set_final_options (self):
         # 'libdir' and 'platdir' just default to 'lib' and 'plat' under
         # the base build directory
diff --git a/command/build_py.py b/command/build_py.py
index 0ed8486ea0..d956eef396 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -15,21 +15,15 @@
 class BuildPy (Command):
 
     options = [('dir=', 'd', "directory for platform-shared files"),
-               ('compile', 'c', "compile .py to .pyc"),
-               ('optimize', 'o', "compile .py to .pyo (optimized)"),
               ]
 
 
     def set_default_options (self):
         self.dir = None
-        self.compile = 1
-        self.optimize = 1
 
     def set_final_options (self):
         self.set_undefined_options ('build',
-                                    ('libdir', 'dir'),
-                                    ('compile_py', 'compile'),
-                                    ('optimize_py', 'optimize'))
+                                    ('libdir', 'dir'))
 
 
     def run (self):
@@ -88,25 +82,5 @@ def run (self):
                 created[outdir] = 1
 
             self.copy_file (infiles[i], outfiles[i])
-
-        # (Optionally) compile .py to .pyc
-        # XXX hey! we can't control whether we optimize or not; that's up
-        # to the invocation of the current Python interpreter (at least
-        # according to the py_compile docs).  That sucks.
-
-        if self.compile:
-            from py_compile import compile
-
-            for f in outfiles:
-                # XXX can't assume this filename mapping!
-                out_fn = string.replace (f, '.py', '.pyc')
-                
-                self.make_file (f, out_fn, compile, (f,),
-                                "compiling %s -> %s" % (f, out_fn),
-                                "compilation of %s skipped" % f)
-
-        # XXX ignore self.optimize for now, since we don't really know if
-        # we're compiling optimally or not, and couldn't pick what to do
-        # even if we did know.  ;-(
                        
 # end class BuildPy
diff --git a/command/install.py b/command/install.py
index 1f457807e1..ec73b1c1a8 100644
--- a/command/install.py
+++ b/command/install.py
@@ -43,6 +43,9 @@ class Install (Command):
                ('install-html=', None, "directory for HTML documentation"),
                ('install-info=', None, "directory for GNU info files"),
                
+               # Flags for 'build_py'
+               ('compile-py', None, "compile .py to .pyc"),
+               ('optimize-py', None, "compile .py to .pyo (optimized)"),
               ]
 
     def set_default_options (self):
@@ -74,6 +77,9 @@ def set_default_options (self):
         self.install_html = None
         self.install_info = None
 
+        self.compile_py = 1
+        self.optimize_py = 1
+
 
     def set_final_options (self):
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 22ab71e799..f147af47f3 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -2,19 +2,25 @@
 
 __rcsid__ = "$Id$"
 
-import sys
+import sys, string
 from distutils.core import Command
 from distutils.util import copy_tree
 
 class InstallPy (Command):
 
     options = [('dir=', 'd', "directory to install to"),
-               ('build-dir=' 'b', "build directory (where to install from)")]
+               ('build-dir=' 'b', "build directory (where to install from)"),
+               ('compile', 'c', "compile .py to .pyc"),
+               ('optimize', 'o', "compile .py to .pyo (optimized)"),
+              ]
+               
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
         self.dir = None
         self.build_dir = None
+        self.compile = 1
+        self.optimize = 1
 
     def set_final_options (self):
         # If we don't have a 'dir' value, we'll have to ask the 'install'
@@ -25,7 +31,10 @@ def set_final_options (self):
 
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    ('install_site_lib', 'dir'))
+                                    ('install_site_lib', 'dir'),
+                                    ('compile_py', 'compile'),
+                                    ('optimize_py', 'optimize'))
+
 
     def run (self):
 
@@ -33,8 +42,28 @@ def run (self):
 
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.dir)
                    
+        # (Optionally) compile .py to .pyc
+        # XXX hey! we can't control whether we optimize or not; that's up
+        # to the invocation of the current Python interpreter (at least
+        # according to the py_compile docs).  That sucks.
+
+        if self.compile:
+            from py_compile import compile
+
+            for f in outfiles:
+                # XXX can't assume this filename mapping!
+                out_fn = string.replace (f, '.py', '.pyc')
+                
+                self.make_file (f, out_fn, compile, (f,),
+                                "compiling %s -> %s" % (f, out_fn),
+                                "compilation of %s skipped" % f)
+
+        # XXX ignore self.optimize for now, since we don't really know if
+        # we're compiling optimally or not, and couldn't pick what to do
+        # even if we did know.  ;-(
+
     # run ()
 
 # class InstallPy
diff --git a/command/install_py.py b/command/install_py.py
index 22ab71e799..f147af47f3 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -2,19 +2,25 @@
 
 __rcsid__ = "$Id$"
 
-import sys
+import sys, string
 from distutils.core import Command
 from distutils.util import copy_tree
 
 class InstallPy (Command):
 
     options = [('dir=', 'd', "directory to install to"),
-               ('build-dir=' 'b', "build directory (where to install from)")]
+               ('build-dir=' 'b', "build directory (where to install from)"),
+               ('compile', 'c', "compile .py to .pyc"),
+               ('optimize', 'o', "compile .py to .pyo (optimized)"),
+              ]
+               
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
         self.dir = None
         self.build_dir = None
+        self.compile = 1
+        self.optimize = 1
 
     def set_final_options (self):
         # If we don't have a 'dir' value, we'll have to ask the 'install'
@@ -25,7 +31,10 @@ def set_final_options (self):
 
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    ('install_site_lib', 'dir'))
+                                    ('install_site_lib', 'dir'),
+                                    ('compile_py', 'compile'),
+                                    ('optimize_py', 'optimize'))
+
 
     def run (self):
 
@@ -33,8 +42,28 @@ def run (self):
 
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.dir)
                    
+        # (Optionally) compile .py to .pyc
+        # XXX hey! we can't control whether we optimize or not; that's up
+        # to the invocation of the current Python interpreter (at least
+        # according to the py_compile docs).  That sucks.
+
+        if self.compile:
+            from py_compile import compile
+
+            for f in outfiles:
+                # XXX can't assume this filename mapping!
+                out_fn = string.replace (f, '.py', '.pyc')
+                
+                self.make_file (f, out_fn, compile, (f,),
+                                "compiling %s -> %s" % (f, out_fn),
+                                "compilation of %s skipped" % f)
+
+        # XXX ignore self.optimize for now, since we don't really know if
+        # we're compiling optimally or not, and couldn't pick what to do
+        # even if we did know.  ;-(
+
     # run ()
 
 # class InstallPy

From 8e84928345bf830b0a8fe08f37627d315d5f897a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 2 May 1999 21:42:05 +0000
Subject: [PATCH 0021/8469] The 'copy_file()' and 'copy_tree()' functions in
 util.py now have meaningful return values: respectively, whether the copy was
 done, and the list of files that were copied.  This meant some trivial
 changes in core.py as well: the Command methods that mirror 'copy_file()' and
 'copy_tree()' have to pass on their return values.

---
 core.py | 16 ++++++++--------
 util.py | 42 ++++++++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/core.py b/core.py
index 980ba5b30d..4b8c78384e 100644
--- a/core.py
+++ b/core.py
@@ -636,10 +636,10 @@ def copy_file (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, update=1, level=1):
         """Copy a file respecting verbose and dry-run flags."""
 
-        util.copy_file (infile, outfile,
-                        preserve_mode, preserve_times,
-                        update, self.distribution.verbose >= level,
-                        self.distribution.dry_run)
+        return util.copy_file (infile, outfile,
+                               preserve_mode, preserve_times,
+                               update, self.distribution.verbose >= level,
+                               self.distribution.dry_run)
 
 
     def copy_tree (self, infile, outfile,
@@ -648,10 +648,10 @@ def copy_tree (self, infile, outfile,
         """Copy an entire directory tree respecting verbose and dry-run
            flags."""
 
-        util.copy_tree (infile, outfile, 
-                        preserve_mode, preserve_times, preserve_symlinks,
-                        update, self.distribution.verbose >= level,
-                        self.distribution.dry_run)
+        return util.copy_tree (infile, outfile, 
+                               preserve_mode,preserve_times,preserve_symlinks,
+                               update, self.distribution.verbose >= level,
+                               self.distribution.dry_run)
 
 
     def make_file (self, infiles, outfile, func, args,
diff --git a/util.py b/util.py
index f4a1df791f..7aedc1c6df 100644
--- a/util.py
+++ b/util.py
@@ -164,7 +164,11 @@ def copy_file (src, dst,
        'update' is true, 'src' will only be copied if 'dst' does not
        exist, or if 'dst' does exist but is older than 'src'.  If
        'verbose' is true, then a one-line summary of the copy will be
-       printed to stdout."""
+       printed to stdout.
+
+       Return true if the file was copied (or would have been copied),
+       false otherwise (ie. 'update' was true and the destination is
+       up-to-date)."""
 
     # XXX doesn't copy Mac-specific metadata
        
@@ -181,14 +185,15 @@ def copy_file (src, dst,
         dir = os.path.dirname (dst)
 
     if update and not newer (src, dst):
-        print "not copying %s (output up-to-date)" % src
-        return
+        if verbose:
+            print "not copying %s (output up-to-date)" % src
+        return 0
 
     if verbose:
         print "copying %s -> %s" % (src, dir)
 
     if dry_run:
-        return
+        return 1
 
     _copy_file_contents (src, dst)
     if preserve_mode or preserve_times:
@@ -198,6 +203,8 @@ def copy_file (src, dst,
         if preserve_times:
             os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
 
+    return 1
+
 # copy_file ()
 
 
@@ -213,9 +220,12 @@ def copy_tree (src, dst,
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
        'src' and 'dst' must be directory names.  If 'src' is not a
        directory, raise DistutilsFileError.  If 'dst' does not exist, it
-       is created with 'mkpath'.  The endresult of the copy is that
+       is created with 'mkpath'.  The end result of the copy is that
        every file in 'src' is copied to 'dst', and directories under
-       'src' are recursively copied to 'dst'.
+       'src' are recursively copied to 'dst'.  Return the list of files
+       copied (under their output names) -- note that if 'update' is true,
+       this might be less than the list of files considered.  Return
+       value is not affected by 'dry_run'.
 
        'preserve_mode' and 'preserve_times' are the same as for
        'copy_file'; note that they only apply to regular files, not to
@@ -236,6 +246,8 @@ def copy_tree (src, dst,
     if not dry_run:
         mkpath (dst, verbose=verbose)
 
+    outputs = []
+
     for n in names:
         src_name = os.path.join (src, n)
         dst_name = os.path.join (dst, n)
@@ -246,13 +258,19 @@ def copy_tree (src, dst,
                 print "linking %s -> %s" % (dst_name, link_dest)
             if not dry_run:
                 os.symlink (link_dest, dst_name)
+            outputs.append (dst_name)
+            
         elif os.path.isdir (src_name):
-            copy_tree (src_name, dst_name,
-                       preserve_mode, preserve_times, preserve_symlinks,
-                       update, verbose, dry_run)
+            outputs[-1:] = \
+                copy_tree (src_name, dst_name,
+                           preserve_mode, preserve_times, preserve_symlinks,
+                           update, verbose, dry_run)
         else:
-            copy_file (src_name, dst_name,
-                       preserve_mode, preserve_times,
-                       update, verbose, dry_run)
+            if (copy_file (src_name, dst_name,
+                           preserve_mode, preserve_times,
+                           update, verbose, dry_run)):
+                outputs.append (dst_name)
+
+    return outputs
 
 # copy_tree ()

From 4c91f4ee1b115815b34eb36da15553c41be1ef80 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Jun 1999 01:58:36 +0000
Subject: [PATCH 0022/8469] Now handles NT, through '_init_nt()' function
 (courtesy of Amos Latteier <amos@aracnet.com>).

---
 sysconfig.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index e71ae4668a..5c60ca4a49 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -129,6 +129,16 @@ def _init_posix():
     parse_makefile(open(get_makefile_filename()), g)
 
 
+def _init_nt():
+    """Initialize the module as appropriate for NT"""
+    g=globals()
+    # load config.h, though I don't know how useful this is
+    parse_config_h(open(
+            os.path.join(sys.exec_prefix, "include", "config.h")), g)
+    # set basic install directories
+    g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib")
+    g['BINLIBDEST']=os.path.join(sys.exec_prefix, "Lib")
+
 
 try:
     exec "_init_" + os.name
@@ -139,3 +149,4 @@ def _init_posix():
     exec "_init_%s()" % os.name
 
 del _init_posix
+del _init_nt

From acd36b84863fab989ea5d731f787300f579e7861 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Jun 1999 02:02:00 +0000
Subject: [PATCH 0023/8469] Added the 'have_run' dictionary to Distribution,
 and changed   'run_command()' to refer to it before attempting to run a
 command --   that way, command classes can freely invoke other commands
 without fear   of duplicate execution. Beefed up some comments and
 docstrings.

---
 core.py | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/core.py b/core.py
index 4b8c78384e..8a6cf72037 100644
--- a/core.py
+++ b/core.py
@@ -136,6 +136,10 @@ def __init__ (self, attrs=None):
         self.licence = None
         self.description = None
 
+        # 'cmdclass' maps command names to class objects, so we
+        # can 1) quickly figure out which class to instantiate when
+        # we need to create a new command object, and 2) have a way
+        # for the client to override command classes
         self.cmdclass = {}
 
         # The rest of these are really the business of various commands,
@@ -152,9 +156,23 @@ def __init__ (self, attrs=None):
                 setattr (self, k, attrs[k])
 
         # And now initialize bookkeeping stuff that can't be supplied by
-        # the caller at all
+        # the caller at all.  'command_obj' maps command names to
+        # Command instances -- that's how we enforce that every command
+        # class is a singleton.
         self.command_obj = {}
 
+        # 'have_run' maps command names to boolean values; it keeps track
+        # of whether we have actually run a particular command, to make it
+        # cheap to "run" a command whenever we think we might need to -- if
+        # it's already been done, no need for expensive filesystem
+        # operations, we just check the 'have_run' dictionary and carry on.
+        # It's only safe to query 'have_run' for a command class
+        # that has been instantiated -- a false value will be put inserted
+        # when the command object is created, and replaced with a true
+        # value when the command is succesfully run.  Thus it's
+        # probably best to use '.get()' rather than a straight lookup.
+        self.have_run = {}
+
     # __init__ ()
 
 
@@ -211,6 +229,7 @@ def parse_command_line (self, args):
             # attribute, but we're not enforcing that anywhere!
             args = fancy_getopt (cmd_obj.options, cmd_obj, args[1:])
             self.command_obj[command] = cmd_obj
+            self.have_run[command] = 0
 
         # while args
 
@@ -347,12 +366,23 @@ def get_options (self, *options):
     # -- Methods that operate on its Commands --------------------------
 
     def run_command (self, command):
-        """Create a command object for 'command' if necessary, and
-           run the command by invoking its 'run()' method."""
+
+        """Do whatever it takes to run a command (including nothing at all,
+           if the command has already been run).  Specifically: if we have
+           already created and run the command named by 'command', return
+           silently without doing anything.  If the command named by
+           'command' doesn't even have a command object yet, create one.
+           Then invoke 'run()' on that command object (or an existing
+           one)."""
+
+        # Already been here, done that? then return silently.
+        if self.have_run.get (command):
+            return
 
         self.announce ("running " + command)
         cmd_obj = self.find_command_obj (command)
         cmd_obj.run ()
+        self.have_run[command] = 1
 
 
     def get_command_option (self, command, option):

From 50fc61eddf6d3a2028dddaeeb106bc783de0efd5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Jun 1999 02:04:36 +0000
Subject: [PATCH 0024/8469] Hacked 'set_final_options()' to set (hopefully)
 appropriate values for 'install_site_lib' and install_site_platlib' on
 non-POSIX platforms. Should at least work for NT, as this is adopted from
 Amos Latteier's NT patches.  Also added extensive comments bitching about the
 inadequacy of the current model, both under POSIX and NT (and probably other)
 systems.

---
 command/install.py | 63 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/command/install.py b/command/install.py
index ec73b1c1a8..54b81879a5 100644
--- a/command/install.py
+++ b/command/install.py
@@ -48,6 +48,7 @@ class Install (Command):
                ('optimize-py', None, "compile .py to .pyo (optimized)"),
               ]
 
+
     def set_default_options (self):
 
         self.build_base = None
@@ -83,6 +84,29 @@ def set_default_options (self):
 
     def set_final_options (self):
 
+        # XXX this method is where the default installation directories
+        # for modules and extension modules are determined.  (Someday,
+        # the default installation directories for scripts,
+        # documentation, and whatever else the Distutils can build and
+        # install will also be determined here.)  Thus, this is a pretty
+        # important place to fiddle with for anyone interested in
+        # installation schemes for the Python library.  Issues that
+        # are not yet resolved to my satisfaction:
+        #   * how much platform dependence should be here, and
+        #     how much can be pushed off to sysconfig (or, better, the
+        #     Makefiles parsed by sysconfig)?
+        #   * how independent of Python version should this be -- ie.
+        #     should we have special cases to handle Python 1.5 and
+        #     older, and then do it "the right way" for 1.6?  Or should
+        #     we install a site.py along with Distutils under pre-1.6
+        #     Python to take care of the current deficiencies in
+        #     Python's library installation scheme?
+        #
+        # Currently, this method has hacks to distinguish POSIX from
+        # non-POSIX systems (for installation of site-local modules),
+        # and assumes the Python 1.5 installation tree with no site.py
+        # to fix things.
+
         # Figure out the build directories, ie. where to install from
         self.set_peer_option ('build', 'basedir', self.build_base)
         self.set_undefined_options ('build',
@@ -114,15 +138,37 @@ def set_final_options (self):
             self.install_platlib = \
                 self.replace_sys_prefix ('BINLIBDEST', ('lib','python1.5'), 1)
 
+
+        # Here is where we decide where to install most library files:
+        # on POSIX systems, they go to 'site-packages' under the
+        # install_lib (determined above -- typically
+        # /usr/local/lib/python1.x).  Unfortunately, both
+        # platform-independent (.py*) and platform-specific (.so) files
+        # go to this directory, since there is no site-packages under
+        # $exec_prefix in the usual way that Python builds sys.path.  On
+        # non-POSIX systems, the situation is even worse: everything
+        # gets dumped right into $exec_prefix, not even a lib
+        # subdirectory!  But apparently that's what needs to be done to
+        # make it work under Python 1.5 -- hope we can get this fixed
+        # for 1.6!
+
         if self.install_site_lib is None:
-            self.install_site_lib = \
-                os.path.join (self.install_lib, 'site-packages')
+            if os.name == 'posix':
+                self.install_site_lib = \
+                    os.path.join (self.install_lib, 'site-packages')
+            else:
+                self.install_site_lib = self.exec_prefix
+
         if self.install_site_platlib is None:
-            # XXX ugh! this puts platform-specific files in with shared files,
-            # with no nice way to override it! (this might be a Python
-            # problem, though, not a Distutils problem...)
-            self.install_site_platlib = \
-                os.path.join (self.install_lib, 'site-packages')
+            if os.name == 'posix':
+                # XXX ugh! this puts platform-specific files in with
+                # shared files, with no nice way to override it! (this
+                # might be a Python problem, though, not a Distutils
+                # problem...)
+                self.install_site_platlib = \
+                    os.path.join (self.install_lib, 'site-packages')
+            else:
+                self.install_site_platlib = self.exec_prefix
 
         #if self.install_scheme == 'site':
         #    install_lib = self.install_site_lib
@@ -181,6 +227,9 @@ def run (self):
 
         self.set_final_options ()
 
+        # Obviously have to build before we can install
+        self.run_peer ('build')
+
         # Install modules in two steps: "platform-shared" files (ie. pure
         # python modules) and platform-specific files (compiled C
         # extensions).

From 93d1813d1383f5f6c7cd004143fd97c8d18cbecf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Jun 1999 17:05:21 +0000
Subject: [PATCH 0025/8469] On David Ascher's recommendation: reversed order of
 'utime()' and 'chmod()' in 'copy_file()'.

---
 util.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 7aedc1c6df..9a299dfd83 100644
--- a/util.py
+++ b/util.py
@@ -198,10 +198,13 @@ def copy_file (src, dst,
     _copy_file_contents (src, dst)
     if preserve_mode or preserve_times:
         st = os.stat (src)
-        if preserve_mode:
-            os.chmod (dst, S_IMODE (st[ST_MODE]))
+
+        # According to David Ascher <da@ski.org>, utime() should be done
+        # before chmod() (at least under NT).
         if preserve_times:
             os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
+        if preserve_mode:
+            os.chmod (dst, S_IMODE (st[ST_MODE]))
 
     return 1
 

From 3cba55ebdce6957864921de0b015f6118afdf2c0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 10 Jul 1999 02:01:44 +0000
Subject: [PATCH 0026/8469] Don't pollute importer's namespace with type
 objects from types modules. Added DistutilsPlatformError.

---
 errors.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/errors.py b/errors.py
index 6605ad2cb1..f5ef385120 100644
--- a/errors.py
+++ b/errors.py
@@ -12,9 +12,9 @@
 
 __rcsid__ = "$Id$"
 
-from types import *
+import types
 
-if type (RuntimeError) is ClassType:
+if type (RuntimeError) is types.ClassType:
 
     # DistutilsError is the root of all Distutils evil.
     class DistutilsError (Exception):
@@ -52,6 +52,12 @@ class DistutilsFileError (DistutilsError):
     class DistutilsOptionError (DistutilsError):
         pass
 
+    # DistutilsPlatformError is raised when we find that we don't
+    # know how to do something on the current platform (but we do
+    # know how to do it on some platform).
+    class DistutilsPlatformError (DistutilsError):
+        pass
+
 # String-based exceptions
 else:
     DistutilsError = 'DistutilsError'
@@ -61,3 +67,6 @@ class DistutilsOptionError (DistutilsError):
     DistutilsArgError = 'DistutilsArgError'
     DistutilsFileError = 'DistutilsFileError'
     DistutilsOptionError = 'DistutilsOptionError'
+    DistutilsPlatformError = 'DistutilsPlatformError'
+
+del types

From 029a6337d35a2ddabacbf5e00a07bfb87e163fc7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 10 Jul 1999 02:02:31 +0000
Subject: [PATCH 0027/8469] Added a self-berating command relating to
 installation directories for module distributions that contain
 platform-specific files.

---
 command/install.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/command/install.py b/command/install.py
index 54b81879a5..01ea0052e6 100644
--- a/command/install.py
+++ b/command/install.py
@@ -165,6 +165,14 @@ def set_final_options (self):
                 # shared files, with no nice way to override it! (this
                 # might be a Python problem, though, not a Distutils
                 # problem...)
+
+                # NO: the way to fix this is
+                #   * any platform-dependent files in distribution?
+                #     yes: install under exec-prefix
+                #     no: install under prefix
+                # ...which will require a pretty major rethink of all
+                # this.  Damn.
+
                 self.install_site_platlib = \
                     os.path.join (self.install_lib, 'site-packages')
             else:

From 6c7798416f22b36ecf283e3f379f29173cad60c5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 10 Jul 1999 02:03:53 +0000
Subject: [PATCH 0028/8469] The abstract base class that defines the C/C++
 compiler abstraction model.

---
 ccompiler.py | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 313 insertions(+)
 create mode 100644 ccompiler.py

diff --git a/ccompiler.py b/ccompiler.py
new file mode 100644
index 0000000000..7be0ba223d
--- /dev/null
+++ b/ccompiler.py
@@ -0,0 +1,313 @@
+"""distutils.ccompiler
+
+Contains CCompiler, an abstract base class that defines the interface
+for the Distutils compiler abstraction model."""
+
+# created 1999/07/05, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import os
+from types import *
+from copy import copy
+from distutils.errors import *
+
+
+class CCompiler:
+    """Abstract base class to define the interface that must be implemented
+       by real compiler abstraction classes.  Might have some use as a
+       place for shared code, but it's not yet clear what code can be
+       shared between compiler abstraction models for different platforms.
+
+       The basic idea behind a compiler abstraction class is that each
+       instance can be used for all the compile/link steps in building
+       a single project.  Thus, attributes common to all of those compile
+       and link steps -- include directories, macros to define, libraries
+       to link against, etc. -- are attributes of the compiler instance.
+       To allow for variability in how individual files are treated,
+       most (all?) of those attributes may be varied on a per-compilation
+       or per-link basis."""
+
+
+    # XXX things not handled by this compiler abstraction model:
+    #   * client can't provide additional options for a compiler,
+    #     e.g. warning, optimization, debugging flags.  Perhaps this
+    #     should be the domain of concrete compiler abstraction classes
+    #     (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base
+    #     class should have methods for the common ones.
+    #   * can't put output files (object files, libraries, whatever)
+    #     into a separate directory from their inputs.  Should this be
+    #     handled by an 'output_dir' attribute of the whole object, or a
+    #     parameter to the compile/link_* methods, or both?
+    #   * can't completely override the include or library searchg
+    #     path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2".
+    #     I'm not sure how widely supported this is even by POSIX
+    #     compilers, much less on other platforms.  And I'm even less
+    #     sure how useful it is; probably for cross-compiling, but I
+    #     have no intention of supporting that.
+    #   * can't do really freaky things with the library list/library
+    #     dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against
+    #     different versions of libfoo.a in different locations.  I
+    #     think this is useless without the ability to null out the
+    #     library search path anyways.
+    #   * don't deal with verbose and dry-run flags -- probably a
+    #     CCompiler object should just drag them around the way the
+    #     Distribution object does (either that or we have to drag
+    #     around a Distribution object, which is what Command objects
+    #     do... but might be kind of annoying)
+    
+
+    def __init__ (self):
+
+        # 'macros': a list of macro definitions (or undefinitions).  A
+        # macro definition is a 2-tuple (name, value), where the value is
+        # either a string or None (no explicit value).  A macro
+        # undefinition is a 1-tuple (name,).
+        self.macros = []
+
+
+        # 'include_dirs': a list of directories to search for include files
+        self.include_dirs = []
+
+        # 'libraries': a list of libraries to include in any link
+        # (library names, not filenames: eg. "foo" not "libfoo.a")
+        self.libraries = []
+
+        # 'library_dirs': a list of directories to search for libraries
+        self.library_dirs = []
+
+        # 'objects': a list of object files (or similar, such as explicitly
+        # named library files) to include on any link
+        self.objects = []
+
+    # __init__ ()
+
+
+    def _find_macro (self, name):
+        i = 0
+        for defn in self.macros:
+            if defn[0] == name:
+                return i
+            i = i + 1
+
+        return None
+
+
+    def _check_macro_definitions (self, definitions):
+        """Ensures that every element of 'definitions' is a valid macro
+           definition, ie. either (name,value) 2-tuple or a (name,)
+           tuple.  Do nothing if all definitions are OK, raise 
+           TypeError otherwise."""
+
+        for defn in definitions:
+            if not (type (defn) is TupleType and
+                    (len (defn) == 1 or
+                     (len (defn) == 2 and
+                      (type (defn[1]) is StringType or defn[1] is None))) and
+                    type (defn[0]) is StringType):
+                raise TypeError, \
+                      ("invalid macro definition '%s': " % defn) + \
+                      "must be tuple (string,), (string, string), or " + \
+                      "(string, None)"
+
+
+    # -- Bookkeeping methods -------------------------------------------
+
+    def define_macro (self, name, value=None):
+        """Define a preprocessor macro for all compilations driven by
+           this compiler object.  The optional parameter 'value' should be
+           a string; if it is not supplied, then the macro will be defined
+           without an explicit value and the exact outcome depends on the
+           compiler used (XXX true? does ANSI say anything about this?)"""
+
+        # Delete from the list of macro definitions/undefinitions if
+        # already there (so that this one will take precedence).
+        i = self._find_macro (name)
+        if i is not None:
+            del self.macros[i]
+
+        defn = (name, value)
+        self.macros.append (defn)
+
+
+    def undefine_macro (self, name):
+        """Undefine a preprocessor macro for all compilations driven by
+           this compiler object.  If the same macro is defined by
+           'define_macro()' and undefined by 'undefine_macro()' the last
+           call takes precedence (including multiple redefinitions or
+           undefinitions).  If the macro is redefined/undefined on a
+           per-compilation basis (ie. in the call to 'compile()'), then
+           that takes precedence."""
+
+        # Delete from the list of macro definitions/undefinitions if
+        # already there (so that this one will take precedence).
+        i = self._find_macro (name)
+        if i is not None:
+            del self.macros[i]
+
+        undefn = (name,)
+        self.macros.append (undefn)
+
+
+    def add_include_dir (self, dir):
+        """Add 'dir' to the list of directories that will be searched
+           for header files.  The compiler is instructed to search
+           directories in the order in which they are supplied by
+           successive calls to 'add_include_dir()'."""
+        self.include_dirs.append (dir)
+
+    def set_include_dirs (self, dirs):
+        """Set the list of directories that will be searched to 'dirs'
+           (a list of strings).  Overrides any preceding calls to
+           'add_include_dir()'; subsequence calls to 'add_include_dir()'
+           add to the list passed to 'set_include_dirs()'.  This does
+           not affect any list of standard include directories that
+           the compiler may search by default."""
+        self.include_dirs = copy (dirs)
+
+
+    def add_library (self, libname):
+        """Add 'libname' to the list of libraries that will be included
+           in all links driven by this compiler object.  Note that
+           'libname' should *not* be the name of a file containing a
+           library, but the name of the library itself: the actual filename
+           will be inferred by the linker, the compiler, or the compiler
+           abstraction class (depending on the platform).
+
+           The linker will be instructed to link against libraries in the
+           order they were supplied to 'add_library()' and/or
+           'set_libraries()'.  It is perfectly valid to duplicate library
+           names; the linker will be instructed to link against libraries
+           as many times as they are mentioned."""
+        self.libraries.append (libname)
+
+    def set_libraries (self, libnames):
+        """Set the list of libraries to be included in all links driven
+           by this compiler object to 'libnames' (a list of strings).
+           This does not affect any standard system libraries that the
+           linker may include by default."""
+
+        self.libraries = copy (libnames)
+
+
+    def add_library_dir (self, dir):
+        """Add 'dir' to the list of directories that will be searched for
+           libraries specified to 'add_library()' and 'set_libraries()'.
+           The linker will be instructed to search for libraries in the
+           order they are supplied to 'add_library_dir()' and/or
+           'set_library_dirs()'."""
+        self.library_dirs.append (dir)
+
+    def set_library_dirs (self, dirs):
+        """Set the list of library search directories to 'dirs' (a list
+           of strings).  This does not affect any standard library
+           search path that the linker may search by default."""
+        self.library_dirs = copy (dirs)
+
+
+    def add_link_object (self, object):
+        """Add 'object' to the list of object files (or analogues, such
+           as explictly named library files or the output of "resource
+           compilers") to be included in every link driven by this
+           compiler object."""
+        self.objects.append (object)
+
+    def set_link_objects (self, objects):
+        """Set the list of object files (or analogues) to be included
+           in every link to 'objects'.  This does not affect any
+           standard object files that the linker may include by default
+           (such as system libraries)."""
+        self.objects = copy (objects)
+
+
+    # -- Worker methods ------------------------------------------------
+    # (must be implemented by subclasses)
+
+    def compile (self,
+                 sources,
+                 macros=None,
+                 includes=None):
+        """Compile one or more C/C++ source files.  'sources' must be
+           a list of strings, each one the name of a C/C++ source
+           file.  Return a list of the object filenames generated
+           (one for each source filename in 'sources').
+
+           'macros', if given, must be a list of macro definitions.  A
+           macro definition is either a (name, value) 2-tuple or a (name,)
+           1-tuple.  The former defines a macro; if the value is None, the
+           macro is defined without an explicit value.  The 1-tuple case
+           undefines a macro.  Later definitions/redefinitions/
+           undefinitions take precedence.
+
+           'includes', if given, must be a list of strings, the directories
+           to add to the default include file search path for this
+           compilation only."""
+        pass
+
+
+    # XXX this is kind of useless without 'link_binary()' or
+    # 'link_executable()' or something -- or maybe 'link_static_lib()'
+    # should not exist at all, and we just have 'link_binary()'?
+    def link_static_lib (self,
+                         objects,
+                         output_libname,
+                         libraries=None,
+                         library_dirs=None):
+        """Link a bunch of stuff together to create a static library
+           file.  The "bunch of stuff" consists of the list of object
+           files supplied as 'objects', the extra object files supplied
+           to 'add_link_object()' and/or 'set_link_objects()', the
+           libraries supplied to 'add_library()' and/or
+           'set_libraries()', and the libraries supplied as 'libraries'
+           (if any).
+
+           'output_libname' should be a library name, not a filename;
+           the filename will be inferred from the library name.
+
+           'library_dirs', if supplied, should be a list of additional
+           directories to search on top of the system default and those
+           supplied to 'add_library_dir()' and/or 'set_library_dirs()'."""
+
+        pass
+    
+
+    # XXX what's better/more consistent/more universally understood
+    # terminology: "shared library" or "dynamic library"?
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         libraries=None,
+                         library_dirs=None):
+        """Link a bunch of stuff together to create a shared library
+           file.  Has the same effect as 'link_static_lib()' except
+           that the filename inferred from 'output_libname' will most
+           likely be different, and the type of file generated will
+           almost certainly be different."""
+        pass
+    
+    def link_shared_object (self,
+                            objects,
+                            output_filename,
+                            libraries=None,
+                            library_dirs=None):
+        """Link a bunch of stuff together to create a shared object
+           file.  Much like 'link_shared_lib()', except the output
+           filename is explicitly supplied as 'output_filename'."""
+        pass
+
+# class CCompiler
+
+
+def new_compiler (plat=None):
+    """Generate a CCompiler instance for platform 'plat' (or the
+       current platform, if 'plat' not supplied).  Really instantiates
+       some concrete subclass of CCompiler, of course."""
+
+    if plat is None: plat = os.name
+    if plat == 'posix':
+        from unixccompiler import UnixCCompiler
+        return UnixCCompiler ()
+    else:
+        raise DistutilsPlatformError, \
+              "don't know how to compile C/C++ code on platform %s" % plat

From 49295f84d81b8262a04a374d1c1c33e8bbbff6e2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 10 Jul 1999 02:04:22 +0000
Subject: [PATCH 0029/8469] The first concrete subclass of CCompiler: defines a
 barebones Unix C compiler.

---
 unixccompiler.py | 192 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100644 unixccompiler.py

diff --git a/unixccompiler.py b/unixccompiler.py
new file mode 100644
index 0000000000..fb5ed6677c
--- /dev/null
+++ b/unixccompiler.py
@@ -0,0 +1,192 @@
+"""distutils.unixccompiler
+
+Contains the UnixCCompiler class, a subclass of CCompiler that handles
+the "typical" Unix-style command-line C compiler:
+  * macros defined with -Dname[=value]
+  * macros undefined with -Uname
+  * include search directories specified with -Idir
+  * libraries specified with -lllib
+  * library search directories specified with -Ldir
+  * compile handled by 'cc' (or similar) executable with -c option:
+    compiles .c to .o
+  * link static library handled by 'ar' command (possibly with 'ranlib')
+  * link shared library handled by 'cc -shared'
+"""
+
+# created 1999/07/05, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import string
+from types import *
+from sysconfig import \
+     CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
+from ccompiler import CCompiler
+
+
+# XXX Things not currently handled:
+#   * optimization/debug/warning flags; we just use whatever's in Python's
+#     Makefile and live with it.  Is this adequate?  If not, we might
+#     have to have a bunch of subclasses GNUCCompiler, SGICCompiler,
+#     SunCCompiler, and I suspect down that road lies madness.
+#   * even if we don't know a warning flag from an optimization flag,
+#     we need some way for outsiders to feed preprocessor/compiler/linker
+#     flags in to us -- eg. a sysadmin might want to mandate certain flags
+#     via a site config file, or a user might want to set something for
+#     compiling this module distribution only via the setup.py command
+#     line, whatever.  As long as these options come from something on the
+#     current system, they can be as system-dependent as they like, and we
+#     should just happily stuff them into the preprocessor/compiler/linker
+#     options and carry on.
+
+
+class UnixCCompiler (CCompiler):
+
+    # XXX any -I and -D options that we get from Makefile (via sysconfig)
+    # are preserved, but not treated specially: that is, they are not put
+    # in the self.include_dirs and self.macros, etc. lists that we inherit
+    # from CCompiler.  I'm not sure if this is right, wrong or indifferent,
+    # but it should probably be a documented part of the CCompiler API:
+    # ie. there are *three* kinds of include directories, those from the
+    # compiler, those from Python's Makefiles, and those supplied to
+    # {add,set}_include_dirs() -- and 'set_include_dirs()' only overrides
+    # the last kind!  I suspect the same applies to libraries and library
+    # directories -- anything else?
+
+    def __init__ (self):
+
+        CCompiler.__init__ (self)
+
+        self.preprocess_options = None
+        self.compile_options = None
+
+        # munge CC and OPT together in case there are flags stuck in CC
+        (self.cc, self.ccflags) = \
+            _split_command (CC + ' ' + OPT)
+        self.ccflags_shared = string.split (CCSHARED)
+
+        (self.ld_shared, self.ldflags_shared) = \
+            _split_command (LDSHARED)
+
+
+    def compile (self,
+                 sources,
+                 macros=[],
+                 includes=[]):
+
+        if type (macros) is not ListType:
+            raise TypeError, \
+                  "'macros' (if supplied) must be a list of tuples"
+        if type (includes) is not ListType:
+            raise TypeError, \
+                  "'includes' (if supplied) must be a list of strings"
+
+        pp_opts = _gen_preprocess_options (self.macros + macros,
+                                           self.include_dirs + includes)
+
+        # use of ccflags_shared means we're blithely assuming that we're
+        # compiling for inclusion in a shared object! (will have to fix
+        # this when I add the ability to build a new Python)
+        cc_args = ['-c'] + pp_opts + \
+                  self.ccflags + self.ccflags_shared + \
+                  sources
+
+        # this will change to 'spawn' when I have it!
+        print string.join ([self.cc] + cc_args, ' ')
+
+
+    # XXX punting on 'link_static_lib()' for now -- it might be better for
+    # CCompiler to mandate just 'link_binary()' or some such to build a new
+    # Python binary; it would then take care of linking in everything
+    # needed for the new Python without messing with an intermediate static
+    # library.
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         libraries=None,
+                         library_dirs=None):
+        # XXX should we sanity check the library name? (eg. no
+        # slashes)
+        self.link_shared_object (objects, "lib%s%s" % (output_libname, SO))
+
+
+    def link_shared_object (self,
+                            objects,
+                            output_filename,
+                            libraries=[],
+                            library_dirs=[]):
+
+        lib_opts = _gen_lib_options (self.libraries + libraries,
+                                     self.library_dirs + library_dirs)
+        ld_args = self.ldflags_shared + lib_opts + \
+                  objects + ['-o', output_filename]
+
+        print string.join ([self.ld_shared] + ld_args, ' ')
+        
+                                        
+# class UnixCCompiler
+
+
+def _split_command (cmd):
+    """Split a command string up into the progam to run (a string) and
+       the list of arguments; return them as (cmd, arglist)."""
+    args = string.split (cmd)
+    return (args[0], args[1:])
+
+
+def _gen_preprocess_options (macros, includes):
+
+    # XXX it would be nice (mainly aesthetic, and so we don't generate
+    # stupid-looking command lines) to go over 'macros' and eliminate
+    # redundant definitions/undefinitions (ie. ensure that only the
+    # latest mention of a particular macro winds up on the command
+    # line).  I don't think it's essential, though, since most (all?)
+    # Unix C compilers only pay attention to the latest -D or -U
+    # mention of a macro on their command line.  Similar situation for
+    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
+    # redundancies like this should probably be the province of
+    # CCompiler, since the data structures used are inherited from it
+    # and therefore common to all CCompiler classes.
+
+
+    pp_opts = []
+    for macro in macros:
+        if len (macro) == 1:        # undefine this macro
+            pp_opts.append ("-U%s" % macro[0])
+        elif len (macro) == 2:
+            if macro[1] is None:    # define with no explicit value
+                pp_opts.append ("-D%s" % macro[0])
+            else:
+                # XXX *don't* need to be clever about quoting the
+                # macro value here, because we're going to avoid the
+                # shell at all costs when we spawn the command!
+                pp_opts.append ("-D%s=%s" % macro)
+
+    for dir in includes:
+        pp_opts.append ("-I%s" % dir)
+
+    return pp_opts
+
+# _gen_preprocess_options ()
+
+
+def _gen_lib_options (libraries, library_dirs):
+
+    lib_opts = []
+
+    for dir in library_dirs:
+        lib_opts.append ("-L%s" % dir)
+
+    # XXX it's important that we *not* remove redundant library mentions!
+    # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
+    # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
+    # -lbar" to get things to work -- that's certainly a possibility, but a
+    # pretty nasty way to arrange your C code.
+
+    for lib in libraries:
+        lib_opts.append ("-l%s" % lib)
+
+    return lib_opts
+
+# _gen_lib_options ()

From 8c9d03208b4de8de842b039922fad2373ea6bf0f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 10 Aug 1999 20:09:38 +0000
Subject: [PATCH 0030/8469] Allow comment characters (#) to be escaped:   - did
 away with 'comment_re' option -- it's just not that simple anymore   -
 heavily revised the main logic in 'readline()' to accomodate this Beefed up
 'warn()': 'line' can be list or tuple, and 'msg' is   automatically converted
 to a string.

---
 text_file.py | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/text_file.py b/text_file.py
index a27df06d45..2e034301c5 100644
--- a/text_file.py
+++ b/text_file.py
@@ -15,7 +15,6 @@
 class TextFile:
 
     default_options = { 'strip_comments': 1,
-                        'comment_re':     re.compile (r'\s*#.*'),
                         'skip_blanks':    1,
                         'join_lines':     0,
                         'lstrip_ws':      0,
@@ -33,10 +32,7 @@ def __init__ (self, filename=None, file=None, **options):
         # or fallback to default_options
         for opt in self.default_options.keys():
             if options.has_key (opt):
-                if opt == 'comment_re' and type (options[opt]) is StringType:
-                    self.comment_re = re.compile (options[opt])
-                else:
-                    setattr (self, opt, options[opt])
+                setattr (self, opt, options[opt])
 
             else:
                 setattr (self, opt, self.default_options[opt])
@@ -76,11 +72,11 @@ def warn (self, msg, line=None):
         if line is None:
             line = self.current_line
         sys.stderr.write (self.filename + ", ")
-        if type (line) is ListType:
+        if type (line) in (ListType, TupleType):
             sys.stderr.write ("lines %d-%d: " % tuple (line))
         else:
             sys.stderr.write ("line %d: " % line)
-        sys.stderr.write (msg + "\n")
+        sys.stderr.write (str (msg) + "\n")
 
 
     def readline (self):
@@ -97,15 +93,42 @@ def readline (self):
         buildup_line = ''
 
         while 1:
-            # read the line, optionally strip comments
+            # read the line, make it None if EOF
             line = self.file.readline()
+            if line == '': line = None
+
             if self.strip_comments and line:
-                line = self.comment_re.sub ('', line)
+
+                # Look for the first "#" in the line.  If none, never
+                # mind.  If we find one and it's the first character, or
+                # is not preceded by "\", then it starts a comment --
+                # strip the comment, strip whitespace before it, and
+                # carry on.  Otherwise, it's just an escaped "#", so
+                # unescape it (and any other escaped "#"'s that might be
+                # lurking in there) and otherwise leave the line alone.
+
+                pos = string.find (line, "#")
+                if pos == -1:           # no "#" -- no comments
+                    pass
+                elif pos == 0 or line[pos-1] != "\\": # it's a comment
+                    # Have to preserve the trailing newline; if
+                    # stripping comments resulted in an empty line, we'd
+                    # have no way to distinguish end-of-file! (NB. this
+                    # means that if the final line is all comment and
+                    # has to trailing newline, we will think that it's
+                    # EOF; I think that's OK.)
+                    has_newline = (line[-1] == '\n')
+                    line = line[0:pos]
+                    if has_newline: line = line + '\n'
+                    
+                else:                   # it's an escaped "#"
+                    line = string.replace (line, "\\#", "#")
+                
 
             # did previous line end with a backslash? then accumulate
             if self.join_lines and buildup_line:
                 # oops: end of file
-                if not line:
+                if line is None:
                     self.warn ("continuation line immediately precedes "
                                "end-of-file")
                     return buildup_line
@@ -119,7 +142,7 @@ def readline (self):
                     self.current_line = [self.current_line, self.current_line+1]
             # just an ordinary line, read it as usual
             else:
-                if not line:
+                if line is None:        # eof
                     return None
 
                 # still have to be careful about incrementing the line number!
@@ -217,15 +240,15 @@ def test_input (count, description, file, expected_result):
     out_file.close ()
 
     in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                   lstrip_ws=0, rstrip_ws=0)
+                        lstrip_ws=0, rstrip_ws=0)
     test_input (1, "no processing", in_file, result1)
 
     in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                   lstrip_ws=0, rstrip_ws=0)
+                        lstrip_ws=0, rstrip_ws=0)
     test_input (2, "strip comments", in_file, result2)
 
     in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                   lstrip_ws=0, rstrip_ws=0)
+                        lstrip_ws=0, rstrip_ws=0)
     test_input (3, "strip blanks", in_file, result3)
 
     in_file = TextFile (filename)

From 6c5612c1cbdcc3fe4762d0ef80948a37a7cbdc3b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:43:45 +0000
Subject: [PATCH 0031/8469] Added DistutilsExecError, DistutilsValueError.

---
 errors.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/errors.py b/errors.py
index f5ef385120..17d1abc796 100644
--- a/errors.py
+++ b/errors.py
@@ -52,12 +52,22 @@ class DistutilsFileError (DistutilsError):
     class DistutilsOptionError (DistutilsError):
         pass
 
+    # DistutilsValueError is raised anytime an option value (presumably
+    # provided by setup.py) is invalid.
+    class DistutilsValueError (DistutilsError):
+        pass
+
     # DistutilsPlatformError is raised when we find that we don't
     # know how to do something on the current platform (but we do
     # know how to do it on some platform).
     class DistutilsPlatformError (DistutilsError):
         pass
 
+    # DistutilsExecError is raised if there are any problems executing
+    # an external program
+    class DistutilsExecError (DistutilsError):
+        pass
+
 # String-based exceptions
 else:
     DistutilsError = 'DistutilsError'
@@ -67,6 +77,8 @@ class DistutilsPlatformError (DistutilsError):
     DistutilsArgError = 'DistutilsArgError'
     DistutilsFileError = 'DistutilsFileError'
     DistutilsOptionError = 'DistutilsOptionError'
+    DistutilsValueError = 'DistutilsValueError'
     DistutilsPlatformError = 'DistutilsPlatformError'
-
+    DistutilsExecError = 'DistutilsExecError'
+    
 del types

From 08b303ebb482dc760d1f7b793ad61475885b98bc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:44:37 +0000
Subject: [PATCH 0032/8469] Better detection of bad entries in option table.
 Better error messages for bad entries in option table.

---
 fancy_getopt.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index c63ce61b8e..125dceb3e1 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -47,16 +47,24 @@ def fancy_getopt (options, object, args):
     attr_name = {}
     takes_arg = {}
 
-    for (long, short, help) in options:
+    for option in options:
+        try:
+            (long, short, help) = option
+        except ValueError:
+            raise DistutilsGetoptError, \
+                  "invalid option tuple " + str (option)
+
         # Type-check the option names
         if type (long) is not StringType or len (long) < 2:
             raise DistutilsGetoptError, \
-                  "long option must be a string of length >= 2"
+                  "long option '%s' must be a string of length >= 2" % \
+                  long
 
         if (not ((short is None) or
                  (type (short) is StringType and len (short) == 1))):
             raise DistutilsGetoptError, \
-                  "short option must be None or string of length 1"
+                  "short option '%s' must be None or string of length 1" % \
+                  short
 
         long_opts.append (long)
 

From d1423866abe4c8a4416b514ca8c9f06f9283dcd7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:47:21 +0000
Subject: [PATCH 0033/8469] Comment tweak.

---
 core.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core.py b/core.py
index 8a6cf72037..a9c573258a 100644
--- a/core.py
+++ b/core.py
@@ -166,11 +166,11 @@ def __init__ (self, attrs=None):
         # cheap to "run" a command whenever we think we might need to -- if
         # it's already been done, no need for expensive filesystem
         # operations, we just check the 'have_run' dictionary and carry on.
-        # It's only safe to query 'have_run' for a command class
-        # that has been instantiated -- a false value will be put inserted
-        # when the command object is created, and replaced with a true
-        # value when the command is succesfully run.  Thus it's
-        # probably best to use '.get()' rather than a straight lookup.
+        # It's only safe to query 'have_run' for a command class that has
+        # been instantiated -- a false value will be inserted when the
+        # command object is created, and replaced with a true value when
+        # the command is succesfully run.  Thus it's probably best to use
+        # '.get()' rather than a straight lookup.
         self.have_run = {}
 
     # __init__ ()

From 5cf06667069e8044604eaa23c4d78bd61a31de74 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:50:50 +0000
Subject: [PATCH 0034/8469] Added 'verbose' and 'dry_run' flags to CCompiler
 constructor and   'new_compiler()' factory function. Added
 'runtime_library_dirs' list (for -R linker option) and methods   to
 manipulate it. Deleted some obsolete comments. Added all the filename
 manglign methods: 'object_filenames()',   'shared_object_filename()',
 'library_filename()',   'shared_library_filename()'. Added 'spawn()' method
 (front end to the "real" spawn).

---
 ccompiler.py | 79 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 64 insertions(+), 15 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 7be0ba223d..d5519cab1c 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -11,6 +11,7 @@
 from types import *
 from copy import copy
 from distutils.errors import *
+from distutils.spawn import spawn
 
 
 class CCompiler:
@@ -41,23 +42,25 @@ class CCompiler:
     #     parameter to the compile/link_* methods, or both?
     #   * can't completely override the include or library searchg
     #     path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2".
-    #     I'm not sure how widely supported this is even by POSIX
+    #     I'm not sure how widely supported this is even by Unix
     #     compilers, much less on other platforms.  And I'm even less
-    #     sure how useful it is; probably for cross-compiling, but I
-    #     have no intention of supporting that.
+    #     sure how useful it is; maybe for cross-compiling, but
+    #     support for that is a ways off.  (And anyways, cross
+    #     compilers probably have a dedicated binary with the
+    #     right paths compiled in.  I hope.)
     #   * can't do really freaky things with the library list/library
     #     dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against
     #     different versions of libfoo.a in different locations.  I
     #     think this is useless without the ability to null out the
     #     library search path anyways.
-    #   * don't deal with verbose and dry-run flags -- probably a
-    #     CCompiler object should just drag them around the way the
-    #     Distribution object does (either that or we have to drag
-    #     around a Distribution object, which is what Command objects
-    #     do... but might be kind of annoying)
     
 
-    def __init__ (self):
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0):
+
+        self.verbose = verbose
+        self.dry_run = dry_run
 
         # 'macros': a list of macro definitions (or undefinitions).  A
         # macro definition is a 2-tuple (name, value), where the value is
@@ -65,7 +68,6 @@ def __init__ (self):
         # undefinition is a 1-tuple (name,).
         self.macros = []
 
-
         # 'include_dirs': a list of directories to search for include files
         self.include_dirs = []
 
@@ -76,6 +78,10 @@ def __init__ (self):
         # 'library_dirs': a list of directories to search for libraries
         self.library_dirs = []
 
+        # 'runtime_library_dirs': a list of directories to search for
+        # shared libraries/objects at runtime
+        self.runtime_library_dirs = []
+
         # 'objects': a list of object files (or similar, such as explicitly
         # named library files) to include on any link
         self.objects = []
@@ -205,6 +211,19 @@ def set_library_dirs (self, dirs):
         self.library_dirs = copy (dirs)
 
 
+    def add_runtime_library_dir (self, dir):
+        """Add 'dir' to the list of directories that will be searched for
+           shared libraries at runtime."""
+        self.runtime_library_dirs.append (dir)
+
+    def set_runtime_library_dirs (self, dirs):
+        """Set the list of directories to search for shared libraries
+           at runtime to 'dirs' (a list of strings).  This does not affect
+           any standard search path that the runtime linker may search by
+           default."""
+        self.runtime_library_dirs = copy (dirs)
+
+
     def add_link_object (self, object):
         """Add 'object' to the list of object files (or analogues, such
            as explictly named library files or the output of "resource
@@ -271,9 +290,6 @@ def link_static_lib (self,
         pass
     
 
-    # XXX what's better/more consistent/more universally understood
-    # terminology: "shared library" or "dynamic library"?
-
     def link_shared_lib (self,
                          objects,
                          output_libname,
@@ -296,10 +312,43 @@ def link_shared_object (self,
            filename is explicitly supplied as 'output_filename'."""
         pass
 
+
+    # -- Filename mangling methods -------------------------------------
+
+    def object_filenames (source_filenames):
+        """Return the list of object filenames corresponding to each
+           specified source filename."""
+        pass
+
+    def shared_object_filename (source_filename):
+        """Return the shared object filename corresponding to a
+           specified source filename."""
+        pass    
+
+    def library_filename (libname):
+        """Return the static library filename corresponding to the
+           specified library name."""
+        
+        pass
+
+    def shared_library_filename (libname):
+        """Return the shared library filename corresponding to the
+           specified library name."""
+        pass
+
+
+    # -- Utility methods -----------------------------------------------
+
+    def spawn (self, cmd):
+        spawn (cmd, verbose=self.verbose, dry_run=self.dry_run)
+
+
 # class CCompiler
 
 
-def new_compiler (plat=None):
+def new_compiler (plat=None,
+                  verbose=0,
+                  dry_run=0):
     """Generate a CCompiler instance for platform 'plat' (or the
        current platform, if 'plat' not supplied).  Really instantiates
        some concrete subclass of CCompiler, of course."""
@@ -307,7 +356,7 @@ def new_compiler (plat=None):
     if plat is None: plat = os.name
     if plat == 'posix':
         from unixccompiler import UnixCCompiler
-        return UnixCCompiler ()
+        return UnixCCompiler (verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to compile C/C++ code on platform %s" % plat

From 570f701e1116a7f768361b28323f16def9c3da31 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:53:53 +0000
Subject: [PATCH 0035/8469] Changed to use 'spawn()', now that it exists. Added
 'verbose' and 'dry_run' parameters to constructor. Changed 'compile()',
 'link_*()' to default lists arguments to None   rather than empty list. Added
 implementations of the filename-mangling methods mandated by   the CCompiler
 interface.

---
 unixccompiler.py | 86 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 24 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index fb5ed6677c..c8468f965a 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,7 +17,7 @@
 
 __rcsid__ = "$Id$"
 
-import string
+import string, re
 from types import *
 from sysconfig import \
      CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
@@ -42,25 +42,35 @@
 
 class UnixCCompiler (CCompiler):
 
-    # XXX any -I and -D options that we get from Makefile (via sysconfig)
-    # are preserved, but not treated specially: that is, they are not put
-    # in the self.include_dirs and self.macros, etc. lists that we inherit
-    # from CCompiler.  I'm not sure if this is right, wrong or indifferent,
-    # but it should probably be a documented part of the CCompiler API:
-    # ie. there are *three* kinds of include directories, those from the
-    # compiler, those from Python's Makefiles, and those supplied to
-    # {add,set}_include_dirs() -- and 'set_include_dirs()' only overrides
-    # the last kind!  I suspect the same applies to libraries and library
-    # directories -- anything else?
-
-    def __init__ (self):
-
-        CCompiler.__init__ (self)
+    # XXX perhaps there should really be *three* kinds of include
+    # directories: those built in to the preprocessor, those from Python's
+    # Makefiles, and those supplied to {add,set}_include_dirs().  Currently
+    # we make no distinction between the latter two at this point; it's all
+    # up to the client class to select the include directories to use above
+    # and beyond the compiler's defaults.  That is, both the Python include
+    # directories and any module- or package-specific include directories
+    # are specified via {add,set}_include_dirs(), and there's no way to
+    # distinguish them.  This might be a bug.
+    
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0):
+
+        CCompiler.__init__ (self, verbose, dry_run)
 
         self.preprocess_options = None
         self.compile_options = None
 
-        # munge CC and OPT together in case there are flags stuck in CC
+        # Munge CC and OPT together in case there are flags stuck in CC.
+        # Note that using these variables from sysconfig immediately makes
+        # this module specific to building Python extensions and
+        # inappropriate as a general-purpose C compiler front-end.  So sue
+        # me.  Note also that we use OPT rather than CFLAGS, because CFLAGS
+        # is the flags used to compile Python itself -- not only are there
+        # -I options in there, they are the *wrong* -I options.  We'll
+        # leave selection of include directories up to the class using
+        # UnixCCompiler!
+
         (self.cc, self.ccflags) = \
             _split_command (CC + ' ' + OPT)
         self.ccflags_shared = string.split (CCSHARED)
@@ -71,8 +81,13 @@ def __init__ (self):
 
     def compile (self,
                  sources,
-                 macros=[],
-                 includes=[]):
+                 macros=None,
+                 includes=None):
+
+        if macros is None:
+            macros = []
+        if includes is None:
+            includes = []
 
         if type (macros) is not ListType:
             raise TypeError, \
@@ -92,7 +107,8 @@ def compile (self,
                   sources
 
         # this will change to 'spawn' when I have it!
-        print string.join ([self.cc] + cc_args, ' ')
+        #print string.join ([self.cc] + cc_args, ' ')
+        self.spawn ([self.cc] + cc_args)
 
 
     # XXX punting on 'link_static_lib()' for now -- it might be better for
@@ -114,17 +130,39 @@ def link_shared_lib (self,
     def link_shared_object (self,
                             objects,
                             output_filename,
-                            libraries=[],
-                            library_dirs=[]):
+                            libraries=None,
+                            library_dirs=None):
+
+        if libraries is None:
+            libraries = []
+        if library_dirs is None:
+            library_dirs = []
 
         lib_opts = _gen_lib_options (self.libraries + libraries,
                                      self.library_dirs + library_dirs)
         ld_args = self.ldflags_shared + lib_opts + \
                   objects + ['-o', output_filename]
 
-        print string.join ([self.ld_shared] + ld_args, ' ')
-        
-                                        
+        #print string.join ([self.ld_shared] + ld_args, ' ')
+        self.spawn ([self.ld_shared] + ld_args)
+
+
+    def object_filenames (self, source_filenames):
+        outnames = []
+        for inname in source_filenames:
+            outnames.append (re.sub (r'\.(c|C|cc|cxx)$', '.o', inname))
+        return outnames
+
+    def shared_object_filename (self, source_filename):
+        return re.sub (r'\.(c|C|cc|cxx)$', SO)
+
+    def library_filename (self, libname):
+        return "lib%s.a" % libname
+
+    def shared_library_filename (self, libname):
+        return "lib%s.so" % libname
+
+
 # class UnixCCompiler
 
 

From e78649a4e18096a1722b66030a160e4f8b90431f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:57:17 +0000
Subject: [PATCH 0036/8469] Module to spawn sub-commands in a
 platform-independent way. Initial revision only includes support for
 POSIX-style fork-and-exec.

---
 spawn.py | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 spawn.py

diff --git a/spawn.py b/spawn.py
new file mode 100644
index 0000000000..24e76ef10e
--- /dev/null
+++ b/spawn.py
@@ -0,0 +1,106 @@
+"""distutils.spawn
+
+Provides the 'spawn()' function, a front-end to various platform-
+specific functions for launching another program in a sub-process."""
+
+# created 1999/07/24, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys, os, string
+from distutils.errors import *
+
+
+def spawn (cmd,
+           search_path=1,
+           verbose=0,
+           dry_run=0):
+
+    """Run another program, specified as a command list 'cmd', in a new
+       process.  'cmd' is just the argument list for the new process, ie.
+       cmd[0] is the program to run and cmd[1:] are the rest of its
+       arguments.  There is no way to run a program with a name different
+       from that of its executable.
+
+       If 'search_path' is true (the default), the system's executable
+       search path will be used to find the program; otherwise, cmd[0] must
+       be the exact path to the executable.  If 'verbose' is true, a
+       one-line summary of the command will be printed before it is run.
+       If 'dry_run' is true, the command will not actually be run.
+
+       Raise DistutilsExecError if running the program fails in any way;
+       just return on success."""
+
+    if os.name == 'posix':
+        _spawn_posix (cmd, search_path, verbose, dry_run)
+    elif os.name == 'windows':          # ???
+        # XXX should 'args' be cmd[1:] or cmd?
+        # XXX how do we detect failure?
+        # XXX how to do this in pre-1.5.2?
+        # XXX is P_WAIT the correct mode?
+        # XXX how to make Windows search the path?
+        if verbose:
+            print string.join (cmd, ' ')
+        if not dry_run:
+            os.spawnv (os.P_WAIT, cmd[0], cmd[1:])
+    else:
+        raise DistutilsPlatformError, \
+              "don't know how to spawn programs on platform '%s'" % os.name
+
+# spawn ()
+
+
+def _spawn_posix (cmd,
+                  search_path=1,
+                  verbose=0,
+                  dry_run=0):
+
+    if verbose:
+        print string.join (cmd, ' ')
+    if dry_run:
+        return
+    exec_fn = search_path and os.execvp or os.execv
+
+    pid = os.fork ()
+
+    if pid == 0:                        # in the child
+        try:
+            #print "cmd[0] =", cmd[0]
+            #print "cmd =", cmd
+            exec_fn (cmd[0], cmd)
+        except OSError, e:
+            sys.stderr.write ("unable to execute %s: %s\n" %
+                              (cmd[0], e.strerror))
+            os._exit (1)
+            
+        sys.stderr.write ("unable to execute %s for unknown reasons" % cmd[0])
+        os._exit (1)
+
+    
+    else:                               # in the parent
+        # Loop until the child either exits or is terminated by a signal
+        # (ie. keep waiting if it's merely stopped)
+        while 1:
+            (pid, status) = os.waitpid (pid, 0)
+            if os.WIFSIGNALED (status):
+                raise DistutilsExecError, \
+                      "command %s terminated by signal %d" % \
+                      (cmd[0], os.WTERMSIG (status))
+
+            elif os.WIFEXITED (status):
+                exit_status = os.WEXITSTATUS (status)
+                if exit_status == 0:
+                    return              # hey, it succeeded!
+                else:
+                    raise DistutilsExecError, \
+                          "command %s failed with exit status %d" % \
+                          (cmd[0], exit_status)
+        
+            elif os.WIFSTOPPED (status):
+                continue
+
+            else:
+                raise DistutilsExecError, \
+                      "unknown error executing %s: termination status %d" % \
+                      (cmd[0], status)
+# _spawn_posix ()

From d8eaecdab17b05bfe965bac07a69b59edba79799 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Aug 1999 23:57:49 +0000
Subject: [PATCH 0037/8469] Implements the 'build_ext' command for building
 C/C++ extension modules.

---
 command/build_ext.py | 192 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100644 command/build_ext.py

diff --git a/command/build_ext.py b/command/build_ext.py
new file mode 100644
index 0000000000..cb9da68dd9
--- /dev/null
+++ b/command/build_ext.py
@@ -0,0 +1,192 @@
+"""distutils.command.build_ext
+
+Implements the Distutils 'build_ext' command, for building extension
+modules (currently limited to C extensions, should accomodate C++
+extensions ASAP)."""
+
+# created 1999/08/09, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys, os, string, re
+from types import *
+from distutils.core import Command
+from distutils.ccompiler import new_compiler
+from distutils.sysconfig import INCLUDEPY, SO, exec_prefix
+from distutils.errors import *
+
+
+# This is the same as a Python NAME, since we must accept any
+# valid module name for the extension name.
+extension_name_re = re.compile (r'^[a-zA-Z_][a-zA-Z_0-9]*$')
+
+
+class BuildExt (Command):
+    
+    # XXX thoughts on how to deal with complex command-line options like
+    # these, i.e. how to make it so fancy_getopt can suck them off the
+    # command line and make it look like setup.py defined the appropriate
+    # lists of tuples of what-have-you.
+    #   - each command needs a callback to process its command-line options
+    #   - Command.__init__() needs access to its share of the whole
+    #     command line (must ultimately come from
+    #     Distribution.parse_command_line())
+    #   - it then calls the current command class' option-parsing
+    #     callback to deal with weird options like -D, which have to
+    #     parse the option text and churn out some custom data
+    #     structure
+    #   - that data structure (in this case, a list of 2-tuples)
+    #     will then be present in the command object by the time
+    #     we get to set_final_options() (i.e. the constructor
+    #     takes care of both command-line and client options
+    #     in between set_default_options() and set_final_options())
+
+    options = [('dir=', 'd',
+                "directory for compiled extension modules"),
+               ('include-dirs=', 'I',
+                "list of directories to search for header files"),
+               ('define=', 'D',
+                "C preprocessor macros to define"),
+               ('undef=', 'U',
+                "C preprocessor macros to undefine"),
+               ('libs=', 'l',
+                "external C libraries to link with"),
+               ('library-dirs=', 'L',
+                "directories to search for external C libraries"),
+               ('rpath=', 'R',
+                "directories to search for shared C libraries at runtime"),
+               ('link-objects=', 'O',
+                "extra explicit link objects to include in the link"),
+              ]
+
+
+    def set_default_options (self):
+        self.dir = None
+        self.include_dirs = None
+        self.define = None
+        self.undef = None
+        self.libs = None
+        self.library_dirs = None
+        self.rpath = None
+        self.link_objects = None
+
+    def set_final_options (self):
+        self.set_undefined_options ('build', ('platdir', 'dir'))
+
+        # Make sure Python's include directories (for Python.h, config.h,
+        # etc.) are in the include search path.  We have to roll our own
+        # "exec include dir", because the Makefile parsed by sysconfig
+        # doesn't have it (sigh).
+        py_include = INCLUDEPY         # prefix + "include" + "python" + ver
+        exec_py_include = os.path.join (exec_prefix, 'include',
+                                        'python' + sys.version[0:3])
+        if self.include_dirs is None:
+            self.include_dirs = []
+        self.include_dirs.insert (0, py_include)
+        if exec_py_include != py_include:
+            self.include_dirs.insert (0, exec_py_include)
+
+
+    def run (self):
+
+        self.set_final_options ()
+        (extensions, package) = \
+            self.distribution.get_options ('ext_modules', 'package')
+
+        # 'extensions', as supplied by setup.py, is a list of 2-tuples.
+        # Each tuple is simple:
+        #    (ext_name, build_info)
+        # build_info is a dictionary containing everything specific to
+        # building this extension.  (Info pertaining to all extensions
+        # should be handled by general distutils options passed from
+        # setup.py down to right here, but that's not taken care of yet.)
+
+
+        # First, sanity-check the 'extensions' list
+        self.check_extensions_list (extensions)
+
+        # Setup the CCompiler object that we'll use to do all the
+        # compiling and linking
+        self.compiler = new_compiler (verbose=self.distribution.verbose,
+                                      dry_run=self.distribution.dry_run)
+        if self.include_dirs is not None:
+            self.compiler.set_include_dirs (self.include_dirs)
+        if self.define is not None:
+            # 'define' option is a list of (name,value) tuples
+            for (name,value) in self.define:
+                self.compiler.define_macro (name, value)
+        if self.undef is not None:
+            for macro in self.undef:
+                self.compiler.undefine_macro (macro)
+        if self.libs is not None:
+            self.compiler.set_libraries (self.libs)
+        if self.library_dirs is not None:
+            self.compiler.set_library_dirs (self.library_dirs)
+        if self.rpath is not None:
+            self.compiler.set_runtime_library_dirs (self.rpath)
+        if self.link_objects is not None:
+            self.compiler.set_link_objects (self.link_objects)
+                                      
+        # Now the real loop over extensions
+        self.build_extensions (extensions)
+
+            
+
+    def check_extensions_list (self, extensions):
+
+        if type (extensions) is not ListType:
+            raise DistutilsValueError, \
+                  "'ext_modules' option must be a list of tuples"
+        
+        for ext in extensions:
+            if type (ext) is not TupleType and len (ext) != 2:
+                raise DistutilsValueError, \
+                      "each element of 'ext_modules' option must be a 2-tuple"
+
+            if not (type (ext[0]) is StringType and
+                    extension_name_re.match (ext[0])):
+                raise DistutilsValueError, \
+                      "first element of each tuple in 'ext_modules' " + \
+                      "must be the extension name (a string)"
+
+            if type (ext[1]) is not DictionaryType:
+                raise DistutilsValueError, \
+                      "second element of each tuple in 'ext_modules' " + \
+                      "must be a dictionary"
+
+        # end sanity-check for
+
+    # check_extensions_list ()
+
+
+    def build_extensions (self, extensions):
+
+        for (extension_name, build_info) in extensions:
+            sources = build_info.get ('sources')
+            if sources is None or type (sources) is not ListType:
+                raise DistutilsValueError, \
+                      "in ext_modules option, 'sources' must be present " + \
+                      "and must be a list of source filenames"
+            
+            macros = build_info.get ('macros')
+            include_dirs = build_info.get ('include_dirs')
+            self.compiler.compile (sources, macros, include_dirs)
+
+            objects = self.compiler.object_filenames (sources)
+            extra_objects = build_info.get ('extra_objects')
+            if extra_objects:
+                objects.extend (extra_objects)
+            libraries = build_info.get ('libraries')
+            library_dirs = build_info.get ('library_dirs')
+
+            ext_filename = self.extension_filename (extension_name)
+            self.compiler.link_shared_object (objects, ext_filename,
+                                              libraries, library_dirs)
+
+    # build_extensions ()
+
+
+    def extension_filename (self, ext_name):
+        return ext_name + SO
+
+# class BuildExt

From e168908a1284d0f1bccbdaa6b34ef9ee56be675f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 19 Aug 1999 20:02:10 +0000
Subject: [PATCH 0038/8469] Oops, call 'os.path.join()'!

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 01ea0052e6..cf45004f07 100644
--- a/command/install.py
+++ b/command/install.py
@@ -226,7 +226,7 @@ def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
             # Otherwise, just tack the "fallback postfix" onto the
             # user-specified prefix.
 
-            return apply (os.join, (my_prefix,) + fallback_postfix)
+            return apply (os.path.join, (my_prefix,) + fallback_postfix)
 
     # replace_sys_prefix ()
     

From 6ad6cbda7915f2134e949639fa5deec460b2338f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:15:07 +0000
Subject: [PATCH 0039/8469] Added msvccompiler module exactly as supplied by
 Perry Stoll.

---
 msvccompiler.py | 317 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 317 insertions(+)
 create mode 100644 msvccompiler.py

diff --git a/msvccompiler.py b/msvccompiler.py
new file mode 100644
index 0000000000..ff66f913be
--- /dev/null
+++ b/msvccompiler.py
@@ -0,0 +1,317 @@
+"""distutils.ccompiler
+
+Contains MSVCCompiler, an implementation of the abstract CCompiler class
+for the Microsoft Visual Studio """
+
+
+# created 1999/08/19, Perry Stoll
+# 
+__rcsid__ = "$Id$"
+
+import os
+import sys
+from distutils.errors import *
+from distutils.ccompiler import CCompiler
+
+
+class MSVCCompiler ( CCompiler) :
+    """Abstract base class to define the interface that must be implemented
+       by real compiler abstraction classes.  Might have some use as a
+       place for shared code, but it's not yet clear what code can be
+       shared between compiler abstraction models for different platforms.
+
+       The basic idea behind a compiler abstraction class is that each
+       instance can be used for all the compile/link steps in building
+       a single project.  Thus, attributes common to all of those compile
+       and link steps -- include directories, macros to define, libraries
+       to link against, etc. -- are attributes of the compiler instance.
+       To allow for variability in how individual files are treated,
+       most (all?) of those attributes may be varied on a per-compilation
+       or per-link basis."""
+
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0):
+
+        CCompiler.__init__ (self, verbose, dry_run)
+
+        
+        # XXX This is a nasty dependency to add on something otherwise
+        #       pretty clean.  move it to build_ext under an nt
+        #       specific part.
+        #       shared libraries need to link against python15.lib
+        self.add_library ( "python" + sys.version[0] + sys.version[2] )
+        self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
+        
+        self.cc   = "cl.exe"
+        self.link = "link.exe"
+        self.preprocess_options = None
+        self.compile_options = [ '/nologo' ]
+
+        self.ldflags_shared = ['/DLL', '/nologo']
+        self.ldflags_static = [ '/nologo']
+
+    # XXX things not handled by this compiler abstraction model:
+    #   * client can't provide additional options for a compiler,
+    #     e.g. warning, optimization, debugging flags.  Perhaps this
+    #     should be the domain of concrete compiler abstraction classes
+    #     (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base
+    #     class should have methods for the common ones.
+    #   * can't put output files (object files, libraries, whatever)
+    #     into a separate directory from their inputs.  Should this be
+    #     handled by an 'output_dir' attribute of the whole object, or a
+    #     parameter to the compile/link_* methods, or both?
+    #   * can't completely override the include or library searchg
+    #     path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2".
+    #     I'm not sure how widely supported this is even by Unix
+    #     compilers, much less on other platforms.  And I'm even less
+    #     sure how useful it is; maybe for cross-compiling, but
+    #     support for that is a ways off.  (And anyways, cross
+    #     compilers probably have a dedicated binary with the
+    #     right paths compiled in.  I hope.)
+    #   * can't do really freaky things with the library list/library
+    #     dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against
+    #     different versions of libfoo.a in different locations.  I
+    #     think this is useless without the ability to null out the
+    #     library search path anyways.
+    
+
+    # -- Worker methods ------------------------------------------------
+    # (must be implemented by subclasses)
+
+    _c_extensions = [ '.c' ]
+    _cpp_extensions = [ '.cc', 'cpp' ]
+
+    _obj_ext = '.obj'
+    _exe_ext = 'exe'
+    _shared_lib_ext = '.dll'
+    _static_lib_ext = '.lib'
+    
+    def compile (self,
+                 sources,
+                 macros=None,
+                 includes=None):
+        """Compile one or more C/C++ source files.  'sources' must be
+           a list of strings, each one the name of a C/C++ source
+           file.  Return a list of the object filenames generated
+           (one for each source filename in 'sources').
+
+           'macros', if given, must be a list of macro definitions.  A
+           macro definition is either a (name, value) 2-tuple or a (name,)
+           1-tuple.  The former defines a macro; if the value is None, the
+           macro is defined without an explicit value.  The 1-tuple case
+           undefines a macro.  Later definitions/redefinitions/
+           undefinitions take precedence.
+
+           'includes', if given, must be a list of strings, the directories
+           to add to the default include file search path for this
+           compilation only."""
+
+        if macros is None:
+            macros = []
+        if includes is None:
+            includes = []
+
+        objectFiles = []
+
+        base_pp_opts = _gen_preprocess_options (self.macros + macros,
+                                                self.include_dirs + includes)
+
+        base_pp_opts.append('/c')
+        
+        for srcFile in sources:
+            base,ext = os.path.splitext(srcFile)
+            objFile = base + ".obj"
+
+            if ext in self._c_extensions:
+                fileOpt = "/Tc"
+            elif ext in self._cpp_extensions:
+                fileOpt = "/Tp"
+
+            inputOpt  = fileOpt + srcFile
+            outputOpt = "/Fo"   + objFile
+
+            pp_opts = base_pp_opts + [ outputOpt, inputOpt ]
+
+            returnCode = self.spawn( [ self.cc ] + self.compile_options + pp_opts )
+            # XXX check for valid return code
+
+            objectFiles.append( objFile )
+
+
+        return objectFiles
+    
+    # XXX this is kind of useless without 'link_binary()' or
+    # 'link_executable()' or something -- or maybe 'link_static_lib()'
+    # should not exist at all, and we just have 'link_binary()'?
+    def link_static_lib (self,
+                         objects,
+                         output_libname,
+                         libraries=None,
+                         library_dirs=None):
+        """Link a bunch of stuff together to create a static library
+           file.  The "bunch of stuff" consists of the list of object
+           files supplied as 'objects', the extra object files supplied
+           to 'add_link_object()' and/or 'set_link_objects()', the
+           libraries supplied to 'add_library()' and/or
+           'set_libraries()', and the libraries supplied as 'libraries'
+           (if any).
+
+           'output_libname' should be a library name, not a filename;
+           the filename will be inferred from the library name.
+
+           'library_dirs', if supplied, should be a list of additional
+           directories to search on top of the system default and those
+           supplied to 'add_library_dir()' and/or 'set_library_dirs()'."""
+        
+        if libraries is None:
+            libraries = []
+        if library_dirs is None:
+            library_dirs = []
+        if build_info is None:
+            build_info = {}
+        
+        lib_opts = _gen_lib_options (self.libraries + libraries,
+                                     self.library_dirs + library_dirs)
+
+        if build_info.has_key('def_file') :
+            lib_opts.append('/DEF:' + build_info['def_file'] )
+                            
+        ld_args = self.ldflags_static + lib_opts + \
+                  objects + ['/OUT:' + output_filename]
+
+        self.spawn ( [ self.link ] + ld_args )
+    
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         libraries=None,
+                         library_dirs=None,
+                         build_info=None):
+        """Link a bunch of stuff together to create a shared library
+           file.  Has the same effect as 'link_static_lib()' except
+           that the filename inferred from 'output_libname' will most
+           likely be different, and the type of file generated will
+           almost certainly be different."""
+        # XXX should we sanity check the library name? (eg. no
+        # slashes)
+        self.link_shared_object (objects, self.shared_library_name(output_libname),
+                                 build_info=build_info )
+    
+    def link_shared_object (self,
+                            objects,
+                            output_filename,
+                            libraries=None,
+                            library_dirs=None,
+                            build_info=None):
+        """Link a bunch of stuff together to create a shared object
+           file.  Much like 'link_shared_lib()', except the output
+           filename is explicitly supplied as 'output_filename'."""
+        if libraries is None:
+            libraries = []
+        if library_dirs is None:
+            library_dirs = []
+        if build_info is None:
+            build_info = {}
+        
+        lib_opts = _gen_lib_options (self.libraries + libraries,
+                                     self.library_dirs + library_dirs)
+
+        if build_info.has_key('def_file') :
+            lib_opts.append('/DEF:' + build_info['def_file'] )
+                            
+        ld_args = self.ldflags_shared + lib_opts + \
+                  objects + ['/OUT:' + output_filename]
+
+        self.spawn ( [ self.link ] + ld_args )
+
+
+    # -- Filename mangling methods -------------------------------------
+
+    def _change_extensions( self, filenames, newExtension ):
+        object_filenames = []
+
+        for srcFile in filenames:
+            base,ext = os.path.splitext( srcFile )
+            # XXX should we strip off any existing path?
+            object_filenames.append( base + newExtension )
+
+        return object_filenames
+
+    def object_filenames (self, source_filenames):
+        """Return the list of object filenames corresponding to each
+           specified source filename."""
+        return self._change_extensions( source_filenames, self._obj_ext )
+
+    def shared_object_filename (self, source_filename):
+        """Return the shared object filename corresponding to a
+           specified source filename."""
+        return self._change_extensions( source_filenames, self._shared_lib_ext )
+
+    def library_filename (self, libname):
+        """Return the static library filename corresponding to the
+           specified library name."""
+        return "lib%s%s" %( libname, self._static_lib_ext )
+
+    def shared_library_filename (self, libname):
+        """Return the shared library filename corresponding to the
+           specified library name."""
+        return "lib%s%s" %( libname, self._shared_lib_ext )
+
+# class MSVCCompiler
+
+def _gen_preprocess_options (macros, includes):
+
+    # XXX it would be nice (mainly aesthetic, and so we don't generate
+    # stupid-looking command lines) to go over 'macros' and eliminate
+    # redundant definitions/undefinitions (ie. ensure that only the
+    # latest mention of a particular macro winds up on the command
+    # line).  I don't think it's essential, though, since most (all?)
+    # Unix C compilers only pay attention to the latest -D or -U
+    # mention of a macro on their command line.  Similar situation for
+    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
+    # redundancies like this should probably be the province of
+    # CCompiler, since the data structures used are inherited from it
+    # and therefore common to all CCompiler classes.
+
+
+    pp_opts = []
+    for macro in macros:
+        if len (macro) == 1:        # undefine this macro
+            pp_opts.append ("-U%s" % macro[0])
+        elif len (macro) == 2:
+            if macro[1] is None:    # define with no explicit value
+                pp_opts.append ("-D%s" % macro[0])
+            else:
+                # XXX *don't* need to be clever about quoting the
+                # macro value here, because we're going to avoid the
+                # shell at all costs when we spawn the command!
+                pp_opts.append ("-D%s=%s" % macro)
+
+    for dir in includes:
+        pp_opts.append ("-I%s" % dir)
+
+    return pp_opts
+
+def _gen_lib_options (libraries, library_dirs):
+
+    lib_opts = []
+
+    for dir in library_dirs:
+        lib_opts.append ("/LIBPATH:%s" % dir)
+
+    # XXX it's important that we *not* remove redundant library mentions!
+    # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
+    # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
+    # -lbar" to get things to work -- that's certainly a possibility, but a
+    # pretty nasty way to arrange your C code.
+
+    for lib in libraries:
+        lib_opts.append ("%s.lib" % lib) # import libraries end in .lib
+
+    return lib_opts
+
+# _gen_lib_options ()
+
+    

From 39a6cfad1bbad1865216c88bf6b9a24c0a0a98f7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:17:36 +0000
Subject: [PATCH 0040/8469] Patch from Perry Stoll:   - fix some broken
 abstract methods   - kludge: add 'build_info' parameter to link methods   -
 add 'object_name()' and 'shared_library_name()'   - support for MSVCCompiler
 class on NT/Win95

---
 ccompiler.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index d5519cab1c..5f27ebc9b7 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -294,7 +294,8 @@ def link_shared_lib (self,
                          objects,
                          output_libname,
                          libraries=None,
-                         library_dirs=None):
+                         library_dirs=None,
+                         build_info=None):
         """Link a bunch of stuff together to create a shared library
            file.  Has the same effect as 'link_static_lib()' except
            that the filename inferred from 'output_libname' will most
@@ -306,7 +307,8 @@ def link_shared_object (self,
                             objects,
                             output_filename,
                             libraries=None,
-                            library_dirs=None):
+                            library_dirs=None,
+                            build_info=None):
         """Link a bunch of stuff together to create a shared object
            file.  Much like 'link_shared_lib()', except the output
            filename is explicitly supplied as 'output_filename'."""
@@ -315,27 +317,35 @@ def link_shared_object (self,
 
     # -- Filename mangling methods -------------------------------------
 
-    def object_filenames (source_filenames):
+    def object_filenames (self, source_filenames):
         """Return the list of object filenames corresponding to each
            specified source filename."""
         pass
 
-    def shared_object_filename (source_filename):
+    def shared_object_filename (self, source_filename):
         """Return the shared object filename corresponding to a
            specified source filename."""
         pass    
 
-    def library_filename (libname):
+    def library_filename (self, libname):
         """Return the static library filename corresponding to the
            specified library name."""
         
         pass
 
-    def shared_library_filename (libname):
+    def shared_library_filename (self, libname):
         """Return the shared library filename corresponding to the
            specified library name."""
         pass
 
+    
+    def object_name (self, inname):
+        """Given a name with no extension, return the name + object extension"""
+        return inname + self._obj_ext
+
+    def shared_library_name (self, inname):
+        """Given a name with no extension, return the name + shared object extension"""
+        return inname + self._shared_lib_ext
 
     # -- Utility methods -----------------------------------------------
 
@@ -357,6 +367,9 @@ def new_compiler (plat=None,
     if plat == 'posix':
         from unixccompiler import UnixCCompiler
         return UnixCCompiler (verbose, dry_run)
+    elif plat in  ['nt', 'win95' ]:
+        from msvccompiler import MSVCCompiler
+        return MSVCCompiler ( verbose, dry_run )
     else:
         raise DistutilsPlatformError, \
               "don't know how to compile C/C++ code on platform %s" % plat

From 0ae40f52f7ec42a97ac5ba7f5a19dc7e61b06427 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:18:26 +0000
Subject: [PATCH 0041/8469] Patch from Perry Stoll: pass 'build_info' to link
 method.

---
 command/build_ext.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index cb9da68dd9..a0464b4ea0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -178,10 +178,9 @@ def build_extensions (self, extensions):
                 objects.extend (extra_objects)
             libraries = build_info.get ('libraries')
             library_dirs = build_info.get ('library_dirs')
-
             ext_filename = self.extension_filename (extension_name)
             self.compiler.link_shared_object (objects, ext_filename,
-                                              libraries, library_dirs)
+                                              libraries, library_dirs, build_info)
 
     # build_extensions ()
 

From 0ddb1bcf7e8dd498d71f29941f3b148dc81f55e4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:19:01 +0000
Subject: [PATCH 0042/8469] Patch from Perry Stoll: OK for list of modules to
 be empty.

---
 command/build_py.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index d956eef396..d75bf3f615 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -55,6 +55,10 @@ def run (self):
         # input and output filenames and checking for missing
         # input files.
 
+        # it's ok not to have *any* py files, right?
+        if not modules:
+            return
+        
         # XXX we should allow for wildcards, so eg. the Distutils setup.py
         # file would just have to say
         #   py_modules = ['distutils.*', 'distutils.command.*']

From 0911797ba33945835d936fde6db2cd1c57fda9f2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:19:37 +0000
Subject: [PATCH 0043/8469] Patch from Perry Stoll: typo fix, make sure we only
 compile .py files.

---
 command/install_lib.py | 15 +++++++++------
 command/install_py.py  | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index f147af47f3..876a34ce61 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -9,7 +9,7 @@
 class InstallPy (Command):
 
     options = [('dir=', 'd', "directory to install to"),
-               ('build-dir=' 'b', "build directory (where to install from)"),
+               ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),
                ('optimize', 'o', "compile .py to .pyo (optimized)"),
               ]
@@ -54,12 +54,15 @@ def run (self):
 
             for f in outfiles:
                 # XXX can't assume this filename mapping!
-                out_fn = string.replace (f, '.py', '.pyc')
-                
-                self.make_file (f, out_fn, compile, (f,),
-                                "compiling %s -> %s" % (f, out_fn),
-                                "compilation of %s skipped" % f)
 
+                # only compile the file if it is actually a .py file
+                if f[-3:] == '.py':
+                    out_fn = string.replace (f, '.py', '.pyc')
+                    
+                    self.make_file (f, out_fn, compile, (f,),
+                                    "compiling %s -> %s" % (f, out_fn),
+                                    "compilation of %s skipped" % f)
+                    
         # XXX ignore self.optimize for now, since we don't really know if
         # we're compiling optimally or not, and couldn't pick what to do
         # even if we did know.  ;-(
diff --git a/command/install_py.py b/command/install_py.py
index f147af47f3..876a34ce61 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -9,7 +9,7 @@
 class InstallPy (Command):
 
     options = [('dir=', 'd', "directory to install to"),
-               ('build-dir=' 'b', "build directory (where to install from)"),
+               ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),
                ('optimize', 'o', "compile .py to .pyo (optimized)"),
               ]
@@ -54,12 +54,15 @@ def run (self):
 
             for f in outfiles:
                 # XXX can't assume this filename mapping!
-                out_fn = string.replace (f, '.py', '.pyc')
-                
-                self.make_file (f, out_fn, compile, (f,),
-                                "compiling %s -> %s" % (f, out_fn),
-                                "compilation of %s skipped" % f)
 
+                # only compile the file if it is actually a .py file
+                if f[-3:] == '.py':
+                    out_fn = string.replace (f, '.py', '.pyc')
+                    
+                    self.make_file (f, out_fn, compile, (f,),
+                                    "compiling %s -> %s" % (f, out_fn),
+                                    "compilation of %s skipped" % f)
+                    
         # XXX ignore self.optimize for now, since we don't really know if
         # we're compiling optimally or not, and couldn't pick what to do
         # even if we did know.  ;-(

From cb5a002f13cc594941024531f7949013f47e598b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:20:32 +0000
Subject: [PATCH 0044/8469] Patch from Perry Stoll: import types module.

---
 core.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core.py b/core.py
index a9c573258a..2d5d066145 100644
--- a/core.py
+++ b/core.py
@@ -12,6 +12,7 @@
 
 import sys, os
 import string, re
+from types import *
 from distutils.errors import *
 from distutils.fancy_getopt import fancy_getopt
 from distutils import util

From 8d83e47358a6a67a91fb5d2d2fe180c717b0a2be Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:20:56 +0000
Subject: [PATCH 0045/8469] Patch from Perry Stoll: support for Windows.

---
 spawn.py | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/spawn.py b/spawn.py
index 24e76ef10e..3a0702dc9d 100644
--- a/spawn.py
+++ b/spawn.py
@@ -33,23 +33,42 @@ def spawn (cmd,
 
     if os.name == 'posix':
         _spawn_posix (cmd, search_path, verbose, dry_run)
-    elif os.name == 'windows':          # ???
-        # XXX should 'args' be cmd[1:] or cmd?
-        # XXX how do we detect failure?
-        # XXX how to do this in pre-1.5.2?
-        # XXX is P_WAIT the correct mode?
-        # XXX how to make Windows search the path?
-        if verbose:
-            print string.join (cmd, ' ')
-        if not dry_run:
-            os.spawnv (os.P_WAIT, cmd[0], cmd[1:])
+    elif os.name in ( 'nt', 'windows' ):          # ???
+        _spawn_nt (cmd, search_path, verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
 
 # spawn ()
 
+def _spawn_nt ( cmd,
+                search_path=1,
+                verbose=0,
+                dry_run=0):
+    import string
+    executable = cmd[0]
+    if search_path:
+        paths = string.split( os.environ['PATH'], os.pathsep)
+        base,ext = os.path.splitext(executable)
+        if (ext != '.exe'):
+            executable = executable + '.exe'
+        if not os.path.isfile(executable):
+            paths.reverse()         # go over the paths and keep the last one
+            for p in paths:
+                f = os.path.join( p, executable )
+                if os.path.isfile ( f ):
+                    # the file exists, we have a shot at spawn working
+                    executable = f
+    if verbose:
+        print string.join ( [executable] + cmd[1:], ' ')
+    if not dry_run:
+        # spawn for NT requires a full path to the .exe
+        rc = os.spawnv (os.P_WAIT, executable, cmd)
+        if rc != 0:
+            raise DistutilsExecError("command failed: %d" % rc) 
 
+    
+                
 def _spawn_posix (cmd,
                   search_path=1,
                   verbose=0,

From c152a6391d7f1e688764758c6a156219ab081ce5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:22:13 +0000
Subject: [PATCH 0046/8469] Patch from Perry Stoll: tweaks to Windows support.

---
 sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 5c60ca4a49..8eaf17dc35 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -137,8 +137,13 @@ def _init_nt():
             os.path.join(sys.exec_prefix, "include", "config.h")), g)
     # set basic install directories
     g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib")
-    g['BINLIBDEST']=os.path.join(sys.exec_prefix, "Lib")
+    g['BINLIBDEST']= os.path.join(sys.exec_prefix, "Lib")
 
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = os.path.join (sys.prefix, 'include' )
+
+    g['SO'] = '.dll'
+    g['exec_prefix'] = sys.exec_prefix
 
 try:
     exec "_init_" + os.name

From badcf0591e3b166bd7c6e52926e54390d07a96e0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 29 Aug 1999 18:23:32 +0000
Subject: [PATCH 0047/8469] Patch from Perry Stoll: caught up with changes in
 CCompiler necessary (?) for MSVCCompiler.

---
 unixccompiler.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index c8468f965a..6594043c73 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -51,6 +51,11 @@ class UnixCCompiler (CCompiler):
     # directories and any module- or package-specific include directories
     # are specified via {add,set}_include_dirs(), and there's no way to
     # distinguish them.  This might be a bug.
+
+    _obj_ext = '.o'
+    _exe_ext = ''
+    _shared_lib_ext = SO
+    _static_lib_ext = '.a'
     
     def __init__ (self,
                   verbose=0,
@@ -121,23 +126,29 @@ def link_shared_lib (self,
                          objects,
                          output_libname,
                          libraries=None,
-                         library_dirs=None):
+                         library_dirs=None,
+                         build_info=None):
         # XXX should we sanity check the library name? (eg. no
         # slashes)
-        self.link_shared_object (objects, "lib%s%s" % (output_libname, SO))
+        self.link_shared_object (objects, "lib%s%s" % \
+                                 (output_libname, self._shared_lib_ext),
+                                 build_info=build_info)
 
 
     def link_shared_object (self,
                             objects,
                             output_filename,
                             libraries=None,
-                            library_dirs=None):
+                            library_dirs=None,
+                            build_info=None):
 
         if libraries is None:
             libraries = []
         if library_dirs is None:
             library_dirs = []
-
+        if build_info is None:
+            build_info = {}
+        
         lib_opts = _gen_lib_options (self.libraries + libraries,
                                      self.library_dirs + library_dirs)
         ld_args = self.ldflags_shared + lib_opts + \
@@ -150,17 +161,19 @@ def link_shared_object (self,
     def object_filenames (self, source_filenames):
         outnames = []
         for inname in source_filenames:
-            outnames.append (re.sub (r'\.(c|C|cc|cxx)$', '.o', inname))
+            outnames.append ( re.sub (r'\.(c|C|cc|cxx|cpp)$',
+                                      self._obj_ext, inname))
         return outnames
 
     def shared_object_filename (self, source_filename):
-        return re.sub (r'\.(c|C|cc|cxx)$', SO)
+        return re.sub (r'\.(c|C|cc|cxx|cpp)$', self._shared_lib_ext)
 
     def library_filename (self, libname):
-        return "lib%s.a" % libname
+        return "lib%s%s" % (libname, self._static_lib_ext )
 
     def shared_library_filename (self, libname):
-        return "lib%s.so" % libname
+        return "lib%s%s" % (libname, self._shared_lib_ext )
+
 
 
 # class UnixCCompiler

From 8fb6d44119d8eadaa89e54db50e804726f6fa98f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:23:28 +0000
Subject: [PATCH 0048/8469] [from 1999/08/28] Apparently os.name is "nt" or
 "posix" or we don't care. Cosmetic tweaks.

---
 spawn.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spawn.py b/spawn.py
index 3a0702dc9d..eee8e7f4a0 100644
--- a/spawn.py
+++ b/spawn.py
@@ -33,7 +33,7 @@ def spawn (cmd,
 
     if os.name == 'posix':
         _spawn_posix (cmd, search_path, verbose, dry_run)
-    elif os.name in ( 'nt', 'windows' ):          # ???
+    elif os.name == 'nt':
         _spawn_nt (cmd, search_path, verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
@@ -41,11 +41,11 @@ def spawn (cmd,
 
 # spawn ()
 
+
 def _spawn_nt ( cmd,
                 search_path=1,
                 verbose=0,
                 dry_run=0):
-    import string
     executable = cmd[0]
     if search_path:
         paths = string.split( os.environ['PATH'], os.pathsep)

From 053838f4381b3616afaa3cd161a81d61969559ab Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:29:08 +0000
Subject: [PATCH 0049/8469] os.name is "posix" or "nt" or we don't care. Added
 big comment about the kludginess of passing 'build_options'   to the link
 methods and how to fix it. Added 'gen_preprocess_options()' and
 'gen_lib_options()' convenience   functions -- the two cases are very similar
 for Unix C Compilers and   VC++, so I figured I might as well unify the
 implementations.

---
 ccompiler.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 5f27ebc9b7..b1167ac25a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -290,6 +290,30 @@ def link_static_lib (self,
         pass
     
 
+    # XXX passing in 'build_info' here is a kludge to deal with the
+    # oddities of one particular compiler (Visual C++).  For some reason,
+    # it needs to be told about ".def" files, and currently the
+    # 'build_info' hash allows this through a 'def_file' element.  The link
+    # methods for VC++ look for 'def_file' and transform it into the
+    # appropriate command-line options.  The current code is objectionable
+    # for a number of reasons: 1) if the link methods take 'build_info',
+    # why bother passing in libraries, library_dirs, etc.? 2) if the link
+    # methods do it, why not the compile methods? 3) build_info is part of
+    # the interface between setup.py and the 'build_ext' command -- it
+    # should stop there and not be propagated down into the compiler
+    # classes! and 4) I don't like elevating a platform- and
+    # compiler-specific oddity to "first-class" status in 'build_info' (oh
+    # well, at least it's not being reified in the compiler classes -- that
+    # would be really gross).
+    #
+    # Possible solutions:
+    #   - just pass build_info to all the compile/link methods, 
+    #     never mind all those other parameters and screw the
+    #     integrity of the interfaces
+    #   - add a mechanism for passing platform-specific and/or
+    #     compiler-specific compiler/linker options from setup.py
+    #     straight through to the appropriate compiler class
+
     def link_shared_lib (self,
                          objects,
                          output_libname,
@@ -367,9 +391,81 @@ def new_compiler (plat=None,
     if plat == 'posix':
         from unixccompiler import UnixCCompiler
         return UnixCCompiler (verbose, dry_run)
-    elif plat in  ['nt', 'win95' ]:
+    elif plat == 'nt':
         from msvccompiler import MSVCCompiler
         return MSVCCompiler ( verbose, dry_run )
     else:
         raise DistutilsPlatformError, \
               "don't know how to compile C/C++ code on platform %s" % plat
+
+
+def gen_preprocess_options (macros, includes):
+    """Generate C pre-processor options (-D, -U, -I) as used by at
+       least two types of compilers: the typical Unix compiler and Visual
+       C++.  'macros' is the usual thing, a list of 1- or 2-tuples, where
+       (name,) means undefine (-U) macro 'name', and (name,value) means
+       define (-D) macro 'name' to 'value'.  'includes' is just a list of
+       directory names to be added to the header file search path (-I).
+       Returns a list of command-line options suitable for either
+       Unix compilers or Visual C++."""
+    
+    # XXX it would be nice (mainly aesthetic, and so we don't generate
+    # stupid-looking command lines) to go over 'macros' and eliminate
+    # redundant definitions/undefinitions (ie. ensure that only the
+    # latest mention of a particular macro winds up on the command
+    # line).  I don't think it's essential, though, since most (all?)
+    # Unix C compilers only pay attention to the latest -D or -U
+    # mention of a macro on their command line.  Similar situation for
+    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
+    # redundancies like this should probably be the province of
+    # CCompiler, since the data structures used are inherited from it
+    # and therefore common to all CCompiler classes.
+
+    pp_opts = []
+    for macro in macros:
+        if len (macro) == 1:        # undefine this macro
+            pp_opts.append ("-U%s" % macro[0])
+        elif len (macro) == 2:
+            if macro[1] is None:    # define with no explicit value
+                pp_opts.append ("-D%s" % macro[0])
+            else:
+                # XXX *don't* need to be clever about quoting the
+                # macro value here, because we're going to avoid the
+                # shell at all costs when we spawn the command!
+                pp_opts.append ("-D%s=%s" % macro)
+
+    for dir in includes:
+        pp_opts.append ("-I%s" % dir)
+
+    return pp_opts
+
+# gen_preprocess_options ()
+
+
+def gen_lib_options (libraries, library_dirs, lib_format, dir_format):
+    """Generate linker options for searching library directories and
+       linking with specific libraries.  'libraries' and 'library_dirs'
+       are, respectively, lists of library names (not filenames!) and
+       search directories.  'lib_format' is a format string with exactly
+       one "%s", into which will be plugged each library name in turn;
+       'dir_format' is similar, but directory names will be plugged into
+       it.  Returns a list of command-line options suitable for use with
+       some compiler (depending on the two format strings passed in)."""
+
+    lib_opts = []
+
+    for dir in library_dirs:
+        lib_opts.append (dir_format % dir)
+
+    # XXX it's important that we *not* remove redundant library mentions!
+    # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
+    # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
+    # -lbar" to get things to work -- that's certainly a possibility, but a
+    # pretty nasty way to arrange your C code.
+
+    for lib in libraries:
+        lib_opts.append (lib_format % lib)
+
+    return lib_opts
+
+# _gen_lib_options ()

From f57477b38afe2a8084580f112be920884c74fcb5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:32:19 +0000
Subject: [PATCH 0050/8469] Ditched '_gen_preprocess_options()' and
 '_gen_lib_options()' -- they're   now provided (minus the leading underscore)
 by the ccompiler module. Fix 'compile()' to return the list of object files
 generated. Cosmetic tweaks/delete cruft.

---
 unixccompiler.py | 76 +++++-------------------------------------------
 1 file changed, 8 insertions(+), 68 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 6594043c73..a868451462 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -21,7 +21,7 @@
 from types import *
 from sysconfig import \
      CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
-from ccompiler import CCompiler
+from ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
 
 
 # XXX Things not currently handled:
@@ -101,8 +101,8 @@ def compile (self,
             raise TypeError, \
                   "'includes' (if supplied) must be a list of strings"
 
-        pp_opts = _gen_preprocess_options (self.macros + macros,
-                                           self.include_dirs + includes)
+        pp_opts = gen_preprocess_options (self.macros + macros,
+                                          self.include_dirs + includes)
 
         # use of ccflags_shared means we're blithely assuming that we're
         # compiling for inclusion in a shared object! (will have to fix
@@ -111,10 +111,9 @@ def compile (self,
                   self.ccflags + self.ccflags_shared + \
                   sources
 
-        # this will change to 'spawn' when I have it!
-        #print string.join ([self.cc] + cc_args, ' ')
         self.spawn ([self.cc] + cc_args)
-
+        return self.object_filenames (sources)
+    
 
     # XXX punting on 'link_static_lib()' for now -- it might be better for
     # CCompiler to mandate just 'link_binary()' or some such to build a new
@@ -149,12 +148,12 @@ def link_shared_object (self,
         if build_info is None:
             build_info = {}
         
-        lib_opts = _gen_lib_options (self.libraries + libraries,
-                                     self.library_dirs + library_dirs)
+        lib_opts = gen_lib_options (self.libraries + libraries,
+                                    self.library_dirs + library_dirs,
+                                    "-l%s", "-L%s")
         ld_args = self.ldflags_shared + lib_opts + \
                   objects + ['-o', output_filename]
 
-        #print string.join ([self.ld_shared] + ld_args, ' ')
         self.spawn ([self.ld_shared] + ld_args)
 
 
@@ -174,8 +173,6 @@ def library_filename (self, libname):
     def shared_library_filename (self, libname):
         return "lib%s%s" % (libname, self._shared_lib_ext )
 
-
-
 # class UnixCCompiler
 
 
@@ -184,60 +181,3 @@ def _split_command (cmd):
        the list of arguments; return them as (cmd, arglist)."""
     args = string.split (cmd)
     return (args[0], args[1:])
-
-
-def _gen_preprocess_options (macros, includes):
-
-    # XXX it would be nice (mainly aesthetic, and so we don't generate
-    # stupid-looking command lines) to go over 'macros' and eliminate
-    # redundant definitions/undefinitions (ie. ensure that only the
-    # latest mention of a particular macro winds up on the command
-    # line).  I don't think it's essential, though, since most (all?)
-    # Unix C compilers only pay attention to the latest -D or -U
-    # mention of a macro on their command line.  Similar situation for
-    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
-    # redundancies like this should probably be the province of
-    # CCompiler, since the data structures used are inherited from it
-    # and therefore common to all CCompiler classes.
-
-
-    pp_opts = []
-    for macro in macros:
-        if len (macro) == 1:        # undefine this macro
-            pp_opts.append ("-U%s" % macro[0])
-        elif len (macro) == 2:
-            if macro[1] is None:    # define with no explicit value
-                pp_opts.append ("-D%s" % macro[0])
-            else:
-                # XXX *don't* need to be clever about quoting the
-                # macro value here, because we're going to avoid the
-                # shell at all costs when we spawn the command!
-                pp_opts.append ("-D%s=%s" % macro)
-
-    for dir in includes:
-        pp_opts.append ("-I%s" % dir)
-
-    return pp_opts
-
-# _gen_preprocess_options ()
-
-
-def _gen_lib_options (libraries, library_dirs):
-
-    lib_opts = []
-
-    for dir in library_dirs:
-        lib_opts.append ("-L%s" % dir)
-
-    # XXX it's important that we *not* remove redundant library mentions!
-    # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
-    # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
-    # -lbar" to get things to work -- that's certainly a possibility, but a
-    # pretty nasty way to arrange your C code.
-
-    for lib in libraries:
-        lib_opts.append ("-l%s" % lib)
-
-    return lib_opts
-
-# _gen_lib_options ()

From 74deaef6c7323d3512b25e14cfea5f13fbfcb37e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:36:01 +0000
Subject: [PATCH 0051/8469] Ditched redundant docstrings and comments (overlap
 with ccompiler.py). Ditched redundant '_gen_preprocess_options()' and
 '_gen_lib_options()'   -- now provided by ccompiler.py. Fixed some filename
 extension variables -- added missing period. Cosmetic tweaks.

---
 msvccompiler.py | 131 ++++++++----------------------------------------
 1 file changed, 20 insertions(+), 111 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index ff66f913be..f328232bc0 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -11,23 +11,13 @@
 import os
 import sys
 from distutils.errors import *
-from distutils.ccompiler import CCompiler
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
 
 
-class MSVCCompiler ( CCompiler) :
-    """Abstract base class to define the interface that must be implemented
-       by real compiler abstraction classes.  Might have some use as a
-       place for shared code, but it's not yet clear what code can be
-       shared between compiler abstraction models for different platforms.
-
-       The basic idea behind a compiler abstraction class is that each
-       instance can be used for all the compile/link steps in building
-       a single project.  Thus, attributes common to all of those compile
-       and link steps -- include directories, macros to define, libraries
-       to link against, etc. -- are attributes of the compiler instance.
-       To allow for variability in how individual files are treated,
-       most (all?) of those attributes may be varied on a per-compilation
-       or per-link basis."""
+class MSVCCompiler (CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
 
     def __init__ (self,
                   verbose=0,
@@ -35,11 +25,9 @@ def __init__ (self,
 
         CCompiler.__init__ (self, verbose, dry_run)
 
-        
         # XXX This is a nasty dependency to add on something otherwise
-        #       pretty clean.  move it to build_ext under an nt
-        #       specific part.
-        #       shared libraries need to link against python15.lib
+        # pretty clean.  move it to build_ext under an nt specific part.
+        # shared libraries need to link against python15.lib
         self.add_library ( "python" + sys.version[0] + sys.version[2] )
         self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
         
@@ -51,39 +39,15 @@ def __init__ (self,
         self.ldflags_shared = ['/DLL', '/nologo']
         self.ldflags_static = [ '/nologo']
 
-    # XXX things not handled by this compiler abstraction model:
-    #   * client can't provide additional options for a compiler,
-    #     e.g. warning, optimization, debugging flags.  Perhaps this
-    #     should be the domain of concrete compiler abstraction classes
-    #     (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base
-    #     class should have methods for the common ones.
-    #   * can't put output files (object files, libraries, whatever)
-    #     into a separate directory from their inputs.  Should this be
-    #     handled by an 'output_dir' attribute of the whole object, or a
-    #     parameter to the compile/link_* methods, or both?
-    #   * can't completely override the include or library searchg
-    #     path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2".
-    #     I'm not sure how widely supported this is even by Unix
-    #     compilers, much less on other platforms.  And I'm even less
-    #     sure how useful it is; maybe for cross-compiling, but
-    #     support for that is a ways off.  (And anyways, cross
-    #     compilers probably have a dedicated binary with the
-    #     right paths compiled in.  I hope.)
-    #   * can't do really freaky things with the library list/library
-    #     dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against
-    #     different versions of libfoo.a in different locations.  I
-    #     think this is useless without the ability to null out the
-    #     library search path anyways.
-    
 
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
 
     _c_extensions = [ '.c' ]
-    _cpp_extensions = [ '.cc', 'cpp' ]
+    _cpp_extensions = [ '.cc', '.cpp' ]
 
     _obj_ext = '.obj'
-    _exe_ext = 'exe'
+    _exe_ext = '.exe'
     _shared_lib_ext = '.dll'
     _static_lib_ext = '.lib'
     
@@ -114,8 +78,8 @@ def compile (self,
 
         objectFiles = []
 
-        base_pp_opts = _gen_preprocess_options (self.macros + macros,
-                                                self.include_dirs + includes)
+        base_pp_opts = gen_preprocess_options (self.macros + macros,
+                                               self.include_dirs + includes)
 
         base_pp_opts.append('/c')
         
@@ -133,14 +97,12 @@ def compile (self,
 
             pp_opts = base_pp_opts + [ outputOpt, inputOpt ]
 
-            returnCode = self.spawn( [ self.cc ] + self.compile_options + pp_opts )
-            # XXX check for valid return code
-
+            self.spawn( [ self.cc ] + self.compile_options + pp_opts)
             objectFiles.append( objFile )
 
-
         return objectFiles
-    
+
+
     # XXX this is kind of useless without 'link_binary()' or
     # 'link_executable()' or something -- or maybe 'link_static_lib()'
     # should not exist at all, and we just have 'link_binary()'?
@@ -171,8 +133,9 @@ def link_static_lib (self,
         if build_info is None:
             build_info = {}
         
-        lib_opts = _gen_lib_options (self.libraries + libraries,
-                                     self.library_dirs + library_dirs)
+        lib_opts = gen_lib_options (self.libraries + libraries,
+                                    self.library_dirs + library_dirs,
+                                    "%s.lib", "/LIBPATH:%s")
 
         if build_info.has_key('def_file') :
             lib_opts.append('/DEF:' + build_info['def_file'] )
@@ -215,8 +178,9 @@ def link_shared_object (self,
         if build_info is None:
             build_info = {}
         
-        lib_opts = _gen_lib_options (self.libraries + libraries,
-                                     self.library_dirs + library_dirs)
+        lib_opts = gen_lib_options (self.libraries + libraries,
+                                    self.library_dirs + library_dirs,
+                                    "%s.lib", "/LIBPATH:%s")
 
         if build_info.has_key('def_file') :
             lib_opts.append('/DEF:' + build_info['def_file'] )
@@ -260,58 +224,3 @@ def shared_library_filename (self, libname):
         return "lib%s%s" %( libname, self._shared_lib_ext )
 
 # class MSVCCompiler
-
-def _gen_preprocess_options (macros, includes):
-
-    # XXX it would be nice (mainly aesthetic, and so we don't generate
-    # stupid-looking command lines) to go over 'macros' and eliminate
-    # redundant definitions/undefinitions (ie. ensure that only the
-    # latest mention of a particular macro winds up on the command
-    # line).  I don't think it's essential, though, since most (all?)
-    # Unix C compilers only pay attention to the latest -D or -U
-    # mention of a macro on their command line.  Similar situation for
-    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
-    # redundancies like this should probably be the province of
-    # CCompiler, since the data structures used are inherited from it
-    # and therefore common to all CCompiler classes.
-
-
-    pp_opts = []
-    for macro in macros:
-        if len (macro) == 1:        # undefine this macro
-            pp_opts.append ("-U%s" % macro[0])
-        elif len (macro) == 2:
-            if macro[1] is None:    # define with no explicit value
-                pp_opts.append ("-D%s" % macro[0])
-            else:
-                # XXX *don't* need to be clever about quoting the
-                # macro value here, because we're going to avoid the
-                # shell at all costs when we spawn the command!
-                pp_opts.append ("-D%s=%s" % macro)
-
-    for dir in includes:
-        pp_opts.append ("-I%s" % dir)
-
-    return pp_opts
-
-def _gen_lib_options (libraries, library_dirs):
-
-    lib_opts = []
-
-    for dir in library_dirs:
-        lib_opts.append ("/LIBPATH:%s" % dir)
-
-    # XXX it's important that we *not* remove redundant library mentions!
-    # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
-    # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
-    # -lbar" to get things to work -- that's certainly a possibility, but a
-    # pretty nasty way to arrange your C code.
-
-    for lib in libraries:
-        lib_opts.append ("%s.lib" % lib) # import libraries end in .lib
-
-    return lib_opts
-
-# _gen_lib_options ()
-
-    

From 7fc78eeacf803248087fcf97f900c43656e02946 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:41:09 +0000
Subject: [PATCH 0052/8469] Careful rethink of command options, distribution
 options, distribution   attributes, etc.  Biggest change was to the
 Distribution constructor   -- it now looks for an 'options' attribute, which
 contains values   (options) that are explicitly farmed out to the commands. 
 Also,   certain options supplied to Distribution (ie. in the 'setup()' call
 in   setup.py) are now "command option aliases", meaning they are dropped  
 right into a certain command rather than being distribution options.   This
 is handled by a new Distribution class attribute,   'alias_options'. Various
 comment changes to reflect the new way-of-thinking. Added
 'get_command_name()' method to Command -- was assuming its   existence all
 along as 'command_name()', so changed the code that   needs it to call
 'get_command_name()'.

---
 core.py | 134 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 108 insertions(+), 26 deletions(-)

diff --git a/core.py b/core.py
index 2d5d066145..8d2572afca 100644
--- a/core.py
+++ b/core.py
@@ -72,9 +72,12 @@ def setup (**attrs):
     # (ie. everything except distclass) to initialize it
     dist = klass (attrs)
 
-    # Get it to parse the command line; any command-line errors are
-    # the end-users fault, so turn them into SystemExit to suppress
-    # tracebacks.
+    # If we had a config file, this is where we would parse it: override
+    # the client-supplied command options, but be overridden by the
+    # command line.
+
+    # Parse the command line; any command-line errors are the end-users
+    # fault, so turn them into SystemExit to suppress tracebacks.
     try:
         dist.parse_command_line (sys.argv[1:])
     except DistutilsArgError, msg:
@@ -111,6 +114,18 @@ class Distribution:
                       ('dry-run', 'n', "don't actually do anything"),
                      ]
 
+    # 'alias_options' map distribution options to command options -- the
+    # idea is that the most common, essential options can be directly
+    # specified as Distribution attributes, and the rest can go in the
+    # 'options' dictionary.  These aliases are for those common, essential
+    # options.
+    alias_options = { 'py_modules': ('build_py', 'modules'),
+                      'ext_modules': ('build_ext', 'modules'),
+                      'package': [('build_py', 'package',),
+                                  ('build_ext', 'package')],
+
+                    }
+
 
     # -- Creation/initialization methods -------------------------------
     
@@ -129,11 +144,13 @@ def __init__ (self, attrs=None):
         self.verbose = 0
         self.dry_run = 0
 
-        # And for all other attributes (stuff that might be passed in
-        # from setup.py, rather than from the end-user)
+        # And the "distribution meta-data" options -- these can only
+        # come from setup.py (the caller), not the command line
+        # (or a hypothetical config file)..
         self.name = None
         self.version = None
         self.author = None
+        self.url = None
         self.licence = None
         self.description = None
 
@@ -143,18 +160,14 @@ def __init__ (self, attrs=None):
         # for the client to override command classes
         self.cmdclass = {}
 
-        # The rest of these are really the business of various commands,
-        # rather than of the Distribution itself.  However, they have
-        # to be here as a conduit to the relevant command class.        
-        self.py_modules = None
-        self.ext_modules = None
-        self.package = None
-
-        # Now we'll use the attrs dictionary to possibly override
-        # any or all of these distribution options
-        if attrs:
-            for k in attrs.keys():
-                setattr (self, k, attrs[k])
+        # These options are really the business of various commands, rather
+        # than of the Distribution itself.  We provide aliases for them in
+        # Distribution as a convenience to the developer.
+        # dictionary.        
+        # XXX not needed anymore! (I think...)
+        #self.py_modules = None
+        #self.ext_modules = None
+        #self.package = None
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
@@ -174,6 +187,49 @@ def __init__ (self, attrs=None):
         # '.get()' rather than a straight lookup.
         self.have_run = {}
 
+        # Now we'll use the attrs dictionary (from the client) to possibly
+        # override any or all of these distribution options
+        if attrs:
+
+            # Pull out the set of command options and work on them
+            # specifically.  Note that this order guarantees that aliased
+            # command options will override any supplied redundantly
+            # through the general options dictionary.
+            options = attrs.get ('options')
+            if options:
+                del attrs['options']
+                for (command, cmd_options) in options.items():
+                    cmd_obj = self.find_command_obj (command)
+                    for (key, val) in cmd_options.items():
+                        cmd_obj.set_option (key, val)
+                # loop over commands
+            # if any command options                        
+
+            # Now work on the rest of the attributes.  Note that some of
+            # these may be aliases for command options, so we might go
+            # through some of the above again.
+            for (key,val) in attrs.items():
+                alias = self.alias_options.get (key)
+                if alias:
+                    if type (alias) is ListType:
+                        for (command, cmd_option) in alias:
+                            cmd_obj = self.find_command_obj (command)
+                            cmd_obj.set_option (cmd_option, val)
+                    elif type (alias) is TupleType:
+                        (command, cmd_option) = alias
+                        cmd_obj = self.find_command_obj (command)
+                        cmd_obj.set_option (cmd_option, val)
+                    else:
+                        raise RuntimeError, \
+                              ("oops! bad alias option for '%s': " +
+                               "must be tuple or list of tuples") % key
+                    
+                elif hasattr (self, key):
+                    setattr (self, key, val)
+                else:
+                    raise DistutilsOptionError, \
+                          "invalid distribution option '%s'" % key
+
     # __init__ ()
 
 
@@ -213,10 +269,10 @@ def parse_command_line (self, args):
                 raise SystemExit, "invalid command name '%s'" % command
             self.commands.append (command)
 
-            # Have to instantiate the command class now, so we have a
-            # way to get its valid options and somewhere to put the
-            # results of parsing its share of the command-line
-            cmd_obj = self.create_command_obj (command)
+            # Make sure we have a command object to put the options into
+            # (this either pulls it out of a cache of command objects,
+            # or finds and instantiates the command class).
+            cmd_obj = self.find_command_obj (command)
 
             # Require that the command class be derived from Command --
             # that way, we can be sure that we at least have the 'run'
@@ -226,8 +282,15 @@ def parse_command_line (self, args):
                       "command class %s must subclass Command" % \
                       cmd_obj.__class__
 
-            # XXX this assumes that cmd_obj provides an 'options'
-            # attribute, but we're not enforcing that anywhere!
+            # Also make sure that the command object provides a list of its
+            # known options
+            if not (hasattr (cmd_obj, 'options') and
+                    type (cmd_obj.options) is ListType):
+                raise DistutilsClasserror, \
+                      ("command class %s must provide an 'options' attribute "+
+                       "(a list of tuples)") % \
+                      cmd_obj.__class__
+
             args = fancy_getopt (cmd_obj.options, cmd_obj, args[1:])
             self.command_obj[command] = cmd_obj
             self.have_run[command] = 0
@@ -376,6 +439,11 @@ def run_command (self, command):
            Then invoke 'run()' on that command object (or an existing
            one)."""
 
+        # XXX currently, this is the only place where we invoke a
+        # command object's 'run()' method -- so it might make sense to
+        # put the 'set_final_options()' call here, too, instead of
+        # requiring every command's 'run()' to call it first.        
+
         # Already been here, done that? then return silently.
         if self.have_run.get (command):
             return
@@ -530,7 +598,7 @@ def get_option (self, option):
         except AttributeError:
             raise DistutilsOptionError, \
                   "command %s: no such option %s" % \
-                  (self.command_name(), option)
+                  (self.get_command_name(), option)
 
 
     def get_options (self, *options):
@@ -545,7 +613,7 @@ def get_options (self, *options):
         except AttributeError, name:
             raise DistutilsOptionError, \
                   "command %s: no such option %s" % \
-                  (self.command_name(), name)
+                  (self.get_command_name(), name)
             
         return tuple (values)
     
@@ -557,7 +625,7 @@ def set_option (self, option, value):
         if not hasattr (self, option):
             raise DistutilsOptionError, \
                   "command %s: no such option %s" % \
-                  (self.command_name(), option)
+                  (self.get_command_name(), option)
         if value is not None:
             setattr (self, option, value)
 
@@ -573,6 +641,20 @@ def set_options (self, **optval):
 
     # -- Convenience methods for commands ------------------------------
 
+    def get_command_name (self):
+        if hasattr (self, 'command_name'):
+            return self.command_name
+        else:
+            class_name = self.__class__.__name__
+
+            # The re.split here returs empty strings delimited by the
+            # words we're actually interested in -- e.g.  "FooBarBaz"
+            # splits to ['', 'Foo', '', 'Bar', '', 'Baz', ''].  Hence
+            # the 'filter' to strip out the empties.            
+            words = filter (None, re.split (r'([A-Z][a-z]+)', class_name))
+            return string.join (map (string.lower, words), "_")
+
+
     def set_undefined_options (self, src_cmd, *option_pairs):
         """Set the values of any "undefined" options from corresponding
            option values in some other command object.  "Undefined" here

From ba6f5bc4f0534bb3ebab3a17f16686f613e42707 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 8 Sep 1999 02:42:30 +0000
Subject: [PATCH 0053/8469] Changed to reflect the new "command options" regime
 -- in particular, we no longer explicitly pull distribution options out of
 our Distribution object, but rather let the Distribution put them into the
 command object.

---
 command/build_ext.py | 22 +++++++++++++++-------
 command/build_py.py  | 14 +++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index a0464b4ea0..a3982c1b22 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -61,6 +61,7 @@ class BuildExt (Command):
 
 
     def set_default_options (self):
+        self.extensions = None
         self.dir = None
         self.include_dirs = None
         self.define = None
@@ -90,10 +91,14 @@ def set_final_options (self):
     def run (self):
 
         self.set_final_options ()
-        (extensions, package) = \
-            self.distribution.get_options ('ext_modules', 'package')
 
-        # 'extensions', as supplied by setup.py, is a list of 2-tuples.
+        # XXX we should care about the package we compile extensions
+        # into! 
+
+        #(extensions, package) = \
+        #    self.distribution.get_options ('ext_modules', 'package')
+
+        # 'self.extensions', as supplied by setup.py, is a list of 2-tuples.
         # Each tuple is simple:
         #    (ext_name, build_info)
         # build_info is a dictionary containing everything specific to
@@ -101,13 +106,16 @@ def run (self):
         # should be handled by general distutils options passed from
         # setup.py down to right here, but that's not taken care of yet.)
 
+        if not self.extensions:
+            return
 
-        # First, sanity-check the 'extensions' list
-        self.check_extensions_list (extensions)
+        # First, sanity-check the 'self.extensions' list
+        self.check_extensions_list (self.extensions)
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (verbose=self.distribution.verbose,
+        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
+                                      verbose=self.distribution.verbose,
                                       dry_run=self.distribution.dry_run)
         if self.include_dirs is not None:
             self.compiler.set_include_dirs (self.include_dirs)
@@ -128,7 +136,7 @@ def run (self):
             self.compiler.set_link_objects (self.link_objects)
                                       
         # Now the real loop over extensions
-        self.build_extensions (extensions)
+        self.build_extensions (self.extensions)
 
             
 
diff --git a/command/build_py.py b/command/build_py.py
index d75bf3f615..28aefa9e7e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -20,10 +20,14 @@ class BuildPy (Command):
 
     def set_default_options (self):
         self.dir = None
+        self.modules = None
+        self.package = None
 
     def set_final_options (self):
         self.set_undefined_options ('build',
                                     ('libdir', 'dir'))
+        if self.package is None:
+            self.package = ''
 
 
     def run (self):
@@ -43,10 +47,6 @@ def run (self):
 
         self.set_final_options ()
 
-        (modules, package) = \
-            self.distribution.get_options ('py_modules', 'package')
-        package = package or ''
-
         infiles = []
         outfiles = []
         missing = []
@@ -56,20 +56,20 @@ def run (self):
         # input files.
 
         # it's ok not to have *any* py files, right?
-        if not modules:
+        if not self.modules:
             return
         
         # XXX we should allow for wildcards, so eg. the Distutils setup.py
         # file would just have to say
         #   py_modules = ['distutils.*', 'distutils.command.*']
         # without having to list each one explicitly.
-        for m in modules:
+        for m in self.modules:
             fn = apply (os.path.join, tuple (string.split (m, '.'))) + '.py'
             if not os.path.exists (fn):
                 missing.append (fn)
             else:
                 infiles.append (fn)
-                outfiles.append (os.path.join (self.dir, package, fn))
+                outfiles.append (os.path.join (self.dir, self.package, fn))
 
         # Blow up if any input files were not found.
         if missing:

From cb448b16d3ad06c7158fe5a63cdb2f66b401935d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 03:03:01 +0000
Subject: [PATCH 0054/8469] Fixed some goofs in 'alias_options'. Error message
 tweak in Command.set_option(). Added Command.get_peer_option(). Added
 Command.move_file() wrapper.

---
 core.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 8d2572afca..a6c378d36c 100644
--- a/core.py
+++ b/core.py
@@ -120,9 +120,10 @@ class Distribution:
     # 'options' dictionary.  These aliases are for those common, essential
     # options.
     alias_options = { 'py_modules': ('build_py', 'modules'),
-                      'ext_modules': ('build_ext', 'modules'),
+                      'ext_modules': ('build_ext', 'extensions'),
                       'package': [('build_py', 'package',),
                                   ('build_ext', 'package')],
+                      'include_dirs': ('build_ext', 'include_dirs'),
 
                     }
 
@@ -624,7 +625,7 @@ def set_option (self, option, value):
 
         if not hasattr (self, option):
             raise DistutilsOptionError, \
-                  "command %s: no such option %s" % \
+                  "command '%s': no such option '%s'" % \
                   (self.get_command_name(), option)
         if value is not None:
             setattr (self, option, value)
@@ -701,6 +702,11 @@ def set_peer_option (self, command, option, value):
         cmd_obj.set_final_options ()
 
 
+    def get_peer_option (self, command, option):
+        cmd_obj = self.distribution.find_command_obj (command)
+        return cmd_obj.get_option (option)
+
+
     def run_peer (self, command):
         """Run some other command: uses the 'run_command()' method of
            Distribution, which creates the command object if necessary
@@ -767,6 +773,13 @@ def copy_tree (self, infile, outfile,
                                self.distribution.dry_run)
 
 
+    def move_file (self, src, dst, level=1):
+        """Move a file respecting verbose and dry-run flags."""
+        return util.move_file (src, dst,
+                               self.distribution.verbose >= level,
+                               self.distribution.dry_run)
+
+
     def make_file (self, infiles, outfile, func, args,
                     exec_msg=None, skip_msg=None, level=1):
 

From e9f33b359886fec9cc43caf900f3f1e8a12a44ae Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 03:07:24 +0000
Subject: [PATCH 0055/8469] Added 'output_dir' attribute, and 'output_dir'
 parameter to several method   signatures, and updated some docstrings to
 reflect it. Some comments added. Added 'announce()' and 'move_file()'
 methods.

---
 ccompiler.py | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index b1167ac25a..0e505338be 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -12,6 +12,7 @@
 from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
+from distutils.util import move_file
 
 
 class CCompiler:
@@ -62,6 +63,10 @@ def __init__ (self,
         self.verbose = verbose
         self.dry_run = dry_run
 
+        # 'output_dir': a common output directory for object, library,
+        # shared object, and shared library files
+        self.output_dir = None
+
         # 'macros': a list of macro definitions (or undefinitions).  A
         # macro definition is a 2-tuple (name, value), where the value is
         # either a string or None (no explicit value).  A macro
@@ -244,6 +249,7 @@ def set_link_objects (self, objects):
 
     def compile (self,
                  sources,
+                 output_dir=None,
                  macros=None,
                  includes=None):
         """Compile one or more C/C++ source files.  'sources' must be
@@ -270,6 +276,7 @@ def compile (self,
     def link_static_lib (self,
                          objects,
                          output_libname,
+                         output_dir=None,
                          libraries=None,
                          library_dirs=None):
         """Link a bunch of stuff together to create a static library
@@ -317,6 +324,7 @@ def link_static_lib (self,
     def link_shared_lib (self,
                          objects,
                          output_libname,
+                         output_dir=None,
                          libraries=None,
                          library_dirs=None,
                          build_info=None):
@@ -330,25 +338,37 @@ def link_shared_lib (self,
     def link_shared_object (self,
                             objects,
                             output_filename,
+                            output_dir=None,
                             libraries=None,
                             library_dirs=None,
                             build_info=None):
         """Link a bunch of stuff together to create a shared object
-           file.  Much like 'link_shared_lib()', except the output
-           filename is explicitly supplied as 'output_filename'."""
+           file.  Much like 'link_shared_lib()', except the output filename
+           is explicitly supplied as 'output_filename'.  If 'output_dir' is
+           supplied, 'output_filename' is relative to it
+           (i.e. 'output_filename' can provide directoriy components if
+           needed)."""
         pass
 
 
     # -- Filename mangling methods -------------------------------------
 
-    def object_filenames (self, source_filenames):
+    # General principle for the filename-mangling methods: by default,
+    # don't include a directory component, no matter what the caller
+    # supplies.  Eg. for UnixCCompiler, a source file of "foo/bar/baz.c"
+    # becomes "baz.o" or "baz.so", etc.  (That way, it's easiest for the
+    # caller to decide where it wants to put/find the output file.)  The
+    # 'output_dir' parameter overrides this, of course -- the directory
+    # component of the input filenames is replaced by 'output_dir'.
+
+    def object_filenames (self, source_filenames, output_dir=None):
         """Return the list of object filenames corresponding to each
            specified source filename."""
         pass
 
     def shared_object_filename (self, source_filename):
         """Return the shared object filename corresponding to a
-           specified source filename."""
+           specified source filename (assuming the same directory)."""
         pass    
 
     def library_filename (self, libname):
@@ -362,7 +382,7 @@ def shared_library_filename (self, libname):
            specified library name."""
         pass
 
-    
+    # XXX ugh -- these should go!
     def object_name (self, inname):
         """Given a name with no extension, return the name + object extension"""
         return inname + self._obj_ext
@@ -373,9 +393,16 @@ def shared_library_name (self, inname):
 
     # -- Utility methods -----------------------------------------------
 
+    def announce (self, msg, level=1):
+        if self.verbose >= level:
+            print msg
+
     def spawn (self, cmd):
         spawn (cmd, verbose=self.verbose, dry_run=self.dry_run)
 
+    def move_file (self, src, dst):
+        return move_file (src, dst, verbose=self.verbose, dry_run=self.dry_run)
+
 
 # class CCompiler
 
@@ -393,7 +420,7 @@ def new_compiler (plat=None,
         return UnixCCompiler (verbose, dry_run)
     elif plat == 'nt':
         from msvccompiler import MSVCCompiler
-        return MSVCCompiler ( verbose, dry_run )
+        return MSVCCompiler (verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to compile C/C++ code on platform %s" % plat

From 38e16941af7fee0698b7c2f53508a3a6b461a30c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 03:09:38 +0000
Subject: [PATCH 0056/8469] Added 'newer_pairwise()' and 'newer_group()'.
 Terminology change in 'newer()'. Made 'copy_tree' respect dry_run flag a
 little better. Added 'move_file()'.

---
 util.py | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 133 insertions(+), 16 deletions(-)

diff --git a/util.py b/util.py
index 9a299dfd83..bb790af438 100644
--- a/util.py
+++ b/util.py
@@ -62,26 +62,75 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 # mkpath ()
 
 
-def newer (file1, file2):
-    """Return true if file1 exists and is more recently modified than
-       file2, or if file1 exists and file2 doesn't.  Return false if both
-       exist and file2 is the same age or younger than file1.  Raises
-       DistutilsFileError if file1 does not exist."""
-
-    if not os.path.exists (file1):
-        raise DistutilsFileError, "file '%s' does not exist" % file1
-    if not os.path.exists (file2):
+def newer (source, target):
+    """Return true if 'source' exists and is more recently modified than
+       'target', or if 'source' exists and 'target' doesn't.  Return
+       false if both exist and 'target' is the same age or younger than
+       'source'.  Raise DistutilsFileError if 'source' does not
+       exist."""
+
+    if not os.path.exists (source):
+        raise DistutilsFileError, "file '%s' does not exist" % source
+    if not os.path.exists (target):
         return 1
 
-    from stat import *
-    mtime1 = os.stat(file1)[ST_MTIME]
-    mtime2 = os.stat(file2)[ST_MTIME]
+    from stat import ST_MTIME
+    mtime1 = os.stat(source)[ST_MTIME]
+    mtime2 = os.stat(target)[ST_MTIME]
 
     return mtime1 > mtime2
 
 # newer ()
 
 
+def newer_pairwise (sources, targets):
+
+    """Walk two filename lists in parallel, testing if each 'target' is
+       up-to-date relative to its corresponding 'source'.  If so, both
+       are deleted from their respective lists.  Return a list of tuples
+       containing the deleted (source,target) pairs."""
+
+    if len (sources) != len (targets):
+        raise ValueError, "'sources' and 'targets' must be same length"
+
+    goners = []
+    for i in range (len (sources)-1, -1, -1):
+        if not newer (sources[i], targets[i]):
+            goners.append ((sources[i], targets[i]))
+            del sources[i]
+            del targets[i]
+    goners.reverse()
+    return goners
+
+# newer_pairwise ()
+
+
+def newer_group (sources, target):
+    """Return true if 'target' is out-of-date with respect to any
+       file listed in 'sources'.  In other words, if 'target' exists and
+       is newer than every file in 'sources', return false; otherwise
+       return true."""
+
+    # If the target doesn't even exist, then it's definitely out-of-date.
+    if not os.path.exists (target):
+        return 1
+   
+    # Otherwise we have to find out the hard way: if *any* source file
+    # is more recent than 'target', then 'target' is out-of-date and
+    # we can immediately return true.  If we fall through to the end
+    # of the loop, then 'target' is up-to-date and we return false.
+    from stat import ST_MTIME
+    target_mtime = os.stat (target)[ST_MTIME]
+    for source in sources:
+        source_mtime = os.stat(source)[ST_MTIME]
+        if source_mtime > target_mtime:
+            return 1
+    else:
+        return 0
+
+# newer_group ()
+
+
 def make_file (src, dst, func, args,
                verbose=0, update_message=None, noupdate_message=None):
     """Makes 'dst' from 'src' (both filenames) by calling 'func' with
@@ -176,7 +225,7 @@ def copy_file (src, dst,
 
     if not os.path.isfile (src):
         raise DistutilsFileError, \
-              "can't copy %s:not a regular file" % src
+              "can't copy %s: not a regular file" % src
 
     if os.path.isdir (dst):
         dir = dst
@@ -237,14 +286,17 @@ def copy_tree (src, dst,
        (the default), the destination of the symlink will be copied.
        'update' and 'verbose' are the same as for 'copy_file'."""
 
-    if not os.path.isdir (src):
+    if not dry_run and not os.path.isdir (src):
         raise DistutilsFileError, \
               "cannot copy tree %s: not a directory" % src    
     try:
         names = os.listdir (src)
     except os.error, (errno, errstr):
-        raise DistutilsFileError, \
-              "error listing files in %s: %s" % (src, errstr)
+        if dry_run:
+            names = []
+        else:
+            raise DistutilsFileError, \
+                  "error listing files in %s: %s" % (src, errstr)
 
     if not dry_run:
         mkpath (dst, verbose=verbose)
@@ -277,3 +329,68 @@ def copy_tree (src, dst,
     return outputs
 
 # copy_tree ()
+
+
+# XXX I suspect this is Unix-specific -- need porting help!
+def move_file (src, dst,
+               verbose=0,
+               dry_run=0):
+
+    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file
+       will be moved into it with the same name; otherwise, 'src' is
+       just renamed to 'dst'.  Return the new full name of the file.
+
+       Handles cross-device moves on Unix using
+       'copy_file()'.  What about other systems???"""
+
+    from os.path import exists, isfile, isdir, basename, dirname
+
+    if verbose:
+        print "moving %s -> %s" % (src, dst)
+
+    if dry_run:
+        return dst
+
+    if not isfile (src):
+        raise DistutilsFileError, \
+              "can't move '%s': not a regular file" % src
+
+    if isdir (dst):
+        dst = os.path.join (dst, basename (src))
+    elif exists (dst):
+        raise DistutilsFileError, \
+              "can't move '%s': destination '%s' already exists" % \
+              (src, dst)
+
+    if not isdir (dirname (dst)):
+        raise DistutilsFileError, \
+              "can't move '%s': destination '%s' not a valid path" % \
+              (src, dst)
+
+    copy_it = 0
+    try:
+        os.rename (src, dst)
+    except os.error, (num, msg):
+        if num == errno.EXDEV:
+            copy_it = 1
+        else:
+            raise DistutilsFileError, \
+                  "couldn't move '%s' to '%s': %s" % (src, dst, msg)
+
+    if copy_it:
+        copy_file (src, dst)
+        try:
+            os.unlink (src)
+        except os.error, (num, msg):
+            try:
+                os.unlink (dst)
+            except os.error:
+                pass
+            raise DistutilsFileError, \
+                  ("couldn't move '%s' to '%s' by copy/delete: " + 
+                   "delete '%s' failed: %s") % \
+                  (src, dst, src, msg)
+
+    return dst
+
+# move_file ()

From d16f82401008b9b8c470bd3506c34fe29cd4f8d7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 03:10:25 +0000
Subject: [PATCH 0057/8469] New command -- install_ext to install extension
 modules.

---
 command/install_ext.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 command/install_ext.py

diff --git a/command/install_ext.py b/command/install_ext.py
new file mode 100644
index 0000000000..360a8027b7
--- /dev/null
+++ b/command/install_ext.py
@@ -0,0 +1,38 @@
+"""install_ext
+
+Implement the Distutils "install_ext" command to install extension modules."""
+
+# created 1999/09/12, Greg Ward
+
+__rcsid__ = "$Id$"
+
+from distutils.core import Command
+from distutils.util import copy_tree
+
+class InstallExt (Command):
+
+    options = [('dir=', 'd', "directory to install to"),
+               ('build-dir=','b', "build directory (where to install from)"),
+              ]
+
+    def set_default_options (self):
+        # let the 'install' command dictate our installation directory
+        self.dir = None
+        self.build_dir = None
+
+    def set_final_options (self):
+        self.set_undefined_options ('install',
+                                    ('build_platlib', 'build_dir'),
+                                    ('install_site_platlib', 'dir'))
+
+    def run (self):
+        self.set_final_options ()
+
+        # Dump the entire "build/platlib" directory (or whatever it really
+        # is; "build/platlib" is the default) to the installation target
+        # (eg. "/usr/local/lib/python1.5/site-packages").  Note that
+        # putting files in the right package dir is already done when we
+        # build.
+        outfiles = self.copy_tree (self.build_dir, self.dir)
+
+# class InstallExt

From 6d41846de7faa855ac30ea57349780d3cc074f96 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 03:12:53 +0000
Subject: [PATCH 0058/8469] Added 'output_dir' parameter to 'compile()' and
 'link_shared_object(). Changed those two methods to only compile/link if
 necessary (according   to simplistic timestamp checks). Added 'output_dir' to
 'object_filenames()' and 'shared_object_filename()'.

---
 unixccompiler.py | 105 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 22 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index a868451462..0149313110 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,12 +17,13 @@
 
 __rcsid__ = "$Id$"
 
-import string, re
+import string, re, os
 from types import *
+from copy import copy
 from sysconfig import \
      CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
 from ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
-
+from util import move_file, newer_pairwise, newer_group
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
@@ -86,9 +87,12 @@ def __init__ (self,
 
     def compile (self,
                  sources,
+                 output_dir=None,
                  macros=None,
                  includes=None):
 
+        if output_dir is None:
+            output_dir = self.output_dir
         if macros is None:
             macros = []
         if includes is None:
@@ -104,15 +108,48 @@ def compile (self,
         pp_opts = gen_preprocess_options (self.macros + macros,
                                           self.include_dirs + includes)
 
-        # use of ccflags_shared means we're blithely assuming that we're
-        # compiling for inclusion in a shared object! (will have to fix
-        # this when I add the ability to build a new Python)
-        cc_args = ['-c'] + pp_opts + \
-                  self.ccflags + self.ccflags_shared + \
-                  sources
+        # So we can mangle 'sources' without hurting the caller's data
+        orig_sources = sources
+        sources = copy (sources)
+
+        # Get the list of expected output (object) files and drop files we
+        # don't have to recompile.  (Simplistic check -- we just compare the
+        # source and object file, no deep dependency checking involving
+        # header files.  Hmmm.)
+        objects = self.object_filenames (sources, output_dir)
+        skipped = newer_pairwise (sources, objects)
+        for skipped_pair in skipped:
+            self.announce ("skipping %s (%s up-to-date)" % skipped_pair)
+
+        # If anything left to compile, compile it
+        if sources:
+            # XXX use of ccflags_shared means we're blithely assuming
+            # that we're compiling for inclusion in a shared object!
+            # (will have to fix this when I add the ability to build a
+            # new Python)
+            cc_args = ['-c'] + pp_opts + \
+                      self.ccflags + self.ccflags_shared + \
+                      sources
+            self.spawn ([self.cc] + cc_args)
+        
 
-        self.spawn ([self.cc] + cc_args)
-        return self.object_filenames (sources)
+        # Note that compiling multiple source files in the same go like
+        # we've just done drops the .o file in the current directory, which
+        # may not be what the caller wants (depending on the 'output_dir'
+        # parameter).  So, if necessary, fix that now by moving the .o
+        # files into the desired output directory.  (The alternative, of
+        # course, is to compile one-at-a-time with a -o option.  6 of one,
+        # 12/2 of the other...)
+
+        if output_dir:
+            for i in range (len (objects)):
+                src = os.path.basename (objects[i])
+                objects[i] = self.move_file (src, output_dir)
+
+        # Have to re-fetch list of object filenames, because we want to
+        # return *all* of them, including those that weren't recompiled on
+        # this call!
+        return self.object_filenames (orig_sources, output_dir)
     
 
     # XXX punting on 'link_static_lib()' for now -- it might be better for
@@ -124,23 +161,31 @@ def compile (self,
     def link_shared_lib (self,
                          objects,
                          output_libname,
+                         output_dir=None,
                          libraries=None,
                          library_dirs=None,
                          build_info=None):
         # XXX should we sanity check the library name? (eg. no
         # slashes)
-        self.link_shared_object (objects, "lib%s%s" % \
-                                 (output_libname, self._shared_lib_ext),
-                                 build_info=build_info)
-
+        self.link_shared_object (
+            objects,
+            "lib%s%s" % (output_libname, self._shared_lib_ext),
+            output_dir,
+            libraries,
+            library_dirs,
+            build_info)
+        
 
     def link_shared_object (self,
                             objects,
                             output_filename,
+                            output_dir=None,
                             libraries=None,
                             library_dirs=None,
                             build_info=None):
 
+        if output_dir is None:
+            output_dir = self.output_dir
         if libraries is None:
             libraries = []
         if library_dirs is None:
@@ -151,21 +196,37 @@ def link_shared_object (self,
         lib_opts = gen_lib_options (self.libraries + libraries,
                                     self.library_dirs + library_dirs,
                                     "-l%s", "-L%s")
-        ld_args = self.ldflags_shared + lib_opts + \
-                  objects + ['-o', output_filename]
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        # If any of the input object files are newer than the output shared
+        # object, relink.  Again, this is a simplistic dependency check:
+        # doesn't look at any of the libraries we might be linking with.
+        if newer_group (objects, output_filename):
+            ld_args = self.ldflags_shared + lib_opts + \
+                      objects + ['-o', output_filename]
 
-        self.spawn ([self.ld_shared] + ld_args)
+            self.spawn ([self.ld_shared] + ld_args)
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
 
 
-    def object_filenames (self, source_filenames):
+    def object_filenames (self, source_filenames, output_dir=None):
         outnames = []
         for inname in source_filenames:
-            outnames.append ( re.sub (r'\.(c|C|cc|cxx|cpp)$',
-                                      self._obj_ext, inname))
+            outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._obj_ext, inname)
+            outname = os.path.basename (outname)
+            if output_dir is not None:
+                outname = os.path.join (output_dir, outname)
+            outnames.append (outname)
         return outnames
 
-    def shared_object_filename (self, source_filename):
-        return re.sub (r'\.(c|C|cc|cxx|cpp)$', self._shared_lib_ext)
+    def shared_object_filename (self, source_filename, output_dir=None):
+        outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._shared_lib_ext)
+        outname = os.path.basename (outname)
+        if output_dir is not None:
+            outname = os.path.join (output_dir, outname)
+        return outname
 
     def library_filename (self, libname):
         return "lib%s%s" % (libname, self._static_lib_ext )

From 7a95432812567cf0ce8135334619b557229c7a15 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 13:52:12 +0000
Subject: [PATCH 0059/8469] Now run 'build_ext'. Default platform-specific
 build directory changed to 'build/platlib'.

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

diff --git a/command/build.py b/command/build.py
index d0e939e9b6..187dddc0b7 100644
--- a/command/build.py
+++ b/command/build.py
@@ -30,7 +30,7 @@ def set_final_options (self):
         if self.libdir is None:
             self.libdir = os.path.join (self.basedir, 'lib')
         if self.platdir is None:
-            self.platdir = os.path.join (self.basedir, 'plat')
+            self.platdir = os.path.join (self.basedir, 'platlib')
 
 
     def run (self):
@@ -44,6 +44,6 @@ def run (self):
         self.run_peer ('build_py')
 
         # And now 'build_ext'
-        #self.run_peer ('build_ext')
+        self.run_peer ('build_ext')
 
 # end class Build

From 3ae6c30ea10386dbf794f794af67fb5fe467d4e2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 13:54:06 +0000
Subject: [PATCH 0060/8469] Comment addition.

---
 command/build_py.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index 28aefa9e7e..0bbe339aa2 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -26,6 +26,9 @@ def set_default_options (self):
     def set_final_options (self):
         self.set_undefined_options ('build',
                                     ('libdir', 'dir'))
+        # 'package' is an alias option in Distribution (hmmm, we
+        # really should change to "pull" options from Distribution
+        # rather than "pushing" them out to commands...)
         if self.package is None:
             self.package = ''
 

From a66fe4c0aa10aa6856e000034efc58d7369aeee1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 13:55:34 +0000
Subject: [PATCH 0061/8469] Added support for 'package' option, including where
 to link the actual extension module to.

---
 command/build_ext.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index a3982c1b22..299158128b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -63,6 +63,8 @@ class BuildExt (Command):
     def set_default_options (self):
         self.extensions = None
         self.dir = None
+        self.package = None
+
         self.include_dirs = None
         self.define = None
         self.undef = None
@@ -74,6 +76,9 @@ def set_default_options (self):
     def set_final_options (self):
         self.set_undefined_options ('build', ('platdir', 'dir'))
 
+        if self.package is None:
+            self.package = ''
+
         # Make sure Python's include directories (for Python.h, config.h,
         # etc.) are in the include search path.  We have to roll our own
         # "exec include dir", because the Makefile parsed by sysconfig
@@ -92,12 +97,6 @@ def run (self):
 
         self.set_final_options ()
 
-        # XXX we should care about the package we compile extensions
-        # into! 
-
-        #(extensions, package) = \
-        #    self.distribution.get_options ('ext_modules', 'package')
-
         # 'self.extensions', as supplied by setup.py, is a list of 2-tuples.
         # Each tuple is simple:
         #    (ext_name, build_info)
@@ -187,8 +186,12 @@ def build_extensions (self, extensions):
             libraries = build_info.get ('libraries')
             library_dirs = build_info.get ('library_dirs')
             ext_filename = self.extension_filename (extension_name)
-            self.compiler.link_shared_object (objects, ext_filename,
-                                              libraries, library_dirs, build_info)
+            dest = os.path.dirname (
+                os.path.join (self.dir, self.package, ext_filename))
+            self.mkpath (dest)
+            self.compiler.link_shared_object (objects, ext_filename, dest,
+                                              libraries, library_dirs,
+                                              build_info=build_info)  # XXX hack!
 
     # build_extensions ()
 

From fc9f4cea6fc24a4e9fd19b16fbabdfad394e9742 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 13:57:26 +0000
Subject: [PATCH 0062/8469] Straightened up the selection of installation
 directories for platform-   specific files; it was somewhat broken, and the
 comments were dead   wrong. Now runs 'install_ext' command after
 'install_py'.

---
 command/install.py | 52 +++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/command/install.py b/command/install.py
index cf45004f07..6fb853618b 100644
--- a/command/install.py
+++ b/command/install.py
@@ -139,42 +139,33 @@ def set_final_options (self):
                 self.replace_sys_prefix ('BINLIBDEST', ('lib','python1.5'), 1)
 
 
-        # Here is where we decide where to install most library files:
-        # on POSIX systems, they go to 'site-packages' under the
-        # install_lib (determined above -- typically
-        # /usr/local/lib/python1.x).  Unfortunately, both
-        # platform-independent (.py*) and platform-specific (.so) files
-        # go to this directory, since there is no site-packages under
-        # $exec_prefix in the usual way that Python builds sys.path.  On
-        # non-POSIX systems, the situation is even worse: everything
-        # gets dumped right into $exec_prefix, not even a lib
-        # subdirectory!  But apparently that's what needs to be done to
-        # make it work under Python 1.5 -- hope we can get this fixed
-        # for 1.6!
+        # Here is where we decide where to install most library files: on
+        # POSIX systems, they go to 'site-packages' under the install_lib
+        # (determined above -- typically /usr/local/lib/python1.x).  Note
+        # that on POSIX systems, platform-specific files belong in
+        # 'site-packages' under install_platlib.  (The actual rule is that
+        # a module distribution that includes *any* platform-specific files
+        # -- ie. extension modules -- goes under install_platlib.  This
+        # solves the "can't find extension module in a package" problem.)
+        # On non-POSIX systems, install_lib and install_platlib are the
+        # same (eg. "C:\Program Files\Python\Lib" on Windows), as are
+        # install_site_lib and install_site_platlib (eg.
+        # "C:\Program Files\Python" on Windows) -- everything will be dumped
+        # right into one of the install_site directories.  (It doesn't
+        # really matter *which* one, of course, but I'll observe decorum
+        # and do it properly.)
 
         if self.install_site_lib is None:
             if os.name == 'posix':
                 self.install_site_lib = \
                     os.path.join (self.install_lib, 'site-packages')
             else:
-                self.install_site_lib = self.exec_prefix
+                self.install_site_lib = self.prefix
 
         if self.install_site_platlib is None:
             if os.name == 'posix':
-                # XXX ugh! this puts platform-specific files in with
-                # shared files, with no nice way to override it! (this
-                # might be a Python problem, though, not a Distutils
-                # problem...)
-
-                # NO: the way to fix this is
-                #   * any platform-dependent files in distribution?
-                #     yes: install under exec-prefix
-                #     no: install under prefix
-                # ...which will require a pretty major rethink of all
-                # this.  Damn.
-
                 self.install_site_platlib = \
-                    os.path.join (self.install_lib, 'site-packages')
+                    os.path.join (self.install_platlib, 'site-packages')
             else:
                 self.install_site_platlib = self.exec_prefix
 
@@ -240,12 +231,11 @@ def run (self):
 
         # Install modules in two steps: "platform-shared" files (ie. pure
         # python modules) and platform-specific files (compiled C
-        # extensions).
-
+        # extensions).  Note that 'install_py' is smart enough to install
+        # pure Python modules in the "platlib" directory if we built any
+        # extensions.
         self.run_peer ('install_py')
-
-        # don't have an 'install_ext' command just yet!
-        #self.run_peer ('install_ext'))
+        self.run_peer ('install_ext')
 
     # run ()
 

From 4c89c1907bed072e12306b6e7380b7e46b57285b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Sep 1999 13:58:34 +0000
Subject: [PATCH 0063/8469] Changed selection of installation directories (in
 'set_final_options()') so that pure Python modules are installed to the
 platform-specific directory if there are any extension modules in this
 distribution.

---
 command/install_lib.py | 20 ++++++++++++++------
 command/install_py.py  | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 876a34ce61..a2ba16cc35 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -23,15 +23,23 @@ def set_default_options (self):
         self.optimize = 1
 
     def set_final_options (self):
-        # If we don't have a 'dir' value, we'll have to ask the 'install'
-        # command for one.  (This usually means the user ran 'install_py'
-        # directly, rather than going through 'install' -- so in reality,
-        # 'find_command_obj()' will create an 'install' command object,
-        # which we then query.
 
+        # Find out from the 'build_ext' command if we were asked to build
+        # any extensions.  If so, that means even pure-Python modules in
+        # this distribution have to be installed to the "platlib"
+        # directory.
+        extensions = self.get_peer_option ('build_ext', 'extensions')
+        if extensions:
+            dir_option = 'install_site_platlib'
+        else:
+            dir_option = 'install_site_lib'
+
+        # Get all the information we need to install pure Python modules
+        # from the umbrella 'install' command -- build (source) directory,
+        # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    ('install_site_lib', 'dir'),
+                                    (dir_option, 'dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 
diff --git a/command/install_py.py b/command/install_py.py
index 876a34ce61..a2ba16cc35 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -23,15 +23,23 @@ def set_default_options (self):
         self.optimize = 1
 
     def set_final_options (self):
-        # If we don't have a 'dir' value, we'll have to ask the 'install'
-        # command for one.  (This usually means the user ran 'install_py'
-        # directly, rather than going through 'install' -- so in reality,
-        # 'find_command_obj()' will create an 'install' command object,
-        # which we then query.
 
+        # Find out from the 'build_ext' command if we were asked to build
+        # any extensions.  If so, that means even pure-Python modules in
+        # this distribution have to be installed to the "platlib"
+        # directory.
+        extensions = self.get_peer_option ('build_ext', 'extensions')
+        if extensions:
+            dir_option = 'install_site_platlib'
+        else:
+            dir_option = 'install_site_lib'
+
+        # Get all the information we need to install pure Python modules
+        # from the umbrella 'install' command -- build (source) directory,
+        # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    ('install_site_lib', 'dir'),
+                                    (dir_option, 'dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 

From cc443544d4b1095c5d358652a98a79c743599abb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:22:34 +0000
Subject: [PATCH 0064/8469] Basically a complete rewrite to support dealing
 with modules in whole packages and searching for source files by
 'package_dir'.

---
 command/build_py.py | 233 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 197 insertions(+), 36 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 0bbe339aa2..187e93b58c 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -7,6 +7,9 @@
 __rcsid__ = "$Id$"
 
 import string, os
+from types import *
+from glob import glob
+
 from distutils.core import Command
 from distutils.errors import *
 from distutils.util import mkpath, newer, make_file, copy_file
@@ -22,15 +25,17 @@ def set_default_options (self):
         self.dir = None
         self.modules = None
         self.package = None
+        self.package_dir = None
 
     def set_final_options (self):
         self.set_undefined_options ('build',
                                     ('libdir', 'dir'))
-        # 'package' is an alias option in Distribution (hmmm, we
-        # really should change to "pull" options from Distribution
-        # rather than "pushing" them out to commands...)
-        if self.package is None:
-            self.package = ''
+
+        # Get the distribution options that are aliases for build_py
+        # options -- list of packages and list of modules.
+        self.packages = self.distribution.packages
+        self.modules = self.distribution.py_modules
+        self.package_dir = self.distribution.package_dir
 
 
     def run (self):
@@ -54,40 +59,196 @@ def run (self):
         outfiles = []
         missing = []
 
-        # Loop over the list of "pure Python" modules, deriving
-        # input and output filenames and checking for missing
-        # input files.
+        # Two options control which modules will be installed: 'packages'
+        # and 'modules'.  The former lets us work with whole packages, not
+        # specifying individual modules at all; the latter is for
+        # specifying modules one-at-a-time.  Currently they are mutually
+        # exclusive: you can define one or the other (or neither), but not
+        # both.  It remains to be seen how limiting this is.
 
-        # it's ok not to have *any* py files, right?
-        if not self.modules:
+        # Dispose of the two "unusual" cases first: no pure Python modules
+        # at all (no problem, just return silently), and over-specified
+        # 'packages' and 'modules' options.
+
+        if not self.modules and not self.packages:
             return
+        if self.modules and self.packages:
+            raise DistutilsOptionError, \
+                  "build_py: supplying both 'packages' and 'modules' " + \
+                  "options not allowed"
+
+        # Now we're down to two cases: 'modules' only and 'packages' only.
+        if self.modules:
+            self.build_modules ()
+        else:
+            self.build_packages ()
+
+
+    # run ()
         
-        # XXX we should allow for wildcards, so eg. the Distutils setup.py
-        # file would just have to say
-        #   py_modules = ['distutils.*', 'distutils.command.*']
-        # without having to list each one explicitly.
-        for m in self.modules:
-            fn = apply (os.path.join, tuple (string.split (m, '.'))) + '.py'
-            if not os.path.exists (fn):
-                missing.append (fn)
+
+    def get_package_dir (self, package):
+        """Return the directory, relative to the top of the source
+           distribution, where package 'package' should be found
+           (at least according to the 'package_dir' option, if any)."""
+
+        if type (package) is StringType:
+            path = string.split (package, '.')
+        elif type (package) in (TupleType, ListType):
+            path = list (path)
+        else:
+            raise TypeError, "'package' must be a string, list, or tuple"
+
+        if not self.package_dir:
+            return apply (os.path.join, path)
+        else:
+            tail = []
+            while path:
+                try:
+                    pdir = self.package_dir[string.join (path, '.')]
+                except KeyError:
+                    tail.insert (0, path[-1])
+                    del path[-1]
+                else:
+                    tail.insert (0, pdir)
+                    return apply (os.path.join, tail)
             else:
-                infiles.append (fn)
-                outfiles.append (os.path.join (self.dir, self.package, fn))
-
-        # Blow up if any input files were not found.
-        if missing:
-            raise DistutilsFileError, \
-                  "missing files: " + string.join (missing, ' ')
-
-        # Loop over the list of input files, copying them to their
-        # temporary (build) destination.
-        created = {}
-        for i in range (len (infiles)):
-            outdir = os.path.split (outfiles[i])[0]
-            if not created.get(outdir):
-                self.mkpath (outdir)
-                created[outdir] = 1
-
-            self.copy_file (infiles[i], outfiles[i])
+                # arg! everything failed, we might as well have not even
+                # looked in package_dir -- oh well
+                return apply (os.path.join, tail)
+
+    # get_package_dir ()
+
+
+    def check_package (self, package, package_dir):
+
+        # Empty dir name means current directory, which we can probably
+        # assume exists.  Also, os.path.exists and isdir don't know about
+        # my "empty string means current dir" convention, so we have to
+        # circumvent them.
+        if package_dir != "":
+            if not os.path.exists (package_dir):
+                raise DistutilsFileError, \
+                      "package directory '%s' does not exist" % package_dir
+            if not os.path.isdir (package_dir):
+                raise DistutilsFileErorr, \
+                      ("supposed package directory '%s' exists, " +
+                       "but is not a directory") % package_dir
+
+        # Require __init__.py for all but the "root package"
+        if package != "":
+            init_py = os.path.join (package_dir, "__init__.py")
+            if not os.path.isfile (init_py):
+                self.warn (("package init file '%s' not found " +
+                            "(or not a regular file)") % init_py)
+    # check_package ()
+
+
+    def check_module (self, module, module_file):
+        if not os.path.isfile (module_file):
+            self.warn ("file %s (for module %s) not found" %
+                       module_file, module)
+            return 0
+        else:
+            return 1
+
+    # check_module ()
+
+
+    def find_modules (self, package, package_dir):
+        module_files = glob (os.path.join (package_dir, "*.py"))
+        module_pairs = []
+        for f in module_files:
+            module = os.path.splitext (os.path.basename (f))[0]
+            module_pairs.append (module, f)
+        return module_pairs
+
+
+    def build_module (self, module, module_file, package):
+
+        if type (package) is StringType:
+            package = string.split (package, '.')
+
+        # Now put the module source file into the "build" area -- this
+        # is easy, we just copy it somewhere under self.dir (the build
+        # directory for Python source).
+        outfile_path = package
+        outfile_path.append (module + ".py")
+        outfile_path.insert (0, self.dir)
+        outfile = apply (os.path.join, outfile_path)
+
+        dir = os.path.dirname (outfile)
+        self.mkpath (dir)
+        self.copy_file (module_file, outfile)
+
+
+    def build_modules (self):
+
+        # Map package names to tuples of useful info about the package:
+        #    (package_dir, checked)
+        # package_dir - the directory where we'll find source files for
+        #   this package
+        # checked - true if we have checked that the package directory
+        #   is valid (exists, contains __init__.py, ... ?)
+
+
+        packages = {}
+
+        # We treat modules-in-packages almost the same as toplevel modules,
+        # just the "package" for a toplevel is empty (either an empty
+        # string or empty list, depending on context).  Differences:
+        #   - don't check for __init__.py in directory for empty package
+
+        for module in self.modules:
+            path = string.split (module, '.')
+            package = tuple (path[0:-1])
+            module = path[-1]
+
+            try:
+                (package_dir, checked) = packages[package]
+            except KeyError:
+                package_dir = self.get_package_dir (package)
+                checked = 0
+
+            if not checked:
+                self.check_package (package, package_dir)
+                packages[package] = (package_dir, 1)
+
+            # XXX perhaps we should also check for just .pyc files
+            # (so greedy closed-source bastards can distribute Python
+            # modules too)
+            module_file = os.path.join (package_dir, module + ".py")
+            if not self.check_module (module, module_file):
+                continue
+
+            # Now "build" the module -- ie. copy the source file to
+            # self.dir (the build directory for Python source).  (Actually,
+            # it gets copied to the directory for this package under
+            # self.dir.)
+            self.build_module (module, module_file, package)
+
+    # build_modules ()
+
+
+    def build_packages (self):
+
+        for package in self.packages:
+            package_dir = self.get_package_dir (package)
+            self.check_package (package, package_dir)
+
+            # Get list of (module, module_file) tuples based on scanning
+            # the package directory.  Here, 'module' is the *unqualified*
+            # module name (ie. no dots, no package -- we already know its
+            # package!), and module_file is the path to the .py file,
+            # relative to the current directory (ie. including
+            # 'package_dir').
+            modules = self.find_modules (package, package_dir)
+
+            # Now loop over the modules we found, "building" each one (just
+            # copy it to self.dir).
+            for (module, module_file) in modules:
+                self.build_module (module, module_file, package)
+
+    # build_packages ()
                        
 # end class BuildPy

From 27fd97e6fa9b27d71a675771e3921954fe4f1ae8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:27:12 +0000
Subject: [PATCH 0065/8469] Some option changes:   - rename 'dir' to
 'build_dir'   - take 'package' from distribution option 'ext_package'   -
 take 'extensions' from distribution option 'ext_modules'   - take
 'include_dirs' from distribution Name keyword args explictly when calling
 CCompiler methods. Overhauled how we generate extension filenames (in
 'extension_filename()   and 'build_extension()') to take 'package' option
 into account.

---
 command/build_ext.py | 47 ++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 299158128b..a0ab61b389 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -16,9 +16,10 @@
 from distutils.errors import *
 
 
-# This is the same as a Python NAME, since we must accept any
-# valid module name for the extension name.
-extension_name_re = re.compile (r'^[a-zA-Z_][a-zA-Z_0-9]*$')
+# An extension name is just a dot-separated list of Python NAMEs (ie.
+# the same as a fully-qualified module name).
+extension_name_re = re.compile \
+    (r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$')
 
 
 class BuildExt (Command):
@@ -41,7 +42,7 @@ class BuildExt (Command):
     #     takes care of both command-line and client options
     #     in between set_default_options() and set_final_options())
 
-    options = [('dir=', 'd',
+    options = [('build-dir=', 'd',
                 "directory for compiled extension modules"),
                ('include-dirs=', 'I',
                 "list of directories to search for header files"),
@@ -57,12 +58,14 @@ class BuildExt (Command):
                 "directories to search for shared C libraries at runtime"),
                ('link-objects=', 'O',
                 "extra explicit link objects to include in the link"),
+               ('package=', 'p',
+                "Python package to put extension modules into"),
               ]
 
 
     def set_default_options (self):
         self.extensions = None
-        self.dir = None
+        self.build_dir = None
         self.package = None
 
         self.include_dirs = None
@@ -74,10 +77,13 @@ def set_default_options (self):
         self.link_objects = None
 
     def set_final_options (self):
-        self.set_undefined_options ('build', ('platdir', 'dir'))
+        self.set_undefined_options ('build', ('platdir', 'build_dir'))
 
         if self.package is None:
-            self.package = ''
+            self.package = self.distribution.ext_package
+
+        self.extensions = self.distribution.ext_modules
+        
 
         # Make sure Python's include directories (for Python.h, config.h,
         # etc.) are in the include search path.  We have to roll our own
@@ -87,7 +93,7 @@ def set_final_options (self):
         exec_py_include = os.path.join (exec_prefix, 'include',
                                         'python' + sys.version[0:3])
         if self.include_dirs is None:
-            self.include_dirs = []
+            self.include_dirs = self.distribution.include_dirs or []
         self.include_dirs.insert (0, py_include)
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
@@ -177,7 +183,9 @@ def build_extensions (self, extensions):
             
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
-            self.compiler.compile (sources, macros, include_dirs)
+            self.compiler.compile (sources,
+                                   macros=macros,
+                                   includes=include_dirs)
 
             objects = self.compiler.object_filenames (sources)
             extra_objects = build_info.get ('extra_objects')
@@ -185,18 +193,23 @@ def build_extensions (self, extensions):
                 objects.extend (extra_objects)
             libraries = build_info.get ('libraries')
             library_dirs = build_info.get ('library_dirs')
-            ext_filename = self.extension_filename (extension_name)
-            dest = os.path.dirname (
-                os.path.join (self.dir, self.package, ext_filename))
-            self.mkpath (dest)
-            self.compiler.link_shared_object (objects, ext_filename, dest,
-                                              libraries, library_dirs,
+            ext_filename = self.extension_filename \
+                           (extension_name, self.package)
+            ext_filename = os.path.join (self.build_dir, ext_filename)
+            dest_dir = os.path.dirname (ext_filename)
+            self.mkpath (dest_dir)
+            self.compiler.link_shared_object (objects, ext_filename, 
+                                              libraries=libraries,
+                                              library_dirs=library_dirs,
                                               build_info=build_info)  # XXX hack!
 
     # build_extensions ()
 
 
-    def extension_filename (self, ext_name):
-        return ext_name + SO
+    def extension_filename (self, ext_name, package=None):
+        if package:
+            ext_name = package + '.' + ext_name
+        ext_path = string.split (ext_name, '.')
+        return apply (os.path.join, ext_path) + SO
 
 # class BuildExt

From 6b9caf68d52702013783cd2225e4ad562c26e14b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:27:55 +0000
Subject: [PATCH 0066/8469] Only run build_py if we have pure Python modules,
 and build_ext if we have extension modules.

---
 command/build.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/command/build.py b/command/build.py
index 187dddc0b7..b74e51cfea 100644
--- a/command/build.py
+++ b/command/build.py
@@ -40,10 +40,14 @@ def run (self):
         # For now, "build" means "build_py" then "build_ext".  (Eventually
         # it should also build documentation.)
 
-        # Invoke the 'build_py' command
-        self.run_peer ('build_py')
-
-        # And now 'build_ext'
-        self.run_peer ('build_ext')
+        # Invoke the 'build_py' command to "build" pure Python modules
+        # (ie. copy 'em into the build tree)
+        if self.distribution.packages or self.distribution.py_modules:
+            self.run_peer ('build_py')
+
+        # And now 'build_ext' -- compile extension modules and put them
+        # into the build tree
+        if self.distribution.ext_modules:
+            self.run_peer ('build_ext')
 
 # end class Build

From 0fd123490a06bd8a56edc91e707293b3b37c3514 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:31:14 +0000
Subject: [PATCH 0067/8469] Added 'install_path' option for giving
 non-packagized module   distributions their own directory (and .pth file).
 Overhauled how we determine installation directories in  
 'set_final_options()' to separate platform-dependence and take  
 'install_path' option into account. Added 'create_path_file()' to create path
 config file when 'install_path'   given. Only run 'install_py' and
 'install_ext' when, respectively, there are   some pure Python modules and
 some extension modules in the distribution.

---
 command/install.py | 94 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 82 insertions(+), 12 deletions(-)

diff --git a/command/install.py b/command/install.py
index 6fb853618b..0e4ad3f016 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,8 +7,10 @@
 __rcsid__ = "$Id$"
 
 import sys, os, string
+from types import *
 from distutils import sysconfig
 from distutils.core import Command
+from distutils.util import write_file
 
 
 class Install (Command):
@@ -36,6 +38,8 @@ class Install (Command):
                 "platform-specific site directory"),
                ('install-scheme=', None,
                 "install to 'system' or 'site' library directory?"),
+               ('install-path=', None,
+                "extra intervening directories to put below install-lib"),
 
                # Where to install documentation (eventually!)
                ('doc-format=', None, "format of documentation to generate"),
@@ -73,6 +77,7 @@ def set_default_options (self):
         self.install_platlib = None
         self.install_site_lib = None
         self.install_site_platlib = None
+        self.install_path = None
 
         self.install_man = None
         self.install_html = None
@@ -155,19 +160,65 @@ def set_final_options (self):
         # really matter *which* one, of course, but I'll observe decorum
         # and do it properly.)
 
-        if self.install_site_lib is None:
-            if os.name == 'posix':
-                self.install_site_lib = \
-                    os.path.join (self.install_lib, 'site-packages')
+        # 'base' and 'platbase' are the base directories for installing
+        # site-local files, eg. "/usr/local/lib/python1.5/site-packages"
+        # or "C:\Program Files\Python"
+        if os.name == 'posix':
+            self.base = os.path.join (self.install_lib,
+                                      'site-packages')
+            self.platbase = os.path.join (self.install_platlib,
+                                          'site-packages')
+        else:
+            self.base = self.prefix
+            self.platbase = self.exec_prefix
+        
+        # 'path_file' and 'extra_dirs' are how we handle distributions
+        # that need to be installed to their own directory, but aren't
+        # package-ized yet.  'extra_dirs' is just a directory under
+        # 'base' or 'platbase' where toplevel modules will actually be
+        # installed; 'path_file' is the basename of a .pth file to drop
+        # in 'base' or 'platbase' (depending on the distribution).  Very
+        # often they will be the same, which is why we allow them to be
+        # supplied as a string or 1-tuple as well as a 2-element
+        # comma-separated string or a 2-tuple.
+        if self.install_path is None:
+            self.install_path = self.distribution.install_path
+
+        if self.install_path is not None:
+            if type (self.install_path) is StringType:
+                self.install_path = string.split (self.install_path, ',')
+
+            if len (self.install_path) == 1:
+                path_file = extra_dirs = self.install_path[0]
+            elif len (self.install_path) == 2:
+                (path_file, extra_dirs) = self.install_path
             else:
-                self.install_site_lib = self.prefix
+                raise DistutilsOptionError, \
+                      "'install_path' option must be a list, tuple, or " + \
+                      "comma-separated string with 1 or 2 elements"
+
+            # install path has slashes in it -- might need to convert to
+            # local form
+            if string.find (extra_dirs, '/') and os.name != "posix":
+                extra_dirs = string.split (extra_dirs, '/')
+                extra_dirs = apply (os.path.join, extra_dirs)
+        else:
+            path_file = None
+            extra_dirs = ''
+
+        # XXX should we warn if path_file and not extra_dirs (in which case
+        # the path file would be harmless but pointless)
+        self.path_file = path_file
+        self.extra_dirs = extra_dirs
+
+
+        if self.install_site_lib is None:
+            self.install_site_lib = os.path.join (self.base,
+                                                  extra_dirs)
 
         if self.install_site_platlib is None:
-            if os.name == 'posix':
-                self.install_site_platlib = \
-                    os.path.join (self.install_platlib, 'site-packages')
-            else:
-                self.install_site_platlib = self.exec_prefix
+            self.install_site_platlib = os.path.join (self.platbase,
+                                                      extra_dirs)
 
         #if self.install_scheme == 'site':
         #    install_lib = self.install_site_lib
@@ -234,9 +285,28 @@ def run (self):
         # extensions).  Note that 'install_py' is smart enough to install
         # pure Python modules in the "platlib" directory if we built any
         # extensions.
-        self.run_peer ('install_py')
-        self.run_peer ('install_ext')
+        if self.distribution.packages or self.distribution.py_modules:
+            self.run_peer ('install_py')
+        if self.distribution.ext_modules:
+            self.run_peer ('install_ext')
+
+        if self.path_file:
+            self.create_path_file ()
 
     # run ()
 
+
+    def create_path_file (self):
+
+        if self.distribution.ext_modules:
+            base = self.platbase
+        else:
+            base = self.base
+
+        filename = os.path.join (base, self.path_file + ".pth")
+        self.execute (write_file,
+                      (filename, [self.extra_dirs]),
+                      "creating %s" % filename)
+
+
 # class Install

From 36722463169bd14a78f8b0773ed38786fb73cd41 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:33:09 +0000
Subject: [PATCH 0068/8469] Added docstring, brought __all__ up-to-date.

---
 command/__init__.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/command/__init__.py b/command/__init__.py
index 9567fd13fb..9a5aef2002 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -1,6 +1,23 @@
-# this is solely for debugging convenience
+"""distutils.command
+
+Package containing implementation of all the standard Distutils
+commands.  Currently this means:
+
+  build
+  build_py
+  build_ext
+  install
+  install_py
+  install_ext
+
+but this list will undoubtedly grow with time."""
+
+__rcsid__ = "$Id$"
 
 __all__ = ['build',
            'build_py',
-           'make_blib',
+           'build_ext',
+           'install',
+           'install_py',
+           'install_ext',
           ]

From 79d143e97dffc76896eb203f2c0303337c051466 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:35:09 +0000
Subject: [PATCH 0069/8469] Typecheck elements of 'macros' parameter in
 'gen_preprocess_options().

---
 ccompiler.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index 0e505338be..2a80739c7b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -450,6 +450,14 @@ def gen_preprocess_options (macros, includes):
 
     pp_opts = []
     for macro in macros:
+
+        if not (type (macro) is TupleType and
+                1 <= len (macro) <= 2):
+            raise TypeError, \
+                  ("bad macro definition '%s': " +
+                   "each element of 'macros' list must be a 1- or 2-tuple") % \
+                  macro
+
         if len (macro) == 1:        # undefine this macro
             pp_opts.append ("-U%s" % macro[0])
         elif len (macro) == 2:

From b2bb06683462c1b7e9df90413d5af326002d93f3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:36:15 +0000
Subject: [PATCH 0070/8469] In 'link_shared_object()', try to be less sensitive
 to missing input files in dry-run mode.

---
 unixccompiler.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 0149313110..02fbc66aa7 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -202,7 +202,17 @@ def link_shared_object (self,
         # If any of the input object files are newer than the output shared
         # object, relink.  Again, this is a simplistic dependency check:
         # doesn't look at any of the libraries we might be linking with.
-        if newer_group (objects, output_filename):
+        # Note that we have to dance around errors comparing timestamps if
+        # we're in dry-run mode (yuck).
+        try:
+            newer = newer_group (objects, output_filename)
+        except OSError:
+            if self.dry_run:
+                newer = 1
+            else:
+                raise
+
+        if newer:
             ld_args = self.ldflags_shared + lib_opts + \
                       objects + ['-o', output_filename]
 

From 602f5dabbeffa74e600e9fca91ef7295521affce Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:37:51 +0000
Subject: [PATCH 0071/8469] Added 'write_file()' function. Added global cache
 PATH_CREATED used by 'mkpath()' to ensure it doesn't   try to create the same
 path more than once in a session (and, more   importantly, to ensure that it
 doesn't print "creating X" more than   once for each X per session!).

---
 util.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index bb790af438..85b04e7a80 100644
--- a/util.py
+++ b/util.py
@@ -15,6 +15,10 @@
 from distutils.errors import *
 
 
+# cache for by mkpath() -- in addition to cheapening redundant calls,
+# eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
+PATH_CREATED = {}
+
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
@@ -26,12 +30,17 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
        directory).  If 'verbose' is true, print a one-line summary of
        each mkdir to stdout."""
 
+    global PATH_CREATED
+
     # XXX what's the better way to handle verbosity? print as we create
     # each directory in the path (the current behaviour), or only announce
-    # the creation of the whole path, and force verbose=0 on all sub-calls?
+    # the creation of the whole path? (quite easy to do the latter since
+    # we're not using a recursive algorithm)
 
     if os.path.isdir (name):
         return
+    if PATH_CREATED.get (name):
+        return
 
     (head, tail) = os.path.split (name)
     tails = [tail]                      # stack of lone dirs to create
@@ -59,6 +68,8 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
             except os.error, (errno, errstr):
                 raise DistutilsFileError, "%s: %s" % (head, errstr)
 
+        PATH_CREATED[head] = 1
+
 # mkpath ()
 
 
@@ -394,3 +405,13 @@ def move_file (src, dst,
     return dst
 
 # move_file ()
+
+
+def write_file (filename, contents):
+    """Create a file with the specified naem and write 'contents' (a
+       sequence of strings without line terminators) to it."""
+
+    f = open (filename, "w")
+    for line in contents:
+        f.write (line + "\n")
+    f.close ()

From 5c182c049b03573ef283d05d1079319d201c669d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 21 Sep 1999 18:41:36 +0000
Subject: [PATCH 0072/8469] Ditched the whole notion of "alias options": this
 meant dropping the   'alias_options' table and getting rid of some hairy code
 in the   Distribution constructor. Resurrected the distribution options that
 describe the modules present   in the module distribution ('py_modules',
 'ext_modules'), and added   a bunch more: 'packages', 'package_dir',
 'ext_package', 'include_dirs',   'install_path'. Updated some comments. Added
 'warn()' method to Command. 'Command.get_command_name()' now stores generated
 command name in   self.command_name.

---
 core.py | 60 ++++++++++++++++++++-------------------------------------
 1 file changed, 21 insertions(+), 39 deletions(-)

diff --git a/core.py b/core.py
index a6c378d36c..e53392133d 100644
--- a/core.py
+++ b/core.py
@@ -114,19 +114,6 @@ class Distribution:
                       ('dry-run', 'n', "don't actually do anything"),
                      ]
 
-    # 'alias_options' map distribution options to command options -- the
-    # idea is that the most common, essential options can be directly
-    # specified as Distribution attributes, and the rest can go in the
-    # 'options' dictionary.  These aliases are for those common, essential
-    # options.
-    alias_options = { 'py_modules': ('build_py', 'modules'),
-                      'ext_modules': ('build_ext', 'extensions'),
-                      'package': [('build_py', 'package',),
-                                  ('build_ext', 'package')],
-                      'include_dirs': ('build_ext', 'include_dirs'),
-
-                    }
-
 
     # -- Creation/initialization methods -------------------------------
     
@@ -151,6 +138,7 @@ def __init__ (self, attrs=None):
         self.name = None
         self.version = None
         self.author = None
+        self.author_email = None
         self.url = None
         self.licence = None
         self.description = None
@@ -165,10 +153,13 @@ def __init__ (self, attrs=None):
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.
         # dictionary.        
-        # XXX not needed anymore! (I think...)
-        #self.py_modules = None
-        #self.ext_modules = None
-        #self.package = None
+        self.packages = None
+        self.package_dir = None
+        self.py_modules = None
+        self.ext_modules = None
+        self.ext_package = None
+        self.include_dirs = None
+        self.install_path = None
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
@@ -188,8 +179,9 @@ def __init__ (self, attrs=None):
         # '.get()' rather than a straight lookup.
         self.have_run = {}
 
-        # Now we'll use the attrs dictionary (from the client) to possibly
-        # override any or all of these distribution options
+        # Now we'll use the attrs dictionary (ultimately, keyword args from
+        # the client) to possibly override any or all of these distribution
+        # options.        
         if attrs:
 
             # Pull out the set of command options and work on them
@@ -206,26 +198,10 @@ def __init__ (self, attrs=None):
                 # loop over commands
             # if any command options                        
 
-            # Now work on the rest of the attributes.  Note that some of
-            # these may be aliases for command options, so we might go
-            # through some of the above again.
+            # Now work on the rest of the attributes.  Any attribute that's
+            # not already defined is invalid!
             for (key,val) in attrs.items():
-                alias = self.alias_options.get (key)
-                if alias:
-                    if type (alias) is ListType:
-                        for (command, cmd_option) in alias:
-                            cmd_obj = self.find_command_obj (command)
-                            cmd_obj.set_option (cmd_option, val)
-                    elif type (alias) is TupleType:
-                        (command, cmd_option) = alias
-                        cmd_obj = self.find_command_obj (command)
-                        cmd_obj.set_option (cmd_option, val)
-                    else:
-                        raise RuntimeError, \
-                              ("oops! bad alias option for '%s': " +
-                               "must be tuple or list of tuples") % key
-                    
-                elif hasattr (self, key):
+                if hasattr (self, key):
                     setattr (self, key, val)
                 else:
                     raise DistutilsOptionError, \
@@ -653,7 +629,8 @@ def get_command_name (self):
             # splits to ['', 'Foo', '', 'Bar', '', 'Baz', ''].  Hence
             # the 'filter' to strip out the empties.            
             words = filter (None, re.split (r'([A-Z][a-z]+)', class_name))
-            return string.join (map (string.lower, words), "_")
+            self.command_name = string.join (map (string.lower, words), "_")
+            return self.command_name
 
 
     def set_undefined_options (self, src_cmd, *option_pairs):
@@ -717,6 +694,11 @@ def run_peer (self, command):
 
     # -- External world manipulation -----------------------------------
 
+    def warn (self, msg):
+        sys.stderr.write ("warning: %s: %s\n" %
+                          (self.get_command_name(), msg))
+
+
     def execute (self, func, args, msg=None, level=1):
         """Perform some action that affects the outside world (eg.
            by writing to the filesystem).  Such actions are special because

From 366fb4718e7bad951328391a0439b6d07852b8fe Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Sep 1999 15:24:04 +0000
Subject: [PATCH 0073/8469] Added docstring and RCS id (apparently some Windows
 tar extractors ignore zero-byte files: grr...).

---
 __init__.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/__init__.py b/__init__.py
index e69de29bb2..18deaadf44 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1,11 @@
+"""distutils
+
+The main package for the Python Module Distribtion Utilities.  Normally
+used from a setup script as
+
+   from distutils.core import setup
+
+   setup (...)
+"""
+
+__rcsid__ = "$Id$"

From d2ce9d4fb72071aabbe879af96eb405739ee1dee Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:12:19 +0000
Subject: [PATCH 0074/8469] Added 'ready' flag and 'ensure_ready()' method to
 Command: together   they make sure that 'set_final_options()' has been
 called, but isn't   called redundantly. Changed Distribution to call
 'ensure_ready()' where it used to call   'set_final_options()', and in a few
 extra places as well. Lots of comment/docstring revisions and additions in
 both classes. New one-liner utility methods in Command: 'find_peer()',
 'spawn()'.

---
 core.py | 81 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/core.py b/core.py
index e53392133d..f0c97aa3ca 100644
--- a/core.py
+++ b/core.py
@@ -416,30 +416,25 @@ def run_command (self, command):
            Then invoke 'run()' on that command object (or an existing
            one)."""
 
-        # XXX currently, this is the only place where we invoke a
-        # command object's 'run()' method -- so it might make sense to
-        # put the 'set_final_options()' call here, too, instead of
-        # requiring every command's 'run()' to call it first.        
-
         # Already been here, done that? then return silently.
         if self.have_run.get (command):
             return
 
         self.announce ("running " + command)
         cmd_obj = self.find_command_obj (command)
+        cmd_obj.ensure_ready ()
         cmd_obj.run ()
         self.have_run[command] = 1
 
 
     def get_command_option (self, command, option):
-        """Create a command object for 'command' if necessary, finalize
-           its option values by invoking its 'set_final_options()'
-           method, and return the value of its 'option' option.  Raise
-           DistutilsOptionError if 'option' is not known for
-           that 'command'."""
+        """Create a command object for 'command' if necessary, ensure that
+           its option values are all set to their final values, and return
+           the value of its 'option' option.  Raise DistutilsOptionError if
+           'option' is not known for that 'command'."""
 
         cmd_obj = self.find_command_obj (command)
-        cmd_obj.set_final_options ()
+        cmd_obj.ensure_ready ()
         return cmd_obj.get_option (option)
         try:
             return getattr (cmd_obj, option)
@@ -449,14 +444,14 @@ def get_command_option (self, command, option):
 
 
     def get_command_options (self, command, *options):
-        """Create a command object for 'command' if necessary, finalize
-           its option values by invoking its 'set_final_options()'
-           method, and return the values of all the options listed in
-           'options' for that command.  Raise DistutilsOptionError if
-           'option' is not known for that 'command'."""
+        """Create a command object for 'command' if necessary, ensure that
+           its option values are all set to their final values, and return
+           a tuple containing the values of all the options listed in
+           'options' for that command.  Raise DistutilsOptionError if any
+           invalid option is supplied in 'options'."""
 
         cmd_obj = self.find_command_obj (command)
-        cmd_obj.set_final_options ()
+        cmd_obj.ensure_ready ()
         values = []
         try:
             for opt in options:
@@ -474,14 +469,14 @@ class Command:
     """Abstract base class for defining command classes, the "worker bees"
        of the Distutils.  A useful analogy for command classes is to
        think of them as subroutines with local variables called
-       "options".  The options are "declared" in 'set_initial_options()'
+       "options".  The options are "declared" in 'set_default_options()'
        and "initialized" (given their real values) in
        'set_final_options()', both of which must be defined by every
        command class.  The distinction between the two is necessary
        because option values might come from the outside world (command
        line, option file, ...), and any options dependent on other
        options must be computed *after* these outside influences have
-       been processed -- hence 'set_final_values()'.  The "body" of the
+       been processed -- hence 'set_final_options()'.  The "body" of the
        subroutine, where it does all its work based on the values of its
        options, is the 'run()' method, which must also be implemented by
        every command class."""
@@ -502,8 +497,21 @@ def __init__ (self, dist):
         self.distribution = dist
         self.set_default_options ()
 
+        # 'ready' records whether or not 'set_final_options()' has been
+        # called.  'set_final_options()' itself should not pay attention to
+        # this flag: it is the business of 'ensure_ready()', which always
+        # calls 'set_final_options()', to respect/update it.
+        self.ready = 0
+
     # end __init__ ()
 
+
+    def ensure_ready (self):
+        if not self.ready:
+            self.set_final_options ()
+        self.ready = 1
+        
+
     # Subclasses must define:
     #   set_default_options()
     #     provide default values for all options; may be overridden
@@ -664,22 +672,32 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
     def set_peer_option (self, command, option, value):
         """Attempt to simulate a command-line override of some option
-           value in another command.  Creates a command object for
-           'command' if necessary, sets 'option' to 'value', and invokes
-           'set_final_options()' on that command object.  This will only
-           have the desired effect if the command object for 'command'
-           has not previously been created.  Generally this is used to
-           ensure that the options in 'command' dependent on 'option'
-           are computed, hopefully (but not necessarily) deriving from
-           'value'.  It might be more accurate to call this method
-           'influence_dependent_peer_options()'."""        
+           value in another command.  Finds the command object for
+           'command', sets its 'option' to 'value', and unconditionally
+           calls 'set_final_options()' on it: this means that some command
+           objects may have 'set_final_options()' invoked more than once.
+           Even so, this is not entirely reliable: the other command may
+           already be initialized to its satisfaction, in which case the
+           second 'set_final_options()' invocation will have little or no
+           effect."""
 
         cmd_obj = self.distribution.find_command_obj (command)
         cmd_obj.set_option (option, value)
         cmd_obj.set_final_options ()
 
 
+    def find_peer (self, command, create=1):
+        """Wrapper around Distribution's 'find_command_obj()' method:
+           find (create if necessary and 'create' is true) the command
+           object for 'command'.."""
+
+        return self.distribution.find_command_obj (command, create)
+
+
     def get_peer_option (self, command, option):
+        """Find or create the command object for 'command', and return
+           its 'option' option."""
+
         cmd_obj = self.distribution.find_command_obj (command)
         return cmd_obj.get_option (option)
 
@@ -762,6 +780,13 @@ def move_file (self, src, dst, level=1):
                                self.distribution.dry_run)
 
 
+    def spawn (self, cmd, search_path=1, level=1):
+        from distutils.spawn import spawn
+        spawn (cmd, search_path,
+               self.distribution.verbose >= level,
+               self.distribution.dry_run)
+
+
     def make_file (self, infiles, outfile, func, args,
                     exec_msg=None, skip_msg=None, level=1):
 

From 9a476d732350a106b3dc6ac876320a51a5d22053 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:14:16 +0000
Subject: [PATCH 0075/8469] More tweaks to 'mkpath()':   - deal with empty tail
 from os.path.split() (eg. from trailing slash,     or backslash, or whatever)
   - check PATH_CREATED hash inside loop as well

---
 util.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/util.py b/util.py
index 85b04e7a80..aee95d3668 100644
--- a/util.py
+++ b/util.py
@@ -43,6 +43,8 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
         return
 
     (head, tail) = os.path.split (name)
+    if not tail:                        # in case 'name' has trailing slash
+        (head, tail) = os.path.split (head)
     tails = [tail]                      # stack of lone dirs to create
     
     while head and tail and not os.path.isdir (head):
@@ -59,6 +61,9 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     for d in tails:
         #print "head = %s, d = %s: " % (head, d),
         head = os.path.join (head, d)
+        if PATH_CREATED.get (head):
+            continue
+
         if verbose:
             print "creating", head
 

From e748eefe84902c7daee5e2bc2e34400b972fe08e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:20:55 +0000
Subject: [PATCH 0076/8469] Added 'extra_preargs' and 'extra_postargs'
 parameters to most methods,   which allowed us to get rid of the 'build_info'
 used in some places   (a temporary kludge to support MSVC++ "def" files).
 Deleted big comment whining about that kludge. Added 'compiler_type' class
 attribute. Overhauled 'new_compiler()': now takes 'compiler' argument along
 with   'plat' (both optional with sensible defaults), and looks them both up 
  in the new 'default_compiler' and 'compiler_class' dictionaries to   figure
 out where to get the concrete compiler class from. Reordered arguments to
 'gen_lib_options()' to match the order in   which the arguments are generated
 (ie. -L before -l).

---
 ccompiler.py | 141 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 94 insertions(+), 47 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 2a80739c7b..bfbb50faf3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -7,7 +7,7 @@
 
 __rcsid__ = "$Id$"
 
-import os
+import sys, os
 from types import *
 from copy import copy
 from distutils.errors import *
@@ -30,6 +30,15 @@ class CCompiler:
        most (all?) of those attributes may be varied on a per-compilation
        or per-link basis."""
 
+    # 'compiler_type' is a class attribute that identifies this class.  It
+    # keeps code that wants to know what kind of compiler it's dealing with
+    # from having to import all possible compiler classes just to do an
+    # 'isinstance'.  In concrete CCompiler subclasses, 'compiler_type'
+    # should really, really be one of the keys of the 'compiler_class'
+    # dictionary (see below -- used by the 'new_compiler()' factory
+    # function) -- authors of new compiler interface classes are
+    # responsible for updating 'compiler_class'!
+    compiler_type = None
 
     # XXX things not handled by this compiler abstraction model:
     #   * client can't provide additional options for a compiler,
@@ -251,7 +260,9 @@ def compile (self,
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None):
+                 includes=None,
+                 extra_preargs=None,
+                 extra_postargs=None):
         """Compile one or more C/C++ source files.  'sources' must be
            a list of strings, each one the name of a C/C++ source
            file.  Return a list of the object filenames generated
@@ -266,7 +277,16 @@ def compile (self,
 
            'includes', if given, must be a list of strings, the directories
            to add to the default include file search path for this
-           compilation only."""
+           compilation only.
+
+           'extra_preargs' and 'extra_postargs' are optional lists of extra
+           command-line arguments that will be, respectively, prepended or
+           appended to the generated command line immediately before
+           execution.  These will most likely be peculiar to the particular
+           platform and compiler being worked with, but are a necessary
+           escape hatch for those occasions when the abstract compiler
+           framework doesn't cut the mustard."""
+           
         pass
 
 
@@ -278,7 +298,9 @@ def link_static_lib (self,
                          output_libname,
                          output_dir=None,
                          libraries=None,
-                         library_dirs=None):
+                         library_dirs=None,
+                         extra_preargs=None,
+                         extra_postargs=None):
         """Link a bunch of stuff together to create a static library
            file.  The "bunch of stuff" consists of the list of object
            files supplied as 'objects', the extra object files supplied
@@ -292,42 +314,23 @@ def link_static_lib (self,
 
            'library_dirs', if supplied, should be a list of additional
            directories to search on top of the system default and those
-           supplied to 'add_library_dir()' and/or 'set_library_dirs()'."""
+           supplied to 'add_library_dir()' and/or 'set_library_dirs()'.
+
+           'extra_preargs' and 'extra_postargs' are as for 'compile()'
+           (except of course that they supply command-line arguments
+           for the particular linker being used)."""
 
         pass
     
 
-    # XXX passing in 'build_info' here is a kludge to deal with the
-    # oddities of one particular compiler (Visual C++).  For some reason,
-    # it needs to be told about ".def" files, and currently the
-    # 'build_info' hash allows this through a 'def_file' element.  The link
-    # methods for VC++ look for 'def_file' and transform it into the
-    # appropriate command-line options.  The current code is objectionable
-    # for a number of reasons: 1) if the link methods take 'build_info',
-    # why bother passing in libraries, library_dirs, etc.? 2) if the link
-    # methods do it, why not the compile methods? 3) build_info is part of
-    # the interface between setup.py and the 'build_ext' command -- it
-    # should stop there and not be propagated down into the compiler
-    # classes! and 4) I don't like elevating a platform- and
-    # compiler-specific oddity to "first-class" status in 'build_info' (oh
-    # well, at least it's not being reified in the compiler classes -- that
-    # would be really gross).
-    #
-    # Possible solutions:
-    #   - just pass build_info to all the compile/link methods, 
-    #     never mind all those other parameters and screw the
-    #     integrity of the interfaces
-    #   - add a mechanism for passing platform-specific and/or
-    #     compiler-specific compiler/linker options from setup.py
-    #     straight through to the appropriate compiler class
-
     def link_shared_lib (self,
                          objects,
                          output_libname,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
-                         build_info=None):
+                         extra_preargs=None,
+                         extra_postargs=None):
         """Link a bunch of stuff together to create a shared library
            file.  Has the same effect as 'link_static_lib()' except
            that the filename inferred from 'output_libname' will most
@@ -335,18 +338,20 @@ def link_shared_lib (self,
            almost certainly be different."""
         pass
     
+
     def link_shared_object (self,
                             objects,
                             output_filename,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
-                            build_info=None):
+                            extra_preargs=None,
+                            extra_postargs=None):
         """Link a bunch of stuff together to create a shared object
            file.  Much like 'link_shared_lib()', except the output filename
            is explicitly supplied as 'output_filename'.  If 'output_dir' is
            supplied, 'output_filename' is relative to it
-           (i.e. 'output_filename' can provide directoriy components if
+           (i.e. 'output_filename' can provide directory components if
            needed)."""
         pass
 
@@ -407,23 +412,65 @@ def move_file (self, src, dst):
 # class CCompiler
 
 
+# Map a platform ('posix', 'nt') to the default compiler type for
+# that platform.
+default_compiler = { 'posix': 'unix',
+                     'nt': 'msvc',
+                   }
+
+# Map compiler types to (module_name, class_name) pairs -- ie. where to
+# find the code that implements an interface to this compiler.  (The module
+# is assumed to be in the 'distutils' package.)
+compiler_class = { 'unix': ('unixccompiler', 'UnixCCompiler'),
+                   'msvc': ('msvccompiler', 'MSVCCompiler'),
+                 }
+
+
 def new_compiler (plat=None,
+                  compiler=None,
                   verbose=0,
                   dry_run=0):
-    """Generate a CCompiler instance for platform 'plat' (or the
-       current platform, if 'plat' not supplied).  Really instantiates
-       some concrete subclass of CCompiler, of course."""
-
-    if plat is None: plat = os.name
-    if plat == 'posix':
-        from unixccompiler import UnixCCompiler
-        return UnixCCompiler (verbose, dry_run)
-    elif plat == 'nt':
-        from msvccompiler import MSVCCompiler
-        return MSVCCompiler (verbose, dry_run)
-    else:
-        raise DistutilsPlatformError, \
-              "don't know how to compile C/C++ code on platform %s" % plat
+
+    """Generate an instance of some CCompiler subclass for the supplied
+       platform/compiler combination.  'plat' defaults to 'os.name'
+       (eg. 'posix', 'nt'), and 'compiler' defaults to the default
+       compiler for that platform.  Currently only 'posix' and 'nt'
+       are supported, and the default compilers are "traditional Unix
+       interface" (UnixCCompiler class) and Visual C++ (MSVCCompiler
+       class).  Note that it's perfectly possible to ask for a Unix
+       compiler object under Windows, and a Microsoft compiler object
+       under Unix -- if you supply a value for 'compiler', 'plat'
+       is ignored."""
+
+    if plat is None:
+        plat = os.name
+
+    try:
+        if compiler is None:
+            compiler = default_compiler[plat]
+        
+        (module_name, class_name) = compiler_class[compiler]
+    except KeyError:
+        msg = "don't know how to compile C/C++ code on platform '%s'" % plat
+        if compiler is not None:
+            msg = msg + " with '%s' compiler" % compiler
+        raise DistutilsPlatformError, msg
+              
+    try:
+        module_name = "distutils." + module_name
+        __import__ (module_name)
+        module = sys.modules[module_name]
+        klass = vars(module)[class_name]
+    except ImportError:
+        raise DistutilsModuleError, \
+              "can't compile C/C++ code: unable to load module '%s'" % \
+              module_name
+    except KeyError:
+        raise DistutilsModuleError, \
+              ("can't compile C/C++ code: unable to find class '%s' " +
+               "in module '%s'") % (class_name, module_name)
+
+    return klass (verbose, dry_run)
 
 
 def gen_preprocess_options (macros, includes):
@@ -477,7 +524,7 @@ def gen_preprocess_options (macros, includes):
 # gen_preprocess_options ()
 
 
-def gen_lib_options (libraries, library_dirs, lib_format, dir_format):
+def gen_lib_options (library_dirs, libraries, dir_format, lib_format):
     """Generate linker options for searching library directories and
        linking with specific libraries.  'libraries' and 'library_dirs'
        are, respectively, lists of library names (not filenames!) and

From 5a10a6e29b3f8bab23620ad6385efb0d7f5b4486 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:22:50 +0000
Subject: [PATCH 0077/8469] Catch up with latest changes in CCompiler:   - add
 'extra_preargs' and 'extra_postargs' parameters (and use them!)   - added
 'compiler_type' class attribute   - respect reordered arguments to
 'gen_lib_options()'

---
 unixccompiler.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 02fbc66aa7..f3d9591b4a 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -53,6 +53,8 @@ class UnixCCompiler (CCompiler):
     # are specified via {add,set}_include_dirs(), and there's no way to
     # distinguish them.  This might be a bug.
 
+    compiler_type = 'unix'
+
     _obj_ext = '.o'
     _exe_ext = ''
     _shared_lib_ext = SO
@@ -89,7 +91,9 @@ def compile (self,
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None):
+                 includes=None,
+                 extra_preargs=None,
+                 extra_postargs=None):
 
         if output_dir is None:
             output_dir = self.output_dir
@@ -130,6 +134,10 @@ def compile (self,
             cc_args = ['-c'] + pp_opts + \
                       self.ccflags + self.ccflags_shared + \
                       sources
+            if extra_preargs:
+                cc_args[:0] = extra_preargs
+            if extra_postargs:
+                cc_args.extend (extra_postargs)
             self.spawn ([self.cc] + cc_args)
         
 
@@ -164,7 +172,8 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
-                         build_info=None):
+                         extra_preargs=None,
+                         extra_postargs=None):
         # XXX should we sanity check the library name? (eg. no
         # slashes)
         self.link_shared_object (
@@ -173,7 +182,8 @@ def link_shared_lib (self,
             output_dir,
             libraries,
             library_dirs,
-            build_info)
+            extra_preargs,
+            extra_postargs)
         
 
     def link_shared_object (self,
@@ -182,7 +192,8 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
-                            build_info=None):
+                            extra_preargs=None,
+                            extra_postargs=None):
 
         if output_dir is None:
             output_dir = self.output_dir
@@ -190,12 +201,10 @@ def link_shared_object (self,
             libraries = []
         if library_dirs is None:
             library_dirs = []
-        if build_info is None:
-            build_info = {}
         
-        lib_opts = gen_lib_options (self.libraries + libraries,
-                                    self.library_dirs + library_dirs,
-                                    "-l%s", "-L%s")
+        lib_opts = gen_lib_options (self.library_dirs + library_dirs,
+                                    self.libraries + libraries,
+                                    "-L%s", "-l%s")
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
@@ -215,7 +224,10 @@ def link_shared_object (self,
         if newer:
             ld_args = self.ldflags_shared + lib_opts + \
                       objects + ['-o', output_filename]
-
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
             self.spawn ([self.ld_shared] + ld_args)
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)

From 746c9403521ce115a30d553275740a65af7efb63 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:29:10 +0000
Subject: [PATCH 0078/8469] Catch up with latest changes in CCompiler:   - add
 'extra_preargs' and 'extra_postargs' parameters (and use them!)   - got rid
 of 'build_info' kludge parameter   - added 'compiler_type' class attribute  
 - respect reordered arguments to 'gen_lib_options()' Also added 'output_dir'
 parameter (catching up with older change in   CCompiler) -- BUT this is
 presently ignored by all methods! Deleted some more docstrings redundant with
 CCompiler. Dropped generated of "/DEF:" argument --- that's now done by   the
 'build_ext' command.

---
 msvccompiler.py | 103 +++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index f328232bc0..64b2730713 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -1,7 +1,7 @@
 """distutils.ccompiler
 
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
-for the Microsoft Visual Studio """
+for the Microsoft Visual Studio."""
 
 
 # created 1999/08/19, Perry Stoll
@@ -19,6 +19,8 @@ class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
        as defined by the CCompiler abstract class."""
 
+    compiler_type = 'msvc'
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0):
@@ -50,26 +52,19 @@ def __init__ (self,
     _exe_ext = '.exe'
     _shared_lib_ext = '.dll'
     _static_lib_ext = '.lib'
+
+    # XXX the 'output_dir' parameter is ignored by the methods in this
+    # class!  I just put it in to be consistent with CCompiler and
+    # UnixCCompiler, but someone who actually knows Visual C++ will
+    # have to make it work...
     
     def compile (self,
                  sources,
+                 output_dir=None,
                  macros=None,
-                 includes=None):
-        """Compile one or more C/C++ source files.  'sources' must be
-           a list of strings, each one the name of a C/C++ source
-           file.  Return a list of the object filenames generated
-           (one for each source filename in 'sources').
-
-           'macros', if given, must be a list of macro definitions.  A
-           macro definition is either a (name, value) 2-tuple or a (name,)
-           1-tuple.  The former defines a macro; if the value is None, the
-           macro is defined without an explicit value.  The 1-tuple case
-           undefines a macro.  Later definitions/redefinitions/
-           undefinitions take precedence.
-
-           'includes', if given, must be a list of strings, the directories
-           to add to the default include file search path for this
-           compilation only."""
+                 includes=None,
+                 extra_preargs=None,
+                 extra_postargs=None):
 
         if macros is None:
             macros = []
@@ -95,11 +90,16 @@ def compile (self,
             inputOpt  = fileOpt + srcFile
             outputOpt = "/Fo"   + objFile
 
-            pp_opts = base_pp_opts + [ outputOpt, inputOpt ]
+            cc_args = self.compile_options + \
+                      base_pp_opts + \
+                      [outputOpt, inputOpt]
+            if extra_preargs:
+                cc_args[:0] = extra_preargs
+            if extra_postargs:
+                cc_args.extend (extra_postargs)
 
-            self.spawn( [ self.cc ] + self.compile_options + pp_opts)
+            self.spawn ([self.cc] + cc_args)
             objectFiles.append( objFile )
-
         return objectFiles
 
 
@@ -109,39 +109,27 @@ def compile (self,
     def link_static_lib (self,
                          objects,
                          output_libname,
+                         output_dir=None,
                          libraries=None,
-                         library_dirs=None):
-        """Link a bunch of stuff together to create a static library
-           file.  The "bunch of stuff" consists of the list of object
-           files supplied as 'objects', the extra object files supplied
-           to 'add_link_object()' and/or 'set_link_objects()', the
-           libraries supplied to 'add_library()' and/or
-           'set_libraries()', and the libraries supplied as 'libraries'
-           (if any).
-
-           'output_libname' should be a library name, not a filename;
-           the filename will be inferred from the library name.
-
-           'library_dirs', if supplied, should be a list of additional
-           directories to search on top of the system default and those
-           supplied to 'add_library_dir()' and/or 'set_library_dirs()'."""
-        
+                         library_dirs=None,
+                         extra_preargs=None,
+                         extra_postargs=None):
+
         if libraries is None:
             libraries = []
         if library_dirs is None:
             library_dirs = []
-        if build_info is None:
-            build_info = {}
         
         lib_opts = gen_lib_options (self.libraries + libraries,
                                     self.library_dirs + library_dirs,
                                     "%s.lib", "/LIBPATH:%s")
 
-        if build_info.has_key('def_file') :
-            lib_opts.append('/DEF:' + build_info['def_file'] )
-                            
         ld_args = self.ldflags_static + lib_opts + \
                   objects + ['/OUT:' + output_filename]
+        if extra_preargs:
+            ld_args[:0] = extra_preargs
+        if extra_postargs:
+            ld_args.extend (extra_postargs)
 
         self.spawn ( [ self.link ] + ld_args )
     
@@ -149,25 +137,25 @@ def link_static_lib (self,
     def link_shared_lib (self,
                          objects,
                          output_libname,
+                         output_dir=None,
                          libraries=None,
                          library_dirs=None,
-                         build_info=None):
-        """Link a bunch of stuff together to create a shared library
-           file.  Has the same effect as 'link_static_lib()' except
-           that the filename inferred from 'output_libname' will most
-           likely be different, and the type of file generated will
-           almost certainly be different."""
+                         extra_preargs=None,
+                         extra_postargs=None):
+
         # XXX should we sanity check the library name? (eg. no
         # slashes)
-        self.link_shared_object (objects, self.shared_library_name(output_libname),
-                                 build_info=build_info )
+        self.link_shared_object (objects,
+                                 self.shared_library_name(output_libname))
     
     def link_shared_object (self,
                             objects,
                             output_filename,
+                            output_dir=None,
                             libraries=None,
                             library_dirs=None,
-                            build_info=None):
+                            extra_preargs=None,
+                            extra_postargs=None):
         """Link a bunch of stuff together to create a shared object
            file.  Much like 'link_shared_lib()', except the output
            filename is explicitly supplied as 'output_filename'."""
@@ -175,18 +163,17 @@ def link_shared_object (self,
             libraries = []
         if library_dirs is None:
             library_dirs = []
-        if build_info is None:
-            build_info = {}
         
-        lib_opts = gen_lib_options (self.libraries + libraries,
-                                    self.library_dirs + library_dirs,
-                                    "%s.lib", "/LIBPATH:%s")
+        lib_opts = gen_lib_options (self.library_dirs + library_dirs,
+                                    self.libraries + libraries,
+                                    "/LIBPATH:%s", "%s.lib")
 
-        if build_info.has_key('def_file') :
-            lib_opts.append('/DEF:' + build_info['def_file'] )
-                            
         ld_args = self.ldflags_shared + lib_opts + \
                   objects + ['/OUT:' + output_filename]
+        if extra_preargs:
+            ld_args[:0] = extra_preargs
+        if extra_postargs:
+            ld_args.extend (extra_postargs)
 
         self.spawn ( [ self.link ] + ld_args )
 

From ef61002f9b2e49fe27ff73f7da6003844eac6943 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:38:18 +0000
Subject: [PATCH 0079/8469] Renamed many options to be consistent across
 commands. Tweaked some help strings to be consistent with documentation.
 Don't call 'set_final_options()' in 'run()' anymore -- that's now  
 guaranteed to be taken care of for us by the Distribution instance.

---
 command/build.py       | 31 ++++++++++++++++---------------
 command/install.py     | 16 +++++++---------
 command/install_ext.py |  9 ++++-----
 command/install_lib.py | 10 ++++------
 command/install_py.py  | 10 ++++------
 5 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/command/build.py b/command/build.py
index b74e51cfea..1586e60b07 100644
--- a/command/build.py
+++ b/command/build.py
@@ -12,31 +12,32 @@
 
 class Build (Command):
 
-    options = [('basedir=', 'b', "base directory for build library"),
-               ('libdir=', 'l', "directory for platform-shared files"),
-               ('platdir=', 'p', "directory for platform-specific files"),
+    options = [('build-base=', 'b',
+                "base directory for build library"),
+               ('build-lib=', 'l',
+                "directory for platform-shared files"),
+               ('build-platlib=', 'p',
+                "directory for platform-specific files"),
               ]
 
     def set_default_options (self):
-        self.basedir = 'build'
-        # these are decided only after 'basedir' has its final value
+        self.build_base = 'build'
+        # these are decided only after 'build_base' has its final value
         # (unless overridden by the user or client)
-        self.libdir = None
-        self.platdir = None
+        self.build_lib = None
+        self.build_platlib = None
 
     def set_final_options (self):
-        # 'libdir' and 'platdir' just default to 'lib' and 'plat' under
-        # the base build directory
-        if self.libdir is None:
-            self.libdir = os.path.join (self.basedir, 'lib')
-        if self.platdir is None:
-            self.platdir = os.path.join (self.basedir, 'platlib')
+        # 'build_lib' and 'build_platlib' just default to 'lib' and
+        # 'platlib' under the base build directory
+        if self.build_lib is None:
+            self.build_lib = os.path.join (self.build_base, 'lib')
+        if self.build_platlib is None:
+            self.build_platlib = os.path.join (self.build_base, 'platlib')
 
 
     def run (self):
 
-        self.set_final_options ()
-
         # For now, "build" means "build_py" then "build_ext".  (Eventually
         # it should also build documentation.)
 
diff --git a/command/install.py b/command/install.py
index 0e4ad3f016..cd12f6fc5b 100644
--- a/command/install.py
+++ b/command/install.py
@@ -16,16 +16,16 @@
 class Install (Command):
 
     options = [('prefix=', None, "installation prefix"),
-               ('execprefix=', None,
+               ('exec-prefix=', None,
                 "prefix for platform-specific files"),
 
                # Build directories: where to install from
                ('build-base=', None,
                 "base build directory"),
                ('build-lib=', None,
-                "build directory for non-platform-specific library files"),
+                "build directory for pure Python modules"),
                ('build-platlib=', None,
-                "build directory for platform-specific library files"),
+                "build directory for extension modules"),
 
                # Installation directories: where to put modules and packages
                ('install-lib=', None,
@@ -113,11 +113,11 @@ def set_final_options (self):
         # to fix things.
 
         # Figure out the build directories, ie. where to install from
-        self.set_peer_option ('build', 'basedir', self.build_base)
+        self.set_peer_option ('build', 'build_base', self.build_base)
         self.set_undefined_options ('build',
-                                    ('basedir', 'build_base'),
-                                    ('libdir', 'build_lib'),
-                                    ('platdir', 'build_platlib'))
+                                    ('build_base', 'build_base'),
+                                    ('build_lib', 'build_lib'),
+                                    ('build_platlib', 'build_platlib'))
 
         # Figure out actual installation directories; the basic principle
         # is: if the user supplied nothing, then use the directories that
@@ -275,8 +275,6 @@ def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
 
     def run (self):
 
-        self.set_final_options ()
-
         # Obviously have to build before we can install
         self.run_peer ('build')
 
diff --git a/command/install_ext.py b/command/install_ext.py
index 360a8027b7..3fb756c6a1 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -11,28 +11,27 @@
 
 class InstallExt (Command):
 
-    options = [('dir=', 'd', "directory to install to"),
+    options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
               ]
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
-        self.dir = None
+        self.install_dir = None
         self.build_dir = None
 
     def set_final_options (self):
         self.set_undefined_options ('install',
                                     ('build_platlib', 'build_dir'),
-                                    ('install_site_platlib', 'dir'))
+                                    ('install_site_platlib', 'install_dir'))
 
     def run (self):
-        self.set_final_options ()
 
         # Dump the entire "build/platlib" directory (or whatever it really
         # is; "build/platlib" is the default) to the installation target
         # (eg. "/usr/local/lib/python1.5/site-packages").  Note that
         # putting files in the right package dir is already done when we
         # build.
-        outfiles = self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.install_dir)
 
 # class InstallExt
diff --git a/command/install_lib.py b/command/install_lib.py
index a2ba16cc35..978bb3b958 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -8,7 +8,7 @@
 
 class InstallPy (Command):
 
-    options = [('dir=', 'd', "directory to install to"),
+    options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),
                ('optimize', 'o', "compile .py to .pyo (optimized)"),
@@ -17,7 +17,7 @@ class InstallPy (Command):
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
-        self.dir = None
+        self.install_dir = None
         self.build_dir = None
         self.compile = 1
         self.optimize = 1
@@ -39,18 +39,16 @@ def set_final_options (self):
         # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    (dir_option, 'dir'),
+                                    (dir_option, 'install_dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 
 
     def run (self):
 
-        self.set_final_options ()
-
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        outfiles = self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.install_dir)
                    
         # (Optionally) compile .py to .pyc
         # XXX hey! we can't control whether we optimize or not; that's up
diff --git a/command/install_py.py b/command/install_py.py
index a2ba16cc35..978bb3b958 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -8,7 +8,7 @@
 
 class InstallPy (Command):
 
-    options = [('dir=', 'd', "directory to install to"),
+    options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),
                ('optimize', 'o', "compile .py to .pyo (optimized)"),
@@ -17,7 +17,7 @@ class InstallPy (Command):
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
-        self.dir = None
+        self.install_dir = None
         self.build_dir = None
         self.compile = 1
         self.optimize = 1
@@ -39,18 +39,16 @@ def set_final_options (self):
         # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    (dir_option, 'dir'),
+                                    (dir_option, 'install_dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 
 
     def run (self):
 
-        self.set_final_options ()
-
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
-        outfiles = self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.install_dir)
                    
         # (Optionally) compile .py to .pyc
         # XXX hey! we can't control whether we optimize or not; that's up

From dc070bb95b5ab859dc3a9fa613a960a62c977f45 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:44:57 +0000
Subject: [PATCH 0080/8469] Renamed 'dir' option to be consistent with other
 commands. Don't call 'set_final_options()' in 'run()' anymore -- that's now  
 guaranteed to be taken care of for us by the Distribution instance.
 Rearranged to bit to allow outsiders (specifically, the 'dist' command)   to
 find out what modules we would build:   - 'find_modules()' renamed to
 'find_package_modules()'   - most of 'build_modules()' abstracted out to
 'find_modules()'   - added 'get_source_files()' (for the 'dist' command to
 use)   - drastically simplified 'build_modules()' -- now just a wrapper
 around     'find_modules()' and 'build_module()'

---
 command/build_py.py | 101 +++++++++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 35 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 187e93b58c..3a7a43bb1e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -17,19 +17,19 @@
 
 class BuildPy (Command):
 
-    options = [('dir=', 'd', "directory for platform-shared files"),
+    options = [('build-dir=', 'd', "directory for platform-shared files"),
               ]
 
 
     def set_default_options (self):
-        self.dir = None
+        self.build_dir = None
         self.modules = None
         self.package = None
         self.package_dir = None
 
     def set_final_options (self):
         self.set_undefined_options ('build',
-                                    ('libdir', 'dir'))
+                                    ('build_lib', 'build_dir'))
 
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.
@@ -53,8 +53,6 @@ def run (self):
         # metadata to know that a file is meant to be interpreted by
         # Python?)
 
-        self.set_final_options ()
-
         infiles = []
         outfiles = []
         missing = []
@@ -155,7 +153,7 @@ def check_module (self, module, module_file):
     # check_module ()
 
 
-    def find_modules (self, package, package_dir):
+    def find_package_modules (self, package, package_dir):
         module_files = glob (os.path.join (package_dir, "*.py"))
         module_pairs = []
         for f in module_files:
@@ -164,36 +162,18 @@ def find_modules (self, package, package_dir):
         return module_pairs
 
 
-    def build_module (self, module, module_file, package):
-
-        if type (package) is StringType:
-            package = string.split (package, '.')
-
-        # Now put the module source file into the "build" area -- this
-        # is easy, we just copy it somewhere under self.dir (the build
-        # directory for Python source).
-        outfile_path = package
-        outfile_path.append (module + ".py")
-        outfile_path.insert (0, self.dir)
-        outfile = apply (os.path.join, outfile_path)
-
-        dir = os.path.dirname (outfile)
-        self.mkpath (dir)
-        self.copy_file (module_file, outfile)
-
-
-    def build_modules (self):
-
+    def find_modules (self):
         # Map package names to tuples of useful info about the package:
         #    (package_dir, checked)
         # package_dir - the directory where we'll find source files for
         #   this package
         # checked - true if we have checked that the package directory
         #   is valid (exists, contains __init__.py, ... ?)
-
-
         packages = {}
 
+        # List of (module, package, filename) tuples to return
+        modules = []
+
         # We treat modules-in-packages almost the same as toplevel modules,
         # just the "package" for a toplevel is empty (either an empty
         # string or empty list, depending on context).  Differences:
@@ -202,7 +182,7 @@ def build_modules (self):
         for module in self.modules:
             path = string.split (module, '.')
             package = tuple (path[0:-1])
-            module = path[-1]
+            module_base = path[-1]
 
             try:
                 (package_dir, checked) = packages[package]
@@ -217,14 +197,65 @@ def build_modules (self):
             # XXX perhaps we should also check for just .pyc files
             # (so greedy closed-source bastards can distribute Python
             # modules too)
-            module_file = os.path.join (package_dir, module + ".py")
+            module_file = os.path.join (package_dir, module_base + ".py")
             if not self.check_module (module, module_file):
                 continue
 
+            modules.append ((module, package, module_file))
+
+        return modules
+
+    # find_modules ()
+
+
+    def get_source_files (self):
+
+        if self.modules:
+            modules = self.find_modules ()
+        else:
+            modules = []
+            for package in self.packages:
+                package_dir = self.get_package_dir (package)
+                m = self.find_package_modules (package, package_dir)
+                modules.extend (m)
+
+        # Both find_modules() and find_package_modules() return a list of
+        # tuples where the last element of each tuple is the filename --
+        # what a happy coincidence!
+        filenames = []
+        for module in modules:
+            filenames.append (module[-1])
+
+        return filenames                
+
+
+    def build_module (self, module, module_file, package):
+
+        if type (package) is StringType:
+            package = string.split (package, '.')
+
+        # Now put the module source file into the "build" area -- this is
+        # easy, we just copy it somewhere under self.build_dir (the build
+        # directory for Python source).
+        outfile_path = package
+        outfile_path.append (module + ".py")
+        outfile_path.insert (0, self.build_dir)
+        outfile = apply (os.path.join, outfile_path)
+
+        dir = os.path.dirname (outfile)
+        self.mkpath (dir)
+        self.copy_file (module_file, outfile)
+
+
+    def build_modules (self):
+
+        modules = self.find_modules()
+        for (module, package, module_file) in modules:
+
             # Now "build" the module -- ie. copy the source file to
-            # self.dir (the build directory for Python source).  (Actually,
-            # it gets copied to the directory for this package under
-            # self.dir.)
+            # self.build_dir (the build directory for Python source).
+            # (Actually, it gets copied to the directory for this package
+            # under self.build_dir.)
             self.build_module (module, module_file, package)
 
     # build_modules ()
@@ -242,10 +273,10 @@ def build_packages (self):
             # package!), and module_file is the path to the .py file,
             # relative to the current directory (ie. including
             # 'package_dir').
-            modules = self.find_modules (package, package_dir)
+            modules = self.find_package_modules (package, package_dir)
 
             # Now loop over the modules we found, "building" each one (just
-            # copy it to self.dir).
+            # copy it to self.build_dir).
             for (module, module_file) in modules:
                 self.build_module (module, module_file, package)
 

From 0e1de2192cf0ccfd9196aec77cdae0ae04eda971 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:49:35 +0000
Subject: [PATCH 0081/8469] Added 'package' option. Catch up with renamed
 'platdir' -> 'build_platlib' option in 'build'. Don't call
 'set_final_options()' in 'run()' anymore -- that's now   guaranteed to be
 taken care of for us by the Distribution instance. If 'include_dirs' is a
 string, split it on os.pathsep (this is half-   hearted -- support for
 setting compile/link options on the command   line is totally lame and
 probably won't work at all). Added 'get_source_files()' for use by 'dist'
 command. Added code to 'build_extensions()' to figure out the "def file" to
 use   with MSVC++ and add it to the linker command line as an
 "extra_postarg".

---
 command/build_ext.py | 51 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index a0ab61b389..8c5065f6bc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -58,8 +58,6 @@ class BuildExt (Command):
                 "directories to search for shared C libraries at runtime"),
                ('link-objects=', 'O',
                 "extra explicit link objects to include in the link"),
-               ('package=', 'p',
-                "Python package to put extension modules into"),
               ]
 
 
@@ -76,8 +74,9 @@ def set_default_options (self):
         self.rpath = None
         self.link_objects = None
 
+
     def set_final_options (self):
-        self.set_undefined_options ('build', ('platdir', 'build_dir'))
+        self.set_undefined_options ('build', ('build_platlib', 'build_dir'))
 
         if self.package is None:
             self.package = self.distribution.ext_package
@@ -94,6 +93,10 @@ def set_final_options (self):
                                         'python' + sys.version[0:3])
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
+        if type (self.include_dirs) is StringType:
+            self.include_dirs = string.split (self.include_dirs,
+                                              os.pathsep)
+
         self.include_dirs.insert (0, py_include)
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
@@ -101,8 +104,6 @@ def set_final_options (self):
 
     def run (self):
 
-        self.set_final_options ()
-
         # 'self.extensions', as supplied by setup.py, is a list of 2-tuples.
         # Each tuple is simple:
         #    (ext_name, build_info)
@@ -172,6 +173,19 @@ def check_extensions_list (self, extensions):
     # check_extensions_list ()
 
 
+    def get_source_files (self):
+
+        filenames = []
+
+        # Wouldn't it be neat if we knew the names of header files too...
+        for (extension_name, build_info) in extensions:
+            sources = build_info.get ('sources')
+            if type (sources) in (ListType, TupleType):
+                filenames.extend (sources)
+
+        return filenames
+
+
     def build_extensions (self, extensions):
 
         for (extension_name, build_info) in extensions:
@@ -180,19 +194,42 @@ def build_extensions (self, extensions):
                 raise DistutilsValueError, \
                       "in ext_modules option, 'sources' must be present " + \
                       "and must be a list of source filenames"
-            
+
+            # First step: compile the source code to object files.  This
+            # drops the object files in the current directory, regardless
+            # of where the source is (may be a bad thing, but that's how a
+            # Makefile.pre.in-based system does it, so at least there's a
+            # precedent!)
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
             self.compiler.compile (sources,
                                    macros=macros,
                                    includes=include_dirs)
 
+            # Now link the object files together into a "shared object" --
+            # of course, first we have to figure out all the other things
+            # that go into the mix.
             objects = self.compiler.object_filenames (sources)
             extra_objects = build_info.get ('extra_objects')
             if extra_objects:
                 objects.extend (extra_objects)
             libraries = build_info.get ('libraries')
             library_dirs = build_info.get ('library_dirs')
+            extra_args = build_info.get ('extra_link_args') or []
+            if self.compiler.compiler_type == 'msvc':
+                def_file = build_info.get ('def_file')
+                if def_file is None:
+                    source_dir = os.path.dirname (sources[0])
+                    ext_base = (string.split (extension_name, '.'))[-1]
+                    def_file = os.path.join (source_dir, "%s.def" % ext_base)
+                    if not os.path.exists (def_file):
+                        self.warn ("file '%s' not found: " % def_file +
+                                   "might have problems building DLL")
+                        def_file = None
+
+                if def_file is not None:
+                    extra_args.append ('/DEF:' + def_file)
+
             ext_filename = self.extension_filename \
                            (extension_name, self.package)
             ext_filename = os.path.join (self.build_dir, ext_filename)
@@ -201,7 +238,7 @@ def build_extensions (self, extensions):
             self.compiler.link_shared_object (objects, ext_filename, 
                                               libraries=libraries,
                                               library_dirs=library_dirs,
-                                              build_info=build_info)  # XXX hack!
+                                              extra_postargs=extra_args)
 
     # build_extensions ()
 

From 23e30bcec4cff109e9545d49763f6166688b88f1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 12:50:13 +0000
Subject: [PATCH 0082/8469] New command to generate source distribution based
 on a manifest file.

---
 command/dist.py | 590 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 590 insertions(+)
 create mode 100644 command/dist.py

diff --git a/command/dist.py b/command/dist.py
new file mode 100644
index 0000000000..222296f363
--- /dev/null
+++ b/command/dist.py
@@ -0,0 +1,590 @@
+"""distutils.command.dist
+
+Implements the Distutils 'dist' command (create a source distribution)."""
+
+# created 1999/09/22, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys, os, string, re
+import fnmatch
+from types import *
+from glob import glob
+from distutils.core import Command
+from distutils.text_file import TextFile
+
+
+# Possible modes of operation:
+#   - require an explicit manifest that lists every single file (presumably
+#     along with a way to auto-generate the manifest)
+#   - require an explicit manifest, but allow it to have globs or
+#     filename patterns of some kind (and also have auto-generation)
+#   - allow an explict manifest, but automatically augment it at runtime
+#     with the source files mentioned in 'packages', 'py_modules', and
+#     'ext_modules' (and any other such things that might come along)
+
+# I'm liking the third way.  Possible gotchas:
+#   - redundant specification: 'packages' includes 'foo' and manifest
+#     includes 'foo/*.py'
+#   - obvious conflict: 'packages' includes 'foo' and manifest
+#     includes '! foo/*.py' (can't imagine why you'd want this)
+#   - subtle conflict:  'packages' includes 'foo' and manifest
+#     includes '! foo/bar.py' (this could well be desired: eg. exclude
+#     an experimental module from distribution)
+
+# Syntax for the manifest file:
+#   - if a line is just a Unix-style glob by itself, it's a "simple include
+#     pattern": go find all files that match and add them to the list
+#     of files
+#   - if a line is a glob preceded by "!", then it's a "simple exclude
+#     pattern": go over the current list of files and exclude any that
+#     match the glob pattern
+#   - if a line consists of a directory name followed by zero or more
+#     glob patterns, then we'll recursively explore that directory tree
+#     - the glob patterns can be include (no punctuation) or exclude
+#       (prefixed by "!", no space)
+#     - if no patterns given or the first pattern is not an include pattern,
+#       then assume "*" -- ie. find everything (and then start applying
+#       the rest of the patterns)
+#     - the patterns are given in order of increasing precedence, ie.
+#       the *last* one to match a given file applies to it
+# 
+# example (ignoring auto-augmentation!):
+#   distutils/*.py
+#   distutils/command/*.py
+#   ! distutils/bleeding_edge.py
+#   examples/*.py
+#   examples/README
+# 
+# smarter way (that *will* include distutils/command/bleeding_edge.py!)
+#   distutils *.py
+#   ! distutils/bleeding_edge.py
+#   examples !*~ !*.py[co]     (same as: examples * !*~ !*.py[co])
+#   test test_* *.txt !*~ !*.py[co]
+#   README
+#   setup.py
+#
+# The actual Distutils manifest (don't need to mention source files,
+# README, setup.py -- they're automatically distributed!):
+#   examples !*~ !*.py[co]
+#   test !*~ !*.py[co]
+
+# The algorithm that will make it work:
+#   files = stuff from 'packages', 'py_modules', 'ext_modules',
+#     plus README, setup.py, ... ?
+#   foreach pattern in manifest file:
+#     if simple-include-pattern:         # "distutils/*.py"
+#       files.append (glob (pattern))
+#     elif simple-exclude-pattern:       # "! distutils/foo*"
+#       xfiles = glob (pattern)
+#       remove all xfiles from files
+#     elif recursive-pattern:            # "examples" (just a directory name)
+#       patterns = rest-of-words-on-line
+#       dir_files = list of all files under dir
+#       if patterns:
+#         if patterns[0] is an exclude-pattern:
+#           insert "*" at patterns[0]
+#         for file in dir_files:
+#           for dpattern in reverse (patterns):
+#             if file matches dpattern:
+#               if dpattern is an include-pattern:
+#                 files.append (file)
+#               else:
+#                 nothing, don't include it
+#               next file
+#       else:
+#         files.extend (dir_files)    # ie. accept all of them
+
+
+# Anyways, this is all implemented below -- BUT it is largely untested; I
+# know it works for the simple case of distributing the Distutils, but
+# haven't tried it on more complicated examples.  Undoubtedly doing so will
+# reveal bugs and cause delays, so I'm waiting until after I've released
+# Distutils 0.1.
+
+
+# Other things we need to look for in creating a source distribution:
+#   - make sure there's a README
+#   - make sure the distribution meta-info is supplied and non-empty
+#     (*must* have name, version, ((author and author_email) or
+#     (maintainer and maintainer_email)), url
+#
+# Frills:
+#   - make sure the setup script is called "setup.py"
+#   - make sure the README refers to "setup.py" (ie. has a line matching
+#     /^\s*python\s+setup\.py/)
+
+# A crazy idea that conflicts with having/requiring 'version' in setup.py:
+#   - make sure there's a version number in the "main file" (main file
+#     is __init__.py of first package, or the first module if no packages,
+#     or the first extension module if no pure Python modules)
+#   - XXX how do we look for __version__ in an extension module?
+#   - XXX do we import and look for __version__? or just scan source for
+#     /^__version__\s*=\s*"[^"]+"/ ?
+#   - what about 'version_from' as an alternative to 'version' -- then
+#     we know just where to search for the version -- no guessing about
+#     what the "main file" is
+
+
+
+class Dist (Command):
+
+    options = [('formats=', 'f',
+                "formats for source distribution (tar, ztar, gztar, or zip)"),
+               ('manifest=', 'm',
+                "name of manifest file"),
+              ]
+
+    default_format = { 'posix': 'gztar',
+                       'nt': 'zip' }
+
+    exclude_re = re.compile (r'\s*!\s*(\S+)') # for manifest lines
+
+
+    def set_default_options (self):
+        self.formats = None
+        self.manifest = None
+
+
+    def set_final_options (self):
+        if self.formats is None:
+            try:
+                self.formats = [self.default_format[os.name]]
+            except KeyError:
+                raise DistutilsPlatformError, \
+                      "don't know how to build source distributions on " + \
+                      "%s platform" % os.name
+        elif type (self.formats) is StringType:
+            self.formats = string.split (self.formats, ',')
+
+        if self.manifest is None:
+            self.manifest = "MANIFEST"
+
+
+    def run (self):
+
+        self.check_metadata ()
+
+        self.files = []
+        self.find_defaults ()
+        self.read_manifest ()
+
+        self.make_distribution ()
+
+
+    def check_metadata (self):
+
+        dist = self.distribution
+
+        missing = []
+        for attr in ('name', 'version', 'url'):
+            if not (hasattr (dist, attr) and getattr (dist, attr)):
+                missing.append (attr)
+
+        if missing:
+            self.warn ("missing required meta-data: " +
+                       string.join (missing, ", "))
+
+        if dist.author:
+            if not dist.author_email:
+                self.warn ("missing meta-data: if 'author' supplied, " +
+                           "'author_email' must be supplied too")
+        elif dist.maintainer:
+            if not dist.maintainer_email:
+                self.warn ("missing meta-data: if 'maintainer' supplied, " +
+                           "'maintainer_email' must be supplied too")
+        else:
+            self.warn ("missing meta-data: either author (and author_email) " +
+                       "or maintainer (and maintainer_email) " +
+                       "must be supplied")
+
+    # check_metadata ()
+
+
+    def find_defaults (self):
+
+        standards = ['README', 'setup.py']
+        for fn in standards:
+            if os.path.exists (fn):
+                self.files.append (fn)
+            else:
+                self.warn ("standard file %s not found" % fn)
+
+        optional = ['test/test*.py']
+        for pattern in optional:
+            files = glob (pattern)
+            if files:
+                self.files.extend (files)
+
+        if self.distribution.packages or self.distribution.py_modules:
+            build_py = self.find_peer ('build_py')
+            build_py.ensure_ready ()
+            self.files.extend (build_py.get_source_files ())
+
+        if self.distribution.ext_modules:
+            build_ext = self.find_peer ('build_ext')
+            build_ext.ensure_ready ()
+            self.files.extend (build_ext.get_source_files ())
+
+
+
+    def open_manifest (self, filename):
+        return TextFile (filename,
+                         strip_comments=1,
+                         skip_blanks=1,
+                         join_lines=1,
+                         lstrip_ws=1,
+                         rstrip_ws=1,
+                         collapse_ws=1)
+
+
+    def search_dir (self, dir, patterns):
+
+        allfiles = findall (dir)
+        if patterns:
+            if patterns[0][0] == "!":   # starts with an exclude spec?
+                patterns.insert (0, "*")# then accept anything that isn't
+                                        # explicitly excluded
+
+            act_patterns = []           # "action-patterns": (include,regexp)
+                                        # tuples where include is a boolean
+            for pattern in patterns:
+                if pattern[0] == '!':
+                    act_patterns.append \
+                        ((0, re.compile (fnmatch.translate (pattern[1:]))))
+                else:
+                    act_patterns.append \
+                        ((1, re.compile (fnmatch.translate (pattern))))
+            act_patterns.reverse()
+
+
+            files = []
+            for file in allfiles:
+                for (include,regexp) in act_patterns:
+                    if regexp.match (file):
+                        if include:
+                            files.append (file)
+                        break           # continue to next file
+        else:
+            files = allfiles
+
+        return files
+
+    # search_dir ()
+
+
+    def exclude_files (self, pattern):
+
+        regexp = re.compile (fnmatch.translate (pattern))
+        for i in range (len (self.files)-1, -1, -1):
+            if regexp.match (self.files[i]):
+                del self.files[i]
+
+
+    def read_manifest (self):
+
+        # self.files had better already be defined (and hold the
+        # "automatically found" files -- Python modules and extensions,
+        # README, setup script, ...)
+        assert self.files is not None
+
+        manifest = self.open_manifest (self.manifest)
+        while 1:
+
+            pattern = manifest.readline()
+            if pattern is None:            # end of file
+                break
+
+            # Cases:
+            #   1) simple-include: "*.py", "foo/*.py", "doc/*.html", "FAQ"
+            #   2) simple-exclude: same, prefaced by !
+            #   3) recursive: multi-word line, first word a directory
+
+            exclude = self.exclude_re.match (pattern)
+            if exclude:
+                pattern = exclude.group (1)
+
+            words = string.split (pattern)
+            assert words                # must have something!
+            if os.name != 'posix':
+                words[0] = apply (os.path.join, string.split (words[0], '/'))
+
+            # First word is a directory, possibly with include/exclude
+            # patterns making up the rest of the line: it's a recursive
+            # pattern
+            if os.path.isdir (words[0]):
+                if exclude:
+                    file.warn ("exclude (!) doesn't apply to " +
+                               "whole directory trees")
+                    continue
+
+                dir_files = self.search_dir (words[0], words[1:])
+                self.files.extend (dir_files)
+
+            # Multiple words in pattern: that's a no-no unless the first
+            # word is a directory name
+            elif len (words) > 1:
+                file.warn ("can't have multiple words unless first word " +
+                           "('%s') is a directory name" % words[0])
+                continue
+
+            # Single word, no bang: it's a "simple include pattern"
+            elif not exclude:
+                matches = glob (pattern)
+                if matches:
+                    self.files.extend (matches)
+                else:
+                    manifest.warn ("no matches for '%s' found" % pattern)
+
+
+            # Single word prefixed with a bang: it's a "simple exclude pattern"
+            else:
+                if self.exclude_files (pattern) == 0:
+                    file.warn ("no files excluded by '%s'" % pattern)
+
+            # if/elif/.../else on 'pattern'
+
+        # loop over lines of 'manifest'
+
+    # read_manifest ()
+
+
+    def make_release_tree (self, base_dir, files):
+
+        # XXX this is Unix-specific
+
+        # First get the list of directories to create
+        need_dir = {}
+        for file in files:
+            need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
+        need_dirs = need_dir.keys()
+        need_dirs.sort()
+
+        # Now create them
+        for dir in need_dirs:
+            self.mkpath (dir)
+
+        # And walk over the list of files, making a hard link for
+        # each one that doesn't already exist in its corresponding
+        # location under 'base_dir'
+    
+        self.announce ("making hard links in %s..." % base_dir)
+        for file in files:
+            dest = os.path.join (base_dir, file)
+            if not os.path.exists (dest):
+                self.execute (os.link, (file, dest),
+                              "linking %s -> %s" % (file, dest))
+    # make_release_tree ()
+
+
+    def make_tarball (self, base_dir):
+
+        # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
+        # It's pretty new, though, so we certainly can't require it -- but
+        # it would be nice to take advantage of it to skip the "create a
+        # tree of hardlinks" step!
+
+        # But I am a lazy bastard, so I require GNU tar anyways.
+
+        archive_name = base_dir + ".tar.gz"
+        self.spawn (["tar", "-czf", archive_name, base_dir])
+
+
+    def make_zipfile (self, base_dir):
+
+        # This assumes the Unix 'zip' utility -- it could be easily recast
+        # to use pkzip (or whatever the command-line zip creation utility
+        # on Redmond's archaic CP/M knockoff is nowadays), but I'll let
+        # someone who can actually test it do that.
+
+        self.spawn (["zip", "-r", base_dir, base_dir])
+
+
+    def make_distribution (self):
+
+        # Don't warn about missing meta-data here -- should be done
+        # elsewhere.
+        name = self.distribution.name or "UNKNOWN"
+        version = self.distribution.version
+
+        if version:
+            base_dir = "%s-%s" % (name, version)
+        else:
+            base_dir = name
+
+        # Remove any files that match "base_dir" from the fileset -- we
+        # don't want to go distributing the distribution inside itself!
+        self.exclude_files (base_dir + "*")
+ 
+        self.make_release_tree (base_dir, self.files)
+        if 'gztar' in self.formats:
+            self.make_tarball (base_dir)
+        if 'zip' in self.formats:
+            self.make_zipfile (base_dir)
+
+# class Dist
+
+
+# ----------------------------------------------------------------------
+# Utility functions
+
+def findall (dir = os.curdir):
+    """Find all files under 'dir' and return the sorted list of full
+       filenames (relative to 'dir')."""
+
+    list = []
+    stack = [dir]
+    pop = stack.pop
+    push = stack.append
+
+    while stack:
+        dir = pop()
+        names = os.listdir (dir)
+
+        for name in names:
+            fullname = os.path.join (dir, name)
+            list.append (fullname)
+            if os.path.isdir (fullname) and not os.path.islink(fullname):
+                push (fullname)
+
+    list.sort()
+    return list
+
+
+
+
+
+# ======================================================================
+# Here follows some extensive mental masturbation about how to
+# make the manifest file and search algorithm even more complex.
+# I think this is all gratuitous, really.
+
+# Hmm, something extra: want to apply an exclude pattern over a whole
+# subtree without necessarily having to explicitly include files from it,
+# ie. it should apply after gathering files by other means (simple
+# include pattern)
+#   . !*~ !*.bak !#*#
+# and we also want to prune at certain directories:
+#   . !RCS !CVS
+# which again should apply globally.
+#
+# possible solution:
+#   - exclude pattern in a directory applies to all files found under that
+#     directory
+#   - subdirectories that match an exclude pattern will be pruned
+#   - hmmm, to be consistent, subdirectories that match an include
+#     pattern should be recursively included
+#   - and this should apply to "simple" patterns too
+#
+# thus:
+#
+#     examples/
+#
+# means get everything in examples/ and all subdirs;
+#
+#     examples/ !*~ !#*# !*.py[co]
+#
+# means get everything under examples/ except files matching those three globs;
+#
+#     ./ !RCS !CVS
+#
+# means get everything under current dir, but prune RCS/CVS directories;
+#
+#     ./ !*~ !#*# !*.py[co] !RCS !CVS
+#     ! build/
+#     ! experimental/
+#
+# means get everything under the distribution directory except the usual
+# excludes at all levels; exclude "build" and "experimental" under the
+# distribution dir only.
+#
+# Do the former examples still work?
+#
+#     distutils/ *.py
+#     ! distutils/bleeding_edge.py
+#
+# means all .py files recursively found under distutils, except for the one
+# explicitly named.
+#
+#     distutils/ *.py !bleeding_edge.py
+#
+# means the same, except bleeding_edge.py will be excluded wherever it's
+# found -- thus this can exclude up to one file per directory under
+# distutils.
+#
+#     distutils/*.py
+#     ! distutils/bleeding_edge.py
+#
+# gets exactly distutils/*.py, minus the one explicitly mentioned exclude, and
+#
+#     distutils/*.py
+#     distutils/ !bleeding_edge.py
+#
+# coincidentally does the same, but only because there can only be one file
+# that matches the exclude pattern.  Oh, we'd still like
+#
+#     distutils *.py !bleeding*.py
+#     distutils/bleeding_ledge.py
+#
+# to include distutils/bleeding_ledge.py -- i.e. it should override the
+# earlier exclude pattern by virtue of appearing later in the manifest.  Does
+# this conflict with the above requirements, ie. that "!RCS" and "!*~" should
+# apply everywhere?  Hmm, I think it doesn't have to, as long as we're smart
+# about it.  Consequence:
+#
+#     . !RCS !CVS
+#     distutils *
+#
+# will go ahead and include RCS and CVS files under distutils, but
+#
+#     distutils *
+#     . !RCS !CVS
+#
+# will do the right thing.  Hmmm.  I think that's OK, and an inevitable
+# consequence of the ability to override exclusions.
+
+# OK, new crack at the search algorithm.
+#
+#   for pattern in manifest:
+#     if dir-pattern:             # ie. first word is a directory (incl. "."!)
+#       dir = first word on line
+#       patterns = rest of line
+#       if patterns:
+#         for dpattern in patterns:
+#           if exclude-pattern:
+#             remove from files anything matching dpattern (including pruning
+#             subtrees rooted at directories that match dpattern)
+#           else:
+#             files.append (recursive_glob (dir, dpattern))
+#       else:
+#         files.append (recursive_glob (dir, '*')
+#
+#     elif include-pattern:       # it's a "simple include pattern"
+#       files.append (glob (pattern))
+#
+#     else:                    # it's a "simple exclude pattern"
+#       remove from files anything matching pattern
+
+# The two removal algorithms might be a bit tricky:
+#
+#   "remove simple exclude pattern":
+#     for f in files:
+#       if f matches pattern:
+#         delete it
+# 
+#   "remove recursive exclude pattern":
+#     for f in files:
+#
+#       t = tail (f)
+#       while t:
+#         if t matches pattern:
+#           delete current file
+#           continue
+#         t = tail (t)
+#
+# Well, that was an interesting mental exercise.  I'm not completely
+# convinced it will work, nor am I convinced this level of complexity
+# is necessary.  If you want to exclude RCS or CVS directories, just
+# don't bloody include them!
+
+

From 3a5f9618d77b220f7e47e6a2c0204472333a7356 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 13:03:32 +0000
Subject: [PATCH 0083/8469] Added all documentation. Slightly improved the code
 for dealing with newline on a comment line,   and for stripping whitespace.

---
 text_file.py | 119 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 106 insertions(+), 13 deletions(-)

diff --git a/text_file.py b/text_file.py
index 2e034301c5..7b29ef4aa5 100644
--- a/text_file.py
+++ b/text_file.py
@@ -14,6 +14,65 @@
 
 class TextFile:
 
+    """Provides a file-like object that takes care of all the things you
+       commonly want to do when processing a text file that has some
+       line-by-line syntax: strip comments (as long as "#" is your comment
+       character), skip blank lines, join adjacent lines by escaping the
+       newline (ie. backslash at end of line), strip leading and/or
+       trailing whitespace, and collapse internal whitespace.  All of these
+       are optional and independently controllable.
+
+       Provides a 'warn()' method so you can generate warning messages that
+       report physical line number, even if the logical line in question
+       spans multiple physical lines.  Also provides 'unreadline()' for
+       implementing line-at-a-time lookahead.
+
+       Constructor is called as:
+
+           TextFile (filename=None, file=None, **options)
+
+       It bombs (RuntimeError) if both 'filename' and 'file' are None;
+       'filename' should be a string, and 'file' a file object (or
+       something that provides 'readline()' and 'close()' methods).  It is
+       recommended that you supply at least 'filename', so that TextFile
+       can include it in warning messages.  If 'file' is not supplied,
+       TextFile creates its own using the 'open()' builtin.
+
+       The options are all boolean, and affect the value returned by
+       'readline()':
+         strip_comments [default: true]
+           strip from "#" to end-of-line, as well as any whitespace
+           leading up to the "#" -- unless it is escaped by a backslash
+         lstrip_ws [default: false]
+           strip leading whitespace from each line before returning it
+         rstrip_ws [default: true]
+           strip trailing whitespace (including line terminator!) from
+           each line before returning it
+         skip_blanks [default: true}
+           skip lines that are empty *after* stripping comments and
+           whitespace.  (If both lstrip_ws and rstrip_ws are true,
+           then some lines may consist of solely whitespace: these will
+           *not* be skipped, even if 'skip_blanks' is true.)
+         join_lines [default: false]
+           if a backslash is the last non-newline character on a line
+           after stripping comments and whitespace, join the following line
+           to it to form one "logical line"; if N consecutive lines end
+           with a backslash, then N+1 physical lines will be joined to
+           form one logical line.
+         collapse_ws [default: false]  
+           after stripping comments and whitespace and joining physical
+           lines into logical lines, all internal whitespace (strings of
+           whitespace surrounded by non-whitespace characters, and not at
+           the beginning or end of the logical line) will be collapsed
+           to a single space.
+
+       Note that since 'rstrip_ws' can strip the trailing newline, the
+       semantics of 'readline()' must differ from those of the builtin file
+       object's 'readline()' method!  In particular, 'readline()' returns
+       None for end-of-file: an empty string might just be a blank line (or
+       an all-whitespace line), if 'rstrip_ws' is true but 'skip_blanks' is
+       not."""
+
     default_options = { 'strip_comments': 1,
                         'skip_blanks':    1,
                         'join_lines':     0,
@@ -23,6 +82,10 @@ class TextFile:
                       }
 
     def __init__ (self, filename=None, file=None, **options):
+        """Construct a new TextFile object.  At least one of 'filename'
+           (a string) and 'file' (a file-like object) must be supplied.
+           They keyword argument options are described above and affect
+           the values returned by 'readline()'."""
 
         if filename is None and file is None:
             raise RuntimeError, \
@@ -56,12 +119,18 @@ def __init__ (self, filename=None, file=None, **options):
         
 
     def open (self, filename):
+        """Open a new file named 'filename'.  This overrides both the
+           'filename' and 'file' arguments to the constructor."""
+
         self.filename = filename
         self.file = open (self.filename, 'r')
         self.current_line = 0
 
 
     def close (self):
+        """Close the current file and forget everything we know about it
+           (filename, current line number)."""
+
         self.file.close ()
         self.file = None
         self.filename = None
@@ -69,6 +138,14 @@ def close (self):
 
 
     def warn (self, msg, line=None):
+        """Print (to stderr) a warning message tied to the current logical
+           line in the current file.  If the current logical line in the
+           file spans multiple physical lines, the warning refers to the
+           whole range, eg. "lines 3-5".  If 'line' supplied, it overrides
+           the current line number; it may be a list or tuple to indicate a
+           range of physical lines, or an integer for a single physical
+           line."""
+
         if line is None:
             line = self.current_line
         sys.stderr.write (self.filename + ", ")
@@ -80,6 +157,15 @@ def warn (self, msg, line=None):
 
 
     def readline (self):
+        """Read and return a single logical line from the current file (or
+           from an internal buffer if lines have previously been "unread"
+           with 'unreadline()').  If the 'join_lines' option is true, this
+           may involve reading multiple physical lines concatenated into a
+           single string.  Updates the current line number, so calling
+           'warn()' after 'readline()' emits a warning about the physical
+           line(s) just read.  Returns None on end-of-file, since the empty
+           string can occur if 'rstrip_ws' is true but 'strip_blanks' is
+           not."""
 
         # If any "unread" lines waiting in 'linebuf', return the top
         # one.  (We don't actually buffer read-ahead data -- lines only
@@ -111,15 +197,15 @@ def readline (self):
                 if pos == -1:           # no "#" -- no comments
                     pass
                 elif pos == 0 or line[pos-1] != "\\": # it's a comment
-                    # Have to preserve the trailing newline; if
-                    # stripping comments resulted in an empty line, we'd
-                    # have no way to distinguish end-of-file! (NB. this
-                    # means that if the final line is all comment and
-                    # has to trailing newline, we will think that it's
+                    
+                    # Have to preserve the trailing newline, because it's
+                    # the job of a later step (rstrip_ws) to remove it --
+                    # and if rstrip_ws is false, we'd better preserve it!
+                    # (NB. this means that if the final line is all comment
+                    # and has no trailing newline, we will think that it's
                     # EOF; I think that's OK.)
-                    has_newline = (line[-1] == '\n')
-                    line = line[0:pos]
-                    if has_newline: line = line + '\n'
+                    eol = (line[-1] == '\n') and '\n' or ''
+                    line = line[0:pos] + eol
                     
                 else:                   # it's an escaped "#"
                     line = string.replace (line, "\\#", "#")
@@ -156,11 +242,10 @@ def readline (self):
             # trailing, or one or the other, or neither)
             if self.lstrip_ws and self.rstrip_ws:
                 line = string.strip (line)
-            else:
-                if self.lstrip_ws:
-                    line = string.lstrip (line)
-                if self.rstrip_ws:
-                    line = string.rstrip (line)
+            elif self.lstrip_ws:
+                line = string.lstrip (line)
+            elif self.rstrip_ws:
+                line = string.rstrip (line)
 
             # blank line (whether we rstrip'ed or not)? skip to next line
             # if appropriate
@@ -187,6 +272,9 @@ def readline (self):
 
 
     def readlines (self):
+        """Read and return the list of all logical lines remaining in the
+           current file."""
+
         lines = []
         while 1:
             line = self.readline()
@@ -196,6 +284,10 @@ def readlines (self):
 
 
     def unreadline (self, line):
+        """Push 'line' (a string) onto an internal buffer that will be
+           checked by future 'readline()' calls.  Handy for implementing
+           a parser with line-at-a-time lookahead."""
+
         self.linebuf.append (line)
 
 
@@ -206,6 +298,7 @@ def unreadline (self, line):
 continues on next line
 """
 
+
     # result 1: no fancy options
     result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
 

From c0b843e02b1e09998d6a56ce259c88c010287b39 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Sep 1999 13:14:27 +0000
Subject: [PATCH 0084/8469] Added 'list_only' option (and modified 'run()' to
 respect it).

---
 command/dist.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/command/dist.py b/command/dist.py
index 222296f363..3f309745ad 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -133,6 +133,8 @@ class Dist (Command):
                 "formats for source distribution (tar, ztar, gztar, or zip)"),
                ('manifest=', 'm',
                 "name of manifest file"),
+               ('list-only', 'l',
+                "just list files that would be distributed"),
               ]
 
     default_format = { 'posix': 'gztar',
@@ -144,6 +146,7 @@ class Dist (Command):
     def set_default_options (self):
         self.formats = None
         self.manifest = None
+        self.list_only = 0
 
 
     def set_final_options (self):
@@ -169,7 +172,12 @@ def run (self):
         self.find_defaults ()
         self.read_manifest ()
 
-        self.make_distribution ()
+        if self.list_only:
+            for f in self.files:
+                print f
+
+        else:
+            self.make_distribution ()
 
 
     def check_metadata (self):

From 7bea18d0ecf34847d08afd9af1a2dc40799d8119 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 20:41:02 +0000
Subject: [PATCH 0085/8469] Slight change to the meaning of the 'libraries'
 list: if a library name   has a directory component, then we only search for
 the library in   that one directory, ie. ignore the 'library_dirs' lists for
 that   one library. Changed calling convention to 'gen_lib_options()' again:
 now, it takes   a CCompiler instance and calls methods on it instead of
 taking   format strings.  Also implemented the new "library name" semantics  
 using the 'find_library_file()' method in the CCompiler instance. Added
 'force' flag to CCompiler; added to constructor and 'new_compiler()'. Added
 'warn()' method.

---
 ccompiler.py | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index bfbb50faf3..486f03ad04 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -67,10 +67,12 @@ class CCompiler:
 
     def __init__ (self,
                   verbose=0,
-                  dry_run=0):
+                  dry_run=0,
+                  force=0):
 
         self.verbose = verbose
         self.dry_run = dry_run
+        self.force = force
 
         # 'output_dir': a common output directory for object, library,
         # shared object, and shared library files
@@ -312,9 +314,19 @@ def link_static_lib (self,
            'output_libname' should be a library name, not a filename;
            the filename will be inferred from the library name.
 
-           'library_dirs', if supplied, should be a list of additional
-           directories to search on top of the system default and those
-           supplied to 'add_library_dir()' and/or 'set_library_dirs()'.
+           'libraries' is a list of libraries to link against.  These are
+           library names, not filenames, since they're translated into
+           filenames in a platform-specific way (eg. "foo" becomes
+           "libfoo.a" on Unix and "foo.lib" on DOS/Windows).  However, they
+           can include a directory component, which means the linker will
+           look in that specific directory rather than searching all the
+           normal locations.
+
+           'library_dirs', if supplied, should be a list of directories to
+           search for libraries that were specified as bare library names
+           (ie. no directory component).  These are on top of the system
+           default and those supplied to 'add_library_dir()' and/or
+           'set_library_dirs()'.
 
            'extra_preargs' and 'extra_postargs' are as for 'compile()'
            (except of course that they supply command-line arguments
@@ -402,6 +414,9 @@ def announce (self, msg, level=1):
         if self.verbose >= level:
             print msg
 
+    def warn (self, msg):
+        sys.stderr.write ("warning: %s\n" % msg)
+
     def spawn (self, cmd):
         spawn (cmd, verbose=self.verbose, dry_run=self.dry_run)
 
@@ -429,7 +444,8 @@ def move_file (self, src, dst):
 def new_compiler (plat=None,
                   compiler=None,
                   verbose=0,
-                  dry_run=0):
+                  dry_run=0,
+                  force=0):
 
     """Generate an instance of some CCompiler subclass for the supplied
        platform/compiler combination.  'plat' defaults to 'os.name'
@@ -470,7 +486,7 @@ def new_compiler (plat=None,
               ("can't compile C/C++ code: unable to find class '%s' " +
                "in module '%s'") % (class_name, module_name)
 
-    return klass (verbose, dry_run)
+    return klass (verbose, dry_run, force)
 
 
 def gen_preprocess_options (macros, includes):
@@ -524,20 +540,18 @@ def gen_preprocess_options (macros, includes):
 # gen_preprocess_options ()
 
 
-def gen_lib_options (library_dirs, libraries, dir_format, lib_format):
+def gen_lib_options (compiler, library_dirs, libraries):
     """Generate linker options for searching library directories and
        linking with specific libraries.  'libraries' and 'library_dirs'
        are, respectively, lists of library names (not filenames!) and
-       search directories.  'lib_format' is a format string with exactly
-       one "%s", into which will be plugged each library name in turn;
-       'dir_format' is similar, but directory names will be plugged into
-       it.  Returns a list of command-line options suitable for use with
-       some compiler (depending on the two format strings passed in)."""
+       search directories.  Returns a list of command-line options suitable
+       for use with some compiler (depending on the two format strings
+       passed in)."""
 
     lib_opts = []
 
     for dir in library_dirs:
-        lib_opts.append (dir_format % dir)
+        lib_opts.append (compiler.library_dir_option (dir))
 
     # XXX it's important that we *not* remove redundant library mentions!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
@@ -546,7 +560,16 @@ def gen_lib_options (library_dirs, libraries, dir_format, lib_format):
     # pretty nasty way to arrange your C code.
 
     for lib in libraries:
-        lib_opts.append (lib_format % lib)
+        (lib_dir, lib_name) = os.path.split (lib)
+        if lib_dir:
+            lib_file = compiler.find_library_file ([lib_dir], lib_name)
+            if lib_file:
+                lib_opts.append (lib_file)
+            else:
+                compiler.warn ("no library file corresponding to "
+                               "'%s' found (skipping)" % lib)
+        else:
+            lib_opts.append (compiler.library_option (lib))
 
     return lib_opts
 

From 63c863ce22ff96c294f7e57858730b8a400debc9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 20:45:33 +0000
Subject: [PATCH 0086/8469] Fixed order of link options: object files now
 precede library stuff. Catch up with changes in 'gen_lib_options()':   -
 change how we call it   - added methods 'library_dir_option()',
 'library_option()', and     'find_library_file()' that it calls Added 'force'
 flag and changed compile/link methods to respect it.

---
 unixccompiler.py | 79 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index f3d9591b4a..8f689196e1 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -62,9 +62,10 @@ class UnixCCompiler (CCompiler):
     
     def __init__ (self,
                   verbose=0,
-                  dry_run=0):
+                  dry_run=0,
+                  force=0):
 
-        CCompiler.__init__ (self, verbose, dry_run)
+        CCompiler.__init__ (self, verbose, dry_run, force)
 
         self.preprocess_options = None
         self.compile_options = None
@@ -121,9 +122,10 @@ def compile (self,
         # source and object file, no deep dependency checking involving
         # header files.  Hmmm.)
         objects = self.object_filenames (sources, output_dir)
-        skipped = newer_pairwise (sources, objects)
-        for skipped_pair in skipped:
-            self.announce ("skipping %s (%s up-to-date)" % skipped_pair)
+        if not self.force:
+            skipped = newer_pairwise (sources, objects)
+            for skipped_pair in skipped:
+                self.announce ("skipping %s (%s up-to-date)" % skipped_pair)
 
         # If anything left to compile, compile it
         if sources:
@@ -202,9 +204,9 @@ def link_shared_object (self,
         if library_dirs is None:
             library_dirs = []
         
-        lib_opts = gen_lib_options (self.library_dirs + library_dirs,
-                                    self.libraries + libraries,
-                                    "-L%s", "-l%s")
+        lib_opts = gen_lib_options (self,
+                                    self.library_dirs + library_dirs,
+                                    self.libraries + libraries)
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
@@ -213,17 +215,18 @@ def link_shared_object (self,
         # doesn't look at any of the libraries we might be linking with.
         # Note that we have to dance around errors comparing timestamps if
         # we're in dry-run mode (yuck).
-        try:
-            newer = newer_group (objects, output_filename)
-        except OSError:
-            if self.dry_run:
-                newer = 1
-            else:
-                raise
-
-        if newer:
-            ld_args = self.ldflags_shared + lib_opts + \
-                      objects + ['-o', output_filename]
+        if not self.force:
+            try:
+                newer = newer_group (objects, output_filename)
+            except OSError:
+                if self.dry_run:
+                    newer = 1
+                else:
+                    raise
+
+        if self.force or newer:
+            ld_args = self.ldflags_shared + objects + \
+                      lib_opts + ['-o', output_filename]
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
@@ -232,6 +235,10 @@ def link_shared_object (self,
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
+    # link_shared_object ()
+
+
+    # -- Filename-mangling (etc.) methods ------------------------------
 
     def object_filenames (self, source_filenames, output_dir=None):
         outnames = []
@@ -250,11 +257,41 @@ def shared_object_filename (self, source_filename, output_dir=None):
             outname = os.path.join (output_dir, outname)
         return outname
 
+
     def library_filename (self, libname):
-        return "lib%s%s" % (libname, self._static_lib_ext )
+        return "lib%s%s" % (libname, self._static_lib_ext)
 
     def shared_library_filename (self, libname):
-        return "lib%s%s" % (libname, self._shared_lib_ext )
+        return "lib%s%s" % (libname, self._shared_lib_ext)
+
+
+    def library_dir_option (self, dir):
+        return "-L" + dir
+
+    def library_option (self, lib):
+        return "-l" + lib
+
+
+    def find_library_file (self, dirs, lib):
+
+        for dir in dirs:
+            shared = os.path.join (dir, self.shared_library_filename (lib))
+            static = os.path.join (dir, self.library_filename (lib))
+
+            # We're second-guessing the linker here, with not much hard
+            # data to go on: GCC seems to prefer the shared library, so I'm
+            # assuming that *all* Unix C compilers do.  And of course I'm
+            # ignoring even GCC's "-static" option.  So sue me.
+            if os.path.exists (shared):
+                return shared
+            elif os.path.exists (static):
+                return static
+
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+
+    # find_library_file ()
 
 # class UnixCCompiler
 

From dba870e5c21cdf14d45ac7f322c75a59a73d249f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 20:47:52 +0000
Subject: [PATCH 0087/8469] Catch up with changes in 'gen_lib_options()':   -
 change how we call it   - added methods 'library_dir_option()',
 'library_option()', and     'find_library_file()' that it calls Added 'force'
 flag; it's automatically "respected", because this class   always rebuilds
 everything!  (Which it to say, "force=0" is not respected.)

---
 msvccompiler.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 64b2730713..5ac60b2e47 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -23,9 +23,10 @@ class MSVCCompiler (CCompiler) :
 
     def __init__ (self,
                   verbose=0,
-                  dry_run=0):
+                  dry_run=0,
+                  force=0):
 
-        CCompiler.__init__ (self, verbose, dry_run)
+        CCompiler.__init__ (self, verbose, dry_run, force)
 
         # XXX This is a nasty dependency to add on something otherwise
         # pretty clean.  move it to build_ext under an nt specific part.
@@ -164,9 +165,9 @@ def link_shared_object (self,
         if library_dirs is None:
             library_dirs = []
         
-        lib_opts = gen_lib_options (self.library_dirs + library_dirs,
-                                    self.libraries + libraries,
-                                    "/LIBPATH:%s", "%s.lib")
+        lib_opts = gen_lib_options (self,
+                                    self.library_dirs + library_dirs,
+                                    self.libraries + libraries)
 
         ld_args = self.ldflags_shared + lib_opts + \
                   objects + ['/OUT:' + output_filename]
@@ -200,6 +201,9 @@ def shared_object_filename (self, source_filename):
            specified source filename."""
         return self._change_extensions( source_filenames, self._shared_lib_ext )
 
+    # XXX ummm... these aren't right, are they?  I thought library 'foo' on
+    # DOS/Windows was to be found in "foo.lib", not "libfoo.lib"!
+
     def library_filename (self, libname):
         """Return the static library filename corresponding to the
            specified library name."""
@@ -210,4 +214,25 @@ def shared_library_filename (self, libname):
            specified library name."""
         return "lib%s%s" %( libname, self._shared_lib_ext )
 
+
+    def library_dir_option (self, dir):
+        return "/LIBPATH:" + dir
+
+    def library_option (self, lib):
+        return self.library_filename (lib)
+
+
+    def find_library_file (self, dirs, lib):
+
+        for dir in dirs:
+            libfile = os.path.join (dir, self.library_filename (lib))
+            if os.path.exists (libfile):
+                return libfile
+
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+
+    # find_library_file ()
+
 # class MSVCCompiler

From 364a45f4e008a7361d45a0fdc9a9161d9710f7db Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 20:48:53 +0000
Subject: [PATCH 0088/8469] Hacked to support the notion of "negative alias"
 options, to handle -q/--quiet reasonably elegantly.

---
 fancy_getopt.py | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 125dceb3e1..3df2d1da65 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -21,7 +21,12 @@
 # the same as a Python NAME -- except, in the spirit of most GNU
 # utilities, we use '-' in place of '_'.  (The spirit of LISP lives on!)
 # The similarities to NAME are again not a coincidence...
-longopt_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9-]*)$')
+longopt_pat = r'[a-zA-Z](?:[a-zA-Z0-9-]*)'
+longopt_re = re.compile (r'^%s$' % longopt_pat)
+
+# For recognizing "negative alias" options, eg. "quiet=!verbose"
+neg_alias_re = re.compile ("^(%s)=!(%s)$" % (longopt_pat, longopt_pat))
+
 
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
@@ -46,6 +51,7 @@ def fancy_getopt (options, object, args):
     short2long = {}
     attr_name = {}
     takes_arg = {}
+    neg_alias = {}
 
     for option in options:
         try:
@@ -73,7 +79,26 @@ def fancy_getopt (options, object, args):
             long = long[0:-1]
             takes_arg[long] = 1
         else:
-            takes_arg[long] = 0
+
+            # Is option is a "negative alias" for some other option (eg.
+            # "quiet=!verbose")?
+            match = neg_alias_re.match (long)
+            if match:
+                (alias_from, alias_to) = match.group (1,2)
+                if not takes_arg.has_key(alias_to) or takes_arg[alias_to]:
+                    raise DistutilsGetoptError, \
+                          ("option '%s' is a negative alias for '%s', " +
+                           "which either hasn't been defined yet " +
+                           "or takes an argument") % (alias_from, alias_to)
+
+                long = alias_from
+                neg_alias[long] = alias_to
+                long_opts[-1] = long
+                takes_arg[long] = 0
+
+            else:
+                takes_arg[long] = 0
+                
 
         # Now enforce some bondage on the long option name, so we can later
         # translate it to an attribute name in 'object'.  Have to do this a
@@ -112,7 +137,11 @@ def fancy_getopt (options, object, args):
             setattr (object, attr, val)
         else:
             if val == '':
-                setattr (object, attr, 1)
+                alias = neg_alias.get (opt)
+                if alias:
+                    setattr (object, attr_name[alias], 0)
+                else:
+                    setattr (object, attr, 1)
             else:
                 raise RuntimeError, "getopt lies! (bad value '%s')" % value
 

From ae141dd4aa010194531808f5c954ca947a9dd8b2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 20:50:41 +0000
Subject: [PATCH 0089/8469] Fixed 'mkpath()' to normalize the path right off
 the bat -- cleans up   the code a bit and should make it work under Windows
 even with trailing   backslash. Fixed a couple of docstrings. Added comment
 about 'make_file()' possibly being redundant and unnecessary.

---
 util.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index aee95d3668..4f93cd44d5 100644
--- a/util.py
+++ b/util.py
@@ -37,14 +37,14 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     # the creation of the whole path? (quite easy to do the latter since
     # we're not using a recursive algorithm)
 
+    name = os.path.normpath (name)
+
     if os.path.isdir (name):
         return
     if PATH_CREATED.get (name):
         return
 
     (head, tail) = os.path.split (name)
-    if not tail:                        # in case 'name' has trailing slash
-        (head, tail) = os.path.split (head)
     tails = [tail]                      # stack of lone dirs to create
     
     while head and tail and not os.path.isdir (head):
@@ -100,7 +100,6 @@ def newer (source, target):
 
 
 def newer_pairwise (sources, targets):
-
     """Walk two filename lists in parallel, testing if each 'target' is
        up-to-date relative to its corresponding 'source'.  If so, both
        are deleted from their respective lists.  Return a list of tuples
@@ -147,6 +146,9 @@ def newer_group (sources, target):
 # newer_group ()
 
 
+# XXX this isn't used anywhere, and worse, it has the same name as a method
+# in Command with subtly different semantics.  (This one just has one
+# source -> one dest; that one has many sources -> one dest.)  Nuke it?
 def make_file (src, dst, func, args,
                verbose=0, update_message=None, noupdate_message=None):
     """Makes 'dst' from 'src' (both filenames) by calling 'func' with
@@ -288,7 +290,7 @@ def copy_tree (src, dst,
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
        'src' and 'dst' must be directory names.  If 'src' is not a
        directory, raise DistutilsFileError.  If 'dst' does not exist, it
-       is created with 'mkpath'.  The end result of the copy is that
+       is created with 'mkpath()'.  The end result of the copy is that
        every file in 'src' is copied to 'dst', and directories under
        'src' are recursively copied to 'dst'.  Return the list of files
        copied (under their output names) -- note that if 'update' is true,
@@ -413,7 +415,7 @@ def move_file (src, dst,
 
 
 def write_file (filename, contents):
-    """Create a file with the specified naem and write 'contents' (a
+    """Create a file with the specified name and write 'contents' (a
        sequence of strings without line terminators) to it."""
 
     f = open (filename, "w")

From bf658c0131376f194bac577d8681e4d8038ae131 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 21:02:48 +0000
Subject: [PATCH 0090/8469] Added 'force' and 'quiet' (negative alias for
 'verbose') to the   global options table. Every Command instance now has its
 own copies of the global options,   which automatically fallback to the
 Distribution instance.  Changes:   - initialize them in constructor   - added
 '__getattr__()' to handle the fallback logic   - changed every
 'self.distribution.{verbose,dry_run}' in Command to    
 'self.{verbose,dry_run}'.   - filesystem utility methods ('copy_file()' et
 al) don't take 'update'     parameter anymore -- instead we pass 'not force'
 to the underlying     function as 'update' Changed parsing of command line so
 that global options apply to all   commands as well -- that's how (eg.)
 Command.verbose will be initialized. Simplified 'make_file()' to use
 'newer_group()' (from util module). Deleted some cruft. Some docstring
 tweaks.

---
 core.py | 167 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 84 insertions(+), 83 deletions(-)

diff --git a/core.py b/core.py
index f0c97aa3ca..c9ccd794ed 100644
--- a/core.py
+++ b/core.py
@@ -106,12 +106,21 @@ class Distribution:
        those described below."""
 
 
-    # 'global_options' describes the command-line options that may
-    # be supplied to the client (setup.py) prior to any actual
-    # commands.  Eg. "./setup.py -nv" or "./setup.py --verbose"
-    # both take advantage of these global options.
-    global_options = [('verbose', 'v', "run verbosely"),
-                      ('dry-run', 'n', "don't actually do anything"),
+    # 'global_options' describes the command-line options that may be
+    # supplied to the client (setup.py) prior to any actual commands.
+    # Eg. "./setup.py -nv" or "./setup.py --verbose" both take advantage of
+    # these global options.  This list should be kept to a bare minimum,
+    # since every global option is also valid as a command option -- and we
+    # don't want to pollute the commands with too many options that they
+    # have minimal control over.
+    global_options = [('verbose', 'v',
+                       "run verbosely"),
+                      ('quiet=!verbose', 'q',
+                       "run quietly (turns verbosity off)"),
+                      ('dry-run', 'n',
+                       "don't actually do anything"),
+                      ('force', 'f',
+                       "skip dependency checking between files"),
                      ]
 
 
@@ -131,6 +140,7 @@ def __init__ (self, attrs=None):
         # Default values for our command-line options
         self.verbose = 0
         self.dry_run = 0
+        self.force = 0
 
         # And the "distribution meta-data" options -- these can only
         # come from setup.py (the caller), not the command line
@@ -211,23 +221,22 @@ def __init__ (self, attrs=None):
 
 
     def parse_command_line (self, args):
-        """Parse the client's command line: set any Distribution
+        """Parse the setup script's command line: set any Distribution
            attributes tied to command-line options, create all command
            objects, and set their options from the command-line.  'args'
            must be a list of command-line arguments, most likely
-           'sys.argv[1:]' (see the 'setup()' function).  This list is
-           first processed for "global options" -- options that set
-           attributes of the Distribution instance.  Then, it is
-           alternately scanned for Distutils command and options for
-           that command.  Each new command terminates the options for
-           the previous command.  The allowed options for a command are
-           determined by the 'options' attribute of the command object
-           -- thus, we instantiate (and cache) every command object
-           here, in order to access its 'options' attribute.  Any error
-           in that 'options' attribute raises DistutilsGetoptError; any
-           error on the command-line raises DistutilsArgError.  If no
-           Distutils commands were found on the command line, raises
-           DistutilsArgError."""
+           'sys.argv[1:]' (see the 'setup()' function).  This list is first
+           processed for "global options" -- options that set attributes of
+           the Distribution instance.  Then, it is alternately scanned for
+           Distutils command and options for that command.  Each new
+           command terminates the options for the previous command.  The
+           allowed options for a command are determined by the 'options'
+           attribute of the command object -- thus, we instantiate (and
+           cache) every command object here, in order to access its
+           'options' attribute.  Any error in that 'options' attribute
+           raises DistutilsGetoptError; any error on the command-line
+           raises DistutilsArgError.  If no Distutils commands were found
+           on the command line, raises DistutilsArgError."""
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -268,7 +277,10 @@ def parse_command_line (self, args):
                        "(a list of tuples)") % \
                       cmd_obj.__class__
 
-            args = fancy_getopt (cmd_obj.options, cmd_obj, args[1:])
+            # Poof! like magic, all commands support the global
+            # options too, just by adding in 'global_options'.
+            args = fancy_getopt (self.global_options + cmd_obj.options,
+                                 cmd_obj, args[1:])
             self.command_obj[command] = cmd_obj
             self.have_run[command] = 0
 
@@ -497,6 +509,17 @@ def __init__ (self, dist):
         self.distribution = dist
         self.set_default_options ()
 
+        # Per-command versions of the global flags, so that the user can
+        # customize Distutils' behaviour command-by-command and let some
+        # commands fallback on the Distribution's behaviour.  None means
+        # "not defined, check self.distribution's copy", while 0 or 1 mean
+        # false and true (duh).  Note that this means figuring out the real
+        # value of each flag is a touch complicatd -- hence "self.verbose"
+        # (etc.) will be handled by __getattr__, below.
+        self._verbose = None
+        self._dry_run = None
+        self._force = None
+
         # 'ready' records whether or not 'set_final_options()' has been
         # called.  'set_final_options()' itself should not pay attention to
         # this flag: it is the business of 'ensure_ready()', which always
@@ -506,6 +529,17 @@ def __init__ (self, dist):
     # end __init__ ()
 
 
+    def __getattr__ (self, attr):
+        if attr in ('verbose', 'dry_run', 'force'):
+            myval = getattr (self, "_" + attr)
+            if myval is None:
+                return getattr (self.distribution, attr)
+            else:
+                return myval
+        else:
+            raise AttributeError, attr
+
+
     def ensure_ready (self):
         if not self.ready:
             self.set_final_options ()
@@ -569,7 +603,8 @@ def announce (self, msg, level=1):
         """If the Distribution instance to which this command belongs
            has a verbosity level of greater than or equal to 'level'
            print 'msg' to stdout."""
-        if self.distribution.verbose >= level:
+    
+        if self.verbose >= level:
             print msg
 
 
@@ -720,15 +755,13 @@ def warn (self, msg):
     def execute (self, func, args, msg=None, level=1):
         """Perform some action that affects the outside world (eg.
            by writing to the filesystem).  Such actions are special because
-           they should be disabled by the "dry run" flag (carried around by
-           the Command's Distribution), and should announce themselves if
-           the current verbosity level is high enough.  This method takes
-           care of all that bureaucracy for you; all you have to do is
-           supply the funtion to call and an argument tuple for it (to
-           embody the "external action" being performed), a message to
-           print if the verbosity level is high enough, and an optional
-           verbosity threshold."""
-
+           they should be disabled by the "dry run" flag, and should
+           announce themselves if the current verbosity level is high
+           enough.  This method takes care of all that bureaucracy for you;
+           all you have to do is supply the funtion to call and an argument
+           tuple for it (to embody the "external action" being performed),
+           a message to print if the verbosity level is high enough, and an
+           optional verbosity threshold."""
 
         # Generate a message if we weren't passed one
         if msg is None:
@@ -740,7 +773,7 @@ def execute (self, func, args, msg=None, level=1):
         self.announce (msg, level)
 
         # And do it, as long as we're not in dry-run mode
-        if not self.distribution.dry_run:
+        if not self.dry_run:
             apply (func, args)
 
     # execute()
@@ -748,43 +781,45 @@ def execute (self, func, args, msg=None, level=1):
 
     def mkpath (self, name, mode=0777):
         util.mkpath (name, mode,
-                     self.distribution.verbose, self.distribution.dry_run)
+                     self.verbose, self.dry_run)
 
 
     def copy_file (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, update=1, level=1):
-        """Copy a file respecting verbose and dry-run flags."""
+                   preserve_mode=1, preserve_times=1, level=1):
+        """Copy a file respecting verbose, dry-run and force flags."""
 
         return util.copy_file (infile, outfile,
                                preserve_mode, preserve_times,
-                               update, self.distribution.verbose >= level,
-                               self.distribution.dry_run)
+                               not self.force,
+                               self.verbose >= level,
+                               self.dry_run)
 
 
     def copy_tree (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, preserve_symlinks=0,
-                   update=1, level=1):
-        """Copy an entire directory tree respecting verbose and dry-run
-           flags."""
+                   level=1):
+        """Copy an entire directory tree respecting verbose, dry-run,
+           and force flags."""
 
         return util.copy_tree (infile, outfile, 
                                preserve_mode,preserve_times,preserve_symlinks,
-                               update, self.distribution.verbose >= level,
-                               self.distribution.dry_run)
+                               not self.force,
+                               self.verbose >= level,
+                               self.dry_run)
 
 
     def move_file (self, src, dst, level=1):
         """Move a file respecting verbose and dry-run flags."""
         return util.move_file (src, dst,
-                               self.distribution.verbose >= level,
-                               self.distribution.dry_run)
+                               self.verbose >= level,
+                               self.dry_run)
 
 
     def spawn (self, cmd, search_path=1, level=1):
         from distutils.spawn import spawn
         spawn (cmd, search_path,
-               self.distribution.verbose >= level,
-               self.distribution.dry_run)
+               self.verbose >= level,
+               self.dry_run)
 
 
     def make_file (self, infiles, outfile, func, args,
@@ -811,29 +846,10 @@ def make_file (self, infiles, outfile, func, args,
             raise TypeError, \
                   "'infiles' must be a string, or a list or tuple of strings"
 
-        # XXX this stuff should probably be moved off to a function
-        # in 'distutils.util'
-        from stat import *
-
-        if os.path.exists (outfile):
-            out_mtime = os.stat (outfile)[ST_MTIME]
-
-            # Loop over all infiles.  If any infile is newer than outfile,
-            # then we'll have to regenerate outfile
-            for f in infiles:
-                in_mtime = os.stat (f)[ST_MTIME]
-                if in_mtime > out_mtime:
-                    runit = 1
-                    break
-            else:
-                runit = 0
-
-        else:
-            runit = 1
-
-        # If we determined that 'outfile' must be regenerated, then
+        # If 'outfile' must be regenerated (either because it doesn't
+        # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if runit:
+        if self.force or newer_group (infiles, outfile):
             self.execute (func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message
@@ -842,19 +858,4 @@ def make_file (self, infiles, outfile, func, args,
 
     # make_file ()
 
-
-#     def make_files (self, infiles, outfiles, func, args,
-#                     exec_msg=None, skip_msg=None, level=1):
-
-#         """Special case of 'execute()' for operations that process one or
-#            more input files and generate one or more output files.  Works
-#            just like 'execute()', except the operation is skipped and a
-#            different message printed if all files listed in 'outfiles'
-#            already exist and are newer than all files listed in
-#            'infiles'."""
-
-#         pass
-    
-    
-
 # end class Command

From 5fb0798f6108306b956fbb5628ab020b00b0f570 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 21:03:26 +0000
Subject: [PATCH 0091/8469] Tweaked verbosity messages for byte-compilation.

---
 command/install_lib.py | 4 ++--
 command/install_py.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 978bb3b958..35deaa812f 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -66,8 +66,8 @@ def run (self):
                     out_fn = string.replace (f, '.py', '.pyc')
                     
                     self.make_file (f, out_fn, compile, (f,),
-                                    "compiling %s -> %s" % (f, out_fn),
-                                    "compilation of %s skipped" % f)
+                                    "byte-compiling %s" % f,
+                                    "byte-compilation of %s skipped" % f)
                     
         # XXX ignore self.optimize for now, since we don't really know if
         # we're compiling optimally or not, and couldn't pick what to do
diff --git a/command/install_py.py b/command/install_py.py
index 978bb3b958..35deaa812f 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -66,8 +66,8 @@ def run (self):
                     out_fn = string.replace (f, '.py', '.pyc')
                     
                     self.make_file (f, out_fn, compile, (f,),
-                                    "compiling %s -> %s" % (f, out_fn),
-                                    "compilation of %s skipped" % f)
+                                    "byte-compiling %s" % f,
+                                    "byte-compilation of %s skipped" % f)
                     
         # XXX ignore self.optimize for now, since we don't really know if
         # we're compiling optimally or not, and couldn't pick what to do

From c83db037302c04d9b2510552bcc4e75d5bf6a2ee Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 21:07:21 +0000
Subject: [PATCH 0092/8469] Don't import what we don't use.

---
 command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 3a7a43bb1e..4067ca4cd6 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -12,7 +12,7 @@
 
 from distutils.core import Command
 from distutils.errors import *
-from distutils.util import mkpath, newer, make_file, copy_file
+from distutils.util import mkpath, copy_file
 
 
 class BuildPy (Command):

From 04b548270ee36bdff4114fc797e84025925a0ef4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 21:08:42 +0000
Subject: [PATCH 0093/8469] Pass 'force' flag to 'new_compiler()'.

---
 command/build_ext.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8c5065f6bc..f284092b3e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -121,8 +121,9 @@ def run (self):
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
         self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
-                                      verbose=self.distribution.verbose,
-                                      dry_run=self.distribution.dry_run)
+                                      verbose=self.verbose,
+                                      dry_run=self.dry_run,
+                                      force=self.force)
         if self.include_dirs is not None:
             self.compiler.set_include_dirs (self.include_dirs)
         if self.define is not None:

From 95fff421e1c4f3293d15344a07f2361e4742b5b4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 3 Oct 1999 21:09:14 +0000
Subject: [PATCH 0094/8469] Filter 'glob()' results so we only look at regular
 files.

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

diff --git a/command/dist.py b/command/dist.py
index 3f309745ad..99a05225bf 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -220,7 +220,7 @@ def find_defaults (self):
 
         optional = ['test/test*.py']
         for pattern in optional:
-            files = glob (pattern)
+            files = filter (os.path.isfile, glob (pattern))
             if files:
                 self.files.extend (files)
 
@@ -338,7 +338,7 @@ def read_manifest (self):
 
             # Single word, no bang: it's a "simple include pattern"
             elif not exclude:
-                matches = glob (pattern)
+                matches = filter (os.path.isfile, glob (pattern))
                 if matches:
                     self.files.extend (matches)
                 else:

From 97cc7bbe9d4650bac48da8831dd70d987fb4562e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Oct 1999 19:06:20 +0000
Subject: [PATCH 0095/8469] Fix how we run 'zip' -- give explicit .zip
 extension.

---
 command/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/dist.py b/command/dist.py
index 99a05225bf..959413f49c 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -405,7 +405,7 @@ def make_zipfile (self, base_dir):
         # on Redmond's archaic CP/M knockoff is nowadays), but I'll let
         # someone who can actually test it do that.
 
-        self.spawn (["zip", "-r", base_dir, base_dir])
+        self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
 
 
     def make_distribution (self):

From d2649fd50531766567cef19ae50a6760f411cf9b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Oct 1999 19:06:56 +0000
Subject: [PATCH 0096/8469] Qualified use of 'newer_group' function.

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index c9ccd794ed..23fc3ccad0 100644
--- a/core.py
+++ b/core.py
@@ -849,7 +849,7 @@ def make_file (self, infiles, outfile, func, args,
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or newer_group (infiles, outfile):
+        if self.force or util.newer_group (infiles, outfile):
             self.execute (func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message

From 78805a7cc9ab2cf178276ca4b84b1d61ad29a6f5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Oct 1999 19:10:59 +0000
Subject: [PATCH 0097/8469] Removed massive comment speculating about
 needlessly complex variations on the manifest file syntax.

---
 command/dist.py | 139 ------------------------------------------------
 1 file changed, 139 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 959413f49c..57db1d78dd 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -457,142 +457,3 @@ def findall (dir = os.curdir):
 
     list.sort()
     return list
-
-
-
-
-
-# ======================================================================
-# Here follows some extensive mental masturbation about how to
-# make the manifest file and search algorithm even more complex.
-# I think this is all gratuitous, really.
-
-# Hmm, something extra: want to apply an exclude pattern over a whole
-# subtree without necessarily having to explicitly include files from it,
-# ie. it should apply after gathering files by other means (simple
-# include pattern)
-#   . !*~ !*.bak !#*#
-# and we also want to prune at certain directories:
-#   . !RCS !CVS
-# which again should apply globally.
-#
-# possible solution:
-#   - exclude pattern in a directory applies to all files found under that
-#     directory
-#   - subdirectories that match an exclude pattern will be pruned
-#   - hmmm, to be consistent, subdirectories that match an include
-#     pattern should be recursively included
-#   - and this should apply to "simple" patterns too
-#
-# thus:
-#
-#     examples/
-#
-# means get everything in examples/ and all subdirs;
-#
-#     examples/ !*~ !#*# !*.py[co]
-#
-# means get everything under examples/ except files matching those three globs;
-#
-#     ./ !RCS !CVS
-#
-# means get everything under current dir, but prune RCS/CVS directories;
-#
-#     ./ !*~ !#*# !*.py[co] !RCS !CVS
-#     ! build/
-#     ! experimental/
-#
-# means get everything under the distribution directory except the usual
-# excludes at all levels; exclude "build" and "experimental" under the
-# distribution dir only.
-#
-# Do the former examples still work?
-#
-#     distutils/ *.py
-#     ! distutils/bleeding_edge.py
-#
-# means all .py files recursively found under distutils, except for the one
-# explicitly named.
-#
-#     distutils/ *.py !bleeding_edge.py
-#
-# means the same, except bleeding_edge.py will be excluded wherever it's
-# found -- thus this can exclude up to one file per directory under
-# distutils.
-#
-#     distutils/*.py
-#     ! distutils/bleeding_edge.py
-#
-# gets exactly distutils/*.py, minus the one explicitly mentioned exclude, and
-#
-#     distutils/*.py
-#     distutils/ !bleeding_edge.py
-#
-# coincidentally does the same, but only because there can only be one file
-# that matches the exclude pattern.  Oh, we'd still like
-#
-#     distutils *.py !bleeding*.py
-#     distutils/bleeding_ledge.py
-#
-# to include distutils/bleeding_ledge.py -- i.e. it should override the
-# earlier exclude pattern by virtue of appearing later in the manifest.  Does
-# this conflict with the above requirements, ie. that "!RCS" and "!*~" should
-# apply everywhere?  Hmm, I think it doesn't have to, as long as we're smart
-# about it.  Consequence:
-#
-#     . !RCS !CVS
-#     distutils *
-#
-# will go ahead and include RCS and CVS files under distutils, but
-#
-#     distutils *
-#     . !RCS !CVS
-#
-# will do the right thing.  Hmmm.  I think that's OK, and an inevitable
-# consequence of the ability to override exclusions.
-
-# OK, new crack at the search algorithm.
-#
-#   for pattern in manifest:
-#     if dir-pattern:             # ie. first word is a directory (incl. "."!)
-#       dir = first word on line
-#       patterns = rest of line
-#       if patterns:
-#         for dpattern in patterns:
-#           if exclude-pattern:
-#             remove from files anything matching dpattern (including pruning
-#             subtrees rooted at directories that match dpattern)
-#           else:
-#             files.append (recursive_glob (dir, dpattern))
-#       else:
-#         files.append (recursive_glob (dir, '*')
-#
-#     elif include-pattern:       # it's a "simple include pattern"
-#       files.append (glob (pattern))
-#
-#     else:                    # it's a "simple exclude pattern"
-#       remove from files anything matching pattern
-
-# The two removal algorithms might be a bit tricky:
-#
-#   "remove simple exclude pattern":
-#     for f in files:
-#       if f matches pattern:
-#         delete it
-# 
-#   "remove recursive exclude pattern":
-#     for f in files:
-#
-#       t = tail (f)
-#       while t:
-#         if t matches pattern:
-#           delete current file
-#           continue
-#         t = tail (t)
-#
-# Well, that was an interesting mental exercise.  I'm not completely
-# convinced it will work, nor am I convinced this level of complexity
-# is necessary.  If you want to exclude RCS or CVS directories, just
-# don't bloody include them!
-
-

From 86d2c36a34934224784e597575f6d33bf0e426b4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Oct 1999 19:25:05 +0000
Subject: [PATCH 0098/8469] Don't assume GNU tar -- generate tar file and
 compress in separate steps. Now supports the full range of intended formats
 (tar, ztar, gztar, zip). "-f" no longer a short option for "--formats" --
 conflicts with new   global option "--force"!

---
 command/dist.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 57db1d78dd..abbd625b51 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -129,7 +129,7 @@
 
 class Dist (Command):
 
-    options = [('formats=', 'f',
+    options = [('formats=', None,
                 "formats for source distribution (tar, ztar, gztar, or zip)"),
                ('manifest=', 'm',
                 "name of manifest file"),
@@ -385,17 +385,23 @@ def make_release_tree (self, base_dir, files):
     # make_release_tree ()
 
 
-    def make_tarball (self, base_dir):
+    def make_tarball (self, base_dir, compress="gzip"):
 
         # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-        # It's pretty new, though, so we certainly can't require it -- but
-        # it would be nice to take advantage of it to skip the "create a
-        # tree of hardlinks" step!
+        # It's pretty new, though, so we certainly can't require it --
+        # but it would be nice to take advantage of it to skip the
+        # "create a tree of hardlinks" step!  (Would also be nice to
+        # detect GNU tar to use its 'z' option and save a step.)
 
-        # But I am a lazy bastard, so I require GNU tar anyways.
+        if compress is not None and compress not in ('gzip', 'compress'):
+            raise ValueError, \
+                  "if given, 'compress' must be 'gzip' or 'compress'"
 
-        archive_name = base_dir + ".tar.gz"
-        self.spawn (["tar", "-czf", archive_name, base_dir])
+        archive_name = base_dir + ".tar"
+        self.spawn (["tar", "-cf", archive_name, base_dir])
+
+        if compress:
+            self.spawn ([compress, archive_name])
 
 
     def make_zipfile (self, base_dir):
@@ -425,10 +431,15 @@ def make_distribution (self):
         self.exclude_files (base_dir + "*")
  
         self.make_release_tree (base_dir, self.files)
-        if 'gztar' in self.formats:
-            self.make_tarball (base_dir)
-        if 'zip' in self.formats:
-            self.make_zipfile (base_dir)
+        for fmt in self.formats:
+            if fmt == 'gztar':
+                self.make_tarball (base_dir, compress='gzip')
+            elif fmt == 'ztar':
+                self.make_tarball (base_dir, compress='compress')
+            elif fmt == 'tar':
+                self.make_tarball (base_dir, compress=None)
+            elif fmt == 'zip':
+                self.make_zipfile (base_dir)
 
 # class Dist
 

From 2bfd1886680134fd1e76d6260abd7388c35079ca Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 3 Dec 1999 16:18:56 +0000
Subject: [PATCH 0099/8469] [from 1999-11-04] Bunch of little bug fixes that
 appeared in building non-packagized distributions.  Mainly:   - brain-slip
 typo in 'get_package_dir()'   - don't try to os.path.join() an empty path
 tuple -- it doesn't like it   - more type-safety in 'build_module()'

---
 command/build_py.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 4067ca4cd6..b3cc1e95cc 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -93,12 +93,15 @@ def get_package_dir (self, package):
         if type (package) is StringType:
             path = string.split (package, '.')
         elif type (package) in (TupleType, ListType):
-            path = list (path)
+            path = list (package)
         else:
             raise TypeError, "'package' must be a string, list, or tuple"
 
         if not self.package_dir:
-            return apply (os.path.join, path)
+            if path:
+                return apply (os.path.join, path)
+            else:
+                return ''
         else:
             tail = []
             while path:
@@ -113,7 +116,10 @@ def get_package_dir (self, package):
             else:
                 # arg! everything failed, we might as well have not even
                 # looked in package_dir -- oh well
-                return apply (os.path.join, tail)
+                if tail:
+                    return apply (os.path.join, tail)
+                else:
+                    return ''
 
     # get_package_dir ()
 
@@ -134,7 +140,7 @@ def check_package (self, package, package_dir):
                        "but is not a directory") % package_dir
 
         # Require __init__.py for all but the "root package"
-        if package != "":
+        if package:
             init_py = os.path.join (package_dir, "__init__.py")
             if not os.path.isfile (init_py):
                 self.warn (("package init file '%s' not found " +
@@ -233,11 +239,14 @@ def build_module (self, module, module_file, package):
 
         if type (package) is StringType:
             package = string.split (package, '.')
+        elif type (package) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'package' must be a string (dot-separated), list, or tuple"
 
         # Now put the module source file into the "build" area -- this is
         # easy, we just copy it somewhere under self.build_dir (the build
         # directory for Python source).
-        outfile_path = package
+        outfile_path = list (package)
         outfile_path.append (module + ".py")
         outfile_path.insert (0, self.build_dir)
         outfile = apply (os.path.join, outfile_path)

From 948163cdcbc541ae0bd3f7af825adad6062cb0e5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 16:51:44 +0000
Subject: [PATCH 0100/8469] Made "verbose" mode the default; now you have to
 supply --quiet if you   want no output.  Still no option for a happy medium
 though. Added "--help" global option. Changed 'parse_command_line()' to
 recognize help options (both for the   whole distribution and per-command),
 and to distinguish "regular run"   and "user asked for help" by returning
 false in the latter case. Also in 'parse_command_line()', detect invalid
 command name on command   line by catching DistutilsModuleError.   a
 'negative_opt' class attribute right after 'global_options'; changed   how we
 call 'fancy_getopt()' accordingly. Initialize 'maintainer' and
 'maintainer_email' attributes to Distribution   to avoid AttributeError when
 'author' and 'author_email' not defined. Initialize 'help' attribute in
 Command constructor (to avoid   AttributeError when user *doesn't* ask for
 help). In 'setup()':   * show usage message before dying when we catch
 DistutilsArgError   * only run commands if 'parse_command_line()' returned
 true (that     way, we exit immediately when a help option is found)   *
 catch KeyboardInterrupt and IOError from running commands Bulked up usage
 message to show --help options. Comment, docstring, and error message tweaks.

---
 core.py | 93 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 18 deletions(-)

diff --git a/core.py b/core.py
index 23fc3ccad0..13bf9c7fcb 100644
--- a/core.py
+++ b/core.py
@@ -13,19 +13,25 @@
 import sys, os
 import string, re
 from types import *
+from copy import copy
 from distutils.errors import *
-from distutils.fancy_getopt import fancy_getopt
+from distutils.fancy_getopt import fancy_getopt, print_help
 from distutils import util
 
-# This is not *quite* the same as a Python NAME; I don't allow leading
-# underscores.  The fact that they're very similar is no coincidence...
+# Regex to define acceptable Distutils command names.  This is not *quite*
+# the same as a Python NAME -- I don't allow leading underscores.  The fact
+# that they're very similar is no coincidence; the default naming scheme is
+# to look for a Python module named after the command.
 command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
 
 # Defining this as a global is probably inadequate -- what about
 # listing the available options (or even commands, which can vary
 # quite late as well)
-usage = '%s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]' % sys.argv[0]
-
+usage = """\
+usage: %s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
+   or: %s --help
+   or: %s cmd --help
+""" % (sys.argv[0], sys.argv[0], sys.argv[0])
 
 
 def setup (**attrs):
@@ -79,12 +85,20 @@ def setup (**attrs):
     # Parse the command line; any command-line errors are the end-users
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
-        dist.parse_command_line (sys.argv[1:])
+        ok = dist.parse_command_line (sys.argv[1:])
     except DistutilsArgError, msg:
+        sys.stderr.write (usage + "\n")
         raise SystemExit, msg
 
     # And finally, run all the commands found on the command line.
-    dist.run_commands ()
+    if ok:
+        try:
+            dist.run_commands ()
+        except KeyboardInterrupt:
+            raise SystemExit, "interrupted"
+        except IOError, exc:
+            # is this 1.5.2-specific? 1.5-specific?
+            raise SystemExit, "error: %s: %s" % (exc.filename, exc.strerror)
 
 # setup ()
 
@@ -114,14 +128,17 @@ class Distribution:
     # don't want to pollute the commands with too many options that they
     # have minimal control over.
     global_options = [('verbose', 'v',
-                       "run verbosely"),
-                      ('quiet=!verbose', 'q',
+                       "run verbosely (default)"),
+                      ('quiet', 'q',
                        "run quietly (turns verbosity off)"),
                       ('dry-run', 'n',
                        "don't actually do anything"),
                       ('force', 'f',
                        "skip dependency checking between files"),
+                      ('help', 'h',
+                       "show this help message"),
                      ]
+    negative_opt = {'quiet': 'verbose'}
 
 
     # -- Creation/initialization methods -------------------------------
@@ -138,17 +155,20 @@ def __init__ (self, attrs=None):
            command objects by 'parse_command_line()'."""
 
         # Default values for our command-line options
-        self.verbose = 0
+        self.verbose = 1
         self.dry_run = 0
         self.force = 0
+        self.help = 0
 
         # And the "distribution meta-data" options -- these can only
         # come from setup.py (the caller), not the command line
-        # (or a hypothetical config file)..
+        # (or a hypothetical config file).
         self.name = None
         self.version = None
         self.author = None
         self.author_email = None
+        self.maintainer = None
+        self.maintainer_email = None
         self.url = None
         self.licence = None
         self.description = None
@@ -236,7 +256,11 @@ def parse_command_line (self, args):
            'options' attribute.  Any error in that 'options' attribute
            raises DistutilsGetoptError; any error on the command-line
            raises DistutilsArgError.  If no Distutils commands were found
-           on the command line, raises DistutilsArgError."""
+           on the command line, raises DistutilsArgError.  Return true if
+           command-line successfully parsed and we should carry on with
+           executing commands; false if no errors but we shouldn't execute
+           commands (currently, this only happens if user asks for
+           help)."""
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -246,7 +270,14 @@ def parse_command_line (self, args):
         # happen until we know what the command is.
 
         self.commands = []
-        args = fancy_getopt (self.global_options, self, sys.argv[1:])
+        args = fancy_getopt (self.global_options, self.negative_opt,
+                             self, sys.argv[1:])
+
+        if self.help:
+            print_help (self.global_options, header="Global options:")
+            print
+            print usage
+            return
 
         while args:
             # Pull the current command from the head of the command line
@@ -258,7 +289,10 @@ def parse_command_line (self, args):
             # Make sure we have a command object to put the options into
             # (this either pulls it out of a cache of command objects,
             # or finds and instantiates the command class).
-            cmd_obj = self.find_command_obj (command)
+            try:
+                cmd_obj = self.find_command_obj (command)
+            except DistutilsModuleError, msg:
+                raise DistutilsArgError, msg
 
             # Require that the command class be derived from Command --
             # that way, we can be sure that we at least have the 'run'
@@ -279,8 +313,24 @@ def parse_command_line (self, args):
 
             # Poof! like magic, all commands support the global
             # options too, just by adding in 'global_options'.
-            args = fancy_getopt (self.global_options + cmd_obj.options,
+            negative_opt = self.negative_opt
+            if hasattr (cmd_obj, 'negative_opt'):
+                negative_opt = copy (negative_opt)
+                negative_opt.update (cmd_obj.negative_opt)
+
+            options = self.global_options + cmd_obj.options
+            args = fancy_getopt (options, negative_opt,
                                  cmd_obj, args[1:])
+            if cmd_obj.help:
+                print_help (self.global_options,
+                            header="Global options:")
+                print
+                print_help (cmd_obj.options,
+                            header="Options for '%s' command:" % command)
+                print
+                print usage
+                return
+                
             self.command_obj[command] = cmd_obj
             self.have_run[command] = 0
 
@@ -288,9 +338,11 @@ def parse_command_line (self, args):
 
         # Oops, no commands found -- an end-user error
         if not self.commands:
-            sys.stderr.write (usage + "\n")
             raise DistutilsArgError, "no commands supplied"
 
+        # All is well: return true
+        return 1
+
     # parse_command_line()
 
 
@@ -318,7 +370,7 @@ class from it, and returns the class object.
             module = sys.modules[module_name]
         except ImportError:
             raise DistutilsModuleError, \
-                  "invalid command '%s' (no module named %s)" % \
+                  "invalid command '%s' (no module named '%s')" % \
                   (command, module_name)
 
         try:
@@ -359,7 +411,8 @@ def find_command_obj (self, command, create=1):
            'create_command_obj()'.  If none found, the action taken
            depends on 'create': if true (the default), create a new
            command object by calling 'create_command_obj()' and return
-           it; otherwise, return None."""
+           it; otherwise, return None.  If 'command' is an invalid
+           command name, then DistutilsModuleError will be raised."""
 
         cmd_obj = self.command_obj.get (command)
         if not cmd_obj and create:
@@ -520,6 +573,10 @@ def __init__ (self, dist):
         self._dry_run = None
         self._force = None
 
+        # The 'help' flag is just used for command-line parsing, so
+        # none of that complicated bureaucracy is needed.
+        self.help = 0
+
         # 'ready' records whether or not 'set_final_options()' has been
         # called.  'set_final_options()' itself should not pay attention to
         # this flag: it is the business of 'ensure_ready()', which always

From 8fa8e3f254c307213ed4ebd194454e144578cd64 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 16:54:55 +0000
Subject: [PATCH 0101/8469] Added support for printing out help text from
 option table: 'print_help()',   'generate_help()', 'wrap_text()' functions,
 and a little tiny test   of 'wrap_text()'. Changed how caller states that one
 option is the boolean opposite of   another: added 'negative_opt' parameter
 to 'fancy_getopt()', and changed   to use it instead of parsing long option
 name.

---
 fancy_getopt.py | 183 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 171 insertions(+), 12 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 3df2d1da65..86e9f326ad 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -12,7 +12,7 @@
 
 __rcsid__ = "$Id$"
 
-import string, re
+import sys, string, re
 from types import *
 import getopt
 from distutils.errors import *
@@ -33,7 +33,7 @@
 longopt_xlate = string.maketrans ('-', '_')
 
 
-def fancy_getopt (options, object, args):
+def fancy_getopt (options, negative_opt, object, args):
 
     # The 'options' table is a list of 3-tuples:
     #   (long_option, short_option, help_string)
@@ -51,7 +51,6 @@ def fancy_getopt (options, object, args):
     short2long = {}
     attr_name = {}
     takes_arg = {}
-    neg_alias = {}
 
     for option in options:
         try:
@@ -81,18 +80,15 @@ def fancy_getopt (options, object, args):
         else:
 
             # Is option is a "negative alias" for some other option (eg.
-            # "quiet=!verbose")?
-            match = neg_alias_re.match (long)
-            if match:
-                (alias_from, alias_to) = match.group (1,2)
+            # "quiet" == "!verbose")?
+            alias_to = negative_opt.get(long)
+            if alias_to is not None:
                 if not takes_arg.has_key(alias_to) or takes_arg[alias_to]:
                     raise DistutilsGetoptError, \
                           ("option '%s' is a negative alias for '%s', " +
                            "which either hasn't been defined yet " +
-                           "or takes an argument") % (alias_from, alias_to)
+                           "or takes an argument") % (long, alias_to)
 
-                long = alias_from
-                neg_alias[long] = alias_to
                 long_opts[-1] = long
                 takes_arg[long] = 0
 
@@ -137,7 +133,7 @@ def fancy_getopt (options, object, args):
             setattr (object, attr, val)
         else:
             if val == '':
-                alias = neg_alias.get (opt)
+                alias = negative_opt.get (opt)
                 if alias:
                     setattr (object, attr_name[alias], 0)
                 else:
@@ -149,4 +145,167 @@ def fancy_getopt (options, object, args):
 
     return args
 
-# end fancy_getopt()
+# fancy_getopt()
+
+
+WS_TRANS = string.maketrans (string.whitespace, ' ' * len (string.whitespace))
+
+def wrap_text (text, width):
+
+    if text is None:
+        return []
+    if len (text) <= width:
+        return [text]
+
+    text = string.expandtabs (text)
+    text = string.translate (text, WS_TRANS)
+    chunks = re.split (r'( +|-+)', text)
+    chunks = filter (None, chunks)      # ' - ' results in empty strings
+    lines = []
+
+    while chunks:
+
+        cur_line = []                   # list of chunks (to-be-joined)
+        cur_len = 0                     # length of current line
+
+        while chunks:
+            l = len (chunks[0])
+            if cur_len + l <= width:    # can squeeze (at least) this chunk in
+                cur_line.append (chunks[0])
+                del chunks[0]
+                cur_len = cur_len + l
+            else:                       # this line is full
+                # drop last chunk if all space
+                if cur_line and cur_line[-1][0] == ' ':
+                    del cur_line[-1]
+                break
+
+        if chunks:                      # any chunks left to process?
+
+            # if the current line is still empty, then we had a single
+            # chunk that's too big too fit on a line -- so we break
+            # down and break it up at the line width
+            if cur_len == 0:
+                cur_line.append (chunks[0][0:width])
+                chunks[0] = chunks[0][width:]
+
+            # all-whitespace chunks at the end of a line can be discarded
+            # (and we know from the re.split above that if a chunk has
+            # *any* whitespace, it is *all* whitespace)
+            if chunks[0][0] == ' ':
+                del chunks[0]
+
+        # and store this line in the list-of-all-lines -- as a single
+        # string, of course!
+        lines.append (string.join (cur_line, ''))
+
+    # while chunks
+
+    return lines
+
+# wrap_text ()
+        
+
+def generate_help (options, header=None):
+    """Generate help text (a list of strings, one per suggested line of
+       output) from an option table."""
+
+    # Blithely assume the option table is good: probably wouldn't call
+    # 'generate_help()' unless you've already called 'fancy_getopt()'.
+
+    # First pass: determine maximum length of long option names
+    max_opt = 0
+    for option in options:
+        long = option[0]
+        short = option[1]
+        l = len (long)
+        if long[-1] == '=':
+            l = l - 1
+        if short is not None:
+            l = l + 5                   # " (-x)" where short == 'x'
+        if l > max_opt:
+            max_opt = l
+            
+    opt_width = max_opt + 2 + 2 + 2     # room for indent + dashes + gutter
+
+    # Typical help block looks like this:
+    #   --foo       controls foonabulation
+    # Help block for longest option looks like this:
+    #   --flimflam  set the flim-flam level
+    # and with wrapped text:
+    #   --flimflam  set the flim-flam level (must be between
+    #               0 and 100, except on Tuesdays)
+    # Options with short names will have the short name shown (but
+    # it doesn't contribute to max_opt):
+    #   --foo (-f)  controls foonabulation
+    # If adding the short option would make the left column too wide,
+    # we push the explanation off to the next line
+    #   --flimflam (-l)
+    #               set the flim-flam level
+    # Important parameters:
+    #   - 2 spaces before option block start lines
+    #   - 2 dashes for each long option name
+    #   - min. 2 spaces between option and explanation (gutter)
+    #   - 5 characters (incl. space) for short option name
+
+    # Now generate lines of help text.
+    line_width = 78                     # if 80 columns were good enough for
+    text_width = line_width - opt_width # Jesus, then 78 are good enough for me
+    big_indent = ' ' * opt_width
+    if header:
+        lines = [header]
+    else:
+        lines = ['Option summary:']
+
+    for (long,short,help) in options:
+       
+        text = wrap_text (help, text_width)
+        if long[-1] == '=':
+            long = long[0:-1]
+
+        # Case 1: no short option at all (makes life easy)
+        if short is None:
+            if text:
+                lines.append ("  --%-*s  %s" % (max_opt, long, text[0]))
+            else:
+                lines.append ("  --%-*s  " % (max_opt, long))
+
+            for l in text[1:]:
+                lines.append (big_indent + l)
+
+        # Case 2: we have a short option, so we have to include it
+        # just after the long option
+        else:
+            opt_names = "%s (-%s)" % (long, short)
+            if text:
+                lines.append ("  --%-*s  %s" %
+                              (max_opt, opt_names, text[0]))
+            else:
+                lines.append ("  --%-*s" % opt_names)
+
+    # for loop over options
+
+    return lines
+
+# generate_help ()
+
+
+def print_help (options, file=None, header=None):
+    if file is None:
+        file = sys.stdout
+    for line in generate_help (options, header):
+        file.write (line + "\n")
+# print_help ()
+    
+
+if __name__ == "__main__":
+    text = """\
+Tra-la-la, supercalifragilisticexpialidocious.
+How *do* you spell that odd word, anyways?
+(Someone ask Mary -- she'll know [or she'll
+say, "How should I know?"].)"""
+
+    for w in (10, 20, 30, 40):
+        print "width: %d" % w
+        print string.join (wrap_text (text, w), "\n")
+        print

From 6b3ff9eef6bd4d9f99572022a776b7874097466b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 16:57:47 +0000
Subject: [PATCH 0102/8469] In 'compile()' method, renamed 'includes' parameter
 to 'include_dirs' for   consistency with 'build_ext' command option. Changed
 'compile()' and 'link_shared_object()' so 'include_dirs',   'libraries', and
 'library_dirs' can be lists or tuples.

---
 unixccompiler.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 8f689196e1..edff4f0a0e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -92,7 +92,7 @@ def compile (self,
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None,
+                 include_dirs=None,
                  extra_preargs=None,
                  extra_postargs=None):
 
@@ -100,18 +100,19 @@ def compile (self,
             output_dir = self.output_dir
         if macros is None:
             macros = []
-        if includes is None:
-            includes = []
+        if include_dirs is None:
+            include_dirs = []
 
         if type (macros) is not ListType:
             raise TypeError, \
                   "'macros' (if supplied) must be a list of tuples"
-        if type (includes) is not ListType:
+        if type (include_dirs) not in (ListType, TupleType):
             raise TypeError, \
-                  "'includes' (if supplied) must be a list of strings"
+                  "'include_dirs' (if supplied) must be a list of strings"
+        include_dirs = list (include_dirs)
 
         pp_opts = gen_preprocess_options (self.macros + macros,
-                                          self.include_dirs + includes)
+                                          self.include_dirs + include_dirs)
 
         # So we can mangle 'sources' without hurting the caller's data
         orig_sources = sources
@@ -204,6 +205,15 @@ def link_shared_object (self,
         if library_dirs is None:
             library_dirs = []
         
+        if type (libraries) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'libraries' (if supplied) must be a list of strings"
+        if type (library_dirs) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'library_dirs' (if supplied) must be a list of strings"
+        libraries = list (libraries)
+        library_dirs = list (library_dirs)
+
         lib_opts = gen_lib_options (self,
                                     self.library_dirs + library_dirs,
                                     self.libraries + libraries)

From c2cadc8e316e5b60fb44864110d970f068e977b2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 17:01:01 +0000
Subject: [PATCH 0103/8469] Changed 'build_extensions()' so 'sources' can be a
 list or tuple; and   call CCompiler method 'compile()' with 'include_dirs'
 not 'includes'. Fixed stupid typo in 'get_source_files()'.

---
 command/build_ext.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f284092b3e..d38cb18b5c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -179,7 +179,7 @@ def get_source_files (self):
         filenames = []
 
         # Wouldn't it be neat if we knew the names of header files too...
-        for (extension_name, build_info) in extensions:
+        for (extension_name, build_info) in self.extensions:
             sources = build_info.get ('sources')
             if type (sources) in (ListType, TupleType):
                 filenames.extend (sources)
@@ -191,10 +191,11 @@ def build_extensions (self, extensions):
 
         for (extension_name, build_info) in extensions:
             sources = build_info.get ('sources')
-            if sources is None or type (sources) is not ListType:
+            if sources is None or type (sources) not in (ListType, TupleType):
                 raise DistutilsValueError, \
                       "in ext_modules option, 'sources' must be present " + \
                       "and must be a list of source filenames"
+            sources = list (sources)
 
             # First step: compile the source code to object files.  This
             # drops the object files in the current directory, regardless
@@ -205,7 +206,7 @@ def build_extensions (self, extensions):
             include_dirs = build_info.get ('include_dirs')
             self.compiler.compile (sources,
                                    macros=macros,
-                                   includes=include_dirs)
+                                   include_dirs=include_dirs)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things

From 749d2ea556fa8790ab5c5188aa163ba170b07dee Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 17:03:59 +0000
Subject: [PATCH 0104/8469] Fixed 'find_package_modules()' to ensure that we
 never build (and thus   install) the setup script itself. Fixed
 'build_module()' so we do *not* preserve file mode (which means   we can
 install read-only files, which makes the next installation   of this
 distribution fail -- at least under Unix); added a comment   explaining this.

---
 command/build_py.py | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index b3cc1e95cc..6bc5aa8007 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -6,7 +6,7 @@
 
 __rcsid__ = "$Id$"
 
-import string, os
+import sys, string, os
 from types import *
 from glob import glob
 
@@ -40,11 +40,21 @@ def set_final_options (self):
 
     def run (self):
 
-        # XXX copy_file by default preserves all stat info -- mode, atime,
-        # and mtime.  IMHO this is the right thing to do, but perhaps it
-        # should be an option -- in particular, a site administrator might
-        # want installed files to reflect the time of installation rather
-        # than the last modification time before the installed release.
+        # XXX copy_file by default preserves atime and mtime.  IMHO this is
+        # the right thing to do, but perhaps it should be an option -- in
+        # particular, a site administrator might want installed files to
+        # reflect the time of installation rather than the last
+        # modification time before the installed release.
+
+        # XXX copy_file by default preserves mode, which appears to be the
+        # wrong thing to do: if a file is read-only in the working
+        # directory, we want it to be installed read/write so that the next
+        # installation of the same module distribution can overwrite it
+        # without problems.  (This might be a Unix-specific issue.)  Thus
+        # we turn off 'preserve_mode' when copying to the build directory,
+        # since the build directory is supposed to be exactly what the
+        # installation will look like (ie. we preserve mode when
+        # installing).
 
         # XXX copy_file does *not* preserve MacOS-specific file metadata.
         # If this is a problem for building/installing Python modules, then
@@ -73,7 +83,7 @@ def run (self):
         if self.modules and self.packages:
             raise DistutilsOptionError, \
                   "build_py: supplying both 'packages' and 'modules' " + \
-                  "options not allowed"
+                  "options is not allowed"
 
         # Now we're down to two cases: 'modules' only and 'packages' only.
         if self.modules:
@@ -81,7 +91,6 @@ def run (self):
         else:
             self.build_packages ()
 
-
     # run ()
         
 
@@ -162,9 +171,13 @@ def check_module (self, module, module_file):
     def find_package_modules (self, package, package_dir):
         module_files = glob (os.path.join (package_dir, "*.py"))
         module_pairs = []
+        setup_script = os.path.abspath (sys.argv[0])
+
         for f in module_files:
-            module = os.path.splitext (os.path.basename (f))[0]
-            module_pairs.append (module, f)
+            abs_f = os.path.abspath (f)
+            if abs_f != setup_script:
+                module = os.path.splitext (os.path.basename (f))[0]
+                module_pairs.append ((module, f))
         return module_pairs
 
 
@@ -253,7 +266,7 @@ def build_module (self, module, module_file, package):
 
         dir = os.path.dirname (outfile)
         self.mkpath (dir)
-        self.copy_file (module_file, outfile)
+        self.copy_file (module_file, outfile, preserve_mode=0)
 
 
     def build_modules (self):

From a65fd32d4d8280c553b631c6407010b271634468 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 17:07:22 +0000
Subject: [PATCH 0105/8469] Catch missing MANIFEST file and warn rather than
 blowing up. Added 'nuke_release_tree()' method to blow away the directory
 from   which the archive file(s) are created, and call it (conditionally)  
 from 'make_distribution()'. Added 'keep_tree' option (false by default) to
 disable the call to   'nuke_release_tree()'.

---
 command/dist.py | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index abbd625b51..cdd4dfc8cc 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -10,6 +10,7 @@
 import fnmatch
 from types import *
 from glob import glob
+from shutil import rmtree
 from distutils.core import Command
 from distutils.text_file import TextFile
 
@@ -135,6 +136,9 @@ class Dist (Command):
                 "name of manifest file"),
                ('list-only', 'l',
                 "just list files that would be distributed"),
+               ('keep-tree', 'k',
+                "keep the distribution tree around after creating " +
+                "archive file(s)"),
               ]
 
     default_format = { 'posix': 'gztar',
@@ -147,6 +151,7 @@ def set_default_options (self):
         self.formats = None
         self.manifest = None
         self.list_only = 0
+        self.keep_tree = 0
 
 
     def set_final_options (self):
@@ -202,8 +207,8 @@ def check_metadata (self):
                 self.warn ("missing meta-data: if 'maintainer' supplied, " +
                            "'maintainer_email' must be supplied too")
         else:
-            self.warn ("missing meta-data: either author (and author_email) " +
-                       "or maintainer (and maintainer_email) " +
+            self.warn ("missing meta-data: either (author and author_email) " +
+                       "or (maintainer and maintainer_email) " +
                        "must be supplied")
 
     # check_metadata ()
@@ -296,7 +301,18 @@ def read_manifest (self):
         # README, setup script, ...)
         assert self.files is not None
 
-        manifest = self.open_manifest (self.manifest)
+        try:
+            manifest = self.open_manifest (self.manifest)
+        except IOError, exc:
+            if type (exc) is InstanceType and hasattr (exc, 'strerror'):
+                msg = "could not open MANIFEST (%s)" % \
+                      string.lower (exc.strerror)
+            else:
+                msg = "could not open MANIFST"
+    
+            self.warn (msg + ": using default file list")
+            return
+        
         while 1:
 
             pattern = manifest.readline()
@@ -385,6 +401,11 @@ def make_release_tree (self, base_dir, files):
     # make_release_tree ()
 
 
+    def nuke_release_tree (self, base_dir):
+        self.execute (rmtree, (base_dir,),
+                      "removing %s" % base_dir)
+
+
     def make_tarball (self, base_dir, compress="gzip"):
 
         # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
@@ -441,6 +462,9 @@ def make_distribution (self):
             elif fmt == 'zip':
                 self.make_zipfile (base_dir)
 
+        if not self.keep_tree:
+            self.nuke_release_tree (base_dir)
+
 # class Dist
 
 

From 8ae570b96d2c1a923c26b02f85d2826561638fba Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 12 Dec 1999 17:19:58 +0000
Subject: [PATCH 0106/8469] Catch up with terminology change in UnixCCompiler:
 'includes' -> 'include_dirs'.

---
 ccompiler.py    | 12 ++++++------
 msvccompiler.py | 11 ++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 486f03ad04..8c2ddf7658 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -262,7 +262,7 @@ def compile (self,
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None,
+                 include_dirs=None,
                  extra_preargs=None,
                  extra_postargs=None):
         """Compile one or more C/C++ source files.  'sources' must be
@@ -277,7 +277,7 @@ def compile (self,
            undefines a macro.  Later definitions/redefinitions/
            undefinitions take precedence.
 
-           'includes', if given, must be a list of strings, the directories
+           'include_dirs', if given, must be a list of strings, the directories
            to add to the default include file search path for this
            compilation only.
 
@@ -489,12 +489,12 @@ def new_compiler (plat=None,
     return klass (verbose, dry_run, force)
 
 
-def gen_preprocess_options (macros, includes):
+def gen_preprocess_options (macros, include_dirs):
     """Generate C pre-processor options (-D, -U, -I) as used by at
        least two types of compilers: the typical Unix compiler and Visual
        C++.  'macros' is the usual thing, a list of 1- or 2-tuples, where
        (name,) means undefine (-U) macro 'name', and (name,value) means
-       define (-D) macro 'name' to 'value'.  'includes' is just a list of
+       define (-D) macro 'name' to 'value'.  'include_dirs' is just a list of
        directory names to be added to the header file search path (-I).
        Returns a list of command-line options suitable for either
        Unix compilers or Visual C++."""
@@ -506,7 +506,7 @@ def gen_preprocess_options (macros, includes):
     # line).  I don't think it's essential, though, since most (all?)
     # Unix C compilers only pay attention to the latest -D or -U
     # mention of a macro on their command line.  Similar situation for
-    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
+    # 'include_dirs'.  I'm punting on both for now.  Anyways, weeding out
     # redundancies like this should probably be the province of
     # CCompiler, since the data structures used are inherited from it
     # and therefore common to all CCompiler classes.
@@ -532,7 +532,7 @@ def gen_preprocess_options (macros, includes):
                 # shell at all costs when we spawn the command!
                 pp_opts.append ("-D%s=%s" % macro)
 
-    for dir in includes:
+    for dir in include_dirs:
         pp_opts.append ("-I%s" % dir)
 
     return pp_opts
diff --git a/msvccompiler.py b/msvccompiler.py
index 5ac60b2e47..d93c74c76d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -63,19 +63,20 @@ def compile (self,
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None,
+                 include_dirs=None,
                  extra_preargs=None,
                  extra_postargs=None):
 
         if macros is None:
             macros = []
-        if includes is None:
-            includes = []
+        if include_dirs is None:
+            include_dirs = []
 
         objectFiles = []
 
-        base_pp_opts = gen_preprocess_options (self.macros + macros,
-                                               self.include_dirs + includes)
+        base_pp_opts = \
+            gen_preprocess_options (self.macros + macros,
+                                    self.include_dirs + include_dirs)
 
         base_pp_opts.append('/c')
         

From fd51c3b988a972a4d21813364202d7e2f04a4c9a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 13 Dec 1999 21:38:57 +0000
Subject: [PATCH 0107/8469] Use 'search', not 'match', on filename pattern
 regexes.

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

diff --git a/command/dist.py b/command/dist.py
index cdd4dfc8cc..2e4aacddfc 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -274,7 +274,7 @@ def search_dir (self, dir, patterns):
             files = []
             for file in allfiles:
                 for (include,regexp) in act_patterns:
-                    if regexp.match (file):
+                    if regexp.search (file):
                         if include:
                             files.append (file)
                         break           # continue to next file
@@ -290,7 +290,7 @@ def exclude_files (self, pattern):
 
         regexp = re.compile (fnmatch.translate (pattern))
         for i in range (len (self.files)-1, -1, -1):
-            if regexp.match (self.files[i]):
+            if regexp.search (self.files[i]):
                 del self.files[i]
 
 

From cca87fce7c57072fd109389de01d23572d0d5dec Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 16 Dec 1999 01:14:15 +0000
Subject: [PATCH 0108/8469] Catch errors from 'rmtree' and emit a warning.

---
 command/dist.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 2e4aacddfc..9931e3752d 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -402,8 +402,16 @@ def make_release_tree (self, base_dir, files):
 
 
     def nuke_release_tree (self, base_dir):
-        self.execute (rmtree, (base_dir,),
-                      "removing %s" % base_dir)
+        try:
+            self.execute (rmtree, (base_dir,),
+                          "removing %s" % base_dir)
+        except (IOError, OSError), exc:
+            if exc.filename:
+                msg = "error removing %s: %s (%s)" % \
+                       (base_dir, exc.strerror, exc.filename)
+            else:
+                msg = "error removing %s: %s" % (base_dir, exc.strerror)
+            self.warn (msg)
 
 
     def make_tarball (self, base_dir, compress="gzip"):

From 29fed792b97b31c545bb4b7f90a0b3a2e8a8ab4a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 16 Dec 1999 01:19:05 +0000
Subject: [PATCH 0109/8469] When emitting a command-line error message, *say*
 it's an error.

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 13bf9c7fcb..fd5ba907fb 100644
--- a/core.py
+++ b/core.py
@@ -88,7 +88,7 @@ def setup (**attrs):
         ok = dist.parse_command_line (sys.argv[1:])
     except DistutilsArgError, msg:
         sys.stderr.write (usage + "\n")
-        raise SystemExit, msg
+        raise SystemExit, "error: %s" % msg
 
     # And finally, run all the commands found on the command line.
     if ok:

From 1e138ca57132305e61c88abc02f5f42c1f733584 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Jan 2000 22:39:32 +0000
Subject: [PATCH 0110/8469] Typo fix: 'file.warn' should have been
 'manifest.warn' in a couple of places.

---
 command/dist.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 9931e3752d..80af990321 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -338,8 +338,8 @@ def read_manifest (self):
             # pattern
             if os.path.isdir (words[0]):
                 if exclude:
-                    file.warn ("exclude (!) doesn't apply to " +
-                               "whole directory trees")
+                    manifest.warn ("exclude (!) doesn't apply to " +
+                                   "whole directory trees")
                     continue
 
                 dir_files = self.search_dir (words[0], words[1:])
@@ -348,8 +348,8 @@ def read_manifest (self):
             # Multiple words in pattern: that's a no-no unless the first
             # word is a directory name
             elif len (words) > 1:
-                file.warn ("can't have multiple words unless first word " +
-                           "('%s') is a directory name" % words[0])
+                manifest.warn ("can't have multiple words unless first word " +
+                               "('%s') is a directory name" % words[0])
                 continue
 
             # Single word, no bang: it's a "simple include pattern"
@@ -364,7 +364,7 @@ def read_manifest (self):
             # Single word prefixed with a bang: it's a "simple exclude pattern"
             else:
                 if self.exclude_files (pattern) == 0:
-                    file.warn ("no files excluded by '%s'" % pattern)
+                    manifest.warn ("no files excluded by '%s'" % pattern)
 
             # if/elif/.../else on 'pattern'
 

From b4325f5828cd4c7a744909360776702dd72a4a13 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Jan 2000 22:41:02 +0000
Subject: [PATCH 0111/8469] Removed a bunch of irrelevant parameters from
 'link_static_lib()' signature. Added 'link_executable()' signature.

---
 ccompiler.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 8c2ddf7658..036cbe9f48 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -292,17 +292,10 @@ def compile (self,
         pass
 
 
-    # XXX this is kind of useless without 'link_binary()' or
-    # 'link_executable()' or something -- or maybe 'link_static_lib()'
-    # should not exist at all, and we just have 'link_binary()'?
     def link_static_lib (self,
                          objects,
                          output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         extra_preargs=None,
-                         extra_postargs=None):
+                         output_dir=None):
         """Link a bunch of stuff together to create a static library
            file.  The "bunch of stuff" consists of the list of object
            files supplied as 'objects', the extra object files supplied
@@ -368,6 +361,23 @@ def link_shared_object (self,
         pass
 
 
+    def link_executable (self,
+                         objects,
+                         output_progname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         extra_preargs=None,
+                         extra_postargs=None):
+        """Link a bunch of stuff together to create a binary executable
+           file.  The "bunch of stuff" is as for 'link_static_lib()'.
+           'output_progname' should be the base name of the executable
+           program--e.g. on Unix the same as the output filename, but
+           on DOS/Windows ".exe" will be appended."""
+        pass
+
+
+
     # -- Filename mangling methods -------------------------------------
 
     # General principle for the filename-mangling methods: by default,

From c77e34abbcc3b20c0091b26e3a9142599b98753a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Jan 2000 22:47:53 +0000
Subject: [PATCH 0112/8469] Abstracted '_fix_link_args()' out of
 'link_shared_object()'. Added 'link_static_lib()' method, and 'archiver' and
 'archiver_options'   class attributes to support it. Added
 'link_executable()' method, and 'ld_exec' instance attribute   to support it.
 'newer_group()' is now able to handle missing files, so we don't have   to
 kludge it by catching OSError when calling it. 'object_filenames()' and
 'shared_object_filename()' now take 'keep_dir'   flag parameters.
 'library_filename()' and 'shared_library_filename()' now respect   a
 directory component in the library name. Various comment updates/deletions.

---
 unixccompiler.py | 170 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 133 insertions(+), 37 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index edff4f0a0e..fb58269cc1 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -59,7 +59,14 @@ class UnixCCompiler (CCompiler):
     _exe_ext = ''
     _shared_lib_ext = SO
     _static_lib_ext = '.a'
-    
+
+    # Command to create a static library: seems to be pretty consistent
+    # across the major Unices.  Might have to move down into the
+    # constructor if we need platform-specific guesswork.
+    archiver = "ar"
+    archiver_options = "-cr"
+
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -87,6 +94,8 @@ def __init__ (self,
         (self.ld_shared, self.ldflags_shared) = \
             _split_command (LDSHARED)
 
+        self.ld_exec = self.cc
+
 
     def compile (self,
                  sources,
@@ -122,7 +131,7 @@ def compile (self,
         # don't have to recompile.  (Simplistic check -- we just compare the
         # source and object file, no deep dependency checking involving
         # header files.  Hmmm.)
-        objects = self.object_filenames (sources, output_dir)
+        objects = self.object_filenames (sources, output_dir=output_dir)
         if not self.force:
             skipped = newer_pairwise (sources, objects)
             for skipped_pair in skipped:
@@ -161,13 +170,70 @@ def compile (self,
         # return *all* of them, including those that weren't recompiled on
         # this call!
         return self.object_filenames (orig_sources, output_dir)
-    
 
-    # XXX punting on 'link_static_lib()' for now -- it might be better for
-    # CCompiler to mandate just 'link_binary()' or some such to build a new
-    # Python binary; it would then take care of linking in everything
-    # needed for the new Python without messing with an intermediate static
-    # library.
+
+    def _fix_link_args (self, output_dir, libraries, library_dirs):
+        """Fixes up the arguments supplied to the 'link_*' methods:
+           if output_dir is None, use self.output_dir; ensure that
+           libraries and library_dirs are both lists (could be None or
+           tuples on input -- both are converted to lists).  Return
+           a tuple of the three input arguments."""
+
+        if output_dir is None:
+            output_dir = self.output_dir
+        if libraries is None:
+            libraries = []
+        if library_dirs is None:
+            library_dirs = []
+        
+        if type (libraries) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'libraries' (if supplied) must be a list of strings"
+        if type (library_dirs) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'library_dirs' (if supplied) must be a list of strings"
+        libraries = list (libraries)
+        library_dirs = list (library_dirs)
+
+        return (output_dir, libraries, library_dirs)
+
+
+    def link_static_lib (self,
+                         objects,
+                         output_libname,
+                         output_dir=None):
+
+        if type (objects) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'objects' must be a list or tuple of strings"
+        objects = list (objects)
+            
+        if output_dir is None:
+            output_dir = self.output_dir
+
+        output_filename = self.library_filename (output_libname)
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        # Check timestamps: if any of the object files are newer than
+        # the library file, *or* if "force" is true, then we'll
+        # recreate the library.
+        if not self.force:
+            if self.dry_run:
+                newer = newer_group (objects, output_filename, missing='newer')
+            else:
+                newer = newer_group (objects, output_filename)
+
+        if self.force or newer:
+            self.spawn ([self.archiver,
+                         self.archiver_options,
+                         output_filename] +
+                        objects)
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
+
+    # link_static_lib ()
+
 
     def link_shared_lib (self,
                          objects,
@@ -198,21 +264,8 @@ def link_shared_object (self,
                             extra_preargs=None,
                             extra_postargs=None):
 
-        if output_dir is None:
-            output_dir = self.output_dir
-        if libraries is None:
-            libraries = []
-        if library_dirs is None:
-            library_dirs = []
-        
-        if type (libraries) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'libraries' (if supplied) must be a list of strings"
-        if type (library_dirs) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'library_dirs' (if supplied) must be a list of strings"
-        libraries = list (libraries)
-        library_dirs = list (library_dirs)
+        (output_dir, libraries, library_dirs) = \
+            self._fix_link_args (output_dir, libraries, library_dirs)
 
         lib_opts = gen_lib_options (self,
                                     self.library_dirs + library_dirs,
@@ -223,16 +276,12 @@ def link_shared_object (self,
         # If any of the input object files are newer than the output shared
         # object, relink.  Again, this is a simplistic dependency check:
         # doesn't look at any of the libraries we might be linking with.
-        # Note that we have to dance around errors comparing timestamps if
-        # we're in dry-run mode (yuck).
+
         if not self.force:
-            try:
+            if self.dry_run:
+                newer = newer_group (objects, output_filename, missing='newer')
+            else:
                 newer = newer_group (objects, output_filename)
-            except OSError:
-                if self.dry_run:
-                    newer = 1
-                else:
-                    raise
 
         if self.force or newer:
             ld_args = self.ldflags_shared + objects + \
@@ -248,31 +297,78 @@ def link_shared_object (self,
     # link_shared_object ()
 
 
+    def link_executable (self,
+                         objects,
+                         output_progname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         extra_preargs=None,
+                         extra_postargs=None):
+    
+        (output_dir, libraries, library_dirs) = \
+            self._fix_link_args (output_dir, libraries, library_dirs)
+
+        lib_opts = gen_lib_options (self,
+                                    self.library_dirs + library_dirs,
+                                    self.libraries + libraries)
+        output_filename = output_progname # Unix-ism!
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        # Same ol' simplistic-but-still-useful dependency check.
+        if not self.force:
+            if self.dry_run:
+                newer = newer_group (objects, output_filename, missing='newer')
+            else:
+                newer = newer_group (objects, output_filename)
+
+        if self.force or newer:
+            ld_args = objects + lib_opts + ['-o', output_filename]
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
+            self.spawn ([self.ld_exec] + ld_args)
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
+
+    # link_executable ()
+
+
     # -- Filename-mangling (etc.) methods ------------------------------
 
-    def object_filenames (self, source_filenames, output_dir=None):
+    def object_filenames (self, source_filenames,
+                          keep_dir=0, output_dir=None):
         outnames = []
         for inname in source_filenames:
             outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._obj_ext, inname)
-            outname = os.path.basename (outname)
+            if not keep_dir:
+                outname = os.path.basename (outname)
             if output_dir is not None:
                 outname = os.path.join (output_dir, outname)
             outnames.append (outname)
         return outnames
 
-    def shared_object_filename (self, source_filename, output_dir=None):
+    def shared_object_filename (self, source_filename,
+                                keep_dir=0, output_dir=None):
         outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._shared_lib_ext)
-        outname = os.path.basename (outname)
+        if not keep_dir:
+            outname = os.path.basename (outname)
         if output_dir is not None:
             outname = os.path.join (output_dir, outname)
         return outname
 
 
     def library_filename (self, libname):
-        return "lib%s%s" % (libname, self._static_lib_ext)
+        (dirname, basename) = os.path.split (libname)
+        return os.path.join (dirname,
+                             "lib%s%s" % (basename, self._static_lib_ext))
 
     def shared_library_filename (self, libname):
-        return "lib%s%s" % (libname, self._shared_lib_ext)
+        (dirname, basename) = os.path.split (libname)
+        return os.path.join (dirname,
+                             "lib%s%s" % (basename, self._shared_lib_ext))
 
 
     def library_dir_option (self, dir):

From 070f8639264c4ef9d748a2592cad810d189e8f4e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Jan 2000 22:48:59 +0000
Subject: [PATCH 0113/8469] 'newer_group()' can now deal with missing files, in
 a way specified by the 'missing' parameter.

---
 util.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 4f93cd44d5..953c2e26e2 100644
--- a/util.py
+++ b/util.py
@@ -120,11 +120,18 @@ def newer_pairwise (sources, targets):
 # newer_pairwise ()
 
 
-def newer_group (sources, target):
+def newer_group (sources, target, missing='error'):
     """Return true if 'target' is out-of-date with respect to any
        file listed in 'sources'.  In other words, if 'target' exists and
        is newer than every file in 'sources', return false; otherwise
-       return true."""
+       return true.  'missing' controls what we do when a source file is
+       missing; the default ("error") is to blow up with an OSError from
+       inside 'stat()'; if it is "ignore", we silently drop any missing
+       source files; if it is "newer", any missing source files make us
+       assume that 'target' is out-of-date (this is handy in "dry-run"
+       mode: it'll make you pretend to carry out commands that wouldn't
+       work because inputs are missing, but that doesn't matter because
+       you're not actually going to run the commands)."""
 
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists (target):
@@ -137,6 +144,14 @@ def newer_group (sources, target):
     from stat import ST_MTIME
     target_mtime = os.stat (target)[ST_MTIME]
     for source in sources:
+        if not os.path.exists (source):
+            if missing == 'error':      # blow up when we stat() the file
+                pass                    
+            elif missing == 'ignore':   # missing source dropped from 
+                continue                #  target's dependency list
+            elif missing == 'newer':    # missing source means target is
+                return 1                #  out-of-date
+            
         source_mtime = os.stat(source)[ST_MTIME]
         if source_mtime > target_mtime:
             return 1

From 9b0d91692d8ed2c33df2133484d19b66b4fe6aa4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 16:25:17 +0000
Subject: [PATCH 0114/8469] Ditch unneeded imports.

---
 command/build_py.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 6bc5aa8007..e27a36d464 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -12,7 +12,6 @@
 
 from distutils.core import Command
 from distutils.errors import *
-from distutils.util import mkpath, copy_file
 
 
 class BuildPy (Command):

From 705babe53bea546b02923e3a54ad837b7fd0f5f4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 16:25:59 +0000
Subject: [PATCH 0115/8469] Always run sys.prefix and sys.exec_prefix through
 'os.path.normpath()' before storing or using.

---
 command/install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index cd12f6fc5b..6f5d6715ca 100644
--- a/command/install.py
+++ b/command/install.py
@@ -130,9 +130,9 @@ def set_final_options (self):
         # ape the behaviour of Python's configure script.
 
         if self.prefix is None:         # user didn't override
-            self.prefix = sys.prefix
+            self.prefix = os.path.normpath (sys.prefix)
         if self.exec_prefix is None:
-            self.exec_prefix = sys.exec_prefix
+            self.exec_prefix = os.path.normpath (sys.exec_prefix)
 
         if self.install_lib is None:
             self.install_lib = \
@@ -247,10 +247,10 @@ def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
            return the "relocated" installation directory."""
 
         if use_exec:
-            sys_prefix = sys.exec_prefix
+            sys_prefix = os.path.normpath (sys.exec_prefix)
             my_prefix = self.exec_prefix
         else:
-            sys_prefix = sys.prefix
+            sys_prefix = os.path.normpath (sys.prefix)
             my_prefix = self.prefix
 
         val = getattr (sysconfig, config_attr)

From dcb45ff5424f902d4e82572b682549b8e1576c89 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 18:00:04 +0000
Subject: [PATCH 0116/8469] Fix library filename methods -- there is no 'lib'
 prefix under DOS/Windows.

---
 msvccompiler.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index d93c74c76d..48453768d2 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -202,18 +202,15 @@ def shared_object_filename (self, source_filename):
            specified source filename."""
         return self._change_extensions( source_filenames, self._shared_lib_ext )
 
-    # XXX ummm... these aren't right, are they?  I thought library 'foo' on
-    # DOS/Windows was to be found in "foo.lib", not "libfoo.lib"!
-
     def library_filename (self, libname):
         """Return the static library filename corresponding to the
            specified library name."""
-        return "lib%s%s" %( libname, self._static_lib_ext )
+        return "%s%s" %( libname, self._static_lib_ext )
 
     def shared_library_filename (self, libname):
         """Return the shared library filename corresponding to the
            specified library name."""
-        return "lib%s%s" %( libname, self._shared_lib_ext )
+        return "%s%s" %( libname, self._shared_lib_ext )
 
 
     def library_dir_option (self, dir):

From e5eb54ac61619eb08aa9c2f2975afe01b747ef5f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 18:04:04 +0000
Subject: [PATCH 0117/8469] Added code to use Jim Ahlstrom's zipfile.py module
 if the external zip command wasn't found or failed.  (Code supplied by Thomas
 Heller <thomas.heller@ion-tof.com>.)

---
 command/dist.py | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 80af990321..b588fe95a9 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -435,12 +435,39 @@ def make_tarball (self, base_dir, compress="gzip"):
 
     def make_zipfile (self, base_dir):
 
-        # This assumes the Unix 'zip' utility -- it could be easily recast
-        # to use pkzip (or whatever the command-line zip creation utility
-        # on Redmond's archaic CP/M knockoff is nowadays), but I'll let
-        # someone who can actually test it do that.
+        # This initially assumed the Unix 'zip' utility -- but
+        # apparently InfoZIP's zip.exe works the same under Windows, so
+        # no changes needed!
 
-        self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
+        try:
+            self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
+        except DistutilsExecError:
+
+            # XXX really should distinguish between "couldn't find
+            # external 'zip' command" and "zip failed" -- shouldn't try
+            # again in the latter case.  (I think fixing this will
+            # require some cooperation from the spawn module -- perhaps
+            # a utility function to search the path, so we can fallback
+            # on zipfile.py without the failed spawn.)
+            try:
+                import zipfile
+            except ImportError:
+                raise DistutilsExecError, \
+                      ("unable to create zip file '%s.zip':" + 
+                       "could neither find a standalone zip utility nor " +
+                       "import the 'zipfile' module") % base_dir
+
+                z = zipfile.ZipFile (base_dir + ".zip", "wb",
+                                     compression=zipfile.ZIP_DEFLATED)
+            
+            def visit (z, dirname, names):
+                for name in names:
+                    path = os.path.join (dirname, name)
+                    if os.path.isfile (path):
+                        z.write (path, path)
+                        
+            os.path.walk (base_dir, visit, z)
+            z.close()
 
 
     def make_distribution (self):

From 102e89700b1f852de2496db33885228989f8161a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 20:23:34 +0000
Subject: [PATCH 0118/8469] Added missing import. Fixed 'make_release_tree()'
 to copy files if 'os.link()' doesn't exist.

---
 command/dist.py | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index b588fe95a9..2d05f17447 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -13,6 +13,7 @@
 from shutil import rmtree
 from distutils.core import Command
 from distutils.text_file import TextFile
+from distutils.errors import DistutilsExecError
 
 
 # Possible modes of operation:
@@ -388,16 +389,30 @@ def make_release_tree (self, base_dir, files):
         for dir in need_dirs:
             self.mkpath (dir)
 
-        # And walk over the list of files, making a hard link for
-        # each one that doesn't already exist in its corresponding
-        # location under 'base_dir'
+        # And walk over the list of files, either making a hard link (if
+        # os.link exists) to each one that doesn't already exist in its
+        # corresponding location under 'base_dir', or copying each file
+        # that's out-of-date in 'base_dir'.  (Usually, all files will be
+        # out-of-date, because by default we blow away 'base_dir' when
+        # we're done making the distribution archives.)
     
-        self.announce ("making hard links in %s..." % base_dir)
+        try:
+            link = os.link
+            msg = "making hard links in %s..." % base_dir
+        except AttributeError:
+            link = 0
+            msg = "copying files to %s..." % base_dir
+
+        self.announce (msg)
         for file in files:
             dest = os.path.join (base_dir, file)
-            if not os.path.exists (dest):
-                self.execute (os.link, (file, dest),
-                              "linking %s -> %s" % (file, dest))
+            if link:
+                if not os.path.exists (dest):
+                    self.execute (os.link, (file, dest),
+                                  "linking %s -> %s" % (file, dest))
+            else:
+                self.copy_file (file, dest)
+
     # make_release_tree ()
 
 
@@ -453,7 +468,7 @@ def make_zipfile (self, base_dir):
                 import zipfile
             except ImportError:
                 raise DistutilsExecError, \
-                      ("unable to create zip file '%s.zip':" + 
+                      ("unable to create zip file '%s.zip': " + 
                        "could neither find a standalone zip utility nor " +
                        "import the 'zipfile' module") % base_dir
 

From 696403a48232186753c41267731124d0105892e3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 20:40:48 +0000
Subject: [PATCH 0119/8469] Added compiler flags suggested by Thomas Heller:
 optimize, use multi-threaded RT library.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 48453768d2..50fd4622f3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -37,7 +37,7 @@ def __init__ (self,
         self.cc   = "cl.exe"
         self.link = "link.exe"
         self.preprocess_options = None
-        self.compile_options = [ '/nologo' ]
+        self.compile_options = [ '/nologo', '/Ox', '/MD', '/GD' ]
 
         self.ldflags_shared = ['/DLL', '/nologo']
         self.ldflags_static = [ '/nologo']

From ab853dd09598817baa291d816f22a8a0b0c784c8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 21:57:17 +0000
Subject: [PATCH 0120/8469] Removed /GD switch -- currently ignored by MSVC.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 50fd4622f3..a07b4b8ea6 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -37,7 +37,7 @@ def __init__ (self,
         self.cc   = "cl.exe"
         self.link = "link.exe"
         self.preprocess_options = None
-        self.compile_options = [ '/nologo', '/Ox', '/MD', '/GD' ]
+        self.compile_options = [ '/nologo', '/Ox', '/MD' ]
 
         self.ldflags_shared = ['/DLL', '/nologo']
         self.ldflags_static = [ '/nologo']

From 57794609e7637324ea1c7c31686e8889571bccd6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 21:57:55 +0000
Subject: [PATCH 0121/8469] Catch OSError from 'spawnv()' in '_spawn_nt()'.
 Tweaked error messages in '_spawn_posix()'.

---
 spawn.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/spawn.py b/spawn.py
index eee8e7f4a0..9a88ac8987 100644
--- a/spawn.py
+++ b/spawn.py
@@ -63,9 +63,16 @@ def _spawn_nt ( cmd,
         print string.join ( [executable] + cmd[1:], ' ')
     if not dry_run:
         # spawn for NT requires a full path to the .exe
-        rc = os.spawnv (os.P_WAIT, executable, cmd)
+        try:
+            rc = os.spawnv (os.P_WAIT, executable, cmd)
+        except OSError, exc:
+            # this seems to happen when the command isn't found
+            raise DistutilsExecError, \
+                  "command '%s' failed: %s" % (cmd[0], exc[-1])
         if rc != 0:
-            raise DistutilsExecError("command failed: %d" % rc) 
+            # and this reflects the command running but failing
+            raise DistutilsExecError, \
+                  "command '%s' failed with exit status %d" % (cmd[0], rc)
 
     
                 
@@ -103,7 +110,7 @@ def _spawn_posix (cmd,
             (pid, status) = os.waitpid (pid, 0)
             if os.WIFSIGNALED (status):
                 raise DistutilsExecError, \
-                      "command %s terminated by signal %d" % \
+                      "command '%s' terminated by signal %d" % \
                       (cmd[0], os.WTERMSIG (status))
 
             elif os.WIFEXITED (status):
@@ -112,7 +119,7 @@ def _spawn_posix (cmd,
                     return              # hey, it succeeded!
                 else:
                     raise DistutilsExecError, \
-                          "command %s failed with exit status %d" % \
+                          "command '%s' failed with exit status %d" % \
                           (cmd[0], exit_status)
         
             elif os.WIFSTOPPED (status):
@@ -120,6 +127,6 @@ def _spawn_posix (cmd,
 
             else:
                 raise DistutilsExecError, \
-                      "unknown error executing %s: termination status %d" % \
+                      "unknown error executing '%s': termination status %d" % \
                       (cmd[0], status)
 # _spawn_posix ()

From 0026c2ec06718cd6767b38cb5cc72bb77ed548b7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 17 Jan 2000 21:58:07 +0000
Subject: [PATCH 0122/8469] Fix indentation bug.

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

diff --git a/command/dist.py b/command/dist.py
index 2d05f17447..0f9e30bad8 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -472,8 +472,8 @@ def make_zipfile (self, base_dir):
                        "could neither find a standalone zip utility nor " +
                        "import the 'zipfile' module") % base_dir
 
-                z = zipfile.ZipFile (base_dir + ".zip", "wb",
-                                     compression=zipfile.ZIP_DEFLATED)
+            z = zipfile.ZipFile (base_dir + ".zip", "wb",
+                                 compression=zipfile.ZIP_DEFLATED)
             
             def visit (z, dirname, names):
                 for name in names:

From 6de13bfacf9bf7d1722fc1ff5c5d8e801512ae04 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 15:07:56 +0000
Subject: [PATCH 0123/8469] Added missing run of corresponding 'build' command.

---
 command/install_ext.py | 3 +++
 command/install_lib.py | 3 +++
 command/install_py.py  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/command/install_ext.py b/command/install_ext.py
index 3fb756c6a1..b5673d235a 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -27,6 +27,9 @@ def set_final_options (self):
 
     def run (self):
 
+        # Make sure we have built all extension modules first
+        self.run_peer ('build_ext')
+
         # Dump the entire "build/platlib" directory (or whatever it really
         # is; "build/platlib" is the default) to the installation target
         # (eg. "/usr/local/lib/python1.5/site-packages").  Note that
diff --git a/command/install_lib.py b/command/install_lib.py
index 35deaa812f..50939a3431 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -46,6 +46,9 @@ def set_final_options (self):
 
     def run (self):
 
+        # Make sure we have "built" all pure Python modules first
+        self.run_peer ('build_py')
+
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
         outfiles = self.copy_tree (self.build_dir, self.install_dir)
diff --git a/command/install_py.py b/command/install_py.py
index 35deaa812f..50939a3431 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -46,6 +46,9 @@ def set_final_options (self):
 
     def run (self):
 
+        # Make sure we have "built" all pure Python modules first
+        self.run_peer ('build_py')
+
         # Dump entire contents of the build directory to the installation
         # directory (that's the beauty of having a build directory!)
         outfiles = self.copy_tree (self.build_dir, self.install_dir)

From f8864bbadfdd49102b589272837a8ec1a93ca0fc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 18:30:32 +0000
Subject: [PATCH 0124/8469] Improvements to the help system:   * "--help" can
 now come either before or after particular commands     to get help on and
 can give help on multiple commands, eg.     "--help install dist" gives help
 on those two commands   * added "--help-commands" option, implemented by the
 'print_commands()'     and 'print_command_list()' methods

---
 core.py | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 5 deletions(-)

diff --git a/core.py b/core.py
index fd5ba907fb..7a646dad22 100644
--- a/core.py
+++ b/core.py
@@ -30,8 +30,9 @@
 usage = """\
 usage: %s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
    or: %s --help
+   or: %s --help-commands
    or: %s cmd --help
-""" % (sys.argv[0], sys.argv[0], sys.argv[0])
+""" % ((sys.argv[0],) * 4)
 
 
 def setup (**attrs):
@@ -159,6 +160,7 @@ def __init__ (self, attrs=None):
         self.dry_run = 0
         self.force = 0
         self.help = 0
+        self.help_commands = 0
 
         # And the "distribution meta-data" options -- these can only
         # come from setup.py (the caller), not the command line
@@ -270,15 +272,21 @@ def parse_command_line (self, args):
         # happen until we know what the command is.
 
         self.commands = []
-        args = fancy_getopt (self.global_options, self.negative_opt,
+        options = self.global_options + \
+                  [('help-commands', None,
+                    "list all available commands")]
+        args = fancy_getopt (options, self.negative_opt,
                              self, sys.argv[1:])
 
-        if self.help:
-            print_help (self.global_options, header="Global options:")
+        # User just wants a list of commands -- we'll print it out and stop
+        # processing now (ie. if they ran "setup --help-commands foo bar",
+        # we ignore "foo bar").
+        if self.help_commands:
+            self.print_commands ()
             print
             print usage
             return
-
+            
         while args:
             # Pull the current command from the head of the command line
             command = args[0]
@@ -336,6 +344,25 @@ def parse_command_line (self, args):
 
         # while args
 
+        # If the user wants help -- ie. they gave the "--help" option --
+        # give it to 'em.  We do this *after* processing the commands in
+        # case they want help on any particular command, eg.
+        # "setup.py --help foo".  (This isn't the documented way to
+        # get help on a command, but I support it because that's how
+        # CVS does it -- might as well be consistent.)
+        if self.help:
+            print_help (self.global_options, header="Global options:")
+            print
+
+            for command in self.commands:
+                klass = self.find_command_class (command)
+                print_help (klass.options,
+                            header="Options for '%s' command:" % command)
+                print
+
+            print usage
+            return
+
         # Oops, no commands found -- an end-user error
         if not self.commands:
             raise DistutilsArgError, "no commands supplied"
@@ -346,6 +373,63 @@ def parse_command_line (self, args):
     # parse_command_line()
 
 
+    def print_command_list (self, commands, header, max_length):
+        """Print a subset of the list of all commands -- used by
+           'print_commands()'."""
+
+        print header + ":"
+
+        for cmd in commands:
+            klass = self.cmdclass.get (cmd)
+            if not klass:
+                klass = self.find_command_class (cmd)
+            try:
+                description = klass.description
+            except AttributeError:
+                description = "(no description available)"
+
+            print "  %-*s  %s" % (max_length, cmd, description)
+
+    # print_command_list ()
+
+
+    def print_commands (self):
+        """Print out a help message listing all available commands with
+           a description of each.  The list is divided into "standard
+           commands" (listed in distutils.command.__all__) and "extra
+           commands" (mentioned in self.cmdclass, but not a standard
+           command).  The descriptions come from the command class
+           attribute 'description'."""
+
+        import distutils.command
+        std_commands = distutils.command.__all__
+        is_std = {}
+        for cmd in std_commands:
+            is_std[cmd] = 1
+
+        extra_commands = []
+        for cmd in self.cmdclass.keys():
+            if not is_std.get(cmd):
+                extra_commands.append (cmd)
+
+        max_length = 0
+        for cmd in (std_commands + extra_commands):
+            if len (cmd) > max_length:
+                max_length = len (cmd)
+
+        self.print_command_list (std_commands,
+                                 "Standard commands",
+                                 max_length)
+        if extra_commands:
+            print
+            self.print_command_list (extra_commands,
+                                     "Extra commands",
+                                     max_length)
+
+    # print_commands ()
+        
+
+
     # -- Command class/object methods ----------------------------------
 
     # This is a method just so it can be overridden if desired; it doesn't

From 40b35bdeccac9d3b970f084d10fd7d0502bca864 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 18:31:34 +0000
Subject: [PATCH 0125/8469] Added 'dist' command.

---
 command/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/__init__.py b/command/__init__.py
index 9a5aef2002..8659307cbf 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -9,6 +9,7 @@
   install
   install_py
   install_ext
+  dist
 
 but this list will undoubtedly grow with time."""
 
@@ -20,4 +21,5 @@
            'install',
            'install_py',
            'install_ext',
+           'dist',
           ]

From fb6034d5ef6f4eccc9ee98e7aa353a4b2ae51235 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 18:34:15 +0000
Subject: [PATCH 0126/8469] Added 'description' class attribute to every
 command class (to help the   '--help-commands' option). Shuffled imports
 around in a few command modules to avoid expensive   up-front import of
 sysconfig (and resulting delays in generating list   of all commands).

---
 command/build.py       |  2 ++
 command/build_ext.py   | 15 ++++++++++-----
 command/build_py.py    |  2 ++
 command/dist.py        |  2 ++
 command/install.py     |  5 ++++-
 command/install_ext.py |  2 ++
 command/install_lib.py |  2 ++
 command/install_py.py  |  2 ++
 8 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/command/build.py b/command/build.py
index 1586e60b07..e6c87bfcae 100644
--- a/command/build.py
+++ b/command/build.py
@@ -12,6 +12,8 @@
 
 class Build (Command):
 
+    description = "build everything needed to install"
+
     options = [('build-base=', 'b',
                 "base directory for build library"),
                ('build-lib=', 'l',
diff --git a/command/build_ext.py b/command/build_ext.py
index d38cb18b5c..4f7e53ff30 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -11,8 +11,6 @@
 import sys, os, string, re
 from types import *
 from distutils.core import Command
-from distutils.ccompiler import new_compiler
-from distutils.sysconfig import INCLUDEPY, SO, exec_prefix
 from distutils.errors import *
 
 
@@ -24,6 +22,8 @@
 
 class BuildExt (Command):
     
+    description = "build C/C++ extensions (compile/link to build directory)"
+
     # XXX thoughts on how to deal with complex command-line options like
     # these, i.e. how to make it so fancy_getopt can suck them off the
     # command line and make it look like setup.py defined the appropriate
@@ -76,6 +76,8 @@ def set_default_options (self):
 
 
     def set_final_options (self):
+        from distutils import sysconfig
+
         self.set_undefined_options ('build', ('build_platlib', 'build_dir'))
 
         if self.package is None:
@@ -88,8 +90,8 @@ def set_final_options (self):
         # etc.) are in the include search path.  We have to roll our own
         # "exec include dir", because the Makefile parsed by sysconfig
         # doesn't have it (sigh).
-        py_include = INCLUDEPY         # prefix + "include" + "python" + ver
-        exec_py_include = os.path.join (exec_prefix, 'include',
+        py_include = sysconfig.INCLUDEPY # prefix + "include" + "python" + ver
+        exec_py_include = os.path.join (sysconfig.exec_prefix, 'include',
                                         'python' + sys.version[0:3])
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
@@ -104,6 +106,8 @@ def set_final_options (self):
 
     def run (self):
 
+        from distutils.ccompiler import new_compiler
+
         # 'self.extensions', as supplied by setup.py, is a list of 2-tuples.
         # Each tuple is simple:
         #    (ext_name, build_info)
@@ -246,9 +250,10 @@ def build_extensions (self, extensions):
 
 
     def extension_filename (self, ext_name, package=None):
+        from distutils import sysconfig
         if package:
             ext_name = package + '.' + ext_name
         ext_path = string.split (ext_name, '.')
-        return apply (os.path.join, ext_path) + SO
+        return apply (os.path.join, ext_path) + sysconfig.SO
 
 # class BuildExt
diff --git a/command/build_py.py b/command/build_py.py
index e27a36d464..57ddf7e7ea 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -16,6 +16,8 @@
 
 class BuildPy (Command):
 
+    description = "\"build\" pure Python modules (copy to build directory)"
+
     options = [('build-dir=', 'd', "directory for platform-shared files"),
               ]
 
diff --git a/command/dist.py b/command/dist.py
index 0f9e30bad8..76332b2751 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -131,6 +131,8 @@
 
 class Dist (Command):
 
+    description = "create a source distribution (tarball, zip file, etc.)"
+
     options = [('formats=', None,
                 "formats for source distribution (tar, ztar, gztar, or zip)"),
                ('manifest=', 'm',
diff --git a/command/install.py b/command/install.py
index 6f5d6715ca..0e5b01cc98 100644
--- a/command/install.py
+++ b/command/install.py
@@ -8,13 +8,14 @@
 
 import sys, os, string
 from types import *
-from distutils import sysconfig
 from distutils.core import Command
 from distutils.util import write_file
 
 
 class Install (Command):
 
+    description = "install everything from build directory"
+
     options = [('prefix=', None, "installation prefix"),
                ('exec-prefix=', None,
                 "prefix for platform-specific files"),
@@ -246,6 +247,8 @@ def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
            then replace it with the current installation prefix and
            return the "relocated" installation directory."""
 
+        from distutils import sysconfig
+
         if use_exec:
             sys_prefix = os.path.normpath (sys.exec_prefix)
             my_prefix = self.exec_prefix
diff --git a/command/install_ext.py b/command/install_ext.py
index b5673d235a..599a37e1ce 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -11,6 +11,8 @@
 
 class InstallExt (Command):
 
+    description = "install C/C++ extension modules"
+    
     options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
               ]
diff --git a/command/install_lib.py b/command/install_lib.py
index 50939a3431..2e8a670686 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -8,6 +8,8 @@
 
 class InstallPy (Command):
 
+    description = "install pure Python modules"
+
     options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),
diff --git a/command/install_py.py b/command/install_py.py
index 50939a3431..2e8a670686 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -8,6 +8,8 @@
 
 class InstallPy (Command):
 
+    description = "install pure Python modules"
+
     options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
                ('compile', 'c', "compile .py to .pyc"),

From 4cf86996ee90c2109a98829865f736683ca5cfac Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 19:57:48 +0000
Subject: [PATCH 0127/8469] Fixed broken list extend in 'copy_tree()'.

---
 util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 953c2e26e2..58d58439e0 100644
--- a/util.py
+++ b/util.py
@@ -349,10 +349,10 @@ def copy_tree (src, dst,
             outputs.append (dst_name)
             
         elif os.path.isdir (src_name):
-            outputs[-1:] = \
+            outputs.extend (
                 copy_tree (src_name, dst_name,
                            preserve_mode, preserve_times, preserve_symlinks,
-                           update, verbose, dry_run)
+                           update, verbose, dry_run))
         else:
             if (copy_file (src_name, dst_name,
                            preserve_mode, preserve_times,

From 6be52b45d1a442faf400b853e190db26b718d1c9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jan 2000 20:22:27 +0000
Subject: [PATCH 0128/8469] Allow either README or README.txt as a "standard
 file".

---
 command/dist.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/command/dist.py b/command/dist.py
index 76332b2751..ea61a4806e 100644
--- a/command/dist.py
+++ b/command/dist.py
@@ -219,12 +219,24 @@ def check_metadata (self):
 
     def find_defaults (self):
 
-        standards = ['README', 'setup.py']
+        standards = [('README', 'README.txt'), 'setup.py']
         for fn in standards:
-            if os.path.exists (fn):
-                self.files.append (fn)
+            if type (fn) is TupleType:
+                alts = fn
+                for fn in alts:
+                    if os.path.exists (fn):
+                        got_it = 1
+                        self.files.append (fn)
+                        break
+
+                if not got_it:
+                    self.warn ("standard file not found: should have one of " +
+                               string.join (alts, ', '))
             else:
-                self.warn ("standard file %s not found" % fn)
+                if os.path.exists (fn):
+                    self.files.append (fn)
+                else:
+                    self.warn ("standard file %s not found" % fn)
 
         optional = ['test/test*.py']
         for pattern in optional:

From 439aa60615c8ada638e789a78159d26091838ffe Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Feb 2000 00:05:14 +0000
Subject: [PATCH 0129/8469] Comment fix. Always use normalized (with
 os.path.normpath()) versions of prefix and   exec_prefix.

---
 sysconfig.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8eaf17dc35..0e40cbc350 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -13,15 +13,20 @@
 import string
 import sys
 
+prefix = os.path.normpath (sys.prefix)
+exec_prefix = os.path.normpath (sys.exec_prefix)
+
 
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    return os.path.join(sys.exec_prefix, "include", "python" + sys.version[:3],
+    return os.path.join(exec_prefix,
+                        "include", "python" + sys.version[:3],
                         "config.h")
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
-    return os.path.join(sys.exec_prefix, "lib", "python" + sys.version[:3],
+    return os.path.join(exec_prefix,
+                        "lib", "python" + sys.version[:3],
                         "config", "Makefile")
 
 def parse_config_h(fp, g=None):
@@ -125,7 +130,7 @@ def _init_posix():
     g = globals()
     # load the installed config.h:
     parse_config_h(open(get_config_h_filename()), g)
-    # load the installed Makefile.pre.in:
+    # load the installed Makefile:
     parse_makefile(open(get_makefile_filename()), g)
 
 
@@ -134,16 +139,16 @@ def _init_nt():
     g=globals()
     # load config.h, though I don't know how useful this is
     parse_config_h(open(
-            os.path.join(sys.exec_prefix, "include", "config.h")), g)
+            os.path.join(exec_prefix, "include", "config.h")), g)
     # set basic install directories
-    g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib")
-    g['BINLIBDEST']= os.path.join(sys.exec_prefix, "Lib")
+    g['LIBDEST']=os.path.join(exec_prefix, "Lib")
+    g['BINLIBDEST']= os.path.join(exec_prefix, "Lib")
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = os.path.join (sys.prefix, 'include' )
+    g['INCLUDEPY'] = os.path.join (prefix, 'include' )
 
     g['SO'] = '.dll'
-    g['exec_prefix'] = sys.exec_prefix
+    g['exec_prefix'] = exec_prefix
 
 try:
     exec "_init_" + os.name

From 0298b16d8f10a056dbd74b2b68c425fcf873d6e2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Feb 2000 00:07:14 +0000
Subject: [PATCH 0130/8469] Patch from Joe Van Andel: fix arg to % operator in
 warning.

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

diff --git a/command/build_py.py b/command/build_py.py
index 57ddf7e7ea..048962b29f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -160,8 +160,8 @@ def check_package (self, package, package_dir):
 
     def check_module (self, module, module_file):
         if not os.path.isfile (module_file):
-            self.warn ("file %s (for module %s) not found" %
-                       module_file, module)
+            self.warn ("file %s (for module %s) not found" % 
+                       (module_file, module))
             return 0
         else:
             return 1

From b97cf9ec1ea46ad32766cabf2f8b0697be681944 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 3 Feb 2000 23:07:19 +0000
Subject: [PATCH 0131/8469] Changed 'compile()' method to compile files
 one-at-a-time -- gives better feedback and, theoretically, the opportunity to
 set compiler flags on a per-file basis.

---
 unixccompiler.py | 49 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index fb58269cc1..9ace98606c 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -137,34 +137,27 @@ def compile (self,
             for skipped_pair in skipped:
                 self.announce ("skipping %s (%s up-to-date)" % skipped_pair)
 
-        # If anything left to compile, compile it
-        if sources:
-            # XXX use of ccflags_shared means we're blithely assuming
-            # that we're compiling for inclusion in a shared object!
-            # (will have to fix this when I add the ability to build a
-            # new Python)
-            cc_args = ['-c'] + pp_opts + \
-                      self.ccflags + self.ccflags_shared + \
-                      sources
-            if extra_preargs:
-                cc_args[:0] = extra_preargs
-            if extra_postargs:
-                cc_args.extend (extra_postargs)
-            self.spawn ([self.cc] + cc_args)
-        
-
-        # Note that compiling multiple source files in the same go like
-        # we've just done drops the .o file in the current directory, which
-        # may not be what the caller wants (depending on the 'output_dir'
-        # parameter).  So, if necessary, fix that now by moving the .o
-        # files into the desired output directory.  (The alternative, of
-        # course, is to compile one-at-a-time with a -o option.  6 of one,
-        # 12/2 of the other...)
-
-        if output_dir:
-            for i in range (len (objects)):
-                src = os.path.basename (objects[i])
-                objects[i] = self.move_file (src, output_dir)
+        # Build list of (source,object) tuples for convenience
+        srcobj = []
+        for i in range (len (sources)):
+            srcobj.append ((sources[i], objects[i]))
+
+        # Compile all source files that weren't eliminated by
+        # 'newer_pairwise()'.
+        # XXX use of ccflags_shared means we're blithely assuming
+        # that we're compiling for inclusion in a shared object!
+        # (will have to fix this when I add the ability to build a
+        # new Python)
+        cc_args = ['-c'] + pp_opts + self.ccflags + self.ccflags_shared
+        if extra_preargs:
+            cc_args[:0] = extra_preargs
+        if extra_postargs is None:
+            extra_postargs = []
+
+        for (source,object) in srcobj:
+            self.spawn ([self.cc] + cc_args +
+                        [source, '-o', object] +
+                        extra_postargs)
 
         # Have to re-fetch list of object filenames, because we want to
         # return *all* of them, including those that weren't recompiled on

From 7c7b43f5c4d40dd9eb5524a4babd50f526cee53d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 3 Feb 2000 23:07:54 +0000
Subject: [PATCH 0132/8469] Improved an error message. Announce when we start
 building each extension (better feedback).

---
 command/build_ext.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4f7e53ff30..126cf60aab 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -197,10 +197,13 @@ def build_extensions (self, extensions):
             sources = build_info.get ('sources')
             if sources is None or type (sources) not in (ListType, TupleType):
                 raise DistutilsValueError, \
-                      "in ext_modules option, 'sources' must be present " + \
-                      "and must be a list of source filenames"
+                      ("in ext_modules option (extension '%s'), " +
+                       "'sources' must be present and must be " +
+                       "a list of source filenames") % extension_name
             sources = list (sources)
 
+            self.announce ("building '%s' extension" % extension_name)
+
             # First step: compile the source code to object files.  This
             # drops the object files in the current directory, regardless
             # of where the source is (may be a bad thing, but that's how a

From 139d5ff59d0b42ffd4a768d3fffe2b8f0320bc9d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Feb 2000 02:23:16 +0000
Subject: [PATCH 0133/8469] Tweaked various comments, docstrings, and error
 messages.

---
 command/build_ext.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 126cf60aab..b253c55dce 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -103,6 +103,11 @@ def set_final_options (self):
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
 
+        # XXX how the heck are 'self.define' and 'self.undef' supposed to
+        # be set?
+
+    # set_final_options ()
+    
 
     def run (self):
 
@@ -152,6 +157,11 @@ def run (self):
             
 
     def check_extensions_list (self, extensions):
+        """Ensure that the list of extensions (presumably provided as a
+           command option 'extensions') is valid, i.e. it is a list of
+           2-tuples, where the tuples are (extension_name, build_info_dict).
+           Raise DistutilsValueError if the structure is invalid anywhere;
+           just returns otherwise."""
 
         if type (extensions) is not ListType:
             raise DistutilsValueError, \
@@ -171,7 +181,7 @@ def check_extensions_list (self, extensions):
             if type (ext[1]) is not DictionaryType:
                 raise DistutilsValueError, \
                       "second element of each tuple in 'ext_modules' " + \
-                      "must be a dictionary"
+                      "must be a dictionary (build info)"
 
         # end sanity-check for
 
@@ -197,7 +207,7 @@ def build_extensions (self, extensions):
             sources = build_info.get ('sources')
             if sources is None or type (sources) not in (ListType, TupleType):
                 raise DistutilsValueError, \
-                      ("in ext_modules option (extension '%s'), " +
+                      ("in 'ext_modules' option (extension '%s'), " +
                        "'sources' must be present and must be " +
                        "a list of source filenames") % extension_name
             sources = list (sources)

From 57d9abc5b58cf0fdc8a19692abdb934f5e07f52b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Feb 2000 02:23:59 +0000
Subject: [PATCH 0134/8469] New command to build C (and C++, hopefully)
 libraries needed by extensions in the current distribution: motivated by
 PIL's libImaging.

---
 command/build_clib.py | 161 ++++++++++++++++++++++++++++++++++++++++++
 command/build_lib.py  | 161 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 322 insertions(+)
 create mode 100644 command/build_clib.py
 create mode 100644 command/build_lib.py

diff --git a/command/build_clib.py b/command/build_clib.py
new file mode 100644
index 0000000000..c638fd5ffc
--- /dev/null
+++ b/command/build_clib.py
@@ -0,0 +1,161 @@
+"""distutils.command.build_lib
+
+Implements the Distutils 'build_lib' command, to build a C/C++ library
+that is included in the module distribution and needed by an extension
+module."""
+
+# created (an empty husk) 1999/12/18, Greg Ward
+# fleshed out 2000/02/03-04
+
+__rcsid__ = "$Id$"
+
+
+# XXX this module has *lots* of code ripped-off quite transparently from
+# build_ext.py -- not surprisingly really, as the work required to build
+# a static library from a collection of C source files is not really all
+# that different from what's required to build a shared object file from
+# a collection of C source files.  Nevertheless, I haven't done the
+# necessary refactoring to account for the overlap in code between the
+# two modules, mainly because a number of subtle details changed in the
+# cut 'n paste.  Sigh.
+
+import os, string
+from types import *
+from distutils.core import Command
+from distutils.errors import *
+from distutils.ccompiler import new_compiler
+
+
+class BuildLib (Command):
+
+    options = []
+
+    def set_default_options (self):
+        # List of libraries to build
+        self.libraries = None
+
+        # Compilation options for all libraries
+        self.include_dirs = None
+        self.define = None
+        self.undef = None
+
+    # set_default_options()
+
+    def set_final_options (self):
+        self.libraries = self.distribution.libraries
+        if self.include_dirs is None:
+            self.include_dirs = self.distribution.include_dirs or []
+        if type (self.include_dirs) is StringType:
+            self.include_dirs = string.split (self.include_dirs,
+                                              os.pathsep)
+
+        # XXX same as for build_ext -- what about 'self.define' and
+        # 'self.undef' ?
+
+    # set_final_options()
+
+
+    def run (self):
+
+        if not self.libraries:
+            return
+        self.check_library_list (self.libraries)
+
+        # Yech -- this is cut 'n pasted from build_ext.py!
+        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
+                                      verbose=self.verbose,
+                                      dry_run=self.dry_run,
+                                      force=self.force)
+        if self.include_dirs is not None:
+            self.compiler.set_include_dirs (self.include_dirs)
+        if self.define is not None:
+            # 'define' option is a list of (name,value) tuples
+            for (name,value) in self.define:
+                self.compiler.define_macro (name, value)
+        if self.undef is not None:
+            for macro in self.undef:
+                self.compiler.undefine_macro (macro)
+
+        self.build_libraries (self.libraries)
+
+    # run()
+
+
+    def check_library_list (self, libraries):
+        """Ensure that the list of libraries (presumably provided as a
+           command option 'libraries') is valid, i.e. it is a list of
+           2-tuples, where the tuples are (library_name, build_info_dict).
+           Raise DistutilsValueError if the structure is invalid anywhere;
+           just returns otherwise."""
+
+        # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
+        # with only names changed to protect the innocent!
+
+        if type (libraries) is not ListType:
+            raise DistutilsValueError, \
+                  "'libraries' option must be a list of tuples"
+
+        for lib in libraries:
+            if type (lib) is not TupleType and len (lib) != 2:
+                raise DistutilsValueError, \
+                      "each element of 'libraries' must a 2-tuple"
+
+            if type (lib[0]) is not StringType:
+                raise DistutilsValueError, \
+                      "first element of each tuple in 'libraries' " + \
+                      "must be a string (the library name)"
+            if type (lib[1]) is not DictionaryType:
+                raise DistutilsValueError, \
+                      "second element of each tuple in 'libraries' " + \
+                      "must be a dictionary (build info)"
+        # for lib
+
+    # check_library_list ()
+
+
+    def build_libraries (self, libraries):
+
+        compiler = self.compiler
+
+        for (lib_name, build_info) in libraries:
+            sources = build_info.get ('sources')
+            if sources is None or type (sources) not in (ListType, TupleType):
+                raise DistutilsValueError, \
+                      ("in 'libraries' option (library '%s'), " +
+                       "'sources' must be present and must be " +
+                       "a list of source filenames") % lib_name
+            sources = list (sources)
+
+            self.announce ("building '%s' library" % lib_name)
+
+            # Extract the directory the library is intended to go in --
+            # note translation from "universal" slash-separated form to
+            # current platform's pathname convention (so we can use the
+            # string for actual filesystem use).
+            path = tuple (string.split (lib_name, '/')[:-1])
+            if path:
+                lib_dir = apply (os.path.join, path)
+            else:
+                lib_dir = ''
+
+            # First, compile the source code to object files in the library
+            # directory.  (This should probably change to putting object
+            # files in a temporary build directory.)
+            macros = build_info.get ('macros')
+            include_dirs = build_info.get ('include_dirs')
+            objects = self.compiler.compile (sources,
+                                             macros=macros,
+                                             include_dirs=include_dirs,
+                                             output_dir=lib_dir)
+
+            # Now "link" the object files together into a static library.
+            # (On Unix at least, this isn't really linking -- it just
+            # builds an archive.  Whatever.)
+            self.compiler.link_static_lib (objects, lib_name)
+
+        # for libraries
+
+    # build_libraries ()
+                
+
+# class BuildLib
diff --git a/command/build_lib.py b/command/build_lib.py
new file mode 100644
index 0000000000..c638fd5ffc
--- /dev/null
+++ b/command/build_lib.py
@@ -0,0 +1,161 @@
+"""distutils.command.build_lib
+
+Implements the Distutils 'build_lib' command, to build a C/C++ library
+that is included in the module distribution and needed by an extension
+module."""
+
+# created (an empty husk) 1999/12/18, Greg Ward
+# fleshed out 2000/02/03-04
+
+__rcsid__ = "$Id$"
+
+
+# XXX this module has *lots* of code ripped-off quite transparently from
+# build_ext.py -- not surprisingly really, as the work required to build
+# a static library from a collection of C source files is not really all
+# that different from what's required to build a shared object file from
+# a collection of C source files.  Nevertheless, I haven't done the
+# necessary refactoring to account for the overlap in code between the
+# two modules, mainly because a number of subtle details changed in the
+# cut 'n paste.  Sigh.
+
+import os, string
+from types import *
+from distutils.core import Command
+from distutils.errors import *
+from distutils.ccompiler import new_compiler
+
+
+class BuildLib (Command):
+
+    options = []
+
+    def set_default_options (self):
+        # List of libraries to build
+        self.libraries = None
+
+        # Compilation options for all libraries
+        self.include_dirs = None
+        self.define = None
+        self.undef = None
+
+    # set_default_options()
+
+    def set_final_options (self):
+        self.libraries = self.distribution.libraries
+        if self.include_dirs is None:
+            self.include_dirs = self.distribution.include_dirs or []
+        if type (self.include_dirs) is StringType:
+            self.include_dirs = string.split (self.include_dirs,
+                                              os.pathsep)
+
+        # XXX same as for build_ext -- what about 'self.define' and
+        # 'self.undef' ?
+
+    # set_final_options()
+
+
+    def run (self):
+
+        if not self.libraries:
+            return
+        self.check_library_list (self.libraries)
+
+        # Yech -- this is cut 'n pasted from build_ext.py!
+        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
+                                      verbose=self.verbose,
+                                      dry_run=self.dry_run,
+                                      force=self.force)
+        if self.include_dirs is not None:
+            self.compiler.set_include_dirs (self.include_dirs)
+        if self.define is not None:
+            # 'define' option is a list of (name,value) tuples
+            for (name,value) in self.define:
+                self.compiler.define_macro (name, value)
+        if self.undef is not None:
+            for macro in self.undef:
+                self.compiler.undefine_macro (macro)
+
+        self.build_libraries (self.libraries)
+
+    # run()
+
+
+    def check_library_list (self, libraries):
+        """Ensure that the list of libraries (presumably provided as a
+           command option 'libraries') is valid, i.e. it is a list of
+           2-tuples, where the tuples are (library_name, build_info_dict).
+           Raise DistutilsValueError if the structure is invalid anywhere;
+           just returns otherwise."""
+
+        # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
+        # with only names changed to protect the innocent!
+
+        if type (libraries) is not ListType:
+            raise DistutilsValueError, \
+                  "'libraries' option must be a list of tuples"
+
+        for lib in libraries:
+            if type (lib) is not TupleType and len (lib) != 2:
+                raise DistutilsValueError, \
+                      "each element of 'libraries' must a 2-tuple"
+
+            if type (lib[0]) is not StringType:
+                raise DistutilsValueError, \
+                      "first element of each tuple in 'libraries' " + \
+                      "must be a string (the library name)"
+            if type (lib[1]) is not DictionaryType:
+                raise DistutilsValueError, \
+                      "second element of each tuple in 'libraries' " + \
+                      "must be a dictionary (build info)"
+        # for lib
+
+    # check_library_list ()
+
+
+    def build_libraries (self, libraries):
+
+        compiler = self.compiler
+
+        for (lib_name, build_info) in libraries:
+            sources = build_info.get ('sources')
+            if sources is None or type (sources) not in (ListType, TupleType):
+                raise DistutilsValueError, \
+                      ("in 'libraries' option (library '%s'), " +
+                       "'sources' must be present and must be " +
+                       "a list of source filenames") % lib_name
+            sources = list (sources)
+
+            self.announce ("building '%s' library" % lib_name)
+
+            # Extract the directory the library is intended to go in --
+            # note translation from "universal" slash-separated form to
+            # current platform's pathname convention (so we can use the
+            # string for actual filesystem use).
+            path = tuple (string.split (lib_name, '/')[:-1])
+            if path:
+                lib_dir = apply (os.path.join, path)
+            else:
+                lib_dir = ''
+
+            # First, compile the source code to object files in the library
+            # directory.  (This should probably change to putting object
+            # files in a temporary build directory.)
+            macros = build_info.get ('macros')
+            include_dirs = build_info.get ('include_dirs')
+            objects = self.compiler.compile (sources,
+                                             macros=macros,
+                                             include_dirs=include_dirs,
+                                             output_dir=lib_dir)
+
+            # Now "link" the object files together into a static library.
+            # (On Unix at least, this isn't really linking -- it just
+            # builds an archive.  Whatever.)
+            self.compiler.link_static_lib (objects, lib_name)
+
+        # for libraries
+
+    # build_libraries ()
+                
+
+# class BuildLib

From ed153d7c608a30aeda273198189cd1539d01be2b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Feb 2000 02:24:16 +0000
Subject: [PATCH 0135/8469] Run the 'build_lib' command before building
 extensions, if necessary.

---
 command/build.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/build.py b/command/build.py
index e6c87bfcae..768db12062 100644
--- a/command/build.py
+++ b/command/build.py
@@ -48,6 +48,12 @@ def run (self):
         if self.distribution.packages or self.distribution.py_modules:
             self.run_peer ('build_py')
 
+        # Build any standalone C libraries next -- they're most likely to
+        # be needed by extension modules, so obviously have to be done
+        # first!
+        if self.distribution.libraries:
+            self.run_peer ('build_lib')
+
         # And now 'build_ext' -- compile extension modules and put them
         # into the build tree
         if self.distribution.ext_modules:

From 47356dea6774b33b37dc74067ef67696a40567e6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Feb 2000 02:24:52 +0000
Subject: [PATCH 0136/8469] Added 'libraries' option for use by the 'build_lib'
 command. Typo fix.

---
 core.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 7a646dad22..88e889b22f 100644
--- a/core.py
+++ b/core.py
@@ -188,6 +188,7 @@ def __init__ (self, attrs=None):
         self.packages = None
         self.package_dir = None
         self.py_modules = None
+        self.libraries = None
         self.ext_modules = None
         self.ext_package = None
         self.include_dirs = None
@@ -314,7 +315,7 @@ def parse_command_line (self, args):
             # known options
             if not (hasattr (cmd_obj, 'options') and
                     type (cmd_obj.options) is ListType):
-                raise DistutilsClasserror, \
+                raise DistutilsClassError, \
                       ("command class %s must provide an 'options' attribute "+
                        "(a list of tuples)") % \
                       cmd_obj.__class__

From b08bf9ee895d020cd5431304cc50aead7c0ba272 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Feb 2000 02:37:15 +0000
Subject: [PATCH 0137/8469] Ditch .def file kludge for (much smaller) /export
 option kludge.

---
 command/build_ext.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index b253c55dce..0f2d1a7bf3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -236,18 +236,7 @@ def build_extensions (self, extensions):
             library_dirs = build_info.get ('library_dirs')
             extra_args = build_info.get ('extra_link_args') or []
             if self.compiler.compiler_type == 'msvc':
-                def_file = build_info.get ('def_file')
-                if def_file is None:
-                    source_dir = os.path.dirname (sources[0])
-                    ext_base = (string.split (extension_name, '.'))[-1]
-                    def_file = os.path.join (source_dir, "%s.def" % ext_base)
-                    if not os.path.exists (def_file):
-                        self.warn ("file '%s' not found: " % def_file +
-                                   "might have problems building DLL")
-                        def_file = None
-
-                if def_file is not None:
-                    extra_args.append ('/DEF:' + def_file)
+                extra_args.append ('/export:init%s' % extension_name)
 
             ext_filename = self.extension_filename \
                            (extension_name, self.package)

From 23cd2df59e48224e36288f7437d180356b55da39 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Feb 2000 02:39:44 +0000
Subject: [PATCH 0138/8469] Revised version (thank to Thomas Heller and Robin
 Becker) that tries a lot harder to find the MSVC compiler (mainly by using
 the registry).

---
 msvccompiler.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index a07b4b8ea6..10cd6081d3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -10,10 +10,96 @@
 
 import os
 import sys
+import string
 from distutils.errors import *
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
 
+def _devstudio_versions():
+    "Get a list of devstudio versions"
+    try:
+        import win32api
+        import win32con
+    except ImportError:
+        return None
+
+    K = 'Software\\Microsoft\\Devstudio'
+    L = []
+    for base in (win32con.HKEY_CLASSES_ROOT,win32con.HKEY_LOCAL_MACHINE,win32con.HKEY_CURRENT_USER,win32con.HKEY_USERS):
+        try:
+            k = win32api.RegOpenKeyEx(base,K)
+            i = 0
+            while 1:
+                try:
+                    p = win32api.RegEnumKey(k,i)
+                    if p[0] in '123456789' and p not in L:
+                        L.append(p)
+                except win32api.error:
+                    break
+                i = i + 1
+        except win32api.error:
+            pass
+    L.sort()
+    L.reverse()
+    return L
+
+def _msvc_get_paths(path, vNum='6.0', platform='x86'):
+    "Get a devstudio path (include, lib or path)"
+    try:
+        import win32api
+        import win32con
+    except ImportError:
+        return None
+
+    L = []
+    if path=='lib': path= 'Library'
+    path = string.upper(path + ' Dirs')
+    K = 'Software\\Microsoft\\Devstudio\\%s\\Build System\\Components\\Platforms\\Win32 (%s)\\Directories' \
+                % (vNum,platform)
+    for base in (win32con.HKEY_CLASSES_ROOT,win32con.HKEY_LOCAL_MACHINE,win32con.HKEY_CURRENT_USER,win32con.HKEY_USERS):
+        try:
+            k = win32api.RegOpenKeyEx(base,K)
+            i = 0
+            while 1:
+                try:
+                    (p,v,t) = win32api.RegEnumValue(k,i)
+                    if string.upper(p)==path:
+                        V = string.split(v,';')
+                        for v in V:
+                            if v=='' or v in L: continue
+                            L.append(v)
+                        break
+                    i = i + 1
+                except win32api.error:
+                    break
+        except win32api.error:
+            pass
+    return L
+
+def _find_exe(exe):
+    for v in _devstudio_versions():
+        for p in _msvc_get_paths('path',v):
+            fn=os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn): return fn
+
+    #didn't find it; try existing path
+    try:
+        for p in string.split(os.environ['Path'],';'):
+            fn=os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn): return fn
+    except:
+        pass
+    return exe  #last desperate hope 
+
+def _find_SET(n):
+    for v in _devstudio_versions():
+        p=_msvc_get_paths(n,v)
+        if p!=[]: return p
+    return []
+
+def _do_SET(n):
+    p=_find_SET(n)
+    if p!=[]: os.environ[n]=string.join(p,';')
 
 class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -34,12 +120,21 @@ def __init__ (self,
         self.add_library ( "python" + sys.version[0] + sys.version[2] )
         self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
         
-        self.cc   = "cl.exe"
-        self.link = "link.exe"
+        self.cc   = _find_exe("cl.exe")
+        self.link = _find_exe("link.exe")
+        _do_SET('lib')
+        _do_SET('include')
+        path=_find_SET('path')
+        try:
+            for p in string.split(os.environ['path'],';'):
+                path.append(p)
+        except KeyError:
+            pass
+        os.environ['path'] = string.join(path,';')
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD' ]
 
-        self.ldflags_shared = ['/DLL', '/nologo']
+        self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         self.ldflags_static = [ '/nologo']
 
 

From 7a31064ca3c8fed8497ec3db7cdb3ee89aba2731 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 8 Feb 2000 15:55:42 +0000
Subject: [PATCH 0139/8469] get_config_h_filename():  Support NT as well as
 Posix systems.

_init_nt():  Use get_config_h_filename() instead of figuring out the
             name directly.

             g['SO'] should be set to '.pyd'.

             Adjust some minor coding nits.
---
 sysconfig.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0e40cbc350..e291aec21e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -19,9 +19,12 @@
 
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    return os.path.join(exec_prefix,
-                        "include", "python" + sys.version[:3],
-                        "config.h")
+    if os.name == "nt":
+        return os.path.join(exec_prefix, "include", "config.h")
+    else:
+        return os.path.join(exec_prefix,
+                            "include", "python" + sys.version[:3],
+                            "config.h")
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
@@ -136,20 +139,20 @@ def _init_posix():
 
 def _init_nt():
     """Initialize the module as appropriate for NT"""
-    g=globals()
+    g = globals()
     # load config.h, though I don't know how useful this is
-    parse_config_h(open(
-            os.path.join(exec_prefix, "include", "config.h")), g)
+    parse_config_h(open(get_config_h_filename()), g)
     # set basic install directories
-    g['LIBDEST']=os.path.join(exec_prefix, "Lib")
-    g['BINLIBDEST']= os.path.join(exec_prefix, "Lib")
+    g['LIBDEST'] = os.path.join(exec_prefix, "Lib")
+    g['BINLIBDEST'] = os.path.join(exec_prefix, "Lib")
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = os.path.join (prefix, 'include' )
+    g['INCLUDEPY'] = os.path.join(prefix, 'include')
 
-    g['SO'] = '.dll'
+    g['SO'] = '.pyd'
     g['exec_prefix'] = exec_prefix
 
+
 try:
     exec "_init_" + os.name
 except NameError:
@@ -158,5 +161,6 @@ def _init_nt():
 else:
     exec "_init_%s()" % os.name
 
+
 del _init_posix
 del _init_nt

From 0c9bccee1cec8339ed0fa0f331f2730ad2c41d21 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 9 Feb 2000 02:16:14 +0000
Subject: [PATCH 0140/8469] Added 'debug' flag to compile and link method
 signatures. Doc fix: several paragraphs under 'link_static_lib()' moved to  
 'link_shared_lib()', where they belong.

---
 ccompiler.py | 66 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 036cbe9f48..7d2d9f58b7 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -263,6 +263,7 @@ def compile (self,
                  output_dir=None,
                  macros=None,
                  include_dirs=None,
+                 debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
         """Compile one or more C/C++ source files.  'sources' must be
@@ -277,9 +278,12 @@ def compile (self,
            undefines a macro.  Later definitions/redefinitions/
            undefinitions take precedence.
 
-           'include_dirs', if given, must be a list of strings, the directories
-           to add to the default include file search path for this
-           compilation only.
+           'include_dirs', if given, must be a list of strings, the
+           directories to add to the default include file search path for
+           this compilation only.
+
+           'debug' is a boolean; if true, the compiler will be instructed
+           to output debug symbols in (or alongside) the object file(s).
 
            'extra_preargs' and 'extra_postargs' are optional lists of extra
            command-line arguments that will be, respectively, prepended or
@@ -295,7 +299,8 @@ def compile (self,
     def link_static_lib (self,
                          objects,
                          output_libname,
-                         output_dir=None):
+                         output_dir=None,
+                         debug=0):
         """Link a bunch of stuff together to create a static library
            file.  The "bunch of stuff" consists of the list of object
            files supplied as 'objects', the extra object files supplied
@@ -304,8 +309,32 @@ def link_static_lib (self,
            'set_libraries()', and the libraries supplied as 'libraries'
            (if any).
 
-           'output_libname' should be a library name, not a filename;
-           the filename will be inferred from the library name.
+           'output_libname' should be a library name, not a filename; the
+           filename will be inferred from the library name.  'output_dir'
+           is the directory where the library file will be put.
+
+           'debug' is a boolean; if true, debugging information will be
+           included in the library (note that on most platforms, it is the
+           compile step where this matters: the 'debug' flag is included
+           here just for consistency)."""
+
+        pass
+    
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         debug=0,
+                         extra_preargs=None,
+                         extra_postargs=None):
+        """Link a bunch of stuff together to create a shared library
+           file.  Has the same effect as 'link_static_lib()' except
+           that the filename inferred from 'output_libname' will most
+           likely be different, and the type of file generated will
+           almost certainly be different
 
            'libraries' is a list of libraries to link against.  These are
            library names, not filenames, since they're translated into
@@ -321,26 +350,15 @@ def link_static_lib (self,
            default and those supplied to 'add_library_dir()' and/or
            'set_library_dirs()'.
 
+           'debug' is as for 'compile()' and 'link_static_lib()', with the
+           slight distinction that it actually matters on most platforms
+           (as opposed to 'link_static_lib()', which includes a 'debug'
+           flag mostly for form's sake).
+
            'extra_preargs' and 'extra_postargs' are as for 'compile()'
            (except of course that they supply command-line arguments
-           for the particular linker being used)."""
-
-        pass
-    
+           for the particular linker being used)."""           
 
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         extra_preargs=None,
-                         extra_postargs=None):
-        """Link a bunch of stuff together to create a shared library
-           file.  Has the same effect as 'link_static_lib()' except
-           that the filename inferred from 'output_libname' will most
-           likely be different, and the type of file generated will
-           almost certainly be different."""
         pass
     
 
@@ -350,6 +368,7 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
         """Link a bunch of stuff together to create a shared object
@@ -367,6 +386,7 @@ def link_executable (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
         """Link a bunch of stuff together to create a binary executable

From 8c5bff29a20dcd4e9ce9b6bd2b4e96f8e6b31624 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 9 Feb 2000 02:17:00 +0000
Subject: [PATCH 0141/8469] Added 'debug' flags to compile and link methods,
 and modified code to add '-g' flag to compiler/linker command lines when it's
 true.

---
 unixccompiler.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 9ace98606c..cc0d7723ad 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -102,6 +102,7 @@ def compile (self,
                  output_dir=None,
                  macros=None,
                  include_dirs=None,
+                 debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
 
@@ -149,6 +150,8 @@ def compile (self,
         # (will have to fix this when I add the ability to build a
         # new Python)
         cc_args = ['-c'] + pp_opts + self.ccflags + self.ccflags_shared
+        if debug:
+            cc_args[:0] = ['-g']
         if extra_preargs:
             cc_args[:0] = extra_preargs
         if extra_postargs is None:
@@ -194,7 +197,8 @@ def _fix_link_args (self, output_dir, libraries, library_dirs):
     def link_static_lib (self,
                          objects,
                          output_libname,
-                         output_dir=None):
+                         output_dir=None,
+                         debug=0):
 
         if type (objects) not in (ListType, TupleType):
             raise TypeError, \
@@ -234,6 +238,7 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
         # XXX should we sanity check the library name? (eg. no
@@ -244,6 +249,7 @@ def link_shared_lib (self,
             output_dir,
             libraries,
             library_dirs,
+            debug,
             extra_preargs,
             extra_postargs)
         
@@ -254,6 +260,7 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
 
@@ -279,6 +286,8 @@ def link_shared_object (self,
         if self.force or newer:
             ld_args = self.ldflags_shared + objects + \
                       lib_opts + ['-o', output_filename]
+            if debug:
+                ld_args[:0] = ['-g']
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
@@ -296,6 +305,7 @@ def link_executable (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
     
@@ -318,6 +328,8 @@ def link_executable (self,
 
         if self.force or newer:
             ld_args = objects + lib_opts + ['-o', output_filename]
+            if debug:
+                ld_args[:0] = ['-g']
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:

From 04c8638c9348a33880f8025b4cce8dc488117aa1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 9 Feb 2000 02:18:39 +0000
Subject: [PATCH 0142/8469] Added 'debug' flags to compile and link methods,
 and added dummy code for   someone who knows Windows/MSVC++ to come along and
 add the right flags. Comment noting that 'link_static_lib()' signature is
 inconsistent with   the other compiler classes (uh-oh!)

---
 msvccompiler.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 10cd6081d3..cf4be0dc43 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -159,6 +159,7 @@ def compile (self,
                  output_dir=None,
                  macros=None,
                  include_dirs=None,
+                 debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
 
@@ -190,6 +191,8 @@ def compile (self,
             cc_args = self.compile_options + \
                       base_pp_opts + \
                       [outputOpt, inputOpt]
+            if debug:
+                pass                    # XXX what goes here?
             if extra_preargs:
                 cc_args[:0] = extra_preargs
             if extra_postargs:
@@ -200,15 +203,17 @@ def compile (self,
         return objectFiles
 
 
-    # XXX this is kind of useless without 'link_binary()' or
-    # 'link_executable()' or something -- or maybe 'link_static_lib()'
-    # should not exist at all, and we just have 'link_binary()'?
+    # XXX the signature of this method is different from CCompiler and
+    # UnixCCompiler -- but those extra parameters (libraries, library_dirs)
+    # are actually used.  So: are they really *needed*, or can they be
+    # ditched?  If needed, the CCompiler API will have to change...
     def link_static_lib (self,
                          objects,
                          output_libname,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
 
@@ -223,6 +228,8 @@ def link_static_lib (self,
 
         ld_args = self.ldflags_static + lib_opts + \
                   objects + ['/OUT:' + output_filename]
+        if debug:
+            pass                        # XXX what goes here?
         if extra_preargs:
             ld_args[:0] = extra_preargs
         if extra_postargs:
@@ -237,6 +244,7 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
 
@@ -267,6 +275,8 @@ def link_shared_object (self,
 
         ld_args = self.ldflags_shared + lib_opts + \
                   objects + ['/OUT:' + output_filename]
+        if debug:
+            pass                        # XXX what goes here?
         if extra_preargs:
             ld_args[:0] = extra_preargs
         if extra_postargs:

From f0b2eb38689af9acf61db1e126458b28f36dff7d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 9 Feb 2000 02:19:49 +0000
Subject: [PATCH 0143/8469] Added 'debug' option (just there for 'build_ext'
 and 'build_lib' commands to fallback to if the user doesn't set it for those
 commands.

---
 command/build.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build.py b/command/build.py
index 768db12062..82a4e6c292 100644
--- a/command/build.py
+++ b/command/build.py
@@ -20,6 +20,8 @@ class Build (Command):
                 "directory for platform-shared files"),
                ('build-platlib=', 'p',
                 "directory for platform-specific files"),
+               ('debug', 'g',
+                "compile extensions and libraries with debugging information"),
               ]
 
     def set_default_options (self):
@@ -28,6 +30,7 @@ def set_default_options (self):
         # (unless overridden by the user or client)
         self.build_lib = None
         self.build_platlib = None
+        self.debug = None
 
     def set_final_options (self):
         # 'build_lib' and 'build_platlib' just default to 'lib' and

From bc5bb15bc3510ccab5986fd22151e75d33776a46 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 9 Feb 2000 02:20:14 +0000
Subject: [PATCH 0144/8469] Added 'debug' option, and changed compile/link
 calls to use it.

---
 command/build_clib.py | 12 +++++++++---
 command/build_ext.py  | 16 ++++++++++++----
 command/build_lib.py  | 12 +++++++++---
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index c638fd5ffc..6571281816 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -28,7 +28,9 @@
 
 class BuildLib (Command):
 
-    options = []
+    options = [('debug', 'g',
+                "compile with debugging information"),
+              ]
 
     def set_default_options (self):
         # List of libraries to build
@@ -38,10 +40,13 @@ def set_default_options (self):
         self.include_dirs = None
         self.define = None
         self.undef = None
+        self.debug = None
 
     # set_default_options()
 
     def set_final_options (self):
+        self.set_undefined_options ('build',
+                                    ('debug', 'debug'))
         self.libraries = self.distribution.libraries
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
@@ -146,12 +151,13 @@ def build_libraries (self, libraries):
             objects = self.compiler.compile (sources,
                                              macros=macros,
                                              include_dirs=include_dirs,
-                                             output_dir=lib_dir)
+                                             output_dir=lib_dir,
+                                             debug=self.debug)
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name)
+            self.compiler.link_static_lib (objects, lib_name, debug=self.debug)
 
         # for libraries
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 0f2d1a7bf3..14c2234e3c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -58,6 +58,8 @@ class BuildExt (Command):
                 "directories to search for shared C libraries at runtime"),
                ('link-objects=', 'O',
                 "extra explicit link objects to include in the link"),
+               ('debug', 'g',
+                "compile/link with debugging information"),
               ]
 
 
@@ -73,12 +75,15 @@ def set_default_options (self):
         self.library_dirs = None
         self.rpath = None
         self.link_objects = None
+        self.debug = None
 
 
     def set_final_options (self):
         from distutils import sysconfig
 
-        self.set_undefined_options ('build', ('build_platlib', 'build_dir'))
+        self.set_undefined_options ('build',
+                                    ('build_platlib', 'build_dir'),
+                                    ('debug', 'debug'))
 
         if self.package is None:
             self.package = self.distribution.ext_package
@@ -223,7 +228,8 @@ def build_extensions (self, extensions):
             include_dirs = build_info.get ('include_dirs')
             self.compiler.compile (sources,
                                    macros=macros,
-                                   include_dirs=include_dirs)
+                                   include_dirs=include_dirs,
+                                   debug=self.debug)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things
@@ -236,7 +242,8 @@ def build_extensions (self, extensions):
             library_dirs = build_info.get ('library_dirs')
             extra_args = build_info.get ('extra_link_args') or []
             if self.compiler.compiler_type == 'msvc':
-                extra_args.append ('/export:init%s' % extension_name)
+                mod_name = string.split (extension_name, '.')[-1]
+                extra_args.append ('/export:init%s' % mod_name)
 
             ext_filename = self.extension_filename \
                            (extension_name, self.package)
@@ -246,7 +253,8 @@ def build_extensions (self, extensions):
             self.compiler.link_shared_object (objects, ext_filename, 
                                               libraries=libraries,
                                               library_dirs=library_dirs,
-                                              extra_postargs=extra_args)
+                                              extra_postargs=extra_args,
+                                              debug=self.debug)
 
     # build_extensions ()
 
diff --git a/command/build_lib.py b/command/build_lib.py
index c638fd5ffc..6571281816 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -28,7 +28,9 @@
 
 class BuildLib (Command):
 
-    options = []
+    options = [('debug', 'g',
+                "compile with debugging information"),
+              ]
 
     def set_default_options (self):
         # List of libraries to build
@@ -38,10 +40,13 @@ def set_default_options (self):
         self.include_dirs = None
         self.define = None
         self.undef = None
+        self.debug = None
 
     # set_default_options()
 
     def set_final_options (self):
+        self.set_undefined_options ('build',
+                                    ('debug', 'debug'))
         self.libraries = self.distribution.libraries
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
@@ -146,12 +151,13 @@ def build_libraries (self, libraries):
             objects = self.compiler.compile (sources,
                                              macros=macros,
                                              include_dirs=include_dirs,
-                                             output_dir=lib_dir)
+                                             output_dir=lib_dir,
+                                             debug=self.debug)
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name)
+            self.compiler.link_static_lib (objects, lib_name, debug=self.debug)
 
         # for libraries
 

From b1228096c7a2efeaab3d677ec72cdb912c0d5252 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 10 Feb 2000 02:15:52 +0000
Subject: [PATCH 0145/8469] Patch from Thomas heller:   * don't need to mention
 python<ver>.lib -- it's done by a pragma   * add debug flags for compile and
 link, and use them   * fix 'link_shared_library()' to pass everything to
 'link_shared_object()'   * change filename when shared object with debug info
 (ugh)

---
 msvccompiler.py | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index cf4be0dc43..7c179782df 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -114,10 +114,6 @@ def __init__ (self,
 
         CCompiler.__init__ (self, verbose, dry_run, force)
 
-        # XXX This is a nasty dependency to add on something otherwise
-        # pretty clean.  move it to build_ext under an nt specific part.
-        # shared libraries need to link against python15.lib
-        self.add_library ( "python" + sys.version[0] + sys.version[2] )
         self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
         
         self.cc   = _find_exe("cl.exe")
@@ -133,8 +129,14 @@ def __init__ (self,
         os.environ['path'] = string.join(path,';')
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD' ]
+        self.compile_options_debug = [
+            '/nologo', '/Od', '/MDd', '/Z7', '/D_DEBUG'
+            ]
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
+        self.ldflags_shared_debug = [
+            '/DLL', '/nologo', '/INCREMENTAL:no', '/pdb:None', '/DEBUG'
+            ]
         self.ldflags_static = [ '/nologo']
 
 
@@ -175,6 +177,11 @@ def compile (self,
                                     self.include_dirs + include_dirs)
 
         base_pp_opts.append('/c')
+
+        if debug:
+            compile_options = self.compile_options_debug
+        else:
+            compile_options = self.compile_options
         
         for srcFile in sources:
             base,ext = os.path.splitext(srcFile)
@@ -188,11 +195,10 @@ def compile (self,
             inputOpt  = fileOpt + srcFile
             outputOpt = "/Fo"   + objFile
 
-            cc_args = self.compile_options + \
+            cc_args = compile_options + \
                       base_pp_opts + \
                       [outputOpt, inputOpt]
-            if debug:
-                pass                    # XXX what goes here?
+
             if extra_preargs:
                 cc_args[:0] = extra_preargs
             if extra_postargs:
@@ -251,7 +257,14 @@ def link_shared_lib (self,
         # XXX should we sanity check the library name? (eg. no
         # slashes)
         self.link_shared_object (objects,
-                                 self.shared_library_name(output_libname))
+                                 self.shared_library_name(output_libname),
+                                 output_dir=output_dir,
+                                 libraries=libraries,
+                                 library_dirs=library_dirs,
+                                 debug=debug,
+                                 extra_preargs=extra_preargs,
+                                 extra_postargs=extra_postargs)
+                    
     
     def link_shared_object (self,
                             objects,
@@ -259,6 +272,7 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
         """Link a bunch of stuff together to create a shared object
@@ -273,10 +287,18 @@ def link_shared_object (self,
                                     self.library_dirs + library_dirs,
                                     self.libraries + libraries)
 
-        ld_args = self.ldflags_shared + lib_opts + \
-                  objects + ['/OUT:' + output_filename]
         if debug:
-            pass                        # XXX what goes here?
+            ldflags = self.ldflags_shared_debug
+            basename, ext = os.path.splitext (output_filename)
+            #XXX not sure this belongs here
+            # extensions in debug_mode are named 'module_d.pyd'
+            output_filename = basename + '_d' + ext
+        else:
+            ldflags = self.ldflags_shared
+
+        ld_args = ldflags + lib_opts + \
+                  objects + ['/OUT:' + output_filename]
+
         if extra_preargs:
             ld_args[:0] = extra_preargs
         if extra_postargs:

From e9cac8bea6e2f62aa1dd28e6c91958394ba0aecf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 10 Feb 2000 02:17:06 +0000
Subject: [PATCH 0146/8469] Path from Thomas Heller: resurrect the .def file
 kludge while preserving the /export option mini-kludge.

---
 command/build_ext.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 14c2234e3c..42eab4796d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -241,9 +241,21 @@ def build_extensions (self, extensions):
             libraries = build_info.get ('libraries')
             library_dirs = build_info.get ('library_dirs')
             extra_args = build_info.get ('extra_link_args') or []
+
             if self.compiler.compiler_type == 'msvc':
-                mod_name = string.split (extension_name, '.')[-1]
-                extra_args.append ('/export:init%s' % mod_name)
+                def_file = build_info.get ('def_file')
+                if def_file is None:
+                    source_dir = os.path.dirname (sources[0])
+                    ext_base = (string.split (extension_name, '.'))[-1]
+                    def_file = os.path.join (source_dir, "%s.def" % ext_base)
+                    if not os.path.exists (def_file):
+                        def_file = None
+
+                if def_file is not None:
+                    extra_args.append ('/DEF:' + def_file)
+                else:
+                    modname = string.split (extension_name, '.')[-1]
+                    extra_args.append('/export:init%s'%modname)
 
             ext_filename = self.extension_filename \
                            (extension_name, self.package)

From 5d779ebd6d24ee05e11c670f6ed2bac639b33a6d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 10 Feb 2000 02:51:32 +0000
Subject: [PATCH 0147/8469] Typecheck 'output_dir' argument to compile/link
 methods.

---
 unixccompiler.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index cc0d7723ad..770a543c75 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -106,6 +106,8 @@ def compile (self,
                  extra_preargs=None,
                  extra_postargs=None):
 
+        if type (output_dir) not in (StringType, NoneType):
+            raise TypeError, "'output_dir' must be a string or None"
         if output_dir is None:
             output_dir = self.output_dir
         if macros is None:
@@ -205,6 +207,8 @@ def link_static_lib (self,
                   "'objects' must be a list or tuple of strings"
         objects = list (objects)
             
+        if type (output_dir) not in (StringType, NoneType):
+            raise TypeError, "'output_dir' must be a string or None"
         if output_dir is None:
             output_dir = self.output_dir
 
@@ -270,6 +274,8 @@ def link_shared_object (self,
         lib_opts = gen_lib_options (self,
                                     self.library_dirs + library_dirs,
                                     self.libraries + libraries)
+        if type (output_dir) not in (StringType, NoneType):
+            raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 

From 7fffec2291d4e832411729c8d653c2cbce6a17f7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 10 Feb 2000 02:52:42 +0000
Subject: [PATCH 0148/8469] Stylistic changes to the registry-grovelling code:
 code formatting, changed function names, dbetter (hopefully) ocstrings, and
 comments.

---
 msvccompiler.py | 74 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 7c179782df..90ebae0a58 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -15,17 +15,26 @@
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
 
-def _devstudio_versions():
-    "Get a list of devstudio versions"
+
+def get_devstudio_versions ():
+
+    """Get list of devstudio versions from the Windows registry.  Return a
+       list of strings (???) containing version numbers; the list will be
+       empty if we were unable to access the registry (eg. couldn't import
+       a registry-access module) or the appropriate registry keys weren't
+       found.  (XXX is this correct???)"""
     try:
         import win32api
         import win32con
     except ImportError:
-        return None
+        return []
 
     K = 'Software\\Microsoft\\Devstudio'
     L = []
-    for base in (win32con.HKEY_CLASSES_ROOT,win32con.HKEY_LOCAL_MACHINE,win32con.HKEY_CURRENT_USER,win32con.HKEY_USERS):
+    for base in (win32con.HKEY_CLASSES_ROOT,
+                 win32con.HKEY_LOCAL_MACHINE,
+                 win32con.HKEY_CURRENT_USER,
+                 win32con.HKEY_USERS):
         try:
             k = win32api.RegOpenKeyEx(base,K)
             i = 0
@@ -43,8 +52,11 @@ def _devstudio_versions():
     L.reverse()
     return L
 
-def _msvc_get_paths(path, vNum='6.0', platform='x86'):
-    "Get a devstudio path (include, lib or path)"
+# get_devstudio_versions ()
+
+
+def get_msvc_paths (path, version='6.0', platform='x86'):
+    """Get a devstudio path (include, lib or path)."""
     try:
         import win32api
         import win32con
@@ -52,21 +64,26 @@ def _msvc_get_paths(path, vNum='6.0', platform='x86'):
         return None
 
     L = []
-    if path=='lib': path= 'Library'
+    if path=='lib':
+        path= 'Library'
     path = string.upper(path + ' Dirs')
-    K = 'Software\\Microsoft\\Devstudio\\%s\\Build System\\Components\\Platforms\\Win32 (%s)\\Directories' \
-                % (vNum,platform)
-    for base in (win32con.HKEY_CLASSES_ROOT,win32con.HKEY_LOCAL_MACHINE,win32con.HKEY_CURRENT_USER,win32con.HKEY_USERS):
+    K = ('Software\\Microsoft\\Devstudio\\%s\\' +
+         'Build System\\Components\\Platforms\\Win32 (%s)\\Directories') % \
+        (version,platform)
+    for base in (win32con.HKEY_CLASSES_ROOT,
+                 win32con.HKEY_LOCAL_MACHINE,
+                 win32con.HKEY_CURRENT_USER,
+                 win32con.HKEY_USERS):
         try:
             k = win32api.RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
                     (p,v,t) = win32api.RegEnumValue(k,i)
-                    if string.upper(p)==path:
+                    if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
-                            if v=='' or v in L: continue
+                            if v == '' or v in L: continue
                             L.append(v)
                         break
                     i = i + 1
@@ -76,30 +93,41 @@ def _msvc_get_paths(path, vNum='6.0', platform='x86'):
             pass
     return L
 
+# get_msvc_paths()
+
+
 def _find_exe(exe):
-    for v in _devstudio_versions():
-        for p in _msvc_get_paths('path',v):
-            fn=os.path.join(os.path.abspath(p),exe)
-            if os.path.isfile(fn): return fn
+    for v in get_devstudio_versions():
+        for p in get_msvc_paths('path',v):
+            fn = os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn):
+                return fn
 
     #didn't find it; try existing path
     try:
         for p in string.split(os.environ['Path'],';'):
             fn=os.path.join(os.path.abspath(p),exe)
-            if os.path.isfile(fn): return fn
-    except:
+            if os.path.isfile(fn):
+                return fn
+    # XXX BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD !!!!!!!!!!!!!!!!
+    except:                             # XXX WHAT'S BEING CAUGHT HERE?!?!?
         pass
     return exe  #last desperate hope 
 
+
 def _find_SET(n):
-    for v in _devstudio_versions():
-        p=_msvc_get_paths(n,v)
-        if p!=[]: return p
+    for v in get_devstudio_versions():
+        p = get_msvc_paths(n,v)
+        if p:
+            return p
     return []
 
+
 def _do_SET(n):
-    p=_find_SET(n)
-    if p!=[]: os.environ[n]=string.join(p,';')
+    p = _find_SET(n)
+    if p:
+        os.environ[n] = string.join(p,';')
+
 
 class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,

From 8224dcdac16e8f63eb008892d84bd192e245b11f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 11 Feb 2000 02:47:15 +0000
Subject: [PATCH 0149/8469] Latest patch from Thomas Heller/Robin Becker:   *
 tweak my docstrings   * fix None returns to empty list   * reshuffle
 responsibilities between '_find_exe()', '_find_SET()', and     the
 MSVCCompiler constructor -- now the constructor worries about     fetching
 the version list and determining the most recent one   * added "/W3" compile
 option Also, I added/tweaked some docstrings.

---
 msvccompiler.py | 115 ++++++++++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 47 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 90ebae0a58..3073aaea32 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -17,12 +17,12 @@
 
 
 def get_devstudio_versions ():
-
     """Get list of devstudio versions from the Windows registry.  Return a
-       list of strings (???) containing version numbers; the list will be
+       list of strings containing version numbers; the list will be
        empty if we were unable to access the registry (eg. couldn't import
        a registry-access module) or the appropriate registry keys weren't
-       found.  (XXX is this correct???)"""
+       found."""
+
     try:
         import win32api
         import win32con
@@ -56,12 +56,15 @@ def get_devstudio_versions ():
 
 
 def get_msvc_paths (path, version='6.0', platform='x86'):
-    """Get a devstudio path (include, lib or path)."""
+    """Get a list of devstudio directories (include, lib or path).  Return
+       a list of strings; will be empty list if unable to access the
+       registry or appropriate registry keys not found."""
+       
     try:
         import win32api
         import win32con
     except ImportError:
-        return None
+        return []
 
     L = []
     if path=='lib':
@@ -96,37 +99,45 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
 # get_msvc_paths()
 
 
-def _find_exe(exe):
-    for v in get_devstudio_versions():
-        for p in get_msvc_paths('path',v):
-            fn = os.path.join(os.path.abspath(p),exe)
-            if os.path.isfile(fn):
-                return fn
+def find_exe (exe, version_number):
+    """Try to find an MSVC executable program 'exe' (from version
+       'version_number' of MSVC) in several places: first, one of the MSVC
+       program search paths from the registry; next, the directories in the
+       PATH environment variable.  If any of those work, return an absolute
+       path that is known to exist.  If none of them work, just return the
+       original program name, 'exe'."""
 
-    #didn't find it; try existing path
-    try:
-        for p in string.split(os.environ['Path'],';'):
-            fn=os.path.join(os.path.abspath(p),exe)
-            if os.path.isfile(fn):
-                return fn
-    # XXX BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD BAD !!!!!!!!!!!!!!!!
-    except:                             # XXX WHAT'S BEING CAUGHT HERE?!?!?
-        pass
-    return exe  #last desperate hope 
-
-
-def _find_SET(n):
-    for v in get_devstudio_versions():
-        p = get_msvc_paths(n,v)
-        if p:
-            return p
-    return []
-
-
-def _do_SET(n):
-    p = _find_SET(n)
+    for p in get_msvc_paths ('path', version_number):
+        fn = os.path.join (os.path.abspath(p), exe)
+        if os.path.isfile(fn):
+            return fn
+
+    # didn't find it; try existing path
+    for p in string.split (os.environ['Path'],';'):
+        fn = os.path.join(os.path.abspath(p),exe)
+        if os.path.isfile(fn):
+            return fn
+
+    return exe                          # last desperate hope 
+
+
+def _find_SET(name,version_number):
+    """looks up in the registry and returns a list of values suitable for
+       use in a SET command eg SET name=value. Normally the value will be a
+       ';' separated list similar to a path list.
+
+       name is the name of an MSVC path and version_number is a version_number
+       of an MSVC installation."""
+    return get_msvc_paths(name, version_number)
+
+
+def _do_SET(name, version_number):
+    """sets os.environ[name] to an MSVC path type value obtained from
+       _find_SET. This is equivalent to a SET command prior to execution of
+       spawned commands."""
+    p=_find_SET(name, version_number)
     if p:
-        os.environ[n] = string.join(p,';')
+        os.environ[name]=string.join(p,';')
 
 
 class MSVCCompiler (CCompiler) :
@@ -144,21 +155,31 @@ def __init__ (self,
 
         self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
         
-        self.cc   = _find_exe("cl.exe")
-        self.link = _find_exe("link.exe")
-        _do_SET('lib')
-        _do_SET('include')
-        path=_find_SET('path')
-        try:
-            for p in string.split(os.environ['path'],';'):
-                path.append(p)
-        except KeyError:
-            pass
-        os.environ['path'] = string.join(path,';')
+        vNum = get_devstudio_versions ()
+
+        if vNum:
+            vNum = vNum[0]  # highest version
+
+            self.cc   = _find_exe("cl.exe", vNum)
+            self.link = _find_exe("link.exe", vNum)
+            _do_SET('lib', vNum)
+            _do_SET('include', vNum)
+            path=_find_SET('path', vNum)
+            try:
+                for p in string.split(os.environ['path'],';'):
+                    path.append(p)
+            except KeyError:
+                pass
+            os.environ['path'] = string.join(path,';')
+        else:
+            # devstudio not found in the registry
+            self.cc = "cl.exe"
+            self.link = "link.exe"
+
         self.preprocess_options = None
-        self.compile_options = [ '/nologo', '/Ox', '/MD' ]
+        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3' ]
         self.compile_options_debug = [
-            '/nologo', '/Od', '/MDd', '/Z7', '/D_DEBUG'
+            '/nologo', '/Od', '/MDd', '/W3', '/Z7', '/D_DEBUG'
             ]
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']

From eed228691703b5775b5ad0a6f626d20e73b72091 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 11 Feb 2000 02:52:39 +0000
Subject: [PATCH 0150/8469] Ditched '_find_SET()', since it was a
 no-value-added wrapper around   'get_msvc_paths()'. Renamed '_do_SET()' to
 'set_path_env_var()', tweaked docstring, and   cosmetically tweaked code.
 Stylistic changes to MSVCCompiler constructor (variable renaming   and type
 consistency).

---
 msvccompiler.py | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 3073aaea32..e489c1c86e 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -121,23 +121,14 @@ def find_exe (exe, version_number):
     return exe                          # last desperate hope 
 
 
-def _find_SET(name,version_number):
-    """looks up in the registry and returns a list of values suitable for
-       use in a SET command eg SET name=value. Normally the value will be a
-       ';' separated list similar to a path list.
+def set_path_env_var (name, version_number):
+    """Set environment variable 'name' to an MSVC path type value obtained
+       from 'get_msvc_paths()'.  This is equivalent to a SET command prior
+       to execution of spawned commands."""
 
-       name is the name of an MSVC path and version_number is a version_number
-       of an MSVC installation."""
-    return get_msvc_paths(name, version_number)
-
-
-def _do_SET(name, version_number):
-    """sets os.environ[name] to an MSVC path type value obtained from
-       _find_SET. This is equivalent to a SET command prior to execution of
-       spawned commands."""
-    p=_find_SET(name, version_number)
+    p = get_msvc_paths (name, version_number)
     if p:
-        os.environ[name]=string.join(p,';')
+        os.environ[name] = string.join (p,';')
 
 
 class MSVCCompiler (CCompiler) :
@@ -155,16 +146,16 @@ def __init__ (self,
 
         self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
         
-        vNum = get_devstudio_versions ()
+        versions = get_devstudio_versions ()
 
-        if vNum:
-            vNum = vNum[0]  # highest version
+        if versions:
+            version = versions[0]  # highest version
 
-            self.cc   = _find_exe("cl.exe", vNum)
-            self.link = _find_exe("link.exe", vNum)
-            _do_SET('lib', vNum)
-            _do_SET('include', vNum)
-            path=_find_SET('path', vNum)
+            self.cc   = _find_exe("cl.exe", version)
+            self.link = _find_exe("link.exe", version)
+            set_path_env_var ('lib', version)
+            set_path_env_var ('include', version)
+            path=get_msvc_paths('path', version)
             try:
                 for p in string.split(os.environ['path'],';'):
                     path.append(p)

From 333dbe885f8da8229084192e350fcf4d4881ada8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 17 Feb 2000 23:54:55 +0000
Subject: [PATCH 0151/8469] The 'dist' command is dead -- long live the 'sdist'
 command!

---
 command/dist.py | 558 ------------------------------------------------
 1 file changed, 558 deletions(-)
 delete mode 100644 command/dist.py

diff --git a/command/dist.py b/command/dist.py
deleted file mode 100644
index ea61a4806e..0000000000
--- a/command/dist.py
+++ /dev/null
@@ -1,558 +0,0 @@
-"""distutils.command.dist
-
-Implements the Distutils 'dist' command (create a source distribution)."""
-
-# created 1999/09/22, Greg Ward
-
-__rcsid__ = "$Id$"
-
-import sys, os, string, re
-import fnmatch
-from types import *
-from glob import glob
-from shutil import rmtree
-from distutils.core import Command
-from distutils.text_file import TextFile
-from distutils.errors import DistutilsExecError
-
-
-# Possible modes of operation:
-#   - require an explicit manifest that lists every single file (presumably
-#     along with a way to auto-generate the manifest)
-#   - require an explicit manifest, but allow it to have globs or
-#     filename patterns of some kind (and also have auto-generation)
-#   - allow an explict manifest, but automatically augment it at runtime
-#     with the source files mentioned in 'packages', 'py_modules', and
-#     'ext_modules' (and any other such things that might come along)
-
-# I'm liking the third way.  Possible gotchas:
-#   - redundant specification: 'packages' includes 'foo' and manifest
-#     includes 'foo/*.py'
-#   - obvious conflict: 'packages' includes 'foo' and manifest
-#     includes '! foo/*.py' (can't imagine why you'd want this)
-#   - subtle conflict:  'packages' includes 'foo' and manifest
-#     includes '! foo/bar.py' (this could well be desired: eg. exclude
-#     an experimental module from distribution)
-
-# Syntax for the manifest file:
-#   - if a line is just a Unix-style glob by itself, it's a "simple include
-#     pattern": go find all files that match and add them to the list
-#     of files
-#   - if a line is a glob preceded by "!", then it's a "simple exclude
-#     pattern": go over the current list of files and exclude any that
-#     match the glob pattern
-#   - if a line consists of a directory name followed by zero or more
-#     glob patterns, then we'll recursively explore that directory tree
-#     - the glob patterns can be include (no punctuation) or exclude
-#       (prefixed by "!", no space)
-#     - if no patterns given or the first pattern is not an include pattern,
-#       then assume "*" -- ie. find everything (and then start applying
-#       the rest of the patterns)
-#     - the patterns are given in order of increasing precedence, ie.
-#       the *last* one to match a given file applies to it
-# 
-# example (ignoring auto-augmentation!):
-#   distutils/*.py
-#   distutils/command/*.py
-#   ! distutils/bleeding_edge.py
-#   examples/*.py
-#   examples/README
-# 
-# smarter way (that *will* include distutils/command/bleeding_edge.py!)
-#   distutils *.py
-#   ! distutils/bleeding_edge.py
-#   examples !*~ !*.py[co]     (same as: examples * !*~ !*.py[co])
-#   test test_* *.txt !*~ !*.py[co]
-#   README
-#   setup.py
-#
-# The actual Distutils manifest (don't need to mention source files,
-# README, setup.py -- they're automatically distributed!):
-#   examples !*~ !*.py[co]
-#   test !*~ !*.py[co]
-
-# The algorithm that will make it work:
-#   files = stuff from 'packages', 'py_modules', 'ext_modules',
-#     plus README, setup.py, ... ?
-#   foreach pattern in manifest file:
-#     if simple-include-pattern:         # "distutils/*.py"
-#       files.append (glob (pattern))
-#     elif simple-exclude-pattern:       # "! distutils/foo*"
-#       xfiles = glob (pattern)
-#       remove all xfiles from files
-#     elif recursive-pattern:            # "examples" (just a directory name)
-#       patterns = rest-of-words-on-line
-#       dir_files = list of all files under dir
-#       if patterns:
-#         if patterns[0] is an exclude-pattern:
-#           insert "*" at patterns[0]
-#         for file in dir_files:
-#           for dpattern in reverse (patterns):
-#             if file matches dpattern:
-#               if dpattern is an include-pattern:
-#                 files.append (file)
-#               else:
-#                 nothing, don't include it
-#               next file
-#       else:
-#         files.extend (dir_files)    # ie. accept all of them
-
-
-# Anyways, this is all implemented below -- BUT it is largely untested; I
-# know it works for the simple case of distributing the Distutils, but
-# haven't tried it on more complicated examples.  Undoubtedly doing so will
-# reveal bugs and cause delays, so I'm waiting until after I've released
-# Distutils 0.1.
-
-
-# Other things we need to look for in creating a source distribution:
-#   - make sure there's a README
-#   - make sure the distribution meta-info is supplied and non-empty
-#     (*must* have name, version, ((author and author_email) or
-#     (maintainer and maintainer_email)), url
-#
-# Frills:
-#   - make sure the setup script is called "setup.py"
-#   - make sure the README refers to "setup.py" (ie. has a line matching
-#     /^\s*python\s+setup\.py/)
-
-# A crazy idea that conflicts with having/requiring 'version' in setup.py:
-#   - make sure there's a version number in the "main file" (main file
-#     is __init__.py of first package, or the first module if no packages,
-#     or the first extension module if no pure Python modules)
-#   - XXX how do we look for __version__ in an extension module?
-#   - XXX do we import and look for __version__? or just scan source for
-#     /^__version__\s*=\s*"[^"]+"/ ?
-#   - what about 'version_from' as an alternative to 'version' -- then
-#     we know just where to search for the version -- no guessing about
-#     what the "main file" is
-
-
-
-class Dist (Command):
-
-    description = "create a source distribution (tarball, zip file, etc.)"
-
-    options = [('formats=', None,
-                "formats for source distribution (tar, ztar, gztar, or zip)"),
-               ('manifest=', 'm',
-                "name of manifest file"),
-               ('list-only', 'l',
-                "just list files that would be distributed"),
-               ('keep-tree', 'k',
-                "keep the distribution tree around after creating " +
-                "archive file(s)"),
-              ]
-
-    default_format = { 'posix': 'gztar',
-                       'nt': 'zip' }
-
-    exclude_re = re.compile (r'\s*!\s*(\S+)') # for manifest lines
-
-
-    def set_default_options (self):
-        self.formats = None
-        self.manifest = None
-        self.list_only = 0
-        self.keep_tree = 0
-
-
-    def set_final_options (self):
-        if self.formats is None:
-            try:
-                self.formats = [self.default_format[os.name]]
-            except KeyError:
-                raise DistutilsPlatformError, \
-                      "don't know how to build source distributions on " + \
-                      "%s platform" % os.name
-        elif type (self.formats) is StringType:
-            self.formats = string.split (self.formats, ',')
-
-        if self.manifest is None:
-            self.manifest = "MANIFEST"
-
-
-    def run (self):
-
-        self.check_metadata ()
-
-        self.files = []
-        self.find_defaults ()
-        self.read_manifest ()
-
-        if self.list_only:
-            for f in self.files:
-                print f
-
-        else:
-            self.make_distribution ()
-
-
-    def check_metadata (self):
-
-        dist = self.distribution
-
-        missing = []
-        for attr in ('name', 'version', 'url'):
-            if not (hasattr (dist, attr) and getattr (dist, attr)):
-                missing.append (attr)
-
-        if missing:
-            self.warn ("missing required meta-data: " +
-                       string.join (missing, ", "))
-
-        if dist.author:
-            if not dist.author_email:
-                self.warn ("missing meta-data: if 'author' supplied, " +
-                           "'author_email' must be supplied too")
-        elif dist.maintainer:
-            if not dist.maintainer_email:
-                self.warn ("missing meta-data: if 'maintainer' supplied, " +
-                           "'maintainer_email' must be supplied too")
-        else:
-            self.warn ("missing meta-data: either (author and author_email) " +
-                       "or (maintainer and maintainer_email) " +
-                       "must be supplied")
-
-    # check_metadata ()
-
-
-    def find_defaults (self):
-
-        standards = [('README', 'README.txt'), 'setup.py']
-        for fn in standards:
-            if type (fn) is TupleType:
-                alts = fn
-                for fn in alts:
-                    if os.path.exists (fn):
-                        got_it = 1
-                        self.files.append (fn)
-                        break
-
-                if not got_it:
-                    self.warn ("standard file not found: should have one of " +
-                               string.join (alts, ', '))
-            else:
-                if os.path.exists (fn):
-                    self.files.append (fn)
-                else:
-                    self.warn ("standard file %s not found" % fn)
-
-        optional = ['test/test*.py']
-        for pattern in optional:
-            files = filter (os.path.isfile, glob (pattern))
-            if files:
-                self.files.extend (files)
-
-        if self.distribution.packages or self.distribution.py_modules:
-            build_py = self.find_peer ('build_py')
-            build_py.ensure_ready ()
-            self.files.extend (build_py.get_source_files ())
-
-        if self.distribution.ext_modules:
-            build_ext = self.find_peer ('build_ext')
-            build_ext.ensure_ready ()
-            self.files.extend (build_ext.get_source_files ())
-
-
-
-    def open_manifest (self, filename):
-        return TextFile (filename,
-                         strip_comments=1,
-                         skip_blanks=1,
-                         join_lines=1,
-                         lstrip_ws=1,
-                         rstrip_ws=1,
-                         collapse_ws=1)
-
-
-    def search_dir (self, dir, patterns):
-
-        allfiles = findall (dir)
-        if patterns:
-            if patterns[0][0] == "!":   # starts with an exclude spec?
-                patterns.insert (0, "*")# then accept anything that isn't
-                                        # explicitly excluded
-
-            act_patterns = []           # "action-patterns": (include,regexp)
-                                        # tuples where include is a boolean
-            for pattern in patterns:
-                if pattern[0] == '!':
-                    act_patterns.append \
-                        ((0, re.compile (fnmatch.translate (pattern[1:]))))
-                else:
-                    act_patterns.append \
-                        ((1, re.compile (fnmatch.translate (pattern))))
-            act_patterns.reverse()
-
-
-            files = []
-            for file in allfiles:
-                for (include,regexp) in act_patterns:
-                    if regexp.search (file):
-                        if include:
-                            files.append (file)
-                        break           # continue to next file
-        else:
-            files = allfiles
-
-        return files
-
-    # search_dir ()
-
-
-    def exclude_files (self, pattern):
-
-        regexp = re.compile (fnmatch.translate (pattern))
-        for i in range (len (self.files)-1, -1, -1):
-            if regexp.search (self.files[i]):
-                del self.files[i]
-
-
-    def read_manifest (self):
-
-        # self.files had better already be defined (and hold the
-        # "automatically found" files -- Python modules and extensions,
-        # README, setup script, ...)
-        assert self.files is not None
-
-        try:
-            manifest = self.open_manifest (self.manifest)
-        except IOError, exc:
-            if type (exc) is InstanceType and hasattr (exc, 'strerror'):
-                msg = "could not open MANIFEST (%s)" % \
-                      string.lower (exc.strerror)
-            else:
-                msg = "could not open MANIFST"
-    
-            self.warn (msg + ": using default file list")
-            return
-        
-        while 1:
-
-            pattern = manifest.readline()
-            if pattern is None:            # end of file
-                break
-
-            # Cases:
-            #   1) simple-include: "*.py", "foo/*.py", "doc/*.html", "FAQ"
-            #   2) simple-exclude: same, prefaced by !
-            #   3) recursive: multi-word line, first word a directory
-
-            exclude = self.exclude_re.match (pattern)
-            if exclude:
-                pattern = exclude.group (1)
-
-            words = string.split (pattern)
-            assert words                # must have something!
-            if os.name != 'posix':
-                words[0] = apply (os.path.join, string.split (words[0], '/'))
-
-            # First word is a directory, possibly with include/exclude
-            # patterns making up the rest of the line: it's a recursive
-            # pattern
-            if os.path.isdir (words[0]):
-                if exclude:
-                    manifest.warn ("exclude (!) doesn't apply to " +
-                                   "whole directory trees")
-                    continue
-
-                dir_files = self.search_dir (words[0], words[1:])
-                self.files.extend (dir_files)
-
-            # Multiple words in pattern: that's a no-no unless the first
-            # word is a directory name
-            elif len (words) > 1:
-                manifest.warn ("can't have multiple words unless first word " +
-                               "('%s') is a directory name" % words[0])
-                continue
-
-            # Single word, no bang: it's a "simple include pattern"
-            elif not exclude:
-                matches = filter (os.path.isfile, glob (pattern))
-                if matches:
-                    self.files.extend (matches)
-                else:
-                    manifest.warn ("no matches for '%s' found" % pattern)
-
-
-            # Single word prefixed with a bang: it's a "simple exclude pattern"
-            else:
-                if self.exclude_files (pattern) == 0:
-                    manifest.warn ("no files excluded by '%s'" % pattern)
-
-            # if/elif/.../else on 'pattern'
-
-        # loop over lines of 'manifest'
-
-    # read_manifest ()
-
-
-    def make_release_tree (self, base_dir, files):
-
-        # XXX this is Unix-specific
-
-        # First get the list of directories to create
-        need_dir = {}
-        for file in files:
-            need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
-        need_dirs = need_dir.keys()
-        need_dirs.sort()
-
-        # Now create them
-        for dir in need_dirs:
-            self.mkpath (dir)
-
-        # And walk over the list of files, either making a hard link (if
-        # os.link exists) to each one that doesn't already exist in its
-        # corresponding location under 'base_dir', or copying each file
-        # that's out-of-date in 'base_dir'.  (Usually, all files will be
-        # out-of-date, because by default we blow away 'base_dir' when
-        # we're done making the distribution archives.)
-    
-        try:
-            link = os.link
-            msg = "making hard links in %s..." % base_dir
-        except AttributeError:
-            link = 0
-            msg = "copying files to %s..." % base_dir
-
-        self.announce (msg)
-        for file in files:
-            dest = os.path.join (base_dir, file)
-            if link:
-                if not os.path.exists (dest):
-                    self.execute (os.link, (file, dest),
-                                  "linking %s -> %s" % (file, dest))
-            else:
-                self.copy_file (file, dest)
-
-    # make_release_tree ()
-
-
-    def nuke_release_tree (self, base_dir):
-        try:
-            self.execute (rmtree, (base_dir,),
-                          "removing %s" % base_dir)
-        except (IOError, OSError), exc:
-            if exc.filename:
-                msg = "error removing %s: %s (%s)" % \
-                       (base_dir, exc.strerror, exc.filename)
-            else:
-                msg = "error removing %s: %s" % (base_dir, exc.strerror)
-            self.warn (msg)
-
-
-    def make_tarball (self, base_dir, compress="gzip"):
-
-        # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-        # It's pretty new, though, so we certainly can't require it --
-        # but it would be nice to take advantage of it to skip the
-        # "create a tree of hardlinks" step!  (Would also be nice to
-        # detect GNU tar to use its 'z' option and save a step.)
-
-        if compress is not None and compress not in ('gzip', 'compress'):
-            raise ValueError, \
-                  "if given, 'compress' must be 'gzip' or 'compress'"
-
-        archive_name = base_dir + ".tar"
-        self.spawn (["tar", "-cf", archive_name, base_dir])
-
-        if compress:
-            self.spawn ([compress, archive_name])
-
-
-    def make_zipfile (self, base_dir):
-
-        # This initially assumed the Unix 'zip' utility -- but
-        # apparently InfoZIP's zip.exe works the same under Windows, so
-        # no changes needed!
-
-        try:
-            self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
-        except DistutilsExecError:
-
-            # XXX really should distinguish between "couldn't find
-            # external 'zip' command" and "zip failed" -- shouldn't try
-            # again in the latter case.  (I think fixing this will
-            # require some cooperation from the spawn module -- perhaps
-            # a utility function to search the path, so we can fallback
-            # on zipfile.py without the failed spawn.)
-            try:
-                import zipfile
-            except ImportError:
-                raise DistutilsExecError, \
-                      ("unable to create zip file '%s.zip': " + 
-                       "could neither find a standalone zip utility nor " +
-                       "import the 'zipfile' module") % base_dir
-
-            z = zipfile.ZipFile (base_dir + ".zip", "wb",
-                                 compression=zipfile.ZIP_DEFLATED)
-            
-            def visit (z, dirname, names):
-                for name in names:
-                    path = os.path.join (dirname, name)
-                    if os.path.isfile (path):
-                        z.write (path, path)
-                        
-            os.path.walk (base_dir, visit, z)
-            z.close()
-
-
-    def make_distribution (self):
-
-        # Don't warn about missing meta-data here -- should be done
-        # elsewhere.
-        name = self.distribution.name or "UNKNOWN"
-        version = self.distribution.version
-
-        if version:
-            base_dir = "%s-%s" % (name, version)
-        else:
-            base_dir = name
-
-        # Remove any files that match "base_dir" from the fileset -- we
-        # don't want to go distributing the distribution inside itself!
-        self.exclude_files (base_dir + "*")
- 
-        self.make_release_tree (base_dir, self.files)
-        for fmt in self.formats:
-            if fmt == 'gztar':
-                self.make_tarball (base_dir, compress='gzip')
-            elif fmt == 'ztar':
-                self.make_tarball (base_dir, compress='compress')
-            elif fmt == 'tar':
-                self.make_tarball (base_dir, compress=None)
-            elif fmt == 'zip':
-                self.make_zipfile (base_dir)
-
-        if not self.keep_tree:
-            self.nuke_release_tree (base_dir)
-
-# class Dist
-
-
-# ----------------------------------------------------------------------
-# Utility functions
-
-def findall (dir = os.curdir):
-    """Find all files under 'dir' and return the sorted list of full
-       filenames (relative to 'dir')."""
-
-    list = []
-    stack = [dir]
-    pop = stack.pop
-    push = stack.append
-
-    while stack:
-        dir = pop()
-        names = os.listdir (dir)
-
-        for name in names:
-            fullname = os.path.join (dir, name)
-            list.append (fullname)
-            if os.path.isdir (fullname) and not os.path.islink(fullname):
-                push (fullname)
-
-    list.sort()
-    return list

From 5caa9f1cf7ce67b78a7db4f2a177ac5a7e5cb16b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 17 Feb 2000 23:56:15 +0000
Subject: [PATCH 0152/8469] The 'sdist' command to create a source
 distribution.  This is derived from the old 'dist' command, but the code for
 dealing with manifests is completely redone -- and renaming the command to
 'sdist' is more symmetric with the soon-to-exist 'bdist' command.

---
 command/sdist.py | 716 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 716 insertions(+)
 create mode 100644 command/sdist.py

diff --git a/command/sdist.py b/command/sdist.py
new file mode 100644
index 0000000000..c8101a708e
--- /dev/null
+++ b/command/sdist.py
@@ -0,0 +1,716 @@
+"""distutils.command.sdist
+
+Implements the Distutils 'sdist' command (create a source distribution)."""
+
+# created 1999/09/22, Greg Ward
+
+__rcsid__ = "$Id$"
+
+import sys, os, string, re
+import fnmatch
+from types import *
+from glob import glob
+from shutil import rmtree
+from distutils.core import Command
+from distutils.util import newer
+from distutils.text_file import TextFile
+from distutils.errors import DistutilsExecError
+
+
+class Sdist (Command):
+
+    description = "create a source distribution (tarball, zip file, etc.)"
+
+    options = [('template=', 't',
+                "name of manifest template file [default: MANIFEST.in]"),
+               ('manifest=', 'm',
+                "name of manifest file [default: MANIFEST]"),
+               ('use-defaults', None,
+                "include the default file set in the manifest "
+                "[default; disable with --no-defaults]"),
+               ('manifest-only', None,
+                "just regenerate the manifest and then stop"),
+               ('force-manifest', None,
+                "forcibly regenerate the manifest and carry on as usual"),
+               
+               ('formats=', None,
+                "formats for source distribution (tar, ztar, gztar, or zip)"),
+               ('list-only', 'l',
+                "just list files that would be distributed"),
+               ('keep-tree', 'k',
+                "keep the distribution tree around after creating " +
+                "archive file(s)"),
+              ]
+    negative_opts = {'use-defaults': 'no-defaults'}
+
+    default_format = { 'posix': 'gztar',
+                       'nt': 'zip' }
+
+    exclude_re = re.compile (r'\s*!\s*(\S+)') # for manifest lines
+
+
+    def set_default_options (self):
+        # 'template' and 'manifest' are, respectively, the names of
+        # the manifest template and manifest file.
+        self.template = None
+        self.manifest = None
+
+        # 'use_defaults': if true, we will include the default file set
+        # in the manifest
+        self.use_defaults = 1
+
+        self.manifest_only = 0
+        self.force_manifest = 0
+
+        self.formats = None
+        self.list_only = 0
+        self.keep_tree = 0
+
+
+    def set_final_options (self):
+        if self.manifest is None:
+            self.manifest = "MANIFEST"
+        if self.template is None:
+            self.template = "MANIFEST.in"
+
+        if self.formats is None:
+            try:
+                self.formats = [self.default_format[os.name]]
+            except KeyError:
+                raise DistutilsPlatformError, \
+                      "don't know how to build source distributions on " + \
+                      "%s platform" % os.name
+        elif type (self.formats) is StringType:
+            self.formats = string.split (self.formats, ',')
+
+
+    def run (self):
+
+        # 'files' is the list of files that will make up the manifest
+        self.files = []
+        
+        # Ensure that all required meta-data is given; warn if not (but
+        # don't die, it's not *that* serious!)
+        self.check_metadata ()
+
+        # Do whatever it takes to get the list of files to process
+        # (process the manifest template, read an existing manifest,
+        # whatever).  File list is put into 'self.files'.
+        self.get_file_list ()
+
+        # If user just wanted us to regenerate the manifest, stop now.
+        if self.manifest_only:
+            return
+
+        # Otherwise, go ahead and create the source distribution tarball,
+        # or zipfile, or whatever.
+        self.make_distribution ()
+
+
+    def check_metadata (self):
+
+        dist = self.distribution
+
+        missing = []
+        for attr in ('name', 'version', 'url'):
+            if not (hasattr (dist, attr) and getattr (dist, attr)):
+                missing.append (attr)
+
+        if missing:
+            self.warn ("missing required meta-data: " +
+                       string.join (missing, ", "))
+
+        if dist.author:
+            if not dist.author_email:
+                self.warn ("missing meta-data: if 'author' supplied, " +
+                           "'author_email' must be supplied too")
+        elif dist.maintainer:
+            if not dist.maintainer_email:
+                self.warn ("missing meta-data: if 'maintainer' supplied, " +
+                           "'maintainer_email' must be supplied too")
+        else:
+            self.warn ("missing meta-data: either (author and author_email) " +
+                       "or (maintainer and maintainer_email) " +
+                       "must be supplied")
+
+    # check_metadata ()
+
+
+    def get_file_list (self):
+        """Figure out the list of files to include in the source
+           distribution, and put it in 'self.files'.  This might
+           involve reading the manifest template (and writing the
+           manifest), or just reading the manifest, or just using
+           the default file set -- it all depends on the user's
+           options and the state of the filesystem."""
+
+
+        template_exists = os.path.isfile (self.template)
+        if template_exists:
+            template_newer = newer (self.template, self.manifest)
+
+        # Regenerate the manifest if necessary (or if explicitly told to)
+        if ((template_exists and template_newer) or
+            self.force_manifest or
+            self.manifest_only):
+
+            if not template_exists:
+                self.warn (("manifest template '%s' does not exist " +
+                            "(using default file list)") %
+                           self.template)
+
+            # Add default file set to 'files'
+            if self.use_defaults:
+                self.find_defaults ()
+
+            # Read manifest template if it exists
+            if template_exists:
+                self.read_template ()
+
+            # File list now complete -- sort it so that higher-level files
+            # come first
+            sortable_files = map (os.path.split, self.files)
+            sortable_files.sort ()
+            self.files = []
+            for sort_tuple in sortable_files:
+                self.files.append (apply (os.path.join, sort_tuple))
+
+            # Remove duplicates from the file list
+            for i in range (len(self.files)-1, 0, -1):
+                if self.files[i] == self.files[i-1]:
+                    del self.files[i]
+
+            # And write complete file list (including default file set) to
+            # the manifest.
+            self.write_manifest ()
+
+        # Don't regenerate the manifest, just read it in.
+        else:
+            self.read_manifest ()
+
+    # get_file_list ()
+
+
+    def find_defaults (self):
+
+        standards = [('README', 'README.txt'), 'setup.py']
+        for fn in standards:
+            if type (fn) is TupleType:
+                alts = fn
+                for fn in alts:
+                    if os.path.exists (fn):
+                        got_it = 1
+                        self.files.append (fn)
+                        break
+
+                if not got_it:
+                    self.warn ("standard file not found: should have one of " +
+                               string.join (alts, ', '))
+            else:
+                if os.path.exists (fn):
+                    self.files.append (fn)
+                else:
+                    self.warn ("standard file '%s' not found" % fn)
+
+        optional = ['test/test*.py']
+        for pattern in optional:
+            files = filter (os.path.isfile, glob (pattern))
+            if files:
+                self.files.extend (files)
+
+        if self.distribution.packages or self.distribution.py_modules:
+            build_py = self.find_peer ('build_py')
+            build_py.ensure_ready ()
+            self.files.extend (build_py.get_source_files ())
+
+        if self.distribution.ext_modules:
+            build_ext = self.find_peer ('build_ext')
+            build_ext.ensure_ready ()
+            self.files.extend (build_ext.get_source_files ())
+
+
+
+    def search_dir (self, dir, pattern=None):
+        """Recursively find files under 'dir' matching 'pattern' (a string
+           containing a Unix-style glob pattern).  If 'pattern' is None,
+           find all files under 'dir'.  Return the list of found
+           filenames."""
+
+        allfiles = findall (dir)
+        if pattern is None:
+            return allfiles
+
+        pattern_re = translate_pattern (pattern)
+        files = []
+        for file in allfiles:
+            if pattern_re.match (os.path.basename (file)):
+                files.append (file)
+
+        return files
+
+    # search_dir ()
+
+
+    def exclude_pattern (self, pattern):
+        """Remove filenames from 'self.files' that match 'pattern'."""
+        print "exclude_pattern: pattern=%s" % pattern
+        pattern_re = translate_pattern (pattern)
+        for i in range (len (self.files)-1, -1, -1):
+            if pattern_re.match (self.files[i]):
+                print "removing %s" % self.files[i]
+                del self.files[i]
+
+
+    def recursive_exclude_pattern (self, dir, pattern=None):
+        """Remove filenames from 'self.files' that are under 'dir'
+           and whose basenames match 'pattern'."""
+
+        print "recursive_exclude_pattern: dir=%s, pattern=%s" % (dir, pattern)
+        if pattern is None:
+            pattern_re = None
+        else:
+            pattern_re = translate_pattern (pattern)
+
+        for i in range (len (self.files)-1, -1, -1):
+            (cur_dir, cur_base) = os.path.split (self.files[i])
+            if (cur_dir == dir and
+                (pattern_re is None or pattern_re.match (cur_base))):
+                print "removing %s" % self.files[i]
+                del self.files[i]
+
+
+    def read_template (self):
+        """Read and parse the manifest template file named by
+           'self.template' (usually "MANIFEST.in").  Process all file
+           specifications (include and exclude) in the manifest template
+           and add the resulting filenames to 'self.files'."""
+
+        assert self.files is not None and type (self.files) is ListType
+
+        template = TextFile (self.template,
+                             strip_comments=1,
+                             skip_blanks=1,
+                             join_lines=1,
+                             lstrip_ws=1,
+                             rstrip_ws=1,
+                             collapse_ws=1)
+
+        all_files = findall ()
+
+        while 1:
+
+            line = template.readline()
+            if line is None:            # end of file
+                break
+
+            words = string.split (line)
+            action = words[0]
+
+            # First, check that the right number of words are present
+            # for the given action (which is the first word)
+            if action in ('include','exclude',
+                          'global-include','global-exclude'):
+                if len (words) != 2:
+                    template.warn \
+                        ("invalid manifest template line: " +
+                         "'%s' expects a single <pattern>" %
+                         action)
+                    continue
+
+                pattern = words[1]
+
+            elif action in ('recursive-include','recursive-exclude'):
+                if len (words) != 3:
+                    template.warn \
+                        ("invalid manifest template line: " +
+                         "'%s' expects <dir> <pattern>" %
+                         action)
+                    continue
+
+                (dir, pattern) = words[1:3]
+
+            elif action in ('graft','prune'):
+                if len (words) != 2:
+                    template.warn \
+                        ("invalid manifest template line: " +
+                         "'%s' expects a single <dir_pattern>" %
+                         action)
+                    continue
+
+                dir_pattern = words[1]
+
+            else:
+                template.warn ("invalid manifest template line: " +
+                               "unknown action '%s'" % action)
+                continue
+
+            # OK, now we know that the action is valid and we have the
+            # right number of words on the line for that action -- so we
+            # can proceed with minimal error-checking.  Also, we have
+            # defined either 'patter', 'dir' and 'pattern', or
+            # 'dir_pattern' -- so we don't have to spend any time digging
+            # stuff up out of 'words'.
+
+            if action == 'include':
+                print "include", pattern
+                files = select_pattern (all_files, pattern, anchor=1)
+                if not files:
+                    template.warn ("no files found matching '%s'" % pattern)
+                else:
+                    self.files.extend (files)
+
+            elif action == 'exclude':
+                print "exclude", pattern
+                num = exclude_pattern (self.files, pattern, anchor=1)
+                if num == 0:
+                    template.warn \
+                        ("no previously-included files found matching '%s'" %
+                         pattern)
+
+            elif action == 'global-include':
+                print "global-include", pattern
+                files = select_pattern (all_files, pattern, anchor=0)
+                if not files:
+                    template.warn (("no files found matching '%s' " +
+                                    "anywhere in distribution") %
+                                   pattern)
+                else:
+                    self.files.extend (files)
+
+            elif action == 'global-exclude':
+                print "global-exclude", pattern
+                num = exclude_pattern (self.files, pattern, anchor=0)
+                if num == 0:
+                    template.warn \
+                        (("no previously-included files matching '%s' " +
+                          "found anywhere in distribution") %
+                         pattern)
+
+            elif action == 'recursive-include':
+                print "recursive-include", dir, pattern
+                files = select_pattern (all_files, pattern, prefix=dir)
+                if not files:
+                    template.warn (("no files found matching '%s' " +
+                                    "under directory '%s'") %
+                                   (pattern, dir))
+                else:
+                    self.files.extend (files)
+
+            elif action == 'recursive-exclude':
+                print "recursive-exclude", dir, pattern
+                num = exclude_pattern (self.files, pattern, prefix=dir)
+                if num == 0:
+                    template.warn \
+                        (("no previously-included files matching '%s' " +
+                          "found under directory '%s'") %
+                         (pattern, dir))
+
+            elif action == 'graft':
+                print "graft", dir_pattern
+                files = select_pattern (all_files, None, prefix=dir_pattern)
+                if not files:
+                    template.warn ("no directories found matching '%s'" %
+                                   dir_pattern)
+                else:
+                    self.files.extend (files)
+
+            elif action == 'prune':
+                print "prune", dir_pattern
+                num = exclude_pattern (self.files, None, prefix=dir_pattern)
+                if num == 0:
+                    template.warn \
+                        (("no previously-included directories found " +
+                          "matching '%s'") %
+                         dir_pattern)
+            else:
+                raise RuntimeError, \
+                      "this cannot happen: invalid action '%s'" % action
+
+        # while loop over lines of template file
+
+    # read_template ()
+
+
+    def write_manifest (self):
+        """Write the file list in 'self.files' (presumably as filled in
+           by 'find_defaults()' and 'read_template()') to the manifest file
+           named by 'self.manifest'."""
+
+        manifest = open (self.manifest, "w")
+        for fn in self.files:
+            manifest.write (fn + '\n')
+        manifest.close ()
+
+    # write_manifest ()
+
+
+    def read_manifest (self):
+        """Read the manifest file (named by 'self.manifest') and use
+           it to fill in 'self.files', the list of files to include
+           in the source distribution."""
+
+        manifest = open (self.manifest)
+        while 1:
+            line = manifest.readline ()
+            if line == '':              # end of file
+                break
+            if line[-1] == '\n':
+                line = line[0:-1]
+            self.files.append (line)
+
+    # read_manifest ()
+            
+
+
+    def make_release_tree (self, base_dir, files):
+
+        # First get the list of directories to create
+        need_dir = {}
+        for file in files:
+            need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
+        need_dirs = need_dir.keys()
+        need_dirs.sort()
+
+        # Now create them
+        for dir in need_dirs:
+            self.mkpath (dir)
+
+        # And walk over the list of files, either making a hard link (if
+        # os.link exists) to each one that doesn't already exist in its
+        # corresponding location under 'base_dir', or copying each file
+        # that's out-of-date in 'base_dir'.  (Usually, all files will be
+        # out-of-date, because by default we blow away 'base_dir' when
+        # we're done making the distribution archives.)
+    
+        try:
+            link = os.link
+            msg = "making hard links in %s..." % base_dir
+        except AttributeError:
+            link = 0
+            msg = "copying files to %s..." % base_dir
+
+        self.announce (msg)
+        for file in files:
+            dest = os.path.join (base_dir, file)
+            if link:
+                if not os.path.exists (dest):
+                    self.execute (os.link, (file, dest),
+                                  "linking %s -> %s" % (file, dest))
+            else:
+                self.copy_file (file, dest)
+
+    # make_release_tree ()
+
+
+    def nuke_release_tree (self, base_dir):
+        try:
+            self.execute (rmtree, (base_dir,),
+                          "removing %s" % base_dir)
+        except (IOError, OSError), exc:
+            if exc.filename:
+                msg = "error removing %s: %s (%s)" % \
+                       (base_dir, exc.strerror, exc.filename)
+            else:
+                msg = "error removing %s: %s" % (base_dir, exc.strerror)
+            self.warn (msg)
+
+
+    def make_tarball (self, base_dir, compress="gzip"):
+
+        # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
+        # It's pretty new, though, so we certainly can't require it --
+        # but it would be nice to take advantage of it to skip the
+        # "create a tree of hardlinks" step!  (Would also be nice to
+        # detect GNU tar to use its 'z' option and save a step.)
+
+        if compress is not None and compress not in ('gzip', 'compress'):
+            raise ValueError, \
+                  "if given, 'compress' must be 'gzip' or 'compress'"
+
+        archive_name = base_dir + ".tar"
+        self.spawn (["tar", "-cf", archive_name, base_dir])
+
+        if compress:
+            self.spawn ([compress, archive_name])
+
+
+    def make_zipfile (self, base_dir):
+
+        # This initially assumed the Unix 'zip' utility -- but
+        # apparently InfoZIP's zip.exe works the same under Windows, so
+        # no changes needed!
+
+        try:
+            self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
+        except DistutilsExecError:
+
+            # XXX really should distinguish between "couldn't find
+            # external 'zip' command" and "zip failed" -- shouldn't try
+            # again in the latter case.  (I think fixing this will
+            # require some cooperation from the spawn module -- perhaps
+            # a utility function to search the path, so we can fallback
+            # on zipfile.py without the failed spawn.)
+            try:
+                import zipfile
+            except ImportError:
+                raise DistutilsExecError, \
+                      ("unable to create zip file '%s.zip': " + 
+                       "could neither find a standalone zip utility nor " +
+                       "import the 'zipfile' module") % base_dir
+
+            z = zipfile.ZipFile (base_dir + ".zip", "wb",
+                                 compression=zipfile.ZIP_DEFLATED)
+            
+            def visit (z, dirname, names):
+                for name in names:
+                    path = os.path.join (dirname, name)
+                    if os.path.isfile (path):
+                        z.write (path, path)
+                        
+            os.path.walk (base_dir, visit, z)
+            z.close()
+
+
+    def make_distribution (self):
+
+        # Don't warn about missing meta-data here -- should be done
+        # elsewhere.
+        name = self.distribution.name or "UNKNOWN"
+        version = self.distribution.version
+
+        if version:
+            base_dir = "%s-%s" % (name, version)
+        else:
+            base_dir = name
+
+        # Remove any files that match "base_dir" from the fileset -- we
+        # don't want to go distributing the distribution inside itself!
+        self.exclude_pattern (base_dir + "*")
+ 
+        self.make_release_tree (base_dir, self.files)
+        for fmt in self.formats:
+            if fmt == 'gztar':
+                self.make_tarball (base_dir, compress='gzip')
+            elif fmt == 'ztar':
+                self.make_tarball (base_dir, compress='compress')
+            elif fmt == 'tar':
+                self.make_tarball (base_dir, compress=None)
+            elif fmt == 'zip':
+                self.make_zipfile (base_dir)
+
+        if not self.keep_tree:
+            self.nuke_release_tree (base_dir)
+
+# class Dist
+
+
+# ----------------------------------------------------------------------
+# Utility functions
+
+def findall (dir = os.curdir):
+    """Find all files under 'dir' and return the list of full
+       filenames (relative to 'dir')."""
+
+    list = []
+    stack = [dir]
+    pop = stack.pop
+    push = stack.append
+
+    while stack:
+        dir = pop()
+        names = os.listdir (dir)
+
+        for name in names:
+            if dir != os.curdir:        # avoid the dreaded "./" syndrome
+                fullname = os.path.join (dir, name)
+            else:
+                fullname = name
+            list.append (fullname)
+            if os.path.isdir (fullname) and not os.path.islink(fullname):
+                push (fullname)
+
+    return list
+
+
+def select_pattern (files, pattern, anchor=1, prefix=None):
+    """Select strings (presumably filenames) from 'files' that match
+       'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
+       quite the same as implemented by the 'fnmatch' module: '*' and '?'
+       match non-special characters, where "special" is platform-dependent:
+       slash on Unix, colon, slash, and backslash on DOS/Windows, and colon
+       on Mac OS.
+
+       If 'anchor' is true (the default), then the pattern match is more
+       stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
+       'anchor' is false, both of these will match.
+
+       If 'prefix' is supplied, then only filenames starting with 'prefix'
+       (itself a pattern) and ending with 'pattern', with anything in
+       between them, will match.  'anchor' is ignored in this case.
+
+       Return the list of matching strings, possibly empty."""
+
+    matches = []
+    pattern_re = translate_pattern (pattern, anchor, prefix)
+    print "select_pattern: applying re %s" % pattern_re.pattern
+    for name in files:
+        if pattern_re.search (name):
+            matches.append (name)
+            print " adding", name
+
+    return matches
+
+# select_pattern ()
+
+
+def exclude_pattern (files, pattern, anchor=1, prefix=None):
+
+    pattern_re = translate_pattern (pattern, anchor, prefix)
+    print "exclude_pattern: applying re %s" % pattern_re.pattern
+    for i in range (len(files)-1, -1, -1):
+        if pattern_re.search (files[i]):
+            print " removing", files[i]
+            del files[i]
+
+# exclude_pattern ()
+
+
+def glob_to_re (pattern):
+    """Translate a shell-like glob pattern to a regular expression;
+       return a string containing the regex.  Differs from
+       'fnmatch.translate()' in that '*' does not match "special
+       characters" (which are platform-specific)."""
+    pattern_re = fnmatch.translate (pattern)
+
+    # '?' and '*' in the glob pattern become '.' and '.*' in the RE, which
+    # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
+    # and by extension they shouldn't match such "special characters" under
+    # any OS.  So change all non-escaped dots in the RE to match any
+    # character except the special characters.
+    # XXX currently the "special characters" are just slash -- i.e. this is
+    # Unix-only.
+    pattern_re = re.sub (r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    return pattern_re
+
+# glob_to_re ()
+
+
+def translate_pattern (pattern, anchor=1, prefix=None):
+    """Translate a shell-like wildcard pattern to a compiled regular
+       expression.    Return the compiled regex."""
+
+    if pattern:
+        pattern_re = glob_to_re (pattern)
+    else:
+        pattern_re = ''
+        
+    if prefix is not None:
+        prefix_re = (glob_to_re (prefix))[0:-1] # ditch trailing $
+        pattern_re = "^" + os.path.join (prefix_re, ".*" + pattern_re)
+    else:                               # no prefix -- respect anchor flag
+        if anchor:
+            pattern_re = "^" + pattern_re
+        
+    return re.compile (pattern_re)
+
+# translate_pattern ()

From d03109b3f6d31ba77bdcee2559d786776a9430ce Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:11:52 +0000
Subject: [PATCH 0153/8469] Changed 'dist' to 'sdist'.

---
 command/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/__init__.py b/command/__init__.py
index 8659307cbf..ea979f9b50 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -21,5 +21,5 @@
            'install',
            'install_py',
            'install_ext',
-           'dist',
+           'sdist',
           ]

From 0fe8bb260644b6dfaf64c07189108d2a045a1895 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:13:53 +0000
Subject: [PATCH 0154/8469] Renamed all command classes so they're exactly the
 same as the name of the command itself: no more of this "FooBar class for
 foo_bar command" silliness.

---
 command/build.py       | 2 +-
 command/build_clib.py  | 2 +-
 command/build_ext.py   | 2 +-
 command/build_lib.py   | 2 +-
 command/build_py.py    | 2 +-
 command/install.py     | 2 +-
 command/install_ext.py | 2 +-
 command/install_lib.py | 2 +-
 command/install_py.py  | 2 +-
 command/sdist.py       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/command/build.py b/command/build.py
index 82a4e6c292..bcbb9332e4 100644
--- a/command/build.py
+++ b/command/build.py
@@ -10,7 +10,7 @@
 from distutils.core import Command
 
 
-class Build (Command):
+class build (Command):
 
     description = "build everything needed to install"
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 6571281816..749b0c2ba2 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -26,7 +26,7 @@
 from distutils.ccompiler import new_compiler
 
 
-class BuildLib (Command):
+class build_lib (Command):
 
     options = [('debug', 'g',
                 "compile with debugging information"),
diff --git a/command/build_ext.py b/command/build_ext.py
index 42eab4796d..ea0e294a70 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -20,7 +20,7 @@
     (r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$')
 
 
-class BuildExt (Command):
+class build_ext (Command):
     
     description = "build C/C++ extensions (compile/link to build directory)"
 
diff --git a/command/build_lib.py b/command/build_lib.py
index 6571281816..749b0c2ba2 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -26,7 +26,7 @@
 from distutils.ccompiler import new_compiler
 
 
-class BuildLib (Command):
+class build_lib (Command):
 
     options = [('debug', 'g',
                 "compile with debugging information"),
diff --git a/command/build_py.py b/command/build_py.py
index 048962b29f..f492ee374f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -14,7 +14,7 @@
 from distutils.errors import *
 
 
-class BuildPy (Command):
+class build_py (Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
diff --git a/command/install.py b/command/install.py
index 0e5b01cc98..b57ec6f2f1 100644
--- a/command/install.py
+++ b/command/install.py
@@ -12,7 +12,7 @@
 from distutils.util import write_file
 
 
-class Install (Command):
+class install (Command):
 
     description = "install everything from build directory"
 
diff --git a/command/install_ext.py b/command/install_ext.py
index 599a37e1ce..ba343d2e42 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -9,7 +9,7 @@
 from distutils.core import Command
 from distutils.util import copy_tree
 
-class InstallExt (Command):
+class install_ext (Command):
 
     description = "install C/C++ extension modules"
     
diff --git a/command/install_lib.py b/command/install_lib.py
index 2e8a670686..e898ce0c18 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,7 +6,7 @@
 from distutils.core import Command
 from distutils.util import copy_tree
 
-class InstallPy (Command):
+class install_py (Command):
 
     description = "install pure Python modules"
 
diff --git a/command/install_py.py b/command/install_py.py
index 2e8a670686..e898ce0c18 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -6,7 +6,7 @@
 from distutils.core import Command
 from distutils.util import copy_tree
 
-class InstallPy (Command):
+class install_py (Command):
 
     description = "install pure Python modules"
 
diff --git a/command/sdist.py b/command/sdist.py
index c8101a708e..d890832862 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -17,7 +17,7 @@
 from distutils.errors import DistutilsExecError
 
 
-class Sdist (Command):
+class sdist (Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 

From d393e804e26ad082c98d3070238a37e416e9e0af Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:14:21 +0000
Subject: [PATCH 0155/8469] Command classes are now named identically to their
 commands, so reflect this in 'find_command_class()' method.

---
 core.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 88e889b22f..f3951ac71c 100644
--- a/core.py
+++ b/core.py
@@ -447,8 +447,7 @@ class from it, and returns the class object.
            expected class was not found in it."""
 
         module_name = 'distutils.command.' + command
-        klass_name = string.join \
-            (map (string.capitalize, string.split (command, '_')), '')
+        klass_name = command
 
         try:
             __import__ (module_name)

From 76c84dcb7f05dd257f26c74e2949e9020e1f633d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:25:39 +0000
Subject: [PATCH 0156/8469] Renamed all 'options' class attributes to
 'user_options'.

---
 command/build.py       | 19 +++++------
 command/build_clib.py  |  7 ++--
 command/build_ext.py   | 39 +++++++++++-----------
 command/build_lib.py   |  7 ++--
 command/build_py.py    |  5 +--
 command/install.py     | 73 +++++++++++++++++++++---------------------
 command/install_ext.py |  7 ++--
 command/install_lib.py | 11 ++++---
 command/install_py.py  | 11 ++++---
 command/sdist.py       | 41 ++++++++++++------------
 10 files changed, 115 insertions(+), 105 deletions(-)

diff --git a/command/build.py b/command/build.py
index bcbb9332e4..d46132f308 100644
--- a/command/build.py
+++ b/command/build.py
@@ -14,15 +14,16 @@ class build (Command):
 
     description = "build everything needed to install"
 
-    options = [('build-base=', 'b',
-                "base directory for build library"),
-               ('build-lib=', 'l',
-                "directory for platform-shared files"),
-               ('build-platlib=', 'p',
-                "directory for platform-specific files"),
-               ('debug', 'g',
-                "compile extensions and libraries with debugging information"),
-              ]
+    user_options = [
+        ('build-base=', 'b',
+         "base directory for build library"),
+        ('build-lib=', 'l',
+         "directory for platform-shared files"),
+        ('build-platlib=', 'p',
+         "directory for platform-specific files"),
+        ('debug', 'g',
+         "compile extensions and libraries with debugging information"),
+        ]
 
     def set_default_options (self):
         self.build_base = 'build'
diff --git a/command/build_clib.py b/command/build_clib.py
index 749b0c2ba2..26b89b3aba 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -28,9 +28,10 @@
 
 class build_lib (Command):
 
-    options = [('debug', 'g',
-                "compile with debugging information"),
-              ]
+    user_options = [
+        ('debug', 'g',
+         "compile with debugging information"),
+        ]
 
     def set_default_options (self):
         # List of libraries to build
diff --git a/command/build_ext.py b/command/build_ext.py
index ea0e294a70..963abc2977 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -42,25 +42,26 @@ class build_ext (Command):
     #     takes care of both command-line and client options
     #     in between set_default_options() and set_final_options())
 
-    options = [('build-dir=', 'd',
-                "directory for compiled extension modules"),
-               ('include-dirs=', 'I',
-                "list of directories to search for header files"),
-               ('define=', 'D',
-                "C preprocessor macros to define"),
-               ('undef=', 'U',
-                "C preprocessor macros to undefine"),
-               ('libs=', 'l',
-                "external C libraries to link with"),
-               ('library-dirs=', 'L',
-                "directories to search for external C libraries"),
-               ('rpath=', 'R',
-                "directories to search for shared C libraries at runtime"),
-               ('link-objects=', 'O',
-                "extra explicit link objects to include in the link"),
-               ('debug', 'g',
-                "compile/link with debugging information"),
-              ]
+    user_options = [
+        ('build-dir=', 'd',
+         "directory for compiled extension modules"),
+        ('include-dirs=', 'I',
+         "list of directories to search for header files"),
+        ('define=', 'D',
+         "C preprocessor macros to define"),
+        ('undef=', 'U',
+         "C preprocessor macros to undefine"),
+        ('libs=', 'l',
+         "external C libraries to link with"),
+        ('library-dirs=', 'L',
+         "directories to search for external C libraries"),
+        ('rpath=', 'R',
+         "directories to search for shared C libraries at runtime"),
+        ('link-objects=', 'O',
+         "extra explicit link objects to include in the link"),
+        ('debug', 'g',
+         "compile/link with debugging information"),
+        ]
 
 
     def set_default_options (self):
diff --git a/command/build_lib.py b/command/build_lib.py
index 749b0c2ba2..26b89b3aba 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -28,9 +28,10 @@
 
 class build_lib (Command):
 
-    options = [('debug', 'g',
-                "compile with debugging information"),
-              ]
+    user_options = [
+        ('debug', 'g',
+         "compile with debugging information"),
+        ]
 
     def set_default_options (self):
         # List of libraries to build
diff --git a/command/build_py.py b/command/build_py.py
index f492ee374f..eecf88b9d3 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -18,8 +18,9 @@ class build_py (Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
-    options = [('build-dir=', 'd', "directory for platform-shared files"),
-              ]
+    user_options = [
+        ('build-dir=', 'd', "directory for platform-shared files"),
+        ]
 
 
     def set_default_options (self):
diff --git a/command/install.py b/command/install.py
index b57ec6f2f1..798460b27a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -16,42 +16,43 @@ class install (Command):
 
     description = "install everything from build directory"
 
-    options = [('prefix=', None, "installation prefix"),
-               ('exec-prefix=', None,
-                "prefix for platform-specific files"),
-
-               # Build directories: where to install from
-               ('build-base=', None,
-                "base build directory"),
-               ('build-lib=', None,
-                "build directory for pure Python modules"),
-               ('build-platlib=', None,
-                "build directory for extension modules"),
-
-               # Installation directories: where to put modules and packages
-               ('install-lib=', None,
-                "base Python library directory"),
-               ('install-platlib=', None,
-                "platform-specific Python library directory"),
-               ('install-site-lib=', None,
-                "directory for site-specific packages and modules"),
-               ('install-site-platlib=', None,
-                "platform-specific site directory"),
-               ('install-scheme=', None,
-                "install to 'system' or 'site' library directory?"),
-               ('install-path=', None,
-                "extra intervening directories to put below install-lib"),
-
-               # Where to install documentation (eventually!)
-               ('doc-format=', None, "format of documentation to generate"),
-               ('install-man=', None, "directory for Unix man pages"),
-               ('install-html=', None, "directory for HTML documentation"),
-               ('install-info=', None, "directory for GNU info files"),
-               
-               # Flags for 'build_py'
-               ('compile-py', None, "compile .py to .pyc"),
-               ('optimize-py', None, "compile .py to .pyo (optimized)"),
-              ]
+    user_options = [
+        ('prefix=', None, "installation prefix"),
+        ('exec-prefix=', None,
+         "prefix for platform-specific files"),
+
+        # Build directories: where to install from
+        ('build-base=', None,
+         "base build directory"),
+        ('build-lib=', None,
+         "build directory for pure Python modules"),
+        ('build-platlib=', None,
+         "build directory for extension modules"),
+
+        # Installation directories: where to put modules and packages
+        ('install-lib=', None,
+         "base Python library directory"),
+        ('install-platlib=', None,
+         "platform-specific Python library directory"),
+        ('install-site-lib=', None,
+         "directory for site-specific packages and modules"),
+        ('install-site-platlib=', None,
+         "platform-specific site directory"),
+        ('install-scheme=', None,
+         "install to 'system' or 'site' library directory?"),
+        ('install-path=', None,
+         "extra intervening directories to put below install-lib"),
+
+        # Where to install documentation (eventually!)
+        ('doc-format=', None, "format of documentation to generate"),
+        ('install-man=', None, "directory for Unix man pages"),
+        ('install-html=', None, "directory for HTML documentation"),
+        ('install-info=', None, "directory for GNU info files"),
+
+        # Flags for 'build_py'
+        ('compile-py', None, "compile .py to .pyc"),
+        ('optimize-py', None, "compile .py to .pyo (optimized)"),
+        ]
 
 
     def set_default_options (self):
diff --git a/command/install_ext.py b/command/install_ext.py
index ba343d2e42..016a514e1e 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -13,9 +13,10 @@ class install_ext (Command):
 
     description = "install C/C++ extension modules"
     
-    options = [('install-dir=', 'd', "directory to install to"),
-               ('build-dir=','b', "build directory (where to install from)"),
-              ]
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+        ('build-dir=','b', "build directory (where to install from)"),
+        ]
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
diff --git a/command/install_lib.py b/command/install_lib.py
index e898ce0c18..6dfebfbe0d 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -10,11 +10,12 @@ class install_py (Command):
 
     description = "install pure Python modules"
 
-    options = [('install-dir=', 'd', "directory to install to"),
-               ('build-dir=','b', "build directory (where to install from)"),
-               ('compile', 'c', "compile .py to .pyc"),
-               ('optimize', 'o', "compile .py to .pyo (optimized)"),
-              ]
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+        ('build-dir=','b', "build directory (where to install from)"),
+        ('compile', 'c', "compile .py to .pyc"),
+        ('optimize', 'o', "compile .py to .pyo (optimized)"),
+        ]
                
 
     def set_default_options (self):
diff --git a/command/install_py.py b/command/install_py.py
index e898ce0c18..6dfebfbe0d 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -10,11 +10,12 @@ class install_py (Command):
 
     description = "install pure Python modules"
 
-    options = [('install-dir=', 'd', "directory to install to"),
-               ('build-dir=','b', "build directory (where to install from)"),
-               ('compile', 'c', "compile .py to .pyc"),
-               ('optimize', 'o', "compile .py to .pyo (optimized)"),
-              ]
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+        ('build-dir=','b', "build directory (where to install from)"),
+        ('compile', 'c', "compile .py to .pyc"),
+        ('optimize', 'o', "compile .py to .pyo (optimized)"),
+        ]
                
 
     def set_default_options (self):
diff --git a/command/sdist.py b/command/sdist.py
index d890832862..aaedb30421 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -21,26 +21,27 @@ class sdist (Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
-    options = [('template=', 't',
-                "name of manifest template file [default: MANIFEST.in]"),
-               ('manifest=', 'm',
-                "name of manifest file [default: MANIFEST]"),
-               ('use-defaults', None,
-                "include the default file set in the manifest "
-                "[default; disable with --no-defaults]"),
-               ('manifest-only', None,
-                "just regenerate the manifest and then stop"),
-               ('force-manifest', None,
-                "forcibly regenerate the manifest and carry on as usual"),
-               
-               ('formats=', None,
-                "formats for source distribution (tar, ztar, gztar, or zip)"),
-               ('list-only', 'l',
-                "just list files that would be distributed"),
-               ('keep-tree', 'k',
-                "keep the distribution tree around after creating " +
-                "archive file(s)"),
-              ]
+    user_options = [
+        ('template=', 't',
+         "name of manifest template file [default: MANIFEST.in]"),
+        ('manifest=', 'm',
+         "name of manifest file [default: MANIFEST]"),
+        ('use-defaults', None,
+         "include the default file set in the manifest "
+         "[default; disable with --no-defaults]"),
+        ('manifest-only', None,
+         "just regenerate the manifest and then stop"),
+        ('force-manifest', None,
+         "forcibly regenerate the manifest and carry on as usual"),
+
+        ('formats=', None,
+         "formats for source distribution (tar, ztar, gztar, or zip)"),
+        ('list-only', 'l',
+         "just list files that would be distributed"),
+        ('keep-tree', 'k',
+         "keep the distribution tree around after creating " +
+         "archive file(s)"),
+        ]
     negative_opts = {'use-defaults': 'no-defaults'}
 
     default_format = { 'posix': 'gztar',

From 42a137f33452bf81103e2960c6c33836b8260dda Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:26:23 +0000
Subject: [PATCH 0157/8469] Changed references to the command class 'options'
 attribute to 'user_options'. Related docstring changes. Unrelated comment
 changes.

---
 core.py | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/core.py b/core.py
index f3951ac71c..6463bb4931 100644
--- a/core.py
+++ b/core.py
@@ -24,9 +24,10 @@
 # to look for a Python module named after the command.
 command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
 
-# Defining this as a global is probably inadequate -- what about
-# listing the available options (or even commands, which can vary
-# quite late as well)
+# This is a barebones help message generated displayed when the user
+# runs the setup script with no arguments at all.  More useful help
+# is generated with various --help options: global help, list commands,
+# and per-command help.
 usage = """\
 usage: %s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
    or: %s --help
@@ -50,22 +51,22 @@ def setup (**attrs):
        Distribution instance.
 
        The 'cmdclass' argument, if supplied, is a dictionary mapping
-       command names to command classes.  Each command encountered on the
-       command line will be turned into a command class, which is in turn
-       instantiated; any class found in 'cmdclass' is used in place of the
-       default, which is (for command 'foo_bar') class 'FooBar' in module
-       'distutils.command.foo_bar'.  The command object must provide an
-       'options' attribute which is a list of option specifiers for
-       'distutils.fancy_getopt'.  Any command-line options between the
-       current and the next command are used to set attributes in the
-       current command object.
-
-       When the entire command-line has been successfully parsed, calls the
-       'run' method on each command object in turn.  This method will be
-       driven entirely by the Distribution object (which each command
-       object has a reference to, thanks to its constructor), and the
-       command-specific options that became attributes of each command
-       object."""
+       command names to command classes.  Each command encountered on
+       the command line will be turned into a command class, which is in
+       turn instantiated; any class found in 'cmdclass' is used in place
+       of the default, which is (for command 'foo_bar') class 'foo_bar'
+       in module 'distutils.command.foo_bar'.  The command class must
+       provide a 'user_options' attribute which is a list of option
+       specifiers for 'distutils.fancy_getopt'.  Any command-line
+       options between the current and the next command are used to set
+       attributes of the current command object.
+
+       When the entire command-line has been successfully parsed, calls
+       the 'run()' method on each command object in turn.  This method
+       will be driven entirely by the Distribution object (which each
+       command object has a reference to, thanks to its constructor),
+       and the command-specific options that became attributes of each
+       command object."""
 
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
@@ -313,11 +314,11 @@ def parse_command_line (self, args):
 
             # Also make sure that the command object provides a list of its
             # known options
-            if not (hasattr (cmd_obj, 'options') and
-                    type (cmd_obj.options) is ListType):
+            if not (hasattr (cmd_obj, 'user_options') and
+                    type (cmd_obj.user_options) is ListType):
                 raise DistutilsClassError, \
-                      ("command class %s must provide an 'options' attribute "+
-                       "(a list of tuples)") % \
+                      ("command class %s must provide " +
+                       "'user_options' attribute (a list of tuples)") % \
                       cmd_obj.__class__
 
             # Poof! like magic, all commands support the global
@@ -327,14 +328,14 @@ def parse_command_line (self, args):
                 negative_opt = copy (negative_opt)
                 negative_opt.update (cmd_obj.negative_opt)
 
-            options = self.global_options + cmd_obj.options
+            options = self.global_options + cmd_obj.user_options
             args = fancy_getopt (options, negative_opt,
                                  cmd_obj, args[1:])
             if cmd_obj.help:
                 print_help (self.global_options,
                             header="Global options:")
                 print
-                print_help (cmd_obj.options,
+                print_help (cmd_obj.user_options,
                             header="Options for '%s' command:" % command)
                 print
                 print usage
@@ -357,7 +358,7 @@ def parse_command_line (self, args):
 
             for command in self.commands:
                 klass = self.find_command_class (command)
-                print_help (klass.options,
+                print_help (klass.user_options,
                             header="Options for '%s' command:" % command)
                 print
 

From 7697546dd8208145f70f4d5dd97d6fc268842aaa Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:35:22 +0000
Subject: [PATCH 0158/8469] Renamed 'set_default_options()' to
 'initialize_options()', and 'set_final_options()' to 'finalize_options()'.

---
 command/build.py       |  4 ++--
 command/build_clib.py  |  8 ++++----
 command/build_ext.py   | 10 +++++-----
 command/build_lib.py   |  8 ++++----
 command/build_py.py    |  4 ++--
 command/install.py     |  6 +++---
 command/install_ext.py |  4 ++--
 command/install_lib.py |  4 ++--
 command/install_py.py  |  4 ++--
 command/sdist.py       |  4 ++--
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/command/build.py b/command/build.py
index d46132f308..28241e104f 100644
--- a/command/build.py
+++ b/command/build.py
@@ -25,7 +25,7 @@ class build (Command):
          "compile extensions and libraries with debugging information"),
         ]
 
-    def set_default_options (self):
+    def initialize_options (self):
         self.build_base = 'build'
         # these are decided only after 'build_base' has its final value
         # (unless overridden by the user or client)
@@ -33,7 +33,7 @@ def set_default_options (self):
         self.build_platlib = None
         self.debug = None
 
-    def set_final_options (self):
+    def finalize_options (self):
         # 'build_lib' and 'build_platlib' just default to 'lib' and
         # 'platlib' under the base build directory
         if self.build_lib is None:
diff --git a/command/build_clib.py b/command/build_clib.py
index 26b89b3aba..9cf53da032 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -33,7 +33,7 @@ class build_lib (Command):
          "compile with debugging information"),
         ]
 
-    def set_default_options (self):
+    def initialize_options (self):
         # List of libraries to build
         self.libraries = None
 
@@ -43,9 +43,9 @@ def set_default_options (self):
         self.undef = None
         self.debug = None
 
-    # set_default_options()
+    # initialize_options()
 
-    def set_final_options (self):
+    def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('debug', 'debug'))
         self.libraries = self.distribution.libraries
@@ -58,7 +58,7 @@ def set_final_options (self):
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
 
-    # set_final_options()
+    # finalize_options()
 
 
     def run (self):
diff --git a/command/build_ext.py b/command/build_ext.py
index 963abc2977..8ed3a97339 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -38,9 +38,9 @@ class build_ext (Command):
     #     structure
     #   - that data structure (in this case, a list of 2-tuples)
     #     will then be present in the command object by the time
-    #     we get to set_final_options() (i.e. the constructor
+    #     we get to finalize_options() (i.e. the constructor
     #     takes care of both command-line and client options
-    #     in between set_default_options() and set_final_options())
+    #     in between initialize_options() and finalize_options())
 
     user_options = [
         ('build-dir=', 'd',
@@ -64,7 +64,7 @@ class build_ext (Command):
         ]
 
 
-    def set_default_options (self):
+    def initialize_options (self):
         self.extensions = None
         self.build_dir = None
         self.package = None
@@ -79,7 +79,7 @@ def set_default_options (self):
         self.debug = None
 
 
-    def set_final_options (self):
+    def finalize_options (self):
         from distutils import sysconfig
 
         self.set_undefined_options ('build',
@@ -112,7 +112,7 @@ def set_final_options (self):
         # XXX how the heck are 'self.define' and 'self.undef' supposed to
         # be set?
 
-    # set_final_options ()
+    # finalize_options ()
     
 
     def run (self):
diff --git a/command/build_lib.py b/command/build_lib.py
index 26b89b3aba..9cf53da032 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -33,7 +33,7 @@ class build_lib (Command):
          "compile with debugging information"),
         ]
 
-    def set_default_options (self):
+    def initialize_options (self):
         # List of libraries to build
         self.libraries = None
 
@@ -43,9 +43,9 @@ def set_default_options (self):
         self.undef = None
         self.debug = None
 
-    # set_default_options()
+    # initialize_options()
 
-    def set_final_options (self):
+    def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('debug', 'debug'))
         self.libraries = self.distribution.libraries
@@ -58,7 +58,7 @@ def set_final_options (self):
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
 
-    # set_final_options()
+    # finalize_options()
 
 
     def run (self):
diff --git a/command/build_py.py b/command/build_py.py
index eecf88b9d3..7ae207b8cc 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -23,13 +23,13 @@ class build_py (Command):
         ]
 
 
-    def set_default_options (self):
+    def initialize_options (self):
         self.build_dir = None
         self.modules = None
         self.package = None
         self.package_dir = None
 
-    def set_final_options (self):
+    def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('build_lib', 'build_dir'))
 
diff --git a/command/install.py b/command/install.py
index 798460b27a..ffd687978a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -55,7 +55,7 @@ class install (Command):
         ]
 
 
-    def set_default_options (self):
+    def initialize_options (self):
 
         self.build_base = None
         self.build_lib = None
@@ -89,7 +89,7 @@ def set_default_options (self):
         self.optimize_py = 1
 
 
-    def set_final_options (self):
+    def finalize_options (self):
 
         # XXX this method is where the default installation directories
         # for modules and extension modules are determined.  (Someday,
@@ -237,7 +237,7 @@ def set_final_options (self):
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
 
-    # set_final_options ()
+    # finalize_options ()
 
 
     def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
diff --git a/command/install_ext.py b/command/install_ext.py
index 016a514e1e..b046dfbf3b 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -18,12 +18,12 @@ class install_ext (Command):
         ('build-dir=','b', "build directory (where to install from)"),
         ]
 
-    def set_default_options (self):
+    def initialize_options (self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
 
-    def set_final_options (self):
+    def finalize_options (self):
         self.set_undefined_options ('install',
                                     ('build_platlib', 'build_dir'),
                                     ('install_site_platlib', 'install_dir'))
diff --git a/command/install_lib.py b/command/install_lib.py
index 6dfebfbe0d..919873c6f2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -18,14 +18,14 @@ class install_py (Command):
         ]
                
 
-    def set_default_options (self):
+    def initialize_options (self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
         self.compile = 1
         self.optimize = 1
 
-    def set_final_options (self):
+    def finalize_options (self):
 
         # Find out from the 'build_ext' command if we were asked to build
         # any extensions.  If so, that means even pure-Python modules in
diff --git a/command/install_py.py b/command/install_py.py
index 6dfebfbe0d..919873c6f2 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -18,14 +18,14 @@ class install_py (Command):
         ]
                
 
-    def set_default_options (self):
+    def initialize_options (self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
         self.compile = 1
         self.optimize = 1
 
-    def set_final_options (self):
+    def finalize_options (self):
 
         # Find out from the 'build_ext' command if we were asked to build
         # any extensions.  If so, that means even pure-Python modules in
diff --git a/command/sdist.py b/command/sdist.py
index aaedb30421..042b1fc54a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -50,7 +50,7 @@ class sdist (Command):
     exclude_re = re.compile (r'\s*!\s*(\S+)') # for manifest lines
 
 
-    def set_default_options (self):
+    def initialize_options (self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
         self.template = None
@@ -68,7 +68,7 @@ def set_default_options (self):
         self.keep_tree = 0
 
 
-    def set_final_options (self):
+    def finalize_options (self):
         if self.manifest is None:
             self.manifest = "MANIFEST"
         if self.template is None:

From 18f73d2efe63baed2730c5d607901c429f7460ed Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 18 Feb 2000 00:36:20 +0000
Subject: [PATCH 0159/8469] Changed all references to command methods
 'set_default_options()' and 'set_final_options()' to 'initialize_options()'
 and 'finalize_options()'.

---
 core.py | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/core.py b/core.py
index 6463bb4931..ddd39a2c79 100644
--- a/core.py
+++ b/core.py
@@ -619,14 +619,14 @@ class Command:
     """Abstract base class for defining command classes, the "worker bees"
        of the Distutils.  A useful analogy for command classes is to
        think of them as subroutines with local variables called
-       "options".  The options are "declared" in 'set_default_options()'
-       and "initialized" (given their real values) in
-       'set_final_options()', both of which must be defined by every
+       "options".  The options are "declared" in 'initialize_options()'
+       and "defined" (given their final values, aka "finalized") in
+       'finalize_options()', both of which must be defined by every
        command class.  The distinction between the two is necessary
        because option values might come from the outside world (command
        line, option file, ...), and any options dependent on other
        options must be computed *after* these outside influences have
-       been processed -- hence 'set_final_options()'.  The "body" of the
+       been processed -- hence 'finalize_options()'.  The "body" of the
        subroutine, where it does all its work based on the values of its
        options, is the 'run()' method, which must also be implemented by
        every command class."""
@@ -635,7 +635,7 @@ class Command:
 
     def __init__ (self, dist):
         """Create and initialize a new Command object.  Most importantly,
-           invokes the 'set_default_options()' method, which is the
+           invokes the 'initialize_options()' method, which is the
            real initializer and depends on the actual command being
            instantiated."""
 
@@ -645,7 +645,7 @@ def __init__ (self, dist):
             raise RuntimeError, "Command is an abstract class"
 
         self.distribution = dist
-        self.set_default_options ()
+        self.initialize_options ()
 
         # Per-command versions of the global flags, so that the user can
         # customize Distutils' behaviour command-by-command and let some
@@ -662,10 +662,10 @@ def __init__ (self, dist):
         # none of that complicated bureaucracy is needed.
         self.help = 0
 
-        # 'ready' records whether or not 'set_final_options()' has been
-        # called.  'set_final_options()' itself should not pay attention to
+        # 'ready' records whether or not 'finalize_options()' has been
+        # called.  'finalize_options()' itself should not pay attention to
         # this flag: it is the business of 'ensure_ready()', which always
-        # calls 'set_final_options()', to respect/update it.
+        # calls 'finalize_options()', to respect/update it.
         self.ready = 0
 
     # end __init__ ()
@@ -684,16 +684,16 @@ def __getattr__ (self, attr):
 
     def ensure_ready (self):
         if not self.ready:
-            self.set_final_options ()
+            self.finalize_options ()
         self.ready = 1
         
 
     # Subclasses must define:
-    #   set_default_options()
+    #   initialize_options()
     #     provide default values for all options; may be overridden
     #     by Distutils client, by command-line options, or by options
     #     from option file
-    #   set_final_options()
+    #   finalize_options()
     #     decide on the final values for all options; this is called
     #     after all possible intervention from the outside world
     #     (command-line, option file, etc.) has been processed
@@ -701,12 +701,12 @@ def ensure_ready (self):
     #     run the command: do whatever it is we're here to do,
     #     controlled by the command's various option values
 
-    def set_default_options (self):
+    def initialize_options (self):
         """Set default values for all the options that this command
            supports.  Note that these defaults may be overridden
            by the command-line supplied by the user; thus, this is
            not the place to code dependencies between options; generally,
-           'set_default_options()' implementations are just a bunch
+           'initialize_options()' implementations are just a bunch
            of "self.foo = None" assignments.
            
            This method must be implemented by all command classes."""
@@ -714,14 +714,14 @@ def set_default_options (self):
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
         
-    def set_final_options (self):
+    def finalize_options (self):
         """Set final values for all the options that this command
            supports.  This is always called as late as possible, ie.
            after any option assignments from the command-line or from
            other commands have been done.  Thus, this is the place to to
            code option dependencies: if 'foo' depends on 'bar', then it
            is safe to set 'foo' from 'bar' as long as 'foo' still has
-           the same value it was assigned in 'set_default_options()'.
+           the same value it was assigned in 'initialize_options()'.
 
            This method must be implemented by all command classes."""
            
@@ -731,8 +731,8 @@ def set_final_options (self):
     def run (self):
         """A command's raison d'etre: carry out the action it exists
            to perform, controlled by the options initialized in
-           'set_initial_options()', customized by the user and other
-           commands, and finalized in 'set_final_options()'.  All
+           'initialize_options()', customized by the user and other
+           commands, and finalized in 'finalize_options()'.  All
            terminal output and filesystem interaction should be done by
            'run()'.
 
@@ -836,7 +836,7 @@ def set_undefined_options (self, src_cmd, *option_pairs):
         # Option_pairs: list of (src_option, dst_option) tuples
 
         src_cmd_obj = self.distribution.find_command_obj (src_cmd)
-        src_cmd_obj.set_final_options ()
+        src_cmd_obj.finalize_options ()
         try:
             for (src_option, dst_option) in option_pairs:
                 if getattr (self, dst_option) is None:
@@ -851,16 +851,16 @@ def set_peer_option (self, command, option, value):
         """Attempt to simulate a command-line override of some option
            value in another command.  Finds the command object for
            'command', sets its 'option' to 'value', and unconditionally
-           calls 'set_final_options()' on it: this means that some command
-           objects may have 'set_final_options()' invoked more than once.
+           calls 'finalize_options()' on it: this means that some command
+           objects may have 'finalize_options()' invoked more than once.
            Even so, this is not entirely reliable: the other command may
            already be initialized to its satisfaction, in which case the
-           second 'set_final_options()' invocation will have little or no
+           second 'finalize_options()' invocation will have little or no
            effect."""
 
         cmd_obj = self.distribution.find_command_obj (command)
         cmd_obj.set_option (option, value)
-        cmd_obj.set_final_options ()
+        cmd_obj.finalize_options ()
 
 
     def find_peer (self, command, create=1):

From d7fe6215f8ae6b39c44a475925c6ae0aa005157a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 24 Feb 2000 03:17:43 +0000
Subject: [PATCH 0160/8469] Fix from est@hyperreal.org: missing initialize in
 'find_defaults()'.

---
 command/sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/sdist.py b/command/sdist.py
index 042b1fc54a..6b838bdef2 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -198,6 +198,7 @@ def find_defaults (self):
         for fn in standards:
             if type (fn) is TupleType:
                 alts = fn
+                got_it = 0
                 for fn in alts:
                     if os.path.exists (fn):
                         got_it = 1

From 0e7f7e1c36820e01bde9edbbcd9acc623445b045 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 26 Feb 2000 00:49:04 +0000
Subject: [PATCH 0161/8469] Unfinished, untested implementation of the lovely
 baroque installation scheme cooked up by Fred Drake and me.  Only saved for
 posterity (whoever posterity is), as it is about to be ditched in favour of
 GvR's much simpler design.

---
 command/install.py     | 259 +++++++++++++++++------------------------
 command/install_ext.py |   2 +-
 command/install_lib.py |  20 +---
 command/install_py.py  |  20 +---
 4 files changed, 118 insertions(+), 183 deletions(-)

diff --git a/command/install.py b/command/install.py
index ffd687978a..a89bc0259f 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,7 +10,7 @@
 from types import *
 from distutils.core import Command
 from distutils.util import write_file
-
+from distutils.errors import DistutilsOptionError
 
 class install (Command):
 
@@ -21,66 +21,52 @@ class install (Command):
         ('exec-prefix=', None,
          "prefix for platform-specific files"),
 
-        # Build directories: where to install from
-        ('build-base=', None,
-         "base build directory"),
-        ('build-lib=', None,
-         "build directory for pure Python modules"),
-        ('build-platlib=', None,
-         "build directory for extension modules"),
-
         # Installation directories: where to put modules and packages
         ('install-lib=', None,
          "base Python library directory"),
         ('install-platlib=', None,
          "platform-specific Python library directory"),
-        ('install-site-lib=', None,
-         "directory for site-specific packages and modules"),
-        ('install-site-platlib=', None,
-         "platform-specific site directory"),
-        ('install-scheme=', None,
-         "install to 'system' or 'site' library directory?"),
         ('install-path=', None,
          "extra intervening directories to put below install-lib"),
 
+        # Build directories: where to find the files to install
+        ('build-base=', None,
+         "base build directory"),
+        ('build-lib=', None,
+         "build directory for pure Python modules"),
+        ('build-platlib=', None,
+         "build directory for extension modules"),
+
         # Where to install documentation (eventually!)
-        ('doc-format=', None, "format of documentation to generate"),
-        ('install-man=', None, "directory for Unix man pages"),
-        ('install-html=', None, "directory for HTML documentation"),
-        ('install-info=', None, "directory for GNU info files"),
+        #('doc-format=', None, "format of documentation to generate"),
+        #('install-man=', None, "directory for Unix man pages"),
+        #('install-html=', None, "directory for HTML documentation"),
+        #('install-info=', None, "directory for GNU info files"),
 
         # Flags for 'build_py'
-        ('compile-py', None, "compile .py to .pyc"),
-        ('optimize-py', None, "compile .py to .pyo (optimized)"),
+        #('compile-py', None, "compile .py to .pyc"),
+        #('optimize-py', None, "compile .py to .pyo (optimized)"),
         ]
 
 
     def initialize_options (self):
 
-        self.build_base = None
-        self.build_lib = None
-        self.build_platlib = None
-
         # Don't define 'prefix' or 'exec_prefix' so we can know when the
         # command is run whether the user supplied values
         self.prefix = None
         self.exec_prefix = None
 
-        # These two, we can supply real values for! (because they're
-        # not directories, and don't have a confusing multitude of
-        # possible derivations)
-        #self.install_scheme = 'site'
-        self.doc_format = None
-
         # The actual installation directories are determined only at
         # run-time, so the user can supply just prefix (and exec_prefix?)
         # as a base for everything else
         self.install_lib = None
         self.install_platlib = None
-        self.install_site_lib = None
-        self.install_site_platlib = None
         self.install_path = None
 
+        self.build_base = None
+        self.build_lib = None
+        self.build_platlib = None
+
         self.install_man = None
         self.install_html = None
         self.install_info = None
@@ -114,75 +100,90 @@ def finalize_options (self):
         # and assumes the Python 1.5 installation tree with no site.py
         # to fix things.
 
-        # Figure out the build directories, ie. where to install from
-        self.set_peer_option ('build', 'build_base', self.build_base)
-        self.set_undefined_options ('build',
-                                    ('build_base', 'build_base'),
-                                    ('build_lib', 'build_lib'),
-                                    ('build_platlib', 'build_platlib'))
-
         # Figure out actual installation directories; the basic principle
-        # is: if the user supplied nothing, then use the directories that
-        # Python was built and installed with (ie. the compiled-in prefix
-        # and exec_prefix, and the actual installation directories gleaned
-        # by sysconfig).  If the user supplied a prefix (and possibly
-        # exec_prefix), then we generate our own installation directories,
-        # following any pattern gleaned from sysconfig's findings.  If no
-        # such pattern can be gleaned, then we'll just make do and try to
-        # ape the behaviour of Python's configure script.
-
-        if self.prefix is None:         # user didn't override
-            self.prefix = os.path.normpath (sys.prefix)
+        # is: ...
+
+        sys_prefix = os.path.normpath (sys.prefix)
+        sys_exec_prefix = os.path.normpath (sys.exec_prefix)
+
+        if self.prefix is None:
+            if self.exec_prefix is not None:
+                raise DistutilsOptionError, \
+                      "you may not supply exec_prefix without prefix"
+            self.prefix = sys_prefix
+        else:
+            # This is handy to guarantee that self.prefix is normalized --
+            # but it could be construed as rude to go normalizing a
+            # user-supplied path (they might like to see their "../" or
+            # symlinks in the installation feedback).
+            self.prefix = os.path.normpath (self.prefix)
+            
         if self.exec_prefix is None:
-            self.exec_prefix = os.path.normpath (sys.exec_prefix)
-
-        if self.install_lib is None:
-            self.install_lib = \
-                self.replace_sys_prefix ('LIBDEST', ('lib','python1.5'))
-        if self.install_platlib is None:
-            # XXX this should probably be DESTSHARED -- but why is there no
-            # equivalent to DESTSHARED for the "site-packages" dir"?
-            self.install_platlib = \
-                self.replace_sys_prefix ('BINLIBDEST', ('lib','python1.5'), 1)
-
-
-        # Here is where we decide where to install most library files: on
-        # POSIX systems, they go to 'site-packages' under the install_lib
-        # (determined above -- typically /usr/local/lib/python1.x).  Note
-        # that on POSIX systems, platform-specific files belong in
-        # 'site-packages' under install_platlib.  (The actual rule is that
-        # a module distribution that includes *any* platform-specific files
-        # -- ie. extension modules -- goes under install_platlib.  This
-        # solves the "can't find extension module in a package" problem.)
-        # On non-POSIX systems, install_lib and install_platlib are the
-        # same (eg. "C:\Program Files\Python\Lib" on Windows), as are
-        # install_site_lib and install_site_platlib (eg.
-        # "C:\Program Files\Python" on Windows) -- everything will be dumped
-        # right into one of the install_site directories.  (It doesn't
-        # really matter *which* one, of course, but I'll observe decorum
-        # and do it properly.)
-
-        # 'base' and 'platbase' are the base directories for installing
-        # site-local files, eg. "/usr/local/lib/python1.5/site-packages"
-        # or "C:\Program Files\Python"
+            if self.prefix == sys_prefix:
+                self.exec_prefix = sys_exec_prefix
+            else:
+                self.exec_prefix = self.prefix
+        else:
+            # Same as above about handy versus rude to normalize user's
+            # exec_prefix.
+            self.exec_prefix = os.path.normpath (self.exec_prefix)
+
+        if self.distribution.ext_modules: # any extensions to install?
+            effective_prefix = self.exec_prefix
+        else:
+            effective_prefix = self.prefix
+
         if os.name == 'posix':
-            self.base = os.path.join (self.install_lib,
-                                      'site-packages')
-            self.platbase = os.path.join (self.install_platlib,
-                                          'site-packages')
+            if self.install_lib is None:
+                if self.prefix == sys_prefix:
+                    self.install_lib = \
+                        os.path.join (effective_prefix,
+                                      "lib",
+                                      "python" + sys.version[:3],
+                                      "site-packages")
+                else:
+                    self.install_lib = \
+                        os.path.join (effective_prefix,
+                                      "lib",
+                                      "python")      # + sys.version[:3] ???
+            # end if self.install_lib ...
+
+            if self.install_platlib is None:
+                if self.exec_prefix == sys_exec_prefix:
+                    self.install_platlib = \
+                        os.path.join (effective_prefix,
+                                      "lib",
+                                      "python" + sys.version[:3],
+                                      "site-packages")
+                else:
+                    self.install_platlib = \
+                        os.path.join (effective_prefix,
+                                      "lib",
+                                      "python")      # + sys.version[:3] ???
+            # end if self.install_platlib ...
+
         else:
-            self.base = self.prefix
-            self.platbase = self.exec_prefix
-        
-        # 'path_file' and 'extra_dirs' are how we handle distributions
-        # that need to be installed to their own directory, but aren't
+            raise DistutilsPlatformError, \
+                  "duh, I'm clueless (for now) about installing on %s" % os.name
+
+        # end if/else on os.name
+                    
+
+        # 'path_file' and 'extra_dirs' are how we handle distributions that
+        # want to be installed to their own directory, but aren't
         # package-ized yet.  'extra_dirs' is just a directory under
-        # 'base' or 'platbase' where toplevel modules will actually be
-        # installed; 'path_file' is the basename of a .pth file to drop
-        # in 'base' or 'platbase' (depending on the distribution).  Very
-        # often they will be the same, which is why we allow them to be
-        # supplied as a string or 1-tuple as well as a 2-element
-        # comma-separated string or a 2-tuple.
+        # 'install_lib' or 'install_platlib' where top-level modules will
+        # actually be installed; 'path_file' is the basename of a .pth file
+        # to drop in 'install_lib' or 'install_platlib' (depending on the
+        # distribution).  Very often they will be the same, which is why we
+        # allow them to be supplied as a string or 1-tuple as well as a
+        # 2-element comma-separated string or a 2-tuple.
+
+        # XXX this will drop a .pth file in install_{lib,platlib} even if
+        # they're not one of the site-packages directories: this is wrong!
+        # we need to suppress path_file in those cases, and warn if
+        # "install_lib/extra_dirs" is not in sys.path.
+
         if self.install_path is None:
             self.install_path = self.distribution.install_path
 
@@ -214,25 +215,12 @@ def finalize_options (self):
         self.extra_dirs = extra_dirs
 
 
-        if self.install_site_lib is None:
-            self.install_site_lib = os.path.join (self.base,
-                                                  extra_dirs)
-
-        if self.install_site_platlib is None:
-            self.install_site_platlib = os.path.join (self.platbase,
-                                                      extra_dirs)
-
-        #if self.install_scheme == 'site':
-        #    install_lib = self.install_site_lib
-        #    install_platlib = self.install_site_platlib
-        #elif self.install_scheme == 'system':
-        #    install_lib = self.install_lib
-        #    install_platlib = self.install_platlib
-        #else:
-        #    # XXX new exception for this kind of misbehaviour?
-        #    raise DistutilsArgError, \
-        #          "invalid install scheme '%s'" % self.install_scheme
-            
+        # Figure out the build directories, ie. where to install from
+        self.set_peer_option ('build', 'build_base', self.build_base)
+        self.set_undefined_options ('build',
+                                    ('build_base', 'build_base'),
+                                    ('build_lib', 'build_lib'),
+                                    ('build_platlib', 'build_platlib'))
 
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
@@ -240,50 +228,13 @@ def finalize_options (self):
     # finalize_options ()
 
 
-    def replace_sys_prefix (self, config_attr, fallback_postfix, use_exec=0):
-        """Attempts to glean a simple pattern from an installation
-           directory available as a 'sysconfig' attribute: if the
-           directory name starts with the "system prefix" (the one
-           hard-coded in the Makefile and compiled into Python),
-           then replace it with the current installation prefix and
-           return the "relocated" installation directory."""
-
-        from distutils import sysconfig
-
-        if use_exec:
-            sys_prefix = os.path.normpath (sys.exec_prefix)
-            my_prefix = self.exec_prefix
-        else:
-            sys_prefix = os.path.normpath (sys.prefix)
-            my_prefix = self.prefix
-
-        val = getattr (sysconfig, config_attr)
-        if string.find (val, sys_prefix) == 0:
-            # If the sysconfig directory starts with the system prefix,
-            # then we can "relocate" it to the user-supplied prefix --
-            # assuming, of course, it is different from the system prefix.
-
-            if sys_prefix == my_prefix:
-                return val
-            else:
-                return my_prefix + val[len(sys_prefix):]
-
-        else:
-            # Otherwise, just tack the "fallback postfix" onto the
-            # user-specified prefix.
-
-            return apply (os.path.join, (my_prefix,) + fallback_postfix)
-
-    # replace_sys_prefix ()
-    
-
     def run (self):
 
         # Obviously have to build before we can install
         self.run_peer ('build')
 
         # Install modules in two steps: "platform-shared" files (ie. pure
-        # python modules) and platform-specific files (compiled C
+        # Python modules) and platform-specific files (compiled C
         # extensions).  Note that 'install_py' is smart enough to install
         # pure Python modules in the "platlib" directory if we built any
         # extensions.
diff --git a/command/install_ext.py b/command/install_ext.py
index b046dfbf3b..f1a3e24725 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -26,7 +26,7 @@ def initialize_options (self):
     def finalize_options (self):
         self.set_undefined_options ('install',
                                     ('build_platlib', 'build_dir'),
-                                    ('install_site_platlib', 'install_dir'))
+                                    ('install_platlib', 'install_dir'))
 
     def run (self):
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 919873c6f2..ab82e04bf0 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -27,22 +27,12 @@ def initialize_options (self):
 
     def finalize_options (self):
 
-        # Find out from the 'build_ext' command if we were asked to build
-        # any extensions.  If so, that means even pure-Python modules in
-        # this distribution have to be installed to the "platlib"
-        # directory.
-        extensions = self.get_peer_option ('build_ext', 'extensions')
-        if extensions:
-            dir_option = 'install_site_platlib'
-        else:
-            dir_option = 'install_site_lib'
-
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    (dir_option, 'install_dir'),
+                                    ('install_lib', 'install_dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 
@@ -52,8 +42,9 @@ def run (self):
         # Make sure we have "built" all pure Python modules first
         self.run_peer ('build_py')
 
-        # Dump entire contents of the build directory to the installation
-        # directory (that's the beauty of having a build directory!)
+        # Install everything: simply dump the entire contents of the build
+        # directory to the installation directory (that's the beauty of
+        # having a build directory!)
         outfiles = self.copy_tree (self.build_dir, self.install_dir)
                    
         # (Optionally) compile .py to .pyc
@@ -65,7 +56,8 @@ def run (self):
             from py_compile import compile
 
             for f in outfiles:
-                # XXX can't assume this filename mapping!
+                # XXX can't assume this filename mapping! (what if
+                # we're running under "python -O"?)
 
                 # only compile the file if it is actually a .py file
                 if f[-3:] == '.py':
diff --git a/command/install_py.py b/command/install_py.py
index 919873c6f2..ab82e04bf0 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -27,22 +27,12 @@ def initialize_options (self):
 
     def finalize_options (self):
 
-        # Find out from the 'build_ext' command if we were asked to build
-        # any extensions.  If so, that means even pure-Python modules in
-        # this distribution have to be installed to the "platlib"
-        # directory.
-        extensions = self.get_peer_option ('build_ext', 'extensions')
-        if extensions:
-            dir_option = 'install_site_platlib'
-        else:
-            dir_option = 'install_site_lib'
-
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
-                                    (dir_option, 'install_dir'),
+                                    ('install_lib', 'install_dir'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'))
 
@@ -52,8 +42,9 @@ def run (self):
         # Make sure we have "built" all pure Python modules first
         self.run_peer ('build_py')
 
-        # Dump entire contents of the build directory to the installation
-        # directory (that's the beauty of having a build directory!)
+        # Install everything: simply dump the entire contents of the build
+        # directory to the installation directory (that's the beauty of
+        # having a build directory!)
         outfiles = self.copy_tree (self.build_dir, self.install_dir)
                    
         # (Optionally) compile .py to .pyc
@@ -65,7 +56,8 @@ def run (self):
             from py_compile import compile
 
             for f in outfiles:
-                # XXX can't assume this filename mapping!
+                # XXX can't assume this filename mapping! (what if
+                # we're running under "python -O"?)
 
                 # only compile the file if it is actually a .py file
                 if f[-3:] == '.py':

From 06c2f98eb01493396435bb99b6e0264e3888353a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 26 Feb 2000 00:49:40 +0000
Subject: [PATCH 0162/8469] Try to deal with pre-1.5.2 IOError exception
 objects.

---
 core.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index ddd39a2c79..a92bff9573 100644
--- a/core.py
+++ b/core.py
@@ -99,8 +99,12 @@ def setup (**attrs):
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
         except IOError, exc:
-            # is this 1.5.2-specific? 1.5-specific?
-            raise SystemExit, "error: %s: %s" % (exc.filename, exc.strerror)
+            # arg, try to work with Python pre-1.5.2
+            if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
+                raise SystemExit, \
+                      "error: %s: %s" % (exc.filename, exc.strerror)
+            else:
+                raise SystemExit, str (exc)
 
 # setup ()
 

From 23c5fe111b4770b4ec04b5be7fbbd081928df5c4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 01:19:37 +0000
Subject: [PATCH 0163/8469] Build reorg: change 'build_dir' option to
 'build_lib'.

---
 command/build_py.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 7ae207b8cc..05a1beff4e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -19,19 +19,19 @@ class build_py (Command):
     description = "\"build\" pure Python modules (copy to build directory)"
 
     user_options = [
-        ('build-dir=', 'd', "directory for platform-shared files"),
+        ('build-lib=', 'd', "directory to \"build\" (copy) to"),
         ]
 
 
     def initialize_options (self):
-        self.build_dir = None
+        self.build_lib = None
         self.modules = None
         self.package = None
         self.package_dir = None
 
     def finalize_options (self):
         self.set_undefined_options ('build',
-                                    ('build_lib', 'build_dir'))
+                                    ('build_lib', 'build_lib'))
 
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.
@@ -259,11 +259,11 @@ def build_module (self, module, module_file, package):
                   "'package' must be a string (dot-separated), list, or tuple"
 
         # Now put the module source file into the "build" area -- this is
-        # easy, we just copy it somewhere under self.build_dir (the build
+        # easy, we just copy it somewhere under self.build_lib (the build
         # directory for Python source).
         outfile_path = list (package)
         outfile_path.append (module + ".py")
-        outfile_path.insert (0, self.build_dir)
+        outfile_path.insert (0, self.build_lib)
         outfile = apply (os.path.join, outfile_path)
 
         dir = os.path.dirname (outfile)
@@ -277,9 +277,9 @@ def build_modules (self):
         for (module, package, module_file) in modules:
 
             # Now "build" the module -- ie. copy the source file to
-            # self.build_dir (the build directory for Python source).
+            # self.build_lib (the build directory for Python source).
             # (Actually, it gets copied to the directory for this package
-            # under self.build_dir.)
+            # under self.build_lib.)
             self.build_module (module, module_file, package)
 
     # build_modules ()
@@ -300,7 +300,7 @@ def build_packages (self):
             modules = self.find_package_modules (package, package_dir)
 
             # Now loop over the modules we found, "building" each one (just
-            # copy it to self.build_dir).
+            # copy it to self.build_lib).
             for (module, module_file) in modules:
                 self.build_module (module, module_file, package)
 

From 403c4a31e1ceb3e900a8e1241d5ab9e1093d0171 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 01:26:45 +0000
Subject: [PATCH 0164/8469] Build reorg:   * 'build_lib' -> 'build_purelib'   *
 new 'build_lib' and 'build_temp' options   * use 'get_platform()' to
 initialize 'build_platlib' and 'build_temp'

---
 command/build.py | 55 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/command/build.py b/command/build.py
index 28241e104f..e25ef81cad 100644
--- a/command/build.py
+++ b/command/build.py
@@ -6,9 +6,9 @@
 
 __rcsid__ = "$Id$"
 
-import os
+import sys, os
 from distutils.core import Command
-
+from distutils.util import get_platform
 
 class build (Command):
 
@@ -17,10 +17,15 @@ class build (Command):
     user_options = [
         ('build-base=', 'b',
          "base directory for build library"),
-        ('build-lib=', 'l',
-         "directory for platform-shared files"),
-        ('build-platlib=', 'p',
-         "directory for platform-specific files"),
+        ('build-purelib=', None,
+         "build directory for platform-neutral distributions"),
+        ('build-platlib=', None,
+         "build directory for platform-specific distributions"),
+        ('build-lib=', None,
+         "build directory for all distribution (defaults to either " +
+         "build-purelib or build-platlib"),
+        ('build-temp=', 't',
+         "temporary build directory"),
         ('debug', 'g',
          "compile extensions and libraries with debugging information"),
         ]
@@ -29,17 +34,43 @@ def initialize_options (self):
         self.build_base = 'build'
         # these are decided only after 'build_base' has its final value
         # (unless overridden by the user or client)
-        self.build_lib = None
+        self.build_purelib = None
         self.build_platlib = None
+        self.build_lib = None
+        self.build_temp = None
         self.debug = None
 
     def finalize_options (self):
-        # 'build_lib' and 'build_platlib' just default to 'lib' and
-        # 'platlib' under the base build directory
-        if self.build_lib is None:
-            self.build_lib = os.path.join (self.build_base, 'lib')
+
+        # Need this to name platform-specific directories, but sys.platform
+        # is not enough -- it only names the OS and version, not the
+        # hardware architecture!
+        self.plat = get_platform ()
+
+        # 'build_purelib' and 'build_platlib' just default to 'lib' and
+        # 'lib.<plat>' under the base build directory.  We only use one of
+        # them for a given distribution, though --
+        if self.build_purelib is None:
+            self.build_purelib = os.path.join (self.build_base, 'lib')
         if self.build_platlib is None:
-            self.build_platlib = os.path.join (self.build_base, 'platlib')
+            self.build_platlib = os.path.join (self.build_base,
+                                               'lib.' + self.plat)
+
+        # 'build_lib' is the actual directory that we will use for this
+        # particular module distribution -- if user didn't supply it, pick
+        # one of 'build_purelib' or 'build_platlib'.
+        if self.build_lib is None:
+            if self.distribution.ext_modules:
+                self.build_lib = self.build_platlib
+            else:
+                self.build_lib = self.build_purelib
+
+        # 'build_temp' -- temporary directory for compiler turds,
+        # "build/temp.<plat>"
+        if self.build_temp is None:
+            self.build_temp = os.path.join (self.build_base,
+                                            'temp.' + self.plat)
+    # finalize_options ()
 
 
     def run (self):

From d762d7cd369f81c7e0a359929d90a8a617d8dfeb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 01:43:28 +0000
Subject: [PATCH 0165/8469] Build reorg:   * 'build_dir' -> 'build_lib', which
 by default takes its value     straight from 'build_lib' in the 'build'
 command   * added 'build_temp' and 'inplace' options   * change
 'build_extensions()' to put object files (compiler turds) in     'build_temp'
 dir   * complicated the name-of-extension-file shenanigans in    
 'build_extensions()' to support "in-place" extension building, i.e.     put
 the extension right into the source tree (handy for developers)   * added
 'get_ext_fullname()', renamed 'extension_filename()' to    
 'get_ext_filename()', and tweaked the latter a bit -- all to support     the
 new filename shenanigans

---
 command/build_ext.py | 57 +++++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8ed3a97339..2bbd89d891 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -43,8 +43,13 @@ class build_ext (Command):
     #     in between initialize_options() and finalize_options())
 
     user_options = [
-        ('build-dir=', 'd',
+        ('build-lib=', 'b',
          "directory for compiled extension modules"),
+        ('build-temp=', 't',
+         "directory for temporary files (build by-products)"),
+        ('inplace', 'i',
+         "ignore build-lib and put compiled extensions into the source" +
+         "directory alongside your pure Python modules"),
         ('include-dirs=', 'I',
          "list of directories to search for header files"),
         ('define=', 'D',
@@ -66,7 +71,9 @@ class build_ext (Command):
 
     def initialize_options (self):
         self.extensions = None
-        self.build_dir = None
+        self.build_lib = None
+        self.build_temp = None
+        self.inplace = 0
         self.package = None
 
         self.include_dirs = None
@@ -83,7 +90,8 @@ def finalize_options (self):
         from distutils import sysconfig
 
         self.set_undefined_options ('build',
-                                    ('build_platlib', 'build_dir'),
+                                    ('build_lib', 'build_lib'),
+                                    ('build_temp', 'build_temp'),
                                     ('debug', 'debug'))
 
         if self.package is None:
@@ -227,15 +235,15 @@ def build_extensions (self, extensions):
             # precedent!)
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
-            self.compiler.compile (sources,
-                                   macros=macros,
-                                   include_dirs=include_dirs,
-                                   debug=self.debug)
+            objects = self.compiler.compile (sources,
+                                             output_dir=self.build_temp,
+                                             macros=macros,
+                                             include_dirs=include_dirs,
+                                             debug=self.debug)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things
             # that go into the mix.
-            objects = self.compiler.object_filenames (sources)
             extra_objects = build_info.get ('extra_objects')
             if extra_objects:
                 objects.extend (extra_objects)
@@ -257,12 +265,25 @@ def build_extensions (self, extensions):
                 else:
                     modname = string.split (extension_name, '.')[-1]
                     extra_args.append('/export:init%s'%modname)
+            # end if MSVC
+
+            fullname = self.get_ext_fullname (extension_name)
+            if self.inplace:
+                # ignore build-lib -- put the compiled extension into
+                # the source tree along with pure Python modules
+
+                modpath = string.split (fullname, '.')
+                package = string.join (modpath[0:-1], '.')
+                base = modpath[-1]
+
+                build_py = self.find_peer ('build_py')
+                package_dir = build_py.get_package_dir (package)
+                ext_filename = os.path.join (package_dir,
+                                             self.get_ext_filename(base))
+            else:
+                ext_filename = os.path.join (self.build_lib,
+                                             self.get_ext_filename(fullname))
 
-            ext_filename = self.extension_filename \
-                           (extension_name, self.package)
-            ext_filename = os.path.join (self.build_dir, ext_filename)
-            dest_dir = os.path.dirname (ext_filename)
-            self.mkpath (dest_dir)
             self.compiler.link_shared_object (objects, ext_filename, 
                                               libraries=libraries,
                                               library_dirs=library_dirs,
@@ -272,10 +293,14 @@ def build_extensions (self, extensions):
     # build_extensions ()
 
 
-    def extension_filename (self, ext_name, package=None):
+    def get_ext_fullname (self, ext_name):
+        if self.package is None:
+            return ext_name
+        else:
+            return self.package + '.' + ext_name
+
+    def get_ext_filename (self, ext_name):
         from distutils import sysconfig
-        if package:
-            ext_name = package + '.' + ext_name
         ext_path = string.split (ext_name, '.')
         return apply (os.path.join, ext_path) + sysconfig.SO
 

From f5aaad4ab595030d314a3f2d815f3533ba7364e9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 14:40:15 +0000
Subject: [PATCH 0166/8469] Added 'get_platform()' to construct a string that
 identifies the current platform, using 'os.uname()' or 'sys.platform'.

---
 util.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 58d58439e0..641a35af8d 100644
--- a/util.py
+++ b/util.py
@@ -11,7 +11,7 @@
 
 __rcsid__ = "$Id$"
 
-import os
+import os, string
 from distutils.errors import *
 
 
@@ -437,3 +437,21 @@ def write_file (filename, contents):
     for line in contents:
         f.write (line + "\n")
     f.close ()
+
+
+def get_platform ():
+    """Return a string (suitable for tacking onto directory names) that
+       identifies the current platform.  Under Unix, identifies both the OS
+       and hardware architecture, e.g. "linux-i586", "solaris-sparc",
+       "irix-mips".  For Windows and Mac OS, just returns 'sys.platform' --
+       i.e. "???" or "???"."""
+
+    if os.name == 'posix':
+        uname = os.uname()
+        OS = uname[0]
+        arch = uname[4]
+        return "%s-%s" % (string.lower (OS), string.lower (arch))
+    else:
+        return sys.platform
+
+# get_platform()

From 8aea04d670e4b002754734358b5ebdfda20d8666 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 14:42:07 +0000
Subject: [PATCH 0167/8469] Added call to 'ensure_ready()' on the command
 object in 'Distribution.find_command_obj()'.

---
 core.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core.py b/core.py
index a92bff9573..83a98a84d6 100644
--- a/core.py
+++ b/core.py
@@ -506,6 +506,7 @@ def find_command_obj (self, command, create=1):
         cmd_obj = self.command_obj.get (command)
         if not cmd_obj and create:
             cmd_obj = self.create_command_obj (command)
+            cmd_obj.ensure_ready ()
             self.command_obj[command] = cmd_obj
 
         return cmd_obj

From bacc83b29ce5519b298bcb9ec9d558a2fec94701 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 14:43:12 +0000
Subject: [PATCH 0168/8469] Added 'mkpath()' method: convenience wrapper around
 'util.mkpath()' that adds the compiler objects 'verbose' and 'dry_run' flags.

---
 ccompiler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 7d2d9f58b7..72b77573c6 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -12,7 +12,7 @@
 from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
-from distutils.util import move_file
+from distutils.util import move_file, mkpath
 
 
 class CCompiler:
@@ -453,6 +453,9 @@ def spawn (self, cmd):
     def move_file (self, src, dst):
         return move_file (src, dst, verbose=self.verbose, dry_run=self.dry_run)
 
+    def mkpath (self, name, mode=0777):
+        mkpath (name, mode, self.verbose, self.dry_run)
+
 
 # class CCompiler
 

From cbad9d0a7c7889f0593b839d4a87966fd54e5a81 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 1 Mar 2000 14:43:49 +0000
Subject: [PATCH 0169/8469] In compile/link methods: ensure that the directory
 we expect to be writing to exists before calling the compiler/linker.

---
 unixccompiler.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 770a543c75..77d12d32bc 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -159,6 +159,8 @@ def compile (self,
         if extra_postargs is None:
             extra_postargs = []
 
+        if output_dir is not None:
+            self.mkpath (output_dir)
         for (source,object) in srcobj:
             self.spawn ([self.cc] + cc_args +
                         [source, '-o', object] +
@@ -167,7 +169,7 @@ def compile (self,
         # Have to re-fetch list of object filenames, because we want to
         # return *all* of them, including those that weren't recompiled on
         # this call!
-        return self.object_filenames (orig_sources, output_dir)
+        return self.object_filenames (orig_sources, output_dir=output_dir)
 
 
     def _fix_link_args (self, output_dir, libraries, library_dirs):
@@ -226,6 +228,7 @@ def link_static_lib (self,
                 newer = newer_group (objects, output_filename)
 
         if self.force or newer:
+            self.mkpath (os.path.dirname (output_filename))
             self.spawn ([self.archiver,
                          self.archiver_options,
                          output_filename] +
@@ -298,6 +301,7 @@ def link_shared_object (self,
                 ld_args[:0] = extra_preargs
             if extra_postargs:
                 ld_args.extend (extra_postargs)
+            self.mkpath (os.path.dirname (output_filename))
             self.spawn ([self.ld_shared] + ld_args)
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
@@ -340,6 +344,7 @@ def link_executable (self,
                 ld_args[:0] = extra_preargs
             if extra_postargs:
                 ld_args.extend (extra_postargs)
+            self.mkpath (os.path.dirname (output_filename))
             self.spawn ([self.ld_exec] + ld_args)
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)

From 872379e98b29803bb5ec360686fe3365456c7313 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 2 Mar 2000 01:21:54 +0000
Subject: [PATCH 0170/8469] In the 'compile()' method: preserve the directory
 portion of source filenames when constructing object filenames, even if
 output_dir given -- eg. "foo/bar.c" will compile to "foo/bar.o" without an
 output_dir, and to "temp/foo/bar.o" if output_dir is "temp".

---
 unixccompiler.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 77d12d32bc..518132f670 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -100,6 +100,7 @@ def __init__ (self,
     def compile (self,
                  sources,
                  output_dir=None,
+                 keep_dir=0,
                  macros=None,
                  include_dirs=None,
                  debug=0,
@@ -134,7 +135,11 @@ def compile (self,
         # don't have to recompile.  (Simplistic check -- we just compare the
         # source and object file, no deep dependency checking involving
         # header files.  Hmmm.)
-        objects = self.object_filenames (sources, output_dir=output_dir)
+        objects = self.object_filenames (sources,
+                                         output_dir=output_dir,
+                                         keep_dir=keep_dir)
+        all_objects = copy (objects)    # preserve full list to return
+
         if not self.force:
             skipped = newer_pairwise (sources, objects)
             for skipped_pair in skipped:
@@ -169,7 +174,7 @@ def compile (self,
         # Have to re-fetch list of object filenames, because we want to
         # return *all* of them, including those that weren't recompiled on
         # this call!
-        return self.object_filenames (orig_sources, output_dir=output_dir)
+        return all_objects
 
 
     def _fix_link_args (self, output_dir, libraries, library_dirs):

From 76ec448446c6c95e8942e53ffc6d5fae0b90a690 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 2 Mar 2000 01:27:36 +0000
Subject: [PATCH 0171/8469] Added command description. Added 'build_clib' and
 'build_temp' options (where to put C libraries   and where to put temporary
 compiler by-products, ie. object files). Moved the call to
 'check_library_list()' from 'run()' to 'finalize_options()'   -- that way, if
 we're going to crash we do so earlier, and we guarantee   that the library
 list is valid before we do anything (not just run). Disallow directory
 separators in library names -- the compiled library   always goes right in
 'build_clib'. Added 'get_library_names()', so the "build_ext" command knows
 what   libraries to link every extension with.

---
 command/build_clib.py | 62 +++++++++++++++++++++++++++++++++----------
 command/build_lib.py  | 62 +++++++++++++++++++++++++++++++++----------
 2 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 9cf53da032..9cb584a1ce 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -28,12 +28,21 @@
 
 class build_lib (Command):
 
+    description = "build C/C++ libraries used by Python extensions"
+
     user_options = [
+        ('build-clib', 'b',
+         "directory to build C/C++ libraries to"),
+        ('build-temp', 't',
+         "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),
         ]
 
     def initialize_options (self):
+        self.build_clib = None
+        self.build_temp = None
+
         # List of libraries to build
         self.libraries = None
 
@@ -45,10 +54,23 @@ def initialize_options (self):
 
     # initialize_options()
 
+
     def finalize_options (self):
+
+        # This might be confusing: both build-clib and build-temp default
+        # to build-temp as defined by the "build" command.  This is because
+        # I think that C libraries are really just temporary build
+        # by-products, at least from the point of view of building Python
+        # extensions -- but I want to keep my options open.
         self.set_undefined_options ('build',
+                                    ('build_temp', 'build_clib'),
+                                    ('build_temp', 'build_temp'),
                                     ('debug', 'debug'))
+
         self.libraries = self.distribution.libraries
+        if self.libraries:
+            self.check_library_list (self.libraries)
+
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if type (self.include_dirs) is StringType:
@@ -65,7 +87,6 @@ def run (self):
 
         if not self.libraries:
             return
-        self.check_library_list (self.libraries)
 
         # Yech -- this is cut 'n pasted from build_ext.py!
         self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
@@ -110,6 +131,12 @@ def check_library_list (self, libraries):
                 raise DistutilsValueError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
+            if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
+                raise DistutilsValueError, \
+                      ("bad library name '%s': " + 
+                       "may not contain directory separators") % \
+                      lib[0]
+
             if type (lib[1]) is not DictionaryType:
                 raise DistutilsValueError, \
                       "second element of each tuple in 'libraries' " + \
@@ -119,6 +146,21 @@ def check_library_list (self, libraries):
     # check_library_list ()
 
 
+    def get_library_names (self):
+        # Assume the library list is valid -- 'check_library_list()' is
+        # called from 'finalize_options()', so it should be!
+
+        if not self.libraries:
+            return None
+
+        lib_names = []
+        for (lib_name, build_info) in self.libraries:
+            lib_names.append (lib_name)
+        return lib_names
+
+    # get_library_names ()
+
+
     def build_libraries (self, libraries):
 
         compiler = self.compiler
@@ -134,35 +176,27 @@ def build_libraries (self, libraries):
 
             self.announce ("building '%s' library" % lib_name)
 
-            # Extract the directory the library is intended to go in --
-            # note translation from "universal" slash-separated form to
-            # current platform's pathname convention (so we can use the
-            # string for actual filesystem use).
-            path = tuple (string.split (lib_name, '/')[:-1])
-            if path:
-                lib_dir = apply (os.path.join, path)
-            else:
-                lib_dir = ''
-
             # First, compile the source code to object files in the library
             # directory.  (This should probably change to putting object
             # files in a temporary build directory.)
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
             objects = self.compiler.compile (sources,
+                                             output_dir=self.build_temp,
+                                             keep_dir=1,
                                              macros=macros,
                                              include_dirs=include_dirs,
-                                             output_dir=lib_dir,
                                              debug=self.debug)
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name, debug=self.debug)
+            self.compiler.link_static_lib (objects, lib_name,
+                                           output_dir=self.build_clib,
+                                           debug=self.debug)
 
         # for libraries
 
     # build_libraries ()
-                
 
 # class BuildLib
diff --git a/command/build_lib.py b/command/build_lib.py
index 9cf53da032..9cb584a1ce 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -28,12 +28,21 @@
 
 class build_lib (Command):
 
+    description = "build C/C++ libraries used by Python extensions"
+
     user_options = [
+        ('build-clib', 'b',
+         "directory to build C/C++ libraries to"),
+        ('build-temp', 't',
+         "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),
         ]
 
     def initialize_options (self):
+        self.build_clib = None
+        self.build_temp = None
+
         # List of libraries to build
         self.libraries = None
 
@@ -45,10 +54,23 @@ def initialize_options (self):
 
     # initialize_options()
 
+
     def finalize_options (self):
+
+        # This might be confusing: both build-clib and build-temp default
+        # to build-temp as defined by the "build" command.  This is because
+        # I think that C libraries are really just temporary build
+        # by-products, at least from the point of view of building Python
+        # extensions -- but I want to keep my options open.
         self.set_undefined_options ('build',
+                                    ('build_temp', 'build_clib'),
+                                    ('build_temp', 'build_temp'),
                                     ('debug', 'debug'))
+
         self.libraries = self.distribution.libraries
+        if self.libraries:
+            self.check_library_list (self.libraries)
+
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if type (self.include_dirs) is StringType:
@@ -65,7 +87,6 @@ def run (self):
 
         if not self.libraries:
             return
-        self.check_library_list (self.libraries)
 
         # Yech -- this is cut 'n pasted from build_ext.py!
         self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
@@ -110,6 +131,12 @@ def check_library_list (self, libraries):
                 raise DistutilsValueError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
+            if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
+                raise DistutilsValueError, \
+                      ("bad library name '%s': " + 
+                       "may not contain directory separators") % \
+                      lib[0]
+
             if type (lib[1]) is not DictionaryType:
                 raise DistutilsValueError, \
                       "second element of each tuple in 'libraries' " + \
@@ -119,6 +146,21 @@ def check_library_list (self, libraries):
     # check_library_list ()
 
 
+    def get_library_names (self):
+        # Assume the library list is valid -- 'check_library_list()' is
+        # called from 'finalize_options()', so it should be!
+
+        if not self.libraries:
+            return None
+
+        lib_names = []
+        for (lib_name, build_info) in self.libraries:
+            lib_names.append (lib_name)
+        return lib_names
+
+    # get_library_names ()
+
+
     def build_libraries (self, libraries):
 
         compiler = self.compiler
@@ -134,35 +176,27 @@ def build_libraries (self, libraries):
 
             self.announce ("building '%s' library" % lib_name)
 
-            # Extract the directory the library is intended to go in --
-            # note translation from "universal" slash-separated form to
-            # current platform's pathname convention (so we can use the
-            # string for actual filesystem use).
-            path = tuple (string.split (lib_name, '/')[:-1])
-            if path:
-                lib_dir = apply (os.path.join, path)
-            else:
-                lib_dir = ''
-
             # First, compile the source code to object files in the library
             # directory.  (This should probably change to putting object
             # files in a temporary build directory.)
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
             objects = self.compiler.compile (sources,
+                                             output_dir=self.build_temp,
+                                             keep_dir=1,
                                              macros=macros,
                                              include_dirs=include_dirs,
-                                             output_dir=lib_dir,
                                              debug=self.debug)
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name, debug=self.debug)
+            self.compiler.link_static_lib (objects, lib_name,
+                                           output_dir=self.build_clib,
+                                           debug=self.debug)
 
         # for libraries
 
     # build_libraries ()
-                
 
 # class BuildLib

From 720accdc1c3e3d7926cfd26d58c368b87b551c12 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 2 Mar 2000 01:32:21 +0000
Subject: [PATCH 0172/8469] If the "build_lib" command built any C libraries,
 link with them all   when building extensions (uses build_lib's
 'get_library_names()' method). Ensure that the relative structure of source
 filenames is preserved in   the temporary build tree, eg. foo/bar.c compiles
 to   build/temp.<plat>/foo/bar.o.

---
 command/build_ext.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2bbd89d891..fd5cd7a53a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -164,7 +164,15 @@ def run (self):
             self.compiler.set_runtime_library_dirs (self.rpath)
         if self.link_objects is not None:
             self.compiler.set_link_objects (self.link_objects)
-                                      
+
+        if self.distribution.libraries:
+            build_lib = self.find_peer ('build_lib')
+            self.libraries = build_lib.get_library_names () or []
+            self.library_dirs = [build_lib.build_clib]
+        else:
+            self.libraries = []
+            self.library_dirs = []
+
         # Now the real loop over extensions
         self.build_extensions (self.extensions)
 
@@ -237,6 +245,7 @@ def build_extensions (self, extensions):
             include_dirs = build_info.get ('include_dirs')
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
+                                             keep_dir=1,
                                              macros=macros,
                                              include_dirs=include_dirs,
                                              debug=self.debug)
@@ -247,8 +256,8 @@ def build_extensions (self, extensions):
             extra_objects = build_info.get ('extra_objects')
             if extra_objects:
                 objects.extend (extra_objects)
-            libraries = build_info.get ('libraries')
-            library_dirs = build_info.get ('library_dirs')
+            libraries = self.libraries + build_info.get ('libraries')
+            library_dirs = self.library_dirs + build_info.get ('library_dirs')
             extra_args = build_info.get ('extra_link_args') or []
 
             if self.compiler.compiler_type == 'msvc':

From 41b233728bac2f952bf2cc9b5ffb19409b9a48e9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 2 Mar 2000 01:49:45 +0000
Subject: [PATCH 0173/8469] Changed '__rcsid__' to '__revision__'.

---
 __init__.py            | 2 +-
 ccompiler.py           | 2 +-
 command/__init__.py    | 2 +-
 command/build.py       | 2 +-
 command/build_clib.py  | 2 +-
 command/build_ext.py   | 2 +-
 command/build_lib.py   | 2 +-
 command/build_py.py    | 2 +-
 command/install.py     | 2 +-
 command/install_ext.py | 2 +-
 command/install_lib.py | 2 +-
 command/install_py.py  | 2 +-
 command/sdist.py       | 2 +-
 core.py                | 2 +-
 errors.py              | 2 +-
 fancy_getopt.py        | 2 +-
 msvccompiler.py        | 2 +-
 spawn.py               | 2 +-
 unixccompiler.py       | 2 +-
 util.py                | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/__init__.py b/__init__.py
index 18deaadf44..1f23b972e4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,4 +8,4 @@
    setup (...)
 """
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
diff --git a/ccompiler.py b/ccompiler.py
index 72b77573c6..4819b23c3c 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -5,7 +5,7 @@
 
 # created 1999/07/05, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os
 from types import *
diff --git a/command/__init__.py b/command/__init__.py
index ea979f9b50..40595ba949 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -13,7 +13,7 @@
 
 but this list will undoubtedly grow with time."""
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 __all__ = ['build',
            'build_py',
diff --git a/command/build.py b/command/build.py
index e25ef81cad..d81bc88511 100644
--- a/command/build.py
+++ b/command/build.py
@@ -4,7 +4,7 @@
 
 # created 1999/03/08, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os
 from distutils.core import Command
diff --git a/command/build_clib.py b/command/build_clib.py
index 9cb584a1ce..955cf5650c 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -7,7 +7,7 @@
 # created (an empty husk) 1999/12/18, Greg Ward
 # fleshed out 2000/02/03-04
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 
 # XXX this module has *lots* of code ripped-off quite transparently from
diff --git a/command/build_ext.py b/command/build_ext.py
index fd5cd7a53a..6da02fedfa 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -6,7 +6,7 @@
 
 # created 1999/08/09, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os, string, re
 from types import *
diff --git a/command/build_lib.py b/command/build_lib.py
index 9cb584a1ce..955cf5650c 100644
--- a/command/build_lib.py
+++ b/command/build_lib.py
@@ -7,7 +7,7 @@
 # created (an empty husk) 1999/12/18, Greg Ward
 # fleshed out 2000/02/03-04
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 
 # XXX this module has *lots* of code ripped-off quite transparently from
diff --git a/command/build_py.py b/command/build_py.py
index 05a1beff4e..2d0ad1ce09 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -4,7 +4,7 @@
 
 # created 1999/03/08, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, string, os
 from types import *
diff --git a/command/install.py b/command/install.py
index a89bc0259f..1df558434a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,7 +4,7 @@
 
 # created 1999/03/13, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os, string
 from types import *
diff --git a/command/install_ext.py b/command/install_ext.py
index f1a3e24725..8d23fa4cde 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -4,7 +4,7 @@
 
 # created 1999/09/12, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 from distutils.core import Command
 from distutils.util import copy_tree
diff --git a/command/install_lib.py b/command/install_lib.py
index ab82e04bf0..33cf6894e2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,6 +1,6 @@
 # created 1999/03/13, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, string
 from distutils.core import Command
diff --git a/command/install_py.py b/command/install_py.py
index ab82e04bf0..33cf6894e2 100644
--- a/command/install_py.py
+++ b/command/install_py.py
@@ -1,6 +1,6 @@
 # created 1999/03/13, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, string
 from distutils.core import Command
diff --git a/command/sdist.py b/command/sdist.py
index 6b838bdef2..726458a246 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -4,7 +4,7 @@
 
 # created 1999/09/22, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os, string, re
 import fnmatch
diff --git a/core.py b/core.py
index 83a98a84d6..a31e60ce4a 100644
--- a/core.py
+++ b/core.py
@@ -8,7 +8,7 @@
 
 # created 1999/03/01, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os
 import string, re
diff --git a/errors.py b/errors.py
index 17d1abc796..86d91dd6c0 100644
--- a/errors.py
+++ b/errors.py
@@ -10,7 +10,7 @@
 
 # created 1999/03/03, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import types
 
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 86e9f326ad..3110ab30db 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -10,7 +10,7 @@
 
 # created 1999/03/03, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, string, re
 from types import *
diff --git a/msvccompiler.py b/msvccompiler.py
index e489c1c86e..2dd8dc10ca 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -6,7 +6,7 @@
 
 # created 1999/08/19, Perry Stoll
 # 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import os
 import sys
diff --git a/spawn.py b/spawn.py
index 9a88ac8987..847346cc2f 100644
--- a/spawn.py
+++ b/spawn.py
@@ -5,7 +5,7 @@
 
 # created 1999/07/24, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import sys, os, string
 from distutils.errors import *
diff --git a/unixccompiler.py b/unixccompiler.py
index 518132f670..7765faf88b 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 # created 1999/07/05, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import string, re, os
 from types import *
diff --git a/util.py b/util.py
index 641a35af8d..85f3a345e6 100644
--- a/util.py
+++ b/util.py
@@ -9,7 +9,7 @@
 
 # created 1999/03/08, Greg Ward
 
-__rcsid__ = "$Id$"
+__revision__ = "$Id$"
 
 import os, string
 from distutils.errors import *

From e67e55e012bc55359655cabd78e2bf9e4ec0d340 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 2 Mar 2000 01:57:12 +0000
Subject: [PATCH 0174/8469] Renamed 'build_lib' command to 'build_clib':   *
 replaced build_lib.py with build_clib.py   * renamed the class in
 build_clib.py   * changed all references to 'build_lib' command in other
 command classes

---
 command/build.py      |   2 +-
 command/build_clib.py |   6 +-
 command/build_ext.py  |   6 +-
 command/build_lib.py  | 202 ------------------------------------------
 4 files changed, 7 insertions(+), 209 deletions(-)
 delete mode 100644 command/build_lib.py

diff --git a/command/build.py b/command/build.py
index d81bc88511..97466fdb48 100644
--- a/command/build.py
+++ b/command/build.py
@@ -87,7 +87,7 @@ def run (self):
         # be needed by extension modules, so obviously have to be done
         # first!
         if self.distribution.libraries:
-            self.run_peer ('build_lib')
+            self.run_peer ('build_clib')
 
         # And now 'build_ext' -- compile extension modules and put them
         # into the build tree
diff --git a/command/build_clib.py b/command/build_clib.py
index 955cf5650c..7a6ef7a802 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -1,6 +1,6 @@
-"""distutils.command.build_lib
+"""distutils.command.build_clib
 
-Implements the Distutils 'build_lib' command, to build a C/C++ library
+Implements the Distutils 'build_clib' command, to build a C/C++ library
 that is included in the module distribution and needed by an extension
 module."""
 
@@ -26,7 +26,7 @@
 from distutils.ccompiler import new_compiler
 
 
-class build_lib (Command):
+class build_clib (Command):
 
     description = "build C/C++ libraries used by Python extensions"
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 6da02fedfa..bbdf062bd6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -166,9 +166,9 @@ def run (self):
             self.compiler.set_link_objects (self.link_objects)
 
         if self.distribution.libraries:
-            build_lib = self.find_peer ('build_lib')
-            self.libraries = build_lib.get_library_names () or []
-            self.library_dirs = [build_lib.build_clib]
+            build_clib = self.find_peer ('build_clib')
+            self.libraries = build_clib.get_library_names () or []
+            self.library_dirs = [build_clib.build_clib]
         else:
             self.libraries = []
             self.library_dirs = []
diff --git a/command/build_lib.py b/command/build_lib.py
deleted file mode 100644
index 955cf5650c..0000000000
--- a/command/build_lib.py
+++ /dev/null
@@ -1,202 +0,0 @@
-"""distutils.command.build_lib
-
-Implements the Distutils 'build_lib' command, to build a C/C++ library
-that is included in the module distribution and needed by an extension
-module."""
-
-# created (an empty husk) 1999/12/18, Greg Ward
-# fleshed out 2000/02/03-04
-
-__revision__ = "$Id$"
-
-
-# XXX this module has *lots* of code ripped-off quite transparently from
-# build_ext.py -- not surprisingly really, as the work required to build
-# a static library from a collection of C source files is not really all
-# that different from what's required to build a shared object file from
-# a collection of C source files.  Nevertheless, I haven't done the
-# necessary refactoring to account for the overlap in code between the
-# two modules, mainly because a number of subtle details changed in the
-# cut 'n paste.  Sigh.
-
-import os, string
-from types import *
-from distutils.core import Command
-from distutils.errors import *
-from distutils.ccompiler import new_compiler
-
-
-class build_lib (Command):
-
-    description = "build C/C++ libraries used by Python extensions"
-
-    user_options = [
-        ('build-clib', 'b',
-         "directory to build C/C++ libraries to"),
-        ('build-temp', 't',
-         "directory to put temporary build by-products"),
-        ('debug', 'g',
-         "compile with debugging information"),
-        ]
-
-    def initialize_options (self):
-        self.build_clib = None
-        self.build_temp = None
-
-        # List of libraries to build
-        self.libraries = None
-
-        # Compilation options for all libraries
-        self.include_dirs = None
-        self.define = None
-        self.undef = None
-        self.debug = None
-
-    # initialize_options()
-
-
-    def finalize_options (self):
-
-        # This might be confusing: both build-clib and build-temp default
-        # to build-temp as defined by the "build" command.  This is because
-        # I think that C libraries are really just temporary build
-        # by-products, at least from the point of view of building Python
-        # extensions -- but I want to keep my options open.
-        self.set_undefined_options ('build',
-                                    ('build_temp', 'build_clib'),
-                                    ('build_temp', 'build_temp'),
-                                    ('debug', 'debug'))
-
-        self.libraries = self.distribution.libraries
-        if self.libraries:
-            self.check_library_list (self.libraries)
-
-        if self.include_dirs is None:
-            self.include_dirs = self.distribution.include_dirs or []
-        if type (self.include_dirs) is StringType:
-            self.include_dirs = string.split (self.include_dirs,
-                                              os.pathsep)
-
-        # XXX same as for build_ext -- what about 'self.define' and
-        # 'self.undef' ?
-
-    # finalize_options()
-
-
-    def run (self):
-
-        if not self.libraries:
-            return
-
-        # Yech -- this is cut 'n pasted from build_ext.py!
-        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
-                                      verbose=self.verbose,
-                                      dry_run=self.dry_run,
-                                      force=self.force)
-        if self.include_dirs is not None:
-            self.compiler.set_include_dirs (self.include_dirs)
-        if self.define is not None:
-            # 'define' option is a list of (name,value) tuples
-            for (name,value) in self.define:
-                self.compiler.define_macro (name, value)
-        if self.undef is not None:
-            for macro in self.undef:
-                self.compiler.undefine_macro (macro)
-
-        self.build_libraries (self.libraries)
-
-    # run()
-
-
-    def check_library_list (self, libraries):
-        """Ensure that the list of libraries (presumably provided as a
-           command option 'libraries') is valid, i.e. it is a list of
-           2-tuples, where the tuples are (library_name, build_info_dict).
-           Raise DistutilsValueError if the structure is invalid anywhere;
-           just returns otherwise."""
-
-        # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
-        # with only names changed to protect the innocent!
-
-        if type (libraries) is not ListType:
-            raise DistutilsValueError, \
-                  "'libraries' option must be a list of tuples"
-
-        for lib in libraries:
-            if type (lib) is not TupleType and len (lib) != 2:
-                raise DistutilsValueError, \
-                      "each element of 'libraries' must a 2-tuple"
-
-            if type (lib[0]) is not StringType:
-                raise DistutilsValueError, \
-                      "first element of each tuple in 'libraries' " + \
-                      "must be a string (the library name)"
-            if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
-                raise DistutilsValueError, \
-                      ("bad library name '%s': " + 
-                       "may not contain directory separators") % \
-                      lib[0]
-
-            if type (lib[1]) is not DictionaryType:
-                raise DistutilsValueError, \
-                      "second element of each tuple in 'libraries' " + \
-                      "must be a dictionary (build info)"
-        # for lib
-
-    # check_library_list ()
-
-
-    def get_library_names (self):
-        # Assume the library list is valid -- 'check_library_list()' is
-        # called from 'finalize_options()', so it should be!
-
-        if not self.libraries:
-            return None
-
-        lib_names = []
-        for (lib_name, build_info) in self.libraries:
-            lib_names.append (lib_name)
-        return lib_names
-
-    # get_library_names ()
-
-
-    def build_libraries (self, libraries):
-
-        compiler = self.compiler
-
-        for (lib_name, build_info) in libraries:
-            sources = build_info.get ('sources')
-            if sources is None or type (sources) not in (ListType, TupleType):
-                raise DistutilsValueError, \
-                      ("in 'libraries' option (library '%s'), " +
-                       "'sources' must be present and must be " +
-                       "a list of source filenames") % lib_name
-            sources = list (sources)
-
-            self.announce ("building '%s' library" % lib_name)
-
-            # First, compile the source code to object files in the library
-            # directory.  (This should probably change to putting object
-            # files in a temporary build directory.)
-            macros = build_info.get ('macros')
-            include_dirs = build_info.get ('include_dirs')
-            objects = self.compiler.compile (sources,
-                                             output_dir=self.build_temp,
-                                             keep_dir=1,
-                                             macros=macros,
-                                             include_dirs=include_dirs,
-                                             debug=self.debug)
-
-            # Now "link" the object files together into a static library.
-            # (On Unix at least, this isn't really linking -- it just
-            # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name,
-                                           output_dir=self.build_clib,
-                                           debug=self.debug)
-
-        # for libraries
-
-    # build_libraries ()
-
-# class BuildLib

From e5881f84002247373f54ef2108e050b03f30fcf2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 3 Mar 2000 03:00:02 +0000
Subject: [PATCH 0175/8469] Fixed 'mkpath()' to accept empty string silently
 (it's just the current dir). Fixed all DistutilsFileError messages to wrap
 file/dir names in quotes.

---
 util.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/util.py b/util.py
index 85f3a345e6..b20f5be92c 100644
--- a/util.py
+++ b/util.py
@@ -39,7 +39,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 
     name = os.path.normpath (name)
 
-    if os.path.isdir (name):
+    if os.path.isdir (name) or name == '':
         return
     if PATH_CREATED.get (name):
         return
@@ -71,7 +71,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
             try:
                 os.mkdir (head)
             except os.error, (errno, errstr):
-                raise DistutilsFileError, "%s: %s" % (head, errstr)
+                raise DistutilsFileError, "'%s': %s" % (head, errstr)
 
         PATH_CREATED[head] = 1
 
@@ -197,19 +197,21 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
         try:
             fsrc = open(src, 'rb')
         except os.error, (errno, errstr):
-            raise DistutilsFileError, "could not open %s: %s" % (src, errstr)
+            raise DistutilsFileError, \
+                  "could not open '%s': %s" % (src, errstr)
         
         try:
             fdst = open(dst, 'wb')
         except os.error, (errno, errstr):
-            raise DistutilsFileError, "could not create %s: %s" % (dst, errstr)
+            raise DistutilsFileError, \
+                  "could not create '%s': %s" % (dst, errstr)
         
         while 1:
             try:
                 buf = fsrc.read (buffer_size)
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
-                      "could not read from %s: %s" % (src, errstr)
+                      "could not read from '%s': %s" % (src, errstr)
             
             if not buf:
                 break
@@ -218,7 +220,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
                 fdst.write(buf)
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
-                      "could not write to %s: %s" % (dst, errstr)
+                      "could not write to '%s': %s" % (dst, errstr)
             
     finally:
         if fdst:
@@ -258,7 +260,7 @@ def copy_file (src, dst,
 
     if not os.path.isfile (src):
         raise DistutilsFileError, \
-              "can't copy %s: not a regular file" % src
+              "can't copy '%s': not a regular file" % src
 
     if os.path.isdir (dst):
         dir = dst
@@ -321,7 +323,7 @@ def copy_tree (src, dst,
 
     if not dry_run and not os.path.isdir (src):
         raise DistutilsFileError, \
-              "cannot copy tree %s: not a directory" % src    
+              "cannot copy tree '%s': not a directory" % src    
     try:
         names = os.listdir (src)
     except os.error, (errno, errstr):
@@ -329,7 +331,7 @@ def copy_tree (src, dst,
             names = []
         else:
             raise DistutilsFileError, \
-                  "error listing files in %s: %s" % (src, errstr)
+                  "error listing files in '%s': %s" % (src, errstr)
 
     if not dry_run:
         mkpath (dst, verbose=verbose)

From bea7ea527619fd6e4360157daea66bb5f7bf946e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 3 Mar 2000 03:00:27 +0000
Subject: [PATCH 0176/8469] Typo fix.

---
 command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 2d0ad1ce09..4e5255a67c 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -146,7 +146,7 @@ def check_package (self, package, package_dir):
                 raise DistutilsFileError, \
                       "package directory '%s' does not exist" % package_dir
             if not os.path.isdir (package_dir):
-                raise DistutilsFileErorr, \
+                raise DistutilsFileError, \
                       ("supposed package directory '%s' exists, " +
                        "but is not a directory") % package_dir
 

From 0b68db614df691a1089dc6c6a290bf0d8b81f424 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 6 Mar 2000 03:36:50 +0000
Subject: [PATCH 0177/8469] Don't pass 'keep_dir' to 'compile()' method of
 CCompiler -- no longer used. Don't assume that the 'libraries' and
 'library_dirs' elements of the   build info dict are always lists.

---
 command/build_ext.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index bbdf062bd6..050a5c65b7 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -245,7 +245,6 @@ def build_extensions (self, extensions):
             include_dirs = build_info.get ('include_dirs')
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
-                                             keep_dir=1,
                                              macros=macros,
                                              include_dirs=include_dirs,
                                              debug=self.debug)
@@ -256,8 +255,10 @@ def build_extensions (self, extensions):
             extra_objects = build_info.get ('extra_objects')
             if extra_objects:
                 objects.extend (extra_objects)
-            libraries = self.libraries + build_info.get ('libraries')
-            library_dirs = self.library_dirs + build_info.get ('library_dirs')
+            libraries = (self.libraries +
+                         (build_info.get ('libraries') or []))
+            library_dirs = (self.library_dirs +
+                            (build_info.get ('library_dirs') or []))
             extra_args = build_info.get ('extra_link_args') or []
 
             if self.compiler.compiler_type == 'msvc':

From 4ffaf24264f6c274ece3c928bdcf717fb12543cd Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 6 Mar 2000 03:37:45 +0000
Subject: [PATCH 0178/8469] Don't pass 'keep_dir' to 'compile()' method of
 CCompiler -- no longer used.

---
 command/build_clib.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 7a6ef7a802..c49e3ca737 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -183,7 +183,6 @@ def build_libraries (self, libraries):
             include_dirs = build_info.get ('include_dirs')
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
-                                             keep_dir=1,
                                              macros=macros,
                                              include_dirs=include_dirs,
                                              debug=self.debug)

From 5696561cb0643ab61ee1e719217ba98f5029f674 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 6 Mar 2000 03:40:29 +0000
Subject: [PATCH 0179/8469] Serious overhaul of the C compiler interface and
 the two classes that implement it (so far):   * moved filename generation
 methods into CCompiler base class,     driven by data supplied by
 implementation classes   * moved a bunch of common code from UnixCCompiler to
 convenience     methods in CCompiler   * overhauled MSVCCompiler's
 compile/link methods to look and act     as much as possible like
 UnixCCompiler's, in order to regularize     both interface and behaviour
 (especially by using those new     convenience methods)

---
 ccompiler.py     | 290 +++++++++++++++++++++++++++++++++++++++--------
 msvccompiler.py  | 235 +++++++++++++++++---------------------
 unixccompiler.py | 237 +++++++++-----------------------------
 3 files changed, 400 insertions(+), 362 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 4819b23c3c..2336e96589 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -12,7 +12,7 @@
 from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
-from distutils.util import move_file, mkpath
+from distutils.util import move_file, mkpath, newer_pairwise, newer_group
 
 
 class CCompiler:
@@ -65,6 +65,18 @@ class CCompiler:
     #     library search path anyways.
     
 
+    # Subclasses that rely on the standard filename generation methods
+    # implemented below should override these; see the comment near
+    # those methods ('object_filenames()' et. al.) for details:
+    src_extensions = None               # list of strings
+    obj_extension = None                # string
+    static_lib_extension = None
+    shared_lib_extension = None         # string
+    static_lib_format = None            # format string
+    shared_lib_format = None            # prob. same as static_lib_format
+    exe_extension = None                # string
+
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -255,6 +267,138 @@ def set_link_objects (self, objects):
         self.objects = copy (objects)
 
 
+    # -- Priviate utility methods --------------------------------------
+    # (here for the convenience of subclasses)
+
+    def _fix_compile_args (self, output_dir, macros, include_dirs):
+        """Typecheck and fix-up some of the arguments to the 'compile()' method,
+           and return fixed-up values.  Specifically: if 'output_dir' is
+           None, replaces it with 'self.output_dir'; ensures that 'macros'
+           is a list, and augments it with 'self.macros'; ensures that
+           'include_dirs' is a list, and augments it with
+           'self.include_dirs'.  Guarantees that the returned values are of
+           the correct type, i.e. for 'output_dir' either string or None,
+           and for 'macros' and 'include_dirs' either list or None."""
+
+        if output_dir is None:
+            output_dir = self.output_dir
+        elif type (output_dir) is not StringType:
+            raise TypeError, "'output_dir' must be a string or None"
+
+        if macros is None:
+            macros = self.macros
+        elif type (macros) is ListType:
+            macros = macros + (self.macros or [])
+        else:
+            raise TypeError, \
+                  "'macros' (if supplied) must be a list of tuples"
+
+        if include_dirs is None:
+            include_dirs = self.include_dirs
+        elif type (include_dirs) in (ListType, TupleType):
+            include_dirs = list (include_dirs) + (self.include_dirs or [])
+        else:
+            raise TypeError, \
+                  "'include_dirs' (if supplied) must be a list of strings"
+                    
+        return (output_dir, macros, include_dirs)
+
+    # _fix_compile_args ()
+
+
+    def _prep_compile (self, sources, output_dir):
+        """Determine the list of object files corresponding to 'sources', and
+           figure out which ones really need to be recompiled.  Return a list
+           of all object files and a dictionary telling which source files can
+           be skipped."""
+
+        # Get the list of expected output (object) files 
+        objects = self.object_filenames (sources,
+                                         output_dir=output_dir)
+
+        if self.force:
+            skip_source = {}            # rebuild everything
+            for source in sources:
+                skip_source[source] = 0
+        else:
+            # Figure out which source files we have to recompile according
+            # to a simplistic check -- we just compare the source and
+            # object file, no deep dependency checking involving header
+            # files.
+            skip_source = {}            # rebuild everything
+            for source in sources:      # no wait, rebuild nothing
+                skip_source[source] = 1
+
+            (n_sources, n_objects) = newer_pairwise (sources, objects)
+            for source in n_sources:    # no really, only rebuild what's out-of-date
+                skip_source[source] = 0
+
+        return (objects, skip_source)
+
+    # _prep_compile ()
+
+
+    def _fix_link_args (self, objects, output_dir,
+                        takes_libs=0, libraries=None, library_dirs=None):
+        """Typecheck and fix up some of the arguments supplied to the
+           'link_*' methods and return the fixed values.  Specifically:
+           ensure that 'objects' is a list; if output_dir is None, use
+           self.output_dir; ensure that 'libraries' and 'library_dirs' are
+           both lists, and augment them with 'self.libraries' and
+           'self.library_dirs'.  If 'takes_libs' is true, return a tuple
+           (objects, output_dir, libraries, library_dirs; else return
+           (objects, output_dir)."""
+
+        if type (objects) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'objects' must be a list or tuple of strings"
+        objects = list (objects)
+            
+        if output_dir is None:
+            output_dir = self.output_dir
+        elif type (output_dir) is not StringType:
+            raise TypeError, "'output_dir' must be a string or None"
+
+        if takes_libs:
+            if libraries is None:
+                libraries = self.libraries
+            elif type (libraries) in (ListType, TupleType):
+                libraries = list (libraries) + (self.libraries or [])
+            else:
+                raise TypeError, \
+                      "'libraries' (if supplied) must be a list of strings"
+
+            if library_dirs is None:
+                library_dirs = self.library_dirs
+            elif type (library_dirs) in (ListType, TupleType):
+                library_dirs = list (library_dirs) + (self.library_dirs or [])
+            else:
+                raise TypeError, \
+                      "'library_dirs' (if supplied) must be a list of strings"
+
+            return (objects, output_dir, libraries, library_dirs)
+        else:
+            return (objects, output_dir)
+
+    # _fix_link_args ()
+
+
+    def _need_link (self, objects, output_file):
+        """Return true if we need to relink the files listed in 'objects' to
+           recreate 'output_file'."""
+
+        if self.force:
+            return 1
+        else:
+            if self.dry_run:
+                newer = newer_group (objects, output_file, missing='newer')
+            else:
+                newer = newer_group (objects, output_file)
+            return newer
+
+    # _need_link ()
+
+
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
 
@@ -268,8 +412,16 @@ def compile (self,
                  extra_postargs=None):
         """Compile one or more C/C++ source files.  'sources' must be
            a list of strings, each one the name of a C/C++ source
-           file.  Return a list of the object filenames generated
-           (one for each source filename in 'sources').
+           file.  Return a list of object filenames, one per source
+           filename in 'sources'.  Depending on the implementation,
+           not all source files will necessarily be compiled, but
+           all corresponding object filenames will be returned.
+
+           If 'output_dir' is given, object files will be put under it,
+           while retaining their original path component.  That is,
+           "foo/bar.c" normally compiles to "foo/bar.o" (for a Unix
+           implementation); if 'output_dir' is "build", then it would
+           compile to "build/foo/bar.o".
 
            'macros', if given, must be a list of macro definitions.  A
            macro definition is either a (name, value) 2-tuple or a (name,)
@@ -285,11 +437,12 @@ def compile (self,
            'debug' is a boolean; if true, the compiler will be instructed
            to output debug symbols in (or alongside) the object file(s).
 
-           'extra_preargs' and 'extra_postargs' are optional lists of extra
-           command-line arguments that will be, respectively, prepended or
-           appended to the generated command line immediately before
-           execution.  These will most likely be peculiar to the particular
-           platform and compiler being worked with, but are a necessary
+           'extra_preargs' and 'extra_postargs' are implementation-
+           dependent.  On platforms that have the notion of a command-line
+           (e.g. Unix, DOS/Windows), they are most likely lists of strings:
+           extra command-line arguments to prepand/append to the compiler
+           command line.  On other platforms, consult the implementation
+           class documentation.  In any event, they are intended as an
            escape hatch for those occasions when the abstract compiler
            framework doesn't cut the mustard."""
            
@@ -398,45 +551,88 @@ def link_executable (self,
 
 
 
-    # -- Filename mangling methods -------------------------------------
-
-    # General principle for the filename-mangling methods: by default,
-    # don't include a directory component, no matter what the caller
-    # supplies.  Eg. for UnixCCompiler, a source file of "foo/bar/baz.c"
-    # becomes "baz.o" or "baz.so", etc.  (That way, it's easiest for the
-    # caller to decide where it wants to put/find the output file.)  The
-    # 'output_dir' parameter overrides this, of course -- the directory
-    # component of the input filenames is replaced by 'output_dir'.
-
-    def object_filenames (self, source_filenames, output_dir=None):
-        """Return the list of object filenames corresponding to each
-           specified source filename."""
-        pass
-
-    def shared_object_filename (self, source_filename):
-        """Return the shared object filename corresponding to a
-           specified source filename (assuming the same directory)."""
-        pass    
-
-    def library_filename (self, libname):
-        """Return the static library filename corresponding to the
-           specified library name."""
-        
-        pass
-
-    def shared_library_filename (self, libname):
-        """Return the shared library filename corresponding to the
-           specified library name."""
-        pass
-
-    # XXX ugh -- these should go!
-    def object_name (self, inname):
-        """Given a name with no extension, return the name + object extension"""
-        return inname + self._obj_ext
+    # -- Filename generation methods -----------------------------------
+
+    # The default implementation of the filename generating methods are
+    # prejudiced towards the Unix/DOS/Windows view of the world:
+    #   * object files are named by replacing the source file extension
+    #     (eg. .c/.cpp -> .o/.obj)
+    #   * library files (shared or static) are named by plugging the
+    #     library name and extension into a format string, eg.
+    #     "lib%s.%s" % (lib_name, ".a") for Unix static libraries
+    #   * executables are named by appending an extension (possibly
+    #     empty) to the program name: eg. progname + ".exe" for
+    #     Windows
+    #
+    # To reduce redundant code, these methods expect to find
+    # several attributes in the current object (presumably defined
+    # as class attributes):
+    #   * src_extensions -
+    #     list of C/C++ source file extensions, eg. ['.c', '.cpp']
+    #   * obj_extension -
+    #     object file extension, eg. '.o' or '.obj'
+    #   * static_lib_extension -
+    #     extension for static library files, eg. '.a' or '.lib'
+    #   * shared_lib_extension -
+    #     extension for shared library/object files, eg. '.so', '.dll'
+    #   * static_lib_format -
+    #     format string for generating static library filenames,
+    #     eg. 'lib%s.%s' or '%s.%s'
+    #   * shared_lib_format
+    #     format string for generating shared library filenames
+    #     (probably same as static_lib_format, since the extension
+    #     is one of the intended parameters to the format string)
+    #   * exe_extension -
+    #     extension for executable files, eg. '' or '.exe'
+
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            (base, ext) = os.path.splitext (src_name)
+            if ext not in self.src_extensions:
+                continue
+            if strip_dir:
+                base = os.path.basename (base)
+            obj_names.append (os.path.join (output_dir,
+                                            base + self.obj_extension))
+        return obj_names
+
+    # object_filenames ()
+
+
+    def shared_object_filename (self,
+                                basename,
+                                strip_dir=0,
+                                output_dir=''):
+        if output_dir is None: output_dir = ''
+        if strip_dir:
+            basename = os.path.basename (basename)
+        return os.path.join (output_dir, basename + self.shared_lib_extension)
+
+
+    def library_filename (self,
+                          libname,
+                          lib_type='static',     # or 'shared'
+                          strip_dir=0,
+                          output_dir=''):
+
+        if output_dir is None: output_dir = ''
+        if lib_type not in ("static","shared"):
+            raise ValueError, "'lib_type' must be \"static\" or \"shared\""
+        fmt = getattr (self, lib_type + "_lib_format")
+        ext = getattr (self, lib_type + "_lib_extension")
+
+        (dir, base) = os.path.split (libname)
+        filename = fmt % (base, ext)
+        if strip_dir:
+            dir = ''
+
+        return os.path.join (output_dir, dir, filename)
 
-    def shared_library_name (self, inname):
-        """Given a name with no extension, return the name + shared object extension"""
-        return inname + self._shared_lib_ext
 
     # -- Utility methods -----------------------------------------------
 
@@ -606,4 +802,4 @@ def gen_lib_options (compiler, library_dirs, libraries):
 
     return lib_opts
 
-# _gen_lib_options ()
+# gen_lib_options ()
diff --git a/msvccompiler.py b/msvccompiler.py
index 2dd8dc10ca..847c611d29 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -5,12 +5,13 @@
 
 
 # created 1999/08/19, Perry Stoll
-# 
+# hacked by Robin Becker and Thomas Heller to do a better job of
+#   finding DevStudio (through the registry)
+
 __revision__ = "$Id$"
 
-import os
-import sys
-import string
+import sys, os, string
+from types import *
 from distutils.errors import *
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -137,6 +138,20 @@ class MSVCCompiler (CCompiler) :
 
     compiler_type = 'msvc'
 
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc','.cpp']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = _c_extensions + _cpp_extensions
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -169,9 +184,7 @@ def __init__ (self,
 
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3' ]
-        self.compile_options_debug = [
-            '/nologo', '/Od', '/MDd', '/W3', '/Z7', '/D_DEBUG'
-            ]
+        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/Z7', '/D_DEBUG']
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         self.ldflags_shared_debug = [
@@ -181,21 +194,7 @@ def __init__ (self,
 
 
     # -- Worker methods ------------------------------------------------
-    # (must be implemented by subclasses)
 
-    _c_extensions = [ '.c' ]
-    _cpp_extensions = [ '.cc', '.cpp' ]
-
-    _obj_ext = '.obj'
-    _exe_ext = '.exe'
-    _shared_lib_ext = '.dll'
-    _static_lib_ext = '.lib'
-
-    # XXX the 'output_dir' parameter is ignored by the methods in this
-    # class!  I just put it in to be consistent with CCompiler and
-    # UnixCCompiler, but someone who actually knows Visual C++ will
-    # have to make it work...
-    
     def compile (self,
                  sources,
                  output_dir=None,
@@ -205,48 +204,43 @@ def compile (self,
                  extra_preargs=None,
                  extra_postargs=None):
 
-        if macros is None:
-            macros = []
-        if include_dirs is None:
-            include_dirs = []
-
-        objectFiles = []
+        (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile (sources, output_dir)
 
-        base_pp_opts = \
-            gen_preprocess_options (self.macros + macros,
-                                    self.include_dirs + include_dirs)
-
-        base_pp_opts.append('/c')
+        if extra_postargs is None:
+            extra_postargs = []
 
+        pp_opts = gen_preprocess_options (macros, include_dirs)
+        compile_opts = extra_preargs or []
+        compile_opts.append ('/c')
         if debug:
-            compile_options = self.compile_options_debug
+            compile_opts.extend (self.compile_options_debug)
         else:
-            compile_options = self.compile_options
+            compile_opts.extend (self.compile_options)
         
-        for srcFile in sources:
-            base,ext = os.path.splitext(srcFile)
-            objFile = base + ".obj"
+        for i in range (len (sources)):
+            src = sources[i] ; obj = objects[i]
+            ext = (os.path.splitext (src))[1]
 
-            if ext in self._c_extensions:
-                fileOpt = "/Tc"
-            elif ext in self._cpp_extensions:
-                fileOpt = "/Tp"
+            if skip_sources[src]:
+                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+            else:
+                if ext in self._c_extensions:
+                    input_opt = "/Tc" + src
+                elif ext in self._cpp_extensions:
+                    input_opt = "/Tp" + src
 
-            inputOpt  = fileOpt + srcFile
-            outputOpt = "/Fo"   + objFile
+                output_opt = "/Fo" + obj
 
-            cc_args = compile_options + \
-                      base_pp_opts + \
-                      [outputOpt, inputOpt]
+                self.mkpath (os.path.dirname (obj))
+                self.spawn ([self.cc] + compile_opts + pp_opts +
+                            [input_opt, output_opt] +
+                            extra_postargs)
 
-            if extra_preargs:
-                cc_args[:0] = extra_preargs
-            if extra_postargs:
-                cc_args.extend (extra_postargs)
+        return objects
 
-            self.spawn ([self.cc] + cc_args)
-            objectFiles.append( objFile )
-        return objectFiles
+    # compile ()
 
 
     # XXX the signature of this method is different from CCompiler and
@@ -263,25 +257,30 @@ def link_static_lib (self,
                          extra_preargs=None,
                          extra_postargs=None):
 
-        if libraries is None:
-            libraries = []
-        if library_dirs is None:
-            library_dirs = []
+        (objects, output_dir, libraries, library_dirs) = \
+            self._fix_link_args (objects, output_dir, takes_libs=1,
+                                 libraries=libraries,
+                                 library_dirs=library_dirs)
         
-        lib_opts = gen_lib_options (self.libraries + libraries,
-                                    self.library_dirs + library_dirs,
-                                    "%s.lib", "/LIBPATH:%s")
-
-        ld_args = self.ldflags_static + lib_opts + \
-                  objects + ['/OUT:' + output_filename]
-        if debug:
-            pass                        # XXX what goes here?
-        if extra_preargs:
-            ld_args[:0] = extra_preargs
-        if extra_postargs:
-            ld_args.extend (extra_postargs)
+        output_filename = \
+            self.library_filename (output_libname, output_dir=output_dir)
+
+        if self._need_link (objects, output_filename):
+            lib_opts = gen_lib_options (libraries, library_dirs,
+                                        "%s.lib", "/LIBPATH:%s")
+            ld_args = self.ldflags_static + lib_opts + \
+                      objects + ['/OUT:' + output_filename]
+            if debug:
+                pass                    # XXX what goes here?
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
+            self.spawn ([self.link] + ld_args)
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
 
-        self.spawn ( [ self.link ] + ld_args )
+    # link_static_lib ()
     
 
     def link_shared_lib (self,
@@ -294,8 +293,6 @@ def link_shared_lib (self,
                          extra_preargs=None,
                          extra_postargs=None):
 
-        # XXX should we sanity check the library name? (eg. no
-        # slashes)
         self.link_shared_object (objects,
                                  self.shared_library_name(output_libname),
                                  output_dir=output_dir,
@@ -315,70 +312,48 @@ def link_shared_object (self,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
-        """Link a bunch of stuff together to create a shared object
-           file.  Much like 'link_shared_lib()', except the output
-           filename is explicitly supplied as 'output_filename'."""
-        if libraries is None:
-            libraries = []
-        if library_dirs is None:
-            library_dirs = []
-        
-        lib_opts = gen_lib_options (self,
-                                    self.library_dirs + library_dirs,
-                                    self.libraries + libraries)
-
-        if debug:
-            ldflags = self.ldflags_shared_debug
-            basename, ext = os.path.splitext (output_filename)
-            #XXX not sure this belongs here
-            # extensions in debug_mode are named 'module_d.pyd'
-            output_filename = basename + '_d' + ext
-        else:
-            ldflags = self.ldflags_shared
-
-        ld_args = ldflags + lib_opts + \
-                  objects + ['/OUT:' + output_filename]
-
-        if extra_preargs:
-            ld_args[:0] = extra_preargs
-        if extra_postargs:
-            ld_args.extend (extra_postargs)
-
-        self.spawn ( [ self.link ] + ld_args )
-
 
-    # -- Filename mangling methods -------------------------------------
-
-    def _change_extensions( self, filenames, newExtension ):
-        object_filenames = []
-
-        for srcFile in filenames:
-            base,ext = os.path.splitext( srcFile )
-            # XXX should we strip off any existing path?
-            object_filenames.append( base + newExtension )
-
-        return object_filenames
+        (objects, output_dir, libraries, library_dirs) = \
+            self._fix_link_args (objects, output_dir, takes_libs=1,
+                                 libraries=libraries, library_dirs=library_dirs)
+        
+        lib_opts = gen_lib_options (self, library_dirs, libraries)
+        if type (output_dir) not in (StringType, NoneType):
+            raise TypeError, "'output_dir' must be a string or None"
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        if self._need_link (objects, output_filename):
+
+            if debug:
+                ldflags = self.ldflags_shared_debug
+                # XXX not sure this belongs here
+                # extensions in debug_mode are named 'module_d.pyd'
+                basename, ext = os.path.splitext (output_filename)
+                output_filename = basename + '_d' + ext
+            else:
+                ldflags = self.ldflags_shared
+
+            ld_args = ldflags + lib_opts + \
+                      objects + ['/OUT:' + output_filename]
 
-    def object_filenames (self, source_filenames):
-        """Return the list of object filenames corresponding to each
-           specified source filename."""
-        return self._change_extensions( source_filenames, self._obj_ext )
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
 
-    def shared_object_filename (self, source_filename):
-        """Return the shared object filename corresponding to a
-           specified source filename."""
-        return self._change_extensions( source_filenames, self._shared_lib_ext )
+            self.mkpath (os.path.dirname (output_filename))
+            self.spawn ([self.link] + ld_args)
 
-    def library_filename (self, libname):
-        """Return the static library filename corresponding to the
-           specified library name."""
-        return "%s%s" %( libname, self._static_lib_ext )
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
 
-    def shared_library_filename (self, libname):
-        """Return the shared library filename corresponding to the
-           specified library name."""
-        return "%s%s" %( libname, self._shared_lib_ext )
+    # link_shared_object ()
+    
 
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
 
     def library_dir_option (self, dir):
         return "/LIBPATH:" + dir
diff --git a/unixccompiler.py b/unixccompiler.py
index 7765faf88b..35390de0ce 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -20,10 +20,9 @@
 import string, re, os
 from types import *
 from copy import copy
-from sysconfig import \
+from distutils.sysconfig import \
      CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
-from ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
-from util import move_file, newer_pairwise, newer_group
+from distutils.ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
@@ -55,10 +54,13 @@ class UnixCCompiler (CCompiler):
 
     compiler_type = 'unix'
 
-    _obj_ext = '.o'
-    _exe_ext = ''
-    _shared_lib_ext = SO
-    _static_lib_ext = '.a'
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = [".c",".C",".cc",".cxx",".cpp"]
+    obj_extension = ".o"
+    static_lib_extension = ".a"
+    shared_lib_extension = ".so"
+    static_lib_format = shared_lib_format = "lib%s%s"
 
     # Command to create a static library: seems to be pretty consistent
     # across the major Unices.  Might have to move down into the
@@ -96,66 +98,24 @@ def __init__ (self,
 
         self.ld_exec = self.cc
 
+    # __init__ ()
+
 
     def compile (self,
                  sources,
                  output_dir=None,
-                 keep_dir=0,
                  macros=None,
                  include_dirs=None,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
 
-        if type (output_dir) not in (StringType, NoneType):
-            raise TypeError, "'output_dir' must be a string or None"
-        if output_dir is None:
-            output_dir = self.output_dir
-        if macros is None:
-            macros = []
-        if include_dirs is None:
-            include_dirs = []
-
-        if type (macros) is not ListType:
-            raise TypeError, \
-                  "'macros' (if supplied) must be a list of tuples"
-        if type (include_dirs) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'include_dirs' (if supplied) must be a list of strings"
-        include_dirs = list (include_dirs)
-
-        pp_opts = gen_preprocess_options (self.macros + macros,
-                                          self.include_dirs + include_dirs)
-
-        # So we can mangle 'sources' without hurting the caller's data
-        orig_sources = sources
-        sources = copy (sources)
-
-        # Get the list of expected output (object) files and drop files we
-        # don't have to recompile.  (Simplistic check -- we just compare the
-        # source and object file, no deep dependency checking involving
-        # header files.  Hmmm.)
-        objects = self.object_filenames (sources,
-                                         output_dir=output_dir,
-                                         keep_dir=keep_dir)
-        all_objects = copy (objects)    # preserve full list to return
-
-        if not self.force:
-            skipped = newer_pairwise (sources, objects)
-            for skipped_pair in skipped:
-                self.announce ("skipping %s (%s up-to-date)" % skipped_pair)
-
-        # Build list of (source,object) tuples for convenience
-        srcobj = []
-        for i in range (len (sources)):
-            srcobj.append ((sources[i], objects[i]))
+        (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile (sources, output_dir)
 
-        # Compile all source files that weren't eliminated by
-        # 'newer_pairwise()'.
-        # XXX use of ccflags_shared means we're blithely assuming
-        # that we're compiling for inclusion in a shared object!
-        # (will have to fix this when I add the ability to build a
-        # new Python)
+        # Figure out the options for the compiler command line.
+        pp_opts = gen_preprocess_options (macros, include_dirs)
         cc_args = ['-c'] + pp_opts + self.ccflags + self.ccflags_shared
         if debug:
             cc_args[:0] = ['-g']
@@ -164,44 +124,21 @@ def compile (self,
         if extra_postargs is None:
             extra_postargs = []
 
-        if output_dir is not None:
-            self.mkpath (output_dir)
-        for (source,object) in srcobj:
-            self.spawn ([self.cc] + cc_args +
-                        [source, '-o', object] +
-                        extra_postargs)
-
-        # Have to re-fetch list of object filenames, because we want to
-        # return *all* of them, including those that weren't recompiled on
-        # this call!
-        return all_objects
-
-
-    def _fix_link_args (self, output_dir, libraries, library_dirs):
-        """Fixes up the arguments supplied to the 'link_*' methods:
-           if output_dir is None, use self.output_dir; ensure that
-           libraries and library_dirs are both lists (could be None or
-           tuples on input -- both are converted to lists).  Return
-           a tuple of the three input arguments."""
-
-        if output_dir is None:
-            output_dir = self.output_dir
-        if libraries is None:
-            libraries = []
-        if library_dirs is None:
-            library_dirs = []
-        
-        if type (libraries) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'libraries' (if supplied) must be a list of strings"
-        if type (library_dirs) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'library_dirs' (if supplied) must be a list of strings"
-        libraries = list (libraries)
-        library_dirs = list (library_dirs)
+        # Compile all source files that weren't eliminated by
+        # '_prep_compile()'.        
+        for i in range (len (sources)):
+            src = sources[i] ; obj = objects[i]
+            if skip_sources[src]:
+                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+            else:
+                self.mkpath (os.path.dirname (obj))
+                self.spawn ([self.cc] + cc_args + [src, '-o', obj] + extra_postargs)
 
-        return (output_dir, libraries, library_dirs)
+        # Return *all* object filenames, not just the ones we just built.
+        return objects
 
+    # compile ()
+    
 
     def link_static_lib (self,
                          objects,
@@ -209,35 +146,17 @@ def link_static_lib (self,
                          output_dir=None,
                          debug=0):
 
-        if type (objects) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'objects' must be a list or tuple of strings"
-        objects = list (objects)
-            
-        if type (output_dir) not in (StringType, NoneType):
-            raise TypeError, "'output_dir' must be a string or None"
-        if output_dir is None:
-            output_dir = self.output_dir
+        (objects, output_dir) = self._fix_link_args (objects, output_dir, takes_libs=0)
 
-        output_filename = self.library_filename (output_libname)
-        if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
+        output_filename = \
+            self.library_filename (output_libname, output_dir=output_dir)
 
-        # Check timestamps: if any of the object files are newer than
-        # the library file, *or* if "force" is true, then we'll
-        # recreate the library.
-        if not self.force:
-            if self.dry_run:
-                newer = newer_group (objects, output_filename, missing='newer')
-            else:
-                newer = newer_group (objects, output_filename)
-
-        if self.force or newer:
+        if self._need_link (objects, output_filename):
             self.mkpath (os.path.dirname (output_filename))
             self.spawn ([self.archiver,
                          self.archiver_options,
                          output_filename] +
-                        objects)
+                        objects + self.objects)
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
@@ -253,11 +172,9 @@ def link_shared_lib (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
-        # XXX should we sanity check the library name? (eg. no
-        # slashes)
         self.link_shared_object (
             objects,
-            "lib%s%s" % (output_libname, self._shared_lib_ext),
+            self.shared_library_filename (output_libname),
             output_dir,
             libraries,
             library_dirs,
@@ -276,30 +193,19 @@ def link_shared_object (self,
                             extra_preargs=None,
                             extra_postargs=None):
 
-        (output_dir, libraries, library_dirs) = \
-            self._fix_link_args (output_dir, libraries, library_dirs)
+        (objects, output_dir, libraries, library_dirs) = \
+            self._fix_link_args (objects, output_dir, takes_libs=1,
+                                 libraries=libraries, library_dirs=library_dirs)
 
-        lib_opts = gen_lib_options (self,
-                                    self.library_dirs + library_dirs,
-                                    self.libraries + libraries)
+        lib_opts = gen_lib_options (self, library_dirs, libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
-        # If any of the input object files are newer than the output shared
-        # object, relink.  Again, this is a simplistic dependency check:
-        # doesn't look at any of the libraries we might be linking with.
-
-        if not self.force:
-            if self.dry_run:
-                newer = newer_group (objects, output_filename, missing='newer')
-            else:
-                newer = newer_group (objects, output_filename)
-
-        if self.force or newer:
-            ld_args = self.ldflags_shared + objects + \
-                      lib_opts + ['-o', output_filename]
+        if self._need_link (objects, output_filename):
+            ld_args = (self.ldflags_shared + objects + self.objects + 
+                       lib_opts + ['-o', output_filename])
             if debug:
                 ld_args[:0] = ['-g']
             if extra_preargs:
@@ -324,25 +230,17 @@ def link_executable (self,
                          extra_preargs=None,
                          extra_postargs=None):
     
-        (output_dir, libraries, library_dirs) = \
-            self._fix_link_args (output_dir, libraries, library_dirs)
+        (objects, output_dir, libraries, library_dirs) = \
+            self._fix_link_args (objects, output_dir, takes_libs=1,
+                                 libraries=libraries, library_dirs=library_dirs)
 
-        lib_opts = gen_lib_options (self,
-                                    self.library_dirs + library_dirs,
-                                    self.libraries + libraries)
+        lib_opts = gen_lib_options (self, library_dirs, libraries)
         output_filename = output_progname # Unix-ism!
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
-        # Same ol' simplistic-but-still-useful dependency check.
-        if not self.force:
-            if self.dry_run:
-                newer = newer_group (objects, output_filename, missing='newer')
-            else:
-                newer = newer_group (objects, output_filename)
-
-        if self.force or newer:
-            ld_args = objects + lib_opts + ['-o', output_filename]
+        if self._need_link (objects, output_filename):
+            ld_args = objects + self.objects + lib_opts + ['-o', output_filename]
             if debug:
                 ld_args[:0] = ['-g']
             if extra_preargs:
@@ -357,41 +255,10 @@ def link_executable (self,
     # link_executable ()
 
 
-    # -- Filename-mangling (etc.) methods ------------------------------
-
-    def object_filenames (self, source_filenames,
-                          keep_dir=0, output_dir=None):
-        outnames = []
-        for inname in source_filenames:
-            outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._obj_ext, inname)
-            if not keep_dir:
-                outname = os.path.basename (outname)
-            if output_dir is not None:
-                outname = os.path.join (output_dir, outname)
-            outnames.append (outname)
-        return outnames
-
-    def shared_object_filename (self, source_filename,
-                                keep_dir=0, output_dir=None):
-        outname = re.sub (r'\.(c|C|cc|cxx|cpp)$', self._shared_lib_ext)
-        if not keep_dir:
-            outname = os.path.basename (outname)
-        if output_dir is not None:
-            outname = os.path.join (output_dir, outname)
-        return outname
-
-
-    def library_filename (self, libname):
-        (dirname, basename) = os.path.split (libname)
-        return os.path.join (dirname,
-                             "lib%s%s" % (basename, self._static_lib_ext))
-
-    def shared_library_filename (self, libname):
-        (dirname, basename) = os.path.split (libname)
-        return os.path.join (dirname,
-                             "lib%s%s" % (basename, self._shared_lib_ext))
-
-
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+    
     def library_dir_option (self, dir):
         return "-L" + dir
 

From 5cf4767279d301842dc5fef525414412320ca947 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 6 Mar 2000 03:44:32 +0000
Subject: [PATCH 0180/8469] Rewrote 'newer_pairwise(): more natural (and
 incompatible) interface, simpler implementation.

---
 util.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/util.py b/util.py
index b20f5be92c..03c0c88cae 100644
--- a/util.py
+++ b/util.py
@@ -100,22 +100,23 @@ def newer (source, target):
 
 
 def newer_pairwise (sources, targets):
-    """Walk two filename lists in parallel, testing if each 'target' is
-       up-to-date relative to its corresponding 'source'.  If so, both
-       are deleted from their respective lists.  Return a list of tuples
-       containing the deleted (source,target) pairs."""
+    """Walk two filename lists in parallel, testing if each source is newer
+       than its corresponding target.  Return a pair of lists (sources,
+       targets) where source is newer than target, according to the
+       semantics of 'newer()'."""
 
     if len (sources) != len (targets):
         raise ValueError, "'sources' and 'targets' must be same length"
 
-    goners = []
-    for i in range (len (sources)-1, -1, -1):
-        if not newer (sources[i], targets[i]):
-            goners.append ((sources[i], targets[i]))
-            del sources[i]
-            del targets[i]
-    goners.reverse()
-    return goners
+    # build a pair of lists (sources, targets) where  source is newer
+    n_sources = []
+    n_targets = []
+    for i in range (len (sources)):
+        if newer (sources[i], targets[i]):
+            n_sources.append (sources[i])
+            n_targets.append (targets[i])
+
+    return (n_sources, n_targets)
 
 # newer_pairwise ()
 

From 7155260372c2a9d8cecb81dd908df0adcafd8d01 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 7 Mar 2000 03:25:20 +0000
Subject: [PATCH 0181/8469] Added '_nt_quote_args()' to deal with whitespace in
 command-line arguments in a rather half-assed, but probably effective, way.

---
 spawn.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/spawn.py b/spawn.py
index 847346cc2f..ae3d09fa31 100644
--- a/spawn.py
+++ b/spawn.py
@@ -42,11 +42,28 @@ def spawn (cmd,
 # spawn ()
 
 
-def _spawn_nt ( cmd,
-                search_path=1,
-                verbose=0,
-                dry_run=0):
+def _nt_quote_args (args):
+    """Obscure quoting command line arguments on NT.
+       Simply quote every argument which contains blanks."""
+
+    # XXX this doesn't seem very robust to me -- but if the Windows guys
+    # say it'll work, I guess I'll have to accept it.  (What if an arg
+    # contains quotes?  What other magic characters, other than spaces,
+    # have to be escaped?  Is there an escaping mechanism other than
+    # quoting?)
+
+    for i in range (len (args)):
+        if string.find (args[i], ' ') == -1:
+            args[i] = '"%s"' % args[i]
+
+
+def _spawn_nt (cmd,
+               search_path=1,
+               verbose=0,
+               dry_run=0):
+
     executable = cmd[0]
+    cmd = _nt_quote_args (cmd)
     if search_path:
         paths = string.split( os.environ['PATH'], os.pathsep)
         base,ext = os.path.splitext(executable)
@@ -60,7 +77,7 @@ def _spawn_nt ( cmd,
                     # the file exists, we have a shot at spawn working
                     executable = f
     if verbose:
-        print string.join ( [executable] + cmd[1:], ' ')
+        print string.join ([executable] + cmd[1:], ' ')
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:

From 0e7330777448758b059ab24d6db4b527c0269001 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 7 Mar 2000 03:27:08 +0000
Subject: [PATCH 0182/8469] Added 'native_path()' for use on pathnames from the
 setup script: split on slashes, and put back together again using the local
 directory separator.

---
 util.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/util.py b/util.py
index 03c0c88cae..683d167641 100644
--- a/util.py
+++ b/util.py
@@ -458,3 +458,31 @@ def get_platform ():
         return sys.platform
 
 # get_platform()
+
+
+def native_path (pathname):
+    """Return 'pathname' as a name that will work on the native
+       filesystem, i.e. split it on '/' and put it back together again
+       using the current directory separator.  Needed because filenames in
+       the setup script are always supplied in Unix style, and have to be
+       converted to the local convention before we can actually use them in
+       the filesystem.  Raises DistutilsValueError if 'pathname' is
+       absolute (starts with '/') or contains local directory separators
+       (unless the local separator is '/', of course)."""
+
+    if pathname[0] == '/':
+        raise DistutilsValueError, "path '%s' cannot be absolute" % pathname
+    if pathname[-1] == '/':
+        raise DistutilsValueError, "path '%s' cannot end with '/'" % pathname
+    if os.sep != '/':
+        if os.sep in pathname:
+            raise DistutilsValueError, \
+                  "path '%s' cannot contain '%c' character" % \
+                  (pathname, os.sep)
+
+        paths = string.split (pathname, '/')
+        return apply (os.path.join, paths)
+    else:
+        return pathname
+
+# native_path ()

From 01efeb23f10c8b27f9d961264d930d5e3f187248 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 7 Mar 2000 03:30:09 +0000
Subject: [PATCH 0183/8469] Patch from Corran Webster <cwebster@nevada.edu>:
 add '_init_mac()'.

---
 sysconfig.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index e291aec21e..2107ffe4bc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -153,6 +153,27 @@ def _init_nt():
     g['exec_prefix'] = exec_prefix
 
 
+def _init_mac():
+    """Initialize the module as appropriate for Macintosh systems"""
+    g = globals()
+    # load the installed config.h (what if not installed? - still need to
+    # be able to install packages which don't require compilation)
+    parse_config_h(open(
+            os.path.join(sys.exec_prefix, "Mac", "Include", "config.h")), g)
+    # set basic install directories
+    g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib")
+    g['BINLIBDEST']= os.path.join(sys.exec_prefix, "Mac", "Plugins")
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = os.path.join (sys.prefix, 'Include' )
+
+    g['SO'] = '.ppc.slb'
+    g['exec_prefix'] = sys.exec_prefix
+    print sys.prefix
+    g['install_lib'] = os.path.join(sys.exec_prefix, "Lib")
+    g['install_platlib'] = os.path.join(sys.exec_prefix, "Mac", "Lib")
+
+
 try:
     exec "_init_" + os.name
 except NameError:
@@ -164,3 +185,4 @@ def _init_nt():
 
 del _init_posix
 del _init_nt
+del _init_mac

From 922f2b62bed5285c5a0d6e6d42f77fe7086e303e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 7 Mar 2000 03:34:16 +0000
Subject: [PATCH 0184/8469] Patch from Corran Webster <cwebster@nevada.edu>
 (tweaked for style by me): changed 'copy_file()' to use the native Mac file
 copy routine.

---
 util.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/util.py b/util.py
index 683d167641..2f193fb43c 100644
--- a/util.py
+++ b/util.py
@@ -280,6 +280,17 @@ def copy_file (src, dst,
     if dry_run:
         return 1
 
+    # On a Mac, use the native file copy routine
+    if os.name == 'mac':
+        import macostools
+        try:
+            macostools.copy (src, dst, 0, preserve_times)
+        except OSError, exc:
+            raise DistutilsFileError, \
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
+        return 1
+    
+    # Otherwise use custom routine
     _copy_file_contents (src, dst)
     if preserve_mode or preserve_times:
         st = os.stat (src)

From 86ff65237970cb480db4f9f909902892973fdf02 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 9 Mar 2000 03:16:05 +0000
Subject: [PATCH 0185/8469] Added Joe Van Andel's 'get_python_inc()', adapted
 by me to supply   the platform-neutral include dir by default and with Mac
 support. Added 'get_python_lib()', inspired by 'get_python_inc()'. Rewrote
 'get_config_h_filename()' and 'get_makefile_filename()'   in terms of
 'get_python_inc()' and 'get_python_lib()'. Changed '_init_nt()' and
 '_init_mac()' to use 'get_python_inc()' and   'get_python_lib()' for
 directory names.

---
 sysconfig.py | 95 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 80 insertions(+), 15 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2107ffe4bc..49e58eb919 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -17,20 +17,83 @@
 exec_prefix = os.path.normpath (sys.exec_prefix)
 
 
+def get_python_inc (plat_specific=0):
+    """Return the directory containing installed Python header files.
+       If 'plat_specific' is false (the default), this is the path to the
+       non-platform-specific header files, i.e. Python.h and so on;
+       otherwise, this is the path to platform-specific header files
+       (namely config.h)."""
+    
+    the_prefix = (plat_specific and exec_prefix or prefix)
+    if os.name == "posix":
+        return os.path.join (the_prefix, "include", "python" + sys.version[:3])
+    elif os.name == "nt":
+        return os.path.join (the_prefix, "Include") # include or Include?
+    elif os.name == "mac":
+        return os.path.join (the_prefix, "Include")
+    else:
+        raise DistutilsPlatformError, \
+              ("I don't know where Python installs its C header files " +
+               "on platform '%s'") % os.name
+
+
+def get_python_lib (plat_specific=0, standard_lib=0):
+    """Return the directory containing the Python library (standard or
+       site additions).  If 'plat_specific' is true, return the directory
+       containing platform-specific modules, i.e. any module from a
+       non-pure-Python module distribution; otherwise, return the
+       platform-shared library directory.  If 'standard_lib' is true,
+       return the directory containing standard Python library modules;
+       otherwise, return the directory for site-specific modules."""
+
+    the_prefix = (plat_specific and exec_prefix or prefix)
+       
+    if os.name == "posix":
+        libpython = os.path.join (the_prefix,
+                                  "lib", "python" + sys.version[:3])
+        if standard_lib:
+            return libpython
+        else:
+            return os.path.join (libpython, "site-packages")
+
+    elif os.name == "nt":
+        if standard_lib:
+            return os.path.join (the_prefix, "Lib")
+        else:
+            return the_prefix
+
+    elif os.name == "mac":
+        if platform_specific:
+            if standard_lib:
+                return os.path.join (exec_prefix, "Mac", "Plugins")
+            else:
+                raise DistutilsPlatformError, \
+                      "OK, where DO site-specific extensions go on the Mac?"
+        else:
+            if standard_lib:
+                return os.path.join (prefix, "Lib")
+            else:
+                raise DistutilsPlatformError, \
+                      "OK, where DO site-specific modules go on the Mac?"
+    else:
+        raise DistutilsPlatformError, \
+              ("I don't know where Python installs its library " +
+               "on platform '%s'") % os.name
+
+# get_python_lib ()
+        
+
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    if os.name == "nt":
-        return os.path.join(exec_prefix, "include", "config.h")
-    else:
-        return os.path.join(exec_prefix,
-                            "include", "python" + sys.version[:3],
-                            "config.h")
+    inc_dir = get_python_inc (plat_specific=1)
+    return os.path.join (inc_dir, "config.h")
+
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
-    return os.path.join(exec_prefix,
-                        "lib", "python" + sys.version[:3],
-                        "config", "Makefile")
+    lib_dir = get_python_lib (plat_specific=1, standard_lib=1)
+    return os.path.join (lib_dir, "config", "Makefile")
+
 
 def parse_config_h(fp, g=None):
     """Parse a config.h-style file.  A dictionary containing name/value
@@ -143,11 +206,11 @@ def _init_nt():
     # load config.h, though I don't know how useful this is
     parse_config_h(open(get_config_h_filename()), g)
     # set basic install directories
-    g['LIBDEST'] = os.path.join(exec_prefix, "Lib")
-    g['BINLIBDEST'] = os.path.join(exec_prefix, "Lib")
+    g['LIBDEST'] = get_python_lib (plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib (plat_specific=1, standard_lib=1)
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = os.path.join(prefix, 'include')
+    g['INCLUDEPY'] = get_python_inc (plat_specific=0)
 
     g['SO'] = '.pyd'
     g['exec_prefix'] = exec_prefix
@@ -161,15 +224,17 @@ def _init_mac():
     parse_config_h(open(
             os.path.join(sys.exec_prefix, "Mac", "Include", "config.h")), g)
     # set basic install directories
-    g['LIBDEST']=os.path.join(sys.exec_prefix, "Lib")
-    g['BINLIBDEST']= os.path.join(sys.exec_prefix, "Mac", "Plugins")
+    g['LIBDEST'] = get_python_lib (plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib (plat_specific=1, standard_lib=1)
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = os.path.join (sys.prefix, 'Include' )
+    g['INCLUDEPY'] = get_python_inc (plat_specific=0)
 
     g['SO'] = '.ppc.slb'
     g['exec_prefix'] = sys.exec_prefix
     print sys.prefix
+
+    # XXX are these used anywhere?
     g['install_lib'] = os.path.join(sys.exec_prefix, "Lib")
     g['install_platlib'] = os.path.join(sys.exec_prefix, "Mac", "Lib")
 

From 13a17ccd50ded25c15ce6065dd516d85fb52bd7b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 9 Mar 2000 15:54:52 +0000
Subject: [PATCH 0186/8469] There are a few places which can raise
 DistutilsPlatformError; make sure it's imported!  ;)

Re-wrap the docstrings on get_python_inc() and get_python_lib() to be
closer to the "normal" Python style.  See GvR's "style guide" on the
essays page (http://www.python.org/doc/essays/).

There should never be a space between a function name and the '(' that
opens the argument list (see the style guide again).
---
 sysconfig.py | 95 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 49e58eb919..2c7318c04d 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -13,65 +13,73 @@
 import string
 import sys
 
-prefix = os.path.normpath (sys.prefix)
-exec_prefix = os.path.normpath (sys.exec_prefix)
+from errors import DistutilsPlatformError
 
 
-def get_python_inc (plat_specific=0):
+prefix = os.path.normpath(sys.prefix)
+exec_prefix = os.path.normpath(sys.exec_prefix)
+
+
+def get_python_inc(plat_specific=0):
     """Return the directory containing installed Python header files.
-       If 'plat_specific' is false (the default), this is the path to the
-       non-platform-specific header files, i.e. Python.h and so on;
-       otherwise, this is the path to platform-specific header files
-       (namely config.h)."""
-    
+
+    If 'plat_specific' is false (the default), this is the path to the
+    non-platform-specific header files, i.e. Python.h and so on;
+    otherwise, this is the path to platform-specific header files
+    (namely config.h).
+
+    """    
     the_prefix = (plat_specific and exec_prefix or prefix)
     if os.name == "posix":
-        return os.path.join (the_prefix, "include", "python" + sys.version[:3])
+        return os.path.join(the_prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
-        return os.path.join (the_prefix, "Include") # include or Include?
+        return os.path.join(the_prefix, "Include") # include or Include?
     elif os.name == "mac":
-        return os.path.join (the_prefix, "Include")
+        return os.path.join(the_prefix, "Include")
     else:
         raise DistutilsPlatformError, \
               ("I don't know where Python installs its C header files " +
                "on platform '%s'") % os.name
 
 
-def get_python_lib (plat_specific=0, standard_lib=0):
+def get_python_lib(plat_specific=0, standard_lib=0):
     """Return the directory containing the Python library (standard or
-       site additions).  If 'plat_specific' is true, return the directory
-       containing platform-specific modules, i.e. any module from a
-       non-pure-Python module distribution; otherwise, return the
-       platform-shared library directory.  If 'standard_lib' is true,
-       return the directory containing standard Python library modules;
-       otherwise, return the directory for site-specific modules."""
+    site additions).
+
+    If 'plat_specific' is true, return the directory containing
+    platform-specific modules, i.e. any module from a non-pure-Python
+    module distribution; otherwise, return the platform-shared library
+    directory.  If 'standard_lib' is true, return the directory
+    containing standard Python library modules; otherwise, return the
+    directory for site-specific modules.
 
+    """
     the_prefix = (plat_specific and exec_prefix or prefix)
        
     if os.name == "posix":
-        libpython = os.path.join (the_prefix,
-                                  "lib", "python" + sys.version[:3])
+        libpython = os.path.join(the_prefix,
+                                 "lib", "python" + sys.version[:3])
         if standard_lib:
             return libpython
         else:
-            return os.path.join (libpython, "site-packages")
+            return os.path.join(libpython, "site-packages")
 
     elif os.name == "nt":
         if standard_lib:
-            return os.path.join (the_prefix, "Lib")
+            return os.path.join(the_prefix, "Lib")
         else:
             return the_prefix
 
     elif os.name == "mac":
         if platform_specific:
             if standard_lib:
-                return os.path.join (exec_prefix, "Mac", "Plugins")
+                return os.path.join(exec_prefix, "Mac", "Plugins")
             else:
                 raise DistutilsPlatformError, \
                       "OK, where DO site-specific extensions go on the Mac?"
         else:
             if standard_lib:
-                return os.path.join (prefix, "Lib")
+                return os.path.join(prefix, "Lib")
             else:
                 raise DistutilsPlatformError, \
                       "OK, where DO site-specific modules go on the Mac?"
@@ -80,25 +88,27 @@ def get_python_lib (plat_specific=0, standard_lib=0):
               ("I don't know where Python installs its library " +
                "on platform '%s'") % os.name
 
-# get_python_lib ()
+# get_python_lib()
         
 
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    inc_dir = get_python_inc (plat_specific=1)
-    return os.path.join (inc_dir, "config.h")
+    inc_dir = get_python_inc(plat_specific=1)
+    return os.path.join(inc_dir, "config.h")
 
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
-    lib_dir = get_python_lib (plat_specific=1, standard_lib=1)
-    return os.path.join (lib_dir, "config", "Makefile")
+    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+    return os.path.join(lib_dir, "config", "Makefile")
 
 
 def parse_config_h(fp, g=None):
-    """Parse a config.h-style file.  A dictionary containing name/value
-    pairs is returned.  If an optional dictionary is passed in as the second
-    argument, it is used instead of a new dictionary.
+    """Parse a config.h-style file.
+
+    A dictionary containing name/value pairs is returned.  If an
+    optional dictionary is passed in as the second argument, it is
+    used instead of a new dictionary.
     """
     if g is None:
         g = {}
@@ -122,9 +132,12 @@ def parse_config_h(fp, g=None):
     return g
 
 def parse_makefile(fp, g=None):
-    """Parse a Makefile-style file.  A dictionary containing name/value
-    pairs is returned.  If an optional dictionary is passed in as the second
-    argument, it is used instead of a new dictionary.
+    """Parse a Makefile-style file.
+
+    A dictionary containing name/value pairs is returned.  If an
+    optional dictionary is passed in as the second argument, it is
+    used instead of a new dictionary.
+
     """
     if g is None:
         g = {}
@@ -206,11 +219,11 @@ def _init_nt():
     # load config.h, though I don't know how useful this is
     parse_config_h(open(get_config_h_filename()), g)
     # set basic install directories
-    g['LIBDEST'] = get_python_lib (plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib (plat_specific=1, standard_lib=1)
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc (plat_specific=0)
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.pyd'
     g['exec_prefix'] = exec_prefix
@@ -224,11 +237,11 @@ def _init_mac():
     parse_config_h(open(
             os.path.join(sys.exec_prefix, "Mac", "Include", "config.h")), g)
     # set basic install directories
-    g['LIBDEST'] = get_python_lib (plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib (plat_specific=1, standard_lib=1)
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
 
     # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc (plat_specific=0)
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.ppc.slb'
     g['exec_prefix'] = sys.exec_prefix

From 970b9e96ac35abc8a46525a25c5d0e7dd5c2c53a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 10 Mar 2000 01:48:32 +0000
Subject: [PATCH 0187/8469] Renamed 'link_static_lib() to
 'create_static_lib()'.

---
 ccompiler.py     | 25 +++++++++++++------------
 unixccompiler.py | 12 ++++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 2336e96589..46dabadee9 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -449,11 +449,11 @@ class documentation.  In any event, they are intended as an
         pass
 
 
-    def link_static_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         debug=0):
+    def create_static_lib (self,
+                           objects,
+                           output_libname,
+                           output_dir=None,
+                           debug=0):
         """Link a bunch of stuff together to create a static library
            file.  The "bunch of stuff" consists of the list of object
            files supplied as 'objects', the extra object files supplied
@@ -484,10 +484,11 @@ def link_shared_lib (self,
                          extra_preargs=None,
                          extra_postargs=None):
         """Link a bunch of stuff together to create a shared library
-           file.  Has the same effect as 'link_static_lib()' except
-           that the filename inferred from 'output_libname' will most
-           likely be different, and the type of file generated will
-           almost certainly be different
+           file.  Similar semantics to 'create_static_lib()', with the
+           addition of other libraries to link against and directories to
+           search for them.  Also, of course, the type and name of
+           the generated file will almost certainly be different, as will
+           the program used to create it.
 
            'libraries' is a list of libraries to link against.  These are
            library names, not filenames, since they're translated into
@@ -503,9 +504,9 @@ def link_shared_lib (self,
            default and those supplied to 'add_library_dir()' and/or
            'set_library_dirs()'.
 
-           'debug' is as for 'compile()' and 'link_static_lib()', with the
+           'debug' is as for 'compile()' and 'create_static_lib()', with the
            slight distinction that it actually matters on most platforms
-           (as opposed to 'link_static_lib()', which includes a 'debug'
+           (as opposed to 'create_static_lib()', which includes a 'debug'
            flag mostly for form's sake).
 
            'extra_preargs' and 'extra_postargs' are as for 'compile()'
@@ -543,7 +544,7 @@ def link_executable (self,
                          extra_preargs=None,
                          extra_postargs=None):
         """Link a bunch of stuff together to create a binary executable
-           file.  The "bunch of stuff" is as for 'link_static_lib()'.
+           file.  The "bunch of stuff" is as for 'link_shared_lib()'.
            'output_progname' should be the base name of the executable
            program--e.g. on Unix the same as the output filename, but
            on DOS/Windows ".exe" will be appended."""
diff --git a/unixccompiler.py b/unixccompiler.py
index 35390de0ce..0d2858de1c 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -140,11 +140,11 @@ def compile (self,
     # compile ()
     
 
-    def link_static_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         debug=0):
+    def create_static_lib (self,
+                           objects,
+                           output_libname,
+                           output_dir=None,
+                           debug=0):
 
         (objects, output_dir) = self._fix_link_args (objects, output_dir, takes_libs=0)
 
@@ -160,7 +160,7 @@ def link_static_lib (self,
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
-    # link_static_lib ()
+    # create_static_lib ()
 
 
     def link_shared_lib (self,

From 475a7ee2b018683744a4d4d739ce14b735fb11e8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 10 Mar 2000 01:49:26 +0000
Subject: [PATCH 0188/8469] Renamed 'link_static_lib() to
 'create_static_lib()', and rewrote it create a static library (using lib.exe
 as found by '__init__()', hopefully through registry entries pointing to
 DevStudio).

---
 msvccompiler.py | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 847c611d29..bf5257f1d6 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -168,6 +168,7 @@ def __init__ (self,
 
             self.cc   = _find_exe("cl.exe", version)
             self.link = _find_exe("link.exe", version)
+            self.lib  = _find_exe("lib.exe", version)
             set_path_env_var ('lib', version)
             set_path_env_var ('include', version)
             path=get_msvc_paths('path', version)
@@ -181,6 +182,7 @@ def __init__ (self,
             # devstudio not found in the registry
             self.cc = "cl.exe"
             self.link = "link.exe"
+            self.lib = "lib.exe"
 
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3' ]
@@ -243,44 +245,32 @@ def compile (self,
     # compile ()
 
 
-    # XXX the signature of this method is different from CCompiler and
-    # UnixCCompiler -- but those extra parameters (libraries, library_dirs)
-    # are actually used.  So: are they really *needed*, or can they be
-    # ditched?  If needed, the CCompiler API will have to change...
-    def link_static_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None):
+    def create_static_lib (self,
+                           objects,
+                           output_libname,
+                           output_dir=None,
+                           debug=0,
+                           extra_preargs=None,
+                           extra_postargs=None):
 
-        (objects, output_dir, libraries, library_dirs) = \
-            self._fix_link_args (objects, output_dir, takes_libs=1,
-                                 libraries=libraries,
-                                 library_dirs=library_dirs)
-        
+        (objects, output_dir) = \
+            self._fix_link_args (objects, output_dir, takes_libs=0)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
 
         if self._need_link (objects, output_filename):
-            lib_opts = gen_lib_options (libraries, library_dirs,
-                                        "%s.lib", "/LIBPATH:%s")
-            ld_args = self.ldflags_static + lib_opts + \
-                      objects + ['/OUT:' + output_filename]
+            lib_args = objects + ['/OUT:' + output_filename]
             if debug:
                 pass                    # XXX what goes here?
             if extra_preargs:
-                ld_args[:0] = extra_preargs
+                lib_args[:0] = extra_preargs
             if extra_postargs:
-                ld_args.extend (extra_postargs)
+                lib_args.extend (extra_postargs)
             self.spawn ([self.link] + ld_args)
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
-    # link_static_lib ()
+    # create_static_lib ()
     
 
     def link_shared_lib (self,

From f148d847825da4d45f345c97a6e7ad8a48b02774 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 10 Mar 2000 02:02:44 +0000
Subject: [PATCH 0189/8469] Catch up with change to CCompiler API: call
 'create_static_lib()', not 'link_static_lib()'.

---
 command/build_clib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index c49e3ca737..6560fb4774 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -190,9 +190,9 @@ def build_libraries (self, libraries):
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.link_static_lib (objects, lib_name,
-                                           output_dir=self.build_clib,
-                                           debug=self.debug)
+            self.compiler.create_static_lib (objects, lib_name,
+                                             output_dir=self.build_clib,
+                                             debug=self.debug)
 
         # for libraries
 

From a447a64793487f03b2f059298a2a1bc1b069a9e2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 15:19:51 +0000
Subject: [PATCH 0190/8469] Changed to pay attention to the
 'runtime_library_dirs' list (= 'rpath' option in the 'build_ext' command):  
 * in ccompiler.py: 'gen_lib_options()' now takes 'runtime_library_dirs'    
 parameter   * in unixccompiler.py and msvccompiler.py: now pass    
 'self.runtime_library_dirs' to 'gen_lib_options()', and define    
 'runtime_library_dir_option()' (although in msvccompiler.py it     blows up
 with a DistutilsPlatformError right now!)

---
 ccompiler.py     |  5 ++++-
 msvccompiler.py  |  8 +++++++-
 unixccompiler.py | 11 +++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 46dabadee9..4a8c1d38c8 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -770,7 +770,7 @@ def gen_preprocess_options (macros, include_dirs):
 # gen_preprocess_options ()
 
 
-def gen_lib_options (compiler, library_dirs, libraries):
+def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
        linking with specific libraries.  'libraries' and 'library_dirs'
        are, respectively, lists of library names (not filenames!) and
@@ -783,6 +783,9 @@ def gen_lib_options (compiler, library_dirs, libraries):
     for dir in library_dirs:
         lib_opts.append (compiler.library_dir_option (dir))
 
+    for dir in runtime_library_dirs:
+        lib_opts.append (compiler.runtime_library_dir_option (dir))
+
     # XXX it's important that we *not* remove redundant library mentions!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
     # resolve all symbols.  I just hope we never have to say "-lfoo obj.o
diff --git a/msvccompiler.py b/msvccompiler.py
index bf5257f1d6..7324b8e1c6 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -307,7 +307,9 @@ def link_shared_object (self,
             self._fix_link_args (objects, output_dir, takes_libs=1,
                                  libraries=libraries, library_dirs=library_dirs)
         
-        lib_opts = gen_lib_options (self, library_dirs, libraries)
+        lib_opts = gen_lib_options (self,
+                                    library_dirs, self.runtime_library_dirs,
+                                    libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
@@ -348,6 +350,10 @@ def link_shared_object (self,
     def library_dir_option (self, dir):
         return "/LIBPATH:" + dir
 
+    def runtime_library_dir_option (self, dir):
+        raise DistutilsPlatformError, \
+              "don't know how to set runtime library search path for MSVC++"
+
     def library_option (self, lib):
         return self.library_filename (lib)
 
diff --git a/unixccompiler.py b/unixccompiler.py
index 0d2858de1c..ec85571ddf 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -197,7 +197,9 @@ def link_shared_object (self,
             self._fix_link_args (objects, output_dir, takes_libs=1,
                                  libraries=libraries, library_dirs=library_dirs)
 
-        lib_opts = gen_lib_options (self, library_dirs, libraries)
+        lib_opts = gen_lib_options (self,
+                                    library_dirs, self.runtime_library_dirs,
+                                    libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
@@ -234,7 +236,9 @@ def link_executable (self,
             self._fix_link_args (objects, output_dir, takes_libs=1,
                                  libraries=libraries, library_dirs=library_dirs)
 
-        lib_opts = gen_lib_options (self, library_dirs, libraries)
+        lib_opts = gen_lib_options (self,
+                                    library_dirs, self.runtime_library_dirs,
+                                    libraries)
         output_filename = output_progname # Unix-ism!
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
@@ -262,6 +266,9 @@ def link_executable (self,
     def library_dir_option (self, dir):
         return "-L" + dir
 
+    def runtime_library_dir_option (self, dir):
+        return "-R" + dir
+
     def library_option (self, lib):
         return "-l" + lib
 

From f11f6f3246f288422067b7c49aa0ab7d20992048 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 15:21:03 +0000
Subject: [PATCH 0191/8469] In 'finalize_options()': if 'self.libs' is a
 string, make it a singleton list.

---
 command/build_ext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 050a5c65b7..dfe64a114e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -117,6 +117,9 @@ def finalize_options (self):
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
 
+        if type (self.libs) is StringType:
+            self.libs = [self.libs]
+
         # XXX how the heck are 'self.define' and 'self.undef' supposed to
         # be set?
 

From 52b70f2aefe7f937e5090dce65c43eef3f8e6051 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 15:37:26 +0000
Subject: [PATCH 0192/8469] Contribution from Bastian Kleineidam
 <calvin@cs.uni-sb.de>: the Distutils 'clean' command.

---
 command/clean.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 command/clean.py

diff --git a/command/clean.py b/command/clean.py
new file mode 100644
index 0000000000..9785de9938
--- /dev/null
+++ b/command/clean.py
@@ -0,0 +1,44 @@
+"""distutils.command.clean
+
+Implements the Distutils 'clean' command."""
+
+# contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
+
+__revision__ = "$Id$"
+
+import os
+from distutils.core import Command
+from distutils.util import remove_tree
+
+class clean (Command):
+
+    description = "clean files we built"
+    user_options = [
+        ('build-base=', 'b', "base directory for build library"),
+        ('build-lib=', None,
+         "build directory for all distribution (defaults to either " +
+         "build-purelib or build-platlib"),
+        ('build-temp=', 't', "temporary build directory"),
+        ('all', 'a',
+         "remove all build output, not just temporary by-products")
+    ]
+
+    def initialize_options(self):
+        self.build_base = None
+        self.build_lib = None
+        self.build_temp = None
+        self.all = None
+
+    def finalize_options(self):
+        self.set_undefined_options('build',
+	    ('build_base', 'build_base'),
+	    ('build_lib', 'build_lib'),
+	    ('build_temp', 'build_temp'))
+
+    def run(self):
+        # remove the build/temp.<plat> directory
+        remove_tree (self.build_temp, self.verbose, self.dry_run)
+
+        if self.all:
+            # remove the build/lib resp. build/platlib directory
+            remove_tree (self.build_lib, self.verbose, self.dry_run)

From b0b51892b77115a91a1cbf12dc63faba193de7a3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 15:42:22 +0000
Subject: [PATCH 0193/8469] Patch from Bastian Kleineidam
 <calvin@cs.uni-sb.de>: added 'remove_tree()'.

---
 util.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 2f193fb43c..7a07b65648 100644
--- a/util.py
+++ b/util.py
@@ -11,7 +11,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os, string, shutil
 from distutils.errors import *
 
 
@@ -378,6 +378,25 @@ def copy_tree (src, dst,
 # copy_tree ()
 
 
+def remove_tree (directory, verbose=0, dry_run=0):
+    """Recursively remove an entire directory tree.  Any errors are ignored
+       (apart from being reported to stdout if 'verbose' is true)."""
+
+    if verbose:
+        print "removing '%s' (and everything under it)" % directory
+    if dry_run:
+        return
+    try:
+        shutil.rmtree(directory,1)
+    except (IOError, OSError), exc:
+        if verbose:
+            if exc.filename:
+                print "error removing %s: %s (%s)" % \
+                       (directory, exc.strerror, exc.filename)
+            else:
+                print "error removing %s: %s" % (directory, exc.strerror)
+
+
 # XXX I suspect this is Unix-specific -- need porting help!
 def move_file (src, dst,
                verbose=0,

From d8cd9e2b90b4f3ea1603bc44cbf1a156172c0f76 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 15:43:42 +0000
Subject: [PATCH 0194/8469] Patch from Bastian Kleineidam
 <calvin@cs.uni-sb.de>: use 'util.remove_tree()' instead of
 'nuke_release_tree()'.

---
 command/sdist.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 726458a246..0c15177893 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -10,9 +10,8 @@
 import fnmatch
 from types import *
 from glob import glob
-from shutil import rmtree
 from distutils.core import Command
-from distutils.util import newer
+from distutils.util import newer, remove_tree
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError
 
@@ -504,19 +503,6 @@ def make_release_tree (self, base_dir, files):
     # make_release_tree ()
 
 
-    def nuke_release_tree (self, base_dir):
-        try:
-            self.execute (rmtree, (base_dir,),
-                          "removing %s" % base_dir)
-        except (IOError, OSError), exc:
-            if exc.filename:
-                msg = "error removing %s: %s (%s)" % \
-                       (base_dir, exc.strerror, exc.filename)
-            else:
-                msg = "error removing %s: %s" % (base_dir, exc.strerror)
-            self.warn (msg)
-
-
     def make_tarball (self, base_dir, compress="gzip"):
 
         # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
@@ -601,7 +587,7 @@ def make_distribution (self):
                 self.make_zipfile (base_dir)
 
         if not self.keep_tree:
-            self.nuke_release_tree (base_dir)
+            remove_tree (base_dir, self.verbose, self.dry_run)
 
 # class Dist
 

From 9403029df5514984078943c729e96ba310319613 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 17:33:18 +0000
Subject: [PATCH 0195/8469] Tweaked all over:   * improve help strings   * warn
 if user supplies non-existing directories   * don't try to 'remove_tree()'
 non-existing directories   * try to remove the build_base after cleanup (but
 don't do or say     anything if it fails -- this is just in case we made it
 empty)

---
 command/clean.py | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 9785de9938..4f0f7e3e94 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -12,13 +12,14 @@
 
 class clean (Command):
 
-    description = "clean files we built"
+    description = "clean up output of 'build' command"
     user_options = [
-        ('build-base=', 'b', "base directory for build library"),
+        ('build-base=', 'b',
+         "base build directory (default: 'build.build-base')"),
         ('build-lib=', None,
-         "build directory for all distribution (defaults to either " +
-         "build-purelib or build-platlib"),
-        ('build-temp=', 't', "temporary build directory"),
+         "build directory for all modules (default: 'build.build-lib')"),
+        ('build-temp=', 't',
+         "temporary build directory (default: 'build.build-temp')"),
         ('all', 'a',
          "remove all build output, not just temporary by-products")
     ]
@@ -30,15 +31,34 @@ def initialize_options(self):
         self.all = None
 
     def finalize_options(self):
+        if self.build_lib and not os.path.exists (self.build_lib):
+            self.warn ("'%s' does not exist -- can't clean it" %
+                       self.build_lib)
+        if self.build_temp and not os.path.exists (self.build_temp):
+            self.warn ("'%s' does not exist -- can't clean it" %
+                       self.build_temp)
+
         self.set_undefined_options('build',
 	    ('build_base', 'build_base'),
 	    ('build_lib', 'build_lib'),
 	    ('build_temp', 'build_temp'))
 
     def run(self):
-        # remove the build/temp.<plat> directory
-        remove_tree (self.build_temp, self.verbose, self.dry_run)
+        # remove the build/temp.<plat> directory (unless it's already
+        # gone)
+        if os.path.exists (self.build_temp):
+            remove_tree (self.build_temp, self.verbose, self.dry_run)
 
         if self.all:
-            # remove the build/lib resp. build/platlib directory
-            remove_tree (self.build_lib, self.verbose, self.dry_run)
+            # remove the module build directory (unless already gone)
+            if os.path.exists (self.build_lib):
+                remove_tree (self.build_lib, self.verbose, self.dry_run)
+
+        # just for the heck of it, try to remove the base build directory:
+        # we might have emptied it right now, but if not we don't care
+        if not self.dry_run:
+            try:
+                os.rmdir (self.build_base)
+                self.announce ("removing '%s'" % self.build_base)
+            except OSError:
+                pass

From 8f7de70136acae5a467212cbb16c09ce2c364fdb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 17:35:12 +0000
Subject: [PATCH 0196/8469] Oops!  Don't call 'ensure_ready()' in
 'Distribution.find_command_obj()' -- that broke parsing command-line options.
  Instead call it in 'Command.find_peer()', which is why I added it to
 'find_command_obj()' in the first place.

---
 core.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index a31e60ce4a..dfe411b0cc 100644
--- a/core.py
+++ b/core.py
@@ -506,7 +506,6 @@ def find_command_obj (self, command, create=1):
         cmd_obj = self.command_obj.get (command)
         if not cmd_obj and create:
             cmd_obj = self.create_command_obj (command)
-            cmd_obj.ensure_ready ()
             self.command_obj[command] = cmd_obj
 
         return cmd_obj
@@ -873,7 +872,9 @@ def find_peer (self, command, create=1):
            find (create if necessary and 'create' is true) the command
            object for 'command'.."""
 
-        return self.distribution.find_command_obj (command, create)
+        cmd_obj = self.distribution.find_command_obj (command, create)
+        cmd_obj.ensure_ready ()
+        return cmd_obj
 
 
     def get_peer_option (self, command, option):

From bfc2b54d5a0bc8ba8a3b115aa8abaf3911cfc9c9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 18 Mar 2000 17:36:09 +0000
Subject: [PATCH 0197/8469] Simplified doc string. Added 'clean' to list of
 commands.

---
 command/__init__.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/command/__init__.py b/command/__init__.py
index 40595ba949..d2b37a8ce1 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -1,17 +1,7 @@
 """distutils.command
 
 Package containing implementation of all the standard Distutils
-commands.  Currently this means:
-
-  build
-  build_py
-  build_ext
-  install
-  install_py
-  install_ext
-  dist
-
-but this list will undoubtedly grow with time."""
+commands."""
 
 __revision__ = "$Id$"
 
@@ -21,5 +11,6 @@
            'install',
            'install_py',
            'install_ext',
+           'clean',
            'sdist',
           ]

From 2176088ac051cb11a5b4aee4928f32b831ec2063 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:11:21 +0000
Subject: [PATCH 0198/8469] Took out what looks like old debugging code that
 probably should never have been checked in: was passing the PLAT environment
 variable as the 'plat' argument to 'new_compiler()'.

---
 command/build_ext.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index dfe64a114e..1d8794a6e4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -146,8 +146,7 @@ def run (self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
-                                      verbose=self.verbose,
+        self.compiler = new_compiler (verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
         if self.include_dirs is not None:

From d852781fe93c7a37b90387e2b388bf18ed3823d1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:12:51 +0000
Subject: [PATCH 0199/8469] Fix how we set 'build_dir' and 'install_dir'
 options from 'install' options -- irrelevant because this file is about to go
 away, but oh well.

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

diff --git a/command/install_ext.py b/command/install_ext.py
index 8d23fa4cde..14730909bb 100644
--- a/command/install_ext.py
+++ b/command/install_ext.py
@@ -25,8 +25,8 @@ def initialize_options (self):
 
     def finalize_options (self):
         self.set_undefined_options ('install',
-                                    ('build_platlib', 'build_dir'),
-                                    ('install_platlib', 'install_dir'))
+                                    ('build_lib', 'build_dir'),
+                                    ('install_lib', 'install_dir'))
 
     def run (self):
 

From d80b9efb03fd6cb33c60de06877d7cc04405b576 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:15:45 +0000
Subject: [PATCH 0200/8469] Yet another complete rewrite.  Hopefully the *last*
 complete rewrite of this command for a while; this implements roughly the
 plan cooked up by Guido, Fred, and me.  Seems to strike a nice balance
 between usability in the common cases (just set one option), expandability
 for more types of files to install in future, and customizability of
 installation directories.

This revision isn't completely working: standard and alternate
installations work fine, but there are still some kinks to work out of
customized installations.
---
 command/install.py | 428 +++++++++++++++++++++++++++++++--------------
 1 file changed, 299 insertions(+), 129 deletions(-)

diff --git a/command/install.py b/command/install.py
index 1df558434a..13baa1a756 100644
--- a/command/install.py
+++ b/command/install.py
@@ -9,33 +9,76 @@
 import sys, os, string
 from types import *
 from distutils.core import Command
-from distutils.util import write_file
+from distutils.util import write_file, native_path, subst_vars
 from distutils.errors import DistutilsOptionError
 
+INSTALL_SCHEMES = {
+    'unix_prefix': {
+        'purelib': '$base/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'scripts': '$base/bin',
+        'data'   : '$base/share',
+        },
+    'unix_home': {
+        'purelib': '$base/lib/python',
+        'platlib': '$base/lib/python',
+        'scripts': '$base/bin',
+        'data'   : '$base/share',
+        },
+    'nt': {
+        'purelib': '$base',
+        'platlib': '$base',
+        'scripts': '$base\\Scripts',
+        'data'   : '$base\\Data',
+        },
+    'mac': {
+        'purelib': '$base:Lib',
+        'platlib': '$base:Mac:PlugIns',
+        'scripts': '$base:Scripts',
+        'data'   : '$base:Data',
+        }
+    }
+
+
 class install (Command):
 
     description = "install everything from build directory"
 
     user_options = [
-        ('prefix=', None, "installation prefix"),
+        # Select installation scheme and set base director(y|ies)
+        ('prefix=', None,
+         "installation prefix"),
         ('exec-prefix=', None,
-         "prefix for platform-specific files"),
-
-        # Installation directories: where to put modules and packages
-        ('install-lib=', None,
-         "base Python library directory"),
+         "(Unix only) prefix for platform-specific files"),
+        ('home=', None,
+         "(Unix only) home directory to install under"),
+
+        # Or, just set the base director(y|ies)
+        ('install-base=', None,
+         "base installation directory (instead of --prefix or --home)"),
+        ('install-platbase=', None,
+         "base installation directory for platform-specific files " +
+         "(instead of --exec-prefix or --home)"),
+
+        # Or, explicitly set the installation scheme
+        ('install-purelib=', None,
+         "installation directory for pure Python module distributions"),
         ('install-platlib=', None,
-         "platform-specific Python library directory"),
-        ('install-path=', None,
-         "extra intervening directories to put below install-lib"),
+         "installation directory for non-pure module distributions"),
+        ('install-lib=', None,
+         "installation directory for all module distributions " +
+         "(overrides --install-purelib and --install-platlib)"),
+
+        ('install-scripts=', None,
+         "installation directory for Python scripts"),
+        ('install-data=', None,
+         "installation directory for data files"),
 
         # Build directories: where to find the files to install
         ('build-base=', None,
          "base build directory"),
         ('build-lib=', None,
-         "build directory for pure Python modules"),
-        ('build-platlib=', None,
-         "build directory for extension modules"),
+         "build directory for all Python modules"),
 
         # Where to install documentation (eventually!)
         #('doc-format=', None, "format of documentation to generate"),
@@ -55,21 +98,31 @@ def initialize_options (self):
         # command is run whether the user supplied values
         self.prefix = None
         self.exec_prefix = None
+        self.home = None
+
+        self.install_base = None
+        self.install_platbase = None
 
         # The actual installation directories are determined only at
         # run-time, so the user can supply just prefix (and exec_prefix?)
         # as a base for everything else
-        self.install_lib = None
+        self.install_purelib = None
         self.install_platlib = None
-        self.install_path = None
+        self.install_lib = None
+
+        self.install_scripts = None
+        self.install_data = None
 
         self.build_base = None
         self.build_lib = None
         self.build_platlib = None
 
-        self.install_man = None
-        self.install_html = None
-        self.install_info = None
+        self.extra_path = None
+        self.install_path_file = 0
+
+        #self.install_man = None
+        #self.install_html = None
+        #self.install_info = None
 
         self.compile_py = 1
         self.optimize_py = 1
@@ -103,129 +156,234 @@ def finalize_options (self):
         # Figure out actual installation directories; the basic principle
         # is: ...
 
+
+
+        # Logic:
+        #   * any: (prefix or exec-prefix or home) and (base or platbase)
+        #     supplied: error
+        #   * Windows/Mac OS: exec-prefix or home supplied: warn and ignore
+        # 
+        #   * Unix: home set
+        #     (select the unix_home scheme)
+        #   * Unix: neither prefix nor home set
+        #     (set prefix=sys_prefix and carry on)
+        #   * Unix: prefix set but not exec-prefix
+        #     (set exec-prefix=prefix and carry on)
+        #   * Unix: prefix set
+        #     (select the unix_prefix scheme)
+        # 
+        #   * Windows/Mac OS: prefix not set
+        #     (set prefix = sys_prefix and carry on)
+        #   * Windows/Mac OS: prefix set
+        #     (select the appropriate scheme)
+
+        # "select a scheme" means:
+        #   - set install-base and install-platbase
+        #   - subst. base/platbase/version into the values of the
+        #     particular scheme dictionary
+        #   - use the resultings strings to set install-lib, etc.
+
         sys_prefix = os.path.normpath (sys.prefix)
         sys_exec_prefix = os.path.normpath (sys.exec_prefix)
 
-        if self.prefix is None:
-            if self.exec_prefix is not None:
+        # Check for errors/inconsistencies in the options
+        if ((self.prefix or self.exec_prefix or self.home) and
+            (self.install_base or self.install_platbase)):
+            raise DistutilsOptionError, \
+                  ("must supply either prefix/exec-prefix/home or " +
+                   "install-base/install-platbase -- not both")
+
+        if os.name == 'posix':
+            if self.home and (self.prefix or self.exec_prefix):
                 raise DistutilsOptionError, \
-                      "you may not supply exec_prefix without prefix"
-            self.prefix = sys_prefix
-        else:
-            # This is handy to guarantee that self.prefix is normalized --
-            # but it could be construed as rude to go normalizing a
-            # user-supplied path (they might like to see their "../" or
-            # symlinks in the installation feedback).
-            self.prefix = os.path.normpath (self.prefix)
-            
-        if self.exec_prefix is None:
-            if self.prefix == sys_prefix:
-                self.exec_prefix = sys_exec_prefix
-            else:
-                self.exec_prefix = self.prefix
+                      ("must supply either home or prefix/exec-prefix -- " +
+                       "not both")
         else:
-            # Same as above about handy versus rude to normalize user's
-            # exec_prefix.
-            self.exec_prefix = os.path.normpath (self.exec_prefix)
+            if self.exec_prefix:
+                self.warn ("exec-prefix option ignored on this platform")
+                self.exec_prefix = None
+            if self.home:
+                self.warn ("home option ignored on this platform")
+                self.home = None
+
+        # Now the interesting logic -- so interesting that we farm it out
+        # to other methods.  The goal of these methods is to set the final
+        # values for the install_{lib,scripts,data,...}  options, using as
+        # input a heady brew of prefix, exec_prefix, home, install_base,
+        # install_platbase, user-supplied versions of
+        # install_{purelib,platlib,lib,scripts,data,...}, and the
+        # INSTALL_SCHEME dictionary above.  Phew!
 
-        if self.distribution.ext_modules: # any extensions to install?
-            effective_prefix = self.exec_prefix
+        if os.name == 'posix':
+            self.finalize_unix ()
         else:
-            effective_prefix = self.prefix
+            self.finalize_other ()
+
+        # Expand "~" and configuration variables in the installation
+        # directories.
+        self.expand_dirs ()
+
+        # Pick the actual directory to install all modules to: either
+        # install_purelib or install_platlib, depending on whether this
+        # module distribution is pure or not.  Of course, if the user
+        # already specified install_lib, use their selection.
+        if self.install_lib is None:
+            if self.distribution.ext_modules: # has extensions: non-pure
+                self.install_lib = self.install_platlib
+            else:
+                self.install_lib = self.install_purelib
+                    
+        # Well, we're not actually fully completely finalized yet: we still
+        # have to deal with 'extra_path', which is the hack for allowing
+        # non-packagized module distributions (hello, Numerical Python!) to
+        # get their own directories.
+        self.handle_extra_path ()
+        self.install_libbase = self.install_lib # needed for .pth file
+        self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
 
-        if os.name == 'posix':
-            if self.install_lib is None:
-                if self.prefix == sys_prefix:
-                    self.install_lib = \
-                        os.path.join (effective_prefix,
-                                      "lib",
-                                      "python" + sys.version[:3],
-                                      "site-packages")
-                else:
-                    self.install_lib = \
-                        os.path.join (effective_prefix,
-                                      "lib",
-                                      "python")      # + sys.version[:3] ???
-            # end if self.install_lib ...
-
-            if self.install_platlib is None:
-                if self.exec_prefix == sys_exec_prefix:
-                    self.install_platlib = \
-                        os.path.join (effective_prefix,
-                                      "lib",
-                                      "python" + sys.version[:3],
-                                      "site-packages")
-                else:
-                    self.install_platlib = \
-                        os.path.join (effective_prefix,
-                                      "lib",
-                                      "python")      # + sys.version[:3] ???
-            # end if self.install_platlib ...
+        # Figure out the build directories, ie. where to install from
+        self.set_peer_option ('build', 'build_base', self.build_base)
+        self.set_undefined_options ('build',
+                                    ('build_base', 'build_base'),
+                                    ('build_lib', 'build_lib'),
+                                    ('build_platlib', 'build_platlib'))
+
+        # Punt on doc directories for now -- after all, we're punting on
+        # documentation completely!
 
+    # finalize_options ()
+
+
+    def finalize_unix (self):
+        
+        if self.install_base is not None or self.install_platbase is not None:
+            if ((self.install_lib is None and
+                 self.install_purelib is None and
+                 self.install_platlib is None) or
+                self.install_scripts is None or
+                self.install_data is None):
+                raise DistutilsOptionError, \
+                      "install-base or install-platbase supplied, but " + \
+                      "installation scheme is incomplete"
+
+            return
+
+        if self.home is not None:
+            self.install_base = self.install_platbase = self.home
+            self.select_scheme ("unix_home")
         else:
+            if self.prefix is None:
+                if self.exec_prefix is not None:
+                    raise DistutilsOptionError, \
+                          "must not supply exec-prefix without prefix"
+
+                self.prefix = os.path.normpath (sys.prefix)
+                self.exec_prefix = os.path.normpath (sys.exec_prefix)
+                self.install_path_file = 1
+
+            else:
+                if self.exec_prefix is None:
+                    self.exec_prefix = self.prefix
+
+
+            # XXX since we don't *know* that a user-supplied prefix really
+            # points to another Python installation, we can't be sure that
+            # writing a .pth file there will actually work -- so we don't
+            # try.  That is, we only set 'install_path_file' if the user
+            # didn't supply prefix.  There are certainly circumstances
+            # under which we *should* install a .pth file when the user
+            # supplies a prefix, namely when that prefix actually points to
+            # another Python installation.  Hmmm.
+
+            self.install_base = self.prefix
+            self.install_platbase = self.exec_prefix
+            self.select_scheme ("unix_prefix")
+
+    # finalize_unix ()
+
+
+    def finalize_other (self):          # Windows and Mac OS for now
+
+        if self.prefix is None:
+            self.prefix = os.path.normpath (sys.prefix)
+            self.install_path_file = 1
+
+        # XXX same caveat regarding 'install_path_file' as in
+        # 'finalize_unix()'.
+
+        self.install_base = self.install_platbase = self.prefix
+        try:
+            self.select_scheme (os.name)
+        except KeyError:
             raise DistutilsPlatformError, \
-                  "duh, I'm clueless (for now) about installing on %s" % os.name
+                  "I don't know how to install stuff on '%s'" % os.name
 
-        # end if/else on os.name
-                    
+    # finalize_other ()
+
+
+    def select_scheme (self, name):
+
+        # it's the caller's problem if they supply a bad name!
+        scheme = INSTALL_SCHEMES[name]
+
+        vars = { 'base': self.install_base,
+                 'platbase': self.install_platbase,
+                 'py_version_short': sys.version[0:3],
+               }
+
+        for key in ('purelib', 'platlib', 'scripts', 'data'):
+            val = subst_vars (scheme[key], vars)
+            setattr (self, 'install_' + key, val)
+
+
+    def expand_dirs (self):
+
+        # XXX probably don't want to 'expanduser()' on Windows or Mac
+        # XXX should use 'util.subst_vars()' with our own set of
+        #     configuration variables
+
+        for att in ('base', 'platbase',
+                    'purelib', 'platlib', 'lib',
+                    'scripts', 'data'):
+            fullname = "install_" + att
+            val = getattr (self, fullname)
+            if val is not None:
+                setattr (self, fullname,
+                         os.path.expandvars (os.path.expanduser (val)))
+
+
+    def handle_extra_path (self):
 
-        # 'path_file' and 'extra_dirs' are how we handle distributions that
-        # want to be installed to their own directory, but aren't
-        # package-ized yet.  'extra_dirs' is just a directory under
-        # 'install_lib' or 'install_platlib' where top-level modules will
-        # actually be installed; 'path_file' is the basename of a .pth file
-        # to drop in 'install_lib' or 'install_platlib' (depending on the
-        # distribution).  Very often they will be the same, which is why we
-        # allow them to be supplied as a string or 1-tuple as well as a
-        # 2-element comma-separated string or a 2-tuple.
-
-        # XXX this will drop a .pth file in install_{lib,platlib} even if
-        # they're not one of the site-packages directories: this is wrong!
-        # we need to suppress path_file in those cases, and warn if
-        # "install_lib/extra_dirs" is not in sys.path.
-
-        if self.install_path is None:
-            self.install_path = self.distribution.install_path
-
-        if self.install_path is not None:
-            if type (self.install_path) is StringType:
-                self.install_path = string.split (self.install_path, ',')
-
-            if len (self.install_path) == 1:
-                path_file = extra_dirs = self.install_path[0]
-            elif len (self.install_path) == 2:
-                (path_file, extra_dirs) = self.install_path
+        if self.extra_path is None:
+            self.extra_path = self.distribution.extra_path
+
+        if self.extra_path is not None:
+            if type (self.extra_path) is StringType:
+                self.extra_path = string.split (self.extra_path, ',')
+
+            if len (self.extra_path) == 1:
+                path_file = extra_dirs = self.extra_path[0]
+            elif len (self.extra_path) == 2:
+                (path_file, extra_dirs) = self.extra_path
             else:
                 raise DistutilsOptionError, \
-                      "'install_path' option must be a list, tuple, or " + \
+                      "'extra_path' option must be a list, tuple, or " + \
                       "comma-separated string with 1 or 2 elements"
 
-            # install path has slashes in it -- might need to convert to
-            # local form
-            if string.find (extra_dirs, '/') and os.name != "posix":
-                extra_dirs = string.split (extra_dirs, '/')
-                extra_dirs = apply (os.path.join, extra_dirs)
+            # convert to local form in case Unix notation used (as it
+            # should be in setup scripts)
+            extra_dirs = native_path (extra_dirs)
+
         else:
             path_file = None
             extra_dirs = ''
 
-        # XXX should we warn if path_file and not extra_dirs (in which case
-        # the path file would be harmless but pointless)
+        # XXX should we warn if path_file and not extra_dirs? (in which
+        # case the path file would be harmless but pointless)
         self.path_file = path_file
         self.extra_dirs = extra_dirs
 
-
-        # Figure out the build directories, ie. where to install from
-        self.set_peer_option ('build', 'build_base', self.build_base)
-        self.set_undefined_options ('build',
-                                    ('build_base', 'build_base'),
-                                    ('build_lib', 'build_lib'),
-                                    ('build_platlib', 'build_platlib'))
-
-        # Punt on doc directories for now -- after all, we're punting on
-        # documentation completely!
-
-    # finalize_options ()
+    # handle_extra_path ()
 
 
     def run (self):
@@ -238,28 +396,40 @@ def run (self):
         # extensions).  Note that 'install_py' is smart enough to install
         # pure Python modules in the "platlib" directory if we built any
         # extensions.
+
+        # XXX this should become one command, 'install_lib', since
+        # all modules are "built" into the same directory now
+
         if self.distribution.packages or self.distribution.py_modules:
             self.run_peer ('install_py')
-        if self.distribution.ext_modules:
-            self.run_peer ('install_ext')
+        #if self.distribution.ext_modules:
+        #    self.run_peer ('install_ext')
 
         if self.path_file:
             self.create_path_file ()
 
+        normalized_path = map (os.path.normpath, sys.path)
+        if (not (self.path_file and self.install_path_file) and
+            os.path.normpath (self.install_lib) not in normalized_path):
+            self.warn (("modules installed to '%s', which is not in " +
+                        "Python's module search path (sys.path) -- " +
+                        "you'll have to change the search path yourself") %
+                       self.install_lib)
+
     # run ()
 
 
     def create_path_file (self):
-
-        if self.distribution.ext_modules:
-            base = self.platbase
+        filename = os.path.join (self.install_libbase,
+                                 self.path_file + ".pth")
+        if self.install_path_file:
+            self.execute (write_file,
+                          (filename, [self.extra_dirs]),
+                          "creating %s" % filename)
         else:
-            base = self.base
-
-        filename = os.path.join (base, self.path_file + ".pth")
-        self.execute (write_file,
-                      (filename, [self.extra_dirs]),
-                      "creating %s" % filename)
-
+            self.warn (("path file '%s' not created for alternate or custom " +
+                        "installation (path files only work with standard " +
+                        "installations)") %
+                       filename)
 
 # class Install

From 4b8aee534fe757703ad35e112a716bd732ae0cc6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:20:46 +0000
Subject: [PATCH 0201/8469] Renamed 'install_path' to 'extra_path'. Fix
 'Command.set_undefined_option()' to call 'ensure_ready()' rather   than
 'finalize_options()' (which is only supposed to be called once,   which is
 the whole point of 'ensure_ready()'). Added comment to 'set_peer_option()' to
 remind myself that this method   cannot work and is fundamentally
 wrong-headed.

---
 core.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index dfe411b0cc..2f3a36d7d0 100644
--- a/core.py
+++ b/core.py
@@ -197,7 +197,7 @@ def __init__ (self, attrs=None):
         self.ext_modules = None
         self.ext_package = None
         self.include_dirs = None
-        self.install_path = None
+        self.extra_path = None
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
@@ -840,7 +840,7 @@ def set_undefined_options (self, src_cmd, *option_pairs):
         # Option_pairs: list of (src_option, dst_option) tuples
 
         src_cmd_obj = self.distribution.find_command_obj (src_cmd)
-        src_cmd_obj.finalize_options ()
+        src_cmd_obj.ensure_ready ()
         try:
             for (src_option, dst_option) in option_pairs:
                 if getattr (self, dst_option) is None:
@@ -862,6 +862,10 @@ def set_peer_option (self, command, option, value):
            second 'finalize_options()' invocation will have little or no
            effect."""
 
+        # XXX this won't work -- must call finalize_option to work, but
+        # calling finalize_option is wrong (it's only supposed to be called
+        # once).  Where is this needed?!??!
+
         cmd_obj = self.distribution.find_command_obj (command)
         cmd_obj.set_option (option, value)
         cmd_obj.finalize_options ()

From bcfea0afe66af5445e7660e4828a422161cf4126 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:22:44 +0000
Subject: [PATCH 0202/8469] Improved an error message in 'mkpath()'. Tightened
 up some logic in 'native_path()'. Added 'subst_vars()' and
 '_check_environ()'.

---
 util.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/util.py b/util.py
index 7a07b65648..b308b90dd0 100644
--- a/util.py
+++ b/util.py
@@ -11,7 +11,7 @@
 
 __revision__ = "$Id$"
 
-import os, string, shutil
+import os, string, re, shutil
 from distutils.errors import *
 
 
@@ -71,7 +71,8 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
             try:
                 os.mkdir (head)
             except os.error, (errno, errstr):
-                raise DistutilsFileError, "'%s': %s" % (head, errstr)
+                raise DistutilsFileError, \
+                      "could not create '%s': %s" % (head, errstr)
 
         PATH_CREATED[head] = 1
 
@@ -504,11 +505,10 @@ def native_path (pathname):
         raise DistutilsValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
         raise DistutilsValueError, "path '%s' cannot end with '/'" % pathname
-    if os.sep != '/':
-        if os.sep in pathname:
-            raise DistutilsValueError, \
-                  "path '%s' cannot contain '%c' character" % \
-                  (pathname, os.sep)
+    if os.sep != '/' and os.sep in pathname:
+        raise DistutilsValueError, \
+              "path '%s' cannot contain '%c' character" % \
+              (pathname, os.sep)
 
         paths = string.split (pathname, '/')
         return apply (os.path.join, paths)
@@ -516,3 +516,43 @@ def native_path (pathname):
         return pathname
 
 # native_path ()
+
+
+def _check_environ ():
+    """Ensure that 'os.environ' has all the environment variables we
+       guarantee that users can use in config files, command-line
+       options, etc.  Currently this includes:
+         HOME - user's home directory (Unix only)
+         PLAT - desription of the current platform, including hardware
+                and OS (see 'get_platform()')
+    """
+
+    if os.name == 'posix' and not os.environ.has_key('HOME'):
+        import pwd
+        os.environ['HOME'] = pwd.getpwuid (os.getuid())[5]
+
+    if not os.environ.has_key('PLAT'):
+        os.environ['PLAT'] = get_platform ()
+
+
+def subst_vars (str, local_vars):
+    """Perform shell/Perl-style variable substitution on 'string'.
+       Every occurence of '$' followed by a name, or a name enclosed in
+       braces, is considered a variable.  Every variable is substituted by
+       the value found in the 'local_vars' dictionary, or in 'os.environ'
+       if it's not in 'local_vars'.  'os.environ' is first checked/
+       augmented to guarantee that it contains certain values: see
+       '_check_environ()'.  Raise ValueError for any variables not found in
+       either 'local_vars' or 'os.environ'."""
+
+    _check_environ ()
+    def _subst (match, local_vars=local_vars):
+        var_name = match.group(1)
+        if local_vars.has_key (var_name):
+            return str (local_vars[var_name])
+        else:
+            return os.environ[var_name]
+
+    return re.sub (r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
+
+# subst_vars ()

From 03db2e6f44914364b5e32fa45de7002e13e08142 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:30:54 +0000
Subject: [PATCH 0203/8469] Dropped any notion of allowing the user to specify
 the build directories: these must come from the 'build' command.  This means
 we no longer need the misconceived 'set_peer_option()' method in Command and,
 more importantly, sweeps away a bunch of potential future complexity to
 handle this tricky case.

---
 command/install.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/command/install.py b/command/install.py
index 13baa1a756..a1b5d06aec 100644
--- a/command/install.py
+++ b/command/install.py
@@ -74,12 +74,6 @@ class install (Command):
         ('install-data=', None,
          "installation directory for data files"),
 
-        # Build directories: where to find the files to install
-        ('build-base=', None,
-         "base build directory"),
-        ('build-lib=', None,
-         "build directory for all Python modules"),
-
         # Where to install documentation (eventually!)
         #('doc-format=', None, "format of documentation to generate"),
         #('install-man=', None, "directory for Unix man pages"),
@@ -113,13 +107,18 @@ def initialize_options (self):
         self.install_scripts = None
         self.install_data = None
 
-        self.build_base = None
-        self.build_lib = None
-        self.build_platlib = None
-
         self.extra_path = None
         self.install_path_file = 0
 
+        # These are only here as a conduit from the 'build' command to the
+        # 'install_*' commands that do the real work.  ('build_base' isn't
+        # actually used anywhere, but it might be useful in future.)  They
+        # are not user options, because if the user told the install
+        # command where the build directory is, that wouldn't affect the
+        # build command.
+        self.build_base = None
+        self.build_lib = None
+
         #self.install_man = None
         #self.install_html = None
         #self.install_info = None
@@ -242,11 +241,9 @@ def finalize_options (self):
         self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
 
         # Figure out the build directories, ie. where to install from
-        self.set_peer_option ('build', 'build_base', self.build_base)
         self.set_undefined_options ('build',
                                     ('build_base', 'build_base'),
-                                    ('build_lib', 'build_lib'),
-                                    ('build_platlib', 'build_platlib'))
+                                    ('build_lib', 'build_lib'))
 
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!

From 6ec82e3176107f789ba8386705b60c2f65bf0999 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:31:37 +0000
Subject: [PATCH 0204/8469] Dropped the evil and misguided 'set_peer_option()'
 method -- it's no longer needed, and can't possibly work anyways.

---
 core.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/core.py b/core.py
index 2f3a36d7d0..df3646765f 100644
--- a/core.py
+++ b/core.py
@@ -851,26 +851,6 @@ def set_undefined_options (self, src_cmd, *option_pairs):
             raise DistutilsOptionError, "unknown option %s" % name
 
 
-    def set_peer_option (self, command, option, value):
-        """Attempt to simulate a command-line override of some option
-           value in another command.  Finds the command object for
-           'command', sets its 'option' to 'value', and unconditionally
-           calls 'finalize_options()' on it: this means that some command
-           objects may have 'finalize_options()' invoked more than once.
-           Even so, this is not entirely reliable: the other command may
-           already be initialized to its satisfaction, in which case the
-           second 'finalize_options()' invocation will have little or no
-           effect."""
-
-        # XXX this won't work -- must call finalize_option to work, but
-        # calling finalize_option is wrong (it's only supposed to be called
-        # once).  Where is this needed?!??!
-
-        cmd_obj = self.distribution.find_command_obj (command)
-        cmd_obj.set_option (option, value)
-        cmd_obj.finalize_options ()
-
-
     def find_peer (self, command, create=1):
         """Wrapper around Distribution's 'find_command_obj()' method:
            find (create if necessary and 'create' is true) the command

From eb49a5318baf4799d7b24e8ec6e4b9012b6ad0b1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:35:16 +0000
Subject: [PATCH 0205/8469] Obsolete command -- no longer relevant since we now
 build all modules, pure Python and extensions, into the same directory.

---
 command/install_ext.py | 43 ------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 command/install_ext.py

diff --git a/command/install_ext.py b/command/install_ext.py
deleted file mode 100644
index 14730909bb..0000000000
--- a/command/install_ext.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""install_ext
-
-Implement the Distutils "install_ext" command to install extension modules."""
-
-# created 1999/09/12, Greg Ward
-
-__revision__ = "$Id$"
-
-from distutils.core import Command
-from distutils.util import copy_tree
-
-class install_ext (Command):
-
-    description = "install C/C++ extension modules"
-    
-    user_options = [
-        ('install-dir=', 'd', "directory to install to"),
-        ('build-dir=','b', "build directory (where to install from)"),
-        ]
-
-    def initialize_options (self):
-        # let the 'install' command dictate our installation directory
-        self.install_dir = None
-        self.build_dir = None
-
-    def finalize_options (self):
-        self.set_undefined_options ('install',
-                                    ('build_lib', 'build_dir'),
-                                    ('install_lib', 'install_dir'))
-
-    def run (self):
-
-        # Make sure we have built all extension modules first
-        self.run_peer ('build_ext')
-
-        # Dump the entire "build/platlib" directory (or whatever it really
-        # is; "build/platlib" is the default) to the installation target
-        # (eg. "/usr/local/lib/python1.5/site-packages").  Note that
-        # putting files in the right package dir is already done when we
-        # build.
-        outfiles = self.copy_tree (self.build_dir, self.install_dir)
-
-# class InstallExt

From d3774f58433e614f683b466370188b4281c35735 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:37:16 +0000
Subject: [PATCH 0206/8469] Renamed install_py.py to install_lib.py, since it
 now handles installing all Python modules, pure and extensions.

---
 command/install_py.py | 76 -------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 command/install_py.py

diff --git a/command/install_py.py b/command/install_py.py
deleted file mode 100644
index 33cf6894e2..0000000000
--- a/command/install_py.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# created 1999/03/13, Greg Ward
-
-__revision__ = "$Id$"
-
-import sys, string
-from distutils.core import Command
-from distutils.util import copy_tree
-
-class install_py (Command):
-
-    description = "install pure Python modules"
-
-    user_options = [
-        ('install-dir=', 'd', "directory to install to"),
-        ('build-dir=','b', "build directory (where to install from)"),
-        ('compile', 'c', "compile .py to .pyc"),
-        ('optimize', 'o', "compile .py to .pyo (optimized)"),
-        ]
-               
-
-    def initialize_options (self):
-        # let the 'install' command dictate our installation directory
-        self.install_dir = None
-        self.build_dir = None
-        self.compile = 1
-        self.optimize = 1
-
-    def finalize_options (self):
-
-        # Get all the information we need to install pure Python modules
-        # from the umbrella 'install' command -- build (source) directory,
-        # install (target) directory, and whether to compile .py files.
-        self.set_undefined_options ('install',
-                                    ('build_lib', 'build_dir'),
-                                    ('install_lib', 'install_dir'),
-                                    ('compile_py', 'compile'),
-                                    ('optimize_py', 'optimize'))
-
-
-    def run (self):
-
-        # Make sure we have "built" all pure Python modules first
-        self.run_peer ('build_py')
-
-        # Install everything: simply dump the entire contents of the build
-        # directory to the installation directory (that's the beauty of
-        # having a build directory!)
-        outfiles = self.copy_tree (self.build_dir, self.install_dir)
-                   
-        # (Optionally) compile .py to .pyc
-        # XXX hey! we can't control whether we optimize or not; that's up
-        # to the invocation of the current Python interpreter (at least
-        # according to the py_compile docs).  That sucks.
-
-        if self.compile:
-            from py_compile import compile
-
-            for f in outfiles:
-                # XXX can't assume this filename mapping! (what if
-                # we're running under "python -O"?)
-
-                # only compile the file if it is actually a .py file
-                if f[-3:] == '.py':
-                    out_fn = string.replace (f, '.py', '.pyc')
-                    
-                    self.make_file (f, out_fn, compile, (f,),
-                                    "byte-compiling %s" % f,
-                                    "byte-compilation of %s skipped" % f)
-                    
-        # XXX ignore self.optimize for now, since we don't really know if
-        # we're compiling optimally or not, and couldn't pick what to do
-        # even if we did know.  ;-(
-
-    # run ()
-
-# class InstallPy

From 3603215dbb368ef0ffa0375174e2aeafc2d32fb1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:40:16 +0000
Subject: [PATCH 0207/8469] Run 'install_lib' instead of 'install_py', and
 ditch 'install_ext' completely (was already commented-out).

---
 command/install.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/command/install.py b/command/install.py
index a1b5d06aec..00aa072047 100644
--- a/command/install.py
+++ b/command/install.py
@@ -388,19 +388,10 @@ def run (self):
         # Obviously have to build before we can install
         self.run_peer ('build')
 
-        # Install modules in two steps: "platform-shared" files (ie. pure
-        # Python modules) and platform-specific files (compiled C
-        # extensions).  Note that 'install_py' is smart enough to install
-        # pure Python modules in the "platlib" directory if we built any
-        # extensions.
-
-        # XXX this should become one command, 'install_lib', since
-        # all modules are "built" into the same directory now
-
-        if self.distribution.packages or self.distribution.py_modules:
-            self.run_peer ('install_py')
-        #if self.distribution.ext_modules:
-        #    self.run_peer ('install_ext')
+        # Now install all Python modules -- don't bother to make this
+        # conditional; why would someone distribute a Python module
+        # distribution without Python modules?
+        self.run_peer ('install_lib')
 
         if self.path_file:
             self.create_path_file ()

From 2f194a8f5701e42aef8801075f4b72da7a482fd8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 22 Mar 2000 00:51:18 +0000
Subject: [PATCH 0208/8469] Revised tons of comments to reflect the current
 state of affairs better. Deleted some crufty code.

---
 command/install.py | 111 ++++++++++++++++-----------------------------
 1 file changed, 39 insertions(+), 72 deletions(-)

diff --git a/command/install.py b/command/install.py
index 00aa072047..ed74971efa 100644
--- a/command/install.py
+++ b/command/install.py
@@ -79,34 +79,38 @@ class install (Command):
         #('install-man=', None, "directory for Unix man pages"),
         #('install-html=', None, "directory for HTML documentation"),
         #('install-info=', None, "directory for GNU info files"),
-
-        # Flags for 'build_py'
-        #('compile-py', None, "compile .py to .pyc"),
-        #('optimize-py', None, "compile .py to .pyo (optimized)"),
         ]
 
 
     def initialize_options (self):
 
-        # Don't define 'prefix' or 'exec_prefix' so we can know when the
-        # command is run whether the user supplied values
+        # High-level options: these select both an installation base
+        # and scheme.
         self.prefix = None
         self.exec_prefix = None
         self.home = None
 
+        # These select only the installation base; it's up to the user to
+        # specify the installation scheme (currently, that means supplying
+        # the --install-{platlib,purelib,scripts,data} options).
         self.install_base = None
         self.install_platbase = None
 
-        # The actual installation directories are determined only at
-        # run-time, so the user can supply just prefix (and exec_prefix?)
-        # as a base for everything else
-        self.install_purelib = None
-        self.install_platlib = None
-        self.install_lib = None
-
+        # These options are the actual installation directories; if not
+        # supplied by the user, they are filled in using the installation
+        # scheme implied by prefix/exec-prefix/home and the contents of
+        # that installation scheme.
+        self.install_purelib = None     # for pure module distributions
+        self.install_platlib = None     # non-pure (dists w/ extensions)
+        self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
 
+        # These two are for putting non-packagized distributions into their
+        # own directory and creating a .pth file if it makes sense.
+        # 'extra_path' comes from the setup file; 'install_path_file' is
+        # set only if we determine that it makes sense to install a path
+        # file.
         self.extra_path = None
         self.install_path_file = 0
 
@@ -119,79 +123,36 @@ def initialize_options (self):
         self.build_base = None
         self.build_lib = None
 
+        # Not defined yet because we don't know anything about
+        # documentation yet.
         #self.install_man = None
         #self.install_html = None
         #self.install_info = None
 
-        self.compile_py = 1
-        self.optimize_py = 1
-
 
     def finalize_options (self):
 
-        # XXX this method is where the default installation directories
-        # for modules and extension modules are determined.  (Someday,
-        # the default installation directories for scripts,
-        # documentation, and whatever else the Distutils can build and
-        # install will also be determined here.)  Thus, this is a pretty
-        # important place to fiddle with for anyone interested in
-        # installation schemes for the Python library.  Issues that
-        # are not yet resolved to my satisfaction:
-        #   * how much platform dependence should be here, and
-        #     how much can be pushed off to sysconfig (or, better, the
-        #     Makefiles parsed by sysconfig)?
-        #   * how independent of Python version should this be -- ie.
-        #     should we have special cases to handle Python 1.5 and
-        #     older, and then do it "the right way" for 1.6?  Or should
-        #     we install a site.py along with Distutils under pre-1.6
-        #     Python to take care of the current deficiencies in
-        #     Python's library installation scheme?
-        #
-        # Currently, this method has hacks to distinguish POSIX from
-        # non-POSIX systems (for installation of site-local modules),
-        # and assumes the Python 1.5 installation tree with no site.py
-        # to fix things.
-
-        # Figure out actual installation directories; the basic principle
-        # is: ...
-
-
-
-        # Logic:
-        #   * any: (prefix or exec-prefix or home) and (base or platbase)
-        #     supplied: error
-        #   * Windows/Mac OS: exec-prefix or home supplied: warn and ignore
-        # 
-        #   * Unix: home set
-        #     (select the unix_home scheme)
-        #   * Unix: neither prefix nor home set
-        #     (set prefix=sys_prefix and carry on)
-        #   * Unix: prefix set but not exec-prefix
-        #     (set exec-prefix=prefix and carry on)
-        #   * Unix: prefix set
-        #     (select the unix_prefix scheme)
-        # 
-        #   * Windows/Mac OS: prefix not set
-        #     (set prefix = sys_prefix and carry on)
-        #   * Windows/Mac OS: prefix set
-        #     (select the appropriate scheme)
+        # This method (and its pliant slaves, like 'finalize_unix()',
+        # 'finalize_other()', and 'select_scheme()') is where the default
+        # installation directories for modules, extension modules, and
+        # anything else we care to install from a Python module
+        # distribution.  Thus, this code makes a pretty important policy
+        # statement about how third-party stuff is added to a Python
+        # installation!  Note that the actual work of installation is done
+        # by the relatively simple 'install_*' commands; they just take
+        # their orders from the installation directory options determined
+        # here.
 
-        # "select a scheme" means:
-        #   - set install-base and install-platbase
-        #   - subst. base/platbase/version into the values of the
-        #     particular scheme dictionary
-        #   - use the resultings strings to set install-lib, etc.
+        # Check for errors/inconsistencies in the options; first, stuff
+        # that's wrong on any platform.
 
-        sys_prefix = os.path.normpath (sys.prefix)
-        sys_exec_prefix = os.path.normpath (sys.exec_prefix)
-
-        # Check for errors/inconsistencies in the options
         if ((self.prefix or self.exec_prefix or self.home) and
             (self.install_base or self.install_platbase)):
             raise DistutilsOptionError, \
                   ("must supply either prefix/exec-prefix/home or " +
                    "install-base/install-platbase -- not both")
 
+        # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name == 'posix':
             if self.home and (self.prefix or self.exec_prefix):
                 raise DistutilsOptionError, \
@@ -240,7 +201,7 @@ def finalize_options (self):
         self.install_libbase = self.install_lib # needed for .pth file
         self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
 
-        # Figure out the build directories, ie. where to install from
+        # Find out the build directories, ie. where to install from.
         self.set_undefined_options ('build',
                                     ('build_base', 'build_base'),
                                     ('build_lib', 'build_lib'))
@@ -320,6 +281,12 @@ def finalize_other (self):          # Windows and Mac OS for now
 
     def select_scheme (self, name):
 
+        # "select a scheme" means:
+        #   - set install-base and install-platbase
+        #   - subst. base/platbase/version into the values of the
+        #     particular scheme dictionary
+        #   - use the resultings strings to set install-lib, etc.
+
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
 

From 51d7237f93809f4d6de8ed358a525777793e74d7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 23 Mar 2000 04:37:11 +0000
Subject: [PATCH 0209/8469] Fixed the class name.

---
 command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 33cf6894e2..eaaa1c7da2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,7 +6,7 @@
 from distutils.core import Command
 from distutils.util import copy_tree
 
-class install_py (Command):
+class install_lib (Command):
 
     description = "install pure Python modules"
 

From 89cec6fde3704c17ce83732bee0c0da4ef54a7a4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 23 Mar 2000 04:38:36 +0000
Subject: [PATCH 0210/8469] Fixed '_nt_quote_args()': backwards logic reversed,
 and now it actually returns a value.

---
 spawn.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spawn.py b/spawn.py
index ae3d09fa31..4e6f206991 100644
--- a/spawn.py
+++ b/spawn.py
@@ -53,9 +53,9 @@ def _nt_quote_args (args):
     # quoting?)
 
     for i in range (len (args)):
-        if string.find (args[i], ' ') == -1:
+        if string.find (args[i], ' ') != -1:
             args[i] = '"%s"' % args[i]
-
+    return 
 
 def _spawn_nt (cmd,
                search_path=1,

From 890ea186e16b49a61d19f9a9055c5e67a106ce3d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 23 Mar 2000 04:39:16 +0000
Subject: [PATCH 0211/8469] Import fix.

---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index b308b90dd0..caf9906281 100644
--- a/util.py
+++ b/util.py
@@ -11,7 +11,7 @@
 
 __revision__ = "$Id$"
 
-import os, string, re, shutil
+import sys, os, string, re, shutil
 from distutils.errors import *
 
 

From db89798d96147692062b0ecad0513f2476082c3e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:37:09 +0000
Subject: [PATCH 0212/8469] Added 'runtime_library_dirs' parameter to
 'link_*()' methods. Split '_fix_link_args()' up into '_fix_object_args()'
 (for use of   'create_static_lib() and link methods) and '_fix_lib_args()'
 (for the   link methods only).

---
 ccompiler.py | 71 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 28 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 4a8c1d38c8..ffad294706 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -338,16 +338,11 @@ def _prep_compile (self, sources, output_dir):
     # _prep_compile ()
 
 
-    def _fix_link_args (self, objects, output_dir,
-                        takes_libs=0, libraries=None, library_dirs=None):
-        """Typecheck and fix up some of the arguments supplied to the
-           'link_*' methods and return the fixed values.  Specifically:
-           ensure that 'objects' is a list; if output_dir is None, use
-           self.output_dir; ensure that 'libraries' and 'library_dirs' are
-           both lists, and augment them with 'self.libraries' and
-           'self.library_dirs'.  If 'takes_libs' is true, return a tuple
-           (objects, output_dir, libraries, library_dirs; else return
-           (objects, output_dir)."""
+    def _fix_object_args (self, objects, output_dir):
+        """Typecheck and fix up some arguments supplied to various
+           methods.  Specifically: ensure that 'objects' is a list; if
+           output_dir is None, replace with self.output_dir.  Return fixed
+           versions of 'objects' and 'output_dir'."""
 
         if type (objects) not in (ListType, TupleType):
             raise TypeError, \
@@ -359,28 +354,45 @@ def _fix_link_args (self, objects, output_dir,
         elif type (output_dir) is not StringType:
             raise TypeError, "'output_dir' must be a string or None"
 
-        if takes_libs:
-            if libraries is None:
-                libraries = self.libraries
-            elif type (libraries) in (ListType, TupleType):
-                libraries = list (libraries) + (self.libraries or [])
-            else:
-                raise TypeError, \
-                      "'libraries' (if supplied) must be a list of strings"
+        return (objects, output_dir)
 
-            if library_dirs is None:
-                library_dirs = self.library_dirs
-            elif type (library_dirs) in (ListType, TupleType):
-                library_dirs = list (library_dirs) + (self.library_dirs or [])
-            else:
-                raise TypeError, \
-                      "'library_dirs' (if supplied) must be a list of strings"
 
-            return (objects, output_dir, libraries, library_dirs)
+    def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
+        """Typecheck and fix up some of the arguments supplied to the
+           'link_*' methods.  Specifically: ensure that all arguments are
+           lists, and augment them with their permanent versions
+           (eg. 'self.libraries' augments 'libraries').  Return a tuple
+           with fixed versions of all arguments."""
+
+        if libraries is None:
+            libraries = self.libraries
+        elif type (libraries) in (ListType, TupleType):
+            libraries = list (libraries) + (self.libraries or [])
+        else:
+            raise TypeError, \
+                  "'libraries' (if supplied) must be a list of strings"
+
+        if library_dirs is None:
+            library_dirs = self.library_dirs
+        elif type (library_dirs) in (ListType, TupleType):
+            library_dirs = list (library_dirs) + (self.library_dirs or [])
         else:
-            return (objects, output_dir)
+            raise TypeError, \
+                  "'library_dirs' (if supplied) must be a list of strings"
+
+        if runtime_library_dirs is None:
+            runtime_library_dirs = self.runtime_library_dirs
+        elif type (runtime_library_dirs) in (ListType, TupleType):
+            runtime_library_dirs = (list (runtime_library_dirs) +
+                                    (self.runtime_library_dirs or []))
+        else:
+            raise TypeError, \
+                  "'runtime_library_dirs' (if supplied) " + \
+                  "must be a list of strings"
+
+        return (libraries, library_dirs, runtime_library_dirs)
 
-    # _fix_link_args ()
+    # _fix_lib_args ()
 
 
     def _need_link (self, objects, output_file):
@@ -480,6 +492,7 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -522,6 +535,7 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            runtime_library_dirs=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
@@ -540,6 +554,7 @@ def link_executable (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):

From 3aa1d946cf86103148fc70e553115286b9777694 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:40:19 +0000
Subject: [PATCH 0213/8469] Added 'runtime_library_dirs' parameter to
 'link_*()' methods, and changed to   use it when linking. Call
 '_fix_object_args()' and/or '_fix_lib_args()' as appropriate, rather   than
 just '_fix_link_args()'.

---
 unixccompiler.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index ec85571ddf..ec766f5405 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -146,7 +146,7 @@ def create_static_lib (self,
                            output_dir=None,
                            debug=0):
 
-        (objects, output_dir) = self._fix_link_args (objects, output_dir, takes_libs=0)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
 
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
@@ -169,6 +169,7 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -178,6 +179,7 @@ def link_shared_lib (self,
             output_dir,
             libraries,
             library_dirs,
+            runtime_library_dirs,
             debug,
             extra_preargs,
             extra_postargs)
@@ -189,16 +191,17 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            runtime_library_dirs=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
 
-        (objects, output_dir, libraries, library_dirs) = \
-            self._fix_link_args (objects, output_dir, takes_libs=1,
-                                 libraries=libraries, library_dirs=library_dirs)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
 
         lib_opts = gen_lib_options (self,
-                                    library_dirs, self.runtime_library_dirs,
+                                    library_dirs, runtime_library_dirs,
                                     libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
@@ -228,16 +231,17 @@ def link_executable (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
     
-        (objects, output_dir, libraries, library_dirs) = \
-            self._fix_link_args (objects, output_dir, takes_libs=1,
-                                 libraries=libraries, library_dirs=library_dirs)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
 
         lib_opts = gen_lib_options (self,
-                                    library_dirs, self.runtime_library_dirs,
+                                    library_dirs, runtime_library_dirs,
                                     libraries)
         output_filename = output_progname # Unix-ism!
         if output_dir is not None:

From f5e23859b6bba32958929ab54176f28e01a5b9f0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:42:28 +0000
Subject: [PATCH 0214/8469] Added 'runtime_library_dirs' parameter to
 'link_*()' methods, and warn that   we don't know what to do with it when we
 see it. Call '_fix_object_args()' and/or '_fix_lib_args()' as appropriate,
 rather   than just '_fix_link_args()'.

---
 msvccompiler.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 7324b8e1c6..bc27cea9b7 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -253,8 +253,7 @@ def create_static_lib (self,
                            extra_preargs=None,
                            extra_postargs=None):
 
-        (objects, output_dir) = \
-            self._fix_link_args (objects, output_dir, takes_libs=0)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
 
@@ -279,6 +278,7 @@ def link_shared_lib (self,
                          output_dir=None,
                          libraries=None,
                          library_dirs=None,
+                         runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -299,16 +299,21 @@ def link_shared_object (self,
                             output_dir=None,
                             libraries=None,
                             library_dirs=None,
+                            runtime_library_dirs=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
 
-        (objects, output_dir, libraries, library_dirs) = \
-            self._fix_link_args (objects, output_dir, takes_libs=1,
-                                 libraries=libraries, library_dirs=library_dirs)
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+        if self.runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
         
         lib_opts = gen_lib_options (self,
-                                    library_dirs, self.runtime_library_dirs,
+                                    library_dirs, runtime_library_dirs,
                                     libraries)
         if type (output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"

From 362881283944c95f424b461590f9d2f81e378d0a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:45:14 +0000
Subject: [PATCH 0215/8469] Fixed a bunch of screwed-up logic and inconsistent
 terminology. Fixed 'build_extensions()' to pay attention to the 'rpath'
 element of the   'build_info' dictionary.

---
 command/build_ext.py | 52 ++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1d8794a6e4..ff680fa953 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -56,7 +56,7 @@ class build_ext (Command):
          "C preprocessor macros to define"),
         ('undef=', 'U',
          "C preprocessor macros to undefine"),
-        ('libs=', 'l',
+        ('libraries=', 'l',
          "external C libraries to link with"),
         ('library-dirs=', 'L',
          "directories to search for external C libraries"),
@@ -79,7 +79,7 @@ def initialize_options (self):
         self.include_dirs = None
         self.define = None
         self.undef = None
-        self.libs = None
+        self.libraries = None
         self.library_dirs = None
         self.rpath = None
         self.link_objects = None
@@ -117,8 +117,8 @@ def finalize_options (self):
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
 
-        if type (self.libs) is StringType:
-            self.libs = [self.libs]
+        if type (self.libraries) is StringType:
+            self.libraries = [self.libraries]
 
         # XXX how the heck are 'self.define' and 'self.undef' supposed to
         # be set?
@@ -144,11 +144,33 @@ def run (self):
         # First, sanity-check the 'self.extensions' list
         self.check_extensions_list (self.extensions)
 
+        # Simplify the following logic (eg. don't have to worry about
+        # appending to None)
+        if self.libraries is None:
+            self.libraries = []
+        if self.library_dirs is None:
+            self.library_dirs = []
+        if self.rpath is None:
+            self.rpath = []
+
+        # If we were asked to build any C/C++ libraries, make sure that the
+        # directory where we put them is in the library search path for
+        # linking extensions.
+        if self.distribution.libraries:
+            build_clib = self.find_peer ('build_clib')
+            self.libraries.extend (build_clib.get_library_names() or [])
+            self.library_dirs.append (build_clib.build_clib)
+
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
         self.compiler = new_compiler (verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
+
+        # And make sure that any compile/link-related options (which might
+        # come from the command-line or from the setup script) are set in
+        # that CCompiler object -- that way, they automatically apply to
+        # all compiling and linking done here.
         if self.include_dirs is not None:
             self.compiler.set_include_dirs (self.include_dirs)
         if self.define is not None:
@@ -158,8 +180,8 @@ def run (self):
         if self.undef is not None:
             for macro in self.undef:
                 self.compiler.undefine_macro (macro)
-        if self.libs is not None:
-            self.compiler.set_libraries (self.libs)
+        if self.libraries is not None:
+            self.compiler.set_libraries (self.libraries)
         if self.library_dirs is not None:
             self.compiler.set_library_dirs (self.library_dirs)
         if self.rpath is not None:
@@ -167,15 +189,7 @@ def run (self):
         if self.link_objects is not None:
             self.compiler.set_link_objects (self.link_objects)
 
-        if self.distribution.libraries:
-            build_clib = self.find_peer ('build_clib')
-            self.libraries = build_clib.get_library_names () or []
-            self.library_dirs = [build_clib.build_clib]
-        else:
-            self.libraries = []
-            self.library_dirs = []
-
-        # Now the real loop over extensions
+        # Now actually compile and link everything.
         self.build_extensions (self.extensions)
 
             
@@ -257,10 +271,9 @@ def build_extensions (self, extensions):
             extra_objects = build_info.get ('extra_objects')
             if extra_objects:
                 objects.extend (extra_objects)
-            libraries = (self.libraries +
-                         (build_info.get ('libraries') or []))
-            library_dirs = (self.library_dirs +
-                            (build_info.get ('library_dirs') or []))
+            libraries = build_info.get ('libraries')
+            library_dirs = build_info.get ('library_dirs')
+            rpath = build_info.get ('rpath')
             extra_args = build_info.get ('extra_link_args') or []
 
             if self.compiler.compiler_type == 'msvc':
@@ -299,6 +312,7 @@ def build_extensions (self, extensions):
             self.compiler.link_shared_object (objects, ext_filename, 
                                               libraries=libraries,
                                               library_dirs=library_dirs,
+                                              runtime_library_dirs=rpath,
                                               extra_postargs=extra_args,
                                               debug=self.debug)
 

From 5da6867520bab8d1abc3f7699207ac55bc6a03f9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:47:00 +0000
Subject: [PATCH 0216/8469] Duh, it helps if '_nt_quote_args()' actually
 returns the mutated list, rather than None.

---
 spawn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spawn.py b/spawn.py
index 4e6f206991..86ea3dfb50 100644
--- a/spawn.py
+++ b/spawn.py
@@ -55,7 +55,7 @@ def _nt_quote_args (args):
     for i in range (len (args)):
         if string.find (args[i], ' ') != -1:
             args[i] = '"%s"' % args[i]
-    return 
+    return args
 
 def _spawn_nt (cmd,
                search_path=1,

From ece89d8b1b55c795e1de3e8842e22ca3eebd3f3d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 26 Mar 2000 21:48:43 +0000
Subject: [PATCH 0217/8469] Beefed up error-handling in 'setup()' a smidge:
 handle OSError and DistutilsExecError now.

---
 core.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index df3646765f..5090f25bc3 100644
--- a/core.py
+++ b/core.py
@@ -98,13 +98,15 @@ def setup (**attrs):
             dist.run_commands ()
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
-        except IOError, exc:
+        except (OSError, IOError), exc:
             # arg, try to work with Python pre-1.5.2
             if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
                 raise SystemExit, \
                       "error: %s: %s" % (exc.filename, exc.strerror)
             else:
                 raise SystemExit, str (exc)
+        except DistutilsExecError, msg:
+            raise SystemExit, "error: " + str (msg)
 
 # setup ()
 

From 05135cd1557034010a85409726c822d34dcc5043 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:10:51 +0000
Subject: [PATCH 0218/8469] Deleted some crufty comments and code. A host of
 improvements in preparation for the 'bdist' command:   - added
 'get_outputs()' method (all the other improvements were to support     this
 addition)   - made 'find_package_modules()' and 'find_modules()' return
 similar     values (list of (package, module, module_filename) tuples)   -
 factored 'find_all_modules()' out of 'get_source_files()' (needed     by
 'get_outputs()')   - factored 'get_module_outfile()' out of 'build_module()'
 (also needed     by 'get_outputs()')   - various little tweaks, improvements,
 comment/doc updates

---
 command/build_py.py | 85 ++++++++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 4e5255a67c..3baddc62c7 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -58,17 +58,6 @@ def run (self):
         # installation will look like (ie. we preserve mode when
         # installing).
 
-        # XXX copy_file does *not* preserve MacOS-specific file metadata.
-        # If this is a problem for building/installing Python modules, then
-        # we'll have to fix copy_file.  (And what about installing scripts,
-        # when the time comes for that -- does MacOS use its special
-        # metadata to know that a file is meant to be interpreted by
-        # Python?)
-
-        infiles = []
-        outfiles = []
-        missing = []
-
         # Two options control which modules will be installed: 'packages'
         # and 'modules'.  The former lets us work with whole packages, not
         # specifying individual modules at all; the latter is for
@@ -171,16 +160,17 @@ def check_module (self, module, module_file):
 
 
     def find_package_modules (self, package, package_dir):
+        self.check_package (package, package_dir)
         module_files = glob (os.path.join (package_dir, "*.py"))
-        module_pairs = []
+        modules = []
         setup_script = os.path.abspath (sys.argv[0])
 
         for f in module_files:
             abs_f = os.path.abspath (f)
             if abs_f != setup_script:
                 module = os.path.splitext (os.path.basename (f))[0]
-                module_pairs.append ((module, f))
-        return module_pairs
+                modules.append ((package, module, f))
+        return modules
 
 
     def find_modules (self):
@@ -222,14 +212,19 @@ def find_modules (self):
             if not self.check_module (module, module_file):
                 continue
 
-            modules.append ((module, package, module_file))
+            modules.append ((package, module, module_file))
 
         return modules
 
     # find_modules ()
 
 
-    def get_source_files (self):
+    def find_all_modules (self):
+        """Compute the list of all modules that will be built, whether
+        they are specified one-module-at-a-time ('self.modules') or
+        by whole packages ('self.packages').  Return a list of tuples
+        (package, module, module_file), just like 'find_modules()' and
+        'find_package_modules()' do."""
 
         if self.modules:
             modules = self.find_modules ()
@@ -240,18 +235,37 @@ def get_source_files (self):
                 m = self.find_package_modules (package, package_dir)
                 modules.extend (m)
 
-        # Both find_modules() and find_package_modules() return a list of
-        # tuples where the last element of each tuple is the filename --
-        # what a happy coincidence!
+        return modules
+
+    # find_all_modules ()
+
+
+    def get_source_files (self):
+
+        modules = self.find_all_modules ()
         filenames = []
         for module in modules:
             filenames.append (module[-1])
 
-        return filenames                
+        return filenames
 
 
-    def build_module (self, module, module_file, package):
+    def get_module_outfile (self, build_dir, package, module):
+        outfile_path = [build_dir] + list(package) + [module + ".py"]
+        return apply (os.path.join, outfile_path)
+
+
+    def get_outputs (self):
+        modules = self.find_all_modules ()
+        outputs = []
+        for (package, module, module_file) in modules:
+            package = string.split (package, '.')
+            outputs.append (self.get_module_outfile (self.build_lib,
+                                                     package, module))
+        return outputs
 
+
+    def build_module (self, module, module_file, package):
         if type (package) is StringType:
             package = string.split (package, '.')
         elif type (package) not in (ListType, TupleType):
@@ -261,11 +275,7 @@ def build_module (self, module, module_file, package):
         # Now put the module source file into the "build" area -- this is
         # easy, we just copy it somewhere under self.build_lib (the build
         # directory for Python source).
-        outfile_path = list (package)
-        outfile_path.append (module + ".py")
-        outfile_path.insert (0, self.build_lib)
-        outfile = apply (os.path.join, outfile_path)
-
+        outfile = self.get_module_outfile (self.build_lib, package, module)
         dir = os.path.dirname (outfile)
         self.mkpath (dir)
         self.copy_file (module_file, outfile, preserve_mode=0)
@@ -274,7 +284,7 @@ def build_module (self, module, module_file, package):
     def build_modules (self):
 
         modules = self.find_modules()
-        for (module, package, module_file) in modules:
+        for (package, module, module_file) in modules:
 
             # Now "build" the module -- ie. copy the source file to
             # self.build_lib (the build directory for Python source).
@@ -288,20 +298,23 @@ def build_modules (self):
     def build_packages (self):
 
         for package in self.packages:
+
+            # Get list of (package, module, module_file) tuples based on
+            # scanning the package directory.  'package' is only included
+            # in the tuple so that 'find_modules()' and
+            # 'find_package_tuples()' have a consistent interface; it's
+            # ignored here (apart from a sanity check).  Also, 'module' is
+            # the *unqualified* module name (ie. no dots, no package -- we
+            # already know its package!), and 'module_file' is the path to
+            # the .py file, relative to the current directory
+            # (ie. including 'package_dir').
             package_dir = self.get_package_dir (package)
-            self.check_package (package, package_dir)
-
-            # Get list of (module, module_file) tuples based on scanning
-            # the package directory.  Here, 'module' is the *unqualified*
-            # module name (ie. no dots, no package -- we already know its
-            # package!), and module_file is the path to the .py file,
-            # relative to the current directory (ie. including
-            # 'package_dir').
             modules = self.find_package_modules (package, package_dir)
 
             # Now loop over the modules we found, "building" each one (just
             # copy it to self.build_lib).
-            for (module, module_file) in modules:
+            for (package_, module, module_file) in modules:
+                assert package == package_
                 self.build_module (module, module_file, package)
 
     # build_packages ()

From be2cdd814051b3e077646a20ad98330a52e2f707 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:13:09 +0000
Subject: [PATCH 0219/8469] Added 'get_outputs()' in prepartion for the 'bdist'
 command. Changed signature of 'build_extensions()': no longer takes the
 extension   list, but uses 'self.extensions' (just like 'get_outputs()' has
 to) Moved call to 'check_extensions_list()' from 'run()' to
 'build_extensions()',   again for consistency with 'get_outputs()'.

---
 command/build_ext.py | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ff680fa953..7d88c06332 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -141,9 +141,6 @@ def run (self):
         if not self.extensions:
             return
 
-        # First, sanity-check the 'self.extensions' list
-        self.check_extensions_list (self.extensions)
-
         # Simplify the following logic (eg. don't have to worry about
         # appending to None)
         if self.libraries is None:
@@ -156,7 +153,7 @@ def run (self):
         # If we were asked to build any C/C++ libraries, make sure that the
         # directory where we put them is in the library search path for
         # linking extensions.
-        if self.distribution.libraries:
+        if self.distribution.has_c_libraries():
             build_clib = self.find_peer ('build_clib')
             self.libraries.extend (build_clib.get_library_names() or [])
             self.library_dirs.append (build_clib.build_clib)
@@ -190,9 +187,10 @@ def run (self):
             self.compiler.set_link_objects (self.link_objects)
 
         # Now actually compile and link everything.
-        self.build_extensions (self.extensions)
+        self.build_extensions ()
+
+    # run ()
 
-            
 
     def check_extensions_list (self, extensions):
         """Ensure that the list of extensions (presumably provided as a
@@ -239,9 +237,32 @@ def get_source_files (self):
         return filenames
 
 
+    def get_outputs (self):
+
+        # Sanity check the 'extensions' list -- can't assume this is being
+        # done in the same run as a 'build_extensions()' call (in fact, we
+        # can probably assume that it *isn't*!).
+        self.check_extensions_list (self.extensions)
+
+        # And build the list of output (built) filenames.  Note that this
+        # ignores the 'inplace' flag, and assumes everything goes in the
+        # "build" tree.
+        outputs = []
+        for (extension_name, build_info) in self.extensions:
+            fullname = self.get_ext_fullname (extension_name)
+            outputs.append (os.path.join (self.build_lib,
+                                          self.get_ext_filename(fullname)))
+        return outputs
+
+    # get_outputs ()
+
+
     def build_extensions (self, extensions):
 
-        for (extension_name, build_info) in extensions:
+        # First, sanity-check the 'extensions' list
+        self.check_extensions_list (self.extensions)
+
+        for (extension_name, build_info) in self.extensions:
             sources = build_info.get ('sources')
             if sources is None or type (sources) not in (ListType, TupleType):
                 raise DistutilsValueError, \
@@ -290,7 +311,7 @@ def build_extensions (self, extensions):
                 else:
                     modname = string.split (extension_name, '.')[-1]
                     extra_args.append('/export:init%s'%modname)
-            # end if MSVC
+            # if MSVC
 
             fullname = self.get_ext_fullname (extension_name)
             if self.inplace:

From d71b7f8620d2a8953c38ccc08541db8a7f087c51 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:14:21 +0000
Subject: [PATCH 0220/8469] Use the new 'has_pure_modules()',
 'has_ext_modules()', 'has_c_libraries()' methods of Distribution instead of
 grovelling directly in self.distribution.

---
 command/build.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build.py b/command/build.py
index 97466fdb48..2da589ab29 100644
--- a/command/build.py
+++ b/command/build.py
@@ -80,18 +80,18 @@ def run (self):
 
         # Invoke the 'build_py' command to "build" pure Python modules
         # (ie. copy 'em into the build tree)
-        if self.distribution.packages or self.distribution.py_modules:
+        if self.distribution.has_pure_modules():
             self.run_peer ('build_py')
 
         # Build any standalone C libraries next -- they're most likely to
         # be needed by extension modules, so obviously have to be done
         # first!
-        if self.distribution.libraries:
+        if self.distribution.has_c_libraries():
             self.run_peer ('build_clib')
 
         # And now 'build_ext' -- compile extension modules and put them
         # into the build tree
-        if self.distribution.ext_modules:
+        if self.distribution.has_ext_modules():
             self.run_peer ('build_ext')
 
 # end class Build

From 5d534b66bc25e3d1455e98944b5e5b6dfb1b7eb1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:15:57 +0000
Subject: [PATCH 0221/8469] Changed so the sub-commands we rely on to do the
 real work is specified   in a class attribute 'sub_commands', rather than
 hard-coded in 'run()'.   This should make it easier to subclass 'install',
 and also makes it   easier to keep 'run()' and the new 'get_outputs()'
 consistent. Added 'get_outputs()' in preparation for the 'bdist' command.

---
 command/install.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index ed74971efa..ac9ec86517 100644
--- a/command/install.py
+++ b/command/install.py
@@ -82,6 +82,14 @@ class install (Command):
         ]
 
 
+    # 'sub_commands': a list of commands this command might have to run
+    # to get its work done.  Each command is represented as a tuple
+    # (func, command) where 'func' is a function to call that returns
+    # true if 'command' (the sub-command name, a string) needs to be
+    # run.  If 'func' is None, assume that 'command' must always be run.
+    sub_commands = [(None, 'install_lib')]
+
+
     def initialize_options (self):
 
         # High-level options: these select both an installation base
@@ -355,10 +363,11 @@ def run (self):
         # Obviously have to build before we can install
         self.run_peer ('build')
 
-        # Now install all Python modules -- don't bother to make this
-        # conditional; why would someone distribute a Python module
-        # distribution without Python modules?
-        self.run_peer ('install_lib')
+        # Run all sub-commands: currently this just means install all
+        # Python modules using 'install_lib'.
+        for (func, cmd) in self.sub_commands:
+            if func is None or func():
+                self.run_peer (cmd)
 
         if self.path_file:
             self.create_path_file ()
@@ -374,6 +383,17 @@ def run (self):
     # run ()
 
 
+    def get_outputs (self):
+        # This command doesn't have any outputs of its own, so just
+        # get the outputs of all its sub-commands.
+        outputs = []
+        for (func, cmd) in self.sub_commands:
+            if func is None or func():
+                outputs.extend (self.run_peer (cmd))
+
+        return outputs
+
+
     def create_path_file (self):
         filename = os.path.join (self.install_libbase,
                                  self.path_file + ".pth")

From 66878bbd6f4d2c871a13c3eb34a8c8a988f7eaa3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:17:42 +0000
Subject: [PATCH 0222/8469] Be sure to run both 'build_py' and 'build_ext', now
 that this command   is responsible for installing all Python modules (pure
 and extensions). Added 'get_outputs()' in preparation for the 'bdist'
 command, and   '_mutate_outputs()' to support 'get_outputs()'.

---
 command/install_lib.py | 52 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index eaaa1c7da2..7e1f2e2a4d 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -2,7 +2,7 @@
 
 __revision__ = "$Id$"
 
-import sys, string
+import sys, os, string
 from distutils.core import Command
 from distutils.util import copy_tree
 
@@ -39,14 +39,17 @@ def finalize_options (self):
 
     def run (self):
 
-        # Make sure we have "built" all pure Python modules first
-        self.run_peer ('build_py')
+        # Make sure we have built everything we need first
+        if self.distribution.has_pure_modules():
+            self.run_peer ('build_py')
+        if self.distribution.has_ext_modules():
+            self.run_peer ('build_ext')
 
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of
         # having a build directory!)
         outfiles = self.copy_tree (self.build_dir, self.install_dir)
-                   
+
         # (Optionally) compile .py to .pyc
         # XXX hey! we can't control whether we optimize or not; that's up
         # to the invocation of the current Python interpreter (at least
@@ -73,4 +76,43 @@ def run (self):
 
     # run ()
 
-# class InstallPy
+
+    def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
+
+        if not has_any:
+            return []
+
+        build_cmd = self.find_peer (build_cmd)
+        build_files = build_cmd.get_outputs()
+        build_dir = build_cmd.get_option (cmd_option)
+
+        prefix_len = len (build_dir) + len (os.sep)
+        outputs = []
+        for file in build_files:
+            outputs.append (os.path.join (output_dir, file[prefix_len:]))
+
+        return outputs
+
+    # _mutate_outputs ()
+        
+    def get_outputs (self):
+        """Return the list of files that would be installed if this command
+        were actually run.  Not affected by the "dry-run" flag or whether
+        modules have actually been built yet."""
+
+        pure_outputs = \
+            self._mutate_outputs (self.distribution.has_pure_modules(),
+                                  'build_py', 'build_lib',
+                                  self.install_dir)
+
+
+        ext_outputs = \
+            self._mutate_outputs (self.distribution.has_ext_modules(),
+                                  'build_ext', 'build_lib',
+                                  self.install_dir)
+
+        return pure_outputs + ext_outputs
+
+    # get_outputs ()
+
+# class install_lib

From f925cbf975d85ad247f6d790159af67f3967d7b2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:18:39 +0000
Subject: [PATCH 0223/8469] Added 'build_clib'; replaced 'install_py' and
 'install_ext' with 'install_lib'.

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

diff --git a/command/__init__.py b/command/__init__.py
index d2b37a8ce1..b7973c6142 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -8,9 +8,9 @@
 __all__ = ['build',
            'build_py',
            'build_ext',
+           'build_clib',
            'install',
-           'install_py',
-           'install_ext',
+           'install_lib',
            'clean',
            'sdist',
           ]

From 104be39562c08bd0c87944ce3a13014a30459c43 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:20:45 +0000
Subject: [PATCH 0224/8469] Added the "distribution query" methods:
 'has_pure_modules()', 'has_ext_modules()', 'has_c_libraries()',
 'has_modules()', and 'is_pure()'.

---
 core.py | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 5090f25bc3..08a1d641d1 100644
--- a/core.py
+++ b/core.py
@@ -618,7 +618,27 @@ def get_command_options (self, command, *options):
 
         return tuple (values)
 
-# end class Distribution
+
+    # -- Distribution query methods ------------------------------------
+
+    def has_pure_modules (self):
+        return len (self.packages or self.py_modules or []) > 0
+
+    def has_ext_modules (self):
+        return self.ext_modules and len (self.ext_modules) > 0
+
+    def has_c_libraries (self):
+        return self.libraries and len (self.libraries) > 0
+
+    def has_modules (self):
+        return self.has_pure_modules() or self.has_ext_modules()
+
+    def is_pure (self):
+        return (self.has_pure_modules() and
+                not self.has_ext_modules() and
+                not self.has_c_libraries())
+
+# class Distribution
 
 
 class Command:
@@ -992,4 +1012,4 @@ def make_file (self, infiles, outfile, func, args,
 
     # make_file ()
 
-# end class Command
+# class Command

From 4aa19c2a2cd09156c6706104f484738302ca7901 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:47:29 +0000
Subject: [PATCH 0225/8469] Moved the guts of 'make_tarball()' and
 'make_zipfile()' to distutils.util in preparation for the 'bdist_dumb'
 command; these methods remain as trivial wrappers around the versions in
 distutils.util.

---
 command/sdist.py | 57 ++++--------------------------------------------
 1 file changed, 4 insertions(+), 53 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 0c15177893..19e1773111 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,7 +11,7 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import newer, remove_tree
+from distutils.util import newer, remove_tree, make_tarball, make_zipfile
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError
 
@@ -503,60 +503,11 @@ def make_release_tree (self, base_dir, files):
     # make_release_tree ()
 
 
-    def make_tarball (self, base_dir, compress="gzip"):
-
-        # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-        # It's pretty new, though, so we certainly can't require it --
-        # but it would be nice to take advantage of it to skip the
-        # "create a tree of hardlinks" step!  (Would also be nice to
-        # detect GNU tar to use its 'z' option and save a step.)
-
-        if compress is not None and compress not in ('gzip', 'compress'):
-            raise ValueError, \
-                  "if given, 'compress' must be 'gzip' or 'compress'"
-
-        archive_name = base_dir + ".tar"
-        self.spawn (["tar", "-cf", archive_name, base_dir])
-
-        if compress:
-            self.spawn ([compress, archive_name])
-
+    def make_tarball (self, base_dir, compress):
+        make_tarball (base_dir, compress, self.verbose, self.dry_run)
 
     def make_zipfile (self, base_dir):
-
-        # This initially assumed the Unix 'zip' utility -- but
-        # apparently InfoZIP's zip.exe works the same under Windows, so
-        # no changes needed!
-
-        try:
-            self.spawn (["zip", "-r", base_dir + ".zip", base_dir])
-        except DistutilsExecError:
-
-            # XXX really should distinguish between "couldn't find
-            # external 'zip' command" and "zip failed" -- shouldn't try
-            # again in the latter case.  (I think fixing this will
-            # require some cooperation from the spawn module -- perhaps
-            # a utility function to search the path, so we can fallback
-            # on zipfile.py without the failed spawn.)
-            try:
-                import zipfile
-            except ImportError:
-                raise DistutilsExecError, \
-                      ("unable to create zip file '%s.zip': " + 
-                       "could neither find a standalone zip utility nor " +
-                       "import the 'zipfile' module") % base_dir
-
-            z = zipfile.ZipFile (base_dir + ".zip", "wb",
-                                 compression=zipfile.ZIP_DEFLATED)
-            
-            def visit (z, dirname, names):
-                for name in names:
-                    path = os.path.join (dirname, name)
-                    if os.path.isfile (path):
-                        z.write (path, path)
-                        
-            os.path.walk (base_dir, visit, z)
-            z.close()
+        make_zipfile (base_dir, self.verbose, self.dry_run)
 
 
     def make_distribution (self):

From 872994b9087f38871f5fba8b6b0062db9a2714cf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:48:40 +0000
Subject: [PATCH 0226/8469] Added 'make_tarball()' and 'make_zipfile()'
 functions in preparation for the 'bdist_dumb' command.  Adapted, with
 tweakage, from the 'sdist' command.

---
 util.py | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index caf9906281..b40373c486 100644
--- a/util.py
+++ b/util.py
@@ -13,7 +13,7 @@
 
 import sys, os, string, re, shutil
 from distutils.errors import *
-
+from distutils.spawn import spawn
 
 # cache for by mkpath() -- in addition to cheapening redundant calls,
 # eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
@@ -316,7 +316,6 @@ def copy_tree (src, dst,
                verbose=0,
                dry_run=0):
 
-
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
        'src' and 'dst' must be directory names.  If 'src' is not a
        directory, raise DistutilsFileError.  If 'dst' does not exist, it
@@ -556,3 +555,92 @@ def _subst (match, local_vars=local_vars):
     return re.sub (r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
 
 # subst_vars ()
+
+
+def make_tarball (base_dir, compress="gzip", verbose=0, dry_run=0):
+    """Create a (possibly compressed) tar file from all the files under
+       'base_dir'.  'compress' must be "gzip" (the default), "compress", or
+       None.  Both "tar" and the compression utility named by 'compress'
+       must be on the default program search path, so this is probably
+       Unix-specific.  The output tar file will be named 'base_dir' +
+       ".tar", possibly plus the appropriate compression extension
+       (".gz" or ".Z").  Return the output filename."""
+
+    # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
+    # It's pretty new, though, so we certainly can't require it --
+    # but it would be nice to take advantage of it to skip the
+    # "create a tree of hardlinks" step!  (Would also be nice to
+    # detect GNU tar to use its 'z' option and save a step.)
+
+    compress_ext = { 'gzip': ".gz",
+                     'compress': ".Z" }
+
+    if compress is not None and compress not in ('gzip', 'compress'):
+        raise ValueError, \
+              "bad value for 'compress': must be None, 'gzip', or 'compress'"
+
+    archive_name = base_dir + ".tar"
+    cmd = ["tar", "-cf", archive_name, base_dir]
+    spawn (cmd, verbose=verbose, dry_run=dry_run)
+
+    if compress:
+        spawn ([compress, archive_name], verbose=verbose, dry_run=dry_run)
+        return archive_name + compress_ext[compress]
+    else:
+        return archive_name
+
+# make_tarball ()
+
+
+def make_zipfile (base_dir, verbose=0, dry_run=0):
+    """Create a ZIP file from all the files under 'base_dir'.  The
+       output ZIP file will be named 'base_dir' + ".zip".  Uses either the
+       InfoZIP "zip" utility (if installed and found on the default search
+       path) or the "zipfile" Python module (if available).  If neither
+       tool is available, raises DistutilsExecError.  Returns the name
+       of the output ZIP file."""
+
+    # This initially assumed the Unix 'zip' utility -- but
+    # apparently InfoZIP's zip.exe works the same under Windows, so
+    # no changes needed!
+
+    zip_filename = base_dir + ".zip"
+    try:
+        spawn (["zip", "-r", zip_filename, base_dir],
+               verbose=verbose, dry_run=dry_run)
+    except DistutilsExecError:
+
+        # XXX really should distinguish between "couldn't find
+        # external 'zip' command" and "zip failed" -- shouldn't try
+        # again in the latter case.  (I think fixing this will
+        # require some cooperation from the spawn module -- perhaps
+        # a utility function to search the path, so we can fallback
+        # on zipfile.py without the failed spawn.)
+        try:
+            import zipfile
+        except ImportError:
+            raise DistutilsExecError, \
+                  ("unable to create zip file '%s': " + 
+                   "could neither find a standalone zip utility nor " +
+                   "import the 'zipfile' module") % zip_filename
+
+        if verbose:
+            print "creating '%s' and adding '%s' to it" % \
+                  (zip_filename, base_dir)
+
+        def visit (z, dirname, names):
+            for name in names:
+                path = os.path.join (dirname, name)
+                if os.path.isfile (path):
+                    z.write (path, path)
+
+        if not dry_run:
+            z = zipfile.ZipFile (zip_filename, "wb",
+                                 compression=zipfile.ZIP_DEFLATED)
+
+            os.path.walk (base_dir, visit, z)
+            z.close()
+
+    return zip_filename
+
+# make_zipfile ()

From 4546cfbf7ed2f8292aebd4f795132e0656a518d7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:53:02 +0000
Subject: [PATCH 0227/8469] Patch from Bastian Kleineidam
 <calvin@cs.uni-sb.de>: make 'mkdir()' return list of directories created.

---
 util.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/util.py b/util.py
index b40373c486..6351bc7edc 100644
--- a/util.py
+++ b/util.py
@@ -38,11 +38,11 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     # we're not using a recursive algorithm)
 
     name = os.path.normpath (name)
-
+    created_dirs = []
     if os.path.isdir (name) or name == '':
-        return
+        return created_dirs
     if PATH_CREATED.get (name):
-        return
+        return created_dirs
 
     (head, tail) = os.path.split (name)
     tails = [tail]                      # stack of lone dirs to create
@@ -70,11 +70,13 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
         if not dry_run:
             try:
                 os.mkdir (head)
+                created_dirs.append(head)
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
                       "could not create '%s': %s" % (head, errstr)
 
         PATH_CREATED[head] = 1
+    return created_dirs
 
 # mkpath ()
 

From 408127fea3cd246776bfaac7c16cce3e250f0bee Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 02:56:34 +0000
Subject: [PATCH 0228/8469] Documented Bastian's patch. Made handling OSError
 in 'mkpath()' more standard.

---
 util.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/util.py b/util.py
index 6351bc7edc..8242e10fc1 100644
--- a/util.py
+++ b/util.py
@@ -24,11 +24,13 @@
 # succeed in that case).
 def mkpath (name, mode=0777, verbose=0, dry_run=0):
     """Create a directory and any missing ancestor directories.  If the
-       directory already exists, return silently.  Raise
-       DistutilsFileError if unable to create some directory along the
-       way (eg. some sub-path exists, but is a file rather than a
-       directory).  If 'verbose' is true, print a one-line summary of
-       each mkdir to stdout."""
+       directory already exists (or if 'name' is the empty string, which
+       means the current directory, which of course exists), then do
+       nothing.  Raise DistutilsFileError if unable to create some
+       directory along the way (eg. some sub-path exists, but is a file
+       rather than a directory).  If 'verbose' is true, print a one-line
+       summary of each mkdir to stdout.  Return the list of directories
+       actually created."""
 
     global PATH_CREATED
 
@@ -71,9 +73,9 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
             try:
                 os.mkdir (head)
                 created_dirs.append(head)
-            except os.error, (errno, errstr):
+            except OSError, exc:
                 raise DistutilsFileError, \
-                      "could not create '%s': %s" % (head, errstr)
+                      "could not create '%s': %s" % (head, exc[-1])
 
         PATH_CREATED[head] = 1
     return created_dirs

From 6d6e77e2094148c5f828f314e7858209a4c78d25 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 03:27:45 +0000
Subject: [PATCH 0229/8469] Changed 'copy_tree()' so it returns the list of all
 files that were copied or might have been copied, regardless of the 'update'
 flag.

---
 util.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/util.py b/util.py
index 8242e10fc1..272961948e 100644
--- a/util.py
+++ b/util.py
@@ -322,13 +322,14 @@ def copy_tree (src, dst,
 
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
        'src' and 'dst' must be directory names.  If 'src' is not a
-       directory, raise DistutilsFileError.  If 'dst' does not exist, it
-       is created with 'mkpath()'.  The end result of the copy is that
-       every file in 'src' is copied to 'dst', and directories under
-       'src' are recursively copied to 'dst'.  Return the list of files
-       copied (under their output names) -- note that if 'update' is true,
-       this might be less than the list of files considered.  Return
-       value is not affected by 'dry_run'.
+       directory, raise DistutilsFileError.  If 'dst' does not exist, it is
+       created with 'mkpath()'.  The end result of the copy is that every
+       file in 'src' is copied to 'dst', and directories under 'src' are
+       recursively copied to 'dst'.  Return the list of files that were
+       copied or might have been copied, using their output name.  The
+       return value is unaffected by 'update' or 'dry_run': it is simply
+       the list of all files under 'src', with the names changed to be
+       under 'dst'.
 
        'preserve_mode' and 'preserve_times' are the same as for
        'copy_file'; note that they only apply to regular files, not to
@@ -372,10 +373,10 @@ def copy_tree (src, dst,
                            preserve_mode, preserve_times, preserve_symlinks,
                            update, verbose, dry_run))
         else:
-            if (copy_file (src_name, dst_name,
-                           preserve_mode, preserve_times,
-                           update, verbose, dry_run)):
-                outputs.append (dst_name)
+            copy_file (src_name, dst_name,
+                       preserve_mode, preserve_times,
+                       update, verbose, dry_run)
+            outputs.append (dst_name)
 
     return outputs
 

From 90d8d95cef6f3195a62348dfcaf06afa616cdb65 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 03:29:34 +0000
Subject: [PATCH 0230/8469] Patch inspired by Bastian Kleineidam
 <calvin@cs.uni-sb.de>: use global __debug__ flag to determine if compiled
 files will be ".pyc" or ".pyo".  Tweaked compilation output messages too.

---
 command/install_lib.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 7e1f2e2a4d..64f7cbcf27 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -59,21 +59,16 @@ def run (self):
             from py_compile import compile
 
             for f in outfiles:
-                # XXX can't assume this filename mapping! (what if
-                # we're running under "python -O"?)
-
                 # only compile the file if it is actually a .py file
                 if f[-3:] == '.py':
-                    out_fn = string.replace (f, '.py', '.pyc')
-                    
+                    out_fn = f + (__debug__ and "c" or "o")
+                    compile_msg = "byte-compiling %s to %s" % \
+                                  (f, os.path.basename (out_fn))
+                    skip_msg = "byte-compilation of %s skipped" % f
                     self.make_file (f, out_fn, compile, (f,),
-                                    "byte-compiling %s" % f,
-                                    "byte-compilation of %s skipped" % f)
-                    
-        # XXX ignore self.optimize for now, since we don't really know if
-        # we're compiling optimally or not, and couldn't pick what to do
-        # even if we did know.  ;-(
-
+                                    compile_msg, skip_msg)
+                                    
+                                    
     # run ()
 
 

From 93bb283e4ed96e98f1203996045abe8ddd0b69fa Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 04:13:00 +0000
Subject: [PATCH 0231/8469] Call 'find_exe()', not '_find_exe()'.

---
 msvccompiler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index bc27cea9b7..298991049f 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -166,9 +166,9 @@ def __init__ (self,
         if versions:
             version = versions[0]  # highest version
 
-            self.cc   = _find_exe("cl.exe", version)
-            self.link = _find_exe("link.exe", version)
-            self.lib  = _find_exe("lib.exe", version)
+            self.cc   = find_exe("cl.exe", version)
+            self.link = find_exe("link.exe", version)
+            self.lib  = find_exe("lib.exe", version)
             set_path_env_var ('lib', version)
             set_path_env_var ('include', version)
             path=get_msvc_paths('path', version)

From c8a944d9a695816880e7f7aec21b351aa7df6185 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 29 Mar 2000 04:13:49 +0000
Subject: [PATCH 0232/8469] Put the Python "system" include dir last, rather
 than first.

---
 command/build_ext.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7d88c06332..96e7ce524f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -113,7 +113,9 @@ def finalize_options (self):
             self.include_dirs = string.split (self.include_dirs,
                                               os.pathsep)
 
-        self.include_dirs.insert (0, py_include)
+        # Put the Python "system" include dir at the end, so that
+        # any local include dirs take precedence.
+        self.include_dirs.append (py_include)
         if exec_py_include != py_include:
             self.include_dirs.insert (0, exec_py_include)
 

From 97eeb322fc5bdf19b0fa8fe387c09b11addb040e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 30 Mar 2000 19:47:22 +0000
Subject: [PATCH 0233/8469] Oops: 'build_extensions()' no longer takes an
 'extensions' list.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 96e7ce524f..f2e0b319b3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -259,7 +259,7 @@ def get_outputs (self):
     # get_outputs ()
 
 
-    def build_extensions (self, extensions):
+    def build_extensions (self):
 
         # First, sanity-check the 'extensions' list
         self.check_extensions_list (self.extensions)

From 986617164899c1f6a746c99318c4bebe6a0a8646 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:50:04 +0000
Subject: [PATCH 0234/8469] Changed to use the new 'has_pure_modules()' and
 'has_ext_modules()' methods   provided by Distribution. Cosmetic and error
 message tweaks. Simplified 'make_release_tree()':   * extracted
 'distutils.util.create_tree()'   * don't have to do hard-linking ourselves --
 it's now handled by     'distutils.util.copy_file()' (although the detection
 of     whether hard linking is available still needs to be factored out)
 Removed 'make_tarball()' and 'make_zipfile()' entirely -- their role   is now
 amply filled by 'distutils.util.make_archive()'. Simplified
 'make_distribution()':   * use Distribution's new 'get_full_name()' method  
 * use 'make_archive()' instead of if/elif/.../else on the archive format

---
 command/sdist.py | 71 +++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 52 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 19e1773111..7dbd40138a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,7 +11,8 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import newer, remove_tree, make_tarball, make_zipfile
+from distutils.util import \
+     newer, remove_tree, make_tarball, make_zipfile, create_tree
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError
 
@@ -78,8 +79,8 @@ def finalize_options (self):
                 self.formats = [self.default_format[os.name]]
             except KeyError:
                 raise DistutilsPlatformError, \
-                      "don't know how to build source distributions on " + \
-                      "%s platform" % os.name
+                      "don't know how to create source distributions " + \
+                      "on platform %s" % os.name
         elif type (self.formats) is StringType:
             self.formats = string.split (self.formats, ',')
 
@@ -219,18 +220,15 @@ def find_defaults (self):
             if files:
                 self.files.extend (files)
 
-        if self.distribution.packages or self.distribution.py_modules:
+        if self.distribution.has_pure_modules():
             build_py = self.find_peer ('build_py')
-            build_py.ensure_ready ()
             self.files.extend (build_py.get_source_files ())
 
-        if self.distribution.ext_modules:
+        if self.distribution.has_ext_modules():
             build_ext = self.find_peer ('build_ext')
-            build_ext.ensure_ready ()
             self.files.extend (build_ext.get_source_files ())
 
 
-
     def search_dir (self, dir, pattern=None):
         """Recursively find files under 'dir' matching 'pattern' (a string
            containing a Unix-style glob pattern).  If 'pattern' is None,
@@ -465,16 +463,10 @@ def read_manifest (self):
 
     def make_release_tree (self, base_dir, files):
 
-        # First get the list of directories to create
-        need_dir = {}
-        for file in files:
-            need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
-        need_dirs = need_dir.keys()
-        need_dirs.sort()
-
-        # Now create them
-        for dir in need_dirs:
-            self.mkpath (dir)
+        # Create all the directories under 'base_dir' necessary to
+        # put 'files' there.
+        create_tree (base_dir, files,
+                     verbose=self.verbose, dry_run=self.dry_run)
 
         # And walk over the list of files, either making a hard link (if
         # os.link exists) to each one that doesn't already exist in its
@@ -483,44 +475,26 @@ def make_release_tree (self, base_dir, files):
         # out-of-date, because by default we blow away 'base_dir' when
         # we're done making the distribution archives.)
     
-        try:
-            link = os.link
+        if hasattr (os, 'link'):        # can make hard links on this system
+            link = 'hard'
             msg = "making hard links in %s..." % base_dir
-        except AttributeError:
-            link = 0
+        else:                           # nope, have to copy
+            link = None
             msg = "copying files to %s..." % base_dir
 
         self.announce (msg)
         for file in files:
             dest = os.path.join (base_dir, file)
-            if link:
-                if not os.path.exists (dest):
-                    self.execute (os.link, (file, dest),
-                                  "linking %s -> %s" % (file, dest))
-            else:
-                self.copy_file (file, dest)
+            self.copy_file (file, dest, link=link)
 
     # make_release_tree ()
 
 
-    def make_tarball (self, base_dir, compress):
-        make_tarball (base_dir, compress, self.verbose, self.dry_run)
-
-    def make_zipfile (self, base_dir):
-        make_zipfile (base_dir, self.verbose, self.dry_run)
-
-
     def make_distribution (self):
 
-        # Don't warn about missing meta-data here -- should be done
-        # elsewhere.
-        name = self.distribution.name or "UNKNOWN"
-        version = self.distribution.version
-
-        if version:
-            base_dir = "%s-%s" % (name, version)
-        else:
-            base_dir = name
+        # Don't warn about missing meta-data here -- should be (and is!)
+        # done elsewhere.
+        base_dir = self.distribution.get_full_name()
 
         # Remove any files that match "base_dir" from the fileset -- we
         # don't want to go distributing the distribution inside itself!
@@ -528,14 +502,7 @@ def make_distribution (self):
  
         self.make_release_tree (base_dir, self.files)
         for fmt in self.formats:
-            if fmt == 'gztar':
-                self.make_tarball (base_dir, compress='gzip')
-            elif fmt == 'ztar':
-                self.make_tarball (base_dir, compress='compress')
-            elif fmt == 'tar':
-                self.make_tarball (base_dir, compress=None)
-            elif fmt == 'zip':
-                self.make_zipfile (base_dir)
+            self.make_archive (base_dir, fmt, base_dir=base_dir)
 
         if not self.keep_tree:
             remove_tree (base_dir, self.verbose, self.dry_run)

From fa293d87ba55e60937559c9647bcef24827cba77 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:52:02 +0000
Subject: [PATCH 0235/8469] Fixed 'get_outputs()' so it actually works. Added
 'get_inputs()' (which is strikingly similar to 'get_outputs()' - sigh).
 Cosmetic tweaks.

---
 command/install.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index ac9ec86517..995fd875c3 100644
--- a/command/install.py
+++ b/command/install.py
@@ -365,9 +365,9 @@ def run (self):
 
         # Run all sub-commands: currently this just means install all
         # Python modules using 'install_lib'.
-        for (func, cmd) in self.sub_commands:
+        for (func, cmd_name) in self.sub_commands:
             if func is None or func():
-                self.run_peer (cmd)
+                self.run_peer (cmd_name)
 
         if self.path_file:
             self.create_path_file ()
@@ -387,13 +387,25 @@ def get_outputs (self):
         # This command doesn't have any outputs of its own, so just
         # get the outputs of all its sub-commands.
         outputs = []
-        for (func, cmd) in self.sub_commands:
+        for (func, cmd_name) in self.sub_commands:
             if func is None or func():
-                outputs.extend (self.run_peer (cmd))
+                cmd = self.find_peer (cmd_name)
+                outputs.extend (cmd.get_outputs())
 
         return outputs
 
 
+    def get_inputs (self):
+        # XXX gee, this looks familiar ;-(
+        inputs = []
+        for (func, cmd_name) in self.sub_commands:
+            if func is None or func():
+                cmd = self.find_peer (cmd_name)
+                inputs.extend (cmd.get_inputs())
+
+        return inputs
+
+
     def create_path_file (self):
         filename = os.path.join (self.install_libbase,
                                  self.path_file + ".pth")

From 3e2f02534c35d876d827a766dac2cf397092d04f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:53:07 +0000
Subject: [PATCH 0236/8469] Added 'get_inputs()'.

---
 command/install_lib.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/command/install_lib.py b/command/install_lib.py
index 64f7cbcf27..5740c5eed2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -110,4 +110,24 @@ def get_outputs (self):
 
     # get_outputs ()
 
+    def get_inputs (self):
+        """Get the list of files that are input to this command, ie. the
+        files that get installed as they are named in the build tree.
+        The files in this list correspond one-to-one to the output
+        filenames returned by 'get_outputs()'."""
+
+        inputs = []
+        
+        if self.distribution.has_pure_modules():
+            build_py = self.find_peer ('build_py')
+            inputs.extend (build_py.get_outputs())
+
+        if self.distribution.has_ext_modules():
+            build_ext = self.find_peer ('build_ext')
+            inputs.extend (build_ext.get_outputs())
+
+        return inputs
+            
+        
+
 # class install_lib

From bdd1b78665f1d2ad66df4add652548e04474a315 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:55:12 +0000
Subject: [PATCH 0237/8469] The 'bdist' command, for creating "built" (binary)
 distributions. Initial revision is pretty limited; it only knows how to
 generate "dumb" binary distributions, i.e. a tarball on Unix and a zip file
 on Windows. Also, due to limitations in the installation code, it only knows
 how to distribute Python library code.  But hey, it's a start.

---
 command/bdist.py | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 command/bdist.py

diff --git a/command/bdist.py b/command/bdist.py
new file mode 100644
index 0000000000..5630828580
--- /dev/null
+++ b/command/bdist.py
@@ -0,0 +1,70 @@
+"""distutils.command.bdist
+
+Implements the Distutils 'bdist' command (create a built [binary]
+distribution)."""
+
+# created 2000/03/29, Greg Ward
+
+__revision__ = "$Id$"
+
+import os, string
+from distutils.core import Command
+
+
+class bdist (Command):
+
+    description = "create a built (binary) distribution"
+
+    user_options = [('formats=', 'f',
+                     "formats for distribution (tar, ztar, gztar, zip, ... )"),
+                   ]
+
+    # This won't do in reality: will need to distinguish RPM-ish Linux,
+    # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
+    default_format = { 'posix': 'gztar',
+                       'nt': 'zip', }
+
+    format_command = { 'gztar': 'bdist_dumb',
+                       'zip':   'bdist_dumb', }
+
+
+    def initialize_options (self):
+        self.formats = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        if self.formats is None:
+            try:
+                self.formats = [self.default_format[os.name]]
+            except KeyError:
+                raise DistutilsPlatformError, \
+                      "don't know how to create built distributions " + \
+                      "on platform %s" % os.name
+        elif type (self.formats) is StringType:
+            self.formats = string.split (self.formats, ',')
+            
+
+    # finalize_options()
+
+
+    def run (self):
+
+        for format in self.formats:
+            cmd_name = self.format_command[format]
+            sub_cmd = self.find_peer (cmd_name)
+            sub_cmd.set_option ('format', format)
+
+            # XXX blecchhh!! should formalize this: at least a
+            # 'forget_run()' (?)  method, possibly complicate the
+            # 'have_run' dictionary to include some command state as well
+            # as the command name -- eg. in this case we might want
+            # ('bdist_dumb','zip') to be marked "have run", but not
+            # ('bdist_dumb','gztar').
+            self.distribution.have_run[cmd_name] = 0
+            self.run_peer (cmd_name)
+
+    # run()
+
+# class bdist

From 24d3df10c8c218a584fd5f3d5f1701fd31dc9730 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:56:34 +0000
Subject: [PATCH 0238/8469] The 'bdist_dumb' command, the first worker bee for
 use by 'bdist'.  This is the command that actually creates "dumb" binary
 distributions, ie. tarballs and zip files that you just unpack under <prefix>
 or <exec-prefix>. Very limited, but it's a start.

---
 command/bdist_dumb.py | 131 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 command/bdist_dumb.py

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
new file mode 100644
index 0000000000..4383a8fa9f
--- /dev/null
+++ b/command/bdist_dumb.py
@@ -0,0 +1,131 @@
+"""distutils.command.bdist_dumb
+
+Implements the Distutils 'bdist_dumb' command (create a "dumb" built
+distribution -- i.e., just an archive to be unpacked under $prefix or
+$exec_prefix)."""
+
+# created 2000/03/29, Greg Ward
+
+__revision__ = "$Id$"
+
+import os
+from distutils.core import Command
+from distutils.util import get_platform, create_tree
+
+
+class bdist_dumb (Command):
+
+    description = "create a \"dumb\" built distribution"
+
+    user_options = [('format=', 'f',
+                     "archive format to create (tar, ztar, gztar, zip)"),
+                   ]
+
+    default_format = { 'posix': 'gztar',
+                       'nt': 'zip', }
+
+
+    def initialize_options (self):
+        self.format = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        if self.format is None:
+            try:
+                self.format = self.default_format[os.name]
+            except KeyError:
+                raise DistutilsPlatformError, \
+                      ("don't know how to create dumb built distributions " +
+                       "on platform %s") % os.name
+
+    # finalize_options()
+
+
+    def run (self):
+
+        self.run_peer ('build')
+        install = self.find_peer ('install')
+        inputs = install.get_inputs ()
+        outputs = install.get_outputs ()
+        assert (len (inputs) == len (outputs))
+
+        # First, strip the installation base directory (prefix or
+        # exec-prefix) from all the output filenames.
+        self.strip_base_dirs (outputs, install)
+
+        # Figure out where to copy them to: "build/bdist" by default; this
+        # directory masquerades as prefix/exec-prefix (ie.  we'll make the
+        # archive from 'output_dir').
+        build_base = self.get_peer_option ('build', 'build_base')
+        output_dir = os.path.join (build_base, "bdist")
+
+        # Copy the built files to the pseudo-installation tree.
+        self.make_install_tree (output_dir, inputs, outputs)
+
+        # And make an archive relative to the root of the
+        # pseudo-installation tree.
+        archive_basename = "%s.%s" % (self.distribution.get_full_name(),
+                                      get_platform())
+        self.make_archive (archive_basename, self.format,
+                           root_dir=output_dir)
+
+    # run()
+
+
+    def strip_base_dirs (self, outputs, install_cmd):
+        # XXX this throws away the prefix/exec-prefix distinction, and
+        # means we can only correctly install the resulting archive on a
+        # system where prefix == exec-prefix (but at least we can *create*
+        # it on one where they differ).  I don't see a way to fix this
+        # without either 1) generating two archives, one for prefix and one
+        # for exec-prefix, or 2) putting absolute paths in the archive
+        # rather than making them relative to one of the prefixes.
+
+        base = install_cmd.install_base + os.sep
+        platbase = install_cmd.install_platbase + os.sep
+        b_len = len (base)
+        pb_len = len (platbase)
+        for i in range (len (outputs)):
+            if outputs[i][0:b_len] == base:
+                outputs[i] = outputs[i][b_len:]
+            elif outputs[i][0:pb_len] == platbase:
+                outputs[i] = outputs[i][pb_len:]
+            else:
+                raise DistutilsInternalError, \
+                      ("installation output filename '%s' doesn't start " + 
+                       "with either install_base ('%s') or " +
+                       "install_platbase ('%s')") % \
+                      (outputs[i], base, platbase)
+
+    # strip_base_dirs()
+
+
+    def make_install_tree (self, output_dir, inputs, outputs):
+
+        assert (len(inputs) == len(outputs))
+
+        # Create all the directories under 'output_dir' necessary to
+        # put 'outputs' there.
+        create_tree (output_dir, outputs,
+                     verbose=self.verbose, dry_run=self.dry_run)
+
+
+        # XXX this bit of logic is duplicated in sdist.make_release_tree():
+        # would be nice to factor it out...
+        if hasattr (os, 'link'):        # can make hard links on this system
+            link = 'hard'
+            msg = "making hard links in %s..." % output_dir
+        else:                           # nope, have to copy
+            link = None
+            msg = "copying files to %s..." % output_dir
+
+        for i in range (len(inputs)):
+            output = os.path.join (output_dir, outputs[i])
+            self.copy_file (inputs[i], output, link=link)
+
+    # make_install_tree ()
+
+
+# class bdist_dumb

From 55e4b812a77be3b24b104184c9c8970a874c805c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 02:57:31 +0000
Subject: [PATCH 0239/8469] Added DistutilsInternalError.

---
 errors.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/errors.py b/errors.py
index 86d91dd6c0..f9d5c8de5a 100644
--- a/errors.py
+++ b/errors.py
@@ -68,6 +68,11 @@ class DistutilsPlatformError (DistutilsError):
     class DistutilsExecError (DistutilsError):
         pass
 
+    # DistutilsInternalError is raised on internal inconsistencies
+    # or impossibilities
+    class DistutilsInternalError (DistutilsError):
+        pass
+
 # String-based exceptions
 else:
     DistutilsError = 'DistutilsError'
@@ -80,5 +85,6 @@ class DistutilsExecError (DistutilsError):
     DistutilsValueError = 'DistutilsValueError'
     DistutilsPlatformError = 'DistutilsPlatformError'
     DistutilsExecError = 'DistutilsExecError'
+    DistutilsInternalError = 'DistutilsInternalError'
     
 del types

From 2ffc581e227586358f5f8e262afe5e6aac8e3cc8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:02:22 +0000
Subject: [PATCH 0240/8469] Added 'create_tree()'. Changes to 'copy_file()':  
 * added support for making hard links and symlinks   * noted that it silently
 clobbers existing files when copying, but     blows up if destination exists
 when linking -- hmmm...   * error message tweak Added 'base_name' parameter
 to 'make_tarball()' and 'make_zipfile()'. Added 'make_archive()' -- wrapper
 around 'make_tarball()' or   'make_zipfile()' to take care of the archive
 "root directory".

---
 util.py | 160 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 135 insertions(+), 25 deletions(-)

diff --git a/util.py b/util.py
index 272961948e..6674d0aa18 100644
--- a/util.py
+++ b/util.py
@@ -19,6 +19,11 @@
 # eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
 PATH_CREATED = {}
 
+# for generating verbose output in 'copy_file()'
+_copy_action = { None:   'copying',
+                 'hard': 'hard linking',
+                 'sym':  'symbolically linking' }
+
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
@@ -83,6 +88,30 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 # mkpath ()
 
 
+def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
+
+    """Create all the empty directories under 'base_dir' needed to
+       put 'files' there.  'base_dir' is just the a name of a directory
+       which doesn't necessarily exist yet; 'files' is a list of filenames
+       to be interpreted relative to 'base_dir'.  'base_dir' + the
+       directory portion of every file in 'files' will be created if it
+       doesn't already exist.  'mode', 'verbose' and 'dry_run' flags are as
+       for 'mkpath()'."""
+
+    # First get the list of directories to create
+    need_dir = {}
+    for file in files:
+        need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
+    need_dirs = need_dir.keys()
+    need_dirs.sort()
+
+    # Now create them
+    for dir in need_dirs:
+        mkpath (dir, mode, verbose, dry_run)
+
+# create_tree ()
+
+
 def newer (source, target):
     """Return true if 'source' exists and is more recently modified than
        'target', or if 'source' exists and 'target' doesn't.  Return
@@ -241,6 +270,7 @@ def copy_file (src, dst,
                preserve_mode=1,
                preserve_times=1,
                update=0,
+               link=None,
                verbose=0,
                dry_run=0):
 
@@ -256,17 +286,32 @@ def copy_file (src, dst,
        'verbose' is true, then a one-line summary of the copy will be
        printed to stdout.
 
+       'link' allows you to make hard links (os.link) or symbolic links
+       (os.symlink) instead of copying: set it to "hard" or "sym"; if it
+       is None (the default), files are copied.  Don't set 'link' on
+       systems that don't support it: 'copy_file()' doesn't check if
+       hard or symbolic linking is availalble.
+
+       Under Mac OS, uses the native file copy function in macostools;
+       on other systems, uses '_copy_file_contents()' to copy file
+       contents.
+
        Return true if the file was copied (or would have been copied),
        false otherwise (ie. 'update' was true and the destination is
        up-to-date)."""
 
-    # XXX doesn't copy Mac-specific metadata
-       
+    # XXX if the destination file already exists, we clobber it if
+    # copying, but blow up if linking.  Hmmm.  And I don't know what
+    # macostools.copyfile() does.  Should definitely be consistent, and
+    # should probably blow up if destination exists and we would be
+    # changing it (ie. it's not already a hard/soft link to src OR
+    # (not update) and (src newer than dst).
+
     from stat import *
 
     if not os.path.isfile (src):
         raise DistutilsFileError, \
-              "can't copy '%s': not a regular file" % src
+              "can't copy '%s': doesn't exist or not a regular file" % src
 
     if os.path.isdir (dst):
         dir = dst
@@ -279,8 +324,13 @@ def copy_file (src, dst,
             print "not copying %s (output up-to-date)" % src
         return 0
 
+    try:
+        action = _copy_action[link]
+    except KeyError:
+        raise ValueError, \
+              "invalid value '%s' for 'link' argument" % link
     if verbose:
-        print "copying %s -> %s" % (src, dir)
+        print "%s %s -> %s" % (action, src, dir)
 
     if dry_run:
         return 1
@@ -293,19 +343,29 @@ def copy_file (src, dst,
         except OSError, exc:
             raise DistutilsFileError, \
                   "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
-        return 1
     
-    # Otherwise use custom routine
-    _copy_file_contents (src, dst)
-    if preserve_mode or preserve_times:
-        st = os.stat (src)
-
-        # According to David Ascher <da@ski.org>, utime() should be done
-        # before chmod() (at least under NT).
-        if preserve_times:
-            os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
-        if preserve_mode:
-            os.chmod (dst, S_IMODE (st[ST_MODE]))
+    # If linking (hard or symbolic), use the appropriate system call
+    # (Unix only, of course, but that's the caller's responsibility)
+    elif link == 'hard':
+        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
+            os.link (src, dst)
+    elif link == 'sym':
+        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
+            os.symlink (src, dst)
+
+    # Otherwise (non-Mac, not linking), copy the file contents and
+    # (optionally) copy the times and mode.
+    else:
+        _copy_file_contents (src, dst)
+        if preserve_mode or preserve_times:
+            st = os.stat (src)
+
+            # According to David Ascher <da@ski.org>, utime() should be done
+            # before chmod() (at least under NT).
+            if preserve_times:
+                os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
+            if preserve_mode:
+                os.chmod (dst, S_IMODE (st[ST_MODE]))
 
     return 1
 
@@ -375,7 +435,7 @@ def copy_tree (src, dst,
         else:
             copy_file (src_name, dst_name,
                        preserve_mode, preserve_times,
-                       update, verbose, dry_run)
+                       update, None, verbose, dry_run)
             outputs.append (dst_name)
 
     return outputs
@@ -562,7 +622,8 @@ def _subst (match, local_vars=local_vars):
 # subst_vars ()
 
 
-def make_tarball (base_dir, compress="gzip", verbose=0, dry_run=0):
+def make_tarball (base_name, base_dir, compress="gzip",
+                  verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
        'base_dir'.  'compress' must be "gzip" (the default), "compress", or
        None.  Both "tar" and the compression utility named by 'compress'
@@ -584,7 +645,7 @@ def make_tarball (base_dir, compress="gzip", verbose=0, dry_run=0):
         raise ValueError, \
               "bad value for 'compress': must be None, 'gzip', or 'compress'"
 
-    archive_name = base_dir + ".tar"
+    archive_name = base_name + ".tar"
     cmd = ["tar", "-cf", archive_name, base_dir]
     spawn (cmd, verbose=verbose, dry_run=dry_run)
 
@@ -597,21 +658,21 @@ def make_tarball (base_dir, compress="gzip", verbose=0, dry_run=0):
 # make_tarball ()
 
 
-def make_zipfile (base_dir, verbose=0, dry_run=0):
-    """Create a ZIP file from all the files under 'base_dir'.  The
-       output ZIP file will be named 'base_dir' + ".zip".  Uses either the
+def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
+    """Create a zip file from all the files under 'base_dir'.  The
+       output zip file will be named 'base_dir' + ".zip".  Uses either the
        InfoZIP "zip" utility (if installed and found on the default search
        path) or the "zipfile" Python module (if available).  If neither
        tool is available, raises DistutilsExecError.  Returns the name
-       of the output ZIP file."""
+       of the output zip file."""
 
     # This initially assumed the Unix 'zip' utility -- but
     # apparently InfoZIP's zip.exe works the same under Windows, so
     # no changes needed!
 
-    zip_filename = base_dir + ".zip"
+    zip_filename = base_name + ".zip"
     try:
-        spawn (["zip", "-r", zip_filename, base_dir],
+        spawn (["zip", "-rq", zip_filename, base_dir],
                verbose=verbose, dry_run=dry_run)
     except DistutilsExecError:
 
@@ -649,3 +710,52 @@ def visit (z, dirname, names):
     return zip_filename
 
 # make_zipfile ()
+
+
+def make_archive (base_name, format,
+                  root_dir=None, base_dir=None,
+                  verbose=0, dry_run=0):
+
+    """Create an archive file (eg. zip or tar).  'base_name' is the name
+    of the file to create, minus any format-specific extension; 'format'
+    is the archive format: one of "zip", "tar", "ztar", or "gztar".
+    'root_dir' is a directory that will be the root directory of the
+    archive; ie. we typically chdir into 'root_dir' before creating the
+    archive.  'base_dir' is the directory where we start archiving from;
+    ie. 'base_dir' will be the common prefix of all files and
+    directories in the archive.  'root_dir' and 'base_dir' both default
+    to the current directory."""
+
+    save_cwd = os.getcwd()
+    if root_dir is not None:
+        if verbose:
+            print "changing into '%s'" % root_dir
+        base_name = os.path.abspath (base_name)
+        if not dry_run:
+            os.chdir (root_dir)
+
+    if base_dir is None:
+        base_dir = os.curdir
+
+    kwargs = { 'verbose': verbose,
+               'dry_run': dry_run }
+    
+    if format == 'gztar':
+        func = make_tarball
+        kwargs['compress'] = 'gzip'
+    elif format == 'ztar':
+        func = make_tarball
+        kwargs['compress'] = 'compress'
+    elif format == 'tar':
+        func = make_tarball
+    elif format == 'zip':
+        func = make_zipfile
+
+    apply (func, (base_name, base_dir), kwargs)
+
+    if root_dir is not None:
+        if verbose:
+            print "changing back to '%s'" % save_cwd
+        os.chdir (save_cwd)
+
+# make_archive ()

From 5b64d0853985580ffcb024ead685aac6a42f25af Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:05:18 +0000
Subject: [PATCH 0241/8469] Added 'get_name()' and 'get_full_name()' methods to
 Distribution. Simplified 'Command.get_peer_option()' a tad -- just call
 'find_peer()'   to get the peer command object. Updated 'Command.copy_file()'
 to take a 'link' parameter, just like   'util.copy_file()' does now. Added
 'Command.make_archive()' to wrap 'util.make_archive()'.

---
 core.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 08a1d641d1..025e1c0df5 100644
--- a/core.py
+++ b/core.py
@@ -638,6 +638,13 @@ def is_pure (self):
                 not self.has_ext_modules() and
                 not self.has_c_libraries())
 
+    def get_name (self):
+        return self.name or "UNKNOWN"
+
+    def get_full_name (self):
+        return "%s-%s" % ((self.name or "UNKNOWN"), (self.version or "???"))
+    
+
 # class Distribution
 
 
@@ -887,7 +894,7 @@ def get_peer_option (self, command, option):
         """Find or create the command object for 'command', and return
            its 'option' option."""
 
-        cmd_obj = self.distribution.find_command_obj (command)
+        cmd_obj = self.find_peer (command)
         return cmd_obj.get_option (option)
 
 
@@ -939,12 +946,13 @@ def mkpath (self, name, mode=0777):
 
 
     def copy_file (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, level=1):
+                   preserve_mode=1, preserve_times=1, link=None, level=1):
         """Copy a file respecting verbose, dry-run and force flags."""
 
         return util.copy_file (infile, outfile,
                                preserve_mode, preserve_times,
                                not self.force,
+                               link,
                                self.verbose >= level,
                                self.dry_run)
 
@@ -976,6 +984,12 @@ def spawn (self, cmd, search_path=1, level=1):
                self.dry_run)
 
 
+    def make_archive (self, base_name, format,
+                      root_dir=None, base_dir=None):
+        util.make_archive (base_name, format, root_dir, base_dir,
+                           self.verbose, self.dry_run)
+
+
     def make_file (self, infiles, outfile, func, args,
                     exec_msg=None, skip_msg=None, level=1):
 

From 71554a0d965d88e26b49b9352b9f6c16d9dcdd4b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:14:51 +0000
Subject: [PATCH 0242/8469] Added 'bdist' and 'bdist_dumb'.

---
 command/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/__init__.py b/command/__init__.py
index b7973c6142..385330b5e0 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -13,4 +13,6 @@
            'install_lib',
            'clean',
            'sdist',
+           'bdist',
+           'bdist_dumb',
           ]

From a65325be6c89763d12b4948bfccb2f5e51171a4e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:34:09 +0000
Subject: [PATCH 0243/8469] Don't put Python's library directory into the
 library search path -- that's specific to building Python extensions.

---
 msvccompiler.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 298991049f..c906e11469 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -158,9 +158,6 @@ def __init__ (self,
                   force=0):
 
         CCompiler.__init__ (self, verbose, dry_run, force)
-
-        self.add_library_dir( os.path.join( sys.exec_prefix, 'libs' ) )
-        
         versions = get_devstudio_versions ()
 
         if versions:

From 62173c6e6b912a50267e06e7ad96074a8aa75a41 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:50:23 +0000
Subject: [PATCH 0244/8469] Patch (mostly) from Thomas Heller for building on
 Windows:   * build to "Debug" or "Release" temp directory   * put linker
 turds (.lib and .exp files) in the build temp directory   * tack on "_d" to
 extensions built with debugging   * added 'get_ext_libname()' help in putting
 linker turds to temp dir Also, moved the code that simplifies None to empty
 list for a bunch   of options to 'finalize_options()' instead of 'run()'.

---
 command/build_ext.py | 47 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f2e0b319b3..2cb1c610f0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -122,9 +122,24 @@ def finalize_options (self):
         if type (self.libraries) is StringType:
             self.libraries = [self.libraries]
 
-        # XXX how the heck are 'self.define' and 'self.undef' supposed to
-        # be set?
+        # Life is easier if we're not forever checking for None, so
+        # simplify these options to empty lists if unset
+        if self.libraries is None:
+            self.libraries = []
+        if self.library_dirs is None:
+            self.library_dirs = []
+        if self.rpath is None:
+            self.rpath = []
 
+        # for extensions under windows use different directories
+        # for Release and Debug builds.
+        # also Python's library directory must be appended to library_dirs
+        if os.name == 'nt':
+            self.library_dirs.append (os.path.join(sys.exec_prefix, 'libs'))
+            if self.debug:
+                self.build_temp = os.path.join (self.build_temp, "Debug")
+            else:
+                self.build_temp = os.path.join (self.build_temp, "Release")
     # finalize_options ()
     
 
@@ -143,15 +158,6 @@ def run (self):
         if not self.extensions:
             return
 
-        # Simplify the following logic (eg. don't have to worry about
-        # appending to None)
-        if self.libraries is None:
-            self.libraries = []
-        if self.library_dirs is None:
-            self.library_dirs = []
-        if self.rpath is None:
-            self.rpath = []
-
         # If we were asked to build any C/C++ libraries, make sure that the
         # directory where we put them is in the library search path for
         # linking extensions.
@@ -313,6 +319,14 @@ def build_extensions (self):
                 else:
                     modname = string.split (extension_name, '.')[-1]
                     extra_args.append('/export:init%s'%modname)
+
+                # The MSVC linker generates unneeded .lib and .exp files,
+                # which cannot be suppressed by any linker switches.  So
+                # make sure they are generated in the temporary build
+                # directory.
+                implib_dir = os.path.join(self.build_temp,\
+                                          self.get_ext_libname(extension_name))
+                extra_args.append ('/IMPLIB:' + implib_dir)
             # if MSVC
 
             fullname = self.get_ext_fullname (extension_name)
@@ -351,6 +365,17 @@ def get_ext_fullname (self, ext_name):
     def get_ext_filename (self, ext_name):
         from distutils import sysconfig
         ext_path = string.split (ext_name, '.')
+        # extensions in debug_mode are named 'module_d.pyd' under windows
+        if os.name == 'nt' and self.debug:
+            return apply (os.path.join, ext_path) + '_d' + sysconfig.SO
         return apply (os.path.join, ext_path) + sysconfig.SO
 
+    def get_ext_libname (self, ext_name):
+        # create a filename for the (unneeded) lib-file.
+        # extensions in debug_mode are named 'module_d.pyd' under windows
+        ext_path = string.split (ext_name, '.')
+        if os.name == 'nt' and self.debug:
+            return apply (os.path.join, ext_path) + '_d.lib'
+        return apply (os.path.join, ext_path) + '.lib'
+
 # class BuildExt

From ac24d4ea40f9c79d063743d6b454f801a81c93e7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 03:52:16 +0000
Subject: [PATCH 0245/8469] Don't perpetrate the "_d" hack for naming debugging
 extensions -- that's now done in the 'build_ext' command.

---
 msvccompiler.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index c906e11469..2828711e7b 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -321,10 +321,6 @@ def link_shared_object (self,
 
             if debug:
                 ldflags = self.ldflags_shared_debug
-                # XXX not sure this belongs here
-                # extensions in debug_mode are named 'module_d.pyd'
-                basename, ext = os.path.splitext (output_filename)
-                output_filename = basename + '_d' + ext
             else:
                 ldflags = self.ldflags_shared
 

From acb7e0a92ecd47d4fb0e64424123a136b23a2b6c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 04:37:40 +0000
Subject: [PATCH 0246/8469] Removed some old test code: don't set 'plat' when
 calling 'new_compiler()'.

---
 command/build_clib.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 6560fb4774..f48e6476fb 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -89,8 +89,7 @@ def run (self):
             return
 
         # Yech -- this is cut 'n pasted from build_ext.py!
-        self.compiler = new_compiler (plat=os.environ.get ('PLAT'),
-                                      verbose=self.verbose,
+        self.compiler = new_compiler (verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
         if self.include_dirs is not None:

From f382f8cd5035da5ab29cf6d33f00f4f6a43c0c21 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 04:40:25 +0000
Subject: [PATCH 0247/8469] Tweaked 'get_platform()' to include the first
 character of the OS release: eg. sunos5, linux2, irix5.

---
 util.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/util.py b/util.py
index 6674d0aa18..63b6bec05a 100644
--- a/util.py
+++ b/util.py
@@ -545,10 +545,8 @@ def get_platform ():
        i.e. "???" or "???"."""
 
     if os.name == 'posix':
-        uname = os.uname()
-        OS = uname[0]
-        arch = uname[4]
-        return "%s-%s" % (string.lower (OS), string.lower (arch))
+        (OS, _, rel, _, arch) = os.uname()
+        return "%s%c-%s" % (string.lower (OS), rel[0], string.lower (arch))
     else:
         return sys.platform
 

From ca78e832a4c8ecb5a9308ed104166e71b393d729 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 04:53:41 +0000
Subject: [PATCH 0248/8469] Import from 'types' module. Added 'ztar', 'tar' to
 'format_command' dictionary.

---
 command/bdist.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/bdist.py b/command/bdist.py
index 5630828580..12397fcac1 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -8,6 +8,7 @@
 __revision__ = "$Id$"
 
 import os, string
+from types import *
 from distutils.core import Command
 
 
@@ -25,6 +26,8 @@ class bdist (Command):
                        'nt': 'zip', }
 
     format_command = { 'gztar': 'bdist_dumb',
+                       'ztar':  'bdist_dumb',
+                       'tar':   'bdist_dumb',
                        'zip':   'bdist_dumb', }
 
 

From 39f9a0206365461772e5c76d01a3cde0be9d1c10 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 05:08:50 +0000
Subject: [PATCH 0249/8469] Rename 'formats' option to 'format', and remove the
 ability to generate multiple built distributions in one run -- it seemed a
 bit dodgy and I'd rather remove it than try to beat it into submission right
 now.

---
 command/bdist.py | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 12397fcac1..889cdba857 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -10,14 +10,15 @@
 import os, string
 from types import *
 from distutils.core import Command
+from distutils.errors import *
 
 
 class bdist (Command):
 
     description = "create a built (binary) distribution"
 
-    user_options = [('formats=', 'f',
-                     "formats for distribution (tar, ztar, gztar, zip, ... )"),
+    user_options = [('format=', 'f',
+                     "format for distribution (tar, ztar, gztar, zip, ... )"),
                    ]
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
@@ -32,21 +33,21 @@ class bdist (Command):
 
 
     def initialize_options (self):
-        self.formats = None
+        self.format = None
 
     # initialize_options()
 
 
     def finalize_options (self):
-        if self.formats is None:
+        if self.format is None:
             try:
-                self.formats = [self.default_format[os.name]]
+                self.format = self.default_format[os.name]
             except KeyError:
                 raise DistutilsPlatformError, \
                       "don't know how to create built distributions " + \
                       "on platform %s" % os.name
-        elif type (self.formats) is StringType:
-            self.formats = string.split (self.formats, ',')
+        #elif type (self.format) is StringType:
+        #    self.format = string.split (self.format, ',')
             
 
     # finalize_options()
@@ -54,19 +55,14 @@ def finalize_options (self):
 
     def run (self):
 
-        for format in self.formats:
-            cmd_name = self.format_command[format]
-            sub_cmd = self.find_peer (cmd_name)
-            sub_cmd.set_option ('format', format)
-
-            # XXX blecchhh!! should formalize this: at least a
-            # 'forget_run()' (?)  method, possibly complicate the
-            # 'have_run' dictionary to include some command state as well
-            # as the command name -- eg. in this case we might want
-            # ('bdist_dumb','zip') to be marked "have run", but not
-            # ('bdist_dumb','gztar').
-            self.distribution.have_run[cmd_name] = 0
-            self.run_peer (cmd_name)
+        try:
+            cmd_name = self.format_command[self.format]
+        except KeyError:
+            raise DistutilsOptionError, \
+                  "invalid archive format '%s'" % self.format
+
+        sub_cmd = self.find_peer (cmd_name)
+        sub_cmd.set_option ('format', self.format)
 
     # run()
 

From 23873c733a5189d48d90a3ab638d0e7d155fa234 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 05:20:27 +0000
Subject: [PATCH 0250/8469] Fixed 'make_archive()' to explicitly turn of
 compression when format is "tar".

---
 util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util.py b/util.py
index 63b6bec05a..22fc437547 100644
--- a/util.py
+++ b/util.py
@@ -746,6 +746,7 @@ def make_archive (base_name, format,
         kwargs['compress'] = 'compress'
     elif format == 'tar':
         func = make_tarball
+        kwargs['compress'] = None
     elif format == 'zip':
         func = make_zipfile
 

From f35f3bd982e3447106ba061b91ebe6f72a47d20a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 05:21:27 +0000
Subject: [PATCH 0251/8469] Oops, got a little too enthusiastic deleting code
 in that last revision: we still have to *run* the sub-command that creates a
 built distribution.

---
 command/bdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/bdist.py b/command/bdist.py
index 889cdba857..685f52508e 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -63,6 +63,7 @@ def run (self):
 
         sub_cmd = self.find_peer (cmd_name)
         sub_cmd.set_option ('format', self.format)
+        self.run_peer (cmd_name)
 
     # run()
 

From f9e57445d36b3438f083a1b69b5793e8b9f8145f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 05:22:47 +0000
Subject: [PATCH 0252/8469] Added code to blow away the pseudo-installation
 tree and a 'keep_tree' option to disable this (by default, it's false and we
 clean up).

---
 command/bdist_dumb.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 4383a8fa9f..5456e57ac3 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -10,7 +10,7 @@
 
 import os
 from distutils.core import Command
-from distutils.util import get_platform, create_tree
+from distutils.util import get_platform, create_tree, remove_tree
 
 
 class bdist_dumb (Command):
@@ -19,6 +19,9 @@ class bdist_dumb (Command):
 
     user_options = [('format=', 'f',
                      "archive format to create (tar, ztar, gztar, zip)"),
+                    ('keep-tree', 'k',
+                     "keep the pseudo-installation tree around after " +
+                     "creating the distribution archive"),
                    ]
 
     default_format = { 'posix': 'gztar',
@@ -27,6 +30,7 @@ class bdist_dumb (Command):
 
     def initialize_options (self):
         self.format = None
+        self.keep_tree = 0
 
     # initialize_options()
 
@@ -68,9 +72,14 @@ def run (self):
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_full_name(),
                                       get_platform())
+        print "output_dir = %s" % output_dir
+        print "self.format = %s" % self.format
         self.make_archive (archive_basename, self.format,
                            root_dir=output_dir)
 
+        if not self.keep_tree:
+            remove_tree (output_dir, self.verbose, self.dry_run)
+
     # run()
 
 

From 802b36518e79ab0103afe61bb5c1ee9e92c2f433 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 16:47:40 +0000
Subject: [PATCH 0253/8469] Patch from Thomas Heller: use the new winreg module
 if available.

---
 msvccompiler.py | 71 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 2828711e7b..07096e95db 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -17,6 +17,35 @@
      CCompiler, gen_preprocess_options, gen_lib_options
 
 
+_can_read_reg = 0
+try:
+    import winreg
+    _HKEY_CLASSES_ROOT = winreg.HKEY_CLASSES_ROOT
+    _HKEY_LOCAL_MACHINE = winreg.HKEY_LOCAL_MACHINE
+    _HKEY_CURRENT_USER = winreg.HKEY_CURRENT_USER
+    _HKEY_USERS = winreg.HKEY_USERS
+    _RegOpenKeyEx = winreg.OpenKeyEx
+    _RegEnumKey = winreg.EnumKey
+    _RegEnumValue = winreg.EnumValue
+    _RegError = winreg.error
+    _can_read_reg = 1
+except ImportError:
+    try:
+        import win32api
+        import win32con
+        _HKEY_CLASSES_ROOT = win32con.HKEY_CLASSES_ROOT
+        _HKEY_LOCAL_MACHINE = win32con.HKEY_LOCAL_MACHINE
+        _HKEY_CURRENT_USER = win32con.HKEY_CURRENT_USER
+        _HKEY_USERS = win32con.HKEY_USERS
+        _RegOpenKeyEx = win32api.RegOpenKeyEx
+        _RegEnumKey = win32api.RegEnumKey
+        _RegEnumValue = win32api.RegEnumValue
+        _RegError = win32api.error
+        _can_read_reg = 1
+    except ImportError:
+        pass
+    
+
 def get_devstudio_versions ():
     """Get list of devstudio versions from the Windows registry.  Return a
        list of strings containing version numbers; the list will be
@@ -24,30 +53,27 @@ def get_devstudio_versions ():
        a registry-access module) or the appropriate registry keys weren't
        found."""
 
-    try:
-        import win32api
-        import win32con
-    except ImportError:
+    if not _can_read_reg:
         return []
 
     K = 'Software\\Microsoft\\Devstudio'
     L = []
-    for base in (win32con.HKEY_CLASSES_ROOT,
-                 win32con.HKEY_LOCAL_MACHINE,
-                 win32con.HKEY_CURRENT_USER,
-                 win32con.HKEY_USERS):
+    for base in (_HKEY_CLASSES_ROOT,
+                 _HKEY_LOCAL_MACHINE,
+                 _HKEY_CURRENT_USER,
+                 _HKEY_USERS):
         try:
-            k = win32api.RegOpenKeyEx(base,K)
+            k = _RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    p = win32api.RegEnumKey(k,i)
+                    p = _RegEnumKey(k,i)
                     if p[0] in '123456789' and p not in L:
                         L.append(p)
-                except win32api.error:
+                except _RegError:
                     break
                 i = i + 1
-        except win32api.error:
+        except _RegError:
             pass
     L.sort()
     L.reverse()
@@ -61,10 +87,7 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
        a list of strings; will be empty list if unable to access the
        registry or appropriate registry keys not found."""
        
-    try:
-        import win32api
-        import win32con
-    except ImportError:
+    if not _can_read_reg:
         return []
 
     L = []
@@ -74,16 +97,16 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
     K = ('Software\\Microsoft\\Devstudio\\%s\\' +
          'Build System\\Components\\Platforms\\Win32 (%s)\\Directories') % \
         (version,platform)
-    for base in (win32con.HKEY_CLASSES_ROOT,
-                 win32con.HKEY_LOCAL_MACHINE,
-                 win32con.HKEY_CURRENT_USER,
-                 win32con.HKEY_USERS):
+    for base in (_HKEY_CLASSES_ROOT,
+                 _HKEY_LOCAL_MACHINE,
+                 _HKEY_CURRENT_USER,
+                 _HKEY_USERS):
         try:
-            k = win32api.RegOpenKeyEx(base,K)
+            k = _RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    (p,v,t) = win32api.RegEnumValue(k,i)
+                    (p,v,t) = _RegEnumValue(k,i)
                     if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
@@ -91,9 +114,9 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
                             L.append(v)
                         break
                     i = i + 1
-                except win32api.error:
+                except _RegError:
                     break
-        except win32api.error:
+        except _RegError:
             pass
     return L
 

From 8b2185f27ae8706e420bcf52ee071a8c3f4ee5dd Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 16:53:42 +0000
Subject: [PATCH 0254/8469] Simplified Thomas Heller's registry patch: just
 assign all those HKEY_* and Reg* names once, rather than having
 near-duplicate code in the two import attempts.

Also dropped the leading underscore on all the imported symbols,
as it's not appropriate (they're not local to this module).
---
 msvccompiler.py | 64 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 07096e95db..b38aadbece 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -20,30 +20,30 @@
 _can_read_reg = 0
 try:
     import winreg
-    _HKEY_CLASSES_ROOT = winreg.HKEY_CLASSES_ROOT
-    _HKEY_LOCAL_MACHINE = winreg.HKEY_LOCAL_MACHINE
-    _HKEY_CURRENT_USER = winreg.HKEY_CURRENT_USER
-    _HKEY_USERS = winreg.HKEY_USERS
-    _RegOpenKeyEx = winreg.OpenKeyEx
-    _RegEnumKey = winreg.EnumKey
-    _RegEnumValue = winreg.EnumValue
-    _RegError = winreg.error
     _can_read_reg = 1
+    hkey_mod = winreg                   # module that provides HKEY_* stuff
+    reg_mod = winreg                    # provides other registry stuff
 except ImportError:
     try:
         import win32api
         import win32con
-        _HKEY_CLASSES_ROOT = win32con.HKEY_CLASSES_ROOT
-        _HKEY_LOCAL_MACHINE = win32con.HKEY_LOCAL_MACHINE
-        _HKEY_CURRENT_USER = win32con.HKEY_CURRENT_USER
-        _HKEY_USERS = win32con.HKEY_USERS
-        _RegOpenKeyEx = win32api.RegOpenKeyEx
-        _RegEnumKey = win32api.RegEnumKey
-        _RegEnumValue = win32api.RegEnumValue
-        _RegError = win32api.error
         _can_read_reg = 1
+        hkey_mod = win32con
+        reg_mod = win32api
     except ImportError:
         pass
+
+if _can_read_reg:
+    HKEY_CLASSES_ROOT = hkey_mod.HKEY_CLASSES_ROOT
+    HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
+    HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
+    HKEY_USERS = hkey_mod.HKEY_USERS
+    RegOpenKeyEx = reg_mod.RegOpenKeyEx
+    RegEnumKey = reg_mod.RegEnumKey
+    RegEnumValue = reg_mod.RegEnumValue
+    RegError = reg_mod.error
+    _can_read_reg = 1
+    
     
 
 def get_devstudio_versions ():
@@ -58,22 +58,22 @@ def get_devstudio_versions ():
 
     K = 'Software\\Microsoft\\Devstudio'
     L = []
-    for base in (_HKEY_CLASSES_ROOT,
-                 _HKEY_LOCAL_MACHINE,
-                 _HKEY_CURRENT_USER,
-                 _HKEY_USERS):
+    for base in (HKEY_CLASSES_ROOT,
+                 HKEY_LOCAL_MACHINE,
+                 HKEY_CURRENT_USER,
+                 HKEY_USERS):
         try:
-            k = _RegOpenKeyEx(base,K)
+            k = RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    p = _RegEnumKey(k,i)
+                    p = RegEnumKey(k,i)
                     if p[0] in '123456789' and p not in L:
                         L.append(p)
-                except _RegError:
+                except RegError:
                     break
                 i = i + 1
-        except _RegError:
+        except RegError:
             pass
     L.sort()
     L.reverse()
@@ -97,16 +97,16 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
     K = ('Software\\Microsoft\\Devstudio\\%s\\' +
          'Build System\\Components\\Platforms\\Win32 (%s)\\Directories') % \
         (version,platform)
-    for base in (_HKEY_CLASSES_ROOT,
-                 _HKEY_LOCAL_MACHINE,
-                 _HKEY_CURRENT_USER,
-                 _HKEY_USERS):
+    for base in (HKEY_CLASSES_ROOT,
+                 HKEY_LOCAL_MACHINE,
+                 HKEY_CURRENT_USER,
+                 HKEY_USERS):
         try:
-            k = _RegOpenKeyEx(base,K)
+            k = RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    (p,v,t) = _RegEnumValue(k,i)
+                    (p,v,t) = RegEnumValue(k,i)
                     if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
@@ -114,9 +114,9 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
                             L.append(v)
                         break
                     i = i + 1
-                except _RegError:
+                except RegError:
                     break
-        except _RegError:
+        except RegError:
             pass
     return L
 

From 373df8bfb5f251907217641652a46ad18603f4b1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 31 Mar 2000 19:04:25 +0000
Subject: [PATCH 0255/8469] Fixed my simplification to Thomas' patch: winreg
 and win32api export the same functions, but with different names.

---
 msvccompiler.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index b38aadbece..43a8596085 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -21,15 +21,25 @@
 try:
     import winreg
     _can_read_reg = 1
-    hkey_mod = winreg                   # module that provides HKEY_* stuff
-    reg_mod = winreg                    # provides other registry stuff
+    hkey_mod = winreg
+
+    RegOpenKeyEx = winreg.OpenKeyEx
+    RegEnumKey = winreg.EnumKey
+    RegEnumValue = winreg.EnumValue
+    RegError = winreg.error
+
 except ImportError:
     try:
         import win32api
         import win32con
         _can_read_reg = 1
         hkey_mod = win32con
-        reg_mod = win32api
+
+        RegOpenKeyEx = win32api.RegOpenKeyEx
+        RegEnumKey = win32api.RegEnumKey
+        RegEnumValue = win32api.RegEnumValue
+        RegError = win32api.error
+
     except ImportError:
         pass
 
@@ -38,11 +48,6 @@
     HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
     HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
     HKEY_USERS = hkey_mod.HKEY_USERS
-    RegOpenKeyEx = reg_mod.RegOpenKeyEx
-    RegEnumKey = reg_mod.RegEnumKey
-    RegEnumValue = reg_mod.RegEnumValue
-    RegError = reg_mod.error
-    _can_read_reg = 1
     
     
 

From fe6451bacbd0075114cc247c568bde94f2b61caf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 4 Apr 2000 01:40:52 +0000
Subject: [PATCH 0256/8469] Reorganization: moved the Distribution class from
 core.py to dist.py, and the Command class from core.py to cmd.py.  No other
 code needs changing though; distutils.core still provides the Command and
 Distribution classes, although indirectly now.

---
 cmd.py  | 390 +++++++++++++++++++++++
 core.py | 939 +-------------------------------------------------------
 dist.py | 567 ++++++++++++++++++++++++++++++++++
 3 files changed, 963 insertions(+), 933 deletions(-)
 create mode 100644 cmd.py
 create mode 100644 dist.py

diff --git a/cmd.py b/cmd.py
new file mode 100644
index 0000000000..ad78703713
--- /dev/null
+++ b/cmd.py
@@ -0,0 +1,390 @@
+"""distutils.cmd
+
+Provides the Command class, the base class for the command classes
+in the distutils.command package."""
+
+# created 2000/04/03, Greg Ward
+# (extricated from core.py; actually dates back to the beginning)
+
+__revision__ = "$Id$"
+
+import sys, string
+from types import *
+from distutils.errors import *
+from distutils import util
+
+
+class Command:
+    """Abstract base class for defining command classes, the "worker bees"
+       of the Distutils.  A useful analogy for command classes is to
+       think of them as subroutines with local variables called
+       "options".  The options are "declared" in 'initialize_options()'
+       and "defined" (given their final values, aka "finalized") in
+       'finalize_options()', both of which must be defined by every
+       command class.  The distinction between the two is necessary
+       because option values might come from the outside world (command
+       line, option file, ...), and any options dependent on other
+       options must be computed *after* these outside influences have
+       been processed -- hence 'finalize_options()'.  The "body" of the
+       subroutine, where it does all its work based on the values of its
+       options, is the 'run()' method, which must also be implemented by
+       every command class."""
+
+    # -- Creation/initialization methods -------------------------------
+
+    def __init__ (self, dist):
+        """Create and initialize a new Command object.  Most importantly,
+           invokes the 'initialize_options()' method, which is the
+           real initializer and depends on the actual command being
+           instantiated."""
+
+        # late import because of mutual dependence between these classes
+        from distutils.dist import Distribution
+
+        if not isinstance (dist, Distribution):
+            raise TypeError, "dist must be a Distribution instance"
+        if self.__class__ is Command:
+            raise RuntimeError, "Command is an abstract class"
+
+        self.distribution = dist
+        self.initialize_options ()
+
+        # Per-command versions of the global flags, so that the user can
+        # customize Distutils' behaviour command-by-command and let some
+        # commands fallback on the Distribution's behaviour.  None means
+        # "not defined, check self.distribution's copy", while 0 or 1 mean
+        # false and true (duh).  Note that this means figuring out the real
+        # value of each flag is a touch complicatd -- hence "self.verbose"
+        # (etc.) will be handled by __getattr__, below.
+        self._verbose = None
+        self._dry_run = None
+        self._force = None
+
+        # The 'help' flag is just used for command-line parsing, so
+        # none of that complicated bureaucracy is needed.
+        self.help = 0
+
+        # 'ready' records whether or not 'finalize_options()' has been
+        # called.  'finalize_options()' itself should not pay attention to
+        # this flag: it is the business of 'ensure_ready()', which always
+        # calls 'finalize_options()', to respect/update it.
+        self.ready = 0
+
+    # __init__ ()
+
+
+    def __getattr__ (self, attr):
+        if attr in ('verbose', 'dry_run', 'force'):
+            myval = getattr (self, "_" + attr)
+            if myval is None:
+                return getattr (self.distribution, attr)
+            else:
+                return myval
+        else:
+            raise AttributeError, attr
+
+
+    def ensure_ready (self):
+        if not self.ready:
+            self.finalize_options ()
+        self.ready = 1
+        
+
+    # Subclasses must define:
+    #   initialize_options()
+    #     provide default values for all options; may be overridden
+    #     by Distutils client, by command-line options, or by options
+    #     from option file
+    #   finalize_options()
+    #     decide on the final values for all options; this is called
+    #     after all possible intervention from the outside world
+    #     (command-line, option file, etc.) has been processed
+    #   run()
+    #     run the command: do whatever it is we're here to do,
+    #     controlled by the command's various option values
+
+    def initialize_options (self):
+        """Set default values for all the options that this command
+           supports.  Note that these defaults may be overridden
+           by the command-line supplied by the user; thus, this is
+           not the place to code dependencies between options; generally,
+           'initialize_options()' implementations are just a bunch
+           of "self.foo = None" assignments.
+           
+           This method must be implemented by all command classes."""
+           
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+        
+    def finalize_options (self):
+        """Set final values for all the options that this command
+           supports.  This is always called as late as possible, ie.
+           after any option assignments from the command-line or from
+           other commands have been done.  Thus, this is the place to to
+           code option dependencies: if 'foo' depends on 'bar', then it
+           is safe to set 'foo' from 'bar' as long as 'foo' still has
+           the same value it was assigned in 'initialize_options()'.
+
+           This method must be implemented by all command classes."""
+           
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+
+    def run (self):
+        """A command's raison d'etre: carry out the action it exists
+           to perform, controlled by the options initialized in
+           'initialize_options()', customized by the user and other
+           commands, and finalized in 'finalize_options()'.  All
+           terminal output and filesystem interaction should be done by
+           'run()'.
+
+           This method must be implemented by all command classes."""
+
+        raise RuntimeError, \
+              "abstract method -- subclass %s must override" % self.__class__
+
+    def announce (self, msg, level=1):
+        """If the Distribution instance to which this command belongs
+           has a verbosity level of greater than or equal to 'level'
+           print 'msg' to stdout."""
+    
+        if self.verbose >= level:
+            print msg
+
+
+    # -- Option query/set methods --------------------------------------
+
+    def get_option (self, option):
+        """Return the value of a single option for this command.  Raise
+           DistutilsOptionError if 'option' is not known."""
+        try:
+            return getattr (self, option)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % \
+                  (self.get_command_name(), option)
+
+
+    def get_options (self, *options):
+        """Return (as a tuple) the values of several options for this
+           command.  Raise DistutilsOptionError if any of the options in
+           'options' are not known."""
+
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (self, opt))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % \
+                  (self.get_command_name(), name)
+            
+        return tuple (values)
+    
+
+    def set_option (self, option, value):
+        """Set the value of a single option for this command.  Raise
+           DistutilsOptionError if 'option' is not known."""
+
+        if not hasattr (self, option):
+            raise DistutilsOptionError, \
+                  "command '%s': no such option '%s'" % \
+                  (self.get_command_name(), option)
+        if value is not None:
+            setattr (self, option, value)
+
+    def set_options (self, **optval):
+        """Set the values of several options for this command.  Raise
+           DistutilsOptionError if any of the options specified as
+           keyword arguments are not known."""
+
+        for k in optval.keys():
+            if optval[k] is not None:
+                self.set_option (k, optval[k])
+
+
+    # -- Convenience methods for commands ------------------------------
+
+    def get_command_name (self):
+        if hasattr (self, 'command_name'):
+            return self.command_name
+        else:
+            return self.__class__.__name__
+
+
+    def set_undefined_options (self, src_cmd, *option_pairs):
+        """Set the values of any "undefined" options from corresponding
+           option values in some other command object.  "Undefined" here
+           means "is None", which is the convention used to indicate
+           that an option has not been changed between
+           'set_initial_values()' and 'set_final_values()'.  Usually
+           called from 'set_final_values()' for options that depend on
+           some other command rather than another option of the same
+           command.  'src_cmd' is the other command from which option
+           values will be taken (a command object will be created for it
+           if necessary); the remaining arguments are
+           '(src_option,dst_option)' tuples which mean "take the value
+           of 'src_option' in the 'src_cmd' command object, and copy it
+           to 'dst_option' in the current command object"."""
+
+        # Option_pairs: list of (src_option, dst_option) tuples
+
+        src_cmd_obj = self.distribution.find_command_obj (src_cmd)
+        src_cmd_obj.ensure_ready ()
+        try:
+            for (src_option, dst_option) in option_pairs:
+                if getattr (self, dst_option) is None:
+                    self.set_option (dst_option,
+                                     src_cmd_obj.get_option (src_option))
+        except AttributeError, name:
+            # duh, which command?
+            raise DistutilsOptionError, "unknown option %s" % name
+
+
+    def find_peer (self, command, create=1):
+        """Wrapper around Distribution's 'find_command_obj()' method:
+           find (create if necessary and 'create' is true) the command
+           object for 'command'.."""
+
+        cmd_obj = self.distribution.find_command_obj (command, create)
+        cmd_obj.ensure_ready ()
+        return cmd_obj
+
+
+    def get_peer_option (self, command, option):
+        """Find or create the command object for 'command', and return
+           its 'option' option."""
+
+        cmd_obj = self.find_peer (command)
+        return cmd_obj.get_option (option)
+
+
+    def run_peer (self, command):
+        """Run some other command: uses the 'run_command()' method of
+           Distribution, which creates the command object if necessary
+           and then invokes its 'run()' method."""
+
+        self.distribution.run_command (command)
+
+
+    # -- External world manipulation -----------------------------------
+
+    def warn (self, msg):
+        sys.stderr.write ("warning: %s: %s\n" %
+                          (self.get_command_name(), msg))
+
+
+    def execute (self, func, args, msg=None, level=1):
+        """Perform some action that affects the outside world (eg.
+           by writing to the filesystem).  Such actions are special because
+           they should be disabled by the "dry run" flag, and should
+           announce themselves if the current verbosity level is high
+           enough.  This method takes care of all that bureaucracy for you;
+           all you have to do is supply the funtion to call and an argument
+           tuple for it (to embody the "external action" being performed),
+           a message to print if the verbosity level is high enough, and an
+           optional verbosity threshold."""
+
+        # Generate a message if we weren't passed one
+        if msg is None:
+            msg = "%s %s" % (func.__name__, `args`)
+            if msg[-2:] == ',)':        # correct for singleton tuple 
+                msg = msg[0:-2] + ')'
+
+        # Print it if verbosity level is high enough
+        self.announce (msg, level)
+
+        # And do it, as long as we're not in dry-run mode
+        if not self.dry_run:
+            apply (func, args)
+
+    # execute()
+
+
+    def mkpath (self, name, mode=0777):
+        util.mkpath (name, mode,
+                     self.verbose, self.dry_run)
+
+
+    def copy_file (self, infile, outfile,
+                   preserve_mode=1, preserve_times=1, link=None, level=1):
+        """Copy a file respecting verbose, dry-run and force flags."""
+
+        return util.copy_file (infile, outfile,
+                               preserve_mode, preserve_times,
+                               not self.force,
+                               link,
+                               self.verbose >= level,
+                               self.dry_run)
+
+
+    def copy_tree (self, infile, outfile,
+                   preserve_mode=1, preserve_times=1, preserve_symlinks=0,
+                   level=1):
+        """Copy an entire directory tree respecting verbose, dry-run,
+           and force flags."""
+
+        return util.copy_tree (infile, outfile, 
+                               preserve_mode,preserve_times,preserve_symlinks,
+                               not self.force,
+                               self.verbose >= level,
+                               self.dry_run)
+
+
+    def move_file (self, src, dst, level=1):
+        """Move a file respecting verbose and dry-run flags."""
+        return util.move_file (src, dst,
+                               self.verbose >= level,
+                               self.dry_run)
+
+
+    def spawn (self, cmd, search_path=1, level=1):
+        from distutils.spawn import spawn
+        spawn (cmd, search_path,
+               self.verbose >= level,
+               self.dry_run)
+
+
+    def make_archive (self, base_name, format,
+                      root_dir=None, base_dir=None):
+        util.make_archive (base_name, format, root_dir, base_dir,
+                           self.verbose, self.dry_run)
+
+
+    def make_file (self, infiles, outfile, func, args,
+                    exec_msg=None, skip_msg=None, level=1):
+
+        """Special case of 'execute()' for operations that process one or
+           more input files and generate one output file.  Works just like
+           'execute()', except the operation is skipped and a different
+           message printed if 'outfile' already exists and is newer than
+           all files listed in 'infiles'."""
+
+
+        if exec_msg is None:
+            exec_msg = "generating %s from %s" % \
+                       (outfile, string.join (infiles, ', '))
+        if skip_msg is None:
+            skip_msg = "skipping %s (inputs unchanged)" % outfile
+        
+
+        # Allow 'infiles' to be a single string
+        if type (infiles) is StringType:
+            infiles = (infiles,)
+        elif type (infiles) not in (ListType, TupleType):
+            raise TypeError, \
+                  "'infiles' must be a string, or a list or tuple of strings"
+
+        # If 'outfile' must be regenerated (either because it doesn't
+        # exist, is out-of-date, or the 'force' flag is true) then
+        # perform the action that presumably regenerates it
+        if self.force or util.newer_group (infiles, outfile):
+            self.execute (func, args, exec_msg, level)
+
+        # Otherwise, print the "skip" message
+        else:
+            self.announce (skip_msg, level)
+
+    # make_file ()
+
+# class Command
diff --git a/core.py b/core.py
index 025e1c0df5..3df54a5e83 100644
--- a/core.py
+++ b/core.py
@@ -1,28 +1,19 @@
 """distutils.core
 
 The only module that needs to be imported to use the Distutils; provides
-the 'setup' function (which must be called); the 'Distribution' class
-(which may be subclassed if additional functionality is desired), and
-the 'Command' class (which is used both internally by Distutils, and
-may be subclassed by clients for still more flexibility)."""
+the 'setup' function (which is to be called from the setup script).  Also
+indirectly provides the Distribution and Command classes, although they are
+really defined in distutils.dist and distutils.cmd."""
 
 # created 1999/03/01, Greg Ward
 
 __revision__ = "$Id$"
 
-import sys, os
-import string, re
+import sys
 from types import *
-from copy import copy
 from distutils.errors import *
-from distutils.fancy_getopt import fancy_getopt, print_help
-from distutils import util
-
-# Regex to define acceptable Distutils command names.  This is not *quite*
-# the same as a Python NAME -- I don't allow leading underscores.  The fact
-# that they're very similar is no coincidence; the default naming scheme is
-# to look for a Python module named after the command.
-command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
+from distutils.dist import Distribution
+from distutils.cmd import Command
 
 # This is a barebones help message generated displayed when the user
 # runs the setup script with no arguments at all.  More useful help
@@ -109,921 +100,3 @@ def setup (**attrs):
             raise SystemExit, "error: " + str (msg)
 
 # setup ()
-
-
-class Distribution:
-    """The core of the Distutils.  Most of the work hiding behind
-       'setup' is really done within a Distribution instance, which
-       farms the work out to the Distutils commands specified on the
-       command line.
-
-       Clients will almost never instantiate Distribution directly,
-       unless the 'setup' function is totally inadequate to their needs.
-       However, it is conceivable that a client might wish to subclass
-       Distribution for some specialized purpose, and then pass the
-       subclass to 'setup' as the 'distclass' keyword argument.  If so,
-       it is necessary to respect the expectations that 'setup' has of
-       Distribution: it must have a constructor and methods
-       'parse_command_line()' and 'run_commands()' with signatures like
-       those described below."""
-
-
-    # 'global_options' describes the command-line options that may be
-    # supplied to the client (setup.py) prior to any actual commands.
-    # Eg. "./setup.py -nv" or "./setup.py --verbose" both take advantage of
-    # these global options.  This list should be kept to a bare minimum,
-    # since every global option is also valid as a command option -- and we
-    # don't want to pollute the commands with too many options that they
-    # have minimal control over.
-    global_options = [('verbose', 'v',
-                       "run verbosely (default)"),
-                      ('quiet', 'q',
-                       "run quietly (turns verbosity off)"),
-                      ('dry-run', 'n',
-                       "don't actually do anything"),
-                      ('force', 'f',
-                       "skip dependency checking between files"),
-                      ('help', 'h',
-                       "show this help message"),
-                     ]
-    negative_opt = {'quiet': 'verbose'}
-
-
-    # -- Creation/initialization methods -------------------------------
-    
-    def __init__ (self, attrs=None):
-        """Construct a new Distribution instance: initialize all the
-           attributes of a Distribution, and then uses 'attrs' (a
-           dictionary mapping attribute names to values) to assign
-           some of those attributes their "real" values.  (Any attributes
-           not mentioned in 'attrs' will be assigned to some null
-           value: 0, None, an empty list or dictionary, etc.)  Most
-           importantly, initialize the 'command_obj' attribute
-           to the empty dictionary; this will be filled in with real
-           command objects by 'parse_command_line()'."""
-
-        # Default values for our command-line options
-        self.verbose = 1
-        self.dry_run = 0
-        self.force = 0
-        self.help = 0
-        self.help_commands = 0
-
-        # And the "distribution meta-data" options -- these can only
-        # come from setup.py (the caller), not the command line
-        # (or a hypothetical config file).
-        self.name = None
-        self.version = None
-        self.author = None
-        self.author_email = None
-        self.maintainer = None
-        self.maintainer_email = None
-        self.url = None
-        self.licence = None
-        self.description = None
-
-        # 'cmdclass' maps command names to class objects, so we
-        # can 1) quickly figure out which class to instantiate when
-        # we need to create a new command object, and 2) have a way
-        # for the client to override command classes
-        self.cmdclass = {}
-
-        # These options are really the business of various commands, rather
-        # than of the Distribution itself.  We provide aliases for them in
-        # Distribution as a convenience to the developer.
-        # dictionary.        
-        self.packages = None
-        self.package_dir = None
-        self.py_modules = None
-        self.libraries = None
-        self.ext_modules = None
-        self.ext_package = None
-        self.include_dirs = None
-        self.extra_path = None
-
-        # And now initialize bookkeeping stuff that can't be supplied by
-        # the caller at all.  'command_obj' maps command names to
-        # Command instances -- that's how we enforce that every command
-        # class is a singleton.
-        self.command_obj = {}
-
-        # 'have_run' maps command names to boolean values; it keeps track
-        # of whether we have actually run a particular command, to make it
-        # cheap to "run" a command whenever we think we might need to -- if
-        # it's already been done, no need for expensive filesystem
-        # operations, we just check the 'have_run' dictionary and carry on.
-        # It's only safe to query 'have_run' for a command class that has
-        # been instantiated -- a false value will be inserted when the
-        # command object is created, and replaced with a true value when
-        # the command is succesfully run.  Thus it's probably best to use
-        # '.get()' rather than a straight lookup.
-        self.have_run = {}
-
-        # Now we'll use the attrs dictionary (ultimately, keyword args from
-        # the client) to possibly override any or all of these distribution
-        # options.        
-        if attrs:
-
-            # Pull out the set of command options and work on them
-            # specifically.  Note that this order guarantees that aliased
-            # command options will override any supplied redundantly
-            # through the general options dictionary.
-            options = attrs.get ('options')
-            if options:
-                del attrs['options']
-                for (command, cmd_options) in options.items():
-                    cmd_obj = self.find_command_obj (command)
-                    for (key, val) in cmd_options.items():
-                        cmd_obj.set_option (key, val)
-                # loop over commands
-            # if any command options                        
-
-            # Now work on the rest of the attributes.  Any attribute that's
-            # not already defined is invalid!
-            for (key,val) in attrs.items():
-                if hasattr (self, key):
-                    setattr (self, key, val)
-                else:
-                    raise DistutilsOptionError, \
-                          "invalid distribution option '%s'" % key
-
-    # __init__ ()
-
-
-    def parse_command_line (self, args):
-        """Parse the setup script's command line: set any Distribution
-           attributes tied to command-line options, create all command
-           objects, and set their options from the command-line.  'args'
-           must be a list of command-line arguments, most likely
-           'sys.argv[1:]' (see the 'setup()' function).  This list is first
-           processed for "global options" -- options that set attributes of
-           the Distribution instance.  Then, it is alternately scanned for
-           Distutils command and options for that command.  Each new
-           command terminates the options for the previous command.  The
-           allowed options for a command are determined by the 'options'
-           attribute of the command object -- thus, we instantiate (and
-           cache) every command object here, in order to access its
-           'options' attribute.  Any error in that 'options' attribute
-           raises DistutilsGetoptError; any error on the command-line
-           raises DistutilsArgError.  If no Distutils commands were found
-           on the command line, raises DistutilsArgError.  Return true if
-           command-line successfully parsed and we should carry on with
-           executing commands; false if no errors but we shouldn't execute
-           commands (currently, this only happens if user asks for
-           help)."""
-
-        # We have to parse the command line a bit at a time -- global
-        # options, then the first command, then its options, and so on --
-        # because each command will be handled by a different class, and
-        # the options that are valid for a particular class aren't
-        # known until we instantiate the command class, which doesn't
-        # happen until we know what the command is.
-
-        self.commands = []
-        options = self.global_options + \
-                  [('help-commands', None,
-                    "list all available commands")]
-        args = fancy_getopt (options, self.negative_opt,
-                             self, sys.argv[1:])
-
-        # User just wants a list of commands -- we'll print it out and stop
-        # processing now (ie. if they ran "setup --help-commands foo bar",
-        # we ignore "foo bar").
-        if self.help_commands:
-            self.print_commands ()
-            print
-            print usage
-            return
-            
-        while args:
-            # Pull the current command from the head of the command line
-            command = args[0]
-            if not command_re.match (command):
-                raise SystemExit, "invalid command name '%s'" % command
-            self.commands.append (command)
-
-            # Make sure we have a command object to put the options into
-            # (this either pulls it out of a cache of command objects,
-            # or finds and instantiates the command class).
-            try:
-                cmd_obj = self.find_command_obj (command)
-            except DistutilsModuleError, msg:
-                raise DistutilsArgError, msg
-
-            # Require that the command class be derived from Command --
-            # that way, we can be sure that we at least have the 'run'
-            # and 'get_option' methods.
-            if not isinstance (cmd_obj, Command):
-                raise DistutilsClassError, \
-                      "command class %s must subclass Command" % \
-                      cmd_obj.__class__
-
-            # Also make sure that the command object provides a list of its
-            # known options
-            if not (hasattr (cmd_obj, 'user_options') and
-                    type (cmd_obj.user_options) is ListType):
-                raise DistutilsClassError, \
-                      ("command class %s must provide " +
-                       "'user_options' attribute (a list of tuples)") % \
-                      cmd_obj.__class__
-
-            # Poof! like magic, all commands support the global
-            # options too, just by adding in 'global_options'.
-            negative_opt = self.negative_opt
-            if hasattr (cmd_obj, 'negative_opt'):
-                negative_opt = copy (negative_opt)
-                negative_opt.update (cmd_obj.negative_opt)
-
-            options = self.global_options + cmd_obj.user_options
-            args = fancy_getopt (options, negative_opt,
-                                 cmd_obj, args[1:])
-            if cmd_obj.help:
-                print_help (self.global_options,
-                            header="Global options:")
-                print
-                print_help (cmd_obj.user_options,
-                            header="Options for '%s' command:" % command)
-                print
-                print usage
-                return
-                
-            self.command_obj[command] = cmd_obj
-            self.have_run[command] = 0
-
-        # while args
-
-        # If the user wants help -- ie. they gave the "--help" option --
-        # give it to 'em.  We do this *after* processing the commands in
-        # case they want help on any particular command, eg.
-        # "setup.py --help foo".  (This isn't the documented way to
-        # get help on a command, but I support it because that's how
-        # CVS does it -- might as well be consistent.)
-        if self.help:
-            print_help (self.global_options, header="Global options:")
-            print
-
-            for command in self.commands:
-                klass = self.find_command_class (command)
-                print_help (klass.user_options,
-                            header="Options for '%s' command:" % command)
-                print
-
-            print usage
-            return
-
-        # Oops, no commands found -- an end-user error
-        if not self.commands:
-            raise DistutilsArgError, "no commands supplied"
-
-        # All is well: return true
-        return 1
-
-    # parse_command_line()
-
-
-    def print_command_list (self, commands, header, max_length):
-        """Print a subset of the list of all commands -- used by
-           'print_commands()'."""
-
-        print header + ":"
-
-        for cmd in commands:
-            klass = self.cmdclass.get (cmd)
-            if not klass:
-                klass = self.find_command_class (cmd)
-            try:
-                description = klass.description
-            except AttributeError:
-                description = "(no description available)"
-
-            print "  %-*s  %s" % (max_length, cmd, description)
-
-    # print_command_list ()
-
-
-    def print_commands (self):
-        """Print out a help message listing all available commands with
-           a description of each.  The list is divided into "standard
-           commands" (listed in distutils.command.__all__) and "extra
-           commands" (mentioned in self.cmdclass, but not a standard
-           command).  The descriptions come from the command class
-           attribute 'description'."""
-
-        import distutils.command
-        std_commands = distutils.command.__all__
-        is_std = {}
-        for cmd in std_commands:
-            is_std[cmd] = 1
-
-        extra_commands = []
-        for cmd in self.cmdclass.keys():
-            if not is_std.get(cmd):
-                extra_commands.append (cmd)
-
-        max_length = 0
-        for cmd in (std_commands + extra_commands):
-            if len (cmd) > max_length:
-                max_length = len (cmd)
-
-        self.print_command_list (std_commands,
-                                 "Standard commands",
-                                 max_length)
-        if extra_commands:
-            print
-            self.print_command_list (extra_commands,
-                                     "Extra commands",
-                                     max_length)
-
-    # print_commands ()
-        
-
-
-    # -- Command class/object methods ----------------------------------
-
-    # This is a method just so it can be overridden if desired; it doesn't
-    # actually use or change any attributes of the Distribution instance.
-    def find_command_class (self, command):
-        """Given a command, derives the names of the module and class
-           expected to implement the command: eg. 'foo_bar' becomes
-           'distutils.command.foo_bar' (the module) and 'FooBar' (the
-           class within that module).  Loads the module, extracts the
-           class from it, and returns the class object.
-
-           Raises DistutilsModuleError with a semi-user-targeted error
-           message if the expected module could not be loaded, or the
-           expected class was not found in it."""
-
-        module_name = 'distutils.command.' + command
-        klass_name = command
-
-        try:
-            __import__ (module_name)
-            module = sys.modules[module_name]
-        except ImportError:
-            raise DistutilsModuleError, \
-                  "invalid command '%s' (no module named '%s')" % \
-                  (command, module_name)
-
-        try:
-            klass = vars(module)[klass_name]
-        except KeyError:
-            raise DistutilsModuleError, \
-                  "invalid command '%s' (no class '%s' in module '%s')" \
-                  % (command, klass_name, module_name)
-
-        return klass
-
-    # find_command_class ()
-
-
-    def create_command_obj (self, command):
-        """Figure out the class that should implement a command,
-           instantiate it, cache and return the new "command object".
-           The "command class" is determined either by looking it up in
-           the 'cmdclass' attribute (this is the mechanism whereby
-           clients may override default Distutils commands or add their
-           own), or by calling the 'find_command_class()' method (if the
-           command name is not in 'cmdclass'."""
-
-        # Determine the command class -- either it's in the command_class
-        # dictionary, or we have to divine the module and class name
-        klass = self.cmdclass.get(command)
-        if not klass:
-            klass = self.find_command_class (command)
-            self.cmdclass[command] = klass
-
-        # Found the class OK -- instantiate it 
-        cmd_obj = klass (self)
-        return cmd_obj
-    
-
-    def find_command_obj (self, command, create=1):
-        """Look up and return a command object in the cache maintained by
-           'create_command_obj()'.  If none found, the action taken
-           depends on 'create': if true (the default), create a new
-           command object by calling 'create_command_obj()' and return
-           it; otherwise, return None.  If 'command' is an invalid
-           command name, then DistutilsModuleError will be raised."""
-
-        cmd_obj = self.command_obj.get (command)
-        if not cmd_obj and create:
-            cmd_obj = self.create_command_obj (command)
-            self.command_obj[command] = cmd_obj
-
-        return cmd_obj
-
-        
-    # -- Methods that operate on the Distribution ----------------------
-
-    def announce (self, msg, level=1):
-        """Print 'msg' if 'level' is greater than or equal to the verbosity
-           level recorded in the 'verbose' attribute (which, currently,
-           can be only 0 or 1)."""
-
-        if self.verbose >= level:
-            print msg
-
-
-    def run_commands (self):
-        """Run each command that was seen on the client command line.
-           Uses the list of commands found and cache of command objects
-           created by 'create_command_obj()'."""
-
-        for cmd in self.commands:
-            self.run_command (cmd)
-
-
-    def get_option (self, option):
-        """Return the value of a distribution option.  Raise
-           DistutilsOptionError if 'option' is not known."""
-
-        try:
-            return getattr (self, opt)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "unknown distribution option %s" % option
-
-
-    def get_options (self, *options):
-        """Return (as a tuple) the values of several distribution
-           options.  Raise DistutilsOptionError if any element of
-           'options' is not known."""
-        
-        values = []
-        try:
-            for opt in options:
-                values.append (getattr (self, opt))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "unknown distribution option %s" % name
-
-        return tuple (values)
-
-
-    # -- Methods that operate on its Commands --------------------------
-
-    def run_command (self, command):
-
-        """Do whatever it takes to run a command (including nothing at all,
-           if the command has already been run).  Specifically: if we have
-           already created and run the command named by 'command', return
-           silently without doing anything.  If the command named by
-           'command' doesn't even have a command object yet, create one.
-           Then invoke 'run()' on that command object (or an existing
-           one)."""
-
-        # Already been here, done that? then return silently.
-        if self.have_run.get (command):
-            return
-
-        self.announce ("running " + command)
-        cmd_obj = self.find_command_obj (command)
-        cmd_obj.ensure_ready ()
-        cmd_obj.run ()
-        self.have_run[command] = 1
-
-
-    def get_command_option (self, command, option):
-        """Create a command object for 'command' if necessary, ensure that
-           its option values are all set to their final values, and return
-           the value of its 'option' option.  Raise DistutilsOptionError if
-           'option' is not known for that 'command'."""
-
-        cmd_obj = self.find_command_obj (command)
-        cmd_obj.ensure_ready ()
-        return cmd_obj.get_option (option)
-        try:
-            return getattr (cmd_obj, option)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % (command, option)
-
-
-    def get_command_options (self, command, *options):
-        """Create a command object for 'command' if necessary, ensure that
-           its option values are all set to their final values, and return
-           a tuple containing the values of all the options listed in
-           'options' for that command.  Raise DistutilsOptionError if any
-           invalid option is supplied in 'options'."""
-
-        cmd_obj = self.find_command_obj (command)
-        cmd_obj.ensure_ready ()
-        values = []
-        try:
-            for opt in options:
-                values.append (getattr (cmd_obj, option))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % (command, name)
-
-        return tuple (values)
-
-
-    # -- Distribution query methods ------------------------------------
-
-    def has_pure_modules (self):
-        return len (self.packages or self.py_modules or []) > 0
-
-    def has_ext_modules (self):
-        return self.ext_modules and len (self.ext_modules) > 0
-
-    def has_c_libraries (self):
-        return self.libraries and len (self.libraries) > 0
-
-    def has_modules (self):
-        return self.has_pure_modules() or self.has_ext_modules()
-
-    def is_pure (self):
-        return (self.has_pure_modules() and
-                not self.has_ext_modules() and
-                not self.has_c_libraries())
-
-    def get_name (self):
-        return self.name or "UNKNOWN"
-
-    def get_full_name (self):
-        return "%s-%s" % ((self.name or "UNKNOWN"), (self.version or "???"))
-    
-
-# class Distribution
-
-
-class Command:
-    """Abstract base class for defining command classes, the "worker bees"
-       of the Distutils.  A useful analogy for command classes is to
-       think of them as subroutines with local variables called
-       "options".  The options are "declared" in 'initialize_options()'
-       and "defined" (given their final values, aka "finalized") in
-       'finalize_options()', both of which must be defined by every
-       command class.  The distinction between the two is necessary
-       because option values might come from the outside world (command
-       line, option file, ...), and any options dependent on other
-       options must be computed *after* these outside influences have
-       been processed -- hence 'finalize_options()'.  The "body" of the
-       subroutine, where it does all its work based on the values of its
-       options, is the 'run()' method, which must also be implemented by
-       every command class."""
-
-    # -- Creation/initialization methods -------------------------------
-
-    def __init__ (self, dist):
-        """Create and initialize a new Command object.  Most importantly,
-           invokes the 'initialize_options()' method, which is the
-           real initializer and depends on the actual command being
-           instantiated."""
-
-        if not isinstance (dist, Distribution):
-            raise TypeError, "dist must be a Distribution instance"
-        if self.__class__ is Command:
-            raise RuntimeError, "Command is an abstract class"
-
-        self.distribution = dist
-        self.initialize_options ()
-
-        # Per-command versions of the global flags, so that the user can
-        # customize Distutils' behaviour command-by-command and let some
-        # commands fallback on the Distribution's behaviour.  None means
-        # "not defined, check self.distribution's copy", while 0 or 1 mean
-        # false and true (duh).  Note that this means figuring out the real
-        # value of each flag is a touch complicatd -- hence "self.verbose"
-        # (etc.) will be handled by __getattr__, below.
-        self._verbose = None
-        self._dry_run = None
-        self._force = None
-
-        # The 'help' flag is just used for command-line parsing, so
-        # none of that complicated bureaucracy is needed.
-        self.help = 0
-
-        # 'ready' records whether or not 'finalize_options()' has been
-        # called.  'finalize_options()' itself should not pay attention to
-        # this flag: it is the business of 'ensure_ready()', which always
-        # calls 'finalize_options()', to respect/update it.
-        self.ready = 0
-
-    # end __init__ ()
-
-
-    def __getattr__ (self, attr):
-        if attr in ('verbose', 'dry_run', 'force'):
-            myval = getattr (self, "_" + attr)
-            if myval is None:
-                return getattr (self.distribution, attr)
-            else:
-                return myval
-        else:
-            raise AttributeError, attr
-
-
-    def ensure_ready (self):
-        if not self.ready:
-            self.finalize_options ()
-        self.ready = 1
-        
-
-    # Subclasses must define:
-    #   initialize_options()
-    #     provide default values for all options; may be overridden
-    #     by Distutils client, by command-line options, or by options
-    #     from option file
-    #   finalize_options()
-    #     decide on the final values for all options; this is called
-    #     after all possible intervention from the outside world
-    #     (command-line, option file, etc.) has been processed
-    #   run()
-    #     run the command: do whatever it is we're here to do,
-    #     controlled by the command's various option values
-
-    def initialize_options (self):
-        """Set default values for all the options that this command
-           supports.  Note that these defaults may be overridden
-           by the command-line supplied by the user; thus, this is
-           not the place to code dependencies between options; generally,
-           'initialize_options()' implementations are just a bunch
-           of "self.foo = None" assignments.
-           
-           This method must be implemented by all command classes."""
-           
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
-        
-    def finalize_options (self):
-        """Set final values for all the options that this command
-           supports.  This is always called as late as possible, ie.
-           after any option assignments from the command-line or from
-           other commands have been done.  Thus, this is the place to to
-           code option dependencies: if 'foo' depends on 'bar', then it
-           is safe to set 'foo' from 'bar' as long as 'foo' still has
-           the same value it was assigned in 'initialize_options()'.
-
-           This method must be implemented by all command classes."""
-           
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
-
-    def run (self):
-        """A command's raison d'etre: carry out the action it exists
-           to perform, controlled by the options initialized in
-           'initialize_options()', customized by the user and other
-           commands, and finalized in 'finalize_options()'.  All
-           terminal output and filesystem interaction should be done by
-           'run()'.
-
-           This method must be implemented by all command classes."""
-
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
-
-    def announce (self, msg, level=1):
-        """If the Distribution instance to which this command belongs
-           has a verbosity level of greater than or equal to 'level'
-           print 'msg' to stdout."""
-    
-        if self.verbose >= level:
-            print msg
-
-
-    # -- Option query/set methods --------------------------------------
-
-    def get_option (self, option):
-        """Return the value of a single option for this command.  Raise
-           DistutilsOptionError if 'option' is not known."""
-        try:
-            return getattr (self, option)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % \
-                  (self.get_command_name(), option)
-
-
-    def get_options (self, *options):
-        """Return (as a tuple) the values of several options for this
-           command.  Raise DistutilsOptionError if any of the options in
-           'options' are not known."""
-
-        values = []
-        try:
-            for opt in options:
-                values.append (getattr (self, opt))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % \
-                  (self.get_command_name(), name)
-            
-        return tuple (values)
-    
-
-    def set_option (self, option, value):
-        """Set the value of a single option for this command.  Raise
-           DistutilsOptionError if 'option' is not known."""
-
-        if not hasattr (self, option):
-            raise DistutilsOptionError, \
-                  "command '%s': no such option '%s'" % \
-                  (self.get_command_name(), option)
-        if value is not None:
-            setattr (self, option, value)
-
-    def set_options (self, **optval):
-        """Set the values of several options for this command.  Raise
-           DistutilsOptionError if any of the options specified as
-           keyword arguments are not known."""
-
-        for k in optval.keys():
-            if optval[k] is not None:
-                self.set_option (k, optval[k])
-
-
-    # -- Convenience methods for commands ------------------------------
-
-    def get_command_name (self):
-        if hasattr (self, 'command_name'):
-            return self.command_name
-        else:
-            class_name = self.__class__.__name__
-
-            # The re.split here returs empty strings delimited by the
-            # words we're actually interested in -- e.g.  "FooBarBaz"
-            # splits to ['', 'Foo', '', 'Bar', '', 'Baz', ''].  Hence
-            # the 'filter' to strip out the empties.            
-            words = filter (None, re.split (r'([A-Z][a-z]+)', class_name))
-            self.command_name = string.join (map (string.lower, words), "_")
-            return self.command_name
-
-
-    def set_undefined_options (self, src_cmd, *option_pairs):
-        """Set the values of any "undefined" options from corresponding
-           option values in some other command object.  "Undefined" here
-           means "is None", which is the convention used to indicate
-           that an option has not been changed between
-           'set_initial_values()' and 'set_final_values()'.  Usually
-           called from 'set_final_values()' for options that depend on
-           some other command rather than another option of the same
-           command.  'src_cmd' is the other command from which option
-           values will be taken (a command object will be created for it
-           if necessary); the remaining arguments are
-           '(src_option,dst_option)' tuples which mean "take the value
-           of 'src_option' in the 'src_cmd' command object, and copy it
-           to 'dst_option' in the current command object"."""
-
-        # Option_pairs: list of (src_option, dst_option) tuples
-
-        src_cmd_obj = self.distribution.find_command_obj (src_cmd)
-        src_cmd_obj.ensure_ready ()
-        try:
-            for (src_option, dst_option) in option_pairs:
-                if getattr (self, dst_option) is None:
-                    self.set_option (dst_option,
-                                     src_cmd_obj.get_option (src_option))
-        except AttributeError, name:
-            # duh, which command?
-            raise DistutilsOptionError, "unknown option %s" % name
-
-
-    def find_peer (self, command, create=1):
-        """Wrapper around Distribution's 'find_command_obj()' method:
-           find (create if necessary and 'create' is true) the command
-           object for 'command'.."""
-
-        cmd_obj = self.distribution.find_command_obj (command, create)
-        cmd_obj.ensure_ready ()
-        return cmd_obj
-
-
-    def get_peer_option (self, command, option):
-        """Find or create the command object for 'command', and return
-           its 'option' option."""
-
-        cmd_obj = self.find_peer (command)
-        return cmd_obj.get_option (option)
-
-
-    def run_peer (self, command):
-        """Run some other command: uses the 'run_command()' method of
-           Distribution, which creates the command object if necessary
-           and then invokes its 'run()' method."""
-
-        self.distribution.run_command (command)
-
-
-    # -- External world manipulation -----------------------------------
-
-    def warn (self, msg):
-        sys.stderr.write ("warning: %s: %s\n" %
-                          (self.get_command_name(), msg))
-
-
-    def execute (self, func, args, msg=None, level=1):
-        """Perform some action that affects the outside world (eg.
-           by writing to the filesystem).  Such actions are special because
-           they should be disabled by the "dry run" flag, and should
-           announce themselves if the current verbosity level is high
-           enough.  This method takes care of all that bureaucracy for you;
-           all you have to do is supply the funtion to call and an argument
-           tuple for it (to embody the "external action" being performed),
-           a message to print if the verbosity level is high enough, and an
-           optional verbosity threshold."""
-
-        # Generate a message if we weren't passed one
-        if msg is None:
-            msg = "%s %s" % (func.__name__, `args`)
-            if msg[-2:] == ',)':        # correct for singleton tuple 
-                msg = msg[0:-2] + ')'
-
-        # Print it if verbosity level is high enough
-        self.announce (msg, level)
-
-        # And do it, as long as we're not in dry-run mode
-        if not self.dry_run:
-            apply (func, args)
-
-    # execute()
-
-
-    def mkpath (self, name, mode=0777):
-        util.mkpath (name, mode,
-                     self.verbose, self.dry_run)
-
-
-    def copy_file (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, link=None, level=1):
-        """Copy a file respecting verbose, dry-run and force flags."""
-
-        return util.copy_file (infile, outfile,
-                               preserve_mode, preserve_times,
-                               not self.force,
-                               link,
-                               self.verbose >= level,
-                               self.dry_run)
-
-
-    def copy_tree (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, preserve_symlinks=0,
-                   level=1):
-        """Copy an entire directory tree respecting verbose, dry-run,
-           and force flags."""
-
-        return util.copy_tree (infile, outfile, 
-                               preserve_mode,preserve_times,preserve_symlinks,
-                               not self.force,
-                               self.verbose >= level,
-                               self.dry_run)
-
-
-    def move_file (self, src, dst, level=1):
-        """Move a file respecting verbose and dry-run flags."""
-        return util.move_file (src, dst,
-                               self.verbose >= level,
-                               self.dry_run)
-
-
-    def spawn (self, cmd, search_path=1, level=1):
-        from distutils.spawn import spawn
-        spawn (cmd, search_path,
-               self.verbose >= level,
-               self.dry_run)
-
-
-    def make_archive (self, base_name, format,
-                      root_dir=None, base_dir=None):
-        util.make_archive (base_name, format, root_dir, base_dir,
-                           self.verbose, self.dry_run)
-
-
-    def make_file (self, infiles, outfile, func, args,
-                    exec_msg=None, skip_msg=None, level=1):
-
-        """Special case of 'execute()' for operations that process one or
-           more input files and generate one output file.  Works just like
-           'execute()', except the operation is skipped and a different
-           message printed if 'outfile' already exists and is newer than
-           all files listed in 'infiles'."""
-
-
-        if exec_msg is None:
-            exec_msg = "generating %s from %s" % \
-                       (outfile, string.join (infiles, ', '))
-        if skip_msg is None:
-            skip_msg = "skipping %s (inputs unchanged)" % outfile
-        
-
-        # Allow 'infiles' to be a single string
-        if type (infiles) is StringType:
-            infiles = (infiles,)
-        elif type (infiles) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'infiles' must be a string, or a list or tuple of strings"
-
-        # If 'outfile' must be regenerated (either because it doesn't
-        # exist, is out-of-date, or the 'force' flag is true) then
-        # perform the action that presumably regenerates it
-        if self.force or util.newer_group (infiles, outfile):
-            self.execute (func, args, exec_msg, level)
-
-        # Otherwise, print the "skip" message
-        else:
-            self.announce (skip_msg, level)
-
-    # make_file ()
-
-# class Command
diff --git a/dist.py b/dist.py
new file mode 100644
index 0000000000..50e755697b
--- /dev/null
+++ b/dist.py
@@ -0,0 +1,567 @@
+"""distutils.dist
+
+Provides the Distribution class, which represents the module distribution
+being built/installed/distributed."""
+
+# created 2000/04/03, Greg Ward
+# (extricated from core.py; actually dates back to the beginning)
+
+__revision__ = "$Id$"
+
+import sys, string, re
+from types import *
+from copy import copy
+from distutils.errors import *
+from distutils.fancy_getopt import fancy_getopt, print_help
+
+
+# Regex to define acceptable Distutils command names.  This is not *quite*
+# the same as a Python NAME -- I don't allow leading underscores.  The fact
+# that they're very similar is no coincidence; the default naming scheme is
+# to look for a Python module named after the command.
+command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
+
+
+class Distribution:
+    """The core of the Distutils.  Most of the work hiding behind
+       'setup' is really done within a Distribution instance, which
+       farms the work out to the Distutils commands specified on the
+       command line.
+
+       Clients will almost never instantiate Distribution directly,
+       unless the 'setup' function is totally inadequate to their needs.
+       However, it is conceivable that a client might wish to subclass
+       Distribution for some specialized purpose, and then pass the
+       subclass to 'setup' as the 'distclass' keyword argument.  If so,
+       it is necessary to respect the expectations that 'setup' has of
+       Distribution: it must have a constructor and methods
+       'parse_command_line()' and 'run_commands()' with signatures like
+       those described below."""
+
+
+    # 'global_options' describes the command-line options that may be
+    # supplied to the client (setup.py) prior to any actual commands.
+    # Eg. "./setup.py -nv" or "./setup.py --verbose" both take advantage of
+    # these global options.  This list should be kept to a bare minimum,
+    # since every global option is also valid as a command option -- and we
+    # don't want to pollute the commands with too many options that they
+    # have minimal control over.
+    global_options = [('verbose', 'v',
+                       "run verbosely (default)"),
+                      ('quiet', 'q',
+                       "run quietly (turns verbosity off)"),
+                      ('dry-run', 'n',
+                       "don't actually do anything"),
+                      ('force', 'f',
+                       "skip dependency checking between files"),
+                      ('help', 'h',
+                       "show this help message"),
+                     ]
+    negative_opt = {'quiet': 'verbose'}
+
+
+    # -- Creation/initialization methods -------------------------------
+    
+    def __init__ (self, attrs=None):
+        """Construct a new Distribution instance: initialize all the
+           attributes of a Distribution, and then uses 'attrs' (a
+           dictionary mapping attribute names to values) to assign
+           some of those attributes their "real" values.  (Any attributes
+           not mentioned in 'attrs' will be assigned to some null
+           value: 0, None, an empty list or dictionary, etc.)  Most
+           importantly, initialize the 'command_obj' attribute
+           to the empty dictionary; this will be filled in with real
+           command objects by 'parse_command_line()'."""
+
+        # Default values for our command-line options
+        self.verbose = 1
+        self.dry_run = 0
+        self.force = 0
+        self.help = 0
+        self.help_commands = 0
+
+        # And the "distribution meta-data" options -- these can only
+        # come from setup.py (the caller), not the command line
+        # (or a hypothetical config file).
+        self.name = None
+        self.version = None
+        self.author = None
+        self.author_email = None
+        self.maintainer = None
+        self.maintainer_email = None
+        self.url = None
+        self.licence = None
+        self.description = None
+
+        # 'cmdclass' maps command names to class objects, so we
+        # can 1) quickly figure out which class to instantiate when
+        # we need to create a new command object, and 2) have a way
+        # for the client to override command classes
+        self.cmdclass = {}
+
+        # These options are really the business of various commands, rather
+        # than of the Distribution itself.  We provide aliases for them in
+        # Distribution as a convenience to the developer.
+        # dictionary.        
+        self.packages = None
+        self.package_dir = None
+        self.py_modules = None
+        self.libraries = None
+        self.ext_modules = None
+        self.ext_package = None
+        self.include_dirs = None
+        self.extra_path = None
+
+        # And now initialize bookkeeping stuff that can't be supplied by
+        # the caller at all.  'command_obj' maps command names to
+        # Command instances -- that's how we enforce that every command
+        # class is a singleton.
+        self.command_obj = {}
+
+        # 'have_run' maps command names to boolean values; it keeps track
+        # of whether we have actually run a particular command, to make it
+        # cheap to "run" a command whenever we think we might need to -- if
+        # it's already been done, no need for expensive filesystem
+        # operations, we just check the 'have_run' dictionary and carry on.
+        # It's only safe to query 'have_run' for a command class that has
+        # been instantiated -- a false value will be inserted when the
+        # command object is created, and replaced with a true value when
+        # the command is succesfully run.  Thus it's probably best to use
+        # '.get()' rather than a straight lookup.
+        self.have_run = {}
+
+        # Now we'll use the attrs dictionary (ultimately, keyword args from
+        # the client) to possibly override any or all of these distribution
+        # options.        
+        if attrs:
+
+            # Pull out the set of command options and work on them
+            # specifically.  Note that this order guarantees that aliased
+            # command options will override any supplied redundantly
+            # through the general options dictionary.
+            options = attrs.get ('options')
+            if options:
+                del attrs['options']
+                for (command, cmd_options) in options.items():
+                    cmd_obj = self.find_command_obj (command)
+                    for (key, val) in cmd_options.items():
+                        cmd_obj.set_option (key, val)
+                # loop over commands
+            # if any command options                        
+
+            # Now work on the rest of the attributes.  Any attribute that's
+            # not already defined is invalid!
+            for (key,val) in attrs.items():
+                if hasattr (self, key):
+                    setattr (self, key, val)
+                else:
+                    raise DistutilsOptionError, \
+                          "invalid distribution option '%s'" % key
+
+    # __init__ ()
+
+
+    def parse_command_line (self, args):
+        """Parse the setup script's command line: set any Distribution
+           attributes tied to command-line options, create all command
+           objects, and set their options from the command-line.  'args'
+           must be a list of command-line arguments, most likely
+           'sys.argv[1:]' (see the 'setup()' function).  This list is first
+           processed for "global options" -- options that set attributes of
+           the Distribution instance.  Then, it is alternately scanned for
+           Distutils command and options for that command.  Each new
+           command terminates the options for the previous command.  The
+           allowed options for a command are determined by the 'options'
+           attribute of the command object -- thus, we instantiate (and
+           cache) every command object here, in order to access its
+           'options' attribute.  Any error in that 'options' attribute
+           raises DistutilsGetoptError; any error on the command-line
+           raises DistutilsArgError.  If no Distutils commands were found
+           on the command line, raises DistutilsArgError.  Return true if
+           command-line successfully parsed and we should carry on with
+           executing commands; false if no errors but we shouldn't execute
+           commands (currently, this only happens if user asks for
+           help)."""
+
+        # late import because of mutual dependence between these classes
+        from distutils.cmd import Command
+
+
+        # We have to parse the command line a bit at a time -- global
+        # options, then the first command, then its options, and so on --
+        # because each command will be handled by a different class, and
+        # the options that are valid for a particular class aren't
+        # known until we instantiate the command class, which doesn't
+        # happen until we know what the command is.
+
+        self.commands = []
+        options = self.global_options + \
+                  [('help-commands', None,
+                    "list all available commands")]
+        args = fancy_getopt (options, self.negative_opt,
+                             self, sys.argv[1:])
+
+        # User just wants a list of commands -- we'll print it out and stop
+        # processing now (ie. if they ran "setup --help-commands foo bar",
+        # we ignore "foo bar").
+        if self.help_commands:
+            self.print_commands ()
+            print
+            print usage
+            return
+            
+        while args:
+            # Pull the current command from the head of the command line
+            command = args[0]
+            if not command_re.match (command):
+                raise SystemExit, "invalid command name '%s'" % command
+            self.commands.append (command)
+
+            # Make sure we have a command object to put the options into
+            # (this either pulls it out of a cache of command objects,
+            # or finds and instantiates the command class).
+            try:
+                cmd_obj = self.find_command_obj (command)
+            except DistutilsModuleError, msg:
+                raise DistutilsArgError, msg
+
+            # Require that the command class be derived from Command --
+            # that way, we can be sure that we at least have the 'run'
+            # and 'get_option' methods.
+            if not isinstance (cmd_obj, Command):
+                raise DistutilsClassError, \
+                      "command class %s must subclass Command" % \
+                      cmd_obj.__class__
+
+            # Also make sure that the command object provides a list of its
+            # known options
+            if not (hasattr (cmd_obj, 'user_options') and
+                    type (cmd_obj.user_options) is ListType):
+                raise DistutilsClassError, \
+                      ("command class %s must provide " +
+                       "'user_options' attribute (a list of tuples)") % \
+                      cmd_obj.__class__
+
+            # Poof! like magic, all commands support the global
+            # options too, just by adding in 'global_options'.
+            negative_opt = self.negative_opt
+            if hasattr (cmd_obj, 'negative_opt'):
+                negative_opt = copy (negative_opt)
+                negative_opt.update (cmd_obj.negative_opt)
+
+            options = self.global_options + cmd_obj.user_options
+            args = fancy_getopt (options, negative_opt,
+                                 cmd_obj, args[1:])
+            if cmd_obj.help:
+                print_help (self.global_options,
+                            header="Global options:")
+                print
+                print_help (cmd_obj.user_options,
+                            header="Options for '%s' command:" % command)
+                print
+                print usage
+                return
+                
+            self.command_obj[command] = cmd_obj
+            self.have_run[command] = 0
+
+        # while args
+
+        # If the user wants help -- ie. they gave the "--help" option --
+        # give it to 'em.  We do this *after* processing the commands in
+        # case they want help on any particular command, eg.
+        # "setup.py --help foo".  (This isn't the documented way to
+        # get help on a command, but I support it because that's how
+        # CVS does it -- might as well be consistent.)
+        if self.help:
+            print_help (self.global_options, header="Global options:")
+            print
+
+            for command in self.commands:
+                klass = self.find_command_class (command)
+                print_help (klass.user_options,
+                            header="Options for '%s' command:" % command)
+                print
+
+            print usage
+            return
+
+        # Oops, no commands found -- an end-user error
+        if not self.commands:
+            raise DistutilsArgError, "no commands supplied"
+
+        # All is well: return true
+        return 1
+
+    # parse_command_line()
+
+
+    def print_command_list (self, commands, header, max_length):
+        """Print a subset of the list of all commands -- used by
+           'print_commands()'."""
+
+        print header + ":"
+
+        for cmd in commands:
+            klass = self.cmdclass.get (cmd)
+            if not klass:
+                klass = self.find_command_class (cmd)
+            try:
+                description = klass.description
+            except AttributeError:
+                description = "(no description available)"
+
+            print "  %-*s  %s" % (max_length, cmd, description)
+
+    # print_command_list ()
+
+
+    def print_commands (self):
+        """Print out a help message listing all available commands with
+           a description of each.  The list is divided into "standard
+           commands" (listed in distutils.command.__all__) and "extra
+           commands" (mentioned in self.cmdclass, but not a standard
+           command).  The descriptions come from the command class
+           attribute 'description'."""
+
+        import distutils.command
+        std_commands = distutils.command.__all__
+        is_std = {}
+        for cmd in std_commands:
+            is_std[cmd] = 1
+
+        extra_commands = []
+        for cmd in self.cmdclass.keys():
+            if not is_std.get(cmd):
+                extra_commands.append (cmd)
+
+        max_length = 0
+        for cmd in (std_commands + extra_commands):
+            if len (cmd) > max_length:
+                max_length = len (cmd)
+
+        self.print_command_list (std_commands,
+                                 "Standard commands",
+                                 max_length)
+        if extra_commands:
+            print
+            self.print_command_list (extra_commands,
+                                     "Extra commands",
+                                     max_length)
+
+    # print_commands ()
+        
+
+
+    # -- Command class/object methods ----------------------------------
+
+    # This is a method just so it can be overridden if desired; it doesn't
+    # actually use or change any attributes of the Distribution instance.
+    def find_command_class (self, command):
+        """Given a command, derives the names of the module and class
+           expected to implement the command: eg. 'foo_bar' becomes
+           'distutils.command.foo_bar' (the module) and 'FooBar' (the
+           class within that module).  Loads the module, extracts the
+           class from it, and returns the class object.
+
+           Raises DistutilsModuleError with a semi-user-targeted error
+           message if the expected module could not be loaded, or the
+           expected class was not found in it."""
+
+        module_name = 'distutils.command.' + command
+        klass_name = command
+
+        try:
+            __import__ (module_name)
+            module = sys.modules[module_name]
+        except ImportError:
+            raise DistutilsModuleError, \
+                  "invalid command '%s' (no module named '%s')" % \
+                  (command, module_name)
+
+        try:
+            klass = vars(module)[klass_name]
+        except KeyError:
+            raise DistutilsModuleError, \
+                  "invalid command '%s' (no class '%s' in module '%s')" \
+                  % (command, klass_name, module_name)
+
+        return klass
+
+    # find_command_class ()
+
+
+    def create_command_obj (self, command):
+        """Figure out the class that should implement a command,
+           instantiate it, cache and return the new "command object".
+           The "command class" is determined either by looking it up in
+           the 'cmdclass' attribute (this is the mechanism whereby
+           clients may override default Distutils commands or add their
+           own), or by calling the 'find_command_class()' method (if the
+           command name is not in 'cmdclass'."""
+
+        # Determine the command class -- either it's in the command_class
+        # dictionary, or we have to divine the module and class name
+        klass = self.cmdclass.get(command)
+        if not klass:
+            klass = self.find_command_class (command)
+            self.cmdclass[command] = klass
+
+        # Found the class OK -- instantiate it 
+        cmd_obj = klass (self)
+        return cmd_obj
+    
+
+    def find_command_obj (self, command, create=1):
+        """Look up and return a command object in the cache maintained by
+           'create_command_obj()'.  If none found, the action taken
+           depends on 'create': if true (the default), create a new
+           command object by calling 'create_command_obj()' and return
+           it; otherwise, return None.  If 'command' is an invalid
+           command name, then DistutilsModuleError will be raised."""
+
+        cmd_obj = self.command_obj.get (command)
+        if not cmd_obj and create:
+            cmd_obj = self.create_command_obj (command)
+            self.command_obj[command] = cmd_obj
+
+        return cmd_obj
+
+        
+    # -- Methods that operate on the Distribution ----------------------
+
+    def announce (self, msg, level=1):
+        """Print 'msg' if 'level' is greater than or equal to the verbosity
+           level recorded in the 'verbose' attribute (which, currently,
+           can be only 0 or 1)."""
+
+        if self.verbose >= level:
+            print msg
+
+
+    def run_commands (self):
+        """Run each command that was seen on the client command line.
+           Uses the list of commands found and cache of command objects
+           created by 'create_command_obj()'."""
+
+        for cmd in self.commands:
+            self.run_command (cmd)
+
+
+    def get_option (self, option):
+        """Return the value of a distribution option.  Raise
+           DistutilsOptionError if 'option' is not known."""
+
+        try:
+            return getattr (self, opt)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "unknown distribution option %s" % option
+
+
+    def get_options (self, *options):
+        """Return (as a tuple) the values of several distribution
+           options.  Raise DistutilsOptionError if any element of
+           'options' is not known."""
+        
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (self, opt))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "unknown distribution option %s" % name
+
+        return tuple (values)
+
+
+    # -- Methods that operate on its Commands --------------------------
+
+    def run_command (self, command):
+
+        """Do whatever it takes to run a command (including nothing at all,
+           if the command has already been run).  Specifically: if we have
+           already created and run the command named by 'command', return
+           silently without doing anything.  If the command named by
+           'command' doesn't even have a command object yet, create one.
+           Then invoke 'run()' on that command object (or an existing
+           one)."""
+
+        # Already been here, done that? then return silently.
+        if self.have_run.get (command):
+            return
+
+        self.announce ("running " + command)
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.ensure_ready ()
+        cmd_obj.run ()
+        self.have_run[command] = 1
+
+
+    def get_command_option (self, command, option):
+        """Create a command object for 'command' if necessary, ensure that
+           its option values are all set to their final values, and return
+           the value of its 'option' option.  Raise DistutilsOptionError if
+           'option' is not known for that 'command'."""
+
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.ensure_ready ()
+        return cmd_obj.get_option (option)
+        try:
+            return getattr (cmd_obj, option)
+        except AttributeError:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % (command, option)
+
+
+    def get_command_options (self, command, *options):
+        """Create a command object for 'command' if necessary, ensure that
+           its option values are all set to their final values, and return
+           a tuple containing the values of all the options listed in
+           'options' for that command.  Raise DistutilsOptionError if any
+           invalid option is supplied in 'options'."""
+
+        cmd_obj = self.find_command_obj (command)
+        cmd_obj.ensure_ready ()
+        values = []
+        try:
+            for opt in options:
+                values.append (getattr (cmd_obj, option))
+        except AttributeError, name:
+            raise DistutilsOptionError, \
+                  "command %s: no such option %s" % (command, name)
+
+        return tuple (values)
+
+
+    # -- Distribution query methods ------------------------------------
+
+    def has_pure_modules (self):
+        return len (self.packages or self.py_modules or []) > 0
+
+    def has_ext_modules (self):
+        return self.ext_modules and len (self.ext_modules) > 0
+
+    def has_c_libraries (self):
+        return self.libraries and len (self.libraries) > 0
+
+    def has_modules (self):
+        return self.has_pure_modules() or self.has_ext_modules()
+
+    def is_pure (self):
+        return (self.has_pure_modules() and
+                not self.has_ext_modules() and
+                not self.has_c_libraries())
+
+    def get_name (self):
+        return self.name or "UNKNOWN"
+
+    def get_full_name (self):
+        return "%s-%s" % ((self.name or "UNKNOWN"), (self.version or "???"))
+    
+# class Distribution
+
+
+if __name__ == "__main__":
+    dist = Distribution ()
+    print "ok"

From f3cceb54cf92355a4d0ce52a5b7b568c490753b3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 4 Apr 2000 02:05:59 +0000
Subject: [PATCH 0257/8469] Reorganization: ripped util.py to shreds, creating
 in the process:   - file_util.py: operations on single files   - dir_util.py:
 operations on whole directories or directory trees   - dep_util.py: simple
 timestamp-based dependency analysis   - archive_util.py: creation of archive
 (tar, zip, ...) files The functions left in util.py are miscellany that don't
 fit in any of the new files.

---
 archive_util.py | 152 +++++++++++
 dep_util.py     | 116 +++++++++
 dir_util.py     | 196 ++++++++++++++
 file_util.py    | 248 ++++++++++++++++++
 util.py         | 671 +-----------------------------------------------
 5 files changed, 719 insertions(+), 664 deletions(-)
 create mode 100644 archive_util.py
 create mode 100644 dep_util.py
 create mode 100644 dir_util.py
 create mode 100644 file_util.py

diff --git a/archive_util.py b/archive_util.py
new file mode 100644
index 0000000000..a28eed1ad8
--- /dev/null
+++ b/archive_util.py
@@ -0,0 +1,152 @@
+"""distutils.archive_util
+
+Utility functions for creating archive files (tarballs, zip files,
+that sort of thing)."""
+
+# created 2000/04/03, Greg Ward (extracted from util.py)
+
+__revision__ = "$Id$"
+
+import os
+from distutils.errors import DistutilsExecError
+from distutils.spawn import spawn
+
+
+def make_tarball (base_name, base_dir, compress="gzip",
+                  verbose=0, dry_run=0):
+    """Create a (possibly compressed) tar file from all the files under
+       'base_dir'.  'compress' must be "gzip" (the default), "compress", or
+       None.  Both "tar" and the compression utility named by 'compress'
+       must be on the default program search path, so this is probably
+       Unix-specific.  The output tar file will be named 'base_dir' +
+       ".tar", possibly plus the appropriate compression extension
+       (".gz" or ".Z").  Return the output filename."""
+
+    # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
+    # It's pretty new, though, so we certainly can't require it --
+    # but it would be nice to take advantage of it to skip the
+    # "create a tree of hardlinks" step!  (Would also be nice to
+    # detect GNU tar to use its 'z' option and save a step.)
+
+    compress_ext = { 'gzip': ".gz",
+                     'compress': ".Z" }
+
+    if compress is not None and compress not in ('gzip', 'compress'):
+        raise ValueError, \
+              "bad value for 'compress': must be None, 'gzip', or 'compress'"
+
+    archive_name = base_name + ".tar"
+    cmd = ["tar", "-cf", archive_name, base_dir]
+    spawn (cmd, verbose=verbose, dry_run=dry_run)
+
+    if compress:
+        spawn ([compress, archive_name], verbose=verbose, dry_run=dry_run)
+        return archive_name + compress_ext[compress]
+    else:
+        return archive_name
+
+# make_tarball ()
+
+
+def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
+    """Create a zip file from all the files under 'base_dir'.  The
+       output zip file will be named 'base_dir' + ".zip".  Uses either the
+       InfoZIP "zip" utility (if installed and found on the default search
+       path) or the "zipfile" Python module (if available).  If neither
+       tool is available, raises DistutilsExecError.  Returns the name
+       of the output zip file."""
+
+    # This initially assumed the Unix 'zip' utility -- but
+    # apparently InfoZIP's zip.exe works the same under Windows, so
+    # no changes needed!
+
+    zip_filename = base_name + ".zip"
+    try:
+        spawn (["zip", "-rq", zip_filename, base_dir],
+               verbose=verbose, dry_run=dry_run)
+    except DistutilsExecError:
+
+        # XXX really should distinguish between "couldn't find
+        # external 'zip' command" and "zip failed" -- shouldn't try
+        # again in the latter case.  (I think fixing this will
+        # require some cooperation from the spawn module -- perhaps
+        # a utility function to search the path, so we can fallback
+        # on zipfile.py without the failed spawn.)
+        try:
+            import zipfile
+        except ImportError:
+            raise DistutilsExecError, \
+                  ("unable to create zip file '%s': " + 
+                   "could neither find a standalone zip utility nor " +
+                   "import the 'zipfile' module") % zip_filename
+
+        if verbose:
+            print "creating '%s' and adding '%s' to it" % \
+                  (zip_filename, base_dir)
+
+        def visit (z, dirname, names):
+            for name in names:
+                path = os.path.join (dirname, name)
+                if os.path.isfile (path):
+                    z.write (path, path)
+
+        if not dry_run:
+            z = zipfile.ZipFile (zip_filename, "wb",
+                                 compression=zipfile.ZIP_DEFLATED)
+
+            os.path.walk (base_dir, visit, z)
+            z.close()
+
+    return zip_filename
+
+# make_zipfile ()
+
+
+def make_archive (base_name, format,
+                  root_dir=None, base_dir=None,
+                  verbose=0, dry_run=0):
+
+    """Create an archive file (eg. zip or tar).  'base_name' is the name
+    of the file to create, minus any format-specific extension; 'format'
+    is the archive format: one of "zip", "tar", "ztar", or "gztar".
+    'root_dir' is a directory that will be the root directory of the
+    archive; ie. we typically chdir into 'root_dir' before creating the
+    archive.  'base_dir' is the directory where we start archiving from;
+    ie. 'base_dir' will be the common prefix of all files and
+    directories in the archive.  'root_dir' and 'base_dir' both default
+    to the current directory."""
+
+    save_cwd = os.getcwd()
+    if root_dir is not None:
+        if verbose:
+            print "changing into '%s'" % root_dir
+        base_name = os.path.abspath (base_name)
+        if not dry_run:
+            os.chdir (root_dir)
+
+    if base_dir is None:
+        base_dir = os.curdir
+
+    kwargs = { 'verbose': verbose,
+               'dry_run': dry_run }
+    
+    if format == 'gztar':
+        func = make_tarball
+        kwargs['compress'] = 'gzip'
+    elif format == 'ztar':
+        func = make_tarball
+        kwargs['compress'] = 'compress'
+    elif format == 'tar':
+        func = make_tarball
+        kwargs['compress'] = None
+    elif format == 'zip':
+        func = make_zipfile
+
+    apply (func, (base_name, base_dir), kwargs)
+
+    if root_dir is not None:
+        if verbose:
+            print "changing back to '%s'" % save_cwd
+        os.chdir (save_cwd)
+
+# make_archive ()
diff --git a/dep_util.py b/dep_util.py
new file mode 100644
index 0000000000..97812edaf5
--- /dev/null
+++ b/dep_util.py
@@ -0,0 +1,116 @@
+"""distutils.dep_util
+
+Utility functions for simple, timestamp-based dependency of files
+and groups of files; also, function based entirely on such
+timestamp dependency analysis."""
+
+# created 2000/04/03, Greg Ward (extracted from util.py)
+
+__revision__ = "$Id$"
+
+import os
+from distutils.errors import DistutilsFileError
+
+
+def newer (source, target):
+    """Return true if 'source' exists and is more recently modified than
+       'target', or if 'source' exists and 'target' doesn't.  Return
+       false if both exist and 'target' is the same age or younger than
+       'source'.  Raise DistutilsFileError if 'source' does not
+       exist."""
+
+    if not os.path.exists (source):
+        raise DistutilsFileError, "file '%s' does not exist" % source
+    if not os.path.exists (target):
+        return 1
+
+    from stat import ST_MTIME
+    mtime1 = os.stat(source)[ST_MTIME]
+    mtime2 = os.stat(target)[ST_MTIME]
+
+    return mtime1 > mtime2
+
+# newer ()
+
+
+def newer_pairwise (sources, targets):
+    """Walk two filename lists in parallel, testing if each source is newer
+       than its corresponding target.  Return a pair of lists (sources,
+       targets) where source is newer than target, according to the
+       semantics of 'newer()'."""
+
+    if len (sources) != len (targets):
+        raise ValueError, "'sources' and 'targets' must be same length"
+
+    # build a pair of lists (sources, targets) where  source is newer
+    n_sources = []
+    n_targets = []
+    for i in range (len (sources)):
+        if newer (sources[i], targets[i]):
+            n_sources.append (sources[i])
+            n_targets.append (targets[i])
+
+    return (n_sources, n_targets)
+
+# newer_pairwise ()
+
+
+def newer_group (sources, target, missing='error'):
+    """Return true if 'target' is out-of-date with respect to any
+       file listed in 'sources'.  In other words, if 'target' exists and
+       is newer than every file in 'sources', return false; otherwise
+       return true.  'missing' controls what we do when a source file is
+       missing; the default ("error") is to blow up with an OSError from
+       inside 'stat()'; if it is "ignore", we silently drop any missing
+       source files; if it is "newer", any missing source files make us
+       assume that 'target' is out-of-date (this is handy in "dry-run"
+       mode: it'll make you pretend to carry out commands that wouldn't
+       work because inputs are missing, but that doesn't matter because
+       you're not actually going to run the commands)."""
+
+    # If the target doesn't even exist, then it's definitely out-of-date.
+    if not os.path.exists (target):
+        return 1
+   
+    # Otherwise we have to find out the hard way: if *any* source file
+    # is more recent than 'target', then 'target' is out-of-date and
+    # we can immediately return true.  If we fall through to the end
+    # of the loop, then 'target' is up-to-date and we return false.
+    from stat import ST_MTIME
+    target_mtime = os.stat (target)[ST_MTIME]
+    for source in sources:
+        if not os.path.exists (source):
+            if missing == 'error':      # blow up when we stat() the file
+                pass                    
+            elif missing == 'ignore':   # missing source dropped from 
+                continue                #  target's dependency list
+            elif missing == 'newer':    # missing source means target is
+                return 1                #  out-of-date
+            
+        source_mtime = os.stat(source)[ST_MTIME]
+        if source_mtime > target_mtime:
+            return 1
+    else:
+        return 0
+
+# newer_group ()
+
+
+# XXX this isn't used anywhere, and worse, it has the same name as a method
+# in Command with subtly different semantics.  (This one just has one
+# source -> one dest; that one has many sources -> one dest.)  Nuke it?
+def make_file (src, dst, func, args,
+               verbose=0, update_message=None, noupdate_message=None):
+    """Makes 'dst' from 'src' (both filenames) by calling 'func' with
+       'args', but only if it needs to: i.e. if 'dst' does not exist or
+       'src' is newer than 'dst'."""
+
+    if newer (src, dst):
+        if verbose and update_message:
+            print update_message
+        apply (func, args)
+    else:
+        if verbose and noupdate_message:
+            print noupdate_message
+
+# make_file ()
diff --git a/dir_util.py b/dir_util.py
new file mode 100644
index 0000000000..c049bbd217
--- /dev/null
+++ b/dir_util.py
@@ -0,0 +1,196 @@
+"""distutils.dir_util
+
+Utility functions for manipulating directories and directory trees."""
+
+# created 2000/04/03, Greg Ward (extracted from util.py)
+
+__revision__ = "$Id$"
+
+import os
+from distutils.errors import DistutilsFileError
+
+
+# cache for by mkpath() -- in addition to cheapening redundant calls,
+# eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
+PATH_CREATED = {}
+
+# I don't use os.makedirs because a) it's new to Python 1.5.2, and
+# b) it blows up if the directory already exists (I want to silently
+# succeed in that case).
+def mkpath (name, mode=0777, verbose=0, dry_run=0):
+    """Create a directory and any missing ancestor directories.  If the
+       directory already exists (or if 'name' is the empty string, which
+       means the current directory, which of course exists), then do
+       nothing.  Raise DistutilsFileError if unable to create some
+       directory along the way (eg. some sub-path exists, but is a file
+       rather than a directory).  If 'verbose' is true, print a one-line
+       summary of each mkdir to stdout.  Return the list of directories
+       actually created."""
+
+    global PATH_CREATED
+
+    # XXX what's the better way to handle verbosity? print as we create
+    # each directory in the path (the current behaviour), or only announce
+    # the creation of the whole path? (quite easy to do the latter since
+    # we're not using a recursive algorithm)
+
+    name = os.path.normpath (name)
+    created_dirs = []
+    if os.path.isdir (name) or name == '':
+        return created_dirs
+    if PATH_CREATED.get (name):
+        return created_dirs
+
+    (head, tail) = os.path.split (name)
+    tails = [tail]                      # stack of lone dirs to create
+    
+    while head and tail and not os.path.isdir (head):
+        #print "splitting '%s': " % head,
+        (head, tail) = os.path.split (head)
+        #print "to ('%s','%s')" % (head, tail)
+        tails.insert (0, tail)          # push next higher dir onto stack
+
+    #print "stack of tails:", tails
+
+    # now 'head' contains the deepest directory that already exists
+    # (that is, the child of 'head' in 'name' is the highest directory
+    # that does *not* exist)
+    for d in tails:
+        #print "head = %s, d = %s: " % (head, d),
+        head = os.path.join (head, d)
+        if PATH_CREATED.get (head):
+            continue
+
+        if verbose:
+            print "creating", head
+
+        if not dry_run:
+            try:
+                os.mkdir (head)
+                created_dirs.append(head)
+            except OSError, exc:
+                raise DistutilsFileError, \
+                      "could not create '%s': %s" % (head, exc[-1])
+
+        PATH_CREATED[head] = 1
+    return created_dirs
+
+# mkpath ()
+
+
+def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
+
+    """Create all the empty directories under 'base_dir' needed to
+       put 'files' there.  'base_dir' is just the a name of a directory
+       which doesn't necessarily exist yet; 'files' is a list of filenames
+       to be interpreted relative to 'base_dir'.  'base_dir' + the
+       directory portion of every file in 'files' will be created if it
+       doesn't already exist.  'mode', 'verbose' and 'dry_run' flags are as
+       for 'mkpath()'."""
+
+    # First get the list of directories to create
+    need_dir = {}
+    for file in files:
+        need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
+    need_dirs = need_dir.keys()
+    need_dirs.sort()
+
+    # Now create them
+    for dir in need_dirs:
+        mkpath (dir, mode, verbose, dry_run)
+
+# create_tree ()
+
+
+def copy_tree (src, dst,
+               preserve_mode=1,
+               preserve_times=1,
+               preserve_symlinks=0,
+               update=0,
+               verbose=0,
+               dry_run=0):
+
+    """Copy an entire directory tree 'src' to a new location 'dst'.  Both
+       'src' and 'dst' must be directory names.  If 'src' is not a
+       directory, raise DistutilsFileError.  If 'dst' does not exist, it is
+       created with 'mkpath()'.  The end result of the copy is that every
+       file in 'src' is copied to 'dst', and directories under 'src' are
+       recursively copied to 'dst'.  Return the list of files that were
+       copied or might have been copied, using their output name.  The
+       return value is unaffected by 'update' or 'dry_run': it is simply
+       the list of all files under 'src', with the names changed to be
+       under 'dst'.
+
+       'preserve_mode' and 'preserve_times' are the same as for
+       'copy_file'; note that they only apply to regular files, not to
+       directories.  If 'preserve_symlinks' is true, symlinks will be
+       copied as symlinks (on platforms that support them!); otherwise
+       (the default), the destination of the symlink will be copied.
+       'update' and 'verbose' are the same as for 'copy_file'."""
+
+    from distutils.file_util import copy_file
+
+    if not dry_run and not os.path.isdir (src):
+        raise DistutilsFileError, \
+              "cannot copy tree '%s': not a directory" % src    
+    try:
+        names = os.listdir (src)
+    except os.error, (errno, errstr):
+        if dry_run:
+            names = []
+        else:
+            raise DistutilsFileError, \
+                  "error listing files in '%s': %s" % (src, errstr)
+
+    if not dry_run:
+        mkpath (dst, verbose=verbose)
+
+    outputs = []
+
+    for n in names:
+        src_name = os.path.join (src, n)
+        dst_name = os.path.join (dst, n)
+
+        if preserve_symlinks and os.path.islink (src_name):
+            link_dest = os.readlink (src_name)
+            if verbose:
+                print "linking %s -> %s" % (dst_name, link_dest)
+            if not dry_run:
+                os.symlink (link_dest, dst_name)
+            outputs.append (dst_name)
+            
+        elif os.path.isdir (src_name):
+            outputs.extend (
+                copy_tree (src_name, dst_name,
+                           preserve_mode, preserve_times, preserve_symlinks,
+                           update, verbose, dry_run))
+        else:
+            copy_file (src_name, dst_name,
+                       preserve_mode, preserve_times,
+                       update, None, verbose, dry_run)
+            outputs.append (dst_name)
+
+    return outputs
+
+# copy_tree ()
+
+
+def remove_tree (directory, verbose=0, dry_run=0):
+    """Recursively remove an entire directory tree.  Any errors are ignored
+       (apart from being reported to stdout if 'verbose' is true)."""
+
+    from shutil import rmtree
+
+    if verbose:
+        print "removing '%s' (and everything under it)" % directory
+    if dry_run:
+        return
+    try:
+        rmtree(directory,1)
+    except (IOError, OSError), exc:
+        if verbose:
+            if exc.filename:
+                print "error removing %s: %s (%s)" % \
+                       (directory, exc.strerror, exc.filename)
+            else:
+                print "error removing %s: %s" % (directory, exc.strerror)
diff --git a/file_util.py b/file_util.py
new file mode 100644
index 0000000000..91545abb18
--- /dev/null
+++ b/file_util.py
@@ -0,0 +1,248 @@
+"""distutils.file_util
+
+Utility functions for operating on single files."""
+
+# created 2000/04/03, Greg Ward (extracted from util.py)
+
+__revision__ = "$Id$"
+
+import os
+from distutils.errors import DistutilsFileError
+
+
+# for generating verbose output in 'copy_file()'
+_copy_action = { None:   'copying',
+                 'hard': 'hard linking',
+                 'sym':  'symbolically linking' }
+
+
+def _copy_file_contents (src, dst, buffer_size=16*1024):
+    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
+       opening either file, reading from 'src', or writing to 'dst',
+       raises DistutilsFileError.  Data is read/written in chunks of
+       'buffer_size' bytes (default 16k).  No attempt is made to handle
+       anything apart from regular files."""
+
+    # Stolen from shutil module in the standard library, but with
+    # custom error-handling added.
+
+    fsrc = None
+    fdst = None
+    try:
+        try:
+            fsrc = open(src, 'rb')
+        except os.error, (errno, errstr):
+            raise DistutilsFileError, \
+                  "could not open '%s': %s" % (src, errstr)
+        
+        try:
+            fdst = open(dst, 'wb')
+        except os.error, (errno, errstr):
+            raise DistutilsFileError, \
+                  "could not create '%s': %s" % (dst, errstr)
+        
+        while 1:
+            try:
+                buf = fsrc.read (buffer_size)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, \
+                      "could not read from '%s': %s" % (src, errstr)
+            
+            if not buf:
+                break
+
+            try:
+                fdst.write(buf)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, \
+                      "could not write to '%s': %s" % (dst, errstr)
+            
+    finally:
+        if fdst:
+            fdst.close()
+        if fsrc:
+            fsrc.close()
+
+# _copy_file_contents()
+
+
+def copy_file (src, dst,
+               preserve_mode=1,
+               preserve_times=1,
+               update=0,
+               link=None,
+               verbose=0,
+               dry_run=0):
+
+    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src'
+       is copied there with the same name; otherwise, it must be a
+       filename.  (If the file exists, it will be ruthlessly clobbered.)
+       If 'preserve_mode' is true (the default), the file's mode (type
+       and permission bits, or whatever is analogous on the current
+       platform) is copied.  If 'preserve_times' is true (the default),
+       the last-modified and last-access times are copied as well.  If
+       'update' is true, 'src' will only be copied if 'dst' does not
+       exist, or if 'dst' does exist but is older than 'src'.  If
+       'verbose' is true, then a one-line summary of the copy will be
+       printed to stdout.
+
+       'link' allows you to make hard links (os.link) or symbolic links
+       (os.symlink) instead of copying: set it to "hard" or "sym"; if it
+       is None (the default), files are copied.  Don't set 'link' on
+       systems that don't support it: 'copy_file()' doesn't check if
+       hard or symbolic linking is availalble.
+
+       Under Mac OS, uses the native file copy function in macostools;
+       on other systems, uses '_copy_file_contents()' to copy file
+       contents.
+
+       Return true if the file was copied (or would have been copied),
+       false otherwise (ie. 'update' was true and the destination is
+       up-to-date)."""
+
+    # XXX if the destination file already exists, we clobber it if
+    # copying, but blow up if linking.  Hmmm.  And I don't know what
+    # macostools.copyfile() does.  Should definitely be consistent, and
+    # should probably blow up if destination exists and we would be
+    # changing it (ie. it's not already a hard/soft link to src OR
+    # (not update) and (src newer than dst).
+
+    from stat import *
+    from distutils.dep_util import newer
+
+    if not os.path.isfile (src):
+        raise DistutilsFileError, \
+              "can't copy '%s': doesn't exist or not a regular file" % src
+
+    if os.path.isdir (dst):
+        dir = dst
+        dst = os.path.join (dst, os.path.basename (src))
+    else:
+        dir = os.path.dirname (dst)
+
+    if update and not newer (src, dst):
+        if verbose:
+            print "not copying %s (output up-to-date)" % src
+        return 0
+
+    try:
+        action = _copy_action[link]
+    except KeyError:
+        raise ValueError, \
+              "invalid value '%s' for 'link' argument" % link
+    if verbose:
+        print "%s %s -> %s" % (action, src, dir)
+
+    if dry_run:
+        return 1
+
+    # On a Mac, use the native file copy routine
+    if os.name == 'mac':
+        import macostools
+        try:
+            macostools.copy (src, dst, 0, preserve_times)
+        except OSError, exc:
+            raise DistutilsFileError, \
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
+    
+    # If linking (hard or symbolic), use the appropriate system call
+    # (Unix only, of course, but that's the caller's responsibility)
+    elif link == 'hard':
+        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
+            os.link (src, dst)
+    elif link == 'sym':
+        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
+            os.symlink (src, dst)
+
+    # Otherwise (non-Mac, not linking), copy the file contents and
+    # (optionally) copy the times and mode.
+    else:
+        _copy_file_contents (src, dst)
+        if preserve_mode or preserve_times:
+            st = os.stat (src)
+
+            # According to David Ascher <da@ski.org>, utime() should be done
+            # before chmod() (at least under NT).
+            if preserve_times:
+                os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
+            if preserve_mode:
+                os.chmod (dst, S_IMODE (st[ST_MODE]))
+
+    return 1
+
+# copy_file ()
+
+
+# XXX I suspect this is Unix-specific -- need porting help!
+def move_file (src, dst,
+               verbose=0,
+               dry_run=0):
+
+    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file
+       will be moved into it with the same name; otherwise, 'src' is
+       just renamed to 'dst'.  Return the new full name of the file.
+
+       Handles cross-device moves on Unix using
+       'copy_file()'.  What about other systems???"""
+
+    from os.path import exists, isfile, isdir, basename, dirname
+
+    if verbose:
+        print "moving %s -> %s" % (src, dst)
+
+    if dry_run:
+        return dst
+
+    if not isfile (src):
+        raise DistutilsFileError, \
+              "can't move '%s': not a regular file" % src
+
+    if isdir (dst):
+        dst = os.path.join (dst, basename (src))
+    elif exists (dst):
+        raise DistutilsFileError, \
+              "can't move '%s': destination '%s' already exists" % \
+              (src, dst)
+
+    if not isdir (dirname (dst)):
+        raise DistutilsFileError, \
+              "can't move '%s': destination '%s' not a valid path" % \
+              (src, dst)
+
+    copy_it = 0
+    try:
+        os.rename (src, dst)
+    except os.error, (num, msg):
+        if num == errno.EXDEV:
+            copy_it = 1
+        else:
+            raise DistutilsFileError, \
+                  "couldn't move '%s' to '%s': %s" % (src, dst, msg)
+
+    if copy_it:
+        copy_file (src, dst)
+        try:
+            os.unlink (src)
+        except os.error, (num, msg):
+            try:
+                os.unlink (dst)
+            except os.error:
+                pass
+            raise DistutilsFileError, \
+                  ("couldn't move '%s' to '%s' by copy/delete: " + 
+                   "delete '%s' failed: %s") % \
+                  (src, dst, src, msg)
+
+    return dst
+
+# move_file ()
+
+
+def write_file (filename, contents):
+    """Create a file with the specified name and write 'contents' (a
+       sequence of strings without line terminators) to it."""
+
+    f = open (filename, "w")
+    for line in contents:
+        f.write (line + "\n")
+    f.close ()
diff --git a/util.py b/util.py
index 22fc437547..ddcf0d2862 100644
--- a/util.py
+++ b/util.py
@@ -1,11 +1,7 @@
 """distutils.util
 
-General-purpose utility functions used throughout the Distutils
-(especially in command classes).  Mostly filesystem manipulation, but
-not limited to that.  The functions in this module generally raise
-DistutilsFileError when they have problems with the filesystem, because
-os.error in pre-1.5.2 Python only gives the error message and not the
-file causing it."""
+Miscellaneous utility functions -- anything that doesn't fit into
+one of the other *util.py modules."""
 
 # created 1999/03/08, Greg Ward
 
@@ -15,526 +11,11 @@
 from distutils.errors import *
 from distutils.spawn import spawn
 
-# cache for by mkpath() -- in addition to cheapening redundant calls,
-# eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
-PATH_CREATED = {}
-
-# for generating verbose output in 'copy_file()'
-_copy_action = { None:   'copying',
-                 'hard': 'hard linking',
-                 'sym':  'symbolically linking' }
-
-# I don't use os.makedirs because a) it's new to Python 1.5.2, and
-# b) it blows up if the directory already exists (I want to silently
-# succeed in that case).
-def mkpath (name, mode=0777, verbose=0, dry_run=0):
-    """Create a directory and any missing ancestor directories.  If the
-       directory already exists (or if 'name' is the empty string, which
-       means the current directory, which of course exists), then do
-       nothing.  Raise DistutilsFileError if unable to create some
-       directory along the way (eg. some sub-path exists, but is a file
-       rather than a directory).  If 'verbose' is true, print a one-line
-       summary of each mkdir to stdout.  Return the list of directories
-       actually created."""
-
-    global PATH_CREATED
-
-    # XXX what's the better way to handle verbosity? print as we create
-    # each directory in the path (the current behaviour), or only announce
-    # the creation of the whole path? (quite easy to do the latter since
-    # we're not using a recursive algorithm)
-
-    name = os.path.normpath (name)
-    created_dirs = []
-    if os.path.isdir (name) or name == '':
-        return created_dirs
-    if PATH_CREATED.get (name):
-        return created_dirs
-
-    (head, tail) = os.path.split (name)
-    tails = [tail]                      # stack of lone dirs to create
-    
-    while head and tail and not os.path.isdir (head):
-        #print "splitting '%s': " % head,
-        (head, tail) = os.path.split (head)
-        #print "to ('%s','%s')" % (head, tail)
-        tails.insert (0, tail)          # push next higher dir onto stack
-
-    #print "stack of tails:", tails
-
-    # now 'head' contains the deepest directory that already exists
-    # (that is, the child of 'head' in 'name' is the highest directory
-    # that does *not* exist)
-    for d in tails:
-        #print "head = %s, d = %s: " % (head, d),
-        head = os.path.join (head, d)
-        if PATH_CREATED.get (head):
-            continue
-
-        if verbose:
-            print "creating", head
-
-        if not dry_run:
-            try:
-                os.mkdir (head)
-                created_dirs.append(head)
-            except OSError, exc:
-                raise DistutilsFileError, \
-                      "could not create '%s': %s" % (head, exc[-1])
-
-        PATH_CREATED[head] = 1
-    return created_dirs
-
-# mkpath ()
-
-
-def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
-
-    """Create all the empty directories under 'base_dir' needed to
-       put 'files' there.  'base_dir' is just the a name of a directory
-       which doesn't necessarily exist yet; 'files' is a list of filenames
-       to be interpreted relative to 'base_dir'.  'base_dir' + the
-       directory portion of every file in 'files' will be created if it
-       doesn't already exist.  'mode', 'verbose' and 'dry_run' flags are as
-       for 'mkpath()'."""
-
-    # First get the list of directories to create
-    need_dir = {}
-    for file in files:
-        need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
-    need_dirs = need_dir.keys()
-    need_dirs.sort()
-
-    # Now create them
-    for dir in need_dirs:
-        mkpath (dir, mode, verbose, dry_run)
-
-# create_tree ()
-
-
-def newer (source, target):
-    """Return true if 'source' exists and is more recently modified than
-       'target', or if 'source' exists and 'target' doesn't.  Return
-       false if both exist and 'target' is the same age or younger than
-       'source'.  Raise DistutilsFileError if 'source' does not
-       exist."""
-
-    if not os.path.exists (source):
-        raise DistutilsFileError, "file '%s' does not exist" % source
-    if not os.path.exists (target):
-        return 1
-
-    from stat import ST_MTIME
-    mtime1 = os.stat(source)[ST_MTIME]
-    mtime2 = os.stat(target)[ST_MTIME]
-
-    return mtime1 > mtime2
-
-# newer ()
-
-
-def newer_pairwise (sources, targets):
-    """Walk two filename lists in parallel, testing if each source is newer
-       than its corresponding target.  Return a pair of lists (sources,
-       targets) where source is newer than target, according to the
-       semantics of 'newer()'."""
-
-    if len (sources) != len (targets):
-        raise ValueError, "'sources' and 'targets' must be same length"
-
-    # build a pair of lists (sources, targets) where  source is newer
-    n_sources = []
-    n_targets = []
-    for i in range (len (sources)):
-        if newer (sources[i], targets[i]):
-            n_sources.append (sources[i])
-            n_targets.append (targets[i])
-
-    return (n_sources, n_targets)
-
-# newer_pairwise ()
-
-
-def newer_group (sources, target, missing='error'):
-    """Return true if 'target' is out-of-date with respect to any
-       file listed in 'sources'.  In other words, if 'target' exists and
-       is newer than every file in 'sources', return false; otherwise
-       return true.  'missing' controls what we do when a source file is
-       missing; the default ("error") is to blow up with an OSError from
-       inside 'stat()'; if it is "ignore", we silently drop any missing
-       source files; if it is "newer", any missing source files make us
-       assume that 'target' is out-of-date (this is handy in "dry-run"
-       mode: it'll make you pretend to carry out commands that wouldn't
-       work because inputs are missing, but that doesn't matter because
-       you're not actually going to run the commands)."""
-
-    # If the target doesn't even exist, then it's definitely out-of-date.
-    if not os.path.exists (target):
-        return 1
-   
-    # Otherwise we have to find out the hard way: if *any* source file
-    # is more recent than 'target', then 'target' is out-of-date and
-    # we can immediately return true.  If we fall through to the end
-    # of the loop, then 'target' is up-to-date and we return false.
-    from stat import ST_MTIME
-    target_mtime = os.stat (target)[ST_MTIME]
-    for source in sources:
-        if not os.path.exists (source):
-            if missing == 'error':      # blow up when we stat() the file
-                pass                    
-            elif missing == 'ignore':   # missing source dropped from 
-                continue                #  target's dependency list
-            elif missing == 'newer':    # missing source means target is
-                return 1                #  out-of-date
-            
-        source_mtime = os.stat(source)[ST_MTIME]
-        if source_mtime > target_mtime:
-            return 1
-    else:
-        return 0
-
-# newer_group ()
-
-
-# XXX this isn't used anywhere, and worse, it has the same name as a method
-# in Command with subtly different semantics.  (This one just has one
-# source -> one dest; that one has many sources -> one dest.)  Nuke it?
-def make_file (src, dst, func, args,
-               verbose=0, update_message=None, noupdate_message=None):
-    """Makes 'dst' from 'src' (both filenames) by calling 'func' with
-       'args', but only if it needs to: i.e. if 'dst' does not exist or
-       'src' is newer than 'dst'."""
-
-    if newer (src, dst):
-        if verbose and update_message:
-            print update_message
-        apply (func, args)
-    else:
-        if verbose and noupdate_message:
-            print noupdate_message
-
-# make_file ()
-
-
-def _copy_file_contents (src, dst, buffer_size=16*1024):
-    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
-       opening either file, reading from 'src', or writing to 'dst',
-       raises DistutilsFileError.  Data is read/written in chunks of
-       'buffer_size' bytes (default 16k).  No attempt is made to handle
-       anything apart from regular files."""
-
-    # Stolen from shutil module in the standard library, but with
-    # custom error-handling added.
-
-    fsrc = None
-    fdst = None
-    try:
-        try:
-            fsrc = open(src, 'rb')
-        except os.error, (errno, errstr):
-            raise DistutilsFileError, \
-                  "could not open '%s': %s" % (src, errstr)
-        
-        try:
-            fdst = open(dst, 'wb')
-        except os.error, (errno, errstr):
-            raise DistutilsFileError, \
-                  "could not create '%s': %s" % (dst, errstr)
-        
-        while 1:
-            try:
-                buf = fsrc.read (buffer_size)
-            except os.error, (errno, errstr):
-                raise DistutilsFileError, \
-                      "could not read from '%s': %s" % (src, errstr)
-            
-            if not buf:
-                break
-
-            try:
-                fdst.write(buf)
-            except os.error, (errno, errstr):
-                raise DistutilsFileError, \
-                      "could not write to '%s': %s" % (dst, errstr)
-            
-    finally:
-        if fdst:
-            fdst.close()
-        if fsrc:
-            fsrc.close()
-
-# _copy_file_contents()
-
-
-def copy_file (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               update=0,
-               link=None,
-               verbose=0,
-               dry_run=0):
-
-    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src'
-       is copied there with the same name; otherwise, it must be a
-       filename.  (If the file exists, it will be ruthlessly clobbered.)
-       If 'preserve_mode' is true (the default), the file's mode (type
-       and permission bits, or whatever is analogous on the current
-       platform) is copied.  If 'preserve_times' is true (the default),
-       the last-modified and last-access times are copied as well.  If
-       'update' is true, 'src' will only be copied if 'dst' does not
-       exist, or if 'dst' does exist but is older than 'src'.  If
-       'verbose' is true, then a one-line summary of the copy will be
-       printed to stdout.
-
-       'link' allows you to make hard links (os.link) or symbolic links
-       (os.symlink) instead of copying: set it to "hard" or "sym"; if it
-       is None (the default), files are copied.  Don't set 'link' on
-       systems that don't support it: 'copy_file()' doesn't check if
-       hard or symbolic linking is availalble.
-
-       Under Mac OS, uses the native file copy function in macostools;
-       on other systems, uses '_copy_file_contents()' to copy file
-       contents.
-
-       Return true if the file was copied (or would have been copied),
-       false otherwise (ie. 'update' was true and the destination is
-       up-to-date)."""
-
-    # XXX if the destination file already exists, we clobber it if
-    # copying, but blow up if linking.  Hmmm.  And I don't know what
-    # macostools.copyfile() does.  Should definitely be consistent, and
-    # should probably blow up if destination exists and we would be
-    # changing it (ie. it's not already a hard/soft link to src OR
-    # (not update) and (src newer than dst).
-
-    from stat import *
-
-    if not os.path.isfile (src):
-        raise DistutilsFileError, \
-              "can't copy '%s': doesn't exist or not a regular file" % src
-
-    if os.path.isdir (dst):
-        dir = dst
-        dst = os.path.join (dst, os.path.basename (src))
-    else:
-        dir = os.path.dirname (dst)
-
-    if update and not newer (src, dst):
-        if verbose:
-            print "not copying %s (output up-to-date)" % src
-        return 0
-
-    try:
-        action = _copy_action[link]
-    except KeyError:
-        raise ValueError, \
-              "invalid value '%s' for 'link' argument" % link
-    if verbose:
-        print "%s %s -> %s" % (action, src, dir)
-
-    if dry_run:
-        return 1
-
-    # On a Mac, use the native file copy routine
-    if os.name == 'mac':
-        import macostools
-        try:
-            macostools.copy (src, dst, 0, preserve_times)
-        except OSError, exc:
-            raise DistutilsFileError, \
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
-    
-    # If linking (hard or symbolic), use the appropriate system call
-    # (Unix only, of course, but that's the caller's responsibility)
-    elif link == 'hard':
-        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
-            os.link (src, dst)
-    elif link == 'sym':
-        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
-            os.symlink (src, dst)
-
-    # Otherwise (non-Mac, not linking), copy the file contents and
-    # (optionally) copy the times and mode.
-    else:
-        _copy_file_contents (src, dst)
-        if preserve_mode or preserve_times:
-            st = os.stat (src)
-
-            # According to David Ascher <da@ski.org>, utime() should be done
-            # before chmod() (at least under NT).
-            if preserve_times:
-                os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
-            if preserve_mode:
-                os.chmod (dst, S_IMODE (st[ST_MODE]))
-
-    return 1
-
-# copy_file ()
-
-
-def copy_tree (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               preserve_symlinks=0,
-               update=0,
-               verbose=0,
-               dry_run=0):
-
-    """Copy an entire directory tree 'src' to a new location 'dst'.  Both
-       'src' and 'dst' must be directory names.  If 'src' is not a
-       directory, raise DistutilsFileError.  If 'dst' does not exist, it is
-       created with 'mkpath()'.  The end result of the copy is that every
-       file in 'src' is copied to 'dst', and directories under 'src' are
-       recursively copied to 'dst'.  Return the list of files that were
-       copied or might have been copied, using their output name.  The
-       return value is unaffected by 'update' or 'dry_run': it is simply
-       the list of all files under 'src', with the names changed to be
-       under 'dst'.
-
-       'preserve_mode' and 'preserve_times' are the same as for
-       'copy_file'; note that they only apply to regular files, not to
-       directories.  If 'preserve_symlinks' is true, symlinks will be
-       copied as symlinks (on platforms that support them!); otherwise
-       (the default), the destination of the symlink will be copied.
-       'update' and 'verbose' are the same as for 'copy_file'."""
-
-    if not dry_run and not os.path.isdir (src):
-        raise DistutilsFileError, \
-              "cannot copy tree '%s': not a directory" % src    
-    try:
-        names = os.listdir (src)
-    except os.error, (errno, errstr):
-        if dry_run:
-            names = []
-        else:
-            raise DistutilsFileError, \
-                  "error listing files in '%s': %s" % (src, errstr)
-
-    if not dry_run:
-        mkpath (dst, verbose=verbose)
-
-    outputs = []
-
-    for n in names:
-        src_name = os.path.join (src, n)
-        dst_name = os.path.join (dst, n)
-
-        if preserve_symlinks and os.path.islink (src_name):
-            link_dest = os.readlink (src_name)
-            if verbose:
-                print "linking %s -> %s" % (dst_name, link_dest)
-            if not dry_run:
-                os.symlink (link_dest, dst_name)
-            outputs.append (dst_name)
-            
-        elif os.path.isdir (src_name):
-            outputs.extend (
-                copy_tree (src_name, dst_name,
-                           preserve_mode, preserve_times, preserve_symlinks,
-                           update, verbose, dry_run))
-        else:
-            copy_file (src_name, dst_name,
-                       preserve_mode, preserve_times,
-                       update, None, verbose, dry_run)
-            outputs.append (dst_name)
-
-    return outputs
-
-# copy_tree ()
-
-
-def remove_tree (directory, verbose=0, dry_run=0):
-    """Recursively remove an entire directory tree.  Any errors are ignored
-       (apart from being reported to stdout if 'verbose' is true)."""
-
-    if verbose:
-        print "removing '%s' (and everything under it)" % directory
-    if dry_run:
-        return
-    try:
-        shutil.rmtree(directory,1)
-    except (IOError, OSError), exc:
-        if verbose:
-            if exc.filename:
-                print "error removing %s: %s (%s)" % \
-                       (directory, exc.strerror, exc.filename)
-            else:
-                print "error removing %s: %s" % (directory, exc.strerror)
-
-
-# XXX I suspect this is Unix-specific -- need porting help!
-def move_file (src, dst,
-               verbose=0,
-               dry_run=0):
-
-    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file
-       will be moved into it with the same name; otherwise, 'src' is
-       just renamed to 'dst'.  Return the new full name of the file.
-
-       Handles cross-device moves on Unix using
-       'copy_file()'.  What about other systems???"""
-
-    from os.path import exists, isfile, isdir, basename, dirname
-
-    if verbose:
-        print "moving %s -> %s" % (src, dst)
-
-    if dry_run:
-        return dst
-
-    if not isfile (src):
-        raise DistutilsFileError, \
-              "can't move '%s': not a regular file" % src
-
-    if isdir (dst):
-        dst = os.path.join (dst, basename (src))
-    elif exists (dst):
-        raise DistutilsFileError, \
-              "can't move '%s': destination '%s' already exists" % \
-              (src, dst)
-
-    if not isdir (dirname (dst)):
-        raise DistutilsFileError, \
-              "can't move '%s': destination '%s' not a valid path" % \
-              (src, dst)
-
-    copy_it = 0
-    try:
-        os.rename (src, dst)
-    except os.error, (num, msg):
-        if num == errno.EXDEV:
-            copy_it = 1
-        else:
-            raise DistutilsFileError, \
-                  "couldn't move '%s' to '%s': %s" % (src, dst, msg)
-
-    if copy_it:
-        copy_file (src, dst)
-        try:
-            os.unlink (src)
-        except os.error, (num, msg):
-            try:
-                os.unlink (dst)
-            except os.error:
-                pass
-            raise DistutilsFileError, \
-                  ("couldn't move '%s' to '%s' by copy/delete: " + 
-                   "delete '%s' failed: %s") % \
-                  (src, dst, src, msg)
-
-    return dst
-
-# move_file ()
-
-
-def write_file (filename, contents):
-    """Create a file with the specified name and write 'contents' (a
-       sequence of strings without line terminators) to it."""
-
-    f = open (filename, "w")
-    for line in contents:
-        f.write (line + "\n")
-    f.close ()
+# for backwards compatibility:
+from distutils.file_util import *
+from distutils.dir_util import *
+from distutils.dep_util import *
+from distutils.archive_util import *
 
 
 def get_platform ():
@@ -620,141 +101,3 @@ def _subst (match, local_vars=local_vars):
 # subst_vars ()
 
 
-def make_tarball (base_name, base_dir, compress="gzip",
-                  verbose=0, dry_run=0):
-    """Create a (possibly compressed) tar file from all the files under
-       'base_dir'.  'compress' must be "gzip" (the default), "compress", or
-       None.  Both "tar" and the compression utility named by 'compress'
-       must be on the default program search path, so this is probably
-       Unix-specific.  The output tar file will be named 'base_dir' +
-       ".tar", possibly plus the appropriate compression extension
-       (".gz" or ".Z").  Return the output filename."""
-
-    # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-    # It's pretty new, though, so we certainly can't require it --
-    # but it would be nice to take advantage of it to skip the
-    # "create a tree of hardlinks" step!  (Would also be nice to
-    # detect GNU tar to use its 'z' option and save a step.)
-
-    compress_ext = { 'gzip': ".gz",
-                     'compress': ".Z" }
-
-    if compress is not None and compress not in ('gzip', 'compress'):
-        raise ValueError, \
-              "bad value for 'compress': must be None, 'gzip', or 'compress'"
-
-    archive_name = base_name + ".tar"
-    cmd = ["tar", "-cf", archive_name, base_dir]
-    spawn (cmd, verbose=verbose, dry_run=dry_run)
-
-    if compress:
-        spawn ([compress, archive_name], verbose=verbose, dry_run=dry_run)
-        return archive_name + compress_ext[compress]
-    else:
-        return archive_name
-
-# make_tarball ()
-
-
-def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
-    """Create a zip file from all the files under 'base_dir'.  The
-       output zip file will be named 'base_dir' + ".zip".  Uses either the
-       InfoZIP "zip" utility (if installed and found on the default search
-       path) or the "zipfile" Python module (if available).  If neither
-       tool is available, raises DistutilsExecError.  Returns the name
-       of the output zip file."""
-
-    # This initially assumed the Unix 'zip' utility -- but
-    # apparently InfoZIP's zip.exe works the same under Windows, so
-    # no changes needed!
-
-    zip_filename = base_name + ".zip"
-    try:
-        spawn (["zip", "-rq", zip_filename, base_dir],
-               verbose=verbose, dry_run=dry_run)
-    except DistutilsExecError:
-
-        # XXX really should distinguish between "couldn't find
-        # external 'zip' command" and "zip failed" -- shouldn't try
-        # again in the latter case.  (I think fixing this will
-        # require some cooperation from the spawn module -- perhaps
-        # a utility function to search the path, so we can fallback
-        # on zipfile.py without the failed spawn.)
-        try:
-            import zipfile
-        except ImportError:
-            raise DistutilsExecError, \
-                  ("unable to create zip file '%s': " + 
-                   "could neither find a standalone zip utility nor " +
-                   "import the 'zipfile' module") % zip_filename
-
-        if verbose:
-            print "creating '%s' and adding '%s' to it" % \
-                  (zip_filename, base_dir)
-
-        def visit (z, dirname, names):
-            for name in names:
-                path = os.path.join (dirname, name)
-                if os.path.isfile (path):
-                    z.write (path, path)
-
-        if not dry_run:
-            z = zipfile.ZipFile (zip_filename, "wb",
-                                 compression=zipfile.ZIP_DEFLATED)
-
-            os.path.walk (base_dir, visit, z)
-            z.close()
-
-    return zip_filename
-
-# make_zipfile ()
-
-
-def make_archive (base_name, format,
-                  root_dir=None, base_dir=None,
-                  verbose=0, dry_run=0):
-
-    """Create an archive file (eg. zip or tar).  'base_name' is the name
-    of the file to create, minus any format-specific extension; 'format'
-    is the archive format: one of "zip", "tar", "ztar", or "gztar".
-    'root_dir' is a directory that will be the root directory of the
-    archive; ie. we typically chdir into 'root_dir' before creating the
-    archive.  'base_dir' is the directory where we start archiving from;
-    ie. 'base_dir' will be the common prefix of all files and
-    directories in the archive.  'root_dir' and 'base_dir' both default
-    to the current directory."""
-
-    save_cwd = os.getcwd()
-    if root_dir is not None:
-        if verbose:
-            print "changing into '%s'" % root_dir
-        base_name = os.path.abspath (base_name)
-        if not dry_run:
-            os.chdir (root_dir)
-
-    if base_dir is None:
-        base_dir = os.curdir
-
-    kwargs = { 'verbose': verbose,
-               'dry_run': dry_run }
-    
-    if format == 'gztar':
-        func = make_tarball
-        kwargs['compress'] = 'gzip'
-    elif format == 'ztar':
-        func = make_tarball
-        kwargs['compress'] = 'compress'
-    elif format == 'tar':
-        func = make_tarball
-        kwargs['compress'] = None
-    elif format == 'zip':
-        func = make_zipfile
-
-    apply (func, (base_name, base_dir), kwargs)
-
-    if root_dir is not None:
-        if verbose:
-            print "changing back to '%s'" % save_cwd
-        os.chdir (save_cwd)
-
-# make_archive ()

From 668f7321264af838cecd5c2b2fb57a01ece71857 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 6 Apr 2000 02:07:41 +0000
Subject: [PATCH 0258/8469] Add missing import of 'usage' string.

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

diff --git a/dist.py b/dist.py
index 50e755697b..7246b74001 100644
--- a/dist.py
+++ b/dist.py
@@ -183,9 +183,9 @@ def parse_command_line (self, args):
            commands (currently, this only happens if user asks for
            help)."""
 
-        # late import because of mutual dependence between these classes
+        # late import because of mutual dependence between these modules
         from distutils.cmd import Command
-
+        from distutils.core import usage
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --

From 1941b15adc3750d84b149fb84af75e36a633ad61 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Apr 2000 02:31:45 +0000
Subject: [PATCH 0259/8469] This little note is to clarify things for people
 who go poking around the Python library hoping to find out more about the
 Distutils.

---
 README | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000000..f1db3c6c40
--- /dev/null
+++ b/README
@@ -0,0 +1,18 @@
+This directory contains only a subset of the Distutils, specifically the
+Python modules in the 'distutils' and 'distutils.command' packages.
+Technically, this is all you need to distribute and install Python modules
+using the Distutils.  Most people will want some documentation and other
+help, though.  Currently, everything can be found at the Distutils web page:
+
+    http://www.python.org/sigs/distutils-sig/
+
+From there you can access the latest documentation, or download a standalone
+Distutils release that includes all the code in this directory, plus
+documentation, test scripts, examples, etc.
+
+The Distutils documentation isn't yet part of the standard Python
+documentation set, but will be soon.
+
+        Greg Ward (gward@python.net)
+
+$Id$

From 79cc38ef59bfe78ac6a3eae934cebb9ef10798ba Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Apr 2000 03:48:37 +0000
Subject: [PATCH 0260/8469] Added (currently) pointless and trivial main body
 (for future tests).

---
 cmd.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmd.py b/cmd.py
index ad78703713..b2fb517e73 100644
--- a/cmd.py
+++ b/cmd.py
@@ -388,3 +388,7 @@ def make_file (self, infiles, outfile, func, args,
     # make_file ()
 
 # class Command
+
+
+if __name__ == "__main__":
+    print "ok"

From 1633033ac04ecddfdb450f8e60efa54c7eb894d5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Apr 2000 03:49:20 +0000
Subject: [PATCH 0261/8469] Catch DistutilsFileError in addition to
 DistutilsExecError in 'setup()'.

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 3df54a5e83..9a801063c7 100644
--- a/core.py
+++ b/core.py
@@ -96,7 +96,7 @@ def setup (**attrs):
                       "error: %s: %s" % (exc.filename, exc.strerror)
             else:
                 raise SystemExit, str (exc)
-        except DistutilsExecError, msg:
+        except (DistutilsExecError, DistutilsFileError), msg:
             raise SystemExit, "error: " + str (msg)
 
 # setup ()

From 4973bedd82d22fe0b181d0a045565eac3e93a37f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 9 Apr 2000 03:51:40 +0000
Subject: [PATCH 0262/8469] Ditched the unused 'list_only' option. Added code
 to include source files from 'build_clib' command to default file   list --
 currently this won't work, since 'build_clib' doesn't have a  
 'get_source_files()' method!

---
 command/sdist.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 7dbd40138a..349a824afd 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -36,8 +36,6 @@ class sdist (Command):
 
         ('formats=', None,
          "formats for source distribution (tar, ztar, gztar, or zip)"),
-        ('list-only', 'l',
-         "just list files that would be distributed"),
         ('keep-tree', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),
@@ -64,7 +62,6 @@ def initialize_options (self):
         self.force_manifest = 0
 
         self.formats = None
-        self.list_only = 0
         self.keep_tree = 0
 
 
@@ -228,6 +225,10 @@ def find_defaults (self):
             build_ext = self.find_peer ('build_ext')
             self.files.extend (build_ext.get_source_files ())
 
+        if self.distribution.has_c_libraries():
+            build_clib = self.find_peer ('build_clib')
+            self.files.extend (build_clib.get_source_files ())
+
 
     def search_dir (self, dir, pattern=None):
         """Recursively find files under 'dir' matching 'pattern' (a string

From 4bd72ccc78221cffe25ef0048895e24c4a63ba6b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 00:02:16 +0000
Subject: [PATCH 0263/8469] Added __version__ to store the Distutils version
 number.

---
 __init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/__init__.py b/__init__.py
index 1f23b972e4..9305554999 100644
--- a/__init__.py
+++ b/__init__.py
@@ -9,3 +9,5 @@
 """
 
 __revision__ = "$Id$"
+
+__version__ = "0.8"

From 515669ce62c1021d1cecfadc1c006bb074beb202 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 00:18:16 +0000
Subject: [PATCH 0264/8469] Removed global '--force' option -- just too vague a
 concept to be applicable to all commands in the same way.  Several Command
 methods now either expect 'self.force' to be defined, or check if it is
 defined and assume it's false if not.

---
 cmd.py  | 24 ++++++++++++++----------
 dist.py |  3 ---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cmd.py b/cmd.py
index b2fb517e73..76a76919cd 100644
--- a/cmd.py
+++ b/cmd.py
@@ -58,7 +58,6 @@ def __init__ (self, dist):
         # (etc.) will be handled by __getattr__, below.
         self._verbose = None
         self._dry_run = None
-        self._force = None
 
         # The 'help' flag is just used for command-line parsing, so
         # none of that complicated bureaucracy is needed.
@@ -74,7 +73,7 @@ def __init__ (self, dist):
 
 
     def __getattr__ (self, attr):
-        if attr in ('verbose', 'dry_run', 'force'):
+        if attr in ('verbose', 'dry_run'):
             myval = getattr (self, "_" + attr)
             if myval is None:
                 return getattr (self.distribution, attr)
@@ -308,7 +307,8 @@ def mkpath (self, name, mode=0777):
 
     def copy_file (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, link=None, level=1):
-        """Copy a file respecting verbose, dry-run and force flags."""
+        """Copy a file respecting verbose, dry-run and force flags (this
+        should only be used by commands that define 'self.force'!)."""
 
         return util.copy_file (infile, outfile,
                                preserve_mode, preserve_times,
@@ -322,7 +322,8 @@ def copy_tree (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, preserve_symlinks=0,
                    level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
-           and force flags."""
+           and force flags (again, should only be used by commands
+           that define 'self.force')."""
 
         return util.copy_tree (infile, outfile, 
                                preserve_mode,preserve_times,preserve_symlinks,
@@ -352,13 +353,15 @@ def make_archive (self, base_name, format,
 
 
     def make_file (self, infiles, outfile, func, args,
-                    exec_msg=None, skip_msg=None, level=1):
+                   exec_msg=None, skip_msg=None, level=1):
 
         """Special case of 'execute()' for operations that process one or
-           more input files and generate one output file.  Works just like
-           'execute()', except the operation is skipped and a different
-           message printed if 'outfile' already exists and is newer than
-           all files listed in 'infiles'."""
+        more input files and generate one output file.  Works just like
+        'execute()', except the operation is skipped and a different
+        message printed if 'outfile' already exists and is newer than all
+        files listed in 'infiles'.  If the command defined 'self.force',
+        and it is true, then the command is unconditionally run -- does no
+        timestamp checks."""
 
 
         if exec_msg is None:
@@ -378,7 +381,8 @@ def make_file (self, infiles, outfile, func, args,
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or util.newer_group (infiles, outfile):
+        if ((hasattr(self,'force') and self.force) or
+            util.newer_group (infiles, outfile)):
             self.execute (func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message
diff --git a/dist.py b/dist.py
index 7246b74001..cb18031470 100644
--- a/dist.py
+++ b/dist.py
@@ -52,8 +52,6 @@ class Distribution:
                        "run quietly (turns verbosity off)"),
                       ('dry-run', 'n',
                        "don't actually do anything"),
-                      ('force', 'f',
-                       "skip dependency checking between files"),
                       ('help', 'h',
                        "show this help message"),
                      ]
@@ -76,7 +74,6 @@ def __init__ (self, attrs=None):
         # Default values for our command-line options
         self.verbose = 1
         self.dry_run = 0
-        self.force = 0
         self.help = 0
         self.help_commands = 0
 

From 5f99c51af634e6d53353955add8bda432fa2d9ad Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 00:19:42 +0000
Subject: [PATCH 0265/8469] Added '--force' option -- very clear what it means
 for building (ignore timestamps), so every build_* command has 'self.force',
 which follows the 'build' command if not set by the user.

---
 command/build.py      | 5 +++++
 command/build_clib.py | 6 +++++-
 command/build_ext.py  | 6 +++++-
 command/build_py.py   | 7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/command/build.py b/command/build.py
index 2da589ab29..bca0ece808 100644
--- a/command/build.py
+++ b/command/build.py
@@ -28,6 +28,8 @@ class build (Command):
          "temporary build directory"),
         ('debug', 'g',
          "compile extensions and libraries with debugging information"),
+        ('force', 'f',
+         "forcibly build everything (ignore file timestamps"),
         ]
 
     def initialize_options (self):
@@ -39,9 +41,12 @@ def initialize_options (self):
         self.build_lib = None
         self.build_temp = None
         self.debug = None
+        self.force = 0
 
     def finalize_options (self):
 
+        print "build.finalize: force=%s" % self.force
+
         # Need this to name platform-specific directories, but sys.platform
         # is not enough -- it only names the OS and version, not the
         # hardware architecture!
diff --git a/command/build_clib.py b/command/build_clib.py
index f48e6476fb..2311187484 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -37,6 +37,8 @@ class build_clib (Command):
          "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),
+        ('force', 'f',
+         "forcibly build everything (ignore file timestamps"),
         ]
 
     def initialize_options (self):
@@ -51,6 +53,7 @@ def initialize_options (self):
         self.define = None
         self.undef = None
         self.debug = None
+        self.force = 0
 
     # initialize_options()
 
@@ -65,7 +68,8 @@ def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('build_temp', 'build_clib'),
                                     ('build_temp', 'build_temp'),
-                                    ('debug', 'debug'))
+                                    ('debug', 'debug'),
+                                    ('force', 'force'))
 
         self.libraries = self.distribution.libraries
         if self.libraries:
diff --git a/command/build_ext.py b/command/build_ext.py
index 2cb1c610f0..ddb01d4ef2 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -66,6 +66,8 @@ class build_ext (Command):
          "extra explicit link objects to include in the link"),
         ('debug', 'g',
          "compile/link with debugging information"),
+        ('force', 'f',
+         "forcibly build everything (ignore file timestamps"),
         ]
 
 
@@ -84,6 +86,7 @@ def initialize_options (self):
         self.rpath = None
         self.link_objects = None
         self.debug = None
+        self.force = None
 
 
     def finalize_options (self):
@@ -92,7 +95,8 @@ def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('build_lib', 'build_lib'),
                                     ('build_temp', 'build_temp'),
-                                    ('debug', 'debug'))
+                                    ('debug', 'debug'),
+                                    ('force', 'force'))
 
         if self.package is None:
             self.package = self.distribution.ext_package
diff --git a/command/build_py.py b/command/build_py.py
index 3baddc62c7..d719cec8d9 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -20,6 +20,7 @@ class build_py (Command):
 
     user_options = [
         ('build-lib=', 'd', "directory to \"build\" (copy) to"),
+        ('force', 'f', "forcibly build everything (ignore file timestamps"),
         ]
 
 
@@ -28,10 +29,14 @@ def initialize_options (self):
         self.modules = None
         self.package = None
         self.package_dir = None
+        self.force = None
 
     def finalize_options (self):
+        print "build_py.finalize: force=%s" % self.force
         self.set_undefined_options ('build',
-                                    ('build_lib', 'build_lib'))
+                                    ('build_lib', 'build_lib'),
+                                    ('force', 'force'))
+        print "build_py.finalize: force=%s" % self.force
 
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.

From b3602e53092a10f2c8fd167c7621150b6c71249a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 01:15:06 +0000
Subject: [PATCH 0266/8469] Better variable names here and there.

---
 sysconfig.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2c7318c04d..9cf9540db3 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -16,8 +16,8 @@
 from errors import DistutilsPlatformError
 
 
-prefix = os.path.normpath(sys.prefix)
-exec_prefix = os.path.normpath(sys.exec_prefix)
+PREFIX = os.path.normpath(sys.prefix)
+EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
 
 def get_python_inc(plat_specific=0):
@@ -29,13 +29,13 @@ def get_python_inc(plat_specific=0):
     (namely config.h).
 
     """    
-    the_prefix = (plat_specific and exec_prefix or prefix)
+    prefix = (plat_specific and EXEC_PREFIX or PREFIX)
     if os.name == "posix":
-        return os.path.join(the_prefix, "include", "python" + sys.version[:3])
+        return os.path.join(prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
-        return os.path.join(the_prefix, "Include") # include or Include?
+        return os.path.join(prefix, "Include") # include or Include?
     elif os.name == "mac":
-        return os.path.join(the_prefix, "Include")
+        return os.path.join(prefix, "Include")
     else:
         raise DistutilsPlatformError, \
               ("I don't know where Python installs its C header files " +
@@ -54,10 +54,10 @@ def get_python_lib(plat_specific=0, standard_lib=0):
     directory for site-specific modules.
 
     """
-    the_prefix = (plat_specific and exec_prefix or prefix)
+    prefix = (plat_specific and EXEC_PREFIX or PREFIX)
        
     if os.name == "posix":
-        libpython = os.path.join(the_prefix,
+        libpython = os.path.join(prefix,
                                  "lib", "python" + sys.version[:3])
         if standard_lib:
             return libpython
@@ -66,20 +66,20 @@ def get_python_lib(plat_specific=0, standard_lib=0):
 
     elif os.name == "nt":
         if standard_lib:
-            return os.path.join(the_prefix, "Lib")
+            return os.path.join(PREFIX, "Lib")
         else:
-            return the_prefix
+            return prefix
 
     elif os.name == "mac":
         if platform_specific:
             if standard_lib:
-                return os.path.join(exec_prefix, "Mac", "Plugins")
+                return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
             else:
                 raise DistutilsPlatformError, \
                       "OK, where DO site-specific extensions go on the Mac?"
         else:
             if standard_lib:
-                return os.path.join(prefix, "Lib")
+                return os.path.join(PREFIX, "Lib")
             else:
                 raise DistutilsPlatformError, \
                       "OK, where DO site-specific modules go on the Mac?"
@@ -226,7 +226,7 @@ def _init_nt():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.pyd'
-    g['exec_prefix'] = exec_prefix
+    g['exec_prefix'] = EXEC_PREFIX
 
 
 def _init_mac():
@@ -235,7 +235,7 @@ def _init_mac():
     # load the installed config.h (what if not installed? - still need to
     # be able to install packages which don't require compilation)
     parse_config_h(open(
-            os.path.join(sys.exec_prefix, "Mac", "Include", "config.h")), g)
+            os.path.join(EXEC_PREFIX, "Mac", "Include", "config.h")), g)
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
     g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
@@ -244,12 +244,12 @@ def _init_mac():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.ppc.slb'
-    g['exec_prefix'] = sys.exec_prefix
-    print sys.prefix
+    g['exec_prefix'] = EXEC_PREFIX
+    print sys.prefix, PREFIX
 
     # XXX are these used anywhere?
-    g['install_lib'] = os.path.join(sys.exec_prefix, "Lib")
-    g['install_platlib'] = os.path.join(sys.exec_prefix, "Mac", "Lib")
+    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
+    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
 
 
 try:

From 82199403a5964745b104e69851f05de78387c2e5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 01:17:49 +0000
Subject: [PATCH 0267/8469] Added optional 'prefix' arguments to
 'get_python_inc()' and 'get_python_lib()'.

---
 sysconfig.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9cf9540db3..3f345fbd12 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -20,7 +20,7 @@
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
 
-def get_python_inc(plat_specific=0):
+def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
 
     If 'plat_specific' is false (the default), this is the path to the
@@ -28,8 +28,11 @@ def get_python_inc(plat_specific=0):
     otherwise, this is the path to platform-specific header files
     (namely config.h).
 
+    If 'prefix' is supplied, use it instead of sys.prefix or
+    sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """    
-    prefix = (plat_specific and EXEC_PREFIX or PREFIX)
+    if prefix is None:
+        prefix = (plat_specific and EXEC_PREFIX or PREFIX)
     if os.name == "posix":
         return os.path.join(prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
@@ -42,7 +45,7 @@ def get_python_inc(plat_specific=0):
                "on platform '%s'") % os.name
 
 
-def get_python_lib(plat_specific=0, standard_lib=0):
+def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     """Return the directory containing the Python library (standard or
     site additions).
 
@@ -53,8 +56,11 @@ def get_python_lib(plat_specific=0, standard_lib=0):
     containing standard Python library modules; otherwise, return the
     directory for site-specific modules.
 
+    If 'prefix' is supplied, use it instead of sys.prefix or
+    sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    prefix = (plat_specific and EXEC_PREFIX or PREFIX)
+    if prefix is None:
+        prefix = (plat_specific and EXEC_PREFIX or PREFIX)
        
     if os.name == "posix":
         libpython = os.path.join(prefix,

From 888eb4fbd70664a685df5f61ea3e4acb4fb738ca Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 01:30:44 +0000
Subject: [PATCH 0268/8469] Added a check for the 'force' attribute in
 '__getattr__()' -- better than   crashing when self.force not defined. Revise
 'copy_file()' and 'copy_tree()' docstrings accordingly. Remove 'hasattr()'
 check for 'self.force' from 'make_file()'.

---
 cmd.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmd.py b/cmd.py
index 76a76919cd..16008c4fd0 100644
--- a/cmd.py
+++ b/cmd.py
@@ -79,6 +79,11 @@ def __getattr__ (self, attr):
                 return getattr (self.distribution, attr)
             else:
                 return myval
+
+        # Needed because some Command methods assume 'self.force' exists,
+        # but not all commands define 'self.force'.  Ugh.
+        elif attr == 'force':
+            return None
         else:
             raise AttributeError, attr
 
@@ -307,8 +312,9 @@ def mkpath (self, name, mode=0777):
 
     def copy_file (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, link=None, level=1):
-        """Copy a file respecting verbose, dry-run and force flags (this
-        should only be used by commands that define 'self.force'!)."""
+        """Copy a file respecting verbose, dry-run and force flags.  (The
+        former two default to whatever is in the Distribution object, and
+        the latter defaults to false for commands that don't define it.)"""
 
         return util.copy_file (infile, outfile,
                                preserve_mode, preserve_times,
@@ -322,8 +328,7 @@ def copy_tree (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, preserve_symlinks=0,
                    level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
-           and force flags (again, should only be used by commands
-           that define 'self.force')."""
+           and force flags."""
 
         return util.copy_tree (infile, outfile, 
                                preserve_mode,preserve_times,preserve_symlinks,
@@ -381,8 +386,7 @@ def make_file (self, infiles, outfile, func, args,
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if ((hasattr(self,'force') and self.force) or
-            util.newer_group (infiles, outfile)):
+        if self.force or util.newer_group (infiles, outfile):
             self.execute (func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message

From fa60eae5bb33a7b14d744cf26b0c0565e727db8a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 01:31:58 +0000
Subject: [PATCH 0269/8469] Delete some debugging print statements.

---
 command/build.py    | 2 --
 command/build_py.py | 2 --
 2 files changed, 4 deletions(-)

diff --git a/command/build.py b/command/build.py
index bca0ece808..7fb0b56657 100644
--- a/command/build.py
+++ b/command/build.py
@@ -45,8 +45,6 @@ def initialize_options (self):
 
     def finalize_options (self):
 
-        print "build.finalize: force=%s" % self.force
-
         # Need this to name platform-specific directories, but sys.platform
         # is not enough -- it only names the OS and version, not the
         # hardware architecture!
diff --git a/command/build_py.py b/command/build_py.py
index d719cec8d9..2a1fdd62c9 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -32,11 +32,9 @@ def initialize_options (self):
         self.force = None
 
     def finalize_options (self):
-        print "build_py.finalize: force=%s" % self.force
         self.set_undefined_options ('build',
                                     ('build_lib', 'build_lib'),
                                     ('force', 'force'))
-        print "build_py.finalize: force=%s" % self.force
 
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.

From a37b56ceefcc8d1b790a3c4061251b11daf1d26f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 10 Apr 2000 13:11:51 +0000
Subject: [PATCH 0270/8469] Define 'self.force' in the constructor and remove
 the hack in '__getattr__()' to account for it not being defined in the
 constructor.

---
 cmd.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd.py b/cmd.py
index 16008c4fd0..b3d16648d0 100644
--- a/cmd.py
+++ b/cmd.py
@@ -59,6 +59,12 @@ def __init__ (self, dist):
         self._verbose = None
         self._dry_run = None
 
+        # Some commands define a 'self.force' option to ignore file
+        # timestamps, but methods defined *here* assume that
+        # 'self.force' exists for all commands.  So define it here
+        # just to be safe.
+        self.force = None
+
         # The 'help' flag is just used for command-line parsing, so
         # none of that complicated bureaucracy is needed.
         self.help = 0
@@ -79,11 +85,6 @@ def __getattr__ (self, attr):
                 return getattr (self.distribution, attr)
             else:
                 return myval
-
-        # Needed because some Command methods assume 'self.force' exists,
-        # but not all commands define 'self.force'.  Ugh.
-        elif attr == 'force':
-            return None
         else:
             raise AttributeError, attr
 

From b40196ff52fb4a503022ee6e91b53ad5ec9c7317 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 14 Apr 2000 00:39:31 +0000
Subject: [PATCH 0271/8469] Don't bother reading config.h on NT or Mac OS. 
 (It's not really needed on Unix either, so should probably disappear
 entirely.)

---
 sysconfig.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3f345fbd12..f7c2e78326 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -222,8 +222,6 @@ def _init_posix():
 def _init_nt():
     """Initialize the module as appropriate for NT"""
     g = globals()
-    # load config.h, though I don't know how useful this is
-    parse_config_h(open(get_config_h_filename()), g)
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
     g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
@@ -238,10 +236,6 @@ def _init_nt():
 def _init_mac():
     """Initialize the module as appropriate for Macintosh systems"""
     g = globals()
-    # load the installed config.h (what if not installed? - still need to
-    # be able to install packages which don't require compilation)
-    parse_config_h(open(
-            os.path.join(EXEC_PREFIX, "Mac", "Include", "config.h")), g)
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
     g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)

From 0a8038198900ef7afaafc5e7c4a5b0fa584cf823 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 14 Apr 2000 00:48:15 +0000
Subject: [PATCH 0272/8469] Cleaned up use of sysconfig module a bit: don't
 import more names   than we actually use, and do actually use AR and SO. Run
 ranlib on static libraries.  (Should probably have a platform-check   so we
 don't run ranlib when it's not necessary, ie. on most modern   Unices.)

---
 unixccompiler.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index ec766f5405..0944461b9a 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -20,8 +20,7 @@
 import string, re, os
 from types import *
 from copy import copy
-from distutils.sysconfig import \
-     CC, CCSHARED, CFLAGS, OPT, LDSHARED, LDFLAGS, RANLIB, AR, SO
+from distutils import sysconfig
 from distutils.ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
 
 # XXX Things not currently handled:
@@ -59,14 +58,15 @@ class UnixCCompiler (CCompiler):
     src_extensions = [".c",".C",".cc",".cxx",".cpp"]
     obj_extension = ".o"
     static_lib_extension = ".a"
-    shared_lib_extension = ".so"
+    shared_lib_extension = sysconfig.SO
     static_lib_format = shared_lib_format = "lib%s%s"
 
     # Command to create a static library: seems to be pretty consistent
     # across the major Unices.  Might have to move down into the
     # constructor if we need platform-specific guesswork.
-    archiver = "ar"
+    archiver = sysconfig.AR
     archiver_options = "-cr"
+    ranlib = sysconfig.RANLIB
 
 
     def __init__ (self,
@@ -90,11 +90,11 @@ def __init__ (self,
         # UnixCCompiler!
 
         (self.cc, self.ccflags) = \
-            _split_command (CC + ' ' + OPT)
-        self.ccflags_shared = string.split (CCSHARED)
+            _split_command (sysconfig.CC + ' ' + sysconfig.OPT)
+        self.ccflags_shared = string.split (sysconfig.CCSHARED)
 
         (self.ld_shared, self.ldflags_shared) = \
-            _split_command (LDSHARED)
+            _split_command (sysconfig.LDSHARED)
 
         self.ld_exec = self.cc
 
@@ -157,6 +157,12 @@ def create_static_lib (self,
                          self.archiver_options,
                          output_filename] +
                         objects + self.objects)
+
+            # Not many Unices required ranlib anymore -- SunOS 4.x is,
+            # I think the only major Unix that does.  Probably should
+            # have some platform intelligence here to skip ranlib if
+            # it's not needed.
+            self.spawn ([self.ranlib, output_filename])
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 

From a213af0d45d592238ea3d6e56beca78271100d20 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 14 Apr 2000 00:49:30 +0000
Subject: [PATCH 0273/8469] Coerce all paths in the manifest template to the
 local path syntax with 'native_path()'.

---
 command/sdist.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 349a824afd..f3cc041e7d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -12,7 +12,7 @@
 from glob import glob
 from distutils.core import Command
 from distutils.util import \
-     newer, remove_tree, make_tarball, make_zipfile, create_tree
+     newer, create_tree, remove_tree, make_tarball, make_zipfile, native_path
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError
 
@@ -317,7 +317,7 @@ def read_template (self):
                          action)
                     continue
 
-                pattern = words[1]
+                pattern = native_path (words[1])
 
             elif action in ('recursive-include','recursive-exclude'):
                 if len (words) != 3:
@@ -327,7 +327,7 @@ def read_template (self):
                          action)
                     continue
 
-                (dir, pattern) = words[1:3]
+                (dir, pattern) = map (native_path, words[1:3])
 
             elif action in ('graft','prune'):
                 if len (words) != 2:
@@ -337,7 +337,7 @@ def read_template (self):
                          action)
                     continue
 
-                dir_pattern = words[1]
+                dir_pattern = native_path (words[1])
 
             else:
                 template.warn ("invalid manifest template line: " +
@@ -347,9 +347,9 @@ def read_template (self):
             # OK, now we know that the action is valid and we have the
             # right number of words on the line for that action -- so we
             # can proceed with minimal error-checking.  Also, we have
-            # defined either 'patter', 'dir' and 'pattern', or
-            # 'dir_pattern' -- so we don't have to spend any time digging
-            # stuff up out of 'words'.
+            # defined either (pattern), (dir and pattern), or
+            # (dir_pattern) -- so we don't have to spend any time
+            # digging stuff up out of 'words'.
 
             if action == 'include':
                 print "include", pattern

From 860fb8e70fb18c06ef9e82438fa2b5af33f926c0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 14 Apr 2000 00:50:49 +0000
Subject: [PATCH 0274/8469] Use 'get_python_inc()' to figure out the Python
 include directories rather than cobbling them togethere here.

---
 command/build_ext.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ddb01d4ef2..f08c97e9e7 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -105,12 +105,9 @@ def finalize_options (self):
         
 
         # Make sure Python's include directories (for Python.h, config.h,
-        # etc.) are in the include search path.  We have to roll our own
-        # "exec include dir", because the Makefile parsed by sysconfig
-        # doesn't have it (sigh).
-        py_include = sysconfig.INCLUDEPY # prefix + "include" + "python" + ver
-        exec_py_include = os.path.join (sysconfig.exec_prefix, 'include',
-                                        'python' + sys.version[0:3])
+        # etc.) are in the include search path.
+        py_include = sysconfig.get_python_inc()
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if type (self.include_dirs) is StringType:
@@ -120,8 +117,8 @@ def finalize_options (self):
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
         self.include_dirs.append (py_include)
-        if exec_py_include != py_include:
-            self.include_dirs.insert (0, exec_py_include)
+        if plat_py_include != py_include:
+            self.include_dirs.append (plat_py_include)
 
         if type (self.libraries) is StringType:
             self.libraries = [self.libraries]

From cde4940c51df0bc44586a948ba99d32218cbc75d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 14 Apr 2000 13:53:34 +0000
Subject: [PATCH 0275/8469] Don't run "ranlib" if sysconfig's RANLIB (from
 Python's Makefile) starts with ":".

---
 unixccompiler.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 0944461b9a..5e1524c67c 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -158,11 +158,13 @@ def create_static_lib (self,
                          output_filename] +
                         objects + self.objects)
 
-            # Not many Unices required ranlib anymore -- SunOS 4.x is,
-            # I think the only major Unix that does.  Probably should
-            # have some platform intelligence here to skip ranlib if
-            # it's not needed.
-            self.spawn ([self.ranlib, output_filename])
+            # Not many Unices required ranlib anymore -- SunOS 4.x is, I
+            # think the only major Unix that does.  Maybe we need some
+            # platform intelligence here to skip ranlib if it's not
+            # needed -- or maybe Python's configure script took care of
+            # it for us, hence the check for leading colon.
+            if self.ranlib[0] != ':':
+                self.spawn ([self.ranlib, output_filename])
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 

From 046fbde66e644516ce1dbe2b4decbc2348b0a137 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 15 Apr 2000 22:15:07 +0000
Subject: [PATCH 0276/8469] Cleaned up/simplified error-handling:   -
 DistutilsOptionError is now documented as it's actually used, ie.     to
 indicate bogus option values (usually user options, eg. from     the
 command-line)   - added DistutilsSetupError to indicate errors that
 definitely arise     in the setup script   - got rid of DistutilsValueError,
 and changed all usage of it to     either DistutilsSetupError or ValueError
 as appropriate   - simplified a bunch of option get/set methods in Command
 and     Distribution classes -- just pass on AttributeError most of     the
 time, rather than turning it into something else

---
 cmd.py                | 42 ++++++++++++++----------------------------
 command/build_clib.py | 14 +++++++-------
 command/build_ext.py  | 12 ++++++------
 dist.py               | 36 +++++++++---------------------------
 errors.py             | 16 +++++++++-------
 msvccompiler.py       |  3 +++
 util.py               |  8 ++++----
 7 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/cmd.py b/cmd.py
index b3d16648d0..d8e413798e 100644
--- a/cmd.py
+++ b/cmd.py
@@ -161,38 +161,28 @@ def announce (self, msg, level=1):
 
     def get_option (self, option):
         """Return the value of a single option for this command.  Raise
-           DistutilsOptionError if 'option' is not known."""
-        try:
-            return getattr (self, option)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % \
-                  (self.get_command_name(), option)
+           AttributeError if 'option' is not known."""
+        return getattr (self, option)
 
 
     def get_options (self, *options):
         """Return (as a tuple) the values of several options for this
-           command.  Raise DistutilsOptionError if any of the options in
+           command.  Raise AttributeError if any of the options in
            'options' are not known."""
 
         values = []
-        try:
-            for opt in options:
-                values.append (getattr (self, opt))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % \
-                  (self.get_command_name(), name)
-            
+        for opt in options:
+            values.append (getattr (self, opt))
+
         return tuple (values)
-    
+
 
     def set_option (self, option, value):
         """Set the value of a single option for this command.  Raise
-           DistutilsOptionError if 'option' is not known."""
+           AttributeError if 'option' is not known."""
 
         if not hasattr (self, option):
-            raise DistutilsOptionError, \
+            raise AttributeError, \
                   "command '%s': no such option '%s'" % \
                   (self.get_command_name(), option)
         if value is not None:
@@ -200,7 +190,7 @@ def set_option (self, option, value):
 
     def set_options (self, **optval):
         """Set the values of several options for this command.  Raise
-           DistutilsOptionError if any of the options specified as
+           AttributeError if any of the options specified as
            keyword arguments are not known."""
 
         for k in optval.keys():
@@ -236,14 +226,10 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
         src_cmd_obj = self.distribution.find_command_obj (src_cmd)
         src_cmd_obj.ensure_ready ()
-        try:
-            for (src_option, dst_option) in option_pairs:
-                if getattr (self, dst_option) is None:
-                    self.set_option (dst_option,
-                                     src_cmd_obj.get_option (src_option))
-        except AttributeError, name:
-            # duh, which command?
-            raise DistutilsOptionError, "unknown option %s" % name
+        for (src_option, dst_option) in option_pairs:
+            if getattr (self, dst_option) is None:
+                self.set_option (dst_option,
+                                 src_cmd_obj.get_option (src_option))
 
 
     def find_peer (self, command, create=1):
diff --git a/command/build_clib.py b/command/build_clib.py
index 2311187484..31170730e6 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -115,33 +115,33 @@ def check_library_list (self, libraries):
         """Ensure that the list of libraries (presumably provided as a
            command option 'libraries') is valid, i.e. it is a list of
            2-tuples, where the tuples are (library_name, build_info_dict).
-           Raise DistutilsValueError if the structure is invalid anywhere;
+           Raise DistutilsSetupError if the structure is invalid anywhere;
            just returns otherwise."""
 
         # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
         # with only names changed to protect the innocent!
 
         if type (libraries) is not ListType:
-            raise DistutilsValueError, \
+            raise DistutilsSetupError, \
                   "'libraries' option must be a list of tuples"
 
         for lib in libraries:
             if type (lib) is not TupleType and len (lib) != 2:
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
             if type (lib[0]) is not StringType:
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
             if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       ("bad library name '%s': " + 
                        "may not contain directory separators") % \
                       lib[0]
 
             if type (lib[1]) is not DictionaryType:
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "second element of each tuple in 'libraries' " + \
                       "must be a dictionary (build info)"
         # for lib
@@ -171,7 +171,7 @@ def build_libraries (self, libraries):
         for (lib_name, build_info) in libraries:
             sources = build_info.get ('sources')
             if sources is None or type (sources) not in (ListType, TupleType):
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       ("in 'libraries' option (library '%s'), " +
                        "'sources' must be present and must be " +
                        "a list of source filenames") % lib_name
diff --git a/command/build_ext.py b/command/build_ext.py
index f08c97e9e7..422b8cae1f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -205,26 +205,26 @@ def check_extensions_list (self, extensions):
         """Ensure that the list of extensions (presumably provided as a
            command option 'extensions') is valid, i.e. it is a list of
            2-tuples, where the tuples are (extension_name, build_info_dict).
-           Raise DistutilsValueError if the structure is invalid anywhere;
+           Raise DistutilsSetupError if the structure is invalid anywhere;
            just returns otherwise."""
 
         if type (extensions) is not ListType:
-            raise DistutilsValueError, \
+            raise DistutilsSetupError, \
                   "'ext_modules' option must be a list of tuples"
         
         for ext in extensions:
             if type (ext) is not TupleType and len (ext) != 2:
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "each element of 'ext_modules' option must be a 2-tuple"
 
             if not (type (ext[0]) is StringType and
                     extension_name_re.match (ext[0])):
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "first element of each tuple in 'ext_modules' " + \
                       "must be the extension name (a string)"
 
             if type (ext[1]) is not DictionaryType:
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       "second element of each tuple in 'ext_modules' " + \
                       "must be a dictionary (build info)"
 
@@ -274,7 +274,7 @@ def build_extensions (self):
         for (extension_name, build_info) in self.extensions:
             sources = build_info.get ('sources')
             if sources is None or type (sources) not in (ListType, TupleType):
-                raise DistutilsValueError, \
+                raise DistutilsSetupError, \
                       ("in 'ext_modules' option (extension '%s'), " +
                        "'sources' must be present and must be " +
                        "a list of source filenames") % extension_name
diff --git a/dist.py b/dist.py
index cb18031470..408b9f5c50 100644
--- a/dist.py
+++ b/dist.py
@@ -152,7 +152,7 @@ def __init__ (self, attrs=None):
                 if hasattr (self, key):
                     setattr (self, key, val)
                 else:
-                    raise DistutilsOptionError, \
+                    raise DistutilsSetupError, \
                           "invalid distribution option '%s'" % key
 
     # __init__ ()
@@ -447,27 +447,18 @@ def run_commands (self):
 
     def get_option (self, option):
         """Return the value of a distribution option.  Raise
-           DistutilsOptionError if 'option' is not known."""
-
-        try:
-            return getattr (self, opt)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "unknown distribution option %s" % option
+           AttributeError if 'option' is not known."""
+        return getattr (self, opt)
 
 
     def get_options (self, *options):
         """Return (as a tuple) the values of several distribution
-           options.  Raise DistutilsOptionError if any element of
+           options.  Raise AttributeError if any element of
            'options' is not known."""
         
         values = []
-        try:
-            for opt in options:
-                values.append (getattr (self, opt))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "unknown distribution option %s" % name
+        for opt in options:
+            values.append (getattr (self, opt))
 
         return tuple (values)
 
@@ -498,17 +489,12 @@ def run_command (self, command):
     def get_command_option (self, command, option):
         """Create a command object for 'command' if necessary, ensure that
            its option values are all set to their final values, and return
-           the value of its 'option' option.  Raise DistutilsOptionError if
+           the value of its 'option' option.  Raise AttributeError if
            'option' is not known for that 'command'."""
 
         cmd_obj = self.find_command_obj (command)
         cmd_obj.ensure_ready ()
         return cmd_obj.get_option (option)
-        try:
-            return getattr (cmd_obj, option)
-        except AttributeError:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % (command, option)
 
 
     def get_command_options (self, command, *options):
@@ -521,12 +507,8 @@ def get_command_options (self, command, *options):
         cmd_obj = self.find_command_obj (command)
         cmd_obj.ensure_ready ()
         values = []
-        try:
-            for opt in options:
-                values.append (getattr (cmd_obj, option))
-        except AttributeError, name:
-            raise DistutilsOptionError, \
-                  "command %s: no such option %s" % (command, name)
+        for opt in options:
+            values.append (getattr (cmd_obj, option))
 
         return tuple (values)
 
diff --git a/errors.py b/errors.py
index f9d5c8de5a..61cdb72c2a 100644
--- a/errors.py
+++ b/errors.py
@@ -46,15 +46,18 @@ class DistutilsArgError (DistutilsError):
     class DistutilsFileError (DistutilsError):
         pass
 
-    # DistutilsOptionError is raised anytime an attempt is made to access
-    # (get or set) an option that does not exist for a particular command
-    # (or for the distribution itself).
+    # DistutilsOptionError is raised for syntactic/semantic errors in
+    # command options, such as use of mutually conflicting options, or
+    # inconsistent options, badly-spelled values, etc.  No distinction is
+    # made between option values originating in the setup script, the
+    # command line, config files, or what-have-you.
     class DistutilsOptionError (DistutilsError):
         pass
 
-    # DistutilsValueError is raised anytime an option value (presumably
-    # provided by setup.py) is invalid.
-    class DistutilsValueError (DistutilsError):
+    # DistutilsSetupError is raised for errors that can be definitely
+    # blamed on the setup script, such as invalid keyword arguments to
+    # 'setup()'.
+    class DistutilsSetupError (DistutilsError):
         pass
 
     # DistutilsPlatformError is raised when we find that we don't
@@ -82,7 +85,6 @@ class DistutilsInternalError (DistutilsError):
     DistutilsArgError = 'DistutilsArgError'
     DistutilsFileError = 'DistutilsFileError'
     DistutilsOptionError = 'DistutilsOptionError'
-    DistutilsValueError = 'DistutilsValueError'
     DistutilsPlatformError = 'DistutilsPlatformError'
     DistutilsExecError = 'DistutilsExecError'
     DistutilsInternalError = 'DistutilsInternalError'
diff --git a/msvccompiler.py b/msvccompiler.py
index 43a8596085..c7a69c3594 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -360,6 +360,9 @@ def link_shared_object (self,
             if extra_postargs:
                 ld_args.extend (extra_postargs)
 
+            print "link_shared_object():"
+            print "  output_filename =", output_filename
+            print "  mkpath'ing:", os.path.dirname (output_filename)
             self.mkpath (os.path.dirname (output_filename))
             self.spawn ([self.link] + ld_args)
 
diff --git a/util.py b/util.py
index ddcf0d2862..be3a1d6e0f 100644
--- a/util.py
+++ b/util.py
@@ -40,16 +40,16 @@ def native_path (pathname):
        using the current directory separator.  Needed because filenames in
        the setup script are always supplied in Unix style, and have to be
        converted to the local convention before we can actually use them in
-       the filesystem.  Raises DistutilsValueError if 'pathname' is
+       the filesystem.  Raises ValueError if 'pathname' is
        absolute (starts with '/') or contains local directory separators
        (unless the local separator is '/', of course)."""
 
     if pathname[0] == '/':
-        raise DistutilsValueError, "path '%s' cannot be absolute" % pathname
+        raise ValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
-        raise DistutilsValueError, "path '%s' cannot end with '/'" % pathname
+        raise ValueError, "path '%s' cannot end with '/'" % pathname
     if os.sep != '/' and os.sep in pathname:
-        raise DistutilsValueError, \
+        raise ValueError, \
               "path '%s' cannot contain '%c' character" % \
               (pathname, os.sep)
 

From 30e154ec0f2489c3376e6cfc371e25a26a1fed70 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 15 Apr 2000 22:23:47 +0000
Subject: [PATCH 0277/8469] Reformatted all exception documentation as
 docstrings.

---
 errors.py | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/errors.py b/errors.py
index 61cdb72c2a..d66043a1fe 100644
--- a/errors.py
+++ b/errors.py
@@ -16,64 +16,65 @@
 
 if type (RuntimeError) is types.ClassType:
 
-    # DistutilsError is the root of all Distutils evil.
     class DistutilsError (Exception):
+        """The root of all Distutils evil."""
         pass
 
-    # DistutilsModuleError is raised if we are unable to load an expected
-    # module, or find an expected class within some module
     class DistutilsModuleError (DistutilsError):
+        """Unable to load an expected module, or to find an expected class
+        within some module (in particular, command modules and classes)."""
         pass
 
-    # DistutilsClassError is raised if we encounter a distribution or command
-    # class that's not holding up its end of the bargain.
     class DistutilsClassError (DistutilsError):
+        """Some command class (or possibly distribution class, if anyone
+        feels a need to subclass Distribution) is found not to be holding
+        up its end of the bargain, ie. implementing some part of the
+        "command "interface."""
         pass
 
-    # DistutilsGetoptError (help me -- I have JavaProgrammersDisease!) is
-    # raised if the option table provided to fancy_getopt is bogus.
     class DistutilsGetoptError (DistutilsError):
+        """The option table provided to 'fancy_getopt()' is bogus."""
         pass
 
-    # DistutilsArgError is raised by fancy_getopt in response to getopt.error;
-    # distutils.core then turns around and raises SystemExit from that.  (Thus
-    # client code should never see DistutilsArgError.)
     class DistutilsArgError (DistutilsError):
+        """Raised by fancy_getopt in response to getopt.error -- ie. an
+        error in the command line usage."""
         pass
 
-    # DistutilsFileError is raised for any problems in the filesystem:
-    # expected file not found, etc.
     class DistutilsFileError (DistutilsError):
+        """Any problems in the filesystem: expected file not found, etc.
+        Typically this is for problems that we detect before IOError or
+        OSError could be raised."""
         pass
 
-    # DistutilsOptionError is raised for syntactic/semantic errors in
-    # command options, such as use of mutually conflicting options, or
-    # inconsistent options, badly-spelled values, etc.  No distinction is
-    # made between option values originating in the setup script, the
-    # command line, config files, or what-have-you.
     class DistutilsOptionError (DistutilsError):
+        """Syntactic/semantic errors in command options, such as use of
+        mutually conflicting options, or inconsistent options,
+        badly-spelled values, etc.  No distinction is made between option
+        values originating in the setup script, the command line, config
+        files, or what-have-you -- but if we *know* something originated in
+        the setup script, we'll raise DistutilsSetupError instead."""
         pass
 
-    # DistutilsSetupError is raised for errors that can be definitely
-    # blamed on the setup script, such as invalid keyword arguments to
-    # 'setup()'.
     class DistutilsSetupError (DistutilsError):
+        """For errors that can be definitely blamed on the setup script,
+        such as invalid keyword arguments to 'setup()'."""
         pass
 
-    # DistutilsPlatformError is raised when we find that we don't
-    # know how to do something on the current platform (but we do
-    # know how to do it on some platform).
     class DistutilsPlatformError (DistutilsError):
+        """We don't know how to do something on the current platform (but
+        we do know how to do it on some platform) -- eg. trying to compile
+        C files on a platform not supported by a CCompiler subclass."""
         pass
 
-    # DistutilsExecError is raised if there are any problems executing
-    # an external program
     class DistutilsExecError (DistutilsError):
+        """Any problems executing an external program (such as the C
+        compiler, when compiling C files)."""
         pass
 
-    # DistutilsInternalError is raised on internal inconsistencies
-    # or impossibilities
     class DistutilsInternalError (DistutilsError):
+        """Internal inconsistencies or impossibilities (obviously, this
+        should never be seen if the code is working!)."""
         pass
 
 # String-based exceptions

From 02d779e3f493d0fe4faebc32f4dfc9636b0de179 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 19 Apr 2000 02:16:49 +0000
Subject: [PATCH 0278/8469] Added 'link_executable()' method (Berthold
 Hoellmann). Two small fixes to 'link_shared_object()'.

---
 msvccompiler.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index c7a69c3594..3667afcd2d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -333,15 +333,13 @@ def link_shared_object (self,
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
 
-        if self.runtime_library_dirs:
+        if runtime_library_dirs:
             self.warn ("I don't know what to do with 'runtime_library_dirs': "
                        + str (runtime_library_dirs))
         
         lib_opts = gen_lib_options (self,
                                     library_dirs, runtime_library_dirs,
                                     libraries)
-        if type (output_dir) not in (StringType, NoneType):
-            raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
@@ -370,6 +368,53 @@ def link_shared_object (self,
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
     # link_shared_object ()
+
+
+    def link_executable (self,
+                         objects,
+                         output_progname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         runtime_library_dirs=None,
+                         debug=0,
+                         extra_preargs=None,
+                         extra_postargs=None):
+
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+        
+        lib_opts = gen_lib_options (self,
+                                    library_dirs, runtime_library_dirs,
+                                    libraries)
+        output_filename = output_progname + self.exe_extension
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        if self._need_link (objects, output_filename):
+
+            if debug:
+                ldflags = self.ldflags_shared_debug[1:]
+            else:
+                ldflags = self.ldflags_shared[1:]
+
+            ld_args = ldflags + lib_opts + \
+                      objects + ['/OUT:' + output_filename]
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
+
+            self.mkpath (os.path.dirname (output_filename))
+            self.spawn ([self.link] + ld_args)
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)   
     
 
     # -- Miscellaneous methods -----------------------------------------

From 32b92081ec16b3958ef792eff9e6588dcdff9e8c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 19 Apr 2000 02:18:09 +0000
Subject: [PATCH 0279/8469] Don't load the config.h file, even under Unix,
 because we never use the information from config.h.  Code is still there in
 case someone in the future needs to parse an autoconf-generated config.h
 file.

---
 sysconfig.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index f7c2e78326..c6341c105d 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -213,8 +213,6 @@ def parse_makefile(fp, g=None):
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     g = globals()
-    # load the installed config.h:
-    parse_config_h(open(get_config_h_filename()), g)
     # load the installed Makefile:
     parse_makefile(open(get_makefile_filename()), g)
 

From 1822bd769bbf61b61f469351555b24c6765f08a9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 19 Apr 2000 02:22:07 +0000
Subject: [PATCH 0280/8469] Added kludge to deal with the "./ld_so_aix"
 problem: force all strings in the Makefile that start with "./" to be
 absolute paths (with the implied root being the directory where the Makefile
 itself was found).

---
 sysconfig.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index c6341c105d..5cc71dc0ba 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -205,6 +205,21 @@ def parse_makefile(fp, g=None):
                 # bogus variable reference; just drop it since we can't deal
                 del notdone[name]
 
+    # "Fix" all pathnames in the Makefile that are explicitly relative,
+    # ie. that start with "./".  This is a kludge to fix the "./ld_so_aix"
+    # problem, the nature of which is that Python's installed Makefile
+    # refers to "./ld_so_aix", but when we are building extensions we are
+    # far from the directory where Python's Makefile (and ld_so_aix, for
+    # that matter) is installed.  Unfortunately, there are several other
+    # relative pathnames in the Makefile, and this fix doesn't fix them,
+    # because the layout of Python's source tree -- which is what the
+    # Makefile refers to -- is not fully preserved in the Python
+    # installation.  Grumble.
+    from os.path import normpath, join, dirname
+    for (name, value) in done.items():
+        if value[0:2] == "./":
+            done[name] = normpath(join(dirname(fp.name), value))
+
     # save the results in the global dictionary
     g.update(done)
     return g

From 4b2a001255107048e4117ac88b0a3d1aa371fd47 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 19 Apr 2000 02:23:21 +0000
Subject: [PATCH 0281/8469] Bumped version to 0.8.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9305554999..5b8a662888 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.8"
+__version__ = "0.8.1"

From 8b97bc929e1390ec9ad9998d10c173923b0b91a0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 01:41:54 +0000
Subject: [PATCH 0282/8469] Hefty refactoring: converted 'fancy_getopt()'
 function into FancyGetopt class.  (Mainly this was to support the ability to
 go back after the getopt operation is done and get extra information about
 the parse, in particular the original order of options seen on the command
 line. But it's a big improvement and should make it a lot easier to add
 functionality in the future.)

---
 fancy_getopt.py | 281 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 266 insertions(+), 15 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 3110ab30db..94e654e896 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -27,11 +27,244 @@
 # For recognizing "negative alias" options, eg. "quiet=!verbose"
 neg_alias_re = re.compile ("^(%s)=!(%s)$" % (longopt_pat, longopt_pat))
 
-
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
 longopt_xlate = string.maketrans ('-', '_')
 
+# This records (option, value) pairs in the order seen on the command line;
+# it's close to what getopt.getopt() returns, but with short options
+# expanded.  (Ugh, this module should be OO-ified.)
+_option_order = None
+
+
+class FancyGetopt:
+    """Wrapper around the standard 'getopt()' module that provides some
+    handy extra functionality:
+      * short and long options are tied together
+      * options have help strings, and help text can be assembled
+        from them
+      * options set attributes of a passed-in object
+      * boolean options can have "negative aliases" -- eg. if
+        --quiet is the "negative alias" of --verbose, then "--quiet"
+        on the command line sets 'verbose' to false
+    """
+
+    def __init__ (self, option_table=None):
+
+        # The option table is (currently) a list of 3-tuples:
+        #   (long_option, short_option, help_string)
+        # if an option takes an argument, its long_option should have '='
+        # appended; short_option should just be a single character, no ':'
+        # in any case.  If a long_option doesn't have a corresponding
+        # short_option, short_option should be None.  All option tuples
+        # must have long options.
+        self.option_table = option_table
+
+        # 'option_index' maps long option names to entries in the option
+        # table (ie. those 3-tuples).
+        self.option_index = {}
+        if self.option_table:
+            self.build_index()
+
+        # 'negative_alias' keeps track of options that are the boolean
+        # opposite of some other option
+        self.negative_alias = {}
+        
+        # These keep track of the information in the option table.  We
+        # don't actually populate these structures until we're ready to
+        # parse the command-line, since the 'option_table' passed in here
+        # isn't necessarily the final word.
+        self.short_opts = []
+        self.long_opts = []
+        self.short2long = {}
+        self.attr_name = {}
+        self.takes_arg = {}
+
+        # And 'option_order' is filled up in 'getopt()'; it records the
+        # original order of options (and their values) on the command-line,
+        # but expands short options, converts aliases, etc.
+        self.option_order = []
+
+    # __init__ ()
+    
+
+    def build_index (self):
+        for option in self.option_table:
+            self.option_index[option[0]] = option
+
+    def add_option (self, long_option, short_option=None, help_string=None):
+        if self.option_index.has_key(long_option):
+            raise DistutilsGetoptError, \
+                  "option conflict: already an option '%s'" % long_option
+        else:
+            option = (long_option, short_option, help_string)
+            self.option_table.append (option)
+            self.option_index[long_option] = option
+
+    def set_negative_aliases (self, negative_alias):
+        """Set the negative aliases for this option parser.
+        'negative_alias' should be a dictionary mapping option names to
+        option names, both the key and value must already be defined
+        in the option table."""
+
+        assert type(negative_alias) is DictionaryType
+        for (negopt, opt) in negative_alias.items():
+            if not self.option_index.has_key(negopt):
+                raise DistutilsGetoptError, \
+                      ("invalid negative alias '%s': "
+                       "option '%s' not defined") % (negopt, negopt)
+            if not self.option_index.has_key(opt):
+                raise DistutilsGetoptError, \
+                      ("invalid negative alias '%s': "
+                       "aliased option '%s' not defined") % (negopt, opt)
+
+        self.negative_alias = negative_alias
+
+
+    def _grok_option_table (self):
+        """Populate the various data structures that keep tabs on
+           the option table.  Called by 'getopt()' before it can do
+           anything worthwhile."""
+
+        for option in self.option_table:
+            try:
+                (long, short, help) = option
+            except ValueError:
+                raise DistutilsGetoptError, \
+                      "invalid option tuple " + str (option)
+
+            # Type- and value-check the option names
+            if type(long) is not StringType or len(long) < 2:
+                raise DistutilsGetoptError, \
+                      ("invalid long option '%s': "
+                       "must be a string of length >= 2") % long
+
+            if (not ((short is None) or
+                     (type (short) is StringType and len (short) == 1))):
+                raise DistutilsGetoptError, \
+                      ("invalid short option '%s': "
+                       "must a single character or None") % short
+
+            self.long_opts.append (long)
+
+            if long[-1] == '=':             # option takes an argument?
+                if short: short = short + ':'
+                long = long[0:-1]
+                self.takes_arg[long] = 1
+            else:
+
+                # Is option is a "negative alias" for some other option (eg.
+                # "quiet" == "!verbose")?
+                alias_to = self.negative_alias.get(long)
+                if alias_to is not None:
+                    if self.takes_arg[alias_to]:
+                        raise DistutilsGetoptError, \
+                              ("invalid negative alias '%s': "
+                               "aliased option '%s' takes a value") % \
+                               (long, alias_to)
+
+                    self.long_opts[-1] = long # XXX redundant?!
+                    self.takes_arg[long] = 0
+
+                else:
+                    self.takes_arg[long] = 0
+
+
+            # Now enforce some bondage on the long option name, so we can
+            # later translate it to an attribute name on some object.  Have
+            # to do this a bit late to make sure we've removed any trailing
+            # '='.
+            if not longopt_re.match (long):
+                raise DistutilsGetoptError, \
+                      ("invalid long option name '%s' " +
+                       "(must be letters, numbers, hyphens only") % long
+
+            self.attr_name[long] = string.translate (long, longopt_xlate)
+            if short:
+                self.short_opts.append (short)
+                self.short2long[short[0]] = long
+
+        # for option_table
+
+    # _grok_option_table()
+
+
+    def getopt (self, args=None, object=None):
+
+        """Parse the command-line options in 'args' and store the results
+        as attributes of 'object'.  If 'args' is None or not supplied, uses
+        'sys.argv[1:]'.  If 'object' is None or not supplied, creates a new
+        OptionDummy object, stores option values there, and returns a tuple
+        (args, object).  If 'object' is supplied, it is modified in place
+        and 'getopt()' just returns 'args'; in both cases, the returned
+        'args' is a modified copy of the passed-in 'args' list, which is
+        left untouched."""
+
+        if args is None:
+            args = sys.argv[1:]
+        if object is None:
+            object = OptionDummy()
+            created_object = 1
+        else:
+            created_object = 0
+
+        self._grok_option_table()
+
+        short_opts = string.join (self.short_opts)
+        try:
+            (opts, args) = getopt.getopt (args, short_opts, self.long_opts)
+        except getopt.error, msg:
+            raise DistutilsArgError, msg
+
+        for (opt, val) in opts:
+            if len (opt) == 2 and opt[0] == '-': # it's a short option
+                opt = self.short2long[opt[1]]
+
+            elif len (opt) > 2 and opt[0:2] == '--':
+                opt = opt[2:]
+
+            else:
+                raise DistutilsInternalError, \
+                      "this can't happen: bad option string '%s'" % opt
+
+            if not self.takes_arg[opt]:     # boolean option?
+                if val != '':               # shouldn't have a value!
+                    raise DistutilsInternalError, \
+                          "this can't happen: bad option value '%s'" % value
+
+                alias = self.negative_alias.get (opt)
+                if alias:
+                    opt = alias
+                    val = 0
+                else:
+                    val = 1
+
+            attr = self.attr_name[opt]
+            setattr (object, attr, val)
+            self.option_order.append ((opt, val))
+
+        # for opts
+
+        if created_object:
+            return (args, object)
+        else:
+            return args
+
+    # getopt()
+
+
+    def get_option_order ():
+        """Returns the list of (option, value) tuples processed by the
+        previous run of 'fancy_getopt()'.  Raises RuntimeError if
+        'fancy_getopt()' hasn't been called yet."""
+
+        if self.option_order is None:
+            raise RuntimeError, "'fancy_getopt()' hasn't been called yet"
+        else:
+            return self.option_order
+
+# class FancyGetopt
+
 
 def fancy_getopt (options, negative_opt, object, args):
 
@@ -117,6 +350,9 @@ def fancy_getopt (options, negative_opt, object, args):
     except getopt.error, msg:
         raise DistutilsArgError, msg
 
+    global _option_order                # blechh! should OO-ify this module
+    _option_order = []
+
     for (opt, val) in opts:
         if len (opt) == 2 and opt[0] == '-': # it's a short option
             opt = short2long[opt[1]]
@@ -125,29 +361,38 @@ def fancy_getopt (options, negative_opt, object, args):
             opt = opt[2:]
 
         else:
-            raise RuntimeError, "getopt lies! (bad option string '%s')" % \
-                  opt
+            raise DistutilsInternalError, \
+                  "this can't happen: bad option string '%s'" % opt
+
+        if not takes_arg[opt]:          # boolean option?
+            if val != '':               # shouldn't have a value!
+                raise DistutilsInternalError, \
+                      "this can't happen: bad option value '%s'" % value
+
+            alias = negative_opt.get (opt)
+            if alias:
+                opt = alias
+                val = 0
+            else:
+                val = 1
 
         attr = attr_name[opt]
-        if takes_arg[opt]:
-            setattr (object, attr, val)
-        else:
-            if val == '':
-                alias = negative_opt.get (opt)
-                if alias:
-                    setattr (object, attr_name[alias], 0)
-                else:
-                    setattr (object, attr, 1)
-            else:
-                raise RuntimeError, "getopt lies! (bad value '%s')" % value
+        setattr (object, attr, val)
+        _option_order.append ((opt, val))
 
-    # end loop over options found in 'args'
+    # for opts
 
     return args
 
 # fancy_getopt()
 
 
+def fancy_getopt (options, negative_opt, object, args):
+    parser = FancyGetopt (options)
+    parser.set_negative_aliases (negative_opt)
+    return parser.getopt (args, object)
+
+
 WS_TRANS = string.maketrans (string.whitespace, ' ' * len (string.whitespace))
 
 def wrap_text (text, width):
@@ -296,6 +541,12 @@ def print_help (options, file=None, header=None):
     for line in generate_help (options, header):
         file.write (line + "\n")
 # print_help ()
+
+
+class OptionDummy:
+    """Dummy class just used as a place to hold command-line option
+    values as instance attributes."""
+    pass
     
 
 if __name__ == "__main__":

From bacfe767f341ed061b5cc1c0ac1454d7f3a72d2e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 01:44:00 +0000
Subject: [PATCH 0283/8469] Continuing the refactoring: deleted the old
 'fancy_getopt()' function, leaving in its place a tiny wrapper around the
 FancyGetopt class for backwards compatibility.

---
 fancy_getopt.py | 121 ------------------------------------------------
 1 file changed, 121 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 94e654e896..8ee27748da 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -266,127 +266,6 @@ def get_option_order ():
 # class FancyGetopt
 
 
-def fancy_getopt (options, negative_opt, object, args):
-
-    # The 'options' table is a list of 3-tuples:
-    #   (long_option, short_option, help_string)
-    # if an option takes an argument, its long_option should have '='
-    # appended; short_option should just be a single character, no ':' in
-    # any case.  If a long_option doesn't have a corresponding
-    # short_option, short_option should be None.  All option tuples must
-    # have long options.
-
-    # Build the short_opts string and long_opts list, remembering how
-    # the two are tied together
-
-    short_opts = []                     # we'll join 'em when done
-    long_opts = []
-    short2long = {}
-    attr_name = {}
-    takes_arg = {}
-
-    for option in options:
-        try:
-            (long, short, help) = option
-        except ValueError:
-            raise DistutilsGetoptError, \
-                  "invalid option tuple " + str (option)
-
-        # Type-check the option names
-        if type (long) is not StringType or len (long) < 2:
-            raise DistutilsGetoptError, \
-                  "long option '%s' must be a string of length >= 2" % \
-                  long
-
-        if (not ((short is None) or
-                 (type (short) is StringType and len (short) == 1))):
-            raise DistutilsGetoptError, \
-                  "short option '%s' must be None or string of length 1" % \
-                  short
-
-        long_opts.append (long)
-
-        if long[-1] == '=':             # option takes an argument?
-            if short: short = short + ':'
-            long = long[0:-1]
-            takes_arg[long] = 1
-        else:
-
-            # Is option is a "negative alias" for some other option (eg.
-            # "quiet" == "!verbose")?
-            alias_to = negative_opt.get(long)
-            if alias_to is not None:
-                if not takes_arg.has_key(alias_to) or takes_arg[alias_to]:
-                    raise DistutilsGetoptError, \
-                          ("option '%s' is a negative alias for '%s', " +
-                           "which either hasn't been defined yet " +
-                           "or takes an argument") % (long, alias_to)
-
-                long_opts[-1] = long
-                takes_arg[long] = 0
-
-            else:
-                takes_arg[long] = 0
-                
-
-        # Now enforce some bondage on the long option name, so we can later
-        # translate it to an attribute name in 'object'.  Have to do this a
-        # bit late to make sure we've removed any trailing '='.
-        if not longopt_re.match (long):
-            raise DistutilsGetoptError, \
-                  ("invalid long option name '%s' " +
-                   "(must be letters, numbers, hyphens only") % long
-
-        attr_name[long] = string.translate (long, longopt_xlate)
-        if short:
-            short_opts.append (short)
-            short2long[short[0]] = long
-
-    # end loop over 'options'
-
-    short_opts = string.join (short_opts)
-    try:
-        (opts, args) = getopt.getopt (args, short_opts, long_opts)
-    except getopt.error, msg:
-        raise DistutilsArgError, msg
-
-    global _option_order                # blechh! should OO-ify this module
-    _option_order = []
-
-    for (opt, val) in opts:
-        if len (opt) == 2 and opt[0] == '-': # it's a short option
-            opt = short2long[opt[1]]
-
-        elif len (opt) > 2 and opt[0:2] == '--':
-            opt = opt[2:]
-
-        else:
-            raise DistutilsInternalError, \
-                  "this can't happen: bad option string '%s'" % opt
-
-        if not takes_arg[opt]:          # boolean option?
-            if val != '':               # shouldn't have a value!
-                raise DistutilsInternalError, \
-                      "this can't happen: bad option value '%s'" % value
-
-            alias = negative_opt.get (opt)
-            if alias:
-                opt = alias
-                val = 0
-            else:
-                val = 1
-
-        attr = attr_name[opt]
-        setattr (object, attr, val)
-        _option_order.append ((opt, val))
-
-    # for opts
-
-    return args
-
-# fancy_getopt()
-
-
 def fancy_getopt (options, negative_opt, object, args):
     parser = FancyGetopt (options)
     parser.set_negative_aliases (negative_opt)

From 97f6eb18591a6e8a62dc727e4900ef036c801637 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 02:09:26 +0000
Subject: [PATCH 0284/8469] Made 'generate_help()' and 'print_help()' methods
 of FancyGetopt. Added 'set_option_table()' method. Added missing 'self' to
 'get_option_order()'. Cosmetic/comment/docstring tweaks.

---
 fancy_getopt.py | 201 ++++++++++++++++++++++++------------------------
 1 file changed, 102 insertions(+), 99 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 8ee27748da..c8112331a0 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -64,7 +64,7 @@ def __init__ (self, option_table=None):
         # table (ie. those 3-tuples).
         self.option_index = {}
         if self.option_table:
-            self.build_index()
+            self._build_index()
 
         # 'negative_alias' keeps track of options that are the boolean
         # opposite of some other option
@@ -88,10 +88,14 @@ def __init__ (self, option_table=None):
     # __init__ ()
     
 
-    def build_index (self):
+    def _build_index (self):
         for option in self.option_table:
             self.option_index[option[0]] = option
 
+    def set_option_table (self, option_table):
+        self.option_table = option_table
+        self._build_index()
+
     def add_option (self, long_option, short_option=None, help_string=None):
         if self.option_index.has_key(long_option):
             raise DistutilsGetoptError, \
@@ -190,7 +194,6 @@ def _grok_option_table (self):
 
 
     def getopt (self, args=None, object=None):
-
         """Parse the command-line options in 'args' and store the results
         as attributes of 'object'.  If 'args' is None or not supplied, uses
         'sys.argv[1:]'.  If 'object' is None or not supplied, creates a new
@@ -253,16 +256,108 @@ def getopt (self, args=None, object=None):
     # getopt()
 
 
-    def get_option_order ():
+    def get_option_order (self):
         """Returns the list of (option, value) tuples processed by the
-        previous run of 'fancy_getopt()'.  Raises RuntimeError if
-        'fancy_getopt()' hasn't been called yet."""
+        previous run of 'getopt()'.  Raises RuntimeError if
+        'getopt()' hasn't been called yet."""
 
         if self.option_order is None:
-            raise RuntimeError, "'fancy_getopt()' hasn't been called yet"
+            raise RuntimeError, "'getopt()' hasn't been called yet"
         else:
             return self.option_order
 
+
+    def generate_help (header=None):
+        """Generate help text (a list of strings, one per suggested line of
+        output) from the option table for this FancyGetopt object."""
+
+        # Blithely assume the option table is good: probably wouldn't call
+        # 'generate_help()' unless you've already called 'getopt()'.
+
+        # First pass: determine maximum length of long option names
+        max_opt = 0
+        for option in self.option_table:
+            long = option[0]
+            short = option[1]
+            l = len (long)
+            if long[-1] == '=':
+                l = l - 1
+            if short is not None:
+                l = l + 5                   # " (-x)" where short == 'x'
+            if l > max_opt:
+                max_opt = l
+
+        opt_width = max_opt + 2 + 2 + 2     # room for indent + dashes + gutter
+
+        # Typical help block looks like this:
+        #   --foo       controls foonabulation
+        # Help block for longest option looks like this:
+        #   --flimflam  set the flim-flam level
+        # and with wrapped text:
+        #   --flimflam  set the flim-flam level (must be between
+        #               0 and 100, except on Tuesdays)
+        # Options with short names will have the short name shown (but
+        # it doesn't contribute to max_opt):
+        #   --foo (-f)  controls foonabulation
+        # If adding the short option would make the left column too wide,
+        # we push the explanation off to the next line
+        #   --flimflam (-l)
+        #               set the flim-flam level
+        # Important parameters:
+        #   - 2 spaces before option block start lines
+        #   - 2 dashes for each long option name
+        #   - min. 2 spaces between option and explanation (gutter)
+        #   - 5 characters (incl. space) for short option name
+
+        # Now generate lines of help text.  (If 80 columns were good enough
+        # for Jesus, then 78 columns are good enough for me!)
+        line_width = 78
+        text_width = line_width - opt_width
+        big_indent = ' ' * opt_width
+        if header:
+            lines = [header]
+        else:
+            lines = ['Option summary:']
+
+        for (long,short,help) in self.option_table:
+
+            text = wrap_text (help, text_width)
+            if long[-1] == '=':
+                long = long[0:-1]
+
+            # Case 1: no short option at all (makes life easy)
+            if short is None:
+                if text:
+                    lines.append ("  --%-*s  %s" % (max_opt, long, text[0]))
+                else:
+                    lines.append ("  --%-*s  " % (max_opt, long))
+
+                for l in text[1:]:
+                    lines.append (big_indent + l)
+
+            # Case 2: we have a short option, so we have to include it
+            # just after the long option
+            else:
+                opt_names = "%s (-%s)" % (long, short)
+                if text:
+                    lines.append ("  --%-*s  %s" %
+                                  (max_opt, opt_names, text[0]))
+                else:
+                    lines.append ("  --%-*s" % opt_names)
+
+        # for self.option_table
+
+        return lines
+
+    # generate_help ()
+
+    def print_help (self, file=None, header=None):
+        if file is None:
+            file = sys.stdout
+        for line in self.generate_help (header):
+            file.write (line + "\n")
+    # print_help ()
+
 # class FancyGetopt
 
 
@@ -330,98 +425,6 @@ def wrap_text (text, width):
 # wrap_text ()
         
 
-def generate_help (options, header=None):
-    """Generate help text (a list of strings, one per suggested line of
-       output) from an option table."""
-
-    # Blithely assume the option table is good: probably wouldn't call
-    # 'generate_help()' unless you've already called 'fancy_getopt()'.
-
-    # First pass: determine maximum length of long option names
-    max_opt = 0
-    for option in options:
-        long = option[0]
-        short = option[1]
-        l = len (long)
-        if long[-1] == '=':
-            l = l - 1
-        if short is not None:
-            l = l + 5                   # " (-x)" where short == 'x'
-        if l > max_opt:
-            max_opt = l
-            
-    opt_width = max_opt + 2 + 2 + 2     # room for indent + dashes + gutter
-
-    # Typical help block looks like this:
-    #   --foo       controls foonabulation
-    # Help block for longest option looks like this:
-    #   --flimflam  set the flim-flam level
-    # and with wrapped text:
-    #   --flimflam  set the flim-flam level (must be between
-    #               0 and 100, except on Tuesdays)
-    # Options with short names will have the short name shown (but
-    # it doesn't contribute to max_opt):
-    #   --foo (-f)  controls foonabulation
-    # If adding the short option would make the left column too wide,
-    # we push the explanation off to the next line
-    #   --flimflam (-l)
-    #               set the flim-flam level
-    # Important parameters:
-    #   - 2 spaces before option block start lines
-    #   - 2 dashes for each long option name
-    #   - min. 2 spaces between option and explanation (gutter)
-    #   - 5 characters (incl. space) for short option name
-
-    # Now generate lines of help text.
-    line_width = 78                     # if 80 columns were good enough for
-    text_width = line_width - opt_width # Jesus, then 78 are good enough for me
-    big_indent = ' ' * opt_width
-    if header:
-        lines = [header]
-    else:
-        lines = ['Option summary:']
-
-    for (long,short,help) in options:
-       
-        text = wrap_text (help, text_width)
-        if long[-1] == '=':
-            long = long[0:-1]
-
-        # Case 1: no short option at all (makes life easy)
-        if short is None:
-            if text:
-                lines.append ("  --%-*s  %s" % (max_opt, long, text[0]))
-            else:
-                lines.append ("  --%-*s  " % (max_opt, long))
-
-            for l in text[1:]:
-                lines.append (big_indent + l)
-
-        # Case 2: we have a short option, so we have to include it
-        # just after the long option
-        else:
-            opt_names = "%s (-%s)" % (long, short)
-            if text:
-                lines.append ("  --%-*s  %s" %
-                              (max_opt, opt_names, text[0]))
-            else:
-                lines.append ("  --%-*s" % opt_names)
-
-    # for loop over options
-
-    return lines
-
-# generate_help ()
-
-
-def print_help (options, file=None, header=None):
-    if file is None:
-        file = sys.stdout
-    for line in generate_help (options, header):
-        file.write (line + "\n")
-# print_help ()
-
-
 class OptionDummy:
     """Dummy class just used as a place to hold command-line option
     values as instance attributes."""

From cae8078a1df69595f030390f134fd59452b6db77 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 02:28:14 +0000
Subject: [PATCH 0285/8469] Patch, originally from Bastian Kleineidam and
 savagely mutilated by me, to add the "display metadata" options: --name,
 --version, --author, and so forth.  Main changes:   * added 'display_options'
 class attribute to list all the "display only"     options (--help-commands
 plus the metadata options)   * added DistributionMetadata class as a place to
 put the actual     metadata information from the setup script (not to be
 confused with     the metadata display options); the logic dealing with
 metadata     (eg. return self.name or "UNKNOWN") is now  in this class   *
 changed 'parse_command_line()' to use the new OO interface provided     by
 fancy_getopt, mainly so we can get at the original order of     options on
 the command line, so we can print multiple lines of     distribution
 meta-data in the order specified by the user   * added
 'handle_display_options()' to handle display-only options Also fixed some
 crufty old comments/docstrings.

---
 dist.py | 243 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 193 insertions(+), 50 deletions(-)

diff --git a/dist.py b/dist.py
index 408b9f5c50..bedd9d252a 100644
--- a/dist.py
+++ b/dist.py
@@ -12,7 +12,7 @@
 from types import *
 from copy import copy
 from distutils.errors import *
-from distutils.fancy_getopt import fancy_getopt, print_help
+from distutils.fancy_getopt import FancyGetopt, longopt_xlate
 
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
@@ -40,8 +40,8 @@ class Distribution:
 
 
     # 'global_options' describes the command-line options that may be
-    # supplied to the client (setup.py) prior to any actual commands.
-    # Eg. "./setup.py -nv" or "./setup.py --verbose" both take advantage of
+    # supplied to the setup script prior to any actual commands.
+    # Eg. "./setup.py -n" or "./setup.py --quiet" both take advantage of
     # these global options.  This list should be kept to a bare minimum,
     # since every global option is also valid as a command option -- and we
     # don't want to pollute the commands with too many options that they
@@ -53,8 +53,47 @@ class Distribution:
                       ('dry-run', 'n',
                        "don't actually do anything"),
                       ('help', 'h',
-                       "show this help message"),
+                       "show this help message, plus help for any commands " +
+                       "given on the command-line"),
                      ]
+
+    # options that are not propagated to the commands
+    display_options = [
+        ('help-commands', None,
+         "list all available commands"),
+        ('name', None,
+         "print package name"),
+        ('version', 'V',
+         "print package version"),
+        ('fullname', None,
+         "print <package name>-<version>"),
+        ('author', None,
+         "print the author's name"),
+        ('author-email', None,
+         "print the author's email address"),
+        ('maintainer', None,
+         "print the maintainer's name"),
+        ('maintainer-email', None,
+         "print the maintainer's email address"),
+        ('contact', None,
+         "print the name of the maintainer if present, "
+         "else author"),
+        ('contact-email', None,
+         "print the email of the maintainer if present, "
+         "else author"),
+        ('url', None,
+         "print the URL for this package"),
+        ('licence', None,
+         "print the licence of the package"),
+        ('license', None,
+         "alias for --licence"),
+        ('description', None,
+         "print the package description"),
+        ]
+    display_option_names = map(lambda x: string.translate(x[0], longopt_xlate),
+                           display_options)
+
+    # negative options are options that exclude other options
     negative_opt = {'quiet': 'verbose'}
 
 
@@ -75,31 +114,28 @@ def __init__ (self, attrs=None):
         self.verbose = 1
         self.dry_run = 0
         self.help = 0
-        self.help_commands = 0
-
-        # And the "distribution meta-data" options -- these can only
-        # come from setup.py (the caller), not the command line
-        # (or a hypothetical config file).
-        self.name = None
-        self.version = None
-        self.author = None
-        self.author_email = None
-        self.maintainer = None
-        self.maintainer_email = None
-        self.url = None
-        self.licence = None
-        self.description = None
+        for attr in self.display_option_names:
+            setattr(self, attr, 0)
+
+        # Store the distribution meta-data (name, version, author, and so
+        # forth) in a separate object -- we're getting to have enough
+        # information here (and enough command-line options) that it's
+        # worth it.  Also delegate 'get_XXX()' methods to the 'metadata'
+        # object in a sneaky and underhanded (but efficient!) way.
+        self.metadata = DistributionMetadata ()
+        for attr in dir(self.metadata):
+            meth_name = "get_" + attr
+            setattr(self, meth_name, getattr(self.metadata, meth_name))
 
         # 'cmdclass' maps command names to class objects, so we
         # can 1) quickly figure out which class to instantiate when
         # we need to create a new command object, and 2) have a way
-        # for the client to override command classes
+        # for the setup script to override command classes
         self.cmdclass = {}
 
         # These options are really the business of various commands, rather
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.
-        # dictionary.        
         self.packages = None
         self.package_dir = None
         self.py_modules = None
@@ -128,8 +164,9 @@ def __init__ (self, attrs=None):
         self.have_run = {}
 
         # Now we'll use the attrs dictionary (ultimately, keyword args from
-        # the client) to possibly override any or all of these distribution
-        # options.        
+        # the setup script) to possibly override any or all of these
+        # distribution options.
+
         if attrs:
 
             # Pull out the set of command options and work on them
@@ -149,7 +186,9 @@ def __init__ (self, attrs=None):
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
-                if hasattr (self, key):
+                if hasattr (self.metadata, key):
+                    setattr (self.metadata, key, val)
+                elif hasattr (self, key):
                     setattr (self, key, val)
                 else:
                     raise DistutilsSetupError, \
@@ -192,19 +231,17 @@ def parse_command_line (self, args):
         # happen until we know what the command is.
 
         self.commands = []
-        options = self.global_options + \
-                  [('help-commands', None,
-                    "list all available commands")]
-        args = fancy_getopt (options, self.negative_opt,
-                             self, sys.argv[1:])
+        parser = FancyGetopt (self.global_options + self.display_options)
+        parser.set_negative_aliases (self.negative_opt)
+        args = parser.getopt (object=self)
+        option_order = parser.get_option_order()
 
-        # User just wants a list of commands -- we'll print it out and stop
-        # processing now (ie. if they ran "setup --help-commands foo bar",
-        # we ignore "foo bar").
-        if self.help_commands:
-            self.print_commands ()
-            print
-            print usage
+        # Handle aliases (license == licence)
+        if self.license:
+            self.licence = 1
+
+        # for display options we return immediately
+        if self.handle_display_options(option_order):
             return
             
         while args:
@@ -246,15 +283,17 @@ def parse_command_line (self, args):
                 negative_opt = copy (negative_opt)
                 negative_opt.update (cmd_obj.negative_opt)
 
-            options = self.global_options + cmd_obj.user_options
-            args = fancy_getopt (options, negative_opt,
-                                 cmd_obj, args[1:])
+            parser.set_option_table (self.global_options +
+                                     cmd_obj.user_options)
+            parser.set_negative_aliases (negative_opt)
+            args = parser.getopt (args[1:], cmd_obj)
             if cmd_obj.help:
-                print_help (self.global_options,
-                            header="Global options:")
+                parser.set_option_table (self.global_options)
+                parser.print_help ("Global options:")
                 print
-                print_help (cmd_obj.user_options,
-                            header="Options for '%s' command:" % command)
+
+                parser.set_option_table (cmd_obj.user_options)
+                parser.print_help ("Options for '%s' command:" % command)
                 print
                 print usage
                 return
@@ -271,13 +310,23 @@ def parse_command_line (self, args):
         # get help on a command, but I support it because that's how
         # CVS does it -- might as well be consistent.)
         if self.help:
-            print_help (self.global_options, header="Global options:")
+            parser.set_option_table (self.global_options)
+            parser.print_help (
+                "Global options (apply to all commands, " +
+                "or can be used per command):")
             print
 
+            if not self.commands:
+                parser.set_option_table (self.display_options)
+                parser.print_help (
+                    "Information display options (just display " +
+                    "information, ignore any commands)")
+                print
+
             for command in self.commands:
                 klass = self.find_command_class (command)
-                print_help (klass.user_options,
-                            header="Options for '%s' command:" % command)
+                parser.set_option_table (klass.user_options)
+                parser.print_help ("Options for '%s' command:" % command)
                 print
 
             print usage
@@ -292,6 +341,40 @@ def parse_command_line (self, args):
 
     # parse_command_line()
 
+    def handle_display_options (self, option_order):
+        """If there were any non-global "display-only" options
+         (--help-commands or the metadata display options) on the command
+         line, display the requested info and return true; else return
+         false."""
+
+        from distutils.core import usage
+
+        # User just wants a list of commands -- we'll print it out and stop
+        # processing now (ie. if they ran "setup --help-commands foo bar",
+        # we ignore "foo bar").
+        if self.help_commands:
+            self.print_commands ()
+            print
+            print usage
+            return 1
+
+        # If user supplied any of the "display metadata" options, then
+        # display that metadata in the order in which the user supplied the
+        # metadata options.
+        any_display_options = 0
+        is_display_option = {}
+        for option in self.display_options:
+            is_display_option[option[0]] = 1
+
+        for (opt, val) in option_order:
+            if val and is_display_option.get(opt):
+                opt = string.translate (opt, longopt_xlate)
+                print getattr(self.metadata, "get_"+opt)()
+                any_display_options = 1
+
+        return any_display_options
+
+    # handle_display_options()
 
     def print_command_list (self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
@@ -437,7 +520,7 @@ def announce (self, msg, level=1):
 
 
     def run_commands (self):
-        """Run each command that was seen on the client command line.
+        """Run each command that was seen on the setup script command line.
            Uses the list of commands found and cache of command objects
            created by 'create_command_obj()'."""
 
@@ -532,14 +615,74 @@ def is_pure (self):
                 not self.has_ext_modules() and
                 not self.has_c_libraries())
 
+    # -- Metadata query methods ----------------------------------------
+
+    # If you're looking for 'get_name()', 'get_version()', and so forth,
+    # they are defined in a sneaky way: the constructor binds self.get_XXX
+    # to self.metadata.get_XXX.  The actual code is in the
+    # DistributionMetadata class, below.
+
+# class Distribution
+
+
+class DistributionMetadata:
+    """Dummy class to hold the distribution meta-data: name, version,
+    author, and so forth."""
+
+    def __init__ (self):
+        self.name = None
+        self.version = None
+        self.author = None
+        self.author_email = None
+        self.maintainer = None
+        self.maintainer_email = None
+        self.url = None
+        self.licence = None
+        self.description = None
+        
+    # -- Metadata query methods ----------------------------------------
+
     def get_name (self):
         return self.name or "UNKNOWN"
 
-    def get_full_name (self):
-        return "%s-%s" % ((self.name or "UNKNOWN"), (self.version or "???"))
-    
-# class Distribution
+    def get_version(self):
+        return self.version or "???"
+
+    def get_fullname (self):
+        return "%s-%s" % (self.get_name(), self.get_version())
+
+    def get_author(self):
+        return self.author or "UNKNOWN"
 
+    def get_author_email(self):
+        return self.author_email or "UNKNOWN"
+
+    def get_maintainer(self):
+        return self.maintainer or "UNKNOWN"
+
+    def get_maintainer_email(self):
+        return self.maintainer_email or "UNKNOWN"
+
+    def get_contact(self):
+        return (self.maintainer or
+                self.author or
+                "UNKNOWN")
+
+    def get_contact_email(self):
+        return (self.maintainer_email or
+                self.author_email or
+                "UNKNOWN")
+
+    def get_url(self):
+        return self.url or "UNKNOWN"
+
+    def get_licence(self):
+        return self.licence or "UNKNOWN"
+
+    def get_description(self):
+        return self.description or "UNKNOWN"
+    
+# class DistributionMetadata
 
 if __name__ == "__main__":
     dist = Distribution ()

From 56ff5710cb6403a6135fdb2104a3545a27cdff64 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 02:31:07 +0000
Subject: [PATCH 0286/8469] Added 'has_option()', 'get_attr_name()' methods.

---
 fancy_getopt.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index c8112331a0..cfebab4920 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -105,6 +105,19 @@ def add_option (self, long_option, short_option=None, help_string=None):
             self.option_table.append (option)
             self.option_index[long_option] = option
 
+
+    def has_option (self, long_option):
+        """Return true if the option table for this parser has an
+        option with long name 'long_option'."""
+        return self.option_index.has_key(long_option)
+
+    def get_attr_name (self, long_option):
+        """Translate long option name 'long_option' to the form it 
+        has as an attribute of some object: ie., translate hyphens
+        to underscores."""
+        return string.translate (long_option, longopt_xlate)
+
+
     def set_negative_aliases (self, negative_alias):
         """Set the negative aliases for this option parser.
         'negative_alias' should be a dictionary mapping option names to
@@ -183,7 +196,7 @@ def _grok_option_table (self):
                       ("invalid long option name '%s' " +
                        "(must be letters, numbers, hyphens only") % long
 
-            self.attr_name[long] = string.translate (long, longopt_xlate)
+            self.attr_name[long] = self.get_attr_name (long)
             if short:
                 self.short_opts.append (short)
                 self.short2long[short[0]] = long

From fe34d8a966eede0315681b03ec003d9b8fb0c681 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 04:22:01 +0000
Subject: [PATCH 0287/8469] Added the capability for alias options.

---
 fancy_getopt.py | 48 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index cfebab4920..629da29eef 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -66,6 +66,10 @@ def __init__ (self, option_table=None):
         if self.option_table:
             self._build_index()
 
+        # 'alias' records (duh) alias options; {'foo': 'bar'} means
+        # --foo is an alias for --bar
+        self.alias = {}
+
         # 'negative_alias' keeps track of options that are the boolean
         # opposite of some other option
         self.negative_alias = {}
@@ -118,23 +122,29 @@ def get_attr_name (self, long_option):
         return string.translate (long_option, longopt_xlate)
 
 
+    def _check_alias_dict (self, aliases, what):
+        assert type(aliases) is DictionaryType
+        for (alias, opt) in aliases.items():
+            if not self.option_index.has_key(alias):
+                raise DistutilsGetoptError, \
+                      ("invalid %s '%s': "
+                       "option '%s' not defined") % (what, alias, alias)
+            if not self.option_index.has_key(opt):
+                raise DistutilsGetoptError, \
+                      ("invalid %s '%s': "
+                       "aliased option '%s' not defined") % (what, alias, opt)
+        
+    def set_aliases (self, alias):
+        """Set the aliases for this option parser."""
+        self._check_alias_dict (alias, "alias")
+        self.alias = alias
+
     def set_negative_aliases (self, negative_alias):
         """Set the negative aliases for this option parser.
         'negative_alias' should be a dictionary mapping option names to
         option names, both the key and value must already be defined
         in the option table."""
-
-        assert type(negative_alias) is DictionaryType
-        for (negopt, opt) in negative_alias.items():
-            if not self.option_index.has_key(negopt):
-                raise DistutilsGetoptError, \
-                      ("invalid negative alias '%s': "
-                       "option '%s' not defined") % (negopt, negopt)
-            if not self.option_index.has_key(opt):
-                raise DistutilsGetoptError, \
-                      ("invalid negative alias '%s': "
-                       "aliased option '%s' not defined") % (negopt, opt)
-
+        self._check_alias_dict (negative_alias, "negative alias")
         self.negative_alias = negative_alias
 
 
@@ -186,6 +196,16 @@ def _grok_option_table (self):
                 else:
                     self.takes_arg[long] = 0
 
+            # If this is an alias option, make sure its "takes arg" flag is
+            # the same as the option it's aliased to.
+            alias_to = self.alias.get(long)
+            if alias_to is not None:
+                if self.takes_arg[long] != self.takes_arg[alias_to]:
+                    raise DistutilsGetoptError, \
+                          ("invalid alias '%s': inconsistent with "
+                           "aliased option '%s' (one of them takes a value, "
+                           "the other doesn't") % (long, alias_to)
+
 
             # Now enforce some bondage on the long option name, so we can
             # later translate it to an attribute name on some object.  Have
@@ -243,6 +263,10 @@ def getopt (self, args=None, object=None):
                 raise DistutilsInternalError, \
                       "this can't happen: bad option string '%s'" % opt
 
+            alias = self.alias.get(opt)
+            if alias:
+                opt = alias
+
             if not self.takes_arg[opt]:     # boolean option?
                 if val != '':               # shouldn't have a value!
                     raise DistutilsInternalError, \

From 7ee4ef65de0dc64230420e7ed910385384094967 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 04:22:49 +0000
Subject: [PATCH 0288/8469] Fixed the '--license' option so it's officially an
 alias for '--licence', and now actually works.

---
 dist.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dist.py b/dist.py
index bedd9d252a..a209212778 100644
--- a/dist.py
+++ b/dist.py
@@ -233,13 +233,10 @@ def parse_command_line (self, args):
         self.commands = []
         parser = FancyGetopt (self.global_options + self.display_options)
         parser.set_negative_aliases (self.negative_opt)
+        parser.set_aliases ({'license': 'licence'})
         args = parser.getopt (object=self)
         option_order = parser.get_option_order()
 
-        # Handle aliases (license == licence)
-        if self.license:
-            self.licence = 1
-
         # for display options we return immediately
         if self.handle_display_options(option_order):
             return

From e90d86fe9ee732ff165ac44bf174312ac828e9c9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 04:31:10 +0000
Subject: [PATCH 0289/8469] Patch from Andrew Kuchling: allow multiple
 include/exclude patterns for all commands except 'prune' and 'graft'.

---
 command/sdist.py | 103 +++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 48 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f3cc041e7d..59dd624813 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -310,24 +310,25 @@ def read_template (self):
             # for the given action (which is the first word)
             if action in ('include','exclude',
                           'global-include','global-exclude'):
-                if len (words) != 2:
+                if len (words) < 2:
                     template.warn \
                         ("invalid manifest template line: " +
-                         "'%s' expects a single <pattern>" %
+                         "'%s' expects <pattern1> <pattern2> ..." %
                          action)
                     continue
 
-                pattern = native_path (words[1])
+                pattern_list = map(native_path, words[1:])
 
             elif action in ('recursive-include','recursive-exclude'):
-                if len (words) != 3:
+                if len (words) < 3:
                     template.warn \
                         ("invalid manifest template line: " +
-                         "'%s' expects <dir> <pattern>" %
+                         "'%s' expects <dir> <pattern1> <pattern2> ..." %
                          action)
                     continue
 
-                (dir, pattern) = map (native_path, words[1:3])
+                dir = native_path(words[1])
+                pattern_list = map (native_path, words[2:])
 
             elif action in ('graft','prune'):
                 if len (words) != 2:
@@ -352,58 +353,64 @@ def read_template (self):
             # digging stuff up out of 'words'.
 
             if action == 'include':
-                print "include", pattern
-                files = select_pattern (all_files, pattern, anchor=1)
-                if not files:
-                    template.warn ("no files found matching '%s'" % pattern)
-                else:
-                    self.files.extend (files)
+                print "include", string.join(pattern_list)
+                for pattern in pattern_list:
+                    files = select_pattern (all_files, pattern, anchor=1)
+                    if not files:
+                        template.warn ("no files found matching '%s'" % pattern)
+                    else:
+                        self.files.extend (files)
 
             elif action == 'exclude':
-                print "exclude", pattern
-                num = exclude_pattern (self.files, pattern, anchor=1)
-                if num == 0:
-                    template.warn \
-                        ("no previously-included files found matching '%s'" %
-                         pattern)
+                print "exclude", string.join(pattern_list)
+                for pattern in pattern_list:
+                    num = exclude_pattern (self.files, pattern, anchor=1)
+                    if num == 0:
+                        template.warn (
+                            "no previously-included files found matching '%s'"%
+                            pattern)
 
             elif action == 'global-include':
-                print "global-include", pattern
-                files = select_pattern (all_files, pattern, anchor=0)
-                if not files:
-                    template.warn (("no files found matching '%s' " +
-                                    "anywhere in distribution") %
-                                   pattern)
-                else:
-                    self.files.extend (files)
+                print "global-include", string.join(pattern_list)
+                for pattern in pattern_list:
+                    files = select_pattern (all_files, pattern, anchor=0)
+                    if not files:
+                        template.warn (("no files found matching '%s' " +
+                                        "anywhere in distribution") %
+                                       pattern)
+                    else:
+                        self.files.extend (files)
 
             elif action == 'global-exclude':
-                print "global-exclude", pattern
-                num = exclude_pattern (self.files, pattern, anchor=0)
-                if num == 0:
-                    template.warn \
-                        (("no previously-included files matching '%s' " +
-                          "found anywhere in distribution") %
-                         pattern)
+                print "global-exclude", string.join(pattern_list)
+                for pattern in pattern_list:
+                    num = exclude_pattern (self.files, pattern, anchor=0)
+                    if num == 0:
+                        template.warn \
+                            (("no previously-included files matching '%s' " +
+                              "found anywhere in distribution") %
+                             pattern)
 
             elif action == 'recursive-include':
-                print "recursive-include", dir, pattern
-                files = select_pattern (all_files, pattern, prefix=dir)
-                if not files:
-                    template.warn (("no files found matching '%s' " +
-                                    "under directory '%s'") %
-                                   (pattern, dir))
-                else:
-                    self.files.extend (files)
+                print "recursive-include", dir, string.join(pattern_list)
+                for pattern in pattern_list:
+                    files = select_pattern (all_files, pattern, prefix=dir)
+                    if not files:
+                        template.warn (("no files found matching '%s' " +
+                                        "under directory '%s'") %
+                                       (pattern, dir))
+                    else:
+                        self.files.extend (files)
 
             elif action == 'recursive-exclude':
-                print "recursive-exclude", dir, pattern
-                num = exclude_pattern (self.files, pattern, prefix=dir)
-                if num == 0:
-                    template.warn \
-                        (("no previously-included files matching '%s' " +
-                          "found under directory '%s'") %
-                         (pattern, dir))
+                print "recursive-exclude", dir, string.join(pattern_list)
+                for pattern in pattern_list:
+                    num = exclude_pattern (self.files, pattern, prefix=dir)
+                    if num == 0:
+                        template.warn \
+                            (("no previously-included files matching '%s' " +
+                              "found under directory '%s'") %
+                             (pattern, dir))
 
             elif action == 'graft':
                 print "graft", dir_pattern

From bf586ddbeea4df44ebf9a21a17e12243bad0a327 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 21 Apr 2000 04:37:12 +0000
Subject: [PATCH 0290/8469] Fix 'check_metadata()' so it grovels through the
 distribution's metadata object, rather than through the distribution itself
 (since I moved the meta- data out to a DistributionMetadata instance).

---
 command/sdist.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 59dd624813..43007d5970 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -107,23 +107,23 @@ def run (self):
 
     def check_metadata (self):
 
-        dist = self.distribution
+        metadata = self.distribution.metadata
 
         missing = []
         for attr in ('name', 'version', 'url'):
-            if not (hasattr (dist, attr) and getattr (dist, attr)):
+            if not (hasattr (metadata, attr) and getattr (metadata, attr)):
                 missing.append (attr)
 
         if missing:
             self.warn ("missing required meta-data: " +
                        string.join (missing, ", "))
 
-        if dist.author:
-            if not dist.author_email:
+        if metadata.author:
+            if not metadata.author_email:
                 self.warn ("missing meta-data: if 'author' supplied, " +
                            "'author_email' must be supplied too")
-        elif dist.maintainer:
-            if not dist.maintainer_email:
+        elif metadata.maintainer:
+            if not metadata.maintainer_email:
                 self.warn ("missing meta-data: if 'maintainer' supplied, " +
                            "'maintainer_email' must be supplied too")
         else:

From 5a78411da74f438590a1d76d71213a5b667c379e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 02:51:25 +0000
Subject: [PATCH 0291/8469] Changed to call 'get_fullname()', not
 'get_full_name()', on Distribution object.

---
 command/bdist_dumb.py | 2 +-
 command/sdist.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 5456e57ac3..0a68d00a09 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -70,7 +70,7 @@ def run (self):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
-        archive_basename = "%s.%s" % (self.distribution.get_full_name(),
+        archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       get_platform())
         print "output_dir = %s" % output_dir
         print "self.format = %s" % self.format
diff --git a/command/sdist.py b/command/sdist.py
index 43007d5970..2cf8e385b8 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -502,7 +502,7 @@ def make_distribution (self):
 
         # Don't warn about missing meta-data here -- should be (and is!)
         # done elsewhere.
-        base_dir = self.distribution.get_full_name()
+        base_dir = self.distribution.get_fullname()
 
         # Remove any files that match "base_dir" from the fileset -- we
         # don't want to go distributing the distribution inside itself!

From 9a32e742ff8308ffcf088fe46eb527fbffd0e812 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 02:52:44 +0000
Subject: [PATCH 0292/8469] Fix how we generate the meta-data query methods to
 include 'get_fullname()' and the other "composite meta-data" methods.

---
 dist.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dist.py b/dist.py
index a209212778..4a83c794ff 100644
--- a/dist.py
+++ b/dist.py
@@ -123,9 +123,11 @@ def __init__ (self, attrs=None):
         # worth it.  Also delegate 'get_XXX()' methods to the 'metadata'
         # object in a sneaky and underhanded (but efficient!) way.
         self.metadata = DistributionMetadata ()
-        for attr in dir(self.metadata):
-            meth_name = "get_" + attr
-            setattr(self, meth_name, getattr(self.metadata, meth_name))
+        method_basenames = dir(self.metadata) + \
+                           ['fullname', 'contact', 'contact_email']
+        for basename in method_basenames:
+            method_name = "get_" + basename
+            setattr(self, method_name, getattr(self.metadata, method_name))
 
         # 'cmdclass' maps command names to class objects, so we
         # can 1) quickly figure out which class to instantiate when

From 71ceb366185124bc76998bd06c7ef6676f7d7827 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 03:09:56 +0000
Subject: [PATCH 0293/8469] Extracted the "what-do-I-do-for-this-format" logic
 from code in   'make_archive()' to a global static dictionary,
 ARCHIVE_FORMATS. Added 'check_archive_formats()', which obviously makes good
 use of   this dictionary.

---
 archive_util.py | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index a28eed1ad8..bae425be06 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -102,6 +102,20 @@ def visit (z, dirname, names):
 # make_zipfile ()
 
 
+ARCHIVE_FORMATS = {
+    'gztar': (make_tarball, [('compress', 'gzip')]),
+    'ztar':  (make_tarball, [('compress', 'compress')]),
+    'tar':   (make_tarball, [('compress', None)]),
+    'zip':   (make_zipfile, [])
+    }
+
+def check_archive_formats (formats):
+    for format in formats:
+        if not ARCHIVE_FORMATS.has_key(format):
+            return format
+    else:
+        return None
+
 def make_archive (base_name, format,
                   root_dir=None, base_dir=None,
                   verbose=0, dry_run=0):
@@ -130,18 +144,14 @@ def make_archive (base_name, format,
     kwargs = { 'verbose': verbose,
                'dry_run': dry_run }
     
-    if format == 'gztar':
-        func = make_tarball
-        kwargs['compress'] = 'gzip'
-    elif format == 'ztar':
-        func = make_tarball
-        kwargs['compress'] = 'compress'
-    elif format == 'tar':
-        func = make_tarball
-        kwargs['compress'] = None
-    elif format == 'zip':
-        func = make_zipfile
+    try:
+        format_info = ARCHIVE_FORMATS[format]
+    except KeyError:
+        raise ValueError, "unknown archive format '%s'" % format
 
+    func = format_info[0]
+    for (arg,val) in format_info[1]:
+        kwargs[arg] = val
     apply (func, (base_name, base_dir), kwargs)
 
     if root_dir is not None:

From ff4f4d515fa616a7480b7a3be0d42fb6b10cf7d5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 03:11:17 +0000
Subject: [PATCH 0294/8469] Catch DistutilsOptionError in 'setup()' -- it's
 thrown either because of errors in the setup script or on the command line,
 so shouldn't result in a traceback.

---
 core.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 9a801063c7..814f4418c1 100644
--- a/core.py
+++ b/core.py
@@ -96,7 +96,9 @@ def setup (**attrs):
                       "error: %s: %s" % (exc.filename, exc.strerror)
             else:
                 raise SystemExit, str (exc)
-        except (DistutilsExecError, DistutilsFileError), msg:
+        except (DistutilsExecError,
+                DistutilsFileError,
+                DistutilsOptionError), msg:
             raise SystemExit, "error: " + str (msg)
 
 # setup ()

From b106a335675ced0bd73d4a70addc388feef883e4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 03:11:55 +0000
Subject: [PATCH 0295/8469] Check that 'self.formats' is good early on.

---
 command/sdist.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 2cf8e385b8..8aa4618ecc 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,10 +11,10 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import \
-     newer, create_tree, remove_tree, make_tarball, make_zipfile, native_path
+from distutils.util import newer, create_tree, remove_tree, native_path
+from distutils.archive_util import check_archive_formats
 from distutils.text_file import TextFile
-from distutils.errors import DistutilsExecError
+from distutils.errors import DistutilsExecError, DistutilsOptionError
 
 
 class sdist (Command):
@@ -81,6 +81,11 @@ def finalize_options (self):
         elif type (self.formats) is StringType:
             self.formats = string.split (self.formats, ',')
 
+        bad_format = check_archive_formats (self.formats)
+        if bad_format:
+            raise DistutilsOptionError, \
+                  "unknown archive format '%s'" % bad_format
+
 
     def run (self):
 

From b99aaeebb214b61283c589940ed59489353062f8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 03:20:49 +0000
Subject: [PATCH 0296/8469] Merged in code from the 0.1.5 release to handle
 IOError and OSError exceptions better.

---
 core.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core.py b/core.py
index 814f4418c1..4b6969284b 100644
--- a/core.py
+++ b/core.py
@@ -9,7 +9,7 @@
 
 __revision__ = "$Id$"
 
-import sys
+import sys, os
 from types import *
 from distutils.errors import *
 from distutils.dist import Distribution
@@ -89,13 +89,19 @@ def setup (**attrs):
             dist.run_commands ()
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
-        except (OSError, IOError), exc:
-            # arg, try to work with Python pre-1.5.2
+        except (IOError, os.error), exc:
+            # check for Python 1.5.2-style {IO,OS}Error exception objects
             if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
-                raise SystemExit, \
-                      "error: %s: %s" % (exc.filename, exc.strerror)
+                if exc.filename:
+                    raise SystemExit, \
+                          "error: %s: %s" % (exc.filename, exc.strerror)
+                else:
+                    # two-argument functions in posix module don't
+                    # include the filename in the exception object!
+                    raise SystemExit, \
+                          "error: %s" % exc.strerror
             else:
-                raise SystemExit, str (exc)
+                raise SystemExit, "error: " + exc[-1]
         except (DistutilsExecError,
                 DistutilsFileError,
                 DistutilsOptionError), msg:

From c0aaf184cfb98c03241a7a455720f56074e1877d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 15:14:58 +0000
Subject: [PATCH 0297/8469] Merged in Python 1.5.1 compatibility changes from
 the 0.1.3 branch: added 'abspath()' and 'extend()'.

---
 util.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/util.py b/util.py
index be3a1d6e0f..9c436b9474 100644
--- a/util.py
+++ b/util.py
@@ -18,6 +18,30 @@
 from distutils.archive_util import *
 
 
+# Need to define 'abspath()', because it was new with Python 1.5.2
+if hasattr (os.path, 'abspath'):
+    abspath = os.path.abspath
+else:
+    def abspath(path):
+        if not os.path.isabs(path):
+            path = os.path.join(os.getcwd(), path)
+        return os.path.normpath(path)
+
+
+# More backwards compatability hacks
+def extend (list, new_list):
+    """Appends the list 'new_list' to 'list', just like the 'extend()'
+       list method does in Python 1.5.2 -- but this works on earlier
+       versions of Python too."""
+
+    if hasattr (list, 'extend'):
+        list.extend (new_list)
+    else:
+        list[len(list):] = new_list
+
+# extend ()
+
+
 def get_platform ():
     """Return a string (suitable for tacking onto directory names) that
        identifies the current platform.  Under Unix, identifies both the OS

From 32155114f6d362c883a9d0f7e337ab91bf7a2187 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 22 Apr 2000 15:17:14 +0000
Subject: [PATCH 0298/8469] Sporadic, untested Python 1.5.1 compatibility
 changes.

---
 file_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/file_util.py b/file_util.py
index 91545abb18..32245109d5 100644
--- a/file_util.py
+++ b/file_util.py
@@ -141,7 +141,7 @@ def copy_file (src, dst,
         import macostools
         try:
             macostools.copy (src, dst, 0, preserve_times)
-        except OSError, exc:
+        except os.error, exc:
             raise DistutilsFileError, \
                   "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
     

From cc06f983649b572614316eeaf64846a5dcecd5bf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 23 Apr 2000 02:50:45 +0000
Subject: [PATCH 0299/8469] Patch from Harry Henry Gebel: fix two stupid bugs
 in help-printing stuff.

---
 fancy_getopt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 629da29eef..39450e8079 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -304,7 +304,7 @@ def get_option_order (self):
             return self.option_order
 
 
-    def generate_help (header=None):
+    def generate_help (self, header=None):
         """Generate help text (a list of strings, one per suggested line of
         output) from the option table for this FancyGetopt object."""
 
@@ -388,7 +388,7 @@ def generate_help (header=None):
 
     # generate_help ()
 
-    def print_help (self, file=None, header=None):
+    def print_help (self, header=None, file=None):
         if file is None:
             file = sys.stdout
         for line in self.generate_help (header):

From 2db555c9b072cb91541f1f9a98d3398fde1a8601 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 25 Apr 2000 01:33:11 +0000
Subject: [PATCH 0300/8469] Lyle Johnson: fixed broken logic in
 'native_path()'.

---
 util.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/util.py b/util.py
index 9c436b9474..ca20ae047a 100644
--- a/util.py
+++ b/util.py
@@ -72,13 +72,13 @@ def native_path (pathname):
         raise ValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
-    if os.sep != '/' and os.sep in pathname:
-        raise ValueError, \
-              "path '%s' cannot contain '%c' character" % \
-              (pathname, os.sep)
-
-        paths = string.split (pathname, '/')
-        return apply (os.path.join, paths)
+    if os.sep != '/':
+       if os.sep in pathname:
+            raise ValueError, \
+              "path '%s' cannot contain '%c' character" % (pathname, os.sep)
+       else:
+            paths = string.split (pathname, '/')
+            return apply (os.path.join, paths)
     else:
         return pathname
 

From b2fe902127ca56285d80dbc3befd671ad467ba7c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 25 Apr 2000 01:38:20 +0000
Subject: [PATCH 0301/8469] Harry Henry Gebel: Adds bztar format to generate
 .tar.bz2 tarballs

Uses the -f argument to overright old tarballs automatically, I am
assuming that if the old tarball was wanted it would have been moved or
else the version number would have been changed.

Uses the -9 argument to bzip2 and gzip to use maximum
compression. Compress uses the maximum compression by default.

Tests for correct value for the 'compress' argument of make_tarball. This
is one less place for someone adding new compression programs to forget to
change.
---
 archive_util.py  | 24 ++++++++++++++++--------
 command/bdist.py |  4 +++-
 command/sdist.py |  3 +--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index bae425be06..050ea41796 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -15,12 +15,12 @@
 def make_tarball (base_name, base_dir, compress="gzip",
                   verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
-       'base_dir'.  'compress' must be "gzip" (the default), "compress", or
-       None.  Both "tar" and the compression utility named by 'compress'
-       must be on the default program search path, so this is probably
-       Unix-specific.  The output tar file will be named 'base_dir' +
-       ".tar", possibly plus the appropriate compression extension
-       (".gz" or ".Z").  Return the output filename."""
+       'base_dir'.  'compress' must be "gzip" (the default), "compress",
+       "bzip2", or None.  Both "tar" and the compression utility named by
+       'compress' must be on the default program search path, so this is
+       probably Unix-specific.  The output tar file will be named 'base_dir'
+       + ".tar", possibly plus the appropriate compression extension (".gz",
+       ".bz2" or ".Z").  Return the output filename."""
 
     # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
     # It's pretty new, though, so we certainly can't require it --
@@ -29,9 +29,15 @@ def make_tarball (base_name, base_dir, compress="gzip",
     # detect GNU tar to use its 'z' option and save a step.)
 
     compress_ext = { 'gzip': ".gz",
+                     'bzip2': '.bz2',
                      'compress': ".Z" }
+    
+    # flags for compression program, each element of list will be an argument
+    compress_flags = {'gzip': ["-f9"],
+                      'compress': ["-f"],
+                      'bzip2': ['-f9']}
 
-    if compress is not None and compress not in ('gzip', 'compress'):
+    if compress is not None and compress not in compress_ext.keys():
         raise ValueError, \
               "bad value for 'compress': must be None, 'gzip', or 'compress'"
 
@@ -40,7 +46,8 @@ def make_tarball (base_name, base_dir, compress="gzip",
     spawn (cmd, verbose=verbose, dry_run=dry_run)
 
     if compress:
-        spawn ([compress, archive_name], verbose=verbose, dry_run=dry_run)
+        spawn ([compress] + compress_flags[compress] + [archive_name],
+               verbose=verbose, dry_run=dry_run)
         return archive_name + compress_ext[compress]
     else:
         return archive_name
@@ -104,6 +111,7 @@ def visit (z, dirname, names):
 
 ARCHIVE_FORMATS = {
     'gztar': (make_tarball, [('compress', 'gzip')]),
+    'bztar': (make_tarball, [('compress', 'bzip2')]),
     'ztar':  (make_tarball, [('compress', 'compress')]),
     'tar':   (make_tarball, [('compress', None)]),
     'zip':   (make_zipfile, [])
diff --git a/command/bdist.py b/command/bdist.py
index 685f52508e..cde8dd63e8 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -18,7 +18,8 @@ class bdist (Command):
     description = "create a built (binary) distribution"
 
     user_options = [('format=', 'f',
-                     "format for distribution (tar, ztar, gztar, zip, ... )"),
+                     "format for distribution " +
+                     "(tar, ztar, gztar, bztar, zip, ... )"),
                    ]
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
@@ -27,6 +28,7 @@ class bdist (Command):
                        'nt': 'zip', }
 
     format_command = { 'gztar': 'bdist_dumb',
+                       'bztar': 'bdist_dumb',
                        'ztar':  'bdist_dumb',
                        'tar':   'bdist_dumb',
                        'zip':   'bdist_dumb', }
diff --git a/command/sdist.py b/command/sdist.py
index 8aa4618ecc..8d9a4650bd 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -33,9 +33,8 @@ class sdist (Command):
          "just regenerate the manifest and then stop"),
         ('force-manifest', None,
          "forcibly regenerate the manifest and carry on as usual"),
-
         ('formats=', None,
-         "formats for source distribution (tar, ztar, gztar, or zip)"),
+         "formats for source distribution (tar, ztar, gztar, bztar, or zip)"),
         ('keep-tree', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),

From 9bf82f12921aae17ef321f30eb613aa3678ca513 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 25 Apr 2000 01:55:58 +0000
Subject: [PATCH 0302/8469] Bumped version to 0.8.2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 5b8a662888..32fc276c40 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"

From 622804da554351a32c6a379badb7520673a38060 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 26 Apr 2000 01:12:40 +0000
Subject: [PATCH 0303/8469] Harry Henry Gebel: Fix 'sdist.write_manifest()' to
 respect the value of dry_run.

---
 command/sdist.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 8d9a4650bd..67917188de 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,7 +11,8 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import newer, create_tree, remove_tree, native_path
+from distutils.util import newer, create_tree, remove_tree, native_path, \
+     write_file
 from distutils.archive_util import check_archive_formats
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -447,10 +448,9 @@ def write_manifest (self):
            by 'find_defaults()' and 'read_template()') to the manifest file
            named by 'self.manifest'."""
 
-        manifest = open (self.manifest, "w")
-        for fn in self.files:
-            manifest.write (fn + '\n')
-        manifest.close ()
+        self.execute(write_file,
+                     (self.manifest, self.files),
+                     "writing manifest file")
 
     # write_manifest ()
 

From ed0fd8fbc0c9d218ea3c1dfd6d64936c790080d9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 26 Apr 2000 01:14:33 +0000
Subject: [PATCH 0304/8469] Supply short form for --manifest-only (-o) and
 --force-manifest (-f) options.

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

diff --git a/command/sdist.py b/command/sdist.py
index 67917188de..f644e9fbfb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -30,9 +30,9 @@ class sdist (Command):
         ('use-defaults', None,
          "include the default file set in the manifest "
          "[default; disable with --no-defaults]"),
-        ('manifest-only', None,
+        ('manifest-only', 'o',
          "just regenerate the manifest and then stop"),
-        ('force-manifest', None,
+        ('force-manifest', 'f',
          "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
          "formats for source distribution (tar, ztar, gztar, bztar, or zip)"),

From 36f1d229a8213decc8b304e83dc49b81739b8e4d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 26 Apr 2000 02:26:55 +0000
Subject: [PATCH 0305/8469] Harry Henry Gebel: add 'long_description' to
 DistributionMetadata.

---
 dist.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 4a83c794ff..ae95009fee 100644
--- a/dist.py
+++ b/dist.py
@@ -89,6 +89,8 @@ class Distribution:
          "alias for --licence"),
         ('description', None,
          "print the package description"),
+        ('long-description', None,
+         "print the long package description"),
         ]
     display_option_names = map(lambda x: string.translate(x[0], longopt_xlate),
                            display_options)
@@ -638,6 +640,7 @@ def __init__ (self):
         self.url = None
         self.licence = None
         self.description = None
+        self.long_description = None
         
     # -- Metadata query methods ----------------------------------------
 
@@ -680,7 +683,10 @@ def get_licence(self):
 
     def get_description(self):
         return self.description or "UNKNOWN"
-    
+
+    def get_long_description(self):
+        return self.long_description or "UNKNOWN"
+
 # class DistributionMetadata
 
 if __name__ == "__main__":

From c5f056b71b4498a249e5af284d31ea665ebd2a52 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 26 Apr 2000 02:29:51 +0000
Subject: [PATCH 0306/8469] Harry Henry Gebel: import exception classes.

---
 command/bdist_dumb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 0a68d00a09..23672a63e4 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -11,7 +11,7 @@
 import os
 from distutils.core import Command
 from distutils.util import get_platform, create_tree, remove_tree
-
+from distutils.errors import *
 
 class bdist_dumb (Command):
 

From 48f223a6efaadc98c4e9dd36f41f5f769a0db99d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 26 Apr 2000 02:38:01 +0000
Subject: [PATCH 0307/8469] Hacked things up a bit so that configuration
 variables are expanded in command-line options, and in two phases at that:
 first, we expand 'install_base' and 'install_platbase', and then the other
 'install_*' options.  This lets us do tricky stuff like     install
 --prefix='/tmp$sys_prefix' ...oooh, neat.

Simplified 'select_scheme()' -- it's no longer responsible for expanding
config vars, tildes, etc.

Define installation-specific config vars in 'self.config_vars', rather than
in a local dictionary of one method.  Also factored '_expand_attrs()' out
of 'expand_dirs()' and added 'expand_basedirs()'.

Added a bunch of debugging output so I (and others) can judge the
success of this crazy scheme through direct feedback.
---
 command/install.py | 79 ++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 27 deletions(-)

diff --git a/command/install.py b/command/install.py
index 995fd875c3..98b08cd7c6 100644
--- a/command/install.py
+++ b/command/install.py
@@ -9,6 +9,7 @@
 import sys, os, string
 from types import *
 from distutils.core import Command
+from distutils import sysconfig
 from distutils.util import write_file, native_path, subst_vars
 from distutils.errors import DistutilsOptionError
 
@@ -182,15 +183,47 @@ def finalize_options (self):
         # install_{purelib,platlib,lib,scripts,data,...}, and the
         # INSTALL_SCHEME dictionary above.  Phew!
 
+        from pprint import pprint
+        print "pre-finalize:"
+        pprint (self.__dict__)
+
         if os.name == 'posix':
             self.finalize_unix ()
         else:
             self.finalize_other ()
 
+        print "post-finalize:"
+        pprint (self.__dict__)
+
+        # Expand configuration variables, tilde, etc. in self.install_base
+        # and self.install_platbase -- that way, we can use $base or
+        # $platbase in the other installation directories and not worry
+        # about needing recursive variable expansion (shudder).
+
+        self.config_vars = {'py_version_short': sys.version[0:3],
+                            'sys_prefix': sysconfig.PREFIX,
+                            'sys_exec_prefix': sysconfig.EXEC_PREFIX,
+                           }
+        self.expand_basedirs ()
+
+        print "post-expand_basedirs:"
+        pprint (self.__dict__)
+
+        # Now define config vars for the base directories so we can expand
+        # everything else.
+        self.config_vars['base'] = self.install_base
+        self.config_vars['platbase'] = self.install_platbase
+
+        print "config vars:"
+        pprint (self.config_vars)
+
         # Expand "~" and configuration variables in the installation
         # directories.
         self.expand_dirs ()
 
+        print "post-expand:"
+        pprint (self.__dict__)
+
         # Pick the actual directory to install all modules to: either
         # install_purelib or install_platlib, depending on whether this
         # module distribution is pure or not.  Of course, if the user
@@ -288,40 +321,32 @@ def finalize_other (self):          # Windows and Mac OS for now
 
 
     def select_scheme (self, name):
-
-        # "select a scheme" means:
-        #   - set install-base and install-platbase
-        #   - subst. base/platbase/version into the values of the
-        #     particular scheme dictionary
-        #   - use the resultings strings to set install-lib, etc.
-
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
-
-        vars = { 'base': self.install_base,
-                 'platbase': self.install_platbase,
-                 'py_version_short': sys.version[0:3],
-               }
-
         for key in ('purelib', 'platlib', 'scripts', 'data'):
-            val = subst_vars (scheme[key], vars)
-            setattr (self, 'install_' + key, val)
+            setattr (self, 'install_' + key, scheme[key])
 
 
-    def expand_dirs (self):
+    def _expand_attrs (self, attrs):
+        for attr in attrs:
+            val = getattr (self, attr)
+            if val is not None:
+                if os.name == 'posix':
+                    val = os.path.expanduser (val)
+                val = subst_vars (val, self.config_vars)
+                setattr (self, attr, val)
 
-        # XXX probably don't want to 'expanduser()' on Windows or Mac
-        # XXX should use 'util.subst_vars()' with our own set of
-        #     configuration variables
 
-        for att in ('base', 'platbase',
-                    'purelib', 'platlib', 'lib',
-                    'scripts', 'data'):
-            fullname = "install_" + att
-            val = getattr (self, fullname)
-            if val is not None:
-                setattr (self, fullname,
-                         os.path.expandvars (os.path.expanduser (val)))
+    def expand_basedirs (self):
+        self._expand_attrs (['install_base',
+                             'install_platbase'])        
+
+    def expand_dirs (self):
+        self._expand_attrs (['install_purelib',
+                             'install_platlib',
+                             'install_lib',
+                             'install_scripts',
+                             'install_data',])
 
 
     def handle_extra_path (self):

From 6becff488178f722e192b09ba308afb6417ec772 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Apr 2000 01:53:46 +0000
Subject: [PATCH 0308/8469] Added 'change_root()' to forcibly slap a new root
 directory onto a pathname, even if it's already absolute.  Currently only
 implemented for Unix; I'm not entirely sure of the right thing to do for
 DOS/Windows, and have no clue what to do for Mac OS.

---
 util.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/util.py b/util.py
index ca20ae047a..8e642e16c6 100644
--- a/util.py
+++ b/util.py
@@ -85,6 +85,32 @@ def native_path (pathname):
 # native_path ()
 
 
+def change_root (new_root, pathname):
+
+    """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
+    relative, this is equivalent to "os.path.join(new_root,pathname)".
+    Otherwise, it requires making 'pathname' relative and then joining the
+    two, which is tricky on DOS/Windows and Mac OS."""
+
+    if not abspath (pathname):
+        return os.path.join (new_root, pathname)
+
+    elif os.name == 'posix':
+        return os.path.join (new_root, pathname[1:])
+
+    elif os.name == 'nt':
+        (root_drive, root_path) = os.path.splitdrive (new_root)
+        (drive, path) = os.path.splitdrive (pathname)
+        raise RuntimeError, "I give up -- not sure how to do this on Windows"
+
+    elif os.name == 'mac':
+        raise RuntimeError, "no clue how to do this on Mac OS"
+
+    else:
+        raise DistutilsPlatformError, \
+              "nothing known about platform '%s'" % os.name
+
+
 def _check_environ ():
     """Ensure that 'os.environ' has all the environment variables we
        guarantee that users can use in config files, command-line

From edd515dffffa31cf704c25c1bd4138ba4f6c85d1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Apr 2000 01:56:38 +0000
Subject: [PATCH 0309/8469] Added the "--root" option as a sort of
 meta-install-base; if supplied,   it is forcibly prepended onto all
 installation directories, even if   they are already absolute. Added
 'dump_dirs()' to clean up the debug output a bit.

---
 command/install.py | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/command/install.py b/command/install.py
index 98b08cd7c6..c70ed9a1d1 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,7 +10,7 @@
 from types import *
 from distutils.core import Command
 from distutils import sysconfig
-from distutils.util import write_file, native_path, subst_vars
+from distutils.util import write_file, native_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
 
 INSTALL_SCHEMES = {
@@ -60,6 +60,8 @@ class install (Command):
         ('install-platbase=', None,
          "base installation directory for platform-specific files " +
          "(instead of --exec-prefix or --home)"),
+        ('root=', None,
+         "install everything relative to this alternate root directory"),
 
         # Or, explicitly set the installation scheme
         ('install-purelib=', None,
@@ -104,6 +106,7 @@ def initialize_options (self):
         # the --install-{platlib,purelib,scripts,data} options).
         self.install_base = None
         self.install_platbase = None
+        self.root = None
 
         # These options are the actual installation directories; if not
         # supplied by the user, they are filled in using the installation
@@ -183,17 +186,14 @@ def finalize_options (self):
         # install_{purelib,platlib,lib,scripts,data,...}, and the
         # INSTALL_SCHEME dictionary above.  Phew!
 
-        from pprint import pprint
-        print "pre-finalize:"
-        pprint (self.__dict__)
+        self.dump_dirs ("pre-finalize_xxx")
 
         if os.name == 'posix':
             self.finalize_unix ()
         else:
             self.finalize_other ()
 
-        print "post-finalize:"
-        pprint (self.__dict__)
+        self.dump_dirs ("post-finalize_xxx()")
 
         # Expand configuration variables, tilde, etc. in self.install_base
         # and self.install_platbase -- that way, we can use $base or
@@ -206,14 +206,14 @@ def finalize_options (self):
                            }
         self.expand_basedirs ()
 
-        print "post-expand_basedirs:"
-        pprint (self.__dict__)
+        self.dump_dirs ("post-expand_basedirs()")
 
         # Now define config vars for the base directories so we can expand
         # everything else.
         self.config_vars['base'] = self.install_base
         self.config_vars['platbase'] = self.install_platbase
 
+        from pprint import pprint
         print "config vars:"
         pprint (self.config_vars)
 
@@ -221,8 +221,7 @@ def finalize_options (self):
         # directories.
         self.expand_dirs ()
 
-        print "post-expand:"
-        pprint (self.__dict__)
+        self.dump_dirs ("post-expand_dirs()")
 
         # Pick the actual directory to install all modules to: either
         # install_purelib or install_platlib, depending on whether this
@@ -242,6 +241,16 @@ def finalize_options (self):
         self.install_libbase = self.install_lib # needed for .pth file
         self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
 
+        # If a new root directory was supplied, make all the installation
+        # dirs relative to it.
+        if self.root is not None:
+            for name in ('lib', 'purelib', 'platlib', 'scripts', 'data'):
+                attr = "install_" + name
+                new_val = change_root (self.root, getattr (self, attr))
+                setattr (self, attr, new_val)
+
+        self.dump_dirs ("after prepending root")
+
         # Find out the build directories, ie. where to install from.
         self.set_undefined_options ('build',
                                     ('build_base', 'build_base'),
@@ -253,6 +262,16 @@ def finalize_options (self):
     # finalize_options ()
 
 
+    # hack for debugging output
+    def dump_dirs (self, msg):
+        from distutils.fancy_getopt import longopt_xlate
+        print msg + ":"
+        for opt in self.user_options:
+            opt_name = string.translate (opt[0][0:-1], longopt_xlate)
+            val = getattr (self, opt_name)
+            print "  %s: %s" % (opt_name, val)
+
+
     def finalize_unix (self):
         
         if self.install_base is not None or self.install_platbase is not None:
@@ -339,7 +358,8 @@ def _expand_attrs (self, attrs):
 
     def expand_basedirs (self):
         self._expand_attrs (['install_base',
-                             'install_platbase'])        
+                             'install_platbase',
+                             'root'])        
 
     def expand_dirs (self):
         self._expand_attrs (['install_purelib',

From 671dda81fc33e545e873e0e5c3b8d81db93a2deb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 6 May 2000 13:12:59 +0000
Subject: [PATCH 0310/8469] Added the ability to sneak extra flags onto the C
 compiler command line via an 'extra_compile_args' option in the 'build_info'
 dictionary.

---
 command/build_ext.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 422b8cae1f..a430c2b3cf 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -289,11 +289,13 @@ def build_extensions (self):
             # precedent!)
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
+            extra_args = build_info.get ('extra_compile_args')
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
                                              macros=macros,
                                              include_dirs=include_dirs,
-                                             debug=self.debug)
+                                             debug=self.debug,
+                                             extra_postargs=extra_args)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things

From d5ac3b7d4bbd40e5f118c04f768a4ece54b43d55 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 7 May 2000 15:29:15 +0000
Subject: [PATCH 0311/8469] Got rid of some little-used and not-very-useful
 methods: 'get_option()' and 'get_options()'.

---
 cmd.py | 47 +++--------------------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/cmd.py b/cmd.py
index d8e413798e..abb23c9fb2 100644
--- a/cmd.py
+++ b/cmd.py
@@ -157,47 +157,6 @@ def announce (self, msg, level=1):
             print msg
 
 
-    # -- Option query/set methods --------------------------------------
-
-    def get_option (self, option):
-        """Return the value of a single option for this command.  Raise
-           AttributeError if 'option' is not known."""
-        return getattr (self, option)
-
-
-    def get_options (self, *options):
-        """Return (as a tuple) the values of several options for this
-           command.  Raise AttributeError if any of the options in
-           'options' are not known."""
-
-        values = []
-        for opt in options:
-            values.append (getattr (self, opt))
-
-        return tuple (values)
-
-
-    def set_option (self, option, value):
-        """Set the value of a single option for this command.  Raise
-           AttributeError if 'option' is not known."""
-
-        if not hasattr (self, option):
-            raise AttributeError, \
-                  "command '%s': no such option '%s'" % \
-                  (self.get_command_name(), option)
-        if value is not None:
-            setattr (self, option, value)
-
-    def set_options (self, **optval):
-        """Set the values of several options for this command.  Raise
-           AttributeError if any of the options specified as
-           keyword arguments are not known."""
-
-        for k in optval.keys():
-            if optval[k] is not None:
-                self.set_option (k, optval[k])
-
-
     # -- Convenience methods for commands ------------------------------
 
     def get_command_name (self):
@@ -228,8 +187,8 @@ def set_undefined_options (self, src_cmd, *option_pairs):
         src_cmd_obj.ensure_ready ()
         for (src_option, dst_option) in option_pairs:
             if getattr (self, dst_option) is None:
-                self.set_option (dst_option,
-                                 src_cmd_obj.get_option (src_option))
+                setattr (self, dst_option,
+                         getattr (src_cmd_obj, src_option))
 
 
     def find_peer (self, command, create=1):
@@ -247,7 +206,7 @@ def get_peer_option (self, command, option):
            its 'option' option."""
 
         cmd_obj = self.find_peer (command)
-        return cmd_obj.get_option (option)
+        return getattr(cmd_obj, option)
 
 
     def run_peer (self, command):

From f1d400d10a1f601cc70a56c403a039bc3e9661b1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 7 May 2000 15:30:31 +0000
Subject: [PATCH 0312/8469] Got rid of several little-used and not-very-useful
 methods: 'get_option()', 'get_options()', 'get_command_option()',
 'get_command_options()'.

---
 dist.py | 49 ++-----------------------------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

diff --git a/dist.py b/dist.py
index ae95009fee..f1ac35e48f 100644
--- a/dist.py
+++ b/dist.py
@@ -261,8 +261,8 @@ def parse_command_line (self, args):
                 raise DistutilsArgError, msg
 
             # Require that the command class be derived from Command --
-            # that way, we can be sure that we at least have the 'run'
-            # and 'get_option' methods.
+            # want to be sure that the basic "command" interface is
+            # implemented.
             if not isinstance (cmd_obj, Command):
                 raise DistutilsClassError, \
                       "command class %s must subclass Command" % \
@@ -529,24 +529,6 @@ def run_commands (self):
             self.run_command (cmd)
 
 
-    def get_option (self, option):
-        """Return the value of a distribution option.  Raise
-           AttributeError if 'option' is not known."""
-        return getattr (self, opt)
-
-
-    def get_options (self, *options):
-        """Return (as a tuple) the values of several distribution
-           options.  Raise AttributeError if any element of
-           'options' is not known."""
-        
-        values = []
-        for opt in options:
-            values.append (getattr (self, opt))
-
-        return tuple (values)
-
-
     # -- Methods that operate on its Commands --------------------------
 
     def run_command (self, command):
@@ -570,33 +552,6 @@ def run_command (self, command):
         self.have_run[command] = 1
 
 
-    def get_command_option (self, command, option):
-        """Create a command object for 'command' if necessary, ensure that
-           its option values are all set to their final values, and return
-           the value of its 'option' option.  Raise AttributeError if
-           'option' is not known for that 'command'."""
-
-        cmd_obj = self.find_command_obj (command)
-        cmd_obj.ensure_ready ()
-        return cmd_obj.get_option (option)
-
-
-    def get_command_options (self, command, *options):
-        """Create a command object for 'command' if necessary, ensure that
-           its option values are all set to their final values, and return
-           a tuple containing the values of all the options listed in
-           'options' for that command.  Raise DistutilsOptionError if any
-           invalid option is supplied in 'options'."""
-
-        cmd_obj = self.find_command_obj (command)
-        cmd_obj.ensure_ready ()
-        values = []
-        for opt in options:
-            values.append (getattr (cmd_obj, option))
-
-        return tuple (values)
-
-
     # -- Distribution query methods ------------------------------------
 
     def has_pure_modules (self):

From f60583c2d16f6fce44276326164967fcb0ccd965 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 7 May 2000 15:32:13 +0000
Subject: [PATCH 0313/8469] Don't use 'set_option()' or 'get_option()' method
 -- direct attribute access, or getattr/setattr, is all that's needed.

---
 command/bdist.py       | 2 +-
 command/install_lib.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index cde8dd63e8..01b4e162d3 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -64,7 +64,7 @@ def run (self):
                   "invalid archive format '%s'" % self.format
 
         sub_cmd = self.find_peer (cmd_name)
-        sub_cmd.set_option ('format', self.format)
+        sub_cmd.format = self.format
         self.run_peer (cmd_name)
 
     # run()
diff --git a/command/install_lib.py b/command/install_lib.py
index 5740c5eed2..852e3f63a2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -79,7 +79,7 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
 
         build_cmd = self.find_peer (build_cmd)
         build_files = build_cmd.get_outputs()
-        build_dir = build_cmd.get_option (cmd_option)
+        build_dir = getattr (build_cmd, cmd_option)
 
         prefix_len = len (build_dir) + len (os.sep)
         outputs = []

From 6ef49c947019b2eb196a1e735e0e231ad60cc8f6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 9 May 2000 01:50:41 +0000
Subject: [PATCH 0314/8469] Added comment about the MSVC-specific kludge.

---
 command/build_ext.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index a430c2b3cf..b234b9199a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -308,6 +308,16 @@ def build_extensions (self):
             rpath = build_info.get ('rpath')
             extra_args = build_info.get ('extra_link_args') or []
 
+            # XXX this is a kludge!  Knowledge of specific compilers or
+            # platforms really doesn't belong here; in an ideal world, the
+            # CCompiler interface would provide access to everything in a
+            # compiler/linker system needs to build Python extensions, and
+            # we would just do everything nicely and cleanly through that
+            # interface.  However, this is a not an ideal world and the
+            # CCompiler interface doesn't handle absolutely everything.
+            # Thus, kludges like this slip in occasionally.  (This is no
+            # excuse for committing more platform- and compiler-specific
+            # kludges; they are to be avoided if possible!)
             if self.compiler.compiler_type == 'msvc':
                 def_file = build_info.get ('def_file')
                 if def_file is None:

From 46983102defd6428d66f50100e05d7746325b419 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:33:14 +0000
Subject: [PATCH 0315/8469] Fix from Lyle Johnson: add the '--compiler' option.

---
 command/build.py      |  5 ++++-
 command/build_clib.py | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/build.py b/command/build.py
index 7fb0b56657..7d753b1126 100644
--- a/command/build.py
+++ b/command/build.py
@@ -26,10 +26,12 @@ class build (Command):
          "build-purelib or build-platlib"),
         ('build-temp=', 't',
          "temporary build directory"),
+        ('compiler=', 'c',
+         "specify the compiler type"),
         ('debug', 'g',
          "compile extensions and libraries with debugging information"),
         ('force', 'f',
-         "forcibly build everything (ignore file timestamps"),
+         "forcibly build everything (ignore file timestamps)"),
         ]
 
     def initialize_options (self):
@@ -40,6 +42,7 @@ def initialize_options (self):
         self.build_platlib = None
         self.build_lib = None
         self.build_temp = None
+        self.compiler = None
         self.debug = None
         self.force = 0
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 31170730e6..681cd76b56 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -38,7 +38,9 @@ class build_clib (Command):
         ('debug', 'g',
          "compile with debugging information"),
         ('force', 'f',
-         "forcibly build everything (ignore file timestamps"),
+         "forcibly build everything (ignore file timestamps)"),
+        ('compiler=', 'c',
+         "specify the compiler type"),
         ]
 
     def initialize_options (self):
@@ -54,6 +56,7 @@ def initialize_options (self):
         self.undef = None
         self.debug = None
         self.force = 0
+        self.compiler = None
 
     # initialize_options()
 
@@ -68,6 +71,7 @@ def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('build_temp', 'build_clib'),
                                     ('build_temp', 'build_temp'),
+                                    ('compiler', 'compiler'),
                                     ('debug', 'debug'),
                                     ('force', 'force'))
 
@@ -93,9 +97,11 @@ def run (self):
             return
 
         # Yech -- this is cut 'n pasted from build_ext.py!
-        self.compiler = new_compiler (verbose=self.verbose,
+        self.compiler = new_compiler (compiler=self.compiler,
+                                      verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
+
         if self.include_dirs is not None:
             self.compiler.set_include_dirs (self.include_dirs)
         if self.define is not None:

From 7a4246d402981cf4382d566232f9f7100ed00572 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:34:12 +0000
Subject: [PATCH 0316/8469] Fix from Lyle Johnson: add the '--compiler' option.
 Also added creation of 'implib_dir', a temporary directory specific to  
 MSVC++ -- but I checked in two ways of fixing it (Lyle's and mine),   because
 I'm not sure which is right.

---
 command/build_ext.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index b234b9199a..2142d05fdc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -67,7 +67,9 @@ class build_ext (Command):
         ('debug', 'g',
          "compile/link with debugging information"),
         ('force', 'f',
-         "forcibly build everything (ignore file timestamps"),
+         "forcibly build everything (ignore file timestamps)"),
+        ('compiler=', 'c',
+         "specify the compiler type"),
         ]
 
 
@@ -87,6 +89,7 @@ def initialize_options (self):
         self.link_objects = None
         self.debug = None
         self.force = None
+        self.compiler = None
 
 
     def finalize_options (self):
@@ -95,6 +98,7 @@ def finalize_options (self):
         self.set_undefined_options ('build',
                                     ('build_lib', 'build_lib'),
                                     ('build_temp', 'build_temp'),
+                                    ('compiler', 'compiler'),
                                     ('debug', 'debug'),
                                     ('force', 'force'))
 
@@ -169,7 +173,8 @@ def run (self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (verbose=self.verbose,
+        self.compiler = new_compiler (compiler=self.compiler,
+                                      verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
 
@@ -340,6 +345,10 @@ def build_extensions (self):
                 implib_dir = os.path.join(self.build_temp,\
                                           self.get_ext_libname(extension_name))
                 extra_args.append ('/IMPLIB:' + implib_dir)
+
+                # XXX arg, which of these is correct?
+                self.mkpath(implib_dir)
+                self.mkpath(os.path.dirname(implib_dir))
             # if MSVC
 
             fullname = self.get_ext_fullname (extension_name)

From 61b34f69cabd9929f8c6c7d3d7141acec8fb817c Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:40:00 +0000
Subject: [PATCH 0317/8469] Made 'check_environ()' "public" by stripping the
 leading underscore; added a global '_environ_checked' so we know if it's
 already been called.

---
 util.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 8e642e16c6..b660b4bf2b 100644
--- a/util.py
+++ b/util.py
@@ -111,7 +111,8 @@ def change_root (new_root, pathname):
               "nothing known about platform '%s'" % os.name
 
 
-def _check_environ ():
+_environ_checked = 0
+def check_environ ():
     """Ensure that 'os.environ' has all the environment variables we
        guarantee that users can use in config files, command-line
        options, etc.  Currently this includes:
@@ -120,6 +121,10 @@ def _check_environ ():
                 and OS (see 'get_platform()')
     """
 
+    global _environ_checked
+    if _environ_checked:
+        return
+
     if os.name == 'posix' and not os.environ.has_key('HOME'):
         import pwd
         os.environ['HOME'] = pwd.getpwuid (os.getuid())[5]
@@ -127,6 +132,8 @@ def _check_environ ():
     if not os.environ.has_key('PLAT'):
         os.environ['PLAT'] = get_platform ()
 
+    _environ_checked = 1
+
 
 def subst_vars (str, local_vars):
     """Perform shell/Perl-style variable substitution on 'string'.
@@ -138,7 +145,7 @@ def subst_vars (str, local_vars):
        '_check_environ()'.  Raise ValueError for any variables not found in
        either 'local_vars' or 'os.environ'."""
 
-    _check_environ ()
+    check_environ ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)
         if local_vars.has_key (var_name):

From a5a461bdbf26a573b747000752c03ff9dbf58819 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:41:33 +0000
Subject: [PATCH 0318/8469] Preliminary support for config files:   - added
 'find_config_files()' and 'parse_config_files()' methods   - added
 'command_options' attribute Comment/docstring updates.

---
 dist.py | 94 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 82 insertions(+), 12 deletions(-)

diff --git a/dist.py b/dist.py
index f1ac35e48f..a0c6c9ea3d 100644
--- a/dist.py
+++ b/dist.py
@@ -8,11 +8,12 @@
 
 __revision__ = "$Id$"
 
-import sys, string, re
+import sys, os, string, re
 from types import *
 from copy import copy
 from distutils.errors import *
 from distutils.fancy_getopt import FancyGetopt, longopt_xlate
+from distutils.util import check_environ
 
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
@@ -137,6 +138,11 @@ def __init__ (self, attrs=None):
         # for the setup script to override command classes
         self.cmdclass = {}
 
+        # Store options for commands here between parsing them (from config
+        # files, the command-line, etc.) and actually putting them into the
+        # command object that needs them.
+        self.command_options = {}
+
         # These options are really the business of various commands, rather
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.
@@ -201,6 +207,74 @@ def __init__ (self, attrs=None):
     # __init__ ()
 
 
+    def find_config_files (self):
+        """Find as many configuration files as should be processed for this
+        platform, and return a list of filenames in the order in which they
+        should be parsed.  The filenames returned are guaranteed to exist
+        (modulo nasty race conditions).
+
+        On Unix, there are three possible config files: pydistutils.cfg in
+        the Distutils installation directory (ie. where the top-level
+        Distutils __inst__.py file lives), .pydistutils.cfg in the user's
+        home directory, and setup.cfg in the current directory.
+
+        On Windows and Mac OS, there are two possible config files:
+        pydistutils.cfg in the Python installation directory (sys.prefix)
+        and setup.cfg in the current directory."""
+
+        files = []
+        if os.name == "posix":
+            check_environ()
+
+            sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
+            sys_file = os.path.join(sys_dir, "pydistutils.cfg")
+            if os.path.isfile(sys_file):
+                files.append(sys_file)
+
+            user_file = os.path.join(os.environ.get('HOME'),
+                                     ".pydistutils.cfg")
+            if os.path.isfile(user_file):
+                files.append(user_file)
+
+        else:
+            sys_file = os.path.join (sysconfig.PREFIX, "pydistutils.cfg")
+            if os.path.isfile(sys_file):
+                files.append(sys_file)
+
+        # All platforms support local setup.cfg
+        local_file = "setup.cfg"
+        if os.path.isfile(local_file):
+            files.append(local_file)
+
+        return files
+
+    # find_config_files ()
+
+
+    def parse_config_files (self, filenames=None):
+
+        from ConfigParser import ConfigParser
+
+        if filenames is None:
+            filenames = self.find_config_files()
+
+        parser = ConfigParser()
+        parser.read(filenames)
+        for section in parser.sections():
+            options = parser.options(section)
+            if not self.command_options.has_key(section) is None:
+                self.command_options[section] = {}
+            cmd_opts = self.command_options[section]
+
+            for opt in options:
+                if opt != '__name__':
+                    cmd_opts[opt] = parser.get(section,opt)
+
+        from pprint import pprint
+        print "configuration options:"
+        pprint (self.command_options)
+
+
     def parse_command_line (self, args):
         """Parse the setup script's command line: set any Distribution
            attributes tied to command-line options, create all command
@@ -436,18 +510,14 @@ def print_commands (self):
 
     # -- Command class/object methods ----------------------------------
 
-    # This is a method just so it can be overridden if desired; it doesn't
-    # actually use or change any attributes of the Distribution instance.
     def find_command_class (self, command):
-        """Given a command, derives the names of the module and class
-           expected to implement the command: eg. 'foo_bar' becomes
-           'distutils.command.foo_bar' (the module) and 'FooBar' (the
-           class within that module).  Loads the module, extracts the
-           class from it, and returns the class object.
-
-           Raises DistutilsModuleError with a semi-user-targeted error
-           message if the expected module could not be loaded, or the
-           expected class was not found in it."""
+        """Given a command name, attempts to load the module and class that
+        implements that command.  This is done by importing a module
+        "distutils.command." + command, and a class named 'command' in that
+        module.
+
+        Raises DistutilsModuleError if the expected module could not be
+        found, or if that module does not define the expected class."""
 
         module_name = 'distutils.command.' + command
         klass_name = command

From a228f136965785d37f5d53b274e92a9fb73ba007 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:42:19 +0000
Subject: [PATCH 0319/8469] Call 'parse_config_files()' at the appropriate
 point. Tweaked error-generating code.

---
 core.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core.py b/core.py
index 4b6969284b..a39bccd307 100644
--- a/core.py
+++ b/core.py
@@ -71,11 +71,11 @@ def setup (**attrs):
     # (ie. everything except distclass) to initialize it
     dist = klass (attrs)
 
-    # If we had a config file, this is where we would parse it: override
-    # the client-supplied command options, but be overridden by the
-    # command line.
-
-    # Parse the command line; any command-line errors are the end-users
+    # Find and parse the config file(s): they will override options from
+    # the setup script, but be overridden by the command line.
+    dist.parse_config_files()
+    
+    # Parse the command line; any command-line errors are the end user's
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line (sys.argv[1:])
@@ -101,10 +101,10 @@ def setup (**attrs):
                     raise SystemExit, \
                           "error: %s" % exc.strerror
             else:
-                raise SystemExit, "error: " + exc[-1]
+                raise SystemExit, "error: " + str(exc[-1])
         except (DistutilsExecError,
                 DistutilsFileError,
                 DistutilsOptionError), msg:
-            raise SystemExit, "error: " + str (msg)
+            raise SystemExit, "error: " + str(msg)
 
 # setup ()

From 316a284532e000c26f077afbbdfbd6640b077210 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 00:52:23 +0000
Subject: [PATCH 0320/8469] Patch from Bastien Kleineidam: adds the
 'install_data' and 'install_scripts' commands; these two are trivial thanks
 to the 'install_misc' base class in cmd.py. (Minor tweaks and commentary by
 me; the code is untested so far.)

---
 cmd.py                     | 30 ++++++++++++++++++++++++++++++
 command/__init__.py        |  2 ++
 command/install.py         |  5 ++++-
 command/install_data.py    | 14 ++++++++++++++
 command/install_scripts.py | 16 ++++++++++++++++
 dist.py                    |  2 ++
 6 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 command/install_data.py
 create mode 100644 command/install_scripts.py

diff --git a/cmd.py b/cmd.py
index abb23c9fb2..393734401d 100644
--- a/cmd.py
+++ b/cmd.py
@@ -344,5 +344,35 @@ def make_file (self, infiles, outfile, func, args,
 # class Command
 
 
+class install_misc (Command):
+    """Common base class for installing some files in a subdirectory.
+    Currently used by install_data and install_scripts.
+    """
+    
+    user_options = [('install-dir=', 'd', "directory to install the files to")]
+
+    def initialize_options (self):
+        self.install_dir = None
+        self.outfiles = None
+
+    def _install_dir_from(self, dirname):
+        self.set_undefined_options('install', (dirname, 'install_dir'))
+
+    def _copydata(self, filelist):
+        self.outfiles = []
+        if not filelist:
+            return
+        self.mkpath(self.install_dir)
+        for f in filelist:
+            self.outfiles.append(self.copy_file (f, self.install_dir))
+
+    def _outputdata(self, filelist):
+        if self.outfiles is not None:
+            return self.outfiles
+        # XXX de-lambda-fy
+        return map(lambda x: os.path.join(self.install_dir, x), filelist)
+
+
+
 if __name__ == "__main__":
     print "ok"
diff --git a/command/__init__.py b/command/__init__.py
index 385330b5e0..573ae5138e 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -11,6 +11,8 @@
            'build_clib',
            'install',
            'install_lib',
+           'install_scripts',
+           'install_data',
            'clean',
            'sdist',
            'bdist',
diff --git a/command/install.py b/command/install.py
index c70ed9a1d1..3f6fa33fc6 100644
--- a/command/install.py
+++ b/command/install.py
@@ -90,7 +90,10 @@ class install (Command):
     # (func, command) where 'func' is a function to call that returns
     # true if 'command' (the sub-command name, a string) needs to be
     # run.  If 'func' is None, assume that 'command' must always be run.
-    sub_commands = [(None, 'install_lib')]
+    sub_commands = [(None, 'install_lib'),
+                    (None, 'install_scripts'),
+                    (None, 'install_data'),
+                   ]
 
 
     def initialize_options (self):
diff --git a/command/install_data.py b/command/install_data.py
new file mode 100644
index 0000000000..f86d95e54b
--- /dev/null
+++ b/command/install_data.py
@@ -0,0 +1,14 @@
+from distutils.cmd import install_misc
+
+class install_data (install_misc):
+
+    description = "install data files"
+
+    def finalize_options (self):
+        self._install_dir_from('install_data')
+
+    def run (self):
+        self._copydata(self.distribution.data)
+
+    def get_outputs (self):
+        return self._outputdata(self.distribution.data)
diff --git a/command/install_scripts.py b/command/install_scripts.py
new file mode 100644
index 0000000000..665208eb78
--- /dev/null
+++ b/command/install_scripts.py
@@ -0,0 +1,16 @@
+from distutils.cmd import install_misc
+
+class install_scripts(install_misc):
+
+    description = "install scripts"
+    # XXX needed?
+    user_options = [('install-dir=', 'd', "directory to install to")]
+
+    def finalize_options (self):
+        self._install_dir_from('install_scripts')
+
+    def run (self):
+        self._copydata(self.distribution.scripts)
+
+    def get_outputs(self):
+        return self._outputdata(self.distribution.scripts)
diff --git a/dist.py b/dist.py
index a0c6c9ea3d..998cff7190 100644
--- a/dist.py
+++ b/dist.py
@@ -154,6 +154,8 @@ def __init__ (self, attrs=None):
         self.ext_package = None
         self.include_dirs = None
         self.extra_path = None
+        self.scripts = None
+        self.data = None
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to

From 593bfaaa0c09ea0939a54bdb050a2e91ab0e295e Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:31:37 +0000
Subject: [PATCH 0321/8469] In 'install_misc' class:   - renamed '_copydata()'
 to 'copy_files()'   - changed it to record complete output filenames   -
 dropped '_outputdata()' in favour of much simpler 'get_outputs()'

---
 cmd.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmd.py b/cmd.py
index 393734401d..28d8617949 100644
--- a/cmd.py
+++ b/cmd.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, string
+import sys, os, string
 from types import *
 from distutils.errors import *
 from distutils import util
@@ -355,23 +355,20 @@ def initialize_options (self):
         self.install_dir = None
         self.outfiles = None
 
-    def _install_dir_from(self, dirname):
+    def _install_dir_from (self, dirname):
         self.set_undefined_options('install', (dirname, 'install_dir'))
 
-    def _copydata(self, filelist):
+    def _copy_files (self, filelist):
         self.outfiles = []
         if not filelist:
             return
         self.mkpath(self.install_dir)
         for f in filelist:
-            self.outfiles.append(self.copy_file (f, self.install_dir))
-
-    def _outputdata(self, filelist):
-        if self.outfiles is not None:
-            return self.outfiles
-        # XXX de-lambda-fy
-        return map(lambda x: os.path.join(self.install_dir, x), filelist)
+            self.copy_file(f, self.install_dir)
+            self.outfiles.append(os.path.join(self.install_dir, f))
 
+    def get_outputs (self):
+        return self.outfiles
 
 
 if __name__ == "__main__":

From a6ee82aab954f10c941860047e35bb26dcc2866b Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:32:30 +0000
Subject: [PATCH 0322/8469] Deleted some cruft. Caught up with renaming in
 'install_misc' base class. Changed 'run()' to chmod installed scripts under
 Unix.

---
 command/install_scripts.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/command/install_scripts.py b/command/install_scripts.py
index 665208eb78..5c3f2fb4c2 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -1,16 +1,26 @@
+import os
 from distutils.cmd import install_misc
+from stat import ST_MODE
 
 class install_scripts(install_misc):
 
     description = "install scripts"
-    # XXX needed?
-    user_options = [('install-dir=', 'd', "directory to install to")]
 
     def finalize_options (self):
         self._install_dir_from('install_scripts')
 
     def run (self):
-        self._copydata(self.distribution.scripts)
+        self._copy_files(self.distribution.scripts)
+        if os.name == 'posix':
+            # Set the executable bits (owner, group, and world) on
+            # all the scripts we just installed.
+            files = self.get_outputs()
+            for file in files:
+                if self.dry_run:
+                    self.announce("changing mode of %s" % file)
+                else:
+                    mode = (os.stat(file)[ST_MODE]) | 0111
+                    self.announce("changing mode of %s to %o" % (file, mode))
+                    os.chmod(file, mode)
 
-    def get_outputs(self):
-        return self._outputdata(self.distribution.scripts)
+# class install_scripts

From d5eb448fcce25d02a65b8ebaabbc119d21be5672 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:34:33 +0000
Subject: [PATCH 0323/8469] Caught up with renaming in 'install_misc' base
 class.

---
 command/install_data.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index f86d95e54b..d96a1def89 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -8,7 +8,4 @@ def finalize_options (self):
         self._install_dir_from('install_data')
 
     def run (self):
-        self._copydata(self.distribution.data)
-
-    def get_outputs (self):
-        return self._outputdata(self.distribution.data)
+        self._copy_files(self.distribution.data)

From 58a11985342e4e261381916e6b43210b58ae0908 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:46:47 +0000
Subject: [PATCH 0324/8469] Added --skip-build option, so lazy
 debuggers/testers (mainly me) don't have to wade through all the 'build'
 output when testing installation.

---
 command/install.py     | 15 +++++++++++++--
 command/install_lib.py | 15 ++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/command/install.py b/command/install.py
index 3f6fa33fc6..4e68e00e95 100644
--- a/command/install.py
+++ b/command/install.py
@@ -77,6 +77,11 @@ class install (Command):
         ('install-data=', None,
          "installation directory for data files"),
 
+        # For lazy debuggers who just want to test the install
+        # commands without rerunning "build" all the time
+        ('skip-build', None,
+         "skip rebuilding everything (for testing/debugging)"),
+
         # Where to install documentation (eventually!)
         #('doc-format=', None, "format of documentation to generate"),
         #('install-man=', None, "directory for Unix man pages"),
@@ -129,6 +134,8 @@ def initialize_options (self):
         self.extra_path = None
         self.install_path_file = 0
 
+        self.skip_build = 0
+
         # These are only here as a conduit from the 'build' command to the
         # 'install_*' commands that do the real work.  ('build_base' isn't
         # actually used anywhere, but it might be useful in future.)  They
@@ -270,7 +277,10 @@ def dump_dirs (self, msg):
         from distutils.fancy_getopt import longopt_xlate
         print msg + ":"
         for opt in self.user_options:
-            opt_name = string.translate (opt[0][0:-1], longopt_xlate)
+            opt_name = opt[0]
+            if opt_name[-1] == "=":
+                opt_name = opt_name[0:-1]
+            opt_name = string.translate (opt_name, longopt_xlate)
             val = getattr (self, opt_name)
             print "  %s: %s" % (opt_name, val)
 
@@ -409,7 +419,8 @@ def handle_extra_path (self):
     def run (self):
 
         # Obviously have to build before we can install
-        self.run_peer ('build')
+        if not self.skip_build:
+            self.run_peer ('build')
 
         # Run all sub-commands: currently this just means install all
         # Python modules using 'install_lib'.
diff --git a/command/install_lib.py b/command/install_lib.py
index 852e3f63a2..2d0a7190f8 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -15,6 +15,7 @@ class install_lib (Command):
         ('build-dir=','b', "build directory (where to install from)"),
         ('compile', 'c', "compile .py to .pyc"),
         ('optimize', 'o', "compile .py to .pyo (optimized)"),
+        ('skip-build', None, "skip the build steps"),
         ]
                
 
@@ -24,6 +25,7 @@ def initialize_options (self):
         self.build_dir = None
         self.compile = 1
         self.optimize = 1
+        self.skip_build = None
 
     def finalize_options (self):
 
@@ -34,16 +36,19 @@ def finalize_options (self):
                                     ('build_lib', 'build_dir'),
                                     ('install_lib', 'install_dir'),
                                     ('compile_py', 'compile'),
-                                    ('optimize_py', 'optimize'))
+                                    ('optimize_py', 'optimize'),
+                                    ('skip_build', 'skip_build'),
+                                   )
 
 
     def run (self):
 
         # Make sure we have built everything we need first
-        if self.distribution.has_pure_modules():
-            self.run_peer ('build_py')
-        if self.distribution.has_ext_modules():
-            self.run_peer ('build_ext')
+        if not self.skip_build:
+            if self.distribution.has_pure_modules():
+                self.run_peer ('build_py')
+            if self.distribution.has_ext_modules():
+                self.run_peer ('build_ext')
 
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of

From 5ff2cdf00f98ecaf7ed6140145e7253425171252 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:54:50 +0000
Subject: [PATCH 0325/8469] Fixed 'select_scheme()' so it doesn't override a
 directory attribute that's already been set (eg. by a command-line option).

---
 command/install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 4e68e00e95..ba4110cb8a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -356,7 +356,9 @@ def select_scheme (self, name):
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
         for key in ('purelib', 'platlib', 'scripts', 'data'):
-            setattr (self, 'install_' + key, scheme[key])
+            attrname = 'install_' + key
+            if getattr(self, attrname) is None:
+                setattr(self, attrname, scheme[key])
 
 
     def _expand_attrs (self, attrs):

From 23b8295f824f1520612add07320e9bf62bc71709 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Fri, 12 May 2000 01:58:29 +0000
Subject: [PATCH 0326/8469] Added comment/docstring/revision header.

---
 command/install_data.py    | 9 +++++++++
 command/install_scripts.py | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/command/install_data.py b/command/install_data.py
index d96a1def89..95ef423127 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -1,3 +1,12 @@
+"""distutils.command.install_data
+
+Implements the Distutils 'install_data' command, for installing
+platform-independent data files."""
+
+# contributed by Bastian Kleineidam
+
+__revision__ = "$Id$"
+
 from distutils.cmd import install_misc
 
 class install_data (install_misc):
diff --git a/command/install_scripts.py b/command/install_scripts.py
index 5c3f2fb4c2..4e23efc8b6 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -1,3 +1,12 @@
+"""distutils.command.install_scripts
+
+Implements the Distutils 'install_scripts' command, for installing
+Python scripts."""
+
+# contributed by Bastian Kleineidam
+
+__revision__ = "$Id$"
+
 import os
 from distutils.cmd import install_misc
 from stat import ST_MODE

From ea70d0b5ebf3197a83a0965f25125f27d0b05d88 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:35:33 +0000
Subject: [PATCH 0327/8469] From Lyle Johnson: renamed 'implib_dir' to
 'implib_file', and correctly ensure that it's 'dirname' exists.

---
 command/build_ext.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2142d05fdc..deb3b130b9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -342,13 +342,11 @@ def build_extensions (self):
                 # which cannot be suppressed by any linker switches.  So
                 # make sure they are generated in the temporary build
                 # directory.
-                implib_dir = os.path.join(self.build_temp,\
-                                          self.get_ext_libname(extension_name))
-                extra_args.append ('/IMPLIB:' + implib_dir)
-
-                # XXX arg, which of these is correct?
-                self.mkpath(implib_dir)
-                self.mkpath(os.path.dirname(implib_dir))
+                implib_file = os.path.join (
+                    self.build_temp,
+                    self.get_ext_libname (extension_name))
+                extra_args.append ('/IMPLIB:' + implib_file)
+                self.mkpath (os.path.dirname (implib_file))
             # if MSVC
 
             fullname = self.get_ext_fullname (extension_name)

From 0ad597128936e67ed4025f170e46d66a61a61ce3 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:48:15 +0000
Subject: [PATCH 0328/8469] Harry Henry Gebel: add 'bdist_rpm' command.

---
 command/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/__init__.py b/command/__init__.py
index 573ae5138e..cd7753fe64 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -17,4 +17,5 @@
            'sdist',
            'bdist',
            'bdist_dumb',
+           'bdist_rpm',
           ]

From 68504c5151605eb5da935805f7973fcb70e6f3aa Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:49:56 +0000
Subject: [PATCH 0329/8469] Harry Henry Gebel: add support for the 'bdist_rpm'
 command, specifically the 'no_format_option' class attribute.

---
 command/bdist.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 01b4e162d3..970779dcaa 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -22,6 +22,9 @@ class bdist (Command):
                      "(tar, ztar, gztar, bztar, zip, ... )"),
                    ]
 
+    # The following commands do not take a format option from bdist
+    no_format_option = ('bdist_rpm',)
+
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
     default_format = { 'posix': 'gztar',
@@ -31,6 +34,7 @@ class bdist (Command):
                        'bztar': 'bdist_dumb',
                        'ztar':  'bdist_dumb',
                        'tar':   'bdist_dumb',
+                       'rpm':   'bdist_rpm',
                        'zip':   'bdist_dumb', }
 
 
@@ -63,8 +67,9 @@ def run (self):
             raise DistutilsOptionError, \
                   "invalid archive format '%s'" % self.format
 
-        sub_cmd = self.find_peer (cmd_name)
-        sub_cmd.format = self.format
+        if cmd_name not in self.no_format_option:
+            sub_cmd = self.find_peer (cmd_name)
+            sub_cmd.format = self.format
         self.run_peer (cmd_name)
 
     # run()

From e1e8fd9c6397cccb920d93434f7b7393b361b564 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:52:14 +0000
Subject: [PATCH 0330/8469] Harry Henry Gebel: get extra compiler flags from
 the CFLAGS environment variable.

(Is this really needed?  Can we drop it when the config file mechanism
allows users to set compiler flags in setup.cfg?)
---
 command/build_ext.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index deb3b130b9..aa9ea0d034 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -295,6 +295,14 @@ def build_extensions (self):
             macros = build_info.get ('macros')
             include_dirs = build_info.get ('include_dirs')
             extra_args = build_info.get ('extra_compile_args')
+            # honor CFLAGS enviroment variable
+            # XXX do we *really* need this? or is it just a hack until
+            # the user can put compiler flags in setup.cfg?
+            if os.environ.has_key('CFLAGS'):
+                if not extra_args:
+                    extra_args = []
+                extra_args = string.split(os.environ['CFLAGS']) + extra_args
+                
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
                                              macros=macros,

From 25c47ab8b0225c1a451b36eb720cfe73954af9b1 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:56:55 +0000
Subject: [PATCH 0331/8469] Added the 'build_bdist' option and code to clean it
 up -- this is the top-level temporary directory for creating built
 distributions.  (Won't work yet, since the "build" command doesn't yet have a
 'build_bdist' option, and none of the "bdist" commands support it yet.)

---
 command/clean.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 4f0f7e3e94..78166f2642 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -20,6 +20,8 @@ class clean (Command):
          "build directory for all modules (default: 'build.build-lib')"),
         ('build-temp=', 't',
          "temporary build directory (default: 'build.build-temp')"),
+        ('build-bdist=', None,
+         "temporary directory for built distributions"),
         ('all', 'a',
          "remove all build output, not just temporary by-products")
     ]
@@ -28,6 +30,7 @@ def initialize_options(self):
         self.build_base = None
         self.build_lib = None
         self.build_temp = None
+        self.build_bdist = None
         self.all = None
 
     def finalize_options(self):
@@ -39,9 +42,10 @@ def finalize_options(self):
                        self.build_temp)
 
         self.set_undefined_options('build',
-	    ('build_base', 'build_base'),
-	    ('build_lib', 'build_lib'),
-	    ('build_temp', 'build_temp'))
+                                   ('build_base', 'build_base'),
+                                   ('build_lib', 'build_lib'),
+                                   ('build_temp', 'build_temp'),
+                                   ('build_bdist', 'build_bdist'))
 
     def run(self):
         # remove the build/temp.<plat> directory (unless it's already
@@ -53,6 +57,13 @@ def run(self):
             # remove the module build directory (unless already gone)
             if os.path.exists (self.build_lib):
                 remove_tree (self.build_lib, self.verbose, self.dry_run)
+            # remove the temporary directory used for creating built
+            # distributions (default "build/bdist") -- eg. type of
+            # built distribution will have its own subdirectory under
+            # "build/bdist", but they'll be taken care of by
+            # 'remove_tree()'.
+            if os.path.exists (self.build_bdist)
+                remove_tree (self.build_bdist, self.verbose, self.dry_run)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care

From 714539777115782361abaa82992217496a2d932e Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 01:58:19 +0000
Subject: [PATCH 0332/8469] Harry Henry Gebel: add the "--record" option to
 write the list of installed files to INSTALLED_FILES.

---
 command/install.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index ba4110cb8a..e6ed984166 100644
--- a/command/install.py
+++ b/command/install.py
@@ -12,6 +12,7 @@
 from distutils import sysconfig
 from distutils.util import write_file, native_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
+from glob import glob
 
 INSTALL_SCHEMES = {
     'unix_prefix': {
@@ -87,8 +88,10 @@ class install (Command):
         #('install-man=', None, "directory for Unix man pages"),
         #('install-html=', None, "directory for HTML documentation"),
         #('install-info=', None, "directory for GNU info files"),
-        ]
 
+        ('record', None,
+         "make a record of installation"),
+        ]
 
     # 'sub_commands': a list of commands this command might have to run
     # to get its work done.  Each command is represented as a tuple
@@ -151,6 +154,7 @@ def initialize_options (self):
         #self.install_html = None
         #self.install_info = None
 
+        self.record = None
 
     def finalize_options (self):
 
@@ -441,6 +445,22 @@ def run (self):
                         "you'll have to change the search path yourself") %
                        self.install_lib)
 
+        # write list of installed files, if requested.
+        if self.record:
+            outputs = self.get_outputs()
+            for counter in xrange (len (outputs)): # include ".pyc" and ".pyo"
+                if outputs[counter][-3:] == ".py":
+                    byte_code = glob(outputs[counter] + '[co]')
+                    outputs.extend(byte_code)
+            outputs.sort() # just makes it look nicer
+            if self.root: # strip any package prefix
+                root_len = len(self.root)
+                for counter in xrange (len (outputs)):
+                    outputs[counter] = outputs[counter][root_len:]
+            self.execute(write_file,
+                         ("INSTALLED_FILES", outputs),
+                         "Writing list of installed files")
+
     # run ()
 
 

From 1c914c4988122ad3436aac8bb4e2ab833aef511f Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:01:22 +0000
Subject: [PATCH 0333/8469] Moved check for installation to non-sys.path
 location so it comes last (after writing list of installed files) -- that
 way, the warning is more visible.

---
 command/install.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/command/install.py b/command/install.py
index e6ed984166..163b018749 100644
--- a/command/install.py
+++ b/command/install.py
@@ -437,14 +437,6 @@ def run (self):
         if self.path_file:
             self.create_path_file ()
 
-        normalized_path = map (os.path.normpath, sys.path)
-        if (not (self.path_file and self.install_path_file) and
-            os.path.normpath (self.install_lib) not in normalized_path):
-            self.warn (("modules installed to '%s', which is not in " +
-                        "Python's module search path (sys.path) -- " +
-                        "you'll have to change the search path yourself") %
-                       self.install_lib)
-
         # write list of installed files, if requested.
         if self.record:
             outputs = self.get_outputs()
@@ -459,7 +451,15 @@ def run (self):
                     outputs[counter] = outputs[counter][root_len:]
             self.execute(write_file,
                          ("INSTALLED_FILES", outputs),
-                         "Writing list of installed files")
+                         "writing list of installed files")
+
+        normalized_path = map (os.path.normpath, sys.path)
+        if (not (self.path_file and self.install_path_file) and
+            os.path.normpath (self.install_lib) not in normalized_path):
+            self.warn (("modules installed to '%s', which is not in " +
+                        "Python's module search path (sys.path) -- " +
+                        "you'll have to change the search path yourself") %
+                       self.install_lib)
 
     # run ()
 

From 6406c80d46402cc93bdfd1fa565acba9a7a33213 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:11:10 +0000
Subject: [PATCH 0334/8469] Added '_bytecode_filenames()' method, and use it in
 'get_outputs()' to ensure that compiled bytecode files are considered part of
 the output of the "install_lib" command.

---
 command/install_lib.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 2d0a7190f8..63c7a6bf00 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -72,8 +72,6 @@ def run (self):
                     skip_msg = "byte-compilation of %s skipped" % f
                     self.make_file (f, out_fn, compile, (f,),
                                     compile_msg, skip_msg)
-                                    
-                                    
     # run ()
 
 
@@ -94,6 +92,14 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
         return outputs
 
     # _mutate_outputs ()
+
+    def _bytecode_filenames (self, py_filenames):
+        bytecode_files = []
+        for py_file in py_filenames:
+            bytecode = py_file + (__debug__ and "c" or "o")
+            bytecode_files.append(bytecode)
+
+        return bytecode_files
         
     def get_outputs (self):
         """Return the list of files that would be installed if this command
@@ -104,14 +110,17 @@ def get_outputs (self):
             self._mutate_outputs (self.distribution.has_pure_modules(),
                                   'build_py', 'build_lib',
                                   self.install_dir)
-
+        if self.compile:
+            bytecode_outputs = self._bytecode_filenames(pure_outputs)
+        else:
+            bytecode_outputs = []
 
         ext_outputs = \
             self._mutate_outputs (self.distribution.has_ext_modules(),
                                   'build_ext', 'build_lib',
                                   self.install_dir)
 
-        return pure_outputs + ext_outputs
+        return pure_outputs + bytecode_outputs + ext_outputs
 
     # get_outputs ()
 

From b9143e831d39d846dd31c84f8e2252161355b346 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:13:53 +0000
Subject: [PATCH 0335/8469] Ditch the explicit search for *.py[co] files --
 they're now included in the list returned by 'get_outputs()', thanks to
 changes in the "install_lib" command.

---
 command/install.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/command/install.py b/command/install.py
index 163b018749..2429f1b1f9 100644
--- a/command/install.py
+++ b/command/install.py
@@ -440,12 +440,7 @@ def run (self):
         # write list of installed files, if requested.
         if self.record:
             outputs = self.get_outputs()
-            for counter in xrange (len (outputs)): # include ".pyc" and ".pyo"
-                if outputs[counter][-3:] == ".py":
-                    byte_code = glob(outputs[counter] + '[co]')
-                    outputs.extend(byte_code)
-            outputs.sort() # just makes it look nicer
-            if self.root: # strip any package prefix
+            if self.root:               # strip any package prefix
                 root_len = len(self.root)
                 for counter in xrange (len (outputs)):
                     outputs[counter] = outputs[counter][root_len:]

From 1f4bdba5ba8806643d7ff97ae965cb0edf1d99fe Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:16:45 +0000
Subject: [PATCH 0336/8469] Made the '--record' option take an argument, which
 is the name of the file to write the list of installed files to.

---
 command/install.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index 2429f1b1f9..a4986e5d5d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -89,8 +89,8 @@ class install (Command):
         #('install-html=', None, "directory for HTML documentation"),
         #('install-info=', None, "directory for GNU info files"),
 
-        ('record', None,
-         "make a record of installation"),
+        ('record=', None,
+         "filename in which to record list of installed files"),
         ]
 
     # 'sub_commands': a list of commands this command might have to run
@@ -445,8 +445,9 @@ def run (self):
                 for counter in xrange (len (outputs)):
                     outputs[counter] = outputs[counter][root_len:]
             self.execute(write_file,
-                         ("INSTALLED_FILES", outputs),
-                         "writing list of installed files")
+                         (self.record, outputs),
+                         "writing list of installed files to '%s'" %
+                         self.record)
 
         normalized_path = map (os.path.normpath, sys.path)
         if (not (self.path_file and self.install_path_file) and

From 2d34b0395476d92bd2fbec6f4fcd99cae6d2a383 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:20:43 +0000
Subject: [PATCH 0337/8469] Typo fix.

---
 command/clean.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/clean.py b/command/clean.py
index 78166f2642..8706e57a1e 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -62,7 +62,7 @@ def run(self):
             # built distribution will have its own subdirectory under
             # "build/bdist", but they'll be taken care of by
             # 'remove_tree()'.
-            if os.path.exists (self.build_bdist)
+            if os.path.exists (self.build_bdist):
                 remove_tree (self.build_bdist, self.verbose, self.dry_run)
 
         # just for the heck of it, try to remove the base build directory:

From b7d9b1267bfe9638d965a16556a7ca408f6e6ff2 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 02:30:15 +0000
Subject: [PATCH 0338/8469] Rename 'build_bdist' to 'bdist_base', and get it by
 default from the "bdist" command rather than "build".

---
 command/clean.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 8706e57a1e..d6999060bd 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -20,7 +20,7 @@ class clean (Command):
          "build directory for all modules (default: 'build.build-lib')"),
         ('build-temp=', 't',
          "temporary build directory (default: 'build.build-temp')"),
-        ('build-bdist=', None,
+        ('bdist-base=', None,
          "temporary directory for built distributions"),
         ('all', 'a',
          "remove all build output, not just temporary by-products")
@@ -30,7 +30,7 @@ def initialize_options(self):
         self.build_base = None
         self.build_lib = None
         self.build_temp = None
-        self.build_bdist = None
+        self.bdist_base = None
         self.all = None
 
     def finalize_options(self):
@@ -44,8 +44,9 @@ def finalize_options(self):
         self.set_undefined_options('build',
                                    ('build_base', 'build_base'),
                                    ('build_lib', 'build_lib'),
-                                   ('build_temp', 'build_temp'),
-                                   ('build_bdist', 'build_bdist'))
+                                   ('build_temp', 'build_temp'))
+        self.set_undefined_options('bdist',
+                                   ('bdist_base', 'bdist_base'))
 
     def run(self):
         # remove the build/temp.<plat> directory (unless it's already
@@ -62,8 +63,8 @@ def run(self):
             # built distribution will have its own subdirectory under
             # "build/bdist", but they'll be taken care of by
             # 'remove_tree()'.
-            if os.path.exists (self.build_bdist):
-                remove_tree (self.build_bdist, self.verbose, self.dry_run)
+            if os.path.exists (self.bdist_base):
+                remove_tree (self.bdist_base, self.verbose, self.dry_run)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care

From 75835e5b552eacae52c565cb1f2172bc0c03405f Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:06:56 +0000
Subject: [PATCH 0339/8469] Drastically simplified by taking advantage of the
 "install" command's new flexibility, specifically the 'root' option.  Now, we
 just use "install" to do a fake installation into a temporary directory (the
 'bdist_dir' option, which derives from the 'bdist_base' option of "bdist"),
 and then tar/zip up that directory.  This means that dumb built distributions
 are now relative to the root directory, rather than the prefix or
 exec-prefix; this is probably a feature, but does make them slightly less
 flexible.

---
 command/bdist_dumb.py | 95 ++++++++++---------------------------------
 1 file changed, 21 insertions(+), 74 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 23672a63e4..2de2befc14 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -17,7 +17,9 @@ class bdist_dumb (Command):
 
     description = "create a \"dumb\" built distribution"
 
-    user_options = [('format=', 'f',
+    user_options = [('bdist-dir=', 'd',
+                     "temporary directory for creating the distribution"),
+                    ('format=', 'f',
                      "archive format to create (tar, ztar, gztar, zip)"),
                     ('keep-tree', 'k',
                      "keep the pseudo-installation tree around after " +
@@ -29,6 +31,7 @@ class bdist_dumb (Command):
 
 
     def initialize_options (self):
+        self.bdist_dir = None
         self.format = None
         self.keep_tree = 0
 
@@ -36,6 +39,10 @@ def initialize_options (self):
 
 
     def finalize_options (self):
+        if self.bdist_dir is None:
+            bdist_base = self.get_peer_option('bdist', 'bdist_base')
+            self.bdist_dir = os.path.join(bdist_base, 'dumb')
+
         if self.format is None:
             try:
                 self.format = self.default_format[os.name]
@@ -50,91 +57,31 @@ def finalize_options (self):
     def run (self):
 
         self.run_peer ('build')
-        install = self.find_peer ('install')
-        inputs = install.get_inputs ()
-        outputs = install.get_outputs ()
-        assert (len (inputs) == len (outputs))
-
-        # First, strip the installation base directory (prefix or
-        # exec-prefix) from all the output filenames.
-        self.strip_base_dirs (outputs, install)
 
-        # Figure out where to copy them to: "build/bdist" by default; this
-        # directory masquerades as prefix/exec-prefix (ie.  we'll make the
-        # archive from 'output_dir').
-        build_base = self.get_peer_option ('build', 'build_base')
-        output_dir = os.path.join (build_base, "bdist")
+        # XXX don't use 'self.find_peer()', because it always runs
+        # 'ensure_ready()' on the command object; we explictly want a
+        # command object that has *not* been finalized, so we can set
+        # options on it!  (The option we set, 'root', is so that we can do
+        # a proper "fake install" using this install command object.)
+        install = self.distribution.find_command_obj('install')
+        install.root = self.bdist_dir
 
-        # Copy the built files to the pseudo-installation tree.
-        self.make_install_tree (output_dir, inputs, outputs)
+        self.announce ("installing to %s" % self.bdist_dir)
+        install.ensure_ready()
+        install.run()
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       get_platform())
-        print "output_dir = %s" % output_dir
+        print "self.bdist_dir = %s" % self.bdist_dir
         print "self.format = %s" % self.format
         self.make_archive (archive_basename, self.format,
-                           root_dir=output_dir)
+                           root_dir=self.bdist_dir)
 
         if not self.keep_tree:
-            remove_tree (output_dir, self.verbose, self.dry_run)
+            remove_tree (self.bdist_dir, self.verbose, self.dry_run)
 
     # run()
 
-
-    def strip_base_dirs (self, outputs, install_cmd):
-        # XXX this throws away the prefix/exec-prefix distinction, and
-        # means we can only correctly install the resulting archive on a
-        # system where prefix == exec-prefix (but at least we can *create*
-        # it on one where they differ).  I don't see a way to fix this
-        # without either 1) generating two archives, one for prefix and one
-        # for exec-prefix, or 2) putting absolute paths in the archive
-        # rather than making them relative to one of the prefixes.
-
-        base = install_cmd.install_base + os.sep
-        platbase = install_cmd.install_platbase + os.sep
-        b_len = len (base)
-        pb_len = len (platbase)
-        for i in range (len (outputs)):
-            if outputs[i][0:b_len] == base:
-                outputs[i] = outputs[i][b_len:]
-            elif outputs[i][0:pb_len] == platbase:
-                outputs[i] = outputs[i][pb_len:]
-            else:
-                raise DistutilsInternalError, \
-                      ("installation output filename '%s' doesn't start " + 
-                       "with either install_base ('%s') or " +
-                       "install_platbase ('%s')") % \
-                      (outputs[i], base, platbase)
-
-    # strip_base_dirs()
-
-
-    def make_install_tree (self, output_dir, inputs, outputs):
-
-        assert (len(inputs) == len(outputs))
-
-        # Create all the directories under 'output_dir' necessary to
-        # put 'outputs' there.
-        create_tree (output_dir, outputs,
-                     verbose=self.verbose, dry_run=self.dry_run)
-
-
-        # XXX this bit of logic is duplicated in sdist.make_release_tree():
-        # would be nice to factor it out...
-        if hasattr (os, 'link'):        # can make hard links on this system
-            link = 'hard'
-            msg = "making hard links in %s..." % output_dir
-        else:                           # nope, have to copy
-            link = None
-            msg = "copying files to %s..." % output_dir
-
-        for i in range (len(inputs)):
-            output = os.path.join (output_dir, outputs[i])
-            self.copy_file (inputs[i], output, link=link)
-
-    # make_install_tree ()
-
-
 # class bdist_dumb

From 046f4ee3aab641fbb6c72931d116e1c58bb99511 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:07:53 +0000
Subject: [PATCH 0340/8469] Added 'get_inputs()' methods, needed by the
 "install" command's 'get_inputs()'.

---
 command/install_data.py    | 3 +++
 command/install_scripts.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/command/install_data.py b/command/install_data.py
index 95ef423127..448614b050 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -18,3 +18,6 @@ def finalize_options (self):
 
     def run (self):
         self._copy_files(self.distribution.data)
+
+    def get_inputs (self):
+        return self.distribution.data or []
diff --git a/command/install_scripts.py b/command/install_scripts.py
index 4e23efc8b6..43e5fc18bc 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -32,4 +32,7 @@ def run (self):
                     self.announce("changing mode of %s to %o" % (file, mode))
                     os.chmod(file, mode)
 
+    def get_inputs (self):
+        return self.distribution.scripts or []
+
 # class install_scripts

From 783f98d5381de82ad91e71bb529bf001d0e69456 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:08:28 +0000
Subject: [PATCH 0341/8469] Added the 'bdist_base' option, the base temp
 directory for all bdist commands.

---
 command/bdist.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 970779dcaa..892712ecfb 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -11,13 +11,16 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
+from distutils.util import get_platform
 
 
 class bdist (Command):
 
     description = "create a built (binary) distribution"
 
-    user_options = [('format=', 'f',
+    user_options = [('bdist-base=', 'b',
+                     "temporary directory for creating built distributions"),
+                    ('format=', 'f',
                      "format for distribution " +
                      "(tar, ztar, gztar, bztar, zip, ... )"),
                    ]
@@ -39,12 +42,21 @@ class bdist (Command):
 
 
     def initialize_options (self):
+        self.bdist_base = None
         self.format = None
 
     # initialize_options()
 
 
     def finalize_options (self):
+        # 'bdist_base' -- parent of per-built-distribution-format
+        # temporary directories (eg. we'll probably have
+        # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.)
+        if self.bdist_base is None:
+            build_base = self.find_peer('build').build_base
+            plat = get_platform()
+            self.bdist_base = os.path.join (build_base, 'bdist.' + plat)
+
         if self.format is None:
             try:
                 self.format = self.default_format[os.name]
@@ -55,7 +67,6 @@ def finalize_options (self):
         #elif type (self.format) is StringType:
         #    self.format = string.split (self.format, ',')
             
-
     # finalize_options()
 
 

From d3e1d51b64dc3cbddc78212a358a69cb51737e8e Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:09:50 +0000
Subject: [PATCH 0342/8469] List data files are listed in the Distribution
 attribute 'data_files', rather than 'data'.

---
 command/install_data.py | 4 ++--
 dist.py                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index 448614b050..fd9836b607 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -17,7 +17,7 @@ def finalize_options (self):
         self._install_dir_from('install_data')
 
     def run (self):
-        self._copy_files(self.distribution.data)
+        self._copy_files(self.distribution.data_files)
 
     def get_inputs (self):
-        return self.distribution.data or []
+        return self.distribution.data_files or []
diff --git a/dist.py b/dist.py
index 998cff7190..24c8d2b853 100644
--- a/dist.py
+++ b/dist.py
@@ -155,7 +155,7 @@ def __init__ (self, attrs=None):
         self.include_dirs = None
         self.extra_path = None
         self.scripts = None
-        self.data = None
+        self.data_files = None
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to

From cc5ee731de127fa418aa290fa486531f9ce2e9e8 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:10:30 +0000
Subject: [PATCH 0343/8469] In 'install_misc': 'self.outfiles' defaults to the
 empty list, so we don't have to worry about "or []" in 'get_outputs()'.

---
 cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd.py b/cmd.py
index 28d8617949..c544b86440 100644
--- a/cmd.py
+++ b/cmd.py
@@ -353,7 +353,7 @@ class install_misc (Command):
 
     def initialize_options (self):
         self.install_dir = None
-        self.outfiles = None
+        self.outfiles = []
 
     def _install_dir_from (self, dirname):
         self.set_undefined_options('install', (dirname, 'install_dir'))

From 6c282fc092bc44258e4d614b541ff59d15bb6582 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:11:40 +0000
Subject: [PATCH 0344/8469] Contribution from Harry Henry Gebel: the
 'bdist_rpm' command.

(Completely uninspected and untested by me, this is just to
get the code into CVS!)
---
 command/bdist_rpm.py | 390 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 390 insertions(+)
 create mode 100644 command/bdist_rpm.py

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
new file mode 100644
index 0000000000..9c3aca3bc1
--- /dev/null
+++ b/command/bdist_rpm.py
@@ -0,0 +1,390 @@
+"""distutils.command.bdist_rpm
+
+Implements the Distutils 'bdist_rpm' command (create RPM source and binary
+distributions."""
+
+# created 2000/04/25, by Harry Henry Gebel
+
+__revision__ = "$Id$"
+
+from os.path import exists, basename
+import os
+from distutils.core import Command
+from distutils.util import mkpath, write_file, copy_file
+from distutils.errors import *
+from string import join, lower
+from types import StringType, DictType, LongType, FloatType, IntType, \
+     ListType, TupleType
+
+class bdist_rpm (Command):
+
+    description = "create an RPM distribution"
+
+    user_options = [
+        ('spec-only', None,
+         "Only regenerate spec file"),
+        ('source-only', None,
+         "Only generate source RPM"),
+        ('binary-only', None,
+         "Only generate binary RPM"),
+        ('use-bzip2', None,
+         "Use bzip2 instead of gzip to create source distribution"),
+        ('no-clean', None,
+         "Do not clean RPM build directory"),
+        ('no-rpm-opt-flags', None,
+         "Do not pass any RPM CFLAGS to compiler")
+        ]
+
+
+    def initialize_options (self):
+        self.spec_only = None
+        self.binary_only = None
+        self.source_only = None
+        self.use_bzip2 = None
+        self.no_clean = None
+        self.no_rpm_opt_flags = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        if os.name != 'posix':
+            raise DistutilsPlatformError, \
+                  ("don't know how to create RPM "
+                   "distributions on platform %s" % os.name)
+        if self.binary_only and self.source_only:
+            raise DistutilsOptionsError, \
+                  "Cannot supply both '--source-only' and '--binary-only'"
+        # don't pass CFLAGS to pure python distributions
+        if not self.distribution.has_ext_modules():
+            self.no_rpm_opt_flags = 1
+
+    # finalize_options()
+
+
+    def run (self):
+        self._get_package_data() # get packaging info
+
+
+        # make directories
+        if self.spec_only:
+            self.execute(mkpath, ('redhat',), "Created './redhat' directory")
+        else:
+            self.execute(mkpath, ('build/rpm/SOURCES',),
+                         "Created RPM source directory")
+            self.execute(mkpath, ('build/rpm/SPECS',),
+                         "Created RPM source directory")
+            self.execute(mkpath, ('build/rpm/BUILD',),
+                         "Created RPM source directory")
+            self.execute(mkpath, ('build/rpm/RPMS',),
+                         "Created RPM source directory")
+            self.execute(mkpath, ('build/rpm/SRPMS',),
+                         "Created RPM source directory")
+
+        # spec file goes into .redhat directory if '--spec-only specified',
+        # into build/rpm/spec otherwisu
+        if self.spec_only:
+            spec_path = './redhat/%s.spec' % self.distribution.get_name()
+        else:
+            spec_path = ('build/rpm/SPECS/%s.spec' %
+                         self.distribution.get_name())
+        self.execute(write_file,
+                     (spec_path,
+                      self._make_spec_file()),
+                     'Writing .spec file')
+
+        if self.spec_only: # stop if requested
+            return
+
+        # make a source distribution and copy to SOURCES directory with
+        # optional icon
+        sdist = self.find_peer ('sdist')
+        if self.use_bzip2:
+            sdist.formats = ['bztar']
+        else:
+            sdist.formats = ['gztar']
+        self.run_peer('sdist')
+        if self.use_bzip2:
+            source = self.distribution.get_fullname() + '.tar.bz2'
+        else:
+            source = self.distribution.get_fullname() + '.tar.gz'
+        self.execute(copy_file, (source, 'build/rpm/SOURCES'),
+                     'Copying source distribution to SOURCES')
+        if self.icon:
+            if exists(self.icon):
+                self.execute(copy_file, (self.icon, 'build/rpm/SOURCES'),
+                     'Copying icon to SOURCES')
+            else:
+                raise DistutilsFileError, \
+                      "Unable to find icon file '%s'" % self.icon
+        
+
+        # build package
+        self.announce('Building RPMs')
+        rpm_args = ['rpm',]
+        if self.source_only: # what kind of RPMs?
+            rpm_args.append('-bs')
+        elif self.binary_only:
+            rpm_args.append('-bb')
+        else:
+            rpm_args.append('-ba')
+        topdir = os.getcwd() + 'build/rpm'
+        rpm_args.extend(['--define',
+                         '_topdir ' + os.getcwd() + '/build/rpm',])
+        if not self.no_clean:
+            rpm_args.append('--clean')
+        rpm_args.append(spec_path)
+        self.spawn(rpm_args)
+
+    # run()
+
+
+    def _get_package_data(self):
+        ''' Get data needed to generate spec file, first from the
+        DistributionMetadata class, then from the package_data file, which is
+        Python code read with execfile() '''
+
+        package_type = 'rpm'
+        
+        # read in package data, if any
+        if exists('package_data'):
+            try:
+                exec(open('package_data'))
+            except:
+                raise DistutilsOptionError, 'Unable to parse package data file'
+
+        # set instance variables, supplying default value if not provided in
+        # package data file
+        self.package_data = locals()
+
+        # the following variables must be {string (len() = 2): string}
+        self.summaries = self._check_string_dict('summaries')
+        self.descriptions = self._check_string_dict('descriptions')
+
+        # The following variable must be an ordinary number or a string
+        self.release = self._check_number_or_string('release', '1')
+        self.serial = self._check_number_or_string('serial')
+
+        # The following variables must be strings
+        self.group = self._check_string('group', 'Development/Libraries')
+        self.vendor = self._check_string('vendor')
+        self.packager = self._check_string('packager')
+        self.changelog = self._check_string('changelog')
+        self.icon = self._check_string('icon')
+        self.distribution_name = self._check_string('distribution_name')
+        self.pre = self._check_string('pre')
+        self.post = self._check_string('post')
+        self.preun = self._check_string('preun')
+        self.postun = self._check_string('postun')
+        self.prep = self._check_string('prep', '%setup')
+        if not self.no_rpm_opt_flags:
+            self.build = (self._check_string(
+                'build',
+                'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'))
+        else:
+            self.build = (self._check_string('build', 'python setup.py build'))
+        self.install = self._check_string(
+            'install',
+            'python setup.py install --root=$RPM_BUILD_ROOT --record')
+        self.clean = self._check_string(
+            'clean',
+            'rm -rf $RPM_BUILD_ROOT')
+
+        # The following variables must be a list or tuple of strings, or a
+        # string
+        self.doc = self._check_string_list('doc')
+        if type(self.doc) == ListType:
+            for readme in ('README', 'README.txt'):
+                if exists(readme) and readme not in self.doc:
+                    self.doc.append(readme)
+            self.doc = join(self.doc)
+        self.provides = join(self._check_string_list('provides'))
+        self.requires = join(self._check_string_list('requires'))
+        self.conflicts = join(self._check_string_list('conflicts'))
+        self.build_requires = join(self._check_string_list('build_requires'))
+        self.obsoletes = join(self._check_string_list('obsoletes'))
+
+    def _make_spec_file(self):
+        ''' Generate an RPM spec file '''
+
+        # definitons and headers
+        spec_file = [
+            '%define name ' + self.distribution.get_name(),
+            '%define version ' + self.distribution.get_version(),
+            '%define release ' + self.release,
+            '',
+            'Summary: ' + self.distribution.get_description(),
+            ]
+
+        # put locale summaries into spec file
+        for locale in self.summaries.keys():
+            spec_file.append('Summary(%s): %s' % (locale,
+                                                  self.summaries[locale]))
+
+        spec_file.extend([
+            'Name: %{name}',
+            'Version: %{version}',
+            'Release: %{release}',])
+        if self.use_bzip2:
+            spec_file.append('Source0: %{name}-%{version}.tar.bz2')
+        else:
+            spec_file.append('Source0: %{name}-%{version}.tar.gz')
+        spec_file.extend([
+            'Copyright: ' + self.distribution.get_licence(),
+            'Group: ' + self.group,
+            'BuildRoot: %{_tmppath}/%{name}-buildroot',
+            'Prefix: %{_prefix}', ])
+
+        # noarch if no extension modules
+        if not self.distribution.has_ext_modules():
+            spec_file.append('BuildArchitectures: noarch')
+
+        for field in ('Vendor',
+                      'Packager',
+                      'Provides',
+                      'Requires',
+                      'Conflicts',
+                      'Obsoletes',
+                      ):
+            if getattr(self, lower(field)):
+                spec_file.append('%s: %s' % (field, getattr(self,
+                                                            lower(field))))
+                      
+        if self.distribution.get_url() != 'UNKNOWN':
+            spec_file.append('Url: ' + self.distribution.get_url())
+
+        if self.distribution_name:
+             spec_file.append('Distribution: ' + self.distribution_name)
+
+        if self.build_requires:
+             spec_file.append('BuildRequires: ' + self.build_requires)
+
+        if self.icon:
+            spec_file.append('Icon: ' + basename(self.icon))
+
+        spec_file.extend([
+            '',
+            '%description',
+            self.distribution.get_long_description()
+            ])
+
+        # put locale descriptions into spec file
+        for locale in self.descriptions.keys():
+            spec_file.extend([
+                '',
+                '%description -l ' + locale,
+                self.descriptions[locale],
+                ])
+
+        # rpm scripts
+        for script in ('prep',
+                       'build',
+                       'install',
+                       'clean',
+                       'pre',
+                       'post',
+                       'preun',
+                       'postun',
+                       ):
+            if getattr(self, script):
+                spec_file.extend([
+                    '',
+                    '%' + script,
+                    getattr(self, script),
+                    ])
+
+        
+        # files section
+        spec_file.extend([
+            '',
+            '%files -f INSTALLED_FILES',
+            '%defattr(-,root,root)',
+            ])
+
+        if self.doc:
+            spec_file.append('%doc ' + self.doc)
+
+        if self.changelog:
+            spec_file.extend([
+                '',
+                '%changelog',
+                self.changelog
+                ])
+
+        return spec_file
+
+    def _check_string_dict(self, var_name, default_value = {}):
+        ''' Tests a wariable to determine if it is {string: string},
+        var_name is the name of the wariable. Return the value if it is valid,
+        returns default_value if the variable does not exist, raises
+        DistutilsOptionError if the variable is not valid'''
+        if self.package_data.has_key(var_name):
+            pass_test = 1 # set to 0 if fails test
+            value = self.package_data[var_name]
+            if type(value) == DictType:
+                for locale in value.keys():
+                    if (type(locale) != StringType) or (type(value[locale]) !=
+                                                         StringType):
+                        pass_test = 0
+                        break
+                if pass_test:
+                    return test_me
+            raise DistutilsOptionError, \
+                  ("Error in package_data: '%s' must be dictionary: "
+                   '{string: string}' % var_name)
+        else:
+            return default_value
+
+    def _check_string(self, var_name, default_value = None):
+        ''' Tests a variable in package_data to determine if it is a string,
+        var_name is the name of the wariable. Return the value if it is a
+        string, returns default_value if the variable does not exist, raises
+        DistutilsOptionError if the variable is not a string'''
+        if self.package_data.has_key(var_name):
+            if type(self.package_data[var_name]) == StringType:
+                return self.package_data[var_name]
+            else:
+                raise DistutilsOptionError, \
+                      "Error in package_data: '%s' must be a string" % var_name
+        else:
+            return default_value
+
+    def _check_number_or_string(self, var_name, default_value = None):
+        ''' Tests a variable in package_data to determine if it is a number or
+        a string, var_name is the name of the wariable. Return the value if it
+        is valid, returns default_value if the variable does not exist, raises
+        DistutilsOptionError if the variable is not valid'''
+        if self.package_data.has_key(var_name):
+            if type(self.package_data[var_name]) in (StringType, LongType,
+                                                     IntType, FloatType):
+                return str(self.package_data[var_name])
+            else:
+                raise DistutilsOptionError, \
+                      ("Error in package_data: '%s' must be a string or a "
+                       'number' % var_name)
+        else:
+            return default_value
+
+    def _check_string_list(self, var_name, default_value = []):
+        ''' Tests a variable in package_data to determine if it is a string or
+        a list or tuple of strings, var_name is the name of the wariable.
+        Return the value as a string or a list if it is valid, returns
+        default_value if the variable does not exist, raises
+        DistutilsOptionError if the variable is not valid'''
+        if self.package_data.has_key(var_name):
+            value = self.package_data[var_name]
+            pass_test = 1
+            if type(value) == StringType:
+                return value
+            elif type(value) in (ListType, TupleType):
+                for item in value:
+                    if type(item) != StringType:
+                        pass_test = 0
+                        break
+                if pass_test:
+                    return list(value)
+            raise DistutilsOptionError, \
+                  ("Error in package_data: '%s' must be a string or a "
+                   'list or tuple of strings' % var_name)
+        else:
+            return default_value

From e46022cedb21e05ca1292aae4f598817b0c195c6 Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:32:36 +0000
Subject: [PATCH 0345/8469] Template for writing Distutils command modules.

---
 command/command_template | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 command/command_template

diff --git a/command/command_template b/command/command_template
new file mode 100644
index 0000000000..f0329aa9f9
--- /dev/null
+++ b/command/command_template
@@ -0,0 +1,39 @@
+"""distutils.command.x
+
+Implements the Distutils 'x' command."""
+
+# created 2000/mm/dd, Greg Ward
+
+__revision__ = "$Id$"
+
+from distutils.core import Command
+
+
+class x (Command):
+
+    description = ""
+
+    user_options = [('', '',
+                     ""),
+                   ]
+
+
+    def initialize_options (self):
+        self. = None
+        self. = None
+        self. = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+
+    # finalize_options()
+
+
+    def run (self):
+
+
+    # run()
+
+# class x

From ed02ed8aaba4efefd9e172b8f39e4f82e93a627c Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Sat, 13 May 2000 03:35:05 +0000
Subject: [PATCH 0346/8469] Changed default developer name. Added some guiding
 comments.

---
 command/command_template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/command_template b/command/command_template
index f0329aa9f9..73c1c190db 100644
--- a/command/command_template
+++ b/command/command_template
@@ -2,7 +2,7 @@
 
 Implements the Distutils 'x' command."""
 
-# created 2000/mm/dd, Greg Ward
+# created 2000/mm/dd, John Doe
 
 __revision__ = "$Id$"
 
@@ -11,8 +11,11 @@ from distutils.core import Command
 
 class x (Command):
 
+    # Brief (40-50 characters) description of the command
     description = ""
 
+    # List of option tuples: long name, short name (None if no short
+    # name), and help string.
     user_options = [('', '',
                      ""),
                    ]
@@ -27,6 +30,8 @@ class x (Command):
 
 
     def finalize_options (self):
+        if self.x is None:
+            self.x = 
 
     # finalize_options()
 

From 33eb8cbf408e379e5e965c32b1365d3f961003a4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 13:23:21 +0000
Subject: [PATCH 0347/8469] Added support for the 'export_symbols' parameter to
 'link_shared_object()' and 'link_shared_lib()'.  In MSVCCompiler, this is
 meaningful: it adds /EXPORT: options to the linker command line.  In
 UnixCCompiler, it is ignored.

---
 ccompiler.py     | 10 +++++++++-
 msvccompiler.py  | 12 ++++++++++--
 unixccompiler.py |  3 +++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index ffad294706..51f5ae02a9 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -493,6 +493,7 @@ def link_shared_lib (self,
                          libraries=None,
                          library_dirs=None,
                          runtime_library_dirs=None,
+                         export_symbols=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -515,7 +516,13 @@ def link_shared_lib (self,
            search for libraries that were specified as bare library names
            (ie. no directory component).  These are on top of the system
            default and those supplied to 'add_library_dir()' and/or
-           'set_library_dirs()'.
+           'set_library_dirs()'.  'runtime_library_dirs' is a list of
+           directories that will be embedded into the shared library and
+           used to search for other shared libraries that *it* depends on
+           at run-time.  (This may only be relevant on Unix.)
+
+           'export_symbols' is a list of symbols that the shared library
+           will export.  (This appears to be relevant only on Windows.)
 
            'debug' is as for 'compile()' and 'create_static_lib()', with the
            slight distinction that it actually matters on most platforms
@@ -536,6 +543,7 @@ def link_shared_object (self,
                             libraries=None,
                             library_dirs=None,
                             runtime_library_dirs=None,
+                            export_symbols=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
diff --git a/msvccompiler.py b/msvccompiler.py
index 3667afcd2d..b6ff432ce3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -304,6 +304,7 @@ def link_shared_lib (self,
                          libraries=None,
                          library_dirs=None,
                          runtime_library_dirs=None,
+                         export_symbols=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -313,6 +314,8 @@ def link_shared_lib (self,
                                  output_dir=output_dir,
                                  libraries=libraries,
                                  library_dirs=library_dirs,
+                                 runtime_library_dirs=runtime_library_dirs,
+                                 export_symbols=export_symbols,
                                  debug=debug,
                                  extra_preargs=extra_preargs,
                                  extra_postargs=extra_postargs)
@@ -325,6 +328,7 @@ def link_shared_object (self,
                             libraries=None,
                             library_dirs=None,
                             runtime_library_dirs=None,
+                            export_symbols=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
@@ -350,8 +354,12 @@ def link_shared_object (self,
             else:
                 ldflags = self.ldflags_shared
 
-            ld_args = ldflags + lib_opts + \
-                      objects + ['/OUT:' + output_filename]
+            export_opts = []
+            for sym in (export_symbols or []):
+                export_opts.append("/EXPORT:" + sym)
+
+            ld_args = (ldflags + lib_opts + export_opts + 
+                       objects + ['/OUT:' + output_filename])
 
             if extra_preargs:
                 ld_args[:0] = extra_preargs
diff --git a/unixccompiler.py b/unixccompiler.py
index 5e1524c67c..40f564ab88 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -178,6 +178,7 @@ def link_shared_lib (self,
                          libraries=None,
                          library_dirs=None,
                          runtime_library_dirs=None,
+                         export_symbols=None,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
@@ -188,6 +189,7 @@ def link_shared_lib (self,
             libraries,
             library_dirs,
             runtime_library_dirs,
+            export_symbols,
             debug,
             extra_preargs,
             extra_postargs)
@@ -200,6 +202,7 @@ def link_shared_object (self,
                             libraries=None,
                             library_dirs=None,
                             runtime_library_dirs=None,
+                            export_symbols=None,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):

From 05fa00ab977197b8e02c7a99443e3541cdfc3624 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 13:31:32 +0000
Subject: [PATCH 0348/8469] Lyle Johnson: added stubs for the four
 miscellaneous methods that must be implemented by subclasses, since they are
 needed by 'gen_lib_options()'.

---
 ccompiler.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index 51f5ae02a9..42221769e6 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -575,6 +575,33 @@ def link_executable (self,
 
 
 
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function; there is
+    # no appropriate default implementation so subclasses should
+    # implement all of these.
+
+    def library_dir_option (self, dir):
+        """Return the compiler option to add 'dir' to the list of directories
+           searched for libraries."""
+        raise NotImplementedError
+
+    def runtime_library_dir_option (self, dir):
+        """Return the compiler option to add 'dir' to the list of directories
+           searched for runtime libraries."""
+        raise NotImplementedError
+
+    def library_option (self, lib):
+        """Return the compiler option to add 'dir' to the list of libraries
+           linked into the shared library or executable."""
+        raise NotImplementedError
+
+    def find_library_file (self, dirs, lib):
+        """Search the specified list of directories for a static or shared
+           library file 'lib' and return the full path to that file. Return
+           None if it wasn't found in any of the specified directories."""
+        raise NotImplementedError
+
+
     # -- Filename generation methods -----------------------------------
 
     # The default implementation of the filename generating methods are

From 022c5e143c2e7f68bc794a3f108a70193b302533 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 14:07:59 +0000
Subject: [PATCH 0349/8469] Added missing import.

---
 dist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist.py b/dist.py
index 24c8d2b853..0f131980b8 100644
--- a/dist.py
+++ b/dist.py
@@ -12,6 +12,7 @@
 from types import *
 from copy import copy
 from distutils.errors import *
+from distutils import sysconfig
 from distutils.fancy_getopt import FancyGetopt, longopt_xlate
 from distutils.util import check_environ
 

From dcc3e4d4cbc4029ba8c71691613faef73a4c1c4d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 15:06:48 +0000
Subject: [PATCH 0350/8469] Added 'has_scripts()', 'has_data_files()' methods.

---
 dist.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dist.py b/dist.py
index 0f131980b8..03b20e1f57 100644
--- a/dist.py
+++ b/dist.py
@@ -639,6 +639,12 @@ def has_c_libraries (self):
     def has_modules (self):
         return self.has_pure_modules() or self.has_ext_modules()
 
+    def has_scripts (self):
+        return self.scripts and len(self.scripts) > 0
+
+    def has_data_files (self):
+        return self.data_files and len(self.data_files) > 0
+
     def is_pure (self):
         return (self.has_pure_modules() and
                 not self.has_ext_modules() and

From 81213a2c15fe76d6d0a05621cad1959ac8deecad Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 15:08:57 +0000
Subject: [PATCH 0351/8469] Check if the claimed build directory doesn't exist,
 and warn that we don't have any Python modules to install (rather than bomb
 when we try to copy a non-existent directory).

---
 command/install_lib.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 63c7a6bf00..5b3d77a399 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -53,7 +53,12 @@ def run (self):
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of
         # having a build directory!)
-        outfiles = self.copy_tree (self.build_dir, self.install_dir)
+        if os.path.isdir(self.build_dir):
+            outfiles = self.copy_tree (self.build_dir, self.install_dir)
+        else:
+            self.warn("'%s' does not exist -- no Python modules to install" %
+                      self.build_dir)
+            return
 
         # (Optionally) compile .py to .pyc
         # XXX hey! we can't control whether we optimize or not; that's up

From 8e79f197fb13982a17cfc1dfa4187444f290f7a5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 15:17:09 +0000
Subject: [PATCH 0352/8469] Changed the semantics of the 'sub_commands' list:
 instead of function   objects, it now has method names. Added three methods,
 'has_lib()', 'has_scripts()', and 'has_data()'   to determine if we need to
 run each of the three possible sub-commands. Added 'get_sub_commands()' to
 take care of finding the methods named   in 'sub_commands', running them, and
 interpreting the results to   build a list of sub-commands that actually have
 to be run.

---
 command/install.py | 65 +++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/command/install.py b/command/install.py
index a4986e5d5d..392fe507c9 100644
--- a/command/install.py
+++ b/command/install.py
@@ -93,14 +93,14 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    # 'sub_commands': a list of commands this command might have to run
-    # to get its work done.  Each command is represented as a tuple
-    # (func, command) where 'func' is a function to call that returns
-    # true if 'command' (the sub-command name, a string) needs to be
-    # run.  If 'func' is None, assume that 'command' must always be run.
-    sub_commands = [(None, 'install_lib'),
-                    (None, 'install_scripts'),
-                    (None, 'install_data'),
+    # 'sub_commands': a list of commands this command might have to run to
+    # get its work done.  Each command is represented as a tuple (method,
+    # command) where 'method' is the name of a method to call that returns
+    # true if 'command' (the sub-command name, a string) needs to be run.
+    # If 'method' is None, assume that 'command' must always be run.
+    sub_commands = [('has_lib', 'install_lib'),
+                    ('has_scripts', 'install_scripts'),
+                    ('has_data', 'install_data'),
                    ]
 
 
@@ -422,17 +422,29 @@ def handle_extra_path (self):
     # handle_extra_path ()
 
 
+    def get_sub_commands (self):
+        """Return the list of subcommands that we need to run.  This is
+        based on the 'subcommands' class attribute: each tuple in that list
+        can name a method that we call to determine if the subcommand needs
+        to be run for the current distribution."""
+        commands = []
+        for (method, cmd_name) in self.sub_commands:
+            if method is not None:
+                method = getattr(self, method)
+            if method is None or method():
+                commands.append(cmd_name)
+        return commands
+
+
     def run (self):
 
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_peer ('build')
 
-        # Run all sub-commands: currently this just means install all
-        # Python modules using 'install_lib'.
-        for (func, cmd_name) in self.sub_commands:
-            if func is None or func():
-                self.run_peer (cmd_name)
+        # Run all sub-commands (at least those that need to be run)
+        for cmd_name in self.get_sub_commands():
+            self.run_peer (cmd_name)
 
         if self.path_file:
             self.create_path_file ()
@@ -460,14 +472,26 @@ def run (self):
     # run ()
 
 
+    def has_lib (self):
+        """Return true if the current distribution has any Python
+        modules to install."""
+        return (self.distribution.has_pure_modules() or
+                self.distribution.has_ext_modules())
+
+    def has_scripts (self):
+        return self.distribution.has_scripts()
+
+    def has_data (self):
+        return self.distribution.has_data_files()
+
+
     def get_outputs (self):
         # This command doesn't have any outputs of its own, so just
         # get the outputs of all its sub-commands.
         outputs = []
-        for (func, cmd_name) in self.sub_commands:
-            if func is None or func():
-                cmd = self.find_peer (cmd_name)
-                outputs.extend (cmd.get_outputs())
+        for cmd_name in self.get_sub_commands():
+            cmd = self.find_peer (cmd_name)
+            outputs.extend (cmd.get_outputs())
 
         return outputs
 
@@ -475,10 +499,9 @@ def get_outputs (self):
     def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
-        for (func, cmd_name) in self.sub_commands:
-            if func is None or func():
-                cmd = self.find_peer (cmd_name)
-                inputs.extend (cmd.get_inputs())
+        for cmd_name in self.get_sub_commands():
+            cmd = self.find_peer (cmd_name)
+            inputs.extend (cmd.get_inputs())
 
         return inputs
 

From a745efa83a06a337f54b8a80362957bdb4cdf4bc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 16:05:34 +0000
Subject: [PATCH 0353/8469] Tweaked output of 'copy_file()': if copying to a
 new name, show the whole destination path, otherwise show just the directory.

---
 file_util.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/file_util.py b/file_util.py
index 32245109d5..a73db42b54 100644
--- a/file_util.py
+++ b/file_util.py
@@ -90,7 +90,7 @@ def copy_file (src, dst,
        (os.symlink) instead of copying: set it to "hard" or "sym"; if it
        is None (the default), files are copied.  Don't set 'link' on
        systems that don't support it: 'copy_file()' doesn't check if
-       hard or symbolic linking is availalble.
+       hard or symbolic linking is available.
 
        Under Mac OS, uses the native file copy function in macostools;
        on other systems, uses '_copy_file_contents()' to copy file
@@ -131,8 +131,11 @@ def copy_file (src, dst,
         raise ValueError, \
               "invalid value '%s' for 'link' argument" % link
     if verbose:
-        print "%s %s -> %s" % (action, src, dir)
-
+        if os.path.basename(dst) == os.path.basename(src):
+            print "%s %s -> %s" % (action, src, dir)
+        else:
+            print "%s %s -> %s" % (action, src, dst)
+            
     if dry_run:
         return 1
 

From 0f61807acb702df144c2266a92fc7a60988c9581 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 01:42:17 +0000
Subject: [PATCH 0354/8469] Marching towards full support of config files:
 thoroughly overhauled the command-line parsing code, splitting it up into
 several methods (new methods: '_parse_command_opts()', '_show_help()') and
 making it put options into the 'command_options' dictionary rather than
 instantiating command objects and putting them there.

Lots of other little changes:
  * merged 'find_command_class()' and 'create_command_obj()' and
    called the result 'get_command_class()'
  * renamed 'find_command_obj()' to 'get_command_obj()', and added
    command object creation and maintenance of the command object cache to
    its responsibilities (taken over from 'create_command_obj()')
  * parse config files one-at-a-time, so we can keep track of the
    filename for later error reporting
  * tweaked some help messages
  * fixed up many obsolete comments and docstrings
---
 dist.py | 447 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 238 insertions(+), 209 deletions(-)

diff --git a/dist.py b/dist.py
index 03b20e1f57..3fd29d9f48 100644
--- a/dist.py
+++ b/dist.py
@@ -48,15 +48,10 @@ class Distribution:
     # since every global option is also valid as a command option -- and we
     # don't want to pollute the commands with too many options that they
     # have minimal control over.
-    global_options = [('verbose', 'v',
-                       "run verbosely (default)"),
-                      ('quiet', 'q',
-                       "run quietly (turns verbosity off)"),
-                      ('dry-run', 'n',
-                       "don't actually do anything"),
-                      ('help', 'h',
-                       "show this help message, plus help for any commands " +
-                       "given on the command-line"),
+    global_options = [('verbose', 'v', "run verbosely (default)"),
+                      ('quiet', 'q', "run quietly (turns verbosity off)"),
+                      ('dry-run', 'n', "don't actually do anything"),
+                      ('help', 'h', "show detailed help message"),
                      ]
 
     # options that are not propagated to the commands
@@ -78,11 +73,9 @@ class Distribution:
         ('maintainer-email', None,
          "print the maintainer's email address"),
         ('contact', None,
-         "print the name of the maintainer if present, "
-         "else author"),
+         "print the maintainer's name if known, else the author's"),
         ('contact-email', None,
-         "print the email of the maintainer if present, "
-         "else author"),
+         "print the maintainer's email address if known, else the author's"),
         ('url', None,
          "print the URL for this package"),
         ('licence', None,
@@ -139,9 +132,11 @@ def __init__ (self, attrs=None):
         # for the setup script to override command classes
         self.cmdclass = {}
 
-        # Store options for commands here between parsing them (from config
-        # files, the command-line, etc.) and actually putting them into the
-        # command object that needs them.
+        # 'command_options' is where we store command options between
+        # parsing them (from config files, the command-line, etc.) and when
+        # they are actually needed -- ie. when the command in question is
+        # instantiated.  It is a dictionary of dictionaries of 2-tuples:
+        #   command_options = { command_name : { option : (source, value) } }
         self.command_options = {}
 
         # These options are really the business of various commands, rather
@@ -190,7 +185,7 @@ def __init__ (self, attrs=None):
             if options:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
-                    cmd_obj = self.find_command_obj (command)
+                    cmd_obj = self.get_command_obj (command)
                     for (key, val) in cmd_options.items():
                         cmd_obj.set_option (key, val)
                 # loop over commands
@@ -210,6 +205,8 @@ def __init__ (self, attrs=None):
     # __init__ ()
 
 
+    # -- Config file finding/parsing methods ---------------------------
+
     def find_config_files (self):
         """Find as many configuration files as should be processed for this
         platform, and return a list of filenames in the order in which they
@@ -223,8 +220,8 @@ def find_config_files (self):
 
         On Windows and Mac OS, there are two possible config files:
         pydistutils.cfg in the Python installation directory (sys.prefix)
-        and setup.cfg in the current directory."""
-
+        and setup.cfg in the current directory.
+        """
         files = []
         if os.name == "posix":
             check_environ()
@@ -262,54 +259,50 @@ def parse_config_files (self, filenames=None):
             filenames = self.find_config_files()
 
         parser = ConfigParser()
-        parser.read(filenames)
-        for section in parser.sections():
-            options = parser.options(section)
-            if not self.command_options.has_key(section) is None:
-                self.command_options[section] = {}
-            cmd_opts = self.command_options[section]
-
-            for opt in options:
-                if opt != '__name__':
-                    cmd_opts[opt] = parser.get(section,opt)
+        for filename in filenames:
+            parser.read(filename)
+            for section in parser.sections():
+                options = parser.options(section)
+                if not self.command_options.has_key(section):
+                    self.command_options[section] = {}
+                opts = self.command_options[section]
+
+                for opt in options:
+                    if opt != '__name__':
+                        opts[opt] = (filename, parser.get(section,opt))
 
         from pprint import pprint
-        print "configuration options:"
+        print "options (after parsing config files):"
         pprint (self.command_options)
 
 
-    def parse_command_line (self, args):
-        """Parse the setup script's command line: set any Distribution
-           attributes tied to command-line options, create all command
-           objects, and set their options from the command-line.  'args'
-           must be a list of command-line arguments, most likely
-           'sys.argv[1:]' (see the 'setup()' function).  This list is first
-           processed for "global options" -- options that set attributes of
-           the Distribution instance.  Then, it is alternately scanned for
-           Distutils command and options for that command.  Each new
-           command terminates the options for the previous command.  The
-           allowed options for a command are determined by the 'options'
-           attribute of the command object -- thus, we instantiate (and
-           cache) every command object here, in order to access its
-           'options' attribute.  Any error in that 'options' attribute
-           raises DistutilsGetoptError; any error on the command-line
-           raises DistutilsArgError.  If no Distutils commands were found
-           on the command line, raises DistutilsArgError.  Return true if
-           command-line successfully parsed and we should carry on with
-           executing commands; false if no errors but we shouldn't execute
-           commands (currently, this only happens if user asks for
-           help)."""
-
-        # late import because of mutual dependence between these modules
-        from distutils.cmd import Command
-        from distutils.core import usage
+    # -- Command-line parsing methods ----------------------------------
 
+    def parse_command_line (self, args):
+        """Parse the setup script's command line.  'args' must be a list
+        of command-line arguments, most likely 'sys.argv[1:]' (see the
+        'setup()' function).  This list is first processed for "global
+        options" -- options that set attributes of the Distribution
+        instance.  Then, it is alternately scanned for Distutils
+        commands and options for that command.  Each new command
+        terminates the options for the previous command.  The allowed
+        options for a command are determined by the 'user_options'
+        attribute of the command class -- thus, we have to be able to
+        load command classes in order to parse the command line.  Any
+        error in that 'options' attribute raises DistutilsGetoptError;
+        any error on the command-line raises DistutilsArgError.  If no
+        Distutils commands were found on the command line, raises
+        DistutilsArgError.  Return true if command-line were
+        successfully parsed and we should carry on with executing
+        commands; false if no errors but we shouldn't execute commands
+        (currently, this only happens if user asks for help).
+        """
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
         # because each command will be handled by a different class, and
-        # the options that are valid for a particular class aren't
-        # known until we instantiate the command class, which doesn't
-        # happen until we know what the command is.
+        # the options that are valid for a particular class aren't known
+        # until we have loaded the command class, which doesn't happen
+        # until we know what the command is.
 
         self.commands = []
         parser = FancyGetopt (self.global_options + self.display_options)
@@ -323,91 +316,21 @@ def parse_command_line (self, args):
             return
             
         while args:
-            # Pull the current command from the head of the command line
-            command = args[0]
-            if not command_re.match (command):
-                raise SystemExit, "invalid command name '%s'" % command
-            self.commands.append (command)
-
-            # Make sure we have a command object to put the options into
-            # (this either pulls it out of a cache of command objects,
-            # or finds and instantiates the command class).
-            try:
-                cmd_obj = self.find_command_obj (command)
-            except DistutilsModuleError, msg:
-                raise DistutilsArgError, msg
-
-            # Require that the command class be derived from Command --
-            # want to be sure that the basic "command" interface is
-            # implemented.
-            if not isinstance (cmd_obj, Command):
-                raise DistutilsClassError, \
-                      "command class %s must subclass Command" % \
-                      cmd_obj.__class__
-
-            # Also make sure that the command object provides a list of its
-            # known options
-            if not (hasattr (cmd_obj, 'user_options') and
-                    type (cmd_obj.user_options) is ListType):
-                raise DistutilsClassError, \
-                      ("command class %s must provide " +
-                       "'user_options' attribute (a list of tuples)") % \
-                      cmd_obj.__class__
-
-            # Poof! like magic, all commands support the global
-            # options too, just by adding in 'global_options'.
-            negative_opt = self.negative_opt
-            if hasattr (cmd_obj, 'negative_opt'):
-                negative_opt = copy (negative_opt)
-                negative_opt.update (cmd_obj.negative_opt)
-
-            parser.set_option_table (self.global_options +
-                                     cmd_obj.user_options)
-            parser.set_negative_aliases (negative_opt)
-            args = parser.getopt (args[1:], cmd_obj)
-            if cmd_obj.help:
-                parser.set_option_table (self.global_options)
-                parser.print_help ("Global options:")
-                print
-
-                parser.set_option_table (cmd_obj.user_options)
-                parser.print_help ("Options for '%s' command:" % command)
-                print
-                print usage
+            args = self._parse_command_opts(parser, args)
+            if args is None:            # user asked for help (and got it)
                 return
-                
-            self.command_obj[command] = cmd_obj
-            self.have_run[command] = 0
-
-        # while args
-
-        # If the user wants help -- ie. they gave the "--help" option --
-        # give it to 'em.  We do this *after* processing the commands in
-        # case they want help on any particular command, eg.
-        # "setup.py --help foo".  (This isn't the documented way to
-        # get help on a command, but I support it because that's how
-        # CVS does it -- might as well be consistent.)
-        if self.help:
-            parser.set_option_table (self.global_options)
-            parser.print_help (
-                "Global options (apply to all commands, " +
-                "or can be used per command):")
-            print
 
-            if not self.commands:
-                parser.set_option_table (self.display_options)
-                parser.print_help (
-                    "Information display options (just display " +
-                    "information, ignore any commands)")
-                print
-
-            for command in self.commands:
-                klass = self.find_command_class (command)
-                parser.set_option_table (klass.user_options)
-                parser.print_help ("Options for '%s' command:" % command)
-                print
-
-            print usage
+        # Handle the cases of --help as a "global" option, ie.
+        # "setup.py --help" and "setup.py --help command ...".  For the
+        # former, we show global options (--verbose, --dry-run, etc.)
+        # and display-only options (--name, --version, etc.); for the
+        # latter, we omit the display-only options and show help for
+        # each command listed on the command line.
+        if self.help:
+            print "showing 'global' help; commands=", self.commands
+            self._show_help(parser,
+                            display_options=len(self.commands) == 0,
+                            commands=self.commands)
             return
 
         # Oops, no commands found -- an end-user error
@@ -419,12 +342,133 @@ def parse_command_line (self, args):
 
     # parse_command_line()
 
+    def _parse_command_opts (self, parser, args):
+
+        """Parse the command-line options for a single command.
+        'parser' must be a FancyGetopt instance; 'args' must be the list
+        of arguments, starting with the current command (whose options
+        we are about to parse).  Returns a new version of 'args' with
+        the next command at the front of the list; will be the empty
+        list if there are no more commands on the command line.  Returns
+        None if the user asked for help on this command.
+        """
+        # late import because of mutual dependence between these modules
+        from distutils.cmd import Command
+
+        # Pull the current command from the head of the command line
+        command = args[0]
+        if not command_re.match (command):
+            raise SystemExit, "invalid command name '%s'" % command
+        self.commands.append (command)
+
+        # Dig up the command class that implements this command, so we
+        # 1) know that it's a valid command, and 2) know which options
+        # it takes.
+        try:
+            cmd_class = self.get_command_class (command)
+        except DistutilsModuleError, msg:
+            raise DistutilsArgError, msg
+
+        # Require that the command class be derived from Command -- want
+        # to be sure that the basic "command" interface is implemented.
+        if not issubclass (cmd_class, Command):
+            raise DistutilsClassError, \
+                  "command class %s must subclass Command" % cmd_class
+
+        # Also make sure that the command object provides a list of its
+        # known options.
+        if not (hasattr (cmd_class, 'user_options') and
+                type (cmd_class.user_options) is ListType):
+            raise DistutilsClassError, \
+                  ("command class %s must provide " +
+                   "'user_options' attribute (a list of tuples)") % \
+                  cmd_class
+
+        # If the command class has a list of negative alias options,
+        # merge it in with the global negative aliases.
+        negative_opt = self.negative_opt
+        if hasattr (cmd_class, 'negative_opt'):
+            negative_opt = copy (negative_opt)
+            negative_opt.update (cmd_class.negative_opt)
+
+        # All commands support the global options too, just by adding
+        # in 'global_options'.
+        parser.set_option_table (self.global_options +
+                                 cmd_class.user_options)
+        parser.set_negative_aliases (negative_opt)
+        (args, opts) = parser.getopt (args[1:])
+        if opts.help:
+            print "showing help for command", cmd_class
+            self._show_help(parser, display_options=0, commands=[cmd_class])
+            return
+
+        # Put the options from the command-line into their official
+        # holding pen, the 'command_options' dictionary.
+        if not self.command_options.has_key(command):
+            self.command_options[command] = {}
+        cmd_opts = self.command_options[command]
+        for (name, value) in vars(opts).items():
+            cmd_opts[command] = ("command line", value)
+
+        return args
+
+    # _parse_command_opts ()
+
+
+    def _show_help (self,
+                    parser,
+                    global_options=1,
+                    display_options=1,
+                    commands=[]):
+        """Show help for the setup script command-line in the form of
+        several lists of command-line options.  'parser' should be a
+        FancyGetopt instance; do not expect it to be returned in the
+        same state, as its option table will be reset to make it
+        generate the correct help text.
+
+        If 'global_options' is true, lists the global options:
+        --verbose, --dry-run, etc.  If 'display_options' is true, lists
+        the "display-only" options: --name, --version, etc.  Finally,
+        lists per-command help for every command name or command class
+        in 'commands'.
+        """
+        # late import because of mutual dependence between these modules
+        from distutils.core import usage
+        from distutils.cmd import Command
+
+        if global_options:
+            parser.set_option_table (self.global_options)
+            parser.print_help ("Global options:")
+            print
+
+        if display_options:
+            parser.set_option_table (self.display_options)
+            parser.print_help (
+                "Information display options (just display " +
+                "information, ignore any commands)")
+            print
+
+        for command in self.commands:
+            if type(command) is ClassType and issubclass(klass, Command):
+                klass = command
+            else:
+                klass = self.get_command_class (command)
+            parser.set_option_table (klass.user_options)
+            parser.print_help ("Options for '%s' command:" % klass.__name__)
+            print
+
+        print usage
+        return
+
+    # _show_help ()
+
+
     def handle_display_options (self, option_order):
         """If there were any non-global "display-only" options
-         (--help-commands or the metadata display options) on the command
-         line, display the requested info and return true; else return
-         false."""
-
+        (--help-commands or the metadata display options) on the command
+        line, display the requested info and return true; else return
+        false.
+        """
         from distutils.core import usage
 
         # User just wants a list of commands -- we'll print it out and stop
@@ -456,14 +500,15 @@ def handle_display_options (self, option_order):
 
     def print_command_list (self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
-           'print_commands()'."""
+        'print_commands()'.
+        """
 
         print header + ":"
 
         for cmd in commands:
             klass = self.cmdclass.get (cmd)
             if not klass:
-                klass = self.find_command_class (cmd)
+                klass = self.get_command_class (cmd)
             try:
                 description = klass.description
             except AttributeError:
@@ -475,12 +520,13 @@ def print_command_list (self, commands, header, max_length):
 
 
     def print_commands (self):
-        """Print out a help message listing all available commands with
-           a description of each.  The list is divided into "standard
-           commands" (listed in distutils.command.__all__) and "extra
-           commands" (mentioned in self.cmdclass, but not a standard
-           command).  The descriptions come from the command class
-           attribute 'description'."""
+        """Print out a help message listing all available commands with a
+        description of each.  The list is divided into "standard commands"
+        (listed in distutils.command.__all__) and "extra commands"
+        (mentioned in self.cmdclass, but not a standard command).  The
+        descriptions come from the command class attribute
+        'description'.
+        """
 
         import distutils.command
         std_commands = distutils.command.__all__
@@ -508,19 +554,25 @@ def print_commands (self):
                                      max_length)
 
     # print_commands ()
-        
 
 
     # -- Command class/object methods ----------------------------------
 
-    def find_command_class (self, command):
-        """Given a command name, attempts to load the module and class that
-        implements that command.  This is done by importing a module
-        "distutils.command." + command, and a class named 'command' in that
-        module.
+    def get_command_class (self, command):
+        """Return the class that implements the Distutils command named by
+        'command'.  First we check the 'cmdclass' dictionary; if the
+        command is mentioned there, we fetch the class object from the
+        dictionary and return it.  Otherwise we load the command module
+        ("distutils.command." + command) and fetch the command class from
+        the module.  The loaded class is also stored in 'cmdclass'
+        to speed future calls to 'get_command_class()'.
 
         Raises DistutilsModuleError if the expected module could not be
-        found, or if that module does not define the expected class."""
+        found, or if that module does not define the expected class.
+        """
+        klass = self.cmdclass.get(command)
+        if klass:
+            return klass
 
         module_name = 'distutils.command.' + command
         klass_name = command
@@ -534,50 +586,28 @@ def find_command_class (self, command):
                   (command, module_name)
 
         try:
-            klass = vars(module)[klass_name]
-        except KeyError:
+            klass = getattr(module, klass_name)
+        except AttributeError:
             raise DistutilsModuleError, \
                   "invalid command '%s' (no class '%s' in module '%s')" \
                   % (command, klass_name, module_name)
 
+        self.cmdclass[command] = klass
         return klass
 
-    # find_command_class ()
-
-
-    def create_command_obj (self, command):
-        """Figure out the class that should implement a command,
-           instantiate it, cache and return the new "command object".
-           The "command class" is determined either by looking it up in
-           the 'cmdclass' attribute (this is the mechanism whereby
-           clients may override default Distutils commands or add their
-           own), or by calling the 'find_command_class()' method (if the
-           command name is not in 'cmdclass'."""
-
-        # Determine the command class -- either it's in the command_class
-        # dictionary, or we have to divine the module and class name
-        klass = self.cmdclass.get(command)
-        if not klass:
-            klass = self.find_command_class (command)
-            self.cmdclass[command] = klass
+    # get_command_class ()
 
-        # Found the class OK -- instantiate it 
-        cmd_obj = klass (self)
-        return cmd_obj
-    
-
-    def find_command_obj (self, command, create=1):
-        """Look up and return a command object in the cache maintained by
-           'create_command_obj()'.  If none found, the action taken
-           depends on 'create': if true (the default), create a new
-           command object by calling 'create_command_obj()' and return
-           it; otherwise, return None.  If 'command' is an invalid
-           command name, then DistutilsModuleError will be raised."""
-
-        cmd_obj = self.command_obj.get (command)
+    def get_command_obj (self, command, create=1):
+        """Return the command object for 'command'.  Normally this object
+        is cached on a previous call to 'get_command_obj()'; if no comand
+        object for 'command' is in the cache, then we either create and
+        return it (if 'create' is true) or return None.
+        """
+        cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
-            cmd_obj = self.create_command_obj (command)
-            self.command_obj[command] = cmd_obj
+            klass = self.get_command_class(command)
+            cmd_obj = self.command_obj[command] = klass()
+            self.command_run[command] = 0
 
         return cmd_obj
 
@@ -586,17 +616,17 @@ def find_command_obj (self, command, create=1):
 
     def announce (self, msg, level=1):
         """Print 'msg' if 'level' is greater than or equal to the verbosity
-           level recorded in the 'verbose' attribute (which, currently,
-           can be only 0 or 1)."""
-
+        level recorded in the 'verbose' attribute (which, currently, can be
+        only 0 or 1).
+        """
         if self.verbose >= level:
             print msg
 
 
     def run_commands (self):
         """Run each command that was seen on the setup script command line.
-           Uses the list of commands found and cache of command objects
-           created by 'create_command_obj()'."""
+        Uses the list of commands found and cache of command objects
+        created by 'get_command_obj()'."""
 
         for cmd in self.commands:
             self.run_command (cmd)
@@ -605,21 +635,20 @@ def run_commands (self):
     # -- Methods that operate on its Commands --------------------------
 
     def run_command (self, command):
-
         """Do whatever it takes to run a command (including nothing at all,
-           if the command has already been run).  Specifically: if we have
-           already created and run the command named by 'command', return
-           silently without doing anything.  If the command named by
-           'command' doesn't even have a command object yet, create one.
-           Then invoke 'run()' on that command object (or an existing
-           one)."""
+        if the command has already been run).  Specifically: if we have
+        already created and run the command named by 'command', return
+        silently without doing anything.  If the command named by 'command'
+        doesn't even have a command object yet, create one.  Then invoke
+        'run()' on that command object (or an existing one).
+        """
 
         # Already been here, done that? then return silently.
         if self.have_run.get (command):
             return
 
         self.announce ("running " + command)
-        cmd_obj = self.find_command_obj (command)
+        cmd_obj = self.get_command_obj (command)
         cmd_obj.ensure_ready ()
         cmd_obj.run ()
         self.have_run[command] = 1

From 1ea22ad71cc61f4f7467262c768ec43fabbb81d2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 01:43:08 +0000
Subject: [PATCH 0355/8469] Tweaked usage message.

---
 core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index a39bccd307..3eeba1df7e 100644
--- a/core.py
+++ b/core.py
@@ -21,10 +21,10 @@
 # and per-command help.
 usage = """\
 usage: %s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-   or: %s --help
+   or: %s --help [cmd1 cmd2 ...]
    or: %s --help-commands
    or: %s cmd --help
-""" % ((sys.argv[0],) * 4)
+""" % ((os.path.basename(sys.argv[0]),) * 4)
 
 
 def setup (**attrs):

From 138ae247bb47e34672d909a46fa998a4b86b90f6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 01:44:20 +0000
Subject: [PATCH 0356/8469] OptionDummy now has a constructor that takes a list
 of options: each string in the option list is an attribute of the OptionDummy
 that will be initialized to None.

---
 fancy_getopt.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 39450e8079..588c6ba73f 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -239,7 +239,7 @@ def getopt (self, args=None, object=None):
         if args is None:
             args = sys.argv[1:]
         if object is None:
-            object = OptionDummy()
+            object = OptionDummy(self.attr_name.values())
             created_object = 1
         else:
             created_object = 0
@@ -465,7 +465,14 @@ def wrap_text (text, width):
 class OptionDummy:
     """Dummy class just used as a place to hold command-line option
     values as instance attributes."""
-    pass
+
+    def __init__ (self, options=[]):
+        """Create a new OptionDummy instance.  The attributes listed in
+        'options' will be initialized to None."""
+        for opt in options:
+            setattr(self, opt, None)
+
+# class OptionDummy
     
 
 if __name__ == "__main__":

From 3f5a39b346e9ed623bba60da5b773e238721ef71 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 01:55:01 +0000
Subject: [PATCH 0357/8469] Use 'get_command_obj()' instead of
 'find_command_obj()'.

---
 cmd.py                | 6 +++---
 command/bdist_dumb.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd.py b/cmd.py
index c544b86440..0cf88d41f5 100644
--- a/cmd.py
+++ b/cmd.py
@@ -183,7 +183,7 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
         # Option_pairs: list of (src_option, dst_option) tuples
 
-        src_cmd_obj = self.distribution.find_command_obj (src_cmd)
+        src_cmd_obj = self.distribution.get_command_obj (src_cmd)
         src_cmd_obj.ensure_ready ()
         for (src_option, dst_option) in option_pairs:
             if getattr (self, dst_option) is None:
@@ -192,11 +192,11 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
 
     def find_peer (self, command, create=1):
-        """Wrapper around Distribution's 'find_command_obj()' method:
+        """Wrapper around Distribution's 'get_command_obj()' method:
            find (create if necessary and 'create' is true) the command
            object for 'command'.."""
 
-        cmd_obj = self.distribution.find_command_obj (command, create)
+        cmd_obj = self.distribution.get_command_obj (command, create)
         cmd_obj.ensure_ready ()
         return cmd_obj
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 2de2befc14..eaa192732b 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -63,7 +63,7 @@ def run (self):
         # command object that has *not* been finalized, so we can set
         # options on it!  (The option we set, 'root', is so that we can do
         # a proper "fake install" using this install command object.)
-        install = self.distribution.find_command_obj('install')
+        install = self.distribution.get_command_obj('install')
         install.root = self.bdist_dir
 
         self.announce ("installing to %s" % self.bdist_dir)

From ed327f4988e7fe976ba91586893e4babb655409c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 01:55:16 +0000
Subject: [PATCH 0358/8469] Fixed command description.

---
 command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 5b3d77a399..e9cd80db35 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -8,7 +8,7 @@
 
 class install_lib (Command):
 
-    description = "install pure Python modules"
+    description = "install all Python modules (extensions and pure Python)"
 
     user_options = [
         ('install-dir=', 'd', "directory to install to"),

From 684f4fcf396f5109aae531d4229699b55419b9e6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 03:47:35 +0000
Subject: [PATCH 0359/8469] Fixed so options from config files and command
 lines actually work:   * 'get_command_obj()' now sets command attributes
 based on     the 'command_options' dictionary   * some typos fixed   *
 kludged 'parse_config_files()' to re-initialize the ConfigParser     instance
 after each file, so we know for sure which config     file each option comes
 form   * added lots of handy debugging output

---
 dist.py | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/dist.py b/dist.py
index 3fd29d9f48..3ceadf1985 100644
--- a/dist.py
+++ b/dist.py
@@ -258,8 +258,11 @@ def parse_config_files (self, filenames=None):
         if filenames is None:
             filenames = self.find_config_files()
 
+        print "Distribution.parse_config_files():"
+
         parser = ConfigParser()
         for filename in filenames:
+            print "  reading", filename
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
@@ -271,9 +274,11 @@ def parse_config_files (self, filenames=None):
                     if opt != '__name__':
                         opts[opt] = (filename, parser.get(section,opt))
 
-        from pprint import pprint
-        print "options (after parsing config files):"
-        pprint (self.command_options)
+            # Make the ConfigParser forget everything (so we retain
+            # the original filenames that options come from) -- gag,
+            # retch, puke -- another good reason for a distutils-
+            # specific config parser (sigh...)
+            parser.__init__()
 
 
     # -- Command-line parsing methods ----------------------------------
@@ -397,7 +402,7 @@ def _parse_command_opts (self, parser, args):
                                  cmd_class.user_options)
         parser.set_negative_aliases (negative_opt)
         (args, opts) = parser.getopt (args[1:])
-        if opts.help:
+        if hasattr(opts, 'help') and opts.help:
             print "showing help for command", cmd_class
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
@@ -408,7 +413,7 @@ def _parse_command_opts (self, parser, args):
             self.command_options[command] = {}
         cmd_opts = self.command_options[command]
         for (name, value) in vars(opts).items():
-            cmd_opts[command] = ("command line", value)
+            cmd_opts[name] = ("command line", value)
 
         return args
 
@@ -605,9 +610,24 @@ def get_command_obj (self, command, create=1):
         """
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
+            print "Distribution.get_command_obj(): " \
+                  "creating '%s' command object" % command
+
             klass = self.get_command_class(command)
-            cmd_obj = self.command_obj[command] = klass()
-            self.command_run[command] = 0
+            cmd_obj = self.command_obj[command] = klass(self)
+            self.have_run[command] = 0
+
+            # Set any options that were supplied in config files
+            # or on the command line.  (NB. support for error
+            # reporting is lame here: any errors aren't reported
+            # until 'finalize_options()' is called, which means
+            # we won't report the source of the error.)
+            options = self.command_options.get(command)
+            if options:
+                print "  setting options:"
+                for (option, (source, value)) in options.items():
+                    print "    %s = %s (from %s)" % (option, value, source)
+                    setattr(cmd_obj, option, value)
 
         return cmd_obj
 

From 9e14daca28b2a95ede58edbb6a4a87ff81ac803f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 03:53:10 +0000
Subject: [PATCH 0360/8469] Don't take advantage of OptionDummy's new
 "auto-initialization" feature after all -- turns out it doesn't buy us much
 after all...

---
 fancy_getopt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 588c6ba73f..a593354c9d 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -239,7 +239,7 @@ def getopt (self, args=None, object=None):
         if args is None:
             args = sys.argv[1:]
         if object is None:
-            object = OptionDummy(self.attr_name.values())
+            object = OptionDummy()
             created_object = 1
         else:
             created_object = 0

From ecde8dd1d2bee1ac529e903b23c1a874c220b846 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 03:54:16 +0000
Subject: [PATCH 0361/8469] Added some debuging output (actually moved here
 from dist.py) -- dump the Distribution's 'command_options' dict after parsing
 config files, and then after parsing the command line.

---
 core.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core.py b/core.py
index 3eeba1df7e..e22db939c9 100644
--- a/core.py
+++ b/core.py
@@ -59,6 +59,8 @@ def setup (**attrs):
        and the command-specific options that became attributes of each
        command object."""
 
+    from pprint import pprint               # for debugging output
+
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
     klass = attrs.get ('distclass')
@@ -75,6 +77,9 @@ def setup (**attrs):
     # the setup script, but be overridden by the command line.
     dist.parse_config_files()
     
+    print "options (after parsing config files):"
+    pprint (dist.command_options)
+
     # Parse the command line; any command-line errors are the end user's
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
@@ -83,6 +88,9 @@ def setup (**attrs):
         sys.stderr.write (usage + "\n")
         raise SystemExit, "error: %s" % msg
 
+    print "options (after parsing command line):"
+    pprint (dist.command_options)
+
     # And finally, run all the commands found on the command line.
     if ok:
         try:

From a5620289f67a4feeb2f0cb54e6c7b481da3f5ea4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 04:11:14 +0000
Subject: [PATCH 0362/8469] Fix 'get_command_obj()' so it checks if a command
 object has an attribute before setting it -- this will catch bad options (eg.
 typos) in config files.

---
 dist.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist.py b/dist.py
index 3ceadf1985..7bdd9aa09b 100644
--- a/dist.py
+++ b/dist.py
@@ -627,6 +627,10 @@ def get_command_obj (self, command, create=1):
                 print "  setting options:"
                 for (option, (source, value)) in options.items():
                     print "    %s = %s (from %s)" % (option, value, source)
+                    if not hasattr(cmd_obj, option):
+                        raise DistutilsOptionError, \
+                              ("%s: command '%s' has no such option '%s'") % \
+                              (source, command, option)
                     setattr(cmd_obj, option, value)
 
         return cmd_obj

From 9449a2faa1832da6ab9fae2b656333f6548ebfb6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 23 May 2000 23:14:00 +0000
Subject: [PATCH 0363/8469] Catch failure to open installed Makefile, and
 report it as a DistutilsPlatformError: "invalid Python installation".  (This
 will happen on Red Hat-ish systems where the python-devel package is not
 installed.)

---
 sysconfig.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 5cc71dc0ba..a5f3816a16 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -229,7 +229,17 @@ def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     g = globals()
     # load the installed Makefile:
-    parse_makefile(open(get_makefile_filename()), g)
+    try:
+        filename = get_makefile_filename()
+        file = open(filename)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError, my_msg
+              
+    parse_makefile(file, g)
 
 
 def _init_nt():

From 9cd0dff83db07c62d3a941dbd82cbeb8b2652bcf Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 01:10:04 +0000
Subject: [PATCH 0364/8469] Normalized all the end-of-class lines.

---
 command/bdist_rpm.py  | 2 ++
 command/build.py      | 2 +-
 command/build_clib.py | 2 +-
 command/build_ext.py  | 2 +-
 command/build_py.py   | 2 +-
 command/clean.py      | 2 ++
 command/install.py    | 2 +-
 command/sdist.py      | 2 +-
 8 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 9c3aca3bc1..d10d0762ca 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -388,3 +388,5 @@ def _check_string_list(self, var_name, default_value = []):
                    'list or tuple of strings' % var_name)
         else:
             return default_value
+
+# class bdist_rpm
diff --git a/command/build.py b/command/build.py
index 7d753b1126..aab0d6f177 100644
--- a/command/build.py
+++ b/command/build.py
@@ -100,4 +100,4 @@ def run (self):
         if self.distribution.has_ext_modules():
             self.run_peer ('build_ext')
 
-# end class Build
+# class build
diff --git a/command/build_clib.py b/command/build_clib.py
index 681cd76b56..dba9a40a8b 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -207,4 +207,4 @@ def build_libraries (self, libraries):
 
     # build_libraries ()
 
-# class BuildLib
+# class build_lib
diff --git a/command/build_ext.py b/command/build_ext.py
index aa9ea0d034..4fb51ac713 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -406,4 +406,4 @@ def get_ext_libname (self, ext_name):
             return apply (os.path.join, ext_path) + '_d.lib'
         return apply (os.path.join, ext_path) + '.lib'
 
-# class BuildExt
+# class build_ext
diff --git a/command/build_py.py b/command/build_py.py
index 2a1fdd62c9..72c6157ceb 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -322,4 +322,4 @@ def build_packages (self):
 
     # build_packages ()
                        
-# end class BuildPy
+# class build_py
diff --git a/command/clean.py b/command/clean.py
index d6999060bd..62307a1968 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -74,3 +74,5 @@ def run(self):
                 self.announce ("removing '%s'" % self.build_base)
             except OSError:
                 pass
+
+# class clean
diff --git a/command/install.py b/command/install.py
index 392fe507c9..5398175f45 100644
--- a/command/install.py
+++ b/command/install.py
@@ -519,4 +519,4 @@ def create_path_file (self):
                         "installations)") %
                        filename)
 
-# class Install
+# class install
diff --git a/command/sdist.py b/command/sdist.py
index f644e9fbfb..56bc4c9556 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -519,7 +519,7 @@ def make_distribution (self):
         if not self.keep_tree:
             remove_tree (base_dir, self.verbose, self.dry_run)
 
-# class Dist
+# class sdist
 
 
 # ----------------------------------------------------------------------

From 6a76fd2a072f87312fcd0affe20e4715d4ec0a98 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 01:19:18 +0000
Subject: [PATCH 0365/8469] Bastian Kleineidam: the "build_scripts" command and
 changes necessary to support it.

Details:
  - build command additionally calls build_scripts
  - build_scripts builds your scripts in 'build/scripts' and adjusts the
    first line if it begins with "#!" and ends with "python", optionally
    ending with commandline options (like -O, -t ...).  Adjusting means we
    write the current path to the Python interpreter in the first line.
  - install_scripts copies the scripts to the install_scripts dir
  - install_data copies your data_files in install_data. You can
    supply individual directories for your data_files:

    data_files = ['doc/info.txt', # copy this file in install_scripts dir
      ('testdata', ['a.dat', 'b.dat']), # copy these files in
                                        # install_scripts/testdata
      ('/etc', ['packagerc']),    # copy this in /etc. When --root is
                                  # given, copy this in rootdir/etc
    ]

    So you can use the --root option with absolute data paths.
---
 command/__init__.py        |  1 +
 command/build.py           |  8 +++++++
 command/install_data.py    | 45 +++++++++++++++++++++++++++++++++-----
 command/install_scripts.py | 31 +++++++++++++++++++++-----
 4 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/command/__init__.py b/command/__init__.py
index cd7753fe64..229c8a3486 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -9,6 +9,7 @@
            'build_py',
            'build_ext',
            'build_clib',
+           'build_scripts',
            'install',
            'install_lib',
            'install_scripts',
diff --git a/command/build.py b/command/build.py
index aab0d6f177..96d41d5e0b 100644
--- a/command/build.py
+++ b/command/build.py
@@ -24,6 +24,8 @@ class build (Command):
         ('build-lib=', None,
          "build directory for all distribution (defaults to either " +
          "build-purelib or build-platlib"),
+        ('build-scripts=', None,
+         "build directory for scripts"),
         ('build-temp=', 't',
          "temporary build directory"),
         ('compiler=', 'c',
@@ -42,6 +44,7 @@ def initialize_options (self):
         self.build_platlib = None
         self.build_lib = None
         self.build_temp = None
+        self.build_scripts = None
         self.compiler = None
         self.debug = None
         self.force = 0
@@ -76,6 +79,8 @@ def finalize_options (self):
         if self.build_temp is None:
             self.build_temp = os.path.join (self.build_base,
                                             'temp.' + self.plat)
+        if self.build_scripts is None:
+            self.build_scripts = os.path.join (self.build_base, 'scripts')
     # finalize_options ()
 
 
@@ -100,4 +105,7 @@ def run (self):
         if self.distribution.has_ext_modules():
             self.run_peer ('build_ext')
 
+        if self.distribution.scripts:
+            self.run_peer ('build_scripts')
+
 # class build
diff --git a/command/install_data.py b/command/install_data.py
index fd9836b607..65d188f7b3 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -7,17 +7,52 @@
 
 __revision__ = "$Id$"
 
-from distutils.cmd import install_misc
+import os
+from types import StringType
+from distutils.core import Command
 
-class install_data (install_misc):
+class install_data (Command):
 
     description = "install data files"
 
+    user_options = [
+        ('install-dir=', 'd',
+         "directory to install the files to"),
+        ('root=', None,
+         "install everything relative to this alternate root directory"),
+        ]
+
+    def initialize_options (self):
+        self.install_dir = None
+        self.outfiles = None
+        self.root = None
+        self.data_files = self.distribution.data_files
+
     def finalize_options (self):
-        self._install_dir_from('install_data')
+        self.set_undefined_options('install',
+	                           ('install_data', 'install_dir'),
+				   ('root', 'root'),
+				  )
 
     def run (self):
-        self._copy_files(self.distribution.data_files)
+        self.mkpath(self.install_dir)
+        for f in self.data_files:
+            if type(f) == StringType:
+                # its a simple file, so copy it
+                self.copy_file(f, self.install_dir)
+            else:
+                # its a tuple with path to install to and a list of files
+                dir = f[0]
+                if not os.path.isabs(dir):
+                    dir = os.path.join(self.install_dir, dir)
+                elif self.root:
+                    dir = os.path.join(self.root, dir[1:])
+                self.mkpath(dir)
+                for data in f[1]:
+                    self.copy_file(data, dir)
 
     def get_inputs (self):
-        return self.distribution.data_files or []
+        return self.data_files or []
+
+    def get_outputs (self):
+        return self.outfiles
diff --git a/command/install_scripts.py b/command/install_scripts.py
index 43e5fc18bc..9b78326373 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -8,23 +8,39 @@
 __revision__ = "$Id$"
 
 import os
-from distutils.cmd import install_misc
+from distutils.core import Command
 from stat import ST_MODE
 
-class install_scripts(install_misc):
+class install_scripts(Command):
 
     description = "install scripts"
 
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+        ('build-dir=','b', "build directory (where to install from)"),
+        ('skip-build', None, "skip the build steps"),
+    ]
+
+    def initialize_options (self):
+        self.install_dir = None
+        self.build_dir = None
+        self.skip_build = None
+
     def finalize_options (self):
-        self._install_dir_from('install_scripts')
+        self.set_undefined_options('build', ('build_scripts', 'build_dir'))
+        self.set_undefined_options ('install',
+                                    ('install_scripts', 'install_dir'),
+                                    ('skip_build', 'skip_build'),
+                                   )
 
     def run (self):
-        self._copy_files(self.distribution.scripts)
+        if not self.skip_build:
+            self.run_peer('build_scripts')
+        self.outfiles = self.copy_tree (self.build_dir, self.install_dir)
         if os.name == 'posix':
             # Set the executable bits (owner, group, and world) on
             # all the scripts we just installed.
-            files = self.get_outputs()
-            for file in files:
+            for file in self.get_outputs():
                 if self.dry_run:
                     self.announce("changing mode of %s" % file)
                 else:
@@ -35,4 +51,7 @@ def run (self):
     def get_inputs (self):
         return self.distribution.scripts or []
 
+    def get_outputs(self):
+        return self.outfiles or []
+
 # class install_scripts

From a561b7d0b579bb9f7bdf5e861daf54b20145a8c1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 01:20:15 +0000
Subject: [PATCH 0366/8469] Bastian Kleineidam: the "build_scripts" command.

---
 command/build_scripts.py | 71 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 command/build_scripts.py

diff --git a/command/build_scripts.py b/command/build_scripts.py
new file mode 100644
index 0000000000..1e7279d022
--- /dev/null
+++ b/command/build_scripts.py
@@ -0,0 +1,71 @@
+"""distutils.command.build_scripts
+
+Implements the Distutils 'build_scripts' command."""
+
+# created 2000/05/23, Bastian Kleineidam
+
+__revision__ = "$Id$"
+
+import sys,os,re
+from distutils.core import Command
+
+# check if Python is called on the first line with this expression
+first_line_re = re.compile(r"^#!.+python(\s-\w+)*")
+
+class build_scripts (Command):
+
+    description = "\"build\" scripts"
+
+    user_options = [
+        ('build-dir=', 'd', "directory to \"build\" (copy) to"),
+        ('force', 'f', "forcibly build everything (ignore file timestamps"),
+        ]
+
+
+    def initialize_options (self):
+        self.build_dir = None
+        self.scripts = None
+        self.force = None
+        self.outfiles = None
+
+    def finalize_options (self):
+        self.set_undefined_options ('build',
+                                    ('build_scripts', 'build_dir'),
+                                    ('force', 'force'))
+        self.scripts = self.distribution.scripts
+
+
+    def run (self):
+        if not self.scripts:
+            return
+        self._copy_files()
+        self._adjust_files()
+        
+    def _copy_files(self):
+        """Copy all the scripts to the build dir"""
+        self.outfiles = []
+        self.mkpath(self.build_dir)
+        for f in self.scripts:
+            print self.build_dir
+            if self.copy_file(f, self.build_dir):
+                self.outfiles.append(os.path.join(self.build_dir, f))
+            
+    def _adjust_files(self):
+        """If the first line begins with #! and ends with python
+	   replace it with the current python interpreter"""
+        for f in self.outfiles:
+            if not self.dry_run:
+                data = open(f, "r").readlines()
+                if not data:
+                    self.warn("%s is an empty file!" % f)
+                    continue
+                mo = first_line_re.match(data[0])
+                if mo:
+                    self.announce("Adjusting first line of file %s" % f)
+                    data[0] = "#!"+sys.executable
+                    # add optional command line options
+                    if mo.group(1):
+                        data[0] = data[0] + mo.group(1)
+                    else:
+                        data[0] = data[0] + "\n"
+                    open(f, "w").writelines(data)

From dec17861b3cc97457f3eef132a26ebe5c55d976a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 01:21:54 +0000
Subject: [PATCH 0367/8469] Use Distribution's 'has_scripts()' method instead
 of directly accessing its 'scripts' attribute.

---
 command/build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build.py b/command/build.py
index 96d41d5e0b..d9eed7685c 100644
--- a/command/build.py
+++ b/command/build.py
@@ -105,7 +105,7 @@ def run (self):
         if self.distribution.has_ext_modules():
             self.run_peer ('build_ext')
 
-        if self.distribution.scripts:
+        if self.distribution.has_scripts():
             self.run_peer ('build_scripts')
 
 # class build

From ef17c6ecdc8fcc0285ed78c359093824cc040d50 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 01:26:23 +0000
Subject: [PATCH 0368/8469] Added comment to remind us of the (temporary?)
 obsolescense of the 'install_misc' class.

---
 cmd.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmd.py b/cmd.py
index 0cf88d41f5..09727331d4 100644
--- a/cmd.py
+++ b/cmd.py
@@ -344,6 +344,11 @@ def make_file (self, infiles, outfile, func, args,
 # class Command
 
 
+# XXX 'install_misc' class not currently used -- it was the base class for
+# both 'install_scripts' and 'install_data', but they outgrew it.  It might
+# still be useful for 'install_headers', though, so I'm keeping it around
+# for the time being.
+
 class install_misc (Command):
     """Common base class for installing some files in a subdirectory.
     Currently used by install_data and install_scripts.

From eaf0c26b00302e889666ceeff1ebfddf519cef59 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 02:03:56 +0000
Subject: [PATCH 0369/8469] Improvements to Bastian's build_scripts command:  
 * 'first_line_re' loosened up   * command description improved   * replaced
 '_copy_files()' and '_adjust_files()' with one method     that does
 everything, 'copy_scripts()' -- this should be more     efficient than
 Bastian's version, should behave better in     dry-run mode, and does
 timestamp dependency-checking

---
 command/build_scripts.py | 89 ++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 31 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 1e7279d022..18297348c0 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -6,15 +6,16 @@
 
 __revision__ = "$Id$"
 
-import sys,os,re
+import sys, os, re
 from distutils.core import Command
+from distutils.dep_util import newer
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile(r"^#!.+python(\s-\w+)*")
+first_line_re = re.compile(r'^#!.*python(\s+.*)?')
 
 class build_scripts (Command):
 
-    description = "\"build\" scripts"
+    description = "\"build\" scripts (copy and fixup #! line)"
 
     user_options = [
         ('build-dir=', 'd', "directory to \"build\" (copy) to"),
@@ -38,34 +39,60 @@ def finalize_options (self):
     def run (self):
         if not self.scripts:
             return
-        self._copy_files()
-        self._adjust_files()
+        self.copy_scripts()
+
         
-    def _copy_files(self):
-        """Copy all the scripts to the build dir"""
-        self.outfiles = []
+    def copy_scripts (self):
+        """Copy each script listed in 'self.scripts'; if it's marked as a
+        Python script in the Unix way (first line matches 'first_line_re',
+        ie. starts with "\#!" and contains "python"), then adjust the first
+        line to refer to the current Python intepreter as we copy.
+        """
+        outfiles = []
         self.mkpath(self.build_dir)
-        for f in self.scripts:
-            print self.build_dir
-            if self.copy_file(f, self.build_dir):
-                self.outfiles.append(os.path.join(self.build_dir, f))
-            
-    def _adjust_files(self):
-        """If the first line begins with #! and ends with python
-	   replace it with the current python interpreter"""
-        for f in self.outfiles:
-            if not self.dry_run:
-                data = open(f, "r").readlines()
-                if not data:
-                    self.warn("%s is an empty file!" % f)
+        for script in self.scripts:
+            adjust = 0
+            outfile = os.path.join(self.build_dir, script)
+
+            if not self.force and not newer(script, outfile):
+                self.announce("not copying %s (output up-to-date)" % script)
+                continue
+
+            # Always open the file, but ignore failures in dry-run mode --
+            # that way, we'll get accurate feedback if we can read the
+            # script.
+            try:
+                f = open(script, "r")
+            except IOError:
+                if not self.dry_run:
+                    raise
+                f = None
+            else:
+                first_line = f.readline()
+                if not first_line:
+                    self.warn("%s is an empty file (skipping)" % script)
                     continue
-                mo = first_line_re.match(data[0])
-                if mo:
-                    self.announce("Adjusting first line of file %s" % f)
-                    data[0] = "#!"+sys.executable
-                    # add optional command line options
-                    if mo.group(1):
-                        data[0] = data[0] + mo.group(1)
-                    else:
-                        data[0] = data[0] + "\n"
-                    open(f, "w").writelines(data)
+
+                match = first_line_re.match(first_line)
+                if match:
+                    adjust = 1
+                    post_interp = match.group(1)
+
+            if adjust:
+                self.announce("copying and adjusting %s -> %s" %
+                              (script, self.build_dir))
+                if not self.dry_run:
+                    outf = open(outfile, "w")
+                    outf.write("#!%s%s\n" % 
+                               (os.path.normpath(sys.executable), post_interp))
+                    outf.writelines(f.readlines())
+                    outf.close()
+                if f:
+                    f.close()
+            else:
+                f.close()
+                self.copy_file(script, outfile)
+
+    # copy_scripts ()
+
+# class build_scripts

From 14a7a370319757cb72bc70c020c6944077f555e3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 02:14:26 +0000
Subject: [PATCH 0370/8469] Fix to use 'change_root()' rather than directly
 mangling path.

---
 command/install_data.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install_data.py b/command/install_data.py
index 65d188f7b3..acc89aa395 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -10,6 +10,7 @@
 import os
 from types import StringType
 from distutils.core import Command
+from distutils.util import change_root
 
 class install_data (Command):
 
@@ -46,7 +47,7 @@ def run (self):
                 if not os.path.isabs(dir):
                     dir = os.path.join(self.install_dir, dir)
                 elif self.root:
-                    dir = os.path.join(self.root, dir[1:])
+                    dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
                     self.copy_file(data, dir)

From 62bcf92f91582ef01086ae94e446a1aee8b82274 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 25 May 2000 20:05:52 +0000
Subject: [PATCH 0371/8469] Take the basename of the script before
 concatenating it with the build dir.

---
 command/build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 18297348c0..6467e65b83 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -52,7 +52,7 @@ def copy_scripts (self):
         self.mkpath(self.build_dir)
         for script in self.scripts:
             adjust = 0
-            outfile = os.path.join(self.build_dir, script)
+            outfile = os.path.join(self.build_dir, os.path.basename(script))
 
             if not self.force and not newer(script, outfile):
                 self.announce("not copying %s (output up-to-date)" % script)

From 514f94d06bedf2f945a7ec777616e0c47ec881a3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 26 May 2000 00:44:06 +0000
Subject: [PATCH 0372/8469] Fixed a couple of long-hidden bugs (amazing what
 you find when you attempt to verify the bold assertions in the
 documentation):   * entries for the "root package" in 'package_dir' didn't
 work --     fixed by improving the fall-through code in 'get_package_dir()'  
 * __init__.py files weren't installed when modules-in-packages     were
 listed individually (ie. in 'py_modules' in the setup script);     fixed by
 making 'check_package()' return the name of the __init__     file if it
 exists, and making 'find_modules()' add an entry to     the module list for
 __init__ if applicable

---
 command/build_py.py | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 72c6157ceb..92a37f20c4 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -117,8 +117,17 @@ def get_package_dir (self, package):
                     tail.insert (0, pdir)
                     return apply (os.path.join, tail)
             else:
-                # arg! everything failed, we might as well have not even
-                # looked in package_dir -- oh well
+                # Oops, got all the way through 'path' without finding a
+                # match in package_dir.  If package_dir defines a directory
+                # for the root (nameless) package, then fallback on it;
+                # otherwise, we might as well have not consulted
+                # package_dir at all, as we just use the directory implied
+                # by 'tail' (which should be the same as the original value
+                # of 'path' at this point).
+                pdir = self.package_dir.get('')
+                if pdir is not None:
+                    tail.insert(0, pdir)
+
                 if tail:
                     return apply (os.path.join, tail)
                 else:
@@ -145,9 +154,16 @@ def check_package (self, package, package_dir):
         # Require __init__.py for all but the "root package"
         if package:
             init_py = os.path.join (package_dir, "__init__.py")
-            if not os.path.isfile (init_py):
+            if os.path.isfile (init_py):
+                return init_py
+            else:
                 self.warn (("package init file '%s' not found " +
                             "(or not a regular file)") % init_py)
+
+        # Either not in a package at all (__init__.py not expected), or
+        # __init__.py doesn't exist -- so don't return the filename.
+        return
+                
     # check_package ()
 
 
@@ -177,6 +193,15 @@ def find_package_modules (self, package, package_dir):
 
 
     def find_modules (self):
+        """Finds individually-specified Python modules, ie. those listed by
+        module name in 'self.modules'.  Returns a list of tuples (package,
+        module_base, filename): 'package' is a tuple of the path through
+        package-space to the module; 'module_base' is the bare (no
+        packages, no dots) module name, and 'filename' is the path to the
+        ".py" file (relative to the distribution root) that implements the
+        module.
+        """
+
         # Map package names to tuples of useful info about the package:
         #    (package_dir, checked)
         # package_dir - the directory where we'll find source files for
@@ -185,7 +210,7 @@ def find_modules (self):
         #   is valid (exists, contains __init__.py, ... ?)
         packages = {}
 
-        # List of (module, package, filename) tuples to return
+        # List of (package, module, filename) tuples to return
         modules = []
 
         # We treat modules-in-packages almost the same as toplevel modules,
@@ -205,8 +230,10 @@ def find_modules (self):
                 checked = 0
 
             if not checked:
-                self.check_package (package, package_dir)
+                init_py = self.check_package (package, package_dir)
                 packages[package] = (package_dir, 1)
+                if init_py:
+                    modules.append((package, "__init__", init_py))
 
             # XXX perhaps we should also check for just .pyc files
             # (so greedy closed-source bastards can distribute Python
@@ -215,7 +242,7 @@ def find_modules (self):
             if not self.check_module (module, module_file):
                 continue
 
-            modules.append ((package, module, module_file))
+            modules.append ((package, module_base, module_file))
 
         return modules
 

From a9e47e475f9420277cc20e1eccf5b67c42adf8b7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 26 May 2000 00:54:52 +0000
Subject: [PATCH 0373/8469] Added the DEBUG global (set from the
 DISTUTILS_DEBUG environment variable). Changed the exception-handling code in
 'setup()' to re-raise exceptions   if DEBUG is true.

---
 core.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/core.py b/core.py
index e22db939c9..cd0f8e9694 100644
--- a/core.py
+++ b/core.py
@@ -27,6 +27,11 @@
 """ % ((os.path.basename(sys.argv[0]),) * 4)
 
 
+# If DISTUTILS_DEBUG is anything other than the empty string, we run in
+# debug mode.
+DEBUG = os.environ.get('DISTUTILS_DEBUG')
+
+
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script
        needs to do, in a highly flexible and user-driven way.  Briefly:
@@ -101,18 +106,26 @@ def setup (**attrs):
             # check for Python 1.5.2-style {IO,OS}Error exception objects
             if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
                 if exc.filename:
-                    raise SystemExit, \
-                          "error: %s: %s" % (exc.filename, exc.strerror)
+                    error = "error: %s: %s" % (exc.filename, exc.strerror)
                 else:
                     # two-argument functions in posix module don't
                     # include the filename in the exception object!
-                    raise SystemExit, \
-                          "error: %s" % exc.strerror
+                    error = "error: %s" % exc.strerror
             else:
-                raise SystemExit, "error: " + str(exc[-1])
+                error = "error: " + str(exc[-1])
+
+            if DEBUG:
+                sys.stderr.write(error + "\n")
+                raise
+            else:
+                raise SystemExit, error
+            
         except (DistutilsExecError,
                 DistutilsFileError,
                 DistutilsOptionError), msg:
-            raise SystemExit, "error: " + str(msg)
+            if DEBUG:
+                raise
+            else:
+                raise SystemExit, "error: " + str(msg)
 
 # setup ()

From bab7e2589a1ecb58045e27f6bce0938d7fee5377 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 26 May 2000 01:00:15 +0000
Subject: [PATCH 0374/8469] Factored out code for extracting-or-creating one of
 the option   dictionaries in 'self.command_options' to 'get_option_dict()'.
 Simplified code in 'parse_config_files()' and 'parse_command_line()'  
 accordingly. Fixed code in constructor that processes the 'options'
 dictionary   from the setup script so it actually works: uses the new  
 'self.command_options' dictionary rather than creating command   objects and
 calling 'set_option()' on them.

---
 dist.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/dist.py b/dist.py
index 7bdd9aa09b..33b3b657b1 100644
--- a/dist.py
+++ b/dist.py
@@ -185,11 +185,9 @@ def __init__ (self, attrs=None):
             if options:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
-                    cmd_obj = self.get_command_obj (command)
-                    for (key, val) in cmd_options.items():
-                        cmd_obj.set_option (key, val)
-                # loop over commands
-            # if any command options                        
+                    opt_dict = self.get_option_dict(command)
+                    for (opt, val) in cmd_options.items():
+                        opt_dict[opt] = ("setup script", val)
 
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
@@ -205,6 +203,19 @@ def __init__ (self, attrs=None):
     # __init__ ()
 
 
+    def get_option_dict (self, command):
+        """Get the option dictionary for a given command.  If that
+        command's option dictionary hasn't been created yet, then create it
+        and return the new dictionary; otherwise, return the existing
+        option dictionary.
+        """
+
+        dict = self.command_options.get(command)
+        if dict is None:
+            dict = self.command_options[command] = {}
+        return dict
+
+
     # -- Config file finding/parsing methods ---------------------------
 
     def find_config_files (self):
@@ -266,13 +277,11 @@ def parse_config_files (self, filenames=None):
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
-                if not self.command_options.has_key(section):
-                    self.command_options[section] = {}
-                opts = self.command_options[section]
+                opt_dict = self.get_option_dict(section)
 
                 for opt in options:
                     if opt != '__name__':
-                        opts[opt] = (filename, parser.get(section,opt))
+                        opt_dict[opt] = (filename, parser.get(section,opt))
 
             # Make the ConfigParser forget everything (so we retain
             # the original filenames that options come from) -- gag,
@@ -409,11 +418,9 @@ def _parse_command_opts (self, parser, args):
 
         # Put the options from the command-line into their official
         # holding pen, the 'command_options' dictionary.
-        if not self.command_options.has_key(command):
-            self.command_options[command] = {}
-        cmd_opts = self.command_options[command]
+        opt_dict = self.get_option_dict(command)
         for (name, value) in vars(opts).items():
-            cmd_opts[name] = ("command line", value)
+            opt_dict[name] = ("command line", value)
 
         return args
 

From b960e574912ef3567a40ec67e3684d2f07d772a8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 26 May 2000 01:31:53 +0000
Subject: [PATCH 0375/8469] Rene Liebscher: check if the extension file (.so or
 .pyd) is up-to-date with respect to the source files; that way, we don't
 needlessly rebuild just because object files go away.

---
 command/build_ext.py | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4fb51ac713..acf1d7b7d5 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -12,7 +12,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
-
+from distutils.dep_util import newer_group
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
@@ -285,7 +285,29 @@ def build_extensions (self):
                        "a list of source filenames") % extension_name
             sources = list (sources)
 
-            self.announce ("building '%s' extension" % extension_name)
+            fullname = self.get_ext_fullname (extension_name)
+            if self.inplace:
+                # ignore build-lib -- put the compiled extension into
+                # the source tree along with pure Python modules
+
+                modpath = string.split (fullname, '.')
+                package = string.join (modpath[0:-1], '.')
+                base = modpath[-1]
+
+                build_py = self.find_peer ('build_py')
+                package_dir = build_py.get_package_dir (package)
+                ext_filename = os.path.join (package_dir,
+                                             self.get_ext_filename(base))
+            else:
+                ext_filename = os.path.join (self.build_lib,
+                                             self.get_ext_filename(fullname))
+
+	    if not newer_group(sources, ext_filename, 'newer'):
+	    	self.announce ("skipping '%s' extension (up-to-date)" %
+                               extension_name)
+		continue # 'for' loop over all extensions
+	    else:
+        	self.announce ("building '%s' extension" % extension_name)
 
             # First step: compile the source code to object files.  This
             # drops the object files in the current directory, regardless
@@ -357,23 +379,6 @@ def build_extensions (self):
                 self.mkpath (os.path.dirname (implib_file))
             # if MSVC
 
-            fullname = self.get_ext_fullname (extension_name)
-            if self.inplace:
-                # ignore build-lib -- put the compiled extension into
-                # the source tree along with pure Python modules
-
-                modpath = string.split (fullname, '.')
-                package = string.join (modpath[0:-1], '.')
-                base = modpath[-1]
-
-                build_py = self.find_peer ('build_py')
-                package_dir = build_py.get_package_dir (package)
-                ext_filename = os.path.join (package_dir,
-                                             self.get_ext_filename(base))
-            else:
-                ext_filename = os.path.join (self.build_lib,
-                                             self.get_ext_filename(fullname))
-
             self.compiler.link_shared_object (objects, ext_filename, 
                                               libraries=libraries,
                                               library_dirs=library_dirs,

From 4fb6d85e29cc25c036f2ecf88b746dd7de51387d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 01:25:16 +0000
Subject: [PATCH 0376/8469] Added 'install_headers' command to install C/C++
 header files.

---
 command/__init__.py        |  1 +
 command/install_headers.py | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 command/install_headers.py

diff --git a/command/__init__.py b/command/__init__.py
index 229c8a3486..56c26fe151 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -12,6 +12,7 @@
            'build_scripts',
            'install',
            'install_lib',
+           'install_headers',
            'install_scripts',
            'install_data',
            'clean',
diff --git a/command/install_headers.py b/command/install_headers.py
new file mode 100644
index 0000000000..33edb945dd
--- /dev/null
+++ b/command/install_headers.py
@@ -0,0 +1,40 @@
+"""distutils.command.install_headers
+
+Implements the Distutils 'install_headers' command, to install C/C++ header
+files to the Python include directory."""
+
+# created 2000/05/26, Greg Ward
+
+__revision__ = "$Id$"
+
+from distutils.core import Command
+
+
+class install_headers (Command):
+
+    description = "install C/C++ header files"
+
+    user_options = [('install-dir=', 'd',
+                     "directory to install header files to"),
+                   ]
+
+
+    def initialize_options (self):
+        self.install_dir = None
+
+    def finalize_options (self):
+        self.set_undefined_options('install',
+                                   ('install_headers', 'install_dir'))
+
+    def run (self):
+        headers = self.distribution.headers
+        if not headers:
+            return
+
+        self.mkpath(self.install_dir)
+        for header in headers:
+            self.copy_file(header, self.install_dir)
+
+    # run()
+
+# class install_headers

From 2f4fee98094cc689a133ac05186a61fdffc0ea7f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 01:33:12 +0000
Subject: [PATCH 0377/8469] Support for the "install_headers" command:   *
 'headers' entry added to all the install schemes   * '--install-headers'
 option added   * 'install_headers' added to 'sub_commands'   * added
 'dist_name' to configuration variables (along with a few     others that seem
 handy: 'dist_version', 'dist_fullname', and     'py_version'   * in
 'finalize_unix()', make sure 'install_headers' defined if     user specified
 'install_base' and/or 'install_platbase'   * added 'has_headers()'   * a few
 other small changes

---
 command/install.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/command/install.py b/command/install.py
index 5398175f45..d89ce4d255 100644
--- a/command/install.py
+++ b/command/install.py
@@ -18,24 +18,28 @@
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
         'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'headers': '$base/include/python/$py_version_short/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base/share',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
         'platlib': '$base/lib/python',
+        'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base/share',
         },
     'nt': {
         'purelib': '$base',
         'platlib': '$base',
+        'headers': '$base\\Include\\$dist_name',
         'scripts': '$base\\Scripts',
         'data'   : '$base\\Data',
         },
     'mac': {
         'purelib': '$base:Lib',
         'platlib': '$base:Mac:PlugIns',
+        'headers': '$base:Include:$dist_name',
         'scripts': '$base:Scripts',
         'data'   : '$base:Data',
         }
@@ -73,6 +77,8 @@ class install (Command):
          "installation directory for all module distributions " +
          "(overrides --install-purelib and --install-platlib)"),
 
+        ('install-headers=', None,
+         "installation directory for C/C++ headers"),
         ('install-scripts=', None,
          "installation directory for Python scripts"),
         ('install-data=', None,
@@ -99,6 +105,7 @@ class install (Command):
     # true if 'command' (the sub-command name, a string) needs to be run.
     # If 'method' is None, assume that 'command' must always be run.
     sub_commands = [('has_lib', 'install_lib'),
+                    ('has_headers', 'install_headers'),
                     ('has_scripts', 'install_scripts'),
                     ('has_data', 'install_data'),
                    ]
@@ -125,6 +132,7 @@ def initialize_options (self):
         # that installation scheme.
         self.install_purelib = None     # for pure module distributions
         self.install_platlib = None     # non-pure (dists w/ extensions)
+        self.install_headers = None     # for C/C++ headers
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
@@ -200,21 +208,26 @@ def finalize_options (self):
         # install_{purelib,platlib,lib,scripts,data,...}, and the
         # INSTALL_SCHEME dictionary above.  Phew!
 
-        self.dump_dirs ("pre-finalize_xxx")
+        self.dump_dirs ("pre-finalize_{unix,other}")
 
         if os.name == 'posix':
             self.finalize_unix ()
         else:
             self.finalize_other ()
 
-        self.dump_dirs ("post-finalize_xxx()")
+        self.dump_dirs ("post-finalize_{unix,other}()")
 
         # Expand configuration variables, tilde, etc. in self.install_base
         # and self.install_platbase -- that way, we can use $base or
         # $platbase in the other installation directories and not worry
         # about needing recursive variable expansion (shudder).
 
-        self.config_vars = {'py_version_short': sys.version[0:3],
+        py_version = (string.split(sys.version))[0]
+        self.config_vars = {'dist_name': self.distribution.get_name(),
+                            'dist_version': self.distribution.get_version(),
+                            'dist_fullname': self.distribution.get_fullname(),
+                            'py_version': py_version,
+                            'py_version_short': py_version[0:3],
                             'sys_prefix': sysconfig.PREFIX,
                             'sys_exec_prefix': sysconfig.EXEC_PREFIX,
                            }
@@ -295,12 +308,12 @@ def finalize_unix (self):
             if ((self.install_lib is None and
                  self.install_purelib is None and
                  self.install_platlib is None) or
+                self.install_headers is None or
                 self.install_scripts is None or
                 self.install_data is None):
                 raise DistutilsOptionError, \
                       "install-base or install-platbase supplied, but " + \
                       "installation scheme is incomplete"
-
             return
 
         if self.home is not None:
@@ -359,7 +372,7 @@ def finalize_other (self):          # Windows and Mac OS for now
     def select_scheme (self, name):
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
-        for key in ('purelib', 'platlib', 'scripts', 'data'):
+        for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
             attrname = 'install_' + key
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
@@ -384,6 +397,7 @@ def expand_dirs (self):
         self._expand_attrs (['install_purelib',
                              'install_platlib',
                              'install_lib',
+                             'install_headers',
                              'install_scripts',
                              'install_data',])
 
@@ -478,6 +492,9 @@ def has_lib (self):
         return (self.distribution.has_pure_modules() or
                 self.distribution.has_ext_modules())
 
+    def has_headers (self):
+        return self.distribution.has_headers()
+
     def has_scripts (self):
         return self.distribution.has_scripts()
 

From 3269156427c4908f5388f8f214436797d1b41810 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 01:33:49 +0000
Subject: [PATCH 0378/8469] Tweaked description, help text.

---
 command/install_scripts.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install_scripts.py b/command/install_scripts.py
index 9b78326373..5888cafd44 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -11,12 +11,12 @@
 from distutils.core import Command
 from stat import ST_MODE
 
-class install_scripts(Command):
+class install_scripts (Command):
 
-    description = "install scripts"
+    description = "install scripts (Python or otherwise)"
 
     user_options = [
-        ('install-dir=', 'd', "directory to install to"),
+        ('install-dir=', 'd', "directory to install scripts to"),
         ('build-dir=','b', "build directory (where to install from)"),
         ('skip-build', None, "skip the build steps"),
     ]

From 1b401b74ff3cac71a809383c5fde85fe31a26ce7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 01:35:27 +0000
Subject: [PATCH 0379/8469] 'mkpath()' now detects non-string 'name' arguments
 -- this is a fairly common bug when adding new code, so I thought I'd make it
 blow up earlier than deep in posix.py.

---
 dir_util.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index c049bbd217..194183ae25 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -7,7 +7,8 @@
 __revision__ = "$Id$"
 
 import os
-from distutils.errors import DistutilsFileError
+from types import *
+from distutils.errors import DistutilsFileError, DistutilsInternalError
 
 
 # cache for by mkpath() -- in addition to cheapening redundant calls,
@@ -29,6 +30,11 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 
     global PATH_CREATED
 
+    # Detect a common bug -- name is None
+    if type(name) is not StringType:
+        raise DistutilsInternalError, \
+              "mkpath: 'name' must be a string (got %s)" % `name`
+
     # XXX what's the better way to handle verbosity? print as we create
     # each directory in the path (the current behaviour), or only announce
     # the creation of the whole path? (quite easy to do the latter since

From 20cf8c4a9698ff498f8ed64b06734a86f11af75c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 01:36:14 +0000
Subject: [PATCH 0380/8469] Support for the "install_headers" command:
 distribution option 'headers' and method 'has_headers()'.

---
 dist.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist.py b/dist.py
index 33b3b657b1..1e8c63243b 100644
--- a/dist.py
+++ b/dist.py
@@ -146,6 +146,7 @@ def __init__ (self, attrs=None):
         self.package_dir = None
         self.py_modules = None
         self.libraries = None
+        self.headers = None
         self.ext_modules = None
         self.ext_package = None
         self.include_dirs = None
@@ -699,6 +700,9 @@ def has_c_libraries (self):
     def has_modules (self):
         return self.has_pure_modules() or self.has_ext_modules()
 
+    def has_headers (self):
+        return self.headers and len(self.headers) > 0
+
     def has_scripts (self):
         return self.scripts and len(self.scripts) > 0
 

From 0bf1c3e9874ed43aa7353c5e03884fc6775486c3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 03:03:23 +0000
Subject: [PATCH 0381/8469] Patch from Andrew Kuchling: prune out the build and
 source distribution directories after all is said and done, so we don't
 accidentally include those files in the source distribution.

(This is the quick and easy way to fix this; Andrew says: "Changing
findall() looked like it was going to be messy, so I tried this instead.
The only problem is that redundant directory traversals are being done,
walking through build/ only to throw out all the files found at the end.").
---
 command/sdist.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/command/sdist.py b/command/sdist.py
index 56bc4c9556..0a57ba364f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -440,6 +440,13 @@ def read_template (self):
 
         # while loop over lines of template file
 
+        # Prune away the build and source distribution directories
+        build = self.find_peer ('build')
+        exclude_pattern (self.files, None, prefix=build.build_base)
+
+        base_dir = self.distribution.get_fullname()
+        exclude_pattern (self.files, None, prefix=base_dir)
+
     # read_template ()
 
 

From 8b3691a0dc7439ba4ce8c91bc7cd112c3ad9b49f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 27 May 2000 17:27:23 +0000
Subject: [PATCH 0382/8469] Some far-reaching naming changes:   * Command
 method 'find_peer()' -> 'get_finalized_command()'   * Command method
 'run_peer()' -> 'run_command()' Also deleted the 'get_command_option()'
 method from Command, and   fixed the one place where it was used (in
 "bdist_dumb").

---
 cmd.py                     | 30 +++++++++--------------
 command/bdist.py           |  6 ++---
 command/bdist_dumb.py      | 10 ++++----
 command/bdist_rpm.py       | 49 +++++++++++++++-----------------------
 command/build.py           |  8 +++----
 command/build_ext.py       |  4 ++--
 command/install.py         |  8 +++----
 command/install_lib.py     | 10 ++++----
 command/install_scripts.py |  2 +-
 command/sdist.py           |  8 +++----
 dist.py                    |  2 +-
 11 files changed, 59 insertions(+), 78 deletions(-)

diff --git a/cmd.py b/cmd.py
index 09727331d4..c21ea03e6d 100644
--- a/cmd.py
+++ b/cmd.py
@@ -69,11 +69,11 @@ def __init__ (self, dist):
         # none of that complicated bureaucracy is needed.
         self.help = 0
 
-        # 'ready' records whether or not 'finalize_options()' has been
+        # 'finalized' records whether or not 'finalize_options()' has been
         # called.  'finalize_options()' itself should not pay attention to
-        # this flag: it is the business of 'ensure_ready()', which always
-        # calls 'finalize_options()', to respect/update it.
-        self.ready = 0
+        # this flag: it is the business of 'ensure_finalized()', which
+        # always calls 'finalize_options()', to respect/update it.
+        self.finalized = 0
 
     # __init__ ()
 
@@ -89,10 +89,10 @@ def __getattr__ (self, attr):
             raise AttributeError, attr
 
 
-    def ensure_ready (self):
-        if not self.ready:
+    def ensure_finalized (self):
+        if not self.finalized:
             self.finalize_options ()
-        self.ready = 1
+        self.finalized = 1
         
 
     # Subclasses must define:
@@ -184,32 +184,24 @@ def set_undefined_options (self, src_cmd, *option_pairs):
         # Option_pairs: list of (src_option, dst_option) tuples
 
         src_cmd_obj = self.distribution.get_command_obj (src_cmd)
-        src_cmd_obj.ensure_ready ()
+        src_cmd_obj.ensure_finalized ()
         for (src_option, dst_option) in option_pairs:
             if getattr (self, dst_option) is None:
                 setattr (self, dst_option,
                          getattr (src_cmd_obj, src_option))
 
 
-    def find_peer (self, command, create=1):
+    def get_finalized_command (self, command, create=1):
         """Wrapper around Distribution's 'get_command_obj()' method:
            find (create if necessary and 'create' is true) the command
            object for 'command'.."""
 
         cmd_obj = self.distribution.get_command_obj (command, create)
-        cmd_obj.ensure_ready ()
+        cmd_obj.ensure_finalized ()
         return cmd_obj
 
 
-    def get_peer_option (self, command, option):
-        """Find or create the command object for 'command', and return
-           its 'option' option."""
-
-        cmd_obj = self.find_peer (command)
-        return getattr(cmd_obj, option)
-
-
-    def run_peer (self, command):
+    def run_command (self, command):
         """Run some other command: uses the 'run_command()' method of
            Distribution, which creates the command object if necessary
            and then invokes its 'run()' method."""
diff --git a/command/bdist.py b/command/bdist.py
index 892712ecfb..df4e3a0350 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -53,7 +53,7 @@ def finalize_options (self):
         # temporary directories (eg. we'll probably have
         # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.)
         if self.bdist_base is None:
-            build_base = self.find_peer('build').build_base
+            build_base = self.get_finalized_command('build').build_base
             plat = get_platform()
             self.bdist_base = os.path.join (build_base, 'bdist.' + plat)
 
@@ -79,9 +79,9 @@ def run (self):
                   "invalid archive format '%s'" % self.format
 
         if cmd_name not in self.no_format_option:
-            sub_cmd = self.find_peer (cmd_name)
+            sub_cmd = self.get_finalized_command (cmd_name)
             sub_cmd.format = self.format
-        self.run_peer (cmd_name)
+        self.run_command (cmd_name)
 
     # run()
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index eaa192732b..51e35e4b15 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -40,7 +40,7 @@ def initialize_options (self):
 
     def finalize_options (self):
         if self.bdist_dir is None:
-            bdist_base = self.get_peer_option('bdist', 'bdist_base')
+            bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'dumb')
 
         if self.format is None:
@@ -56,10 +56,10 @@ def finalize_options (self):
 
     def run (self):
 
-        self.run_peer ('build')
+        self.run_command ('build')
 
-        # XXX don't use 'self.find_peer()', because it always runs
-        # 'ensure_ready()' on the command object; we explictly want a
+        # XXX don't use 'self.get_finalized_command()', because it always runs
+        # 'ensure_finalized()' on the command object; we explictly want a
         # command object that has *not* been finalized, so we can set
         # options on it!  (The option we set, 'root', is so that we can do
         # a proper "fake install" using this install command object.)
@@ -67,7 +67,7 @@ def run (self):
         install.root = self.bdist_dir
 
         self.announce ("installing to %s" % self.bdist_dir)
-        install.ensure_ready()
+        install.ensure_finalized()
         install.run()
 
         # And make an archive relative to the root of the
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index d10d0762ca..d07f9249da 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -1,20 +1,17 @@
 """distutils.command.bdist_rpm
 
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
-distributions."""
+distributions)."""
 
 # created 2000/04/25, by Harry Henry Gebel
 
 __revision__ = "$Id$"
 
-from os.path import exists, basename
-import os
+import os, string
+from types import *
 from distutils.core import Command
 from distutils.util import mkpath, write_file, copy_file
 from distutils.errors import *
-from string import join, lower
-from types import StringType, DictType, LongType, FloatType, IntType, \
-     ListType, TupleType
 
 class bdist_rpm (Command):
 
@@ -68,23 +65,15 @@ def run (self):
 
         # make directories
         if self.spec_only:
-            self.execute(mkpath, ('redhat',), "Created './redhat' directory")
+            self.mkpath('redhat')
         else:
-            self.execute(mkpath, ('build/rpm/SOURCES',),
-                         "Created RPM source directory")
-            self.execute(mkpath, ('build/rpm/SPECS',),
-                         "Created RPM source directory")
-            self.execute(mkpath, ('build/rpm/BUILD',),
-                         "Created RPM source directory")
-            self.execute(mkpath, ('build/rpm/RPMS',),
-                         "Created RPM source directory")
-            self.execute(mkpath, ('build/rpm/SRPMS',),
-                         "Created RPM source directory")
+            for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'):
+                self.mkpath(os.path.join('build/rpm', d))
 
         # spec file goes into .redhat directory if '--spec-only specified',
-        # into build/rpm/spec otherwisu
+        # into build/rpm/spec otherwise
         if self.spec_only:
-            spec_path = './redhat/%s.spec' % self.distribution.get_name()
+            spec_path = 'redhat/%s.spec' % self.distribution.get_name()
         else:
             spec_path = ('build/rpm/SPECS/%s.spec' %
                          self.distribution.get_name())
@@ -98,12 +87,12 @@ def run (self):
 
         # make a source distribution and copy to SOURCES directory with
         # optional icon
-        sdist = self.find_peer ('sdist')
+        sdist = self.get_finalized_command ('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']
         else:
             sdist.formats = ['gztar']
-        self.run_peer('sdist')
+        self.run_command('sdist')
         if self.use_bzip2:
             source = self.distribution.get_fullname() + '.tar.bz2'
         else:
@@ -111,7 +100,7 @@ def run (self):
         self.execute(copy_file, (source, 'build/rpm/SOURCES'),
                      'Copying source distribution to SOURCES')
         if self.icon:
-            if exists(self.icon):
+            if os.path.exists(self.icon):
                 self.execute(copy_file, (self.icon, 'build/rpm/SOURCES'),
                      'Copying icon to SOURCES')
             else:
@@ -144,10 +133,12 @@ def _get_package_data(self):
         DistributionMetadata class, then from the package_data file, which is
         Python code read with execfile() '''
 
+        from string import join
+
         package_type = 'rpm'
         
         # read in package data, if any
-        if exists('package_data'):
+        if os.path.exists('package_data'):
             try:
                 exec(open('package_data'))
             except:
@@ -195,7 +186,7 @@ def _get_package_data(self):
         self.doc = self._check_string_list('doc')
         if type(self.doc) == ListType:
             for readme in ('README', 'README.txt'):
-                if exists(readme) and readme not in self.doc:
+                if os.path.exists(readme) and readme not in self.doc:
                     self.doc.append(readme)
             self.doc = join(self.doc)
         self.provides = join(self._check_string_list('provides'))
@@ -246,9 +237,9 @@ def _make_spec_file(self):
                       'Conflicts',
                       'Obsoletes',
                       ):
-            if getattr(self, lower(field)):
-                spec_file.append('%s: %s' % (field, getattr(self,
-                                                            lower(field))))
+            if getattr(self, string.lower(field)):
+                spec_file.append('%s: %s' %
+                                 (field, getattr(self, string.lower(field))))
                       
         if self.distribution.get_url() != 'UNKNOWN':
             spec_file.append('Url: ' + self.distribution.get_url())
@@ -260,7 +251,7 @@ def _make_spec_file(self):
              spec_file.append('BuildRequires: ' + self.build_requires)
 
         if self.icon:
-            spec_file.append('Icon: ' + basename(self.icon))
+            spec_file.append('Icon: ' + os.path.basename(self.icon))
 
         spec_file.extend([
             '',
@@ -388,5 +379,3 @@ def _check_string_list(self, var_name, default_value = []):
                    'list or tuple of strings' % var_name)
         else:
             return default_value
-
-# class bdist_rpm
diff --git a/command/build.py b/command/build.py
index d9eed7685c..b0894b8313 100644
--- a/command/build.py
+++ b/command/build.py
@@ -92,20 +92,20 @@ def run (self):
         # Invoke the 'build_py' command to "build" pure Python modules
         # (ie. copy 'em into the build tree)
         if self.distribution.has_pure_modules():
-            self.run_peer ('build_py')
+            self.run_command ('build_py')
 
         # Build any standalone C libraries next -- they're most likely to
         # be needed by extension modules, so obviously have to be done
         # first!
         if self.distribution.has_c_libraries():
-            self.run_peer ('build_clib')
+            self.run_command ('build_clib')
 
         # And now 'build_ext' -- compile extension modules and put them
         # into the build tree
         if self.distribution.has_ext_modules():
-            self.run_peer ('build_ext')
+            self.run_command ('build_ext')
 
         if self.distribution.has_scripts():
-            self.run_peer ('build_scripts')
+            self.run_command ('build_scripts')
 
 # class build
diff --git a/command/build_ext.py b/command/build_ext.py
index acf1d7b7d5..cef3ca827d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -167,7 +167,7 @@ def run (self):
         # directory where we put them is in the library search path for
         # linking extensions.
         if self.distribution.has_c_libraries():
-            build_clib = self.find_peer ('build_clib')
+            build_clib = self.get_finalized_command ('build_clib')
             self.libraries.extend (build_clib.get_library_names() or [])
             self.library_dirs.append (build_clib.build_clib)
 
@@ -294,7 +294,7 @@ def build_extensions (self):
                 package = string.join (modpath[0:-1], '.')
                 base = modpath[-1]
 
-                build_py = self.find_peer ('build_py')
+                build_py = self.get_finalized_command ('build_py')
                 package_dir = build_py.get_package_dir (package)
                 ext_filename = os.path.join (package_dir,
                                              self.get_ext_filename(base))
diff --git a/command/install.py b/command/install.py
index d89ce4d255..bc5d8f33be 100644
--- a/command/install.py
+++ b/command/install.py
@@ -454,11 +454,11 @@ def run (self):
 
         # Obviously have to build before we can install
         if not self.skip_build:
-            self.run_peer ('build')
+            self.run_command ('build')
 
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
-            self.run_peer (cmd_name)
+            self.run_command (cmd_name)
 
         if self.path_file:
             self.create_path_file ()
@@ -507,7 +507,7 @@ def get_outputs (self):
         # get the outputs of all its sub-commands.
         outputs = []
         for cmd_name in self.get_sub_commands():
-            cmd = self.find_peer (cmd_name)
+            cmd = self.get_finalized_command (cmd_name)
             outputs.extend (cmd.get_outputs())
 
         return outputs
@@ -517,7 +517,7 @@ def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
-            cmd = self.find_peer (cmd_name)
+            cmd = self.get_finalized_command (cmd_name)
             inputs.extend (cmd.get_inputs())
 
         return inputs
diff --git a/command/install_lib.py b/command/install_lib.py
index e9cd80db35..d866d8cc82 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -46,9 +46,9 @@ def run (self):
         # Make sure we have built everything we need first
         if not self.skip_build:
             if self.distribution.has_pure_modules():
-                self.run_peer ('build_py')
+                self.run_command ('build_py')
             if self.distribution.has_ext_modules():
-                self.run_peer ('build_ext')
+                self.run_command ('build_ext')
 
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of
@@ -85,7 +85,7 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
         if not has_any:
             return []
 
-        build_cmd = self.find_peer (build_cmd)
+        build_cmd = self.get_finalized_command (build_cmd)
         build_files = build_cmd.get_outputs()
         build_dir = getattr (build_cmd, cmd_option)
 
@@ -138,11 +138,11 @@ def get_inputs (self):
         inputs = []
         
         if self.distribution.has_pure_modules():
-            build_py = self.find_peer ('build_py')
+            build_py = self.get_finalized_command ('build_py')
             inputs.extend (build_py.get_outputs())
 
         if self.distribution.has_ext_modules():
-            build_ext = self.find_peer ('build_ext')
+            build_ext = self.get_finalized_command ('build_ext')
             inputs.extend (build_ext.get_outputs())
 
         return inputs
diff --git a/command/install_scripts.py b/command/install_scripts.py
index 5888cafd44..3eb3963c95 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -35,7 +35,7 @@ def finalize_options (self):
 
     def run (self):
         if not self.skip_build:
-            self.run_peer('build_scripts')
+            self.run_command('build_scripts')
         self.outfiles = self.copy_tree (self.build_dir, self.install_dir)
         if os.name == 'posix':
             # Set the executable bits (owner, group, and world) on
diff --git a/command/sdist.py b/command/sdist.py
index 0a57ba364f..6626b9e66a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -223,15 +223,15 @@ def find_defaults (self):
                 self.files.extend (files)
 
         if self.distribution.has_pure_modules():
-            build_py = self.find_peer ('build_py')
+            build_py = self.get_finalized_command ('build_py')
             self.files.extend (build_py.get_source_files ())
 
         if self.distribution.has_ext_modules():
-            build_ext = self.find_peer ('build_ext')
+            build_ext = self.get_finalized_command ('build_ext')
             self.files.extend (build_ext.get_source_files ())
 
         if self.distribution.has_c_libraries():
-            build_clib = self.find_peer ('build_clib')
+            build_clib = self.get_finalized_command ('build_clib')
             self.files.extend (build_clib.get_source_files ())
 
 
@@ -441,7 +441,7 @@ def read_template (self):
         # while loop over lines of template file
 
         # Prune away the build and source distribution directories
-        build = self.find_peer ('build')
+        build = self.get_finalized_command ('build')
         exclude_pattern (self.files, None, prefix=build.build_base)
 
         base_dir = self.distribution.get_fullname()
diff --git a/dist.py b/dist.py
index 1e8c63243b..ece23a6ba3 100644
--- a/dist.py
+++ b/dist.py
@@ -681,7 +681,7 @@ def run_command (self, command):
 
         self.announce ("running " + command)
         cmd_obj = self.get_command_obj (command)
-        cmd_obj.ensure_ready ()
+        cmd_obj.ensure_finalized ()
         cmd_obj.run ()
         self.have_run[command] = 1
 

From e98b1cb14ebf43c54f0ec74be9483e02d69d900e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 28 May 2000 23:47:00 +0000
Subject: [PATCH 0383/8469] Moved warnings out of 'finalize_options()' into
 'run()'. Added a warning for 'bdist_base' directory.

---
 command/clean.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 62307a1968..31147b58ef 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -34,13 +34,6 @@ def initialize_options(self):
         self.all = None
 
     def finalize_options(self):
-        if self.build_lib and not os.path.exists (self.build_lib):
-            self.warn ("'%s' does not exist -- can't clean it" %
-                       self.build_lib)
-        if self.build_temp and not os.path.exists (self.build_temp):
-            self.warn ("'%s' does not exist -- can't clean it" %
-                       self.build_temp)
-
         self.set_undefined_options('build',
                                    ('build_base', 'build_base'),
                                    ('build_lib', 'build_lib'),
@@ -53,11 +46,21 @@ def run(self):
         # gone)
         if os.path.exists (self.build_temp):
             remove_tree (self.build_temp, self.verbose, self.dry_run)
+        else:
+            self.warn ("'%s' does not exist -- can't clean it" %
+                       self.build_temp)
+
+
+            
 
         if self.all:
             # remove the module build directory (unless already gone)
             if os.path.exists (self.build_lib):
                 remove_tree (self.build_lib, self.verbose, self.dry_run)
+            else:
+                self.warn ("'%s' does not exist -- can't clean it" %
+                           self.build_lib)
+
             # remove the temporary directory used for creating built
             # distributions (default "build/bdist") -- eg. type of
             # built distribution will have its own subdirectory under
@@ -65,6 +68,9 @@ def run(self):
             # 'remove_tree()'.
             if os.path.exists (self.bdist_base):
                 remove_tree (self.bdist_base, self.verbose, self.dry_run)
+            else:
+                self.warn ("'%s' does not exist -- can't clean it" %
+                           self.bdist_base)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care

From 5988ea06ee6f64f6b1da4397b66b1ea9b227484c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 28 May 2000 23:47:31 +0000
Subject: [PATCH 0384/8469] Only print debugging output if DEBUG (imported from
 distutils.core) is true.

---
 command/install.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/command/install.py b/command/install.py
index bc5d8f33be..13fa88ee19 100644
--- a/command/install.py
+++ b/command/install.py
@@ -8,7 +8,7 @@
 
 import sys, os, string
 from types import *
-from distutils.core import Command
+from distutils.core import Command, DEBUG
 from distutils import sysconfig
 from distutils.util import write_file, native_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
@@ -240,9 +240,10 @@ def finalize_options (self):
         self.config_vars['base'] = self.install_base
         self.config_vars['platbase'] = self.install_platbase
 
-        from pprint import pprint
-        print "config vars:"
-        pprint (self.config_vars)
+        if DEBUG:
+            from pprint import pprint
+            print "config vars:"
+            pprint (self.config_vars)
 
         # Expand "~" and configuration variables in the installation
         # directories.
@@ -289,17 +290,17 @@ def finalize_options (self):
     # finalize_options ()
 
 
-    # hack for debugging output
     def dump_dirs (self, msg):
-        from distutils.fancy_getopt import longopt_xlate
-        print msg + ":"
-        for opt in self.user_options:
-            opt_name = opt[0]
-            if opt_name[-1] == "=":
-                opt_name = opt_name[0:-1]
-            opt_name = string.translate (opt_name, longopt_xlate)
-            val = getattr (self, opt_name)
-            print "  %s: %s" % (opt_name, val)
+        if DEBUG:
+            from distutils.fancy_getopt import longopt_xlate
+            print msg + ":"
+            for opt in self.user_options:
+                opt_name = opt[0]
+                if opt_name[-1] == "=":
+                    opt_name = opt_name[0:-1]
+                opt_name = string.translate (opt_name, longopt_xlate)
+                val = getattr (self, opt_name)
+                print "  %s: %s" % (opt_name, val)
 
 
     def finalize_unix (self):

From 691c62d56f771c3a2f1f914bc44f9958ad2d7c28 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 28 May 2000 23:49:03 +0000
Subject: [PATCH 0385/8469] Changed order so 'clean' is right after the 'build'
 commands.

---
 command/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/__init__.py b/command/__init__.py
index 56c26fe151..95bce8d8c1 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -10,12 +10,12 @@
            'build_ext',
            'build_clib',
            'build_scripts',
+           'clean',
            'install',
            'install_lib',
            'install_headers',
            'install_scripts',
            'install_data',
-           'clean',
            'sdist',
            'bdist',
            'bdist_dumb',

From b09a8fe0d18535ae8db3f8f6c980d5f2fde3e19f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 28 May 2000 23:53:06 +0000
Subject: [PATCH 0386/8469] Factored '_set_command_options()' out of
 'get_command_obj()'. Added 'reinitialize_command()' -- lets us "push" option
 values in   a controlled, safe way; this is a small change to the code, but  
 a big change to the Distutils philosophy of passing option values   around. 
 The preferred mode is still definitely to "pull" options   from another
 command (eg. "install" fetches the base build directory   from "build"), but
 it is now feasible to "push" options onto another   command, when you know
 what's best for it.  One possible application   will be a "config" command,
 which pokes around the system and pushes   values (eg. include and library
 directories) onto the "build" command. Added 'dump_option_dicts()' method
 (for debugging output).

---
 dist.py | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 8 deletions(-)

diff --git a/dist.py b/dist.py
index ece23a6ba3..3391e53f5e 100644
--- a/dist.py
+++ b/dist.py
@@ -217,6 +217,35 @@ def get_option_dict (self, command):
         return dict
 
 
+    def dump_option_dicts (self, header=None, commands=None, indent=""):
+        from pprint import pformat
+
+        if commands is None:             # dump all command option dicts
+            commands = self.command_options.keys()
+            commands.sort()
+
+        if header is not None:
+            print indent + header
+            indent = indent + "  "
+
+        if not commands:
+            print indent + "no commands known yet"
+            return
+
+        for cmd_name in commands:
+            opt_dict = self.command_options.get(cmd_name)
+            if opt_dict is None:
+                print indent + "no option dict for '%s' command" % cmd_name
+            else:
+                print indent + "option dict for '%s' command:" % cmd_name
+                out = pformat(opt_dict)
+                for line in string.split(out, "\n"):
+                    print indent + "  " + line
+
+    # dump_option_dicts ()
+            
+
+
     # -- Config file finding/parsing methods ---------------------------
 
     def find_config_files (self):
@@ -632,17 +661,62 @@ def get_command_obj (self, command, create=1):
             # we won't report the source of the error.)
             options = self.command_options.get(command)
             if options:
-                print "  setting options:"
-                for (option, (source, value)) in options.items():
-                    print "    %s = %s (from %s)" % (option, value, source)
-                    if not hasattr(cmd_obj, option):
-                        raise DistutilsOptionError, \
-                              ("%s: command '%s' has no such option '%s'") % \
-                              (source, command, option)
-                    setattr(cmd_obj, option, value)
+                self._set_command_options(cmd_obj, options)
 
         return cmd_obj
 
+    def _set_command_options (self, command_obj, option_dict=None):
+
+        """Set the options for 'command_obj' from 'option_dict'.  Basically
+        this means copying elements of a dictionary ('option_dict') to
+        attributes of an instance ('command').
+
+        'command_obj' must be a Commnd instance.  If 'option_dict' is not
+        supplied, uses the standard option dictionary for this command
+        (from 'self.command_options').
+        """
+        from distutils.core import DEBUG
+        
+        command_name = command_obj.get_command_name()
+        if option_dict is None:
+            option_dict = self.get_option_dict(command_name)
+
+        if DEBUG: print "  setting options for '%s' command:" % command_name
+        for (option, (source, value)) in option_dict.items():
+            if DEBUG: print "    %s = %s (from %s)" % (option, value, source)
+            if not hasattr(command_obj, option):
+                raise DistutilsOptionError, \
+                      ("error in %s: command '%s' has no such option '%s'") % \
+                      (source, command_name, option)
+            setattr(command_obj, option, value)
+
+    def reinitialize_command (self, command):
+        """Reinitializes a command to the state it was in when first
+        returned by 'get_command_obj()': ie., initialized but not yet
+        finalized.  This gives provides the opportunity to sneak option
+        values in programmatically, overriding or supplementing
+        user-supplied values from the config files and command line.
+        You'll have to re-finalize the command object (by calling
+        'finalize_options()' or 'ensure_finalized()') before using it for
+        real.  
+
+        'command' should be a command name (string) or command object.
+        Returns the reinitialized command object.
+        """
+        from distutils.cmd import Command
+        if not isinstance(command, Command):
+            command_name = command
+            command = self.get_command_obj(command_name)
+        else:
+            command_name = command.get_command_name()
+
+        if not command.finalized:
+            return
+        command.initialize_options()
+        command.finalized = 0
+        self._set_command_options(command)
+        return command
+
         
     # -- Methods that operate on the Distribution ----------------------
 

From d7dd557d81c46cd532939cdbf4a420f34d46bb1c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 28 May 2000 23:54:00 +0000
Subject: [PATCH 0387/8469] Added 'dump_options()' for debugging output.

---
 cmd.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cmd.py b/cmd.py
index c21ea03e6d..f80338920e 100644
--- a/cmd.py
+++ b/cmd.py
@@ -135,6 +135,21 @@ def finalize_options (self):
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
 
+
+    def dump_options (self, header=None, indent=""):
+        from distutils.fancy_getopt import longopt_xlate
+        if header is None:
+            header = "command options for '%s':" % self.get_command_name()
+        print indent + header
+        indent = indent + "  "
+        for (option, _, _) in self.user_options:
+            option = string.translate(option, longopt_xlate)
+            if option[-1] == "=":
+                option = option[:-1]
+            value = getattr(self, option)
+            print indent + "%s = %s" % (option, value)
+
+
     def run (self):
         """A command's raison d'etre: carry out the action it exists
            to perform, controlled by the options initialized in

From 73ce40de7dd0c8ef02a2f2b99d3cc308d9062916 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 01:56:44 +0000
Subject: [PATCH 0388/8469] Changed to catch compile/link failures and raise
 CompileError, LibError, or LinkError (exception classes defined in
 ccompiler.py).

---
 ccompiler.py     | 36 +++++++++++++++++++++++++++++++-----
 msvccompiler.py  | 28 +++++++++++++++++++++-------
 unixccompiler.py | 27 ++++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 42221769e6..33caf86830 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,6 +15,22 @@
 from distutils.util import move_file, mkpath, newer_pairwise, newer_group
 
 
+# Exception classes used by the CCompiler implementation classes
+class CCompilerError (Exception):
+    """Failure doing some compile/link operation."""
+
+class CompileError (CCompilerError):
+    """Failure to compile one or more C/C++ source files."""
+
+class LibError (CCompilerError):
+    """Failure to create a static library from one or more C/C++ object
+    files."""
+
+class LinkError (CCompilerError):
+    """Failure to link one or more C/C++ object files into an executable
+    or shared library file."""
+
+
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
        by real compiler abstraction classes.  Might have some use as a
@@ -456,7 +472,9 @@ def compile (self,
            command line.  On other platforms, consult the implementation
            class documentation.  In any event, they are intended as an
            escape hatch for those occasions when the abstract compiler
-           framework doesn't cut the mustard."""
+           framework doesn't cut the mustard.
+
+           Raises CompileError on failure."""
            
         pass
 
@@ -481,7 +499,9 @@ def create_static_lib (self,
            'debug' is a boolean; if true, debugging information will be
            included in the library (note that on most platforms, it is the
            compile step where this matters: the 'debug' flag is included
-           here just for consistency)."""
+           here just for consistency).
+
+           Raises LibError on failure."""
 
         pass
     
@@ -531,7 +551,9 @@ def link_shared_lib (self,
 
            'extra_preargs' and 'extra_postargs' are as for 'compile()'
            (except of course that they supply command-line arguments
-           for the particular linker being used)."""           
+           for the particular linker being used).
+
+           Raises LinkError on failure."""
 
         pass
     
@@ -552,7 +574,9 @@ def link_shared_object (self,
            is explicitly supplied as 'output_filename'.  If 'output_dir' is
            supplied, 'output_filename' is relative to it
            (i.e. 'output_filename' can provide directory components if
-           needed)."""
+           needed).
+
+           Raises LinkError on failure."""
         pass
 
 
@@ -570,7 +594,9 @@ def link_executable (self,
            file.  The "bunch of stuff" is as for 'link_shared_lib()'.
            'output_progname' should be the base name of the executable
            program--e.g. on Unix the same as the output filename, but
-           on DOS/Windows ".exe" will be appended."""
+           on DOS/Windows ".exe" will be appended.
+
+           Raises LinkError on failure."""
         pass
 
 
diff --git a/msvccompiler.py b/msvccompiler.py
index b6ff432ce3..06b415ebde 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -14,7 +14,8 @@
 from types import *
 from distutils.errors import *
 from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+     CCompiler, gen_preprocess_options, gen_lib_options, \
+     CompileError, LibError, LinkError
 
 
 _can_read_reg = 0
@@ -261,9 +262,12 @@ def compile (self,
                 output_opt = "/Fo" + obj
 
                 self.mkpath (os.path.dirname (obj))
-                self.spawn ([self.cc] + compile_opts + pp_opts +
-                            [input_opt, output_opt] +
-                            extra_postargs)
+                try:
+                    self.spawn ([self.cc] + compile_opts + pp_opts +
+                                [input_opt, output_opt] +
+                                extra_postargs)
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
 
         return objects
 
@@ -290,7 +294,11 @@ def create_static_lib (self,
                 lib_args[:0] = extra_preargs
             if extra_postargs:
                 lib_args.extend (extra_postargs)
-            self.spawn ([self.link] + ld_args)
+            try:
+                self.spawn ([self.link] + ld_args)
+            except DistutilsExecError, msg:
+                raise LibError, msg
+                
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
@@ -370,7 +378,10 @@ def link_shared_object (self,
             print "  output_filename =", output_filename
             print "  mkpath'ing:", os.path.dirname (output_filename)
             self.mkpath (os.path.dirname (output_filename))
-            self.spawn ([self.link] + ld_args)
+            try:
+                self.spawn ([self.link] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
 
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
@@ -420,7 +431,10 @@ def link_executable (self,
                 ld_args.extend (extra_postargs)
 
             self.mkpath (os.path.dirname (output_filename))
-            self.spawn ([self.link] + ld_args)
+            try:
+                self.spawn ([self.link] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)   
     
diff --git a/unixccompiler.py b/unixccompiler.py
index 40f564ab88..c2f841ff67 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -21,7 +21,10 @@
 from types import *
 from copy import copy
 from distutils import sysconfig
-from distutils.ccompiler import CCompiler, gen_preprocess_options, gen_lib_options
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options, \
+     CompileError, LibError, LinkError
+from distutils.errors import DistutilsExecError
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
@@ -132,7 +135,12 @@ def compile (self,
                 self.announce ("skipping %s (%s up-to-date)" % (src, obj))
             else:
                 self.mkpath (os.path.dirname (obj))
-                self.spawn ([self.cc] + cc_args + [src, '-o', obj] + extra_postargs)
+                try:
+                    self.spawn ([self.cc] + cc_args +
+                                [src, '-o', obj] +
+                                extra_postargs)
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
 
         # Return *all* object filenames, not just the ones we just built.
         return objects
@@ -164,7 +172,10 @@ def create_static_lib (self,
             # needed -- or maybe Python's configure script took care of
             # it for us, hence the check for leading colon.
             if self.ranlib[0] != ':':
-                self.spawn ([self.ranlib, output_filename])
+                try:
+                    self.spawn ([self.ranlib, output_filename])
+                except DistutilsExecError, msg:
+                    raise LibError, msg
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
@@ -229,7 +240,10 @@ def link_shared_object (self,
             if extra_postargs:
                 ld_args.extend (extra_postargs)
             self.mkpath (os.path.dirname (output_filename))
-            self.spawn ([self.ld_shared] + ld_args)
+            try:
+                self.spawn ([self.ld_shared] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
@@ -267,7 +281,10 @@ def link_executable (self,
             if extra_postargs:
                 ld_args.extend (extra_postargs)
             self.mkpath (os.path.dirname (output_filename))
-            self.spawn ([self.ld_exec] + ld_args)
+            try:
+                self.spawn ([self.ld_exec] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 

From 8f4b133d35191a4e6efc52c8a743c01cc7be8cd7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:02:14 +0000
Subject: [PATCH 0389/8469] Moved the CCompiler exceptions here, to avoid
 having to import ccompiler.py   just to get a little exception class. No more
 string-based exceptions.

---
 errors.py | 157 +++++++++++++++++++++++++++---------------------------
 1 file changed, 78 insertions(+), 79 deletions(-)

diff --git a/errors.py b/errors.py
index d66043a1fe..161705633c 100644
--- a/errors.py
+++ b/errors.py
@@ -12,82 +12,81 @@
 
 __revision__ = "$Id$"
 
-import types
-
-if type (RuntimeError) is types.ClassType:
-
-    class DistutilsError (Exception):
-        """The root of all Distutils evil."""
-        pass
-
-    class DistutilsModuleError (DistutilsError):
-        """Unable to load an expected module, or to find an expected class
-        within some module (in particular, command modules and classes)."""
-        pass
-
-    class DistutilsClassError (DistutilsError):
-        """Some command class (or possibly distribution class, if anyone
-        feels a need to subclass Distribution) is found not to be holding
-        up its end of the bargain, ie. implementing some part of the
-        "command "interface."""
-        pass
-
-    class DistutilsGetoptError (DistutilsError):
-        """The option table provided to 'fancy_getopt()' is bogus."""
-        pass
-
-    class DistutilsArgError (DistutilsError):
-        """Raised by fancy_getopt in response to getopt.error -- ie. an
-        error in the command line usage."""
-        pass
-
-    class DistutilsFileError (DistutilsError):
-        """Any problems in the filesystem: expected file not found, etc.
-        Typically this is for problems that we detect before IOError or
-        OSError could be raised."""
-        pass
-
-    class DistutilsOptionError (DistutilsError):
-        """Syntactic/semantic errors in command options, such as use of
-        mutually conflicting options, or inconsistent options,
-        badly-spelled values, etc.  No distinction is made between option
-        values originating in the setup script, the command line, config
-        files, or what-have-you -- but if we *know* something originated in
-        the setup script, we'll raise DistutilsSetupError instead."""
-        pass
-
-    class DistutilsSetupError (DistutilsError):
-        """For errors that can be definitely blamed on the setup script,
-        such as invalid keyword arguments to 'setup()'."""
-        pass
-
-    class DistutilsPlatformError (DistutilsError):
-        """We don't know how to do something on the current platform (but
-        we do know how to do it on some platform) -- eg. trying to compile
-        C files on a platform not supported by a CCompiler subclass."""
-        pass
-
-    class DistutilsExecError (DistutilsError):
-        """Any problems executing an external program (such as the C
-        compiler, when compiling C files)."""
-        pass
-
-    class DistutilsInternalError (DistutilsError):
-        """Internal inconsistencies or impossibilities (obviously, this
-        should never be seen if the code is working!)."""
-        pass
-
-# String-based exceptions
-else:
-    DistutilsError = 'DistutilsError'
-    DistutilsModuleError = 'DistutilsModuleError'
-    DistutilsClassError = 'DistutilsClassError'
-    DistutilsGetoptError = 'DistutilsGetoptError'
-    DistutilsArgError = 'DistutilsArgError'
-    DistutilsFileError = 'DistutilsFileError'
-    DistutilsOptionError = 'DistutilsOptionError'
-    DistutilsPlatformError = 'DistutilsPlatformError'
-    DistutilsExecError = 'DistutilsExecError'
-    DistutilsInternalError = 'DistutilsInternalError'
-    
-del types
+class DistutilsError (Exception):
+    """The root of all Distutils evil."""
+    pass
+
+class DistutilsModuleError (DistutilsError):
+    """Unable to load an expected module, or to find an expected class
+    within some module (in particular, command modules and classes)."""
+    pass
+
+class DistutilsClassError (DistutilsError):
+    """Some command class (or possibly distribution class, if anyone
+    feels a need to subclass Distribution) is found not to be holding
+    up its end of the bargain, ie. implementing some part of the
+    "command "interface."""
+    pass
+
+class DistutilsGetoptError (DistutilsError):
+    """The option table provided to 'fancy_getopt()' is bogus."""
+    pass
+
+class DistutilsArgError (DistutilsError):
+    """Raised by fancy_getopt in response to getopt.error -- ie. an
+    error in the command line usage."""
+    pass
+
+class DistutilsFileError (DistutilsError):
+    """Any problems in the filesystem: expected file not found, etc.
+    Typically this is for problems that we detect before IOError or
+    OSError could be raised."""
+    pass
+
+class DistutilsOptionError (DistutilsError):
+    """Syntactic/semantic errors in command options, such as use of
+    mutually conflicting options, or inconsistent options,
+    badly-spelled values, etc.  No distinction is made between option
+    values originating in the setup script, the command line, config
+    files, or what-have-you -- but if we *know* something originated in
+    the setup script, we'll raise DistutilsSetupError instead."""
+    pass
+
+class DistutilsSetupError (DistutilsError):
+    """For errors that can be definitely blamed on the setup script,
+    such as invalid keyword arguments to 'setup()'."""
+    pass
+
+class DistutilsPlatformError (DistutilsError):
+    """We don't know how to do something on the current platform (but
+    we do know how to do it on some platform) -- eg. trying to compile
+    C files on a platform not supported by a CCompiler subclass."""
+    pass
+
+class DistutilsExecError (DistutilsError):
+    """Any problems executing an external program (such as the C
+    compiler, when compiling C files)."""
+    pass
+
+class DistutilsInternalError (DistutilsError):
+    """Internal inconsistencies or impossibilities (obviously, this
+    should never be seen if the code is working!)."""
+    pass
+
+
+# Exception classes used by the CCompiler implementation classes
+class CCompilerError (Exception):
+    """Some compile/link operation failed."""
+
+class CompileError (CCompilerError):
+    """Failure to compile one or more C/C++ source files."""
+
+class LibError (CCompilerError):
+    """Failure to create a static library from one or more C/C++ object
+    files."""
+
+class LinkError (CCompilerError):
+    """Failure to link one or more C/C++ object files into an executable
+    or shared library file."""
+
+

From 16536d61d54c05d033267117413465693856737e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:02:48 +0000
Subject: [PATCH 0390/8469] Removed exceptions -- now in errors.py to avoid
 expensive import of ccompiler.

---
 ccompiler.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 33caf86830..834d543e33 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,22 +15,6 @@
 from distutils.util import move_file, mkpath, newer_pairwise, newer_group
 
 
-# Exception classes used by the CCompiler implementation classes
-class CCompilerError (Exception):
-    """Failure doing some compile/link operation."""
-
-class CompileError (CCompilerError):
-    """Failure to compile one or more C/C++ source files."""
-
-class LibError (CCompilerError):
-    """Failure to create a static library from one or more C/C++ object
-    files."""
-
-class LinkError (CCompilerError):
-    """Failure to link one or more C/C++ object files into an executable
-    or shared library file."""
-
-
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
        by real compiler abstraction classes.  Might have some use as a

From 665fe5e7211490f9540308db3a3c625d0303ddc4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:02:49 +0000
Subject: [PATCH 0391/8469] Import exceptions from errors.py, not ccompiler.py.

---
 msvccompiler.py  | 8 ++++----
 unixccompiler.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 06b415ebde..06d8501afa 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -12,11 +12,11 @@
 
 import sys, os, string
 from types import *
-from distutils.errors import *
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options, \
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
-
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
 
 _can_read_reg = 0
 try:
diff --git a/unixccompiler.py b/unixccompiler.py
index c2f841ff67..4d38e4d8c1 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -22,9 +22,9 @@
 from copy import copy
 from distutils import sysconfig
 from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options, \
-     CompileError, LibError, LinkError
-from distutils.errors import DistutilsExecError
+     CCompiler, gen_preprocess_options, gen_lib_options
+from distutils.errors import \
+     DistutilsExecError, CompileError, LibError, LinkError
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's

From ad92da0dcc01f36dfd7c4b5084c77a20a7352f7b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:04:29 +0000
Subject: [PATCH 0392/8469] Catch CCompiler exceptions in 'setup()'.

---
 core.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index cd0f8e9694..15a8814712 100644
--- a/core.py
+++ b/core.py
@@ -122,7 +122,8 @@ def setup (**attrs):
             
         except (DistutilsExecError,
                 DistutilsFileError,
-                DistutilsOptionError), msg:
+                DistutilsOptionError,
+                CCompilerError), msg:
             if DEBUG:
                 raise
             else:

From 4c3307aa998ac380beb50662b75648fa6e5d80ea Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:04:54 +0000
Subject: [PATCH 0393/8469] Cosmetic tweak.

---
 command/command_template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/command_template b/command/command_template
index 73c1c190db..50bbab7b6e 100644
--- a/command/command_template
+++ b/command/command_template
@@ -1,6 +1,7 @@
 """distutils.command.x
 
-Implements the Distutils 'x' command."""
+Implements the Distutils 'x' command.
+"""
 
 # created 2000/mm/dd, John Doe
 

From 31ba84d5006258eea4f524076aebb085a1168aac Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 01:05:35 +0000
Subject: [PATCH 0394/8469] Provides the Extension class, a nicer way to
 describe C/C++ extensions than the old (ext_name, build_info) tuple.

---
 extension.py | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 extension.py

diff --git a/extension.py b/extension.py
new file mode 100644
index 0000000000..9d2a6fa15c
--- /dev/null
+++ b/extension.py
@@ -0,0 +1,115 @@
+"""distutils.extension
+
+Provides the Extension class, used to describe C/C++ extension
+modules in setup scripts."""
+
+# created 2000/05/30, Greg Ward
+
+__revision__ = "$Id$"
+
+from types import *
+
+
+# This class is really only used by the "build_ext" command, so it might
+# make sense to put it in distutils.command.build_ext.  However, that
+# module is already big enough, and I want to make this class a bit more
+# complex to simplify some common cases ("foo" module in "foo.c") and do
+# better error-checking ("foo.c" actually exists).
+# 
+# Also, putting this in build_ext.py means every setup script would have to
+# import that large-ish module (indirectly, through distutils.core) in
+# order to do anything.
+
+class Extension:
+    """Just a collection of attributes that describes an extension
+    module and everything needed to build it (hopefully in a portable
+    way, but there are hooks that let you can be as unportable as you
+    need).
+
+    Instance attributes:
+      name : string
+        the full name of the extension, including any packages -- ie.
+        *not* a filename or pathname, but Python dotted name
+      sources : [string]
+        list of C/C++ source filenames, relative to the distribution
+        root (where the setup script lives), in Unix form
+        (slash-separated) for portability
+      include_dirs : [string]
+        list of directories to search for C/C++ header files (in Unix
+        form for portability)
+      define_macros : [(name : string, value : string|None)]
+        list of macros to define; each macro is defined using a 2-tuple,
+        where 'value' is either the string to define it to or None to
+        define it without a particular value (equivalent of "#define
+        FOO" in source or -DFOO on Unix C compiler command line)
+      undef_macros : [string]
+        list of macros to undefine explicitly
+      library_dirs : [string]
+        list of directories to search for C/C++ libraries at link time
+      libraries : [string]
+        list of library names (not filenames or paths) to link against
+      runtime_library_dirs : [string]
+        list of directories to search for C/C++ libraries at run time
+        (for shared extensions, this is when the extension is loaded)
+      extra_objects : [string]
+        list of extra files to link with (eg. object files not implied
+        by 'sources', static library that must be explicitly specified,
+        binary resource files, etc.)
+      extra_compile_args : [string]
+        any extra platform- and compiler-specific information to use
+        when compiling the source files in 'sources'.  For platforms and
+        compilers where "command line" makes sense, this is typically a
+        list of command-line arguments, but for other platforms it could
+        be anything.
+      extra_link_args : [string]
+        any extra platform- and compiler-specific information to use
+        when linking object files together to create the extension (or
+        to create a new static Python interpreter).  Similar
+        interpretation as for 'extra_compile_args'.
+      export_symbols : [string]
+        list of symbols to be exported from a shared extension.  Not
+        used on all platforms, and not generally necessary for Python
+        extensions, which typically export exactly one symbol: "init" +
+        extension_name.
+      export_symbol_file : string
+        name of file that lists symbols to export; the format of this
+        file is platform- and compiler-specific.  This is even more
+        gratuitous and unnecessary than 'export_symbols'; I'll be happy
+        when it goes away forever.
+    """
+
+    def __init__ (self, name, sources,
+                  include_dirs=None,
+                  define_macros=None,
+                  undef_macros=None,
+                  library_dirs=None,
+                  libraries=None,
+                  runtime_library_dirs=None,
+                  extra_objects=None,
+                  extra_compile_args=None,
+                  extra_link_args=None,
+                  export_symbols=None,
+                  export_symbol_file=None,
+                 ):
+
+        assert type(name) is StringType, "'name' must be a string"
+        assert (type(sources) is ListType and
+                len(sources) >= 1 and
+                map(type, sources) == [StringType]*len(sources)), \
+                "'sources' must be a non-empty list of strings"
+
+        self.name = name
+        self.sources = sources
+        self.include_dirs = include_dirs or []
+        self.define_macros = define_macros or []
+        self.undef_macros = undef_macros or []
+        self.library_dirs = library_dirs or []
+        self.libraries = libraries or []
+        self.runtime_library_dirs = runtime_library_dirs or []
+        self.extra_objects = extra_objects or []
+        self.extra_compile_args = extra_compile_args or []
+        self.extra_link_args = extra_link_args or []
+        self.export_symbols = export_symbols or []
+        self.export_symbol_file = export_symbol_file
+
+# class Extension

From 69fc9746d19d0bdb9cf5d2d18eaebe561da1210b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 01:09:52 +0000
Subject: [PATCH 0395/8469] Overhauled to expect 'self.extensions' (taken from
 'ext_modules' in the setup script) to be a list of Extension instances,
 rather than a list of of (ext_name, build_info) tuples.  This is mostly a
 simplification, but 'check_extension_list()' got a lot more complicated
 because of the need to convert the old-style tuples to Extension instances.

Temporarily dropped support for defining/undefining macros in the
'extensions' list -- I want to change the interface, but haven't yet made
the required changes in CCompiler and friends to support this nicely.

Also neatened up the code that merges 'extra_compile_flags' and the CFLAGS
environment variable.
---
 command/build_ext.py | 194 ++++++++++++++++++++++++++++---------------
 1 file changed, 128 insertions(+), 66 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index cef3ca827d..f487a68cab 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -13,6 +13,7 @@
 from distutils.core import Command
 from distutils.errors import *
 from distutils.dep_util import newer_group
+from distutils.extension import Extension
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
@@ -152,13 +153,17 @@ def run (self):
 
         from distutils.ccompiler import new_compiler
 
-        # 'self.extensions', as supplied by setup.py, is a list of 2-tuples.
-        # Each tuple is simple:
+        # 'self.extensions', as supplied by setup.py, is a list of
+        # Extension instances.  See the documentation for Extension (in
+        # distutils.core) for details.
+        # 
+        # For backwards compatibility with Distutils 0.8.2 and earlier, we
+        # also allow the 'extensions' list to be a list of tuples:
         #    (ext_name, build_info)
-        # build_info is a dictionary containing everything specific to
-        # building this extension.  (Info pertaining to all extensions
-        # should be handled by general distutils options passed from
-        # setup.py down to right here, but that's not taken care of yet.)
+        # where build_info is a dictionary containing everything that
+        # Extension instances do except the name, with a few things being
+        # differently named.  We convert these 2-tuples to Extension
+        # instances as needed.
 
         if not self.extensions:
             return
@@ -208,32 +213,82 @@ def run (self):
 
     def check_extensions_list (self, extensions):
         """Ensure that the list of extensions (presumably provided as a
-           command option 'extensions') is valid, i.e. it is a list of
-           2-tuples, where the tuples are (extension_name, build_info_dict).
-           Raise DistutilsSetupError if the structure is invalid anywhere;
-           just returns otherwise."""
-
-        if type (extensions) is not ListType:
+        command option 'extensions') is valid, i.e. it is a list of
+        Extension objects.  We also support the old-style list of 2-tuples,
+        where the tuples are (ext_name, build_info), which are converted to
+        Extension instances here.
+
+        Raise DistutilsSetupError if the structure is invalid anywhere;
+        just returns otherwise.
+        """
+        if type(extensions) is not ListType:
             raise DistutilsSetupError, \
-                  "'ext_modules' option must be a list of tuples"
+                  "'ext_modules' option must be a list of Extension instances"
         
-        for ext in extensions:
-            if type (ext) is not TupleType and len (ext) != 2:
+        for i in range(len(extensions)):
+            ext = extensions[i]
+            if isinstance(ext, Extension):
+                continue                # OK! (assume type-checking done
+                                        # by Extension constructor)
+
+            (ext_name, build_info) = ext
+            self.warn(("old-style (ext_name, build_info) tuple found in "
+                       "ext_modules for extension '%s'" 
+                       "-- please convert to Extension instance" % ext_name))
+            if type(ext) is not TupleType and len(ext) != 2:
                 raise DistutilsSetupError, \
-                      "each element of 'ext_modules' option must be a 2-tuple"
+                      ("each element of 'ext_modules' option must be an "
+                       "Extension instance or 2-tuple")
 
-            if not (type (ext[0]) is StringType and
-                    extension_name_re.match (ext[0])):
+            if not (type(ext_name) is StringType and
+                    extension_name_re.match(ext_name)):
                 raise DistutilsSetupError, \
-                      "first element of each tuple in 'ext_modules' " + \
-                      "must be the extension name (a string)"
+                      ("first element of each tuple in 'ext_modules' "
+                       "must be the extension name (a string)")
 
-            if type (ext[1]) is not DictionaryType:
+            if type(build_info) is not DictionaryType:
                 raise DistutilsSetupError, \
-                      "second element of each tuple in 'ext_modules' " + \
-                      "must be a dictionary (build info)"
-
-        # end sanity-check for
+                      ("second element of each tuple in 'ext_modules' "
+                       "must be a dictionary (build info)")
+
+            # OK, the (ext_name, build_info) dict is type-safe: convert it
+            # to an Extension instance.
+            ext = Extension(ext_name, build_info['sources'])
+
+            # Easy stuff: one-to-one mapping from dict elements to
+            # instance attributes.
+            for key in ('include_dirs',
+                        'library_dirs',
+                        'libraries',
+                        'extra_objects',
+                        'extra_compile_args',
+                        'extra_link_args'):
+                setattr(ext, key, build_info.get(key))
+
+            # Medium-easy stuff: same syntax/semantics, different names.
+            ext.runtime_library_dirs = build_info.get('rpath')
+            ext.export_symbol_file = build_info.get('def_file')
+
+            # Non-trivial stuff: 'macros' split into 'define_macros'
+            # and 'undef_macros'.
+            macros = build_info.get('macros')
+            if macros:
+                ext.define_macros = []
+                ext.undef_macros = []
+                for macro in macros:
+                    if not (type(macro) is TupleType and
+                            1 <= len(macros) <= 2):
+                        raise DistutilsSetupError, \
+                              ("'macros' element of build info dict "
+                               "must be 1- or 2-tuple")
+                    if len(macro) == 1:
+                        ext.undef_macros.append(macro[0])
+                    elif len(macro) == 2:
+                        ext.define_macros.append(macro)
+
+            extensions[i] = ext
+
+        # for extensions
 
     # check_extensions_list ()
 
@@ -243,10 +298,8 @@ def get_source_files (self):
         filenames = []
 
         # Wouldn't it be neat if we knew the names of header files too...
-        for (extension_name, build_info) in self.extensions:
-            sources = build_info.get ('sources')
-            if type (sources) in (ListType, TupleType):
-                filenames.extend (sources)
+        for ext in self.extensions:
+            filenames.extend (ext.sources)
 
         return filenames
 
@@ -262,8 +315,8 @@ def get_outputs (self):
         # ignores the 'inplace' flag, and assumes everything goes in the
         # "build" tree.
         outputs = []
-        for (extension_name, build_info) in self.extensions:
-            fullname = self.get_ext_fullname (extension_name)
+        for ext in self.extensions:
+            fullname = self.get_ext_fullname (ext.name)
             outputs.append (os.path.join (self.build_lib,
                                           self.get_ext_filename(fullname)))
         return outputs
@@ -276,16 +329,16 @@ def build_extensions (self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list (self.extensions)
 
-        for (extension_name, build_info) in self.extensions:
-            sources = build_info.get ('sources')
+        for ext in self.extensions:
+            sources = ext.sources
             if sources is None or type (sources) not in (ListType, TupleType):
                 raise DistutilsSetupError, \
                       ("in 'ext_modules' option (extension '%s'), " +
                        "'sources' must be present and must be " +
-                       "a list of source filenames") % extension_name
+                       "a list of source filenames") % ext.name
             sources = list (sources)
 
-            fullname = self.get_ext_fullname (extension_name)
+            fullname = self.get_ext_fullname (ext.name)
             if self.inplace:
                 # ignore build-lib -- put the compiled extension into
                 # the source tree along with pure Python modules
@@ -302,46 +355,54 @@ def build_extensions (self):
                 ext_filename = os.path.join (self.build_lib,
                                              self.get_ext_filename(fullname))
 
-	    if not newer_group(sources, ext_filename, 'newer'):
+	    if not (self.force or newer_group(sources, ext_filename, 'newer')):
 	    	self.announce ("skipping '%s' extension (up-to-date)" %
-                               extension_name)
+                               ext.name)
 		continue # 'for' loop over all extensions
 	    else:
-        	self.announce ("building '%s' extension" % extension_name)
+        	self.announce ("building '%s' extension" % ext.name)
 
             # First step: compile the source code to object files.  This
             # drops the object files in the current directory, regardless
             # of where the source is (may be a bad thing, but that's how a
             # Makefile.pre.in-based system does it, so at least there's a
             # precedent!)
-            macros = build_info.get ('macros')
-            include_dirs = build_info.get ('include_dirs')
-            extra_args = build_info.get ('extra_compile_args')
-            # honor CFLAGS enviroment variable
-            # XXX do we *really* need this? or is it just a hack until
-            # the user can put compiler flags in setup.cfg?
+
+            # XXX not honouring 'define_macros' or 'undef_macros' -- the
+            # CCompiler API needs to change to accomodate this, and I
+            # want to do one thing at a time!
+
+            # Two possible sources for extra compiler arguments:
+            #   - 'extra_compile_args' in Extension object
+            #   - CFLAGS environment variable (not particularly
+            #     elegant, but people seem to expect it and I
+            #     guess it's useful)
+            # The environment variable should take precedence, and
+            # any sensible compiler will give precendence to later
+            # command line args.  Hence we combine them in order:
+            extra_args = ext.extra_compile_args
+
+            # XXX and if we support CFLAGS, why not CC (compiler
+            # executable), CPPFLAGS (pre-processor options), and LDFLAGS
+            # (linker options) too?
+            # XXX should we use shlex to properly parse CFLAGS?
+
             if os.environ.has_key('CFLAGS'):
-                if not extra_args:
-                    extra_args = []
-                extra_args = string.split(os.environ['CFLAGS']) + extra_args
+                extra_args.extend(string.split(os.environ['CFLAGS']))
                 
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
-                                             macros=macros,
-                                             include_dirs=include_dirs,
+                                             #macros=macros,
+                                             include_dirs=ext.include_dirs,
                                              debug=self.debug,
                                              extra_postargs=extra_args)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things
             # that go into the mix.
-            extra_objects = build_info.get ('extra_objects')
-            if extra_objects:
-                objects.extend (extra_objects)
-            libraries = build_info.get ('libraries')
-            library_dirs = build_info.get ('library_dirs')
-            rpath = build_info.get ('rpath')
-            extra_args = build_info.get ('extra_link_args') or []
+            if ext.extra_objects:
+                objects.extend (ext.extra_objects)
+            extra_args = ext.extra_link_args
 
             # XXX this is a kludge!  Knowledge of specific compilers or
             # platforms really doesn't belong here; in an ideal world, the
@@ -354,10 +415,10 @@ def build_extensions (self):
             # excuse for committing more platform- and compiler-specific
             # kludges; they are to be avoided if possible!)
             if self.compiler.compiler_type == 'msvc':
-                def_file = build_info.get ('def_file')
+                def_file = ext.export_symbol_file
                 if def_file is None:
                     source_dir = os.path.dirname (sources[0])
-                    ext_base = (string.split (extension_name, '.'))[-1]
+                    ext_base = (string.split (ext.name, '.'))[-1]
                     def_file = os.path.join (source_dir, "%s.def" % ext_base)
                     if not os.path.exists (def_file):
                         def_file = None
@@ -365,7 +426,7 @@ def build_extensions (self):
                 if def_file is not None:
                     extra_args.append ('/DEF:' + def_file)
                 else:
-                    modname = string.split (extension_name, '.')[-1]
+                    modname = string.split (ext.name, '.')[-1]
                     extra_args.append('/export:init%s'%modname)
 
                 # The MSVC linker generates unneeded .lib and .exp files,
@@ -374,17 +435,18 @@ def build_extensions (self):
                 # directory.
                 implib_file = os.path.join (
                     self.build_temp,
-                    self.get_ext_libname (extension_name))
+                    self.get_ext_libname (ext.name))
                 extra_args.append ('/IMPLIB:' + implib_file)
                 self.mkpath (os.path.dirname (implib_file))
             # if MSVC
 
-            self.compiler.link_shared_object (objects, ext_filename, 
-                                              libraries=libraries,
-                                              library_dirs=library_dirs,
-                                              runtime_library_dirs=rpath,
-                                              extra_postargs=extra_args,
-                                              debug=self.debug)
+            self.compiler.link_shared_object (
+                objects, ext_filename, 
+                libraries=ext.libraries,
+                library_dirs=ext.library_dirs,
+                runtime_library_dirs=ext.runtime_library_dirs,
+                extra_postargs=extra_args,
+                debug=self.debug)
 
     # build_extensions ()
 

From 56c6ea7b26cbbbd156403430021ae019172da3ff Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 01:11:20 +0000
Subject: [PATCH 0396/8469] Import the new Extension class, so setup scripts
 can "from distutils.core import" it.

---
 core.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core.py b/core.py
index 15a8814712..8903603925 100644
--- a/core.py
+++ b/core.py
@@ -12,8 +12,12 @@
 import sys, os
 from types import *
 from distutils.errors import *
+
+# Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
 from distutils.cmd import Command
+from distutils.extension import Extension
+
 
 # This is a barebones help message generated displayed when the user
 # runs the setup script with no arguments at all.  More useful help

From 794b1fe1cd5521c67511325600ef8679c48a53e6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 02:14:32 +0000
Subject: [PATCH 0397/8469] Fixed 'change_root() to work at all on Windows, and
 to work correctly on Unix.

---
 util.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/util.py b/util.py
index b660b4bf2b..6063aa6847 100644
--- a/util.py
+++ b/util.py
@@ -86,22 +86,22 @@ def native_path (pathname):
 
 
 def change_root (new_root, pathname):
-
     """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
     relative, this is equivalent to "os.path.join(new_root,pathname)".
     Otherwise, it requires making 'pathname' relative and then joining the
-    two, which is tricky on DOS/Windows and Mac OS."""
-
-    if not abspath (pathname):
-        return os.path.join (new_root, pathname)
-
-    elif os.name == 'posix':
-        return os.path.join (new_root, pathname[1:])
+    two, which is tricky on DOS/Windows and Mac OS.
+    """
+    if os.name == 'posix':
+        if not os.path.isabs (pathname):
+            return os.path.join (new_root, pathname)
+        else:
+            return os.path.join (new_root, pathname[1:])
 
     elif os.name == 'nt':
-        (root_drive, root_path) = os.path.splitdrive (new_root)
         (drive, path) = os.path.splitdrive (pathname)
-        raise RuntimeError, "I give up -- not sure how to do this on Windows"
+        if path[0] == '\\':
+            path = path[1:]
+        return os.path.join (new_root, path)
 
     elif os.name == 'mac':
         raise RuntimeError, "no clue how to do this on Mac OS"

From f96f4e6d4a60e6d7c8cddc8656e6affbe456c61a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 02:17:19 +0000
Subject: [PATCH 0398/8469] Normalize paths before writing them to a zipfile.

---
 archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archive_util.py b/archive_util.py
index 050ea41796..218450a6ba 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -93,7 +93,7 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
 
         def visit (z, dirname, names):
             for name in names:
-                path = os.path.join (dirname, name)
+                path = os.path.normpath(os.path.join(dirname, name))
                 if os.path.isfile (path):
                     z.write (path, path)
 

From 378e81b1c72a9d54682c8e53a433d8d5cb2f81f7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 02:32:10 +0000
Subject: [PATCH 0399/8469] Renamed 'native_path()' to 'convert_path()'. Also
 changed it so it doesn't barf if the path is already in native format   (ie.
 contains os.sep).

---
 command/install.py |  4 ++--
 command/sdist.py   | 10 +++++-----
 util.py            | 12 ++++--------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/command/install.py b/command/install.py
index 13fa88ee19..7176fab890 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,7 +10,7 @@
 from types import *
 from distutils.core import Command, DEBUG
 from distutils import sysconfig
-from distutils.util import write_file, native_path, subst_vars, change_root
+from distutils.util import write_file, convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
 from glob import glob
 
@@ -423,7 +423,7 @@ def handle_extra_path (self):
 
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
-            extra_dirs = native_path (extra_dirs)
+            extra_dirs = convert_path (extra_dirs)
 
         else:
             path_file = None
diff --git a/command/sdist.py b/command/sdist.py
index 6626b9e66a..c06860fb65 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,7 +11,7 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import newer, create_tree, remove_tree, native_path, \
+from distutils.util import newer, create_tree, remove_tree, convert_path, \
      write_file
 from distutils.archive_util import check_archive_formats
 from distutils.text_file import TextFile
@@ -322,7 +322,7 @@ def read_template (self):
                          action)
                     continue
 
-                pattern_list = map(native_path, words[1:])
+                pattern_list = map(convert_path, words[1:])
 
             elif action in ('recursive-include','recursive-exclude'):
                 if len (words) < 3:
@@ -332,8 +332,8 @@ def read_template (self):
                          action)
                     continue
 
-                dir = native_path(words[1])
-                pattern_list = map (native_path, words[2:])
+                dir = convert_path(words[1])
+                pattern_list = map (convert_path, words[2:])
 
             elif action in ('graft','prune'):
                 if len (words) != 2:
@@ -343,7 +343,7 @@ def read_template (self):
                          action)
                     continue
 
-                dir_pattern = native_path (words[1])
+                dir_pattern = convert_path (words[1])
 
             else:
                 template.warn ("invalid manifest template line: " +
diff --git a/util.py b/util.py
index 6063aa6847..575463843b 100644
--- a/util.py
+++ b/util.py
@@ -58,7 +58,7 @@ def get_platform ():
 # get_platform()
 
 
-def native_path (pathname):
+def convert_path (pathname):
     """Return 'pathname' as a name that will work on the native
        filesystem, i.e. split it on '/' and put it back together again
        using the current directory separator.  Needed because filenames in
@@ -73,16 +73,12 @@ def native_path (pathname):
     if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
     if os.sep != '/':
-       if os.sep in pathname:
-            raise ValueError, \
-              "path '%s' cannot contain '%c' character" % (pathname, os.sep)
-       else:
-            paths = string.split (pathname, '/')
-            return apply (os.path.join, paths)
+        paths = string.split (pathname, '/')
+        return apply (os.path.join, paths)
     else:
         return pathname
 
-# native_path ()
+# convert_path ()
 
 
 def change_root (new_root, pathname):

From c0ed34f0d17691d413a195bb719cc004e50fd3fd Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 31 May 2000 23:56:45 +0000
Subject: [PATCH 0400/8469] Regularize options a bit:   * help strings start
 with lowercase   * added affirmative version of '--no-clean' and
 '--no-rpm-opt-flags',     which are the default (thus the attributes that
 correspond to     the options are now 'clean' and 'use_rpm_opt_flags')

---
 command/bdist_rpm.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index d07f9249da..e7e4ca7ef6 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -19,27 +19,34 @@ class bdist_rpm (Command):
 
     user_options = [
         ('spec-only', None,
-         "Only regenerate spec file"),
+         "only regenerate spec file"),
         ('source-only', None,
-         "Only generate source RPM"),
+         "only generate source RPM"),
         ('binary-only', None,
-         "Only generate binary RPM"),
+         "only generate binary RPM"),
         ('use-bzip2', None,
-         "Use bzip2 instead of gzip to create source distribution"),
+         "use bzip2 instead of gzip to create source distribution"),
+        ('clean', None,
+         "clean up RPM build directory [default]"),
         ('no-clean', None,
-         "Do not clean RPM build directory"),
+         "don't clean up RPM build directory"),
+        ('use-rpm-opt-flags', None,
+         "compile with RPM_OPT_FLAGS when building from source RPM"),
         ('no-rpm-opt-flags', None,
-         "Do not pass any RPM CFLAGS to compiler")
-        ]
+         "do not pass any RPM CFLAGS to compiler"),
+       ]
 
+    negative_opt = {'no-clean': 'clean',
+                    'no-rpm-opt-flags': 'use-rpm-opt-flags'}
 
+                    
     def initialize_options (self):
         self.spec_only = None
         self.binary_only = None
         self.source_only = None
         self.use_bzip2 = None
-        self.no_clean = None
-        self.no_rpm_opt_flags = None
+        self.clean = 1
+        self.use_rpm_opt_flags = 1
 
     # initialize_options()
 
@@ -54,7 +61,7 @@ def finalize_options (self):
                   "Cannot supply both '--source-only' and '--binary-only'"
         # don't pass CFLAGS to pure python distributions
         if not self.distribution.has_ext_modules():
-            self.no_rpm_opt_flags = 1
+            self.use_rpm_opt_flags = 0
 
     # finalize_options()
 
@@ -120,7 +127,7 @@ def run (self):
         topdir = os.getcwd() + 'build/rpm'
         rpm_args.extend(['--define',
                          '_topdir ' + os.getcwd() + '/build/rpm',])
-        if not self.no_clean:
+        if self.clean:
             rpm_args.append('--clean')
         rpm_args.append(spec_path)
         self.spawn(rpm_args)
@@ -168,7 +175,7 @@ def _get_package_data(self):
         self.preun = self._check_string('preun')
         self.postun = self._check_string('postun')
         self.prep = self._check_string('prep', '%setup')
-        if not self.no_rpm_opt_flags:
+        if self.use_rpm_opt_flags:
             self.build = (self._check_string(
                 'build',
                 'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'))

From 0534a48d54c3fbf99ad65bff7b472b26eae70534 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 1 Jun 2000 00:40:25 +0000
Subject: [PATCH 0401/8469] More tweaking to make this command act like other
 Distutils commands:   * added "--bdist-base" option to parameterize where we
 build     the RPM (comes from "bdist" by default: "build/bdist.<plat>")   *
 simplified/cleaned up some code in 'run()' in the process of     removing
 (most) hard-coded directory names   * if "--spec-only", drop spec file in
 "dist" rather than "redhat"     (directory name still hard-coded, though)   *
 use 'reinitialize_command()' to fetch the "sdist" object to     tweak before
 running "sdist" command   * use 'self.copy_file()' method rather than
 'copy_file()' function   * cosmetic tweaks to comments, error messages

---
 command/bdist_rpm.py | 55 +++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index e7e4ca7ef6..c84fda873e 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -10,7 +10,7 @@
 import os, string
 from types import *
 from distutils.core import Command
-from distutils.util import mkpath, write_file, copy_file
+from distutils.util import get_platform, write_file
 from distutils.errors import *
 
 class bdist_rpm (Command):
@@ -18,6 +18,8 @@ class bdist_rpm (Command):
     description = "create an RPM distribution"
 
     user_options = [
+        ('bdist-base', None,
+         "base directory for creating built distributions"),
         ('spec-only', None,
          "only regenerate spec file"),
         ('source-only', None,
@@ -41,6 +43,7 @@ class bdist_rpm (Command):
 
                     
     def initialize_options (self):
+        self.bdist_base = None
         self.spec_only = None
         self.binary_only = None
         self.source_only = None
@@ -52,13 +55,14 @@ def initialize_options (self):
 
 
     def finalize_options (self):
+        self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
         if os.name != 'posix':
             raise DistutilsPlatformError, \
                   ("don't know how to create RPM "
                    "distributions on platform %s" % os.name)
         if self.binary_only and self.source_only:
             raise DistutilsOptionsError, \
-                  "Cannot supply both '--source-only' and '--binary-only'"
+                  "cannot supply both '--source-only' and '--binary-only'"
         # don't pass CFLAGS to pure python distributions
         if not self.distribution.has_ext_modules():
             self.use_rpm_opt_flags = 0
@@ -69,50 +73,49 @@ def finalize_options (self):
     def run (self):
         self._get_package_data() # get packaging info
 
-
         # make directories
         if self.spec_only:
-            self.mkpath('redhat')
+            spec_dir = "dist"
+            self.mkpath(spec_dir)       # XXX should be configurable
         else:
+            rpm_base = os.path.join(self.bdist_base, "rpm")
+            rpm_dir = {}
             for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'):
-                self.mkpath(os.path.join('build/rpm', d))
-
-        # spec file goes into .redhat directory if '--spec-only specified',
-        # into build/rpm/spec otherwise
-        if self.spec_only:
-            spec_path = 'redhat/%s.spec' % self.distribution.get_name()
-        else:
-            spec_path = ('build/rpm/SPECS/%s.spec' %
-                         self.distribution.get_name())
+                rpm_dir[d] = os.path.join(rpm_base, d)
+                self.mkpath(rpm_dir[d])
+            spec_dir = rpm_dir['SPECS']
+
+        # Spec file goes into 'dist' directory if '--spec-only specified',
+        # into build/rpm.<plat> otherwise.
+        spec_path = os.path.join(spec_dir,
+                                 "%s.spec" % self.distribution.get_name())
         self.execute(write_file,
                      (spec_path,
                       self._make_spec_file()),
-                     'Writing .spec file')
+                     "writing '%s'" % spec_path)
 
         if self.spec_only: # stop if requested
             return
 
-        # make a source distribution and copy to SOURCES directory with
-        # optional icon
-        sdist = self.get_finalized_command ('sdist')
+        # Make a source distribution and copy to SOURCES directory with
+        # optional icon.
+        sdist = self.reinitialize_command ('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']
         else:
             sdist.formats = ['gztar']
         self.run_command('sdist')
-        if self.use_bzip2:
-            source = self.distribution.get_fullname() + '.tar.bz2'
-        else:
-            source = self.distribution.get_fullname() + '.tar.gz'
-        self.execute(copy_file, (source, 'build/rpm/SOURCES'),
-                     'Copying source distribution to SOURCES')
+
+        source = sdist.get_archive_files()[0]
+        source_dir = rpm_dir['SOURCES']
+        self.copy_file(source, source_dir)
+
         if self.icon:
             if os.path.exists(self.icon):
-                self.execute(copy_file, (self.icon, 'build/rpm/SOURCES'),
-                     'Copying icon to SOURCES')
+                self.copy_file(self.icon, source_dir)
             else:
                 raise DistutilsFileError, \
-                      "Unable to find icon file '%s'" % self.icon
+                      "icon file '%s' does not exist" % self.icon
         
 
         # build package

From 7b2992eb1483e6c551d33f6e896569a420b1c88b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 1 Jun 2000 01:07:55 +0000
Subject: [PATCH 0402/8469] Ensure that 'make_archive()' returns the name of
 the new archive file.

---
 archive_util.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 218450a6ba..3159c284e4 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -127,7 +127,6 @@ def check_archive_formats (formats):
 def make_archive (base_name, format,
                   root_dir=None, base_dir=None,
                   verbose=0, dry_run=0):
-
     """Create an archive file (eg. zip or tar).  'base_name' is the name
     of the file to create, minus any format-specific extension; 'format'
     is the archive format: one of "zip", "tar", "ztar", or "gztar".
@@ -136,8 +135,8 @@ def make_archive (base_name, format,
     archive.  'base_dir' is the directory where we start archiving from;
     ie. 'base_dir' will be the common prefix of all files and
     directories in the archive.  'root_dir' and 'base_dir' both default
-    to the current directory."""
-
+    to the current directory.  Returns the name of the archive file.
+    """
     save_cwd = os.getcwd()
     if root_dir is not None:
         if verbose:
@@ -160,11 +159,13 @@ def make_archive (base_name, format,
     func = format_info[0]
     for (arg,val) in format_info[1]:
         kwargs[arg] = val
-    apply (func, (base_name, base_dir), kwargs)
+    filename = apply (func, (base_name, base_dir), kwargs)
 
     if root_dir is not None:
         if verbose:
             print "changing back to '%s'" % save_cwd
         os.chdir (save_cwd)
 
+    return filename
+
 # make_archive ()

From 71848a5af214fca715bf55b482e778cb4763c81b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 1 Jun 2000 01:08:52 +0000
Subject: [PATCH 0403/8469] Added 'reinitialize_command()' method -- delegated
 to Distribution instance. Ensure 'make_archive()' method returns archive
 filename.

---
 cmd.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd.py b/cmd.py
index f80338920e..852acadbea 100644
--- a/cmd.py
+++ b/cmd.py
@@ -215,6 +215,10 @@ def get_finalized_command (self, command, create=1):
         cmd_obj.ensure_finalized ()
         return cmd_obj
 
+    # XXX rename to 'get_reinitialized_command()'? (should do the
+    # same in dist.py, if so)
+    def reinitialize_command (self, command):
+        return self.distribution.reinitialize_command(command)
 
     def run_command (self, command):
         """Run some other command: uses the 'run_command()' method of
@@ -306,8 +310,8 @@ def spawn (self, cmd, search_path=1, level=1):
 
     def make_archive (self, base_name, format,
                       root_dir=None, base_dir=None):
-        util.make_archive (base_name, format, root_dir, base_dir,
-                           self.verbose, self.dry_run)
+        return util.make_archive (base_name, format, root_dir, base_dir,
+                                  self.verbose, self.dry_run)
 
 
     def make_file (self, infiles, outfile, func, args,

From 2d35a4ef38fc12bf2e61791fe1ba5bd2b99015ab Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 1 Jun 2000 01:09:47 +0000
Subject: [PATCH 0404/8469] Oops, 'reinitialize_command()' forgot to return the
 command object if didn't need to be reinitialized -- fixed.

---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 3391e53f5e..de4f7ef0a2 100644
--- a/dist.py
+++ b/dist.py
@@ -711,7 +711,7 @@ def reinitialize_command (self, command):
             command_name = command.get_command_name()
 
         if not command.finalized:
-            return
+            return command
         command.initialize_options()
         command.finalized = 0
         self._set_command_options(command)

From d9112d61365041f3bd448c3084b2e53a99b432bc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 1 Jun 2000 01:10:56 +0000
Subject: [PATCH 0405/8469] Remember the list of archive files created in
 'make_distribution()'. Added 'get_archive_files()' so outsiders can get their
 hands on that list.

---
 command/sdist.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index c06860fb65..03de85b1ae 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -64,6 +64,8 @@ def initialize_options (self):
         self.formats = None
         self.keep_tree = 0
 
+        self.archive_files = None
+
 
     def finalize_options (self):
         if self.manifest is None:
@@ -520,12 +522,22 @@ def make_distribution (self):
         self.exclude_pattern (base_dir + "*")
  
         self.make_release_tree (base_dir, self.files)
+        archive_files = []              # remember names of files we create
         for fmt in self.formats:
-            self.make_archive (base_dir, fmt, base_dir=base_dir)
+            file = self.make_archive (base_dir, fmt, base_dir=base_dir)
+            archive_files.append(file)
+
+        self.archive_files = archive_files
 
         if not self.keep_tree:
             remove_tree (base_dir, self.verbose, self.dry_run)
 
+    def get_archive_files (self):
+        """Return the list of archive files created when the command
+        was run, or None if the command hasn't run yet.
+        """
+        return self.archive_files
+
 # class sdist
 
 

From fcdde577abf375ececdcf97aed74e3d0d5e73463 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 00:44:53 +0000
Subject: [PATCH 0406/8469] Reformatted and updated many docstrings.

---
 cmd.py  | 168 ++++++++++++++++++++++++++++----------------------------
 core.py |  64 ++++++++++-----------
 dist.py |  47 ++++++++--------
 3 files changed, 140 insertions(+), 139 deletions(-)

diff --git a/cmd.py b/cmd.py
index 852acadbea..b0a4b95942 100644
--- a/cmd.py
+++ b/cmd.py
@@ -1,7 +1,8 @@
 """distutils.cmd
 
 Provides the Command class, the base class for the command classes
-in the distutils.command package."""
+in the distutils.command package.
+"""
 
 # created 2000/04/03, Greg Ward
 # (extricated from core.py; actually dates back to the beginning)
@@ -16,28 +17,28 @@
 
 class Command:
     """Abstract base class for defining command classes, the "worker bees"
-       of the Distutils.  A useful analogy for command classes is to
-       think of them as subroutines with local variables called
-       "options".  The options are "declared" in 'initialize_options()'
-       and "defined" (given their final values, aka "finalized") in
-       'finalize_options()', both of which must be defined by every
-       command class.  The distinction between the two is necessary
-       because option values might come from the outside world (command
-       line, option file, ...), and any options dependent on other
-       options must be computed *after* these outside influences have
-       been processed -- hence 'finalize_options()'.  The "body" of the
-       subroutine, where it does all its work based on the values of its
-       options, is the 'run()' method, which must also be implemented by
-       every command class."""
+    of the Distutils.  A useful analogy for command classes is to think of
+    them as subroutines with local variables called "options".  The options
+    are "declared" in 'initialize_options()' and "defined" (given their
+    final values, aka "finalized") in 'finalize_options()', both of which
+    must be defined by every command class.  The distinction between the
+    two is necessary because option values might come from the outside
+    world (command line, config file, ...), and any options dependent on
+    other options must be computed *after* these outside influences have
+    been processed -- hence 'finalize_options()'.  The "body" of the
+    subroutine, where it does all its work based on the values of its
+    options, is the 'run()' method, which must also be implemented by every
+    command class.
+    """
 
     # -- Creation/initialization methods -------------------------------
 
     def __init__ (self, dist):
         """Create and initialize a new Command object.  Most importantly,
-           invokes the 'initialize_options()' method, which is the
-           real initializer and depends on the actual command being
-           instantiated."""
-
+        invokes the 'initialize_options()' method, which is the real
+        initializer and depends on the actual command being
+        instantiated.
+        """
         # late import because of mutual dependence between these classes
         from distutils.dist import Distribution
 
@@ -97,9 +98,9 @@ def ensure_finalized (self):
 
     # Subclasses must define:
     #   initialize_options()
-    #     provide default values for all options; may be overridden
-    #     by Distutils client, by command-line options, or by options
-    #     from option file
+    #     provide default values for all options; may be customized by
+    #     setup script, by options from config file(s), or by command-line
+    #     options
     #   finalize_options()
     #     decide on the final values for all options; this is called
     #     after all possible intervention from the outside world
@@ -110,28 +111,28 @@ def ensure_finalized (self):
 
     def initialize_options (self):
         """Set default values for all the options that this command
-           supports.  Note that these defaults may be overridden
-           by the command-line supplied by the user; thus, this is
-           not the place to code dependencies between options; generally,
-           'initialize_options()' implementations are just a bunch
-           of "self.foo = None" assignments.
-           
-           This method must be implemented by all command classes."""
+        supports.  Note that these defaults may be overridden by other
+        commands, by the setup script, by config files, or by the
+        command-line.  Thus, this is not the place to code dependencies
+        between options; generally, 'initialize_options()' implementations
+        are just a bunch of "self.foo = None" assignments.
            
+        This method must be implemented by all command classes.
+        """
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
         
     def finalize_options (self):
-        """Set final values for all the options that this command
-           supports.  This is always called as late as possible, ie.
-           after any option assignments from the command-line or from
-           other commands have been done.  Thus, this is the place to to
-           code option dependencies: if 'foo' depends on 'bar', then it
-           is safe to set 'foo' from 'bar' as long as 'foo' still has
-           the same value it was assigned in 'initialize_options()'.
-
-           This method must be implemented by all command classes."""
-           
+        """Set final values for all the options that this command supports.
+        This is always called as late as possible, ie.  after any option
+        assignments from the command-line or from other commands have been
+        done.  Thus, this is the place to to code option dependencies: if
+        'foo' depends on 'bar', then it is safe to set 'foo' from 'bar' as
+        long as 'foo' still has the same value it was assigned in
+        'initialize_options()'.
+
+        This method must be implemented by all command classes.
+        """
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
 
@@ -151,23 +152,23 @@ def dump_options (self, header=None, indent=""):
 
 
     def run (self):
-        """A command's raison d'etre: carry out the action it exists
-           to perform, controlled by the options initialized in
-           'initialize_options()', customized by the user and other
-           commands, and finalized in 'finalize_options()'.  All
-           terminal output and filesystem interaction should be done by
-           'run()'.
+        """A command's raison d'etre: carry out the action it exists to
+        perform, controlled by the options initialized in
+        'initialize_options()', customized by other commands, the setup
+        script, the command-line, and config files, and finalized in
+        'finalize_options()'.  All terminal output and filesystem
+        interaction should be done by 'run()'.
 
-           This method must be implemented by all command classes."""
+        This method must be implemented by all command classes.
+        """
 
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
 
     def announce (self, msg, level=1):
-        """If the Distribution instance to which this command belongs
-           has a verbosity level of greater than or equal to 'level'
-           print 'msg' to stdout."""
-    
+        """If the current verbosity level is of greater than or equal to
+        'level' print 'msg' to stdout.
+        """
         if self.verbose >= level:
             print msg
 
@@ -183,18 +184,18 @@ def get_command_name (self):
 
     def set_undefined_options (self, src_cmd, *option_pairs):
         """Set the values of any "undefined" options from corresponding
-           option values in some other command object.  "Undefined" here
-           means "is None", which is the convention used to indicate
-           that an option has not been changed between
-           'set_initial_values()' and 'set_final_values()'.  Usually
-           called from 'set_final_values()' for options that depend on
-           some other command rather than another option of the same
-           command.  'src_cmd' is the other command from which option
-           values will be taken (a command object will be created for it
-           if necessary); the remaining arguments are
-           '(src_option,dst_option)' tuples which mean "take the value
-           of 'src_option' in the 'src_cmd' command object, and copy it
-           to 'dst_option' in the current command object"."""
+        option values in some other command object.  "Undefined" here means
+        "is None", which is the convention used to indicate that an option
+        has not been changed between 'initialize_options()' and
+        'finalize_options()'.  Usually called from 'finalize_options()' for
+        options that depend on some other command rather than another
+        option of the same command.  'src_cmd' is the other command from
+        which option values will be taken (a command object will be created
+        for it if necessary); the remaining arguments are
+        '(src_option,dst_option)' tuples which mean "take the value of
+        'src_option' in the 'src_cmd' command object, and copy it to
+        'dst_option' in the current command object".
+        """
 
         # Option_pairs: list of (src_option, dst_option) tuples
 
@@ -207,10 +208,11 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
 
     def get_finalized_command (self, command, create=1):
-        """Wrapper around Distribution's 'get_command_obj()' method:
-           find (create if necessary and 'create' is true) the command
-           object for 'command'.."""
-
+        """Wrapper around Distribution's 'get_command_obj()' method: find
+        (create if necessary and 'create' is true) the command object for
+        'command', call its 'ensure_finalized()' method, and return the
+        finalized command object.
+        """
         cmd_obj = self.distribution.get_command_obj (command, create)
         cmd_obj.ensure_finalized ()
         return cmd_obj
@@ -222,9 +224,9 @@ def reinitialize_command (self, command):
 
     def run_command (self, command):
         """Run some other command: uses the 'run_command()' method of
-           Distribution, which creates the command object if necessary
-           and then invokes its 'run()' method."""
-
+        Distribution, which creates and finalizes the command object if
+        necessary and then invokes its 'run()' method.
+        """
         self.distribution.run_command (command)
 
 
@@ -236,15 +238,16 @@ def warn (self, msg):
 
 
     def execute (self, func, args, msg=None, level=1):
-        """Perform some action that affects the outside world (eg.
-           by writing to the filesystem).  Such actions are special because
-           they should be disabled by the "dry run" flag, and should
-           announce themselves if the current verbosity level is high
-           enough.  This method takes care of all that bureaucracy for you;
-           all you have to do is supply the funtion to call and an argument
-           tuple for it (to embody the "external action" being performed),
-           a message to print if the verbosity level is high enough, and an
-           optional verbosity threshold."""
+        """Perform some action that affects the outside world (eg.  by
+        writing to the filesystem).  Such actions are special because they
+        should be disabled by the "dry run" flag, and should announce
+        themselves if the current verbosity level is high enough.  This
+        method takes care of all that bureaucracy for you; all you have to
+        do is supply the funtion to call and an argument tuple for it (to
+        embody the "external action" being performed), a message to print
+        if the verbosity level is high enough, and an optional verbosity
+        threshold.
+        """
 
         # Generate a message if we weren't passed one
         if msg is None:
@@ -285,8 +288,8 @@ def copy_tree (self, infile, outfile,
                    preserve_mode=1, preserve_times=1, preserve_symlinks=0,
                    level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
-           and force flags."""
-
+        and force flags.
+        """
         return util.copy_tree (infile, outfile, 
                                preserve_mode,preserve_times,preserve_symlinks,
                                not self.force,
@@ -302,6 +305,7 @@ def move_file (self, src, dst, level=1):
 
 
     def spawn (self, cmd, search_path=1, level=1):
+        """Spawn an external command respecting verbose and dry-run flags."""
         from distutils.spawn import spawn
         spawn (cmd, search_path,
                self.verbose >= level,
@@ -316,16 +320,14 @@ def make_archive (self, base_name, format,
 
     def make_file (self, infiles, outfile, func, args,
                    exec_msg=None, skip_msg=None, level=1):
-
         """Special case of 'execute()' for operations that process one or
         more input files and generate one output file.  Works just like
         'execute()', except the operation is skipped and a different
         message printed if 'outfile' already exists and is newer than all
         files listed in 'infiles'.  If the command defined 'self.force',
         and it is true, then the command is unconditionally run -- does no
-        timestamp checks."""
-
-
+        timestamp checks.
+        """
         if exec_msg is None:
             exec_msg = "generating %s from %s" % \
                        (outfile, string.join (infiles, ', '))
diff --git a/core.py b/core.py
index 8903603925..9e390ac13a 100644
--- a/core.py
+++ b/core.py
@@ -3,7 +3,8 @@
 The only module that needs to be imported to use the Distutils; provides
 the 'setup' function (which is to be called from the setup script).  Also
 indirectly provides the Distribution and Command classes, although they are
-really defined in distutils.dist and distutils.cmd."""
+really defined in distutils.dist and distutils.cmd.
+"""
 
 # created 1999/03/01, Greg Ward
 
@@ -37,36 +38,37 @@
 
 
 def setup (**attrs):
-    """The gateway to the Distutils: do everything your setup script
-       needs to do, in a highly flexible and user-driven way.  Briefly:
-       create a Distribution instance; parse the command-line, creating
-       and customizing instances of the command class for each command
-       found on the command-line; run each of those commands.
-
-       The Distribution instance might be an instance of a class
-       supplied via the 'distclass' keyword argument to 'setup'; if no
-       such class is supplied, then the 'Distribution' class (also in
-       this module) is instantiated.  All other arguments to 'setup'
-       (except for 'cmdclass') are used to set attributes of the
-       Distribution instance.
-
-       The 'cmdclass' argument, if supplied, is a dictionary mapping
-       command names to command classes.  Each command encountered on
-       the command line will be turned into a command class, which is in
-       turn instantiated; any class found in 'cmdclass' is used in place
-       of the default, which is (for command 'foo_bar') class 'foo_bar'
-       in module 'distutils.command.foo_bar'.  The command class must
-       provide a 'user_options' attribute which is a list of option
-       specifiers for 'distutils.fancy_getopt'.  Any command-line
-       options between the current and the next command are used to set
-       attributes of the current command object.
-
-       When the entire command-line has been successfully parsed, calls
-       the 'run()' method on each command object in turn.  This method
-       will be driven entirely by the Distribution object (which each
-       command object has a reference to, thanks to its constructor),
-       and the command-specific options that became attributes of each
-       command object."""
+    """The gateway to the Distutils: do everything your setup script needs
+    to do, in a highly flexible and user-driven way.  Briefly: create a
+    Distribution instance; find and parse config files; parse the command
+    line; run each of those commands using the options supplied to
+    'setup()' (as keyword arguments), in config files, and on the command
+    line.
+
+    The Distribution instance might be an instance of a class supplied via
+    the 'distclass' keyword argument to 'setup'; if no such class is
+    supplied, then the Distribution class (in dist.py) is instantiated.
+    All other arguments to 'setup' (except for 'cmdclass') are used to set
+    attributes of the Distribution instance.
+
+    The 'cmdclass' argument, if supplied, is a dictionary mapping command
+    names to command classes.  Each command encountered on the command line
+    will be turned into a command class, which is in turn instantiated; any
+    class found in 'cmdclass' is used in place of the default, which is
+    (for command 'foo_bar') class 'foo_bar' in module
+    'distutils.command.foo_bar'.  The command class must provide a
+    'user_options' attribute which is a list of option specifiers for
+    'distutils.fancy_getopt'.  Any command-line options between the current
+    and the next command are used to set attributes of the current command
+    object.
+
+    When the entire command-line has been successfully parsed, calls the
+    'run()' method on each command object in turn.  This method will be
+    driven entirely by the Distribution object (which each command object
+    has a reference to, thanks to its constructor), and the
+    command-specific options that became attributes of each command
+    object.
+    """
 
     from pprint import pprint               # for debugging output
 
diff --git a/dist.py b/dist.py
index de4f7ef0a2..6acc0544a8 100644
--- a/dist.py
+++ b/dist.py
@@ -1,7 +1,8 @@
 """distutils.dist
 
 Provides the Distribution class, which represents the module distribution
-being built/installed/distributed."""
+being built/installed/distributed.
+"""
 
 # created 2000/04/03, Greg Ward
 # (extricated from core.py; actually dates back to the beginning)
@@ -25,20 +26,18 @@
 
 
 class Distribution:
-    """The core of the Distutils.  Most of the work hiding behind
-       'setup' is really done within a Distribution instance, which
-       farms the work out to the Distutils commands specified on the
-       command line.
-
-       Clients will almost never instantiate Distribution directly,
-       unless the 'setup' function is totally inadequate to their needs.
-       However, it is conceivable that a client might wish to subclass
-       Distribution for some specialized purpose, and then pass the
-       subclass to 'setup' as the 'distclass' keyword argument.  If so,
-       it is necessary to respect the expectations that 'setup' has of
-       Distribution: it must have a constructor and methods
-       'parse_command_line()' and 'run_commands()' with signatures like
-       those described below."""
+    """The core of the Distutils.  Most of the work hiding behind 'setup'
+    is really done within a Distribution instance, which farms the work out
+    to the Distutils commands specified on the command line.
+
+    Setup scripts will almost never instantiate Distribution directly,
+    unless the 'setup()' function is totally inadequate to their needs.
+    However, it is conceivable that a setup script might wish to subclass
+    Distribution for some specialized purpose, and then pass the subclass
+    to 'setup()' as the 'distclass' keyword argument.  If so, it is
+    necessary to respect the expectations that 'setup' has of Distribution.
+    See the code for 'setup()', in core.py, for details.
+    """
 
 
     # 'global_options' describes the command-line options that may be
@@ -98,14 +97,14 @@ class Distribution:
     
     def __init__ (self, attrs=None):
         """Construct a new Distribution instance: initialize all the
-           attributes of a Distribution, and then uses 'attrs' (a
-           dictionary mapping attribute names to values) to assign
-           some of those attributes their "real" values.  (Any attributes
-           not mentioned in 'attrs' will be assigned to some null
-           value: 0, None, an empty list or dictionary, etc.)  Most
-           importantly, initialize the 'command_obj' attribute
-           to the empty dictionary; this will be filled in with real
-           command objects by 'parse_command_line()'."""
+        attributes of a Distribution, and then use 'attrs' (a dictionary
+        mapping attribute names to values) to assign some of those
+        attributes their "real" values.  (Any attributes not mentioned in
+        'attrs' will be assigned to some null value: 0, None, an empty list
+        or dictionary, etc.)  Most importantly, initialize the
+        'command_obj' attribute to the empty dictionary; this will be
+        filled in with real command objects by 'parse_command_line()'.
+        """
 
         # Default values for our command-line options
         self.verbose = 1
@@ -387,7 +386,6 @@ def parse_command_line (self, args):
     # parse_command_line()
 
     def _parse_command_opts (self, parser, args):
-
         """Parse the command-line options for a single command.
         'parser' must be a FancyGetopt instance; 'args' must be the list
         of arguments, starting with the current command (whose options
@@ -666,7 +664,6 @@ def get_command_obj (self, command, create=1):
         return cmd_obj
 
     def _set_command_options (self, command_obj, option_dict=None):
-
         """Set the options for 'command_obj' from 'option_dict'.  Basically
         this means copying elements of a dictionary ('option_dict') to
         attributes of an instance ('command').

From c857db21dbfe9234d637d3b65ffe37f49464d7d5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 01:49:58 +0000
Subject: [PATCH 0407/8469] Fairly massive overhaul to support getting RPM
 inputs (extra meta-data, prep/build/etc. scripts, doc files, dependency info)
 from a config file rather than the dedicated "package_info" file.  (The idea
 is that developers will provide RPM-specific info in the "[bdist_rpm]"
 section of setup.cfg, but of course it could also be supplied in the other
 config files, on the command line, or in the setup script -- or any mix of
 the above.)

Major changes:
  * added a boatload of options to 'user_options' and
    'initialize_options()': 'distribution_name', 'group', 'release', ...
  * added 'finalize_package_data()', which takes the place of
    '_get_package_data()' -- except it's called from 'finalize_options()',
    not 'run()', so we have everything figured out before we actually run
    the command
  * added 'ensure_string()', 'ensure_string_list()', 'ensure_filename()';
    these take the place of '_check_string()' and friends.  (These actually
    look like really useful type-checking methods that could come in handy
    all over the Distutils; should consider moving them up to Command and
    using them in other command classes' 'finalize_options()' method for
    error-checking).
  * various cleanup, commentary, and adaptation to the new way of
    storing RPM info in '_make_spec_file()'
---
 command/bdist_rpm.py | 262 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 230 insertions(+), 32 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index c84fda873e..b09b657fb6 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os, string, re
 from types import *
 from distutils.core import Command
 from distutils.util import get_platform, write_file
@@ -28,6 +28,63 @@ class bdist_rpm (Command):
          "only generate binary RPM"),
         ('use-bzip2', None,
          "use bzip2 instead of gzip to create source distribution"),
+
+        # More meta-data: too RPM-specific to put in the setup script,
+        # but needs to go in the .spec file -- so we make these options
+        # to "bdist_rpm".  The idea is that packagers would put this
+        # info in setup.cfg, although they are of course free to
+        # supply it on the command line.
+        ('distribution-name', None,
+         "name of the (Linux) distribution name to which this "
+         "RPM applies (*not* the name of the module distribution!)"),
+        ('group', None,
+         "package classification [default: \"Development/Libraries\"]"),
+        ('release', None,
+         "RPM release number"),
+        ('serial', None,
+         "???"),
+        ('vendor', None,
+         "RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
+         "[default: maintainer or author from setup script]"),
+        ('packager', None,
+         "RPM packager (eg. \"Jane Doe <jane@example.net>\")"
+         "[default: vendor]"),
+        ('doc-files', None,
+         "list of documentation files (space or comma-separated)"),
+        ('changelog', None,
+         "RPM changelog"),
+        ('icon', None,
+         "name of icon file"),
+
+        ('prep-cmd', None,
+         "?? pre-build command(s) ??"),
+        ('build-cmd', None,
+         "?? build command(s) ??"),
+        ('install-cmd', None,
+         "?? installation command(s) ??"),
+        ('clean-cmd', None,
+         "?? clean command(s) ??"),
+        ('pre-install', None,
+         "pre-install script (Bourne shell code)"),
+        ('post-install', None,
+         "post-install script (Bourne shell code)"),
+        ('pre-uninstall', None,
+         "pre-uninstall script (Bourne shell code)"),
+        ('post-uninstall', None,
+         "post-uninstall script (Bourne shell code)"),
+
+        ('provides', None,
+         "???"),
+        ('requires', None,
+         "???"),
+        ('conflicts', None,
+         "???"),
+        ('build-requires', None,
+         "???"),
+        ('obsoletes', None,
+         "???"),
+
+        # Actions to take when building RPM
         ('clean', None,
          "clean up RPM build directory [default]"),
         ('no-clean', None,
@@ -48,6 +105,32 @@ def initialize_options (self):
         self.binary_only = None
         self.source_only = None
         self.use_bzip2 = None
+
+        self.distribution_name = None
+        self.group = None
+        self.release = None
+        self.serial = None
+        self.vendor = None
+        self.packager = None
+        self.doc_files = None
+        self.changelog = None
+        self.icon = None
+
+        self.prep_cmd = None
+        self.build_cmd = None
+        self.install_cmd = None
+        self.clean_cmd = None
+        self.pre_install = None
+        self.post_install = None
+        self.pre_uninstall = None
+        self.post_uninstall = None
+        self.prep = None
+        self.provides = None
+        self.requires = None
+        self.conflicts = None
+        self.build_requires = None
+        self.obsoletes = None
+
         self.clean = 1
         self.use_rpm_opt_flags = 1
 
@@ -63,15 +146,112 @@ def finalize_options (self):
         if self.binary_only and self.source_only:
             raise DistutilsOptionsError, \
                   "cannot supply both '--source-only' and '--binary-only'"
+
         # don't pass CFLAGS to pure python distributions
         if not self.distribution.has_ext_modules():
             self.use_rpm_opt_flags = 0
 
+        self.finalize_package_data()
+
     # finalize_options()
 
+    def finalize_package_data (self):
+        self.ensure_string('group', "Development/Libraries")
+        self.ensure_string('vendor',
+                           "%s <%s>" % (self.distribution.get_contact(),
+                                        self.distribution.get_contact_email()))
+        self.ensure_string('packager', self.vendor) # or nothing?
+        self.ensure_string_list('doc_files')
+        if type(self.doc_files) is ListType:
+            for readme in ('README', 'README.txt'):
+                if os.path.exists(readme) and readme not in self.doc_files:
+                    self.doc.append(readme)
+
+        self.ensure_string('release', "1")   # should it be an int?
+        self.ensure_string('serial')   # should it be an int?
+
+        self.ensure_string('icon')
+        self.ensure_string('distribution_name')
+
+        self.ensure_string('prep_cmd', "%setup") # string or filename?
+
+        if self.use_rpm_opt_flags:
+            def_build = 'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'
+        else:
+            def_build = 'python setup.py build'
+        self.ensure_string('build_cmd', def_build)
+        self.ensure_string('install_cmd',
+                           "python setup.py install --root=$RPM_BUILD_ROOT "
+                           "--record=INSTALLED_FILES")
+        self.ensure_string('clean_cmd',
+                           "rm -rf $RPM_BUILD_ROOT")
+        self.ensure_filename('pre_install')
+        self.ensure_filename('post_install')
+        self.ensure_filename('pre_uninstall')
+        self.ensure_filename('post_uninstall')
+
+        # XXX don't forget we punted on summaries and descriptions -- they
+        # should be handled here eventually!
+
+        # Now *this* is some meta-data that belongs in the setup script...
+        self.ensure_string_list('provides')
+        self.ensure_string_list('requires')
+        self.ensure_string_list('conflicts')
+        self.ensure_string_list('build_requires')
+        self.ensure_string_list('obsoletes')
+
+    # finalize_package_data ()
+
+
+    # XXX these look awfully handy: should probably move them
+    # up to Command and use more widely.
+    def _ensure_stringlike (self, option, what, default=None):
+        val = getattr(self, option)
+        if val is None:
+            setattr(self, option, default)
+            return default
+        elif type(val) is not StringType:
+            raise DistutilsOptionError, \
+                  "'%s' must be a %s (got `%s`)" % (option, what, val)
+        return val
+
+    def ensure_string (self, option, default=None):
+        self._ensure_stringlike(option, "string", default)
+
+    def ensure_string_list (self, option):
+        val = getattr(self, option)
+        if val is None:
+            return
+        elif type(val) is StringType:
+            setattr(self, option, re.split(r',\s*|\s+', val))
+        else:
+            if type(val) is ListType:
+                types = map(type, val)
+                ok = (types == [StringType] * len(val))
+            else:
+                ok = 0
+
+            if not ok:
+                raise DistutilsOptionError, \
+                      "'%s' must be a list of strings (got %s)" % \
+                      (option, `val`)
+        
+    def ensure_filename (self, option, default=None):
+        val = self._ensure_stringlike(option, "filename", None)
+        if val is not None and not os.path.exists(val):
+            raise DistutilsOptionError, \
+                  "error in '%s' option: file '%s' does not exist" % \
+                  (option, val)
+
+
 
     def run (self):
-        self._get_package_data() # get packaging info
+
+        print "before _get_package_data():"
+        print "vendor =", self.vendor
+        print "packager =", self.packager
+        print "doc_files =", self.doc_files
+        print "changelog =", self.changelog
 
         # make directories
         if self.spec_only:
@@ -206,9 +386,10 @@ def _get_package_data(self):
         self.obsoletes = join(self._check_string_list('obsoletes'))
 
     def _make_spec_file(self):
-        ''' Generate an RPM spec file '''
-
-        # definitons and headers
+        """Generate the text of an RPM spec file and return it as a
+        list of strings (one per line).
+        """
+        # definitions and headers
         spec_file = [
             '%define name ' + self.distribution.get_name(),
             '%define version ' + self.distribution.get_version(),
@@ -218,18 +399,25 @@ def _make_spec_file(self):
             ]
 
         # put locale summaries into spec file
-        for locale in self.summaries.keys():
-            spec_file.append('Summary(%s): %s' % (locale,
-                                                  self.summaries[locale]))
+        # XXX not supported for now (hard to put a dictionary
+        # in a config file -- arg!)
+        #for locale in self.summaries.keys():
+        #    spec_file.append('Summary(%s): %s' % (locale,
+        #                                          self.summaries[locale]))
 
         spec_file.extend([
             'Name: %{name}',
             'Version: %{version}',
             'Release: %{release}',])
+
+        # XXX yuck! this filename is available from the "sdist" command,
+        # but only after it has run: and we create the spec file before
+        # running "sdist", in case of --spec-only.
         if self.use_bzip2:
             spec_file.append('Source0: %{name}-%{version}.tar.bz2')
         else:
             spec_file.append('Source0: %{name}-%{version}.tar.gz')
+
         spec_file.extend([
             'Copyright: ' + self.distribution.get_licence(),
             'Group: ' + self.group,
@@ -247,9 +435,12 @@ def _make_spec_file(self):
                       'Conflicts',
                       'Obsoletes',
                       ):
-            if getattr(self, string.lower(field)):
-                spec_file.append('%s: %s' %
-                                 (field, getattr(self, string.lower(field))))
+            val = getattr(self, string.lower(field))
+            if type(val) is ListType:
+                spec_file.append('%s: %s' % (field, string.join(val)))
+            elif val is not None:
+                spec_file.append('%s: %s' % (field, val))
+                
                       
         if self.distribution.get_url() != 'UNKNOWN':
             spec_file.append('Url: ' + self.distribution.get_url())
@@ -258,7 +449,8 @@ def _make_spec_file(self):
              spec_file.append('Distribution: ' + self.distribution_name)
 
         if self.build_requires:
-             spec_file.append('BuildRequires: ' + self.build_requires)
+             spec_file.append('BuildRequires: ' +
+                              string.join(self.build_requires))
 
         if self.icon:
             spec_file.append('Icon: ' + os.path.basename(self.icon))
@@ -270,28 +462,34 @@ def _make_spec_file(self):
             ])
 
         # put locale descriptions into spec file
-        for locale in self.descriptions.keys():
-            spec_file.extend([
-                '',
-                '%description -l ' + locale,
-                self.descriptions[locale],
-                ])
+        # XXX again, suppressed because config file syntax doesn't
+        # easily support this ;-(
+        #for locale in self.descriptions.keys():
+        #    spec_file.extend([
+        #        '',
+        #        '%description -l ' + locale,
+        #        self.descriptions[locale],
+        #        ])
 
         # rpm scripts
-        for script in ('prep',
-                       'build',
-                       'install',
-                       'clean',
-                       'pre',
-                       'post',
-                       'preun',
-                       'postun',
-                       ):
-            if getattr(self, script):
+        for (rpm_opt, attr) in (('prep', 'prep_cmd'),
+                                ('build', 'build_cmd'),
+                                ('install', 'install_cmd'),
+                                ('clean', 'clean_cmd'),
+                                ('pre', 'pre_install'),
+                                ('post', 'post_install'),
+                                ('preun', 'pre_uninstall'),
+                                ('postun', 'post_uninstall')):
+            # XXX oops, this doesn't distinguish between "raw code"
+            # options and "script filename" options -- well, we probably
+            # should settle on one or the other, and not make the
+            # distinction!
+            val = getattr(self, attr)
+            if val:
                 spec_file.extend([
                     '',
-                    '%' + script,
-                    getattr(self, script),
+                    '%' + rpm_opt,
+                    val
                     ])
 
         
@@ -302,8 +500,8 @@ def _make_spec_file(self):
             '%defattr(-,root,root)',
             ])
 
-        if self.doc:
-            spec_file.append('%doc ' + self.doc)
+        if self.doc_files:
+            spec_file.append('%doc ' + string.join(self.doc_files))
 
         if self.changelog:
             spec_file.extend([

From 4e66ce5352c3529cb79bf189c35da0b990b0993b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 01:52:04 +0000
Subject: [PATCH 0408/8469] Ditched the obsolete '_get_package_data()' method
 and its '_check_*()' helpers.

---
 command/bdist_rpm.py | 145 +------------------------------------------
 1 file changed, 3 insertions(+), 142 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index b09b657fb6..d37d609094 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -318,73 +318,6 @@ def run (self):
     # run()
 
 
-    def _get_package_data(self):
-        ''' Get data needed to generate spec file, first from the
-        DistributionMetadata class, then from the package_data file, which is
-        Python code read with execfile() '''
-
-        from string import join
-
-        package_type = 'rpm'
-        
-        # read in package data, if any
-        if os.path.exists('package_data'):
-            try:
-                exec(open('package_data'))
-            except:
-                raise DistutilsOptionError, 'Unable to parse package data file'
-
-        # set instance variables, supplying default value if not provided in
-        # package data file
-        self.package_data = locals()
-
-        # the following variables must be {string (len() = 2): string}
-        self.summaries = self._check_string_dict('summaries')
-        self.descriptions = self._check_string_dict('descriptions')
-
-        # The following variable must be an ordinary number or a string
-        self.release = self._check_number_or_string('release', '1')
-        self.serial = self._check_number_or_string('serial')
-
-        # The following variables must be strings
-        self.group = self._check_string('group', 'Development/Libraries')
-        self.vendor = self._check_string('vendor')
-        self.packager = self._check_string('packager')
-        self.changelog = self._check_string('changelog')
-        self.icon = self._check_string('icon')
-        self.distribution_name = self._check_string('distribution_name')
-        self.pre = self._check_string('pre')
-        self.post = self._check_string('post')
-        self.preun = self._check_string('preun')
-        self.postun = self._check_string('postun')
-        self.prep = self._check_string('prep', '%setup')
-        if self.use_rpm_opt_flags:
-            self.build = (self._check_string(
-                'build',
-                'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'))
-        else:
-            self.build = (self._check_string('build', 'python setup.py build'))
-        self.install = self._check_string(
-            'install',
-            'python setup.py install --root=$RPM_BUILD_ROOT --record')
-        self.clean = self._check_string(
-            'clean',
-            'rm -rf $RPM_BUILD_ROOT')
-
-        # The following variables must be a list or tuple of strings, or a
-        # string
-        self.doc = self._check_string_list('doc')
-        if type(self.doc) == ListType:
-            for readme in ('README', 'README.txt'):
-                if os.path.exists(readme) and readme not in self.doc:
-                    self.doc.append(readme)
-            self.doc = join(self.doc)
-        self.provides = join(self._check_string_list('provides'))
-        self.requires = join(self._check_string_list('requires'))
-        self.conflicts = join(self._check_string_list('conflicts'))
-        self.build_requires = join(self._check_string_list('build_requires'))
-        self.obsoletes = join(self._check_string_list('obsoletes'))
-
     def _make_spec_file(self):
         """Generate the text of an RPM spec file and return it as a
         list of strings (one per line).
@@ -512,78 +445,6 @@ def _make_spec_file(self):
 
         return spec_file
 
-    def _check_string_dict(self, var_name, default_value = {}):
-        ''' Tests a wariable to determine if it is {string: string},
-        var_name is the name of the wariable. Return the value if it is valid,
-        returns default_value if the variable does not exist, raises
-        DistutilsOptionError if the variable is not valid'''
-        if self.package_data.has_key(var_name):
-            pass_test = 1 # set to 0 if fails test
-            value = self.package_data[var_name]
-            if type(value) == DictType:
-                for locale in value.keys():
-                    if (type(locale) != StringType) or (type(value[locale]) !=
-                                                         StringType):
-                        pass_test = 0
-                        break
-                if pass_test:
-                    return test_me
-            raise DistutilsOptionError, \
-                  ("Error in package_data: '%s' must be dictionary: "
-                   '{string: string}' % var_name)
-        else:
-            return default_value
-
-    def _check_string(self, var_name, default_value = None):
-        ''' Tests a variable in package_data to determine if it is a string,
-        var_name is the name of the wariable. Return the value if it is a
-        string, returns default_value if the variable does not exist, raises
-        DistutilsOptionError if the variable is not a string'''
-        if self.package_data.has_key(var_name):
-            if type(self.package_data[var_name]) == StringType:
-                return self.package_data[var_name]
-            else:
-                raise DistutilsOptionError, \
-                      "Error in package_data: '%s' must be a string" % var_name
-        else:
-            return default_value
-
-    def _check_number_or_string(self, var_name, default_value = None):
-        ''' Tests a variable in package_data to determine if it is a number or
-        a string, var_name is the name of the wariable. Return the value if it
-        is valid, returns default_value if the variable does not exist, raises
-        DistutilsOptionError if the variable is not valid'''
-        if self.package_data.has_key(var_name):
-            if type(self.package_data[var_name]) in (StringType, LongType,
-                                                     IntType, FloatType):
-                return str(self.package_data[var_name])
-            else:
-                raise DistutilsOptionError, \
-                      ("Error in package_data: '%s' must be a string or a "
-                       'number' % var_name)
-        else:
-            return default_value
-
-    def _check_string_list(self, var_name, default_value = []):
-        ''' Tests a variable in package_data to determine if it is a string or
-        a list or tuple of strings, var_name is the name of the wariable.
-        Return the value as a string or a list if it is valid, returns
-        default_value if the variable does not exist, raises
-        DistutilsOptionError if the variable is not valid'''
-        if self.package_data.has_key(var_name):
-            value = self.package_data[var_name]
-            pass_test = 1
-            if type(value) == StringType:
-                return value
-            elif type(value) in (ListType, TupleType):
-                for item in value:
-                    if type(item) != StringType:
-                        pass_test = 0
-                        break
-                if pass_test:
-                    return list(value)
-            raise DistutilsOptionError, \
-                  ("Error in package_data: '%s' must be a string or a "
-                   'list or tuple of strings' % var_name)
-        else:
-            return default_value
+    # _make_spec_file ()
+
+# class bdist_rpm

From 1870024f295ec8b39849c562a75f6a11deb725b7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 01:55:36 +0000
Subject: [PATCH 0409/8469] Use Distribution method 'dump_option_dicts()' for
 debugging output, and only do so if DEBUG is true.

---
 core.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core.py b/core.py
index 9e390ac13a..2bad10e438 100644
--- a/core.py
+++ b/core.py
@@ -70,8 +70,6 @@ class found in 'cmdclass' is used in place of the default, which is
     object.
     """
 
-    from pprint import pprint               # for debugging output
-
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
     klass = attrs.get ('distclass')
@@ -88,8 +86,9 @@ class found in 'cmdclass' is used in place of the default, which is
     # the setup script, but be overridden by the command line.
     dist.parse_config_files()
     
-    print "options (after parsing config files):"
-    pprint (dist.command_options)
+    if DEBUG:
+        print "options (after parsing config files):"
+        dist.dump_option_dicts()
 
     # Parse the command line; any command-line errors are the end user's
     # fault, so turn them into SystemExit to suppress tracebacks.
@@ -99,8 +98,9 @@ class found in 'cmdclass' is used in place of the default, which is
         sys.stderr.write (usage + "\n")
         raise SystemExit, "error: %s" % msg
 
-    print "options (after parsing command line):"
-    pprint (dist.command_options)
+    if DEBUG:
+        print "options (after parsing command line):"
+        dist.dump_option_dicts()
 
     # And finally, run all the commands found on the command line.
     if ok:

From 1d343163373ad5f9fa7fe5e11e44d4f7af9eabae Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 01:59:33 +0000
Subject: [PATCH 0410/8469] Only print debugging output if DEBUG true (and
 deleted some of the more extraneous debug prints).

---
 dist.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dist.py b/dist.py
index 6acc0544a8..64f63add57 100644
--- a/dist.py
+++ b/dist.py
@@ -294,15 +294,16 @@ def find_config_files (self):
     def parse_config_files (self, filenames=None):
 
         from ConfigParser import ConfigParser
+        from distutils.core import DEBUG
 
         if filenames is None:
             filenames = self.find_config_files()
 
-        print "Distribution.parse_config_files():"
+        if DEBUG: print "Distribution.parse_config_files():"
 
         parser = ConfigParser()
         for filename in filenames:
-            print "  reading", filename
+            if DEBUG: print "  reading", filename
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
@@ -370,7 +371,6 @@ def parse_command_line (self, args):
         # latter, we omit the display-only options and show help for
         # each command listed on the command line.
         if self.help:
-            print "showing 'global' help; commands=", self.commands
             self._show_help(parser,
                             display_options=len(self.commands) == 0,
                             commands=self.commands)
@@ -440,7 +440,6 @@ def _parse_command_opts (self, parser, args):
         parser.set_negative_aliases (negative_opt)
         (args, opts) = parser.getopt (args[1:])
         if hasattr(opts, 'help') and opts.help:
-            print "showing help for command", cmd_class
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
 
@@ -643,10 +642,12 @@ def get_command_obj (self, command, create=1):
         object for 'command' is in the cache, then we either create and
         return it (if 'create' is true) or return None.
         """
+        from distutils.core import DEBUG
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
-            print "Distribution.get_command_obj(): " \
-                  "creating '%s' command object" % command
+            if DEBUG:
+                print "Distribution.get_command_obj(): " \
+                      "creating '%s' command object" % command
 
             klass = self.get_command_class(command)
             cmd_obj = self.command_obj[command] = klass(self)

From a3be3dbd094620fea37917c49fd6d93cabd4a16c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 02:01:51 +0000
Subject: [PATCH 0411/8469] Only print debugging output if DEBUG true.

---
 command/bdist_rpm.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index d37d609094..aecf5c9dec 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -9,7 +9,7 @@
 
 import os, string, re
 from types import *
-from distutils.core import Command
+from distutils.core import Command, DEBUG
 from distutils.util import get_platform, write_file
 from distutils.errors import *
 
@@ -247,11 +247,12 @@ def ensure_filename (self, option, default=None):
 
     def run (self):
 
-        print "before _get_package_data():"
-        print "vendor =", self.vendor
-        print "packager =", self.packager
-        print "doc_files =", self.doc_files
-        print "changelog =", self.changelog
+        if DEBUG:
+            print "before _get_package_data():"
+            print "vendor =", self.vendor
+            print "packager =", self.packager
+            print "doc_files =", self.doc_files
+            print "changelog =", self.changelog
 
         # make directories
         if self.spec_only:

From 9057f17f11ad3f506bab940ada1bd488f9add36a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 2 Jun 2000 02:23:42 +0000
Subject: [PATCH 0412/8469] Bumped version number to 0.9pre (there will be a
 couple of code snapshots before the real release, but I want to make it clear
 that a major new release is on the way).

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 32fc276c40..2ba82bd58d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.8.2"
+__version__ = "0.9pre"

From 821ff992cc9ca03f511e1e7d69a71c37f1e80938 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 3 Jun 2000 00:44:30 +0000
Subject: [PATCH 0413/8469] Added a bunch of new globals in '_init_mac()' --
 these will be needed to   support the forthcoming Cygwin/Mingw32
 GCC-on-Windows patch. Standardized CVS id line.

---
 sysconfig.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index a5f3816a16..53da48264e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -6,7 +6,7 @@
 Initial date: 17-Dec-1998
 """
 
-__version__ = "$Revision$"
+__revision__ = "$Id$"
 
 import os
 import re
@@ -255,6 +255,20 @@ def _init_nt():
     g['SO'] = '.pyd'
     g['exec_prefix'] = EXEC_PREFIX
 
+    # These are needed for the CygwinCCompiler and Mingw32CCompiler
+    # classes, which are just UnixCCompiler classes that happen to work on
+    # Windows.  UnixCCompiler expects to find these values in sysconfig, so
+    # here they are.  The fact that other Windows compilers don't need
+    # these values is pure luck (hmmm).
+    g['CC'] = "cc"                      # not gcc?
+    g['RANLIB'] = "ranlib"
+    g['AR'] = "ar"
+    g['OPT'] = "-O2"
+    g['SO'] = ".pyd"
+    g['LDSHARED'] = "ld"
+    g['CCSHARED'] = ""
+    g['EXE'] = ".exe"
+
 
 def _init_mac():
     """Initialize the module as appropriate for Macintosh systems"""

From c5268b3d895061e69e712f4e375e8997a03de8e3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 3 Jun 2000 01:02:06 +0000
Subject: [PATCH 0414/8469] Catch DistutilSetupError from the Distribution
 constructor.

---
 core.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 2bad10e438..8bcf2a87d6 100644
--- a/core.py
+++ b/core.py
@@ -80,7 +80,10 @@ class found in 'cmdclass' is used in place of the default, which is
 
     # Create the Distribution instance, using the remaining arguments
     # (ie. everything except distclass) to initialize it
-    dist = klass (attrs)
+    try:
+        dist = klass (attrs)
+    except DistutilsSetupError, msg:
+        raise SystemExit, "error in setup script: %s" % msg
 
     # Find and parse the config file(s): they will override options from
     # the setup script, but be overridden by the command line.

From 85ef7f4621c78621e4a2858b21c950cede345f8f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 3 Jun 2000 01:03:55 +0000
Subject: [PATCH 0415/8469] Patch from Harry Henry Gebel: fixes a bit of code
 that slipped by my overhaul last night.

---
 command/bdist_rpm.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index aecf5c9dec..9bce04c1ad 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -308,9 +308,8 @@ def run (self):
             rpm_args.append('-bb')
         else:
             rpm_args.append('-ba')
-        topdir = os.getcwd() + 'build/rpm'
         rpm_args.extend(['--define',
-                         '_topdir ' + os.getcwd() + '/build/rpm',])
+                         '_topdir %s/%s' % (os.getcwd(), rpm_base),])
         if self.clean:
             rpm_args.append('--clean')
         rpm_args.append(spec_path)

From 4e412ef49e4dc89329ceb1a213f4b695f611e080 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 13:42:52 +0000
Subject: [PATCH 0416/8469] Renamed 'modules' option to 'py_modules', for
 consistency with Distribution (and in order to generate a more sensible error
 message cleanly).

---
 command/build_py.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 92a37f20c4..0405d392d3 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -26,7 +26,7 @@ class build_py (Command):
 
     def initialize_options (self):
         self.build_lib = None
-        self.modules = None
+        self.py_modules = None
         self.package = None
         self.package_dir = None
         self.force = None
@@ -39,7 +39,7 @@ def finalize_options (self):
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.
         self.packages = self.distribution.packages
-        self.modules = self.distribution.py_modules
+        self.py_modules = self.distribution.py_modules
         self.package_dir = self.distribution.package_dir
 
 
@@ -62,7 +62,7 @@ def run (self):
         # installing).
 
         # Two options control which modules will be installed: 'packages'
-        # and 'modules'.  The former lets us work with whole packages, not
+        # and 'py_modules'.  The former lets us work with whole packages, not
         # specifying individual modules at all; the latter is for
         # specifying modules one-at-a-time.  Currently they are mutually
         # exclusive: you can define one or the other (or neither), but not
@@ -70,17 +70,17 @@ def run (self):
 
         # Dispose of the two "unusual" cases first: no pure Python modules
         # at all (no problem, just return silently), and over-specified
-        # 'packages' and 'modules' options.
+        # 'packages' and 'py_modules' options.
 
-        if not self.modules and not self.packages:
+        if not self.py_modules and not self.packages:
             return
-        if self.modules and self.packages:
+        if self.py_modules and self.packages:
             raise DistutilsOptionError, \
-                  "build_py: supplying both 'packages' and 'modules' " + \
+                  "build_py: supplying both 'packages' and 'py_modules' " + \
                   "options is not allowed"
 
-        # Now we're down to two cases: 'modules' only and 'packages' only.
-        if self.modules:
+        # Now we're down to two cases: 'py_modules' only and 'packages' only.
+        if self.py_modules:
             self.build_modules ()
         else:
             self.build_packages ()
@@ -194,7 +194,7 @@ def find_package_modules (self, package, package_dir):
 
     def find_modules (self):
         """Finds individually-specified Python modules, ie. those listed by
-        module name in 'self.modules'.  Returns a list of tuples (package,
+        module name in 'self.py_modules'.  Returns a list of tuples (package,
         module_base, filename): 'package' is a tuple of the path through
         package-space to the module; 'module_base' is the bare (no
         packages, no dots) module name, and 'filename' is the path to the
@@ -218,7 +218,7 @@ def find_modules (self):
         # string or empty list, depending on context).  Differences:
         #   - don't check for __init__.py in directory for empty package
 
-        for module in self.modules:
+        for module in self.py_modules:
             path = string.split (module, '.')
             package = tuple (path[0:-1])
             module_base = path[-1]
@@ -251,12 +251,12 @@ def find_modules (self):
 
     def find_all_modules (self):
         """Compute the list of all modules that will be built, whether
-        they are specified one-module-at-a-time ('self.modules') or
+        they are specified one-module-at-a-time ('self.py_modules') or
         by whole packages ('self.packages').  Return a list of tuples
         (package, module, module_file), just like 'find_modules()' and
         'find_package_modules()' do."""
 
-        if self.modules:
+        if self.py_modules:
             modules = self.find_modules ()
         else:
             modules = []

From 32b0296e148d27447ca6b7154f8fd2d94b6a6a5e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 14:20:57 +0000
Subject: [PATCH 0417/8469] Removed the 'ensure_*' methods -- they're just too
 handy too keep in one command class, so they're now in the Command base
 class.

---
 command/bdist_rpm.py | 44 +-------------------------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 9bce04c1ad..4e7675e806 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string, re
+import os, string
 from types import *
 from distutils.core import Command, DEBUG
 from distutils.util import get_platform, write_file
@@ -203,48 +203,6 @@ def finalize_package_data (self):
     # finalize_package_data ()
 
 
-    # XXX these look awfully handy: should probably move them
-    # up to Command and use more widely.
-    def _ensure_stringlike (self, option, what, default=None):
-        val = getattr(self, option)
-        if val is None:
-            setattr(self, option, default)
-            return default
-        elif type(val) is not StringType:
-            raise DistutilsOptionError, \
-                  "'%s' must be a %s (got `%s`)" % (option, what, val)
-        return val
-
-    def ensure_string (self, option, default=None):
-        self._ensure_stringlike(option, "string", default)
-
-    def ensure_string_list (self, option):
-        val = getattr(self, option)
-        if val is None:
-            return
-        elif type(val) is StringType:
-            setattr(self, option, re.split(r',\s*|\s+', val))
-        else:
-            if type(val) is ListType:
-                types = map(type, val)
-                ok = (types == [StringType] * len(val))
-            else:
-                ok = 0
-
-            if not ok:
-                raise DistutilsOptionError, \
-                      "'%s' must be a list of strings (got %s)" % \
-                      (option, `val`)
-        
-    def ensure_filename (self, option, default=None):
-        val = self._ensure_stringlike(option, "filename", None)
-        if val is not None and not os.path.exists(val):
-            raise DistutilsOptionError, \
-                  "error in '%s' option: file '%s' does not exist" % \
-                  (option, val)
-
-
-
     def run (self):
 
         if DEBUG:

From f126db7e1143b197ef275f5545fc39258124fa87 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 14:21:28 +0000
Subject: [PATCH 0418/8469] Added the 'ensure_*' methods from bdist_rpm;
 refactored 'ensure_filename()' and added 'ensure_dirname()'.

---
 cmd.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/cmd.py b/cmd.py
index b0a4b95942..9f63f838a7 100644
--- a/cmd.py
+++ b/cmd.py
@@ -9,7 +9,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os, string, re
 from types import *
 from distutils.errors import *
 from distutils import util
@@ -173,6 +173,77 @@ def announce (self, msg, level=1):
             print msg
 
 
+    # -- Option validation methods -------------------------------------
+    # (these are very handy in writing the 'finalize_options()' method)
+    # 
+    # NB. the general philosophy here is to ensure that a particular option
+    # value meets certain type and value constraints.  If not, we try to
+    # force it into conformance (eg. if we expect a list but have a string,
+    # split the string on comma and/or whitespace).  If we can't force the
+    # option into conformance, raise DistutilsOptionError.  Thus, command
+    # classes need do nothing more than (eg.)
+    #   self.ensure_string_list('foo')
+    # and they can be guaranteed that thereafter, self.foo will be
+    # a list of strings.
+
+    def _ensure_stringlike (self, option, what, default=None):
+        val = getattr(self, option)
+        if val is None:
+            setattr(self, option, default)
+            return default
+        elif type(val) is not StringType:
+            raise DistutilsOptionError, \
+                  "'%s' must be a %s (got `%s`)" % (option, what, val)
+        return val
+
+    def ensure_string (self, option, default=None):
+        """Ensure that 'option' is a string; if not defined, set it to
+        'default'.
+        """
+        self._ensure_stringlike(option, "string", default)
+
+    def ensure_string_list (self, option):
+        """Ensure that 'option' is a list of strings.  If 'option' is
+        currently a string, we split it either on /,\s*/ or /\s+/, so
+        "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
+        ["foo", "bar", "baz"].
+        """
+        val = getattr(self, option)
+        if val is None:
+            return
+        elif type(val) is StringType:
+            setattr(self, option, re.split(r',\s*|\s+', val))
+        else:
+            if type(val) is ListType:
+                types = map(type, val)
+                ok = (types == [StringType] * len(val))
+            else:
+                ok = 0
+
+            if not ok:
+                raise DistutilsOptionError, \
+                      "'%s' must be a list of strings (got %s)" % \
+                      (option, `val`)
+        
+    def _ensure_tested_string (self, option, tester,
+                               what, error_fmt, default=None):
+        val = self._ensure_stringlike(option, what, default)
+        if val is not None and not tester(val):
+            raise DistutilsOptionError, \
+                  ("error in '%s' option: " + error_fmt) % (option, val)
+
+    def ensure_filename (self, option):
+        """Ensure that 'option' is the name of an existing file."""
+        self._ensure_tested_string(option, os.path.isfile,
+                                   "filename",
+                                   "'%s' does not exist or is not a file")
+
+    def ensure_dirname (self, option):
+        self._ensure_tested_string(option, os.path.isdir,
+                                   "directory name",
+                                   "'%s' does not exist or is not a directory")
+
+
     # -- Convenience methods for commands ------------------------------
 
     def get_command_name (self):

From bf680c9cda3ae15b841455b9b8f8b858eb9fffd4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 15:00:34 +0000
Subject: [PATCH 0419/8469] Patch from Harry Henry Gebel: Fills in question
 marks in help

Reads scripts in from files rather than strings

Adds RPM 2 compatibility mode (untested). Use of this mode requires that
--bdist-base be specified because bdist_rpm has no way of detecting where
RPM wants to find spec files and source files. An unmodified RedHat 5.0
system would require '--bdist-base=/usr/src/RedHat'. (You would also have
to be root.) If the rpmrc file has been modified to allow RPMs to be built
by normal users then --build-base would need to be changed accordingly.

Formats the changelog.

GPW: tweaked formatting, added some editorial comments.
---
 command/bdist_rpm.py | 162 +++++++++++++++++++++++++++----------------
 1 file changed, 103 insertions(+), 59 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 4e7675e806..612629fe4c 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -42,7 +42,7 @@ class bdist_rpm (Command):
         ('release', None,
          "RPM release number"),
         ('serial', None,
-         "???"),
+         "RPM serial number"),
         ('vendor', None,
          "RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
          "[default: maintainer or author from setup script]"),
@@ -52,18 +52,17 @@ class bdist_rpm (Command):
         ('doc-files', None,
          "list of documentation files (space or comma-separated)"),
         ('changelog', None,
-         "RPM changelog"),
+         "path to RPM changelog"),
         ('icon', None,
          "name of icon file"),
-
-        ('prep-cmd', None,
-         "?? pre-build command(s) ??"),
-        ('build-cmd', None,
-         "?? build command(s) ??"),
-        ('install-cmd', None,
-         "?? installation command(s) ??"),
-        ('clean-cmd', None,
-         "?? clean command(s) ??"),
+        ('prep-script', None,
+         "pre-build script  (Bourne shell code)"),
+        ('build-script', None,
+         "build script (Bourne shell code)"),
+        ('install-script', None,
+         "installation script (Bourne shell code)"),
+        ('clean-script', None,
+         "clean script (Bourne shell code)"),
         ('pre-install', None,
          "pre-install script (Bourne shell code)"),
         ('post-install', None,
@@ -72,17 +71,16 @@ class bdist_rpm (Command):
          "pre-uninstall script (Bourne shell code)"),
         ('post-uninstall', None,
          "post-uninstall script (Bourne shell code)"),
-
         ('provides', None,
-         "???"),
+         "capabilities provided by this package"),
         ('requires', None,
-         "???"),
+         "capabilities required by this package"),
         ('conflicts', None,
-         "???"),
+         "capabilities which conflict with this package"),
         ('build-requires', None,
-         "???"),
+         "capabilities required to build this package"),
         ('obsoletes', None,
-         "???"),
+         "capabilities made obsolete by this package"),
 
         # Actions to take when building RPM
         ('clean', None,
@@ -93,10 +91,15 @@ class bdist_rpm (Command):
          "compile with RPM_OPT_FLAGS when building from source RPM"),
         ('no-rpm-opt-flags', None,
          "do not pass any RPM CFLAGS to compiler"),
+        ('rpm3-mode', None,
+         "RPM 3 compatibility mode (default)"),
+        ('rpm2-mode', None,
+         "RPM 2 compatibility mode"),
        ]
 
     negative_opt = {'no-clean': 'clean',
-                    'no-rpm-opt-flags': 'use-rpm-opt-flags'}
+                    'no-rpm-opt-flags': 'use-rpm-opt-flags',
+                    'rpm2-mode': 'rpm3-mode'}
 
                     
     def initialize_options (self):
@@ -116,10 +119,10 @@ def initialize_options (self):
         self.changelog = None
         self.icon = None
 
-        self.prep_cmd = None
-        self.build_cmd = None
-        self.install_cmd = None
-        self.clean_cmd = None
+        self.prep_script = None
+        self.build_script = None
+        self.install_script = None
+        self.clean_script = None
         self.pre_install = None
         self.post_install = None
         self.pre_uninstall = None
@@ -133,6 +136,7 @@ def initialize_options (self):
 
         self.clean = 1
         self.use_rpm_opt_flags = 1
+        self.rpm3_mode = 1
 
     # initialize_options()
 
@@ -160,31 +164,28 @@ def finalize_package_data (self):
         self.ensure_string('vendor',
                            "%s <%s>" % (self.distribution.get_contact(),
                                         self.distribution.get_contact_email()))
-        self.ensure_string('packager', self.vendor) # or nothing?
+        self.ensure_string('packager') 
         self.ensure_string_list('doc_files')
         if type(self.doc_files) is ListType:
             for readme in ('README', 'README.txt'):
                 if os.path.exists(readme) and readme not in self.doc_files:
                     self.doc.append(readme)
 
-        self.ensure_string('release', "1")   # should it be an int?
+        self.ensure_string('release', "1")
         self.ensure_string('serial')   # should it be an int?
 
-        self.ensure_string('icon')
         self.ensure_string('distribution_name')
 
-        self.ensure_string('prep_cmd', "%setup") # string or filename?
+        self.ensure_string('changelog')
+          # Format changelog correctly
+        self.changelog = self._format_changelog(self.changelog)
 
-        if self.use_rpm_opt_flags:
-            def_build = 'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'
-        else:
-            def_build = 'python setup.py build'
-        self.ensure_string('build_cmd', def_build)
-        self.ensure_string('install_cmd',
-                           "python setup.py install --root=$RPM_BUILD_ROOT "
-                           "--record=INSTALLED_FILES")
-        self.ensure_string('clean_cmd',
-                           "rm -rf $RPM_BUILD_ROOT")
+        self.ensure_filename('icon')
+        
+        self.ensure_filename('prep_script')
+        self.ensure_filename('build_script')
+        self.ensure_filename('install_script')
+        self.ensure_filename('clean_script')
         self.ensure_filename('pre_install')
         self.ensure_filename('post_install')
         self.ensure_filename('pre_uninstall')
@@ -217,7 +218,11 @@ def run (self):
             spec_dir = "dist"
             self.mkpath(spec_dir)       # XXX should be configurable
         else:
-            rpm_base = os.path.join(self.bdist_base, "rpm")
+            if self.rpm3_mode:
+                rpm_base = os.path.join(self.bdist_base, "rpm")
+            else:
+                # complete path must be specified in RPM 2 mode
+                rpm_base = self.bdist_base
             rpm_dir = {}
             for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'):
                 rpm_dir[d] = os.path.join(rpm_base, d)
@@ -266,8 +271,9 @@ def run (self):
             rpm_args.append('-bb')
         else:
             rpm_args.append('-ba')
-        rpm_args.extend(['--define',
-                         '_topdir %s/%s' % (os.getcwd(), rpm_base),])
+        if self.rpm3_mode:
+            rpm_args.extend(['--define',
+                             '_topdir %s/%s' % (os.getcwd(), rpm_base),])
         if self.clean:
             rpm_args.append('--clean')
         rpm_args.append(spec_path)
@@ -363,27 +369,45 @@ def _make_spec_file(self):
         #        ])
 
         # rpm scripts
-        for (rpm_opt, attr) in (('prep', 'prep_cmd'),
-                                ('build', 'build_cmd'),
-                                ('install', 'install_cmd'),
-                                ('clean', 'clean_cmd'),
-                                ('pre', 'pre_install'),
-                                ('post', 'post_install'),
-                                ('preun', 'pre_uninstall'),
-                                ('postun', 'post_uninstall')):
-            # XXX oops, this doesn't distinguish between "raw code"
-            # options and "script filename" options -- well, we probably
-            # should settle on one or the other, and not make the
-            # distinction!
+        # figure out default build script
+        if self.use_rpm_opt_flags:
+            def_build = 'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'
+        else:
+            def_build = 'python setup.py build'
+        # insert contents of files
+
+        # XXX this is kind of misleading: user-supplied options are files
+        # that we open and interpolate into the spec file, but the defaults
+        # are just text that we drop in as-is.  Hmmm.
+
+        script_options = [
+            ('prep', 'prep_script', "%setup"),
+            ('build', 'build_script', def_build),
+            ('install', 'install_script',
+             "python setup.py install "
+             "--root=$RPM_BUILD_ROOT "
+             "--record=INSTALLED_FILES"),
+            ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
+            ('pre', 'pre_install', None),
+            ('post', 'post_install', None),
+            ('preun', 'pre_uninstall', None),
+            ('postun', 'post_uninstall', None))
+        ]
+
+        for (rpm_opt, attr, default) in script_options:
+            # Insert contents of file refered to, if no file is refered to
+            # use 'default' as contents of script
             val = getattr(self, attr)
-            if val:
+            if val or default:
                 spec_file.extend([
                     '',
-                    '%' + rpm_opt,
-                    val
-                    ])
+                    '%' + rpm_opt,])
+                if val:
+                    spec_file.extend(string.split(open(val, 'r').read(), '\n'))
+                else:
+                    spec_file.append(default)
+
 
-        
         # files section
         spec_file.extend([
             '',
@@ -397,12 +421,32 @@ def _make_spec_file(self):
         if self.changelog:
             spec_file.extend([
                 '',
-                '%changelog',
-                self.changelog
-                ])
+                '%changelog',])
+            spec_file.extend(self.changelog)
 
         return spec_file
 
     # _make_spec_file ()
 
+    def _format_changelog(self, changelog):
+        """Format the changelog correctly and convert it to a list of strings
+        """
+        new_changelog = []
+        for line in string.split(string.strip(changelog), '\n'):
+            line = string.strip(line)
+            if line[0] == '*':
+                new_changelog.extend(['', line])
+            elif line[0] == '-':
+                new_changelog.append(line)
+            else:
+                new_changelog.append('  ' + line)
+                
+        # strip trailing newline inserted by first changelog entry
+        if not new_changelog[0]:
+            del new_changelog[0]
+        
+        return new_changelog
+
+    # _format_changelog()
+
 # class bdist_rpm

From 2b0f2098a922464c8891848b2ef9da402ed0398b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 15:12:51 +0000
Subject: [PATCH 0420/8469] Use 'ensure_string_list()' for 'formats' option, so
 that it can be spelled sensibly in a config file.

---
 command/sdist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 03de85b1ae..af88eba07a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -73,6 +73,7 @@ def finalize_options (self):
         if self.template is None:
             self.template = "MANIFEST.in"
 
+        self.ensure_string_list('formats')
         if self.formats is None:
             try:
                 self.formats = [self.default_format[os.name]]
@@ -80,8 +81,6 @@ def finalize_options (self):
                 raise DistutilsPlatformError, \
                       "don't know how to create source distributions " + \
                       "on platform %s" % os.name
-        elif type (self.formats) is StringType:
-            self.formats = string.split (self.formats, ',')
 
         bad_format = check_archive_formats (self.formats)
         if bad_format:

From a74d191319d246a424b5de2e1ca55dce5cd4d799 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 4 Jun 2000 15:30:35 +0000
Subject: [PATCH 0421/8469] Fixed syntax error. Half-fixed RPM 2
 compatibility:added 'rpm_base' option, which must be set   (to eg.
 /usr/src/redhat on a stock Red Hat system) if rpm2_mode is on.   Still not
 quite working, though.

---
 command/bdist_rpm.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 612629fe4c..0959ad8f90 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -18,8 +18,11 @@ class bdist_rpm (Command):
     description = "create an RPM distribution"
 
     user_options = [
-        ('bdist-base', None,
+        ('bdist-base=', None,
          "base directory for creating built distributions"),
+        ('rpm-base=', None,
+         "base directory for creating RPMs (defaults to \"rpm\" under "
+         "--bdist-base; must be specified for RPM 2)"),
         ('spec-only', None,
          "only regenerate spec file"),
         ('source-only', None,
@@ -104,6 +107,7 @@ class bdist_rpm (Command):
                     
     def initialize_options (self):
         self.bdist_base = None
+        self.rpm_base = None
         self.spec_only = None
         self.binary_only = None
         self.source_only = None
@@ -143,6 +147,12 @@ def initialize_options (self):
 
     def finalize_options (self):
         self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
+        if self.rpm_base is None:
+            if not self.rpm3_mode:
+                raise DistutilsOptionError, \
+                      "you must specify --rpm-base in RPM 2 mode"
+            self.rpm_base = os.path.join(self.bdist_base, "rpm")
+
         if os.name != 'posix':
             raise DistutilsPlatformError, \
                   ("don't know how to create RPM "
@@ -218,14 +228,9 @@ def run (self):
             spec_dir = "dist"
             self.mkpath(spec_dir)       # XXX should be configurable
         else:
-            if self.rpm3_mode:
-                rpm_base = os.path.join(self.bdist_base, "rpm")
-            else:
-                # complete path must be specified in RPM 2 mode
-                rpm_base = self.bdist_base
             rpm_dir = {}
             for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'):
-                rpm_dir[d] = os.path.join(rpm_base, d)
+                rpm_dir[d] = os.path.join(self.rpm_base, d)
                 self.mkpath(rpm_dir[d])
             spec_dir = rpm_dir['SPECS']
 
@@ -273,7 +278,7 @@ def run (self):
             rpm_args.append('-ba')
         if self.rpm3_mode:
             rpm_args.extend(['--define',
-                             '_topdir %s/%s' % (os.getcwd(), rpm_base),])
+                             '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
         if self.clean:
             rpm_args.append('--clean')
         rpm_args.append(spec_path)
@@ -391,7 +396,7 @@ def _make_spec_file(self):
             ('pre', 'pre_install', None),
             ('post', 'post_install', None),
             ('preun', 'pre_uninstall', None),
-            ('postun', 'post_uninstall', None))
+            ('postun', 'post_uninstall', None),
         ]
 
         for (rpm_opt, attr, default) in script_options:

From 448d6882a1ad6730e07c74b34be274cfadfbd514 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 6 Jun 2000 02:18:13 +0000
Subject: [PATCH 0422/8469] 'get_outputs()' now returns an empty list instead
 of None.

---
 command/install_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_data.py b/command/install_data.py
index acc89aa395..5481dabe66 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -56,4 +56,4 @@ def get_inputs (self):
         return self.data_files or []
 
     def get_outputs (self):
-        return self.outfiles
+        return self.outfiles or []

From 6a1d2a4ef333b3c52fbd11a6f4ba261349aae97c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 6 Jun 2000 02:51:38 +0000
Subject: [PATCH 0423/8469] Support for multiple distribution formats in one
 run.

---
 command/bdist.py | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index df4e3a0350..3cd1eb0342 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -20,9 +20,9 @@ class bdist (Command):
 
     user_options = [('bdist-base=', 'b',
                      "temporary directory for creating built distributions"),
-                    ('format=', 'f',
-                     "format for distribution " +
-                     "(tar, ztar, gztar, bztar, zip, ... )"),
+                    ('formats=', None,
+                     "formats for distribution " +
+                     "(gztar, bztar, zip, rpm, ... )"),
                    ]
 
     # The following commands do not take a format option from bdist
@@ -43,7 +43,7 @@ class bdist (Command):
 
     def initialize_options (self):
         self.bdist_base = None
-        self.format = None
+        self.formats = None
 
     # initialize_options()
 
@@ -57,31 +57,32 @@ def finalize_options (self):
             plat = get_platform()
             self.bdist_base = os.path.join (build_base, 'bdist.' + plat)
 
-        if self.format is None:
+        self.ensure_string_list('formats')
+        if self.formats is None:
             try:
-                self.format = self.default_format[os.name]
+                self.formats = [self.default_format[os.name]]
             except KeyError:
                 raise DistutilsPlatformError, \
                       "don't know how to create built distributions " + \
                       "on platform %s" % os.name
-        #elif type (self.format) is StringType:
-        #    self.format = string.split (self.format, ',')
             
     # finalize_options()
 
 
     def run (self):
 
-        try:
-            cmd_name = self.format_command[self.format]
-        except KeyError:
-            raise DistutilsOptionError, \
-                  "invalid archive format '%s'" % self.format
+        for format in self.formats:
 
-        if cmd_name not in self.no_format_option:
-            sub_cmd = self.get_finalized_command (cmd_name)
-            sub_cmd.format = self.format
-        self.run_command (cmd_name)
+            try:
+                cmd_name = self.format_command[self.format]
+            except KeyError:
+                raise DistutilsOptionError, \
+                      "invalid format '%s'" % self.format
+
+            sub_cmd = self.reinitialize_command(cmd_name)
+            if cmd_name not in self.no_format_option:
+                sub_cmd.format = self.format
+            self.run_command (cmd_name)
 
     # run()
 

From ea60038bb5f5d80fefb16772d62e90d2d2508dc5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 6 Jun 2000 02:52:36 +0000
Subject: [PATCH 0424/8469] Fix 'reinitialize_command()' so it resets the
 'have_run' flag for the command being reinitialized to false.

---
 dist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist.py b/dist.py
index 64f63add57..44f5c8806a 100644
--- a/dist.py
+++ b/dist.py
@@ -712,6 +712,7 @@ def reinitialize_command (self, command):
             return command
         command.initialize_options()
         command.finalized = 0
+        self.have_run[command_name] = 0
         self._set_command_options(command)
         return command
 

From 356f7580cd5f33456c296a1c8addd207d67a4548 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 6 Jun 2000 02:57:07 +0000
Subject: [PATCH 0425/8469] First crack at the Distutils "config" command. 
 Unlike other commands, this one doesn't *do* anything by default; it's just
 there as a conduit for data (eg. include dirs, libraries) from the user to
 the "build" commands. However, it provides a couple of Autoconf-ish methods
 ('try_compile()', 'try_link()', 'try_run()') that derived, per-distribution
 "config" commands can use to poke around the target system and see what's
 available.

Initial experimenst with mxDateTime indicate that higher-level methods are
necessary: analogs of Autoconf's AC_CHECK_HEADER, AC_CHECK_LIB will be
needed too (and that's just to probe the C/C++ system: how to probe the
Python system is wide open, and someday we'll have to worry about probing a
Java system too).
---
 command/config.py | 180 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 command/config.py

diff --git a/command/config.py b/command/config.py
new file mode 100644
index 0000000000..cad75bcb27
--- /dev/null
+++ b/command/config.py
@@ -0,0 +1,180 @@
+"""distutils.command.config
+
+Implements the Distutils 'config' command, a (mostly) empty command class
+that exists mainly to be sub-classed by specific module distributions and
+applications.  The idea is that while every "config" command is different,
+at least they're all named the same, and users always see "config" in the
+list of standard commands.  Also, this is a good place to put common
+configure-like tasks: "try to compile this C code", or "figure out where
+this header file lives".
+"""
+
+# created 2000/05/29, Greg Ward
+
+__revision__ = "$Id$"
+
+import os, string
+from distutils.core import Command
+from distutils.errors import DistutilsExecError
+
+
+LANG_EXT = {'c': '.c',
+            'c++': '.cxx'}
+
+class config (Command):
+
+    description = "prepare to build"
+
+    user_options = [
+        ('compiler=', None,
+         "specify the compiler type"),
+        ('cc=', None,
+         "specify the compiler executable"),
+        ('include-dirs=', 'I',
+         "list of directories to search for header files"),
+        ('define=', 'D',
+         "C preprocessor macros to define"),
+        ('undef=', 'U',
+         "C preprocessor macros to undefine"),
+        ('libraries=', 'l',
+         "external C libraries to link with"),
+        ('library-dirs=', 'L',
+         "directories to search for external C libraries"),
+        ]
+
+
+    # The three standard command methods: since the "config" command
+    # does nothing by default, these are empty.
+
+    def initialize_options (self):
+        self.compiler = None
+        self.cc = None
+        self.include_dirs = None
+        #self.define = None
+        #self.undef = None
+        self.libraries = None
+        self.library_dirs = None
+
+    def finalize_options (self):
+        pass
+
+    def run (self):
+        pass
+
+
+    # Utility methods for actual "config" commands.  The interfaces are
+    # loosely based on Autoconf macros of similar names.  Sub-classes
+    # may use these freely.
+
+    def _check_compiler (self):
+        """Check that 'self.compiler' really is a CCompiler object;
+        if not, make it one.
+        """
+        # We do this late, and only on-demand, because this is an expensive
+        # import.
+        from distutils.ccompiler import CCompiler, new_compiler
+        if not isinstance(self.compiler, CCompiler):
+            self.compiler = new_compiler (compiler=self.compiler,
+                                          verbose=self.verbose, # for now
+                                          dry_run=self.dry_run,
+                                          force=1)
+            if self.include_dirs:
+                self.compiler.set_include_dirs(self.include_dirs)
+            if self.libraries:
+                self.compiler.set_libraries(self.libraries)
+            if self.library_dirs:
+                self.compiler.set_library_dirs(self.library_dirs)
+
+
+    def _gen_temp_sourcefile (self, body, lang):
+        filename = "_configtest" + LANG_EXT[lang]
+        file = open(filename, "w")
+        file.write(body)
+        file.close()
+        return filename
+
+    def _compile (self, body, lang):
+        src = self._gen_temp_sourcefile(body, lang)
+        (obj,) = self.compiler.compile([src])
+        return (src, obj)
+
+    def _link (self, body, lang):
+        (src, obj) = self._compile(body, lang)
+        exe = os.path.splitext(os.path.basename(src))[0]
+        self.compiler.link_executable([obj], exe)
+        return (src, obj, exe)
+
+    def _clean (self, *filenames):
+        self.announce("removing: " + string.join(filenames))
+        for filename in filenames:
+            try:
+                os.remove(filename)
+            except OSError:
+                pass
+
+
+    # XXX no 'try_cpp()' or 'search_cpp()' since the CCompiler interface
+    # does not provide access to the preprocessor.  This is an oversight
+    # that should be fixed.
+
+    # XXX these ignore the dry-run flag: what to do, what to do? even if
+    # you want a dry-run build, you still need some sort of configuration
+    # info.  My inclination is to make it up to the real config command to
+    # consult 'dry_run', and assume a default (minimal) configuration if
+    # true.  The problem with trying to do it here is that you'd have to
+    # return either true or false from all the 'try' methods, neither of
+    # which is correct.
+
+    def try_compile (self, body, lang="c"):
+        """Try to compile a source file that consists of the text in 'body'
+        (a multi-line string).  Return true on success, false
+        otherwise.
+        """
+        from distutils.ccompiler import CompileError
+        self._check_compiler()
+        try:
+            (src, obj) = self._compile(body, lang)
+            ok = 1
+        except CompileError:
+            ok = 0
+
+        self.announce(ok and "success!" or "failure.")
+        self._clean(src, obj)
+        return ok
+
+    def try_link (self, body, lang="c"):
+        """Try to compile and link a source file (to an executable) that
+        consists of the text in 'body' (a multi-line string).  Return true
+        on success, false otherwise.
+        """
+        from distutils.ccompiler import CompileError, LinkError
+        self._check_compiler()
+        try:
+            (src, obj, exe) = self._link(body, lang)
+            ok = 1
+        except (CompileError, LinkError):
+            ok = 0
+
+        self.announce(ok and "success!" or "failure.")
+        self._clean(src, obj, exe)
+        return ok
+            
+    def try_run (self, body, lang="c"):
+        """Try to compile, link to an executable, and run a program that
+        consists of the text in 'body'.  Return true on success, false
+        otherwise.
+        """
+        from distutils.ccompiler import CompileError, LinkError
+        self._check_compiler()
+        try:
+            (src, obj, exe) = self._link(body, lang)
+            self.spawn([exe])
+            ok = 1
+        except (CompileError, LinkError, DistutilsExecError):
+            ok = 0
+
+        self.announce(ok and "success!" or "failure.")
+        self._clean(src, obj, exe)
+        return ok
+
+# class config

From 86b8b566efbb265aaa76d90658759dad90a5d31c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 7 Jun 2000 02:26:19 +0000
Subject: [PATCH 0426/8469] Patch from Rene Liebscher: Look for personal config
 file in /home/greg on Windows, too: users will have to set /home/greg to use
 this, so it's not something that many people will use.  But if python-dev
 comes up with the "right way" to divine a home directory on Windows, we can
 use that to set /home/greg and poof! -- personal Distutils config files on
 Windows.

---
 dist.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/dist.py b/dist.py
index 44f5c8806a..ea4ec2e7e9 100644
--- a/dist.py
+++ b/dist.py
@@ -263,24 +263,25 @@ def find_config_files (self):
         and setup.cfg in the current directory.
         """
         files = []
-        if os.name == "posix":
-            check_environ()
-
-            sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
-            sys_file = os.path.join(sys_dir, "pydistutils.cfg")
-            if os.path.isfile(sys_file):
-                files.append(sys_file)
-
-            user_file = os.path.join(os.environ.get('HOME'),
-                                     ".pydistutils.cfg")
+        check_environ()
+
+        if os.name=='posix':
+	    sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
+	    user_filename = ".pydistutils.cfg"
+	else:
+	    sys_dir = sysconfig.PREFIX
+	    user_filename = "pydistutils.cfg"
+	
+        sys_file = os.path.join(sys_dir, "pydistutils.cfg")
+        if os.path.isfile(sys_file):
+            files.append(sys_file)
+
+	if os.environ.has_key('HOME'):
+    	    user_file = os.path.join(os.environ.get('HOME'),
+                                     user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
 
-        else:
-            sys_file = os.path.join (sysconfig.PREFIX, "pydistutils.cfg")
-            if os.path.isfile(sys_file):
-                files.append(sys_file)
-
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):

From daadfabdb5b0395712504823a574111262fd5361 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 7 Jun 2000 02:29:03 +0000
Subject: [PATCH 0427/8469] Always look for the system config file in the
 Distutils module directory, and call it "distutils.cfg" instead of
 "pydistutils.cfg" (personal config files are still ".pydistutils.cfg" or
 "pydistutils.cfg", though).

---
 dist.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dist.py b/dist.py
index ea4ec2e7e9..0b8a99e1cd 100644
--- a/dist.py
+++ b/dist.py
@@ -265,20 +265,23 @@ def find_config_files (self):
         files = []
         check_environ()
 
-        if os.name=='posix':
-	    sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
+        # Where to look for the system-wide Distutils config file
+        sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
+
+        # Look for the system config file
+        sys_file = os.path.join(sys_dir, "distutils.cfg")
+        if os.path.isfile(sys_file):
+            files.append(sys_file)
+
+        # What to call the per-user config file
+        if os.name == 'posix':
 	    user_filename = ".pydistutils.cfg"
 	else:
-	    sys_dir = sysconfig.PREFIX
 	    user_filename = "pydistutils.cfg"
 	
-        sys_file = os.path.join(sys_dir, "pydistutils.cfg")
-        if os.path.isfile(sys_file):
-            files.append(sys_file)
-
+        # And look for the user config file
 	if os.environ.has_key('HOME'):
-    	    user_file = os.path.join(os.environ.get('HOME'),
-                                     user_filename)
+    	    user_file = os.path.join(os.environ.get('HOME'), user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
 

From daf86a83ea964ce51f67cff37b365f4129e93134 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 7 Jun 2000 03:00:06 +0000
Subject: [PATCH 0428/8469] Patch from Rene Liebscher: this adds "--help-foo"
 options to list the values that "--foo" can take for various commands: eg.
 what formats for "sdist" and "bdist", what compilers for "build_ext" and
 "build_clib".

I have *not* reviewed this patch; I'm checking it in as-is because it also
fixes a paper-bag-over-head bug in bdist.py, and because I won't have
time to review it properly for several days: so someone else can
test it for me, instead!
---
 archive_util.py       | 10 +++++-----
 ccompiler.py          | 18 +++++++++++++++---
 command/bdist.py      | 37 ++++++++++++++++++++++++++-----------
 command/build.py      |  5 +++++
 command/build_clib.py |  6 +++++-
 command/build_ext.py  |  5 +++++
 command/sdist.py      | 19 +++++++++++++++++--
 dist.py               | 32 +++++++++++++++++++++++++++++---
 8 files changed, 107 insertions(+), 25 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 3159c284e4..27aa8c0bfc 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -110,11 +110,11 @@ def visit (z, dirname, names):
 
 
 ARCHIVE_FORMATS = {
-    'gztar': (make_tarball, [('compress', 'gzip')]),
-    'bztar': (make_tarball, [('compress', 'bzip2')]),
-    'ztar':  (make_tarball, [('compress', 'compress')]),
-    'tar':   (make_tarball, [('compress', None)]),
-    'zip':   (make_zipfile, [])
+    'gztar': (make_tarball, [('compress', 'gzip')],"gzipped tar-file"),
+    'bztar': (make_tarball, [('compress', 'bzip2')],"bzip2-ed tar-file"),
+    'ztar':  (make_tarball, [('compress', 'compress')],"compressed tar-file"),
+    'tar':   (make_tarball, [('compress', None)],"uncompressed tar-file"),
+    'zip':   (make_zipfile, [],"zip-file")
     }
 
 def check_archive_formats (formats):
diff --git a/ccompiler.py b/ccompiler.py
index 834d543e33..b146f89011 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -726,10 +726,22 @@ def mkpath (self, name, mode=0777):
 # Map compiler types to (module_name, class_name) pairs -- ie. where to
 # find the code that implements an interface to this compiler.  (The module
 # is assumed to be in the 'distutils' package.)
-compiler_class = { 'unix': ('unixccompiler', 'UnixCCompiler'),
-                   'msvc': ('msvccompiler', 'MSVCCompiler'),
+compiler_class = { 'unix': ('unixccompiler', 'UnixCCompiler',"standard UNIX-style compiler"),
+                   'msvc': ('msvccompiler', 'MSVCCompiler',"Microsoft Visual C++"),
+                   'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',"Cygwin-Gnu-Win32-C-Compiler"),
+                   'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',"MinGW32-C-Compiler (or cygwin in this mode)"),
                  }
 
+# prints all possible arguments to --compiler
+def show_compilers():
+    from distutils.fancy_getopt import FancyGetopt 
+    list_of_compilers=[]
+    for compiler in compiler_class.keys():
+	list_of_compilers.append(("compiler="+compiler,None,compiler_class[compiler][2]))
+    list_of_compilers.sort()
+    pretty_printer=FancyGetopt(list_of_compilers)
+    pretty_printer.print_help("List of available compilers:")
+    
 
 def new_compiler (plat=None,
                   compiler=None,
@@ -755,7 +767,7 @@ def new_compiler (plat=None,
         if compiler is None:
             compiler = default_compiler[plat]
         
-        (module_name, class_name) = compiler_class[compiler]
+        (module_name, class_name,long_description) = compiler_class[compiler]
     except KeyError:
         msg = "don't know how to compile C/C++ code on platform '%s'" % plat
         if compiler is not None:
diff --git a/command/bdist.py b/command/bdist.py
index 3cd1eb0342..66ef1133f3 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -21,8 +21,7 @@ class bdist (Command):
     user_options = [('bdist-base=', 'b',
                      "temporary directory for creating built distributions"),
                     ('formats=', None,
-                     "formats for distribution " +
-                     "(gztar, bztar, zip, rpm, ... )"),
+                     "formats for distribution"),
                    ]
 
     # The following commands do not take a format option from bdist
@@ -33,12 +32,28 @@ class bdist (Command):
     default_format = { 'posix': 'gztar',
                        'nt': 'zip', }
 
-    format_command = { 'gztar': 'bdist_dumb',
-                       'bztar': 'bdist_dumb',
-                       'ztar':  'bdist_dumb',
-                       'tar':   'bdist_dumb',
-                       'rpm':   'bdist_rpm',
-                       'zip':   'bdist_dumb', }
+    format_command = { 'gztar': ('bdist_dumb',"gzipped tar-file"),
+                       'bztar': ('bdist_dumb',"bzip2-ed tar-file"),
+                       'ztar':  ('bdist_dumb',"compressed tar-file"),
+                       'tar':   ('bdist_dumb',"tar-file"),
+                       'rpm':   ('bdist_rpm',"rpm distribution"),
+                       'zip':   ('bdist_dumb',"zip-file"),
+		        }
+
+    # prints all possible arguments to --format
+    def show_formats():
+	from distutils.fancy_getopt import FancyGetopt 
+	list_of_formats=[]
+	for format in bdist.format_command.keys():
+	    list_of_formats.append(("formats="+format,None,bdist.format_command[format][1]))
+	list_of_formats.sort()
+	pretty_printer=FancyGetopt(list_of_formats)
+	pretty_printer.print_help("List of available distribution formats:")
+
+    help_options = [
+        ('help-formats', None,
+         "lists available distribution formats",show_formats),
+	]
 
 
     def initialize_options (self):
@@ -74,14 +89,14 @@ def run (self):
         for format in self.formats:
 
             try:
-                cmd_name = self.format_command[self.format]
+                cmd_name = self.format_command[format][0]
             except KeyError:
                 raise DistutilsOptionError, \
-                      "invalid format '%s'" % self.format
+                      "invalid format '%s'" % format
 
             sub_cmd = self.reinitialize_command(cmd_name)
             if cmd_name not in self.no_format_option:
-                sub_cmd.format = self.format
+                sub_cmd.format = format
             self.run_command (cmd_name)
 
     # run()
diff --git a/command/build.py b/command/build.py
index b0894b8313..c064f8394b 100644
--- a/command/build.py
+++ b/command/build.py
@@ -9,6 +9,7 @@
 import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
+from distutils.ccompiler import show_compilers
 
 class build (Command):
 
@@ -35,6 +36,10 @@ class build (Command):
         ('force', 'f',
          "forcibly build everything (ignore file timestamps)"),
         ]
+    help_options = [
+        ('help-compiler', None,
+         "lists available compilers",show_compilers),
+	]
 
     def initialize_options (self):
         self.build_base = 'build'
diff --git a/command/build_clib.py b/command/build_clib.py
index dba9a40a8b..72df372fbf 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -23,7 +23,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
-from distutils.ccompiler import new_compiler
+from distutils.ccompiler import new_compiler,show_compilers
 
 
 class build_clib (Command):
@@ -42,6 +42,10 @@ class build_clib (Command):
         ('compiler=', 'c',
          "specify the compiler type"),
         ]
+    help_options = [
+        ('help-compiler', None,
+         "lists available compilers",show_compilers),
+	]
 
     def initialize_options (self):
         self.build_clib = None
diff --git a/command/build_ext.py b/command/build_ext.py
index f487a68cab..53a265cc2e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -14,6 +14,7 @@
 from distutils.errors import *
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils.ccompiler import show_compilers
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
@@ -72,6 +73,10 @@ class build_ext (Command):
         ('compiler=', 'c',
          "specify the compiler type"),
         ]
+    help_options = [
+        ('help-compiler', None,
+         "lists available compilers",show_compilers),
+	]
 
 
     def initialize_options (self):
diff --git a/command/sdist.py b/command/sdist.py
index af88eba07a..221a4d9934 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -13,7 +13,7 @@
 from distutils.core import Command
 from distutils.util import newer, create_tree, remove_tree, convert_path, \
      write_file
-from distutils.archive_util import check_archive_formats
+from distutils.archive_util import check_archive_formats,ARCHIVE_FORMATS
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError, DistutilsOptionError
 
@@ -35,11 +35,26 @@ class sdist (Command):
         ('force-manifest', 'f',
          "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
-         "formats for source distribution (tar, ztar, gztar, bztar, or zip)"),
+         "formats for source distribution"),
         ('keep-tree', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),
         ]
+    # prints all possible arguments to --formats
+    def show_formats():
+	from distutils.fancy_getopt import FancyGetopt 
+	list_of_formats=[]
+	for format in ARCHIVE_FORMATS.keys():
+	    list_of_formats.append(("formats="+format,None,ARCHIVE_FORMATS[format][2]))
+	list_of_formats.sort()
+	pretty_printer=FancyGetopt(list_of_formats)
+	pretty_printer.print_help("List of available distribution formats:")
+
+    help_options = [
+        ('help-formats', None,
+         "lists available distribution formats",show_formats),
+	]
+
     negative_opts = {'use-defaults': 'no-defaults'}
 
     default_format = { 'posix': 'gztar',
diff --git a/dist.py b/dist.py
index 0b8a99e1cd..88bd94a470 100644
--- a/dist.py
+++ b/dist.py
@@ -437,16 +437,38 @@ def _parse_command_opts (self, parser, args):
             negative_opt = copy (negative_opt)
             negative_opt.update (cmd_class.negative_opt)
 
+	# Check for help_options in command class
+	# They have a different format (tuple of four) so we need to preprocess them here 
+	help_options = []
+	if hasattr(cmd_class,"help_options") and type (cmd_class.help_options) is ListType:
+	    help_options = map(lambda x:(x[0],x[1],x[2]),cmd_class.help_options)
+
         # All commands support the global options too, just by adding
         # in 'global_options'.
         parser.set_option_table (self.global_options +
-                                 cmd_class.user_options)
+                                 cmd_class.user_options + help_options)
         parser.set_negative_aliases (negative_opt)
         (args, opts) = parser.getopt (args[1:])
         if hasattr(opts, 'help') and opts.help:
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
 
+	if hasattr(cmd_class,"help_options") and type (cmd_class.help_options) is ListType:
+	    help_option_found=0
+	    for help_option in cmd_class.help_options:
+		if hasattr(opts, parser.get_attr_name(help_option[0])):
+		    help_option_found=1
+		    #print "showing help for option %s of command %s" % (help_option[0],cmd_class)
+		    if callable(help_option[3]):
+			help_option[3]()
+		    else:
+        		raise DistutilsClassError, \
+                          ("command class %s must provide " +
+                           "a callable object for help_option '%s'") % \
+                          (cmd_class,help_option[0])
+	    if help_option_found: 
+		return
+
         # Put the options from the command-line into their official
         # holding pen, the 'command_options' dictionary.
         opt_dict = self.get_option_dict(command)
@@ -496,7 +518,11 @@ def _show_help (self,
                 klass = command
             else:
                 klass = self.get_command_class (command)
-            parser.set_option_table (klass.user_options)
+	    if hasattr(klass,"help_options") and type (klass.help_options) is ListType:
+		parser.set_option_table (klass.user_options+
+					 map(lambda x:(x[0],x[1],x[2]),klass.help_options))
+	    else:
+        	parser.set_option_table (klass.user_options)
             parser.print_help ("Options for '%s' command:" % klass.__name__)
             print
 
@@ -504,7 +530,7 @@ def _show_help (self,
         return
 
     # _show_help ()
-
+	
 
     def handle_display_options (self, option_order):
         """If there were any non-global "display-only" options

From e2136df03285e1476e460aab0d646aa929b69651 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:02:36 +0000
Subject: [PATCH 0429/8469] Added 'debug_print()' method (driven by DEBUG
 global from distutils.core).

---
 cmd.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cmd.py b/cmd.py
index 9f63f838a7..c9b5624f8a 100644
--- a/cmd.py
+++ b/cmd.py
@@ -172,6 +172,15 @@ def announce (self, msg, level=1):
         if self.verbose >= level:
             print msg
 
+    def debug_print (self, msg):
+        """Print 'msg' to stdout if the global DEBUG (taken from the
+        DISTUTILS_DEBUG environment variable) flag is true.
+        """
+        from distutils.core import DEBUG
+        if DEBUG:
+            print msg
+        
+
 
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)

From 33a33497961e25ab9467ff6de472a4c8fb2e6230 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:08:14 +0000
Subject: [PATCH 0430/8469] Made all debug output go through the
 'debug_print()' method instead of directly printing to stdout.  This was a
 bit more work than it sounds like it should have been:   * turned
 'select_pattern()' and 'exclude_pattern()' from functions into     methods,
 so they can refer to 'self' to access the method   * commented out the
 *other* 'exclude_pattern()' method, which appears     to be vestigial code
 that was never cleaned up when the     'exclude_pattern()' function was
 created   * changed the one use of the old 'exclude_pattern()' method to use
 the     new 'exclude_pattern()' (same behaviour, slightly different args)   *
 some code and docstring reformatting   * and, of course, changed all the
 debugging prints to 'debug_print()' calls Added/tweaked some regular
 ('self.announce()') output for better runtime   feedback.

---
 command/sdist.py | 165 ++++++++++++++++++++++++++---------------------
 1 file changed, 90 insertions(+), 75 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 221a4d9934..b06c515656 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -272,21 +272,22 @@ def search_dir (self, dir, pattern=None):
     # search_dir ()
 
 
-    def exclude_pattern (self, pattern):
-        """Remove filenames from 'self.files' that match 'pattern'."""
-        print "exclude_pattern: pattern=%s" % pattern
-        pattern_re = translate_pattern (pattern)
-        for i in range (len (self.files)-1, -1, -1):
-            if pattern_re.match (self.files[i]):
-                print "removing %s" % self.files[i]
-                del self.files[i]
+#     def exclude_pattern (self, pattern):
+#         """Remove filenames from 'self.files' that match 'pattern'."""
+#         self.debug_print("exclude_pattern: pattern=%s" % pattern)
+#         pattern_re = translate_pattern (pattern)
+#         for i in range (len (self.files)-1, -1, -1):
+#             if pattern_re.match (self.files[i]):
+#                 self.debug_print("removing %s" % self.files[i])
+#                 del self.files[i]
 
 
     def recursive_exclude_pattern (self, dir, pattern=None):
         """Remove filenames from 'self.files' that are under 'dir'
            and whose basenames match 'pattern'."""
 
-        print "recursive_exclude_pattern: dir=%s, pattern=%s" % (dir, pattern)
+        self.debug_print("recursive_exclude_pattern: dir=%s, pattern=%s" %
+                         (dir, pattern))
         if pattern is None:
             pattern_re = None
         else:
@@ -296,7 +297,7 @@ def recursive_exclude_pattern (self, dir, pattern=None):
             (cur_dir, cur_base) = os.path.split (self.files[i])
             if (cur_dir == dir and
                 (pattern_re is None or pattern_re.match (cur_base))):
-                print "removing %s" % self.files[i]
+                self.debug_print("removing %s" % self.files[i])
                 del self.files[i]
 
 
@@ -307,6 +308,7 @@ def read_template (self):
            and add the resulting filenames to 'self.files'."""
 
         assert self.files is not None and type (self.files) is ListType
+        self.announce("reading manifest template '%s'" % self.template)
 
         template = TextFile (self.template,
                              strip_comments=1,
@@ -374,27 +376,28 @@ def read_template (self):
             # digging stuff up out of 'words'.
 
             if action == 'include':
-                print "include", string.join(pattern_list)
+                self.debug_print("include " + string.join(pattern_list))
                 for pattern in pattern_list:
-                    files = select_pattern (all_files, pattern, anchor=1)
+                    files = self.select_pattern (all_files, pattern, anchor=1)
                     if not files:
-                        template.warn ("no files found matching '%s'" % pattern)
+                        template.warn ("no files found matching '%s'" %
+                                       pattern)
                     else:
                         self.files.extend (files)
 
             elif action == 'exclude':
-                print "exclude", string.join(pattern_list)
+                self.debug_print("exclude " + string.join(pattern_list))
                 for pattern in pattern_list:
-                    num = exclude_pattern (self.files, pattern, anchor=1)
+                    num = self.exclude_pattern (self.files, pattern, anchor=1)
                     if num == 0:
                         template.warn (
                             "no previously-included files found matching '%s'"%
                             pattern)
 
             elif action == 'global-include':
-                print "global-include", string.join(pattern_list)
+                self.debug_print("global-include " + string.join(pattern_list))
                 for pattern in pattern_list:
-                    files = select_pattern (all_files, pattern, anchor=0)
+                    files = self.select_pattern (all_files, pattern, anchor=0)
                     if not files:
                         template.warn (("no files found matching '%s' " +
                                         "anywhere in distribution") %
@@ -403,9 +406,9 @@ def read_template (self):
                         self.files.extend (files)
 
             elif action == 'global-exclude':
-                print "global-exclude", string.join(pattern_list)
+                self.debug_print("global-exclude " + string.join(pattern_list))
                 for pattern in pattern_list:
-                    num = exclude_pattern (self.files, pattern, anchor=0)
+                    num = self.exclude_pattern (self.files, pattern, anchor=0)
                     if num == 0:
                         template.warn \
                             (("no previously-included files matching '%s' " +
@@ -413,9 +416,11 @@ def read_template (self):
                              pattern)
 
             elif action == 'recursive-include':
-                print "recursive-include", dir, string.join(pattern_list)
+                self.debug_print("recursive-include %s %s" %
+                                 (dir, string.join(pattern_list)))
                 for pattern in pattern_list:
-                    files = select_pattern (all_files, pattern, prefix=dir)
+                    files = self.select_pattern (
+                        all_files, pattern, prefix=dir)
                     if not files:
                         template.warn (("no files found matching '%s' " +
                                         "under directory '%s'") %
@@ -424,9 +429,11 @@ def read_template (self):
                         self.files.extend (files)
 
             elif action == 'recursive-exclude':
-                print "recursive-exclude", dir, string.join(pattern_list)
+                self.debug_print("recursive-exclude %s %s" %
+                                 (dir, string.join(pattern_list)))
                 for pattern in pattern_list:
-                    num = exclude_pattern (self.files, pattern, prefix=dir)
+                    num = self.exclude_pattern(
+                        self.files, pattern, prefix=dir)
                     if num == 0:
                         template.warn \
                             (("no previously-included files matching '%s' " +
@@ -434,8 +441,9 @@ def read_template (self):
                              (pattern, dir))
 
             elif action == 'graft':
-                print "graft", dir_pattern
-                files = select_pattern (all_files, None, prefix=dir_pattern)
+                self.debug_print("graft " + dir_pattern)
+                files = self.select_pattern(
+                    all_files, None, prefix=dir_pattern)
                 if not files:
                     template.warn ("no directories found matching '%s'" %
                                    dir_pattern)
@@ -443,8 +451,9 @@ def read_template (self):
                     self.files.extend (files)
 
             elif action == 'prune':
-                print "prune", dir_pattern
-                num = exclude_pattern (self.files, None, prefix=dir_pattern)
+                self.debug_print("prune " + dir_pattern)
+                num = self.exclude_pattern(
+                    self.files, None, prefix=dir_pattern)
                 if num == 0:
                     template.warn \
                         (("no previously-included directories found " +
@@ -458,14 +467,63 @@ def read_template (self):
 
         # Prune away the build and source distribution directories
         build = self.get_finalized_command ('build')
-        exclude_pattern (self.files, None, prefix=build.build_base)
+        self.exclude_pattern (self.files, None, prefix=build.build_base)
 
         base_dir = self.distribution.get_fullname()
-        exclude_pattern (self.files, None, prefix=base_dir)
+        self.exclude_pattern (self.files, None, prefix=base_dir)
 
     # read_template ()
 
 
+    def select_pattern (self, files, pattern, anchor=1, prefix=None):
+        """Select strings (presumably filenames) from 'files' that match
+        'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
+        quite the same as implemented by the 'fnmatch' module: '*' and '?'
+        match non-special characters, where "special" is platform-dependent:
+        slash on Unix, colon, slash, and backslash on DOS/Windows, and colon on
+        Mac OS.
+
+        If 'anchor' is true (the default), then the pattern match is more
+        stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
+        'anchor' is false, both of these will match.
+
+        If 'prefix' is supplied, then only filenames starting with 'prefix'
+        (itself a pattern) and ending with 'pattern', with anything in between
+        them, will match.  'anchor' is ignored in this case.
+
+        Return the list of matching strings, possibly empty.
+        """
+        matches = []
+        pattern_re = translate_pattern (pattern, anchor, prefix)
+        self.debug_print("select_pattern: applying regex r'%s'" %
+                         pattern_re.pattern)
+        for name in files:
+            if pattern_re.search (name):
+                matches.append (name)
+                self.debug_print(" adding " + name)
+
+        return matches
+
+    # select_pattern ()
+
+
+    def exclude_pattern (self, files, pattern, anchor=1, prefix=None):
+        """Remove strings (presumably filenames) from 'files' that match
+        'pattern'.  'pattern', 'anchor', 'and 'prefix' are the same
+        as for 'select_pattern()', above.  The list 'files' is modified
+        in place.
+        """
+        pattern_re = translate_pattern (pattern, anchor, prefix)
+        self.debug_print("exclude_pattern: applying regex r'%s'" %
+                         pattern_re.pattern)
+        for i in range (len(files)-1, -1, -1):
+            if pattern_re.search (files[i]):
+                self.debug_print(" removing " + files[i])
+                del files[i]
+
+    # exclude_pattern ()
+
+
     def write_manifest (self):
         """Write the file list in 'self.files' (presumably as filled in
            by 'find_defaults()' and 'read_template()') to the manifest file
@@ -473,7 +531,7 @@ def write_manifest (self):
 
         self.execute(write_file,
                      (self.manifest, self.files),
-                     "writing manifest file")
+                     "writing manifest file '%s'" % self.manifest)
 
     # write_manifest ()
 
@@ -483,6 +541,7 @@ def read_manifest (self):
            it to fill in 'self.files', the list of files to include
            in the source distribution."""
 
+        self.announce("reading manifest file '%s'" % self.manifest)
         manifest = open (self.manifest)
         while 1:
             line = manifest.readline ()
@@ -495,7 +554,6 @@ def read_manifest (self):
     # read_manifest ()
             
 
-
     def make_release_tree (self, base_dir, files):
 
         # Create all the directories under 'base_dir' necessary to
@@ -533,7 +591,7 @@ def make_distribution (self):
 
         # Remove any files that match "base_dir" from the fileset -- we
         # don't want to go distributing the distribution inside itself!
-        self.exclude_pattern (base_dir + "*")
+        self.exclude_pattern (self.files, base_dir + "*")
  
         self.make_release_tree (base_dir, self.files)
         archive_files = []              # remember names of files we create
@@ -583,49 +641,6 @@ def findall (dir = os.curdir):
     return list
 
 
-def select_pattern (files, pattern, anchor=1, prefix=None):
-    """Select strings (presumably filenames) from 'files' that match
-       'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
-       quite the same as implemented by the 'fnmatch' module: '*' and '?'
-       match non-special characters, where "special" is platform-dependent:
-       slash on Unix, colon, slash, and backslash on DOS/Windows, and colon
-       on Mac OS.
-
-       If 'anchor' is true (the default), then the pattern match is more
-       stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
-       'anchor' is false, both of these will match.
-
-       If 'prefix' is supplied, then only filenames starting with 'prefix'
-       (itself a pattern) and ending with 'pattern', with anything in
-       between them, will match.  'anchor' is ignored in this case.
-
-       Return the list of matching strings, possibly empty."""
-
-    matches = []
-    pattern_re = translate_pattern (pattern, anchor, prefix)
-    print "select_pattern: applying re %s" % pattern_re.pattern
-    for name in files:
-        if pattern_re.search (name):
-            matches.append (name)
-            print " adding", name
-
-    return matches
-
-# select_pattern ()
-
-
-def exclude_pattern (files, pattern, anchor=1, prefix=None):
-
-    pattern_re = translate_pattern (pattern, anchor, prefix)
-    print "exclude_pattern: applying re %s" % pattern_re.pattern
-    for i in range (len(files)-1, -1, -1):
-        if pattern_re.search (files[i]):
-            print " removing", files[i]
-            del files[i]
-
-# exclude_pattern ()
-
-
 def glob_to_re (pattern):
     """Translate a shell-like glob pattern to a regular expression;
        return a string containing the regex.  Differs from

From 0a3e5710675c4013d56a4f72ecccdc230282ec00 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:14:18 +0000
Subject: [PATCH 0431/8469] Cosmetic tweaks to imports, the 'show_formats()'
 function, and the 'help_options' list; also added an editorial comment.

---
 command/sdist.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index b06c515656..eabf5c7936 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -11,9 +11,9 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import newer, create_tree, remove_tree, convert_path, \
-     write_file
-from distutils.archive_util import check_archive_formats,ARCHIVE_FORMATS
+from distutils.util import \
+     convert_path, create_tree, remove_tree, newer, write_file, \
+     check_archive_formats, ARCHIVE_FORMATS
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError, DistutilsOptionError
 
@@ -40,19 +40,27 @@ class sdist (Command):
          "keep the distribution tree around after creating " +
          "archive file(s)"),
         ]
-    # prints all possible arguments to --formats
-    def show_formats():
+
+
+    # XXX ugh: this has to precede the 'help_options' list, because
+    # it is mentioned there -- also, this is not a method, even though
+    # it's defined in a class: double-ugh!
+    def show_formats ():
+        """Print all possible values for the 'formats' option -- used by
+        the "--help-formats" command-line option.
+        """
 	from distutils.fancy_getopt import FancyGetopt 
-	list_of_formats=[]
+	formats=[]
 	for format in ARCHIVE_FORMATS.keys():
-	    list_of_formats.append(("formats="+format,None,ARCHIVE_FORMATS[format][2]))
-	list_of_formats.sort()
-	pretty_printer=FancyGetopt(list_of_formats)
-	pretty_printer.print_help("List of available distribution formats:")
+	    formats.append(("formats="+format,None,ARCHIVE_FORMATS[format][2]))
+	formats.sort()
+	pretty_printer = FancyGetopt(formats)
+	pretty_printer.print_help(
+            "List of available source distribution formats:")
 
     help_options = [
         ('help-formats', None,
-         "lists available distribution formats",show_formats),
+         "lists available distribution formats", show_formats),
 	]
 
     negative_opts = {'use-defaults': 'no-defaults'}

From 3acc171c28a904839b263f8a6cbb617c9894d184 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:24:01 +0000
Subject: [PATCH 0432/8469] Docstring reformatting binge.

---
 command/sdist.py | 51 ++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index eabf5c7936..cd7f258b53 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -68,8 +68,6 @@ def show_formats ():
     default_format = { 'posix': 'gztar',
                        'nt': 'zip' }
 
-    exclude_re = re.compile (r'\s*!\s*(\S+)') # for manifest lines
-
 
     def initialize_options (self):
         # 'template' and 'manifest' are, respectively, the names of
@@ -165,13 +163,11 @@ def check_metadata (self):
 
     def get_file_list (self):
         """Figure out the list of files to include in the source
-           distribution, and put it in 'self.files'.  This might
-           involve reading the manifest template (and writing the
-           manifest), or just reading the manifest, or just using
-           the default file set -- it all depends on the user's
-           options and the state of the filesystem."""
-
-
+        distribution, and put it in 'self.files'.  This might involve
+        reading the manifest template (and writing the manifest), or just
+        reading the manifest, or just using the default file set -- it all
+        depends on the user's options and the state of the filesystem.
+        """
         template_exists = os.path.isfile (self.template)
         if template_exists:
             template_newer = newer (self.template, self.manifest)
@@ -261,10 +257,9 @@ def find_defaults (self):
 
     def search_dir (self, dir, pattern=None):
         """Recursively find files under 'dir' matching 'pattern' (a string
-           containing a Unix-style glob pattern).  If 'pattern' is None,
-           find all files under 'dir'.  Return the list of found
-           filenames."""
-
+        containing a Unix-style glob pattern).  If 'pattern' is None, find
+        all files under 'dir'.  Return the list of found filenames.
+        """
         allfiles = findall (dir)
         if pattern is None:
             return allfiles
@@ -291,9 +286,9 @@ def search_dir (self, dir, pattern=None):
 
 
     def recursive_exclude_pattern (self, dir, pattern=None):
-        """Remove filenames from 'self.files' that are under 'dir'
-           and whose basenames match 'pattern'."""
-
+        """Remove filenames from 'self.files' that are under 'dir' and
+        whose basenames match 'pattern'.
+        """
         self.debug_print("recursive_exclude_pattern: dir=%s, pattern=%s" %
                          (dir, pattern))
         if pattern is None:
@@ -311,10 +306,10 @@ def recursive_exclude_pattern (self, dir, pattern=None):
 
     def read_template (self):
         """Read and parse the manifest template file named by
-           'self.template' (usually "MANIFEST.in").  Process all file
-           specifications (include and exclude) in the manifest template
-           and add the resulting filenames to 'self.files'."""
-
+        'self.template' (usually "MANIFEST.in").  Process all file
+        specifications (include and exclude) in the manifest template and
+        add the resulting filenames to 'self.files'.
+        """
         assert self.files is not None and type (self.files) is ListType
         self.announce("reading manifest template '%s'" % self.template)
 
@@ -533,10 +528,10 @@ def exclude_pattern (self, files, pattern, anchor=1, prefix=None):
 
 
     def write_manifest (self):
-        """Write the file list in 'self.files' (presumably as filled in
-           by 'find_defaults()' and 'read_template()') to the manifest file
-           named by 'self.manifest'."""
-
+        """Write the file list in 'self.files' (presumably as filled in by
+        'find_defaults()' and 'read_template()') to the manifest file named
+        by 'self.manifest'.
+        """
         self.execute(write_file,
                      (self.manifest, self.files),
                      "writing manifest file '%s'" % self.manifest)
@@ -545,10 +540,10 @@ def write_manifest (self):
 
 
     def read_manifest (self):
-        """Read the manifest file (named by 'self.manifest') and use
-           it to fill in 'self.files', the list of files to include
-           in the source distribution."""
-
+        """Read the manifest file (named by 'self.manifest') and use it to
+        fill in 'self.files', the list of files to include in the source
+        distribution.
+        """
         self.announce("reading manifest file '%s'" % self.manifest)
         manifest = open (self.manifest)
         while 1:

From 74f4d48df9b4e3afe675b6fe446c6d4ad1dee325 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:35:33 +0000
Subject: [PATCH 0433/8469] Fixed so we print more than just the first line of
 help for options with a short form and text that wraps onto multiple lines.

---
 fancy_getopt.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index a593354c9d..6adfc819c2 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -369,9 +369,6 @@ def generate_help (self, header=None):
                 else:
                     lines.append ("  --%-*s  " % (max_opt, long))
 
-                for l in text[1:]:
-                    lines.append (big_indent + l)
-
             # Case 2: we have a short option, so we have to include it
             # just after the long option
             else:
@@ -382,6 +379,9 @@ def generate_help (self, header=None):
                 else:
                     lines.append ("  --%-*s" % opt_names)
 
+            for l in text[1:]:
+                lines.append (big_indent + l)
+
         # for self.option_table
 
         return lines

From 691fce64def6c4aca873465234a5039c6a6c8480 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:46:45 +0000
Subject: [PATCH 0434/8469] Docstring addition binge.

---
 command/sdist.py | 59 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index cd7f258b53..2a4d346fff 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -31,7 +31,8 @@ class sdist (Command):
          "include the default file set in the manifest "
          "[default; disable with --no-defaults]"),
         ('manifest-only', 'o',
-         "just regenerate the manifest and then stop"),
+         "just regenerate the manifest and then stop "
+         "(implies --force-manifest)"),
         ('force-manifest', 'f',
          "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
@@ -133,7 +134,11 @@ def run (self):
 
 
     def check_metadata (self):
-
+        """Ensure that all required elements of meta-data (name, version,
+        URL, (author and author_email) or (maintainer and
+        maintainer_email)) are supplied by the Distribution object; warn if
+        any are missing.
+        """
         metadata = self.distribution.metadata
 
         missing = []
@@ -215,7 +220,16 @@ def get_file_list (self):
 
 
     def find_defaults (self):
-
+        """Add all the default files to self.files:
+          - README or README.txt
+          - setup.py
+          - test/test*.py
+          - all pure Python modules mentioned in setup script
+          - all C sources listed as part of extensions or C libraries
+            in the setup script (doesn't catch C headers!)
+        Warns if (README or README.txt) or setup.py are missing; everything
+        else is optional.
+        """
         standards = [('README', 'README.txt'), 'setup.py']
         for fn in standards:
             if type (fn) is TupleType:
@@ -308,7 +322,8 @@ def read_template (self):
         """Read and parse the manifest template file named by
         'self.template' (usually "MANIFEST.in").  Process all file
         specifications (include and exclude) in the manifest template and
-        add the resulting filenames to 'self.files'.
+        update 'self.files' accordingly (filenames may be added to
+        or removed from 'self.files' based on the manifest template).
         """
         assert self.files is not None and type (self.files) is ListType
         self.announce("reading manifest template '%s'" % self.template)
@@ -558,7 +573,14 @@ def read_manifest (self):
             
 
     def make_release_tree (self, base_dir, files):
-
+        """Create the directory tree that will become the source
+        distribution archive.  All directories implied by the filenames in
+        'files' are created under 'base_dir', and then we hard link or copy
+        (if hard linking is unavailable) those files into place.
+        Essentially, this duplicates the developer's source tree, but in a
+        directory named after the distribution, containing only the files
+        to be distributed.
+        """
         # Create all the directories under 'base_dir' necessary to
         # put 'files' there.
         create_tree (base_dir, files,
@@ -587,7 +609,13 @@ def make_release_tree (self, base_dir, files):
 
 
     def make_distribution (self):
-
+        """Create the source distribution(s).  First, we create the release
+        tree with 'make_release_tree()'; then, we create all required
+        archive files (according to 'self.formats') from the release tree.
+        Finally, we clean up by blowing away the release tree (unless
+        'self.keep_tree' is true).  The list of archive files created is
+        stored so it can be retrieved later by 'get_archive_files()'.
+        """
         # Don't warn about missing meta-data here -- should be (and is!)
         # done elsewhere.
         base_dir = self.distribution.get_fullname()
@@ -620,9 +648,9 @@ def get_archive_files (self):
 # Utility functions
 
 def findall (dir = os.curdir):
-    """Find all files under 'dir' and return the list of full
-       filenames (relative to 'dir')."""
-
+    """Find all files under 'dir' and return the list of full filenames
+    (relative to 'dir').
+    """
     list = []
     stack = [dir]
     pop = stack.pop
@@ -645,10 +673,11 @@ def findall (dir = os.curdir):
 
 
 def glob_to_re (pattern):
-    """Translate a shell-like glob pattern to a regular expression;
-       return a string containing the regex.  Differs from
-       'fnmatch.translate()' in that '*' does not match "special
-       characters" (which are platform-specific)."""
+    """Translate a shell-like glob pattern to a regular expression; return
+    a string containing the regex.  Differs from 'fnmatch.translate()' in
+    that '*' does not match "special characters" (which are
+    platform-specific).
+    """
     pattern_re = fnmatch.translate (pattern)
 
     # '?' and '*' in the glob pattern become '.' and '.*' in the RE, which
@@ -666,8 +695,8 @@ def glob_to_re (pattern):
 
 def translate_pattern (pattern, anchor=1, prefix=None):
     """Translate a shell-like wildcard pattern to a compiled regular
-       expression.    Return the compiled regex."""
-
+    expression.  Return the compiled regex.
+    """
     if pattern:
         pattern_re = glob_to_re (pattern)
     else:

From 99ddd15c2fca235eaf905472d648564831458a89 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 00:52:52 +0000
Subject: [PATCH 0435/8469] Renamed 'find_defaults()' to 'add_defaults()'.
 Deleted old, commented-out 'exclude_pattern()' method.

---
 command/sdist.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 2a4d346fff..26241353ac 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -189,7 +189,7 @@ def get_file_list (self):
 
             # Add default file set to 'files'
             if self.use_defaults:
-                self.find_defaults ()
+                self.add_defaults ()
 
             # Read manifest template if it exists
             if template_exists:
@@ -219,7 +219,7 @@ def get_file_list (self):
     # get_file_list ()
 
 
-    def find_defaults (self):
+    def add_defaults (self):
         """Add all the default files to self.files:
           - README or README.txt
           - setup.py
@@ -268,6 +268,8 @@ def find_defaults (self):
             build_clib = self.get_finalized_command ('build_clib')
             self.files.extend (build_clib.get_source_files ())
 
+    # add_defaults ()
+    
 
     def search_dir (self, dir, pattern=None):
         """Recursively find files under 'dir' matching 'pattern' (a string
@@ -289,16 +291,6 @@ def search_dir (self, dir, pattern=None):
     # search_dir ()
 
 
-#     def exclude_pattern (self, pattern):
-#         """Remove filenames from 'self.files' that match 'pattern'."""
-#         self.debug_print("exclude_pattern: pattern=%s" % pattern)
-#         pattern_re = translate_pattern (pattern)
-#         for i in range (len (self.files)-1, -1, -1):
-#             if pattern_re.match (self.files[i]):
-#                 self.debug_print("removing %s" % self.files[i])
-#                 del self.files[i]
-
-
     def recursive_exclude_pattern (self, dir, pattern=None):
         """Remove filenames from 'self.files' that are under 'dir' and
         whose basenames match 'pattern'.
@@ -544,7 +536,7 @@ def exclude_pattern (self, files, pattern, anchor=1, prefix=None):
 
     def write_manifest (self):
         """Write the file list in 'self.files' (presumably as filled in by
-        'find_defaults()' and 'read_template()') to the manifest file named
+        'add_defaults()' and 'read_template()') to the manifest file named
         by 'self.manifest'.
         """
         self.execute(write_file,

From 5f4a8d08d7029e5d4e199ddb50ca40743d836c2d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 01:06:02 +0000
Subject: [PATCH 0436/8469] Moved the code that prunes the file list after
 reading the manifest   template into a new method 'prune_file_list()', called
 from   'get_file_list()' rather than 'read_manifest()' -- this keeps  
 'read_manifest()' more general. Deleted the redundant call to
 'exclude_pattern()' in 'make_distribution()'   -- this had the same intention
 as 'prune_file_list()', but was incomplete   (only pruned the release tree,
 not the build tree) and in the wrong   place (the prune wouldn't be reflected
 in the manifest file).

---
 command/sdist.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 26241353ac..5a78cc58d2 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -195,6 +195,9 @@ def get_file_list (self):
             if template_exists:
                 self.read_template ()
 
+            # Prune away the build and source distribution directories
+            self.prune_file_list()
+
             # File list now complete -- sort it so that higher-level files
             # come first
             sortable_files = map (os.path.split, self.files)
@@ -475,15 +478,21 @@ def read_template (self):
 
         # while loop over lines of template file
 
-        # Prune away the build and source distribution directories
-        build = self.get_finalized_command ('build')
-        self.exclude_pattern (self.files, None, prefix=build.build_base)
+    # read_template ()
+
 
+    def prune_file_list (self):
+        """Prune off branches that might slip into the file list as created
+        by 'read_template()', but really don't belong there: specifically,
+        the build tree (typically "build") and the release tree itself
+        (only an issue if we ran "sdist" previously with --keep-tree, or it
+        aborted).
+        """
+        build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
+        self.exclude_pattern (self.files, None, prefix=build.build_base)
         self.exclude_pattern (self.files, None, prefix=base_dir)
 
-    # read_template ()
-
 
     def select_pattern (self, files, pattern, anchor=1, prefix=None):
         """Select strings (presumably filenames) from 'files' that match
@@ -612,10 +621,6 @@ def make_distribution (self):
         # done elsewhere.
         base_dir = self.distribution.get_fullname()
 
-        # Remove any files that match "base_dir" from the fileset -- we
-        # don't want to go distributing the distribution inside itself!
-        self.exclude_pattern (self.files, base_dir + "*")
- 
         self.make_release_tree (base_dir, self.files)
         archive_files = []              # remember names of files we create
         for fmt in self.formats:

From 1e78c7432ebfb62f570e7c380f0011ac4eb37e58 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 01:22:48 +0000
Subject: [PATCH 0437/8469] Include setup.cfg in the list of default files to
 distribute.

---
 command/sdist.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 5a78cc58d2..48e9793e5e 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -233,6 +233,10 @@ def add_defaults (self):
         Warns if (README or README.txt) or setup.py are missing; everything
         else is optional.
         """
+
+        # XXX name of setup script and config file should be taken
+        # programmatically from the Distribution object (except
+        # it doesn't have that capability... yet!)
         standards = [('README', 'README.txt'), 'setup.py']
         for fn in standards:
             if type (fn) is TupleType:
@@ -253,7 +257,7 @@ def add_defaults (self):
                 else:
                     self.warn ("standard file '%s' not found" % fn)
 
-        optional = ['test/test*.py']
+        optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
             files = filter (os.path.isfile, glob (pattern))
             if files:

From 4ea6b39b83cf4405bad1110e81ad7cd240fbecfe Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 8 Jun 2000 14:21:23 +0000
Subject: [PATCH 0438/8469] Harry Henry Gebel: fix '_format_changelog()' so it
 doesn't bomb if passed None.

---
 command/bdist_rpm.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 0959ad8f90..7f58a1da6b 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -436,6 +436,8 @@ def _make_spec_file(self):
     def _format_changelog(self, changelog):
         """Format the changelog correctly and convert it to a list of strings
         """
+        if not changelog:
+            return changelog
         new_changelog = []
         for line in string.split(string.strip(changelog), '\n'):
             line = string.strip(line)

From 524777aabcda3e1fafe2ce35eed3df0ac2be07ef Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 01:34:45 +0000
Subject: [PATCH 0439/8469] Fixed install directory for header files on Unix.

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 7176fab890..21d971b8d3 100644
--- a/command/install.py
+++ b/command/install.py
@@ -18,7 +18,7 @@
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
         'platlib': '$platbase/lib/python$py_version_short/site-packages',
-        'headers': '$base/include/python/$py_version_short/$dist_name',
+        'headers': '$base/include/python$py_version_short/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base/share',
         },

From 1f24f7dc91a4145dafa4e7678bd50f47822730b5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 01:58:14 +0000
Subject: [PATCH 0440/8469] Bastian Kleineidam: added 'remove_tree()' function.
  Needed so that 'remove_tree()' can cooperate with 'mkpath()' in the
 maintenance of the PATH_CREATED cache: specifically, if a directory is
 created with 'mkpath()', later removed with 'remove_tree()', and 'mkpath()'
 is again requested to create it, then it would erroneously think the
 directory already existed, because it was in the PATH_CREATED cache.  The
 patch (slightly tweaked by me) fixes that.

---
 dir_util.py | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 194183ae25..e5b24fe475 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -180,23 +180,38 @@ def copy_tree (src, dst,
 
 # copy_tree ()
 
+# Helper for remove_tree()
+def _build_cmdtuple(path, cmdtuples):
+    for f in os.listdir(path):
+        real_f = os.path.join(path,f)
+        if os.path.isdir(real_f) and not os.path.islink(real_f):
+            _build_cmdtuple(real_f, cmdtuples)
+        else:
+            cmdtuples.append((os.remove, real_f))
+    cmdtuples.append((os.rmdir, path))
+
 
 def remove_tree (directory, verbose=0, dry_run=0):
     """Recursively remove an entire directory tree.  Any errors are ignored
        (apart from being reported to stdout if 'verbose' is true)."""
 
-    from shutil import rmtree
-
+    global PATH_CREATED
     if verbose:
         print "removing '%s' (and everything under it)" % directory
     if dry_run:
         return
-    try:
-        rmtree(directory,1)
-    except (IOError, OSError), exc:
-        if verbose:
-            if exc.filename:
-                print "error removing %s: %s (%s)" % \
+    cmdtuples = []
+    _build_cmdtuple(directory, cmdtuples)
+    for cmd in cmdtuples:
+        try:
+            apply(cmd[0], (cmd[1],))
+            # remove dir from cache if it's already there
+            if PATH_CREATED.has_key(cmd[1]):
+                del PATH_CREATED[cmd[1]]
+        except (IOError, OSError), exc:
+            if verbose:
+                if exc.filename:
+                    print "error removing %s: %s (%s)" % \
                        (directory, exc.strerror, exc.filename)
-            else:
-                print "error removing %s: %s" % (directory, exc.strerror)
+                else:
+                    print "error removing %s: %s" % (directory, exc.strerror)

From c5c7d04269747c746f02bfaec075f2710e7cd309 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 02:16:46 +0000
Subject: [PATCH 0441/8469] Added 'grok_environment_error()' function to deal
 with the various forms that IOError and OSError can take (taken from
 core.py).

---
 util.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/util.py b/util.py
index 575463843b..279f246726 100644
--- a/util.py
+++ b/util.py
@@ -154,3 +154,23 @@ def _subst (match, local_vars=local_vars):
 # subst_vars ()
 
 
+def grok_environment_error (exc, prefix="error: "):
+    """Generate a useful error message from an EnvironmentError (IOError or
+    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
+    does what it can to deal with exception objects that don't have a
+    filename (which happens when the error is due to a two-file operation,
+    such as 'rename()' or 'link()'.  Returns the error message as a string
+    prefixed with 'prefix'.
+    """
+    # check for Python 1.5.2-style {IO,OS}Error exception objects
+    if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
+        if exc.filename:
+            error = prefix + "%s: %s" % (exc.filename, exc.strerror)
+        else:
+            # two-argument functions in posix module don't
+            # include the filename in the exception object!
+            error = prefix + "%s" % exc.strerror
+    else:
+        error = prefix + str(exc[-1])
+
+    return error

From f0ceb6e0a9eda6011c72bf4b0e3c7ed52eddd271 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 02:17:45 +0000
Subject: [PATCH 0442/8469] Changed to use the new 'grok_environment_error()'
 function instead of muddling through IOError and OSError exception objects
 right here.

---
 core.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/core.py b/core.py
index 8bcf2a87d6..35afa84b7e 100644
--- a/core.py
+++ b/core.py
@@ -112,16 +112,7 @@ class found in 'cmdclass' is used in place of the default, which is
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
         except (IOError, os.error), exc:
-            # check for Python 1.5.2-style {IO,OS}Error exception objects
-            if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
-                if exc.filename:
-                    error = "error: %s: %s" % (exc.filename, exc.strerror)
-                else:
-                    # two-argument functions in posix module don't
-                    # include the filename in the exception object!
-                    error = "error: %s" % exc.strerror
-            else:
-                error = "error: " + str(exc[-1])
+            error = grok_environment_error(exc)
 
             if DEBUG:
                 sys.stderr.write(error + "\n")

From 3b27bed6ec2871c31925d0f22bfbb8203dc81a5c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 02:18:19 +0000
Subject: [PATCH 0443/8469] Changed 'remove_tree()' to use the new
 'grok_environment_error()' function instead of muddling through IOError and
 OSError exception objects itself.

---
 dir_util.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index e5b24fe475..838a870d9b 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -193,9 +193,11 @@ def _build_cmdtuple(path, cmdtuples):
 
 def remove_tree (directory, verbose=0, dry_run=0):
     """Recursively remove an entire directory tree.  Any errors are ignored
-       (apart from being reported to stdout if 'verbose' is true)."""
-
+    (apart from being reported to stdout if 'verbose' is true).
+    """
+    from distutils.util import grok_environment_error
     global PATH_CREATED
+
     if verbose:
         print "removing '%s' (and everything under it)" % directory
     if dry_run:
@@ -210,8 +212,5 @@ def remove_tree (directory, verbose=0, dry_run=0):
                 del PATH_CREATED[cmd[1]]
         except (IOError, OSError), exc:
             if verbose:
-                if exc.filename:
-                    print "error removing %s: %s (%s)" % \
-                       (directory, exc.strerror, exc.filename)
-                else:
-                    print "error removing %s: %s" % (directory, exc.strerror)
+                print grok_environment_error(
+                    exc, "error removing %s: " % directory)

From dab81b6a1e465fdc70dc1051a6bb4b9440737555 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 02:19:30 +0000
Subject: [PATCH 0444/8469] Renamed PATH_CREATED to _path_created, on the
 grounds that it's private and mutable, rather than public and constant.

---
 dir_util.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 838a870d9b..85f8a18d2c 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -13,7 +13,7 @@
 
 # cache for by mkpath() -- in addition to cheapening redundant calls,
 # eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
-PATH_CREATED = {}
+_path_created = {}
 
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
@@ -28,7 +28,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
        summary of each mkdir to stdout.  Return the list of directories
        actually created."""
 
-    global PATH_CREATED
+    global _path_created
 
     # Detect a common bug -- name is None
     if type(name) is not StringType:
@@ -44,7 +44,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     created_dirs = []
     if os.path.isdir (name) or name == '':
         return created_dirs
-    if PATH_CREATED.get (name):
+    if _path_created.get (name):
         return created_dirs
 
     (head, tail) = os.path.split (name)
@@ -64,7 +64,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     for d in tails:
         #print "head = %s, d = %s: " % (head, d),
         head = os.path.join (head, d)
-        if PATH_CREATED.get (head):
+        if _path_created.get (head):
             continue
 
         if verbose:
@@ -78,7 +78,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
                 raise DistutilsFileError, \
                       "could not create '%s': %s" % (head, exc[-1])
 
-        PATH_CREATED[head] = 1
+        _path_created[head] = 1
     return created_dirs
 
 # mkpath ()
@@ -196,7 +196,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
     (apart from being reported to stdout if 'verbose' is true).
     """
     from distutils.util import grok_environment_error
-    global PATH_CREATED
+    global _path_created
 
     if verbose:
         print "removing '%s' (and everything under it)" % directory
@@ -208,8 +208,8 @@ def remove_tree (directory, verbose=0, dry_run=0):
         try:
             apply(cmd[0], (cmd[1],))
             # remove dir from cache if it's already there
-            if PATH_CREATED.has_key(cmd[1]):
-                del PATH_CREATED[cmd[1]]
+            if _path_created.has_key(cmd[1]):
+                del _path_created[cmd[1]]
         except (IOError, OSError), exc:
             if verbose:
                 print grok_environment_error(

From 0e20e9c1fe3d9a35d483d251ef45a9675a7b36d0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 17 Jun 2000 23:04:31 +0000
Subject: [PATCH 0445/8469] Pulled the MSVC++-specific hackery out to a new
 method, 'prelink_hook()', and added (empty) 'precompile_hook()' for symmetry.
  One can envision a much more elaborate hook mechanism, but this looks like
 it'll do for now.

---
 command/build_ext.py | 99 ++++++++++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 36 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 53a265cc2e..3d6d17c8d8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -160,7 +160,7 @@ def run (self):
 
         # 'self.extensions', as supplied by setup.py, is a list of
         # Extension instances.  See the documentation for Extension (in
-        # distutils.core) for details.
+        # distutils.extension) for details.
         # 
         # For backwards compatibility with Distutils 0.8.2 and earlier, we
         # also allow the 'extensions' list to be a list of tuples:
@@ -395,6 +395,11 @@ def build_extensions (self):
             if os.environ.has_key('CFLAGS'):
                 extra_args.extend(string.split(os.environ['CFLAGS']))
                 
+            # Run any platform/compiler-specific hooks needed before
+            # compiling (currently none, but any hypothetical subclasses
+            # might find it useful to override this).
+            self.precompile_hook()
+
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
                                              #macros=macros,
@@ -409,41 +414,9 @@ def build_extensions (self):
                 objects.extend (ext.extra_objects)
             extra_args = ext.extra_link_args
 
-            # XXX this is a kludge!  Knowledge of specific compilers or
-            # platforms really doesn't belong here; in an ideal world, the
-            # CCompiler interface would provide access to everything in a
-            # compiler/linker system needs to build Python extensions, and
-            # we would just do everything nicely and cleanly through that
-            # interface.  However, this is a not an ideal world and the
-            # CCompiler interface doesn't handle absolutely everything.
-            # Thus, kludges like this slip in occasionally.  (This is no
-            # excuse for committing more platform- and compiler-specific
-            # kludges; they are to be avoided if possible!)
-            if self.compiler.compiler_type == 'msvc':
-                def_file = ext.export_symbol_file
-                if def_file is None:
-                    source_dir = os.path.dirname (sources[0])
-                    ext_base = (string.split (ext.name, '.'))[-1]
-                    def_file = os.path.join (source_dir, "%s.def" % ext_base)
-                    if not os.path.exists (def_file):
-                        def_file = None
-
-                if def_file is not None:
-                    extra_args.append ('/DEF:' + def_file)
-                else:
-                    modname = string.split (ext.name, '.')[-1]
-                    extra_args.append('/export:init%s'%modname)
-
-                # The MSVC linker generates unneeded .lib and .exp files,
-                # which cannot be suppressed by any linker switches.  So
-                # make sure they are generated in the temporary build
-                # directory.
-                implib_file = os.path.join (
-                    self.build_temp,
-                    self.get_ext_libname (ext.name))
-                extra_args.append ('/IMPLIB:' + implib_file)
-                self.mkpath (os.path.dirname (implib_file))
-            # if MSVC
+            # Run any platform/compiler-specific hooks needed between
+            # compiling and linking (currently needed only on Windows).
+            self.prelink_hook()
 
             self.compiler.link_shared_object (
                 objects, ext_filename, 
@@ -456,6 +429,55 @@ def build_extensions (self):
     # build_extensions ()
 
 
+    # -- Hooks ---------------------------------------------------------
+
+    def precompile_hook (self):
+        pass
+
+    def prelink_hook (self):
+
+        # XXX this is a kludge!  Knowledge of specific compilers or
+        # platforms really doesn't belong here; in an ideal world, the
+        # CCompiler interface would provide access to everything in a
+        # compiler/linker system needs to build Python extensions, and
+        # we would just do everything nicely and cleanly through that
+        # interface.  However, this is a not an ideal world and the
+        # CCompiler interface doesn't handle absolutely everything.
+        # Thus, kludges like this slip in occasionally.  (This is no
+        # excuse for committing more platform- and compiler-specific
+        # kludges; they are to be avoided if possible!)
+        if self.compiler.compiler_type == 'msvc':
+            def_file = ext.export_symbol_file
+            if def_file is None:
+                source_dir = os.path.dirname (sources[0])
+                ext_base = (string.split (ext.name, '.'))[-1]
+                def_file = os.path.join (source_dir, "%s.def" % ext_base)
+                if not os.path.exists (def_file):
+                    def_file = None
+
+            if def_file is not None:
+                extra_args.append ('/DEF:' + def_file)
+            else:
+                modname = string.split (ext.name, '.')[-1]
+                extra_args.append('/export:init%s'%modname)
+
+            # The MSVC linker generates unneeded .lib and .exp files,
+            # which cannot be suppressed by any linker switches.  So
+            # make sure they are generated in the temporary build
+            # directory.
+            implib_file = os.path.join (
+                self.build_temp,
+                self.get_ext_libname (ext.name))
+            extra_args.append ('/IMPLIB:' + implib_file)
+            self.mkpath (os.path.dirname (implib_file))
+        # if MSVC
+
+    # prelink_hook ()
+
+
+    # -- Name generators -----------------------------------------------
+    # (extension names, filenames, whatever)
+
     def get_ext_fullname (self, ext_name):
         if self.package is None:
             return ext_name
@@ -463,6 +485,11 @@ def get_ext_fullname (self, ext_name):
             return self.package + '.' + ext_name
 
     def get_ext_filename (self, ext_name):
+        """Convert the name of an extension (eg. "foo.bar") into the name
+        of the file from which it will be loaded (eg. "foo/bar.so", or
+        "foo\bar.pyd").
+        """
+
         from distutils import sysconfig
         ext_path = string.split (ext_name, '.')
         # extensions in debug_mode are named 'module_d.pyd' under windows

From 895819ab90dd0a4851f356f2153b68f4e2888b9d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 18 Jun 2000 15:45:55 +0000
Subject: [PATCH 0446/8469] 'get_platform()' now just returns 'sys.platform' on
 all platforms.

---
 util.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/util.py b/util.py
index 279f246726..74df8aa6a4 100644
--- a/util.py
+++ b/util.py
@@ -44,18 +44,10 @@ def extend (list, new_list):
 
 def get_platform ():
     """Return a string (suitable for tacking onto directory names) that
-       identifies the current platform.  Under Unix, identifies both the OS
-       and hardware architecture, e.g. "linux-i586", "solaris-sparc",
-       "irix-mips".  For Windows and Mac OS, just returns 'sys.platform' --
-       i.e. "???" or "???"."""
-
-    if os.name == 'posix':
-        (OS, _, rel, _, arch) = os.uname()
-        return "%s%c-%s" % (string.lower (OS), rel[0], string.lower (arch))
-    else:
-        return sys.platform
-
-# get_platform()
+    identifies the current platform.  Currently, this is just
+    'sys.platform'.
+    """
+    return sys.platform
 
 
 def convert_path (pathname):

From 2591d3a3e93d7f39325d7e0e707f9457c7a1631a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 02:58:46 +0000
Subject: [PATCH 0447/8469] Added 'preprocess()' method to CCompiler interface,
 and implemented it in UnixCCompiler.  Still needs to be implemented in
 MSVCCompiler (and whatever other compiler classes are lurking out there,
 waiting to be checked in).

---
 ccompiler.py     | 16 ++++++++++++++++
 unixccompiler.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index b146f89011..53d4fa5301 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -414,6 +414,22 @@ def _need_link (self, objects, output_file):
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
 
+    def preprocess (self,
+                    source,
+                    output_file=None,
+                    macros=None,
+                    include_dirs=None,
+                    extra_preargs=None,
+                    extra_postargs=None):
+        """Preprocess a single C/C++ source file, named in 'source'.
+        Output will be written to file named 'output_file', or stdout if
+        'output_file' not supplied.  'macros' is a list of macro
+        definitions as for 'compile()', which will augment the macros set
+        with 'define_macro()' and 'undefine_macro()'.  'include_dirs' is a
+        list of directory names that will be added to the default list.
+        """
+        pass
+
     def compile (self,
                  sources,
                  output_dir=None,
diff --git a/unixccompiler.py b/unixccompiler.py
index 4d38e4d8c1..47d8ad6325 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -21,6 +21,7 @@
 from types import *
 from copy import copy
 from distutils import sysconfig
+from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.errors import \
@@ -104,6 +105,37 @@ def __init__ (self,
     # __init__ ()
 
 
+    def preprocess (self,
+                    source,
+                    output_file=None,
+                    macros=None,
+                    include_dirs=None,
+                    extra_preargs=None,
+                    extra_postargs=None):
+
+        (_, macros, include_dirs) = \
+            self._fix_compile_args (None, macros, include_dirs)
+        pp_opts = gen_preprocess_options (macros, include_dirs)
+        cc_args = ['-E'] + pp_opts
+        if output_file:
+            cc_args.extend(['-o', output_file])
+        if extra_preargs:
+            cc_args[:0] = extra_preargs
+        if extra_postargs:
+            extra_postargs.extend(extra_postargs)
+
+        # We need to preprocess: either we're being forced to, or the
+        # source file is newer than the target (or the target doesn't
+        # exist).
+        if self.force or (output_file and newer(source, output_file)):
+            if output_file:
+                self.mkpath(os.path.dirname(output_file))
+            try:
+                self.spawn ([self.cc] + cc_args)
+            except DistutilsExecError, msg:
+                raise CompileError, msg
+
+
     def compile (self,
                  sources,
                  output_dir=None,

From 90843282f35eb7ff25172ea35d52d77e5135d56e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 02:59:14 +0000
Subject: [PATCH 0448/8469] Oops, import 'grok_environment_error()'.

---
 core.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core.py b/core.py
index 35afa84b7e..4c982a07ad 100644
--- a/core.py
+++ b/core.py
@@ -13,6 +13,7 @@
 import sys, os
 from types import *
 from distutils.errors import *
+from distutils.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution

From ebbf910d513041fe74deacf0244b1b79b2bad2f5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:00:50 +0000
Subject: [PATCH 0449/8469] Fleshed out and added a bunch of useful stuff,
 notably 'check_func()', 'try_cpp()', 'search_cpp()', and 'check_header()'. 
 This is enough that the base config is actually useful for implementing a
 real config command, specifically one for mxDateTime.

---
 command/config.py | 208 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 176 insertions(+), 32 deletions(-)

diff --git a/command/config.py b/command/config.py
index cad75bcb27..570f71a5c1 100644
--- a/command/config.py
+++ b/command/config.py
@@ -13,7 +13,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import sys, os, string, re
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 
@@ -40,6 +40,11 @@ class config (Command):
          "external C libraries to link with"),
         ('library-dirs=', 'L',
          "directories to search for external C libraries"),
+
+        ('noisy', None,
+         "show every action (compile, link, run, ...) taken"),
+        ('dump-source', None,
+         "dump generated source files before attempting to compile them"),
         ]
 
 
@@ -55,6 +60,14 @@ def initialize_options (self):
         self.libraries = None
         self.library_dirs = None
 
+        # maximal output for now
+        self.noisy = 1
+        self.dump_source = 1
+
+        # list of temporary files generated along-the-way that we have
+        # to clean at some point
+        self.temp_files = []
+
     def finalize_options (self):
         pass
 
@@ -75,7 +88,7 @@ def _check_compiler (self):
         from distutils.ccompiler import CCompiler, new_compiler
         if not isinstance(self.compiler, CCompiler):
             self.compiler = new_compiler (compiler=self.compiler,
-                                          verbose=self.verbose, # for now
+                                          verbose=self.noisy,
                                           dry_run=self.dry_run,
                                           force=1)
             if self.include_dirs:
@@ -86,25 +99,48 @@ def _check_compiler (self):
                 self.compiler.set_library_dirs(self.library_dirs)
 
 
-    def _gen_temp_sourcefile (self, body, lang):
+    def _gen_temp_sourcefile (self, body, headers, lang):
         filename = "_configtest" + LANG_EXT[lang]
         file = open(filename, "w")
+        if headers:
+            for header in headers:
+                file.write("#include <%s>\n" % header)
+            file.write("\n")
         file.write(body)
+        if body[-1] != "\n":
+            file.write("\n")
         file.close()
         return filename
 
-    def _compile (self, body, lang):
-        src = self._gen_temp_sourcefile(body, lang)
-        (obj,) = self.compiler.compile([src])
+    def _preprocess (self, body, headers, lang):
+        src = self._gen_temp_sourcefile(body, headers, lang)
+        out = "_configtest.i"
+        self.temp_files.extend([src, out])
+        self.compiler.preprocess(src, out)
+        return (src, out)
+
+    def _compile (self, body, headers, lang):
+        src = self._gen_temp_sourcefile(body, headers, lang)
+        if self.dump_source:
+            dump_file(src, "compiling '%s':" % src)
+        (obj,) = self.compiler.object_filenames([src])
+        self.temp_files.extend([src, obj])
+        self.compiler.compile([src])
         return (src, obj)
 
-    def _link (self, body, lang):
-        (src, obj) = self._compile(body, lang)
-        exe = os.path.splitext(os.path.basename(src))[0]
-        self.compiler.link_executable([obj], exe)
-        return (src, obj, exe)
+    def _link (self, body, headers, libraries, library_dirs, lang):
+        (src, obj) = self._compile(body, headers, lang)
+        prog = os.path.splitext(os.path.basename(src))[0] 
+        self.temp_files.append(prog)    # XXX should be prog + exe_ext
+        self.compiler.link_executable([obj], prog,
+                                      libraries=libraries,
+                                      library_dirs=library_dirs)
+        return (src, obj, prog)
 
     def _clean (self, *filenames):
+        if not filenames:
+            filenames = self.temp_files
+            self.temp_files = []
         self.announce("removing: " + string.join(filenames))
         for filename in filenames:
             try:
@@ -113,10 +149,6 @@ def _clean (self, *filenames):
                 pass
 
 
-    # XXX no 'try_cpp()' or 'search_cpp()' since the CCompiler interface
-    # does not provide access to the preprocessor.  This is an oversight
-    # that should be fixed.
-
     # XXX these ignore the dry-run flag: what to do, what to do? even if
     # you want a dry-run build, you still need some sort of configuration
     # info.  My inclination is to make it up to the real config command to
@@ -125,56 +157,168 @@ def _clean (self, *filenames):
     # return either true or false from all the 'try' methods, neither of
     # which is correct.
 
-    def try_compile (self, body, lang="c"):
-        """Try to compile a source file that consists of the text in 'body'
-        (a multi-line string).  Return true on success, false
-        otherwise.
+    # XXX need access to the header search path and maybe default macros.
+
+    def try_cpp (self, body=None, headers=None, lang="c"):
+        """Construct a source file from 'body' (a string containing lines
+        of C/C++ code) and 'headers' (a list of header files to include)
+        and run it through the preprocessor.  Return true if the
+        preprocessor succeeded, false if there were any errors.
+        ('body' probably isn't of much use, but what the heck.)
         """
         from distutils.ccompiler import CompileError
         self._check_compiler()
+        ok = 1
         try:
-            (src, obj) = self._compile(body, lang)
+            self._preprocess(body, headers, lang)
+        except CompileError:
+            ok = 0
+
+        self._clean()
+        return ok
+
+    def search_cpp (self, pattern, body=None, headers=None, lang="c"):
+        """Construct a source file (just like 'try_cpp()'), run it through
+        the preprocessor, and return true if any line of the output matches
+        'pattern'.  'pattern' should either be a compiled regex object or a
+        string containing a regex.  If both 'body' and 'headers' are None,
+        preprocesses an empty file -- which can be useful to determine the
+        symbols the preprocessor and compiler set by default.
+        """
+
+        self._check_compiler()
+        (src, out) = self._preprocess(body, headers, lang)
+
+        if type(pattern) is StringType:
+            pattern = re.compile(pattern)
+
+        file = open(out)
+        match = 0
+        while 1:
+            line = file.readline()
+            if line == '':
+                break
+            if pattern.search(pattern):
+                match = 1
+                break
+
+        file.close()
+        self._clean()
+        return match
+
+    def try_compile (self, body, headers=None, lang="c"):
+        """Try to compile a source file built from 'body' and 'headers'.
+        Return true on success, false otherwise.
+        """
+        from distutils.ccompiler import CompileError
+        self._check_compiler()
+        try:
+            self._compile(body, headers, lang)
             ok = 1
         except CompileError:
             ok = 0
 
         self.announce(ok and "success!" or "failure.")
-        self._clean(src, obj)
+        self._clean()
         return ok
 
-    def try_link (self, body, lang="c"):
-        """Try to compile and link a source file (to an executable) that
-        consists of the text in 'body' (a multi-line string).  Return true
-        on success, false otherwise.
+    def try_link (self,
+                  body, headers=None,
+                  libraries=None, library_dirs=None,
+                  lang="c"):
+        """Try to compile and link a source file, built from 'body' and
+        'headers', to executable form.  Return true on success, false
+        otherwise.
         """
         from distutils.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
-            (src, obj, exe) = self._link(body, lang)
+            self._link(body, headers, libraries, library_dirs, lang)
             ok = 1
         except (CompileError, LinkError):
             ok = 0
 
         self.announce(ok and "success!" or "failure.")
-        self._clean(src, obj, exe)
+        self._clean()
         return ok
             
-    def try_run (self, body, lang="c"):
-        """Try to compile, link to an executable, and run a program that
-        consists of the text in 'body'.  Return true on success, false
+    def try_run (self,
+                 body, headers=None, 
+                 libraries=None, library_dirs=None,
+                 lang="c"):
+        """Try to compile, link to an executable, and run a program
+        built from 'body' and 'headers'.  Return true on success, false
         otherwise.
         """
         from distutils.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
-            (src, obj, exe) = self._link(body, lang)
+            self._link(body, headers, libraries, library_dirs, lang)
             self.spawn([exe])
             ok = 1
         except (CompileError, LinkError, DistutilsExecError):
             ok = 0
 
         self.announce(ok and "success!" or "failure.")
-        self._clean(src, obj, exe)
+        self._clean()
         return ok
 
+
+    # -- High-level methods --------------------------------------------
+    # (these are the ones that are actually likely to be useful
+    # when implementing a real-world config command!)
+
+    def check_func (self, func, headers=None,
+                    libraries=None, library_dirs=None,
+                    decl=0, call=0):
+
+        """Determine if function 'func' is available by constructing a
+        source file that refers to 'func', and compiles and links it.
+        If everything succeeds, returns true; otherwise returns false.
+
+        The constructed source file starts out by including the header
+        files listed in 'headers'.  If 'decl' is true, it then declares
+        'func' (as "int func()"); you probably shouldn't supply 'headers'
+        and set 'decl' true in the same call, or you might get errors about
+        a conflicting declarations for 'func'.  Finally, the constructed
+        'main()' function either references 'func' or (if 'call' is true)
+        calls it.  'libraries' and 'library_dirs' are used when
+        linking.
+        """
+
+        self._check_compiler()
+        body = []
+        if decl:
+            body.append("int %s ();" % func)
+        body.append("int main () {")
+        if call:
+            body.append("  %s();" % func)
+        else:
+            body.append("  %s;" % func)
+        body.append("}")
+        body = string.join(body, "\n") + "\n"
+
+        return self.try_link(body, headers, libraries, library_dirs)
+
+    # check_func ()
+
+    def check_header (self, header, lang="c"):
+        """Determine if the system header file named by 'header_file'
+        exists and can be found by the preprocessor; return true if so,
+        false otherwise.
+        """
+        return self.try_cpp(headers=[header])
+
+
 # class config
+
+
+def dump_file (filename, head=None):
+    if head is None:
+        print filename + ":"
+    else:
+        print head
+
+    file = open(filename)
+    sys.stdout.write(file.read())
+    file.close()

From ed71d7548070c87c61c8ac7b2ca5f1f4479d2622 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:09:02 +0000
Subject: [PATCH 0450/8469] Rene Liebscher: when fixing up directories with an
 alternate root, include 'install_headers'.

---
 command/install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 21d971b8d3..5e8ade8d80 100644
--- a/command/install.py
+++ b/command/install.py
@@ -272,7 +272,8 @@ def finalize_options (self):
         # If a new root directory was supplied, make all the installation
         # dirs relative to it.
         if self.root is not None:
-            for name in ('lib', 'purelib', 'platlib', 'scripts', 'data'):
+            for name in ('lib', 'purelib', 'platlib',
+                         'scripts', 'data', 'headers'):
                 attr = "install_" + name
                 new_val = change_root (self.root, getattr (self, attr))
                 setattr (self, attr, new_val)

From db2316094f167954780793b08eeb1a62dbad543c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:13:51 +0000
Subject: [PATCH 0451/8469] Build the 'outfiles' list so 'get_outputs()' has
 something to return. (Bug spotted and originally fixed by Rene Liebscher; fix
 redone by me.)

---
 command/install_data.py    | 10 ++++++----
 command/install_headers.py | 10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index 5481dabe66..f8ed0a7540 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -25,7 +25,7 @@ class install_data (Command):
 
     def initialize_options (self):
         self.install_dir = None
-        self.outfiles = None
+        self.outfiles = []
         self.root = None
         self.data_files = self.distribution.data_files
 
@@ -40,7 +40,8 @@ def run (self):
         for f in self.data_files:
             if type(f) == StringType:
                 # its a simple file, so copy it
-                self.copy_file(f, self.install_dir)
+                out = self.copy_file(f, self.install_dir)
+                self.outfiles.append(out)
             else:
                 # its a tuple with path to install to and a list of files
                 dir = f[0]
@@ -50,10 +51,11 @@ def run (self):
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
-                    self.copy_file(data, dir)
+                    out = self.copy_file(data, dir)
+                    self.outfiles.append(out)
 
     def get_inputs (self):
         return self.data_files or []
 
     def get_outputs (self):
-        return self.outfiles or []
+        return self.outfiles
diff --git a/command/install_headers.py b/command/install_headers.py
index 33edb945dd..afcc887a69 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -7,6 +7,7 @@
 
 __revision__ = "$Id$"
 
+import os
 from distutils.core import Command
 
 
@@ -21,6 +22,7 @@ class install_headers (Command):
 
     def initialize_options (self):
         self.install_dir = None
+	self.outfiles = []
 
     def finalize_options (self):
         self.set_undefined_options('install',
@@ -33,8 +35,14 @@ def run (self):
 
         self.mkpath(self.install_dir)
         for header in headers:
-            self.copy_file(header, self.install_dir)
+            out = self.copy_file(header, self.install_dir)
+            self.outfiles.append(out)
 
+    def get_inputs (self):
+        return self.distribution.headers or []
+
+    def get_outputs (self):
+        return self.outfiles
     # run()
 
 # class install_headers

From f888626d57eb7caa92c9b814e81802e2e2fd24c4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:14:27 +0000
Subject: [PATCH 0452/8469] Delete spurious comment.

---
 command/install_headers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/install_headers.py b/command/install_headers.py
index afcc887a69..991985b4ad 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -43,6 +43,5 @@ def get_inputs (self):
 
     def get_outputs (self):
         return self.outfiles
-    # run()
 
 # class install_headers

From 88259b3d075b18c55429fd5c2413c2e08cbb8a56 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:29:57 +0000
Subject: [PATCH 0453/8469] Fix inspired by Rene Liebscher: if setup script is
 newer than the manifest, regenerate the manifest.

---
 command/sdist.py | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 48e9793e5e..ded8ec2269 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -173,14 +173,37 @@ def get_file_list (self):
         reading the manifest, or just using the default file set -- it all
         depends on the user's options and the state of the filesystem.
         """
+
+        # If we have a manifest template, see if it's newer than the
+        # manifest; if so, we'll regenerate the manifest.
         template_exists = os.path.isfile (self.template)
         if template_exists:
             template_newer = newer (self.template, self.manifest)
 
+        # The contents of the manifest file almost certainly depend on the
+        # setup script as well as the manifest template -- so if the setup
+        # script is newer than the manifest, we'll regenerate the manifest
+        # from the template.  (Well, not quite: if we already have a
+        # manifest, but there's no template -- which will happen if the
+        # developer elects to generate a manifest some other way -- then we
+        # can't regenerate the manifest, so we don't.)
+        setup_newer = newer(sys.argv[0], self.manifest)
+
+        # cases:
+        #   1) no manifest, template exists: generate manifest
+        #      (covered by 2a: no manifest == template newer)
+        #   2) manifest & template exist:
+        #      2a) template or setup script newer than manifest:
+        #          regenerate manifest
+        #      2b) manifest newer than both:
+        #          do nothing (unless --force or --manifest-only)
+        #   3) manifest exists, no template:
+        #      do nothing (unless --force or --manifest-only)
+        #   4) no manifest, no template: generate w/ warning ("defaults only")
+
         # Regenerate the manifest if necessary (or if explicitly told to)
-        if ((template_exists and template_newer) or
-            self.force_manifest or
-            self.manifest_only):
+        if ((template_exists and (template_newer or setup_newer)) or
+            self.force_manifest or self.manifest_only):
 
             if not template_exists:
                 self.warn (("manifest template '%s' does not exist " +

From bed42c8495831545d7e190a1221bb59cacf441f3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 21 Jun 2000 03:33:03 +0000
Subject: [PATCH 0454/8469] Implementation of the CCompiler class for Cygwin
 and Mingw32, ie. the two major ports of GCC to Windows.  Contributed by Rene
 Liebscher, and quite untested by me.  Apparently requires tweaking Python's
 installed config.h and adding a libpython.a to build extensions.

---
 cygwinccompiler.py | 181 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 cygwinccompiler.py

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
new file mode 100644
index 0000000000..cc2ed5db66
--- /dev/null
+++ b/cygwinccompiler.py
@@ -0,0 +1,181 @@
+"""distutils.cygwinccompiler
+
+Contains the CygwinCCompiler class, a subclass of UnixCCompiler that handles
+the Gnu Win32 C compiler.
+It also contains the Mingw32CCompiler class which handles the mingw32 compiler
+(same as cygwin in no-cygwin mode.)
+
+"""
+
+# created 2000/05/05, Rene Liebscher
+
+__revision__ = "$Id$"
+
+import os,sys,string,tempfile
+from distutils import sysconfig
+from distutils.unixccompiler import UnixCCompiler
+
+# Because these compilers aren't configured in Python's config.h file by default
+# we should at least warn the user if he used this unmodified version. 
+def check_if_config_h_is_gcc_ready():
+        """ checks, if the gcc-compiler is mentioned in config.h 
+            if it is not, compiling probably doesn't work """ 
+        from distutils import sysconfig
+        import string,sys
+        try:
+                # It would probably better to read single lines to search.
+                # But we do this only once, and it is fast enough 
+                f=open(sysconfig.get_config_h_filename())
+                s=f.read()
+                f.close()
+                try:
+                        string.index(s,"__GNUC__") # is somewhere a #ifdef __GNUC__ or something similar
+                except:
+                        sys.stderr.write ("warning: Python's config.h doesn't seem to support your compiler.\n")
+        except: # unspecific error => ignore
+                pass
+
+
+# This is called when the module is imported, so we make this check only once
+check_if_config_h_is_gcc_ready()
+
+
+# XXX Things not currently handled:
+#   * see UnixCCompiler
+
+class CygwinCCompiler (UnixCCompiler):
+
+    compiler_type = 'cygwin'
+   
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
+
+        UnixCCompiler.__init__ (self, verbose, dry_run, force)
+
+	# our compiler uses other names
+	self.cc='gcc'
+	self.ld_shared='dllwrap'
+	self.ldflags_shared=[]
+
+        # some variables to manage the differences between cygwin and mingw32
+        self.dllwrap_options=["--target=i386-cygwin32"]
+        # specification of entry point is not necessary
+        
+        self.dll_additional_libraries=[
+               # cygwin shouldn't need msvcrt, but without the dll's will crash
+               # perhaps something about initialization (Python uses it, too)
+               # mingw32 needs it in all cases
+                                        "msvcrt"
+                                      ]
+        
+    # __init__ ()
+
+    def link_shared_object (self,
+                            objects,
+                            output_filename,
+                            output_dir=None,
+                            libraries=None,
+                            library_dirs=None,
+                            runtime_library_dirs=None,
+                            export_symbols=None,
+			    debug=0,
+                            extra_preargs=None,
+                            extra_postargs=None):
+        
+        if libraries==None:
+                libraries=[]
+        
+        python_library=["python"+str(sys.hexversion>>24)+str((sys.hexversion>>16)&0xff)]
+        libraries=libraries+python_library+self.dll_additional_libraries
+        
+        # if you don't need the def-file afterwards, it is
+        # better to use for it tempfile.mktemp() as its name
+        # (unix-style compilers don't like backslashes in filenames)
+        win_dll_def_file=string.replace(tempfile.mktemp(),"\\","/")
+        #win_dll_def_file=output_filename[:-len(self.shared_lib_extension)]+".def"
+        #win_dll_exp_file=output_filename[:-len(self.shared_lib_extension)]+".exp"
+        #win_dll_lib_file=output_filename[:-len(self.shared_lib_extension)]+".a"
+        
+        # Make .def file
+        # (It would probably better to check if we really need this, but for this we had to
+        # insert some unchanged parts of UnixCCompiler, and this is not what I want.) 
+        f=open(win_dll_def_file,"w")
+        f.write("EXPORTS\n") # intro
+        # always export a function "init"+module_name
+        if not debug:
+                f.write("init"+os.path.basename(output_filename)[:-len(self.shared_lib_extension)]+"\n")
+        else: # in debug mode outfile_name is something like XXXXX_d.pyd
+                f.write("init"+os.path.basename(output_filename)[:-(len(self.shared_lib_extension)+2)]+"\n")
+        # if there are more symbols to export
+        # insert code here to write them in f
+        if export_symbols!=None: 
+            for sym in export_symbols:
+                f.write(sym+"\n")                
+        f.close()
+        
+        if extra_preargs==None:
+                extra_preargs=[]
+        
+        extra_preargs=extra_preargs+[
+                        #"--verbose",
+                        #"--output-exp",win_dll_exp_file,
+                        #"--output-lib",win_dll_lib_file,
+                        "--def",win_dll_def_file
+                        ]+ self.dllwrap_options
+        
+        # who wants symbols and a many times greater output file
+        # should explicitely switch the debug mode on 
+        # otherwise we let dllwrap strip the outputfile
+        # (On my machine unstripped_file=stripped_file+254KB
+        #   10KB < stripped_file < ??100KB ) 
+        if not debug: 
+                extra_preargs=extra_preargs+["-s"] 
+	
+	try:        
+    	    UnixCCompiler.link_shared_object(self,
+                            objects,
+                            output_filename,
+                            output_dir,
+                            libraries,
+                            library_dirs,
+                            runtime_library_dirs,
+			    None, # export_symbols, we do this with our def-file 
+                            debug,
+                            extra_preargs,
+                            extra_postargs)
+        finally: 
+    	    # we don't need the def-file anymore
+    	    os.remove(win_dll_def_file) 
+        
+    # link_shared_object ()
+
+# class CygwinCCompiler
+
+# the same as cygwin plus some additional parameters
+class Mingw32CCompiler (CygwinCCompiler):
+
+    compiler_type = 'mingw32'
+
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
+
+        CygwinCCompiler.__init__ (self, verbose, dry_run, force)
+
+        self.ccflags = self.ccflags + ["-mno-cygwin"]
+        self.dllwrap_options=[
+                                # mingw32 doesn't really need 'target' 
+                                # and cygwin too (it seems, it is enough
+                                # to specify a different entry point)                
+                                #"--target=i386-mingw32",
+                                "--entry","_DllMain@12"
+                                ]
+        # no additional libraries need 
+        # (only msvcrt, which is already added by CygwinCCompiler)
+
+    # __init__ ()
+                
+# class Mingw32CCompiler

From ae6b225478590a6a5d5462307ff1bb565980619e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 23 Jun 2000 01:42:40 +0000
Subject: [PATCH 0455/8469] Bastian Kleineidam: 'copy_file()' now returns the
 output filename, rather than a boolean indicating whether it did the copy.

---
 file_util.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/file_util.py b/file_util.py
index a73db42b54..2d0148f3f1 100644
--- a/file_util.py
+++ b/file_util.py
@@ -96,9 +96,8 @@ def copy_file (src, dst,
        on other systems, uses '_copy_file_contents()' to copy file
        contents.
 
-       Return true if the file was copied (or would have been copied),
-       false otherwise (ie. 'update' was true and the destination is
-       up-to-date)."""
+       Return the name of the destination file, whether it was actually
+       copied or not."""
 
     # XXX if the destination file already exists, we clobber it if
     # copying, but blow up if linking.  Hmmm.  And I don't know what
@@ -123,7 +122,7 @@ def copy_file (src, dst,
     if update and not newer (src, dst):
         if verbose:
             print "not copying %s (output up-to-date)" % src
-        return 0
+        return dst
 
     try:
         action = _copy_action[link]
@@ -137,7 +136,7 @@ def copy_file (src, dst,
             print "%s %s -> %s" % (action, src, dst)
             
     if dry_run:
-        return 1
+        return dst
 
     # On a Mac, use the native file copy routine
     if os.name == 'mac':
@@ -171,7 +170,7 @@ def copy_file (src, dst,
             if preserve_mode:
                 os.chmod (dst, S_IMODE (st[ST_MODE]))
 
-    return 1
+    return dst
 
 # copy_file ()
 

From 0b55a059cd131e263c36fb412c5556f9e32d2437 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 00:18:24 +0000
Subject: [PATCH 0456/8469] Revised docstring so 'sources' isn't necessarily
 all C/C++ files (to accomodate SWIG interface files, resource files, etc.).

---
 extension.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extension.py b/extension.py
index 9d2a6fa15c..f0f68b9390 100644
--- a/extension.py
+++ b/extension.py
@@ -31,9 +31,11 @@ class Extension:
         the full name of the extension, including any packages -- ie.
         *not* a filename or pathname, but Python dotted name
       sources : [string]
-        list of C/C++ source filenames, relative to the distribution
-        root (where the setup script lives), in Unix form
-        (slash-separated) for portability
+        list of source filenames, relative to the distribution root
+        (where the setup script lives), in Unix form (slash-separated)
+        for portability.  Source files may be C, C++, SWIG (.i),
+        platform-specific resource files, or whatever else is recognized
+        by the "build_ext" command as source for a Python extension.
       include_dirs : [string]
         list of directories to search for C/C++ header files (in Unix
         form for portability)

From 1f3bafb167859eb32d5a0fcec63c92bc72e4e65a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 00:19:35 +0000
Subject: [PATCH 0457/8469] Experimental, completely untested SWIG support.

---
 command/build_ext.py | 79 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 3d6d17c8d8..f3ff157183 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -367,11 +367,12 @@ def build_extensions (self):
 	    else:
         	self.announce ("building '%s' extension" % ext.name)
 
-            # First step: compile the source code to object files.  This
-            # drops the object files in the current directory, regardless
-            # of where the source is (may be a bad thing, but that's how a
-            # Makefile.pre.in-based system does it, so at least there's a
-            # precedent!)
+            # First, scan the sources for SWIG definition files (.i), run
+            # SWIG on 'em to create .c files, and modify the sources list
+            # accordingly.
+            sources = self.swig_sources(sources)
+
+            # Next, compile the source code to object files.
 
             # XXX not honouring 'define_macros' or 'undef_macros' -- the
             # CCompiler API needs to change to accomodate this, and I
@@ -429,6 +430,74 @@ def build_extensions (self):
     # build_extensions ()
 
 
+    def swig_sources (self, sources):
+
+        """Walk the list of source files in 'sources', looking for SWIG
+        interface (.i) files.  Run SWIG on all that are found, and
+        return a modified 'sources' list with SWIG source files replaced
+        by the generated C (or C++) files.
+        """
+
+        new_sources = []
+        swig_sources = []
+        swig_targets = {}
+
+        # XXX this drops generated C files into the source tree, which
+        # is fine for developers who want to distribute the generated
+        # source -- but there should be an option to put SWIG output in
+        # the temp dir.
+
+        for source in sources:
+            (base, ext) = os.path.splitext(source)
+            if ext in self.swig_ext():
+                new_sources.append(base + ".c") # umm, what if it's C++?
+                swig_files.append(source)
+                swig_targets[source] = new_sources[-1]
+            else:
+                new_sources.append(source)
+
+        if not swig_files:
+            return new_sources
+
+        swig = self.find_swig()
+        swig_cmd = [swig, "-python", "-dnone", "-ISWIG"] # again, C++?!?
+
+        for source in swig_sources:
+            self.announce ("swigging %s to %s" % (src, obj))
+            self.spawn(swig_cmd + ["-o", swig_targets[source], source])
+
+        return new_sources
+
+    # swig_sources ()
+
+    def find_swig (self):
+        """Return the name of the SWIG executable.  On Unix, this is
+        just "swig" -- it should be in the PATH.  Tries a bit harder on
+        Windows.
+        """
+
+        if os.name == "posix":
+            return "swig"
+        elif os.name == "nt":
+
+            # Look for SWIG in its standard installation directory on
+            # Windows (or so I presume!).  If we find it there, great;
+            # if not, act like Unix and assume it's in the PATH.
+            for vers in ("1.3", "1.2", "1.1"):
+                fn = os.path.join("c:\\swig%s" % vers, "swig.exe")
+                if os.path.isfile (fn):
+                    return fn
+            else:
+                return "swig.exe"
+
+        else:
+            raise DistutilsPlatformError, \
+                  ("I don't know how to find (much less run) SWIG "
+                   "on platform '%s'") % os.name
+
+    # find_swig ()
+    
+
     # -- Hooks ---------------------------------------------------------
 
     def precompile_hook (self):

From 9285ec887624587ca83a53445ce64b0bafd34ea9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 00:23:20 +0000
Subject: [PATCH 0458/8469] Stylistic/formatting changes to Rene Liebscher's
 '--help-xxx' patch.

---
 archive_util.py       |  8 ++++----
 ccompiler.py          | 30 ++++++++++++++++++++----------
 command/bdist.py      | 29 +++++++++++++++--------------
 command/build.py      |  3 ++-
 command/build_clib.py |  3 ++-
 command/sdist.py      |  4 ++--
 dist.py               | 37 +++++++++++++++++++++++++++----------
 7 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 27aa8c0bfc..08a3c8310c 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -110,10 +110,10 @@ def visit (z, dirname, names):
 
 
 ARCHIVE_FORMATS = {
-    'gztar': (make_tarball, [('compress', 'gzip')],"gzipped tar-file"),
-    'bztar': (make_tarball, [('compress', 'bzip2')],"bzip2-ed tar-file"),
-    'ztar':  (make_tarball, [('compress', 'compress')],"compressed tar-file"),
-    'tar':   (make_tarball, [('compress', None)],"uncompressed tar-file"),
+    'gztar': (make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),
+    'bztar': (make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
+    'ztar':  (make_tarball, [('compress', 'compress')], "compressed tar file"),
+    'tar':   (make_tarball, [('compress', None)], "uncompressed tar file"),
     'zip':   (make_zipfile, [],"zip-file")
     }
 
diff --git a/ccompiler.py b/ccompiler.py
index 53d4fa5301..5be8c25a14 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -742,20 +742,30 @@ def mkpath (self, name, mode=0777):
 # Map compiler types to (module_name, class_name) pairs -- ie. where to
 # find the code that implements an interface to this compiler.  (The module
 # is assumed to be in the 'distutils' package.)
-compiler_class = { 'unix': ('unixccompiler', 'UnixCCompiler',"standard UNIX-style compiler"),
-                   'msvc': ('msvccompiler', 'MSVCCompiler',"Microsoft Visual C++"),
-                   'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',"Cygwin-Gnu-Win32-C-Compiler"),
-                   'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',"MinGW32-C-Compiler (or cygwin in this mode)"),
+compiler_class = { 'unix':    ('unixccompiler', 'UnixCCompiler',
+                               "standard UNIX-style compiler"),
+                   'msvc':    ('msvccompiler', 'MSVCCompiler',
+                               "Microsoft Visual C++"),
+                   'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',
+                               "Cygwin port of GNU C Compiler for Win32"),
+                   'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',
+                               "Mingw32 port of GNU C Compiler for Win32"),
                  }
 
-# prints all possible arguments to --compiler
 def show_compilers():
+    """Print list of available compilers (used by the "--help-compiler"
+    options to "build", "build_ext", "build_clib").
+    """
+    # XXX this "knows" that the compiler option it's describing is
+    # "--compiler", which just happens to be the case for the three
+    # commands that use it.
     from distutils.fancy_getopt import FancyGetopt 
-    list_of_compilers=[]
+    compilers = []
     for compiler in compiler_class.keys():
-	list_of_compilers.append(("compiler="+compiler,None,compiler_class[compiler][2]))
-    list_of_compilers.sort()
-    pretty_printer=FancyGetopt(list_of_compilers)
+	compilers.append(("compiler="+compiler, None,
+                          compiler_class[compiler][2]))
+    compilers.sort()
+    pretty_printer = FancyGetopt(compilers)
     pretty_printer.print_help("List of available compilers:")
     
 
@@ -783,7 +793,7 @@ def new_compiler (plat=None,
         if compiler is None:
             compiler = default_compiler[plat]
         
-        (module_name, class_name,long_description) = compiler_class[compiler]
+        (module_name, class_name, long_description) = compiler_class[compiler]
     except KeyError:
         msg = "don't know how to compile C/C++ code on platform '%s'" % plat
         if compiler is not None:
diff --git a/command/bdist.py b/command/bdist.py
index 66ef1133f3..164699362d 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -21,7 +21,7 @@ class bdist (Command):
     user_options = [('bdist-base=', 'b',
                      "temporary directory for creating built distributions"),
                     ('formats=', None,
-                     "formats for distribution"),
+                     "formats for distribution (comma-separated list)"),
                    ]
 
     # The following commands do not take a format option from bdist
@@ -32,22 +32,24 @@ class bdist (Command):
     default_format = { 'posix': 'gztar',
                        'nt': 'zip', }
 
-    format_command = { 'gztar': ('bdist_dumb',"gzipped tar-file"),
-                       'bztar': ('bdist_dumb',"bzip2-ed tar-file"),
-                       'ztar':  ('bdist_dumb',"compressed tar-file"),
-                       'tar':   ('bdist_dumb',"tar-file"),
-                       'rpm':   ('bdist_rpm',"rpm distribution"),
-                       'zip':   ('bdist_dumb',"zip-file"),
+    format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
+                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
+                       'bztar': ('bdist_dumb', "bzip2'ed tar file"),
+                       'ztar':  ('bdist_dumb', "compressed tar file"),
+                       'tar':   ('bdist_dumb', "tar file"),
+                       'zip':   ('bdist_dumb', "ZIP file"),
 		        }
 
-    # prints all possible arguments to --format
-    def show_formats():
+    def show_formats ():
+        """Print list of available formats (arguments to "--format" option).
+        """
 	from distutils.fancy_getopt import FancyGetopt 
-	list_of_formats=[]
+	formats=[]
 	for format in bdist.format_command.keys():
-	    list_of_formats.append(("formats="+format,None,bdist.format_command[format][1]))
-	list_of_formats.sort()
-	pretty_printer=FancyGetopt(list_of_formats)
+	    formats.append(("formats="+format, None,
+                            bdist.format_command[format][1]))
+	formats.sort()
+	pretty_printer = FancyGetopt(formats)
 	pretty_printer.print_help("List of available distribution formats:")
 
     help_options = [
@@ -87,7 +89,6 @@ def finalize_options (self):
     def run (self):
 
         for format in self.formats:
-
             try:
                 cmd_name = self.format_command[format][0]
             except KeyError:
diff --git a/command/build.py b/command/build.py
index c064f8394b..d5513fc737 100644
--- a/command/build.py
+++ b/command/build.py
@@ -36,9 +36,10 @@ class build (Command):
         ('force', 'f',
          "forcibly build everything (ignore file timestamps)"),
         ]
+
     help_options = [
         ('help-compiler', None,
-         "lists available compilers",show_compilers),
+         "list available compilers", show_compilers),
 	]
 
     def initialize_options (self):
diff --git a/command/build_clib.py b/command/build_clib.py
index 72df372fbf..9a82ac0917 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -42,9 +42,10 @@ class build_clib (Command):
         ('compiler=', 'c',
          "specify the compiler type"),
         ]
+
     help_options = [
         ('help-compiler', None,
-         "lists available compilers",show_compilers),
+         "list available compilers", show_compilers),
 	]
 
     def initialize_options (self):
diff --git a/command/sdist.py b/command/sdist.py
index ded8ec2269..93e53bbd66 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -36,7 +36,7 @@ class sdist (Command):
         ('force-manifest', 'f',
          "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
-         "formats for source distribution"),
+         "formats for source distribution (comma-separated list)"),
         ('keep-tree', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),
@@ -61,7 +61,7 @@ def show_formats ():
 
     help_options = [
         ('help-formats', None,
-         "lists available distribution formats", show_formats),
+         "list available distribution formats", show_formats),
 	]
 
     negative_opts = {'use-defaults': 'no-defaults'}
diff --git a/dist.py b/dist.py
index 88bd94a470..2e4951ff88 100644
--- a/dist.py
+++ b/dist.py
@@ -437,11 +437,14 @@ def _parse_command_opts (self, parser, args):
             negative_opt = copy (negative_opt)
             negative_opt.update (cmd_class.negative_opt)
 
-	# Check for help_options in command class
-	# They have a different format (tuple of four) so we need to preprocess them here 
-	help_options = []
-	if hasattr(cmd_class,"help_options") and type (cmd_class.help_options) is ListType:
-	    help_options = map(lambda x:(x[0],x[1],x[2]),cmd_class.help_options)
+	# Check for help_options in command class.  They have a different
+	# format (tuple of four) so we need to preprocess them here.
+	if (hasattr(cmd_class, 'help_options') and
+            type (cmd_class.help_options) is ListType):
+            help_options = fix_help_options(cmd_class.help_options)
+        else:
+            help_optiosn = []
+
 
         # All commands support the global options too, just by adding
         # in 'global_options'.
@@ -453,12 +456,14 @@ def _parse_command_opts (self, parser, args):
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
 
-	if hasattr(cmd_class,"help_options") and type (cmd_class.help_options) is ListType:
+	if (hasattr(cmd_class, 'help_options') and
+            type (cmd_class.help_options) is ListType):
 	    help_option_found=0
 	    for help_option in cmd_class.help_options:
 		if hasattr(opts, parser.get_attr_name(help_option[0])):
 		    help_option_found=1
-		    #print "showing help for option %s of command %s" % (help_option[0],cmd_class)
+		    #print "showing help for option %s of command %s" % \
+                    #      (help_option[0],cmd_class)
 		    if callable(help_option[3]):
 			help_option[3]()
 		    else:
@@ -518,9 +523,10 @@ def _show_help (self,
                 klass = command
             else:
                 klass = self.get_command_class (command)
-	    if hasattr(klass,"help_options") and type (klass.help_options) is ListType:
-		parser.set_option_table (klass.user_options+
-					 map(lambda x:(x[0],x[1],x[2]),klass.help_options))
+	    if (hasattr(klass, 'help_options') and
+                type (klass.help_options) is ListType):
+		parser.set_option_table (klass.user_options +
+                                         fix_help_options(klass.help_options))
 	    else:
         	parser.set_option_table (klass.user_options)
             parser.print_help ("Options for '%s' command:" % klass.__name__)
@@ -890,6 +896,17 @@ def get_long_description(self):
 
 # class DistributionMetadata
 
+
+def fix_help_options (options):
+    """Convert a 4-tuple 'help_options' list as found in various command
+    classes to the 3-tuple form required by FancyGetopt.
+    """
+    new_options = []
+    for help_tuple in options:
+        new_options.append(help_tuple[0:3])
+    return new_options
+
+
 if __name__ == "__main__":
     dist = Distribution ()
     print "ok"

From 4fc435d3e805645f360a11cb97bf4d3e93e5af17 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 01:22:41 +0000
Subject: [PATCH 0459/8469] More stylistic tweaks to the generic '--help-xxx'
 code.

---
 dist.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/dist.py b/dist.py
index 2e4951ff88..287137ee13 100644
--- a/dist.py
+++ b/dist.py
@@ -443,13 +443,14 @@ def _parse_command_opts (self, parser, args):
             type (cmd_class.help_options) is ListType):
             help_options = fix_help_options(cmd_class.help_options)
         else:
-            help_optiosn = []
+            help_options = []
 
 
         # All commands support the global options too, just by adding
         # in 'global_options'.
         parser.set_option_table (self.global_options +
-                                 cmd_class.user_options + help_options)
+                                 cmd_class.user_options +
+                                 help_options)
         parser.set_negative_aliases (negative_opt)
         (args, opts) = parser.getopt (args[1:])
         if hasattr(opts, 'help') and opts.help:
@@ -459,19 +460,21 @@ def _parse_command_opts (self, parser, args):
 	if (hasattr(cmd_class, 'help_options') and
             type (cmd_class.help_options) is ListType):
 	    help_option_found=0
-	    for help_option in cmd_class.help_options:
-		if hasattr(opts, parser.get_attr_name(help_option[0])):
+	    for (help_option, short, desc, func) in cmd_class.help_options:
+		if hasattr(opts, parser.get_attr_name(help_option)):
 		    help_option_found=1
 		    #print "showing help for option %s of command %s" % \
                     #      (help_option[0],cmd_class)
-		    if callable(help_option[3]):
-			help_option[3]()
-		    else:
-        		raise DistutilsClassError, \
-                          ("command class %s must provide " +
-                           "a callable object for help_option '%s'") % \
-                          (cmd_class,help_option[0])
-	    if help_option_found: 
+
+                    if callable(func):
+			func()
+                    else:
+                        raise DistutilsClassError, \
+                            ("invalid help function %s for help option '%s': "
+                             "must be a callable object (function, etc.)") % \
+                            (`func`, help_option)
+
+            if help_option_found: 
 		return
 
         # Put the options from the command-line into their official

From 869c587086b76265a98af7c65def177261b593cc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 01:23:37 +0000
Subject: [PATCH 0460/8469] Changed so all the help-generating functions are
 defined, at module-level, in the module of the command classes that have
 command-specific help options.  This lets us keep the principle of lazily
 importing the ccompiler module, and also gets away from defining non-methods
 at class level.

---
 command/bdist.py      | 38 ++++++++++++++++++++------------------
 command/build.py      |  7 ++++++-
 command/build_clib.py |  7 ++++++-
 command/build_ext.py  | 10 +++++++---
 command/sdist.py      | 35 +++++++++++++++++------------------
 5 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 164699362d..47d4cbc965 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -14,6 +14,18 @@
 from distutils.util import get_platform
 
 
+def show_formats ():
+    """Print list of available formats (arguments to "--format" option).
+    """
+    from distutils.fancy_getopt import FancyGetopt 
+    formats=[]
+    for format in bdist.format_commands:
+        formats.append(("formats=" + format, None,
+                        bdist.format_command[format][1]))
+    pretty_printer = FancyGetopt(formats)
+    pretty_printer.print_help("List of available distribution formats:")
+
+
 class bdist (Command):
 
     description = "create a built (binary) distribution"
@@ -24,6 +36,11 @@ class bdist (Command):
                      "formats for distribution (comma-separated list)"),
                    ]
 
+    help_options = [
+        ('help-formats', None,
+         "lists available distribution formats", show_formats),
+	]
+
     # The following commands do not take a format option from bdist
     no_format_option = ('bdist_rpm',)
 
@@ -38,24 +55,9 @@ class bdist (Command):
                        'ztar':  ('bdist_dumb', "compressed tar file"),
                        'tar':   ('bdist_dumb', "tar file"),
                        'zip':   ('bdist_dumb', "ZIP file"),
-		        }
-
-    def show_formats ():
-        """Print list of available formats (arguments to "--format" option).
-        """
-	from distutils.fancy_getopt import FancyGetopt 
-	formats=[]
-	for format in bdist.format_command.keys():
-	    formats.append(("formats="+format, None,
-                            bdist.format_command[format][1]))
-	formats.sort()
-	pretty_printer = FancyGetopt(formats)
-	pretty_printer.print_help("List of available distribution formats:")
-
-    help_options = [
-        ('help-formats', None,
-         "lists available distribution formats",show_formats),
-	]
+                     }
+    # establish the preferred order
+    format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar', 'zip']
 
 
     def initialize_options (self):
diff --git a/command/build.py b/command/build.py
index d5513fc737..1e87f23bbc 100644
--- a/command/build.py
+++ b/command/build.py
@@ -9,7 +9,12 @@
 import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.ccompiler import show_compilers
+
+
+def show_compilers ():
+    from distutils.ccompiler import show_compilers
+    show_compilers()
+
 
 class build (Command):
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 9a82ac0917..7106882d79 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -23,7 +23,11 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
-from distutils.ccompiler import new_compiler,show_compilers
+
+
+def show_compilers ():
+    from distutils.ccompiler import show_compilers
+    show_compilers()
 
 
 class build_clib (Command):
@@ -102,6 +106,7 @@ def run (self):
             return
 
         # Yech -- this is cut 'n pasted from build_ext.py!
+        from distutils.ccompiler import new_compiler
         self.compiler = new_compiler (compiler=self.compiler,
                                       verbose=self.verbose,
                                       dry_run=self.dry_run,
diff --git a/command/build_ext.py b/command/build_ext.py
index f3ff157183..6b7ec74190 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -14,7 +14,6 @@
 from distutils.errors import *
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
-from distutils.ccompiler import show_compilers
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
@@ -22,6 +21,11 @@
     (r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$')
 
 
+def show_compilers ():
+    from distutils.ccompiler import show_compilers
+    show_compilers()
+
+
 class build_ext (Command):
     
     description = "build C/C++ extensions (compile/link to build directory)"
@@ -73,12 +77,12 @@ class build_ext (Command):
         ('compiler=', 'c',
          "specify the compiler type"),
         ]
+
     help_options = [
         ('help-compiler', None,
-         "lists available compilers",show_compilers),
+         "list available compilers", show_compilers),
 	]
 
-
     def initialize_options (self):
         self.extensions = None
         self.build_lib = None
diff --git a/command/sdist.py b/command/sdist.py
index 93e53bbd66..5627ebb9e5 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -13,11 +13,27 @@
 from distutils.core import Command
 from distutils.util import \
      convert_path, create_tree, remove_tree, newer, write_file, \
-     check_archive_formats, ARCHIVE_FORMATS
+     check_archive_formats
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError, DistutilsOptionError
 
 
+def show_formats ():
+    """Print all possible values for the 'formats' option (used by
+    the "--help-formats" command-line option).
+    """
+    from distutils.fancy_getopt import FancyGetopt
+    from distutils.archive_util import ARCHIVE_FORMATS
+    formats=[]
+    for format in ARCHIVE_FORMATS.keys():
+        formats.append(("formats=" + format, None,
+                        ARCHIVE_FORMATS[format][2]))
+    formats.sort()
+    pretty_printer = FancyGetopt(formats)
+    pretty_printer.print_help(
+        "List of available source distribution formats:")
+
+
 class sdist (Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
@@ -43,22 +59,6 @@ class sdist (Command):
         ]
 
 
-    # XXX ugh: this has to precede the 'help_options' list, because
-    # it is mentioned there -- also, this is not a method, even though
-    # it's defined in a class: double-ugh!
-    def show_formats ():
-        """Print all possible values for the 'formats' option -- used by
-        the "--help-formats" command-line option.
-        """
-	from distutils.fancy_getopt import FancyGetopt 
-	formats=[]
-	for format in ARCHIVE_FORMATS.keys():
-	    formats.append(("formats="+format,None,ARCHIVE_FORMATS[format][2]))
-	formats.sort()
-	pretty_printer = FancyGetopt(formats)
-	pretty_printer.print_help(
-            "List of available source distribution formats:")
-
     help_options = [
         ('help-formats', None,
          "list available distribution formats", show_formats),
@@ -69,7 +69,6 @@ def show_formats ():
     default_format = { 'posix': 'gztar',
                        'nt': 'zip' }
 
-
     def initialize_options (self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.

From 614a927fbf22310f55f5ee3f895ce6a138bf6d35 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 02:22:49 +0000
Subject: [PATCH 0461/8469] Changed 'object_filenames()' to raise exception
 instead of silently carrying on if it sees a filename with unknown extension.

---
 ccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 5be8c25a14..4dd8645bc5 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -671,7 +671,9 @@ def object_filenames (self,
         for src_name in source_filenames:
             (base, ext) = os.path.splitext (src_name)
             if ext not in self.src_extensions:
-                continue
+                raise UnknownFileError, \
+                      "unknown file type '%s' (from '%s')" % \
+                      (ext, src_name)
             if strip_dir:
                 base = os.path.basename (base)
             obj_names.append (os.path.join (output_dir,

From 2bfcf462aa13cdd68bc582ec69ed80e2d52d6eb5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 17:22:39 +0000
Subject: [PATCH 0462/8469] Changed the default installation directory for data
 files (used by the "install_data" command to the installation base, which is
 usually just sys.prefix.  (Any setup scripts out there that specify data
 files will have to set the installation directory, relative to the base,
 explicitly.)

---
 command/install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index 5e8ade8d80..1be49046ec 100644
--- a/command/install.py
+++ b/command/install.py
@@ -20,28 +20,28 @@
         'platlib': '$platbase/lib/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short/$dist_name',
         'scripts': '$base/bin',
-        'data'   : '$base/share',
+        'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
         'platlib': '$base/lib/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
-        'data'   : '$base/share',
+        'data'   : '$base',
         },
     'nt': {
         'purelib': '$base',
         'platlib': '$base',
         'headers': '$base\\Include\\$dist_name',
         'scripts': '$base\\Scripts',
-        'data'   : '$base\\Data',
+        'data'   : '$base',
         },
     'mac': {
         'purelib': '$base:Lib',
         'platlib': '$base:Mac:PlugIns',
         'headers': '$base:Include:$dist_name',
         'scripts': '$base:Scripts',
-        'data'   : '$base:Data',
+        'data'   : '$base',
         }
     }
 

From 3cac3f4156d58d1a827929273bb02e8645762484 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 17:36:24 +0000
Subject: [PATCH 0463/8469] Print a warning if we install a data file right in
 install_dir. Tweaked help text.

---
 command/install_data.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index f8ed0a7540..716febb5c6 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -18,7 +18,8 @@ class install_data (Command):
 
     user_options = [
         ('install-dir=', 'd',
-         "directory to install the files to"),
+         "base directory for installating data files "
+         "(default: installation base dir)"),
         ('root=', None,
          "install everything relative to this alternate root directory"),
         ]
@@ -39,11 +40,14 @@ def run (self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
             if type(f) == StringType:
-                # its a simple file, so copy it
+                # it's a simple file, so copy it
+                self.warn("setup script did not provide a directory for "
+                          "'%s' -- installing right in '%s'" %
+                          (f, self.install_dir))
                 out = self.copy_file(f, self.install_dir)
                 self.outfiles.append(out)
             else:
-                # its a tuple with path to install to and a list of files
+                # it's a tuple with path to install to and a list of files
                 dir = f[0]
                 if not os.path.isabs(dir):
                     dir = os.path.join(self.install_dir, dir)

From 0a5cf577d2738162be426bc2a95b04d55bf3cbed Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 18:10:48 +0000
Subject: [PATCH 0464/8469] Docstring reformatting/tweaking binge. Fixed a few
 comments.

---
 ccompiler.py | 502 ++++++++++++++++++++++++++-------------------------
 1 file changed, 253 insertions(+), 249 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 4dd8645bc5..9aa41adb9d 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -17,18 +17,17 @@
 
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
-       by real compiler abstraction classes.  Might have some use as a
-       place for shared code, but it's not yet clear what code can be
-       shared between compiler abstraction models for different platforms.
-
-       The basic idea behind a compiler abstraction class is that each
-       instance can be used for all the compile/link steps in building
-       a single project.  Thus, attributes common to all of those compile
-       and link steps -- include directories, macros to define, libraries
-       to link against, etc. -- are attributes of the compiler instance.
-       To allow for variability in how individual files are treated,
-       most (all?) of those attributes may be varied on a per-compilation
-       or per-link basis."""
+    by real compiler classes.  Also has some utility methods used by
+    several compiler classes.
+
+    The basic idea behind a compiler abstraction class is that each
+    instance can be used for all the compile/link steps in building a
+    single project.  Thus, attributes common to all of those compile and
+    link steps -- include directories, macros to define, libraries to link
+    against, etc. -- are attributes of the compiler instance.  To allow for
+    variability in how individual files are treated, most of those
+    attributes may be varied on a per-compilation or per-link basis.
+    """
 
     # 'compiler_type' is a class attribute that identifies this class.  It
     # keeps code that wants to know what kind of compiler it's dealing with
@@ -46,10 +45,6 @@ class CCompiler:
     #     should be the domain of concrete compiler abstraction classes
     #     (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base
     #     class should have methods for the common ones.
-    #   * can't put output files (object files, libraries, whatever)
-    #     into a separate directory from their inputs.  Should this be
-    #     handled by an 'output_dir' attribute of the whole object, or a
-    #     parameter to the compile/link_* methods, or both?
     #   * can't completely override the include or library searchg
     #     path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2".
     #     I'm not sure how widely supported this is even by Unix
@@ -129,10 +124,9 @@ def _find_macro (self, name):
 
     def _check_macro_definitions (self, definitions):
         """Ensures that every element of 'definitions' is a valid macro
-           definition, ie. either (name,value) 2-tuple or a (name,)
-           tuple.  Do nothing if all definitions are OK, raise 
-           TypeError otherwise."""
-
+        definition, ie. either (name,value) 2-tuple or a (name,) tuple.  Do
+        nothing if all definitions are OK, raise TypeError otherwise.
+        """
         for defn in definitions:
             if not (type (defn) is TupleType and
                     (len (defn) == 1 or
@@ -148,12 +142,12 @@ def _check_macro_definitions (self, definitions):
     # -- Bookkeeping methods -------------------------------------------
 
     def define_macro (self, name, value=None):
-        """Define a preprocessor macro for all compilations driven by
-           this compiler object.  The optional parameter 'value' should be
-           a string; if it is not supplied, then the macro will be defined
-           without an explicit value and the exact outcome depends on the
-           compiler used (XXX true? does ANSI say anything about this?)"""
-
+        """Define a preprocessor macro for all compilations driven by this
+        compiler object.  The optional parameter 'value' should be a
+        string; if it is not supplied, then the macro will be defined
+        without an explicit value and the exact outcome depends on the
+        compiler used (XXX true? does ANSI say anything about this?)
+        """
         # Delete from the list of macro definitions/undefinitions if
         # already there (so that this one will take precedence).
         i = self._find_macro (name)
@@ -166,13 +160,13 @@ def define_macro (self, name, value=None):
 
     def undefine_macro (self, name):
         """Undefine a preprocessor macro for all compilations driven by
-           this compiler object.  If the same macro is defined by
-           'define_macro()' and undefined by 'undefine_macro()' the last
-           call takes precedence (including multiple redefinitions or
-           undefinitions).  If the macro is redefined/undefined on a
-           per-compilation basis (ie. in the call to 'compile()'), then
-           that takes precedence."""
-
+        this compiler object.  If the same macro is defined by
+        'define_macro()' and undefined by 'undefine_macro()' the last call
+        takes precedence (including multiple redefinitions or
+        undefinitions).  If the macro is redefined/undefined on a
+        per-compilation basis (ie. in the call to 'compile()'), then that
+        takes precedence.
+        """
         # Delete from the list of macro definitions/undefinitions if
         # already there (so that this one will take precedence).
         i = self._find_macro (name)
@@ -184,86 +178,94 @@ def undefine_macro (self, name):
 
 
     def add_include_dir (self, dir):
-        """Add 'dir' to the list of directories that will be searched
-           for header files.  The compiler is instructed to search
-           directories in the order in which they are supplied by
-           successive calls to 'add_include_dir()'."""
+        """Add 'dir' to the list of directories that will be searched for
+        header files.  The compiler is instructed to search directories in
+        the order in which they are supplied by successive calls to
+        'add_include_dir()'.
+        """
         self.include_dirs.append (dir)
 
     def set_include_dirs (self, dirs):
-        """Set the list of directories that will be searched to 'dirs'
-           (a list of strings).  Overrides any preceding calls to
-           'add_include_dir()'; subsequence calls to 'add_include_dir()'
-           add to the list passed to 'set_include_dirs()'.  This does
-           not affect any list of standard include directories that
-           the compiler may search by default."""
+        """Set the list of directories that will be searched to 'dirs' (a
+        list of strings).  Overrides any preceding calls to
+        'add_include_dir()'; subsequence calls to 'add_include_dir()' add
+        to the list passed to 'set_include_dirs()'.  This does not affect
+        any list of standard include directories that the compiler may
+        search by default.
+        """
         self.include_dirs = copy (dirs)
 
 
     def add_library (self, libname):
-        """Add 'libname' to the list of libraries that will be included
-           in all links driven by this compiler object.  Note that
-           'libname' should *not* be the name of a file containing a
-           library, but the name of the library itself: the actual filename
-           will be inferred by the linker, the compiler, or the compiler
-           abstraction class (depending on the platform).
-
-           The linker will be instructed to link against libraries in the
-           order they were supplied to 'add_library()' and/or
-           'set_libraries()'.  It is perfectly valid to duplicate library
-           names; the linker will be instructed to link against libraries
-           as many times as they are mentioned."""
+        """Add 'libname' to the list of libraries that will be included in
+        all links driven by this compiler object.  Note that 'libname'
+        should *not* be the name of a file containing a library, but the
+        name of the library itself: the actual filename will be inferred by
+        the linker, the compiler, or the compiler class (depending on the
+        platform).
+
+        The linker will be instructed to link against libraries in the
+        order they were supplied to 'add_library()' and/or
+        'set_libraries()'.  It is perfectly valid to duplicate library
+        names; the linker will be instructed to link against libraries as
+        many times as they are mentioned.
+        """
         self.libraries.append (libname)
 
     def set_libraries (self, libnames):
-        """Set the list of libraries to be included in all links driven
-           by this compiler object to 'libnames' (a list of strings).
-           This does not affect any standard system libraries that the
-           linker may include by default."""
-
+        """Set the list of libraries to be included in all links driven by
+        this compiler object to 'libnames' (a list of strings).  This does
+        not affect any standard system libraries that the linker may
+        include by default.
+        """
         self.libraries = copy (libnames)
 
 
     def add_library_dir (self, dir):
         """Add 'dir' to the list of directories that will be searched for
-           libraries specified to 'add_library()' and 'set_libraries()'.
-           The linker will be instructed to search for libraries in the
-           order they are supplied to 'add_library_dir()' and/or
-           'set_library_dirs()'."""
+        libraries specified to 'add_library()' and 'set_libraries()'.  The
+        linker will be instructed to search for libraries in the order they
+        are supplied to 'add_library_dir()' and/or 'set_library_dirs()'.
+        """
         self.library_dirs.append (dir)
 
     def set_library_dirs (self, dirs):
-        """Set the list of library search directories to 'dirs' (a list
-           of strings).  This does not affect any standard library
-           search path that the linker may search by default."""
+        """Set the list of library search directories to 'dirs' (a list of
+        strings).  This does not affect any standard library search path
+        that the linker may search by default.
+        """
         self.library_dirs = copy (dirs)
 
 
     def add_runtime_library_dir (self, dir):
         """Add 'dir' to the list of directories that will be searched for
-           shared libraries at runtime."""
+        shared libraries at runtime.
+        """
         self.runtime_library_dirs.append (dir)
 
     def set_runtime_library_dirs (self, dirs):
-        """Set the list of directories to search for shared libraries
-           at runtime to 'dirs' (a list of strings).  This does not affect
-           any standard search path that the runtime linker may search by
-           default."""
+        """Set the list of directories to search for shared libraries at
+        runtime to 'dirs' (a list of strings).  This does not affect any
+        standard search path that the runtime linker may search by
+        default.
+        """
         self.runtime_library_dirs = copy (dirs)
 
 
     def add_link_object (self, object):
-        """Add 'object' to the list of object files (or analogues, such
-           as explictly named library files or the output of "resource
-           compilers") to be included in every link driven by this
-           compiler object."""
+        """Add 'object' to the list of object files (or analogues, such as
+        explictly named library files or the output of "resource
+        compilers") to be included in every link driven by this compiler
+        object.
+        """
         self.objects.append (object)
 
     def set_link_objects (self, objects):
-        """Set the list of object files (or analogues) to be included
-           in every link to 'objects'.  This does not affect any
-           standard object files that the linker may include by default
-           (such as system libraries)."""
+        """Set the list of object files (or analogues) to be included in
+        every link to 'objects'.  This does not affect any standard object
+        files that the linker may include by default (such as system
+        libraries).
+        """
         self.objects = copy (objects)
 
 
@@ -271,15 +273,15 @@ def set_link_objects (self, objects):
     # (here for the convenience of subclasses)
 
     def _fix_compile_args (self, output_dir, macros, include_dirs):
-        """Typecheck and fix-up some of the arguments to the 'compile()' method,
-           and return fixed-up values.  Specifically: if 'output_dir' is
-           None, replaces it with 'self.output_dir'; ensures that 'macros'
-           is a list, and augments it with 'self.macros'; ensures that
-           'include_dirs' is a list, and augments it with
-           'self.include_dirs'.  Guarantees that the returned values are of
-           the correct type, i.e. for 'output_dir' either string or None,
-           and for 'macros' and 'include_dirs' either list or None."""
-
+        """Typecheck and fix-up some of the arguments to the 'compile()'
+        method, and return fixed-up values.  Specifically: if 'output_dir'
+        is None, replaces it with 'self.output_dir'; ensures that 'macros'
+        is a list, and augments it with 'self.macros'; ensures that
+        'include_dirs' is a list, and augments it with 'self.include_dirs'.
+        Guarantees that the returned values are of the correct type,
+        i.e. for 'output_dir' either string or None, and for 'macros' and
+        'include_dirs' either list or None.
+        """
         if output_dir is None:
             output_dir = self.output_dir
         elif type (output_dir) is not StringType:
@@ -307,11 +309,11 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
 
 
     def _prep_compile (self, sources, output_dir):
-        """Determine the list of object files corresponding to 'sources', and
-           figure out which ones really need to be recompiled.  Return a list
-           of all object files and a dictionary telling which source files can
-           be skipped."""
-
+        """Determine the list of object files corresponding to 'sources',
+        and figure out which ones really need to be recompiled.  Return a
+        list of all object files and a dictionary telling which source
+        files can be skipped.
+        """
         # Get the list of expected output (object) files 
         objects = self.object_filenames (sources,
                                          output_dir=output_dir)
@@ -330,8 +332,8 @@ def _prep_compile (self, sources, output_dir):
                 skip_source[source] = 1
 
             (n_sources, n_objects) = newer_pairwise (sources, objects)
-            for source in n_sources:    # no really, only rebuild what's out-of-date
-                skip_source[source] = 0
+            for source in n_sources:    # no really, only rebuild what's
+                skip_source[source] = 0 # out-of-date
 
         return (objects, skip_source)
 
@@ -339,11 +341,11 @@ def _prep_compile (self, sources, output_dir):
 
 
     def _fix_object_args (self, objects, output_dir):
-        """Typecheck and fix up some arguments supplied to various
-           methods.  Specifically: ensure that 'objects' is a list; if
-           output_dir is None, replace with self.output_dir.  Return fixed
-           versions of 'objects' and 'output_dir'."""
-
+        """Typecheck and fix up some arguments supplied to various methods.
+        Specifically: ensure that 'objects' is a list; if output_dir is
+        None, replace with self.output_dir.  Return fixed versions of
+        'objects' and 'output_dir'.
+        """
         if type (objects) not in (ListType, TupleType):
             raise TypeError, \
                   "'objects' must be a list or tuple of strings"
@@ -359,11 +361,11 @@ def _fix_object_args (self, objects, output_dir):
 
     def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
         """Typecheck and fix up some of the arguments supplied to the
-           'link_*' methods.  Specifically: ensure that all arguments are
-           lists, and augment them with their permanent versions
-           (eg. 'self.libraries' augments 'libraries').  Return a tuple
-           with fixed versions of all arguments."""
-
+        'link_*' methods.  Specifically: ensure that all arguments are
+        lists, and augment them with their permanent versions
+        (eg. 'self.libraries' augments 'libraries').  Return a tuple with
+        fixed versions of all arguments.
+        """
         if libraries is None:
             libraries = self.libraries
         elif type (libraries) in (ListType, TupleType):
@@ -396,9 +398,9 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
 
 
     def _need_link (self, objects, output_file):
-        """Return true if we need to relink the files listed in 'objects' to
-           recreate 'output_file'."""
-
+        """Return true if we need to relink the files listed in 'objects'
+        to recreate 'output_file'.
+        """
         if self.force:
             return 1
         else:
@@ -438,44 +440,44 @@ def compile (self,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
-        """Compile one or more C/C++ source files.  'sources' must be
-           a list of strings, each one the name of a C/C++ source
-           file.  Return a list of object filenames, one per source
-           filename in 'sources'.  Depending on the implementation,
-           not all source files will necessarily be compiled, but
-           all corresponding object filenames will be returned.
-
-           If 'output_dir' is given, object files will be put under it,
-           while retaining their original path component.  That is,
-           "foo/bar.c" normally compiles to "foo/bar.o" (for a Unix
-           implementation); if 'output_dir' is "build", then it would
-           compile to "build/foo/bar.o".
-
-           'macros', if given, must be a list of macro definitions.  A
-           macro definition is either a (name, value) 2-tuple or a (name,)
-           1-tuple.  The former defines a macro; if the value is None, the
-           macro is defined without an explicit value.  The 1-tuple case
-           undefines a macro.  Later definitions/redefinitions/
-           undefinitions take precedence.
-
-           'include_dirs', if given, must be a list of strings, the
-           directories to add to the default include file search path for
-           this compilation only.
-
-           'debug' is a boolean; if true, the compiler will be instructed
-           to output debug symbols in (or alongside) the object file(s).
-
-           'extra_preargs' and 'extra_postargs' are implementation-
-           dependent.  On platforms that have the notion of a command-line
-           (e.g. Unix, DOS/Windows), they are most likely lists of strings:
-           extra command-line arguments to prepand/append to the compiler
-           command line.  On other platforms, consult the implementation
-           class documentation.  In any event, they are intended as an
-           escape hatch for those occasions when the abstract compiler
-           framework doesn't cut the mustard.
-
-           Raises CompileError on failure."""
-           
+        """Compile one or more C/C++ source files.  'sources' must be a
+        list of strings, each one the name of a C/C++ source file.  Return
+        a list of object filenames, one per source filename in 'sources'.
+        Depending on the implementation, not all source files will
+        necessarily be compiled, but all corresponding object filenames
+        will be returned.
+
+        If 'output_dir' is given, object files will be put under it, while
+        retaining their original path component.  That is, "foo/bar.c"
+        normally compiles to "foo/bar.o" (for a Unix implementation); if
+        'output_dir' is "build", then it would compile to
+        "build/foo/bar.o".
+
+        'macros', if given, must be a list of macro definitions.  A macro
+        definition is either a (name, value) 2-tuple or a (name,) 1-tuple.
+        The former defines a macro; if the value is None, the macro is
+        defined without an explicit value.  The 1-tuple case undefines a
+        macro.  Later definitions/redefinitions/ undefinitions take
+        precedence.
+
+        'include_dirs', if given, must be a list of strings, the
+        directories to add to the default include file search path for this
+        compilation only.
+
+        'debug' is a boolean; if true, the compiler will be instructed to
+        output debug symbols in (or alongside) the object file(s).
+
+        'extra_preargs' and 'extra_postargs' are implementation- dependent.
+        On platforms that have the notion of a command-line (e.g. Unix,
+        DOS/Windows), they are most likely lists of strings: extra
+        command-line arguments to prepand/append to the compiler command
+        line.  On other platforms, consult the implementation class
+        documentation.  In any event, they are intended as an escape hatch
+        for those occasions when the abstract compiler framework doesn't
+        cut the mustard.
+
+        Raises CompileError on failure.
+        """
         pass
 
 
@@ -484,25 +486,24 @@ def create_static_lib (self,
                            output_libname,
                            output_dir=None,
                            debug=0):
-        """Link a bunch of stuff together to create a static library
-           file.  The "bunch of stuff" consists of the list of object
-           files supplied as 'objects', the extra object files supplied
-           to 'add_link_object()' and/or 'set_link_objects()', the
-           libraries supplied to 'add_library()' and/or
-           'set_libraries()', and the libraries supplied as 'libraries'
-           (if any).
-
-           'output_libname' should be a library name, not a filename; the
-           filename will be inferred from the library name.  'output_dir'
-           is the directory where the library file will be put.
-
-           'debug' is a boolean; if true, debugging information will be
-           included in the library (note that on most platforms, it is the
-           compile step where this matters: the 'debug' flag is included
-           here just for consistency).
-
-           Raises LibError on failure."""
-
+        """Link a bunch of stuff together to create a static library file.
+        The "bunch of stuff" consists of the list of object files supplied
+        as 'objects', the extra object files supplied to
+        'add_link_object()' and/or 'set_link_objects()', the libraries
+        supplied to 'add_library()' and/or 'set_libraries()', and the
+        libraries supplied as 'libraries' (if any).
+
+        'output_libname' should be a library name, not a filename; the
+        filename will be inferred from the library name.  'output_dir' is
+        the directory where the library file will be put.
+
+        'debug' is a boolean; if true, debugging information will be
+        included in the library (note that on most platforms, it is the
+        compile step where this matters: the 'debug' flag is included here
+        just for consistency).
+
+        Raises LibError on failure.
+        """
         pass
     
 
@@ -517,44 +518,44 @@ def link_shared_lib (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
-        """Link a bunch of stuff together to create a shared library
-           file.  Similar semantics to 'create_static_lib()', with the
-           addition of other libraries to link against and directories to
-           search for them.  Also, of course, the type and name of
-           the generated file will almost certainly be different, as will
-           the program used to create it.
-
-           'libraries' is a list of libraries to link against.  These are
-           library names, not filenames, since they're translated into
-           filenames in a platform-specific way (eg. "foo" becomes
-           "libfoo.a" on Unix and "foo.lib" on DOS/Windows).  However, they
-           can include a directory component, which means the linker will
-           look in that specific directory rather than searching all the
-           normal locations.
-
-           'library_dirs', if supplied, should be a list of directories to
-           search for libraries that were specified as bare library names
-           (ie. no directory component).  These are on top of the system
-           default and those supplied to 'add_library_dir()' and/or
-           'set_library_dirs()'.  'runtime_library_dirs' is a list of
-           directories that will be embedded into the shared library and
-           used to search for other shared libraries that *it* depends on
-           at run-time.  (This may only be relevant on Unix.)
-
-           'export_symbols' is a list of symbols that the shared library
-           will export.  (This appears to be relevant only on Windows.)
-
-           'debug' is as for 'compile()' and 'create_static_lib()', with the
-           slight distinction that it actually matters on most platforms
-           (as opposed to 'create_static_lib()', which includes a 'debug'
-           flag mostly for form's sake).
-
-           'extra_preargs' and 'extra_postargs' are as for 'compile()'
-           (except of course that they supply command-line arguments
-           for the particular linker being used).
-
-           Raises LinkError on failure."""
 
+        """Link a bunch of stuff together to create a shared library file.
+        Similar semantics to 'create_static_lib()', with the addition of
+        other libraries to link against and directories to search for them.
+        Also, of course, the type and name of the generated file will
+        almost certainly be different, as will the program used to create
+        it.
+
+        'libraries' is a list of libraries to link against.  These are
+        library names, not filenames, since they're translated into
+        filenames in a platform-specific way (eg. "foo" becomes "libfoo.a"
+        on Unix and "foo.lib" on DOS/Windows).  However, they can include a
+        directory component, which means the linker will look in that
+        specific directory rather than searching all the normal locations.
+
+        'library_dirs', if supplied, should be a list of directories to
+        search for libraries that were specified as bare library names
+        (ie. no directory component).  These are on top of the system
+        default and those supplied to 'add_library_dir()' and/or
+        'set_library_dirs()'.  'runtime_library_dirs' is a list of
+        directories that will be embedded into the shared library and used
+        to search for other shared libraries that *it* depends on at
+        run-time.  (This may only be relevant on Unix.)
+
+        'export_symbols' is a list of symbols that the shared library will
+        export.  (This appears to be relevant only on Windows.)
+
+        'debug' is as for 'compile()' and 'create_static_lib()', with the
+        slight distinction that it actually matters on most platforms (as
+        opposed to 'create_static_lib()', which includes a 'debug' flag
+        mostly for form's sake).
+
+        'extra_preargs' and 'extra_postargs' are as for 'compile()' (except
+        of course that they supply command-line arguments for the
+        particular linker being used).
+
+        Raises LinkError on failure.
+        """
         pass
     
 
@@ -569,14 +570,15 @@ def link_shared_object (self,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None):
-        """Link a bunch of stuff together to create a shared object
-           file.  Much like 'link_shared_lib()', except the output filename
-           is explicitly supplied as 'output_filename'.  If 'output_dir' is
-           supplied, 'output_filename' is relative to it
-           (i.e. 'output_filename' can provide directory components if
-           needed).
-
-           Raises LinkError on failure."""
+        """Link a bunch of stuff together to create a shared object file.
+        Much like 'link_shared_lib()', except the output filename is
+        explicitly supplied as 'output_filename'.  If 'output_dir' is
+        supplied, 'output_filename' is relative to it
+        (i.e. 'output_filename' can provide directory components if
+        needed).
+
+        Raises LinkError on failure.
+        """
         pass
 
 
@@ -591,12 +593,13 @@ def link_executable (self,
                          extra_preargs=None,
                          extra_postargs=None):
         """Link a bunch of stuff together to create a binary executable
-           file.  The "bunch of stuff" is as for 'link_shared_lib()'.
-           'output_progname' should be the base name of the executable
-           program--e.g. on Unix the same as the output filename, but
-           on DOS/Windows ".exe" will be appended.
+        file.  The "bunch of stuff" is as for 'link_shared_lib()'.
+        'output_progname' should be the base name of the executable
+        program--e.g. on Unix the same as the output filename, but on
+        DOS/Windows ".exe" will be appended.
 
-           Raises LinkError on failure."""
+        Raises LinkError on failure.
+        """
         pass
 
 
@@ -607,24 +610,28 @@ def link_executable (self,
     # implement all of these.
 
     def library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of directories
-           searched for libraries."""
+        """Return the compiler option to add 'dir' to the list of
+        directories searched for libraries.
+        """
         raise NotImplementedError
 
     def runtime_library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of directories
-           searched for runtime libraries."""
+        """Return the compiler option to add 'dir' to the list of
+        directories searched for runtime libraries.
+        """
         raise NotImplementedError
 
     def library_option (self, lib):
         """Return the compiler option to add 'dir' to the list of libraries
-           linked into the shared library or executable."""
+        linked into the shared library or executable.
+        """
         raise NotImplementedError
 
     def find_library_file (self, dirs, lib):
         """Search the specified list of directories for a static or shared
-           library file 'lib' and return the full path to that file. Return
-           None if it wasn't found in any of the specified directories."""
+        library file 'lib' and return the full path to that file. Return
+        None if it wasn't found in any of the specified directories.
+        """
         raise NotImplementedError
 
 
@@ -776,18 +783,16 @@ def new_compiler (plat=None,
                   verbose=0,
                   dry_run=0,
                   force=0):
-
     """Generate an instance of some CCompiler subclass for the supplied
-       platform/compiler combination.  'plat' defaults to 'os.name'
-       (eg. 'posix', 'nt'), and 'compiler' defaults to the default
-       compiler for that platform.  Currently only 'posix' and 'nt'
-       are supported, and the default compilers are "traditional Unix
-       interface" (UnixCCompiler class) and Visual C++ (MSVCCompiler
-       class).  Note that it's perfectly possible to ask for a Unix
-       compiler object under Windows, and a Microsoft compiler object
-       under Unix -- if you supply a value for 'compiler', 'plat'
-       is ignored."""
-
+    platform/compiler combination.  'plat' defaults to 'os.name'
+    (eg. 'posix', 'nt'), and 'compiler' defaults to the default compiler
+    for that platform.  Currently only 'posix' and 'nt' are supported, and
+    the default compilers are "traditional Unix interface" (UnixCCompiler
+    class) and Visual C++ (MSVCCompiler class).  Note that it's perfectly
+    possible to ask for a Unix compiler object under Windows, and a
+    Microsoft compiler object under Unix -- if you supply a value for
+    'compiler', 'plat' is ignored.
+    """
     if plat is None:
         plat = os.name
 
@@ -820,15 +825,15 @@ def new_compiler (plat=None,
 
 
 def gen_preprocess_options (macros, include_dirs):
-    """Generate C pre-processor options (-D, -U, -I) as used by at
-       least two types of compilers: the typical Unix compiler and Visual
-       C++.  'macros' is the usual thing, a list of 1- or 2-tuples, where
-       (name,) means undefine (-U) macro 'name', and (name,value) means
-       define (-D) macro 'name' to 'value'.  'include_dirs' is just a list of
-       directory names to be added to the header file search path (-I).
-       Returns a list of command-line options suitable for either
-       Unix compilers or Visual C++."""
-    
+    """Generate C pre-processor options (-D, -U, -I) as used by at least
+    two types of compilers: the typical Unix compiler and Visual C++.
+    'macros' is the usual thing, a list of 1- or 2-tuples, where (name,)
+    means undefine (-U) macro 'name', and (name,value) means define (-D)
+    macro 'name' to 'value'.  'include_dirs' is just a list of directory
+    names to be added to the header file search path (-I).  Returns a list
+    of command-line options suitable for either Unix compilers or Visual
+    C++.
+    """
     # XXX it would be nice (mainly aesthetic, and so we don't generate
     # stupid-looking command lines) to go over 'macros' and eliminate
     # redundant definitions/undefinitions (ie. ensure that only the
@@ -872,12 +877,11 @@ def gen_preprocess_options (macros, include_dirs):
 
 def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
-       linking with specific libraries.  'libraries' and 'library_dirs'
-       are, respectively, lists of library names (not filenames!) and
-       search directories.  Returns a list of command-line options suitable
-       for use with some compiler (depending on the two format strings
-       passed in)."""
-
+    linking with specific libraries.  'libraries' and 'library_dirs' are,
+    respectively, lists of library names (not filenames!) and search
+    directories.  Returns a list of command-line options suitable for use
+    with some compiler (depending on the two format strings passed in).
+    """
     lib_opts = []
 
     for dir in library_dirs:

From 57d36e94b071791b0183ad6df383ff293b2ecbc7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 24 Jun 2000 20:40:02 +0000
Subject: [PATCH 0465/8469] Added 'split_quoted()' function to deal with
 strings that are quoted in Unix shell-like syntax (eg. in Python's Makefile,
 for one thing -- now that I have this function, I'll probably allow quoted
 strings in config files too.

---
 util.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/util.py b/util.py
index 74df8aa6a4..5c1de78997 100644
--- a/util.py
+++ b/util.py
@@ -166,3 +166,70 @@ def grok_environment_error (exc, prefix="error: "):
         error = prefix + str(exc[-1])
 
     return error
+
+
+# Needed by 'split_quoted()'
+_wordchars_re = re.compile(r'[^\\\'\"\ ]*')
+_squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
+_dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
+
+def split_quoted (s):
+    """Split a string up according to Unix shell-like rules for quotes and
+    backslashes.  In short: words are delimited by spaces, as long as those
+    spaces are not escaped by a backslash, or inside a quoted string.
+    Single and double quotes are equivalent, and the quote characters can
+    be backslash-escaped.  The backslash is stripped from any two-character
+    escape sequence, leaving only the escaped character.  The quote
+    characters are stripped from any quoted string.  Returns a list of
+    words.
+    """
+
+    # This is a nice algorithm for splitting up a single string, since it
+    # doesn't require character-by-character examination.  It was a little
+    # bit of a brain-bender to get it working right, though...
+
+    s = string.strip(s)
+    words = []
+    pos = 0
+
+    while s:
+        m = _wordchars_re.match(s, pos)
+        end = m.end()
+        if end == len(s):
+            words.append(s[:end])
+            break
+
+        if s[end] == ' ':               # unescaped, unquoted space: now
+            words.append(s[:end])       # we definitely have a word delimiter
+            s = string.lstrip(s[end:])
+            pos = 0
+
+        elif s[end] == '\\':            # preserve whatever is being escaped;
+                                        # will become part of the current word
+            s = s[:end] + s[end+1:]
+            pos = end+1
+
+        else:
+            if s[end] == "'":           # slurp singly-quoted string
+                m = _squote_re.match(s, end)
+            elif s[end] == '"':         # slurp doubly-quoted string
+                m = _dquote_re.match(s, end)
+            else:
+                raise RuntimeError, \
+                      "this can't happen (bad char '%c')" % s[end]
+
+            if m is None:
+                raise ValueError, \
+                      "bad string (mismatched %s quotes?)" % s[end]
+
+            (beg, end) = m.span()
+            s = s[:beg] + s[beg+1:end-1] + s[end:]
+            pos = m.end() - 2
+
+        if pos >= len(s):
+            words.append(s)
+            break
+
+    return words
+
+# split_quoted ()

From d710c3f8dee703894ec6e3e3ab6a4ead1b827be7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:05:29 +0000
Subject: [PATCH 0466/8469] Got rid of direct dependence on the sysconfig
 module.  Mainly, this meant playing along with the new "dictionary of
 executables" scheme added to CCompiler by adding the 'executables' class
 attribute, and changing all the compile/link/etc. methods to use the new
 attributes (which encapsulate both the program to run and its standard
 arguments, so it was a *little* bit more than just changing some names).

---
 unixccompiler.py | 102 ++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 67 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 47d8ad6325..85ce5df719 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -20,7 +20,6 @@
 import string, re, os
 from types import *
 from copy import copy
-from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -45,65 +44,42 @@
 
 class UnixCCompiler (CCompiler):
 
-    # XXX perhaps there should really be *three* kinds of include
-    # directories: those built in to the preprocessor, those from Python's
-    # Makefiles, and those supplied to {add,set}_include_dirs().  Currently
-    # we make no distinction between the latter two at this point; it's all
-    # up to the client class to select the include directories to use above
-    # and beyond the compiler's defaults.  That is, both the Python include
-    # directories and any module- or package-specific include directories
-    # are specified via {add,set}_include_dirs(), and there's no way to
-    # distinguish them.  This might be a bug.
-
     compiler_type = 'unix'
 
-    # Needed for the filename generation methods provided by the
-    # base class, CCompiler.
+    # These are used by CCompiler in two places: the constructor sets
+    # instance attributes 'preprocessor', 'compiler', etc. from them, and
+    # 'set_executable()' allows any of these to be set.  The defaults here
+    # are pretty generic; they will probably have to be set by an outsider
+    # (eg. using information discovered by the sysconfig about building
+    # Python extensions).
+    executables = {'preprocessor' : None,
+                   'compiler'     : ["cc"],
+                   'compiler_so'  : ["cc"],
+                   'linker_so'    : ["cc", "-shared"],
+                   'linker_exe'   : ["cc"],
+                   'archiver'     : ["ar", "-cr"],
+                   'ranlib'       : None,
+                  }
+
+    # Needed for the filename generation methods provided by the base
+    # class, CCompiler.  NB. whoever instantiates/uses a particular
+    # UnixCCompiler instance should set 'shared_lib_ext' -- we set a
+    # reasonable common default here, but it's not necessarily used on all
+    # Unices!
+
     src_extensions = [".c",".C",".cc",".cxx",".cpp"]
     obj_extension = ".o"
     static_lib_extension = ".a"
-    shared_lib_extension = sysconfig.SO
+    shared_lib_extension = ".so"
     static_lib_format = shared_lib_format = "lib%s%s"
 
-    # Command to create a static library: seems to be pretty consistent
-    # across the major Unices.  Might have to move down into the
-    # constructor if we need platform-specific guesswork.
-    archiver = sysconfig.AR
-    archiver_options = "-cr"
-    ranlib = sysconfig.RANLIB
-
 
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
                   force=0):
-
         CCompiler.__init__ (self, verbose, dry_run, force)
 
-        self.preprocess_options = None
-        self.compile_options = None
-
-        # Munge CC and OPT together in case there are flags stuck in CC.
-        # Note that using these variables from sysconfig immediately makes
-        # this module specific to building Python extensions and
-        # inappropriate as a general-purpose C compiler front-end.  So sue
-        # me.  Note also that we use OPT rather than CFLAGS, because CFLAGS
-        # is the flags used to compile Python itself -- not only are there
-        # -I options in there, they are the *wrong* -I options.  We'll
-        # leave selection of include directories up to the class using
-        # UnixCCompiler!
-
-        (self.cc, self.ccflags) = \
-            _split_command (sysconfig.CC + ' ' + sysconfig.OPT)
-        self.ccflags_shared = string.split (sysconfig.CCSHARED)
-
-        (self.ld_shared, self.ldflags_shared) = \
-            _split_command (sysconfig.LDSHARED)
-
-        self.ld_exec = self.cc
-
-    # __init__ ()
-
 
     def preprocess (self,
                     source,
@@ -116,11 +92,11 @@ def preprocess (self,
         (_, macros, include_dirs) = \
             self._fix_compile_args (None, macros, include_dirs)
         pp_opts = gen_preprocess_options (macros, include_dirs)
-        cc_args = ['-E'] + pp_opts
+        pp_args = self.preprocessor + pp_opts
         if output_file:
-            cc_args.extend(['-o', output_file])
+            pp_args.extend(['-o', output_file])
         if extra_preargs:
-            cc_args[:0] = extra_preargs
+            pp_args[:0] = extra_preargs
         if extra_postargs:
             extra_postargs.extend(extra_postargs)
 
@@ -131,7 +107,7 @@ def preprocess (self,
             if output_file:
                 self.mkpath(os.path.dirname(output_file))
             try:
-                self.spawn ([self.cc] + cc_args)
+                self.spawn (pp_args)
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
@@ -151,7 +127,7 @@ def compile (self,
 
         # Figure out the options for the compiler command line.
         pp_opts = gen_preprocess_options (macros, include_dirs)
-        cc_args = ['-c'] + pp_opts + self.ccflags + self.ccflags_shared
+        cc_args = pp_opts + ['-c']
         if debug:
             cc_args[:0] = ['-g']
         if extra_preargs:
@@ -168,7 +144,7 @@ def compile (self,
             else:
                 self.mkpath (os.path.dirname (obj))
                 try:
-                    self.spawn ([self.cc] + cc_args +
+                    self.spawn (self.compiler_so + cc_args +
                                 [src, '-o', obj] +
                                 extra_postargs)
                 except DistutilsExecError, msg:
@@ -193,9 +169,8 @@ def create_static_lib (self,
 
         if self._need_link (objects, output_filename):
             self.mkpath (os.path.dirname (output_filename))
-            self.spawn ([self.archiver,
-                         self.archiver_options,
-                         output_filename] +
+            self.spawn (self.archiver +
+                        [output_filename] +
                         objects + self.objects)
 
             # Not many Unices required ranlib anymore -- SunOS 4.x is, I
@@ -203,9 +178,9 @@ def create_static_lib (self,
             # platform intelligence here to skip ranlib if it's not
             # needed -- or maybe Python's configure script took care of
             # it for us, hence the check for leading colon.
-            if self.ranlib[0] != ':':
+            if self.ranlib:
                 try:
-                    self.spawn ([self.ranlib, output_filename])
+                    self.spawn (self.ranlib + [output_filename])
                 except DistutilsExecError, msg:
                     raise LibError, msg
         else:
@@ -263,7 +238,7 @@ def link_shared_object (self,
             output_filename = os.path.join (output_dir, output_filename)
 
         if self._need_link (objects, output_filename):
-            ld_args = (self.ldflags_shared + objects + self.objects + 
+            ld_args = (objects + self.objects + 
                        lib_opts + ['-o', output_filename])
             if debug:
                 ld_args[:0] = ['-g']
@@ -273,7 +248,7 @@ def link_shared_object (self,
                 ld_args.extend (extra_postargs)
             self.mkpath (os.path.dirname (output_filename))
             try:
-                self.spawn ([self.ld_shared] + ld_args)
+                self.spawn (self.linker_so + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
@@ -314,7 +289,7 @@ def link_executable (self,
                 ld_args.extend (extra_postargs)
             self.mkpath (os.path.dirname (output_filename))
             try:
-                self.spawn ([self.ld_exec] + ld_args)
+                self.spawn (self.linker_exe + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
@@ -359,10 +334,3 @@ def find_library_file (self, dirs, lib):
     # find_library_file ()
 
 # class UnixCCompiler
-
-
-def _split_command (cmd):
-    """Split a command string up into the progam to run (a string) and
-       the list of arguments; return them as (cmd, arglist)."""
-    args = string.split (cmd)
-    return (args[0], args[1:])

From 69604851149442fe1a0cba66cadf75e9fc6947fb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:08:18 +0000
Subject: [PATCH 0467/8469] Introduced some bureaucracy for setting and
 tracking the executables that a particular compiler system depends on.  This
 consists of the 'set_executables()' and 'set_executable()' methods, and a few
 lines in the constructor that expect implementation classes to provide an
 'executables' attribute, which we use to initialize several instance
 attributes.  The default implementation is somewhat biased in favour of a
 Unix/DOS "command-line" view of the world, but it shouldn't be too hard to
 override this for operating systems with a more sophisticated way of
 representing programs-to-execute.

---
 ccompiler.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 9aa41adb9d..e97c97776a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -12,7 +12,10 @@
 from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
-from distutils.util import move_file, mkpath, newer_pairwise, newer_group
+from distutils.file_util import move_file
+from distutils.dir_util import mkpath
+from distutils.dep_util import newer_pairwise, newer_group
+from distutils.util import split_quoted
 
 
 class CCompiler:
@@ -109,9 +112,56 @@ def __init__ (self,
         # named library files) to include on any link
         self.objects = []
 
+        for key in self.executables.keys():
+            self.set_executable(key, self.executables[key])
+
     # __init__ ()
 
 
+    def set_executables (self, **args):
+
+        """Define the executables (and options for them) that will be run
+        to perform the various stages of compilation.  The exact set of
+        executables that may be specified here depends on the compiler
+        class (via the 'executables' class attribute), but most will have:
+          compiler      the C/C++ compiler
+          linker_so     linker used to create shared objects and libraries
+          linker_exe    linker used to create binary executables
+          archiver      static library creator
+
+        On platforms with a command-line (Unix, DOS/Windows), each of these
+        is a string that will be split into executable name and (optional)
+        list of arguments.  (Splitting the string is done similarly to how
+        Unix shells operate: words are delimited by spaces, but quotes and
+        backslashes can override this.  See
+        'distutils.util.split_quoted()'.)
+        """
+
+        # Note that some CCompiler implementation classes will define class
+        # attributes 'cpp', 'cc', etc. with hard-coded executable names;
+        # this is appropriate when a compiler class is for exactly one
+        # compiler/OS combination (eg. MSVCCompiler).  Other compiler
+        # classes (UnixCCompiler, in particular) are driven by information
+        # discovered at run-time, since there are many different ways to do
+        # basically the same things with Unix C compilers.
+
+        for key in args.keys():
+            if not self.executables.has_key(key):
+                raise ValueError, \
+                      "unknown executable '%s' for class %s" % \
+                      (key, self.__class__.__name__)
+            self.set_executable(key, args[key])
+
+    # set_executables ()
+
+    def set_executable(self, key, value):
+        if type(value) is StringType:
+            setattr(self, key, split_quoted(value))
+        else:
+            setattr(self, key, value)
+        
+
+
     def _find_macro (self, name):
         i = 0
         for defn in self.macros:
@@ -429,6 +479,8 @@ def preprocess (self,
         definitions as for 'compile()', which will augment the macros set
         with 'define_macro()' and 'undefine_macro()'.  'include_dirs' is a
         list of directory names that will be added to the default list.
+
+        Raises PreprocessError on failure.
         """
         pass
 
@@ -440,8 +492,11 @@ def compile (self,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
-        """Compile one or more C/C++ source files.  'sources' must be a
-        list of strings, each one the name of a C/C++ source file.  Return
+
+        """Compile one or more source files.  'sources' must be a list of
+        filenames, most likely C/C++ files, but in reality anything that
+        can be handled by a particular compiler and compiler class
+        (eg. MSVCCompiler can handle resource files in 'sources').  Return
         a list of object filenames, one per source filename in 'sources'.
         Depending on the implementation, not all source files will
         necessarily be compiled, but all corresponding object filenames

From c0d32c47f1960aae8b43c2efd4deeaf996740fc6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:09:14 +0000
Subject: [PATCH 0468/8469] Added the 'customize_compiler()' function, which
 plugs in the essential information about building Python extensions that we
 discovered in Python's makefile.  Currently only needed on Unix, so does
 nothing on other systems.

---
 sysconfig.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 53da48264e..330d3b333c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -97,6 +97,23 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 # get_python_lib()
         
 
+def customize_compiler (compiler):
+    """Do any platform-specific customization of the CCompiler instance
+    'compiler'.  Mainly needed on Unix, so we can plug in the information
+    that varies across Unices and is stored in Python's Makefile.
+    """
+    if compiler.compiler_type == "unix":
+        cc_cmd = CC + ' ' + OPT
+        compiler.set_executables(
+            preprocessor=CC + " -E",    # not always!
+            compiler=cc_cmd,
+            compiler_so=cc_cmd + ' ' + CCSHARED,
+            linker_so=LDSHARED,
+            linker_exe=CC)
+
+        compiler.shared_lib_extension = SO
+
+
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
     inc_dir = get_python_inc(plat_specific=1)
@@ -260,6 +277,9 @@ def _init_nt():
     # Windows.  UnixCCompiler expects to find these values in sysconfig, so
     # here they are.  The fact that other Windows compilers don't need
     # these values is pure luck (hmmm).
+
+    # XXX I think these are now unnecessary...
+
     g['CC'] = "cc"                      # not gcc?
     g['RANLIB'] = "ranlib"
     g['AR'] = "ar"

From 9ce4a2b21ef10a62a81c34e979aa56e0f592d2b4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:10:46 +0000
Subject: [PATCH 0469/8469] Fixed a few silly bugs in my SWIG support code. 
 (Hey, I said it was   experimental and untested.) Call 'customize_compiler()'
 after getting CCompiler object.

---
 command/build_ext.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 6b7ec74190..f8df87a724 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -12,6 +12,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
+from distutils.sysconfig import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
 
@@ -191,6 +192,7 @@ def run (self):
                                       verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
+        customize_compiler(self.compiler)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
@@ -453,14 +455,14 @@ def swig_sources (self, sources):
 
         for source in sources:
             (base, ext) = os.path.splitext(source)
-            if ext in self.swig_ext():
+            if ext == ".i":             # SWIG interface file
                 new_sources.append(base + ".c") # umm, what if it's C++?
-                swig_files.append(source)
+                swig_sources.append(source)
                 swig_targets[source] = new_sources[-1]
             else:
                 new_sources.append(source)
 
-        if not swig_files:
+        if not swig_sources:
             return new_sources
 
         swig = self.find_swig()

From ef29e55a0092ccf9c959cd1cdb5edc96edf4dc8f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:10:58 +0000
Subject: [PATCH 0470/8469] Call 'customize_compiler()' after getting CCompiler
 object.

---
 command/build_clib.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/build_clib.py b/command/build_clib.py
index 7106882d79..450dae1754 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -23,6 +23,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
+from distutils.sysconfig import customize_compiler
 
 
 def show_compilers ():
@@ -111,6 +112,7 @@ def run (self):
                                       verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
+        customize_compiler(self.compiler)
 
         if self.include_dirs is not None:
             self.compiler.set_include_dirs (self.include_dirs)

From e4b7595cc2c3b3cfb5830579792155aa2b82494a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:12:14 +0000
Subject: [PATCH 0471/8469] Added PreprocessError and UnknownFileError (both
 used by CCompiler).

---
 errors.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/errors.py b/errors.py
index 161705633c..a718f01a40 100644
--- a/errors.py
+++ b/errors.py
@@ -78,6 +78,9 @@ class DistutilsInternalError (DistutilsError):
 class CCompilerError (Exception):
     """Some compile/link operation failed."""
 
+class PreprocessError (CCompilerError):
+    """Failure to preprocess one or more C/C++ files."""
+
 class CompileError (CCompilerError):
     """Failure to compile one or more C/C++ source files."""
 
@@ -89,4 +92,5 @@ class LinkError (CCompilerError):
     """Failure to link one or more C/C++ object files into an executable
     or shared library file."""
 
-
+class UnknownFileError (CCompilerError):
+    """Attempt to process an unknown file type."""

From b6aafbc5a3d6007b6579cc491ce55c9b34a64620 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:23:11 +0000
Subject: [PATCH 0472/8469] Fixed the "pre-link hook" so it actually works,
 mainly by renaming it to 'msvc_prelink_hack()', adding the parameters that it
 actually needs, and only calling it for MSVC compiler objects.  Generally
 gave up on the idea of a general "hook" mechanism: deleted the empty
 'precompile_hook()'.

---
 command/build_ext.py | 74 ++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 41 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f8df87a724..0a5fa9cd0d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -188,7 +188,8 @@ def run (self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (compiler=self.compiler,
+        self.compiler = new_compiler (#compiler=self.compiler,
+                                      compiler="msvc",
                                       verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
@@ -402,11 +403,6 @@ def build_extensions (self):
             if os.environ.has_key('CFLAGS'):
                 extra_args.extend(string.split(os.environ['CFLAGS']))
                 
-            # Run any platform/compiler-specific hooks needed before
-            # compiling (currently none, but any hypothetical subclasses
-            # might find it useful to override this).
-            self.precompile_hook()
-
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
                                              #macros=macros,
@@ -421,9 +417,9 @@ def build_extensions (self):
                 objects.extend (ext.extra_objects)
             extra_args = ext.extra_link_args
 
-            # Run any platform/compiler-specific hooks needed between
-            # compiling and linking (currently needed only on Windows).
-            self.prelink_hook()
+            # Bunch of fixing-up we have to do for Microsoft's linker.
+            if self.compiler.compiler_type == 'msvc':
+                self.msvc_prelink_hack(sources, ext, extra_args)
 
             self.compiler.link_shared_object (
                 objects, ext_filename, 
@@ -504,12 +500,9 @@ def find_swig (self):
     # find_swig ()
     
 
-    # -- Hooks ---------------------------------------------------------
-
-    def precompile_hook (self):
-        pass
+    # -- Hooks 'n hacks ------------------------------------------------
 
-    def prelink_hook (self):
+    def msvc_prelink_hack (self, sources, ext, extra_args):
 
         # XXX this is a kludge!  Knowledge of specific compilers or
         # platforms really doesn't belong here; in an ideal world, the
@@ -521,33 +514,32 @@ def prelink_hook (self):
         # Thus, kludges like this slip in occasionally.  (This is no
         # excuse for committing more platform- and compiler-specific
         # kludges; they are to be avoided if possible!)
-        if self.compiler.compiler_type == 'msvc':
-            def_file = ext.export_symbol_file
-            if def_file is None:
-                source_dir = os.path.dirname (sources[0])
-                ext_base = (string.split (ext.name, '.'))[-1]
-                def_file = os.path.join (source_dir, "%s.def" % ext_base)
-                if not os.path.exists (def_file):
-                    def_file = None
-
-            if def_file is not None:
-                extra_args.append ('/DEF:' + def_file)
-            else:
-                modname = string.split (ext.name, '.')[-1]
-                extra_args.append('/export:init%s'%modname)
-
-            # The MSVC linker generates unneeded .lib and .exp files,
-            # which cannot be suppressed by any linker switches.  So
-            # make sure they are generated in the temporary build
-            # directory.
-            implib_file = os.path.join (
-                self.build_temp,
-                self.get_ext_libname (ext.name))
-            extra_args.append ('/IMPLIB:' + implib_file)
-            self.mkpath (os.path.dirname (implib_file))
-        # if MSVC
-
-    # prelink_hook ()
+
+        def_file = ext.export_symbol_file
+        if def_file is None:
+            source_dir = os.path.dirname (sources[0])
+            ext_base = (string.split (ext.name, '.'))[-1]
+            def_file = os.path.join (source_dir, "%s.def" % ext_base)
+            if not os.path.exists (def_file):
+                def_file = None
+
+        if def_file is not None:
+            extra_args.append ('/DEF:' + def_file)
+        else:
+            modname = string.split (ext.name, '.')[-1]
+            extra_args.append('/export:init%s' % modname)
+
+        # The MSVC linker generates unneeded .lib and .exp files,
+        # which cannot be suppressed by any linker switches.  So
+        # make sure they are generated in the temporary build
+        # directory.
+        implib_file = os.path.join (
+            self.build_temp,
+            self.get_ext_libname (ext.name))
+        extra_args.append ('/IMPLIB:' + implib_file)
+        self.mkpath (os.path.dirname (implib_file))
+
+    # msvc_prelink_hack ()
 
 
     # -- Name generators -----------------------------------------------

From 2ae918a80f3a4fd7b6cfad6add81e149bc52e8c4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:30:15 +0000
Subject: [PATCH 0473/8469] Removed some debugging code that slipped into the
 last checkin. Ensure that 'extra_args' (whether compile or link args) is
 never None.

---
 command/build_ext.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0a5fa9cd0d..26d6981805 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -188,8 +188,7 @@ def run (self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (#compiler=self.compiler,
-                                      compiler="msvc",
+        self.compiler = new_compiler (compiler=self.compiler,
                                       verbose=self.verbose,
                                       dry_run=self.dry_run,
                                       force=self.force)
@@ -393,7 +392,7 @@ def build_extensions (self):
             # The environment variable should take precedence, and
             # any sensible compiler will give precendence to later
             # command line args.  Hence we combine them in order:
-            extra_args = ext.extra_compile_args
+            extra_args = ext.extra_compile_args or []
 
             # XXX and if we support CFLAGS, why not CC (compiler
             # executable), CPPFLAGS (pre-processor options), and LDFLAGS
@@ -415,7 +414,7 @@ def build_extensions (self):
             # that go into the mix.
             if ext.extra_objects:
                 objects.extend (ext.extra_objects)
-            extra_args = ext.extra_link_args
+            extra_args = ext.extra_link_args or []
 
             # Bunch of fixing-up we have to do for Microsoft's linker.
             if self.compiler.compiler_type == 'msvc':

From 7d785e9c7c3410b9c883c7bab41ebdcdfcab8244 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 25 Jun 2000 02:31:16 +0000
Subject: [PATCH 0474/8469] Define the 'executables' class attribute so the
 CCompiler constructor doesn't blow up.  We don't currently use the
 'set_executables()' bureaucracy, although it would be nice to do so for
 consistency with UnixCCompiler.

---
 msvccompiler.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 06d8501afa..2e80ed5fd7 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -167,6 +167,13 @@ class MSVCCompiler (CCompiler) :
 
     compiler_type = 'msvc'
 
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
     # Private class data (need to distinguish C from C++ source for compiler)
     _c_extensions = ['.c']
     _cpp_extensions = ['.cc','.cpp']
@@ -295,7 +302,7 @@ def create_static_lib (self,
             if extra_postargs:
                 lib_args.extend (extra_postargs)
             try:
-                self.spawn ([self.link] + ld_args)
+                self.spawn ([self.lib] + lib_args)
             except DistutilsExecError, msg:
                 raise LibError, msg
                 

From 2bc3b231e4cc5a7d5570923a0d49df5500171d35 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:21:22 +0000
Subject: [PATCH 0475/8469] Added 'include_dirs' parameters all over the place.
 Added 'check_lib()', which provides a subset of the functionality of  
 'check_func()' with a simpler interface and implementation.

---
 command/config.py | 58 +++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/command/config.py b/command/config.py
index 570f71a5c1..5c3f26a716 100644
--- a/command/config.py
+++ b/command/config.py
@@ -112,24 +112,26 @@ def _gen_temp_sourcefile (self, body, headers, lang):
         file.close()
         return filename
 
-    def _preprocess (self, body, headers, lang):
+    def _preprocess (self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         out = "_configtest.i"
         self.temp_files.extend([src, out])
-        self.compiler.preprocess(src, out)
+        self.compiler.preprocess(src, out, include_dirs=include_dirs)
         return (src, out)
 
-    def _compile (self, body, headers, lang):
+    def _compile (self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         if self.dump_source:
             dump_file(src, "compiling '%s':" % src)
         (obj,) = self.compiler.object_filenames([src])
         self.temp_files.extend([src, obj])
-        self.compiler.compile([src])
+        self.compiler.compile([src], include_dirs=include_dirs)
         return (src, obj)
 
-    def _link (self, body, headers, libraries, library_dirs, lang):
-        (src, obj) = self._compile(body, headers, lang)
+    def _link (self, body,
+               headers, include_dirs,
+               libraries, library_dirs, lang):
+        (src, obj) = self._compile(body, headers, include_dirs, lang)
         prog = os.path.splitext(os.path.basename(src))[0] 
         self.temp_files.append(prog)    # XXX should be prog + exe_ext
         self.compiler.link_executable([obj], prog,
@@ -159,7 +161,7 @@ def _clean (self, *filenames):
 
     # XXX need access to the header search path and maybe default macros.
 
-    def try_cpp (self, body=None, headers=None, lang="c"):
+    def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
         """Construct a source file from 'body' (a string containing lines
         of C/C++ code) and 'headers' (a list of header files to include)
         and run it through the preprocessor.  Return true if the
@@ -177,7 +179,8 @@ def try_cpp (self, body=None, headers=None, lang="c"):
         self._clean()
         return ok
 
-    def search_cpp (self, pattern, body=None, headers=None, lang="c"):
+    def search_cpp (self, pattern, body=None,
+                    headers=None, include_dirs=None, lang="c"):
         """Construct a source file (just like 'try_cpp()'), run it through
         the preprocessor, and return true if any line of the output matches
         'pattern'.  'pattern' should either be a compiled regex object or a
@@ -206,7 +209,7 @@ def search_cpp (self, pattern, body=None, headers=None, lang="c"):
         self._clean()
         return match
 
-    def try_compile (self, body, headers=None, lang="c"):
+    def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
         """Try to compile a source file built from 'body' and 'headers'.
         Return true on success, false otherwise.
         """
@@ -222,8 +225,8 @@ def try_compile (self, body, headers=None, lang="c"):
         self._clean()
         return ok
 
-    def try_link (self,
-                  body, headers=None,
+    def try_link (self, body,
+                  headers=None, include_dirs=None,
                   libraries=None, library_dirs=None,
                   lang="c"):
         """Try to compile and link a source file, built from 'body' and
@@ -233,7 +236,8 @@ def try_link (self,
         from distutils.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
-            self._link(body, headers, libraries, library_dirs, lang)
+            self._link(body, headers, include_dirs,
+                       libraries, library_dirs, lang)
             ok = 1
         except (CompileError, LinkError):
             ok = 0
@@ -242,8 +246,8 @@ def try_link (self,
         self._clean()
         return ok
             
-    def try_run (self,
-                 body, headers=None, 
+    def try_run (self, body,
+                 headers=None, include_dirs=None,
                  libraries=None, library_dirs=None,
                  lang="c"):
         """Try to compile, link to an executable, and run a program
@@ -253,7 +257,8 @@ def try_run (self,
         from distutils.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
-            self._link(body, headers, libraries, library_dirs, lang)
+            self._link(body, headers, include_dirs,
+                       libraries, library_dirs, lang)
             self.spawn([exe])
             ok = 1
         except (CompileError, LinkError, DistutilsExecError):
@@ -268,7 +273,8 @@ def try_run (self,
     # (these are the ones that are actually likely to be useful
     # when implementing a real-world config command!)
 
-    def check_func (self, func, headers=None,
+    def check_func (self, func,
+                    headers=None, include_dirs=None,
                     libraries=None, library_dirs=None,
                     decl=0, call=0):
 
@@ -298,16 +304,30 @@ def check_func (self, func, headers=None,
         body.append("}")
         body = string.join(body, "\n") + "\n"
 
-        return self.try_link(body, headers, libraries, library_dirs)
+        return self.try_link(body, headers, include_dirs,
+                             libraries, library_dirs)
 
     # check_func ()
 
-    def check_header (self, header, lang="c"):
+    def check_lib (self, library, library_dirs=None,
+                   headers=None, include_dirs=None):
+        """Determine if 'library' is available to be linked against,
+        without actually checking that any particular symbols are provided
+        by it.  'headers' will be used in constructing the source file to
+        be compiled, but the only effect of this is to check if all the
+        header files listed are available.
+        """
+        self._check_compiler()
+        return self.try_link("int main (void) { }",
+                             headers, include_dirs, [library], library_dirs)
+
+    def check_header (self, header, include_dirs=None,
+                      library_dirs=None, lang="c"):
         """Determine if the system header file named by 'header_file'
         exists and can be found by the preprocessor; return true if so,
         false otherwise.
         """
-        return self.try_cpp(headers=[header])
+        return self.try_cpp(headers=[header], include_dirs=include_dirs)
 
 
 # class config

From 1930cf43c4152c2db35164b0dca4a8a85f58c37d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:24:07 +0000
Subject: [PATCH 0476/8469] Infrastructure support for the "bdist_wininst"
 command.

---
 command/__init__.py | 1 +
 command/bdist.py    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/command/__init__.py b/command/__init__.py
index 95bce8d8c1..ef8e9ad694 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -20,4 +20,5 @@
            'bdist',
            'bdist_dumb',
            'bdist_rpm',
+           'bdist_wininst',
           ]
diff --git a/command/bdist.py b/command/bdist.py
index 47d4cbc965..3fcbf7793d 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -55,6 +55,8 @@ class bdist (Command):
                        'ztar':  ('bdist_dumb', "compressed tar file"),
                        'tar':   ('bdist_dumb', "tar file"),
                        'zip':   ('bdist_dumb', "ZIP file"),
+                       'wininst': ('bdist_wininst',
+                                   "Windows executable installer"),
                      }
     # establish the preferred order
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar', 'zip']

From 78fe2e5e7ee63ad56dc426dd2afbd2c3f986d196 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:24:38 +0000
Subject: [PATCH 0477/8469] Thomas Heller's "bdist_wininst" command
 (unreviewed, untested).

---
 command/bdist_wininst.py | 448 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 448 insertions(+)
 create mode 100644 command/bdist_wininst.py

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
new file mode 100644
index 0000000000..6a4b4722ce
--- /dev/null
+++ b/command/bdist_wininst.py
@@ -0,0 +1,448 @@
+"""distutils.command.bdist_wininst
+
+Implements the Distutils 'bdist_wininst' command: create a windows installer
+exe-program."""
+
+# created 2000/06/02, Thomas Heller
+
+__revision__ = "$Id$"
+
+import os, sys
+from distutils.core import Command
+from distutils.util import get_platform, create_tree, remove_tree
+from distutils.errors import *
+
+class bdist_wininst (Command):
+
+    description = "create a \"wininst\" built distribution"
+
+    user_options = [('bdist-dir=', 'd',
+                     "temporary directory for creating the distribution"),
+                    ('keep-tree', 'k',
+                     "keep the pseudo-installation tree around after " +
+                     "creating the distribution archive"),
+                    ('target-compile', 'c',
+                     "compile to .pyc on the target system"),
+                    ('target-optimize', 'o',
+                     "compile to .pyo on the target system"),
+                    ('target-version=', 'v',
+                     "require a specific python version" +
+                     " on the target system (1.5 or 1.6)"),
+                   ]
+
+    def initialize_options (self):
+        self.bdist_dir = None
+        self.keep_tree = 0
+        self.target_compile = 0
+        self.target_optimize = 0
+        self.target_version = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        if self.bdist_dir is None:
+            bdist_base = self.get_finalized_command('bdist').bdist_base
+            self.bdist_dir = os.path.join(bdist_base, 'wininst')
+        if not self.target_version:
+            self.target_version = ""
+        else:
+            if not self.target_version in ("1.5", "1.6"):
+                raise DistutilsOptionError (
+                    "target version must be 1.5 or 1.6")
+        if self.distribution.has_ext_modules():
+            short_version = sys.version[:3]
+            if self.target_version and self.target_version != short_version:
+                raise DistutilsOptionError ("target version can only be" +
+                                            short_version)
+            self.target_version = short_version
+
+    # finalize_options()
+
+
+    def run (self):
+
+        self.run_command ('build')
+
+        # XXX don't use 'self.get_finalized_command()', because it always
+        # runs 'ensure_finalized()' on the command object; we explictly
+        # want a command object that has *not* been finalized, so we can set
+        # options on it!  (The option we set, 'root', is so that we can do
+        # a proper "fake install" using this install command object.)
+        install = self.distribution.get_command_obj('install')
+        install.root = self.bdist_dir
+
+        install_lib = self.distribution.get_command_obj('install_lib')
+
+        install_lib.compile = 0
+        install_lib.optimize = 0
+
+        # The packager (correct term in distutils speak?) can choose
+        # if pyc and pyo files should be created on the TARGET system
+        # instead at the SOURCE system.
+
+##        # The compilation can only be done on the SOURCE system
+##        # for one python version (assuming 1.6 and 1.5 have incompatible
+##        # byte-codes).
+##        short_version = sys.version[:3]
+##        if self.target_version == short_version:
+##            if not self.target_compile:
+##                install_lib.compile = 1
+##            if not self.target_optimize:
+##                install_lib.optimize = 1
+
+        install_lib.ensure_finalized()
+
+        self.announce ("installing to %s" % self.bdist_dir)
+        install.ensure_finalized()
+
+        install.run()
+
+        # And make an archive relative to the root of the
+        # pseudo-installation tree.
+        archive_basename = "%s.win32" % self.distribution.get_fullname()
+        # XXX hack! Our archive MUST be relative to sys.prefix
+        # XXX What about .install_data, .install_scripts, ...?
+        root_dir = install.install_lib
+        arcname = self.make_archive (archive_basename, "zip",
+                           root_dir=root_dir)
+
+        self.create_exe (arcname)
+
+        if not self.keep_tree:
+            remove_tree (self.bdist_dir, self.verbose, self.dry_run)
+
+    # run()
+
+    def create_inifile (self):
+        # create an inifile containing data describing the installation.
+        # This could be done without creating a real file, but
+        # a file is (at least) usefull for debugging bdist_wininst.
+        import string
+
+        metadata = self.distribution.metadata
+
+        ini_name = "%s.ini" % self.distribution.get_fullname()
+
+        self.announce ("creating %s" % ini_name)
+
+        inifile = open (ini_name, "w")
+
+        # write the [metadata] section. values are written with repr()[1:],
+        # so they do not contain unprintable characters, and are not
+        # surrounded by quote chars
+        inifile.write ("[metadata]\n")
+
+        # 'info' will be displayed in the installers dialog box,
+        # describing the items to be installed
+        info = metadata.long_description + '\n'
+
+        for name in dir (metadata):
+            if (name != 'long_description'):
+                data = getattr (metadata, name)
+                if data:
+                   info = info + ("\n    %s: %s" % \
+                                  (string.capitalize (name), data))
+                   inifile.write ("%s=%s\n" % (name, repr (data)[1:-1]))
+
+        # The [setup] section contains entries controlling
+        # the installer runtime.
+        inifile.write ("\n[Setup]\n")
+        inifile.write ("info=%s\n" % repr (info)[1:-1])
+        inifile.write ("pthname=%s.%s\n" % (metadata.name, metadata.version))
+        inifile.write ("pyc_compile=%d\n" % self.target_compile)
+        inifile.write ("pyo_compile=%d\n" % self.target_optimize)
+        if self.target_version:
+            vers_minor = string.split (self.target_version, '.')[1]
+            inifile.write ("vers_minor=%s\n" % vers_minor)
+
+        title = self.distribution.get_fullname()
+        inifile.write ("title=%s\n" % repr (title)[1:-1])
+        inifile.close()
+        return ini_name
+
+    # create_inifile()
+
+    def create_exe (self, arcname):
+        import struct, zlib
+
+        cfgdata = open (self.create_inifile()).read()
+
+        comp_method = zlib.DEFLATED
+        co = zlib.compressobj (zlib.Z_DEFAULT_COMPRESSION, comp_method, -15)
+        zcfgdata = co.compress (cfgdata) + co.flush()
+
+        installer_name = "%s.win32.exe" % self.distribution.get_fullname()
+
+        self.announce ("creating %s" % installer_name)
+
+        file = open (installer_name, "wb")
+        file.write (self.get_exe_bytes ())
+        file.write (zcfgdata)
+        crc32 = zlib.crc32 (cfgdata)
+        header = struct.pack ("<iiiiiiii",
+                              0x12345678,       # tag
+                              comp_method,      # compression method
+                              crc32,            # checksum
+                              len (cfgdata),    # uncompressed length
+                              len (zcfgdata),   # compressed length
+                              0, 0, 0)          # reserved fields
+        file.write (header)
+        file.write (open (arcname, "rb").read())
+
+    # create_exe()
+
+    def get_exe_bytes (self):
+        import zlib, base64
+        return zlib.decompress (base64.decodestring (EXEDATA))
+
+# class bdist_wininst
+
+if __name__ == '__main__':
+    import zlib, base64
+    file = r"c:\wininst\wininst.exe"
+    data = open (file, "rb").read()
+    cdata = zlib.compress (data, 9)
+    bdata = base64.encodestring (cdata)
+    open ("EXEDATA", "w").write (bdata)
+    print "%d %d %d" % (len (data), len (cdata), len (bdata))
+
+EXEDATA = """
+eNrtfQt4U9eV7pEl28IIJIJNlMRJlCBaN3JcE5uMiYDK2HJMsI1s2TIkDsbYMrLwK9IRj4akENkT
+DhvlMU06aW/bSZp2pnMnM5OZ5jY0bYONSQzkwcMp0JJpIO1NZQyEJATMU/df+2z5BalnvszMN/f7
+fPi29jl7r7X2WmuvvdbaW0em9P6nJK0kSTqUWEyStknq5ZDGv46iTL31tanSK5PeuW2bpuSd2yp9
+TUFLe6BtVaCuxVJf19raJltWei2BUKulqdVSuMRtaWlr8GZNmZJiFTT66x9r/ceEE/Pj5eAtR+e/
+hDrrlg/n/zPqitujvN57c2z+TzjMyfmfCdgXeP9HvPbrjnO8iqZ6H/XFeXQ5JalEo5M8rxTPHebb
+qJmsSVKFdKltf1OCD1P82aHem1S9SNJwLT0v4HAl8E+TeDYNtZtG6Ci1UpK20s1TkuRLkP7zLvC5
+VfPF3Vmyd51MkiwQDDnGMIbLIkkrsgINdXKdJL0/WchuGtaJNGwLjiwVTCrMwscKFZnXo+G6sgLB
+QL0kZH1K0Nt4NT1p4pq4Jq6Ja+KauCauiWvimrgmrolr4vpvvarYCebUe9jpzi65aou+Y7e8ZOP5
+mlDhlmKNY+P57A3RjedzHp2x8XyrPHnj+UDot28mTSka6HszKaVo4EykVO/Xl7tiaaddDim80zAv
+JaSj/s1JIFk08I+bpxY5Bv5u41ek5Q/29HiYbNV7ooftkrSMTXllnUOKFGoS2JSXcde5+0VqCKV7
+otvQ7wDJ50HS43qReqM/RNvAHa7yWNogWpfxxs6uZfKNPtMKh+SKrkO/JzaHwzbjPrzTtLwHgm06
+YcIO2e2pVvtiab8COpvzY+LWO4hySdpOFKpdivNM7CAkYIc7j8jfjDkH3ZHO01diMV86DRBLc5SD
+Xd7iilUZQB/aSow5Lw1kQ9Jzh2/qCh81hLvqXXG01KvQohfxGd6Z6o6FBn0JOkmKzcl+gniaB5hq
+vxQ7uGzZwMZY6EwsTY8W5ry0rHb5A7tVMej0IafLM9epf51u5TkuqN5V7omF9C6fNA3E0p4ifUU6
+pUuxGLXG0kzlfE7wEEvbis6BpM28V4UBwGY0RkpNttPlkY5EFc/gQftP+WSaVDi/yVfCZZmzM0Lc
+FoJqTtfyOF9Qb8RpcAE2xsf1UcsoGjFOo+ZqGrt7XtiGSfGEBxPkRWwONYYHtXJBeFAjL/TP9KXX
+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
+g0P4QXgJcL4SKedqAR9U+RT0eYea7dFFP9ZOb3RI9MdDTKgllDNeh3QUZR/KNq/aR3K2YCfWROYi
+LIvwV4YaGyG1V7hgwAXR0lTf5G2VIVwLfJbENSYgkCp64QSG4LnCx/S1jtDHkKD1PGUdam+GmwzU
+NX9dqET0qmdPdD61IlkcZOnFfy+iV884K/XqeWBFsnpuSO3tos4WBLporSWr51fUvkLUFtH/fPyA
+VNQbRe0Q/UcFfpJoXypqs+in/6bEnayeU1L7OlHnif59qMqT1TM/aveJOkP0vyye9aLeLOpi0X9a
+jK8T7ZWipp/fVenV808a3ybaZVHnCvxdYvwpor1B1FbR/1PxHKffIepC0R8V48f5qxF1uuh/juYh
+WT2fpfYNop4n+g+L+bletDeLOlP0bxPPBlFvFXWJ6B8U42tFe4WorxPyvyjknynaA6K+S+DvFPJP
+Fu0rRX276P+xeE4Q9WOiXij6/yjGTxbt94v6RtH/jJC/QLR/U9T3iP73hPzTRbtf1HeI/lfEc9w+
+t4j6PtF/RoyfKNo9oqZv5LqE3ZL8OaJ9jajvFvhvC/mNor1R1F8R/S+J57h9/6Woi0T/CTH+JNG+
+XNS3iP7vC/nrRfujol4g+t8X8t8k2ltFnSX6fyWep4r6CVGXif5LY9Z/ueifJuY/PGb9PyTq2QJ/
+x5j1Xyfq20T/j8SzRtSbRJ0v+j8cs/6XifoG0f9XY9b/elHPFf0Hxqz/JlF/TfT/q3iO61cR9SLR
+/+mY9V8l6jRq16vffYxc/yFRzxH4e8asf6+oZ4n+/y2e4/bVKWqn6D8+Zv0/KOqbRf/3xqz/R0Q9
+X/T/bsz6bxH1naL/NfEc5y8i6lLRf2HM+o+PM13Mf8+Y9R8UdY7Af3PM+o/b6UzR/7fiOU4/LOoC
+0f/RmPX/gKhvEv3fGbP+Hxa1XfQfHLP+V4vaJvp/Lp7j/DFRLxb9Z8es/2pRX/8F63+tqP9C4L87
+Zv2vEvVXRf8/iee4fI+L+l7Rf2rM+q8V9a2i/4dj1v+3RP0N0f/7Meu/TdRfF/2vi+c4f0+Keono
+v/Il43/3OPH/hXHi/7Fx4v/T48T//ePE/38ZJ/5/8iXj/+5x4v/fjxP/+8eJ/98dJ/7/dpz4/4tx
+4v/5Lxn/3xgn/v9knPj/f8eJ/8+OE/9/M078/z/jxP/Pv2T8f2ec+P+P48T/k+PE/x+ME///bZz4
+/+tx4v/lLxn/e8aJ/y+OE///ME78//Y48b9vnPj/s3Hi/2dfMv6/NU78/4dx4v/AOPH/f40T/4+M
+E/9/OU78v/gl43/vOPH/78aJ/38aJ/7/9Tjx/9A48f/VceL/uS8Z//eOE///eZz4//E48f9vxon/
+H4wT/7ePE//phSZXoro+qxPVd2Pciep6eiBRfRemPFHVz7JE9V2ZqkR1/T6YqL4bQ/g0v0sT1Xdq
+KhPV9V+TqL5DU5Goynd/ovqOjSdR9QNdiep7NYSfIMbfJMa/IT6+WR0/OT5+kjp+XXx8ga+Lj69V
+x58dHz9bHX9KfHyDOn73iPHV8xo6mLM0rG+ta2mqH3G0FLTI9LUoHVYHQyuD9YGmlXTa9UVwI2iN
+OXbh3WPpXBPG29Iurx8+zaFGy9omdI86oxrmeSQg9Y3ldWx//N0lrXgfySjeCyObIvsim4gBIEZ/
+IxQAMQDEAEB/vCv2rfhbcMKnT1wT18Q1cU1cE9fE9V94aXgOZr7qf2zX8D1H9jXak3XqOceKp5Af
+XeP/t+/S7+I4fO8mpWo+4PUi7CGDkowMqxn/6nDXhKyylaeNpdgfWFDqOAzdeaUA+hvFiBp+fFQp
+7ZHuwo6zXxuLbQQM0QqoJycExWGeEDAJEsEUYKQ2UIynJxs5TLq0TfodYAa0LeirB4Vm1LVSO6i1
+IdMOAD6Ifzn8NMI1pnW24CmB00qWXpKSkHyeAE+PCflIsnoxok7/LwIuGXAbpSjgNom+SeJYLFna
+irw3RTrF5ari/FrQtR6UfFxHFoyape4NSQppE8e7Q/oepJ0qfXwNmksEzdPj0Lx7aNbi8vwAOZue
+vxv+mFQISUhu0lEb7tar5yMj9D0IHtLAw6d8nCz+b+KauCauiWvimrgmrolr4pq4Jq6Ja+L6n3H9
+Pzrvwu8=
+"""

From fb986d87edb588c61783d078ef07ef58982efdfc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:37:10 +0000
Subject: [PATCH 0478/8469] Thomas Heller: added --swig-cpp option and fixed
 silly typos in SWIG support. Also supposedly made some change to where .lib
 files wind up under MSVC++,   but I don't understand how to code is doing
 what Thomas says it's   doing.

---
 command/build_ext.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 26d6981805..106faccb28 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -77,6 +77,8 @@ class build_ext (Command):
          "forcibly build everything (ignore file timestamps)"),
         ('compiler=', 'c',
          "specify the compiler type"),
+        ('swig-cpp', None,
+         "make SWIG create C++ files (default is C)"),
         ]
 
     help_options = [
@@ -101,6 +103,7 @@ def initialize_options (self):
         self.debug = None
         self.force = None
         self.compiler = None
+        self.swig_cpp = None
 
 
     def finalize_options (self):
@@ -443,15 +446,20 @@ def swig_sources (self, sources):
         swig_sources = []
         swig_targets = {}
 
-        # XXX this drops generated C files into the source tree, which
+        # XXX this drops generated C/C++ files into the source tree, which
         # is fine for developers who want to distribute the generated
         # source -- but there should be an option to put SWIG output in
         # the temp dir.
 
+        if self.swig_cpp:
+            target_ext = '.cpp'
+        else:
+            target_ext = '.c'
+
         for source in sources:
             (base, ext) = os.path.splitext(source)
             if ext == ".i":             # SWIG interface file
-                new_sources.append(base + ".c") # umm, what if it's C++?
+                new_sources.append(base + target_ext)
                 swig_sources.append(source)
                 swig_targets[source] = new_sources[-1]
             else:
@@ -461,11 +469,14 @@ def swig_sources (self, sources):
             return new_sources
 
         swig = self.find_swig()
-        swig_cmd = [swig, "-python", "-dnone", "-ISWIG"] # again, C++?!?
+        swig_cmd = [swig, "-python", "-dnone", "-ISWIG"]
+        if self.swig_cpp:
+            swig_cmd.append ("-c++")
 
         for source in swig_sources:
-            self.announce ("swigging %s to %s" % (src, obj))
-            self.spawn(swig_cmd + ["-o", swig_targets[source], source])
+            target = swig_targets[source]
+            self.announce ("swigging %s to %s" % (source, target))
+            self.spawn(swig_cmd + ["-o", target, source])
 
         return new_sources
 
@@ -528,10 +539,11 @@ def msvc_prelink_hack (self, sources, ext, extra_args):
             modname = string.split (ext.name, '.')[-1]
             extra_args.append('/export:init%s' % modname)
 
-        # The MSVC linker generates unneeded .lib and .exp files,
-        # which cannot be suppressed by any linker switches.  So
-        # make sure they are generated in the temporary build
-        # directory.
+        # The MSVC linker generates .lib and .exp files, which cannot be
+        # suppressed by any linker switches. The .lib files may even be
+        # needed! Make sure they are generated in the temporary build
+        # directory. Since they have different names for debug and release
+        # builds, they can go into the same directory.
         implib_file = os.path.join (
             self.build_temp,
             self.get_ext_libname (ext.name))

From f73b0b9df04af727d477c1f326fc1b82639b8ead Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:43:24 +0000
Subject: [PATCH 0479/8469] A-ha!  Read Thomas' patch a little more carefully
 and figured it out: the 'implib_dir' attribute is back (only on NT, of
 course).

---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 106faccb28..f8aa91cae3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -155,6 +155,7 @@ def finalize_options (self):
         # also Python's library directory must be appended to library_dirs
         if os.name == 'nt':
             self.library_dirs.append (os.path.join(sys.exec_prefix, 'libs'))
+            self.implib_dir = self.build_temp
             if self.debug:
                 self.build_temp = os.path.join (self.build_temp, "Debug")
             else:
@@ -545,7 +546,7 @@ def msvc_prelink_hack (self, sources, ext, extra_args):
         # directory. Since they have different names for debug and release
         # builds, they can go into the same directory.
         implib_file = os.path.join (
-            self.build_temp,
+            self.implib_dir,
             self.get_ext_libname (ext.name))
         extra_args.append ('/IMPLIB:' + implib_file)
         self.mkpath (os.path.dirname (implib_file))

From 603c444d6b9ead884a9c09ca25b5fb707ca622b6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:59:06 +0000
Subject: [PATCH 0480/8469] Fixed LDSHARED for AIX, based on a patch by Rene
 Liebscher. Ditched my old code that fixed relative paths in the Makefile --
 didn't work,   doomed to failure, etc.

---
 sysconfig.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 330d3b333c..9ca94ed9c8 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -222,21 +222,6 @@ def parse_makefile(fp, g=None):
                 # bogus variable reference; just drop it since we can't deal
                 del notdone[name]
 
-    # "Fix" all pathnames in the Makefile that are explicitly relative,
-    # ie. that start with "./".  This is a kludge to fix the "./ld_so_aix"
-    # problem, the nature of which is that Python's installed Makefile
-    # refers to "./ld_so_aix", but when we are building extensions we are
-    # far from the directory where Python's Makefile (and ld_so_aix, for
-    # that matter) is installed.  Unfortunately, there are several other
-    # relative pathnames in the Makefile, and this fix doesn't fix them,
-    # because the layout of Python's source tree -- which is what the
-    # Makefile refers to -- is not fully preserved in the Python
-    # installation.  Grumble.
-    from os.path import normpath, join, dirname
-    for (name, value) in done.items():
-        if value[0:2] == "./":
-            done[name] = normpath(join(dirname(fp.name), value))
-
     # save the results in the global dictionary
     g.update(done)
     return g
@@ -257,6 +242,18 @@ def _init_posix():
         raise DistutilsPlatformError, my_msg
               
     parse_makefile(file, g)
+    
+    # On AIX, there are wrong paths to the linker scripts in the Makefile
+    # -- these paths are relative to the Python source, but when installed
+    # the scripts are in another directory.
+    if sys.platform: # == 'aix4':          # what about AIX 3.x ?
+        # Linker script is in the config directory, not in Modules as the
+        # Makefile says.
+        python_lib = get_python_lib(standard_lib=1)
+        ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
+        python_exp = os.path.join(python_lib, 'config', 'python.exp')
+
+        g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
 
 
 def _init_nt():

From ecb70087dbb4512152365262d97e3879509cbec1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 27 Jun 2000 01:59:43 +0000
Subject: [PATCH 0481/8469] Oops, only do that AIX hack on AIX.

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9ca94ed9c8..b2aa3f2d1e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -246,7 +246,7 @@ def _init_posix():
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.
-    if sys.platform: # == 'aix4':          # what about AIX 3.x ?
+    if sys.platform == 'aix4':          # what about AIX 3.x ?
         # Linker script is in the config directory, not in Modules as the
         # Makefile says.
         python_lib = get_python_lib(standard_lib=1)

From 9a02fc21cdba079187b15393495606987817c20e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 00:36:40 +0000
Subject: [PATCH 0482/8469] Fixed to use 'reinitialize_command()' to fetch the
 "install" command object.

---
 command/bdist_dumb.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 51e35e4b15..f9c81fc247 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -58,12 +58,7 @@ def run (self):
 
         self.run_command ('build')
 
-        # XXX don't use 'self.get_finalized_command()', because it always runs
-        # 'ensure_finalized()' on the command object; we explictly want a
-        # command object that has *not* been finalized, so we can set
-        # options on it!  (The option we set, 'root', is so that we can do
-        # a proper "fake install" using this install command object.)
-        install = self.distribution.get_command_obj('install')
+        install = self.reinitialize_command('install')
         install.root = self.bdist_dir
 
         self.announce ("installing to %s" % self.bdist_dir)

From 60c49dce0d05efd5482eb0d8dc99f969a6b981f8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 00:56:20 +0000
Subject: [PATCH 0483/8469] Fixed to use 'reinitialize_command()' to fetch
 "install" and "install_lib"   command objects. Various formatting tweaks,
 typo fixes in comments.

---
 command/bdist_wininst.py | 48 +++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 6a4b4722ce..d3d17721e1 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -7,14 +7,14 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import sys, os, string
 from distutils.core import Command
 from distutils.util import get_platform, create_tree, remove_tree
 from distutils.errors import *
 
 class bdist_wininst (Command):
 
-    description = "create a \"wininst\" built distribution"
+    description = "create an executable installer for MS Windows"
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
@@ -64,22 +64,15 @@ def run (self):
 
         self.run_command ('build')
 
-        # XXX don't use 'self.get_finalized_command()', because it always
-        # runs 'ensure_finalized()' on the command object; we explictly
-        # want a command object that has *not* been finalized, so we can set
-        # options on it!  (The option we set, 'root', is so that we can do
-        # a proper "fake install" using this install command object.)
-        install = self.distribution.get_command_obj('install')
+        install = self.reinitialize_command('install')
         install.root = self.bdist_dir
 
-        install_lib = self.distribution.get_command_obj('install_lib')
-
+        install_lib = self.reinitialize_command('install_lib')
         install_lib.compile = 0
         install_lib.optimize = 0
 
-        # The packager (correct term in distutils speak?) can choose
-        # if pyc and pyo files should be created on the TARGET system
-        # instead at the SOURCE system.
+        # The packager can choose if .pyc and .pyo files should be created
+        # on the TARGET system instead at the SOURCE system.
 
 ##        # The compilation can only be done on the SOURCE system
 ##        # for one python version (assuming 1.6 and 1.5 have incompatible
@@ -95,7 +88,6 @@ def run (self):
 
         self.announce ("installing to %s" % self.bdist_dir)
         install.ensure_finalized()
-
         install.run()
 
         # And make an archive relative to the root of the
@@ -103,10 +95,14 @@ def run (self):
         archive_basename = "%s.win32" % self.distribution.get_fullname()
         # XXX hack! Our archive MUST be relative to sys.prefix
         # XXX What about .install_data, .install_scripts, ...?
+        # [Perhaps require that all installation dirs be under sys.prefix
+        # on Windows?  this will be acceptable until we start dealing
+        # with Python applications, at which point we should zip up
+        # the application directory -- and again everything can be
+        # under one dir --GPW]
         root_dir = install.install_lib
         arcname = self.make_archive (archive_basename, "zip",
-                           root_dir=root_dir)
-
+                                     root_dir=root_dir)
         self.create_exe (arcname)
 
         if not self.keep_tree:
@@ -115,26 +111,23 @@ def run (self):
     # run()
 
     def create_inifile (self):
-        # create an inifile containing data describing the installation.
+        # Create an inifile containing data describing the installation.
         # This could be done without creating a real file, but
-        # a file is (at least) usefull for debugging bdist_wininst.
-        import string
+        # a file is (at least) useful for debugging bdist_wininst.
 
         metadata = self.distribution.metadata
-
-        ini_name = "%s.ini" % self.distribution.get_fullname()
+        ini_name = "%s.ini" % metadata.get_fullname()
 
         self.announce ("creating %s" % ini_name)
-
         inifile = open (ini_name, "w")
 
-        # write the [metadata] section. values are written with repr()[1:],
-        # so they do not contain unprintable characters, and are not
-        # surrounded by quote chars
+        # Write the [metadata] section.  Values are written with
+        # repr()[1:-1], so they do not contain unprintable characters, and
+        # are not surrounded by quote chars.
         inifile.write ("[metadata]\n")
 
-        # 'info' will be displayed in the installers dialog box,
-        # describing the items to be installed
+        # 'info' will be displayed in the installer's dialog box,
+        # describing the items to be installed.
         info = metadata.long_description + '\n'
 
         for name in dir (metadata):
@@ -173,7 +166,6 @@ def create_exe (self, arcname):
         zcfgdata = co.compress (cfgdata) + co.flush()
 
         installer_name = "%s.win32.exe" % self.distribution.get_fullname()
-
         self.announce ("creating %s" % installer_name)
 
         file = open (installer_name, "wb")

From 834a327e9f342c7903be01c24ecca10ff2c8138a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 01:20:35 +0000
Subject: [PATCH 0484/8469] Lyle Johnson's interface to Borland C++, with a few
 editorial comments by me. Two major points:   * lots of overlap with
 MSVCCompiler; the common code really should be     factored out into a base
 class, say WindowsCCompiler   * it doesn't work: weird problem spawning the
 linker (see comment for     details)

---
 bcppcompiler.py | 344 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 344 insertions(+)
 create mode 100644 bcppcompiler.py

diff --git a/bcppcompiler.py b/bcppcompiler.py
new file mode 100644
index 0000000000..6c9ac827c1
--- /dev/null
+++ b/bcppcompiler.py
@@ -0,0 +1,344 @@
+"""distutils.bcppcompiler
+
+Contains BorlandCCompiler, an implementation of the abstract CCompiler class
+for the Borland C++ compiler.
+"""
+
+# This implementation by Lyle Johnson, based on the original msvccompiler.py
+# module and using the directions originally published by Gordon Williams.
+
+# XXX looks like there's a LOT of overlap between these two classes:
+# someone should sit down and factor out the common code as
+# WindowsCCompiler!  --GPW
+
+# XXX Lyle reports that this doesn't quite work yet:
+# """...but this is what I've got so far. The compile step works fine but
+# when it runs the link step I get an "out of memory" failure.  Since
+# spawn() echoes the command it's trying to spawn, I can type the link line
+# verbatim at the DOS prompt and it links the Windows DLL correctly -- so
+# the syntax is correct. There's just some weird interaction going on when
+# it tries to "spawn" the link process from within the setup.py script. I'm
+# not really sure how to debug this one right off-hand; obviously there's
+# nothing wrong with the "spawn()" function since it's working properly for
+# the compile stage."""
+
+__revision__ = "$Id$"
+
+
+import sys, os, string
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
+     CompileError, LibError, LinkError
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
+
+
+class BCPPCompiler(CCompiler) :
+    """Concrete class that implements an interface to the Borland C/C++
+    compiler, as defined by the CCompiler abstract class.
+    """
+
+    compiler_type = 'bcpp'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = _c_extensions + _cpp_extensions
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
+
+        CCompiler.__init__ (self, verbose, dry_run, force)
+
+        # These executables are assumed to all be in the path.
+        # Borland doesn't seem to use any special registry settings to
+        # indicate their installation locations.
+
+        self.cc = "bcc32.exe"
+        self.link = "ilink32.exe"
+        self.lib = "tlib.exe"
+
+        self.preprocess_options = None
+        self.compile_options = ['/tWM', '/O2', '/q']
+        self.compile_options_debug = ['/tWM', '/Od', '/q']
+
+        self.ldflags_shared = ['/Tpd', '/Gn', '/q', '/x']
+        self.ldflags_shared_debug = ['/Tpd', '/Gn', '/q', '/x']
+        self.ldflags_static = []
+
+
+    # -- Worker methods ------------------------------------------------
+
+    def compile (self,
+                 sources,
+                 output_dir=None,
+                 macros=None,
+                 include_dirs=None,
+                 debug=0,
+                 extra_preargs=None,
+                 extra_postargs=None):
+
+        (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile (sources, output_dir)
+
+        if extra_postargs is None:
+            extra_postargs = []
+
+        pp_opts = gen_preprocess_options (macros, include_dirs)
+        compile_opts = extra_preargs or []
+        compile_opts.append ('-c')
+        if debug:
+            compile_opts.extend (self.compile_options_debug)
+        else:
+            compile_opts.extend (self.compile_options)
+        
+        for i in range (len (sources)):
+            src = sources[i] ; obj = objects[i]
+            ext = (os.path.splitext (src))[1]
+
+            if skip_sources[src]:
+                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+            else:
+                if ext in self._c_extensions:
+                    input_opt = ""
+                elif ext in self._cpp_extensions:
+                    input_opt = "-P"
+
+                output_opt = "-o" + obj
+
+                self.mkpath (os.path.dirname (obj))
+
+                # Compiler command line syntax is: "bcc32 [options] file(s)".
+                # Note that the source file names must appear at the end of
+                # the command line.
+
+                try:
+                    self.spawn ([self.cc] + compile_opts + pp_opts +
+                                [input_opt, output_opt] +
+                                extra_postargs + [src])
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
+
+        return objects
+
+    # compile ()
+
+
+    def create_static_lib (self,
+                           objects,
+                           output_libname,
+                           output_dir=None,
+                           debug=0,
+                           extra_preargs=None,
+                           extra_postargs=None):
+
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        output_filename = \
+            self.library_filename (output_libname, output_dir=output_dir)
+
+        if self._need_link (objects, output_filename):
+            lib_args = [output_filename, '/u'] + objects
+            if debug:
+                pass                    # XXX what goes here?
+            if extra_preargs:
+                lib_args[:0] = extra_preargs
+            if extra_postargs:
+                lib_args.extend (extra_postargs)
+            try:
+               self.spawn ([self.lib] + lib_args)
+            except DistutilsExecError, msg:
+               raise LibError, msg
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
+
+    # create_static_lib ()
+    
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         runtime_library_dirs=None,
+                         export_symbols=None,
+                         debug=0,
+                         extra_preargs=None,
+                         extra_postargs=None,
+                         build_temp=None):
+
+        self.link_shared_object (objects,
+                                 self.shared_library_name(output_libname),
+                                 output_dir=output_dir,
+                                 libraries=libraries,
+                                 library_dirs=library_dirs,
+                                 runtime_library_dirs=runtime_library_dirs,
+                                 export_symbols=export_symbols,
+                                 debug=debug,
+                                 extra_preargs=extra_preargs,
+                                 extra_postargs=extra_postargs,
+                                 build_temp=build_temp)
+                    
+    
+    def link_shared_object (self,
+                            objects,
+                            output_filename,
+                            output_dir=None,
+                            libraries=None,
+                            library_dirs=None,
+                            runtime_library_dirs=None,
+                            export_symbols=None,
+                            debug=0,
+                            extra_preargs=None,
+                            extra_postargs=None,
+                            build_temp=None):
+
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+        
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        if self._need_link (objects, output_filename):
+
+            if debug:
+                ldflags = self.ldflags_shared_debug
+            else:
+                ldflags = self.ldflags_shared
+
+            startup_obj = 'c0d32'
+
+            libraries.append ('mypylib')
+            libraries.append ('import32')
+            libraries.append ('cw32mt')
+
+            # Create a temporary exports file for use by the linker
+            head, tail = os.path.split (output_filename)
+            modname, ext = os.path.splitext (tail)
+            def_file = os.path.join (build_temp, '%s.def' % modname)
+            f = open (def_file, 'w')
+            f.write ('EXPORTS\n')
+            for sym in (export_symbols or []):
+                f.write ('  %s=_%s\n' % (sym, sym))
+
+            ld_args = ldflags + [startup_obj] + objects + \
+                [',%s,,' % output_filename] + \
+                libraries + [',' + def_file]
+            
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
+
+            self.mkpath (os.path.dirname (output_filename))
+            try:
+                self.spawn ([self.link] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
+
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)
+
+    # link_shared_object ()
+
+
+    def link_executable (self,
+                         objects,
+                         output_progname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         runtime_library_dirs=None,
+                         debug=0,
+                         extra_preargs=None,
+                         extra_postargs=None):
+
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+        
+        lib_opts = gen_lib_options (self,
+                                    library_dirs, runtime_library_dirs,
+                                    libraries)
+        output_filename = output_progname + self.exe_extension
+        if output_dir is not None:
+            output_filename = os.path.join (output_dir, output_filename)
+
+        if self._need_link (objects, output_filename):
+
+            if debug:
+                ldflags = self.ldflags_shared_debug[1:]
+            else:
+                ldflags = self.ldflags_shared[1:]
+
+            ld_args = ldflags + lib_opts + \
+                      objects + ['/OUT:' + output_filename]
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend (extra_postargs)
+
+            self.mkpath (os.path.dirname (output_filename))
+            try:
+                self.spawn ([self.link] + ld_args)
+            except DistutilsExecError, msg:
+                raise LinkError, msg
+        else:
+            self.announce ("skipping %s (up-to-date)" % output_filename)   
+    
+
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+
+    def library_dir_option (self, dir):
+        return "-L" + dir
+
+    def runtime_library_dir_option (self, dir):
+        raise DistutilsPlatformError, \
+              "don't know how to set runtime library search path for MSVC++"
+
+    def library_option (self, lib):
+        return self.library_filename (lib)
+
+
+    def find_library_file (self, dirs, lib):
+
+        for dir in dirs:
+            libfile = os.path.join (dir, self.library_filename (lib))
+            if os.path.exists (libfile):
+                return libfile
+
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+

From 6d74cfe58c300042b6a6e67053efb05ef972621e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 01:25:27 +0000
Subject: [PATCH 0485/8469] Typo fix.

---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 287137ee13..bb4760657c 100644
--- a/dist.py
+++ b/dist.py
@@ -730,7 +730,7 @@ def _set_command_options (self, command_obj, option_dict=None):
     def reinitialize_command (self, command):
         """Reinitializes a command to the state it was in when first
         returned by 'get_command_obj()': ie., initialized but not yet
-        finalized.  This gives provides the opportunity to sneak option
+        finalized.  This provides the opportunity to sneak option
         values in programmatically, overriding or supplementing
         user-supplied values from the config files and command line.
         You'll have to re-finalize the command object (by calling

From de30582dec6027d2b0441578781cbbb71033a72f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 01:29:09 +0000
Subject: [PATCH 0486/8469] Lyle Johnson: added 'build_temp' parameter to
 'link_shared_{lib,object}()' methods (but not 'link_executable()', hmmm). 
 Currently only used by BCPPCompiler; it's a dummy parameter for UnixCCompiler
 and MSVCCompiler.

Also added 'bcpp' to compiler table used by 'new_compiler()'.
---
 ccompiler.py     | 10 ++++++----
 msvccompiler.py  | 11 +++++++----
 unixccompiler.py | 11 ++++++++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index e97c97776a..20a5191ba3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -492,7 +492,6 @@ def compile (self,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
-
         """Compile one or more source files.  'sources' must be a list of
         filenames, most likely C/C++ files, but in reality anything that
         can be handled by a particular compiler and compiler class
@@ -572,8 +571,8 @@ def link_shared_lib (self,
                          export_symbols=None,
                          debug=0,
                          extra_preargs=None,
-                         extra_postargs=None):
-
+                         extra_postargs=None,
+                         build_temp=None):
         """Link a bunch of stuff together to create a shared library file.
         Similar semantics to 'create_static_lib()', with the addition of
         other libraries to link against and directories to search for them.
@@ -624,7 +623,8 @@ def link_shared_object (self,
                             export_symbols=None,
                             debug=0,
                             extra_preargs=None,
-                            extra_postargs=None):
+                            extra_postargs=None,
+                            build_temp=None):
         """Link a bunch of stuff together to create a shared object file.
         Much like 'link_shared_lib()', except the output filename is
         explicitly supplied as 'output_filename'.  If 'output_dir' is
@@ -814,6 +814,8 @@ def mkpath (self, name, mode=0777):
                                "Cygwin port of GNU C Compiler for Win32"),
                    'mingw32': ('cygwinccompiler', 'Mingw32CCompiler',
                                "Mingw32 port of GNU C Compiler for Win32"),
+                   'bcpp':    ('bcppcompiler', 'BCPPCompiler',
+                               "Borland C++ Compiler"),
                  }
 
 def show_compilers():
diff --git a/msvccompiler.py b/msvccompiler.py
index 2e80ed5fd7..db8bd35aca 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -1,4 +1,4 @@
-"""distutils.ccompiler
+"""distutils.msvccompiler
 
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
 for the Microsoft Visual Studio."""
@@ -322,7 +322,8 @@ def link_shared_lib (self,
                          export_symbols=None,
                          debug=0,
                          extra_preargs=None,
-                         extra_postargs=None):
+                         extra_postargs=None,
+                         build_temp=None):
 
         self.link_shared_object (objects,
                                  self.shared_library_name(output_libname),
@@ -333,7 +334,8 @@ def link_shared_lib (self,
                                  export_symbols=export_symbols,
                                  debug=debug,
                                  extra_preargs=extra_preargs,
-                                 extra_postargs=extra_postargs)
+                                 extra_postargs=extra_postargs,
+                                 build_temp=build_temp)
                     
     
     def link_shared_object (self,
@@ -346,7 +348,8 @@ def link_shared_object (self,
                             export_symbols=None,
                             debug=0,
                             extra_preargs=None,
-                            extra_postargs=None):
+                            extra_postargs=None,
+                            build_temp=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
diff --git a/unixccompiler.py b/unixccompiler.py
index 85ce5df719..4772e1a8b5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -74,6 +74,7 @@ class UnixCCompiler (CCompiler):
     static_lib_format = shared_lib_format = "lib%s%s"
 
 
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -199,7 +200,9 @@ def link_shared_lib (self,
                          export_symbols=None,
                          debug=0,
                          extra_preargs=None,
-                         extra_postargs=None):
+                         extra_postargs=None,
+                         build_temp=None):
+
         self.link_shared_object (
             objects,
             self.shared_library_filename (output_libname),
@@ -210,7 +213,8 @@ def link_shared_lib (self,
             export_symbols,
             debug,
             extra_preargs,
-            extra_postargs)
+            extra_postargs,
+            build_temp)
         
 
     def link_shared_object (self,
@@ -223,7 +227,8 @@ def link_shared_object (self,
                             export_symbols=None,
                             debug=0,
                             extra_preargs=None,
-                            extra_postargs=None):
+                            extra_postargs=None,
+                            build_temp=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \

From 2a385bb0eca83d0735d51671439c5e1978ca4bd2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 28 Jun 2000 01:29:37 +0000
Subject: [PATCH 0487/8469] Lyle Johnson: pass in temp directory as
 'build_temp' argument when calling 'link_shared_object()'.

---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f8aa91cae3..adf85d3287 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -430,7 +430,8 @@ def build_extensions (self):
                 library_dirs=ext.library_dirs,
                 runtime_library_dirs=ext.runtime_library_dirs,
                 extra_postargs=extra_args,
-                debug=self.debug)
+                debug=self.debug,
+                build_temp=self.build_temp)
 
     # build_extensions ()
 

From cce2862dcd7df9f3ed14f8c8277e9ba3fd768d98 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 28 Jun 2000 14:48:01 +0000
Subject: [PATCH 0488/8469] typos fixed by Rob Hooft

---
 cmd.py               | 2 +-
 command/build_ext.py | 4 ++--
 util.py              | 2 +-
 version.py           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd.py b/cmd.py
index c9b5624f8a..d450ad320c 100644
--- a/cmd.py
+++ b/cmd.py
@@ -323,7 +323,7 @@ def execute (self, func, args, msg=None, level=1):
         should be disabled by the "dry run" flag, and should announce
         themselves if the current verbosity level is high enough.  This
         method takes care of all that bureaucracy for you; all you have to
-        do is supply the funtion to call and an argument tuple for it (to
+        do is supply the function to call and an argument tuple for it (to
         embody the "external action" being performed), a message to print
         if the verbosity level is high enough, and an optional verbosity
         threshold.
diff --git a/command/build_ext.py b/command/build_ext.py
index adf85d3287..54d48467bc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -1,7 +1,7 @@
 """distutils.command.build_ext
 
 Implements the Distutils 'build_ext' command, for building extension
-modules (currently limited to C extensions, should accomodate C++
+modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
 # created 1999/08/09, Greg Ward
@@ -385,7 +385,7 @@ def build_extensions (self):
             # Next, compile the source code to object files.
 
             # XXX not honouring 'define_macros' or 'undef_macros' -- the
-            # CCompiler API needs to change to accomodate this, and I
+            # CCompiler API needs to change to accommodate this, and I
             # want to do one thing at a time!
 
             # Two possible sources for extra compiler arguments:
diff --git a/util.py b/util.py
index 5c1de78997..ebfdf0abf5 100644
--- a/util.py
+++ b/util.py
@@ -28,7 +28,7 @@ def abspath(path):
         return os.path.normpath(path)
 
 
-# More backwards compatability hacks
+# More backwards compatibility hacks
 def extend (list, new_list):
     """Appends the list 'new_list' to 'list', just like the 'extend()'
        list method does in Python 1.5.2 -- but this works on earlier
diff --git a/version.py b/version.py
index 918a1ded43..8b9ef10670 100644
--- a/version.py
+++ b/version.py
@@ -207,7 +207,7 @@ def __cmp__ (self, other):
 # provides enough benefit to be worth using, and will submit their
 # version numbering scheme to its domination.  The free-thinking
 # anarchists in the lot will never give in, though, and something needs
-# to be done to accomodate them.
+# to be done to accommodate them.
 # 
 # Perhaps a "moderately strict" version class could be implemented that
 # lets almost anything slide (syntactically), and makes some heuristic

From 78d7f6ae8b4d39977f5bc4efc043a136d80e9c96 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 02:06:29 +0000
Subject: [PATCH 0489/8469] Fixed 'findall()' so it only returns regular files
 -- no directories. Changed 'prune_file_list()' so it also prunes out RCS and
 CVS directories. Added 'is_regex' parameter to 'select_pattern()',
 'exclude_pattern()',   and 'translate_pattern()', so that you don't have to
 be constrained   by the simple shell-glob-like pattern language, and can
 escape into   full-blown regexes when needed.  Currently this is only
 available   in code -- it's not exposed in the manifest template
 mini-language. Added 'prune' option (controlled by --prune and --no-prune) to
 determine   whether we call 'prune_file_list()' or not -- it's true by
 default. Fixed 'negative_opt' -- it was misnamed and not being seen by
 dist.py. Added --no-defaults to the option table, so it's seen by
 FancyGetopt.

---
 command/sdist.py | 72 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 5627ebb9e5..6f867e89d8 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -46,6 +46,14 @@ class sdist (Command):
         ('use-defaults', None,
          "include the default file set in the manifest "
          "[default; disable with --no-defaults]"),
+        ('no-defaults', None,
+         "don't include the default file set"),
+        ('prune', None,
+         "specifically exclude files/directories that should not be "
+         "distributed (build tree, RCS/CVS dirs, etc.) "
+         "[default; disable with --no-prune]"),
+        ('no-prune', None,
+         "don't automatically exclude anything"),
         ('manifest-only', 'o',
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
@@ -64,7 +72,8 @@ class sdist (Command):
          "list available distribution formats", show_formats),
 	]
 
-    negative_opts = {'use-defaults': 'no-defaults'}
+    negative_opt = {'no-defaults': 'use-defaults',
+                    'no-prune': 'prune' }
 
     default_format = { 'posix': 'gztar',
                        'nt': 'zip' }
@@ -78,6 +87,7 @@ def initialize_options (self):
         # 'use_defaults': if true, we will include the default file set
         # in the manifest
         self.use_defaults = 1
+        self.prune = 1
 
         self.manifest_only = 0
         self.force_manifest = 0
@@ -217,8 +227,10 @@ def get_file_list (self):
             if template_exists:
                 self.read_template ()
 
-            # Prune away the build and source distribution directories
-            self.prune_file_list()
+            # Prune away any directories that don't belong in the source
+            # distribution
+            if self.prune:
+                self.prune_file_list()
 
             # File list now complete -- sort it so that higher-level files
             # come first
@@ -509,18 +521,21 @@ def read_template (self):
 
     def prune_file_list (self):
         """Prune off branches that might slip into the file list as created
-        by 'read_template()', but really don't belong there: specifically,
-        the build tree (typically "build") and the release tree itself
-        (only an issue if we ran "sdist" previously with --keep-tree, or it
-        aborted).
+        by 'read_template()', but really don't belong there:
+          * the build tree (typically "build")
+          * the release tree itself (only an issue if we ran "sdist"
+            previously with --keep-tree, or it aborted)
+          * any RCS or CVS directories
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
         self.exclude_pattern (self.files, None, prefix=build.build_base)
         self.exclude_pattern (self.files, None, prefix=base_dir)
+        self.exclude_pattern (self.files, r'/(RCS|CVS)/.*', is_regex=1)
 
 
-    def select_pattern (self, files, pattern, anchor=1, prefix=None):
+    def select_pattern (self, files, pattern,
+                        anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'files' that match
         'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
         quite the same as implemented by the 'fnmatch' module: '*' and '?'
@@ -536,10 +551,15 @@ def select_pattern (self, files, pattern, anchor=1, prefix=None):
         (itself a pattern) and ending with 'pattern', with anything in between
         them, will match.  'anchor' is ignored in this case.
 
+        If 'is_regex' is true, 'anchor' and 'prefix' are ignored, and
+        'pattern' is assumed to be either a string containing a regex or a
+        regex object -- no translation is done, the regex is just compiled
+        and used as-is.
+
         Return the list of matching strings, possibly empty.
         """
         matches = []
-        pattern_re = translate_pattern (pattern, anchor, prefix)
+        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
         self.debug_print("select_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
         for name in files:
@@ -552,13 +572,14 @@ def select_pattern (self, files, pattern, anchor=1, prefix=None):
     # select_pattern ()
 
 
-    def exclude_pattern (self, files, pattern, anchor=1, prefix=None):
+    def exclude_pattern (self, files, pattern,
+                         anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
-        'pattern'.  'pattern', 'anchor', 'and 'prefix' are the same
-        as for 'select_pattern()', above.  The list 'files' is modified
-        in place.
+        'pattern'.  Other parameters are the same as for
+        'select_pattern()', above.  The list 'files' is modified in place.
         """
-        pattern_re = translate_pattern (pattern, anchor, prefix)
+
+        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
         self.debug_print("exclude_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
         for i in range (len(files)-1, -1, -1):
@@ -674,6 +695,8 @@ def findall (dir = os.curdir):
     """Find all files under 'dir' and return the list of full filenames
     (relative to 'dir').
     """
+    from stat import ST_MODE, S_ISREG, S_ISDIR, S_ISLNK
+
     list = []
     stack = [dir]
     pop = stack.pop
@@ -688,8 +711,13 @@ def findall (dir = os.curdir):
                 fullname = os.path.join (dir, name)
             else:
                 fullname = name
-            list.append (fullname)
-            if os.path.isdir (fullname) and not os.path.islink(fullname):
+
+            # Avoid excess stat calls -- just one will do, thank you!
+            stat = os.stat(fullname)
+            mode = stat[ST_MODE]
+            if S_ISREG(mode):
+                list.append (fullname)
+            elif S_ISDIR(mode) and not S_ISLNK(mode):
                 push (fullname)
 
     return list
@@ -716,10 +744,18 @@ def glob_to_re (pattern):
 # glob_to_re ()
 
 
-def translate_pattern (pattern, anchor=1, prefix=None):
+def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
     """Translate a shell-like wildcard pattern to a compiled regular
-    expression.  Return the compiled regex.
+    expression.  Return the compiled regex.  If 'is_regex' true,
+    then 'pattern' is directly compiled to a regex (if it's a string)
+    or just returned as-is (assumes it's a regex object).
     """
+    if is_regex:
+        if type(pattern) is StringType:
+            return re.compile(pattern)
+        else:
+            return pattern
+
     if pattern:
         pattern_re = glob_to_re (pattern)
     else:

From 0350ebe9b29608aada89136c1db880c4f3552330 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 02:16:24 +0000
Subject: [PATCH 0490/8469] Fixed so 'get_source_files()' calls
 'check_extension_list()' -- that way, we can run "sdist" on a distribution
 with old-style extension structures even if we haven't built it yet.  Bug
 spotted by Harry Gebel.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 54d48467bc..9bb7e77001 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -309,7 +309,7 @@ def check_extensions_list (self, extensions):
 
 
     def get_source_files (self):
-
+        self.check_extension_list()
         filenames = []
 
         # Wouldn't it be neat if we knew the names of header files too...

From 41192ad621b245fd3985b4191348ab27cab4360d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 22:57:55 +0000
Subject: [PATCH 0491/8469] Cleaned up and reformatted by Rene Liebscher. More
 reformatting by me. Also added some editorial comments.

---
 cygwinccompiler.py | 208 ++++++++++++++++++++++++---------------------
 1 file changed, 113 insertions(+), 95 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index cc2ed5db66..7d43f02ff3 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -1,48 +1,55 @@
 """distutils.cygwinccompiler
 
-Contains the CygwinCCompiler class, a subclass of UnixCCompiler that handles
-the Gnu Win32 C compiler.
-It also contains the Mingw32CCompiler class which handles the mingw32 compiler
-(same as cygwin in no-cygwin mode.)
-
+Provides the CygwinCCompiler class, a subclass of UnixCCompiler that
+handles the Cygwin port of the GNU C compiler to Windows.  It also contains
+the Mingw32CCompiler class which handles the mingw32 port of GCC (same as
+cygwin in no-cygwin mode).
 """
 
 # created 2000/05/05, Rene Liebscher
 
 __revision__ = "$Id$"
 
-import os,sys,string,tempfile
+import os,sys,string
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
 
-# Because these compilers aren't configured in Python's config.h file by default
-# we should at least warn the user if he used this unmodified version. 
-def check_if_config_h_is_gcc_ready():
-        """ checks, if the gcc-compiler is mentioned in config.h 
-            if it is not, compiling probably doesn't work """ 
-        from distutils import sysconfig
-        import string,sys
+# Because these compilers aren't configured in Python's config.h file by
+# default we should at least warn the user if he is using a unmodified
+# version.
+
+def check_config_h():
+    """Checks if the GCC compiler is mentioned in config.h.  If it is not,
+    compiling probably doesn't work, so print a warning to stderr.
+    """
+
+    # XXX the result of the check should be returned!
+
+    from distutils import sysconfig
+    import string,sys
+    try:
+        # It would probably better to read single lines to search.
+        # But we do this only once, and it is fast enough 
+        f=open(sysconfig.get_config_h_filename())
+        s=f.read()
+        f.close()
         try:
-                # It would probably better to read single lines to search.
-                # But we do this only once, and it is fast enough 
-                f=open(sysconfig.get_config_h_filename())
-                s=f.read()
-                f.close()
-                try:
-                        string.index(s,"__GNUC__") # is somewhere a #ifdef __GNUC__ or something similar
-                except:
-                        sys.stderr.write ("warning: Python's config.h doesn't seem to support your compiler.\n")
-        except: # unspecific error => ignore
-                pass
+            # is somewhere a #ifdef __GNUC__ or something similar
+            string.index(s,"__GNUC__") 
+        except ValueError:
+            sys.stderr.write ("warning: "+
+                "Python's config.h doesn't seem to support your compiler.\n")
+    except IOError:
+        # if we can't read this file, we cannot say it is wrong
+        # the compiler will complain later about this file as missing
+        pass
 
 
 # This is called when the module is imported, so we make this check only once
-check_if_config_h_is_gcc_ready()
+# XXX why not make it only when the compiler is needed?
+check_config_h()
 
 
-# XXX Things not currently handled:
-#   * see UnixCCompiler
-
 class CygwinCCompiler (UnixCCompiler):
 
     compiler_type = 'cygwin'
@@ -54,21 +61,22 @@ def __init__ (self,
 
         UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
-	# our compiler uses other names
-	self.cc='gcc'
-	self.ld_shared='dllwrap'
-	self.ldflags_shared=[]
-
-        # some variables to manage the differences between cygwin and mingw32
-        self.dllwrap_options=["--target=i386-cygwin32"]
-        # specification of entry point is not necessary
-        
-        self.dll_additional_libraries=[
-               # cygwin shouldn't need msvcrt, but without the dll's will crash
-               # perhaps something about initialization (Python uses it, too)
+        # Hard-code GCC because that's what this is all about.
+        # XXX optimization, warnings etc. should be customizable.
+        self.set_executables(compiler='gcc -O -Wall',
+                             compiler_so='gcc -O -Wall',
+                             linker_exe='gcc',
+                             linker_so='dllwrap --target=i386-cygwin32')
+
+        # cygwin and mingw32 need different sets of libraries 
+        self.dll_libraries=[
+               # cygwin shouldn't need msvcrt, 
+               # but without the dll's will crash
+               # ( gcc version 2.91.57 )
+               # perhaps something about initialization
                # mingw32 needs it in all cases
-                                        "msvcrt"
-                                      ]
+                            "msvcrt"
+                            ]
         
     # __init__ ()
 
@@ -80,79 +88,88 @@ def link_shared_object (self,
                             library_dirs=None,
                             runtime_library_dirs=None,
                             export_symbols=None,
-			    debug=0,
+                            debug=0,
                             extra_preargs=None,
-                            extra_postargs=None):
+                            extra_postargs=None,
+                            build_temp=None):
         
-        if libraries==None:
-                libraries=[]
+        if libraries == None:
+            libraries = []
         
-        python_library=["python"+str(sys.hexversion>>24)+str((sys.hexversion>>16)&0xff)]
-        libraries=libraries+python_library+self.dll_additional_libraries
-        
-        # if you don't need the def-file afterwards, it is
-        # better to use for it tempfile.mktemp() as its name
-        # (unix-style compilers don't like backslashes in filenames)
-        win_dll_def_file=string.replace(tempfile.mktemp(),"\\","/")
-        #win_dll_def_file=output_filename[:-len(self.shared_lib_extension)]+".def"
-        #win_dll_exp_file=output_filename[:-len(self.shared_lib_extension)]+".exp"
-        #win_dll_lib_file=output_filename[:-len(self.shared_lib_extension)]+".a"
+        # Additional libraries: the python library is always needed on
+        # Windows we need the python version without the dot, eg. '15'
+
+        pythonlib = ("python%d%d" %
+                     (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+        libraries.append(pythonlib)
+        libraries.extend(self.dll_libraries)
+
+        # name of extension
+
+        # XXX WRONG WRONG WRONG
+        # this is NOT the place to make guesses about Python namespaces;
+        # that MUST be done in build_ext.py
+
+        if not debug:
+            ext_name = os.path.basename(output_filename)[:-len(".pyd")]
+        else:
+            ext_name = os.path.basename(output_filename)[:-len("_d.pyd")]
+
+        def_file = os.path.join(build_temp, ext_name + ".def")
+        #exp_file = os.path.join(build_temp, ext_name + ".exp")
+        #lib_file = os.path.join(build_temp, 'lib' + ext_name + ".a")
         
         # Make .def file
-        # (It would probably better to check if we really need this, but for this we had to
-        # insert some unchanged parts of UnixCCompiler, and this is not what I want.) 
-        f=open(win_dll_def_file,"w")
+        # (It would probably better to check if we really need this, 
+        # but for this we had to insert some unchanged parts of 
+        # UnixCCompiler, and this is not what we want.) 
+        f = open(def_file,"w")
         f.write("EXPORTS\n") # intro
-        # always export a function "init"+module_name
-        if not debug:
-                f.write("init"+os.path.basename(output_filename)[:-len(self.shared_lib_extension)]+"\n")
-        else: # in debug mode outfile_name is something like XXXXX_d.pyd
-                f.write("init"+os.path.basename(output_filename)[:-(len(self.shared_lib_extension)+2)]+"\n")
-        # if there are more symbols to export
-        # insert code here to write them in f
-        if export_symbols!=None: 
+        if export_symbols == None: 
+            # export a function "init" + ext_name
+            f.write("init" + ext_name + "\n")    
+        else:
+            # if there are more symbols to export write them into f
             for sym in export_symbols:
-                f.write(sym+"\n")                
+                f.write(sym+"\n")                    
         f.close()
         
-        if extra_preargs==None:
-                extra_preargs=[]
+        if extra_preargs == None:
+                extra_preargs = []
         
-        extra_preargs=extra_preargs+[
+        extra_preargs = extra_preargs + [
                         #"--verbose",
-                        #"--output-exp",win_dll_exp_file,
-                        #"--output-lib",win_dll_lib_file,
-                        "--def",win_dll_def_file
-                        ]+ self.dllwrap_options
+                        #"--output-exp",exp_file,
+                        #"--output-lib",lib_file,
+                        "--def",def_file
+                        ]
         
-        # who wants symbols and a many times greater output file
+        # who wants symbols and a many times larger output file
         # should explicitely switch the debug mode on 
-        # otherwise we let dllwrap strip the outputfile
-        # (On my machine unstripped_file=stripped_file+254KB
+        # otherwise we let dllwrap strip the output file
+        # (On my machine unstripped_file = stripped_file + 254KB
         #   10KB < stripped_file < ??100KB ) 
         if not debug: 
-                extra_preargs=extra_preargs+["-s"] 
-	
-	try:        
-    	    UnixCCompiler.link_shared_object(self,
+            extra_preargs = extra_preargs + ["-s"] 
+        
+        UnixCCompiler.link_shared_object(self,
                             objects,
                             output_filename,
                             output_dir,
                             libraries,
                             library_dirs,
                             runtime_library_dirs,
-			    None, # export_symbols, we do this with our def-file 
+                            None, # export_symbols, we do this with our def-file
                             debug,
                             extra_preargs,
-                            extra_postargs)
-        finally: 
-    	    # we don't need the def-file anymore
-    	    os.remove(win_dll_def_file) 
+                            extra_postargs,
+                            build_temp)
         
     # link_shared_object ()
 
 # class CygwinCCompiler
 
+
 # the same as cygwin plus some additional parameters
 class Mingw32CCompiler (CygwinCCompiler):
 
@@ -165,14 +182,15 @@ def __init__ (self,
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
 
-        self.ccflags = self.ccflags + ["-mno-cygwin"]
-        self.dllwrap_options=[
-                                # mingw32 doesn't really need 'target' 
-                                # and cygwin too (it seems, it is enough
-                                # to specify a different entry point)                
-                                #"--target=i386-mingw32",
-                                "--entry","_DllMain@12"
-                                ]
+        self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+                             compiler_so='gcc -mno-cygwin -O -Wall',
+                             linker_exe='gcc -mno-cygwin',
+                             linker_so='dllwrap' 
+                                    + ' --target=i386-mingw32'
+                                    + ' --entry _DllMain@12')
+        # mingw32 doesn't really need 'target' and cygwin too (it seems, 
+        # it is enough to specify a different entry point)                
+
         # no additional libraries need 
         # (only msvcrt, which is already added by CygwinCCompiler)
 

From ac971ce5217faf3cac2d2b9bf69d347dac0ca08c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 22:59:10 +0000
Subject: [PATCH 0492/8469] Changed to use _winreg module instead of winreg.

---
 msvccompiler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index db8bd35aca..6acd4efd0d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -20,14 +20,14 @@
 
 _can_read_reg = 0
 try:
-    import winreg
+    import _winreg
     _can_read_reg = 1
-    hkey_mod = winreg
+    hkey_mod = _winreg
 
-    RegOpenKeyEx = winreg.OpenKeyEx
-    RegEnumKey = winreg.EnumKey
-    RegEnumValue = winreg.EnumValue
-    RegError = winreg.error
+    RegOpenKeyEx = _winreg.OpenKeyEx
+    RegEnumKey = _winreg.EnumKey
+    RegEnumValue = _winreg.EnumValue
+    RegError = _winreg.error
 
 except ImportError:
     try:

From 9d71d05b4198ad054d20534d5714d1a1a8ce8877 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 23:04:59 +0000
Subject: [PATCH 0493/8469] On second thought, first try for _winreg, and then
 winreg.  Only if both fail do we try for win32api/win32con.  If *those* both
 fail, then we don't have registry access.  Phew!

---
 msvccompiler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 6acd4efd0d..ae5e2d767a 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -20,7 +20,11 @@
 
 _can_read_reg = 0
 try:
-    import _winreg
+    try:
+        import _winreg
+    except ImportError:
+        import winreg                   # for pre-2000/06/29 CVS Python
+
     _can_read_reg = 1
     hkey_mod = _winreg
 

From 6165d95cb15b50fb4e20dd91ae8879229e231f06 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 23:09:20 +0000
Subject: [PATCH 0494/8469] Don't try to guess the name of a .def file -- if
 one is supplied, use it, otherwise just generate an '/export:' option.

---
 command/build_ext.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 9bb7e77001..4b5aaab8ef 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -528,12 +528,6 @@ def msvc_prelink_hack (self, sources, ext, extra_args):
         # kludges; they are to be avoided if possible!)
 
         def_file = ext.export_symbol_file
-        if def_file is None:
-            source_dir = os.path.dirname (sources[0])
-            ext_base = (string.split (ext.name, '.'))[-1]
-            def_file = os.path.join (source_dir, "%s.def" % ext_base)
-            if not os.path.exists (def_file):
-                def_file = None
 
         if def_file is not None:
             extra_args.append ('/DEF:' + def_file)

From 734a9d18a8887ba73bcba4bf355a7fd271b2a7d9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 29 Jun 2000 23:50:19 +0000
Subject: [PATCH 0495/8469] Allow 2.0 on the list of target versions.  NB. this
 isn't enough: the GUI part, misc/install.c, still needs to be updated, and it
 looks like a non-trivial change.

---
 command/bdist_wininst.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d3d17721e1..b81c4d4179 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -27,7 +27,7 @@ class bdist_wininst (Command):
                      "compile to .pyo on the target system"),
                     ('target-version=', 'v',
                      "require a specific python version" +
-                     " on the target system (1.5 or 1.6)"),
+                     " on the target system (1.5 or 1.6/2.0)"),
                    ]
 
     def initialize_options (self):
@@ -47,9 +47,9 @@ def finalize_options (self):
         if not self.target_version:
             self.target_version = ""
         else:
-            if not self.target_version in ("1.5", "1.6"):
+            if not self.target_version in ("1.5", "1.6", "2.0"):
                 raise DistutilsOptionError (
-                    "target version must be 1.5 or 1.6")
+                    "target version must be 1.5, 1.6, or 2.0")
         if self.distribution.has_ext_modules():
             short_version = sys.version[:3]
             if self.target_version and self.target_version != short_version:
@@ -74,8 +74,8 @@ def run (self):
         # The packager can choose if .pyc and .pyo files should be created
         # on the TARGET system instead at the SOURCE system.
 
-##        # The compilation can only be done on the SOURCE system
-##        # for one python version (assuming 1.6 and 1.5 have incompatible
+##        # The compilation can only be done on the SOURCE system for one
+##        # python version (assuming 1.6/2.0 and 1.5 have incompatible
 ##        # byte-codes).
 ##        short_version = sys.version[:3]
 ##        if self.target_version == short_version:

From 67211d1e7cc101f970c3053015b8da87d889de28 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 30 Jun 2000 02:54:36 +0000
Subject: [PATCH 0496/8469] Bump version to 0.9.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2ba82bd58d..ded0899c76 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9pre"
+__version__ = "0.9"

From a951e20878ee09dfd00a555b89ca61fabe4f79ff Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 30 Jun 2000 19:37:59 +0000
Subject: [PATCH 0497/8469] Simplify the registry-module-finding code: _winreg
 or win32api/win32con. This'll work fine with 2.0 or 1.5.2, but is less than
 ideal for 1.6a1/a2.  But the code to accomodate 1.6a1/a2 was released with
 Distutils 0.9, so it can go away now.

---
 msvccompiler.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index ae5e2d767a..e58e6c10c8 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -20,10 +20,7 @@
 
 _can_read_reg = 0
 try:
-    try:
-        import _winreg
-    except ImportError:
-        import winreg                   # for pre-2000/06/29 CVS Python
+    import _winreg
 
     _can_read_reg = 1
     hkey_mod = _winreg

From 07f383457ff22083cc4b09c58be345d5d09b80ea Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 5 Jul 2000 03:06:46 +0000
Subject: [PATCH 0498/8469] Added the --dist-dir option to control where the
 archive(s) are put; defaults to 'dist' (ie. no longer in the distribution
 root).

---
 command/sdist.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 6f867e89d8..2d31640f44 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -64,6 +64,9 @@ class sdist (Command):
         ('keep-tree', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),
+        ('dist-dir=', 'd',
+         "directory to put the source distribution archive(s) in "
+         "[default: dist]"),
         ]
 
 
@@ -94,6 +97,7 @@ def initialize_options (self):
 
         self.formats = None
         self.keep_tree = 0
+        self.dist_dir = None
 
         self.archive_files = None
 
@@ -118,6 +122,9 @@ def finalize_options (self):
             raise DistutilsOptionError, \
                   "unknown archive format '%s'" % bad_format
 
+        if self.dist_dir is None:
+            self.dist_dir = "dist"
+
 
     def run (self):
 
@@ -667,11 +674,14 @@ def make_distribution (self):
         # Don't warn about missing meta-data here -- should be (and is!)
         # done elsewhere.
         base_dir = self.distribution.get_fullname()
+        base_name = os.path.join(self.dist_dir, base_dir)
 
         self.make_release_tree (base_dir, self.files)
         archive_files = []              # remember names of files we create
+        if self.dist_dir:
+            self.mkpath(self.dist_dir)
         for fmt in self.formats:
-            file = self.make_archive (base_dir, fmt, base_dir=base_dir)
+            file = self.make_archive (base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
 
         self.archive_files = archive_files

From 0b393c97f576061b8565a7b373788f7046f28148 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 5 Jul 2000 03:07:18 +0000
Subject: [PATCH 0499/8469] Added the --dist-dir option that the "bdist_*" will
 use to control where they place their output files.

---
 command/bdist.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/command/bdist.py b/command/bdist.py
index 3fcbf7793d..100563a9d1 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -34,6 +34,9 @@ class bdist (Command):
                      "temporary directory for creating built distributions"),
                     ('formats=', None,
                      "formats for distribution (comma-separated list)"),
+                    ('dist-dir=', 'd',
+                     "directory to put final built distributions in "
+                     "[default: dist]"),
                    ]
 
     help_options = [
@@ -65,6 +68,7 @@ class bdist (Command):
     def initialize_options (self):
         self.bdist_base = None
         self.formats = None
+        self.dist_dir = None
 
     # initialize_options()
 
@@ -86,6 +90,9 @@ def finalize_options (self):
                 raise DistutilsPlatformError, \
                       "don't know how to create built distributions " + \
                       "on platform %s" % os.name
+
+        if self.dist_dir is None:
+            self.dist_dir = "dist"
             
     # finalize_options()
 

From 8efd9f49e8f828de05c505aed52f32b17a9a91ad Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 5 Jul 2000 03:07:37 +0000
Subject: [PATCH 0500/8469] Added --dist-dir option to control where output
 archive(s) go.

---
 command/bdist_dumb.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index f9c81fc247..805aa0a9eb 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -24,6 +24,8 @@ class bdist_dumb (Command):
                     ('keep-tree', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
+                    ('dist-dir=', 'd',
+                     "directory to put final built distributions in"),
                    ]
 
     default_format = { 'posix': 'gztar',
@@ -34,6 +36,7 @@ def initialize_options (self):
         self.bdist_dir = None
         self.format = None
         self.keep_tree = 0
+        self.dist_dir = None
 
     # initialize_options()
 
@@ -51,6 +54,8 @@ def finalize_options (self):
                       ("don't know how to create dumb built distributions " +
                        "on platform %s") % os.name
 
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+
     # finalize_options()
 
 
@@ -71,7 +76,8 @@ def run (self):
                                       get_platform())
         print "self.bdist_dir = %s" % self.bdist_dir
         print "self.format = %s" % self.format
-        self.make_archive (archive_basename, self.format,
+        self.make_archive (os.path.join(self.dist_dir, archive_basename),
+                           self.format,
                            root_dir=self.bdist_dir)
 
         if not self.keep_tree:

From 93518e1e37741f335e5aa118799826d5e6b5abbc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 5 Jul 2000 03:08:55 +0000
Subject: [PATCH 0501/8469] Fixed so the ZIP file (which is bundled into an
 executable) goes in the   temporary directory ('bdist_base'). Added
 --dist-dir option to control where the executable is put.

---
 command/bdist_wininst.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b81c4d4179..0c53bf9e6b 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -28,6 +28,8 @@ class bdist_wininst (Command):
                     ('target-version=', 'v',
                      "require a specific python version" +
                      " on the target system (1.5 or 1.6/2.0)"),
+                    ('dist-dir=', 'd',
+                     "directory to put final built distributions in"),
                    ]
 
     def initialize_options (self):
@@ -36,6 +38,7 @@ def initialize_options (self):
         self.target_compile = 0
         self.target_optimize = 0
         self.target_version = None
+        self.dist_dir = None
 
     # initialize_options()
 
@@ -57,6 +60,8 @@ def finalize_options (self):
                                             short_version)
             self.target_version = short_version
 
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+
     # finalize_options()
 
 
@@ -92,7 +97,10 @@ def run (self):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
-        archive_basename = "%s.win32" % self.distribution.get_fullname()
+        fullname = self.distribution.get_fullname()
+        archive_basename = os.path.join(self.bdist_dir,
+                                        "%s.win32" % fullname)
+
         # XXX hack! Our archive MUST be relative to sys.prefix
         # XXX What about .install_data, .install_scripts, ...?
         # [Perhaps require that all installation dirs be under sys.prefix
@@ -103,7 +111,7 @@ def run (self):
         root_dir = install.install_lib
         arcname = self.make_archive (archive_basename, "zip",
                                      root_dir=root_dir)
-        self.create_exe (arcname)
+        self.create_exe (arcname, fullname)
 
         if not self.keep_tree:
             remove_tree (self.bdist_dir, self.verbose, self.dry_run)
@@ -156,7 +164,7 @@ def create_inifile (self):
 
     # create_inifile()
 
-    def create_exe (self, arcname):
+    def create_exe (self, arcname, fullname):
         import struct, zlib
 
         cfgdata = open (self.create_inifile()).read()
@@ -165,7 +173,8 @@ def create_exe (self, arcname):
         co = zlib.compressobj (zlib.Z_DEFAULT_COMPRESSION, comp_method, -15)
         zcfgdata = co.compress (cfgdata) + co.flush()
 
-        installer_name = "%s.win32.exe" % self.distribution.get_fullname()
+        installer_name = os.path.join(self.dist_dir,
+                                      "%s.win32.exe" % fullname)
         self.announce ("creating %s" % installer_name)
 
         file = open (installer_name, "wb")

From 9f4f35f3c5fe3f538355af050e65e951997b2dfb Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 7 Jul 2000 20:45:21 +0000
Subject: [PATCH 0502/8469] fix inconsistent use of tabs and spaces

---
 ccompiler.py               |  2 +-
 command/build_ext.py       | 10 +++++-----
 command/install_headers.py |  2 +-
 dist.py                    | 34 +++++++++++++++++-----------------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 20a5191ba3..933060aeb2 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -828,7 +828,7 @@ def show_compilers():
     from distutils.fancy_getopt import FancyGetopt 
     compilers = []
     for compiler in compiler_class.keys():
-	compilers.append(("compiler="+compiler, None,
+        compilers.append(("compiler="+compiler, None,
                           compiler_class[compiler][2]))
     compilers.sort()
     pretty_printer = FancyGetopt(compilers)
diff --git a/command/build_ext.py b/command/build_ext.py
index 4b5aaab8ef..6456ad498f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -370,12 +370,12 @@ def build_extensions (self):
                 ext_filename = os.path.join (self.build_lib,
                                              self.get_ext_filename(fullname))
 
-	    if not (self.force or newer_group(sources, ext_filename, 'newer')):
-	    	self.announce ("skipping '%s' extension (up-to-date)" %
+            if not (self.force or newer_group(sources, ext_filename, 'newer')):
+                self.announce ("skipping '%s' extension (up-to-date)" %
                                ext.name)
-		continue # 'for' loop over all extensions
-	    else:
-        	self.announce ("building '%s' extension" % ext.name)
+                continue # 'for' loop over all extensions
+            else:
+                self.announce ("building '%s' extension" % ext.name)
 
             # First, scan the sources for SWIG definition files (.i), run
             # SWIG on 'em to create .c files, and modify the sources list
diff --git a/command/install_headers.py b/command/install_headers.py
index 991985b4ad..2e6ce8690b 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -22,7 +22,7 @@ class install_headers (Command):
 
     def initialize_options (self):
         self.install_dir = None
-	self.outfiles = []
+        self.outfiles = []
 
     def finalize_options (self):
         self.set_undefined_options('install',
diff --git a/dist.py b/dist.py
index bb4760657c..5f81c88773 100644
--- a/dist.py
+++ b/dist.py
@@ -275,13 +275,13 @@ def find_config_files (self):
 
         # What to call the per-user config file
         if os.name == 'posix':
-	    user_filename = ".pydistutils.cfg"
-	else:
-	    user_filename = "pydistutils.cfg"
+            user_filename = ".pydistutils.cfg"
+        else:
+            user_filename = "pydistutils.cfg"
 	
         # And look for the user config file
-	if os.environ.has_key('HOME'):
-    	    user_file = os.path.join(os.environ.get('HOME'), user_filename)
+        if os.environ.has_key('HOME'):
+            user_file = os.path.join(os.environ.get('HOME'), user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
 
@@ -439,7 +439,7 @@ def _parse_command_opts (self, parser, args):
 
 	# Check for help_options in command class.  They have a different
 	# format (tuple of four) so we need to preprocess them here.
-	if (hasattr(cmd_class, 'help_options') and
+        if (hasattr(cmd_class, 'help_options') and
             type (cmd_class.help_options) is ListType):
             help_options = fix_help_options(cmd_class.help_options)
         else:
@@ -457,17 +457,17 @@ def _parse_command_opts (self, parser, args):
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
 
-	if (hasattr(cmd_class, 'help_options') and
+        if (hasattr(cmd_class, 'help_options') and
             type (cmd_class.help_options) is ListType):
-	    help_option_found=0
-	    for (help_option, short, desc, func) in cmd_class.help_options:
-		if hasattr(opts, parser.get_attr_name(help_option)):
-		    help_option_found=1
+            help_option_found=0
+            for (help_option, short, desc, func) in cmd_class.help_options:
+                if hasattr(opts, parser.get_attr_name(help_option)):
+                    help_option_found=1
 		    #print "showing help for option %s of command %s" % \
                     #      (help_option[0],cmd_class)
 
                     if callable(func):
-			func()
+                        func()
                     else:
                         raise DistutilsClassError, \
                             ("invalid help function %s for help option '%s': "
@@ -475,7 +475,7 @@ def _parse_command_opts (self, parser, args):
                             (`func`, help_option)
 
             if help_option_found: 
-		return
+                return
 
         # Put the options from the command-line into their official
         # holding pen, the 'command_options' dictionary.
@@ -526,12 +526,12 @@ def _show_help (self,
                 klass = command
             else:
                 klass = self.get_command_class (command)
-	    if (hasattr(klass, 'help_options') and
+            if (hasattr(klass, 'help_options') and
                 type (klass.help_options) is ListType):
-		parser.set_option_table (klass.user_options +
+                parser.set_option_table (klass.user_options +
                                          fix_help_options(klass.help_options))
-	    else:
-        	parser.set_option_table (klass.user_options)
+            else:
+                parser.set_option_table (klass.user_options)
             parser.print_help ("Options for '%s' command:" % klass.__name__)
             print
 

From e522e80e068bcf976636e4454d1e6e127436f551 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 14 Jul 2000 13:35:07 +0000
Subject: [PATCH 0503/8469] Typo fix from Bastian Kleineidam

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 6456ad498f..37d19c7db4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -309,7 +309,7 @@ def check_extensions_list (self, extensions):
 
 
     def get_source_files (self):
-        self.check_extension_list()
+        self.check_extensions_list(self.extensions)
         filenames = []
 
         # Wouldn't it be neat if we knew the names of header files too...

From ac99c62e48886255ec93847fec136b5b81d9122e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Jul 2000 01:21:54 +0000
Subject: [PATCH 0504/8469] Typo fix from David Ascher.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 37d19c7db4..2ede447fed 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -292,7 +292,7 @@ def check_extensions_list (self, extensions):
                 ext.undef_macros = []
                 for macro in macros:
                     if not (type(macro) is TupleType and
-                            1 <= len(macros) <= 2):
+                            1 <= len(macro) <= 2):
                         raise DistutilsSetupError, \
                               ("'macros' element of build info dict "
                                "must be 1- or 2-tuple")

From 20550ceda600efdce508bd686c887ce88b2c09e9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Jul 2000 01:23:19 +0000
Subject: [PATCH 0505/8469] Fix to call 'library_filename()' instead of the
 non-existent 'shared_library_filename()'.

---
 unixccompiler.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 4772e1a8b5..799560c396 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -205,7 +205,7 @@ def link_shared_lib (self,
 
         self.link_shared_object (
             objects,
-            self.shared_library_filename (output_libname),
+            self.library_filename (output_libname, lib_type='shared'),
             output_dir,
             libraries,
             library_dirs,
@@ -320,8 +320,10 @@ def library_option (self, lib):
     def find_library_file (self, dirs, lib):
 
         for dir in dirs:
-            shared = os.path.join (dir, self.shared_library_filename (lib))
-            static = os.path.join (dir, self.library_filename (lib))
+            shared = os.path.join (
+                dir, self.library_filename (lib, lib_type='shared'))
+            static = os.path.join (
+                dir, self.library_filename (lib, lib_type='static'))
 
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm

From ba1b7bf236f18fb1997ae789505856bb315c8f37 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Jul 2000 01:58:45 +0000
Subject: [PATCH 0506/8469] Remove unused 'search_dir()' method. Comment tweak.

---
 command/sdist.py | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 2d31640f44..3b91170cb3 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -319,26 +319,6 @@ def add_defaults (self):
     # add_defaults ()
     
 
-    def search_dir (self, dir, pattern=None):
-        """Recursively find files under 'dir' matching 'pattern' (a string
-        containing a Unix-style glob pattern).  If 'pattern' is None, find
-        all files under 'dir'.  Return the list of found filenames.
-        """
-        allfiles = findall (dir)
-        if pattern is None:
-            return allfiles
-
-        pattern_re = translate_pattern (pattern)
-        files = []
-        for file in allfiles:
-            if pattern_re.match (os.path.basename (file)):
-                files.append (file)
-
-        return files
-
-    # search_dir ()
-
-
     def recursive_exclude_pattern (self, dir, pattern=None):
         """Remove filenames from 'self.files' that are under 'dir' and
         whose basenames match 'pattern'.
@@ -717,7 +697,7 @@ def findall (dir = os.curdir):
         names = os.listdir (dir)
 
         for name in names:
-            if dir != os.curdir:        # avoid the dreaded "./" syndrome
+            if dir != os.curdir:        # avoid leading "./"
                 fullname = os.path.join (dir, name)
             else:
                 fullname = name

From 01105a3143f4096e4916f9fd95e219dc9d6d3fde Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Jul 2000 02:13:20 +0000
Subject: [PATCH 0507/8469] Fixed a grab-bag of typos spotted by Rob Hooft.

---
 ccompiler.py             | 2 +-
 cmd.py                   | 2 +-
 command/bdist_rpm.py     | 2 +-
 command/build_ext.py     | 2 +-
 command/build_scripts.py | 2 +-
 command/install_data.py  | 2 +-
 cygwinccompiler.py       | 2 +-
 dist.py                  | 4 ++--
 util.py                  | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 933060aeb2..eb6200f638 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -304,7 +304,7 @@ def set_runtime_library_dirs (self, dirs):
 
     def add_link_object (self, object):
         """Add 'object' to the list of object files (or analogues, such as
-        explictly named library files or the output of "resource
+        explicitly named library files or the output of "resource
         compilers") to be included in every link driven by this compiler
         object.
         """
diff --git a/cmd.py b/cmd.py
index d450ad320c..8beb5d443e 100644
--- a/cmd.py
+++ b/cmd.py
@@ -55,7 +55,7 @@ def __init__ (self, dist):
         # commands fallback on the Distribution's behaviour.  None means
         # "not defined, check self.distribution's copy", while 0 or 1 mean
         # false and true (duh).  Note that this means figuring out the real
-        # value of each flag is a touch complicatd -- hence "self.verbose"
+        # value of each flag is a touch complicated -- hence "self.verbose"
         # (etc.) will be handled by __getattr__, below.
         self._verbose = None
         self._dry_run = None
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 7f58a1da6b..3302eea24b 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -400,7 +400,7 @@ def _make_spec_file(self):
         ]
 
         for (rpm_opt, attr, default) in script_options:
-            # Insert contents of file refered to, if no file is refered to
+            # Insert contents of file referred to, if no file is refered to
             # use 'default' as contents of script
             val = getattr(self, attr)
             if val or default:
diff --git a/command/build_ext.py b/command/build_ext.py
index 2ede447fed..c04036b02e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -394,7 +394,7 @@ def build_extensions (self):
             #     elegant, but people seem to expect it and I
             #     guess it's useful)
             # The environment variable should take precedence, and
-            # any sensible compiler will give precendence to later
+            # any sensible compiler will give precedence to later
             # command line args.  Hence we combine them in order:
             extra_args = ext.extra_compile_args or []
 
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 6467e65b83..17fae8f7b5 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -46,7 +46,7 @@ def copy_scripts (self):
         """Copy each script listed in 'self.scripts'; if it's marked as a
         Python script in the Unix way (first line matches 'first_line_re',
         ie. starts with "\#!" and contains "python"), then adjust the first
-        line to refer to the current Python intepreter as we copy.
+        line to refer to the current Python interpreter as we copy.
         """
         outfiles = []
         self.mkpath(self.build_dir)
diff --git a/command/install_data.py b/command/install_data.py
index 716febb5c6..9193f91924 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -18,7 +18,7 @@ class install_data (Command):
 
     user_options = [
         ('install-dir=', 'd',
-         "base directory for installating data files "
+         "base directory for installing data files "
          "(default: installation base dir)"),
         ('root=', None,
          "install everything relative to this alternate root directory"),
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 7d43f02ff3..650627f5cf 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -145,7 +145,7 @@ def link_shared_object (self,
                         ]
         
         # who wants symbols and a many times larger output file
-        # should explicitely switch the debug mode on 
+        # should explicitly switch the debug mode on 
         # otherwise we let dllwrap strip the output file
         # (On my machine unstripped_file = stripped_file + 254KB
         #   10KB < stripped_file < ??100KB ) 
diff --git a/dist.py b/dist.py
index 5f81c88773..ed829fe480 100644
--- a/dist.py
+++ b/dist.py
@@ -167,7 +167,7 @@ def __init__ (self, attrs=None):
         # It's only safe to query 'have_run' for a command class that has
         # been instantiated -- a false value will be inserted when the
         # command object is created, and replaced with a true value when
-        # the command is succesfully run.  Thus it's probably best to use
+        # the command is successfully run.  Thus it's probably best to use
         # '.get()' rather than a straight lookup.
         self.have_run = {}
 
@@ -677,7 +677,7 @@ def get_command_class (self, command):
 
     def get_command_obj (self, command, create=1):
         """Return the command object for 'command'.  Normally this object
-        is cached on a previous call to 'get_command_obj()'; if no comand
+        is cached on a previous call to 'get_command_obj()'; if no command
         object for 'command' is in the cache, then we either create and
         return it (if 'create' is true) or return None.
         """
diff --git a/util.py b/util.py
index ebfdf0abf5..0bff3a5b85 100644
--- a/util.py
+++ b/util.py
@@ -105,7 +105,7 @@ def check_environ ():
        guarantee that users can use in config files, command-line
        options, etc.  Currently this includes:
          HOME - user's home directory (Unix only)
-         PLAT - desription of the current platform, including hardware
+         PLAT - description of the current platform, including hardware
                 and OS (see 'get_platform()')
     """
 
@@ -125,7 +125,7 @@ def check_environ ():
 
 def subst_vars (str, local_vars):
     """Perform shell/Perl-style variable substitution on 'string'.
-       Every occurence of '$' followed by a name, or a name enclosed in
+       Every occurrence of '$' followed by a name, or a name enclosed in
        braces, is considered a variable.  Every variable is substituted by
        the value found in the 'local_vars' dictionary, or in 'os.environ'
        if it's not in 'local_vars'.  'os.environ' is first checked/

From 5338783b1c404117bb02b80412e4cc94b5380469 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 27 Jul 2000 02:17:40 +0000
Subject: [PATCH 0508/8469] Bump version to 0.9.1pre.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index ded0899c76..f6af3c9dac 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9"
+__version__ = "0.9.1pre"

From e709ad9b04b0dca03c690faa222979297b759f74 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 00:04:17 +0000
Subject: [PATCH 0509/8469] Provides the FileList class for building a list of
 filenames by exploring the filesystem, and filtering the list by applying
 various patterns.

Initial revision (almost) as supplied in a patch by Rene Liebscher; I
just renamed the class from Template to FileList, and the module
accordingly.
---
 filelist.py | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 362 insertions(+)
 create mode 100644 filelist.py

diff --git a/filelist.py b/filelist.py
new file mode 100644
index 0000000000..ee7051b97e
--- /dev/null
+++ b/filelist.py
@@ -0,0 +1,362 @@
+"""distutils.filelist
+
+Provides the FileList class, used for poking about the filesystem
+and building lists of files.
+"""
+
+# created 2000/07/17, Rene Liebscher (as template.py)
+# most parts taken from commands/sdist.py
+# renamed 2000/07/29 (to filelist.py) and officially added to
+#  the Distutils source, Greg Ward 
+
+__revision__ = "$Id$"
+
+import sys, os, string, re
+import fnmatch
+from types import *
+from glob import glob
+from distutils.util import convert_path
+
+class FileList:
+
+    files = None # reference to files list to mainpulate
+    allfiles = None # list of all files, if None will be filled
+                    # at first use from directory self.dir
+    dir = None # directory from which files will be taken
+               # to fill self.allfiles if it was not set otherwise
+
+    # next both functions (callable objects) can be set by the user
+    # warn: warning function
+    # debug_print: debug function  
+
+    def __init__(self, 
+                 files=[], 
+                 dir=os.curdir, 
+                 allfiles=None, 
+                 warn=None, 
+                 debug_print=None):
+        # use standard warning and debug functions, if no other given
+        if warn is None: warn = self.__warn 
+        if debug_print is None: debug_print = self.__debug_print
+        self.warn = warn
+        self.debug_print = debug_print
+        self.files = files
+        self.dir = dir
+        self.allfiles = allfiles 
+             # if None, it will be filled, when used for first time
+
+
+    # standard warning and debug functions, if no other given
+    def __warn (self, msg):
+        sys.stderr.write ("warning: template: %s\n" % msg)
+        
+    def __debug_print (self, msg):
+        """Print 'msg' to stdout if the global DEBUG (taken from the
+        DISTUTILS_DEBUG environment variable) flag is true.
+        """
+        from distutils.core import DEBUG
+        if DEBUG:
+            print msg
+
+    
+    def process_line(self, line):    
+
+            words = string.split (line)
+            action = words[0]
+
+            # First, check that the right number of words are present
+            # for the given action (which is the first word)
+            if action in ('include','exclude',
+                          'global-include','global-exclude'):
+                if len (words) < 2:
+                    self.warn \
+                        ("invalid template line: " +
+                         "'%s' expects <pattern1> <pattern2> ..." %
+                         action)
+                    return
+
+                pattern_list = map(convert_path, words[1:])
+
+            elif action in ('recursive-include','recursive-exclude'):
+                if len (words) < 3:
+                    self.warn \
+                        ("invalid template line: " +
+                         "'%s' expects <dir> <pattern1> <pattern2> ..." %
+                         action)
+                    return
+
+                dir = convert_path(words[1])
+                pattern_list = map (convert_path, words[2:])
+
+            elif action in ('graft','prune'):
+                if len (words) != 2:
+                    self.warn \
+                        ("invalid template line: " +
+                         "'%s' expects a single <dir_pattern>" %
+                         action)
+                    return
+
+                dir_pattern = convert_path (words[1])
+
+            else:
+                self.warn ("invalid template line: " +
+                               "unknown action '%s'" % action)
+                return
+
+            # OK, now we know that the action is valid and we have the
+            # right number of words on the line for that action -- so we
+            # can proceed with minimal error-checking.  Also, we have
+            # defined either (pattern), (dir and pattern), or
+            # (dir_pattern) -- so we don't have to spend any time
+            # digging stuff up out of 'words'.
+
+            if action == 'include':
+                self.debug_print("include " + string.join(pattern_list))
+                for pattern in pattern_list:
+                    if not self.select_pattern (pattern, anchor=1):
+                        self.warn ("no files found matching '%s'" %
+                                       pattern)
+
+            elif action == 'exclude':
+                self.debug_print("exclude " + string.join(pattern_list))
+                for pattern in pattern_list:
+                    if not self.exclude_pattern (pattern, anchor=1):
+                        self.warn (
+                            "no previously-included files found matching '%s'"%
+                            pattern)
+
+            elif action == 'global-include':
+                self.debug_print("global-include " + string.join(pattern_list))
+                for pattern in pattern_list:
+                    if not self.select_pattern (pattern, anchor=0):
+                        self.warn (("no files found matching '%s' " +
+                                        "anywhere in distribution") %
+                                       pattern)
+
+            elif action == 'global-exclude':
+                self.debug_print("global-exclude " + string.join(pattern_list))
+                for pattern in pattern_list:
+                    if not self.exclude_pattern (pattern, anchor=0):
+                        self.warn \
+                            (("no previously-included files matching '%s' " +
+                              "found anywhere in distribution") %
+                             pattern)
+
+            elif action == 'recursive-include':
+                self.debug_print("recursive-include %s %s" %
+                                 (dir, string.join(pattern_list)))
+                for pattern in pattern_list:
+                    if not self.select_pattern (pattern, prefix=dir):
+                        self.warn (("no files found matching '%s' " +
+                                        "under directory '%s'") %
+                                       (pattern, dir))
+
+            elif action == 'recursive-exclude':
+                self.debug_print("recursive-exclude %s %s" %
+                                 (dir, string.join(pattern_list)))
+                for pattern in pattern_list:
+                    if not self.exclude_pattern(pattern, prefix=dir):
+                        self.warn \
+                            (("no previously-included files matching '%s' " +
+                              "found under directory '%s'") %
+                             (pattern, dir))
+
+            elif action == 'graft':
+                self.debug_print("graft " + dir_pattern)
+                if not self.select_pattern(None, prefix=dir_pattern):
+                    self.warn ("no directories found matching '%s'" %
+                                   dir_pattern)
+
+            elif action == 'prune':
+                self.debug_print("prune " + dir_pattern)
+                if not self.exclude_pattern(None, prefix=dir_pattern):
+                    self.warn \
+                        (("no previously-included directories found " +
+                          "matching '%s'") %
+                         dir_pattern)
+            else:
+                raise RuntimeError, \
+                      "this cannot happen: invalid action '%s'" % action
+
+    # process_line ()
+
+
+
+
+    def select_pattern (self, pattern,
+                        anchor=1, prefix=None, is_regex=0):
+        """Select strings (presumably filenames) from 'files' that match
+        'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
+        quite the same as implemented by the 'fnmatch' module: '*' and '?'
+        match non-special characters, where "special" is platform-dependent:
+        slash on Unix, colon, slash, and backslash on DOS/Windows, and colon on
+        Mac OS.
+
+        If 'anchor' is true (the default), then the pattern match is more
+        stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
+        'anchor' is false, both of these will match.
+
+        If 'prefix' is supplied, then only filenames starting with 'prefix'
+        (itself a pattern) and ending with 'pattern', with anything in between
+        them, will match.  'anchor' is ignored in this case.
+
+        If 'is_regex' is true, 'anchor' and 'prefix' are ignored, and
+        'pattern' is assumed to be either a string containing a regex or a
+        regex object -- no translation is done, the regex is just compiled
+        and used as-is.
+
+        Selected strings will be added to self.files.
+
+        Return 1 if files are found.
+        """
+        files_found = 0
+        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
+        self.debug_print("select_pattern: applying regex r'%s'" %
+                         pattern_re.pattern)
+
+        # delayed loading of allfiles list
+        if self.allfiles is None: self.allfiles = findall (self.dir)
+
+        for name in self.allfiles:
+            if pattern_re.search (name):
+                self.debug_print(" adding " + name)
+                self.files.append (name)
+                files_found = 1
+    
+        return files_found
+
+    # select_pattern ()
+
+
+    def exclude_pattern (self, pattern,
+                         anchor=1, prefix=None, is_regex=0):
+        """Remove strings (presumably filenames) from 'files' that match
+        'pattern'.  Other parameters are the same as for
+        'select_pattern()', above.  
+        The list 'self.files' is modified in place.
+        Return 1 if files are found.
+        """
+        files_found = 0
+        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
+        self.debug_print("exclude_pattern: applying regex r'%s'" %
+                         pattern_re.pattern)
+        for i in range (len(self.files)-1, -1, -1):
+            if pattern_re.search (self.files[i]):
+                self.debug_print(" removing " + self.files[i])
+                del self.files[i]
+                files_found = 1
+    
+        return files_found
+
+    # exclude_pattern ()
+
+
+    def recursive_exclude_pattern (self, dir, pattern=None):
+        """Remove filenames from 'self.files' that are under 'dir' and
+        whose basenames match 'pattern'.
+        Return 1 if files are found.
+        """
+        files_found = 0
+        self.debug_print("recursive_exclude_pattern: dir=%s, pattern=%s" %
+                         (dir, pattern))
+        if pattern is None:
+            pattern_re = None
+        else:
+            pattern_re = translate_pattern (pattern)
+
+        for i in range (len (self.files)-1, -1, -1):
+            (cur_dir, cur_base) = os.path.split (self.files[i])
+            if (cur_dir == dir and
+                (pattern_re is None or pattern_re.match (cur_base))):
+                self.debug_print("removing %s" % self.files[i])
+                del self.files[i]
+                files_found = 1
+    
+        return files_found
+
+# class FileList
+
+
+# ----------------------------------------------------------------------
+# Utility functions
+
+def findall (dir = os.curdir):
+    """Find all files under 'dir' and return the list of full filenames
+    (relative to 'dir').
+    """
+    from stat import ST_MODE, S_ISREG, S_ISDIR, S_ISLNK
+
+    list = []
+    stack = [dir]
+    pop = stack.pop
+    push = stack.append
+
+    while stack:
+        dir = pop()
+        names = os.listdir (dir)
+
+        for name in names:
+            if dir != os.curdir:        # avoid the dreaded "./" syndrome
+                fullname = os.path.join (dir, name)
+            else:
+                fullname = name
+
+            # Avoid excess stat calls -- just one will do, thank you!
+            stat = os.stat(fullname)
+            mode = stat[ST_MODE]
+            if S_ISREG(mode):
+                list.append (fullname)
+            elif S_ISDIR(mode) and not S_ISLNK(mode):
+                push (fullname)
+
+    return list
+
+
+def glob_to_re (pattern):
+    """Translate a shell-like glob pattern to a regular expression; return
+    a string containing the regex.  Differs from 'fnmatch.translate()' in
+    that '*' does not match "special characters" (which are
+    platform-specific).
+    """
+    pattern_re = fnmatch.translate (pattern)
+
+    # '?' and '*' in the glob pattern become '.' and '.*' in the RE, which
+    # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
+    # and by extension they shouldn't match such "special characters" under
+    # any OS.  So change all non-escaped dots in the RE to match any
+    # character except the special characters.
+    # XXX currently the "special characters" are just slash -- i.e. this is
+    # Unix-only.
+    pattern_re = re.sub (r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    return pattern_re
+
+# glob_to_re ()
+
+
+def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
+    """Translate a shell-like wildcard pattern to a compiled regular
+    expression.  Return the compiled regex.  If 'is_regex' true,
+    then 'pattern' is directly compiled to a regex (if it's a string)
+    or just returned as-is (assumes it's a regex object).
+    """
+    if is_regex:
+        if type(pattern) is StringType:
+            return re.compile(pattern)
+        else:
+            return pattern
+
+    if pattern:
+        pattern_re = glob_to_re (pattern)
+    else:
+        pattern_re = ''
+        
+    if prefix is not None:
+        prefix_re = (glob_to_re (prefix))[0:-1] # ditch trailing $
+        pattern_re = "^" + os.path.join (prefix_re, ".*" + pattern_re)
+    else:                               # no prefix -- respect anchor flag
+        if anchor:
+            pattern_re = "^" + pattern_re
+        
+    return re.compile (pattern_re)
+
+# translate_pattern ()

From 8c4ad7e3aecd45e6207ee27003cceef9ed92b8d2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 00:08:13 +0000
Subject: [PATCH 0510/8469] Added class docstring and ditched inappropriate
 class attrs. Indentation/whitspace fixes.

---
 filelist.py | 249 ++++++++++++++++++++++++++--------------------------
 1 file changed, 126 insertions(+), 123 deletions(-)

diff --git a/filelist.py b/filelist.py
index ee7051b97e..78f2a8d859 100644
--- a/filelist.py
+++ b/filelist.py
@@ -19,15 +19,19 @@
 
 class FileList:
 
-    files = None # reference to files list to mainpulate
-    allfiles = None # list of all files, if None will be filled
-                    # at first use from directory self.dir
-    dir = None # directory from which files will be taken
-               # to fill self.allfiles if it was not set otherwise
-
-    # next both functions (callable objects) can be set by the user
-    # warn: warning function
-    # debug_print: debug function  
+    """A list of files built by on exploring the filesystem and filtered by
+    applying various patterns to what we find there.
+
+    Instance attributes:
+      dir
+        directory from which files will be taken -- only used if
+        'allfiles' not supplied to constructor
+      files
+        list of filenames currently being built/filtered/manipulated
+      allfiles
+        complete list of files under consideration (ie. without any
+        filtering applied)
+    """
 
     def __init__(self, 
                  files=[], 
@@ -42,13 +46,14 @@ def __init__(self,
         self.debug_print = debug_print
         self.files = files
         self.dir = dir
+
+        # if None, 'allfiles' will be filled when used for first time
         self.allfiles = allfiles 
-             # if None, it will be filled, when used for first time
 
 
     # standard warning and debug functions, if no other given
     def __warn (self, msg):
-        sys.stderr.write ("warning: template: %s\n" % msg)
+        sys.stderr.write ("warning: %s\n" % msg)
         
     def __debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
@@ -59,130 +64,128 @@ def __debug_print (self, msg):
             print msg
 
     
-    def process_line(self, line):    
+    def process_line (self, line):    
+
+        words = string.split (line)
+        action = words[0]
+
+        # First, check that the right number of words are present
+        # for the given action (which is the first word)
+        if action in ('include','exclude',
+                      'global-include','global-exclude'):
+            if len (words) < 2:
+                self.warn \
+                    ("invalid template line: " +
+                     "'%s' expects <pattern1> <pattern2> ..." %
+                     action)
+                return
 
-            words = string.split (line)
-            action = words[0]
+            pattern_list = map(convert_path, words[1:])
 
-            # First, check that the right number of words are present
-            # for the given action (which is the first word)
-            if action in ('include','exclude',
-                          'global-include','global-exclude'):
-                if len (words) < 2:
-                    self.warn \
-                        ("invalid template line: " +
-                         "'%s' expects <pattern1> <pattern2> ..." %
-                         action)
-                    return
+        elif action in ('recursive-include','recursive-exclude'):
+            if len (words) < 3:
+                self.warn \
+                    ("invalid template line: " +
+                     "'%s' expects <dir> <pattern1> <pattern2> ..." %
+                     action)
+                return
 
-                pattern_list = map(convert_path, words[1:])
+            dir = convert_path(words[1])
+            pattern_list = map (convert_path, words[2:])
 
-            elif action in ('recursive-include','recursive-exclude'):
-                if len (words) < 3:
-                    self.warn \
-                        ("invalid template line: " +
-                         "'%s' expects <dir> <pattern1> <pattern2> ..." %
-                         action)
-                    return
+        elif action in ('graft','prune'):
+            if len (words) != 2:
+                self.warn \
+                    ("invalid template line: " +
+                     "'%s' expects a single <dir_pattern>" %
+                     action)
+                return
 
-                dir = convert_path(words[1])
-                pattern_list = map (convert_path, words[2:])
+            dir_pattern = convert_path (words[1])
 
-            elif action in ('graft','prune'):
-                if len (words) != 2:
+        else:
+            self.warn ("invalid template line: " +
+                           "unknown action '%s'" % action)
+            return
+
+        # OK, now we know that the action is valid and we have the
+        # right number of words on the line for that action -- so we
+        # can proceed with minimal error-checking.  Also, we have
+        # defined either (pattern), (dir and pattern), or
+        # (dir_pattern) -- so we don't have to spend any time
+        # digging stuff up out of 'words'.
+
+        if action == 'include':
+            self.debug_print("include " + string.join(pattern_list))
+            for pattern in pattern_list:
+                if not self.select_pattern (pattern, anchor=1):
+                    self.warn ("no files found matching '%s'" %
+                                   pattern)
+
+        elif action == 'exclude':
+            self.debug_print("exclude " + string.join(pattern_list))
+            for pattern in pattern_list:
+                if not self.exclude_pattern (pattern, anchor=1):
+                    self.warn (
+                        "no previously-included files found matching '%s'"%
+                        pattern)
+
+        elif action == 'global-include':
+            self.debug_print("global-include " + string.join(pattern_list))
+            for pattern in pattern_list:
+                if not self.select_pattern (pattern, anchor=0):
+                    self.warn (("no files found matching '%s' " +
+                                    "anywhere in distribution") %
+                                   pattern)
+
+        elif action == 'global-exclude':
+            self.debug_print("global-exclude " + string.join(pattern_list))
+            for pattern in pattern_list:
+                if not self.exclude_pattern (pattern, anchor=0):
                     self.warn \
-                        ("invalid template line: " +
-                         "'%s' expects a single <dir_pattern>" %
-                         action)
-                    return
-
-                dir_pattern = convert_path (words[1])
-
-            else:
-                self.warn ("invalid template line: " +
-                               "unknown action '%s'" % action)
-                return
-
-            # OK, now we know that the action is valid and we have the
-            # right number of words on the line for that action -- so we
-            # can proceed with minimal error-checking.  Also, we have
-            # defined either (pattern), (dir and pattern), or
-            # (dir_pattern) -- so we don't have to spend any time
-            # digging stuff up out of 'words'.
-
-            if action == 'include':
-                self.debug_print("include " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    if not self.select_pattern (pattern, anchor=1):
-                        self.warn ("no files found matching '%s'" %
-                                       pattern)
-
-            elif action == 'exclude':
-                self.debug_print("exclude " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    if not self.exclude_pattern (pattern, anchor=1):
-                        self.warn (
-                            "no previously-included files found matching '%s'"%
-                            pattern)
-
-            elif action == 'global-include':
-                self.debug_print("global-include " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    if not self.select_pattern (pattern, anchor=0):
-                        self.warn (("no files found matching '%s' " +
-                                        "anywhere in distribution") %
-                                       pattern)
-
-            elif action == 'global-exclude':
-                self.debug_print("global-exclude " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    if not self.exclude_pattern (pattern, anchor=0):
-                        self.warn \
-                            (("no previously-included files matching '%s' " +
-                              "found anywhere in distribution") %
-                             pattern)
-
-            elif action == 'recursive-include':
-                self.debug_print("recursive-include %s %s" %
-                                 (dir, string.join(pattern_list)))
-                for pattern in pattern_list:
-                    if not self.select_pattern (pattern, prefix=dir):
-                        self.warn (("no files found matching '%s' " +
-                                        "under directory '%s'") %
-                                       (pattern, dir))
-
-            elif action == 'recursive-exclude':
-                self.debug_print("recursive-exclude %s %s" %
-                                 (dir, string.join(pattern_list)))
-                for pattern in pattern_list:
-                    if not self.exclude_pattern(pattern, prefix=dir):
-                        self.warn \
-                            (("no previously-included files matching '%s' " +
-                              "found under directory '%s'") %
-                             (pattern, dir))
-
-            elif action == 'graft':
-                self.debug_print("graft " + dir_pattern)
-                if not self.select_pattern(None, prefix=dir_pattern):
-                    self.warn ("no directories found matching '%s'" %
-                                   dir_pattern)
-
-            elif action == 'prune':
-                self.debug_print("prune " + dir_pattern)
-                if not self.exclude_pattern(None, prefix=dir_pattern):
+                        (("no previously-included files matching '%s' " +
+                          "found anywhere in distribution") %
+                         pattern)
+
+        elif action == 'recursive-include':
+            self.debug_print("recursive-include %s %s" %
+                             (dir, string.join(pattern_list)))
+            for pattern in pattern_list:
+                if not self.select_pattern (pattern, prefix=dir):
+                    self.warn (("no files found matching '%s' " +
+                                    "under directory '%s'") %
+                                   (pattern, dir))
+
+        elif action == 'recursive-exclude':
+            self.debug_print("recursive-exclude %s %s" %
+                             (dir, string.join(pattern_list)))
+            for pattern in pattern_list:
+                if not self.exclude_pattern(pattern, prefix=dir):
                     self.warn \
-                        (("no previously-included directories found " +
-                          "matching '%s'") %
-                         dir_pattern)
-            else:
-                raise RuntimeError, \
-                      "this cannot happen: invalid action '%s'" % action
+                        (("no previously-included files matching '%s' " +
+                          "found under directory '%s'") %
+                         (pattern, dir))
+
+        elif action == 'graft':
+            self.debug_print("graft " + dir_pattern)
+            if not self.select_pattern(None, prefix=dir_pattern):
+                self.warn ("no directories found matching '%s'" %
+                               dir_pattern)
+
+        elif action == 'prune':
+            self.debug_print("prune " + dir_pattern)
+            if not self.exclude_pattern(None, prefix=dir_pattern):
+                self.warn \
+                    (("no previously-included directories found " +
+                      "matching '%s'") %
+                     dir_pattern)
+        else:
+            raise RuntimeError, \
+                  "this cannot happen: invalid action '%s'" % action
 
     # process_line ()
 
 
-
-
     def select_pattern (self, pattern,
                         anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'files' that match

From aab3b0d0ea6785e13a0bdeb71853544d4302f568 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 00:21:36 +0000
Subject: [PATCH 0511/8469] Renamed 'process_line()' to
 'process_template_line()', and factored out '_parse_template_line()'.

---
 filelist.py | 132 +++++++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 69 deletions(-)

diff --git a/filelist.py b/filelist.py
index 78f2a8d859..5310ae5a67 100644
--- a/filelist.py
+++ b/filelist.py
@@ -16,6 +16,7 @@
 from types import *
 from glob import glob
 from distutils.util import convert_path
+from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 
 class FileList:
 
@@ -64,126 +65,119 @@ def __debug_print (self, msg):
             print msg
 
     
-    def process_line (self, line):    
-
+    def _parse_template_line (self, line):
         words = string.split (line)
         action = words[0]
 
-        # First, check that the right number of words are present
-        # for the given action (which is the first word)
-        if action in ('include','exclude',
-                      'global-include','global-exclude'):
+        patterns = dir = dir_pattern = None
+
+        if action in ('include', 'exclude',
+                      'global-include', 'global-exclude'):
             if len (words) < 2:
-                self.warn \
-                    ("invalid template line: " +
-                     "'%s' expects <pattern1> <pattern2> ..." %
-                     action)
-                return
+                raise DistutilsTemplateError, \
+                      "'%s' expects <pattern1> <pattern2> ..." % action
 
-            pattern_list = map(convert_path, words[1:])
+            patterns = map(convert_path, words[1:])
 
-        elif action in ('recursive-include','recursive-exclude'):
+        elif action in ('recursive-include', 'recursive-exclude'):
             if len (words) < 3:
-                self.warn \
-                    ("invalid template line: " +
-                     "'%s' expects <dir> <pattern1> <pattern2> ..." %
-                     action)
-                return
+                raise DistutilsTemplateError, \
+                      "'%s' expects <dir> <pattern1> <pattern2> ..." % action
 
             dir = convert_path(words[1])
-            pattern_list = map (convert_path, words[2:])
+            patterns = map(convert_path, words[2:])
 
-        elif action in ('graft','prune'):
+        elif action in ('graft', 'prune'):
             if len (words) != 2:
-                self.warn \
-                    ("invalid template line: " +
-                     "'%s' expects a single <dir_pattern>" %
-                     action)
-                return
+                raise DistutilsTemplateError, \
+                     "'%s' expects a single <dir_pattern>" % action
 
-            dir_pattern = convert_path (words[1])
+            dir_pattern = convert_path(words[1])
 
         else:
-            self.warn ("invalid template line: " +
-                           "unknown action '%s'" % action)
-            return
+            raise DistutilsTemplateError, "unknown action '%s'" % action
+
+        return (action, pattern, dir, dir_pattern)
+
+    # _parse_template_line ()
+    
+
+    def process_template_line (self, line):    
+
+        # Parse the line: split it up, make sure the right number of words
+        # are there, and return the relevant words.  'action' is always
+        # defined: it's the first word of the line.  Which of the other
+        # three are defined depends on the action; it'll be either
+        # patterns, (dir and patterns), or (dir_pattern).
+        (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
 
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
-        # can proceed with minimal error-checking.  Also, we have
-        # defined either (pattern), (dir and pattern), or
-        # (dir_pattern) -- so we don't have to spend any time
-        # digging stuff up out of 'words'.
-
+        # can proceed with minimal error-checking.
         if action == 'include':
-            self.debug_print("include " + string.join(pattern_list))
-            for pattern in pattern_list:
+            self.debug_print("include " + string.join(patterns))
+            for pattern in patterns:
                 if not self.select_pattern (pattern, anchor=1):
-                    self.warn ("no files found matching '%s'" %
-                                   pattern)
+                    self.warn("no files found matching '%s'" % pattern)
 
         elif action == 'exclude':
-            self.debug_print("exclude " + string.join(pattern_list))
-            for pattern in pattern_list:
+            self.debug_print("exclude " + string.join(patterns))
+            for pattern in patterns:
                 if not self.exclude_pattern (pattern, anchor=1):
-                    self.warn (
+                    self.warn(
                         "no previously-included files found matching '%s'"%
                         pattern)
 
         elif action == 'global-include':
-            self.debug_print("global-include " + string.join(pattern_list))
-            for pattern in pattern_list:
+            self.debug_print("global-include " + string.join(patterns))
+            for pattern in patterns:
                 if not self.select_pattern (pattern, anchor=0):
                     self.warn (("no files found matching '%s' " +
-                                    "anywhere in distribution") %
-                                   pattern)
+                                "anywhere in distribution") %
+                               pattern)
 
         elif action == 'global-exclude':
-            self.debug_print("global-exclude " + string.join(pattern_list))
-            for pattern in pattern_list:
+            self.debug_print("global-exclude " + string.join(patterns))
+            for pattern in patterns:
                 if not self.exclude_pattern (pattern, anchor=0):
-                    self.warn \
-                        (("no previously-included files matching '%s' " +
-                          "found anywhere in distribution") %
-                         pattern)
+                    self.warn(("no previously-included files matching '%s' " +
+                               "found anywhere in distribution") %
+                              pattern)
 
         elif action == 'recursive-include':
             self.debug_print("recursive-include %s %s" %
-                             (dir, string.join(pattern_list)))
-            for pattern in pattern_list:
+                             (dir, string.join(patterns)))
+            for pattern in patterns:
                 if not self.select_pattern (pattern, prefix=dir):
                     self.warn (("no files found matching '%s' " +
-                                    "under directory '%s'") %
-                                   (pattern, dir))
+                                "under directory '%s'") %
+                               (pattern, dir))
 
         elif action == 'recursive-exclude':
             self.debug_print("recursive-exclude %s %s" %
-                             (dir, string.join(pattern_list)))
-            for pattern in pattern_list:
+                             (dir, string.join(patterns)))
+            for pattern in patterns:
                 if not self.exclude_pattern(pattern, prefix=dir):
-                    self.warn \
-                        (("no previously-included files matching '%s' " +
-                          "found under directory '%s'") %
-                         (pattern, dir))
+                    self.warn(("no previously-included files matching '%s' " +
+                               "found under directory '%s'") %
+                              (pattern, dir))
 
         elif action == 'graft':
             self.debug_print("graft " + dir_pattern)
             if not self.select_pattern(None, prefix=dir_pattern):
-                self.warn ("no directories found matching '%s'" %
-                               dir_pattern)
+                self.warn ("no directories found matching '%s'" % dir_pattern)
 
         elif action == 'prune':
             self.debug_print("prune " + dir_pattern)
             if not self.exclude_pattern(None, prefix=dir_pattern):
-                self.warn \
-                    (("no previously-included directories found " +
-                      "matching '%s'") %
-                     dir_pattern)
+                self.warn(("no previously-included directories found " +
+                           "matching '%s'") %
+                          dir_pattern)
         else:
-            raise RuntimeError, \
+            raise DistutilsInternalError, \
                   "this cannot happen: invalid action '%s'" % action
 
-    # process_line ()
+    # process_template_line ()
 
 
     def select_pattern (self, pattern,

From ea8670808399ab267f60d8cfcab189102e069b8e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 00:36:25 +0000
Subject: [PATCH 0512/8469] Renamed 'select_pattern()' to 'include_pattern()'.
 Other cosmetic/doc/comment tweaks.

---
 filelist.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/filelist.py b/filelist.py
index 5310ae5a67..749fa6124b 100644
--- a/filelist.py
+++ b/filelist.py
@@ -105,7 +105,7 @@ def _parse_template_line (self, line):
     def process_template_line (self, line):    
 
         # Parse the line: split it up, make sure the right number of words
-        # are there, and return the relevant words.  'action' is always
+        # is there, and return the relevant words.  'action' is always
         # defined: it's the first word of the line.  Which of the other
         # three are defined depends on the action; it'll be either
         # patterns, (dir and patterns), or (dir_pattern).
@@ -117,7 +117,7 @@ def process_template_line (self, line):
         if action == 'include':
             self.debug_print("include " + string.join(patterns))
             for pattern in patterns:
-                if not self.select_pattern (pattern, anchor=1):
+                if not self.include_pattern (pattern, anchor=1):
                     self.warn("no files found matching '%s'" % pattern)
 
         elif action == 'exclude':
@@ -131,7 +131,7 @@ def process_template_line (self, line):
         elif action == 'global-include':
             self.debug_print("global-include " + string.join(patterns))
             for pattern in patterns:
-                if not self.select_pattern (pattern, anchor=0):
+                if not self.include_pattern (pattern, anchor=0):
                     self.warn (("no files found matching '%s' " +
                                 "anywhere in distribution") %
                                pattern)
@@ -148,7 +148,7 @@ def process_template_line (self, line):
             self.debug_print("recursive-include %s %s" %
                              (dir, string.join(patterns)))
             for pattern in patterns:
-                if not self.select_pattern (pattern, prefix=dir):
+                if not self.include_pattern (pattern, prefix=dir):
                     self.warn (("no files found matching '%s' " +
                                 "under directory '%s'") %
                                (pattern, dir))
@@ -164,7 +164,7 @@ def process_template_line (self, line):
 
         elif action == 'graft':
             self.debug_print("graft " + dir_pattern)
-            if not self.select_pattern(None, prefix=dir_pattern):
+            if not self.include_pattern(None, prefix=dir_pattern):
                 self.warn ("no directories found matching '%s'" % dir_pattern)
 
         elif action == 'prune':
@@ -180,14 +180,15 @@ def process_template_line (self, line):
     # process_template_line ()
 
 
-    def select_pattern (self, pattern,
+    def include_pattern (self, pattern,
                         anchor=1, prefix=None, is_regex=0):
-        """Select strings (presumably filenames) from 'files' that match
-        'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
-        quite the same as implemented by the 'fnmatch' module: '*' and '?'
-        match non-special characters, where "special" is platform-dependent:
-        slash on Unix, colon, slash, and backslash on DOS/Windows, and colon on
-        Mac OS.
+
+        """Select strings (presumably filenames) from 'self.files' that
+        match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
+        are not quite the same as implemented by the 'fnmatch' module: '*'
+        and '?'  match non-special characters, where "special" is platform-
+        dependent: slash on Unix; colon, slash, and backslash on
+        DOS/Windows; and colon on Mac OS.
 
         If 'anchor' is true (the default), then the pattern match is more
         stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
@@ -208,7 +209,7 @@ def select_pattern (self, pattern,
         """
         files_found = 0
         pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
-        self.debug_print("select_pattern: applying regex r'%s'" %
+        self.debug_print("include_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
 
         # delayed loading of allfiles list
@@ -222,14 +223,14 @@ def select_pattern (self, pattern,
     
         return files_found
 
-    # select_pattern ()
+    # include_pattern ()
 
 
     def exclude_pattern (self, pattern,
                          anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
         'pattern'.  Other parameters are the same as for
-        'select_pattern()', above.  
+        'include_pattern()', above.  
         The list 'self.files' is modified in place.
         Return 1 if files are found.
         """

From 86f9edf31c0f992aacc6f9fb0892a57e749e60f4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 00:37:04 +0000
Subject: [PATCH 0513/8469] Ditched the unused 'recursive_exclude_pattern()'
 method.

---
 filelist.py | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/filelist.py b/filelist.py
index 749fa6124b..2eaff83705 100644
--- a/filelist.py
+++ b/filelist.py
@@ -248,30 +248,6 @@ def exclude_pattern (self, pattern,
 
     # exclude_pattern ()
 
-
-    def recursive_exclude_pattern (self, dir, pattern=None):
-        """Remove filenames from 'self.files' that are under 'dir' and
-        whose basenames match 'pattern'.
-        Return 1 if files are found.
-        """
-        files_found = 0
-        self.debug_print("recursive_exclude_pattern: dir=%s, pattern=%s" %
-                         (dir, pattern))
-        if pattern is None:
-            pattern_re = None
-        else:
-            pattern_re = translate_pattern (pattern)
-
-        for i in range (len (self.files)-1, -1, -1):
-            (cur_dir, cur_base) = os.path.split (self.files[i])
-            if (cur_dir == dir and
-                (pattern_re is None or pattern_re.match (cur_base))):
-                self.debug_print("removing %s" % self.files[i])
-                del self.files[i]
-                files_found = 1
-    
-        return files_found
-
 # class FileList
 
 

From 2a8fc1009cee9fe11b303b246f81dfc71806e647 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:03:31 +0000
Subject: [PATCH 0514/8469] Added DistutilsTemplateError.

---
 errors.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/errors.py b/errors.py
index a718f01a40..bec3464511 100644
--- a/errors.py
+++ b/errors.py
@@ -73,6 +73,9 @@ class DistutilsInternalError (DistutilsError):
     should never be seen if the code is working!)."""
     pass
 
+class DistutilsTemplateError (DistutilsError):
+    """Syntax error in a file list template."""
+
 
 # Exception classes used by the CCompiler implementation classes
 class CCompilerError (Exception):

From 689482195099b5777e8d3ae68f3049df64c46d7a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:04:22 +0000
Subject: [PATCH 0515/8469] Typo fix.

---
 filelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filelist.py b/filelist.py
index 2eaff83705..a8049287df 100644
--- a/filelist.py
+++ b/filelist.py
@@ -97,7 +97,7 @@ def _parse_template_line (self, line):
         else:
             raise DistutilsTemplateError, "unknown action '%s'" % action
 
-        return (action, pattern, dir, dir_pattern)
+        return (action, patterns, dir, dir_pattern)
 
     # _parse_template_line ()
     

From 29d6ebdae92bac92b53c8cb2d69c710b12c8b1a9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:05:02 +0000
Subject: [PATCH 0516/8469] The other half of Rene Liebscher's patch to add the
 Template class, which I renamed to FileList: remove all the
 file-list-generation code from the sdist command and adapt it to use the new
 FileList class instead.

---
 command/sdist.py | 320 +++--------------------------------------------
 1 file changed, 15 insertions(+), 305 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 3b91170cb3..045054b86a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -6,16 +6,16 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
-import fnmatch
+import sys, os, string
 from types import *
 from glob import glob
 from distutils.core import Command
 from distutils.util import \
-     convert_path, create_tree, remove_tree, newer, write_file, \
+     create_tree, remove_tree, newer, write_file, \
      check_archive_formats
 from distutils.text_file import TextFile
 from distutils.errors import DistutilsExecError, DistutilsOptionError
+from distutils.filelist import FileList
 
 
 def show_formats ():
@@ -319,25 +319,6 @@ def add_defaults (self):
     # add_defaults ()
     
 
-    def recursive_exclude_pattern (self, dir, pattern=None):
-        """Remove filenames from 'self.files' that are under 'dir' and
-        whose basenames match 'pattern'.
-        """
-        self.debug_print("recursive_exclude_pattern: dir=%s, pattern=%s" %
-                         (dir, pattern))
-        if pattern is None:
-            pattern_re = None
-        else:
-            pattern_re = translate_pattern (pattern)
-
-        for i in range (len (self.files)-1, -1, -1):
-            (cur_dir, cur_base) = os.path.split (self.files[i])
-            if (cur_dir == dir and
-                (pattern_re is None or pattern_re.match (cur_base))):
-                self.debug_print("removing %s" % self.files[i])
-                del self.files[i]
-
-
     def read_template (self):
         """Read and parse the manifest template file named by
         'self.template' (usually "MANIFEST.in").  Process all file
@@ -356,152 +337,17 @@ def read_template (self):
                              rstrip_ws=1,
                              collapse_ws=1)
 
-        all_files = findall ()
+        # if we give Template() a list, it modifies this list
+        filelist = FileList(files=self.files,
+                            warn=self.warn,
+                            debug_print=self.debug_print)
 
         while 1:
-
             line = template.readline()
             if line is None:            # end of file
                 break
 
-            words = string.split (line)
-            action = words[0]
-
-            # First, check that the right number of words are present
-            # for the given action (which is the first word)
-            if action in ('include','exclude',
-                          'global-include','global-exclude'):
-                if len (words) < 2:
-                    template.warn \
-                        ("invalid manifest template line: " +
-                         "'%s' expects <pattern1> <pattern2> ..." %
-                         action)
-                    continue
-
-                pattern_list = map(convert_path, words[1:])
-
-            elif action in ('recursive-include','recursive-exclude'):
-                if len (words) < 3:
-                    template.warn \
-                        ("invalid manifest template line: " +
-                         "'%s' expects <dir> <pattern1> <pattern2> ..." %
-                         action)
-                    continue
-
-                dir = convert_path(words[1])
-                pattern_list = map (convert_path, words[2:])
-
-            elif action in ('graft','prune'):
-                if len (words) != 2:
-                    template.warn \
-                        ("invalid manifest template line: " +
-                         "'%s' expects a single <dir_pattern>" %
-                         action)
-                    continue
-
-                dir_pattern = convert_path (words[1])
-
-            else:
-                template.warn ("invalid manifest template line: " +
-                               "unknown action '%s'" % action)
-                continue
-
-            # OK, now we know that the action is valid and we have the
-            # right number of words on the line for that action -- so we
-            # can proceed with minimal error-checking.  Also, we have
-            # defined either (pattern), (dir and pattern), or
-            # (dir_pattern) -- so we don't have to spend any time
-            # digging stuff up out of 'words'.
-
-            if action == 'include':
-                self.debug_print("include " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    files = self.select_pattern (all_files, pattern, anchor=1)
-                    if not files:
-                        template.warn ("no files found matching '%s'" %
-                                       pattern)
-                    else:
-                        self.files.extend (files)
-
-            elif action == 'exclude':
-                self.debug_print("exclude " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    num = self.exclude_pattern (self.files, pattern, anchor=1)
-                    if num == 0:
-                        template.warn (
-                            "no previously-included files found matching '%s'"%
-                            pattern)
-
-            elif action == 'global-include':
-                self.debug_print("global-include " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    files = self.select_pattern (all_files, pattern, anchor=0)
-                    if not files:
-                        template.warn (("no files found matching '%s' " +
-                                        "anywhere in distribution") %
-                                       pattern)
-                    else:
-                        self.files.extend (files)
-
-            elif action == 'global-exclude':
-                self.debug_print("global-exclude " + string.join(pattern_list))
-                for pattern in pattern_list:
-                    num = self.exclude_pattern (self.files, pattern, anchor=0)
-                    if num == 0:
-                        template.warn \
-                            (("no previously-included files matching '%s' " +
-                              "found anywhere in distribution") %
-                             pattern)
-
-            elif action == 'recursive-include':
-                self.debug_print("recursive-include %s %s" %
-                                 (dir, string.join(pattern_list)))
-                for pattern in pattern_list:
-                    files = self.select_pattern (
-                        all_files, pattern, prefix=dir)
-                    if not files:
-                        template.warn (("no files found matching '%s' " +
-                                        "under directory '%s'") %
-                                       (pattern, dir))
-                    else:
-                        self.files.extend (files)
-
-            elif action == 'recursive-exclude':
-                self.debug_print("recursive-exclude %s %s" %
-                                 (dir, string.join(pattern_list)))
-                for pattern in pattern_list:
-                    num = self.exclude_pattern(
-                        self.files, pattern, prefix=dir)
-                    if num == 0:
-                        template.warn \
-                            (("no previously-included files matching '%s' " +
-                              "found under directory '%s'") %
-                             (pattern, dir))
-
-            elif action == 'graft':
-                self.debug_print("graft " + dir_pattern)
-                files = self.select_pattern(
-                    all_files, None, prefix=dir_pattern)
-                if not files:
-                    template.warn ("no directories found matching '%s'" %
-                                   dir_pattern)
-                else:
-                    self.files.extend (files)
-
-            elif action == 'prune':
-                self.debug_print("prune " + dir_pattern)
-                num = self.exclude_pattern(
-                    self.files, None, prefix=dir_pattern)
-                if num == 0:
-                    template.warn \
-                        (("no previously-included directories found " +
-                          "matching '%s'") %
-                         dir_pattern)
-            else:
-                raise RuntimeError, \
-                      "this cannot happen: invalid action '%s'" % action
-
-        # while loop over lines of template file
+            filelist.process_template_line(line)
 
     # read_template ()
 
@@ -516,65 +362,14 @@ def prune_file_list (self):
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
-        self.exclude_pattern (self.files, None, prefix=build.build_base)
-        self.exclude_pattern (self.files, None, prefix=base_dir)
-        self.exclude_pattern (self.files, r'/(RCS|CVS)/.*', is_regex=1)
-
-
-    def select_pattern (self, files, pattern,
-                        anchor=1, prefix=None, is_regex=0):
-        """Select strings (presumably filenames) from 'files' that match
-        'pattern', a Unix-style wildcard (glob) pattern.  Patterns are not
-        quite the same as implemented by the 'fnmatch' module: '*' and '?'
-        match non-special characters, where "special" is platform-dependent:
-        slash on Unix, colon, slash, and backslash on DOS/Windows, and colon on
-        Mac OS.
-
-        If 'anchor' is true (the default), then the pattern match is more
-        stringent: "*.py" will match "foo.py" but not "foo/bar.py".  If
-        'anchor' is false, both of these will match.
-
-        If 'prefix' is supplied, then only filenames starting with 'prefix'
-        (itself a pattern) and ending with 'pattern', with anything in between
-        them, will match.  'anchor' is ignored in this case.
-
-        If 'is_regex' is true, 'anchor' and 'prefix' are ignored, and
-        'pattern' is assumed to be either a string containing a regex or a
-        regex object -- no translation is done, the regex is just compiled
-        and used as-is.
-
-        Return the list of matching strings, possibly empty.
-        """
-        matches = []
-        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
-        self.debug_print("select_pattern: applying regex r'%s'" %
-                         pattern_re.pattern)
-        for name in files:
-            if pattern_re.search (name):
-                matches.append (name)
-                self.debug_print(" adding " + name)
-
-        return matches
 
-    # select_pattern ()
-
-
-    def exclude_pattern (self, files, pattern,
-                         anchor=1, prefix=None, is_regex=0):
-        """Remove strings (presumably filenames) from 'files' that match
-        'pattern'.  Other parameters are the same as for
-        'select_pattern()', above.  The list 'files' is modified in place.
-        """
-
-        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
-        self.debug_print("exclude_pattern: applying regex r'%s'" %
-                         pattern_re.pattern)
-        for i in range (len(files)-1, -1, -1):
-            if pattern_re.search (files[i]):
-                self.debug_print(" removing " + files[i])
-                del files[i]
-
-    # exclude_pattern ()
+        # if we give FileList a list, it modifies this list
+        filelist = FileList(files=self.files,
+                            warn=self.warn,
+                            debug_print=self.debug_print)
+        filelist.exclude_pattern(None, prefix=build.build_base)
+        filelist.exclude_pattern(None, prefix=base_dir)
+        filelist.exclude_pattern(r'/(RCS|CVS)/.*', is_regex=1)
 
 
     def write_manifest (self):
@@ -676,88 +471,3 @@ def get_archive_files (self):
         return self.archive_files
 
 # class sdist
-
-
-# ----------------------------------------------------------------------
-# Utility functions
-
-def findall (dir = os.curdir):
-    """Find all files under 'dir' and return the list of full filenames
-    (relative to 'dir').
-    """
-    from stat import ST_MODE, S_ISREG, S_ISDIR, S_ISLNK
-
-    list = []
-    stack = [dir]
-    pop = stack.pop
-    push = stack.append
-
-    while stack:
-        dir = pop()
-        names = os.listdir (dir)
-
-        for name in names:
-            if dir != os.curdir:        # avoid leading "./"
-                fullname = os.path.join (dir, name)
-            else:
-                fullname = name
-
-            # Avoid excess stat calls -- just one will do, thank you!
-            stat = os.stat(fullname)
-            mode = stat[ST_MODE]
-            if S_ISREG(mode):
-                list.append (fullname)
-            elif S_ISDIR(mode) and not S_ISLNK(mode):
-                push (fullname)
-
-    return list
-
-
-def glob_to_re (pattern):
-    """Translate a shell-like glob pattern to a regular expression; return
-    a string containing the regex.  Differs from 'fnmatch.translate()' in
-    that '*' does not match "special characters" (which are
-    platform-specific).
-    """
-    pattern_re = fnmatch.translate (pattern)
-
-    # '?' and '*' in the glob pattern become '.' and '.*' in the RE, which
-    # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
-    # and by extension they shouldn't match such "special characters" under
-    # any OS.  So change all non-escaped dots in the RE to match any
-    # character except the special characters.
-    # XXX currently the "special characters" are just slash -- i.e. this is
-    # Unix-only.
-    pattern_re = re.sub (r'(^|[^\\])\.', r'\1[^/]', pattern_re)
-    return pattern_re
-
-# glob_to_re ()
-
-
-def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
-    """Translate a shell-like wildcard pattern to a compiled regular
-    expression.  Return the compiled regex.  If 'is_regex' true,
-    then 'pattern' is directly compiled to a regex (if it's a string)
-    or just returned as-is (assumes it's a regex object).
-    """
-    if is_regex:
-        if type(pattern) is StringType:
-            return re.compile(pattern)
-        else:
-            return pattern
-
-    if pattern:
-        pattern_re = glob_to_re (pattern)
-    else:
-        pattern_re = ''
-        
-    if prefix is not None:
-        prefix_re = (glob_to_re (prefix))[0:-1] # ditch trailing $
-        pattern_re = "^" + os.path.join (prefix_re, ".*" + pattern_re)
-    else:                               # no prefix -- respect anchor flag
-        if anchor:
-            pattern_re = "^" + pattern_re
-        
-    return re.compile (pattern_re)
-
-# translate_pattern ()

From ab16bbe1a660891123c029e7dbdd66e61a585a1c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:30:31 +0000
Subject: [PATCH 0517/8469] Replaced 'self.files' with 'self.filelist': now we
 carry around a FileList instance instead of a list of filenames.  Simplifies
 the "sdist" command only a bit, but should allow greater simplification of
 FileList.

---
 command/sdist.py | 92 ++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 54 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 045054b86a..4c2acf678f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -128,8 +128,9 @@ def finalize_options (self):
 
     def run (self):
 
-        # 'files' is the list of files that will make up the manifest
-        self.files = []
+        # 'filelist' contains the list of files that will make up the
+        # manifest
+        self.filelist = FileList()
         
         # Ensure that all required meta-data is given; warn if not (but
         # don't die, it's not *that* serious!)
@@ -137,7 +138,7 @@ def run (self):
 
         # Do whatever it takes to get the list of files to process
         # (process the manifest template, read an existing manifest,
-        # whatever).  File list is put into 'self.files'.
+        # whatever).  File list is accumulated in 'self.filelist'.
         self.get_file_list ()
 
         # If user just wanted us to regenerate the manifest, stop now.
@@ -184,7 +185,7 @@ def check_metadata (self):
 
     def get_file_list (self):
         """Figure out the list of files to include in the source
-        distribution, and put it in 'self.files'.  This might involve
+        distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
         depends on the user's options and the state of the filesystem.
@@ -192,9 +193,9 @@ def get_file_list (self):
 
         # If we have a manifest template, see if it's newer than the
         # manifest; if so, we'll regenerate the manifest.
-        template_exists = os.path.isfile (self.template)
+        template_exists = os.path.isfile(self.template)
         if template_exists:
-            template_newer = newer (self.template, self.manifest)
+            template_newer = newer(self.template, self.manifest)
 
         # The contents of the manifest file almost certainly depend on the
         # setup script as well as the manifest template -- so if the setup
@@ -222,17 +223,17 @@ def get_file_list (self):
             self.force_manifest or self.manifest_only):
 
             if not template_exists:
-                self.warn (("manifest template '%s' does not exist " +
-                            "(using default file list)") %
-                           self.template)
+                self.warn(("manifest template '%s' does not exist " +
+                           "(using default file list)") %
+                          self.template)
 
             # Add default file set to 'files'
             if self.use_defaults:
-                self.add_defaults ()
+                self.add_defaults()
 
             # Read manifest template if it exists
             if template_exists:
-                self.read_template ()
+                self.read_template()
 
             # Prune away any directories that don't belong in the source
             # distribution
@@ -241,30 +242,24 @@ def get_file_list (self):
 
             # File list now complete -- sort it so that higher-level files
             # come first
-            sortable_files = map (os.path.split, self.files)
-            sortable_files.sort ()
-            self.files = []
-            for sort_tuple in sortable_files:
-                self.files.append (apply (os.path.join, sort_tuple))
+            self.filelist.sort()
 
             # Remove duplicates from the file list
-            for i in range (len(self.files)-1, 0, -1):
-                if self.files[i] == self.files[i-1]:
-                    del self.files[i]
+            self.filelist.remove_duplicates()
 
             # And write complete file list (including default file set) to
             # the manifest.
-            self.write_manifest ()
+            self.write_manifest()
 
         # Don't regenerate the manifest, just read it in.
         else:
-            self.read_manifest ()
+            self.read_manifest()
 
     # get_file_list ()
 
 
     def add_defaults (self):
-        """Add all the default files to self.files:
+        """Add all the default files to self.filelist:
           - README or README.txt
           - setup.py
           - test/test*.py
@@ -286,7 +281,7 @@ def add_defaults (self):
                 for fn in alts:
                     if os.path.exists (fn):
                         got_it = 1
-                        self.files.append (fn)
+                        self.filelist.append (fn)
                         break
 
                 if not got_it:
@@ -294,7 +289,7 @@ def add_defaults (self):
                                string.join (alts, ', '))
             else:
                 if os.path.exists (fn):
-                    self.files.append (fn)
+                    self.filelist.append (fn)
                 else:
                     self.warn ("standard file '%s' not found" % fn)
 
@@ -302,33 +297,31 @@ def add_defaults (self):
         for pattern in optional:
             files = filter (os.path.isfile, glob (pattern))
             if files:
-                self.files.extend (files)
+                self.filelist.extend (files)
 
         if self.distribution.has_pure_modules():
             build_py = self.get_finalized_command ('build_py')
-            self.files.extend (build_py.get_source_files ())
+            self.filelist.extend (build_py.get_source_files ())
 
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command ('build_ext')
-            self.files.extend (build_ext.get_source_files ())
+            self.filelist.extend (build_ext.get_source_files ())
 
         if self.distribution.has_c_libraries():
             build_clib = self.get_finalized_command ('build_clib')
-            self.files.extend (build_clib.get_source_files ())
+            self.filelist.extend (build_clib.get_source_files ())
 
     # add_defaults ()
     
 
     def read_template (self):
+
         """Read and parse the manifest template file named by
-        'self.template' (usually "MANIFEST.in").  Process all file
-        specifications (include and exclude) in the manifest template and
-        update 'self.files' accordingly (filenames may be added to
-        or removed from 'self.files' based on the manifest template).
+        'self.template' (usually "MANIFEST.in").  The parsing and
+        processing is done by 'self.filelist', which updates itself
+        accordingly.
         """
-        assert self.files is not None and type (self.files) is ListType
         self.announce("reading manifest template '%s'" % self.template)
-
         template = TextFile (self.template,
                              strip_comments=1,
                              skip_blanks=1,
@@ -337,17 +330,12 @@ def read_template (self):
                              rstrip_ws=1,
                              collapse_ws=1)
 
-        # if we give Template() a list, it modifies this list
-        filelist = FileList(files=self.files,
-                            warn=self.warn,
-                            debug_print=self.debug_print)
-
         while 1:
             line = template.readline()
             if line is None:            # end of file
                 break
 
-            filelist.process_template_line(line)
+            self.filelist.process_template_line(line)
 
     # read_template ()
 
@@ -363,22 +351,18 @@ def prune_file_list (self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
 
-        # if we give FileList a list, it modifies this list
-        filelist = FileList(files=self.files,
-                            warn=self.warn,
-                            debug_print=self.debug_print)
-        filelist.exclude_pattern(None, prefix=build.build_base)
-        filelist.exclude_pattern(None, prefix=base_dir)
-        filelist.exclude_pattern(r'/(RCS|CVS)/.*', is_regex=1)
+        self.filelist.exclude_pattern(None, prefix=build.build_base)
+        self.filelist.exclude_pattern(None, prefix=base_dir)
+        self.filelist.exclude_pattern(r'/(RCS|CVS)/.*', is_regex=1)
 
 
     def write_manifest (self):
-        """Write the file list in 'self.files' (presumably as filled in by
-        'add_defaults()' and 'read_template()') to the manifest file named
-        by 'self.manifest'.
+        """Write the file list in 'self.filelist' (presumably as filled in
+        by 'add_defaults()' and 'read_template()') to the manifest file
+        named by 'self.manifest'.
         """
         self.execute(write_file,
-                     (self.manifest, self.files),
+                     (self.manifest, self.filelist.files),
                      "writing manifest file '%s'" % self.manifest)
 
     # write_manifest ()
@@ -386,7 +370,7 @@ def write_manifest (self):
 
     def read_manifest (self):
         """Read the manifest file (named by 'self.manifest') and use it to
-        fill in 'self.files', the list of files to include in the source
+        fill in 'self.filelist', the list of files to include in the source
         distribution.
         """
         self.announce("reading manifest file '%s'" % self.manifest)
@@ -397,7 +381,7 @@ def read_manifest (self):
                 break
             if line[-1] == '\n':
                 line = line[0:-1]
-            self.files.append (line)
+            self.filelist.append (line)
 
     # read_manifest ()
             
@@ -451,7 +435,7 @@ def make_distribution (self):
         base_dir = self.distribution.get_fullname()
         base_name = os.path.join(self.dist_dir, base_dir)
 
-        self.make_release_tree (base_dir, self.files)
+        self.make_release_tree (base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
         if self.dist_dir:
             self.mkpath(self.dist_dir)

From d3cb1ab466d37d52bad2f5b44d852bb6009c2214 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:45:42 +0000
Subject: [PATCH 0518/8469] Added list-like methods: 'append()', 'extend()',
 'sort()'. Added 'remove_duplicates()'. Simplified constructor: no longer take
 'files' or 'allfiles' as args,   and no longer have 'dir' attribute at all.
 Added 'set_allfiles()' and 'findall()' so the client does have a   way to set
 the list of all files. Changed 'include_pattern()' to use the 'findall()'
 method instead of   the external function.  (Of course, the method is just a
 trivial   wrapper around the function.)

---
 filelist.py | 60 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/filelist.py b/filelist.py
index a8049287df..84f36d2c4b 100644
--- a/filelist.py
+++ b/filelist.py
@@ -35,24 +35,25 @@ class FileList:
     """
 
     def __init__(self, 
-                 files=[], 
-                 dir=os.curdir, 
-                 allfiles=None, 
                  warn=None, 
                  debug_print=None):
-        # use standard warning and debug functions, if no other given
-        if warn is None: warn = self.__warn 
-        if debug_print is None: debug_print = self.__debug_print
-        self.warn = warn
-        self.debug_print = debug_print
-        self.files = files
-        self.dir = dir
+        # use standard warning and debug functions if no other given
+        self.warn = warn or self.__warn
+        self.debug_print = debug_print or self.__debug_print
 
-        # if None, 'allfiles' will be filled when used for first time
-        self.allfiles = allfiles 
+        self.allfiles = None
+        self.files = []
 
 
-    # standard warning and debug functions, if no other given
+    def set_allfiles (self, allfiles):
+        self.allfiles = allfiles
+
+    def findall (self, dir=os.curdir):
+        self.allfiles = findall(dir)
+
+
+    # -- Fallback warning/debug functions ------------------------------
+    
     def __warn (self, msg):
         sys.stderr.write ("warning: %s\n" % msg)
         
@@ -64,6 +65,34 @@ def __debug_print (self, msg):
         if DEBUG:
             print msg
 
+
+    # -- List-like methods ---------------------------------------------
+
+    def append (self, item):
+        self.files.append(item)
+
+    def extend (self, items):
+        self.files.extend(items)
+
+    def sort (self):
+        # Not a strict lexical sort!
+        sortable_files = map(os.path.split, self.files)
+        sortable_files.sort()
+        self.files = []
+        for sort_tuple in sortable_files:
+            self.files.append(apply(os.path.join, sort_tuple))
+
+
+    # -- Other miscellaneous utility methods ---------------------------
+
+    def remove_duplicates (self):
+        # Assumes list has been sorted!
+        for i in range (len(self.files)-1, 0, -1):
+            if self.files[i] == self.files[i-1]:
+                del self.files[i]
+
+
+    # -- "File template" methods ---------------------------------------
     
     def _parse_template_line (self, line):
         words = string.split (line)
@@ -180,6 +209,8 @@ def process_template_line (self, line):
     # process_template_line ()
 
 
+    # -- Filtering/selection methods -----------------------------------
+
     def include_pattern (self, pattern,
                         anchor=1, prefix=None, is_regex=0):
 
@@ -213,7 +244,8 @@ def include_pattern (self, pattern,
                          pattern_re.pattern)
 
         # delayed loading of allfiles list
-        if self.allfiles is None: self.allfiles = findall (self.dir)
+        if self.allfiles is None:
+            self.findall()
 
         for name in self.allfiles:
             if pattern_re.search (name):

From c27f92a2c9bbf5835159d9b0d3e56ae258ef31be Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 30 Jul 2000 01:47:16 +0000
Subject: [PATCH 0519/8469] Catch syntax errors from processing template lines
 and turn them into   mere warnings. Call 'findall()' on our FileList object
 before we start using it seriously.

---
 command/sdist.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 4c2acf678f..4765d7fa13 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -14,7 +14,7 @@
      create_tree, remove_tree, newer, write_file, \
      check_archive_formats
 from distutils.text_file import TextFile
-from distutils.errors import DistutilsExecError, DistutilsOptionError
+from distutils.errors import *
 from distutils.filelist import FileList
 
 
@@ -227,6 +227,8 @@ def get_file_list (self):
                            "(using default file list)") %
                           self.template)
 
+            self.filelist.findall()
+
             # Add default file set to 'files'
             if self.use_defaults:
                 self.add_defaults()
@@ -335,7 +337,12 @@ def read_template (self):
             if line is None:            # end of file
                 break
 
-            self.filelist.process_template_line(line)
+            try:
+                self.filelist.process_template_line(line)
+            except DistutilsTemplateError, msg:
+                self.warn("%s, line %d: %s" % (template.filename,
+                                               template.current_line,
+                                               msg))
 
     # read_template ()
 

From 06830ada1cda3595d2a1f222fd8cbed35bdb691e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 1 Aug 2000 23:54:29 +0000
Subject: [PATCH 0520/8469] Patch from Rene Liebscher, tweaked by me:   -
 'export_symbol_file' (and corresponding 'def_file' in the old     "build
 info" dict) are gone; warn if we see 'def_file' in the     dict   - the MSVC
 "pre-link hack" is gone -- all that stuff is now handled     elsewhere (eg.
 by using 'export_symbols', etc.)   - add 'get_export_symbols()' and
 'get_libraries()' methods -- needed     because on Windows, both of those
 things are a tad more complicated     than fetching them from the Extension
 instance

---
 command/build_ext.py | 85 +++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 44 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c04036b02e..1ffe3234d4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -84,7 +84,7 @@ class build_ext (Command):
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
-	]
+        ]
 
     def initialize_options (self):
         self.extensions = None
@@ -282,7 +282,9 @@ def check_extensions_list (self, extensions):
 
             # Medium-easy stuff: same syntax/semantics, different names.
             ext.runtime_library_dirs = build_info.get('rpath')
-            ext.export_symbol_file = build_info.get('def_file')
+            if build_info.has_key('def_file'):
+                self.warn("'def_file' element of build info dict "
+                          "no longer supported")
 
             # Non-trivial stuff: 'macros' split into 'define_macros'
             # and 'undef_macros'.
@@ -420,16 +422,14 @@ def build_extensions (self):
                 objects.extend (ext.extra_objects)
             extra_args = ext.extra_link_args or []
 
-            # Bunch of fixing-up we have to do for Microsoft's linker.
-            if self.compiler.compiler_type == 'msvc':
-                self.msvc_prelink_hack(sources, ext, extra_args)
 
             self.compiler.link_shared_object (
                 objects, ext_filename, 
-                libraries=ext.libraries,
+                libraries=self.get_libraries(ext),
                 library_dirs=ext.library_dirs,
                 runtime_library_dirs=ext.runtime_library_dirs,
                 extra_postargs=extra_args,
+                export_symbols=self.get_export_symbols(ext), 
                 debug=self.debug,
                 build_temp=self.build_temp)
 
@@ -511,44 +511,6 @@ def find_swig (self):
 
     # find_swig ()
     
-
-    # -- Hooks 'n hacks ------------------------------------------------
-
-    def msvc_prelink_hack (self, sources, ext, extra_args):
-
-        # XXX this is a kludge!  Knowledge of specific compilers or
-        # platforms really doesn't belong here; in an ideal world, the
-        # CCompiler interface would provide access to everything in a
-        # compiler/linker system needs to build Python extensions, and
-        # we would just do everything nicely and cleanly through that
-        # interface.  However, this is a not an ideal world and the
-        # CCompiler interface doesn't handle absolutely everything.
-        # Thus, kludges like this slip in occasionally.  (This is no
-        # excuse for committing more platform- and compiler-specific
-        # kludges; they are to be avoided if possible!)
-
-        def_file = ext.export_symbol_file
-
-        if def_file is not None:
-            extra_args.append ('/DEF:' + def_file)
-        else:
-            modname = string.split (ext.name, '.')[-1]
-            extra_args.append('/export:init%s' % modname)
-
-        # The MSVC linker generates .lib and .exp files, which cannot be
-        # suppressed by any linker switches. The .lib files may even be
-        # needed! Make sure they are generated in the temporary build
-        # directory. Since they have different names for debug and release
-        # builds, they can go into the same directory.
-        implib_file = os.path.join (
-            self.implib_dir,
-            self.get_ext_libname (ext.name))
-        extra_args.append ('/IMPLIB:' + implib_file)
-        self.mkpath (os.path.dirname (implib_file))
-
-    # msvc_prelink_hack ()
-
-
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
 
@@ -579,4 +541,39 @@ def get_ext_libname (self, ext_name):
             return apply (os.path.join, ext_path) + '_d.lib'
         return apply (os.path.join, ext_path) + '.lib'
 
+
+    def get_export_symbols (self, ext):
+        """Return the list of symbols that a shared extension has to
+        export.  This either uses 'ext.export_symbols' or, if it's not
+        provided, "init" + module_name.  Only relevant on Windows, where
+        the .pyd file (DLL) must export the module "init" function.
+        """
+
+        # XXX what if 'export_symbols' defined but it doesn't contain
+        # "init" + module_name?  Should we add it? warn? or just carry
+        # on doing nothing?
+
+        if ext.export_symbols is None:
+            return ["init" + string.split(ext.name,'.')[-1]]
+        else:
+            return ext.export_symbols
+
+    def get_libraries (self, ext):
+        """Return the list of libraries to link against when building a
+        shared extension.  On most platforms, this is just 'ext.libraries';
+        on Windows, we add the Python library (eg. python20.dll).
+        """
+        # The python library is always needed on Windows.  For MSVC, this
+        # is redundant, since the library is mentioned in a pragma in
+        # config.h that MSVC groks.  The other Windows compilers all seem
+        # to need it mentioned explicitly, though, so that's what we do.
+        if sys.platform == "win32": 
+            pythonlib = ("python%d%d" %
+                 (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+            # don't extend ext.libraries, it may be shared with other
+            # extensions, it is a reference to the original list
+            return ext.libraries + [pythonlib]
+        else:
+            return ext.libraries
+
 # class build_ext

From 7ef5e9f9cda6b4b01a7f64ef3b23052c0303e23f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 00:00:30 +0000
Subject: [PATCH 0521/8469] Patch from Rene Liebscher: generate an /IMPLIB:
 option to ensure that the linker leaves the (temporary) .lib file in the
 temporary dir.  (Moved from 'msvc_prelink_hack()' method in build_ext.py.)

---
 msvccompiler.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index e58e6c10c8..b86e0b3023 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -380,10 +380,22 @@ def link_shared_object (self,
             ld_args = (ldflags + lib_opts + export_opts + 
                        objects + ['/OUT:' + output_filename])
 
+            # The MSVC linker generates .lib and .exp files, which cannot be
+            # suppressed by any linker switches. The .lib files may even be
+            # needed! Make sure they are generated in the temporary build
+            # directory. Since they have different names for debug and release
+            # builds, they can go into the same directory.
+            (dll_name, dll_ext) = os.path.splitext(
+                os.path.basename(output_filename))
+            implib_file = os.path.join(
+                os.path.dirname(objects[0]),
+                self.library_filename(dll_name))
+            ld_args.append ('/IMPLIB:' + implib_file)
+
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
-                ld_args.extend (extra_postargs)
+                ld_args.extend(extra_postargs)
 
             print "link_shared_object():"
             print "  output_filename =", output_filename

From 247bbf98667922b35c599456d86afe9b69664773 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 00:01:56 +0000
Subject: [PATCH 0522/8469] Ditched some debugging prints.

---
 msvccompiler.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index b86e0b3023..a1dedb0e53 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -397,9 +397,6 @@ def link_shared_object (self,
             if extra_postargs:
                 ld_args.extend(extra_postargs)
 
-            print "link_shared_object():"
-            print "  output_filename =", output_filename
-            print "  mkpath'ing:", os.path.dirname (output_filename)
             self.mkpath (os.path.dirname (output_filename))
             try:
                 self.spawn ([self.link] + ld_args)

From d43aeac154d817eefdde7f84243bd273d5542254 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 00:04:13 +0000
Subject: [PATCH 0523/8469] Removed 'export_symbol_file'. 'export_symbols' can
 be None (not sure this is a good idea: it's inconsistent   with every other
 instance attribute of Extension).

---
 extension.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/extension.py b/extension.py
index f0f68b9390..95a2ece8e8 100644
--- a/extension.py
+++ b/extension.py
@@ -73,11 +73,6 @@ class Extension:
         used on all platforms, and not generally necessary for Python
         extensions, which typically export exactly one symbol: "init" +
         extension_name.
-      export_symbol_file : string
-        name of file that lists symbols to export; the format of this
-        file is platform- and compiler-specific.  This is even more
-        gratuitous and unnecessary than 'export_symbols'; I'll be happy
-        when it goes away forever.
     """
 
     def __init__ (self, name, sources,
@@ -91,7 +86,6 @@ def __init__ (self, name, sources,
                   extra_compile_args=None,
                   extra_link_args=None,
                   export_symbols=None,
-                  export_symbol_file=None,
                  ):
 
         assert type(name) is StringType, "'name' must be a string"
@@ -111,7 +105,6 @@ def __init__ (self, name, sources,
         self.extra_objects = extra_objects or []
         self.extra_compile_args = extra_compile_args or []
         self.extra_link_args = extra_link_args or []
-        self.export_symbols = export_symbols or []
-        self.export_symbol_file = export_symbol_file
+        self.export_symbols = export_symbols
 
 # class Extension

From 336876f5fbc5664836629ae225b680d31020eb55 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 00:37:32 +0000
Subject: [PATCH 0524/8469] Ditched 'abspath()' -- don't need 1.5.1
 compatability hacks anymore.

---
 util.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/util.py b/util.py
index 0bff3a5b85..d69626e1f1 100644
--- a/util.py
+++ b/util.py
@@ -18,16 +18,6 @@
 from distutils.archive_util import *
 
 
-# Need to define 'abspath()', because it was new with Python 1.5.2
-if hasattr (os.path, 'abspath'):
-    abspath = os.path.abspath
-else:
-    def abspath(path):
-        if not os.path.isabs(path):
-            path = os.path.join(os.getcwd(), path)
-        return os.path.normpath(path)
-
-
 # More backwards compatibility hacks
 def extend (list, new_list):
     """Appends the list 'new_list' to 'list', just like the 'extend()'

From b4ff40df511d1477c3457931578bb2ab9630ab1b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:03:23 +0000
Subject: [PATCH 0525/8469] Patch from Rene Liebscher.  Some ugly changes, but
 supposedly this makes it so BCPPCompiler actually works, so I'm provisionally
 accepting it -- ugly and working is better than not working!  Major changes: 
  - normalize paths (apparently BC++ doesn't like slashes)   - overhauled how
 we search for and specify libraries on the linker     command-line   - hacked
 up 'find_library_file()' so it knows about "debug" library     naming
 convention as well as "bcpp_xxx.lib" -- the question is,     is this a
 well-established and sensible convention? Also:   - change to use
 'util.write_file()' to write the .def file

---
 bcppcompiler.py | 99 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 70 insertions(+), 29 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 6c9ac827c1..7daa597b75 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,17 +11,6 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
-# XXX Lyle reports that this doesn't quite work yet:
-# """...but this is what I've got so far. The compile step works fine but
-# when it runs the link step I get an "out of memory" failure.  Since
-# spawn() echoes the command it's trying to spawn, I can type the link line
-# verbatim at the DOS prompt and it links the Windows DLL correctly -- so
-# the syntax is correct. There's just some weird interaction going on when
-# it tries to "spawn" the link process from within the setup.py script. I'm
-# not really sure how to debug this one right off-hand; obviously there's
-# nothing wrong with the "spawn()" function since it's working properly for
-# the compile stage."""
-
 __revision__ = "$Id$"
 
 
@@ -31,6 +20,7 @@
      CompileError, LibError, LinkError
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
+from distutils.file_util import write_file
 
 
 class BCPPCompiler(CCompiler) :
@@ -123,14 +113,15 @@ def compile (self,
                 elif ext in self._cpp_extensions:
                     input_opt = "-P"
 
+                src = os.path.normpath(src)
+                obj = os.path.normpath(obj)
+                
                 output_opt = "-o" + obj
-
-                self.mkpath (os.path.dirname (obj))
+                self.mkpath(os.path.dirname(obj))
 
                 # Compiler command line syntax is: "bcc32 [options] file(s)".
                 # Note that the source file names must appear at the end of
                 # the command line.
-
                 try:
                     self.spawn ([self.cc] + compile_opts + pp_opts +
                                 [input_opt, output_opt] +
@@ -212,6 +203,9 @@ def link_shared_object (self,
                             extra_postargs=None,
                             build_temp=None):
 
+        # XXX this ignores 'build_temp'!  should follow the lead of
+        # msvccompiler.py
+
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
@@ -226,33 +220,63 @@ def link_shared_object (self,
         if self._need_link (objects, output_filename):
 
             if debug:
-                ldflags = self.ldflags_shared_debug
+                ld_args = self.ldflags_shared_debug[:]
             else:
-                ldflags = self.ldflags_shared
+                ld_args = self.ldflags_shared[:]
 
+            # Borland C++ has problems with '/' in paths
+            objects = map(os.path.normpath, objects)
             startup_obj = 'c0d32'
+            objects.insert(0, startup_obj)
 
-            libraries.append ('mypylib')
+            # either exchange python15.lib in the python libs directory against
+            # a Borland-like one, or create one with name bcpp_python15.lib 
+            # there and remove the pragmas from config.h  
+            #libraries.append ('mypylib')            
             libraries.append ('import32')
             libraries.append ('cw32mt')
 
             # Create a temporary exports file for use by the linker
             head, tail = os.path.split (output_filename)
             modname, ext = os.path.splitext (tail)
-            def_file = os.path.join (build_temp, '%s.def' % modname)
-            f = open (def_file, 'w')
-            f.write ('EXPORTS\n')
+            temp_dir = os.path.dirname(objects[0]) # preserve tree structure
+            def_file = os.path.join (temp_dir, '%s.def' % modname)
+            contents = ['EXPORTS']
             for sym in (export_symbols or []):
-                f.write ('  %s=_%s\n' % (sym, sym))
-
-            ld_args = ldflags + [startup_obj] + objects + \
-                [',%s,,' % output_filename] + \
-                libraries + [',' + def_file]
+                contents.append('  %s=_%s' % (sym, sym))
+            self.execute(write_file, (def_file, contents),
+                         "writing %s" % def_file)
+
+            # Start building command line flags and options.
+
+            for l in library_dirs:
+                ld_args.append("/L%s" % os.path.normpath(l)) 
+                
+            ld_args.extend(objects)     # list of object files
+
+            # name of dll file
+            ld_args.extend([',',output_filename])
+            # no map file and start libraries 
+            ld_args.extend([',', ','])
+
+            for lib in libraries:
+                # see if we find it and if there is a bcpp specific lib 
+                # (bcpp_xxx.lib)
+                libfile = self.find_library_file(library_dirs, lib, debug)
+                if libfile is None:
+                    ld_args.append(lib)
+                    # probably a BCPP internal library -- don't warn
+                    #    self.warn('library %s not found.' % lib)
+                else:
+                    # full name which prefers bcpp_xxx.lib over xxx.lib
+                    ld_args.append(libfile)
+            # def file for export symbols
+            ld_args.extend([',',def_file])
             
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
-                ld_args.extend (extra_postargs)
+                ld_args.extend(extra_postargs)
 
             self.mkpath (os.path.dirname (output_filename))
             try:
@@ -325,15 +349,32 @@ def library_dir_option (self, dir):
 
     def runtime_library_dir_option (self, dir):
         raise DistutilsPlatformError, \
-              "don't know how to set runtime library search path for MSVC++"
+              ("don't know how to set runtime library search path "
+               "for Borland C++")
 
     def library_option (self, lib):
         return self.library_filename (lib)
 
 
-    def find_library_file (self, dirs, lib):
-
+    def find_library_file (self, dirs, lib, debug=0):
+        # find library file
+        # bcpp_xxx.lib is better than xxx.lib
+        # and xxx_d.lib is better than xxx.lib if debug is set
         for dir in dirs:
+            if debug:
+                libfile = os.path.join (
+                    dir, self.library_filename ("bcpp_" + lib + "_d"))
+                if os.path.exists (libfile):
+                    return libfile
+            libfile = os.path.join (
+                dir, self.library_filename ("bcpp_" + lib))
+            if os.path.exists (libfile):
+                return libfile
+            if debug:
+                libfile = os.path.join (
+                    dir, self.library_filename(lib + '_d'))
+                if os.path.exists (libfile):
+                    return libfile
             libfile = os.path.join (dir, self.library_filename (lib))
             if os.path.exists (libfile):
                 return libfile

From 6904a1cecea7706215802d00436350ed15771192 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:08:02 +0000
Subject: [PATCH 0526/8469] Rene Liebscher: factor 'find_executable()' out of
 '_spawn_nt()'.

---
 spawn.py | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/spawn.py b/spawn.py
index 86ea3dfb50..651124d682 100644
--- a/spawn.py
+++ b/spawn.py
@@ -1,7 +1,9 @@
 """distutils.spawn
 
 Provides the 'spawn()' function, a front-end to various platform-
-specific functions for launching another program in a sub-process."""
+specific functions for launching another program in a sub-process.
+Also provides the 'find_executable()' to search the path for a given
+executable name. """
 
 # created 1999/07/24, Greg Ward
 
@@ -65,17 +67,8 @@ def _spawn_nt (cmd,
     executable = cmd[0]
     cmd = _nt_quote_args (cmd)
     if search_path:
-        paths = string.split( os.environ['PATH'], os.pathsep)
-        base,ext = os.path.splitext(executable)
-        if (ext != '.exe'):
-            executable = executable + '.exe'
-        if not os.path.isfile(executable):
-            paths.reverse()         # go over the paths and keep the last one
-            for p in paths:
-                f = os.path.join( p, executable )
-                if os.path.isfile ( f ):
-                    # the file exists, we have a shot at spawn working
-                    executable = f
+        # either we find one or it stays the same
+        executable = find_executable(executable) or executable 
     if verbose:
         print string.join ([executable] + cmd[1:], ' ')
     if not dry_run:
@@ -91,7 +84,6 @@ def _spawn_nt (cmd,
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
-    
                 
 def _spawn_posix (cmd,
                   search_path=1,
@@ -147,3 +139,28 @@ def _spawn_posix (cmd,
                       "unknown error executing '%s': termination status %d" % \
                       (cmd[0], status)
 # _spawn_posix ()
+
+
+def find_executable(executable, path=None):
+    """Try to find 'executable' in the directories listed in 'path' (a
+    string listing directories separated by 'os.pathsep'; defaults to
+    os.environ['PATH']).  Returns the complete filename or None if not
+    found.
+    """
+    if path is None:
+        path = os.environ['PATH']
+    paths = string.split(path, os.pathsep)
+    (base, ext) = os.path.splitext(executable)
+    if (sys.platform == 'win32') and (ext != '.exe'):
+        executable = executable + '.exe'
+    if not os.path.isfile(executable):
+        for p in paths:
+            f = os.path.join(p, executable)
+            if os.path.isfile(f):
+                # the file exists, we have a shot at spawn working
+                return f
+        return None
+    else:
+        return executable
+
+# find_executable()    

From 8be2f9c465909ad6d71cc1bb116df7f87fa25422 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:09:11 +0000
Subject: [PATCH 0527/8469] Rene Liebscher: deleted unneeded hard-coded
 assignments of CC, RANLIB, etc. in '_init_nt()' (they were kludges for
 CygwinCCompiler and no longer needed).

---
 sysconfig.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index b2aa3f2d1e..f6d941ac13 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -267,24 +267,8 @@ def _init_nt():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.pyd'
-    g['exec_prefix'] = EXEC_PREFIX
-
-    # These are needed for the CygwinCCompiler and Mingw32CCompiler
-    # classes, which are just UnixCCompiler classes that happen to work on
-    # Windows.  UnixCCompiler expects to find these values in sysconfig, so
-    # here they are.  The fact that other Windows compilers don't need
-    # these values is pure luck (hmmm).
-
-    # XXX I think these are now unnecessary...
-
-    g['CC'] = "cc"                      # not gcc?
-    g['RANLIB'] = "ranlib"
-    g['AR'] = "ar"
-    g['OPT'] = "-O2"
-    g['SO'] = ".pyd"
-    g['LDSHARED'] = "ld"
-    g['CCSHARED'] = ""
     g['EXE'] = ".exe"
+    g['exec_prefix'] = EXEC_PREFIX
 
 
 def _init_mac():

From cc5431ba2d4c6e6fb0ab740721ea8734ca9dc3b8 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:31:56 +0000
Subject: [PATCH 0528/8469] Latest version from Rene Liebscher; major changes: 
  - added big comment describing possible problems   - look for and react to
 versions of gcc, ld, and dlltool; mainly     this is done by the
 'get_versions()' function and the CygwinCCompiler     and Mingw32CCompiler
 constructors   - move 'check_config_h()' to end of file and defer calling it
 until     we need to (ie. in the CygwinCCompiler constructor)   - lots of
 changes in 'link_shared_object()' -- mostly seems to be     library and DLL
 stuff, but I don't follow it entirely

---
 cygwinccompiler.py | 337 +++++++++++++++++++++++++++++++--------------
 1 file changed, 230 insertions(+), 107 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 650627f5cf..3f9a5bd585 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -6,53 +6,54 @@
 cygwin in no-cygwin mode).
 """
 
+# problems:
+#
+# * if you use a msvc compiled python version (1.5.2)
+#   1. you have to insert a __GNUC__ section in its config.h
+#   2. you have to generate a import library for its dll
+#      - create a def-file for python??.dll
+#      - create a import library using
+#             dlltool --dllname python15.dll --def python15.def \
+#                       --output-lib libpython15.a
+#
+#   see also http://starship.python.net/crew/kernr/mingw32/Notes.html
+#
+# * We use put export_symbols in a def-file, and don't use 
+#   --export-all-symbols because it doesn't worked reliable in some
+#   tested configurations. And because other windows compilers also
+#   need their symbols specified this no serious problem.
+#
+# tested configurations:
+#   
+# * cygwin gcc 2.91.57/ld 2.9.4/dllwrap 0.2.4 works 
+#   (after patching python's config.h and for C++ some other include files)
+#   see also http://starship.python.net/crew/kernr/mingw32/Notes.html
+# * mingw32 gcc 2.95.2/ld 2.9.4/dllwrap 0.2.4 works 
+#   (ld doesn't support -shared, so we use dllwrap)   
+# * cygwin gcc 2.95.2/ld 2.10.90/dllwrap 2.10.90 works now
+#   - its dllwrap doesn't work, there is a bug in binutils 2.10.90
+#     see also .....
+#   - using gcc -mdll instead dllwrap doesn't work without -static because 
+#     it tries to link against dlls instead their import libraries. (If
+#     it finds the dll first.)
+#     By specifying -static we force ld to link against the import libraries, 
+#     this is windows standard and there are normally not the necessary symbols 
+#     in the dlls.
+
 # created 2000/05/05, Rene Liebscher
 
 __revision__ = "$Id$"
 
-import os,sys,string
-from distutils import sysconfig
+import os,sys
 from distutils.unixccompiler import UnixCCompiler
-
-# Because these compilers aren't configured in Python's config.h file by
-# default we should at least warn the user if he is using a unmodified
-# version.
-
-def check_config_h():
-    """Checks if the GCC compiler is mentioned in config.h.  If it is not,
-    compiling probably doesn't work, so print a warning to stderr.
-    """
-
-    # XXX the result of the check should be returned!
-
-    from distutils import sysconfig
-    import string,sys
-    try:
-        # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough 
-        f=open(sysconfig.get_config_h_filename())
-        s=f.read()
-        f.close()
-        try:
-            # is somewhere a #ifdef __GNUC__ or something similar
-            string.index(s,"__GNUC__") 
-        except ValueError:
-            sys.stderr.write ("warning: "+
-                "Python's config.h doesn't seem to support your compiler.\n")
-    except IOError:
-        # if we can't read this file, we cannot say it is wrong
-        # the compiler will complain later about this file as missing
-        pass
-
-
-# This is called when the module is imported, so we make this check only once
-# XXX why not make it only when the compiler is needed?
-check_config_h()
-
+from distutils.file_util import write_file
 
 class CygwinCCompiler (UnixCCompiler):
 
     compiler_type = 'cygwin'
+    gcc_version = None
+    dllwrap_version = None
+    ld_version = None
    
     def __init__ (self,
                   verbose=0,
@@ -61,22 +62,45 @@ def __init__ (self,
 
         UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
+        if check_config_h()<=0:
+            self.warn(
+                "Python's config.h doesn't seem to support your compiler. "
+                "Compiling may fail because of undefined preprocessor macros.")
+        
+        (self.gcc_version, self.ld_version, self.dllwrap_version) = \
+            get_versions()
+        sys.stderr.write(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
+                         (self.gcc_version, 
+                          self.ld_version, 
+                          self.dllwrap_version) )
+
+        # ld_version >= "2.10.90" should also be able to use 
+        # gcc -mdll instead of dllwrap
+        # Older dllwraps had own version numbers, newer ones use the 
+        # same as the rest of binutils ( also ld )
+        # dllwrap 2.10.90 is buggy
+        if self.ld_version >= "2.10.90": 
+            self.linker = "gcc"
+        else:
+            self.linker = "dllwrap"
+
         # Hard-code GCC because that's what this is all about.
         # XXX optimization, warnings etc. should be customizable.
-        self.set_executables(compiler='gcc -O -Wall',
-                             compiler_so='gcc -O -Wall',
-                             linker_exe='gcc',
-                             linker_so='dllwrap --target=i386-cygwin32')
+        self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                             compiler_so='gcc -mcygwin -mdll -O -Wall',
+                             linker_exe='gcc -mcygwin',
+                             linker_so=('%s -mcygwin -mdll -static' %
+                                        self.linker))
 
         # cygwin and mingw32 need different sets of libraries 
-        self.dll_libraries=[
-               # cygwin shouldn't need msvcrt, 
-               # but without the dll's will crash
-               # ( gcc version 2.91.57 )
-               # perhaps something about initialization
-               # mingw32 needs it in all cases
-                            "msvcrt"
-                            ]
+        if self.gcc_version == "2.91.57":
+            # cygwin shouldn't need msvcrt, but without the dlls will crash
+            # (gcc version 2.91.57) -- perhaps something about initialization
+            self.dll_libraries=["msvcrt"]
+            self.warn( 
+                "Consider upgrading to a newer version of gcc")
+        else:
+            self.dll_libraries=[]
         
     # __init__ ()
 
@@ -93,64 +117,67 @@ def link_shared_object (self,
                             extra_postargs=None,
                             build_temp=None):
         
-        if libraries == None:
-            libraries = []
+        # use separate copies, so can modify the lists
+        extra_preargs = list(extra_preargs or [])
+        libraries = list(libraries or [])
         
-        # Additional libraries: the python library is always needed on
-        # Windows we need the python version without the dot, eg. '15'
-
-        pythonlib = ("python%d%d" %
-                     (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-        libraries.append(pythonlib)
+        # Additional libraries
         libraries.extend(self.dll_libraries)
+        
+        # we want to put some files in the same directory as the 
+        # object files are, build_temp doesn't help much
 
-        # name of extension
+        # where are the object files
+        temp_dir = os.path.dirname(objects[0])
 
-        # XXX WRONG WRONG WRONG
-        # this is NOT the place to make guesses about Python namespaces;
-        # that MUST be done in build_ext.py
+        # name of dll to give the helper files (def, lib, exp) the same name
+        (dll_name, dll_extension) = os.path.splitext(
+            os.path.basename(output_filename))
 
-        if not debug:
-            ext_name = os.path.basename(output_filename)[:-len(".pyd")]
-        else:
-            ext_name = os.path.basename(output_filename)[:-len("_d.pyd")]
+        # generate the filenames for these files
+        def_file = None # this will be done later, if necessary
+        exp_file = os.path.join(temp_dir, dll_name + ".exp")
+        lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
 
-        def_file = os.path.join(build_temp, ext_name + ".def")
-        #exp_file = os.path.join(build_temp, ext_name + ".exp")
-        #lib_file = os.path.join(build_temp, 'lib' + ext_name + ".a")
-        
-        # Make .def file
-        # (It would probably better to check if we really need this, 
-        # but for this we had to insert some unchanged parts of 
-        # UnixCCompiler, and this is not what we want.) 
-        f = open(def_file,"w")
-        f.write("EXPORTS\n") # intro
-        if export_symbols == None: 
-            # export a function "init" + ext_name
-            f.write("init" + ext_name + "\n")    
+        #extra_preargs.append("--verbose")
+        if self.linker == "dllwrap":
+            extra_preargs.extend([#"--output-exp",exp_file,
+                                  "--output-lib",lib_file,
+                                 ])
         else:
-            # if there are more symbols to export write them into f
+            # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
+            extra_preargs.extend([#"-Wl,--out-implib,%s" % lib_file,
+                                 ])
+       
+        #  check what we got in export_symbols
+        if export_symbols is not None:
+            # Make .def file
+            # (It would probably better to check if we really need this, 
+            # but for this we had to insert some unchanged parts of 
+            # UnixCCompiler, and this is not what we want.) 
+            def_file = os.path.join(temp_dir, dll_name + ".def")
+            contents = [
+                "LIBRARY %s" % os.path.basename(output_filename),
+                "EXPORTS"]
             for sym in export_symbols:
-                f.write(sym+"\n")                    
-        f.close()
-        
-        if extra_preargs == None:
-                extra_preargs = []
-        
-        extra_preargs = extra_preargs + [
-                        #"--verbose",
-                        #"--output-exp",exp_file,
-                        #"--output-lib",lib_file,
-                        "--def",def_file
-                        ]
-        
+                contents.append(sym)
+            self.execute(write_file, (def_file, contents),
+                         "writing %s" % def_file)
+
+        if def_file:
+            if self.linker == "dllwrap":
+                # for dllwrap we have to use a special option
+                extra_preargs.append("--def")
+            # for gcc/ld it is specified as any other object file    
+            extra_preargs.append(def_file)
+                                                 
         # who wants symbols and a many times larger output file
         # should explicitly switch the debug mode on 
-        # otherwise we let dllwrap strip the output file
+        # otherwise we let dllwrap/ld strip the output file
         # (On my machine unstripped_file = stripped_file + 254KB
         #   10KB < stripped_file < ??100KB ) 
         if not debug: 
-            extra_preargs = extra_preargs + ["-s"] 
+            extra_preargs.append("-s") 
         
         UnixCCompiler.link_shared_object(self,
                             objects,
@@ -159,7 +186,7 @@ def link_shared_object (self,
                             libraries,
                             library_dirs,
                             runtime_library_dirs,
-                            None, # export_symbols, we do this with our def-file
+                            None, # export_symbols, we do this in our def-file
                             debug,
                             extra_preargs,
                             extra_postargs,
@@ -181,19 +208,115 @@ def __init__ (self,
                   force=0):
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
+        
+        # A real mingw32 doesn't need to specify a different entry point,
+        # but cygwin 2.91.57 in no-cygwin-mode needs it.
+        if self.gcc_version <= "2.91.57":
+            entry_point = '--entry _DllMain@12'
+        else:
+            entry_point = ''
 
         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
-                             compiler_so='gcc -mno-cygwin -O -Wall',
+                             compiler_so='gcc -mno-cygwin -mdll -O -Wall',
                              linker_exe='gcc -mno-cygwin',
-                             linker_so='dllwrap' 
-                                    + ' --target=i386-mingw32'
-                                    + ' --entry _DllMain@12')
-        # mingw32 doesn't really need 'target' and cygwin too (it seems, 
-        # it is enough to specify a different entry point)                
-
-        # no additional libraries need 
-        # (only msvcrt, which is already added by CygwinCCompiler)
-
+                             linker_so='%s -mno-cygwin -mdll -static %s' 
+                                        % (self.linker, entry_point))
+        # Maybe we should also append -mthreads, but then the finished
+        # dlls need another dll (mingwm10.dll see Mingw32 docs)
+        # (-mthreads: Support thread-safe exception handling on `Mingw32')       
+        
+        # no additional libraries needed 
+        self.dll_libraries=[]
+        
     # __init__ ()
-                
+
 # class Mingw32CCompiler
+
+# Because these compilers aren't configured in Python's config.h file by
+# default, we should at least warn the user if he is using a unmodified
+# version.
+
+def check_config_h():
+    """Checks if the GCC compiler is mentioned in config.h.  If it is not,
+       compiling probably doesn't work.
+    """
+    # return values
+    #  2: OK, python was compiled with GCC
+    #  1: OK, python's config.h mentions __GCC__
+    #  0: uncertain, because we couldn't check it
+    # -1: probably not OK, because we didn't found it in config.h
+    # You could check check_config_h()>0 => OK
+
+    from distutils import sysconfig
+    import string,sys
+    # if sys.version contains GCC then python was compiled with
+    # GCC, and the config.h file should be OK
+    if -1 == string.find(sys.version,"GCC"):
+        pass # go to the next test
+    else:
+        return 2
+    
+    try:
+        # It would probably better to read single lines to search.
+        # But we do this only once, and it is fast enough 
+        f=open(sysconfig.get_config_h_filename())
+        s=f.read()
+        f.close()
+        
+        # is somewhere a #ifdef __GNUC__ or something similar
+        if -1 == string.find(s,"__GNUC__"):
+            return -1  
+        else:
+            return 1
+    except IOError:
+        # if we can't read this file, we cannot say it is wrong
+        # the compiler will complain later about this file as missing
+        pass
+    return 0
+
+def get_versions():
+    """ Try to find out the versions of gcc, ld and dllwrap.
+        If not possible it returns None for it.
+    """
+    from distutils.version import StrictVersion
+    from distutils.spawn import find_executable
+    import re
+        
+    gcc_exe = find_executable('gcc')
+    if gcc_exe:
+        out = os.popen(gcc_exe + ' -dumpversion','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        if result:
+            gcc_version = StrictVersion(result.group(1))
+        else:
+            gcc_version = None
+    else:
+        gcc_version = None
+    ld_exe = find_executable('ld')
+    if ld_exe:
+        out = os.popen(ld_exe + ' -v','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        if result:
+            ld_version = StrictVersion(result.group(1))
+        else:
+            ld_version = None
+    else:
+        ld_version = None
+    dllwrap_exe = find_executable('dllwrap')
+    if dllwrap_exe:
+        out = os.popen(dllwrap_exe + ' --version','r')
+        out_string = out.read()
+        out.close()
+        result = re.search(' (\d+\.\d+\.\d+)',out_string)
+        if result:
+            dllwrap_version = StrictVersion(result.group(1))
+        else:
+            dllwrap_version = None
+    else:
+        dllwrap_version = None
+    return (gcc_version, ld_version, dllwrap_version)
+

From 8370736a2f17bc52b2aae9f0497cbf39a4851987 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:34:18 +0000
Subject: [PATCH 0529/8469] Rene Liebscher: fix 'skipping byte-compilation'
 message for grammatical consistency.

---
 command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index d866d8cc82..1c15db1494 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -74,7 +74,7 @@ def run (self):
                     out_fn = f + (__debug__ and "c" or "o")
                     compile_msg = "byte-compiling %s to %s" % \
                                   (f, os.path.basename (out_fn))
-                    skip_msg = "byte-compilation of %s skipped" % f
+                    skip_msg = "skipping byte-compilation of %s" % f
                     self.make_file (f, out_fn, compile, (f,),
                                     compile_msg, skip_msg)
     # run ()

From 9624e74733a8888f50d4cc7bef25e7e3c78de50e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:37:30 +0000
Subject: [PATCH 0530/8469] Added the 'execute()' function (moved here from
 cmd.py with minor tweakage).

---
 util.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/util.py b/util.py
index d69626e1f1..37cd4b554e 100644
--- a/util.py
+++ b/util.py
@@ -223,3 +223,29 @@ def split_quoted (s):
     return words
 
 # split_quoted ()
+
+
+def execute (func, args, msg=None, verbose=0, dry_run=0):
+    """Perform some action that affects the outside world (eg.  by writing
+    to the filesystem).  Such actions are special because they are disabled
+    by the 'dry_run' flag, and announce themselves if 'verbose' is true.
+    This method takes care of all that bureaucracy for you; all you have to
+    do is supply the function to call and an argument tuple for it (to
+    embody the "external action" being performed), and an optional message
+    to print.
+    """
+    # Generate a message if we weren't passed one
+    if msg is None:
+        msg = "%s%s" % (func.__name__, `args`)
+        if msg[-2:] == ',)':        # correct for singleton tuple 
+            msg = msg[0:-2] + ')'
+
+    # Print it if verbosity level is high enough
+    if verbose:
+        print msg
+
+    # And do it, as long as we're not in dry-run mode
+    if not dry_run:
+        apply(func, args)
+
+# execute()

From 20b387f6de0ca9835df40e2b4728a0bd9e629521 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:37:53 +0000
Subject: [PATCH 0531/8469] Replaced 'execute()' method with a thin wrapper
 around 'util.execute()'.

---
 cmd.py | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/cmd.py b/cmd.py
index 8beb5d443e..c905edecb4 100644
--- a/cmd.py
+++ b/cmd.py
@@ -318,31 +318,7 @@ def warn (self, msg):
 
 
     def execute (self, func, args, msg=None, level=1):
-        """Perform some action that affects the outside world (eg.  by
-        writing to the filesystem).  Such actions are special because they
-        should be disabled by the "dry run" flag, and should announce
-        themselves if the current verbosity level is high enough.  This
-        method takes care of all that bureaucracy for you; all you have to
-        do is supply the function to call and an argument tuple for it (to
-        embody the "external action" being performed), a message to print
-        if the verbosity level is high enough, and an optional verbosity
-        threshold.
-        """
-
-        # Generate a message if we weren't passed one
-        if msg is None:
-            msg = "%s %s" % (func.__name__, `args`)
-            if msg[-2:] == ',)':        # correct for singleton tuple 
-                msg = msg[0:-2] + ')'
-
-        # Print it if verbosity level is high enough
-        self.announce (msg, level)
-
-        # And do it, as long as we're not in dry-run mode
-        if not self.dry_run:
-            apply (func, args)
-
-    # execute()
+        util.execute(func, args, msg, self.verbose >= level, self.dry_run)
 
 
     def mkpath (self, name, mode=0777):

From edbbc73e92e3889f5f3ea0ac9f5a2e9445c5751d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:38:20 +0000
Subject: [PATCH 0532/8469] Added 'execute()' method, a thin wrapper around
 'util.execute() (just like the one in cmd.py).

---
 ccompiler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index eb6200f638..d8d8ab916c 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,7 +15,7 @@
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
-from distutils.util import split_quoted
+from distutils.util import split_quoted, execute
 
 
 class CCompiler:
@@ -784,6 +784,9 @@ def announce (self, msg, level=1):
     def warn (self, msg):
         sys.stderr.write ("warning: %s\n" % msg)
 
+    def execute (self, func, args, msg=None, level=1):
+        execute(func, args, msg, self.verbose >= level, self.dry_run)
+
     def spawn (self, cmd):
         spawn (cmd, verbose=self.verbose, dry_run=self.dry_run)
 

From bb7acec3a19a3e0488ef95e2d5e41c0df0ed446b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:44:44 +0000
Subject: [PATCH 0533/8469] Added 'wininst' to the 'format_commands' list, so
 it's included in the --help-formats output.  Also moved that list up so it's
 more obvious when adding formats.

---
 command/bdist.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 100563a9d1..1c862d585d 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -52,17 +52,20 @@ class bdist (Command):
     default_format = { 'posix': 'gztar',
                        'nt': 'zip', }
 
+    # Establish the preferred order (for the --help-formats option).
+    format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
+                       'wininst', 'zip']
+
+    # And the real information.
     format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
                        'gztar': ('bdist_dumb', "gzip'ed tar file"),
                        'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                        'ztar':  ('bdist_dumb', "compressed tar file"),
                        'tar':   ('bdist_dumb', "tar file"),
-                       'zip':   ('bdist_dumb', "ZIP file"),
                        'wininst': ('bdist_wininst',
                                    "Windows executable installer"),
+                       'zip':   ('bdist_dumb', "ZIP file"),
                      }
-    # establish the preferred order
-    format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar', 'zip']
 
 
     def initialize_options (self):

From a509be9cada73fce73f71a7cf74a175eac6d530a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 2 Aug 2000 01:49:40 +0000
Subject: [PATCH 0534/8469] Typo fix.

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index f6d941ac13..2246327781 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -77,7 +77,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             return prefix
 
     elif os.name == "mac":
-        if platform_specific:
+        if plat_specific:
             if standard_lib:
                 return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
             else:

From e989444d5f0c7def7be57bbfa1d1529298fa1b07 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 4 Aug 2000 01:28:39 +0000
Subject: [PATCH 0535/8469] Added 'debug' flag to 'find_library_file()'.

---
 ccompiler.py     | 8 +++++---
 unixccompiler.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index d8d8ab916c..141af796a0 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -682,10 +682,12 @@ def library_option (self, lib):
         """
         raise NotImplementedError
 
-    def find_library_file (self, dirs, lib):
+    def find_library_file (self, dirs, lib, debug=0):
         """Search the specified list of directories for a static or shared
-        library file 'lib' and return the full path to that file. Return
-        None if it wasn't found in any of the specified directories.
+        library file 'lib' and return the full path to that file.  If
+        'debug' true, look for a debugging version (if that makes sense on
+        the current platform).  Return None if 'lib' wasn't found in any of
+        the specified directories.
         """
         raise NotImplementedError
 
diff --git a/unixccompiler.py b/unixccompiler.py
index 799560c396..9339850102 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -317,7 +317,7 @@ def library_option (self, lib):
         return "-l" + lib
 
 
-    def find_library_file (self, dirs, lib):
+    def find_library_file (self, dirs, lib, debug=0):
 
         for dir in dirs:
             shared = os.path.join (

From be27b1c8bcaa43999f0008d56c4f5c502495e346 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 4 Aug 2000 01:29:27 +0000
Subject: [PATCH 0536/8469] Added 'debug' flag to 'find_library_file()', and
 changed code to handle it.

---
 msvccompiler.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index a1dedb0e53..eecbb620ed 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -474,13 +474,18 @@ def library_option (self, lib):
         return self.library_filename (lib)
 
 
-    def find_library_file (self, dirs, lib):
-
+    def find_library_file (self, dirs, lib, debug=0):
+        # Prefer a debugging library if found (and requested), but deal
+        # with it if we don't have one.
+        if debug:
+            try_names = [lib + "_d", lib]
+        else:
+            try_names = [lib]
         for dir in dirs:
-            libfile = os.path.join (dir, self.library_filename (lib))
-            if os.path.exists (libfile):
-                return libfile
-
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename (name))
+                if os.path.exists(libfile):
+                    return libfile
         else:
             # Oops, didn't find it in *any* of 'dirs'
             return None

From 8e0f15f62975ef32643724e05c08eebf8376db4b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 4 Aug 2000 01:30:03 +0000
Subject: [PATCH 0537/8469] Rewrote 'find_library_file()' much more cleanly
 (and consistently with MSVCCompiler's version, to aid in factoring common
 code out of the two classes when the time comes).

---
 bcppcompiler.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 7daa597b75..1d897de61a 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -357,28 +357,26 @@ def library_option (self, lib):
 
 
     def find_library_file (self, dirs, lib, debug=0):
-        # find library file
+        # List of effective library names to try, in order of preference:
         # bcpp_xxx.lib is better than xxx.lib
         # and xxx_d.lib is better than xxx.lib if debug is set
+        #
+        # The "bcpp_" prefix is to handle a Python installation for people
+        # with multiple compilers (primarily Distutils hackers, I suspect
+        # ;-).  The idea is they'd have one static library for each
+        # compiler they care about, since (almost?) every Windows compiler
+        # seems to have a different format for static libraries.
+        if debug:
+            dlib = (lib + "_d")
+            try_names = ("bcpp_" + dlib, "bcpp_" + lib, dlib, lib)
+        else:
+            try_names = ("bcpp_" + lib, lib)
+
         for dir in dirs:
-            if debug:
-                libfile = os.path.join (
-                    dir, self.library_filename ("bcpp_" + lib + "_d"))
-                if os.path.exists (libfile):
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename(name))
+                if os.path.exists(libfile):
                     return libfile
-            libfile = os.path.join (
-                dir, self.library_filename ("bcpp_" + lib))
-            if os.path.exists (libfile):
-                return libfile
-            if debug:
-                libfile = os.path.join (
-                    dir, self.library_filename(lib + '_d'))
-                if os.path.exists (libfile):
-                    return libfile
-            libfile = os.path.join (dir, self.library_filename (lib))
-            if os.path.exists (libfile):
-                return libfile
-
         else:
             # Oops, didn't find it in *any* of 'dirs'
             return None

From 7555345e8cd473cae9a0b4ee91fb265885bb35c5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 4 Aug 2000 01:31:13 +0000
Subject: [PATCH 0538/8469] Added 'debug_print()'.

---
 ccompiler.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index 141af796a0..ce3f2be69d 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -783,6 +783,11 @@ def announce (self, msg, level=1):
         if self.verbose >= level:
             print msg
 
+    def debug_print (self, msg):
+        from distutils.core import DEBUG
+        if DEBUG:
+            print msg
+
     def warn (self, msg):
         sys.stderr.write ("warning: %s\n" % msg)
 

From 242c59cb2be299e3229b9bcde18dd47eff67fd4d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Aug 2000 01:25:24 +0000
Subject: [PATCH 0539/8469] Drop the 'extend()' function -- old 1.5.1
 compatibility hack that   wasn't actually used anywhere. Drop the "from
 xxx_util import*" backwards compability hacks.

---
 util.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/util.py b/util.py
index 37cd4b554e..96266d266e 100644
--- a/util.py
+++ b/util.py
@@ -11,26 +11,6 @@
 from distutils.errors import *
 from distutils.spawn import spawn
 
-# for backwards compatibility:
-from distutils.file_util import *
-from distutils.dir_util import *
-from distutils.dep_util import *
-from distutils.archive_util import *
-
-
-# More backwards compatibility hacks
-def extend (list, new_list):
-    """Appends the list 'new_list' to 'list', just like the 'extend()'
-       list method does in Python 1.5.2 -- but this works on earlier
-       versions of Python too."""
-
-    if hasattr (list, 'extend'):
-        list.extend (new_list)
-    else:
-        list[len(list):] = new_list
-
-# extend ()
-
 
 def get_platform ():
     """Return a string (suitable for tacking onto directory names) that

From 177d3705cc1ffcd1b068776baea88dd5f44259cb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 5 Aug 2000 01:31:54 +0000
Subject: [PATCH 0540/8469] Fixed imports from '*util' modules to not just
 import everything from util.

---
 command/bdist_dumb.py    |  3 ++-
 command/bdist_rpm.py     |  3 ++-
 command/bdist_wininst.py |  3 ++-
 command/clean.py         |  2 +-
 command/install.py       |  3 ++-
 command/install_lib.py   |  2 +-
 command/sdist.py         | 18 ++++++++----------
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 805aa0a9eb..e93c6b7272 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -10,7 +10,8 @@
 
 import os
 from distutils.core import Command
-from distutils.util import get_platform, create_tree, remove_tree
+from distutils.util import get_platform
+from distutils.dir_util import create_tree, remove_tree
 from distutils.errors import *
 
 class bdist_dumb (Command):
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 3302eea24b..e45d7a368b 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -10,7 +10,8 @@
 import os, string
 from types import *
 from distutils.core import Command, DEBUG
-from distutils.util import get_platform, write_file
+from distutils.util import get_platform
+from distutils.file_util import write_file
 from distutils.errors import *
 
 class bdist_rpm (Command):
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0c53bf9e6b..38e973b66d 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -9,7 +9,8 @@
 
 import sys, os, string
 from distutils.core import Command
-from distutils.util import get_platform, create_tree, remove_tree
+from distutils.util import get_platform
+from distutils.dir_util import create_tree, remove_tree
 from distutils.errors import *
 
 class bdist_wininst (Command):
diff --git a/command/clean.py b/command/clean.py
index 31147b58ef..1d8c7b2200 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -8,7 +8,7 @@
 
 import os
 from distutils.core import Command
-from distutils.util import remove_tree
+from distutils.dir_util import remove_tree
 
 class clean (Command):
 
diff --git a/command/install.py b/command/install.py
index 1be49046ec..6385fdc224 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,7 +10,8 @@
 from types import *
 from distutils.core import Command, DEBUG
 from distutils import sysconfig
-from distutils.util import write_file, convert_path, subst_vars, change_root
+from distutils.file_util import write_file
+from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
 from glob import glob
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 1c15db1494..879a7d00e2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -4,7 +4,7 @@
 
 import sys, os, string
 from distutils.core import Command
-from distutils.util import copy_tree
+from distutils.dir_util import copy_tree
 
 class install_lib (Command):
 
diff --git a/command/sdist.py b/command/sdist.py
index 4765d7fa13..b2d7a86f1f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -10,9 +10,7 @@
 from types import *
 from glob import glob
 from distutils.core import Command
-from distutils.util import \
-     create_tree, remove_tree, newer, write_file, \
-     check_archive_formats
+from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
 from distutils.errors import *
 from distutils.filelist import FileList
@@ -117,7 +115,7 @@ def finalize_options (self):
                       "don't know how to create source distributions " + \
                       "on platform %s" % os.name
 
-        bad_format = check_archive_formats (self.formats)
+        bad_format = archive_util.check_archive_formats (self.formats)
         if bad_format:
             raise DistutilsOptionError, \
                   "unknown archive format '%s'" % bad_format
@@ -195,7 +193,7 @@ def get_file_list (self):
         # manifest; if so, we'll regenerate the manifest.
         template_exists = os.path.isfile(self.template)
         if template_exists:
-            template_newer = newer(self.template, self.manifest)
+            template_newer = dep_util.newer(self.template, self.manifest)
 
         # The contents of the manifest file almost certainly depend on the
         # setup script as well as the manifest template -- so if the setup
@@ -204,7 +202,7 @@ def get_file_list (self):
         # manifest, but there's no template -- which will happen if the
         # developer elects to generate a manifest some other way -- then we
         # can't regenerate the manifest, so we don't.)
-        setup_newer = newer(sys.argv[0], self.manifest)
+        setup_newer = dep_util.newer(sys.argv[0], self.manifest)
 
         # cases:
         #   1) no manifest, template exists: generate manifest
@@ -368,7 +366,7 @@ def write_manifest (self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        self.execute(write_file,
+        self.execute(file_util.write_file,
                      (self.manifest, self.filelist.files),
                      "writing manifest file '%s'" % self.manifest)
 
@@ -404,8 +402,8 @@ def make_release_tree (self, base_dir, files):
         """
         # Create all the directories under 'base_dir' necessary to
         # put 'files' there.
-        create_tree (base_dir, files,
-                     verbose=self.verbose, dry_run=self.dry_run)
+        dir_util.create_tree (base_dir, files,
+                              verbose=self.verbose, dry_run=self.dry_run)
 
         # And walk over the list of files, either making a hard link (if
         # os.link exists) to each one that doesn't already exist in its
@@ -453,7 +451,7 @@ def make_distribution (self):
         self.archive_files = archive_files
 
         if not self.keep_tree:
-            remove_tree (base_dir, self.verbose, self.dry_run)
+            dir_util.remove_tree (base_dir, self.verbose, self.dry_run)
 
     def get_archive_files (self):
         """Return the list of archive files created when the command

From d6bdb1ca69a126e1c651d06d304c283ca304254a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 7 Aug 2000 00:45:51 +0000
Subject: [PATCH 0541/8469] Fix so we clear or reinitialize various data
 structures before populating (allows the same FancyGetopt object to be used
 multiple times with different option tables).

---
 fancy_getopt.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 6adfc819c2..a62bc0df75 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -93,6 +93,7 @@ def __init__ (self, option_table=None):
     
 
     def _build_index (self):
+        self.option_index.clear()
         for option in self.option_table:
             self.option_index[option[0]] = option
 
@@ -153,6 +154,10 @@ def _grok_option_table (self):
            the option table.  Called by 'getopt()' before it can do
            anything worthwhile."""
 
+        self.long_opts = []
+        self.short_opts = []
+        self.short2long.clear()
+
         for option in self.option_table:
             try:
                 (long, short, help) = option

From f777456bab4933786d6890e00ccd603912e382b1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 7 Aug 2000 00:48:04 +0000
Subject: [PATCH 0542/8469] Fix so the 'install_libbase' directory -- where
 .pth files are installed -- participates in the "--root" hack, ie. it also
 has a new root directory hacked on at the very last minute (essential if the
 .pth file is to be included in an RPM or other smart installer!).

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 6385fdc224..2a59e16b96 100644
--- a/command/install.py
+++ b/command/install.py
@@ -273,7 +273,7 @@ def finalize_options (self):
         # If a new root directory was supplied, make all the installation
         # dirs relative to it.
         if self.root is not None:
-            for name in ('lib', 'purelib', 'platlib',
+            for name in ('libbase', 'lib', 'purelib', 'platlib',
                          'scripts', 'data', 'headers'):
                 attr = "install_" + name
                 new_val = change_root (self.root, getattr (self, attr))

From 5dcbeda034a291131d3b1106ea80896749366a9e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 8 Aug 2000 14:38:13 +0000
Subject: [PATCH 0543/8469] Fix so 'split_quoted()' handles any whitespace
 delimiter (not just space).

---
 util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 96266d266e..2487f6dab6 100644
--- a/util.py
+++ b/util.py
@@ -139,7 +139,7 @@ def grok_environment_error (exc, prefix="error: "):
 
 
 # Needed by 'split_quoted()'
-_wordchars_re = re.compile(r'[^\\\'\"\ ]*')
+_wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
 _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
 _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
@@ -169,7 +169,7 @@ def split_quoted (s):
             words.append(s[:end])
             break
 
-        if s[end] == ' ':               # unescaped, unquoted space: now
+        if s[end] in string.whitespace: # unescaped, unquoted whitespace: now
             words.append(s[:end])       # we definitely have a word delimiter
             s = string.lstrip(s[end:])
             pos = 0

From bb6a4ba2745a9747b1a152f6d6a1dbf5cc20574f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:36:47 +0000
Subject: [PATCH 0544/8469] Fix references to functions formerly imported from
 'util'.

---
 cmd.py | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/cmd.py b/cmd.py
index c905edecb4..474f8f321b 100644
--- a/cmd.py
+++ b/cmd.py
@@ -12,7 +12,7 @@
 import sys, os, string, re
 from types import *
 from distutils.errors import *
-from distutils import util
+from distutils import util, dir_util, file_util, archive_util, dep_util
 
 
 class Command:
@@ -322,8 +322,8 @@ def execute (self, func, args, msg=None, level=1):
 
 
     def mkpath (self, name, mode=0777):
-        util.mkpath (name, mode,
-                     self.verbose, self.dry_run)
+        dir_util.mkpath(name, mode,
+                        self.verbose, self.dry_run)
 
 
     def copy_file (self, infile, outfile,
@@ -332,12 +332,13 @@ def copy_file (self, infile, outfile,
         former two default to whatever is in the Distribution object, and
         the latter defaults to false for commands that don't define it.)"""
 
-        return util.copy_file (infile, outfile,
-                               preserve_mode, preserve_times,
-                               not self.force,
-                               link,
-                               self.verbose >= level,
-                               self.dry_run)
+        return file_util.copy_file(
+            infile, outfile,
+            preserve_mode, preserve_times,
+            not self.force,
+            link,
+            self.verbose >= level,
+            self.dry_run)
 
 
     def copy_tree (self, infile, outfile,
@@ -346,18 +347,19 @@ def copy_tree (self, infile, outfile,
         """Copy an entire directory tree respecting verbose, dry-run,
         and force flags.
         """
-        return util.copy_tree (infile, outfile, 
-                               preserve_mode,preserve_times,preserve_symlinks,
-                               not self.force,
-                               self.verbose >= level,
-                               self.dry_run)
+        return dir_util.copy_tree(
+            infile, outfile, 
+            preserve_mode,preserve_times,preserve_symlinks,
+            not self.force,
+            self.verbose >= level,
+            self.dry_run)
 
 
     def move_file (self, src, dst, level=1):
         """Move a file respecting verbose and dry-run flags."""
-        return util.move_file (src, dst,
-                               self.verbose >= level,
-                               self.dry_run)
+        return file_util.move_file (src, dst,
+                                    self.verbose >= level,
+                                    self.dry_run)
 
 
     def spawn (self, cmd, search_path=1, level=1):
@@ -370,8 +372,9 @@ def spawn (self, cmd, search_path=1, level=1):
 
     def make_archive (self, base_name, format,
                       root_dir=None, base_dir=None):
-        return util.make_archive (base_name, format, root_dir, base_dir,
-                                  self.verbose, self.dry_run)
+        return archive_util.make_archive(
+            base_name, format, root_dir, base_dir,
+            self.verbose, self.dry_run)
 
 
     def make_file (self, infiles, outfile, func, args,
@@ -401,7 +404,7 @@ def make_file (self, infiles, outfile, func, args,
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or util.newer_group (infiles, outfile):
+        if self.force or dep_util.newer_group (infiles, outfile):
             self.execute (func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message

From 5351623c97c7a5adc612074a46d601dbd9f948c5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:38:58 +0000
Subject: [PATCH 0545/8469] Typo fix in docstring.

---
 extension.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extension.py b/extension.py
index 95a2ece8e8..f0021d0edc 100644
--- a/extension.py
+++ b/extension.py
@@ -23,8 +23,7 @@
 class Extension:
     """Just a collection of attributes that describes an extension
     module and everything needed to build it (hopefully in a portable
-    way, but there are hooks that let you can be as unportable as you
-    need).
+    way, but there are hooks that let you be as unportable as you need).
 
     Instance attributes:
       name : string

From f04ac5dd09157b550218a607a0721aa1bb86e821 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:41:40 +0000
Subject: [PATCH 0546/8469] Rene Liebscher: ext.export_symbols is now always a
 list (added 'or []').

---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index f0021d0edc..1d3112b652 100644
--- a/extension.py
+++ b/extension.py
@@ -104,6 +104,6 @@ def __init__ (self, name, sources,
         self.extra_objects = extra_objects or []
         self.extra_compile_args = extra_compile_args or []
         self.extra_link_args = extra_link_args or []
-        self.export_symbols = export_symbols
+        self.export_symbols = export_symbols or []
 
 # class Extension

From dff17c86072b76f6491300166e4b9670149ddd9b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:42:35 +0000
Subject: [PATCH 0547/8469] get_export_symbols() changed, adds now module init
 function if not given by the user.

---
 command/build_ext.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1ffe3234d4..aca6dac407 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -549,14 +549,10 @@ def get_export_symbols (self, ext):
         the .pyd file (DLL) must export the module "init" function.
         """
 
-        # XXX what if 'export_symbols' defined but it doesn't contain
-        # "init" + module_name?  Should we add it? warn? or just carry
-        # on doing nothing?
-
-        if ext.export_symbols is None:
-            return ["init" + string.split(ext.name,'.')[-1]]
-        else:
-            return ext.export_symbols
+        initfunc_name = "init" + string.split(ext.name,'.')[-1]
+        if initfunc_name not in ext.export_symbols:
+            ext.export_symbols.append(initfunc_name)
+        return ext.export_symbols
 
     def get_libraries (self, ext):
         """Return the list of libraries to link against when building a

From 9ef0502074aa149aa35ac81368f89253308a8012 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:43:16 +0000
Subject: [PATCH 0548/8469] Rene Liebscher:   * changed some list.extend([...])
 to list.append(...)   * added '/g0' to compiler_options, so compiler doesn't 
    stop after 100 warnings

---
 bcppcompiler.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 1d897de61a..930490245b 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -67,8 +67,8 @@ def __init__ (self,
         self.lib = "tlib.exe"
 
         self.preprocess_options = None
-        self.compile_options = ['/tWM', '/O2', '/q']
-        self.compile_options_debug = ['/tWM', '/Od', '/q']
+        self.compile_options = ['/tWM', '/O2', '/q', '/g0']
+        self.compile_options_debug = ['/tWM', '/Od', '/q', '/g0']
 
         self.ldflags_shared = ['/Tpd', '/Gn', '/q', '/x']
         self.ldflags_shared_debug = ['/Tpd', '/Gn', '/q', '/x']
@@ -232,7 +232,6 @@ def link_shared_object (self,
             # either exchange python15.lib in the python libs directory against
             # a Borland-like one, or create one with name bcpp_python15.lib 
             # there and remove the pragmas from config.h  
-            #libraries.append ('mypylib')            
             libraries.append ('import32')
             libraries.append ('cw32mt')
 
@@ -257,7 +256,7 @@ def link_shared_object (self,
             # name of dll file
             ld_args.extend([',',output_filename])
             # no map file and start libraries 
-            ld_args.extend([',', ','])
+            ld_args.append(',,')
 
             for lib in libraries:
                 # see if we find it and if there is a bcpp specific lib 

From 2c9c53b17589f71e434be1a8dae4ead6dd6e3f1e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:43:56 +0000
Subject: [PATCH 0549/8469] Rene Liebscher:   * use self.debug_print() for
 debug messages   * uses now copy.copy() to copy lists   * added
 'shared_lib_extension=".dll"', ... , this is necessary if you     want use
 the compiler class outside of the standard distutils build     process.   *
 changed result type of check_config_h() from int to string

---
 cygwinccompiler.py | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 3f9a5bd585..da0d60b0c2 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -44,16 +44,19 @@
 
 __revision__ = "$Id$"
 
-import os,sys
+import os,sys,copy
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 
 class CygwinCCompiler (UnixCCompiler):
 
     compiler_type = 'cygwin'
-    gcc_version = None
-    dllwrap_version = None
-    ld_version = None
+    obj_extension = ".o"
+    static_lib_extension = ".a"
+    shared_lib_extension = ".dll"
+    static_lib_format = "lib%s%s"
+    shared_lib_format = "%s%s"
+    exe_extension = ".exe"
    
     def __init__ (self,
                   verbose=0,
@@ -62,14 +65,16 @@ def __init__ (self,
 
         UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
-        if check_config_h()<=0:
+        check_result = check_config_h()
+        self.debug_print("Python's GCC status: %s" % check_result)
+        if check_result[:2] <> "OK":
             self.warn(
                 "Python's config.h doesn't seem to support your compiler. "
                 "Compiling may fail because of undefined preprocessor macros.")
         
         (self.gcc_version, self.ld_version, self.dllwrap_version) = \
             get_versions()
-        sys.stderr.write(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
+        self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version, 
                           self.ld_version, 
                           self.dllwrap_version) )
@@ -117,9 +122,9 @@ def link_shared_object (self,
                             extra_postargs=None,
                             build_temp=None):
         
-        # use separate copies, so can modify the lists
-        extra_preargs = list(extra_preargs or [])
-        libraries = list(libraries or [])
+        # use separate copies, so we can modify the lists
+        extra_preargs = copy.copy(extra_preargs or [])
+        libraries = copy.copy(libraries or [])
         
         # Additional libraries
         libraries.extend(self.dll_libraries)
@@ -241,11 +246,11 @@ def check_config_h():
        compiling probably doesn't work.
     """
     # return values
-    #  2: OK, python was compiled with GCC
-    #  1: OK, python's config.h mentions __GCC__
-    #  0: uncertain, because we couldn't check it
-    # -1: probably not OK, because we didn't found it in config.h
-    # You could check check_config_h()>0 => OK
+    #  "OK, python was compiled with GCC"
+    #  "OK, python's config.h mentions __GCC__"
+    #  "uncertain, because we couldn't check it"
+    #  "not OK, because we didn't found __GCC__ in config.h"
+    # You could check check_config_h()[:2] == "OK"
 
     from distutils import sysconfig
     import string,sys
@@ -254,7 +259,7 @@ def check_config_h():
     if -1 == string.find(sys.version,"GCC"):
         pass # go to the next test
     else:
-        return 2
+        return "OK, python was compiled with GCC"
     
     try:
         # It would probably better to read single lines to search.
@@ -265,14 +270,14 @@ def check_config_h():
         
         # is somewhere a #ifdef __GNUC__ or something similar
         if -1 == string.find(s,"__GNUC__"):
-            return -1  
+            return "not OK, because we didn't found __GCC__ in config.h"
         else:
-            return 1
+            return "OK, python's config.h mentions __GCC__"
     except IOError:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
         pass
-    return 0
+    return "uncertain, because we couldn't check it"
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.

From b9d00036db2020f271d9509152265dc170ac729b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 00:54:39 +0000
Subject: [PATCH 0550/8469] Added a whinging comment about the ugliness of
 constructing the BCPP argument list.

---
 bcppcompiler.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 930490245b..8ad9e4f2d4 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -253,6 +253,16 @@ def link_shared_object (self,
                 
             ld_args.extend(objects)     # list of object files
 
+            # XXX the command-line syntax for Borland C++ is a bit wonky;
+            # certain filenames are jammed together in one big string, but
+            # comma-delimited.  This doesn't mesh too well with the
+            # Unix-centric attitude (with a DOS/Windows quoting hack) of
+            # 'spawn()', so constructing the argument list is a bit
+            # awkward.  Note that doing the obvious thing and jamming all
+            # the filenames and commas into one argument would be wrong,
+            # because 'spawn()' would quote any filenames with spaces in
+            # them.  Arghghh!.  Apparently it works fine as coded...
+
             # name of dll file
             ld_args.extend([',',output_filename])
             # no map file and start libraries 

From 5042724ac26c16206dffec481827d36d8778a182 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 13 Aug 2000 01:18:55 +0000
Subject: [PATCH 0551/8469] Overhauld 'check_config_h()': now returns a
 (status, details) tuple, and is much better documented to boot.

---
 cygwinccompiler.py | 71 +++++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index da0d60b0c2..2ac2678e73 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -65,11 +65,13 @@ def __init__ (self,
 
         UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
-        check_result = check_config_h()
-        self.debug_print("Python's GCC status: %s" % check_result)
-        if check_result[:2] <> "OK":
+        (status, details) = check_config_h()
+        self.debug_print("Python's GCC status: %s (details: %s)" %
+                         (status, details))
+        if status is not CONFIG_H_OK:
             self.warn(
-                "Python's config.h doesn't seem to support your compiler. "
+                "Python's config.h doesn't seem to support your compiler.  " +
+                ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
         
         (self.gcc_version, self.ld_version, self.dllwrap_version) = \
@@ -241,43 +243,60 @@ def __init__ (self,
 # default, we should at least warn the user if he is using a unmodified
 # version.
 
+CONFIG_H_OK = "ok"
+CONFIG_H_NOTOK = "not ok"
+CONFIG_H_UNCERTAIN = "uncertain"
+
 def check_config_h():
-    """Checks if the GCC compiler is mentioned in config.h.  If it is not,
-       compiling probably doesn't work.
+
+    """Check if the current Python installation (specifically, config.h)
+    appears amenable to building extensions with GCC.  Returns a tuple
+    (status, details), where 'status' is one of the following constants:
+      CONFIG_H_OK
+        all is well, go ahead and compile
+      CONFIG_H_NOTOK
+        doesn't look good
+      CONFIG_H_UNCERTAIN
+        not sure -- unable to read config.h
+    'details' is a human-readable string explaining the situation.
+
+    Note there are two ways to conclude "OK": either 'sys.version' contains
+    the string "GCC" (implying that this Python was built with GCC), or the
+    installed "config.h" contains the string "__GNUC__".
     """
-    # return values
-    #  "OK, python was compiled with GCC"
-    #  "OK, python's config.h mentions __GCC__"
-    #  "uncertain, because we couldn't check it"
-    #  "not OK, because we didn't found __GCC__ in config.h"
-    # You could check check_config_h()[:2] == "OK"
+
+    # XXX since this function also checks sys.version, it's not strictly a
+    # "config.h" check -- should probably be renamed...
 
     from distutils import sysconfig
     import string,sys
     # if sys.version contains GCC then python was compiled with
     # GCC, and the config.h file should be OK
-    if -1 == string.find(sys.version,"GCC"):
-        pass # go to the next test
-    else:
-        return "OK, python was compiled with GCC"
+    if string.find(sys.version,"GCC") >= 0:
+        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
+    fn = sysconfig.get_config_h_filename()
     try:
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough 
-        f=open(sysconfig.get_config_h_filename())
-        s=f.read()
+        f = open(fn)
+        s = f.read()
         f.close()
         
-        # is somewhere a #ifdef __GNUC__ or something similar
-        if -1 == string.find(s,"__GNUC__"):
-            return "not OK, because we didn't found __GCC__ in config.h"
-        else:
-            return "OK, python's config.h mentions __GCC__"
-    except IOError:
+    except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
-        pass
-    return "uncertain, because we couldn't check it"
+        return (CONFIG_H_UNCERTAIN,
+                "couldn't read '%s': %s" % (fn, exc.strerror))
+
+    else:
+        # "config.h" contains an "#ifdef __GNUC__" or something similar
+        if string.find(s,"__GNUC__") >= 0:
+            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
+        else:
+            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
+
+
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.

From e016e0767f54a5256595679a34f7ce581508d573 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 15 Aug 2000 13:01:25 +0000
Subject: [PATCH 0552/8469] Fix long-hidden inconsistency in internal
 interface: 'find_modules()' now represents packages as strings, not tuples. 
 This allowed a simplification in 'get_package_dir()', too -- can now assume
 that 'package' is a string.

---
 command/build_py.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 0405d392d3..87e3efa218 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -93,12 +93,7 @@ def get_package_dir (self, package):
            distribution, where package 'package' should be found
            (at least according to the 'package_dir' option, if any)."""
 
-        if type (package) is StringType:
-            path = string.split (package, '.')
-        elif type (package) in (TupleType, ListType):
-            path = list (package)
-        else:
-            raise TypeError, "'package' must be a string, list, or tuple"
+        path = string.split (package, '.')
 
         if not self.package_dir:
             if path:
@@ -220,7 +215,7 @@ def find_modules (self):
 
         for module in self.py_modules:
             path = string.split (module, '.')
-            package = tuple (path[0:-1])
+            package = string.join(path[0:-1], '.')
             module_base = path[-1]
 
             try:

From 56988c3650a6601eca05bb51e07e84faaf629ca2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 15 Aug 2000 13:03:16 +0000
Subject: [PATCH 0553/8469] Added support for the '--dist-dir' option,
 including a mildly nasty hack to find the two created RPM files (source and
 binary) and move them to the "dist dir" (default "dist").

---
 command/bdist_rpm.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index e45d7a368b..1da0b81f39 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -8,6 +8,7 @@
 __revision__ = "$Id$"
 
 import os, string
+import glob
 from types import *
 from distutils.core import Command, DEBUG
 from distutils.util import get_platform
@@ -24,6 +25,9 @@ class bdist_rpm (Command):
         ('rpm-base=', None,
          "base directory for creating RPMs (defaults to \"rpm\" under "
          "--bdist-base; must be specified for RPM 2)"),
+        ('dist-dir=', 'd',
+         "directory to put final RPM files in "
+         "(and .spec files if --spec-only)"),
         ('spec-only', None,
          "only regenerate spec file"),
         ('source-only', None,
@@ -109,6 +113,7 @@ class bdist_rpm (Command):
     def initialize_options (self):
         self.bdist_base = None
         self.rpm_base = None
+        self.dist_dir = None
         self.spec_only = None
         self.binary_only = None
         self.source_only = None
@@ -166,6 +171,7 @@ def finalize_options (self):
         if not self.distribution.has_ext_modules():
             self.use_rpm_opt_flags = 0
 
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
         self.finalize_package_data()
 
     # finalize_options()
@@ -226,8 +232,8 @@ def run (self):
 
         # make directories
         if self.spec_only:
-            spec_dir = "dist"
-            self.mkpath(spec_dir)       # XXX should be configurable
+            spec_dir = self.dist_dir
+            self.mkpath(spec_dir)
         else:
             rpm_dir = {}
             for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'):
@@ -235,8 +241,8 @@ def run (self):
                 self.mkpath(rpm_dir[d])
             spec_dir = rpm_dir['SPECS']
 
-        # Spec file goes into 'dist' directory if '--spec-only specified',
-        # into build/rpm.<plat> otherwise.
+        # Spec file goes into 'dist_dir' if '--spec-only specified',
+        # build/rpm.<plat> otherwise.
         spec_path = os.path.join(spec_dir,
                                  "%s.spec" % self.distribution.get_name())
         self.execute(write_file,
@@ -285,6 +291,19 @@ def run (self):
         rpm_args.append(spec_path)
         self.spawn(rpm_args)
 
+        # XXX this is a nasty hack -- we really should have a proper way to
+        # find out the names of the RPM files created; also, this assumes
+        # that RPM creates exactly one source and one binary RPM.
+        if not self.dry_run:
+            srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
+            rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
+            assert len(srpms) == 1, \
+                   "unexpected number of SRPM files found: %s" % srpms
+            assert len(rpms) == 1, \
+                   "unexpected number of RPM files found: %s" % rpms
+            self.move_file(srpms[0], self.dist_dir)
+            self.move_file(rpms[0], self.dist_dir)
+
     # run()
 
 

From 802df4b37327ad870f0a6fe0be1551740f138758 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 15 Aug 2000 13:05:35 +0000
Subject: [PATCH 0554/8469] Fixed the move-RPM-files hack so it knows about the
 '--binary-only' and '--source-only' options.

---
 command/bdist_rpm.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 1da0b81f39..026a3ba4d5 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -295,14 +295,17 @@ def run (self):
         # find out the names of the RPM files created; also, this assumes
         # that RPM creates exactly one source and one binary RPM.
         if not self.dry_run:
-            srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
-            rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
-            assert len(srpms) == 1, \
-                   "unexpected number of SRPM files found: %s" % srpms
-            assert len(rpms) == 1, \
-                   "unexpected number of RPM files found: %s" % rpms
-            self.move_file(srpms[0], self.dist_dir)
-            self.move_file(rpms[0], self.dist_dir)
+            if not self.binary_only:
+                srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
+                assert len(srpms) == 1, \
+                       "unexpected number of SRPM files found: %s" % srpms
+                self.move_file(srpms[0], self.dist_dir)
+
+            if not self.source_only:
+                rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
+                assert len(rpms) == 1, \
+                       "unexpected number of RPM files found: %s" % rpms
+                self.move_file(rpms[0], self.dist_dir)
 
     # run()
 

From 91251698bde14e2f5f9697626ff61d6ba3f408cb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 15 Aug 2000 13:14:27 +0000
Subject: [PATCH 0555/8469] Bump version to 0.9.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f6af3c9dac..7fe2f913e9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.1pre"
+__version__ = "0.9.1"

From 7ec708f7b894796c2fe1d28216e47819fc9fcf87 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 22 Aug 2000 01:48:54 +0000
Subject: [PATCH 0556/8469] Ensure destination directory exists before trying
 to create a tarball or ZIP file.

---
 archive_util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 08a3c8310c..26cd7fb2ec 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -10,7 +10,7 @@
 import os
 from distutils.errors import DistutilsExecError
 from distutils.spawn import spawn
-
+from distutils.dir_util import mkpath
 
 def make_tarball (base_name, base_dir, compress="gzip",
                   verbose=0, dry_run=0):
@@ -42,6 +42,7 @@ def make_tarball (base_name, base_dir, compress="gzip",
               "bad value for 'compress': must be None, 'gzip', or 'compress'"
 
     archive_name = base_name + ".tar"
+    mkpath(os.path.dirname(archive_name), verbose=verbose, dry_run=dry_run)
     cmd = ["tar", "-cf", archive_name, base_dir]
     spawn (cmd, verbose=verbose, dry_run=dry_run)
 
@@ -68,6 +69,7 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     # no changes needed!
 
     zip_filename = base_name + ".zip"
+    mkpath(os.path.dirname(zip_filename), verbose=verbose, dry_run=dry_run)
     try:
         spawn (["zip", "-rq", zip_filename, base_dir],
                verbose=verbose, dry_run=dry_run)
@@ -114,7 +116,7 @@ def visit (z, dirname, names):
     'bztar': (make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
     'ztar':  (make_tarball, [('compress', 'compress')], "compressed tar file"),
     'tar':   (make_tarball, [('compress', None)], "uncompressed tar file"),
-    'zip':   (make_zipfile, [],"zip-file")
+    'zip':   (make_zipfile, [],"ZIP file")
     }
 
 def check_archive_formats (formats):

From a535c80ee5091193512f8e7456e92b827d1725df Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 22 Aug 2000 01:49:41 +0000
Subject: [PATCH 0557/8469] Don't bother to 'mkpath()' the 'dist_dir' -- that's
 now taken care of in archive_util.py.

---
 command/sdist.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index b2d7a86f1f..2351ebbe37 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -442,8 +442,6 @@ def make_distribution (self):
 
         self.make_release_tree (base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
-        if self.dist_dir:
-            self.mkpath(self.dist_dir)
         for fmt in self.formats:
             file = self.make_archive (base_name, fmt, base_dir=base_dir)
             archive_files.append(file)

From e1e774a29223c5fafee139a64411fec416e1fdb4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 26 Aug 2000 02:21:55 +0000
Subject: [PATCH 0558/8469] In 'check_extensions_list()': when converting
 old-style 'buildinfo' dict, don't assign None to any attributes of the
 Extension object.

---
 command/build_ext.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index aca6dac407..4d779b8264 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -278,7 +278,9 @@ def check_extensions_list (self, extensions):
                         'extra_objects',
                         'extra_compile_args',
                         'extra_link_args'):
-                setattr(ext, key, build_info.get(key))
+                val = build_info.get(key)
+                if val is not None:
+                    setattr(ext, key, val)
 
             # Medium-easy stuff: same syntax/semantics, different names.
             ext.runtime_library_dirs = build_info.get('rpath')

From 43abfd378a945259c7164cabc5fb16b44dc8a5f1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 26 Aug 2000 02:37:07 +0000
Subject: [PATCH 0559/8469] Bumped version to 0.9.2pre.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7fe2f913e9..afd65545b4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.1"
+__version__ = "0.9.2pre"

From 8294ae149b20ee146afc6c57c410979b440f7934 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 26 Aug 2000 02:40:10 +0000
Subject: [PATCH 0560/8469] New release of the Windows installer from Thomas
 Heller. The known bug (bogus error message when an empty file is extracted)
 is fixed.

Other changes:

- The target-compile and target-optimize flags of bdist_wininst
  are gone. It is no longer possible to compile the python
  files during installation.
- The zlib module is no longer required or used by bdist_wininst.

- I moved the decompression/extraction code into a separate
  file (extract.c).

- The installer stub is now compressed by UPX (see
  http://upx.tsx.org/). This reduces the size of the exe
  (and thus the overhead of the final installer program)
  from 40 kB to 16 kB.

- The installer displays a more uptodate user wizard-like
  user interface, also containing a graphic: Just's Python Powered logo.
  (I could not convince myself to use one of the BeOpen logos).
- The installation progress bar now moves correctly.
---
 command/bdist_wininst.py | 579 ++++++++++++++++++++-------------------
 1 file changed, 296 insertions(+), 283 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 38e973b66d..9b600a9e1e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -22,13 +22,9 @@ class bdist_wininst (Command):
                     ('keep-tree', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
-                    ('target-compile', 'c',
-                     "compile to .pyc on the target system"),
-                    ('target-optimize', 'o',
-                     "compile to .pyo on the target system"),
                     ('target-version=', 'v',
                      "require a specific python version" +
-                     " on the target system (1.5 or 1.6/2.0)"),
+                     " on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
                    ]
@@ -74,22 +70,10 @@ def run (self):
         install.root = self.bdist_dir
 
         install_lib = self.reinitialize_command('install_lib')
+        # we do not want to include pyc or pyo files
         install_lib.compile = 0
         install_lib.optimize = 0
 
-        # The packager can choose if .pyc and .pyo files should be created
-        # on the TARGET system instead at the SOURCE system.
-
-##        # The compilation can only be done on the SOURCE system for one
-##        # python version (assuming 1.6/2.0 and 1.5 have incompatible
-##        # byte-codes).
-##        short_version = sys.version[:3]
-##        if self.target_version == short_version:
-##            if not self.target_compile:
-##                install_lib.compile = 1
-##            if not self.target_optimize:
-##                install_lib.optimize = 1
-
         install_lib.ensure_finalized()
 
         self.announce ("installing to %s" % self.bdist_dir)
@@ -137,7 +121,7 @@ def create_inifile (self):
 
         # 'info' will be displayed in the installer's dialog box,
         # describing the items to be installed.
-        info = metadata.long_description + '\n'
+        info = metadata.long_description or '' + '\n'
 
         for name in dir (metadata):
             if (name != 'long_description'):
@@ -152,11 +136,8 @@ def create_inifile (self):
         inifile.write ("\n[Setup]\n")
         inifile.write ("info=%s\n" % repr (info)[1:-1])
         inifile.write ("pthname=%s.%s\n" % (metadata.name, metadata.version))
-        inifile.write ("pyc_compile=%d\n" % self.target_compile)
-        inifile.write ("pyo_compile=%d\n" % self.target_optimize)
         if self.target_version:
-            vers_minor = string.split (self.target_version, '.')[1]
-            inifile.write ("vers_minor=%s\n" % vers_minor)
+            inifile.write ("target_version=%s\n" % self.target_version)
 
         title = self.distribution.get_fullname()
         inifile.write ("title=%s\n" % repr (title)[1:-1])
@@ -166,285 +147,317 @@ def create_inifile (self):
     # create_inifile()
 
     def create_exe (self, arcname, fullname):
-        import struct, zlib
+        import struct#, zlib
 
         cfgdata = open (self.create_inifile()).read()
 
-        comp_method = zlib.DEFLATED
-        co = zlib.compressobj (zlib.Z_DEFAULT_COMPRESSION, comp_method, -15)
-        zcfgdata = co.compress (cfgdata) + co.flush()
-
         installer_name = os.path.join(self.dist_dir,
                                       "%s.win32.exe" % fullname)
         self.announce ("creating %s" % installer_name)
 
         file = open (installer_name, "wb")
         file.write (self.get_exe_bytes ())
-        file.write (zcfgdata)
-        crc32 = zlib.crc32 (cfgdata)
-        header = struct.pack ("<iiiiiiii",
-                              0x12345678,       # tag
-                              comp_method,      # compression method
-                              crc32,            # checksum
-                              len (cfgdata),    # uncompressed length
-                              len (zcfgdata),   # compressed length
-                              0, 0, 0)          # reserved fields
+        file.write (cfgdata)
+        header = struct.pack ("<ii",
+                              0x12345679,       # tag
+                              len (cfgdata))    # length
         file.write (header)
         file.write (open (arcname, "rb").read())
 
     # create_exe()
 
     def get_exe_bytes (self):
-        import zlib, base64
-        return zlib.decompress (base64.decodestring (EXEDATA))
+        import base64
+        return base64.decodestring (EXEDATA)
 
 # class bdist_wininst
 
 if __name__ == '__main__':
-    import zlib, base64
-    file = r"c:\wininst\wininst.exe"
+    import base64
+    file = r"..\..\misc\wininst.exe"
     data = open (file, "rb").read()
-    cdata = zlib.compress (data, 9)
-    bdata = base64.encodestring (cdata)
+    bdata = base64.encodestring (data)
     open ("EXEDATA", "w").write (bdata)
-    print "%d %d %d" % (len (data), len (cdata), len (bdata))
-
-EXEDATA = """
-eNrtfQt4U9eV7pEl28IIJIJNlMRJlCBaN3JcE5uMiYDK2HJMsI1s2TIkDsbYMrLwK9IRj4akENkT
-DhvlMU06aW/bSZp2pnMnM5OZ5jY0bYONSQzkwcMp0JJpIO1NZQyEJATMU/df+2z5BalnvszMN/f7
-fPi29jl7r7X2WmuvvdbaW0em9P6nJK0kSTqUWEyStknq5ZDGv46iTL31tanSK5PeuW2bpuSd2yp9
-TUFLe6BtVaCuxVJf19raJltWei2BUKulqdVSuMRtaWlr8GZNmZJiFTT66x9r/ceEE/Pj5eAtR+e/
-hDrrlg/n/zPqitujvN57c2z+TzjMyfmfCdgXeP9HvPbrjnO8iqZ6H/XFeXQ5JalEo5M8rxTPHebb
-qJmsSVKFdKltf1OCD1P82aHem1S9SNJwLT0v4HAl8E+TeDYNtZtG6Ci1UpK20s1TkuRLkP7zLvC5
-VfPF3Vmyd51MkiwQDDnGMIbLIkkrsgINdXKdJL0/WchuGtaJNGwLjiwVTCrMwscKFZnXo+G6sgLB
-QL0kZH1K0Nt4NT1p4pq4Jq6Ja+KauCauiWvimrgmrolr4vpvvarYCebUe9jpzi65aou+Y7e8ZOP5
-mlDhlmKNY+P57A3RjedzHp2x8XyrPHnj+UDot28mTSka6HszKaVo4EykVO/Xl7tiaaddDim80zAv
-JaSj/s1JIFk08I+bpxY5Bv5u41ek5Q/29HiYbNV7ooftkrSMTXllnUOKFGoS2JSXcde5+0VqCKV7
-otvQ7wDJ50HS43qReqM/RNvAHa7yWNogWpfxxs6uZfKNPtMKh+SKrkO/JzaHwzbjPrzTtLwHgm06
-YcIO2e2pVvtiab8COpvzY+LWO4hySdpOFKpdivNM7CAkYIc7j8jfjDkH3ZHO01diMV86DRBLc5SD
-Xd7iilUZQB/aSow5Lw1kQ9Jzh2/qCh81hLvqXXG01KvQohfxGd6Z6o6FBn0JOkmKzcl+gniaB5hq
-vxQ7uGzZwMZY6EwsTY8W5ry0rHb5A7tVMej0IafLM9epf51u5TkuqN5V7omF9C6fNA3E0p4ifUU6
-pUuxGLXG0kzlfE7wEEvbis6BpM28V4UBwGY0RkpNttPlkY5EFc/gQftP+WSaVDi/yVfCZZmzM0Lc
-FoJqTtfyOF9Qb8RpcAE2xsf1UcsoGjFOo+ZqGrt7XtiGSfGEBxPkRWwONYYHtXJBeFAjL/TP9KXX
-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
-g0P4QXgJcL4SKedqAR9U+RT0eYea7dFFP9ZOb3RI9MdDTKgllDNeh3QUZR/KNq/aR3K2YCfWROYi
-LIvwV4YaGyG1V7hgwAXR0lTf5G2VIVwLfJbENSYgkCp64QSG4LnCx/S1jtDHkKD1PGUdam+GmwzU
-NX9dqET0qmdPdD61IlkcZOnFfy+iV884K/XqeWBFsnpuSO3tos4WBLporSWr51fUvkLUFtH/fPyA
-VNQbRe0Q/UcFfpJoXypqs+in/6bEnayeU1L7OlHnif59qMqT1TM/aveJOkP0vyye9aLeLOpi0X9a
-jK8T7ZWipp/fVenV808a3ybaZVHnCvxdYvwpor1B1FbR/1PxHKffIepC0R8V48f5qxF1uuh/juYh
-WT2fpfYNop4n+g+L+bletDeLOlP0bxPPBlFvFXWJ6B8U42tFe4WorxPyvyjknynaA6K+S+DvFPJP
-Fu0rRX276P+xeE4Q9WOiXij6/yjGTxbt94v6RtH/jJC/QLR/U9T3iP73hPzTRbtf1HeI/lfEc9w+
-t4j6PtF/RoyfKNo9oqZv5LqE3ZL8OaJ9jajvFvhvC/mNor1R1F8R/S+J57h9/6Woi0T/CTH+JNG+
-XNS3iP7vC/nrRfujol4g+t8X8t8k2ltFnSX6fyWep4r6CVGXif5LY9Z/ueifJuY/PGb9PyTq2QJ/
-x5j1Xyfq20T/j8SzRtSbRJ0v+j8cs/6XifoG0f9XY9b/elHPFf0Hxqz/JlF/TfT/q3iO61cR9SLR
-/+mY9V8l6jRq16vffYxc/yFRzxH4e8asf6+oZ4n+/y2e4/bVKWqn6D8+Zv0/KOqbRf/3xqz/R0Q9
-X/T/bsz6bxH1naL/NfEc5y8i6lLRf2HM+o+PM13Mf8+Y9R8UdY7Af3PM+o/b6UzR/7fiOU4/LOoC
-0f/RmPX/gKhvEv3fGbP+Hxa1XfQfHLP+V4vaJvp/Lp7j/DFRLxb9Z8es/2pRX/8F63+tqP9C4L87
-Zv2vEvVXRf8/iee4fI+L+l7Rf2rM+q8V9a2i/4dj1v+3RP0N0f/7Meu/TdRfF/2vi+c4f0+Keono
-v/Il43/3OPH/hXHi/7Fx4v/T48T//ePE/38ZJ/5/8iXj/+5x4v/fjxP/+8eJ/98dJ/7/dpz4/4tx
-4v/5Lxn/3xgn/v9knPj/f8eJ/8+OE/9/M078/z/jxP/Pv2T8f2ec+P+P48T/k+PE/x+ME///bZz4
-/+tx4v/lLxn/e8aJ/y+OE///ME78//Y48b9vnPj/s3Hi/2dfMv6/NU78/4dx4v/AOPH/f40T/4+M
-E/9/OU78v/gl43/vOPH/78aJ/38aJ/7/9Tjx/9A48f/VceL/uS8Z//eOE///eZz4//E48f9vxon/
-H4wT/7ePE//phSZXoro+qxPVd2Pciep6eiBRfRemPFHVz7JE9V2ZqkR1/T6YqL4bQ/g0v0sT1Xdq
-KhPV9V+TqL5DU5Goynd/ovqOjSdR9QNdiep7NYSfIMbfJMa/IT6+WR0/OT5+kjp+XXx8ga+Lj69V
-x58dHz9bHX9KfHyDOn73iPHV8xo6mLM0rG+ta2mqH3G0FLTI9LUoHVYHQyuD9YGmlXTa9UVwI2iN
-OXbh3WPpXBPG29Iurx8+zaFGy9omdI86oxrmeSQg9Y3ldWx//N0lrXgfySjeCyObIvsim4gBIEZ/
-IxQAMQDEAEB/vCv2rfhbcMKnT1wT18Q1cU1cE9fE9V94aXgOZr7qf2zX8D1H9jXak3XqOceKp5Af
-XeP/t+/S7+I4fO8mpWo+4PUi7CGDkowMqxn/6nDXhKyylaeNpdgfWFDqOAzdeaUA+hvFiBp+fFQp
-7ZHuwo6zXxuLbQQM0QqoJycExWGeEDAJEsEUYKQ2UIynJxs5TLq0TfodYAa0LeirB4Vm1LVSO6i1
-IdMOAD6Ifzn8NMI1pnW24CmB00qWXpKSkHyeAE+PCflIsnoxok7/LwIuGXAbpSjgNom+SeJYLFna
-irw3RTrF5ari/FrQtR6UfFxHFoyape4NSQppE8e7Q/oepJ0qfXwNmksEzdPj0Lx7aNbi8vwAOZue
-vxv+mFQISUhu0lEb7tar5yMj9D0IHtLAw6d8nCz+b+KauCauiWvimrgmrolr4pq4Jq6Ja+L6n3H9
-Pzrvwu8=
+    print "%d %d" % (len (data), len (bdata))
+
+EXEDATA = """\
+TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAA4AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
+ZGUuDQ0KJAAAAAAAAADq0pWMrrP7366z+9+us/vf1a/336+z+98tr/XfrLP731GT/9+ss/vfzKzo
+36az+9+us/rf9rP7366z+9+js/vfUZPx36Oz+99ptf3fr7P731JpY2ius/vfAAAAAAAAAABQRQAA
+TAEDAE2JpjkAAAAAAAAAAOAADwELAQYAAEAAAAAQAAAAgAAAQMMAAACQAAAA0AAAAABAAAAQAAAA
+AgAABAAAAAAAAAAEAAAAAAAAAADgAAAABAAAAAAAAAIAAAAAABAAABAAAAAAEAAAEAAAAAAAABAA
+AAAAAAAAAAAAADDRAABwAQAAANAAADABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAFVQWDAAAAAAAIAAAAAQAAAAAAAAAAQAAAAAAAAAAAAAAAAAAIAAAOBV
+UFgxAAAAAABAAAAAkAAAADYAAAAEAAAAAAAAAAAAAAAAAABAAADgLnJzcmMAAAAAEAAAANAAAAAE
+AAAAOgAAAAAAAAAAAAAAAAAAQAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
+IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
+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
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgACAAAAIAAAgAUAAABg
+AACAAAAAAAAAAAAAAAAAAAABAG4AAAA4AACAAAAAAAAAAAAAAAAAAAABAAAAAABQAAAAMJEAAAgK
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABABrAAAAkAAAgGwAAAC4AACAbQAAAOAAAIBuAAAACAEA
+gAAAAAAAAAAAAAAAAAAAAQAJBAAAqAAAADibAAB+AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA
+CQQAANAAAAC4nAAAbgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAD4AAAAKJ4AAFoCAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAAIAEAAIigAABcAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAD00QAAvNEAAAAAAAAAAAAAAAAAAAHSAADM0QAAAAAAAAAAAAAAAAAADtIAANTRAAAAAAAAAAAA
+AAAAAAAb0gAA3NEAAAAAAAAAAAAAAAAAACXSAADk0QAAAAAAAAAAAAAAAAAAMNIAAOzRAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAADrSAABI0gAAWNIAAAAAAABm0gAAAAAAAHTSAAAAAAAAhNIAAAAAAACO
+0gAAAAAAAJTSAAAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRsbABDT01DVEwzMi5kbGwAR0RJ
+MzIuZGxsAE1TVkNSVC5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVz
+cwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAA
+ZXhpdAAARW5kUGFpbnQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
 """

From 069a0d745b397e28c3540678cd53cdc064101b0a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 27 Aug 2000 20:44:13 +0000
Subject: [PATCH 0561/8469] Fix line-endings. Fix bad operator precedence:
 should be "(metadata or '') + '\n'".

---
 command/bdist_wininst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 9b600a9e1e..78a5c9c573 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -121,7 +121,7 @@ def create_inifile (self):
 
         # 'info' will be displayed in the installer's dialog box,
         # describing the items to be installed.
-        info = metadata.long_description or '' + '\n'
+        info = (metadata.long_description or '') + '\n'
 
         for name in dir (metadata):
             if (name != 'long_description'):

From 23be7d21e3e70fd3a397ce710a25166adfa8a037 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 29 Aug 2000 01:15:18 +0000
Subject: [PATCH 0562/8469] Added 'script_name' and 'script_args' instance
 attributes to Distribution. Changed 'core.setup()' so it sets them to
 reasonable defaults. Tweaked how the "usage" string is generated: 'core' now
 provides   'gen_usage()', which is used instead of 'USAGE'. Modified
 "build_py" and "sdist" commands to refer to   'self.distribution.script_name'
 rather than 'sys.argv[0]'.

---
 command/build_py.py |  4 +++-
 command/sdist.py    |  5 ++++-
 core.py             | 34 ++++++++++++++++++-----------
 dist.py             | 52 +++++++++++++++++++++++++--------------------
 4 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 87e3efa218..66f50241c1 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -177,13 +177,15 @@ def find_package_modules (self, package, package_dir):
         self.check_package (package, package_dir)
         module_files = glob (os.path.join (package_dir, "*.py"))
         modules = []
-        setup_script = os.path.abspath (sys.argv[0])
+        setup_script = os.path.abspath(self.distribution.script_name)
 
         for f in module_files:
             abs_f = os.path.abspath (f)
             if abs_f != setup_script:
                 module = os.path.splitext (os.path.basename (f))[0]
                 modules.append ((package, module, f))
+            else:
+                self.debug_print("excluding %s" % setup_script)
         return modules
 
 
diff --git a/command/sdist.py b/command/sdist.py
index 2351ebbe37..06c8f1cb10 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -202,7 +202,10 @@ def get_file_list (self):
         # manifest, but there's no template -- which will happen if the
         # developer elects to generate a manifest some other way -- then we
         # can't regenerate the manifest, so we don't.)
-        setup_newer = dep_util.newer(sys.argv[0], self.manifest)
+        self.debug_print("checking if %s newer than %s" %
+                         (self.distribution.script_name, self.manifest))
+        setup_newer = dep_util.newer(self.distribution.script_name,
+                                     self.manifest)
 
         # cases:
         #   1) no manifest, template exists: generate manifest
diff --git a/core.py b/core.py
index 4c982a07ad..39f1f54b29 100644
--- a/core.py
+++ b/core.py
@@ -25,26 +25,30 @@
 # runs the setup script with no arguments at all.  More useful help
 # is generated with various --help options: global help, list commands,
 # and per-command help.
-usage = """\
-usage: %s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
-   or: %s --help [cmd1 cmd2 ...]
-   or: %s --help-commands
-   or: %s cmd --help
-""" % ((os.path.basename(sys.argv[0]),) * 4)
+USAGE = """\
+usage: %(script)s [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
+   or: %(script)s --help [cmd1 cmd2 ...]
+   or: %(script)s --help-commands
+   or: %(script)s cmd --help
+"""
 
 
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
 # debug mode.
 DEBUG = os.environ.get('DISTUTILS_DEBUG')
 
+def gen_usage (script_name):
+    script = os.path.basename(script_name)
+    return USAGE % vars()
+
 
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
     to do, in a highly flexible and user-driven way.  Briefly: create a
     Distribution instance; find and parse config files; parse the command
-    line; run each of those commands using the options supplied to
-    'setup()' (as keyword arguments), in config files, and on the command
-    line.
+    line; run each Distutils command found there, customized by the options
+    supplied to 'setup()' (as keyword arguments), in config files, and on
+    the command line.
 
     The Distribution instance might be an instance of a class supplied via
     the 'distclass' keyword argument to 'setup'; if no such class is
@@ -79,6 +83,11 @@ class found in 'cmdclass' is used in place of the default, which is
     else:
         klass = Distribution
 
+    if not attrs.has_key('script_name'):
+        attrs['script_name'] = sys.argv[0]
+    if not attrs.has_key('script_args'):
+        attrs['script_args'] = sys.argv[1:]
+
     # Create the Distribution instance, using the remaining arguments
     # (ie. everything except distclass) to initialize it
     try:
@@ -97,10 +106,11 @@ class found in 'cmdclass' is used in place of the default, which is
     # Parse the command line; any command-line errors are the end user's
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
-        ok = dist.parse_command_line (sys.argv[1:])
+        ok = dist.parse_command_line()
     except DistutilsArgError, msg:
-        sys.stderr.write (usage + "\n")
-        raise SystemExit, "error: %s" % msg
+        script = os.path.basename(dist.script_name)
+        raise SystemExit, \
+              gen_usage(dist.script_name) + "\nerror: %s" % msg
 
     if DEBUG:
         print "options (after parsing command line):"
diff --git a/dist.py b/dist.py
index ed829fe480..1552dc0c41 100644
--- a/dist.py
+++ b/dist.py
@@ -131,6 +131,12 @@ def __init__ (self, attrs=None):
         # for the setup script to override command classes
         self.cmdclass = {}
 
+        # 'script_name' and 'script_args' are usually set to sys.argv[0]
+        # and sys.argv[1:], but they can be overridden when the caller is
+        # not necessarily a setup script run from the command-line.
+        self.script_name = None
+        self.script_args = None
+
         # 'command_options' is where we store command options between
         # parsing them (from config files, the command-line, etc.) and when
         # they are actually needed -- ie. when the command in question is
@@ -326,24 +332,24 @@ def parse_config_files (self, filenames=None):
 
     # -- Command-line parsing methods ----------------------------------
 
-    def parse_command_line (self, args):
-        """Parse the setup script's command line.  'args' must be a list
-        of command-line arguments, most likely 'sys.argv[1:]' (see the
-        'setup()' function).  This list is first processed for "global
-        options" -- options that set attributes of the Distribution
-        instance.  Then, it is alternately scanned for Distutils
-        commands and options for that command.  Each new command
-        terminates the options for the previous command.  The allowed
-        options for a command are determined by the 'user_options'
-        attribute of the command class -- thus, we have to be able to
-        load command classes in order to parse the command line.  Any
-        error in that 'options' attribute raises DistutilsGetoptError;
-        any error on the command-line raises DistutilsArgError.  If no
-        Distutils commands were found on the command line, raises
-        DistutilsArgError.  Return true if command-line were
-        successfully parsed and we should carry on with executing
-        commands; false if no errors but we shouldn't execute commands
-        (currently, this only happens if user asks for help).
+    def parse_command_line (self):
+        """Parse the setup script's command line, taken from the
+        'script_args' instance attribute (which defaults to 'sys.argv[1:]'
+        -- see 'setup()' in core.py).  This list is first processed for
+        "global options" -- options that set attributes of the Distribution
+        instance.  Then, it is alternately scanned for Distutils commands
+        and options for that command.  Each new command terminates the
+        options for the previous command.  The allowed options for a
+        command are determined by the 'user_options' attribute of the
+        command class -- thus, we have to be able to load command classes
+        in order to parse the command line.  Any error in that 'options'
+        attribute raises DistutilsGetoptError; any error on the
+        command-line raises DistutilsArgError.  If no Distutils commands
+        were found on the command line, raises DistutilsArgError.  Return
+        true if command-line were successfully parsed and we should carry
+        on with executing commands; false if no errors but we shouldn't
+        execute commands (currently, this only happens if user asks for
+        help).
         """
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -356,7 +362,7 @@ def parse_command_line (self, args):
         parser = FancyGetopt (self.global_options + self.display_options)
         parser.set_negative_aliases (self.negative_opt)
         parser.set_aliases ({'license': 'licence'})
-        args = parser.getopt (object=self)
+        args = parser.getopt (args=self.script_args, object=self)
         option_order = parser.get_option_order()
 
         # for display options we return immediately
@@ -506,7 +512,7 @@ def _show_help (self,
         in 'commands'.
         """
         # late import because of mutual dependence between these modules
-        from distutils.core import usage
+        from distutils.core import gen_usage
         from distutils.cmd import Command
 
         if global_options:
@@ -535,7 +541,7 @@ def _show_help (self,
             parser.print_help ("Options for '%s' command:" % klass.__name__)
             print
 
-        print usage
+        print gen_usage(self.script_name)
         return
 
     # _show_help ()
@@ -547,7 +553,7 @@ def handle_display_options (self, option_order):
         line, display the requested info and return true; else return
         false.
         """
-        from distutils.core import usage
+        from distutils.core import gen_usage
 
         # User just wants a list of commands -- we'll print it out and stop
         # processing now (ie. if they ran "setup --help-commands foo bar",
@@ -555,7 +561,7 @@ def handle_display_options (self, option_order):
         if self.help_commands:
             self.print_commands ()
             print
-            print usage
+            print gen_usage(self.script_name)
             return 1
 
         # If user supplied any of the "display metadata" options, then

From 67d6f9504294214af2808483dbf15e6246a5a2d4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 30 Aug 2000 17:16:27 +0000
Subject: [PATCH 0563/8469] Added docstring for 'wrap()' function.

---
 fancy_getopt.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index a62bc0df75..eaf6073760 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -412,6 +412,11 @@ def fancy_getopt (options, negative_opt, object, args):
 WS_TRANS = string.maketrans (string.whitespace, ' ' * len (string.whitespace))
 
 def wrap_text (text, width):
+    """wrap_text(text : string, width : int) -> [string]
+
+    Split 'text' into multiple lines of no more than 'width' characters
+    each, and return the list of strings that results.
+    """
 
     if text is None:
         return []

From 630ec75678315f7043e3a14aa21b539d77979854 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 30 Aug 2000 17:32:24 +0000
Subject: [PATCH 0564/8469] Add ".cxx" to the list of known C++ extensions.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index eecbb620ed..6c3f8dab71 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -177,7 +177,7 @@ class MSVCCompiler (CCompiler) :
 
     # Private class data (need to distinguish C from C++ source for compiler)
     _c_extensions = ['.c']
-    _cpp_extensions = ['.cc','.cpp']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
 
     # Needed for the filename generation methods provided by the
     # base class, CCompiler.

From 1020b190ea0add7c81905e2bc2814678d0fc414a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 31 Aug 2000 00:31:07 +0000
Subject: [PATCH 0565/8469] Add /GX to 'compile_options'.  This is definitely
 needed for C++ source; according to the MS docs it enables
 exception-handling, and (according to Alex Martelli <aleaxit@yahoo.com>) is
 needed to compile without getting warnings from standard C++ library headers.
  Apparently it doesn't cause any problems with C code, so I haven't bothered
 conditionalizing the use of /GX.

---
 msvccompiler.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 6c3f8dab71..ae08e7fdcf 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -219,8 +219,9 @@ def __init__ (self,
             self.lib = "lib.exe"
 
         self.preprocess_options = None
-        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3' ]
-        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/Z7', '/D_DEBUG']
+        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ]
+        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GX',
+                                      '/Z7', '/D_DEBUG']
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         self.ldflags_shared_debug = [

From 58ad88e9ee05aaf0a3ee7e3d6c23900d3277d399 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 00:52:45 +0000
Subject: [PATCH 0566/8469] Added 'run_setup()' to allow outsiders to run a
 setup script under fairly tight control, and the '_setup_stop_after' and
 '_setup_distribution' globals to provide the tight control.

This isn't entirely reliable yet: it dies horribly with a NameError on the
example PIL setup script in examples/pil_setup.py (at least with Python
1.5.2; untested with current Python).  There's some strangeness going
on with execfile(), but I don't understand it and don't have time
to track it down right now.
---
 core.py | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/core.py b/core.py
index 39f1f54b29..5dfe2db839 100644
--- a/core.py
+++ b/core.py
@@ -42,6 +42,11 @@ def gen_usage (script_name):
     return USAGE % vars()
 
 
+# Some mild magic to control the behaviour of 'setup()' from 'run_setup()'.
+_setup_stop_after = None
+_setup_distribution = None
+
+
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
     to do, in a highly flexible and user-driven way.  Briefly: create a
@@ -75,6 +80,8 @@ class found in 'cmdclass' is used in place of the default, which is
     object.
     """
 
+    global _setup_stop_after, _setup_distribution
+
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
     klass = attrs.get ('distclass')
@@ -91,10 +98,13 @@ class found in 'cmdclass' is used in place of the default, which is
     # Create the Distribution instance, using the remaining arguments
     # (ie. everything except distclass) to initialize it
     try:
-        dist = klass (attrs)
+        _setup_distribution = dist = klass (attrs)
     except DistutilsSetupError, msg:
         raise SystemExit, "error in setup script: %s" % msg
 
+    if _setup_stop_after == "init":
+        return dist
+
     # Find and parse the config file(s): they will override options from
     # the setup script, but be overridden by the command line.
     dist.parse_config_files()
@@ -103,6 +113,9 @@ class found in 'cmdclass' is used in place of the default, which is
         print "options (after parsing config files):"
         dist.dump_option_dicts()
 
+    if _setup_stop_after == "config":
+        return dist
+
     # Parse the command line; any command-line errors are the end user's
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
@@ -116,6 +129,9 @@ class found in 'cmdclass' is used in place of the default, which is
         print "options (after parsing command line):"
         dist.dump_option_dicts()
 
+    if _setup_stop_after == "commandline":
+        return dist
+
     # And finally, run all the commands found on the command line.
     if ok:
         try:
@@ -140,4 +156,76 @@ class found in 'cmdclass' is used in place of the default, which is
             else:
                 raise SystemExit, "error: " + str(msg)
 
+    return dist
+
 # setup ()
+
+
+def run_setup (script_name, script_args=None, stop_after="run"):
+    """Run a setup script in a somewhat controlled environment, and
+    return the Distribution instance that drives things.  This is useful
+    if you need to find out the distribution meta-data (passed as
+    keyword args from 'script' to 'setup()', or the contents of the
+    config files or command-line.
+
+    'script_name' is a file that will be run with 'execfile()';
+    'sys.argv[0]' will be replaced with 'script' for the duration of the
+    call.  'script_args' is a list of strings; if supplied,
+    'sys.argv[1:]' will be replaced by 'script_args' for the duration of
+    the call.
+
+    'stop_after' tells 'setup()' when to stop processing; possible
+    values:
+      init
+        stop after the Distribution instance has been created and
+        populated with the keyword arguments to 'setup()'
+      config
+        stop after config files have been parsed (and their data
+        stored in the Distribution instance)
+      commandline
+        stop after the command-line ('sys.argv[1:]' or 'script_args')
+        have been parsed (and the data stored in the Distribution)
+      run [default]
+        stop after all commands have been run (the same as if 'setup()'
+        had been called in the usual way
+
+    Returns the Distribution instance, which provides all information
+    used to drive the Distutils.
+    """
+    if stop_after not in ('init', 'config', 'commandline', 'run'):
+        raise ValueError, "invalid value for 'stop_after': %s" % `stop_after`
+
+    global _setup_stop_after, _setup_distribution
+    _setup_stop_after = stop_after
+
+    save_argv = sys.argv
+    g = {}
+    l = {}
+    try:
+        try:
+            sys.argv[0] = script_name
+            if script_args is not None:
+                sys.argv[1:] = script_args
+            execfile(script_name, g, l)
+        finally:
+            sys.argv = save_argv
+            _setup_stop_after = None
+    except SystemExit:
+        # Hmm, should we do something if exiting with a non-zero code
+        # (ie. error)?
+        pass
+    except:
+        raise
+
+    if _setup_distribution is None:
+        raise RuntimeError, \
+              ("'distutils.core.setup()' was never called -- "
+               "perhaps '%s' is not a Distutils setup script?") % \
+              script_name
+
+    # I wonder if the setup script's namespace -- g and l -- would be of
+    # any interest to callers?
+    #print "_setup_distribution:", _setup_distribution
+    return _setup_distribution
+
+# run_setup ()

From 0a344796c68ac40b4796d2c07fa3b37104a4157b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 01:00:40 +0000
Subject: [PATCH 0567/8469] Bump version to 0.9.2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index afd65545b4..16a3984b0c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.2pre"
+__version__ = "0.9.2"

From 8553e855805f2e75372d582f60ffc9517a91f01e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 01:23:26 +0000
Subject: [PATCH 0568/8469] Rene Liebscher: hack '_init_posix()' to handle the
 BeOS linker script. (With a worry-wart comment added by me about where we
 *should* add the Python library to the link.)

---
 sysconfig.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 2246327781..3774ab25bc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -255,6 +255,23 @@ def _init_posix():
 
         g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
 
+    if sys.platform == 'beos':
+
+        # Linker script is in the config directory.  In the Makefile it is
+        # relative to the srcdir, which after installation no longer makes
+        # sense.
+        python_lib = get_python_lib(standard_lib=1)
+        linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
+        linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
+
+        # XXX this isn't the right place to do this: adding the Python
+        # library to the link, if needed, should be in the "build_ext"
+        # command.  (It's also needed for non-MS compilers on Windows, and
+        # it's taken care of for them by the 'build_ext.get_libraries()'
+        # method.)
+        g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
+                         (linkerscript, sys.prefix, sys.version[0:3]))
+
 
 def _init_nt():
     """Initialize the module as appropriate for NT"""

From 18201c35b97437685a0cbf43a86e188d471f22e2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 01:24:31 +0000
Subject: [PATCH 0569/8469] Rene Liebscher: comment fixes.

---
 cygwinccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 2ac2678e73..f547d540f5 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -18,7 +18,7 @@
 #
 #   see also http://starship.python.net/crew/kernr/mingw32/Notes.html
 #
-# * We use put export_symbols in a def-file, and don't use 
+# * We put export_symbols in a def-file, and don't use 
 #   --export-all-symbols because it doesn't worked reliable in some
 #   tested configurations. And because other windows compilers also
 #   need their symbols specified this no serious problem.
@@ -32,7 +32,7 @@
 #   (ld doesn't support -shared, so we use dllwrap)   
 # * cygwin gcc 2.95.2/ld 2.10.90/dllwrap 2.10.90 works now
 #   - its dllwrap doesn't work, there is a bug in binutils 2.10.90
-#     see also .....
+#     see also http://sources.redhat.com/ml/cygwin/2000-06/msg01274.html
 #   - using gcc -mdll instead dllwrap doesn't work without -static because 
 #     it tries to link against dlls instead their import libraries. (If
 #     it finds the dll first.)

From bb458fa60d179f85c4290c807987cf8f93a52e1d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 01:28:33 +0000
Subject: [PATCH 0570/8469] Rene Liebscher: * reverse library names from
 bcpp_library to library_bcpp * move some code to the right places, to put the
 def-files   in the right directories again

---
 bcppcompiler.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 8ad9e4f2d4..2b73b12f0d 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -224,17 +224,6 @@ def link_shared_object (self,
             else:
                 ld_args = self.ldflags_shared[:]
 
-            # Borland C++ has problems with '/' in paths
-            objects = map(os.path.normpath, objects)
-            startup_obj = 'c0d32'
-            objects.insert(0, startup_obj)
-
-            # either exchange python15.lib in the python libs directory against
-            # a Borland-like one, or create one with name bcpp_python15.lib 
-            # there and remove the pragmas from config.h  
-            libraries.append ('import32')
-            libraries.append ('cw32mt')
-
             # Create a temporary exports file for use by the linker
             head, tail = os.path.split (output_filename)
             modname, ext = os.path.splitext (tail)
@@ -246,6 +235,17 @@ def link_shared_object (self,
             self.execute(write_file, (def_file, contents),
                          "writing %s" % def_file)
 
+            # Borland C++ has problems with '/' in paths
+            objects = map(os.path.normpath, objects)
+            startup_obj = 'c0d32'
+            objects.insert(0, startup_obj)
+
+            # either exchange python15.lib in the python libs directory against
+            # a Borland-like one, or create one with name bcpp_python15.lib 
+            # there and remove the pragmas from config.h  
+            libraries.append ('import32')
+            libraries.append ('cw32mt')
+
             # Start building command line flags and options.
 
             for l in library_dirs:
@@ -377,9 +377,9 @@ def find_library_file (self, dirs, lib, debug=0):
         # seems to have a different format for static libraries.
         if debug:
             dlib = (lib + "_d")
-            try_names = ("bcpp_" + dlib, "bcpp_" + lib, dlib, lib)
+            try_names = (dlib + "_bcpp", lib + "_bcpp", dlib, lib)
         else:
-            try_names = ("bcpp_" + lib, lib)
+            try_names = (lib + "_bcpp", lib)
 
         for dir in dirs:
             for name in try_names:

From 6d4ed7968e6a6ebde7b50b53361e180c1a1d8f2c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 1 Sep 2000 01:44:45 +0000
Subject: [PATCH 0571/8469] Rene Liebscher/Thomas Heller: * ensure the "dist"
 directory exists * raise exception if using for modules containing compiled
 extensions   on a non-win32 platform. * don't create an .ini file anymore (it
 was just for debugging)

---
 command/bdist_wininst.py | 42 +++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 78a5c9c573..d51ea0a851 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -63,6 +63,12 @@ def finalize_options (self):
 
 
     def run (self):
+        if (sys.platform != "win32" and
+            (self.distribution.has_ext_modules() or
+             self.distribution.has_c_libraries())):
+            raise DistutilsPlatformError, \
+                  ("distribution contains extensions and/or C libraries; "
+                   "must be compiled on a Windows 32 platform")
 
         self.run_command ('build')
 
@@ -103,21 +109,16 @@ def run (self):
 
     # run()
 
-    def create_inifile (self):
-        # Create an inifile containing data describing the installation.
-        # This could be done without creating a real file, but
-        # a file is (at least) useful for debugging bdist_wininst.
+    def get_inidata (self):
+        # Return data describing the installation.
 
+        lines = []
         metadata = self.distribution.metadata
-        ini_name = "%s.ini" % metadata.get_fullname()
-
-        self.announce ("creating %s" % ini_name)
-        inifile = open (ini_name, "w")
 
         # Write the [metadata] section.  Values are written with
         # repr()[1:-1], so they do not contain unprintable characters, and
         # are not surrounded by quote chars.
-        inifile.write ("[metadata]\n")
+        lines.append ("[metadata]")
 
         # 'info' will be displayed in the installer's dialog box,
         # describing the items to be installed.
@@ -129,27 +130,28 @@ def create_inifile (self):
                 if data:
                    info = info + ("\n    %s: %s" % \
                                   (string.capitalize (name), data))
-                   inifile.write ("%s=%s\n" % (name, repr (data)[1:-1]))
+                   lines.append ("%s=%s" % (name, repr (data)[1:-1]))
 
         # The [setup] section contains entries controlling
         # the installer runtime.
-        inifile.write ("\n[Setup]\n")
-        inifile.write ("info=%s\n" % repr (info)[1:-1])
-        inifile.write ("pthname=%s.%s\n" % (metadata.name, metadata.version))
+        lines.append ("\n[Setup]")
+        lines.append ("info=%s" % repr (info)[1:-1])
+        lines.append ("pthname=%s.%s" % (metadata.name, metadata.version))
         if self.target_version:
-            inifile.write ("target_version=%s\n" % self.target_version)
+            lines.append ("target_version=%s" % self.target_version)
 
         title = self.distribution.get_fullname()
-        inifile.write ("title=%s\n" % repr (title)[1:-1])
-        inifile.close()
-        return ini_name
+        lines.append ("title=%s" % repr (title)[1:-1])
+        return string.join (lines, "\n")
 
-    # create_inifile()
+    # get_inidata()
 
     def create_exe (self, arcname, fullname):
-        import struct#, zlib
+        import struct
+
+        self.mkpath(self.dist_dir)
 
-        cfgdata = open (self.create_inifile()).read()
+        cfgdata = self.get_inidata()
 
         installer_name = os.path.join(self.dist_dir,
                                       "%s.win32.exe" % fullname)

From 47192a5d2460a813c4a177c8a2d27339c7fbecc1 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 6 Sep 2000 02:06:27 +0000
Subject: [PATCH 0572/8469] Typo fix.

---
 command/build_ext.py | 2 +-
 command/build_py.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4d779b8264..3f714c54d8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -55,7 +55,7 @@ class build_ext (Command):
         ('build-temp=', 't',
          "directory for temporary files (build by-products)"),
         ('inplace', 'i',
-         "ignore build-lib and put compiled extensions into the source" +
+         "ignore build-lib and put compiled extensions into the source " +
          "directory alongside your pure Python modules"),
         ('include-dirs=', 'I',
          "list of directories to search for header files"),
diff --git a/command/build_py.py b/command/build_py.py
index 66f50241c1..5fcd18e788 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -20,7 +20,7 @@ class build_py (Command):
 
     user_options = [
         ('build-lib=', 'd', "directory to \"build\" (copy) to"),
-        ('force', 'f', "forcibly build everything (ignore file timestamps"),
+        ('force', 'f', "forcibly build everything (ignore file timestamps)"),
         ]
 
 

From 1565bb9efd2c7943171ecd4c07774d02d6785038 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 6 Sep 2000 02:08:24 +0000
Subject: [PATCH 0573/8469] Reorganized logic in 'get_file_list()' so it's
 easier to read, and fixed a   bug to boot: now works even if both MANIFEST
 and MANIFEST.in don't exist. Don't hardcode setup.py, use
 'self.distribution.script_name'.

---
 command/sdist.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 06c8f1cb10..1bf297fdcb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -219,10 +219,14 @@ def get_file_list (self):
         #      do nothing (unless --force or --manifest-only)
         #   4) no manifest, no template: generate w/ warning ("defaults only")
 
-        # Regenerate the manifest if necessary (or if explicitly told to)
-        if ((template_exists and (template_newer or setup_newer)) or
-            self.force_manifest or self.manifest_only):
+        manifest_outofdate = (template_exists and
+                              (template_newer or setup_newer))
+        force_regen = self.force_manifest or self.manifest_only
+        manifest_exists = os.path.isfile(self.manifest)
+        neither_exists = (not template_exists and not manifest_exists)
 
+        # Regenerate the manifest if necessary (or if explicitly told to)
+        if manifest_outofdate or neither_exists or force_regen:
             if not template_exists:
                 self.warn(("manifest template '%s' does not exist " +
                            "(using default file list)") %
@@ -273,10 +277,7 @@ def add_defaults (self):
         else is optional.
         """
 
-        # XXX name of setup script and config file should be taken
-        # programmatically from the Distribution object (except
-        # it doesn't have that capability... yet!)
-        standards = [('README', 'README.txt'), 'setup.py']
+        standards = [('README', 'README.txt'), self.distribution.script_name]
         for fn in standards:
             if type (fn) is TupleType:
                 alts = fn

From 6df7b0fff005b77bbf39fc0dc1c0e50284d60ede Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 6 Sep 2000 02:18:59 +0000
Subject: [PATCH 0574/8469] Bullet-proofing of 'make_release_tree()':   -
 'mkpath()' the distribution dir in case of empty manifest   - warn if empty
 manifest   - detect, warn about, and skip non-regular files in manifest

---
 command/sdist.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 1bf297fdcb..6de703ec92 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -405,9 +405,11 @@ def make_release_tree (self, base_dir, files):
         to be distributed.
         """
         # Create all the directories under 'base_dir' necessary to
-        # put 'files' there.
-        dir_util.create_tree (base_dir, files,
-                              verbose=self.verbose, dry_run=self.dry_run)
+        # put 'files' there; the 'mkpath()' is just so we don't die
+        # if the manifest happens to be empty.
+        self.mkpath(base_dir)
+        dir_util.create_tree(base_dir, files,
+                             verbose=self.verbose, dry_run=self.dry_run)
 
         # And walk over the list of files, either making a hard link (if
         # os.link exists) to each one that doesn't already exist in its
@@ -423,10 +425,16 @@ def make_release_tree (self, base_dir, files):
             link = None
             msg = "copying files to %s..." % base_dir
 
-        self.announce (msg)
+        if not files:
+            self.warn("no files to distribute -- empty manifest?")
+        else:
+            self.announce (msg)
         for file in files:
-            dest = os.path.join (base_dir, file)
-            self.copy_file (file, dest, link=link)
+            if not os.path.isfile(file):
+                self.warn("'%s' not a regular file -- skipping" % file)
+            else:
+                dest = os.path.join (base_dir, file)
+                self.copy_file (file, dest, link=link)
 
     # make_release_tree ()
 

From 9f06911a43f19a6b026ffb25fbe8858d330b1e69 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 7 Sep 2000 02:38:42 +0000
Subject: [PATCH 0575/8469] Typo fix.

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 026a3ba4d5..daf55b766a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -43,7 +43,7 @@ class bdist_rpm (Command):
         # info in setup.cfg, although they are of course free to
         # supply it on the command line.
         ('distribution-name', None,
-         "name of the (Linux) distribution name to which this "
+         "name of the (Linux) distribution to which this "
          "RPM applies (*not* the name of the module distribution!)"),
         ('group', None,
          "package classification [default: \"Development/Libraries\"]"),

From c8a74343d6d9f35457e17ff5dbf40f15ac533ec7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 7 Sep 2000 15:59:22 +0000
Subject: [PATCH 0576/8469] Changes: distutils/command/bdist_wininst.py: - the
 windows installer is again able to compile after installing   the files.
 Note: The default has changed, the packager has to   give
 --no-target-compile/--no-target-optimize to NOT compile   on the target
 system. (Another note: install_lib's --compile   --optimize options have the
 same semantics to switch off   the compilation. Shouldn't the names change?)
 - All references to specific python versions are gone. - A small bug:    
 raise DistutilsPlatformError ("...")   instead of     raise
 DistutilsPlatformError, ("...") - When bdist_wininst creates an installer for
 one specific python   version, this is reflected in the name:    
 Distutils-0.9.2.win32-py15.exe instead of     Distutils-0.9.2.win32.exe -
 bdist_wininst, when run as script, reads the wininst.exe file   and rewrites
 itself. Previously this was done by hand.

misc/install.c
- All the changes needed for compilation
- Deleted a lot of debug/dead code
---
 command/bdist_wininst.py | 571 ++++++++++++++++++++-------------------
 1 file changed, 298 insertions(+), 273 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d51ea0a851..0ebc566838 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -25,6 +25,10 @@ class bdist_wininst (Command):
                     ('target-version=', 'v',
                      "require a specific python version" +
                      " on the target system"),
+                    ('no-target-compile', 'c',
+                     "do not compile .py to .pyc on the target system"),
+                    ('no-target-optimize', 'o',
+                     "do not compile .py to .pyo (optimized) on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
                    ]
@@ -32,8 +36,8 @@ class bdist_wininst (Command):
     def initialize_options (self):
         self.bdist_dir = None
         self.keep_tree = 0
-        self.target_compile = 0
-        self.target_optimize = 0
+        self.no_target_compile = 0
+        self.no_target_optimize = 0
         self.target_version = None
         self.dist_dir = None
 
@@ -46,10 +50,6 @@ def finalize_options (self):
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
         if not self.target_version:
             self.target_version = ""
-        else:
-            if not self.target_version in ("1.5", "1.6", "2.0"):
-                raise DistutilsOptionError (
-                    "target version must be 1.5, 1.6, or 2.0")
         if self.distribution.has_ext_modules():
             short_version = sys.version[:3]
             if self.target_version and self.target_version != short_version:
@@ -66,7 +66,7 @@ def run (self):
         if (sys.platform != "win32" and
             (self.distribution.has_ext_modules() or
              self.distribution.has_c_libraries())):
-            raise DistutilsPlatformError, \
+            raise DistutilsPlatformError \
                   ("distribution contains extensions and/or C libraries; "
                    "must be compiled on a Windows 32 platform")
 
@@ -137,6 +137,8 @@ def get_inidata (self):
         lines.append ("\n[Setup]")
         lines.append ("info=%s" % repr (info)[1:-1])
         lines.append ("pthname=%s.%s" % (metadata.name, metadata.version))
+        lines.append ("target_compile=%d" % (not self.no_target_compile))
+        lines.append ("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append ("target_version=%s" % self.target_version)
 
@@ -153,8 +155,15 @@ def create_exe (self, arcname, fullname):
 
         cfgdata = self.get_inidata()
 
-        installer_name = os.path.join(self.dist_dir,
-                                      "%s.win32.exe" % fullname)
+        if self.target_version:
+            # if we create an installer for a specific python version,
+            # it's better to include this in the name
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32-py%s.exe" %
+                                           (fullname, self.target_version))
+        else:
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32.exe" % fullname)
         self.announce ("creating %s" % installer_name)
 
         file = open (installer_name, "wb")
@@ -175,291 +184,307 @@ def get_exe_bytes (self):
 # class bdist_wininst
 
 if __name__ == '__main__':
-    import base64
-    file = r"..\..\misc\wininst.exe"
-    data = open (file, "rb").read()
-    bdata = base64.encodestring (data)
-    open ("EXEDATA", "w").write (bdata)
-    print "%d %d" % (len (data), len (bdata))
+    # recreate EXEDATA from wininst.exe by rewriting this file
+    import re, base64
+    moddata = open ("bdist_wininst.py", "r").read()
+    exedata = open ("../../misc/wininst.exe", "rb").read()
+    print "wininst.exe length is %d bytes" % len (exedata)
+    print "wininst.exe encoded length is %d bytes" % len (base64.encodestring (exedata))
+    exp = re.compile ('EXE'+'DATA = """\\\\(\n.*)*\n"""', re.M)
+    data = exp.sub ('EXE' + 'DATA = """\\\\\n%s"""' %
+                    base64.encodestring (exedata), moddata)
+    open ("bdist_wininst.py", "w").write (data)
+    print "bdist_wininst.py recreated"
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCiqWey66NM4TkqYAADIzAAAAoAAAJgEA1v+/
-/f9TVVaLdCQUhfZXdHaLfAi9EGBAAIA+AHRoalxWbP/29v8V8FANi/BZHll0V4AmAFcRbP833//Y
-g/v/dR5qD3CFwHUROUQkHHQLV9na//9VagX/VCQog8QM9sMQdR1otwAAJHT/T9itg10cACHGBlxG
+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
-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
+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
-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
-AACAAAAAAAAAAAAAAAAAAAABAG4AAAA4AACAAAAAAAAAAAAAAAAAAAABAAAAAABQAAAAMJEAAAgK
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABABrAAAAkAAAgGwAAAC4AACAbQAAAOAAAIBuAAAACAEA
-gAAAAAAAAAAAAAAAAAAAAQAJBAAAqAAAADibAAB+AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA
-CQQAANAAAAC4nAAAbgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAD4AAAAKJ4AAFoCAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAAIAEAAIigAABcAQAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAD00QAAvNEAAAAAAAAAAAAAAAAAAAHSAADM0QAAAAAAAAAAAAAAAAAADtIAANTRAAAAAAAAAAAA
-AAAAAAAb0gAA3NEAAAAAAAAAAAAAAAAAACXSAADk0QAAAAAAAAAAAAAAAAAAMNIAAOzRAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAADrSAABI0gAAWNIAAAAAAABm0gAAAAAAAHTSAAAAAAAAhNIAAAAAAACO
-0gAAAAAAAJTSAAAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRsbABDT01DVEwzMi5kbGwAR0RJ
-MzIuZGxsAE1TVkNSVC5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVz
-cwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAA
-ZXhpdAAARW5kUGFpbnQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAIAAAAgAACABQAAAGAA
+AIAAAAAAAAAAAAAAAAAAAAEAbgAAADgAAIAAAAAAAAAAAAAAAAAAAAEAAAAAAFAAAAAwoQAACAoA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAGsAAACQAACAbAAAALgAAIBtAAAA4AAAgG4AAAAIAQCA
+AAAAAAAAAAAAAAAAAAABAAkEAACoAAAAOKsAAH4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJ
+BAAA0AAAALisAABuAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAAAorgAAWgIAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAAgAQAAiLAAAFwBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+APThAAC84QAAAAAAAAAAAAAAAAAAAeIAAMzhAAAAAAAAAAAAAAAAAAAO4gAA1OEAAAAAAAAAAAAA
+AAAAABviAADc4QAAAAAAAAAAAAAAAAAAJeIAAOThAAAAAAAAAAAAAAAAAAAw4gAA7OEAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAOuIAAEjiAABY4gAAAAAAAGbiAAAAAAAAdOIAAAAAAACE4gAAAAAAAI7i
+AAAAAAAAlOIAAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkz
+Mi5kbGwATVNWQ1JULmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdldFByb2NBZGRyZXNz
+AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABl
+eGl0AABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
 """
+
+# --- EOF ---

From b5474c8672e2a3114d5225e07dfc855424ddc737 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Sat, 9 Sep 2000 19:52:49 +0000
Subject: [PATCH 0577/8469] The windows installer must also look under the
 HKEY_CURRENT_USER key for python installations, not only under
 HKEY_LOCAL_MACHINE.

---
 command/bdist_wininst.py | 480 +++++++++++++++++++--------------------
 1 file changed, 240 insertions(+), 240 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0ebc566838..5e94047c13 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -201,7 +201,7 @@ def get_exe_bytes (self):
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
 ZGUuDQ0KJAAAAAAAAADqs5WMrtL7367S+9+u0vvf1c7336/S+98tzvXfrNL731Hy/9+s0vvfzM3o
 36bS+9+u0vrf89L7367S+9+j0vvfUfLx36PS+99p1P3fr9L731JpY2iu0vvfAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwDytrc5AAAAAAAAAADgAA8BCwEGAABAAAAAEAAAAJAAAPDUAAAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwBmkbo5AAAAAAAAAADgAA8BCwEGAABAAAAAEAAAAJAAABDVAAAA
 oAAAAOAAAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAA8AAAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAw4QAAcAEAAADgAAAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -214,7 +214,7 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCgXl0CO4+gFz0bYAAPA0AAAAsAAAJgEAyf+/
+bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCjUEmknnJr9G0bYAAAU1AAAAsAAAJgEABf+/
 /f9TVVaLdCQUhfZXdHaLfAi9EHBAAIA+AHRoalxWbP/29v8V/GANi/BZHll0V4AmAFcRmP833//Y
 g/v/dR5qD5SFwHUROUQkHHQLV9na//9VagX/VCQog8QM9sMQdR1otwAAJJD/T9itg10cACHGBlxG
 dZNqAVhfXr/7//9dW8NVi+yD7BCLRRRTVleLQBaLPXg0iUX4M/a79u7+d0PAOXUIdQfHRQgBDFZo
@@ -222,244 +222,244 @@ def get_exe_bytes (self):
 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
-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
+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

From fdee9cba1357af7cf490d43b5a994fb215155582 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Sat, 9 Sep 2000 21:15:12 +0000
Subject: [PATCH 0578/8469] The installer now displays info about version of
 distutils used to create the distribution and the creation date.

Takes care of the extra_path argument to the setup function,
installs the modules into <prefix>/extra_path and creates
a -pth file (like install_lib does).
---
 command/bdist_wininst.py | 541 ++++++++++++++++++++-------------------
 1 file changed, 278 insertions(+), 263 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 5e94047c13..2e535d51ec 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -84,6 +84,13 @@ def run (self):
 
         self.announce ("installing to %s" % self.bdist_dir)
         install.ensure_finalized()
+
+        # save the path_file and extra_dirs options
+        # created by the install command if an extra_path
+        # argument has been supplied
+        self.extra_dirs = install.extra_dirs
+        self.path_file = install.path_file
+
         install.run()
 
         # And make an archive relative to the root of the
@@ -136,14 +143,22 @@ def get_inidata (self):
         # the installer runtime.
         lines.append ("\n[Setup]")
         lines.append ("info=%s" % repr (info)[1:-1])
-        lines.append ("pthname=%s.%s" % (metadata.name, metadata.version))
         lines.append ("target_compile=%d" % (not self.no_target_compile))
         lines.append ("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append ("target_version=%s" % self.target_version)
+        if (self.path_file):
+            lines.append ("path_file=%s" % self.path_file)
+        if (self.extra_dirs):
+            lines.append ("extra_dirs=%s" % self.extra_dirs)
 
         title = self.distribution.get_fullname()
         lines.append ("title=%s" % repr (title)[1:-1])
+        import time
+        import distutils
+        build_info = "Build %s with distutils-%s" % \
+                     (time.ctime (time.time()), distutils.__version__)
+        lines.append ("build_info=%s" % build_info)
         return string.join (lines, "\n")
 
     # get_inidata()
@@ -198,287 +213,287 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
-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
+vb37yAONRfBQ3GaLSAoDQAxRYdj70HuESn38GQNQ4XVvppQ7+HUJC1Sdhy+U7psOVmoEVhBwhIs9
+VN/X4CKQhg9oOIk8mu3WNusmrCsCUyp0U8/3W9uuCCV2CDvGdRcnECjChmYwhJURM8B8ti385FvJ
+OFOLXVKLIVeh2B4W/kYIZj0IAFGeADiayG1uu13sUOjWP+JMEDZXyLbLVrgiEkC7CMwWXgbYtvvP
+3SVoqFgq8VCJXdQtFoze+/7CjVrAdHf/dChQaJCfGUtbutvnBBeslXQTGg18kvLPde4E0JH2IR8W
+PIXAHrqBHGTcXADGX8M7xrpmfev/dhbpU6Hcbrh7cyOXXuvZ04HsGO2LTRC/4e/o2QxWfAv6jUQL
+6sQrSAwrz4Pd9v+N6WbRA/qBOFBLBQaJVfTuSi6D337c/mUQAGaDeAr9jjMrA4sZi0wfKrbZfv+N
+BB+NNBED8y4BAisegT4L/R2f7QMENxLHLpKNFB8Pv1ge3f3ttk3wBlAgA0AcA9MDx36NPBC31n67
+DUYcA1YaA8gDdlSKGh5shMYv7I2F6P6dXfQLgi1f92iw7lDM7hAfO9O72fRQjYQFDRdMGlDMbmFz
+GyUDAPAeDGG/DdjJSwRdV+hGFIC8BefCx+R3G1x0MP91FFhQ2JtrMLshAIZuFBsC7KmwM79WfAID
+EzmDxLjdrqNhGPhAwfzSClA4ar7WuY0GQRQhEv8aFTmNw8ntBozPV9KaXF/6buvr94sXBEQRigiE
+yf2A+S912Lcz/gPGAFxAde9zQFwMD3QXdiPdDI+cQclEYVIF49gbrU4KC8BXUBRAYfPfbAXHcUoM
+PGoKmVn39222/PkzyWi0cFEAHmi8AgAN0SyZhi80KyhQbramtjLXGg0UFSS+4IloS0fYBFYZWVAu
+DwF2ct3dIB0sGP/TaCnXKN7XDuw4YCMKARXTqZw5070LXyCfnjhdY2vN9PH2wj7auLC9+7YABgA9
+/OFOdHCBBRB42jHLZ6OKfQjfYTR8+E/nBgDHBCSAm78A8P/Ac7jfwfDyNUwF0xrtW7s0CugDPzrW
+aECKFjayOdho/QwAnQAEX4Rr966N/SdrgXgIOM11GQ9875ltah1wqXRcSA0HZs0prXlq8FuE2CBc
+d2My1m0vtQs4i/gFBPyLyFT037gtvBEr0CvyUg/4K+MDwVKZs8bW8SvC0fgY8BX46A0djcgIEVgF
+AQgoF3gHZoPoTlc1+QEGB7o/Z4stZB4tRH66O8PCSBUmtSgcvv7RZtF6s7UYERTB6BBIxzG3W9gK
+CK6fYDBoUOgjw4cGumgegBLTPwi3IPlHsj0bFgEz21NTaIuWgcadFdU7w4nFkd8WbOFIU0mGFFpU
+6gP3Di8IJDwe/RLwdiBYiCX8oBR1Q/hsjKwPKE+oaO/JsB1GjRWwDODO08wU5BYKYJouzGHfElhr
+lSQYaJmT2Hew29i0wJ02U7tMUwvC++nxuOCeDpgigD0MQM3Os9cZMB/uaApBJlvWJVOTYop0g0iP
+QMJU7dt0Wm6QzyIciY3qXezmLhiQJjxxUCocYXedC7NEWAIyAxzwZsTcaCwb3qxxWHb4bLWwEGgT
++nEYDZcB60XgIJQ4xWGEf3Yz/1dXYGjSY2HDw28UaHUEZOu0ImGMcANXJFazjnKy4Sy2W4EGK2+F
+G7j4U+WoGQACdouRtlySI/zCAJxaqaEddAcwdgrkALdootArTWmYSfRQiixbM/Un+ARNvMZZm/X5
+ymVoWWPZcgbdEPw2Ly9QooEGOEQ9TZhRM9uLH19AMic2nFOkZ3OpUL1I/4Bx1rN10tZeEGQSAXzX
+tKR5toLoKfj+VDabna0/YuzHIKr7NluyxjXs8P1OU7W972Wg8PCwCAgfsLtmmxsMrFk36GiadA+s
+C9j3GPzyhBsDL1ZwoFISRroQZNcLDr8EESe5QboCDFO9mZ+zXuCapukt8QK6PUVqaGFWorzxAgQA
+L3XLmcM2EC1o7BBMTW6D21EQEWSPDIodBwETWCJlNbtoDI5Aks387kxyBvzuub5kQ1VNiPG3x90L
+WAg9MdB0KT1km6kBNgthNQP9NRQjYPrTv11XiTXEOe+AMdJG3bjfEVwBDVhXDWGk8sDukFf3xuhm
+vh0PaH8eEbf0XVdr4H3OPKAAu6DVOL0zMIGCPsWoMSo9+/3/NUCaBcCJTgLXB3vf7m45OT28EKPk
+nwR0EmgcN7HJ3e3v1iIMkVke0JsZE2gAw+5ZIUcav2CYi8fOs30tw7icFg8ADKvD4pkGRP66Ylh2
+tpD8EFcMDfslu4D4cSBo5HFx870knB5Q0xAv4HpNcqsuMGEYiJ8sHHi6LA2+KOsaaN6/SbnEK6Rh
+DeeDJfJ404w2s1mL2VGDPaTVRatgChwHQn+HCLOyZXNyo/PYPjFZdkDk+IWMBQV32OhV6+hVaxNA
+rvWecDQaEAfjCWjgNM/8cujszRiva9s610wFicjTzhCOkY222iJZwP5XYmBvuXVXmV9Zw2dMAaGU
+Fq41cmCBOy159X+jo78GcgRB6/YPt8HB4BDjscWjMr0su83X2acHG1Ox11a9HFZVEH7htS5BFKlR
+LXRV/zb/MpY44I1v13PuE3BvXQ8kCpQkcHzybdkEugQmEMdKPADuTwkci3YE66eLK16009tagcS9
+1McjWt+FFlNWqgi+CnTrNZqjt8wIUFEJBVlycbYw8vdIbaHJwtsn/xW6GJroxT4w2waIHSOfo13J
+mKgr8J0SVts6m3Q0FCNqG3DWRSye26JcnWx73VqYzBuTU71bnhBQhy4Wh3cMzUf0hraYsWut/khI
+0RF8m5Zl2QJcQghwxQ9pcMDQCn87+LHMamDIh128Wcle3SEV1lJXoBBYRrILGetvwY11wrM7p1hq
+MBhohItwzAj8mzO16ztqLpP4yXqtsQUqqyUWdueAQm5wlG7rtF8ZeOMLDZdX2IvDW6NhEhtKCHfE
+DGv2MY6AsIkGXFmJRgQDJl58jBVew6GgVG+2G/DadEnZe9N0QwQBwXRs3PlqIyZ046hTvzXeBtYY
+BnQWkwYHD5XBSRh4//6D4QJBi8GjQuvHxwUHpnjf0A7eWHnDaiRojDyT+k/mx0DoBl732BvAQJmW
+qaeJHAiEM8/kuI5mox3k1oMfCmTmzDQNiAmMIpAxmvDr21/X9idrcKRtdbc95XU69LnC6ITBFOsl
+reCQKWQEXXTt0l23JGoLMY19xI7zqwY2F7rE9IkJq6vKnGAMq1Ro28YakBOMG79wpdZcwnldwDCJ
+L+vbZqoBvbcc3OEU5tbeDvgb2FYVByLMazp3amvkH/DXKxJsXDJ2ZyBjFkAZ9G2TS06eFhr4bu0a
+0M5XIJ9vf4w0TGyO7lx8mM8FlPK2327ZBayMf5Agm3W0ArwwT21bqA+k/ooYgst0HROABA8ZYmZz
+vAjcHJgR8eAfD01jE6dZo1NDhqHwhBVhZtgXk8tvBnkrFB/InrpwPYkIjxM22/aQdegG+DK9IWpQ
+u8S/D3y4ab7ks9x0yddVaj9Ziwfba0s/Imhs4Qex2WzQHBWkAGdzQroYxAAQQIpkyGKTvA1SAN4C
+DGSw2aAP7sSZ2dJYE6MwGHkzkZKQKkcKaFB7bgkZgF2Am3jSw+ln5mzRFQtQowcrsWASZRCunWg0
+Kh29oTd2hUrGK3B2i6RgVeSQbMCSYdAt8OZVeXv7/0+A+Vx1RIpIAUAIMHzoBDN+Ftn+O2Bu/nJ1
+2cYGDUbr0wUKNrBlYPR8DlEu8GBzvwZHPAryH4gGUh+tFAV+rYgORkDIeX1nxINPU1FTfJYDiZFO
+uFb67ieIByM2uhiD+ytS/EhE4RGlZAzUEwGMcAY7XtGCdMQbMATFUaK1HC+XlxQGGIEJYKMkt2v7
+j9FVCAuNTALqVytBEAIMM2johngegTk9jTQQbQAuzPaGEXlWNBILnZB4vb/NjJW7BD3+K35m+hZm
+Aed1ks6GUrmT6s7cGWytWM9nI+2aFAdIdf5oGj1Ei1CBix9CPS/oOG0l4Aa9AsDgVi5o08LINf8Y
+MYzY+1cJK8ZJ+i1t6x5oKHUS6wejUgSpuQ1AGwcOQZpguChsRy59GTBRVtTYA9x7rh1L0xRAqeTg
+uwB/WpwtNlPTDeyVkCzTgDOPndYwLjZX23vYu4TEIviWJXSajR1hsxdWgnVYdCwg8ZQX/djvNseB
+fPh1VsKMPG5rDQcOsBEM/RAEQu3Eawstc66AzmyOyHgaCnwRhnAnnIDIzACOX7b//zPSO8JWdDOL
+SBw7ynQsiVAUAggYi3EMblts//feG/ZSg+YHrDHXHCAUUdj6FRsIHAwnXsKTuB007GuU/wiQAD0I
+79pCF8E6mRzUVE4khcmudUQrPU0KlD/WYnPLKiwIHhooaKcBzC3dJA3HAABU2dhBc5/pcjvHHfds
+7IqtigENVjrBUufObDfIRRg4Ctx5b6YW+ww793UKP+CJZCCJfr/hrbUYOhNgILA7f34oOX4kda60
+M7cHDiTQgWoYNIRJura5INIniYY+/C8s9EYKEIl4lVYXz4l6/ftdgwy5tPfZx0AMAXj5CHxZu8DX
+vQQPf1QfuBHTIkoQUrf/C1vXUTfaG9JQ99KB4oA6ZVJWvQZyDzSMGShBT5a94gtvehR1D9NubNY9
+vnTsdwtWG8nZkhGeX7j6aRAAsFBGoq8QHwTdQkRwJHZWA6E+8C9stgAI8ItUIzPbg/oEv/tD+/cN
+BJXDS70FweP7iVwZiQ9/4tsIyA0Ph8SDJI3QKxkEbaPZCrY9iEkeiQ341lpsEAg/LwWLDooR3WLj
+2xwENRYQBFcPQudK32jFLhZ0Fcc4Vd27W+YFbBjsdUXroiKLUA7sxu0QwekowQhddhgk2K+1HUxq
+F+4XBb1ctGieBBFIuvxt7W2Dd0B2i14cC3kGeqH2uIm9HwMTH4tDBO69/xfZCAPB9/WF0nQhxwNW
+lNH45Oli3V/AaPbBIA07m9slgWMpByb8KOCIHNhE2h083wsUDDKkNf11GKMCsxOFYFXzfyx221pX
+WgKSIgFPaQJzlmpLbaAzjeg1Uh2bc5EeEkRUDPkLvOSbbdgMOeMILQLNvWDOY+Tt4Uq15xpv3MHh
+GEgL5Ek4FFqyNAnrO6Ew1m6DSEKJBjocFJAG7G9dgUg34hADyolIOQpILpJLvgibLblkC4Q2P5Y5
+3Jg5SDQSNoLZDBHr5TNZ6QMhIAeopP3qh2xoAnUJi8ecwgg7OOeWp2dyamOk3ZnMQhZQR27HAQNb
+QniAORZITzeKOVuWhgobUOHRPlZMcoAcAgQO0oQdQpggiSizSAgpYSEfyV6zXXhOMPMGuPg7GKZh
+GWksmHCwbDYrACVqbEm+rQD9DEMBKf3bL+aWBjgLByhMftymWXYDdCqu7SgrD5pmuewD9ShiKZfR
+CwRepukbrLhbf24NPJDTV78FejyJbSkKHEN09wQPDd5obwQFdQ6+60coUpnY9daBV8p1BnUNPldR
+brwjG+ozzCjH8gFGNGtBYNsCMA447lEImjDQZyB0Dlm80NSw7dYfYEcwwMN/Oteoz9dtalpkYyBo
+0VQNzrj2q5Cj0TvDw4tPKAZJVYEDzjQaX9lIzEp3fYtXKIyQydgGuMfDckBWUCidzkFzKB+fK1GQ
+sAbOHi6iNvDWjWgCkgPYHoleLBJDYra8OMgERzaPkCyqMoPsMDhTa6C16G84PPspQ7JB21pjaxJI
+Lkv/awt9K4IQMFY7yINUChWAa8u/RHMFK8FI6wUsBx4P/ly+jAOD+AkZDIXsOUDYVKLX+hiD/QNz
+nD0st33D9ZYNxuRIig/HFEyUdd3f/4vRi83T4oPFCGML8kcxiTiJAv/23i9yzusEN6+D4AeLyNHo
+tR1039oBZB5LGHeRYxSkg/7bs8DtAxkBzRwHwe4D0+4r6a462PQ/sx1+QUha7G4L7SBSjbCEjQ0w
+UQ44UvS6hk/OOtwkXCE0+KDE2zVzUQ8sUhDe5ivQfRAr3BSJrrXvxczYc1xYcQZhDm/IgRQD+P3c
+unjrWBTOIHMsqfr6oAYuW6DhP0wsT/Z84jeRe0AnlnLUi9aLzhZ4V2qC4Qdy6hAz0a+iurW3/zjt
+i8E7xfoEiWxcSyYBW2LYQYuJA+lM0heMlnBuvCrHTMm6ccN37Yt8GkQ71nUjv4t7KOG7xm8tdBmL
+1zuxFXMHK8JIV92x7UJkK/JziTV1Z7RMjYYvdEFIBFOJUzQHOwCs+2JrB0cwatajTDocbcPbMSvK
+Sf9LLAcEkJHv9j5VdSBi99Znm9x88k6LzsKLyKReoWGYcLALBclp6N5gdp3CO8EFwT4U+yUWqkSn
+0YEC86WLyi07PH6hHN8DK9DzpNpcJbvRtrdEA1INS10V8CsMgqEzXRaJeBwpAYcLNtdoXWQYDUEg
+jzEEKpYOczgyxlVyMg6S0mJzdB8l/z8lyCCYH2Ohb9mHHQbW0DzgCGuom7uB+qAFE/IF/QV9zgHf
+YB9GjYQIAvR3s3GWbgNIKPlQYQxx4o3njQUOSA7HQ27T2Ns08ATrCK5xU5K60OhGCBEKg2Itc2im
+kt95WTK+NAYDOiItTCwITrGL+/GpJfygVUsMxQSRYXOF1mAICAOGame9H3YPcpgwuBOhyHMhPBXe
+a5M0xzFpNaCXttPNNyBy33AaJG9DEJyhwdKNU1FSNFfxteJs2uNQUTPsIIVsm9nwhSH7COYFGD58
+hU9l0DTiHzd24u0sNQJdD4N70ln2fjz6O+hzM+NKOwXr+mjuvbb5Spj29PnpWHNDB/ou+c2Lye/g
+r0QmuRQjxuZUwQGNbbWia+Y0GPpVEFxru92XNHMbySvq0QxFhNvhGhYSinFApDcjQCMeX+h3ErnN
+dAMz8oPoEs0vuUs8WSsk+AsfwAs7boE87OlzO5ngBB89GjmwMJ3pyeyNfneufHdViwyNqSPOJu+1
+WnsOFGLUkBsuI5wa1xUc4YwK3Wr1dB4DGSqHqYml3Ot10yo5EOkxd6FGmfCCkxUNXSp8c9odivzr
+AgCoDEFIaA+/ZVSP/HX1d4leere9TByChZgVQCQmM2b6QFFQQI3fCSzXcK1jJFESUjw2Oz9ko4D7
+UUIFATxrzxSHedZAZQkHQAYPaXqcZTlMJB8VTA8HpjokX8ol04BrszTPdz2fPGMIbN8gKxx5UKRO
+tpDluYRXBAQGKQsLPMBID3Neazwwq4stWpfYBNArnTl48XU4A1ZM6M7FqWerTe5LLASimWdrnXtA
+dFaLF2dXXbZUAB0nQaLwgE0+DSOJQ8GZGLEpzCH5WgmkGInSAJhLsoEsAKGdtl7bOM+LJmialtrp
+WnOv7ZVMUXeF2hew2yGXBJChMwYwbRzasMPgUVxh/W7WeDPLMxhodj9VUbAffnvy5Ndq/SvRwwPq
+UE7tya5kS0yNMYtpOcLmGpZR0CsBZpLqL0sg2y0VUlE6Q4Vv2bc2MmrHQRhIg0vM/VhrRkBISFGJ
+eQRGRDhwhCEYEUsg6BFco02zrPKEp2BvEGaEFVLIxoCL90hUysShE5/PAM45QQSTivcM7luHK/cD
+7oNRT9ESTAkEWLhFD2HB0BOfz55q/IZCCIRQlHmQCu+QkiSMzytIIAUSjhhjhM3enf11BlulRMEW
+2QEYUag6I0KyjtciaJQUfCpjhC2euw5c1rWRUt1QBpeQZhA1zwjaVsgkuP6B/ToXgiFfJEwSDthC
+EOwYUoTYI5QFPgk7lZI3UlxIUFJ4vd6zpgcMQKZmLCd0d+dBUFZTdEtTQpt7j9F0N6F76CA3pcrf
+Pi6JVgR/UCvVi24I4yDfSrZufT5mCN8jYxwYMUMui8dMVluDVgtVxWNDS1bppZAmmTudEJAOIZig
+EhhCmJcNGJG+mhBkU0+w/insNdZFQ0gqQ7nctuj/lC0wLgMALyswLpfLZtrBMRA0tzgeOeyarlli
++CcWeAP5NOCSYgYb7wwHaAQbogxqJxjClaIAR1hpjXIBnt2LWEYoGHCA83sNGAhXY6qxwA7pT7cG
+3IhBu+/ddQrsvYsNesIMk1z52w+G78XvHd8RVYH7sBWZw3IFuAgr2KIVf9yCD4yhrejB7dt3UYjf
+YRCKFoPGG6xW8QM55JCz+Qjy8/TkkEMO9fb3kEMOOfj5+kMOOeT7/P0bbOeQ/v8DTbxkdYaiBJ8J
+FRZ3K/W2EkYTSHX0sQ258fJtu29j9/FMvwiLNff364ut2rpb9YcTMV0XW88/JsHhXwvBCJ+VCFAW
+QtkEbkGWUC4NZCBsdEAEw0uq0fEPHxyhNxVqdAU4ik+jG4F33EWIUBBaDIhIEXUAAIcBd9APSBjD
+3xRo4RUPfyB2zgPQWDBhRpLwVsiwuWhL2m4MwQw0aZpwtcF+xbwQwgr0wfZGLAeJM006jV9xA9/+
+BmyoQ08ItNChPRwanc5g5KztEAoKkmwoRlu5Wv56LIl+O4wpK7bV0gIie635hYkGvopLpWXcVRgk
+UjFgw44iTRFPVRB3Smb31Dw86sijfhy4m+tM10idKA1ArvwY12ggY6MwcqWtLgD/dBNJ99kbyTWD
+we+qPfeLTWEsXWZjkcaKpZauTbZFskUVD6u3WPhzREBcBMUunou6DrXtMABL7gV4so7P0+DQAMe7
+9nPuCAvINnngLEE/Cixy1X1no7yuhfgjIAi/Ro0tVshJGDkU0+j0a4RHuG7BRSv4ReItuECKAcUW
+i0mPocdMs5UIBq+oEHSDYq1Ed+AProuvBSK22ybpHwJAr0XDqCAHDTlz0OMnHwd95pDOgtpCGq9I
+Nyxg79x50OfYMycfyQi+iwRMuVpr7X1NBAPIzq2RsNS3tZnpcgPX00AY9ZBgMDRFzGVeljCK5JYD
+RAekYRJkDEQEhfAQbhYMUmUMjQzBiALkAUJB2AKQQw4ZDAwFDgUoMG9+A92AYwNrFdV1A8Ir50xN
+6jdA1h/tbLxCtCOWsQmWSvx4ylaX1E4sLZQ226eOdSE+MDvBEQcnlRpULSkM+04dEbYI6w9/Z4aa
+RGkjFFKFcjJkRkZiPAxtg53cQGJdY2EiLZEdcl6PYp4+CSPE2wGQQvMJiEr/Hgrn/hFBSDtQCI4H
+bI6O504MZklhzyhgQxoMN7AA4zI+KlDgTQoiDOx9iApCSES99mXgCbjPFIsrCqDAMbrix0MfK80T
+JBGyZhcRqvQEvpnuFMNKCTAYMHdAYvkReANQZWr9K81TzRXmBlZQSRjrHmShsrSYiokD7/1QVj6D
+/wd2FT88DO+V4IPvCJFMiUwdCkvoN1C2i7I75oJW6mKzTiA6fynTGyttbjz5Uyv9i2sIK/QGZO+J
+C1v+ZCLh0RJBAZFMZIs7/rPcLnyQdDx0MT0DDD6QS0ObZU4/xOJAu0IvvhphE1ftQeIE+QyhRxZB
+IFFTbJ2OpeAgYxN2EFbdDBJn2Nt1CaHbPz46W1l1HLJWVYtsCY0ScAN1ulPrIFJVeIl+UboBE4U0
+nKJLtNWW0/43GltTUpyo/VLHRxh8iIpXNFvBb+9dXkwe+3QGg30BDMVc1HQfWL7CMO8Ji4Upz4Hs
+8KLQ1lXujCT0Bvy03wE03QI11VfPRANITNM0TdNQVFhcYE3TNE1kaGxwdHgGGYI3fImsJEIy3n6h
+xAHvflyERI1EA0NKiau7QJe67TkIdR9xGIFIxH/llG7AiSmJKktfjC28jxqcF7kRjRc20FOYO0M5
+KD1Bg9qgG8DABCZ283b59t14fM1zBppiug8rtHgXN/o/OS51CEqD7gQ71QU7+qWNf5ttLHYlVPq+
+UYk70+avg93b/3MSjVyMRCszeCVTwwTREXLyb3AzRGiVo4UcDERRL9CtjQMr8bpAeRDwdSebEaID
+zuWILAtu7m9t9kqHM9sDTBxISeWMHEWj0/0Xde/dBG9bIwN9tM3/HBWM1hVsh4QcPShzjA2h8Hg7
+iVx4QokREnsc7Y74pghDO9lyxVeL3/dCp9nI2IwUNZSJIV3vmYYCA3EkHmGdzhmKx3cAEsSh8RG/
+HTwPj4ECMzRlhwUeikQNuQo729wC70mF0uwrPiD9O00iB9t7D44HYBQ41r9gyc0sLfhsujgDRM9E
+/98r00UDzzvX8CYS0FG3GtccIEnLuIlm+n+NfQE7x3Yng8//9xotYQG3YcduGEEErn2+t+5uYcVt
+4B8HK8cScu6EJL5sx5okvzvni7F8A/iB/5yxkaOI2O8mIIO9nz4rLMIvjZSE2DaJT9040DiLuT90
+OEOI/SLCrkygtIQs1suI10s0sQUxvcbXi0r87wvfauGL9dPBQyvwiRQ7dN57uhuf6wlKGCjg8I7Q
+FRsGj/9ajG6K0Ph02xsJHCrTiD0xiwgMkd3GBt5/cgfGDsDrnzcpDPxH3xWT8XMUgf7JG9KD4qCb
+ruwu9mCIcesgIBTB5lubCPcCihQxDLaAwks00XJbvDEhsQT2Dq2NLHyHJEe64ry0Q7SwiTsVcx63
+xdfhGL9FMHeJOY081aRxBIaJEbqdHXLm1RR6jcLbf8GVMYGFwnQIM9DR6Ad14dBahPhYSg4oYA9G
+G6GMHI0FMSRPI+W+K7T6yzpfGIPoBE+IY12wHyYr3zkzCCN1PDHGidx1FchKIB6mhjor0sIcUl6d
+Pj6QQOvBmh59w/Q2TpEbQtc79XQXWsjSXZEsAXRN+yLgAtYBDAoktBICww9foxp4LA9hOGgSZBgE
+3hlAC19mTtLA4TRVZBg0UlvBWz3T2GigYiMgl8AOegQVVVJwhcECM7b219NFPjgmO3sL+8YMTChI
+OJ3biXZ7FkyYY++BvdEEVh6oUlFLdSQnBuD31oM6FgiB/Wp3Ez8JvCUAHavkYUs2y09RKIkeCJQa
+8vt1H5HjyQePLCP8dALowGBkLy8jSxhMYGfEQqRFSBLMEiMPQbQXF98NUPze5bbCu9OhVAoWnAIQ
+wMN3N5THAVgRxwJYh0DIUTZg43TtDGNr13s4tdUAwHb9weuNtv13dgMVLBF77zvoWMPW8Ya/7XQP
+MiD3COptJf5IIFYUK8UD1eYwVsQvwUKWOHAOi0s8VTcBNyoFNkM8Es2L9x8xqR6kplnK41+5VKYD
+xRdLLAP9otxWtZ0KdX5BRCgN7E636JF1H3M06por7nJyhS2fEIRXR6yDHMhXVkcwfK3FFmrNXviE
+e4K9KNh75IyKYakuGE5aKFSJUXK8YAlfNRheH7cbh17MWfmLaZxRIN2ohQs7cTA3OB077g7oH45R
+QRw5cwkr9U71e9VSXc5JMc2BNqTpJpS0DhwsE80lviCD+Dwii0lBlNjqqBGLpcgaxd7uS2EIC9ZH
+HXLiWKKN+Bu8VzAjysiKHM6NNM4sK8A7x4SOwjJOAdPqBGcFaF2VjzkEvrcP8IMjawydYF4ENgPL
+/wByYDhVdMeD4w8rw30FumA0MU4Nq8tJJpKtI6QPDzJlS5ogNJwxTNkIOQUBlM8LewDeO8NzK1kY
+g7WfA5r559WH10Emy9kSX5dyBzxZTvqbozVqz3DB7sf1hAKuKEjXlME3uBC8SSgRO/dyFwYf7N+L
+90WKDkaITf8Gg+sC6wF8O9aI6ydxLB8733YTzv7WCosdHABFRk919hgoJduZwRBLnusZvwI9P7cG
+BBlwRUmBYepH7IgScjoOcjPaOkft+TyYtZwQSQSb41eFE3Qr8z6s8BfxhXqyrTvzD4IHoLnJOy0/
+l4t02cVAj71dZcHrHtlzAt44K/nGxli9M40UzZrCxBz6O4hLMBZTRgjqz4lVcoXCPitnVg1WYC+c
+mulzYiB0VlebzYoUz1rb1w6QCzByPxBSTUa+Zv71iOjWtrNoAytBWECLMQfvJTZBOXdfiUFnmgHc
+9E79Zp//JQCRkZGtdQUECBAHBujLtGDMzFE9kS1jv29hCHKH6QstBIUBF3OpxK2L7JjEDIvhYM8q
+zHO7UMPMQ7BgJO+yg18sav9oEGRT0FFkoaEFW2+pUHQlBxho0CgaL8uJZei+9r0hugRUFcAxgw3o
+n1Oxnc0/BuwUxJyRke1pDbjxCA3ItL0r3N+hzAwAo/Ao6705HZCzuY3IGBm+bE7Q77PdvxioaAxw
+gghwJ6KhsD+3ETVBX5RwrAxS0Ww3CZxQA5CgT4Z8XdHYHQQyABb0XQBOodxuMDG+7e/+gD4idTpG
+CIoGOsN0BDwN8hIEmm17QCB28tTQTqSgN6ItbvZF0DMRhNTrtOiftw4rIHbY6/VqCliVehK0VYKc
+hRGjfBVdCf0z4JLsF0egN1QJiU2Iy5xZCmyE7QUu/3WIH+hj7AV7C29k5NS0VQMELFbYMF8v0qzD
+kgB3GNkSL7y43QALFQBJABXzvCIo//8QNN0gTRESCAMHCdM0TdMGCgULBE3XNE0MAw0CPw4B2/+D
+NA8gaW5mbGF0ZSAxLgEz/+7b/yBDb3B5cmlnaHQPOTk1LQQ4IE1hcmsgQe+9N/tkbGVyIEtXY297
+vffee4N/e3drX9M0TfenE7MXGx8jTdM0TSszO0NTYzRN0zRzg6PD45BdhPABJQEDyZAMyQIDBDvN
+kAwFAHBfJcySLUcvfzRN97338xk/ITFBrjtN02GBwUCBA03TNM0BAgMEBggMNE3TNBAYIDBANrIV
+1mDn18ckYQlHBqerIN8SJq+zAwuGCjLIDA2uYURbinpfjgM5BnxAVUNyZR3/1f/tRGkGY3Rvcnkg
+KCVzKQhNYXBWaXuzYP9ld09mRmlsZRUrEB0Bs5S9cGluZxcQzP23n3JFbmQgGXR1cm5zICVkUxf7
+wRIWFBNJbml0Mhg6wAEDrkNct9tvX1RpbWUUUm9tYW4LaGkKV2l7A7btemFyXHdxbN9zdGEH7Xb7
+m3ggb24geW9AIGMpcHVT2679/3IuIENsaWNrIE5leHQg3RdudC519t5aa4DoGUtjZWwVHAzWbd1p
+HWgVU31wWy631toHF3kWMowBLmTudmRrYQ9QIFZZc2kHt2/AcxbB329mdHc0ZVzd3MFmIAZDbxGV
+XEluK7udoFDlaABDtShmsHXN0LMpmP5n3HRshkS2hClTbzBs0B1hu25vtmN5IHBbZnYIws5+N3cA
+j54XWuG9Ay5wfjsbES20w/ccGHMAGjUuZpEjrAAbY8XuQnjLHBRdYr1zbgiHbkiSg+HHFA4XXOSJ
+SWabsh8c3St2LOp2XYhjaCK8rW0SZzMEeSq/tV/hwkBzlsxzLCoQhtCOb0JhBNnF7cISBne/M19P
+9rqt0Ro8EZxMZw9SrrBtF2lfUxBwwFNnVPFca2MjRghsIwuM9232h2kNAExvYWTwB+g2N8IGADy0
+dBJfZgPW8GUJOwsuB5w7bJsGcif0J8dxgcOO0N4RRXJyN4d5AAvNGdrGT3YFd4bAvfH/CnsIWz8A
+G3M/CgpQcrb/XmgGnFlFU/dBTFdBWQlvf8cewi4sCnAtTk8sTkVWHPtT2UVSK0NBTkNFTFxTS224
+UDCLA6tkdY95LjTE4YGXb3Ce00ltgnsgrmZhS3/2a4W3bRZkFWELYg0Hshm32w1yZxZfdv8PE4Yd
+XkynD0hYXcsd62J1aV8lbyvhtjveb0NwcmFflnJ8Uqy99+JfvluWB8jWtoE0ACdeZZlZbZJrjWvK
+IOjs9ih3229nRm3gdmFsi6yVdGqtYn3TY8YMPLQC+WEibX4W5pgVEUfdL7yxFJPFTHe1ZG93ZO2s
+0GFUKy65n7WH2NhXHUMcH2V31rlDo3/TQ2TrY2020+GBlCBBJQpruUJb9icXEVxlw2DDghnFdHNL
+4dC2jXprkHf4TNllG4bDnpPLZC9dazTTYjbOAhW4cNipfXDpR29vJ5AYv53cIRnSa1h5bWJvbNq5
+WrJzPxaSRmxvsWVvZo4vz18YURAj2nR5Wl6uiAbR/Az/Z02z3FqsA/B25NDAHe3NNqh2G+e1UmLu
+RzJMTi0PZmb1VXDfpGVCZ3MRNw6Gm6tNWNxtbzsxLGtowyGfvm0vtoQjO7wbbg/oFrBCW35dxwMM
+m22G0gkv4h00xTJSYwVgfAGuac6OUAAHEFRzH9ggJ5tSHwBwMEDIIE03wB9QCmALBg0yIKAIP2SQ
+QQaAQOCQQQYbBh9YGJBBmm6Qf1M7eJCmGWQ40FERQQYZZGgosAYZZJAIiEjwGWyQQQRUBxQZZLCm
+VeN/K3RskEEGNMgNH7NBBhlkJKgPDDbIZF+ERH/oyOMmm59cHxzIIE0zmFRTfNggDDI82J8X/yCD
+DDJsLLiDDDLIDIxM+AwyyCADUhIyyCCDoyNyyCCDDDLECyCDDDJiIqSDDDLIAoJC5AwyyCAHWhoy
+yCCDlEN6yCCDDDrUEyCDDDJqKrSDDDLICopK9AwyyCAFVhYMMkjTwAAzdjLIIIM2zA/IIIMMZias
+IIMMMgaGRoMMMsjsCV4eDDLIIJxjfjbIIIM+3Bsf2CCDDG4uvA8ggww2Dh+OTjIIQ9L8/1H/EQwy
+JA2D/3ExDDIkg8JhITLIIIOiAYEyJIMMQeJZMiSDDBmSeTIkgww50mnIIIMMKbIJJIMMMolJ8rLp
+DTJVFRf/AgEyyCAXdTXKMsggQ2UlqsgggwwFhUXIIEMy6l0dyCBDMpp9PcggQzLabS0ggwwyug2N
+IEMyyE36UyBDMsgTw3MgQzLIM8ZjgwwyyCOmA4NDMsggQ+ZbQzLIIBuWe0MyyCA71msMMsggK7YL
+Msggg4tL9kPIIENXF3dDMsggN85nDDLIICeuBzLIIIOHR+4yyCBDXx+eMsggQ38/3jbIYENvHy++
+D0EGm2yfjx9PKBkqif7/wYaSoWSh4ZFkKBlK0bGSoZKh8ckoGUqGqemGkqFkmdm5GSoZSvnFkqFk
+KKXlKBlKhpXVoZKhZLX1GUqGks2t7ZKhZCid3SoZSoa9/aFkKBnDoxlKhpLjk9OSoWQos/NKhpKh
+y6uhZCgZ65sZSoaS27v7ZCgZKsenSoaSoeeXoWQoGde3hpKhkvfPr2QoGUrvn0qGkqHfv8c76Rv/
+fwWfVwfvdO5pug8RWxDfDwXTNMvTWQRVQV3OPd3ZQD8DD1gCrw80nXuaIVwgnw8JWvY0zfIIVoHA
+YH8hgwxyAoEZcnLIyRgHBmEnh5wcYAQDMXLIySEwDQxAh1hywa+4FJfCVylkeexpY6UbtIxaSnJl
+1Qr73xV4c3Vic2NyaWJlZCcWEmLZS3YeIoGNLEcj8ZIQl610ec0UGxjhShseo7NS9pYtKD1j0zRf
+yh8DAQMHTtM0TQ8fP3//aZqm6SD//////wTinab//0N1hA2oKgOIkAURnqhpDihuLKsE5XYlxyeg
+Cf8AAOdcLpfLAN4A1gC9AIQAQsvlcrkAOQAxACkAGABOfiuXEAAIP97/AKVj7hGULcgAN+Zmrarw
+BgAFEjZlB/8X/zcWMDfrD/4GCAUXm0z2Vg837waVLUvZABc3nGu38/+2vwampggMDsDehc0LF6YG
+N8bu/vv7UltK+lJBQloFWVJaC1vsvdj2FyfvCxEGN3arng/2ICalYBWvBdktBOcUEDjGF/7u+cDe
+GyYFBjf6QEr7una7+1ExUTFaBQBaC1oXW9ixAVoFEEpvYOu21ly6dQVUFW4UBbFYc/9ldYamEBY3
+Fwsd3p4bshZvEdldA0dARmRj3eYBBRHNWG/6C7nXjez5QG+6FV15M4N7gwEAEuhGCwf5AHMdb0Ex
+WEhSZ665k1gQBYUNC0r55E/Z+lHfFGVkECUQFqamdTP3G2R1FZUXCwoAdthhgG9DdUgLZN+QbRcx
+BTFv5gkGYuKzFabDCsEMzwtZF4zHkH0FFN/7CiPMMXPnWgMLOhcZIWE3BUJXT3o7rBvG/pMIvwu2
+BR0hW4afb/D8hr0kS3L+DQNa2GH2BgTJb5u9YEkRBwUDdyNk7yUL9zf5W9gbNgcF5w8bdiEl7+5J
+B80SwjcF9lcPe+8t7Ps3udkHBb1ZQjj6xw8h9lqMkG/5agcFZQzjbAMVQ5vLgg2wb1VvpWwZs0cF
+m2/ZzHQ6gfIBa2lxgbkvdRbnbxEmDWuKE+xabwWyhpDPb0dRMQBbr5ek2W91bwPbxhhhb/NZAltv
+gT1MKxeb3yuAfW/NcibfDWzCF9hvSfz5PQMkkpMlb1r6ZO/xIrcJ+2mHbZAC2fbf61LXK0sZrxG/
+LzeH4oxJ8YcV4Fa2MlpVnzfk3BmT8fNaCwzTSiKAD29mIbWXpOsLDPdksLJvC/434spihL0JC4cx
+hGAgAbGCz2hTd8BICT0BskFsELHds3TrDlKx13CoAU0TIAMR3euoYT1zCSFyIl4YLVlmNlB9BUEj
+WPWzOX1uqfje/4I7aCUxV67pNtcHej81ZA13bAGxM/e5IAdRdBkPJS3pNre5bxUFeQeFcgljXfe5
+rm2PdSl5LhNDL2nZXNd1GWsLThV4Gyl0nvvcmS9uC111G1GXrBv7R0PBYxFsKznZsjfYaTtoK/+3
+TfeEDS7sBAix7yl4y3bZyAD9gRwCAw5QZ7SIhgY/aPFkgtNdWHMHfQACQ6OE070KEB+Cn30hQqYF
+J2w4HLrXA2P/T3kDOwmTbkqZYRlpN/gJ67p/czk6YIAIgVDDhI1io6FtXe8TEMyTje+eAEITzLop
+7ElnRAlynYSHrDu/nTpNAwGhgyVCRh5kAP6Dg4wRJAerCEuajmKBZ257huQ+UvdJbRumu+ydSYtN
+cj92+9xkbAV39WNVJWdbWDLSFwl5Y2a995BI7+d0D0OeuyzWDSxT0UItCVqANJKVbQ3zsEJhS4BP
+3YdrmrPrbX0NbAdf1I10DZdy82dzATMVDNkHg1AVMW7kaWSLc4nsU+PIFhmDYzpfBCCZKANGM8Ih
+V0avaWhlIbBON3XVdPkMkLWSd9spSWCVNGeC4W6MB16N42R3dRdqnxuEY3lmDTV5jaUgKqxwwVAR
+SKnEroISNFdQONz1r6PgTGli0UENY2FsRo2CfwfbAUZvcm1hdE0vt+9KBQsaR2V0UHIeQWRVKNjc
+ZHITD2w21v67EkQZQ2xvc2VIYW5kDiZDgdsOaXY5ZS1llgVxd0ludCNVbm1Jv1gw915kdzQVU2n9
+laizekFUthBOYW3PBPGCehE6bqwLWRB+E01cltuDLU9BdHSKYnVzvmVBzDbh7FMdAaLdJUxhxYYB
+RN4uCLfERCBkVG89ls0G9gltiDEsBsTK6kxZsPZu2UEmTW9kdQ7RbTZhthM2ET4KtgoKDBFJIVjb
+td4QRGUXeK5WwZ9m0QBSZWdPxAjIx/5LZXlFeEEORW51bWF7zEWMDwxRdWXpVtE7zeZaBh5F3hTU
+4L41N7VKcXlTaGXJ03QJm+UTMusg7pjhs45PYmo+4EJrwVsY5r5lCmwSGKd4CxWchEJxb1Nve0zC
+LzVCcnVzaEpvEEHNVmjfK0MfSmb1rGNbcDxfVRdwCGaE3dxuFw1jcMtfYzWabGbcEf7WGV82Y2Vw
+dF9oOnIzEVdBx9Y1TV8MX2DV7L25DwlfZm2eC2sbwQrfDexqiystWANiZsw3DgVXaI9l6O/UEb9r
+5XONaTQQHGcYELbfBkSJczljbW5utM4F0QhhDliXM72YO+MrkRM6zHa8eWxjtHRvbHZzbnARdGaC
+N7vFE8loctEH9Nx7raPZB4QXxmZt7E0HbkgQB1+0UmzCRG40fxoPbZlrJTxxnTRj0RjmDv0HMUkI
+d4zKLF44UQad4Qqli+gab3noOkqtN33htWPhQqJhZoi4He1m2uMUA5jyFlaD+8OyCrtEbGdJPMJE
+sGa7EHdzcCZWqr5Gr0RNPEU2xllsFgpSJkdBZcHaS00XDGLHwZa9FA0JQm/kiFFop9yUtuHjBHGC
+Yj1ya0SaJWcPxQjukn1YgVVwZBzQZWVrYO6tS1SGbnNsHhJZoW2GAFhwD6kjAht/YChDdXJzrkFC
+fQFgeVBFTMP4pro5gm+AmBGCDwELAQaw72wE+2ATPAsQDxaJ3OxACwMyB2bFZEsXwCkM3sDODBAH
+BhsgzbO8HGSMoBLCqrpAp5iPFuwzvC509OtBkN9EbCZsRSAucmwJsyP0MAxTAwJpdq+5QC4mPPQv
+cI1tyt4HJ8BPc+Ur+957DOvzJ5BPgPaB3ACwBPdDtQMAAAAAAABAAv8AAAAAAAAAAAAAAABgvgCg
+QACNvgBw//9Xg83/6xCQkJCQkJCKBkaIB0cB23UHix6D7vwR23LtuAEAAAAB23UHix6D7vwR2xHA
+Adtz73UJix6D7vwR23PkMcmD6ANyDcHgCIoGRoPw/3R0icUB23UHix6D7vwR2xHJAdt1B4seg+78
+EdsRyXUgQQHbdQeLHoPu/BHbEckB23PvdQmLHoPu/BHbc+SDwQKB/QDz//+D0QGNFC+D/fx2D4oC
+QogHR0l19+lj////kIsCg8IEiQeDxwSD6QR38QHP6Uz///9eife5mAAAAIoHRyzoPAF394A/AXXy
+iweKXwRmwegIwcAQhsQp+IDr6AHwiQeDxwWJ2OLZjb4AsAAAiwcJwHQ8i18EjYQwMNEAAAHzUIPH
+CP+WvNEAAJWKB0cIwHTciflXSPKuVf+WwNEAAAnAdAeJA4PDBOvh/5bE0QAAYekIef//AAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAIAAAAgAACABQAAAGAA
 AIAAAAAAAAAAAAAAAAAAAAEAbgAAADgAAIAAAAAAAAAAAAAAAAAAAAEAAAAAAFAAAAAwoQAACAoA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAGsAAACQAACAbAAAALgAAIBtAAAA4AAAgG4AAAAIAQCA
-AAAAAAAAAAAAAAAAAAABAAkEAACoAAAAOKsAAH4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJ
-BAAA0AAAALisAABuAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAAAorgAAWgIAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAAgAQAAiLAAAFwBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAABAAkEAACoAAAAOKsAAKABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJ
+BAAA0AAAANisAABiAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAABArgAAWgIAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAAgAQAAoLAAAFwBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 APThAAC84QAAAAAAAAAAAAAAAAAAAeIAAMzhAAAAAAAAAAAAAAAAAAAO4gAA1OEAAAAAAAAAAAAA
 AAAAABviAADc4QAAAAAAAAAAAAAAAAAAJeIAAOThAAAAAAAAAAAAAAAAAAAw4gAA7OEAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAOuIAAEjiAABY4gAAAAAAAGbiAAAAAAAAdOIAAAAAAACE4gAAAAAAAI7i
 AAAAAAAAlOIAAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkz
 Mi5kbGwATVNWQ1JULmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdldFByb2NBZGRyZXNz
-AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABl
-eGl0AABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABm
+cmVlAABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

From cde132acfb8b07bd59966d7392c82c4fb2de2b2b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 10 Sep 2000 01:21:27 +0000
Subject: [PATCH 0579/8469] Added --python and --fix-python options for better
 control over what   interpreter the .spec file refers to. Cosmetic tweaks.

---
 command/bdist_rpm.py | 49 +++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index daf55b766a..9bddddce24 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import sys, os, string
 import glob
 from types import *
 from distutils.core import Command, DEBUG
@@ -28,6 +28,12 @@ class bdist_rpm (Command):
         ('dist-dir=', 'd',
          "directory to put final RPM files in "
          "(and .spec files if --spec-only)"),
+        ('python=', None,
+         "path to Python interpreter to hard-code in the .spec file "
+         "(default: \"python\")"),
+        ('fix-python', None,
+         "hard-code the exact path to the current Python interpreter in "
+         "the .spec file"),
         ('spec-only', None,
          "only regenerate spec file"),
         ('source-only', None,
@@ -114,6 +120,8 @@ def initialize_options (self):
         self.bdist_base = None
         self.rpm_base = None
         self.dist_dir = None
+        self.python = None
+        self.fix_python = None
         self.spec_only = None
         self.binary_only = None
         self.source_only = None
@@ -159,6 +167,15 @@ def finalize_options (self):
                       "you must specify --rpm-base in RPM 2 mode"
             self.rpm_base = os.path.join(self.bdist_base, "rpm")
 
+        if self.python is None:
+            if self.fix_python:
+                self.python = sys.executable
+            else:
+                self.python = "python"
+        elif self.fix_python:
+            raise DistutilsOptionError, \
+                  "--python and --fix-python are mutually exclusive options"
+
         if os.name != 'posix':
             raise DistutilsPlatformError, \
                   ("don't know how to create RPM "
@@ -275,21 +292,21 @@ def run (self):
         
 
         # build package
-        self.announce('Building RPMs')
-        rpm_args = ['rpm',]
+        self.announce('building RPMs')
+        rpm_cmd = ['rpm']
         if self.source_only: # what kind of RPMs?
-            rpm_args.append('-bs')
+            rpm_cmd.append('-bs')
         elif self.binary_only:
-            rpm_args.append('-bb')
+            rpm_cmd.append('-bb')
         else:
-            rpm_args.append('-ba')
+            rpm_cmd.append('-ba')
         if self.rpm3_mode:
-            rpm_args.extend(['--define',
+            rpm_cmd.extend(['--define',
                              '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
         if self.clean:
-            rpm_args.append('--clean')
-        rpm_args.append(spec_path)
-        self.spawn(rpm_args)
+            rpm_cmd.append('--clean')
+        rpm_cmd.append(spec_path)
+        self.spawn(rpm_cmd)
 
         # XXX this is a nasty hack -- we really should have a proper way to
         # find out the names of the RPM files created; also, this assumes
@@ -398,10 +415,10 @@ def _make_spec_file(self):
 
         # rpm scripts
         # figure out default build script
+        def_build = "%s setup.py build" % self.python
         if self.use_rpm_opt_flags:
-            def_build = 'env CFLAGS="$RPM_OPT_FLAGS" python setup.py build'
-        else:
-            def_build = 'python setup.py build'
+            def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build
+
         # insert contents of files
 
         # XXX this is kind of misleading: user-supplied options are files
@@ -412,9 +429,9 @@ def _make_spec_file(self):
             ('prep', 'prep_script', "%setup"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
-             "python setup.py install "
-             "--root=$RPM_BUILD_ROOT "
-             "--record=INSTALLED_FILES"),
+             ("%s setup.py install "
+              "--root=$RPM_BUILD_ROOT "
+              "--record=INSTALLED_FILES") % self.python),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('pre', 'pre_install', None),
             ('post', 'post_install', None),

From 9a1e68da5031587d22fa58f20a36e3d12f76a9aa Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 11 Sep 2000 00:47:35 +0000
Subject: [PATCH 0580/8469] Added --plat-name option to override
 sysconfig.get_platform() in generated filenames.

---
 command/bdist.py      | 11 +++++++++--
 command/bdist_dumb.py | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 1c862d585d..cc0c3985cf 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -32,6 +32,9 @@ class bdist (Command):
 
     user_options = [('bdist-base=', 'b',
                      "temporary directory for creating built distributions"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('formats=', None,
                      "formats for distribution (comma-separated list)"),
                     ('dist-dir=', 'd',
@@ -70,6 +73,7 @@ class bdist (Command):
 
     def initialize_options (self):
         self.bdist_base = None
+        self.plat_name = None
         self.formats = None
         self.dist_dir = None
 
@@ -77,13 +81,16 @@ def initialize_options (self):
 
 
     def finalize_options (self):
+        # have to finalize 'plat_name' before 'bdist_base'
+        if self.plat_name is None:
+            self.plat_name = get_platform()
+
         # 'bdist_base' -- parent of per-built-distribution-format
         # temporary directories (eg. we'll probably have
         # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.)
         if self.bdist_base is None:
             build_base = self.get_finalized_command('build').build_base
-            plat = get_platform()
-            self.bdist_base = os.path.join (build_base, 'bdist.' + plat)
+            self.bdist_base = os.path.join(build_base, 'bdist.' + self.plat_name)
 
         self.ensure_string_list('formats')
         if self.formats is None:
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index e93c6b7272..0fb8e83b2f 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -20,6 +20,9 @@ class bdist_dumb (Command):
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('format=', 'f',
                      "archive format to create (tar, ztar, gztar, zip)"),
                     ('keep-tree', 'k',
@@ -35,6 +38,7 @@ class bdist_dumb (Command):
 
     def initialize_options (self):
         self.bdist_dir = None
+        self.plat_name = None
         self.format = None
         self.keep_tree = 0
         self.dist_dir = None
@@ -43,6 +47,7 @@ def initialize_options (self):
 
 
     def finalize_options (self):
+
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'dumb')
@@ -55,7 +60,9 @@ def finalize_options (self):
                       ("don't know how to create dumb built distributions " +
                        "on platform %s") % os.name
 
-        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist',
+                                   ('dist_dir', 'dist_dir'),
+                                   ('plat_name', 'plat_name'))
 
     # finalize_options()
 
@@ -74,7 +81,7 @@ def run (self):
         # And make an archive relative to the root of the
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
-                                      get_platform())
+                                      self.plat_name)
         print "self.bdist_dir = %s" % self.bdist_dir
         print "self.format = %s" % self.format
         self.make_archive (os.path.join(self.dist_dir, archive_basename),

From 445af86d1bb43c3904c1f0542efb72d1fe21ba1e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 11 Sep 2000 00:50:37 +0000
Subject: [PATCH 0581/8469] Delete some debugging prints.

---
 command/bdist_dumb.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 0fb8e83b2f..2da9c48795 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -82,8 +82,6 @@ def run (self):
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       self.plat_name)
-        print "self.bdist_dir = %s" % self.bdist_dir
-        print "self.format = %s" % self.format
         self.make_archive (os.path.join(self.dist_dir, archive_basename),
                            self.format,
                            root_dir=self.bdist_dir)

From 561b706a78a2adb9f8909bf17b31c031f42a8cc9 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 12 Sep 2000 00:07:49 +0000
Subject: [PATCH 0582/8469] Bastian Kleineidam: fix so it cleans up the
 temporary script-building directory too.  Also generally cleaned up the code.

---
 command/clean.py | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 1d8c7b2200..2f3597fdbc 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -20,6 +20,8 @@ class clean (Command):
          "build directory for all modules (default: 'build.build-lib')"),
         ('build-temp=', 't',
          "temporary build directory (default: 'build.build-temp')"),
+        ('build-scripts=', None,
+         "build directory for scripts (default: 'build.build-scripts')"),
         ('bdist-base=', None,
          "temporary directory for built distributions"),
         ('all', 'a',
@@ -30,6 +32,7 @@ def initialize_options(self):
         self.build_base = None
         self.build_lib = None
         self.build_temp = None
+        self.build_scripts = None
         self.bdist_base = None
         self.all = None
 
@@ -37,6 +40,7 @@ def finalize_options(self):
         self.set_undefined_options('build',
                                    ('build_base', 'build_base'),
                                    ('build_lib', 'build_lib'),
+                                   ('build_scripts', 'build_scripts'),
                                    ('build_temp', 'build_temp'))
         self.set_undefined_options('bdist',
                                    ('bdist_base', 'bdist_base'))
@@ -50,27 +54,16 @@ def run(self):
             self.warn ("'%s' does not exist -- can't clean it" %
                        self.build_temp)
 
-
-            
-
         if self.all:
-            # remove the module build directory (unless already gone)
-            if os.path.exists (self.build_lib):
-                remove_tree (self.build_lib, self.verbose, self.dry_run)
-            else:
-                self.warn ("'%s' does not exist -- can't clean it" %
-                           self.build_lib)
-
-            # remove the temporary directory used for creating built
-            # distributions (default "build/bdist") -- eg. type of
-            # built distribution will have its own subdirectory under
-            # "build/bdist", but they'll be taken care of by
-            # 'remove_tree()'.
-            if os.path.exists (self.bdist_base):
-                remove_tree (self.bdist_base, self.verbose, self.dry_run)
-            else:
-                self.warn ("'%s' does not exist -- can't clean it" %
-                           self.bdist_base)
+            # remove build directories
+            for directory in (self.build_lib,
+                              self.bdist_base,
+			      self.build_scripts):
+                if os.path.exists (directory):
+                    remove_tree (directory, self.verbose, self.dry_run)
+                else:
+                    self.warn ("'%s' does not exist -- can't clean it" %
+                               directory)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care

From e4b265d05af821755af79ff534c0afb4f4cdfedb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 13 Sep 2000 00:12:11 +0000
Subject: [PATCH 0583/8469] Fix install directories on Mac OS: now everything
 goes to <prefix>:Lib:site-packages.

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

diff --git a/command/install.py b/command/install.py
index 2a59e16b96..2cb7871fdf 100644
--- a/command/install.py
+++ b/command/install.py
@@ -38,8 +38,8 @@
         'data'   : '$base',
         },
     'mac': {
-        'purelib': '$base:Lib',
-        'platlib': '$base:Mac:PlugIns',
+        'purelib': '$base:Lib:site-packages',
+        'platlib': '$base:Lib:site-packages',
         'headers': '$base:Include:$dist_name',
         'scripts': '$base:Scripts',
         'data'   : '$base',

From f322172314e80fb68beeb9438853db40cef0e116 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 13 Sep 2000 00:44:09 +0000
Subject: [PATCH 0584/8469] Bump version to 0.9.3pre.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 16a3984b0c..34f55a2fd7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.2"
+__version__ = "0.9.3pre"

From 1d693fbcc485be61709c3a033b0b915a97cd31ea Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 13 Sep 2000 01:02:25 +0000
Subject: [PATCH 0585/8469] Added --force (-f) option to force installation
 (including bytecode compilation).

---
 command/install.py         | 6 ++++--
 command/install_data.py    | 3 +++
 command/install_headers.py | 7 ++++++-
 command/install_lib.py     | 3 +++
 command/install_scripts.py | 5 ++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index 2cb7871fdf..2332770c6b 100644
--- a/command/install.py
+++ b/command/install.py
@@ -85,8 +85,9 @@ class install (Command):
         ('install-data=', None,
          "installation directory for data files"),
 
-        # For lazy debuggers who just want to test the install
-        # commands without rerunning "build" all the time
+        # Miscellaneous control options
+        ('force', 'f',
+         "force installation (overwrite any existing files)"),
         ('skip-build', None,
          "skip rebuilding everything (for testing/debugging)"),
 
@@ -146,6 +147,7 @@ def initialize_options (self):
         self.extra_path = None
         self.install_path_file = 0
 
+        self.force = 0
         self.skip_build = 0
 
         # These are only here as a conduit from the 'build' command to the
diff --git a/command/install_data.py b/command/install_data.py
index 9193f91924..6cfc7d41f3 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -22,18 +22,21 @@ class install_data (Command):
          "(default: installation base dir)"),
         ('root=', None,
          "install everything relative to this alternate root directory"),
+        ('force', 'f', "force installation (overwrite existing files)"),
         ]
 
     def initialize_options (self):
         self.install_dir = None
         self.outfiles = []
         self.root = None
+        self.force = 0
         self.data_files = self.distribution.data_files
 
     def finalize_options (self):
         self.set_undefined_options('install',
 	                           ('install_data', 'install_dir'),
 				   ('root', 'root'),
+                                   ('force', 'force'),
 				  )
 
     def run (self):
diff --git a/command/install_headers.py b/command/install_headers.py
index 2e6ce8690b..5c06d574d6 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -17,16 +17,21 @@ class install_headers (Command):
 
     user_options = [('install-dir=', 'd',
                      "directory to install header files to"),
+                    ('force', 'f',
+                     "force installation (overwrite existing files)"),
                    ]
 
 
     def initialize_options (self):
         self.install_dir = None
+        self.force = 0
         self.outfiles = []
 
     def finalize_options (self):
         self.set_undefined_options('install',
-                                   ('install_headers', 'install_dir'))
+                                   ('install_headers', 'install_dir'),
+                                   ('force', 'force'))
+                                   
 
     def run (self):
         headers = self.distribution.headers
diff --git a/command/install_lib.py b/command/install_lib.py
index 879a7d00e2..2d19e5b96a 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -13,6 +13,7 @@ class install_lib (Command):
     user_options = [
         ('install-dir=', 'd', "directory to install to"),
         ('build-dir=','b', "build directory (where to install from)"),
+        ('force', 'f', "force installation (overwrite existing files)"),
         ('compile', 'c', "compile .py to .pyc"),
         ('optimize', 'o', "compile .py to .pyo (optimized)"),
         ('skip-build', None, "skip the build steps"),
@@ -23,6 +24,7 @@ def initialize_options (self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
+        self.force = 0
         self.compile = 1
         self.optimize = 1
         self.skip_build = None
@@ -35,6 +37,7 @@ def finalize_options (self):
         self.set_undefined_options ('install',
                                     ('build_lib', 'build_dir'),
                                     ('install_lib', 'install_dir'),
+                                    ('force', 'force'),
                                     ('compile_py', 'compile'),
                                     ('optimize_py', 'optimize'),
                                     ('skip_build', 'skip_build'),
diff --git a/command/install_scripts.py b/command/install_scripts.py
index 3eb3963c95..d506f90f51 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -18,11 +18,13 @@ class install_scripts (Command):
     user_options = [
         ('install-dir=', 'd', "directory to install scripts to"),
         ('build-dir=','b', "build directory (where to install from)"),
+        ('force', 'f', "force installation (overwrite existing files)"),
         ('skip-build', None, "skip the build steps"),
     ]
 
     def initialize_options (self):
         self.install_dir = None
+        self.force = 0
         self.build_dir = None
         self.skip_build = None
 
@@ -30,13 +32,14 @@ def finalize_options (self):
         self.set_undefined_options('build', ('build_scripts', 'build_dir'))
         self.set_undefined_options ('install',
                                     ('install_scripts', 'install_dir'),
+                                    ('force', 'force'),
                                     ('skip_build', 'skip_build'),
                                    )
 
     def run (self):
         if not self.skip_build:
             self.run_command('build_scripts')
-        self.outfiles = self.copy_tree (self.build_dir, self.install_dir)
+        self.outfiles = self.copy_tree(self.build_dir, self.install_dir)
         if os.name == 'posix':
             # Set the executable bits (owner, group, and world) on
             # all the scripts we just installed.

From 5f191c24e8ad0103340029f2d342a8d643f8e1fc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 00:03:13 +0000
Subject: [PATCH 0586/8469] Fixed so 'parse_makefile()' uses the TextFile class
 to ensure that comments are stripped and lines are joined according to the
 backslash convention.

---
 sysconfig.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3774ab25bc..27c08dbf19 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -154,7 +154,7 @@ def parse_config_h(fp, g=None):
                 g[m.group(1)] = 0
     return g
 
-def parse_makefile(fp, g=None):
+def parse_makefile(fn, g=None):
     """Parse a Makefile-style file.
 
     A dictionary containing name/value pairs is returned.  If an
@@ -162,15 +162,18 @@ def parse_makefile(fp, g=None):
     used instead of a new dictionary.
 
     """
+    from distutils.text_file import TextFile
+    fp = TextFile(fn, strip_comments=1, join_lines=1)
+
     if g is None:
         g = {}
-    variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)\n")
+    variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
     done = {}
     notdone = {}
-    #
+
     while 1:
         line = fp.readline()
-        if not line:
+        if line is None:
             break
         m = variable_rx.match(line)
         if m:
@@ -233,7 +236,7 @@ def _init_posix():
     # load the installed Makefile:
     try:
         filename = get_makefile_filename()
-        file = open(filename)
+        parse_makefile(filename, g)
     except IOError, msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
@@ -241,7 +244,6 @@ def _init_posix():
 
         raise DistutilsPlatformError, my_msg
               
-    parse_makefile(file, g)
     
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed

From c0c287bddf8631bd8bd8ea78a02b9e4bc2724a8a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 01:15:08 +0000
Subject: [PATCH 0587/8469] Changed from eager parsing of Makefile (at import
 time) to lazy: only do all that work when someone asks for a "configuration
 variable" from the Makefile.  Details:   - added 'get_config_vars()':
 responsible for calling one of the     '_init_*()' functions to figure things
 out for this platform,     and to provide an interface to the resulting
 dictionary   - added 'get_config_var()' as a simple interface to the
 dictionary     loaded by 'get_config_vars()'   - changed the '_init_*()'
 functions so they load the global dictionary     '_config_vars', rather than
 spewing their findings all over     the module namespace   - don't delete the
 '_init_*()' functions when done importing   - adjusted 'customize_compiler()'
 to the new regime

---
 sysconfig.py | 88 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 25 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 27c08dbf19..de35d96a8d 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -15,7 +15,7 @@
 
 from errors import DistutilsPlatformError
 
-
+# These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
@@ -103,15 +103,18 @@ def customize_compiler (compiler):
     that varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        cc_cmd = CC + ' ' + OPT
+        (cc, opt, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'OPT', 'CCSHARED', 'LDSHARED', 'SO')
+
+        cc_cmd = cc + ' ' + opt
         compiler.set_executables(
-            preprocessor=CC + " -E",    # not always!
+            preprocessor=cc + " -E",    # not always!
             compiler=cc_cmd,
-            compiler_so=cc_cmd + ' ' + CCSHARED,
-            linker_so=LDSHARED,
-            linker_exe=CC)
+            compiler_so=cc_cmd + ' ' + ccshared,
+            linker_so=ldshared,
+            linker_exe=cc)
 
-        compiler.shared_lib_extension = SO
+        compiler.shared_lib_extension = so_ext
 
 
 def get_config_h_filename():
@@ -230,9 +233,11 @@ def parse_makefile(fn, g=None):
     return g
 
 
+_config_vars = None
+
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
-    g = globals()
+    g = {}
     # load the installed Makefile:
     try:
         filename = get_makefile_filename()
@@ -257,7 +262,7 @@ def _init_posix():
 
         g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
 
-    if sys.platform == 'beos':
+    elif sys.platform == 'beos':
 
         # Linker script is in the config directory.  In the Makefile it is
         # relative to the srcdir, which after installation no longer makes
@@ -272,12 +277,15 @@ def _init_posix():
         # it's taken care of for them by the 'build_ext.get_libraries()'
         # method.)
         g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                         (linkerscript, sys.prefix, sys.version[0:3]))
+                         (linkerscript, PREFIX, sys.version[0:3]))
+
+    global _config_vars
+    _config_vars = g
 
 
 def _init_nt():
     """Initialize the module as appropriate for NT"""
-    g = globals()
+    g = {}
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
     g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
@@ -287,12 +295,14 @@ def _init_nt():
 
     g['SO'] = '.pyd'
     g['EXE'] = ".exe"
-    g['exec_prefix'] = EXEC_PREFIX
+
+    global _config_vars
+    _config_vars = g
 
 
 def _init_mac():
     """Initialize the module as appropriate for Macintosh systems"""
-    g = globals()
+    g = {}
     # set basic install directories
     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
     g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
@@ -301,23 +311,51 @@ def _init_mac():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.ppc.slb'
-    g['exec_prefix'] = EXEC_PREFIX
-    print sys.prefix, PREFIX
 
     # XXX are these used anywhere?
     g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
     g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
 
+    global _config_vars
+    _config_vars = g
 
-try:
-    exec "_init_" + os.name
-except NameError:
-    # not needed for this platform
-    pass
-else:
-    exec "_init_%s()" % os.name
 
+def get_config_vars(*args):
+    """With no arguments, return a dictionary of all configuration
+    variables relevant for the current platform.  Generally this includes
+    everything needed to build extensions and install both pure modules and
+    extensions.  On Unix, this means every variable defined in Python's
+    installed Makefile; on Windows and Mac OS it's a much smaller set.
 
-del _init_posix
-del _init_nt
-del _init_mac
+    With arguments, return a list of values that result from looking up
+    each argument in the configuration variable dictionary.
+    """
+    global _config_vars
+    if _config_vars is None:
+        from pprint import pprint
+        func = globals().get("_init_" + os.name)
+        if func:
+            func()
+        else:
+            _config_vars = {}
+
+        # Normalized versions of prefix and exec_prefix are handy to have;
+        # in fact, these are the standard versions used most places in the
+        # Distutils.
+        _config_vars['prefix'] = PREFIX
+        _config_vars['exec_prefix'] = EXEC_PREFIX
+
+    if args:
+        vals = []
+        for name in args:
+            vals.append(_config_vars.get(name))
+        return vals
+    else:
+        return _config_vars
+
+def get_config_var(name):
+    """Return the value of a single variable using the dictionary
+    returned by 'get_config_vars()'.  Equivalent to
+      get_config_vars().get(name)
+    """
+    return get_config_vars().get(name)

From 4f4854922673817fb057229ff42e7c47fded3f2c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 01:16:14 +0000
Subject: [PATCH 0588/8469] Revamped 'get_platform()' to try and do something
 reasonably smart on POSIX platforms, ie. get a little more detail than
 'sys.platform' gives.

---
 util.py | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/util.py b/util.py
index 2487f6dab6..468887127f 100644
--- a/util.py
+++ b/util.py
@@ -13,11 +13,49 @@
 
 
 def get_platform ():
-    """Return a string (suitable for tacking onto directory names) that
-    identifies the current platform.  Currently, this is just
-    'sys.platform'.
+    """Return a string that identifies the current platform.  This is used
+    mainly to distinguish platform-specific build directories and
+    platform-specific built distributions.  Typically includes the OS name
+    and version and the architecture (as supplied by 'os.uname()'),
+    although the exact information included depends on the OS; eg. for IRIX
+    the architecture isn't particularly important (IRIX only runs on SGI
+    hardware), but for Linux the kernel version isn't particularly
+    important.
+
+    Examples of returned values:
+       linux-i586
+       linux-alpha (?)
+       solaris-2.6-sun4u
+       irix-5.3
+       irix64-6.2
+       
+    For non-POSIX platforms, currently just returns 'sys.platform'.
     """
-    return sys.platform
+    if os.name != "posix":
+        # XXX what about the architecture? NT is Intel or Alpha,
+        # Mac OS is M68k or PPC, etc.
+        return sys.platform
+
+    # Try to distinguish various flavours of Unix
+
+    (osname, host, release, version, machine) = os.uname()
+    osname = string.lower(osname)
+    if osname[:5] == "linux":
+        # At least on Linux/Intel, 'machine' is the processor --
+        # i386, etc.
+        # XXX what about Alpha, SPARC, etc?
+        return  "%s-%s" % (osname, machine)
+    elif osname[:5] == "sunos":
+        if release[0] >= "5":           # SunOS 5 == Solaris 2
+            osname = "solaris"
+            release = "%d.%s" % (int(release[0]) - 3, release[2:])
+        # fall through to standard osname-release-machine representation
+    elif osname[:4] == "irix":              # could be "irix64"!
+        return "%s-%s" % (osname, release)
+            
+    return "%s-%s-%s" % (osname, release, machine)
+
+# get_platform ()
 
 
 def convert_path (pathname):

From 4959d02600d04cf81f26e89cf083cc7455c5b736 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 01:19:03 +0000
Subject: [PATCH 0589/8469] Adjust to the new sysconfig regime: use
 'get_config_var()' instead of globals from sysconfig.

---
 command/build_ext.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 3f714c54d8..76da00476c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -528,12 +528,13 @@ def get_ext_filename (self, ext_name):
         "foo\bar.pyd").
         """
 
-        from distutils import sysconfig
+        from distutils.sysconfig import get_config_var
         ext_path = string.split (ext_name, '.')
         # extensions in debug_mode are named 'module_d.pyd' under windows
+        so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply (os.path.join, ext_path) + '_d' + sysconfig.SO
-        return apply (os.path.join, ext_path) + sysconfig.SO
+            return apply (os.path.join, ext_path) + '_d' + so_ext
+        return apply (os.path.join, ext_path) + so_ext
 
     def get_ext_libname (self, ext_name):
         # create a filename for the (unneeded) lib-file.

From 637280f9c621536fbea5a6030b991aa0c3b2364f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 01:20:10 +0000
Subject: [PATCH 0590/8469] Adjust to the new sysconfig regime: use
 'get_config_vars()' instead   of globals from sysconfig. Added 'prefix' and
 'exec_prefix' to the list of variables that can be   expanded in installation
 directories (preserving the stupid old names   of 'sys_prefix' and
 'sys_exec_prefix, though).

---
 command/install.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/install.py b/command/install.py
index 2332770c6b..938922a675 100644
--- a/command/install.py
+++ b/command/install.py
@@ -9,7 +9,7 @@
 import sys, os, string
 from types import *
 from distutils.core import Command, DEBUG
-from distutils import sysconfig
+from distutils.sysconfig import get_config_vars
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
@@ -226,13 +226,16 @@ def finalize_options (self):
         # about needing recursive variable expansion (shudder).
 
         py_version = (string.split(sys.version))[0]
+        prefix = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
                             'py_version_short': py_version[0:3],
-                            'sys_prefix': sysconfig.PREFIX,
-                            'sys_exec_prefix': sysconfig.EXEC_PREFIX,
+                            'sys_prefix': prefix,
+                            'prefix': prefix,
+                            'sys_exec_prefix': exec_prefix,
+                            'exec_prefix': exec_prefix,
                            }
         self.expand_basedirs ()
 

From 4018076a7ebe9adf03891e2eef88f35b3f6b2a1f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 15 Sep 2000 01:21:07 +0000
Subject: [PATCH 0591/8469] Added 'warn_dir' option so other code can sneak in
 and disable the sometimes inappropriate warning about where we're installing
 data files.

---
 command/install_data.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index 6cfc7d41f3..af348f5190 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -30,7 +30,9 @@ def initialize_options (self):
         self.outfiles = []
         self.root = None
         self.force = 0
+
         self.data_files = self.distribution.data_files
+        self.warn_dir = 1
 
     def finalize_options (self):
         self.set_undefined_options('install',
@@ -44,9 +46,10 @@ def run (self):
         for f in self.data_files:
             if type(f) == StringType:
                 # it's a simple file, so copy it
-                self.warn("setup script did not provide a directory for "
-                          "'%s' -- installing right in '%s'" %
-                          (f, self.install_dir))
+                if self.warn_dir:
+                    self.warn("setup script did not provide a directory for "
+                              "'%s' -- installing right in '%s'" %
+                              (f, self.install_dir))
                 out = self.copy_file(f, self.install_dir)
                 self.outfiles.append(out)
             else:

From 1507bd55580f4662f9319edd26efdcc698a33cb2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 01:44:45 +0000
Subject: [PATCH 0592/8469] Document the directory separatory for include dir
 and library dir lists.

---
 command/build_ext.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 76da00476c..f880a7a8d5 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -49,6 +49,7 @@ class build_ext (Command):
     #     takes care of both command-line and client options
     #     in between initialize_options() and finalize_options())
 
+    sep_by = " (separated by '%s')" % os.pathsep
     user_options = [
         ('build-lib=', 'b',
          "directory for compiled extension modules"),
@@ -58,7 +59,7 @@ class build_ext (Command):
          "ignore build-lib and put compiled extensions into the source " +
          "directory alongside your pure Python modules"),
         ('include-dirs=', 'I',
-         "list of directories to search for header files"),
+         "list of directories to search for header files" + sep_by),
         ('define=', 'D',
          "C preprocessor macros to define"),
         ('undef=', 'U',
@@ -66,7 +67,7 @@ class build_ext (Command):
         ('libraries=', 'l',
          "external C libraries to link with"),
         ('library-dirs=', 'L',
-         "directories to search for external C libraries"),
+         "directories to search for external C libraries" + sep_by),
         ('rpath=', 'R',
          "directories to search for shared C libraries at runtime"),
         ('link-objects=', 'O',

From 8a0e231dcf1cd16a0075cca6c78a7996144eb6d2 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 01:54:46 +0000
Subject: [PATCH 0593/8469] Include the Python version in the platform-specific
 build directories: with the recent change in 'get_platform()', we now have
 directory names like "build/lib-1.5-linux-i586".  Idea and original patch by
 Rene Liebscher.

---
 command/build.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/build.py b/command/build.py
index 1e87f23bbc..1d901282ad 100644
--- a/command/build.py
+++ b/command/build.py
@@ -67,6 +67,8 @@ def finalize_options (self):
         # hardware architecture!
         self.plat = get_platform ()
 
+        plat_specifier = sys.version[0:3] + '-' + self.plat
+
         # 'build_purelib' and 'build_platlib' just default to 'lib' and
         # 'lib.<plat>' under the base build directory.  We only use one of
         # them for a given distribution, though --
@@ -74,7 +76,7 @@ def finalize_options (self):
             self.build_purelib = os.path.join (self.build_base, 'lib')
         if self.build_platlib is None:
             self.build_platlib = os.path.join (self.build_base,
-                                               'lib.' + self.plat)
+                                               'lib-' + plat_specifier)
 
         # 'build_lib' is the actual directory that we will use for this
         # particular module distribution -- if user didn't supply it, pick
@@ -89,7 +91,7 @@ def finalize_options (self):
         # "build/temp.<plat>"
         if self.build_temp is None:
             self.build_temp = os.path.join (self.build_base,
-                                            'temp.' + self.plat)
+                                            'temp-' + plat_specifier)
         if self.build_scripts is None:
             self.build_scripts = os.path.join (self.build_base, 'scripts')
     # finalize_options ()

From df1d24963b20a7532d52a441e7f39cb3c9b7c892 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 01:59:06 +0000
Subject: [PATCH 0594/8469] Typo fix.

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 938922a675..7182857d2c 100644
--- a/command/install.py
+++ b/command/install.py
@@ -226,7 +226,7 @@ def finalize_options (self):
         # about needing recursive variable expansion (shudder).
 
         py_version = (string.split(sys.version))[0]
-        prefix = get_config_vars('prefix', 'exec_prefix')
+        (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),

From e24f5d6128e2325fa37f0f37819c253b35fbaae0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 02:06:45 +0000
Subject: [PATCH 0595/8469] Tweaked the build temp dir names again.

---
 command/build.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/command/build.py b/command/build.py
index 1d901282ad..15476ca11b 100644
--- a/command/build.py
+++ b/command/build.py
@@ -62,12 +62,7 @@ def initialize_options (self):
 
     def finalize_options (self):
 
-        # Need this to name platform-specific directories, but sys.platform
-        # is not enough -- it only names the OS and version, not the
-        # hardware architecture!
-        self.plat = get_platform ()
-
-        plat_specifier = sys.version[0:3] + '-' + self.plat
+        plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
 
         # 'build_purelib' and 'build_platlib' just default to 'lib' and
         # 'lib.<plat>' under the base build directory.  We only use one of
@@ -76,7 +71,7 @@ def finalize_options (self):
             self.build_purelib = os.path.join (self.build_base, 'lib')
         if self.build_platlib is None:
             self.build_platlib = os.path.join (self.build_base,
-                                               'lib-' + plat_specifier)
+                                               'lib' + plat_specifier)
 
         # 'build_lib' is the actual directory that we will use for this
         # particular module distribution -- if user didn't supply it, pick
@@ -91,9 +86,10 @@ def finalize_options (self):
         # "build/temp.<plat>"
         if self.build_temp is None:
             self.build_temp = os.path.join (self.build_base,
-                                            'temp-' + plat_specifier)
+                                            'temp' + plat_specifier)
         if self.build_scripts is None:
             self.build_scripts = os.path.join (self.build_base, 'scripts')
+
     # finalize_options ()
 
 

From fe2e79b7e47c5f822e28eb0aebf83e652fa9192b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:06:57 +0000
Subject: [PATCH 0596/8469] Factored the "sub-command" machinery out to
 Command.  Mainly, this meant removing 'get_sub_commands()', and moving the
 'sub_commands' class attribute to the end and restructuring it to conform to
 the new regime.

---
 command/install.py | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/command/install.py b/command/install.py
index 7182857d2c..04b325a6d2 100644
--- a/command/install.py
+++ b/command/install.py
@@ -101,17 +101,6 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    # 'sub_commands': a list of commands this command might have to run to
-    # get its work done.  Each command is represented as a tuple (method,
-    # command) where 'method' is the name of a method to call that returns
-    # true if 'command' (the sub-command name, a string) needs to be run.
-    # If 'method' is None, assume that 'command' must always be run.
-    sub_commands = [('has_lib', 'install_lib'),
-                    ('has_headers', 'install_headers'),
-                    ('has_scripts', 'install_scripts'),
-                    ('has_data', 'install_data'),
-                   ]
-
 
     def initialize_options (self):
 
@@ -444,20 +433,6 @@ def handle_extra_path (self):
     # handle_extra_path ()
 
 
-    def get_sub_commands (self):
-        """Return the list of subcommands that we need to run.  This is
-        based on the 'subcommands' class attribute: each tuple in that list
-        can name a method that we call to determine if the subcommand needs
-        to be run for the current distribution."""
-        commands = []
-        for (method, cmd_name) in self.sub_commands:
-            if method is not None:
-                method = getattr(self, method)
-            if method is None or method():
-                commands.append(cmd_name)
-        return commands
-
-
     def run (self):
 
         # Obviously have to build before we can install
@@ -494,6 +469,8 @@ def run (self):
     # run ()
 
 
+    # -- Predicates for sub-command list -------------------------------
+
     def has_lib (self):
         """Return true if the current distribution has any Python
         modules to install."""
@@ -544,4 +521,12 @@ def create_path_file (self):
                         "installations)") %
                        filename)
 
+    # 'sub_commands': a list of commands this command might have to run to
+    # get its work done.  See cmd.py for more info.
+    sub_commands = [('install_lib',     has_lib),
+                    ('install_headers', has_headers),
+                    ('install_scripts', has_scripts),
+                    ('install_data',    has_data),
+                   ]
+
 # class install

From 2534b87e2eb30b3657de351d70266460069506dd Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:09:17 +0000
Subject: [PATCH 0597/8469] Added the "sub-command" machinery to formalize the
 notion of "command families" -- eg. install and its brood, build and its
 brood, and so forth. Specifically: added the 'sub_commands' class attribute
 (empty list, sub- classes must override it) and a comment describing it, and
 the 'get_sub_commands()' method.

---
 cmd.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/cmd.py b/cmd.py
index 474f8f321b..61d234bb4e 100644
--- a/cmd.py
+++ b/cmd.py
@@ -31,6 +31,23 @@ class Command:
     command class.
     """
 
+    # 'sub_commands' formalizes the notion of a "family" of commands,
+    # eg. "install" as the parent with sub-commands "install_lib",
+    # "install_headers", etc.  The parent of a family of commands
+    # defines 'sub_commands' as a class attribute; it's a list of
+    #    (command_name : string, predicate : unbound_method | string | None)
+    # tuples, where 'predicate' is a method of the parent command that
+    # determines whether the corresponding command is applicable in the
+    # current situation.  (Eg. we "install_headers" is only applicable if
+    # we have any C header files to install.)  If 'predicate' is None,
+    # that command is always applicable.
+    # 
+    # 'sub_commands' is usually defined at the *end* of a class, because
+    # predicates can be unbound methods, so they must already have been
+    # defined.  The canonical example is the "install" command.
+    sub_commands = []
+
+
     # -- Creation/initialization methods -------------------------------
 
     def __init__ (self, dist):
@@ -310,6 +327,20 @@ def run_command (self, command):
         self.distribution.run_command (command)
 
 
+    def get_sub_commands (self):
+        """Determine the sub-commands that are relevant in the current
+        distribution (ie., that need to be run).  This is based on the
+        'sub_commands' class attribute: each tuple in that list may include
+        a method that we call to determine if the subcommand needs to be
+        run for the current distribution.  Return a list of command names.
+        """
+        commands = []
+        for (cmd_name, method) in self.sub_commands:
+            if method is None or method(self):
+                commands.append(cmd_name)
+        return commands
+
+
     # -- External world manipulation -----------------------------------
 
     def warn (self, msg):

From 09dbe7ef0f1498e27bfdeef00ffd238e1c13b62f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:23:28 +0000
Subject: [PATCH 0598/8469] Generalized 'reinitialize_command()' so it can
 optionally reinitialize the command's sub-commands as well (off by default). 
 This is essential if we want to be be able to run (eg.) "install" twice in
 one run, as happens when generating multiple built distributions in one run.

---
 dist.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 1552dc0c41..b126a99757 100644
--- a/dist.py
+++ b/dist.py
@@ -733,7 +733,7 @@ def _set_command_options (self, command_obj, option_dict=None):
                       (source, command_name, option)
             setattr(command_obj, option, value)
 
-    def reinitialize_command (self, command):
+    def reinitialize_command (self, command, reinit_subcommands=0):
         """Reinitializes a command to the state it was in when first
         returned by 'get_command_obj()': ie., initialized but not yet
         finalized.  This provides the opportunity to sneak option
@@ -743,9 +743,18 @@ def reinitialize_command (self, command):
         'finalize_options()' or 'ensure_finalized()') before using it for
         real.  
 
-        'command' should be a command name (string) or command object.
+        'command' should be a command name (string) or command object.  If
+        'reinit_subcommands' is true, also reinitializes the command's
+        sub-commands, as declared by the 'sub_commands' class attribute (if
+        it has one).  See the "install" command for an example.  Only
+        reinitializes the sub-commands that actually matter, ie. those
+        whose test predicates return true.
+
         Returns the reinitialized command object.
         """
+        print "reinitialize_command: command=%s" % command
+        print "  before: have_run =", self.have_run
+
         from distutils.cmd import Command
         if not isinstance(command, Command):
             command_name = command
@@ -759,6 +768,15 @@ def reinitialize_command (self, command):
         command.finalized = 0
         self.have_run[command_name] = 0
         self._set_command_options(command)
+
+        print "  after:  have_run =", self.have_run
+
+        if reinit_subcommands:
+            print ("  reinitializing sub-commands: %s" %
+                   command.get_sub_commands())
+            for sub in command.get_sub_commands():
+                self.reinitialize_command(sub, reinit_subcommands)            
+
         return command
 
         

From 927edd6665097270bd2930210f37501f692bbe55 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:25:55 +0000
Subject: [PATCH 0599/8469] In 'reinitialize_subcommand()', pass
 'reinit_subcommands' flag on to the real implementation in Distribution.

---
 cmd.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd.py b/cmd.py
index 61d234bb4e..7866d1b607 100644
--- a/cmd.py
+++ b/cmd.py
@@ -316,8 +316,9 @@ def get_finalized_command (self, command, create=1):
 
     # XXX rename to 'get_reinitialized_command()'? (should do the
     # same in dist.py, if so)
-    def reinitialize_command (self, command):
-        return self.distribution.reinitialize_command(command)
+    def reinitialize_command (self, command, reinit_subcommands=0):
+        return self.distribution.reinitialize_command(
+            command, reinit_subcommands)
 
     def run_command (self, command):
         """Run some other command: uses the 'run_command()' method of

From 8db8a763ae8c5c0456a161c93a765483887d9130 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:27:17 +0000
Subject: [PATCH 0600/8469] Remove some debugging output from the last change.

---
 dist.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/dist.py b/dist.py
index b126a99757..c5fe86ebbf 100644
--- a/dist.py
+++ b/dist.py
@@ -752,9 +752,6 @@ def reinitialize_command (self, command, reinit_subcommands=0):
 
         Returns the reinitialized command object.
         """
-        print "reinitialize_command: command=%s" % command
-        print "  before: have_run =", self.have_run
-
         from distutils.cmd import Command
         if not isinstance(command, Command):
             command_name = command
@@ -769,11 +766,7 @@ def reinitialize_command (self, command, reinit_subcommands=0):
         self.have_run[command_name] = 0
         self._set_command_options(command)
 
-        print "  after:  have_run =", self.have_run
-
         if reinit_subcommands:
-            print ("  reinitializing sub-commands: %s" %
-                   command.get_sub_commands())
             for sub in command.get_sub_commands():
                 self.reinitialize_command(sub, reinit_subcommands)            
 

From ba1539c0c415bebf7bf237cb91e0dc0c007b00bd Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:30:47 +0000
Subject: [PATCH 0601/8469] Ensure sub-commands of "install" are reinitialized
 too. Run "install" the right way, by calling 'run_command()'.

---
 command/bdist_dumb.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 2da9c48795..afeb4ad35f 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -71,12 +71,11 @@ def run (self):
 
         self.run_command ('build')
 
-        install = self.reinitialize_command('install')
+        install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.bdist_dir
 
         self.announce ("installing to %s" % self.bdist_dir)
-        install.ensure_finalized()
-        install.run()
+        self.run_command('install')
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.

From 7275ee4bb9a86ab4d196242acc902697a70caa67 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:53:41 +0000
Subject: [PATCH 0602/8469] Renamed --keep-tree option to --keep-temp.

---
 command/bdist_dumb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index afeb4ad35f..1fdbf4253b 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -25,7 +25,7 @@ class bdist_dumb (Command):
                      "(default: %s)" % get_platform()),
                     ('format=', 'f',
                      "archive format to create (tar, ztar, gztar, zip)"),
-                    ('keep-tree', 'k',
+                    ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
                     ('dist-dir=', 'd',
@@ -40,7 +40,7 @@ def initialize_options (self):
         self.bdist_dir = None
         self.plat_name = None
         self.format = None
-        self.keep_tree = 0
+        self.keep_temp = 0
         self.dist_dir = None
 
     # initialize_options()
@@ -85,7 +85,7 @@ def run (self):
                            self.format,
                            root_dir=self.bdist_dir)
 
-        if not self.keep_tree:
+        if not self.keep_temp:
             remove_tree (self.bdist_dir, self.verbose, self.dry_run)
 
     # run()

From cedc5acb59abb40151af3df16d4e1c7751608c78 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:54:18 +0000
Subject: [PATCH 0603/8469] Renamed --clean to --no-keep-temp and --noclean to
 --keep-temp.

---
 command/bdist_rpm.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 9bddddce24..2afc714670 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -97,10 +97,10 @@ class bdist_rpm (Command):
          "capabilities made obsolete by this package"),
 
         # Actions to take when building RPM
-        ('clean', None,
-         "clean up RPM build directory [default]"),
-        ('no-clean', None,
+        ('keep-temp', 'k',
          "don't clean up RPM build directory"),
+        ('no-keep-temp', None,
+         "clean up RPM build directory [default]"),
         ('use-rpm-opt-flags', None,
          "compile with RPM_OPT_FLAGS when building from source RPM"),
         ('no-rpm-opt-flags', None,
@@ -111,7 +111,7 @@ class bdist_rpm (Command):
          "RPM 2 compatibility mode"),
        ]
 
-    negative_opt = {'no-clean': 'clean',
+    negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
                     'rpm2-mode': 'rpm3-mode'}
 
@@ -152,7 +152,7 @@ def initialize_options (self):
         self.build_requires = None
         self.obsoletes = None
 
-        self.clean = 1
+        self.keep_temp = 0
         self.use_rpm_opt_flags = 1
         self.rpm3_mode = 1
 
@@ -303,7 +303,7 @@ def run (self):
         if self.rpm3_mode:
             rpm_cmd.extend(['--define',
                              '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
-        if self.clean:
+        if not self.keep_temp:
             rpm_cmd.append('--clean')
         rpm_cmd.append(spec_path)
         self.spawn(rpm_cmd)

From 55c0d1f2782c95996bf76de2418aa62fe28de33a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 15:56:32 +0000
Subject: [PATCH 0604/8469] Renamed --keep-tree to --keep-temp.

---
 command/bdist_wininst.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 2e535d51ec..5030ef9057 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -19,7 +19,7 @@ class bdist_wininst (Command):
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
-                    ('keep-tree', 'k',
+                    ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
                     ('target-version=', 'v',
@@ -35,7 +35,7 @@ class bdist_wininst (Command):
 
     def initialize_options (self):
         self.bdist_dir = None
-        self.keep_tree = 0
+        self.keep_temp = 0
         self.no_target_compile = 0
         self.no_target_optimize = 0
         self.target_version = None
@@ -111,7 +111,7 @@ def run (self):
                                      root_dir=root_dir)
         self.create_exe (arcname, fullname)
 
-        if not self.keep_tree:
+        if not self.keep_temp:
             remove_tree (self.bdist_dir, self.verbose, self.dry_run)
 
     # run()

From 8e1b5544e34c5186aa2c8a1c63fd426d2dfae782 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 16:04:59 +0000
Subject: [PATCH 0605/8469] Rene Liebscher: if we have to run the same
 sub-command multiple times (eg. "bdist_dumb", to generate both ZIP and tar
 archives in the same run), tell all but the last run to keep temp files --
 this just gets rid of the need to pseudo-install the same files multiple
 times.

---
 command/bdist.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index cc0c3985cf..8651e70954 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -90,7 +90,8 @@ def finalize_options (self):
         # "build/bdist.<plat>/dumb", "build/bdist.<plat>/rpm", etc.)
         if self.bdist_base is None:
             build_base = self.get_finalized_command('build').build_base
-            self.bdist_base = os.path.join(build_base, 'bdist.' + self.plat_name)
+            self.bdist_base = os.path.join(build_base,
+                                           'bdist.' + self.plat_name)
 
         self.ensure_string_list('formats')
         if self.formats is None:
@@ -109,16 +110,28 @@ def finalize_options (self):
 
     def run (self):
 
+        # Figure out which sub-commands we need to run.
+        commands = []
         for format in self.formats:
             try:
-                cmd_name = self.format_command[format][0]
+                commands.append(self.format_command[format][0])
             except KeyError:
-                raise DistutilsOptionError, \
-                      "invalid format '%s'" % format
+                raise DistutilsOptionError, "invalid format '%s'" % format
 
+        # Reinitialize and run each command.
+        for i in range(len(self.formats)):
+            cmd_name = commands[i]
             sub_cmd = self.reinitialize_command(cmd_name)
             if cmd_name not in self.no_format_option:
-                sub_cmd.format = format
+                sub_cmd.format = self.formats[i]
+
+            print ("bdist.run: format=%s, command=%s, rest=%s" %
+                   (self.formats[i], cmd_name, commands[i+1:]))
+
+            # If we're going to need to run this command again, tell it to
+            # keep its temporary files around so subsequent runs go faster.
+            if cmd_name in commands[i+1:]:
+                sub_cmd.keep_temp = 1
             self.run_command (cmd_name)
 
     # run()

From 41ea88ac7aefa3d488f04485e277ad53e8c023f6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 18:04:55 +0000
Subject: [PATCH 0606/8469] [change from 2000/04/17, propagating now to
 distutils copy] Dropped the 'collapse_ws' option and replaced it with
 'collapse_join' -- it's *much* faster (no 're.sub()') and this is the reason
 I really added 'collapse_ws', ie. to remove leading whitespace from a line
 being joined to the previous line.

---
 text_file.py | 56 ++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/text_file.py b/text_file.py
index 7b29ef4aa5..f22b3e9167 100644
--- a/text_file.py
+++ b/text_file.py
@@ -9,18 +9,18 @@
 __revision__ = "$Id$"
 
 from types import *
-import sys, os, string, re
+import sys, os, string
 
 
 class TextFile:
 
     """Provides a file-like object that takes care of all the things you
        commonly want to do when processing a text file that has some
-       line-by-line syntax: strip comments (as long as "#" is your comment
-       character), skip blank lines, join adjacent lines by escaping the
-       newline (ie. backslash at end of line), strip leading and/or
-       trailing whitespace, and collapse internal whitespace.  All of these
-       are optional and independently controllable.
+       line-by-line syntax: strip comments (as long as "#" is your
+       comment character), skip blank lines, join adjacent lines by
+       escaping the newline (ie. backslash at end of line), strip
+       leading and/or trailing whitespace.  All of these are optional
+       and independently controllable.
 
        Provides a 'warn()' method so you can generate warning messages that
        report physical line number, even if the logical line in question
@@ -50,7 +50,7 @@ class TextFile:
            each line before returning it
          skip_blanks [default: true}
            skip lines that are empty *after* stripping comments and
-           whitespace.  (If both lstrip_ws and rstrip_ws are true,
+           whitespace.  (If both lstrip_ws and rstrip_ws are false,
            then some lines may consist of solely whitespace: these will
            *not* be skipped, even if 'skip_blanks' is true.)
          join_lines [default: false]
@@ -59,12 +59,9 @@ class TextFile:
            to it to form one "logical line"; if N consecutive lines end
            with a backslash, then N+1 physical lines will be joined to
            form one logical line.
-         collapse_ws [default: false]  
-           after stripping comments and whitespace and joining physical
-           lines into logical lines, all internal whitespace (strings of
-           whitespace surrounded by non-whitespace characters, and not at
-           the beginning or end of the logical line) will be collapsed
-           to a single space.
+         collapse_join [default: false]
+           strip leading whitespace from lines that are joined to their
+           predecessor; only matters if (join_lines and not lstrip_ws)
 
        Note that since 'rstrip_ws' can strip the trailing newline, the
        semantics of 'readline()' must differ from those of the builtin file
@@ -75,10 +72,10 @@ class TextFile:
 
     default_options = { 'strip_comments': 1,
                         'skip_blanks':    1,
-                        'join_lines':     0,
                         'lstrip_ws':      0,
                         'rstrip_ws':      1,
-                        'collapse_ws':    0,
+                        'join_lines':     0,
+                        'collapse_join':  0,
                       }
 
     def __init__ (self, filename=None, file=None, **options):
@@ -219,6 +216,8 @@ def readline (self):
                                "end-of-file")
                     return buildup_line
 
+                if self.collapse_join:
+                    line = string.lstrip (line)
                 line = buildup_line + line
 
                 # careful: pay attention to line number when incrementing it
@@ -261,10 +260,6 @@ def readline (self):
                     buildup_line = line[0:-2] + '\n'
                     continue
 
-            # collapse internal whitespace (*after* joining lines!)
-            if self.collapse_ws:
-                line = re.sub (r'(\S)\s+(\S)', r'\1 \2', line)            
-
             # well, I guess there's some actual content there: return it
             return line
 
@@ -295,7 +290,7 @@ def unreadline (self, line):
     test_data = """# test file
 
 line 3 \\
-continues on next line
+  continues on next line
 """
 
 
@@ -303,16 +298,21 @@ def unreadline (self, line):
     result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
 
     # result 2: just strip comments
-    result2 = ["\n", "\n", "line 3 \\\n", "continues on next line\n"]
+    result2 = ["\n", "\n", "line 3 \\\n", "  continues on next line\n"]
 
     # result 3: just strip blank lines
-    result3 = ["# test file\n", "line 3 \\\n", "continues on next line\n"]
+    result3 = ["# test file\n", "line 3 \\\n", "  continues on next line\n"]
 
     # result 4: default, strip comments, blank lines, and trailing whitespace
-    result4 = ["line 3 \\", "continues on next line"]
+    result4 = ["line 3 \\", "  continues on next line"]
 
-    # result 5: full processing, strip comments and blanks, plus join lines
-    result5 = ["line 3 continues on next line"]
+    # result 5: strip comments and blanks, plus join lines (but don't
+    # "collapse" joined lines
+    result5 = ["line 3   continues on next line"]
+
+    # result 6: strip comments and blanks, plus join lines (and
+    # "collapse" joined lines
+    result6 = ["line 3 continues on next line"]
 
     def test_input (count, description, file, expected_result):
         result = file.readlines ()
@@ -349,7 +349,11 @@ def test_input (count, description, file, expected_result):
 
     in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
                         join_lines=1, rstrip_ws=1)
-    test_input (5, "full processing", in_file, result5)
+    test_input (5, "join lines without collapsing", in_file, result5)
+
+    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                        join_lines=1, rstrip_ws=1, collapse_join=1)
+    test_input (6, "join lines with collapsing", in_file, result6)
 
     os.remove (filename)
     

From c21a9987e9f21985cccaa2e3a244a0c456091692 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 18:06:31 +0000
Subject: [PATCH 0607/8469] [change from 2000/08/11, propagating now to
 distutils copy] Factored the guts of 'warn()' out to 'gen_error()', and added
 the 'error()' method (trivial thanks to the refactoring).

---
 text_file.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/text_file.py b/text_file.py
index f22b3e9167..b731762230 100644
--- a/text_file.py
+++ b/text_file.py
@@ -134,6 +134,22 @@ def close (self):
         self.current_line = None
 
 
+    def gen_error (self, msg, line=None):
+        outmsg = []
+        if line is None:
+            line = self.current_line
+        outmsg.append(self.filename + ", ")
+        if type (line) in (ListType, TupleType):
+            outmsg.append("lines %d-%d: " % tuple (line))
+        else:
+            outmsg.append("line %d: " % line)
+        outmsg.append(str(msg))
+        return string.join(outmsg, "")
+
+
+    def error (self, msg, line=None):
+        raise ValueError, "error: " + self.gen_error(msg, line)
+
     def warn (self, msg, line=None):
         """Print (to stderr) a warning message tied to the current logical
            line in the current file.  If the current logical line in the
@@ -142,15 +158,7 @@ def warn (self, msg, line=None):
            the current line number; it may be a list or tuple to indicate a
            range of physical lines, or an integer for a single physical
            line."""
-
-        if line is None:
-            line = self.current_line
-        sys.stderr.write (self.filename + ", ")
-        if type (line) in (ListType, TupleType):
-            sys.stderr.write ("lines %d-%d: " % tuple (line))
-        else:
-            sys.stderr.write ("line %d: " % line)
-        sys.stderr.write (str (msg) + "\n")
+        sys.stderr.write("warning: " + self.gen_error(msg, line) + "\n")
 
 
     def readline (self):

From 878b6ad60e8f5e4e163ae13074582e08f4ae4b3b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 18:09:22 +0000
Subject: [PATCH 0608/8469] Andrew Kuchling: Fixed precendence bug that meant
 setting skip_blanks to false didn't work under some circumstances.

---
 text_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text_file.py b/text_file.py
index b731762230..c983afa425 100644
--- a/text_file.py
+++ b/text_file.py
@@ -256,7 +256,7 @@ def readline (self):
 
             # blank line (whether we rstrip'ed or not)? skip to next line
             # if appropriate
-            if line == '' or line == '\n' and self.skip_blanks:
+            if (line == '' or line == '\n') and self.skip_blanks:
                 continue
 
             if self.join_lines:

From 0bd2aefe51af28256934aa5b567efb49d09f2f7a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 16 Sep 2000 18:33:36 +0000
Subject: [PATCH 0609/8469] Changed so lines that are all comment (or just
 whitespace + comment) are completely skipped, rather than being treated as
 blank lines (and then subject to the 'skip_blanks' flag).  This allows us to
 process old-style Setup files, which rely on   hello \\   # boo!   there
 coming out as "hello there".

---
 text_file.py | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/text_file.py b/text_file.py
index c983afa425..37bffe6139 100644
--- a/text_file.py
+++ b/text_file.py
@@ -201,8 +201,10 @@ def readline (self):
                 pos = string.find (line, "#")
                 if pos == -1:           # no "#" -- no comments
                     pass
-                elif pos == 0 or line[pos-1] != "\\": # it's a comment
-                    
+
+                # It's definitely a comment -- either "#" is the first
+                # character, or it's elsewhere and unescaped.
+                elif pos == 0 or line[pos-1] != "\\":
                     # Have to preserve the trailing newline, because it's
                     # the job of a later step (rstrip_ws) to remove it --
                     # and if rstrip_ws is false, we'd better preserve it!
@@ -212,6 +214,16 @@ def readline (self):
                     eol = (line[-1] == '\n') and '\n' or ''
                     line = line[0:pos] + eol
                     
+                    # If all that's left is whitespace, then skip line
+                    # *now*, before we try to join it to 'buildup_line' --
+                    # that way constructs like
+                    #   hello \\
+                    #   # comment that should be ignored
+                    #   there
+                    # result in "hello there".
+                    if string.strip(line) == "":
+                        continue
+
                 else:                   # it's an escaped "#"
                     line = string.replace (line, "\\#", "#")
                 
@@ -232,7 +244,8 @@ def readline (self):
                 if type (self.current_line) is ListType:
                     self.current_line[1] = self.current_line[1] + 1
                 else:
-                    self.current_line = [self.current_line, self.current_line+1]
+                    self.current_line = [self.current_line,
+                                         self.current_line+1]
             # just an ordinary line, read it as usual
             else:
                 if line is None:        # eof
@@ -271,7 +284,7 @@ def readline (self):
             # well, I guess there's some actual content there: return it
             return line
 
-    # end readline
+    # readline ()
 
 
     def readlines (self):
@@ -298,21 +311,26 @@ def unreadline (self, line):
     test_data = """# test file
 
 line 3 \\
+# intervening comment
   continues on next line
 """
-
-
     # result 1: no fancy options
     result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
 
     # result 2: just strip comments
-    result2 = ["\n", "\n", "line 3 \\\n", "  continues on next line\n"]
+    result2 = ["\n",
+               "line 3 \\\n",
+               "  continues on next line\n"]
 
     # result 3: just strip blank lines
-    result3 = ["# test file\n", "line 3 \\\n", "  continues on next line\n"]
+    result3 = ["# test file\n",
+               "line 3 \\\n",
+               "# intervening comment\n",
+               "  continues on next line\n"]
 
     # result 4: default, strip comments, blank lines, and trailing whitespace
-    result4 = ["line 3 \\", "  continues on next line"]
+    result4 = ["line 3 \\",
+               "  continues on next line"]
 
     # result 5: strip comments and blanks, plus join lines (but don't
     # "collapse" joined lines

From 7774801f0603d1cb9323ece86720102e31eaac79 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 17 Sep 2000 00:45:18 +0000
Subject: [PATCH 0610/8469] Added 'read_setup_file()' to read old-style Setup
 files.  Could make life   easier for people porting Makefile.pre.in-based
 extensions to Distutils. Also loosened argument-checking in Extension
 constructor to make life   easier for 'read_setup_file()'.

---
 extension.py | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 2 deletions(-)

diff --git a/extension.py b/extension.py
index 1d3112b652..a63ede233c 100644
--- a/extension.py
+++ b/extension.py
@@ -7,6 +7,7 @@
 
 __revision__ = "$Id$"
 
+import os, string
 from types import *
 
 
@@ -89,9 +90,8 @@ def __init__ (self, name, sources,
 
         assert type(name) is StringType, "'name' must be a string"
         assert (type(sources) is ListType and
-                len(sources) >= 1 and
                 map(type, sources) == [StringType]*len(sources)), \
-                "'sources' must be a non-empty list of strings"
+                "'sources' must be a list of strings"
 
         self.name = name
         self.sources = sources
@@ -107,3 +107,111 @@ def __init__ (self, name, sources,
         self.export_symbols = export_symbols or []
 
 # class Extension
+
+
+def read_setup_file (filename):
+    from distutils.sysconfig import \
+         parse_makefile, expand_makefile_vars, _variable_rx
+    from distutils.text_file import TextFile
+    from distutils.util import split_quoted
+
+    # First pass over the file to gather "VAR = VALUE" assignments.
+    vars = parse_makefile(filename)
+
+    # Second pass to gobble up the real content: lines of the form
+    #   <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
+    file = TextFile(filename,
+                    strip_comments=1, skip_blanks=1, join_lines=1,
+                    lstrip_ws=1, rstrip_ws=1)
+    extensions = []
+
+    while 1:
+        line = file.readline()
+        if line is None:                # eof
+            break
+        if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
+            continue
+
+        if line[0] == line[-1] == "*":
+            file.warn("'%s' lines not handled yet" % line)
+            continue
+
+        #print "original line: " + line
+        line = expand_makefile_vars(line, vars)
+        words = split_quoted(line)
+        #print "expanded line: " + line
+
+        # NB. this parses a slightly different syntax than the old
+        # makesetup script: here, there must be exactly one extension per
+        # line, and it must be the first word of the line.  I have no idea
+        # why the old syntax supported multiple extensions per line, as
+        # they all wind up being the same.
+
+        module = words[0]
+        ext = Extension(module, [])
+        append_next_word = None
+
+        for word in words[1:]:
+            if append_next_word is not None:
+                append_next_word.append(word)
+                append_next_word = None
+                continue
+
+            suffix = os.path.splitext(word)[1]
+            switch = word[0:2] ; value = word[2:]
+
+            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++"):
+                # hmm, should we do something about C vs. C++ sources?
+                # or leave it up to the CCompiler implementation to
+                # worry about?
+                ext.sources.append(word)
+            elif switch == "-I":
+                ext.include_dirs.append(value)
+            elif switch == "-D":
+                equals = string.find(value, "=")
+                if equals == -1:        # bare "-DFOO" -- no value
+                    ext.define_macros.append((value, None))
+                else:                   # "-DFOO=blah"
+                    ext.define_macros.append((value[0:equals],
+                                              value[equals+2:]))
+            elif switch == "-U":
+                ext.undef_macros.append(value)
+            elif switch == "-C":        # only here 'cause makesetup has it!
+                ext.extra_compile_args.append(word)
+            elif switch == "-l":
+                ext.libraries.append(value)
+            elif switch == "-L":
+                ext.library_dirs.append(value)
+            elif switch == "-R":
+                ext.runtime_library_dirs.append(value)
+            elif word == "-rpath":
+                append_next_word = ext.runtime_library_dirs
+            elif word == "-Xlinker":
+                append_next_word = ext.extra_link_args
+            elif switch == "-u":
+                ext.extra_link_args.append(word)
+                if not value:
+                    append_next_word = ext.extra_link_args
+            elif suffix in (".a", ".so", ".sl", ".o"):
+                # NB. a really faithful emulation of makesetup would
+                # append a .o file to extra_objects only if it
+                # had a slash in it; otherwise, it would s/.o/.c/
+                # and append it to sources.  Hmmmm.
+                ext.extra_objects.append(word)
+            else:
+                file.warn("unrecognized argument '%s'" % word)
+
+        extensions.append(ext)
+
+        #print "module:", module
+        #print "source files:", source_files
+        #print "cpp args:", cpp_args
+        #print "lib args:", library_args
+
+        #extensions[module] = { 'sources': source_files,
+        #                       'cpp_args': cpp_args,
+        #                       'lib_args': library_args }
+        
+    return extensions
+
+# read_setup_file ()

From 0e6eb0bf665aed42a3e42d4319a636b3ca6fa38c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 17 Sep 2000 00:53:02 +0000
Subject: [PATCH 0611/8469] Added 'expand_makefile_vars()' to (duh) expand
 make-style variables   in a string (gives you something to do with the
 dictionary returned   by 'parse_makefile()'). Pulled the regexes in
 'parse_makefile()' out -- they're now globals,   as 'expand_makefile_vars()'
 needs (two of) them. Cosmetic tweaks to 'parse_makefile()'.

---
 sysconfig.py | 48 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index de35d96a8d..605e95dfb2 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -157,6 +157,13 @@ def parse_config_h(fp, g=None):
                 g[m.group(1)] = 0
     return g
 
+
+# Regexes needed for parsing Makefile (and similar syntaxes,
+# like old-style Setup files).
+_variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
+_findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)")
+_findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
+
 def parse_makefile(fn, g=None):
     """Parse a Makefile-style file.
 
@@ -166,19 +173,18 @@ def parse_makefile(fn, g=None):
 
     """
     from distutils.text_file import TextFile
-    fp = TextFile(fn, strip_comments=1, join_lines=1)
+    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
 
     if g is None:
         g = {}
-    variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
     done = {}
     notdone = {}
 
     while 1:
         line = fp.readline()
-        if line is None:
+        if line is None:                # eof
             break
-        m = variable_rx.match(line)
+        m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
             v = string.strip(v)
@@ -190,14 +196,10 @@ def parse_makefile(fn, g=None):
                 done[n] = v
 
     # do variable interpolation here
-    findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)")
-    findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
     while notdone:
         for name in notdone.keys():
             value = notdone[name]
-            m = findvar1_rx.search(value)
-            if not m:
-                m = findvar2_rx.search(value)
+            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
             if m:
                 n = m.group(1)
                 if done.has_key(n):
@@ -228,11 +230,39 @@ def parse_makefile(fn, g=None):
                 # bogus variable reference; just drop it since we can't deal
                 del notdone[name]
 
+    fp.close()
+
     # save the results in the global dictionary
     g.update(done)
     return g
 
 
+def expand_makefile_vars(s, vars):
+    """Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
+    'string' according to 'vars' (a dictionary mapping variable names to
+    values).  Variables not present in 'vars' are silently expanded to the
+    empty string.  The variable values in 'vars' should not contain further
+    variable expansions; if 'vars' is the output of 'parse_makefile()',
+    you're fine.  Returns a variable-expanded version of 's'.
+    """
+
+    # This algorithm does multiple expansion, so if vars['foo'] contains
+    # "${bar}", it will expand ${foo} to ${bar}, and then expand
+    # ${bar}... and so forth.  This is fine as long as 'vars' comes from
+    # 'parse_makefile()', which takes care of such expansions eagerly,
+    # according to make's variable expansion semantics.
+
+    while 1:
+        m = _findvar1_rx.search(s) or _findvar2_rx.search(s)
+        if m:
+            name = m.group(1)
+            (beg, end) = m.span()
+            s = s[0:beg] + vars.get(m.group(1)) + s[end:]
+        else:
+            break
+    return s
+
+
 _config_vars = None
 
 def _init_posix():

From 7ce5bceb8f36d5b1b416bde08b9f161ca4bf51d4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 17 Sep 2000 00:54:58 +0000
Subject: [PATCH 0612/8469] Fixed to respect 'define_macros' and 'undef_macros'
 on Extension object.

---
 command/build_ext.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f880a7a8d5..d578b846ac 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -403,6 +403,10 @@ def build_extensions (self):
             # command line args.  Hence we combine them in order:
             extra_args = ext.extra_compile_args or []
 
+            macros = ext.define_macros[:]
+            for undef in ext.undef_macros:
+                macros.append((undef,))
+
             # XXX and if we support CFLAGS, why not CC (compiler
             # executable), CPPFLAGS (pre-processor options), and LDFLAGS
             # (linker options) too?
@@ -413,7 +417,7 @@ def build_extensions (self):
                 
             objects = self.compiler.compile (sources,
                                              output_dir=self.build_temp,
-                                             #macros=macros,
+                                             macros=macros,
                                              include_dirs=ext.include_dirs,
                                              debug=self.debug,
                                              extra_postargs=extra_args)

From 7d833392261181af33c821afed6dff05ed17b3b0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 18 Sep 2000 00:41:10 +0000
Subject: [PATCH 0613/8469] Catch up to recent changes in TextFile (spotted by
 Bastian Kleineidam).

---
 command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 6de703ec92..9b9f6064c5 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -332,7 +332,7 @@ def read_template (self):
                              join_lines=1,
                              lstrip_ws=1,
                              rstrip_ws=1,
-                             collapse_ws=1)
+                             collapse_join=1)
 
         while 1:
             line = template.readline()

From 3d12a4154867139b39890b8debcf250286f6b5e7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 19 Sep 2000 11:10:23 +0000
Subject: [PATCH 0614/8469] Set the 'nt' installation scheme for the install
 command even if run on other systems, so that data, headers, scripts are
 included in the installer.

---
 command/bdist_wininst.py | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 5030ef9057..4637d4518c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -74,6 +74,17 @@ def run (self):
 
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
+        if os.name != 'nt':
+            # must force install to use the 'nt' scheme
+            install.select_scheme ('nt')
+            # change the backslash to the current pathname separator
+            for key in ('purelib', 'platlib', 'headers', 'scripts',
+                        'data'):
+                attrname = 'install_' + key
+                attr = getattr (install, attrname)
+                if attr:
+                    attr = string.replace (attr, '\\', os.sep)
+                    setattr (install, attrname, attr)
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files
@@ -99,14 +110,20 @@ def run (self):
         archive_basename = os.path.join(self.bdist_dir,
                                         "%s.win32" % fullname)
 
-        # XXX hack! Our archive MUST be relative to sys.prefix
-        # XXX What about .install_data, .install_scripts, ...?
-        # [Perhaps require that all installation dirs be under sys.prefix
-        # on Windows?  this will be acceptable until we start dealing
-        # with Python applications, at which point we should zip up
-        # the application directory -- and again everything can be
-        # under one dir --GPW]
-        root_dir = install.install_lib
+        # Our archive MUST be relative to sys.prefix, which is the
+        # same as install_lib in the 'nt' scheme.
+        root_dir = os.path.normpath (install.install_lib)
+
+        # Sanity check: Make sure everything is included
+        for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
+            attrname = 'install_' + key
+            install_x = getattr (install, attrname)
+            # (Use normpath so that we can string.find to look for
+            # subdirectories)
+            install_x = os.path.normpath (install_x)
+            if string.find (install_x, root_dir) != 0:
+                raise DistutilsInternalError \
+                      ("'%s' not included in install_lib" % key)
         arcname = self.make_archive (archive_basename, "zip",
                                      root_dir=root_dir)
         self.create_exe (arcname, fullname)

From 5054d1229b94a8fe66d72b69de38e62955997685 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 19 Sep 2000 23:56:43 +0000
Subject: [PATCH 0615/8469] *Very* belated application of Thomas Heller's patch
 to handle resource files.  The gist of the patch is to treat ".rc" and ".mc"
 files as source files; ".mc" files are compiled to ".rc" and then ".res", and
 ".rc" files are compiled to ".res".  Wish I knew what all these things stood
 for...

---
 msvccompiler.py | 89 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index ae08e7fdcf..ea58a79cd3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -178,10 +178,14 @@ class MSVCCompiler (CCompiler) :
     # Private class data (need to distinguish C from C++ source for compiler)
     _c_extensions = ['.c']
     _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.rc']
+    _mc_extensions = ['.mc']
 
     # Needed for the filename generation methods provided by the
     # base class, CCompiler.
-    src_extensions = _c_extensions + _cpp_extensions
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions + _mc_extensions)
+    res_extension = '.res'
     obj_extension = '.obj'
     static_lib_extension = '.lib'
     shared_lib_extension = '.dll'
@@ -203,6 +207,8 @@ def __init__ (self,
             self.cc   = find_exe("cl.exe", version)
             self.link = find_exe("link.exe", version)
             self.lib  = find_exe("lib.exe", version)
+            self.rc   = find_exe("rc.exe", version)     # resource compiler
+            self.mc   = find_exe("mc.exe", version)     # message compiler
             set_path_env_var ('lib', version)
             set_path_env_var ('include', version)
             path=get_msvc_paths('path', version)
@@ -217,6 +223,8 @@ def __init__ (self,
             self.cc = "cl.exe"
             self.link = "link.exe"
             self.lib = "lib.exe"
+            self.rc = "rc.exe"
+            self.mc = "mc.exe"
 
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ]
@@ -232,6 +240,37 @@ def __init__ (self,
 
     # -- Worker methods ------------------------------------------------
 
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        # Copied from ccompiler.py, extended to return .res as 'object'-file
+        # for .rc input file
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            (base, ext) = os.path.splitext (src_name)
+            if ext not in self.src_extensions:
+                # Better to raise an exception instead of silently continuing
+                # and later complain about sources and targets having
+                # different lengths
+                raise CompileError ("Don't know how to compile %s" % src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext in self._rc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            elif ext in self._mc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.obj_extension))
+        return obj_names
+
+    # object_filenames ()
+
+
     def compile (self,
                  sources,
                  output_dir=None,
@@ -263,14 +302,58 @@ def compile (self,
             if skip_sources[src]:
                 self.announce ("skipping %s (%s up-to-date)" % (src, obj))
             else:
+                self.mkpath (os.path.dirname (obj))
+
                 if ext in self._c_extensions:
                     input_opt = "/Tc" + src
                 elif ext in self._cpp_extensions:
                     input_opt = "/Tp" + src
+                elif ext in self._rc_extensions:
+                    # compile .RC to .RES file
+                    input_opt = src
+                    output_opt = "/fo" + obj
+                    try:
+                        self.spawn ([self.rc] +
+                                    [output_opt] + [input_opt])
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+                    continue
+                elif ext in self._mc_extensions:
+
+                    # Compile .MC to .RC file to .RES file.
+                    #   * '-h dir' specifies the directory for the
+                    #     generated include file
+                    #   * '-r dir' specifies the target directory of the
+                    #     generated RC file and the binary message resource
+                    #     it includes
+                    #
+                    # For now (since there are no options to change this),
+                    # we use the source-directory for the include file and
+                    # the build directory for the RC file and message
+                    # resources. This works at least for win32all.
+
+                    h_dir = os.path.dirname (src)
+                    rc_dir = os.path.dirname (obj)
+                    try:
+                        # first compile .MC to .RC and .H file
+                        self.spawn ([self.mc] +
+                                    ['-h', h_dir, '-r', rc_dir] + [src])
+                        base, _ = os.path.splitext (os.path.basename (src))
+                        rc_file = os.path.join (rc_dir, base + '.rc')
+                        # then compile .RC to .RES file
+                        self.spawn ([self.rc] +
+                                    ["/fo" + obj] + [rc_file])
+
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+                    continue
+                else:
+                    # how to handle this file?
+                    raise CompileError (
+                        "Don't know how to compile %s to %s" % \
+                        (src, obj))
 
                 output_opt = "/Fo" + obj
-
-                self.mkpath (os.path.dirname (obj))
                 try:
                     self.spawn ([self.cc] + compile_opts + pp_opts +
                                 [input_opt, output_opt] +

From ec1f37f7faad9e09826aa1b6003f006676f0a9ef Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 21 Sep 2000 01:23:35 +0000
Subject: [PATCH 0616/8469] Corran Webster: fix 'change_root()' to handle Mac
 OS paths.

---
 util.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 468887127f..b60e39c709 100644
--- a/util.py
+++ b/util.py
@@ -100,7 +100,13 @@ def change_root (new_root, pathname):
         return os.path.join (new_root, path)
 
     elif os.name == 'mac':
-        raise RuntimeError, "no clue how to do this on Mac OS"
+        if not os.path.isabs(pathname):
+            return os.path.join(new_root, pathname)
+        else:
+            # Chop off volume name from start of path
+            elements = string.split(pathname, ":", 1)
+            pathname = ":" + elements[1]
+            return os.path.join(new_root, pathname)
 
     else:
         raise DistutilsPlatformError, \

From d56ce29dfa83433ccaa14e7fc1cd3d732cc08955 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 22 Sep 2000 01:05:43 +0000
Subject: [PATCH 0617/8469] Fix 'convert_path()' so it returns immediately
 under Unix -- prevents blowing up when the pathname starts with '/', which is
 needed when converting installation directories in the "install" command.

---
 util.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index b60e39c709..3f06807854 100644
--- a/util.py
+++ b/util.py
@@ -68,15 +68,15 @@ def convert_path (pathname):
        absolute (starts with '/') or contains local directory separators
        (unless the local separator is '/', of course)."""
 
+    if os.sep == '/':
+        return pathname
     if pathname[0] == '/':
         raise ValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
-    if os.sep != '/':
-        paths = string.split (pathname, '/')
-        return apply (os.path.join, paths)
-    else:
-        return pathname
+
+    paths = string.split(pathname, '/')
+    return apply(os.path.join, paths)
 
 # convert_path ()
 

From ade6e34965cd938919f4177788b89e96c6f16d99 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 22 Sep 2000 01:31:08 +0000
Subject: [PATCH 0618/8469] Changed all paths in the INSTALL_SCHEMES dict to
 Unix syntax, and added 'convert_paths()' method to convert them all to the
 local syntax (backslash or colon or whatever) at the appropriate time.

Added SCHEME_KEYS to get rid of one hard-coded list of attributes (in
'select_scheme()').

Default 'install_path_file' to true, and never set it false (it's just
there in case some outsider somewhere wants to disable installation of the
.pth file for whatever reason).

Toned down the warning emitted when 'install_path_file' is false, since we
no longer know why it might be false.

Added 'warn_dir' flag to suppress warning when installing to a directory
not in sys.path (again, we never set this false -- it's there for outsiders
to use, specifically the "bdist_*" commands).

Pulled the loop of 'change_root()' calls out to new method 'change_roots()'.

Comment updates/deletions/additions.
---
 command/install.py | 99 ++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/command/install.py b/command/install.py
index 04b325a6d2..573e0740eb 100644
--- a/command/install.py
+++ b/command/install.py
@@ -33,19 +33,24 @@
     'nt': {
         'purelib': '$base',
         'platlib': '$base',
-        'headers': '$base\\Include\\$dist_name',
-        'scripts': '$base\\Scripts',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
         'data'   : '$base',
         },
     'mac': {
-        'purelib': '$base:Lib:site-packages',
-        'platlib': '$base:Lib:site-packages',
-        'headers': '$base:Include:$dist_name',
-        'scripts': '$base:Scripts',
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
         'data'   : '$base',
         }
     }
 
+# The keys to an installation scheme; if any new types of files are to be
+# installed, be sure to add an entry to every installation scheme above,
+# and to SCHEME_KEYS here.
+SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+
 
 class install (Command):
 
@@ -130,14 +135,24 @@ def initialize_options (self):
 
         # These two are for putting non-packagized distributions into their
         # own directory and creating a .pth file if it makes sense.
-        # 'extra_path' comes from the setup file; 'install_path_file' is
-        # set only if we determine that it makes sense to install a path
-        # file.
+        # 'extra_path' comes from the setup file; 'install_path_file' can
+        # be turned off if it makes no sense to install a .pth file.  (But
+        # better to install it uselessly than to guess wrong and not
+        # install it when it's necessary and would be used!)  Currently,
+        # 'install_path_file' is always true unless some outsider meddles
+        # with it.
         self.extra_path = None
-        self.install_path_file = 0
-
+        self.install_path_file = 1
+
+        # 'force' forces installation, even if target files are not
+        # out-of-date.  'skip_build' skips running the "build" command,
+        # handy if you know it's not necessary.  'warn_dir' (which is *not*
+        # a user option, it's just there so the bdist_* commands can turn
+        # it off) determines whether we warn about installing to a
+        # directory not in sys.path.
         self.force = 0
         self.skip_build = 0
+        self.warn_dir = 1
 
         # These are only here as a conduit from the 'build' command to the
         # 'install_*' commands that do the real work.  ('build_base' isn't
@@ -256,6 +271,12 @@ def finalize_options (self):
             else:
                 self.install_lib = self.install_purelib
                     
+
+        # Convert directories from Unix /-separated syntax to the local
+        # convention.
+        self.convert_paths('lib', 'purelib', 'platlib',
+                           'scripts', 'data', 'headers')
+
         # Well, we're not actually fully completely finalized yet: we still
         # have to deal with 'extra_path', which is the hack for allowing
         # non-packagized module distributions (hello, Numerical Python!) to
@@ -267,11 +288,8 @@ def finalize_options (self):
         # If a new root directory was supplied, make all the installation
         # dirs relative to it.
         if self.root is not None:
-            for name in ('libbase', 'lib', 'purelib', 'platlib',
-                         'scripts', 'data', 'headers'):
-                attr = "install_" + name
-                new_val = change_root (self.root, getattr (self, attr))
-                setattr (self, attr, new_val)
+            self.change_roots('libbase', 'lib', 'purelib', 'platlib',
+                              'scripts', 'data', 'headers')
 
         self.dump_dirs ("after prepending root")
 
@@ -324,22 +342,11 @@ def finalize_unix (self):
 
                 self.prefix = os.path.normpath (sys.prefix)
                 self.exec_prefix = os.path.normpath (sys.exec_prefix)
-                self.install_path_file = 1
 
             else:
                 if self.exec_prefix is None:
                     self.exec_prefix = self.prefix
 
-
-            # XXX since we don't *know* that a user-supplied prefix really
-            # points to another Python installation, we can't be sure that
-            # writing a .pth file there will actually work -- so we don't
-            # try.  That is, we only set 'install_path_file' if the user
-            # didn't supply prefix.  There are certainly circumstances
-            # under which we *should* install a .pth file when the user
-            # supplies a prefix, namely when that prefix actually points to
-            # another Python installation.  Hmmm.
-
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
             self.select_scheme ("unix_prefix")
@@ -351,10 +358,6 @@ def finalize_other (self):          # Windows and Mac OS for now
 
         if self.prefix is None:
             self.prefix = os.path.normpath (sys.prefix)
-            self.install_path_file = 1
-
-        # XXX same caveat regarding 'install_path_file' as in
-        # 'finalize_unix()'.
 
         self.install_base = self.install_platbase = self.prefix
         try:
@@ -369,7 +372,7 @@ def finalize_other (self):          # Windows and Mac OS for now
     def select_scheme (self, name):
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
-        for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
+        for key in SCHEME_KEYS:
             attrname = 'install_' + key
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
@@ -399,6 +402,12 @@ def expand_dirs (self):
                              'install_data',])
 
 
+    def convert_paths (self, *names):
+        for name in names:
+            attr = "install_" + name
+            setattr(self, attr, convert_path(getattr(self, attr)))
+
+
     def handle_extra_path (self):
 
         if self.extra_path is None:
@@ -433,6 +442,12 @@ def handle_extra_path (self):
     # handle_extra_path ()
 
 
+    def change_roots (self, *names):
+        for name in names:
+            attr = "install_" + name
+            setattr(self, attr, change_root(self.root, getattr(self, attr)))
+
+
     def run (self):
 
         # Obviously have to build before we can install
@@ -458,13 +473,14 @@ def run (self):
                          "writing list of installed files to '%s'" %
                          self.record)
 
-        normalized_path = map (os.path.normpath, sys.path)
-        if (not (self.path_file and self.install_path_file) and
-            os.path.normpath (self.install_lib) not in normalized_path):
-            self.warn (("modules installed to '%s', which is not in " +
-                        "Python's module search path (sys.path) -- " +
-                        "you'll have to change the search path yourself") %
-                       self.install_lib)
+        normalized_path = map(os.path.normpath, sys.path)
+        if (self.warn_dir and
+            not (self.path_file and self.install_path_file) and
+            os.path.normpath(self.install_lib) not in normalized_path):
+            self.warn(("modules installed to '%s', which is not in " +
+                       "Python's module search path (sys.path) -- " +
+                       "you'll have to change the search path yourself") %
+                      self.install_lib)
 
     # run ()
 
@@ -516,10 +532,7 @@ def create_path_file (self):
                           (filename, [self.extra_dirs]),
                           "creating %s" % filename)
         else:
-            self.warn (("path file '%s' not created for alternate or custom " +
-                        "installation (path files only work with standard " +
-                        "installations)") %
-                       filename)
+            self.warn("path file '%s' not created" % filename)
 
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.

From 7d6f876b662e94221ed957643e07cacff9352e7b Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Fri, 22 Sep 2000 01:32:34 +0000
Subject: [PATCH 0619/8469] Tweak what happens when run on non-Windows
 platforms: set install prefix as well as scheme, and don't convert all
 installation paths (that's now done by the "install" command for us).

---
 command/bdist_wininst.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 4637d4518c..b4c6d9b4b6 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -75,16 +75,11 @@ def run (self):
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
         if os.name != 'nt':
-            # must force install to use the 'nt' scheme
-            install.select_scheme ('nt')
-            # change the backslash to the current pathname separator
-            for key in ('purelib', 'platlib', 'headers', 'scripts',
-                        'data'):
-                attrname = 'install_' + key
-                attr = getattr (install, attrname)
-                if attr:
-                    attr = string.replace (attr, '\\', os.sep)
-                    setattr (install, attrname, attr)
+            # Must force install to use the 'nt' scheme; we set the
+            # prefix too just because it looks silly to put stuff
+            # in (eg.) ".../usr/Scripts", "usr/Include", etc.
+            install.prefix = "Python"
+            install.select_scheme('nt')
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files

From 3790253376ae5bac233c686320b37e6789fe51f5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Sep 2000 00:59:34 +0000
Subject: [PATCH 0620/8469] Reformat docstrings. Standardize use of whitespace
 on function calls.

---
 file_util.py | 128 +++++++++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 65 deletions(-)

diff --git a/file_util.py b/file_util.py
index 2d0148f3f1..0e85a74b69 100644
--- a/file_util.py
+++ b/file_util.py
@@ -18,11 +18,11 @@
 
 def _copy_file_contents (src, dst, buffer_size=16*1024):
     """Copy the file 'src' to 'dst'; both must be filenames.  Any error
-       opening either file, reading from 'src', or writing to 'dst',
-       raises DistutilsFileError.  Data is read/written in chunks of
-       'buffer_size' bytes (default 16k).  No attempt is made to handle
-       anything apart from regular files."""
-
+    opening either file, reading from 'src', or writing to 'dst', raises
+    DistutilsFileError.  Data is read/written in chunks of 'buffer_size'
+    bytes (default 16k).  No attempt is made to handle anything apart from
+    regular files.
+    """
     # Stolen from shutil module in the standard library, but with
     # custom error-handling added.
 
@@ -43,7 +43,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
         
         while 1:
             try:
-                buf = fsrc.read (buffer_size)
+                buf = fsrc.read(buffer_size)
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
                       "could not read from '%s': %s" % (src, errstr)
@@ -74,31 +74,29 @@ def copy_file (src, dst,
                verbose=0,
                dry_run=0):
 
-    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src'
-       is copied there with the same name; otherwise, it must be a
-       filename.  (If the file exists, it will be ruthlessly clobbered.)
-       If 'preserve_mode' is true (the default), the file's mode (type
-       and permission bits, or whatever is analogous on the current
-       platform) is copied.  If 'preserve_times' is true (the default),
-       the last-modified and last-access times are copied as well.  If
-       'update' is true, 'src' will only be copied if 'dst' does not
-       exist, or if 'dst' does exist but is older than 'src'.  If
-       'verbose' is true, then a one-line summary of the copy will be
-       printed to stdout.
-
-       'link' allows you to make hard links (os.link) or symbolic links
-       (os.symlink) instead of copying: set it to "hard" or "sym"; if it
-       is None (the default), files are copied.  Don't set 'link' on
-       systems that don't support it: 'copy_file()' doesn't check if
-       hard or symbolic linking is available.
-
-       Under Mac OS, uses the native file copy function in macostools;
-       on other systems, uses '_copy_file_contents()' to copy file
-       contents.
-
-       Return the name of the destination file, whether it was actually
-       copied or not."""
-
+    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
+    copied there with the same name; otherwise, it must be a filename.  (If
+    the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
+    is true (the default), the file's mode (type and permission bits, or
+    whatever is analogous on the current platform) is copied.  If
+    'preserve_times' is true (the default), the last-modified and
+    last-access times are copied as well.  If 'update' is true, 'src' will
+    only be copied if 'dst' does not exist, or if 'dst' does exist but is
+    older than 'src'.  If 'verbose' is true, then a one-line summary of the
+    copy will be printed to stdout.
+
+    'link' allows you to make hard links (os.link) or symbolic links
+    (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
+    None (the default), files are copied.  Don't set 'link' on systems that
+    don't support it: 'copy_file()' doesn't check if hard or symbolic
+    linking is available.
+
+    Under Mac OS, uses the native file copy function in macostools; on
+    other systems, uses '_copy_file_contents()' to copy file contents.
+
+    Return the name of the destination file, whether it was actually copied
+    or not.
+    """
     # XXX if the destination file already exists, we clobber it if
     # copying, but blow up if linking.  Hmmm.  And I don't know what
     # macostools.copyfile() does.  Should definitely be consistent, and
@@ -109,17 +107,17 @@ def copy_file (src, dst,
     from stat import *
     from distutils.dep_util import newer
 
-    if not os.path.isfile (src):
+    if not os.path.isfile(src):
         raise DistutilsFileError, \
               "can't copy '%s': doesn't exist or not a regular file" % src
 
-    if os.path.isdir (dst):
+    if os.path.isdir(dst):
         dir = dst
-        dst = os.path.join (dst, os.path.basename (src))
+        dst = os.path.join(dst, os.path.basename(src))
     else:
-        dir = os.path.dirname (dst)
+        dir = os.path.dirname(dst)
 
-    if update and not newer (src, dst):
+    if update and not newer(src, dst):
         if verbose:
             print "not copying %s (output up-to-date)" % src
         return dst
@@ -142,7 +140,7 @@ def copy_file (src, dst,
     if os.name == 'mac':
         import macostools
         try:
-            macostools.copy (src, dst, 0, preserve_times)
+            macostools.copy(src, dst, 0, preserve_times)
         except os.error, exc:
             raise DistutilsFileError, \
                   "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
@@ -150,25 +148,25 @@ def copy_file (src, dst,
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
-        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
-            os.link (src, dst)
+        if not (os.path.exists(dst) and os.path.samefile(src, dst)):
+            os.link(src, dst)
     elif link == 'sym':
-        if not (os.path.exists (dst) and os.path.samefile (src, dst)):
-            os.symlink (src, dst)
+        if not (os.path.exists(dst) and os.path.samefile(src, dst)):
+            os.symlink(src, dst)
 
     # Otherwise (non-Mac, not linking), copy the file contents and
     # (optionally) copy the times and mode.
     else:
-        _copy_file_contents (src, dst)
+        _copy_file_contents(src, dst)
         if preserve_mode or preserve_times:
-            st = os.stat (src)
+            st = os.stat(src)
 
             # According to David Ascher <da@ski.org>, utime() should be done
             # before chmod() (at least under NT).
             if preserve_times:
-                os.utime (dst, (st[ST_ATIME], st[ST_MTIME]))
+                os.utime(dst, (st[ST_ATIME], st[ST_MTIME]))
             if preserve_mode:
-                os.chmod (dst, S_IMODE (st[ST_MODE]))
+                os.chmod(dst, S_IMODE(st[ST_MODE]))
 
     return dst
 
@@ -180,13 +178,13 @@ def move_file (src, dst,
                verbose=0,
                dry_run=0):
 
-    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file
-       will be moved into it with the same name; otherwise, 'src' is
-       just renamed to 'dst'.  Return the new full name of the file.
-
-       Handles cross-device moves on Unix using
-       'copy_file()'.  What about other systems???"""
+    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
+    be moved into it with the same name; otherwise, 'src' is just renamed
+    to 'dst'.  Return the new full name of the file.
 
+    Handles cross-device moves on Unix using 'copy_file()'.  What about
+    other systems???
+    """
     from os.path import exists, isfile, isdir, basename, dirname
 
     if verbose:
@@ -195,25 +193,25 @@ def move_file (src, dst,
     if dry_run:
         return dst
 
-    if not isfile (src):
+    if not isfile(src):
         raise DistutilsFileError, \
               "can't move '%s': not a regular file" % src
 
-    if isdir (dst):
-        dst = os.path.join (dst, basename (src))
-    elif exists (dst):
+    if isdir(dst):
+        dst = os.path.join(dst, basename(src))
+    elif exists(dst):
         raise DistutilsFileError, \
               "can't move '%s': destination '%s' already exists" % \
               (src, dst)
 
-    if not isdir (dirname (dst)):
+    if not isdir(dirname(dst)):
         raise DistutilsFileError, \
               "can't move '%s': destination '%s' not a valid path" % \
               (src, dst)
 
     copy_it = 0
     try:
-        os.rename (src, dst)
+        os.rename(src, dst)
     except os.error, (num, msg):
         if num == errno.EXDEV:
             copy_it = 1
@@ -222,12 +220,12 @@ def move_file (src, dst,
                   "couldn't move '%s' to '%s': %s" % (src, dst, msg)
 
     if copy_it:
-        copy_file (src, dst)
+        copy_file(src, dst)
         try:
-            os.unlink (src)
+            os.unlink(src)
         except os.error, (num, msg):
             try:
-                os.unlink (dst)
+                os.unlink(dst)
             except os.error:
                 pass
             raise DistutilsFileError, \
@@ -242,9 +240,9 @@ def move_file (src, dst,
 
 def write_file (filename, contents):
     """Create a file with the specified name and write 'contents' (a
-       sequence of strings without line terminators) to it."""
-
-    f = open (filename, "w")
+    sequence of strings without line terminators) to it.
+    """
+    f = open(filename, "w")
     for line in contents:
-        f.write (line + "\n")
-    f.close ()
+        f.write(line + "\n")
+    f.close()

From 2d5928fb5d508496758ddafa463e5a55712f637c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Sep 2000 01:10:10 +0000
Subject: [PATCH 0621/8469] Whitespace tweaks.

---
 command/install_lib.py | 67 ++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 2d19e5b96a..dac644ee68 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -34,30 +34,29 @@ def finalize_options (self):
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
-        self.set_undefined_options ('install',
-                                    ('build_lib', 'build_dir'),
-                                    ('install_lib', 'install_dir'),
-                                    ('force', 'force'),
-                                    ('compile_py', 'compile'),
-                                    ('optimize_py', 'optimize'),
-                                    ('skip_build', 'skip_build'),
-                                   )
-
+        self.set_undefined_options('install',
+                                   ('build_lib', 'build_dir'),
+                                   ('install_lib', 'install_dir'),
+                                   ('force', 'force'),
+                                   ('compile_py', 'compile'),
+                                   ('optimize_py', 'optimize'),
+                                   ('skip_build', 'skip_build'),
+                                  )
 
     def run (self):
 
         # Make sure we have built everything we need first
         if not self.skip_build:
             if self.distribution.has_pure_modules():
-                self.run_command ('build_py')
+                self.run_command('build_py')
             if self.distribution.has_ext_modules():
-                self.run_command ('build_ext')
+                self.run_command('build_ext')
 
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of
         # having a build directory!)
         if os.path.isdir(self.build_dir):
-            outfiles = self.copy_tree (self.build_dir, self.install_dir)
+            outfiles = self.copy_tree(self.build_dir, self.install_dir)
         else:
             self.warn("'%s' does not exist -- no Python modules to install" %
                       self.build_dir)
@@ -76,10 +75,10 @@ def run (self):
                 if f[-3:] == '.py':
                     out_fn = f + (__debug__ and "c" or "o")
                     compile_msg = "byte-compiling %s to %s" % \
-                                  (f, os.path.basename (out_fn))
+                                  (f, os.path.basename(out_fn))
                     skip_msg = "skipping byte-compilation of %s" % f
-                    self.make_file (f, out_fn, compile, (f,),
-                                    compile_msg, skip_msg)
+                    self.make_file(f, out_fn, compile, (f,),
+                                   compile_msg, skip_msg)
     # run ()
 
 
@@ -88,14 +87,14 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
         if not has_any:
             return []
 
-        build_cmd = self.get_finalized_command (build_cmd)
+        build_cmd = self.get_finalized_command(build_cmd)
         build_files = build_cmd.get_outputs()
-        build_dir = getattr (build_cmd, cmd_option)
+        build_dir = getattr(build_cmd, cmd_option)
 
-        prefix_len = len (build_dir) + len (os.sep)
+        prefix_len = len(build_dir) + len(os.sep)
         outputs = []
         for file in build_files:
-            outputs.append (os.path.join (output_dir, file[prefix_len:]))
+            outputs.append(os.path.join(output_dir, file[prefix_len:]))
 
         return outputs
 
@@ -112,21 +111,21 @@ def _bytecode_filenames (self, py_filenames):
     def get_outputs (self):
         """Return the list of files that would be installed if this command
         were actually run.  Not affected by the "dry-run" flag or whether
-        modules have actually been built yet."""
-
+        modules have actually been built yet.
+        """
         pure_outputs = \
-            self._mutate_outputs (self.distribution.has_pure_modules(),
-                                  'build_py', 'build_lib',
-                                  self.install_dir)
+            self._mutate_outputs(self.distribution.has_pure_modules(),
+                                 'build_py', 'build_lib',
+                                 self.install_dir)
         if self.compile:
             bytecode_outputs = self._bytecode_filenames(pure_outputs)
         else:
             bytecode_outputs = []
 
         ext_outputs = \
-            self._mutate_outputs (self.distribution.has_ext_modules(),
-                                  'build_ext', 'build_lib',
-                                  self.install_dir)
+            self._mutate_outputs(self.distribution.has_ext_modules(),
+                                 'build_ext', 'build_lib',
+                                 self.install_dir)
 
         return pure_outputs + bytecode_outputs + ext_outputs
 
@@ -136,20 +135,18 @@ def get_inputs (self):
         """Get the list of files that are input to this command, ie. the
         files that get installed as they are named in the build tree.
         The files in this list correspond one-to-one to the output
-        filenames returned by 'get_outputs()'."""
-
+        filenames returned by 'get_outputs()'.
+        """
         inputs = []
         
         if self.distribution.has_pure_modules():
-            build_py = self.get_finalized_command ('build_py')
-            inputs.extend (build_py.get_outputs())
+            build_py = self.get_finalized_command('build_py')
+            inputs.extend(build_py.get_outputs())
 
         if self.distribution.has_ext_modules():
-            build_ext = self.get_finalized_command ('build_ext')
-            inputs.extend (build_ext.get_outputs())
+            build_ext = self.get_finalized_command('build_ext')
+            inputs.extend(build_ext.get_outputs())
 
         return inputs
-            
-        
 
 # class install_lib

From 5b0913a16d97aa227bbe0bcc2aaf6d39bc502934 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 23 Sep 2000 01:20:19 +0000
Subject: [PATCH 0622/8469] Split 'run()' up into 'build()', 'install()', and
 'bytecompile()' (for easier extensibility).

---
 command/install_lib.py | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index dac644ee68..b104fa9cfc 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -46,31 +46,46 @@ def finalize_options (self):
     def run (self):
 
         # Make sure we have built everything we need first
+        self.build()
+        
+        # Install everything: simply dump the entire contents of the build
+        # directory to the installation directory (that's the beauty of
+        # having a build directory!)
+        outfiles = self.install()
+
+        # (Optionally) compile .py to .pyc
+        self.bytecompile(outfiles)
+
+    # run ()
+
+
+    # -- Top-level worker functions ------------------------------------
+    # (called from 'run()')
+
+    def build (self):
         if not self.skip_build:
             if self.distribution.has_pure_modules():
                 self.run_command('build_py')
             if self.distribution.has_ext_modules():
                 self.run_command('build_ext')
-
-        # Install everything: simply dump the entire contents of the build
-        # directory to the installation directory (that's the beauty of
-        # having a build directory!)
+        
+    def install (self):
         if os.path.isdir(self.build_dir):
             outfiles = self.copy_tree(self.build_dir, self.install_dir)
         else:
             self.warn("'%s' does not exist -- no Python modules to install" %
                       self.build_dir)
             return
+        return outfiles
 
-        # (Optionally) compile .py to .pyc
+    def bytecompile (self, files):
         # XXX hey! we can't control whether we optimize or not; that's up
         # to the invocation of the current Python interpreter (at least
         # according to the py_compile docs).  That sucks.
-
         if self.compile:
             from py_compile import compile
 
-            for f in outfiles:
+            for f in files:
                 # only compile the file if it is actually a .py file
                 if f[-3:] == '.py':
                     out_fn = f + (__debug__ and "c" or "o")
@@ -79,9 +94,10 @@ def run (self):
                     skip_msg = "skipping byte-compilation of %s" % f
                     self.make_file(f, out_fn, compile, (f,),
                                    compile_msg, skip_msg)
-    # run ()
 
 
+    # -- Utility methods -----------------------------------------------
+
     def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
 
         if not has_any:
@@ -108,6 +124,10 @@ def _bytecode_filenames (self, py_filenames):
 
         return bytecode_files
         
+
+    # -- External interface --------------------------------------------
+    # (called by outsiders)
+
     def get_outputs (self):
         """Return the list of files that would be installed if this command
         were actually run.  Not affected by the "dry-run" flag or whether

From 16f0821b07cee481a0ed13bf10ce67c589acd618 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:23:52 +0000
Subject: [PATCH 0623/8469] Fixed some bugs and mis-features in handling config
 files:   * options can now be spelled "foo-bar" or "foo_bar" (handled in    
 'parse_config_files()', just after we parse a file)   * added a "[global]"
 section so there's a place to set global     options like verbose/quiet and
 dry-run   * respect the "negative alias" dictionary so (eg.) "quiet=1" is    
 the same as "verbose=0" (this had to be done twice: once in    
 'parse_config_file()' for global options, and once in    
 '_set_command_options()' for per-command options)   * the other half of
 handling boolean options correctly: allow     commands to list their boolean
 options in a 'boolean_options'     class attribute, and use it to translate
 strings (like "yes", "1",     "no", "0", etc) to true or false

---
 dist.py | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/dist.py b/dist.py
index c5fe86ebbf..f821e0aa30 100644
--- a/dist.py
+++ b/dist.py
@@ -15,7 +15,7 @@
 from distutils.errors import *
 from distutils import sysconfig
 from distutils.fancy_getopt import FancyGetopt, longopt_xlate
-from distutils.util import check_environ
+from distutils.util import check_environ, strtobool
 
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
@@ -321,7 +321,9 @@ def parse_config_files (self, filenames=None):
 
                 for opt in options:
                     if opt != '__name__':
-                        opt_dict[opt] = (filename, parser.get(section,opt))
+                        val = parser.get(section,opt)
+                        opt = string.replace(opt, '-', '_')
+                        opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
             # the original filenames that options come from) -- gag,
@@ -329,6 +331,22 @@ def parse_config_files (self, filenames=None):
             # specific config parser (sigh...)
             parser.__init__()
 
+        # If there was a "global" section in the config file, use it
+        # to set Distribution options.
+
+        if self.command_options.has_key('global'):
+            for (opt, (src, val)) in self.command_options['global'].items():
+                alias = self.negative_opt.get(opt)
+                try:
+                    if alias:
+                        setattr(self, alias, not strtobool(val))
+                    elif opt in ('verbose', 'dry_run'): # ugh!
+                        setattr(self, opt, strtobool(val))
+                except ValueError, msg:
+                    raise DistutilsOptionError, msg
+
+    # parse_config_files ()
+
 
     # -- Command-line parsing methods ----------------------------------
 
@@ -346,7 +364,7 @@ def parse_command_line (self):
         attribute raises DistutilsGetoptError; any error on the
         command-line raises DistutilsArgError.  If no Distutils commands
         were found on the command line, raises DistutilsArgError.  Return
-        true if command-line were successfully parsed and we should carry
+        true if command-line was successfully parsed and we should carry
         on with executing commands; false if no errors but we shouldn't
         execute commands (currently, this only happens if user asks for
         help).
@@ -714,7 +732,7 @@ def _set_command_options (self, command_obj, option_dict=None):
         this means copying elements of a dictionary ('option_dict') to
         attributes of an instance ('command').
 
-        'command_obj' must be a Commnd instance.  If 'option_dict' is not
+        'command_obj' must be a Command instance.  If 'option_dict' is not
         supplied, uses the standard option dictionary for this command
         (from 'self.command_options').
         """
@@ -727,11 +745,28 @@ def _set_command_options (self, command_obj, option_dict=None):
         if DEBUG: print "  setting options for '%s' command:" % command_name
         for (option, (source, value)) in option_dict.items():
             if DEBUG: print "    %s = %s (from %s)" % (option, value, source)
-            if not hasattr(command_obj, option):
-                raise DistutilsOptionError, \
-                      ("error in %s: command '%s' has no such option '%s'") % \
-                      (source, command_name, option)
-            setattr(command_obj, option, value)
+            try:
+                bool_opts = command_obj.boolean_options
+            except AttributeError:
+                bool_opts = []
+            try:
+                neg_opt = command_obj.negative_opt
+            except AttributeError:
+                neg_opt = {}
+
+            try:
+                if neg_opt.has_key(option):
+                    setattr(command_obj, neg_opt[option], not strtobool(value))
+                elif option in bool_opts:
+                    setattr(command_obj, option, strtobool(value))
+                elif hasattr(command_obj, option):
+                    setattr(command_obj, option, value)
+                else:
+                    raise DistutilsOptionError, \
+                          ("error in %s: command '%s' has no such option '%s'"
+                           % (source, command_name, option))
+            except ValueError, msg:
+                raise DistutilsOptionError, msg
 
     def reinitialize_command (self, command, reinit_subcommands=0):
         """Reinitializes a command to the state it was in when first

From a9f1b90db48367bd932b4d19310d184a2e5cf317 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:25:06 +0000
Subject: [PATCH 0624/8469] Added 'strtobool()' function: convert strings like
 "yes", "1", "no", "0", etc. to true/false.

---
 util.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/util.py b/util.py
index 3f06807854..367985aceb 100644
--- a/util.py
+++ b/util.py
@@ -273,3 +273,18 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
         apply(func, args)
 
 # execute()
+
+
+def strtobool (val):
+    """Convert a string representation of truth to true (1) or false (0).
+    True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
+    are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
+    'val' is anything else.
+    """
+    val = string.lower(val)
+    if val in ('y', 'yes', 't', 'true', 'on', '1'):
+        return 1
+    elif val in ('n', 'no', 'f', 'false', 'off', '0'):
+        return 0
+    else:
+        raise ValueError, "invalid truth value %s" % `val`

From 0881101deede0e48530b1245c88f396acc1cbf6f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:41:15 +0000
Subject: [PATCH 0625/8469] Added 'boolean_options' list to support config file
 parsing.

---
 command/bdist_dumb.py      | 2 ++
 command/bdist_rpm.py       | 2 ++
 command/bdist_wininst.py   | 2 ++
 command/build.py           | 2 ++
 command/build_clib.py      | 2 ++
 command/build_ext.py       | 2 ++
 command/build_py.py        | 2 ++
 command/build_scripts.py   | 2 ++
 command/clean.py           | 2 ++
 command/install.py         | 2 ++
 command/install_data.py    | 2 ++
 command/install_headers.py | 1 +
 command/install_lib.py     | 2 ++
 command/install_scripts.py | 3 +++
 command/sdist.py           | 3 +++
 15 files changed, 31 insertions(+)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 1fdbf4253b..520098db19 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -32,6 +32,8 @@ class bdist_dumb (Command):
                      "directory to put final built distributions in"),
                    ]
 
+    boolean_options = ['keep-temp']
+
     default_format = { 'posix': 'gztar',
                        'nt': 'zip', }
 
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 2afc714670..d585e8c660 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -111,6 +111,8 @@ class bdist_rpm (Command):
          "RPM 2 compatibility mode"),
        ]
 
+    boolean_options = ['keep-temp', 'rpm2-mode']
+
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
                     'rpm2-mode': 'rpm3-mode'}
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b4c6d9b4b6..16dd8022a0 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -33,6 +33,8 @@ class bdist_wininst (Command):
                      "directory to put final built distributions in"),
                    ]
 
+    boolean_options = ['keep-temp']
+
     def initialize_options (self):
         self.bdist_dir = None
         self.keep_temp = 0
diff --git a/command/build.py b/command/build.py
index 15476ca11b..f30f4ee1da 100644
--- a/command/build.py
+++ b/command/build.py
@@ -42,6 +42,8 @@ class build (Command):
          "forcibly build everything (ignore file timestamps)"),
         ]
 
+    boolean_options = ['debug', 'force']
+
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
diff --git a/command/build_clib.py b/command/build_clib.py
index 450dae1754..775b7ade5a 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -48,6 +48,8 @@ class build_clib (Command):
          "specify the compiler type"),
         ]
 
+    boolean_options = ['debug', 'force']
+
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
diff --git a/command/build_ext.py b/command/build_ext.py
index d578b846ac..7fdfd1458d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -82,6 +82,8 @@ class build_ext (Command):
          "make SWIG create C++ files (default is C)"),
         ]
 
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
+
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
diff --git a/command/build_py.py b/command/build_py.py
index 5fcd18e788..ea92c2be0f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -23,6 +23,8 @@ class build_py (Command):
         ('force', 'f', "forcibly build everything (ignore file timestamps)"),
         ]
 
+    boolean_options = ['force']
+
 
     def initialize_options (self):
         self.build_lib = None
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 17fae8f7b5..eacf798996 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -22,6 +22,8 @@ class build_scripts (Command):
         ('force', 'f', "forcibly build everything (ignore file timestamps"),
         ]
 
+    boolean_options = ['force']
+
 
     def initialize_options (self):
         self.build_dir = None
diff --git a/command/clean.py b/command/clean.py
index 2f3597fdbc..4f04f08be5 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -28,6 +28,8 @@ class clean (Command):
          "remove all build output, not just temporary by-products")
     ]
 
+    boolean_options = ['all']
+
     def initialize_options(self):
         self.build_base = None
         self.build_lib = None
diff --git a/command/install.py b/command/install.py
index 573e0740eb..4ad652d990 100644
--- a/command/install.py
+++ b/command/install.py
@@ -106,6 +106,8 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
+    boolean_options = ['force', 'skip-build']
+
 
     def initialize_options (self):
 
diff --git a/command/install_data.py b/command/install_data.py
index af348f5190..9ce118394b 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -25,6 +25,8 @@ class install_data (Command):
         ('force', 'f', "force installation (overwrite existing files)"),
         ]
 
+    boolean_options = ['force']
+
     def initialize_options (self):
         self.install_dir = None
         self.outfiles = []
diff --git a/command/install_headers.py b/command/install_headers.py
index 5c06d574d6..ec0cf4412d 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -21,6 +21,7 @@ class install_headers (Command):
                      "force installation (overwrite existing files)"),
                    ]
 
+    boolean_options = ['force']
 
     def initialize_options (self):
         self.install_dir = None
diff --git a/command/install_lib.py b/command/install_lib.py
index b104fa9cfc..a603b4f59e 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -19,6 +19,8 @@ class install_lib (Command):
         ('skip-build', None, "skip the build steps"),
         ]
                
+    boolean_options = ['force', 'compile', 'optimize', 'skip-build']
+
 
     def initialize_options (self):
         # let the 'install' command dictate our installation directory
diff --git a/command/install_scripts.py b/command/install_scripts.py
index d506f90f51..b8938c48de 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -22,6 +22,9 @@ class install_scripts (Command):
         ('skip-build', None, "skip the build steps"),
     ]
 
+    boolean_options = ['force', 'skip-build']
+
+
     def initialize_options (self):
         self.install_dir = None
         self.force = 0
diff --git a/command/sdist.py b/command/sdist.py
index 9b9f6064c5..ec443a3068 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -67,6 +67,9 @@ class sdist (Command):
          "[default: dist]"),
         ]
 
+    boolean_options = ['use-defaults', 'prune',
+                       'manifest-only', 'force-manifest',
+                       'keep-tree']
 
     help_options = [
         ('help-formats', None,

From 0dc98e6007d2b9a56fa302fd96b0c043e2e3da05 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:51:01 +0000
Subject: [PATCH 0626/8469] Renamed '--keep-tree' option to '--keep-temp', for
 consistency with the bdist_* commands.

---
 command/sdist.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index ec443a3068..adaf4925f2 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -59,7 +59,7 @@ class sdist (Command):
          "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
-        ('keep-tree', 'k',
+        ('keep-temp', 'k',
          "keep the distribution tree around after creating " +
          "archive file(s)"),
         ('dist-dir=', 'd',
@@ -69,7 +69,7 @@ class sdist (Command):
 
     boolean_options = ['use-defaults', 'prune',
                        'manifest-only', 'force-manifest',
-                       'keep-tree']
+                       'keep-temp']
 
     help_options = [
         ('help-formats', None,
@@ -97,7 +97,7 @@ def initialize_options (self):
         self.force_manifest = 0
 
         self.formats = None
-        self.keep_tree = 0
+        self.keep_temp = 0
         self.dist_dir = None
 
         self.archive_files = None
@@ -357,7 +357,7 @@ def prune_file_list (self):
         by 'read_template()', but really don't belong there:
           * the build tree (typically "build")
           * the release tree itself (only an issue if we ran "sdist"
-            previously with --keep-tree, or it aborted)
+            previously with --keep-temp, or it aborted)
           * any RCS or CVS directories
         """
         build = self.get_finalized_command('build')
@@ -447,7 +447,7 @@ def make_distribution (self):
         tree with 'make_release_tree()'; then, we create all required
         archive files (according to 'self.formats') from the release tree.
         Finally, we clean up by blowing away the release tree (unless
-        'self.keep_tree' is true).  The list of archive files created is
+        'self.keep_temp' is true).  The list of archive files created is
         stored so it can be retrieved later by 'get_archive_files()'.
         """
         # Don't warn about missing meta-data here -- should be (and is!)
@@ -463,7 +463,7 @@ def make_distribution (self):
 
         self.archive_files = archive_files
 
-        if not self.keep_tree:
+        if not self.keep_temp:
             dir_util.remove_tree (base_dir, self.verbose, self.dry_run)
 
     def get_archive_files (self):

From 680d30f3685bcd7d4230598198edcf5bb634d692 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:53:01 +0000
Subject: [PATCH 0627/8469] Added a bunch of missing "=" signs in the option
 table. Removed script options -- don't think they ever worked, weren't   very
 well thought through, etc.

---
 command/bdist_rpm.py | 44 ++++++++++++++------------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index d585e8c660..c293f1f5e4 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -48,52 +48,36 @@ class bdist_rpm (Command):
         # to "bdist_rpm".  The idea is that packagers would put this
         # info in setup.cfg, although they are of course free to
         # supply it on the command line.
-        ('distribution-name', None,
+        ('distribution-name=', None,
          "name of the (Linux) distribution to which this "
          "RPM applies (*not* the name of the module distribution!)"),
-        ('group', None,
+        ('group=', None,
          "package classification [default: \"Development/Libraries\"]"),
-        ('release', None,
+        ('release=', None,
          "RPM release number"),
-        ('serial', None,
+        ('serial=', None,
          "RPM serial number"),
-        ('vendor', None,
+        ('vendor=', None,
          "RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
          "[default: maintainer or author from setup script]"),
-        ('packager', None,
+        ('packager=', None,
          "RPM packager (eg. \"Jane Doe <jane@example.net>\")"
          "[default: vendor]"),
-        ('doc-files', None,
+        ('doc-files=', None,
          "list of documentation files (space or comma-separated)"),
-        ('changelog', None,
+        ('changelog=', None,
          "path to RPM changelog"),
-        ('icon', None,
+        ('icon=', None,
          "name of icon file"),
-        ('prep-script', None,
-         "pre-build script  (Bourne shell code)"),
-        ('build-script', None,
-         "build script (Bourne shell code)"),
-        ('install-script', None,
-         "installation script (Bourne shell code)"),
-        ('clean-script', None,
-         "clean script (Bourne shell code)"),
-        ('pre-install', None,
-         "pre-install script (Bourne shell code)"),
-        ('post-install', None,
-         "post-install script (Bourne shell code)"),
-        ('pre-uninstall', None,
-         "pre-uninstall script (Bourne shell code)"),
-        ('post-uninstall', None,
-         "post-uninstall script (Bourne shell code)"),
-        ('provides', None,
+        ('provides=', None,
          "capabilities provided by this package"),
-        ('requires', None,
+        ('requires=', None,
          "capabilities required by this package"),
-        ('conflicts', None,
+        ('conflicts=', None,
          "capabilities which conflict with this package"),
-        ('build-requires', None,
+        ('build-requires=', None,
          "capabilities required to build this package"),
-        ('obsoletes', None,
+        ('obsoletes=', None,
          "capabilities made obsolete by this package"),
 
         # Actions to take when building RPM

From e0a10947148eeed6a56ef67c5ea170315fbe3c48 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:58:07 +0000
Subject: [PATCH 0628/8469] Change to use the new 'translate_longopt()'
 function from fancy_getopt, rather than rolling our own with fancy_getopt's
 'longopt_xlate' global.

---
 dist.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dist.py b/dist.py
index f821e0aa30..0069b5fb4c 100644
--- a/dist.py
+++ b/dist.py
@@ -14,7 +14,7 @@
 from copy import copy
 from distutils.errors import *
 from distutils import sysconfig
-from distutils.fancy_getopt import FancyGetopt, longopt_xlate
+from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool
 
 
@@ -86,8 +86,8 @@ class Distribution:
         ('long-description', None,
          "print the long package description"),
         ]
-    display_option_names = map(lambda x: string.translate(x[0], longopt_xlate),
-                           display_options)
+    display_option_names = map(lambda x: translate_longopt(x[0]),
+                               display_options)
 
     # negative options are options that exclude other options
     negative_opt = {'quiet': 'verbose'}
@@ -592,7 +592,7 @@ def handle_display_options (self, option_order):
 
         for (opt, val) in option_order:
             if val and is_display_option.get(opt):
-                opt = string.translate (opt, longopt_xlate)
+                opt = translate_longopt(opt)
                 print getattr(self.metadata, "get_"+opt)()
                 any_display_options = 1
 
@@ -746,7 +746,7 @@ def _set_command_options (self, command_obj, option_dict=None):
         for (option, (source, value)) in option_dict.items():
             if DEBUG: print "    %s = %s (from %s)" % (option, value, source)
             try:
-                bool_opts = command_obj.boolean_options
+                bool_opts = map(translate_longopt, command_obj.boolean_options)
             except AttributeError:
                 bool_opts = []
             try:

From d5e007365aa1d4b127c7eee4826590ca86aeb3b6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 25 Sep 2000 01:58:31 +0000
Subject: [PATCH 0629/8469] Added 'translate_longopt()' function.

---
 fancy_getopt.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index eaf6073760..f93520019f 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -470,6 +470,13 @@ def wrap_text (text, width):
     return lines
 
 # wrap_text ()
+
+
+def translate_longopt (opt):
+    """Convert a long option name to a valid Python identifier by
+    changing "-" to "_".
+    """
+    return string.translate(opt, longopt_xlate)
         
 
 class OptionDummy:

From e67685fc403dc1e6cc25b0381aac29230aca571d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 01:52:25 +0000
Subject: [PATCH 0630/8469] Standardize whitespace in function calls and
 docstrings.

---
 dist.py | 124 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/dist.py b/dist.py
index 0069b5fb4c..91b820e9b4 100644
--- a/dist.py
+++ b/dist.py
@@ -118,7 +118,7 @@ def __init__ (self, attrs=None):
         # information here (and enough command-line options) that it's
         # worth it.  Also delegate 'get_XXX()' methods to the 'metadata'
         # object in a sneaky and underhanded (but efficient!) way.
-        self.metadata = DistributionMetadata ()
+        self.metadata = DistributionMetadata()
         method_basenames = dir(self.metadata) + \
                            ['fullname', 'contact', 'contact_email']
         for basename in method_basenames:
@@ -187,7 +187,7 @@ def __init__ (self, attrs=None):
             # specifically.  Note that this order guarantees that aliased
             # command options will override any supplied redundantly
             # through the general options dictionary.
-            options = attrs.get ('options')
+            options = attrs.get('options')
             if options:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
@@ -198,10 +198,10 @@ def __init__ (self, attrs=None):
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
-                if hasattr (self.metadata, key):
-                    setattr (self.metadata, key, val)
-                elif hasattr (self, key):
-                    setattr (self, key, val)
+                if hasattr(self.metadata, key):
+                    setattr(self.metadata, key, val)
+                elif hasattr(self, key):
+                    setattr(self, key, val)
                 else:
                     raise DistutilsSetupError, \
                           "invalid distribution option '%s'" % key
@@ -377,10 +377,10 @@ def parse_command_line (self):
         # until we know what the command is.
 
         self.commands = []
-        parser = FancyGetopt (self.global_options + self.display_options)
-        parser.set_negative_aliases (self.negative_opt)
-        parser.set_aliases ({'license': 'licence'})
-        args = parser.getopt (args=self.script_args, object=self)
+        parser = FancyGetopt(self.global_options + self.display_options)
+        parser.set_negative_aliases(self.negative_opt)
+        parser.set_aliases({'license': 'licence'})
+        args = parser.getopt(args=self.script_args, object=self)
         option_order = parser.get_option_order()
 
         # for display options we return immediately
@@ -427,28 +427,28 @@ def _parse_command_opts (self, parser, args):
 
         # Pull the current command from the head of the command line
         command = args[0]
-        if not command_re.match (command):
+        if not command_re.match(command):
             raise SystemExit, "invalid command name '%s'" % command
-        self.commands.append (command)
+        self.commands.append(command)
 
         # Dig up the command class that implements this command, so we
         # 1) know that it's a valid command, and 2) know which options
         # it takes.
         try:
-            cmd_class = self.get_command_class (command)
+            cmd_class = self.get_command_class(command)
         except DistutilsModuleError, msg:
             raise DistutilsArgError, msg
 
         # Require that the command class be derived from Command -- want
         # to be sure that the basic "command" interface is implemented.
-        if not issubclass (cmd_class, Command):
+        if not issubclass(cmd_class, Command):
             raise DistutilsClassError, \
                   "command class %s must subclass Command" % cmd_class
 
         # Also make sure that the command object provides a list of its
         # known options.
-        if not (hasattr (cmd_class, 'user_options') and
-                type (cmd_class.user_options) is ListType):
+        if not (hasattr(cmd_class, 'user_options') and
+                type(cmd_class.user_options) is ListType):
             raise DistutilsClassError, \
                   ("command class %s must provide " +
                    "'user_options' attribute (a list of tuples)") % \
@@ -457,14 +457,14 @@ def _parse_command_opts (self, parser, args):
         # If the command class has a list of negative alias options,
         # merge it in with the global negative aliases.
         negative_opt = self.negative_opt
-        if hasattr (cmd_class, 'negative_opt'):
-            negative_opt = copy (negative_opt)
-            negative_opt.update (cmd_class.negative_opt)
+        if hasattr(cmd_class, 'negative_opt'):
+            negative_opt = copy(negative_opt)
+            negative_opt.update(cmd_class.negative_opt)
 
 	# Check for help_options in command class.  They have a different
 	# format (tuple of four) so we need to preprocess them here.
         if (hasattr(cmd_class, 'help_options') and
-            type (cmd_class.help_options) is ListType):
+            type(cmd_class.help_options) is ListType):
             help_options = fix_help_options(cmd_class.help_options)
         else:
             help_options = []
@@ -472,17 +472,17 @@ def _parse_command_opts (self, parser, args):
 
         # All commands support the global options too, just by adding
         # in 'global_options'.
-        parser.set_option_table (self.global_options +
-                                 cmd_class.user_options +
-                                 help_options)
-        parser.set_negative_aliases (negative_opt)
-        (args, opts) = parser.getopt (args[1:])
+        parser.set_option_table(self.global_options +
+                                cmd_class.user_options +
+                                help_options)
+        parser.set_negative_aliases(negative_opt)
+        (args, opts) = parser.getopt(args[1:])
         if hasattr(opts, 'help') and opts.help:
             self._show_help(parser, display_options=0, commands=[cmd_class])
             return
 
         if (hasattr(cmd_class, 'help_options') and
-            type (cmd_class.help_options) is ListType):
+            type(cmd_class.help_options) is ListType):
             help_option_found=0
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
@@ -534,13 +534,13 @@ def _show_help (self,
         from distutils.cmd import Command
 
         if global_options:
-            parser.set_option_table (self.global_options)
-            parser.print_help ("Global options:")
+            parser.set_option_table(self.global_options)
+            parser.print_help("Global options:")
             print
 
         if display_options:
-            parser.set_option_table (self.display_options)
-            parser.print_help (
+            parser.set_option_table(self.display_options)
+            parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
             print
@@ -549,14 +549,14 @@ def _show_help (self,
             if type(command) is ClassType and issubclass(klass, Command):
                 klass = command
             else:
-                klass = self.get_command_class (command)
+                klass = self.get_command_class(command)
             if (hasattr(klass, 'help_options') and
-                type (klass.help_options) is ListType):
-                parser.set_option_table (klass.user_options +
-                                         fix_help_options(klass.help_options))
+                type(klass.help_options) is ListType):
+                parser.set_option_table(klass.user_options +
+                                        fix_help_options(klass.help_options))
             else:
-                parser.set_option_table (klass.user_options)
-            parser.print_help ("Options for '%s' command:" % klass.__name__)
+                parser.set_option_table(klass.user_options)
+            parser.print_help("Options for '%s' command:" % klass.__name__)
             print
 
         print gen_usage(self.script_name)
@@ -577,7 +577,7 @@ def handle_display_options (self, option_order):
         # processing now (ie. if they ran "setup --help-commands foo bar",
         # we ignore "foo bar").
         if self.help_commands:
-            self.print_commands ()
+            self.print_commands()
             print
             print gen_usage(self.script_name)
             return 1
@@ -608,9 +608,9 @@ def print_command_list (self, commands, header, max_length):
         print header + ":"
 
         for cmd in commands:
-            klass = self.cmdclass.get (cmd)
+            klass = self.cmdclass.get(cmd)
             if not klass:
-                klass = self.get_command_class (cmd)
+                klass = self.get_command_class(cmd)
             try:
                 description = klass.description
             except AttributeError:
@@ -639,21 +639,21 @@ def print_commands (self):
         extra_commands = []
         for cmd in self.cmdclass.keys():
             if not is_std.get(cmd):
-                extra_commands.append (cmd)
+                extra_commands.append(cmd)
 
         max_length = 0
         for cmd in (std_commands + extra_commands):
-            if len (cmd) > max_length:
-                max_length = len (cmd)
+            if len(cmd) > max_length:
+                max_length = len(cmd)
 
-        self.print_command_list (std_commands,
-                                 "Standard commands",
-                                 max_length)
+        self.print_command_list(std_commands,
+                                "Standard commands",
+                                max_length)
         if extra_commands:
             print
-            self.print_command_list (extra_commands,
-                                     "Extra commands",
-                                     max_length)
+            self.print_command_list(extra_commands,
+                                    "Extra commands",
+                                    max_length)
 
     # print_commands ()
 
@@ -822,10 +822,10 @@ def announce (self, msg, level=1):
     def run_commands (self):
         """Run each command that was seen on the setup script command line.
         Uses the list of commands found and cache of command objects
-        created by 'get_command_obj()'."""
-
+        created by 'get_command_obj()'.
+        """
         for cmd in self.commands:
-            self.run_command (cmd)
+            self.run_command(cmd)
 
 
     # -- Methods that operate on its Commands --------------------------
@@ -838,28 +838,27 @@ def run_command (self, command):
         doesn't even have a command object yet, create one.  Then invoke
         'run()' on that command object (or an existing one).
         """
-
         # Already been here, done that? then return silently.
-        if self.have_run.get (command):
+        if self.have_run.get(command):
             return
 
-        self.announce ("running " + command)
-        cmd_obj = self.get_command_obj (command)
-        cmd_obj.ensure_finalized ()
-        cmd_obj.run ()
+        self.announce("running " + command)
+        cmd_obj = self.get_command_obj(command)
+        cmd_obj.ensure_finalized()
+        cmd_obj.run()
         self.have_run[command] = 1
 
 
     # -- Distribution query methods ------------------------------------
 
     def has_pure_modules (self):
-        return len (self.packages or self.py_modules or []) > 0
+        return len(self.packages or self.py_modules or []) > 0
 
     def has_ext_modules (self):
-        return self.ext_modules and len (self.ext_modules) > 0
+        return self.ext_modules and len(self.ext_modules) > 0
 
     def has_c_libraries (self):
-        return self.libraries and len (self.libraries) > 0
+        return self.libraries and len(self.libraries) > 0
 
     def has_modules (self):
         return self.has_pure_modules() or self.has_ext_modules()
@@ -890,7 +889,8 @@ def is_pure (self):
 
 class DistributionMetadata:
     """Dummy class to hold the distribution meta-data: name, version,
-    author, and so forth."""
+    author, and so forth.
+    """
 
     def __init__ (self):
         self.name = None
@@ -963,5 +963,5 @@ def fix_help_options (options):
 
 
 if __name__ == "__main__":
-    dist = Distribution ()
+    dist = Distribution()
     print "ok"

From cb2e23a951132584f35e3f5ab94e42034b4c4e28 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 01:56:15 +0000
Subject: [PATCH 0631/8469] Standardize whitespace in function calls.

---
 core.py          |   6 +--
 unixccompiler.py | 104 +++++++++++++++++++++++------------------------
 util.py          |  24 +++++------
 version.py       |  50 +++++++++++------------
 4 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/core.py b/core.py
index 5dfe2db839..2aab7c4dd3 100644
--- a/core.py
+++ b/core.py
@@ -84,7 +84,7 @@ class found in 'cmdclass' is used in place of the default, which is
 
     # Determine the distribution class -- either caller-supplied or
     # our Distribution (see below).
-    klass = attrs.get ('distclass')
+    klass = attrs.get('distclass')
     if klass:
         del attrs['distclass']
     else:
@@ -98,7 +98,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # Create the Distribution instance, using the remaining arguments
     # (ie. everything except distclass) to initialize it
     try:
-        _setup_distribution = dist = klass (attrs)
+        _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError, msg:
         raise SystemExit, "error in setup script: %s" % msg
 
@@ -135,7 +135,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # And finally, run all the commands found on the command line.
     if ok:
         try:
-            dist.run_commands ()
+            dist.run_commands()
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
         except (IOError, os.error), exc:
diff --git a/unixccompiler.py b/unixccompiler.py
index 9339850102..ff0341a5ce 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -91,8 +91,8 @@ def preprocess (self,
                     extra_postargs=None):
 
         (_, macros, include_dirs) = \
-            self._fix_compile_args (None, macros, include_dirs)
-        pp_opts = gen_preprocess_options (macros, include_dirs)
+            self._fix_compile_args(None, macros, include_dirs)
+        pp_opts = gen_preprocess_options(macros, include_dirs)
         pp_args = self.preprocessor + pp_opts
         if output_file:
             pp_args.extend(['-o', output_file])
@@ -108,7 +108,7 @@ def preprocess (self,
             if output_file:
                 self.mkpath(os.path.dirname(output_file))
             try:
-                self.spawn (pp_args)
+                self.spawn(pp_args)
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
@@ -123,11 +123,11 @@ def compile (self,
                  extra_postargs=None):
 
         (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile (sources, output_dir)
+            self._fix_compile_args(output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile(sources, output_dir)
 
         # Figure out the options for the compiler command line.
-        pp_opts = gen_preprocess_options (macros, include_dirs)
+        pp_opts = gen_preprocess_options(macros, include_dirs)
         cc_args = pp_opts + ['-c']
         if debug:
             cc_args[:0] = ['-g']
@@ -138,16 +138,16 @@ def compile (self,
 
         # Compile all source files that weren't eliminated by
         # '_prep_compile()'.        
-        for i in range (len (sources)):
+        for i in range(len(sources)):
             src = sources[i] ; obj = objects[i]
             if skip_sources[src]:
-                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+                self.announce("skipping %s (%s up-to-date)" % (src, obj))
             else:
-                self.mkpath (os.path.dirname (obj))
+                self.mkpath(os.path.dirname(obj))
                 try:
-                    self.spawn (self.compiler_so + cc_args +
-                                [src, '-o', obj] +
-                                extra_postargs)
+                    self.spawn(self.compiler_so + cc_args +
+                               [src, '-o', obj] +
+                               extra_postargs)
                 except DistutilsExecError, msg:
                     raise CompileError, msg
 
@@ -163,16 +163,16 @@ def create_static_lib (self,
                            output_dir=None,
                            debug=0):
 
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
 
         output_filename = \
-            self.library_filename (output_libname, output_dir=output_dir)
+            self.library_filename(output_libname, output_dir=output_dir)
 
-        if self._need_link (objects, output_filename):
-            self.mkpath (os.path.dirname (output_filename))
-            self.spawn (self.archiver +
-                        [output_filename] +
-                        objects + self.objects)
+        if self._need_link(objects, output_filename):
+            self.mkpath(os.path.dirname(output_filename))
+            self.spawn(self.archiver +
+                       [output_filename] +
+                       objects + self.objects)
 
             # Not many Unices required ranlib anymore -- SunOS 4.x is, I
             # think the only major Unix that does.  Maybe we need some
@@ -181,11 +181,11 @@ def create_static_lib (self,
             # it for us, hence the check for leading colon.
             if self.ranlib:
                 try:
-                    self.spawn (self.ranlib + [output_filename])
+                    self.spawn(self.ranlib + [output_filename])
                 except DistutilsExecError, msg:
                     raise LibError, msg
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            self.announce("skipping %s (up-to-date)" % output_filename)
 
     # create_static_lib ()
 
@@ -203,9 +203,9 @@ def link_shared_lib (self,
                          extra_postargs=None,
                          build_temp=None):
 
-        self.link_shared_object (
+        self.link_shared_object(
             objects,
-            self.library_filename (output_libname, lib_type='shared'),
+            self.library_filename(output_libname, lib_type='shared'),
             output_dir,
             libraries,
             library_dirs,
@@ -230,19 +230,19 @@ def link_shared_object (self,
                             extra_postargs=None,
                             build_temp=None):
 
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+            self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
 
-        lib_opts = gen_lib_options (self,
-                                    library_dirs, runtime_library_dirs,
-                                    libraries)
-        if type (output_dir) not in (StringType, NoneType):
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
+        if type(output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
+            output_filename = os.path.join(output_dir, output_filename)
 
-        if self._need_link (objects, output_filename):
+        if self._need_link(objects, output_filename):
             ld_args = (objects + self.objects + 
                        lib_opts + ['-o', output_filename])
             if debug:
@@ -250,14 +250,14 @@ def link_shared_object (self,
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
-                ld_args.extend (extra_postargs)
-            self.mkpath (os.path.dirname (output_filename))
+                ld_args.extend(extra_postargs)
+            self.mkpath(os.path.dirname(output_filename))
             try:
-                self.spawn (self.linker_so + ld_args)
+                self.spawn(self.linker_so + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            self.announce("skipping %s (up-to-date)" % output_filename)
 
     # link_shared_object ()
 
@@ -273,32 +273,32 @@ def link_executable (self,
                          extra_preargs=None,
                          extra_postargs=None):
     
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+            self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
 
-        lib_opts = gen_lib_options (self,
-                                    library_dirs, runtime_library_dirs,
-                                    libraries)
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
         output_filename = output_progname # Unix-ism!
         if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
+            output_filename = os.path.join(output_dir, output_filename)
 
-        if self._need_link (objects, output_filename):
+        if self._need_link(objects, output_filename):
             ld_args = objects + self.objects + lib_opts + ['-o', output_filename]
             if debug:
                 ld_args[:0] = ['-g']
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
-                ld_args.extend (extra_postargs)
-            self.mkpath (os.path.dirname (output_filename))
+                ld_args.extend(extra_postargs)
+            self.mkpath(os.path.dirname(output_filename))
             try:
-                self.spawn (self.linker_exe + ld_args)
+                self.spawn(self.linker_exe + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            self.announce("skipping %s (up-to-date)" % output_filename)
 
     # link_executable ()
 
@@ -320,18 +320,18 @@ def library_option (self, lib):
     def find_library_file (self, dirs, lib, debug=0):
 
         for dir in dirs:
-            shared = os.path.join (
-                dir, self.library_filename (lib, lib_type='shared'))
-            static = os.path.join (
-                dir, self.library_filename (lib, lib_type='static'))
+            shared = os.path.join(
+                dir, self.library_filename(lib, lib_type='shared'))
+            static = os.path.join(
+                dir, self.library_filename(lib, lib_type='static'))
 
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm
             # ignoring even GCC's "-static" option.  So sue me.
-            if os.path.exists (shared):
+            if os.path.exists(shared):
                 return shared
-            elif os.path.exists (static):
+            elif os.path.exists(static):
                 return static
 
         else:
diff --git a/util.py b/util.py
index 367985aceb..d52c69b46f 100644
--- a/util.py
+++ b/util.py
@@ -88,16 +88,16 @@ def change_root (new_root, pathname):
     two, which is tricky on DOS/Windows and Mac OS.
     """
     if os.name == 'posix':
-        if not os.path.isabs (pathname):
-            return os.path.join (new_root, pathname)
+        if not os.path.isabs(pathname):
+            return os.path.join(new_root, pathname)
         else:
-            return os.path.join (new_root, pathname[1:])
+            return os.path.join(new_root, pathname[1:])
 
     elif os.name == 'nt':
-        (drive, path) = os.path.splitdrive (pathname)
+        (drive, path) = os.path.splitdrive(pathname)
         if path[0] == '\\':
             path = path[1:]
-        return os.path.join (new_root, path)
+        return os.path.join(new_root, path)
 
     elif os.name == 'mac':
         if not os.path.isabs(pathname):
@@ -129,10 +129,10 @@ def check_environ ():
 
     if os.name == 'posix' and not os.environ.has_key('HOME'):
         import pwd
-        os.environ['HOME'] = pwd.getpwuid (os.getuid())[5]
+        os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
     if not os.environ.has_key('PLAT'):
-        os.environ['PLAT'] = get_platform ()
+        os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
 
@@ -147,15 +147,15 @@ def subst_vars (str, local_vars):
        '_check_environ()'.  Raise ValueError for any variables not found in
        either 'local_vars' or 'os.environ'."""
 
-    check_environ ()
+    check_environ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)
-        if local_vars.has_key (var_name):
-            return str (local_vars[var_name])
+        if local_vars.has_key(var_name):
+            return str(local_vars[var_name])
         else:
             return os.environ[var_name]
 
-    return re.sub (r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
+    return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
 
 # subst_vars ()
 
@@ -169,7 +169,7 @@ def grok_environment_error (exc, prefix="error: "):
     prefixed with 'prefix'.
     """
     # check for Python 1.5.2-style {IO,OS}Error exception objects
-    if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
+    if hasattr(exc, 'filename') and hasattr(exc, 'strerror'):
         if exc.filename:
             error = prefix + "%s: %s" % (exc.filename, exc.strerror)
         else:
diff --git a/version.py b/version.py
index 8b9ef10670..9d3d172429 100644
--- a/version.py
+++ b/version.py
@@ -39,10 +39,10 @@ class Version:
 
     def __init__ (self, vstring=None):
         if vstring:
-            self.parse (vstring)
+            self.parse(vstring)
 
     def __repr__ (self):
-        return "%s ('%s')" % (self.__class__.__name__, str (self))
+        return "%s ('%s')" % (self.__class__.__name__, str(self))
 
 
 # Interface for version-number classes -- must be implemented
@@ -99,25 +99,25 @@ class StrictVersion (Version):
     in the distutils documentation.
     """
     
-    version_re = re.compile (r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
-                             re.VERBOSE)
+    version_re = re.compile(r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
+                            re.VERBOSE)
 
 
     def parse (self, vstring):
-        match = self.version_re.match (vstring)
+        match = self.version_re.match(vstring)
         if not match:
             raise ValueError, "invalid version number '%s'" % vstring
 
         (major, minor, patch, prerelease, prerelease_num) = \
-            match.group (1, 2, 4, 5, 6)
+            match.group(1, 2, 4, 5, 6)
 
         if patch:
-            self.version = tuple (map (string.atoi, [major, minor, patch]))
+            self.version = tuple(map(string.atoi, [major, minor, patch]))
         else:
-            self.version = tuple (map (string.atoi, [major, minor]) + [0])
+            self.version = tuple(map(string.atoi, [major, minor]) + [0])
 
         if prerelease:
-            self.prerelease = (prerelease[0], string.atoi (prerelease_num))
+            self.prerelease = (prerelease[0], string.atoi(prerelease_num))
         else:
             self.prerelease = None
 
@@ -125,21 +125,21 @@ def parse (self, vstring):
     def __str__ (self):
         
         if self.version[2] == 0:
-            vstring = string.join (map (str, self.version[0:2]), '.')
+            vstring = string.join(map(str, self.version[0:2]), '.')
         else:
-            vstring = string.join (map (str, self.version), '.')
+            vstring = string.join(map(str, self.version), '.')
 
         if self.prerelease:
-            vstring = vstring + self.prerelease[0] + str (self.prerelease[1])
+            vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
 
         return vstring
     
 
     def __cmp__ (self, other):
-        if isinstance (other, StringType):
-            other = StrictVersion (other)
+        if isinstance(other, StringType):
+            other = StrictVersion(other)
 
-        compare = cmp (self.version, other.version)
+        compare = cmp(self.version, other.version)
         if (compare == 0):              # have to compare prerelease
 
             # case 1: neither has prerelease; they're equal
@@ -154,7 +154,7 @@ def __cmp__ (self, other):
             elif (not self.prerelease and other.prerelease):
                 return 1
             elif (self.prerelease and other.prerelease):
-                return cmp (self.prerelease, other.prerelease)
+                return cmp(self.prerelease, other.prerelease)
 
         else:                           # numeric versions don't match --
             return compare              # prerelease stuff doesn't matter
@@ -264,7 +264,7 @@ class LooseVersion (Version):
 
     def __init__ (self, vstring=None):
         if vstring:
-            self.parse (vstring)
+            self.parse(vstring)
 
 
     def parse (self, vstring):
@@ -272,11 +272,11 @@ def parse (self, vstring):
         # from the parsed tuple -- so I just store the string here for
         # use by __str__
         self.vstring = vstring
-        components = filter (lambda x: x and x != '.',
-                             self.component_re.split (vstring))
-        for i in range (len (components)):
+        components = filter(lambda x: x and x != '.',
+                            self.component_re.split(vstring))
+        for i in range(len(components)):
             try:
-                components[i] = int (components[i])
+                components[i] = int(components[i])
             except ValueError:
                 pass
 
@@ -288,14 +288,14 @@ def __str__ (self):
 
 
     def __repr__ (self):
-        return "LooseVersion ('%s')" % str (self)
+        return "LooseVersion ('%s')" % str(self)
 
 
     def __cmp__ (self, other):
-        if isinstance (other, StringType):
-            other = LooseVersion (other)
+        if isinstance(other, StringType):
+            other = LooseVersion(other)
 
-        return cmp (self.version, other.version)
+        return cmp(self.version, other.version)
         
 
 # end class LooseVersion

From f5d5642c6b067bcbf6f82020cc1fda18dbb74511 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 02:00:51 +0000
Subject: [PATCH 0632/8469] Reformat docstrings. Standardize whitespace in
 function calls.

---
 spawn.py | 79 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/spawn.py b/spawn.py
index 651124d682..1eed7a8abc 100644
--- a/spawn.py
+++ b/spawn.py
@@ -3,7 +3,8 @@
 Provides the 'spawn()' function, a front-end to various platform-
 specific functions for launching another program in a sub-process.
 Also provides the 'find_executable()' to search the path for a given
-executable name. """
+executable name.
+"""
 
 # created 1999/07/24, Greg Ward
 
@@ -19,24 +20,24 @@ def spawn (cmd,
            dry_run=0):
 
     """Run another program, specified as a command list 'cmd', in a new
-       process.  'cmd' is just the argument list for the new process, ie.
-       cmd[0] is the program to run and cmd[1:] are the rest of its
-       arguments.  There is no way to run a program with a name different
-       from that of its executable.
-
-       If 'search_path' is true (the default), the system's executable
-       search path will be used to find the program; otherwise, cmd[0] must
-       be the exact path to the executable.  If 'verbose' is true, a
-       one-line summary of the command will be printed before it is run.
-       If 'dry_run' is true, the command will not actually be run.
-
-       Raise DistutilsExecError if running the program fails in any way;
-       just return on success."""
-
+    process.  'cmd' is just the argument list for the new process, ie.
+    cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
+    There is no way to run a program with a name different from that of its
+    executable.
+
+    If 'search_path' is true (the default), the system's executable search
+    path will be used to find the program; otherwise, cmd[0] must be the
+    exact path to the executable.  If 'verbose' is true, a one-line summary
+    of the command will be printed before it is run.  If 'dry_run' is true,
+    the command will not actually be run.
+
+    Raise DistutilsExecError if running the program fails in any way; just
+    return on success.
+    """
     if os.name == 'posix':
-        _spawn_posix (cmd, search_path, verbose, dry_run)
+        _spawn_posix(cmd, search_path, verbose, dry_run)
     elif os.name == 'nt':
-        _spawn_nt (cmd, search_path, verbose, dry_run)
+        _spawn_nt(cmd, search_path, verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
@@ -45,8 +46,10 @@ def spawn (cmd,
 
 
 def _nt_quote_args (args):
-    """Obscure quoting command line arguments on NT.
-       Simply quote every argument which contains blanks."""
+    """Quote command-line arguments for DOS/Windows conventions: just
+    wraps every argument which contains blanks in double quotes, and
+    returns a new argument list.
+    """
 
     # XXX this doesn't seem very robust to me -- but if the Windows guys
     # say it'll work, I guess I'll have to accept it.  (What if an arg
@@ -54,8 +57,8 @@ def _nt_quote_args (args):
     # have to be escaped?  Is there an escaping mechanism other than
     # quoting?)
 
-    for i in range (len (args)):
-        if string.find (args[i], ' ') != -1:
+    for i in range(len(args)):
+        if string.find(args[i], ' ') != -1:
             args[i] = '"%s"' % args[i]
     return args
 
@@ -65,16 +68,16 @@ def _spawn_nt (cmd,
                dry_run=0):
 
     executable = cmd[0]
-    cmd = _nt_quote_args (cmd)
+    cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable 
     if verbose:
-        print string.join ([executable] + cmd[1:], ' ')
+        print string.join([executable] + cmd[1:], ' ')
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:
-            rc = os.spawnv (os.P_WAIT, executable, cmd)
+            rc = os.spawnv(os.P_WAIT, executable, cmd)
         except OSError, exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError, \
@@ -91,39 +94,39 @@ def _spawn_posix (cmd,
                   dry_run=0):
 
     if verbose:
-        print string.join (cmd, ' ')
+        print string.join(cmd, ' ')
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
 
-    pid = os.fork ()
+    pid = os.fork()
 
     if pid == 0:                        # in the child
         try:
             #print "cmd[0] =", cmd[0]
             #print "cmd =", cmd
-            exec_fn (cmd[0], cmd)
+            exec_fn(cmd[0], cmd)
         except OSError, e:
-            sys.stderr.write ("unable to execute %s: %s\n" %
-                              (cmd[0], e.strerror))
-            os._exit (1)
+            sys.stderr.write("unable to execute %s: %s\n" %
+                             (cmd[0], e.strerror))
+            os._exit(1)
             
-        sys.stderr.write ("unable to execute %s for unknown reasons" % cmd[0])
-        os._exit (1)
+        sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
+        os._exit(1)
 
     
     else:                               # in the parent
         # Loop until the child either exits or is terminated by a signal
         # (ie. keep waiting if it's merely stopped)
         while 1:
-            (pid, status) = os.waitpid (pid, 0)
-            if os.WIFSIGNALED (status):
+            (pid, status) = os.waitpid(pid, 0)
+            if os.WIFSIGNALED(status):
                 raise DistutilsExecError, \
                       "command '%s' terminated by signal %d" % \
-                      (cmd[0], os.WTERMSIG (status))
+                      (cmd[0], os.WTERMSIG(status))
 
-            elif os.WIFEXITED (status):
-                exit_status = os.WEXITSTATUS (status)
+            elif os.WIFEXITED(status):
+                exit_status = os.WEXITSTATUS(status)
                 if exit_status == 0:
                     return              # hey, it succeeded!
                 else:
@@ -131,7 +134,7 @@ def _spawn_posix (cmd,
                           "command '%s' failed with exit status %d" % \
                           (cmd[0], exit_status)
         
-            elif os.WIFSTOPPED (status):
+            elif os.WIFSTOPPED(status):
                 continue
 
             else:

From 310173b2ba5b272a6ef87f9057c36381712d42c5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 02:03:34 +0000
Subject: [PATCH 0633/8469] Whitespace fix.

---
 file_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/file_util.py b/file_util.py
index 0e85a74b69..d05b456161 100644
--- a/file_util.py
+++ b/file_util.py
@@ -1,6 +1,7 @@
 """distutils.file_util
 
-Utility functions for operating on single files."""
+Utility functions for operating on single files.
+"""
 
 # created 2000/04/03, Greg Ward (extracted from util.py)
 

From b7ed5395cfb4acb46268fe41f6f8188e2f3da77d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 02:12:31 +0000
Subject: [PATCH 0634/8469] Standardize whitespace in function calls.

---
 cmd.py          |  54 ++++++++++++------------
 dir_util.py     |  60 +++++++++++++-------------
 fancy_getopt.py | 109 ++++++++++++++++++++++++------------------------
 filelist.py     |  69 +++++++++++++++---------------
 4 files changed, 145 insertions(+), 147 deletions(-)

diff --git a/cmd.py b/cmd.py
index 7866d1b607..ce44829498 100644
--- a/cmd.py
+++ b/cmd.py
@@ -59,13 +59,13 @@ def __init__ (self, dist):
         # late import because of mutual dependence between these classes
         from distutils.dist import Distribution
 
-        if not isinstance (dist, Distribution):
+        if not isinstance(dist, Distribution):
             raise TypeError, "dist must be a Distribution instance"
         if self.__class__ is Command:
             raise RuntimeError, "Command is an abstract class"
 
         self.distribution = dist
-        self.initialize_options ()
+        self.initialize_options()
 
         # Per-command versions of the global flags, so that the user can
         # customize Distutils' behaviour command-by-command and let some
@@ -98,9 +98,9 @@ def __init__ (self, dist):
 
     def __getattr__ (self, attr):
         if attr in ('verbose', 'dry_run'):
-            myval = getattr (self, "_" + attr)
+            myval = getattr(self, "_" + attr)
             if myval is None:
-                return getattr (self.distribution, attr)
+                return getattr(self.distribution, attr)
             else:
                 return myval
         else:
@@ -109,7 +109,7 @@ def __getattr__ (self, attr):
 
     def ensure_finalized (self):
         if not self.finalized:
-            self.finalize_options ()
+            self.finalize_options()
         self.finalized = 1
         
 
@@ -273,7 +273,7 @@ def ensure_dirname (self, option):
     # -- Convenience methods for commands ------------------------------
 
     def get_command_name (self):
-        if hasattr (self, 'command_name'):
+        if hasattr(self, 'command_name'):
             return self.command_name
         else:
             return self.__class__.__name__
@@ -296,12 +296,12 @@ def set_undefined_options (self, src_cmd, *option_pairs):
 
         # Option_pairs: list of (src_option, dst_option) tuples
 
-        src_cmd_obj = self.distribution.get_command_obj (src_cmd)
-        src_cmd_obj.ensure_finalized ()
+        src_cmd_obj = self.distribution.get_command_obj(src_cmd)
+        src_cmd_obj.ensure_finalized()
         for (src_option, dst_option) in option_pairs:
-            if getattr (self, dst_option) is None:
-                setattr (self, dst_option,
-                         getattr (src_cmd_obj, src_option))
+            if getattr(self, dst_option) is None:
+                setattr(self, dst_option,
+                        getattr(src_cmd_obj, src_option))
 
 
     def get_finalized_command (self, command, create=1):
@@ -310,8 +310,8 @@ def get_finalized_command (self, command, create=1):
         'command', call its 'ensure_finalized()' method, and return the
         finalized command object.
         """
-        cmd_obj = self.distribution.get_command_obj (command, create)
-        cmd_obj.ensure_finalized ()
+        cmd_obj = self.distribution.get_command_obj(command, create)
+        cmd_obj.ensure_finalized()
         return cmd_obj
 
     # XXX rename to 'get_reinitialized_command()'? (should do the
@@ -325,7 +325,7 @@ def run_command (self, command):
         Distribution, which creates and finalizes the command object if
         necessary and then invokes its 'run()' method.
         """
-        self.distribution.run_command (command)
+        self.distribution.run_command(command)
 
 
     def get_sub_commands (self):
@@ -345,8 +345,8 @@ def get_sub_commands (self):
     # -- External world manipulation -----------------------------------
 
     def warn (self, msg):
-        sys.stderr.write ("warning: %s: %s\n" %
-                          (self.get_command_name(), msg))
+        sys.stderr.write("warning: %s: %s\n" %
+                         (self.get_command_name(), msg))
 
 
     def execute (self, func, args, msg=None, level=1):
@@ -389,17 +389,17 @@ def copy_tree (self, infile, outfile,
 
     def move_file (self, src, dst, level=1):
         """Move a file respecting verbose and dry-run flags."""
-        return file_util.move_file (src, dst,
-                                    self.verbose >= level,
-                                    self.dry_run)
+        return file_util.move_file(src, dst,
+                                   self.verbose >= level,
+                                   self.dry_run)
 
 
     def spawn (self, cmd, search_path=1, level=1):
         """Spawn an external command respecting verbose and dry-run flags."""
         from distutils.spawn import spawn
-        spawn (cmd, search_path,
-               self.verbose >= level,
-               self.dry_run)
+        spawn(cmd, search_path,
+              self.verbose >= level,
+              self.dry_run)
 
 
     def make_archive (self, base_name, format,
@@ -421,15 +421,15 @@ def make_file (self, infiles, outfile, func, args,
         """
         if exec_msg is None:
             exec_msg = "generating %s from %s" % \
-                       (outfile, string.join (infiles, ', '))
+                       (outfile, string.join(infiles, ', '))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
         
 
         # Allow 'infiles' to be a single string
-        if type (infiles) is StringType:
+        if type(infiles) is StringType:
             infiles = (infiles,)
-        elif type (infiles) not in (ListType, TupleType):
+        elif type(infiles) not in (ListType, TupleType):
             raise TypeError, \
                   "'infiles' must be a string, or a list or tuple of strings"
 
@@ -437,11 +437,11 @@ def make_file (self, infiles, outfile, func, args,
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
         if self.force or dep_util.newer_group (infiles, outfile):
-            self.execute (func, args, exec_msg, level)
+            self.execute(func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message
         else:
-            self.announce (skip_msg, level)
+            self.announce(skip_msg, level)
 
     # make_file ()
 
diff --git a/dir_util.py b/dir_util.py
index 85f8a18d2c..768cb4ebe7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -40,21 +40,21 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     # the creation of the whole path? (quite easy to do the latter since
     # we're not using a recursive algorithm)
 
-    name = os.path.normpath (name)
+    name = os.path.normpath(name)
     created_dirs = []
-    if os.path.isdir (name) or name == '':
+    if os.path.isdir(name) or name == '':
         return created_dirs
-    if _path_created.get (name):
+    if _path_created.get(name):
         return created_dirs
 
-    (head, tail) = os.path.split (name)
+    (head, tail) = os.path.split(name)
     tails = [tail]                      # stack of lone dirs to create
     
-    while head and tail and not os.path.isdir (head):
+    while head and tail and not os.path.isdir(head):
         #print "splitting '%s': " % head,
-        (head, tail) = os.path.split (head)
+        (head, tail) = os.path.split(head)
         #print "to ('%s','%s')" % (head, tail)
-        tails.insert (0, tail)          # push next higher dir onto stack
+        tails.insert(0, tail)          # push next higher dir onto stack
 
     #print "stack of tails:", tails
 
@@ -63,8 +63,8 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     # that does *not* exist)
     for d in tails:
         #print "head = %s, d = %s: " % (head, d),
-        head = os.path.join (head, d)
-        if _path_created.get (head):
+        head = os.path.join(head, d)
+        if _path_created.get(head):
             continue
 
         if verbose:
@@ -72,7 +72,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 
         if not dry_run:
             try:
-                os.mkdir (head)
+                os.mkdir(head)
                 created_dirs.append(head)
             except OSError, exc:
                 raise DistutilsFileError, \
@@ -97,13 +97,13 @@ def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
     # First get the list of directories to create
     need_dir = {}
     for file in files:
-        need_dir[os.path.join (base_dir, os.path.dirname (file))] = 1
+        need_dir[os.path.join(base_dir, os.path.dirname(file))] = 1
     need_dirs = need_dir.keys()
     need_dirs.sort()
 
     # Now create them
     for dir in need_dirs:
-        mkpath (dir, mode, verbose, dry_run)
+        mkpath(dir, mode, verbose, dry_run)
 
 # create_tree ()
 
@@ -136,11 +136,11 @@ def copy_tree (src, dst,
 
     from distutils.file_util import copy_file
 
-    if not dry_run and not os.path.isdir (src):
+    if not dry_run and not os.path.isdir(src):
         raise DistutilsFileError, \
               "cannot copy tree '%s': not a directory" % src    
     try:
-        names = os.listdir (src)
+        names = os.listdir(src)
     except os.error, (errno, errstr):
         if dry_run:
             names = []
@@ -149,32 +149,32 @@ def copy_tree (src, dst,
                   "error listing files in '%s': %s" % (src, errstr)
 
     if not dry_run:
-        mkpath (dst, verbose=verbose)
+        mkpath(dst, verbose=verbose)
 
     outputs = []
 
     for n in names:
-        src_name = os.path.join (src, n)
-        dst_name = os.path.join (dst, n)
+        src_name = os.path.join(src, n)
+        dst_name = os.path.join(dst, n)
 
-        if preserve_symlinks and os.path.islink (src_name):
-            link_dest = os.readlink (src_name)
+        if preserve_symlinks and os.path.islink(src_name):
+            link_dest = os.readlink(src_name)
             if verbose:
                 print "linking %s -> %s" % (dst_name, link_dest)
             if not dry_run:
-                os.symlink (link_dest, dst_name)
-            outputs.append (dst_name)
+                os.symlink(link_dest, dst_name)
+            outputs.append(dst_name)
             
-        elif os.path.isdir (src_name):
-            outputs.extend (
-                copy_tree (src_name, dst_name,
-                           preserve_mode, preserve_times, preserve_symlinks,
-                           update, verbose, dry_run))
+        elif os.path.isdir(src_name):
+            outputs.extend(
+                copy_tree(src_name, dst_name,
+                          preserve_mode, preserve_times, preserve_symlinks,
+                          update, verbose, dry_run))
         else:
-            copy_file (src_name, dst_name,
-                       preserve_mode, preserve_times,
-                       update, None, verbose, dry_run)
-            outputs.append (dst_name)
+            copy_file(src_name, dst_name,
+                      preserve_mode, preserve_times,
+                      update, None, verbose, dry_run)
+            outputs.append(dst_name)
 
     return outputs
 
diff --git a/fancy_getopt.py b/fancy_getopt.py
index f93520019f..6f8b8c06f1 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -22,14 +22,14 @@
 # utilities, we use '-' in place of '_'.  (The spirit of LISP lives on!)
 # The similarities to NAME are again not a coincidence...
 longopt_pat = r'[a-zA-Z](?:[a-zA-Z0-9-]*)'
-longopt_re = re.compile (r'^%s$' % longopt_pat)
+longopt_re = re.compile(r'^%s$' % longopt_pat)
 
 # For recognizing "negative alias" options, eg. "quiet=!verbose"
-neg_alias_re = re.compile ("^(%s)=!(%s)$" % (longopt_pat, longopt_pat))
+neg_alias_re = re.compile("^(%s)=!(%s)$" % (longopt_pat, longopt_pat))
 
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
-longopt_xlate = string.maketrans ('-', '_')
+longopt_xlate = string.maketrans('-', '_')
 
 # This records (option, value) pairs in the order seen on the command line;
 # it's close to what getopt.getopt() returns, but with short options
@@ -107,7 +107,7 @@ def add_option (self, long_option, short_option=None, help_string=None):
                   "option conflict: already an option '%s'" % long_option
         else:
             option = (long_option, short_option, help_string)
-            self.option_table.append (option)
+            self.option_table.append(option)
             self.option_index[long_option] = option
 
 
@@ -120,7 +120,7 @@ def get_attr_name (self, long_option):
         """Translate long option name 'long_option' to the form it 
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
-        return string.translate (long_option, longopt_xlate)
+        return string.translate(long_option, longopt_xlate)
 
 
     def _check_alias_dict (self, aliases, what):
@@ -137,7 +137,7 @@ def _check_alias_dict (self, aliases, what):
         
     def set_aliases (self, alias):
         """Set the aliases for this option parser."""
-        self._check_alias_dict (alias, "alias")
+        self._check_alias_dict(alias, "alias")
         self.alias = alias
 
     def set_negative_aliases (self, negative_alias):
@@ -145,15 +145,15 @@ def set_negative_aliases (self, negative_alias):
         'negative_alias' should be a dictionary mapping option names to
         option names, both the key and value must already be defined
         in the option table."""
-        self._check_alias_dict (negative_alias, "negative alias")
+        self._check_alias_dict(negative_alias, "negative alias")
         self.negative_alias = negative_alias
 
 
     def _grok_option_table (self):
-        """Populate the various data structures that keep tabs on
-           the option table.  Called by 'getopt()' before it can do
-           anything worthwhile."""
-
+        """Populate the various data structures that keep tabs on the
+        option table.  Called by 'getopt()' before it can do anything
+        worthwhile.
+        """
         self.long_opts = []
         self.short_opts = []
         self.short2long.clear()
@@ -163,7 +163,7 @@ def _grok_option_table (self):
                 (long, short, help) = option
             except ValueError:
                 raise DistutilsGetoptError, \
-                      "invalid option tuple " + str (option)
+                      "invalid option tuple " + str(option)
 
             # Type- and value-check the option names
             if type(long) is not StringType or len(long) < 2:
@@ -172,12 +172,12 @@ def _grok_option_table (self):
                        "must be a string of length >= 2") % long
 
             if (not ((short is None) or
-                     (type (short) is StringType and len (short) == 1))):
+                     (type(short) is StringType and len(short) == 1))):
                 raise DistutilsGetoptError, \
                       ("invalid short option '%s': "
                        "must a single character or None") % short
 
-            self.long_opts.append (long)
+            self.long_opts.append(long)
 
             if long[-1] == '=':             # option takes an argument?
                 if short: short = short + ':'
@@ -216,14 +216,14 @@ def _grok_option_table (self):
             # later translate it to an attribute name on some object.  Have
             # to do this a bit late to make sure we've removed any trailing
             # '='.
-            if not longopt_re.match (long):
+            if not longopt_re.match(long):
                 raise DistutilsGetoptError, \
                       ("invalid long option name '%s' " +
                        "(must be letters, numbers, hyphens only") % long
 
-            self.attr_name[long] = self.get_attr_name (long)
+            self.attr_name[long] = self.get_attr_name(long)
             if short:
-                self.short_opts.append (short)
+                self.short_opts.append(short)
                 self.short2long[short[0]] = long
 
         # for option_table
@@ -239,8 +239,8 @@ def getopt (self, args=None, object=None):
         (args, object).  If 'object' is supplied, it is modified in place
         and 'getopt()' just returns 'args'; in both cases, the returned
         'args' is a modified copy of the passed-in 'args' list, which is
-        left untouched."""
-
+        left untouched.
+        """
         if args is None:
             args = sys.argv[1:]
         if object is None:
@@ -251,17 +251,17 @@ def getopt (self, args=None, object=None):
 
         self._grok_option_table()
 
-        short_opts = string.join (self.short_opts)
+        short_opts = string.join(self.short_opts)
         try:
-            (opts, args) = getopt.getopt (args, short_opts, self.long_opts)
+            (opts, args) = getopt.getopt(args, short_opts, self.long_opts)
         except getopt.error, msg:
             raise DistutilsArgError, msg
 
         for (opt, val) in opts:
-            if len (opt) == 2 and opt[0] == '-': # it's a short option
+            if len(opt) == 2 and opt[0] == '-': # it's a short option
                 opt = self.short2long[opt[1]]
 
-            elif len (opt) > 2 and opt[0:2] == '--':
+            elif len(opt) > 2 and opt[0:2] == '--':
                 opt = opt[2:]
 
             else:
@@ -277,7 +277,7 @@ def getopt (self, args=None, object=None):
                     raise DistutilsInternalError, \
                           "this can't happen: bad option value '%s'" % value
 
-                alias = self.negative_alias.get (opt)
+                alias = self.negative_alias.get(opt)
                 if alias:
                     opt = alias
                     val = 0
@@ -285,8 +285,8 @@ def getopt (self, args=None, object=None):
                     val = 1
 
             attr = self.attr_name[opt]
-            setattr (object, attr, val)
-            self.option_order.append ((opt, val))
+            setattr(object, attr, val)
+            self.option_order.append((opt, val))
 
         # for opts
 
@@ -301,8 +301,8 @@ def getopt (self, args=None, object=None):
     def get_option_order (self):
         """Returns the list of (option, value) tuples processed by the
         previous run of 'getopt()'.  Raises RuntimeError if
-        'getopt()' hasn't been called yet."""
-
+        'getopt()' hasn't been called yet.
+        """
         if self.option_order is None:
             raise RuntimeError, "'getopt()' hasn't been called yet"
         else:
@@ -311,8 +311,8 @@ def get_option_order (self):
 
     def generate_help (self, header=None):
         """Generate help text (a list of strings, one per suggested line of
-        output) from the option table for this FancyGetopt object."""
-
+        output) from the option table for this FancyGetopt object.
+        """
         # Blithely assume the option table is good: probably wouldn't call
         # 'generate_help()' unless you've already called 'getopt()'.
 
@@ -321,7 +321,7 @@ def generate_help (self, header=None):
         for option in self.option_table:
             long = option[0]
             short = option[1]
-            l = len (long)
+            l = len(long)
             if long[-1] == '=':
                 l = l - 1
             if short is not None:
@@ -363,29 +363,29 @@ def generate_help (self, header=None):
 
         for (long,short,help) in self.option_table:
 
-            text = wrap_text (help, text_width)
+            text = wrap_text(help, text_width)
             if long[-1] == '=':
                 long = long[0:-1]
 
             # Case 1: no short option at all (makes life easy)
             if short is None:
                 if text:
-                    lines.append ("  --%-*s  %s" % (max_opt, long, text[0]))
+                    lines.append("  --%-*s  %s" % (max_opt, long, text[0]))
                 else:
-                    lines.append ("  --%-*s  " % (max_opt, long))
+                    lines.append("  --%-*s  " % (max_opt, long))
 
             # Case 2: we have a short option, so we have to include it
             # just after the long option
             else:
                 opt_names = "%s (-%s)" % (long, short)
                 if text:
-                    lines.append ("  --%-*s  %s" %
-                                  (max_opt, opt_names, text[0]))
+                    lines.append("  --%-*s  %s" %
+                                 (max_opt, opt_names, text[0]))
                 else:
-                    lines.append ("  --%-*s" % opt_names)
+                    lines.append("  --%-*s" % opt_names)
 
             for l in text[1:]:
-                lines.append (big_indent + l)
+                lines.append(big_indent + l)
 
         # for self.option_table
 
@@ -396,20 +396,19 @@ def generate_help (self, header=None):
     def print_help (self, header=None, file=None):
         if file is None:
             file = sys.stdout
-        for line in self.generate_help (header):
-            file.write (line + "\n")
-    # print_help ()
+        for line in self.generate_help(header):
+            file.write(line + "\n")
 
 # class FancyGetopt
 
 
 def fancy_getopt (options, negative_opt, object, args):
-    parser = FancyGetopt (options)
-    parser.set_negative_aliases (negative_opt)
-    return parser.getopt (args, object)
+    parser = FancyGetopt(options)
+    parser.set_negative_aliases(negative_opt)
+    return parser.getopt(args, object)
 
 
-WS_TRANS = string.maketrans (string.whitespace, ' ' * len (string.whitespace))
+WS_TRANS = string.maketrans(string.whitespace, ' ' * len(string.whitespace))
 
 def wrap_text (text, width):
     """wrap_text(text : string, width : int) -> [string]
@@ -420,13 +419,13 @@ def wrap_text (text, width):
 
     if text is None:
         return []
-    if len (text) <= width:
+    if len(text) <= width:
         return [text]
 
-    text = string.expandtabs (text)
-    text = string.translate (text, WS_TRANS)
-    chunks = re.split (r'( +|-+)', text)
-    chunks = filter (None, chunks)      # ' - ' results in empty strings
+    text = string.expandtabs(text)
+    text = string.translate(text, WS_TRANS)
+    chunks = re.split(r'( +|-+)', text)
+    chunks = filter(None, chunks)      # ' - ' results in empty strings
     lines = []
 
     while chunks:
@@ -435,9 +434,9 @@ def wrap_text (text, width):
         cur_len = 0                     # length of current line
 
         while chunks:
-            l = len (chunks[0])
+            l = len(chunks[0])
             if cur_len + l <= width:    # can squeeze (at least) this chunk in
-                cur_line.append (chunks[0])
+                cur_line.append(chunks[0])
                 del chunks[0]
                 cur_len = cur_len + l
             else:                       # this line is full
@@ -452,7 +451,7 @@ def wrap_text (text, width):
             # chunk that's too big too fit on a line -- so we break
             # down and break it up at the line width
             if cur_len == 0:
-                cur_line.append (chunks[0][0:width])
+                cur_line.append(chunks[0][0:width])
                 chunks[0] = chunks[0][width:]
 
             # all-whitespace chunks at the end of a line can be discarded
@@ -463,7 +462,7 @@ def wrap_text (text, width):
 
         # and store this line in the list-of-all-lines -- as a single
         # string, of course!
-        lines.append (string.join (cur_line, ''))
+        lines.append(string.join(cur_line, ''))
 
     # while chunks
 
@@ -501,5 +500,5 @@ def __init__ (self, options=[]):
 
     for w in (10, 20, 30, 40):
         print "width: %d" % w
-        print string.join (wrap_text (text, w), "\n")
+        print string.join(wrap_text(text, w), "\n")
         print
diff --git a/filelist.py b/filelist.py
index 84f36d2c4b..211b65f8d2 100644
--- a/filelist.py
+++ b/filelist.py
@@ -55,7 +55,7 @@ def findall (self, dir=os.curdir):
     # -- Fallback warning/debug functions ------------------------------
     
     def __warn (self, msg):
-        sys.stderr.write ("warning: %s\n" % msg)
+        sys.stderr.write("warning: %s\n" % msg)
         
     def __debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
@@ -87,7 +87,7 @@ def sort (self):
 
     def remove_duplicates (self):
         # Assumes list has been sorted!
-        for i in range (len(self.files)-1, 0, -1):
+        for i in range(len(self.files)-1, 0, -1):
             if self.files[i] == self.files[i-1]:
                 del self.files[i]
 
@@ -95,21 +95,21 @@ def remove_duplicates (self):
     # -- "File template" methods ---------------------------------------
     
     def _parse_template_line (self, line):
-        words = string.split (line)
+        words = string.split(line)
         action = words[0]
 
         patterns = dir = dir_pattern = None
 
         if action in ('include', 'exclude',
                       'global-include', 'global-exclude'):
-            if len (words) < 2:
+            if len(words) < 2:
                 raise DistutilsTemplateError, \
                       "'%s' expects <pattern1> <pattern2> ..." % action
 
             patterns = map(convert_path, words[1:])
 
         elif action in ('recursive-include', 'recursive-exclude'):
-            if len (words) < 3:
+            if len(words) < 3:
                 raise DistutilsTemplateError, \
                       "'%s' expects <dir> <pattern1> <pattern2> ..." % action
 
@@ -117,7 +117,7 @@ def _parse_template_line (self, line):
             patterns = map(convert_path, words[2:])
 
         elif action in ('graft', 'prune'):
-            if len (words) != 2:
+            if len(words) != 2:
                 raise DistutilsTemplateError, \
                      "'%s' expects a single <dir_pattern>" % action
 
@@ -146,13 +146,13 @@ def process_template_line (self, line):
         if action == 'include':
             self.debug_print("include " + string.join(patterns))
             for pattern in patterns:
-                if not self.include_pattern (pattern, anchor=1):
+                if not self.include_pattern(pattern, anchor=1):
                     self.warn("no files found matching '%s'" % pattern)
 
         elif action == 'exclude':
             self.debug_print("exclude " + string.join(patterns))
             for pattern in patterns:
-                if not self.exclude_pattern (pattern, anchor=1):
+                if not self.exclude_pattern(pattern, anchor=1):
                     self.warn(
                         "no previously-included files found matching '%s'"%
                         pattern)
@@ -160,15 +160,15 @@ def process_template_line (self, line):
         elif action == 'global-include':
             self.debug_print("global-include " + string.join(patterns))
             for pattern in patterns:
-                if not self.include_pattern (pattern, anchor=0):
-                    self.warn (("no files found matching '%s' " +
-                                "anywhere in distribution") %
-                               pattern)
+                if not self.include_pattern(pattern, anchor=0):
+                    self.warn(("no files found matching '%s' " +
+                               "anywhere in distribution") %
+                              pattern)
 
         elif action == 'global-exclude':
             self.debug_print("global-exclude " + string.join(patterns))
             for pattern in patterns:
-                if not self.exclude_pattern (pattern, anchor=0):
+                if not self.exclude_pattern(pattern, anchor=0):
                     self.warn(("no previously-included files matching '%s' " +
                                "found anywhere in distribution") %
                               pattern)
@@ -177,8 +177,8 @@ def process_template_line (self, line):
             self.debug_print("recursive-include %s %s" %
                              (dir, string.join(patterns)))
             for pattern in patterns:
-                if not self.include_pattern (pattern, prefix=dir):
-                    self.warn (("no files found matching '%s' " +
+                if not self.include_pattern(pattern, prefix=dir):
+                    self.warn(("no files found matching '%s' " +
                                 "under directory '%s'") %
                                (pattern, dir))
 
@@ -190,11 +190,11 @@ def process_template_line (self, line):
                     self.warn(("no previously-included files matching '%s' " +
                                "found under directory '%s'") %
                               (pattern, dir))
-
+                    
         elif action == 'graft':
             self.debug_print("graft " + dir_pattern)
             if not self.include_pattern(None, prefix=dir_pattern):
-                self.warn ("no directories found matching '%s'" % dir_pattern)
+                self.warn("no directories found matching '%s'" % dir_pattern)
 
         elif action == 'prune':
             self.debug_print("prune " + dir_pattern)
@@ -212,8 +212,7 @@ def process_template_line (self, line):
     # -- Filtering/selection methods -----------------------------------
 
     def include_pattern (self, pattern,
-                        anchor=1, prefix=None, is_regex=0):
-
+                         anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'self.files' that
         match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
         are not quite the same as implemented by the 'fnmatch' module: '*'
@@ -239,7 +238,7 @@ def include_pattern (self, pattern,
         Return 1 if files are found.
         """
         files_found = 0
-        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
+        pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("include_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
 
@@ -248,9 +247,9 @@ def include_pattern (self, pattern,
             self.findall()
 
         for name in self.allfiles:
-            if pattern_re.search (name):
+            if pattern_re.search(name):
                 self.debug_print(" adding " + name)
-                self.files.append (name)
+                self.files.append(name)
                 files_found = 1
     
         return files_found
@@ -267,11 +266,11 @@ def exclude_pattern (self, pattern,
         Return 1 if files are found.
         """
         files_found = 0
-        pattern_re = translate_pattern (pattern, anchor, prefix, is_regex)
+        pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("exclude_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
-        for i in range (len(self.files)-1, -1, -1):
-            if pattern_re.search (self.files[i]):
+        for i in range(len(self.files)-1, -1, -1):
+            if pattern_re.search(self.files[i]):
                 self.debug_print(" removing " + self.files[i])
                 del self.files[i]
                 files_found = 1
@@ -299,11 +298,11 @@ def findall (dir = os.curdir):
 
     while stack:
         dir = pop()
-        names = os.listdir (dir)
+        names = os.listdir(dir)
 
         for name in names:
             if dir != os.curdir:        # avoid the dreaded "./" syndrome
-                fullname = os.path.join (dir, name)
+                fullname = os.path.join(dir, name)
             else:
                 fullname = name
 
@@ -311,9 +310,9 @@ def findall (dir = os.curdir):
             stat = os.stat(fullname)
             mode = stat[ST_MODE]
             if S_ISREG(mode):
-                list.append (fullname)
+                list.append(fullname)
             elif S_ISDIR(mode) and not S_ISLNK(mode):
-                push (fullname)
+                push(fullname)
 
     return list
 
@@ -324,7 +323,7 @@ def glob_to_re (pattern):
     that '*' does not match "special characters" (which are
     platform-specific).
     """
-    pattern_re = fnmatch.translate (pattern)
+    pattern_re = fnmatch.translate(pattern)
 
     # '?' and '*' in the glob pattern become '.' and '.*' in the RE, which
     # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
@@ -333,7 +332,7 @@ def glob_to_re (pattern):
     # character except the special characters.
     # XXX currently the "special characters" are just slash -- i.e. this is
     # Unix-only.
-    pattern_re = re.sub (r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re)
     return pattern_re
 
 # glob_to_re ()
@@ -352,17 +351,17 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
             return pattern
 
     if pattern:
-        pattern_re = glob_to_re (pattern)
+        pattern_re = glob_to_re(pattern)
     else:
         pattern_re = ''
         
     if prefix is not None:
-        prefix_re = (glob_to_re (prefix))[0:-1] # ditch trailing $
-        pattern_re = "^" + os.path.join (prefix_re, ".*" + pattern_re)
+        prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+        pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
         
-    return re.compile (pattern_re)
+    return re.compile(pattern_re)
 
 # translate_pattern ()

From 208764c9d80a704b06463dbadf392709af561b57 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 02:13:49 +0000
Subject: [PATCH 0635/8469] Reformat docstrings. Standardize whitespace in
 function calls.

---
 archive_util.py | 56 +++++++++++++++++++-------------------
 dep_util.py     | 71 ++++++++++++++++++++++++-------------------------
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 26cd7fb2ec..61bc25ea0f 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -15,13 +15,13 @@
 def make_tarball (base_name, base_dir, compress="gzip",
                   verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
-       'base_dir'.  'compress' must be "gzip" (the default), "compress",
-       "bzip2", or None.  Both "tar" and the compression utility named by
-       'compress' must be on the default program search path, so this is
-       probably Unix-specific.  The output tar file will be named 'base_dir'
-       + ".tar", possibly plus the appropriate compression extension (".gz",
-       ".bz2" or ".Z").  Return the output filename."""
-
+    'base_dir'.  'compress' must be "gzip" (the default), "compress",
+    "bzip2", or None.  Both "tar" and the compression utility named by
+    'compress' must be on the default program search path, so this is
+    probably Unix-specific.  The output tar file will be named 'base_dir' +
+    ".tar", possibly plus the appropriate compression extension (".gz",
+    ".bz2" or ".Z").  Return the output filename.
+    """
     # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
     # It's pretty new, though, so we certainly can't require it --
     # but it would be nice to take advantage of it to skip the
@@ -44,11 +44,11 @@ def make_tarball (base_name, base_dir, compress="gzip",
     archive_name = base_name + ".tar"
     mkpath(os.path.dirname(archive_name), verbose=verbose, dry_run=dry_run)
     cmd = ["tar", "-cf", archive_name, base_dir]
-    spawn (cmd, verbose=verbose, dry_run=dry_run)
+    spawn(cmd, verbose=verbose, dry_run=dry_run)
 
     if compress:
-        spawn ([compress] + compress_flags[compress] + [archive_name],
-               verbose=verbose, dry_run=dry_run)
+        spawn([compress] + compress_flags[compress] + [archive_name],
+              verbose=verbose, dry_run=dry_run)
         return archive_name + compress_ext[compress]
     else:
         return archive_name
@@ -57,13 +57,13 @@ def make_tarball (base_name, base_dir, compress="gzip",
 
 
 def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
-    """Create a zip file from all the files under 'base_dir'.  The
-       output zip file will be named 'base_dir' + ".zip".  Uses either the
-       InfoZIP "zip" utility (if installed and found on the default search
-       path) or the "zipfile" Python module (if available).  If neither
-       tool is available, raises DistutilsExecError.  Returns the name
-       of the output zip file."""
-
+    """Create a zip file from all the files under 'base_dir'.  The output
+    zip file will be named 'base_dir' + ".zip".  Uses either the InfoZIP
+    "zip" utility (if installed and found on the default search path) or
+    the "zipfile" Python module (if available).  If neither tool is
+    available, raises DistutilsExecError.  Returns the name of the output
+    zip file.
+    """
     # This initially assumed the Unix 'zip' utility -- but
     # apparently InfoZIP's zip.exe works the same under Windows, so
     # no changes needed!
@@ -71,8 +71,8 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     zip_filename = base_name + ".zip"
     mkpath(os.path.dirname(zip_filename), verbose=verbose, dry_run=dry_run)
     try:
-        spawn (["zip", "-rq", zip_filename, base_dir],
-               verbose=verbose, dry_run=dry_run)
+        spawn(["zip", "-rq", zip_filename, base_dir],
+              verbose=verbose, dry_run=dry_run)
     except DistutilsExecError:
 
         # XXX really should distinguish between "couldn't find
@@ -96,14 +96,14 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         def visit (z, dirname, names):
             for name in names:
                 path = os.path.normpath(os.path.join(dirname, name))
-                if os.path.isfile (path):
-                    z.write (path, path)
+                if os.path.isfile(path):
+                    z.write(path, path)
 
         if not dry_run:
-            z = zipfile.ZipFile (zip_filename, "wb",
-                                 compression=zipfile.ZIP_DEFLATED)
+            z = zipfile.ZipFile(zip_filename, "wb",
+                                compression=zipfile.ZIP_DEFLATED)
 
-            os.path.walk (base_dir, visit, z)
+            os.path.walk(base_dir, visit, z)
             z.close()
 
     return zip_filename
@@ -143,9 +143,9 @@ def make_archive (base_name, format,
     if root_dir is not None:
         if verbose:
             print "changing into '%s'" % root_dir
-        base_name = os.path.abspath (base_name)
+        base_name = os.path.abspath(base_name)
         if not dry_run:
-            os.chdir (root_dir)
+            os.chdir(root_dir)
 
     if base_dir is None:
         base_dir = os.curdir
@@ -161,12 +161,12 @@ def make_archive (base_name, format,
     func = format_info[0]
     for (arg,val) in format_info[1]:
         kwargs[arg] = val
-    filename = apply (func, (base_name, base_dir), kwargs)
+    filename = apply(func, (base_name, base_dir), kwargs)
 
     if root_dir is not None:
         if verbose:
             print "changing back to '%s'" % save_cwd
-        os.chdir (save_cwd)
+        os.chdir(save_cwd)
 
     return filename
 
diff --git a/dep_util.py b/dep_util.py
index 97812edaf5..4b93ed023c 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -14,14 +14,13 @@
 
 def newer (source, target):
     """Return true if 'source' exists and is more recently modified than
-       'target', or if 'source' exists and 'target' doesn't.  Return
-       false if both exist and 'target' is the same age or younger than
-       'source'.  Raise DistutilsFileError if 'source' does not
-       exist."""
-
-    if not os.path.exists (source):
+    'target', or if 'source' exists and 'target' doesn't.  Return false if
+    both exist and 'target' is the same age or younger than 'source'.
+    Raise DistutilsFileError if 'source' does not exist.
+    """
+    if not os.path.exists(source):
         raise DistutilsFileError, "file '%s' does not exist" % source
-    if not os.path.exists (target):
+    if not os.path.exists(target):
         return 1
 
     from stat import ST_MTIME
@@ -35,20 +34,20 @@ def newer (source, target):
 
 def newer_pairwise (sources, targets):
     """Walk two filename lists in parallel, testing if each source is newer
-       than its corresponding target.  Return a pair of lists (sources,
-       targets) where source is newer than target, according to the
-       semantics of 'newer()'."""
-
-    if len (sources) != len (targets):
+    than its corresponding target.  Return a pair of lists (sources,
+    targets) where source is newer than target, according to the semantics
+    of 'newer()'.
+    """
+    if len(sources) != len(targets):
         raise ValueError, "'sources' and 'targets' must be same length"
 
     # build a pair of lists (sources, targets) where  source is newer
     n_sources = []
     n_targets = []
-    for i in range (len (sources)):
-        if newer (sources[i], targets[i]):
-            n_sources.append (sources[i])
-            n_targets.append (targets[i])
+    for i in range(len(sources)):
+        if newer(sources[i], targets[i]):
+            n_sources.append(sources[i])
+            n_targets.append(targets[i])
 
     return (n_sources, n_targets)
 
@@ -56,20 +55,20 @@ def newer_pairwise (sources, targets):
 
 
 def newer_group (sources, target, missing='error'):
-    """Return true if 'target' is out-of-date with respect to any
-       file listed in 'sources'.  In other words, if 'target' exists and
-       is newer than every file in 'sources', return false; otherwise
-       return true.  'missing' controls what we do when a source file is
-       missing; the default ("error") is to blow up with an OSError from
-       inside 'stat()'; if it is "ignore", we silently drop any missing
-       source files; if it is "newer", any missing source files make us
-       assume that 'target' is out-of-date (this is handy in "dry-run"
-       mode: it'll make you pretend to carry out commands that wouldn't
-       work because inputs are missing, but that doesn't matter because
-       you're not actually going to run the commands)."""
-
+    """Return true if 'target' is out-of-date with respect to any file
+    listed in 'sources'.  In other words, if 'target' exists and is newer
+    than every file in 'sources', return false; otherwise return true.
+    'missing' controls what we do when a source file is missing; the
+    default ("error") is to blow up with an OSError from inside 'stat()';
+    if it is "ignore", we silently drop any missing source files; if it is
+    "newer", any missing source files make us assume that 'target' is
+    out-of-date (this is handy in "dry-run" mode: it'll make you pretend to
+    carry out commands that wouldn't work because inputs are missing, but
+    that doesn't matter because you're not actually going to run the
+    commands).
+    """
     # If the target doesn't even exist, then it's definitely out-of-date.
-    if not os.path.exists (target):
+    if not os.path.exists(target):
         return 1
    
     # Otherwise we have to find out the hard way: if *any* source file
@@ -77,9 +76,9 @@ def newer_group (sources, target, missing='error'):
     # we can immediately return true.  If we fall through to the end
     # of the loop, then 'target' is up-to-date and we return false.
     from stat import ST_MTIME
-    target_mtime = os.stat (target)[ST_MTIME]
+    target_mtime = os.stat(target)[ST_MTIME]
     for source in sources:
-        if not os.path.exists (source):
+        if not os.path.exists(source):
             if missing == 'error':      # blow up when we stat() the file
                 pass                    
             elif missing == 'ignore':   # missing source dropped from 
@@ -102,13 +101,13 @@ def newer_group (sources, target, missing='error'):
 def make_file (src, dst, func, args,
                verbose=0, update_message=None, noupdate_message=None):
     """Makes 'dst' from 'src' (both filenames) by calling 'func' with
-       'args', but only if it needs to: i.e. if 'dst' does not exist or
-       'src' is newer than 'dst'."""
-
-    if newer (src, dst):
+    'args', but only if it needs to: i.e. if 'dst' does not exist or 'src'
+    is newer than 'dst'.
+    """
+    if newer(src, dst):
         if verbose and update_message:
             print update_message
-        apply (func, args)
+        apply(func, args)
     else:
         if verbose and noupdate_message:
             print noupdate_message

From 60381acee5ec5b115938eff6e66cb4277ec2a84d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 26 Sep 2000 02:51:09 +0000
Subject: [PATCH 0636/8469] Bump version to 0.9.3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 34f55a2fd7..b2b9b569a7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.3pre"
+__version__ = "0.9.3"

From f2886a0174116e2d8dfd3a5275de79233b5481b4 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 27 Sep 2000 00:15:37 +0000
Subject: [PATCH 0637/8469] Fix '_set_command_options()' so it only calls
 'strtobool()' on strings (was crashing on any boolean command-line option!).

---
 dist.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 91b820e9b4..92d390f777 100644
--- a/dist.py
+++ b/dist.py
@@ -755,9 +755,10 @@ def _set_command_options (self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                if neg_opt.has_key(option):
+                is_string = type(value) is StringType
+                if neg_opt.has_key(option) and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
-                elif option in bool_opts:
+                elif option in bool_opts and is_string:
                     setattr(command_obj, option, strtobool(value))
                 elif hasattr(command_obj, option):
                     setattr(command_obj, option, value)

From 3baf36cad7c938199bb27b95d25bcb5db2bb6cae Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 27 Sep 2000 00:17:08 +0000
Subject: [PATCH 0638/8469] Bump version to 0.9.4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b2b9b569a7..6113dcf8c3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.3"
+__version__ = "0.9.4"

From 5937fb6402fd3826b37192fc61b0869f7c3e441d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 27 Sep 2000 02:08:14 +0000
Subject: [PATCH 0639/8469] Big patch from Rene Liebscher to simplify the
 CCompiler API and implementations.  Details:   * replace
 'link_shared_object()', 'link_shared_lib()', and     'link_executable()' with
 'link()', which is (roughly)     the union of the three methods it replaces  
 * in all implementation classes (UnixCCompiler, MSVCCompiler, etc.),    
 ditch the old 'link_*()' methods and replace them with 'link()'   * in the
 abstract base class (CCompiler), add the old 'link_*()'     methods as
 wrappers around the new 'link()' (they also print     a warning of the
 deprecated interface)

Also increases consistency between MSVCCompiler and BCPPCompiler,
hopefully to make it easier to factor out the mythical WindowsCCompiler
class.  Details:
  * use 'self.linker' instead of 'self.link'
  * add ability to compile resource files to BCPPCompiler
  * added (redundant?) 'object_filename()' method to BCPPCompiler
  * only generate a .def file if 'export_symbols' defined
---
 bcppcompiler.py    | 263 +++++++++++++++++++++------------------------
 ccompiler.py       | 111 ++++++++++++-------
 cygwinccompiler.py | 230 +++++++++++++++++++++++++++------------
 msvccompiler.py    | 135 ++++++-----------------
 unixccompiler.py   | 100 ++++-------------
 5 files changed, 409 insertions(+), 430 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 2b73b12f0d..bb9557fbb3 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -63,7 +63,7 @@ def __init__ (self,
         # indicate their installation locations.
 
         self.cc = "bcc32.exe"
-        self.link = "ilink32.exe"
+        self.linker = "ilink32.exe"
         self.lib = "tlib.exe"
 
         self.preprocess_options = None
@@ -73,6 +73,8 @@ def __init__ (self,
         self.ldflags_shared = ['/Tpd', '/Gn', '/q', '/x']
         self.ldflags_shared_debug = ['/Tpd', '/Gn', '/q', '/x']
         self.ldflags_static = []
+        self.ldflags_exe = ['/Gn', '/q', '/x']
+        self.ldflags_exe_debug = ['/Gn', '/q', '/x','/r']
 
 
     # -- Worker methods ------------------------------------------------
@@ -108,16 +110,33 @@ def compile (self,
             if skip_sources[src]:
                 self.announce ("skipping %s (%s up-to-date)" % (src, obj))
             else:
+                src = os.path.normpath(src)
+                obj = os.path.normpath(obj)
+                self.mkpath(os.path.dirname(obj))
+
+                if ext == '.res':
+                    # This is already a binary file -- skip it.
+                    continue # the 'for' loop
+                if ext == '.rc':
+                    # This needs to be compiled to a .res file -- do it now.
+                    try:
+                        self.spawn (["brcc32", "-fo", obj, src])
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+                    continue # the 'for' loop
+
+                # The next two are both for the real compiler.
                 if ext in self._c_extensions:
                     input_opt = ""
                 elif ext in self._cpp_extensions:
                     input_opt = "-P"
+                else: 
+                    # Unknown file type -- no extra options.  The compiler
+                    # will probably fail, but let it just in case this is a
+                    # file the compiler recognizes even if we don't.
+                    input_opt = ""                              
 
-                src = os.path.normpath(src)
-                obj = os.path.normpath(obj)
-                
                 output_opt = "-o" + obj
-                self.mkpath(os.path.dirname(obj))
 
                 # Compiler command line syntax is: "bcc32 [options] file(s)".
                 # Note that the source file names must appear at the end of
@@ -163,45 +182,20 @@ def create_static_lib (self,
 
     # create_static_lib ()
     
-
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None):
-
-        self.link_shared_object (objects,
-                                 self.shared_library_name(output_libname),
-                                 output_dir=output_dir,
-                                 libraries=libraries,
-                                 library_dirs=library_dirs,
-                                 runtime_library_dirs=runtime_library_dirs,
-                                 export_symbols=export_symbols,
-                                 debug=debug,
-                                 extra_preargs=extra_preargs,
-                                 extra_postargs=extra_postargs,
-                                 build_temp=build_temp)
-                    
     
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None):
+    def link (self,
+              target_desc,        
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
 
         # XXX this ignores 'build_temp'!  should follow the lead of
         # msvccompiler.py
@@ -213,45 +207,61 @@ def link_shared_object (self,
         if runtime_library_dirs:
             self.warn ("I don't know what to do with 'runtime_library_dirs': "
                        + str (runtime_library_dirs))
-        
+
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
 
         if self._need_link (objects, output_filename):
 
-            if debug:
-                ld_args = self.ldflags_shared_debug[:]
+            # Figure out linker args based on type of target.
+            if target_desc == CCompiler.EXECUTABLE:
+                startup_obj = 'c0w32'
+                if debug:
+                    ld_args = self.ldflags_exe_debug[:]
+                else:
+                    ld_args = self.ldflags_exe[:]
             else:
-                ld_args = self.ldflags_shared[:]
+                startup_obj = 'c0d32'
+                if debug:
+                    ld_args = self.ldflags_shared_debug[:]
+                else:
+                    ld_args = self.ldflags_shared[:]
+
 
             # Create a temporary exports file for use by the linker
-            head, tail = os.path.split (output_filename)
-            modname, ext = os.path.splitext (tail)
-            temp_dir = os.path.dirname(objects[0]) # preserve tree structure
-            def_file = os.path.join (temp_dir, '%s.def' % modname)
-            contents = ['EXPORTS']
-            for sym in (export_symbols or []):
-                contents.append('  %s=_%s' % (sym, sym))
-            self.execute(write_file, (def_file, contents),
-                         "writing %s" % def_file)
+            if export_symbols is None:
+                def_file = ''
+            else:
+                head, tail = os.path.split (output_filename)
+                modname, ext = os.path.splitext (tail)
+                temp_dir = os.path.dirname(objects[0]) # preserve tree structure
+                def_file = os.path.join (temp_dir, '%s.def' % modname)
+                contents = ['EXPORTS']
+                for sym in (export_symbols or []):
+                    contents.append('  %s=_%s' % (sym, sym))
+                self.execute(write_file, (def_file, contents),
+                             "writing %s" % def_file)
 
             # Borland C++ has problems with '/' in paths
-            objects = map(os.path.normpath, objects)
-            startup_obj = 'c0d32'
-            objects.insert(0, startup_obj)
-
-            # either exchange python15.lib in the python libs directory against
-            # a Borland-like one, or create one with name bcpp_python15.lib 
-            # there and remove the pragmas from config.h  
-            libraries.append ('import32')
-            libraries.append ('cw32mt')
-
-            # Start building command line flags and options.
-
+            objects2 = map(os.path.normpath, objects)
+            # split objects in .obj and .res files
+            # Borland C++ needs them at different positions in the command line
+            objects = [startup_obj]
+            resources = []
+            for file in objects2:
+                (base, ext) = os.path.splitext(os.path.normcase(file))
+                if ext == '.res':
+                    resources.append(file)
+                else:
+                    objects.append(file)
+            
+            
             for l in library_dirs:
                 ld_args.append("/L%s" % os.path.normpath(l)) 
-                
-            ld_args.extend(objects)     # list of object files
+            ld_args.append("/L.") # we sometimes use relative paths
+
+            # list of object files                
+            ld_args.extend(objects)     
 
             # XXX the command-line syntax for Borland C++ is a bit wonky;
             # certain filenames are jammed together in one big string, but
@@ -263,14 +273,14 @@ def link_shared_object (self,
             # because 'spawn()' would quote any filenames with spaces in
             # them.  Arghghh!.  Apparently it works fine as coded...
 
-            # name of dll file
+            # name of dll/exe file
             ld_args.extend([',',output_filename])
             # no map file and start libraries 
             ld_args.append(',,')
 
             for lib in libraries:
                 # see if we find it and if there is a bcpp specific lib 
-                # (bcpp_xxx.lib)
+                # (xxx_bcpp.lib)
                 libfile = self.find_library_file(library_dirs, lib, debug)
                 if libfile is None:
                     ld_args.append(lib)
@@ -279,8 +289,17 @@ def link_shared_object (self,
                 else:
                     # full name which prefers bcpp_xxx.lib over xxx.lib
                     ld_args.append(libfile)
+
+            # some default libraries
+            ld_args.append ('import32')
+            ld_args.append ('cw32mt')
+
             # def file for export symbols
             ld_args.extend([',',def_file])
+            # add resource files
+            ld_args.append(',')
+            ld_args.extend(resources)
+
             
             if extra_preargs:
                 ld_args[:0] = extra_preargs
@@ -289,88 +308,24 @@ def link_shared_object (self,
 
             self.mkpath (os.path.dirname (output_filename))
             try:
-                self.spawn ([self.link] + ld_args)
+                self.spawn ([self.linker] + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
 
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
-    # link_shared_object ()
-
-
-    def link_executable (self,
-                         objects,
-                         output_progname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None):
-
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
-
-        if runtime_library_dirs:
-            self.warn ("I don't know what to do with 'runtime_library_dirs': "
-                       + str (runtime_library_dirs))
-        
-        lib_opts = gen_lib_options (self,
-                                    library_dirs, runtime_library_dirs,
-                                    libraries)
-        output_filename = output_progname + self.exe_extension
-        if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
-
-        if self._need_link (objects, output_filename):
-
-            if debug:
-                ldflags = self.ldflags_shared_debug[1:]
-            else:
-                ldflags = self.ldflags_shared[1:]
-
-            ld_args = ldflags + lib_opts + \
-                      objects + ['/OUT:' + output_filename]
-
-            if extra_preargs:
-                ld_args[:0] = extra_preargs
-            if extra_postargs:
-                ld_args.extend (extra_postargs)
-
-            self.mkpath (os.path.dirname (output_filename))
-            try:
-                self.spawn ([self.link] + ld_args)
-            except DistutilsExecError, msg:
-                raise LinkError, msg
-        else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)   
-    
+    # link ()
 
     # -- Miscellaneous methods -----------------------------------------
-    # These are all used by the 'gen_lib_options() function, in
-    # ccompiler.py.
-
-    def library_dir_option (self, dir):
-        return "-L" + dir
-
-    def runtime_library_dir_option (self, dir):
-        raise DistutilsPlatformError, \
-              ("don't know how to set runtime library search path "
-               "for Borland C++")
-
-    def library_option (self, lib):
-        return self.library_filename (lib)
 
 
     def find_library_file (self, dirs, lib, debug=0):
         # List of effective library names to try, in order of preference:
-        # bcpp_xxx.lib is better than xxx.lib
+        # xxx_bcpp.lib is better than xxx.lib
         # and xxx_d.lib is better than xxx.lib if debug is set
         #
-        # The "bcpp_" prefix is to handle a Python installation for people
+        # The "_bcpp" suffix is to handle a Python installation for people
         # with multiple compilers (primarily Distutils hackers, I suspect
         # ;-).  The idea is they'd have one static library for each
         # compiler they care about, since (almost?) every Windows compiler
@@ -390,3 +345,31 @@ def find_library_file (self, dirs, lib, debug=0):
             # Oops, didn't find it in *any* of 'dirs'
             return None
 
+    # overwrite the one from CCompiler to support rc and res-files
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            # use normcase to make sure '.rc' is really '.rc' and not '.RC'
+            (base, ext) = os.path.splitext (os.path.normcase(src_name))
+            if ext not in (self.src_extensions + ['.rc','.res']):
+                raise UnknownFileError, \
+                      "unknown file type '%s' (from '%s')" % \
+                      (ext, src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext == '.res':
+                # these can go unchanged
+                obj_names.append (os.path.join (output_dir, base + ext))
+            elif ext == '.rc':
+                # these need to be compiled to .res-files
+                obj_names.append (os.path.join (output_dir, base + '.res'))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                            base + self.obj_extension))
+        return obj_names
+
+    # object_filenames ()
diff --git a/ccompiler.py b/ccompiler.py
index ce3f2be69d..97949060fb 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -561,24 +561,32 @@ def create_static_lib (self,
         pass
     
 
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None):
-        """Link a bunch of stuff together to create a shared library file.
-        Similar semantics to 'create_static_lib()', with the addition of
-        other libraries to link against and directories to search for them.
-        Also, of course, the type and name of the generated file will
-        almost certainly be different, as will the program used to create
-        it.
+    # values for target_desc parameter in link()
+    SHARED_OBJECT = "shared_object"
+    SHARED_LIBRARY = "shared_library"
+    EXECUTABLE = "executable"
+
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
+        """Link a bunch of stuff together to create an executable or
+        shared library file.
+
+        The "bunch of stuff" consists of the list of object files supplied
+        as 'objects'.  'output_filename' should be a filename.  If
+        'output_dir' is supplied, 'output_filename' is relative to it
+        (i.e. 'output_filename' can provide directory components if
+        needed).
 
         'libraries' is a list of libraries to link against.  These are
         library names, not filenames, since they're translated into
@@ -610,7 +618,31 @@ def link_shared_lib (self,
 
         Raises LinkError on failure.
         """
-        pass
+        raise NotImplementedError
+
+    
+    # old methods, rewritten to use the new link() method.
+
+    def link_shared_lib (self,
+                         objects,
+                         output_libname,
+                         output_dir=None,
+                         libraries=None,
+                         library_dirs=None,
+                         runtime_library_dirs=None,
+                         export_symbols=None,
+                         debug=0,
+                         extra_preargs=None,
+                         extra_postargs=None,
+                         build_temp=None):
+        self.warn("link_shared_lib(..) is deprecated, please "
+                  "use link(CCompiler.SHARED_LIBRARY, ...) instead")
+        self.link(CCompiler.SHARED_LIBRARY, objects, 
+                  self.library_filename(output_libname, lib_type='shared'),
+                  output_dir,
+                  libraries, library_dirs, runtime_library_dirs,
+                  export_symbols, debug,
+                  extra_preargs, extra_postargs, build_temp)
     
 
     def link_shared_object (self,
@@ -625,16 +657,13 @@ def link_shared_object (self,
                             extra_preargs=None,
                             extra_postargs=None,
                             build_temp=None):
-        """Link a bunch of stuff together to create a shared object file.
-        Much like 'link_shared_lib()', except the output filename is
-        explicitly supplied as 'output_filename'.  If 'output_dir' is
-        supplied, 'output_filename' is relative to it
-        (i.e. 'output_filename' can provide directory components if
-        needed).
-
-        Raises LinkError on failure.
-        """
-        pass
+        self.warn("link_shared_object(...) is deprecated, please "
+                  "use link(CCompiler.SHARED_OBJECT,...) instead.")
+        self.link(CCompiler.SHARED_OBJECT, objects,
+                  output_filename, output_dir,
+                  libraries, library_dirs, runtime_library_dirs,
+                  export_symbols, debug,
+                  extra_preargs, extra_postargs, build_temp)
 
 
     def link_executable (self,
@@ -647,16 +676,12 @@ def link_executable (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
-        """Link a bunch of stuff together to create a binary executable
-        file.  The "bunch of stuff" is as for 'link_shared_lib()'.
-        'output_progname' should be the base name of the executable
-        program--e.g. on Unix the same as the output filename, but on
-        DOS/Windows ".exe" will be appended.
-
-        Raises LinkError on failure.
-        """
-        pass
-
+        self.warn("link_executable(...) is deprecated, please "
+                  "use link(CCompiler.EXECUTABLE,...) instead.")
+        self.link (CCompiler.EXECUTABLE, objects, 
+                   self.executable_filename(output_progname), output_dir,
+                   libraries, library_dirs, runtime_library_dirs, None, 
+                   debug, extra_preargs, extra_postargs, None)
 
 
     # -- Miscellaneous methods -----------------------------------------
@@ -756,6 +781,14 @@ def shared_object_filename (self,
             basename = os.path.basename (basename)
         return os.path.join (output_dir, basename + self.shared_lib_extension)
 
+    def executable_filename (self,
+                                basename,
+                                strip_dir=0,
+                                output_dir=''):
+        if output_dir is None: output_dir = ''
+        if strip_dir:
+            basename = os.path.basename (basename)
+        return os.path.join(output_dir, basename + (self.exe_extension or ''))
 
     def library_filename (self,
                           libname,
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index f547d540f5..5b06d3d79c 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -39,14 +39,17 @@
 #     By specifying -static we force ld to link against the import libraries, 
 #     this is windows standard and there are normally not the necessary symbols 
 #     in the dlls.
+#   *** only the version of June 2000 shows these problems 
 
 # created 2000/05/05, Rene Liebscher
 
 __revision__ = "$Id$"
 
 import os,sys,copy
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
+from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 
 class CygwinCCompiler (UnixCCompiler):
 
@@ -87,9 +90,9 @@ def __init__ (self,
         # same as the rest of binutils ( also ld )
         # dllwrap 2.10.90 is buggy
         if self.ld_version >= "2.10.90": 
-            self.linker = "gcc"
+            self.linker_dll = "gcc"
         else:
-            self.linker = "dllwrap"
+            self.linker_dll = "dllwrap"
 
         # Hard-code GCC because that's what this is all about.
         # XXX optimization, warnings etc. should be customizable.
@@ -97,7 +100,7 @@ def __init__ (self,
                              compiler_so='gcc -mcygwin -mdll -O -Wall',
                              linker_exe='gcc -mcygwin',
                              linker_so=('%s -mcygwin -mdll -static' %
-                                        self.linker))
+                                        self.linker_dll))
 
         # cygwin and mingw32 need different sets of libraries 
         if self.gcc_version == "2.91.57":
@@ -111,58 +114,108 @@ def __init__ (self,
         
     # __init__ ()
 
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None):
+    # not much different of the compile method in UnixCCompiler,
+    # but we have to insert some lines in the middle of it, so
+    # we put here a adapted version of it.
+    # (If we would call compile() in the base class, it would do some 
+    # initializations a second time, this is why all is done here.)
+    def compile (self,
+                 sources,
+                 output_dir=None,
+                 macros=None,
+                 include_dirs=None,
+                 debug=0,
+                 extra_preargs=None,
+                 extra_postargs=None):
+
+        (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile (sources, output_dir)
+
+        # Figure out the options for the compiler command line.
+        pp_opts = gen_preprocess_options (macros, include_dirs)
+        cc_args = pp_opts + ['-c']
+        if debug:
+            cc_args[:0] = ['-g']
+        if extra_preargs:
+            cc_args[:0] = extra_preargs
+        if extra_postargs is None:
+            extra_postargs = []
+
+        # Compile all source files that weren't eliminated by
+        # '_prep_compile()'.        
+        for i in range (len (sources)):
+            src = sources[i] ; obj = objects[i]
+            ext = (os.path.splitext (src))[1]
+            if skip_sources[src]:
+                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+            else:
+                self.mkpath (os.path.dirname (obj))
+                if ext == '.rc' or ext == '.res':
+                    # gcc needs '.res' and '.rc' compiled to object files !!!
+                    try:
+                        self.spawn (["windres","-i",src,"-o",obj])
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+                else: # for other files use the C-compiler 
+                    try:
+                        self.spawn (self.compiler_so + cc_args +
+                                [src, '-o', obj] +
+                                extra_postargs)
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+
+        # Return *all* object filenames, not just the ones we just built.
+        return objects
+
+    # compile ()
+
+
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
         
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
-        
+        objects = copy.copy(objects or [])
+                
         # Additional libraries
         libraries.extend(self.dll_libraries)
-        
-        # we want to put some files in the same directory as the 
-        # object files are, build_temp doesn't help much
-
-        # where are the object files
-        temp_dir = os.path.dirname(objects[0])
-
-        # name of dll to give the helper files (def, lib, exp) the same name
-        (dll_name, dll_extension) = os.path.splitext(
-            os.path.basename(output_filename))
-
-        # generate the filenames for these files
-        def_file = None # this will be done later, if necessary
-        exp_file = os.path.join(temp_dir, dll_name + ".exp")
-        lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
-
-        #extra_preargs.append("--verbose")
-        if self.linker == "dllwrap":
-            extra_preargs.extend([#"--output-exp",exp_file,
-                                  "--output-lib",lib_file,
-                                 ])
-        else:
-            # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
-            extra_preargs.extend([#"-Wl,--out-implib,%s" % lib_file,
-                                 ])
-       
-        #  check what we got in export_symbols
-        if export_symbols is not None:
-            # Make .def file
-            # (It would probably better to check if we really need this, 
+
+        # handle export symbols by creating a def-file
+        # with executables this only works with gcc/ld as linker
+        if ((export_symbols is not None) and
+            (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
+            # (The linker doesn't do anything if output is up-to-date.
+            # So it would probably better to check if we really need this,
             # but for this we had to insert some unchanged parts of 
             # UnixCCompiler, and this is not what we want.) 
+
+            # we want to put some files in the same directory as the 
+            # object files are, build_temp doesn't help much
+            # where are the object files
+            temp_dir = os.path.dirname(objects[0])
+            # name of dll to give the helper files the same base name
+            (dll_name, dll_extension) = os.path.splitext(
+                os.path.basename(output_filename))
+
+            # generate the filenames for these files
             def_file = os.path.join(temp_dir, dll_name + ".def")
+            exp_file = os.path.join(temp_dir, dll_name + ".exp")
+            lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
+       
+            # Generate .def file
             contents = [
                 "LIBRARY %s" % os.path.basename(output_filename),
                 "EXPORTS"]
@@ -171,35 +224,78 @@ def link_shared_object (self,
             self.execute(write_file, (def_file, contents),
                          "writing %s" % def_file)
 
-        if def_file:
-            if self.linker == "dllwrap":
+            # next add options for def-file and to creating import libraries
+
+            # dllwrap uses different options than gcc/ld
+            if self.linker_dll == "dllwrap":
+                extra_preargs.extend([#"--output-exp",exp_file,
+                                       "--output-lib",lib_file,
+                                     ])
                 # for dllwrap we have to use a special option
-                extra_preargs.append("--def")
-            # for gcc/ld it is specified as any other object file    
-            extra_preargs.append(def_file)
+                extra_preargs.extend(["--def", def_file])
+            # we use gcc/ld here and can be sure ld is >= 2.9.10
+            else:
+                # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
+                #extra_preargs.extend(["-Wl,--out-implib,%s" % lib_file])
+                # for gcc/ld the def-file is specified as any other object files    
+                objects.append(def_file)
+
+        #end: if ((export_symbols is not None) and
+        #        (target_desc <> self.EXECUTABLE or self.linker_dll == "gcc")):
                                                  
         # who wants symbols and a many times larger output file
         # should explicitly switch the debug mode on 
         # otherwise we let dllwrap/ld strip the output file
-        # (On my machine unstripped_file = stripped_file + 254KB
-        #   10KB < stripped_file < ??100KB ) 
+        # (On my machine: 10KB < stripped_file < ??100KB 
+        #   unstripped_file = stripped_file + XXX KB
+        #  ( XXX=254 for a typical python extension)) 
         if not debug: 
             extra_preargs.append("-s") 
         
-        UnixCCompiler.link_shared_object(self,
-                            objects,
-                            output_filename,
-                            output_dir,
-                            libraries,
-                            library_dirs,
-                            runtime_library_dirs,
-                            None, # export_symbols, we do this in our def-file
-                            debug,
-                            extra_preargs,
-                            extra_postargs,
-                            build_temp)
+        UnixCCompiler.link(self,
+                           target_desc,
+                           objects,
+                           output_filename,
+                           output_dir,
+                           libraries,
+                           library_dirs,
+                           runtime_library_dirs,
+                           None, # export_symbols, we do this in our def-file
+                           debug,
+                           extra_preargs,
+                           extra_postargs,
+                           build_temp)
         
-    # link_shared_object ()
+    # link ()
+
+    # -- Miscellaneous methods -----------------------------------------
+
+    # overwrite the one from CCompiler to support rc and res-files
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            # use normcase to make sure '.rc' is really '.rc' and not '.RC'
+            (base, ext) = os.path.splitext (os.path.normcase(src_name))
+            if ext not in (self.src_extensions + ['.rc','.res']):
+                raise UnknownFileError, \
+                      "unknown file type '%s' (from '%s')" % \
+                      (ext, src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext == '.res' or ext == '.rc':
+                # these need to be compiled to object files
+                obj_names.append (os.path.join (output_dir, 
+                                            base + ext + self.obj_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                            base + self.obj_extension))
+        return obj_names
+
+    # object_filenames ()
 
 # class CygwinCCompiler
 
@@ -227,7 +323,7 @@ def __init__ (self,
                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
                              linker_exe='gcc -mno-cygwin',
                              linker_so='%s -mno-cygwin -mdll -static %s' 
-                                        % (self.linker, entry_point))
+                                        % (self.linker_dll, entry_point))
         # Maybe we should also append -mthreads, but then the finished
         # dlls need another dll (mingwm10.dll see Mingw32 docs)
         # (-mthreads: Support thread-safe exception handling on `Mingw32')       
diff --git a/msvccompiler.py b/msvccompiler.py
index ea58a79cd3..0325b48508 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -205,7 +205,7 @@ def __init__ (self,
             version = versions[0]  # highest version
 
             self.cc   = find_exe("cl.exe", version)
-            self.link = find_exe("link.exe", version)
+            self.linker = find_exe("link.exe", version)
             self.lib  = find_exe("lib.exe", version)
             self.rc   = find_exe("rc.exe", version)     # resource compiler
             self.mc   = find_exe("mc.exe", version)     # message compiler
@@ -221,7 +221,7 @@ def __init__ (self,
         else:
             # devstudio not found in the registry
             self.cc = "cl.exe"
-            self.link = "link.exe"
+            self.linker = "link.exe"
             self.lib = "lib.exe"
             self.rc = "rc.exe"
             self.mc = "mc.exe"
@@ -396,45 +396,19 @@ def create_static_lib (self,
 
     # create_static_lib ()
     
-
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None):
-
-        self.link_shared_object (objects,
-                                 self.shared_library_name(output_libname),
-                                 output_dir=output_dir,
-                                 libraries=libraries,
-                                 library_dirs=library_dirs,
-                                 runtime_library_dirs=runtime_library_dirs,
-                                 export_symbols=export_symbols,
-                                 debug=debug,
-                                 extra_preargs=extra_preargs,
-                                 extra_postargs=extra_postargs,
-                                 build_temp=build_temp)
-                    
-    
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None):
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
@@ -452,10 +426,16 @@ def link_shared_object (self,
 
         if self._need_link (objects, output_filename):
 
-            if debug:
-                ldflags = self.ldflags_shared_debug
+            if target_desc == CCompiler.EXECUTABLE:
+                if debug:
+                    ldflags = self.ldflags_shared_debug[1:]
+                else:
+                    ldflags = self.ldflags_shared[1:]
             else:
-                ldflags = self.ldflags_shared
+                if debug:
+                    ldflags = self.ldflags_shared_debug
+                else:
+                    ldflags = self.ldflags_shared
 
             export_opts = []
             for sym in (export_symbols or []):
@@ -469,12 +449,13 @@ def link_shared_object (self,
             # needed! Make sure they are generated in the temporary build
             # directory. Since they have different names for debug and release
             # builds, they can go into the same directory.
-            (dll_name, dll_ext) = os.path.splitext(
-                os.path.basename(output_filename))
-            implib_file = os.path.join(
-                os.path.dirname(objects[0]),
-                self.library_filename(dll_name))
-            ld_args.append ('/IMPLIB:' + implib_file)
+            if export_symbols is not None:
+                (dll_name, dll_ext) = os.path.splitext(
+                    os.path.basename(output_filename))
+                implib_file = os.path.join(
+                    os.path.dirname(objects[0]),
+                    self.library_filename(dll_name))
+                ld_args.append ('/IMPLIB:' + implib_file)
 
             if extra_preargs:
                 ld_args[:0] = extra_preargs
@@ -483,66 +464,16 @@ def link_shared_object (self,
 
             self.mkpath (os.path.dirname (output_filename))
             try:
-                self.spawn ([self.link] + ld_args)
+                self.spawn ([self.linker] + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
 
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
-    # link_shared_object ()
+    # link ()
 
 
-    def link_executable (self,
-                         objects,
-                         output_progname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None):
-
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
-
-        if runtime_library_dirs:
-            self.warn ("I don't know what to do with 'runtime_library_dirs': "
-                       + str (runtime_library_dirs))
-        
-        lib_opts = gen_lib_options (self,
-                                    library_dirs, runtime_library_dirs,
-                                    libraries)
-        output_filename = output_progname + self.exe_extension
-        if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
-
-        if self._need_link (objects, output_filename):
-
-            if debug:
-                ldflags = self.ldflags_shared_debug[1:]
-            else:
-                ldflags = self.ldflags_shared[1:]
-
-            ld_args = ldflags + lib_opts + \
-                      objects + ['/OUT:' + output_filename]
-
-            if extra_preargs:
-                ld_args[:0] = extra_preargs
-            if extra_postargs:
-                ld_args.extend (extra_postargs)
-
-            self.mkpath (os.path.dirname (output_filename))
-            try:
-                self.spawn ([self.link] + ld_args)
-            except DistutilsExecError, msg:
-                raise LinkError, msg
-        else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)   
-    
-
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
     # ccompiler.py.
diff --git a/unixccompiler.py b/unixccompiler.py
index ff0341a5ce..f7eb93ae43 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -190,45 +190,19 @@ def create_static_lib (self,
     # create_static_lib ()
 
 
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None):
-
-        self.link_shared_object(
-            objects,
-            self.library_filename(output_libname, lib_type='shared'),
-            output_dir,
-            libraries,
-            library_dirs,
-            runtime_library_dirs,
-            export_symbols,
-            debug,
-            extra_preargs,
-            extra_postargs,
-            build_temp)
-        
-
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None):
+    def link (self,
+              target_desc,    
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
 
         (objects, output_dir) = self._fix_object_args(objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
@@ -253,54 +227,16 @@ def link_shared_object (self,
                 ld_args.extend(extra_postargs)
             self.mkpath(os.path.dirname(output_filename))
             try:
-                self.spawn(self.linker_so + ld_args)
+                if target_desc == CCompiler.EXECUTABLE:    
+                    self.spawn(self.linker_exe + ld_args)
+                else:
+                    self.spawn(self.linker_so + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
             self.announce("skipping %s (up-to-date)" % output_filename)
 
-    # link_shared_object ()
-
-
-    def link_executable (self,
-                         objects,
-                         output_progname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None):
-    
-        (objects, output_dir) = self._fix_object_args(objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
-
-        lib_opts = gen_lib_options(self,
-                                   library_dirs, runtime_library_dirs,
-                                   libraries)
-        output_filename = output_progname # Unix-ism!
-        if output_dir is not None:
-            output_filename = os.path.join(output_dir, output_filename)
-
-        if self._need_link(objects, output_filename):
-            ld_args = objects + self.objects + lib_opts + ['-o', output_filename]
-            if debug:
-                ld_args[:0] = ['-g']
-            if extra_preargs:
-                ld_args[:0] = extra_preargs
-            if extra_postargs:
-                ld_args.extend(extra_postargs)
-            self.mkpath(os.path.dirname(output_filename))
-            try:
-                self.spawn(self.linker_exe + ld_args)
-            except DistutilsExecError, msg:
-                raise LinkError, msg
-        else:
-            self.announce("skipping %s (up-to-date)" % output_filename)
-
-    # link_executable ()
+    # link ()
 
 
     # -- Miscellaneous methods -----------------------------------------

From a50a92cb127350ef11b3bf567d9724e61ce063af Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 27 Sep 2000 02:24:21 +0000
Subject: [PATCH 0640/8469] Remove deprecation warnings on old 'link_*()'
 methods, ie. they're not deprecated after all.  But now they're only
 implemented once, instead of N times.

---
 ccompiler.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 97949060fb..b10ee67e3c 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -621,7 +621,7 @@ def link (self,
         raise NotImplementedError
 
     
-    # old methods, rewritten to use the new link() method.
+    # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
     def link_shared_lib (self,
                          objects,
@@ -635,8 +635,6 @@ def link_shared_lib (self,
                          extra_preargs=None,
                          extra_postargs=None,
                          build_temp=None):
-        self.warn("link_shared_lib(..) is deprecated, please "
-                  "use link(CCompiler.SHARED_LIBRARY, ...) instead")
         self.link(CCompiler.SHARED_LIBRARY, objects, 
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
@@ -657,8 +655,6 @@ def link_shared_object (self,
                             extra_preargs=None,
                             extra_postargs=None,
                             build_temp=None):
-        self.warn("link_shared_object(...) is deprecated, please "
-                  "use link(CCompiler.SHARED_OBJECT,...) instead.")
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
@@ -676,12 +672,10 @@ def link_executable (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
-        self.warn("link_executable(...) is deprecated, please "
-                  "use link(CCompiler.EXECUTABLE,...) instead.")
-        self.link (CCompiler.EXECUTABLE, objects, 
-                   self.executable_filename(output_progname), output_dir,
-                   libraries, library_dirs, runtime_library_dirs, None, 
-                   debug, extra_preargs, extra_postargs, None)
+        self.link(CCompiler.EXECUTABLE, objects, 
+                  self.executable_filename(output_progname), output_dir,
+                  libraries, library_dirs, runtime_library_dirs, None, 
+                  debug, extra_preargs, extra_postargs, None)
 
 
     # -- Miscellaneous methods -----------------------------------------

From 117c5cbfe52d2dfc01e823e96051f24f80f60038 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 27 Sep 2000 02:26:57 +0000
Subject: [PATCH 0641/8469] Bump version to 1.0pre.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6113dcf8c3..23315cdeb9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "0.9.4"
+__version__ = "1.0pre"

From b0ce6a9888ab8fc85326e696c0e114dddfdeaeaa Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 28 Sep 2000 19:28:35 +0000
Subject: [PATCH 0642/8469] Removed the implib_dir instance variable because it
 is unused.

Removed get_ext_libname() because it is unused.

Fixed get_libraries() to append an '_d' to the python debug
import library. If MSVC is used, do not add 'pythonxx.lib' to
the list of libraries, because this is handled better
by a pragma in config.h.

This should fix bug #115595, but it needs some more testing.
---
 command/build_ext.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7fdfd1458d..9147c3d07b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -158,7 +158,6 @@ def finalize_options (self):
         # also Python's library directory must be appended to library_dirs
         if os.name == 'nt':
             self.library_dirs.append (os.path.join(sys.exec_prefix, 'libs'))
-            self.implib_dir = self.build_temp
             if self.debug:
                 self.build_temp = os.path.join (self.build_temp, "Debug")
             else:
@@ -543,15 +542,6 @@ def get_ext_filename (self, ext_name):
             return apply (os.path.join, ext_path) + '_d' + so_ext
         return apply (os.path.join, ext_path) + so_ext
 
-    def get_ext_libname (self, ext_name):
-        # create a filename for the (unneeded) lib-file.
-        # extensions in debug_mode are named 'module_d.pyd' under windows
-        ext_path = string.split (ext_name, '.')
-        if os.name == 'nt' and self.debug:
-            return apply (os.path.join, ext_path) + '_d.lib'
-        return apply (os.path.join, ext_path) + '.lib'
-
-
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
@@ -573,9 +563,15 @@ def get_libraries (self, ext):
         # is redundant, since the library is mentioned in a pragma in
         # config.h that MSVC groks.  The other Windows compilers all seem
         # to need it mentioned explicitly, though, so that's what we do.
-        if sys.platform == "win32": 
-            pythonlib = ("python%d%d" %
-                 (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+        # Append '_d' to the python import library on debug builds.
+        from distutils.msvccompiler import MSVCCompiler
+        if sys.platform == "win32" and \
+           not isinstance(self.compiler, MSVCCompiler):
+            template = "python%d%d"
+            if self.debug:
+                template = template + '_d'
+            pythonlib = (template %
+                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]

From 96979143f471579f54c80afc1aedf0831a98e58a Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 29 Sep 2000 11:36:55 +0000
Subject: [PATCH 0643/8469] Removed the extra_dirs and path_file metadata
 options. They are unneeded: All this stuff is already done by the install
 command which is run by bdist_wininst.

One bug has been fixed:
The root of the fake install tree is install.install_purelib,
not install.install_lib!
They are different if the extra_path option is used in
the setup function.

Rebuild after the changes to wininst.exe.
---
 command/bdist_wininst.py | 530 +++++++++++++++++++--------------------
 1 file changed, 260 insertions(+), 270 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 16dd8022a0..3251bac07c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -28,7 +28,8 @@ class bdist_wininst (Command):
                     ('no-target-compile', 'c',
                      "do not compile .py to .pyc on the target system"),
                     ('no-target-optimize', 'o',
-                     "do not compile .py to .pyo (optimized) on the target system"),
+                     "do not compile .py to .pyo (optimized)"
+                     "on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
                    ]
@@ -92,13 +93,6 @@ def run (self):
 
         self.announce ("installing to %s" % self.bdist_dir)
         install.ensure_finalized()
-
-        # save the path_file and extra_dirs options
-        # created by the install command if an extra_path
-        # argument has been supplied
-        self.extra_dirs = install.extra_dirs
-        self.path_file = install.path_file
-
         install.run()
 
         # And make an archive relative to the root of the
@@ -108,8 +102,8 @@ def run (self):
                                         "%s.win32" % fullname)
 
         # Our archive MUST be relative to sys.prefix, which is the
-        # same as install_lib in the 'nt' scheme.
-        root_dir = os.path.normpath (install.install_lib)
+        # same as install_purelib in the 'nt' scheme.
+        root_dir = os.path.normpath (install.install_purelib)
 
         # Sanity check: Make sure everything is included
         for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
@@ -161,10 +155,6 @@ def get_inidata (self):
         lines.append ("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append ("target_version=%s" % self.target_version)
-        if (self.path_file):
-            lines.append ("path_file=%s" % self.path_file)
-        if (self.extra_dirs):
-            lines.append ("extra_dirs=%s" % self.extra_dirs)
 
         title = self.distribution.get_fullname()
         lines.append ("title=%s" % repr (title)[1:-1])
@@ -227,271 +217,271 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
+HoPu/BHbEcl1IEEB23UHix6D7vwR2xHJAdtz73UJix6D7vwR23Pkg8ECgf0A8///g9EBjRQvg/38
+dg+KAkKIB0dJdffpY////5CLAoPCBIkHg8cEg+kEd/EBz+lM////Xon3uZAAAACKB0cs6DwBd/eA
+PwF18osHil8EZsHoCMHAEIbEKfiA6+gB8IkHg8cFidji2Y2+ALAAAIsHCcB0PItfBI2EMDDRAAAB
+81CDxwj/lrzRAACVigdHCMB03In5V0jyrlX/lsDRAAAJwHQHiQODwwTr4f+WxNEAAGHpmHj//wAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -506,8 +496,8 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAOuIAAEjiAABY4gAAAAAAAGbiAAAAAAAAdOIAAAAAAACE4gAAAAAAAI7i
 AAAAAAAAlOIAAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkz
 Mi5kbGwATVNWQ1JULmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdldFByb2NBZGRyZXNz
-AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABm
-cmVlAABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABl
+eGl0AABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

From 2ab90e20a50ed93e808c40772d010c8427c283c6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:05:37 +0000
Subject: [PATCH 0644/8469] Moved some things around for better organization.

---
 command/install.py | 62 +++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/command/install.py b/command/install.py
index 4ad652d990..8c6aa1cff8 100644
--- a/command/install.py
+++ b/command/install.py
@@ -173,6 +173,13 @@ def initialize_options (self):
 
         self.record = None
 
+
+    # -- Option finalizing methods -------------------------------------
+    # (This is rather more involved than for most commands,
+    # because this is where the policy for installing third-
+    # party Python modules on various platforms given a wide
+    # array of user input is decided.  Yes, it's quite complex!)
+
     def finalize_options (self):
 
         # This method (and its pliant slaves, like 'finalize_unix()',
@@ -450,6 +457,8 @@ def change_roots (self, *names):
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
 
+    # -- Command execution methods -------------------------------------
+
     def run (self):
 
         # Obviously have to build before we can install
@@ -486,24 +495,18 @@ def run (self):
 
     # run ()
 
+    def create_path_file (self):
+        filename = os.path.join (self.install_libbase,
+                                 self.path_file + ".pth")
+        if self.install_path_file:
+            self.execute (write_file,
+                          (filename, [self.extra_dirs]),
+                          "creating %s" % filename)
+        else:
+            self.warn("path file '%s' not created" % filename)
 
-    # -- Predicates for sub-command list -------------------------------
-
-    def has_lib (self):
-        """Return true if the current distribution has any Python
-        modules to install."""
-        return (self.distribution.has_pure_modules() or
-                self.distribution.has_ext_modules())
-
-    def has_headers (self):
-        return self.distribution.has_headers()
-
-    def has_scripts (self):
-        return self.distribution.has_scripts()
-
-    def has_data (self):
-        return self.distribution.has_data_files()
 
+    # -- Reporting methods ---------------------------------------------
 
     def get_outputs (self):
         # This command doesn't have any outputs of its own, so just
@@ -515,7 +518,6 @@ def get_outputs (self):
 
         return outputs
 
-
     def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
@@ -526,15 +528,23 @@ def get_inputs (self):
         return inputs
 
 
-    def create_path_file (self):
-        filename = os.path.join (self.install_libbase,
-                                 self.path_file + ".pth")
-        if self.install_path_file:
-            self.execute (write_file,
-                          (filename, [self.extra_dirs]),
-                          "creating %s" % filename)
-        else:
-            self.warn("path file '%s' not created" % filename)
+    # -- Predicates for sub-command list -------------------------------
+
+    def has_lib (self):
+        """Return true if the current distribution has any Python
+        modules to install."""
+        return (self.distribution.has_pure_modules() or
+                self.distribution.has_ext_modules())
+
+    def has_headers (self):
+        return self.distribution.has_headers()
+
+    def has_scripts (self):
+        return self.distribution.has_scripts()
+
+    def has_data (self):
+        return self.distribution.has_data_files()
+
 
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.

From 157e91886f9d060d88fc35c34e2f5239d43c6af3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:08:12 +0000
Subject: [PATCH 0645/8469] Changed to use the 'sub-commands' machinery:   -
 added 'sub_commands' class attr   - added 'has_*()' predicates referenced by
 the sub-command list   - rewrote 'run()' so it's a trivial loop over relevant
 sub-commands

---
 command/build.py | 50 ++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/command/build.py b/command/build.py
index f30f4ee1da..1f785996ec 100644
--- a/command/build.py
+++ b/command/build.py
@@ -97,26 +97,34 @@ def finalize_options (self):
 
     def run (self):
 
-        # For now, "build" means "build_py" then "build_ext".  (Eventually
-        # it should also build documentation.)
-
-        # Invoke the 'build_py' command to "build" pure Python modules
-        # (ie. copy 'em into the build tree)
-        if self.distribution.has_pure_modules():
-            self.run_command ('build_py')
-
-        # Build any standalone C libraries next -- they're most likely to
-        # be needed by extension modules, so obviously have to be done
-        # first!
-        if self.distribution.has_c_libraries():
-            self.run_command ('build_clib')
-
-        # And now 'build_ext' -- compile extension modules and put them
-        # into the build tree
-        if self.distribution.has_ext_modules():
-            self.run_command ('build_ext')
-
-        if self.distribution.has_scripts():
-            self.run_command ('build_scripts')
+        # Run all relevant sub-commands.  This will be some subset of:
+        #  - build_py      - pure Python modules
+        #  - build_clib    - standalone C libraries
+        #  - build_ext     - Python extensions
+        #  - build_scripts - (Python) scripts
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
+
+    # -- Predicates for the sub-command list ---------------------------
+
+    def has_pure_modules (self):
+        return self.distribution.has_pure_modules()
+
+    def has_c_libraries (self):
+        return self.distribution.has_c_libraries()
+
+    def has_ext_modules (self):
+        return self.distribution.has_ext_modules()
+
+    def has_scripts (self):
+        return self.distribution.has_scripts()
+
+
+    sub_commands = [('build_py',      has_pure_modules),
+                    ('build_clib',    has_c_libraries),
+                    ('build_ext',     has_ext_modules),
+                    ('build_scripts', has_scripts),
+                   ]
 
 # class build

From 939159b5a3ded23234a997e930543af87d19c524 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:09:39 +0000
Subject: [PATCH 0646/8469] In 'get_platform()', handle so-called POSIX systems
 that don't have 'uname()' -- specifically NeXTSTEP.

---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index d52c69b46f..016119ce66 100644
--- a/util.py
+++ b/util.py
@@ -31,7 +31,7 @@ def get_platform ():
        
     For non-POSIX platforms, currently just returns 'sys.platform'.
     """
-    if os.name != "posix":
+    if os.name != "posix" or not hasattr(os, 'uname'):
         # XXX what about the architecture? NT is Intel or Alpha,
         # Mac OS is M68k or PPC, etc.
         return sys.platform

From 3e90f681ce2c2f2bfb9b5015e78a0f207135997a Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:29:35 +0000
Subject: [PATCH 0647/8469] Changed 'copy_file()' so it returns a tuple
 (dest_name, copied) -- hopefully, this will please everyone (as if that's
 possible).

---
 file_util.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/file_util.py b/file_util.py
index d05b456161..a9e12ce3f3 100644
--- a/file_util.py
+++ b/file_util.py
@@ -95,8 +95,9 @@ def copy_file (src, dst,
     Under Mac OS, uses the native file copy function in macostools; on
     other systems, uses '_copy_file_contents()' to copy file contents.
 
-    Return the name of the destination file, whether it was actually copied
-    or not.
+    Return a tuple (dest_name, copied): 'dest_name' is the actual name of
+    the output file, and 'copied' is true if the file was copied (or would
+    have been copied, if 'dry_run' true).
     """
     # XXX if the destination file already exists, we clobber it if
     # copying, but blow up if linking.  Hmmm.  And I don't know what
@@ -121,7 +122,7 @@ def copy_file (src, dst,
     if update and not newer(src, dst):
         if verbose:
             print "not copying %s (output up-to-date)" % src
-        return dst
+        return (dst, 0)
 
     try:
         action = _copy_action[link]
@@ -135,9 +136,9 @@ def copy_file (src, dst,
             print "%s %s -> %s" % (action, src, dst)
             
     if dry_run:
-        return dst
+        return (dst, 1)
 
-    # On a Mac, use the native file copy routine
+    # On Mac OS, use the native file copy routine
     if os.name == 'mac':
         import macostools
         try:
@@ -169,7 +170,7 @@ def copy_file (src, dst,
             if preserve_mode:
                 os.chmod(dst, S_IMODE(st[ST_MODE]))
 
-    return dst
+    return (dst, 1)
 
 # copy_file ()
 

From 4e493b610cddc4325efb115e2ebf61d2aaba8068 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:33:05 +0000
Subject: [PATCH 0648/8469] Changed 'build_module()' so it returns the result
 of 'copy_file()' on the module file -- could be useful for subclasses
 overriding it.

---
 command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index ea92c2be0f..ebe30e8106 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -307,7 +307,7 @@ def build_module (self, module, module_file, package):
         outfile = self.get_module_outfile (self.build_lib, package, module)
         dir = os.path.dirname (outfile)
         self.mkpath (dir)
-        self.copy_file (module_file, outfile, preserve_mode=0)
+        return self.copy_file (module_file, outfile, preserve_mode=0)
 
 
     def build_modules (self):

From 5b94288789b79b3b730f5eb2d40eb5e617f93f2f Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:34:50 +0000
Subject: [PATCH 0649/8469] Expect a tuple (dest_name, copied) from
 'copy_file()'.

---
 command/install_data.py    | 4 ++--
 command/install_headers.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index 9ce118394b..d9a486936c 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -52,7 +52,7 @@ def run (self):
                     self.warn("setup script did not provide a directory for "
                               "'%s' -- installing right in '%s'" %
                               (f, self.install_dir))
-                out = self.copy_file(f, self.install_dir)
+                (out, _) = self.copy_file(f, self.install_dir)
                 self.outfiles.append(out)
             else:
                 # it's a tuple with path to install to and a list of files
@@ -63,7 +63,7 @@ def run (self):
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
-                    out = self.copy_file(data, dir)
+                    (out, _) = self.copy_file(data, dir)
                     self.outfiles.append(out)
 
     def get_inputs (self):
diff --git a/command/install_headers.py b/command/install_headers.py
index ec0cf4412d..2d72a07b14 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -41,7 +41,7 @@ def run (self):
 
         self.mkpath(self.install_dir)
         for header in headers:
-            out = self.copy_file(header, self.install_dir)
+            (out, _) = self.copy_file(header, self.install_dir)
             self.outfiles.append(out)
 
     def get_inputs (self):

From 28c8c4911fe821cda508e839dbeca6781e9dd924 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:35:26 +0000
Subject: [PATCH 0650/8469] Fixed 'run()' so it doesn't call 'bytecompile()' if
 'install()' returned None.

---
 command/install_lib.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index a603b4f59e..2c92f3fe4a 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -56,7 +56,8 @@ def run (self):
         outfiles = self.install()
 
         # (Optionally) compile .py to .pyc
-        self.bytecompile(outfiles)
+        if outfiles is not None:
+            self.bytecompile(outfiles)
 
     # run ()
 

From 48647d7afb29872232fd752601c017a428c47233 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 17:47:17 +0000
Subject: [PATCH 0651/8469] Andrew Kuchling: changed so the '_path_created'
 dictionary is keyed on absolute pathnames; this lets it keep working in the
 face of chdir'ing around.

---
 dir_util.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 768cb4ebe7..a1578bed6a 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -44,7 +44,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     created_dirs = []
     if os.path.isdir(name) or name == '':
         return created_dirs
-    if _path_created.get(name):
+    if _path_created.get(os.path.abspath(name)):
         return created_dirs
 
     (head, tail) = os.path.split(name)
@@ -64,7 +64,9 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     for d in tails:
         #print "head = %s, d = %s: " % (head, d),
         head = os.path.join(head, d)
-        if _path_created.get(head):
+        abs_head = os.path.abspath(head)
+
+        if _path_created.get(abs_head):
             continue
 
         if verbose:
@@ -78,7 +80,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
                 raise DistutilsFileError, \
                       "could not create '%s': %s" % (head, exc[-1])
 
-        _path_created[head] = 1
+        _path_created[abs_head] = 1
     return created_dirs
 
 # mkpath ()
@@ -208,8 +210,9 @@ def remove_tree (directory, verbose=0, dry_run=0):
         try:
             apply(cmd[0], (cmd[1],))
             # remove dir from cache if it's already there
-            if _path_created.has_key(cmd[1]):
-                del _path_created[cmd[1]]
+            abspath = os.path.abspath(cmd[1])
+            if _path_created.has_key(abspath):
+                del _path_created[abspath]
         except (IOError, OSError), exc:
             if verbose:
                 print grok_environment_error(

From cade95e31186a5f2c4119d538e60ea58a44fa920 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 18:27:54 +0000
Subject: [PATCH 0652/8469] Standardized whitespace around function calls.

---
 command/bdist.py           |   2 +-
 command/bdist_dumb.py      |  12 ++--
 command/bdist_rpm.py       |   2 +-
 command/bdist_wininst.py   |  88 ++++++++++++-------------
 command/build.py           |  12 ++--
 command/build_clib.py      |  74 ++++++++++-----------
 command/build_ext.py       | 127 ++++++++++++++++++-------------------
 command/build_py.py        | 108 +++++++++++++++----------------
 command/build_scripts.py   |   6 +-
 command/clean.py           |  20 +++---
 command/config.py          |   8 +--
 command/install.py         | 112 ++++++++++++++++----------------
 command/install_scripts.py |  10 +--
 command/sdist.py           |  96 ++++++++++++++--------------
 14 files changed, 338 insertions(+), 339 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 8651e70954..c0cb1d3acd 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -132,7 +132,7 @@ def run (self):
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:
                 sub_cmd.keep_temp = 1
-            self.run_command (cmd_name)
+            self.run_command(cmd_name)
 
     # run()
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 520098db19..8dfc3271df 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -71,24 +71,24 @@ def finalize_options (self):
 
     def run (self):
 
-        self.run_command ('build')
+        self.run_command('build')
 
         install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.bdist_dir
 
-        self.announce ("installing to %s" % self.bdist_dir)
+        self.announce("installing to %s" % self.bdist_dir)
         self.run_command('install')
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       self.plat_name)
-        self.make_archive (os.path.join(self.dist_dir, archive_basename),
-                           self.format,
-                           root_dir=self.bdist_dir)
+        self.make_archive(os.path.join(self.dist_dir, archive_basename),
+                          self.format,
+                          root_dir=self.bdist_dir)
 
         if not self.keep_temp:
-            remove_tree (self.bdist_dir, self.verbose, self.dry_run)
+            remove_tree(self.bdist_dir, self.verbose, self.dry_run)
 
     # run()
 
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index c293f1f5e4..f421590488 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -258,7 +258,7 @@ def run (self):
 
         # Make a source distribution and copy to SOURCES directory with
         # optional icon.
-        sdist = self.reinitialize_command ('sdist')
+        sdist = self.reinitialize_command('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']
         else:
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3251bac07c..afe6955e77 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -56,8 +56,8 @@ def finalize_options (self):
         if self.distribution.has_ext_modules():
             short_version = sys.version[:3]
             if self.target_version and self.target_version != short_version:
-                raise DistutilsOptionError ("target version can only be" +
-                                            short_version)
+                raise DistutilsOptionError, \
+                      "target version can only be" + short_version
             self.target_version = short_version
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
@@ -73,7 +73,7 @@ def run (self):
                   ("distribution contains extensions and/or C libraries; "
                    "must be compiled on a Windows 32 platform")
 
-        self.run_command ('build')
+        self.run_command('build')
 
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
@@ -91,7 +91,7 @@ def run (self):
 
         install_lib.ensure_finalized()
 
-        self.announce ("installing to %s" % self.bdist_dir)
+        self.announce("installing to %s" % self.bdist_dir)
         install.ensure_finalized()
         install.run()
 
@@ -103,24 +103,24 @@ def run (self):
 
         # Our archive MUST be relative to sys.prefix, which is the
         # same as install_purelib in the 'nt' scheme.
-        root_dir = os.path.normpath (install.install_purelib)
+        root_dir = os.path.normpath(install.install_purelib)
 
         # Sanity check: Make sure everything is included
         for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
             attrname = 'install_' + key
-            install_x = getattr (install, attrname)
+            install_x = getattr(install, attrname)
             # (Use normpath so that we can string.find to look for
             # subdirectories)
-            install_x = os.path.normpath (install_x)
-            if string.find (install_x, root_dir) != 0:
+            install_x = os.path.normpath(install_x)
+            if string.find(install_x, root_dir) != 0:
                 raise DistutilsInternalError \
                       ("'%s' not included in install_lib" % key)
-        arcname = self.make_archive (archive_basename, "zip",
-                                     root_dir=root_dir)
-        self.create_exe (arcname, fullname)
+        arcname = self.make_archive(archive_basename, "zip",
+                                    root_dir=root_dir)
+        self.create_exe(arcname, fullname)
 
         if not self.keep_temp:
-            remove_tree (self.bdist_dir, self.verbose, self.dry_run)
+            remove_tree(self.bdist_dir, self.verbose, self.dry_run)
 
     # run()
 
@@ -133,37 +133,37 @@ def get_inidata (self):
         # Write the [metadata] section.  Values are written with
         # repr()[1:-1], so they do not contain unprintable characters, and
         # are not surrounded by quote chars.
-        lines.append ("[metadata]")
+        lines.append("[metadata]")
 
         # 'info' will be displayed in the installer's dialog box,
         # describing the items to be installed.
         info = (metadata.long_description or '') + '\n'
 
-        for name in dir (metadata):
+        for name in dir(metadata):
             if (name != 'long_description'):
-                data = getattr (metadata, name)
+                data = getattr(metadata, name)
                 if data:
                    info = info + ("\n    %s: %s" % \
-                                  (string.capitalize (name), data))
-                   lines.append ("%s=%s" % (name, repr (data)[1:-1]))
+                                  (string.capitalize(name), data))
+                   lines.append("%s=%s" % (name, repr(data)[1:-1]))
 
         # The [setup] section contains entries controlling
         # the installer runtime.
-        lines.append ("\n[Setup]")
-        lines.append ("info=%s" % repr (info)[1:-1])
-        lines.append ("target_compile=%d" % (not self.no_target_compile))
-        lines.append ("target_optimize=%d" % (not self.no_target_optimize))
+        lines.append("\n[Setup]")
+        lines.append("info=%s" % repr(info)[1:-1])
+        lines.append("target_compile=%d" % (not self.no_target_compile))
+        lines.append("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
-            lines.append ("target_version=%s" % self.target_version)
+            lines.append("target_version=%s" % self.target_version)
 
         title = self.distribution.get_fullname()
-        lines.append ("title=%s" % repr (title)[1:-1])
+        lines.append("title=%s" % repr(title)[1:-1])
         import time
         import distutils
         build_info = "Build %s with distutils-%s" % \
-                     (time.ctime (time.time()), distutils.__version__)
-        lines.append ("build_info=%s" % build_info)
-        return string.join (lines, "\n")
+                     (time.ctime(time.time()), distutils.__version__)
+        lines.append("build_info=%s" % build_info)
+        return string.join(lines, "\n")
 
     # get_inidata()
 
@@ -183,36 +183,36 @@ def create_exe (self, arcname, fullname):
         else:
             installer_name = os.path.join(self.dist_dir,
                                           "%s.win32.exe" % fullname)
-        self.announce ("creating %s" % installer_name)
+        self.announce("creating %s" % installer_name)
 
-        file = open (installer_name, "wb")
-        file.write (self.get_exe_bytes ())
-        file.write (cfgdata)
-        header = struct.pack ("<ii",
-                              0x12345679,       # tag
-                              len (cfgdata))    # length
-        file.write (header)
-        file.write (open (arcname, "rb").read())
+        file = open(installer_name, "wb")
+        file.write(self.get_exe_bytes())
+        file.write(cfgdata)
+        header = struct.pack("<ii",
+                             0x12345679,       # tag
+                             len(cfgdata))     # length
+        file.write(header)
+        file.write(open(arcname, "rb").read())
 
     # create_exe()
 
     def get_exe_bytes (self):
         import base64
-        return base64.decodestring (EXEDATA)
+        return base64.decodestring(EXEDATA)
 
 # class bdist_wininst
 
 if __name__ == '__main__':
     # recreate EXEDATA from wininst.exe by rewriting this file
     import re, base64
-    moddata = open ("bdist_wininst.py", "r").read()
-    exedata = open ("../../misc/wininst.exe", "rb").read()
-    print "wininst.exe length is %d bytes" % len (exedata)
-    print "wininst.exe encoded length is %d bytes" % len (base64.encodestring (exedata))
-    exp = re.compile ('EXE'+'DATA = """\\\\(\n.*)*\n"""', re.M)
-    data = exp.sub ('EXE' + 'DATA = """\\\\\n%s"""' %
-                    base64.encodestring (exedata), moddata)
-    open ("bdist_wininst.py", "w").write (data)
+    moddata = open("bdist_wininst.py", "r").read()
+    exedata = open("../../misc/wininst.exe", "rb").read()
+    print "wininst.exe length is %d bytes" % len(exedata)
+    print "wininst.exe encoded length is %d bytes" % len(base64.encodestring(exedata))
+    exp = re.compile('EXE'+'DATA = """\\\\(\n.*)*\n"""', re.M)
+    data = exp.sub('EXE' + 'DATA = """\\\\\n%s"""' %
+                    base64.encodestring(exedata), moddata)
+    open("bdist_wininst.py", "w").write(data)
     print "bdist_wininst.py recreated"
 
 EXEDATA = """\
diff --git a/command/build.py b/command/build.py
index 1f785996ec..0fed6b489e 100644
--- a/command/build.py
+++ b/command/build.py
@@ -70,10 +70,10 @@ def finalize_options (self):
         # 'lib.<plat>' under the base build directory.  We only use one of
         # them for a given distribution, though --
         if self.build_purelib is None:
-            self.build_purelib = os.path.join (self.build_base, 'lib')
+            self.build_purelib = os.path.join(self.build_base, 'lib')
         if self.build_platlib is None:
-            self.build_platlib = os.path.join (self.build_base,
-                                               'lib' + plat_specifier)
+            self.build_platlib = os.path.join(self.build_base,
+                                              'lib' + plat_specifier)
 
         # 'build_lib' is the actual directory that we will use for this
         # particular module distribution -- if user didn't supply it, pick
@@ -87,10 +87,10 @@ def finalize_options (self):
         # 'build_temp' -- temporary directory for compiler turds,
         # "build/temp.<plat>"
         if self.build_temp is None:
-            self.build_temp = os.path.join (self.build_base,
-                                            'temp' + plat_specifier)
+            self.build_temp = os.path.join(self.build_base,
+                                           'temp' + plat_specifier)
         if self.build_scripts is None:
-            self.build_scripts = os.path.join (self.build_base, 'scripts')
+            self.build_scripts = os.path.join(self.build_base, 'scripts')
 
     # finalize_options ()
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 775b7ade5a..2726b975fa 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -80,22 +80,22 @@ def finalize_options (self):
         # I think that C libraries are really just temporary build
         # by-products, at least from the point of view of building Python
         # extensions -- but I want to keep my options open.
-        self.set_undefined_options ('build',
-                                    ('build_temp', 'build_clib'),
-                                    ('build_temp', 'build_temp'),
-                                    ('compiler', 'compiler'),
-                                    ('debug', 'debug'),
-                                    ('force', 'force'))
+        self.set_undefined_options('build',
+                                   ('build_temp', 'build_clib'),
+                                   ('build_temp', 'build_temp'),
+                                   ('compiler', 'compiler'),
+                                   ('debug', 'debug'),
+                                   ('force', 'force'))
 
         self.libraries = self.distribution.libraries
         if self.libraries:
-            self.check_library_list (self.libraries)
+            self.check_library_list(self.libraries)
 
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type (self.include_dirs) is StringType:
-            self.include_dirs = string.split (self.include_dirs,
-                                              os.pathsep)
+        if type(self.include_dirs) is StringType:
+            self.include_dirs = string.split(self.include_dirs,
+                                             os.pathsep)
 
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
@@ -110,23 +110,23 @@ def run (self):
 
         # Yech -- this is cut 'n pasted from build_ext.py!
         from distutils.ccompiler import new_compiler
-        self.compiler = new_compiler (compiler=self.compiler,
-                                      verbose=self.verbose,
-                                      dry_run=self.dry_run,
-                                      force=self.force)
+        self.compiler = new_compiler(compiler=self.compiler,
+                                     verbose=self.verbose,
+                                     dry_run=self.dry_run,
+                                     force=self.force)
         customize_compiler(self.compiler)
 
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs (self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name,value) in self.define:
-                self.compiler.define_macro (name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro (macro)
+                self.compiler.undefine_macro(macro)
 
-        self.build_libraries (self.libraries)
+        self.build_libraries(self.libraries)
 
     # run()
 
@@ -141,16 +141,16 @@ def check_library_list (self, libraries):
         # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
         # with only names changed to protect the innocent!
 
-        if type (libraries) is not ListType:
+        if type(libraries) is not ListType:
             raise DistutilsSetupError, \
                   "'libraries' option must be a list of tuples"
 
         for lib in libraries:
-            if type (lib) is not TupleType and len (lib) != 2:
+            if type(lib) is not TupleType and len(lib) != 2:
                 raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
-            if type (lib[0]) is not StringType:
+            if type(lib[0]) is not StringType:
                 raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
@@ -160,7 +160,7 @@ def check_library_list (self, libraries):
                        "may not contain directory separators") % \
                       lib[0]
 
-            if type (lib[1]) is not DictionaryType:
+            if type(lib[1]) is not DictionaryType:
                 raise DistutilsSetupError, \
                       "second element of each tuple in 'libraries' " + \
                       "must be a dictionary (build info)"
@@ -178,7 +178,7 @@ def get_library_names (self):
 
         lib_names = []
         for (lib_name, build_info) in self.libraries:
-            lib_names.append (lib_name)
+            lib_names.append(lib_name)
         return lib_names
 
     # get_library_names ()
@@ -189,33 +189,33 @@ def build_libraries (self, libraries):
         compiler = self.compiler
 
         for (lib_name, build_info) in libraries:
-            sources = build_info.get ('sources')
-            if sources is None or type (sources) not in (ListType, TupleType):
+            sources = build_info.get('sources')
+            if sources is None or type(sources) not in (ListType, TupleType):
                 raise DistutilsSetupError, \
                       ("in 'libraries' option (library '%s'), " +
                        "'sources' must be present and must be " +
                        "a list of source filenames") % lib_name
-            sources = list (sources)
+            sources = list(sources)
 
-            self.announce ("building '%s' library" % lib_name)
+            self.announce("building '%s' library" % lib_name)
 
             # First, compile the source code to object files in the library
             # directory.  (This should probably change to putting object
             # files in a temporary build directory.)
-            macros = build_info.get ('macros')
-            include_dirs = build_info.get ('include_dirs')
-            objects = self.compiler.compile (sources,
-                                             output_dir=self.build_temp,
-                                             macros=macros,
-                                             include_dirs=include_dirs,
-                                             debug=self.debug)
+            macros = build_info.get('macros')
+            include_dirs = build_info.get('include_dirs')
+            objects = self.compiler.compile(sources,
+                                            output_dir=self.build_temp,
+                                            macros=macros,
+                                            include_dirs=include_dirs,
+                                            debug=self.debug)
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
-            self.compiler.create_static_lib (objects, lib_name,
-                                             output_dir=self.build_clib,
-                                             debug=self.debug)
+            self.compiler.create_static_lib(objects, lib_name,
+                                            output_dir=self.build_clib,
+                                            debug=self.debug)
 
         # for libraries
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 9147c3d07b..70e8a73455 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -112,12 +112,12 @@ def initialize_options (self):
     def finalize_options (self):
         from distutils import sysconfig
 
-        self.set_undefined_options ('build',
-                                    ('build_lib', 'build_lib'),
-                                    ('build_temp', 'build_temp'),
-                                    ('compiler', 'compiler'),
-                                    ('debug', 'debug'),
-                                    ('force', 'force'))
+        self.set_undefined_options('build',
+                                   ('build_lib', 'build_lib'),
+                                   ('build_temp', 'build_temp'),
+                                   ('compiler', 'compiler'),
+                                   ('debug', 'debug'),
+                                   ('force', 'force'))
 
         if self.package is None:
             self.package = self.distribution.ext_package
@@ -131,17 +131,16 @@ def finalize_options (self):
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type (self.include_dirs) is StringType:
-            self.include_dirs = string.split (self.include_dirs,
-                                              os.pathsep)
+        if type(self.include_dirs) is StringType:
+            self.include_dirs = string.split(self.include_dirs, os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
-        self.include_dirs.append (py_include)
+        self.include_dirs.append(py_include)
         if plat_py_include != py_include:
-            self.include_dirs.append (plat_py_include)
+            self.include_dirs.append(plat_py_include)
 
-        if type (self.libraries) is StringType:
+        if type(self.libraries) is StringType:
             self.libraries = [self.libraries]
 
         # Life is easier if we're not forever checking for None, so
@@ -157,11 +156,11 @@ def finalize_options (self):
         # for Release and Debug builds.
         # also Python's library directory must be appended to library_dirs
         if os.name == 'nt':
-            self.library_dirs.append (os.path.join(sys.exec_prefix, 'libs'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs'))
             if self.debug:
-                self.build_temp = os.path.join (self.build_temp, "Debug")
+                self.build_temp = os.path.join(self.build_temp, "Debug")
             else:
-                self.build_temp = os.path.join (self.build_temp, "Release")
+                self.build_temp = os.path.join(self.build_temp, "Release")
     # finalize_options ()
     
 
@@ -188,16 +187,16 @@ def run (self):
         # directory where we put them is in the library search path for
         # linking extensions.
         if self.distribution.has_c_libraries():
-            build_clib = self.get_finalized_command ('build_clib')
-            self.libraries.extend (build_clib.get_library_names() or [])
-            self.library_dirs.append (build_clib.build_clib)
+            build_clib = self.get_finalized_command('build_clib')
+            self.libraries.extend(build_clib.get_library_names() or [])
+            self.library_dirs.append(build_clib.build_clib)
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler (compiler=self.compiler,
-                                      verbose=self.verbose,
-                                      dry_run=self.dry_run,
-                                      force=self.force)
+        self.compiler = new_compiler(compiler=self.compiler,
+                                     verbose=self.verbose,
+                                     dry_run=self.dry_run,
+                                     force=self.force)
         customize_compiler(self.compiler)
 
         # And make sure that any compile/link-related options (which might
@@ -205,25 +204,25 @@ def run (self):
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs (self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name,value) in self.define:
-                self.compiler.define_macro (name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro (macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries (self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs (self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs (self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects (self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
-        self.build_extensions ()
+        self.build_extensions()
 
     # run ()
 
@@ -320,7 +319,7 @@ def get_source_files (self):
 
         # Wouldn't it be neat if we knew the names of header files too...
         for ext in self.extensions:
-            filenames.extend (ext.sources)
+            filenames.extend(ext.sources)
 
         return filenames
 
@@ -330,16 +329,16 @@ def get_outputs (self):
         # Sanity check the 'extensions' list -- can't assume this is being
         # done in the same run as a 'build_extensions()' call (in fact, we
         # can probably assume that it *isn't*!).
-        self.check_extensions_list (self.extensions)
+        self.check_extensions_list(self.extensions)
 
         # And build the list of output (built) filenames.  Note that this
         # ignores the 'inplace' flag, and assumes everything goes in the
         # "build" tree.
         outputs = []
         for ext in self.extensions:
-            fullname = self.get_ext_fullname (ext.name)
-            outputs.append (os.path.join (self.build_lib,
-                                          self.get_ext_filename(fullname)))
+            fullname = self.get_ext_fullname(ext.name)
+            outputs.append(os.path.join(self.build_lib,
+                                        self.get_ext_filename(fullname)))
         return outputs
 
     # get_outputs ()
@@ -348,40 +347,40 @@ def get_outputs (self):
     def build_extensions (self):
 
         # First, sanity-check the 'extensions' list
-        self.check_extensions_list (self.extensions)
+        self.check_extensions_list(self.extensions)
 
         for ext in self.extensions:
             sources = ext.sources
-            if sources is None or type (sources) not in (ListType, TupleType):
+            if sources is None or type(sources) not in (ListType, TupleType):
                 raise DistutilsSetupError, \
                       ("in 'ext_modules' option (extension '%s'), " +
                        "'sources' must be present and must be " +
                        "a list of source filenames") % ext.name
-            sources = list (sources)
+            sources = list(sources)
 
-            fullname = self.get_ext_fullname (ext.name)
+            fullname = self.get_ext_fullname(ext.name)
             if self.inplace:
                 # ignore build-lib -- put the compiled extension into
                 # the source tree along with pure Python modules
 
-                modpath = string.split (fullname, '.')
-                package = string.join (modpath[0:-1], '.')
+                modpath = string.split(fullname, '.')
+                package = string.join(modpath[0:-1], '.')
                 base = modpath[-1]
 
-                build_py = self.get_finalized_command ('build_py')
-                package_dir = build_py.get_package_dir (package)
-                ext_filename = os.path.join (package_dir,
-                                             self.get_ext_filename(base))
+                build_py = self.get_finalized_command('build_py')
+                package_dir = build_py.get_package_dir(package)
+                ext_filename = os.path.join(package_dir,
+                                            self.get_ext_filename(base))
             else:
-                ext_filename = os.path.join (self.build_lib,
-                                             self.get_ext_filename(fullname))
+                ext_filename = os.path.join(self.build_lib,
+                                            self.get_ext_filename(fullname))
 
             if not (self.force or newer_group(sources, ext_filename, 'newer')):
-                self.announce ("skipping '%s' extension (up-to-date)" %
-                               ext.name)
+                self.announce("skipping '%s' extension (up-to-date)" %
+                              ext.name)
                 continue # 'for' loop over all extensions
             else:
-                self.announce ("building '%s' extension" % ext.name)
+                self.announce("building '%s' extension" % ext.name)
 
             # First, scan the sources for SWIG definition files (.i), run
             # SWIG on 'em to create .c files, and modify the sources list
@@ -416,22 +415,22 @@ def build_extensions (self):
             if os.environ.has_key('CFLAGS'):
                 extra_args.extend(string.split(os.environ['CFLAGS']))
                 
-            objects = self.compiler.compile (sources,
-                                             output_dir=self.build_temp,
-                                             macros=macros,
-                                             include_dirs=ext.include_dirs,
-                                             debug=self.debug,
-                                             extra_postargs=extra_args)
+            objects = self.compiler.compile(sources,
+                                            output_dir=self.build_temp,
+                                            macros=macros,
+                                            include_dirs=ext.include_dirs,
+                                            debug=self.debug,
+                                            extra_postargs=extra_args)
 
             # Now link the object files together into a "shared object" --
             # of course, first we have to figure out all the other things
             # that go into the mix.
             if ext.extra_objects:
-                objects.extend (ext.extra_objects)
+                objects.extend(ext.extra_objects)
             extra_args = ext.extra_link_args or []
 
 
-            self.compiler.link_shared_object (
+            self.compiler.link_shared_object(
                 objects, ext_filename, 
                 libraries=self.get_libraries(ext),
                 library_dirs=ext.library_dirs,
@@ -481,11 +480,11 @@ def swig_sources (self, sources):
         swig = self.find_swig()
         swig_cmd = [swig, "-python", "-dnone", "-ISWIG"]
         if self.swig_cpp:
-            swig_cmd.append ("-c++")
+            swig_cmd.append("-c++")
 
         for source in swig_sources:
             target = swig_targets[source]
-            self.announce ("swigging %s to %s" % (source, target))
+            self.announce("swigging %s to %s" % (source, target))
             self.spawn(swig_cmd + ["-o", target, source])
 
         return new_sources
@@ -507,7 +506,7 @@ def find_swig (self):
             # if not, act like Unix and assume it's in the PATH.
             for vers in ("1.3", "1.2", "1.1"):
                 fn = os.path.join("c:\\swig%s" % vers, "swig.exe")
-                if os.path.isfile (fn):
+                if os.path.isfile(fn):
                     return fn
             else:
                 return "swig.exe"
@@ -535,12 +534,12 @@ def get_ext_filename (self, ext_name):
         """
 
         from distutils.sysconfig import get_config_var
-        ext_path = string.split (ext_name, '.')
+        ext_path = string.split(ext_name, '.')
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply (os.path.join, ext_path) + '_d' + so_ext
-        return apply (os.path.join, ext_path) + so_ext
+            return apply(os.path.join, ext_path) + '_d' + so_ext
+        return apply(os.path.join, ext_path) + so_ext
 
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
diff --git a/command/build_py.py b/command/build_py.py
index ebe30e8106..6a8a7f43f9 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -34,9 +34,9 @@ def initialize_options (self):
         self.force = None
 
     def finalize_options (self):
-        self.set_undefined_options ('build',
-                                    ('build_lib', 'build_lib'),
-                                    ('force', 'force'))
+        self.set_undefined_options('build',
+                                   ('build_lib', 'build_lib'),
+                                   ('force', 'force'))
 
         # Get the distribution options that are aliases for build_py
         # options -- list of packages and list of modules.
@@ -83,9 +83,9 @@ def run (self):
 
         # Now we're down to two cases: 'py_modules' only and 'packages' only.
         if self.py_modules:
-            self.build_modules ()
+            self.build_modules()
         else:
-            self.build_packages ()
+            self.build_packages()
 
     # run ()
         
@@ -95,24 +95,24 @@ def get_package_dir (self, package):
            distribution, where package 'package' should be found
            (at least according to the 'package_dir' option, if any)."""
 
-        path = string.split (package, '.')
+        path = string.split(package, '.')
 
         if not self.package_dir:
             if path:
-                return apply (os.path.join, path)
+                return apply(os.path.join, path)
             else:
                 return ''
         else:
             tail = []
             while path:
                 try:
-                    pdir = self.package_dir[string.join (path, '.')]
+                    pdir = self.package_dir[string.join(path, '.')]
                 except KeyError:
-                    tail.insert (0, path[-1])
+                    tail.insert(0, path[-1])
                     del path[-1]
                 else:
-                    tail.insert (0, pdir)
-                    return apply (os.path.join, tail)
+                    tail.insert(0, pdir)
+                    return apply(os.path.join, tail)
             else:
                 # Oops, got all the way through 'path' without finding a
                 # match in package_dir.  If package_dir defines a directory
@@ -126,7 +126,7 @@ def get_package_dir (self, package):
                     tail.insert(0, pdir)
 
                 if tail:
-                    return apply (os.path.join, tail)
+                    return apply(os.path.join, tail)
                 else:
                     return ''
 
@@ -140,22 +140,22 @@ def check_package (self, package, package_dir):
         # my "empty string means current dir" convention, so we have to
         # circumvent them.
         if package_dir != "":
-            if not os.path.exists (package_dir):
+            if not os.path.exists(package_dir):
                 raise DistutilsFileError, \
                       "package directory '%s' does not exist" % package_dir
-            if not os.path.isdir (package_dir):
+            if not os.path.isdir(package_dir):
                 raise DistutilsFileError, \
                       ("supposed package directory '%s' exists, " +
                        "but is not a directory") % package_dir
 
         # Require __init__.py for all but the "root package"
         if package:
-            init_py = os.path.join (package_dir, "__init__.py")
-            if os.path.isfile (init_py):
+            init_py = os.path.join(package_dir, "__init__.py")
+            if os.path.isfile(init_py):
                 return init_py
             else:
-                self.warn (("package init file '%s' not found " +
-                            "(or not a regular file)") % init_py)
+                self.warn(("package init file '%s' not found " +
+                           "(or not a regular file)") % init_py)
 
         # Either not in a package at all (__init__.py not expected), or
         # __init__.py doesn't exist -- so don't return the filename.
@@ -165,9 +165,9 @@ def check_package (self, package, package_dir):
 
 
     def check_module (self, module, module_file):
-        if not os.path.isfile (module_file):
-            self.warn ("file %s (for module %s) not found" % 
-                       (module_file, module))
+        if not os.path.isfile(module_file):
+            self.warn("file %s (for module %s) not found" % 
+                      (module_file, module))
             return 0
         else:
             return 1
@@ -176,16 +176,16 @@ def check_module (self, module, module_file):
 
 
     def find_package_modules (self, package, package_dir):
-        self.check_package (package, package_dir)
-        module_files = glob (os.path.join (package_dir, "*.py"))
+        self.check_package(package, package_dir)
+        module_files = glob(os.path.join(package_dir, "*.py"))
         modules = []
         setup_script = os.path.abspath(self.distribution.script_name)
 
         for f in module_files:
-            abs_f = os.path.abspath (f)
+            abs_f = os.path.abspath(f)
             if abs_f != setup_script:
-                module = os.path.splitext (os.path.basename (f))[0]
-                modules.append ((package, module, f))
+                module = os.path.splitext(os.path.basename(f))[0]
+                modules.append((package, module, f))
             else:
                 self.debug_print("excluding %s" % setup_script)
         return modules
@@ -218,18 +218,18 @@ def find_modules (self):
         #   - don't check for __init__.py in directory for empty package
 
         for module in self.py_modules:
-            path = string.split (module, '.')
+            path = string.split(module, '.')
             package = string.join(path[0:-1], '.')
             module_base = path[-1]
 
             try:
                 (package_dir, checked) = packages[package]
             except KeyError:
-                package_dir = self.get_package_dir (package)
+                package_dir = self.get_package_dir(package)
                 checked = 0
 
             if not checked:
-                init_py = self.check_package (package, package_dir)
+                init_py = self.check_package(package, package_dir)
                 packages[package] = (package_dir, 1)
                 if init_py:
                     modules.append((package, "__init__", init_py))
@@ -237,11 +237,11 @@ def find_modules (self):
             # XXX perhaps we should also check for just .pyc files
             # (so greedy closed-source bastards can distribute Python
             # modules too)
-            module_file = os.path.join (package_dir, module_base + ".py")
-            if not self.check_module (module, module_file):
+            module_file = os.path.join(package_dir, module_base + ".py")
+            if not self.check_module(module, module_file):
                 continue
 
-            modules.append ((package, module_base, module_file))
+            modules.append((package, module_base, module_file))
 
         return modules
 
@@ -256,13 +256,13 @@ def find_all_modules (self):
         'find_package_modules()' do."""
 
         if self.py_modules:
-            modules = self.find_modules ()
+            modules = self.find_modules()
         else:
             modules = []
             for package in self.packages:
-                package_dir = self.get_package_dir (package)
-                m = self.find_package_modules (package, package_dir)
-                modules.extend (m)
+                package_dir = self.get_package_dir(package)
+                m = self.find_package_modules(package, package_dir)
+                modules.extend(m)
 
         return modules
 
@@ -271,43 +271,43 @@ def find_all_modules (self):
 
     def get_source_files (self):
 
-        modules = self.find_all_modules ()
+        modules = self.find_all_modules()
         filenames = []
         for module in modules:
-            filenames.append (module[-1])
+            filenames.append(module[-1])
 
         return filenames
 
 
     def get_module_outfile (self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
-        return apply (os.path.join, outfile_path)
+        return apply(os.path.join, outfile_path)
 
 
     def get_outputs (self):
-        modules = self.find_all_modules ()
+        modules = self.find_all_modules()
         outputs = []
         for (package, module, module_file) in modules:
-            package = string.split (package, '.')
-            outputs.append (self.get_module_outfile (self.build_lib,
-                                                     package, module))
+            package = string.split(package, '.')
+            outputs.append(self.get_module_outfile(self.build_lib,
+                                                   package, module))
         return outputs
 
 
     def build_module (self, module, module_file, package):
-        if type (package) is StringType:
-            package = string.split (package, '.')
-        elif type (package) not in (ListType, TupleType):
+        if type(package) is StringType:
+            package = string.split(package, '.')
+        elif type(package) not in (ListType, TupleType):
             raise TypeError, \
                   "'package' must be a string (dot-separated), list, or tuple"
 
         # Now put the module source file into the "build" area -- this is
         # easy, we just copy it somewhere under self.build_lib (the build
         # directory for Python source).
-        outfile = self.get_module_outfile (self.build_lib, package, module)
-        dir = os.path.dirname (outfile)
-        self.mkpath (dir)
-        return self.copy_file (module_file, outfile, preserve_mode=0)
+        outfile = self.get_module_outfile(self.build_lib, package, module)
+        dir = os.path.dirname(outfile)
+        self.mkpath(dir)
+        return self.copy_file(module_file, outfile, preserve_mode=0)
 
 
     def build_modules (self):
@@ -319,7 +319,7 @@ def build_modules (self):
             # self.build_lib (the build directory for Python source).
             # (Actually, it gets copied to the directory for this package
             # under self.build_lib.)
-            self.build_module (module, module_file, package)
+            self.build_module(module, module_file, package)
 
     # build_modules ()
 
@@ -337,14 +337,14 @@ def build_packages (self):
             # already know its package!), and 'module_file' is the path to
             # the .py file, relative to the current directory
             # (ie. including 'package_dir').
-            package_dir = self.get_package_dir (package)
-            modules = self.find_package_modules (package, package_dir)
+            package_dir = self.get_package_dir(package)
+            modules = self.find_package_modules(package, package_dir)
 
             # Now loop over the modules we found, "building" each one (just
             # copy it to self.build_lib).
             for (package_, module, module_file) in modules:
                 assert package == package_
-                self.build_module (module, module_file, package)
+                self.build_module(module, module_file, package)
 
     # build_packages ()
                        
diff --git a/command/build_scripts.py b/command/build_scripts.py
index eacf798996..495f4c372a 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -32,9 +32,9 @@ def initialize_options (self):
         self.outfiles = None
 
     def finalize_options (self):
-        self.set_undefined_options ('build',
-                                    ('build_scripts', 'build_dir'),
-                                    ('force', 'force'))
+        self.set_undefined_options('build',
+                                   ('build_scripts', 'build_dir'),
+                                   ('force', 'force'))
         self.scripts = self.distribution.scripts
 
 
diff --git a/command/clean.py b/command/clean.py
index 4f04f08be5..fb8822f766 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -50,29 +50,29 @@ def finalize_options(self):
     def run(self):
         # remove the build/temp.<plat> directory (unless it's already
         # gone)
-        if os.path.exists (self.build_temp):
-            remove_tree (self.build_temp, self.verbose, self.dry_run)
+        if os.path.exists(self.build_temp):
+            remove_tree(self.build_temp, self.verbose, self.dry_run)
         else:
-            self.warn ("'%s' does not exist -- can't clean it" %
-                       self.build_temp)
+            self.warn("'%s' does not exist -- can't clean it" %
+                      self.build_temp)
 
         if self.all:
             # remove build directories
             for directory in (self.build_lib,
                               self.bdist_base,
 			      self.build_scripts):
-                if os.path.exists (directory):
-                    remove_tree (directory, self.verbose, self.dry_run)
+                if os.path.exists(directory):
+                    remove_tree(directory, self.verbose, self.dry_run)
                 else:
-                    self.warn ("'%s' does not exist -- can't clean it" %
-                               directory)
+                    self.warn("'%s' does not exist -- can't clean it" %
+                              directory)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care
         if not self.dry_run:
             try:
-                os.rmdir (self.build_base)
-                self.announce ("removing '%s'" % self.build_base)
+                os.rmdir(self.build_base)
+                self.announce("removing '%s'" % self.build_base)
             except OSError:
                 pass
 
diff --git a/command/config.py b/command/config.py
index 5c3f26a716..a13055cf8c 100644
--- a/command/config.py
+++ b/command/config.py
@@ -87,10 +87,10 @@ def _check_compiler (self):
         # import.
         from distutils.ccompiler import CCompiler, new_compiler
         if not isinstance(self.compiler, CCompiler):
-            self.compiler = new_compiler (compiler=self.compiler,
-                                          verbose=self.noisy,
-                                          dry_run=self.dry_run,
-                                          force=1)
+            self.compiler = new_compiler(compiler=self.compiler,
+                                         verbose=self.noisy,
+                                         dry_run=self.dry_run,
+                                         force=1)
             if self.include_dirs:
                 self.compiler.set_include_dirs(self.include_dirs)
             if self.libraries:
diff --git a/command/install.py b/command/install.py
index 8c6aa1cff8..e9528c635d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -210,10 +210,10 @@ def finalize_options (self):
                        "not both")
         else:
             if self.exec_prefix:
-                self.warn ("exec-prefix option ignored on this platform")
+                self.warn("exec-prefix option ignored on this platform")
                 self.exec_prefix = None
             if self.home:
-                self.warn ("home option ignored on this platform")
+                self.warn("home option ignored on this platform")
                 self.home = None
 
         # Now the interesting logic -- so interesting that we farm it out
@@ -224,14 +224,14 @@ def finalize_options (self):
         # install_{purelib,platlib,lib,scripts,data,...}, and the
         # INSTALL_SCHEME dictionary above.  Phew!
 
-        self.dump_dirs ("pre-finalize_{unix,other}")
+        self.dump_dirs("pre-finalize_{unix,other}")
 
         if os.name == 'posix':
-            self.finalize_unix ()
+            self.finalize_unix()
         else:
-            self.finalize_other ()
+            self.finalize_other()
 
-        self.dump_dirs ("post-finalize_{unix,other}()")
+        self.dump_dirs("post-finalize_{unix,other}()")
 
         # Expand configuration variables, tilde, etc. in self.install_base
         # and self.install_platbase -- that way, we can use $base or
@@ -250,9 +250,9 @@ def finalize_options (self):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                            }
-        self.expand_basedirs ()
+        self.expand_basedirs()
 
-        self.dump_dirs ("post-expand_basedirs()")
+        self.dump_dirs("post-expand_basedirs()")
 
         # Now define config vars for the base directories so we can expand
         # everything else.
@@ -262,13 +262,13 @@ def finalize_options (self):
         if DEBUG:
             from pprint import pprint
             print "config vars:"
-            pprint (self.config_vars)
+            pprint(self.config_vars)
 
         # Expand "~" and configuration variables in the installation
         # directories.
-        self.expand_dirs ()
+        self.expand_dirs()
 
-        self.dump_dirs ("post-expand_dirs()")
+        self.dump_dirs("post-expand_dirs()")
 
         # Pick the actual directory to install all modules to: either
         # install_purelib or install_platlib, depending on whether this
@@ -290,9 +290,9 @@ def finalize_options (self):
         # have to deal with 'extra_path', which is the hack for allowing
         # non-packagized module distributions (hello, Numerical Python!) to
         # get their own directories.
-        self.handle_extra_path ()
+        self.handle_extra_path()
         self.install_libbase = self.install_lib # needed for .pth file
-        self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
+        self.install_lib = os.path.join(self.install_lib, self.extra_dirs)
 
         # If a new root directory was supplied, make all the installation
         # dirs relative to it.
@@ -300,12 +300,12 @@ def finalize_options (self):
             self.change_roots('libbase', 'lib', 'purelib', 'platlib',
                               'scripts', 'data', 'headers')
 
-        self.dump_dirs ("after prepending root")
+        self.dump_dirs("after prepending root")
 
         # Find out the build directories, ie. where to install from.
-        self.set_undefined_options ('build',
-                                    ('build_base', 'build_base'),
-                                    ('build_lib', 'build_lib'))
+        self.set_undefined_options('build',
+                                   ('build_base', 'build_base'),
+                                   ('build_lib', 'build_lib'))
 
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
@@ -321,8 +321,8 @@ def dump_dirs (self, msg):
                 opt_name = opt[0]
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
-                opt_name = string.translate (opt_name, longopt_xlate)
-                val = getattr (self, opt_name)
+                opt_name = string.translate(opt_name, longopt_xlate)
+                val = getattr(self, opt_name)
                 print "  %s: %s" % (opt_name, val)
 
 
@@ -342,15 +342,15 @@ def finalize_unix (self):
 
         if self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme ("unix_home")
+            self.select_scheme("unix_home")
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
                     raise DistutilsOptionError, \
                           "must not supply exec-prefix without prefix"
 
-                self.prefix = os.path.normpath (sys.prefix)
-                self.exec_prefix = os.path.normpath (sys.exec_prefix)
+                self.prefix = os.path.normpath(sys.prefix)
+                self.exec_prefix = os.path.normpath(sys.exec_prefix)
 
             else:
                 if self.exec_prefix is None:
@@ -358,7 +358,7 @@ def finalize_unix (self):
 
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
-            self.select_scheme ("unix_prefix")
+            self.select_scheme("unix_prefix")
 
     # finalize_unix ()
 
@@ -366,11 +366,11 @@ def finalize_unix (self):
     def finalize_other (self):          # Windows and Mac OS for now
 
         if self.prefix is None:
-            self.prefix = os.path.normpath (sys.prefix)
+            self.prefix = os.path.normpath(sys.prefix)
 
         self.install_base = self.install_platbase = self.prefix
         try:
-            self.select_scheme (os.name)
+            self.select_scheme(os.name)
         except KeyError:
             raise DistutilsPlatformError, \
                   "I don't know how to install stuff on '%s'" % os.name
@@ -389,26 +389,26 @@ def select_scheme (self, name):
 
     def _expand_attrs (self, attrs):
         for attr in attrs:
-            val = getattr (self, attr)
+            val = getattr(self, attr)
             if val is not None:
                 if os.name == 'posix':
-                    val = os.path.expanduser (val)
-                val = subst_vars (val, self.config_vars)
-                setattr (self, attr, val)
+                    val = os.path.expanduser(val)
+                val = subst_vars(val, self.config_vars)
+                setattr(self, attr, val)
 
 
     def expand_basedirs (self):
-        self._expand_attrs (['install_base',
-                             'install_platbase',
-                             'root'])        
+        self._expand_attrs(['install_base',
+                            'install_platbase',
+                            'root'])        
 
     def expand_dirs (self):
-        self._expand_attrs (['install_purelib',
-                             'install_platlib',
-                             'install_lib',
-                             'install_headers',
-                             'install_scripts',
-                             'install_data',])
+        self._expand_attrs(['install_purelib',
+                            'install_platlib',
+                            'install_lib',
+                            'install_headers',
+                            'install_scripts',
+                            'install_data',])
 
 
     def convert_paths (self, *names):
@@ -423,12 +423,12 @@ def handle_extra_path (self):
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
-            if type (self.extra_path) is StringType:
-                self.extra_path = string.split (self.extra_path, ',')
+            if type(self.extra_path) is StringType:
+                self.extra_path = string.split(self.extra_path, ',')
 
-            if len (self.extra_path) == 1:
+            if len(self.extra_path) == 1:
                 path_file = extra_dirs = self.extra_path[0]
-            elif len (self.extra_path) == 2:
+            elif len(self.extra_path) == 2:
                 (path_file, extra_dirs) = self.extra_path
             else:
                 raise DistutilsOptionError, \
@@ -437,7 +437,7 @@ def handle_extra_path (self):
 
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
-            extra_dirs = convert_path (extra_dirs)
+            extra_dirs = convert_path(extra_dirs)
 
         else:
             path_file = None
@@ -463,21 +463,21 @@ def run (self):
 
         # Obviously have to build before we can install
         if not self.skip_build:
-            self.run_command ('build')
+            self.run_command('build')
 
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
-            self.run_command (cmd_name)
+            self.run_command(cmd_name)
 
         if self.path_file:
-            self.create_path_file ()
+            self.create_path_file()
 
         # write list of installed files, if requested.
         if self.record:
             outputs = self.get_outputs()
             if self.root:               # strip any package prefix
                 root_len = len(self.root)
-                for counter in xrange (len (outputs)):
+                for counter in xrange(len(outputs)):
                     outputs[counter] = outputs[counter][root_len:]
             self.execute(write_file,
                          (self.record, outputs),
@@ -496,12 +496,12 @@ def run (self):
     # run ()
 
     def create_path_file (self):
-        filename = os.path.join (self.install_libbase,
-                                 self.path_file + ".pth")
+        filename = os.path.join(self.install_libbase,
+                                self.path_file + ".pth")
         if self.install_path_file:
-            self.execute (write_file,
-                          (filename, [self.extra_dirs]),
-                          "creating %s" % filename)
+            self.execute(write_file,
+                         (filename, [self.extra_dirs]),
+                         "creating %s" % filename)
         else:
             self.warn("path file '%s' not created" % filename)
 
@@ -513,8 +513,8 @@ def get_outputs (self):
         # get the outputs of all its sub-commands.
         outputs = []
         for cmd_name in self.get_sub_commands():
-            cmd = self.get_finalized_command (cmd_name)
-            outputs.extend (cmd.get_outputs())
+            cmd = self.get_finalized_command(cmd_name)
+            outputs.extend(cmd.get_outputs())
 
         return outputs
 
@@ -522,8 +522,8 @@ def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
-            cmd = self.get_finalized_command (cmd_name)
-            inputs.extend (cmd.get_inputs())
+            cmd = self.get_finalized_command(cmd_name)
+            inputs.extend(cmd.get_inputs())
 
         return inputs
 
diff --git a/command/install_scripts.py b/command/install_scripts.py
index b8938c48de..3bc23e7460 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -33,11 +33,11 @@ def initialize_options (self):
 
     def finalize_options (self):
         self.set_undefined_options('build', ('build_scripts', 'build_dir'))
-        self.set_undefined_options ('install',
-                                    ('install_scripts', 'install_dir'),
-                                    ('force', 'force'),
-                                    ('skip_build', 'skip_build'),
-                                   )
+        self.set_undefined_options('install',
+                                   ('install_scripts', 'install_dir'),
+                                   ('force', 'force'),
+                                   ('skip_build', 'skip_build'),
+                                  )
 
     def run (self):
         if not self.skip_build:
diff --git a/command/sdist.py b/command/sdist.py
index adaf4925f2..5116868e76 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -118,7 +118,7 @@ def finalize_options (self):
                       "don't know how to create source distributions " + \
                       "on platform %s" % os.name
 
-        bad_format = archive_util.check_archive_formats (self.formats)
+        bad_format = archive_util.check_archive_formats(self.formats)
         if bad_format:
             raise DistutilsOptionError, \
                   "unknown archive format '%s'" % bad_format
@@ -135,12 +135,12 @@ def run (self):
         
         # Ensure that all required meta-data is given; warn if not (but
         # don't die, it's not *that* serious!)
-        self.check_metadata ()
+        self.check_metadata()
 
         # Do whatever it takes to get the list of files to process
         # (process the manifest template, read an existing manifest,
         # whatever).  File list is accumulated in 'self.filelist'.
-        self.get_file_list ()
+        self.get_file_list()
 
         # If user just wanted us to regenerate the manifest, stop now.
         if self.manifest_only:
@@ -148,7 +148,7 @@ def run (self):
 
         # Otherwise, go ahead and create the source distribution tarball,
         # or zipfile, or whatever.
-        self.make_distribution ()
+        self.make_distribution()
 
 
     def check_metadata (self):
@@ -161,25 +161,25 @@ def check_metadata (self):
 
         missing = []
         for attr in ('name', 'version', 'url'):
-            if not (hasattr (metadata, attr) and getattr (metadata, attr)):
-                missing.append (attr)
+            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
+                missing.append(attr)
 
         if missing:
-            self.warn ("missing required meta-data: " +
-                       string.join (missing, ", "))
+            self.warn("missing required meta-data: " +
+                      string.join(missing, ", "))
 
         if metadata.author:
             if not metadata.author_email:
-                self.warn ("missing meta-data: if 'author' supplied, " +
-                           "'author_email' must be supplied too")
+                self.warn("missing meta-data: if 'author' supplied, " +
+                          "'author_email' must be supplied too")
         elif metadata.maintainer:
             if not metadata.maintainer_email:
-                self.warn ("missing meta-data: if 'maintainer' supplied, " +
-                           "'maintainer_email' must be supplied too")
+                self.warn("missing meta-data: if 'maintainer' supplied, " +
+                          "'maintainer_email' must be supplied too")
         else:
-            self.warn ("missing meta-data: either (author and author_email) " +
-                       "or (maintainer and maintainer_email) " +
-                       "must be supplied")
+            self.warn("missing meta-data: either (author and author_email) " +
+                      "or (maintainer and maintainer_email) " +
+                      "must be supplied")
 
     # check_metadata ()
 
@@ -282,41 +282,41 @@ def add_defaults (self):
 
         standards = [('README', 'README.txt'), self.distribution.script_name]
         for fn in standards:
-            if type (fn) is TupleType:
+            if type(fn) is TupleType:
                 alts = fn
                 got_it = 0
                 for fn in alts:
-                    if os.path.exists (fn):
+                    if os.path.exists(fn):
                         got_it = 1
-                        self.filelist.append (fn)
+                        self.filelist.append(fn)
                         break
 
                 if not got_it:
-                    self.warn ("standard file not found: should have one of " +
-                               string.join (alts, ', '))
+                    self.warn("standard file not found: should have one of " +
+                              string.join(alts, ', '))
             else:
-                if os.path.exists (fn):
-                    self.filelist.append (fn)
+                if os.path.exists(fn):
+                    self.filelist.append(fn)
                 else:
-                    self.warn ("standard file '%s' not found" % fn)
+                    self.warn("standard file '%s' not found" % fn)
 
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
-            files = filter (os.path.isfile, glob (pattern))
+            files = filter(os.path.isfile, glob(pattern))
             if files:
-                self.filelist.extend (files)
+                self.filelist.extend(files)
 
         if self.distribution.has_pure_modules():
-            build_py = self.get_finalized_command ('build_py')
-            self.filelist.extend (build_py.get_source_files ())
+            build_py = self.get_finalized_command('build_py')
+            self.filelist.extend(build_py.get_source_files())
 
         if self.distribution.has_ext_modules():
-            build_ext = self.get_finalized_command ('build_ext')
-            self.filelist.extend (build_ext.get_source_files ())
+            build_ext = self.get_finalized_command('build_ext')
+            self.filelist.extend(build_ext.get_source_files())
 
         if self.distribution.has_c_libraries():
-            build_clib = self.get_finalized_command ('build_clib')
-            self.filelist.extend (build_clib.get_source_files ())
+            build_clib = self.get_finalized_command('build_clib')
+            self.filelist.extend(build_clib.get_source_files())
 
     # add_defaults ()
     
@@ -329,13 +329,13 @@ def read_template (self):
         accordingly.
         """
         self.announce("reading manifest template '%s'" % self.template)
-        template = TextFile (self.template,
-                             strip_comments=1,
-                             skip_blanks=1,
-                             join_lines=1,
-                             lstrip_ws=1,
-                             rstrip_ws=1,
-                             collapse_join=1)
+        template = TextFile(self.template,
+                            strip_comments=1,
+                            skip_blanks=1,
+                            join_lines=1,
+                            lstrip_ws=1,
+                            rstrip_ws=1,
+                            collapse_join=1)
 
         while 1:
             line = template.readline()
@@ -386,14 +386,14 @@ def read_manifest (self):
         distribution.
         """
         self.announce("reading manifest file '%s'" % self.manifest)
-        manifest = open (self.manifest)
+        manifest = open(self.manifest)
         while 1:
-            line = manifest.readline ()
+            line = manifest.readline()
             if line == '':              # end of file
                 break
             if line[-1] == '\n':
                 line = line[0:-1]
-            self.filelist.append (line)
+            self.filelist.append(line)
 
     # read_manifest ()
             
@@ -421,7 +421,7 @@ def make_release_tree (self, base_dir, files):
         # out-of-date, because by default we blow away 'base_dir' when
         # we're done making the distribution archives.)
     
-        if hasattr (os, 'link'):        # can make hard links on this system
+        if hasattr(os, 'link'):        # can make hard links on this system
             link = 'hard'
             msg = "making hard links in %s..." % base_dir
         else:                           # nope, have to copy
@@ -431,13 +431,13 @@ def make_release_tree (self, base_dir, files):
         if not files:
             self.warn("no files to distribute -- empty manifest?")
         else:
-            self.announce (msg)
+            self.announce(msg)
         for file in files:
             if not os.path.isfile(file):
                 self.warn("'%s' not a regular file -- skipping" % file)
             else:
-                dest = os.path.join (base_dir, file)
-                self.copy_file (file, dest, link=link)
+                dest = os.path.join(base_dir, file)
+                self.copy_file(file, dest, link=link)
 
     # make_release_tree ()
 
@@ -455,16 +455,16 @@ def make_distribution (self):
         base_dir = self.distribution.get_fullname()
         base_name = os.path.join(self.dist_dir, base_dir)
 
-        self.make_release_tree (base_dir, self.filelist.files)
+        self.make_release_tree(base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
         for fmt in self.formats:
-            file = self.make_archive (base_name, fmt, base_dir=base_dir)
+            file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
 
         self.archive_files = archive_files
 
         if not self.keep_temp:
-            dir_util.remove_tree (base_dir, self.verbose, self.dry_run)
+            dir_util.remove_tree(base_dir, self.verbose, self.dry_run)
 
     def get_archive_files (self):
         """Return the list of archive files created when the command

From e125b16ff055a9b864f749cc48dcc94e8191a123 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 18:40:42 +0000
Subject: [PATCH 0653/8469] Reformat docstrings.

---
 util.py | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/util.py b/util.py
index 016119ce66..4f972ffd91 100644
--- a/util.py
+++ b/util.py
@@ -59,15 +59,15 @@ def get_platform ():
 
 
 def convert_path (pathname):
-    """Return 'pathname' as a name that will work on the native
-       filesystem, i.e. split it on '/' and put it back together again
-       using the current directory separator.  Needed because filenames in
-       the setup script are always supplied in Unix style, and have to be
-       converted to the local convention before we can actually use them in
-       the filesystem.  Raises ValueError if 'pathname' is
-       absolute (starts with '/') or contains local directory separators
-       (unless the local separator is '/', of course)."""
-
+    """Return 'pathname' as a name that will work on the native filesystem,
+    i.e. split it on '/' and put it back together again using the current
+    directory separator.  Needed because filenames in the setup script are
+    always supplied in Unix style, and have to be converted to the local
+    convention before we can actually use them in the filesystem.  Raises
+    ValueError if 'pathname' is absolute (starts with '/') or contains
+    local directory separators (unless the local separator is '/', of
+    course).
+    """
     if os.sep == '/':
         return pathname
     if pathname[0] == '/':
@@ -116,13 +116,12 @@ def change_root (new_root, pathname):
 _environ_checked = 0
 def check_environ ():
     """Ensure that 'os.environ' has all the environment variables we
-       guarantee that users can use in config files, command-line
-       options, etc.  Currently this includes:
-         HOME - user's home directory (Unix only)
-         PLAT - description of the current platform, including hardware
-                and OS (see 'get_platform()')
+    guarantee that users can use in config files, command-line options,
+    etc.  Currently this includes:
+      HOME - user's home directory (Unix only)
+      PLAT - description of the current platform, including hardware
+             and OS (see 'get_platform()')
     """
-
     global _environ_checked
     if _environ_checked:
         return
@@ -138,15 +137,15 @@ def check_environ ():
 
 
 def subst_vars (str, local_vars):
-    """Perform shell/Perl-style variable substitution on 'string'.
-       Every occurrence of '$' followed by a name, or a name enclosed in
-       braces, is considered a variable.  Every variable is substituted by
-       the value found in the 'local_vars' dictionary, or in 'os.environ'
-       if it's not in 'local_vars'.  'os.environ' is first checked/
-       augmented to guarantee that it contains certain values: see
-       '_check_environ()'.  Raise ValueError for any variables not found in
-       either 'local_vars' or 'os.environ'."""
-
+    """Perform shell/Perl-style variable substitution on 'string'.  Every
+    occurrence of '$' followed by a name, or a name enclosed in braces, is
+    considered a variable.  Every variable is substituted by the value
+    found in the 'local_vars' dictionary, or in 'os.environ' if it's not in
+    'local_vars'.  'os.environ' is first checked/ augmented to guarantee
+    that it contains certain values: see '_check_environ()'.  Raise
+    ValueError for any variables not found in either 'local_vars' or
+    'os.environ'.
+    """
     check_environ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)

From 2cefa8512551672a267241aa0c7c783c272325e0 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 18:49:14 +0000
Subject: [PATCH 0654/8469] Various docstring tweaks. Fixed 'subst_vars()' so
 it actually blows up like the docstring claims   (and fixed the docstring not
 to claim it handles ${var}, which it   doesn't).

---
 util.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/util.py b/util.py
index 4f972ffd91..1a1ec6d858 100644
--- a/util.py
+++ b/util.py
@@ -1,7 +1,8 @@
 """distutils.util
 
 Miscellaneous utility functions -- anything that doesn't fit into
-one of the other *util.py modules."""
+one of the other *util.py modules.
+"""
 
 # created 1999/03/08, Greg Ward
 
@@ -64,9 +65,8 @@ def convert_path (pathname):
     directory separator.  Needed because filenames in the setup script are
     always supplied in Unix style, and have to be converted to the local
     convention before we can actually use them in the filesystem.  Raises
-    ValueError if 'pathname' is absolute (starts with '/') or contains
-    local directory separators (unless the local separator is '/', of
-    course).
+    ValueError on non-Unix-ish systems if 'pathname' either starts or
+    ends with a slash.
     """
     if os.sep == '/':
         return pathname
@@ -138,13 +138,12 @@ def check_environ ():
 
 def subst_vars (str, local_vars):
     """Perform shell/Perl-style variable substitution on 'string'.  Every
-    occurrence of '$' followed by a name, or a name enclosed in braces, is
-    considered a variable.  Every variable is substituted by the value
-    found in the 'local_vars' dictionary, or in 'os.environ' if it's not in
-    'local_vars'.  'os.environ' is first checked/ augmented to guarantee
-    that it contains certain values: see '_check_environ()'.  Raise
-    ValueError for any variables not found in either 'local_vars' or
-    'os.environ'.
+    occurrence of '$' followed by a name is considered a variable, and
+    variable is substituted by the value found in the 'local_vars'
+    dictionary, or in 'os.environ' if it's not in 'local_vars'.
+    'os.environ' is first checked/augmented to guarantee that it contains
+    certain values: see 'check_environ()'.  Raise ValueError for any
+    variables not found in either 'local_vars' or 'os.environ'.
     """
     check_environ()
     def _subst (match, local_vars=local_vars):
@@ -154,7 +153,10 @@ def _subst (match, local_vars=local_vars):
         else:
             return os.environ[var_name]
 
-    return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
+    try:
+        return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
+    except KeyError, var:
+        raise ValueError, "invalid variable '$%s'" % var
 
 # subst_vars ()
 

From 016c9e3595524f13467fe2192e5509f9469725a6 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 20:37:56 +0000
Subject: [PATCH 0655/8469] Added 'byte_compile(): an all-singing, all-dancing
 wrapper around the standard 'py_compile.compile()' function.  Laundry list of
 features:   - handles standard Distutils 'force', 'verbose', 'dry_run' flags 
  - handles various levels of optimization: can compile directly in     this
 interpreter process, or write a temporary script that is     then executed by
 a new interpreter with the appropriate flags   - can rewrite the source
 filename by stripping an optional prefix     and preprending an optional base
 dir.

---
 util.py | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 1a1ec6d858..03234847a6 100644
--- a/util.py
+++ b/util.py
@@ -8,8 +8,9 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re, shutil
-from distutils.errors import *
+import sys, os, string, re
+from distutils.errors import DistutilsPlatformError
+from distutils.dep_util import newer
 from distutils.spawn import spawn
 
 
@@ -289,3 +290,129 @@ def strtobool (val):
         return 0
     else:
         raise ValueError, "invalid truth value %s" % `val`
+
+
+def byte_compile (py_files,
+                  optimize=0, force=0,
+                  prefix=None, base_dir=None,
+                  verbose=1, dry_run=0,
+                  direct=None):
+    """Byte-compile a collection of Python source files to either
+    .pyc or .pyo files in the same directory.  'optimize' must be
+    one of the following:
+      0 - don't optimize (generate .pyc)
+      1 - normal optimization (like "python -O")
+      2 - extra optimization (like "python -OO")
+    If 'force' is true, all files are recompiled regardless of
+    timestamps.
+
+    The source filename encoded in each bytecode file defaults to the
+    filenames listed in 'py_files'; you can modify these with 'prefix' and
+    'basedir'.  'prefix' is a string that will be stripped off of each
+    source filename, and 'base_dir' is a directory name that will be
+    prepended (after 'prefix' is stripped).  You can supply either or both
+    (or neither) of 'prefix' and 'base_dir', as you wish.
+
+    If 'verbose' is true, prints out a report of each file.  If 'dry_run'
+    is true, doesn't actually do anything that would affect the filesystem.
+
+    Byte-compilation is either done directly in this interpreter process
+    with the standard py_compile module, or indirectly by writing a
+    temporary script and executing it.  Normally, you should let
+    'byte_compile()' figure out to use direct compilation or not (see
+    the source for details).  The 'direct' flag is used by the script
+    generated in indirect mode; unless you know what you're doing, leave
+    it set to None.
+    """
+
+    # First, if the caller didn't force us into direct or indirect mode,
+    # figure out which mode we should be in.  We take a conservative
+    # approach: choose direct mode *only* if the current interpreter is
+    # in debug mode and optimize is 0.  If we're not in debug mode (-O
+    # or -OO), we don't know which level of optimization this
+    # interpreter is running with, so we can't do direct
+    # byte-compilation and be certain that it's the right thing.  Thus,
+    # always compile indirectly if the current interpreter is in either
+    # optimize mode, or if either optimization level was requested by
+    # the caller.
+    if direct is None:
+        direct = (__debug__ and optimize == 0)
+
+    # "Indirect" byte-compilation: write a temporary script and then
+    # run it with the appropriate flags.
+    if not direct:
+        from tempfile import mktemp
+        script_name = mktemp(".py")
+        if verbose:
+            print "writing byte-compilation script '%s'" % script_name
+        if not dry_run:
+            script = open(script_name, "w")
+
+            script.write("""\
+from distutils.util import byte_compile
+files = [
+""")
+            script.write(string.join(map(repr, py_files), ",\n") + "]\n")
+            script.write("""
+byte_compile(files, optimize=%s, force=%s,
+             prefix=%s, base_dir=%s,
+             verbose=%s, dry_run=0,
+             direct=1)
+""" % (`optimize`, `force`, `prefix`, `base_dir`, `verbose`))
+
+            script.close()
+
+        cmd = [sys.executable, script_name]
+        if optimize == 1:
+            cmd.insert(1, "-O")
+        elif optimize == 2:
+            cmd.insert(1, "-OO")
+        spawn(cmd, verbose=verbose, dry_run=dry_run)
+        
+    # "Direct" byte-compilation: use the py_compile module to compile
+    # right here, right now.  Note that the script generated in indirect
+    # mode simply calls 'byte_compile()' in direct mode, a weird sort of
+    # cross-process recursion.  Hey, it works!
+    else:
+        from py_compile import compile
+
+        for file in py_files:
+            if file[-3:] != ".py":
+                raise ValueError, \
+                      "invalid filename: %s doesn't end with '.py'" % `file`
+
+            # Terminology from the py_compile module:
+            #   cfile - byte-compiled file
+            #   dfile - purported source filename (same as 'file' by default)
+            cfile = file + (__debug__ and "c" or "o")
+            dfile = file
+            if prefix:
+                if file[:len(prefix)] != prefix:
+                    raise ValueError, \
+                          ("invalid prefix: filename %s doesn't start with %s"
+                           % (`file`, `prefix`))
+                dfile = dfile[len(prefix):]
+            if base_dir:
+                dfile = os.path.join(base_dir, dfile)
+
+            cfile_base = os.path.basename(cfile)
+            if direct:
+                if force or newer(file, cfile):
+                    if verbose:
+                        print "byte-compiling %s to %s" % (file, cfile_base)
+                    if not dry_run:
+                        compile(file, cfile, dfile)
+                else:
+                    if verbose:
+                        print "skipping byte-compilation of %s to %s" % \
+                              (file, cfile_base)
+
+# byte_compile ()
+
+
+if __name__ == "__main__":
+    import glob
+    f = glob.glob("command/*.py")
+    byte_compile(f, optimize=0, prefix="command/", base_dir="/usr/lib/python")
+    #byte_compile(f, optimize=1)
+    #byte_compile(f, optimize=2)

From c2c1bbc37b9dea94262111b0d050c6d6e9fd024e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 30 Sep 2000 20:39:09 +0000
Subject: [PATCH 0656/8469] Reduced the 'bytecompile()' method to a one-line
 wrapper around 'util.byte_compile()'.  Currently just reproduces the existing
 functionality -- doesn't use any of the fancy features in the new
 'byte_compile()'.

---
 command/install_lib.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 2c92f3fe4a..6ad0a54b32 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -5,6 +5,7 @@
 import sys, os, string
 from distutils.core import Command
 from distutils.dir_util import copy_tree
+from distutils.util import byte_compile
 
 class install_lib (Command):
 
@@ -82,21 +83,9 @@ def install (self):
         return outfiles
 
     def bytecompile (self, files):
-        # XXX hey! we can't control whether we optimize or not; that's up
-        # to the invocation of the current Python interpreter (at least
-        # according to the py_compile docs).  That sucks.
-        if self.compile:
-            from py_compile import compile
-
-            for f in files:
-                # only compile the file if it is actually a .py file
-                if f[-3:] == '.py':
-                    out_fn = f + (__debug__ and "c" or "o")
-                    compile_msg = "byte-compiling %s to %s" % \
-                                  (f, os.path.basename(out_fn))
-                    skip_msg = "skipping byte-compilation of %s" % f
-                    self.make_file(f, out_fn, compile, (f,),
-                                   compile_msg, skip_msg)
+        byte_compile(files,
+                     force=self.force,
+                     verbose=self.verbose, dry_run=self.dry_run)
 
 
     # -- Utility methods -----------------------------------------------

From 9a39df987d712514e23769e43651dd72768e0289 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 1 Oct 2000 23:49:30 +0000
Subject: [PATCH 0657/8469] Tweaked 'byte_compile()' so it silently skips
 non-Python files, rather than blowing up.

---
 util.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index 03234847a6..563e47c4bd 100644
--- a/util.py
+++ b/util.py
@@ -297,9 +297,10 @@ def byte_compile (py_files,
                   prefix=None, base_dir=None,
                   verbose=1, dry_run=0,
                   direct=None):
-    """Byte-compile a collection of Python source files to either
-    .pyc or .pyo files in the same directory.  'optimize' must be
-    one of the following:
+    """Byte-compile a collection of Python source files to either .pyc
+    or .pyo files in the same directory.  'py_files' is a list of files
+    to compile; any files that don't end in ".py" are silently skipped.
+    'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
@@ -378,8 +379,9 @@ def byte_compile (py_files,
 
         for file in py_files:
             if file[-3:] != ".py":
-                raise ValueError, \
-                      "invalid filename: %s doesn't end with '.py'" % `file`
+                # This lets us be lazy and not filter filenames in
+                # the "install_lib" command.
+                continue
 
             # Terminology from the py_compile module:
             #   cfile - byte-compiled file

From 1e229b65b2fd026127f9507e1a5eb2bf5716b6d3 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 1 Oct 2000 23:50:13 +0000
Subject: [PATCH 0658/8469] From 'run()', only call 'bytecompile()' if we
 actually have pure Python modules to compile.

---
 command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 6ad0a54b32..2396eedad3 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -57,7 +57,7 @@ def run (self):
         outfiles = self.install()
 
         # (Optionally) compile .py to .pyc
-        if outfiles is not None:
+        if outfiles is not None and self.distribution.has_pure_modules():
             self.bytecompile(outfiles)
 
     # run ()

From 0c6e44515410c371cbb4f4d3589f8554e7f217ab Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 2 Oct 2000 02:09:55 +0000
Subject: [PATCH 0659/8469] Remove the temporary byte-compilation script when
 we're done with it.

---
 util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util.py b/util.py
index 563e47c4bd..8a8b77afef 100644
--- a/util.py
+++ b/util.py
@@ -369,6 +369,7 @@ def byte_compile (py_files,
         elif optimize == 2:
             cmd.insert(1, "-OO")
         spawn(cmd, verbose=verbose, dry_run=dry_run)
+        os.remove(script_name)
         
     # "Direct" byte-compilation: use the py_compile module to compile
     # right here, right now.  Note that the script generated in indirect

From af0b04bbeb4b4811fcf2892856cfc4154841bda7 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 2 Oct 2000 02:15:08 +0000
Subject: [PATCH 0660/8469] Finished the overhaul of byte-compilation options:
 there's now a 6-way choice between (compile, no-compile) * (optimize=0,
 optimize=1, optimize=2).  Details:   - added --no-compile option to
 complement --compile, which has     been there for ages   - changed
 --optimize (which never worked) to a value option, which     expects 0, 1, or
 2   - renamed 'bytecompile()' method to 'byte_compile()', and beefed     it
 up to handle both 'compile' and 'optimize' options   - fix
 '_bytecode_filenames()' to respect the new options

---
 command/install_lib.py | 81 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 2396eedad3..80da3acc86 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -3,24 +3,44 @@
 __revision__ = "$Id$"
 
 import sys, os, string
+from types import IntType
 from distutils.core import Command
+from distutils.errors import DistutilsOptionError
 from distutils.dir_util import copy_tree
-from distutils.util import byte_compile
 
 class install_lib (Command):
 
     description = "install all Python modules (extensions and pure Python)"
 
+    # The byte-compilation options are a tad confusing.  Here are the
+    # possible scenarios:
+    #   1) no compilation at all (--no-compile --no-optimize)
+    #   2) compile .pyc only (--compile --no-optimize; default)
+    #   3) compile .pyc and "level 1" .pyo (--compile --optimize)
+    #   4) compile "level 1" .pyo only (--no-compile --optimize)
+    #   5) compile .pyc and "level 2" .pyo (--compile --optimize-more)
+    #   6) compile "level 2" .pyo only (--no-compile --optimize-more)
+    # 
+    # The UI for this is two option, 'compile' and 'optimize'.
+    # 'compile' is strictly boolean, and only decides whether to
+    # generate .pyc files.  'optimize' is three-way (0, 1, or 2), and
+    # decides both whether to generate .pyo files and what level of
+    # optimization to use.
+
     user_options = [
         ('install-dir=', 'd', "directory to install to"),
         ('build-dir=','b', "build directory (where to install from)"),
         ('force', 'f', "force installation (overwrite existing files)"),
-        ('compile', 'c', "compile .py to .pyc"),
-        ('optimize', 'o', "compile .py to .pyo (optimized)"),
+        ('compile', 'c', "compile .py to .pyc [default]"),
+        ('no-compile', None, "don't compile .py files"),
+        ('optimize=', 'O',
+         "also compile with optimization: -O1 for \"python -O\", "
+         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
         ('skip-build', None, "skip the build steps"),
         ]
                
-    boolean_options = ['force', 'compile', 'optimize', 'skip-build']
+    boolean_options = ['force', 'compile', 'skip-build']
+    negative_opt = {'no-compile' : 'compile'}
 
 
     def initialize_options (self):
@@ -28,8 +48,8 @@ def initialize_options (self):
         self.install_dir = None
         self.build_dir = None
         self.force = 0
-        self.compile = 1
-        self.optimize = 1
+        self.compile = None
+        self.optimize = None
         self.skip_build = None
 
     def finalize_options (self):
@@ -41,11 +61,25 @@ def finalize_options (self):
                                    ('build_lib', 'build_dir'),
                                    ('install_lib', 'install_dir'),
                                    ('force', 'force'),
-                                   ('compile_py', 'compile'),
-                                   ('optimize_py', 'optimize'),
+                                   ('compile', 'compile'),
+                                   ('optimize', 'optimize'),
                                    ('skip_build', 'skip_build'),
                                   )
 
+        if self.compile is None:
+            self.compile = 1
+        if self.optimize is None:
+            self.optimize = 0
+
+        print "install_lib: compile=%s, optimize=%s" % \
+              (`self.compile`, `self.optimize`)
+        if type(self.optimize) is not IntType:
+            try:
+                self.optimize = int(self.optimize)
+                assert 0 <= self.optimize <= 2
+            except (ValueError, AssertionError):
+                raise DistutilsOptionError, "optimize must be 0, 1, or 2"
+
     def run (self):
 
         # Make sure we have built everything we need first
@@ -58,7 +92,7 @@ def run (self):
 
         # (Optionally) compile .py to .pyc
         if outfiles is not None and self.distribution.has_pure_modules():
-            self.bytecompile(outfiles)
+            self.byte_compile(outfiles)
 
     # run ()
 
@@ -82,10 +116,25 @@ def install (self):
             return
         return outfiles
 
-    def bytecompile (self, files):
-        byte_compile(files,
-                     force=self.force,
-                     verbose=self.verbose, dry_run=self.dry_run)
+    def byte_compile (self, files):
+        from distutils.util import byte_compile
+
+        # Get the "--root" directory supplied to the "install" command,
+        # and use it as a prefix to strip off the purported filename
+        # encoded in bytecode files.  This is far from complete, but it
+        # should at least generate usable bytecode in RPM distributions.
+        install_root = self.get_finalized_command('install').root
+
+        if self.compile:
+            byte_compile(files, optimize=0,
+                         force=self.force,
+                         prefix=install_root,
+                         verbose=self.verbose, dry_run=self.dry_run)
+        if self.optimize > 0:
+            byte_compile(files, optimize=self.optimize,
+                         force=self.force,
+                         prefix=install_root,
+                         verbose=self.verbose, dry_run=self.dry_run)
 
 
     # -- Utility methods -----------------------------------------------
@@ -111,8 +160,10 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
     def _bytecode_filenames (self, py_filenames):
         bytecode_files = []
         for py_file in py_filenames:
-            bytecode = py_file + (__debug__ and "c" or "o")
-            bytecode_files.append(bytecode)
+            if self.compile:
+                bytecode_files.append(py_file + "c")
+            if self.optmize > 0:
+                bytecode_files.append(py_file + "o")
 
         return bytecode_files
         

From 6bccb12b568be281d7e54b5ef3c5ff67ca6163bc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 2 Oct 2000 02:16:04 +0000
Subject: [PATCH 0661/8469] Added --compile, --optimize options so users have
 an easy way to instruct the "install_lib" command from the command-line.

---
 command/install.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/command/install.py b/command/install.py
index e9528c635d..303ae4c02d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -90,6 +90,15 @@ class install (Command):
         ('install-data=', None,
          "installation directory for data files"),
 
+        # Byte-compilation options -- see install_lib.py for details, as
+        # these are duplicated from there (but only install_lib does
+        # anything with them).
+        ('compile', 'c', "compile .py to .pyc [default]"),
+        ('no-compile', None, "don't compile .py files"),
+        ('optimize=', 'O',
+         "also compile with optimization: -O1 for \"python -O\", "
+         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
+         
         # Miscellaneous control options
         ('force', 'f',
          "force installation (overwrite any existing files)"),
@@ -135,6 +144,9 @@ def initialize_options (self):
         self.install_scripts = None
         self.install_data = None
 
+        self.compile = None
+        self.optimize = None
+
         # These two are for putting non-packagized distributions into their
         # own directory and creating a .pth file if it makes sense.
         # 'extra_path' comes from the setup file; 'install_path_file' can

From 7acf599bd33799d9e5b000b8d7e233a13464211d Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 2 Oct 2000 02:19:04 +0000
Subject: [PATCH 0662/8469] Added the ability to do byte-compilation at build
 time, currently off by default (since compiling at install time works just
 fine).  Details:   - added 'compile' and 'optimize' options   - added
 'byte_compile()' method   - changed 'get_outputs()' so it includes bytecode
 files A lot of the code added is very similar to code in install_lib.py;
 would be nice to factor it out further.

---
 command/build_py.py | 56 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 6a8a7f43f9..6fd4417f48 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -20,10 +20,16 @@ class build_py (Command):
 
     user_options = [
         ('build-lib=', 'd', "directory to \"build\" (copy) to"),
+        ('compile', 'c', "compile .py to .pyc"),
+        ('no-compile', None, "don't compile .py files [default]"),
+        ('optimize=', 'O',
+         "also compile with optimization: -O1 for \"python -O\", "
+         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
         ('force', 'f', "forcibly build everything (ignore file timestamps)"),
         ]
 
-    boolean_options = ['force']
+    boolean_options = ['compile', 'force']
+    negative_opt = {'no-compile' : 'compile'}
 
 
     def initialize_options (self):
@@ -31,6 +37,8 @@ def initialize_options (self):
         self.py_modules = None
         self.package = None
         self.package_dir = None
+        self.compile = 0
+        self.optimize = 0
         self.force = None
 
     def finalize_options (self):
@@ -44,6 +52,14 @@ def finalize_options (self):
         self.py_modules = self.distribution.py_modules
         self.package_dir = self.distribution.package_dir
 
+        # Ick, copied straight from install_lib.py (fancy_getopt needs a
+        # type system!  Hell, *everything* needs a type system!!!)
+        if type(self.optimize) is not IntType:
+            try:
+                self.optimize = int(self.optimize)
+                assert 0 <= self.optimize <= 2
+            except (ValueError, AssertionError):
+                raise DistutilsOptionError, "optimize must be 0, 1, or 2"
 
     def run (self):
 
@@ -87,6 +103,8 @@ def run (self):
         else:
             self.build_packages()
 
+        self.byte_compile(self.get_outputs(include_bytecode=0))
+
     # run ()
         
 
@@ -284,13 +302,19 @@ def get_module_outfile (self, build_dir, package, module):
         return apply(os.path.join, outfile_path)
 
 
-    def get_outputs (self):
+    def get_outputs (self, include_bytecode=1):
         modules = self.find_all_modules()
         outputs = []
         for (package, module, module_file) in modules:
             package = string.split(package, '.')
-            outputs.append(self.get_module_outfile(self.build_lib,
-                                                   package, module))
+            filename = self.get_module_outfile(self.build_lib, package, module)
+            outputs.append(filename)
+            if include_bytecode:
+                if self.compile:
+                    outputs.append(filename + "c")
+                if self.optimize > 0:
+                    outputs.append(filename + "o")
+
         return outputs
 
 
@@ -347,5 +371,27 @@ def build_packages (self):
                 self.build_module(module, module_file, package)
 
     # build_packages ()
-                       
+
+
+    def byte_compile (self, files):
+        from distutils.util import byte_compile
+        prefix = self.build_lib
+        if prefix[-1] != os.sep:
+            prefix = prefix + os.sep
+
+        # XXX this code is essentially the same as the 'byte_compile()
+        # method of the "install_lib" command, except for the determination
+        # of the 'prefix' string.  Hmmm.
+
+        if self.compile:
+            byte_compile(files, optimize=0,
+                         force=self.force,
+                         prefix=prefix,
+                         verbose=self.verbose, dry_run=self.dry_run)
+        if self.optimize > 0:
+            byte_compile(files, optimize=self.optimize,
+                         force=self.force,
+                         prefix=prefix,
+                         verbose=self.verbose, dry_run=self.dry_run)
+
 # class build_py

From d2497ea9a9cfcf3a2869d5251437cfea6ff473cc Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Mon, 2 Oct 2000 02:25:51 +0000
Subject: [PATCH 0663/8469] Typo fix.

---
 command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 80da3acc86..804dcffa60 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -162,7 +162,7 @@ def _bytecode_filenames (self, py_filenames):
         for py_file in py_filenames:
             if self.compile:
                 bytecode_files.append(py_file + "c")
-            if self.optmize > 0:
+            if self.optimize > 0:
                 bytecode_files.append(py_file + "o")
 
         return bytecode_files

From 94052cd86e69fe242219496b66427f1e429994df Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 3 Oct 2000 03:31:05 +0000
Subject: [PATCH 0664/8469] Added a long-winded comment (and commented-out
 comment to go with out) about how it would be nice to write absolute paths to
 the temporary byte-compilation script, but this doesn't work because it
 screws up the trailing-slash trickery done to 'prefix' in build_py's
 'byte_compile()' method.

Fixed to use 'execute()' instead of 'os.remove()' to remove the temporary
script: now it doesn't blow up in dry-run mode!
---
 util.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 8a8b77afef..7522ee2499 100644
--- a/util.py
+++ b/util.py
@@ -353,6 +353,21 @@ def byte_compile (py_files,
 from distutils.util import byte_compile
 files = [
 """)
+
+            # XXX would be nice to write absolute filenames, just for
+            # safety's sake (script should be more robust in the face of
+            # chdir'ing before running it).  But this requires abspath'ing
+            # 'prefix' as well, and that breaks the hack in build_lib's
+            # 'byte_compile()' method that carefully tacks on a trailing
+            # slash (os.sep really) to make sure the prefix here is "just
+            # right".  This whole prefix business is rather delicate -- the
+            # problem is that it's really a directory, but I'm treating it
+            # as a dumb string, so trailing slashes and so forth matter.
+
+            #py_files = map(os.path.abspath, py_files)
+            #if prefix:
+            #    prefix = os.path.abspath(prefix)
+
             script.write(string.join(map(repr, py_files), ",\n") + "]\n")
             script.write("""
 byte_compile(files, optimize=%s, force=%s,
@@ -369,7 +384,8 @@ def byte_compile (py_files,
         elif optimize == 2:
             cmd.insert(1, "-OO")
         spawn(cmd, verbose=verbose, dry_run=dry_run)
-        os.remove(script_name)
+        execute(os.remove, (script_name,), "removing %s" % script_name,
+                verbose=verbose, dry_run=dry_run)
         
     # "Direct" byte-compilation: use the py_compile module to compile
     # right here, right now.  Note that the script generated in indirect

From 5e53de4c1f29689ed46a3edcedab0594b2ab9b7e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 3 Oct 2000 03:31:52 +0000
Subject: [PATCH 0665/8469] Fixed so --no-compile is a negative alias for
 --compile.

---
 command/install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/install.py b/command/install.py
index 303ae4c02d..330f324867 100644
--- a/command/install.py
+++ b/command/install.py
@@ -116,6 +116,7 @@ class install (Command):
         ]
 
     boolean_options = ['force', 'skip-build']
+    negative_opt = {'no-compile' : 'compile'}
 
 
     def initialize_options (self):

From 7bfd1e33100e73e990f07bffe02e06f5f8cd2e60 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 3 Oct 2000 03:32:37 +0000
Subject: [PATCH 0666/8469] Remove some debugging prints.

---
 command/install_lib.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 804dcffa60..6c4c7fe993 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -71,8 +71,6 @@ def finalize_options (self):
         if self.optimize is None:
             self.optimize = 0
 
-        print "install_lib: compile=%s, optimize=%s" % \
-              (`self.compile`, `self.optimize`)
         if type(self.optimize) is not IntType:
             try:
                 self.optimize = int(self.optimize)

From f07662ad4804864ca561414b1aeab71901df8c64 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Tue, 3 Oct 2000 03:48:43 +0000
Subject: [PATCH 0667/8469] Bump version to 1.0.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 23315cdeb9..2073617627 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0pre"
+__version__ = "1.0"

From aa3edfa3ec76a4cc13fca1dee25fda6f0baeb771 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 12 Oct 2000 19:31:13 +0000
Subject: [PATCH 0668/8469] Recreated after installer source code changes. This
 should close SF bug (patch)
 http://sourceforge.net/patch/?func=detailpatch&patch_id=101844&group_id=5470

---
 command/bdist_wininst.py | 492 +++++++++++++++++++--------------------
 1 file changed, 246 insertions(+), 246 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index afe6955e77..b45089b724 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -218,9 +218,9 @@ def get_exe_bytes (self):
 EXEDATA = """\
 TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
-ZGUuDQ0KJAAAAAAAAADqs5WMrtL7367S+9+u0vvf1c7336/S+98tzvXfrNL731Hy/9+s0vvfzM3o
-36bS+9+u0vrf89L7367S+9+j0vvfUfLx36PS+99p1P3fr9L731JpY2iu0vvfAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwD9e9Q5AAAAAAAAAADgAA8BCwEGAABAAAAAEAAAAJAAAADVAAAA
+ZGUuDQ0KJAAAAAAAAABwj7aMNO7Y3zTu2N807tjfT/LU3zXu2N+38tbfNu7Y39zx3N827tjfVvHL
+3zzu2N807tnfae7Y3zTu2N857tjf3PHS3znu2N+M6N7fNe7Y31JpY2g07tjfAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwAu6+E5AAAAAAAAAADgAA8BCwEGAABAAAAAEAAAAJAAAPDUAAAA
 oAAAAOAAAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAA8AAAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAw4QAAcAEAAADgAAAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -233,251 +233,251 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-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
+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
-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
+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

From 3440959467b0aa5fa7f21378e1657a9bbc047b67 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Oct 2000 03:40:20 +0000
Subject: [PATCH 0669/8469] Bastian Kleineidam: fix up any supplied
 command-line options.

---
 command/config.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/command/config.py b/command/config.py
index a13055cf8c..18d7992abe 100644
--- a/command/config.py
+++ b/command/config.py
@@ -14,6 +14,7 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
+from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 
@@ -69,7 +70,21 @@ def initialize_options (self):
         self.temp_files = []
 
     def finalize_options (self):
-        pass
+        if self.include_dirs is None:
+            self.include_dirs = self.distribution.include_dirs or []
+        elif type(self.include_dirs) is StringType:
+            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+
+        if self.libraries is None:
+            self.libraries = []
+        elif type(self.libraries) is StringType:
+            self.libraries = [self.libraries]
+
+        if self.library_dirs is None:
+            self.library_dirs = []
+        elif type(self.library_dirs) is StringType:
+            self.library_dirs = string.split(self.library_dirs, os.pathsep)
+
 
     def run (self):
         pass

From 806c2d4c0c20efab95c6519462cc891f93d96c0c Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Oct 2000 03:47:07 +0000
Subject: [PATCH 0670/8469] Lyle Johnson: use 'normcase()' in addition to
 'normpath()' when testing if we actually installed modules to a directory in
 sys.path.

---
 command/install.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/install.py b/command/install.py
index 330f324867..012b9f4577 100644
--- a/command/install.py
+++ b/command/install.py
@@ -497,10 +497,12 @@ def run (self):
                          "writing list of installed files to '%s'" %
                          self.record)
 
-        normalized_path = map(os.path.normpath, sys.path)
+        sys_path = map(os.path.normpath, sys.path)
+	sys_path = map(os.path.normcase, sys_path)
+        install_lib = os.path.normcase(os.path.normpath(self.install_lib))
         if (self.warn_dir and
             not (self.path_file and self.install_path_file) and
-            os.path.normpath(self.install_lib) not in normalized_path):
+            install_lib not in sys_path):
             self.warn(("modules installed to '%s', which is not in " +
                        "Python's module search path (sys.path) -- " +
                        "you'll have to change the search path yourself") %

From 89b5ec9d38d646bd3b9e1c7f746f3ba1801315fb Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Oct 2000 03:56:42 +0000
Subject: [PATCH 0671/8469] Bastian Kleineidam: make 'check_lib()' more like
 AC_CHECK_LIB by adding an 'other_libraries()' parameter.

---
 command/config.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/config.py b/command/config.py
index 18d7992abe..ce6cff8cef 100644
--- a/command/config.py
+++ b/command/config.py
@@ -325,16 +325,19 @@ def check_func (self, func,
     # check_func ()
 
     def check_lib (self, library, library_dirs=None,
-                   headers=None, include_dirs=None):
+                   headers=None, include_dirs=None, other_libraries=[]):
         """Determine if 'library' is available to be linked against,
         without actually checking that any particular symbols are provided
         by it.  'headers' will be used in constructing the source file to
         be compiled, but the only effect of this is to check if all the
-        header files listed are available.
+        header files listed are available.  Any libraries listed in
+        'other_libraries' will be included in the link, in case 'library'
+        has symbols that depend on other libraries.
         """
         self._check_compiler()
         return self.try_link("int main (void) { }",
-                             headers, include_dirs, [library], library_dirs)
+                             headers, include_dirs,
+                             [library]+other_libraries, library_dirs)
 
     def check_header (self, header, include_dirs=None,
                       library_dirs=None, lang="c"):

From 760b926a79252cf94800f28d378990773ed82bde Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Oct 2000 04:06:40 +0000
Subject: [PATCH 0672/8469] Untabified.

---
 command/bdist.py        |  2 +-
 command/build.py        |  2 +-
 command/build_clib.py   |  2 +-
 command/clean.py        |  2 +-
 command/install.py      |  2 +-
 command/install_data.py |  6 +++---
 command/sdist.py        |  2 +-
 dist.py                 | 10 +++++-----
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index c0cb1d3acd..a75303e689 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -45,7 +45,7 @@ class bdist (Command):
     help_options = [
         ('help-formats', None,
          "lists available distribution formats", show_formats),
-	]
+        ]
 
     # The following commands do not take a format option from bdist
     no_format_option = ('bdist_rpm',)
diff --git a/command/build.py b/command/build.py
index 0fed6b489e..cf35b45d01 100644
--- a/command/build.py
+++ b/command/build.py
@@ -47,7 +47,7 @@ class build (Command):
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
-	]
+        ]
 
     def initialize_options (self):
         self.build_base = 'build'
diff --git a/command/build_clib.py b/command/build_clib.py
index 2726b975fa..063da91552 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -53,7 +53,7 @@ class build_clib (Command):
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
-	]
+        ]
 
     def initialize_options (self):
         self.build_clib = None
diff --git a/command/clean.py b/command/clean.py
index fb8822f766..b4a9be45f8 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -60,7 +60,7 @@ def run(self):
             # remove build directories
             for directory in (self.build_lib,
                               self.bdist_base,
-			      self.build_scripts):
+                              self.build_scripts):
                 if os.path.exists(directory):
                     remove_tree(directory, self.verbose, self.dry_run)
                 else:
diff --git a/command/install.py b/command/install.py
index 012b9f4577..6aee1b35d9 100644
--- a/command/install.py
+++ b/command/install.py
@@ -498,7 +498,7 @@ def run (self):
                          self.record)
 
         sys_path = map(os.path.normpath, sys.path)
-	sys_path = map(os.path.normcase, sys_path)
+        sys_path = map(os.path.normcase, sys_path)
         install_lib = os.path.normcase(os.path.normpath(self.install_lib))
         if (self.warn_dir and
             not (self.path_file and self.install_path_file) and
diff --git a/command/install_data.py b/command/install_data.py
index d9a486936c..dba108af14 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -38,10 +38,10 @@ def initialize_options (self):
 
     def finalize_options (self):
         self.set_undefined_options('install',
-	                           ('install_data', 'install_dir'),
-				   ('root', 'root'),
+                                   ('install_data', 'install_dir'),
+                                   ('root', 'root'),
                                    ('force', 'force'),
-				  )
+                                  )
 
     def run (self):
         self.mkpath(self.install_dir)
diff --git a/command/sdist.py b/command/sdist.py
index 5116868e76..1f9e9184d7 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -74,7 +74,7 @@ class sdist (Command):
     help_options = [
         ('help-formats', None,
          "list available distribution formats", show_formats),
-	]
+        ]
 
     negative_opt = {'no-defaults': 'use-defaults',
                     'no-prune': 'prune' }
diff --git a/dist.py b/dist.py
index 92d390f777..abbc160067 100644
--- a/dist.py
+++ b/dist.py
@@ -284,7 +284,7 @@ def find_config_files (self):
             user_filename = ".pydistutils.cfg"
         else:
             user_filename = "pydistutils.cfg"
-	
+
         # And look for the user config file
         if os.environ.has_key('HOME'):
             user_file = os.path.join(os.environ.get('HOME'), user_filename)
@@ -461,8 +461,8 @@ def _parse_command_opts (self, parser, args):
             negative_opt = copy(negative_opt)
             negative_opt.update(cmd_class.negative_opt)
 
-	# Check for help_options in command class.  They have a different
-	# format (tuple of four) so we need to preprocess them here.
+        # Check for help_options in command class.  They have a different
+        # format (tuple of four) so we need to preprocess them here.
         if (hasattr(cmd_class, 'help_options') and
             type(cmd_class.help_options) is ListType):
             help_options = fix_help_options(cmd_class.help_options)
@@ -487,7 +487,7 @@ def _parse_command_opts (self, parser, args):
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
                     help_option_found=1
-		    #print "showing help for option %s of command %s" % \
+                    #print "showing help for option %s of command %s" % \
                     #      (help_option[0],cmd_class)
 
                     if callable(func):
@@ -563,7 +563,7 @@ def _show_help (self,
         return
 
     # _show_help ()
-	
+
 
     def handle_display_options (self, option_order):
         """If there were any non-global "display-only" options

From ac94b8701f445c75e671f29ed64ea3b577a9b3a5 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 14 Oct 2000 04:07:39 +0000
Subject: [PATCH 0673/8469] Removed debugging code at bottom.

---
 util.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/util.py b/util.py
index 7522ee2499..dd9de854f9 100644
--- a/util.py
+++ b/util.py
@@ -427,11 +427,3 @@ def byte_compile (py_files,
                               (file, cfile_base)
 
 # byte_compile ()
-
-
-if __name__ == "__main__":
-    import glob
-    f = glob.glob("command/*.py")
-    byte_compile(f, optimize=0, prefix="command/", base_dir="/usr/lib/python")
-    #byte_compile(f, optimize=1)
-    #byte_compile(f, optimize=2)

From dc35143fa2af5382aa1428c9da4b140237bf9391 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sun, 15 Oct 2000 19:20:20 +0000
Subject: [PATCH 0674/8469] Bump version to 1.0.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2073617627..55951090ff 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0"
+__version__ = "1.0.1"

From f64d6b6db2fa6882b19b75d53156c4a541b53588 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Sat, 11 Nov 2000 02:47:11 +0000
Subject: [PATCH 0675/8469] Jack Jansen: added 'get_command_list()' method, and
 Mac-specific code to use it to generate a dialog for users to specify the
 command-line (because providing a command-line with MacPython is so awkward).

---
 dist.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/dist.py b/dist.py
index abbc160067..fe728c3b60 100644
--- a/dist.py
+++ b/dist.py
@@ -172,6 +172,12 @@ def __init__ (self, attrs=None):
         # operations, we just check the 'have_run' dictionary and carry on.
         # It's only safe to query 'have_run' for a command class that has
         # been instantiated -- a false value will be inserted when the
+        if sys.platform == 'mac':
+            import EasyDialogs
+            cmdlist = self.get_command_list()
+            self.script_args = EasyDialogs.GetArgv(
+                self.global_options + self.display_options, cmdlist)
+
         # command object is created, and replaced with a true value when
         # the command is successfully run.  Thus it's probably best to use
         # '.get()' rather than a straight lookup.
@@ -657,6 +663,38 @@ def print_commands (self):
 
     # print_commands ()
 
+    def get_command_list (self):
+        """Get a list of (command, description) tuples.
+        The list is divided into "standard commands" (listed in
+        distutils.command.__all__) and "extra commands" (mentioned in
+        self.cmdclass, but not a standard command).  The descriptions come
+        from the command class attribute 'description'.
+        """
+        # Currently this is only used on Mac OS, for the Mac-only GUI
+        # Distutils interface (by Jack Jansen)
+
+        import distutils.command
+        std_commands = distutils.command.__all__
+        is_std = {}
+        for cmd in std_commands:
+            is_std[cmd] = 1
+
+        extra_commands = []
+        for cmd in self.cmdclass.keys():
+            if not is_std.get(cmd):
+                extra_commands.append(cmd)
+
+        rv = []
+        for cmd in (std_commands + extra_commands):
+            klass = self.cmdclass.get(cmd)
+            if not klass:
+                klass = self.get_command_class(cmd)
+            try:
+                description = klass.description
+            except AttributeError:
+                description = "(no description available)"
+            rv.append((cmd, description))
+        return rv
 
     # -- Command class/object methods ----------------------------------
 

From 41f2923e4cb8e646dd04aea546f43752850c091b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 12 Dec 2000 23:11:42 +0000
Subject: [PATCH 0676/8469] Update the code to better reflect recommended
 style:

Use != instead of <> since <> is documented as "obsolescent".
Use "is" and "is not" when comparing with None or type objects.
---
 cygwinccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 5b06d3d79c..f40d1a2d4a 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -241,7 +241,7 @@ def link (self,
                 objects.append(def_file)
 
         #end: if ((export_symbols is not None) and
-        #        (target_desc <> self.EXECUTABLE or self.linker_dll == "gcc")):
+        #        (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
                                                  
         # who wants symbols and a many times larger output file
         # should explicitly switch the debug mode on 

From f749040280c9b9f4151fc1852e7d3ec524d2a1b4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 20 Dec 2000 00:48:12 +0000
Subject: [PATCH 0677/8469] Add forgotten initialization.  Fixes bug #120994,
 "Traceback with     DISTUTILS_DEBUG set"

---
 command/install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/install.py b/command/install.py
index 6aee1b35d9..806da01afa 100644
--- a/command/install.py
+++ b/command/install.py
@@ -146,6 +146,7 @@ def initialize_options (self):
         self.install_data = None
 
         self.compile = None
+        self.no_compile = None
         self.optimize = None
 
         # These two are for putting non-packagized distributions into their

From aa73c5a0fd86980d14bb7bfc07fb41189c2f58cb Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 9 Jan 2001 03:15:47 +0000
Subject: [PATCH 0678/8469] Check in patch #102971: if library_dirs is a
 string, split it using    os.pathsep

---
 command/build_ext.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 70e8a73455..936a5f633a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -149,6 +149,8 @@ def finalize_options (self):
             self.libraries = []
         if self.library_dirs is None:
             self.library_dirs = []
+        elif type(self.library_dirs) is StringType:
+            self.library_dirs = string.split(self.library_dirs, os.pathsep)
         if self.rpath is None:
             self.rpath = []
 

From abec99bc72e4002a5348f4a6822f7891bb4f4589 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 11 Jan 2001 15:35:16 +0000
Subject: [PATCH 0679/8469] Delete unused import of pprint module

---
 sysconfig.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 605e95dfb2..d57b915911 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -362,7 +362,6 @@ def get_config_vars(*args):
     """
     global _config_vars
     if _config_vars is None:
-        from pprint import pprint
         func = globals().get("_init_" + os.name)
         if func:
             func()

From 12123de064e383654dafdd825e35948ef01c2825 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 15 Jan 2001 16:09:35 +0000
Subject: [PATCH 0680/8469] Fix from Jack Jansen for the Mac and the Metrowerks
 compiler, posted to the Distutils-SIG and archived at
 http://mail.python.org/pipermail/distutils-sig/2000-November/001755.html

---
 ccompiler.py      |   3 +
 dist.py           |  16 ++--
 mwerkscompiler.py | 203 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 mwerkscompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index b10ee67e3c..53901b3362 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -838,6 +838,7 @@ def mkpath (self, name, mode=0777):
 # that platform.
 default_compiler = { 'posix': 'unix',
                      'nt': 'msvc',
+                     'mac': 'mwerks',
                    }
 
 # Map compiler types to (module_name, class_name) pairs -- ie. where to
@@ -853,6 +854,8 @@ def mkpath (self, name, mode=0777):
                                "Mingw32 port of GNU C Compiler for Win32"),
                    'bcpp':    ('bcppcompiler', 'BCPPCompiler',
                                "Borland C++ Compiler"),
+                   'mwerks':  ('mwerkscompiler', 'MWerksCompiler',
+                               "MetroWerks CodeWarrior"),
                  }
 
 def show_compilers():
diff --git a/dist.py b/dist.py
index fe728c3b60..41d5dbbc0b 100644
--- a/dist.py
+++ b/dist.py
@@ -172,12 +172,6 @@ def __init__ (self, attrs=None):
         # operations, we just check the 'have_run' dictionary and carry on.
         # It's only safe to query 'have_run' for a command class that has
         # been instantiated -- a false value will be inserted when the
-        if sys.platform == 'mac':
-            import EasyDialogs
-            cmdlist = self.get_command_list()
-            self.script_args = EasyDialogs.GetArgv(
-                self.global_options + self.display_options, cmdlist)
-
         # command object is created, and replaced with a true value when
         # the command is successfully run.  Thus it's probably best to use
         # '.get()' rather than a straight lookup.
@@ -375,6 +369,16 @@ def parse_command_line (self):
         execute commands (currently, this only happens if user asks for
         help).
         """
+        #
+        # We now have enough information to show the Macintosh dialog that allows
+        # the user to interactively specify the "command line".
+        #
+        if sys.platform == 'mac':
+            import EasyDialogs
+            cmdlist = self.get_command_list()
+            self.script_args = EasyDialogs.GetArgv(
+                self.global_options + self.display_options, cmdlist)
+ 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
         # because each command will be handled by a different class, and
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
new file mode 100644
index 0000000000..2edc8259bf
--- /dev/null
+++ b/mwerkscompiler.py
@@ -0,0 +1,203 @@
+"""distutils.mwerkscompiler
+
+Contains MWerksCompiler, an implementation of the abstract CCompiler class
+for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
+Windows."""
+
+import sys, os, string
+from types import *
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
+     CompileError, LibError, LinkError
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
+import distutils.util
+import distutils.dir_util
+import mkcwproject
+
+class MWerksCompiler (CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
+
+    compiler_type = 'mwerks'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.r']
+    _exp_extension = '.exp'
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions)
+    res_extension = '.rsrc'
+    obj_extension = '.obj' # Not used, really
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.slb'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = ''
+
+
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
+
+        CCompiler.__init__ (self, verbose, dry_run, force)
+        
+        
+    def compile (self,
+                 sources,
+                 output_dir=None,
+                 macros=None,
+                 include_dirs=None,
+                 debug=0,
+                 extra_preargs=None,
+                 extra_postargs=None):
+         self.__sources = sources
+         self.__macros = macros
+         self.__include_dirs = include_dirs
+         # Don't need extra_preargs and extra_postargs for CW
+         
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
+        # First examine a couple of options for things that aren't implemented yet
+        if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
+            raise DistutilsPlatformError, 'Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac'
+        if runtime_library_dirs:
+            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
+        if extra_preargs or extra_postargs:
+            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
+        if len(export_symbols) != 1:
+            raise DistutilsPlatformError, 'Need exactly one export symbol'
+        # Next there are various things for which we need absolute pathnames.
+        # This is because we (usually) create the project in a subdirectory of
+        # where we are now, and keeping the paths relative is too much work right
+        # now.
+        sources = map(self._filename_to_abs, self.__sources)
+        include_dirs = map(self._filename_to_abs, self.__include_dirs)
+        if objects:
+            objects = map(self._filename_to_abs, objects)
+        else:
+            objects = []
+        if build_temp:
+            build_temp = self._filename_to_abs(build_temp)
+        else:
+            build_temp = os.curdir()
+        if output_dir:
+            output_filename = os.path.join(output_dir, output_filename)
+        # The output filename needs special handling: splitting it into dir and
+        # filename part. Actually I'm not sure this is really needed, but it
+        # can't hurt.
+        output_filename = self._filename_to_abs(output_filename)
+        output_dir, output_filename = os.path.split(output_filename)
+        # Now we need the short names of a couple of things for putting them
+        # into the project.
+        if output_filename[-8:] == '.ppc.slb':
+            basename = output_filename[:-8]
+        else:
+            basename = os.path.strip(output_filename)[0]
+        projectname = basename + '.mcp'
+        targetname = basename
+        xmlname = basename + '.xml'
+        exportname = basename + '.mcp.exp'
+        prefixname = 'mwerks_%s_config.h'%basename
+        # Create the directories we need
+        distutils.dir_util.mkpath(build_temp, self.verbose, self.dry_run)
+        distutils.dir_util.mkpath(output_dir, self.verbose, self.dry_run)
+        # And on to filling in the parameters for the project builder
+        settings = {}
+        settings['mac_exportname'] = exportname
+        settings['mac_outputdir'] = output_dir
+        settings['mac_dllname'] = output_filename
+        settings['mac_targetname'] = targetname
+        settings['sysprefix'] = sys.prefix
+        settings['mac_sysprefixtype'] = 'Absolute'
+        sourcefilenames = []
+        sourcefiledirs = []
+        for filename in sources + objects:
+            dirname, filename = os.path.split(filename)
+            sourcefilenames.append(filename)
+            if not dirname in sourcefiledirs:
+                sourcefiledirs.append(dirname)
+        settings['sources'] = sourcefilenames
+        settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
+        if self.dry_run:
+            print 'CALLING LINKER IN', os.getcwd()
+            for key, value in settings.items():
+                print '%20.20s %s'%(key, value)
+            return
+        # Build the export file
+        exportfilename = os.path.join(build_temp, exportname)
+        if self.verbose:
+            print '\tCreate export file', exportfilename
+        fp = open(exportfilename, 'w')
+        fp.write('%s\n'%export_symbols[0])
+        fp.close()
+        # Generate the prefix file, if needed, and put it in the settings
+        if self.__macros:
+            prefixfilename = os.path.join(os.getcwd(), os.path.join(build_temp, prefixname))
+            fp = open(prefixfilename, 'w')
+            fp.write('#include "mwerks_plugin_config.h"\n')
+            for name, value in self.__macros:
+                if value is None:
+                    fp.write('#define %s\n'%name)
+                else:
+                    fp.write('#define %s "%s"\n'%(name, value))
+            fp.close()
+            settings['prefixname'] = prefixname
+
+        # Build the XML file. We need the full pathname (only lateron, really)
+        # because we pass this pathname to CodeWarrior in an AppleEvent, and CW
+        # doesn't have a clue about our working directory.
+        xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
+        if self.verbose:
+            print '\tCreate XML file', xmlfilename
+        xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
+        xmlbuilder.generate()
+        xmldata = settings['tmp_projectxmldata']
+        fp = open(xmlfilename, 'w')
+        fp.write(xmldata)
+        fp.close()
+        # Generate the project. Again a full pathname.
+        projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
+        if self.verbose:
+            print '\tCreate project file', projectfilename
+        mkcwproject.makeproject(xmlfilename, projectfilename)
+        # And build it
+        if self.verbose:
+            print '\tBuild project'
+        mkcwproject.buildproject(projectfilename)
+        
+    def _filename_to_abs(self, filename):
+        # Some filenames seem to be unix-like. Convert to Mac names.
+##        if '/' in filename and ':' in filename:
+##           raise DistutilsPlatformError, 'Filename may be Unix or Mac style: %s'%filename
+##        if '/' in filename:
+##           filename = macurl2path(filename)
+        filename = distutils.util.convert_path(filename)
+        if not os.path.isabs(filename):
+           curdir = os.getcwd()
+           filename = os.path.join(curdir, filename)
+        return filename
+        
+        

From cacfb4f1472c9b83df8d0b1799834f9f5e322e47 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 16 Jan 2001 03:10:43 +0000
Subject: [PATCH 0681/8469] Add strip_dir argument to the single call to
 .object_filenames(), to     prevent creating files such as
 build/lib.whatever/Modules/foo.o     when given a source filename such as
 Modules/foo.c.

---
 ccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ccompiler.py b/ccompiler.py
index 53901b3362..5e0b328042 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -366,6 +366,7 @@ def _prep_compile (self, sources, output_dir):
         """
         # Get the list of expected output (object) files 
         objects = self.object_filenames (sources,
+                                         strip_dir=1,
                                          output_dir=output_dir)
 
         if self.force:

From 3f4a8e719b6611b77347bb1f8970b5a0141bd400 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 16 Jan 2001 16:16:03 +0000
Subject: [PATCH 0682/8469] Modified version of a patch from Jeremy Kloth, to
 make .get_outputs() produce a list of unique filenames:     "While attempting
 to build an RPM using distutils on Python 2.0,     rpm complained about
 duplicate files.  The following patch fixed     that problem.

---
 command/install.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 806da01afa..40e00705d3 100644
--- a/command/install.py
+++ b/command/install.py
@@ -530,7 +530,11 @@ def get_outputs (self):
         outputs = []
         for cmd_name in self.get_sub_commands():
             cmd = self.get_finalized_command(cmd_name)
-            outputs.extend(cmd.get_outputs())
+            # Add the contents of cmd.get_outputs(), ensuring
+            # that outputs doesn't contain duplicate entries
+            for filename in cmd.get_outputs():
+                if filename not in outputs:
+                    outputs.append(filename)
 
         return outputs
 

From e26cdf35269dc6e049dd19c5b39bd312cddeb81a Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 16 Jan 2001 16:33:28 +0000
Subject: [PATCH 0683/8469] Fix bugs with integer-valued variables when parsing
 Makefiles.  Values for done[n] can be integers as well as strings, but the
 code concatenates them with strings (fixed by adding a str()) and calls
 string.strip() on them (fixed by rearranging the logic)

(Presumably this wasn't noticed previously because parse_makefile()
was only called on Modules/Makefile, which contains no integer-valued
variables.)
---
 sysconfig.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d57b915911..4da376898c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -204,13 +204,15 @@ def parse_makefile(fn, g=None):
                 n = m.group(1)
                 if done.has_key(n):
                     after = value[m.end():]
-                    value = value[:m.start()] + done[n] + after
+                    value = value[:m.start()] + str(done[n]) + after
                     if "$" in after:
                         notdone[name] = value
                     else:
                         try: value = string.atoi(value)
-                        except ValueError: pass
-                        done[name] = string.strip(value)
+                        except ValueError:
+                            done[name] = string.strip(value)
+                        else:
+                            done[name] = value
                         del notdone[name]
                 elif notdone.has_key(n):
                     # get it on a subsequent round
@@ -223,8 +225,10 @@ def parse_makefile(fn, g=None):
                         notdone[name] = value
                     else:
                         try: value = string.atoi(value)
-                        except ValueError: pass
-                        done[name] = string.strip(value)
+                        except ValueError:
+                            done[name] = string.strip(value)
+                        else:
+                            done[name] = value
                         del notdone[name]
             else:
                 # bogus variable reference; just drop it since we can't deal

From 6aef8efc56535f695fdbbddcb651bf715bfbc79e Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 17 Jan 2001 15:16:52 +0000
Subject: [PATCH 0684/8469] Patch #103279: sysconfig.py always looks for
 versions of files in sys.prefix + 'config/Makefile'. When building Python for
 the first time, these files aren't there, so the files from the build tree
 have to be used instead; this file adds an entry point for specifying that
 the build tree files should be used.  (Perhaps 'set_python_build' should
 should be preceded with an underscore?)

---
 sysconfig.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 4da376898c..3ae0a5f91d 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -19,6 +19,19 @@
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
+# Boolean; if it's true, we're still building Python, so
+# we use different (hard-wired) directories.
+
+python_build = 0
+
+def set_python_build():
+    """Set the python_build flag to true; this means that we're
+    building Python itself.  Only called from the setup.py script
+    shipped with Python.
+    """
+    
+    global python_build
+    python_build = 1
 
 def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
@@ -34,6 +47,8 @@ def get_python_inc(plat_specific=0, prefix=None):
     if prefix is None:
         prefix = (plat_specific and EXEC_PREFIX or PREFIX)
     if os.name == "posix":
+        if python_build:
+            return "Include/"
         return os.path.join(prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
         return os.path.join(prefix, "Include") # include or Include?
@@ -119,12 +134,15 @@ def customize_compiler (compiler):
 
 def get_config_h_filename():
     """Return full pathname of installed config.h file."""
-    inc_dir = get_python_inc(plat_specific=1)
+    if python_build: inc_dir = '.'
+    else:            inc_dir = get_python_inc(plat_specific=1)
     return os.path.join(inc_dir, "config.h")
 
 
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
+    if python_build:
+        return './Modules/Makefile'
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 

From dd5ccc0082a1bf655dd242d3881620cd88f0d980 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 19 Jan 2001 16:26:12 +0000
Subject: [PATCH 0685/8469] Patch #103220 from Jason Tishler:   This patch adds
 support for Cygwin to util.get_platform(). A Cygwin   specific case is needed
 due to the format of Cygwin's uname command,   which contains '/' characters.

---
 util.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/util.py b/util.py
index dd9de854f9..80e4814389 100644
--- a/util.py
+++ b/util.py
@@ -54,6 +54,11 @@ def get_platform ():
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)
+    elif osname[:6] == "cygwin":
+        rel_re = re.compile (r'[\d.]+')
+        m = rel_re.match(release)
+        if m:
+            release = m.group()
             
     return "%s-%s-%s" % (osname, release, machine)
 

From 86f47bdacaf41dd4535e115c74162bfcfb87f267 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 24 Jan 2001 15:43:09 +0000
Subject: [PATCH 0686/8469] Part of patch #102409: special cases for Cygwin:   
  Lib/distutils/command/build_ext.py(build_ext.finalize_options): Add    
 Cygwin specific code to append Python's library directory to the    
 extension's list of library directories.

    (build_ext.get_libraries): Add Cygwin specific code to append Python's
    (import) library to the extension's list of libraries.
---
 command/build_ext.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 936a5f633a..2876c3593f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -163,6 +163,17 @@ def finalize_options (self):
                 self.build_temp = os.path.join(self.build_temp, "Debug")
             else:
                 self.build_temp = os.path.join(self.build_temp, "Release")
+
+        # for extensions under Cygwin Python's library directory must be
+        # appended to library_dirs
+        if sys.platform[:6] == 'cygwin':
+            if string.find(sys.executable, sys.exec_prefix) != -1:
+                # building third party extensions
+                self.library_dirs.append(os.path.join(sys.prefix, "lib", "python" + sys.version[:3], "config"))
+            else:
+                # building python standard extensions
+                self.library_dirs.append('.')
+
     # finalize_options ()
     
 
@@ -576,6 +587,13 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
+        elif sys.platform[:6] == "cygwin":
+            template = "python%d.%d"
+            pythonlib = (template %
+                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+            # don't extend ext.libraries, it may be shared with other
+            # extensions, it is a reference to the original list
+            return ext.libraries + [pythonlib]
         else:
             return ext.libraries
 

From 11b83157df263f7aa40e1d42536200ee07a34b32 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Wed, 24 Jan 2001 17:17:20 +0000
Subject: [PATCH 0687/8469] There is no more Modules/Makefile, use toplevel
 Makefile.

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3ae0a5f91d..ae9b37f3a1 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -142,7 +142,7 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return './Modules/Makefile'
+        return './Makefile'
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 

From 5634233ca85a0f27b1feca9ccf899b688c276cbf Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 25 Jan 2001 20:10:32 +0000
Subject: [PATCH 0688/8469] In subst_vars(), change the name of the argument
 from str to s to prevent binding for str from masking use of builtin str in
 nested function.

(This is the only case I found in the standard library where a local
shadows a global or builtin.  There may be others, but the regression
test doesn't catch them.)
---
 util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 80e4814389..550d94abb6 100644
--- a/util.py
+++ b/util.py
@@ -142,7 +142,7 @@ def check_environ ():
     _environ_checked = 1
 
 
-def subst_vars (str, local_vars):
+def subst_vars (s, local_vars):
     """Perform shell/Perl-style variable substitution on 'string'.  Every
     occurrence of '$' followed by a name is considered a variable, and
     variable is substituted by the value found in the 'local_vars'
@@ -160,7 +160,7 @@ def _subst (match, local_vars=local_vars):
             return os.environ[var_name]
 
     try:
-        return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
+        return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
     except KeyError, var:
         raise ValueError, "invalid variable '$%s'" % var
 

From 0cb7c3124d31ecef94db04ea71eb2d7b38a54ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Fri, 26 Jan 2001 18:00:48 +0000
Subject: [PATCH 0689/8469] Added an execution layer to be able to customize
 per-extension building.

---
 command/build_ext.py | 183 ++++++++++++++++++++++---------------------
 1 file changed, 92 insertions(+), 91 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2876c3593f..8f59523935 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -356,104 +356,105 @@ def get_outputs (self):
 
     # get_outputs ()
 
-
-    def build_extensions (self):
+    def build_extensions(self):
 
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
 
         for ext in self.extensions:
-            sources = ext.sources
-            if sources is None or type(sources) not in (ListType, TupleType):
-                raise DistutilsSetupError, \
-                      ("in 'ext_modules' option (extension '%s'), " +
-                       "'sources' must be present and must be " +
-                       "a list of source filenames") % ext.name
-            sources = list(sources)
+            self.build_extension(ext)
 
-            fullname = self.get_ext_fullname(ext.name)
-            if self.inplace:
-                # ignore build-lib -- put the compiled extension into
-                # the source tree along with pure Python modules
-
-                modpath = string.split(fullname, '.')
-                package = string.join(modpath[0:-1], '.')
-                base = modpath[-1]
-
-                build_py = self.get_finalized_command('build_py')
-                package_dir = build_py.get_package_dir(package)
-                ext_filename = os.path.join(package_dir,
-                                            self.get_ext_filename(base))
-            else:
-                ext_filename = os.path.join(self.build_lib,
-                                            self.get_ext_filename(fullname))
+    def build_extension(self, ext):
 
-            if not (self.force or newer_group(sources, ext_filename, 'newer')):
-                self.announce("skipping '%s' extension (up-to-date)" %
-                              ext.name)
-                continue # 'for' loop over all extensions
-            else:
-                self.announce("building '%s' extension" % ext.name)
-
-            # First, scan the sources for SWIG definition files (.i), run
-            # SWIG on 'em to create .c files, and modify the sources list
-            # accordingly.
-            sources = self.swig_sources(sources)
-
-            # Next, compile the source code to object files.
-
-            # XXX not honouring 'define_macros' or 'undef_macros' -- the
-            # CCompiler API needs to change to accommodate this, and I
-            # want to do one thing at a time!
-
-            # Two possible sources for extra compiler arguments:
-            #   - 'extra_compile_args' in Extension object
-            #   - CFLAGS environment variable (not particularly
-            #     elegant, but people seem to expect it and I
-            #     guess it's useful)
-            # The environment variable should take precedence, and
-            # any sensible compiler will give precedence to later
-            # command line args.  Hence we combine them in order:
-            extra_args = ext.extra_compile_args or []
-
-            macros = ext.define_macros[:]
-            for undef in ext.undef_macros:
-                macros.append((undef,))
-
-            # XXX and if we support CFLAGS, why not CC (compiler
-            # executable), CPPFLAGS (pre-processor options), and LDFLAGS
-            # (linker options) too?
-            # XXX should we use shlex to properly parse CFLAGS?
-
-            if os.environ.has_key('CFLAGS'):
-                extra_args.extend(string.split(os.environ['CFLAGS']))
-                
-            objects = self.compiler.compile(sources,
-                                            output_dir=self.build_temp,
-                                            macros=macros,
-                                            include_dirs=ext.include_dirs,
-                                            debug=self.debug,
-                                            extra_postargs=extra_args)
-
-            # Now link the object files together into a "shared object" --
-            # of course, first we have to figure out all the other things
-            # that go into the mix.
-            if ext.extra_objects:
-                objects.extend(ext.extra_objects)
-            extra_args = ext.extra_link_args or []
-
-
-            self.compiler.link_shared_object(
-                objects, ext_filename, 
-                libraries=self.get_libraries(ext),
-                library_dirs=ext.library_dirs,
-                runtime_library_dirs=ext.runtime_library_dirs,
-                extra_postargs=extra_args,
-                export_symbols=self.get_export_symbols(ext), 
-                debug=self.debug,
-                build_temp=self.build_temp)
-
-    # build_extensions ()
+        sources = ext.sources
+        if sources is None or type(sources) not in (ListType, TupleType):
+            raise DistutilsSetupError, \
+                  ("in 'ext_modules' option (extension '%s'), " +
+                   "'sources' must be present and must be " +
+                   "a list of source filenames") % ext.name
+        sources = list(sources)
+
+        fullname = self.get_ext_fullname(ext.name)
+        if self.inplace:
+            # ignore build-lib -- put the compiled extension into
+            # the source tree along with pure Python modules
+
+            modpath = string.split(fullname, '.')
+            package = string.join(modpath[0:-1], '.')
+            base = modpath[-1]
+
+            build_py = self.get_finalized_command('build_py')
+            package_dir = build_py.get_package_dir(package)
+            ext_filename = os.path.join(package_dir,
+                                        self.get_ext_filename(base))
+        else:
+            ext_filename = os.path.join(self.build_lib,
+                                        self.get_ext_filename(fullname))
+
+        if not (self.force or newer_group(sources, ext_filename, 'newer')):
+            self.announce("skipping '%s' extension (up-to-date)" %
+                          ext.name)
+            return
+        else:
+            self.announce("building '%s' extension" % ext.name)
+
+        # First, scan the sources for SWIG definition files (.i), run
+        # SWIG on 'em to create .c files, and modify the sources list
+        # accordingly.
+        sources = self.swig_sources(sources)
+
+        # Next, compile the source code to object files.
+
+        # XXX not honouring 'define_macros' or 'undef_macros' -- the
+        # CCompiler API needs to change to accommodate this, and I
+        # want to do one thing at a time!
+
+        # Two possible sources for extra compiler arguments:
+        #   - 'extra_compile_args' in Extension object
+        #   - CFLAGS environment variable (not particularly
+        #     elegant, but people seem to expect it and I
+        #     guess it's useful)
+        # The environment variable should take precedence, and
+        # any sensible compiler will give precedence to later
+        # command line args.  Hence we combine them in order:
+        extra_args = ext.extra_compile_args or []
+
+        macros = ext.define_macros[:]
+        for undef in ext.undef_macros:
+            macros.append((undef,))
+
+        # XXX and if we support CFLAGS, why not CC (compiler
+        # executable), CPPFLAGS (pre-processor options), and LDFLAGS
+        # (linker options) too?
+        # XXX should we use shlex to properly parse CFLAGS?
+
+        if os.environ.has_key('CFLAGS'):
+            extra_args.extend(string.split(os.environ['CFLAGS']))
+
+        objects = self.compiler.compile(sources,
+                                        output_dir=self.build_temp,
+                                        macros=macros,
+                                        include_dirs=ext.include_dirs,
+                                        debug=self.debug,
+                                        extra_postargs=extra_args)
+
+        # Now link the object files together into a "shared object" --
+        # of course, first we have to figure out all the other things
+        # that go into the mix.
+        if ext.extra_objects:
+            objects.extend(ext.extra_objects)
+        extra_args = ext.extra_link_args or []
+
+
+        self.compiler.link_shared_object(
+            objects, ext_filename, 
+            libraries=self.get_libraries(ext),
+            library_dirs=ext.library_dirs,
+            runtime_library_dirs=ext.runtime_library_dirs,
+            extra_postargs=extra_args,
+            export_symbols=self.get_export_symbols(ext), 
+            debug=self.debug,
+            build_temp=self.build_temp)
 
 
     def swig_sources (self, sources):

From a2946a75cbbeb464dbe57bba2a67327381da73ac Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 28 Jan 2001 12:22:14 +0000
Subject: [PATCH 0690/8469] Data pathnames were not converted from URL-style to
 local style. Fixed.

---
 command/install_data.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index dba108af14..503c1aa8ac 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -10,7 +10,7 @@
 import os
 from types import StringType
 from distutils.core import Command
-from distutils.util import change_root
+from distutils.util import change_root, convert_path
 
 class install_data (Command):
 
@@ -48,6 +48,7 @@ def run (self):
         for f in self.data_files:
             if type(f) == StringType:
                 # it's a simple file, so copy it
+                f = convert_path(f)
                 if self.warn_dir:
                     self.warn("setup script did not provide a directory for "
                               "'%s' -- installing right in '%s'" %
@@ -56,13 +57,14 @@ def run (self):
                 self.outfiles.append(out)
             else:
                 # it's a tuple with path to install to and a list of files
-                dir = f[0]
+                dir = convert_path(f[0])
                 if not os.path.isabs(dir):
                     dir = os.path.join(self.install_dir, dir)
                 elif self.root:
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
+                    data = convert_path(f[1])
                     (out, _) = self.copy_file(data, dir)
                     self.outfiles.append(out)
 

From d14a7b0d085ee7397a87141e7cd2ea0503def6b8 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 28 Jan 2001 12:23:32 +0000
Subject: [PATCH 0691/8469] Remove single "." components from pathnames, and
 return os.curdir if the resulting path is empty.

---
 util.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/util.py b/util.py
index 550d94abb6..d4891b3c2a 100644
--- a/util.py
+++ b/util.py
@@ -82,6 +82,10 @@ def convert_path (pathname):
         raise ValueError, "path '%s' cannot end with '/'" % pathname
 
     paths = string.split(pathname, '/')
+    while '.' in paths:
+        paths.remove('.')
+    if not paths:
+        return os.curdir
     return apply(os.path.join, paths)
 
 # convert_path ()

From 2b9227d208d3f9196b66758a601352a58ae4253f Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 31 Jan 2001 20:07:17 +0000
Subject: [PATCH 0692/8469] move "from stat import *" to module level

---
 file_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/file_util.py b/file_util.py
index a9e12ce3f3..39f6eea289 100644
--- a/file_util.py
+++ b/file_util.py
@@ -8,6 +8,7 @@
 __revision__ = "$Id$"
 
 import os
+from stat import *
 from distutils.errors import DistutilsFileError
 
 
@@ -106,7 +107,6 @@ def copy_file (src, dst,
     # changing it (ie. it's not already a hard/soft link to src OR
     # (not update) and (src newer than dst).
 
-    from stat import *
     from distutils.dep_util import newer
 
     if not os.path.isfile(src):

From b0762d40180e6930b7f5fa403e7c1084c1f598da Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 5 Feb 2001 17:43:11 +0000
Subject: [PATCH 0693/8469] Patch #103587: Fix typo that broke the install_data
 command; caught by    Uche Ogbuji

---
 command/install_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_data.py b/command/install_data.py
index 503c1aa8ac..28f593866c 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -64,7 +64,7 @@ def run (self):
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
-                    data = convert_path(f[1])
+                    data = convert_path(data)
                     (out, _) = self.copy_file(data, dir)
                     self.outfiles.append(out)
 

From 6b6d7c364eec3b44b99f1f1b5a41be2920183783 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 9 Feb 2001 11:14:08 +0000
Subject: [PATCH 0694/8469] String method conversion. (This one was trivial --
 no actual string. references in it!)

---
 bcppcompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index bb9557fbb3..00ccec548b 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -14,7 +14,7 @@
 __revision__ = "$Id$"
 
 
-import sys, os, string
+import sys, os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError

From 877b037a3e40bfb3285be20db1d161ca44b1e8db Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 9 Feb 2001 11:51:27 +0000
Subject: [PATCH 0695/8469] String method conversion.

---
 cmd.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd.py b/cmd.py
index ce44829498..cec4bff237 100644
--- a/cmd.py
+++ b/cmd.py
@@ -9,7 +9,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from types import *
 from distutils.errors import *
 from distutils import util, dir_util, file_util, archive_util, dep_util
@@ -161,7 +161,7 @@ def dump_options (self, header=None, indent=""):
         print indent + header
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = string.translate(option, longopt_xlate)
+            option = option.translate(longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
@@ -421,7 +421,7 @@ def make_file (self, infiles, outfile, func, args,
         """
         if exec_msg is None:
             exec_msg = "generating %s from %s" % \
-                       (outfile, string.join(infiles, ', '))
+                       (outfile, ', '.join(infiles))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
         

From 31bfd423882c406175d12a99256a75411487bb93 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 9 Feb 2001 12:20:51 +0000
Subject: [PATCH 0696/8469] String method conversion.

---
 cygwinccompiler.py |  6 +++---
 extension.py       |  4 ++--
 version.py         | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index f40d1a2d4a..42318ad3d4 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -365,10 +365,10 @@ def check_config_h():
     # "config.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string,sys
+    import sys
     # if sys.version contains GCC then python was compiled with
     # GCC, and the config.h file should be OK
-    if string.find(sys.version,"GCC") >= 0:
+    if sys.version.find("GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
     fn = sysconfig.get_config_h_filename()
@@ -387,7 +387,7 @@ def check_config_h():
 
     else:
         # "config.h" contains an "#ifdef __GNUC__" or something similar
-        if string.find(s,"__GNUC__") >= 0:
+        if s.find("__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
             return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
diff --git a/extension.py b/extension.py
index a63ede233c..f49abad003 100644
--- a/extension.py
+++ b/extension.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 
 
@@ -168,7 +168,7 @@ def read_setup_file (filename):
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = string.find(value, "=")
+                equals = value.find("=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"
diff --git a/version.py b/version.py
index 9d3d172429..2916eb79a1 100644
--- a/version.py
+++ b/version.py
@@ -112,12 +112,12 @@ def parse (self, vstring):
             match.group(1, 2, 4, 5, 6)
 
         if patch:
-            self.version = tuple(map(string.atoi, [major, minor, patch]))
+            self.version = tuple(map(int, [major, minor, patch]))
         else:
-            self.version = tuple(map(string.atoi, [major, minor]) + [0])
+            self.version = tuple(map(int, [major, minor]) + [0])
 
         if prerelease:
-            self.prerelease = (prerelease[0], string.atoi(prerelease_num))
+            self.prerelease = (prerelease[0], int(prerelease_num))
         else:
             self.prerelease = None
 
@@ -125,9 +125,9 @@ def parse (self, vstring):
     def __str__ (self):
         
         if self.version[2] == 0:
-            vstring = string.join(map(str, self.version[0:2]), '.')
+            vstring = '.'.join(map(str, self.version[0:2]))
         else:
-            vstring = string.join(map(str, self.version), '.')
+            vstring = '.'.join(map(str, self.version))
 
         if self.prerelease:
             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])

From e5fb9e92092d08b97107b3ae88108bc404a00bdb Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Fri, 16 Feb 2001 03:31:13 +0000
Subject: [PATCH 0697/8469] Linking just got simpiler on AIX and BeOS (closes
 SF patch #103679).

---
 sysconfig.py | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index ae9b37f3a1..2b0bce33e9 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -305,31 +305,8 @@ def _init_posix():
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.
-    if sys.platform == 'aix4':          # what about AIX 3.x ?
-        # Linker script is in the config directory, not in Modules as the
-        # Makefile says.
-        python_lib = get_python_lib(standard_lib=1)
-        ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-        python_exp = os.path.join(python_lib, 'config', 'python.exp')
-
-        g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
-
-    elif sys.platform == 'beos':
-
-        # Linker script is in the config directory.  In the Makefile it is
-        # relative to the srcdir, which after installation no longer makes
-        # sense.
-        python_lib = get_python_lib(standard_lib=1)
-        linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
-        linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
-
-        # XXX this isn't the right place to do this: adding the Python
-        # library to the link, if needed, should be in the "build_ext"
-        # command.  (It's also needed for non-MS compilers on Windows, and
-        # it's taken care of for them by the 'build_ext.get_libraries()'
-        # method.)
-        g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                         (linkerscript, PREFIX, sys.version[0:3]))
+    if python_build:
+	g['LDSHARED'] = g['BLDSHARED']
 
     global _config_vars
     _config_vars = g

From abba167c662eed5cea8b58a24df09483eac2fd96 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 17 Feb 2001 04:48:41 +0000
Subject: [PATCH 0698/8469] Split the rpath argument into multiple paths,
 turning it into a list.     This partially fixes bug #128930.

---
 command/build_ext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8f59523935..14cfebf720 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -151,8 +151,11 @@ def finalize_options (self):
             self.library_dirs = []
         elif type(self.library_dirs) is StringType:
             self.library_dirs = string.split(self.library_dirs, os.pathsep)
+
         if self.rpath is None:
             self.rpath = []
+        elif type(self.rpath) is StringType:
+            self.rpath = string.split(self.rpath, os.pathsep)
 
         # for extensions under windows use different directories
         # for Release and Debug builds.

From 7122d9720a99b46bb0f52a89f2e24375d21514f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Mon, 19 Feb 2001 09:20:04 +0000
Subject: [PATCH 0699/8469] This patch makes the default compiler determination
 more flexible and also takes the sys.platform name into account. This helps
 on platforms where there are multiple possible compiler backends (the one
 with which Python itself was compiled is preferred over others in this case).

The patch uses this new technique to enable using cygwin compiler
per default for cygwin compiled Pythons.

Written by Marc-Andre Lemburg. Copyright assigned to Guido van Rossum.
---
 ccompiler.py | 48 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 5e0b328042..0a30640fe2 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import sys, os, re
 from types import *
 from copy import copy
 from distutils.errors import *
@@ -835,12 +835,44 @@ def mkpath (self, name, mode=0777):
 # class CCompiler
 
 
-# Map a platform ('posix', 'nt') to the default compiler type for
-# that platform.
-default_compiler = { 'posix': 'unix',
-                     'nt': 'msvc',
-                     'mac': 'mwerks',
-                   }
+# Map a sys.platform/os.name ('posix', 'nt') to the default compiler
+# type for that platform. Keys are interpreted as re match
+# patterns. Order is important; platform mappings are preferred over
+# OS names.
+_default_compilers = (
+
+    # Platform string mappings
+    ('cygwin.*', 'cygwin'),
+    
+    # OS name mappings
+    ('posix', 'unix'),
+    ('nt', 'msvc'),
+    ('mac', 'mwerks'),
+    
+    )
+
+def get_default_compiler(osname=None, platform=None):
+
+    """ Determine the default compiler to use for the given platform.
+
+        osname should be one of the standard Python OS names (i.e. the
+        ones returned by os.name) and platform the common value
+        returned by sys.platform for the platform in question.
+
+        The default values are os.name and sys.platform in case the
+        parameters are not given.
+
+    """
+    if osname is None:
+        osname = os.name
+    if platform is None:
+        platform = sys.platform
+    for pattern, compiler in _default_compilers:
+        if re.match(pattern, platform) is not None or \
+           re.match(pattern, osname) is not None:
+            return compiler
+    # Default to Unix compiler
+    return 'unix'
 
 # Map compiler types to (module_name, class_name) pairs -- ie. where to
 # find the code that implements an interface to this compiler.  (The module
@@ -896,7 +928,7 @@ def new_compiler (plat=None,
 
     try:
         if compiler is None:
-            compiler = default_compiler[plat]
+            compiler = get_default_compiler(plat)
         
         (module_name, class_name, long_description) = compiler_class[compiler]
     except KeyError:

From a8b3af8796b6d404864ae381ffb958e46632d836 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 19 Feb 2001 09:20:30 +0000
Subject: [PATCH 0700/8469] Enhancements to the bdist_wininst command: --bitmap
 command line option allows to use a different bitmap file instead of the
 build-in python powered logo. --title lets you specify the text to display on
 the background.

The editbox in the first screen now longer is
selected (highlighted), it had the WS_TABSTOP flag.

This is the patch
http://sourceforge.net/patch/?func=detailpatch&patch_id=103687&group_id=5470
with two changes:
1. No messagebox displayed when the compilation to .pyc or .pyo files
failes, this will only confuse the user (and it will fail under certain
cases, where sys.path contains garbage).
2. A debugging print statement was removed from bdist_wininst.py.
---
 command/bdist_wininst.py | 547 ++++++++++++++++++++-------------------
 1 file changed, 282 insertions(+), 265 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b45089b724..e3964b6b4b 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -32,6 +32,10 @@ class bdist_wininst (Command):
                      "on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
+                    ('bitmap=', 'b',
+                     "bitmap to use for the installer instead of python-powered logo"),
+                    ('title=', 't',
+                     "title to display on the installer background instead of default"),
                    ]
 
     boolean_options = ['keep-temp']
@@ -43,6 +47,8 @@ def initialize_options (self):
         self.no_target_optimize = 0
         self.target_version = None
         self.dist_dir = None
+        self.bitmap = None
+        self.title = None
 
     # initialize_options()
 
@@ -117,7 +123,7 @@ def run (self):
                       ("'%s' not included in install_lib" % key)
         arcname = self.make_archive(archive_basename, "zip",
                                     root_dir=root_dir)
-        self.create_exe(arcname, fullname)
+        self.create_exe(arcname, fullname, self.bitmap)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, self.verbose, self.dry_run)
@@ -156,7 +162,7 @@ def get_inidata (self):
         if self.target_version:
             lines.append("target_version=%s" % self.target_version)
 
-        title = self.distribution.get_fullname()
+        title = self.title or self.distribution.get_fullname()
         lines.append("title=%s" % repr(title)[1:-1])
         import time
         import distutils
@@ -167,7 +173,7 @@ def get_inidata (self):
 
     # get_inidata()
 
-    def create_exe (self, arcname, fullname):
+    def create_exe (self, arcname, fullname, bitmap=None):
         import struct
 
         self.mkpath(self.dist_dir)
@@ -185,12 +191,23 @@ def create_exe (self, arcname, fullname):
                                           "%s.win32.exe" % fullname)
         self.announce("creating %s" % installer_name)
 
+        if bitmap:
+            bitmapdata = open(bitmap, "rb").read()
+            bitmaplen = len(bitmapdata)
+        else:
+            bitmaplen = 0
+
         file = open(installer_name, "wb")
         file.write(self.get_exe_bytes())
+        if bitmap:
+            file.write(bitmapdata)
+            
         file.write(cfgdata)
-        header = struct.pack("<ii",
-                             0x12345679,       # tag
-                             len(cfgdata))     # length
+        header = struct.pack("<iii",
+                             0x1234567A,       # tag
+                             len(cfgdata),     # length
+                             bitmaplen,        # number of bytes in bitmap
+                             )
         file.write(header)
         file.write(open(arcname, "rb").read())
 
@@ -217,271 +234,271 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
@@ -497,7 +514,7 @@ def get_exe_bytes (self):
 AAAAAAAAlOIAAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkz
 Mi5kbGwATVNWQ1JULmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdldFByb2NBZGRyZXNz
 AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABl
-eGl0AABFbmRQYWludAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+eGl0AABHZXREQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

From 956316c8bf6c75f99d2bccda188f1ca45b04a39c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 27 Feb 2001 18:48:00 +0000
Subject: [PATCH 0701/8469] Patch #404275: generate a reasonable platform
 string for AIX

---
 util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util.py b/util.py
index d4891b3c2a..009ba6cb93 100644
--- a/util.py
+++ b/util.py
@@ -54,6 +54,8 @@ def get_platform ():
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)
+    elif osname[:3] == "aix":              
+        return "%s-%s.%s" % (osname, version, release)
     elif osname[:6] == "cygwin":
         rel_re = re.compile (r'[\d.]+')
         m = rel_re.match(release)

From e49a11577577efa7493fe079aec5b257a1796d00 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 27 Feb 2001 19:13:15 +0000
Subject: [PATCH 0702/8469] Patch #403947: On Cygwin, use the Unix compiler
 class, and not  the Cygwin-specific compiler class.

 (According to Jason Tishler, cygwinccompiler needs some work to
  handle the differences in Cygwin- and MSVC-Python. Makefile and
  config files are currently ignored by cygwinccompiler, as it was
  written to support cygwin for extensions which are intended to be
  used with the standard MSVC built Python.)
---
 ccompiler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 0a30640fe2..4a282d4cff 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -842,7 +842,10 @@ def mkpath (self, name, mode=0777):
 _default_compilers = (
 
     # Platform string mappings
-    ('cygwin.*', 'cygwin'),
+
+    # on a cygwin built python we can use gcc like an ordinary UNIXish
+    # compiler
+    ('cygwin.*', 'unix'),
     
     # OS name mappings
     ('posix', 'unix'),

From 9a2d4238fc67219b220c86cdea11776e83cf8371 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 27 Feb 2001 19:25:42 +0000
Subject: [PATCH 0703/8469] Bug #229280: remove '/' characters from the OS name
 (for BSD/OS :) )

---
 util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 009ba6cb93..e596150422 100644
--- a/util.py
+++ b/util.py
@@ -41,7 +41,12 @@ def get_platform ():
     # Try to distinguish various flavours of Unix
 
     (osname, host, release, version, machine) = os.uname()
-    osname = string.lower(osname)
+
+    # Convert the OS name to lowercase and remove '/' characters
+    # (to accommodate BSD/OS)
+    osname = string.lower(osname) 
+    osname = string.replace(osname, '/', '')
+    
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --
         # i386, etc.

From a491120a1f3f62675249b45d01c90e690c13000f Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 28 Feb 2001 19:40:27 +0000
Subject: [PATCH 0704/8469] Placate tabnanny

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2b0bce33e9..91f9279d87 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -306,7 +306,7 @@ def _init_posix():
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.
     if python_build:
-	g['LDSHARED'] = g['BLDSHARED']
+        g['LDSHARED'] = g['BLDSHARED']
 
     global _config_vars
     _config_vars = g

From fde8019f9e24a1b85b69bbdddc0073996df538aa Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 28 Feb 2001 20:59:33 +0000
Subject: [PATCH 0705/8469] Leave #! lines featuring /usr/bin/env alone

---
 command/build_scripts.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 495f4c372a..1f68899ce9 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -10,8 +10,10 @@
 from distutils.core import Command
 from distutils.dep_util import newer
 
-# check if Python is called on the first line with this expression
-first_line_re = re.compile(r'^#!.*python(\s+.*)?')
+# check if Python is called on the first line with this expression.
+# This expression will leave lines using /usr/bin/env alone; presumably
+# the script author knew what they were doing...)
+first_line_re = re.compile(r'^#!(?!\s*/usr/bin/env\b).*python(\s+.*)?')
 
 class build_scripts (Command):
 

From 925f20a7baabbecc1a696330747546e2f2d8e2a3 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 2 Mar 2001 07:28:03 +0000
Subject: [PATCH 0706/8469] When not copying a file because the output is up to
 date, make the message slightly more brief, and more like the message that an
 extension will not be built because the built copy is up to date.

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

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 1f68899ce9..ee7f4e2d1e 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -45,7 +45,7 @@ def run (self):
             return
         self.copy_scripts()
 
-        
+
     def copy_scripts (self):
         """Copy each script listed in 'self.scripts'; if it's marked as a
         Python script in the Unix way (first line matches 'first_line_re',
@@ -59,7 +59,7 @@ def copy_scripts (self):
             outfile = os.path.join(self.build_dir, os.path.basename(script))
 
             if not self.force and not newer(script, outfile):
-                self.announce("not copying %s (output up-to-date)" % script)
+                self.announce("not copying %s (up-to-date)" % script)
                 continue
 
             # Always open the file, but ignore failures in dry-run mode --

From baf6ba89cd2afee636c0590384219bf555f3b02f Mon Sep 17 00:00:00 2001
From: Ka-Ping Yee <ping@zesty.ca>
Date: Sat, 10 Mar 2001 09:33:14 +0000
Subject: [PATCH 0707/8469] Make docstrings raw, since they contain literal
 backslashes.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 14cfebf720..866697577d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -545,7 +545,7 @@ def get_ext_fullname (self, ext_name):
             return self.package + '.' + ext_name
 
     def get_ext_filename (self, ext_name):
-        """Convert the name of an extension (eg. "foo.bar") into the name
+        r"""Convert the name of an extension (eg. "foo.bar") into the name
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """

From c30a37b5c788097c52695b55e76916e109d32ac4 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 16 Mar 2001 20:57:37 +0000
Subject: [PATCH 0708/8469] The bdist_wininst.py command has been recreated
 after wininst.exe has been changed to include an uninstaller. I forgot to
 mention in the uninstaller checkin that the logfile name (used for
 uninstalling) has been changed from <module>.log to <module>-wininst.log.
 This should prevent conflicts with a distutils logfile serving the same
 purpose.

The short form of the --bdist-dir (-d) option has been removed
because it caused conflicts with the short form of the --dist-dir
option.
---
 command/bdist_wininst.py | 580 +++++++++++++++++++++------------------
 1 file changed, 308 insertions(+), 272 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index e3964b6b4b..f1dd633297 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -17,7 +17,7 @@ class bdist_wininst (Command):
 
     description = "create an executable installer for MS Windows"
 
-    user_options = [('bdist-dir=', 'd',
+    user_options = [('bdist-dir=', None,
                      "temporary directory for creating the distribution"),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
@@ -235,292 +235,328 @@ def get_exe_bytes (self):
 EXEDATA = """\
 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
-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
+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
-AAAAAAAAAAAAAAAAAAAAAFVQWDAAAAAAAJAAAAAQAAAAAAAAAAQAAAAAAAAAAAAAAAAAAIAAAOBV
-UFgxAAAAAABAAAAAoAAAADgAAAAEAAAAAAAAAAAAAAAAAABAAADgLnJzcmMAAAAAEAAAAOAAAAAE
-AAAAPAAAAAAAAAAAAAAAAAAAQAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+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
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCqpen60jTE6a87YAALo1AAAAsAAAJgcAZP/b
-//9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xUIYUAAi/BZHVl0X4AmAFcReGD9v/n+
-2IP7/3Unag98hcB1E4XtdA9XaBBw/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALYAp
-Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz2ILe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
-bxFWVlMFDP/Xg/j/iUX8D4WIY26+vZmMEQN1GyEg/3UQ6Bf/b7s31wBopw+EA0HrsR9QdAmPbduz
-UI/rL1wgGOpTDGoCrM2W7f9VIPDALmcQZrsnYy91JS67aFTH6Qe3+57vAAHrOwdZDvMkdAoTbIX2
-yAONRfRuBgIYYdj7LEKQffwSA0jhdW+mlDQUdQkLmJZ/NJjumw5WagRWEHAQmN/X4CJ8iX4PYTiC
-PJrt1jbrJqUrAlMqdFPP923bpwgliwQ7xnUXJxAoFza0CXKOCjPAbFvJW2j/JziDfRAIU4tdCGlD
-kvK224XtOJPI3VDoyD/CRQyX5dvmL1DICBRAagHMGF73n7ttBtglaKhRKvFQiV3ULf2FhW0WbNcc
-O3Rp/3QoUGiQdLfP95gZSwQXjI50ExoNn+vct3yLBMmK9iEfFrWBnH06Lh9kQ9sOG60DxUUSPshT
-l/bQbe68GY1e8IQUxs4d3Q0fgewY4YtNENAMRFT//zf8C/qNRAvquCtIDCvKg+kWA9GBOFBLBQaJ
-TfQ+/t9t7mUsg2UMAGaDeAoAD45OHQa7/f/fPfSLVRCLRBoqjTQajTwIA/uBPjEBAi47lttmNoE/
-CwMEKosPv2/brflOIIPCLokwA9ME8BFWHgPSvHW7ygUcAxHRCE8cicHxy237VxoD0BP0jRoe7I2F
-6P7XPRuhlGLUC2iw81DbbrZgy84QH95UjYQF39zb9g02+EZHGlAbJQO1dfCAnex0HrRLBGhXjruX
-2shGyrwF5w9cdEZMMhys+2aLRgxQBA5B93ZOHsquUAnpLQCNfx5tdw3nJ7Q+G3YUUQ3srY1m+0sB
-+h0YOSoUG9i96Y4YE0BQi3K/QApQQmoG7mud21UUtBL/GhU5Btw4nNyMtHnWmnDr9/z/7y5RJARE
-EYoIhMl0C4D5L3UDxgBcQHXvJHcrZ4dANHQXgLbrSDfDVd9AYV8FWRHxNfZGJsBXUBQwltj/N1vB
-jOIMOGoKmVn3+TPJaLRw4X2bLVEAHmi8AgANJm00S6YwPyxQMte2m62pGiEUFSi+oIoEVjfa0hEv
-WVBCDwE5HSS7nVx3GP/TaDbkKCBgI6/3tQMKARXTqRgzZ850XzyfnjT0t+3eWvH2whAA2rgABgA9
-sTVb3dzhTjuUgQkQfXeH+0CFrAynfQhXIQYzoTCevNuwqzx/dBSXaHIiaAEEAL+mcw9pSFUGUFAq
-f8fC6fjwBCRAnP0A8D3AGjQzuc9MNTwFIBpgt/a7TegDQdZoGRZo/QzT28jmwJ0ABF+sXusn4bmu
-tXuBeAg49XUZS35wHX/NfO/RdFxEKdWDPSjWZ9twpwpCCDB1Oa03Bl2DRilcMaEdXLrxt0CLUAqN
-SA72UVLLUVZZuvcsRjSjMCwMWAZpOKFe/BDe8GBd2CLEw9co1qyL+PHWdakFkPyLgvQRK9Ar/lLp
-tmZSD/grbVdSmSvC0fiYLdA6jPAV9McN6GhERoVUeXUIB+WtO+WD6E7ehNkB4myGD4XiTi3CfIlI
-arhzLIUGKSgcvv4dZpd/udCnl/QBwegQSHR56QkNfUgaIpYQ04stZLox18BJzx48aEmAPcOHBrPV
-pAkWhRs784/MLhYz7VVVaIsV0ztwAQelxRZfOUhVDQ5utq6GFFp3QekOLwiJPIMSAEF7EKyIJZa5
-hqessDhDKCi+WIlxOb6Ow2jv8qRhDKAzmYLcYnYKIJu7dkMCi+VrqxhomW1tEPsNvT5QVTXWVVaQ
-yZZaKYohNROfhckY6FnyMtByg4wciY2xhcO0bNBwUL5xVYuyc2GWGBC5ApEDbDG3hTUsG6UfTGXv
-ppspJOsQaNrBcRgNt4vrRcAgwDjpYYR/1TP/V1cnaJlWQ7Zd2DAvdQQr6wLsV+uTi4QxVt+EuQ1D
-4yS4gZbNmFyD7fb4UzPbqBkADFPzkjbGsbZ3/BYAYBMHMH4T7YY9Cm5TANRTUI1FmMeybK5mOWwn
-+ATxGmcp6/XZyrvRajbNcGFF6c07wy/HlzYwWjgY+Y1NmFEm6sz24kASiDacU1AX6dlc6Uj/gHHW
-3xBtnbS1ZBIBqNfW6CstaZ4p+P5UH2KszWZn7Mcgqsatvc2WNezw/U4AFrM3ZpbwDAgIHxsbdtds
-DLBZN+homnT37oF1ARj88oQboOHgxQpSEkYOdbAEJqcTTFPTT3InnLiekl4t8QKZecF1TT1/ZWpn
-8AIEADYQYXbrA3TKgGjsg9uZwxA8UA/nY446ZR1uDCIdzQE169lMlpBDzBYgaAlMDghWEHJQMPAl
-W3RsIDtCj7sXXAg9Me50KT2CS7MQAs/EA0c1GPzpAvZWvlGJPSCeYl5s1H2AuJ8RXIENEj6DNc4U
-zt8coAC7czR08IEA/OFTS4fBd/fCiGjBHQY1AJsFhHRToYPXAsk9ODk1bBfhvdswoyxmdBJo4De8
-IuxC3fYMKFkekFden2jEGsDRrJBIGyxzgRLDykzwVIlguIlSV0PSfmjwH0zS4Z2DNcERslDr+LdP
-dPiFSwWDyP/rUlP6ZBLofeCafDOB1Ad0Ls7mzwnA3gqwrYYMnPzyVTAqFq5+jlZSh7xZiWdUHlno
-+FfyYF5bXzUDb7miTAGhk+TpdNRiqTr3EAhpBjRa/C+PBEHr9g+3wcHgmUpmIzw+ela7Ce1TsLpk
-PxoAvVhWVRBBFLNUq9epUffojcn4a+s2/1oYrmgMcw+Hwb11DyQKlCRwgGBPqd/9XQYmEOszi4Qk
-ZBP32BvAg+A9EnaLdcBj6URoBDzMhhqlIRxbDb0JbtkEO4MsVAZwux+LdgTpLRmLYykL74zegcT5
-8wDQrluJBzZLxRAA/AEM3HatDt9u/C0LokhIy7aB2c+r1HwCXEJaYbcsCHBWDqsnO3BheBmglC+Q
-6s4mvYAXhNZSV252S3aEEIXrb21lu9nAoYxbig7ZWGowGDrjrDRK8oD4aAO4sX5+O2oudhwMaSJZ
-r8EqAyXxR7A/130fSrDrtF8AsJDrZQ9t2IvDPoEIsxovZlpFFJOM0D7GiQYEWYlGBAO9Xt/CjSUb
-qlY5Ab4KdAvN8YU1IU0IUFFWBSIRh3C2KJdINwiAkSZN7gCzRGcmi22MBogd7VSkkd1naivwmhJW
-NPhgWXhbZyNqr0jUKxwnduHe+YWOoVCSA15hB+Z0SW0Vq2njwnZ0QwQBjWojXnQfWttgrnQ4N9YY
-Bqb//r81zwYHD5XBSYPhAkGLwaNC68fHBdcOGHgHJ1XsXTLTK3HDaiQWPANAgxP6eOgGXolAZxx/
-qISpp3Qzmh11rqNZdOTWux8KxIToZObMGwmIIuvbjJqjd0pBwbm9jUIJHHVlSR0QeFuRLFUg2KuQ
-ISOXtHIESxe8pl19GHRq4HbprguRjX3E7POrBvSJ7AcL3aKrq89MXQyrGgamt22QE4wbvwAI1/YN
-aLXmwDCJL0rFPRY2U6Qc3AMUrtvTrb0b2GEVBwbMa+XWH/A707lTxCsSbCDiFvLkkrFAGfRtdRp2
-nlxy+G4tIJ9T93auxn+MNFx8mIW3bCY2BZSLBayMf7Yt22+QIJt1tAK8qA+k/oMDmI+QGDYd6B76
-YoDmBDZqGJzwBw4cP9+2E3FZo8mwcTrlMmCgYYblO4MhFwtQK+kFnsTJJJ4IIRMFMd0AXwc6XDG9
-BWpQuzK7tw5Uhb6YdGaQdCe+9tuKVT0JWUo+aLbYrKFXRwmIHw10r96yI0ZbIHx7CzCbFY5sD6K6
-B2dmqBOjkhhcnfpBSoxqCjn33BLSR0xdQJxEo7vHx9449KIU41Cj8fsQpo0FMyj/HaHZHirwN18x
-qlASpI8DDMa3B7tiA5YMk16iIfCl29v/Z1VPgPlcdUSKSAFACDB86AQz9t8By34Wbr1yddnGBg1G
-69MFurZcywr0VJZRBvBzvxJPPAohH4gGUh8qUIp/rYgORkDrp0S6PCMefEdRU6xiA1aRGKMzBAiA
-+Yg2OmKji4NIKyT8G6BDNA5R3/zZPBHACA6NGxEtSEcDBMUQ4lbAAh+XiQgf3zq0GQRVCHbzTALq
-Vxvire0rQRACDCcigTkXjTTtN0WLELqugT56VjQSC4a7DZmryoyjB4tGCBuPNcD/DYvOK04EK8iJ
-Dee7Uf4rfoFzHHh6lmOmUudGr2rbU/z+LGal3MlsUuNNFuhsBhfE/HQXGzZgQYf7enZGogKUuQVa
-qRxMFjcXYxCEaIb5P4T+Mn4G1+seaNz66wdouHQzIkiviwPow2HIR3Eoej76yKUvMVa02APchhRA
-lOljaYnk4NN/cBleuM1MDey50p0fy3SwHkVsOA7Yuzh1zeZqc3Ei+A8lkGZrtrpAChdWtnUMBBu5
-gYD91FPYzXEgm+8AdVbajKAFDa847r4RTvbgNdc7BAstWa5sjhO421YoCnhgJ5zOEXzWzABs8Rsi
-YzPSO8JWdIZI/5ftLzvKdCyJUBQCCBiLcQz33hv2UoMbbkvb5ge0MbQcIBRREBvs17B1coUAe7iU
-/wgvOGjYkAAd8vZ0Oq28Kwv5HFROJIXJPeaWD7sUDQpWkSoMCB4aW7pti9FRryQNxwAAg+YCmFSf
-8XwVW7OxO8cf94oBDS202dhGOsFo54N8Bjhjb+KxCtxr3Tv3dQo/X1tr306fZCCJfhg6E2AgZ25/
-w5A7h34oOX4kdQcOJLCBmytcaWoYSoTjJ4mXmKRrhj78TBaJeDX4wkLbVhfPiXoMw93bv9+099nH
-QAwBePkIfFkED39UH7hf2Np/EdPgiUoQUtdRN9ob0lDkPrD999KB4mA6ZVJ7HGwZxbd4DRhBT116
-FHUP99gte8NuDhXMfwtGeLJZVhvJX7j6aRAZiWZLAI8QFsHBQh8EDHYKFTbb7vkDoT4ACPCLVCN/
-/9UvQoP6BL/7Z5XDS70FweP7iSe+PbRcGYkIyA0Ph8Rumq3w8CSNsCsZBLY9iEmtxdY2HokNEAhJ
-Lza+jW8Fiw6KERwENRYQBPSN1i1hD0LbLhZ0FceZF5xrbFXdbBigdRu3725b66Iii1AQwekowQhd
-dnYwObAYJIxaF85onu3QF0K9BBFI3roMtcSaP0B2i14cao/b1gt5Bom9HwMT+3+jF72LQwR3CAPB
-9/WF0nQhxwNWni7m3pTR3V90aLO5jU/2wSAlgWMpBwKO2LAmHNhaCxi2j9odP/ikS/0ThWDfdRij
-AlXzZ9taV7MsnwKSIgFPiEttdmkCc6AzjUhszkXaslIeEkRUDJJvtnX5C9gMOeMI94I58y0CY+Tt
-4Z5rvDVK3MHhGEgL5FBoydZJNAn1wli74TuDSEKJBjocFLC/dYWQgUg34hADyolIOblILhkKvgi2
-5JIhC4Q25nBjbj85SDQSNmYzRFjr5TNZhIAcCOlcpKsfsg1oAnUJi8em4Jxb9sIIp2dyamcyC+1j
-pBZQR24J4QF2xwEDORZITyUyHG43igqdU1wOkCNnPlYCBA5DCJNJ0iCJISWMsCizIR9rtgsJeE4w
-8wa4+DQsI9k7aSxMzWYFw3AAJcm3FZZqAP0MQwHF3JItKf0GOLPcuvoL5yfYKANUKo5y2blNzQgr
-DwPVKEIpZtk0zXex64wrmDyQBF5bf9NXChxuDb8FejyJQ3Rob20peAQPBAV1Dr7WgQ3e60coUqFX
-ynUjG9j1BnUNPldR6jOsKGDbbrzH8gFGNAIwDjjFZ2tB7lEIIHQO7dY6cqGv0B9gRzDAqM/UsMN/
-v21qVA0610pkYyDW0Tto0Zr2wcvDi08oA86Qo8hJShpf0gVDgdmXelcojO4xErOQ0cNyQNActgH0
-UCgoH4Fzp3OfK1EeLiMaJKyiNgIUmC28dQPYHoleLLw4yCSLxJAET6otus0jMoPsMDhTbzhE1tga
-aPspQ7JrEkjfStC2Lkv/jBAwVjvI8u/aQplUChVEcwUrwUjrBZcv4NosBx6MA4P4CRkMBP+DP4XM
-OUDYGIP9A3M8cD05yMqNlg3G9/9t3+RIig/HFEyUi9GLzdPig8UIY713XfcL8kcxiTiJL3LO6wQ3
-t7bAv6+D4AeLyNHotQFkHksYzwI33XeRY/SD7QMZAc1g0/tvHAfB7gPT7ivpP7MdXqDRLehBSIEg
-UgCf2N22ho0NMFEOOFLOOrw26nUNJFwhNPhDUT5Q4u0PLFIQ3hArvDnzFegUia6171zAYmbsWHEG
-YRR1hzfkA/j9WBRwbl28ziBzLKn6+qAGPZct0D9MLE/2fECi0TvIJ95y1IvWdRZ4V2qC4Qdy6hAz
-0a+iurW3/zjti8E7xfoEiWxcSyYBW2LYQYuJA+lM0heHTXRuvCrHHAWFnRaLG75rfBpEO9Z1I7+L
-eygtCt81fnQZi9c7sRVzByvCSFfrjm0XZCvyc4k1dWe0TEErHXyhSARTiVM0GDoHZt0XW0cwataj
-TDocbcOmG8pJ/0ssBwSQke/2PlV1IGL31meb3HzyTovOwovIpF6hYZhwsAsFyWno3mB2ncI7wQXB
-PhT7JRaqRAjRgQLzpYvKLTs8fqEc3wMr0POk2lwltdG2t0QDUg1LXRXwMHSmM6cWiXgcKWPE5loB
-aF1kGKEHQB5jCCqWDnM4ZIyr5DIOktLF5ug+Jf8/JcggmB/HQt+yhx0G1tA84AjWUDd3gfqgBRPy
-BV4FfeYavsEfRo2ECAK2UHcDPhtn6Ugo+VBhDI0FEyfeeA5IDsdDbvA0jb1NBOsIrnFTkginC41u
-EQqDYi1zaFlkKvmdMr40BgOiI9LCLAhOsYu2H59a/KBdSwzFBJFhCDBXaA0IA4ZqZ9n7YfdymDC4
-E6HIcyE8NFzhvTbHMWk1oDd9aTvdIHLfcBokb0MQjVPNGRosUVI0V/HjXSvOplBRM8xi8IVYyLaZ
-IfsI5gWC4cNXT2XQNOIfNzVvJ97OAl0Pg3vSWTvoc2vvx6Mz40o7Bev6+YTm3mtKmPb0+QeXjjU3
-+i75zYvJ+Ihdewd/uRQjxuZUwQGN5jQY7W6rQEBVEJc0cxvJsOBa2yvq0QxFhBKKv9sO13FApDcj
-ICMSuc10A+Lx+EIz8oPoEs1ZYX/JXSsk+AsfwAs76XM7mYF1C+TgBB8wnXPt0cjpyex8d1Xaa/S7
-iwyNqSPOJg4U1Hiv1WLUkBvXp3MZ4RUc4YwKHnKvd+sD0Dsqh6l10yqFGiWWORDpmfDwzcXcgpMV
-DdodivzrAj18e6kAqAxBSJmP/HX1d4kycSChXnqChZjpA932FUAkJlFQQI3ftY7NmAksJFESUjwC
-7l/DNjs/UUIFATxrWQORjc8UZQkHcZYd5kAGDzksJDjqpOkfFUwk4K7NPhzKJTTPdz2wfU8Dnzwg
-Kxx5UJbnjiGkToRXBAQG8ADbQilID3O2aC0sXms8MJfYBMXXrS7QK504A1ZMBq3m4OjOTe7ntkan
-vlH8SbF7QHYlmnl0Vl22VAAPuHhxHSdNPpwZJAoNIxixQJo4FCnMIRgbmK+VidIALACNg7kkoZ3P
-iybabuu1aJqW2umVTFF3SaA194XaF7CQDbsdcqEzBjDD4DfTxqFRXGH9yzMYHLfnZo12P1VR8uTX
-akoG++H9K9HDA+pQTkth2Z7sTI0xi2k5UdAr3SJsrgFmkuovFVJRa7MEsjpDhTJqa8tOfcdBGPw9
-S0ZAIcz9WEhIUYl5BEZETThwhBgRSyDos2YRXKOs8oSnhEhgbxAVUsjGz4CL91TKxADOW6ETnzlB
-BJOKhysE9wzu9wPug1FP0VjQEkwJuEWED2HBE5/Pnmr8UJTJhkIIeZDYdQmFdxiMzyuObySQAhid
-/XUG9jDKZlulT1GoX8aQAHzXiwgyIgwzlBR8qzJG2J674cBlXZFS3VAGNXsJaQbPvNr+YoVMgoH9
-pHMhGF8kTBAg4YAt7BhShIU9Qlk+CTtbKXkjXEhQUqYHh9frPQxApmbnyHJCd0FQVlN0S1MjtLn3
-0XQ3oXvoIDcuW6r87YlWBH9QK9WLbgjjbn0B8q1kPmYI8D0yxhgxQy6Lx0xWsjVotVXFY0NLVpJe
-CmmZO50JAekQmKCXJoEhhA0YkVPtqwlBT7D+RZ7CXmNDSCpD/3QtZtlsNxRtLgPgCzC62SyXy6Ex
-8DOXOP5COQM2y27YJ/YtWNk0Gw1wSTHvDKIMgAMUgmqoGE/hSlFHWGndi71GuQBYRigYDQc4wPkY
-CFdj6SDVWGBPt7s9A27E7911CuzCDO/exQapXPnbD4bvEVWB+7Du4veOFZnDcgW4CCvYgg+MoW/R
-ij+t6MHt22EQihbZuyjEg8YbrFbxA/kIhxxyyPLz9PUccsgh9vf4csghh/n6+8ghhxz8/f6CDbZz
-/wNNvGTbOhdRn/kVFhJGE7G7lXpIdfSxDbnx8vfxrbbdt0y/CIs19/fri/W8AGzdhxMxXRdbbV8L
-weDHJDgIn5UIUMFCKJtuQXZQ3qWBXM10QATDD25JNTofHKE3hcddocYiik+jRYhQEFoHvRF4DIhI
-EXUAAA/xcBhwSBjD3xR/IBOGFl52zgNGkrYEjQXwVsjabgxXC5uLwQw0wX7FbJ+mCbwQwkYsB4k3
-oEAfM0063/4GHdr4FWyIQ089HNqOQAsanc4QCgqS5Q9GzmwoRnosiX4tsJWrO4wpKyJ7VGpbLa35
-hYkGZUe3FrHcVV+UVlIi2xiwYU0RT1UQdzwwU2sls3Muo34cuEidJcB1pigNQK5H12ggY6MwcqWt
-LgD/dBNJ99kbyT+Dwe+qPfeLTWEsPWZjkcaKpZaWTbZFskUVD6u3WPhzREBcBMUunou6DrXtMABL
-7gV4so7P0+DQAMe79nPuCAvINnngLEE/Cixy1X1no7yuhfgjIAi/Ro0tVshJGE8U0+j0a4RHuG7B
-RSv4ReItuECKAcUWi0mPo8dMs5UIBq+oEHS7Yq1Ed+AProuvBSKi2ybpHwJAr0XDqHLmoK2f4ycf
-B8whnRuC2kIaWMDe+69I3HnQ504+km/YCL6LBEzW2vtmuU0EA8jOrZGwaDPTtdRyA9fTwdBcqy71
-RcxlKJJDgl6WA4ZJWMJEZAxEWTAckASF8FJlDAcIQbiNDMGIQdg5ZAiQAgwMoMBADgVvjg04FH4D
-axXVNal3A3UDwis3QArRnjPWH+0jlptP1fCxWgG2hZdOLM32qRItjnUhPjA7SaUGpcERVC0pR4Tt
-wQz7COsPf1LQiFNnhhSyjIw0iXJiPAy5gWTIbWJdO+QGO2NhIl6PYkaIWyKe2wGQQs79fRLzCYhK
-/xFBSDtQCB3PfRHWB04MZkk0GNgcYc8oN7AAVKDAhuPY+2R84E0KiApCSES9E3BFGPbPFGN0y8CL
-Kwrix0MfK2TNQIHNExcRqjPdSSL0FMNKCTAFEHB1GODYYhvkR+BQZWr9K81TVlDKNleYScjrtJhZ
-eZCFiokDPoK/90OD/wd2FT88g+8IoTO8V5FMiUw3ULZadSgsi7Lqb+yYC2KzTiA6K20b/KVMbjz5
-Uyv9i2tk70cjrNCJC1v+Ei2SiYRBAfBFMpE7/pBUPJbLZrt0ET0D7HA+Lj+kTSwNbcJAu0IPV80E
-+WqEQeIE+QyChx5ZIFFTbCBIdDqWSxN2EGfoWHUz2Nt1CaFbWdcU/fh1HLJWVfmNuisFN1BT6yBS
-Vc0BmegXpROFNHyiv0RbbdP+NxpbU1LHRxiX4kSuLLxXNF1eWwp+e0we+3QGg33sDB8s5qKmCL7C
-MCl/T1gsz4Hs8KKMJPSBtq5yBvy03wHVpukWqFfPRANITJqmaZpQVFhcYGRpmqZpaGxwdHg2yAW8
-fImsJHwyAfT2CyXvflyERI1EA0NKiV/dBbq67TkIdR9xGIGURSL+K27AiSmJKlX6YmzhjxqcF7kR
-jb6wgZ6YO0M5KD1Bg8AE0wbdACZ283b5zbHvxuNzBppiug8rtHi7uNH/OS51CEqD7gQ71QU7+qUs
-dm/822wlVPq+UYk70+avcxKNG+ze/lyMRCszeCVTwwTREXLyb5WFmyFCo4UcDESNjHqBbgMr8bpA
-eRARg6872aIDzuWILAv2d3N/a0qHM9sDTBxISeWMHBcrGp3ude/dBG+03BoZ6M3/HBWMhO3Ybjsc
-PSgcjYwNiVx4m4bC40KJERJ7HAhDO2O3O+LZcsVXi9/3QowUNZQKnGYjiSFdA0zH6RpxJIuEUsfE
-b6frqv8SxB08D4+BAiJRaHwzNGWHDcB7gYe5CjtJhdLs9t42tys+IP07TQ+OB2AUcrPIwTjWLC3R
-/y9Y+Gy6OAPfK9NFA88719Qt0TPwJhrXHCD+nwR0Scu4jX0BO8d2J4PP/21Yopn3Gi3HbhhBW1hY
-wASufb7FbeAfy0KxuwcrxxJy7a8kv1FftmM754uxfAP4gf8fztjIiNjvJiArLMLowd5PL42UhNg2
-iTiL16duHLk/dDhDiEyg2H4RYbSELNbLiAUx8Oslmr3G14tK/O+L9Y2Fb7XTwUMr8IkUO3SfDe89
-3esJShgo4PAGjw1H6Ir/WoxuitAJHG98uu0q04g9MYsIDJF/cgfGim5jAw7A6583KQwX/qPvk/Fz
-FIH+yRvSg+Kg9mCIXVBXdnHrICAU0+Zbmwj3AooUMQzAgMJLNNFyW7wxIbEE9g6tjSx8hyRHuuK8
-tEO0sIk7FXMet8U44Ri/RTB3iTmNPNWkcQSGiRG6nR1y5tUUeo3C23/BlTGBhcJ0CDPQ0egHdeHQ
-WoT4WEoOKGAPRhuhjByNBTEkTyPlviu0+ss6XxiD6ARPiGNdsB8mK985MwgjdTwxxoncdRXISiAe
-poY6K9LCHFJenT4+kEDrwZoefcP0Nk6RG0LXO/V0F1rI0l2RLAF0Tfsi4ALWAQwKJLQSAsMPX6Ma
-eCwPYThoEmQYBN4ZQAtfZk7SwOE0VWQYNFIM0Fs909hooGIvLIEd9AQVVVJwC8y4VX2F00U+OOzs
-LQT7xgxMKEhuJ9qZOHsWTJhjB/ZGdwRWHqhSUUt1gN9bvyQngzoWCIH9ancT8JYAGD8dqwLSLCfk
-T1HYEDjkwx77dR+845APHtkj/HQCmGAwstgvI0sMJrAzdEJURSQJZgkjD4M4bAvfDcxAGelyF4B3
-oQQKnIkCEODhu5uUxwEIEccCCIdAyFEbsHE67Qxja9d7nNpqAMB2/cH1Rtt+d3YDFSwRe+876LYO
-R9VY6NcyIPcIK/FHGuogVhQrxQPV5jB+CRZqVpY4cA6LSzxVCbhRIQU2QzwSiEn1uM2L96Sm/8ql
-+lnKpgPFF0ssA/22qu0cogp1fkFEKHe6RecNkXUfczTqmpMrbGEr7p8QhFcd5ECWR1dWRzAttlBj
-fM1e+IR7RcHea4LkjIp1wXDqYVooVIlRBUv4SnI1GF7dOPTiH8xZ+YtpRi1cuJxRIDtxMDc4HUH/
-cOw77lFBHDlzCSv1TquW6jI7zkkxzYFNN6HcNrQOHCwu0aglODwii1ZHnWhJQRGLpXZfosTIGmEI
-C9ZHHXLi3+At9liiVzAjysiKHM6N3jluxDTOLISOwjJOAdPq66pcAQRnZzkEgB8sQL4jawydkAO7
-fWBeBDYDyzhV0AX7B3THg+MPK8M0MU6RbO0rDavLI6QPW9JMMg8gNJxGyJEpMQUBA/BmypTPO8Nz
-K1kc0FzYGIP559WW+Kr9h9dBJpdyBzytUVvOWU76z3DBcEXZHO7H9UjBhSAU15S8SShg/w6+ETv3
-cheL90WKDkaITf8GsUY0+IPrAusB6ye3VuDbcSwfO992E4sdHABFzgx29kZPdfYYKBBLnvm5Ldnr
-Gb8GBBlwRUliRxTogWEScjo5alc/DnIz+Tx4tb8q1NacEEkEE3Qr8y/U2xw+rPCyrTvzD03euYiC
-By0/d4t07O0CzdnFZcHrHtlzAt7G6gV6OCv5M40UzZrCXIIxNsQc+hZTRggrFN5B6s+JPitnVg3h
-1KySVulzYlakAHsgdFZXz4Bc2Gxa2+Ay8r12cj8QZv71tp2VaohoAytBWC+xQbdAizFBOXdfiUGm
-dzp4Z5r9Zp+NbA3g/yUMdQUQFAC9eY4LuGAgzMxRPW4o7MCxLQhyh0lP7i23Lo79EIUBF3PsmMQM
-i+HP7aYSYM9Qw8w9JGEEBWqpMDRqAanvsoNkU7BRZKGhUHQvBVtvJQcYaMuJZegE0Cgavv6juIO6
-NhXEGYMNNPGmYjubBjgU0KQjW1OpDaTxCA3IZBGgvyOhzAwAozy0cxuR+0GdOR1AGLeebE5nu39n
-3BiIaAxwgghwJ4IhaoLeoWA/R5ReotlublwMCZxQA5Cg+ZqgpVfYIwQyAOi7AAxOoehuMNvf/S0Z
-gD4idTpGCIoGOsN0BDwN8tv2gHwSBCB28tTQTqRFW9w0WPZF0DMR0T9vLyLU6w4rIHbY6/VqClgk
-aKtoldtMdSq6EvQRm+Uz4I5Ab/ia7FQJiU2Iy3xZCNsLLgou/3WIH/ShFt7I2OwF5NS0VQNvmK/x
-BEkvsqzDw8yZkS1hAC/AvEIFQPYPAAA8ryjKFf//EE03SNMREggDBwk0TdM0BgoFCwTTNU3TDAMN
-Aj8O9v8gTQEPIGluZmxhdGUgMS4Bv/v2/zMgQ29weXJpZ2h0Dzk5NS0EOCBNYXJre+/N/iBBZGxl
-ciBLV2Nve++9996Df3t3a180TdN9pxOzFxsfI9M0TdMrMztDU03TNE1jc4Ojw+NkFyE8ASUBAzIk
-QzICAwROMyRDBQBwCbNky19HL39N031v9/MZPyExQetO0zRhgcFAgQPTNE2zAQIDBAYITdM0TQwQ
-GCAwQI1shTVg59dJWMKRxwanq8i3hAmvswMLoYIMMgwNzhjRlqJaf24DWQEfUFVDcmV/9X+7HURp
-BmN0b3J5ICglcykITWFw3izY/1ZpZXdPZkZpbGUVKxDALGXvHXBpbmcXEHP/7WdyRW5kIBl0dXJu
-cyAlZFMXfrCEBRQTSW5pdDIOcMDAGK5D7fbbl1xUaW1lFFJvbWFuC2hpCt6AbftXaXphclx3cWzf
-c3Rhu93+5gd4IG9uIHlvQCBjKXB1U7Zr/39yLiBDbGljayBOZXh0IN0XbnQuvbfW2nWA6BlLY2Vs
-FYN1W7ccaR1oFVN9cFsurbX2ARd5FjKMAbsd2douZGEPUCBWWXNpB+0b8JwWwd9vZnR3NDd3sNll
-XCAGQ28RlVxJ28puZ6BQ5WgAQ7UobF0ztGazKZj+Z9x0nCGRLYQpU2/f29fw0Pp/ZnNzxC6rbyxy
-hLUuABtjiV0Ib9kcFCFirw3h0IFuDFa0pcLhgmuLqE1JZl92g6N7hTosrnYhTIS3te1jaBJnMwR5
-KoPbLVxYQHNadHZzLCphCO1Yb0JhBJ2JvS1hAHeD919PcNBtjbY7bRFgTGcPUnOFbbstX1MQcMBT
-K1Qjj+daG0YIbCMLSya8b7NpDQBMb2Fk8Mube7cRBgDLJWNbRLx0AWt4dBpfMRE7CzC3HbMuB9Jy
-JzAnKeaca29IAEVycjMLhZUdjrbwsA9PdtF3jt3CHkJzxfljPwAbvxfav3M/CgpQcgakWUVT/0FM
-sYew7VdBWQlvLiwKcC3+VPbfTk8sTkVWRVIrQ0FOQ0VMLhQMx1xTS5MLs2R1cXhgG5d5LpdvcKbg
-HggNn0m2ZmFL4W1bm4fqFmQVYQtqxu32Wg0HDXJnFl92y2GHl2wPTK8PTbfdhEgxYnUGZF/xb/S1
-2Ej3b0N+GgAvS46IfC8MbG5vdNcarXWTZYFBW7Ig7trbJJzUb2dyfch2YWzUWu1Re5QWZWyxLouH
-O2OR9mWz9nU94WHWZoB++Udi0sIczS95FZo3lgB3pWRvd2E8xiYrnCsuWJ9XHUMarT3EHAdld3/D
-D2zOHStk0+pySCCyt5kOKRUKaycXFswV2hFEZRnFbRwGG3RzM1ZrcDjEupB3bsPBhma6bMN7u2Qv
-YibOD65rheoVuHDpR287BDu1byeAGBnSS/a3k1tYeW1ib2xzPxbNTDtXRkZsb34vwD227M9fGHR5
-cPgRDaKjzLzPTdN1XSiwB6ADlIBwdbg3excb47E2YroPyTAyEfNmZvFlVsF9kyZjcxEzOTsYbq5E
-2G1vNy0hsGxzDf/QbS/ZEo7suBtuC+RawAptflnDAzFsthnOCS/eHdIUy0gTBWAsAbqmOTtQAAcQ
-VHMfUmCDnGwfAHAwQCCDNN3AH1AKYCwINMggoLg/kEEGGYBA4EEGGWwGH1gYQQZpupB/Uzt4QZpm
-kDjQUREGGWSQaCiwCBlkkEGISPBmsEEGBFQHFGSQwZpV438rdJBBBhk0yA1BBhlkZCSoBhlkkASE
-ROjIYJNNn1wfHMggTTOYVFN8SNMNMjzY/1IXIIMMMmwsuIMMMsgMjEz4DDLIIANSEjLIIIOjI3LI
-IIMMMsQLIIMMMmIipIMMMsgCgkLkDDLIIAdaGjLIIIOUQ3rIIIMMOtQTIIMMMmoqtIMMMsgKikr0
-DDLIIAVWFgwySNPAADN2MsgggzbMD8gggwxmJqwggwwyBoZGgwwyyOwJXh4MMsggnGN+Nsgggz7c
-Gx/YIIMMbi68DyCDDDYOH45OMghD0vz/Uf8RDDIkDYP/cTEMMiSDwmEhMsggg6IBgTIkgwxB4lky
-JIMMGZJ5MiSDDDnSacgggwwpsgkkgwwyiUnysukNMlUVF/8CATLIIBd1NcoyyCBDZSWqyCCDDAWF
-RcggQzLqXR3IIEMymn09yCBDMtptLSCDDDK6DY0gQzLITfpTIEMyyBPDcyBDMsgzxmODDDLII6YD
-g0MyyCBD5ltDMsggG5Z7QzLIIDvWawwyyCArtgsyyCCDi0v2Q8ggQ1cXd0MyyCA3zmcMMsggJ64H
-Msggg4dH7jLIIENfH54yyCBDfz/eNshgQ28fL74PQQabbJ+PH08oGSqJ/v/BhpKhZKHhkWQoGUrR
-sZKhkqHxySgZSoap6YaSoWSZ2bkZKhlK+cWSoWQopeUoGUqGldWhkqFktfUZSoaSza3tkqFkKJ3d
-KhlKhr39oWQoGcOjGUqGkuOT05KhZCiz80qGkqHLq6FkKBnrmxlKhpLbu/tkKBkqx6dKhpKh55eh
-ZCgZ17eGkqGS98+vZCgZSu+fSoaSod+/xzvpG/9/BZ9XB+907mm6DxFbEN8PBdM0y9NZBFVBXc49
-3dlAPwMPWAKvDzSde5ohXCCfDwla9jTN8ghWgcBgfyGDDHICgRlycsjJGAcGYSeHnBxgBAMxcsjJ
-ITANDECHWHLBr7gUl8JDJWR50GljpRu0jFY2cmXVCvvfFVxzdWJzY3JpYmVkJxYSYtlLdh4igY0s
-RyPxkhCXqXR5zRQbGOFKFx6fs1L2li0oPWPTNF/KHwMBAwdO0zRNDx8/f/9pmqbpIP//////BOKd
-pv//QyWEDagqA4qQRUGeqGkOKG4s+wTldiXHJ6AJ/wAA51wul8sA3gDWAL0AhABCy+VyuQA5ADEA
-KQAYAE5+K5cQAAg/3v8ApWPuEZQtyAA3A3Ozwu9eBgAFdQmbsv8X/zcP/isLmJsGCAUX7E0mew83
-7wYA+cqWpRc3/7a/Zs612wampggMDgt9YO/CF6YGN/tSW3tjd/9K+lJBQloFWVJaC1sXJwf2Xmzv
-CxEGN/Zzu1XPICalsBWvBRQQjewWgojGF/7uJt18YO8FBjf6QEr7UTGAfV27UTFaBQBaC1oXri3s
-2FoFEEpvYLr/dVtrdQVUFW4UBWV1hqYQ2VisuRY3FwsdFm9zb88NEdldA0dARgEFdrKxbhHNWG/6
-C/lAb8Hc60a6FV15AbmZwb0AEuhGCx3Jg3yAb0ExWEhSWOwz19wQBYUNC0r6Ud+NfPKnFGVkECUQ
-FqamZMC6mft1FZUXCwoAbzY77DBDdUgLFzGyb8gxBTFvBvMEBzKzFabPvmGFYAtZFwUUc8ZjyN/7
-CiNaG+aYuQMLOhcF44yQsEJXT3r+k8Md1g0Ivwu2BZ+ljpAtb/D8cnvDXpL+DQMGBCQt7DDJbxGS
-zV6wBwUDd5sRsvcL9zf5B5It7A0F5w+bDbuQ7+5JBwX2Zgnh9lcP+zecvfcWudkHBfrI3iwhxw8h
-bzZ7LUb5agcFA9gyhnEVQ5tv2WXBBlVvRwWdUraMm2+Bl2xmOvIBa2l1xbjA3BbnbxETZ5OGNexa
-bwVvR2xZQ8hRMQBbb7DXS9J1bwNvlW1jjPNZAltvt8Aepheb383sFcC+cibfDW8SNuELSfz5PQMR
-EsnJb1r6t2yy93gJ+2mH9t/XNkiB61LXEb+klaWMLzfxrUdxxocVMFVJK1sZnzfxQHLujPNaCwwP
-0mklEW9m67eQ2ksLDPcLXjJY2f434gkQZTHCC4epGEYwAQHHCMRntMBICT0Bsi1YIpaIA3QncNR1
-B6n4AU0TIANhlojudT1zCSFyqWZsES+MNlB9RbP8gqARiWH/gus+t1SLaCUxVwd6P1zXdJs1ZA13
-bAEgB9zYmftRdBkPJS1vFdd0m9sFeQeFcgljbY+6rvtcdSl5LhNDL2kZa8xsrusLThV4Gyl0L33P
-fe5uC111G1FHQ+xL1o3BYxFsKzlpO4Zs2RtoK/+3LuSme8LsBAiw7yl4AP3DZbtsgRwCAw5QBj/t
-cCA2U6NzDwNgugtrfQACQ6OZEt7MZyMUnwVe94UIJ2wDY/8p4XDoT3kDO5nrJky6YRlpN39zOY3i
-J6w6YIAIgVDD8TYSNoptre8T79h3Mk+eAEJ2g0lnd5h1U0QJcp2/nTwID1k6TQMBoYNkAP5ISoSM
-gwcdBxkjq2KBZ6QQljRuezsNyX33SW0bSYvYTHfZTXI/dgV3L/a5yfVjVSVnWwmRsGSkeWNm76x7
-7yHndA9DDSxTJD13WdFCLQmVGiELaW0N87BCYUuAT92Ha5qz6219DWwHX9SNdA2XcvNncwEzFQzZ
-B9NQFTFu5Glki3OJ7FPjyBYZg2M6XwQgmSgDRjPCIVdGr2loZSGwTjd11XT5DJC1knfbKUlglTRn
-guFujAdejeNkd3UXap8bhGN5Zg01eY2lqCqswNgMBYADxERQ30T9JThMb2NhbEYdAUZvcm1SQaPg
-YXRNbUl4/7fbQQ9HZQxvZHVsZUhhbmRsEZkKboBFTGliSiWqUNANbIiWLBW0ZylTdBQaSW0/KxXP
-EFByaXZNZbkgQLwGb2Zpoxl9CxbsakImgEFkZHK7LWrMdQ9UAUYwTmGZIF6wbYMRNXAjC8INeRO/
-2MCCoTAIQXQFMdt2cGJ1LHM2iHb7lty6UyVMYb6yhX0EtQFVbm1EZ8J9wt6CK0Rvc0Qbi723C4tU
-byEJUAwIQWgvQ2wkNEUVfAsL1Q1ThGVtM+lRZQlsOGkWLoxQdEGu0QDsL0D8UmVnTxBLZXlFeEEO
-c7GAfEVudW17Dwy5VtgeUXVl7lbfBh7NzU6zRd4U32FKsAnuC7R5U2hldfMTPzxNlzLrIFOIeHRD
-JxS+w29sBQpPXUlCuFvTuWvgyFNjFmJqBfwQ3iRDb7+BSUJpdOHfDjNqD1NMaWRCcnVzaAWeZpsN
-PHb1sF+1nSs4YzwxB25jM93NHYsIB19jWq1sZhxfzR3hb45jZXB0X2hzcjMROHsVdGxOXyRfvw92
-i+2aCTFtbakYZGp1g5Ugth9mBxtms22NYBlUonRCbQZEc4URrRC+5nAt2HNRNBqLBTv8bYYEdGmH
-WGNwzTTC1LafWGNtgW4IVPbaWAE9rXSjoSwt6zZ9c25wCHRmCnYLO2tMjtxwee0HaE/uvQKEGRcH
-fdkyd3oXcQ9eKFaK9L0wKGbJS3+6Y1SliKYwUQZCCOcaItBQy0O1p2Cljwm2eTkfYVOpW/MtY3PN
-RGxnSYB4eHAS4UGWZqvxOMXtpx9dIbJgzS0uGi8U1wZj9ndz1s1hkWt8zErVTZlJmWwWLLZsDnND
-IQYc5pK9bRpjmIY4WNb4YH1Cb3iAQ3Vyc4N9AdsuC3ZQ+GuZDYiHtWhLblVwWVFop2R8e8rILph7
-y8SEbnNsGjbtY1mhtWm7D1BHqEEMaTY7YhN4gngi/UFMVrwUy1BFTM1v4ZDljUHwH+AADwELAQZV
-YJsd9p0THAsQD0ALA2zJIpE8BxfA2NmsmDMMEAeWl8EbBiUcZIwXCKR5oBKnjldYVZjpLnQkhM2C
-fa5BkN9FdoyIzSAucjI6DFM1ly1hAwJALtk7nZsmCDxwByd7r7FNwE9z7Qzr81xrZd8nkE9CBACA
-9oMBTbUDAgAAAAAAAED/AAAAAAAAYL4AoEAAjb4AcP//V4PN/+sQkJCQkJCQigZGiAdHAdt1B4se
-g+78Edty7bgBAAAAAdt1B4seg+78EdsRwAHbc+91CYseg+78Edtz5DHJg+gDcg3B4AiKBkaD8P90
-dInFAdt1B4seg+78EdsRyQHbdQeLHoPu/BHbEcl1IEEB23UHix6D7vwR2xHJAdtz73UJix6D7vwR
-23Pkg8ECgf0A8///g9EBjRQvg/38dg+KAkKIB0dJdffpY////5CLAoPCBIkHg8cEg+kEd/EBz+lM
-////Xon3uZQAAACKB0cs6DwBd/eAPwd18osHil8EZsHoCMHAEIbEKfiA6+gB8IkHg8cFidji2Y2+
-ALAAAIsHCcB0PItfBI2EMDDRAAAB81CDxwj/lrzRAACVigdHCMB03In5V0jyrlX/lsDRAAAJwHQH
-iQODwwTr4f+WxNEAAGHpCHn//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+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
-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
-AAAAAAAAAAAAAAAAAAABAAkEAACoAAAAOKsAAKABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJ
-BAAA0AAAANisAABiAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAABArgAAWgIAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAAgAQAAoLAAAFwBAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-APThAAC84QAAAAAAAAAAAAAAAAAAAeIAAMzhAAAAAAAAAAAAAAAAAAAO4gAA1OEAAAAAAAAAAAAA
-AAAAABviAADc4QAAAAAAAAAAAAAAAAAAJeIAAOThAAAAAAAAAAAAAAAAAAAw4gAA7OEAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAOuIAAEjiAABY4gAAAAAAAGbiAAAAAAAAdOIAAAAAAACE4gAAAAAAAI7i
-AAAAAAAAlOIAAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkz
-Mi5kbGwATVNWQ1JULmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdldFByb2NBZGRyZXNz
-AABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEAAFRleHRPdXRBAABl
-eGl0AABHZXREQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAgAAACAAAIAFAAAAYAAAgAAA
+AAAAAAAAAAAAAAAAAQBuAAAAOAAAgAAAAAAAAAAAAAAAAAAAAQAAAAAAUAAAADCxAAAICgAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAQAawAAAJAAAIBsAAAAuAAAgG0AAADgAACAbgAAAAgBAIAAAAAA
+AAAAAAAAAAAAAAEACQQAAKgAAAA4uwAAoAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAADQ
+AAAA2LwAAGIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA+AAAAEC+AABaAgAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAEACQQAACABAACgwAAAXAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9PEA
+ALzxAAAAAAAAAAAAAAAAAAAB8gAAzPEAAAAAAAAAAAAAAAAAAA7yAADU8QAAAAAAAAAAAAAAAAAA
+G/IAANzxAAAAAAAAAAAAAAAAAAAl8gAA5PEAAAAAAAAAAAAAAAAAADDyAADs8QAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAA68gAASPIAAFjyAAAAAAAAZvIAAAAAAAB08gAAAAAAAITyAAAAAAAAjvIAAAAA
+AACU8gAAAAAAAEtFUk5FTDMyLkRMTABBRFZBUEkzMi5kbGwAQ09NQ1RMMzIuZGxsAEdESTMyLmRs
+bABNU1ZDUlQuZGxsAFVTRVIzMi5kbGwAAExvYWRMaWJyYXJ5QQAAR2V0UHJvY0FkZHJlc3MAAEV4
+aXRQcm9jZXNzAAAAUmVnQ2xvc2VLZXkAAABQcm9wZXJ0eVNoZWV0QQAAVGV4dE91dEEAAGV4aXQA
+AEdldERDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAA
 """
 
 # --- EOF ---

From 517c0d40da7055c00cdc68e76207ae86a72756bf Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 16 Mar 2001 21:00:18 +0000
Subject: [PATCH 0709/8469] Distutils version number has been changed from
 1.0.1 to 1.0.2pre before this get forgotten again. Should probably be set to
 1.0.2 before final release of python 2.1

Does someone still release distutils separate from python?
---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 55951090ff..bd9761cc25 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0.1"
+__version__ = "1.0.2pre"

From 59c4620e1fd084da8d9067c4eeadf763feb4760d Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 17 Mar 2001 19:59:26 +0000
Subject: [PATCH 0710/8469] Bug #409403: Signal an error if the distribution's
 metadata has no version

---
 dist.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist.py b/dist.py
index 41d5dbbc0b..6bda869e2e 100644
--- a/dist.py
+++ b/dist.py
@@ -206,6 +206,10 @@ def __init__ (self, attrs=None):
                     raise DistutilsSetupError, \
                           "invalid distribution option '%s'" % key
 
+        if self.metadata.version is None:
+            raise DistutilsSetupError, \
+                  "No version number specified for distribution"
+        
     # __init__ ()
 
 

From d23ca0098c0ef28b79e4833fcf6ed85fae2aa11a Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 17 Mar 2001 20:15:41 +0000
Subject: [PATCH 0711/8469] Fix bug #233253: the --define and --undef options
 didn't work, whether    specified on the command-line or in setup.cfg.  The
 option processing    leaves them as strings, but they're supposed to be
 lists.

---
 command/build_ext.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 866697577d..f732373ea3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -177,6 +177,21 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
+        # The argument parsing will result in self.define being a string, but
+        # it has to be a list of 2-tuples.  All the preprocessor symbols
+        # specified by the 'define' option will be set to '1'.  Multiple
+        # symbols can be separated with commas.
+        
+        if self.define:
+            defines = string.split(self.define, ',')
+            self.define = map(lambda symbol: (symbol, '1'), defines)
+
+        # The option for macros to undefine is also a string from the
+        # option parsing, but has to be a list.  Multiple symbols can also
+        # be separated with commas here.
+        if self.undef:
+            self.undef = string.split(self.undef, ',')
+
     # finalize_options ()
     
 

From 61fe3191e144fa397832ea37932156cdf904320c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 03:03:41 +0000
Subject: [PATCH 0712/8469] Patch #407434: add rfc822_escape utility function

---
 util.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util.py b/util.py
index e596150422..010db9a3b0 100644
--- a/util.py
+++ b/util.py
@@ -443,3 +443,13 @@ def byte_compile (py_files,
                               (file, cfile_base)
 
 # byte_compile ()
+
+def rfc822_escape (header):
+    """Return a version of the string escaped for inclusion in an
+    RFC-822 header, by adding a space after each newline.
+    """
+    header = string.rstrip(header)
+    header = string.replace(header, '\n', '\n ')
+    return header
+
+

From c5fc89cfdabbf37241d499f96c4c1bf08973b436 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 03:06:52 +0000
Subject: [PATCH 0713/8469] Add 'platforms' and 'keywords' attributes to the
 DistributionMetadata class,     along with options to print them. Add a
 finalize_options() method to Distribution to do final processing     on the
 platform and keyword attributes Add DistributionMetadata.write_pkg_info()
 method to write a PKG-INFO file     into the release tree.

---
 dist.py | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/dist.py b/dist.py
index 6bda869e2e..23466965ad 100644
--- a/dist.py
+++ b/dist.py
@@ -15,7 +15,7 @@
 from distutils.errors import *
 from distutils import sysconfig
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
-from distutils.util import check_environ, strtobool
+from distutils.util import check_environ, strtobool, rfc822_escape
 
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
@@ -85,6 +85,10 @@ class Distribution:
          "print the package description"),
         ('long-description', None,
          "print the long package description"),
+        ('platforms', None,
+         "print the list of platforms"),
+        ('keywords', None,
+         "print the list of keywords"),
         ]
     display_option_names = map(lambda x: translate_longopt(x[0]),
                                display_options)
@@ -206,9 +210,7 @@ def __init__ (self, attrs=None):
                     raise DistutilsSetupError, \
                           "invalid distribution option '%s'" % key
 
-        if self.metadata.version is None:
-            raise DistutilsSetupError, \
-                  "No version number specified for distribution"
+        self.finalize_options()
         
     # __init__ ()
 
@@ -526,6 +528,28 @@ def _parse_command_opts (self, parser, args):
     # _parse_command_opts ()
 
 
+    def finalize_options (self):
+        """Set final values for all the options on the Distribution
+        instance, analogous to the .finalize_options() method of Command
+        objects.
+        """
+
+        if self.metadata.version is None:
+            raise DistutilsSetupError, \
+                  "No version number specified for distribution"
+
+        keywords = self.metadata.keywords
+        if keywords is not None:
+            if type(keywords) is StringType:
+                keywordlist = string.split(keywords, ',')
+                self.metadata.keywords = map(string.strip, keywordlist)
+
+        platforms = self.metadata.platforms
+        if platforms is not None:
+            if type(platforms) is StringType:
+                platformlist = string.split(platforms, ',')
+                self.metadata.platforms = map(string.strip, platformlist)
+
     def _show_help (self,
                     parser,
                     global_options=1,
@@ -607,7 +631,11 @@ def handle_display_options (self, option_order):
         for (opt, val) in option_order:
             if val and is_display_option.get(opt):
                 opt = translate_longopt(opt)
-                print getattr(self.metadata, "get_"+opt)()
+                value = getattr(self.metadata, "get_"+opt)()
+                if opt in ['keywords', 'platforms']:
+                    print string.join(value, ',')
+                else:
+                    print value
                 any_display_options = 1
 
         return any_display_options
@@ -950,7 +978,38 @@ def __init__ (self):
         self.licence = None
         self.description = None
         self.long_description = None
+        self.keywords = None
+        self.platforms = None
         
+    def write_pkg_info (self, base_dir):
+        """Write the PKG-INFO file into the release tree.
+        """
+
+        pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
+
+        pkg_info.write('Metadata-Version: 1.0\n')
+        pkg_info.write('Name: %s\n' % self.get_name() )
+        pkg_info.write('Version: %s\n' % self.get_version() )
+        pkg_info.write('Summary: %s\n' % self.get_description() )
+        pkg_info.write('Home-page: %s\n' % self.get_url() )
+        pkg_info.write('Author: %s\n' % self.get_maintainer() )
+        pkg_info.write('Author-email: %s\n' % self.get_maintainer_email() )
+        pkg_info.write('License: %s\n' % self.get_licence() )
+
+        long_desc = rfc822_escape( self.get_long_description() )
+        pkg_info.write('Description: %s\n' % long_desc)
+
+        keywords = string.join( self.get_keywords(), ',')
+        if keywords:
+            pkg_info.write('Keywords: %s\n' % keywords )
+
+        for platform in self.get_platforms():
+            pkg_info.write('Platform: %s\n' % platform )
+
+        pkg_info.close()
+        
+    # write_pkg_info ()
+    
     # -- Metadata query methods ----------------------------------------
 
     def get_name (self):
@@ -996,6 +1055,12 @@ def get_description(self):
     def get_long_description(self):
         return self.long_description or "UNKNOWN"
 
+    def get_keywords(self):
+        return self.keywords or []
+
+    def get_platforms(self):
+        return self.platforms or ["UNKNOWN"]
+
 # class DistributionMetadata
 
 

From adced399695befb6c925c42e5ccae882a1f4924f Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 03:10:05 +0000
Subject: [PATCH 0714/8469] Call the write_pkg_info method

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

diff --git a/command/sdist.py b/command/sdist.py
index 1f9e9184d7..894d7d44c5 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -31,7 +31,6 @@ def show_formats ():
     pretty_printer.print_help(
         "List of available source distribution formats:")
 
-
 class sdist (Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
@@ -439,9 +438,10 @@ def make_release_tree (self, base_dir, files):
                 dest = os.path.join(base_dir, file)
                 self.copy_file(file, dest, link=link)
 
+        self.distribution.metadata.write_pkg_info(base_dir)
+        
     # make_release_tree ()
 
-
     def make_distribution (self):
         """Create the source distribution(s).  First, we create the release
         tree with 'make_release_tree()'; then, we create all required

From 047c580a97cb9ef9101c572e241cb5f33773c502 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 03:48:31 +0000
Subject: [PATCH 0715/8469] Back out conversion to string methods; the
 Distutils is intended to work    with 1.5.2

---
 cmd.py             |  6 +++---
 cygwinccompiler.py |  6 +++---
 extension.py       |  4 ++--
 version.py         | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cmd.py b/cmd.py
index cec4bff237..ce44829498 100644
--- a/cmd.py
+++ b/cmd.py
@@ -9,7 +9,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import sys, os, string, re
 from types import *
 from distutils.errors import *
 from distutils import util, dir_util, file_util, archive_util, dep_util
@@ -161,7 +161,7 @@ def dump_options (self, header=None, indent=""):
         print indent + header
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = option.translate(longopt_xlate)
+            option = string.translate(option, longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
@@ -421,7 +421,7 @@ def make_file (self, infiles, outfile, func, args,
         """
         if exec_msg is None:
             exec_msg = "generating %s from %s" % \
-                       (outfile, ', '.join(infiles))
+                       (outfile, string.join(infiles, ', '))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
         
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 42318ad3d4..f40d1a2d4a 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -365,10 +365,10 @@ def check_config_h():
     # "config.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import sys
+    import string,sys
     # if sys.version contains GCC then python was compiled with
     # GCC, and the config.h file should be OK
-    if sys.version.find("GCC") >= 0:
+    if string.find(sys.version,"GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
     fn = sysconfig.get_config_h_filename()
@@ -387,7 +387,7 @@ def check_config_h():
 
     else:
         # "config.h" contains an "#ifdef __GNUC__" or something similar
-        if s.find("__GNUC__") >= 0:
+        if string.find(s,"__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
             return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
diff --git a/extension.py b/extension.py
index f49abad003..a63ede233c 100644
--- a/extension.py
+++ b/extension.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os
+import os, string
 from types import *
 
 
@@ -168,7 +168,7 @@ def read_setup_file (filename):
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = value.find("=")
+                equals = string.find(value, "=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"
diff --git a/version.py b/version.py
index 2916eb79a1..9d3d172429 100644
--- a/version.py
+++ b/version.py
@@ -112,12 +112,12 @@ def parse (self, vstring):
             match.group(1, 2, 4, 5, 6)
 
         if patch:
-            self.version = tuple(map(int, [major, minor, patch]))
+            self.version = tuple(map(string.atoi, [major, minor, patch]))
         else:
-            self.version = tuple(map(int, [major, minor]) + [0])
+            self.version = tuple(map(string.atoi, [major, minor]) + [0])
 
         if prerelease:
-            self.prerelease = (prerelease[0], int(prerelease_num))
+            self.prerelease = (prerelease[0], string.atoi(prerelease_num))
         else:
             self.prerelease = None
 
@@ -125,9 +125,9 @@ def parse (self, vstring):
     def __str__ (self):
         
         if self.version[2] == 0:
-            vstring = '.'.join(map(str, self.version[0:2]))
+            vstring = string.join(map(str, self.version[0:2]), '.')
         else:
-            vstring = '.'.join(map(str, self.version))
+            vstring = string.join(map(str, self.version), '.')
 
         if self.prerelease:
             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])

From 7e76bc2645746985a3025843e7476b540c8c7316 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 03:50:09 +0000
Subject: [PATCH 0716/8469] Remove redundant import

---
 cygwinccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index f40d1a2d4a..92def164ad 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -365,7 +365,7 @@ def check_config_h():
     # "config.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string,sys
+    import string
     # if sys.version contains GCC then python was compiled with
     # GCC, and the config.h file should be OK
     if string.find(sys.version,"GCC") >= 0:

From 52e9a5d7a9f246c15dfefe605c6a4e37a706001d Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 22 Mar 2001 15:32:23 +0000
Subject: [PATCH 0717/8469] Use the get_contact*() accessors instead of
 get_maintainer*()

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

diff --git a/dist.py b/dist.py
index 23466965ad..7ef3a42b76 100644
--- a/dist.py
+++ b/dist.py
@@ -992,8 +992,8 @@ def write_pkg_info (self, base_dir):
         pkg_info.write('Version: %s\n' % self.get_version() )
         pkg_info.write('Summary: %s\n' % self.get_description() )
         pkg_info.write('Home-page: %s\n' % self.get_url() )
-        pkg_info.write('Author: %s\n' % self.get_maintainer() )
-        pkg_info.write('Author-email: %s\n' % self.get_maintainer_email() )
+        pkg_info.write('Author: %s\n' % self.get_contact() )
+        pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
         pkg_info.write('License: %s\n' % self.get_licence() )
 
         long_desc = rfc822_escape( self.get_long_description() )

From 9f790bc4fe4815ba2d112430a83d527a8b13f8b0 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 23 Mar 2001 17:30:26 +0000
Subject: [PATCH 0718/8469] Change rfc822_escape() to ensure there's a
 consistent amount of whitespace    after each newline, instead of just
 blindly inserting a space at    the start of each line.  (Improvement
 suggested by Thomas Wouters)

---
 util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util.py b/util.py
index 010db9a3b0..01abd346d5 100644
--- a/util.py
+++ b/util.py
@@ -446,10 +446,11 @@ def byte_compile (py_files,
 
 def rfc822_escape (header):
     """Return a version of the string escaped for inclusion in an
-    RFC-822 header, by adding a space after each newline.
+    RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    header = string.rstrip(header)
-    header = string.replace(header, '\n', '\n ')
+    lines = string.split(header, '\n')
+    lines = map(string.strip, lines)
+    header = string.join(lines, '\n' + 8*' ')
     return header
 
 

From 3d12c8d570fc54ac95ec9d25869b79b5b862c24a Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 31 Mar 2001 02:41:01 +0000
Subject: [PATCH 0719/8469] Back out the requirement to supply a version number

---
 dist.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dist.py b/dist.py
index 7ef3a42b76..1ac9786d8d 100644
--- a/dist.py
+++ b/dist.py
@@ -534,10 +534,6 @@ def finalize_options (self):
         objects.
         """
 
-        if self.metadata.version is None:
-            raise DistutilsSetupError, \
-                  "No version number specified for distribution"
-
         keywords = self.metadata.keywords
         if keywords is not None:
             if type(keywords) is StringType:

From 74314af647d7117a502d009c6c465851867e00e4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 5 Apr 2001 15:46:48 +0000
Subject: [PATCH 0720/8469] Patch #413912 from Steve Majewski: Add .m to the
 list of extensions     in order to support Objective-C.

---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index f7eb93ae43..9ecfb6d13b 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -67,7 +67,7 @@ class UnixCCompiler (CCompiler):
     # reasonable common default here, but it's not necessarily used on all
     # Unices!
 
-    src_extensions = [".c",".C",".cc",".cxx",".cpp"]
+    src_extensions = [".c",".C",".cc",".cxx",".cpp",".m"]
     obj_extension = ".o"
     static_lib_extension = ".a"
     shared_lib_extension = ".so"

From c6c4c5c787dad0ef56656ef9123aa7ae49be9c45 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 10 Apr 2001 18:57:07 +0000
Subject: [PATCH 0721/8469] Since bdist_wininst.py contains the installer
 executable, it had to be rebuild.

---
 command/bdist_wininst.py | 524 +++++++++++++++++++--------------------
 1 file changed, 262 insertions(+), 262 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index f1dd633297..477b733cd3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -237,7 +237,7 @@ def get_exe_bytes (self):
 AAAA4AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
 ZGUuDQ0KJAAAAAAAAABwv7aMNN7Y3zTe2N803tjfT8LU3zXe2N+3wtbfNt7Y39zB3N823tjfVsHL
 3zze2N803tnfSN7Y3zTe2N853tjf3MHS3zne2N+M2N7fNd7Y31JpY2g03tjfAAAAAAAAAABQRQAA
-TAEDAE55sjoAAAAAAAAAAOAADwELAQYAAEAAAAAQAAAAoAAAsOwAAACwAAAA8AAAAABAAAAQAAAA
+TAEDABAF0joAAAAAAAAAAOAADwELAQYAAEAAAAAQAAAAoAAA8OwAAACwAAAA8AAAAABAAAAQAAAA
 AgAABAAAAAAAAAAEAAAAAAAAAAAAAQAABAAAAAAAAAIAAAAAABAAABAAAAAAEAAAEAAAAAAAABAA
 AAAAAAAAAAAAADDxAABsAQAAAPAAADABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -250,7 +250,7 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCoh1qAd/HPj7S8gAAKg8AAAAsAAAJgEATP/b
+bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCtCN63fHS7mJS8gAAOo8AAAAsAAAJgEAbP/b
 //9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xU0YUAAi/BZHVl0X4AmAFcRvGD9v/n+
 2IP7/3Unag+4hcB1E4XtdA9XaBBw/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALbQp
 Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz3ALe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
@@ -258,18 +258,18 @@ def get_exe_bytes (self):
 UI/rL1wgGOpTDGoCrM2W7f9VIPDALmcQZronYy91JS67aFTH6Xbf891TAes7B1kO8yR0Cq3QHvkT
 A41F9G4GAgx7n4UYQqh9/BIDvO7NNEjMNBR1CQvIlgbTfTN/DlZqBFYQxBD7GlyEyHyJfg9hOIKz
 3drmPOsmpSsCUyqs+b5tW1OnCCWLBDvGdRcnEMKGNuEoco4KM8BsC+3/5FvJOIN9EAhTi10IaUOS
-druwffI4k8jdUOjISZJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sLDtLSA81xw7
-dGn/dChQaO72+b6QmBlLBCFcjnQTGnOd+5YNfIsEyYr2IR8byFn3H+w6Lh9kQ+2w0VoDxUUSPsgP
-3ea+U5eMGY1e8NAUxtHd8GHOgewY4YtNENAM/3/D30RUC/qNRAvquCtIDCvKg+kWA9GBOFBLBeP/
+druwffI4k8jdUOjISeJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sLDtLSCM1xw7
+dGn/dChQaO72+b6QmBlLBCGsjnQTGnOd+5YNfIsEyYr2IR8byFn3IDw6Lh9kQ+2w0VoDxUUSPsgP
+3ea+U5fcGY1e8NAUxtHd8GHOgewY4YtNENAM/3/D30RUC/qNRAvquCtIDCvKg+kWA9GBOFBLBeP/
 3fYGiU307mUsg2UMAGaDeAoAD45OHdv//+0GPfSLVRCLRBoqjTQajTwIA/uBPjEBY7lttgIuNoE/
 CwMEKou23Zq/D79OIIPCLokwA9ME8BHNW7f7Vh4DygUcAxHRCE8cicG/3LYvVxoD0BP0jRoe7I2F
-6P7dsxEalGKkC2iw81BmC7Z8254QH96Uzb1t742EBQ02+EZHGlAbJexkZvcDtXXwHkRhSwRoV9y9
-1AaYRsq8BecPXHRG4WDdd0xmi0YMUAQOQfd2TlB2hZIJ6S0AjbtrOPe6Hie0Pht2FFENbTTbb+xL
+6P7dsxEalGL0C2iw81BmC7Z82+4QH96Uzb1t742EBQ02+EZHGlAbJexkZvcDtXXwHkRhSwRoV9y9
+1AboRsq8BecPXHRG4WDdd0xmi0YMUAQOQfd2TlB2hZIJ6S0AjbtrOPe6Hie0Pht2FFENbTTbb+xL
 AfodGDkqFO5Nd2wbGBNAUItyv0AKUEJf69zGagZVFLQS/xoVOcbh5HYGjLR51ppw/3934ev3USQE
 RBGKCITJdAuA+S91A8YAXLlbOeNAde+HQDR0F4AjNRkmtlUWYV8F19gbrVkRJsBXUBTUlt9sBcfY
 jOIM0GoKmVn39222/PkzyWjocFEAHmi8AgAN0SyZhkVAPzBQbramtjLXGiEUFUi+oI5oS0fYBFYv
 WVBCDwFwct3dOR04GP/TaDbk+9qBNQdgIwoBFdOpM2e61xhfPJ+edm+tmcD08fbCEADauACare7b
-BgA9rOFOO5SBu8P92AkQQIWsDKd9CFchbdjVvgYzoTiiPH90FJdoctO5B94iaAEEAGmgVQbodHz4
+BgA9/OFOO5SBu8P92AkQQIWsDKd9CFchbdjVvgYzoTiiPH90FJdoctO5B94iaAEEAGmgVQbodHz4
 X1Aqf8cEJECg/QDwPfSZ3GfhGuQ12AUg3f5dmhpN6ANB1mgAjxZo/W8jm4MMwKEABF+sXusnutbu
 TeGBeAg49XUZS35wNfO95x3RdFzgKWwbrvDVg0unCkIIOKBr0Pp1Oa1GKaQ3/vbGMaEdQItQCo1I
 DvZRUveehUvLUVZGRKMwLA0nNEsM/F78EN7wW4TYILDD1yjWui61C6yL+AWQ/IuC9CrdNt4RK9Ar
@@ -277,260 +277,260 @@ def get_exe_bytes (self):
 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
-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
+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

From 4d5c70781a289e136da686d05bcb1a0767e08cea Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sat, 14 Apr 2001 16:17:00 +0000
Subject: [PATCH 0722/8469] Pete Shinners discovered that zipfile.ZipFile() is
 called with mode argument "wb", while the only valid modes are "r", "w" or
 "a".  Fix this by changing the mode to "w".

---
 archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archive_util.py b/archive_util.py
index 61bc25ea0f..4c5641b951 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -100,7 +100,7 @@ def visit (z, dirname, names):
                     z.write(path, path)
 
         if not dry_run:
-            z = zipfile.ZipFile(zip_filename, "wb",
+            z = zipfile.ZipFile(zip_filename, "w",
                                 compression=zipfile.ZIP_DEFLATED)
 
             os.path.walk(base_dir, visit, z)

From 48343f32fa28556d2d229b5a661bfe5e0b4b0634 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 23 Apr 2001 16:01:06 +0000
Subject: [PATCH 0723/8469] Bump version # for final release

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index bd9761cc25..16d387a46a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0.2pre"
+__version__ = "1.0.2"

From 09b62d24b0c662a7e9146fcafe7a4f29bff0d463 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 23 Apr 2001 17:13:03 +0000
Subject: [PATCH 0724/8469] Fix typo in docstring

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 16d387a46a..27e79a54ac 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,6 @@
 """distutils
 
-The main package for the Python Module Distribtion Utilities.  Normally
+The main package for the Python Module Distribution Utilities.  Normally
 used from a setup script as
 
    from distutils.core import setup

From 59653f9ebdb6ead7454c56aadfb40bfcb33b0bfa Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 17 May 2001 12:52:01 +0000
Subject: [PATCH 0725/8469] Made distutils understand the MacPython Carbon
 runtime model. Distutils will build for the runtime model you are currently
 using for the interpreter.

---
 mwerkscompiler.py | 2 ++
 sysconfig.py      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 2edc8259bf..981fd95f01 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -114,6 +114,8 @@ def link (self,
         # into the project.
         if output_filename[-8:] == '.ppc.slb':
             basename = output_filename[:-8]
+        elif output_filename[-11:] == '.carbon.slb':
+            basename = output_filename[:-11]
         else:
             basename = os.path.strip(output_filename)[0]
         projectname = basename + '.mcp'
diff --git a/sysconfig.py b/sysconfig.py
index 91f9279d87..473faea85e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -339,7 +339,11 @@ def _init_mac():
     # XXX hmmm.. a normal install puts include files here
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
+    import MacOS
+    if not hasattr(MacOS, 'runtimemodel'):
     g['SO'] = '.ppc.slb'
+    else:
+        g['SO'] = '.%s.slb' % MacOS.runtimemodel
 
     # XXX are these used anywhere?
     g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")

From 9ac36316de9ed5d0c147f7493e9b472480c7b4f7 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 17 May 2001 15:03:14 +0000
Subject: [PATCH 0726/8469] Fixed botched indent in _init_mac() code.  (It may
 never be executed, but it still can't have any syntax errors.  Went a little
 too fast there, Jack? :-)

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 473faea85e..d013d1b832 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -341,7 +341,7 @@ def _init_mac():
 
     import MacOS
     if not hasattr(MacOS, 'runtimemodel'):
-    g['SO'] = '.ppc.slb'
+        g['SO'] = '.ppc.slb'
     else:
         g['SO'] = '.%s.slb' % MacOS.runtimemodel
 

From 4fb616ab1845cdb8a67b68055a8a348db3c6f99c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 21 May 2001 20:34:38 +0000
Subject: [PATCH 0727/8469] Fix bug #418369: typo in bdist_rpm

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index f421590488..4659494533 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -189,7 +189,7 @@ def finalize_package_data (self):
         if type(self.doc_files) is ListType:
             for readme in ('README', 'README.txt'):
                 if os.path.exists(readme) and readme not in self.doc_files:
-                    self.doc.append(readme)
+                    self.doc_files.append(readme)
 
         self.ensure_string('release', "1")
         self.ensure_string('serial')   # should it be an int?

From e7ab99d0e57404a593cd9e44f9381d3f08b0925c Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Tue, 19 Jun 2001 19:44:02 +0000
Subject: [PATCH 0728/8469] Fixed -D emulation for symbols with a value, as
 specified with the define_macros Extension argument.

---
 mwerkscompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 981fd95f01..1b416715ea 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -164,7 +164,7 @@ def link (self,
                 if value is None:
                     fp.write('#define %s\n'%name)
                 else:
-                    fp.write('#define %s "%s"\n'%(name, value))
+                    fp.write('#define %s %s\n'%(name, value))
             fp.close()
             settings['prefixname'] = prefixname
 

From 37936adf51754abcc600a93964e105b20a052e20 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 19 Jun 2001 21:23:11 +0000
Subject: [PATCH 0729/8469] - _filename_to_abs() didn't cater for .. components
 in the pathname. Fixed. - compile() didn't return a (empty) list of objects.
 Fixed. - the various _fix_xxx_args() methods weren't called (are they new or
 did I overlook them?). Fixed.

---
 mwerkscompiler.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 1b416715ea..46e16e2e94 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -62,10 +62,13 @@ def compile (self,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
+         (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
          self.__sources = sources
          self.__macros = macros
          self.__include_dirs = include_dirs
          # Don't need extra_preargs and extra_postargs for CW
+         return []
          
     def link (self,
               target_desc,
@@ -80,6 +83,11 @@ def link (self,
               extra_preargs=None,
               extra_postargs=None,
               build_temp=None):
+        # First fixup.
+        (objects, output_dir) = self._fix_object_args (objects, output_dir)
+        (libraries, library_dirs, runtime_library_dirs) = \
+            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
         # First examine a couple of options for things that aren't implemented yet
         if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
             raise DistutilsPlatformError, 'Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac'
@@ -200,6 +208,11 @@ def _filename_to_abs(self, filename):
         if not os.path.isabs(filename):
            curdir = os.getcwd()
            filename = os.path.join(curdir, filename)
-        return filename
+        # Finally remove .. components
+        components = string.split(filename, ':')
+        for i in range(1, len(components)):
+           if components[i] == '..':
+              components[i] = ''
+        return string.join(components, ':')
         
         

From debc45c4d667d5573afe333e9ac6d9ede0d07da1 Mon Sep 17 00:00:00 2001
From: unknown <tools@python.org>
Date: Wed, 4 Jul 2001 16:52:02 +0000
Subject: [PATCH 0730/8469] dummy checkin for testing, please ignore

---
 command/bdist_wininst.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 477b733cd3..16a6cc418c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -216,7 +216,6 @@ def create_exe (self, arcname, fullname, bitmap=None):
     def get_exe_bytes (self):
         import base64
         return base64.decodestring(EXEDATA)
-
 # class bdist_wininst
 
 if __name__ == '__main__':

From 78fe57542d08d417655af49304c2b266b993a2ff Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 16 Jul 2001 14:19:20 +0000
Subject: [PATCH 0731/8469] [Bug #441527] Fixes for preprocessor support,
 contributed by Tarn     Weisner Burton

---
 unixccompiler.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 9ecfb6d13b..91e7d5e03b 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -99,12 +99,13 @@ def preprocess (self,
         if extra_preargs:
             pp_args[:0] = extra_preargs
         if extra_postargs:
-            extra_postargs.extend(extra_postargs)
+            pp_args.extend(extra_postargs)
 
-        # We need to preprocess: either we're being forced to, or the
-        # source file is newer than the target (or the target doesn't
+        # We need to preprocess: either we're being forced to, or we're
+	# generating output to stdout, or there's a target output file and 
+	# the source file is newer than the target (or the target doesn't
         # exist).
-        if self.force or (output_file and newer(source, output_file)):
+        if self.force or output_file is None or newer(source, output_file)):
             if output_file:
                 self.mkpath(os.path.dirname(output_file))
             try:

From 4490899b03853d52c7f718b6a2c5a54a2e865829 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 16 Jul 2001 14:46:13 +0000
Subject: [PATCH 0732/8469] Fix a mismatched parenthesis in the last patch.

---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 91e7d5e03b..da1f2a4e8e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -105,7 +105,7 @@ def preprocess (self,
 	# generating output to stdout, or there's a target output file and 
 	# the source file is newer than the target (or the target doesn't
         # exist).
-        if self.force or output_file is None or newer(source, output_file)):
+        if self.force or output_file is None or newer(source, output_file):
             if output_file:
                 self.mkpath(os.path.dirname(output_file))
             try:

From 89b261c72363d96d8c2e380370cff3396b22b488 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Wed, 18 Jul 2001 18:39:56 +0000
Subject: [PATCH 0733/8469] Minor changes for stylistic cleanliness and
 consistency.

---
 sysconfig.py | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d013d1b832..16e80231d1 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -1,5 +1,9 @@
-"""Provide access to Python's configuration information.  The specific names
-defined in the module depend heavily on the platform and configuration.
+"""Provide access to Python's configuration information.  The specific
+configuration variables available depend heavily on the platform and
+configuration.  The values may be retrieved using
+get_config_var(name), and the list of variables is available via
+get_config_vars().keys().  Additional convenience functions are also
+available.
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
@@ -45,7 +49,7 @@ def get_python_inc(plat_specific=0, prefix=None):
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """    
     if prefix is None:
-        prefix = (plat_specific and EXEC_PREFIX or PREFIX)
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
             return "Include/"
@@ -55,9 +59,9 @@ def get_python_inc(plat_specific=0, prefix=None):
     elif os.name == "mac":
         return os.path.join(prefix, "Include")
     else:
-        raise DistutilsPlatformError, \
-              ("I don't know where Python installs its C header files " +
-               "on platform '%s'") % os.name
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its C header files "
+            "on platform '%s'" % os.name)
 
 
 def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
@@ -75,7 +79,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
     if prefix is None:
-        prefix = (plat_specific and EXEC_PREFIX or PREFIX)
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
        
     if os.name == "posix":
         libpython = os.path.join(prefix,
@@ -96,23 +100,23 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             if standard_lib:
                 return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
             else:
-                raise DistutilsPlatformError, \
-                      "OK, where DO site-specific extensions go on the Mac?"
+                raise DistutilsPlatformError(
+                    "OK, where DO site-specific extensions go on the Mac?")
         else:
             if standard_lib:
                 return os.path.join(PREFIX, "Lib")
             else:
-                raise DistutilsPlatformError, \
-                      "OK, where DO site-specific modules go on the Mac?"
+                raise DistutilsPlatformError(
+                    "OK, where DO site-specific modules go on the Mac?")
     else:
-        raise DistutilsPlatformError, \
-              ("I don't know where Python installs its library " +
-               "on platform '%s'") % os.name
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its library "
+            "on platform '%s'" % os.name)
 
 # get_python_lib()
         
 
-def customize_compiler (compiler):
+def customize_compiler(compiler):
     """Do any platform-specific customization of the CCompiler instance
     'compiler'.  Mainly needed on Unix, so we can plug in the information
     that varies across Unices and is stored in Python's Makefile.
@@ -299,7 +303,7 @@ def _init_posix():
         if hasattr(msg, "strerror"):
             my_msg = my_msg + " (%s)" % msg.strerror
 
-        raise DistutilsPlatformError, my_msg
+        raise DistutilsPlatformError(my_msg)
               
     
     # On AIX, there are wrong paths to the linker scripts in the Makefile

From cfca016e6101c3590ecefd1731c56be76f4f6b83 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 20 Jul 2001 19:29:04 +0000
Subject: [PATCH 0734/8469] Patch #429442 from Jason Tishler: Corrects
 sys.platform and     distutils.util.get_platform() problems caused by the
 cruft contained     in Cygwin's uname -s.

---
 util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util.py b/util.py
index 01abd346d5..25ddbdf450 100644
--- a/util.py
+++ b/util.py
@@ -62,6 +62,7 @@ def get_platform ():
     elif osname[:3] == "aix":              
         return "%s-%s.%s" % (osname, version, release)
     elif osname[:6] == "cygwin":
+        osname = "cygwin"
         rel_re = re.compile (r'[\d.]+')
         m = rel_re.match(release)
         if m:

From 9dad3ab68accd527b9d7027b9d005303abfbdc35 Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 25 Jul 2001 19:48:03 +0000
Subject: [PATCH 0735/8469] Don't "import *" from stat at all -- just import
 what's needed, and do it back in copy_file() (not at module level).

---
 file_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/file_util.py b/file_util.py
index 39f6eea289..a3767bbd93 100644
--- a/file_util.py
+++ b/file_util.py
@@ -8,7 +8,6 @@
 __revision__ = "$Id$"
 
 import os
-from stat import *
 from distutils.errors import DistutilsFileError
 
 
@@ -108,6 +107,7 @@ def copy_file (src, dst,
     # (not update) and (src newer than dst).
 
     from distutils.dep_util import newer
+    from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
 
     if not os.path.isfile(src):
         raise DistutilsFileError, \

From 49b8a8e81d33296018e5454c1d42c9a8321510da Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Wed, 25 Jul 2001 20:20:11 +0000
Subject: [PATCH 0736/8469] Undo revision 1.7: always mangle a #! line
 containing "python" to point to the current Python interpreter (ie. the one
 used for building/installation), even (especially!) if "/usr/bin/env" appears
 in the #! line.

Rationale: installing scripts with "#!/usr/bin/env python" is asking for
trouble, because
  1) it might pick the wrong interpreter (not the one used to
     build/install the script)
  2) it doesn't work on all platforms (try it on IRIX 5, or on Linux
     with command-line options for python)
  3) "env" might not be in /usr/bin
---
 command/build_scripts.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index ee7f4e2d1e..653b8d8ace 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -10,10 +10,8 @@
 from distutils.core import Command
 from distutils.dep_util import newer
 
-# check if Python is called on the first line with this expression.
-# This expression will leave lines using /usr/bin/env alone; presumably
-# the script author knew what they were doing...)
-first_line_re = re.compile(r'^#!(?!\s*/usr/bin/env\b).*python(\s+.*)?')
+# check if Python is called on the first line with this expression
+first_line_re = re.compile(r'^#!.*python(\s+.*)?')
 
 class build_scripts (Command):
 

From 853724a093730bff94e89528c3117b032c8af6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 26 Jul 2001 13:41:06 +0000
Subject: [PATCH 0737/8469] Patch #411138: Rename config.h to pyconfig.h. 
 Closes bug #231774.

---
 command/build_ext.py |  4 ++--
 cygwinccompiler.py   | 16 ++++++++--------
 sysconfig.py         |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f732373ea3..259a8447fb 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -125,7 +125,7 @@ def finalize_options (self):
         self.extensions = self.distribution.ext_modules
         
 
-        # Make sure Python's include directories (for Python.h, config.h,
+        # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
         py_include = sysconfig.get_python_inc()
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
@@ -592,7 +592,7 @@ def get_libraries (self, ext):
         """
         # The python library is always needed on Windows.  For MSVC, this
         # is redundant, since the library is mentioned in a pragma in
-        # config.h that MSVC groks.  The other Windows compilers all seem
+        # pyconfig.h that MSVC groks.  The other Windows compilers all seem
         # to need it mentioned explicitly, though, so that's what we do.
         # Append '_d' to the python import library on debug builds.
         from distutils.msvccompiler import MSVCCompiler
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 92def164ad..07e16655b0 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -73,7 +73,7 @@ def __init__ (self,
                          (status, details))
         if status is not CONFIG_H_OK:
             self.warn(
-                "Python's config.h doesn't seem to support your compiler.  " +
+                "Python's pyconfig.h doesn't seem to support your compiler.  " +
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
         
@@ -335,7 +335,7 @@ def __init__ (self,
 
 # class Mingw32CCompiler
 
-# Because these compilers aren't configured in Python's config.h file by
+# Because these compilers aren't configured in Python's pyconfig.h file by
 # default, we should at least warn the user if he is using a unmodified
 # version.
 
@@ -345,7 +345,7 @@ def __init__ (self,
 
 def check_config_h():
 
-    """Check if the current Python installation (specifically, config.h)
+    """Check if the current Python installation (specifically, pyconfig.h)
     appears amenable to building extensions with GCC.  Returns a tuple
     (status, details), where 'status' is one of the following constants:
       CONFIG_H_OK
@@ -353,21 +353,21 @@ def check_config_h():
       CONFIG_H_NOTOK
         doesn't look good
       CONFIG_H_UNCERTAIN
-        not sure -- unable to read config.h
+        not sure -- unable to read pyconfig.h
     'details' is a human-readable string explaining the situation.
 
     Note there are two ways to conclude "OK": either 'sys.version' contains
     the string "GCC" (implying that this Python was built with GCC), or the
-    installed "config.h" contains the string "__GNUC__".
+    installed "pyconfig.h" contains the string "__GNUC__".
     """
 
     # XXX since this function also checks sys.version, it's not strictly a
-    # "config.h" check -- should probably be renamed...
+    # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
     import string
     # if sys.version contains GCC then python was compiled with
-    # GCC, and the config.h file should be OK
+    # GCC, and the pyconfig.h file should be OK
     if string.find(sys.version,"GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
@@ -386,7 +386,7 @@ def check_config_h():
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
     else:
-        # "config.h" contains an "#ifdef __GNUC__" or something similar
+        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
         if string.find(s,"__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
diff --git a/sysconfig.py b/sysconfig.py
index 16e80231d1..529d0e6dd3 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -43,7 +43,7 @@ def get_python_inc(plat_specific=0, prefix=None):
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
     otherwise, this is the path to platform-specific header files
-    (namely config.h).
+    (namely pyconfig.h).
 
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
@@ -137,10 +137,10 @@ def customize_compiler(compiler):
 
 
 def get_config_h_filename():
-    """Return full pathname of installed config.h file."""
+    """Return full pathname of installed pyconfig.h file."""
     if python_build: inc_dir = '.'
     else:            inc_dir = get_python_inc(plat_specific=1)
-    return os.path.join(inc_dir, "config.h")
+    return os.path.join(inc_dir, "pyconfig.h")
 
 
 def get_makefile_filename():

From 80b512fee5d1ee8342100e305a8582f4b121d978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Thu, 26 Jul 2001 18:06:58 +0000
Subject: [PATCH 0738/8469] Add backwards compatibility.

---
 sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 529d0e6dd3..bbf7c4afab 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -140,7 +140,12 @@ def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build: inc_dir = '.'
     else:            inc_dir = get_python_inc(plat_specific=1)
-    return os.path.join(inc_dir, "pyconfig.h")
+    if sys.version < '2.2':
+        config_h = 'config.h'
+    else:
+        # The name of the config.h file changed in 2.2
+        config_h = 'pyconfig.h'
+    return os.path.join(inc_dir, config_h)
 
 
 def get_makefile_filename():

From 6f9753a79698a3fd9c882c8567cd75a351e6e04a Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Sun, 29 Jul 2001 21:39:18 +0000
Subject: [PATCH 0739/8469] Do convert_path() on script paths (now PyXML builds
 out of the box under MacOS.)

---
 command/build_scripts.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 653b8d8ace..611767e7bc 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -9,6 +9,7 @@
 import sys, os, re
 from distutils.core import Command
 from distutils.dep_util import newer
+from distutils.util import convert_path
 
 # check if Python is called on the first line with this expression
 first_line_re = re.compile(r'^#!.*python(\s+.*)?')
@@ -54,6 +55,7 @@ def copy_scripts (self):
         self.mkpath(self.build_dir)
         for script in self.scripts:
             adjust = 0
+            script = convert_path(script)
             outfile = os.path.join(self.build_dir, os.path.basename(script))
 
             if not self.force and not newer(script, outfile):

From 27487d75c92e72a5a28d25d0b75bbb26c49ec5b4 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 2 Aug 2001 20:03:12 +0000
Subject: [PATCH 0740/8469] Miscellaneous minor cleanups.

---
 sysconfig.py | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index bbf7c4afab..1f0d14539f 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -29,14 +29,15 @@
 python_build = 0
 
 def set_python_build():
-    """Set the python_build flag to true; this means that we're
-    building Python itself.  Only called from the setup.py script
-    shipped with Python.
+    """Set the python_build flag to true.
+
+    This means that we're building Python itself.  Only called from
+    the setup.py script shipped with Python.
     """
-    
     global python_build
     python_build = 1
 
+
 def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
 
@@ -55,7 +56,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             return "Include/"
         return os.path.join(prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
-        return os.path.join(prefix, "Include") # include or Include?
+        return os.path.join(prefix, "include")
     elif os.name == "mac":
         return os.path.join(prefix, "Include")
     else:
@@ -80,7 +81,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     """
     if prefix is None:
         prefix = plat_specific and EXEC_PREFIX or PREFIX
-       
+
     if os.name == "posix":
         libpython = os.path.join(prefix,
                                  "lib", "python" + sys.version[:3])
@@ -91,20 +92,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 
     elif os.name == "nt":
         if standard_lib:
-            return os.path.join(PREFIX, "Lib")
+            return os.path.join(prefix, "Lib")
         else:
             return prefix
 
     elif os.name == "mac":
         if plat_specific:
             if standard_lib:
-                return os.path.join(EXEC_PREFIX, "Mac", "Plugins")
+                return os.path.join(prefix, "Mac", "Plugins")
             else:
                 raise DistutilsPlatformError(
                     "OK, where DO site-specific extensions go on the Mac?")
         else:
             if standard_lib:
-                return os.path.join(PREFIX, "Lib")
+                return os.path.join(prefix, "Lib")
             else:
                 raise DistutilsPlatformError(
                     "OK, where DO site-specific modules go on the Mac?")
@@ -113,13 +114,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
-# get_python_lib()
-        
 
 def customize_compiler(compiler):
-    """Do any platform-specific customization of the CCompiler instance
-    'compiler'.  Mainly needed on Unix, so we can plug in the information
-    that varies across Unices and is stored in Python's Makefile.
+    """Do any platform-specific customization of a CCompiler instance.
+
+    Mainly needed on Unix, so we can plug in the information that
+    varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
         (cc, opt, ccshared, ldshared, so_ext) = \
@@ -138,8 +138,10 @@ def customize_compiler(compiler):
 
 def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
-    if python_build: inc_dir = '.'
-    else:            inc_dir = get_python_inc(plat_specific=1)
+    if python_build:
+        inc_dir = os.curdir
+    else:
+        inc_dir = get_python_inc(plat_specific=1)
     if sys.version < '2.2':
         config_h = 'config.h'
     else:
@@ -197,7 +199,6 @@ def parse_makefile(fn, g=None):
     A dictionary containing name/value pairs is returned.  If an
     optional dictionary is passed in as the second argument, it is
     used instead of a new dictionary.
-
     """
     from distutils.text_file import TextFile
     fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
@@ -309,8 +310,8 @@ def _init_posix():
             my_msg = my_msg + " (%s)" % msg.strerror
 
         raise DistutilsPlatformError(my_msg)
-              
-    
+
+
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.
@@ -397,6 +398,6 @@ def get_config_vars(*args):
 def get_config_var(name):
     """Return the value of a single variable using the dictionary
     returned by 'get_config_vars()'.  Equivalent to
-      get_config_vars().get(name)
+    get_config_vars().get(name)
     """
     return get_config_vars().get(name)

From 6daca2f31cd60949e816919a9c1163b016c02a71 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 9 Aug 2001 20:57:46 +0000
Subject: [PATCH 0741/8469] Use correct variable name

---
 fancy_getopt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 6f8b8c06f1..83d07216a7 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -275,7 +275,7 @@ def getopt (self, args=None, object=None):
             if not self.takes_arg[opt]:     # boolean option?
                 if val != '':               # shouldn't have a value!
                     raise DistutilsInternalError, \
-                          "this can't happen: bad option value '%s'" % value
+                          "this can't happen: bad option value '%s'" % val
 
                 alias = self.negative_alias.get(opt)
                 if alias:

From db61a5d336c081391a6621918a63df03e9b64e04 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 9 Aug 2001 20:59:53 +0000
Subject: [PATCH 0742/8469] Import the errno module

---
 file_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/file_util.py b/file_util.py
index a3767bbd93..991d8357b5 100644
--- a/file_util.py
+++ b/file_util.py
@@ -188,7 +188,8 @@ def move_file (src, dst,
     other systems???
     """
     from os.path import exists, isfile, isdir, basename, dirname
-
+    import errno
+    
     if verbose:
         print "moving %s -> %s" % (src, dst)
 

From ff1cb1dae11e3fb8f12fba68a62f9c0085ff9e50 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 9 Aug 2001 21:02:34 +0000
Subject: [PATCH 0743/8469] Import UnknownFileError

---
 bcppcompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 00ccec548b..2742b5fe33 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -17,7 +17,7 @@
 import sys, os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError
+     CompileError, LibError, LinkError, UnknownFileError
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.file_util import write_file

From 34771a9b3649f5b2762c5090a5587d49dc7e9698 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 18:49:23 +0000
Subject: [PATCH 0744/8469] [Bug #412271, bug #449009] Use 'license' as the
 attribute name,    though 'licence' is still supported for
 backward-compatibility    (Should I add a warning to get_licence(), or not
 bother?)

Also fixes an UnboundLocalError noticed by PyChecker
---
 dist.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dist.py b/dist.py
index 1ac9786d8d..824a0d3e6a 100644
--- a/dist.py
+++ b/dist.py
@@ -13,7 +13,6 @@
 from types import *
 from copy import copy
 from distutils.errors import *
-from distutils import sysconfig
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 
@@ -77,10 +76,10 @@ class Distribution:
          "print the maintainer's email address if known, else the author's"),
         ('url', None,
          "print the URL for this package"),
-        ('licence', None,
-         "print the licence of the package"),
         ('license', None,
-         "alias for --licence"),
+         "print the license of the package"),
+        ('licence', None,
+         "alias for --license"),
         ('description', None,
          "print the package description"),
         ('long-description', None,
@@ -395,7 +394,7 @@ def parse_command_line (self):
         self.commands = []
         parser = FancyGetopt(self.global_options + self.display_options)
         parser.set_negative_aliases(self.negative_opt)
-        parser.set_aliases({'license': 'licence'})
+        parser.set_aliases({'licence': 'license'})
         args = parser.getopt(args=self.script_args, object=self)
         option_order = parser.get_option_order()
 
@@ -580,7 +579,7 @@ def _show_help (self,
             print
 
         for command in self.commands:
-            if type(command) is ClassType and issubclass(klass, Command):
+            if type(command) is ClassType and issubclass(command, Command):
                 klass = command
             else:
                 klass = self.get_command_class(command)
@@ -971,7 +970,7 @@ def __init__ (self):
         self.maintainer = None
         self.maintainer_email = None
         self.url = None
-        self.licence = None
+        self.license = None
         self.description = None
         self.long_description = None
         self.keywords = None
@@ -990,7 +989,7 @@ def write_pkg_info (self, base_dir):
         pkg_info.write('Home-page: %s\n' % self.get_url() )
         pkg_info.write('Author: %s\n' % self.get_contact() )
         pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
-        pkg_info.write('License: %s\n' % self.get_licence() )
+        pkg_info.write('License: %s\n' % self.get_license() )
 
         long_desc = rfc822_escape( self.get_long_description() )
         pkg_info.write('Description: %s\n' % long_desc)
@@ -1042,9 +1041,10 @@ def get_contact_email(self):
     def get_url(self):
         return self.url or "UNKNOWN"
 
-    def get_licence(self):
-        return self.licence or "UNKNOWN"
-
+    def get_license(self):
+        return self.license or "UNKNOWN"
+    get_licence = get_license
+    
     def get_description(self):
         return self.description or "UNKNOWN"
 

From 404bfc2ce6499d3f1e0f3f7bc318805fb1f53feb Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 18:50:11 +0000
Subject: [PATCH 0745/8469] Use .get_license()

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 4659494533..92de935825 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -347,7 +347,7 @@ def _make_spec_file(self):
             spec_file.append('Source0: %{name}-%{version}.tar.gz')
 
         spec_file.extend([
-            'Copyright: ' + self.distribution.get_licence(),
+            'Copyright: ' + self.distribution.get_license(),
             'Group: ' + self.group,
             'BuildRoot: %{_tmppath}/%{name}-buildroot',
             'Prefix: %{_prefix}', ])

From a23893242a626332e830cf29243efe00df23c38f Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 10 Aug 2001 18:59:30 +0000
Subject: [PATCH 0746/8469] Wrap a comment to fit in 80 columns. Use
 construction-syntax for an exception to make the argument easier to read.

---
 dist.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dist.py b/dist.py
index 824a0d3e6a..3803f5cc68 100644
--- a/dist.py
+++ b/dist.py
@@ -375,8 +375,8 @@ def parse_command_line (self):
         help).
         """
         #
-        # We now have enough information to show the Macintosh dialog that allows
-        # the user to interactively specify the "command line".
+        # We now have enough information to show the Macintosh dialog
+        # that allows the user to interactively specify the "command line".
         #
         if sys.platform == 'mac':
             import EasyDialogs
@@ -508,10 +508,10 @@ def _parse_command_opts (self, parser, args):
                     if callable(func):
                         func()
                     else:
-                        raise DistutilsClassError, \
-                            ("invalid help function %s for help option '%s': "
-                             "must be a callable object (function, etc.)") % \
-                            (`func`, help_option)
+                        raise DistutilsClassError(
+                            "invalid help function %s for help option '%s': "
+                            "must be a callable object (function, etc.)"
+                            % (`func`, help_option))
 
             if help_option_found: 
                 return

From 67be7feb397ea9c635a125a3efa771e38454e78c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 18:59:59 +0000
Subject: [PATCH 0747/8469] Add forgotten import

---
 command/install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/install.py b/command/install.py
index 40e00705d3..1d0a34e4cd 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,6 +10,7 @@
 from types import *
 from distutils.core import Command, DEBUG
 from distutils.sysconfig import get_config_vars
+from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError

From cd27545f369affed2ce5537416fd463fb1180c1c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 19:00:15 +0000
Subject: [PATCH 0748/8469] Fix typo caught by PyChecker

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 92de935825..150fdeca62 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -167,7 +167,7 @@ def finalize_options (self):
                   ("don't know how to create RPM "
                    "distributions on platform %s" % os.name)
         if self.binary_only and self.source_only:
-            raise DistutilsOptionsError, \
+            raise DistutilsOptionError, \
                   "cannot supply both '--source-only' and '--binary-only'"
 
         # don't pass CFLAGS to pure python distributions

From f7cb031597baffc1532b640a2c5fb2d08f306524 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 19:00:41 +0000
Subject: [PATCH 0749/8469] Remove unused variable

---
 command/build_scripts.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 611767e7bc..16024e5fed 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -51,7 +51,6 @@ def copy_scripts (self):
         ie. starts with "\#!" and contains "python"), then adjust the first
         line to refer to the current Python interpreter as we copy.
         """
-        outfiles = []
         self.mkpath(self.build_dir)
         for script in self.scripts:
             adjust = 0

From 45de3e623e5f498ee233b53b22a76a48fc542a08 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 10 Aug 2001 20:24:33 +0000
Subject: [PATCH 0750/8469] [Bug #414032] Make the 'sdist' command work when
 the distribution contains     libraries.  This is done by adding a
 .get_source_files() method,     contributed by Rene Liebscher and slightly
 modified. Remove an unused local variable spotted by PyChecker

---
 command/build_clib.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 063da91552..69ed044551 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -184,9 +184,25 @@ def get_library_names (self):
     # get_library_names ()
 
 
-    def build_libraries (self, libraries):
+    def get_source_files (self):
+        self.check_library_list(self.libraries)
+        filenames = []
+        for (lib_name, build_info) in self.libraries:
+            sources = build_info.get('sources')
+            if (sources is None or
+                type(sources) not in (ListType, TupleType) ):
+                raise DistutilsSetupError, \
+                      ("in 'libraries' option (library '%s'), "
+                       "'sources' must be present and must be "
+                       "a list of source filenames") % lib_name
+            
+            filenames.extend(sources)
+
+        return filenames
+    # get_source_files ()
 
-        compiler = self.compiler
+
+    def build_libraries (self, libraries):
 
         for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')

From 33c706bf78fbd8f9aad6ec837164a703b8a9a2e2 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 13 Aug 2001 13:56:24 +0000
Subject: [PATCH 0751/8469] Fix for NameError caught by PyChecker. (This
 command seems to be essentially untested; should fix that...)

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

diff --git a/command/config.py b/command/config.py
index ce6cff8cef..d409691874 100644
--- a/command/config.py
+++ b/command/config.py
@@ -272,8 +272,8 @@ def try_run (self, body,
         from distutils.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
-            self._link(body, headers, include_dirs,
-                       libraries, library_dirs, lang)
+            src, obj, exe = self._link(body, headers, include_dirs,
+                                       libraries, library_dirs, lang)
             self.spawn([exe])
             ok = 1
         except (CompileError, LinkError, DistutilsExecError):

From dbdaae041996677d97be3ed6bed2b0bd59643989 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 16 Aug 2001 13:56:40 +0000
Subject: [PATCH 0752/8469] [Patch #442530 from twburton]     Provide
 include_dirs argument to all calls to ._preprocess and ._compile     Fix
 typo: pattern.search(pattern) should be pattern.search(line)

---
 command/config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/config.py b/command/config.py
index d409691874..2df42a5722 100644
--- a/command/config.py
+++ b/command/config.py
@@ -187,7 +187,7 @@ def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
         self._check_compiler()
         ok = 1
         try:
-            self._preprocess(body, headers, lang)
+            self._preprocess(body, headers, include_dirs, lang)
         except CompileError:
             ok = 0
 
@@ -205,7 +205,7 @@ def search_cpp (self, pattern, body=None,
         """
 
         self._check_compiler()
-        (src, out) = self._preprocess(body, headers, lang)
+        (src, out) = self._preprocess(body, headers, include_dirs, lang)
 
         if type(pattern) is StringType:
             pattern = re.compile(pattern)
@@ -216,7 +216,7 @@ def search_cpp (self, pattern, body=None,
             line = file.readline()
             if line == '':
                 break
-            if pattern.search(pattern):
+            if pattern.search(line):
                 match = 1
                 break
 
@@ -231,7 +231,7 @@ def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
         from distutils.ccompiler import CompileError
         self._check_compiler()
         try:
-            self._compile(body, headers, lang)
+            self._compile(body, headers, include_dirs, lang)
             ok = 1
         except CompileError:
             ok = 0

From 95bdf9afbb9a6455ee440381fc6226fd00aede8f Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 16 Aug 2001 14:08:02 +0000
Subject: [PATCH 0753/8469] [Patch #444854 from twburton]     Add executable
 extension, needed to get the program name right on Win32

---
 command/config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/command/config.py b/command/config.py
index 2df42a5722..b89997a293 100644
--- a/command/config.py
+++ b/command/config.py
@@ -148,10 +148,13 @@ def _link (self, body,
                libraries, library_dirs, lang):
         (src, obj) = self._compile(body, headers, include_dirs, lang)
         prog = os.path.splitext(os.path.basename(src))[0] 
-        self.temp_files.append(prog)    # XXX should be prog + exe_ext
         self.compiler.link_executable([obj], prog,
                                       libraries=libraries,
                                       library_dirs=library_dirs)
+
+        prog = prog + self.compiler.exe_extension
+        self.temp_files.append(prog)
+
         return (src, obj, prog)
 
     def _clean (self, *filenames):

From d786b1a936ba0f38409c95d2906c908d1ba245a1 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 16 Aug 2001 20:17:41 +0000
Subject: [PATCH 0754/8469] [Patch #441691] preprocess() method for Borland C
 compiler.     I have no way of testing this.

---
 bcppcompiler.py | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 2742b5fe33..5c0fae8b71 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -21,7 +21,7 @@
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.file_util import write_file
-
+from distutils.dep_util import newer
 
 class BCPPCompiler(CCompiler) :
     """Concrete class that implements an interface to the Borland C/C++
@@ -373,3 +373,37 @@ def object_filenames (self,
         return obj_names
 
     # object_filenames ()
+
+    def preprocess (self,
+                    source,
+                    output_file=None,
+                    macros=None,
+                    include_dirs=None,
+                    extra_preargs=None,
+                    extra_postargs=None):
+
+        (_, macros, include_dirs) = \
+            self._fix_compile_args(None, macros, include_dirs)
+        pp_opts = gen_preprocess_options(macros, include_dirs)
+        pp_args = ['cpp32.exe'] + pp_opts
+        if output_file is not None:
+            pp_args.append('-o' + output_file)
+        if extra_preargs:
+            pp_args[:0] = extra_preargs
+        if extra_postargs:
+            pp_args.extend(extra_postargs)
+        pp_args.append(source)
+
+        # We need to preprocess: either we're being forced to, or the
+        # source file is newer than the target (or the target doesn't
+        # exist).
+        if self.force or output_file is None or newer(source, output_file):
+            if output_file:
+                self.mkpath(os.path.dirname(output_file))
+            try:
+                self.spawn(pp_args)
+            except DistutilsExecError, msg:
+                print msg
+                raise CompileError, msg
+
+    # preprocess()

From f5528a1e2f78f25f3208d3365f6b0ed3f5e7e74e Mon Sep 17 00:00:00 2001
From: Greg Ward <gward@python.net>
Date: Thu, 23 Aug 2001 20:53:27 +0000
Subject: [PATCH 0755/8469] Patch #449054 to implement PEP 250.  The standard
 install directory for modules and extensions on Windows is now
 $PREFIX/Lib/site-packages. Includes backwards compatibility code for pre-2.2
 Pythons.  Contributed by Paul Moore.

---
 command/install.py | 25 ++++++++++++++++++-------
 sysconfig.py       |  5 ++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/command/install.py b/command/install.py
index 1d0a34e4cd..5af4cf1055 100644
--- a/command/install.py
+++ b/command/install.py
@@ -16,6 +16,23 @@
 from distutils.errors import DistutilsOptionError
 from glob import glob
 
+if sys.version < "2.2":
+    WINDOWS_SCHEME = {
+        'purelib': '$base',
+        'platlib': '$base',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+else:
+    WINDOWS_SCHEME = {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -31,13 +48,7 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
-    'nt': {
-        'purelib': '$base',
-        'platlib': '$base',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
+    'nt': WINDOWS_SCHEME,
     'mac': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
diff --git a/sysconfig.py b/sysconfig.py
index 1f0d14539f..558ff2938e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -94,7 +94,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         if standard_lib:
             return os.path.join(prefix, "Lib")
         else:
-            return prefix
+            if sys.version < "2.2":
+                return prefix
+            else:
+                return os.path.join(PREFIX, "Lib", "site-packages")
 
     elif os.name == "mac":
         if plat_specific:

From 679698bbb368dc2cee79992418c7720f2acce34a Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 27 Aug 2001 15:08:16 +0000
Subject: [PATCH 0756/8469] Patch by Bill Noon: added 'dylib' as a library type
 along with 'static' and 'shared'. This fixes extension building for dynamic
 Pythons on MacOSX.

---
 ccompiler.py     | 4 ++--
 unixccompiler.py | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 4a282d4cff..4efd93407b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -792,8 +792,8 @@ def library_filename (self,
                           output_dir=''):
 
         if output_dir is None: output_dir = ''
-        if lib_type not in ("static","shared"):
-            raise ValueError, "'lib_type' must be \"static\" or \"shared\""
+        if lib_type not in ("static","shared","dylib"):
+            raise ValueError, "'lib_type' must be \"static\", \"shared\" or \"dylib\""
         fmt = getattr (self, lib_type + "_lib_format")
         ext = getattr (self, lib_type + "_lib_extension")
 
diff --git a/unixccompiler.py b/unixccompiler.py
index da1f2a4e8e..a4f0ac4d04 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -71,7 +71,8 @@ class UnixCCompiler (CCompiler):
     obj_extension = ".o"
     static_lib_extension = ".a"
     shared_lib_extension = ".so"
-    static_lib_format = shared_lib_format = "lib%s%s"
+    dylib_lib_extension = ".dylib"
+    static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
 
 
 
@@ -259,6 +260,8 @@ def find_library_file (self, dirs, lib, debug=0):
         for dir in dirs:
             shared = os.path.join(
                 dir, self.library_filename(lib, lib_type='shared'))
+            dylib = os.path.join(
+                dir, self.library_filename(lib, lib_type='dylib'))
             static = os.path.join(
                 dir, self.library_filename(lib, lib_type='static'))
 
@@ -266,7 +269,9 @@ def find_library_file (self, dirs, lib, debug=0):
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm
             # ignoring even GCC's "-static" option.  So sue me.
-            if os.path.exists(shared):
+            if os.path.exists(dylib):
+                return dylib
+            elif os.path.exists(shared):
                 return shared
             elif os.path.exists(static):
                 return static

From 31ba5afaf948150804377ad1f4a508e9578d1549 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Wed, 29 Aug 2001 23:57:22 +0000
Subject: [PATCH 0757/8469] Flush output more aggressively.  This makes things
 look better if the setup script is running from inside Vim.

---
 cmd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmd.py b/cmd.py
index ce44829498..85a7f46182 100644
--- a/cmd.py
+++ b/cmd.py
@@ -188,6 +188,7 @@ def announce (self, msg, level=1):
         """
         if self.verbose >= level:
             print msg
+            sys.stdout.flush()
 
     def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
@@ -196,6 +197,7 @@ def debug_print (self, msg):
         from distutils.core import DEBUG
         if DEBUG:
             print msg
+            sys.stdout.flush()
         
 
 

From 8035ea689daa1273bbcb133c80e51c70a4fa3ca6 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Mon, 3 Sep 2001 15:47:21 +0000
Subject: [PATCH 0758/8469] Don't use dir() to find instance attribute names.

---
 dist.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dist.py b/dist.py
index 3803f5cc68..40dcc96e27 100644
--- a/dist.py
+++ b/dist.py
@@ -122,9 +122,7 @@ def __init__ (self, attrs=None):
         # worth it.  Also delegate 'get_XXX()' methods to the 'metadata'
         # object in a sneaky and underhanded (but efficient!) way.
         self.metadata = DistributionMetadata()
-        method_basenames = dir(self.metadata) + \
-                           ['fullname', 'contact', 'contact_email']
-        for basename in method_basenames:
+        for basename in self.metadata._METHOD_BASENAMES:
             method_name = "get_" + basename
             setattr(self, method_name, getattr(self.metadata, method_name))
 
@@ -962,6 +960,12 @@ class DistributionMetadata:
     author, and so forth.
     """
 
+    _METHOD_BASENAMES = ("name", "version", "author", "author_email",
+                         "maintainer", "maintainer_email", "url",
+                         "license", "description", "long_description",
+                         "keywords", "platforms", "fullname", "contact",
+                         "contact_email", "licence")
+
     def __init__ (self):
         self.name = None
         self.version = None

From 66b732945438e944b73f2417ac97195af45c49d7 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 4 Sep 2001 12:01:49 +0000
Subject: [PATCH 0759/8469] On the mac some library paths returned were
 outdated, some were outright funny. Fixed.

---
 sysconfig.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 558ff2938e..cc663a8341 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -102,16 +102,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     elif os.name == "mac":
         if plat_specific:
             if standard_lib:
-                return os.path.join(prefix, "Mac", "Plugins")
+                return os.path.join(prefix, "Lib", "lib-dynload")
             else:
-                raise DistutilsPlatformError(
-                    "OK, where DO site-specific extensions go on the Mac?")
+                return os.path.join(prefix, "Lib", "site-packages")
         else:
             if standard_lib:
                 return os.path.join(prefix, "Lib")
             else:
-                raise DistutilsPlatformError(
-                    "OK, where DO site-specific modules go on the Mac?")
+                return os.path.join(prefix, "Lib", "site-packages")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "

From 6d5c86825f122583f4fec4be228f10e2c712e61e Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 4 Sep 2001 20:06:43 +0000
Subject: [PATCH 0760/8469] [Bug #436732] install.py does not record a created
 *.pth file in the    INSTALLED_FILES output.  Modified version of a patch
 from    Jon Nelson (jnelson)

---
 command/install.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/command/install.py b/command/install.py
index 5af4cf1055..022e34a2e0 100644
--- a/command/install.py
+++ b/command/install.py
@@ -537,8 +537,7 @@ def create_path_file (self):
     # -- Reporting methods ---------------------------------------------
 
     def get_outputs (self):
-        # This command doesn't have any outputs of its own, so just
-        # get the outputs of all its sub-commands.
+        # Assemble the outputs of all the sub-commands.
         outputs = []
         for cmd_name in self.get_sub_commands():
             cmd = self.get_finalized_command(cmd_name)
@@ -548,6 +547,10 @@ def get_outputs (self):
                 if filename not in outputs:
                     outputs.append(filename)
 
+        if self.path_file and self.install_path_file:
+            outputs.append(os.path.join(self.install_libbase,
+                                        self.path_file + ".pth"))
+            
         return outputs
 
     def get_inputs (self):

From 33914718f28f60a0d0ff5f79bc6662748fd1dc6b Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 4 Sep 2001 20:42:08 +0000
Subject: [PATCH 0761/8469] [Bug #444589] Record empty directories in the
 install_data command    Slightly modified version of patch from Jon Nelson
 (jnelson).

---
 command/install_data.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index 28f593866c..d0091ce238 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -63,10 +63,18 @@ def run (self):
                 elif self.root:
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
-                for data in f[1]:
-                    data = convert_path(data)
-                    (out, _) = self.copy_file(data, dir)
-                    self.outfiles.append(out)
+
+                if f[1] == []:
+                    # If there are no files listed, the user must be
+                    # trying to create an empty directory, so add the
+                    # directory to the list of output files.
+                    self.outfiles.append(dir)
+                else:
+                    # Copy files, adding them to the list of output files.
+                    for data in f[1]:
+                        data = convert_path(data)
+                        (out, _) = self.copy_file(data, dir)
+                        self.outfiles.append(out)
 
     def get_inputs (self):
         return self.data_files or []

From 4a7fbb7560c4f661bf8314166f6d26c0bfd25882 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 5 Sep 2001 12:02:59 +0000
Subject: [PATCH 0762/8469] [Bug #404274] Restore some special-case code for
 AIX and BeOS under 1.5.2.    This will have to stay until we decide to drop
 1.5.2 compatibility    completely.

---
 sysconfig.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index cc663a8341..935372cd2b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -318,7 +318,34 @@ def _init_posix():
     # the scripts are in another directory.
     if python_build:
         g['LDSHARED'] = g['BLDSHARED']
-
+        
+    elif sys.version < '2.1':
+        # The following two branches are for 1.5.2 compatibility.
+        if sys.platform == 'aix4':          # what about AIX 3.x ?
+            # Linker script is in the config directory, not in Modules as the
+            # Makefile says.
+            python_lib = get_python_lib(standard_lib=1)
+            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
+            python_exp = os.path.join(python_lib, 'config', 'python.exp')
+
+            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
+
+        elif sys.platform == 'beos':
+            # Linker script is in the config directory.  In the Makefile it is
+            # relative to the srcdir, which after installation no longer makes
+            # sense.
+            python_lib = get_python_lib(standard_lib=1)
+            linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
+            linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
+            
+            # XXX this isn't the right place to do this: adding the Python
+            # library to the link, if needed, should be in the "build_ext"
+            # command.  (It's also needed for non-MS compilers on Windows, and
+            # it's taken care of for them by the 'build_ext.get_libraries()'
+            # method.)
+            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
+                             (linkerscript, PREFIX, sys.version[0:3]))
+            
     global _config_vars
     _config_vars = g
 

From e9d279e9c8eb2b7b6bbdf3f9c6e01eb27684dce7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 5 Sep 2001 13:00:40 +0000
Subject: [PATCH 0763/8469] Implement PEP250: Use Lib/site-packages under
 windows. bdist_wininst doesn't use the NT SCHEME any more, instead a custom
 SCHEME is used, which is exchanged at installation time, depending on the
 python version used.

Avoid a bogus warning frpom install_lib about installing
into a directory not on sys.path.
---
 command/bdist_wininst.py | 617 +++++++++++++++++++--------------------
 1 file changed, 306 insertions(+), 311 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 16a6cc418c..8e4a7964a9 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -83,46 +83,41 @@ def run (self):
 
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
-        if os.name != 'nt':
-            # Must force install to use the 'nt' scheme; we set the
-            # prefix too just because it looks silly to put stuff
-            # in (eg.) ".../usr/Scripts", "usr/Include", etc.
-            install.prefix = "Python"
-            install.select_scheme('nt')
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files
         install_lib.compile = 0
         install_lib.optimize = 0
 
-        install_lib.ensure_finalized()
+        # Use a custom scheme for the zip-file, because we have to decide
+        # at installation time which scheme to use.
+        for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
+            value = string.upper(key)
+            if key == 'headers':
+                value = value + '/Include/$dist_name'
+            setattr(install,
+                    'install_' + key,
+                    value)
 
         self.announce("installing to %s" % self.bdist_dir)
         install.ensure_finalized()
+
+        # avoid warning of 'install_lib' about installing
+        # into a directory not in sys.path
+        sys.path.insert(0, os.path.join(self.bdist_dir, 'PURELIB'))
+
         install.run()
 
+        del sys.path[0]
+
         # And make an archive relative to the root of the
         # pseudo-installation tree.
         fullname = self.distribution.get_fullname()
         archive_basename = os.path.join(self.bdist_dir,
                                         "%s.win32" % fullname)
 
-        # Our archive MUST be relative to sys.prefix, which is the
-        # same as install_purelib in the 'nt' scheme.
-        root_dir = os.path.normpath(install.install_purelib)
-
-        # Sanity check: Make sure everything is included
-        for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
-            attrname = 'install_' + key
-            install_x = getattr(install, attrname)
-            # (Use normpath so that we can string.find to look for
-            # subdirectories)
-            install_x = os.path.normpath(install_x)
-            if string.find(install_x, root_dir) != 0:
-                raise DistutilsInternalError \
-                      ("'%s' not included in install_lib" % key)
         arcname = self.make_archive(archive_basename, "zip",
-                                    root_dir=root_dir)
+                                    root_dir=self.bdist_dir)
         self.create_exe(arcname, fullname, self.bitmap)
 
         if not self.keep_temp:
@@ -233,308 +228,308 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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

From 74eebff9df62f424e6be3262778cd50611dd7dbd Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 5 Oct 2001 20:40:48 +0000
Subject: [PATCH 0764/8469] Explicitely list the metadata attributes to show in
 the gui. Updated to include the new exe-file.

---
 command/bdist_wininst.py | 599 ++++++++++++++++++++-------------------
 1 file changed, 304 insertions(+), 295 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 8e4a7964a9..7cdf385553 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -140,13 +140,13 @@ def get_inidata (self):
         # describing the items to be installed.
         info = (metadata.long_description or '') + '\n'
 
-        for name in dir(metadata):
-            if (name != 'long_description'):
-                data = getattr(metadata, name)
-                if data:
-                   info = info + ("\n    %s: %s" % \
-                                  (string.capitalize(name), data))
-                   lines.append("%s=%s" % (name, repr(data)[1:-1]))
+        for name in ["author", "author_email", "description", "maintainer",
+                     "maintainer_email", "name", "url", "version"]:
+            data = getattr(metadata, name, "")
+            if data:
+                info = info + ("\n    %s: %s" % \
+                               (string.capitalize(name), data))
+                lines.append("%s=%s" % (name, repr(data)[1:-1]))
 
         # The [setup] section contains entries controlling
         # the installer runtime.
@@ -231,20 +231,20 @@ def get_exe_bytes (self):
 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
-AAAAAAAAAAAAAAAAUEUAAEwBAwCMCZY7AAAAAAAAAADgAA8BCwEGAABAAAAAEAAAAKAAAADuAAAA
-sAAAAPAAAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAAAEAAAQAAAAAAAACAAAAAAAQAAAQ
-AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAw8QAAbAEAAADwAAAwAQAAAAAAAAAAAAAAAAAAAAAA
+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
-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
+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
-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
+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
@@ -252,8 +252,8 @@ def get_exe_bytes (self):
 UI/rL1wgGOpTDGoCrM2W7f9VIPDALmcQZronYy91JS67aFTH6Xbf891TAes7B1kO8yR0Cq3QHvkT
 A41F9G4GAgx7n4UYQtB9/BIDvO7NNEioNBR1CQvIlgbTfTN/DlZqBFYQxBD7GlyEyHyJfg9hOIKz
 3drmPOsmpSsCUyqs+b5tW1OnCCWLBDvGdRcnEMKGNuEoco4KM8BsC+3/5FvJOIN9EAhTi10IaUOS
-druwffI4k8jdUOjISxJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sLDtLSG81xw7
-dGn/dChQaO72+b6QmBlLBCLcjnQTGnOd+5YNfIsEyYr2IR8byFn3IWw6Lh9kQ+2w0VoDxUUSPsge
+druwffI4k8jdUOjITBJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sLDtLSK81xw7
+dGn/dChQaO72+b6QmBlLBCPcjnQTGnOd+5YNfIsEyYr2IR8byFn3Imw6Lh9kQ+2w0VoDxUUSPsge
 uu29U5eUjV7wzBTGxp3hw86B7Cjhq4tVEESN/9v/i0wC+o1cAupXn+ArQwwrwYPoFosb/5fb/8+B
 O1BLBQaJfejwbwKDZRQAZoN7CgAP/jf33Y5kDusJi03sP8zoi0QRKo00EQNts13eM/qBPgECMD6B
 Pwt/6z7bAwQ8MsEulIkxA8oPv1Ye2x67bQj0Bk4gDBwDVRXRCNv2pXlPHInBVxoD0JsQFuhGaPzt
@@ -263,294 +263,303 @@ def get_exe_bytes (self):
 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
-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
+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
-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
+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
-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
-AAAAAAAAAAAAAAAAAAAAAAAAAAQAawAAAJAAAIBsAAAAuAAAgG0AAADgAACAbgAAAAgBAIAAAAAA
-AAAAAAAAAAAAAAEACQQAAKgAAAA4uwAAoAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAADQ
-AAAA2LwAAGIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA+AAAAEC+AABaAgAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAEACQQAACABAACgwAAAXAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9PEA
-ALzxAAAAAAAAAAAAAAAAAAAB8gAAzPEAAAAAAAAAAAAAAAAAAA7yAADU8QAAAAAAAAAAAAAAAAAA
-G/IAANzxAAAAAAAAAAAAAAAAAAAl8gAA5PEAAAAAAAAAAAAAAAAAADDyAADs8QAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAA68gAASPIAAFjyAAAAAAAAZvIAAAAAAAB08gAAAAAAAITyAAAAAAAAjvIAAAAA
-AACU8gAAAAAAAEtFUk5FTDMyLkRMTABBRFZBUEkzMi5kbGwAQ09NQ1RMMzIuZGxsAEdESTMyLmRs
-bABNU1ZDUlQuZGxsAFVTRVIzMi5kbGwAAExvYWRMaWJyYXJ5QQAAR2V0UHJvY0FkZHJlc3MAAEV4
-aXRQcm9jZXNzAAAAUmVnQ2xvc2VLZXkAAABQcm9wZXJ0eVNoZWV0QQAAVGV4dE91dEEAAGV4aXQA
-AEdldERDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgACAAAAIAAAgAUAAABgAACAAAAA
+AAAAAAAAAAAAAAABAG4AAAA4AACAAAAAAAAAAAAAAAAAAAABAAAAAABQAAAAMLEAAAgKAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAABABrAAAAkAAAgGwAAAC4AACAbQAAAOAAAIBuAAAACAEAgAAAAAAA
+AAAAAAAAAAAAAQAJBAAAqAAAADi7AACgAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAANAA
+AADYvAAABAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAD4AAAA4L4AAFoCAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAQAJBAAAIAEAAEDBAABcAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAD0AQEA
+vAEBAAAAAAAAAAAAAAAAAAECAQDMAQEAAAAAAAAAAAAAAAAADgIBANQBAQAAAAAAAAAAAAAAAAAb
+AgEA3AEBAAAAAAAAAAAAAAAAACUCAQDkAQEAAAAAAAAAAAAAAAAAMAIBAOwBAQAAAAAAAAAAAAAA
+AAAAAAAAAAAAADoCAQBIAgEAWAIBAAAAAABmAgEAAAAAAHQCAQAAAAAAhAIBAAAAAACOAgEAAAAA
+AJQCAQAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRsbABDT01DVEwzMi5kbGwAR0RJMzIuZGxs
+AE1TVkNSVC5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVzcwAARXhp
+dFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAAZXhpdAAA
+R2V0REMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAA=
 """
 
 # --- EOF ---

From b00902df9fcae870190f460790a9293c8eda1c61 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 5 Oct 2001 20:43:09 +0000
Subject: [PATCH 0765/8469] With Andrew's blessing: distutils version number is
 now 1.0.3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 27e79a54ac..1055aa39c1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,4 +10,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"

From 333b9da550f41bac8faf5a4b3bfccc53a54da671 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sat, 10 Nov 2001 23:20:22 +0000
Subject: [PATCH 0766/8469] The libraries argument was completely ignored,
 fixed. Reported by Tom Loredo.

---
 mwerkscompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 46e16e2e94..e759456a36 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -16,7 +16,7 @@
 import mkcwproject
 
 class MWerksCompiler (CCompiler) :
-    """Concrete class that implements an interface to Microsoft Visual C++,
+    """Concrete class that implements an interface to MetroWerks CodeWarrior,
        as defined by the CCompiler abstract class."""
 
     compiler_type = 'mwerks'
@@ -150,6 +150,7 @@ def link (self,
             if not dirname in sourcefiledirs:
                 sourcefiledirs.append(dirname)
         settings['sources'] = sourcefilenames
+        settings['libraries'] = libraries
         settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
         if self.dry_run:
             print 'CALLING LINKER IN', os.getcwd()

From 6fdff7d1bce93929138b277904edd9508b635978 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 6 Dec 2001 16:32:05 +0000
Subject: [PATCH 0767/8469] [Bug #459270] Fix incorrect docstring

---
 dist.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dist.py b/dist.py
index 40dcc96e27..3e1bc648d4 100644
--- a/dist.py
+++ b/dist.py
@@ -262,14 +262,11 @@ def find_config_files (self):
         should be parsed.  The filenames returned are guaranteed to exist
         (modulo nasty race conditions).
 
-        On Unix, there are three possible config files: pydistutils.cfg in
-        the Distutils installation directory (ie. where the top-level
-        Distutils __inst__.py file lives), .pydistutils.cfg in the user's
-        home directory, and setup.cfg in the current directory.
-
-        On Windows and Mac OS, there are two possible config files:
-        pydistutils.cfg in the Python installation directory (sys.prefix)
-        and setup.cfg in the current directory.
+        There are three possible config files: distutils.cfg in the
+        Distutils installation directory (ie. where the top-level
+        Distutils __inst__.py file lives), a file in the user's home
+        directory named .pydistutils.cfg on Unix and pydistutils.cfg
+        on Windows/Mac, and setup.cfg in the current directory.
         """
         files = []
         check_environ()

From 1a4ad0259c7382d0520aa9dad7e6af852b3d7ad9 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 6 Dec 2001 20:44:19 +0000
Subject: [PATCH 0768/8469] Use a version number of 0.0.0 instead of ???.  The
 latter leads to invalid filenames on Windows when building without specifying
 a version number in the setup script.

See also
http://mail.python.org/pipermail/distutils-sig/2001-November/002656.html

Bugfix candidate.
---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 3e1bc648d4..d5bfa05dc4 100644
--- a/dist.py
+++ b/dist.py
@@ -1012,7 +1012,7 @@ def get_name (self):
         return self.name or "UNKNOWN"
 
     def get_version(self):
-        return self.version or "???"
+        return self.version or "0.0.0"
 
     def get_fullname (self):
         return "%s-%s" % (self.get_name(), self.get_version())

From 68cb7fe9ae037b7a517b692213c03c6c0e54f7e4 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 6 Dec 2001 20:51:35 +0000
Subject: [PATCH 0769/8469] Whitespace normalization.

---
 archive_util.py    |  6 +--
 bcppcompiler.py    | 32 +++++++--------
 ccompiler.py       | 34 ++++++++--------
 cmd.py             | 20 +++++-----
 core.py            |  4 +-
 cygwinccompiler.py | 97 +++++++++++++++++++++++-----------------------
 dep_util.py        |  8 ++--
 dir_util.py        |  6 +--
 dist.py            | 28 ++++++-------
 extension.py       |  4 +-
 fancy_getopt.py    | 12 +++---
 file_util.py       | 16 ++++----
 filelist.py        | 28 ++++++-------
 msvccompiler.py    | 18 ++++-----
 mwerkscompiler.py  | 32 +++++++--------
 spawn.py           | 12 +++---
 sysconfig.py       |  8 ++--
 text_file.py       | 13 +++----
 unixccompiler.py   | 16 ++++----
 util.py            | 16 ++++----
 version.py         | 16 ++++----
 21 files changed, 210 insertions(+), 216 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 4c5641b951..58d9a062e1 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -31,7 +31,7 @@ def make_tarball (base_name, base_dir, compress="gzip",
     compress_ext = { 'gzip': ".gz",
                      'bzip2': '.bz2',
                      'compress': ".Z" }
-    
+
     # flags for compression program, each element of list will be an argument
     compress_flags = {'gzip': ["-f9"],
                       'compress': ["-f"],
@@ -85,7 +85,7 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
             import zipfile
         except ImportError:
             raise DistutilsExecError, \
-                  ("unable to create zip file '%s': " + 
+                  ("unable to create zip file '%s': " +
                    "could neither find a standalone zip utility nor " +
                    "import the 'zipfile' module") % zip_filename
 
@@ -152,7 +152,7 @@ def make_archive (base_name, format,
 
     kwargs = { 'verbose': verbose,
                'dry_run': dry_run }
-    
+
     try:
         format_info = ARCHIVE_FORMATS[format]
     except KeyError:
diff --git a/bcppcompiler.py b/bcppcompiler.py
index 5c0fae8b71..9ebba2d85b 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -102,7 +102,7 @@ def compile (self,
             compile_opts.extend (self.compile_options_debug)
         else:
             compile_opts.extend (self.compile_options)
-        
+
         for i in range (len (sources)):
             src = sources[i] ; obj = objects[i]
             ext = (os.path.splitext (src))[1]
@@ -130,11 +130,11 @@ def compile (self,
                     input_opt = ""
                 elif ext in self._cpp_extensions:
                     input_opt = "-P"
-                else: 
+                else:
                     # Unknown file type -- no extra options.  The compiler
                     # will probably fail, but let it just in case this is a
                     # file the compiler recognizes even if we don't.
-                    input_opt = ""                              
+                    input_opt = ""
 
                 output_opt = "-o" + obj
 
@@ -174,17 +174,17 @@ def create_static_lib (self,
             if extra_postargs:
                 lib_args.extend (extra_postargs)
             try:
-               self.spawn ([self.lib] + lib_args)
+                self.spawn ([self.lib] + lib_args)
             except DistutilsExecError, msg:
-               raise LibError, msg
+                raise LibError, msg
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
     # create_static_lib ()
-    
-    
+
+
     def link (self,
-              target_desc,        
+              target_desc,
               objects,
               output_filename,
               output_dir=None,
@@ -254,14 +254,14 @@ def link (self,
                     resources.append(file)
                 else:
                     objects.append(file)
-            
-            
+
+
             for l in library_dirs:
-                ld_args.append("/L%s" % os.path.normpath(l)) 
+                ld_args.append("/L%s" % os.path.normpath(l))
             ld_args.append("/L.") # we sometimes use relative paths
 
-            # list of object files                
-            ld_args.extend(objects)     
+            # list of object files
+            ld_args.extend(objects)
 
             # XXX the command-line syntax for Borland C++ is a bit wonky;
             # certain filenames are jammed together in one big string, but
@@ -275,11 +275,11 @@ def link (self,
 
             # name of dll/exe file
             ld_args.extend([',',output_filename])
-            # no map file and start libraries 
+            # no map file and start libraries
             ld_args.append(',,')
 
             for lib in libraries:
-                # see if we find it and if there is a bcpp specific lib 
+                # see if we find it and if there is a bcpp specific lib
                 # (xxx_bcpp.lib)
                 libfile = self.find_library_file(library_dirs, lib, debug)
                 if libfile is None:
@@ -300,7 +300,7 @@ def link (self,
             ld_args.append(',')
             ld_args.extend(resources)
 
-            
+
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
diff --git a/ccompiler.py b/ccompiler.py
index 4efd93407b..21bf0c1715 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -61,7 +61,7 @@ class CCompiler:
     #     different versions of libfoo.a in different locations.  I
     #     think this is useless without the ability to null out the
     #     library search path anyways.
-    
+
 
     # Subclasses that rely on the standard filename generation methods
     # implemented below should override these; see the comment near
@@ -159,7 +159,7 @@ def set_executable(self, key, value):
             setattr(self, key, split_quoted(value))
         else:
             setattr(self, key, value)
-        
+
 
 
     def _find_macro (self, name):
@@ -352,7 +352,7 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
         else:
             raise TypeError, \
                   "'include_dirs' (if supplied) must be a list of strings"
-                    
+
         return (output_dir, macros, include_dirs)
 
     # _fix_compile_args ()
@@ -364,7 +364,7 @@ def _prep_compile (self, sources, output_dir):
         list of all object files and a dictionary telling which source
         files can be skipped.
         """
-        # Get the list of expected output (object) files 
+        # Get the list of expected output (object) files
         objects = self.object_filenames (sources,
                                          strip_dir=1,
                                          output_dir=output_dir)
@@ -401,7 +401,7 @@ def _fix_object_args (self, objects, output_dir):
             raise TypeError, \
                   "'objects' must be a list or tuple of strings"
         objects = list (objects)
-            
+
         if output_dir is None:
             output_dir = self.output_dir
         elif type (output_dir) is not StringType:
@@ -560,7 +560,7 @@ def create_static_lib (self,
         Raises LibError on failure.
         """
         pass
-    
+
 
     # values for target_desc parameter in link()
     SHARED_OBJECT = "shared_object"
@@ -621,7 +621,7 @@ def link (self,
         """
         raise NotImplementedError
 
-    
+
     # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
     def link_shared_lib (self,
@@ -636,13 +636,13 @@ def link_shared_lib (self,
                          extra_preargs=None,
                          extra_postargs=None,
                          build_temp=None):
-        self.link(CCompiler.SHARED_LIBRARY, objects, 
+        self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
                   libraries, library_dirs, runtime_library_dirs,
                   export_symbols, debug,
                   extra_preargs, extra_postargs, build_temp)
-    
+
 
     def link_shared_object (self,
                             objects,
@@ -673,9 +673,9 @@ def link_executable (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None):
-        self.link(CCompiler.EXECUTABLE, objects, 
+        self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
-                  libraries, library_dirs, runtime_library_dirs, None, 
+                  libraries, library_dirs, runtime_library_dirs, None,
                   debug, extra_preargs, extra_postargs, None)
 
 
@@ -846,12 +846,12 @@ def mkpath (self, name, mode=0777):
     # on a cygwin built python we can use gcc like an ordinary UNIXish
     # compiler
     ('cygwin.*', 'unix'),
-    
+
     # OS name mappings
     ('posix', 'unix'),
     ('nt', 'msvc'),
     ('mac', 'mwerks'),
-    
+
     )
 
 def get_default_compiler(osname=None, platform=None):
@@ -901,7 +901,7 @@ def show_compilers():
     # XXX this "knows" that the compiler option it's describing is
     # "--compiler", which just happens to be the case for the three
     # commands that use it.
-    from distutils.fancy_getopt import FancyGetopt 
+    from distutils.fancy_getopt import FancyGetopt
     compilers = []
     for compiler in compiler_class.keys():
         compilers.append(("compiler="+compiler, None,
@@ -909,7 +909,7 @@ def show_compilers():
     compilers.sort()
     pretty_printer = FancyGetopt(compilers)
     pretty_printer.print_help("List of available compilers:")
-    
+
 
 def new_compiler (plat=None,
                   compiler=None,
@@ -932,14 +932,14 @@ def new_compiler (plat=None,
     try:
         if compiler is None:
             compiler = get_default_compiler(plat)
-        
+
         (module_name, class_name, long_description) = compiler_class[compiler]
     except KeyError:
         msg = "don't know how to compile C/C++ code on platform '%s'" % plat
         if compiler is not None:
             msg = msg + " with '%s' compiler" % compiler
         raise DistutilsPlatformError, msg
-              
+
     try:
         module_name = "distutils." + module_name
         __import__ (module_name)
diff --git a/cmd.py b/cmd.py
index 85a7f46182..65060d6700 100644
--- a/cmd.py
+++ b/cmd.py
@@ -41,7 +41,7 @@ class Command:
     # current situation.  (Eg. we "install_headers" is only applicable if
     # we have any C header files to install.)  If 'predicate' is None,
     # that command is always applicable.
-    # 
+    #
     # 'sub_commands' is usually defined at the *end* of a class, because
     # predicates can be unbound methods, so they must already have been
     # defined.  The canonical example is the "install" command.
@@ -111,7 +111,7 @@ def ensure_finalized (self):
         if not self.finalized:
             self.finalize_options()
         self.finalized = 1
-        
+
 
     # Subclasses must define:
     #   initialize_options()
@@ -133,12 +133,12 @@ def initialize_options (self):
         command-line.  Thus, this is not the place to code dependencies
         between options; generally, 'initialize_options()' implementations
         are just a bunch of "self.foo = None" assignments.
-           
+
         This method must be implemented by all command classes.
         """
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
-        
+
     def finalize_options (self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
@@ -198,12 +198,12 @@ def debug_print (self, msg):
         if DEBUG:
             print msg
             sys.stdout.flush()
-        
+
 
 
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)
-    # 
+    #
     # NB. the general philosophy here is to ensure that a particular option
     # value meets certain type and value constraints.  If not, we try to
     # force it into conformance (eg. if we expect a list but have a string,
@@ -252,7 +252,7 @@ def ensure_string_list (self, option):
                 raise DistutilsOptionError, \
                       "'%s' must be a list of strings (got %s)" % \
                       (option, `val`)
-        
+
     def _ensure_tested_string (self, option, tester,
                                what, error_fmt, default=None):
         val = self._ensure_stringlike(option, what, default)
@@ -382,7 +382,7 @@ def copy_tree (self, infile, outfile,
         and force flags.
         """
         return dir_util.copy_tree(
-            infile, outfile, 
+            infile, outfile,
             preserve_mode,preserve_times,preserve_symlinks,
             not self.force,
             self.verbose >= level,
@@ -426,7 +426,7 @@ def make_file (self, infiles, outfile, func, args,
                        (outfile, string.join(infiles, ', '))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
-        
+
 
         # Allow 'infiles' to be a single string
         if type(infiles) is StringType:
@@ -459,7 +459,7 @@ class install_misc (Command):
     """Common base class for installing some files in a subdirectory.
     Currently used by install_data and install_scripts.
     """
-    
+
     user_options = [('install-dir=', 'd', "directory to install the files to")]
 
     def initialize_options (self):
diff --git a/core.py b/core.py
index 2aab7c4dd3..97a741c812 100644
--- a/core.py
+++ b/core.py
@@ -108,7 +108,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # Find and parse the config file(s): they will override options from
     # the setup script, but be overridden by the command line.
     dist.parse_config_files()
-    
+
     if DEBUG:
         print "options (after parsing config files):"
         dist.dump_option_dicts()
@@ -146,7 +146,7 @@ class found in 'cmdclass' is used in place of the default, which is
                 raise
             else:
                 raise SystemExit, error
-            
+
         except (DistutilsExecError,
                 DistutilsFileError,
                 DistutilsOptionError,
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 07e16655b0..1d97282322 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -18,28 +18,28 @@
 #
 #   see also http://starship.python.net/crew/kernr/mingw32/Notes.html
 #
-# * We put export_symbols in a def-file, and don't use 
+# * We put export_symbols in a def-file, and don't use
 #   --export-all-symbols because it doesn't worked reliable in some
 #   tested configurations. And because other windows compilers also
 #   need their symbols specified this no serious problem.
 #
 # tested configurations:
-#   
-# * cygwin gcc 2.91.57/ld 2.9.4/dllwrap 0.2.4 works 
+#
+# * cygwin gcc 2.91.57/ld 2.9.4/dllwrap 0.2.4 works
 #   (after patching python's config.h and for C++ some other include files)
 #   see also http://starship.python.net/crew/kernr/mingw32/Notes.html
-# * mingw32 gcc 2.95.2/ld 2.9.4/dllwrap 0.2.4 works 
-#   (ld doesn't support -shared, so we use dllwrap)   
+# * mingw32 gcc 2.95.2/ld 2.9.4/dllwrap 0.2.4 works
+#   (ld doesn't support -shared, so we use dllwrap)
 # * cygwin gcc 2.95.2/ld 2.10.90/dllwrap 2.10.90 works now
 #   - its dllwrap doesn't work, there is a bug in binutils 2.10.90
 #     see also http://sources.redhat.com/ml/cygwin/2000-06/msg01274.html
-#   - using gcc -mdll instead dllwrap doesn't work without -static because 
+#   - using gcc -mdll instead dllwrap doesn't work without -static because
 #     it tries to link against dlls instead their import libraries. (If
 #     it finds the dll first.)
-#     By specifying -static we force ld to link against the import libraries, 
-#     this is windows standard and there are normally not the necessary symbols 
+#     By specifying -static we force ld to link against the import libraries,
+#     this is windows standard and there are normally not the necessary symbols
 #     in the dlls.
-#   *** only the version of June 2000 shows these problems 
+#   *** only the version of June 2000 shows these problems
 
 # created 2000/05/05, Rene Liebscher
 
@@ -60,7 +60,7 @@ class CygwinCCompiler (UnixCCompiler):
     static_lib_format = "lib%s%s"
     shared_lib_format = "%s%s"
     exe_extension = ".exe"
-   
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -76,20 +76,20 @@ def __init__ (self,
                 "Python's pyconfig.h doesn't seem to support your compiler.  " +
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
-        
+
         (self.gcc_version, self.ld_version, self.dllwrap_version) = \
             get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
-                         (self.gcc_version, 
-                          self.ld_version, 
+                         (self.gcc_version,
+                          self.ld_version,
                           self.dllwrap_version) )
 
-        # ld_version >= "2.10.90" should also be able to use 
+        # ld_version >= "2.10.90" should also be able to use
         # gcc -mdll instead of dllwrap
-        # Older dllwraps had own version numbers, newer ones use the 
+        # Older dllwraps had own version numbers, newer ones use the
         # same as the rest of binutils ( also ld )
         # dllwrap 2.10.90 is buggy
-        if self.ld_version >= "2.10.90": 
+        if self.ld_version >= "2.10.90":
             self.linker_dll = "gcc"
         else:
             self.linker_dll = "dllwrap"
@@ -102,22 +102,22 @@ def __init__ (self,
                              linker_so=('%s -mcygwin -mdll -static' %
                                         self.linker_dll))
 
-        # cygwin and mingw32 need different sets of libraries 
+        # cygwin and mingw32 need different sets of libraries
         if self.gcc_version == "2.91.57":
             # cygwin shouldn't need msvcrt, but without the dlls will crash
             # (gcc version 2.91.57) -- perhaps something about initialization
             self.dll_libraries=["msvcrt"]
-            self.warn( 
+            self.warn(
                 "Consider upgrading to a newer version of gcc")
         else:
             self.dll_libraries=[]
-        
+
     # __init__ ()
 
     # not much different of the compile method in UnixCCompiler,
     # but we have to insert some lines in the middle of it, so
     # we put here a adapted version of it.
-    # (If we would call compile() in the base class, it would do some 
+    # (If we would call compile() in the base class, it would do some
     # initializations a second time, this is why all is done here.)
     def compile (self,
                  sources,
@@ -143,7 +143,7 @@ def compile (self,
             extra_postargs = []
 
         # Compile all source files that weren't eliminated by
-        # '_prep_compile()'.        
+        # '_prep_compile()'.
         for i in range (len (sources)):
             src = sources[i] ; obj = objects[i]
             ext = (os.path.splitext (src))[1]
@@ -157,7 +157,7 @@ def compile (self,
                         self.spawn (["windres","-i",src,"-o",obj])
                     except DistutilsExecError, msg:
                         raise CompileError, msg
-                else: # for other files use the C-compiler 
+                else: # for other files use the C-compiler
                     try:
                         self.spawn (self.compiler_so + cc_args +
                                 [src, '-o', obj] +
@@ -184,12 +184,12 @@ def link (self,
               extra_preargs=None,
               extra_postargs=None,
               build_temp=None):
-        
+
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
         objects = copy.copy(objects or [])
-                
+
         # Additional libraries
         libraries.extend(self.dll_libraries)
 
@@ -199,10 +199,10 @@ def link (self,
             (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
             # (The linker doesn't do anything if output is up-to-date.
             # So it would probably better to check if we really need this,
-            # but for this we had to insert some unchanged parts of 
-            # UnixCCompiler, and this is not what we want.) 
+            # but for this we had to insert some unchanged parts of
+            # UnixCCompiler, and this is not what we want.)
 
-            # we want to put some files in the same directory as the 
+            # we want to put some files in the same directory as the
             # object files are, build_temp doesn't help much
             # where are the object files
             temp_dir = os.path.dirname(objects[0])
@@ -214,7 +214,7 @@ def link (self,
             def_file = os.path.join(temp_dir, dll_name + ".def")
             exp_file = os.path.join(temp_dir, dll_name + ".exp")
             lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
-       
+
             # Generate .def file
             contents = [
                 "LIBRARY %s" % os.path.basename(output_filename),
@@ -237,21 +237,21 @@ def link (self,
             else:
                 # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
                 #extra_preargs.extend(["-Wl,--out-implib,%s" % lib_file])
-                # for gcc/ld the def-file is specified as any other object files    
+                # for gcc/ld the def-file is specified as any other object files
                 objects.append(def_file)
 
         #end: if ((export_symbols is not None) and
         #        (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
-                                                 
+
         # who wants symbols and a many times larger output file
-        # should explicitly switch the debug mode on 
+        # should explicitly switch the debug mode on
         # otherwise we let dllwrap/ld strip the output file
-        # (On my machine: 10KB < stripped_file < ??100KB 
+        # (On my machine: 10KB < stripped_file < ??100KB
         #   unstripped_file = stripped_file + XXX KB
-        #  ( XXX=254 for a typical python extension)) 
-        if not debug: 
-            extra_preargs.append("-s") 
-        
+        #  ( XXX=254 for a typical python extension))
+        if not debug:
+            extra_preargs.append("-s")
+
         UnixCCompiler.link(self,
                            target_desc,
                            objects,
@@ -265,7 +265,7 @@ def link (self,
                            extra_preargs,
                            extra_postargs,
                            build_temp)
-        
+
     # link ()
 
     # -- Miscellaneous methods -----------------------------------------
@@ -288,7 +288,7 @@ def object_filenames (self,
                 base = os.path.basename (base)
             if ext == '.res' or ext == '.rc':
                 # these need to be compiled to object files
-                obj_names.append (os.path.join (output_dir, 
+                obj_names.append (os.path.join (output_dir,
                                             base + ext + self.obj_extension))
             else:
                 obj_names.append (os.path.join (output_dir,
@@ -311,7 +311,7 @@ def __init__ (self,
                   force=0):
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
-        
+
         # A real mingw32 doesn't need to specify a different entry point,
         # but cygwin 2.91.57 in no-cygwin-mode needs it.
         if self.gcc_version <= "2.91.57":
@@ -322,15 +322,15 @@ def __init__ (self,
         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
                              linker_exe='gcc -mno-cygwin',
-                             linker_so='%s -mno-cygwin -mdll -static %s' 
+                             linker_so='%s -mno-cygwin -mdll -static %s'
                                         % (self.linker_dll, entry_point))
         # Maybe we should also append -mthreads, but then the finished
         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-        # (-mthreads: Support thread-safe exception handling on `Mingw32')       
-        
-        # no additional libraries needed 
+        # (-mthreads: Support thread-safe exception handling on `Mingw32')
+
+        # no additional libraries needed
         self.dll_libraries=[]
-        
+
     # __init__ ()
 
 # class Mingw32CCompiler
@@ -370,15 +370,15 @@ def check_config_h():
     # GCC, and the pyconfig.h file should be OK
     if string.find(sys.version,"GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
-    
+
     fn = sysconfig.get_config_h_filename()
     try:
         # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough 
+        # But we do this only once, and it is fast enough
         f = open(fn)
         s = f.read()
         f.close()
-        
+
     except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
@@ -401,7 +401,7 @@ def get_versions():
     from distutils.version import StrictVersion
     from distutils.spawn import find_executable
     import re
-        
+
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
@@ -439,4 +439,3 @@ def get_versions():
     else:
         dllwrap_version = None
     return (gcc_version, ld_version, dllwrap_version)
-
diff --git a/dep_util.py b/dep_util.py
index 4b93ed023c..9edba4c8ae 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -70,7 +70,7 @@ def newer_group (sources, target, missing='error'):
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists(target):
         return 1
-   
+
     # Otherwise we have to find out the hard way: if *any* source file
     # is more recent than 'target', then 'target' is out-of-date and
     # we can immediately return true.  If we fall through to the end
@@ -80,12 +80,12 @@ def newer_group (sources, target, missing='error'):
     for source in sources:
         if not os.path.exists(source):
             if missing == 'error':      # blow up when we stat() the file
-                pass                    
-            elif missing == 'ignore':   # missing source dropped from 
+                pass
+            elif missing == 'ignore':   # missing source dropped from
                 continue                #  target's dependency list
             elif missing == 'newer':    # missing source means target is
                 return 1                #  out-of-date
-            
+
         source_mtime = os.stat(source)[ST_MTIME]
         if source_mtime > target_mtime:
             return 1
diff --git a/dir_util.py b/dir_util.py
index a1578bed6a..77007c976b 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -49,7 +49,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 
     (head, tail) = os.path.split(name)
     tails = [tail]                      # stack of lone dirs to create
-    
+
     while head and tail and not os.path.isdir(head):
         #print "splitting '%s': " % head,
         (head, tail) = os.path.split(head)
@@ -140,7 +140,7 @@ def copy_tree (src, dst,
 
     if not dry_run and not os.path.isdir(src):
         raise DistutilsFileError, \
-              "cannot copy tree '%s': not a directory" % src    
+              "cannot copy tree '%s': not a directory" % src
     try:
         names = os.listdir(src)
     except os.error, (errno, errstr):
@@ -166,7 +166,7 @@ def copy_tree (src, dst,
             if not dry_run:
                 os.symlink(link_dest, dst_name)
             outputs.append(dst_name)
-            
+
         elif os.path.isdir(src_name):
             outputs.extend(
                 copy_tree(src_name, dst_name,
diff --git a/dist.py b/dist.py
index d5bfa05dc4..b648f24eb7 100644
--- a/dist.py
+++ b/dist.py
@@ -97,7 +97,7 @@ class Distribution:
 
 
     # -- Creation/initialization methods -------------------------------
-    
+
     def __init__ (self, attrs=None):
         """Construct a new Distribution instance: initialize all the
         attributes of a Distribution, and then use 'attrs' (a dictionary
@@ -208,7 +208,7 @@ def __init__ (self, attrs=None):
                           "invalid distribution option '%s'" % key
 
         self.finalize_options()
-        
+
     # __init__ ()
 
 
@@ -251,7 +251,7 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
                     print indent + "  " + line
 
     # dump_option_dicts ()
-            
+
 
 
     # -- Config file finding/parsing methods ---------------------------
@@ -378,7 +378,7 @@ def parse_command_line (self):
             cmdlist = self.get_command_list()
             self.script_args = EasyDialogs.GetArgv(
                 self.global_options + self.display_options, cmdlist)
- 
+
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
         # because each command will be handled by a different class, and
@@ -396,7 +396,7 @@ def parse_command_line (self):
         # for display options we return immediately
         if self.handle_display_options(option_order):
             return
-            
+
         while args:
             args = self._parse_command_opts(parser, args)
             if args is None:            # user asked for help (and got it)
@@ -508,7 +508,7 @@ def _parse_command_opts (self, parser, args):
                             "must be a callable object (function, etc.)"
                             % (`func`, help_option))
 
-            if help_option_found: 
+            if help_option_found:
                 return
 
         # Put the options from the command-line into their official
@@ -801,7 +801,7 @@ def _set_command_options (self, command_obj, option_dict=None):
         (from 'self.command_options').
         """
         from distutils.core import DEBUG
-        
+
         command_name = command_obj.get_command_name()
         if option_dict is None:
             option_dict = self.get_option_dict(command_name)
@@ -841,7 +841,7 @@ def reinitialize_command (self, command, reinit_subcommands=0):
         user-supplied values from the config files and command line.
         You'll have to re-finalize the command object (by calling
         'finalize_options()' or 'ensure_finalized()') before using it for
-        real.  
+        real.
 
         'command' should be a command name (string) or command object.  If
         'reinit_subcommands' is true, also reinitializes the command's
@@ -868,11 +868,11 @@ def reinitialize_command (self, command, reinit_subcommands=0):
 
         if reinit_subcommands:
             for sub in command.get_sub_commands():
-                self.reinitialize_command(sub, reinit_subcommands)            
+                self.reinitialize_command(sub, reinit_subcommands)
 
         return command
 
-        
+
     # -- Methods that operate on the Distribution ----------------------
 
     def announce (self, msg, level=1):
@@ -976,7 +976,7 @@ def __init__ (self):
         self.long_description = None
         self.keywords = None
         self.platforms = None
-        
+
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
@@ -1003,9 +1003,9 @@ def write_pkg_info (self, base_dir):
             pkg_info.write('Platform: %s\n' % platform )
 
         pkg_info.close()
-        
+
     # write_pkg_info ()
-    
+
     # -- Metadata query methods ----------------------------------------
 
     def get_name (self):
@@ -1045,7 +1045,7 @@ def get_url(self):
     def get_license(self):
         return self.license or "UNKNOWN"
     get_licence = get_license
-    
+
     def get_description(self):
         return self.description or "UNKNOWN"
 
diff --git a/extension.py b/extension.py
index a63ede233c..fbae7c5226 100644
--- a/extension.py
+++ b/extension.py
@@ -16,7 +16,7 @@
 # module is already big enough, and I want to make this class a bit more
 # complex to simplify some common cases ("foo" module in "foo.c") and do
 # better error-checking ("foo.c" actually exists).
-# 
+#
 # Also, putting this in build_ext.py means every setup script would have to
 # import that large-ish module (indirectly, through distutils.core) in
 # order to do anything.
@@ -211,7 +211,7 @@ def read_setup_file (filename):
         #extensions[module] = { 'sources': source_files,
         #                       'cpp_args': cpp_args,
         #                       'lib_args': library_args }
-        
+
     return extensions
 
 # read_setup_file ()
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 83d07216a7..e65302fc0b 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -73,7 +73,7 @@ def __init__ (self, option_table=None):
         # 'negative_alias' keeps track of options that are the boolean
         # opposite of some other option
         self.negative_alias = {}
-        
+
         # These keep track of the information in the option table.  We
         # don't actually populate these structures until we're ready to
         # parse the command-line, since the 'option_table' passed in here
@@ -90,7 +90,7 @@ def __init__ (self, option_table=None):
         self.option_order = []
 
     # __init__ ()
-    
+
 
     def _build_index (self):
         self.option_index.clear()
@@ -117,7 +117,7 @@ def has_option (self, long_option):
         return self.option_index.has_key(long_option)
 
     def get_attr_name (self, long_option):
-        """Translate long option name 'long_option' to the form it 
+        """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
         return string.translate(long_option, longopt_xlate)
@@ -134,7 +134,7 @@ def _check_alias_dict (self, aliases, what):
                 raise DistutilsGetoptError, \
                       ("invalid %s '%s': "
                        "aliased option '%s' not defined") % (what, alias, opt)
-        
+
     def set_aliases (self, alias):
         """Set the aliases for this option parser."""
         self._check_alias_dict(alias, "alias")
@@ -476,7 +476,7 @@ def translate_longopt (opt):
     changing "-" to "_".
     """
     return string.translate(opt, longopt_xlate)
-        
+
 
 class OptionDummy:
     """Dummy class just used as a place to hold command-line option
@@ -489,7 +489,7 @@ def __init__ (self, options=[]):
             setattr(self, opt, None)
 
 # class OptionDummy
-    
+
 
 if __name__ == "__main__":
     text = """\
diff --git a/file_util.py b/file_util.py
index 991d8357b5..526e4cf593 100644
--- a/file_util.py
+++ b/file_util.py
@@ -35,20 +35,20 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
         except os.error, (errno, errstr):
             raise DistutilsFileError, \
                   "could not open '%s': %s" % (src, errstr)
-        
+
         try:
             fdst = open(dst, 'wb')
         except os.error, (errno, errstr):
             raise DistutilsFileError, \
                   "could not create '%s': %s" % (dst, errstr)
-        
+
         while 1:
             try:
                 buf = fsrc.read(buffer_size)
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
                       "could not read from '%s': %s" % (src, errstr)
-            
+
             if not buf:
                 break
 
@@ -57,7 +57,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
                       "could not write to '%s': %s" % (dst, errstr)
-            
+
     finally:
         if fdst:
             fdst.close()
@@ -134,7 +134,7 @@ def copy_file (src, dst,
             print "%s %s -> %s" % (action, src, dir)
         else:
             print "%s %s -> %s" % (action, src, dst)
-            
+
     if dry_run:
         return (dst, 1)
 
@@ -146,7 +146,7 @@ def copy_file (src, dst,
         except os.error, exc:
             raise DistutilsFileError, \
                   "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
-    
+
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
@@ -189,7 +189,7 @@ def move_file (src, dst,
     """
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
-    
+
     if verbose:
         print "moving %s -> %s" % (src, dst)
 
@@ -232,7 +232,7 @@ def move_file (src, dst,
             except os.error:
                 pass
             raise DistutilsFileError, \
-                  ("couldn't move '%s' to '%s' by copy/delete: " + 
+                  ("couldn't move '%s' to '%s' by copy/delete: " +
                    "delete '%s' failed: %s") % \
                   (src, dst, src, msg)
 
diff --git a/filelist.py b/filelist.py
index 211b65f8d2..f7222fd927 100644
--- a/filelist.py
+++ b/filelist.py
@@ -7,7 +7,7 @@
 # created 2000/07/17, Rene Liebscher (as template.py)
 # most parts taken from commands/sdist.py
 # renamed 2000/07/29 (to filelist.py) and officially added to
-#  the Distutils source, Greg Ward 
+#  the Distutils source, Greg Ward
 
 __revision__ = "$Id$"
 
@@ -34,8 +34,8 @@ class FileList:
         filtering applied)
     """
 
-    def __init__(self, 
-                 warn=None, 
+    def __init__(self,
+                 warn=None,
                  debug_print=None):
         # use standard warning and debug functions if no other given
         self.warn = warn or self.__warn
@@ -53,10 +53,10 @@ def findall (self, dir=os.curdir):
 
 
     # -- Fallback warning/debug functions ------------------------------
-    
+
     def __warn (self, msg):
         sys.stderr.write("warning: %s\n" % msg)
-        
+
     def __debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
@@ -93,7 +93,7 @@ def remove_duplicates (self):
 
 
     # -- "File template" methods ---------------------------------------
-    
+
     def _parse_template_line (self, line):
         words = string.split(line)
         action = words[0]
@@ -129,9 +129,9 @@ def _parse_template_line (self, line):
         return (action, patterns, dir, dir_pattern)
 
     # _parse_template_line ()
-    
 
-    def process_template_line (self, line):    
+
+    def process_template_line (self, line):
 
         # Parse the line: split it up, make sure the right number of words
         # is there, and return the relevant words.  'action' is always
@@ -190,7 +190,7 @@ def process_template_line (self, line):
                     self.warn(("no previously-included files matching '%s' " +
                                "found under directory '%s'") %
                               (pattern, dir))
-                    
+
         elif action == 'graft':
             self.debug_print("graft " + dir_pattern)
             if not self.include_pattern(None, prefix=dir_pattern):
@@ -251,7 +251,7 @@ def include_pattern (self, pattern,
                 self.debug_print(" adding " + name)
                 self.files.append(name)
                 files_found = 1
-    
+
         return files_found
 
     # include_pattern ()
@@ -261,7 +261,7 @@ def exclude_pattern (self, pattern,
                          anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
         'pattern'.  Other parameters are the same as for
-        'include_pattern()', above.  
+        'include_pattern()', above.
         The list 'self.files' is modified in place.
         Return 1 if files are found.
         """
@@ -274,7 +274,7 @@ def exclude_pattern (self, pattern,
                 self.debug_print(" removing " + self.files[i])
                 del self.files[i]
                 files_found = 1
-    
+
         return files_found
 
     # exclude_pattern ()
@@ -354,14 +354,14 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
         pattern_re = glob_to_re(pattern)
     else:
         pattern_re = ''
-        
+
     if prefix is not None:
         prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
-        
+
     return re.compile(pattern_re)
 
 # translate_pattern ()
diff --git a/msvccompiler.py b/msvccompiler.py
index 0325b48508..8a67dfc823 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -50,8 +50,8 @@
     HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
     HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
     HKEY_USERS = hkey_mod.HKEY_USERS
-    
-    
+
+
 
 def get_devstudio_versions ():
     """Get list of devstudio versions from the Windows registry.  Return a
@@ -93,7 +93,7 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
     """Get a list of devstudio directories (include, lib or path).  Return
        a list of strings; will be empty list if unable to access the
        registry or appropriate registry keys not found."""
-       
+
     if not _can_read_reg:
         return []
 
@@ -149,7 +149,7 @@ def find_exe (exe, version_number):
         if os.path.isfile(fn):
             return fn
 
-    return exe                          # last desperate hope 
+    return exe                          # last desperate hope
 
 
 def set_path_env_var (name, version_number):
@@ -294,7 +294,7 @@ def compile (self,
             compile_opts.extend (self.compile_options_debug)
         else:
             compile_opts.extend (self.compile_options)
-        
+
         for i in range (len (sources)):
             src = sources[i] ; obj = objects[i]
             ext = (os.path.splitext (src))[1]
@@ -390,12 +390,12 @@ def create_static_lib (self,
                 self.spawn ([self.lib] + lib_args)
             except DistutilsExecError, msg:
                 raise LibError, msg
-                
+
         else:
             self.announce ("skipping %s (up-to-date)" % output_filename)
 
     # create_static_lib ()
-    
+
     def link (self,
               target_desc,
               objects,
@@ -417,7 +417,7 @@ def link (self,
         if runtime_library_dirs:
             self.warn ("I don't know what to do with 'runtime_library_dirs': "
                        + str (runtime_library_dirs))
-        
+
         lib_opts = gen_lib_options (self,
                                     library_dirs, runtime_library_dirs,
                                     libraries)
@@ -441,7 +441,7 @@ def link (self,
             for sym in (export_symbols or []):
                 export_opts.append("/EXPORT:" + sym)
 
-            ld_args = (ldflags + lib_opts + export_opts + 
+            ld_args = (ldflags + lib_opts + export_opts +
                        objects + ['/OUT:' + output_filename])
 
             # The MSVC linker generates .lib and .exp files, which cannot be
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index e759456a36..7c77b8bcef 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -52,8 +52,8 @@ def __init__ (self,
                   force=0):
 
         CCompiler.__init__ (self, verbose, dry_run, force)
-        
-        
+
+
     def compile (self,
                  sources,
                  output_dir=None,
@@ -62,14 +62,14 @@ def compile (self,
                  debug=0,
                  extra_preargs=None,
                  extra_postargs=None):
-         (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-         self.__sources = sources
-         self.__macros = macros
-         self.__include_dirs = include_dirs
-         # Don't need extra_preargs and extra_postargs for CW
-         return []
-         
+        (output_dir, macros, include_dirs) = \
+           self._fix_compile_args (output_dir, macros, include_dirs)
+        self.__sources = sources
+        self.__macros = macros
+        self.__include_dirs = include_dirs
+        # Don't need extra_preargs and extra_postargs for CW
+        return []
+
     def link (self,
               target_desc,
               objects,
@@ -198,7 +198,7 @@ def link (self,
         if self.verbose:
             print '\tBuild project'
         mkcwproject.buildproject(projectfilename)
-        
+
     def _filename_to_abs(self, filename):
         # Some filenames seem to be unix-like. Convert to Mac names.
 ##        if '/' in filename and ':' in filename:
@@ -207,13 +207,11 @@ def _filename_to_abs(self, filename):
 ##           filename = macurl2path(filename)
         filename = distutils.util.convert_path(filename)
         if not os.path.isabs(filename):
-           curdir = os.getcwd()
-           filename = os.path.join(curdir, filename)
+            curdir = os.getcwd()
+            filename = os.path.join(curdir, filename)
         # Finally remove .. components
         components = string.split(filename, ':')
         for i in range(1, len(components)):
-           if components[i] == '..':
-              components[i] = ''
+            if components[i] == '..':
+                components[i] = ''
         return string.join(components, ':')
-        
-        
diff --git a/spawn.py b/spawn.py
index 1eed7a8abc..07dc81484a 100644
--- a/spawn.py
+++ b/spawn.py
@@ -71,7 +71,7 @@ def _spawn_nt (cmd,
     cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
-        executable = find_executable(executable) or executable 
+        executable = find_executable(executable) or executable
     if verbose:
         print string.join([executable] + cmd[1:], ' ')
     if not dry_run:
@@ -87,7 +87,7 @@ def _spawn_nt (cmd,
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
-                
+
 def _spawn_posix (cmd,
                   search_path=1,
                   verbose=0,
@@ -110,11 +110,11 @@ def _spawn_posix (cmd,
             sys.stderr.write("unable to execute %s: %s\n" %
                              (cmd[0], e.strerror))
             os._exit(1)
-            
+
         sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
         os._exit(1)
 
-    
+
     else:                               # in the parent
         # Loop until the child either exits or is terminated by a signal
         # (ie. keep waiting if it's merely stopped)
@@ -133,7 +133,7 @@ def _spawn_posix (cmd,
                     raise DistutilsExecError, \
                           "command '%s' failed with exit status %d" % \
                           (cmd[0], exit_status)
-        
+
             elif os.WIFSTOPPED(status):
                 continue
 
@@ -166,4 +166,4 @@ def find_executable(executable, path=None):
     else:
         return executable
 
-# find_executable()    
+# find_executable()
diff --git a/sysconfig.py b/sysconfig.py
index 935372cd2b..feaf318ccd 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -48,7 +48,7 @@ def get_python_inc(plat_specific=0, prefix=None):
 
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
-    """    
+    """
     if prefix is None:
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
@@ -318,7 +318,7 @@ def _init_posix():
     # the scripts are in another directory.
     if python_build:
         g['LDSHARED'] = g['BLDSHARED']
-        
+
     elif sys.version < '2.1':
         # The following two branches are for 1.5.2 compatibility.
         if sys.platform == 'aix4':          # what about AIX 3.x ?
@@ -337,7 +337,7 @@ def _init_posix():
             python_lib = get_python_lib(standard_lib=1)
             linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
             linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
-            
+
             # XXX this isn't the right place to do this: adding the Python
             # library to the link, if needed, should be in the "build_ext"
             # command.  (It's also needed for non-MS compilers on Windows, and
@@ -345,7 +345,7 @@ def _init_posix():
             # method.)
             g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
                              (linkerscript, PREFIX, sys.version[0:3]))
-            
+
     global _config_vars
     _config_vars = g
 
diff --git a/text_file.py b/text_file.py
index 37bffe6139..7086b1af56 100644
--- a/text_file.py
+++ b/text_file.py
@@ -86,7 +86,7 @@ def __init__ (self, filename=None, file=None, **options):
 
         if filename is None and file is None:
             raise RuntimeError, \
-                  "you must supply either or both of 'filename' and 'file'" 
+                  "you must supply either or both of 'filename' and 'file'"
 
         # set values for all options -- either from client option hash
         # or fallback to default_options
@@ -113,7 +113,7 @@ def __init__ (self, filename=None, file=None, **options):
         # actually read from the file; it's only populated by an
         # 'unreadline()' operation
         self.linebuf = []
-        
+
 
     def open (self, filename):
         """Open a new file named 'filename'.  This overrides both the
@@ -213,7 +213,7 @@ def readline (self):
                     # EOF; I think that's OK.)
                     eol = (line[-1] == '\n') and '\n' or ''
                     line = line[0:pos] + eol
-                    
+
                     # If all that's left is whitespace, then skip line
                     # *now*, before we try to join it to 'buildup_line' --
                     # that way constructs like
@@ -226,7 +226,7 @@ def readline (self):
 
                 else:                   # it's an escaped "#"
                     line = string.replace (line, "\\#", "#")
-                
+
 
             # did previous line end with a backslash? then accumulate
             if self.join_lines and buildup_line:
@@ -256,7 +256,7 @@ def readline (self):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
-                
+
 
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
@@ -351,7 +351,7 @@ def test_input (count, description, file, expected_result):
             print expected_result
             print "** received:"
             print result
-            
+
 
     filename = "test.txt"
     out_file = open (filename, "w")
@@ -382,4 +382,3 @@ def test_input (count, description, file, expected_result):
     test_input (6, "join lines with collapsing", in_file, result6)
 
     os.remove (filename)
-    
diff --git a/unixccompiler.py b/unixccompiler.py
index a4f0ac4d04..a9b5de51ce 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -103,8 +103,8 @@ def preprocess (self,
             pp_args.extend(extra_postargs)
 
         # We need to preprocess: either we're being forced to, or we're
-	# generating output to stdout, or there's a target output file and 
-	# the source file is newer than the target (or the target doesn't
+        # generating output to stdout, or there's a target output file and
+        # the source file is newer than the target (or the target doesn't
         # exist).
         if self.force or output_file is None or newer(source, output_file):
             if output_file:
@@ -139,7 +139,7 @@ def compile (self,
             extra_postargs = []
 
         # Compile all source files that weren't eliminated by
-        # '_prep_compile()'.        
+        # '_prep_compile()'.
         for i in range(len(sources)):
             src = sources[i] ; obj = objects[i]
             if skip_sources[src]:
@@ -157,7 +157,7 @@ def compile (self,
         return objects
 
     # compile ()
-    
+
 
     def create_static_lib (self,
                            objects,
@@ -193,7 +193,7 @@ def create_static_lib (self,
 
 
     def link (self,
-              target_desc,    
+              target_desc,
               objects,
               output_filename,
               output_dir=None,
@@ -219,7 +219,7 @@ def link (self,
             output_filename = os.path.join(output_dir, output_filename)
 
         if self._need_link(objects, output_filename):
-            ld_args = (objects + self.objects + 
+            ld_args = (objects + self.objects +
                        lib_opts + ['-o', output_filename])
             if debug:
                 ld_args[:0] = ['-g']
@@ -229,7 +229,7 @@ def link (self,
                 ld_args.extend(extra_postargs)
             self.mkpath(os.path.dirname(output_filename))
             try:
-                if target_desc == CCompiler.EXECUTABLE:    
+                if target_desc == CCompiler.EXECUTABLE:
                     self.spawn(self.linker_exe + ld_args)
                 else:
                     self.spawn(self.linker_so + ld_args)
@@ -244,7 +244,7 @@ def link (self,
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
     # ccompiler.py.
-    
+
     def library_dir_option (self, dir):
         return "-L" + dir
 
diff --git a/util.py b/util.py
index 25ddbdf450..1541e02de9 100644
--- a/util.py
+++ b/util.py
@@ -30,7 +30,7 @@ def get_platform ():
        solaris-2.6-sun4u
        irix-5.3
        irix64-6.2
-       
+
     For non-POSIX platforms, currently just returns 'sys.platform'.
     """
     if os.name != "posix" or not hasattr(os, 'uname'):
@@ -44,9 +44,9 @@ def get_platform ():
 
     # Convert the OS name to lowercase and remove '/' characters
     # (to accommodate BSD/OS)
-    osname = string.lower(osname) 
+    osname = string.lower(osname)
     osname = string.replace(osname, '/', '')
-    
+
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --
         # i386, etc.
@@ -59,7 +59,7 @@ def get_platform ():
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)
-    elif osname[:3] == "aix":              
+    elif osname[:3] == "aix":
         return "%s-%s.%s" % (osname, version, release)
     elif osname[:6] == "cygwin":
         osname = "cygwin"
@@ -67,7 +67,7 @@ def get_platform ():
         m = rel_re.match(release)
         if m:
             release = m.group()
-            
+
     return "%s-%s-%s" % (osname, release, machine)
 
 # get_platform ()
@@ -280,7 +280,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
     # Generate a message if we weren't passed one
     if msg is None:
         msg = "%s%s" % (func.__name__, `args`)
-        if msg[-2:] == ',)':        # correct for singleton tuple 
+        if msg[-2:] == ',)':        # correct for singleton tuple
             msg = msg[0:-2] + ')'
 
     # Print it if verbosity level is high enough
@@ -403,7 +403,7 @@ def byte_compile (py_files,
         spawn(cmd, verbose=verbose, dry_run=dry_run)
         execute(os.remove, (script_name,), "removing %s" % script_name,
                 verbose=verbose, dry_run=dry_run)
-        
+
     # "Direct" byte-compilation: use the py_compile module to compile
     # right here, right now.  Note that the script generated in indirect
     # mode simply calls 'byte_compile()' in direct mode, a weird sort of
@@ -453,5 +453,3 @@ def rfc822_escape (header):
     lines = map(string.strip, lines)
     header = string.join(lines, '\n' + 8*' ')
     return header
-
-
diff --git a/version.py b/version.py
index 9d3d172429..02502dac95 100644
--- a/version.py
+++ b/version.py
@@ -98,7 +98,7 @@ class StrictVersion (Version):
     The rationale for this version numbering system will be explained
     in the distutils documentation.
     """
-    
+
     version_re = re.compile(r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
                             re.VERBOSE)
 
@@ -123,7 +123,7 @@ def parse (self, vstring):
 
 
     def __str__ (self):
-        
+
         if self.version[2] == 0:
             vstring = string.join(map(str, self.version[0:2]), '.')
         else:
@@ -133,7 +133,7 @@ def __str__ (self):
             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
 
         return vstring
-    
+
 
     def __cmp__ (self, other):
         if isinstance(other, StringType):
@@ -170,7 +170,7 @@ def __cmp__ (self, other):
 # 2) sequences of letters are part of the tuple for comparison and are
 #    compared lexicographically
 # 3) recognize the numeric components may have leading zeroes
-# 
+#
 # The LooseVersion class below implements these rules: a version number
 # string is split up into a tuple of integer and string components, and
 # comparison is a simple tuple comparison.  This means that version
@@ -185,7 +185,7 @@ def __cmp__ (self, other):
 #   - indicating a post-release patch ('p', 'pl', 'patch')
 # but of course this can't cover all version number schemes, and there's
 # no way to know what a programmer means without asking him.
-# 
+#
 # The problem is what to do with letters (and other non-numeric
 # characters) in a version number.  The current implementation does the
 # obvious and predictable thing: keep them as strings and compare
@@ -208,7 +208,7 @@ def __cmp__ (self, other):
 # version numbering scheme to its domination.  The free-thinking
 # anarchists in the lot will never give in, though, and something needs
 # to be done to accommodate them.
-# 
+#
 # Perhaps a "moderately strict" version class could be implemented that
 # lets almost anything slide (syntactically), and makes some heuristic
 # assumptions about non-digits in version number strings.  This could
@@ -217,7 +217,7 @@ def __cmp__ (self, other):
 # somehow knows that "1.2.1" < "1.2.2a2" < "1.2.2" < "1.2.2pl3", and is
 # just as happy dealing with things like "2g6" and "1.13++".  I don't
 # think I'm smart enough to do it right though.
-# 
+#
 # In any case, I've coded the test suite for this module (see
 # ../test/test_version.py) specifically to fail on things like comparing
 # "1.2a2" and "1.2".  That's not because the *code* is doing anything
@@ -296,6 +296,6 @@ def __cmp__ (self, other):
             other = LooseVersion(other)
 
         return cmp(self.version, other.version)
-        
+
 
 # end class LooseVersion

From 4263b3189f9532a313b1bb52e478168f8a545729 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 6 Dec 2001 21:01:19 +0000
Subject: [PATCH 0770/8469] Whitespace normalization.

---
 command/bdist.py           |  4 ++--
 command/bdist_rpm.py       | 22 +++++++++++-----------
 command/bdist_wininst.py   |  2 +-
 command/build_clib.py      |  4 ++--
 command/build_ext.py       | 20 ++++++++++----------
 command/build_py.py        |  6 +++---
 command/config.py          |  4 ++--
 command/install.py         | 10 +++++-----
 command/install_headers.py |  2 +-
 command/install_lib.py     | 12 ++++++------
 command/sdist.py           | 10 +++++-----
 11 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index a75303e689..2b1951fd32 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -17,7 +17,7 @@
 def show_formats ():
     """Print list of available formats (arguments to "--format" option).
     """
-    from distutils.fancy_getopt import FancyGetopt 
+    from distutils.fancy_getopt import FancyGetopt
     formats=[]
     for format in bdist.format_commands:
         formats.append(("formats=" + format, None,
@@ -104,7 +104,7 @@ def finalize_options (self):
 
         if self.dist_dir is None:
             self.dist_dir = "dist"
-            
+
     # finalize_options()
 
 
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 150fdeca62..037ed9e8f9 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -101,7 +101,7 @@ class bdist_rpm (Command):
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
                     'rpm2-mode': 'rpm3-mode'}
 
-                    
+
     def initialize_options (self):
         self.bdist_base = None
         self.rpm_base = None
@@ -184,7 +184,7 @@ def finalize_package_data (self):
         self.ensure_string('vendor',
                            "%s <%s>" % (self.distribution.get_contact(),
                                         self.distribution.get_contact_email()))
-        self.ensure_string('packager') 
+        self.ensure_string('packager')
         self.ensure_string_list('doc_files')
         if type(self.doc_files) is ListType:
             for readme in ('README', 'README.txt'):
@@ -201,7 +201,7 @@ def finalize_package_data (self):
         self.changelog = self._format_changelog(self.changelog)
 
         self.ensure_filename('icon')
-        
+
         self.ensure_filename('prep_script')
         self.ensure_filename('build_script')
         self.ensure_filename('install_script')
@@ -275,7 +275,7 @@ def run (self):
             else:
                 raise DistutilsFileError, \
                       "icon file '%s' does not exist" % self.icon
-        
+
 
         # build package
         self.announce('building RPMs')
@@ -368,17 +368,17 @@ def _make_spec_file(self):
                 spec_file.append('%s: %s' % (field, string.join(val)))
             elif val is not None:
                 spec_file.append('%s: %s' % (field, val))
-                
-                      
+
+
         if self.distribution.get_url() != 'UNKNOWN':
             spec_file.append('Url: ' + self.distribution.get_url())
 
         if self.distribution_name:
-             spec_file.append('Distribution: ' + self.distribution_name)
+            spec_file.append('Distribution: ' + self.distribution_name)
 
         if self.build_requires:
-             spec_file.append('BuildRequires: ' +
-                              string.join(self.build_requires))
+            spec_file.append('BuildRequires: ' +
+                             string.join(self.build_requires))
 
         if self.icon:
             spec_file.append('Icon: ' + os.path.basename(self.icon))
@@ -473,11 +473,11 @@ def _format_changelog(self, changelog):
                 new_changelog.append(line)
             else:
                 new_changelog.append('  ' + line)
-                
+
         # strip trailing newline inserted by first changelog entry
         if not new_changelog[0]:
             del new_changelog[0]
-        
+
         return new_changelog
 
     # _format_changelog()
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 7cdf385553..357ba519d3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -196,7 +196,7 @@ def create_exe (self, arcname, fullname, bitmap=None):
         file.write(self.get_exe_bytes())
         if bitmap:
             file.write(bitmapdata)
-            
+
         file.write(cfgdata)
         header = struct.pack("<iii",
                              0x1234567A,       # tag
diff --git a/command/build_clib.py b/command/build_clib.py
index 69ed044551..b659147b26 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -156,7 +156,7 @@ def check_library_list (self, libraries):
                       "must be a string (the library name)"
             if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
                 raise DistutilsSetupError, \
-                      ("bad library name '%s': " + 
+                      ("bad library name '%s': " +
                        "may not contain directory separators") % \
                       lib[0]
 
@@ -195,7 +195,7 @@ def get_source_files (self):
                       ("in 'libraries' option (library '%s'), "
                        "'sources' must be present and must be "
                        "a list of source filenames") % lib_name
-            
+
             filenames.extend(sources)
 
         return filenames
diff --git a/command/build_ext.py b/command/build_ext.py
index 259a8447fb..c9e3062306 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -28,7 +28,7 @@ def show_compilers ():
 
 
 class build_ext (Command):
-    
+
     description = "build C/C++ extensions (compile/link to build directory)"
 
     # XXX thoughts on how to deal with complex command-line options like
@@ -123,7 +123,7 @@ def finalize_options (self):
             self.package = self.distribution.ext_package
 
         self.extensions = self.distribution.ext_modules
-        
+
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
@@ -181,7 +181,7 @@ def finalize_options (self):
         # it has to be a list of 2-tuples.  All the preprocessor symbols
         # specified by the 'define' option will be set to '1'.  Multiple
         # symbols can be separated with commas.
-        
+
         if self.define:
             defines = string.split(self.define, ',')
             self.define = map(lambda symbol: (symbol, '1'), defines)
@@ -193,7 +193,7 @@ def finalize_options (self):
             self.undef = string.split(self.undef, ',')
 
     # finalize_options ()
-    
+
 
     def run (self):
 
@@ -202,7 +202,7 @@ def run (self):
         # 'self.extensions', as supplied by setup.py, is a list of
         # Extension instances.  See the documentation for Extension (in
         # distutils.extension) for details.
-        # 
+        #
         # For backwards compatibility with Distutils 0.8.2 and earlier, we
         # also allow the 'extensions' list to be a list of tuples:
         #    (ext_name, build_info)
@@ -271,7 +271,7 @@ def check_extensions_list (self, extensions):
         if type(extensions) is not ListType:
             raise DistutilsSetupError, \
                   "'ext_modules' option must be a list of Extension instances"
-        
+
         for i in range(len(extensions)):
             ext = extensions[i]
             if isinstance(ext, Extension):
@@ -280,7 +280,7 @@ def check_extensions_list (self, extensions):
 
             (ext_name, build_info) = ext
             self.warn(("old-style (ext_name, build_info) tuple found in "
-                       "ext_modules for extension '%s'" 
+                       "ext_modules for extension '%s'"
                        "-- please convert to Extension instance" % ext_name))
             if type(ext) is not TupleType and len(ext) != 2:
                 raise DistutilsSetupError, \
@@ -465,12 +465,12 @@ def build_extension(self, ext):
 
 
         self.compiler.link_shared_object(
-            objects, ext_filename, 
+            objects, ext_filename,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
             extra_postargs=extra_args,
-            export_symbols=self.get_export_symbols(ext), 
+            export_symbols=self.get_export_symbols(ext),
             debug=self.debug,
             build_temp=self.build_temp)
 
@@ -549,7 +549,7 @@ def find_swig (self):
                    "on platform '%s'") % os.name
 
     # find_swig ()
-    
+
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
 
diff --git a/command/build_py.py b/command/build_py.py
index 6fd4417f48..527e81d9ae 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -106,7 +106,7 @@ def run (self):
         self.byte_compile(self.get_outputs(include_bytecode=0))
 
     # run ()
-        
+
 
     def get_package_dir (self, package):
         """Return the directory, relative to the top of the source
@@ -178,13 +178,13 @@ def check_package (self, package, package_dir):
         # Either not in a package at all (__init__.py not expected), or
         # __init__.py doesn't exist -- so don't return the filename.
         return
-                
+
     # check_package ()
 
 
     def check_module (self, module, module_file):
         if not os.path.isfile(module_file):
-            self.warn("file %s (for module %s) not found" % 
+            self.warn("file %s (for module %s) not found" %
                       (module_file, module))
             return 0
         else:
diff --git a/command/config.py b/command/config.py
index b89997a293..27c2cc1512 100644
--- a/command/config.py
+++ b/command/config.py
@@ -147,7 +147,7 @@ def _link (self, body,
                headers, include_dirs,
                libraries, library_dirs, lang):
         (src, obj) = self._compile(body, headers, include_dirs, lang)
-        prog = os.path.splitext(os.path.basename(src))[0] 
+        prog = os.path.splitext(os.path.basename(src))[0]
         self.compiler.link_executable([obj], prog,
                                       libraries=libraries,
                                       library_dirs=library_dirs)
@@ -263,7 +263,7 @@ def try_link (self, body,
         self.announce(ok and "success!" or "failure.")
         self._clean()
         return ok
-            
+
     def try_run (self, body,
                  headers=None, include_dirs=None,
                  libraries=None, library_dirs=None,
diff --git a/command/install.py b/command/install.py
index 022e34a2e0..8755a1424a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -110,7 +110,7 @@ class install (Command):
         ('optimize=', 'O',
          "also compile with optimization: -O1 for \"python -O\", "
          "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
-         
+
         # Miscellaneous control options
         ('force', 'f',
          "force installation (overwrite any existing files)"),
@@ -305,7 +305,7 @@ def finalize_options (self):
                 self.install_lib = self.install_platlib
             else:
                 self.install_lib = self.install_purelib
-                    
+
 
         # Convert directories from Unix /-separated syntax to the local
         # convention.
@@ -353,7 +353,7 @@ def dump_dirs (self, msg):
 
 
     def finalize_unix (self):
-        
+
         if self.install_base is not None or self.install_platbase is not None:
             if ((self.install_lib is None and
                  self.install_purelib is None and
@@ -426,7 +426,7 @@ def _expand_attrs (self, attrs):
     def expand_basedirs (self):
         self._expand_attrs(['install_base',
                             'install_platbase',
-                            'root'])        
+                            'root'])
 
     def expand_dirs (self):
         self._expand_attrs(['install_purelib',
@@ -550,7 +550,7 @@ def get_outputs (self):
         if self.path_file and self.install_path_file:
             outputs.append(os.path.join(self.install_libbase,
                                         self.path_file + ".pth"))
-            
+
         return outputs
 
     def get_inputs (self):
diff --git a/command/install_headers.py b/command/install_headers.py
index 2d72a07b14..495d150c55 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -32,7 +32,7 @@ def finalize_options (self):
         self.set_undefined_options('install',
                                    ('install_headers', 'install_dir'),
                                    ('force', 'force'))
-                                   
+
 
     def run (self):
         headers = self.distribution.headers
diff --git a/command/install_lib.py b/command/install_lib.py
index 6c4c7fe993..029528e995 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -20,7 +20,7 @@ class install_lib (Command):
     #   4) compile "level 1" .pyo only (--no-compile --optimize)
     #   5) compile .pyc and "level 2" .pyo (--compile --optimize-more)
     #   6) compile "level 2" .pyo only (--no-compile --optimize-more)
-    # 
+    #
     # The UI for this is two option, 'compile' and 'optimize'.
     # 'compile' is strictly boolean, and only decides whether to
     # generate .pyc files.  'optimize' is three-way (0, 1, or 2), and
@@ -38,7 +38,7 @@ class install_lib (Command):
          "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
         ('skip-build', None, "skip the build steps"),
         ]
-               
+
     boolean_options = ['force', 'compile', 'skip-build']
     negative_opt = {'no-compile' : 'compile'}
 
@@ -82,7 +82,7 @@ def run (self):
 
         # Make sure we have built everything we need first
         self.build()
-        
+
         # Install everything: simply dump the entire contents of the build
         # directory to the installation directory (that's the beauty of
         # having a build directory!)
@@ -104,7 +104,7 @@ def build (self):
                 self.run_command('build_py')
             if self.distribution.has_ext_modules():
                 self.run_command('build_ext')
-        
+
     def install (self):
         if os.path.isdir(self.build_dir):
             outfiles = self.copy_tree(self.build_dir, self.install_dir)
@@ -164,7 +164,7 @@ def _bytecode_filenames (self, py_filenames):
                 bytecode_files.append(py_file + "o")
 
         return bytecode_files
-        
+
 
     # -- External interface --------------------------------------------
     # (called by outsiders)
@@ -199,7 +199,7 @@ def get_inputs (self):
         filenames returned by 'get_outputs()'.
         """
         inputs = []
-        
+
         if self.distribution.has_pure_modules():
             build_py = self.get_finalized_command('build_py')
             inputs.extend(build_py.get_outputs())
diff --git a/command/sdist.py b/command/sdist.py
index 894d7d44c5..fbd3c6d200 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -131,7 +131,7 @@ def run (self):
         # 'filelist' contains the list of files that will make up the
         # manifest
         self.filelist = FileList()
-        
+
         # Ensure that all required meta-data is given; warn if not (but
         # don't die, it's not *that* serious!)
         self.check_metadata()
@@ -318,7 +318,7 @@ def add_defaults (self):
             self.filelist.extend(build_clib.get_source_files())
 
     # add_defaults ()
-    
+
 
     def read_template (self):
 
@@ -395,7 +395,7 @@ def read_manifest (self):
             self.filelist.append(line)
 
     # read_manifest ()
-            
+
 
     def make_release_tree (self, base_dir, files):
         """Create the directory tree that will become the source
@@ -419,7 +419,7 @@ def make_release_tree (self, base_dir, files):
         # that's out-of-date in 'base_dir'.  (Usually, all files will be
         # out-of-date, because by default we blow away 'base_dir' when
         # we're done making the distribution archives.)
-    
+
         if hasattr(os, 'link'):        # can make hard links on this system
             link = 'hard'
             msg = "making hard links in %s..." % base_dir
@@ -439,7 +439,7 @@ def make_release_tree (self, base_dir, files):
                 self.copy_file(file, dest, link=link)
 
         self.distribution.metadata.write_pkg_info(base_dir)
-        
+
     # make_release_tree ()
 
     def make_distribution (self):

From 32002f389ee94c310f82b6d6c87b50e399f28d01 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 6 Dec 2001 21:29:28 +0000
Subject: [PATCH 0771/8469] [Bug #475009] Tighten the pattern for the first
 line, so we don't    adjust it when a versioned interpreter is supplied
 (#!.../python2 ...)

---
 command/build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 16024e5fed..31750b7c1d 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -12,7 +12,7 @@
 from distutils.util import convert_path
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile(r'^#!.*python(\s+.*)?')
+first_line_re = re.compile(r'^#!.*python(\s+.*)?$')
 
 class build_scripts (Command):
 

From bf0c7b1e25b1e08c625bb9f5cfd1e6db68360aa6 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 6 Dec 2001 22:59:54 +0000
Subject: [PATCH 0772/8469] Visious hackery to solve a build-control problem
 related to our use of distutils for the library modules built as shared
 objects.  A better solution appears possible, but with the threat that the
 distutils becomes more magical ("complex"). This closes SF bug #458343.

---
 command/build_ext.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index c9e3062306..7a39314bcd 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -456,6 +456,17 @@ def build_extension(self, ext):
                                         debug=self.debug,
                                         extra_postargs=extra_args)
 
+        # XXX -- this is a Vile HACK!
+        #
+        # The setup.py script for Python on Unix needs to be able to
+        # get this list so it can perform all the clean up needed to
+        # avoid keeping object files around when cleaning out a failed
+        # build of an extension module.  Since Distutils does not
+        # track dependencies, we have to get rid of intermediates to
+        # ensure all the intermediates will be properly re-built.
+        #
+        self._built_objects = objects[:]
+
         # Now link the object files together into a "shared object" --
         # of course, first we have to figure out all the other things
         # that go into the mix.

From 730b95b729f9b7acfb9d84225ce74b7f20b8f263 Mon Sep 17 00:00:00 2001
From: "Michael W. Hudson" <mwh@python.net>
Date: Mon, 10 Dec 2001 15:28:30 +0000
Subject: [PATCH 0773/8469] Fix for

[ #477371 ] build_scripts can use wrong #! line

scripts now get "built" into a directory

build/scripts-$(PYTHON_VERSION)/
---
 command/build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build.py b/command/build.py
index cf35b45d01..6bc92a43b8 100644
--- a/command/build.py
+++ b/command/build.py
@@ -90,7 +90,8 @@ def finalize_options (self):
             self.build_temp = os.path.join(self.build_base,
                                            'temp' + plat_specifier)
         if self.build_scripts is None:
-            self.build_scripts = os.path.join(self.build_base, 'scripts')
+            self.build_scripts = os.path.join(self.build_base,
+                                              'scripts-' + sys.version[0:3])
 
     # finalize_options ()
 

From 158c496ca9d641e38b8469143db7cf49ff35b8a8 Mon Sep 17 00:00:00 2001
From: "Michael W. Hudson" <mwh@python.net>
Date: Mon, 10 Dec 2001 16:15:44 +0000
Subject: [PATCH 0774/8469] Fix for

[ #409430 ] pydoc install broken
---
 command/build_scripts.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 31750b7c1d..7286bf1f3f 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
 from distutils.util import convert_path
@@ -86,8 +87,16 @@ def copy_scripts (self):
                               (script, self.build_dir))
                 if not self.dry_run:
                     outf = open(outfile, "w")
-                    outf.write("#!%s%s\n" % 
-                               (os.path.normpath(sys.executable), post_interp))
+                    if not sysconfig.python_build:
+                        outf.write("#!%s%s\n" % 
+                                   (os.path.normpath(sys.executable),
+                                    post_interp))
+                    else:
+                        outf.write("#!%s%s" %
+                                   (os.path.join(
+                            sysconfig.get_config_var("BINDIR"),
+                            "python" + sysconfig.get_config_var("EXE")),
+                                    post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
                 if f:

From 54b68c95834551d0995f388151974be7b967a471 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 11 Dec 2001 05:04:24 +0000
Subject: [PATCH 0775/8469] When using GCC, use the right option to add a
 directory to the list of dirs searched for a dependency for runtime linking.
 This closes SF bug #445902.

---
 unixccompiler.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index a9b5de51ce..356587d600 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -20,6 +20,7 @@
 import string, re, os
 from types import *
 from copy import copy
+from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -249,7 +250,23 @@ def library_dir_option (self, dir):
         return "-L" + dir
 
     def runtime_library_dir_option (self, dir):
-        return "-R" + dir
+        # XXX Hackish, at the very least.  See Python bug #445902:
+        # http://sourceforge.net/tracker/index.php
+        #   ?func=detail&aid=445902&group_id=5470&atid=105470
+        # Linkers on different platforms need different options to
+        # specify that directories need to be added to the list of
+        # directories searched for dependencies when a dynamic library
+        # is sought.  GCC has to be told to pass the -R option through
+        # to the linker, whereas other compilers just know this.
+        # Other compilers may need something slightly different.  At
+        # this time, there's no way to determine this information from
+        # the configuration data stored in the Python installation, so
+        # we use this hack.
+        compiler = os.path.basename(sysconfig.get_config_var("CC"))
+        if compiler == "gcc" or compiler == "g++":
+            return "-Wl,-R" + dir
+        else:
+            return "-R" + dir
 
     def library_option (self, lib):
         return "-l" + lib

From 30bfa264aae2dfa5a6a6db2a3058467c79c7f437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Tue, 11 Dec 2001 20:44:42 +0000
Subject: [PATCH 0776/8469] Joe VanAndel wrote: > > When using 'distutils'
 (shipped with Python 2.1) I've found that my > Python scripts installed with
 a first line of: > > #!/usr/bin/python2.1None > > This is caused by distutils
 trying to patch the first line of the python > script to use the current
 interpreter.

---
 command/build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 7286bf1f3f..bfa33c3a10 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -80,7 +80,7 @@ def copy_scripts (self):
                 match = first_line_re.match(first_line)
                 if match:
                     adjust = 1
-                    post_interp = match.group(1)
+                    post_interp = match.group(1) or ''
 
             if adjust:
                 self.announce("copying and adjusting %s -> %s" %

From 5ccf2307126f5e3f989925d2653239860c9b53db Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 18 Dec 2001 20:13:40 +0000
Subject: [PATCH 0777/8469] Second part of fix for bug [#483982] Python 2.2b2
 bdist_wininst crashes.

If no external zip-utility is found, the archive is created by the
zipfile module, which behaves different now than in 2.1: if the
zip-file is created in the root directory if the distribution, it will
contain an (empty) version of itself.

This triggered the above bug - so it's better to create the zip-file
far away in the TMP directory.
---
 command/bdist_wininst.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 357ba519d3..9ff9461307 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -112,13 +112,16 @@ def run (self):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
+        from tempfile import mktemp
+        archive_basename = mktemp()
         fullname = self.distribution.get_fullname()
-        archive_basename = os.path.join(self.bdist_dir,
-                                        "%s.win32" % fullname)
-
         arcname = self.make_archive(archive_basename, "zip",
                                     root_dir=self.bdist_dir)
+        # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
+        # remove the zip-file again
+        self.announce("removing temporary file '%s'" % arcname)
+        os.remove(arcname)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, self.verbose, self.dry_run)

From 74bfeea5bba971e7e23323973affee72cfd37c60 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 18 Dec 2001 21:08:15 +0000
Subject: [PATCH 0778/8469] Recreated after source changes.

---
 command/bdist_wininst.py | 568 +++++++++++++++++++--------------------
 1 file changed, 284 insertions(+), 284 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 9ff9461307..7c34cffd85 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -234,7 +234,7 @@ def get_exe_bytes (self):
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
 ZGUuDQ0KJAAAAAAAAAA/SHa+eykY7XspGO17KRjtADUU7XkpGO0UNhLtcCkY7fg1Fu15KRjtFDYc
 7XkpGO0ZNgvtcykY7XspGe0GKRjteykY7XYpGO19ChLteSkY7bwvHu16KRjtUmljaHspGO0AAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwBWGr47AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAAKAAAODuAAAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwCUrh88AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAAKAAANDuAAAA
 sAAAAAABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAEAEAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwAQEAbAEAAAAAAQAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -247,7 +247,7 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCq3wArkET+QFVsgAAN0+AAAAsAAAJgEA4//b
+bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCjD69l3lQx/kVsgAAME+AAAAsAAAJgEA4P/b
 //9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xU0YUAAi/BZHVl0X4AmAFcRvGD9v/n+
 2IP7/3Unag+4hcB1E4XtdA9XaBBw/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALbQp
 Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz3ALe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
@@ -255,288 +255,288 @@ def get_exe_bytes (self):
 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
-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
+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

From b8b4137be241dd8aeb636a704150fea716b63a30 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 21 Dec 2001 15:34:17 +0000
Subject: [PATCH 0779/8469] Suggested by Pete Shinners: treat .m and .mm files
 as source code.

Question for Jack Jansen: is this reasonable?

Candidate for 2.2 release branch (if Jack thinks it's OK).
---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index fbae7c5226..a31ccbce8d 100644
--- a/extension.py
+++ b/extension.py
@@ -160,7 +160,7 @@ def read_setup_file (filename):
             suffix = os.path.splitext(word)[1]
             switch = word[0:2] ; value = word[2:]
 
-            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++"):
+            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
                 # hmm, should we do something about C vs. C++ sources?
                 # or leave it up to the CCompiler implementation to
                 # worry about?

From 533106ffec72f15ce012bff3bae5f24df618c8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Jan 2002 11:27:42 +0000
Subject: [PATCH 0780/8469] Patch #414775: Add --skip-build option to bdist
 command.

---
 command/bdist.py         | 5 +++++
 command/bdist_dumb.py    | 9 +++++++--
 command/bdist_wininst.py | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 2b1951fd32..fc18bd0c80 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -40,8 +40,12 @@ class bdist (Command):
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in "
                      "[default: dist]"),
+                    ('skip-build', None,
+                     "skip rebuilding everything (for testing/debugging)"),
                    ]
 
+    boolean_options = ['skip-build']
+
     help_options = [
         ('help-formats', None,
          "lists available distribution formats", show_formats),
@@ -76,6 +80,7 @@ def initialize_options (self):
         self.plat_name = None
         self.formats = None
         self.dist_dir = None
+        self.skip_build = 0
 
     # initialize_options()
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 8dfc3271df..dbe862bb42 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -30,9 +30,11 @@ class bdist_dumb (Command):
                      "creating the distribution archive"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
+                    ('skip-build', None,
+                     "skip rebuilding everything (for testing/debugging)"),
                    ]
 
-    boolean_options = ['keep-temp']
+    boolean_options = ['keep-temp', 'skip-build']
 
     default_format = { 'posix': 'gztar',
                        'nt': 'zip', }
@@ -44,6 +46,7 @@ def initialize_options (self):
         self.format = None
         self.keep_temp = 0
         self.dist_dir = None
+        self.skip_build = 0
 
     # initialize_options()
 
@@ -71,10 +74,12 @@ def finalize_options (self):
 
     def run (self):
 
-        self.run_command('build')
+        if not self.skip_build:
+            self.run_command('build')
 
         install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.bdist_dir
+        install.skip_build = self.skip_build
 
         self.announce("installing to %s" % self.bdist_dir)
         self.run_command('install')
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 7c34cffd85..4a16eec45e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -36,6 +36,8 @@ class bdist_wininst (Command):
                      "bitmap to use for the installer instead of python-powered logo"),
                     ('title=', 't',
                      "title to display on the installer background instead of default"),
+                    ('skip-build', None,
+                     "skip rebuilding everything (for testing/debugging)"),
                    ]
 
     boolean_options = ['keep-temp']
@@ -49,6 +51,7 @@ def initialize_options (self):
         self.dist_dir = None
         self.bitmap = None
         self.title = None
+        self.skip_build = 0
 
     # initialize_options()
 
@@ -79,10 +82,12 @@ def run (self):
                   ("distribution contains extensions and/or C libraries; "
                    "must be compiled on a Windows 32 platform")
 
-        self.run_command('build')
+        if not self.skip_build:
+            self.run_command('build')
 
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
+        install.skip_build = self.skip_build
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files

From 877f0c18a6a831ef6f840a30e04d9ad8414d9aef Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 18 Jan 2002 20:30:53 +0000
Subject: [PATCH 0781/8469] SWIGing a source file <name>.i silently overwrites
 <name>.c if it is present - at least the swigged file should be named
 <name>_wrap.c as this is also SWIG's default. (Even better would be to
 generate the wrapped sources in a different location, but I'll leave this for
 later).

Newer versions of SWIG don't accept the -dnone flag any more.

Since virtually nobody uses SWIG with distutils, this should do no
harm.

Suggested be Martin Bless on c.l.p.
---
 command/build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7a39314bcd..98617f7fcd 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -511,7 +511,7 @@ def swig_sources (self, sources):
         for source in sources:
             (base, ext) = os.path.splitext(source)
             if ext == ".i":             # SWIG interface file
-                new_sources.append(base + target_ext)
+                new_sources.append(base + '_wrap' + target_ext)
                 swig_sources.append(source)
                 swig_targets[source] = new_sources[-1]
             else:
@@ -521,7 +521,7 @@ def swig_sources (self, sources):
             return new_sources
 
         swig = self.find_swig()
-        swig_cmd = [swig, "-python", "-dnone", "-ISWIG"]
+        swig_cmd = [swig, "-python"]
         if self.swig_cpp:
             swig_cmd.append("-c++")
 

From 9b2752c213bc110bd6b5a123c3aa67314d772711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 29 Jan 2002 10:23:42 +0000
Subject: [PATCH 0782/8469] Encode MSVC paths as mbcs. Fixes #509117. 2.2.1
 candidate.

---
 msvccompiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 8a67dfc823..35336642ae 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -117,6 +117,10 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
                     if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
+                            try:
+                                v = v.encode("mbcs")
+                            except UnicodeError:
+                                pass
                             if v == '' or v in L: continue
                             L.append(v)
                         break

From d6951f1f6bab52d73341651f62cda2dd3f85433c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Thu, 31 Jan 2002 18:56:00 +0000
Subject: [PATCH 0783/8469] OS/2 patches by Andrew I MacIntyre for distutils.

Closes patch #435381.
---
 ccompiler.py          |  3 +++
 command/bdist.py      |  3 ++-
 command/bdist_dumb.py |  9 ++++++++-
 command/build_ext.py  | 27 ++++++++++++++++++++++++++-
 command/install.py    |  7 +++++++
 spawn.py              | 31 ++++++++++++++++++++++++++++++-
 sysconfig.py          | 26 ++++++++++++++++++++++++++
 util.py               |  6 ++++++
 8 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 21bf0c1715..f4fc4bcbae 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -846,6 +846,7 @@ def mkpath (self, name, mode=0777):
     # on a cygwin built python we can use gcc like an ordinary UNIXish
     # compiler
     ('cygwin.*', 'unix'),
+    ('os2emx', 'emx'),
 
     # OS name mappings
     ('posix', 'unix'),
@@ -892,6 +893,8 @@ def get_default_compiler(osname=None, platform=None):
                                "Borland C++ Compiler"),
                    'mwerks':  ('mwerkscompiler', 'MWerksCompiler',
                                "MetroWerks CodeWarrior"),
+                   'emx':     ('emxccompiler', 'EMXCCompiler',
+                               "EMX port of GNU C Compiler for OS/2"),
                  }
 
 def show_compilers():
diff --git a/command/bdist.py b/command/bdist.py
index fc18bd0c80..68609f346a 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -57,7 +57,8 @@ class bdist (Command):
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
     default_format = { 'posix': 'gztar',
-                       'nt': 'zip', }
+                       'nt': 'zip',
+                       'os2': 'zip', }
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index dbe862bb42..b627a86a43 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -37,7 +37,8 @@ class bdist_dumb (Command):
     boolean_options = ['keep-temp', 'skip-build']
 
     default_format = { 'posix': 'gztar',
-                       'nt': 'zip', }
+                       'nt': 'zip',
+                       'os2': 'zip' }
 
 
     def initialize_options (self):
@@ -88,6 +89,12 @@ def run (self):
         # pseudo-installation tree.
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       self.plat_name)
+
+        # OS/2 objects to any ":" characters in a filename (such as when
+        # a timestamp is used in a version) so change them to hyphens.
+        if os.name == "os2":
+            archive_basename = archive_basename.replace(":", "-")
+
         self.make_archive(os.path.join(self.dist_dir, archive_basename),
                           self.format,
                           root_dir=self.bdist_dir)
diff --git a/command/build_ext.py b/command/build_ext.py
index 98617f7fcd..91fee5ee6e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -167,6 +167,11 @@ def finalize_options (self):
             else:
                 self.build_temp = os.path.join(self.build_temp, "Release")
 
+        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
+        # import libraries in its "Config" subdirectory
+        if os.name == 'os2':
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
+
         # for extensions under Cygwin Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin':
@@ -554,6 +559,10 @@ def find_swig (self):
             else:
                 return "swig.exe"
 
+        elif os.name == "os2":
+            # assume swig available in the PATH.
+            return "swig.exe"
+
         else:
             raise DistutilsPlatformError, \
                   ("I don't know how to find (much less run) SWIG "
@@ -578,6 +587,9 @@ def get_ext_filename (self, ext_name):
 
         from distutils.sysconfig import get_config_var
         ext_path = string.split(ext_name, '.')
+        # OS/2 has an 8 character module (extension) limit :-(
+        if os.name == "os2":
+            ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
@@ -599,7 +611,7 @@ def get_export_symbols (self, ext):
     def get_libraries (self, ext):
         """Return the list of libraries to link against when building a
         shared extension.  On most platforms, this is just 'ext.libraries';
-        on Windows, we add the Python library (eg. python20.dll).
+        on Windows and OS/2, we add the Python library (eg. python20.dll).
         """
         # The python library is always needed on Windows.  For MSVC, this
         # is redundant, since the library is mentioned in a pragma in
@@ -617,6 +629,19 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
+        elif sys.platform == "os2emx":
+            # EMX/GCC requires the python library explicitly, and I
+            # believe VACPP does as well (though not confirmed) - AIM Apr01
+            template = "python%d%d"
+            # debug versions of the main DLL aren't supported, at least 
+            # not at this time - AIM Apr01
+            #if self.debug:
+            #    template = template + '_d'
+            pythonlib = (template %
+                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+            # don't extend ext.libraries, it may be shared with other
+            # extensions, it is a reference to the original list
+            return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "cygwin":
             template = "python%d.%d"
             pythonlib = (template %
diff --git a/command/install.py b/command/install.py
index 8755a1424a..4d78d3aa6f 100644
--- a/command/install.py
+++ b/command/install.py
@@ -50,6 +50,13 @@
         },
     'nt': WINDOWS_SCHEME,
     'mac': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
+    'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
         'headers': '$base/Include/$dist_name',
diff --git a/spawn.py b/spawn.py
index 07dc81484a..5b6016e0d8 100644
--- a/spawn.py
+++ b/spawn.py
@@ -38,6 +38,8 @@ def spawn (cmd,
         _spawn_posix(cmd, search_path, verbose, dry_run)
     elif os.name == 'nt':
         _spawn_nt(cmd, search_path, verbose, dry_run)
+    elif os.name == 'os2':
+        _spawn_os2(cmd, search_path, verbose, dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
@@ -88,6 +90,33 @@ def _spawn_nt (cmd,
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
 
+def _spawn_os2 (cmd,
+                search_path=1,
+                verbose=0,
+                dry_run=0):
+
+    executable = cmd[0]
+    #cmd = _nt_quote_args(cmd)
+    if search_path:
+        # either we find one or it stays the same
+        executable = find_executable(executable) or executable 
+    if verbose:
+        print string.join([executable] + cmd[1:], ' ')
+    if not dry_run:
+        # spawnv for OS/2 EMX requires a full path to the .exe
+        try:
+            rc = os.spawnv(os.P_WAIT, executable, cmd)
+        except OSError, exc:
+            # this seems to happen when the command isn't found
+            raise DistutilsExecError, \
+                  "command '%s' failed: %s" % (cmd[0], exc[-1])
+        if rc != 0:
+            # and this reflects the command running but failing
+            print "command '%s' failed with exit status %d" % (cmd[0], rc)
+            raise DistutilsExecError, \
+                  "command '%s' failed with exit status %d" % (cmd[0], rc)
+
+
 def _spawn_posix (cmd,
                   search_path=1,
                   verbose=0,
@@ -154,7 +183,7 @@ def find_executable(executable, path=None):
         path = os.environ['PATH']
     paths = string.split(path, os.pathsep)
     (base, ext) = os.path.splitext(executable)
-    if (sys.platform == 'win32') and (ext != '.exe'):
+    if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
         executable = executable + '.exe'
     if not os.path.isfile(executable):
         for p in paths:
diff --git a/sysconfig.py b/sysconfig.py
index feaf318ccd..d773f14905 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -59,6 +59,8 @@ def get_python_inc(plat_specific=0, prefix=None):
         return os.path.join(prefix, "include")
     elif os.name == "mac":
         return os.path.join(prefix, "Include")
+    elif os.name == "os2":
+        return os.path.join(prefix, "Include")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its C header files "
@@ -110,6 +112,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return os.path.join(prefix, "Lib")
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
+
+    elif os.name == "os2":
+        if standard_lib:
+            return os.path.join(PREFIX, "Lib")
+        else:
+            return os.path.join(PREFIX, "Lib", "site-packages")
+
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "
@@ -391,6 +400,23 @@ def _init_mac():
     _config_vars = g
 
 
+def _init_os2():
+    """Initialize the module as appropriate for OS/2"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    g['SO'] = '.pyd'
+    g['EXE'] = ".exe"
+
+    global _config_vars
+    _config_vars = g
+
+
 def get_config_vars(*args):
     """With no arguments, return a dictionary of all configuration
     variables relevant for the current platform.  Generally this includes
diff --git a/util.py b/util.py
index 1541e02de9..a51ce6601d 100644
--- a/util.py
+++ b/util.py
@@ -117,6 +117,12 @@ def change_root (new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
+    elif os.name == 'os2':
+        (drive, path) = os.path.splitdrive(pathname)
+        if path[0] == os.sep:
+            path = path[1:]
+        return os.path.join(new_root, path)
+
     elif os.name == 'mac':
         if not os.path.isabs(pathname):
             return os.path.join(new_root, pathname)

From f666dda63137a66f6d619529d79c9238dfbae94d Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 31 Jan 2002 22:08:38 +0000
Subject: [PATCH 0784/8469] Restrict the mode to the lowest four octal
 positions; higher positions    contain the type of the file (regular file,
 socket, link, &c.).    This means that install_scripts will now print   
 "changing mode of <file> to 775" instead of "... to 100775".

2.2 bugfix candidate, I suppose, though this isn't actually fixing a bug.
---
 command/install_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_scripts.py b/command/install_scripts.py
index 3bc23e7460..d4cbaa3a0a 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -50,7 +50,7 @@ def run (self):
                 if self.dry_run:
                     self.announce("changing mode of %s" % file)
                 else:
-                    mode = (os.stat(file)[ST_MODE]) | 0111
+                    mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
                     self.announce("changing mode of %s to %o" % (file, mode))
                     os.chmod(file, mode)
 

From 4431a9867079962ba92f8671378c33555fe45a10 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 1 Feb 2002 09:44:09 +0000
Subject: [PATCH 0785/8469] package_dir must be converted from the distutils
 path conventions to local conventions before being used by build_py.

Fixes SF bug #509288, probably a candidate for 2.2.1
---
 command/build_py.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 527e81d9ae..97d094b1b2 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -12,6 +12,7 @@
 
 from distutils.core import Command
 from distutils.errors import *
+from distutils.util import convert_path
 
 
 class build_py (Command):
@@ -50,7 +51,10 @@ def finalize_options (self):
         # options -- list of packages and list of modules.
         self.packages = self.distribution.packages
         self.py_modules = self.distribution.py_modules
-        self.package_dir = self.distribution.package_dir
+        self.package_dir = {}
+        if self.distribution.package_dir:
+            for name, path in self.distribution.package_dir.items():
+                self.package_dir[name] = convert_path(path)
 
         # Ick, copied straight from install_lib.py (fancy_getopt needs a
         # type system!  Hell, *everything* needs a type system!!!)

From 0592edfb320ccaba1ac5478560dab5f5dbdccdd9 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 1 Feb 2002 18:29:34 +0000
Subject: [PATCH 0786/8469] [Bug #220993; may also fix bug #479469] Fix
 flakiness when old   installations are present, by always unlinking the
 destination file   before copying to it.  Without the unlink(), the copied
 file remains   owned by its previous UID, causing the subsequent chmod() to
 fail.

Bugfix candidate, though it may cause changes on platforms where
  file ownership behaves differently.
---
 file_util.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/file_util.py b/file_util.py
index 526e4cf593..14772fb74a 100644
--- a/file_util.py
+++ b/file_util.py
@@ -36,6 +36,13 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             raise DistutilsFileError, \
                   "could not open '%s': %s" % (src, errstr)
 
+        if os.path.exists(dst):
+            try:
+                os.unlink(dst)
+            except os.error, (errno, errstr):
+                raise DistutilsFileError, \
+                      "could not delete '%s': %s" % (dst, errstr)
+        
         try:
             fdst = open(dst, 'wb')
         except os.error, (errno, errstr):

From 896685f12e8f24d25586928c66d926c7c095b8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Wed, 6 Feb 2002 18:22:48 +0000
Subject: [PATCH 0787/8469] Forgot to add the new emxccompiler.py from Andrew
 I. MacIntyre's distutils patch for OS/2.

Here it is...
---
 emxccompiler.py | 334 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 334 insertions(+)
 create mode 100644 emxccompiler.py

diff --git a/emxccompiler.py b/emxccompiler.py
new file mode 100644
index 0000000000..58a0d812e4
--- /dev/null
+++ b/emxccompiler.py
@@ -0,0 +1,334 @@
+"""distutils.emxccompiler
+
+Provides the EMXCCompiler class, a subclass of UnixCCompiler that
+handles the EMX port of the GNU C compiler to OS/2.
+"""
+
+# issues:
+#
+# * OS/2 insists that DLLs can have names no longer than 8 characters
+#   We put export_symbols in a def-file, as though the DLL can have
+#   an arbitrary length name, but truncate the output filename.
+#
+# * only use OMF objects and use LINK386 as the linker (-Zomf)
+#
+# * always build for multithreading (-Zmt) as the accompanying OS/2 port
+#   of Python is only distributed with threads enabled.
+#
+# tested configurations:
+#   
+# * EMX gcc 2.81/EMX 0.9d fix03
+
+# created 2001/5/7, Andrew MacIntyre, from Rene Liebscher's cywinccompiler.py
+
+__revision__ = "$Id$"
+
+import os,sys,copy
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
+from distutils.unixccompiler import UnixCCompiler
+from distutils.file_util import write_file
+from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
+
+class EMXCCompiler (UnixCCompiler):
+
+    compiler_type = 'emx'
+    obj_extension = ".obj"
+    static_lib_extension = ".lib"
+    shared_lib_extension = ".dll"
+    static_lib_format = "%s%s"
+    shared_lib_format = "%s%s"
+    res_extension = ".res"      # compiled resource file
+    exe_extension = ".exe"
+   
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
+
+        UnixCCompiler.__init__ (self, verbose, dry_run, force)
+
+        (status, details) = check_config_h()
+        self.debug_print("Python's GCC status: %s (details: %s)" %
+                         (status, details))
+        if status is not CONFIG_H_OK:
+            self.warn(
+                "Python's pyconfig.h doesn't seem to support your compiler.  " +
+                ("Reason: %s." % details) +
+                "Compiling may fail because of undefined preprocessor macros.")
+        
+        (self.gcc_version, self.ld_version) = \
+            get_versions()
+        self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
+                         (self.gcc_version, 
+                          self.ld_version) )
+
+        # Hard-code GCC because that's what this is all about.
+        # XXX optimization, warnings etc. should be customizable.
+        self.set_executables(compiler='gcc -Zomf -Zmt -O2 -Wall',
+                             compiler_so='gcc -Zomf -Zmt -O2 -Wall',
+                             linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
+
+        # want the gcc library statically linked (so that we don't have
+        # to distribute a version dependent on the compiler we have)
+        self.dll_libraries=["gcc"]
+        
+    # __init__ ()
+
+    # not much different of the compile method in UnixCCompiler,
+    # but we have to insert some lines in the middle of it, so
+    # we put here a adapted version of it.
+    # (If we would call compile() in the base class, it would do some 
+    # initializations a second time, this is why all is done here.)
+    def compile (self,
+                 sources,
+                 output_dir=None,
+                 macros=None,
+                 include_dirs=None,
+                 debug=0,
+                 extra_preargs=None,
+                 extra_postargs=None):
+
+        (output_dir, macros, include_dirs) = \
+            self._fix_compile_args (output_dir, macros, include_dirs)
+        (objects, skip_sources) = self._prep_compile (sources, output_dir)
+
+        # Figure out the options for the compiler command line.
+        pp_opts = gen_preprocess_options (macros, include_dirs)
+        cc_args = pp_opts + ['-c']
+        if debug:
+            cc_args[:0] = ['-g']
+        if extra_preargs:
+            cc_args[:0] = extra_preargs
+        if extra_postargs is None:
+            extra_postargs = []
+
+        # Compile all source files that weren't eliminated by
+        # '_prep_compile()'.        
+        for i in range (len (sources)):
+            src = sources[i] ; obj = objects[i]
+            ext = (os.path.splitext (src))[1]
+            if skip_sources[src]:
+                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+            else:
+                self.mkpath (os.path.dirname (obj))
+                if ext == '.rc':
+                    # gcc requires '.rc' compiled to binary ('.res') files !!!
+                    try:
+                        self.spawn (["rc","-r",src])
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+                else: # for other files use the C-compiler 
+                    try:
+                        self.spawn (self.compiler_so + cc_args +
+                                [src, '-o', obj] +
+                                extra_postargs)
+                    except DistutilsExecError, msg:
+                        raise CompileError, msg
+
+        # Return *all* object filenames, not just the ones we just built.
+        return objects
+
+    # compile ()
+
+
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None):
+        
+        # use separate copies, so we can modify the lists
+        extra_preargs = copy.copy(extra_preargs or [])
+        libraries = copy.copy(libraries or [])
+        objects = copy.copy(objects or [])
+                
+        # Additional libraries
+        libraries.extend(self.dll_libraries)
+
+        # handle export symbols by creating a def-file
+        # with executables this only works with gcc/ld as linker
+        if ((export_symbols is not None) and
+            (target_desc != self.EXECUTABLE)):
+            # (The linker doesn't do anything if output is up-to-date.
+            # So it would probably better to check if we really need this,
+            # but for this we had to insert some unchanged parts of 
+            # UnixCCompiler, and this is not what we want.) 
+
+            # we want to put some files in the same directory as the 
+            # object files are, build_temp doesn't help much
+            # where are the object files
+            temp_dir = os.path.dirname(objects[0])
+            # name of dll to give the helper files the same base name
+            (dll_name, dll_extension) = os.path.splitext(
+                os.path.basename(output_filename))
+
+            # generate the filenames for these files
+            def_file = os.path.join(temp_dir, dll_name + ".def")
+            lib_file = os.path.join(temp_dir, dll_name + ".lib")
+       
+            # Generate .def file
+            contents = [
+                "LIBRARY %s INITINSTANCE TERMINSTANCE" % os.path.splitext(os.path.basename(output_filename))[0],
+                "DATA MULTIPLE NONSHARED",
+                "EXPORTS"]
+            for sym in export_symbols:
+                contents.append('  "%s"' % sym)
+            self.execute(write_file, (def_file, contents),
+                         "writing %s" % def_file)
+
+            # next add options for def-file and to creating import libraries
+            # for gcc/ld the def-file is specified as any other object files    
+            objects.append(def_file)
+
+        #end: if ((export_symbols is not None) and
+        #        (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
+                                                 
+        # who wants symbols and a many times larger output file
+        # should explicitly switch the debug mode on 
+        # otherwise we let dllwrap/ld strip the output file
+        # (On my machine: 10KB < stripped_file < ??100KB 
+        #   unstripped_file = stripped_file + XXX KB
+        #  ( XXX=254 for a typical python extension)) 
+        if not debug: 
+            extra_preargs.append("-s") 
+        
+        UnixCCompiler.link(self,
+                           target_desc,
+                           objects,
+                           output_filename,
+                           output_dir,
+                           libraries,
+                           library_dirs,
+                           runtime_library_dirs,
+                           None, # export_symbols, we do this in our def-file
+                           debug,
+                           extra_preargs,
+                           extra_postargs,
+                           build_temp)
+        
+    # link ()
+
+    # -- Miscellaneous methods -----------------------------------------
+
+    # overwrite the one from CCompiler to support rc and res-files
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            # use normcase to make sure '.rc' is really '.rc' and not '.RC'
+            (base, ext) = os.path.splitext (os.path.normcase(src_name))
+            if ext not in (self.src_extensions + ['.rc']):
+                raise UnknownFileError, \
+                      "unknown file type '%s' (from '%s')" % \
+                      (ext, src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext == '.rc':
+                # these need to be compiled to object files
+                obj_names.append (os.path.join (output_dir, 
+                                            base + self.res_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                            base + self.obj_extension))
+        return obj_names
+
+    # object_filenames ()
+
+# class EMXCCompiler
+
+
+# Because these compilers aren't configured in Python's pyconfig.h file by
+# default, we should at least warn the user if he is using a unmodified
+# version.
+
+CONFIG_H_OK = "ok"
+CONFIG_H_NOTOK = "not ok"
+CONFIG_H_UNCERTAIN = "uncertain"
+
+def check_config_h():
+
+    """Check if the current Python installation (specifically, pyconfig.h)
+    appears amenable to building extensions with GCC.  Returns a tuple
+    (status, details), where 'status' is one of the following constants:
+      CONFIG_H_OK
+        all is well, go ahead and compile
+      CONFIG_H_NOTOK
+        doesn't look good
+      CONFIG_H_UNCERTAIN
+        not sure -- unable to read pyconfig.h
+    'details' is a human-readable string explaining the situation.
+
+    Note there are two ways to conclude "OK": either 'sys.version' contains
+    the string "GCC" (implying that this Python was built with GCC), or the
+    installed "pyconfig.h" contains the string "__GNUC__".
+    """
+
+    # XXX since this function also checks sys.version, it's not strictly a
+    # "pyconfig.h" check -- should probably be renamed...
+
+    from distutils import sysconfig
+    import string
+    # if sys.version contains GCC then python was compiled with
+    # GCC, and the pyconfig.h file should be OK
+    if string.find(sys.version,"GCC") >= 0:
+        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
+    
+    fn = sysconfig.get_config_h_filename()
+    try:
+        # It would probably better to read single lines to search.
+        # But we do this only once, and it is fast enough 
+        f = open(fn)
+        s = f.read()
+        f.close()
+        
+    except IOError, exc:
+        # if we can't read this file, we cannot say it is wrong
+        # the compiler will complain later about this file as missing
+        return (CONFIG_H_UNCERTAIN,
+                "couldn't read '%s': %s" % (fn, exc.strerror))
+
+    else:
+        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
+        if string.find(s,"__GNUC__") >= 0:
+            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
+        else:
+            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
+
+
+def get_versions():
+    """ Try to find out the versions of gcc and ld.
+        If not possible it returns None for it.
+    """
+    from distutils.version import StrictVersion
+    from distutils.spawn import find_executable
+    import re
+        
+    gcc_exe = find_executable('gcc')
+    if gcc_exe:
+        out = os.popen(gcc_exe + ' -dumpversion','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        if result:
+            gcc_version = StrictVersion(result.group(1))
+        else:
+            gcc_version = None
+    else:
+        gcc_version = None
+    # EMX ld has no way of reporting version number, and we use GCC
+    # anyway - so we can link OMF DLLs
+    ld_version = None
+    return (gcc_version, ld_version)
+

From e4a3cf2f6d0118090f23e5ed8b9d61afd9b2b6f5 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 8 Feb 2002 14:41:31 +0000
Subject: [PATCH 0788/8469] Make it 1.5.2 compatible again.

---
 msvccompiler.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 35336642ae..79a4901bea 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -117,10 +117,11 @@ def get_msvc_paths (path, version='6.0', platform='x86'):
                     if string.upper(p) == path:
                         V = string.split(v,';')
                         for v in V:
-                            try:
-                                v = v.encode("mbcs")
-                            except UnicodeError:
-                                pass
+                            if hasattr(v, "encode"):
+                                try:
+                                    v = v.encode("mbcs")
+                                except UnicodeError:
+                                    pass
                             if v == '' or v in L: continue
                             L.append(v)
                         break

From ab694beb3331ca6d37bf29f0f783c2cd57c52bb5 Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Mon, 11 Feb 2002 15:31:50 +0000
Subject: [PATCH 0789/8469] on MacOSX/Darwin, use ranlib when building static
 libs.

---
 unixccompiler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 356587d600..7e63c56afe 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,7 +17,7 @@
 
 __revision__ = "$Id$"
 
-import string, re, os
+import string, re, os, sys
 from types import *
 from copy import copy
 from distutils import sysconfig
@@ -62,6 +62,9 @@ class UnixCCompiler (CCompiler):
                    'ranlib'       : None,
                   }
 
+    if sys.platform[:6] == "darwin":
+        executables['ranlib'] = ["ranlib"]
+
     # Needed for the filename generation methods provided by the base
     # class, CCompiler.  NB. whoever instantiates/uses a particular
     # UnixCCompiler instance should set 'shared_lib_ext' -- we set a

From 32ee66a4511be5b957e95bf1e71f148b611f9736 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 20 Feb 2002 08:01:19 +0000
Subject: [PATCH 0790/8469] First version which runs an install-script
 (specified by the --install-script ... command line option to bdist_wininst)
 at the end of the installation and at the start of deinstallation.  Output
 (stdout, stderr) of the script (if any) is displayed in the last screen at
 installation, or in a simple message box at deinstallation.

sys.argv[1] for the script will contain '-install' at installation
time or '-remove' at deinstallation time.

The installation script runs in an environment (embedded by the
bdist_wininst runtime) where an additional function is available as
builtin:

create_shortcut(path, description, filename,
	        [arguments[, workdir[, iconpath, iconindex]]])

Recreated this file after source changes.
---
 command/bdist_wininst.py | 668 +++++++++++++++++++++------------------
 1 file changed, 354 insertions(+), 314 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 4a16eec45e..fe52f393dc 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -38,6 +38,9 @@ class bdist_wininst (Command):
                      "title to display on the installer background instead of default"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
+                    ('install-script=', None,
+                     "installation script to be run after installation"
+                     " or before deinstallation"),
                    ]
 
     boolean_options = ['keep-temp']
@@ -52,6 +55,7 @@ def initialize_options (self):
         self.bitmap = None
         self.title = None
         self.skip_build = 0
+        self.install_script = None
 
     # initialize_options()
 
@@ -71,6 +75,11 @@ def finalize_options (self):
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
+        if self.install_script and \
+               self.install_script not in self.distribution.scripts:
+            raise DistutilsOptionError, \
+                  "install_script '%s' not found in scripts" % self.install_script
+
     # finalize_options()
 
 
@@ -159,6 +168,8 @@ def get_inidata (self):
         # The [setup] section contains entries controlling
         # the installer runtime.
         lines.append("\n[Setup]")
+        if self.install_script:
+            lines.append("install_script=%s" % self.install_script)
         lines.append("info=%s" % repr(info)[1:-1])
         lines.append("target_compile=%d" % (not self.no_target_compile))
         lines.append("target_optimize=%d" % (not self.no_target_optimize))
@@ -223,6 +234,17 @@ def get_exe_bytes (self):
 
 if __name__ == '__main__':
     # recreate EXEDATA from wininst.exe by rewriting this file
+
+    # If you want to do this at home, you should:
+    # - checkout the *distutils* source code
+    #   (see also http://sourceforge.net/cvs/?group_id=5470)
+    #   by doing:
+    #     cvs -d:pserver:anonymous@cvs.python.sourceforge.net:/cvsroot/python login
+    #   and
+    #     cvs -z3 -d:pserver:anonymous@cvs.python.sourceforge.net:/cvsroot/python co distutils
+    # - Built wininst.exe from the MSVC project file distutils/misc/wininst.dsw
+    # - Execute this file (distutils/distutils/command/bdist_wininst.py)
+
     import re, base64
     moddata = open("bdist_wininst.py", "r").read()
     exedata = open("../../misc/wininst.exe", "rb").read()
@@ -236,338 +258,356 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
-AAAAAAAAAAAAADoCAQBIAgEAWAIBAAAAAABmAgEAAAAAAHQCAQAAAAAAhAIBAAAAAACOAgEAAAAA
-AJQCAQAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRsbABDT01DVEwzMi5kbGwAR0RJMzIuZGxs
-AE1TVkNSVC5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVzcwAARXhp
-dFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAAZXhpdAAA
-R2V0REMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAgAAACAAAIAFAAAAYAAAgAAAAAAA
+AAAAAAAAAAAAAQBuAAAAOAAAgAAAAAAAAAAAAAAAAAAAAQAAAAAAUAAAADDBAAAICgAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAQAawAAAJAAAIBsAAAAuAAAgG0AAADgAACAbgAAAAgBAIAAAAAAAAAA
+AAAAAAAAAAEACQQAAKgAAAA4ywAAoAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAADQAAAA
+2MwAAAQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA+AAAAODOAABaAgAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAEACQQAACABAABA0QAAFAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAIBANAB
+AQAAAAAAAAAAAAAAAAAdAgEA4AEBAAAAAAAAAAAAAAAAACoCAQDoAQEAAAAAAAAAAAAAAAAANwIB
+APABAQAAAAAAAAAAAAAAAABBAgEA+AEBAAAAAAAAAAAAAAAAAEwCAQAAAgEAAAAAAAAAAAAAAAAA
+VgIBAAgCAQAAAAAAAAAAAAAAAAAAAAAAAAAAAGACAQBuAgEAfgIBAAAAAACMAgEAAAAAAJoCAQAA
+AAAAqgIBAAAAAAC0AgEAAAAAALoCAQAAAAAAyAIBAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIu
+ZGxsAENPTUNUTDMyLmRsbABHREkzMi5kbGwATVNWQ1JULmRsbABvbGUzMi5kbGwAVVNFUjMyLmRs
+bAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVzcwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtl
+eQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAAZXhpdAAAQ29Jbml0aWFsaXplAABHZXREQwAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAA=
+AAAAAAAAAAAAAAAAAAAAAAAA
 """
 
 # --- EOF ---

From 09c86a0df132784f9ed870fd070a8b4f2438659c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Thu, 28 Feb 2002 09:16:21 +0000
Subject: [PATCH 0791/8469] Allow shebang's which use versioned Python
 binaries. Fixes bug #521526.

---
 command/build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index bfa33c3a10..444284f7cc 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -13,7 +13,7 @@
 from distutils.util import convert_path
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile(r'^#!.*python(\s+.*)?$')
+first_line_re = re.compile(r'^#!.*python[0-9.]*(\s+.*)?$')
 
 class build_scripts (Command):
 

From 8fd1b1700cffd1092deeb99b2448e2a42217299a Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Mar 2002 23:27:54 +0000
Subject: [PATCH 0792/8469] [Bug #517451] bdist_rpm didn't list all of its
 Boolean options.    (Someone should check the other commands for this same
 error.)

Bugfix candidate.
---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 037ed9e8f9..4bc2561324 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -95,7 +95,7 @@ class bdist_rpm (Command):
          "RPM 2 compatibility mode"),
        ]
 
-    boolean_options = ['keep-temp', 'rpm2-mode']
+    boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',

From 1e740e80316e36a442707027850bece78e8eb3af Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Mar 2002 23:44:01 +0000
Subject: [PATCH 0793/8469] Add unlisted Boolean options.  Thomas H., can you
 please check that I     got this right?

Bugfix candidate, unless Thomas notes a problem.
---
 command/bdist_wininst.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index fe52f393dc..33dc28ed0c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -43,7 +43,8 @@ class bdist_wininst (Command):
                      " or before deinstallation"),
                    ]
 
-    boolean_options = ['keep-temp']
+    boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
+                       'skip-build']
 
     def initialize_options (self):
         self.bdist_dir = None

From 127d81ce6d8d0d8e6c98fe835467cca676ac6e57 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Mar 2002 23:46:54 +0000
Subject: [PATCH 0794/8469] Add missing Boolean options Remove unused
 no_compile flag Initialize the Boolean attribute .compile to 0 instead of
 None

Bugfix candidate.
---
 command/install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/command/install.py b/command/install.py
index 4d78d3aa6f..2a18fb9dee 100644
--- a/command/install.py
+++ b/command/install.py
@@ -134,7 +134,7 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['force', 'skip-build']
+    boolean_options = ['compile', 'force', 'skip-build']
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -164,8 +164,7 @@ def initialize_options (self):
         self.install_scripts = None
         self.install_data = None
 
-        self.compile = None
-        self.no_compile = None
+        self.compile = 0
         self.optimize = None
 
         # These two are for putting non-packagized distributions into their

From b193016d79630c69c5bb7005c4a38a746aa74be2 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 22 Mar 2002 15:35:17 +0000
Subject: [PATCH 0795/8469] Revert part of previous patch: several install_*
 subcommands expect     .compile to be None, and set it to true if it is.    
 Caught by Pearu Peterson.

Bugfix candidate, if the previous change is accepted for
release22-maint.
---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 2a18fb9dee..746ca1f2c3 100644
--- a/command/install.py
+++ b/command/install.py
@@ -164,7 +164,7 @@ def initialize_options (self):
         self.install_scripts = None
         self.install_data = None
 
-        self.compile = 0
+        self.compile = None
         self.optimize = None
 
         # These two are for putting non-packagized distributions into their

From 3f2880bde5a24637ed8dc9e8b534d3855705673c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 29 Mar 2002 18:00:19 +0000
Subject: [PATCH 0796/8469] [Patch #536769] Add -Xcompiler flag for adding
 arguments and switches for     the compiler

---
 extension.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension.py b/extension.py
index a31ccbce8d..3737712016 100644
--- a/extension.py
+++ b/extension.py
@@ -188,6 +188,8 @@ def read_setup_file (filename):
                 append_next_word = ext.runtime_library_dirs
             elif word == "-Xlinker":
                 append_next_word = ext.extra_link_args
+            elif word == "-Xcompiler":
+                append_next_word = ext.extra_compile_args
             elif switch == "-u":
                 ext.extra_link_args.append(word)
                 if not value:

From fd007b43987507a5ef19f1ba2d9037d1aebf6c4d Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 4 Apr 2002 22:55:58 +0000
Subject: [PATCH 0797/8469] Convert a pile of obvious "yes/no" functions to
 return bool.

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

diff --git a/command/build_py.py b/command/build_py.py
index 97d094b1b2..453ca97a09 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -190,9 +190,9 @@ def check_module (self, module, module_file):
         if not os.path.isfile(module_file):
             self.warn("file %s (for module %s) not found" %
                       (module_file, module))
-            return 0
+            return False
         else:
-            return 1
+            return True
 
     # check_module ()
 

From 2b6ab4d227f851daa1f17389e45bc5456c3211e6 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 4 Apr 2002 23:17:31 +0000
Subject: [PATCH 0798/8469] Revert 0/1 -> False/True change; I didn't intend to
 muck w/ distutils.

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

diff --git a/command/build_py.py b/command/build_py.py
index 453ca97a09..97d094b1b2 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -190,9 +190,9 @@ def check_module (self, module, module_file):
         if not os.path.isfile(module_file):
             self.warn("file %s (for module %s) not found" %
                       (module_file, module))
-            return False
+            return 0
         else:
-            return True
+            return 1
 
     # check_module ()
 

From ae4a213ef2fb41949998f6087eeb9797cad3ee71 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 9 Apr 2002 14:14:38 +0000
Subject: [PATCH 0799/8469] Set the warn_dir option to 0 before running the
 install command. This suppresses bogus warnings about modules installed into
 a directory not in sys.path.

Bugfix candidate.
---
 command/bdist_dumb.py    | 1 +
 command/bdist_wininst.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index b627a86a43..a135877a8e 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -81,6 +81,7 @@ def run (self):
         install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.bdist_dir
         install.skip_build = self.skip_build
+        install.warn_dir = 0
 
         self.announce("installing to %s" % self.bdist_dir)
         self.run_command('install')
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 33dc28ed0c..1683bb31a7 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -98,6 +98,7 @@ def run (self):
         install = self.reinitialize_command('install')
         install.root = self.bdist_dir
         install.skip_build = self.skip_build
+        install.warn_dir = 0
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files

From 0691960a0fb3b6ce43f5d0c58985371ed2a98d48 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 9 Apr 2002 14:16:07 +0000
Subject: [PATCH 0800/8469] Remove unconditional debugging prints.

---
 command/bdist.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 68609f346a..99f7d95e5a 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -131,9 +131,6 @@ def run (self):
             if cmd_name not in self.no_format_option:
                 sub_cmd.format = self.formats[i]
 
-            print ("bdist.run: format=%s, command=%s, rest=%s" %
-                   (self.formats[i], cmd_name, commands[i+1:]))
-
             # If we're going to need to run this command again, tell it to
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:

From 668ed0282eeb48450bfbf7800678dcacd6c2e4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Wed, 17 Apr 2002 20:30:10 +0000
Subject: [PATCH 0801/8469] Patch #531901 by Mark W. Alexander: adds a new
 distutils packager base class (in bdist_packager) and two subclasses which
 make use of this base class: bdist_pkgtool (for Solaris) and bdist_sdux (for
 HP-UX).

---
 command/__init__.py       |   5 +
 command/bdist.py          |  11 +-
 command/bdist_packager.py | 250 +++++++++++++++++++++++
 command/bdist_pkgtool.py  | 412 ++++++++++++++++++++++++++++++++++++++
 command/bdist_sdux.py     | 302 ++++++++++++++++++++++++++++
 5 files changed, 976 insertions(+), 4 deletions(-)
 create mode 100644 command/bdist_packager.py
 create mode 100644 command/bdist_pkgtool.py
 create mode 100644 command/bdist_sdux.py

diff --git a/command/__init__.py b/command/__init__.py
index ef8e9ad694..8143627559 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -21,4 +21,9 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
+           'bdist_sdux',
+           'bdist_pkgtool',
+           # Note:
+           # bdist_packager is not included because it only provides
+           # an abstract base class
           ]
diff --git a/command/bdist.py b/command/bdist.py
index 99f7d95e5a..f61611eb8d 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -52,7 +52,7 @@ class bdist (Command):
         ]
 
     # The following commands do not take a format option from bdist
-    no_format_option = ('bdist_rpm',)
+    no_format_option = ('bdist_rpm', 'bdist_sdux', 'bdist_pkgtool')
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
@@ -62,18 +62,21 @@ class bdist (Command):
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
-                       'wininst', 'zip']
+                       'wininst', 'zip', 'pkgtool', 'sdux']
 
     # And the real information.
     format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
-                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
+                       'zip':   ('bdist_dumb', "ZIP file"),                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
                        'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                        'ztar':  ('bdist_dumb', "compressed tar file"),
                        'tar':   ('bdist_dumb', "tar file"),
                        'wininst': ('bdist_wininst',
                                    "Windows executable installer"),
                        'zip':   ('bdist_dumb', "ZIP file"),
-                     }
+                       'pkgtool': ('bdist_pkgtool', 
+                                   "Solaris pkgtool distribution"),
+                       'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
+                      }
 
 
     def initialize_options (self):
diff --git a/command/bdist_packager.py b/command/bdist_packager.py
new file mode 100644
index 0000000000..a812307e73
--- /dev/null
+++ b/command/bdist_packager.py
@@ -0,0 +1,250 @@
+"""distutils.command.bdist_ packager
+
+Modified from bdist_dumb by Mark W. Alexander <slash@dotnetslash.net>
+
+Implements the Distutils 'bdist_packager' abstract command 
+to be subclassed by binary package creation commands."""
+
+
+__revision__ = "$Id: bdist_packager.py,v 0.1 2001/04/4 mwa"
+
+import os
+from distutils.core import Command
+from distutils.util import get_platform
+from distutils.dir_util import create_tree, remove_tree
+from distutils.file_util import write_file
+from distutils.errors import *
+import string, sys
+
+class bdist_packager (Command):
+
+    description = "abstract base for package manager specific bdist commands"
+
+# XXX update user_options
+    user_options = [
+         ('bdist-base=', None,
+         "base directory for creating built distributions"),
+        ('pkg-dir=', None,
+         "base directory for creating binary packages (defaults to \"binary\" under "),
+        ('dist-dir=', 'd',
+         "directory to put final RPM files in "
+         "(and .spec files if --spec-only)"),
+        ('category=', None,
+         "Software category (packager dependent format)"),
+        ('revision=', None,
+         "package revision number"),
+	# the following have moved into the distribution class
+        #('packager=', None,
+         #"Package maintainer"),
+        #('packager-mail=', None,
+         #"Package maintainer's email address"),
+        #('author=', None,
+         #"Package author"),
+        #('author-mail=', None,
+         #"Package author's email address"),
+        #('license=', None,
+         #"License code"),
+        #('licence=', None,
+         #"alias for license"),
+        ('icon=', None,
+         "Package icon"),
+        ('subpackages=', None,
+         "Comma seperated list of seperately packaged trees"),
+        ('preinstall=', None,
+         "preinstall script (Bourne shell code)"),
+        ('postinstall=', None,
+         "postinstall script (Bourne shell code)"),
+        ('preremove=', None,
+         "preremove script (Bourne shell code)"),
+        ('postremove=', None,
+         "postremove script (Bourne shell code)"),
+        ('requires=', None,
+         "capabilities required by this package"),
+        ('keep-temp', 'k',
+         "don't clean up RPM build directory"),
+        ('control-only', None,
+         "Generate package control files and stop"),
+        ('no-autorelocate', None,
+         "Inhibit automatic relocation to installed site-packages"),
+         ]
+
+    boolean_options = ['keep-temp', 'control-only', 'no_autorelocate']
+
+    def ensure_string_not_none (self,option,default=None):
+        val = getattr(self,option)
+        if val is not None:
+            return
+        Command.ensure_string(self,option,default)
+        val = getattr(self,option)
+        if val is None:
+            raise DistutilsOptionError, "'%s' must be provided" % option
+
+    def ensure_script (self,arg):
+        if not arg:
+            return
+        try:
+            self.ensure_string(arg, None)
+        except:
+            try:
+                self.ensure_filename(arg, None)
+            except:
+                raise RuntimeError, \
+                    "cannot decipher script option (%s)" \
+                    % arg
+
+    def write_script (self,path,attr,default=None):
+        """ write the script specified in attr to path. if attr is None,
+            write use default instead """
+        val = getattr(self,attr)
+        if not val:
+            if not default:
+                return
+            else:
+                setattr(self,attr,default)
+                val = default
+        if val!="":
+            self.announce('Creating %s script', attr)
+            self.execute(write_file,
+                     (path, self.get_script(attr)),
+                     "writing '%s'" % path)
+
+    def get_binary_name(self):
+        py_ver = sys.version[0:string.find(sys.version,' ')]
+        return self.name + '-' + self.version + '-' + \
+               self.revision + '-' + py_ver
+
+    def get_script (self,attr):
+        # accept a script as a string ("line\012line\012..."),
+        # a filename, or a list
+        # XXX We could probably get away with copy_file, but I'm
+        # guessing this will be more flexible later on....
+        val = getattr(self,attr)
+        ret=None
+        if val:
+            try:
+                os.stat(val)
+                # script is a file
+                ret=[]
+                f=open(val)
+                ret=string.split(f.read(),"\012");
+                f.close()
+                #return ret
+            except:
+                if type(val)==type(""):
+                    # script is a string
+                    ret = string.split(val,"\012")
+                elif type(val)==type([]):
+                    # script is a list
+                    ret = val
+                else:
+                    raise RuntimeError, \
+                        "cannot figure out what to do with 'request' option (%s)" \
+                        % val
+            return ret
+
+
+    def initialize_options (self):
+        d = self.distribution
+        self.keep_temp = 0
+        self.control_only = 0
+        self.no_autorelocate = 0
+        self.pkg_dir = None
+        self.plat_name = None
+        self.icon = None
+        self.requires = None
+        self.subpackages = None
+        self.category = None
+        self.revision = None
+
+        # PEP 241 Metadata
+        self.name = None
+        self.version = None
+        #self.url = None
+        #self.author = None
+        #self.author_email = None
+        #self.maintainer = None
+        #self.maintainer_email = None
+        #self.description = None
+        #self.long_description = None
+        #self.licence = None
+        #self.platforms = None
+        #self.keywords = None
+        self.root_package = None
+
+        # package installation scripts
+        self.preinstall = None
+        self.postinstall = None
+        self.preremove = None
+        self.postremove = None
+    # initialize_options()
+
+
+    def finalize_options (self):
+
+        if self.pkg_dir is None:
+            bdist_base = self.get_finalized_command('bdist').bdist_base
+            self.pkg_dir = os.path.join(bdist_base, 'binary')
+
+        if not self.plat_name:
+            d = self.distribution
+            self.plat = d.get_platforms()
+        if self.distribution.has_ext_modules():
+            self.plat_name = [sys.platform,]
+        else:
+            self.plat_name = ["noarch",]
+
+        d = self.distribution
+        self.ensure_string_not_none('name', d.get_name())
+        self.ensure_string_not_none('version', d.get_version())
+        self.ensure_string('category')
+        self.ensure_string('revision',"1")
+        #self.ensure_string('url',d.get_url())
+	if type(self.distribution.packages) == type([]):
+		self.root_package=self.distribution.packages[0]
+	else:
+		self.root_package=self.name
+        self.ensure_string('root_package',self.root_package)
+        #self.ensure_string_list('keywords')
+        #self.ensure_string_not_none('author', d.get_author())
+        #self.ensure_string_not_none('author_email', d.get_author_email())
+        self.ensure_filename('icon')
+        #self.ensure_string_not_none('maintainer', d.get_maintainer())
+        #self.ensure_string_not_none('maintainer_email',
+                        #d.get_maintainer_email())
+        #self.ensure_string_not_none('description', d.get_description())
+        #self.ensure_string_not_none('long_description', d.get_long_description())
+        #if self.long_description=='UNKNOWN':
+            #self.long_description=self.description
+        #self.ensure_string_not_none('license', d.get_license())
+        self.ensure_string_list('requires')
+        self.ensure_filename('preinstall')
+        self.ensure_filename('postinstall')
+        self.ensure_filename('preremove')
+        self.ensure_filename('postremove')
+
+    # finalize_options()
+
+
+    def run (self):
+
+        raise RuntimeError, \
+            "abstract method -- subclass %s must override" % self.__class__
+        self.run_command('build')
+
+        install = self.reinitialize_command('install', reinit_subcommands=1)
+        install.root = self.pkg_dir
+
+        self.announce("installing to %s" % self.pkg_dir)
+        self.run_command('install')
+
+        # And make an archive relative to the root of the
+        # pseudo-installation tree.
+        archive_basename = "%s.%s" % (self.distribution.get_fullname(),
+                                      self.plat_name)
+
+        if not self.keep_temp:
+            remove_tree(self.pkg_dir, self.verbose, self.dry_run)
+
+    # run()
+
+# class bdist_packager
diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
new file mode 100644
index 0000000000..fc035ebde4
--- /dev/null
+++ b/command/bdist_pkgtool.py
@@ -0,0 +1,412 @@
+"""distutils.command.bdist_pkgtool
+
+
+Author: Mark W. Alexander <slash@dotnet.net>
+
+Implements the Distutils 'bdist_pkgtool' command (create Solaris pkgtool
+distributions)."""
+
+import os, string, sys, pwd, grp
+import glob
+from types import *
+from distutils.core import Command, DEBUG
+from distutils.util import get_platform
+from distutils.file_util import write_file
+from distutils.errors import *
+from distutils.command import bdist_packager
+from distutils import sysconfig
+import compileall
+from commands import getoutput
+
+__revision__ = "$Id: bdist_pkgtool.py,v 0.3 mwa "
+
+# default request script - Is also wrapped around user's request script
+# unless --no-autorelocate is requested. Finds the python site-packages
+# directory and prompts for verification
+DEFAULT_REQUEST="""#!/bin/sh 
+######################################################################
+#         Distutils internal package relocation support              #
+######################################################################
+
+PRODUCT="__DISTUTILS_NAME__"
+
+trap `exit 3` 15
+/usr/bin/which python 2>&1 >/dev/null
+if [ $? -ne 0 ]; then
+    echo "The python interpretor needs to be on your path!"
+    echo 
+    echo "If you have more than one, make sure the first one is where"
+    echo "you want this module installed:"
+    exit 1
+fi
+
+PY_DIR=`python -c "import sys;print '%s/lib/python%s' % (sys.exec_prefix,sys.version[0:3])" 2>/dev/null`
+PY_PKG_DIR=`python -c "import sys;print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[0:3])" 2>/dev/null`
+
+echo ""
+if [ -z "${PY_DIR}" ]; then
+	echo "I can't seem to find the python distribution."
+	echo "I'm assuming the default path for site-packages"
+else
+	BASEDIR="${PY_PKG_DIR}"
+	cat <<EOF
+	Python found! The default path:
+
+	${BASEDIR}
+
+	will install ${PRODUCT} such that all python users 
+	can import it.
+
+	If you just want individual access, you can install into
+	any directory and add that directory to your \$PYTHONPATH
+EOF
+fi
+echo ""
+
+BASEDIR=`ckpath -d ${BASEDIR} -ay \
+	-p "Where should ${PRODUCT} be installed? [${BASEDIR}]"` || exit $?
+
+######################################################################
+#                user supplied request script follows                #
+######################################################################
+"""
+### request script
+
+# default postinstall compiles and changes ownership on the module directory
+# XXX The ownership change _should_ be handled by adjusting the prototype file
+DEFAULT_POSTINSTALL="""#!/bin/sh
+/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
+if [ $? -eq 0 ]; then
+	python -c "import compileall;compileall.compile_dir(\\"${BASEDIR}/__DISTUTILS_NAME__\\")"
+	chown -R root:other ${BASEDIR}/__DISTUTILS_NAME__
+fi
+"""
+
+# default preremove deletes *.pyc and *.pyo from the module tree
+# This should leave the tree empty, so pkgtool will remove it.
+# If the user's scripts place anything else in there (e.g. config files),
+# pkgtool will leave the directory intact
+DEFAULT_PREREMOVE="""#!/bin/sh
+
+/usr/bin/which python 2>&1 >/dev/null
+if [ $? -ne 0 ]; then
+    echo "The python interpretor needs to be on your path!"
+    echo 
+    echo "If you have more than one, make sure the first one is where"
+    echo "you want this module removed from"
+    exit 1
+fi
+
+/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
+if [ $? -eq 0 ]; then
+	find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyc" -exec rm {} \;
+	find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyo" -exec rm {} \;
+fi
+"""
+
+# default postremove removes the module directory _IF_ no files are
+# there (Turns out this isn't needed if the preremove does it's job
+# Left for posterity
+DEFAULT_POSTREMOVE="""#!/bin/sh
+
+/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
+if [ $? -eq 0 ]; then
+	if [ `find ${BASEDIR}/__DISTUTILS_NAME__ ! -type d | wc -l` -eq 0 ]; then
+    	rm -rf ${BASEDIR}/__DISTUTILS_NAME__
+	fi
+fi
+"""
+
+class bdist_pkgtool (bdist_packager.bdist_packager):
+
+    description = "create an pkgtool (Solaris) package"
+
+    user_options = bdist_packager.bdist_packager.user_options + [
+        ('revision=', None,
+         "package revision number (PSTAMP)"),
+        ('pkg-abrev=', None,
+         "Abbreviation (9 characters or less) of the package name"),
+        ('compver=', None,
+         "file containing compatible versions of this package (man compver)"),
+        ('depend=', None,
+         "file containing dependencies for this package (man depend)"),
+        #('category=', None,
+         #"Software category"),
+        ('request=', None,
+         "request script (Bourne shell code)"),
+       ]
+
+    def initialize_options (self):
+        # XXX Check for pkgtools on path...
+        bdist_packager.bdist_packager.initialize_options(self)
+        self.compver = None
+        self.depend = None
+        self.vendor = None
+        self.classes = None
+        self.request = None
+        self.pkg_abrev = None
+        self.revision = None
+        # I'm not sure I should need to do this, but the setup.cfg
+        # settings weren't showing up....
+        options = self.distribution.get_option_dict('bdist_packager')
+        for key in options.keys():
+            setattr(self,key,options[key][1])
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        global DEFAULT_REQUEST, DEFAULT_POSTINSTALL
+        global DEFAULT_PREREMOVE, DEFAULT_POSTREMOVE
+        if self.pkg_dir is None:
+            dist_dir = self.get_finalized_command('bdist').dist_dir
+            self.pkg_dir = os.path.join(dist_dir, "pkgtool")
+
+        self.ensure_string('classes', None)
+        self.ensure_string('revision', "1")
+        self.ensure_script('request')
+        self.ensure_script('preinstall')
+        self.ensure_script('postinstall')
+        self.ensure_script('preremove')
+        self.ensure_script('postremove')
+        self.ensure_string('vendor', None)
+        if self.__dict__.has_key('author'):
+                if self.__dict__.has_key('author_email'):
+                        self.ensure_string('vendor',
+                                "%s <%s>" % (self.author,
+                                   self.author_email))
+                else:
+                        self.ensure_string('vendor',
+                             "%s" % (self.author))
+        self.ensure_string('category', "System,application")
+        self.ensure_script('compver')
+        self.ensure_script('depend')
+        bdist_packager.bdist_packager.finalize_options(self)
+        if self.pkg_abrev is None:
+            self.pkg_abrev=self.name
+        if len(self.pkg_abrev)>9:
+            raise DistutilsOptionError, \
+            "pkg-abrev (%s) must be less than 9 characters" % self.pkg_abrev
+        # Update default scripts with our metadata name
+        DEFAULT_REQUEST = string.replace(DEFAULT_REQUEST, 
+            "__DISTUTILS_NAME__", self.root_package)
+        DEFAULT_POSTINSTALL = string.replace(DEFAULT_POSTINSTALL,
+            "__DISTUTILS_NAME__", self.root_package)
+        DEFAULT_PREREMOVE = string.replace(DEFAULT_PREREMOVE,
+            "__DISTUTILS_NAME__", self.root_package)
+        DEFAULT_POSTREMOVE = string.replace(DEFAULT_POSTREMOVE,
+            "__DISTUTILS_NAME__", self.root_package)
+
+    # finalize_options()
+
+
+    def make_package(self,root=None):
+        # make directories
+        self.mkpath(self.pkg_dir)
+        if root:
+            pkg_dir = self.pkg_dir+"/"+root
+            self.mkpath(pkg_dir)
+        else:
+            pkg_dir = self.pkg_dir
+
+        install = self.reinitialize_command('install', reinit_subcommands=1)
+        # build package
+        self.announce('Building package')
+        self.run_command('build')
+        self.announce('Creating pkginfo file')
+        path = os.path.join(pkg_dir, "pkginfo")
+        self.execute(write_file,
+                     (path,
+                      self._make_info_file()),
+                     "writing '%s'" % path)
+        # request script handling
+        if self.request==None:
+            self.request = self._make_request_script()
+        if self.request!="":
+            path = os.path.join(pkg_dir, "request")
+            self.execute(write_file,
+                     (path,
+                      self.request),
+                     "writing '%s'" % path)
+
+        # Create installation scripts, since compver & depend are
+        # user created files, they work just fine as scripts
+        self.write_script(os.path.join(pkg_dir, "postinstall"),
+                 'postinstall',DEFAULT_POSTINSTALL)
+        self.write_script(os.path.join(pkg_dir, "preinstall"),
+                 'preinstall',None)
+        self.write_script(os.path.join(pkg_dir, "preremove"),
+                 'preremove',DEFAULT_PREREMOVE)
+        self.write_script(os.path.join(pkg_dir, "postremove"),
+                 'postremove',None)
+        self.write_script(os.path.join(pkg_dir, "compver"),
+                 'compver',None)
+        self.write_script(os.path.join(pkg_dir, "depend"),
+                 'depend',None)
+            
+        self.announce('Creating prototype file')
+        path = os.path.join(pkg_dir, "prototype")
+        self.execute(write_file,
+                     (path,
+                      self._make_prototype()),
+                     "writing '%s'" % path)
+
+
+        if self.control_only: # stop if requested
+            return
+
+
+        self.announce('Creating package')
+        pkg_cmd = ['pkgmk', '-o', '-f']
+        pkg_cmd.append(path)
+        pkg_cmd.append('-b')
+        pkg_cmd.append(os.environ['PWD'])
+        self.spawn(pkg_cmd)
+        pkg_cmd = ['pkgtrans', '-s', '/var/spool/pkg']
+        path = os.path.join(os.environ['PWD'],pkg_dir, 
+		           self.get_binary_name() + ".pkg")
+        self.announce('Transferring package to ' + pkg_dir)
+        pkg_cmd.append(path)
+        pkg_cmd.append(self.pkg_abrev)
+        self.spawn(pkg_cmd)
+        os.system("rm -rf /var/spool/pkg/%s" % self.pkg_abrev)
+        
+
+    def run (self):
+        if self.subpackages:
+            self.subpackages=string.split(self.subpackages,",")
+            for pkg in self.subpackages:
+                self.make_package(subpackage)
+        else:
+            self.make_package()
+    # run()
+
+  
+    def _make_prototype(self):
+        proto_file = ["i pkginfo"]
+        if self.request:
+            proto_file.extend(['i request'])
+        if self.postinstall:
+            proto_file.extend(['i postinstall'])
+        if self.postremove:
+            proto_file.extend(['i postremove'])
+        if self.preinstall:
+            proto_file.extend(['i preinstall'])
+        if self.preremove:
+            proto_file.extend(['i preremove'])
+        if self.compver:
+            proto_file.extend(['i compver'])
+        if self.requires:
+            proto_file.extend(['i depend'])
+        proto_file.extend(['!default 644 root bin'])
+        build = self.get_finalized_command('build')
+
+        try:
+                self.distribution.packages[0]
+                file_list=string.split( 
+                getoutput("pkgproto %s/%s=%s" % (build.build_lib,
+                self.distribution.packages[0], 
+		self.distribution.packages[0])),"\012")
+        except:
+                file_list=string.split( 
+                getoutput("pkgproto %s=" % (build.build_lib)),"\012")
+        ownership="%s %s" % (pwd.getpwuid(os.getuid())[0], 
+            grp.getgrgid(os.getgid())[0])
+        for i in range(len(file_list)):
+            file_list[i] = string.replace(file_list[i],ownership,"root bin")
+        proto_file.extend(file_list)
+        return proto_file
+
+    def _make_request_script(self):
+        global DEFAULT_REQUEST
+        # A little different from other scripts, if we are to automatically
+        # relocate to the target site-packages, we have to wrap any provided
+        # script with the autorelocation script. If no script is provided,
+        # The request script will simply be the autorelocate script
+        if self.no_autorelocate==0:
+                request=string.split(DEFAULT_REQUEST,"\012")
+        else:
+            self.announce('Creating relocation request script')
+        if self.request:
+            users_request=self.get_script('request')
+            if users_request!=None and users_request!=[]:
+                if self.no_autorelocate==0 and users_request[0][0:2]=="#!":
+                    users_request.remove(users_request[0])
+                for i in users_request:
+                    request.append(i)
+            
+        if self.no_autorelocate==0:
+            request.append("#############################################")
+            request.append("#        finalize relocation support        #")
+            request.append("#############################################")
+            request.append('echo "BASEDIR=\\"${BASEDIR}\\"" >>$1')
+        return request
+
+    def _make_info_file(self):
+        """Generate the text of a pkgtool info file and return it as a
+        list of strings (one per line).
+        """
+        # definitions and headers
+        # PKG must be alphanumeric, < 9 characters
+        info_file = [
+            'PKG="%s"' % self.pkg_abrev,
+            'NAME="%s"' % self.name,
+            'VERSION="%s"' % self.version,
+            'PSTAMP="%s"' % self.revision,
+            ]
+        info_file.extend(['VENDOR="%s (%s)"' % (self.distribution.maintainer, \
+		self.distribution.license) ])
+        info_file.extend(['EMAIL="%s"' % self.distribution.maintainer_email ])
+        
+        p = self.distribution.get_platforms()
+	if p is None or p==['UNKNOWN']:
+	    archs=getoutput('uname -p')
+        else:
+            archs=string.join(self.distribution.get_platforms(),',')
+        #else:
+            #print "Assuming a sparc architecure"
+            #archs='sparc'
+        info_file.extend(['ARCH="%s"' % archs ])
+
+        if self.distribution.get_url():
+            info_file.extend(['HOTLINE="%s"' % self.distribution.get_url() ])
+        if self.classes:
+            info_file.extend(['CLASSES="%s"' % self.classes ])
+        if self.category:
+            info_file.extend(['CATEGORY="%s"' % self.category ])
+        site=None
+        for i in  sys.path:
+            if i[-13:]=="site-packages":
+                site=i
+                break
+        if site:
+            info_file.extend(['BASEDIR="%s"' % site ])
+                      
+        return info_file
+
+    # _make_info_file ()
+
+    def _format_changelog(self, changelog):
+        """Format the changelog correctly and convert it to a list of strings
+        """
+        if not changelog:
+            return changelog
+        new_changelog = []
+        for line in string.split(string.strip(changelog), '\n'):
+            line = string.strip(line)
+            if line[0] == '*':
+                new_changelog.extend(['', line])
+            elif line[0] == '-':
+                new_changelog.append(line)
+            else:
+                new_changelog.append('  ' + line)
+                
+        # strip trailing newline inserted by first changelog entry
+        if not new_changelog[0]:
+            del new_changelog[0]
+        
+        return new_changelog
+
+    # _format_changelog()
+
+# class bdist_rpm
diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
new file mode 100644
index 0000000000..985a37a57b
--- /dev/null
+++ b/command/bdist_sdux.py
@@ -0,0 +1,302 @@
+"""distutils.command.bdist_pkgtool
+
+Implements the Distutils 'bdist_sdux' command to create HP-UX 
+swinstall depot"""
+
+# Mark Alexander <slash@dotnetslash.net>
+
+__revision__ = "$Id: bdist_sdux.py,v 0.2 "
+import os, string
+import glob
+from types import *
+from distutils.core import Command, DEBUG
+from distutils.util import get_platform
+from distutils.file_util import write_file
+from distutils.errors import *
+from distutils.command import bdist_packager
+import sys
+from commands import getoutput
+
+DEFAULT_CHECKINSTALL="""#!/bin/sh
+/usr/bin/which python 2>&1 >/dev/null
+if [ $? -ne 0 ]; then
+    echo "ERROR: Python must be on your PATH"  &>2
+    echo "ERROR: (You may need to link it to /usr/bin) "  &>2
+    exit 1
+fi
+PY_DIR=`python -c "import sys;print '%s/lib/python%s' % (sys.exec_prefix,sys.version[0:3])" #2>/dev/null`
+PY_PKG_DIR=`python -c "import sys;print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[0:3])" #2>/dev/null`
+PY_LIB_DIR=`dirname $PY_PKG_DIR`
+
+if [ "`dirname ${SW_LOCATION}`" = "__DISTUTILS_PKG_DIR__" ]; then
+    # swinstall to default location
+    if [ "${PY_PKG_DIR}" != "__DISTUTILS_PKG_DIR__" ]; then
+        echo "ERROR: " &>2
+        echo "ERROR: Python is not installed where this package expected!" &>2
+        echo "ERROR: You need to manually relocate this package to your python installation." &>2
+        echo "ERROR: " &>2
+        echo "ERROR: Re-run swinstall specifying the product name:location, e.g.:" &>2
+        echo "ERROR: " &>2
+        echo "ERROR:     swinstall -s [source] __DISTUTILS_NAME__:${PY_PKG_DIR}/__DISTUTILS_DIRNAME__" &>2
+        echo "ERROR: " &>2
+        echo "ERROR: to relocate this package to match your python installation" &>2
+        echo "ERROR: " &>2
+        exit 1
+    fi
+else
+    if [ "`dirname ${SW_LOCATION}`" != "${PY_PKG_DIR}" -a "`dirname ${SWLOCATION}`" != "${PY_LIB_DIR}" ]; then
+        echo "WARNING: " &>2
+        echo "WARNING: Package is being installed outside the 'normal' python search path!" &>2
+        echo "WARNING: Add ${SW_LOCATION} to PYTHONPATH to use this package" &>2
+        echo "WARNING: " &>2
+    fi
+fi
+"""
+
+DEFAULT_POSTINSTALL="""#!/bin/sh
+/usr/bin/which python 2>&1 >/dev/null
+if [ $? -ne 0 ]; then
+    echo "ERROR: Python must be on your PATH"  &>2
+    echo "ERROR: (You may need to link it to /usr/bin) "  &>2
+    exit 1
+fi
+python -c "import compileall;compileall.compile_dir(\\"${SW_LOCATION}\\")"
+"""
+
+DEFAULT_PREREMOVE="""#!/bin/sh
+# remove compiled bytecode files
+find ${SW_LOCATION} -name "*.pyc" -exec rm {} \;
+find ${SW_LOCATION} -name "*.pyo" -exec rm {} \;
+"""
+
+DEFAULT_POSTREMOVE="""#!/bin/sh
+if [ `find ${SW_LOCATION} ! -type d | wc -l` -eq 0 ]; then
+    # remove if there's nothing but empty directories left
+    rm -rf ${SW_LOCATION}
+fi
+"""
+
+class bdist_sdux(bdist_packager.bdist_packager):
+
+    description = "create an HP swinstall depot"
+
+    user_options = bdist_packager.bdist_packager.user_options + [
+        #('revision=', None,
+         #"package revision number (PSTAMP)"),
+        ('keep-permissions', None,
+         "Don't reset permissions and ownership to root/bin"), # XXX
+        ('corequisites=', None,
+         "corequisites"), # XXX
+        ('prerequisites=', None,
+         "prerequisites"), # XXX
+        #('category=', None,
+         #"Software category"),
+        ('checkinstall=', None, # XXX ala request
+         "checkinstall script (Bourne shell code)"),
+        ('configure=', None, # XXX 
+         "configure script (Bourne shell code)"),
+        ('unconfigure=', None, # XXX
+         "unconfigure script (Bourne shell code)"),
+        ('verify=', None, # XXX
+         "verify script (Bourne shell code)"),
+        ('unpreinstall=', None, # XXX
+         "unpreinstall script (Bourne shell code)"),
+        ('unpostinstall=', None, # XXX
+         "unpostinstall script (Bourne shell code)"),
+       ]
+
+    boolean_options = ['keep-permissions']
+
+    def initialize_options (self):
+        bdist_packager.bdist_packager.initialize_options(self)
+        self.corequisites = None
+        self.prerequesites = None
+        self.checkinstall = None
+        self.configure = None
+        self.unconfigure = None
+        self.verify = None
+        self.unpreinstall = None
+        self.unpostinstall = None
+        # More
+        self.copyright = None
+        self.readme = None
+        self.machine_type = None
+        self.os_name = None
+        self.os_release = None
+        self.directory = None
+        self.readme = None
+        self.copyright = None
+        self.architecture= None
+        self.keep_permissions= None
+        options = self.distribution.get_option_dict('bdist_packager')
+        for key in options.keys():
+            setattr(self,key,options[key][1])
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        global DEFAULT_CHECKINSTALL, DEFAULT_POSTINSTALL
+        global DEFAULT_PREREMOVE, DEFAULT_POSTREMOVE
+        if self.pkg_dir==None:
+            dist_dir = self.get_finalized_command('bdist').dist_dir
+            self.pkg_dir = os.path.join(dist_dir, "sdux")  
+        self.ensure_script('corequisites')
+        self.ensure_script('prerequesites')
+        self.ensure_script('checkinstall')
+        self.ensure_script('configure')
+        self.ensure_script('unconfigure')
+        self.ensure_script('verify')
+        self.ensure_script('unpreinstall')
+        self.ensure_script('unpostinstall')
+        self.ensure_script('copyright')
+        self.ensure_script('readme')
+        self.ensure_string('machine_type','*')
+        if not self.__dict__.has_key('platforms'):
+            # This is probably HP, but if it's not, use sys.platform
+            if sys.platform[0:5] == "hp-ux":
+                self.platforms = "HP-UX"
+            else:
+                self.platforms = string.upper(sys.platform)
+        else:
+            # we can only handle one
+            self.platforms=string.join(self.platforms[0])
+        self.ensure_string('os_release','*')
+        self.ensure_string('directory','%s/lib/python%s/site-packages' % \
+                (sys.exec_prefix, sys.version[0:3]))
+        bdist_packager.bdist_packager.finalize_options(self)
+        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
+            "__DISTUTILS_NAME__", self.name)
+        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
+            "__DISTUTILS_DIRNAME__", self.root_package)
+        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
+            "__DISTUTILS_PKG_DIR__", self.directory)
+        DEFAULT_POSTINSTALL = string.replace(DEFAULT_POSTINSTALL,
+            "__DISTUTILS_DIRNAME__", self.root_package)
+        #DEFAULT_PREREMOVE = string.replace(DEFAULT_PREREMOVE,
+            #"__DISTUTILS_NAME__", self.root_package)
+        #DEFAULT_POSTREMOVE = string.replace(DEFAULT_POSTREMOVE,
+            #"__DISTUTILS_NAME__", self.root_package)
+    # finalize_options()
+
+    def run (self):
+        # make directories
+        self.mkpath(self.pkg_dir)
+        psf_path = os.path.join(self.pkg_dir, 
+                                 "%s.psf" % self.get_binary_name())
+        # build package
+        self.announce('Building package')
+        self.run_command('build')
+        self.announce('Creating psf file')
+        self.execute(write_file,
+                     (psf_path,
+                      self._make_control_file()),
+                     "writing '%s'" % psf_path)
+        if self.control_only: # stop if requested
+            return
+
+        self.announce('Creating package')
+        spawn_cmd = ['swpackage', '-s']
+        spawn_cmd.append(psf_path)
+        spawn_cmd.append('-x')
+        spawn_cmd.append('target_type=tape')
+        spawn_cmd.append('@')
+        spawn_cmd.append(self.pkg_dir+"/"+self.get_binary_name()+'.depot')
+        self.spawn(spawn_cmd)
+
+    # run()
+
+  
+    def _make_control_file(self):
+        # Generate a psf file and return it as list of strings (one per line).
+        # definitions and headers
+        title = "%s %s" % (self.maintainer,self.maintainer_email)
+        title=title[0:80]
+        #top=self.distribution.packages[0]
+        psf_file = [
+            'vendor',               # Vendor information
+            '    tag                %s' % "DISTUTILS",
+            '    title              %s' % title,
+            '    description        Distutils package maintainer (%s)' % self.license,
+            'end',                  # end of vendor
+            'product',              # Product information
+            '    tag                %s' % self.name,
+            '    title              %s' % self.description,
+            '    description        %s' % self.description,
+            '    revision           %s' % self.version,
+            '    architecture       %s' % self.platforms,
+            '    machine_type       %s' % self.machine_type,
+            '    os_name            %s' % self.platforms,
+            '    os_release         %s' % self.os_release,
+            '    directory          %s' % self.directory + "/" + self.root_package,
+            ]
+
+        self.write_script(os.path.join(self.pkg_dir, "checkinstall"),
+                'checkinstall',DEFAULT_CHECKINSTALL)
+        psf_file.extend(['    checkinstall       %s/checkinstall' % self.pkg_dir])
+        self.write_script(os.path.join(self.pkg_dir, "postinstall"),
+                'postinstall',DEFAULT_POSTINSTALL)
+        psf_file.extend(['    postinstall        %s/postinstall' % self.pkg_dir])
+        self.write_script(os.path.join(self.pkg_dir, "preremove"),
+                'preremove',DEFAULT_PREREMOVE)
+        psf_file.extend(['    preremove          %s/preremove' % self.pkg_dir])
+        self.write_script(os.path.join(self.pkg_dir, "postremove"),
+                'postremove',DEFAULT_POSTREMOVE)
+        psf_file.extend(['    postremove         %s/postremove' % self.pkg_dir])
+        if self.preinstall:
+            self.write_script(self.pkg_dir+"/preinstall", 'preinstall', None)
+            psf_file.extend(['    preinstall         %s/preinstall' % self.pkg_dir])
+        if self.configure:
+            self.write_script(self.pkg_dir+"/configure", 'configure', None)
+            psf_file.extend(['    configure          %s/configure' % self.pkg_dir])
+        if self.unconfigure:
+            self.write_script(self.pkg_dir+"/unconfigure", 'unconfigure', None)
+            psf_file.extend(['    unconfigure        %s/unconfigure' % self.pkg_dir])
+        if self.verify:
+            self.write_script(self.pkg_dir+"/verify", 'verify', None)
+            psf_file.extend(['    verify             %s/verify' % self.pkg_dir])
+        if self.unpreinstall:
+            self.write_script(self.pkg_dir+"/unpreinstall", 'unpreinstall', None)
+            psf_file.extend(['    unpreinstall       %s/unpreinstall' % self.pkg_dir])
+        if self.unpostinstall:
+            self.write_script(self.pkg_dir+"/unpostinstall", 'unpostinstall', None)
+            psf_file.extend(['    unpostinstall      %s/unpostinstall' % self.pkg_dir])
+        psf_file.extend(['    is_locatable       true'])
+        #if self.long_description:
+            #psf_file.extend([self.long_description])
+        if self.copyright:
+            # XX make a copyright file XXX
+            write_script('copyright')
+            psf_file.extend(['    copyright         <copyright'])
+        if self.readme:
+            # XX make a readme file XXX
+            write_script('readme')
+            psf_file.extend(['    readme            <readme'])
+
+        psf_file.extend(['    fileset'])    # start fileset
+        if self.distribution.ext_modules:
+            platlib=self.get_finalized_command('build').build_platlib
+        else:
+            platlib=self.get_finalized_command('build').build_lib
+        title = "%s installation files" % (self.name)
+        psf_file.extend([
+            '        tag            %s' % 'FILES',
+            '        title          %s' % "%s installation files" % (self.name),
+            '        revision       %s' % self.version,
+            '        directory      %s/%s=%s/%s' % (platlib,self.root_package,self.directory,self.root_package),
+            ])
+        if not self.keep_permissions:
+            psf_file.extend(['        file_permissions    -m 555 -o root -g bin'])
+        psf_file.extend(['        file           *'])
+        psf_file.extend(['    end'])        # end of fileset
+        psf_file.extend(['end'])    # end of product
+               
+# XXX add fileset information
+        
+
+        return psf_file
+
+    # _make_control_file ()
+
+
+# class bdist_sdux

From 810da7c3f8f1219d2ea373873f16c83fbc82902b Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 23 Apr 2002 18:18:43 +0000
Subject: [PATCH 0802/8469] Whitespace normalization.  Unka Timmy would be
 proud.

---
 command/bdist_packager.py |  12 ++---
 command/bdist_pkgtool.py  | 102 +++++++++++++++++++-------------------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index a812307e73..667c03069e 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -2,7 +2,7 @@
 
 Modified from bdist_dumb by Mark W. Alexander <slash@dotnetslash.net>
 
-Implements the Distutils 'bdist_packager' abstract command 
+Implements the Distutils 'bdist_packager' abstract command
 to be subclassed by binary package creation commands."""
 
 
@@ -33,7 +33,7 @@ class bdist_packager (Command):
          "Software category (packager dependent format)"),
         ('revision=', None,
          "package revision number"),
-	# the following have moved into the distribution class
+        # the following have moved into the distribution class
         #('packager=', None,
          #"Package maintainer"),
         #('packager-mail=', None,
@@ -199,10 +199,10 @@ def finalize_options (self):
         self.ensure_string('category')
         self.ensure_string('revision',"1")
         #self.ensure_string('url',d.get_url())
-	if type(self.distribution.packages) == type([]):
-		self.root_package=self.distribution.packages[0]
-	else:
-		self.root_package=self.name
+        if type(self.distribution.packages) == type([]):
+            self.root_package=self.distribution.packages[0]
+        else:
+            self.root_package=self.name
         self.ensure_string('root_package',self.root_package)
         #self.ensure_string_list('keywords')
         #self.ensure_string_not_none('author', d.get_author())
diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index fc035ebde4..a36638a92c 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -23,7 +23,7 @@
 # default request script - Is also wrapped around user's request script
 # unless --no-autorelocate is requested. Finds the python site-packages
 # directory and prompts for verification
-DEFAULT_REQUEST="""#!/bin/sh 
+DEFAULT_REQUEST="""#!/bin/sh
 ######################################################################
 #         Distutils internal package relocation support              #
 ######################################################################
@@ -34,7 +34,7 @@
 /usr/bin/which python 2>&1 >/dev/null
 if [ $? -ne 0 ]; then
     echo "The python interpretor needs to be on your path!"
-    echo 
+    echo
     echo "If you have more than one, make sure the first one is where"
     echo "you want this module installed:"
     exit 1
@@ -45,26 +45,26 @@
 
 echo ""
 if [ -z "${PY_DIR}" ]; then
-	echo "I can't seem to find the python distribution."
-	echo "I'm assuming the default path for site-packages"
+        echo "I can't seem to find the python distribution."
+        echo "I'm assuming the default path for site-packages"
 else
-	BASEDIR="${PY_PKG_DIR}"
-	cat <<EOF
-	Python found! The default path:
+        BASEDIR="${PY_PKG_DIR}"
+        cat <<EOF
+        Python found! The default path:
 
-	${BASEDIR}
+        ${BASEDIR}
 
-	will install ${PRODUCT} such that all python users 
-	can import it.
+        will install ${PRODUCT} such that all python users
+        can import it.
 
-	If you just want individual access, you can install into
-	any directory and add that directory to your \$PYTHONPATH
+        If you just want individual access, you can install into
+        any directory and add that directory to your \$PYTHONPATH
 EOF
 fi
 echo ""
 
 BASEDIR=`ckpath -d ${BASEDIR} -ay \
-	-p "Where should ${PRODUCT} be installed? [${BASEDIR}]"` || exit $?
+        -p "Where should ${PRODUCT} be installed? [${BASEDIR}]"` || exit $?
 
 ######################################################################
 #                user supplied request script follows                #
@@ -77,8 +77,8 @@
 DEFAULT_POSTINSTALL="""#!/bin/sh
 /usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
 if [ $? -eq 0 ]; then
-	python -c "import compileall;compileall.compile_dir(\\"${BASEDIR}/__DISTUTILS_NAME__\\")"
-	chown -R root:other ${BASEDIR}/__DISTUTILS_NAME__
+        python -c "import compileall;compileall.compile_dir(\\"${BASEDIR}/__DISTUTILS_NAME__\\")"
+        chown -R root:other ${BASEDIR}/__DISTUTILS_NAME__
 fi
 """
 
@@ -91,7 +91,7 @@
 /usr/bin/which python 2>&1 >/dev/null
 if [ $? -ne 0 ]; then
     echo "The python interpretor needs to be on your path!"
-    echo 
+    echo
     echo "If you have more than one, make sure the first one is where"
     echo "you want this module removed from"
     exit 1
@@ -99,8 +99,8 @@
 
 /usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
 if [ $? -eq 0 ]; then
-	find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyc" -exec rm {} \;
-	find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyo" -exec rm {} \;
+        find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyc" -exec rm {} \;
+        find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyo" -exec rm {} \;
 fi
 """
 
@@ -111,9 +111,9 @@
 
 /usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
 if [ $? -eq 0 ]; then
-	if [ `find ${BASEDIR}/__DISTUTILS_NAME__ ! -type d | wc -l` -eq 0 ]; then
-    	rm -rf ${BASEDIR}/__DISTUTILS_NAME__
-	fi
+        if [ `find ${BASEDIR}/__DISTUTILS_NAME__ ! -type d | wc -l` -eq 0 ]; then
+        rm -rf ${BASEDIR}/__DISTUTILS_NAME__
+        fi
 fi
 """
 
@@ -171,13 +171,13 @@ def finalize_options (self):
         self.ensure_script('postremove')
         self.ensure_string('vendor', None)
         if self.__dict__.has_key('author'):
-                if self.__dict__.has_key('author_email'):
-                        self.ensure_string('vendor',
-                                "%s <%s>" % (self.author,
-                                   self.author_email))
-                else:
-                        self.ensure_string('vendor',
-                             "%s" % (self.author))
+            if self.__dict__.has_key('author_email'):
+                self.ensure_string('vendor',
+                        "%s <%s>" % (self.author,
+                           self.author_email))
+            else:
+                self.ensure_string('vendor',
+                     "%s" % (self.author))
         self.ensure_string('category', "System,application")
         self.ensure_script('compver')
         self.ensure_script('depend')
@@ -188,7 +188,7 @@ def finalize_options (self):
             raise DistutilsOptionError, \
             "pkg-abrev (%s) must be less than 9 characters" % self.pkg_abrev
         # Update default scripts with our metadata name
-        DEFAULT_REQUEST = string.replace(DEFAULT_REQUEST, 
+        DEFAULT_REQUEST = string.replace(DEFAULT_REQUEST,
             "__DISTUTILS_NAME__", self.root_package)
         DEFAULT_POSTINSTALL = string.replace(DEFAULT_POSTINSTALL,
             "__DISTUTILS_NAME__", self.root_package)
@@ -243,7 +243,7 @@ def make_package(self,root=None):
                  'compver',None)
         self.write_script(os.path.join(pkg_dir, "depend"),
                  'depend',None)
-            
+
         self.announce('Creating prototype file')
         path = os.path.join(pkg_dir, "prototype")
         self.execute(write_file,
@@ -263,14 +263,14 @@ def make_package(self,root=None):
         pkg_cmd.append(os.environ['PWD'])
         self.spawn(pkg_cmd)
         pkg_cmd = ['pkgtrans', '-s', '/var/spool/pkg']
-        path = os.path.join(os.environ['PWD'],pkg_dir, 
-		           self.get_binary_name() + ".pkg")
+        path = os.path.join(os.environ['PWD'],pkg_dir,
+                           self.get_binary_name() + ".pkg")
         self.announce('Transferring package to ' + pkg_dir)
         pkg_cmd.append(path)
         pkg_cmd.append(self.pkg_abrev)
         self.spawn(pkg_cmd)
         os.system("rm -rf /var/spool/pkg/%s" % self.pkg_abrev)
-        
+
 
     def run (self):
         if self.subpackages:
@@ -281,7 +281,7 @@ def run (self):
             self.make_package()
     # run()
 
-  
+
     def _make_prototype(self):
         proto_file = ["i pkginfo"]
         if self.request:
@@ -302,15 +302,15 @@ def _make_prototype(self):
         build = self.get_finalized_command('build')
 
         try:
-                self.distribution.packages[0]
-                file_list=string.split( 
-                getoutput("pkgproto %s/%s=%s" % (build.build_lib,
-                self.distribution.packages[0], 
-		self.distribution.packages[0])),"\012")
+            self.distribution.packages[0]
+            file_list=string.split(
+            getoutput("pkgproto %s/%s=%s" % (build.build_lib,
+            self.distribution.packages[0],
+            self.distribution.packages[0])),"\012")
         except:
-                file_list=string.split( 
-                getoutput("pkgproto %s=" % (build.build_lib)),"\012")
-        ownership="%s %s" % (pwd.getpwuid(os.getuid())[0], 
+            file_list=string.split(
+            getoutput("pkgproto %s=" % (build.build_lib)),"\012")
+        ownership="%s %s" % (pwd.getpwuid(os.getuid())[0],
             grp.getgrgid(os.getgid())[0])
         for i in range(len(file_list)):
             file_list[i] = string.replace(file_list[i],ownership,"root bin")
@@ -324,7 +324,7 @@ def _make_request_script(self):
         # script with the autorelocation script. If no script is provided,
         # The request script will simply be the autorelocate script
         if self.no_autorelocate==0:
-                request=string.split(DEFAULT_REQUEST,"\012")
+            request=string.split(DEFAULT_REQUEST,"\012")
         else:
             self.announce('Creating relocation request script')
         if self.request:
@@ -334,7 +334,7 @@ def _make_request_script(self):
                     users_request.remove(users_request[0])
                 for i in users_request:
                     request.append(i)
-            
+
         if self.no_autorelocate==0:
             request.append("#############################################")
             request.append("#        finalize relocation support        #")
@@ -355,12 +355,12 @@ def _make_info_file(self):
             'PSTAMP="%s"' % self.revision,
             ]
         info_file.extend(['VENDOR="%s (%s)"' % (self.distribution.maintainer, \
-		self.distribution.license) ])
+                self.distribution.license) ])
         info_file.extend(['EMAIL="%s"' % self.distribution.maintainer_email ])
-        
+
         p = self.distribution.get_platforms()
-	if p is None or p==['UNKNOWN']:
-	    archs=getoutput('uname -p')
+        if p is None or p==['UNKNOWN']:
+            archs=getoutput('uname -p')
         else:
             archs=string.join(self.distribution.get_platforms(),',')
         #else:
@@ -381,7 +381,7 @@ def _make_info_file(self):
                 break
         if site:
             info_file.extend(['BASEDIR="%s"' % site ])
-                      
+
         return info_file
 
     # _make_info_file ()
@@ -400,11 +400,11 @@ def _format_changelog(self, changelog):
                 new_changelog.append(line)
             else:
                 new_changelog.append('  ' + line)
-                
+
         # strip trailing newline inserted by first changelog entry
         if not new_changelog[0]:
             del new_changelog[0]
-        
+
         return new_changelog
 
     # _format_changelog()

From 6bb5291d452462b4170a9a8d3630dcf66aa020d7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 25 Apr 2002 17:03:30 +0000
Subject: [PATCH 0803/8469] Fix trivial typo.

---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index f4fc4bcbae..f8d13c0e03 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -319,7 +319,7 @@ def set_link_objects (self, objects):
         self.objects = copy (objects)
 
 
-    # -- Priviate utility methods --------------------------------------
+    # -- Private utility methods --------------------------------------
     # (here for the convenience of subclasses)
 
     def _fix_compile_args (self, output_dir, macros, include_dirs):

From cad65ba14e067657c1756b023f522c2a0e3ac0af Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 25 Apr 2002 17:26:37 +0000
Subject: [PATCH 0804/8469] Append the PC specific include 'PC' and library
 'PCBuild' directories under NT - this allows distutils to work with the CVS
 version or the source distribution.

Wrap a long line.
---
 command/build_ext.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 91fee5ee6e..ddbd03e28c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -167,6 +167,11 @@ def finalize_options (self):
             else:
                 self.build_temp = os.path.join(self.build_temp, "Release")
 
+            # Append the source distribution include and library directories,
+            # this allows distutils on windows to work in the source tree
+            self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
         # import libraries in its "Config" subdirectory
         if os.name == 'os2':
@@ -177,7 +182,9 @@ def finalize_options (self):
         if sys.platform[:6] == 'cygwin':
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
-                self.library_dirs.append(os.path.join(sys.prefix, "lib", "python" + sys.version[:3], "config"))
+                self.library_dirs.append(os.path.join(sys.prefix, "lib",
+                                                      "python" + sys.version[:3],
+                                                      "config"))
             else:
                 # building python standard extensions
                 self.library_dirs.append('.')

From 33b72ce75455b7b892efa9aa682a7c35e42ea1da Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 25 Apr 2002 17:29:45 +0000
Subject: [PATCH 0805/8469] Pass the full pathname to MSVC when compiling a
 debug version. This allows the debugger to find the source without asking the
 user to browse for it.

---
 msvccompiler.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 79a4901bea..73cd44258c 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -309,6 +309,12 @@ def compile (self,
             else:
                 self.mkpath (os.path.dirname (obj))
 
+                if debug:
+                    # pass the full pathname to MSVC in debug mode,
+                    # this allows the debugger to find the source file
+                    # without asking the user to browse for it
+                    src = os.path.abspath(src)
+
                 if ext in self._c_extensions:
                     input_opt = "/Tc" + src
                 elif ext in self._cpp_extensions:

From f40275a1996a3dd768fd1d2f4e96e4f3e1c3dfd6 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 6 May 2002 13:57:19 +0000
Subject: [PATCH 0806/8469] Prevent convert_path from crashing if the path is
 an empty string.  Bugfix candidate.

---
 util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index a51ce6601d..d079588a91 100644
--- a/util.py
+++ b/util.py
@@ -84,9 +84,9 @@ def convert_path (pathname):
     """
     if os.sep == '/':
         return pathname
-    if pathname[0] == '/':
+    if pathname and pathname[0] == '/':
         raise ValueError, "path '%s' cannot be absolute" % pathname
-    if pathname[-1] == '/':
+    if pathname and pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
 
     paths = string.split(pathname, '/')

From e5820caf234ff9c9feaf90519f64a6c7800ca5d6 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 30 May 2002 19:15:16 +0000
Subject: [PATCH 0807/8469] Remove unneeded import

---
 command/install_lib.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 029528e995..03b44ee9ef 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,7 +6,6 @@
 from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
-from distutils.dir_util import copy_tree
 
 class install_lib (Command):
 

From 6b571cfed1d5d0e7d955f4f177e9e4dabc631a1b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 4 Jun 2002 15:28:21 +0000
Subject: [PATCH 0808/8469] When using a Python that has not been installed to
 build 3rd-party modules, distutils does not understand that the build version
 of the source tree is needed.

This patch fixes distutils.sysconfig to understand that the running
Python is part of the build tree and needs to use the appropriate
"shape" of the tree. This does not assume anything about the current
directory, so can be used to build 3rd-party modules using Python's
build tree as well.

This is useful since it allows us to use a non-installed debug-mode
Python with 3rd-party modules for testing. It as the side-effect that
set_python_build() is no longer needed (the hack which was added to
allow distutils to be used to build the "standard" extension modules).

This closes SF patch #547734.
---
 sysconfig.py | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d773f14905..3e323533b6 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -23,19 +23,20 @@
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
-# Boolean; if it's true, we're still building Python, so
-# we use different (hard-wired) directories.
-
-python_build = 0
-
-def set_python_build():
-    """Set the python_build flag to true.
-
-    This means that we're building Python itself.  Only called from
-    the setup.py script shipped with Python.
-    """
-    global python_build
+# python_build: (Boolean) if true, we're either building Python or
+# building an extension with an un-installed Python, so we use
+# different (hard-wired) directories.
+
+argv0_path = os.path.dirname(os.path.abspath(sys.executable))
+landmark = os.path.join(argv0_path, "Modules", "Setup")
+if not os.path.isfile(landmark):
+    python_build = 0
+elif os.path.isfile(os.path.join(argv0_path, "Lib", "os.py")):
     python_build = 1
+else:
+    python_build = os.path.isfile(os.path.join(os.path.dirname(argv0_path),
+                                               "Lib", "os.py"))
+del argv0_path, landmark
 
 
 def get_python_inc(plat_specific=0, prefix=None):
@@ -53,7 +54,14 @@ def get_python_inc(plat_specific=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
-            return "Include/"
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if plat_specific:
+                inc_dir = base
+            else:
+                inc_dir = os.path.join(base, "Include")
+                if not os.path.exists(inc_dir):
+                    inc_dir = os.path.join(os.path.dirname(base), "Include")
+            return inc_dir
         return os.path.join(prefix, "include", "python" + sys.version[:3])
     elif os.name == "nt":
         return os.path.join(prefix, "include")
@@ -163,7 +171,7 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return './Makefile'
+        return os.path.join(os.path.dirname(sys.executable), "Makefile")
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 

From bbf5c4f0008d7aa45284910f87a2ee7179ee8f0d Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 18:55:54 +0000
Subject: [PATCH 0809/8469] The comment said:

 # XXX this isn't used anywhere, and worse, it has the same name as a method
 # in Command with subtly different semantics.  (This one just has one
 # source -> one dest; that one has many sources -> one dest.)  Nuke it?

Yes.  Nuke it.
---
 dep_util.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/dep_util.py b/dep_util.py
index 9edba4c8ae..bbb6d235b3 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -93,23 +93,3 @@ def newer_group (sources, target, missing='error'):
         return 0
 
 # newer_group ()
-
-
-# XXX this isn't used anywhere, and worse, it has the same name as a method
-# in Command with subtly different semantics.  (This one just has one
-# source -> one dest; that one has many sources -> one dest.)  Nuke it?
-def make_file (src, dst, func, args,
-               verbose=0, update_message=None, noupdate_message=None):
-    """Makes 'dst' from 'src' (both filenames) by calling 'func' with
-    'args', but only if it needs to: i.e. if 'dst' does not exist or 'src'
-    is newer than 'dst'.
-    """
-    if newer(src, dst):
-        if verbose and update_message:
-            print update_message
-        apply(func, args)
-    else:
-        if verbose and noupdate_message:
-            print noupdate_message
-
-# make_file ()

From 6b2531b43f67643c8bf7cc2552159d8f0aaf4081 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:00:26 +0000
Subject: [PATCH 0810/8469] A simple log mechanism styled after the proposed
 std library module

---
 log.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 log.py

diff --git a/log.py b/log.py
new file mode 100644
index 0000000000..f0a7865067
--- /dev/null
+++ b/log.py
@@ -0,0 +1,56 @@
+"""A simple log mechanism styled after PEP 282."""
+
+# The class here is styled after PEP 282 so that it could later be
+# replaced with a standard Python logging implementation.
+
+DEBUG = 1
+INFO = 2
+WARN = 3
+ERROR = 4
+FATAL = 5
+
+class Log:
+
+    def __init__(self, threshold=WARN):
+        self.threshold = threshold
+
+    def _log(self, level, msg, args):
+        if level >= self.threshold:
+            print msg % args
+
+    def log(self, level, msg, *args):
+        self._log(level, msg, args)
+
+    def debug(self, msg, *args):
+        self._log(DEBUG, msg, args)
+    
+    def info(self, msg, *args):
+        self._log(INFO, msg, args)
+    
+    def warn(self, msg, *args):
+        self._log(WARN, msg, args)
+    
+    def error(self, msg, *args):
+        self._log(ERROR, msg, args)
+    
+    def fatal(self, msg, *args):
+        self._log(FATAL, msg, args)
+
+_global_log = Log()
+log = _global_log.log
+debug = _global_log.debug
+info = _global_log.info
+warn = _global_log.warn
+error = _global_log.error
+fatal = _global_log.fatal
+
+def set_threshold(level):
+    _global_log.threshold = level
+
+def set_verbosity(v):
+    if v == 0:
+        set_threshold(WARN)
+    if v == 1:
+        set_threshold(INFO)
+    if v == 2:
+        set_threshold(DEBUG)

From fcaddaa4cfd26c0f07bfbb4dbf41760334d5d788 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:14:43 +0000
Subject: [PATCH 0811/8469] Make setup.py less chatty by default.

This is a conservative version of SF patch 504889.  It uses the log
module instead of calling print in various places, and it ignores the
verbose argument passed to many functions and set as an attribute on
some objects.  Instead, it uses the verbosity set on the logger via
the command line.

The log module is now preferred over announce() and warn() methods
that exist only for backwards compatibility.

XXX This checkin changes a lot of modules that have no test suite and
aren't exercised by the Python build process.  It will need
substantial testing.
---
 archive_util.py            | 28 +++++++++---------
 bcppcompiler.py            | 12 ++++----
 ccompiler.py               | 19 +++++++------
 cmd.py                     | 51 +++++++++++++++------------------
 command/bdist_dumb.py      |  5 ++--
 command/bdist_packager.py  |  9 +++---
 command/bdist_pkgtool.py   | 13 +++++----
 command/bdist_rpm.py       |  3 +-
 command/bdist_sdux.py      |  7 +++--
 command/bdist_wininst.py   |  7 +++--
 command/build_clib.py      |  5 ++--
 command/build_ext.py       | 18 ++++++------
 command/build_py.py        | 17 ++++-------
 command/build_scripts.py   |  7 +++--
 command/clean.py           | 15 +++++-----
 command/config.py          | 14 ++++-----
 command/install_lib.py     |  8 ++----
 command/install_scripts.py |  5 ++--
 command/sdist.py           | 37 ++++++++----------------
 core.py                    |  6 +++-
 cygwinccompiler.py         |  3 +-
 dir_util.py                | 31 +++++++++-----------
 dist.py                    | 16 ++++-------
 emxccompiler.py            |  3 +-
 fancy_getopt.py            | 57 +++++++++++++++++++------------------
 file_util.py               | 23 ++++++---------
 filelist.py                | 58 ++++++++++++++++----------------------
 msvccompiler.py            |  7 +++--
 mwerkscompiler.py          | 17 +++++------
 spawn.py                   | 20 ++++++-------
 unixccompiler.py           |  7 +++--
 util.py                    | 45 ++++++++++++-----------------
 32 files changed, 260 insertions(+), 313 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 58d9a062e1..47fac0cb7d 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -11,6 +11,7 @@
 from distutils.errors import DistutilsExecError
 from distutils.spawn import spawn
 from distutils.dir_util import mkpath
+from distutils import log
 
 def make_tarball (base_name, base_dir, compress="gzip",
                   verbose=0, dry_run=0):
@@ -42,13 +43,13 @@ def make_tarball (base_name, base_dir, compress="gzip",
               "bad value for 'compress': must be None, 'gzip', or 'compress'"
 
     archive_name = base_name + ".tar"
-    mkpath(os.path.dirname(archive_name), verbose=verbose, dry_run=dry_run)
+    mkpath(os.path.dirname(archive_name), dry_run=dry_run)
     cmd = ["tar", "-cf", archive_name, base_dir]
-    spawn(cmd, verbose=verbose, dry_run=dry_run)
+    spawn(cmd, dry_run=dry_run)
 
     if compress:
         spawn([compress] + compress_flags[compress] + [archive_name],
-              verbose=verbose, dry_run=dry_run)
+              dry_run=dry_run)
         return archive_name + compress_ext[compress]
     else:
         return archive_name
@@ -69,10 +70,10 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     # no changes needed!
 
     zip_filename = base_name + ".zip"
-    mkpath(os.path.dirname(zip_filename), verbose=verbose, dry_run=dry_run)
+    mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
     try:
         spawn(["zip", "-rq", zip_filename, base_dir],
-              verbose=verbose, dry_run=dry_run)
+              dry_run=dry_run)
     except DistutilsExecError:
 
         # XXX really should distinguish between "couldn't find
@@ -89,10 +90,10 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
                    "could neither find a standalone zip utility nor " +
                    "import the 'zipfile' module") % zip_filename
 
-        if verbose:
-            print "creating '%s' and adding '%s' to it" % \
-                  (zip_filename, base_dir)
-
+        
+        log.info("creating '%s' and adding '%s' to it", 
+                 zip_filename, base_dir)
+         
         def visit (z, dirname, names):
             for name in names:
                 path = os.path.normpath(os.path.join(dirname, name))
@@ -141,8 +142,7 @@ def make_archive (base_name, format,
     """
     save_cwd = os.getcwd()
     if root_dir is not None:
-        if verbose:
-            print "changing into '%s'" % root_dir
+        log.debug("changing into '%s'", root_dir)
         base_name = os.path.abspath(base_name)
         if not dry_run:
             os.chdir(root_dir)
@@ -150,8 +150,7 @@ def make_archive (base_name, format,
     if base_dir is None:
         base_dir = os.curdir
 
-    kwargs = { 'verbose': verbose,
-               'dry_run': dry_run }
+    kwargs = { 'dry_run': dry_run }
 
     try:
         format_info = ARCHIVE_FORMATS[format]
@@ -164,8 +163,7 @@ def make_archive (base_name, format,
     filename = apply(func, (base_name, base_dir), kwargs)
 
     if root_dir is not None:
-        if verbose:
-            print "changing back to '%s'" % save_cwd
+        log.debug("changing back to '%s'", save_cwd)
         os.chdir(save_cwd)
 
     return filename
diff --git a/bcppcompiler.py b/bcppcompiler.py
index 9ebba2d85b..019244cd16 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -22,6 +22,7 @@
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.file_util import write_file
 from distutils.dep_util import newer
+from distutils import log
 
 class BCPPCompiler(CCompiler) :
     """Concrete class that implements an interface to the Borland C/C++
@@ -108,7 +109,7 @@ def compile (self,
             ext = (os.path.splitext (src))[1]
 
             if skip_sources[src]:
-                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+                log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 src = os.path.normpath(src)
                 obj = os.path.normpath(obj)
@@ -178,7 +179,7 @@ def create_static_lib (self,
             except DistutilsExecError, msg:
                 raise LibError, msg
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # create_static_lib ()
 
@@ -205,8 +206,8 @@ def link (self,
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
 
         if runtime_library_dirs:
-            self.warn ("I don't know what to do with 'runtime_library_dirs': "
-                       + str (runtime_library_dirs))
+            log.warn("I don't know what to do with 'runtime_library_dirs': %s",
+                     str(runtime_library_dirs))
 
         if output_dir is not None:
             output_filename = os.path.join (output_dir, output_filename)
@@ -285,7 +286,6 @@ def link (self,
                 if libfile is None:
                     ld_args.append(lib)
                     # probably a BCPP internal library -- don't warn
-                    #    self.warn('library %s not found.' % lib)
                 else:
                     # full name which prefers bcpp_xxx.lib over xxx.lib
                     ld_args.append(libfile)
@@ -313,7 +313,7 @@ def link (self,
                 raise LinkError, msg
 
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # link ()
 
diff --git a/ccompiler.py b/ccompiler.py
index f8d13c0e03..4c8b881c3a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -16,7 +16,7 @@
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
 from distutils.util import split_quoted, execute
-
+from distutils import log
 
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
@@ -80,7 +80,6 @@ def __init__ (self,
                   dry_run=0,
                   force=0):
 
-        self.verbose = verbose
         self.dry_run = dry_run
         self.force = force
 
@@ -808,8 +807,7 @@ def library_filename (self,
     # -- Utility methods -----------------------------------------------
 
     def announce (self, msg, level=1):
-        if self.verbose >= level:
-            print msg
+        log.debug(msg)
 
     def debug_print (self, msg):
         from distutils.core import DEBUG
@@ -820,16 +818,16 @@ def warn (self, msg):
         sys.stderr.write ("warning: %s\n" % msg)
 
     def execute (self, func, args, msg=None, level=1):
-        execute(func, args, msg, self.verbose >= level, self.dry_run)
+        execute(func, args, msg, self.dry_run)
 
     def spawn (self, cmd):
-        spawn (cmd, verbose=self.verbose, dry_run=self.dry_run)
+        spawn (cmd, dry_run=self.dry_run)
 
     def move_file (self, src, dst):
-        return move_file (src, dst, verbose=self.verbose, dry_run=self.dry_run)
+        return move_file (src, dst, dry_run=self.dry_run)
 
     def mkpath (self, name, mode=0777):
-        mkpath (name, mode, self.verbose, self.dry_run)
+        mkpath (name, mode, self.dry_run)
 
 
 # class CCompiler
@@ -957,7 +955,10 @@ def new_compiler (plat=None,
               ("can't compile C/C++ code: unable to find class '%s' " +
                "in module '%s'") % (class_name, module_name)
 
-    return klass (verbose, dry_run, force)
+    # XXX The None is necessary to preserve backwards compatibility
+    # with classes that expect verbose to be the first positional
+    # argument.
+    return klass (None, dry_run, force)
 
 
 def gen_preprocess_options (macros, include_dirs):
diff --git a/cmd.py b/cmd.py
index 65060d6700..25ff3025b6 100644
--- a/cmd.py
+++ b/cmd.py
@@ -13,7 +13,7 @@
 from types import *
 from distutils.errors import *
 from distutils import util, dir_util, file_util, archive_util, dep_util
-
+from distutils import log
 
 class Command:
     """Abstract base class for defining command classes, the "worker bees"
@@ -72,11 +72,15 @@ def __init__ (self, dist):
         # commands fallback on the Distribution's behaviour.  None means
         # "not defined, check self.distribution's copy", while 0 or 1 mean
         # false and true (duh).  Note that this means figuring out the real
-        # value of each flag is a touch complicated -- hence "self.verbose"
-        # (etc.) will be handled by __getattr__, below.
-        self._verbose = None
+        # value of each flag is a touch complicated -- hence "self._dry_run"
+        # will be handled by __getattr__, below.
+        # XXX This needs to be fixed.
         self._dry_run = None
 
+        # verbose is largely ignored, but needs to be set for
+        # backwards compatibility (I think)?
+        self.verbose = dist.verbose
+        
         # Some commands define a 'self.force' option to ignore file
         # timestamps, but methods defined *here* assume that
         # 'self.force' exists for all commands.  So define it here
@@ -96,8 +100,10 @@ def __init__ (self, dist):
     # __init__ ()
 
 
+    # XXX A more explicit way to customize dry_run would be better.
+    
     def __getattr__ (self, attr):
-        if attr in ('verbose', 'dry_run'):
+        if attr == 'dry_run':
             myval = getattr(self, "_" + attr)
             if myval is None:
                 return getattr(self.distribution, attr)
@@ -186,9 +192,7 @@ def announce (self, msg, level=1):
         """If the current verbosity level is of greater than or equal to
         'level' print 'msg' to stdout.
         """
-        if self.verbose >= level:
-            print msg
-            sys.stdout.flush()
+        log.debug(msg)
 
     def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
@@ -352,12 +356,11 @@ def warn (self, msg):
 
 
     def execute (self, func, args, msg=None, level=1):
-        util.execute(func, args, msg, self.verbose >= level, self.dry_run)
+        util.execute(func, args, msg, dry_run=self.dry_run)
 
 
     def mkpath (self, name, mode=0777):
-        dir_util.mkpath(name, mode,
-                        self.verbose, self.dry_run)
+        dir_util.mkpath(name, mode, dry_run=self.dry_run)
 
 
     def copy_file (self, infile, outfile,
@@ -371,8 +374,7 @@ def copy_file (self, infile, outfile,
             preserve_mode, preserve_times,
             not self.force,
             link,
-            self.verbose >= level,
-            self.dry_run)
+            dry_run=self.dry_run)
 
 
     def copy_tree (self, infile, outfile,
@@ -385,30 +387,21 @@ def copy_tree (self, infile, outfile,
             infile, outfile,
             preserve_mode,preserve_times,preserve_symlinks,
             not self.force,
-            self.verbose >= level,
-            self.dry_run)
-
+            dry_run=self.dry_run)
 
     def move_file (self, src, dst, level=1):
-        """Move a file respecting verbose and dry-run flags."""
-        return file_util.move_file(src, dst,
-                                   self.verbose >= level,
-                                   self.dry_run)
-
+        """Move a file respectin dry-run flag."""
+        return file_util.move_file(src, dst, dry_run = self.dry_run)
 
     def spawn (self, cmd, search_path=1, level=1):
-        """Spawn an external command respecting verbose and dry-run flags."""
+        """Spawn an external command respecting dry-run flag."""
         from distutils.spawn import spawn
-        spawn(cmd, search_path,
-              self.verbose >= level,
-              self.dry_run)
-
+        spawn(cmd, search_path, dry_run= self.dry_run)
 
     def make_archive (self, base_name, format,
                       root_dir=None, base_dir=None):
         return archive_util.make_archive(
-            base_name, format, root_dir, base_dir,
-            self.verbose, self.dry_run)
+            base_name, format, root_dir, base_dir, dry_run=self.dry_run)
 
 
     def make_file (self, infiles, outfile, func, args,
@@ -443,7 +436,7 @@ def make_file (self, infiles, outfile, func, args,
 
         # Otherwise, print the "skip" message
         else:
-            self.announce(skip_msg, level)
+            log.debug(skip_msg)
 
     # make_file ()
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index a135877a8e..712fec884e 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -13,6 +13,7 @@
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
 from distutils.errors import *
+from distutils import log
 
 class bdist_dumb (Command):
 
@@ -83,7 +84,7 @@ def run (self):
         install.skip_build = self.skip_build
         install.warn_dir = 0
 
-        self.announce("installing to %s" % self.bdist_dir)
+        log.info("installing to %s" % self.bdist_dir)
         self.run_command('install')
 
         # And make an archive relative to the root of the
@@ -101,7 +102,7 @@ def run (self):
                           root_dir=self.bdist_dir)
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, self.verbose, self.dry_run)
+            remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
     # run()
 
diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index 667c03069e..11278ee28b 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -14,6 +14,7 @@
 from distutils.dir_util import create_tree, remove_tree
 from distutils.file_util import write_file
 from distutils.errors import *
+from distutils import log
 import string, sys
 
 class bdist_packager (Command):
@@ -102,8 +103,8 @@ def write_script (self,path,attr,default=None):
             else:
                 setattr(self,attr,default)
                 val = default
-        if val!="":
-            self.announce('Creating %s script', attr)
+        if val != "":
+            log.info('Creating %s script', attr)
             self.execute(write_file,
                      (path, self.get_script(attr)),
                      "writing '%s'" % path)
@@ -234,7 +235,7 @@ def run (self):
         install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.pkg_dir
 
-        self.announce("installing to %s" % self.pkg_dir)
+        log.info("installing to %s", self.pkg_dir)
         self.run_command('install')
 
         # And make an archive relative to the root of the
@@ -243,7 +244,7 @@ def run (self):
                                       self.plat_name)
 
         if not self.keep_temp:
-            remove_tree(self.pkg_dir, self.verbose, self.dry_run)
+            remove_tree(self.pkg_dir, dry_run=self.dry_run)
 
     # run()
 
diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index a36638a92c..4fd95012a2 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -15,6 +15,7 @@
 from distutils.errors import *
 from distutils.command import bdist_packager
 from distutils import sysconfig
+from distutils import log
 import compileall
 from commands import getoutput
 
@@ -211,9 +212,9 @@ def make_package(self,root=None):
 
         install = self.reinitialize_command('install', reinit_subcommands=1)
         # build package
-        self.announce('Building package')
+        log.info('Building package')
         self.run_command('build')
-        self.announce('Creating pkginfo file')
+        log.info('Creating pkginfo file')
         path = os.path.join(pkg_dir, "pkginfo")
         self.execute(write_file,
                      (path,
@@ -244,7 +245,7 @@ def make_package(self,root=None):
         self.write_script(os.path.join(pkg_dir, "depend"),
                  'depend',None)
 
-        self.announce('Creating prototype file')
+        log.info('Creating prototype file')
         path = os.path.join(pkg_dir, "prototype")
         self.execute(write_file,
                      (path,
@@ -256,7 +257,7 @@ def make_package(self,root=None):
             return
 
 
-        self.announce('Creating package')
+        log.info('Creating package')
         pkg_cmd = ['pkgmk', '-o', '-f']
         pkg_cmd.append(path)
         pkg_cmd.append('-b')
@@ -265,7 +266,7 @@ def make_package(self,root=None):
         pkg_cmd = ['pkgtrans', '-s', '/var/spool/pkg']
         path = os.path.join(os.environ['PWD'],pkg_dir,
                            self.get_binary_name() + ".pkg")
-        self.announce('Transferring package to ' + pkg_dir)
+        log.info('Transferring package to ' + pkg_dir)
         pkg_cmd.append(path)
         pkg_cmd.append(self.pkg_abrev)
         self.spawn(pkg_cmd)
@@ -326,7 +327,7 @@ def _make_request_script(self):
         if self.no_autorelocate==0:
             request=string.split(DEFAULT_REQUEST,"\012")
         else:
-            self.announce('Creating relocation request script')
+            log.info('Creating relocation request script')
         if self.request:
             users_request=self.get_script('request')
             if users_request!=None and users_request!=[]:
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 4bc2561324..808ddc14cb 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -14,6 +14,7 @@
 from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *
+from distutils import log
 
 class bdist_rpm (Command):
 
@@ -278,7 +279,7 @@ def run (self):
 
 
         # build package
-        self.announce('building RPMs')
+        log.info("building RPMs")
         rpm_cmd = ['rpm']
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
index 985a37a57b..e4765f97df 100644
--- a/command/bdist_sdux.py
+++ b/command/bdist_sdux.py
@@ -14,6 +14,7 @@
 from distutils.file_util import write_file
 from distutils.errors import *
 from distutils.command import bdist_packager
+from distutils import log
 import sys
 from commands import getoutput
 
@@ -185,9 +186,9 @@ def run (self):
         psf_path = os.path.join(self.pkg_dir, 
                                  "%s.psf" % self.get_binary_name())
         # build package
-        self.announce('Building package')
+        log.info('Building package')
         self.run_command('build')
-        self.announce('Creating psf file')
+        log.info('Creating psf file')
         self.execute(write_file,
                      (psf_path,
                       self._make_control_file()),
@@ -195,7 +196,7 @@ def run (self):
         if self.control_only: # stop if requested
             return
 
-        self.announce('Creating package')
+        log.info('Creating package')
         spawn_cmd = ['swpackage', '-s']
         spawn_cmd.append(psf_path)
         spawn_cmd.append('-x')
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 1683bb31a7..6a985f190b 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -12,6 +12,7 @@
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
 from distutils.errors import *
+from distutils import log
 
 class bdist_wininst (Command):
 
@@ -115,7 +116,7 @@ def run (self):
                     'install_' + key,
                     value)
 
-        self.announce("installing to %s" % self.bdist_dir)
+        log.info("installing to %s", self.bdist_dir)
         install.ensure_finalized()
 
         # avoid warning of 'install_lib' about installing
@@ -136,11 +137,11 @@ def run (self):
         # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
         # remove the zip-file again
-        self.announce("removing temporary file '%s'" % arcname)
+        log.debug("removing temporary file '%s'", arcname)
         os.remove(arcname)
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, self.verbose, self.dry_run)
+            remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
     # run()
 
diff --git a/command/build_clib.py b/command/build_clib.py
index b659147b26..f0207e4e0f 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -24,7 +24,7 @@
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler
-
+from distutils import log
 
 def show_compilers ():
     from distutils.ccompiler import show_compilers
@@ -111,7 +111,6 @@ def run (self):
         # Yech -- this is cut 'n pasted from build_ext.py!
         from distutils.ccompiler import new_compiler
         self.compiler = new_compiler(compiler=self.compiler,
-                                     verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
         customize_compiler(self.compiler)
@@ -213,7 +212,7 @@ def build_libraries (self, libraries):
                        "a list of source filenames") % lib_name
             sources = list(sources)
 
-            self.announce("building '%s' library" % lib_name)
+            log.info("building '%s' library", lib_name)
 
             # First, compile the source code to object files in the library
             # directory.  (This should probably change to putting object
diff --git a/command/build_ext.py b/command/build_ext.py
index ddbd03e28c..89ca1dc9b8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -15,6 +15,7 @@
 from distutils.sysconfig import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils import log
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
@@ -291,9 +292,9 @@ def check_extensions_list (self, extensions):
                                         # by Extension constructor)
 
             (ext_name, build_info) = ext
-            self.warn(("old-style (ext_name, build_info) tuple found in "
-                       "ext_modules for extension '%s'"
-                       "-- please convert to Extension instance" % ext_name))
+            log.warn(("old-style (ext_name, build_info) tuple found in "
+                      "ext_modules for extension '%s'"
+                      "-- please convert to Extension instance" % ext_name))
             if type(ext) is not TupleType and len(ext) != 2:
                 raise DistutilsSetupError, \
                       ("each element of 'ext_modules' option must be an "
@@ -329,8 +330,8 @@ def check_extensions_list (self, extensions):
             # Medium-easy stuff: same syntax/semantics, different names.
             ext.runtime_library_dirs = build_info.get('rpath')
             if build_info.has_key('def_file'):
-                self.warn("'def_file' element of build info dict "
-                          "no longer supported")
+                log.warn("'def_file' element of build info dict "
+                         "no longer supported")
 
             # Non-trivial stuff: 'macros' split into 'define_macros'
             # and 'undef_macros'.
@@ -422,11 +423,10 @@ def build_extension(self, ext):
                                         self.get_ext_filename(fullname))
 
         if not (self.force or newer_group(sources, ext_filename, 'newer')):
-            self.announce("skipping '%s' extension (up-to-date)" %
-                          ext.name)
+            log.debug("skipping '%s' extension (up-to-date)", ext.name)
             return
         else:
-            self.announce("building '%s' extension" % ext.name)
+            log.info("building '%s' extension", ext.name)
 
         # First, scan the sources for SWIG definition files (.i), run
         # SWIG on 'em to create .c files, and modify the sources list
@@ -539,7 +539,7 @@ def swig_sources (self, sources):
 
         for source in swig_sources:
             target = swig_targets[source]
-            self.announce("swigging %s to %s" % (source, target))
+            log.info("swigging %s to %s", source, target)
             self.spawn(swig_cmd + ["-o", target, source])
 
         return new_sources
diff --git a/command/build_py.py b/command/build_py.py
index 97d094b1b2..388d3cbc9e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -13,7 +13,7 @@
 from distutils.core import Command
 from distutils.errors import *
 from distutils.util import convert_path
-
+from distutils import log
 
 class build_py (Command):
 
@@ -176,8 +176,8 @@ def check_package (self, package, package_dir):
             if os.path.isfile(init_py):
                 return init_py
             else:
-                self.warn(("package init file '%s' not found " +
-                           "(or not a regular file)") % init_py)
+                log.warn(("package init file '%s' not found " +
+                          "(or not a regular file)"), init_py)
 
         # Either not in a package at all (__init__.py not expected), or
         # __init__.py doesn't exist -- so don't return the filename.
@@ -188,8 +188,7 @@ def check_package (self, package, package_dir):
 
     def check_module (self, module, module_file):
         if not os.path.isfile(module_file):
-            self.warn("file %s (for module %s) not found" %
-                      (module_file, module))
+            log.warn("file %s (for module %s) not found", module_file, module)
             return 0
         else:
             return 1
@@ -389,13 +388,9 @@ def byte_compile (self, files):
 
         if self.compile:
             byte_compile(files, optimize=0,
-                         force=self.force,
-                         prefix=prefix,
-                         verbose=self.verbose, dry_run=self.dry_run)
+                         force=self.force, prefix=prefix, dry_run=self.dry_run)
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
-                         force=self.force,
-                         prefix=prefix,
-                         verbose=self.verbose, dry_run=self.dry_run)
+                         force=self.force, prefix=prefix, dry_run=self.dry_run)
 
 # class build_py
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 444284f7cc..211ade40fa 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -11,6 +11,7 @@
 from distutils.core import Command
 from distutils.dep_util import newer
 from distutils.util import convert_path
+from distutils import log
 
 # check if Python is called on the first line with this expression
 first_line_re = re.compile(r'^#!.*python[0-9.]*(\s+.*)?$')
@@ -59,7 +60,7 @@ def copy_scripts (self):
             outfile = os.path.join(self.build_dir, os.path.basename(script))
 
             if not self.force and not newer(script, outfile):
-                self.announce("not copying %s (up-to-date)" % script)
+                log.debug("not copying %s (up-to-date)", script)
                 continue
 
             # Always open the file, but ignore failures in dry-run mode --
@@ -83,8 +84,8 @@ def copy_scripts (self):
                     post_interp = match.group(1) or ''
 
             if adjust:
-                self.announce("copying and adjusting %s -> %s" %
-                              (script, self.build_dir))
+                log.info("copying and adjusting %s -> %s", script,
+                         self.build_dir)
                 if not self.dry_run:
                     outf = open(outfile, "w")
                     if not sysconfig.python_build:
diff --git a/command/clean.py b/command/clean.py
index b4a9be45f8..8fddeb453a 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -9,6 +9,7 @@
 import os
 from distutils.core import Command
 from distutils.dir_util import remove_tree
+from distutils import log
 
 class clean (Command):
 
@@ -51,10 +52,10 @@ def run(self):
         # remove the build/temp.<plat> directory (unless it's already
         # gone)
         if os.path.exists(self.build_temp):
-            remove_tree(self.build_temp, self.verbose, self.dry_run)
+            remove_tree(self.build_temp, dry_run=self.dry_run)
         else:
-            self.warn("'%s' does not exist -- can't clean it" %
-                      self.build_temp)
+            log.warn("'%s' does not exist -- can't clean it",
+                     self.build_temp)
 
         if self.all:
             # remove build directories
@@ -62,17 +63,17 @@ def run(self):
                               self.bdist_base,
                               self.build_scripts):
                 if os.path.exists(directory):
-                    remove_tree(directory, self.verbose, self.dry_run)
+                    remove_tree(directory, dry_run=self.dry_run)
                 else:
-                    self.warn("'%s' does not exist -- can't clean it" %
-                              directory)
+                    log.warn("'%s' does not exist -- can't clean it",
+                             directory)
 
         # just for the heck of it, try to remove the base build directory:
         # we might have emptied it right now, but if not we don't care
         if not self.dry_run:
             try:
                 os.rmdir(self.build_base)
-                self.announce("removing '%s'" % self.build_base)
+                log.info("removing '%s'", self.build_base)
             except OSError:
                 pass
 
diff --git a/command/config.py b/command/config.py
index 27c2cc1512..d74aa6a277 100644
--- a/command/config.py
+++ b/command/config.py
@@ -17,7 +17,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
-
+from distutils import log
 
 LANG_EXT = {'c': '.c',
             'c++': '.cxx'}
@@ -103,9 +103,7 @@ def _check_compiler (self):
         from distutils.ccompiler import CCompiler, new_compiler
         if not isinstance(self.compiler, CCompiler):
             self.compiler = new_compiler(compiler=self.compiler,
-                                         verbose=self.noisy,
-                                         dry_run=self.dry_run,
-                                         force=1)
+                                         dry_run=self.dry_run, force=1)
             if self.include_dirs:
                 self.compiler.set_include_dirs(self.include_dirs)
             if self.libraries:
@@ -161,7 +159,7 @@ def _clean (self, *filenames):
         if not filenames:
             filenames = self.temp_files
             self.temp_files = []
-        self.announce("removing: " + string.join(filenames))
+        log.info("removing: %s", string.join(filenames))
         for filename in filenames:
             try:
                 os.remove(filename)
@@ -239,7 +237,7 @@ def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
         except CompileError:
             ok = 0
 
-        self.announce(ok and "success!" or "failure.")
+        log.info(ok and "success!" or "failure.")
         self._clean()
         return ok
 
@@ -260,7 +258,7 @@ def try_link (self, body,
         except (CompileError, LinkError):
             ok = 0
 
-        self.announce(ok and "success!" or "failure.")
+        log.info(ok and "success!" or "failure.")
         self._clean()
         return ok
 
@@ -282,7 +280,7 @@ def try_run (self, body,
         except (CompileError, LinkError, DistutilsExecError):
             ok = 0
 
-        self.announce(ok and "success!" or "failure.")
+        log.info(ok and "success!" or "failure.")
         self._clean()
         return ok
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 03b44ee9ef..1e771c619e 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -124,13 +124,11 @@ def byte_compile (self, files):
 
         if self.compile:
             byte_compile(files, optimize=0,
-                         force=self.force,
-                         prefix=install_root,
-                         verbose=self.verbose, dry_run=self.dry_run)
+                         force=self.force, prefix=install_root,
+                         dry_run=self.dry_run)
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
-                         force=self.force,
-                         prefix=install_root,
+                         force=self.force, prefix=install_root,
                          verbose=self.verbose, dry_run=self.dry_run)
 
 
diff --git a/command/install_scripts.py b/command/install_scripts.py
index d4cbaa3a0a..4044ba092b 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -9,6 +9,7 @@
 
 import os
 from distutils.core import Command
+from distutils import log
 from stat import ST_MODE
 
 class install_scripts (Command):
@@ -48,10 +49,10 @@ def run (self):
             # all the scripts we just installed.
             for file in self.get_outputs():
                 if self.dry_run:
-                    self.announce("changing mode of %s" % file)
+                    log.info("changing mode of %s to %o", file, mode)
                 else:
                     mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
-                    self.announce("changing mode of %s to %o" % (file, mode))
+                    log.info("changing mode of %s to %o", file, mode)
                     os.chmod(file, mode)
 
     def get_inputs (self):
diff --git a/command/sdist.py b/command/sdist.py
index fbd3c6d200..082aa88ce3 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -14,6 +14,7 @@
 from distutils.text_file import TextFile
 from distutils.errors import *
 from distutils.filelist import FileList
+from distutils import log
 
 
 def show_formats ():
@@ -233,31 +234,17 @@ def get_file_list (self):
                 self.warn(("manifest template '%s' does not exist " +
                            "(using default file list)") %
                           self.template)
-
             self.filelist.findall()
 
-            # Add default file set to 'files'
             if self.use_defaults:
                 self.add_defaults()
-
-            # Read manifest template if it exists
             if template_exists:
                 self.read_template()
-
-            # Prune away any directories that don't belong in the source
-            # distribution
             if self.prune:
                 self.prune_file_list()
 
-            # File list now complete -- sort it so that higher-level files
-            # come first
             self.filelist.sort()
-
-            # Remove duplicates from the file list
             self.filelist.remove_duplicates()
-
-            # And write complete file list (including default file set) to
-            # the manifest.
             self.write_manifest()
 
         # Don't regenerate the manifest, just read it in.
@@ -321,13 +308,12 @@ def add_defaults (self):
 
 
     def read_template (self):
+        """Read and parse manifest template file named by self.template.
 
-        """Read and parse the manifest template file named by
-        'self.template' (usually "MANIFEST.in").  The parsing and
-        processing is done by 'self.filelist', which updates itself
-        accordingly.
+        (usually "MANIFEST.in") The parsing and processing is done by
+        'self.filelist', which updates itself accordingly.
         """
-        self.announce("reading manifest template '%s'" % self.template)
+        log.info("reading manifest template '%s'", self.template)
         template = TextFile(self.template,
                             strip_comments=1,
                             skip_blanks=1,
@@ -384,7 +370,7 @@ def read_manifest (self):
         fill in 'self.filelist', the list of files to include in the source
         distribution.
         """
-        self.announce("reading manifest file '%s'" % self.manifest)
+        log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest)
         while 1:
             line = manifest.readline()
@@ -410,8 +396,7 @@ def make_release_tree (self, base_dir, files):
         # put 'files' there; the 'mkpath()' is just so we don't die
         # if the manifest happens to be empty.
         self.mkpath(base_dir)
-        dir_util.create_tree(base_dir, files,
-                             verbose=self.verbose, dry_run=self.dry_run)
+        dir_util.create_tree(base_dir, files, dry_run=self.dry_run)
 
         # And walk over the list of files, either making a hard link (if
         # os.link exists) to each one that doesn't already exist in its
@@ -428,12 +413,12 @@ def make_release_tree (self, base_dir, files):
             msg = "copying files to %s..." % base_dir
 
         if not files:
-            self.warn("no files to distribute -- empty manifest?")
+            log.warn("no files to distribute -- empty manifest?")
         else:
-            self.announce(msg)
+            log.info(msg)
         for file in files:
             if not os.path.isfile(file):
-                self.warn("'%s' not a regular file -- skipping" % file)
+                log.warn("'%s' not a regular file -- skipping" % file)
             else:
                 dest = os.path.join(base_dir, file)
                 self.copy_file(file, dest, link=link)
@@ -464,7 +449,7 @@ def make_distribution (self):
         self.archive_files = archive_files
 
         if not self.keep_temp:
-            dir_util.remove_tree(base_dir, self.verbose, self.dry_run)
+            dir_util.remove_tree(base_dir, dry_run=self.dry_run)
 
     def get_archive_files (self):
         """Return the list of archive files created when the command
diff --git a/core.py b/core.py
index 97a741c812..222e6aebd8 100644
--- a/core.py
+++ b/core.py
@@ -100,7 +100,11 @@ class found in 'cmdclass' is used in place of the default, which is
     try:
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError, msg:
-        raise SystemExit, "error in setup script: %s" % msg
+        if attrs.has_key('name'):
+            raise SystemExit, "error in %s setup command: %s" % \
+                  (attrs['name'], msg)
+        else:
+            raise SystemExit, "error in setup command: %s" % msg
 
     if _setup_stop_after == "init":
         return dist
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 1d97282322..3fb5bc9005 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -50,6 +50,7 @@
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
+from distutils import log
 
 class CygwinCCompiler (UnixCCompiler):
 
@@ -148,7 +149,7 @@ def compile (self,
             src = sources[i] ; obj = objects[i]
             ext = (os.path.splitext (src))[1]
             if skip_sources[src]:
-                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+                log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 self.mkpath (os.path.dirname (obj))
                 if ext == '.rc' or ext == '.res':
diff --git a/dir_util.py b/dir_util.py
index 77007c976b..8b3e06b2fa 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -9,7 +9,7 @@
 import os
 from types import *
 from distutils.errors import DistutilsFileError, DistutilsInternalError
-
+from distutils import log
 
 # cache for by mkpath() -- in addition to cheapening redundant calls,
 # eliminates redundant "creating /foo/bar/baz" messages in dry-run mode
@@ -69,8 +69,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
         if _path_created.get(abs_head):
             continue
 
-        if verbose:
-            print "creating", head
+        log.info("creating %s", head)
 
         if not dry_run:
             try:
@@ -105,7 +104,7 @@ def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
 
     # Now create them
     for dir in need_dirs:
-        mkpath(dir, mode, verbose, dry_run)
+        mkpath(dir, mode, dry_run=dry_run)
 
 # create_tree ()
 
@@ -151,7 +150,7 @@ def copy_tree (src, dst,
                   "error listing files in '%s': %s" % (src, errstr)
 
     if not dry_run:
-        mkpath(dst, verbose=verbose)
+        mkpath(dst)
 
     outputs = []
 
@@ -161,21 +160,19 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
-            if verbose:
-                print "linking %s -> %s" % (dst_name, link_dest)
+            log.info("linking %s -> %s", dst_name, link_dest)
             if not dry_run:
                 os.symlink(link_dest, dst_name)
             outputs.append(dst_name)
 
         elif os.path.isdir(src_name):
             outputs.extend(
-                copy_tree(src_name, dst_name,
-                          preserve_mode, preserve_times, preserve_symlinks,
-                          update, verbose, dry_run))
+                copy_tree(src_name, dst_name, preserve_mode,
+                          preserve_times, preserve_symlinks, update,
+                          dry_run=dry_run))
         else:
-            copy_file(src_name, dst_name,
-                      preserve_mode, preserve_times,
-                      update, None, verbose, dry_run)
+            copy_file(src_name, dst_name, preserve_mode,
+                      preserve_times, update, dry_run=dry_run)
             outputs.append(dst_name)
 
     return outputs
@@ -200,8 +197,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
     from distutils.util import grok_environment_error
     global _path_created
 
-    if verbose:
-        print "removing '%s' (and everything under it)" % directory
+    log.info("removing '%s' (and everything under it)", directory)
     if dry_run:
         return
     cmdtuples = []
@@ -214,6 +210,5 @@ def remove_tree (directory, verbose=0, dry_run=0):
             if _path_created.has_key(abspath):
                 del _path_created[abspath]
         except (IOError, OSError), exc:
-            if verbose:
-                print grok_environment_error(
-                    exc, "error removing %s: " % directory)
+            log.warn(grok_environment_error(
+                    exc, "error removing %s: " % directory))
diff --git a/dist.py b/dist.py
index b648f24eb7..a84004f4c7 100644
--- a/dist.py
+++ b/dist.py
@@ -15,7 +15,7 @@
 from distutils.errors import *
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
-
+from distutils import log
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
 # the same as a Python NAME -- I don't allow leading underscores.  The fact
@@ -46,7 +46,8 @@ class Distribution:
     # since every global option is also valid as a command option -- and we
     # don't want to pollute the commands with too many options that they
     # have minimal control over.
-    global_options = [('verbose', 'v', "run verbosely (default)"),
+    # The fourth entry for verbose means that it can be repeated.
+    global_options = [('verbose', 'v', "run verbosely (default)", 1),
                       ('quiet', 'q', "run quietly (turns verbosity off)"),
                       ('dry-run', 'n', "don't actually do anything"),
                       ('help', 'h', "show detailed help message"),
@@ -392,6 +393,7 @@ def parse_command_line (self):
         parser.set_aliases({'licence': 'license'})
         args = parser.getopt(args=self.script_args, object=self)
         option_order = parser.get_option_order()
+        log.set_verbosity(self.verbose)
 
         # for display options we return immediately
         if self.handle_display_options(option_order):
@@ -876,13 +878,7 @@ def reinitialize_command (self, command, reinit_subcommands=0):
     # -- Methods that operate on the Distribution ----------------------
 
     def announce (self, msg, level=1):
-        """Print 'msg' if 'level' is greater than or equal to the verbosity
-        level recorded in the 'verbose' attribute (which, currently, can be
-        only 0 or 1).
-        """
-        if self.verbose >= level:
-            print msg
-
+        log.debug(msg)
 
     def run_commands (self):
         """Run each command that was seen on the setup script command line.
@@ -907,7 +903,7 @@ def run_command (self, command):
         if self.have_run.get(command):
             return
 
-        self.announce("running " + command)
+        log.info("running %s", command)
         cmd_obj = self.get_command_obj(command)
         cmd_obj.ensure_finalized()
         cmd_obj.run()
diff --git a/emxccompiler.py b/emxccompiler.py
index 58a0d812e4..2788209c72 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -28,6 +28,7 @@
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
+from distutils import log
 
 class EMXCCompiler (UnixCCompiler):
 
@@ -109,7 +110,7 @@ def compile (self,
             src = sources[i] ; obj = objects[i]
             ext = (os.path.splitext (src))[1]
             if skip_sources[src]:
-                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+                log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 self.mkpath (os.path.dirname (obj))
                 if ext == '.rc':
diff --git a/fancy_getopt.py b/fancy_getopt.py
index e65302fc0b..fe9b0d4d94 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -157,13 +157,18 @@ def _grok_option_table (self):
         self.long_opts = []
         self.short_opts = []
         self.short2long.clear()
+        self.repeat = {}
 
         for option in self.option_table:
-            try:
-                (long, short, help) = option
-            except ValueError:
-                raise DistutilsGetoptError, \
-                      "invalid option tuple " + str(option)
+            if len(option) == 3:
+                long, short, help = option
+                repeat = 0
+            elif len(option) == 4:
+                long, short, help, repeat = option
+            else:
+                # the option table is part of the code, so simply
+                # assert that it is correct
+                assert "invalid option tuple: %s" % `option`
 
             # Type- and value-check the option names
             if type(long) is not StringType or len(long) < 2:
@@ -177,6 +182,7 @@ def _grok_option_table (self):
                       ("invalid short option '%s': "
                        "must a single character or None") % short
 
+            self.repeat[long] = 1
             self.long_opts.append(long)
 
             if long[-1] == '=':             # option takes an argument?
@@ -232,14 +238,15 @@ def _grok_option_table (self):
 
 
     def getopt (self, args=None, object=None):
-        """Parse the command-line options in 'args' and store the results
-        as attributes of 'object'.  If 'args' is None or not supplied, uses
-        'sys.argv[1:]'.  If 'object' is None or not supplied, creates a new
-        OptionDummy object, stores option values there, and returns a tuple
-        (args, object).  If 'object' is supplied, it is modified in place
-        and 'getopt()' just returns 'args'; in both cases, the returned
-        'args' is a modified copy of the passed-in 'args' list, which is
-        left untouched.
+        """Parse command-line options in args. Store as attributes on object.
+
+        If 'args' is None or not supplied, uses 'sys.argv[1:]'.  If
+        'object' is None or not supplied, creates a new OptionDummy
+        object, stores option values there, and returns a tuple (args,
+        object).  If 'object' is supplied, it is modified in place and
+        'getopt()' just returns 'args'; in both cases, the returned
+        'args' is a modified copy of the passed-in 'args' list, which
+        is left untouched.
         """
         if args is None:
             args = sys.argv[1:]
@@ -253,30 +260,23 @@ def getopt (self, args=None, object=None):
 
         short_opts = string.join(self.short_opts)
         try:
-            (opts, args) = getopt.getopt(args, short_opts, self.long_opts)
+            opts, args = getopt.getopt(args, short_opts, self.long_opts)
         except getopt.error, msg:
             raise DistutilsArgError, msg
 
-        for (opt, val) in opts:
+        for opt, val in opts:
             if len(opt) == 2 and opt[0] == '-': # it's a short option
                 opt = self.short2long[opt[1]]
-
-            elif len(opt) > 2 and opt[0:2] == '--':
-                opt = opt[2:]
-
             else:
-                raise DistutilsInternalError, \
-                      "this can't happen: bad option string '%s'" % opt
+                assert len(opt) > 2 and opt[:2] == '--'
+                opt = opt[2:]
 
             alias = self.alias.get(opt)
             if alias:
                 opt = alias
 
             if not self.takes_arg[opt]:     # boolean option?
-                if val != '':               # shouldn't have a value!
-                    raise DistutilsInternalError, \
-                          "this can't happen: bad option value '%s'" % val
-
+                assert val == '', "boolean option can't have value"
                 alias = self.negative_alias.get(opt)
                 if alias:
                     opt = alias
@@ -285,13 +285,16 @@ def getopt (self, args=None, object=None):
                     val = 1
 
             attr = self.attr_name[opt]
+            # The only repeating option at the moment is 'verbose'.
+            # It has a negative option -q quiet, which should set verbose = 0.
+            if val and self.repeat.get(attr) is not None:
+                val = getattr(object, attr, 0) + 1
             setattr(object, attr, val)
             self.option_order.append((opt, val))
 
         # for opts
-
         if created_object:
-            return (args, object)
+            return args, object
         else:
             return args
 
diff --git a/file_util.py b/file_util.py
index 14772fb74a..56b1faee45 100644
--- a/file_util.py
+++ b/file_util.py
@@ -9,7 +9,7 @@
 
 import os
 from distutils.errors import DistutilsFileError
-
+from distutils import log
 
 # for generating verbose output in 'copy_file()'
 _copy_action = { None:   'copying',
@@ -73,7 +73,6 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
 
 # _copy_file_contents()
 
-
 def copy_file (src, dst,
                preserve_mode=1,
                preserve_times=1,
@@ -90,8 +89,7 @@ def copy_file (src, dst,
     'preserve_times' is true (the default), the last-modified and
     last-access times are copied as well.  If 'update' is true, 'src' will
     only be copied if 'dst' does not exist, or if 'dst' does exist but is
-    older than 'src'.  If 'verbose' is true, then a one-line summary of the
-    copy will be printed to stdout.
+    older than 'src'.
 
     'link' allows you to make hard links (os.link) or symbolic links
     (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
@@ -127,20 +125,18 @@ def copy_file (src, dst,
         dir = os.path.dirname(dst)
 
     if update and not newer(src, dst):
-        if verbose:
-            print "not copying %s (output up-to-date)" % src
-        return (dst, 0)
+        log.debug("not copying %s (output up-to-date)", src)
+        return dst, 0
 
     try:
         action = _copy_action[link]
     except KeyError:
         raise ValueError, \
               "invalid value '%s' for 'link' argument" % link
-    if verbose:
-        if os.path.basename(dst) == os.path.basename(src):
-            print "%s %s -> %s" % (action, src, dir)
-        else:
-            print "%s %s -> %s" % (action, src, dst)
+    if os.path.basename(dst) == os.path.basename(src):
+        log.info("%s %s -> %s", action, src, dir)
+    else:
+        log.info("%s %s -> %s", action, src, dst)
 
     if dry_run:
         return (dst, 1)
@@ -197,8 +193,7 @@ def move_file (src, dst,
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
 
-    if verbose:
-        print "moving %s -> %s" % (src, dst)
+    log.info("moving %s -> %s", src, dst)
 
     if dry_run:
         return dst
diff --git a/filelist.py b/filelist.py
index f7222fd927..d39c835869 100644
--- a/filelist.py
+++ b/filelist.py
@@ -37,27 +37,19 @@ class FileList:
     def __init__(self,
                  warn=None,
                  debug_print=None):
-        # use standard warning and debug functions if no other given
-        self.warn = warn or self.__warn
-        self.debug_print = debug_print or self.__debug_print
+        # ignore argument to FileList, but keep them for backwards
+        # compatibility
 
         self.allfiles = None
         self.files = []
 
-
     def set_allfiles (self, allfiles):
         self.allfiles = allfiles
 
     def findall (self, dir=os.curdir):
         self.allfiles = findall(dir)
 
-
-    # -- Fallback warning/debug functions ------------------------------
-
-    def __warn (self, msg):
-        sys.stderr.write("warning: %s\n" % msg)
-
-    def __debug_print (self, msg):
+    def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
@@ -65,7 +57,6 @@ def __debug_print (self, msg):
         if DEBUG:
             print msg
 
-
     # -- List-like methods ---------------------------------------------
 
     def append (self, item):
@@ -87,8 +78,8 @@ def sort (self):
 
     def remove_duplicates (self):
         # Assumes list has been sorted!
-        for i in range(len(self.files)-1, 0, -1):
-            if self.files[i] == self.files[i-1]:
+        for i in range(len(self.files) - 1, 0, -1):
+            if self.files[i] == self.files[i - 1]:
                 del self.files[i]
 
 
@@ -147,61 +138,60 @@ def process_template_line (self, line):
             self.debug_print("include " + string.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=1):
-                    self.warn("no files found matching '%s'" % pattern)
+                    log.warn("warning: no files found matching '%s'",
+                             pattern)
 
         elif action == 'exclude':
             self.debug_print("exclude " + string.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=1):
-                    self.warn(
-                        "no previously-included files found matching '%s'"%
-                        pattern)
+                    log.warn(("warning: no previously-included files "
+                              "found matching '%s'"), pattern)
 
         elif action == 'global-include':
             self.debug_print("global-include " + string.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=0):
-                    self.warn(("no files found matching '%s' " +
-                               "anywhere in distribution") %
-                              pattern)
+                    log.warn(("warning: no files found matching '%s' " +
+                              "anywhere in distribution"), pattern)
 
         elif action == 'global-exclude':
             self.debug_print("global-exclude " + string.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=0):
-                    self.warn(("no previously-included files matching '%s' " +
-                               "found anywhere in distribution") %
-                              pattern)
+                    log.warn(("warning: no previously-included files matching "
+                              "'%s' found anywhere in distribution"),
+                             pattern)
 
         elif action == 'recursive-include':
             self.debug_print("recursive-include %s %s" %
                              (dir, string.join(patterns)))
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
-                    self.warn(("no files found matching '%s' " +
-                                "under directory '%s'") %
-                               (pattern, dir))
+                    log.warn(("warngin: no files found matching '%s' " +
+                                "under directory '%s'"), 
+                             pattern, dir)
 
         elif action == 'recursive-exclude':
             self.debug_print("recursive-exclude %s %s" %
                              (dir, string.join(patterns)))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, prefix=dir):
-                    self.warn(("no previously-included files matching '%s' " +
-                               "found under directory '%s'") %
-                              (pattern, dir))
+                    log.warn(("warning: no previously-included files matching "
+                              "'%s' found under directory '%s'"),
+                             pattern, dir)
 
         elif action == 'graft':
             self.debug_print("graft " + dir_pattern)
             if not self.include_pattern(None, prefix=dir_pattern):
-                self.warn("no directories found matching '%s'" % dir_pattern)
+                log.warn("warning: no directories found matching '%s'",
+                         dir_pattern)
 
         elif action == 'prune':
             self.debug_print("prune " + dir_pattern)
             if not self.exclude_pattern(None, prefix=dir_pattern):
-                self.warn(("no previously-included directories found " +
-                           "matching '%s'") %
-                          dir_pattern)
+                log.warn(("no previously-included directories found " +
+                          "matching '%s'"), dir_pattern)
         else:
             raise DistutilsInternalError, \
                   "this cannot happen: invalid action '%s'" % action
diff --git a/msvccompiler.py b/msvccompiler.py
index 73cd44258c..ade8172d3b 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -17,6 +17,7 @@
      CompileError, LibError, LinkError
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
+from distutils import log
 
 _can_read_reg = 0
 try:
@@ -305,7 +306,7 @@ def compile (self,
             ext = (os.path.splitext (src))[1]
 
             if skip_sources[src]:
-                self.announce ("skipping %s (%s up-to-date)" % (src, obj))
+                log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 self.mkpath (os.path.dirname (obj))
 
@@ -403,7 +404,7 @@ def create_static_lib (self,
                 raise LibError, msg
 
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # create_static_lib ()
 
@@ -480,7 +481,7 @@ def link (self,
                 raise LinkError, msg
 
         else:
-            self.announce ("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # link ()
 
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 7c77b8bcef..6242f12aa1 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -13,6 +13,7 @@
      CCompiler, gen_preprocess_options, gen_lib_options
 import distutils.util
 import distutils.dir_util
+from distutils import log
 import mkcwproject
 
 class MWerksCompiler (CCompiler) :
@@ -132,8 +133,8 @@ def link (self,
         exportname = basename + '.mcp.exp'
         prefixname = 'mwerks_%s_config.h'%basename
         # Create the directories we need
-        distutils.dir_util.mkpath(build_temp, self.verbose, self.dry_run)
-        distutils.dir_util.mkpath(output_dir, self.verbose, self.dry_run)
+        distutils.dir_util.mkpath(build_temp, dry_run=self.dry_run)
+        distutils.dir_util.mkpath(output_dir, dry_run=self.dry_run)
         # And on to filling in the parameters for the project builder
         settings = {}
         settings['mac_exportname'] = exportname
@@ -159,8 +160,7 @@ def link (self,
             return
         # Build the export file
         exportfilename = os.path.join(build_temp, exportname)
-        if self.verbose:
-            print '\tCreate export file', exportfilename
+        log.debug("\tCreate export file", exportfilename)
         fp = open(exportfilename, 'w')
         fp.write('%s\n'%export_symbols[0])
         fp.close()
@@ -181,8 +181,7 @@ def link (self,
         # because we pass this pathname to CodeWarrior in an AppleEvent, and CW
         # doesn't have a clue about our working directory.
         xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
-        if self.verbose:
-            print '\tCreate XML file', xmlfilename
+        log.debug("\tCreate XML file", xmlfilename)
         xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
         xmlbuilder.generate()
         xmldata = settings['tmp_projectxmldata']
@@ -191,12 +190,10 @@ def link (self,
         fp.close()
         # Generate the project. Again a full pathname.
         projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
-        if self.verbose:
-            print '\tCreate project file', projectfilename
+        log.debug('\tCreate project file', projectfilename)
         mkcwproject.makeproject(xmlfilename, projectfilename)
         # And build it
-        if self.verbose:
-            print '\tBuild project'
+        log.debug('\tBuild project')
         mkcwproject.buildproject(projectfilename)
 
     def _filename_to_abs(self, filename):
diff --git a/spawn.py b/spawn.py
index 5b6016e0d8..4df6e097de 100644
--- a/spawn.py
+++ b/spawn.py
@@ -12,7 +12,7 @@
 
 import sys, os, string
 from distutils.errors import *
-
+from distutils import log
 
 def spawn (cmd,
            search_path=1,
@@ -27,19 +27,18 @@ def spawn (cmd,
 
     If 'search_path' is true (the default), the system's executable search
     path will be used to find the program; otherwise, cmd[0] must be the
-    exact path to the executable.  If 'verbose' is true, a one-line summary
-    of the command will be printed before it is run.  If 'dry_run' is true,
+    exact path to the executable.If 'dry_run' is true,
     the command will not actually be run.
 
     Raise DistutilsExecError if running the program fails in any way; just
     return on success.
     """
     if os.name == 'posix':
-        _spawn_posix(cmd, search_path, verbose, dry_run)
+        _spawn_posix(cmd, search_path, dry_run=dry_run)
     elif os.name == 'nt':
-        _spawn_nt(cmd, search_path, verbose, dry_run)
+        _spawn_nt(cmd, search_path, dry_run=dry_run)
     elif os.name == 'os2':
-        _spawn_os2(cmd, search_path, verbose, dry_run)
+        _spawn_os2(cmd, search_path, dry_run=dry_run)
     else:
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
@@ -74,8 +73,7 @@ def _spawn_nt (cmd,
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
-    if verbose:
-        print string.join([executable] + cmd[1:], ' ')
+    log.info(string.join([executable] + cmd[1:], ' '))
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:
@@ -100,8 +98,7 @@ def _spawn_os2 (cmd,
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable 
-    if verbose:
-        print string.join([executable] + cmd[1:], ' ')
+    log.info(string.join([executable] + cmd[1:], ' '))
     if not dry_run:
         # spawnv for OS/2 EMX requires a full path to the .exe
         try:
@@ -122,8 +119,7 @@ def _spawn_posix (cmd,
                   verbose=0,
                   dry_run=0):
 
-    if verbose:
-        print string.join(cmd, ' ')
+    log.info(string.join(cmd, ' '))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
diff --git a/unixccompiler.py b/unixccompiler.py
index 7e63c56afe..55a51b3201 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -26,6 +26,7 @@
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.errors import \
      DistutilsExecError, CompileError, LibError, LinkError
+from distutils import log
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
@@ -147,7 +148,7 @@ def compile (self,
         for i in range(len(sources)):
             src = sources[i] ; obj = objects[i]
             if skip_sources[src]:
-                self.announce("skipping %s (%s up-to-date)" % (src, obj))
+                log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 self.mkpath(os.path.dirname(obj))
                 try:
@@ -191,7 +192,7 @@ def create_static_lib (self,
                 except DistutilsExecError, msg:
                     raise LibError, msg
         else:
-            self.announce("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # create_static_lib ()
 
@@ -240,7 +241,7 @@ def link (self,
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:
-            self.announce("skipping %s (up-to-date)" % output_filename)
+            log.debug("skipping %s (up-to-date)", output_filename)
 
     # link ()
 
diff --git a/util.py b/util.py
index d079588a91..23c29ebb2a 100644
--- a/util.py
+++ b/util.py
@@ -12,7 +12,7 @@
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
-
+from distutils import log
 
 def get_platform ():
     """Return a string that identifies the current platform.  This is used
@@ -275,33 +275,27 @@ def split_quoted (s):
 
 
 def execute (func, args, msg=None, verbose=0, dry_run=0):
-    """Perform some action that affects the outside world (eg.  by writing
-    to the filesystem).  Such actions are special because they are disabled
-    by the 'dry_run' flag, and announce themselves if 'verbose' is true.
-    This method takes care of all that bureaucracy for you; all you have to
-    do is supply the function to call and an argument tuple for it (to
-    embody the "external action" being performed), and an optional message
-    to print.
+    """Perform some action that affects the outside world (eg.  by
+    writing to the filesystem).  Such actions are special because they
+    are disabled by the 'dry_run' flag.  This method takes care of all
+    that bureaucracy for you; all you have to do is supply the
+    function to call and an argument tuple for it (to embody the
+    "external action" being performed), and an optional message to
+    print.
     """
-    # Generate a message if we weren't passed one
     if msg is None:
         msg = "%s%s" % (func.__name__, `args`)
         if msg[-2:] == ',)':        # correct for singleton tuple
             msg = msg[0:-2] + ')'
 
-    # Print it if verbosity level is high enough
-    if verbose:
-        print msg
-
-    # And do it, as long as we're not in dry-run mode
+    log.info(msg)
     if not dry_run:
         apply(func, args)
 
-# execute()
-
 
 def strtobool (val):
     """Convert a string representation of truth to true (1) or false (0).
+    
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
     are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
     'val' is anything else.
@@ -337,8 +331,8 @@ def byte_compile (py_files,
     prepended (after 'prefix' is stripped).  You can supply either or both
     (or neither) of 'prefix' and 'base_dir', as you wish.
 
-    If 'verbose' is true, prints out a report of each file.  If 'dry_run'
-    is true, doesn't actually do anything that would affect the filesystem.
+    If 'dry_run' is true, doesn't actually do anything that would
+    affect the filesystem.
 
     Byte-compilation is either done directly in this interpreter process
     with the standard py_compile module, or indirectly by writing a
@@ -367,8 +361,7 @@ def byte_compile (py_files,
     if not direct:
         from tempfile import mktemp
         script_name = mktemp(".py")
-        if verbose:
-            print "writing byte-compilation script '%s'" % script_name
+        log.info("writing byte-compilation script '%s'", script_name)
         if not dry_run:
             script = open(script_name, "w")
 
@@ -406,9 +399,9 @@ def byte_compile (py_files,
             cmd.insert(1, "-O")
         elif optimize == 2:
             cmd.insert(1, "-OO")
-        spawn(cmd, verbose=verbose, dry_run=dry_run)
+        spawn(cmd, dry_run=dry_run)
         execute(os.remove, (script_name,), "removing %s" % script_name,
-                verbose=verbose, dry_run=dry_run)
+                dry_run=dry_run)
 
     # "Direct" byte-compilation: use the py_compile module to compile
     # right here, right now.  Note that the script generated in indirect
@@ -440,14 +433,12 @@ def byte_compile (py_files,
             cfile_base = os.path.basename(cfile)
             if direct:
                 if force or newer(file, cfile):
-                    if verbose:
-                        print "byte-compiling %s to %s" % (file, cfile_base)
+                    log.info("byte-compiling %s to %s", file, cfile_base)
                     if not dry_run:
                         compile(file, cfile, dfile)
                 else:
-                    if verbose:
-                        print "skipping byte-compilation of %s to %s" % \
-                              (file, cfile_base)
+                    log.debug("skipping byte-compilation of %s to %s",
+                              file, cfile_base)
 
 # byte_compile ()
 

From 86d1bd16c0053ee46f0e7d529dec144b611de3ed Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:18:24 +0000
Subject: [PATCH 0812/8469] Remove unused imports caught by pychecker

---
 command/bdist_pkgtool.py | 2 --
 command/bdist_sdux.py    | 1 -
 filelist.py              | 2 +-
 unixccompiler.py         | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index 4fd95012a2..9d6e7dc110 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -7,7 +7,6 @@
 distributions)."""
 
 import os, string, sys, pwd, grp
-import glob
 from types import *
 from distutils.core import Command, DEBUG
 from distutils.util import get_platform
@@ -16,7 +15,6 @@
 from distutils.command import bdist_packager
 from distutils import sysconfig
 from distutils import log
-import compileall
 from commands import getoutput
 
 __revision__ = "$Id: bdist_pkgtool.py,v 0.3 mwa "
diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
index e4765f97df..a3cbbb8a3f 100644
--- a/command/bdist_sdux.py
+++ b/command/bdist_sdux.py
@@ -7,7 +7,6 @@
 
 __revision__ = "$Id: bdist_sdux.py,v 0.2 "
 import os, string
-import glob
 from types import *
 from distutils.core import Command, DEBUG
 from distutils.util import get_platform
diff --git a/filelist.py b/filelist.py
index d39c835869..3ed6f03291 100644
--- a/filelist.py
+++ b/filelist.py
@@ -11,7 +11,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import os, string, re
 import fnmatch
 from types import *
 from glob import glob
diff --git a/unixccompiler.py b/unixccompiler.py
index 55a51b3201..56d3ee44cb 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,7 +17,7 @@
 
 __revision__ = "$Id$"
 
-import string, re, os, sys
+import os, sys
 from types import *
 from copy import copy
 from distutils import sysconfig

From ae4a1269c661b5fb842d7d18911d5a0c19ded7dc Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:24:05 +0000
Subject: [PATCH 0813/8469] Set repeat metadata for an option based on repeat
 local var not constant.

---
 fancy_getopt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index fe9b0d4d94..cb89e070d7 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -182,7 +182,7 @@ def _grok_option_table (self):
                       ("invalid short option '%s': "
                        "must a single character or None") % short
 
-            self.repeat[long] = 1
+            self.repeat[long] = repeat
             self.long_opts.append(long)
 
             if long[-1] == '=':             # option takes an argument?

From c3296eab8b1919b8f4c3fcdbfbd34deca6a22040 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:26:44 +0000
Subject: [PATCH 0814/8469] Fix unused local variables caught by pychecker.

Fixes a bug for Solaris pkgtool (bdist_pkgtool) that would have
prevented it from building subpackages.
---
 command/bdist_packager.py | 10 +---------
 command/bdist_pkgtool.py  |  4 ++--
 core.py                   |  4 +---
 cygwinccompiler.py        |  7 ++-----
 emxccompiler.py           |  4 ++--
 sysconfig.py              |  1 -
 6 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index 11278ee28b..dde113ce4d 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -145,7 +145,6 @@ def get_script (self,attr):
 
 
     def initialize_options (self):
-        d = self.distribution
         self.keep_temp = 0
         self.control_only = 0
         self.no_autorelocate = 0
@@ -187,8 +186,7 @@ def finalize_options (self):
             self.pkg_dir = os.path.join(bdist_base, 'binary')
 
         if not self.plat_name:
-            d = self.distribution
-            self.plat = d.get_platforms()
+            self.plat = self.distribution.get_platforms()
         if self.distribution.has_ext_modules():
             self.plat_name = [sys.platform,]
         else:
@@ -237,12 +235,6 @@ def run (self):
 
         log.info("installing to %s", self.pkg_dir)
         self.run_command('install')
-
-        # And make an archive relative to the root of the
-        # pseudo-installation tree.
-        archive_basename = "%s.%s" % (self.distribution.get_fullname(),
-                                      self.plat_name)
-
         if not self.keep_temp:
             remove_tree(self.pkg_dir, dry_run=self.dry_run)
 
diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index 9d6e7dc110..3a48d2699a 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -208,7 +208,7 @@ def make_package(self,root=None):
         else:
             pkg_dir = self.pkg_dir
 
-        install = self.reinitialize_command('install', reinit_subcommands=1)
+        self.reinitialize_command('install', reinit_subcommands=1)
         # build package
         log.info('Building package')
         self.run_command('build')
@@ -275,7 +275,7 @@ def run (self):
         if self.subpackages:
             self.subpackages=string.split(self.subpackages,",")
             for pkg in self.subpackages:
-                self.make_package(subpackage)
+                self.make_package(pkg)
         else:
             self.make_package()
     # run()
diff --git a/core.py b/core.py
index 222e6aebd8..fbf5d51182 100644
--- a/core.py
+++ b/core.py
@@ -125,9 +125,7 @@ class found in 'cmdclass' is used in place of the default, which is
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError, msg:
-        script = os.path.basename(dist.script_name)
-        raise SystemExit, \
-              gen_usage(dist.script_name) + "\nerror: %s" % msg
+        raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
 
     if DEBUG:
         print "options (after parsing command line):"
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 3fb5bc9005..443c9bcfb7 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -213,7 +213,6 @@ def link (self,
 
             # generate the filenames for these files
             def_file = os.path.join(temp_dir, dll_name + ".def")
-            exp_file = os.path.join(temp_dir, dll_name + ".exp")
             lib_file = os.path.join(temp_dir, 'lib' + dll_name + ".a")
 
             # Generate .def file
@@ -229,16 +228,14 @@ def link (self,
 
             # dllwrap uses different options than gcc/ld
             if self.linker_dll == "dllwrap":
-                extra_preargs.extend([#"--output-exp",exp_file,
-                                       "--output-lib",lib_file,
-                                     ])
+                extra_preargs.extend(["--output-lib", lib_file])
                 # for dllwrap we have to use a special option
                 extra_preargs.extend(["--def", def_file])
             # we use gcc/ld here and can be sure ld is >= 2.9.10
             else:
                 # doesn't work: bfd_close build\...\libfoo.a: Invalid operation
                 #extra_preargs.extend(["-Wl,--out-implib,%s" % lib_file])
-                # for gcc/ld the def-file is specified as any other object files
+                # for gcc/ld the def-file is specified as any object files
                 objects.append(def_file)
 
         #end: if ((export_symbols is not None) and
diff --git a/emxccompiler.py b/emxccompiler.py
index 2788209c72..644c6fc391 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -174,11 +174,11 @@ def link (self,
 
             # generate the filenames for these files
             def_file = os.path.join(temp_dir, dll_name + ".def")
-            lib_file = os.path.join(temp_dir, dll_name + ".lib")
        
             # Generate .def file
             contents = [
-                "LIBRARY %s INITINSTANCE TERMINSTANCE" % os.path.splitext(os.path.basename(output_filename))[0],
+                "LIBRARY %s INITINSTANCE TERMINSTANCE" % \
+                os.path.splitext(os.path.basename(output_filename))[0],
                 "DATA MULTIPLE NONSHARED",
                 "EXPORTS"]
             for sym in export_symbols:
diff --git a/sysconfig.py b/sysconfig.py
index 3e323533b6..847b87240b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -305,7 +305,6 @@ def expand_makefile_vars(s, vars):
     while 1:
         m = _findvar1_rx.search(s) or _findvar2_rx.search(s)
         if m:
-            name = m.group(1)
             (beg, end) = m.span()
             s = s[0:beg] + vars.get(m.group(1)) + s[end:]
         else:

From c7cb56da7ee4c7f2a29d32f6a15c6e838708419e Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:30:10 +0000
Subject: [PATCH 0815/8469] Fix bug in recent change to logging code.

mode is not computed in dry_run mode, so it can't be included in the
log message.
---
 command/install_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_scripts.py b/command/install_scripts.py
index 4044ba092b..ceece1b6bf 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -49,7 +49,7 @@ def run (self):
             # all the scripts we just installed.
             for file in self.get_outputs():
                 if self.dry_run:
-                    log.info("changing mode of %s to %o", file, mode)
+                    log.info("changing mode of %s", file)
                 else:
                     mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
                     log.info("changing mode of %s to %o", file, mode)

From 8c19b0c4ec29c8daa3aceddcaabf7ec0f86ed12e Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:35:10 +0000
Subject: [PATCH 0816/8469] global _option_order is not used

---
 fancy_getopt.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index cb89e070d7..2ed29a24fd 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -31,12 +31,6 @@
 # (for use as attributes of some object).
 longopt_xlate = string.maketrans('-', '_')
 
-# This records (option, value) pairs in the order seen on the command line;
-# it's close to what getopt.getopt() returns, but with short options
-# expanded.  (Ugh, this module should be OO-ified.)
-_option_order = None
-
-
 class FancyGetopt:
     """Wrapper around the standard 'getopt()' module that provides some
     handy extra functionality:

From d8961739214a05f084e4ee8ac55b0c02deaba3b7 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:39:34 +0000
Subject: [PATCH 0817/8469] get_script() implicitly returned None and also had
 explicit returns.

Make all returns explicit and rearrange logic to avoid extra
indentation.
---
 command/bdist_packager.py | 51 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index dde113ce4d..d57a59403b 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -3,8 +3,8 @@
 Modified from bdist_dumb by Mark W. Alexander <slash@dotnetslash.net>
 
 Implements the Distutils 'bdist_packager' abstract command
-to be subclassed by binary package creation commands."""
-
+to be subclassed by binary package creation commands.
+"""
 
 __revision__ = "$Id: bdist_packager.py,v 0.1 2001/04/4 mwa"
 
@@ -114,34 +114,33 @@ def get_binary_name(self):
         return self.name + '-' + self.version + '-' + \
                self.revision + '-' + py_ver
 
-    def get_script (self,attr):
+    def get_script (self, attr):
         # accept a script as a string ("line\012line\012..."),
         # a filename, or a list
         # XXX We could probably get away with copy_file, but I'm
         # guessing this will be more flexible later on....
-        val = getattr(self,attr)
-        ret=None
-        if val:
-            try:
-                os.stat(val)
-                # script is a file
-                ret=[]
-                f=open(val)
-                ret=string.split(f.read(),"\012");
-                f.close()
-                #return ret
-            except:
-                if type(val)==type(""):
-                    # script is a string
-                    ret = string.split(val,"\012")
-                elif type(val)==type([]):
-                    # script is a list
-                    ret = val
-                else:
-                    raise RuntimeError, \
-                        "cannot figure out what to do with 'request' option (%s)" \
-                        % val
-            return ret
+        val = getattr(self, attr)
+        if val is None:
+            return None
+        try:
+            os.stat(val)
+            # script is a file
+            ret = []
+            f = open(val)
+            ret = string.split(f.read(), "\012");
+            f.close()
+        except:
+            if type(val) == type(""):
+                # script is a string
+                ret = string.split(val, "\012")
+            elif type(val) == type([]):
+                # script is a list
+                ret = val
+            else:
+                raise RuntimeError, \
+                    "cannot figure out what to do with 'request' option (%s)" \
+                    % val
+        return ret
 
 
     def initialize_options (self):

From 53d0ff29cbd412eb5505f8044b76544bd7496321 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:40:03 +0000
Subject: [PATCH 0818/8469] Remove (commented out) options that have moved into
 the distribution.

---
 command/bdist_packager.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index d57a59403b..12efeaa087 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -34,19 +34,6 @@ class bdist_packager (Command):
          "Software category (packager dependent format)"),
         ('revision=', None,
          "package revision number"),
-        # the following have moved into the distribution class
-        #('packager=', None,
-         #"Package maintainer"),
-        #('packager-mail=', None,
-         #"Package maintainer's email address"),
-        #('author=', None,
-         #"Package author"),
-        #('author-mail=', None,
-         #"Package author's email address"),
-        #('license=', None,
-         #"License code"),
-        #('licence=', None,
-         #"alias for license"),
         ('icon=', None,
          "Package icon"),
         ('subpackages=', None,

From d9e8a67208a3d479acb0e19dd9e92b03d6d5aa83 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:42:41 +0000
Subject: [PATCH 0819/8469] Reindent lines to improve readability

---
 command/bdist_pkgtool.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index 3a48d2699a..998af5e7cd 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -303,9 +303,9 @@ def _make_prototype(self):
         try:
             self.distribution.packages[0]
             file_list=string.split(
-            getoutput("pkgproto %s/%s=%s" % (build.build_lib,
-            self.distribution.packages[0],
-            self.distribution.packages[0])),"\012")
+                getoutput("pkgproto %s/%s=%s" % \
+                          (build.build_lib, self.distribution.packages[0],
+                           self.distribution.packages[0])), "\012")
         except:
             file_list=string.split(
             getoutput("pkgproto %s=" % (build.build_lib)),"\012")

From 54e7ddc64aac340cb2a1c87e394caf0a9bdfb3ab Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:45:17 +0000
Subject: [PATCH 0820/8469] ensure_filename() only takes one argument.

Call ensure_string() with one arg too, since the second value passed
was the default.
---
 command/bdist_packager.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/command/bdist_packager.py b/command/bdist_packager.py
index 12efeaa087..1960425511 100644
--- a/command/bdist_packager.py
+++ b/command/bdist_packager.py
@@ -67,18 +67,16 @@ def ensure_string_not_none (self,option,default=None):
         if val is None:
             raise DistutilsOptionError, "'%s' must be provided" % option
 
-    def ensure_script (self,arg):
+    def ensure_script(self, arg):
         if not arg:
             return
         try:
-            self.ensure_string(arg, None)
+            self.ensure_string(arg)
         except:
             try:
-                self.ensure_filename(arg, None)
+                self.ensure_filename(arg)
             except:
-                raise RuntimeError, \
-                    "cannot decipher script option (%s)" \
-                    % arg
+                raise RuntimeError, "cannot decipher script option (%s)" % arg
 
     def write_script (self,path,attr,default=None):
         """ write the script specified in attr to path. if attr is None,

From 58596909c7673897cc8563e233ba6b71547a3ab4 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 20:55:10 +0000
Subject: [PATCH 0821/8469] import base64 at the top to avoid two different
 imports at other times

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

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 6a985f190b..f018f4616f 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -8,6 +8,7 @@
 __revision__ = "$Id$"
 
 import sys, os, string
+import base64
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -231,7 +232,6 @@ def create_exe (self, arcname, fullname, bitmap=None):
     # create_exe()
 
     def get_exe_bytes (self):
-        import base64
         return base64.decodestring(EXEDATA)
 # class bdist_wininst
 
@@ -248,7 +248,7 @@ def get_exe_bytes (self):
     # - Built wininst.exe from the MSVC project file distutils/misc/wininst.dsw
     # - Execute this file (distutils/distutils/command/bdist_wininst.py)
 
-    import re, base64
+    import re
     moddata = open("bdist_wininst.py", "r").read()
     exedata = open("../../misc/wininst.exe", "rb").read()
     print "wininst.exe length is %d bytes" % len(exedata)

From 6ff1777df1ce884b828e5e6bcf6a562512d5d543 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:00:20 +0000
Subject: [PATCH 0822/8469] Make None return explicit

---
 command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 388d3cbc9e..0ab72c08f4 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -181,7 +181,7 @@ def check_package (self, package, package_dir):
 
         # Either not in a package at all (__init__.py not expected), or
         # __init__.py doesn't exist -- so don't return the filename.
-        return
+        return None
 
     # check_package ()
 

From 0d435a0fec6aed4828aaf1f692d34dc0c213570b Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:00:33 +0000
Subject: [PATCH 0823/8469] Remove unused imports

---
 command/bdist_pkgtool.py | 1 -
 command/bdist_sdux.py    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index 998af5e7cd..51b89d978e 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -8,7 +8,6 @@
 
 import os, string, sys, pwd, grp
 from types import *
-from distutils.core import Command, DEBUG
 from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *
diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
index a3cbbb8a3f..ee3822e9d3 100644
--- a/command/bdist_sdux.py
+++ b/command/bdist_sdux.py
@@ -8,7 +8,6 @@
 __revision__ = "$Id: bdist_sdux.py,v 0.2 "
 import os, string
 from types import *
-from distutils.core import Command, DEBUG
 from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *

From 2c4e48b301ddef1ea26454a694220d56c98a644f Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:02:26 +0000
Subject: [PATCH 0824/8469] Use module-level import of DEBUG instead of many
 function-level imports.

---
 dist.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dist.py b/dist.py
index a84004f4c7..f995d58e9a 100644
--- a/dist.py
+++ b/dist.py
@@ -16,6 +16,7 @@
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 from distutils import log
+from distutils.core import DEBUG
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
 # the same as a Python NAME -- I don't allow leading underscores.  The fact
@@ -305,7 +306,6 @@ def find_config_files (self):
     def parse_config_files (self, filenames=None):
 
         from ConfigParser import ConfigParser
-        from distutils.core import DEBUG
 
         if filenames is None:
             filenames = self.find_config_files()
@@ -771,7 +771,6 @@ def get_command_obj (self, command, create=1):
         object for 'command' is in the cache, then we either create and
         return it (if 'create' is true) or return None.
         """
-        from distutils.core import DEBUG
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
             if DEBUG:
@@ -802,8 +801,6 @@ def _set_command_options (self, command_obj, option_dict=None):
         supplied, uses the standard option dictionary for this command
         (from 'self.command_options').
         """
-        from distutils.core import DEBUG
-
         command_name = command_obj.get_command_name()
         if option_dict is None:
             option_dict = self.get_option_dict(command_name)

From 309de7b19b6bcfe387a274af9a2412921364ea0e Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:04:03 +0000
Subject: [PATCH 0825/8469] Add missing import of log.

---
 filelist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/filelist.py b/filelist.py
index 3ed6f03291..e2e2457c8b 100644
--- a/filelist.py
+++ b/filelist.py
@@ -17,6 +17,7 @@
 from glob import glob
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
+from distutils import log
 
 class FileList:
 

From dfeac87d4fb807b342d27a6d19626aef80a8de17 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:05:05 +0000
Subject: [PATCH 0826/8469] Define DEBUG as early as possible to avoid import
 problems.

---
 core.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core.py b/core.py
index fbf5d51182..8a348ce3e5 100644
--- a/core.py
+++ b/core.py
@@ -12,6 +12,11 @@
 
 import sys, os
 from types import *
+
+# If DISTUTILS_DEBUG is anything other than the empty string, we run in
+# debug mode.
+DEBUG = os.environ.get('DISTUTILS_DEBUG')
+
 from distutils.errors import *
 from distutils.util import grok_environment_error
 
@@ -32,11 +37,6 @@
    or: %(script)s cmd --help
 """
 
-
-# If DISTUTILS_DEBUG is anything other than the empty string, we run in
-# debug mode.
-DEBUG = os.environ.get('DISTUTILS_DEBUG')
-
 def gen_usage (script_name):
     script = os.path.basename(script_name)
     return USAGE % vars()

From 6dc1366e1df26a7247b81f0d1ac19e278ad4fcb7 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:06:16 +0000
Subject: [PATCH 0827/8469] Replace bogus bare variables with attribute access.

---
 command/bdist_sdux.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
index ee3822e9d3..875f3d88ce 100644
--- a/command/bdist_sdux.py
+++ b/command/bdist_sdux.py
@@ -1,7 +1,8 @@
 """distutils.command.bdist_pkgtool
 
 Implements the Distutils 'bdist_sdux' command to create HP-UX 
-swinstall depot"""
+swinstall depot.
+"""
 
 # Mark Alexander <slash@dotnetslash.net>
 
@@ -265,11 +266,11 @@ def _make_control_file(self):
             #psf_file.extend([self.long_description])
         if self.copyright:
             # XX make a copyright file XXX
-            write_script('copyright')
+            self.write_script('copyright')
             psf_file.extend(['    copyright         <copyright'])
         if self.readme:
             # XX make a readme file XXX
-            write_script('readme')
+            self.write_script('readme')
             psf_file.extend(['    readme            <readme'])
 
         psf_file.extend(['    fileset'])    # start fileset

From 191a5b0aee9989c6619190229c217885135a7639 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:10:35 +0000
Subject: [PATCH 0828/8469] Track extra arg to option_table to all uses of it

---
 fancy_getopt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 2ed29a24fd..a11b4d5840 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -358,8 +358,8 @@ def generate_help (self, header=None):
         else:
             lines = ['Option summary:']
 
-        for (long,short,help) in self.option_table:
-
+        for option in self.option_table:
+            long, short, help = option_table[:3]
             text = wrap_text(help, text_width)
             if long[-1] == '=':
                 long = long[0:-1]

From 03599c1b7e1719cbc27bef76603807002c384aec Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:11:56 +0000
Subject: [PATCH 0829/8469] Test changes before checking them in.

---
 fancy_getopt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index a11b4d5840..5de64e15da 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -359,7 +359,7 @@ def generate_help (self, header=None):
             lines = ['Option summary:']
 
         for option in self.option_table:
-            long, short, help = option_table[:3]
+            long, short, help = option[:3]
             text = wrap_text(help, text_width)
             if long[-1] == '=':
                 long = long[0:-1]

From 1d89b23767470db537211e8d3daa12d435d5effb Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 4 Jun 2002 21:20:08 +0000
Subject: [PATCH 0830/8469] Move warning about directory not on sys.path to
 debug level.

Fix a bunch of multiline string constants that used +.
---
 command/install.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/command/install.py b/command/install.py
index 746ca1f2c3..322177f441 100644
--- a/command/install.py
+++ b/command/install.py
@@ -2,6 +2,8 @@
 
 Implements the Distutils 'install' command."""
 
+from distutils import log
+
 # created 1999/03/13, Greg Ward
 
 __revision__ = "$Id$"
@@ -368,8 +370,8 @@ def finalize_unix (self):
                 self.install_scripts is None or
                 self.install_data is None):
                 raise DistutilsOptionError, \
-                      "install-base or install-platbase supplied, but " + \
-                      "installation scheme is incomplete"
+                      ("install-base or install-platbase supplied, but "
+                      "installation scheme is incomplete")
             return
 
         if self.home is not None:
@@ -464,8 +466,8 @@ def handle_extra_path (self):
                 (path_file, extra_dirs) = self.extra_path
             else:
                 raise DistutilsOptionError, \
-                      "'extra_path' option must be a list, tuple, or " + \
-                      "comma-separated string with 1 or 2 elements"
+                      ("'extra_path' option must be a list, tuple, or "
+                      "comma-separated string with 1 or 2 elements")
 
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
@@ -522,10 +524,10 @@ def run (self):
         if (self.warn_dir and
             not (self.path_file and self.install_path_file) and
             install_lib not in sys_path):
-            self.warn(("modules installed to '%s', which is not in " +
-                       "Python's module search path (sys.path) -- " +
-                       "you'll have to change the search path yourself") %
-                      self.install_lib)
+            log.debug(("modules installed to '%s', which is not in "
+                       "Python's module search path (sys.path) -- " 
+                       "you'll have to change the search path yourself"),
+                       self.install_lib)
 
     # run ()
 

From 6b97787eb0832dabe581cb2b8e55a709bab0d75f Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 6 Jun 2002 14:54:56 +0000
Subject: [PATCH 0831/8469] Change warning to debug level; it's a very minor
 issue.

The specific warning is that clean didn't find a directory that should
be removed if it exists.
---
 command/clean.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 8fddeb453a..36252d5174 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -54,8 +54,8 @@ def run(self):
         if os.path.exists(self.build_temp):
             remove_tree(self.build_temp, dry_run=self.dry_run)
         else:
-            log.warn("'%s' does not exist -- can't clean it",
-                     self.build_temp)
+            log.debug("'%s' does not exist -- can't clean it",
+                      self.build_temp)
 
         if self.all:
             # remove build directories

From 8ad35754e1684d02471a0be1b22e0e14c2b78592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 11 Jun 2002 06:22:31 +0000
Subject: [PATCH 0832/8469] Patch #488073: AtheOS port.

---
 command/build_ext.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 89ca1dc9b8..d8f3dc8a7a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -178,9 +178,9 @@ def finalize_options (self):
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
 
-        # for extensions under Cygwin Python's library directory must be
+        # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin':
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -656,6 +656,22 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
+        elif sys.platform[:6] == "atheos":
+            from distutils import sysconfig
+
+            template = "python%d.%d"
+            pythonlib = (template %
+                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+            # Get SHLIBS from Makefile
+            extra = []
+            for lib in sysconfig.get_config_var('SHLIBS').split():
+                if lib.startswith('-l'):
+                    extra.append(lib[2:])
+                else:
+                    extra.append(lib)
+            # don't extend ext.libraries, it may be shared with other
+            # extensions, it is a reference to the original list
+            return ext.libraries + [pythonlib, "m"] + extra
         else:
             return ext.libraries
 

From c21ebfc2107cf837e5efa2958dc1c66e2db057fc Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 12 Jun 2002 20:08:56 +0000
Subject: [PATCH 0833/8469] Add a new definition to Extension objects: depends.

depends is a list of files that the target depends, but aren't direct
sources of the target.  think .h files.
---
 command/build_ext.py | 3 ++-
 extension.py         | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index d8f3dc8a7a..21dd0dcd6e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -422,7 +422,8 @@ def build_extension(self, ext):
             ext_filename = os.path.join(self.build_lib,
                                         self.get_ext_filename(fullname))
 
-        if not (self.force or newer_group(sources, ext_filename, 'newer')):
+        depends = sources + ext.depends
+        if not (self.force or newer_group(depends, ext_filename, 'newer')):
             log.debug("skipping '%s' extension (up-to-date)", ext.name)
             return
         else:
diff --git a/extension.py b/extension.py
index 3737712016..d73bb08e00 100644
--- a/extension.py
+++ b/extension.py
@@ -73,6 +73,8 @@ class Extension:
         used on all platforms, and not generally necessary for Python
         extensions, which typically export exactly one symbol: "init" +
         extension_name.
+      depends : [string]
+        list of files that the extension depends on
     """
 
     def __init__ (self, name, sources,
@@ -86,6 +88,7 @@ def __init__ (self, name, sources,
                   extra_compile_args=None,
                   extra_link_args=None,
                   export_symbols=None,
+                  depends=None,
                  ):
 
         assert type(name) is StringType, "'name' must be a string"
@@ -105,6 +108,7 @@ def __init__ (self, name, sources,
         self.extra_compile_args = extra_compile_args or []
         self.extra_link_args = extra_link_args or []
         self.export_symbols = export_symbols or []
+        self.depends = depends or []
 
 # class Extension
 

From bcb36e840f82d68473ff4c48f3fd9b53fcebf9eb Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 14:58:30 +0000
Subject: [PATCH 0834/8469] Python style conformance: Delete spaces between
 name of function and arglist.

Making the world better a little bit at a time <wink>.
---
 unixccompiler.py | 82 ++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 56d3ee44cb..e584007c00 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -81,20 +81,20 @@ class UnixCCompiler (CCompiler):
 
 
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+    def __init__(self,
+                 verbose=0,
+                 dry_run=0,
+                 force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
 
 
-    def preprocess (self,
-                    source,
-                    output_file=None,
-                    macros=None,
-                    include_dirs=None,
-                    extra_preargs=None,
-                    extra_postargs=None):
+    def preprocess(self,
+                   source,
+                   output_file=None,
+                   macros=None,
+                   include_dirs=None,
+                   extra_preargs=None,
+                   extra_postargs=None):
 
         (_, macros, include_dirs) = \
             self._fix_compile_args(None, macros, include_dirs)
@@ -120,14 +120,14 @@ def preprocess (self,
                 raise CompileError, msg
 
 
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
+    def compile(self,
+                sources,
+                output_dir=None,
+                macros=None,
+                include_dirs=None,
+                debug=0,
+                extra_preargs=None,
+                extra_postargs=None):
 
         (output_dir, macros, include_dirs) = \
             self._fix_compile_args(output_dir, macros, include_dirs)
@@ -164,11 +164,11 @@ def compile (self,
     # compile ()
 
 
-    def create_static_lib (self,
-                           objects,
-                           output_libname,
-                           output_dir=None,
-                           debug=0):
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0):
 
         (objects, output_dir) = self._fix_object_args(objects, output_dir)
 
@@ -197,19 +197,19 @@ def create_static_lib (self,
     # create_static_lib ()
 
 
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None):
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None):
 
         (objects, output_dir) = self._fix_object_args(objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
@@ -250,10 +250,10 @@ def link (self,
     # These are all used by the 'gen_lib_options() function, in
     # ccompiler.py.
 
-    def library_dir_option (self, dir):
+    def library_dir_option(self, dir):
         return "-L" + dir
 
-    def runtime_library_dir_option (self, dir):
+    def runtime_library_dir_option(self, dir):
         # XXX Hackish, at the very least.  See Python bug #445902:
         # http://sourceforge.net/tracker/index.php
         #   ?func=detail&aid=445902&group_id=5470&atid=105470
@@ -272,11 +272,11 @@ def runtime_library_dir_option (self, dir):
         else:
             return "-R" + dir
 
-    def library_option (self, lib):
+    def library_option(self, lib):
         return "-l" + lib
 
 
-    def find_library_file (self, dirs, lib, debug=0):
+    def find_library_file(self, dirs, lib, debug=0):
 
         for dir in dirs:
             shared = os.path.join(

From 80830960c062d2faed9375840f036eefe109c991 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 15:01:38 +0000
Subject: [PATCH 0835/8469] Some more style improvements

---
 unixccompiler.py | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index e584007c00..1cfeebd136 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -18,8 +18,9 @@
 __revision__ = "$Id$"
 
 import os, sys
-from types import *
+from types import StringType, NoneType
 from copy import copy
+
 from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
@@ -43,8 +44,7 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
-
-class UnixCCompiler (CCompiler):
+class UnixCCompiler(CCompiler):
 
     compiler_type = 'unix'
 
@@ -85,8 +85,7 @@ def __init__(self,
                  verbose=0,
                  dry_run=0,
                  force=0):
-        CCompiler.__init__ (self, verbose, dry_run, force)
-
+        CCompiler.__init__(self, verbose, dry_run, force)
 
     def preprocess(self,
                    source,
@@ -95,7 +94,6 @@ def preprocess(self,
                    include_dirs=None,
                    extra_preargs=None,
                    extra_postargs=None):
-
         (_, macros, include_dirs) = \
             self._fix_compile_args(None, macros, include_dirs)
         pp_opts = gen_preprocess_options(macros, include_dirs)
@@ -119,7 +117,6 @@ def preprocess(self,
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
-
     def compile(self,
                 sources,
                 output_dir=None,
@@ -128,7 +125,6 @@ def compile(self,
                 debug=0,
                 extra_preargs=None,
                 extra_postargs=None):
-
         (output_dir, macros, include_dirs) = \
             self._fix_compile_args(output_dir, macros, include_dirs)
         (objects, skip_sources) = self._prep_compile(sources, output_dir)
@@ -161,15 +157,11 @@ def compile(self,
         # Return *all* object filenames, not just the ones we just built.
         return objects
 
-    # compile ()
-
-
     def create_static_lib(self,
                           objects,
                           output_libname,
                           output_dir=None,
                           debug=0):
-
         (objects, output_dir) = self._fix_object_args(objects, output_dir)
 
         output_filename = \
@@ -194,9 +186,6 @@ def create_static_lib(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    # create_static_lib ()
-
-
     def link(self,
              target_desc,
              objects,
@@ -210,7 +199,6 @@ def link(self,
              extra_preargs=None,
              extra_postargs=None,
              build_temp=None):
-
         (objects, output_dir) = self._fix_object_args(objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
@@ -243,9 +231,6 @@ def link(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    # link ()
-
-
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
     # ccompiler.py.
@@ -275,9 +260,7 @@ def runtime_library_dir_option(self, dir):
     def library_option(self, lib):
         return "-l" + lib
 
-
     def find_library_file(self, dirs, lib, debug=0):
-
         for dir in dirs:
             shared = os.path.join(
                 dir, self.library_filename(lib, lib_type='shared'))
@@ -300,7 +283,3 @@ def find_library_file(self, dirs, lib, debug=0):
         else:
             # Oops, didn't find it in *any* of 'dirs'
             return None
-
-    # find_library_file ()
-
-# class UnixCCompiler

From 26e7e90cb2e973453758e43324128205af177296 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 15:14:10 +0000
Subject: [PATCH 0836/8469] More style changes and little cleanups.

Remove __init__ that just called base class __init__ with same args.
Fold long argument lists into fewer, shorter lines.
Remove parens in tuple unpacks.
Don't put multiple statements on one line with a semicolon.
In find_library_file() compute the library_filename() upfront.
---
 unixccompiler.py | 96 +++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 63 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 1cfeebd136..abf7a2643b 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -79,22 +79,10 @@ class UnixCCompiler(CCompiler):
     dylib_lib_extension = ".dylib"
     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
 
-
-
-    def __init__(self,
-                 verbose=0,
-                 dry_run=0,
-                 force=0):
-        CCompiler.__init__(self, verbose, dry_run, force)
-
-    def preprocess(self,
-                   source,
-                   output_file=None,
-                   macros=None,
-                   include_dirs=None,
-                   extra_preargs=None,
-                   extra_postargs=None):
-        (_, macros, include_dirs) = \
+    def preprocess(self, source,
+                   output_file=None, macros=None, include_dirs=None,
+                   extra_preargs=None, extra_postargs=None):
+        ignore, macros, include_dirs = \
             self._fix_compile_args(None, macros, include_dirs)
         pp_opts = gen_preprocess_options(macros, include_dirs)
         pp_args = self.preprocessor + pp_opts
@@ -117,17 +105,12 @@ def preprocess(self,
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
-    def compile(self,
-                sources,
-                output_dir=None,
-                macros=None,
-                include_dirs=None,
-                debug=0,
-                extra_preargs=None,
-                extra_postargs=None):
-        (output_dir, macros, include_dirs) = \
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None):
+        output_dir, macros, include_dirs = \
             self._fix_compile_args(output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile(sources, output_dir)
+        objects, skip_sources = self._prep_compile(sources, output_dir)
 
         # Figure out the options for the compiler command line.
         pp_opts = gen_preprocess_options(macros, include_dirs)
@@ -142,27 +125,24 @@ def compile(self,
         # Compile all source files that weren't eliminated by
         # '_prep_compile()'.
         for i in range(len(sources)):
-            src = sources[i] ; obj = objects[i]
+            src = sources[i]
+            obj = objects[i]
             if skip_sources[src]:
                 log.debug("skipping %s (%s up-to-date)", src, obj)
             else:
                 self.mkpath(os.path.dirname(obj))
                 try:
                     self.spawn(self.compiler_so + cc_args +
-                               [src, '-o', obj] +
-                               extra_postargs)
+                               [src, '-o', obj] + extra_postargs)
                 except DistutilsExecError, msg:
                     raise CompileError, msg
 
         # Return *all* object filenames, not just the ones we just built.
         return objects
 
-    def create_static_lib(self,
-                          objects,
-                          output_libname,
-                          output_dir=None,
-                          debug=0):
-        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+    def create_static_lib(self, objects, output_libname,
+                          output_dir=None, debug=0):
+        objects, output_dir = self._fix_object_args(objects, output_dir)
 
         output_filename = \
             self.library_filename(output_libname, output_dir=output_dir)
@@ -186,25 +166,16 @@ def create_static_lib(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    def link(self,
-             target_desc,
-             objects,
-             output_filename,
-             output_dir=None,
-             libraries=None,
-             library_dirs=None,
-             runtime_library_dirs=None,
-             export_symbols=None,
-             debug=0,
-             extra_preargs=None,
-             extra_postargs=None,
-             build_temp=None):
-        (objects, output_dir) = self._fix_object_args(objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
+    def link(self, target_desc, objects,
+             output_filename, output_dir=None, libraries=None,
+             library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None):
+        objects, output_dir = self._fix_object_args(objects, output_dir)
+        libraries, library_dirs, runtime_library_dirs = \
             self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
 
-        lib_opts = gen_lib_options(self,
-                                   library_dirs, runtime_library_dirs,
+        lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
         if type(output_dir) not in (StringType, NoneType):
             raise TypeError, "'output_dir' must be a string or None"
@@ -261,14 +232,14 @@ def library_option(self, lib):
         return "-l" + lib
 
     def find_library_file(self, dirs, lib, debug=0):
+        shared_f = self.library_filename(lib, lib_type='shared')
+        dylib_f = self.library_filename(lib, lib_type='dylib')
+        static_f = self.library_filename(lib, lib_type='static')
+        
         for dir in dirs:
-            shared = os.path.join(
-                dir, self.library_filename(lib, lib_type='shared'))
-            dylib = os.path.join(
-                dir, self.library_filename(lib, lib_type='dylib'))
-            static = os.path.join(
-                dir, self.library_filename(lib, lib_type='static'))
-
+            shared = os.path.join(dir, shared_f)
+            dylib = os.path.join(dir, dylib_f)
+            static = os.path.join(dir, static_f)
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm
@@ -279,7 +250,6 @@ def find_library_file(self, dirs, lib, debug=0):
                 return shared
             elif os.path.exists(static):
                 return static
-
-        else:
-            # Oops, didn't find it in *any* of 'dirs'
-            return None
+            
+        # Oops, didn't find it in *any* of 'dirs'
+        return None

From 538305bafac46ceda3d7702e7cf88a19a757caef Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 17:26:30 +0000
Subject: [PATCH 0837/8469] Extend compiler() method with optional depends
 argument.

This change is not backwards compatible.  If a compiler subclass
exists outside the distutils package, it may get called with the
unexpected keyword arg.  It's easy to extend that compiler by having
it ignore the argument, and not much harder to do the right thing.  If
this ends up being burdensome, we can change it before 2.3 final to
work harder at compatibility.

Also add _setup_compile() and _get_cc_args() helper functions that
factor out much of the boilerplate for each concrete compiler class.
---
 ccompiler.py | 242 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 168 insertions(+), 74 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 4c8b881c3a..50246b8961 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -160,7 +160,6 @@ def set_executable(self, key, value):
             setattr(self, key, value)
 
 
-
     def _find_macro (self, name):
         i = 0
         for defn in self.macros:
@@ -321,6 +320,100 @@ def set_link_objects (self, objects):
     # -- Private utility methods --------------------------------------
     # (here for the convenience of subclasses)
 
+    # Helper method to prep compiler in subclass compile() methods
+
+    def _setup_compile(self, outdir, macros, incdirs, sources, depends,
+                       extra):
+        """Process arguments and decide which source files to compile.
+
+        Merges _fix_compile_args() and _prep_compile().
+        """
+        if outdir is None:
+            outdir = self.output_dir
+        elif type(outdir) is not StringType:
+            raise TypeError, "'output_dir' must be a string or None"
+
+        if macros is None:
+            macros = self.macros
+        elif type(macros) is ListType:
+            macros = macros + (self.macros or [])
+        else:
+            raise TypeError, "'macros' (if supplied) must be a list of tuples"
+
+        if incdirs is None:
+            incdirs = self.include_dirs
+        elif type(incdirs) in (ListType, TupleType):
+            incdirs = list(incdirs) + (self.include_dirs or [])
+        else:
+            raise TypeError, \
+                  "'include_dirs' (if supplied) must be a list of strings"
+
+        if extra is None:
+            extra = []
+
+        # Get the list of expected output (object) files
+        objects = self.object_filenames(sources, 1, outdir)
+        assert len(objects) == len(sources)
+
+        # XXX should redo this code to eliminate skip_source entirely.
+        # XXX instead create build and issue skip messages inline
+
+        if self.force:
+            skip_source = {}            # rebuild everything
+            for source in sources:
+                skip_source[source] = 0
+        elif depends is None:
+            # If depends is None, figure out which source files we
+            # have to recompile according to a simplistic check. We
+            # just compare the source and object file, no deep
+            # dependency checking involving header files.
+            skip_source = {}            # rebuild everything
+            for source in sources:      # no wait, rebuild nothing
+                skip_source[source] = 1
+
+            n_sources, n_objects = newer_pairwise(sources, objects)
+            for source in n_sources:    # no really, only rebuild what's
+                skip_source[source] = 0 # out-of-date
+        else:
+            # If depends is a list of files, then do a different
+            # simplistic check.  Assume that each object depends on
+            # its source and all files in the depends list.
+            skip_source = {}
+            # L contains all the depends plus a spot at the end for a
+            # particular source file
+            L = depends[:] + [None]
+            for i in range(len(objects)):
+                source = sources[i]
+                L[-1] = source
+                if newer_group(L, objects[i]):
+                    skip_source[source] = 0
+                else:
+                    skip_source[source] = 1
+
+        pp_opts = gen_preprocess_options(macros, incdirs)
+
+        build = {}
+        for i in range(len(sources)):
+            src = sources[i]
+            obj = objects[i]
+            ext = os.path.splitext(src)[1]
+            self.mkpath(os.path.dirname(obj))
+            if skip_source[src]:
+                log.debug("skipping %s (%s up-to-date)", src, obj)
+            else:
+                build[obj] = src, ext
+
+        return macros, objects, extra, pp_opts, build
+
+    def _get_cc_args(self, pp_opts, debug, before):
+        # works for unixccompiler, emxccompiler, cygwinccompiler
+        cc_args = pp_opts + ['-c']
+        if debug:
+            cc_args[:0] = ['-g']
+        if before:
+            cc_args[:0] = before
+        return cc_args
+
     def _fix_compile_args (self, output_dir, macros, include_dirs):
         """Typecheck and fix-up some of the arguments to the 'compile()'
         method, and return fixed-up values.  Specifically: if 'output_dir'
@@ -341,8 +434,7 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
         elif type (macros) is ListType:
             macros = macros + (self.macros or [])
         else:
-            raise TypeError, \
-                  "'macros' (if supplied) must be a list of tuples"
+            raise TypeError, "'macros' (if supplied) must be a list of tuples"
 
         if include_dirs is None:
             include_dirs = self.include_dirs
@@ -352,40 +444,57 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
             raise TypeError, \
                   "'include_dirs' (if supplied) must be a list of strings"
 
-        return (output_dir, macros, include_dirs)
+        return output_dir, macros, include_dirs
 
     # _fix_compile_args ()
 
 
-    def _prep_compile (self, sources, output_dir):
-        """Determine the list of object files corresponding to 'sources',
-        and figure out which ones really need to be recompiled.  Return a
-        list of all object files and a dictionary telling which source
-        files can be skipped.
+    def _prep_compile(self, sources, output_dir, depends=None):
+        """Decide which souce files must be recompiled.
+
+        Determine the list of object files corresponding to 'sources',
+        and figure out which ones really need to be recompiled.
+        Return a list of all object files and a dictionary telling
+        which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames (sources,
-                                         strip_dir=1,
-                                         output_dir=output_dir)
+        objects = self.object_filenames(sources, strip_dir=1,
+                                        output_dir=output_dir)
+        assert len(objects) == len(sources)
 
         if self.force:
             skip_source = {}            # rebuild everything
             for source in sources:
                 skip_source[source] = 0
-        else:
-            # Figure out which source files we have to recompile according
-            # to a simplistic check -- we just compare the source and
-            # object file, no deep dependency checking involving header
-            # files.
+        elif depends is None:
+            # If depends is None, figure out which source files we
+            # have to recompile according to a simplistic check. We
+            # just compare the source and object file, no deep
+            # dependency checking involving header files.
             skip_source = {}            # rebuild everything
             for source in sources:      # no wait, rebuild nothing
                 skip_source[source] = 1
 
-            (n_sources, n_objects) = newer_pairwise (sources, objects)
+            n_sources, n_objects = newer_pairwise(sources, objects)
             for source in n_sources:    # no really, only rebuild what's
                 skip_source[source] = 0 # out-of-date
-
-        return (objects, skip_source)
+        else:
+            # If depends is a list of files, then do a different
+            # simplistic check.  Assume that each object depends on
+            # its source and all files in the depends list.
+            skip_source = {}
+            # L contains all the depends plus a spot at the end for a
+            # particular source file
+            L = depends[:] + [None]
+            for i in range(len(objects)):
+                source = sources[i]
+                L[-1] = source
+                if newer_group(L, objects[i]):
+                    skip_source[source] = 0
+                else:
+                    skip_source[source] = 1
+
+        return objects, skip_source
 
     # _prep_compile ()
 
@@ -484,22 +593,19 @@ def preprocess (self,
         """
         pass
 
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
-        """Compile one or more source files.  'sources' must be a list of
-        filenames, most likely C/C++ files, but in reality anything that
-        can be handled by a particular compiler and compiler class
-        (eg. MSVCCompiler can handle resource files in 'sources').  Return
-        a list of object filenames, one per source filename in 'sources'.
-        Depending on the implementation, not all source files will
-        necessarily be compiled, but all corresponding object filenames
-        will be returned.
+    def compile(self, sources, output_dir=None, macros=None,
+                include_dirs=None, debug=0, extra_preargs=None,
+                extra_postargs=None, depends=None):
+        """Compile one or more source files.
+
+        'sources' must be a list of filenames, most likely C/C++
+        files, but in reality anything that can be handled by a
+        particular compiler and compiler class (eg. MSVCCompiler can
+        handle resource files in 'sources').  Return a list of object
+        filenames, one per source filename in 'sources'.  Depending on
+        the implementation, not all source files will necessarily be
+        compiled, but all corresponding object filenames will be
+        returned.
 
         If 'output_dir' is given, object files will be put under it, while
         retaining their original path component.  That is, "foo/bar.c"
@@ -530,6 +636,12 @@ def compile (self,
         for those occasions when the abstract compiler framework doesn't
         cut the mustard.
 
+        'depends', if given, is a list of filenames that all targets
+        depend on.  If a source file is older than any file in
+        depends, then the source file will be recompiled.  This
+        supports dependency tracking, but only at a coarse
+        granularity.
+
         Raises CompileError on failure.
         """
         pass
@@ -710,7 +822,6 @@ def find_library_file (self, dirs, lib, debug=0):
         """
         raise NotImplementedError
 
-
     # -- Filename generation methods -----------------------------------
 
     # The default implementation of the filename generating methods are
@@ -745,63 +856,46 @@ def find_library_file (self, dirs, lib, debug=0):
     #   * exe_extension -
     #     extension for executable files, eg. '' or '.exe'
 
-    def object_filenames (self,
-                          source_filenames,
-                          strip_dir=0,
-                          output_dir=''):
-        if output_dir is None: output_dir = ''
+    def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
+        assert output_dir is not None
         obj_names = []
         for src_name in source_filenames:
-            (base, ext) = os.path.splitext (src_name)
+            base, ext = os.path.splitext(src_name)
             if ext not in self.src_extensions:
                 raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % \
-                      (ext, src_name)
+                      "unknown file type '%s' (from '%s')" % (ext, src_name)
             if strip_dir:
-                base = os.path.basename (base)
-            obj_names.append (os.path.join (output_dir,
-                                            base + self.obj_extension))
+                base = os.path.basename(base)
+            obj_names.append(os.path.join(output_dir,
+                                          base + self.obj_extension))
         return obj_names
 
-    # object_filenames ()
-
-
-    def shared_object_filename (self,
-                                basename,
-                                strip_dir=0,
-                                output_dir=''):
-        if output_dir is None: output_dir = ''
+    def shared_object_filename(self, basename, strip_dir=0, output_dir=''):
+        assert output_dir is not None
         if strip_dir:
             basename = os.path.basename (basename)
-        return os.path.join (output_dir, basename + self.shared_lib_extension)
+        return os.path.join(output_dir, basename + self.shared_lib_extension)
 
-    def executable_filename (self,
-                                basename,
-                                strip_dir=0,
-                                output_dir=''):
-        if output_dir is None: output_dir = ''
+    def executable_filename(self, basename, strip_dir=0, output_dir=''):
+        assert output_dir is not None
         if strip_dir:
             basename = os.path.basename (basename)
         return os.path.join(output_dir, basename + (self.exe_extension or ''))
 
-    def library_filename (self,
-                          libname,
-                          lib_type='static',     # or 'shared'
-                          strip_dir=0,
-                          output_dir=''):
-
-        if output_dir is None: output_dir = ''
-        if lib_type not in ("static","shared","dylib"):
+    def library_filename(self, libname, lib_type='static',     # or 'shared'
+                         strip_dir=0, output_dir=''):
+        assert output_dir is not None
+        if lib_type not in ("static", "shared", "dylib"):
             raise ValueError, "'lib_type' must be \"static\", \"shared\" or \"dylib\""
-        fmt = getattr (self, lib_type + "_lib_format")
-        ext = getattr (self, lib_type + "_lib_extension")
+        fmt = getattr(self, lib_type + "_lib_format")
+        ext = getattr(self, lib_type + "_lib_extension")
 
-        (dir, base) = os.path.split (libname)
+        dir, base = os.path.split (libname)
         filename = fmt % (base, ext)
         if strip_dir:
             dir = ''
 
-        return os.path.join (output_dir, dir, filename)
+        return os.path.join(output_dir, dir, filename)
 
 
     # -- Utility methods -----------------------------------------------

From 155cee1b86894b12c00e663d6d8172b385700127 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 17:27:13 +0000
Subject: [PATCH 0838/8469] Add depends=None to the arglist for compile().

---
 mwerkscompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 6242f12aa1..1f71c60cea 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -62,7 +62,8 @@ def compile (self,
                  include_dirs=None,
                  debug=0,
                  extra_preargs=None,
-                 extra_postargs=None):
+                 extra_postargs=None,
+                 depends=None):
         (output_dir, macros, include_dirs) = \
            self._fix_compile_args (output_dir, macros, include_dirs)
         self.__sources = sources

From 2c28f1d7b189db2ed88625f504345e19d4be2e08 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 17:28:18 +0000
Subject: [PATCH 0839/8469] Refactor compile() method implementations.

Always use _setup_compile() to do the grunt work of processing
arguments, figuring out which files to compile, and emitting debug
messages for files that are up-to-date.

Use _get_cc_args() when possible.
---
 bcppcompiler.py    | 101 +++++++++++++----------------
 cygwinccompiler.py |  85 +++++++++----------------
 emxccompiler.py    |  69 +++++++-------------
 msvccompiler.py    | 155 ++++++++++++++++++++-------------------------
 unixccompiler.py   |  40 ++++--------
 5 files changed, 178 insertions(+), 272 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 019244cd16..6e9d6c64de 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -80,23 +80,13 @@ def __init__ (self,
 
     # -- Worker methods ------------------------------------------------
 
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
-
-        (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile (sources, output_dir)
-
-        if extra_postargs is None:
-            extra_postargs = []
-
-        pp_opts = gen_preprocess_options (macros, include_dirs)
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+        
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
         compile_opts = extra_preargs or []
         compile_opts.append ('-c')
         if debug:
@@ -104,50 +94,47 @@ def compile (self,
         else:
             compile_opts.extend (self.compile_options)
 
-        for i in range (len (sources)):
-            src = sources[i] ; obj = objects[i]
-            ext = (os.path.splitext (src))[1]
+        for obj, (src, ext) in build.items():
+            # XXX why do the normpath here?
+            src = os.path.normpath(src)
+            obj = os.path.normpath(obj)
+            # XXX _setup_compile() did a mkpath() too but before the normpath.
+            # Is it possible to skip the normpath?
+            self.mkpath(os.path.dirname(obj))
 
-            if skip_sources[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                src = os.path.normpath(src)
-                obj = os.path.normpath(obj)
-                self.mkpath(os.path.dirname(obj))
-
-                if ext == '.res':
-                    # This is already a binary file -- skip it.
-                    continue # the 'for' loop
-                if ext == '.rc':
-                    # This needs to be compiled to a .res file -- do it now.
-                    try:
-                        self.spawn (["brcc32", "-fo", obj, src])
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
-                    continue # the 'for' loop
-
-                # The next two are both for the real compiler.
-                if ext in self._c_extensions:
-                    input_opt = ""
-                elif ext in self._cpp_extensions:
-                    input_opt = "-P"
-                else:
-                    # Unknown file type -- no extra options.  The compiler
-                    # will probably fail, but let it just in case this is a
-                    # file the compiler recognizes even if we don't.
-                    input_opt = ""
-
-                output_opt = "-o" + obj
-
-                # Compiler command line syntax is: "bcc32 [options] file(s)".
-                # Note that the source file names must appear at the end of
-                # the command line.
+            if ext == '.res':
+                # This is already a binary file -- skip it.
+                continue # the 'for' loop
+            if ext == '.rc':
+                # This needs to be compiled to a .res file -- do it now.
                 try:
-                    self.spawn ([self.cc] + compile_opts + pp_opts +
-                                [input_opt, output_opt] +
-                                extra_postargs + [src])
+                    self.spawn (["brcc32", "-fo", obj, src])
                 except DistutilsExecError, msg:
                     raise CompileError, msg
+                continue # the 'for' loop
+
+            # The next two are both for the real compiler.
+            if ext in self._c_extensions:
+                input_opt = ""
+            elif ext in self._cpp_extensions:
+                input_opt = "-P"
+            else:
+                # Unknown file type -- no extra options.  The compiler
+                # will probably fail, but let it just in case this is a
+                # file the compiler recognizes even if we don't.
+                input_opt = ""
+
+            output_opt = "-o" + obj
+
+            # Compiler command line syntax is: "bcc32 [options] file(s)".
+            # Note that the source file names must appear at the end of
+            # the command line.
+            try:
+                self.spawn ([self.cc] + compile_opts + pp_opts +
+                            [input_opt, output_opt] +
+                            extra_postargs + [src])
+            except DistutilsExecError, msg:
+                raise CompileError, msg
 
         return objects
 
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 443c9bcfb7..302293ac25 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -62,10 +62,7 @@ class CygwinCCompiler (UnixCCompiler):
     shared_lib_format = "%s%s"
     exe_extension = ".exe"
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+    def __init__ (self, verbose=0, dry_run=0, force=0):
 
         UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
@@ -74,11 +71,12 @@ def __init__ (self,
                          (status, details))
         if status is not CONFIG_H_OK:
             self.warn(
-                "Python's pyconfig.h doesn't seem to support your compiler.  " +
-                ("Reason: %s." % details) +
-                "Compiling may fail because of undefined preprocessor macros.")
+                "Python's pyconfig.h doesn't seem to support your compiler. " 
+                "Reason: %s. "
+                "Compiling may fail because of undefined preprocessor macros."
+                % details)
 
-        (self.gcc_version, self.ld_version, self.dllwrap_version) = \
+        self.gcc_version, self.ld_version, self.dllwrap_version = \
             get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version,
@@ -120,58 +118,33 @@ def __init__ (self,
     # we put here a adapted version of it.
     # (If we would call compile() in the base class, it would do some
     # initializations a second time, this is why all is done here.)
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
-
-        (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile (sources, output_dir)
-
-        # Figure out the options for the compiler command line.
-        pp_opts = gen_preprocess_options (macros, include_dirs)
-        cc_args = pp_opts + ['-c']
-        if debug:
-            cc_args[:0] = ['-g']
-        if extra_preargs:
-            cc_args[:0] = extra_preargs
-        if extra_postargs is None:
-            extra_postargs = []
-
-        # Compile all source files that weren't eliminated by
-        # '_prep_compile()'.
-        for i in range (len (sources)):
-            src = sources[i] ; obj = objects[i]
-            ext = (os.path.splitext (src))[1]
-            if skip_sources[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                self.mkpath (os.path.dirname (obj))
-                if ext == '.rc' or ext == '.res':
-                    # gcc needs '.res' and '.rc' compiled to object files !!!
-                    try:
-                        self.spawn (["windres","-i",src,"-o",obj])
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
-                else: # for other files use the C-compiler
-                    try:
-                        self.spawn (self.compiler_so + cc_args +
-                                [src, '-o', obj] +
-                                extra_postargs)
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+        
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
+        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
+
+        for obj, (src, ext) in build.items():
+            if ext == '.rc' or ext == '.res':
+                # gcc needs '.res' and '.rc' compiled to object files !!!
+                try:
+                    self.spawn (["windres","-i",src,"-o",obj])
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
+            else: # for other files use the C-compiler
+                try:
+                    self.spawn (self.compiler_so + cc_args +
+                            [src, '-o', obj] +
+                            extra_postargs)
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
 
         # Return *all* object filenames, not just the ones we just built.
         return objects
 
-    # compile ()
-
-
     def link (self,
               target_desc,
               objects,
diff --git a/emxccompiler.py b/emxccompiler.py
index 644c6fc391..c2c73b0dec 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -81,51 +81,30 @@ def __init__ (self,
     # we put here a adapted version of it.
     # (If we would call compile() in the base class, it would do some 
     # initializations a second time, this is why all is done here.)
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
-
-        (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile (sources, output_dir)
-
-        # Figure out the options for the compiler command line.
-        pp_opts = gen_preprocess_options (macros, include_dirs)
-        cc_args = pp_opts + ['-c']
-        if debug:
-            cc_args[:0] = ['-g']
-        if extra_preargs:
-            cc_args[:0] = extra_preargs
-        if extra_postargs is None:
-            extra_postargs = []
-
-        # Compile all source files that weren't eliminated by
-        # '_prep_compile()'.        
-        for i in range (len (sources)):
-            src = sources[i] ; obj = objects[i]
-            ext = (os.path.splitext (src))[1]
-            if skip_sources[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                self.mkpath (os.path.dirname (obj))
-                if ext == '.rc':
-                    # gcc requires '.rc' compiled to binary ('.res') files !!!
-                    try:
-                        self.spawn (["rc","-r",src])
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
-                else: # for other files use the C-compiler 
-                    try:
-                        self.spawn (self.compiler_so + cc_args +
-                                [src, '-o', obj] +
-                                extra_postargs)
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
+
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+        
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
+        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
+
+        for obj, (src, ext) in build.items():
+            if ext == '.rc':
+                # gcc requires '.rc' compiled to binary ('.res') files !!!
+                try:
+                    self.spawn (["rc","-r",src])
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
+            else: # for other files use the C-compiler 
+                try:
+                    self.spawn (self.compiler_so + cc_args +
+                            [src, '-o', obj] +
+                            extra_postargs)
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
 
         # Return *all* object filenames, not just the ones we just built.
         return objects
diff --git a/msvccompiler.py b/msvccompiler.py
index ade8172d3b..8460eea967 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -277,101 +277,84 @@ def object_filenames (self,
     # object_filenames ()
 
 
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None):
-
-        (output_dir, macros, include_dirs) = \
-            self._fix_compile_args (output_dir, macros, include_dirs)
-        (objects, skip_sources) = self._prep_compile (sources, output_dir)
-
-        if extra_postargs is None:
-            extra_postargs = []
-
-        pp_opts = gen_preprocess_options (macros, include_dirs)
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
+
         compile_opts = extra_preargs or []
         compile_opts.append ('/c')
         if debug:
-            compile_opts.extend (self.compile_options_debug)
+            compile_opts.extend(self.compile_options_debug)
         else:
-            compile_opts.extend (self.compile_options)
-
-        for i in range (len (sources)):
-            src = sources[i] ; obj = objects[i]
-            ext = (os.path.splitext (src))[1]
-
-            if skip_sources[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                self.mkpath (os.path.dirname (obj))
+            compile_opts.extend(self.compile_options)
 
-                if debug:
-                    # pass the full pathname to MSVC in debug mode,
-                    # this allows the debugger to find the source file
-                    # without asking the user to browse for it
-                    src = os.path.abspath(src)
-
-                if ext in self._c_extensions:
-                    input_opt = "/Tc" + src
-                elif ext in self._cpp_extensions:
-                    input_opt = "/Tp" + src
-                elif ext in self._rc_extensions:
-                    # compile .RC to .RES file
-                    input_opt = src
-                    output_opt = "/fo" + obj
-                    try:
-                        self.spawn ([self.rc] +
-                                    [output_opt] + [input_opt])
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
-                    continue
-                elif ext in self._mc_extensions:
-
-                    # Compile .MC to .RC file to .RES file.
-                    #   * '-h dir' specifies the directory for the
-                    #     generated include file
-                    #   * '-r dir' specifies the target directory of the
-                    #     generated RC file and the binary message resource
-                    #     it includes
-                    #
-                    # For now (since there are no options to change this),
-                    # we use the source-directory for the include file and
-                    # the build directory for the RC file and message
-                    # resources. This works at least for win32all.
-
-                    h_dir = os.path.dirname (src)
-                    rc_dir = os.path.dirname (obj)
-                    try:
-                        # first compile .MC to .RC and .H file
-                        self.spawn ([self.mc] +
-                                    ['-h', h_dir, '-r', rc_dir] + [src])
-                        base, _ = os.path.splitext (os.path.basename (src))
-                        rc_file = os.path.join (rc_dir, base + '.rc')
-                        # then compile .RC to .RES file
-                        self.spawn ([self.rc] +
-                                    ["/fo" + obj] + [rc_file])
-
-                    except DistutilsExecError, msg:
-                        raise CompileError, msg
-                    continue
-                else:
-                    # how to handle this file?
-                    raise CompileError (
-                        "Don't know how to compile %s to %s" % \
-                        (src, obj))
+        for obj, (src, ext) in build.items():
+            if debug:
+                # pass the full pathname to MSVC in debug mode,
+                # this allows the debugger to find the source file
+                # without asking the user to browse for it
+                src = os.path.abspath(src)
+
+            if ext in self._c_extensions:
+                input_opt = "/Tc" + src
+            elif ext in self._cpp_extensions:
+                input_opt = "/Tp" + src
+            elif ext in self._rc_extensions:
+                # compile .RC to .RES file
+                input_opt = src
+                output_opt = "/fo" + obj
+                try:
+                    self.spawn ([self.rc] +
+                                [output_opt] + [input_opt])
+                except DistutilsExecError, msg:
+                    raise CompileError, msg
+                continue
+            elif ext in self._mc_extensions:
 
-                output_opt = "/Fo" + obj
+                # Compile .MC to .RC file to .RES file.
+                #   * '-h dir' specifies the directory for the
+                #     generated include file
+                #   * '-r dir' specifies the target directory of the
+                #     generated RC file and the binary message resource
+                #     it includes
+                #
+                # For now (since there are no options to change this),
+                # we use the source-directory for the include file and
+                # the build directory for the RC file and message
+                # resources. This works at least for win32all.
+
+                h_dir = os.path.dirname (src)
+                rc_dir = os.path.dirname (obj)
                 try:
-                    self.spawn ([self.cc] + compile_opts + pp_opts +
-                                [input_opt, output_opt] +
-                                extra_postargs)
+                    # first compile .MC to .RC and .H file
+                    self.spawn ([self.mc] +
+                                ['-h', h_dir, '-r', rc_dir] + [src])
+                    base, _ = os.path.splitext (os.path.basename (src))
+                    rc_file = os.path.join (rc_dir, base + '.rc')
+                    # then compile .RC to .RES file
+                    self.spawn ([self.rc] +
+                                ["/fo" + obj] + [rc_file])
+
                 except DistutilsExecError, msg:
                     raise CompileError, msg
+                continue
+            else:
+                # how to handle this file?
+                raise CompileError (
+                    "Don't know how to compile %s to %s" % \
+                    (src, obj))
+
+            output_opt = "/Fo" + obj
+            try:
+                self.spawn ([self.cc] + compile_opts + pp_opts +
+                            [input_opt, output_opt] +
+                            extra_postargs)
+            except DistutilsExecError, msg:
+                raise CompileError, msg
 
         return objects
 
diff --git a/unixccompiler.py b/unixccompiler.py
index abf7a2643b..c887a88226 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -107,35 +107,19 @@ def preprocess(self, source,
 
     def compile(self, sources,
                 output_dir=None, macros=None, include_dirs=None, debug=0,
-                extra_preargs=None, extra_postargs=None):
-        output_dir, macros, include_dirs = \
-            self._fix_compile_args(output_dir, macros, include_dirs)
-        objects, skip_sources = self._prep_compile(sources, output_dir)
+                extra_preargs=None, extra_postargs=None, depends=None):
+        
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
+        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
 
-        # Figure out the options for the compiler command line.
-        pp_opts = gen_preprocess_options(macros, include_dirs)
-        cc_args = pp_opts + ['-c']
-        if debug:
-            cc_args[:0] = ['-g']
-        if extra_preargs:
-            cc_args[:0] = extra_preargs
-        if extra_postargs is None:
-            extra_postargs = []
-
-        # Compile all source files that weren't eliminated by
-        # '_prep_compile()'.
-        for i in range(len(sources)):
-            src = sources[i]
-            obj = objects[i]
-            if skip_sources[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                self.mkpath(os.path.dirname(obj))
-                try:
-                    self.spawn(self.compiler_so + cc_args +
-                               [src, '-o', obj] + extra_postargs)
-                except DistutilsExecError, msg:
-                    raise CompileError, msg
+        for obj, (src, ext) in build.items():
+            try:
+                self.spawn(self.compiler_so + cc_args +
+                           [src, '-o', obj] + extra_postargs)
+            except DistutilsExecError, msg:
+                raise CompileError, msg
 
         # Return *all* object filenames, not just the ones we just built.
         return objects

From 2c0f494c5782d2208257d403c1e4eecef2ef3305 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 13 Jun 2002 17:32:20 +0000
Subject: [PATCH 0840/8469] Extend dependency tracking so that .o files are
 rebuilt.

Two new tests are needed:

Don't skip building an extension if any of the depends files are newer
than the target.

Pass ext.depends to compiler.compile() so that it can track individual
files.
---
 command/build_ext.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 21dd0dcd6e..943f30a4fb 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -388,7 +388,6 @@ def get_outputs (self):
     # get_outputs ()
 
     def build_extensions(self):
-
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
 
@@ -396,7 +395,6 @@ def build_extensions(self):
             self.build_extension(ext)
 
     def build_extension(self, ext):
-
         sources = ext.sources
         if sources is None or type(sources) not in (ListType, TupleType):
             raise DistutilsSetupError, \
@@ -421,7 +419,6 @@ def build_extension(self, ext):
         else:
             ext_filename = os.path.join(self.build_lib,
                                         self.get_ext_filename(fullname))
-
         depends = sources + ext.depends
         if not (self.force or newer_group(depends, ext_filename, 'newer')):
             log.debug("skipping '%s' extension (up-to-date)", ext.name)
@@ -467,7 +464,8 @@ def build_extension(self, ext):
                                         macros=macros,
                                         include_dirs=ext.include_dirs,
                                         debug=self.debug,
-                                        extra_postargs=extra_args)
+                                        extra_postargs=extra_args,
+                                        depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #

From 39105a6df67fb823a7f86283f0b514cccb7d708c Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 18 Jun 2002 18:40:54 +0000
Subject: [PATCH 0841/8469] Only import msvccompiler on win32 platforms.

---
 command/build_ext.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 943f30a4fb..6b6f2c7d57 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -624,17 +624,17 @@ def get_libraries (self, ext):
         # pyconfig.h that MSVC groks.  The other Windows compilers all seem
         # to need it mentioned explicitly, though, so that's what we do.
         # Append '_d' to the python import library on debug builds.
-        from distutils.msvccompiler import MSVCCompiler
-        if sys.platform == "win32" and \
-           not isinstance(self.compiler, MSVCCompiler):
-            template = "python%d%d"
-            if self.debug:
-                template = template + '_d'
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib]
+        if sys.platform == "win32":
+            from distutils.msvccompiler import MSVCCompiler
+            if not isinstance(self.compiler, MSVCCompiler):
+                template = "python%d%d"
+                if self.debug:
+                    template = template + '_d'
+                pythonlib = (template %
+                       (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+                # don't extend ext.libraries, it may be shared with other
+                # extensions, it is a reference to the original list
+                return ext.libraries + [pythonlib]
         elif sys.platform == "os2emx":
             # EMX/GCC requires the python library explicitly, and I
             # believe VACPP does as well (though not confirmed) - AIM Apr01

From 34d756600f62023716bf0d11c1d4df69fe434199 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 18 Jun 2002 18:42:41 +0000
Subject: [PATCH 0842/8469] Add a default implementation of compile() to the
 base class.

The default implementation calls _compile() to compile individual
files.  This method must be implemented by the subclass.  This change
factors out most of the remaining common code in all the compilers
except mwerks.
---
 ccompiler.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 50246b8961..f1a50cbddc 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -644,8 +644,27 @@ def compile(self, sources, output_dir=None, macros=None,
 
         Raises CompileError on failure.
         """
-        pass
 
+        # A concrete compiler class can either override this method
+        # entirely or implement _compile().
+        
+        macros, objects, extra_postargs, pp_opts, build = \
+                self._setup_compile(output_dir, macros, include_dirs, sources,
+                                    depends, extra_postargs)
+        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
+
+        for obj, (src, ext) in build.items():
+            self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
+
+        # Return *all* object filenames, not just the ones we just built.
+        return objects
+
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        """Compile 'src' to product 'obj'."""
+        
+        # A concrete compiler class that does not override compile()
+        # should implement _compile().
+        pass
 
     def create_static_lib (self,
                            objects,

From 0fac9b6c9635aa053f92312b8a489ab8b2fc502f Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 18 Jun 2002 18:48:55 +0000
Subject: [PATCH 0843/8469] Add implementation of _compile() and use default
 compile() method.

---
 cygwinccompiler.py | 45 ++++++++++++++-----------------------------
 emxccompiler.py    | 48 +++++++++++++---------------------------------
 unixccompiler.py   | 24 ++++++-----------------
 3 files changed, 33 insertions(+), 84 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 302293ac25..9aabd8a66b 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -113,37 +113,20 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
 
     # __init__ ()
 
-    # not much different of the compile method in UnixCCompiler,
-    # but we have to insert some lines in the middle of it, so
-    # we put here a adapted version of it.
-    # (If we would call compile() in the base class, it would do some
-    # initializations a second time, this is why all is done here.)
-    def compile(self, sources,
-                output_dir=None, macros=None, include_dirs=None, debug=0,
-                extra_preargs=None, extra_postargs=None, depends=None):
-        
-        macros, objects, extra_postargs, pp_opts, build = \
-                self._setup_compile(output_dir, macros, include_dirs, sources,
-                                    depends, extra_postargs)
-        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
-
-        for obj, (src, ext) in build.items():
-            if ext == '.rc' or ext == '.res':
-                # gcc needs '.res' and '.rc' compiled to object files !!!
-                try:
-                    self.spawn (["windres","-i",src,"-o",obj])
-                except DistutilsExecError, msg:
-                    raise CompileError, msg
-            else: # for other files use the C-compiler
-                try:
-                    self.spawn (self.compiler_so + cc_args +
-                            [src, '-o', obj] +
-                            extra_postargs)
-                except DistutilsExecError, msg:
-                    raise CompileError, msg
-
-        # Return *all* object filenames, not just the ones we just built.
-        return objects
+
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        if ext == '.rc' or ext == '.res':
+            # gcc needs '.res' and '.rc' compiled to object files !!!
+            try:
+                self.spawn(["windres", "-i", src, "-o", obj])
+            except DistutilsExecError, msg:
+                raise CompileError, msg
+        else: # for other files use the C-compiler
+            try:
+                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+                           extra_postargs)
+            except DistutilsExecError, msg:
+                raise CompileError, msg
 
     def link (self,
               target_desc,
diff --git a/emxccompiler.py b/emxccompiler.py
index c2c73b0dec..2dc4fbd091 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -76,41 +76,19 @@ def __init__ (self,
         
     # __init__ ()
 
-    # not much different of the compile method in UnixCCompiler,
-    # but we have to insert some lines in the middle of it, so
-    # we put here a adapted version of it.
-    # (If we would call compile() in the base class, it would do some 
-    # initializations a second time, this is why all is done here.)
-
-    def compile(self, sources,
-                output_dir=None, macros=None, include_dirs=None, debug=0,
-                extra_preargs=None, extra_postargs=None, depends=None):
-        
-        macros, objects, extra_postargs, pp_opts, build = \
-                self._setup_compile(output_dir, macros, include_dirs, sources,
-                                    depends, extra_postargs)
-        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
-
-        for obj, (src, ext) in build.items():
-            if ext == '.rc':
-                # gcc requires '.rc' compiled to binary ('.res') files !!!
-                try:
-                    self.spawn (["rc","-r",src])
-                except DistutilsExecError, msg:
-                    raise CompileError, msg
-            else: # for other files use the C-compiler 
-                try:
-                    self.spawn (self.compiler_so + cc_args +
-                            [src, '-o', obj] +
-                            extra_postargs)
-                except DistutilsExecError, msg:
-                    raise CompileError, msg
-
-        # Return *all* object filenames, not just the ones we just built.
-        return objects
-
-    # compile ()
-
+    def _compile(self, obj, src, ext, cc_args, extra_postargs):
+        if ext == '.rc':
+            # gcc requires '.rc' compiled to binary ('.res') files !!!
+            try:
+                self.spawn(["rc", "-r", src])
+            except DistutilsExecError, msg:
+                raise CompileError, msg
+        else: # for other files use the C-compiler 
+            try:
+                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+                           extra_postargs)
+            except DistutilsExecError, msg:
+                raise CompileError, msg
 
     def link (self,
               target_desc,
diff --git a/unixccompiler.py b/unixccompiler.py
index c887a88226..d94c384092 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -105,24 +105,12 @@ def preprocess(self, source,
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
-    def compile(self, sources,
-                output_dir=None, macros=None, include_dirs=None, debug=0,
-                extra_preargs=None, extra_postargs=None, depends=None):
-        
-        macros, objects, extra_postargs, pp_opts, build = \
-                self._setup_compile(output_dir, macros, include_dirs, sources,
-                                    depends, extra_postargs)
-        cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
-
-        for obj, (src, ext) in build.items():
-            try:
-                self.spawn(self.compiler_so + cc_args +
-                           [src, '-o', obj] + extra_postargs)
-            except DistutilsExecError, msg:
-                raise CompileError, msg
-
-        # Return *all* object filenames, not just the ones we just built.
-        return objects
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        try:
+            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+                       extra_postargs)
+        except DistutilsExecError, msg:
+            raise CompileError, msg
 
     def create_static_lib(self, objects, output_libname,
                           output_dir=None, debug=0):

From 38242c6fdae57a47aeb70eda52f3b6f2b651900d Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 18 Jun 2002 19:08:40 +0000
Subject: [PATCH 0844/8469] Define NDEBUG for releae builds, just like Python.

XXX Why doesn't distutils on Windows use the same set of flags as Python?
---
 msvccompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 8460eea967..65b114353e 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -233,7 +233,8 @@ def __init__ (self,
             self.mc = "mc.exe"
 
         self.preprocess_options = None
-        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ]
+        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ,
+                                 '/DNDEBUG']
         self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GX',
                                       '/Z7', '/D_DEBUG']
 

From a0559d181e1cc8a522f7d416edde440d306b4818 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 26 Jun 2002 15:00:29 +0000
Subject: [PATCH 0845/8469] This module broke on the Mac (where it can't work,
 but distutils seems to import it anyway) because it imported pwd and grp.
 Moved the import to inside the routine where they're used.

---
 command/bdist_pkgtool.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
index 51b89d978e..3b8ca2d2e7 100644
--- a/command/bdist_pkgtool.py
+++ b/command/bdist_pkgtool.py
@@ -6,7 +6,7 @@
 Implements the Distutils 'bdist_pkgtool' command (create Solaris pkgtool
 distributions)."""
 
-import os, string, sys, pwd, grp
+import os, string, sys
 from types import *
 from distutils.util import get_platform
 from distutils.file_util import write_file
@@ -281,6 +281,7 @@ def run (self):
 
 
     def _make_prototype(self):
+        import pwd, grp
         proto_file = ["i pkginfo"]
         if self.request:
             proto_file.extend(['i request'])

From 88e0aef39dbc5f117ac936aa266650e7f6ab7079 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 26 Jun 2002 15:42:49 +0000
Subject: [PATCH 0846/8469] Fixed various MacPython-specific issues found by
 attempting to use the standard core setup.py for MacPython.

---
 mwerkscompiler.py | 34 +++++++++++++++++++++++++++++++---
 sysconfig.py      |  7 ++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 1f71c60cea..5f567b9989 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -161,7 +161,7 @@ def link (self,
             return
         # Build the export file
         exportfilename = os.path.join(build_temp, exportname)
-        log.debug("\tCreate export file", exportfilename)
+        log.debug("\tCreate export file %s", exportfilename)
         fp = open(exportfilename, 'w')
         fp.write('%s\n'%export_symbols[0])
         fp.close()
@@ -182,7 +182,7 @@ def link (self,
         # because we pass this pathname to CodeWarrior in an AppleEvent, and CW
         # doesn't have a clue about our working directory.
         xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
-        log.debug("\tCreate XML file", xmlfilename)
+        log.debug("\tCreate XML file %s", xmlfilename)
         xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
         xmlbuilder.generate()
         xmldata = settings['tmp_projectxmldata']
@@ -191,7 +191,7 @@ def link (self,
         fp.close()
         # Generate the project. Again a full pathname.
         projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
-        log.debug('\tCreate project file', projectfilename)
+        log.debug('\tCreate project file %s', projectfilename)
         mkcwproject.makeproject(xmlfilename, projectfilename)
         # And build it
         log.debug('\tBuild project')
@@ -213,3 +213,31 @@ def _filename_to_abs(self, filename):
             if components[i] == '..':
                 components[i] = ''
         return string.join(components, ':')
+
+    def library_dir_option (self, dir):
+        """Return the compiler option to add 'dir' to the list of
+        directories searched for libraries.
+        """
+        return # XXXX Not correct...
+
+    def runtime_library_dir_option (self, dir):
+        """Return the compiler option to add 'dir' to the list of
+        directories searched for runtime libraries.
+        """
+        # Nothing needed or Mwerks/Mac.
+        return
+
+    def library_option (self, lib):
+        """Return the compiler option to add 'dir' to the list of libraries
+        linked into the shared library or executable.
+        """
+        return
+
+    def find_library_file (self, dirs, lib, debug=0):
+        """Search the specified list of directories for a static or shared
+        library file 'lib' and return the full path to that file.  If
+        'debug' true, look for a debugging version (if that makes sense on
+        the current platform).  Return None if 'lib' wasn't found in any of
+        the specified directories.
+        """
+        return 0
diff --git a/sysconfig.py b/sysconfig.py
index 847b87240b..74394abc5a 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -66,7 +66,10 @@ def get_python_inc(plat_specific=0, prefix=None):
     elif os.name == "nt":
         return os.path.join(prefix, "include")
     elif os.name == "mac":
-        return os.path.join(prefix, "Include")
+    	if plat_specific:
+    		return os.path.join(prefix, "Mac", "Include")
+    	else:
+	        return os.path.join(prefix, "Include")
     elif os.name == "os2":
         return os.path.join(prefix, "Include")
     else:
@@ -403,6 +406,8 @@ def _init_mac():
     g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
     g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
 
+    # These are used by the extension module build
+    g['srcdir'] = ':'
     global _config_vars
     _config_vars = g
 

From a88699b8cec97f6868dbde077637389919a41ae7 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 26 Jun 2002 22:05:33 +0000
Subject: [PATCH 0847/8469] Whitespace normalization (remove tabs)

---
 sysconfig.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 74394abc5a..e9b728eac8 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -66,10 +66,10 @@ def get_python_inc(plat_specific=0, prefix=None):
     elif os.name == "nt":
         return os.path.join(prefix, "include")
     elif os.name == "mac":
-    	if plat_specific:
-    		return os.path.join(prefix, "Mac", "Include")
-    	else:
-	        return os.path.join(prefix, "Include")
+        if plat_specific:
+                return os.path.join(prefix, "Mac", "Include")
+        else:
+                return os.path.join(prefix, "Include")
     elif os.name == "os2":
         return os.path.join(prefix, "Include")
     else:

From 04369bde233174b17d0d9494125511641c3e69f9 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 27 Jun 2002 22:10:19 +0000
Subject: [PATCH 0848/8469] The standard definition file is now called
 mwerks_shcarbon_plugin.h.

---
 mwerkscompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 5f567b9989..cd66a09913 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -169,7 +169,7 @@ def link (self,
         if self.__macros:
             prefixfilename = os.path.join(os.getcwd(), os.path.join(build_temp, prefixname))
             fp = open(prefixfilename, 'w')
-            fp.write('#include "mwerks_plugin_config.h"\n')
+            fp.write('#include "mwerks_shcarbon_config.h"\n')
             for name, value in self.__macros:
                 if value is None:
                     fp.write('#define %s\n'%name)

From b15291038df11afa687d1e12480e0901a6567ed4 Mon Sep 17 00:00:00 2001
From: "Michael W. Hudson" <mwh@python.net>
Date: Fri, 12 Jul 2002 09:16:44 +0000
Subject: [PATCH 0849/8469] Well, Fred never did explain why the code to
 determine whether the calling Python was installed was so complicated, so I
 simplified it.

This should get the snake-farm's build scripts working again.
---
 sysconfig.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index e9b728eac8..48672d6a10 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -29,13 +29,9 @@
 
 argv0_path = os.path.dirname(os.path.abspath(sys.executable))
 landmark = os.path.join(argv0_path, "Modules", "Setup")
-if not os.path.isfile(landmark):
-    python_build = 0
-elif os.path.isfile(os.path.join(argv0_path, "Lib", "os.py")):
-    python_build = 1
-else:
-    python_build = os.path.isfile(os.path.join(os.path.dirname(argv0_path),
-                                               "Lib", "os.py"))
+
+python_build = os.path.isfile(landmark)
+
 del argv0_path, landmark
 
 

From 3f0272e6f1efa1a3e4faf5afbf1bdc830ecf404f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 28 Jul 2002 10:49:37 +0000
Subject: [PATCH 0850/8469] Patch #543498: Use License: field instead of
 Copyright:.

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 808ddc14cb..dd9dc66108 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -348,7 +348,7 @@ def _make_spec_file(self):
             spec_file.append('Source0: %{name}-%{version}.tar.gz')
 
         spec_file.extend([
-            'Copyright: ' + self.distribution.get_license(),
+            'License: ' + self.distribution.get_license(),
             'Group: ' + self.group,
             'BuildRoot: %{_tmppath}/%{name}-buildroot',
             'Prefix: %{_prefix}', ])

From 9ffafc4502cbaf28984a9eb1fa3191b70607a678 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 29 Jul 2002 12:11:18 +0000
Subject: [PATCH 0851/8469] Recompiled the exe and updated bdist_wininst.py.

---
 command/bdist_wininst.py | 677 ++++++++++++++++++++-------------------
 1 file changed, 343 insertions(+), 334 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index f018f4616f..71e51bfd37 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -261,356 +261,365 @@ def get_exe_bytes (self):
 
 EXEDATA = """\
 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
-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
+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
-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
+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
-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
+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
-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
+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
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAgAAACAAAIAFAAAAYAAAgAAAAAAA
-AAAAAAAAAAAAAQBuAAAAOAAAgAAAAAAAAAAAAAAAAAAAAQAAAAAAUAAAADDBAAAICgAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAQAawAAAJAAAIBsAAAAuAAAgG0AAADgAACAbgAAAAgBAIAAAAAAAAAA
-AAAAAAAAAAEACQQAAKgAAAA4ywAAoAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAADQAAAA
-2MwAAAQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA+AAAAODOAABaAgAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAEACQQAACABAABA0QAAFAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAIBANAB
-AQAAAAAAAAAAAAAAAAAdAgEA4AEBAAAAAAAAAAAAAAAAACoCAQDoAQEAAAAAAAAAAAAAAAAANwIB
-APABAQAAAAAAAAAAAAAAAABBAgEA+AEBAAAAAAAAAAAAAAAAAEwCAQAAAgEAAAAAAAAAAAAAAAAA
-VgIBAAgCAQAAAAAAAAAAAAAAAAAAAAAAAAAAAGACAQBuAgEAfgIBAAAAAACMAgEAAAAAAJoCAQAA
-AAAAqgIBAAAAAAC0AgEAAAAAALoCAQAAAAAAyAIBAAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIu
-ZGxsAENPTUNUTDMyLmRsbABHREkzMi5kbGwATVNWQ1JULmRsbABvbGUzMi5kbGwAVVNFUjMyLmRs
-bAAATG9hZExpYnJhcnlBAABHZXRQcm9jQWRkcmVzcwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtl
-eQAAAFByb3BlcnR5U2hlZXRBAABUZXh0T3V0QQAAZXhpdAAAQ29Jbml0aWFsaXplAABHZXREQwAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgACAAAAIAAAgAUAAABgAACAAAAAAAAA
+AAAAAAAAAAABAG4AAAA4AACAAAAAAAAAAAAAAAAAAAABAAAAAABQAAAAMNEAAAgKAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAABABrAAAAkAAAgGwAAAC4AACAbQAAAOAAAIBuAAAACAEAgAAAAAAAAAAA
+AAAAAAAAAQAJBAAAqAAAADjbAACgAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAANAAAADY
+3AAABAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAkEAAD4AAAA4N4AAFoCAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAQAJBAAAIAEAAEDhAAAUAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsEgEA5BEB
+AAAAAAAAAAAAAAAAADkSAQD0EQEAAAAAAAAAAAAAAAAARhIBAPwRAQAAAAAAAAAAAAAAAABTEgEA
+BBIBAAAAAAAAAAAAAAAAAF0SAQAMEgEAAAAAAAAAAAAAAAAAaBIBABQSAQAAAAAAAAAAAAAAAABy
+EgEAHBIBAAAAAAAAAAAAAAAAAH4SAQAkEgEAAAAAAAAAAAAAAAAAAAAAAAAAAACIEgEAlhIBAKYS
+AQAAAAAAtBIBAAAAAADCEgEAAAAAANISAQAAAAAA3BIBAAAAAADiEgEAAAAAAPASAQAAAAAAChMB
+AAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkzMi5kbGwATVNW
+Q1JULmRsbABvbGUzMi5kbGwAU0hFTEwzMi5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABH
+ZXRQcm9jQWRkcmVzcwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRB
+AABUZXh0T3V0QQAAZXhpdAAAQ29Jbml0aWFsaXplAABTSEdldFNwZWNpYWxGb2xkZXJQYXRoQQAA
+AEdldERDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAA=
 """
 
 # --- EOF ---

From c715e1d18cfc2b74b8728ab418cb7dc9d7433bdf Mon Sep 17 00:00:00 2001
From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Sun, 4 Aug 2002 06:17:08 +0000
Subject: [PATCH 0852/8469] add parameter missing following Jeremy's compiler
 class refactoring

---
 emxccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emxccompiler.py b/emxccompiler.py
index 2dc4fbd091..91920eb366 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -76,7 +76,7 @@ def __init__ (self,
         
     # __init__ ()
 
-    def _compile(self, obj, src, ext, cc_args, extra_postargs):
+    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         if ext == '.rc':
             # gcc requires '.rc' compiled to binary ('.res') files !!!
             try:

From 3dcfe36f1c82f73bfad7d1eb3c3c8188de577415 Mon Sep 17 00:00:00 2001
From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Sun, 4 Aug 2002 06:21:25 +0000
Subject: [PATCH 0853/8469] - comment improvement - implement viable library
 search routine for EMX

---
 emxccompiler.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/emxccompiler.py b/emxccompiler.py
index 91920eb366..9cd9600c0e 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -177,7 +177,8 @@ def link (self,
 
     # -- Miscellaneous methods -----------------------------------------
 
-    # overwrite the one from CCompiler to support rc and res-files
+    # override the object_filenames method from CCompiler to
+    # support rc and res-files
     def object_filenames (self,
                           source_filenames,
                           strip_dir=0,
@@ -204,6 +205,29 @@ def object_filenames (self,
 
     # object_filenames ()
 
+    # override the find_library_file method from UnixCCompiler
+    # to deal with file naming/searching differences
+    def find_library_file(self, dirs, lib, debug=0):
+        shortlib = '%s.lib' % lib
+        longlib = 'lib%s.lib' % lib    # this form very rare
+
+        # get EMX's default library directory search path
+        try:
+            emx_dirs = os.environ['LIBRARY_PATH'].split(';')
+        except KeyError:
+            emx_dirs = []
+	
+        for dir in dirs + emx_dirs:
+            shortlibp = os.path.join(dir, shortlib)
+            longlibp = os.path.join(dir, longlib)
+            if os.path.exists(shortlibp):
+                return shortlibp
+            elif os.path.exists(longlibp):
+                return longlibp
+            
+        # Oops, didn't find it in *any* of 'dirs'
+        return None
+
 # class EMXCCompiler
 
 

From cec536c16d4f1efa7f0ee0c2cb56805f9aac6b69 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 9 Aug 2002 16:38:32 +0000
Subject: [PATCH 0854/8469] Massive changes from SF 589982 (tempfile.py
 rewrite, by Zack Weinberg).  This changes all uses of deprecated tempfile
 functions to the recommended ones.

---
 command/bdist_wininst.py | 7 ++++---
 util.py                  | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 71e51bfd37..b538319881 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -130,8 +130,9 @@ def run (self):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
-        from tempfile import mktemp
-        archive_basename = mktemp()
+        from tempfile import NamedTemporaryFile
+        arc = NamedTemporaryFile(".zip")
+        archive_basename = arc.name[:-4]
         fullname = self.distribution.get_fullname()
         arcname = self.make_archive(archive_basename, "zip",
                                     root_dir=self.bdist_dir)
@@ -139,7 +140,7 @@ def run (self):
         self.create_exe(arcname, fullname, self.bitmap)
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
-        os.remove(arcname)
+        arc.close()
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
diff --git a/util.py b/util.py
index 23c29ebb2a..d9c622487c 100644
--- a/util.py
+++ b/util.py
@@ -359,11 +359,11 @@ def byte_compile (py_files,
     # "Indirect" byte-compilation: write a temporary script and then
     # run it with the appropriate flags.
     if not direct:
-        from tempfile import mktemp
-        script_name = mktemp(".py")
+        from tempfile import mkstemp
+        (script_fd, script_name) = mkstemp(".py")
         log.info("writing byte-compilation script '%s'", script_name)
         if not dry_run:
-            script = open(script_name, "w")
+            script = os.fdopen(script_fd, "w")
 
             script.write("""\
 from distutils.util import byte_compile

From cf18671a7339251d55d6fcec6653e359574c2599 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 13 Aug 2002 17:42:57 +0000
Subject: [PATCH 0855/8469] SF bug #574235, convert_path fails with empty
 pathname

---
 util.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index d9c622487c..8d22415496 100644
--- a/util.py
+++ b/util.py
@@ -84,9 +84,11 @@ def convert_path (pathname):
     """
     if os.sep == '/':
         return pathname
-    if pathname and pathname[0] == '/':
+    if not pathname:
+        return pathname
+    if pathname[0] == '/':
         raise ValueError, "path '%s' cannot be absolute" % pathname
-    if pathname and pathname[-1] == '/':
+    if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
 
     paths = string.split(pathname, '/')

From 6dddf6bec77b5dcf69da39d556471f094eb8ecd8 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 9 Sep 2002 12:10:00 +0000
Subject: [PATCH 0856/8469] Include an empty body when checking for a header
 file

(Bugfix candidate for 2.2, and likely 2.1 as well)
---
 command/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/config.py b/command/config.py
index d74aa6a277..88b1586607 100644
--- a/command/config.py
+++ b/command/config.py
@@ -346,7 +346,8 @@ def check_header (self, header, include_dirs=None,
         exists and can be found by the preprocessor; return true if so,
         false otherwise.
         """
-        return self.try_cpp(headers=[header], include_dirs=include_dirs)
+        return self.try_cpp(body="/* No body */", headers=[header],
+                            include_dirs=include_dirs)
 
 
 # class config

From 23ad69adc2c9dd95e91445962900405da7115026 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 9 Sep 2002 12:16:58 +0000
Subject: [PATCH 0857/8469] The .preprocess() method didn't work, because it
 didn't add the input file     to the command-line arguments.  Fix this by
 adding the source filename.

---
 unixccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index d94c384092..831717baca 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -92,6 +92,7 @@ def preprocess(self, source,
             pp_args[:0] = extra_preargs
         if extra_postargs:
             pp_args.extend(extra_postargs)
+        pp_args.append(source)
 
         # We need to preprocess: either we're being forced to, or we're
         # generating output to stdout, or there's a target output file and

From dfe0dcd95667389986923e0815e82009a3137729 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 11 Sep 2002 16:28:52 +0000
Subject: [PATCH 0858/8469] Define DEBUG in a separate module to resolve
 circular references.

---
 debug.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 debug.py

diff --git a/debug.py b/debug.py
new file mode 100644
index 0000000000..7ca76d6c5c
--- /dev/null
+++ b/debug.py
@@ -0,0 +1,6 @@
+import os
+
+# If DISTUTILS_DEBUG is anything other than the empty string, we run in
+# debug mode.
+DEBUG = os.environ.get('DISTUTILS_DEBUG')
+

From 788c442e3f321f5824f388132538e2cc1350fb35 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 11 Sep 2002 16:31:53 +0000
Subject: [PATCH 0859/8469] Use distutils.debug.DEBUG instead of
 distutils.core.DEBUG.

Note that distutils.core.DEBUG still works if client code uses it, but
the core code avoids circular references by using distutils.debug.
---
 ccompiler.py         | 2 +-
 cmd.py               | 2 +-
 command/bdist_rpm.py | 3 ++-
 command/install.py   | 3 ++-
 core.py              | 6 +-----
 dist.py              | 2 +-
 filelist.py          | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index f1a50cbddc..5a0641ea5c 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -923,7 +923,7 @@ def announce (self, msg, level=1):
         log.debug(msg)
 
     def debug_print (self, msg):
-        from distutils.core import DEBUG
+        from distutils.debug import DEBUG
         if DEBUG:
             print msg
 
diff --git a/cmd.py b/cmd.py
index 25ff3025b6..6a268184c0 100644
--- a/cmd.py
+++ b/cmd.py
@@ -198,7 +198,7 @@ def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
-        from distutils.core import DEBUG
+        from distutils.debug import DEBUG
         if DEBUG:
             print msg
             sys.stdout.flush()
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index dd9dc66108..bbaad7dc7b 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -10,7 +10,8 @@
 import sys, os, string
 import glob
 from types import *
-from distutils.core import Command, DEBUG
+from distutils.core import Command
+from distutils.debug import DEBUG
 from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *
diff --git a/command/install.py b/command/install.py
index 322177f441..67f37893f5 100644
--- a/command/install.py
+++ b/command/install.py
@@ -10,7 +10,8 @@
 
 import sys, os, string
 from types import *
-from distutils.core import Command, DEBUG
+from distutils.core import Command
+from distutils.debug import DEBUG
 from distutils.sysconfig import get_config_vars
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
diff --git a/core.py b/core.py
index 8a348ce3e5..9a6bff6b55 100644
--- a/core.py
+++ b/core.py
@@ -13,10 +13,7 @@
 import sys, os
 from types import *
 
-# If DISTUTILS_DEBUG is anything other than the empty string, we run in
-# debug mode.
-DEBUG = os.environ.get('DISTUTILS_DEBUG')
-
+from distutils.debug import DEBUG
 from distutils.errors import *
 from distutils.util import grok_environment_error
 
@@ -25,7 +22,6 @@
 from distutils.cmd import Command
 from distutils.extension import Extension
 
-
 # This is a barebones help message generated displayed when the user
 # runs the setup script with no arguments at all.  More useful help
 # is generated with various --help options: global help, list commands,
diff --git a/dist.py b/dist.py
index f995d58e9a..92cb8320da 100644
--- a/dist.py
+++ b/dist.py
@@ -16,7 +16,7 @@
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 from distutils import log
-from distutils.core import DEBUG
+from distutils.debug import DEBUG
 
 # Regex to define acceptable Distutils command names.  This is not *quite*
 # the same as a Python NAME -- I don't allow leading underscores.  The fact
diff --git a/filelist.py b/filelist.py
index e2e2457c8b..b4f3269cf1 100644
--- a/filelist.py
+++ b/filelist.py
@@ -54,7 +54,7 @@ def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
-        from distutils.core import DEBUG
+        from distutils.debug import DEBUG
         if DEBUG:
             print msg
 

From 1e573796bb675500c52d99361415982b0f40f193 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sun, 29 Sep 2002 00:25:51 +0000
Subject: [PATCH 0860/8469] Whitespace normalization (get rid of tabs).

---
 emxccompiler.py | 57 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/emxccompiler.py b/emxccompiler.py
index 9cd9600c0e..7c3ad025bb 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -16,7 +16,7 @@
 #   of Python is only distributed with threads enabled.
 #
 # tested configurations:
-#   
+#
 # * EMX gcc 2.81/EMX 0.9d fix03
 
 # created 2001/5/7, Andrew MacIntyre, from Rene Liebscher's cywinccompiler.py
@@ -40,7 +40,7 @@ class EMXCCompiler (UnixCCompiler):
     shared_lib_format = "%s%s"
     res_extension = ".res"      # compiled resource file
     exe_extension = ".exe"
-   
+
     def __init__ (self,
                   verbose=0,
                   dry_run=0,
@@ -56,11 +56,11 @@ def __init__ (self,
                 "Python's pyconfig.h doesn't seem to support your compiler.  " +
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
-        
+
         (self.gcc_version, self.ld_version) = \
             get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
-                         (self.gcc_version, 
+                         (self.gcc_version,
                           self.ld_version) )
 
         # Hard-code GCC because that's what this is all about.
@@ -73,7 +73,7 @@ def __init__ (self,
         # want the gcc library statically linked (so that we don't have
         # to distribute a version dependent on the compiler we have)
         self.dll_libraries=["gcc"]
-        
+
     # __init__ ()
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
@@ -83,7 +83,7 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
                 self.spawn(["rc", "-r", src])
             except DistutilsExecError, msg:
                 raise CompileError, msg
-        else: # for other files use the C-compiler 
+        else: # for other files use the C-compiler
             try:
                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                            extra_postargs)
@@ -103,12 +103,12 @@ def link (self,
               extra_preargs=None,
               extra_postargs=None,
               build_temp=None):
-        
+
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
         objects = copy.copy(objects or [])
-                
+
         # Additional libraries
         libraries.extend(self.dll_libraries)
 
@@ -118,10 +118,10 @@ def link (self,
             (target_desc != self.EXECUTABLE)):
             # (The linker doesn't do anything if output is up-to-date.
             # So it would probably better to check if we really need this,
-            # but for this we had to insert some unchanged parts of 
-            # UnixCCompiler, and this is not what we want.) 
+            # but for this we had to insert some unchanged parts of
+            # UnixCCompiler, and this is not what we want.)
 
-            # we want to put some files in the same directory as the 
+            # we want to put some files in the same directory as the
             # object files are, build_temp doesn't help much
             # where are the object files
             temp_dir = os.path.dirname(objects[0])
@@ -131,7 +131,7 @@ def link (self,
 
             # generate the filenames for these files
             def_file = os.path.join(temp_dir, dll_name + ".def")
-       
+
             # Generate .def file
             contents = [
                 "LIBRARY %s INITINSTANCE TERMINSTANCE" % \
@@ -144,21 +144,21 @@ def link (self,
                          "writing %s" % def_file)
 
             # next add options for def-file and to creating import libraries
-            # for gcc/ld the def-file is specified as any other object files    
+            # for gcc/ld the def-file is specified as any other object files
             objects.append(def_file)
 
         #end: if ((export_symbols is not None) and
         #        (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
-                                                 
+
         # who wants symbols and a many times larger output file
-        # should explicitly switch the debug mode on 
+        # should explicitly switch the debug mode on
         # otherwise we let dllwrap/ld strip the output file
-        # (On my machine: 10KB < stripped_file < ??100KB 
+        # (On my machine: 10KB < stripped_file < ??100KB
         #   unstripped_file = stripped_file + XXX KB
-        #  ( XXX=254 for a typical python extension)) 
-        if not debug: 
-            extra_preargs.append("-s") 
-        
+        #  ( XXX=254 for a typical python extension))
+        if not debug:
+            extra_preargs.append("-s")
+
         UnixCCompiler.link(self,
                            target_desc,
                            objects,
@@ -172,7 +172,7 @@ def link (self,
                            extra_preargs,
                            extra_postargs,
                            build_temp)
-        
+
     # link ()
 
     # -- Miscellaneous methods -----------------------------------------
@@ -196,7 +196,7 @@ def object_filenames (self,
                 base = os.path.basename (base)
             if ext == '.rc':
                 # these need to be compiled to object files
-                obj_names.append (os.path.join (output_dir, 
+                obj_names.append (os.path.join (output_dir,
                                             base + self.res_extension))
             else:
                 obj_names.append (os.path.join (output_dir,
@@ -216,7 +216,7 @@ def find_library_file(self, dirs, lib, debug=0):
             emx_dirs = os.environ['LIBRARY_PATH'].split(';')
         except KeyError:
             emx_dirs = []
-	
+
         for dir in dirs + emx_dirs:
             shortlibp = os.path.join(dir, shortlib)
             longlibp = os.path.join(dir, longlib)
@@ -224,7 +224,7 @@ def find_library_file(self, dirs, lib, debug=0):
                 return shortlibp
             elif os.path.exists(longlibp):
                 return longlibp
-            
+
         # Oops, didn't find it in *any* of 'dirs'
         return None
 
@@ -266,15 +266,15 @@ def check_config_h():
     # GCC, and the pyconfig.h file should be OK
     if string.find(sys.version,"GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
-    
+
     fn = sysconfig.get_config_h_filename()
     try:
         # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough 
+        # But we do this only once, and it is fast enough
         f = open(fn)
         s = f.read()
         f.close()
-        
+
     except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
@@ -296,7 +296,7 @@ def get_versions():
     from distutils.version import StrictVersion
     from distutils.spawn import find_executable
     import re
-        
+
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
@@ -313,4 +313,3 @@ def get_versions():
     # anyway - so we can link OMF DLLs
     ld_version = None
     return (gcc_version, ld_version)
-

From 4db3246f4f27f3cfd92a72024b56c7c60c6ac083 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 1 Oct 2002 04:14:17 +0000
Subject: [PATCH 0861/8469] Commit fix for SF 603831.

Strangely, two out of three patches there seem already committed; but
the essential one (get rid of the assert in object_filenames in
ccompiler.py) was not yet applied.

This makes the build procedure for Twisted work again.

This is *not* a backport candidate despite the fact that identical
code appears to exist in 2.2.2; Twisted builds fine there, so there
must have been a change elsewhere.
---
 ccompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 5a0641ea5c..43dfa731d2 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -876,7 +876,8 @@ def find_library_file (self, dirs, lib, debug=0):
     #     extension for executable files, eg. '' or '.exe'
 
     def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
-        assert output_dir is not None
+        if output_dir is None:
+            output_dir = ''
         obj_names = []
         for src_name in source_filenames:
             base, ext = os.path.splitext(src_name)

From 1d52f144d021e9b66b6610b2dfc1c662182f7248 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Tue, 1 Oct 2002 17:39:59 +0000
Subject: [PATCH 0862/8469] save the verbose argument as an instance
 attributes.  Subclasses of CCompiler may rely on the presence of self.verbose
 (SciPy's distutils appears to).

---
 ccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ccompiler.py b/ccompiler.py
index 43dfa731d2..60d1caeed1 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -82,6 +82,7 @@ def __init__ (self,
 
         self.dry_run = dry_run
         self.force = force
+        self.verbose = verbose
 
         # 'output_dir': a common output directory for object, library,
         # shared object, and shared library files

From 464cfeaa1514adce324231af0aba80aac19484d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Fri, 4 Oct 2002 09:30:06 +0000
Subject: [PATCH 0863/8469] Pulling Mark Alexander's contribution from CVS.

---
 command/__init__.py       |   5 +-
 command/bdist.py          |  17 +-
 command/bdist_packager.py | 227 ---------------------
 command/bdist_pkgtool.py  | 411 --------------------------------------
 command/bdist_sdux.py     | 302 ----------------------------
 5 files changed, 14 insertions(+), 948 deletions(-)
 delete mode 100644 command/bdist_packager.py
 delete mode 100644 command/bdist_pkgtool.py
 delete mode 100644 command/bdist_sdux.py

diff --git a/command/__init__.py b/command/__init__.py
index 8143627559..e70429c807 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -21,8 +21,9 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
-           'bdist_sdux',
-           'bdist_pkgtool',
+           # These two are reserved for future use:
+           #'bdist_sdux',
+           #'bdist_pkgtool',
            # Note:
            # bdist_packager is not included because it only provides
            # an abstract base class
diff --git a/command/bdist.py b/command/bdist.py
index f61611eb8d..454c9df119 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -52,7 +52,9 @@ class bdist (Command):
         ]
 
     # The following commands do not take a format option from bdist
-    no_format_option = ('bdist_rpm', 'bdist_sdux', 'bdist_pkgtool')
+    no_format_option = ('bdist_rpm',
+                        #'bdist_sdux', 'bdist_pkgtool'
+                        )
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
@@ -62,20 +64,23 @@ class bdist (Command):
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
-                       'wininst', 'zip', 'pkgtool', 'sdux']
+                       'wininst', 'zip',
+                       #'pkgtool', 'sdux'
+                       ]
 
     # And the real information.
     format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
-                       'zip':   ('bdist_dumb', "ZIP file"),                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
+                       'zip':   ('bdist_dumb', "ZIP file"),
+                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
                        'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                        'ztar':  ('bdist_dumb', "compressed tar file"),
                        'tar':   ('bdist_dumb', "tar file"),
                        'wininst': ('bdist_wininst',
                                    "Windows executable installer"),
                        'zip':   ('bdist_dumb', "ZIP file"),
-                       'pkgtool': ('bdist_pkgtool', 
-                                   "Solaris pkgtool distribution"),
-                       'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
+                       #'pkgtool': ('bdist_pkgtool', 
+                       #            "Solaris pkgtool distribution"),
+                       #'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
                       }
 
 
diff --git a/command/bdist_packager.py b/command/bdist_packager.py
deleted file mode 100644
index 1960425511..0000000000
--- a/command/bdist_packager.py
+++ /dev/null
@@ -1,227 +0,0 @@
-"""distutils.command.bdist_ packager
-
-Modified from bdist_dumb by Mark W. Alexander <slash@dotnetslash.net>
-
-Implements the Distutils 'bdist_packager' abstract command
-to be subclassed by binary package creation commands.
-"""
-
-__revision__ = "$Id: bdist_packager.py,v 0.1 2001/04/4 mwa"
-
-import os
-from distutils.core import Command
-from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
-from distutils.file_util import write_file
-from distutils.errors import *
-from distutils import log
-import string, sys
-
-class bdist_packager (Command):
-
-    description = "abstract base for package manager specific bdist commands"
-
-# XXX update user_options
-    user_options = [
-         ('bdist-base=', None,
-         "base directory for creating built distributions"),
-        ('pkg-dir=', None,
-         "base directory for creating binary packages (defaults to \"binary\" under "),
-        ('dist-dir=', 'd',
-         "directory to put final RPM files in "
-         "(and .spec files if --spec-only)"),
-        ('category=', None,
-         "Software category (packager dependent format)"),
-        ('revision=', None,
-         "package revision number"),
-        ('icon=', None,
-         "Package icon"),
-        ('subpackages=', None,
-         "Comma seperated list of seperately packaged trees"),
-        ('preinstall=', None,
-         "preinstall script (Bourne shell code)"),
-        ('postinstall=', None,
-         "postinstall script (Bourne shell code)"),
-        ('preremove=', None,
-         "preremove script (Bourne shell code)"),
-        ('postremove=', None,
-         "postremove script (Bourne shell code)"),
-        ('requires=', None,
-         "capabilities required by this package"),
-        ('keep-temp', 'k',
-         "don't clean up RPM build directory"),
-        ('control-only', None,
-         "Generate package control files and stop"),
-        ('no-autorelocate', None,
-         "Inhibit automatic relocation to installed site-packages"),
-         ]
-
-    boolean_options = ['keep-temp', 'control-only', 'no_autorelocate']
-
-    def ensure_string_not_none (self,option,default=None):
-        val = getattr(self,option)
-        if val is not None:
-            return
-        Command.ensure_string(self,option,default)
-        val = getattr(self,option)
-        if val is None:
-            raise DistutilsOptionError, "'%s' must be provided" % option
-
-    def ensure_script(self, arg):
-        if not arg:
-            return
-        try:
-            self.ensure_string(arg)
-        except:
-            try:
-                self.ensure_filename(arg)
-            except:
-                raise RuntimeError, "cannot decipher script option (%s)" % arg
-
-    def write_script (self,path,attr,default=None):
-        """ write the script specified in attr to path. if attr is None,
-            write use default instead """
-        val = getattr(self,attr)
-        if not val:
-            if not default:
-                return
-            else:
-                setattr(self,attr,default)
-                val = default
-        if val != "":
-            log.info('Creating %s script', attr)
-            self.execute(write_file,
-                     (path, self.get_script(attr)),
-                     "writing '%s'" % path)
-
-    def get_binary_name(self):
-        py_ver = sys.version[0:string.find(sys.version,' ')]
-        return self.name + '-' + self.version + '-' + \
-               self.revision + '-' + py_ver
-
-    def get_script (self, attr):
-        # accept a script as a string ("line\012line\012..."),
-        # a filename, or a list
-        # XXX We could probably get away with copy_file, but I'm
-        # guessing this will be more flexible later on....
-        val = getattr(self, attr)
-        if val is None:
-            return None
-        try:
-            os.stat(val)
-            # script is a file
-            ret = []
-            f = open(val)
-            ret = string.split(f.read(), "\012");
-            f.close()
-        except:
-            if type(val) == type(""):
-                # script is a string
-                ret = string.split(val, "\012")
-            elif type(val) == type([]):
-                # script is a list
-                ret = val
-            else:
-                raise RuntimeError, \
-                    "cannot figure out what to do with 'request' option (%s)" \
-                    % val
-        return ret
-
-
-    def initialize_options (self):
-        self.keep_temp = 0
-        self.control_only = 0
-        self.no_autorelocate = 0
-        self.pkg_dir = None
-        self.plat_name = None
-        self.icon = None
-        self.requires = None
-        self.subpackages = None
-        self.category = None
-        self.revision = None
-
-        # PEP 241 Metadata
-        self.name = None
-        self.version = None
-        #self.url = None
-        #self.author = None
-        #self.author_email = None
-        #self.maintainer = None
-        #self.maintainer_email = None
-        #self.description = None
-        #self.long_description = None
-        #self.licence = None
-        #self.platforms = None
-        #self.keywords = None
-        self.root_package = None
-
-        # package installation scripts
-        self.preinstall = None
-        self.postinstall = None
-        self.preremove = None
-        self.postremove = None
-    # initialize_options()
-
-
-    def finalize_options (self):
-
-        if self.pkg_dir is None:
-            bdist_base = self.get_finalized_command('bdist').bdist_base
-            self.pkg_dir = os.path.join(bdist_base, 'binary')
-
-        if not self.plat_name:
-            self.plat = self.distribution.get_platforms()
-        if self.distribution.has_ext_modules():
-            self.plat_name = [sys.platform,]
-        else:
-            self.plat_name = ["noarch",]
-
-        d = self.distribution
-        self.ensure_string_not_none('name', d.get_name())
-        self.ensure_string_not_none('version', d.get_version())
-        self.ensure_string('category')
-        self.ensure_string('revision',"1")
-        #self.ensure_string('url',d.get_url())
-        if type(self.distribution.packages) == type([]):
-            self.root_package=self.distribution.packages[0]
-        else:
-            self.root_package=self.name
-        self.ensure_string('root_package',self.root_package)
-        #self.ensure_string_list('keywords')
-        #self.ensure_string_not_none('author', d.get_author())
-        #self.ensure_string_not_none('author_email', d.get_author_email())
-        self.ensure_filename('icon')
-        #self.ensure_string_not_none('maintainer', d.get_maintainer())
-        #self.ensure_string_not_none('maintainer_email',
-                        #d.get_maintainer_email())
-        #self.ensure_string_not_none('description', d.get_description())
-        #self.ensure_string_not_none('long_description', d.get_long_description())
-        #if self.long_description=='UNKNOWN':
-            #self.long_description=self.description
-        #self.ensure_string_not_none('license', d.get_license())
-        self.ensure_string_list('requires')
-        self.ensure_filename('preinstall')
-        self.ensure_filename('postinstall')
-        self.ensure_filename('preremove')
-        self.ensure_filename('postremove')
-
-    # finalize_options()
-
-
-    def run (self):
-
-        raise RuntimeError, \
-            "abstract method -- subclass %s must override" % self.__class__
-        self.run_command('build')
-
-        install = self.reinitialize_command('install', reinit_subcommands=1)
-        install.root = self.pkg_dir
-
-        log.info("installing to %s", self.pkg_dir)
-        self.run_command('install')
-        if not self.keep_temp:
-            remove_tree(self.pkg_dir, dry_run=self.dry_run)
-
-    # run()
-
-# class bdist_packager
diff --git a/command/bdist_pkgtool.py b/command/bdist_pkgtool.py
deleted file mode 100644
index 3b8ca2d2e7..0000000000
--- a/command/bdist_pkgtool.py
+++ /dev/null
@@ -1,411 +0,0 @@
-"""distutils.command.bdist_pkgtool
-
-
-Author: Mark W. Alexander <slash@dotnet.net>
-
-Implements the Distutils 'bdist_pkgtool' command (create Solaris pkgtool
-distributions)."""
-
-import os, string, sys
-from types import *
-from distutils.util import get_platform
-from distutils.file_util import write_file
-from distutils.errors import *
-from distutils.command import bdist_packager
-from distutils import sysconfig
-from distutils import log
-from commands import getoutput
-
-__revision__ = "$Id: bdist_pkgtool.py,v 0.3 mwa "
-
-# default request script - Is also wrapped around user's request script
-# unless --no-autorelocate is requested. Finds the python site-packages
-# directory and prompts for verification
-DEFAULT_REQUEST="""#!/bin/sh
-######################################################################
-#         Distutils internal package relocation support              #
-######################################################################
-
-PRODUCT="__DISTUTILS_NAME__"
-
-trap `exit 3` 15
-/usr/bin/which python 2>&1 >/dev/null
-if [ $? -ne 0 ]; then
-    echo "The python interpretor needs to be on your path!"
-    echo
-    echo "If you have more than one, make sure the first one is where"
-    echo "you want this module installed:"
-    exit 1
-fi
-
-PY_DIR=`python -c "import sys;print '%s/lib/python%s' % (sys.exec_prefix,sys.version[0:3])" 2>/dev/null`
-PY_PKG_DIR=`python -c "import sys;print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[0:3])" 2>/dev/null`
-
-echo ""
-if [ -z "${PY_DIR}" ]; then
-        echo "I can't seem to find the python distribution."
-        echo "I'm assuming the default path for site-packages"
-else
-        BASEDIR="${PY_PKG_DIR}"
-        cat <<EOF
-        Python found! The default path:
-
-        ${BASEDIR}
-
-        will install ${PRODUCT} such that all python users
-        can import it.
-
-        If you just want individual access, you can install into
-        any directory and add that directory to your \$PYTHONPATH
-EOF
-fi
-echo ""
-
-BASEDIR=`ckpath -d ${BASEDIR} -ay \
-        -p "Where should ${PRODUCT} be installed? [${BASEDIR}]"` || exit $?
-
-######################################################################
-#                user supplied request script follows                #
-######################################################################
-"""
-### request script
-
-# default postinstall compiles and changes ownership on the module directory
-# XXX The ownership change _should_ be handled by adjusting the prototype file
-DEFAULT_POSTINSTALL="""#!/bin/sh
-/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
-if [ $? -eq 0 ]; then
-        python -c "import compileall;compileall.compile_dir(\\"${BASEDIR}/__DISTUTILS_NAME__\\")"
-        chown -R root:other ${BASEDIR}/__DISTUTILS_NAME__
-fi
-"""
-
-# default preremove deletes *.pyc and *.pyo from the module tree
-# This should leave the tree empty, so pkgtool will remove it.
-# If the user's scripts place anything else in there (e.g. config files),
-# pkgtool will leave the directory intact
-DEFAULT_PREREMOVE="""#!/bin/sh
-
-/usr/bin/which python 2>&1 >/dev/null
-if [ $? -ne 0 ]; then
-    echo "The python interpretor needs to be on your path!"
-    echo
-    echo "If you have more than one, make sure the first one is where"
-    echo "you want this module removed from"
-    exit 1
-fi
-
-/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
-if [ $? -eq 0 ]; then
-        find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyc" -exec rm {} \;
-        find ${BASEDIR}/__DISTUTILS_NAME__ -name "*.pyo" -exec rm {} \;
-fi
-"""
-
-# default postremove removes the module directory _IF_ no files are
-# there (Turns out this isn't needed if the preremove does it's job
-# Left for posterity
-DEFAULT_POSTREMOVE="""#!/bin/sh
-
-/usr/bin/test -d ${BASEDIR}/__DISTUTILS_NAME__
-if [ $? -eq 0 ]; then
-        if [ `find ${BASEDIR}/__DISTUTILS_NAME__ ! -type d | wc -l` -eq 0 ]; then
-        rm -rf ${BASEDIR}/__DISTUTILS_NAME__
-        fi
-fi
-"""
-
-class bdist_pkgtool (bdist_packager.bdist_packager):
-
-    description = "create an pkgtool (Solaris) package"
-
-    user_options = bdist_packager.bdist_packager.user_options + [
-        ('revision=', None,
-         "package revision number (PSTAMP)"),
-        ('pkg-abrev=', None,
-         "Abbreviation (9 characters or less) of the package name"),
-        ('compver=', None,
-         "file containing compatible versions of this package (man compver)"),
-        ('depend=', None,
-         "file containing dependencies for this package (man depend)"),
-        #('category=', None,
-         #"Software category"),
-        ('request=', None,
-         "request script (Bourne shell code)"),
-       ]
-
-    def initialize_options (self):
-        # XXX Check for pkgtools on path...
-        bdist_packager.bdist_packager.initialize_options(self)
-        self.compver = None
-        self.depend = None
-        self.vendor = None
-        self.classes = None
-        self.request = None
-        self.pkg_abrev = None
-        self.revision = None
-        # I'm not sure I should need to do this, but the setup.cfg
-        # settings weren't showing up....
-        options = self.distribution.get_option_dict('bdist_packager')
-        for key in options.keys():
-            setattr(self,key,options[key][1])
-
-    # initialize_options()
-
-
-    def finalize_options (self):
-        global DEFAULT_REQUEST, DEFAULT_POSTINSTALL
-        global DEFAULT_PREREMOVE, DEFAULT_POSTREMOVE
-        if self.pkg_dir is None:
-            dist_dir = self.get_finalized_command('bdist').dist_dir
-            self.pkg_dir = os.path.join(dist_dir, "pkgtool")
-
-        self.ensure_string('classes', None)
-        self.ensure_string('revision', "1")
-        self.ensure_script('request')
-        self.ensure_script('preinstall')
-        self.ensure_script('postinstall')
-        self.ensure_script('preremove')
-        self.ensure_script('postremove')
-        self.ensure_string('vendor', None)
-        if self.__dict__.has_key('author'):
-            if self.__dict__.has_key('author_email'):
-                self.ensure_string('vendor',
-                        "%s <%s>" % (self.author,
-                           self.author_email))
-            else:
-                self.ensure_string('vendor',
-                     "%s" % (self.author))
-        self.ensure_string('category', "System,application")
-        self.ensure_script('compver')
-        self.ensure_script('depend')
-        bdist_packager.bdist_packager.finalize_options(self)
-        if self.pkg_abrev is None:
-            self.pkg_abrev=self.name
-        if len(self.pkg_abrev)>9:
-            raise DistutilsOptionError, \
-            "pkg-abrev (%s) must be less than 9 characters" % self.pkg_abrev
-        # Update default scripts with our metadata name
-        DEFAULT_REQUEST = string.replace(DEFAULT_REQUEST,
-            "__DISTUTILS_NAME__", self.root_package)
-        DEFAULT_POSTINSTALL = string.replace(DEFAULT_POSTINSTALL,
-            "__DISTUTILS_NAME__", self.root_package)
-        DEFAULT_PREREMOVE = string.replace(DEFAULT_PREREMOVE,
-            "__DISTUTILS_NAME__", self.root_package)
-        DEFAULT_POSTREMOVE = string.replace(DEFAULT_POSTREMOVE,
-            "__DISTUTILS_NAME__", self.root_package)
-
-    # finalize_options()
-
-
-    def make_package(self,root=None):
-        # make directories
-        self.mkpath(self.pkg_dir)
-        if root:
-            pkg_dir = self.pkg_dir+"/"+root
-            self.mkpath(pkg_dir)
-        else:
-            pkg_dir = self.pkg_dir
-
-        self.reinitialize_command('install', reinit_subcommands=1)
-        # build package
-        log.info('Building package')
-        self.run_command('build')
-        log.info('Creating pkginfo file')
-        path = os.path.join(pkg_dir, "pkginfo")
-        self.execute(write_file,
-                     (path,
-                      self._make_info_file()),
-                     "writing '%s'" % path)
-        # request script handling
-        if self.request==None:
-            self.request = self._make_request_script()
-        if self.request!="":
-            path = os.path.join(pkg_dir, "request")
-            self.execute(write_file,
-                     (path,
-                      self.request),
-                     "writing '%s'" % path)
-
-        # Create installation scripts, since compver & depend are
-        # user created files, they work just fine as scripts
-        self.write_script(os.path.join(pkg_dir, "postinstall"),
-                 'postinstall',DEFAULT_POSTINSTALL)
-        self.write_script(os.path.join(pkg_dir, "preinstall"),
-                 'preinstall',None)
-        self.write_script(os.path.join(pkg_dir, "preremove"),
-                 'preremove',DEFAULT_PREREMOVE)
-        self.write_script(os.path.join(pkg_dir, "postremove"),
-                 'postremove',None)
-        self.write_script(os.path.join(pkg_dir, "compver"),
-                 'compver',None)
-        self.write_script(os.path.join(pkg_dir, "depend"),
-                 'depend',None)
-
-        log.info('Creating prototype file')
-        path = os.path.join(pkg_dir, "prototype")
-        self.execute(write_file,
-                     (path,
-                      self._make_prototype()),
-                     "writing '%s'" % path)
-
-
-        if self.control_only: # stop if requested
-            return
-
-
-        log.info('Creating package')
-        pkg_cmd = ['pkgmk', '-o', '-f']
-        pkg_cmd.append(path)
-        pkg_cmd.append('-b')
-        pkg_cmd.append(os.environ['PWD'])
-        self.spawn(pkg_cmd)
-        pkg_cmd = ['pkgtrans', '-s', '/var/spool/pkg']
-        path = os.path.join(os.environ['PWD'],pkg_dir,
-                           self.get_binary_name() + ".pkg")
-        log.info('Transferring package to ' + pkg_dir)
-        pkg_cmd.append(path)
-        pkg_cmd.append(self.pkg_abrev)
-        self.spawn(pkg_cmd)
-        os.system("rm -rf /var/spool/pkg/%s" % self.pkg_abrev)
-
-
-    def run (self):
-        if self.subpackages:
-            self.subpackages=string.split(self.subpackages,",")
-            for pkg in self.subpackages:
-                self.make_package(pkg)
-        else:
-            self.make_package()
-    # run()
-
-
-    def _make_prototype(self):
-        import pwd, grp
-        proto_file = ["i pkginfo"]
-        if self.request:
-            proto_file.extend(['i request'])
-        if self.postinstall:
-            proto_file.extend(['i postinstall'])
-        if self.postremove:
-            proto_file.extend(['i postremove'])
-        if self.preinstall:
-            proto_file.extend(['i preinstall'])
-        if self.preremove:
-            proto_file.extend(['i preremove'])
-        if self.compver:
-            proto_file.extend(['i compver'])
-        if self.requires:
-            proto_file.extend(['i depend'])
-        proto_file.extend(['!default 644 root bin'])
-        build = self.get_finalized_command('build')
-
-        try:
-            self.distribution.packages[0]
-            file_list=string.split(
-                getoutput("pkgproto %s/%s=%s" % \
-                          (build.build_lib, self.distribution.packages[0],
-                           self.distribution.packages[0])), "\012")
-        except:
-            file_list=string.split(
-            getoutput("pkgproto %s=" % (build.build_lib)),"\012")
-        ownership="%s %s" % (pwd.getpwuid(os.getuid())[0],
-            grp.getgrgid(os.getgid())[0])
-        for i in range(len(file_list)):
-            file_list[i] = string.replace(file_list[i],ownership,"root bin")
-        proto_file.extend(file_list)
-        return proto_file
-
-    def _make_request_script(self):
-        global DEFAULT_REQUEST
-        # A little different from other scripts, if we are to automatically
-        # relocate to the target site-packages, we have to wrap any provided
-        # script with the autorelocation script. If no script is provided,
-        # The request script will simply be the autorelocate script
-        if self.no_autorelocate==0:
-            request=string.split(DEFAULT_REQUEST,"\012")
-        else:
-            log.info('Creating relocation request script')
-        if self.request:
-            users_request=self.get_script('request')
-            if users_request!=None and users_request!=[]:
-                if self.no_autorelocate==0 and users_request[0][0:2]=="#!":
-                    users_request.remove(users_request[0])
-                for i in users_request:
-                    request.append(i)
-
-        if self.no_autorelocate==0:
-            request.append("#############################################")
-            request.append("#        finalize relocation support        #")
-            request.append("#############################################")
-            request.append('echo "BASEDIR=\\"${BASEDIR}\\"" >>$1')
-        return request
-
-    def _make_info_file(self):
-        """Generate the text of a pkgtool info file and return it as a
-        list of strings (one per line).
-        """
-        # definitions and headers
-        # PKG must be alphanumeric, < 9 characters
-        info_file = [
-            'PKG="%s"' % self.pkg_abrev,
-            'NAME="%s"' % self.name,
-            'VERSION="%s"' % self.version,
-            'PSTAMP="%s"' % self.revision,
-            ]
-        info_file.extend(['VENDOR="%s (%s)"' % (self.distribution.maintainer, \
-                self.distribution.license) ])
-        info_file.extend(['EMAIL="%s"' % self.distribution.maintainer_email ])
-
-        p = self.distribution.get_platforms()
-        if p is None or p==['UNKNOWN']:
-            archs=getoutput('uname -p')
-        else:
-            archs=string.join(self.distribution.get_platforms(),',')
-        #else:
-            #print "Assuming a sparc architecure"
-            #archs='sparc'
-        info_file.extend(['ARCH="%s"' % archs ])
-
-        if self.distribution.get_url():
-            info_file.extend(['HOTLINE="%s"' % self.distribution.get_url() ])
-        if self.classes:
-            info_file.extend(['CLASSES="%s"' % self.classes ])
-        if self.category:
-            info_file.extend(['CATEGORY="%s"' % self.category ])
-        site=None
-        for i in  sys.path:
-            if i[-13:]=="site-packages":
-                site=i
-                break
-        if site:
-            info_file.extend(['BASEDIR="%s"' % site ])
-
-        return info_file
-
-    # _make_info_file ()
-
-    def _format_changelog(self, changelog):
-        """Format the changelog correctly and convert it to a list of strings
-        """
-        if not changelog:
-            return changelog
-        new_changelog = []
-        for line in string.split(string.strip(changelog), '\n'):
-            line = string.strip(line)
-            if line[0] == '*':
-                new_changelog.extend(['', line])
-            elif line[0] == '-':
-                new_changelog.append(line)
-            else:
-                new_changelog.append('  ' + line)
-
-        # strip trailing newline inserted by first changelog entry
-        if not new_changelog[0]:
-            del new_changelog[0]
-
-        return new_changelog
-
-    # _format_changelog()
-
-# class bdist_rpm
diff --git a/command/bdist_sdux.py b/command/bdist_sdux.py
deleted file mode 100644
index 875f3d88ce..0000000000
--- a/command/bdist_sdux.py
+++ /dev/null
@@ -1,302 +0,0 @@
-"""distutils.command.bdist_pkgtool
-
-Implements the Distutils 'bdist_sdux' command to create HP-UX 
-swinstall depot.
-"""
-
-# Mark Alexander <slash@dotnetslash.net>
-
-__revision__ = "$Id: bdist_sdux.py,v 0.2 "
-import os, string
-from types import *
-from distutils.util import get_platform
-from distutils.file_util import write_file
-from distutils.errors import *
-from distutils.command import bdist_packager
-from distutils import log
-import sys
-from commands import getoutput
-
-DEFAULT_CHECKINSTALL="""#!/bin/sh
-/usr/bin/which python 2>&1 >/dev/null
-if [ $? -ne 0 ]; then
-    echo "ERROR: Python must be on your PATH"  &>2
-    echo "ERROR: (You may need to link it to /usr/bin) "  &>2
-    exit 1
-fi
-PY_DIR=`python -c "import sys;print '%s/lib/python%s' % (sys.exec_prefix,sys.version[0:3])" #2>/dev/null`
-PY_PKG_DIR=`python -c "import sys;print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[0:3])" #2>/dev/null`
-PY_LIB_DIR=`dirname $PY_PKG_DIR`
-
-if [ "`dirname ${SW_LOCATION}`" = "__DISTUTILS_PKG_DIR__" ]; then
-    # swinstall to default location
-    if [ "${PY_PKG_DIR}" != "__DISTUTILS_PKG_DIR__" ]; then
-        echo "ERROR: " &>2
-        echo "ERROR: Python is not installed where this package expected!" &>2
-        echo "ERROR: You need to manually relocate this package to your python installation." &>2
-        echo "ERROR: " &>2
-        echo "ERROR: Re-run swinstall specifying the product name:location, e.g.:" &>2
-        echo "ERROR: " &>2
-        echo "ERROR:     swinstall -s [source] __DISTUTILS_NAME__:${PY_PKG_DIR}/__DISTUTILS_DIRNAME__" &>2
-        echo "ERROR: " &>2
-        echo "ERROR: to relocate this package to match your python installation" &>2
-        echo "ERROR: " &>2
-        exit 1
-    fi
-else
-    if [ "`dirname ${SW_LOCATION}`" != "${PY_PKG_DIR}" -a "`dirname ${SWLOCATION}`" != "${PY_LIB_DIR}" ]; then
-        echo "WARNING: " &>2
-        echo "WARNING: Package is being installed outside the 'normal' python search path!" &>2
-        echo "WARNING: Add ${SW_LOCATION} to PYTHONPATH to use this package" &>2
-        echo "WARNING: " &>2
-    fi
-fi
-"""
-
-DEFAULT_POSTINSTALL="""#!/bin/sh
-/usr/bin/which python 2>&1 >/dev/null
-if [ $? -ne 0 ]; then
-    echo "ERROR: Python must be on your PATH"  &>2
-    echo "ERROR: (You may need to link it to /usr/bin) "  &>2
-    exit 1
-fi
-python -c "import compileall;compileall.compile_dir(\\"${SW_LOCATION}\\")"
-"""
-
-DEFAULT_PREREMOVE="""#!/bin/sh
-# remove compiled bytecode files
-find ${SW_LOCATION} -name "*.pyc" -exec rm {} \;
-find ${SW_LOCATION} -name "*.pyo" -exec rm {} \;
-"""
-
-DEFAULT_POSTREMOVE="""#!/bin/sh
-if [ `find ${SW_LOCATION} ! -type d | wc -l` -eq 0 ]; then
-    # remove if there's nothing but empty directories left
-    rm -rf ${SW_LOCATION}
-fi
-"""
-
-class bdist_sdux(bdist_packager.bdist_packager):
-
-    description = "create an HP swinstall depot"
-
-    user_options = bdist_packager.bdist_packager.user_options + [
-        #('revision=', None,
-         #"package revision number (PSTAMP)"),
-        ('keep-permissions', None,
-         "Don't reset permissions and ownership to root/bin"), # XXX
-        ('corequisites=', None,
-         "corequisites"), # XXX
-        ('prerequisites=', None,
-         "prerequisites"), # XXX
-        #('category=', None,
-         #"Software category"),
-        ('checkinstall=', None, # XXX ala request
-         "checkinstall script (Bourne shell code)"),
-        ('configure=', None, # XXX 
-         "configure script (Bourne shell code)"),
-        ('unconfigure=', None, # XXX
-         "unconfigure script (Bourne shell code)"),
-        ('verify=', None, # XXX
-         "verify script (Bourne shell code)"),
-        ('unpreinstall=', None, # XXX
-         "unpreinstall script (Bourne shell code)"),
-        ('unpostinstall=', None, # XXX
-         "unpostinstall script (Bourne shell code)"),
-       ]
-
-    boolean_options = ['keep-permissions']
-
-    def initialize_options (self):
-        bdist_packager.bdist_packager.initialize_options(self)
-        self.corequisites = None
-        self.prerequesites = None
-        self.checkinstall = None
-        self.configure = None
-        self.unconfigure = None
-        self.verify = None
-        self.unpreinstall = None
-        self.unpostinstall = None
-        # More
-        self.copyright = None
-        self.readme = None
-        self.machine_type = None
-        self.os_name = None
-        self.os_release = None
-        self.directory = None
-        self.readme = None
-        self.copyright = None
-        self.architecture= None
-        self.keep_permissions= None
-        options = self.distribution.get_option_dict('bdist_packager')
-        for key in options.keys():
-            setattr(self,key,options[key][1])
-
-    # initialize_options()
-
-
-    def finalize_options (self):
-        global DEFAULT_CHECKINSTALL, DEFAULT_POSTINSTALL
-        global DEFAULT_PREREMOVE, DEFAULT_POSTREMOVE
-        if self.pkg_dir==None:
-            dist_dir = self.get_finalized_command('bdist').dist_dir
-            self.pkg_dir = os.path.join(dist_dir, "sdux")  
-        self.ensure_script('corequisites')
-        self.ensure_script('prerequesites')
-        self.ensure_script('checkinstall')
-        self.ensure_script('configure')
-        self.ensure_script('unconfigure')
-        self.ensure_script('verify')
-        self.ensure_script('unpreinstall')
-        self.ensure_script('unpostinstall')
-        self.ensure_script('copyright')
-        self.ensure_script('readme')
-        self.ensure_string('machine_type','*')
-        if not self.__dict__.has_key('platforms'):
-            # This is probably HP, but if it's not, use sys.platform
-            if sys.platform[0:5] == "hp-ux":
-                self.platforms = "HP-UX"
-            else:
-                self.platforms = string.upper(sys.platform)
-        else:
-            # we can only handle one
-            self.platforms=string.join(self.platforms[0])
-        self.ensure_string('os_release','*')
-        self.ensure_string('directory','%s/lib/python%s/site-packages' % \
-                (sys.exec_prefix, sys.version[0:3]))
-        bdist_packager.bdist_packager.finalize_options(self)
-        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
-            "__DISTUTILS_NAME__", self.name)
-        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
-            "__DISTUTILS_DIRNAME__", self.root_package)
-        DEFAULT_CHECKINSTALL = string.replace(DEFAULT_CHECKINSTALL,
-            "__DISTUTILS_PKG_DIR__", self.directory)
-        DEFAULT_POSTINSTALL = string.replace(DEFAULT_POSTINSTALL,
-            "__DISTUTILS_DIRNAME__", self.root_package)
-        #DEFAULT_PREREMOVE = string.replace(DEFAULT_PREREMOVE,
-            #"__DISTUTILS_NAME__", self.root_package)
-        #DEFAULT_POSTREMOVE = string.replace(DEFAULT_POSTREMOVE,
-            #"__DISTUTILS_NAME__", self.root_package)
-    # finalize_options()
-
-    def run (self):
-        # make directories
-        self.mkpath(self.pkg_dir)
-        psf_path = os.path.join(self.pkg_dir, 
-                                 "%s.psf" % self.get_binary_name())
-        # build package
-        log.info('Building package')
-        self.run_command('build')
-        log.info('Creating psf file')
-        self.execute(write_file,
-                     (psf_path,
-                      self._make_control_file()),
-                     "writing '%s'" % psf_path)
-        if self.control_only: # stop if requested
-            return
-
-        log.info('Creating package')
-        spawn_cmd = ['swpackage', '-s']
-        spawn_cmd.append(psf_path)
-        spawn_cmd.append('-x')
-        spawn_cmd.append('target_type=tape')
-        spawn_cmd.append('@')
-        spawn_cmd.append(self.pkg_dir+"/"+self.get_binary_name()+'.depot')
-        self.spawn(spawn_cmd)
-
-    # run()
-
-  
-    def _make_control_file(self):
-        # Generate a psf file and return it as list of strings (one per line).
-        # definitions and headers
-        title = "%s %s" % (self.maintainer,self.maintainer_email)
-        title=title[0:80]
-        #top=self.distribution.packages[0]
-        psf_file = [
-            'vendor',               # Vendor information
-            '    tag                %s' % "DISTUTILS",
-            '    title              %s' % title,
-            '    description        Distutils package maintainer (%s)' % self.license,
-            'end',                  # end of vendor
-            'product',              # Product information
-            '    tag                %s' % self.name,
-            '    title              %s' % self.description,
-            '    description        %s' % self.description,
-            '    revision           %s' % self.version,
-            '    architecture       %s' % self.platforms,
-            '    machine_type       %s' % self.machine_type,
-            '    os_name            %s' % self.platforms,
-            '    os_release         %s' % self.os_release,
-            '    directory          %s' % self.directory + "/" + self.root_package,
-            ]
-
-        self.write_script(os.path.join(self.pkg_dir, "checkinstall"),
-                'checkinstall',DEFAULT_CHECKINSTALL)
-        psf_file.extend(['    checkinstall       %s/checkinstall' % self.pkg_dir])
-        self.write_script(os.path.join(self.pkg_dir, "postinstall"),
-                'postinstall',DEFAULT_POSTINSTALL)
-        psf_file.extend(['    postinstall        %s/postinstall' % self.pkg_dir])
-        self.write_script(os.path.join(self.pkg_dir, "preremove"),
-                'preremove',DEFAULT_PREREMOVE)
-        psf_file.extend(['    preremove          %s/preremove' % self.pkg_dir])
-        self.write_script(os.path.join(self.pkg_dir, "postremove"),
-                'postremove',DEFAULT_POSTREMOVE)
-        psf_file.extend(['    postremove         %s/postremove' % self.pkg_dir])
-        if self.preinstall:
-            self.write_script(self.pkg_dir+"/preinstall", 'preinstall', None)
-            psf_file.extend(['    preinstall         %s/preinstall' % self.pkg_dir])
-        if self.configure:
-            self.write_script(self.pkg_dir+"/configure", 'configure', None)
-            psf_file.extend(['    configure          %s/configure' % self.pkg_dir])
-        if self.unconfigure:
-            self.write_script(self.pkg_dir+"/unconfigure", 'unconfigure', None)
-            psf_file.extend(['    unconfigure        %s/unconfigure' % self.pkg_dir])
-        if self.verify:
-            self.write_script(self.pkg_dir+"/verify", 'verify', None)
-            psf_file.extend(['    verify             %s/verify' % self.pkg_dir])
-        if self.unpreinstall:
-            self.write_script(self.pkg_dir+"/unpreinstall", 'unpreinstall', None)
-            psf_file.extend(['    unpreinstall       %s/unpreinstall' % self.pkg_dir])
-        if self.unpostinstall:
-            self.write_script(self.pkg_dir+"/unpostinstall", 'unpostinstall', None)
-            psf_file.extend(['    unpostinstall      %s/unpostinstall' % self.pkg_dir])
-        psf_file.extend(['    is_locatable       true'])
-        #if self.long_description:
-            #psf_file.extend([self.long_description])
-        if self.copyright:
-            # XX make a copyright file XXX
-            self.write_script('copyright')
-            psf_file.extend(['    copyright         <copyright'])
-        if self.readme:
-            # XX make a readme file XXX
-            self.write_script('readme')
-            psf_file.extend(['    readme            <readme'])
-
-        psf_file.extend(['    fileset'])    # start fileset
-        if self.distribution.ext_modules:
-            platlib=self.get_finalized_command('build').build_platlib
-        else:
-            platlib=self.get_finalized_command('build').build_lib
-        title = "%s installation files" % (self.name)
-        psf_file.extend([
-            '        tag            %s' % 'FILES',
-            '        title          %s' % "%s installation files" % (self.name),
-            '        revision       %s' % self.version,
-            '        directory      %s/%s=%s/%s' % (platlib,self.root_package,self.directory,self.root_package),
-            ])
-        if not self.keep_permissions:
-            psf_file.extend(['        file_permissions    -m 555 -o root -g bin'])
-        psf_file.extend(['        file           *'])
-        psf_file.extend(['    end'])        # end of fileset
-        psf_file.extend(['end'])    # end of product
-               
-# XXX add fileset information
-        
-
-        return psf_file
-
-    # _make_control_file ()
-
-
-# class bdist_sdux

From 679296fdf3e45a05a0d7ec86ab291b8d871ff598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 7 Oct 2002 05:57:21 +0000
Subject: [PATCH 0864/8469] Patch #619493: Prefer rpmbuild over rpm if
 available. Backported to 2.2.

---
 command/bdist_rpm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index bbaad7dc7b..86a40947b4 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -282,6 +282,9 @@ def run (self):
         # build package
         log.info("building RPMs")
         rpm_cmd = ['rpm']
+        if os.path.exists('/usr/bin/rpmbuild') or \
+           os.path.exists('/bin/rpmbuild'):
+            rpm_cmd = ['rpmbuild']
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
         elif self.binary_only:

From 6ed654260a646f4c8823e335597316c2a29038e5 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Wed, 9 Oct 2002 21:37:18 +0000
Subject: [PATCH 0865/8469] MacOSX linker doesn't understand -R flag at all, no
 matter how you feed it the flag.  Punt and return a -L flag instead
 (returning "" gums up the command to be forked).

---
 unixccompiler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 831717baca..692e3eb477 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -196,7 +196,10 @@ def runtime_library_dir_option(self, dir):
         # the configuration data stored in the Python installation, so
         # we use this hack.
         compiler = os.path.basename(sysconfig.get_config_var("CC"))
-        if compiler == "gcc" or compiler == "g++":
+        if sys.platform[:6] == "darwin":
+            # MacOSX's linker doesn't understand the -R flag at all
+            return "-L" + dir
+        elif compiler == "gcc" or compiler == "g++":
             return "-Wl,-R" + dir
         else:
             return "-R" + dir

From 41f9cf2f3074f7626544b810e8995139bb842be9 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 15 Oct 2002 14:51:58 +0000
Subject: [PATCH 0866/8469] Revert the previous checkin - it didn't work
 anyway.

---
 command/bdist_wininst.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b538319881..71e51bfd37 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -130,9 +130,8 @@ def run (self):
 
         # And make an archive relative to the root of the
         # pseudo-installation tree.
-        from tempfile import NamedTemporaryFile
-        arc = NamedTemporaryFile(".zip")
-        archive_basename = arc.name[:-4]
+        from tempfile import mktemp
+        archive_basename = mktemp()
         fullname = self.distribution.get_fullname()
         arcname = self.make_archive(archive_basename, "zip",
                                     root_dir=self.bdist_dir)
@@ -140,7 +139,7 @@ def run (self):
         self.create_exe(arcname, fullname, self.bitmap)
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
-        arc.close()
+        os.remove(arcname)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)

From a3f707d5f06386feabf8d3767faca67ef4a580cd Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 15 Oct 2002 19:45:25 +0000
Subject: [PATCH 0867/8469] Recreated after source changes.

---
 command/bdist_wininst.py | 630 +++++++++++++++++++--------------------
 1 file changed, 315 insertions(+), 315 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 71e51bfd37..a3526a7a04 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -264,7 +264,7 @@ def get_exe_bytes (self):
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
 ZGUuDQ0KJAAAAAAAAAAtOHsRaVkVQmlZFUJpWRVCEkUZQmpZFUIGRh9CYlkVQupFG0JrWRVCBkYR
 QmtZFUJpWRVCZlkVQmlZFELjWRVCC0YGQmRZFUJveh9Ca1kVQq5fE0JoWRVCUmljaGlZFUIAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwAQIUU9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAJAFAQAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwDeb6w9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAGAGAQAA
 wAAAABABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAIAEAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEA5AEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -277,7 +277,7 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCsm8FbzjNj4gCekAAIxFAAAA4AAAJgYA2//b
+bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCifWKaycxW6nCekAAFxGAAAA4AAAJgYALP/b
 //9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xVUcUAAi/BZHVl0X4AmAFcRvHD9v/n+
 2IP7/3Unag/IhcB1E4XtdA9XaBCQ/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALcQp
 Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz2oLe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
@@ -285,321 +285,321 @@ def get_exe_bytes (self):
 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
-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
+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
-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
+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

From 4d708a479b7ca9f8464af6059bc6afa01ad2bdf7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 16 Oct 2002 17:51:38 +0000
Subject: [PATCH 0868/8469] Recreated after source changes.

---
 command/bdist_wininst.py | 638 +++++++++++++++++++--------------------
 1 file changed, 319 insertions(+), 319 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index a3526a7a04..d996bee35a 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -264,7 +264,7 @@ def get_exe_bytes (self):
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
 ZGUuDQ0KJAAAAAAAAAAtOHsRaVkVQmlZFUJpWRVCEkUZQmpZFUIGRh9CYlkVQupFG0JrWRVCBkYR
 QmtZFUJpWRVCZlkVQmlZFELjWRVCC0YGQmRZFUJveh9Ca1kVQq5fE0JoWRVCUmljaGlZFUIAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwDeb6w9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAGAGAQAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwCepq09AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAIAGAQAA
 wAAAABABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAIAEAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEA5AEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -277,7 +277,7 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
 IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
 ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCifWKaycxW6nCekAAFxGAAAA4AAAJgYALP/b
+bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCjYL5dfUlP5rCekAAH1GAAAA4AAAJgYA0//b
 //9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xVUcUAAi/BZHVl0X4AmAFcRvHD9v/n+
 2IP7/3Unag/IhcB1E4XtdA9XaBCQ/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALcQp
 Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz2oLe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
@@ -285,322 +285,322 @@ def get_exe_bytes (self):
 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
-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
+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
@@ -614,7 +614,7 @@ def get_exe_bytes (self):
 AAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkzMi5kbGwATVNW
 Q1JULmRsbABvbGUzMi5kbGwAU0hFTEwzMi5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABH
 ZXRQcm9jQWRkcmVzcwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRB
-AABUZXh0T3V0QQAAZXhpdAAAQ29Jbml0aWFsaXplAABTSEdldFNwZWNpYWxGb2xkZXJQYXRoQQAA
+AABUZXh0T3V0QQAAZnJlZQAAQ29Jbml0aWFsaXplAABTSEdldFNwZWNpYWxGb2xkZXJQYXRoQQAA
 AEdldERDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

From c3c5a89898505fe9b1efe3310fc6a666212bd148 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 31 Oct 2002 13:22:41 +0000
Subject: [PATCH 0869/8469] Make the Distribution() constructor forgiving of
 unknown keyword arguments, triggering a warning instead of raising an
 exception.  (In 1.5.2/2.0, it will print to stderr.)

Bugfix candidate for all previous versions.  This changes behaviour,
but the old behaviour wasn't very useful.  If Distutils version X+1
adds a new keyword argument, using the new keyword means your setup.py
file won't work with Distutils version X any more.
---
 dist.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 92cb8320da..c71cb36a94 100644
--- a/dist.py
+++ b/dist.py
@@ -12,6 +12,12 @@
 import sys, os, string, re
 from types import *
 from copy import copy
+
+try:
+    import warnings
+except:
+    warnings = None
+
 from distutils.errors import *
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
@@ -206,8 +212,11 @@ def __init__ (self, attrs=None):
                 elif hasattr(self, key):
                     setattr(self, key, val)
                 else:
-                    raise DistutilsSetupError, \
-                          "invalid distribution option '%s'" % key
+                    msg = "Unknown distribution option: %s" % repr(key)
+                    if warnings is not None:
+                        warnings.warn(msg)
+                    else:
+                        sys.stderr.write(msg + "\n")
 
         self.finalize_options()
 

From 00c4a7c3a8e95dcb877acdf8d92421cc853c69cb Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 31 Oct 2002 13:39:33 +0000
Subject: [PATCH 0870/8469] Catch only ImportError

---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index c71cb36a94..dbeeb8b1dc 100644
--- a/dist.py
+++ b/dist.py
@@ -15,7 +15,7 @@
 
 try:
     import warnings
-except:
+except ImportError:
     warnings = None
 
 from distutils.errors import *

From 763affe91fa9f53831b26e94b818e34d73c5a2cd Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 31 Oct 2002 14:26:37 +0000
Subject: [PATCH 0871/8469] Fixes SF bug#614051: win32 build_ext problem.

---
 command/build_ext.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 6b6f2c7d57..11ab59528a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -635,6 +635,8 @@ def get_libraries (self, ext):
                 # don't extend ext.libraries, it may be shared with other
                 # extensions, it is a reference to the original list
                 return ext.libraries + [pythonlib]
+            else:
+                return ext.libraries
         elif sys.platform == "os2emx":
             # EMX/GCC requires the python library explicitly, and I
             # believe VACPP does as well (though not confirmed) - AIM Apr01

From 42f8752d3cfc16950f11ddc0c462ec9c06cfd822 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 4 Nov 2002 13:33:07 +0000
Subject: [PATCH 0872/8469] [Bug #570655] Fix misleading option text

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 86a40947b4..597b26c6ad 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -68,7 +68,7 @@ class bdist_rpm (Command):
         ('doc-files=', None,
          "list of documentation files (space or comma-separated)"),
         ('changelog=', None,
-         "path to RPM changelog"),
+         "RPM changelog"),
         ('icon=', None,
          "name of icon file"),
         ('provides=', None,

From a5639c31c94c1fe14c1685072399798fa4ed1a82 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 4 Nov 2002 13:45:15 +0000
Subject: [PATCH 0873/8469] Add get_distutil_options(); future setup.py files
 can use this to check    whether the Distutils being used supports a
 particularly capability.

   (This idea was originally suggested by Juergen Hermann as a method
    on the Distribution class.  I think it makes more sense as a
    function in core.py, and that's what this patch implements.)
---
 core.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core.py b/core.py
index 9a6bff6b55..d180eb8cb6 100644
--- a/core.py
+++ b/core.py
@@ -227,3 +227,12 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     return _setup_distribution
 
 # run_setup ()
+
+def get_distutil_options ():
+    """Returns a list of strings recording changes to the Distutils.
+
+    setup.py files can then do:
+      if 'optional-thing' in get_distutil_options():
+          ...
+    """
+    return []

From 1bd24104b8ac0fb4707a24204bfde7b5e30c93d4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 4 Nov 2002 14:27:43 +0000
Subject: [PATCH 0874/8469] [Bug #620630] Flush stdout after logging every
 message.  Without it,    when output is redirected to a file, compiler error
 messages show    up before Distutils prints the command being invoked.

---
 log.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/log.py b/log.py
index f0a7865067..6aeb7c9aac 100644
--- a/log.py
+++ b/log.py
@@ -9,6 +9,8 @@
 ERROR = 4
 FATAL = 5
 
+import sys
+
 class Log:
 
     def __init__(self, threshold=WARN):
@@ -17,6 +19,7 @@ def __init__(self, threshold=WARN):
     def _log(self, level, msg, args):
         if level >= self.threshold:
             print msg % args
+            sys.stdout.flush()
 
     def log(self, level, msg, *args):
         self._log(level, msg, args)

From 17cca1e870697be532a44be00137f801faad424d Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 4 Nov 2002 19:50:03 +0000
Subject: [PATCH 0875/8469] [Patch #588809] Remove check of environment
 variables; sysconfig.py will do that now

---
 command/build_ext.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 11ab59528a..934b4576e6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -451,14 +451,6 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        # XXX and if we support CFLAGS, why not CC (compiler
-        # executable), CPPFLAGS (pre-processor options), and LDFLAGS
-        # (linker options) too?
-        # XXX should we use shlex to properly parse CFLAGS?
-
-        if os.environ.has_key('CFLAGS'):
-            extra_args.extend(string.split(os.environ['CFLAGS']))
-
         objects = self.compiler.compile(sources,
                                         output_dir=self.build_temp,
                                         macros=macros,
@@ -485,7 +477,6 @@ def build_extension(self, ext):
             objects.extend(ext.extra_objects)
         extra_args = ext.extra_link_args or []
 
-
         self.compiler.link_shared_object(
             objects, ext_filename,
             libraries=self.get_libraries(ext),

From 4765756222ebf75cbba020854d4550f7e471f2f5 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 4 Nov 2002 19:53:24 +0000
Subject: [PATCH 0876/8469] [Patch #588809] LDFLAGS support for build_ext.py,
 from Robert Weber

customize_compiler() now looks at various environment variables and uses
   their values to override the configured C compiler/preprocessor/linker
   binary and flags.
---
 sysconfig.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 48672d6a10..e879fa149a 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -142,9 +142,25 @@ def customize_compiler(compiler):
         (cc, opt, ccshared, ldshared, so_ext) = \
             get_config_vars('CC', 'OPT', 'CCSHARED', 'LDSHARED', 'SO')
 
+        if os.environ.has_key('CC'):
+            cc = os.environ['CC']
+        if os.environ.has_key('CPP'):
+            cpp = os.environ['CPP']
+        else:
+            cpp = cc + " -E"           # not always
+        if os.environ.has_key('LDFLAGS'):
+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if os.environ.has_key('CFLAGS'):
+            opt = opt + ' ' + os.environ['CFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
+        if os.environ.has_key('CPPFLAGS'):
+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
+            opt = opt + ' ' + os.environ['CPPFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+
         cc_cmd = cc + ' ' + opt
         compiler.set_executables(
-            preprocessor=cc + " -E",    # not always!
+            preprocessor=cpp,
             compiler=cc_cmd,
             compiler_so=cc_cmd + ' ' + ccshared,
             linker_so=ldshared,

From 8c157b7b9e0b11cd6274e6fdbb476e142d61951f Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 5 Nov 2002 10:06:19 +0000
Subject: [PATCH 0877/8469] Must now give the basename - not including
 directories - of the install-script on the command line.

Recreated after recompilation of wininst.exe.
---
 command/bdist_wininst.py | 704 ++++++++++++++++++++-------------------
 1 file changed, 358 insertions(+), 346 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d996bee35a..029a026b62 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -41,8 +41,8 @@ class bdist_wininst (Command):
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
                     ('install-script=', None,
-                     "installation script to be run after installation"
-                     " or before deinstallation"),
+                     "basename of installation script to be run after"
+                     "installation or before deinstallation"),
                    ]
 
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
@@ -78,11 +78,14 @@ def finalize_options (self):
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
-        if self.install_script and \
-               self.install_script not in self.distribution.scripts:
-            raise DistutilsOptionError, \
-                  "install_script '%s' not found in scripts" % self.install_script
-
+        if self.install_script:
+            for script in self.distribution.scripts:
+                if self.install_script == os.path.basename(script):
+                    break
+            else:
+                raise DistutilsOptionError, \
+                      "install_script '%s' not found in scripts" % \
+                      self.install_script
     # finalize_options()
 
 
@@ -264,362 +267,371 @@ def get_exe_bytes (self):
 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
-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
+AAAAAAAAAAAAAAAAUEUAAEwBAwAvl8c9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAMAGAQAA
 wAAAABABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAIAEAAAQAAAAAAAACAAAAAAAQAAAQ
 AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEA5AEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVUFgwAAAAAACwAAAAEAAAAAAAAAAEAAAA
-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
+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
-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
+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
-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
-EgEAHBIBAAAAAAAAAAAAAAAAAH4SAQAkEgEAAAAAAAAAAAAAAAAAAAAAAAAAAACIEgEAlhIBAKYS
-AQAAAAAAtBIBAAAAAADCEgEAAAAAANISAQAAAAAA3BIBAAAAAADiEgEAAAAAAPASAQAAAAAAChMB
-AAAAAABLRVJORUwzMi5ETEwAQURWQVBJMzIuZGxsAENPTUNUTDMyLmRsbABHREkzMi5kbGwATVNW
-Q1JULmRsbABvbGUzMi5kbGwAU0hFTEwzMi5kbGwAVVNFUjMyLmRsbAAATG9hZExpYnJhcnlBAABH
-ZXRQcm9jQWRkcmVzcwAARXhpdFByb2Nlc3MAAABSZWdDbG9zZUtleQAAAFByb3BlcnR5U2hlZXRB
-AABUZXh0T3V0QQAAZnJlZQAAQ29Jbml0aWFsaXplAABTSEdldFNwZWNpYWxGb2xkZXJQYXRoQQAA
-AEdldERDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+UI/rL1wgGOpTDGoCrM2W7f9VIPDALmcQZronYy91JS67aFTH6Xbf891TAes7B1kO8yR0Cq3QHvkT
+A41F9G4GAgx7n4UYQrB9/BIDvO7NNEjMNBR1CQvYlgbTfTN/DlZqBFYQ1BD7GlyE2HyJfg9hOIKz
+3drmPOsmpSsCUyrQ+b5tW1OnCCWLBDvGdRcnEMKGNuEoco4KM8BsC+3/5FvJOIN9EAhTi10IaUOS
+druwffI4k8jdUOjIVuJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sLDtLS2M1xw7
+dGn/dChQaO72+b6QmBlLBC6sjnQTGnOd+5YNfIsEyYr2IR8byFn3LTw6Lh9kQ+2w0VoDxUUSPsgP
+3ea+U5fcGY1e8KQUxuPO8GHOgewo4auLVRBExv/tf4tMAvqNXALqV5/gK0MMK8GD6BaLG//L7f/P
+gTtQSwUGiX3o8GsCg2UUAGaDewoA/5v77g+OYA7rCYtN7D/M6ItEESqNNBEDttkubzP6gT4BAjA6
+gT8Lv3Wf7QMEPC7BLpSJMQPKD79WbY/dth4I9AZOIAwcA1UV0W370rwITxyJwVcaA9CbEBYjNP72
+6I1EAipF3I2F2P6bafShezdgC+7dgLwF1w9cMseY4VkYaLATHehPFz4bMyvtoGX4hoQFtrRhexFS
+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
+YIMtbU9z3ADr0E+fW1vJwJgN+Hdj5wAAAGgDACQAAP8AAAAAAAAAAABgvgDAQACNvgBQ//9Xg83/
+6xCQkJCQkJCKBkaIB0cB23UHix6D7vwR23LtuAEAAAAB23UHix6D7vwR2xHAAdtz73UJix6D7vwR
+23PkMcmD6ANyDcHgCIoGRoPw/3R0icUB23UHix6D7vwR2xHJAdt1B4seg+78EdsRyXUgQQHbdQeL
+HoPu/BHbEckB23PvdQmLHoPu/BHbc+SDwQKB/QDz//+D0QGNFC+D/fx2D4oCQogHR0l19+lj////
+kIsCg8IEiQeDxwSD6QR38QHP6Uz///9eife50QAAAIoHRyzoPAF394A/AXXyiweKXwRmwegIwcAQ
+hsQp+IDr6AHwiQeDxwWJ2OLZjb4A4AAAiwcJwHQ8i18EjYQwMAEBAAHzUIPHCP+W5AEBAJWKB0cI
+wHTciflXSPKuVf+W6AEBAAnAdAeJA4PDBOvh/5bsAQEAYekyX///AAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAIAAAAgAACABQAAAGAAAIAAAAAAAAAA
+AAAAAAAAAAEAbgAAADgAAIAAAAAAAAAAAAAAAAAAAAEAAAAAAFAAAAAw0QAACAoAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAEAGsAAACQAACAbAAAALgAAIBtAAAA4AAAgG4AAAAIAQCAAAAAAAAAAAAA
+AAAAAAABAAkEAACoAAAAONsAAKABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA0AAAANjc
+AAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAADg3gAAWgIAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAABAAkEAAAgAQAAQOEAABQBAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwSAQDkEQEA
+AAAAAAAAAAAAAAAAORIBAPQRAQAAAAAAAAAAAAAAAABGEgEA/BEBAAAAAAAAAAAAAAAAAFMSAQAE
+EgEAAAAAAAAAAAAAAAAAXRIBAAwSAQAAAAAAAAAAAAAAAABoEgEAFBIBAAAAAAAAAAAAAAAAAHIS
+AQAcEgEAAAAAAAAAAAAAAAAAfhIBACQSAQAAAAAAAAAAAAAAAAAAAAAAAAAAAIgSAQCWEgEAphIB
+AAAAAAC0EgEAAAAAAMISAQAAAAAA0hIBAAAAAADcEgEAAAAAAOISAQAAAAAA8BIBAAAAAAAKEwEA
+AAAAAEtFUk5FTDMyLkRMTABBRFZBUEkzMi5kbGwAQ09NQ1RMMzIuZGxsAEdESTMyLmRsbABNU1ZD
+UlQuZGxsAG9sZTMyLmRsbABTSEVMTDMyLmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdl
+dFByb2NBZGRyZXNzAABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEA
+AFRleHRPdXRBAABmcmVlAABDb0luaXRpYWxpemUAAFNIR2V0U3BlY2lhbEZvbGRlclBhdGhBAAAA
+R2V0REMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAA=
+AAAAAAAAAAAAAAAAAAAAAA==
 """
 
 # --- EOF ---

From 47474c30d9a5ba83990c5370f74eba40d166d84c Mon Sep 17 00:00:00 2001
From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Tue, 5 Nov 2002 16:12:02 +0000
Subject: [PATCH 0878/8469] This patch fixes the following bugs:

[#413582] g++ must be called for c++ extensions
[#454030] distutils cannot link C++ code with GCC

topdir = "Lib/distutils"

* bcppcompiler.py
  (BCPPCompiler.create_static_lib): Fixed prototype, removing extra_preargs
  and extra_postargs parameters. Included target_lang parameter.
  (BCPPCompiler.link): Included target_lang parameter.

* msvccompiler.py
  (MSVCCompiler.create_static_lib): Fixed prototype, removing extra_preargs
  and extra_postargs parameters. Included target_lang parameter.
  (MSVCCompiler.link): Included target_lang parameter.

* ccompiler.py
  (CCompiler): New language_map and language_order attributes, used by
  CCompiler.detect_language().

  (CCompiler.detect_language): New method, will return the language of
  a given source, or list of sources. Individual source language is
  detected using the language_map dict. When mixed sources are used,
  language_order will stablish the language precedence.

  (CCompiler.create_static_lib, CCompiler.link, CCompiler.link_executable,
   CCompiler.link_shared_object, CCompiler.link_shared_lib):
  Inlcuded target_lang parameter.

* cygwinccompiler.py
  (CygwinCCompiler.link): Included target_lang parameter.

* emxccompiler.py
  (EMXCCompiler.link): Included target_lang parameter.

* mwerkscompiler.py
  (MWerksCompiler.link): Included target_lang parameter.

* extension.py
  (Extension.__init__): New 'language' parameter/attribute, initialized
  to None by default. If provided will overlap the automatic detection
  made by CCompiler.detect_language(), in build_ext command.

* sysconfig.py
  (customize_compiler): Check Makefile for CXX option, and also the
  environment variable CXX. Use the resulting value in the 'compiler_cxx'
  parameter of compiler.set_executables().

* unixccompiler.py
  (UnixCCompiler): Included 'compiler_cxx' in executables dict, defaulting
  to 'cc'.
  (UnixCCompiler.create_static_lib): Included target_lang parameter.
  (UnixCCompiler.link): Included target_lang parameter, and made
  linker command use compiler_cxx, if target_lang is 'c++'.

* command/build_ext.py
  (build_ext.build_extension): Pass new ext.language attribute
  to compiler.link_shared_object()'s target_lang parameter. If
  ext.language is not provided, detect language using
  compiler.detect_language(sources) instead.

* command/config.py
  (config._link): Pass already available lang parameter as target_lang
  parameter of compiler.link_executable().
---
 bcppcompiler.py      | 10 +++----
 ccompiler.py         | 63 ++++++++++++++++++++++++++++++++++++++------
 command/build_ext.py |  6 ++++-
 command/config.py    |  3 ++-
 cygwinccompiler.py   |  6 +++--
 emxccompiler.py      |  6 +++--
 extension.py         |  5 ++++
 msvccompiler.py      | 10 +++----
 mwerkscompiler.py    |  3 ++-
 sysconfig.py         |  7 +++--
 unixccompiler.py     | 12 ++++++---
 11 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 6e9d6c64de..abe302a804 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -146,8 +146,7 @@ def create_static_lib (self,
                            output_libname,
                            output_dir=None,
                            debug=0,
-                           extra_preargs=None,
-                           extra_postargs=None):
+                           target_lang=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
@@ -157,10 +156,6 @@ def create_static_lib (self,
             lib_args = [output_filename, '/u'] + objects
             if debug:
                 pass                    # XXX what goes here?
-            if extra_preargs:
-                lib_args[:0] = extra_preargs
-            if extra_postargs:
-                lib_args.extend (extra_postargs)
             try:
                 self.spawn ([self.lib] + lib_args)
             except DistutilsExecError, msg:
@@ -183,7 +178,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
 
         # XXX this ignores 'build_temp'!  should follow the lead of
         # msvccompiler.py
diff --git a/ccompiler.py b/ccompiler.py
index 60d1caeed1..317e21efb4 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -74,6 +74,19 @@ class CCompiler:
     shared_lib_format = None            # prob. same as static_lib_format
     exe_extension = None                # string
 
+    # Default language settings. language_map is used to detect a source
+    # file or Extension target language, checking source filenames.
+    # language_order is used to detect the language precedence, when deciding
+    # what language to use when mixing source types. For example, if some
+    # extension has two files with ".c" extension, and one with ".cpp", it
+    # is still linked as c++.
+    language_map = {".c"   : "c",
+                    ".cc"  : "c++",
+                    ".cpp" : "c++",
+                    ".cxx" : "c++",
+                    ".m"   : "objc",
+                   }
+    language_order = ["c++", "objc", "c"]
 
     def __init__ (self,
                   verbose=0,
@@ -572,6 +585,27 @@ def _need_link (self, objects, output_file):
 
     # _need_link ()
 
+    def detect_language (self, sources):
+        """Detect the language of a given file, or list of files. Uses
+        language_map, and language_order to do the job.
+        """
+	if type(sources) is not ListType:
+            sources = [sources]
+        lang = None
+        index = len(self.language_order)
+        for source in sources:
+            base, ext = os.path.splitext(source)
+            extlang = self.language_map.get(ext)
+            try:
+                extindex = self.language_order.index(extlang)
+                if extindex < index:
+                    lang = extlang
+                    index = extindex
+            except ValueError:
+                pass
+        return lang
+
+    # detect_language ()
 
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
@@ -671,7 +705,8 @@ def create_static_lib (self,
                            objects,
                            output_libname,
                            output_dir=None,
-                           debug=0):
+                           debug=0,
+                           target_lang=None):
         """Link a bunch of stuff together to create a static library file.
         The "bunch of stuff" consists of the list of object files supplied
         as 'objects', the extra object files supplied to
@@ -688,6 +723,10 @@ def create_static_lib (self,
         compile step where this matters: the 'debug' flag is included here
         just for consistency).
 
+        'target_lang' is the target language for which the given objects
+        are being compiled. This allows specific linkage time treatment of
+        certain languages.
+
         Raises LibError on failure.
         """
         pass
@@ -710,7 +749,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
         """Link a bunch of stuff together to create an executable or
         shared library file.
 
@@ -748,6 +788,10 @@ def link (self,
         of course that they supply command-line arguments for the
         particular linker being used).
 
+        'target_lang' is the target language for which the given objects
+        are being compiled. This allows specific linkage time treatment of
+        certain languages.
+
         Raises LinkError on failure.
         """
         raise NotImplementedError
@@ -766,13 +810,14 @@ def link_shared_lib (self,
                          debug=0,
                          extra_preargs=None,
                          extra_postargs=None,
-                         build_temp=None):
+                         build_temp=None,
+                         target_lang=None):
         self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
                   libraries, library_dirs, runtime_library_dirs,
                   export_symbols, debug,
-                  extra_preargs, extra_postargs, build_temp)
+                  extra_preargs, extra_postargs, build_temp, target_lang)
 
 
     def link_shared_object (self,
@@ -786,12 +831,13 @@ def link_shared_object (self,
                             debug=0,
                             extra_preargs=None,
                             extra_postargs=None,
-                            build_temp=None):
+                            build_temp=None,
+                            target_lang=None):
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
                   export_symbols, debug,
-                  extra_preargs, extra_postargs, build_temp)
+                  extra_preargs, extra_postargs, build_temp, target_lang)
 
 
     def link_executable (self,
@@ -803,11 +849,12 @@ def link_executable (self,
                          runtime_library_dirs=None,
                          debug=0,
                          extra_preargs=None,
-                         extra_postargs=None):
+                         extra_postargs=None,
+                         target_lang=None):
         self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
                   libraries, library_dirs, runtime_library_dirs, None,
-                  debug, extra_preargs, extra_postargs, None)
+                  debug, extra_preargs, extra_postargs, None, target_lang)
 
 
     # -- Miscellaneous methods -----------------------------------------
diff --git a/command/build_ext.py b/command/build_ext.py
index 934b4576e6..4bfc20c9d4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -477,6 +477,9 @@ def build_extension(self, ext):
             objects.extend(ext.extra_objects)
         extra_args = ext.extra_link_args or []
 
+        # Detect target language, if not provided
+        language = ext.language or self.compiler.detect_language(sources)
+
         self.compiler.link_shared_object(
             objects, ext_filename,
             libraries=self.get_libraries(ext),
@@ -485,7 +488,8 @@ def build_extension(self, ext):
             extra_postargs=extra_args,
             export_symbols=self.get_export_symbols(ext),
             debug=self.debug,
-            build_temp=self.build_temp)
+            build_temp=self.build_temp,
+            target_lang=language)
 
 
     def swig_sources (self, sources):
diff --git a/command/config.py b/command/config.py
index 88b1586607..9ebe0d9191 100644
--- a/command/config.py
+++ b/command/config.py
@@ -148,7 +148,8 @@ def _link (self, body,
         prog = os.path.splitext(os.path.basename(src))[0]
         self.compiler.link_executable([obj], prog,
                                       libraries=libraries,
-                                      library_dirs=library_dirs)
+                                      library_dirs=library_dirs,
+                                      target_lang=lang)
 
         prog = prog + self.compiler.exe_extension
         self.temp_files.append(prog)
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 9aabd8a66b..a046ee21c8 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -140,7 +140,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
 
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
@@ -218,7 +219,8 @@ def link (self,
                            debug,
                            extra_preargs,
                            extra_postargs,
-                           build_temp)
+                           build_temp,
+                           target_lang)
 
     # link ()
 
diff --git a/emxccompiler.py b/emxccompiler.py
index 7c3ad025bb..624c0fecbd 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -102,7 +102,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
 
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
@@ -171,7 +172,8 @@ def link (self,
                            debug,
                            extra_preargs,
                            extra_postargs,
-                           build_temp)
+                           build_temp,
+                           target_lang)
 
     # link ()
 
diff --git a/extension.py b/extension.py
index d73bb08e00..7fbeb4e1f1 100644
--- a/extension.py
+++ b/extension.py
@@ -75,6 +75,9 @@ class Extension:
         extension_name.
       depends : [string]
         list of files that the extension depends on
+      language : string
+        extension language (i.e. "c", "c++", "objc"). Will be detected
+        from the source extensions if not provided.
     """
 
     def __init__ (self, name, sources,
@@ -89,6 +92,7 @@ def __init__ (self, name, sources,
                   extra_link_args=None,
                   export_symbols=None,
                   depends=None,
+                  language=None,
                  ):
 
         assert type(name) is StringType, "'name' must be a string"
@@ -109,6 +113,7 @@ def __init__ (self, name, sources,
         self.extra_link_args = extra_link_args or []
         self.export_symbols = export_symbols or []
         self.depends = depends or []
+        self.language = language
 
 # class Extension
 
diff --git a/msvccompiler.py b/msvccompiler.py
index 65b114353e..a2459ad032 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -367,8 +367,7 @@ def create_static_lib (self,
                            output_libname,
                            output_dir=None,
                            debug=0,
-                           extra_preargs=None,
-                           extra_postargs=None):
+                           target_lang=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
@@ -378,10 +377,6 @@ def create_static_lib (self,
             lib_args = objects + ['/OUT:' + output_filename]
             if debug:
                 pass                    # XXX what goes here?
-            if extra_preargs:
-                lib_args[:0] = extra_preargs
-            if extra_postargs:
-                lib_args.extend (extra_postargs)
             try:
                 self.spawn ([self.lib] + lib_args)
             except DistutilsExecError, msg:
@@ -404,7 +399,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
 
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index cd66a09913..8f62bf7d87 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -84,7 +84,8 @@ def link (self,
               debug=0,
               extra_preargs=None,
               extra_postargs=None,
-              build_temp=None):
+              build_temp=None,
+              target_lang=None):
         # First fixup.
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
diff --git a/sysconfig.py b/sysconfig.py
index e879fa149a..cc571888db 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -139,11 +139,13 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, opt, ccshared, ldshared, so_ext) = \
-            get_config_vars('CC', 'OPT', 'CCSHARED', 'LDSHARED', 'SO')
+        (cc, cxx, opt, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'CCSHARED', 'LDSHARED', 'SO')
 
         if os.environ.has_key('CC'):
             cc = os.environ['CC']
+        if os.environ.has_key('CXX'):
+            cxx = os.environ['CXX']
         if os.environ.has_key('CPP'):
             cpp = os.environ['CPP']
         else:
@@ -163,6 +165,7 @@ def customize_compiler(compiler):
             preprocessor=cpp,
             compiler=cc_cmd,
             compiler_so=cc_cmd + ' ' + ccshared,
+            compiler_cxx=cxx,
             linker_so=ldshared,
             linker_exe=cc)
 
diff --git a/unixccompiler.py b/unixccompiler.py
index 692e3eb477..2f4546e1a7 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -57,6 +57,7 @@ class UnixCCompiler(CCompiler):
     executables = {'preprocessor' : None,
                    'compiler'     : ["cc"],
                    'compiler_so'  : ["cc"],
+                   'compiler_cxx' : ["cc"],
                    'linker_so'    : ["cc", "-shared"],
                    'linker_exe'   : ["cc"],
                    'archiver'     : ["ar", "-cr"],
@@ -114,7 +115,7 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             raise CompileError, msg
 
     def create_static_lib(self, objects, output_libname,
-                          output_dir=None, debug=0):
+                          output_dir=None, debug=0, target_lang=None):
         objects, output_dir = self._fix_object_args(objects, output_dir)
 
         output_filename = \
@@ -143,7 +144,7 @@ def link(self, target_desc, objects,
              output_filename, output_dir=None, libraries=None,
              library_dirs=None, runtime_library_dirs=None,
              export_symbols=None, debug=0, extra_preargs=None,
-             extra_postargs=None, build_temp=None):
+             extra_postargs=None, build_temp=None, target_lang=None):
         objects, output_dir = self._fix_object_args(objects, output_dir)
         libraries, library_dirs, runtime_library_dirs = \
             self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
@@ -167,9 +168,12 @@ def link(self, target_desc, objects,
             self.mkpath(os.path.dirname(output_filename))
             try:
                 if target_desc == CCompiler.EXECUTABLE:
-                    self.spawn(self.linker_exe + ld_args)
+                    linker = self.linker_exe[:]
                 else:
-                    self.spawn(self.linker_so + ld_args)
+                    linker = self.linker_so[:]
+                if target_lang == "c++" and self.compiler_cxx:
+                    linker[0] = self.compiler_cxx[0]
+                self.spawn(linker + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
         else:

From bc09b3f743da2691427c0a23f5b5aadfe90c7847 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 5 Nov 2002 20:11:08 +0000
Subject: [PATCH 0879/8469] Remove use of string module and reflow a couple of
 long lines.

---
 sysconfig.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index cc571888db..222648aa74 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -14,7 +14,6 @@
 
 import os
 import re
-import string
 import sys
 
 from errors import DistutilsPlatformError
@@ -213,7 +212,7 @@ def parse_config_h(fp, g=None):
         m = define_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            try: v = string.atoi(v)
+            try: v = int(v)
             except ValueError: pass
             g[n] = v
         else:
@@ -251,11 +250,11 @@ def parse_makefile(fn, g=None):
         m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            v = string.strip(v)
+            v = v.strip()
             if "$" in v:
                 notdone[n] = v
             else:
-                try: v = string.atoi(v)
+                try: v = int(v)
                 except ValueError: pass
                 done[n] = v
 
@@ -272,9 +271,9 @@ def parse_makefile(fn, g=None):
                     if "$" in after:
                         notdone[name] = value
                     else:
-                        try: value = string.atoi(value)
+                        try: value = int(value)
                         except ValueError:
-                            done[name] = string.strip(value)
+                            done[name] = value.strip()
                         else:
                             done[name] = value
                         del notdone[name]
@@ -288,9 +287,9 @@ def parse_makefile(fn, g=None):
                     if "$" in after:
                         notdone[name] = value
                     else:
-                        try: value = string.atoi(value)
+                        try: value = int(value)
                         except ValueError:
-                            done[name] = string.strip(value)
+                            done[name] = value.strip()
                         else:
                             done[name] = value
                         del notdone[name]
@@ -369,8 +368,9 @@ def _init_posix():
             # relative to the srcdir, which after installation no longer makes
             # sense.
             python_lib = get_python_lib(standard_lib=1)
-            linkerscript_name = os.path.basename(string.split(g['LDSHARED'])[0])
-            linkerscript = os.path.join(python_lib, 'config', linkerscript_name)
+            linkerscript_name = os.path.basename(g['LDSHARED'].split()[0])
+            linkerscript = os.path.join(python_lib, 'config',
+                                        linkerscript_name)
 
             # XXX this isn't the right place to do this: adding the Python
             # library to the link, if needed, should be in the "build_ext"

From 152918876946cf1aba35f1a4e4e7a9ff53f37acc Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Tue, 5 Nov 2002 20:27:17 +0000
Subject: [PATCH 0880/8469] Repair inconsistent use of tabs and spaces.

---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 317e21efb4..8898f51f59 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -589,7 +589,7 @@ def detect_language (self, sources):
         """Detect the language of a given file, or list of files. Uses
         language_map, and language_order to do the job.
         """
-	if type(sources) is not ListType:
+        if type(sources) is not ListType:
             sources = [sources]
         lang = None
         index = len(self.language_order)

From 5211b8478b5bd08e9237dbf35840eee043efb320 Mon Sep 17 00:00:00 2001
From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Wed, 6 Nov 2002 18:44:26 +0000
Subject: [PATCH 0881/8469] Fixed bug "[#466200] ability to specify a 'verify'
 script".

* Lib/distutils/command/bdist_rpm.py
  (bdist_rpm.initialize_options): Included verify_script attribute.
  (bdist_rpm.finalize_package_data): Ensure that verify_script is a filename.
  (bdist_rpm._make_spec_file): Included verify_script in script_options
  tuple.

* Misc/NEWS
  Mention change.
---
 command/bdist_rpm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 597b26c6ad..0dad1ac474 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -129,6 +129,7 @@ def initialize_options (self):
         self.build_script = None
         self.install_script = None
         self.clean_script = None
+        self.verify_script = None
         self.pre_install = None
         self.post_install = None
         self.pre_uninstall = None
@@ -208,6 +209,7 @@ def finalize_package_data (self):
         self.ensure_filename('build_script')
         self.ensure_filename('install_script')
         self.ensure_filename('clean_script')
+        self.ensure_filename('verify_script')
         self.ensure_filename('pre_install')
         self.ensure_filename('post_install')
         self.ensure_filename('pre_uninstall')
@@ -424,6 +426,7 @@ def _make_spec_file(self):
               "--root=$RPM_BUILD_ROOT "
               "--record=INSTALLED_FILES") % self.python),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
+            ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),
             ('post', 'post_install', None),
             ('preun', 'pre_uninstall', None),

From 013ee1e07785651f7b0bc75fdd3944b6409e7a31 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 7 Nov 2002 16:41:38 +0000
Subject: [PATCH 0882/8469] Fix a small bug when sys.argv[0] has an absolute
 path. See
 http://mail.python.org/pipermail/distutils-sig/2002-November/003039.html

---
 core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.py b/core.py
index d180eb8cb6..001e74be47 100644
--- a/core.py
+++ b/core.py
@@ -87,7 +87,7 @@ class found in 'cmdclass' is used in place of the default, which is
         klass = Distribution
 
     if not attrs.has_key('script_name'):
-        attrs['script_name'] = sys.argv[0]
+        attrs['script_name'] = os.path.basename(sys.argv[0])
     if not attrs.has_key('script_args'):
         attrs['script_args'] = sys.argv[1:]
 

From 5ebe4f2073b0cfd36cbbd01e7c3bd18ec7a1f773 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 7 Nov 2002 16:46:19 +0000
Subject: [PATCH 0883/8469] Use dynamic linking for the SHGetSpecialFolderPath
 function, it is not always available on Windows NT. When the function cannot
 be loaded, get_special_folder_path raises OSError, "function not available".

Compiled the exe, and rebuilt bdist_wininst.py.
---
 command/bdist_wininst.py | 662 +++++++++++++++++++--------------------
 1 file changed, 331 insertions(+), 331 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 029a026b62..97a045824d 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -265,11 +265,11 @@ def get_exe_bytes (self):
 EXEDATA = """\
 TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
-ZGUuDQ0KJAAAAAAAAAAtOHsRaVkVQmlZFUJpWRVCEkUZQmpZFUIGRh9CYlkVQupFG0JrWRVCBkYR
-QmtZFUJpWRVCZlkVQmlZFELjWRVCC0YGQmRZFUJveh9Ca1kVQq5fE0JoWRVCUmljaGlZFUIAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwAvl8c9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAMAGAQAA
+ZGUuDQ0KJAAAAAAAAAAjSEomZykkdWcpJHVnKSR1HDUodWQpJHUINi51bCkkdeQ1KnVlKSR1CDYg
+dWUpJHVnKSR1aCkkdWcpJXXuKSR1BTY3dWwpJHVhCi51ZSkkdaAvInVmKSR1UmljaGcpJHUAAAAA
+AAAAAAAAAAAAAAAAUEUAAEwBAwCllso9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAAAHAQAA
 wAAAABABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAIAEAAAQAAAAAAAACAAAAAAAQAAAQ
-AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEA5AEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
+AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEAoAEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVUFgwAAAAAACwAAAAEAAAAAAAAAAEAAAA
 AAAAAAAAAAAAAACAAADgVVBYMQAAAAAAUAAAAMAAAABKAAAABAAAAAAAAAAAAAAAAAAAQAAA4C5y
@@ -280,332 +280,332 @@ def get_exe_bytes (self):
 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
-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
+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
-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
+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
-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
+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
-UGU0aGAzwwbysgywBXitsO4bbpp0SqZmi0YMUAQOQ2uuseF2ueRQVCyrR/4a3EclIicbCBt2FFEw
+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
-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
+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
-cJNAZVg3ELl9SMtpAl3DVmQrS7t6CHdHth1EI2QA7F03AWdXMks4BDI/V7t39l/YUFNBdDsz/74c
-kVg2PLv/CDjYKCqDxghHgf5sGnLjOmN/X2iIfTXUymLJCy73w2+LBP0YJlsf/FjnHjxqFEheEhLI
-d2E2U5dV68xMdKtprOtszEqxpixzVhAsy7J9Vol18ALs6PT8hVvltvg4OHJkfQsBs92OwNSUlwgd
-z+hQA+xC0zRN9PDg3OQnKz8m5MiUJHc6ARy1Bt1l/NB0qQEFmhuGTPbIQFqk9o1V5Gxh9/hSaOAg
-iwjrER90cvZzBLAZUVAaVCEnIxPcHDCakbHbOdd0GB/wLAjr4LZZDOtyHOx02Ogf1jwZGexE5JNS
-PHMyNsj09BwkuBUO5sY1udT953gumSc21uBW4nD9jZUszdj2G+5SNhg5nBjchCR7yCfLLHNjDcUG
-JQhoDLWuwywiPN8kJlATAWM2mx8IG3WFzTzjWV7JdAAEdltx9h3KjhATAPz0FVCbzELTyOAIlUiX
-AWX7jOwG6QCbdHsCXiUeN7chD4X+oWTKSZzQPnKQmSiVCWQPt15xiTtuDDX4acHgEEl9FOGam9t5
-aAFl3kzL1i59jYBtlAIQrznGxKdZnJNQVu8J9Hbu2e7hGWowG2ggZSDwceeYbcYG7OtzitSGHpzA
-2QwgeEFqLl/vQ5Y+dEdoCB9K+iZ3L34QdTayYcvrljlhb/0bCohl2OsbV/SUbQvTA4vDYAMIELNt
-S5iARSQR8AsgwrfdfYkGoXi2bYlGBAM1Cl58+C1cWLBWOWK+CnQ1drhYWIJNy1F4MwAR7xCah018
-VpgI5vuFc7FwbQx5pwaIHbAzkxAooJ0r8GeT7nOSElY07CNqdzgL7xBoQPFpQDGF9+4lXl680Dk1
-dJ90PYM9B25XusUC4WokpS1oUAQCD70JmzHiBjl3Q+y3BAd1zccFKvPrwYk+Z+Gaiw7gUd5A2GSj
-LwwPdBcNFLljfx3jCHIZC7DwwFdQFATL0MWhcl7jXZ/LZt1/U/0KmVn3+TPJaNx8UQDIdM7dHmi8
-awnXSIZal1mWRLbXGngYGG62FBVAvsC3ODuHC7XtWVDYDwFhHTwaB/Ysw9NoSnU4cCMKukfvawEV
-06lvXzRruDNnn5789ZXXE233QubCEADauAAGT9qaje5XDOFO9ZSBCRDtOLVkJw+sKOgIVzHG2Ngh
-DIoAzG50+HOPYrhyIv1rVQbD8d+j0L0q1scEJIBk3MaHk6bw6DAaNcxpFr7tbBpQGwNB1s25kc3B
-Gp/9DODKAAQ+3sSGX4TrJ76BeAg4QBlmz3WNon5wHdF0buFFtjcM1fVwp3P8bAv+Qgh4dTlWyCn+
-9saq4IihHUCLUAqNSA6ao9GFSVFSIqycMEv3HkajMCwM3G+QhkH8EN7w6ENGBVOENdffrAhHLQq1
-BeUJ2ejb1lv0ESvQK61SD/grVfBC7dBfqlKZK8LR+DIV+0RkhNnHDYXkhS5+ubyDfAJ+BrjoB8Ou
-wt/Hdg4IAgx9Bbi4E7gMEZ6jArgPi4QkFAtqfuxuLnROV3PlArQkIBOLLTN0dT9/LcIA9CvGFUUu
-Ntvdpii//gtmO8cUAMHoiFw4BAPpzxCk0wsJac4QC9W7MCHIwt0xOlNoZoBXVtv0BshmOBCzvBYB
-YutM10ZIixnVWIloqtTamhBkXoxId61gm61ohhlkdDSAPfxaqXtlsVPjxn0AlwzTuWQmTBUcIS20
-MdxpN3xRz0PkJIeMQCkgvJZ1uYUB60qMFzB86FGa9B5W+Uc3BaObUQFJX9NDcOeCjMOIu8QUdU6D
-r6Ws6ChBkb+OyDa2wPTvo9MI8EgXKXdgm5EKyQKL4CCDeHbrDXZHdhhomXi7Pg4Osw5eNSpTXwOg
-UZDJKYrU2BEMTKv0b1pQHvvUIsiJgEpkzARGFujc/hscSegQxp6F3t0CdR9j0DUiVOgOIWauRBAw
-EGXOcBaj5EDrzUu7gbWXOxINNQ2N6mZVaIOPigoouo3+kBEUgHwEF9oRExjBuieM9f93BBMcDo6X
-LHwKWfHw60vJCsYhmSz9O/TT7Ag3R1dXp2j+LQPh1sKGr3UEq+sgA1dg1YKENR8bLZ112vmBxFT+
-gdwCgoPtD6n4UzPbdxkAa0dgAceYhr38XBxw9BvaSCEHNrgSCVdqUF8/ash1A1MA+5jd+Ik6C8Tc
-ffRdJzHy10X50B88i0Xawx+XKHAhTTgYNBaYUXpmWxKhK6VEz8Z4tgv4cP3WEUj/c7maNETKf0aA
-tdls7KAcf592bvTodV2c+vD9AN87WbYa8AA5XhZoBi+CwIABMcFj7k4i2Ogv3llP6Gia58zYwCJF
-EFH0dzLXvfEl/PPwhBaLDV69WF4RKZRZA/KSW7UEEAwQ1E3Xz3LzqHYt8QKvTSoht+BwCNXXJCo/
-gunMwtPrECjZxzk7bB3sGCAggm1wv2YWKnefFGslsE5gh5ZF69HzwYQl5BokaCth/Yi5qBSYTwny
-F7KXjYB4aYuEtscNP4tACD0xEXQtPazaTxjBkuRh7Z2ST802Sz0YGL30Ve4YEIuJnzC4XwoGGWmh
-XN4NM1VVxzh2zhygFBZsUYThoXdKMpNZv7L4JFqugF/OE4Hu99vEZHsYJ0DJBaS3Xhhrg19uAslN
-XB4Udeo2lz6QtqN0Sbv1b+a2aqEgl0L+QmAyOrjQDpLwU1Y50kn3FGrjFHhDJW/ud1hVPdicSDto
-tAFal1iqhfYxPDpgNlhGVkMFXXaKIZvEBBDq1t5SL9xgHKwKmVvE6drbVPTv9wnok+Zkc88K1PjE
-GlFOmvy09CW+q1aM3UeFSjvedEPB8nYrNnQ+BPh0Ofyhrhqgtx0vsSvSa7Rrajk/oCsPlTNbtRuj
-bVUC0xr8sBUl3mi0PU3wFPhHhoPI/ynH1gO6blAQSJqhtdMSanIaR6utfqz/QARB6/ZjwVt4/CiF
-pCFWu8B9ehDGoFMX11a9H1ZVUYjtkhBBFIuxLf4TkbgBkQD6nvfYG8CD4CtBwy1TwGOPGGwFCCR5
-h9UgaCCZouA+hPv/lCR0L8t0BCYn7BY79Co0aBgsLFBm4JoFM5OHSUtwy4gswBreBPf2i3YElHWE
-i1Kz/UCz4YRTHLAocjPXEhRoL8lIV+ozmwk6gB9TPtQJHDqZOywlIuvbNl3ZzBPCHBT8QgQTiMXj
-vqiR3K4WvEGrFvSKDwV1HAHeDUr5C5iak12a7Qgs0BlFGYRWzcJpwhq+/4KMU2dkgVfFn+SaNltn
-sNcNbC+Qo2SRLRpwrll8bmv2vaC7D9MFNDwtRDrDYDgFAimcPVczA3UXyEYQ7B2jLFBoMK8RNpBK
-t2tII/3a6QVmg9kkjx0Ua80G7ZnTIQZQADBONjgwrcMUGyQ34BWwFWsMmlb4aSwnEKB98AExPQZy
-MwxoU4r0mRazVy0Ek7M6SASEE+SZHvYj9F5rYYkQQNg5kGVzI5L0GP5gwUaywJk3sjYgg705j6BW
-JfJAuGGkaJCZnoyZ64ObS3ouPMvy7OgWjNU2F5iDQP32XWa2C5RHVktgyw3Y+wEgQL5QF9BWKYBN
-kMxWyE8b4LHBw1vclBQREODSJVbWfQKVN5sn2wwjAASFiL4guPt4wgGujgL/PQ+VyBTdKPWL8Xjg
-FjiK/JwECW7cwrXo4t/wxzH0m2L0vi/p+OnsuHQZ5NmEuxDom+jhXjA7VgxAsojRd2vc9Y2NGFEW
-Gy8LFsabTBBT5qgVvjE+DbzsuBXBRRFjoT06UUmODFBIWmh0oxSwNJuhY4Zbb6E1vSBQZSkMWBrJ
-ILD0f3IjS53zliAkBRzODmR1stbJ/KcxMF3MXFU7Ms/atWcdagJg1BwK/xhQDmyDYHfrgMwMbIsd
-DH3rFh9TmyQr1iBYH5wV0kEy12y0O8q+hXu4111cscSPiUzRmcBFdX/uLZvRRpqDsBSbjisGex8b
-rHcogKQ1Ji1QsNTQBGOi18abaPc0m9EOwtPIHecGsdhRgUrrdOliWxatg1sV4eosNTeIxebmdMwT
-EUhmKOCPVrfgF8O2Vi8AKqTrrsYIOZB+BL6cQA6JkSAwnSVxNklxHArsnWQTJ93oFQTkqOyc4qQ5
-m9QK8MQIdGeHbN60nKAU9AqQS4VInODIEgRDlpFlMwjsOugxZBlZRuQo+B/ZSphl8BbyEA5u/0AZ
-9K2LTeA7zhv6AAoXZmvGB/ISut0Vx0SJHYiLXQw1iQ3N5ooG/6PiG8mAhK5lujsIwI2UU/0xxo7t
-WUJZ+XUfH1MND6T4Z2Sc2QPpxOFbpCTcaFAVUE78b1+4VhUYVvhK/nQ/+gou3mg48HtbCKMG6mgn
-MA3Mo3JbqC/XvmhpqFV+NifErx288IPGEDKB/oJy5Wh0omfQVeynS4uRMb6x5H6UFL2SynGpByLr
-AlIdDoMxaAzdVvE1N5g5TvzrBfFAnRm8kDz0EeubaFZs8ks1XnQIwM8VGndZycG78MbLdGoLWVeN
-fcTO86sGV0svUaTwq6vjZGwttm3sDKsakBOMG7+VtcMtFw/UwDCWLy62RnwAyPYc3Glu7c0UXBvY
-uBsHBsxrzhSOpyfWUBYrZOzOdBJsIFodQBn0l5w8uW0QIvhunaOdJ00pn9d/jNoa1L00XHyYdAWU
-/XbL5mkFrIx/kCCbdbQ+gNuyAryoD6QEbCSUpIhQXIy6L15wHaw1aMyIcB69vAl+9RmAVbuEUFO+
-4DLQlTBgFgRWvh2pBxpgakO38yCXLcDZWa0QQVX70MNO0ZYoDmsn2U7RZiM9cyjE0gEONnstbNRq
-3auTsRXVoxYUpPlmKiHYRQpoMMs30g3klFuAjLLoRcPMgBlFftjk24+4MnDDIRxQo4TZlYHZQh5P
-R+8BmLinoTpPAc72DTFbdAdQE2jWN4rVNw80JGwAEHrbACZ8VhpXdG9PVSrViVm4KGa9/aX6g/8C
-dmFtdU6KSAFACDB8Svu/vLwEM34ebnQMcnU7QMYGDUbrMwZ6g/4WAwpGT0/rJ9lqCFEMfz9prKQ8
-CnUFH0+IBu2V6uDfBusFiA5GQE+ombokjMTba4AmqNIo2o2Pwqn31cFWRGHp+MjYA9zdGkAZ5OAD
-GmXAsQB/yhCanIHrDNRoTcJMoxwfw57YuyCeCLG6ZmtBqyUQZncXiU7DBboUnmb0G3jiGC3H2O/T
-nbEZBgzUVnOMADVoCTgy+xEwSrPmSi4ECy3irvUs0a5XFPCZCgkJ2JkYBhxyL7NkcgDxrPGkzLYQ
-h9ZPU66MIs+lzhRQOKD9ntbJYKddEWiQSUGsxCsSL9nJ2vfsJju/UBBXwxHsBXMbUjQSEEUdhScj
-FNT8akQlhIEx4qheVo3iEdA1RyokdtQBUBxQcJvdTla3U1NEKlNmtJ0stE3Y0ohDj4Qw2w3xAPEK
-1moPGIAWmZGe0YC4tKw2923PuOws2AjWLBN0MDyEdzUjUVEf5L6xkTEg6FShW+WzwRcdQNjd2y2L
-9L+Ae0NqXVMS3oX/WXR9gCcARwP/4LVWV186dAOAIGkBqzap6Ljv1IvVF7xWzmWT7XBgSS0cJQjJ
-aiWXFnSeAwDY8hDN5Fm7DJRccj1sBDYCIZOM0Tp/WcGJzYN1Al7DoQ2V/ruIDkaDOAF+EA++BtHF
-THdmoyPrEaxQFYsJimBnbfoEQYPgCFPQVmReT5KvyECQGBTLwhvCWd4028PsJhQuEUBTaW8787X9
-saKLJtmIHkZWlbUGOlnxNvxVhEr41Ot5qVPc8Lie9EMzMsiBhjW/VyA5SDlrhlNTkkG+RwApDLBu
-k4owe2KndDaUoYUrkjmZhNRDk149FHVAAFJBKl9HNVuDNQgr+KLsV6QmqUhMRldEf78nuQiInDUq
-OJ0FX3QarOQSvFM6CaSecDGDIlTh9tGBPPBHwBiDywUcuNQDV3s2VbCpd6X8GycQdAk7tKBcYQMD
-vW0MIwkZS0KD4Z4enAO2ZeFUHggEDdwK/i5YkgmxEWoQVmhAoB493kPrKMvfSlc4MPpRCEzwUlUI
-NItMKNsNj1Es+iqSaigaKnULaLAL2L0YIhkpKhYdOAU4mCOC6O9BMjsGZxDes5IIKAYURoKZHwJZ
-WeFePmLo5xWENecaxmzIgewWGvF7rt5atU7rxMhLUqVgBg12aefeGvyJBI9BO03sCXweg3bsa7K1
-Ngbo87w8TAeYM5uUv7awhSa4Qmv3AJMd+YUDcat8mzr6oA0gBnRFQI0DApCEywigxJ8o/h16ILY8
-0+r4V3qgvU/fjkAPqvcCkO4aFuf4X18e/zBTZByCPRsNM4sYzMx+H6kr9lhTSzvHdUUuJOURHkof
-8xv/CXX+gDgimI9qWgmioRZhtkeq37pxsMhmtgixMfxewBoBOaDBeHlGDuSIEJWiOZADe/TrZSl0
-CF/Jgf0jHetCIWDZ6yA/B3IgTAclNVnOhQsLsPhtTfCK0f53AmM4+6RotQWIEkLQ3hQR1wQanKmB
-USBzYA40AxYvuatQaPieoRSWdCfb6xsf7FQc1AhvMB7UQBDAFtZALPQoPsvAhNIVhh67BQzAi1Nc
-4FnFV75kphOduuBWN4xZCCF49C+qK25Zo2xFR3w+vQ5oJKGGrHB7aEbt+EUiMsAr5n+jaC30Lhh5
-EB9E62FMLNrnIn1G1yWnDDAOOBVNx30m3SU/FMj9DyG5H0B0HGoGaBxnvj4B97sWYgdo8CcFcICB
-0V40hqOI0UhjUUhfDpgqNJqQXmzR07EpqHA3g4crRekoTG8YlIziBA/cVjwLHcUHre8bAARkqoEg
-Sdc8MBDaqqLHCOyKLcD9N4tVCBr4TEPxtxcYK0EQAgyD6CKBORJ9F7BxjTQQCMNIPnpWNBJ10Caz
-C7enjK+dTgH/l2oQfw2L1itWBCvRiRWNXSI2jStGcRC7V/6WrPqtDICJASt+BNexzpgE4nR32JxU
-UmwwK+HqIxaNXNdUZyc/mBs2BHbIFSyiNSLyLdHA3UqKsXQuF/WCDwhC/eqkYbiNsSHrrjxFoEfC
-BmNGzABUZfvb/zPSO8JWdDOLSFfKdCyJUBQCCLff6v8Yi3EM994b9lKD5oqJMYtAHCAUUbzwIHZL
-MwzAuwQAuEDDPldpCJAAF/FGND0IljqLRtPRbc1CMyMkLD0UDQr15rZPdEEsPwgeGihQUcDc0i2W
-JA3HAABUvkr0Ee5WWVf3wqZia4oBDWY6wYvFYfvX52d8JBg4CtyO32LE3s4793UKP1pkIIl+GHwX
-b03bCmAgsFJEfig5fiQrOnNrkA4k0IFqrNrmKlyEAyeJhi/8J+k+/EwkEIl4FItWF8+Jevbvd60M
-CLT32cdADAF4+Qh8WQS29l/3D39UH7gR0+CJShBS11E+bf8XN9ob0lD30oHigFFlUoozjPhfV+EZ
-OEFPVjl6FHUPw27ZqeNuDizspMKTzboLVhvJX7j6aTxPWDIQcVNVEEIJtqqRBIN2NLfdLQr5A6E+
-ABPwA1Rvqt8oI16D+gS/+8mVw0u93x7avwXB4/uJXBmJCMgND4fEFR7eEKIkjdBCGQS2O9pGsz2I
-SR6JDetBi/FtfGsvBYsOihEcBDUW5/6FvxAEg+EPQoAKiRZ0FccADVXdu0vmBWwYtKF+66Iii1AO
-7MbtEMHpKMEIXXYYJKCvtR1MHi7uFwW92xVungQRSDPJjmYIQHb2uDV9i14ciVcGib0fAxP/S7zR
-iYRDBMGQA8H39YXSdCHH6WLuvQNWlNHdX4ib2/jkaPbBICWBYykH5YgNOyYc2FbB9aN92jQ8a6Ru
-QyHY9/11GKMCVfNabW1pMCyFaAKSIgHBpTa7T2kCc6AzjUjNuUhLe1IeEkRU8s22jgz5C9gMOeMI
-XjBnXi0CY+Ttc4235uFK3MHhGEgL5L4u2dpJNAn4VlYojLUbg0hCiQY6HBQB+1tXkIFIN+IQA8qJ
-SDmSi+SSCr4IZksuGQuENmUON+Y/OUg0EjZgNkOE6+UzWUAIyIHpcKSm+iHbaAJ1CYvHWYNzbtnC
-CKdncmpjnckstKQWUEduxyWEB9gBAzkWSE+zZWm4N4oKG1Dh0T4kB8iRVgIEDtghhMnSIIkos4SQ
-EkYhH+w124V4TjDzBrj4O2EalpFpLGDLZrOCcAAlapbk2woA/QxDASn9Ym7J/QY4Cwc/bZplt0x+
-A3RBru0oQmmWy84PA/U/YkCX0eBlmq4LG6y4W+3FA0l/01f8egu1gsM8iUO74AS80Z5qD+IOvutH
-KFLrrQMbslfKdQZ1DT54RzawV1HqSswox/KCwLbdAUY0AjAOOO64gs/WUQggdA6q1nZrXb7QH2BH
-MMDD30L0FUj8bWpqvijRuWRjIMpV9nQhByXkzRNPKOAa4WhNScoaXTAUOF/Zl3pXKB5jMCuMkPbD
-cs1gBuhAU1woKB84dzoHnytRHi6gQcIaojYCtvDWJf0D2B6JXiy8OMgvFkNiBEmq0X3oZQCD7KE4
-U284xtZAa2H7KUOyaxKbC7i1SC5LNE8QMP5d2+JWO8i8VAoVRHMFK8FI6wXyBVxbLAcejAOD+AnW
-f/DnGQyF7FBA2BiD/QNznOupFb09kJYNxv9v+4bkSIoPxxRMlIvRi83T4oPFveu6vwhjC/JHMYk4
-iS9yzusEC/xW7TevwweLyNHotQFUwn1ToIlLGHeRY9XfngU2qe0DGQHNHAfB7gPQwab30+4r6T+z
-NH5BSG4LbRNFUo2whI0NMFG6hk/sDjhSzlHcJFwhNMTbdfT45VEPLFIQK9B9oN4QQtwUia61zNhz
-5u9cWHEGb8iBxWEUA/i6eOsO/VgUziBzLKn6W6Dh3PqgBj9MLE/2NoN7LnxAJwDy1K7UxIWWi86C
-4Qdyb/8t8OoQM9Gvojjti8E7xfoEiWywg3RrXEsmAYuJA+no3LbETNIXvCrHHHzXDpsFhZ0WfBpE
-O9Z1I9d4Vze/i3souRmL1zuxFbZdKHxzByvCSFdkK/JziTVGha47dWe0TEFIBAPYWqPhUzQHUgAH
-RzDwNuu+atajTDoxK8pJuz1H2/9LLAcEPlV1IGI3H2Tk99byTovOwovIJtzZJqResAs3WGgYBcl2
-ncI7QmsausEFwT4URDAkX+h+iYEC86WLyi0c3wMr0PPt7Q6PpNpcJUQDUg1M1260S10V8CsMFonN
-tWDoeBwpAWhdZDGEEYIYhwcqVXIgj5YOczgydB8yxg6S0iX/PyXIb9licyCYH4cdBtabu2Oh0Dzg
-CIH6oAUT8jfYGooF8wV9H0aNhKWbM9QIAoh3A0go+eP5bJxQYQyNBQ5I91nAfA7HQwhKA+sIrtGN
-prFxU5IIEQqDv/N0oWItc2hZMr40BlqYTCUDLAhBS3RETrGL/FBrsP3YREsMxQSRYQgIA7uHuUKG
-amdymDC4E7XJ3g+hyHMhPDTHMenmCu9pNaA3IHLfcGDpS9saJG9DEI1TUVI2bc7QNFfx41BRSuwz
-u1JwBPCFIfuvsJBtCOYFT2WdBcOH0DTiHzc1AkffTrxdD4N70lk76HMz49fW3o9KOwXr+vlKmG4I
-zb329PkH+v4uHWsu+c2LyRC1uRQjxqC59g7mVMEBjeY0du12t9W0VRCXNHMbySvq0WtYcK0MRYQS
-inFApKHfbYc3OkAjErnNdAMzLvF4fPKD6BLNWSsk+PKwv+QLH8ALO+lzO5ngBOTAugUfMJ3p3bn2
-aMnsfHdViwyNau01+qkjziYOFGJwarzX1JAb1xX107mMHOGMCh4D0DtLude7KoepddMqORDuQo0S
-6ZnwgpMVVPjmYg3aHYr86wIA0B6+vagMQUiZj/x19XeJXnuZOJB6goWYFUDM9IFuJCZRUECN3wnh
-WsdmLCRRElI8NgKu4q87P1FCBeZrWQORjc8UZQkHcZYd5kAGD1BMJE3upOkfFUwkChkIAddmHyU0
-z3c9nxDYvqc8ICsceVCkIctzx06EVwQEBhZ4gG0pSA9zXmsXW7QWPDCX2ATQ8OLrViudOANWTOhT
-z1Zzzk3uS0MEmnm2hesBe0B0VnhxdiVdtlQAHSQKD7gnTT4NIzgUnBkYsSnMr5VAmiEYidK5JBuY
-ACwAoeu1jYOdz4smaJqW2jX32m7plUxRd4XaFx1ySaCwkKEzxqENuwYww+BRXGFmjTfT/cszGDCi
-P1X74bfnUfLk12r9K9HDA+pQTp7sSgZLTI0xi2lsrmHZOVHQKwFmkuoEst0iLxVSUTpDln1rs4Uy
-asdBGBCD3I+19ktGQEhIUYl5BEYDRxjCRBgRSyDowTXahLOs8oSn9gZhFoQVUsjGuHiPBFTKxDrx
-+QwAzjlBBJMG9xYUit33A+6DUaYEgntP0Vi4sGBoCUUTn88hBMKHnmr8UJR5O4xkQ5DsoYzPSIGE
-wiuOGGWzNxKd/XUGW6XYInsYT1GoOkRI1jHXImiUFGWMsGV8nruBy7pWkVLdUAYS0gzCNc/QCpkE
-99r+gf3nQjDEXyRMwgFbSBDsGFKEe4SyQD4JO1LyRgpcSFBSr9d7tqYHDECmZuWE7g7nQVBWU3RL
-aHPvkVPRdDehe+ggVPnbRzcuiVYEf1Ar1YtuCORbybbjbn0+Zgh7ZIwDGDFDLovHTGvQauFWVcVj
-Q0u9FNJkVpk7AtIhJJ2YoAJDCBOXDRiRVxOCTFNPsIW9xtr+RUNIKkPLzRE8/5RE6gMARityuWyW
-R9rBSBBLt0+u6ZrlHlBi+CcWeAMuKWbA+Usb7wyAS5EBojFWV1wpCnAYR1hpKBfgKd2LWEYoBzi/
-1xgNGAhXYxoL7ADpT7fAjRiku+/ddQoANMBn7MIMAFsY3zt+uaaG71WB+7AVmcNyBbgIKyv+uIvY
-gg+Moa3owe3bohC/RWEQihaDxhvIIWfvrFbxA/kI8vMhhxxy9PX2hxxyyPf4+foccsgh+/z92M4h
-h/7/A00XQAk2vGSfGY1q2zoVFhJGE0ih+zZ2t8ENufHy9/FMvwiLNa271bb39+uL9YcTMV0XBIcX
-oFtUXwvBCGUT/JiflQhQblig7JpbCFAfGxpXPKlGx7sEww8fHKE3K9TYLYUiik+jRTcC77iIUBBa
-DIhIEXUAAA4D7qAPSBjD3xTQwisefyB2zgOgsWDCRpLwVshhc9GW2m4MwQw0wdM04Wp+xbwQwhTo
-g+1GLAeJM006G7/iBt/+BmyoWk89EWihQxwanc7ByFnbEAoKkmwoRrZytfx6LIl+O4wpK22rpQUi
-e635hYkGVqqWSmXcVeCUAzbs6FZSIk0RT1UQd2R2Tx1TPOrIo34cuM50rbhInSgNQK40kM9Q9qMw
-eqP/a3KldBNJ99kbyRkCg8H63C+2701hQ11mYxArlmolxBK2RbI8rN4aRVj4c0RAXAS7eC5Wug61
-7TAAuRfgFbKOz9Pg0NrPuS8AxwgLyDZ54CxBP/edje4KLHK8roX4IyBSMLZUCFbISRjXa4RHvxTT
-6LhuwUXiLbj0K/hAigHFFotJx0yzRY+VCAavqBCtRHehdIPgD66LrwXbJuliIh8CQK9Fwzlz0Lao
-IAfjJx8H5pDODYLaQhosYO99r0jcedDnJx/JN9gIvosETGvtfTO5TQQDyM6tkbC1mela1HID19Ng
-MDS3QBj1RcxlMIrkkF6WA6RhEpZEZAxEBG4WDAeF8FJlDI0MweQBQhCIQdgCQw4ZAgwMBSgwkAVv
-foBjAw4DaxXVTE3q3XUDwis3QNa8QrTnH+0jlrGJ50c1WgHZhZcsLdJm+1SOdSE+MDvBEeCkUoNU
-LSkMqSPC9vsI6w9/Z4aTKG3EFFKFcobMyEhiPAxtsJMbSGJdY2ElskNuIl6PYidhhLie2wGQQvMJ
-iBfl3N9K/xFBSDtQCN/N0fHcB04MZklhz2xIg4EoN7AA48ZHBQrgTQqEgb1PiApCSES99gw8AVfP
-FIsrChQ4Rrfix0MfK80TJELWDBcRqvRXN9OdFMNKCTAY+FQEXgABYlBlhblBfmr9K81TVlBJWahs
-c+DrtJiKP5SVB4kDPoP/B3YVeyX4ez88g+8IkUyJwhI6w0w3ULaLuaBVh7LqYsr0xo6zTiA6K21u
-Cr3BXzz5Uyv9i2tk74kLW0h4NML+EkET2SKZATv+twtfJJB0U3QxVAMMVdBm2SyQTlbE4ldG2MTS
-u1kvV+1Y4gSRRZCv+QwgYwl66FFTbCAIE3aJmESnEGcNPjpWPXUJoVtZdRx1TQU/slZVGY26U7oW
-dQPrIFJVgQETlol+UYVLnKLT/Uu01f43GltTUsdHGES071KcqIpXNF1eTGq6228e+3QGg31udQwf
-IL7FwmIuwjApKvf3hM+B7PCijCT0BgX6UOz8tCSi7VfPmqZpukQDSExQVFhpmqZpXGBkaGwBb5qm
-cHR4fImsJEKJDXJ7MgHvfoEuvf1chESNRANDSom67TkI/8pXd3UfcRiBlG7AiSmJW3gxqCoIjxqc
-F6Cnvhi5EY2YOzeAL2xDOSg9QYPABCZ28/H4tEF2+c1zBpr0f+y7YroPK7R4OS51CEqD7gQ71Tbb
-Lm4FO/qlLHYlVPq+t/8b/1GJO9Pmr3MSjVyMRCszeCVTwwSI0Aa70RFy8m+Vo6Bb4WaFHAxEjQMr
-8U42o166QHkQEaIDzt/a4OvliCwL9kqHM9sDTIX73dwcSEnljBwXde/dA33FGO+LtM3/aodbIxwV
-jIQcPXg7tgtljYwNiVx4QokR+Kah8BJ7HAhDO9lyxcjY7Y5Xi9/3QowUNZSGAqfZiSFdA3GZqO+Z
-JB5hx9MRv53OABLEHTwPj4ECikSh8TM0ZYcNAu8FHrkKO0mF0uwr23vb3D4g/TtND44HYBQ4yc0i
-B9YsLfhE/79gbLo4A98r00UDzzvXUbdEz/AmGtccIPp/EtBJy7iNfQE7x3Yng8//t2GJZvcaLcdu
-GEEEbWFhAa59vsVt4B91pmr3dgcrxxJy7SE3v0d92Y4754uxfAP4gf+IfThjI9jvJiArLMJ6B3s/
-L42UhNg2iTgTXZ96o1oqdDhDiEygtGL7RYSELNbLiAUxwq+XaL3G14tK/O+L9dM3Fr7VwUMr8IkU
-O3Sf6wk2vPd0Shgo4PAGj/83HKErWoxuitAJHCrTvPHptog9MYsIDJF/cgfGK7qNDQ7A6583KQyT
-/qNCtPFzQckb0oPioE1Xdhf2YIhx6yAgFMHv1qb75gKKFDEMEIDCSzQxIV+03BaxBPYOhyRiayML
-R7rivLQ7t+gubBVzHrfFAIMwd4k5tzMc44081aRxBIYdcubVuDIxQhR6jcIxi3D7L4GFwnQIM9DR
-6Ad1+FhKIzQcWg4oYIwcjYX2wWgFMSRPI/rLOvaj3HdfGIPoBE+IJivfOThxrAszCCN13HVQhyfG
-FchKICvHx8PU0sIcUpBA697Gq9PBmh5OkRu6q2+YQtc79XQXkSwBdMBaC1lN+wEMYFgEXAokD+WB
-VkJfo2E4A0gDj2gSZBgLOJzAO19mNFWrx0kaZBg0UtPYTJCDemhQc5xIqiWwgxVVUnBggRmXNIXT
-RT44k529hfvGDEwoSDjO7UQ7exZMSHT3wN7oUVYeqFJRS3UkJwPwe+uDOhYIgf1qdxM/BN4SAB2r
-5FhAmuVPUfAeGwKHfPt1H9TjIxvywSP8dAKwLwYMRhYjS4yBwQR2QmxFgSTBLCMP33eDOHwNGKNA
-GQyhHAqbcheAnIkCEJTHATrg4bsgEccCILNAyFHtDAAbsHFja9d7fpzaasB2/cF3dgPR9UbbFSwR
-e+876Fjohq3DEPcyIPcI6tpK/JEgVhQrxQPV5jBWiF+ChZY4cA6LSzxVbgJuVAU2QzwSzYv3PmJS
-PaSmWcrHv3KppgPFF0ssA/2iua1qOwp1fkFEKA3YnW7RkXUfczTqmivu5eQKW58QhFdHWAc5kFdW
-RzB8Wost1M1e+IR7gnpRsPfkjIphUl0wnFooVIlRcnjBEr41GF4fbjcOvcxZ+YtpnFEgu1ELFztx
-MDc4HTvuUV3dPxxBHDlzCSv1TsQUzkmUe9VSMc2BNr6k6Sa0DhwsIIP4qBPNJTwii0lBQZTY6hGL
-pcgaLfZ2L6kL1kcdcuJYoldN0N/gMCPKyIoczo00ztOOrgDvHMIyTgHT6gRnBWhNEYc5BL4fYHNU
-hWadYF4EAeTAbjYDyzhVCnTB/nTHg+MPK8M0MU4NTCRb+6vLI6QPD8qWNJMgNJyyEXJkMQUBlPYA
-vJnPO8NzK1kYgz8HNBf559WH10GzJb5qJpdyBzxZR2vUlk76z3DB7gVcUTbH9UjXb3AhCJS8SSgR
-O/dyPti/gxeL90WKDkaITf8Gg+sC63asEQ0B6ydxLB/9rRX4O992E4sdHABFRk919rYzg50YKBBL
-nusZv3p+bksGBBlwRUmBj9gRBWEScjoOdY7a1XIz+VOYtZwQOS4LtUkEE+Ar8z4RX6i3rPCyrTvz
-D4Kam7xzBy1Wl4t02cX02NsFZcHrHtlzAt44K/lsjNULM40UzZrCxByDuARj+hZTRgjqJVcovM+J
-PitnVg1W9sKpWelzYiB0VlfZrEgBz1rtALmw2/hyP9Vk5HsQZv71bm07K4hoAytBWECLMfBeYoNB
-OXdfiUFnxU3vdJr9Zp//JVgZGdkaiQVcZGgYhRkZbHAfW3GiDlE9rhtyHPt9C5fpCy0EhQEXc+xN
-JW5dqMQMi+Fw31BS4Yjaw8xBslt9lzH4av9o8F1oZKGrUCnYekt+JQciaNWiAtV4iWXoyO+5d0QX
-VxX85YMNfMyBfYi2swaAFADojLYy5iow+4sNiHeF+zuhCAwAo4Qo9cc5HXMbAY5gxMHIbE6z3T9z
-DHEYsmgMkIIIkCdQdVHvrKGEP8iU0Ww3t7iADAmcUAOQoHwN0VJyFM0EMgD1XQCGWKEYbjDt7/5C
-moA+InU6RgiKBjrDdAQ8DW17QL7yEgQgdvLU0E6ILe6apMDW9kXQPRH65+0lb9TrDisgdtjr9WoK
-WFRsFS2fAWRfV6ieoCqrZjMca0XiCPSG7E4JiU2I1aZZjbC94BQu/3WIH4SlKG/hjYwFJBC0VQME
-FRvmaywv0rbDO/lcOOnX+HD0cAAA5ikoAv//ADTda7oQAxESDAMIB9M0TdMJBgoFC13TNE0EDAMN
-Aj8O/w/SNAEPIGluZmxhdGUgMS67b/9vATMgQ29weXJpZ2h0Dzk5NS0EOCD33uz/TWFyayBBZGxl
-ciBLV2Nv3nvvvXuDf3t3a9M03fdfpxOzFxsfTdM0TSMrMztDUzRN0zRjc4Ojww2EvdPjrAABkAzJ
-kAMCA82QDMkEBQBwzJItO19HL033vSV/9/MZPyExO03TNEFhgcFA0zTNroEDAQIDBAZN0zRNCAwQ
-GCAwshXWNEBg59dhCUc2xwanq98SJiSvswMLDzLIIAwNARQCHrInY3bARu4PCwEAAjRFQo6ENaAI
-rNqYAxkGQJGlBv8IKkJDcmVhdGX/o//LRGljdG9yeSAoJXMp+01hcFZpZfdmwf53T2ZGaWxlFSsQ
-HQBmKXtwaW5nFxDm/ttPwkVuZCAZdHVybnMgJWRTF/1gCQsUE0luaXQyTR2AgRj+iFyKFtUgaJoZ
-bLAm9mAHWA9QAzbIskSTPAAvKABXyZOTKJMW2XSvc8sTCwwHGvCSpmmaZhnQELgYmqZpmqAHkBd4
-ArbrXvdzBxSzB0wDrRZfDEg3yAE0DwYkAWku2ZYVEM5h9y/8U29mdHdhEFxNaWNyb3MNXFcr/98K
-f2Rvd3NcQyMXbnRWZXJzaW9uXFVuwgTZL3N0YWxsM2T5DA8RHl9jxadmyba9cMAOAGeWX3NwJmkw
-bXa7/V9mb2xkRF9wG2gAIhrs/8a3aD50Y3V0B1NJRExfRk9OVFML+2DtH1BST0dSQU0OD0NPTU0e
-/AcLWBYnU1RBUlRVUAA/2LKQFhdERVNLVLKQ3f5PUERJUkVDB1JZLx5Y2w62H0FQFEFMb2G2kl9N
-RU5VFr/C21Z4aWJcKt0t6WNrYQHeDDPHc4hCm/hpcHRtu3v3EQtDUklQ70hFQX1SBxdwXv5QTEFU
-TElCVVJFQ33ShH9ubyBzdWNoIDsjdW5r/UGKvRZ3biB/R1NhdmUoKVuh3bAmYX9kLCAqxC0wMm0L
-73gleGeDVw1rdPAbYUmrKitJY0FmKLzlTG9jnu0nNpB1/EFyZ3VtGHN3RPyOboW98EojUA9Q2k5h
-Z1F1D3nheBRauUxyZuEvhdYJ7NV+MDJDb1EOsPZxSaNuMSNz8Rqj2wB8A2kbbz4jeALbnWl6KzEw
-MDQBWw1tZBs6OlxzR/Dcd18ucHkAMheEZSdzb7AYRTYfG092K5w5bkl3cgkgUrhpW7JhbW0WJx5w
-eNo/HXDTFD5zPwoKUMTtL2zcoCBZkyCtIEFMV0FZCd+xh7BvLiwKcC1OTyxOYaewxkVWSysuAHeb
-+4gwb5lnVJhCUlratsJvbTQLaDIg/XpBui3QDoR3NWwg8HbrRnPEMXZ5bxAgYymNQqHhcHWVLgA6
-5escb2t2Z3R+O211Wp17D5sjQ4BsFYQdaMSCbWgV7nVwW4tuBVorPBYytAEuZA3WyNZhD1AgbCDZ
-hnvNFgInS/N0iTFs1r4nTlQqEjG3YIquJmNkEmyw13ALFWf7PmhXwbQ7ZHZzHXF1Du6vtUytd+9h
-/RNi1g1LYUJDO2k+QXKuWy9yKhHthoWZui7kbGWYBJstgcZ1cwdnTAazm2sERBFXXEky7JLLThGz
-ViicQGYalpj6UyQUCo/fp8L/0dV2vIe+by4Ap2+EvQmv2BmDEi9v2SxyY50cFDbBXQj9YpU4/McF
-1xKfvBdJZjtw0b2GaG4swnYlt7Wt8Ch9EmczBHkqWFhYjF9AOXQMY63xw+oqb0JqxgDGMHlld181
-dVxYC19P5G3eRjO8fbdMZw9TeXNfR09PYmqkD2xbAZOVvCBw0FOx2pgrT2QzRggSbb/0eguisGdy
-YW1OAmV3c8uaUzQP2yVja5waHLhEzU5fHSHYgDUhOwsuB8NLEuZ2cicwJylJeA2mOwYiAVJlbbst
-ZVjbXvl4ZSIgLRQCLdIsCXu/7S5siCJrd2J3LhoXWusAMDR3EJxEQjNrG+vaVXV1WzxdAj1/w6PB
-wtt1RONPRoO38CBrZW12JptJTsl4t/1hed3jd6xNshm0UzJLMFG9SSxsXUvJToZBau6XqvO1U8iE
-QhusY/sqAP/S77u2JQpyNmNZLyVtL2zNIJr7SDolTSAnLGe0lrmU+RN3u1o4zhp7dVlUqSY+CsHY
-EApoDo7GRhM4ZqdjY269iAMbL2MiDt3K06mNj7FtBm5lII0N6zDiF3NQMYOEuW+zH2YwrJ1Xbxcz
-4hldC9cdqM8fCpgaS7GPiUYTF3W/HDIl8HQJd3IyXXYwzyPfbJ1znHXD4xkAH3Ktd2HAnQV2OrqH
-7YTLwK62WEZmwRkqtAgkLR1iMBu4gQ8qpzMxCbPm/YpI21wWCzZgpC1s8/wGXFOBI11hwjOUEOtr
-DY1uQQ3EmMGvG09T6Yy5VjgY9F9fCzksSDZ2oggPPVMxmAxYSt9YLSUXaZCDcodUqlw8V2hWx90P
-kjPdCo0gUKRUdc8TtPWwPUNGZmO+X6V3WbFY97tCgGSTHwi2rIWvEkGkcgMXNtKRDFNJ5V8GiYT1
-fk1vZHVoR/t3Qq/Ze2spdg+QZqQkAzEE1CaDpfhfD876tq2eDmQ5YVtuigAWDE6ZRWLXD9awYE1v
-8w98NXC8bjFi/EFII1Zw718FM8+wkoRwGhYH/I9YdTSDcYN3F6/ZhoGJDHMrfRc7q2E3NUMcw7b1
-msVmgcfPZ0dtOFfXb05wMeCFbNOV7IsW6zoV2wCsbtnhLmLVfy1lZ1OzUrYXyhsR+C0MListciU1
-TFoCb5Z4Ic7EYLBnZOhhVwzszB1W02kSNmQjsJbkAAoWH8lKJJtjpxtQ3iEhfd9kemwTsMwtBL4V
-E1sZJTt+J14X0SwZLZJngRPthL4AQYNgG/ElJJ4IjZsKQkttYMnRsm3udmhZFz8H6vJPNEele08Z
-t22FNLVwQZDDYwCBg4G4GqeuBCYs36kyeIccLQ7pmF5yte+VN6cFV8JhEdxrN5BtYrykJBcYmMQZ
-43DXQoJrEXY+aWS8Dvqj2lt2KgciWe2CdDLoeXm7YnkMlrIm0VKIvydaSuK5uRcvAu0Irb1AH0Ic
-fmSsycV6bOFlXKwYn4ZOH61jIUog9SWGtuxtCmuXFxHbBmnYsHIZxaBzdQgGnP8rwKzV9Xoldkdo
-ty9aoRm4Ys+CJhWo/To5BYUTb28nCTBjdpAY1lJM1mDhc3lNb34/c2CtcHDrDeiFL9qxZYdjXxh0
-eVrYBBQLn8TUomm6boRDyAe4A6yYgHuzpohwG+e1eCXL0Spi1OHDYxYD1y/17mdBYYdhLIUxIR2W
-NbSfcm0vcC1bwpEbbg/oUwtYoX5dxwMBgIbNNgkv4h1IB/TGewXXlAE1TfeCeAcQVHMb5GTTH1If
-AHAwQBmk6QbAH1AKYBCiQQYgoCCDDDJYP4BA4Awy2CAGH1gYDNJ0g5B/Uzt4NM0ggzjQUREyyCCD
-aCiwyCCDDAiISGCDDDLwBFQHIIM1zRRV438rgwwyyHQ0yA0MMsggZCSoMsgggwSERMEmmwzon1wf
-QZpmkByYVFNBGGSQfDzYnwYZZLAX/2wsuBlkkEEMjExkkEEG+ANSkEEGGRKjI0EGGWRyMsQGGWSQ
-C2IipBlkkEECgkJkkEEG5AdakEEGGRqUQ0EGGWR6OtQGGWSQE2oqtBlkkEEKikpkkEEG9AVWZJCm
-GRbAADOQQQYZdjbMQQYZZA9mJgYZZJCsBoZGGWSQQewJXmSQQQYenGOQQQYZfj7cQQYZbBsfbi4G
-GWywvA8OH45OEIakQfz/Uf9kSBpkEYP/cWRIBhkxwmGQQQYZIaIBSAYZZIFB4kgGGWRZGZJIBhlk
-eTnSQQYZZGkpsgYZZJAJiUny0xtkSFUVF/+QQS5kAgF1NZBBhmTKZSVBBhlkqgWFQYZkkEXqXUGG
-ZJAdmn1BhmSQPdptBhlkkC26DY2GZJBBTfpThmSQQRPDc4ZkkEEzxmMZZJBBI6YDZJBBBoND5mSQ
-QYZbG5ZkkEGGezvWZJBBhmsrtpBBBhkLi0uQQYZk9lcXZJBBhnc3zmSQQYZnJ66QQQYZB4dHkEGG
-ZO5fH5BBhmSefz+QwYZk3m8fLww22Wy+D5+PH08yVBKD/v/BJUPJUKHhUDKUDJHRQyVDybHxyTKU
-DCWp6SVDyVCZ2VQylAy5+UPJUDLFpeUylAwlldUlQ8lQtfWUDCVDza1DyVAy7Z3dMpQMJb39yVAy
-VMOjlAwlQ+OTQ8lQMtOz8wwlQyXLq8lQMpTrm5QMJUPbu1AyVDL7xwwlQ8mn55fJUDKU17clQyVD
-989QMpQMr+8MJUPJn9+/d9I3lP9/BZ9XB9zTdI/vDxFbEN9plqfpDwVZBFVBe7qzp11APwMPWAKv
-Ovc0nQ8hXCCfDwlpmuVpWghWgcAGGeTsYH8CgRnkkJNDGAcGDjk55GFgBAOQk0NOMTANCbHk5AzB
-r+IGfaCNZHmgaWOWbtUyWkpyZdVv2A20Icd1YpxiZWQnkBDLVkt2CWxksR5HI5eEuBRhdHnNFMAI
-V4obHqOyt2zZsyg9Y6b5UpYfAwEDmqZpmgcPHz9//2mapnkBAwcPH8KCmqY/f/84haAiZAEoGUWB
-AFmqISoo225Myd9nLAQAAKAJAP/L5XK5AOcA3gDWAL0AuVwul4QAQgA5ADEAKd/K5XIAGAAQAAg/
-3v8ApWULspNj7gA33KxwBO9eBgDCpuzABf8X/zcC5mZdD/4GCAWTyd7KFw8377JlKXsGABc3c+12
-vv+2vwampggMDti7sJkLF6YGN9jdfx/7UltK+lJBQloFWVJaC70X295bFyfvCxEGW8DzgTf2ICal
-mBVugTi3rwUUEHDGFwf23sj+7iYFBjf617XbzUBK+1ExUTFaBQBaC8KODdhaF1oFEEpvt7Xm2mC6
-dQVUFW7FmvtfFAVldYamEBY3Fwv23JCNHRZvEdldAxvrNvdHQEYBBRHNWG/6C71uZCf5QG+6FV0Z
-3BvMeQEAEuhGyAeYmwsdb0ExWHPNnTxIUlgQBYUNCyd/yj5K+lHfFGVkECUQFpu538impmR1FZUX
-CwrDDgOsAG9DdfuGbLNICxcxBTFvT3AUIxqzFaZWCGYwzwtZFzyG7BsFFN/7Co6ZO2cjWgMLOggJ
-u2EXBUJXT2HdMM56/pMIvwsI2TLctgWfb+wlWerw/HL+DQPCDrM3BgTJb+wFS9IRBwUDIXsv2XcL
-9zfC3rAZ+QcF57ALKdkP7+5JlhC+2QcF9lcPe29hb/s3udkHzRLC2QX6xw/XYoTsIW/5agdjGGez
-BQMVQ5sWbIAtb1VvZcuYXUcFm29mptMpgfIBawvMfclpdRbnb2lYU4wRE+xabwU1hHw2b0dRMQC9
-JM2WW291bzbGCHsDb/NZAuxhWtlbbxeb3wHsewvNcibfE77AXg1vSfz5PZGcLGEDb1r6e48XIbcJ
-+2mHgxTIJvbf61JZynht1xG/LzdAZ0xa8YcVspXRehhVnzfnzpi08fNaCwxWEgEkD2+pvSSdZusL
-DPeDlX0LC/434hYj7CUJC4clEANRAemE4jP6QADASAl7AbIVLRUbRet0D3DquoME4AFNEyADYUtF
-9zo9cwkhcpFmtooXRjZQfS33fkFRgmEc/4J1n1uCc2glMVcHeq5rus0/NWQNd2wBIAdu7Mx9UXQZ
-DyUtbxVrus1tBXkHhXIJY22PXdd9rnUpeS4TQy9pGWtmNtd1C04VeBspdC++5z53bgtddRtRR0P2
-JevGwWMRbCs5aTtDtuwNaCv/ty5y0z1h7AQIsO8fgwD94bJdNoEcAgMOUAY/djgUm1OjWw8DMN2F
-tX0AAkOjTAlvZmcjFJ8IviQTgQwnbBwO3esDY/9PeQM7hEk3JZlhGWk3/YR13X9zOTpggAiBUL/C
-BrQQibWV7xNO5slG74kAN3bBugn7g1B1RGVykXkhZA+zeWF3AwGhKmTkphhqAP6DU8jIWaed8J5L
-IQzIAEJJD7P3TcUqTUIBBwAyb/EU4WcCBIAARmENb1r2PoJ5oS4BNZTkgUKn9gAfkl53kEtiD2er
-IbmnFMYbl0ltLnunIbvpi01yN0mb6T92BXeVY1WM9cU+JWdbCXkDZn0kMpaPh3Qui3XvD0MNLFPR
-QmCNrOctCTUNPKywFgFLgD5cc9OdDgDrbX0FbG6ka+gHX5dy82dzAWPInqIzW1AVMSlcM0gjI/bs
-U9KRLTJ7YzoLkCMjEV8DCCFkIPdXY3wwY/8daGV1hkDgdNV0mXcgEdZKAwRMRk6/KOyCUUSRlUV0
-wC7jVGCYdart/y/BQnl0ZVRvV2lkZUNoYXIURoBoVZQV+WAuiubSDFoM4k8U20ENR0FjQWRkkyKe
-A4IPOKJrhYhIUQUhRDAXxCHEvS6qcF37aXZhEDVmE6SIAVb/FpNa225dGVJVdW2MaF11rwj3/ntj
-YWyNkxsMoGC7TXRhZ1nNzQV72CxTZQpaLHuxKtxpdLtAsDeJ4gWsQa2eJACdIJ5x7kF8syFOJR9T
-Za3qM3QMVH0wO0PFsBHZDWxzCEE3b7psZW5Vbm0t7SUMC30JTGEruBsOFDskb3NEG71XMFWqeCEJ
-sFiwgdSz1c9EslPEiZ6DtQVXypZ1RNhTVsRdEMl1cEkJQlBCum5T3mGXzRYfdk23zU0IGuAve5Yb
-QWix4z0JAQABqBFxz9UROwbFFnhBESIGFpsAEhArRJw19A5Fwgw2e2+YLlkcDHomzAUsHadcT2ab
-FSKKHoYWxlsznCQsFvx5U2gpY8Jmj15FFVA1B+E02zIjMBFJQophGApXtbWpIsaMSUoHpYh3eENv
-bD0KGAqD4wk1QmtBJJ2EWawZMDJvbrZfapd+UzxQQnJ1c2h2LSw7/mngX3ZzbnDqdGZmV2gUYtfR
-4rIZrnvHMhhRbmNweRNjUPhG627FbGagX4QQcHRfaA1bc0eDcjMRMo5foV/25g4Rjw8JX2ZtnZaC
-dS8LPW0NE2otWOnWhytmZHM3Ds01CqdlTxogEXeGwnMLBnQQHCcRbXeKaBBdOWNtbtpzUbRuCOyk
-jnOP9pU+jVigQDQMYI0IU6MWdBTswNxfOAt2zzODc64w8VtUHjBmXbDCcXNeVR9pCQYruNeKK5MY
-13Ajwn3BCCZobxcbzL1DHgfJX2EIb2YaNgeSDyghnMVmXwdBZmrDGzbGdP9twOU8wd1K5W1ihwZh
-eDSvo3NFJAYGY7CNHSjcB69UZiU3e51GbK0KFGheIaC5bF92FfI9Psu9ZDSqZmZsF2w2fu8OVO1v
-Yp04OGLyLQvoyg1VhBCUsA8Y9NpstjhCxGFTSAl6BI0UpEZngk6zxaYhTswIPLYbyWxnST1t1out
-gOM1YXLo5FIaLwi4bFlmLW0Uk2bBLhPSwn2xHzVEQzwGTdzpLBaLLRIKUhnQZg8WNkJveGuV2SzZ
-q1nEhmRdzzK0dkUMj3HUeXMA6rpieupjNULArGnmlB2xZmfATBXuKjfGo0UgFsXiM61YsySTMEsV
-QbIPawiyVXBkHE1yGJjwhZvxAC25mwtgZWVr47JGM2k0TRF3KWg7gQZBy0UDTKaI2RdDL5fHPRHa
-IKAp4A8BC69gDDr5WT+AAEZncEyyWPReCwOyBzaBJlsX8KkMXvYGdhAHBgD8dH5FHCLqD1gS260A
-gaGnSAIesM/xCi50V+tYkGJ3YV/rECMgFS5yEA4bqQBM+yAD+Flz2QJALiYAiDwAU/bGivswByfA
-YIMtbU9z3ADr0E+fW1vJwJgN+Hdj5wAAAGgDACQAAP8AAAAAAAAAAABgvgDAQACNvgBQ//9Xg83/
-6xCQkJCQkJCKBkaIB0cB23UHix6D7vwR23LtuAEAAAAB23UHix6D7vwR2xHAAdtz73UJix6D7vwR
-23PkMcmD6ANyDcHgCIoGRoPw/3R0icUB23UHix6D7vwR2xHJAdt1B4seg+78EdsRyXUgQQHbdQeL
-HoPu/BHbEckB23PvdQmLHoPu/BHbc+SDwQKB/QDz//+D0QGNFC+D/fx2D4oCQogHR0l19+lj////
-kIsCg8IEiQeDxwSD6QR38QHP6Uz///9eife50QAAAIoHRyzoPAF394A/AXXyiweKXwRmwegIwcAQ
-hsQp+IDr6AHwiQeDxwWJ2OLZjb4A4AAAiwcJwHQ8i18EjYQwMAEBAAHzUIPHCP+W5AEBAJWKB0cI
-wHTciflXSPKuVf+W6AEBAAnAdAeJA4PDBOvh/5bsAQEAYekyX///AAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+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
@@ -618,16 +618,16 @@ def get_exe_bytes (self):
 AAAAAAAAAAAAAAAAAAAEAGsAAACQAACAbAAAALgAAIBtAAAA4AAAgG4AAAAIAQCAAAAAAAAAAAAA
 AAAAAAABAAkEAACoAAAAONsAAKABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA0AAAANjc
 AAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAADg3gAAWgIAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAABAAkEAAAgAQAAQOEAABQBAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwSAQDkEQEA
-AAAAAAAAAAAAAAAAORIBAPQRAQAAAAAAAAAAAAAAAABGEgEA/BEBAAAAAAAAAAAAAAAAAFMSAQAE
-EgEAAAAAAAAAAAAAAAAAXRIBAAwSAQAAAAAAAAAAAAAAAABoEgEAFBIBAAAAAAAAAAAAAAAAAHIS
-AQAcEgEAAAAAAAAAAAAAAAAAfhIBACQSAQAAAAAAAAAAAAAAAAAAAAAAAAAAAIgSAQCWEgEAphIB
-AAAAAAC0EgEAAAAAAMISAQAAAAAA0hIBAAAAAADcEgEAAAAAAOISAQAAAAAA8BIBAAAAAAAKEwEA
-AAAAAEtFUk5FTDMyLkRMTABBRFZBUEkzMi5kbGwAQ09NQ1RMMzIuZGxsAEdESTMyLmRsbABNU1ZD
-UlQuZGxsAG9sZTMyLmRsbABTSEVMTDMyLmRsbABVU0VSMzIuZGxsAABMb2FkTGlicmFyeUEAAEdl
-dFByb2NBZGRyZXNzAABFeGl0UHJvY2VzcwAAAFJlZ0Nsb3NlS2V5AAAAUHJvcGVydHlTaGVldEEA
-AFRleHRPdXRBAABmcmVlAABDb0luaXRpYWxpemUAAFNIR2V0U3BlY2lhbEZvbGRlclBhdGhBAAAA
-R2V0REMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAABAAkEAAAgAQAAQOEAABQBAAAAAAAAAAAAAAAAAAAAAAAAAAAAABASAQDQEQEA
+AAAAAAAAAAAAAAAAHRIBAOARAQAAAAAAAAAAAAAAAAAqEgEA6BEBAAAAAAAAAAAAAAAAADcSAQDw
+EQEAAAAAAAAAAAAAAAAAQRIBAPgRAQAAAAAAAAAAAAAAAABMEgEAABIBAAAAAAAAAAAAAAAAAFYS
+AQAIEgEAAAAAAAAAAAAAAAAAAAAAAAAAAABgEgEAbhIBAH4SAQAAAAAAjBIBAAAAAACaEgEAAAAA
+AKoSAQAAAAAAtBIBAAAAAAC6EgEAAAAAAMgSAQAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRs
+bABDT01DVEwzMi5kbGwAR0RJMzIuZGxsAE1TVkNSVC5kbGwAb2xlMzIuZGxsAFVTRVIzMi5kbGwA
+AExvYWRMaWJyYXJ5QQAAR2V0UHJvY0FkZHJlc3MAAEV4aXRQcm9jZXNzAAAAUmVnQ2xvc2VLZXkA
+AABQcm9wZXJ0eVNoZWV0QQAAVGV4dE91dEEAAGZyZWUAAENvSW5pdGlhbGl6ZQAAR2V0REMAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

From da858ca9d519e45c814af5f7cf45afc598d30059 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 8 Nov 2002 15:11:42 +0000
Subject: [PATCH 0884/8469] Fix comment typo

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 0dad1ac474..88be5e8bf7 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -434,7 +434,7 @@ def _make_spec_file(self):
         ]
 
         for (rpm_opt, attr, default) in script_options:
-            # Insert contents of file referred to, if no file is refered to
+            # Insert contents of file referred to, if no file is referred to
             # use 'default' as contents of script
             val = getattr(self, attr)
             if val or default:

From b309ef158743a718b302cf7566e03aa79cd600d7 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 8 Nov 2002 16:18:24 +0000
Subject: [PATCH 0885/8469] [Bug #233259] Ugly traceback for
 DistutilsPlatformError   Fixed by catching all exceptions that are subclasses
 of DistutilsError,   so only the error message will be printed.  You can
 still get the   whole traceback by enabling the Distutils debugging mode.

---
 core.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core.py b/core.py
index 001e74be47..51961454f6 100644
--- a/core.py
+++ b/core.py
@@ -145,9 +145,7 @@ class found in 'cmdclass' is used in place of the default, which is
             else:
                 raise SystemExit, error
 
-        except (DistutilsExecError,
-                DistutilsFileError,
-                DistutilsOptionError,
+        except (DistutilsError,
                 CCompilerError), msg:
             if DEBUG:
                 raise

From 8541483a41b056cfb0e5e2bf707f66c3afb1d0e6 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 13 Nov 2002 13:26:59 +0000
Subject: [PATCH 0886/8469] Update file

---
 README | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/README b/README
index f1db3c6c40..45c7ca8ca9 100644
--- a/README
+++ b/README
@@ -1,17 +1,21 @@
-This directory contains only a subset of the Distutils, specifically the
-Python modules in the 'distutils' and 'distutils.command' packages.
-Technically, this is all you need to distribute and install Python modules
-using the Distutils.  Most people will want some documentation and other
-help, though.  Currently, everything can be found at the Distutils web page:
+This directory contains only a subset of the Distutils, specifically
+the Python modules in the 'distutils' and 'distutils.command'
+packages.  This is all you need to distribute and install Python
+modules using the Distutils.  There is also a separately packaged
+standalone version of the Distutils available for people who want to
+upgrade the Distutils without upgrading Python, available from the
+Distutils web page:
 
     http://www.python.org/sigs/distutils-sig/
 
-From there you can access the latest documentation, or download a standalone
-Distutils release that includes all the code in this directory, plus
-documentation, test scripts, examples, etc.
+The standalone version includes all of the code in this directory,
+plus documentation, test scripts, examples, etc.
 
-The Distutils documentation isn't yet part of the standard Python
-documentation set, but will be soon.
+The Distutils documentation is divided into two documents, "Installing
+Python Modules", which explains how to install Python packages, and
+"Distributing Python Modules", which explains how to write setup.py
+files.  Both documents are part of the standard Python documentation
+set, and are available from http://www.python.org/doc/current/ .
 
         Greg Ward (gward@python.net)
 

From 02d558c61ba43389e4aba498833b2dfd6e55c26d Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 13 Nov 2002 17:03:05 +0000
Subject: [PATCH 0887/8469] Back out part of rev. 1.53, restoring the use of
 the string module. The two long lines have been reflowed differently;
 hopefully someone on BeOS can test them.  Rev. 1.53 also converted
 string.atoi() to int(); I've left that alone.

---
 sysconfig.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 222648aa74..3d369b00de 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -14,6 +14,7 @@
 
 import os
 import re
+import string
 import sys
 
 from errors import DistutilsPlatformError
@@ -250,7 +251,7 @@ def parse_makefile(fn, g=None):
         m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            v = v.strip()
+            v = string.strip(v)
             if "$" in v:
                 notdone[n] = v
             else:
@@ -273,7 +274,7 @@ def parse_makefile(fn, g=None):
                     else:
                         try: value = int(value)
                         except ValueError:
-                            done[name] = value.strip()
+                            done[name] = string.strip(value)
                         else:
                             done[name] = value
                         del notdone[name]
@@ -289,7 +290,7 @@ def parse_makefile(fn, g=None):
                     else:
                         try: value = int(value)
                         except ValueError:
-                            done[name] = value.strip()
+                            done[name] = string.strip(value)
                         else:
                             done[name] = value
                         del notdone[name]
@@ -368,7 +369,8 @@ def _init_posix():
             # relative to the srcdir, which after installation no longer makes
             # sense.
             python_lib = get_python_lib(standard_lib=1)
-            linkerscript_name = os.path.basename(g['LDSHARED'].split()[0])
+            linkerscript_path = string.split(g['LDSHARED'])[0]
+            linkerscript_name = os.path.basename(linkerscript_path)
             linkerscript = os.path.join(python_lib, 'config',
                                         linkerscript_name)
 

From 87b5c0ec3c8aded916170321554f653bafe57030 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 13 Nov 2002 20:54:21 +0000
Subject: [PATCH 0888/8469] Allow unknown keyword arguments to the Extension
 class, and warn about them.

---
 extension.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index 7fbeb4e1f1..9dc316a1a5 100644
--- a/extension.py
+++ b/extension.py
@@ -10,6 +10,10 @@
 import os, string
 from types import *
 
+try:
+    import warnings
+except ImportError:
+    warnings = None
 
 # This class is really only used by the "build_ext" command, so it might
 # make sense to put it in distutils.command.build_ext.  However, that
@@ -93,8 +97,8 @@ def __init__ (self, name, sources,
                   export_symbols=None,
                   depends=None,
                   language=None,
+                  **kw                      # To catch unknown keywords
                  ):
-
         assert type(name) is StringType, "'name' must be a string"
         assert (type(sources) is ListType and
                 map(type, sources) == [StringType]*len(sources)), \
@@ -115,6 +119,15 @@ def __init__ (self, name, sources,
         self.depends = depends or []
         self.language = language
 
+        # If there are unknown keyword options, warn about them
+        if len(kw):
+            L = kw.keys() ; L.sort()
+            L = map(repr, L)
+            msg = "Unknown Extension options: " + string.join(L, ', ')
+            if warnings is not None:
+                warnings.warn(msg)
+            else:
+                sys.stderr.write(msg + '\n')
 # class Extension
 
 

From 649fdd11b8ff8d08957390b343eca0dbc5a9e3a5 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 14 Nov 2002 01:29:00 +0000
Subject: [PATCH 0889/8469] [Bug #599248] ext module generation problem

If you have source files srcdir1/foo.c and srcdir2/foo.c, the
temporary .o for both files is written to build/temp.<platform>/foo.o.
This patch sets strip_dir to false for both calls to object_filename,
so now the object files are written to temp.<platform>/srcdir1/foo.o
and .../srcdir2/foo.o.

2.2 bugfix candidate
---
 ccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 8898f51f59..8aca058b0f 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -366,7 +366,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             extra = []
 
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, 1, outdir)
+        objects = self.object_filenames(sources, 0, outdir)
         assert len(objects) == len(sources)
 
         # XXX should redo this code to eliminate skip_source entirely.
@@ -472,7 +472,7 @@ def _prep_compile(self, sources, output_dir, depends=None):
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=1,
+        objects = self.object_filenames(sources, strip_dir=0,
                                         output_dir=output_dir)
         assert len(objects) == len(sources)
 

From d47c1f5e8455cc049fc8c4ae2c00795e98c3abb7 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 14 Nov 2002 01:43:00 +0000
Subject: [PATCH 0890/8469] [Bug #550364] Add get_python_version()

---
 sysconfig.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3d369b00de..b12b98deee 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -35,6 +35,14 @@
 del argv0_path, landmark
 
 
+def get_python_version ():
+    """Return a string containing the major and minor Python version,
+    leaving off the patchlevel.  Sample return values could be '1.5'
+    or '2.2'.
+    """
+    return sys.version[:3]
+
+
 def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
 
@@ -93,7 +101,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 
     if os.name == "posix":
         libpython = os.path.join(prefix,
-                                 "lib", "python" + sys.version[:3])
+                                 "lib", "python" + get_python_version())
         if standard_lib:
             return libpython
         else:

From fb4cdac4953c41880107d487afc61c4b7ca937b2 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 14 Nov 2002 01:44:35 +0000
Subject: [PATCH 0891/8469] [Bug #550364] Use sysconfig.get_python_version()

---
 command/bdist_wininst.py | 2 +-
 command/build_ext.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 97a045824d..dcc390e6d6 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -70,7 +70,7 @@ def finalize_options (self):
         if not self.target_version:
             self.target_version = ""
         if self.distribution.has_ext_modules():
-            short_version = sys.version[:3]
+            short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError, \
                       "target version can only be" + short_version
diff --git a/command/build_ext.py b/command/build_ext.py
index 4bfc20c9d4..250e539340 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -12,7 +12,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import *
-from distutils.sysconfig import customize_compiler
+from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
 from distutils import log
@@ -184,7 +184,7 @@ def finalize_options (self):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                                      "python" + sys.version[:3],
+                                                      "python" + get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions

From fdfa7f054ccb881256c4696ad9dadbb5f0f9aa1c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 14 Nov 2002 01:58:48 +0000
Subject: [PATCH 0892/8469] Fix docstring typo; remove 'created' line

---
 errors.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/errors.py b/errors.py
index bec3464511..963d83377c 100644
--- a/errors.py
+++ b/errors.py
@@ -5,11 +5,9 @@
 usually raised for errors that are obviously the end-user's fault
 (eg. bad command-line arguments).
 
-This module safe to use in "from ... import *" mode; it only exports
+This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
-# created 1999/03/03, Greg Ward
-
 __revision__ = "$Id$"
 
 class DistutilsError (Exception):

From 4461f74828aed6a205722c0d9e697f8425771f8c Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 14 Nov 2002 02:25:42 +0000
Subject: [PATCH 0893/8469] Remove 'created by' lines; people can use CVS for
 this, and the information is often out of date

---
 archive_util.py            | 2 --
 ccompiler.py               | 2 --
 cmd.py                     | 3 ---
 command/bdist.py           | 2 --
 command/bdist_dumb.py      | 2 --
 command/bdist_rpm.py       | 2 --
 command/bdist_wininst.py   | 2 --
 command/build.py           | 2 --
 command/build_clib.py      | 3 ---
 command/build_ext.py       | 2 --
 command/build_py.py        | 2 --
 command/build_scripts.py   | 2 --
 command/config.py          | 2 --
 command/install.py         | 2 --
 command/install_headers.py | 2 --
 command/install_lib.py     | 2 --
 command/sdist.py           | 2 --
 core.py                    | 2 --
 cygwinccompiler.py         | 2 --
 dep_util.py                | 2 --
 dir_util.py                | 2 --
 dist.py                    | 3 ---
 emxccompiler.py            | 2 --
 extension.py               | 2 --
 fancy_getopt.py            | 2 --
 file_util.py               | 2 --
 filelist.py                | 5 -----
 msvccompiler.py            | 2 +-
 spawn.py                   | 2 --
 sysconfig.py               | 1 -
 text_file.py               | 2 --
 unixccompiler.py           | 2 --
 util.py                    | 2 --
 version.py                 | 2 --
 34 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 47fac0cb7d..98c1e55950 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,8 +3,6 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
-# created 2000/04/03, Greg Ward (extracted from util.py)
-
 __revision__ = "$Id$"
 
 import os
diff --git a/ccompiler.py b/ccompiler.py
index 8aca058b0f..3084947d58 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,8 +3,6 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-# created 1999/07/05, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, re
diff --git a/cmd.py b/cmd.py
index 6a268184c0..b35eb07855 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,9 +4,6 @@
 in the distutils.command package.
 """
 
-# created 2000/04/03, Greg Ward
-# (extricated from core.py; actually dates back to the beginning)
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/bdist.py b/command/bdist.py
index 454c9df119..e0648f3bdd 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
-# created 2000/03/29, Greg Ward
-
 __revision__ = "$Id$"
 
 import os, string
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 712fec884e..7562b70812 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,8 +4,6 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
-# created 2000/03/29, Greg Ward
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 88be5e8bf7..a7bc45f481 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-# created 2000/04/25, by Harry Henry Gebel
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index dcc390e6d6..c5cfd6d31b 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-# created 2000/06/02, Thomas Heller
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/build.py b/command/build.py
index 6bc92a43b8..0643948c92 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build' command."""
 
-# created 1999/03/08, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/command/build_clib.py b/command/build_clib.py
index f0207e4e0f..fe921fb88b 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,9 +4,6 @@
 that is included in the module distribution and needed by an extension
 module."""
 
-# created (an empty husk) 1999/12/18, Greg Ward
-# fleshed out 2000/02/03-04
-
 __revision__ = "$Id$"
 
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 250e539340..0b3ef14933 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,8 +4,6 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-# created 1999/08/09, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/build_py.py b/command/build_py.py
index 0ab72c08f4..f61dc17a18 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_py' command."""
 
-# created 1999/03/08, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, string, os
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 211ade40fa..e4d6099bd5 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_scripts' command."""
 
-# created 2000/05/23, Bastian Kleineidam
-
 __revision__ = "$Id$"
 
 import sys, os, re
diff --git a/command/config.py b/command/config.py
index 9ebe0d9191..abfa138530 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,8 +9,6 @@
 this header file lives".
 """
 
-# created 2000/05/29, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/install.py b/command/install.py
index 67f37893f5..9adda4688a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,8 +4,6 @@
 
 from distutils import log
 
-# created 1999/03/13, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/install_headers.py b/command/install_headers.py
index 495d150c55..957ed239b1 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
-# created 2000/05/26, Greg Ward
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/install_lib.py b/command/install_lib.py
index 1e771c619e..5da1c7aea7 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,5 +1,3 @@
-# created 1999/03/13, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/sdist.py b/command/sdist.py
index 082aa88ce3..91807e6a3f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
-# created 1999/09/22, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/core.py b/core.py
index 51961454f6..5be9e4ec29 100644
--- a/core.py
+++ b/core.py
@@ -6,8 +6,6 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
-# created 1999/03/01, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index a046ee21c8..93f8803847 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -41,8 +41,6 @@
 #     in the dlls.
 #   *** only the version of June 2000 shows these problems
 
-# created 2000/05/05, Rene Liebscher
-
 __revision__ = "$Id$"
 
 import os,sys,copy
diff --git a/dep_util.py b/dep_util.py
index bbb6d235b3..f49665483a 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,8 +4,6 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
-# created 2000/04/03, Greg Ward (extracted from util.py)
-
 __revision__ = "$Id$"
 
 import os
diff --git a/dir_util.py b/dir_util.py
index 8b3e06b2fa..d407e9ac5b 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,8 +2,6 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-# created 2000/04/03, Greg Ward (extracted from util.py)
-
 __revision__ = "$Id$"
 
 import os
diff --git a/dist.py b/dist.py
index dbeeb8b1dc..3a690696bb 100644
--- a/dist.py
+++ b/dist.py
@@ -4,9 +4,6 @@
 being built/installed/distributed.
 """
 
-# created 2000/04/03, Greg Ward
-# (extricated from core.py; actually dates back to the beginning)
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/emxccompiler.py b/emxccompiler.py
index 624c0fecbd..76bdbae506 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -19,8 +19,6 @@
 #
 # * EMX gcc 2.81/EMX 0.9d fix03
 
-# created 2001/5/7, Andrew MacIntyre, from Rene Liebscher's cywinccompiler.py
-
 __revision__ = "$Id$"
 
 import os,sys,copy
diff --git a/extension.py b/extension.py
index 9dc316a1a5..5b197fa58d 100644
--- a/extension.py
+++ b/extension.py
@@ -3,8 +3,6 @@
 Provides the Extension class, used to describe C/C++ extension
 modules in setup scripts."""
 
-# created 2000/05/30, Greg Ward
-
 __revision__ = "$Id$"
 
 import os, string
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 5de64e15da..f78b0a6854 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,8 +8,6 @@
   * options set attributes of a passed-in object
 """
 
-# created 1999/03/03, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, string, re
diff --git a/file_util.py b/file_util.py
index 56b1faee45..c2fa086f05 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,8 +3,6 @@
 Utility functions for operating on single files.
 """
 
-# created 2000/04/03, Greg Ward (extracted from util.py)
-
 __revision__ = "$Id$"
 
 import os
diff --git a/filelist.py b/filelist.py
index b4f3269cf1..4b5d47d02f 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,11 +4,6 @@
 and building lists of files.
 """
 
-# created 2000/07/17, Rene Liebscher (as template.py)
-# most parts taken from commands/sdist.py
-# renamed 2000/07/29 (to filelist.py) and officially added to
-#  the Distutils source, Greg Ward
-
 __revision__ = "$Id$"
 
 import os, string, re
diff --git a/msvccompiler.py b/msvccompiler.py
index a2459ad032..c2bd77de44 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -4,7 +4,7 @@
 for the Microsoft Visual Studio."""
 
 
-# created 1999/08/19, Perry Stoll
+# Written by Perry Stoll
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
diff --git a/spawn.py b/spawn.py
index 4df6e097de..f94817d498 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,8 +6,6 @@
 executable name.
 """
 
-# created 1999/07/24, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/sysconfig.py b/sysconfig.py
index b12b98deee..aa3636f609 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -7,7 +7,6 @@
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
-Initial date: 17-Dec-1998
 """
 
 __revision__ = "$Id$"
diff --git a/text_file.py b/text_file.py
index 7086b1af56..67efd65e36 100644
--- a/text_file.py
+++ b/text_file.py
@@ -4,8 +4,6 @@
 that (optionally) takes care of stripping comments, ignoring blank
 lines, and joining lines with backslashes."""
 
-# created 1999/01/12, Greg Ward
-
 __revision__ = "$Id$"
 
 from types import *
diff --git a/unixccompiler.py b/unixccompiler.py
index 2f4546e1a7..603dfe90cc 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -13,8 +13,6 @@
   * link shared library handled by 'cc -shared'
 """
 
-# created 1999/07/05, Greg Ward
-
 __revision__ = "$Id$"
 
 import os, sys
diff --git a/util.py b/util.py
index 8d22415496..9de6077fc6 100644
--- a/util.py
+++ b/util.py
@@ -4,8 +4,6 @@
 one of the other *util.py modules.
 """
 
-# created 1999/03/08, Greg Ward
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/version.py b/version.py
index 02502dac95..71a5614719 100644
--- a/version.py
+++ b/version.py
@@ -4,8 +4,6 @@
 # Implements multiple version numbering conventions for the
 # Python Module Distribution Utilities.
 #
-# written by Greg Ward, 1998/12/17
-#
 # $Id$
 #
 

From 58e414fbe6bab66065fc5b5a0705980f578f4796 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 19 Nov 2002 13:12:28 +0000
Subject: [PATCH 0894/8469] Add comment to Distutil files about requiring 1.5.2
 compatibility, as     suggested by PEP 291.

---
 __init__.py                | 2 ++
 archive_util.py            | 2 ++
 bcppcompiler.py            | 2 ++
 ccompiler.py               | 2 ++
 cmd.py                     | 2 ++
 command/__init__.py        | 2 ++
 command/bdist.py           | 2 ++
 command/bdist_dumb.py      | 2 ++
 command/bdist_rpm.py       | 2 ++
 command/bdist_wininst.py   | 2 ++
 command/build.py           | 2 ++
 command/build_clib.py      | 2 ++
 command/build_ext.py       | 2 ++
 command/build_py.py        | 2 ++
 command/build_scripts.py   | 2 ++
 command/clean.py           | 2 ++
 command/config.py          | 2 ++
 command/install.py         | 2 ++
 command/install_data.py    | 2 ++
 command/install_headers.py | 2 ++
 command/install_lib.py     | 2 ++
 command/install_scripts.py | 2 ++
 command/sdist.py           | 2 ++
 core.py                    | 2 ++
 cygwinccompiler.py         | 2 ++
 debug.py                   | 4 ++++
 dep_util.py                | 2 ++
 dir_util.py                | 2 ++
 dist.py                    | 2 ++
 errors.py                  | 2 ++
 fancy_getopt.py            | 2 ++
 file_util.py               | 2 ++
 filelist.py                | 2 ++
 log.py                     | 2 ++
 msvccompiler.py            | 3 ++-
 mwerkscompiler.py          | 4 ++++
 spawn.py                   | 2 ++
 37 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 1055aa39c1..7873d297b3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,6 +8,8 @@
    setup (...)
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 __version__ = "1.0.3"
diff --git a/archive_util.py b/archive_util.py
index 98c1e55950..d1dc909520 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,6 +3,8 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/bcppcompiler.py b/bcppcompiler.py
index abe302a804..cfbe04ac01 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,6 +11,8 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 
diff --git a/ccompiler.py b/ccompiler.py
index 3084947d58..edb9f7542f 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,6 +3,8 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, re
diff --git a/cmd.py b/cmd.py
index b35eb07855..1165f95124 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,6 +4,8 @@
 in the distutils.command package.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/__init__.py b/command/__init__.py
index e70429c807..fc6117166b 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -3,6 +3,8 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 __all__ = ['build',
diff --git a/command/bdist.py b/command/bdist.py
index e0648f3bdd..7c606ffc4d 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,6 +3,8 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os, string
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 7562b70812..d1cce55b20 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,6 +4,8 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index a7bc45f481..237cc70d25 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,6 +3,8 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index c5cfd6d31b..9c9fd10918 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,6 +3,8 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/build.py b/command/build.py
index 0643948c92..78231541ec 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,6 +2,8 @@
 
 Implements the Distutils 'build' command."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/command/build_clib.py b/command/build_clib.py
index fe921fb88b..ef03ed7269 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,6 +4,8 @@
 that is included in the module distribution and needed by an extension
 module."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 0b3ef14933..0c37768179 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,6 +4,8 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/build_py.py b/command/build_py.py
index f61dc17a18..258d6d4ca0 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,6 +2,8 @@
 
 Implements the Distutils 'build_py' command."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, string, os
diff --git a/command/build_scripts.py b/command/build_scripts.py
index e4d6099bd5..b7c11d472b 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,6 +2,8 @@
 
 Implements the Distutils 'build_scripts' command."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, re
diff --git a/command/clean.py b/command/clean.py
index 36252d5174..41b22777bc 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -4,6 +4,8 @@
 
 # contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/command/config.py b/command/config.py
index abfa138530..b6f5ad1dc5 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,6 +9,8 @@
 this header file lives".
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/install.py b/command/install.py
index 9adda4688a..5d5bdaa77e 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,6 +4,8 @@
 
 from distutils import log
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/install_data.py b/command/install_data.py
index d0091ce238..5c1f18a9f2 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -5,6 +5,8 @@
 
 # contributed by Bastian Kleineidam
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/command/install_headers.py b/command/install_headers.py
index 957ed239b1..3a37d309f9 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,6 +3,8 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/command/install_lib.py b/command/install_lib.py
index 5da1c7aea7..daf3e010fd 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,3 +1,5 @@
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/install_scripts.py b/command/install_scripts.py
index ceece1b6bf..6572e650d4 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -5,6 +5,8 @@
 
 # contributed by Bastian Kleineidam
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/command/sdist.py b/command/sdist.py
index 91807e6a3f..c0b7dd45d9 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,6 +2,8 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/core.py b/core.py
index 5be9e4ec29..9ab419ef4c 100644
--- a/core.py
+++ b/core.py
@@ -6,6 +6,8 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 93f8803847..18af388c3c 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -41,6 +41,8 @@
 #     in the dlls.
 #   *** only the version of June 2000 shows these problems
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os,sys,copy
diff --git a/debug.py b/debug.py
index 7ca76d6c5c..e195ebdcdf 100644
--- a/debug.py
+++ b/debug.py
@@ -1,5 +1,9 @@
 import os
 
+# This module should be kept compatible with Python 1.5.2.
+
+__revision__ = "$Id$"
+
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
 # debug mode.
 DEBUG = os.environ.get('DISTUTILS_DEBUG')
diff --git a/dep_util.py b/dep_util.py
index f49665483a..0746633d23 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,6 +4,8 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/dir_util.py b/dir_util.py
index d407e9ac5b..ca9fa9dc7f 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,6 +2,8 @@
 
 Utility functions for manipulating directories and directory trees."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/dist.py b/dist.py
index 3a690696bb..faeb7b10b3 100644
--- a/dist.py
+++ b/dist.py
@@ -4,6 +4,8 @@
 being built/installed/distributed.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/errors.py b/errors.py
index 963d83377c..94e83fb557 100644
--- a/errors.py
+++ b/errors.py
@@ -8,6 +8,8 @@
 This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 class DistutilsError (Exception):
diff --git a/fancy_getopt.py b/fancy_getopt.py
index f78b0a6854..a4a4e7979e 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,6 +8,8 @@
   * options set attributes of a passed-in object
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, string, re
diff --git a/file_util.py b/file_util.py
index c2fa086f05..e230ce587e 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,6 +3,8 @@
 Utility functions for operating on single files.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os
diff --git a/filelist.py b/filelist.py
index 4b5d47d02f..bfa53d2133 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,6 +4,8 @@
 and building lists of files.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import os, string, re
diff --git a/log.py b/log.py
index 6aeb7c9aac..0442033d66 100644
--- a/log.py
+++ b/log.py
@@ -1,5 +1,7 @@
 """A simple log mechanism styled after PEP 282."""
 
+# This module should be kept compatible with Python 1.5.2.
+
 # The class here is styled after PEP 282 so that it could later be
 # replaced with a standard Python logging implementation.
 
diff --git a/msvccompiler.py b/msvccompiler.py
index c2bd77de44..65a50cc79a 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -3,11 +3,12 @@
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
 for the Microsoft Visual Studio."""
 
-
 # Written by Perry Stoll
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 8f62bf7d87..d546de1f25 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -4,6 +4,10 @@
 for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
 Windows."""
 
+# This module should be kept compatible with Python 1.5.2.
+
+__revision__ = "$Id$"
+
 import sys, os, string
 from types import *
 from distutils.errors import \
diff --git a/spawn.py b/spawn.py
index f94817d498..6e0423b099 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,6 +6,8 @@
 executable name.
 """
 
+# This module should be kept compatible with Python 1.5.2.
+
 __revision__ = "$Id$"
 
 import sys, os, string

From 6ff384d0805ec8da74e606380d9526d73cac0c8b Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 20 Nov 2002 16:10:29 +0000
Subject: [PATCH 0895/8469] Add missing import

---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index 5b197fa58d..e4209449e4 100644
--- a/extension.py
+++ b/extension.py
@@ -5,7 +5,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os, string, sys
 from types import *
 
 try:

From 66ffcc6481adb327ae0c529f439bed2c418e97ef Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Nov 2002 18:33:28 +0000
Subject: [PATCH 0896/8469] Bug #639118 from Ollie Oldham: archiver should use
 zipfile before zip         Previously archive_util.py attempted to spawn an  
       external 'zip' program for the zip action, if this fails, an        
 attempt to import zipfile.py is made...

        This bites folks who have 'old' or non-conforming zip
        programs on windows platforms.  This change tries the 'zipfile'
        module first, falling back to spawning a zip process if
        the module isn't available.
---
 archive_util.py | 58 +++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index d1dc909520..d5b3096617 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -59,46 +59,48 @@ def make_tarball (base_name, base_dir, compress="gzip",
 
 def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.  The output
-    zip file will be named 'base_dir' + ".zip".  Uses either the InfoZIP
-    "zip" utility (if installed and found on the default search path) or
-    the "zipfile" Python module (if available).  If neither tool is
-    available, raises DistutilsExecError.  Returns the name of the output
-    zip file.
+    zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
+    Python module (if available) or the InfoZIP "zip" utility (if installed
+    and found on the default search path).  If neither tool is available,
+    raises DistutilsExecError.  Returns the name of the output zip file.
     """
-    # This initially assumed the Unix 'zip' utility -- but
-    # apparently InfoZIP's zip.exe works the same under Windows, so
-    # no changes needed!
-
+    try:
+        import zipfile
+    except ImportError:
+        zipfile = None
+        
     zip_filename = base_name + ".zip"
     mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
-    try:
-        spawn(["zip", "-rq", zip_filename, base_dir],
-              dry_run=dry_run)
-    except DistutilsExecError:
-
-        # XXX really should distinguish between "couldn't find
-        # external 'zip' command" and "zip failed" -- shouldn't try
-        # again in the latter case.  (I think fixing this will
-        # require some cooperation from the spawn module -- perhaps
-        # a utility function to search the path, so we can fallback
-        # on zipfile.py without the failed spawn.)
+
+    # If zipfile module is not available, try spawning an external
+    # 'zip' command.
+    if zipfile is None:
+        if verbose:
+            zipoptions = "-r"
+        else:
+            zipoptions = "-rq"
+        
         try:
-            import zipfile
-        except ImportError:
+            spawn(["zip", zipoptions, zip_filename, base_dir],
+                  dry_run=dry_run)
+        except DistutilsExecError:
+            # XXX really should distinguish between "couldn't find
+            # external 'zip' command" and "zip failed".
             raise DistutilsExecError, \
-                  ("unable to create zip file '%s': " +
-                   "could neither find a standalone zip utility nor " +
-                   "import the 'zipfile' module") % zip_filename
+                  ("unable to create zip file '%s': "
+                   "could neither import the 'zipfile' module nor "
+                   "find a standalone zip utility") % zip_filename
 
-        
-        log.info("creating '%s' and adding '%s' to it", 
+    else:
+        log.info("creating '%s' and adding '%s' to it",
                  zip_filename, base_dir)
-         
+
         def visit (z, dirname, names):
             for name in names:
                 path = os.path.normpath(os.path.join(dirname, name))
                 if os.path.isfile(path):
                     z.write(path, path)
+                    log.info("adding '%s'" % path)
 
         if not dry_run:
             z = zipfile.ZipFile(zip_filename, "w",

From c8618f4eddcd6ecc5ea54387494cb5d8a00f8dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 21 Nov 2002 20:33:24 +0000
Subject: [PATCH 0897/8469] Patch #642019: Recognize gcc-x.y as gcc.

---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 603dfe90cc..2a6b1beeea 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -201,7 +201,7 @@ def runtime_library_dir_option(self, dir):
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
-        elif compiler == "gcc" or compiler == "g++":
+        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
             return "-Wl,-R" + dir
         else:
             return "-R" + dir

From 2fe3abe410be345020e460b3be5860c4d60a2223 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Nov 2002 20:41:07 +0000
Subject: [PATCH 0898/8469] Reflow comment

---
 spawn.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spawn.py b/spawn.py
index 6e0423b099..4857ce5e63 100644
--- a/spawn.py
+++ b/spawn.py
@@ -25,9 +25,9 @@ def spawn (cmd,
     There is no way to run a program with a name different from that of its
     executable.
 
-    If 'search_path' is true (the default), the system's executable search
-    path will be used to find the program; otherwise, cmd[0] must be the
-    exact path to the executable.If 'dry_run' is true,
+    If 'search_path' is true (the default), the system's executable
+    search path will be used to find the program; otherwise, cmd[0]
+    must be the exact path to the executable.  If 'dry_run' is true,
     the command will not actually be run.
 
     Raise DistutilsExecError if running the program fails in any way; just

From 90b1c1a1b6dfb3d5ed0ef835e62d94ea2c45f4fa Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 22 Nov 2002 20:57:20 +0000
Subject: [PATCH 0899/8469] get_python_version was not imported.

---
 command/bdist_wininst.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 9c9fd10918..7609fabeef 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -13,6 +13,7 @@
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
 from distutils.errors import *
+from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_wininst (Command):

From fc4c1ada98f887c3423daee9c803753513fba0ba Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 22 Nov 2002 21:08:34 +0000
Subject: [PATCH 0900/8469] (This is hopefully the last large, funny checkin
 message for bdist_wininst.py we will see.)

Removed the base64 encoded binary contents, wininst.exe must be in the
same directory as this file now.

wininst.exe must be recompiled and commited each time the sources in
PC/bdist_wininst are changed.
---
 command/bdist_wininst.py | 404 +--------------------------------------
 command/wininst.exe      | Bin 0 -> 20992 bytes
 2 files changed, 4 insertions(+), 400 deletions(-)
 create mode 100755 command/wininst.exe

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 7609fabeef..5acca11a62 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -8,7 +8,6 @@
 __revision__ = "$Id$"
 
 import sys, os, string
-import base64
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -236,403 +235,8 @@ def create_exe (self, arcname, fullname, bitmap=None):
     # create_exe()
 
     def get_exe_bytes (self):
-        return base64.decodestring(EXEDATA)
+        # wininst.exe is in the same directory as this file
+        directory = os.path.dirname(__file__)
+        filename = os.path.join(directory, "wininst.exe")
+        return open(filename, "rb").read()
 # class bdist_wininst
-
-if __name__ == '__main__':
-    # recreate EXEDATA from wininst.exe by rewriting this file
-
-    # If you want to do this at home, you should:
-    # - checkout the *distutils* source code
-    #   (see also http://sourceforge.net/cvs/?group_id=5470)
-    #   by doing:
-    #     cvs -d:pserver:anonymous@cvs.python.sourceforge.net:/cvsroot/python login
-    #   and
-    #     cvs -z3 -d:pserver:anonymous@cvs.python.sourceforge.net:/cvsroot/python co distutils
-    # - Built wininst.exe from the MSVC project file distutils/misc/wininst.dsw
-    # - Execute this file (distutils/distutils/command/bdist_wininst.py)
-
-    import re
-    moddata = open("bdist_wininst.py", "r").read()
-    exedata = open("../../misc/wininst.exe", "rb").read()
-    print "wininst.exe length is %d bytes" % len(exedata)
-    print "wininst.exe encoded length is %d bytes" % len(base64.encodestring(exedata))
-    exp = re.compile('EXE'+'DATA = """\\\\(\n.*)*\n"""', re.M)
-    data = exp.sub('EXE' + 'DATA = """\\\\\n%s"""' %
-                    base64.encodestring(exedata), moddata)
-    open("bdist_wininst.py", "w").write(data)
-    print "bdist_wininst.py recreated"
-
-EXEDATA = """\
-TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAA8AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1v
-ZGUuDQ0KJAAAAAAAAAAjSEomZykkdWcpJHVnKSR1HDUodWQpJHUINi51bCkkdeQ1KnVlKSR1CDYg
-dWUpJHVnKSR1aCkkdWcpJXXuKSR1BTY3dWwpJHVhCi51ZSkkdaAvInVmKSR1UmljaGcpJHUAAAAA
-AAAAAAAAAAAAAAAAUEUAAEwBAwCllso9AAAAAAAAAADgAA8BCwEGAABQAAAAEAAAALAAAAAHAQAA
-wAAAABABAAAAQAAAEAAAAAIAAAQAAAAAAAAABAAAAAAAAAAAIAEAAAQAAAAAAAACAAAAAAAQAAAQ
-AAAAABAAABAAAAAAAAAQAAAAAAAAAAAAAAAwEQEAoAEAAAAQAQAwAQAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVUFgwAAAAAACwAAAAEAAAAAAAAAAEAAAA
-AAAAAAAAAAAAAACAAADgVVBYMQAAAAAAUAAAAMAAAABKAAAABAAAAAAAAAAAAAAAAAAAQAAA4C5y
-c3JjAAAAABAAAAAQAQAABAAAAE4AAAAAAAAAAAAAAAAAAEAAAMAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAkSW5mbzogVGhpcyBmaWxlIGlz
-IHBhY2tlZCB3aXRoIHRoZSBVUFggZXhlY3V0YWJsZSBwYWNrZXIgaHR0cDovL3VweC50c3gub3Jn
-ICQKACRJZDogVVBYIDEuMDEgQ29weXJpZ2h0IChDKSAxOTk2LTIwMDAgdGhlIFVQWCBUZWFtLiBB
-bGwgUmlnaHRzIFJlc2VydmVkLiAkCgBVUFghDAkCCuNX/7Q27V5F5+gAAPhGAAAA4AAAJgEAFf/b
-//9TVVaLdCQUhfZXdH2LbCQci3wMgD4AdHBqXFb/5vZv/xVMcUAAi/BZHVl0X4AmAFcRzHD9v/n+
-2IP7/3Unag/IhcB1E4XtdA9XaBCQ/d/+vw1qBf/Vg8QM6wdXagEJWVn2wxB1HGi3ABOyna0ALcQp
-Dcb3/3/7BlxGdYssWF9eXVvDVYvsg+wMU1ZXiz2oLe/uf3cz9rs5wDl1CHUHx0UIAQxWaIBMsf9v
-bxFWVlMFDP/Xg/j/iUX8D4WIY26+vZmsEQN1GyEg/3UQ6Bf/b7s31wBopw+EA0HrsR9QdAmPbduz
-UI/rL1wgGOpTDGoCrM2W7f9VIPDALmcQZronYy91JS67aFTH6Xbf891TAes7B1kO8yR0Cq3QHvkT
-A41F9G4GAgx7n4UYQrB9/BIDvO7NNEjQNBR1CQvYlgbTfTN/DlZqBFYQ1BD7GlyE2HyJfg9hOIKz
-3drmPOsmpSsCUyq8+b5tW1OnCCWLBDvGdRcnEMKGNuEoco4KM8BsC+3/5FvJOIN9EAhTi10IaUOS
-druwffI4k8jdUOjIVyJFsnzb3AwvUMgIFEBqAcz+c7ftGF4G2CVoqFEq8VCJXdS/sHDrLS0bfRw7
-dGn/dChQaO72+b6QmBlLBC7sjnQTGnOd+5YNfIsEyYr2IR8byFn3LXw6Lh9kQ+2w0VoDxUUSPsgP
-3ea+U5ccGY1e8KQUxuPO8GHOgewo4auLVRBExv/tf4tMAvqNXALqV5/gK0MMK8GD6BaLG//L7f/P
-gTtQSwUGiX3o8GsCg2UUAGaDewoA/5v77g+OYA7rCYtN7D/M6ItEESqNNBEDttkubzP6gT4BAjA6
-gT8Lv3Wf7QMEPC7BLpSJMQPKD79WbY/dth4I9AZOIAwcA1UV0W370rwITxyJwVcaA9CbEBYjNP72
-6I1EAipF3I2F2P6baTShezdgCy7dgLwF1w9cMseY4VkYaLATHShPFz4bMyvtoGX4hoQFtrRhexFS
-5PaDOMA+Cn5jL9vwDfzw/zBSUAp19J8ls9QN1kgPEMoAds79Dy38/0X4g8AILzU9dcixzs3eq0ca
-UGU0aFgzwwbysgywBXitsO4bbpp0SqZmi0YMUAQOQ2uuseF2ueRQVCyrR/4a3EclIicbCBt2FFEw
-z/bbDdxKAfqZGNLu7WPbmRjJFXlQKUMKUEPt9tzGagbBGLwPtRQ5Aqnguu4PjE1h6ZFw+7qmgLnH
-fjTIjRzIlv9zBNSoZr+52yg3XxrwJvQDyCvYGZvkEBaz/HYQKt4ugXAAL1mNTwT72/aKCID5MwUE
-L3UCQEtT9naGpSA3W+A6oQQsbjxel3jrA+quXCQE8X/fGgcRO4TJdAs6A8YAXEB17/D6QunIFEBo
-cJNAZVg3ELl9iMtpAl3DVpOtbLt6CL+Fth2EjZABsF03AbW6Hyg4XIM9pBkACY8s4G40aMxE4Hh0
-M2jZXte5tA7PVA+jJGj8vw/2AHRZQ3UVaJwdNaz3L5SxzGvJKes7M/++HJE0CJiFjXM2HURtx3a7
-/ymDxghHgf5sGnLjHGiIOxTL3RCsIbQ1BP0Yds+CyyWfY/hqpaS292bBRhYSl99zd+xk38lPdIvr
-ru4sAucsy/YtWFaJdfAC7Oj0frnBsvz4pzByO8Z9C1C22xFYld8IZe7oUAPsaJqmafTw4Nzkx8eE
-XAYElSS/OuncBt2HI8h0rQFNuAeOICfZWjjglD45W9j9jVX4UmjYIIsIYxEfsJz9HAH4GVFQGpDI
-yciE3BxsZmTsdjnXdBgf8CyauG2WCEjrchzsdCDoe05Gxh/sRCBSPDwZG2T09Bwk9JMKrrnUNQHU
-/QTgfM4CDboe4HqGfGZse7dFjZUb7lI2GAYXMpY52AcnzsvcWAcNBiUIaAytazILIjQnJCZQE8CY
-zWYfCBu9tuUgcFle9QAEU3ZbPSg7FnEQFwD88ppap+kVg3Qa3UhnZGcWlwEG6QCbuLkt23R7Al4h
-D4X+oaTKkYMs8U3kmWSVcXeD9gmsD7deVDXsT8HgENlwOy6RfRR9aAFlqowI2Bbu1i7cAhDN4mzX
-sjkKDpNQns92L343CjwpGWowG2hcbDO2c2Ug6HEG5Otziidw9h10EoZIIHCJavuQpQd2QWxHaEQf
-/bnf15I6EHU2H2gT65bC3vqCfQ3QrdjrG1ctXCdkMIvDmku2LWG2CKrgjSQR8BzfdvfNHIkGoay2
-bYlGBAM1Cl63cGEJfLBWOWK+CuFiYeF0NYJNy1HAQ2ge2jMAEZVcVphs4SK7CG3scAzvWCWDF/sG
-iB0j2Un3OdidK/DaElaifAuvxbMjahBGuWmALV53ODGFXrwYhb7W7jk1qJ90PYwHAikTXMfGaiSw
-ljuMMptvBT56MSoGgQQHdc0X74bYxwUq8+vBiT5WX07INeBRJkAMD3QXWrHJRlUUuawx9u0xGQv4
-U9xFwFdQFPzfNDT0btgrXZ/4agqZWfe526z7+TPJaBiBUQAeaLxri8enzgnXMDw9RBrRMFtDbdca
-wBQVQLZjYFhQuDiDWVDYDwwfLtQBqR08GtNoSq8d2LN1OHAjCgEVnOkevdOpt180nwutYc6e8JXX
-5sKj+7bdEADauAAGAD1M4U71LZm2ZpSBCRAnD6zGdztOcOgIVyEM0qG4zG4Uw40xdPhyIv3/jJ17
-v1UGxHGDDR7HBCTAjGw6HGTc8CSWKIFJWDIvP8jG8KzWsNT36ANB1m65n/0MNoxsDiDLAARfhOsn
-a/TxLgaBeAg4QBnqfrI1e65wHdF0NwRbcAsv1fWwp/5CCFad42e4dTlWyCnY0C70tzehHUCLUAqN
-SA6RUVJ7FhqNaqxGSKMwBsEs3SwM1PwQEZ5BGt7w4DXX1BoVTN+sUAVvTbVoLVEh9BEr0Ct/oW9b
-rVIP+CtV8PJSmSvC0fhmG7VDehVDxw3lFpERhdwEg3zbFbr4An4GuOhPw64OCAIMPgh/H30FuLgT
-uAwRnouEJBTQjQrgC7LGTlf9sLu5u+UCtCQgE4stfy3CAJvO0NX0K8YVRS4ov/4Q2Gx3C2Y7xxQA
-wegDpCFy4enPEOzOEMcMLyQL1btwfzpTaOEgC3dmgFdW2/QQ+7xdGyCbFgFGSItri60zGdVYieIQ
-ZG2iqVJe1EixaIbu3bWCGWR0NIA9ZbGS8WulU+PGfTyXJnAzTOdMFRwhaTK20MY3fFHPQ0ApBpCT
-HCD4luu61+UWSsgXMLgeSeToZjwfwx3EA0lf07kgY8FDw4i7aykr3MQUdU7oKEGRjS3w4L+O9O+j
-00XKHbII8KCb2SI4CNIKyYN4g92RwHZ2GGiZeLvbINZ6Pg41KlNfBZnsMAMpisHABEocq/RvLYKM
-HVpQHonDOtcMT0qk6Ib+GxwF3pzZL+SL3QJ1Hw4hZsaeEDUikK5EcBboDhAwEKPwgbVlr0DrzZc7
-KrSlp/Z9DY2Dj39IdbPSCihZFIB8BBcTUt1SIhETGD3/Fr5g3XcEExwOClnx8JBMx0vrS8ks/YQb
-BeM79EpXV6dhw2l2aP4tA691BKvCmnBr6yADV2AfOu1qQWP5gcRUAoeWzv6B3AKpwseCg+0z23cZ
-AGvUhqRGYAG9/FwcADr6De0HNrgSUVdqUF8DU40MNOQA+5ivMM4Cke2JffQnDDHydVE+tB88i0Xa
-wyUKXMgfTTgYNBae2ZbEmFGhK6VEno3xjLZorP3WEUj/uQowaYASf8DabLZG7KAcf58zF3h0dV2c
-UfD9m++dLJsa8AA5XhbwIghsTgExwe4kgm1j6C/eWU/OjA3s6GiaIkUQUVk7FXv08brz8K9erDuE
-FoteESncecmtBlm1BBAMEOtnuQHU86h2LfECr1twuKZNKgjV1yQqdGbhkD/T6xAonB02wdkd7Bgg
-Nrjf4yBmFnJ3nxSzJ7BDwSWWRevRwhJyWPMaJLB+xGBouahQmE8L2cuVCY2AeOOGH/mxi4SLQAg9
-MRF0LT2sYEly29pPYe2dZpsljJI9GBgMiMWnvfRViZ94jLRQd7ifClzeDTNVHDtng1UcoBQWtDsl
-mWNRhOGTWb+yLVfA0PhfzhP7bWISgWTDGCeAyQWgwS/35LdebgLJTTaXMBn1sj7EtqO0lWh16km7
-9aGYdHDf7EL+QgwOkqSTwGTwU/cUauPA76xyFMBDYFU9GCKVLY2yO+KXSGAFaF2qhfYxPEZs6oDZ
-VkMIXcQEEAPaK4Yy1pzbW+qFrAqZW1Qwpjhdewf3CSQXc9KcbAoQ+AD8qBFlZPCY9G3iu2rF3UeF
-SjvedEMaLG+3fnQ+BPh0Ofy3FuqqAR0vsSvSObZGu6Y/4CsPlTNbVVO7MdoC0xr8sBVtTeCNRtvw
-FPhHhoPI/51ybJ30blAQSKoZWjsSanIaR7na6sf/QARB6/ZjwVseGzwaDYequ8CfHoQxoFMX11a9
-H1ZVFGK7ZBBBFIuxLf9EJG4BkQD6nvfYG8CDStBwi+BTwGOPGG8CSd7hBdUgaFyZorgf4T7/lCR0
-LxN0BCYJu8UO9Co0aFQsGbhmwSxQe5OH0hLcsogswBo3wb19i3YElHWEi1Kz/dBsOKFTHLAgcjO1
-BAUaL8lIV8xmgs7qgB9TPsyHTubOCSQlIuvbNlc28wTCHBT8QgRi8XgEvqiR3K4Wb9CqxfSKDwV1
-HIB3gxL5C9Sak2Y7Aktd0BmNGcCzcJqwVhq+/4KkGVngVVPFn+Sa5kMc7NcNqJoQeHF7zy6ayvgX
-nHGYuw/B3Nbs0wU0eC04Boh0hgUCKZR1RnuuZhfIRixQbiHYO2hsrxFrSCOzbSCV/drpYI/aC8wG
-HRSZ02DWmg0hBlAAMCucbHCtwxQbsBVYSG7Aa0iaJxas8NMQoH3wATE95NUiId2RijAEMGExe5Oz
-OiBrDYmBHvZhiWxuhN4QQBQjkvRINgeyGP78mdkZLNg3shSP3DC75NyZViWkaMyZzSV5IJ7ImXou
-apv1wXzL8uzoF5DmXAvGg0D9c4tHfQD7XVZLnJnLIEC+jCbIBuwX0FbMVtjgFMDIT8Nb6ZIN8NyU
-FBFW1pNtCHB+ApUMJOSAm80ABIWJvmC4rl33Pl7h/z0PKPYuU7fAqUU5ivycBBauxQMJ6OLf921u
-4/DHMTATCfjp7LjPJhSjdLsQJJyC2ckgKFYMvlsL90Cy3PWNjRhRWbBAjBbGnEyN8dl4EFPmuA2o
-7KAL7anwFcFFOlFJjgxCo4sYUKMUsDTcekPSm6GhNb0gUEgGGTNlKQzsWerE0vR/85YYdiCTGxwF
-dfrWsaJBbprazvbsNAZVPDIdagJgNihSu9QcUxCVUBDiBsF47LybGkbsYBB+6xYfI6xBsNibJB+d
-FTLXzECIO8u/e7jXQV6YssWQitGZwIVGdoDu0UaaTC6EjBSc92asmI9OcSiApDUmdEJdsC3+A6PX
-9zSbsMeb0g7D08mx2FFoHjCCS+t06hatgwZjXBXi6zeIxVss5+e0zMDkKzUT4Ufs9GK2nbhWLwAq
-pZADCQw1fwTkkGiMv5IgZ5PECWydclgK7HfSXRKe6BVA5Ao0J81JKPgQ8ADxkE2cCN/wnNyckTjp
-Jr4KzODJy2aWChIFQwjsOrKMLCPoMeQoMMvIMvgf8BaBMrKV8xAO9K7M1tz+i03gO84b+gDGB/Ir
-jhUuE0WJHYkVHXS7i10MNYkNAKPLdJvN4xvJgDsIwI4d2wldlFP9WUJZ+nUD6WOMHx9TZ6A1wt2w
-RN3pxCpojBUrtUVKUU/8xxji/faFV/hK/nQ/aHTwdqKv4HxbCKM0DXJtoI7No3O+aGrBu4X6qVXH
-Nifwg8YQekb82jOB/oNy5dFV7O+LRq/mTLLkCktduBiHKL4HI+tBk1SOAlJmDHFyGIzeVvI1/OS5
-wczrBfJ8nfRiy+CFEezyrthEs0w2XnQbXsYAfndZyQp0agtZidqFN1eNfcTO86sGpWO/Wnrwq6vk
-ZG0MqxqQuWixbROMG7+WEOKrHW7VwDCWLwHIKQqwNfcc3JBd6tZKmxvY5wcGzGvnTOF4KNZQFysS
-S8buTGwgoh1AGfRyycmTbVgi+G7bOdp5lSmf13+MNFyurUHdfJh1BZRq22+3bAWsjH+QIJt1tAK8
-5QO4LagPpAS1JEdJighcjR6v++IFrDWozIlwHr0Z45vgV4FVu4VQU74cnh/QkIGuFARWv2FqHNWd
-MBqbPiBxZQtw9hNBVfwMKNmwU7QObCcjTbZTtD10KAC3dICDey1s1WqdFZDu1cnVoxcU4Bx5M5XZ
-RQpocNCdZjv0lltSFciLhrkCVQQZRrDJt8XJuDKsw7MrA/0hZVCj2kMemN4DMAm58KE6nO0bjlAx
-W3QHUBNoFKtvAtcPNCW2AUxubQAQxVYaqlSq9Vd0b4lauPtL9Z9xZoP/AnZhtnVOikgBQAh/eXl7
-MHxKBDN+Hm50DHJ1O0DGBgb9LfYNRuszBgMKRk9P6yfa/n7S9GoIUay0PAp1BR9PiAbVwb8Z7Qbr
-BYgORkBPqZkYibcru2uAJqjTKB+FU0na+NXBVtLxkRtE2APcJRtAGeSUAcfD4AN/yhAGrjNom9Vo
-TcNqeAxzTJ7Yu1yqUJqtBY2yrCUIZmQ+Fuh3F7pQGTDEMQpIHMjY7zIMGPDUntVWc9WgR7Zv+FZq
-ETErzZorLwQLLeKuutazRFgM8JkKECQkYGcGFHJ4zpLJBDqs8aQz20Ic1lBTrowUqUlzO1B+oP2o
-Xop1MtgRpHhJexAr8RIv2SY7VbL2Pb+MEFfDEYK92Svl4BBFHbzwZITV/GpEJaheVoUwMEaOIhEl
-CbrmSHbUAVAcUFcWbrPbt1NTRCpTZk3Y+LaThdOIQ4+ESPFBr+2GC9ZqDxiASLLEG8muuLQNsrhn
-c9827CzYCNYsE3QJw0N4NSNRUR8xuaYYGxzoTMtb5WzwRQdB2N7bLYv9L+DeQ2pdUxLehf9ZdH2A
-JwBHwD94LVZXXzp0A4Agy6pN6mnpuPCjXqx+rxhWz2VKOXu4Ay14IyUWkaxWcrCeBACwAw/O8Ia7
-GSi55D1sBG0EQibI0Tr/soITzsx1Al7DoYQaKv13DkaDOAF+EA++BtHFvO/MRkfrEa2wFYsJigTA
-ztr0QYPgCFPQVmReTyVfkYGQGBSWhTeEWd4028PZTShcEUBTaW8787rwY0WMJyKIHkYMoLUDnaz4
-NvxWhEr56vW8VFPd8PSe9EMZGeRAhzW/V5AcpJxrh1NTySDfIwApDOy3SUUYe2OndDbK0MIVkzmZ
-QuqhSV89FHVAAKkgFV9Hmq3BGggr+KLsV1KTVKRMRldEv9+TXAiInDUqOJ0FX3SScbreGlM6euBJ
-zKAIQVTiIA88XPZHwBgBB250g9QDV3sLXelyN1X8GyeuCQYGYFM78KC+bYQGucIMIwninsvCM5Ye
-2FQeCASwJAdsDdwLCbyH/F2yEWoQVmh8oOsoy2D0PXrfSlEITBaZrnDwUlVk3Fj0EWgOKttqKBuw
-ex+jKnULaFQiGSlzMEdgFxcdOILo704iCnBBMyezBDN3DJIIKAYffMQojANZWejnFZADw72ENeca
-7Ba9tYzZGvG1TuvEDBr2XMhLUnc1+EvBsokEj0E7Texrbc69CXweg3bsBujzIWe2WWY8TJS/toXW
-DjCwhfcAk+JWTXAd+X3kOgzoCg9DoEVAjsKJG0AERKBKKBBbAVj/PNPcpw59M/hX345AD4aFngX3
-5ALn+F/PBqS7Xx7/MFNkDTOLGFMLh2DMzPaf5fTh96dLO8d1RS4lLvMb/8DU4aEJj0eAjCygkCwA
-ohNahNlaL9+6usAim9kIsTH8XgNrBOTcwXjL8zmQxBAk3qL0z4Ec2OtlKbAII31KDuxm60IhnCQi
-6yCOHMiB5ogHflmcCxcWsPhtTfCK0f7vBMZw+6RotQWIJYSgvRQR1wXVOVMDUiBzYO99HrB4yatQ
-aDSfoRTrG7CkO9kf7J0cEEmqg/HUQBD8ntwJhIN2KiJCJ2c4oXSFuwUMwFn44hQXxVe+ZaZWy0Sn
-LjiMWQmqagge/Su3WaNsRg4oPZ82nKGGrHB7lNrxe4/wKcAsL3+jqFroXTB5EB+N62FMLK8ERPpG
-1yXdDCqajrUwDn0nJiU/+x9CcF26H0B0HGoGaFhnfQLukbsWYgdoLBAw3sgSUGgIoTQxGgkOhmNR
-SFOFZhSompCNNNYBXimo9IOOwsQWiCtvYU7wUZSUJVY8fNDKKFTwGxoI0lFJBEnXoa1Kpjyixwjs
-AtwPAzeLVQgaf3uh2PlMYStBEAIMg+gigTkBGzcUW400EAjDbTLbd0k+elY0Egu3p4yvf6lWB55O
-EH8Ni9YrVgQlYhPwK9GJFY4rRrqq39rYELtX/gyAiQErfgSjFm7J2LF0d+f8xyXcycZUnFLqI+yE
-DWYWjZg/mBu05prqNgV2yCLyW6mCRXaLsXTBKBq4Lhf1RmyP4gHqRWPrGAvDba54RaBGt/+PN8wA
-SzPSO8JWdDOLSE7KdNX/y/YsiVAUAggYi3EM994b9lKD5kHsbr+BiTGLQBwgFFFCM0xc0Wrhu7IE
-12HRAA37CJAAfQgLDcUbjjqLRhMzGiQ+Rbc1LD0UDQpsQWy31JvbPwgeGihQUY0kDUcAc0vHAABU
-5a35KtFWUU73igFfC5uKDaY6wYLnXnx7F4ftJBg4CtyFxTv3dQo/NX2LEVFkIIl+GNIKrfFdvGAg
-8FI7fig5fiSHDrhWdOUkEFOBaqSE0rXNVUMniYY+/OkLv01MJYl4FItWF8+Jegz/vf37XbT32cdA
-DAF4+Qh8WQQPf1SFrf3XH7gR0+CJShBS11E3uE/b/9ob0lD30oHiwFFlUoEzzBkq/tdVeEFPVjl6
-FHUPCsVb9iNuDk/Ck83GC1YbyV+4+mk8T1gyEHFTVRBCCbaqiQR6djS33S0K+QOhPgAT8ANUb6rf
-KCNVg/oEv/vBlcNLvd8e2r8FweP7iVwZiQjIDQ+HxBUe3hCZJI0QQxkEtjvaRrM9iEkeiQ3iQYvx
-bXxrLwWLDooRHAQ1Fuf+hb8QBIPhD0KACokWdBXHAA1V3btL5gVsGPChdeuiIotQDuzG7RDB6SjB
-CF12GCTcr7UdTBUvLhcFvdsVbp4EEUgzyY5mCEB29rg1fYteHIlOBom9HwMT/0u80Yl7QwTBhwPB
-9/WF0nQhx+li7r0DVpTR3V/Em9v45Gj2wSAlgWMpB+WIDTsmHNhWwfWjdNo0fGKkZUMh2Pf9dRij
-AlXzWm1taTAshV8CkiIBwaU2u09pAnOgM41IzblIS3NSHhJEVPLNto4M+QvYDDnjCF4wZ14tAmPk
-7XONt+bhStzB4RhIC+S+LtnaSTQJ+E1WKIy1G4NIQokGOhwUAftbV5CBSDfiEAPKiUg5kovkkgq+
-CGZLLhkLhDZlDjfmPzlINBI2YDZDhOvlM1lACMiB6aykpvoh22gCdQmLx1GDc27ZwginZ3JqY53J
-LLSkFlBHbsclhAfYAQM5FkhPs2VpuDeKChtQ4dE+JAfIkVYCBA7YIYTJ0iCJKLOEkBJGIR/sNduF
-eE4w8wa4+DthGpaRaSycy2azgnAAJWqW5NsKAP0MQwEp/WJuyf0GOAtHP9ksuwIwA7RB7i1C0yyb
-Zmi0NUCi18ssm2URQUvsQvhbiweSwH/TV/OiAofbejyJQ3SN9lTbWAQP2Q6+628d2OBHKFKpV8p1
-BnUNO7KBXT5XUepLDCjH8gS27cYBRjQCMA447hV8thZRCCB0DrZb68KitdAfYEcwwMOir0Cy3/xt
-akWJzhWqZGMgwQs5KPFM9tvECk/XCEerKNpJwRqCocABX9mXehiDWelXKIyQ7cMGM0D3ckBTUygo
-udM5aB+fK1EeDRLWwC6iNgKFty4B9QPYHoleLLyxGBKzOMgEQO5DL3uqAIPsmDhTb7YGWos4WPsp
-Q7JrXMCtNRJILks0R+/aFt8QMFY7yLNUChVEcwUrL+Da8sFI6wUsBx6MA4P4DQ4+lwkZDIUsQH4Y
-XJED+IP9A3M8ddC2b7ielg3G5EiKD8cUTK77+/+Ui9GLzdPig8UIYwvyRzGJOG/V3ruJL3LO6wQ3
-r7oHi8jdN7XA0ei1AZeJSxh3kWNUb88CN4PtAxkBzRwHwe7oYNP7A9PuK+k/szS+QUi3hbYJPVKN
-sISNDTBRXcMndg44Us5SHCRcITTi7Tp6+NxRDyxSEBXoPlDeEEMcFImuZuw587XvXFhxBjfkwGJh
-FAP4Xbx1h/1YFM4gcyyp+i3QcG76oAY/TCxPm8E9l/Z8QCcA8tRXauJCjYvOguEHcrf/FnjqEDPR
-r6I47YvBO8X6BInYQbq1bFxLJgGLiQPpdG5bYkzSF7wqxxy+a4dNBYWdFnwaRDvWdSNrvKsbv4t7
-KLAZi9c7sRXbLhS+cwcrwkhXZCvyc4k1oULXHXVntExBSAT6YmvtcFM0KA4HRzDD26z7atajTDox
-K8pJ/+/2HG1LLAcEPlV1IGLcfJCR99byTovOwovImHBnm6ResAveYKFhBcl2ncI7wQqtaegFwT4U
-RDAk/oL7JYEC86WLyi2N4QMr0POktrc7PNpcJUQDUg1LM1270V0V8CsMFol4NteCoRwpAWhdZBjG
-EEYIfwcqllfJgTwOczgyDtF9yBiS0iX/PyXIvmWLzSCYH4cdBtbQbu6OhTzgCIH6oAUT8gXfYGso
-6wV9H0aNhAgClm7OUH93A0go+VCN57NxYQyNBQ5I3mcB8w7HQwhKA+sIrkY3msZxU5IIEQqDYvzO
-04Utc2hZMr40BmlhMpUDLAhODjLREbGL/DsabD9a7cUEkWEICO5hrtADhmpncpgwbbL3w7gTochz
-ITw0xzG6ucJ7aTWgNyBy31j60nZwGiRvQxCNU1FSnJozNDRX8eNyu0ZwaipR/PCFIbCQbTP7COYF
-BcOHr09l0DTiHzc13068nQJdD4N70lk76HMz1t6PR+NKOwXr+vkIzb3XSpj29PkHLh1rbvou+c2L
-yUi1ufYO/rkUI8bmVMEBjeY0drfVoHa0VRCXNHMbyVhwre0r6tEMRYQSit9th2txQKQ3OoAjErnN
-dMTj8YUDAfKD6BLNWcP+krsrJPgLH8ALO+lzO5kD6xbI4AQfMJ3n2qOR6cnsfHdVtdfod4sMjakj
-ziYOFKnxXqti1JAb1xVP5zLCHOGMCh4D5V7v1tA7KoepddMqCzVKLDkQ6ZnwguGbi7mTFQ3aHYr8
-6wIAe/j2UqgMQUiZj/x19XeJXmXiQEJ6goWY0we67RVAJCZRUECN32sdmzEJLCRRElI8NriKv4Y7
-P1FCBd4NRDYKa88UZQlZdphnB0AGD1CMJLmTpscfFUwkClybfTQZCCU0z3c9YPueBp88ICsceVAs
-zx1DpE6EVwQEBuABtoUpSA9zbNFaWF5rPDCX2ASLr1td0CudOANWTOgNWs3Bzk3u52yNTn1RXEmx
-e0DsSjTzdFZdtlQAeMBFm+cnTT7gzCBRDSMYsQTSxKEpzCEY2cB8rYnSACwAbRzMJaGdz4smaNd2
-W6+altrplUxRd4VLAq252hewkKFt2O2QMwYww+BRvJk2Dlxh/cszGGyivz03az9VUfLk12r9K9FX
-MtgPwwPqUE5LTA3L9mSNMYtpOVHQKwHtFmFzZpLqLxVSUTpbmyWQQ4UyasestbfsQRhMg0tGQEjC
-EOZ+SFGJeQRGRBgR0SYcOEsg6LOsCLMIrvKEp4QVeySwN1LIxlTKz2fAxcQAzjlBt6DQiQSTitT3
-AxDcM7jug1FP0VhDSzAluEUTED6EBZ/Pnmr8UJRKGgoheZAoSCi8Q4zPK457I4EUGJ39dQZbsodR
-NqVPUahkHYMtOtciaJQIW0aEFHyerGtVxruRUt3NIBy4UAY1zwxJcC8h2v6BBEOskP1fJLCFdC5M
-EOwoCyQcGFKEPm+ksEcJO1xIUFK9ZyslpgcMQOju8HqmZudBUFZT9x5ZTnRLU9F0N6F7v32ENugg
-Ny6JVgR/UCvVi26VbEuVCONufT7GOEC+ZggYMUOtFr5HLovHTFZVxWMhTbYGQ0tWmR1C0ks7nZiE
-MCEgoJcNIcgkMBiRU09rrH01sP5FQ0gq7cZT2EP/1EQUzUUDXC6Xy0BGa0caSAFJUEuWzXK5909e
-UKI4RVaKGbBpuDlMG1JkgEvvDKIpigIc4FZXGEcFeApXWGndi1jO7zXKRigYDRgIVwI7wAFj6U8j
-BqnGt7vv3Q3wGXB1CuzCDABbGI5fLgCdhu9VgfuwFZk/7uL3w3IFuAgr2IIPjKGt6MHEb9GK7dth
-EIoWg8bI2bsoG6xW8QP5CPIhhxxy8/T1hxxyyPb3+Pkccsgh+vv8c8ghh/3+/1CCDbYDTbxkn9q2
-zgVZFRYSRhNIjd1to5nBDbnx8vfxTG617b6/CIs19/fri/WHE+EFaOsxXRdbTF8LwQgEPybBn5UI
-UOYWQtluWOBQHxvR8S67Gld8BMMPHxw1dkuqoTeFIopPwDvuCqNFiFAQWgyISBGAO+iNdQAAD0gY
-w/CKh8PfFH8gdiyYMLTOA0aS8FZctCVoyNpuDMFNuFrYDDTBfsW8EPpg+zTCRiwHiTNNr7gBBTrf
-/gZsWujQxuhaTz0cGp1y1nYEzhAKCpJsKFwtfzBGeiyJfjuMammBrSkrInut+aqlUtuFiQZl3FUN
-O7qV2JRWUiJNEU9V3VPHgBB3U3zqyKN+M10rmRy4SJ0oDeQzFK5Aru6jMOj/Gg1ypXQTSffZG8n3
-i63eGQKDwe9NYUOdZqVaiT5jELsStqu3xopFskVY+HNEQJ6LFQ9cBLoOtQV4xS7tMACyjnPuS+7P
-0+DQAMcIC8g2eeBno7v2LEE/CixyvK6FjC3VffgjIAhWyEkY4dGvFM4U0+i4bgsu/RrBRSv4QIoB
-xdNskXgWi0mPlQgG0V3oMa+oEHTV4A+ui0m6WCuvBSIfAhy07bZAr0XDqCAH4yekc0POHweC2kLY
-e585Gq9I3HnQR/INC+fYCL5738zJiwRMuU0EA8jOrWa61lqRsNRyA9cMzW1t00AY9UXMIjkkGGVe
-lgOYhCWMRGQMBcMBaUQEhfBSZYAQhJsMjQzBiEFDhgB52AIMCgzkkAwFb9iAQwF+A2sVk3o34NV1
-A8IrN0AQ7TlT1h/tI/lRDa+WsVoB0IWX2T5V4iwtjnUhPjCp1KC0O8ERVC0piLA9OAz7COsPShtx
-6n9nhhRShTMy0iRyYjwM5AaSIW1iXeyQG+xjYSJej2IYIW6JntsBkEI59/dJ8wmISv8RQUg7UAh0
-PPdF1wdODGZJ0mBgc2HPKDewAFGBAhvjYO+T8eBNCogKQkhEvU/AFWH2zxSLK47RLQMK4sdDHyvN
-kDUDBRMXEarNdCeJ9BTDSgkwwBsg8Bgwo0BiUDA3yI9lav0rzVNWUEkLlW2uGOu0mIqHsvIgiQM+
-g/+vBH/vB3YVPzyD7wiRTFhCZ3iJTDdQthe06lCLsupimd7YMbNOIDorbW6hN/hLPPlTK/2La2Tv
-iQtbCY9GWP4SQSJbJBMBO27Vi2T+kLS+cVTLbbPcA0xV0I5WBwRXIoBZLpdY91lvWi1FkK8M3/kM
-A3rokSBRU2wg/5hEp2MTdhBnOlY9iQR1CaFbWU0FPz51HLJWVVmNFnUDdbpT6yBSVXlET1S6ARP0
-3CXaasui0/43GlspTtT+U1LHRxh8tIpXNN3tt3ddXkwe+3QGg31udQwfWGExFzW+wjAp+3vCYs+B
-7PCijCT0Bn0odpX8tCSZ7VfTNN0Cz0QDSExQTdM0TVRYXGBkaDdN0zRscHR4fImsxAa5gCRyMgGX
-3n6h735chESNRANDSom67Tnlq7tACHUfcRiBlLwY1H9uwIkpiSoAj1NfjC0anBe5EY2YwBc20DtD
-OSg9QYPABHzaoBsmdvN2+c1zBj/23XiaYroPK7R4OS51CEptFzf6g+4EO9UFO/qlLHYl/41/m1T6
-vlGJO9Pmr3MSjVyMRCszaIPd23glU8ME0RFy8m+VrXAzRKOFHAxEjQObUS/QK/G6QHkQEaJt8HUn
-A87liCwL9kr9bu5vhzPbA0wcSEnljBwXde++YozC3eaLtM3DrZGB/xwVjIQcHdsFtT1cjYwNiVzT
-UHi8eEKJERJ7HAjsdkd8QzvZcsVXi9/3QowUNYHTbGSUiSFdA9T3TENxJB5hx99O50zLABLEHTwP
-j4Gi0PiIAjM0ZYf3Ag9FDbkKO0mF0uy9bW6BKz4g/TtND44HZpGD7WAUONYs/1+w5C34bLo4A98r
-00UDzztbomei1/AmGtccPwnoqCBJy7iNfQE7sEQz/cd2J4PP//caLcewsIDbbhhBBK59vsWmane3
-beAfByvHEnLtGX3ZjnU3vzvni7F8A/iB/zhjI0eI2O8mIAd7P30rLMIvjZSE2DaJOJ96o3oTUip0
-OEOITPtFhF2gtIQs1suIBa+XaGIxvcbXi0r87xa+1cKL9dPBQyvwiRQ7dLz3dDef6wlKGCjg8Byh
-KzYGj/9ajG6K0PHptjcJHCrTiD0xiwgMkbqNDbx/cgfGDsDrnzcpDKNCtCuT8XM4yVd2F/4b0oPi
-oPZgiHHrICDWpvtNFMHmAooUMQwQgMJLtNwW7zQxIbEE9g5rIwtfhyRHuuK8tOgubGI7FXMet8UA
-gzAzHOO3d4k5jTzVpHEEhh0yMUK3cubVFHqNwnD7L7gxgYXCdAgz0NHoB3X4NBxai1hKDihgjPbB
-aCMcjQUxJE8j+suj3HeFOl8Yg+gET4gmcawL9ivfOTMII3XchyfGOHUVyEogK8fD1FDSwhxSkMar
-08dA68GaHk6rb5jekRtC1zv1dBeRWgtZuiwBdE37AVgEXMAMCiQPgVZCYF+jYUgDj+U4aBJkGJzA
-OwMLX2Y0x0kaOFVkGDRS05CheKvYaEhzMSWwg0w/FVVScIEZl6oshdNFPp29hWA4+8YMTCjtRDuT
-SDh7FkzA3ujOQHRRVh6oUlFL8Hvr93UkJ4M6FgiB/Wp3E94SAAM/Haslm+UE5E9RKLUCD/mwHvt1
-Hwy14/LBIwsj/HQC6DAY2UsvI0sGE9gZxEKkRZIEswQjDxDtxQXfDVD83u4C8G4DoVQKnIkCEDx8
-d1OUxwFYEccCWLNAyFEDNk4H7Qxja9dTWw1ge8B2/cHeaNuPd3YDFSwRe+876HU4IrpY6DcyIIk/
-0rD3COogVhQrxQPV5kuwUFswVpY4cA7AjQrxi0s8VQU2QzxMqsdNEs2L96SmVy7VR1nKpgPFF1Vt
-5/hLLAP9ogp1fkHTLTq3RCgNkXUfczTqXGELu5or7p8QhFcgB7KcR1dWsYUa60cwfM1e+IQK9l5r
-e4LkjIoLhlMvYVooVIlYwleqUXI1GF7GoRcvH8xZ+Wrhwu2LaZxRIDtxMDc4+4djNx077lFBHDlz
-CSv1TsSvWqqrFM5JMc2BNN2Ecja0DhwsornElyCD+Dwii0kSWx11QRGLpcga3u4liOkL1kcdcuJY
-+hu8xaJXMCPKyIoczo00zuCdownKjsIyTgHT6q0pwhUEZ8c5BAF+sAC+I2sMnWBADuz2XgQ2A8s4
-VUAX7B90x4PjDyvDNDFORLK1rw2ryyOkD2xJM8kPIDScGyFHpjEFAZQPwJspzzvDcytZGHNAc2GD
-+efVh1viq/bXQSaXcgc8WbRGbTlO+s9wwcAVZXPux/VIBheCUNeUvEkoEYP9O/g793IXi/dFig5G
-iE3/BoPHGtHg6wLrAesncSzfWoFvHzvfdhOLHRwARUZPOzPY2XX2GCgQS57rGefntmS/BgQZcEVJ
-iB1RoIFhEnI656hd/Q5yM/lT2LWc/KpQWxBJBBN0K/O/UG9zPqzwsq078w+C3G62jQAnVth0Ldlj
-bxdoxWXB6x7ZcwLeODFWL9Ar+TONFM2awuISjLHEHPoWU0YIXKHwDurPiT4rZ1YNC6dmlVbpc2Ig
-syIF2HRWV88D5MJmWtswk5HvtXI/EGb+9bXtrFSIaAMrQVh7iQ26QIsxQTl3X4lBZze908Ga/Waf
-/yVQZGQrFY4FVFywZmRkYGRozAC24kQdUT2lG3I49vsWl+kLLQSFARdz7JtK3LqoxAyL4XDfUMOl
-whG1zEGpUvVdfvBq/2joXRBpZKGrUKVg6y1+JQciaNWIClTjiWXoyObm3hFdThX83IMNvMyBBvQh
-2s7AFADfwLYjY6bK+7INvKEroES9CAyzDxsBjh9ZBzkdkMS5CG8gc3NsTgxxDvJoDJAaBc91gggE
-Dh0LVRf1P7+Ur7Rotg8R9JxQA5CgvoZoqWkUxAQyAPouAENYoRhuMPZ3f6GRgD4idTpGCIoGOsN0
-BDwNtj0g3/ISBCB28tTQTsQWd82kwNb2RdA9Ef3z9hJn1OsOKyB22Ov1agpYKpaKFp/4ZK8rVE+X
-KvRdM4BrcQR6w0XsTgmJTYjV5llQqF5wFC7/dYhX4Y2MjaUoBSAQtFUbboRvAwQBDxIvtsP5XDgV
-4Nf4cPRwqQICOwAA3Wu65v//ABADERIMAwg0TdM0BwkGCgXTNE3TCwQMAw0P0jRdAj8OAQ8gaW5v
-/2//ZmxhdGUgMS4BMyBDb3B5cmlnaHQPOTk13uz/uy0EOCBNYXJrIEFkbGVyIEtXe++992Nve4N/
-e3c03ffea1+nE7MXG9M0TdMfIyszO03TNE1DU2Nzg6OEvdM0w+OsAAzJkA0BAwIDkAzJkAQFki07
-zQBwX0f3vSXML3/38xk/TdM0TSExQWGBwTTNrjtAgQMBAgME0zRN0wYIDBAYFdY0TSAwQGDnCUc2
-stfHBqcSJiRhq6+zMsgg3wMLDA2yJ2MPARQCdsBG7g82RUIeCwEARsRoAYFU27TYA9GIKrJUBk8A
-UEhDcmU/9X/5YXRlRGljdG9yeSAoJXMpGE1hcN4s2P9WaWV3T2ZGaWxlFSsQwCxl7x1waW5nFxDc
-f/sJykVuZCAZdHVybnMgJWRTHyxhwRcUE0luaXSpBzCwMhgGpdGiGqRcaFKDDdZErWAHWA9QwAZZ
-NkSTPAAv4Cp5ciiTKJMWm+51DtMTCwwHGvCSNE3TLBnQELgY0zRN06AHkBd4dt3rXgJzBxSzB0wD
-9RYB6QbZXwE0DwYgzSWbJJYVEM7s/oU/U29mdHdhEFxNaWNyb3MNXFf/W+EvK2Rvd3NcQyMXbnRW
-ZXJzaW9umCD75VxVbnN0YWxsM2ThIcJD+V9jxadmybYXDpgOAGeWX3NwJmnNbrffMF9mb2xkRF9w
-G2gAIv3f+LYaaD50Y3V0B1NJRExfRk9OVFMfrP2DC1BST0dSQU0OD0NPTU3/YAFrHhYnU1RBUlRV
-UAdbFpIAFhdERRay2/9TS1RPUERJUkVDB1JZLx5r28FWH0FQFEFMb8xW8gtNRU5VFnjbCi+/aWJc
-Kt0t6WNrYZth5lgBc4hCm/hpbXfv3nB0EQtDUklQ70hFQX1SAs7LvwdQTEFUTElCVVJFT5rw70tu
-byBzdWNoIDsjdW42SLG3axZ3biB/R2YUwm8NhYqeIBl0IGF2YYaEhV3hYWKJY0hHgVOAFpph7EZD
-UH6KeGW1t8MXwTMyLmT7L2UoKWJvjXbBNLQsICIAaTB4JSTTtr14oz1XDWuw52+/EZYqK0ljgkxv
-Yx1/kL1hiidBcmd1bVRzdigMZHdEOCxKKey5FSPMZysXWttRdQ95HYhyZuG9Go9Ca8G6bD7OOoEy
-Q2+NSd9udNsB1jEjcwB8A2lgG15jV296WGl6K6FtBE8xMDB4ZBs6+y5gqzqYc6MucHkAMhcN9gie
-hKkYRcftZO42HxtPdkl3ckWsbYUzIFLfaW0WJwNuSzYecHjTUI1b+6d6cz8KClDEoCBZzxC2/YUg
-rSBBTFdBWQlvLtb4O/YsCnAtTk8sTkVWhysRJuwULgB3b5lWeHMfo1SYQlJvbTQLBVpb22gyIDl6
-SsCOLli3dzVsICzEIJ1Cw+3WeW9MIGMpcHWVLgDe1kqFOiF2Z3R+HjbXOTttdVojQ4Bs29A69xWE
-HWgV7nVwW7RWiAWLPBYyke3RCvABxg9Q95obrCCoIBYCJ0tZe1gnFbYATlQqginGsBKuYmPDLcTc
-ZBJsFWf7Pu6QwV5oV3ZzHTC1BtNxdQ7ud++dbIWdFjlzeEJDuW5ZNztpPi9yKmbqBssRKS7kbGWY
-BBobFgR1cwejrhFstkwGRBEuO81uV1xJMhGzVmtYsksonJg2KDwCmVPfp9vxklDC/4e+by4AJrxG
-V+Nv2BmDs8gR9hIvY513IbxlHBT9YpVcS9gEOPyfvPcaHhcXSWY7aG4swrbCw0V2YSh9EmdhMd7W
-MwR5Kl9AtcZjYTl0w+oqGMMwjG9CanllcWEZA3dfC19P4N3W1ORt3kZMZw9TeXNfgMkZbk9PYmqk
-D5XMFbat+CBw0FNPZDN6vVhtRggSC6JlzbZfsGdyYW1OAmVTNCbcu7kP2yVja0QJwBpODU5fHSE7
-C3O7EGwuB8NyJzAnKR2DJQmFeCIBUq/8BtNlbbstZXhlIiAtFN92rG0CLdIsLmyIImt3rfWEvWJ3
-LgAwNHcQdW2NC5xEQjNVdXVbYOG1jTxdAj1/23Vb+OHRPONPIGtlbXYmvFujwddJ/WF53dkMp2Tj
-d7RTMhY21iZLMFFdSzX33iwFTpeq8w1WwyC1U8hj+yrbEkKhAP/SCnI2zf33XWNZLyVtL2xIOiVN
-ICcsXMpmEKv5E2cNWst3u3t1WYVgLRxU5dgQowkTHwpoDnRmp4ENR2NjY24vYyLp1F7EUo2PsYb1
-buVtBm5lMOLCXJDGF3NQb7PWzphBH1dvFzOEazMY4h2o2MeMzZIfCpiJRhMSeI2lF3W/dAk7GA6Z
-d3LPI9+6YZkubJ3jGQDOgjnOH3Ktd3Y6ZeAw4LqHrrZahHbCWEZmwSQtgsQMFR2eD5rDbOAqpzP9
-ioDFJMxI21zgClss2C1s8/xhYL5mwJm/wjMNjW78SgmxQQ0bT1ODQYwZ6Yz0Xyeaa4VfCzksCA+l
-hGRjPVMx3waJyYBYLYNyhVZykYdUqlbH0MjFc90PklzQM9OtUKRUdc8TQ0Z1T1uDVl+ld7tCgGT4
-mhWLkx8IEkHJYMtapHIDF1PvZyMdSeVfBk1vZHVomp1IWEf7e0pyJ/RrKXYPA1gKaUYxBPjbSm0y
-Xw+eDmQ5lOmsb2FbbooARdZkweCe1w9v8+tmDQsPfDFi/PdeA8dBSF8FM2ExYgXPsJIHM0gIp/yP
-cRiIVUe/d1OJGvaabQxzK303WXyxs3FDHMNmgXVtW6/Hz2dHb05wvtiGczHghWwW6zodPl3JFdsA
-LmLVZcvqln8tZWcXwjA1K8pXLiUQgd8rLXIlbwZbw6SWeCFnZOgI4EwMYVcMDwOwMzdpEjZkI2zC
-WpIKFh9jp/QlK5EbUN9kEHiHhHpsE77swDK3FRN+J7RsZZReFxNGs2SSZ74AeAZOtEGDYBsIgcWX
-kI2bCsldCC210bJt7j+V2qFlB+rye8I90RxPGbdtQQYW0tSQw2O4sAAEDhqntLgSmN+pMg5X4h1y
-6ZheN6fdyNW+BVfCYZBtYmdEcK+8pCQX43DYYWAS10I+aWSpCK5FvA76owega2/ZIlnteXlEC9LJ
-u2J5DFLnWsqaiL8nuRf2aimJLwJAH7G1I7RCHH5krOFltCYX61ysGJ9jIbcZOn1KIPUlCmuXwxra
-shcR23IZcBqkYcWgc//r1SEYZ8AlduCyVtdHaLcvYuRohWbPgiYVBdmh9uuFE29vJ5AYhSfAjNZS
-c3lNwTFZg29+P3PrDR2CtcLohS9jQIbHll8YdHlwB9tNiE28DKN7B/CiA5ttmmbk0MCoohvjWY4G
-2rEmYtDdGLjGK78r8eoMYxmzYz2BrKENOy0hm25tLxKO7LBsG24LwApt2eR+WcNstjlaA/0JL94d
-0DIGNLsFYN0LIh3UAbAHEJNN1zRUcx9SHwCmG2yQcDBAwB9QBhlkkApgIKDIYEGIYD+AYIMMMkDg
-Bh/TDTLIWBiQf1ODDDJIO3g40IMM0jRREWgoDDLIILAIiDLIIINI8ATWNIMNVAcUVeN/yCCDDCt0
-NCCDDDLIDWSDDDLIJKgEhGwyyCBE6J+aQQabXB8cmFSQQQZpU3w8kMEGYdifF/9sQQYZZCy4DAYZ
-ZJCMTPgDGWSQQVISo2SQQQYjcjKQQQYZxAtiQQYZZCKkAgYZZJCCQuQHGWSQQVoalGSQQQZDejqQ
-QQYZ1BNqQQYZZCq0CgYZZJCKSvQFmmaQQVYWwAAZZJBBM3Y2ZJBBBswPZpBBBhkmrAZBBhlkhkbs
-BhlkkAleHpwZZJBBY34+ZLBBBtwbH26wwQYZLrwPDh+SBhlkjk78/2mQQRhR/xGD/xlkkCFxMcIZ
-ZJAhYSGiZJBBBgGBQWSQIRniWRlkkCEZknk5ZJAhGdJpKZBBBhmyCYmQIRlkSfJVuZBNbxUX/wIB
-dRmSQQY1ymVkkEEGJaoFkkEGGYVF6pJBBhldHZqSQQYZfT3akEEGGW0tukEGGWQNjU1BBhmS+lMT
-QQYZksNzM0EGGZLGYyMGGWSQpgODQwYZkkHmWxsGGZJBlns7BhmSQdZrKxlkkEG2C4sZkkEGS/ZX
-BhlCBhd3NwYZkkHOZycZZJBBrgeHGZJBBkfuXxmSQQYfnn8bkkEGP95vH2SzQQYvvg+fSQwy2I8f
-T/7/JUPJUMGhUDKUDOGRDCVDydGx8TKUDJXJqSVDyVDpmVAylAzZuUPJUMn5xaUylAwl5ZUlQ8lQ
-1bWUDJUM9c1DyVAyre2dMpQMJd29yVDJUP3DlAwlQ6PjQ8lQMpPTswyVDCXzy8lQMpSr65QMJUOb
-21DJUDK7+wwlQ8nHp+fJUDKUl9eVDCVDt/dQMpQMz68MJUPJ75/f31AylL//fwXTPd5Jn1cH7w8R
-nqZzT1sQ3w8FWQTOnqZZVUFdQD8D03Tu6Q9YAq8PIVyWp+ncIJ8PCVoIVpCzp2mBwGB/Ak4OGWSB
-GRgH5JCTQwZhYA45OeQEAzEwkpNDTg0MwfSBJsSviWR5VcuIG5xpY1bQhli6RnJl1W/HdWIsW2E3
-mGJlZCdLkcVCQnYeR+JSJLAjXXR5XCleEs0UFx6yZQMjn7MoS1nK3j1jHwOmaZrmAQMHDx+a5mma
-P3//AQMHapqmaQ8fP3//AAoZC4UBQkVgAwNmoAJKKPL3qZpuLKsEAACgCQC5XC5T/wDnAN4A1pfL
-5XIAvQCEAEIAOQAxcrlcLgApABgAEAAIguzktz/e/wClY+4AKxxB2TfvXgYpOzA3AAX/F7lZl7D/
-Nw/+Bgiyt7KABRcPN1nK3mTvBgAXu52vbDf/tr8GpqYILmzmXAwOCxem998H9gY3+1JbSvpSQUJa
-BcW2N3ZZUloLWxcn7wvwfGDvEQY39iAmpSDO7RZgFa8FFBC9N7JbOMYX/u4mBQbtdvOBN/pASvtR
-MVExWgVjA/Z1AFoLWhdaBRCtubawSm9gunUF5v7XbVQVbhQFZXWGphAWNxc3ZGOxCx0WbxHZus29
-PV0DR0BGAQURzVgb2cnGb/oL+UBvuvcGc68VXXkBABLoAeZmBkYLHW9zJw/yQTFYSFJYEAWFn7LP
-XA0LSvpR3xRlZBDuN/LJJRAWpqZkdRWVF8MA62YLCgBvQyHb7LB1SAsXMQzFyL4FMW/ighnME7MV
-ps8LIfuGFVkXBRTf5s4Zj/sKI1oDC8JumGM6FwVCV083jDNCev6TCLYMd1i/C7YFn29JljpC8Pxy
-/sPsDXsNAwYEycGStLBvEQfeSzZ7BQN3C/c3bEbIN/kHBUJKtrDnD++Ebzbs7kkHBfZXW9ibJQ/7
-N7mEcPbe2QcF+scYIXuzDyFv+cbZ7LVqBwUDFUMbYMsYm29VMmaXBW9HBZvpdErZb4HyAXNfsplr
-aXUW52/WFOMCERPsWm8hn00aBW9HUTFJs2UNAFtvdTHCXi9vA2+YVraN81kCW28X+94Ce5vfzXIm
-3y+wVwANb0n8J0vYhPk9A29a+uNFSCS3CfsFssneaYf23zJe2yDrUtcRvy8Zk1aWN/GHZbQO0BXg
-VZ8zJq1sN/HzRADJuVoLDA8vSaeVb2brC2XfQmoM9wv+Nwh7yWDiCQvEQJTFhwHRJmgIsXfASChi
-EZ8JewGy3SRoo9izdNdwqNdR1x0BTRMgA2E9cwkwWiq6IXJZZjYStFS8UH319ykS9AmK0/+CO22u
-+9xoJTFXB3o/NWTuc13TDXdsASAHUXQZbnNjZw8lLW8VBXkHc13TbYVyCWNtj3Upea7ruu4uE0Mv
-aRlrC04VuTOzuXgbKXQvbgs39j33XXUbUUdDwWMRb7AvWWwrOWk7aCsJG7Jl/7cu7LKRm+4ECLDv
-H4MA/YEc2AyX7QIDDlAGP1OjrLXDoSMPA30AM4PpLgJDo2cjCGRKeBSfCF73JZkMJ2wDY/8p4XDo
-T3kDO5nrJky6YRlpN39zOYXoJ6w6YIAIgVC/UTYSNqC1Xe8T79h3Mk+JADd2g1B1ewjWTURlcpGz
-eWE3zQshdwMBoRhqAP7OUiEjg6edQJ5CRvCeAEJWWQphSQ+zP7tvKhVCAQcAMm8CBIAARhGMpwhh
-DW95FNKy96EuATWng6QkD/YAH0swlvS6Yg9nqyEbDck9pZdJbbtMd9k76YtNcj929rlJ2gV3lWNV
-JWdbsWSsLwl5A2Z77yORj4d0D0MNPXdZrCxT0UItCbUAa2Q1DZvmYYUBS4CdDgBD9+Ga6219BWwH
-X5cUdSNdcvNncwEzGhlD9iNQFTEpkeGaQSP27FN7iZCObGM6CwOBHBlfA/cZQwghV/+nG+ODHWhl
-ddV0VjIEApl3cgKJsAO/KIokYDLsWXYVjCIrVGD8g2IDmEfVY0FkZFNFc0AWD/GkiI5qbEbdAVFz
-SxBuTRYJQQ8VDogCkA+sIs6IeDf0SH2I+BYNbB5EgEZpcN327AxWaXY+ZV1mE4gBVqq7FqpoXaRP
-GVJmwdq53UVUaIVhZAVq9t++dRtNZnRpQnk0VG9XaWRlQ2gWsBlAsUrNNLibC/ZTZQpiuml0pVj3
-YlUE4MVBtTwHxQum6HlDADpBshJngvhmJR9TOAxhy1rVVEUwEXl7BKB8AWxzwmxlblhACLpVbm0t
-fYpoL2ERTGErqcLd8P8sb3NEG242sPea1CEJ1LOKGBYL1c/RLcxwTQ5lM1MrRdwFiHVwSchpAJsN
-pFOE3gZFV8TOaZEELZu1ZTOFQmtuJOAge7HrEafZCD3tAFAcgBqTmbEZsSPaeEERCBJZI2JgELgO
-hrlCxEWGDC7AYrP3WRwMeh0hYsJcmFxPTsNptlkehvokLD0aLzQWAXlTaKFmbo8Jm0UVUMMyBwGL
-MdhZMONvlqDEmFExCkfxDm9UyENvbD8KcDyhEdkjQms+MItUYSHaMMMchZNiSUKjAQ8022+0Uz+s
-QnJ1c2h2EeClgiPiONhm3LsVynNzrQdmY/0P3JHcF4tuY3B5EHpfY5jwjdbdvmxmTV+ACXB0X2ga
-WuuOfHIzEV8yD5pf7M0dIkwPCV9mbZktBeteCz1tDQxqW7DSrYArZmR0Nw5lgmsUTtYTHhHcc4Xn
-trN0EBwgvhBtu1NEGjljbW5uR/tKzgiaMYdYoCQmW4u5LpQ4zmNgB+bOdV85C3bWM4Nz5m1wXFUY
-MHWzEsVxczVcH2kovVibCYsrE8fm3qFkK2QSB7dMMw2bDWEIB3kPzGKzNyhMB0GH3e0qPl10Zl12
-c24LZsNb9hwV1xHLOevdSuVtYn0GYXipFQeKs9wtW2Zg1lykY1pmdCTGywrJztxsBSlZc3W4PXZL
-tmIXZmwDDXBjaG7JTa5DiWw2q43Y1wL5JnMZnZYFdJ4cYo4CSlj5DVUPBDZbwtw4JsRhzraP8Rph
-P65EbGdJJm3bCnQ8wr9UTjBsN6zxgoDSIlIjQDFpFhOwCsMX+9dEQ00GTQmMs1gkzxIKUvqFYD1Y
-NkJveFgVrV02a+xYUUUMlOxZSb5pk0e3eXN6HEBdV4hjNUI2HZg1zSmSZmcIGJipwkNoo6QIxKKE
-EfCtFGuWMCnzCDNI9mGyVXBkHFqzSQ4DY3/SCwagJXdgZWVrCyBc1mg0RBF31gJtJ9BBqUUDTCHA
-y5D4pZbKPVQPAQuzQEBTVWAlgL0YdPIAhmdwKgu2ZLHoA5AHF/DsbAJNhwwQB0W87A0GAPR0An2K
-eBC1WBJ/FbZbAadAAh5ssJ3jLnRMByBZkGCYRsXuhRsVLnKisiEcNgL7IAMCFfGz5kAuJgDIPADa
-puyNoTAHJ8BPc5LBBlvTAOvQT8C0z62whA3Ud0HnAwAAAAAAABIA/wAAAAAAAAAAYL4AwEAAjb4A
-UP//V4PN/+sQkJCQkJCQigZGiAdHAdt1B4seg+78Edty7bgBAAAAAdt1B4seg+78EdsRwAHbc+91
-CYseg+78Edtz5DHJg+gDcg3B4AiKBkaD8P90dInFAdt1B4seg+78EdsRyQHbdQeLHoPu/BHbEcl1
-IEEB23UHix6D7vwR2xHJAdtz73UJix6D7vwR23Pkg8ECgf0A8///g9EBjRQvg/38dg+KAkKIB0dJ
-dffpY////5CLAoPCBIkHg8cEg+kEd/EBz+lM////Xon3udEAAACKB0cs6DwBd/eAPwF18osHil8E
-ZsHoCMHAEIbEKfiA6+gB8IkHg8cFidji2Y2+AOAAAIsHCcB0PItfBI2EMDABAQAB81CDxwj/ltAB
-AQCVigdHCMB03In5V0jyrlX/ltQBAQAJwHQHiQODwwTr4f+W2AEBAGHpMl///wAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAIAAAAgAACABQAAAGAAAIAAAAAAAAAA
-AAAAAAAAAAEAbgAAADgAAIAAAAAAAAAAAAAAAAAAAAEAAAAAAFAAAAAw0QAACAoAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAEAGsAAACQAACAbAAAALgAAIBtAAAA4AAAgG4AAAAIAQCAAAAAAAAAAAAA
-AAAAAAABAAkEAACoAAAAONsAAKABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAJBAAA0AAAANjc
-AAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEACQQAAPgAAADg3gAAWgIAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAABAAkEAAAgAQAAQOEAABQBAAAAAAAAAAAAAAAAAAAAAAAAAAAAABASAQDQEQEA
-AAAAAAAAAAAAAAAAHRIBAOARAQAAAAAAAAAAAAAAAAAqEgEA6BEBAAAAAAAAAAAAAAAAADcSAQDw
-EQEAAAAAAAAAAAAAAAAAQRIBAPgRAQAAAAAAAAAAAAAAAABMEgEAABIBAAAAAAAAAAAAAAAAAFYS
-AQAIEgEAAAAAAAAAAAAAAAAAAAAAAAAAAABgEgEAbhIBAH4SAQAAAAAAjBIBAAAAAACaEgEAAAAA
-AKoSAQAAAAAAtBIBAAAAAAC6EgEAAAAAAMgSAQAAAAAAS0VSTkVMMzIuRExMAEFEVkFQSTMyLmRs
-bABDT01DVEwzMi5kbGwAR0RJMzIuZGxsAE1TVkNSVC5kbGwAb2xlMzIuZGxsAFVTRVIzMi5kbGwA
-AExvYWRMaWJyYXJ5QQAAR2V0UHJvY0FkZHJlc3MAAEV4aXRQcm9jZXNzAAAAUmVnQ2xvc2VLZXkA
-AABQcm9wZXJ0eVNoZWV0QQAAVGV4dE91dEEAAGZyZWUAAENvSW5pdGlhbGl6ZQAAR2V0REMAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAA==
-"""
-
-# --- EOF ---
diff --git a/command/wininst.exe b/command/wininst.exe
new file mode 100755
index 0000000000000000000000000000000000000000..6290a9361e36d244122f6af3feb506efe6d255c8
GIT binary patch
literal 20992
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

literal 0
HcmV?d00001


From 7e77495f1012854570db4870dcd839ce9ece7854 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 26 Nov 2002 17:42:48 +0000
Subject: [PATCH 0901/8469] Part of the fix for bug #410541: add
 ensure_relative() function

---
 dir_util.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index ca9fa9dc7f..bd1ea0f243 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import os
+import os, sys
 from types import *
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
@@ -212,3 +212,17 @@ def remove_tree (directory, verbose=0, dry_run=0):
         except (IOError, OSError), exc:
             log.warn(grok_environment_error(
                     exc, "error removing %s: " % directory))
+
+
+def ensure_relative (path):
+    """Take the full path 'path', and make it a relative path so
+    it can be the second argument to os.path.join().
+    """
+    drive, path = os.path.splitdrive(path)
+    if sys.platform == 'mac':
+        return os.sep + path
+    else:
+        if path[0:1] == os.sep:
+            path = drive + path[1:]
+        return path
+

From 56507a08e5a566801e5506f80325a67198e86493 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 26 Nov 2002 17:45:19 +0000
Subject: [PATCH 0902/8469] Fix for bug #410541: bdist builds bogus .zips This
 adds a --relative option to the bdist_dumb command that defaults to false; if
 true, the .tar.gz or .zip will be assembled using relative paths.

---
 command/bdist_dumb.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index d1cce55b20..8ee3a5c5f7 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -11,7 +11,7 @@
 import os
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
+from distutils.dir_util import create_tree, remove_tree, ensure_relative
 from distutils.errors import *
 from distutils import log
 
@@ -33,9 +33,12 @@ class bdist_dumb (Command):
                      "directory to put final built distributions in"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
+                    ('relative', None,
+                     "build the archive using relative paths"
+                     "(default: false)"),
                    ]
 
-    boolean_options = ['keep-temp', 'skip-build']
+    boolean_options = ['keep-temp', 'skip-build', 'relative']
 
     default_format = { 'posix': 'gztar',
                        'nt': 'zip',
@@ -49,7 +52,8 @@ def initialize_options (self):
         self.keep_temp = 0
         self.dist_dir = None
         self.skip_build = 0
-
+        self.relative = 0
+        
     # initialize_options()
 
 
@@ -97,9 +101,24 @@ def run (self):
         if os.name == "os2":
             archive_basename = archive_basename.replace(":", "-")
 
-        self.make_archive(os.path.join(self.dist_dir, archive_basename),
-                          self.format,
-                          root_dir=self.bdist_dir)
+        pseudoinstall_root = os.path.join(self.dist_dir, archive_basename)
+        if not self.relative:
+            archive_root = self.bdist_dir
+        else:
+            if (self.distribution.has_ext_modules() and
+                (install.install_base != install.install_platbase)):
+                raise DistutilsPlatformError, \
+                      ("can't make a dumb built distribution where "
+                       "base and platbase are different (%s, %s)"
+                       % (repr(install.install_base),
+                          repr(install.install_platbase)))
+            else:
+                archive_root = os.path.join(self.bdist_dir,
+                                   ensure_relative(install.install_base))
+
+        # Make the archive
+        self.make_archive(pseudoinstall_root,
+                          self.format, root_dir=archive_root)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)

From 6f8ae17986bf88dde5c0f158e4a49b1f9465736b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 26 Nov 2002 21:28:23 +0000
Subject: [PATCH 0903/8469] Use "is" to test type objects, not "==".

---
 command/install_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_data.py b/command/install_data.py
index 5c1f18a9f2..2fa0da29fe 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -48,7 +48,7 @@ def finalize_options (self):
     def run (self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
-            if type(f) == StringType:
+            if type(f) is StringType:
                 # it's a simple file, so copy it
                 f = convert_path(f)
                 if self.warn_dir:

From 6efa84626efe12980cd1ec6c649b9c41bff2d6a4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 27 Nov 2002 13:45:26 +0000
Subject: [PATCH 0904/8469] [Part of patch #641685] Add .dylib as an extension
 for shared libraries

---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index e4209449e4..94b56e6ce4 100644
--- a/extension.py
+++ b/extension.py
@@ -214,7 +214,7 @@ def read_setup_file (filename):
                 ext.extra_link_args.append(word)
                 if not value:
                     append_next_word = ext.extra_link_args
-            elif suffix in (".a", ".so", ".sl", ".o"):
+            elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
                 # NB. a really faithful emulation of makesetup would
                 # append a .o file to extra_objects only if it
                 # had a slash in it; otherwise, it would s/.o/.c/

From 54d6451d9991f43b2f593fee76fe238632027264 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 29 Nov 2002 19:45:58 +0000
Subject: [PATCH 0905/8469] Fix mode on scripts to have the read bit set (noted
 by Nicholas Riley)

---
 command/install_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install_scripts.py b/command/install_scripts.py
index 6572e650d4..abe10457b6 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -53,7 +53,7 @@ def run (self):
                 if self.dry_run:
                     log.info("changing mode of %s", file)
                 else:
-                    mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
+                    mode = ((os.stat(file)[ST_MODE]) | 0555) & 07777
                     log.info("changing mode of %s to %o", file, mode)
                     os.chmod(file, mode)
 

From f786b434f3184c64840218756664aae4152f5b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Tue, 3 Dec 2002 08:45:11 +0000
Subject: [PATCH 0906/8469] Adding Python <= 2.2 support back in.

---
 util.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/util.py b/util.py
index 9de6077fc6..17fc320aa6 100644
--- a/util.py
+++ b/util.py
@@ -359,11 +359,18 @@ def byte_compile (py_files,
     # "Indirect" byte-compilation: write a temporary script and then
     # run it with the appropriate flags.
     if not direct:
-        from tempfile import mkstemp
-        (script_fd, script_name) = mkstemp(".py")
+        try:
+            from tempfile import mkstemp
+            (script_fd, script_name) = mkstemp(".py")
+        except ImportError:
+            from tempfile import mktemp
+            (script_fd, script_name) = None, mktemp(".py")
         log.info("writing byte-compilation script '%s'", script_name)
         if not dry_run:
-            script = os.fdopen(script_fd, "w")
+            if script_fd is not None:
+                script = os.fdopen(script_fd, "w")
+            else:
+                script = open(script_name, "w")
 
             script.write("""\
 from distutils.util import byte_compile

From fb9fc102e11fdf1851470aa6b5dd11b0e2737b6f Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sun, 29 Dec 2002 17:00:57 +0000
Subject: [PATCH 0907/8469] Bug #599248: strip directories when building
 Python.  Out-of-tree builds should work again.

---
 ccompiler.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index edb9f7542f..bfcf1279f1 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,6 +15,7 @@
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
+from distutils.sysconfig import python_build
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -366,7 +367,9 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             extra = []
 
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, 0, outdir)
+        objects = self.object_filenames(sources,
+                                        strip_dir=python_build,
+                                        output_dir=outdir)
         assert len(objects) == len(sources)
 
         # XXX should redo this code to eliminate skip_source entirely.
@@ -472,7 +475,7 @@ def _prep_compile(self, sources, output_dir, depends=None):
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=0,
+        objects = self.object_filenames(sources, strip_dir=python_build,
                                         output_dir=output_dir)
         assert len(objects) == len(sources)
 

From 0f17b9ba75fc0d3d166a058387ca8a7cd2d97a63 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 3 Jan 2003 15:24:36 +0000
Subject: [PATCH 0908/8469] [Patch #658094] PEP 301 implementation   Add
 'classifiers' keyword to DistributionMetadata

---
 dist.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index faeb7b10b3..f15c945c74 100644
--- a/dist.py
+++ b/dist.py
@@ -93,6 +93,8 @@ class Distribution:
          "print the long package description"),
         ('platforms', None,
          "print the list of platforms"),
+        ('classifiers', None,
+         "print the list of classifiers"),
         ('keywords', None,
          "print the list of keywords"),
         ]
@@ -634,6 +636,8 @@ def handle_display_options (self, option_order):
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
                     print string.join(value, ',')
+                elif opt == 'classifiers':
+                    print string.join(value, '\n')
                 else:
                     print value
                 any_display_options = 1
@@ -962,7 +966,7 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "licence")
+                         "contact_email", "licence", "classifiers")
 
     def __init__ (self):
         self.name = None
@@ -977,6 +981,7 @@ def __init__ (self):
         self.long_description = None
         self.keywords = None
         self.platforms = None
+        self.classifiers = None
 
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
@@ -1003,6 +1008,9 @@ def write_pkg_info (self, base_dir):
         for platform in self.get_platforms():
             pkg_info.write('Platform: %s\n' % platform )
 
+        for classifier in self.get_classifiers():
+            pkg_info.write('Classifier: %s\n' % classifier )
+
         pkg_info.close()
 
     # write_pkg_info ()
@@ -1059,6 +1067,9 @@ def get_keywords(self):
     def get_platforms(self):
         return self.platforms or ["UNKNOWN"]
 
+    def get_classifiers(self):
+        return self.classifiers or []
+
 # class DistributionMetadata
 
 

From 68218cefc84e5b95d3cbf4cadccb1742b83623d5 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 3 Jan 2003 15:29:28 +0000
Subject: [PATCH 0909/8469] [Patch #658094 ] PEP 301 implementation    Add the
 'register' distutils command

---
 command/register.py | 293 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 293 insertions(+)
 create mode 100644 command/register.py

diff --git a/command/register.py b/command/register.py
new file mode 100644
index 0000000000..6920d1d1c9
--- /dev/null
+++ b/command/register.py
@@ -0,0 +1,293 @@
+"""distutils.command.register
+
+Implements the Distutils 'register' command (register with the repository).
+"""
+
+# created 2002/10/21, Richard Jones
+
+__revision__ = "$Id$"
+
+import sys, os, string, urllib2, getpass, urlparse
+import StringIO, ConfigParser
+
+from distutils.core import Command
+from distutils.errors import *
+
+class register(Command):
+
+    description = "register the distribution with the repository"
+
+    # XXX must update this to python.org before 2.3final!
+    DEFAULT_REPOSITORY = 'http://www.amk.ca/cgi-bin/pypi.cgi'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]"%DEFAULT_REPOSITORY),
+        ('verify', None,
+         'verify the package metadata for correctness'),
+        ('list-classifiers', None,
+         'list the valid Trove classifiers'),
+        ('verbose', None,
+         'display full response from server'),
+        ]
+    boolean_options = ['verify', 'verbose', 'list-classifiers']
+
+    def initialize_options(self):
+        self.repository = None
+        self.verify = 0
+        self.verbose = 0
+        self.list_classifiers = 0
+
+    def finalize_options(self):
+        if self.repository is None:
+            self.repository = self.DEFAULT_REPOSITORY
+
+    def run(self):
+        self.check_metadata()
+        if self.verify:
+            self.verify_metadata()
+        elif self.list_classifiers:
+            self.classifiers()
+        else:
+            self.send_metadata()
+
+    def check_metadata(self):
+        """Ensure that all required elements of meta-data (name, version,
+           URL, (author and author_email) or (maintainer and
+           maintainer_email)) are supplied by the Distribution object; warn if
+           any are missing.
+        """
+        metadata = self.distribution.metadata
+
+        missing = []
+        for attr in ('name', 'version', 'url'):
+            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
+                missing.append(attr)
+
+        if missing:
+            self.warn("missing required meta-data: " +
+                      string.join(missing, ", "))
+
+        if metadata.author:
+            if not metadata.author_email:
+                self.warn("missing meta-data: if 'author' supplied, " +
+                          "'author_email' must be supplied too")
+        elif metadata.maintainer:
+            if not metadata.maintainer_email:
+                self.warn("missing meta-data: if 'maintainer' supplied, " +
+                          "'maintainer_email' must be supplied too")
+        else:
+            self.warn("missing meta-data: either (author and author_email) " +
+                      "or (maintainer and maintainer_email) " +
+                      "must be supplied")
+
+    def classifiers(self):
+        ''' Fetch the list of classifiers from the server.
+        '''
+        response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
+        print response.read()
+
+    def verify_metadata(self):
+        ''' Send the metadata to the package index server to be checked.
+        '''
+        # send the info to the server and report the result
+        (code, result) = self.post_to_server(self.build_post_data('verify'))
+        print 'Server response (%s): %s'%(code, result)
+
+    def send_metadata(self):
+        ''' Send the metadata to the package index server.
+
+            Well, do the following:
+            1. figure who the user is, and then
+            2. send the data as a Basic auth'ed POST.
+
+            First we try to read the username/password from $HOME/.pypirc,
+            which is a ConfigParser-formatted file with a section
+            [server-login] containing username and password entries (both
+            in clear text). Eg:
+
+                [server-login]
+                username: fred
+                password: sekrit
+
+            Otherwise, to figure who the user is, we offer the user three
+            choices:
+
+             1. use existing login,
+             2. register as a new user, or
+             3. set the password to a random string and email the user.
+
+        '''
+        choice = 'x'
+        username = password = ''
+
+        # see if we can short-cut and get the username/password from the
+        # config
+        config = None
+        if os.environ.has_key('HOME'):
+            rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if os.path.exists(rc):
+                print 'Using PyPI login from %s'%rc
+                config = ConfigParser.ConfigParser()
+                config.read(rc)
+                username = config.get('server-login', 'username')
+                password = config.get('server-login', 'password')
+                choice = '1'
+
+        # get the user's login info
+        choices = '1 2 3 4'.split()
+        while choice not in choices:
+            print '''We need to know who you are, so please choose either:
+ 1. use your existing login,
+ 2. register as a new user,
+ 3. have the server generate a new password for you (and email it to you), or
+ 4. quit
+Your selection [default 1]: ''',
+            choice = raw_input()
+            if not choice:
+                choice = '1'
+            elif choice not in choices:
+                print 'Please choose one of the four options!'
+
+        if choice == '1':
+            # get the username and password
+            while not username:
+                username = raw_input('Username: ')
+            while not password:
+                password = getpass.getpass('Password: ')
+
+            # set up the authentication
+            auth = urllib2.HTTPPasswordMgr()
+            host = urlparse.urlparse(self.repository)[1]
+            auth.add_password('pypi', host, username, password)
+
+            # send the info to the server and report the result
+            code, result = self.post_to_server(self.build_post_data('submit'),
+                auth)
+            print 'Server response (%s): %s'%(code, result)
+
+            # possibly save the login
+            if os.environ.has_key('HOME') and config is None and code == 200:
+                rc = os.path.join(os.environ['HOME'], '.pypirc')
+                print 'I can store your PyPI login so future submissions will be faster.'
+                print '(the login will be stored in %s)'%rc
+                choice = 'X'
+                while choice.lower() not in 'yn':
+                    choice = raw_input('Save your login (y/N)?')
+                    if not choice:
+                        choice = 'n'
+                if choice.lower() == 'y':
+                    f = open(rc, 'w')
+                    f.write('[server-login]\nusername:%s\npassword:%s\n'%(
+                        username, password))
+                    f.close()
+                    try:
+                        os.chmod(rc, 0600)
+                    except:
+                        pass
+        elif choice == '2':
+            data = {':action': 'user'}
+            data['name'] = data['password'] = data['email'] = ''
+            data['confirm'] = None
+            while not data['name']:
+                data['name'] = raw_input('Username: ')
+            while data['password'] != data['confirm']:
+                while not data['password']:
+                    data['password'] = getpass.getpass('Password: ')
+                while not data['confirm']:
+                    data['confirm'] = getpass.getpass(' Confirm: ')
+                if data['password'] != data['confirm']:
+                    data['password'] = ''
+                    data['confirm'] = None
+                    print "Password and confirm don't match!"
+            while not data['email']:
+                data['email'] = raw_input('   EMail: ')
+            code, result = self.post_to_server(data)
+            if code != 200:
+                print 'Server response (%s): %s'%(code, result)
+            else:
+                print 'You will receive an email shortly.'
+                print 'Follow the instructions in it to complete registration.'
+        elif choice == '3':
+            data = {':action': 'password_reset'}
+            data['email'] = ''
+            while not data['email']:
+                data['email'] = raw_input('Your email address: ')
+            code, result = self.post_to_server(data)
+            print 'Server response (%s): %s'%(code, result)
+
+    def build_post_data(self, action):
+        # figure the data to send - the metadata plus some additional
+        # information used by the package server
+        meta = self.distribution.metadata
+        data = {
+            ':action': action,
+            'metadata_version' : '1.0',
+            'name': meta.get_name(),
+            'version': meta.get_version(),
+            'summary': meta.get_description(),
+            'home_page': meta.get_url(),
+            'author': meta.get_contact(),
+            'author_email': meta.get_contact_email(),
+            'license': meta.get_licence(),
+            'description': meta.get_long_description(),
+            'keywords': meta.get_keywords(),
+            'platform': meta.get_platforms(),
+        }
+        if hasattr(meta, 'classifiers'):
+            data['classifiers'] = meta.get_classifiers()
+        return data
+
+    def post_to_server(self, data, auth=None):
+        ''' Post a query to the server, and return a string response.
+        '''
+
+        # Build up the MIME payload for the urllib2 POST data
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = '\n--' + boundary
+        end_boundary = sep_boundary + '--'
+        body = StringIO.StringIO()
+        for key, value in data.items():
+            # handle multiple entries for the same name
+            if type(value) != type([]):
+                value = [value]
+            for value in value:
+                value = str(value)
+                body.write(sep_boundary)
+                body.write('\nContent-Disposition: form-data; name="%s"'%key)
+                body.write("\n\n")
+                body.write(value)
+                if value and value[-1] == '\r':
+                    body.write('\n')  # write an extra newline (lurve Macs)
+        body.write(end_boundary)
+        body.write("\n")
+        body = body.getvalue()
+
+        # build the Request
+        headers = {
+            'Content-type': 'multipart/form-data; boundary=%s'%boundary,
+            'Content-length': str(len(body))
+        }
+        req = urllib2.Request(self.repository, body, headers)
+
+        # handle HTTP and include the Basic Auth handler
+        opener = urllib2.build_opener(
+            urllib2.HTTPBasicAuthHandler(password_mgr=auth)
+        )
+        data = ''
+        try:
+            result = opener.open(req)
+        except urllib2.HTTPError, e:
+            if self.verbose:
+                data = e.fp.read()
+            result = e.code, e.msg
+        except urllib2.URLError, e:
+            result = 500, str(e)
+        else:
+            if self.verbose:
+                data = result.read()
+            result = 200, 'OK'
+        if self.verbose:
+            print '-'*75, data, '-'*75
+        return result
+

From bfd055388d345fe1f58cd04f7272f6f7d3963f15 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 6 Jan 2003 13:28:12 +0000
Subject: [PATCH 0910/8469] Translate spaces in the machine name to underscores
     (Power Macintosh -> Power_Macintosh)

---
 util.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 17fc320aa6..dc3183b691 100644
--- a/util.py
+++ b/util.py
@@ -40,10 +40,11 @@ def get_platform ():
 
     (osname, host, release, version, machine) = os.uname()
 
-    # Convert the OS name to lowercase and remove '/' characters
-    # (to accommodate BSD/OS)
+    # Convert the OS name to lowercase, remove '/' characters
+    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
     osname = string.lower(osname)
     osname = string.replace(osname, '/', '')
+    machine = string.replace(machine, ' ', '_')
 
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --

From fc7885b993648b7587683e0e14adecb21011556b Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 24 Jan 2003 14:56:52 +0000
Subject: [PATCH 0911/8469] Change the mode of scripts in the build/scripts*
 directory to executable.

---
 command/build_scripts.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index b7c11d472b..c7bd4a9d9b 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
@@ -54,10 +55,12 @@ def copy_scripts (self):
         line to refer to the current Python interpreter as we copy.
         """
         self.mkpath(self.build_dir)
+        outfiles = []
         for script in self.scripts:
             adjust = 0
             script = convert_path(script)
             outfile = os.path.join(self.build_dir, os.path.basename(script))
+            outfiles.append(outfile)
 
             if not self.force and not newer(script, outfile):
                 log.debug("not copying %s (up-to-date)", script)
@@ -106,6 +109,15 @@ def copy_scripts (self):
                 f.close()
                 self.copy_file(script, outfile)
 
+        if os.name == 'posix':
+            for file in outfiles:
+                if self.dry_run:
+                    log.info("changing mode of %s", file)
+                else:
+                    mode = ((os.stat(file)[ST_MODE]) | 0555) & 07777
+                    log.info("changing mode of %s to %o", file, mode)
+                    os.chmod(file, mode)
+
     # copy_scripts ()
 
 # class build_scripts

From caa7bc3bd88e1b1c50f4f03bda217b0fc6063f2b Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 27 Jan 2003 16:30:36 +0000
Subject: [PATCH 0912/8469] Remove the recently-added get_distutil_options(),
 and just    have two tuples listing the legal keywords for setup() and
 Extension()

---
 core.py      | 21 +++++++++++++--------
 extension.py |  2 ++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core.py b/core.py
index 9ab419ef4c..29fbc5cdf9 100644
--- a/core.py
+++ b/core.py
@@ -42,6 +42,19 @@ def gen_usage (script_name):
 _setup_stop_after = None
 _setup_distribution = None
 
+# Legal keyword arguments for the setup() function
+setup_keywords = ('distclass', 'script_name', 'script_args', 'options',
+                  'name', 'version', 'author', 'author_email',
+                  'maintainer', 'maintainer_email', 'url', 'license',
+                  'description', 'long_description', 'keywords',
+                  'platforms', 'classifiers')
+
+# Legal keyword arguments for the Extension constructor
+extension_keywords = ('name', 'sources', 'include_dirs',
+                      'define_macros', 'undef_macros',
+                      'library_dirs', 'libraries', 'runtime_library_dirs',
+                      'extra_objects', 'extra_compile_args', 'extra_link_args',
+                      'export_symbols', 'depends', 'language')
 
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
@@ -226,11 +239,3 @@ def run_setup (script_name, script_args=None, stop_after="run"):
 
 # run_setup ()
 
-def get_distutil_options ():
-    """Returns a list of strings recording changes to the Distutils.
-
-    setup.py files can then do:
-      if 'optional-thing' in get_distutil_options():
-          ...
-    """
-    return []
diff --git a/extension.py b/extension.py
index 94b56e6ce4..e69f3e93e0 100644
--- a/extension.py
+++ b/extension.py
@@ -82,6 +82,8 @@ class Extension:
         from the source extensions if not provided.
     """
 
+    # When adding arguments to this constructor, be sure to update
+    # setup_keywords in core.py.
     def __init__ (self, name, sources,
                   include_dirs=None,
                   define_macros=None,

From 04937364e507dbe9f02d00d0cd79908dbfc9afb7 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 29 Jan 2003 16:58:31 +0000
Subject: [PATCH 0913/8469] Only log a message and chmod() when the mode isn't
 already what we want it to be.  Log both the old and new mode.

---
 command/build_scripts.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index c7bd4a9d9b..f61ad37d03 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -114,9 +114,12 @@ def copy_scripts (self):
                 if self.dry_run:
                     log.info("changing mode of %s", file)
                 else:
-                    mode = ((os.stat(file)[ST_MODE]) | 0555) & 07777
-                    log.info("changing mode of %s to %o", file, mode)
-                    os.chmod(file, mode)
+                    oldmode = os.stat(file)[ST_MODE] & 07777
+                    newmode = (oldmode | 0555) & 07777
+                    if newmode != oldmode:
+                        log.info("changing mode of %s from %o to %o",
+                                 file, oldmode, newmode)
+                        os.chmod(file, newmode)
 
     # copy_scripts ()
 

From c7d6889f2f4e4f3a0562798e3641d67c09951f35 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 31 Jan 2003 20:40:15 +0000
Subject: [PATCH 0914/8469] Pass the preprocessor options also to the resource
 compiler when compiling .RC files.

From Robin Dunn, fixes SF # 669198.
---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 65a50cc79a..e07a6d5a0c 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -310,7 +310,7 @@ def compile(self, sources,
                 input_opt = src
                 output_opt = "/fo" + obj
                 try:
-                    self.spawn ([self.rc] +
+                    self.spawn ([self.rc] + pp_opts +
                                 [output_opt] + [input_opt])
                 except DistutilsExecError, msg:
                     raise CompileError, msg

From 90ceb5eaaf84551cf39ba48550debf99f9081e7b Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Mon, 3 Feb 2003 11:43:54 +0000
Subject: [PATCH 0915/8469] patch #664131, fix config command on OSX and Linux

---
 command/config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/config.py b/command/config.py
index b6f5ad1dc5..3bd537a6e8 100644
--- a/command/config.py
+++ b/command/config.py
@@ -151,7 +151,8 @@ def _link (self, body,
                                       library_dirs=library_dirs,
                                       target_lang=lang)
 
-        prog = prog + self.compiler.exe_extension
+        if self.compiler.exe_extension is not None:
+            prog = prog + self.compiler.exe_extension
         self.temp_files.append(prog)
 
         return (src, obj, prog)

From 3ea65a4bba9d3ce1086bc983c16c5f0feea8055b Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Mon, 10 Feb 2003 14:02:33 +0000
Subject: [PATCH 0916/8469] Pick up Makefile variable BASECFLAGS too. This is
 needed since OPT was split into OPT and BASECFLAGS (Makefile.pre.in rev.
 1.108), because now there are essential CFLAGS in BASECFLAGS.

---
 sysconfig.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index aa3636f609..67353a8d64 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,8 +146,8 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, ccshared, ldshared, so_ext) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'CCSHARED', 'LDSHARED', 'SO')
+        (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
 
         if os.environ.has_key('CC'):
             cc = os.environ['CC']
@@ -159,6 +159,8 @@ def customize_compiler(compiler):
             cpp = cc + " -E"           # not always
         if os.environ.has_key('LDFLAGS'):
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if basecflags:
+        	opt = basecflags + ' ' + opt
         if os.environ.has_key('CFLAGS'):
             opt = opt + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']

From a65727b5db3ecf4546e808fcc72eb14fbea9cf42 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 18 Feb 2003 01:28:51 +0000
Subject: [PATCH 0917/8469] [Patch #681504] Call customize_compiler in config
 command

---
 command/config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/config.py b/command/config.py
index 3bd537a6e8..f18c79ff43 100644
--- a/command/config.py
+++ b/command/config.py
@@ -17,6 +17,7 @@
 from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
+from distutils.sysconfig import customize_compiler
 from distutils import log
 
 LANG_EXT = {'c': '.c',
@@ -104,6 +105,7 @@ def _check_compiler (self):
         if not isinstance(self.compiler, CCompiler):
             self.compiler = new_compiler(compiler=self.compiler,
                                          dry_run=self.dry_run, force=1)
+            customize_compiler(self.compiler)
             if self.include_dirs:
                 self.compiler.set_include_dirs(self.include_dirs)
             if self.libraries:

From dae4f7a4a339196ac3fa85ede474b603659e3169 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Tue, 18 Feb 2003 21:28:20 +0000
Subject: [PATCH 0918/8469] Use python.org as the repository

---
 command/register.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/register.py b/command/register.py
index 6920d1d1c9..aac700c480 100644
--- a/command/register.py
+++ b/command/register.py
@@ -17,8 +17,7 @@ class register(Command):
 
     description = "register the distribution with the repository"
 
-    # XXX must update this to python.org before 2.3final!
-    DEFAULT_REPOSITORY = 'http://www.amk.ca/cgi-bin/pypi.cgi'
+    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',

From 7fa7f24d329793d1d40b4fbdb0d56cb284e4c907 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 19 Feb 2003 13:49:35 +0000
Subject: [PATCH 0919/8469] [Patch #684398] Rename verbose argument to
 show-response; don't conditionalize the get_classifiers() call

---
 command/register.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/command/register.py b/command/register.py
index aac700c480..328d8d0ae8 100644
--- a/command/register.py
+++ b/command/register.py
@@ -26,15 +26,15 @@ class register(Command):
          'verify the package metadata for correctness'),
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
-        ('verbose', None,
-         'display full response from server'),
+        ('show-response', None,
+         'display full response text from server'),
         ]
-    boolean_options = ['verify', 'verbose', 'list-classifiers']
+    boolean_options = ['verify', 'show-response', 'list-classifiers']
 
     def initialize_options(self):
         self.repository = None
         self.verify = 0
-        self.verbose = 0
+        self.show_response = 0
         self.list_classifiers = 0
 
     def finalize_options(self):
@@ -232,9 +232,8 @@ def build_post_data(self, action):
             'description': meta.get_long_description(),
             'keywords': meta.get_keywords(),
             'platform': meta.get_platforms(),
+            'classifiers': meta.get_classifiers(),
         }
-        if hasattr(meta, 'classifiers'):
-            data['classifiers'] = meta.get_classifiers()
         return data
 
     def post_to_server(self, data, auth=None):
@@ -277,16 +276,16 @@ def post_to_server(self, data, auth=None):
         try:
             result = opener.open(req)
         except urllib2.HTTPError, e:
-            if self.verbose:
+            if self.show_response:
                 data = e.fp.read()
             result = e.code, e.msg
         except urllib2.URLError, e:
             result = 500, str(e)
         else:
-            if self.verbose:
+            if self.show_response:
                 data = result.read()
             result = 200, 'OK'
-        if self.verbose:
+        if self.show_response:
             print '-'*75, data, '-'*75
         return result
 

From fedab9d677951d29d7e11684ab6978e31cea0a68 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 19 Feb 2003 14:16:01 +0000
Subject: [PATCH 0920/8469] [Patch #683939] Add download_url field to metadata

---
 core.py | 2 +-
 dist.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 29fbc5cdf9..a463272c2f 100644
--- a/core.py
+++ b/core.py
@@ -47,7 +47,7 @@ def gen_usage (script_name):
                   'name', 'version', 'author', 'author_email',
                   'maintainer', 'maintainer_email', 'url', 'license',
                   'description', 'long_description', 'keywords',
-                  'platforms', 'classifiers')
+                  'platforms', 'classifiers', 'download_url')
 
 # Legal keyword arguments for the Extension constructor
 extension_keywords = ('name', 'sources', 'include_dirs',
diff --git a/dist.py b/dist.py
index f15c945c74..08e2a4f7d8 100644
--- a/dist.py
+++ b/dist.py
@@ -966,7 +966,8 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "licence", "classifiers")
+                         "contact_email", "licence", "classifiers",
+                         "download_url")
 
     def __init__ (self):
         self.name = None
@@ -982,6 +983,7 @@ def __init__ (self):
         self.keywords = None
         self.platforms = None
         self.classifiers = None
+        self.download_url = None
 
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
@@ -997,6 +999,8 @@ def write_pkg_info (self, base_dir):
         pkg_info.write('Author: %s\n' % self.get_contact() )
         pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
         pkg_info.write('License: %s\n' % self.get_license() )
+        if self.download_url:
+            pkg_info.write('Download-URL: %s\n' % self.download_url)
 
         long_desc = rfc822_escape( self.get_long_description() )
         pkg_info.write('Description: %s\n' % long_desc)
@@ -1070,6 +1074,9 @@ def get_platforms(self):
     def get_classifiers(self):
         return self.classifiers or []
 
+    def get_download_url(self):
+        return self.download_url or "UNKNOWN"
+
 # class DistributionMetadata
 
 

From 3001d212f66a2cb547d0d3306680e7ab09c87f6e Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 19 Feb 2003 14:27:21 +0000
Subject: [PATCH 0921/8469] Include download_url in the data POSTed to the
 catalog server

---
 command/register.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/register.py b/command/register.py
index 328d8d0ae8..29b76cbfd9 100644
--- a/command/register.py
+++ b/command/register.py
@@ -233,6 +233,7 @@ def build_post_data(self, action):
             'keywords': meta.get_keywords(),
             'platform': meta.get_platforms(),
             'classifiers': meta.get_classifiers(),
+            'download_url': meta.get_download_url(),
         }
         return data
 

From 39a95207b183654cd92b4048ed910491ffe1a48a Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 20 Feb 2003 02:09:30 +0000
Subject: [PATCH 0922/8469] set_verbosity(): do something reasonable for
 out-of-range verbosity levels.  (Previously, -vvv would be the same as -q!)

---
 log.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/log.py b/log.py
index 0442033d66..01420da9af 100644
--- a/log.py
+++ b/log.py
@@ -53,9 +53,9 @@ def set_threshold(level):
     _global_log.threshold = level
 
 def set_verbosity(v):
-    if v == 0:
+    if v <= 0:
         set_threshold(WARN)
-    if v == 1:
+    elif v == 1:
         set_threshold(INFO)
-    if v == 2:
+    elif v >= 2:
         set_threshold(DEBUG)

From 72cbcb8b55ce0bd038577685f074418aa61fdea6 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 20 Feb 2003 02:10:08 +0000
Subject: [PATCH 0923/8469] announce(): use the level argument to control the
 log level.

---
 cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd.py b/cmd.py
index 1165f95124..7e7a4cd5ff 100644
--- a/cmd.py
+++ b/cmd.py
@@ -191,7 +191,7 @@ def announce (self, msg, level=1):
         """If the current verbosity level is of greater than or equal to
         'level' print 'msg' to stdout.
         """
-        log.debug(msg)
+        log.log(level, msg)
 
     def debug_print (self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the

From 5daaf7cd967da08a031cb40e3b668a173b4673a1 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 26 Feb 2003 18:52:07 +0000
Subject: [PATCH 0924/8469] [Bug #668662] Patch from Pearu Pearson: if a C
 source file is     specified with an absolute path, the object file is also  
   written to an absolute path.  The patch drops the drive and     leading '/'
 from the source path, so a path like /path/to/foo.c     results in an object
 file like build/temp.i686linux/path/to/foo.o.

---
 ccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index bfcf1279f1..46fb743db0 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -932,6 +932,8 @@ def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
         obj_names = []
         for src_name in source_filenames:
             base, ext = os.path.splitext(src_name)
+            base = os.path.splitdrive(base)[1] # Chop off the drive
+            base = base[os.path.isabs(base):]  # If abs, chop off leading /
             if ext not in self.src_extensions:
                 raise UnknownFileError, \
                       "unknown file type '%s' (from '%s')" % (ext, src_name)

From cbc89d16f32d66f6b51a0a94cd6a0a00824bdbff Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 28 Feb 2003 22:03:04 +0000
Subject: [PATCH 0925/8469] [Patch #695090 from Bernhard Herzog] Allow
 specifying both py_modules and packages

---
 command/build_py.py | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 258d6d4ca0..6c007c6987 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -86,25 +86,11 @@ def run (self):
         # Two options control which modules will be installed: 'packages'
         # and 'py_modules'.  The former lets us work with whole packages, not
         # specifying individual modules at all; the latter is for
-        # specifying modules one-at-a-time.  Currently they are mutually
-        # exclusive: you can define one or the other (or neither), but not
-        # both.  It remains to be seen how limiting this is.
-
-        # Dispose of the two "unusual" cases first: no pure Python modules
-        # at all (no problem, just return silently), and over-specified
-        # 'packages' and 'py_modules' options.
-
-        if not self.py_modules and not self.packages:
-            return
-        if self.py_modules and self.packages:
-            raise DistutilsOptionError, \
-                  "build_py: supplying both 'packages' and 'py_modules' " + \
-                  "options is not allowed"
-
-        # Now we're down to two cases: 'py_modules' only and 'packages' only.
+        # specifying modules one-at-a-time.
+
         if self.py_modules:
             self.build_modules()
-        else:
+        if self.packages:
             self.build_packages()
 
         self.byte_compile(self.get_outputs(include_bytecode=0))
@@ -276,10 +262,10 @@ def find_all_modules (self):
         (package, module, module_file), just like 'find_modules()' and
         'find_package_modules()' do."""
 
+        modules = []
         if self.py_modules:
-            modules = self.find_modules()
-        else:
-            modules = []
+            modules.extend(self.find_modules())
+        if self.packages:
             for package in self.packages:
                 package_dir = self.get_package_dir(package)
                 m = self.find_package_modules(package, package_dir)

From 06f82fdc6015683f349612125cd2e44fea44092b Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 3 Mar 2003 18:26:01 +0000
Subject: [PATCH 0926/8469] Improve description

---
 command/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/register.py b/command/register.py
index 29b76cbfd9..e4a379939b 100644
--- a/command/register.py
+++ b/command/register.py
@@ -15,7 +15,7 @@
 
 class register(Command):
 
-    description = "register the distribution with the repository"
+    description = ("register the distribution with the Python package index")
 
     DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
 

From 9c00844cfbe8e4f33255f6174c54fe45c266fce8 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 3 Mar 2003 18:37:16 +0000
Subject: [PATCH 0927/8469] [Bug #69389] List register command in __all__, so
 setup.py --help-commands will now list it

---
 command/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/__init__.py b/command/__init__.py
index fc6117166b..870005dca7 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -19,6 +19,7 @@
            'install_scripts',
            'install_data',
            'sdist',
+           'register',
            'bdist',
            'bdist_dumb',
            'bdist_rpm',

From 9766b20bc6d839174db2fb53881c140f110583dd Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 3 Mar 2003 20:07:27 +0000
Subject: [PATCH 0928/8469] [Bug #693470] 'licence' as an alias for 'license'
 doesn't work.    This patch makes it work again.

---
 dist.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 08e2a4f7d8..d313e7d116 100644
--- a/dist.py
+++ b/dist.py
@@ -205,6 +205,15 @@ def __init__ (self, attrs=None):
                     for (opt, val) in cmd_options.items():
                         opt_dict[opt] = ("setup script", val)
 
+            if attrs.has_key('licence'):
+                attrs['license'] = attrs['licence']
+                del attrs['licence']
+                msg = "'licence' distribution option is deprecated; use 'license'"
+                if warnings is not None:
+                    warnings.warn(msg)
+                else:
+                    sys.stderr.write(msg + "\n")
+
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
@@ -966,7 +975,7 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "licence", "classifiers",
+                         "contact_email", "license", "classifiers",
                          "download_url")
 
     def __init__ (self):

From ad325698f9280631620c2d7aad6619b67ab8d899 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Wed, 9 Apr 2003 12:35:51 +0000
Subject: [PATCH 0929/8469] Remove the --verify option in favor of the standard
 -n/--dry-run option

---
 command/register.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/register.py b/command/register.py
index e4a379939b..8e347ce6dc 100644
--- a/command/register.py
+++ b/command/register.py
@@ -22,8 +22,6 @@ class register(Command):
     user_options = [
         ('repository=', 'r',
          "url of repository [default: %s]"%DEFAULT_REPOSITORY),
-        ('verify', None,
-         'verify the package metadata for correctness'),
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
         ('show-response', None,
@@ -33,7 +31,6 @@ class register(Command):
 
     def initialize_options(self):
         self.repository = None
-        self.verify = 0
         self.show_response = 0
         self.list_classifiers = 0
 
@@ -43,7 +40,7 @@ def finalize_options(self):
 
     def run(self):
         self.check_metadata()
-        if self.verify:
+        if self.dry_run:
             self.verify_metadata()
         elif self.list_classifiers:
             self.classifiers()

From 1942fa31ea1b33d7fcccfed31d6cd2ebd46c7f60 Mon Sep 17 00:00:00 2001
From: Jason Tishler <jason@tishler.net>
Date: Wed, 9 Apr 2003 16:03:57 +0000
Subject: [PATCH 0930/8469] Patch #709178: remove -static option from
 cygwinccompiler

Currently, the cygwinccompiler.py compiler handling in
distutils is invoking the cygwin and mingw compilers
with the -static option.

Logically, this means that the linker should choose to
link to static libraries instead of shared/dynamically
linked libraries.

Current win32 binutils expect import libraries to have
a .dll.a suffix and static libraries to have .a suffix.
If -static is passed, it will skip the .dll.a
libraries. This is pain if one has a tree with both
static and dynamic libraries using this naming
convention, and wish to use the dynamic libraries.

The -static option being passed in distutils is to get
around a bug in old versions of binutils where it would
get confused when it found the DLLs themselves.

The decision to use static or shared libraries is site
or package specific, and should be left to the setup
script or to command line options.
---
 cygwinccompiler.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 18af388c3c..e86dc81533 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -33,12 +33,6 @@
 # * cygwin gcc 2.95.2/ld 2.10.90/dllwrap 2.10.90 works now
 #   - its dllwrap doesn't work, there is a bug in binutils 2.10.90
 #     see also http://sources.redhat.com/ml/cygwin/2000-06/msg01274.html
-#   - using gcc -mdll instead dllwrap doesn't work without -static because
-#     it tries to link against dlls instead their import libraries. (If
-#     it finds the dll first.)
-#     By specifying -static we force ld to link against the import libraries,
-#     this is windows standard and there are normally not the necessary symbols
-#     in the dlls.
 #   *** only the version of June 2000 shows these problems
 
 # This module should be kept compatible with Python 1.5.2.
@@ -98,7 +92,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
         self.set_executables(compiler='gcc -mcygwin -O -Wall',
                              compiler_so='gcc -mcygwin -mdll -O -Wall',
                              linker_exe='gcc -mcygwin',
-                             linker_so=('%s -mcygwin -mdll -static' %
+                             linker_so=('%s -mcygwin -mdll' %
                                         self.linker_dll))
 
         # cygwin and mingw32 need different sets of libraries
@@ -278,7 +272,7 @@ def __init__ (self,
         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
                              linker_exe='gcc -mno-cygwin',
-                             linker_so='%s -mno-cygwin -mdll -static %s'
+                             linker_so='%s -mno-cygwin -mdll %s'
                                         % (self.linker_dll, entry_point))
         # Maybe we should also append -mthreads, but then the finished
         # dlls need another dll (mingwm10.dll see Mingw32 docs)

From 972516d3ad5fba97791d87ba95d126f3d6bcc5a2 Mon Sep 17 00:00:00 2001
From: Jason Tishler <jason@tishler.net>
Date: Wed, 9 Apr 2003 20:13:59 +0000
Subject: [PATCH 0931/8469] Patch #718551: cygwinccompiler.get_versions() patch

The cygwinccompiler.get_versions() function only handles versions numbers of
the form "x.y.z".  The attached patch enhances get_versions() to handle "x.y"
too (i.e., the ".z" is optional).

This change causes the unnecessary "--entry _DllMain@12" link option to be
suppressed for recent Cygwin and Mingw toolchains. Additionally, it directs
recent Mingw toolchains to use gcc instead of dllwrap during linking.
---
 cygwinccompiler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index e86dc81533..794dcdb59c 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -357,7 +357,7 @@ def get_versions():
         out = os.popen(gcc_exe + ' -dumpversion','r')
         out_string = out.read()
         out.close()
-        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
             gcc_version = StrictVersion(result.group(1))
         else:
@@ -369,7 +369,7 @@ def get_versions():
         out = os.popen(ld_exe + ' -v','r')
         out_string = out.read()
         out.close()
-        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
             ld_version = StrictVersion(result.group(1))
         else:
@@ -381,7 +381,7 @@ def get_versions():
         out = os.popen(dllwrap_exe + ' --version','r')
         out_string = out.read()
         out.close()
-        result = re.search(' (\d+\.\d+\.\d+)',out_string)
+        result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
         if result:
             dllwrap_version = StrictVersion(result.group(1))
         else:

From ac175fdb7176adf51768ab5237c81f7ab421c50d Mon Sep 17 00:00:00 2001
From: Jason Tishler <jason@tishler.net>
Date: Mon, 14 Apr 2003 12:51:26 +0000
Subject: [PATCH 0932/8469] Patch #709178: remove -static option from
 cygwinccompiler

After some more reflection (and no negative feedback), I am reverting the
original patch and applying my version, cygwinccompiler.py-shared.diff,
instead.

My reasons are the following:

1. support for older toolchains is retained
2. support for new toolchains (i.e., ld -shared) is added

The goal of my approach is to avoid breaking older toolchains while adding
better support for newer ones.
---
 cygwinccompiler.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 794dcdb59c..94b8b86b6d 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -33,7 +33,17 @@
 # * cygwin gcc 2.95.2/ld 2.10.90/dllwrap 2.10.90 works now
 #   - its dllwrap doesn't work, there is a bug in binutils 2.10.90
 #     see also http://sources.redhat.com/ml/cygwin/2000-06/msg01274.html
+#   - using gcc -mdll instead dllwrap doesn't work without -static because
+#     it tries to link against dlls instead their import libraries. (If
+#     it finds the dll first.)
+#     By specifying -static we force ld to link against the import libraries,
+#     this is windows standard and there are normally not the necessary symbols
+#     in the dlls.
 #   *** only the version of June 2000 shows these problems
+# * cygwin gcc 3.2/ld 2.13.90 works
+#   (ld supports -shared)
+# * mingw gcc 3.2/ld 2.13 works
+#   (ld supports -shared)
 
 # This module should be kept compatible with Python 1.5.2.
 
@@ -77,7 +87,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
                           self.ld_version,
                           self.dllwrap_version) )
 
-        # ld_version >= "2.10.90" should also be able to use
+        # ld_version >= "2.10.90" and < "2.13" should also be able to use
         # gcc -mdll instead of dllwrap
         # Older dllwraps had own version numbers, newer ones use the
         # same as the rest of binutils ( also ld )
@@ -87,13 +97,20 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
         else:
             self.linker_dll = "dllwrap"
 
+        # ld_version >= "2.13" support -shared so use it instead of
+        # -mdll -static
+        if self.ld_version >= "2.13":
+            shared_option = "-shared"
+        else:
+            shared_option = "-mdll -static"
+
         # Hard-code GCC because that's what this is all about.
         # XXX optimization, warnings etc. should be customizable.
         self.set_executables(compiler='gcc -mcygwin -O -Wall',
                              compiler_so='gcc -mcygwin -mdll -O -Wall',
                              linker_exe='gcc -mcygwin',
-                             linker_so=('%s -mcygwin -mdll' %
-                                        self.linker_dll))
+                             linker_so=('%s -mcygwin %s' %
+                                        (self.linker_dll, shared_option)))
 
         # cygwin and mingw32 need different sets of libraries
         if self.gcc_version == "2.91.57":
@@ -262,6 +279,13 @@ def __init__ (self,
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
 
+        # ld_version >= "2.13" support -shared so use it instead of
+        # -mdll -static
+        if self.ld_version >= "2.13":
+            shared_option = "-shared"
+        else:
+            shared_option = "-mdll -static"
+
         # A real mingw32 doesn't need to specify a different entry point,
         # but cygwin 2.91.57 in no-cygwin-mode needs it.
         if self.gcc_version <= "2.91.57":
@@ -272,8 +296,9 @@ def __init__ (self,
         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
                              linker_exe='gcc -mno-cygwin',
-                             linker_so='%s -mno-cygwin -mdll %s'
-                                        % (self.linker_dll, entry_point))
+                             linker_so='%s -mno-cygwin %s %s'
+                                        % (self.linker_dll, shared_option,
+                                           entry_point))
         # Maybe we should also append -mthreads, but then the finished
         # dlls need another dll (mingwm10.dll see Mingw32 docs)
         # (-mthreads: Support thread-safe exception handling on `Mingw32')

From 8e2d2f9fefd61c49a54298e45d4c10be078a5696 Mon Sep 17 00:00:00 2001
From: Jason Tishler <jason@tishler.net>
Date: Fri, 18 Apr 2003 17:27:47 +0000
Subject: [PATCH 0933/8469] Patch #718049: Setting exe_extension for cygwin

On cygwin, the setup.py script uses unixccompiler.py for compiling and linking
C extensions. The unixccompiler.py script assumes that executables do not get
special extensions, which makes sense for Unix.  However, on Cygwin,
executables get an .exe extension.

This causes a problem during the configuration step (python setup.py config),
in which some temporary executables may be generated. As unixccompiler.py does
not know about the .exe extension, distutils fails to clean up after itself: it
does not remove _configtest.exe but tries to remove _configtest instead.

The attached patch to unixccompiler.py sets the correct exe_extension for
cygwin by checking if sys.platform is 'cygwin'. With this patch, distutils
cleans up after itself correctly.

Michiel de Hoon
University of Tokyo, Human Genome Center.
---
 unixccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index 2a6b1beeea..e444917fb6 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -77,6 +77,8 @@ class UnixCCompiler(CCompiler):
     shared_lib_extension = ".so"
     dylib_lib_extension = ".dylib"
     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+    if sys.platform == "cygwin":
+        exe_extension = ".exe"
 
     def preprocess(self, source,
                    output_file=None, macros=None, include_dirs=None,

From d19626f7466f8166af24c6cd5e3aca722395b835 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Thu, 24 Apr 2003 19:49:23 +0000
Subject: [PATCH 0934/8469] new method: has_function() - returns a boolean
 indicating whether the argument function is available on the current platform

---
 ccompiler.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index 46fb743db0..751ec0694b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -883,6 +883,51 @@ def library_option (self, lib):
         """
         raise NotImplementedError
 
+    def has_function(self, funcname,
+                     includes=None,
+                     include_dirs=None,
+                     libraries=None,
+                     library_dirs=None):
+        """Return a boolean indicating whether funcname is supported on
+        the current platform.  The optional arguments can be used to
+        augment the compilation environment.
+        """
+
+        # this can't be included at module scope because it tries to
+        # import math which might not be available at that point - maybe
+        # the necessary logic should just be inlined?
+        import tempfile
+        if includes is None:
+            includes = []
+        if include_dirs is None:
+            include_dirs = []
+        if libraries is None:
+            libraries = []
+        if library_dirs is None:
+            library_dirs = []
+        fd, fname = tempfile.mkstemp(".c", funcname, text=True)
+        f = os.fdopen(fd, "w")
+        for incl in includes:
+            f.write("""#include "%s"\n""" % incl)
+        f.write("""\
+main (int argc, char **argv) {
+    %s();
+}
+""" % funcname)
+        f.close()
+        try:
+            objects = self.compile([fname], include_dirs=include_dirs)
+        except CompileError:
+            return False
+
+        try:
+            self.link_executable(objects, "a.out",
+                                 libraries=libraries,
+                                 library_dirs=library_dirs)
+        except (LinkError, TypeError):
+            return False
+        return True
+
     def find_library_file (self, dirs, lib, debug=0):
         """Search the specified list of directories for a static or shared
         library file 'lib' and return the full path to that file.  If

From 70a92cdaba12a893f3c1d19f8c714029e6054081 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 9 May 2003 16:06:42 +0000
Subject: [PATCH 0935/8469] Variant of SF patch 614770: MSVC 7 support

distutils now looks for the compiler version in sys.version, falling
back to MSVC 6 if the version isn't listed (Python 2.2 and lower).
Add helper routines for reading the registry.  Refactor many
module functions into methods of the compiler to avoid passing
lots of state as arguments.
---
 msvccompiler.py | 332 +++++++++++++++++++++++++++---------------------
 1 file changed, 189 insertions(+), 143 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index e07a6d5a0c..b4c890d030 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -1,7 +1,8 @@
 """distutils.msvccompiler
 
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
-for the Microsoft Visual Studio."""
+for the Microsoft Visual Studio.
+"""
 
 # Written by Perry Stoll
 # hacked by Robin Becker and Thomas Heller to do a better job of
@@ -12,7 +13,6 @@
 __revision__ = "$Id$"
 
 import sys, os, string
-from types import *
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
@@ -48,126 +48,116 @@
         pass
 
 if _can_read_reg:
-    HKEY_CLASSES_ROOT = hkey_mod.HKEY_CLASSES_ROOT
-    HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
-    HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
-    HKEY_USERS = hkey_mod.HKEY_USERS
+    HKEYS = (hkey_mod.HKEY_USERS,
+             hkey_mod.HKEY_CURRENT_USER,
+             hkey_mod.HKEY_LOCAL_MACHINE,
+             hkey_mod.HKEY_CLASSES_ROOT)
 
+def read_keys(base, key):
+    """Return list of registry keys."""
 
-
-def get_devstudio_versions ():
-    """Get list of devstudio versions from the Windows registry.  Return a
-       list of strings containing version numbers; the list will be
-       empty if we were unable to access the registry (eg. couldn't import
-       a registry-access module) or the appropriate registry keys weren't
-       found."""
-
-    if not _can_read_reg:
-        return []
-
-    K = 'Software\\Microsoft\\Devstudio'
+    try:
+        handle = RegOpenKeyEx(base, key)
+    except RegError:
+        return None
     L = []
-    for base in (HKEY_CLASSES_ROOT,
-                 HKEY_LOCAL_MACHINE,
-                 HKEY_CURRENT_USER,
-                 HKEY_USERS):
+    i = 0
+    while 1:
         try:
-            k = RegOpenKeyEx(base,K)
-            i = 0
-            while 1:
-                try:
-                    p = RegEnumKey(k,i)
-                    if p[0] in '123456789' and p not in L:
-                        L.append(p)
-                except RegError:
-                    break
-                i = i + 1
+            k = RegEnumKey(handle, i)
         except RegError:
-            pass
-    L.sort()
-    L.reverse()
+            break
+        L.append(k)
+        i = i + 1
     return L
 
-# get_devstudio_versions ()
-
-
-def get_msvc_paths (path, version='6.0', platform='x86'):
-    """Get a list of devstudio directories (include, lib or path).  Return
-       a list of strings; will be empty list if unable to access the
-       registry or appropriate registry keys not found."""
-
-    if not _can_read_reg:
-        return []
+def read_values(base, key):
+    """Return dict of registry keys and values.
 
-    L = []
-    if path=='lib':
-        path= 'Library'
-    path = string.upper(path + ' Dirs')
-    K = ('Software\\Microsoft\\Devstudio\\%s\\' +
-         'Build System\\Components\\Platforms\\Win32 (%s)\\Directories') % \
-        (version,platform)
-    for base in (HKEY_CLASSES_ROOT,
-                 HKEY_LOCAL_MACHINE,
-                 HKEY_CURRENT_USER,
-                 HKEY_USERS):
+    All names are converted to lowercase.
+    """
+    try:
+        handle = RegOpenKeyEx(base, key)
+    except RegError:
+        return None
+    d = {}
+    i = 0
+    while 1:
         try:
-            k = RegOpenKeyEx(base,K)
-            i = 0
-            while 1:
-                try:
-                    (p,v,t) = RegEnumValue(k,i)
-                    if string.upper(p) == path:
-                        V = string.split(v,';')
-                        for v in V:
-                            if hasattr(v, "encode"):
-                                try:
-                                    v = v.encode("mbcs")
-                                except UnicodeError:
-                                    pass
-                            if v == '' or v in L: continue
-                            L.append(v)
-                        break
-                    i = i + 1
-                except RegError:
-                    break
+            name, value, type = RegEnumValue(handle, i)
         except RegError:
+            break
+        name = name.lower()
+        d[convert_mbcs(name)] = convert_mbcs(value)
+        i = i + 1
+    return d
+
+def convert_mbcs(s):
+    enc = getattr(s, "encode", None)
+    if enc is not None:
+        try:
+            s = enc("mbcs")
+        except UnicodeError:
             pass
-    return L
-
-# get_msvc_paths()
-
-
-def find_exe (exe, version_number):
-    """Try to find an MSVC executable program 'exe' (from version
-       'version_number' of MSVC) in several places: first, one of the MSVC
-       program search paths from the registry; next, the directories in the
-       PATH environment variable.  If any of those work, return an absolute
-       path that is known to exist.  If none of them work, just return the
-       original program name, 'exe'."""
-
-    for p in get_msvc_paths ('path', version_number):
-        fn = os.path.join (os.path.abspath(p), exe)
-        if os.path.isfile(fn):
-            return fn
-
-    # didn't find it; try existing path
-    for p in string.split (os.environ['Path'],';'):
-        fn = os.path.join(os.path.abspath(p),exe)
-        if os.path.isfile(fn):
-            return fn
-
-    return exe                          # last desperate hope
-
-
-def set_path_env_var (name, version_number):
-    """Set environment variable 'name' to an MSVC path type value obtained
-       from 'get_msvc_paths()'.  This is equivalent to a SET command prior
-       to execution of spawned commands."""
-
-    p = get_msvc_paths (name, version_number)
-    if p:
-        os.environ[name] = string.join (p,';')
-
+    return s
+
+class MacroExpander:
+
+    def __init__(self, version):
+        self.macros = {}
+        self.load_macros(version)
+
+    def set_macro(self, macro, path, key):
+        for base in HKEYS:
+            d = read_values(base, path)
+            if d:
+                self.macros["$(%s)" % macro] = d[key]
+                break
+              
+    def load_macros(self, version):
+        vsbase = r"Software\Microsoft\VisualStudio\%s.0" % version
+        self.set_macro("VCInstallDir", vsbase + r"\Setup\VC", "productdir")
+        self.set_macro("VSInstallDir", vsbase + r"\Setup\VS", "productdir")
+        net = r"Software\Microsoft\.NETFramework"
+        self.set_macro("FrameworkDir", net, "installroot")
+        self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
+
+        p = r"Software\Microsoft\NET Framework Setup\Product"
+        for base in HKEYS:
+            try:
+                h = RegOpenKeyEx(base, p)
+            except RegError:
+                continue
+            key = RegEnumKey(h, 0)
+            d = read_values(base, r"%s\%s" % (p, key))
+            self.macros["$(FrameworkVersion)"] = d["version"]
+
+    def sub(self, s):
+        for k, v in self.macros.items():
+            s = string.replace(s, k, v)
+        return s
+
+def get_build_version():
+    """Return the version of MSVC that was used to build Python.
+
+    For Python 2.3 and up, the version number is included in
+    sys.version.  For earlier versions, assume the compiler is MSVC 6.
+    """
+
+    prefix = "MSC v."
+    i = string.find(sys.version, prefix)
+    if i == -1:
+        return 6
+    i += len(prefix)
+    s, rest = sys.version[i:].split(" ", 1)
+    n = int(s[:-2])
+    if n == 12:
+        return 6
+    elif n == 13:
+        return 7
+    # else we don't know what version of the compiler this is
+    return None
+    
 
 class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -199,39 +189,31 @@ class MSVCCompiler (CCompiler) :
     static_lib_format = shared_lib_format = '%s%s'
     exe_extension = '.exe'
 
-
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
+    def __init__ (self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
-        versions = get_devstudio_versions ()
-
-        if versions:
-            version = versions[0]  # highest version
-
-            self.cc   = find_exe("cl.exe", version)
-            self.linker = find_exe("link.exe", version)
-            self.lib  = find_exe("lib.exe", version)
-            self.rc   = find_exe("rc.exe", version)     # resource compiler
-            self.mc   = find_exe("mc.exe", version)     # message compiler
-            set_path_env_var ('lib', version)
-            set_path_env_var ('include', version)
-            path=get_msvc_paths('path', version)
-            try:
-                for p in string.split(os.environ['path'],';'):
-                    path.append(p)
-            except KeyError:
-                pass
-            os.environ['path'] = string.join(path,';')
+        self.__version = get_build_version()
+        if self.__version == 7:
+            self.__root = r"Software\Microsoft\VisualStudio"
+            self.__macros = MacroExpander(self.__version)
         else:
-            # devstudio not found in the registry
-            self.cc = "cl.exe"
-            self.linker = "link.exe"
-            self.lib = "lib.exe"
-            self.rc = "rc.exe"
-            self.mc = "mc.exe"
+            self.__root = r"Software\Microsoft\Devstudio"
+        self.__paths = self.get_msvc_paths("path")
+
+        self.cc = self.find_exe("cl.exe")
+        self.linker = self.find_exe("link.exe")
+        self.lib = self.find_exe("lib.exe")
+        self.rc = self.find_exe("rc.exe")   # resource compiler
+        self.mc = self.find_exe("mc.exe")   # message compiler
+        self.set_path_env_var('lib')
+        self.set_path_env_var('include')
+
+        # extend the MSVC path with the current path
+        try:
+            for p in string.split(os.environ['path'], ';'):
+                self.__paths.append(p)
+        except KeyError:
+            pass
+        os.environ['path'] = string.join(self.__paths, ';')
 
         self.preprocess_options = None
         self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ,
@@ -500,4 +482,68 @@ def find_library_file (self, dirs, lib, debug=0):
 
     # find_library_file ()
 
-# class MSVCCompiler
+    # Helper methods for using the MSVC registry settings
+
+    def find_exe(self, exe):
+        """Return path to an MSVC executable program.
+
+        Tries to find the program in several places: first, one of the
+        MSVC program search paths from the registry; next, the directories
+        in the PATH environment variable.  If any of those work, return an
+        absolute path that is known to exist.  If none of them work, just
+        return the original program name, 'exe'.
+        """
+
+        for p in self.__paths:
+            fn = os.path.join(os.path.abspath(p), exe)
+            if os.path.isfile(fn):
+                return fn
+
+        # didn't find it; try existing path
+        for p in string.split(os.environ['Path'],';'):
+            fn = os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn):
+                return fn
+
+        return exe
+    
+    def get_msvc_paths(self, path, platform='x86'):
+        """Get a list of devstudio directories (include, lib or path).
+
+        Return a list of strings.  The list will be empty if unable to
+        access the registry or appropriate registry keys not found.
+        """
+
+        if not _can_read_reg:
+            return []
+
+        path = path + " dirs"
+        if self.__version == 7:
+            key = (r"%s\7.0\VC\VC_OBJECTS_PLATFORM_INFO\Win32\Directories"
+                   % (self.__root,))
+        else:
+            key = (r"%s\6.0\Build System\Components\Platforms"
+
+        for base in HKEYS:
+            d = read_values(base, key)
+            if d:
+                if self.__version == 7:
+                    return string.split(self.__macros.sub(d[path]), ";")
+                else:
+                    return string.split(d[path], ";")
+        return []
+
+    def set_path_env_var(self, name):
+        """Set environment variable 'name' to an MSVC path type value.
+
+        This is equivalent to a SET command prior to execution of spawned
+        commands.
+        """
+
+        if name == "lib":
+            p = self.get_msvc_paths("library")
+        else:
+            p = self.get_msvc_paths(name)
+        if p:
+            os.environ[name] = string.join(p, ';')
+

From c4ab88656cb41c9c7182805868af9ec6800f9874 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 9 May 2003 16:55:28 +0000
Subject: [PATCH 0936/8469] Replace line somehow deleted before last checkin.

---
 msvccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index b4c890d030..4d7159f0f9 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -523,6 +523,7 @@ def get_msvc_paths(self, path, platform='x86'):
                    % (self.__root,))
         else:
             key = (r"%s\6.0\Build System\Components\Platforms"
+                   r"\Win32 (%s)\Directories" % (self.__root, platform))
 
         for base in HKEYS:
             d = read_values(base, key)

From afc49f281192ac64ca549636dec5e8765bb1e0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Wed, 14 May 2003 19:48:57 +0000
Subject: [PATCH 0937/8469] Restore Python 1.5.2 compatibility.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 4d7159f0f9..eeac0ee67a 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -148,7 +148,7 @@ def get_build_version():
     i = string.find(sys.version, prefix)
     if i == -1:
         return 6
-    i += len(prefix)
+    i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
     n = int(s[:-2])
     if n == 12:

From bd92613fe048b143af67d29b018d525d8d380b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 31 May 2003 08:09:21 +0000
Subject: [PATCH 0938/8469] Patch #740301: Add +s when linking shared libraries
 on HP-UX, use -L for the library path.

---
 unixccompiler.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index e444917fb6..02db910ae6 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -203,8 +203,10 @@ def runtime_library_dir_option(self, dir):
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
-            return "-Wl,-R" + dir
+      elif sys.platform[:5] == "hp-ux":
+            return "+s -L" + dir
+      elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+          return "-Wl,-R" + dir
         else:
             return "-R" + dir
 

From 2e51b32d4660c3e6a8e90ce8e8fa7bb6bed786dc Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 1 Jun 2003 19:27:40 +0000
Subject: [PATCH 0939/8469] Fixed indentation error. Closes bug #746953.

---
 unixccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 02db910ae6..11ecb9f6ae 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -203,9 +203,9 @@ def runtime_library_dir_option(self, dir):
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
-      elif sys.platform[:5] == "hp-ux":
+        elif sys.platform[:5] == "hp-ux":
             return "+s -L" + dir
-      elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
           return "-Wl,-R" + dir
         else:
             return "-R" + dir

From 3f5044ac5626bd886b51c905d16a1fcb1aaa6464 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 12 Jun 2003 17:23:58 +0000
Subject: [PATCH 0940/8469] Fix for sf # 749210, wininst isn't build correctly
 after building zip.

The problem was that subcommands were not reinitialized.

Bugfix candidate, will backport myself.
---
 command/bdist_wininst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 5acca11a62..3c4c893920 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -100,7 +100,7 @@ def run (self):
         if not self.skip_build:
             self.run_command('build')
 
-        install = self.reinitialize_command('install')
+        install = self.reinitialize_command('install', reinit_subcommands=1)
         install.root = self.bdist_dir
         install.skip_build = self.skip_build
         install.warn_dir = 0

From 59a7a49f88a89af3e6e168da54dcd45ffb374aed Mon Sep 17 00:00:00 2001
From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Fri, 27 Jun 2003 19:33:38 +0000
Subject: [PATCH 0941/8469] Do not add extra "\n" after bang line.

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

diff --git a/command/build_scripts.py b/command/build_scripts.py
index f61ad37d03..8de9cd3f6d 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -15,7 +15,7 @@
 from distutils import log
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile(r'^#!.*python[0-9.]*(\s+.*)?$')
+first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
 
 class build_scripts (Command):
 
@@ -96,7 +96,7 @@ def copy_scripts (self):
                                    (os.path.normpath(sys.executable),
                                     post_interp))
                     else:
-                        outf.write("#!%s%s" %
+                        outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
                             "python" + sysconfig.get_config_var("EXE")),

From a17a0b4ac049c984145ad23ccbbe301b98dc6564 Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 17 Jul 2003 14:41:07 +0000
Subject: [PATCH 0942/8469] Patch from John Anderson to enable VC 7.1 support.

I tested against VC 7.0 and it caused no problems there.
---
 msvccompiler.py | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index eeac0ee67a..5f3d8de872 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -45,6 +45,10 @@
         RegError = win32api.error
 
     except ImportError:
+        log.info("Warning: Can't read registry to find the "
+                 "necessary compiler setting\n"
+                 "Make sure that Python modules _winreg, "
+                 "win32api or win32con are installed.")
         pass
 
 if _can_read_reg:
@@ -115,12 +119,15 @@ def set_macro(self, macro, path, key):
                 break
               
     def load_macros(self, version):
-        vsbase = r"Software\Microsoft\VisualStudio\%s.0" % version
+        vsbase = r"Software\Microsoft\VisualStudio\%0.1f" % version
         self.set_macro("VCInstallDir", vsbase + r"\Setup\VC", "productdir")
         self.set_macro("VSInstallDir", vsbase + r"\Setup\VS", "productdir")
         net = r"Software\Microsoft\.NETFramework"
         self.set_macro("FrameworkDir", net, "installroot")
-        self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
+        if version > 7.0:
+            self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
+        else:
+            self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
 
         p = r"Software\Microsoft\NET Framework Setup\Product"
         for base in HKEYS:
@@ -150,11 +157,13 @@ def get_build_version():
         return 6
     i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
-    n = int(s[:-2])
-    if n == 12:
-        return 6
-    elif n == 13:
-        return 7
+    majorVersion = int(s[:-2]) - 6
+    minorVersion = int(s[2:3]) / 10.0
+    # I don't think paths are affected by minor version in version 6
+    if majorVersion == 6:
+        minorVersion = 0
+    if majorVersion >= 6:
+        return majorVersion + minorVersion
     # else we don't know what version of the compiler this is
     return None
     
@@ -192,13 +201,19 @@ class MSVCCompiler (CCompiler) :
     def __init__ (self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
         self.__version = get_build_version()
-        if self.__version == 7:
+        if self.__version >= 7:
             self.__root = r"Software\Microsoft\VisualStudio"
             self.__macros = MacroExpander(self.__version)
         else:
             self.__root = r"Software\Microsoft\Devstudio"
         self.__paths = self.get_msvc_paths("path")
 
+        if len (self.__paths) == 0:
+            raise DistutilsPlatformError, \
+                  ("Python was built with version %s of Visual Studio, "
+                   "and extensions need to be built with the same "
+                   "version of the compiler, but it isn't installed." % self.__version)
+
         self.cc = self.find_exe("cl.exe")
         self.linker = self.find_exe("link.exe")
         self.lib = self.find_exe("lib.exe")
@@ -518,9 +533,9 @@ def get_msvc_paths(self, path, platform='x86'):
             return []
 
         path = path + " dirs"
-        if self.__version == 7:
-            key = (r"%s\7.0\VC\VC_OBJECTS_PLATFORM_INFO\Win32\Directories"
-                   % (self.__root,))
+        if self.__version >= 7:
+            key = (r"%s\%0.1f\VC\VC_OBJECTS_PLATFORM_INFO\Win32\Directories"
+                   % (self.__root, self.__version))
         else:
             key = (r"%s\6.0\Build System\Components\Platforms"
                    r"\Win32 (%s)\Directories" % (self.__root, platform))
@@ -528,7 +543,7 @@ def get_msvc_paths(self, path, platform='x86'):
         for base in HKEYS:
             d = read_values(base, key)
             if d:
-                if self.__version == 7:
+                if self.__version >= 7:
                     return string.split(self.__macros.sub(d[path]), ";")
                 else:
                     return string.split(d[path], ";")

From 9089c83f40086c19cff06f883f152354c953bd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Mon, 20 Oct 2003 14:01:56 +0000
Subject: [PATCH 0943/8469] Fix a bunch of typos in documentation, docstrings
 and comments. (From SF patch #810751)

---
 cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd.py b/cmd.py
index 7e7a4cd5ff..6e44221eb5 100644
--- a/cmd.py
+++ b/cmd.py
@@ -148,7 +148,7 @@ def finalize_options (self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
         assignments from the command-line or from other commands have been
-        done.  Thus, this is the place to to code option dependencies: if
+        done.  Thus, this is the place to code option dependencies: if
         'foo' depends on 'bar', then it is safe to set 'foo' from 'bar' as
         long as 'foo' still has the same value it was assigned in
         'initialize_options()'.

From f50262ae1518686131d3a0953983ea64b13b1b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 24 Oct 2003 20:09:23 +0000
Subject: [PATCH 0944/8469] Patch #812378: Normalize white space.

---
 sysconfig.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 67353a8d64..46d1acbb04 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -70,9 +70,9 @@ def get_python_inc(plat_specific=0, prefix=None):
         return os.path.join(prefix, "include")
     elif os.name == "mac":
         if plat_specific:
-                return os.path.join(prefix, "Mac", "Include")
+            return os.path.join(prefix, "Mac", "Include")
         else:
-                return os.path.join(prefix, "Include")
+            return os.path.join(prefix, "Include")
     elif os.name == "os2":
         return os.path.join(prefix, "Include")
     else:
@@ -160,7 +160,7 @@ def customize_compiler(compiler):
         if os.environ.has_key('LDFLAGS'):
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
         if basecflags:
-        	opt = basecflags + ' ' + opt
+            opt = basecflags + ' ' + opt
         if os.environ.has_key('CFLAGS'):
             opt = opt + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']

From 2c9c51ede8cea8c78f14fcc723c5c0a3cbf7b5cf Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 28 Nov 2003 19:42:56 +0000
Subject: [PATCH 0945/8469] See SF #848614: distutils' msvccompiler now tries
 to detect that MSVC6 is installed but the registry settings are incomplete
 because the gui has never been run.

Already backported to release23-maint.
---
 msvccompiler.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 5f3d8de872..27fb658b5b 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -547,6 +547,16 @@ def get_msvc_paths(self, path, platform='x86'):
                     return string.split(self.__macros.sub(d[path]), ";")
                 else:
                     return string.split(d[path], ";")
+        # MSVC 6 seems to create the registry entries we need only when
+        # the GUI is run.
+        if self.__version == 6:
+            for base in HKEYS:
+                if read_values(base, r"%s\6.0" % self.__root) is not None:
+                    self.warn("It seems you have Visual Studio 6 installed, "
+                        "but the expected registry settings are not present.\n"
+                        "You must at least run the Visual Studio GUI once "
+                        "so that these entries are created.")
+                break
         return []
 
     def set_path_env_var(self, name):

From 2a97217f7fae82ae141e9dc1a426146dca203b04 Mon Sep 17 00:00:00 2001
From: Andrew MacIntyre <andymac@bullseye.apana.org.au>
Date: Tue, 2 Dec 2003 12:17:59 +0000
Subject: [PATCH 0946/8469] use same compiler switches as core for extensions

---
 emxccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emxccompiler.py b/emxccompiler.py
index 76bdbae506..f52e63232d 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -63,8 +63,8 @@ def __init__ (self,
 
         # Hard-code GCC because that's what this is all about.
         # XXX optimization, warnings etc. should be customizable.
-        self.set_executables(compiler='gcc -Zomf -Zmt -O2 -Wall',
-                             compiler_so='gcc -Zomf -Zmt -O2 -Wall',
+        self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                             compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
                              linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
 

From 21a1ad1c19eeab489dc344c59f0cd027bda50dd7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 5 Dec 2003 20:12:23 +0000
Subject: [PATCH 0947/8469] Compile the files in the same order they are passed
 to the compiler.

Use case: Sometimes 'compiling' source files (with SWIG, for example)
creates additionl files which included by later sources.  The win32all
setup script requires this.

There is no SF item for this, but it was discussed on distutils-sig:
http://mail.python.org/pipermail/distutils-sig/2003-November/003514.html
---
 bcppcompiler.py | 6 +++++-
 ccompiler.py    | 6 +++++-
 msvccompiler.py | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index cfbe04ac01..b0360a248e 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -96,7 +96,11 @@ def compile(self, sources,
         else:
             compile_opts.extend (self.compile_options)
 
-        for obj, (src, ext) in build.items():
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
             # XXX why do the normpath here?
             src = os.path.normpath(src)
             obj = os.path.normpath(obj)
diff --git a/ccompiler.py b/ccompiler.py
index 751ec0694b..ebd93c27eb 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -691,7 +691,11 @@ def compile(self, sources, output_dir=None, macros=None,
                                     depends, extra_postargs)
         cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
 
-        for obj, (src, ext) in build.items():
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
             self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
 
         # Return *all* object filenames, not just the ones we just built.
diff --git a/msvccompiler.py b/msvccompiler.py
index 27fb658b5b..1441ea04c3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -291,7 +291,11 @@ def compile(self, sources,
         else:
             compile_opts.extend(self.compile_options)
 
-        for obj, (src, ext) in build.items():
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
             if debug:
                 # pass the full pathname to MSVC in debug mode,
                 # this allows the debugger to find the source file

From affdbb99128310385c45cd2562afcb2f0009431f Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 18 Jan 2004 20:29:55 +0000
Subject: [PATCH 0948/8469] Whitespace normalization.

---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0c37768179..7fff422268 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -171,7 +171,8 @@ def finalize_options (self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6'))
+            #self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
         # import libraries in its "Config" subdirectory

From cdd1c7641bdef9ac123a2879c88c2f4d28a9a9fe Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 18 Jan 2004 20:39:35 +0000
Subject: [PATCH 0949/8469] Revert another local change that snuck into a
 whitespace normalization patch.

---
 command/build_ext.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7fff422268..0c37768179 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -171,8 +171,7 @@ def finalize_options (self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6'))
-            #self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
         # import libraries in its "Config" subdirectory

From 950e6ac2191aa79725d553476bb9cd3211ae0a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Thu, 12 Feb 2004 17:35:32 +0000
Subject: [PATCH 0950/8469] Replace backticks with repr() or "%r"

From SF patch #852334.
---
 cmd.py          |  4 ++--
 core.py         |  2 +-
 dir_util.py     |  2 +-
 dist.py         |  4 ++--
 fancy_getopt.py |  2 +-
 util.py         | 16 ++++++++--------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cmd.py b/cmd.py
index 6e44221eb5..fef49390da 100644
--- a/cmd.py
+++ b/cmd.py
@@ -253,8 +253,8 @@ def ensure_string_list (self, option):
 
             if not ok:
                 raise DistutilsOptionError, \
-                      "'%s' must be a list of strings (got %s)" % \
-                      (option, `val`)
+                      "'%s' must be a list of strings (got %r)" % \
+                      (option, val)
 
     def _ensure_tested_string (self, option, tester,
                                what, error_fmt, default=None):
diff --git a/core.py b/core.py
index a463272c2f..eb419721e4 100644
--- a/core.py
+++ b/core.py
@@ -202,7 +202,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     used to drive the Distutils.
     """
     if stop_after not in ('init', 'config', 'commandline', 'run'):
-        raise ValueError, "invalid value for 'stop_after': %s" % `stop_after`
+        raise ValueError, "invalid value for 'stop_after': %r" % (stop_after,)
 
     global _setup_stop_after, _setup_distribution
     _setup_stop_after = stop_after
diff --git a/dir_util.py b/dir_util.py
index bd1ea0f243..e479b62415 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -33,7 +33,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     # Detect a common bug -- name is None
     if type(name) is not StringType:
         raise DistutilsInternalError, \
-              "mkpath: 'name' must be a string (got %s)" % `name`
+              "mkpath: 'name' must be a string (got %r)" % (name,)
 
     # XXX what's the better way to handle verbosity? print as we create
     # each directory in the path (the current behaviour), or only announce
diff --git a/dist.py b/dist.py
index d313e7d116..f63ea97331 100644
--- a/dist.py
+++ b/dist.py
@@ -525,9 +525,9 @@ def _parse_command_opts (self, parser, args):
                         func()
                     else:
                         raise DistutilsClassError(
-                            "invalid help function %s for help option '%s': "
+                            "invalid help function %r for help option '%s': "
                             "must be a callable object (function, etc.)"
-                            % (`func`, help_option))
+                            % (func, help_option))
 
             if help_option_found:
                 return
diff --git a/fancy_getopt.py b/fancy_getopt.py
index a4a4e7979e..512bc9b665 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -162,7 +162,7 @@ def _grok_option_table (self):
             else:
                 # the option table is part of the code, so simply
                 # assert that it is correct
-                assert "invalid option tuple: %s" % `option`
+                assert "invalid option tuple: %r" % (option,)
 
             # Type- and value-check the option names
             if type(long) is not StringType or len(long) < 2:
diff --git a/util.py b/util.py
index dc3183b691..8c3c8df979 100644
--- a/util.py
+++ b/util.py
@@ -285,7 +285,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
     print.
     """
     if msg is None:
-        msg = "%s%s" % (func.__name__, `args`)
+        msg = "%s%r" % (func.__name__, args)
         if msg[-2:] == ',)':        # correct for singleton tuple
             msg = msg[0:-2] + ')'
 
@@ -307,7 +307,7 @@ def strtobool (val):
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
         return 0
     else:
-        raise ValueError, "invalid truth value %s" % `val`
+        raise ValueError, "invalid truth value %r" % (val,)
 
 
 def byte_compile (py_files,
@@ -394,11 +394,11 @@ def byte_compile (py_files,
 
             script.write(string.join(map(repr, py_files), ",\n") + "]\n")
             script.write("""
-byte_compile(files, optimize=%s, force=%s,
-             prefix=%s, base_dir=%s,
-             verbose=%s, dry_run=0,
+byte_compile(files, optimize=%r, force=%r,
+             prefix=%r, base_dir=%r,
+             verbose=%r, dry_run=0,
              direct=1)
-""" % (`optimize`, `force`, `prefix`, `base_dir`, `verbose`))
+""" % (optimize, force, prefix, base_dir, verbose))
 
             script.close()
 
@@ -432,8 +432,8 @@ def byte_compile (py_files,
             if prefix:
                 if file[:len(prefix)] != prefix:
                     raise ValueError, \
-                          ("invalid prefix: filename %s doesn't start with %s"
-                           % (`file`, `prefix`))
+                          ("invalid prefix: filename %r doesn't start with %r"
+                           % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
                 dfile = os.path.join(base_dir, dfile)

From bc3373b4d89d718b8760d3c8a4afd18316fec86c Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 17 Feb 2004 22:35:19 +0000
Subject: [PATCH 0951/8469] commentary about how bad ConfigParser is doesn't
 help here, and the suggested approach to dealing with it isn't a good one; we
 need a better general purpose config reader, not a distutils-specific reader

---
 dist.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dist.py b/dist.py
index f63ea97331..586e6bb145 100644
--- a/dist.py
+++ b/dist.py
@@ -346,9 +346,7 @@ def parse_config_files (self, filenames=None):
                         opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
-            # the original filenames that options come from) -- gag,
-            # retch, puke -- another good reason for a distutils-
-            # specific config parser (sigh...)
+            # the original filenames that options come from)
             parser.__init__()
 
         # If there was a "global" section in the config file, use it

From 0d7a3db04fd813544f939ce1d9bbcf135f1a6f35 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 20 Feb 2004 14:43:21 +0000
Subject: [PATCH 0952/8469] Patch #892660 from Mark Hammond, for distutils
 bdist_wininst command.

install.c: support for a 'pre-install-script', run before anything has
been installed. Provides a 'message_box' module function for use by
either the pre-install or post-install scripts.

bdist_wininst.py: support for pre-install script. Typo (build->built),
fixes so that --target-version can still work, even when the
distribution has extension modules - in this case, we insist on
--skip-build, as we still can't actually build other versions.
---
 command/bdist_wininst.py | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3c4c893920..76b1762ede 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -43,6 +43,10 @@ class bdist_wininst (Command):
                     ('install-script=', None,
                      "basename of installation script to be run after"
                      "installation or before deinstallation"),
+                    ('pre-install-script=', None,
+                     "Fully qualified filename of a script to be run before "
+                     "any files are installed.  This script need not be in the "
+                     "distribution"),
                    ]
 
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
@@ -59,6 +63,7 @@ def initialize_options (self):
         self.title = None
         self.skip_build = 0
         self.install_script = None
+        self.pre_install_script = None
 
     # initialize_options()
 
@@ -69,11 +74,12 @@ def finalize_options (self):
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
         if not self.target_version:
             self.target_version = ""
-        if self.distribution.has_ext_modules():
+        if not self.skip_build and self.distribution.has_ext_modules():
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be" + short_version
+                      "target version can only be %s, or the '--skip_build'" \
+                      " option must be specified" % (short_version,)
             self.target_version = short_version
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
@@ -109,6 +115,21 @@ def run (self):
         # we do not want to include pyc or pyo files
         install_lib.compile = 0
         install_lib.optimize = 0
+        
+        # If we are building an installer for a Python version other
+        # than the one we are currently running, then we need to ensure
+        # our build_lib reflects the other Python version rather than ours.
+        # Note that for target_version!=sys.version, we must have skipped the
+        # build step, so there is no issue with enforcing the build of this
+        # version.
+        target_version = self.target_version
+        if not target_version:
+            assert self.skip_build, "Should have already checked this"
+            target_version = sys.version[0:3]
+        plat_specifier = ".%s-%s" % (get_platform(), target_version)
+        build = self.get_finalized_command('build')
+        build.build_lib = os.path.join(build.build_base,
+                                       'lib' + plat_specifier)
 
         # Use a custom scheme for the zip-file, because we have to decide
         # at installation time which scheme to use.
@@ -187,7 +208,7 @@ def get_inidata (self):
         lines.append("title=%s" % repr(title)[1:-1])
         import time
         import distutils
-        build_info = "Build %s with distutils-%s" % \
+        build_info = "Built %s with distutils-%s" % \
                      (time.ctime(time.time()), distutils.__version__)
         lines.append("build_info=%s" % build_info)
         return string.join(lines, "\n")
@@ -223,6 +244,11 @@ def create_exe (self, arcname, fullname, bitmap=None):
         if bitmap:
             file.write(bitmapdata)
 
+        # Append the pre-install script
+        cfgdata = cfgdata + "\0"
+        if self.pre_install_script:
+            script_data = open(self.pre_install_script, "r").read()
+            cfgdata = cfgdata + script_data + "\n\0"
         file.write(cfgdata)
         header = struct.pack("<iii",
                              0x1234567A,       # tag

From 20adf88eec1f10183f260a6eb3fa02416eb94cd7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 20 Feb 2004 14:44:32 +0000
Subject: [PATCH 0953/8469] Recompiled the binary wininst.exe.

Patch #892660 from Mark Hammond, for distutils bdist_wininst command.

install.c: support for a 'pre-install-script', run before anything has
been installed. Provides a 'message_box' module function for use by
either the pre-install or post-install scripts.

bdist_wininst.py: support for pre-install script. Typo (build->built),
fixes so that --target-version can still work, even when the
distribution has extension modules - in this case, we insist on
--skip-build, as we still can't actually build other versions.
---
 command/wininst.exe | Bin 20992 -> 21504 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst.exe b/command/wininst.exe
index 6290a9361e36d244122f6af3feb506efe6d255c8..bea2bed4c14ba91dacafda27a890db281143dc4b 100755
GIT binary patch
delta 18883
zcmXtfXH*m4*L6Y)fg~hAfY3un5_+%FdkHP{UJM;m00j+QAfPCq(iB9op+5wrNC%}T
zC<s!dD=J7;5l~Pb_^<b!weH#H+`VsE^I`5eGi#D>1C#Fo^YwsRm-S8D=l2f<OG_?W
z{{Oa+S#Ej#D8^>qv@AYCYDUrjkmt&q|6yrKz9sK5e`V0}>i_ss%Zo=SQFhI;<OrR@
zg2=~nT^7Tt5X}GpTObH9fYmSr{J(1ffC9pSPym2<)PX)~wE#c`I}iZqJdO(lfTBQL
zfeug+$q58h9CZWGK!6gkAb=&jU;)SmtS$Hk#6ym?wgmz#5^P5-0DKe?3(Q%z3yeY4
z*gGEA!}-fVAAc<a07ceE)B*q?4FptP0jmqv#QyF0{ckdD|Bx;dj=G)EN$1X3r=i@)
z===gASR7Yz0@=HJ$k>N^o70&DcRybruO3(CTG|@IndHXQ?=QFlRsp^!cnLnG)p_oK
z3)H$Xq-NQwhM}{;o327f&#5vvNa0`-`YC!}z&pJuDf>JsKr6L=_QMywRp~o;7H7HI
zf?$X?i}%NZn-B@R24&kZAx|M)TG-*!o16PIIU+g#x}XhMCCTFwb^e{a8@CWLDG&TQ
z_Y~*($2$^YN(TwJU=7bi+$uk)-;&GcXQQyuYv+=gv=_cVhYL{9C&JtCjoIW@$OP*8
zqDQ5-DwbT!Eo>mD+PCb4-x@2Jg~|X83m~lJz~zD}R#V2#{&=h;n3YpEeSikn0rfik
zF<$v@NZ;(|F(l^}7;2)Mx5(!P2P0X0dOkp&yL+5v^H^%+;|J(Y3HSSG0{2ti!L<C+
z^vC#FHb@Tv2u<>`=_h*me*Zn1DtVaW?IfzoAC<o@Nj{)?m}LCe->37Cn}pTZhAdvZ
zI#FNyo$+r~SM{)6=&~ABL)bKWR}>g~BCQu@k@7E6AnB7(s`}C-`L?dhV53KDv!FWo
zFIMVS&>ms3e<S?PSR*gjweq$7xq0e<Lq2o$@l^ZgiyH)%ukNI5`Wnj?#p`Ow()Pig
zmKH@gW%|+Mb8t(cqK`2AsG3*RMmuP0d(BuujbXPuvj9aGZS;H!lI$>Fk*K9TlG*o6
z0}^i(=y|RcKHj>BGstt@a|*!0`=`2@upmy+7v9r^*_Z`>N1_1i_G&EOjy6C4j8L+>
z_Q==Z;58anXpImo5mbFmcZ()yA-ZLn+omUDD!5IP5!!|?zRQ*5!xg@2`tpu@$%1{1
z@fW-TS6i0LkXg>W<nm;FR>wZCNO0H545JcPiq#{Ek+-?O^hUp-$cxaRvaquVALkX%
z2NYFF31V-gMg+GgOmIL;I1S|C3v_g3kzT5!onhZIEW-3&=sPozvPz&#_zxg8m7tn>
zMNgt$cR2vS&V62XXuD0*sndW12Oh>OZP0i^hxWqqJ1}HFcMZA%D5WK`_{xiDHj1G#
z{#7o$zH2mWK*=voC}L+rHTw2RZA3p-m(A!}KyRGGO!Vv9M3aFb;NfwFeQThXHVYb|
z9Z^u^SFc6fzsz2oPJermKU_(W92-JhiQN%iTczgExH7$QvH5pcWj=)uGfE>X=O^|p
z$nK(Rf6#OdH<pfp*?`#9tAcQOR<`2W-pP}0rq`q36U?6NdoXmux%w!ZuacZwaM^5V
z<wB!-cjIhSwmBH2&hDG!z9;YfkE9*g&Q4QLwYw09{lM=iTnpg*QLuq7@g`k|MI~pQ
z<E0>M-Jw~+#goNWvSZ~8{Fd5yz11!kNi9ht9IX(P8`;*(=u}Gg^=xTOXr*YY&)lTx
ze|h|g?++_WX1F97do{a4g+;WDtyK8}bUNN-tr5&hAL@h1{ao$JHjr5=Vb(4<rWsBK
zS1BS;G`>1abI`oVCoF{@;p#kN*6BvX2!&1$S5ZJ$d=Lm+6l45vX879fZ`A=ZA;l3O
z^2zz@47oLeZ9*+iUrXRoRl_iTLO>Y9qYKR})oV9w)|&MoPHrulN1=dFVMBpY@`n`t
z0c$nWSP6Du@y6Ib&**)OpXIQ?m%*DiB#S22O{d$wbfW<ungG!6k4DEMX^Zy13RBq7
zGSPkarBF3PjAfXcSd((^9#XM#Zz!6!M-jjDCNk)+n=2R!Yb)jGVaO%+fh7SUGh13$
zg}PA^2my68rFSb6(k=>J1{sZ?eSR|_m|FW6;Xeof`=#G8Xn(l6fk{b#X&LfcXoS9{
zpN|zDp#d=P=tZ;lzqaoFGp?W>M8fvy+NAyy2N{fiJ0kLx!iG#Dd!8l7stBTX#L?-6
zqqTVz?)v(7rC$z!gKkaB9`xMSwu$<LXI1Kn`I-liNB4R2E<9vxbH;2(t>TCAV@{|&
zyz7>&Q!zfWDsH)ZWN(b8ybsy@QoB22@3e1PQe1|@d6x6grsexRk2zp0sP6eb#5qV)
z6E|-Yg7XG5U6OVm+Ju3laQ1E|*P^3&3i=TQ2B*~<v~mxe4gS8RmZ7t?)IIA=4o!9=
zO>dp%bbpM@A8O?Vnp-{_9xrC{zjx2pL&uG{-VgRwu!NH{cQ-t{_=9O`$@(Er2KJsg
zIe+RsN4zH8#9vLd<q;AK<M$#5X(l<oH8DKFk#EI;L#&Ri$?;jwTvZypN{a5SU;N#}
z5Qc%Q{NO6QxuYgMSuI!Vy31c+==RI9Mw2Y4_RAeJ+nZH2Gh)-Du&sqs)zmbc5BsaM
zgh^pGLR=h{T%3Rme5Bc8z@aXOyB1mR>~{j4gS~EeKknhSasCsD7*C=|w#x(R>|N`n
zA@I|Gf<lBXjVbS}Sr)n|2N9;Mx}(kzzx~)0uVxdERzjz*8m@-<M@<b~)7=5GN3DE7
z=A~UC{JJov!7f{mNlpUu>5ILWPvYdpUOS8j2QR|MxrI2`J-%;o4A5FvZ3YN`buF44
zm9}rYx!ooI<JBk&l?VMt2R~eutYK@!f!zE>YepaQcK%Lz;qtEqZn2Uwvyj1XR-KOT
ze6rxr4~SSc)4k8>-ge+E<jJbhbn(1N6W3$6aH5}&Ghjo3-RJrBiW}MIwjYqoA%QZ=
zKSc8*?j`9l&18E-vu!X<-?Xr5yw@Eot@P{V@pnwoXEe-H0IlPkmWN;DI&T+7GR%Py
z^;2sVLX4Ylycb63J{yi(e@k%;dR?Tz7D79w6T#9rkqlIp9kv2b2Q4ekc@#fM$@^U*
zZibmk4}9ym{r$=o(6>f6otNp$c|yaN@-W5Y85oT~|M7@6ocnn%PX0R!uh8R_|Lh82
z?<XY7J+zkOPL8gkWlvqOQ<@T9!{U$|yIQzV0p0kUJZx*k+A~sD%|H_jt?|{7pUl<_
z?t$|!7GUJ(_gk+cyn%=&bi-22yViTx*HYt|=~0&i&od2S`pSYddHsf^$4aSE1Hrp@
z%Q#QOUDdBC{?{b$8_6nvzj(Wj-Uo1Y|I##%@z&_Kg#SQVI6DjJ_CBFjU<A&Eq-$ue
z_mZyM9nAh%`Qk%r$6NjrjE)hSK=L&ni|8mfxA$(YBPuTj`2xQ1{s&aOz>~hTJ0&+s
zrisz{J6}O=$N6kXHs>qjlvxG`yeW~Z@RaMuJeifkTMI)7K$Br>drM~QoVRO&Az5vH
z;Y!JZw-3>oq&+_1h6y*}`LF70oKn2Mxj)Sm<~}G-@_4BG+mRc|ASI7y?35fjkoq5U
zT(^DgBM(NWSST-4PIh*ngjek6<G^}xQXW;Q-RNa;vEXSht>7$!`^D+!%5p~4&$0@$
z<;x5We1Wnj?L{6G-6~V_-uCDKJhF_L3bEFmqnQMrX)%nV8G!d_+6PYo!bB^S;$^(~
zwWx?-cErafRMAU@4|uY{%avu+e2UkpYW=?V{1#?!3ajnux0Tj^xR9cWLp&<C|8P5;
zVjJ}fHEc0&2sT>X`PC(5pXa@P6RU^nw!GWogm*TaAhkX5sdIQjazz_qm`}uc`PfO{
zE(3D6nqD3%?M@1IrY(H#3_4>qx8&&s3B{57i$xa=plXc6LP?t9A+6%2NE28(Q%=n`
zi<=}vAP`SQPe~%A__GLe1`%v4^2|7JAw8YR-d(!jH1qcfGPF{C#qe!yN+skxwz6jV
z-fX8~2Y>CxIXcblV4R;D$6=8#YbLAQmo>0=$(qhh)+_nZ-y@1#+rd6AfcatTJjTiq
z8i>FU#%&@<pefngU2{>odC1uCMhk-YQJ}NA+5?72EUrMEeRXhBzYIfk>uJ_x>AcPb
zM0oO+l7}Nplz;^I(<0d22H9R6fhOh)XSWAZd0@@n@Qu8(-(rQFPm(2-CQS5tpXYP9
z4Y~c+*U(&gw>rL8%p~PH<@?7^dHH<;nhR1GMkR9_BhiK{x|3b*G!1Yrwxe}TS=)?o
zlvl}qoYir@<adqV=u_GlB4EHGf<<?!Z+>ZjO%QVlQMz5CcB(*srX+ok9oA|^eOGpH
zZ~Ho-uwito47yfOofD>0I&ck^QkoPUp7k}JG92X;M$Yxko)>vOdf!9$AMNC2^AUT-
z_w_z<0<6jknV5qd*{MouC!3HyAZKP$3pHfsd(kc_CTeOg|23t4j;ewxy|}E&x>Yr}
zR`obEzM-b$x6t0w={vG6S*mO5(qXZ77v20kMcFr(dj<xJ+1A8Yr(fYq&*WqYVGfM5
zT&o(v?F?@L-(^yLsy|IV5keQT&oE}(35oxNT!+cS2lRwV{HFuEOI%0-?cux>qx#Ml
z&dTs5Q}&%C!?Fovl2$k5)N0jpwb1$f$k<Nd))v$#q`J%d#ImjyWF}N0i*}-EkuPh+
z7p`VbuxLcDsf+!`>1!#`f|RuWtFp3Jddai48=d4gN**uC$b%9AO8Bx!8iQXECfLB^
zZmIBMVxd&Veeqo-VPOlXtS{6*q(pYk=`Te`z)R&>o9i#(FFrB}*WeGto-7r7=#Q?c
zk+`xgHIzcY{wrKV@DeoZYA$IGLYHVHsoUh>QmT~*?1q2o*?Z#z+t5}Fhw@PP%l@Z^
zE7s?e&t0=1*{Hq78MaGuGlD@oe8Z$c((7QDf4`i_-IXhFWdMeg)KL%xJDtY@L?~wa
z6b}Kw8P{dBh1XwkYEBCx+bfz+gfuiJvi(!i5=Oy)m~5atQK!jI%fa3y(|aj7K3jcy
z_c+;Nmm{HtJ!@+!{q<}r=(6(VSLK0mBt&Cd-$Ki<GaxSy>v)zyPG5XrlT+S<4t^^U
zwDld?E!<_;?x=>TN+XFQyh<=emY(DmY<W#uF8`I3*b|6gi|{bXLq;Rd499zppi>Kn
zO0OkPcMgr0NMJqFrdDWr`ofR>r|+?@jp1}Igc1`zb_zj2LkPmoq|u30UQsfpTvAla
zvipUo5&8PrO9c#BL}^Y#h`)}-dh*6fP>|{eOj!v&H(qx5mj7n*ZFOmR_77aX*SnsQ
zUz81VkWOygcr!X67UAc*nh@|neHh2P!Sm7h$=TOl1fRhtYY~?WXn*l;su!YyZjh7!
zc#I<_B_RC|c*M^<@6ByGq-m)fVUN3zgCXAd<jqx3rgwvppWP}ceVTt`P!iN-4sTwI
zv*Y*B7~N}v9sIW!SsD^ty<M(5g)WkKU7x#^+m*hy_|I#F#$YmVG@2Hi7E9K;gu(I-
zzo?jzGQ1@!@!nY&eS=k8YUv+n)tr3rZRK=DK!BxCeL|w6tSOZDgX=a)^SP4UhP4!H
z&MHfljyr=(aUH??X-Nr73RXXG8la{XLxTNpY`?tP1?Tjw>U~fpT_5eMoxiq>JAIAj
zOo4ltKND1Zo_Fqr($9y`*(Y|j+glGG+63Dm9twC#&o$(8=L&WJV5xeYkh9^Rl>h)m
za{v1;6}(YGGgov4O;j6qCVhlh#Rns9mz>f$h5N<8b4B8Ac&o%63LEloM?DjNQ($Ai
z7ws#*F~hF-mD4*{ElFdPbnm(|q;LdMb9KGZE0>XvE2TeWX}y>J13iPf4c?OU&U_e5
zj0jIlozVZTzC5%aE7Hb48E6sd?%EPWbmqI+6z3N?x_3iy0*ek$nNnS|M;b^9?r|H9
zU5#RNxqjG^<roX?5wVt$(C5&Y5^<7UN|cX`RoQ{plgD`8SIx4m2wlaza33^dzb)9`
zPp*CH1#s!Hjjy>;SHWLk*S=2YY*xwdsTlb~86j3RX^p;g+k7vEALiC6OL?<{RQ95=
z61mCu8_#xXqAW|A0ceG`A{nNcfEz7l7R_KL9|E89+z(AVWQhy-v9qJOLATGb1RBDW
zlB~h1=S95M4u3?`5EQzuVJ{SEzN!iZvD+!SteQJGgf)f39FGbd#v>U$c1ux*Ea>{g
zz14Z>DkO`;+|a?VI56Uh5?4&J^gT1#4|$hTL8kA!NTwpmKl&#@GpT|d3$ls;h9C&Q
z7|%9aE=#FW)gxQVDFJjudTva%7y^lpr>q^n<wy;N#uGP!QuuIc{21^Dp{nFRI+L5Q
zo3;E<1c*e<#i`4UiMEi!IZ>4li$aIMaQTmq$)}!^f`_fy$Do{&x&D)<Yn9$!8KBgB
zzYUHHZFr>M{5TgwJYQ>3@TG$BH+PtGO?NyvYe+qIJ!uNDw`Lfl+Yx)yXRU}`!%l7i
ztzz6YXC`cMfKBmD2sf3w=SzzGNWD$EZVrkY14c4AeTYItF>z<p;L40?Ip<KjNwciz
zoV)8Lm(l^>SH{Cpx!dVe*krBbrlgp}tFM>|YlJ44SZjUrIDwm{F2QiGAt!IR=`1rd
zDf70KUY|uL&4$}N7N*ykCgDELTzgxde-tMUJ!t2WWdIf=H@^a%Ew?04GA_&uK3^B!
z6!;(Zz{M73m|nIjD?ji#SXW32%v*Rf!R(4>T+IN`|3YVrzO4$85(%iu{QyfJ(W&X!
zw+XbBWAW{&1aO$AF|>f^(K_#lE2wtp2m!pxS<N`5fr0Tb*>b=}X$vrC1UPPdm=x^m
zkS|8~orA@AEY=ZP=hUWqI1Qb%Uqu^-#pwPFADPGymGj9GF-HtHXdK)>bze-)!`j(2
zWn}ft*5u7?lMQWEm45XOw+IWIHg?0=8K88<sQu_!njOth%}IQ9m!@&L;BsY#c5$!1
zDXdCZESY{cLdjEV>oE+k9NqxkyS3(4PvN&Sf8_QMmT-99A*)PXPOBW^M-y<?F>@b4
zCcU`nvalFv+__^BTLn7PiA|FQx!GJhp_Lfpda&%>`59SQNMj?7RhD61Jwrwztk^nv
zZ#<E_A=1il5rIkZ`+I?rYv<VXmo`%+Im6K;vVY~OY^v^d*6aB{jx27mvFxrqPOg?}
z_iZhouc^Gq-BaKVmmRcQ`p||vr6tZ!cwEeJs*7N<&AMy^J%xE(5?FtwH@R3BCJPm%
zd-xgzVmy|=@}#SOjqFcZ6j<XGcs%FX`~8{y>I+3ipfNJh#>sU~-~jn88+^$~*KUn1
zNhFQZqVY9u4Z8f3XRk6@yMD;Fu%n?i75_9YV;4{${96mt7zh+KNQ7wFx>cARoXbzI
ze*RIm@>_-MS=k2OS-sJSy_|VCr<()nq9IB>YgV1Gt^9S*&rjq~$r+refeS{eGO>dO
zPHqgX!5w#J8{Iy-nMR?(fr4z<Pr*Yrx_qic0w-s(!CZuLYR|3jiu0j(p3vvNU{CTv
z%t++}-%dl08qThSd$re2Eur~uZLfx$n7j$nE`&)}t{RJh_6voQWqej~Q3N6F{7BYj
zkJ`P{3Qy&t8goYewR2;8_HUD)L9#HH^HUi+oD-kizS{b*;HdtaO%D@0KS~kF*osQb
zs-S4Vz((-eq|o-wvD7VSl_7e8cf20Pw=O4juIy&4@d|qj1kvd+jFwP%>DE5+l60-o
z-tK0uN9BV#9=$(`Adjj@Nlvoqt<Jct^31wg#*20fHDQJ2)))=qzm3a@i4RlY;{A-(
z@HGA9KNaU-UgAvH^@;IzlBtFfLW$#I7bsjuE<oetea#()`+ZSEnou~Dtat0{mO}WF
z0g%c{Mso$kCZ~)jn_Wu|RAYJI=mDx`x7&VL8FNP<tVXBbGA%0Eb~GEGj46~dL?xUi
zeX0mc774c#ECNe8Bf*{%cJ&uhh8d(u*k4Om0%U{f3KLkiHM`%@_5g2$W<jJai|46P
z9!}B)zln=rASv4Q2c!p?Qetp}vm`Yx^)c!C$rri9toBp?u7%5&A(`WN5*R;{{dedK
zhgTxr92{%*?=j-+ua{kafcW#^$w`khS0h`odG`)@CF9G|t54jBa)urxG3?u)eO$Ya
zbtwlN#({~d;QNzeEN@r^5ZqahZF$^MbYpAxp8U>BVg<S#*kRwxliz&BX2xY>V+9qi
zU&&na4oXJ$cF&~`0(N!|FXgMg)9t3IFfE02U(r^wi5Ql~!^77wEb}zNX?IR=hnV(-
zHCvf!C?tk)95>X8v(nOI0K=LF6lBF30X_MDm*wWNU^-e%^L%BD=pzqfNjd#ocBh!=
zeXM!pNtlR$EYa~@>7e|qB(e_xaPf8hk4s-ljsz?4oSZG$$pIphCw00Wd=b=%JgiER
z#A>lmKVsM2ooMujv-=qb;<C?Uc?9NPda?WB{N2x=m(@Nm**w9>c{9Tynal|HNNsN@
z#&yYLr|TU&Qao_5l|*MJV3;J#+w8Ll!`+?D_}bm6K0^eM_8XSu1x7JQqKAz;eodUC
z3)$9a;;18H_k-X&;_kbYuLe<hA3KAby0u#Q1KH%ZVzP}KNZMyHyyagaf~L8_(S9+g
z8tH;(9Je@y|1nZa(Njf#P^Bk_Ng3TPjrt&`Tev3Q6K9oq2!+ZFv|?wZ=5&`^Ci}BA
z0|0jo;C$t}F7{2@A8^OM$cK*2Z$&*eZIJh$_OreDi(w*j==m8W>O%4@$-D$}JUA+-
znWtAjgvClB8>!L$%uc|FsR&_m<Zu$ehu!mg>by8GBW)37oGg;fOXKMSAf<k$QeD5F
z$7bDXj{CGTyLwBUNkn(8$acY^<FJwuEz+#FCso?{Ad`-Ier@0li0VMpdX!s5D9kX9
z=_>?318p7IY07RB<>t;FHUW2Sv>n>afVy^nWxS(_^?^u*BYR6LfwO*1<ee@YQnz$k
z{T##X1grF~s?S+M%T3?3y}Q~QMQ-2!OUG8RxV|eE6JV7iWSonNoBqIZMI7j04y0CG
z*2uCk$+N6>Qi!rErE;0NAlTrOh?(Z4QteML_Mo|v#IB|FMeCWaMQm`yTXk>vl9d`;
zgr;fJd)+ik<7}u-<6|OL2$P>;sreB-AjJUffL>)=YO|M$s7Ug`;It6UFM&PkD!S^H
zN+#(c92_cN7yDEEH6~3zFNjSW!YYDUUi*&Rxy9^jt*jI-iwKD&``kdk+OQ2Jx<>W^
zL7K?M^etXX3-ug!ZlX4&fv`BDM`8hY2VcQ+yyInquc5PLAMq!OiP`#LqwJM@8S7WS
zzlnza^l8%e`kWddAU+)Et}%Is36`)2BDjDW)9aTNh5qJG7^~QufDEUr!>*boJloJP
z=X+UNJ*A;y3OZFe9b|5#|C$h`h;@4jV)Wb{V9wD(nHEickT#<>Q7GNB3rljX=>#1v
znjbJ7lw`Vk;|-ao+L&&K*%o7r=|jH?07Q3-!kXuPi2n)NU>ak*i5y+`leB99H?P`B
zPj|CE{|6{75UT5V0JsUzLc$fpdTD5@RAzL_`l?sK6Z++SL8bxoEr*F>>*aPZRXjx}
z-!i?!@9B9u$Z(Z2o!^Y@xek7~n^*H6v)jmyKE*_F;4RMItsQ^1{)drmo6V}3t^YX;
z+;9~`!W7jE>LRE4q_a8wdRblGWSP5<<YV(=O{ER4v7TVlH0E8iFwr|J4&5|yyZ4x=
zr|?rR`=NP}S00p%y2wGWvA}3Oc`56JanpHUmyIOcMc#08^du%lwQOn0_IVeYtFb6?
zls$rEYxz3Dj!vfv3_~w+SQN~f$vxN>%<%3S`9xyx-wrlL@q7!yg>3CGc&as@inBS$
zk}Dq76(u~56VS1lpbIcPR^4RR@`HPzsz&kShR!fq+2^C`0o#&z#}_1ap+S4J>V($^
z_8BQqPa=UJsr6E%GC=wCVo%!IQ{&mY`dZF@T5GE}Wut`8FidVmM04Ay37(@u!qG}3
z-F^#~h}Rtvc08t32)@g56+&PYIq+^znE|EkvFRZ)lt_K6|Lz0Q{(`7_9+<zUdw1k}
zpp$x*IjBC2ZP@dc?vo?Tq0x_NFZZP2KP;59$Jg6dwXzi{Z&tyYx6&36yN~3*_m3<?
zfWaa**!atgpy~Q9JNLA8P#ADXh*er+>tELfXmkU=a*|d1#$|Q^pIep)NvFqKLGfN<
zc}O)!4m~Fsx3V}Nu?aqJF()oZgsD@iXrc69TOZ5Zudm*YI6SVq0`+hOF^iu>Lwzxr
zvblWFuV107%R^qTaa02IkLhHHpcY8Y|BS;=n{%;@w@HRF0hBQ=Cfuir`R3DN3*}qK
z$eo>e=)niAb!M0D%Ux03tJB_EHga2w*&qrnnyDVlw=LHvv^9Id$0?(d+lDY=syjlL
z5}0<HZDmqra|Hu+Z_MswZ1PZ9@!gg#t1S3eirMP)p2ly_PuJPnSZX_GJF7|Lz4xr@
zW7TBb99NBu8n3j~s#3N3;|tl~_hdcPbB=C+kgq~bg13fs$ETl98~w0XScP825wgn=
z6HFz?r*=>ln@Ba8xQ#wY#(3LvNY{N4({fq*>%YA3SbpANzUmWQ1nq9<KllE5+gMM^
z6x5%MT=|fffyMJ~;Ss#q&Af>6vqJKaQ)I?fC6*__*wd^EIPoUkYaCP!qiX!`s^FU&
z*X(m(bLJ(Pw5mTG@9sz)o~#@GvMky!az*r=aD1QnJY#scbOD<3rvlRUB2I%lLf5jO
zYZ;<;pRePbXkI#urT>QD%~PLR{1DJh4s(vSx6m(rCa@~dD(v1LbLT~)^gI}fJ*}Go
zjy>zp=tPZn(Q2BC|M20b!`+egHtQSDRWxdvo7!HtgM>4q#71n~`Vh~U<8kOa7(Rpz
z;=J&ehVFIn<x?=@J(2F%sKk?NB9tpiP283JR53j@eCvdCpR%`lh352hV=0a@kB}tg
z*@&B<o!Aiol<k5e(P_Y>>^+*}mLp^9Rav)j!_ewq*fPX1w35F)U|61^`th7@YdMPt
zDvha2(p{$NPSzG&*r|nBe?7PaQ)mF8i`wM2Ev6B$e?}Uzl$Xp8Eqg5^mJMwfi9QRL
zE@0lbb)DD+4a-UNO*Lvy>U10Y75-b>=w>c&PGZ%3l!c+z$#5K3^AHV`!HE8zkn|&M
znd^;bw&dPYZN~!qT_;?3g=%txv!#5Fy-eJI(k1pS{%cuEk`EJ+_gLcXc;z#<WDZQY
z@kcGsPi@7bOV;Vh4qtKdx$JmQH#jL-lXT$?ct8yejlbV8-Q8xL+RFKS0&zXsHszqO
z;l>Jr(duPrlX?(ufTgdOFxW0lp>sUib51lCYo*e?g(Ss?ehN<-x)|o^vJo1bP8cig
z2{&mi){Q7JjGQ1q_$)^6)08~jl#SI8Do8>YEeO|1M%}vFCxuGdCS8@q7`{%frl#Kl
z^CC97!o&paq2kwk30sd7eIwfINZ_H7cndrH+w6VYI)p9jDoBh$ByCv^UiJMdE-ITb
zvQX{P;P%m!0L37!-gG|Hws8F6eg?yZV(0l!;0khZ(qvLj7Jz8G<H?Vv7L%4eW2Wzt
zk80YgZQHJBnPB;>Y`$!*^0is}ayKrhQjfvRv~81zv2?xpTQibE9V+~QsB4?2$trju
zEA{U{40f-}wT|ItY#%0crDx;(MEGC)h@2(po4t*1gG`I<fHE^o+i@5_?x1EOrn92y
zlFijWPUgYsm`LqE8p==!?=!+8s?wT8Bi3!q4J|Dlv(JFd%P%UWn_}&3a86?JQoFiJ
zUHs`VrY+Z`V7jAIf3HJB94`+xz}!@kxr-EPjDO<*W@z;ffxc%W(bh>2I~yl)m!T{A
zndqn#2F%NN?WOwrlmwJ}Z;e4#ZeAa0fI+JN&$*UrBDY8!wK2pJx}Nvc<&EHoMURVw
zZ`eAIWvS)AaT>z@b>=en#pYl3^>DEr_Li_wY;c({t-NNqH;lOKNP1{M3HDLZksa2w
zwedg2xNi?OxD21e5grR&y-?}xze(IEvgNeU@Q)_>J7d;ty1VV=NycmWvPl;K94^=b
zn3%rDWuhhNRNX*>CBEojrKYd`*&r+8<X|N?A|&a)m~)wMLa?@t^9W6|{XdkzP;f?T
zsKU32%9WT<1N?htG|VLW%h!Yx%_^a=X@MoiWll{K1!mvN;QP&uaiC$+cee{RZkA_H
z=rYTU<-oTu=B6Vw5!ZTOy>5BqPmpK-*J?SPce2|g&kFF=3jV+vButqiT(hyY{WWJN
zPxR1u{rQhefa@KswFWTdRdtcQW6T0qNHU^skmQC+V-do;MKImUBJ*=4GtRq7s`}J2
z+=5Q_BA%KzI>f$mPGC;iCddwE=u&8}`+F^A{SGrFCmVbxk528!`H5*Z3m=`*w6hC4
zdoDpAval_RZ0@`=yx8deH~zI$cycpVI`fyS&%xaHl>J(swjK(k35K7XM#=x%>C3%4
zvfQ;^^nUk4*GI7A1Uu1$h1c!^%!EUmafb9A^!vw84(+A<?O!{)M_{t|`_GZ(*gyC?
z7RRCe?+|2{2u*$W^su~)t5GUB%ADJBp$pmky<uM?ZfEy<UI&b+zPtPV)}!f<%s*d|
z%07HvQXenyRr<lZ(wi{1cOR^#LlmFWaC!2p3$7HeF&2>!Zd;Z^;)ZVpD3%f9FDxp^
zSGkRE(DT4z!-Y6r8nx6H4icY;=bSw_-Kd{qmPJGZvMf2D29z!ru>cM&v93zSg%9km
z;Kov#e~rm{;h15H^pO!nx>~rBy=0SYc?C9c!8uK20YtSYm}6`x&(5{8p)UM^68)!A
z4lbI)g)48Cb;`0ghv~d$XH?ot%4VDU{aFa{6=lAB=kTT{TM;z&fj6Z;ACXOdooSAI
zdWKl(gh@=axEIx$(@Xb26yIW}s$4HK)ME#&mSm1p5^l1O!M6TZ(y#}Xi7ahCYEJ}N
z`?`KxAt@~SNS_)@exT(Gktp?-nAe5_lTdX*a?Px4dlLBdba=}c10&0kV>aG1zTmdO
zxAH*p1ECXZrnysoCk{jDSIYPy@!>ytQ+eli{ZXWyZxLt^b`;)Mn0V&`PZz&I?qXR=
z^kq7ak7~}y{u6hLM>}0;nkX;l@&rEZ_L3Etw7J&heO1DcF06wfUTK?%wInlaeg;#Y
zW(%d40)1GE^i+<{|DRc)*P(Bbz}`EnU;D*g!)Tl!>~2;*A1eqyg*lVH)trxod4K^H
zP3lVs&L=GL))m#(95_!F1Zc3qFbjgXtokd^lKN4~ymhjwc+v6g&ADloCP<mRXcy&Y
zF>tf8_t0|uqrr<E*(^k@83B1Q>ZFViU4mUnmBv3T&%%fd=ho}Cyac121(3%gf-Z-T
zH%EpMNXu;2i}r<wTPkRDHE$g!EN9D!GTtxb$>ZK_wLGecsRq8r8sj$;=S6eavaAm|
zjn-PMJeO~@oa5B>rL($Y=dFT!I=}pRFOo0_09X;PuA!!{3pE3BVc)XY9f8bqkBsNL
z7oMbDg0S{kV1){Z1ZkjFK|F!Xkk`BH{qIo1<I?BS&y*?9l&7Z`tM}PzAA;?vXjV->
z(A>$>T#6h-$t}s$8wtTUN9R7A^vKHOHEw_OR|%kltTvsE#mnH^YL&-FAwySa9$=$F
zTGIJE&dGI~`Hm+8$erP6d+QOew|MivQUQ0DIPYm^Cv*2_9N>=Tb!P8thM%p-J`I|7
zPSs^JDitA`-0rO;N#Nx@@zy&r9R1&6?t3Vm^NwQnQ;3u5D9x)@d;FCP$lcp+RL#ym
zm>d~P`wE*=OGrBUsF4Nj85poi&&thbUGF%z4@~O<e@l1CGX<GhXUo#pwP^v#nv7Yx
z=sDT+LP<ilcDBxw3_b$mdZ~07A9VHuvsql{A`|}?68U5ct*vEcWD9<ISL(TR+)tjB
zFI4EAi|0-nt~^H_y^+&45V}Yb{A-=I0oI++*FF6C-954)PRiw5I}Jbj<w@dx$4@F(
zo_DSbUNu3=xd%MLN%`TFxg*!qj=SvqEG>E(@yr&4|LJ-LJs}*)z&^hPn)`H}P`a=9
zlK%^hTXh;_E97qVId?cNwnK=IzB%j8&zy~7)pvMXLX+UhEquV#ALk@!UCl*i3tfGj
zdzy9BIGa-}S5T$y?_U$$Das2bb9Q%H1CcxVXcYhN&)@7qyxXth%zQ2JK96?6X>9<<
z7=Ygpq=&jx%)<VN@jb0bEw6Oy67sq7w~M%F7ZBI#!v)6_>-IQq_gD^ZnOQgr??jt@
zWOI?r-&m077n2Oiyx{Q=G;0j<S^R8Ghq*f2SR&QrM|9u6c+Ww6_BuLS8r(OJ*GyU5
z5X^sji2n<d1@)cx3s`)73e3$s_vYm}3Dzw7`YgVWi?YsS)ZEf~u4j7EGiwGA0~(H@
zn$>$js3{+mwlQ8psjdkzeR*0z^E(;u@>*NJo1S^OVY<OeGr%hB8fJYYJSA7kOBG6$
zObQfaVU>sb_O~8s4l}JmO8D<xdibqu463K;35nLUimdhqwj$pG&;H@O^ea7mx<w`@
zXZW3v+-Mf#q%t#iUSYUf<MI$|FF~nu)#{$ca1WFIOvvy%^}|rd^mBlkz`Nv+70KQH
zN~^fIAzH@@PO|F@OAdwuffMOcZ-twxafpd!2RTKMamL(*eSEK<-RI&V>q=iQ`i_h%
zJ>8X|1p0j<kMMqLkLO~~X>b{i^2Jzx=3iP)Mjwp<Q{5X`W~J}xv|SvIUgx#u8vRV?
z%S#uHX1stp*hy^m(r`bl@x+?M+F7}@WiTElC>&($HRPhtJ8XIH4wG#j_O6viD-U4!
z;vj}~vKk_9z8lwzpYur0d(`<|axZT;p~zc3c`v5*4?16_o_(FNzwseiGG>#|Xd>$d
zxX8Ewp^@c?KR4L`Codg3<3Mz{0VvIfB~GmxdsK;Bdh4d<)JSwBn^NOz(`*ah)VMma
z%-oYo7S0$oXEBoqj7?3G79`lpT58>C&hp~pR<hNig>9y^4Lgzw?m0Qy&?RM_Ztjk!
z=?K75{)WeU^$?$O$EE?6d>(G2O7#wH7_x4TeJ0ptXOVq+9d0XM6xQ%lf{9!)IG`a!
zBo!s>>ysoxot<v)WR`Ur_dk=9V6sZ`iZYSJ&mJ@4ALcYGUA8voytfhAEZ-;kfbN`q
zEbdRmu#4bp9SF(7WGNA5gqmI=v84y-mHu}v4jTvJF`MX(B5<Pd0n2vF(hUp_?nWNm
zF3fM-^WZX$gu%ZAy;oIYd)kqlVWP!qqvyKRR8<dVn8Xh;cW;!qUV3L)@#>KMv={^Q
zGKJ5E0Q&pBenBXg{d0=R<NY^LTe6(j>7Z<?nv_uG08hgU{Ki`})6JKHdu`!HvQYA@
z8EH$sG*ZS)<w<Ls$lfTpoXt4Z5_|ofif^`~x`_ZUI2}tqdC#WIV4C37#*_uZ`R3Y~
zjySv1N>*q7a4bkXG7{4Lr$A-H@7l8nVjlP4ttziOrj5OQE9)5;Hl<|Bac@sJ_LVnL
zf+?tKM=YESpD*iIl;4R{jE9e#iBJ|j?z<yj&MzoQyqe7sdXuO2rkc_C*lbg1RMj3h
z`t2_nLPqkqYlC|mQCn#?iHP#^zF-Z|>%Rbszt(wLU)m=WJFQCqqNZ#Q_LlV8uX!zT
z2ZefdRjmN0R$j+R305Wmi-z*sir?z?P^HhWeBSx*oc{YDGcg9`1C!v=s)-^0$&~m8
zTIuMmG}NU{{VJ*Y$LNJ_;D4#y_Br#D>cNa69CkErYRlqRLBBXCf0*zM-Jv)!{7{Za
z*5K68Ur`HlJNmA*LYyqhD(}C)>*1>;jvQYgCr?_)lo=&JL=*e<w7`Nq6r6<;vDlE)
z!g^4264)uKNauLq2@kTU-ixq&uY1to#@s~#dc~r2*;Wa|aZngI*Mdr&ar4gqPhS25
z#|O`r$*$>1L*3LnRNL3F_?36P&aEqXn4#<4KZQ<=%Lyp+ma;0wL7MKrSHQoDK_;px
z5=L?*+IzBbG!k#Nk-wX$r<S1tVfr>jnV&y#h!DE*%WE1M@tX|78@U@Yw@W4~ly^@Q
z8HIkAI(i3X9QyW9ifC@$K#GI7c>9wA%*}(zek8pIAV+<<h`#gl-IN<EaCvYBkdM0N
zmhHti@&dtJye;6FJQzpp88k}o4UhkA#AaGP935O)m-?u2j5s63>O>BA%xk=p9kRR=
zk;qCrG0LM>lZHGPO1TFvE`<W#oaL9D_%HaN5zi=J`gbuGxmPKP091ixxl$I9W_{Yi
zo!U7Y^HVeZk@h%j9T}0ITJm6b3YITZQ@MT8wD8=m$p>m%Ps)g9aAG|uzv8x@l)w+V
z6<7rjy%FO&Ux|%Y;!QRXr|X!*SeK^%<v?|MXkb0$4=yk+Zm({t;m6pp{q4cn9kXE|
zBPPZSbL-XEDhD1HH_0Y9c5?MsIJ>(9%;^`H96YC>__0Fs;JGR$!fef+E!!@O7sA&k
zRqf%T5F+vR!gQACLhO^JShSE|qJ+yZ2ux6X*A4oh^t?xA!c3#TU&|5zD2c{Hy3w4R
zT-9OEjbJENHfTw8SP44>4n}~&N~+nzkSrWP)a%2;j)EC=EJJ&4?eI`rU0y{=Nd;#Y
zK#9N^1xJQZa2C#qn{B&(5%G+~cq(mZckYx|6*u31f=7ACsHg;9Rrfd}F>wx}rd2_@
zN7Z^h0r^!VP2zwc7Ldu21BL*uN|ma`IviH-&v8*VSNTthl^^Xx*(e~TE371R!Y~B{
zWC4L0(4)?37y^yOO|eImC>i>H8m&#25bS~8jA7%xQg!zs2+ALv4@V$3>STg4l;S$g
zfhaXYV-YwI(4L+nN41l>4gx^T0#cx3ho4WHP(lJ|A*NwLv>3`6oU9b}M7{svVUk@y
zEGaA`-XYXHEHZ=#Utidkh!&0wi$2B2Kp(El0A86z2jlo@bV@W8Cly?q4xu{pVYo#)
zJI`B1htX89P-b}kV>a(}6AgDaQ%Vvm4J8;ng^2Voa0e(pTp9qH7MK>4RIfhg1rfO6
ztU>|^wV}E&{<SOUG3@dEYGtkAD{QG=@nxa1ViL%pJ>FzmTBIM4h+<>pf4MSbSj<Bh
zS@f&p$GyWk$Ar@218{rr7KXQ7SP&(Kiu88V4UUPYdYhd8eMnN}i>8r6DAcf+Xm8hO
zDlH%~^3$PAziLznl^Sp=#4j)=0T9fSc>#v<3tH?6{T#Kg;m-k(qxn%|rNi{5*W&j5
zLSrI>iGHzyWPrE;oIH7$7h^yRqSGV_Rx}+M|01P2?9A+4c>%Uzf!<Y%4LlmN@+(0R
z1nTX?n9O41yL(}=G*0+o!)%+0lNE8((#+_b6D!fy$i>#mxC5@G=;~y4Dmn&7r3cL!
zgmsf~x+m$;5xnuyILrs!OGZ#ACMN^lq5k0LcH;u#0x|;vv!8JD#syhgq&O#=n=t&`
z$(h9SISC;{swxV>l|He^QFHl6I9hno(-@RC4kzO!gOkUpH9R^OA(E(+AeG=?=LU~J
zt_2s*aLb;+`EO3IPe@n=<=Dmq1zZso^ym{cqMV{f`BQ}i*9gXyrb?1Jp=I#3j7UP-
z3!&!W4{-oTI_ivaG9~oC-m2IThHTKw_GE)MIss88F~wHX(X?sc_z8O|APE%aFX$U&
z5tC^db`~$#HE$y+r>vxu8$3T7PL>eYsiCs-Da4)usC0>RsiwDKo5}~<%nU>Y9pW70
zDbF6oe$mG{O`MM6?Ti}8lo3ft811b-qy<x`C)wGFlv12WpIGGng#jamt(%btTZ}@@
z_xLped#t>@1Hs;m#K4Q&PM%Nz#K#mr+WKNp>T=!KDJDt}9`&@LfvkelKWlFpA4ltY
zt{#a~dVwoC6Ehqe@s#LuB9>mH(D=-$5@5_9cZzoY!Vvu;K8o%sVUnfs^i5kNPr5Lf
zXM-O5h$pbii>b$}5}e3*3Izk(QN*?{&<I=&j+aGdTx5K}2KgLd?;_`)qa4X~!!s7H
z+!z$h70GjIUpKgR!hq}+M-{ex)b->veP<_rv&bvpE<~RiYi#n^YaFQ?W}rxsD}LTZ
z;S^I?inL4V&CIwCrc+t(Mu1D@ZK0-|ukGtg-Mp<-IO_$jt}(8VWXrCzUo!ln;QaM&
zT&pCe`|v`0i~`$#BkuvzF_ZjhcuIO3mtv5YSmjgs^s{4U=IT5W6(qV0wYVBy>g-0J
z%9mG7Z;YxJ6b-p>hBUh%jktEfHE`XZ%vPFzau*{%zSR_C6<W|4O$dp~xWJ4XN`B9E
zsyndtkt+C%T%#c);?8LIWtyO|T#Qm?0M@vBq-~{J1sdNN<maH*+4AUNl!3YJDU|aW
zsvojUb>^l+VE6&*m*sUlArco0cD@^|`s?hI59Tlm{Lkx>s1DdEN<fr7ONetJqA8w=
znwAQRFzrcJFB7Qtqr2+DPy0(uDzFMt77>yEZKE8nZ#pxgMtr&Ea6*(oKw7U3EFFCT
ziewklZZL|G;fxeJg%I<<^i{i6%6rp@+VXz*VL6?;%;n&`NRoz;y%3}|zYx05)2Q0e
zNEqInH|ji*%pq-Ktm{cn^KZK7LRa)NRti?O6k?j7Ow4)xx_iKlJn<+p#ps14)T^5k
z#OEByI4QVjW#$L9iwUNa)sR=yk+R|$PDS%0Dq6B0AqgSkIC*$b#yW;Y{vSbs=hRj{
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
Lq>!PL6OH&k$Un<D

delta 18385
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
R9U;Ea972x7`nLFR@IS?K`al2x


From ab3840c7ff78c37c20f8c36242eba1b3329778e2 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 20 Feb 2004 18:26:55 +0000
Subject: [PATCH 0954/8469] wininst.exe is no longer used - we now need
 wininst-6.exe or wininst-7.1.exe.

---
 command/wininst.exe | Bin 21504 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 command/wininst.exe

diff --git a/command/wininst.exe b/command/wininst.exe
deleted file mode 100755
index bea2bed4c14ba91dacafda27a890db281143dc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21504
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


From 61a049aec865a04851211b698bd3522c743ff242 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 20 Feb 2004 18:33:38 +0000
Subject: [PATCH 0955/8469] wininst-6.exe and wininst-7.1.exe are in CVS, so
 that they can be included in Python distributions for systems other than
 Windows. Windows installers can be build on non-Windows systems as long as
 they only include pure python module distributions.

---
 command/wininst-6.exe   | Bin 0 -> 21504 bytes
 command/wininst-7.1.exe | Bin 0 -> 22016 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 command/wininst-6.exe
 create mode 100644 command/wininst-7.1.exe

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
new file mode 100644
index 0000000000000000000000000000000000000000..c40cbcb5a0adbbc15edd7005be0deb672f9d08c3
GIT binary patch
literal 21504
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

literal 0
HcmV?d00001

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
new file mode 100644
index 0000000000000000000000000000000000000000..89a78885c93bd4458ac5bcb71800662fc35b6802
GIT binary patch
literal 22016
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
N|D1^b;eT}o{ttRghu{DJ

literal 0
HcmV?d00001


From b78c1bc106189b7b7ad1013e0d723b4a47fa5d6c Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 20 Feb 2004 19:38:50 +0000
Subject: [PATCH 0956/8469] Use the right wininstXX.exe, depending on
 msvccompiler.get_build_version().

Distributions without a pre-install-script didn't work any longer, we
must at least provide the terminating NUL character.
---
 command/bdist_wininst.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 76b1762ede..324ce31a91 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -249,6 +249,9 @@ def create_exe (self, arcname, fullname, bitmap=None):
         if self.pre_install_script:
             script_data = open(self.pre_install_script, "r").read()
             cfgdata = cfgdata + script_data + "\n\0"
+        else:
+            # empty pre-install script
+            cfgdata = cfgdata + "\0"
         file.write(cfgdata)
         header = struct.pack("<iii",
                              0x1234567A,       # tag
@@ -261,8 +264,11 @@ def create_exe (self, arcname, fullname, bitmap=None):
     # create_exe()
 
     def get_exe_bytes (self):
-        # wininst.exe is in the same directory as this file
+        from distutils.msvccompiler import get_build_version
+        # wininst-x.y.exe is in the same directory as this file
         directory = os.path.dirname(__file__)
-        filename = os.path.join(directory, "wininst.exe")
+        # we must use a wininst-x.y.exe built with the same C compiler
+        # used for python.  XXX What about mingw, borland, and so on?
+        filename = os.path.join(directory, "wininst-%s.exe" % get_build_version())
         return open(filename, "rb").read()
 # class bdist_wininst

From efaa2d53a821a3dbcc131185165886783efb1077 Mon Sep 17 00:00:00 2001
From: Hye-Shik Chang <hyeshik@gmail.com>
Date: Tue, 24 Feb 2004 23:54:17 +0000
Subject: [PATCH 0957/8469] Make _spawn_posix be ready for EINTR. waitpid(2)
 can be interrupted by SIGCHLD or sth because no signal is masked before. This
 fixes an optimized installation problem on FreeBSD libpthread.

---
 spawn.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spawn.py b/spawn.py
index 4857ce5e63..67391e8826 100644
--- a/spawn.py
+++ b/spawn.py
@@ -144,7 +144,14 @@ def _spawn_posix (cmd,
         # Loop until the child either exits or is terminated by a signal
         # (ie. keep waiting if it's merely stopped)
         while 1:
-            (pid, status) = os.waitpid(pid, 0)
+            try:
+                (pid, status) = os.waitpid(pid, 0)
+            except OSError, exc:
+                import errno
+                if exc.errno == errno.EINTR:
+                    continue
+                raise DistutilsExecError, \
+                      "command '%s' failed: %s" % (cmd[0], exc[-1])
             if os.WIFSIGNALED(status):
                 raise DistutilsExecError, \
                       "command '%s' terminated by signal %d" % \

From 7fcc46c767cdadaa18b2b1111864b92ec4439bd9 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Mon, 22 Mar 2004 22:22:05 +0000
Subject: [PATCH 0958/8469] Basic dependency checking. setup() has two new
 optional arguments requires and provides. requires is a sequence of strings,
 of the form 'packagename-version'. The dependency checking so far merely does
 an '__import__(packagename)' and checks for packagename.__version__ You can
 also leave off the version, and any version of the package will be installed.
 There's a special case for the package 'python' - sys.version_info is used,
 so requires= ( 'python-2.3', ) just works.

Provides is of the same format as requires - but if it's not supplied,
a provides is generated by adding the version to each entry in packages,
or modules if packages isn't there.
Provides is currently only used in the PKG-INFO file. Shortly, PyPI
will grow the ability to accept these lines, and register will be
updated to send them.

There's a new command 'checkdep' command that runs these checks.
For this version, only greater-than-or-equal checking is done. We'll
add the ability to specify an optional operator later.
---
 command/__init__.py |  1 +
 command/checkdep.py | 70 +++++++++++++++++++++++++++++++++++++++++++++
 command/install.py  | 13 ++++++++-
 core.py             |  3 +-
 dist.py             | 60 +++++++++++++++++++++++++++++++++++++-
 5 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 command/checkdep.py

diff --git a/command/__init__.py b/command/__init__.py
index 870005dca7..3a9a53ee85 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -24,6 +24,7 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
+           'checkdep',
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',
diff --git a/command/checkdep.py b/command/checkdep.py
new file mode 100644
index 0000000000..729002c725
--- /dev/null
+++ b/command/checkdep.py
@@ -0,0 +1,70 @@
+"""distutils.command.x
+
+Implements the Distutils 'x' command.
+"""
+
+# created 2000/mm/dd, John Doe
+
+__revision__ = "$Id$"
+
+from distutils.core import Command
+
+class DependencyFailure(Exception): pass
+
+class VersionTooOld(DependencyFailure): pass
+
+class VersionNotKnown(DependencyFailure): pass
+
+class checkdep (Command):
+
+    # Brief (40-50 characters) description of the command
+    description = "check package dependencies"
+
+    # List of option tuples: long name, short name (None if no short
+    # name), and help string.
+    # Later on, we might have auto-fetch and the like here. Feel free.
+    user_options = []
+
+    def initialize_options (self):
+        self.debug = None
+
+    # initialize_options()
+
+
+    def finalize_options (self):
+        pass
+    # finalize_options()
+
+
+    def run (self):
+        from distutils.version import LooseVersion
+        failed = []
+        for pkg, ver in self.distribution.metadata.requires:
+            if pkg == 'python':
+                if ver is not None:
+                    # Special case the 'python' package
+                    import sys
+                    thisver = LooseVersion('%d.%d.%d'%sys.version_info[:3])
+                    if thisver < ver:
+                        failed.append(((pkg,ver), VersionTooOld(thisver)))
+                continue
+            # Kinda hacky - we should do more here
+            try:
+                mod = __import__(pkg)
+            except Exception, e:
+                failed.append(((pkg,ver), e))
+                continue
+            if ver is not None:
+                if hasattr(mod, '__version__'):
+                    thisver = LooseVersion(mod.__version__)
+                    if thisver < ver:
+                        failed.append(((pkg,ver), VersionTooOld(thisver)))
+                else:
+                    failed.append(((pkg,ver), VersionNotKnown()))
+
+        if failed:
+            raise DependencyFailure, failed
+
+    # run()
+
+# class x
diff --git a/command/install.py b/command/install.py
index 5d5bdaa77e..7fb46a74bb 100644
--- a/command/install.py
+++ b/command/install.py
@@ -126,6 +126,8 @@ class install (Command):
          "force installation (overwrite any existing files)"),
         ('skip-build', None,
          "skip rebuilding everything (for testing/debugging)"),
+        ('skip-checkdep', None,
+         "skip checking dependencies (use at own risk)"),
 
         # Where to install documentation (eventually!)
         #('doc-format=', None, "format of documentation to generate"),
@@ -183,12 +185,15 @@ def initialize_options (self):
 
         # 'force' forces installation, even if target files are not
         # out-of-date.  'skip_build' skips running the "build" command,
-        # handy if you know it's not necessary.  'warn_dir' (which is *not*
+        # handy if you know it's not necessary.  'skip_checkdep' skips
+        # the 'checkdep' command, if you are sure you can work around the
+        # dependency failure in another way. 'warn_dir' (which is *not*
         # a user option, it's just there so the bdist_* commands can turn
         # it off) determines whether we warn about installing to a
         # directory not in sys.path.
         self.force = 0
         self.skip_build = 0
+        self.skip_checkdep = 0
         self.warn_dir = 1
 
         # These are only here as a conduit from the 'build' command to the
@@ -500,6 +505,12 @@ def run (self):
         if not self.skip_build:
             self.run_command('build')
 
+        # We check dependencies before we install
+        # For now, this is disabled. Before 2.4 is released, this will
+        # be turned on.
+        #if not self.skip_checkdep:
+        #    self.run_command('checkdep')
+
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
diff --git a/core.py b/core.py
index eb419721e4..fba463c10b 100644
--- a/core.py
+++ b/core.py
@@ -47,7 +47,8 @@ def gen_usage (script_name):
                   'name', 'version', 'author', 'author_email',
                   'maintainer', 'maintainer_email', 'url', 'license',
                   'description', 'long_description', 'keywords',
-                  'platforms', 'classifiers', 'download_url')
+                  'platforms', 'classifiers', 'download_url',
+                  'provides', 'requires', )
 
 # Legal keyword arguments for the Extension constructor
 extension_keywords = ('name', 'sources', 'include_dirs',
diff --git a/dist.py b/dist.py
index 586e6bb145..2795b7bc83 100644
--- a/dist.py
+++ b/dist.py
@@ -214,6 +214,51 @@ def __init__ (self, attrs=None):
                 else:
                     sys.stderr.write(msg + "\n")
 
+            # Build up the requires sequence
+            from distutils.version import LooseVersion
+            requires = attrs.get('requires')
+            if requires:
+                if isinstance(requires, type('')):
+                    raise DistutilsOptionError, 'requires should be a sequence'
+                newreq = []
+                for req in requires:
+                    if '-' not in req:
+                        # We have a plain package name - any version will do
+                        newreq.append((req,None))
+                    else:
+                        pkg, ver = string.split(req, '-', 1)
+                        newreq.append((pkg, LooseVersion(ver)))
+                attrs['requires'] = newreq
+
+            # Build up the provides object. If the setup() has no 
+            # provides line, we use packages or modules and the version
+            # to synthesise the provides. If no version is provided (no
+            # pun intended) we don't have a provides entry at all.
+            provides = attrs.get('provides')
+            if provides:
+                if isinstance(provides, type('')):
+                    raise DistutilsOptionError, 'provides should be a sequence'
+                newprov = []
+                for prov in provides:
+                    if '-' not in prov:
+                        # We have a plain package name - any version will do
+                        newprov.append((prov,None))
+                    else:
+                        pkg, ver = string.split(prov, '-', 1)
+                        newprov.append((pkg, LooseVersion(ver)))
+                attrs['provides'] = newprov
+            elif attrs.get('version'):
+                # Build a provides line
+                prov = []
+                if attrs.get('packages'):
+                    for pkg in attrs['packages']:
+                        pkg = string.replace(pkg, '/', '.')
+                        prov.append('%s-%s'%(pkg, attrs['version']))
+                elif attrs.get('modules'):
+                    for mod in attrs['modules']:
+                        prov.append('%s-%s'%(mod, attrs['version']))
+                attrs['provides'] = prov
+
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
@@ -974,7 +1019,7 @@ class DistributionMetadata:
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
                          "contact_email", "license", "classifiers",
-                         "download_url")
+                         "download_url", "provides", "requires",)
 
     def __init__ (self):
         self.name = None
@@ -991,6 +1036,8 @@ def __init__ (self):
         self.platforms = None
         self.classifiers = None
         self.download_url = None
+        self.requires = []
+        self.provides = []
 
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
@@ -1006,6 +1053,10 @@ def write_pkg_info (self, base_dir):
         pkg_info.write('Author: %s\n' % self.get_contact() )
         pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
         pkg_info.write('License: %s\n' % self.get_license() )
+        for req in self.get_requires():
+            pkg_info.write('Requires: %s\n' % req )
+        for prov in self.get_provides():
+            pkg_info.write('Provides: %s\n' % prov )
         if self.download_url:
             pkg_info.write('Download-URL: %s\n' % self.download_url)
 
@@ -1084,6 +1135,13 @@ def get_classifiers(self):
     def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
+    def get_requires(self):
+        return [ '%s%s%s'%(x, (y and '-') or '', y or '') 
+                                                for x,y in self.requires ]
+
+    def get_provides(self):
+        return self.provides
+
 # class DistributionMetadata
 
 

From 62e895c42c640dfee627e9ae286a5577654ebdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 25 Mar 2004 14:58:19 +0000
Subject: [PATCH 0959/8469] Defer compilation of regular expressions until
 first use.

---
 util.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/util.py b/util.py
index 8c3c8df979..12775d6fc4 100644
--- a/util.py
+++ b/util.py
@@ -209,9 +209,12 @@ def grok_environment_error (exc, prefix="error: "):
 
 
 # Needed by 'split_quoted()'
-_wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
-_squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
-_dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
+_wordchars_re = _squote_re = _dquote_re = None
+def _init_regex():
+    global _wordchars_re, _squote_re, _dquote_re
+    _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
+    _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
+    _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
 def split_quoted (s):
     """Split a string up according to Unix shell-like rules for quotes and
@@ -227,6 +230,7 @@ def split_quoted (s):
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
+    if _wordchars_re is None: _init_regex()
 
     s = string.strip(s)
     words = []

From 74d0b875f5ca2d37ade9f60df8ab09b90db35b57 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 25 Mar 2004 22:04:52 +0000
Subject: [PATCH 0960/8469] make sure the default manifest generation includes
 files identified as scripts closes SF bug 796042

---
 command/build_scripts.py | 2 ++
 command/sdist.py         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 8de9cd3f6d..165a009ded 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -41,6 +41,8 @@ def finalize_options (self):
                                    ('force', 'force'))
         self.scripts = self.distribution.scripts
 
+    def get_source_files(self):
+        return self.scripts
 
     def run (self):
         if not self.scripts:
diff --git a/command/sdist.py b/command/sdist.py
index c0b7dd45d9..0a29addba6 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -304,6 +304,10 @@ def add_defaults (self):
             build_clib = self.get_finalized_command('build_clib')
             self.filelist.extend(build_clib.get_source_files())
 
+        if self.distribution.has_scripts():
+            build_scripts = self.get_finalized_command('build_scripts')
+            self.filelist.extend(build_scripts.get_source_files())
+
     # add_defaults ()
 
 

From 802e2d1d699ab8830e703ab229c31a7e2749f369 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 11 May 2004 18:13:10 +0000
Subject: [PATCH 0961/8469] Added 2.3.3 and 2.3.4 to the release table.  Added
 2004 to the list of copyright years.

---
 command/build_ext.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0c37768179..83364c7463 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -171,9 +171,10 @@ def finalize_options (self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6'))
+            #self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
 
-        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
+        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
@@ -636,7 +637,7 @@ def get_libraries (self, ext):
             # EMX/GCC requires the python library explicitly, and I
             # believe VACPP does as well (though not confirmed) - AIM Apr01
             template = "python%d%d"
-            # debug versions of the main DLL aren't supported, at least 
+            # debug versions of the main DLL aren't supported, at least
             # not at this time - AIM Apr01
             #if self.debug:
             #    template = template + '_d'

From 56255b44272116bc022a3c8b872a6b5441e1177f Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 11 May 2004 18:18:35 +0000
Subject: [PATCH 0962/8469] Reverting local change checked in by mistake.

---
 command/build_ext.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 83364c7463..0c37768179 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -171,10 +171,9 @@ def finalize_options (self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PC', 'VC6'))
-            #self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
 
-        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
+        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
         # import libraries in its "Config" subdirectory
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
@@ -637,7 +636,7 @@ def get_libraries (self, ext):
             # EMX/GCC requires the python library explicitly, and I
             # believe VACPP does as well (though not confirmed) - AIM Apr01
             template = "python%d%d"
-            # debug versions of the main DLL aren't supported, at least
+            # debug versions of the main DLL aren't supported, at least 
             # not at this time - AIM Apr01
             #if self.debug:
             #    template = template + '_d'

From 23064f19614cbb3afc2ce8c908e05d5bc4e11aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Mon, 31 May 2004 15:12:27 +0000
Subject: [PATCH 0963/8469] Fix typo (from SF bug #962602)

---
 filelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filelist.py b/filelist.py
index bfa53d2133..0872e96636 100644
--- a/filelist.py
+++ b/filelist.py
@@ -166,7 +166,7 @@ def process_template_line (self, line):
                              (dir, string.join(patterns)))
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
-                    log.warn(("warngin: no files found matching '%s' " +
+                    log.warn(("warning: no files found matching '%s' " +
                                 "under directory '%s'"), 
                              pattern, dir)
 

From ffd7d4b009e36c735ec8e7bead8c45c56049f144 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 31 May 2004 19:27:59 +0000
Subject: [PATCH 0964/8469] SF patch 959726:  sdist versus SVN The disutils
 sdist command now ignores .svn directories.

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

diff --git a/command/sdist.py b/command/sdist.py
index 0a29addba6..7021496549 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -347,14 +347,14 @@ def prune_file_list (self):
           * the build tree (typically "build")
           * the release tree itself (only an issue if we ran "sdist"
             previously with --keep-temp, or it aborted)
-          * any RCS or CVS directories
+          * any RCS, CVS and .svn directories
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'/(RCS|CVS)/.*', is_regex=1)
+        self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
 
 
     def write_manifest (self):

From 48fa26d6758e83a5680f95d8795ee6428d752a02 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 3 Jun 2004 12:41:45 +0000
Subject: [PATCH 0965/8469] Partial fix for #887242 (link extensions with
 dynamic_lookup in stead of hard linking against the framework).

If $MACOSX_DEPLOYMENT_TARGET is set, and >= 10.3, during configure we
setup extensions to link with dynamic lookup. We also record the
value in the Makefile.

Distutils checks whether a value for MACOSX_DEPLOYMENT_TARGET was
recorded in the Makefile, and if it was insists that the current
value matches.

This is only a partial fix because it only applies to 2.4, and the
"two python problem" exists with Python 2.3 shipped with MacOSX 10.3,
which we have no influence over.
---
 sysconfig.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 46d1acbb04..c912a15cdc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -355,7 +355,19 @@ def _init_posix():
 
         raise DistutilsPlatformError(my_msg)
 
-
+    # On MacOSX we need to check the setting of the environment variable
+    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
+    # it needs to be compatible.
+    # An alternative would be to force MACOSX_DEPLOYMENT_TARGET to be
+    # the same as during configure.
+    if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
+        cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
+        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
+        if cfg_target != cur_target:
+            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
+                % (cur_target, cfg_target))
+            raise DistutilsPlatformError(my_msg)
+        
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.

From 10fc69e6cf3fed9c530548ec7a8dbc4536ad4576 Mon Sep 17 00:00:00 2001
From: Hye-Shik Chang <hyeshik@gmail.com>
Date: Sat, 5 Jun 2004 18:37:53 +0000
Subject: [PATCH 0966/8469] SF #877165: Give an info about what C++ compiler
 command should be used in cygwin and mingw32. (Reported by Michael
 Droettboom)

---
 cygwinccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 94b8b86b6d..0101bae5b9 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -108,6 +108,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
         # XXX optimization, warnings etc. should be customizable.
         self.set_executables(compiler='gcc -mcygwin -O -Wall',
                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                             compiler_cxx='g++ -mcygwin -O -Wall',
                              linker_exe='gcc -mcygwin',
                              linker_so=('%s -mcygwin %s' %
                                         (self.linker_dll, shared_option)))
@@ -295,6 +296,7 @@ def __init__ (self,
 
         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+                             compiler_cxx='g++ -mno-cygwin -O -Wall',
                              linker_exe='gcc -mno-cygwin',
                              linker_so='%s -mno-cygwin %s %s'
                                         % (self.linker_dll, shared_option,

From 2dc3968b1f396bca0d8732826103427ffa8f3fe8 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Fri, 11 Jun 2004 17:16:46 +0000
Subject: [PATCH 0967/8469] Bug 957381: rpmbuild builds a -debuginfo rpm on
 recent Redhat and Fedora releases. Ignore it, rather than breaking.

Will backport.

(and r1.1000 for Misc/NEWS!)
---
 command/bdist_rpm.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 237cc70d25..4be9999497 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -313,10 +313,15 @@ def run (self):
 
             if not self.source_only:
                 rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
+                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'], \
+                                                   "*/*debuginfo*.rpm"))
+                if debuginfo:
+                    rpms.remove(debuginfo[0])
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
                 self.move_file(rpms[0], self.dist_dir)
-
+                if debuginfo:
+                    self.move_file(debuginfo[0], self.dist_dir)
     # run()
 
 

From f94afed8695dece39c63c0122579a9e7f823d9e0 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 11 Jun 2004 21:50:33 +0000
Subject: [PATCH 0968/8469] Add support for package data.

This is basically the support for package data from Phillip Eby's
setuptools package.  I've changed it only to fit it into the core
implementation rather than to live in subclasses, and added
documentation.
---
 command/build_py.py | 51 +++++++++++++++++++++++++++++++++++++++++++++
 dist.py             |  1 +
 2 files changed, 52 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index 6c007c6987..329b55a9d5 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -37,6 +37,7 @@ def initialize_options (self):
         self.build_lib = None
         self.py_modules = None
         self.package = None
+        self.package_data = None
         self.package_dir = None
         self.compile = 0
         self.optimize = 0
@@ -51,6 +52,8 @@ def finalize_options (self):
         # options -- list of packages and list of modules.
         self.packages = self.distribution.packages
         self.py_modules = self.distribution.py_modules
+        self.package_data = self.distribution.package_data
+        self.data_files = self.get_data_files()
         self.package_dir = {}
         if self.distribution.package_dir:
             for name, path in self.distribution.package_dir.items():
@@ -92,11 +95,53 @@ def run (self):
             self.build_modules()
         if self.packages:
             self.build_packages()
+            self.build_package_data()
 
         self.byte_compile(self.get_outputs(include_bytecode=0))
 
     # run ()
 
+    def get_data_files (self):
+        """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
+        data = []
+        for package in self.packages:
+            # Locate package source directory
+            src_dir = self.get_package_dir(package)
+
+            # Compute package build directory
+            build_dir = os.path.join(*([self.build_lib] + package.split('.')))
+
+            # Length of path to strip from found files
+            plen = len(src_dir)+1
+
+            # Strip directory from globbed filenames
+            filenames = [
+                file[plen:] for file in self.find_data_files(package, src_dir)
+                ]
+            data.append((package, src_dir, build_dir, filenames))
+        return data
+
+    def find_data_files (self, package, src_dir):
+        """Return filenames for package's data files in 'src_dir'"""
+        globs = (self.package_data.get('', [])
+                 + self.package_data.get(package, []))
+        files = []
+        for pattern in globs:
+            # Each pattern has to be converted to a platform-specific path
+            filelist = glob(os.path.join(src_dir, convert_path(pattern)))
+            # Files that match more than one pattern are only added once
+            files.extend([fn for fn in filelist if fn not in files])
+        return files
+
+    def build_package_data (self):
+        """Copy data files into build directory"""
+        lastdir = None
+        for package, src_dir, build_dir, filenames in self.data_files:
+            for filename in filenames:
+                target = os.path.join(build_dir, filename)
+                self.mkpath(os.path.dirname(target))
+                self.copy_file(os.path.join(src_dir, filename), target,
+                               preserve_mode=False)
 
     def get_package_dir (self, package):
         """Return the directory, relative to the top of the source
@@ -304,6 +349,12 @@ def get_outputs (self, include_bytecode=1):
                 if self.optimize > 0:
                     outputs.append(filename + "o")
 
+        outputs += [
+            os.path.join(build_dir, filename)
+            for package, src_dir, build_dir, filenames in self.data_files
+            for filename in filenames
+            ]
+
         return outputs
 
 
diff --git a/dist.py b/dist.py
index 2795b7bc83..7d0a7bad3c 100644
--- a/dist.py
+++ b/dist.py
@@ -158,6 +158,7 @@ def __init__ (self, attrs=None):
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.
         self.packages = None
+        self.package_data = {}
         self.package_dir = None
         self.py_modules = None
         self.libraries = None

From c32a93c26b45cb63b89156e60d7ab2218feec3de Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 15 Jun 2004 15:49:46 +0000
Subject: [PATCH 0969/8469] One unit test for distutils is not much, but is
 more than we had yesterday. We need to write more; hopefully the barrier is a
 little lower now.

---
 tests/__init__.py             | 35 ++++++++++++++++++++++++++
 tests/test_install_scripts.py | 46 +++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_install_scripts.py

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000000..7bdb912463
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,35 @@
+"""Test suite for distutils.
+
+This test suite consists of a collection of test modules in the
+distutils.tests package.  Each test module has a name starting with
+'test' and contains a function test_suite().  The function is expected
+to return an initialized unittest.TestSuite instance.
+
+Tests for the command classes in the distutils.command package are
+included in distutils.tests as well, instead of using a separate
+distutils.command.tests package, since command identification is done
+by import rather than matching pre-defined names.
+
+"""
+
+import os
+import sys
+import unittest
+
+
+here = os.path.dirname(__file__)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    for fn in os.listdir(here):
+        if fn.startswith("test") and fn.endswith(".py"):
+            modname = "distutils.tests." + fn[:-3]
+            __import__(modname)
+            module = sys.modules[modname]
+            suite.addTest(module.test_suite())
+    return suite
+
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
new file mode 100644
index 0000000000..f9a95ea504
--- /dev/null
+++ b/tests/test_install_scripts.py
@@ -0,0 +1,46 @@
+"""Tests for distutils.command.install_scripts."""
+
+import os
+import unittest
+
+from distutils.command.install_scripts import install_scripts
+from distutils.core import Distribution
+
+
+class InstallScriptsTestCase(unittest.TestCase):
+
+    def test_default_settings(self):
+        dist = Distribution()
+        dist.command_obj["build"] = DummyCommand(build_scripts="/foo/bar")
+        dist.command_obj["install"] = DummyCommand(
+            install_scripts="/splat/funk",
+            force=1,
+            skip_build=1,
+            )
+        cmd = install_scripts(dist)
+        self.assert_(not cmd.force)
+        self.assert_(not cmd.skip_build)
+        self.assert_(cmd.build_dir is None)
+        self.assert_(cmd.install_dir is None)
+
+        cmd.finalize_options()
+
+        self.assert_(cmd.force)
+        self.assert_(cmd.skip_build)
+        self.assertEqual(cmd.build_dir, "/foo/bar")
+        self.assertEqual(cmd.install_dir, "/splat/funk")
+
+
+class DummyCommand:
+
+    def __init__(self, **kwargs):
+        for kw, val in kwargs.items():
+            setattr(self, kw, val)
+
+    def ensure_finalized(self):
+        pass
+
+
+
+def test_suite():
+    return unittest.makeSuite(InstallScriptsTestCase)

From 05b7bce87c1ab146c6912af1520c1d988fa43959 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 15 Jun 2004 16:55:46 +0000
Subject: [PATCH 0970/8469] add a test that actually installs some scripts

---
 tests/test_install_scripts.py | 56 +++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index f9a95ea504..824f733601 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -1,6 +1,8 @@
 """Tests for distutils.command.install_scripts."""
 
 import os
+import shutil
+import tempfile
 import unittest
 
 from distutils.command.install_scripts import install_scripts
@@ -9,6 +11,23 @@
 
 class InstallScriptsTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.tempdirs = []
+
+    def tearDown(self):
+        while self.tempdirs:
+            d = self.tempdirs.pop()
+            shutil.rmtree(d)
+
+    def mkdtemp(self):
+        """Create a temporary directory that will be cleaned up.
+
+        Returns the path of the directory.
+        """
+        d = tempfile.mkdtemp()
+        self.tempdirs.append(d)
+        return d
+
     def test_default_settings(self):
         dist = Distribution()
         dist.command_obj["build"] = DummyCommand(build_scripts="/foo/bar")
@@ -30,8 +49,45 @@ def test_default_settings(self):
         self.assertEqual(cmd.build_dir, "/foo/bar")
         self.assertEqual(cmd.install_dir, "/splat/funk")
 
+    def test_installation(self):
+        source = self.mkdtemp()
+        expected = []
+
+        def write_script(name, text):
+            expected.append(name)
+            f = open(os.path.join(source, name), "w")
+            f.write(text)
+            f.close()
+
+        write_script("script1.py", ("#! /usr/bin/env python2.3\n"
+                                    "# bogus script w/ Python sh-bang\n"
+                                    "pass\n"))
+        write_script("script2.py", ("#!/usr/bin/python\n"
+                                    "# bogus script w/ Python sh-bang\n"
+                                    "pass\n"))
+        write_script("shell.sh", ("#!/bin/sh\n"
+                                  "# bogus shell script w/ sh-bang\n"
+                                  "exit 0\n"))
+
+        target = self.mkdtemp()
+        dist = Distribution()
+        dist.command_obj["build"] = DummyCommand(build_scripts=source)
+        dist.command_obj["install"] = DummyCommand(
+            install_scripts=target,
+            force=1,
+            skip_build=1,
+            )
+        cmd = install_scripts(dist)
+        cmd.finalize_options()
+        cmd.run()
+
+        installed = os.listdir(target)
+        for name in expected:
+            self.assert_(name in installed)
+
 
 class DummyCommand:
+    """Class to store options for retrieval via set_undefined_options()."""
 
     def __init__(self, **kwargs):
         for kw, val in kwargs.items():

From 8191b39bcc348a1b1f89d7ab3a00e6b2afcf5e94 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 17 Jun 2004 20:14:50 +0000
Subject: [PATCH 0971/8469] move support code to a helper module to ease re-use

---
 tests/support.py              | 41 +++++++++++++++++++++++++++++++++++
 tests/test_install_scripts.py | 41 ++++++-----------------------------
 2 files changed, 48 insertions(+), 34 deletions(-)
 create mode 100644 tests/support.py

diff --git a/tests/support.py b/tests/support.py
new file mode 100644
index 0000000000..cef985d79a
--- /dev/null
+++ b/tests/support.py
@@ -0,0 +1,41 @@
+"""Support code for distutils test cases."""
+
+import shutil
+import tempfile
+
+
+class TempdirManager(object):
+    """Mix-in class that handles temporary directories for test cases.
+
+    This is intended to be used with unittest.TestCase.
+    """
+
+    def setUp(self):
+        super(TempdirManager, self).setUp()
+        self.tempdirs = []
+
+    def tearDown(self):
+        super(TempdirManager, self).tearDown()
+        while self.tempdirs:
+            d = self.tempdirs.pop()
+            shutil.rmtree(d)
+
+    def mkdtemp(self):
+        """Create a temporary directory that will be cleaned up.
+
+        Returns the path of the directory.
+        """
+        d = tempfile.mkdtemp()
+        self.tempdirs.append(d)
+        return d
+
+
+class DummyCommand:
+    """Class to store options for retrieval via set_undefined_options()."""
+
+    def __init__(self, **kwargs):
+        for kw, val in kwargs.items():
+            setattr(self, kw, val)
+
+    def ensure_finalized(self):
+        pass
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 824f733601..0a11abf6bd 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -1,37 +1,21 @@
 """Tests for distutils.command.install_scripts."""
 
 import os
-import shutil
-import tempfile
 import unittest
 
 from distutils.command.install_scripts import install_scripts
 from distutils.core import Distribution
 
+from distutils.tests import support
 
-class InstallScriptsTestCase(unittest.TestCase):
 
-    def setUp(self):
-        self.tempdirs = []
-
-    def tearDown(self):
-        while self.tempdirs:
-            d = self.tempdirs.pop()
-            shutil.rmtree(d)
-
-    def mkdtemp(self):
-        """Create a temporary directory that will be cleaned up.
-
-        Returns the path of the directory.
-        """
-        d = tempfile.mkdtemp()
-        self.tempdirs.append(d)
-        return d
+class InstallScriptsTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_default_settings(self):
         dist = Distribution()
-        dist.command_obj["build"] = DummyCommand(build_scripts="/foo/bar")
-        dist.command_obj["install"] = DummyCommand(
+        dist.command_obj["build"] = support.DummyCommand(
+            build_scripts="/foo/bar")
+        dist.command_obj["install"] = support.DummyCommand(
             install_scripts="/splat/funk",
             force=1,
             skip_build=1,
@@ -71,8 +55,8 @@ def write_script(name, text):
 
         target = self.mkdtemp()
         dist = Distribution()
-        dist.command_obj["build"] = DummyCommand(build_scripts=source)
-        dist.command_obj["install"] = DummyCommand(
+        dist.command_obj["build"] = support.DummyCommand(build_scripts=source)
+        dist.command_obj["install"] = support.DummyCommand(
             install_scripts=target,
             force=1,
             skip_build=1,
@@ -86,17 +70,6 @@ def write_script(name, text):
             self.assert_(name in installed)
 
 
-class DummyCommand:
-    """Class to store options for retrieval via set_undefined_options()."""
-
-    def __init__(self, **kwargs):
-        for kw, val in kwargs.items():
-            setattr(self, kw, val)
-
-    def ensure_finalized(self):
-        pass
-
-
 
 def test_suite():
     return unittest.makeSuite(InstallScriptsTestCase)

From 7e402b740c8846c7b50ce89e2ac4013f7048b35c Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 17 Jun 2004 20:16:19 +0000
Subject: [PATCH 0972/8469] fix bug: list of data files was initialized too
 soon in build_py

---
 command/build_py.py    |  2 +-
 tests/test_build_py.py | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_build_py.py

diff --git a/command/build_py.py b/command/build_py.py
index 329b55a9d5..cfbab262cc 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -53,11 +53,11 @@ def finalize_options (self):
         self.packages = self.distribution.packages
         self.py_modules = self.distribution.py_modules
         self.package_data = self.distribution.package_data
-        self.data_files = self.get_data_files()
         self.package_dir = {}
         if self.distribution.package_dir:
             for name, path in self.distribution.package_dir.items():
                 self.package_dir[name] = convert_path(path)
+        self.data_files = self.get_data_files()
 
         # Ick, copied straight from install_lib.py (fancy_getopt needs a
         # type system!  Hell, *everything* needs a type system!!!)
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
new file mode 100644
index 0000000000..6cdce2c776
--- /dev/null
+++ b/tests/test_build_py.py
@@ -0,0 +1,50 @@
+"""Tests for distutils.command.build_py."""
+
+import os
+import unittest
+
+from distutils.command.build_py import build_py
+from distutils.core import Distribution
+
+from distutils.tests import support
+
+
+class BuildPyTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_package_data(self):
+        sources = self.mkdtemp()
+        f = open(os.path.join(sources, "__init__.py"), "w")
+        f.write("# Pretend this is a package.")
+        f.close()
+        f = open(os.path.join(sources, "README.txt"), "w")
+        f.write("Info about this package")
+        f.close()
+
+        destination = self.mkdtemp()
+
+        dist = Distribution({"packages": ["pkg"],
+                             "package_dir": {"pkg": sources}})
+        # script_name need not exist, it just need to be initialized
+        dist.script_name = os.path.join(sources, "setup.py")
+        dist.command_obj["build"] = support.DummyCommand(
+            force=0,
+            build_lib=destination)
+        dist.packages = ["pkg"]
+        dist.package_data = {"pkg": ["README.txt"]}
+        dist.package_dir = {"pkg": sources}
+
+        cmd = build_py(dist)
+        cmd.ensure_finalized()
+        self.assertEqual(cmd.package_data, dist.package_data)
+
+        cmd.run()
+
+        self.assertEqual(len(cmd.get_outputs()), 2)
+        pkgdest = os.path.join(destination, "pkg")
+        files = os.listdir(pkgdest)
+        self.assert_("__init__.py" in files)
+        self.assert_("README.txt" in files)
+
+
+def test_suite():
+    return unittest.makeSuite(BuildPyTestCase)

From 08d85503d984dae19579aaeeca76e8c4b5322d63 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 18 Jun 2004 18:30:27 +0000
Subject: [PATCH 0973/8469] Rebuild the wininst.exe files.

---
 command/wininst-6.exe   | Bin 21504 -> 61440 bytes
 command/wininst-7.1.exe | Bin 22016 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index c40cbcb5a0adbbc15edd7005be0deb672f9d08c3..8ab173b662012ef4eed68d00f4704b761c182bae 100644
GIT binary patch
literal 61440
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
b9S7<-P{)Bf4%Bg=jstZZsN=x@haC7ncVh9!

literal 21504
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

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 89a78885c93bd4458ac5bcb71800662fc35b6802..858f6f2296b3ccfa8008f5d3575aa0b2ce5e8372 100644
GIT binary patch
literal 61440
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
YfjJ4xNnlO_a}t=7z?=mBFO<N407NHL(EtDd

literal 22016
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
N|D1^b;eT}o{ttRghu{DJ


From 302974208f3aa3d5b7922d68e8f9026e909e17cb Mon Sep 17 00:00:00 2001
From: Sjoerd Mullender <sjoerd@acm.org>
Date: Fri, 18 Jun 2004 20:39:11 +0000
Subject: [PATCH 0974/8469] If self.packages is None (this can happen, I saw
 it), return immediately (since None is not a sequence you can iterate over).

---
 command/build_py.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index cfbab262cc..3079bfcdef 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -104,6 +104,8 @@ def run (self):
     def get_data_files (self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         data = []
+        if not self.packages:
+            return data
         for package in self.packages:
             # Locate package source directory
             src_dir = self.get_package_dir(package)

From b48d7f0f6502934c6ee3cc6d3d2d2ec6a602c651 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 18 Jun 2004 21:28:28 +0000
Subject: [PATCH 0975/8469] fix typo

---
 cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd.py b/cmd.py
index fef49390da..9362410487 100644
--- a/cmd.py
+++ b/cmd.py
@@ -68,7 +68,7 @@ def __init__ (self, dist):
 
         # Per-command versions of the global flags, so that the user can
         # customize Distutils' behaviour command-by-command and let some
-        # commands fallback on the Distribution's behaviour.  None means
+        # commands fall back on the Distribution's behaviour.  None means
         # "not defined, check self.distribution's copy", while 0 or 1 mean
         # false and true (duh).  Note that this means figuring out the real
         # value of each flag is a touch complicated -- hence "self._dry_run"

From b20a6ccc211060644ff3e6f89428420fa59f5a5d Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 21 Jun 2004 16:15:22 +0000
Subject: [PATCH 0976/8469] add a couple of tests for the build_scripts command

---
 tests/test_build_scripts.py | 74 +++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 tests/test_build_scripts.py

diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
new file mode 100644
index 0000000000..0cfef4e5cf
--- /dev/null
+++ b/tests/test_build_scripts.py
@@ -0,0 +1,74 @@
+"""Tests for distutils.command.build_scripts."""
+
+import os
+import unittest
+
+from distutils.command.build_scripts import build_scripts
+from distutils.core import Distribution
+
+from distutils.tests import support
+
+
+class BuildScriptsTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_default_settings(self):
+        cmd = self.get_build_scripts_cmd("/foo/bar", [])
+        self.assert_(not cmd.force)
+        self.assert_(cmd.build_dir is None)
+
+        cmd.finalize_options()
+
+        self.assert_(cmd.force)
+        self.assertEqual(cmd.build_dir, "/foo/bar")
+
+    def test_build(self):
+        source = self.mkdtemp()
+        target = self.mkdtemp()
+        expected = self.write_sample_scripts(source)
+
+        cmd = self.get_build_scripts_cmd(target,
+                                         [os.path.join(source, fn)
+                                          for fn in expected])
+        cmd.finalize_options()
+        cmd.run()
+
+        built = os.listdir(target)
+        for name in expected:
+            self.assert_(name in built)
+
+    def get_build_scripts_cmd(self, target, scripts):
+        dist = Distribution()
+        dist.scripts = scripts
+        dist.command_obj["build"] = support.DummyCommand(
+            build_scripts=target,
+            force=1
+            )
+        return build_scripts(dist)
+
+    def write_sample_scripts(self, dir):
+        expected = []
+        expected.append("script1.py")
+        self.write_script(dir, "script1.py",
+                          ("#! /usr/bin/env python2.3\n"
+                           "# bogus script w/ Python sh-bang\n"
+                           "pass\n"))
+        expected.append("script2.py")
+        self.write_script(dir, "script2.py",
+                          ("#!/usr/bin/python\n"
+                           "# bogus script w/ Python sh-bang\n"
+                           "pass\n"))
+        expected.append("shell.sh")
+        self.write_script(dir, "shell.sh",
+                          ("#!/bin/sh\n"
+                           "# bogus shell script w/ sh-bang\n"
+                           "exit 0\n"))
+        return expected
+
+    def write_script(self, dir, name, text):
+        f = open(os.path.join(dir, name), "w")
+        f.write(text)
+        f.close()
+
+
+def test_suite():
+    return unittest.makeSuite(BuildScriptsTestCase)

From 08c14ecdbb73fbb9036506e74a2bdf742ee5b13a Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 25 Jun 2004 19:04:21 +0000
Subject: [PATCH 0977/8469] add boilerplate so the test modules can be run as
 scripts

---
 tests/test_build_py.py        | 3 +++
 tests/test_build_scripts.py   | 3 +++
 tests/test_install_scripts.py | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 6cdce2c776..757d757c86 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -48,3 +48,6 @@ def test_package_data(self):
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 0cfef4e5cf..7ef71cc120 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -72,3 +72,6 @@ def write_script(self, dir, name, text):
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 0a11abf6bd..2e86dcd8a9 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -70,6 +70,8 @@ def write_script(name, text):
             self.assert_(name in installed)
 
 
-
 def test_suite():
     return unittest.makeSuite(InstallScriptsTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 1bf1bfa6924e28ef13c43dd27d35ca94b988b36b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 25 Jun 2004 23:02:59 +0000
Subject: [PATCH 0978/8469] Make distutils "install --home" support all
 platforms.

---
 command/install.py    | 34 +++++++++++++-------------
 tests/test_install.py | 55 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 tests/test_install.py

diff --git a/command/install.py b/command/install.py
index 7fb46a74bb..3c36ede622 100644
--- a/command/install.py
+++ b/command/install.py
@@ -242,19 +242,15 @@ def finalize_options (self):
                   ("must supply either prefix/exec-prefix/home or " +
                    "install-base/install-platbase -- not both")
 
+        if self.home and (self.prefix or self.exec_prefix):
+            raise DistutilsOptionError, \
+                  "must supply either home or prefix/exec-prefix -- not both"
+
         # Next, stuff that's wrong (or dubious) only on certain platforms.
-        if os.name == 'posix':
-            if self.home and (self.prefix or self.exec_prefix):
-                raise DistutilsOptionError, \
-                      ("must supply either home or prefix/exec-prefix -- " +
-                       "not both")
-        else:
+        if os.name != "posix":
             if self.exec_prefix:
                 self.warn("exec-prefix option ignored on this platform")
                 self.exec_prefix = None
-            if self.home:
-                self.warn("home option ignored on this platform")
-                self.home = None
 
         # Now the interesting logic -- so interesting that we farm it out
         # to other methods.  The goal of these methods is to set the final
@@ -405,15 +401,19 @@ def finalize_unix (self):
 
     def finalize_other (self):          # Windows and Mac OS for now
 
-        if self.prefix is None:
-            self.prefix = os.path.normpath(sys.prefix)
+        if self.home is not None:
+            self.install_base = self.install_platbase = self.home
+            self.select_scheme("unix_home")
+        else:
+            if self.prefix is None:
+                self.prefix = os.path.normpath(sys.prefix)
 
-        self.install_base = self.install_platbase = self.prefix
-        try:
-            self.select_scheme(os.name)
-        except KeyError:
-            raise DistutilsPlatformError, \
-                  "I don't know how to install stuff on '%s'" % os.name
+            self.install_base = self.install_platbase = self.prefix
+            try:
+                self.select_scheme(os.name)
+            except KeyError:
+                raise DistutilsPlatformError, \
+                      "I don't know how to install stuff on '%s'" % os.name
 
     # finalize_other ()
 
diff --git a/tests/test_install.py b/tests/test_install.py
new file mode 100644
index 0000000000..c834b91b38
--- /dev/null
+++ b/tests/test_install.py
@@ -0,0 +1,55 @@
+"""Tests for distutils.command.install."""
+
+import os
+import unittest
+
+from distutils.command.install import install
+from distutils.core import Distribution
+
+from distutils.tests import support
+
+
+class InstallTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_home_installation_scheme(self):
+        # This ensure two things:
+        # - that --home generates the desired set of directory names
+        # - test --home is supported on all platforms
+        builddir = self.mkdtemp()
+        destination = os.path.join(builddir, "installation")
+
+        dist = Distribution({"name": "foopkg"})
+        # script_name need not exist, it just need to be initialized
+        dist.script_name = os.path.join(builddir, "setup.py")
+        dist.command_obj["build"] = support.DummyCommand(
+            build_base=builddir,
+            build_lib=os.path.join(builddir, "lib"),
+            )
+
+        cmd = install(dist)
+        cmd.home = destination
+        cmd.ensure_finalized()
+
+        self.assertEqual(cmd.install_base, destination)
+        self.assertEqual(cmd.install_platbase, destination)
+
+        def check_path(got, expected):
+            got = os.path.normpath(got)
+            expected = os.path.normpath(expected)
+            self.assertEqual(got, expected)
+
+        libdir = os.path.join(destination, "lib", "python")
+        check_path(cmd.install_lib, libdir)
+        check_path(cmd.install_platlib, libdir)
+        check_path(cmd.install_purelib, libdir)
+        check_path(cmd.install_headers,
+                   os.path.join(destination, "include", "python", "foopkg"))
+        check_path(cmd.install_scripts, os.path.join(destination, "bin"))
+        check_path(cmd.install_data, destination)
+
+
+def test_suite():
+    return unittest.makeSuite(InstallTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a6850a7120f88d68c4e2f8413120dce52e8b19c5 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 2 Jul 2004 08:02:40 +0000
Subject: [PATCH 0979/8469] Fix for SF 982215: bdist_wininst - Next button not
 greyed out during file copy. Patch from Mark Hammond. Recompiled binary.

Already packported to the 2.3 branch.
---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index 8ab173b662012ef4eed68d00f4704b761c182bae..efa3bc4f1f8a2632e71009b24317e5417f2a0522 100644
GIT binary patch
delta 14456
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
z%0D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
XeFj6*(m%X58ll_0O*eIXG4;OyH@wYg

delta 14669
zcmeHudw5h;mhY)b0R<FR1ydLyVAN`e@-SKi6GNN=QW%iOfg)AZND?CnoYYMqCZ~``
zLIo@3q&#FAJ?Mum-3<-XL$`K!+5kpH2qqBdVR}#?M5VoqP4^tE-0r9uro0_F_qX;r
zNs87x-Sgf1-@Sa_s{LAf?X}lluf0!bxSG^(HEGvegYrV&g3$OyKkxQtv_}SE=InEk
zLbNZ<{&i#(%Ht1rvXaJEFuaqI-=LiR@P$YbN{{1*5gz67hkq4$0_7iOosRfWuB=!q
z&>T+x$GbUhiNVC3yyt>zu<t5ol}8zp4S$sHH27}o`~k=9qoJ!Dw|cz%g7NVY)f`t~
zeBthiqi2cbn?(#Y$e$ag&G{k+Rg7^iy+kqi&xPJuWu;;%I+XkH(*j7RvUQp9jd3qz
znqRanH?+vS?LPc&wRPcle)6;UJ(WBSzyBjS(@-x@89%wS#l<zd&jdc_qeT}L#{(QE
z)u)9!(<1GnC8CP=^TIA*#3m7riC4bN<T!usX}@?o2FLM29R>p?^>Vn=;=BPIUU?7_
zh_w5~SsFrFi@bMyn&FE4*7*0Q-?NhAnj<|oRh3t4sAE>cu@RTiUL)SF4G1lu$Sb|_
zk=th*-jzSQy~t1^7o@y=`x&0&)LK*2Jupb2MgBY`&G3qRn>}@M14eaH4}iH_Xcfx~
z?EX-*+rkSwTV0$Qw5ayidt9`7q&;XX>OfB*NhwL<IN@Rk5bTGv(V~t*srN6;Gbq!(
zecp~<vjIEI>jXv4>k9?b1%+0(U#WIMK%!GPk0!6$d(b{WSk3N%Z{tw(>qLTfp^YeH
zo%@jJ9PD;+et#_2sUA=JB|3rw>KxTx@HBc!{`ZAXn;+Y8vl2sfzg2_91HwTzc{cW@
zO{OzzFDX9TA(_5T1zLdPn<H^LoB%M0Bd|F^@6traB!flIVl`pc5Hqo#%ei;lZON{2
zak;1K$MQnj5m~sy5waa2zJ|o@h_qW97eXp*r+a>YB@JGo38iYEJ2bcVu#3BX2&ydM
zs0-sOg+oA)%)FYc(e9-2CT&~|UZs&0Jci7?a1cYWYRprESI{qyO&uL-puW{P!Co<y
z4fL`JGqee1G?<$c>=P%c!E0>1kB#SR<M}i`DJR%3PGf`pY|w$hJ9r@-gNcU$dBz@V
zj$Hg&RRt4v$p=(5_>kiDLZNWRk~`k~5)B3nD;b$okeSP?K}F~vk|dpsd@A+skPGr~
zw#OWp#Y<*&g&FH>71d5-37YE15kgT{tRPh-(Kcg_;JQ`zDWvLWN!3YFf^pS815}`X
znN$dK30ps1q894i(aV`Q&J!>^(d@QCF}ML0+p!4Li)ovoXOi0-?z9zH8x7bkit9KO
z6t7YtZYvOr3&gt%tdW~&@9(@!>SS$v1q~vz84F&277gp0Zkt!i$^aWDuiAW4eG1f1
z2*HO!xGkit-N5$=#)OWN;_E-fRE;Sx(+TnN$|-dD{nvM)2xMwwLN%5FLc(5SwK^~2
zc;aJ?h9F`)IKRLw^r`mhr$f3GJtnLs1SR}9Xv3_6bAX^Yu|(`;eR<_mT370cO}d3}
z{w;*1jwjA`cmrnDUWb)b(P5GLRC@;M(UJSl!_@rIg(iPAi>k$tf4(k%XS+AYZ9Yyy
z7qj^0rDlGGR}Dhdxn#)4z6Klj4xSAR!QQCt11PF}wLEo7MyNsS(U1Z*VHe{oYaeq1
zbokD8=#MvGD9*_`ht<Wra2}OLF+1Q8QjbE__F;;C7EE2j@sVP3I6f-)&s`%JDv9G{
zluegT7k7XnDP*|U6|N6itl}MNFhvd8NVLRPDi*zd7;`+{W_P;}7J$w)bV@w|L$nC;
zPe&s#<`w^ceC0eV%m523w0{AEaLmY23tP=5o64I@NAFQD2MnI5I|a6Z_VM&n5R3Ao
zML3tcd2hfPuzIA)`4~|z2+(59Cl#RWRkkmZ)qCy?EkOg!XuLSEd`Yph{fV>h**I*Z
zjk6)jdO<E+Z&_w-+zsA$)LU!@Xm8|oG`vt-vrqX)RQLD5IYU!Krp7fu5lEGNs@(*t
zD9k8$<qS}}OpdFt3Y<(|2reTV`^2^^7?-ka_=P^w82quIAjbIAZeibP9LLvs!-XSc
z=7^CJ$UFugm9k^AIhzdi&VUhSR82-h;$^F<_7sqHw$rx4dFR0>C(aM&f#VRz1#`Sm
zOP~%wVWhtOG#ub0eoS-0ZAs@>tPGf-d3K(Jc7XOsI;`3`5Y!LbhSTiRPqUwBWU*s}
z{RRwDT<w+$2c$ESyFb89KR?|)uu>|FPcQ6CI=S+d>F>$BV?rp7NfeI4bq<qp`^Yw>
z#l>|5EohpJtWiIrt&RHHEKq*s&Br)SYILNa?kV(!m1RC_<L{sy(qTtB`lOj8@R{#H
z(BgD>Av>f7^b8E0xQY6@+%9W`L*=BRxv)ZxyZ$-mvlGMt+Q<(L9iUge^v*5_oXzzJ
zz-#b99(~}MSI(k|)A9&7?u70)&@FG6HaS#)&?-EKK}@+Mb%6NnhCHGM);!IPj&xEJ
z{>`EDr;~4Vq@h<kdMv~gqRwICf(sad`vwW54-v3@8-dt}wk!8Rvtaq>NWnmgj9!{d
z8WBj+b;PS)fa;~x$kQ^Wg-A)H$+X}JN{4*HA0Z`R_=LW}N;`O0{(wx+C$x8?`dd^H
z3a)Pk%ikbMdIW7r6<)z8N#Grt&U=)fVV2+T(dn}-0yCLVpVv`cV5?64Bx6!26LW-4
zD4uW_`vAQ()xHzb$FkwLF?g4nMHp%pLpcZ(#+hbMz`+EYYHz}Xn2p6wjd43;A#tvf
zi4ZNtoAVv%9$xwPe1w^NM+Tp#{0`M{XG%kz>5esGGCEWBT=g^t{C@Qr6Z+D4<xOf*
z)z9k!v)kk&_stBEK8E9J&=fGljDaK{vre2xf^C)*7s2i9=p+T#e9w+v8?*=!-Q)b2
z7w+VYoJUY_(9t49adMR~Na)ijXZv*r$t=K^G`ssf_=hxL4?JTq9<A?({!}BRApl3d
zfI%SMGB@M4sqTT?4j_oB*{Nbm^U^&lc;#OgU;~JC*2q5qm#AntpwP|~tXu0TfR_<=
zYdzu4RM>vBzE|V0IYNUTIMX2pgGJ4<ed_p-g|QpV(X&dA&;X{HhsuC-qHd)*(g*qD
z)G0RlK|&F}mx!VU`=F?xf*sOE*)9iD8XKc-ZJdDRi&>IGm;uA;5=7rNla0HbQw-Rh
z)abC-2Hl2y{*lzsix4t&@2~?F#<5&Oh(X!Wk%11)c@K{EY6IzPfXqaRj>2ri>g&ru
zMaP0+k>CF&mDu~t!AQp(sUV;SiqNp5(IbVxLIWw;v9=+<FdP^19Vx?6;Sewc;tGM_
z`dLT|`=fnGE_2?45QR81k79x~@-vJLnWxSu)4vc!9<uxE5>0=d@y5*56P?)tyXqQo
z5vGSRPI+Y>oLt)pbguD><CqP2l<nw*DJyj}xQ_-ok8*URu1Jkpn0bqlHGKsmV^J=O
zJ?;-3#0=886BOyhi4EDDXcwB=T%4~E`Ck?dD@!qiyAUzLSsQ-~UIbCc5Yq2-VS#<{
zMQWA_(cc4mPgm@JP*s>LQs1!x4^-t{Od2M!53O*X(&6Gl+&gnI{w_H)(Iuo4S;&VS
zakq!bb}$(&R94}X!73QHi7D{x$_qr*uX&g!p>R5nVtzO;yT^t7<O-($l%g>Nl2V^P
zazjkUl}LdQK@hHisL>s*2tEPoOFm)$8So3Wp=^)b8Ley5%q9FCCL8|&LeVlXiwCw&
zH%!V<gqF8xU){o9Dy1IOc2O<r4w+G})9MJ-LZwz6Ky{5)?N_^<H*#2h8Z_ZzvN-n>
zaY0VdEIyhOjEgxr!2xkL-IE^3JuOamp3R|~LZ^$fzH~BbRtwGQ1(y8{C@CcKPRf1@
z<I?F^QuvHoQvAf4vmHBnc>{tkCBO*h&KtfcJht;J$c>a-rg^a&);CY$f*|FQ8|A(4
zka;o_^XMmY+50Zt5xj*%9iWgRWu2FAWKSP`2HSwdEH(1|IgUr#2U|$L@*OjHT>s;r
zldhy{p=y|hIw$e;;mMnF(n8wZ9+IWIJiJ$zdw?!{YBw}(IlF;r_h=!Gby!k>1Q)0{
zHj>>8-Jj}D9eJ1;H0vHw`3;(gS9(+J)-HG9UW?ZU-t32Q<RLtQ>~BFu%6c8Y;da-F
z-EU)iKJtUzY$V*Ct~a$fM-Ex)3wNeRZUk=^1Yj$F3qR|J_^*G4BSD-ndzEXXcTso$
zpz7(19MTry2Wf{uT<s3m_d`jojd;)E-pK|<k8&S)M^-x<4X{EtoP)$=-ah<NKFUYk
zX7w_2_j{>}TyD@Db;s4q5^l%&nFbsYU67=BxHAI}NRN1Y%13iG`IsJtM-LE2Xb(^@
zF{!J;kqMdXM$@P4#03@3lWZc~>4=RL9JI?#==GCa?7N6A_VxtjnC!m%*V)FOnZ};C
zkuAeyAZe-3*`C`Y=HiAX&dG7d#RqfT1LBO_J~4wSKht}kk`4ip_9Oqrw&+#O2%iS^
z?;2Ep#!t96<rapr-_eXUol0h`W~xD2A(&+xn?s$LQ?x1>>qV^!V--5JY9HBc)ZLr=
ziM8>0FandcHtt}RxL8MK`wW?F4ZVR>!PqK<HcV76NO6DeP4RDp*NF@^A{?a30rq+n
zDx`b=0eXfyF8q?t(TmOT>Kq`(!>4U<xjSyQVW94J5cmOlO_SVx2k6aBa`zsfhbve?
z62;|W1ZH+sOoKID!wLDEcpvfkn%&oMm4H2occF?iS1_j4dg*dLgcJK%Kh7P!X>g*r
zgADk1&@de*27F$YscUIcZkL!9j*keY1#CWH_c81;@m&B3)OSI^Cp2ILt~cSy;5fx%
zDbE5HJaqdGHAk-DnM|kzCa+%BTg(JCjXyxI9rOx=rwL4wCbu*0(Z0ZXFW|uibM=WM
z;5vYLjA7D4gx1d^mjxMIS;>(KnZ&TxGx0*Wvj9ji;KZQn6&%OpNz)%B_An$^7<-8u
zVRk?%QMkU(5KPnXc!4A(^h3D@SH$TGbcfa$NnAs?2DG6)^UC-f@>Z!Xq=+OEK41uN
zA)$w81(9{8YEExbU~sSPY<eP3`b3QvHdAM49}&?-fHw{z57`U57==Nh@6_m#o59*@
z)?Vls++(kn1*rBm41_yfYOq&x6T^h)AcZFriSf$9Y}!q_>o`yS30ng4U%#6W<e+WG
z`z>3c7-LvH=!Dwn`l|fyVXTX%1+TTS89F%lw$S*1*5DA<tdTuv;1ZBCnS#8vaU7b*
z8*oU{X?j<?2_?#&Ol@nZ@e4G3QXb`|!qs>2Ls=E}8!hVVa`#_EPqYX=w>i>FYRqn9
z%1ZE{cbowNuVf8%czGoQ4febR_H#SLNzKhPbp;D9LJQ%mc2Zqvjwhr=DQO%FQIlDS
zI_Wx2_OZf?5MWWEzcz%*6rLCMVeT!)HWa=fbB0Ne^n|(V&oKpKh@%K%zk-FO$yZ4S
z)C)*v@P$Cz7#vO1-KWfqQ}CngYA&uRI2#%b7<sQ!1VMopx|OB!`pPch$;ACw^fW9s
zfsG3;3?ky{`}O<386!iqZwkQh!dfWAHHb764^()#LmCGTkeRYrriHQ;ij@?`*p-PQ
z72;pR!7M`4v3V^I!DG&4p%0clc%~Fj2h<BnC$>^TniX5QncXm)H{j0gym$C&0S(Y@
zGC5hKL%|e<M<5s`%x>UbFMCsBxO5``$=EdcPY+BCCEQc#&2Tsu4UTBD9Usg%Zw+FD
z8D|~F^>8I<RSH*n_DLD19>geevCzf>o*vG6(b@Snygn#UJUg4S6hW+wg4oglYvV6i
zC2no}F{|`j8^4cA?uXXKmsm%iwQ(nPoU}GJvW{LcBo$e5KNQ96v0}AQ28KL(szO@g
z52mq0_28I=xfs;WI)pR9ccR!rAp?E4W`&RwVx&(=f~M(@orMF46$tWiwXh#5M28F8
zLChZ&Fyi_@9Q$_kT5xoTTVAZg!bO%AE)Y?1*QQ^57CMfsqdC$~_L>kcw4T98!7Na>
zQhaMEW_JWy*slj!(Ssy%tl!z*T;J)u@#SmH_5IOc-)pZ)lgr?!1D4m=(5`53=a;XY
z;LHf8UGDZw$Shjlsmh<_r5KCSUVQW}qdHl>`_a^?NAAJ4yOEI4%PCO0+~+m`xy#-2
z>zOn{iN}CfE_pORwDlo4uR^a+%{l|klk%#u-n+~caFZ>3hu)cZ&+!>2AXo=}yl_tW
z4qE_bPjN^Y!|c>TeHw*A-Xo+9BNoDuoCe;fSRSXO;RNsz1mVCV*iM8PNqzB|m9$xd
zz_Iz4wB7@B4Mb-j&K6HpdM91q0%HVvs`Cg}+0f-7;*=G5gdS3cbNGQFvdyt?KLUAT
zk8n(zB81p3{t4Xi2lj!O@+BqT{=q194h-!l!QiGBX@5c-1x*mBj~-f)15uk^sGaRQ
zI!S1hGD&WWH`4ACH%j$3DQJG)+;~=87gmj%N*lgf6I}Lufx*@ARc77dhOeC4r-T~5
z+8|mQzN!i4x=xQAw=m{p#p#h_7A{{Nn}+WS0W-a+o0*nc=8g%DAhhL8Bk_%A;quss
zrrQ>}mctRh5=+8j4O59z;-Zb7N0c8zM?7?Alk!NBpfx=RI8cNu&rX8d3tmf!2Cu?z
z;hxQT@yHXUaC}9szBe^gi9_I{c%;I6mi-)-Ux!uh@Cr|&UvS|Ew|WRnd$oj9!k67Y
z!Uks3w86(c3qG-3mh$MinfH1F$?9c3V8f3W(VnoqJWSDk9>k@-KoY7KQAN@7G>l3*
zJ(z^<=zWqxtk>5ZIY@R!S2{ep!8Po}rnF83kA0L|wdw1Fklu4x>mffcWr_F|4p9%g
zC}?v}?4=IvlBQD=d=2O$2i~ob(T7>e0)de62J)NThl;&;j2wxt^N3c>?%rtdP?!56
z_(PWBKE!K}FkZZfG44FPM;`rP(I_khho2!=J~%NX0e3;5$b(x;+#gZ>VtvCj?y<la
zJO?;$urK;a4e8{Ccwr<S8NJ#Q_t5)ds+Z-(j9@}$9Gl6uV>dxS(9;QCp`Gmq%O+r9
zfA?yScI-`#ZfO2Np|4m0f&XPb^M?7X{6FB68{)I)+xbMKru<mrQ~vcssUa2+jKv-M
z2hhJToNd@{vmPHApywBkHsX&ZOXEzap;sFHylGzesu?PL9{NQlT#Qd^kKl<0gn1yb
zG{hhL>*<9O3GQM9$?Q_d?4FxJ>MCUs;lL9l#BS%u{@f0~nCuD^LG|dXOP@dYOMj5w
zhv^}rY05&J(R*Z+1Ik>?XAixNi!tQ$bh-OX?HDRTRDgjVCVoR&7N<QloYWo~R`}RO
zz8ktoxtYiFpJZ|DY=OzLIADGwi({gucND2F_e*gOl$#G2p)p?N<r{dB33b}?pt=pg
z|4sS@G1DX2H?y!7aDPh@2AyQa8AtX7r{H6m*ia7U8_vLhxQixtW;E^13K4Gh_vyDp
zoCpJ>n$QRBfdbsB<4mr~wfiAdKjOQ7wQZwkUgZ<?l7|e}o0ELx?t&y^972~{8H4?a
zqbcvgxx{LvdW$e{5<2*dN%{W$@R)Q&Y+ONaY*n+{%m++fq4$^YF>qK7nvv4YHaTGP
z3Oi}8##$_cSr%zD%W~9bbRm$zBbN$Jz^WqfAw~Ks1g@{EAQ{LQe1`Fda&O}Cw2W}B
z*F#J2{w_`K1HtBqLXx0xgsht#u(h!jTj_F}Gf-&bymJ0N>;T^r$$ZFq?AGIrS^tKq
zi6%5*(1f(1VLK8-Ny}oL$b@OJL7Mu<0cmMGYWnWH+@(r%X}oSq80%uYVF(n@K>b)w
z^K{n66JQ5?e;daUFA_HA4fa)moGo6jzWXQyVS-wMN}Rr$K+W+bd=*3>*oI|=kKoqG
z1xN%hS1f<YJ#GDa7qzo?f>6L1t&c;*B^XvSJ<4UsM6<PV+8ilWmk^z&z=1G)GnUHj
z3c5YYzx+v6>DVWQRCn+7kFf!E1_3;1{f07!>ucyN*dIRNJ7(kCKnTZ^tc|~<t-1%U
z{{&?s{a)DhAboLS;>g8>k)X|^jMP{Dk?QV`l{bgjF(b-=$@WB4vqvezBYtdtBC*&1
z4C5wYq$gtRNyHfCQL?d|KkSa1)TMpa$oq)9&Ks}*rm5sVLkKG)h?NxT!mFG9#~x2#
zAu-VVRXUu7wgTPqgZ)B2mKe$nQeybap5DRnejz<^&=zoMBZ7sxbt_OR{sUa#)g5nB
zQYas<>zPtM9C)TOVH(+Xhu3$UJ;_jl;H3*F<p%<NeDErVA$b1*`UHXF3nmNI@457I
z;;%<BCeWu0fpR^8-YT?j7WmGHA@-$09Hq?ZhtLAyJVN5+QkQ*=nu+8xQ~5E;${+ii
zz#4E`4JBiq;Vze$78ofASO~lBB{O5*c9bv|U9k~DDheo0=EpRfT|Bf;i-^2P+2p+R
zDIsw>MSdv!ZcO(ghcbHEZOwidZDe(AC~zaY9R8EaUjHW%jtQAj3kE!JotKf0N=waA
zb7DG0@{tP77{XtAEHQrOn?BDreV!$(+|xYUCKaZJ@4;{ien;-e;U6C{Ql5GD{UQ3h
zgXs%R(o&mrlciwO7n-An>D%#*gS`y*_#+=%8(-!~zXzZ$JVR3Ld%+2GrOHEZO*9}J
z(j>A+8(8IR=XqY;Wa2#mqw>+e&})Ah9#Ao733~C`$o_a{DO`xs?Ev+<Q3ePk17enz
zrs8Zc5H;X0ETXAMR6!GxjNuy<78%sZ7e6Ek>zZ?p{>f)uFDBboBc^W8$l2})j_O+I
z$Xwl8Id8hrnCX*WS#Zg?yH2jozt7lEC%>BSHVSp}r}_DJ?5@M7xOBMI8>g>|HfZ0H
zE?4T3y4F1RO`|azWx)dm!$G-f(G*(&{C3xZC8Hsbt_1}JTjf_5J#2K;$rl$@8clVr
z^B1o+7|(2#_dcFW#fOg<j#svUcq%67bUU}Tx|X<%w;w`(%qp#NERpIQDP8kZ4{ej>
zWs8hEx5=L@TW%D$wLY-?g2A|YTdQfs9)r=fP5!~k=ZxvwTBmwC3`X-dIkxIaW8c=+
zrG>H~6kFipa@;QNSAaPSUEKEorpKW5fNsE}1^9a}z;_n8xRrn+K<;7}_ftUT<1X$O
zfP+h1+|K1LZv6@u_ZDER2f7WIzskk^H^9<D7x(V~6|mat;@Uyu5@6(FR}wdAvHX-T
zV5pP-**DS9)T;P?pY&ilcG$&Df~X`VHbYwC;JfCfx@g;}htkE-U2bkH#$w|k7#;%0
zPSq!pjrW?jV_Lo=vjAmum19OMr>&_Te_LWSavZ(_&TczX-|8%$XEHWzmp46?5o&r4
z+2GL+q?DJMp2el@lGH=r3QxvTr5WFE0u9M;a$fq5ilv+>k*4Q?azT0ze}-Z``UzoR
zcKD>pdbC|KMHqoo(nnbK&j_5_@hPKVdWli!z!d5H$<II}bVaA~U*v%(+{(r<57I}@
zQ{Ui0=irnygYkg*&Qngf%=4%*P6kCl+qWLQ;!I(ilX?<Fapzx<#4rm^h#_GjWXL%B
zrWiufc`T;O;1)il9_OWR9EElem!ui&C}<OxzHuJIT#z7!xge2f3`l9(Ih+cgl)qPY
z*DN|kZQFH@@zUIP=^(NE*TZwQb-#Ab#k%spm1U6jB$xXPm2yS-+>vcRfUQ)^ua(~)
zx&n`=hR0o{LbcB(hcxb52goCt%Ve#qthIjzHMj%UfT$!J@H#fR<vl#}S%k{<<fI%J
z_A9@I+6k5xP&ea8`8AsRuh4w=?q>IHJSFv@(d^!fkiQGCkG~DyE-_Ou(HyQternx%
zGu`rerQvex`|JL@IW*@VIc_Q-1#k?HaOVL(2N==rLwOZI|9bax+)V)e+l9Vrz>|Pg
zfC4}^AOo-+K>soiaNJzLGQb)@HDEj7WxyMN_W<1o@Tl+^DmMY+4|1FX@CaZTU=5%e
zkntlB2TTOc5|mE?Y5+}umjMR>#{lO59|4a41k9q01IAzu{rl_?$6Wz@0QeQ49nc0i
zbST7edr^52&;-~HFoA#tFcB~VFc(k&PylNHm4G_H^MJj8djRJFR{$*lFC_OQAOH{n
z+W}307Xf<#KL)e_-Ugfr;pYRuCjj~z#6H0P1en0cZGZ`YDS)YfS%7T7e86JBDnKzH
z0N4bee`6s2_&;FBfR6y@0PTPlz+ONTU@IU1SOZwR3O@yahX7Ln69HyG9HRd{pa;+i
zXagJq>;?Qifc|{|eK-zyo#{pEjb{U6rWU}t&IRNGG6Cs;6aWY4LuBj$<kq)7*Zljt
zLo?UAxOsrRx?T~@Pf^dV;kcbYq?Yz?B91bn8poW_*8m<?qc1aIZW=a!?rDzOlYn;+
zeY1gAme5xK0dv*(gQ9|c`U)uGkl?lI7w(?$|4rimZIf8|f5#+Rm%Z`4LH>Q~lm`xT
z3v0^DmsC7eQ(Ciyn`(HhTwJ=bELd4yP`aV4vV0z%Z@B#O%5t%MVFjA<mxr_D#fO{Z
ztA|r$)8U8Yj3XH%Q;eSS4Q2A-Ba3H#V&FH{ic8CDYfIPD<QW(e^DEac63eSr;r}4b
z<6bvDQ(IkAu|ZrnPyV~3_sTU#QsloqI%S-Zmew&jIdUZD&Z#taL9nKFV-5E`!;+1q
zWm;pN{PmFs)4njQEMH$yE0)(Rs4T6m#ae|P_e$qOv&t$f<*P?mCuedCYRXH+^87{f
zE5xeOYEFLm&AVjb&H2e&Y3hn#dCeAYX=M;>%0GGY)li$UR;*cD1#|46TFqLahFfi1
zr}4`DtD$65?FPNUy<n^=t*qR*7U9THGSq#N=51J8y@e|_u7gxL?ufCrc5Uf~b#PC{
zn)0fRo6xt!xNdFb##+>h2&=S=D>JSW%jH+w#?J5=*KMpW-@q+5u3J|btQGL(jc{1s
z?S_(yjZeX`8O5sV4W(7G>8&{roS`Mfjg|0whLY;F;+E=i&JM&{t;&^hB_&l)m8=cc
zlvI^&=2{oL^&Nx#UGU7dT7f@VX7#dQb?XbpyGF{k_Cuk@Ru@O#P3rVg)XPegPXbo!
z?LqfM`1t_Br}8i1Pr$?(z@wBn4dq0X7L<3Q?0o|-=QdO>zTx6hQ657%3gzo4??Aa5
zr4eN#$`q8FQ3`<g1nsW~(Z%s-k4|X2(0;`}JU#>M_Y>ObXn&A8I4&PO8EAFYlo>|z
zg)7}l7R~2s<x{oOWs8`4ho=Ba>ZvYYTTxoMaARdzc@1AG3iDd;6^jhAWAl=6D}x)v
zimLK-cTLU48u_JXzB_gmnziXGH&&HykpH;3N<Ozmkh8bu%ME~*EfeKUTfEK%8>^}-
zDl0auPhSTkt4$X-rq8P0vT@d|S$JFj*0HtnKQ-L>;*LtWddEI_cSHI-ehZc^@l;e*
zSC)H3*w=c<VN1!viVdZe6<f=x4r}6THm<KJty)%E1@)u8MH?za>;)LIzadv{49=93
zpQ#<oZ@~sicrsJ@7r~#kc5dBgXx&qnZjf7QQ{^?A=F30bbdOwCmnqwx6|7=~SV{D-
yK(HDw3qRbvRBo&9lpD66llf4cd_J^OZhE#_uHNhzLFZ$Dt`&`Iz3u!Lcl|Gq@7!4c

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 858f6f2296b3ccfa8008f5d3575aa0b2ce5e8372..7be9396b8a9c39abaddb789180bfaa6752b8d9a3 100644
GIT binary patch
delta 8918
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

delta 9071
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


From 84314dfe519cc3347826b21074d697949a3754e6 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 6 Jul 2004 19:23:27 +0000
Subject: [PATCH 0980/8469] Fix SF#983164.

Patch from Mark Hammond:

bdist_wininst attempts to use the correct MSVC runtime for the current
version of Python. This doesn't work correctly when --target-version
is set. In that case, bdist_wininst still uses the *current*
sys.version (ie, 2.4) rather than the version specified as
--target-version. Thus, the msvc7 runtime based executable stub is
*always* used.

This patch "hard-codes" knowledge of earlier Python versions,
providing the correct result when Python 2.4 is used to build Python
2.3 and earlier distributions.

Remove the short variant (-v) of the --target-version command line
options, it conflicts with the --verbose/-v standard distutils switch.
---
 command/bdist_wininst.py | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 324ce31a91..7c593adcaa 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -24,7 +24,7 @@ class bdist_wininst (Command):
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
-                    ('target-version=', 'v',
+                    ('target-version=', None,
                      "require a specific python version" +
                      " on the target system"),
                     ('no-target-compile', 'c',
@@ -265,10 +265,34 @@ def create_exe (self, arcname, fullname, bitmap=None):
 
     def get_exe_bytes (self):
         from distutils.msvccompiler import get_build_version
+        # If a target-version other than the current version has been
+        # specified, then using the MSVC version from *this* build is no good.
+        # Without actually finding and executing the target version and parsing
+        # its sys.version, we just hard-code our knowledge of old versions.
+        # NOTE: Possible alternative is to allow "--target-version" to
+        # specify a Python executable rather than a simple version string.
+        # We can then execute this program to obtain any info we need, such
+        # as the real sys.version string for the build.
+        cur_version = get_python_version()
+        if self.target_version and self.target_version != cur_version:
+            # If the target version is *later* than us, then we assume they
+            # use what we use
+            # string compares seem wrong, but are what sysconfig.py itself uses
+            if self.target_version > cur_version:
+                bv = get_build_version()
+            else:
+                if self.target_version < "2.4":
+                    bv = "6"
+                else:
+                    bv = "7.1"
+        else:
+            # for current version - use authoritative check.
+            bv = get_build_version()
+
         # wininst-x.y.exe is in the same directory as this file
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        filename = os.path.join(directory, "wininst-%s.exe" % get_build_version())
+        filename = os.path.join(directory, "wininst-%s.exe" % bv)
         return open(filename, "rb").read()
 # class bdist_wininst

From 89f251ec91fbc1a66a06a5aa903f6faa2d44d047 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 14 Jul 2004 15:22:05 +0000
Subject: [PATCH 0981/8469] Recompiled after source file changes.

---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index efa3bc4f1f8a2632e71009b24317e5417f2a0522..7e93de88ebb447bc758757638161718fb4d62883 100644
GIT binary patch
delta 16266
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
T!}*^H%AGg4^VYL}xZ{5TE|VIw

delta 15881
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
O*=>HP<(BSG=ln01UY@=H

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 7be9396b8a9c39abaddb789180bfaa6752b8d9a3..40f80035e4be9a80d6abd461a1afc0eeb14d18c9 100644
GIT binary patch
delta 11920
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
J=-ek`{}<A+<pcl#

delta 11555
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
R*4l$-ZVav+a_RH2{|)#TCHw#Y


From 0180948beafd529bb6a0f19e6e7293dd5117aab7 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 16 Jul 2004 18:14:37 +0000
Subject: [PATCH 0982/8469] The new distutils features justify a new version
 number, imo.

If someone has other ideas for the numbering scheme, please change to
something else (1.1.0 ?).
---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7873d297b3..2e9c90c7c7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,4 +12,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"

From 3d2ade66dfe5efa2a561cd804d43c35974ed210a Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 18 Jul 2004 06:16:08 +0000
Subject: [PATCH 0983/8469] Whitespace normalization, via reindent.py.

---
 archive_util.py          | 4 ++--
 bcppcompiler.py          | 2 +-
 ccompiler.py             | 4 ++--
 cmd.py                   | 4 ++--
 command/bdist.py         | 2 +-
 command/bdist_dumb.py    | 2 +-
 command/bdist_wininst.py | 2 +-
 command/build_ext.py     | 4 ++--
 command/build_scripts.py | 2 +-
 command/install.py       | 2 +-
 command/register.py      | 1 -
 core.py                  | 1 -
 cygwinccompiler.py       | 2 +-
 debug.py                 | 1 -
 dir_util.py              | 1 -
 dist.py                  | 4 ++--
 file_util.py             | 2 +-
 filelist.py              | 2 +-
 log.py                   | 8 ++++----
 msvccompiler.py          | 7 +++----
 spawn.py                 | 2 +-
 sysconfig.py             | 2 +-
 unixccompiler.py         | 6 +++---
 util.py                  | 2 +-
 24 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index d5b3096617..55babe6fc6 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -68,7 +68,7 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         import zipfile
     except ImportError:
         zipfile = None
-        
+
     zip_filename = base_name + ".zip"
     mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
 
@@ -79,7 +79,7 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
             zipoptions = "-r"
         else:
             zipoptions = "-rq"
-        
+
         try:
             spawn(["zip", zipoptions, zip_filename, base_dir],
                   dry_run=dry_run)
diff --git a/bcppcompiler.py b/bcppcompiler.py
index b0360a248e..f995e36711 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -85,7 +85,7 @@ def __init__ (self,
     def compile(self, sources,
                 output_dir=None, macros=None, include_dirs=None, debug=0,
                 extra_preargs=None, extra_postargs=None, depends=None):
-        
+
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)
diff --git a/ccompiler.py b/ccompiler.py
index ebd93c27eb..a3b1ffa4d5 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -685,7 +685,7 @@ def compile(self, sources, output_dir=None, macros=None,
 
         # A concrete compiler class can either override this method
         # entirely or implement _compile().
-        
+
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)
@@ -703,7 +703,7 @@ def compile(self, sources, output_dir=None, macros=None,
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         """Compile 'src' to product 'obj'."""
-        
+
         # A concrete compiler class that does not override compile()
         # should implement _compile().
         pass
diff --git a/cmd.py b/cmd.py
index 9362410487..be8e826fdb 100644
--- a/cmd.py
+++ b/cmd.py
@@ -79,7 +79,7 @@ def __init__ (self, dist):
         # verbose is largely ignored, but needs to be set for
         # backwards compatibility (I think)?
         self.verbose = dist.verbose
-        
+
         # Some commands define a 'self.force' option to ignore file
         # timestamps, but methods defined *here* assume that
         # 'self.force' exists for all commands.  So define it here
@@ -100,7 +100,7 @@ def __init__ (self, dist):
 
 
     # XXX A more explicit way to customize dry_run would be better.
-    
+
     def __getattr__ (self, attr):
         if attr == 'dry_run':
             myval = getattr(self, "_" + attr)
diff --git a/command/bdist.py b/command/bdist.py
index 7c606ffc4d..4eca9c3426 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -78,7 +78,7 @@ class bdist (Command):
                        'wininst': ('bdist_wininst',
                                    "Windows executable installer"),
                        'zip':   ('bdist_dumb', "ZIP file"),
-                       #'pkgtool': ('bdist_pkgtool', 
+                       #'pkgtool': ('bdist_pkgtool',
                        #            "Solaris pkgtool distribution"),
                        #'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
                       }
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 8ee3a5c5f7..3db332d5bd 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -53,7 +53,7 @@ def initialize_options (self):
         self.dist_dir = None
         self.skip_build = 0
         self.relative = 0
-        
+
     # initialize_options()
 
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 7c593adcaa..d91c08936c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -115,7 +115,7 @@ def run (self):
         # we do not want to include pyc or pyo files
         install_lib.compile = 0
         install_lib.optimize = 0
-        
+
         # If we are building an installer for a Python version other
         # than the one we are currently running, then we need to ensure
         # our build_lib reflects the other Python version rather than ours.
diff --git a/command/build_ext.py b/command/build_ext.py
index 0c37768179..04cd742cef 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -173,7 +173,7 @@ def finalize_options (self):
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
 
-        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the 
+        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
@@ -636,7 +636,7 @@ def get_libraries (self, ext):
             # EMX/GCC requires the python library explicitly, and I
             # believe VACPP does as well (though not confirmed) - AIM Apr01
             template = "python%d%d"
-            # debug versions of the main DLL aren't supported, at least 
+            # debug versions of the main DLL aren't supported, at least
             # not at this time - AIM Apr01
             #if self.debug:
             #    template = template + '_d'
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 165a009ded..e0fcc23e13 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -94,7 +94,7 @@ def copy_scripts (self):
                 if not self.dry_run:
                     outf = open(outfile, "w")
                     if not sysconfig.python_build:
-                        outf.write("#!%s%s\n" % 
+                        outf.write("#!%s%s\n" %
                                    (os.path.normpath(sys.executable),
                                     post_interp))
                     else:
diff --git a/command/install.py b/command/install.py
index 3c36ede622..175f785214 100644
--- a/command/install.py
+++ b/command/install.py
@@ -537,7 +537,7 @@ def run (self):
             not (self.path_file and self.install_path_file) and
             install_lib not in sys_path):
             log.debug(("modules installed to '%s', which is not in "
-                       "Python's module search path (sys.path) -- " 
+                       "Python's module search path (sys.path) -- "
                        "you'll have to change the search path yourself"),
                        self.install_lib)
 
diff --git a/command/register.py b/command/register.py
index 8e347ce6dc..8104ce0656 100644
--- a/command/register.py
+++ b/command/register.py
@@ -286,4 +286,3 @@ def post_to_server(self, data, auth=None):
         if self.show_response:
             print '-'*75, data, '-'*75
         return result
-
diff --git a/core.py b/core.py
index fba463c10b..fef291f656 100644
--- a/core.py
+++ b/core.py
@@ -239,4 +239,3 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     return _setup_distribution
 
 # run_setup ()
-
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 0101bae5b9..a962007601 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -75,7 +75,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
                          (status, details))
         if status is not CONFIG_H_OK:
             self.warn(
-                "Python's pyconfig.h doesn't seem to support your compiler. " 
+                "Python's pyconfig.h doesn't seem to support your compiler. "
                 "Reason: %s. "
                 "Compiling may fail because of undefined preprocessor macros."
                 % details)
diff --git a/debug.py b/debug.py
index e195ebdcdf..2a87eb5d28 100644
--- a/debug.py
+++ b/debug.py
@@ -7,4 +7,3 @@
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
 # debug mode.
 DEBUG = os.environ.get('DISTUTILS_DEBUG')
-
diff --git a/dir_util.py b/dir_util.py
index e479b62415..77f64c4104 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -225,4 +225,3 @@ def ensure_relative (path):
         if path[0:1] == os.sep:
             path = drive + path[1:]
         return path
-
diff --git a/dist.py b/dist.py
index 7d0a7bad3c..b4dd0b9170 100644
--- a/dist.py
+++ b/dist.py
@@ -231,7 +231,7 @@ def __init__ (self, attrs=None):
                         newreq.append((pkg, LooseVersion(ver)))
                 attrs['requires'] = newreq
 
-            # Build up the provides object. If the setup() has no 
+            # Build up the provides object. If the setup() has no
             # provides line, we use packages or modules and the version
             # to synthesise the provides. If no version is provided (no
             # pun intended) we don't have a provides entry at all.
@@ -1137,7 +1137,7 @@ def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
     def get_requires(self):
-        return [ '%s%s%s'%(x, (y and '-') or '', y or '') 
+        return [ '%s%s%s'%(x, (y and '-') or '', y or '')
                                                 for x,y in self.requires ]
 
     def get_provides(self):
diff --git a/file_util.py b/file_util.py
index e230ce587e..e2b1c51558 100644
--- a/file_util.py
+++ b/file_util.py
@@ -42,7 +42,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             except os.error, (errno, errstr):
                 raise DistutilsFileError, \
                       "could not delete '%s': %s" % (dst, errstr)
-        
+
         try:
             fdst = open(dst, 'wb')
         except os.error, (errno, errstr):
diff --git a/filelist.py b/filelist.py
index 0872e96636..566d87ab28 100644
--- a/filelist.py
+++ b/filelist.py
@@ -167,7 +167,7 @@ def process_template_line (self, line):
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
                     log.warn(("warning: no files found matching '%s' " +
-                                "under directory '%s'"), 
+                                "under directory '%s'"),
                              pattern, dir)
 
         elif action == 'recursive-exclude':
diff --git a/log.py b/log.py
index 01420da9af..024e7c28de 100644
--- a/log.py
+++ b/log.py
@@ -28,16 +28,16 @@ def log(self, level, msg, *args):
 
     def debug(self, msg, *args):
         self._log(DEBUG, msg, args)
-    
+
     def info(self, msg, *args):
         self._log(INFO, msg, args)
-    
+
     def warn(self, msg, *args):
         self._log(WARN, msg, args)
-    
+
     def error(self, msg, *args):
         self._log(ERROR, msg, args)
-    
+
     def fatal(self, msg, *args):
         self._log(FATAL, msg, args)
 
diff --git a/msvccompiler.py b/msvccompiler.py
index 1441ea04c3..168881ad2d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -117,7 +117,7 @@ def set_macro(self, macro, path, key):
             if d:
                 self.macros["$(%s)" % macro] = d[key]
                 break
-              
+
     def load_macros(self, version):
         vsbase = r"Software\Microsoft\VisualStudio\%0.1f" % version
         self.set_macro("VCInstallDir", vsbase + r"\Setup\VC", "productdir")
@@ -166,7 +166,7 @@ def get_build_version():
         return majorVersion + minorVersion
     # else we don't know what version of the compiler this is
     return None
-    
+
 
 class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -525,7 +525,7 @@ def find_exe(self, exe):
                 return fn
 
         return exe
-    
+
     def get_msvc_paths(self, path, platform='x86'):
         """Get a list of devstudio directories (include, lib or path).
 
@@ -576,4 +576,3 @@ def set_path_env_var(self, name):
             p = self.get_msvc_paths(name)
         if p:
             os.environ[name] = string.join(p, ';')
-
diff --git a/spawn.py b/spawn.py
index 67391e8826..a89b88cebf 100644
--- a/spawn.py
+++ b/spawn.py
@@ -97,7 +97,7 @@ def _spawn_os2 (cmd,
     #cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
-        executable = find_executable(executable) or executable 
+        executable = find_executable(executable) or executable
     log.info(string.join([executable] + cmd[1:], ' '))
     if not dry_run:
         # spawnv for OS/2 EMX requires a full path to the .exe
diff --git a/sysconfig.py b/sysconfig.py
index c912a15cdc..0a4e14cc37 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -367,7 +367,7 @@ def _init_posix():
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
             raise DistutilsPlatformError(my_msg)
-        
+
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.
diff --git a/unixccompiler.py b/unixccompiler.py
index 11ecb9f6ae..24cbcb53e5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -206,7 +206,7 @@ def runtime_library_dir_option(self, dir):
         elif sys.platform[:5] == "hp-ux":
             return "+s -L" + dir
         elif compiler[:3] == "gcc" or compiler[:3] == "g++":
-          return "-Wl,-R" + dir
+            return "-Wl,-R" + dir
         else:
             return "-R" + dir
 
@@ -217,7 +217,7 @@ def find_library_file(self, dirs, lib, debug=0):
         shared_f = self.library_filename(lib, lib_type='shared')
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
-        
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
@@ -232,6 +232,6 @@ def find_library_file(self, dirs, lib, debug=0):
                 return shared
             elif os.path.exists(static):
                 return static
-            
+
         # Oops, didn't find it in *any* of 'dirs'
         return None
diff --git a/util.py b/util.py
index 12775d6fc4..387e9bdc93 100644
--- a/util.py
+++ b/util.py
@@ -300,7 +300,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
 
 def strtobool (val):
     """Convert a string representation of truth to true (1) or false (0).
-    
+
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
     are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
     'val' is anything else.

From eb85239d5cdcf684b6f19ef7cce2cc969accdf6c Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 19 Jul 2004 09:45:46 +0000
Subject: [PATCH 0984/8469] The binary layout of cfgdata has changed, so the
 magic number has to change as well.  Add a comment explaining this.

---
 command/bdist_wininst.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d91c08936c..79c95ae2ae 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -253,8 +253,14 @@ def create_exe (self, arcname, fullname, bitmap=None):
             # empty pre-install script
             cfgdata = cfgdata + "\0"
         file.write(cfgdata)
+
+        # The 'magic number' 0x1234567B is used to make sure that the
+        # binary layout of 'cfgdata' is what the wininst.exe binary
+        # expects.  If the layout changes, increment that number, make
+        # the corresponding changes to the wininst.exe sources, and
+        # recompile them.
         header = struct.pack("<iii",
-                             0x1234567A,       # tag
+                             0x1234567B,       # tag
                              len(cfgdata),     # length
                              bitmaplen,        # number of bytes in bitmap
                              )

From 4ec3dfee7519a3d9dee59200c260677f0ab41303 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 19 Jul 2004 10:07:28 +0000
Subject: [PATCH 0985/8469] The binary layout of cfgdata has changed, so the
 magic number has to change as well. Recompiled binaries after this change.

---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index 7e93de88ebb447bc758757638161718fb4d62883..ed288d6a260ab8e0b5e8a9b79ab781433399e94c 100644
GIT binary patch
delta 2835
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
Y4p&k84|Cy~388^5g<2hm8~ZZ--+~QEzyJUM

delta 2776
zcmZuz4Qx}_6~5PTaLDY$`LS`Z^Jkm@`G>@ilsbJ01VTu&7hK!%N+4P{c(Q0q!Cu#H
zg+z{Njj@*LvUXJ4l*~-~sWxRbbWDWQ!&wVW#Zm$J*`yIoUiI2|t2dwuTiDw<cEXsp
zNXPHKbM86!-0ytny!6kf_0OjbB}(si-Q&pe-#p2tU!bc9=>x@3O8GmMLuY6o`-Fax
zW`vt$v25DQigGKcobApnp*NT-x0L3v)45f2jQu+Iqb!+~kf3k&Uy{U&iM{N*c?S9+
zyO7sFzt29+>!nYy_WalLe$q{dbWHAVTUyyV#Qv6Vpf9m3jjpf{to>u@GZ3TJ>CQ`S
z5k^Nj!i&vpyXKJN!&#1aCzQU3N7fsaJW5xZcr1+&Ara+>q`8{1_C{@ic(6^$3+Kb2
z_9!LI|M*dH+arFAYV%~VDAQ`!HN+rPux;u8IlG-+3z~^XBg|uHb9@fZonX&u&5Ebs
zbX@;bTUvp;d=a-c=vzcUQi&w<b2=BUNuDL);<7)xtKAPkS=angu@bCN*ZOchpxdrk
zz8ss>8DZyNbro8?sMC2ZDw!_=IKtrzc=A<NQ_v-g&9LJIb-7cR%rxBHA;{zeGM!?P
zf)=!<t*u*gppy`%FXHr+!4A;~6<;_z0=AB|W>p+gclvkAoqlsX%1*EK(+Jb*Pbs+H
za>Opqvmfi%LB%Ka7J7!QHk8X2=h!AgB_*uaP?HsT57K!6$U3BHp^u$4G(VmIh={w@
zYgxpFr^zn4O&OAA=>?7i5+i7JkpQ0=Y|l!Y>fY;;ciSZme+147EzX7W3iXse$7+il
zYtbDbRr4+)9Hmfm3iq;0w=Rvc;i9k7QMRg>gWp}n-i-*DL--8RuuC@_LSkhx51@!Y
z+6mbS^V6_=liew9$U-e|^{Ws{v4@#US`<8}gxDN=r9^)M*OEB~rwi_P;0HY=jq)fG
zQ4M!dOPbf<E(_`;2~&Y1ZGf*+GXKX{G(C`{z+!NRsl>{Q!(fNy23{P3m3Jb)|C{nP
z``kI8(=GG;g;a<aGvuH&@Zy(QacP{s%9O^x&=C8F@jD3ox7Qf~`19*dsj=R6yKn?B
zvAv&ucaC+LN-OYYRxzg)y6WO>SnqSXRmt#H@$(kU&??@AXaDeRcGgs=c_iD``;z2`
zWJV^~q{);u0nXwMfDsx1Vm~kyC?W`h*~ALVN^9?8WwQt003LZQ@(FmkgebY21^Gp&
zgblcm_!U4GhX}~TXUi%wlRij`9yU^@r&H{5S$&NNg@YPr@F`540IyuqbOOBIvZRAE
zgj=w`y>TTQ+Gu9h@&Xy~^ttj1TEfnj*W=6e^7>)~M4GW*M)uonRya1P@Via<0VH<G
z`fnsblV+qX4-<Q9{qyRB&5)!gW4Uuh2dmi7Et{WauWUF7z{fUNsf{&m48v*hjki?E
zrnhAP6+-bjcD<rJ2YWNnmI&d<3ADvS6D+;*1E|teWi7TJt!mpAn}OVJ2ql1&kUs`%
zb4uf#Xvfh&9#N$@6!gV_KFC5gP<3?E%5JrQO$kPrF^`f>IDZK!EzP7Xy!Z?=RUg2^
zebv>OV~`ijU##6&bv=E9C93zKt*b^yx3EJs)doa5doW8z$oMeC54`7#WDiP|kjBDc
zHd<5Poa`7ev=s+_9L^SQUd9o9@}a`ci!Z?oj1=q=-L|M(9}MEoZs-qITKgsfdb##<
z<nV>MVi|C1y6#IdG0HY?dH`Ig+k8@$yrjkrwTCd_=;mzN^}%LBtTwwtGK-L6z;Xn}
z#ATvR_ENs>61F{W9dCRWV6B56J0P&bq;~Oq5+^Yet^gko)L{fx(vW`w2bTCJB<_SV
z71qTIeE^YFFr-2(A69)B4s%gKnbh7&X+ubMP%e$*X)DSeaCc=2qsb`oq-o}1Y?9Q*
zKr76Sb9Ufp$|T4kI|1>w3RhD;sjMd<IX)BtH}MXT0LO|6c1fBkNN5CsIIzFh7kS#P
zfUXfx2cWJtpQE3#Uzne#k#NzLRg~JpWm_-E=oR*drmd^zuK)!+OXAnV`p2H627DEZ
zD{&yWXwUwquVH^()B&zy0UO-*7`@5f-S#5o+1AJJ$r4dkW6{&yti#eov%`ay`}Bln
zJ^DuNj`1X=@g{Z`WOy2~5pYo0#q)3rX9yF=&rXhT8qS1|C2Zh7@q<mk5hLJj1SF_r
zMmJu(2PPPgFcTEwpYKT0g3D{cO~hjiSVZuaX1tAT>4{G}DqGZ*ElRIw3^u3(Hl5c<
z0=9hk9cbeBq_4{M#URo^^UL;z+-%=0tbx;~r{Edr%J5xts{+%Nc6sGTeobPIHMe}F
z=>By{@=h51Z5eQOr}Q<s1JE4=GQwyOZ?Q<r7S*{~tVVt003ycHTVGcvdH~ns8=8)r
zJc{>sn$+R9TB~GK9iH8BGo22Gf8KFSbz*V{M+$aw<Yyq-T^xBCBnHyn&XIROigrT<
zLDD-ovKhnzqTj=jQy}V2j(iJb@JWsw<~g!!FGtRTELb`6%u^gO+BmWYq}tArTOhYV
z8XX)Nh8Pz>KJMVs$Ui&6KkRAGf^se#tk}K;U`k#U`8_-&O&we?pdvtOKYXIAl5b1U
zRsM_-6TXm;95#wMP~fJ*sVf}uD1}bebEr6b5qGtn3AUZ#CG*`VJ9)@Y2g2}8RInkc
ze*4H+O}a|pNNM;tKS;|pVyB*ie}M4$z2)Z_c)kYGpL}N@j~3;k`M=d+?JwWXSq)`N
Q{?YJ&%%TcsP5r(2-#D6bD*ylh

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 40f80035e4be9a80d6abd461a1afc0eeb14d18c9..a800678ea7dca567eb518e427a9b267deed5b9c4 100644
GIT binary patch
delta 15767
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
MF>QCB|7hy}0w!Zz4*&oF

delta 15673
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


From ccb3f9c92225e9af8441defe2003ddf96d2b9cd2 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Wed, 21 Jul 2004 18:53:06 +0000
Subject: [PATCH 0986/8469] elaborate package data test to make sure
 get_outputs() gives the right results when byte-code compilation is requested
 (in particular, make sure that package data doesn't get a bogus byte-code
 listing generated)

---
 tests/test_build_py.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 757d757c86..6f7276866d 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -34,15 +34,21 @@ def test_package_data(self):
         dist.package_dir = {"pkg": sources}
 
         cmd = build_py(dist)
+        cmd.compile = 1
         cmd.ensure_finalized()
         self.assertEqual(cmd.package_data, dist.package_data)
 
         cmd.run()
 
-        self.assertEqual(len(cmd.get_outputs()), 2)
+        # This makes sure the list of outputs includes byte-compiled
+        # files for Python modules but not for package data files
+        # (there shouldn't *be* byte-code files for those!).
+        #
+        self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
         self.assert_("__init__.py" in files)
+        self.assert_("__init__.pyc" in files)
         self.assert_("README.txt" in files)
 
 

From c8ecef628841d8f77400d5227236538dd227eab1 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 23 Jul 2004 19:44:29 +0000
Subject: [PATCH 0987/8469] bdist_wininst does now properly handle unicode
 strings or byte strings with umlauts in the author argument and others.

Fixes sf # 993943.
---
 command/bdist_wininst.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 79c95ae2ae..506a4a26ba 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -176,36 +176,38 @@ def get_inidata (self):
         lines = []
         metadata = self.distribution.metadata
 
-        # Write the [metadata] section.  Values are written with
-        # repr()[1:-1], so they do not contain unprintable characters, and
-        # are not surrounded by quote chars.
+        # Write the [metadata] section.
         lines.append("[metadata]")
 
         # 'info' will be displayed in the installer's dialog box,
         # describing the items to be installed.
         info = (metadata.long_description or '') + '\n'
 
+        # Escape newline characters
+        def escape(s):
+            return string.replace(s, "\n", "\\n")
+
         for name in ["author", "author_email", "description", "maintainer",
                      "maintainer_email", "name", "url", "version"]:
             data = getattr(metadata, name, "")
             if data:
                 info = info + ("\n    %s: %s" % \
-                               (string.capitalize(name), data))
-                lines.append("%s=%s" % (name, repr(data)[1:-1]))
+                               (string.capitalize(name), escape(data)))
+                lines.append("%s=%s" % (name, escape(data)))
 
         # The [setup] section contains entries controlling
         # the installer runtime.
         lines.append("\n[Setup]")
         if self.install_script:
             lines.append("install_script=%s" % self.install_script)
-        lines.append("info=%s" % repr(info)[1:-1])
+        lines.append("info=%s" % escape(info))
         lines.append("target_compile=%d" % (not self.no_target_compile))
         lines.append("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append("target_version=%s" % self.target_version)
 
         title = self.title or self.distribution.get_fullname()
-        lines.append("title=%s" % repr(title)[1:-1])
+        lines.append("title=%s" % escape(title))
         import time
         import distutils
         build_info = "Built %s with distutils-%s" % \
@@ -244,6 +246,15 @@ def create_exe (self, arcname, fullname, bitmap=None):
         if bitmap:
             file.write(bitmapdata)
 
+        # Convert cfgdata from unicode to ascii, mbcs encoded
+        try:
+            unicode
+        except NameError:
+            pass
+        else:
+            if isinstance(cfgdata, unicode):
+                cfgdata = cfgdata.encode("mbcs")
+
         # Append the pre-install script
         cfgdata = cfgdata + "\0"
         if self.pre_install_script:

From 255d561a68712ed1f40f673cbb1c428815a5febd Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 23 Jul 2004 19:47:32 +0000
Subject: [PATCH 0988/8469] Make the distutils version number the same as the
 python version.  It must be literally contained here, because it is still
 possible to install this distutils in older Python versions.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2e9c90c7c7..2592a6c559 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,4 +12,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "1.0.4"
+__version__ = "2.4.0"

From c1e60ed922d5a869202a3aea3f5c9e7587d063f1 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Fri, 23 Jul 2004 19:58:28 +0000
Subject: [PATCH 0989/8469] Factored out a method to determine the final
 installer filename.

---
 command/bdist_wininst.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 506a4a26ba..20bd61389a 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -224,15 +224,7 @@ def create_exe (self, arcname, fullname, bitmap=None):
 
         cfgdata = self.get_inidata()
 
-        if self.target_version:
-            # if we create an installer for a specific python version,
-            # it's better to include this in the name
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32-py%s.exe" %
-                                           (fullname, self.target_version))
-        else:
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32.exe" % fullname)
+        installer_name = self.get_installer_filename(fullname)
         self.announce("creating %s" % installer_name)
 
         if bitmap:
@@ -280,6 +272,19 @@ def create_exe (self, arcname, fullname, bitmap=None):
 
     # create_exe()
 
+    def get_installer_filename(self, fullname):
+        # Factored out to allow overriding in subclasses
+        if self.target_version:
+            # if we create an installer for a specific python version,
+            # it's better to include this in the name
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32-py%s.exe" %
+                                           (fullname, self.target_version))
+        else:
+            installer_name = os.path.join(self.dist_dir,
+                                          "%s.win32.exe" % fullname)
+    # get_installer_filename()
+
     def get_exe_bytes (self):
         from distutils.msvccompiler import get_build_version
         # If a target-version other than the current version has been

From 372525bfe68c909c7d7a8b5f92bdfc31ef361149 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Wed, 28 Jul 2004 14:55:10 +0000
Subject: [PATCH 0990/8469] Since build_py handles package data installation,
 the list of outputs can contain more than just .py files.  Make sure we only
 report bytecode files for the .py files.

---
 command/install_lib.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/command/install_lib.py b/command/install_lib.py
index daf3e010fd..c234117adc 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -7,6 +7,11 @@
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
+
+# Extension for Python source files.
+PYTHON_SOURCE_EXTENSION = os.extsep + "py"
+
+
 class install_lib (Command):
 
     description = "install all Python modules (extensions and pure Python)"
@@ -155,6 +160,12 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
     def _bytecode_filenames (self, py_filenames):
         bytecode_files = []
         for py_file in py_filenames:
+            # Since build_py handles package data installation, the
+            # list of outputs can contain more than just .py files.
+            # Make sure we only report bytecode for the .py files.
+            ext = os.path.splitext(os.path.normcase(py_file))[1]
+            if ext != PYTHON_SOURCE_EXTENSION:
+                continue
             if self.compile:
                 bytecode_files.append(py_file + "c")
             if self.optimize > 0:

From ab63210e40d4c242c91f03b4ae363e2cdf7a6341 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 2 Aug 2004 17:58:51 +0000
Subject: [PATCH 0991/8469] - fix description of option table entries - fix
 broken assert statement; should just raise

---
 fancy_getopt.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 512bc9b665..6c1134fc40 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -45,8 +45,9 @@ class FancyGetopt:
 
     def __init__ (self, option_table=None):
 
-        # The option table is (currently) a list of 3-tuples:
-        #   (long_option, short_option, help_string)
+        # The option table is (currently) a list of tuples.  The
+        # tuples may have 3 or four values:
+        #   (long_option, short_option, help_string [, repeatable])
         # if an option takes an argument, its long_option should have '='
         # appended; short_option should just be a single character, no ':'
         # in any case.  If a long_option doesn't have a corresponding
@@ -162,7 +163,7 @@ def _grok_option_table (self):
             else:
                 # the option table is part of the code, so simply
                 # assert that it is correct
-                assert "invalid option tuple: %r" % (option,)
+                raise ValueError, "invalid option tuple: %r" % (option,)
 
             # Type- and value-check the option names
             if type(long) is not StringType or len(long) < 2:

From ab4c054599bc4bcce9deb27b543b6b5465667a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 3 Aug 2004 12:41:42 +0000
Subject: [PATCH 0992/8469] Patch #870382: Automatically add msvcr71 to the
 list of libraries if Python was built with VC 7.1.

---
 cygwinccompiler.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index a962007601..acd393d593 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -122,6 +122,17 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
                 "Consider upgrading to a newer version of gcc")
         else:
             self.dll_libraries=[]
+	    # Include the appropriate MSVC runtime library if Python was built
+	    # with MSVC 7.0 or 7.1.
+	    msc_pos = sys.version.find('MSC v.')
+	    if msc_pos != -1:
+		msc_ver = sys.version[msc_pos+6:msc_pos+10]
+		if msc_ver == '1300':
+		    # MSVC 7.0
+		    self.dll_libraries = ['msvcr70']
+		elif msc_ver == '1310':
+		    # MSVC 7.1
+		    self.dll_libraries = ['msvcr71']
 
     # __init__ ()
 
@@ -308,6 +319,18 @@ def __init__ (self,
         # no additional libraries needed
         self.dll_libraries=[]
 
+	# Include the appropriate MSVC runtime library if Python was built
+	# with MSVC 7.0 or 7.1.
+	msc_pos = sys.version.find('MSC v.')
+	if msc_pos != -1:
+	    msc_ver = sys.version[msc_pos+6:msc_pos+10]
+	    if msc_ver == '1300':
+		# MSVC 7.0
+		self.dll_libraries = ['msvcr70']
+	    elif msc_ver == '1310':
+		# MSVC 7.1
+		self.dll_libraries = ['msvcr71']
+
     # __init__ ()
 
 # class Mingw32CCompiler

From 1e8e19184f43761f8645b35e3ceb1bc95edde5b5 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 3 Aug 2004 16:37:40 +0000
Subject: [PATCH 0993/8469] This allows additional commands to be provided for
 existing setup.py scripts without modifying either the distutils installation
 or the setup.py scripts of packages with which the new commands will be used.

Specifically, an option is added to distutils that allows additional
packages to be searched for command implementations in addition to
distutils.command.  The additional packages can be specified on the
command line or via the installation or personal configuration files
already loaded by distutils.

For discussion, see the thread starting with:

http://mail.python.org/pipermail/distutils-sig/2004-August/004112.html

This closes SF patch #102241.
---
 dist.py            |  84 +++++++++++++++++++++++++++----------
 tests/test_dist.py | 100 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+), 22 deletions(-)
 create mode 100644 tests/test_dist.py

diff --git a/dist.py b/dist.py
index b4dd0b9170..53846e937f 100644
--- a/dist.py
+++ b/dist.py
@@ -141,6 +141,14 @@ def __init__ (self, attrs=None):
         # for the setup script to override command classes
         self.cmdclass = {}
 
+        # 'command_packages' is a list of packages in which commands
+        # are searched for.  The factory for command 'foo' is expected
+        # to be named 'foo' in the module 'foo' in one of the packages
+        # named here.  This list is searched from the left; an error
+        # is raised if no named package provides the command being
+        # searched for.  (Always access using get_command_packages().)
+        self.command_packages = None
+
         # 'script_name' and 'script_args' are usually set to sys.argv[0]
         # and sys.argv[1:], but they can be overridden when the caller is
         # not necessarily a setup script run from the command-line.
@@ -406,6 +414,8 @@ def parse_config_files (self, filenames=None):
                         setattr(self, alias, not strtobool(val))
                     elif opt in ('verbose', 'dry_run'): # ugh!
                         setattr(self, opt, strtobool(val))
+                    else:
+                        setattr(self, opt, val)
                 except ValueError, msg:
                     raise DistutilsOptionError, msg
 
@@ -437,11 +447,12 @@ def parse_command_line (self):
         # We now have enough information to show the Macintosh dialog
         # that allows the user to interactively specify the "command line".
         #
+        toplevel_options = self._get_toplevel_options()
         if sys.platform == 'mac':
             import EasyDialogs
             cmdlist = self.get_command_list()
             self.script_args = EasyDialogs.GetArgv(
-                self.global_options + self.display_options, cmdlist)
+                toplevel_options + self.display_options, cmdlist)
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -451,7 +462,7 @@ def parse_command_line (self):
         # until we know what the command is.
 
         self.commands = []
-        parser = FancyGetopt(self.global_options + self.display_options)
+        parser = FancyGetopt(toplevel_options + self.display_options)
         parser.set_negative_aliases(self.negative_opt)
         parser.set_aliases({'licence': 'license'})
         args = parser.getopt(args=self.script_args, object=self)
@@ -488,6 +499,17 @@ def parse_command_line (self):
 
     # parse_command_line()
 
+    def _get_toplevel_options (self):
+        """Return the non-display options recognized at the top level.
+
+        This includes options that are recognized *only* at the top
+        level as well as options recognized for commands.
+        """
+        return self.global_options + [
+            ("command-packages=", None,
+             "list of packages that provide distutils commands"),
+            ]
+
     def _parse_command_opts (self, parser, args):
         """Parse the command-line options for a single command.
         'parser' must be a FancyGetopt instance; 'args' must be the list
@@ -586,7 +608,6 @@ def _parse_command_opts (self, parser, args):
 
     # _parse_command_opts ()
 
-
     def finalize_options (self):
         """Set final values for all the options on the Distribution
         instance, analogous to the .finalize_options() method of Command
@@ -627,7 +648,11 @@ def _show_help (self,
         from distutils.cmd import Command
 
         if global_options:
-            parser.set_option_table(self.global_options)
+            if display_options:
+                options = self._get_toplevel_options()
+            else:
+                options = self.global_options
+            parser.set_option_table(options)
             parser.print_help("Global options:")
             print
 
@@ -791,6 +816,19 @@ def get_command_list (self):
 
     # -- Command class/object methods ----------------------------------
 
+    def get_command_packages (self):
+        """Return a list of packages from which commands are loaded."""
+        pkgs = self.command_packages
+        if not isinstance(pkgs, type([])):
+            pkgs = string.split(pkgs or "", ",")
+            for i in range(len(pkgs)):
+                pkgs[i] = string.strip(pkgs[i])
+            pkgs = filter(None, pkgs)
+            if "distutils.command" not in pkgs:
+                pkgs.insert(0, "distutils.command")
+            self.command_packages = pkgs
+        return pkgs
+
     def get_command_class (self, command):
         """Return the class that implements the Distutils command named by
         'command'.  First we check the 'cmdclass' dictionary; if the
@@ -807,26 +845,28 @@ def get_command_class (self, command):
         if klass:
             return klass
 
-        module_name = 'distutils.command.' + command
-        klass_name = command
+        for pkgname in self.get_command_packages():
+            module_name = "%s.%s" % (pkgname, command)
+            klass_name = command
 
-        try:
-            __import__ (module_name)
-            module = sys.modules[module_name]
-        except ImportError:
-            raise DistutilsModuleError, \
-                  "invalid command '%s' (no module named '%s')" % \
-                  (command, module_name)
+            try:
+                __import__ (module_name)
+                module = sys.modules[module_name]
+            except ImportError:
+                continue
+
+            try:
+                klass = getattr(module, klass_name)
+            except AttributeError:
+                raise DistutilsModuleError, \
+                      "invalid command '%s' (no class '%s' in module '%s')" \
+                      % (command, klass_name, module_name)
+
+            self.cmdclass[command] = klass
+            return klass
+
+        raise DistutilsModuleError("invalid command '%s'" % command)
 
-        try:
-            klass = getattr(module, klass_name)
-        except AttributeError:
-            raise DistutilsModuleError, \
-                  "invalid command '%s' (no class '%s' in module '%s')" \
-                  % (command, klass_name, module_name)
-
-        self.cmdclass[command] = klass
-        return klass
 
     # get_command_class ()
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
new file mode 100644
index 0000000000..695f6d8192
--- /dev/null
+++ b/tests/test_dist.py
@@ -0,0 +1,100 @@
+"""Tests for distutils.dist."""
+
+import distutils.cmd
+import distutils.dist
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from test.test_support import TESTFN
+
+
+class test_dist(distutils.cmd.Command):
+    """Sample distutils extension command."""
+
+    user_options = [
+        ("sample-option=", "S", "help text"),
+        ]
+
+    def initialize_options(self):
+        self.sample_option = None
+
+
+class TestDistribution(distutils.dist.Distribution):
+    """Distribution subclasses that avoids the default search for
+    configuration files.
+
+    The ._config_files attribute must be set before
+    .parse_config_files() is called.
+    """
+
+    def find_config_files(self):
+        return self._config_files
+
+
+class DistributionTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.argv = sys.argv[:]
+        del sys.argv[1:]
+
+    def tearDown(self):
+        sys.argv[:] = self.argv
+
+    def create_distribution(self, configfiles=()):
+        d = TestDistribution()
+        d._config_files = configfiles
+        d.parse_config_files()
+        d.parse_command_line()
+        return d
+
+    def test_command_packages_unspecified(self):
+        sys.argv.append("build")
+        d = self.create_distribution()
+        self.assertEqual(d.get_command_packages(), ["distutils.command"])
+
+    def test_command_packages_cmdline(self):
+        sys.argv.extend(["--command-packages",
+                         "foo.bar,distutils.tests",
+                         "test_dist",
+                         "-Ssometext",
+                         ])
+        d = self.create_distribution()
+        # let's actually try to load our test command:
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "foo.bar", "distutils.tests"])
+        cmd = d.get_command_obj("test_dist")
+        self.assert_(isinstance(cmd, test_dist))
+        self.assertEqual(cmd.sample_option, "sometext")
+
+    def test_command_packages_configfile(self):
+        sys.argv.append("build")
+        f = open(TESTFN, "w")
+        try:
+            print >>f, "[global]"
+            print >>f, "command_packages = foo.bar, splat"
+            f.close()
+            d = self.create_distribution([TESTFN])
+            self.assertEqual(d.get_command_packages(),
+                             ["distutils.command", "foo.bar", "splat"])
+
+            # ensure command line overrides config:
+            sys.argv[1:] = ["--command-packages", "spork", "build"]
+            d = self.create_distribution([TESTFN])
+            self.assertEqual(d.get_command_packages(),
+                             ["distutils.command", "spork"])
+
+            # Setting --command-packages to '' should cause the default to
+            # be used even if a config file specified something else:
+            sys.argv[1:] = ["--command-packages", "", "build"]
+            d = self.create_distribution([TESTFN])
+            self.assertEqual(d.get_command_packages(), ["distutils.command"])
+
+        finally:
+            os.unlink(TESTFN)
+
+
+def test_suite():
+    return unittest.makeSuite(DistributionTestCase)

From 5f46c973a65daae1e9351c98edd0c4d7e531526b Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 3 Aug 2004 18:53:07 +0000
Subject: [PATCH 0994/8469] make sure distutils logging is shut off in tests to
 avoid spurious output

---
 log.py                        |  3 +++
 tests/support.py              | 13 +++++++++++++
 tests/test_build_py.py        |  4 +++-
 tests/test_build_scripts.py   |  4 +++-
 tests/test_install_scripts.py |  4 +++-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/log.py b/log.py
index 024e7c28de..bf26302fcc 100644
--- a/log.py
+++ b/log.py
@@ -50,7 +50,10 @@ def fatal(self, msg, *args):
 fatal = _global_log.fatal
 
 def set_threshold(level):
+    # return the old threshold for use from tests
+    old = _global_log.threshold
     _global_log.threshold = level
+    return old
 
 def set_verbosity(v):
     if v <= 0:
diff --git a/tests/support.py b/tests/support.py
index cef985d79a..475ceee598 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,6 +3,19 @@
 import shutil
 import tempfile
 
+from distutils import log
+
+
+class LoggingSilencer(object):
+
+    def setUp(self):
+        super(LoggingSilencer, self).setUp()
+        self.threshold = log.set_threshold(log.FATAL)
+
+    def tearDown(self):
+        log.set_threshold(self.threshold)
+        super(LoggingSilencer, self).tearDown()
+
 
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 6f7276866d..78e4c55ed4 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -9,7 +9,9 @@
 from distutils.tests import support
 
 
-class BuildPyTestCase(support.TempdirManager, unittest.TestCase):
+class BuildPyTestCase(support.TempdirManager,
+                      support.LoggingSilencer,
+                      unittest.TestCase):
 
     def test_package_data(self):
         sources = self.mkdtemp()
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 7ef71cc120..bf25b38222 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -9,7 +9,9 @@
 from distutils.tests import support
 
 
-class BuildScriptsTestCase(support.TempdirManager, unittest.TestCase):
+class BuildScriptsTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
+                           unittest.TestCase):
 
     def test_default_settings(self):
         cmd = self.get_build_scripts_cmd("/foo/bar", [])
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 2e86dcd8a9..fffa6ef2c3 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -9,7 +9,9 @@
 from distutils.tests import support
 
 
-class InstallScriptsTestCase(support.TempdirManager, unittest.TestCase):
+class InstallScriptsTestCase(support.TempdirManager,
+                             support.LoggingSilencer,
+                             unittest.TestCase):
 
     def test_default_settings(self):
         dist = Distribution()

From 4e7fa463934326cdeebc21acd417260cb1dd5da2 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Wed, 4 Aug 2004 02:36:18 +0000
Subject: [PATCH 0995/8469] Whitespace normalization.

---
 cygwinccompiler.py | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index acd393d593..31e8e3492f 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -122,17 +122,17 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
                 "Consider upgrading to a newer version of gcc")
         else:
             self.dll_libraries=[]
-	    # Include the appropriate MSVC runtime library if Python was built
-	    # with MSVC 7.0 or 7.1.
-	    msc_pos = sys.version.find('MSC v.')
-	    if msc_pos != -1:
-		msc_ver = sys.version[msc_pos+6:msc_pos+10]
-		if msc_ver == '1300':
-		    # MSVC 7.0
-		    self.dll_libraries = ['msvcr70']
-		elif msc_ver == '1310':
-		    # MSVC 7.1
-		    self.dll_libraries = ['msvcr71']
+            # Include the appropriate MSVC runtime library if Python was built
+            # with MSVC 7.0 or 7.1.
+            msc_pos = sys.version.find('MSC v.')
+            if msc_pos != -1:
+                msc_ver = sys.version[msc_pos+6:msc_pos+10]
+                if msc_ver == '1300':
+                    # MSVC 7.0
+                    self.dll_libraries = ['msvcr70']
+                elif msc_ver == '1310':
+                    # MSVC 7.1
+                    self.dll_libraries = ['msvcr71']
 
     # __init__ ()
 
@@ -319,17 +319,17 @@ def __init__ (self,
         # no additional libraries needed
         self.dll_libraries=[]
 
-	# Include the appropriate MSVC runtime library if Python was built
-	# with MSVC 7.0 or 7.1.
-	msc_pos = sys.version.find('MSC v.')
-	if msc_pos != -1:
-	    msc_ver = sys.version[msc_pos+6:msc_pos+10]
-	    if msc_ver == '1300':
-		# MSVC 7.0
-		self.dll_libraries = ['msvcr70']
-	    elif msc_ver == '1310':
-		# MSVC 7.1
-		self.dll_libraries = ['msvcr71']
+        # Include the appropriate MSVC runtime library if Python was built
+        # with MSVC 7.0 or 7.1.
+        msc_pos = sys.version.find('MSC v.')
+        if msc_pos != -1:
+            msc_ver = sys.version[msc_pos+6:msc_pos+10]
+            if msc_ver == '1300':
+                # MSVC 7.0
+                self.dll_libraries = ['msvcr70']
+            elif msc_ver == '1310':
+                # MSVC 7.1
+                self.dll_libraries = ['msvcr71']
 
     # __init__ ()
 

From bf70c77f2d4b915ed174f2484197be059d589916 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Tue, 17 Aug 2004 10:15:07 +0000
Subject: [PATCH 0996/8469] The get_installer_filename() method forgot to
 return the name it calculates.  Spotted by Cort Danger Stratton.

---
 command/bdist_wininst.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 20bd61389a..33e15561bb 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -283,6 +283,7 @@ def get_installer_filename(self, fullname):
         else:
             installer_name = os.path.join(self.dist_dir,
                                           "%s.win32.exe" % fullname)
+        return installer_name
     # get_installer_filename()
 
     def get_exe_bytes (self):

From 85a862fc5645a070fa1b62884c76210384376912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 25 Aug 2004 11:37:43 +0000
Subject: [PATCH 0997/8469] Patch #736857, #736859: Add -e option to
 build_scripts.

---
 command/build.py         | 5 +++++
 command/build_scripts.py | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/command/build.py b/command/build.py
index 78231541ec..e6b3991f15 100644
--- a/command/build.py
+++ b/command/build.py
@@ -40,6 +40,8 @@ class build (Command):
          "compile extensions and libraries with debugging information"),
         ('force', 'f',
          "forcibly build everything (ignore file timestamps)"),
+        ('executable=', 'e',
+         "specify final destination interpreter path (build.py)"),
         ]
 
     boolean_options = ['debug', 'force']
@@ -61,6 +63,7 @@ def initialize_options (self):
         self.compiler = None
         self.debug = None
         self.force = 0
+        self.executable = None
 
     def finalize_options (self):
 
@@ -93,6 +96,8 @@ def finalize_options (self):
             self.build_scripts = os.path.join(self.build_base,
                                               'scripts-' + sys.version[0:3])
 
+        if self.executable is None:
+            self.executable = os.path.normpath(sys.executable)
     # finalize_options ()
 
 
diff --git a/command/build_scripts.py b/command/build_scripts.py
index e0fcc23e13..fb73719f57 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -24,6 +24,7 @@ class build_scripts (Command):
     user_options = [
         ('build-dir=', 'd', "directory to \"build\" (copy) to"),
         ('force', 'f', "forcibly build everything (ignore file timestamps"),
+        ('executable=', 'e', "specify final destination interpreter path"),
         ]
 
     boolean_options = ['force']
@@ -33,12 +34,14 @@ def initialize_options (self):
         self.build_dir = None
         self.scripts = None
         self.force = None
+        self.executable = None
         self.outfiles = None
 
     def finalize_options (self):
         self.set_undefined_options('build',
                                    ('build_scripts', 'build_dir'),
-                                   ('force', 'force'))
+                                   ('force', 'force'),
+                                   ('executable', 'executable'))
         self.scripts = self.distribution.scripts
 
     def get_source_files(self):
@@ -95,7 +98,7 @@ def copy_scripts (self):
                     outf = open(outfile, "w")
                     if not sysconfig.python_build:
                         outf.write("#!%s%s\n" %
-                                   (os.path.normpath(sys.executable),
+                                   (self.executable,
                                     post_interp))
                     else:
                         outf.write("#!%s%s\n" %

From 5fb221df11270747861f6bbc2dd35e88365935f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 25 Aug 2004 13:00:34 +0000
Subject: [PATCH 0998/8469] Patch #970019: Include version and release in the
 BuildRoot.

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 4be9999497..43181ea018 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -361,7 +361,7 @@ def _make_spec_file(self):
         spec_file.extend([
             'License: ' + self.distribution.get_license(),
             'Group: ' + self.group,
-            'BuildRoot: %{_tmppath}/%{name}-buildroot',
+            'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot',
             'Prefix: %{_prefix}', ])
 
         # noarch if no extension modules

From e640606ebb5a80db67d17d9e2ec8f82e901fff61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 25 Aug 2004 13:04:53 +0000
Subject: [PATCH 0999/8469] Patch #970015: Replace - by _ in version and
 release.

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

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 43181ea018..5c8a7570b3 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -332,8 +332,8 @@ def _make_spec_file(self):
         # definitions and headers
         spec_file = [
             '%define name ' + self.distribution.get_name(),
-            '%define version ' + self.distribution.get_version(),
-            '%define release ' + self.release,
+            '%define version ' + self.distribution.get_version().replace('-','_'),
+            '%define release ' + self.release.replace('-','_'),
             '',
             'Summary: ' + self.distribution.get_description(),
             ]

From 78bb6f689a29017a19b4197024fe1ec78031063b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 26 Aug 2004 05:44:02 +0000
Subject: [PATCH 1000/8469] Add missing executable option to DummyCommand.

---
 tests/test_build_scripts.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index bf25b38222..666ca44c1d 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -39,11 +39,13 @@ def test_build(self):
             self.assert_(name in built)
 
     def get_build_scripts_cmd(self, target, scripts):
+        import sys
         dist = Distribution()
         dist.scripts = scripts
         dist.command_obj["build"] = support.DummyCommand(
             build_scripts=target,
-            force=1
+            force=1,
+            executable=sys.executable
             )
         return build_scripts(dist)
 

From 87a4bf20711940df17932f0c16c05785da706480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 29 Aug 2004 16:40:55 +0000
Subject: [PATCH 1001/8469] Patch #973204: Use -rpath instead of -R on Irix and
 Tru64.

---
 ccompiler.py     | 6 +++++-
 unixccompiler.py | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index a3b1ffa4d5..e5b9d7cc11 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1241,7 +1241,11 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
         lib_opts.append (compiler.library_dir_option (dir))
 
     for dir in runtime_library_dirs:
-        lib_opts.append (compiler.runtime_library_dir_option (dir))
+        opt = compiler.runtime_library_dir_option (dir)
+        if type(opt) is ListType:
+            lib_opts = lib_opts + opt
+        else:
+            lib_opts.append (opt)
 
     # XXX it's important that we *not* remove redundant library mentions!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
diff --git a/unixccompiler.py b/unixccompiler.py
index 24cbcb53e5..56998c3507 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -205,6 +205,8 @@ def runtime_library_dir_option(self, dir):
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
             return "+s -L" + dir
+        elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
+            return ["-rpath", dir]
         elif compiler[:3] == "gcc" or compiler[:3] == "g++":
             return "-Wl,-R" + dir
         else:

From 99846e7ee4b5ad74bdbdcc4428b22f51e8a6a082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 10 Sep 2004 06:25:01 +0000
Subject: [PATCH 1002/8469] Patch #808115: Add script support to bdist_rpm.py.

---
 command/bdist_rpm.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 5c8a7570b3..11fd9f184c 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -95,6 +95,31 @@ class bdist_rpm (Command):
          "RPM 3 compatibility mode (default)"),
         ('rpm2-mode', None,
          "RPM 2 compatibility mode"),
+
+        # Add the hooks necessary for specifying custom scripts
+        ('prep-script=', None, 
+         "Specify a script for the PREP phase of RPM building"),
+        ('build-script=', None, 
+         "Specify a script for the BUILD phase of RPM building"),
+
+        ('pre-install=', None, 
+         "Specify a script for the pre-INSTALL phase of RPM building"),
+        ('install-script=', None, 
+         "Specify a script for the INSTALL phase of RPM building"),
+        ('post-install=', None, 
+         "Specify a script for the post-INSTALL phase of RPM building"),
+
+        ('pre-uninstall=', None, 
+         "Specify a script for the pre-UNINSTALL phase of RPM building"),
+        ('post-uninstall=', None, 
+         "Specify a script for the post-UNINSTALL phase of RPM building"),
+
+        ('clean-script=', None, 
+         "Specify a script for the CLEAN phase of RPM building"),
+
+        ('verify-script=', None,
+         "Specify a script for the VERIFY phase of the RPM build"),
+
        ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode']

From 6d690de8de670b52f88c5d414c1bc2580ade2c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 10 Sep 2004 06:32:54 +0000
Subject: [PATCH 1003/8469] Patch #808120: Add --force-arch=ARCH to
 bdist_rpm.py.

---
 command/bdist_rpm.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 11fd9f184c..559fcb9f73 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -120,6 +120,9 @@ class bdist_rpm (Command):
         ('verify-script=', None,
          "Specify a script for the VERIFY phase of the RPM build"),
 
+        # Allow a packager to explicitly force an architecture
+        ('force-arch=', None,
+         "Force an architecture onto the RPM build process"),
        ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode']
@@ -170,6 +173,8 @@ def initialize_options (self):
         self.use_rpm_opt_flags = 1
         self.rpm3_mode = 1
 
+        self.force_arch = None
+
     # initialize_options()
 
 
@@ -250,6 +255,7 @@ def finalize_package_data (self):
         self.ensure_string_list('build_requires')
         self.ensure_string_list('obsoletes')
 
+        self.ensure_string('force_arch')
     # finalize_package_data ()
 
 
@@ -389,9 +395,12 @@ def _make_spec_file(self):
             'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot',
             'Prefix: %{_prefix}', ])
 
-        # noarch if no extension modules
-        if not self.distribution.has_ext_modules():
-            spec_file.append('BuildArchitectures: noarch')
+        if not self.force_arch:
+            # noarch if no extension modules
+            if not self.distribution.has_ext_modules():
+                spec_file.append('BuildArch: noarch')
+        else:
+            spec_file.append( 'BuildArch: %s' % self.force_arch )
 
         for field in ('Vendor',
                       'Packager',

From d3c88e64e1b45b0c08f081423c191de75c823b05 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 12 Sep 2004 03:49:31 +0000
Subject: [PATCH 1004/8469] Whitespace normalization.

---
 command/bdist_rpm.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 559fcb9f73..22eccb9325 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -97,24 +97,24 @@ class bdist_rpm (Command):
          "RPM 2 compatibility mode"),
 
         # Add the hooks necessary for specifying custom scripts
-        ('prep-script=', None, 
+        ('prep-script=', None,
          "Specify a script for the PREP phase of RPM building"),
-        ('build-script=', None, 
+        ('build-script=', None,
          "Specify a script for the BUILD phase of RPM building"),
 
-        ('pre-install=', None, 
+        ('pre-install=', None,
          "Specify a script for the pre-INSTALL phase of RPM building"),
-        ('install-script=', None, 
+        ('install-script=', None,
          "Specify a script for the INSTALL phase of RPM building"),
-        ('post-install=', None, 
+        ('post-install=', None,
          "Specify a script for the post-INSTALL phase of RPM building"),
 
-        ('pre-uninstall=', None, 
+        ('pre-uninstall=', None,
          "Specify a script for the pre-UNINSTALL phase of RPM building"),
-        ('post-uninstall=', None, 
+        ('post-uninstall=', None,
          "Specify a script for the post-UNINSTALL phase of RPM building"),
 
-        ('clean-script=', None, 
+        ('clean-script=', None,
          "Specify a script for the CLEAN phase of RPM building"),
 
         ('verify-script=', None,

From 6b853a9c0d4926ef6c628436cdec012241c7912b Mon Sep 17 00:00:00 2001
From: Sean Reifschneider <jafo@tummy.com>
Date: Fri, 17 Sep 2004 08:23:22 +0000
Subject: [PATCH 1005/8469] SF Patch 1022003: Change bdist_rpm _topdir to use
 os.path.abspath(self.rpm_base) instead of os.getcwd() + '/' + self.rpm_base

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 22eccb9325..18546d2611 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -326,7 +326,7 @@ def run (self):
             rpm_cmd.append('-ba')
         if self.rpm3_mode:
             rpm_cmd.extend(['--define',
-                             '_topdir %s/%s' % (os.getcwd(), self.rpm_base),])
+                             '_topdir %s' % os.path.abspath(self.rpm_base)])
         if not self.keep_temp:
             rpm_cmd.append('--clean')
         rpm_cmd.append(spec_path)

From f9ace2e1ee023402f1c4ba9df06df33a2d5b52ac Mon Sep 17 00:00:00 2001
From: Sean Reifschneider <jafo@tummy.com>
Date: Fri, 17 Sep 2004 08:34:12 +0000
Subject: [PATCH 1006/8469] SF Patch 1022011: Add a command-line argument
 --no-autoreq, which sets the    "AutoReq: 0" to disable automatic dependency
 searching.

---
 command/bdist_rpm.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 18546d2611..7f1b440e05 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -81,6 +81,8 @@ class bdist_rpm (Command):
          "capabilities required to build this package"),
         ('obsoletes=', None,
          "capabilities made obsolete by this package"),
+        ('no-autoreq', None,
+         "do not automatically calculate dependencies"),
 
         # Actions to take when building RPM
         ('keep-temp', 'k',
@@ -125,7 +127,8 @@ class bdist_rpm (Command):
          "Force an architecture onto the RPM build process"),
        ]
 
-    boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode']
+    boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode',
+                       'no-autoreq']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
@@ -172,6 +175,7 @@ def initialize_options (self):
         self.keep_temp = 0
         self.use_rpm_opt_flags = 1
         self.rpm3_mode = 1
+        self.no_autoreq = 0
 
         self.force_arch = None
 
@@ -429,6 +433,9 @@ def _make_spec_file(self):
         if self.icon:
             spec_file.append('Icon: ' + os.path.basename(self.icon))
 
+        if self.no_autoreq:
+            spec_file.append('AutoReq: 0')
+
         spec_file.extend([
             '',
             '%description',

From de08fcf3db1b9779a9430c600354bed93dadd90b Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 13 Oct 2004 12:35:28 +0000
Subject: [PATCH 1007/8469] Backing out the basic dependency checking (from
 pycon sprint). This support was only a first cut, and doesn't deserve to be
 in a released version (where we have to support it in an ongoing manner)

---
 command/__init__.py |  1 -
 command/checkdep.py | 70 ---------------------------------------------
 command/install.py  | 13 +--------
 core.py             |  3 +-
 dist.py             | 61 +--------------------------------------
 5 files changed, 3 insertions(+), 145 deletions(-)
 delete mode 100644 command/checkdep.py

diff --git a/command/__init__.py b/command/__init__.py
index 3a9a53ee85..870005dca7 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -24,7 +24,6 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
-           'checkdep',
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',
diff --git a/command/checkdep.py b/command/checkdep.py
deleted file mode 100644
index 729002c725..0000000000
--- a/command/checkdep.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""distutils.command.x
-
-Implements the Distutils 'x' command.
-"""
-
-# created 2000/mm/dd, John Doe
-
-__revision__ = "$Id$"
-
-from distutils.core import Command
-
-class DependencyFailure(Exception): pass
-
-class VersionTooOld(DependencyFailure): pass
-
-class VersionNotKnown(DependencyFailure): pass
-
-class checkdep (Command):
-
-    # Brief (40-50 characters) description of the command
-    description = "check package dependencies"
-
-    # List of option tuples: long name, short name (None if no short
-    # name), and help string.
-    # Later on, we might have auto-fetch and the like here. Feel free.
-    user_options = []
-
-    def initialize_options (self):
-        self.debug = None
-
-    # initialize_options()
-
-
-    def finalize_options (self):
-        pass
-    # finalize_options()
-
-
-    def run (self):
-        from distutils.version import LooseVersion
-        failed = []
-        for pkg, ver in self.distribution.metadata.requires:
-            if pkg == 'python':
-                if ver is not None:
-                    # Special case the 'python' package
-                    import sys
-                    thisver = LooseVersion('%d.%d.%d'%sys.version_info[:3])
-                    if thisver < ver:
-                        failed.append(((pkg,ver), VersionTooOld(thisver)))
-                continue
-            # Kinda hacky - we should do more here
-            try:
-                mod = __import__(pkg)
-            except Exception, e:
-                failed.append(((pkg,ver), e))
-                continue
-            if ver is not None:
-                if hasattr(mod, '__version__'):
-                    thisver = LooseVersion(mod.__version__)
-                    if thisver < ver:
-                        failed.append(((pkg,ver), VersionTooOld(thisver)))
-                else:
-                    failed.append(((pkg,ver), VersionNotKnown()))
-
-        if failed:
-            raise DependencyFailure, failed
-
-    # run()
-
-# class x
diff --git a/command/install.py b/command/install.py
index 175f785214..2aaf010562 100644
--- a/command/install.py
+++ b/command/install.py
@@ -126,8 +126,6 @@ class install (Command):
          "force installation (overwrite any existing files)"),
         ('skip-build', None,
          "skip rebuilding everything (for testing/debugging)"),
-        ('skip-checkdep', None,
-         "skip checking dependencies (use at own risk)"),
 
         # Where to install documentation (eventually!)
         #('doc-format=', None, "format of documentation to generate"),
@@ -185,15 +183,12 @@ def initialize_options (self):
 
         # 'force' forces installation, even if target files are not
         # out-of-date.  'skip_build' skips running the "build" command,
-        # handy if you know it's not necessary.  'skip_checkdep' skips
-        # the 'checkdep' command, if you are sure you can work around the
-        # dependency failure in another way. 'warn_dir' (which is *not*
+        # handy if you know it's not necessary.  'warn_dir' (which is *not*
         # a user option, it's just there so the bdist_* commands can turn
         # it off) determines whether we warn about installing to a
         # directory not in sys.path.
         self.force = 0
         self.skip_build = 0
-        self.skip_checkdep = 0
         self.warn_dir = 1
 
         # These are only here as a conduit from the 'build' command to the
@@ -505,12 +500,6 @@ def run (self):
         if not self.skip_build:
             self.run_command('build')
 
-        # We check dependencies before we install
-        # For now, this is disabled. Before 2.4 is released, this will
-        # be turned on.
-        #if not self.skip_checkdep:
-        #    self.run_command('checkdep')
-
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
diff --git a/core.py b/core.py
index fef291f656..6867534967 100644
--- a/core.py
+++ b/core.py
@@ -47,8 +47,7 @@ def gen_usage (script_name):
                   'name', 'version', 'author', 'author_email',
                   'maintainer', 'maintainer_email', 'url', 'license',
                   'description', 'long_description', 'keywords',
-                  'platforms', 'classifiers', 'download_url',
-                  'provides', 'requires', )
+                  'platforms', 'classifiers', 'download_url',)
 
 # Legal keyword arguments for the Extension constructor
 extension_keywords = ('name', 'sources', 'include_dirs',
diff --git a/dist.py b/dist.py
index 53846e937f..a23a773c57 100644
--- a/dist.py
+++ b/dist.py
@@ -223,51 +223,6 @@ def __init__ (self, attrs=None):
                 else:
                     sys.stderr.write(msg + "\n")
 
-            # Build up the requires sequence
-            from distutils.version import LooseVersion
-            requires = attrs.get('requires')
-            if requires:
-                if isinstance(requires, type('')):
-                    raise DistutilsOptionError, 'requires should be a sequence'
-                newreq = []
-                for req in requires:
-                    if '-' not in req:
-                        # We have a plain package name - any version will do
-                        newreq.append((req,None))
-                    else:
-                        pkg, ver = string.split(req, '-', 1)
-                        newreq.append((pkg, LooseVersion(ver)))
-                attrs['requires'] = newreq
-
-            # Build up the provides object. If the setup() has no
-            # provides line, we use packages or modules and the version
-            # to synthesise the provides. If no version is provided (no
-            # pun intended) we don't have a provides entry at all.
-            provides = attrs.get('provides')
-            if provides:
-                if isinstance(provides, type('')):
-                    raise DistutilsOptionError, 'provides should be a sequence'
-                newprov = []
-                for prov in provides:
-                    if '-' not in prov:
-                        # We have a plain package name - any version will do
-                        newprov.append((prov,None))
-                    else:
-                        pkg, ver = string.split(prov, '-', 1)
-                        newprov.append((pkg, LooseVersion(ver)))
-                attrs['provides'] = newprov
-            elif attrs.get('version'):
-                # Build a provides line
-                prov = []
-                if attrs.get('packages'):
-                    for pkg in attrs['packages']:
-                        pkg = string.replace(pkg, '/', '.')
-                        prov.append('%s-%s'%(pkg, attrs['version']))
-                elif attrs.get('modules'):
-                    for mod in attrs['modules']:
-                        prov.append('%s-%s'%(mod, attrs['version']))
-                attrs['provides'] = prov
-
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
@@ -275,7 +230,6 @@ def __init__ (self, attrs=None):
                     setattr(self.metadata, key, val)
                 elif hasattr(self, key):
                     setattr(self, key, val)
-                else:
                     msg = "Unknown distribution option: %s" % repr(key)
                     if warnings is not None:
                         warnings.warn(msg)
@@ -1060,7 +1014,7 @@ class DistributionMetadata:
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
                          "contact_email", "license", "classifiers",
-                         "download_url", "provides", "requires",)
+                         "download_url")
 
     def __init__ (self):
         self.name = None
@@ -1077,8 +1031,6 @@ def __init__ (self):
         self.platforms = None
         self.classifiers = None
         self.download_url = None
-        self.requires = []
-        self.provides = []
 
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
@@ -1094,10 +1046,6 @@ def write_pkg_info (self, base_dir):
         pkg_info.write('Author: %s\n' % self.get_contact() )
         pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
         pkg_info.write('License: %s\n' % self.get_license() )
-        for req in self.get_requires():
-            pkg_info.write('Requires: %s\n' % req )
-        for prov in self.get_provides():
-            pkg_info.write('Provides: %s\n' % prov )
         if self.download_url:
             pkg_info.write('Download-URL: %s\n' % self.download_url)
 
@@ -1176,13 +1124,6 @@ def get_classifiers(self):
     def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
-    def get_requires(self):
-        return [ '%s%s%s'%(x, (y and '-') or '', y or '')
-                                                for x,y in self.requires ]
-
-    def get_provides(self):
-        return self.provides
-
 # class DistributionMetadata
 
 

From f790936afe6035720d8afde494b9b17d408032c7 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 13 Oct 2004 13:22:34 +0000
Subject: [PATCH 1008/8469] oops. how did _that_ happen?

---
 dist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist.py b/dist.py
index a23a773c57..1a39022fd8 100644
--- a/dist.py
+++ b/dist.py
@@ -230,6 +230,7 @@ def __init__ (self, attrs=None):
                     setattr(self.metadata, key, val)
                 elif hasattr(self, key):
                     setattr(self, key, val)
+                else:
                     msg = "Unknown distribution option: %s" % repr(key)
                     if warnings is not None:
                         warnings.warn(msg)

From 51311882da9cc8f976e8c669794f9bbcc1860792 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 13 Oct 2004 15:54:17 +0000
Subject: [PATCH 1009/8469] Patch 983206: distutils obeys LDSHARED env var.
 Removed the code in Python's own setup.py that did the same thing (and tested
 on Solaris, where LDSHARED is needed...)

---
 sysconfig.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 0a4e14cc37..8986dc9857 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -153,6 +153,8 @@ def customize_compiler(compiler):
             cc = os.environ['CC']
         if os.environ.has_key('CXX'):
             cxx = os.environ['CXX']
+        if os.environ.has_key('LDSHARED'):
+            ldshared = os.environ['LDSHARED']
         if os.environ.has_key('CPP'):
             cpp = os.environ['CPP']
         else:

From 27585e07f272206ef70fe911c5c0f05c78fa9336 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Thu, 14 Oct 2004 10:02:08 +0000
Subject: [PATCH 1010/8469] Patch 1046644 - improved distutils support for
 SWIG.

---
 command/build_ext.py | 27 +++++++++++++++++++++++----
 core.py              |  2 +-
 extension.py         |  5 +++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 04cd742cef..07614c6a0d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -81,6 +81,10 @@ class build_ext (Command):
          "specify the compiler type"),
         ('swig-cpp', None,
          "make SWIG create C++ files (default is C)"),
+        ('swig-opts=', None,
+         "list of SWIG command line options"),
+        ('swig=', None,
+         "path to the SWIG executable"),
         ]
 
     boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
@@ -107,8 +111,9 @@ def initialize_options (self):
         self.debug = None
         self.force = None
         self.compiler = None
+        self.swig = None
         self.swig_cpp = None
-
+        self.swig_opts = None
 
     def finalize_options (self):
         from distutils import sysconfig
@@ -205,6 +210,11 @@ def finalize_options (self):
         if self.undef:
             self.undef = string.split(self.undef, ',')
 
+        if self.swig_opts is None:
+            self.swig_opts = []
+        else:
+            self.swig_opts = self.swig_opts.split(' ')
+
     # finalize_options ()
 
 
@@ -429,7 +439,7 @@ def build_extension(self, ext):
         # First, scan the sources for SWIG definition files (.i), run
         # SWIG on 'em to create .c files, and modify the sources list
         # accordingly.
-        sources = self.swig_sources(sources)
+        sources = self.swig_sources(sources, ext)
 
         # Next, compile the source code to object files.
 
@@ -492,7 +502,7 @@ def build_extension(self, ext):
             target_lang=language)
 
 
-    def swig_sources (self, sources):
+    def swig_sources (self, sources, extension):
 
         """Walk the list of source files in 'sources', looking for SWIG
         interface (.i) files.  Run SWIG on all that are found, and
@@ -510,6 +520,9 @@ def swig_sources (self, sources):
         # the temp dir.
 
         if self.swig_cpp:
+            log.warn("--swig-cpp is deprecated - use --swig-opts=-c++")
+
+        if self.swig_cpp or ('-c++' in self.swig_opts):
             target_ext = '.cpp'
         else:
             target_ext = '.c'
@@ -526,11 +539,17 @@ def swig_sources (self, sources):
         if not swig_sources:
             return new_sources
 
-        swig = self.find_swig()
+        swig = self.swig or self.find_swig()
         swig_cmd = [swig, "-python"]
+        swig_cmd.extend(self.swig_opts)
         if self.swig_cpp:
             swig_cmd.append("-c++")
 
+        # Do not override commandline arguments
+        if not self.swig_opts:
+            for o in extension.swig_opts:
+                swig_cmd.append(o)
+
         for source in swig_sources:
             target = swig_targets[source]
             log.info("swigging %s to %s", source, target)
diff --git a/core.py b/core.py
index 6867534967..8c82801051 100644
--- a/core.py
+++ b/core.py
@@ -54,7 +54,7 @@ def gen_usage (script_name):
                       'define_macros', 'undef_macros',
                       'library_dirs', 'libraries', 'runtime_library_dirs',
                       'extra_objects', 'extra_compile_args', 'extra_link_args',
-                      'export_symbols', 'depends', 'language')
+                      'swig_opts', 'export_symbols', 'depends', 'language')
 
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
diff --git a/extension.py b/extension.py
index e69f3e93e0..440d128cdc 100644
--- a/extension.py
+++ b/extension.py
@@ -75,6 +75,9 @@ class Extension:
         used on all platforms, and not generally necessary for Python
         extensions, which typically export exactly one symbol: "init" +
         extension_name.
+      swig_opts : [string]
+        any extra options to pass to SWIG if a source file has the .i
+        extension.
       depends : [string]
         list of files that the extension depends on
       language : string
@@ -95,6 +98,7 @@ def __init__ (self, name, sources,
                   extra_compile_args=None,
                   extra_link_args=None,
                   export_symbols=None,
+                  swig_opts = None,
                   depends=None,
                   language=None,
                   **kw                      # To catch unknown keywords
@@ -116,6 +120,7 @@ def __init__ (self, name, sources,
         self.extra_compile_args = extra_compile_args or []
         self.extra_link_args = extra_link_args or []
         self.export_symbols = export_symbols or []
+        self.swig_opts = swig_opts or []
         self.depends = depends or []
         self.language = language
 

From dea703ad7656eb0d194d854734483045e0a0be56 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 27 Oct 2004 21:54:33 +0000
Subject: [PATCH 1011/8469] Fix [1055540 ] bdist_wininst broken for pure Python
 distributions

---
 command/bdist_wininst.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 33e15561bb..f4bab62ae3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -116,20 +116,21 @@ def run (self):
         install_lib.compile = 0
         install_lib.optimize = 0
 
-        # If we are building an installer for a Python version other
-        # than the one we are currently running, then we need to ensure
-        # our build_lib reflects the other Python version rather than ours.
-        # Note that for target_version!=sys.version, we must have skipped the
-        # build step, so there is no issue with enforcing the build of this
-        # version.
-        target_version = self.target_version
-        if not target_version:
-            assert self.skip_build, "Should have already checked this"
-            target_version = sys.version[0:3]
-        plat_specifier = ".%s-%s" % (get_platform(), target_version)
-        build = self.get_finalized_command('build')
-        build.build_lib = os.path.join(build.build_base,
-                                       'lib' + plat_specifier)
+        if self.distribution.has_ext_modules():
+            # If we are building an installer for a Python version other
+            # than the one we are currently running, then we need to ensure
+            # our build_lib reflects the other Python version rather than ours.
+            # Note that for target_version!=sys.version, we must have skipped the
+            # build step, so there is no issue with enforcing the build of this
+            # version.
+            target_version = self.target_version
+            if not target_version:
+                assert self.skip_build, "Should have already checked this"
+                target_version = sys.version[0:3]
+            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            build = self.get_finalized_command('build')
+            build.build_lib = os.path.join(build.build_base,
+                                           'lib' + plat_specifier)
 
         # Use a custom scheme for the zip-file, because we have to decide
         # at installation time which scheme to use.

From d0a2baffd16b3af0caca15a0b5ec9c3449a6abcd Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 10 Nov 2004 09:01:41 +0000
Subject: [PATCH 1012/8469] Avoid a linker warning: MSVC 7 doesn't support
 /pdb:None, the debug info will always be in a .pdb file.

---
 msvccompiler.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 168881ad2d..ab92801c2b 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -237,9 +237,14 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
                                       '/Z7', '/D_DEBUG']
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
-        self.ldflags_shared_debug = [
-            '/DLL', '/nologo', '/INCREMENTAL:no', '/pdb:None', '/DEBUG'
-            ]
+        if self.__version >= 7:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG'
+                ]
+        else:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/pdb:None', '/DEBUG'
+                ]
         self.ldflags_static = [ '/nologo']
 
 

From 5712b12c54ef78b0e4211337269ae93fdcdb1ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 10 Nov 2004 22:23:15 +0000
Subject: [PATCH 1013/8469] Update compatibility comments to 2.1, corresponding
 to PEP 291 1.13.

---
 __init__.py                | 2 +-
 archive_util.py            | 2 +-
 bcppcompiler.py            | 2 +-
 ccompiler.py               | 2 +-
 cmd.py                     | 2 +-
 command/__init__.py        | 2 +-
 command/bdist.py           | 2 +-
 command/bdist_dumb.py      | 2 +-
 command/bdist_rpm.py       | 2 +-
 command/bdist_wininst.py   | 2 +-
 command/build.py           | 2 +-
 command/build_clib.py      | 2 +-
 command/build_ext.py       | 2 +-
 command/build_py.py        | 2 +-
 command/build_scripts.py   | 2 +-
 command/clean.py           | 2 +-
 command/config.py          | 2 +-
 command/install.py         | 2 +-
 command/install_data.py    | 2 +-
 command/install_headers.py | 2 +-
 command/install_lib.py     | 2 +-
 command/install_scripts.py | 2 +-
 command/sdist.py           | 2 +-
 core.py                    | 2 +-
 cygwinccompiler.py         | 2 +-
 debug.py                   | 2 +-
 dep_util.py                | 2 +-
 dir_util.py                | 2 +-
 dist.py                    | 2 +-
 errors.py                  | 2 +-
 fancy_getopt.py            | 2 +-
 file_util.py               | 2 +-
 filelist.py                | 2 +-
 log.py                     | 2 +-
 msvccompiler.py            | 2 +-
 mwerkscompiler.py          | 2 +-
 spawn.py                   | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/__init__.py b/__init__.py
index 2592a6c559..a1dbb4b5ef 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,7 +8,7 @@
    setup (...)
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/archive_util.py b/archive_util.py
index 55babe6fc6..6aa5e635d7 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,7 +3,7 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/bcppcompiler.py b/bcppcompiler.py
index f995e36711..ca524a5b88 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,7 +11,7 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/ccompiler.py b/ccompiler.py
index e5b9d7cc11..6dad757a6a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,7 +3,7 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/cmd.py b/cmd.py
index be8e826fdb..3cd5858920 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,7 +4,7 @@
 in the distutils.command package.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/__init__.py b/command/__init__.py
index 870005dca7..0888c2712b 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -3,7 +3,7 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/bdist.py b/command/bdist.py
index 4eca9c3426..23c25a55a8 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 3db332d5bd..7f498c8396 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,7 +4,7 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 7f1b440e05..8eaaff3246 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index f4bab62ae3..9b45cf35e8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/build.py b/command/build.py
index e6b3991f15..9ae0a292a3 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,7 +2,7 @@
 
 Implements the Distutils 'build' command."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/build_clib.py b/command/build_clib.py
index ef03ed7269..69d8c75166 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,7 +4,7 @@
 that is included in the module distribution and needed by an extension
 module."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 07614c6a0d..4191c76cef 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,7 +4,7 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/build_py.py b/command/build_py.py
index 3079bfcdef..621bcb4af3 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,7 +2,7 @@
 
 Implements the Distutils 'build_py' command."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/build_scripts.py b/command/build_scripts.py
index fb73719f57..bda4480ca5 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,7 +2,7 @@
 
 Implements the Distutils 'build_scripts' command."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/clean.py b/command/clean.py
index 41b22777bc..1844ffefd3 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -4,7 +4,7 @@
 
 # contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/config.py b/command/config.py
index f18c79ff43..520c1b0c76 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,7 +9,7 @@
 this header file lives".
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/install.py b/command/install.py
index 2aaf010562..fdbec35872 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,7 +4,7 @@
 
 from distutils import log
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/install_data.py b/command/install_data.py
index 2fa0da29fe..1069830fb3 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -5,7 +5,7 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/install_headers.py b/command/install_headers.py
index 3a37d309f9..2bd1b04367 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/install_lib.py b/command/install_lib.py
index c234117adc..22d0ab37a7 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,4 +1,4 @@
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/install_scripts.py b/command/install_scripts.py
index abe10457b6..fe93ef5af2 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -5,7 +5,7 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/command/sdist.py b/command/sdist.py
index 7021496549..fe6c913913 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,7 +2,7 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/core.py b/core.py
index 8c82801051..eba94559d9 100644
--- a/core.py
+++ b/core.py
@@ -6,7 +6,7 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 31e8e3492f..4fd23e6dc6 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -45,7 +45,7 @@
 # * mingw gcc 3.2/ld 2.13 works
 #   (ld supports -shared)
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/debug.py b/debug.py
index 2a87eb5d28..b67139c7d4 100644
--- a/debug.py
+++ b/debug.py
@@ -1,6 +1,6 @@
 import os
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/dep_util.py b/dep_util.py
index 0746633d23..c139c852e4 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,7 +4,7 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/dir_util.py b/dir_util.py
index 77f64c4104..7f1450373b 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,7 +2,7 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/dist.py b/dist.py
index 1a39022fd8..9eb2aa424c 100644
--- a/dist.py
+++ b/dist.py
@@ -4,7 +4,7 @@
 being built/installed/distributed.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/errors.py b/errors.py
index 94e83fb557..e72221bdba 100644
--- a/errors.py
+++ b/errors.py
@@ -8,7 +8,7 @@
 This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 6c1134fc40..218ed73f98 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,7 +8,7 @@
   * options set attributes of a passed-in object
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/file_util.py b/file_util.py
index e2b1c51558..37b152ed8a 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,7 +3,7 @@
 Utility functions for operating on single files.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/filelist.py b/filelist.py
index 566d87ab28..43f9aaaf5b 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,7 +4,7 @@
 and building lists of files.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/log.py b/log.py
index bf26302fcc..cf3ee136e0 100644
--- a/log.py
+++ b/log.py
@@ -1,6 +1,6 @@
 """A simple log mechanism styled after PEP 282."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 # The class here is styled after PEP 282 so that it could later be
 # replaced with a standard Python logging implementation.
diff --git a/msvccompiler.py b/msvccompiler.py
index ab92801c2b..dd9d8928ad 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -8,7 +8,7 @@
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index d546de1f25..0de123d9e9 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -4,7 +4,7 @@
 for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
 Windows."""
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 
diff --git a/spawn.py b/spawn.py
index a89b88cebf..e5654ff009 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,7 +6,7 @@
 executable name.
 """
 
-# This module should be kept compatible with Python 1.5.2.
+# This module should be kept compatible with Python 2.1.
 
 __revision__ = "$Id$"
 

From 0d815d149d55b3ec5930550e0facf64838f03cb7 Mon Sep 17 00:00:00 2001
From: Fredrik Lundh <fredrik@pythonware.com>
Date: Wed, 24 Nov 2004 22:31:11 +0000
Subject: [PATCH 1014/8469] SF patch #1071739 (by Christos Georgiou)

This patch offers a better explanation in case the MS VC++ (free)
toolkit is installed but the .NET Framework SDK is not.
---
 msvccompiler.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index dd9d8928ad..ccb62a8813 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -124,10 +124,15 @@ def load_macros(self, version):
         self.set_macro("VSInstallDir", vsbase + r"\Setup\VS", "productdir")
         net = r"Software\Microsoft\.NETFramework"
         self.set_macro("FrameworkDir", net, "installroot")
-        if version > 7.0:
-            self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
-        else:
-            self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
+	try:
+	    if version > 7.0:
+		self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
+	    else:
+		self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
+	except KeyError, exc: #
+            raise DistutilsPlatformError, \
+                  ("The .NET Framework SDK needs to be installed before "
+                   "building extensions for Python.")
 
         p = r"Software\Microsoft\NET Framework Setup\Product"
         for base in HKEYS:

From 69251931fb71629f37d7daa3e3765ee802513e74 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 28 Nov 2004 01:10:01 +0000
Subject: [PATCH 1015/8469] Whitespace normalization.

---
 msvccompiler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index ccb62a8813..89a75b3486 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -124,12 +124,12 @@ def load_macros(self, version):
         self.set_macro("VSInstallDir", vsbase + r"\Setup\VS", "productdir")
         net = r"Software\Microsoft\.NETFramework"
         self.set_macro("FrameworkDir", net, "installroot")
-	try:
-	    if version > 7.0:
-		self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
-	    else:
-		self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
-	except KeyError, exc: #
+        try:
+            if version > 7.0:
+                self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
+            else:
+                self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
+        except KeyError, exc: #
             raise DistutilsPlatformError, \
                   ("The .NET Framework SDK needs to be installed before "
                    "building extensions for Python.")

From 0713ced9996da5971124d3912d21af46ec2c21ad Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 1 Dec 2004 19:43:34 +0000
Subject: [PATCH 1016/8469] Recompiled binaries after source changes.

---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index ed288d6a260ab8e0b5e8a9b79ab781433399e94c..4683659e41dbce722c3ff1160de9954a03c331fa 100644
GIT binary patch
delta 3904
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
ar&@Q)Z=u7%S_B>;|M%zaTl~Vstp5XW)y}g3

delta 3847
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
TKJ?Amg$rWfIt|Hh;hg^gbD-Z?

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index a800678ea7dca567eb518e427a9b267deed5b9c4..b8028f448bdb7598c6f88aead5c6074c3a6a7e19 100644
GIT binary patch
delta 14899
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

delta 14881
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
V#=;>aX&n@A`0(a?&wW1e{{X&s-p&93


From 543e5a6ca421c514dd517e81bb4d2ba64da772dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Thu, 2 Dec 2004 20:14:16 +0000
Subject: [PATCH 1017/8469] Restore Python 2.1 compatibility (os.extsep was
 introduced in Python 2.2).

---
 command/install_lib.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 22d0ab37a7..08ff543449 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -9,8 +9,10 @@
 
 
 # Extension for Python source files.
-PYTHON_SOURCE_EXTENSION = os.extsep + "py"
-
+if hasattr(os, 'extsep'):
+    PYTHON_SOURCE_EXTENSION = os.extsep + "py"
+else:
+    PYTHON_SOURCE_EXTENSION = ".py"
 
 class install_lib (Command):
 

From abc818a08898ada7a31b2466a7bf56848798fe86 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Wed, 22 Dec 2004 17:24:36 +0000
Subject: [PATCH 1018/8469] Recompiled after source changes.

---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index 4683659e41dbce722c3ff1160de9954a03c331fa..6ee282353046c2c28240398af0611d81a1fd5dd6 100644
GIT binary patch
delta 14670
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

delta 14779
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
G$NvH-Cc66o

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index b8028f448bdb7598c6f88aead5c6074c3a6a7e19..6ebef04653050ef00e6506cb16c9446f69966bef 100644
GIT binary patch
delta 2154
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

delta 2057
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


From 9c20e5e7816e7e2f1a132fe8a7458745355141b1 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 26 Dec 2004 23:07:48 +0000
Subject: [PATCH 1019/8469] After discussion on the PythonMac-SIG it was
 decided that it is better to make using "-undefined dynamic_lookup" for
 linking extensions more automatic on 10.3 and later. So if we're on that
 platform and MACOSX_DEPLOYMENT_TARGET is not set we now set it to the current
 OSX version during configure. Additionally, distutils will pick up the
 configure-time value by default.

Will backport.
---
 sysconfig.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8986dc9857..d4eb368e9f 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -360,11 +360,13 @@ def _init_posix():
     # On MacOSX we need to check the setting of the environment variable
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
-    # An alternative would be to force MACOSX_DEPLOYMENT_TARGET to be
-    # the same as during configure.
+    # If it isn't set we set it to the configure-time value
     if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
         cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
+        if cur_target == '':
+            cur_target = cfg_target
+            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
         if cfg_target != cur_target:
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))

From 4cca0bf734f15ffd714bcb39f781c6e3d768312f Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 20 Jan 2005 19:14:17 +0000
Subject: [PATCH 1020/8469] Fix [ 1103844 ] fix distutils.install.dump_dirs()
 with negated options.

Will backport myself.
---
 command/install.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/install.py b/command/install.py
index fdbec35872..7723761117 100644
--- a/command/install.py
+++ b/command/install.py
@@ -352,8 +352,13 @@ def dump_dirs (self, msg):
                 opt_name = opt[0]
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
-                opt_name = string.translate(opt_name, longopt_xlate)
-                val = getattr(self, opt_name)
+                if self.negative_opt.has_key(opt_name):
+                    opt_name = string.translate(self.negative_opt[opt_name],
+                                                longopt_xlate)
+                    val = not getattr(self, opt_name)
+                else:
+                    opt_name = string.translate(opt_name, longopt_xlate)
+                    val = getattr(self, opt_name)
                 print "  %s: %s" % (opt_name, val)
 
 

From 3145cad407f875f453bb252f7aea93597c6e6777 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Thu, 3 Feb 2005 20:48:26 +0000
Subject: [PATCH 1021/8469] Recompiled after source changes.

---
 command/wininst-6.exe   | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe | Bin 61440 -> 61440 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.exe b/command/wininst-6.exe
index 6ee282353046c2c28240398af0611d81a1fd5dd6..bd715250e780b37e94996e33820070987bcc77fd 100644
GIT binary patch
delta 15247
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
bP-%azR!KZtF@ko|0KpnNw)M^npUwE+0zYU(

delta 14785
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
HuO|N=)K@Bl

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 6ebef04653050ef00e6506cb16c9446f69966bef..ee35713940177c0eb8e3cf0435d7a6a9287a27fc 100644
GIT binary patch
delta 15856
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
G%=!Pqr8oEh

delta 15284
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
XbL~ghw)T_P=zpW$)^<zJ@8|z7><1W-


From 21599f63453eaf27fb5819a7d7706cb23720f323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Mar 2005 08:12:27 +0000
Subject: [PATCH 1022/8469] Patch #1104111: Alter setup.py --help and
 --help-commands.

---
 command/clean.py |  2 +-
 dist.py          | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/command/clean.py b/command/clean.py
index 1844ffefd3..02189c531a 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -15,7 +15,7 @@
 
 class clean (Command):
 
-    description = "clean up output of 'build' command"
+    description = "clean up temporary files from 'build' command"
     user_options = [
         ('build-base=', 'b',
          "base build directory (default: 'build.build-base')"),
diff --git a/dist.py b/dist.py
index 9eb2aa424c..4f4bae5218 100644
--- a/dist.py
+++ b/dist.py
@@ -59,6 +59,15 @@ class Distribution:
                       ('help', 'h', "show detailed help message"),
                      ]
 
+    # 'common_usage' is a short (2-3 line) string describing the common
+    # usage of the setup script.
+    common_usage = """\
+Common commands: (see '--help-commands' for more)
+
+  setup.py build      will build the package underneath 'build/'
+  setup.py install    will install the package
+"""
+
     # options that are not propagated to the commands
     display_options = [
         ('help-commands', None,
@@ -608,7 +617,7 @@ def _show_help (self,
             else:
                 options = self.global_options
             parser.set_option_table(options)
-            parser.print_help("Global options:")
+            parser.print_help(self.common_usage + "\nGlobal options:")
             print
 
         if display_options:

From b60285cfd0da94171ac6ab69812e9213c9826d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Mar 2005 11:08:03 +0000
Subject: [PATCH 1023/8469] Patch #1046831: Use get_python_version where
 appropriate in sysconfig.py.

---
 sysconfig.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d4eb368e9f..aae0f27cb5 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -34,7 +34,7 @@
 del argv0_path, landmark
 
 
-def get_python_version ():
+def get_python_version():
     """Return a string containing the major and minor Python version,
     leaving off the patchlevel.  Sample return values could be '1.5'
     or '2.2'.
@@ -65,7 +65,7 @@ def get_python_inc(plat_specific=0, prefix=None):
                 if not os.path.exists(inc_dir):
                     inc_dir = os.path.join(os.path.dirname(base), "Include")
             return inc_dir
-        return os.path.join(prefix, "include", "python" + sys.version[:3])
+        return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
     elif os.name == "mac":
@@ -110,7 +110,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         if standard_lib:
             return os.path.join(prefix, "Lib")
         else:
-            if sys.version < "2.2":
+            if get_python_version() < "2.2":
                 return prefix
             else:
                 return os.path.join(PREFIX, "Lib", "site-packages")
@@ -189,7 +189,7 @@ def get_config_h_filename():
         inc_dir = os.curdir
     else:
         inc_dir = get_python_inc(plat_specific=1)
-    if sys.version < '2.2':
+    if get_python_version() < '2.2':
         config_h = 'config.h'
     else:
         # The name of the config.h file changed in 2.2
@@ -378,7 +378,7 @@ def _init_posix():
     if python_build:
         g['LDSHARED'] = g['BLDSHARED']
 
-    elif sys.version < '2.1':
+    elif get_python_version() < '2.1':
         # The following two branches are for 1.5.2 compatibility.
         if sys.platform == 'aix4':          # what about AIX 3.x ?
             # Linker script is in the config directory, not in Modules as the
@@ -405,7 +405,7 @@ def _init_posix():
             # it's taken care of for them by the 'build_ext.get_libraries()'
             # method.)
             g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                             (linkerscript, PREFIX, sys.version[0:3]))
+                             (linkerscript, PREFIX, get_python_version()))
 
     global _config_vars
     _config_vars = g

From 827d92b58b53f25b8e2579d6f301c51a43780687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 4 Mar 2005 13:50:17 +0000
Subject: [PATCH 1024/8469] Patch #1075887: Don't require MSVC in distutils if
 there is nothing to build. Will backport to 2.4

---
 msvccompiler.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 89a75b3486..016139321c 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -211,6 +211,9 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
             self.__macros = MacroExpander(self.__version)
         else:
             self.__root = r"Software\Microsoft\Devstudio"
+        self.initialized = False
+
+    def initialize(self):
         self.__paths = self.get_msvc_paths("path")
 
         if len (self.__paths) == 0:
@@ -290,6 +293,7 @@ def compile(self, sources,
                 output_dir=None, macros=None, include_dirs=None, debug=0,
                 extra_preargs=None, extra_postargs=None, depends=None):
 
+	if not self.initialized: self.initialize()
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)
@@ -381,6 +385,7 @@ def create_static_lib (self,
                            debug=0,
                            target_lang=None):
 
+	if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
@@ -414,6 +419,7 @@ def link (self,
               build_temp=None,
               target_lang=None):
 
+	if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)

From ec12da619b7a0be1135564e31e6a9b41d6134437 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 5 Mar 2005 05:28:45 +0000
Subject: [PATCH 1025/8469] Remove a tab so that whitespace usage is
 consistent.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 016139321c..d2ea008e82 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -293,7 +293,7 @@ def compile(self, sources,
                 output_dir=None, macros=None, include_dirs=None, debug=0,
                 extra_preargs=None, extra_postargs=None, depends=None):
 
-	if not self.initialized: self.initialize()
+        if not self.initialized: self.initialize()
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)

From 891c7ebce5c207c73bfcf79ecd51d58ee8fab395 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 5 Mar 2005 05:32:14 +0000
Subject: [PATCH 1026/8469] Remove some more tab usage to prevent an error when
 run as ``python -tt``.

---
 msvccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index d2ea008e82..8106df6177 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -385,7 +385,7 @@ def create_static_lib (self,
                            debug=0,
                            target_lang=None):
 
-	if not self.initialized: self.initialize()
+        if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         output_filename = \
             self.library_filename (output_libname, output_dir=output_dir)
@@ -419,7 +419,7 @@ def link (self,
               build_temp=None,
               target_lang=None):
 
-	if not self.initialized: self.initialize()
+        if not self.initialized: self.initialize()
         (objects, output_dir) = self._fix_object_args (objects, output_dir)
         (libraries, library_dirs, runtime_library_dirs) = \
             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)

From 8992c0187b1cbc5bf26aa8c686421d0b81e55e4c Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Sat, 12 Mar 2005 19:05:58 +0000
Subject: [PATCH 1027/8469] Port bugfix from 2.4 maint.

Bug #1160802:  Can't build Zope on Windows w/ 2.4.1c1.

MSVCCompiler.initialize():  set self.initialized to True, as suggested
by AMK.  Else we keep growing the PATH endlessly, with each new C
extension built, until putenv() complains.

No change to NEWS because the patch that created this bug is also new
for 2.5a1 (so there's no change here to any code yet released from HEAD).
---
 msvccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 8106df6177..b94d35f15f 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -255,6 +255,7 @@ def initialize(self):
                 ]
         self.ldflags_static = [ '/nologo']
 
+        self.initialized = True
 
     # -- Worker methods ------------------------------------------------
 

From 5a3290c36b8087fc73356362cccb51d523b16167 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Sun, 20 Mar 2005 22:17:02 +0000
Subject: [PATCH 1028/8469] helper code, mostly from Andy Harrington, for PEP
 314 completion

---
 tests/test_versionpredicate.py |   9 +++
 versionpredicate.py            | 103 +++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 tests/test_versionpredicate.py
 create mode 100644 versionpredicate.py

diff --git a/tests/test_versionpredicate.py b/tests/test_versionpredicate.py
new file mode 100644
index 0000000000..44cb41ee38
--- /dev/null
+++ b/tests/test_versionpredicate.py
@@ -0,0 +1,9 @@
+"""Tests harness for distutils.versionpredicate.
+
+"""
+
+import distutils.versionpredicate
+import doctest
+
+def test_suite():
+   return doctest.DocTestSuite(distutils.versionpredicate)
diff --git a/versionpredicate.py b/versionpredicate.py
new file mode 100644
index 0000000000..5126ebf548
--- /dev/null
+++ b/versionpredicate.py
@@ -0,0 +1,103 @@
+"""Module for parsing and testing package version predicate strings.
+"""
+import re
+import version
+import operator
+
+re_validPackage = re.compile(r"(?i)^\s*([a-z_]\w*(?:\.[a-z_]\w*)*)(.*)")
+# (package) (rest)
+
+re_paren = re.compile(r"^\s*\((.*)\)\s*$") # (list) inside of parentheses
+re_splitComparison = re.compile(r"^\s*(<=|>=|<|>|!=|==)\s*([^\s,]+)\s*$")
+# (comp) (version)
+
+def splitUp(pred):
+   """Parse a single version comparison.
+   Return (comparison string, StrictVersion)
+   """
+   res = re_splitComparison.match(pred)
+   if not res:
+       raise ValueError, "Bad package restriction syntax:  " + pred
+   comp, verStr = res.groups()
+   return (comp, version.StrictVersion(verStr))
+
+compmap = {"<": operator.lt, "<=": operator.le, "==": operator.eq,
+           ">": operator.gt, ">=": operator.ge, "!=": operator.ne}
+
+class VersionPredicate:
+   """Parse and test package version predicates.
+
+   >>> v = VersionPredicate("pyepat.abc (>1.0, <3333.3a1, !=1555.1b3)")
+   >>> print v
+   pyepat.abc (> 1.0, < 3333.3a1, != 1555.1b3)
+   >>> v.satisfied_by("1.1")
+   True
+   >>> v.satisfied_by("1.4")
+   True
+   >>> v.satisfied_by("1.0")
+   False
+   >>> v.satisfied_by("4444.4")
+   False
+   >>> v.satisfied_by("1555.1b3")
+   False
+   >>> v = VersionPredicate("pat( ==  0.1  )  ")
+   >>> v.satisfied_by("0.1")
+   True
+   >>> v.satisfied_by("0.2")
+   False
+   >>> v = VersionPredicate("p1.p2.p3.p4(>=1.0, <=1.3a1, !=1.2zb3)")
+   Traceback (most recent call last):
+   ...
+   ValueError: invalid version number '1.2zb3'
+
+   """
+
+   def __init__(self, versionPredicateStr):
+       """Parse a version predicate string.
+       """
+       # Fields:
+       #    name:  package name
+       #    pred:  list of (comparison string, StrictVersion)
+
+       versionPredicateStr = versionPredicateStr.strip()
+       if not versionPredicateStr:
+           raise ValueError, "Empty package restriction"
+       match = re_validPackage.match(versionPredicateStr)
+       if not match:
+           raise ValueError, "Bad package name in " + versionPredicateStr
+       self.name, paren = match.groups()
+       paren = paren.strip()
+       if paren:
+           match = re_paren.match(paren)
+           if not match:
+               raise ValueError, "Expected parenthesized list: " + paren
+           str = match.groups()[0]
+           self.pred = [splitUp(aPred) for aPred in str.split(",")]
+           if not self.pred:
+               raise ValueError("Empty Parenthesized list in %r" 
+                                % versionPredicateStr )
+       else:
+           self.pred=[]
+
+   def __str__(self):
+       if self.pred:
+           seq = [cond + " " + str(ver) for cond, ver in self.pred]
+           return self.name + " (" + ", ".join(seq) + ")"
+       else:
+           return self.name
+
+   def satisfied_by(self, version):
+       """True if version is compatible with all the predicates in self.
+          The parameter version must be acceptable to the StrictVersion
+          constructor.  It may be either a string or StrictVersion.
+       """
+       for cond, ver in self.pred:
+           if not compmap[cond](version, ver):
+               return False
+       return True
+
+
+def check_provision(value):
+    m = re.match("[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*(\s*\([^)]+\))?$", value)
+    if not m:
+        raise ValueError("illegal provides specification: %r" % value)

From 1690ef36ec0968c381d0cd02c92863441416daf0 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Sun, 20 Mar 2005 22:19:47 +0000
Subject: [PATCH 1029/8469] PEP 314 implementation (client side): added support
 for the provides, requires, and obsoletes metadata fields

---
 command/register.py |   6 +++
 core.py             |   4 +-
 dist.py             | 109 ++++++++++++++++++++++++++++++++++----------
 tests/test_dist.py  |  91 +++++++++++++++++++++++++++++++++++-
 4 files changed, 185 insertions(+), 25 deletions(-)

diff --git a/command/register.py b/command/register.py
index 8104ce0656..6e9a8d4297 100644
--- a/command/register.py
+++ b/command/register.py
@@ -231,7 +231,13 @@ def build_post_data(self, action):
             'platform': meta.get_platforms(),
             'classifiers': meta.get_classifiers(),
             'download_url': meta.get_download_url(),
+            # PEP 314
+            'provides': meta.get_provides(),
+            'requires': meta.get_requires(),
+            'obsoletes': meta.get_obsoletes(),
         }
+        if data['provides'] or data['requires'] or data['obsoletes']:
+            data['metadata_version'] = '1.1'
         return data
 
     def post_to_server(self, data, auth=None):
diff --git a/core.py b/core.py
index eba94559d9..c9c6f037a7 100644
--- a/core.py
+++ b/core.py
@@ -47,7 +47,9 @@ def gen_usage (script_name):
                   'name', 'version', 'author', 'author_email',
                   'maintainer', 'maintainer_email', 'url', 'license',
                   'description', 'long_description', 'keywords',
-                  'platforms', 'classifiers', 'download_url',)
+                  'platforms', 'classifiers', 'download_url',
+                  'requires', 'provides', 'obsoletes',
+                  )
 
 # Legal keyword arguments for the Extension constructor
 extension_keywords = ('name', 'sources', 'include_dirs',
diff --git a/dist.py b/dist.py
index 4f4bae5218..c5dd5cbf78 100644
--- a/dist.py
+++ b/dist.py
@@ -106,6 +106,12 @@ class Distribution:
          "print the list of classifiers"),
         ('keywords', None,
          "print the list of keywords"),
+        ('provides', None,
+         "print the list of packages/modules provided"),
+        ('requires', None,
+         "print the list of packages/modules required"),
+        ('obsoletes', None,
+         "print the list of packages/modules made obsolete")
         ]
     display_option_names = map(lambda x: translate_longopt(x[0]),
                                display_options)
@@ -210,7 +216,6 @@ def __init__ (self, attrs=None):
         # distribution options.
 
         if attrs:
-
             # Pull out the set of command options and work on them
             # specifically.  Note that this order guarantees that aliased
             # command options will override any supplied redundantly
@@ -235,7 +240,9 @@ def __init__ (self, attrs=None):
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
-                if hasattr(self.metadata, key):
+                if hasattr(self.metadata, "set_" + key):
+                    getattr(self.metadata, "set_" + key)(val)
+                elif hasattr(self.metadata, key):
                     setattr(self.metadata, key, val)
                 elif hasattr(self, key):
                     setattr(self, key, val)
@@ -678,7 +685,8 @@ def handle_display_options (self, option_order):
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
                     print string.join(value, ',')
-                elif opt == 'classifiers':
+                elif opt in ('classifiers', 'provides', 'requires',
+                             'obsoletes'):
                     print string.join(value, '\n')
                 else:
                     print value
@@ -1024,7 +1032,10 @@ class DistributionMetadata:
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
                          "contact_email", "license", "classifiers",
-                         "download_url")
+                         "download_url",
+                         # PEP 314
+                         "provides", "requires", "obsoletes",
+                         )
 
     def __init__ (self):
         self.name = None
@@ -1041,40 +1052,58 @@ def __init__ (self):
         self.platforms = None
         self.classifiers = None
         self.download_url = None
+        # PEP 314
+        self.provides = None
+        self.requires = None
+        self.obsoletes = None
 
     def write_pkg_info (self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-
         pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
 
-        pkg_info.write('Metadata-Version: 1.0\n')
-        pkg_info.write('Name: %s\n' % self.get_name() )
-        pkg_info.write('Version: %s\n' % self.get_version() )
-        pkg_info.write('Summary: %s\n' % self.get_description() )
-        pkg_info.write('Home-page: %s\n' % self.get_url() )
-        pkg_info.write('Author: %s\n' % self.get_contact() )
-        pkg_info.write('Author-email: %s\n' % self.get_contact_email() )
-        pkg_info.write('License: %s\n' % self.get_license() )
+        self.write_pkg_file(pkg_info)
+
+        pkg_info.close()
+
+    # write_pkg_info ()
+
+    def write_pkg_file (self, file):
+        """Write the PKG-INFO format data to a file object.
+        """
+        version = '1.0'
+        if self.provides or self.requires or self.obsoletes:
+            version = '1.1'
+
+        file.write('Metadata-Version: %s\n' % version)
+        file.write('Name: %s\n' % self.get_name() )
+        file.write('Version: %s\n' % self.get_version() )
+        file.write('Summary: %s\n' % self.get_description() )
+        file.write('Home-page: %s\n' % self.get_url() )
+        file.write('Author: %s\n' % self.get_contact() )
+        file.write('Author-email: %s\n' % self.get_contact_email() )
+        file.write('License: %s\n' % self.get_license() )
         if self.download_url:
-            pkg_info.write('Download-URL: %s\n' % self.download_url)
+            file.write('Download-URL: %s\n' % self.download_url)
 
         long_desc = rfc822_escape( self.get_long_description() )
-        pkg_info.write('Description: %s\n' % long_desc)
+        file.write('Description: %s\n' % long_desc)
 
         keywords = string.join( self.get_keywords(), ',')
         if keywords:
-            pkg_info.write('Keywords: %s\n' % keywords )
-
-        for platform in self.get_platforms():
-            pkg_info.write('Platform: %s\n' % platform )
+            file.write('Keywords: %s\n' % keywords )
 
-        for classifier in self.get_classifiers():
-            pkg_info.write('Classifier: %s\n' % classifier )
+        self._write_list(file, 'Platform', self.get_platforms())
+        self._write_list(file, 'Classifier', self.get_classifiers())
 
-        pkg_info.close()
+        # PEP 314
+        self._write_list(file, 'Requires', self.get_requires())
+        self._write_list(file, 'Provides', self.get_provides())
+        self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
-    # write_pkg_info ()
+    def _write_list (self, file, name, values):
+        for value in values:
+            file.write('%s: %s\n' % (name, value))
 
     # -- Metadata query methods ----------------------------------------
 
@@ -1134,6 +1163,40 @@ def get_classifiers(self):
     def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
+    # PEP 314
+
+    def get_requires(self):
+        return self.requires or []
+
+    def set_requires(self, value):
+        import distutils.versionpredicate
+        for v in value:
+            distutils.versionpredicate.VersionPredicate(v)
+        self.requires = value
+
+    def get_provides(self):
+        return self.provides or []
+
+    def set_provides(self, value):
+        value = [v.strip() for v in value]
+        for v in value:
+            import distutils.versionpredicate
+            ver = distutils.versionpredicate.check_provision(v)
+            if ver:
+                import distutils.version
+                sv = distutils.version.StrictVersion()
+                sv.parse(ver.strip()[1:-1])
+        self.provides = value
+
+    def get_obsoletes(self):
+        return self.obsoletes or []
+
+    def set_obsoletes(self, value):
+        import distutils.versionpredicate
+        for v in value:
+            distutils.versionpredicate.VersionPredicate(v)
+        self.obsoletes = value
+
 # class DistributionMetadata
 
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 695f6d8192..7675fbfa93 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -4,6 +4,7 @@
 import distutils.dist
 import os
 import shutil
+import StringIO
 import sys
 import tempfile
 import unittest
@@ -96,5 +97,93 @@ def test_command_packages_configfile(self):
             os.unlink(TESTFN)
 
 
+class MetadataTestCase(unittest.TestCase):
+
+    def test_simple_metadata(self):
+        attrs = {"name": "package",
+                 "version": "1.0"}
+        dist = distutils.dist.Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assert_("Metadata-Version: 1.0" in meta)
+        self.assert_("provides:" not in meta.lower())
+        self.assert_("requires:" not in meta.lower())
+        self.assert_("obsoletes:" not in meta.lower())
+
+    def test_provides(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "provides": ["package", "package.sub"]}
+        dist = distutils.dist.Distribution(attrs)
+        self.assertEqual(dist.metadata.get_provides(),
+                         ["package", "package.sub"])
+        self.assertEqual(dist.get_provides(),
+                         ["package", "package.sub"])
+        meta = self.format_metadata(dist)
+        self.assert_("Metadata-Version: 1.1" in meta)
+        self.assert_("requires:" not in meta.lower())
+        self.assert_("obsoletes:" not in meta.lower())
+
+    def test_provides_illegal(self):
+        self.assertRaises(ValueError,
+                          distutils.dist.Distribution,
+                          {"name": "package",
+                           "version": "1.0",
+                           "provides": ["my.pkg (splat)"]})
+
+    def test_requires(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "requires": ["other", "another (==1.0)"]}
+        dist = distutils.dist.Distribution(attrs)
+        self.assertEqual(dist.metadata.get_requires(),
+                         ["other", "another (==1.0)"])
+        self.assertEqual(dist.get_requires(),
+                         ["other", "another (==1.0)"])
+        meta = self.format_metadata(dist)
+        self.assert_("Metadata-Version: 1.1" in meta)
+        self.assert_("provides:" not in meta.lower())
+        self.assert_("Requires: other" in meta)
+        self.assert_("Requires: another (==1.0)" in meta)
+        self.assert_("obsoletes:" not in meta.lower())
+
+    def test_requires_illegal(self):
+        self.assertRaises(ValueError,
+                          distutils.dist.Distribution,
+                          {"name": "package",
+                           "version": "1.0",
+                           "requires": ["my.pkg (splat)"]})
+
+    def test_obsoletes(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "obsoletes": ["other", "another (<1.0)"]}
+        dist = distutils.dist.Distribution(attrs)
+        self.assertEqual(dist.metadata.get_obsoletes(),
+                         ["other", "another (<1.0)"])
+        self.assertEqual(dist.get_obsoletes(),
+                         ["other", "another (<1.0)"])
+        meta = self.format_metadata(dist)
+        self.assert_("Metadata-Version: 1.1" in meta)
+        self.assert_("provides:" not in meta.lower())
+        self.assert_("requires:" not in meta.lower())
+        self.assert_("Obsoletes: other" in meta)
+        self.assert_("Obsoletes: another (<1.0)" in meta)
+
+    def test_obsoletes_illegal(self):
+        self.assertRaises(ValueError,
+                          distutils.dist.Distribution,
+                          {"name": "package",
+                           "version": "1.0",
+                           "obsoletes": ["my.pkg (splat)"]})
+ 
+    def format_metadata(self, dist):
+        sio = StringIO.StringIO()
+        dist.metadata.write_pkg_file(sio)
+        return sio.getvalue()
+
+
 def test_suite():
-    return unittest.makeSuite(DistributionTestCase)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(DistributionTestCase))
+    suite.addTest(unittest.makeSuite(MetadataTestCase))
+    return suite

From b9835f36c86e8b46e92de5b8c6fcd88525bcac21 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 21 Mar 2005 06:36:32 +0000
Subject: [PATCH 1030/8469] - rename check_provision() to split_revision() -
 fix indentation to conform to the Python style guide - add more tests and
 documentation

---
 dist.py             |   6 +-
 versionpredicate.py | 227 ++++++++++++++++++++++++++++----------------
 2 files changed, 145 insertions(+), 88 deletions(-)

diff --git a/dist.py b/dist.py
index c5dd5cbf78..f015874bc4 100644
--- a/dist.py
+++ b/dist.py
@@ -1181,11 +1181,7 @@ def set_provides(self, value):
         value = [v.strip() for v in value]
         for v in value:
             import distutils.versionpredicate
-            ver = distutils.versionpredicate.check_provision(v)
-            if ver:
-                import distutils.version
-                sv = distutils.version.StrictVersion()
-                sv.parse(ver.strip()[1:-1])
+            distutils.versionpredicate.split_provision(v)
         self.provides = value
 
     def get_obsoletes(self):
diff --git a/versionpredicate.py b/versionpredicate.py
index 5126ebf548..8922b137fd 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -1,9 +1,10 @@
 """Module for parsing and testing package version predicate strings.
 """
 import re
-import version
+import distutils.version
 import operator
 
+
 re_validPackage = re.compile(r"(?i)^\s*([a-z_]\w*(?:\.[a-z_]\w*)*)(.*)")
 # (package) (rest)
 
@@ -11,93 +12,153 @@
 re_splitComparison = re.compile(r"^\s*(<=|>=|<|>|!=|==)\s*([^\s,]+)\s*$")
 # (comp) (version)
 
+
 def splitUp(pred):
-   """Parse a single version comparison.
-   Return (comparison string, StrictVersion)
-   """
-   res = re_splitComparison.match(pred)
-   if not res:
-       raise ValueError, "Bad package restriction syntax:  " + pred
-   comp, verStr = res.groups()
-   return (comp, version.StrictVersion(verStr))
+    """Parse a single version comparison.
+
+    Return (comparison string, StrictVersion)
+    """
+    res = re_splitComparison.match(pred)
+    if not res:
+        raise ValueError("bad package restriction syntax: %r" % pred)
+    comp, verStr = res.groups()
+    return (comp, distutils.version.StrictVersion(verStr))
 
 compmap = {"<": operator.lt, "<=": operator.le, "==": operator.eq,
            ">": operator.gt, ">=": operator.ge, "!=": operator.ne}
 
 class VersionPredicate:
-   """Parse and test package version predicates.
-
-   >>> v = VersionPredicate("pyepat.abc (>1.0, <3333.3a1, !=1555.1b3)")
-   >>> print v
-   pyepat.abc (> 1.0, < 3333.3a1, != 1555.1b3)
-   >>> v.satisfied_by("1.1")
-   True
-   >>> v.satisfied_by("1.4")
-   True
-   >>> v.satisfied_by("1.0")
-   False
-   >>> v.satisfied_by("4444.4")
-   False
-   >>> v.satisfied_by("1555.1b3")
-   False
-   >>> v = VersionPredicate("pat( ==  0.1  )  ")
-   >>> v.satisfied_by("0.1")
-   True
-   >>> v.satisfied_by("0.2")
-   False
-   >>> v = VersionPredicate("p1.p2.p3.p4(>=1.0, <=1.3a1, !=1.2zb3)")
-   Traceback (most recent call last):
-   ...
-   ValueError: invalid version number '1.2zb3'
-
-   """
-
-   def __init__(self, versionPredicateStr):
-       """Parse a version predicate string.
-       """
-       # Fields:
-       #    name:  package name
-       #    pred:  list of (comparison string, StrictVersion)
-
-       versionPredicateStr = versionPredicateStr.strip()
-       if not versionPredicateStr:
-           raise ValueError, "Empty package restriction"
-       match = re_validPackage.match(versionPredicateStr)
-       if not match:
-           raise ValueError, "Bad package name in " + versionPredicateStr
-       self.name, paren = match.groups()
-       paren = paren.strip()
-       if paren:
-           match = re_paren.match(paren)
-           if not match:
-               raise ValueError, "Expected parenthesized list: " + paren
-           str = match.groups()[0]
-           self.pred = [splitUp(aPred) for aPred in str.split(",")]
-           if not self.pred:
-               raise ValueError("Empty Parenthesized list in %r" 
-                                % versionPredicateStr )
-       else:
-           self.pred=[]
-
-   def __str__(self):
-       if self.pred:
-           seq = [cond + " " + str(ver) for cond, ver in self.pred]
-           return self.name + " (" + ", ".join(seq) + ")"
-       else:
-           return self.name
-
-   def satisfied_by(self, version):
-       """True if version is compatible with all the predicates in self.
-          The parameter version must be acceptable to the StrictVersion
-          constructor.  It may be either a string or StrictVersion.
-       """
-       for cond, ver in self.pred:
-           if not compmap[cond](version, ver):
-               return False
-       return True
-
-
-def check_provision(value):
-    m = re.match("[a-zA-Z_]\w*(\.[a-zA-Z_]\w*)*(\s*\([^)]+\))?$", value)
+    """Parse and test package version predicates.
+
+    >>> v = VersionPredicate('pyepat.abc (>1.0, <3333.3a1, !=1555.1b3)')
+
+    The `name` attribute provides the full dotted name that is given::
+
+    >>> v.name
+    'pyepat.abc'
+
+    The str() of a `VersionPredicate` provides a normalized
+    human-readable version of the expression::
+
+    >>> print v
+    pyepat.abc (> 1.0, < 3333.3a1, != 1555.1b3)
+
+    The `satisfied_by()` method can be used to determine with a given
+    version number is included in the set described by the version
+    restrictions::
+
+    >>> v.satisfied_by('1.1')
+    True
+    >>> v.satisfied_by('1.4')
+    True
+    >>> v.satisfied_by('1.0')
+    False
+    >>> v.satisfied_by('4444.4')
+    False
+    >>> v.satisfied_by('1555.1b3')
+    False
+
+    `VersionPredicate` is flexible in accepting extra whitespace::
+
+    >>> v = VersionPredicate(' pat( ==  0.1  )  ')
+    >>> v.name
+    'pat'
+    >>> v.satisfied_by('0.1')
+    True
+    >>> v.satisfied_by('0.2')
+    False
+
+    If any version numbers passed in do not conform to the
+    restrictions of `StrictVersion`, a `ValueError` is raised::
+
+    >>> v = VersionPredicate('p1.p2.p3.p4(>=1.0, <=1.3a1, !=1.2zb3)')
+    Traceback (most recent call last):
+      ...
+    ValueError: invalid version number '1.2zb3'
+
+    It the module or package name given does not conform to what's
+    allowed as a legal module or package name, `ValueError` is
+    raised::
+
+    >>> v = VersionPredicate('foo-bar')
+    Traceback (most recent call last):
+      ...
+    ValueError: expected parenthesized list: '-bar'
+
+    >>> v = VersionPredicate('foo bar (12.21)')
+    Traceback (most recent call last):
+      ...
+    ValueError: expected parenthesized list: 'bar (12.21)'
+
+    """
+
+    def __init__(self, versionPredicateStr):
+        """Parse a version predicate string.
+        """
+        # Fields:
+        #    name:  package name
+        #    pred:  list of (comparison string, StrictVersion)
+
+        versionPredicateStr = versionPredicateStr.strip()
+        if not versionPredicateStr:
+           raise ValueError("empty package restriction")
+        match = re_validPackage.match(versionPredicateStr)
+        if not match:
+           raise ValueError("bad package name in %r" % versionPredicateStr)
+        self.name, paren = match.groups()
+        paren = paren.strip()
+        if paren:
+            match = re_paren.match(paren)
+            if not match:
+                raise ValueError("expected parenthesized list: %r" % paren)
+            str = match.groups()[0]
+            self.pred = [splitUp(aPred) for aPred in str.split(",")]
+            if not self.pred:
+                raise ValueError("empty parenthesized list in %r" 
+                                 % versionPredicateStr)
+        else:
+            self.pred=[]
+
+    def __str__(self):
+        if self.pred:
+            seq = [cond + " " + str(ver) for cond, ver in self.pred]
+            return self.name + " (" + ", ".join(seq) + ")"
+        else:
+            return self.name
+
+    def satisfied_by(self, version):
+        """True if version is compatible with all the predicates in self.
+        The parameter version must be acceptable to the StrictVersion
+        constructor.  It may be either a string or StrictVersion.
+        """
+        for cond, ver in self.pred:
+            if not compmap[cond](version, ver):
+                return False
+        return True
+
+
+_provision_rx = None
+
+def split_provision(value):
+    """Return the name and optional version number of a provision.
+
+    The version number, if given, will be returned as a `StrictVersion`
+    instance, otherwise it will be `None`.
+
+    >>> split_provision('mypkg')
+    ('mypkg', None)
+    >>> split_provision(' mypkg( 1.2 ) ')
+    ('mypkg', StrictVersion ('1.2'))
+    """
+    global _provision_rx
+    if _provision_rx is None:
+        _provision_rx = re.compile(
+            "([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$")
+    value = value.strip()
+    m = _provision_rx.match(value)
     if not m:
         raise ValueError("illegal provides specification: %r" % value)
+    ver = m.group(2) or None
+    if ver:
+        ver = distutils.version.StrictVersion(ver)
+    return m.group(1), ver

From 8bd5d36635206ea66de6ec7389408175ea9dea89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 21 Mar 2005 20:56:35 +0000
Subject: [PATCH 1031/8469] Add the upload command. Make all dist commands
 register their outputs with the distribution object.

---
 command/bdist_dumb.py    | 5 +++--
 command/bdist_rpm.py     | 3 +++
 command/bdist_wininst.py | 2 ++
 command/sdist.py         | 1 +
 command/upload.py        | 4 ++++
 dist.py                  | 5 +++++
 6 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 command/upload.py

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 7f498c8396..59435516fa 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -117,8 +117,9 @@ def run (self):
                                    ensure_relative(install.install_base))
 
         # Make the archive
-        self.make_archive(pseudoinstall_root,
-                          self.format, root_dir=archive_root)
+        filename = self.make_archive(pseudoinstall_root,
+                                     self.format, root_dir=archive_root)
+        self.distribution.dist_files.append(('bdist_dumb', filename))
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 8eaaff3246..09bfa43fd0 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -297,12 +297,14 @@ def run (self):
 
         # Make a source distribution and copy to SOURCES directory with
         # optional icon.
+        saved_dist_files = self.distributuion.dist_files[:]
         sdist = self.reinitialize_command('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']
         else:
             sdist.formats = ['gztar']
         self.run_command('sdist')
+        self.distribution.dist_files = saved_dist_files
 
         source = sdist.get_archive_files()[0]
         source_dir = rpm_dir['SOURCES']
@@ -355,6 +357,7 @@ def run (self):
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
                 self.move_file(rpms[0], self.dist_dir)
+                self.distribution.dist_files.append(('bdist_rpm', rpms[0]))
                 if debuginfo:
                     self.move_file(debuginfo[0], self.dist_dir)
     # run()
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 9b45cf35e8..a0335feec7 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -162,6 +162,8 @@ def run (self):
                                     root_dir=self.bdist_dir)
         # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
+        self.distribution.dist_files.append(('bdist_wininst', 
+                                             self.get_installer_filename()))
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
         os.remove(arcname)
diff --git a/command/sdist.py b/command/sdist.py
index fe6c913913..8b88f22f83 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -449,6 +449,7 @@ def make_distribution (self):
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
+            self.distribution.dist_files.append(('sdist',file))
 
         self.archive_files = archive_files
 
diff --git a/command/upload.py b/command/upload.py
new file mode 100644
index 0000000000..d14f177697
--- /dev/null
+++ b/command/upload.py
@@ -0,0 +1,4 @@
+"""distutils.command.upload
+
+Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
+
diff --git a/dist.py b/dist.py
index f015874bc4..c7ec3830fa 100644
--- a/dist.py
+++ b/dist.py
@@ -177,6 +177,11 @@ def __init__ (self, attrs=None):
         #   command_options = { command_name : { option : (source, value) } }
         self.command_options = {}
 
+        # 'dist_files' is the list of (command, file) that have been created
+        # by any dist commands run so far. This is filled regardless
+        # of whether the run is dry or not.
+        self.dist_files = []
+
         # These options are really the business of various commands, rather
         # than of the Distribution itself.  We provide aliases for them in
         # Distribution as a convenience to the developer.

From b793563cf2adb97f0fc84300d8e9f550125c22b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 21 Mar 2005 21:00:59 +0000
Subject: [PATCH 1032/8469] Actually add the implementation of the command.

---
 command/upload.py | 150 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)

diff --git a/command/upload.py b/command/upload.py
index d14f177697..aea2e4b9c4 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -2,3 +2,153 @@
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
+from distutils.errors import *
+from distutils.core import Command
+from md5 import md5
+from distutils.sysconfig import get_python_version
+from distutils import log
+import os
+import platform
+import ConfigParser
+import httplib
+import base64
+import urlparse
+import cStringIO as StringIO
+
+class upload(Command):
+
+    description = "upload binary package to PyPI"
+
+    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server'),
+        ]
+    boolean_options = ['show-response']
+
+    def initialize_options(self):
+        self.username = ''
+        self.password = ''
+        self.repository = ''
+        self.show_response = 0
+
+    def finalize_options(self):
+        if os.environ.has_key('HOME'):
+            rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if os.path.exists(rc):
+                self.announce('Using PyPI login from %s' % rc)
+                config = ConfigParser.ConfigParser({
+                        'username':'',
+                        'password':'',
+                        'repository':''})
+                config.read(rc)
+                if not self.repository:
+                    self.repository = config.get('server-login', 'repository')
+                if not self.username:
+                    self.username = config.get('server-login', 'username')
+                if not self.password:
+                    self.password = config.get('server-login', 'password')
+        if not self.repository:
+            self.repository = self.DEFAULT_REPOSITORY
+
+    def run(self):
+        if not self.distribution.dist_files:
+            raise DistutilsOptionError("No dist file created in earlier command")
+        for command, filename in self.distribution.dist_files:
+            self.upload_file(command, filename)
+
+    def upload_file(self, command, filename):
+
+        # Fill in the data
+        content = open(filename).read()
+        data = {
+            ':action':'file_upload',
+            'name':self.distribution.get_name(),
+            'version':self.distribution.get_version(),
+            'content':(os.path.basename(filename),content),
+            'filetype':command,
+            'pyversion':get_python_version(),
+            'md5_digest':md5(content).hexdigest(),
+            }
+        comment = ''
+        if command == 'bdist_rpm':
+            dist, version, id = platform.dist()
+            if dist:
+                comment = 'built for %s %s' % (dist, version)
+        elif command == 'bdist_dumb':
+            comment = 'built for %s' % platform.platform(terse=1)
+        data['comment'] = comment
+
+        # set up the authentication
+        auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
+
+        # Build up the MIME payload for the POST data
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = '\n--' + boundary
+        end_boundary = sep_boundary + '--'
+        body = StringIO.StringIO()
+        for key, value in data.items():
+            # handle multiple entries for the same name
+            if type(value) != type([]):
+                value = [value]
+            for value in value:
+                if type(value) is tuple:
+                    fn = ';filename="%s"' % value[0]
+                    value = value[1]
+                else:
+                    fn = ""
+                value = str(value)
+                body.write(sep_boundary)
+                body.write('\nContent-Disposition: form-data; name="%s"'%key)
+                body.write(fn)
+                body.write("\n\n")
+                body.write(value)
+                if value and value[-1] == '\r':
+                    body.write('\n')  # write an extra newline (lurve Macs)
+        body.write(end_boundary)
+        body.write("\n")
+        body = body.getvalue()
+
+        self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
+
+        # build the Request
+        # We can't use urllib2 since we need to send the Basic
+        # auth right with the first request
+        schema, netloc, url, params, query, fragments = \
+            urlparse.urlparse(self.repository)
+        assert not params and not query and not fragments
+        if schema == 'http': 
+            http = httplib.HTTPConnection(netloc)
+        elif schema == 'https':
+            http = httplib.HTTPSConnection(netloc)
+        else:
+            raise AssertionError, "unsupported schema "+schema
+
+        data = ''
+        loglevel = log.INFO
+        try:
+            http.connect()
+            http.putrequest("POST", url)
+            http.putheader('Content-type', 
+                           'multipart/form-data; boundary=%s'%boundary)
+            http.putheader('Content-length', str(len(body)))
+            http.putheader('Authorization', auth)
+            http.endheaders()
+            http.send(body)
+        except socket.error, e:
+            self.announce(e.msg, log.ERROR)
+            return
+
+        r = http.getresponse()
+        if r.status == 200:
+            self.announce('Server response (%s): %s' % (r.status, r.reason), 
+                          log.INFO)
+        else:
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason), 
+                          log.INFO)
+        if self.show_response:
+            print '-'*75, r.read(), '-'*75
+

From a2e09746ac9aee2d9002e43e37fd3b8c71379e9f Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Tue, 22 Mar 2005 05:43:18 +0000
Subject: [PATCH 1033/8469] fix Python style guide conformance

---
 versionpredicate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versionpredicate.py b/versionpredicate.py
index 8922b137fd..62d89f8b00 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -117,7 +117,7 @@ def __init__(self, versionPredicateStr):
                 raise ValueError("empty parenthesized list in %r" 
                                  % versionPredicateStr)
         else:
-            self.pred=[]
+            self.pred = []
 
     def __str__(self):
         if self.pred:

From ae0315024ea6c6e2a36267ec78988ab4cc8d8047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 22 Mar 2005 15:51:14 +0000
Subject: [PATCH 1034/8469] Upload GPG signature.

---
 command/upload.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index aea2e4b9c4..ad0e230462 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -4,9 +4,10 @@
 
 from distutils.errors import *
 from distutils.core import Command
-from md5 import md5
 from distutils.sysconfig import get_python_version
+from distutils.spawn import spawn
 from distutils import log
+from md5 import md5
 import os
 import platform
 import ConfigParser
@@ -26,14 +27,17 @@ class upload(Command):
          "url of repository [default: %s]" % DEFAULT_REPOSITORY),
         ('show-response', None,
          'display full response text from server'),
+        ('sign', 's',
+         'sign files to upload using gpg'),
         ]
-    boolean_options = ['show-response']
+    boolean_options = ['show-response', 'sign']
 
     def initialize_options(self):
         self.username = ''
         self.password = ''
         self.repository = ''
         self.show_response = 0
+        self.sign = False
 
     def finalize_options(self):
         if os.environ.has_key('HOME'):
@@ -61,11 +65,16 @@ def run(self):
             self.upload_file(command, filename)
 
     def upload_file(self, command, filename):
+        # Sign if requested
+        if self.sign:
+            spawn(("gpg", "--sign",  "-a", filename),
+                  dry_run=self.dry_run)
 
         # Fill in the data
         content = open(filename).read()
         data = {
             ':action':'file_upload',
+            'protcol_version':'1',
             'name':self.distribution.get_name(),
             'version':self.distribution.get_version(),
             'content':(os.path.basename(filename),content),
@@ -82,6 +91,10 @@ def upload_file(self, command, filename):
             comment = 'built for %s' % platform.platform(terse=1)
         data['comment'] = comment
 
+        if self.sign:
+            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
+                                     open(filename+".asc").read())
+
         # set up the authentication
         auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
 
@@ -148,7 +161,7 @@ def upload_file(self, command, filename):
                           log.INFO)
         else:
             self.announce('Upload failed (%s): %s' % (r.status, r.reason), 
-                          log.INFO)
+                          log.ERROR)
         if self.show_response:
             print '-'*75, r.read(), '-'*75
 

From a383851362fc46f5c023273f1465611203271c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 22 Mar 2005 20:32:41 +0000
Subject: [PATCH 1035/8469] Don't set the Python version for sdist uploads.

---
 command/upload.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/upload.py b/command/upload.py
index ad0e230462..a62da78a02 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -89,6 +89,8 @@ def upload_file(self, command, filename):
                 comment = 'built for %s %s' % (dist, version)
         elif command == 'bdist_dumb':
             comment = 'built for %s' % platform.platform(terse=1)
+        elif command == 'sdist':
+            data['pyversion'] = ''
         data['comment'] = comment
 
         if self.sign:

From ec9d7b79d687c8b9954d807c838993912c26499d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 22 Mar 2005 22:23:29 +0000
Subject: [PATCH 1036/8469] Fix registration of output file.

---
 command/bdist_wininst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index a0335feec7..5a83226b78 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -163,7 +163,7 @@ def run (self):
         # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
         self.distribution.dist_files.append(('bdist_wininst', 
-                                             self.get_installer_filename()))
+                                             self.get_installer_filename(fullname)))
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
         os.remove(arcname)

From ef5d51cd28dc7219e12a42241e132ea86d371392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 22 Mar 2005 23:02:54 +0000
Subject: [PATCH 1037/8469] Make the signature detached.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index a62da78a02..6a4e3b3332 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -67,7 +67,7 @@ def run(self):
     def upload_file(self, command, filename):
         # Sign if requested
         if self.sign:
-            spawn(("gpg", "--sign",  "-a", filename),
+            spawn(("gpg", "--detach-sign", "-a", filename),
                   dry_run=self.dry_run)
 
         # Fill in the data

From af6b7fae4c6a9b798e43aa544897d23b2ed013b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 23 Mar 2005 18:54:36 +0000
Subject: [PATCH 1038/8469] Make dist_files a triple, with the Python target
 version included, so that bdist_wininst can specify 'any'.

---
 command/bdist_dumb.py    |  8 +++++++-
 command/bdist_rpm.py     | 13 ++++++++++++-
 command/bdist_wininst.py |  6 +++++-
 command/sdist.py         |  2 +-
 command/upload.py        | 11 ++++-------
 dist.py                  | 12 +++++++++---
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 59435516fa..ccba00955a 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -13,6 +13,7 @@
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree, ensure_relative
 from distutils.errors import *
+from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb (Command):
@@ -119,7 +120,12 @@ def run (self):
         # Make the archive
         filename = self.make_archive(pseudoinstall_root,
                                      self.format, root_dir=archive_root)
-        self.distribution.dist_files.append(('bdist_dumb', filename))
+        if self.distribution.has_ext_modules():
+            pyversion = get_python_version()
+        else:
+            pyversion = 'any'
+        self.distribution.dist_files.append(('bdist_dumb', pyversion,
+                                             filename))
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 09bfa43fd0..c7b94e8133 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -15,6 +15,7 @@
 from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *
+from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_rpm (Command):
@@ -346,6 +347,10 @@ def run (self):
                 srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
                 assert len(srpms) == 1, \
                        "unexpected number of SRPM files found: %s" % srpms
+                dist_file = ('bdist_rpm', '',
+                             os.path.join(self.dist_dir,
+                                          os.path.basename(srpms[0])))
+                self.distribution.dist_files.append(dist_file)
                 self.move_file(srpms[0], self.dist_dir)
 
             if not self.source_only:
@@ -356,9 +361,15 @@ def run (self):
                     rpms.remove(debuginfo[0])
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
+                dist_file = ('bdist_rpm', get_python_version(),
+                             os.path.join(self.dist_dir,
+                                          os.path.basename(rpms[0])))
+                self.distribution.dist_files.append(dist_file)
                 self.move_file(rpms[0], self.dist_dir)
-                self.distribution.dist_files.append(('bdist_rpm', rpms[0]))
                 if debuginfo:
+                    dist_file = ('bdist_rpm', get_python_version(),
+                                 os.path.join(self.dist_dir,
+                                              os.path.basename(debuginfo[0])))
                     self.move_file(debuginfo[0], self.dist_dir)
     # run()
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 5a83226b78..49afca0472 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -162,7 +162,11 @@ def run (self):
                                     root_dir=self.bdist_dir)
         # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
-        self.distribution.dist_files.append(('bdist_wininst', 
+        if self.distribution.has_ext_modules():
+            pyversion = get_python_version()
+        else:
+            pyversion = 'any'
+        self.distribution.dist_files.append(('bdist_wininst', pyversion,
                                              self.get_installer_filename(fullname)))
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
diff --git a/command/sdist.py b/command/sdist.py
index 8b88f22f83..3dfe6f21a7 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -449,7 +449,7 @@ def make_distribution (self):
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
-            self.distribution.dist_files.append(('sdist',file))
+            self.distribution.dist_files.append(('sdist', '', file))
 
         self.archive_files = archive_files
 
diff --git a/command/upload.py b/command/upload.py
index 6a4e3b3332..266e9b1e87 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -4,7 +4,6 @@
 
 from distutils.errors import *
 from distutils.core import Command
-from distutils.sysconfig import get_python_version
 from distutils.spawn import spawn
 from distutils import log
 from md5 import md5
@@ -61,10 +60,10 @@ def finalize_options(self):
     def run(self):
         if not self.distribution.dist_files:
             raise DistutilsOptionError("No dist file created in earlier command")
-        for command, filename in self.distribution.dist_files:
-            self.upload_file(command, filename)
+        for command, pyversion, filename in self.distribution.dist_files:
+            self.upload_file(command, pyversion, filename)
 
-    def upload_file(self, command, filename):
+    def upload_file(self, command, pyversion, filename):
         # Sign if requested
         if self.sign:
             spawn(("gpg", "--detach-sign", "-a", filename),
@@ -79,7 +78,7 @@ def upload_file(self, command, filename):
             'version':self.distribution.get_version(),
             'content':(os.path.basename(filename),content),
             'filetype':command,
-            'pyversion':get_python_version(),
+            'pyversion':pyversion,
             'md5_digest':md5(content).hexdigest(),
             }
         comment = ''
@@ -89,8 +88,6 @@ def upload_file(self, command, filename):
                 comment = 'built for %s %s' % (dist, version)
         elif command == 'bdist_dumb':
             comment = 'built for %s' % platform.platform(terse=1)
-        elif command == 'sdist':
-            data['pyversion'] = ''
         data['comment'] = comment
 
         if self.sign:
diff --git a/dist.py b/dist.py
index c7ec3830fa..ff49886d97 100644
--- a/dist.py
+++ b/dist.py
@@ -177,9 +177,15 @@ def __init__ (self, attrs=None):
         #   command_options = { command_name : { option : (source, value) } }
         self.command_options = {}
 
-        # 'dist_files' is the list of (command, file) that have been created
-        # by any dist commands run so far. This is filled regardless
-        # of whether the run is dry or not.
+        # 'dist_files' is the list of (command, pyversion, file) that
+        # have been created by any dist commands run so far. This is
+        # filled regardless of whether the run is dry or not. pyversion
+        # gives sysconfig.get_python_version() if the dist file is
+        # specific to a Python version, 'any' if it is good for all
+        # Python versions on the target platform, and '' for a source
+        # file. pyversion should not be used to specify minimum or
+        # maximum required Python versions; use the metainfo for that
+        # instead.
         self.dist_files = []
 
         # These options are really the business of various commands, rather

From ae46d6954d01ffda7b4fcc5f966bcb9fc9ccb197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 23 Mar 2005 22:16:22 +0000
Subject: [PATCH 1039/8469] Make SRPMs pyversion 'any'.

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index c7b94e8133..7968d14ca7 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -347,7 +347,7 @@ def run (self):
                 srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
                 assert len(srpms) == 1, \
                        "unexpected number of SRPM files found: %s" % srpms
-                dist_file = ('bdist_rpm', '',
+                dist_file = ('bdist_rpm', 'any',
                              os.path.join(self.dist_dir,
                                           os.path.basename(srpms[0])))
                 self.distribution.dist_files.append(dist_file)

From 17df9acf1e48891c158caa9db83cb972377f81b6 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Thu, 24 Mar 2005 07:00:05 +0000
Subject: [PATCH 1040/8469] minor cleanup

---
 command/bdist_rpm.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 7968d14ca7..98621af9fd 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -348,31 +348,30 @@ def run (self):
                 assert len(srpms) == 1, \
                        "unexpected number of SRPM files found: %s" % srpms
                 dist_file = ('bdist_rpm', 'any',
-                             os.path.join(self.dist_dir,
-                                          os.path.basename(srpms[0])))
+                             self._dist_path(srpms[0]))
                 self.distribution.dist_files.append(dist_file)
                 self.move_file(srpms[0], self.dist_dir)
 
             if not self.source_only:
                 rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
-                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'], \
+                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
                                                    "*/*debuginfo*.rpm"))
                 if debuginfo:
                     rpms.remove(debuginfo[0])
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
                 dist_file = ('bdist_rpm', get_python_version(),
-                             os.path.join(self.dist_dir,
-                                          os.path.basename(rpms[0])))
+                             self._dist_path(rpms[0])
                 self.distribution.dist_files.append(dist_file)
                 self.move_file(rpms[0], self.dist_dir)
                 if debuginfo:
                     dist_file = ('bdist_rpm', get_python_version(),
-                                 os.path.join(self.dist_dir,
-                                              os.path.basename(debuginfo[0])))
+                                 self._dist_path(debuginfo[0])
                     self.move_file(debuginfo[0], self.dist_dir)
     # run()
 
+    def _dist_path(self, path):
+        return os.path.join(self.dist_dir, os.path.basename(path))
 
     def _make_spec_file(self):
         """Generate the text of an RPM spec file and return it as a

From 5c887b6d88da0ef921b9cef12269eeb321a9275f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 24 Mar 2005 19:40:57 +0000
Subject: [PATCH 1041/8469] Add missing socket import

---
 command/upload.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/upload.py b/command/upload.py
index 266e9b1e87..d1d5ec601a 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -8,6 +8,7 @@
 from distutils import log
 from md5 import md5
 import os
+import socket
 import platform
 import ConfigParser
 import httplib

From 31e173cb4da568d9a71645bfd46d416b6d0d406b Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 28 Mar 2005 01:05:48 +0000
Subject: [PATCH 1042/8469] Two lines in this file had unbalanced parentheses
 -- couldn't possibly work (SyntaxErrors at compile time).

I slammed in what looked like the obvious fixes, but someone who
understands this file should check my work.
---
 command/bdist_rpm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 98621af9fd..4bc00c3ac4 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -361,12 +361,12 @@ def run (self):
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
                 dist_file = ('bdist_rpm', get_python_version(),
-                             self._dist_path(rpms[0])
+                             self._dist_path(rpms[0]))
                 self.distribution.dist_files.append(dist_file)
                 self.move_file(rpms[0], self.dist_dir)
                 if debuginfo:
                     dist_file = ('bdist_rpm', get_python_version(),
-                                 self._dist_path(debuginfo[0])
+                                 self._dist_path(debuginfo[0]))
                     self.move_file(debuginfo[0], self.dist_dir)
     # run()
 

From 462bfbfa899143d92476cc8b1e2e86df2b4b7432 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 28 Mar 2005 01:08:02 +0000
Subject: [PATCH 1043/8469] Whitespace normalization.

---
 command/upload.py              | 9 ++++-----
 tests/test_dist.py             | 2 +-
 tests/test_versionpredicate.py | 2 +-
 versionpredicate.py            | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index d1d5ec601a..7b08336c82 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -133,7 +133,7 @@ def upload_file(self, command, pyversion, filename):
         schema, netloc, url, params, query, fragments = \
             urlparse.urlparse(self.repository)
         assert not params and not query and not fragments
-        if schema == 'http': 
+        if schema == 'http':
             http = httplib.HTTPConnection(netloc)
         elif schema == 'https':
             http = httplib.HTTPSConnection(netloc)
@@ -145,7 +145,7 @@ def upload_file(self, command, pyversion, filename):
         try:
             http.connect()
             http.putrequest("POST", url)
-            http.putheader('Content-type', 
+            http.putheader('Content-type',
                            'multipart/form-data; boundary=%s'%boundary)
             http.putheader('Content-length', str(len(body)))
             http.putheader('Authorization', auth)
@@ -157,11 +157,10 @@ def upload_file(self, command, pyversion, filename):
 
         r = http.getresponse()
         if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason), 
+            self.announce('Server response (%s): %s' % (r.status, r.reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason), 
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
             print '-'*75, r.read(), '-'*75
-
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 7675fbfa93..4d2a7cdf1a 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -175,7 +175,7 @@ def test_obsoletes_illegal(self):
                           {"name": "package",
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
- 
+
     def format_metadata(self, dist):
         sio = StringIO.StringIO()
         dist.metadata.write_pkg_file(sio)
diff --git a/tests/test_versionpredicate.py b/tests/test_versionpredicate.py
index 44cb41ee38..8a60dbe806 100644
--- a/tests/test_versionpredicate.py
+++ b/tests/test_versionpredicate.py
@@ -6,4 +6,4 @@
 import doctest
 
 def test_suite():
-   return doctest.DocTestSuite(distutils.versionpredicate)
+    return doctest.DocTestSuite(distutils.versionpredicate)
diff --git a/versionpredicate.py b/versionpredicate.py
index 62d89f8b00..ba8b6c021b 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -101,10 +101,10 @@ def __init__(self, versionPredicateStr):
 
         versionPredicateStr = versionPredicateStr.strip()
         if not versionPredicateStr:
-           raise ValueError("empty package restriction")
+            raise ValueError("empty package restriction")
         match = re_validPackage.match(versionPredicateStr)
         if not match:
-           raise ValueError("bad package name in %r" % versionPredicateStr)
+            raise ValueError("bad package name in %r" % versionPredicateStr)
         self.name, paren = match.groups()
         paren = paren.strip()
         if paren:
@@ -114,7 +114,7 @@ def __init__(self, versionPredicateStr):
             str = match.groups()[0]
             self.pred = [splitUp(aPred) for aPred in str.split(",")]
             if not self.pred:
-                raise ValueError("empty parenthesized list in %r" 
+                raise ValueError("empty parenthesized list in %r"
                                  % versionPredicateStr)
         else:
             self.pred = []

From 1ad5ca4f1e967b5623b43600007d51dc9c758d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Thu, 31 Mar 2005 13:57:38 +0000
Subject: [PATCH 1044/8469] Since PyPI only accepts UTF-8 encoded data now,
 make sure that the data is properly encoded and include the encoding in the
 Content-Type header.

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

diff --git a/command/register.py b/command/register.py
index 6e9a8d4297..dec9aa2bf2 100644
--- a/command/register.py
+++ b/command/register.py
@@ -254,7 +254,7 @@ def post_to_server(self, data, auth=None):
             if type(value) != type([]):
                 value = [value]
             for value in value:
-                value = str(value)
+                value = unicode(value).encode("utf-8")
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")
@@ -267,7 +267,7 @@ def post_to_server(self, data, auth=None):
 
         # build the Request
         headers = {
-            'Content-type': 'multipart/form-data; boundary=%s'%boundary,
+            'Content-type': 'multipart/form-data; boundary=%s; charset=utf-8'%boundary,
             'Content-length': str(len(body))
         }
         req = urllib2.Request(self.repository, body, headers)

From 7edd1145871db2e4b444114c99e326829edbbc12 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Fri, 15 Apr 2005 06:17:20 +0000
Subject: [PATCH 1045/8469] typo fix, thanks Jeremy Sanders

---
 command/bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 4bc00c3ac4..738e3f7269 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -298,7 +298,7 @@ def run (self):
 
         # Make a source distribution and copy to SOURCES directory with
         # optional icon.
-        saved_dist_files = self.distributuion.dist_files[:]
+        saved_dist_files = self.distribution.dist_files[:]
         sdist = self.reinitialize_command('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']

From 1133a2e0542e3f3e82544ec98095d3799a5921cd Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 24 Apr 2005 22:26:38 +0000
Subject: [PATCH 1046/8469] Introduced EXTRA_CFLAGS as an environment variable
 used by the Makefile.  Meant to be used for flags that change binary
 compatibility.

Distutils was tweaked to also use the variable if used during compilation of
the interpreter.
---
 sysconfig.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index aae0f27cb5..1bd62097f0 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,8 +146,9 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO')
+        (cc, cxx, opt, extra_cflags, basecflags, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'EXTRA_CFLAGS', 'BASECFLAGS',
+                            'CCSHARED', 'LDSHARED', 'SO')
 
         if os.environ.has_key('CC'):
             cc = os.environ['CC']
@@ -171,7 +172,7 @@ def customize_compiler(compiler):
             opt = opt + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
 
-        cc_cmd = cc + ' ' + opt
+        cc_cmd = ' '.join(str(x) for x in (cc, opt, extra_cflags) if x)
         compiler.set_executables(
             preprocessor=cpp,
             compiler=cc_cmd,

From a9aaf538b9b30a25b67802887f107ae74c35eba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 25 Apr 2005 07:14:03 +0000
Subject: [PATCH 1047/8469] Make parse_makefile fallback to environment
 variables if nothing is defined in the makefile. Get CFLAGS from the
 Makefile, instead of getting OPT, BASE_CFLAGS and EXTRA_CFLAGS individually.

---
 sysconfig.py | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 1bd62097f0..0be5b6b7cb 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,8 +146,8 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, extra_cflags, basecflags, ccshared, ldshared, so_ext) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'EXTRA_CFLAGS', 'BASECFLAGS',
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', 
                             'CCSHARED', 'LDSHARED', 'SO')
 
         if os.environ.has_key('CC'):
@@ -162,17 +162,15 @@ def customize_compiler(compiler):
             cpp = cc + " -E"           # not always
         if os.environ.has_key('LDFLAGS'):
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if basecflags:
-            opt = basecflags + ' ' + opt
         if os.environ.has_key('CFLAGS'):
-            opt = opt + ' ' + os.environ['CFLAGS']
+            cflags = opt + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']
         if os.environ.has_key('CPPFLAGS'):
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-            opt = opt + ' ' + os.environ['CPPFLAGS']
+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
 
-        cc_cmd = ' '.join(str(x) for x in (cc, opt, extra_cflags) if x)
+        cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
             preprocessor=cpp,
             compiler=cc_cmd,
@@ -278,25 +276,20 @@ def parse_makefile(fn, g=None):
             m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
             if m:
                 n = m.group(1)
+                found = True
                 if done.has_key(n):
-                    after = value[m.end():]
-                    value = value[:m.start()] + str(done[n]) + after
-                    if "$" in after:
-                        notdone[name] = value
-                    else:
-                        try: value = int(value)
-                        except ValueError:
-                            done[name] = string.strip(value)
-                        else:
-                            done[name] = value
-                        del notdone[name]
+                    item = str(done[n])
                 elif notdone.has_key(n):
                     # get it on a subsequent round
-                    pass
+                    found = False
+                elif os.environ.has_key(n):
+                    # do it like make: fall back to environment
+                    item = os.environ[n]
                 else:
-                    done[n] = ""
+                    done[n] = item = ""
+                if found:
                     after = value[m.end():]
-                    value = value[:m.start()] + after
+                    value = value[:m.start()] + item + after
                     if "$" in after:
                         notdone[name] = value
                     else:

From 3b756201e5bd88f1dac1206c49864e5a286a3497 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Wed, 18 May 2005 02:18:09 +0000
Subject: [PATCH 1048/8469] Whitespace normalization.

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0be5b6b7cb..9bdbb16a8c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -147,7 +147,7 @@ def customize_compiler(compiler):
     """
     if compiler.compiler_type == "unix":
         (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', 
+            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO')
 
         if os.environ.has_key('CC'):

From 7c683cbb4a9a15e15bc522c90e018c1fb5707418 Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Thu, 7 Jul 2005 15:36:20 +0000
Subject: [PATCH 1049/8469] Fix "upload" command garbling and truncating files
 on Windows.  If it's a binary file, use 'rb'!

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 7b08336c82..3b5a0fc9d9 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -71,7 +71,7 @@ def upload_file(self, command, pyversion, filename):
                   dry_run=self.dry_run)
 
         # Fill in the data
-        content = open(filename).read()
+        content = open(filename,'rb').read()
         data = {
             ':action':'file_upload',
             'protcol_version':'1',

From 72fb0955fb8a81449d0a0924faa805fec3fa221f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 7 Aug 2005 20:51:04 +0000
Subject: [PATCH 1050/8469] Patch #827386: Support absolute source paths in
 msvccompiler.py. Backported to 2.4.

---
 msvccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index b94d35f15f..85d515b20d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -269,6 +269,8 @@ def object_filenames (self,
         obj_names = []
         for src_name in source_filenames:
             (base, ext) = os.path.splitext (src_name)
+            base = os.path.splitdrive(base)[1] # Chop off the drive
+            base = base[os.path.isabs(base):]  # If abs, chop off leading /
             if ext not in self.src_extensions:
                 # Better to raise an exception instead of silently continuing
                 # and later complain about sources and targets having

From 1cae8e7c527625752262f72ade9f12e0dcf92214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 24 Aug 2005 14:55:22 +0000
Subject: [PATCH 1051/8469] Patch #1167716: Support Unicode filenames in
 mkpath. Fixes #1121494. Will backport to 2.4.

---
 dir_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 7f1450373b..2248b607cf 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -31,7 +31,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     global _path_created
 
     # Detect a common bug -- name is None
-    if type(name) is not StringType:
+    if not isinstance(name, StringTypes):   
         raise DistutilsInternalError, \
               "mkpath: 'name' must be a string (got %r)" % (name,)
 

From 326aece3c808d1f4a0cec3f37fcca0d5ce4f1223 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Fri, 26 Aug 2005 15:20:46 +0000
Subject: [PATCH 1052/8469] Whitespace normalization (via reindent.py).

---
 dir_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 2248b607cf..43994db3ff 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -31,7 +31,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     global _path_created
 
     # Detect a common bug -- name is None
-    if not isinstance(name, StringTypes):   
+    if not isinstance(name, StringTypes):
         raise DistutilsInternalError, \
               "mkpath: 'name' must be a string (got %r)" % (name,)
 

From 7792b51671f50059dd24fffbac70a38b487a0d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 8 Jan 2006 10:48:54 +0000
Subject: [PATCH 1053/8469] Patch #1299675: Pass metadata in upload.

---
 command/upload.py | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 3b5a0fc9d9..62767a348e 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -70,17 +70,41 @@ def upload_file(self, command, pyversion, filename):
             spawn(("gpg", "--detach-sign", "-a", filename),
                   dry_run=self.dry_run)
 
-        # Fill in the data
+        # Fill in the data - send all the meta-data in case we need to
+        # register a new release
         content = open(filename,'rb').read()
+        meta = self.distribution.metadata
         data = {
-            ':action':'file_upload',
-            'protcol_version':'1',
-            'name':self.distribution.get_name(),
-            'version':self.distribution.get_version(),
-            'content':(os.path.basename(filename),content),
-            'filetype':command,
-            'pyversion':pyversion,
-            'md5_digest':md5(content).hexdigest(),
+            # action
+            ':action': 'file_upload',
+            'protcol_version': '1',
+
+            # identify release
+            'name': meta.get_name(),
+            'version': meta.get_version(),
+
+            # file content
+            'content': (os.path.basename(filename),content),
+            'filetype': command,
+            'pyversion': pyversion,
+            'md5_digest': md5(content).hexdigest(),
+
+            # additional meta-data
+            'metadata_version' : '1.0',
+            'summary': meta.get_description(),
+            'home_page': meta.get_url(),
+            'author': meta.get_contact(),
+            'author_email': meta.get_contact_email(),
+            'license': meta.get_licence(),
+            'description': meta.get_long_description(),
+            'keywords': meta.get_keywords(),
+            'platform': meta.get_platforms(),
+            'classifiers': meta.get_classifiers(),
+            'download_url': meta.get_download_url(),
+            # PEP 314
+            'provides': meta.get_provides(),
+            'requires': meta.get_requires(),
+            'obsoletes': meta.get_obsoletes(),
             }
         comment = ''
         if command == 'bdist_rpm':

From 2849b2318b136f0a419cd040cc516100eef3a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 20 Feb 2006 12:15:15 +0000
Subject: [PATCH 1054/8469] Let the SDK setup override distutils logic.

---
 msvccompiler.py | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index 85d515b20d..b65e5286a2 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -214,21 +214,31 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
         self.initialized = False
 
     def initialize(self):
-        self.__paths = self.get_msvc_paths("path")
-
-        if len (self.__paths) == 0:
-            raise DistutilsPlatformError, \
-                  ("Python was built with version %s of Visual Studio, "
-                   "and extensions need to be built with the same "
-                   "version of the compiler, but it isn't installed." % self.__version)
-
-        self.cc = self.find_exe("cl.exe")
-        self.linker = self.find_exe("link.exe")
-        self.lib = self.find_exe("lib.exe")
-        self.rc = self.find_exe("rc.exe")   # resource compiler
-        self.mc = self.find_exe("mc.exe")   # message compiler
-        self.set_path_env_var('lib')
-        self.set_path_env_var('include')
+        self.__paths = []
+        if os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
+            # Assume that the SDK set up everything alright; don't try to be
+            # smarter
+            self.cc = "cl.exe"
+            self.linker = "link.exe"
+            self.lib = "lib.exe"
+            self.rc = "rc.exe"
+            self.mc = "mc.exe"
+        else:
+            self.__paths = self.get_msvc_paths("path")
+
+            if len (self.__paths) == 0:
+                raise DistutilsPlatformError, \
+                      ("Python was built with version %s of Visual Studio, "
+                       "and extensions need to be built with the same "
+                       "version of the compiler, but it isn't installed." % self.__version)
+
+            self.cc = self.find_exe("cl.exe")
+            self.linker = self.find_exe("link.exe")
+            self.lib = self.find_exe("lib.exe")
+            self.rc = self.find_exe("rc.exe")   # resource compiler
+            self.mc = self.find_exe("mc.exe")   # message compiler
+            self.set_path_env_var('lib')
+            self.set_path_env_var('include')
 
         # extend the MSVC path with the current path
         try:

From 7a7a2802bcbe8f867b3f0bfd75949ee1a4b9fc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 20 Feb 2006 12:26:58 +0000
Subject: [PATCH 1055/8469] Detect Win64 builds.

---
 msvccompiler.py | 49 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index b65e5286a2..aefcf98709 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -172,6 +172,20 @@ def get_build_version():
     # else we don't know what version of the compiler this is
     return None
 
+def get_build_architecture():
+    """Return the processor architecture.
+
+    Possible results are "Intel", "Itanium", or "AMD64".
+    """
+
+    prefix = " bit ("
+    i = string.find(sys.version, prefix)
+    if i == -1:
+        return "Intel"
+    j = string.find(sys.version, ")", i)
+    return sys.version[i+len(prefix):j]
+    
+
 
 class MSVCCompiler (CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -206,11 +220,19 @@ class MSVCCompiler (CCompiler) :
     def __init__ (self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
         self.__version = get_build_version()
-        if self.__version >= 7:
-            self.__root = r"Software\Microsoft\VisualStudio"
-            self.__macros = MacroExpander(self.__version)
+        self.__arch = get_build_architecture()
+        if self.__arch == "Intel":
+            # x86
+            if self.__version >= 7:
+                self.__root = r"Software\Microsoft\VisualStudio"
+                self.__macros = MacroExpander(self.__version)
+            else:
+                self.__root = r"Software\Microsoft\Devstudio"
+            self.__product = "Visual Studio version %s" % self.__version
         else:
-            self.__root = r"Software\Microsoft\Devstudio"
+            # Win64. Assume this was built with the platform SDK
+            self.__product = "Microsoft SDK compiler %s" % (self.__version + 6)
+            
         self.initialized = False
 
     def initialize(self):
@@ -228,9 +250,9 @@ def initialize(self):
 
             if len (self.__paths) == 0:
                 raise DistutilsPlatformError, \
-                      ("Python was built with version %s of Visual Studio, "
+                      ("Python was built with %s, "
                        "and extensions need to be built with the same "
-                       "version of the compiler, but it isn't installed." % self.__version)
+                       "version of the compiler, but it isn't installed." % self.__product)
 
             self.cc = self.find_exe("cl.exe")
             self.linker = self.find_exe("link.exe")
@@ -249,10 +271,17 @@ def initialize(self):
         os.environ['path'] = string.join(self.__paths, ';')
 
         self.preprocess_options = None
-        self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ,
-                                 '/DNDEBUG']
-        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GX',
-                                      '/Z7', '/D_DEBUG']
+        if self.__arch == "Intel":
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GX' ,
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GX',
+                                          '/Z7', '/D_DEBUG']
+        else:
+            # Win64
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
+                                          '/Z7', '/D_DEBUG']            
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         if self.__version >= 7:

From a1548e541bd1b4b0e54ff449520e393bbfd00a39 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 20 Feb 2006 21:42:18 +0000
Subject: [PATCH 1056/8469] Whitespace normalization.

---
 msvccompiler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index aefcf98709..f88f36526c 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -184,7 +184,7 @@ def get_build_architecture():
         return "Intel"
     j = string.find(sys.version, ")", i)
     return sys.version[i+len(prefix):j]
-    
+
 
 
 class MSVCCompiler (CCompiler) :
@@ -232,7 +232,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
         else:
             # Win64. Assume this was built with the platform SDK
             self.__product = "Microsoft SDK compiler %s" % (self.__version + 6)
-            
+
         self.initialized = False
 
     def initialize(self):
@@ -281,7 +281,7 @@ def initialize(self):
             self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
                                      '/DNDEBUG']
             self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
-                                          '/Z7', '/D_DEBUG']            
+                                          '/Z7', '/D_DEBUG']
 
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         if self.__version >= 7:

From d35ccaa6b4a5e7da4b2888f5f59f3407ce34ae6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 5 Mar 2006 13:36:04 +0000
Subject: [PATCH 1057/8469] Import bdist_msi

---
 command/bdist_msi.py | 639 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 639 insertions(+)
 create mode 100644 command/bdist_msi.py

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
new file mode 100644
index 0000000000..6c0982d49f
--- /dev/null
+++ b/command/bdist_msi.py
@@ -0,0 +1,639 @@
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2005 Martin v. Löwis
+# Licensed to PSF under a Contributor Agreement.
+# The bdist_wininst command proper
+# based on bdist_wininst
+"""
+Implements the bdist_msi command.
+"""
+
+import sys, os, string
+from distutils.core import Command
+from distutils.util import get_platform
+from distutils.dir_util import remove_tree
+from distutils.sysconfig import get_python_version
+from distutils.version import StrictVersion
+from distutils.errors import DistutilsOptionError
+from distutils import log
+import msilib
+from msilib import schema, sequence, uisample
+from msilib import Directory, Feature, Dialog, add_data
+
+class PyDialog(Dialog):
+    """Dialog class with a fixed layout: controls at the top, then a ruler,
+    then a list of buttons: back, next, cancel. Optionally a bitmap at the
+    left."""
+    def __init__(self, *args, **kw):
+        """Dialog(database, name, x, y, w, h, attributes, title, first,
+        default, cancel, bitmap=true)"""
+        Dialog.__init__(self, *args)
+        ruler = self.h - 36
+        bmwidth = 152*ruler/328
+        #if kw.get("bitmap", True):
+        #    self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
+        self.line("BottomLine", 0, ruler, self.w, 0)
+
+    def title(self, title):
+        "Set the title text of the dialog at the top."
+        # name, x, y, w, h, flags=Visible|Enabled|Transparent|NoPrefix,
+        # text, in VerdanaBold10
+        self.text("Title", 15, 10, 320, 60, 0x30003,
+                  r"{\VerdanaBold10}%s" % title)
+
+    def back(self, title, next, name = "Back", active = 1):
+        """Add a back button with a given title, the tab-next button,
+        its name in the Control table, possibly initially disabled.
+
+        Return the button, so that events can be associated"""
+        if active:
+            flags = 3 # Visible|Enabled
+        else:
+            flags = 1 # Visible
+        return self.pushbutton(name, 180, self.h-27 , 56, 17, flags, title, next)
+
+    def cancel(self, title, next, name = "Cancel", active = 1):
+        """Add a cancel button with a given title, the tab-next button,
+        its name in the Control table, possibly initially disabled.
+
+        Return the button, so that events can be associated"""
+        if active:
+            flags = 3 # Visible|Enabled
+        else:
+            flags = 1 # Visible
+        return self.pushbutton(name, 304, self.h-27, 56, 17, flags, title, next)
+
+    def next(self, title, next, name = "Next", active = 1):
+        """Add a Next button with a given title, the tab-next button,
+        its name in the Control table, possibly initially disabled.
+
+        Return the button, so that events can be associated"""
+        if active:
+            flags = 3 # Visible|Enabled
+        else:
+            flags = 1 # Visible
+        return self.pushbutton(name, 236, self.h-27, 56, 17, flags, title, next)
+
+    def xbutton(self, name, title, next, xpos):
+        """Add a button with a given title, the tab-next button,
+        its name in the Control table, giving its x position; the
+        y-position is aligned with the other buttons.
+
+        Return the button, so that events can be associated"""
+        return self.pushbutton(name, int(self.w*xpos - 28), self.h-27, 56, 17, 3, title, next)
+
+class bdist_msi (Command):
+
+    description = "create a Microsoft Installer (.msi) binary distribution"
+
+    user_options = [('bdist-dir=', None,
+                     "temporary directory for creating the distribution"),
+                    ('keep-temp', 'k',
+                     "keep the pseudo-installation tree around after " +
+                     "creating the distribution archive"),
+                    ('target-version=', None,
+                     "require a specific python version" +
+                     " on the target system"),
+                    ('no-target-compile', 'c',
+                     "do not compile .py to .pyc on the target system"),
+                    ('no-target-optimize', 'o',
+                     "do not compile .py to .pyo (optimized)"
+                     "on the target system"),
+                    ('dist-dir=', 'd',
+                     "directory to put final built distributions in"),
+                    ('skip-build', None,
+                     "skip rebuilding everything (for testing/debugging)"),
+                    ('install-script=', None,
+                     "basename of installation script to be run after"
+                     "installation or before deinstallation"),
+                    ('pre-install-script=', None,
+                     "Fully qualified filename of a script to be run before "
+                     "any files are installed.  This script need not be in the "
+                     "distribution"),
+                   ]
+
+    boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
+                       'skip-build']
+
+    def initialize_options (self):
+        self.bdist_dir = None
+        self.keep_temp = 0
+        self.no_target_compile = 0
+        self.no_target_optimize = 0
+        self.target_version = None
+        self.dist_dir = None
+        self.skip_build = 0
+        self.install_script = None
+        self.pre_install_script = None
+
+    def finalize_options (self):
+        if self.bdist_dir is None:
+            bdist_base = self.get_finalized_command('bdist').bdist_base
+            self.bdist_dir = os.path.join(bdist_base, 'msi')
+        short_version = get_python_version()
+        if self.target_version:
+            if not self.skip_build and self.distribution.has_ext_modules()\
+               and self.target_version != short_version:
+                raise DistutilsOptionError, \
+                      "target version can only be %s, or the '--skip_build'" \
+                      " option must be specified" % (short_version,)
+        else:
+            self.target_version = short_version
+
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+
+        if self.pre_install_script:
+            raise DistutilsOptionError, "the pre-install-script feature is not yet implemented"
+
+        if self.install_script:
+            for script in self.distribution.scripts:
+                if self.install_script == os.path.basename(script):
+                    break
+            else:
+                raise DistutilsOptionError, \
+                      "install_script '%s' not found in scripts" % \
+                      self.install_script
+        self.install_script_key = None
+    # finalize_options()
+
+
+    def run (self):
+        if not self.skip_build:
+            self.run_command('build')
+
+        install = self.reinitialize_command('install', reinit_subcommands=1)
+        install.prefix = self.bdist_dir
+        install.skip_build = self.skip_build
+        install.warn_dir = 0
+
+        install_lib = self.reinitialize_command('install_lib')
+        # we do not want to include pyc or pyo files
+        install_lib.compile = 0
+        install_lib.optimize = 0
+
+        if self.distribution.has_ext_modules():
+            # If we are building an installer for a Python version other
+            # than the one we are currently running, then we need to ensure
+            # our build_lib reflects the other Python version rather than ours.
+            # Note that for target_version!=sys.version, we must have skipped the
+            # build step, so there is no issue with enforcing the build of this
+            # version.
+            target_version = self.target_version
+            if not target_version:
+                assert self.skip_build, "Should have already checked this"
+                target_version = sys.version[0:3]
+            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            build = self.get_finalized_command('build')
+            build.build_lib = os.path.join(build.build_base,
+                                           'lib' + plat_specifier)
+
+        log.info("installing to %s", self.bdist_dir)
+        install.ensure_finalized()
+
+        # avoid warning of 'install_lib' about installing
+        # into a directory not in sys.path
+        sys.path.insert(0, os.path.join(self.bdist_dir, 'PURELIB'))
+
+        install.run()
+
+        del sys.path[0]
+
+        self.mkpath(self.dist_dir)
+        fullname = self.distribution.get_fullname()
+        installer_name = self.get_installer_filename(fullname)
+        installer_name = os.path.abspath(installer_name)
+        if os.path.exists(installer_name): os.unlink(installer_name)
+
+        metadata = self.distribution.metadata
+        author = metadata.author
+        if not author:
+            author = metadata.maintainer
+        if not author:
+            author = "UNKNOWN"
+        version = metadata.get_version()
+        # ProductVersion must be strictly numeric
+        # XXX need to deal with prerelease versions
+        sversion = "%d.%d.%d" % StrictVersion(version).version
+        # Prefix ProductName with Python x.y, so that
+        # it sorts together with the other Python packages
+        # in Add-Remove-Programs (APR)
+        product_name = "Python %s %s" % (self.target_version, 
+                       self.distribution.get_fullname())
+        self.db = msilib.init_database(installer_name, schema,
+                product_name, msilib.gen_uuid(), 
+                sversion, author)
+        msilib.add_tables(self.db, sequence)
+        props = [('DistVersion', version)]
+        email = metadata.author_email or metadata.maintainer_email
+        if email:
+            props.append(("ARPCONTACT", email))
+        if metadata.url:
+            props.append(("ARPURLINFOABOUT", metadata.url))
+        if props:
+            add_data(self.db, 'Property', props)
+
+        self.add_find_python()
+        self.add_files()
+        self.add_scripts()
+        self.add_ui()
+        self.db.Commit()
+
+        if hasattr(self.distribution, 'dist_files'):
+           self.distribution.dist_files.append(('bdist_msi', self.target_version, fullname))
+
+        if not self.keep_temp:
+            remove_tree(self.bdist_dir, dry_run=self.dry_run)
+
+    def add_files(self):
+        db = self.db
+        cab = msilib.CAB("distfiles")
+        f = Feature(db, "default", "Default Feature", "Everything", 1, directory="TARGETDIR")
+        f.set_current()
+        rootdir = os.path.abspath(self.bdist_dir)
+        root = Directory(db, cab, None, rootdir, "TARGETDIR", "SourceDir")
+        db.Commit()
+        todo = [root]
+        while todo:
+            dir = todo.pop()
+            for file in os.listdir(dir.absolute):
+                afile = os.path.join(dir.absolute, file)
+                if os.path.isdir(afile):
+                    newdir = Directory(db, cab, dir, file, file, "%s|%s" % (dir.make_short(file), file))
+                    todo.append(newdir)
+                else:
+                    key = dir.add_file(file)
+                    if file==self.install_script:
+                        if self.install_script_key:
+                            raise DistutilsOptionError, "Multiple files with name %s" % file
+                        self.install_script_key = '[#%s]' % key
+                        
+        cab.commit(db)
+
+    def add_find_python(self):
+        """Adds code to the installer to compute the location of Python.
+        Properties PYTHON.MACHINE, PYTHON.USER, PYTHONDIR and PYTHON will be set
+        in both the execute and UI sequences; PYTHONDIR will be set from
+        PYTHON.USER if defined, else from PYTHON.MACHINE. 
+        PYTHON is PYTHONDIR\python.exe"""
+        install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version
+        add_data(self.db, "RegLocator",
+                [("python.machine", 2, install_path, None, 2),
+                 ("python.user", 1, install_path, None, 2)])
+        add_data(self.db, "AppSearch",
+                [("PYTHON.MACHINE", "python.machine"),
+                 ("PYTHON.USER", "python.user")])
+        add_data(self.db, "CustomAction",
+                [("PythonFromMachine", 51+256, "PYTHONDIR", "[PYTHON.MACHINE]"),
+                 ("PythonFromUser", 51+256, "PYTHONDIR", "[PYTHON.USER]"),
+                 ("PythonExe", 51+256, "PYTHON", "[PYTHONDIR]\\python.exe"),
+                 ("InitialTargetDir", 51+256, "TARGETDIR", "[PYTHONDIR]")])
+        add_data(self.db, "InstallExecuteSequence",
+                [("PythonFromMachine", "PYTHON.MACHINE", 401),
+                 ("PythonFromUser", "PYTHON.USER", 402),
+                 ("PythonExe", None, 403),
+                 ("InitialTargetDir", 'TARGETDIR=""', 404),
+                ])
+        add_data(self.db, "InstallUISequence",
+                [("PythonFromMachine", "PYTHON.MACHINE", 401),
+                 ("PythonFromUser", "PYTHON.USER", 402),
+                 ("PythonExe", None, 403),
+                 ("InitialTargetDir", 'TARGETDIR=""', 404),
+                ])
+
+    def add_scripts(self):
+        if self.install_script:
+            add_data(self.db, "CustomAction",
+                    [("install_script", 50, "PYTHON", self.install_script_key)])
+            add_data(self.db, "InstallExecuteSequence",
+                    [("install_script", "NOT Installed", 6800)])
+        if self.pre_install_script:
+            scriptfn = os.path.join(self.bdist_dir, "preinstall.bat")
+            f = open(scriptfn, "w")
+            # The batch file will be executed with [PYTHON], so that %1
+            # is the path to the Python interpreter; %0 will be the path
+            # of the batch file.
+            # rem ="""
+            # %1 %0
+            # exit
+            # """
+            # <actual script>
+            f.write('rem ="""\n%1 %0\nexit\n"""\n')
+            f.write(open(self.pre_install_script).read())
+            f.close()
+            add_data(self.db, "Binary",
+                [("PreInstall", msilib.Binary(scriptfn))
+                ])
+            add_data(self.db, "CustomAction",
+                [("PreInstall", 2, "PreInstall", None)
+                ])
+            add_data(self.db, "InstallExecuteSequence",
+                    [("PreInstall", "NOT Installed", 450)])
+
+
+    def add_ui(self):
+        db = self.db
+        x = y = 50
+        w = 370
+        h = 300
+        title = "[ProductName] Setup"
+
+        # see "Dialog Style Bits"
+        modal = 3      # visible | modal
+        modeless = 1   # visible
+        track_disk_space = 32
+
+        # UI customization properties
+        add_data(db, "Property",
+                 # See "DefaultUIFont Property"
+                 [("DefaultUIFont", "DlgFont8"),
+                  # See "ErrorDialog Style Bit"
+                  ("ErrorDialog", "ErrorDlg"),
+                  ("Progress1", "Install"),   # modified in maintenance type dlg
+                  ("Progress2", "installs"),
+                  ("MaintenanceForm_Action", "Repair"),
+                  # possible values: ALL, JUSTME
+                  ("WhichUsers", "ALL")
+                 ])
+
+        # Fonts, see "TextStyle Table"
+        add_data(db, "TextStyle",
+                 [("DlgFont8", "Tahoma", 9, None, 0),
+                  ("DlgFontBold8", "Tahoma", 8, None, 1), #bold
+                  ("VerdanaBold10", "Verdana", 10, None, 1),
+                  ("VerdanaRed9", "Verdana", 9, 255, 0),
+                 ])
+
+        # UI Sequences, see "InstallUISequence Table", "Using a Sequence Table"
+        # Numbers indicate sequence; see sequence.py for how these action integrate
+        add_data(db, "InstallUISequence",
+                 [("PrepareDlg", "Not Privileged or Windows9x or Installed", 140),
+                  ("WhichUsersDlg", "Privileged and not Windows9x and not Installed", 141),
+                  # In the user interface, assume all-users installation if privileged.
+                  ("SelectDirectoryDlg", "Not Installed", 1230),
+                  # XXX no support for resume installations yet
+                  #("ResumeDlg", "Installed AND (RESUME OR Preselected)", 1240),
+                  ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
+                  ("ProgressDlg", None, 1280)])
+
+        add_data(db, 'ActionText', uisample.ActionText)
+        add_data(db, 'UIText', uisample.UIText)
+        #####################################################################
+        # Standard dialogs: FatalError, UserExit, ExitDialog
+        fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
+                     "Finish", "Finish", "Finish")
+        fatal.title("[ProductName] Installer ended prematurely")
+        fatal.back("< Back", "Finish", active = 0)
+        fatal.cancel("Cancel", "Back", active = 0)
+        fatal.text("Description1", 15, 70, 320, 80, 0x30003,
+                   "[ProductName] setup ended prematurely because of an error.  Your system has not been modified.  To install this program at a later time, please run the installation again.")
+        fatal.text("Description2", 15, 155, 320, 20, 0x30003,
+                   "Click the Finish button to exit the Installer.")
+        c=fatal.next("Finish", "Cancel", name="Finish")
+        c.event("EndDialog", "Exit")
+
+        user_exit=PyDialog(db, "UserExit", x, y, w, h, modal, title,
+                     "Finish", "Finish", "Finish")
+        user_exit.title("[ProductName] Installer was interrupted")
+        user_exit.back("< Back", "Finish", active = 0)
+        user_exit.cancel("Cancel", "Back", active = 0)
+        user_exit.text("Description1", 15, 70, 320, 80, 0x30003,
+                   "[ProductName] setup was interrupted.  Your system has not been modified.  "
+                   "To install this program at a later time, please run the installation again.")
+        user_exit.text("Description2", 15, 155, 320, 20, 0x30003,
+                   "Click the Finish button to exit the Installer.")
+        c = user_exit.next("Finish", "Cancel", name="Finish")
+        c.event("EndDialog", "Exit")
+
+        exit_dialog = PyDialog(db, "ExitDialog", x, y, w, h, modal, title,
+                             "Finish", "Finish", "Finish")
+        exit_dialog.title("Completing the [ProductName] Installer")
+        exit_dialog.back("< Back", "Finish", active = 0)
+        exit_dialog.cancel("Cancel", "Back", active = 0)
+        exit_dialog.text("Description", 15, 235, 320, 20, 0x30003,
+                   "Click the Finish button to exit the Installer.")
+        c = exit_dialog.next("Finish", "Cancel", name="Finish")
+        c.event("EndDialog", "Return")
+
+        #####################################################################
+        # Required dialog: FilesInUse, ErrorDlg
+        inuse = PyDialog(db, "FilesInUse",
+                         x, y, w, h,
+                         19,                # KeepModeless|Modal|Visible
+                         title,
+                         "Retry", "Retry", "Retry", bitmap=False)
+        inuse.text("Title", 15, 6, 200, 15, 0x30003,
+                   r"{\DlgFontBold8}Files in Use")
+        inuse.text("Description", 20, 23, 280, 20, 0x30003,
+               "Some files that need to be updated are currently in use.")
+        inuse.text("Text", 20, 55, 330, 50, 3,
+                   "The following applications are using files that need to be updated by this setup. Close these applications and then click Retry to continue the installation or Cancel to exit it.")
+        inuse.control("List", "ListBox", 20, 107, 330, 130, 7, "FileInUseProcess",
+                      None, None, None)
+        c=inuse.back("Exit", "Ignore", name="Exit")
+        c.event("EndDialog", "Exit")
+        c=inuse.next("Ignore", "Retry", name="Ignore")
+        c.event("EndDialog", "Ignore")
+        c=inuse.cancel("Retry", "Exit", name="Retry")
+        c.event("EndDialog","Retry")
+
+        # See "Error Dialog". See "ICE20" for the required names of the controls.
+        error = Dialog(db, "ErrorDlg",
+                       50, 10, 330, 101,
+                       65543,       # Error|Minimize|Modal|Visible
+                       title,
+                       "ErrorText", None, None)
+        error.text("ErrorText", 50,9,280,48,3, "")
+        #error.control("ErrorIcon", "Icon", 15, 9, 24, 24, 5242881, None, "py.ico", None, None)
+        error.pushbutton("N",120,72,81,21,3,"No",None).event("EndDialog","ErrorNo")
+        error.pushbutton("Y",240,72,81,21,3,"Yes",None).event("EndDialog","ErrorYes")
+        error.pushbutton("A",0,72,81,21,3,"Abort",None).event("EndDialog","ErrorAbort")
+        error.pushbutton("C",42,72,81,21,3,"Cancel",None).event("EndDialog","ErrorCancel")
+        error.pushbutton("I",81,72,81,21,3,"Ignore",None).event("EndDialog","ErrorIgnore")
+        error.pushbutton("O",159,72,81,21,3,"Ok",None).event("EndDialog","ErrorOk")
+        error.pushbutton("R",198,72,81,21,3,"Retry",None).event("EndDialog","ErrorRetry")
+
+        #####################################################################
+        # Global "Query Cancel" dialog
+        cancel = Dialog(db, "CancelDlg", 50, 10, 260, 85, 3, title,
+                        "No", "No", "No")
+        cancel.text("Text", 48, 15, 194, 30, 3,
+                    "Are you sure you want to cancel [ProductName] installation?")
+        #cancel.control("Icon", "Icon", 15, 15, 24, 24, 5242881, None,
+        #               "py.ico", None, None)
+        c=cancel.pushbutton("Yes", 72, 57, 56, 17, 3, "Yes", "No")
+        c.event("EndDialog", "Exit")
+
+        c=cancel.pushbutton("No", 132, 57, 56, 17, 3, "No", "Yes")
+        c.event("EndDialog", "Return")
+
+        #####################################################################
+        # Global "Wait for costing" dialog
+        costing = Dialog(db, "WaitForCostingDlg", 50, 10, 260, 85, modal, title,
+                         "Return", "Return", "Return")
+        costing.text("Text", 48, 15, 194, 30, 3,
+                     "Please wait while the installer finishes determining your disk space requirements.")
+        c = costing.pushbutton("Return", 102, 57, 56, 17, 3, "Return", None)
+        c.event("EndDialog", "Exit")
+
+        #####################################################################
+        # Preparation dialog: no user input except cancellation
+        prep = PyDialog(db, "PrepareDlg", x, y, w, h, modeless, title,
+                        "Cancel", "Cancel", "Cancel")
+        prep.text("Description", 15, 70, 320, 40, 0x30003,
+                  "Please wait while the Installer prepares to guide you through the installation.")
+        prep.title("Welcome to the [ProductName] Installer")
+        c=prep.text("ActionText", 15, 110, 320, 20, 0x30003, "Pondering...")
+        c.mapping("ActionText", "Text")
+        c=prep.text("ActionData", 15, 135, 320, 30, 0x30003, None)
+        c.mapping("ActionData", "Text")
+        prep.back("Back", None, active=0)
+        prep.next("Next", None, active=0)
+        c=prep.cancel("Cancel", None)
+        c.event("SpawnDialog", "CancelDlg")
+
+        #####################################################################
+        # Target directory selection
+        seldlg = PyDialog(db, "SelectDirectoryDlg", x, y, w, h, modal, title,
+                        "Next", "Next", "Cancel")
+        seldlg.title("Select Destination Directory")
+
+        version = sys.version[:3]+" "
+        seldlg.text("Hint", 15, 30, 300, 40, 3, 
+                "The destination directory should contain a Python %sinstallation" % version)
+
+        seldlg.back("< Back", None, active=0)
+        c = seldlg.next("Next >", "Cancel")
+        c.event("SetTargetPath", "TARGETDIR", order=1)
+        c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2)
+        c.event("EndDialog", "Return", order=3)
+
+        c = seldlg.cancel("Cancel", "DirectoryCombo")
+        c.event("SpawnDialog", "CancelDlg")
+
+        seldlg.control("DirectoryCombo", "DirectoryCombo", 15, 70, 272, 80, 393219,
+                       "TARGETDIR", None, "DirectoryList", None)
+        seldlg.control("DirectoryList", "DirectoryList", 15, 90, 308, 136, 3, "TARGETDIR",
+                       None, "PathEdit", None)
+        seldlg.control("PathEdit", "PathEdit", 15, 230, 306, 16, 3, "TARGETDIR", None, "Next", None)
+        c = seldlg.pushbutton("Up", 306, 70, 18, 18, 3, "Up", None)
+        c.event("DirectoryListUp", "0")
+        c = seldlg.pushbutton("NewDir", 324, 70, 30, 18, 3, "New", None)
+        c.event("DirectoryListNew", "0")
+
+        #####################################################################
+        # Disk cost
+        cost = PyDialog(db, "DiskCostDlg", x, y, w, h, modal, title,
+                        "OK", "OK", "OK", bitmap=False)
+        cost.text("Title", 15, 6, 200, 15, 0x30003,
+                  "{\DlgFontBold8}Disk Space Requirements")
+        cost.text("Description", 20, 20, 280, 20, 0x30003,
+                  "The disk space required for the installation of the selected features.")
+        cost.text("Text", 20, 53, 330, 60, 3,
+                  "The highlighted volumes (if any) do not have enough disk space "
+              "available for the currently selected features.  You can either "
+              "remove some files from the highlighted volumes, or choose to "
+              "install less features onto local drive(s), or select different "
+              "destination drive(s).")
+        cost.control("VolumeList", "VolumeCostList", 20, 100, 330, 150, 393223,
+                     None, "{120}{70}{70}{70}{70}", None, None)
+        cost.xbutton("OK", "Ok", None, 0.5).event("EndDialog", "Return")
+
+        #####################################################################
+        # WhichUsers Dialog. Only available on NT, and for privileged users.
+        # This must be run before FindRelatedProducts, because that will
+        # take into account whether the previous installation was per-user
+        # or per-machine. We currently don't support going back to this
+        # dialog after "Next" was selected; to support this, we would need to
+        # find how to reset the ALLUSERS property, and how to re-run
+        # FindRelatedProducts.
+        # On Windows9x, the ALLUSERS property is ignored on the command line
+        # and in the Property table, but installer fails according to the documentation
+        # if a dialog attempts to set ALLUSERS.
+        whichusers = PyDialog(db, "WhichUsersDlg", x, y, w, h, modal, title,
+                            "AdminInstall", "Next", "Cancel")
+        whichusers.title("Select whether to install [ProductName] for all users of this computer.")
+        # A radio group with two options: allusers, justme
+        g = whichusers.radiogroup("AdminInstall", 15, 60, 260, 50, 3,
+                                  "WhichUsers", "", "Next")
+        g.add("ALL", 0, 5, 150, 20, "Install for all users")
+        g.add("JUSTME", 0, 25, 150, 20, "Install just for me")
+
+        whichusers.back("Back", None, active=0)
+
+        c = whichusers.next("Next >", "Cancel")
+        c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
+        c.event("EndDialog", "Return", order = 2)
+
+        c = whichusers.cancel("Cancel", "AdminInstall")
+        c.event("SpawnDialog", "CancelDlg")
+
+        #####################################################################
+        # Installation Progress dialog (modeless)
+        progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title,
+                            "Cancel", "Cancel", "Cancel", bitmap=False)
+        progress.text("Title", 20, 15, 200, 15, 0x30003,
+                      "{\DlgFontBold8}[Progress1] [ProductName]")
+        progress.text("Text", 35, 65, 300, 30, 3,
+                      "Please wait while the Installer [Progress2] [ProductName]. "
+                      "This may take several minutes.")
+        progress.text("StatusLabel", 35, 100, 35, 20, 3, "Status:")
+
+        c=progress.text("ActionText", 70, 100, w-70, 20, 3, "Pondering...")
+        c.mapping("ActionText", "Text")
+
+        #c=progress.text("ActionData", 35, 140, 300, 20, 3, None)
+        #c.mapping("ActionData", "Text")
+
+        c=progress.control("ProgressBar", "ProgressBar", 35, 120, 300, 10, 65537,
+                           None, "Progress done", None, None)
+        c.mapping("SetProgress", "Progress")
+
+        progress.back("< Back", "Next", active=False)
+        progress.next("Next >", "Cancel", active=False)
+        progress.cancel("Cancel", "Back").event("SpawnDialog", "CancelDlg")
+
+        ###################################################################
+        # Maintenance type: repair/uninstall
+        maint = PyDialog(db, "MaintenanceTypeDlg", x, y, w, h, modal, title,
+                         "Next", "Next", "Cancel")
+        maint.title("Welcome to the [ProductName] Setup Wizard")
+        maint.text("BodyText", 15, 63, 330, 42, 3,
+                   "Select whether you want to repair or remove [ProductName].")
+        g=maint.radiogroup("RepairRadioGroup", 15, 108, 330, 60, 3,
+                            "MaintenanceForm_Action", "", "Next")
+        #g.add("Change", 0, 0, 200, 17, "&Change [ProductName]")
+        g.add("Repair", 0, 18, 200, 17, "&Repair [ProductName]")
+        g.add("Remove", 0, 36, 200, 17, "Re&move [ProductName]")
+
+        maint.back("< Back", None, active=False)
+        c=maint.next("Finish", "Cancel")
+        # Change installation: Change progress dialog to "Change", then ask
+        # for feature selection
+        #c.event("[Progress1]", "Change", 'MaintenanceForm_Action="Change"', 1)
+        #c.event("[Progress2]", "changes", 'MaintenanceForm_Action="Change"', 2)
+
+        # Reinstall: Change progress dialog to "Repair", then invoke reinstall
+        # Also set list of reinstalled features to "ALL"
+        c.event("[REINSTALL]", "ALL", 'MaintenanceForm_Action="Repair"', 5)
+        c.event("[Progress1]", "Repairing", 'MaintenanceForm_Action="Repair"', 6)
+        c.event("[Progress2]", "repairs", 'MaintenanceForm_Action="Repair"', 7)
+        c.event("Reinstall", "ALL", 'MaintenanceForm_Action="Repair"', 8)
+
+        # Uninstall: Change progress to "Remove", then invoke uninstall
+        # Also set list of removed features to "ALL"
+        c.event("[REMOVE]", "ALL", 'MaintenanceForm_Action="Remove"', 11)
+        c.event("[Progress1]", "Removing", 'MaintenanceForm_Action="Remove"', 12)
+        c.event("[Progress2]", "removes", 'MaintenanceForm_Action="Remove"', 13)
+        c.event("Remove", "ALL", 'MaintenanceForm_Action="Remove"', 14)
+
+        # Close dialog when maintenance action scheduled
+        c.event("EndDialog", "Return", 'MaintenanceForm_Action<>"Change"', 20)
+        #c.event("NewDialog", "SelectFeaturesDlg", 'MaintenanceForm_Action="Change"', 21)
+
+        maint.cancel("Cancel", "RepairRadioGroup").event("SpawnDialog", "CancelDlg")
+
+    def get_installer_filename(self, fullname):
+        # Factored out to allow overriding in subclasses
+        installer_name = os.path.join(self.dist_dir,
+                                      "%s.win32-py%s.msi" %
+                                       (fullname, self.target_version))
+        return installer_name

From c24cffd76bbddf35362ec7ab850b25bea009dbf5 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 9 Mar 2006 01:15:05 +0000
Subject: [PATCH 1058/8469] Whitespace normalization.

---
 command/bdist_msi.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 6c0982d49f..f05d66cb5d 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -216,10 +216,10 @@ def run (self):
         # Prefix ProductName with Python x.y, so that
         # it sorts together with the other Python packages
         # in Add-Remove-Programs (APR)
-        product_name = "Python %s %s" % (self.target_version, 
+        product_name = "Python %s %s" % (self.target_version,
                        self.distribution.get_fullname())
         self.db = msilib.init_database(installer_name, schema,
-                product_name, msilib.gen_uuid(), 
+                product_name, msilib.gen_uuid(),
                 sversion, author)
         msilib.add_tables(self.db, sequence)
         props = [('DistVersion', version)]
@@ -238,7 +238,7 @@ def run (self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-           self.distribution.dist_files.append(('bdist_msi', self.target_version, fullname))
+            self.distribution.dist_files.append(('bdist_msi', self.target_version, fullname))
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
@@ -265,14 +265,14 @@ def add_files(self):
                         if self.install_script_key:
                             raise DistutilsOptionError, "Multiple files with name %s" % file
                         self.install_script_key = '[#%s]' % key
-                        
+
         cab.commit(db)
 
     def add_find_python(self):
         """Adds code to the installer to compute the location of Python.
         Properties PYTHON.MACHINE, PYTHON.USER, PYTHONDIR and PYTHON will be set
         in both the execute and UI sequences; PYTHONDIR will be set from
-        PYTHON.USER if defined, else from PYTHON.MACHINE. 
+        PYTHON.USER if defined, else from PYTHON.MACHINE.
         PYTHON is PYTHONDIR\python.exe"""
         install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version
         add_data(self.db, "RegLocator",
@@ -497,7 +497,7 @@ def add_ui(self):
         seldlg.title("Select Destination Directory")
 
         version = sys.version[:3]+" "
-        seldlg.text("Hint", 15, 30, 300, 40, 3, 
+        seldlg.text("Hint", 15, 30, 300, 40, 3,
                 "The destination directory should contain a Python %sinstallation" % version)
 
         seldlg.back("< Back", None, active=0)

From 9e5258e007776422cab25de64ea538f0056f438f Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 15 Mar 2006 04:33:54 +0000
Subject: [PATCH 1059/8469] Use relative imports in a few places where I
 noticed the need. (Ideally, all packages in Python 2.5 will use the relative
 import syntax for all their relative import needs.)

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9bdbb16a8c..dc603be8b7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -16,7 +16,7 @@
 import string
 import sys
 
-from errors import DistutilsPlatformError
+from .errors import DistutilsPlatformError
 
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)

From 68fb7a659320c41ca8949058210394de916a400f Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 15 Mar 2006 04:58:47 +0000
Subject: [PATCH 1060/8469] Checkpoint.  218 tests are okay; 53 are failing. 
 Done so far: - all classes are new-style (but ripping out classobject.[ch]
 isn't done) - int/int -> float - all exceptions must derive from
 BaseException - absolute import - 'as' and 'with' are keywords

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9bdbb16a8c..dc603be8b7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -16,7 +16,7 @@
 import string
 import sys
 
-from errors import DistutilsPlatformError
+from .errors import DistutilsPlatformError
 
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)

From 0a9342f5549e6078a83335bee511bed4dcd43480 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 15 Mar 2006 23:08:13 +0000
Subject: [PATCH 1061/8469] Instead of relative imports, use (implicitly)
 absolute ones.

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index dc603be8b7..0feb14aa2b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -16,7 +16,7 @@
 import string
 import sys
 
-from .errors import DistutilsPlatformError
+from distutils.errors import DistutilsPlatformError
 
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)

From 79b3a97173af4724fe2c4b437a12ce760960f718 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 17 Mar 2006 06:49:51 +0000
Subject: [PATCH 1062/8469] Get rid of a bunch more raw_input references

---
 command/register.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/command/register.py b/command/register.py
index dec9aa2bf2..f8912621c8 100644
--- a/command/register.py
+++ b/command/register.py
@@ -13,6 +13,11 @@
 from distutils.core import Command
 from distutils.errors import *
 
+def raw_input(prompt):
+    sys.stdout.write(prompt)
+    sys.stdout.flush()
+    return sys.stdin.readline()
+
 class register(Command):
 
     description = ("register the distribution with the Python package index")

From 6811c9d7ad4341ea3769490502cd805ce400eb09 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 17 Mar 2006 08:00:19 +0000
Subject: [PATCH 1063/8469] Remove apply()

---
 archive_util.py      | 2 +-
 command/build_ext.py | 4 ++--
 command/build_py.py  | 8 ++++----
 dir_util.py          | 2 +-
 filelist.py          | 2 +-
 util.py              | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 6aa5e635d7..b725a14b41 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -162,7 +162,7 @@ def make_archive (base_name, format,
     func = format_info[0]
     for (arg,val) in format_info[1]:
         kwargs[arg] = val
-    filename = apply(func, (base_name, base_dir), kwargs)
+    filename = func(base_name, base_dir, **kwargs)
 
     if root_dir is not None:
         log.debug("changing back to '%s'", save_cwd)
diff --git a/command/build_ext.py b/command/build_ext.py
index 4191c76cef..6ea5d57998 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -613,8 +613,8 @@ def get_ext_filename (self, ext_name):
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply(os.path.join, ext_path) + '_d' + so_ext
-        return apply(os.path.join, ext_path) + so_ext
+            return os.path.join(*ext_path) + '_d' + so_ext
+        return os.path.join(*ext_path) + so_ext
 
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
diff --git a/command/build_py.py b/command/build_py.py
index 621bcb4af3..3b7ec62c59 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -154,7 +154,7 @@ def get_package_dir (self, package):
 
         if not self.package_dir:
             if path:
-                return apply(os.path.join, path)
+                return os.path.join(*path)
             else:
                 return ''
         else:
@@ -167,7 +167,7 @@ def get_package_dir (self, package):
                     del path[-1]
                 else:
                     tail.insert(0, pdir)
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
             else:
                 # Oops, got all the way through 'path' without finding a
                 # match in package_dir.  If package_dir defines a directory
@@ -181,7 +181,7 @@ def get_package_dir (self, package):
                     tail.insert(0, pdir)
 
                 if tail:
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
                 else:
                     return ''
 
@@ -335,7 +335,7 @@ def get_source_files (self):
 
     def get_module_outfile (self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
-        return apply(os.path.join, outfile_path)
+        return os.path.join(*outfile_path)
 
 
     def get_outputs (self, include_bytecode=1):
diff --git a/dir_util.py b/dir_util.py
index 43994db3ff..a4aff58e3d 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -204,7 +204,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
     _build_cmdtuple(directory, cmdtuples)
     for cmd in cmdtuples:
         try:
-            apply(cmd[0], (cmd[1],))
+            cmd[0](cmd[1])
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
             if _path_created.has_key(abspath):
diff --git a/filelist.py b/filelist.py
index 43f9aaaf5b..4bbdd1f00f 100644
--- a/filelist.py
+++ b/filelist.py
@@ -69,7 +69,7 @@ def sort (self):
         sortable_files.sort()
         self.files = []
         for sort_tuple in sortable_files:
-            self.files.append(apply(os.path.join, sort_tuple))
+            self.files.append(os.path.join(*sort_tuple))
 
 
     # -- Other miscellaneous utility methods ---------------------------
diff --git a/util.py b/util.py
index 387e9bdc93..889bf13603 100644
--- a/util.py
+++ b/util.py
@@ -95,7 +95,7 @@ def convert_path (pathname):
         paths.remove('.')
     if not paths:
         return os.curdir
-    return apply(os.path.join, paths)
+    return os.path.join(*paths)
 
 # convert_path ()
 
@@ -295,7 +295,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
 
     log.info(msg)
     if not dry_run:
-        apply(func, args)
+        func(*args)
 
 
 def strtobool (val):

From be411d30ce0fadb76610cae16903da8a1f34f200 Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Mon, 27 Mar 2006 21:55:21 +0000
Subject: [PATCH 1064/8469] Patch #1459476: install PKG-INFO metadata alongside
 distutils-installed packages.

---
 command/install.py          |  1 +
 command/install_egg_info.py | 75 +++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 command/install_egg_info.py

diff --git a/command/install.py b/command/install.py
index 7723761117..453151d08b 100644
--- a/command/install.py
+++ b/command/install.py
@@ -601,6 +601,7 @@ def has_data (self):
                     ('install_headers', has_headers),
                     ('install_scripts', has_scripts),
                     ('install_data',    has_data),
+                    ('install_egg_info', lambda self:True),
                    ]
 
 # class install
diff --git a/command/install_egg_info.py b/command/install_egg_info.py
new file mode 100644
index 0000000000..4e472d7c75
--- /dev/null
+++ b/command/install_egg_info.py
@@ -0,0 +1,75 @@
+"""distutils.command.install_egg_info
+
+Implements the Distutils 'install_egg_info' command, for installing
+a package's PKG-INFO metadata."""
+
+
+from distutils.cmd import Command
+from distutils import log, dir_util
+import os, sys, re
+
+class install_egg_info(Command):
+    """Install an .egg-info file for the package"""
+
+    description = "Install package's PKG-INFO metadata as an .egg-info file"
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+    ]
+
+    def initialize_options(self):
+        self.install_dir = None
+
+    def finalize_options(self):
+        self.set_undefined_options('install_lib',('install_dir','install_dir'))
+        basename = "%s-%s-py%s.egg-info" % (
+            to_filename(safe_name(self.distribution.get_name())),
+            to_filename(safe_version(self.distribution.get_version())),
+            sys.version[:3]
+        )
+        self.target = os.path.join(self.install_dir, basename) 
+        self.outputs = [self.target]
+
+    def run(self):
+        target = self.target
+        if os.path.isdir(target) and not os.path.islink(target):
+            dir_util.remove_tree(target, dry_run=self.dry_run)
+        elif os.path.exists(target):
+            self.execute(os.unlink,(self.target,),"Removing "+target)
+        log.info("Writing %s", target)
+        if not self.dry_run:
+            f = open(target, 'w')
+            self.distribution.metadata.write_pkg_file(f)
+            f.close()
+            
+    def get_outputs(self):
+        return self.outputs
+
+
+# The following routines are taken from setuptools' pkg_resources module and
+# can be replaced by importing them from pkg_resources once it is included
+# in the stdlib.
+
+def safe_name(name):
+    """Convert an arbitrary string to a standard distribution name
+
+    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '-', name)
+
+
+def safe_version(version):
+    """Convert an arbitrary string to a standard version string
+
+    Spaces become dots, and all other non-alphanumeric characters become
+    dashes, with runs of multiple dashes condensed to a single dash.
+    """
+    version = version.replace(' ','.')
+    return re.sub('[^A-Za-z0-9.]+', '-', version)
+
+
+def to_filename(name):
+    """Convert a project or version name to its filename-escaped form
+
+    Any '-' characters are currently replaced with '_'.
+    """
+    return name.replace('-','_')

From 9e248daf97b68077781fbfde44293dcaa0104172 Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Thu, 30 Mar 2006 02:12:14 +0000
Subject: [PATCH 1065/8469] Implementation for patch request #1457316: support
 --identity option for setup.py "upload" command.

---
 command/upload.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 62767a348e..6f4ce81f79 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -29,6 +29,7 @@ class upload(Command):
          'display full response text from server'),
         ('sign', 's',
          'sign files to upload using gpg'),
+        ('identity=', 'i', 'GPG identity used to sign files'),
         ]
     boolean_options = ['show-response', 'sign']
 
@@ -38,8 +39,13 @@ def initialize_options(self):
         self.repository = ''
         self.show_response = 0
         self.sign = False
+        self.identity = None
 
     def finalize_options(self):
+        if self.identity and not self.sign:
+            raise DistutilsOptionError(
+                "Must use --sign for --identity to have meaning"
+            )
         if os.environ.has_key('HOME'):
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
@@ -67,7 +73,10 @@ def run(self):
     def upload_file(self, command, pyversion, filename):
         # Sign if requested
         if self.sign:
-            spawn(("gpg", "--detach-sign", "-a", filename),
+            gpg_args = ["gpg", "--detach-sign", "-a", filename]
+            if self.identity:
+                gpg_args[2:2] = ["--local-user", self.identity]
+            spawn(gpg_args,
                   dry_run=self.dry_run)
 
         # Fill in the data - send all the meta-data in case we need to

From c363bcdfa7ebe6448597a5dc7a323ee6887083e8 Mon Sep 17 00:00:00 2001
From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Thu, 30 Mar 2006 12:59:11 +0000
Subject: [PATCH 1066/8469] whitespace normalisation

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

diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index 4e472d7c75..c31ac29668 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -26,7 +26,7 @@ def finalize_options(self):
             to_filename(safe_version(self.distribution.get_version())),
             sys.version[:3]
         )
-        self.target = os.path.join(self.install_dir, basename) 
+        self.target = os.path.join(self.install_dir, basename)
         self.outputs = [self.target]
 
     def run(self):
@@ -40,7 +40,7 @@ def run(self):
             f = open(target, 'w')
             self.distribution.metadata.write_pkg_file(f)
             f.close()
-            
+
     def get_outputs(self):
         return self.outputs
 

From 723767238ee601ade352660d96ceb887a9437417 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 1 Apr 2006 07:46:54 +0000
Subject: [PATCH 1067/8469] Bug #1458017: make distutils.Log._log more
 forgiving when passing in msg strings with '%', but without format args.

---
 log.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/log.py b/log.py
index cf3ee136e0..95d4c1c5a2 100644
--- a/log.py
+++ b/log.py
@@ -20,7 +20,12 @@ def __init__(self, threshold=WARN):
 
     def _log(self, level, msg, args):
         if level >= self.threshold:
-            print msg % args
+            if not args:
+                # msg may contain a '%'. If args is empty,
+                # don't even try to string-format
+                print msg
+            else:
+                print msg % args
             sys.stdout.flush()
 
     def log(self, level, msg, *args):

From 6cce429ad7ac2f6ee6d4a2b37817de4296a4a639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 10 Apr 2006 12:39:36 +0000
Subject: [PATCH 1068/8469] Patch #1429775: Link Python modules to libpython on
 linux if --enable-shared. Fixes #832799.

---
 command/build_ext.py | 13 +++++++++++--
 sysconfig.py         | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4191c76cef..fbb74768ba 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -185,7 +185,9 @@ def finalize_options (self):
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
+               (sys.platform.startswith('linux') and
+                sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -688,6 +690,13 @@ def get_libraries (self, ext):
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib, "m"] + extra
         else:
-            return ext.libraries
+            from distutils import sysconfig
+            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+                template = "python%d.%d"
+                pythonlib = (template %
+                             (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+                return ext.libraries + [pythonlib]
+            else:
+                return ext.libraries
 
 # class build_ext
diff --git a/sysconfig.py b/sysconfig.py
index 0feb14aa2b..eafd49e7af 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -213,8 +213,8 @@ def parse_config_h(fp, g=None):
     """
     if g is None:
         g = {}
-    define_rx = re.compile("#define ([A-Z][A-Z0-9_]+) (.*)\n")
-    undef_rx = re.compile("/[*] #undef ([A-Z][A-Z0-9_]+) [*]/\n")
+    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
+    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
     #
     while 1:
         line = fp.readline()
@@ -351,6 +351,17 @@ def _init_posix():
 
         raise DistutilsPlatformError(my_msg)
 
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(file(filename), g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
     # On MacOSX we need to check the setting of the environment variable
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.

From 9294929b0028f551a54dd48cc3325581933b3c5f Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 12 Oct 2009 20:00:02 +0000
Subject: [PATCH 1069/8469] Major updates and fixes include:

* Fix for the Python 2.6.3 build_ext API change
* Support for the most recent Sourceforge download link insanity
* Support for SVN 1.6
* Stop crashing on certain types of HTTP error
* Stop re-trying URLs that already failed retrieval once
* Fixes for various dependency management problems such as looping
  builds, re-downloading packages already present on sys.path (but not
  in a registered "site" directory), and randomly preferring local -f
  packages over local installed packages
* Prevent lots of spurious "already imported from another path" warnings
  (e.g. when pkg_resources is imported late)
* Ensure C libraries (as opposed to extensions) are also built when
  doing bdist_egg

Other changes:

* Misc. documentation fixes
* Improved Jython support
* Fewer warnings under Python 2.6+
* Warn when 'packages' uses paths instead of package names (because it
  causes other problems, like spurious "already imported" warnings)
* Stop using /usr/bin/sw_vers on Mac OS (replaced w/'platform' module
  calls)

Note: This is NOT a merge from Distribute; upon review, many of the
tracker-submitted patches used as a basis for forking were incorrect,
incomplete, introduced new bugs, or were not addressing the root
causes.  (E.g., one of the changes in this patch fixes three superficially
unrelated issues in the setuptools bug tracker.)  Careful review will be
required if you  want to merge this work back into Distribute.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075385
---
 EasyInstall.txt                      |  18 ++++-
 ez_setup.py                          |   2 +-
 pkg_resources.py                     | 109 ++++++++++++++++++---------
 pkg_resources.txt                    |  20 ++---
 release.sh                           |   2 +-
 setup.py                             |   4 +-
 setuptools.egg-info/entry_points.txt |   1 +
 setuptools.txt                       |  31 +++++++-
 setuptools/__init__.py               |   2 +-
 setuptools/command/alias.py          |   4 +-
 setuptools/command/bdist_egg.py      |   6 +-
 setuptools/command/build_ext.py      |  18 ++---
 setuptools/command/easy_install.py   |  14 ++--
 setuptools/command/egg_info.py       |  22 +++---
 setuptools/command/sdist.py          |  83 ++++++++++++++------
 setuptools/depends.py                |   2 +-
 setuptools/dist.py                   |  53 +++++++++++--
 setuptools/package_index.py          |  62 +++++++--------
 setuptools/sandbox.py                |  75 +++++++++++++-----
 version.dat                          |   2 +-
 20 files changed, 368 insertions(+), 162 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index b0341e8881..20e2053a32 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -256,7 +256,7 @@ or directory (found in the installation directory).
 If you want to delete the currently installed version of a package (or all
 versions of a package), you should first run::
 
-    easy_install -m PackageName
+    easy_install -mxN PackageName
 
 This will ensure that Python doesn't continue to search for a package you're
 planning to remove. After you've done this, you can safely delete the .egg
@@ -427,7 +427,7 @@ below, and also the section on the `Package Index "API"`_.
 
 
 Password-Protected Sites
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 If a site you want to download from is password-protected using HTTP "Basic"
 authentication, you can specify your credentials in the URL, like so::
@@ -1217,7 +1217,19 @@ displayed MD5 info (broken onto two lines for readability)::
 Release Notes/Change History
 ============================
 
-0.6final
+0.6c10
+ * Support for the most recent Sourceforge download link insanity
+
+ * Stop crashing on certain types of HTTP error
+
+ * Stop re-trying URLs that already failed retrieval once
+
+ * Fixes for various dependency management problems such as looping builds,
+   re-downloading packages already present on sys.path (but not in a registered
+   "site" directory), and semi-randomly preferring local "-f" packages over
+   local installed packages
+
+0.6c9
  * Fixed ``win32.exe`` support for .pth files, so unnecessary directory nesting
    is flattened out in the resulting egg.  (There was a case-sensitivity
    problem that affected some distributions, notably ``pywin32``.)
diff --git a/ez_setup.py b/ez_setup.py
index d24e845e58..f4de7e4b03 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c9"
+DEFAULT_VERSION = "0.6c10"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
diff --git a/pkg_resources.py b/pkg_resources.py
index 9edb6c0bd9..baff42253c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,7 +13,7 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, new
+import sys, os, zipimport, time, re, imp
 
 try:
     frozenset
@@ -39,6 +39,47 @@
 
 
 
+_state_vars = {}
+
+def _declare_state(vartype, **kw):
+    g = globals()
+    for name, val in kw.iteritems():
+        g[name] = val
+        _state_vars[name] = vartype
+
+def __getstate__():
+    state = {}
+    g = globals()
+    for k, v in _state_vars.iteritems():
+        state[k] = g['_sget_'+v](g[k])
+    return state
+
+def __setstate__(state):
+    g = globals()
+    for k, v in state.iteritems():
+        g['_sset_'+_state_vars[k]](k, g[k], v)
+    return state
+
+def _sget_dict(val):
+    return val.copy()
+
+def _sset_dict(key, ob, state):
+    ob.clear()
+    ob.update(state)
+
+def _sget_object(val):
+    return val.__getstate__()
+
+def _sset_object(key, ob, state):
+    ob.__setstate__(state)
+
+_sget_none = _sset_none = lambda *args: None
+
+
+
+
+
+
 def get_supported_platform():
     """Return this platform's maximum compatible version.
 
@@ -164,14 +205,8 @@ def get_provider(moduleOrReq):
 
 def _macosx_vers(_cache=[]):
     if not _cache:
-        info = os.popen('/usr/bin/sw_vers').read().splitlines()
-        for line in info:
-            key, value = line.split(None, 1)
-            if key == 'ProductVersion:':
-                _cache.append(value.strip().split("."))
-                break
-        else:
-            raise ValueError, "What?!"
+        from platform import mac_ver
+        _cache.append(mac_ver()[0].split('.'))
     return _cache[0]
 
 def _macosx_arch(machine):
@@ -203,6 +238,12 @@ def get_build_platform():
 
 
 
+
+
+
+
+
+
 def compatible_platforms(provided,required):
     """Can code for the `provided` platform run on the `required` platform?
 
@@ -387,7 +428,7 @@ def __init__(self, entries=None):
     def add_entry(self, entry):
         """Add a path item to ``.entries``, finding any distributions on it
 
-        ``find_distributions(entry,False)`` is used to find distributions
+        ``find_distributions(entry, True)`` is used to find distributions
         corresponding to the path entry, and they are added.  `entry` is
         always appended to ``.entries``, even if it is already present.
         (This is because ``sys.path`` can contain the same value more than
@@ -622,7 +663,6 @@ def require(self, *requirements):
         activated to fulfill the requirements; all relevant distributions are
         included, even if they were already activated in this working set.
         """
-
         needed = self.resolve(parse_requirements(requirements))
 
         for dist in needed:
@@ -630,7 +670,6 @@ def require(self, *requirements):
 
         return needed
 
-
     def subscribe(self, callback):
         """Invoke `callback` for all distributions (including existing ones)"""
         if callback in self.callbacks:
@@ -639,19 +678,21 @@ def subscribe(self, callback):
         for dist in self:
             callback(dist)
 
-
     def _added_new(self, dist):
         for callback in self.callbacks:
             callback(dist)
 
+    def __getstate__(self):
+        return (
+            self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
+            self.callbacks[:]
+        )
 
-
-
-
-
-
-
-
+    def __setstate__(self, (entries, keys, by_key, callbacks)):
+        self.entries = entries[:]
+        self.entry_keys = keys.copy()
+        self.by_key = by_key.copy()
+        self.callbacks = callbacks[:]
 
 
 class Environment(object):
@@ -1597,7 +1638,7 @@ def get_importer(path_item):
 
 
 
-_distribution_finders = {}
+_declare_state('dict', _distribution_finders = {})
 
 def register_finder(importer_type, distribution_finder):
     """Register `distribution_finder` to find distributions in sys.path items
@@ -1646,7 +1687,7 @@ def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
 
-    if os.path.isdir(path_item):
+    if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
         if path_item.lower().endswith('.egg'):
             # unpacked egg
             yield Distribution.from_filename(
@@ -1679,8 +1720,8 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(ImpWrapper,find_on_path)
 
-_namespace_handlers = {}
-_namespace_packages = {}
+_declare_state('dict', _namespace_handlers = {})
+_declare_state('dict', _namespace_packages = {})
 
 def register_namespace_handler(importer_type, namespace_handler):
     """Register `namespace_handler` to declare namespace packages
@@ -1709,7 +1750,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = new.module(packageName)
+        module = sys.modules[packageName] = imp.new_module(packageName)
         module.__path__ = []; _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
@@ -2220,12 +2261,9 @@ def insert_on(self, path, loc = None):
         if not loc:
             return
 
-        if path is sys.path:
-            self.check_version_conflict()
-
         nloc = _normalize_cached(loc)
         bdir = os.path.dirname(nloc)
-        npath= map(_normalize_cached, path)
+        npath= [(p and _normalize_cached(p) or p) for p in path]
 
         bp = None
         for p, item in enumerate(npath):
@@ -2233,10 +2271,14 @@ def insert_on(self, path, loc = None):
                 break
             elif item==bdir and self.precedence==EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
+                if path is sys.path:
+                    self.check_version_conflict()
                 path.insert(p, loc)
                 npath.insert(p, nloc)
                 break
         else:
+            if path is sys.path:
+                self.check_version_conflict()
             path.append(loc)
             return
 
@@ -2253,7 +2295,6 @@ def insert_on(self, path, loc = None):
         return
 
 
-
     def check_version_conflict(self):
         if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(
@@ -2267,7 +2308,7 @@ def check_version_conflict(self):
                 continue
 
             fn = getattr(sys.modules[modname], '__file__', None)
-            if fn and normalize_path(fn).startswith(loc):
+            if fn and (normalize_path(fn).startswith(loc) or fn.startswith(loc)):
                 continue
             issue_warning(
                 "Module %s was already imported from %s, but %s is being added"
@@ -2444,7 +2485,7 @@ def __eq__(self,other):
 
     def __contains__(self,item):
         if isinstance(item,Distribution):
-            if item.key <> self.key: return False
+            if item.key != self.key: return False
             if self.index: item = item.parsed_version  # only get if we need it
         elif isinstance(item,basestring):
             item = parse_version(item)
@@ -2541,7 +2582,7 @@ def _mkstemp(*args,**kw):
         os.open = old_open  # and then put it back
 
 
-# Set up global resource manager
+# Set up global resource manager (deliberately not state-saved)
 _manager = ResourceManager()
 def _initialize(g):
     for name in dir(_manager):
@@ -2550,7 +2591,7 @@ def _initialize(g):
 _initialize(globals())
 
 # Prepare the master working set and make the ``require()`` API available
-working_set = WorkingSet()
+_declare_state('object', working_set = WorkingSet())
 try:
     # Does the main program list any requirements?
     from __main__ import __requires__
diff --git a/pkg_resources.txt b/pkg_resources.txt
index 7d8afd377e..03793b6268 100755
--- a/pkg_resources.txt
+++ b/pkg_resources.txt
@@ -269,7 +269,7 @@ instance:
     the global ``working_set`` to reflect the change.  This method is also
     called by the ``WorkingSet()`` constructor during initialization.
 
-    This method uses ``find_distributions(entry,False)`` to find distributions
+    This method uses ``find_distributions(entry, True)`` to find distributions
     corresponding to the path entry, and then ``add()`` them.  `entry` is
     always appended to the ``entries`` attribute, even if it is already
     present, however. (This is because ``sys.path`` can contain the same value
@@ -1661,14 +1661,10 @@ PEP 302 Utilities
     for obtaining an "importer" object.  It first checks for an importer for
     the path item in ``sys.path_importer_cache``, and if not found it calls
     each of the ``sys.path_hooks`` and caches the result if a good importer is
-    found.  If no importer is found, this routine returns an ``ImpWrapper``
-    instance that wraps the builtin import machinery as a PEP 302-compliant
-    "importer" object.  This ``ImpWrapper`` is *not* cached; instead a new
-    instance is returned each time.
-
-    (Note: When run under Python 2.5, this function is simply an alias for
-    ``pkgutil.get_importer()``, and instead of ``pkg_resources.ImpWrapper``
-    instances, it may return ``pkgutil.ImpImporter`` instances.)
+    found.  If no importer is found, this routine returns a wrapper object
+    that wraps the builtin import machinery as a PEP 302-compliant "importer"
+    object.  This wrapper object is *not* cached; instead a new instance is
+    returned each time.
 
 
 File/Path Utilities
@@ -1692,7 +1688,11 @@ File/Path Utilities
 Release Notes/Change History
 ----------------------------
 
-0.6final
+0.6c10
+ * Prevent lots of spurious "already imported from another path" warnings (e.g.
+   when pkg_resources is imported late).
+
+0.6c9
  * Fix ``resource_listdir('')`` always returning an empty list for zipped eggs.
  
 0.6c7
diff --git a/release.sh b/release.sh
index c53357d924..2d2da5eb53 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@
 # If your initials aren't PJE, don't run it.  :)
 #
 
-export VERSION="0.6c9"
+export VERSION="0.6c10"
 
 python2.3 setup.py -q release source --target-version=2.3 upload && \
 python2.4 setup.py -q release binary --target-version=2.4 upload && \
diff --git a/setup.py b/setup.py
index b5da418398..198ae88d9a 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 execfile(convert_path('setuptools/command/__init__.py'), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6c9"
+VERSION = "0.6c10"
 
 from setuptools import setup, find_packages
 import sys
@@ -53,8 +53,8 @@
             "include_package_data = setuptools.dist:assert_bool",
             "dependency_links     = setuptools.dist:assert_string_list",
             "test_loader          = setuptools.dist:check_importable",
+            "packages             = setuptools.dist:check_packages",
         ],
-
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index f7367e0d35..10f1da6c73 100755
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -49,6 +49,7 @@ test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
 zip_safe = setuptools.dist:assert_bool
 test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
 tests_require = setuptools.dist:check_requirements
 
 [setuptools.installation]
diff --git a/setuptools.txt b/setuptools.txt
index d1b253028d..93940528ae 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2569,6 +2569,27 @@ A few important points for writing revision control file finders:
   inform the user of the missing program(s).
 
 
+A Note Regarding Dependencies
+-----------------------------
+
+If the project *containing* your distutils/setuptools extension(s) depends on
+any projects other than setuptools, you *must* also declare those dependencies
+as part of your project's  ``setup_requires`` keyword, so that they will
+already be built (and at least temprorarily installed) before your extension
+project is built.
+
+So, if for example you create a project Foo that includes a new file finder
+plugin, and Foo depends on Bar, then you *must* list Bar in both the
+``install_requires`` **and** ``setup_requires`` arguments to ``setup()``.
+
+If you don't do this, then in certain edge cases you may cause setuptools to
+try to go into infinite recursion, trying to build your dependencies to resolve
+your dependencies, while still building your dependencies.  (It probably won't
+happen on your development machine, but it *will* happen in a full build
+pulling everything from revision control on a clean machine, and then you or
+your users will be scratching their heads trying to figure it out!)
+
+
 Subclassing ``Command``
 -----------------------
 
@@ -2611,7 +2632,15 @@ XXX
 Release Notes/Change History
 ----------------------------
 
-0.6final
+0.6c10
+ * Fix for the Python 2.6.3 build_ext API change
+
+ * Ensure C libraries (as opposed to extensions) are also built when doing
+   bdist_egg
+
+ * Support for SVN 1.6
+
+0.6c9
  * Fixed a missing files problem when using Windows source distributions on
    non-Windows platforms, due to distutils not handling manifest file line
    endings correctly.
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 56cbf7673b..a9f6544de9 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c9'
+__version__ = '0.6c10'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index f5368b29e9..40c00b550b 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -9,7 +9,7 @@ def shquote(arg):
     """Quote an argument for later parsing by shlex.split()"""
     for c in '"', "'", "\\", "#":
         if c in arg: return repr(arg)
-    if arg.split()<>[arg]:
+    if arg.split()!=[arg]:
         return repr(arg)
     return arg        
 
@@ -33,7 +33,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         option_base.finalize_options(self)
-        if self.remove and len(self.args)<>1:
+        if self.remove and len(self.args)!=1:
             raise DistutilsOptionError(
                 "Must specify exactly one argument (the alias name) when "
                 "using --remove"
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9e852a3f15..7e5a37995c 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -165,12 +165,13 @@ def call_command(self,cmdname,**kw):
     def run(self):
         # Generate metadata first
         self.run_command("egg_info")
-
         # We run install_lib before install_data, because some data hacks
         # pull their data path from the install_lib command.
         log.info("installing library code to %s" % self.bdist_dir)
         instcmd = self.get_finalized_command('install')
         old_root = instcmd.root; instcmd.root = None
+        if self.distribution.has_c_libraries() and not self.skip_build:
+            self.run_command('build_clib')
         cmd = self.call_command('install_lib', warn_dir=0)
         instcmd.root = old_root
 
@@ -190,7 +191,6 @@ def run(self):
         to_compile.extend(self.make_init_files())
         if to_compile:
             cmd.byte_compile(to_compile)
-
         if self.distribution.data_files:
             self.do_install_data()
 
@@ -398,7 +398,7 @@ def write_safety_flag(egg_dir, safe):
     for flag,fn in safety_flags.items():
         fn = os.path.join(egg_dir, fn)
         if os.path.exists(fn):
-            if safe is None or bool(safe)<>flag:
+            if safe is None or bool(safe)!=flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe)==flag:
             f=open(fn,'wb'); f.write('\n'); f.close()
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c0aaa8e80c..f6f3355dcb 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -82,15 +82,15 @@ def swig_sources(self, sources, *otherargs):
 
     def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self,fullname)
-        ext = self.ext_map[fullname]
-        if isinstance(ext,Library):
-            fn, ext = os.path.splitext(filename)
-            return self.shlib_compiler.library_filename(fn,libtype)
-        elif use_stubs and ext._links_to_dynamic:
-            d,fn = os.path.split(filename)
-            return os.path.join(d,'dl-'+fn)
-        else:
-            return filename
+        if fullname in self.ext_map:
+            ext = self.ext_map[fullname]
+            if isinstance(ext,Library):
+                fn, ext = os.path.splitext(filename)
+                return self.shlib_compiler.library_filename(fn,libtype)
+            elif use_stubs and ext._links_to_dynamic:
+                d,fn = os.path.split(filename)
+                return os.path.join(d,'dl-'+fn)
+        return filename
 
     def initialize_options(self):
         _build_ext.initialize_options(self)
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f06b6ddd7b..a5a23ad49b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -204,7 +204,7 @@ def finalize_options(self):
         self.outputs = []
 
     def run(self):
-        if self.verbose<>self.distribution.verbose:
+        if self.verbose!=self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
             for spec in self.args:
@@ -252,7 +252,7 @@ def check_site_dir(self):
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
         is_site_dir = instdir in self.all_site_dirs
 
-        if not is_site_dir:
+        if not is_site_dir and not self.multi_version:
             # No?  Then directly test whether it does .pth file processing
             is_site_dir = self.check_pth_processing()
         else:
@@ -430,9 +430,9 @@ def easy_install(self, spec, deps=False):
 
             self.check_editable(spec)
             dist = self.package_index.fetch_distribution(
-                spec, tmpdir, self.upgrade, self.editable, not self.always_copy
+                spec, tmpdir, self.upgrade, self.editable, not self.always_copy,
+                self.local_index
             )
-
             if dist is None:
                 msg = "Could not find suitable distribution for %r" % spec
                 if self.always_copy:
@@ -722,7 +722,7 @@ def install_exe(self, dist_filename, tmpdir):
             f = open(pkg_inf,'w')
             f.write('Metadata-Version: 1.0\n')
             for k,v in cfg.items('metadata'):
-                if k<>'target_version':
+                if k!='target_version':
                     f.write('%s: %s\n' % (k.replace('_','-').title(), v))
             f.close()
         script_dir = os.path.join(egg_info,'scripts')
@@ -988,7 +988,6 @@ def unpack_and_compile(self, egg_path, destination):
         def pf(src,dst):
             if dst.endswith('.py') and not src.startswith('EGG-INFO/'):
                 to_compile.append(dst)
-                to_chmod.append(dst)
             elif dst.endswith('.dll') or dst.endswith('.so'):
                 to_chmod.append(dst)
             self.unpack_progress(src,dst)
@@ -1023,6 +1022,7 @@ def byte_compile(self, to_compile):
 
 
 
+
     def no_default_version_msg(self):
         return """bad install directory or PYTHONPATH
 
@@ -1286,7 +1286,7 @@ def get_exe_prefixes(exe_filename):
                 if parts[1].endswith('.egg-info'):
                     prefixes.insert(0,('/'.join(parts[:2]), 'EGG-INFO/'))
                     break
-            if len(parts)<>2 or not name.endswith('.pth'):
+            if len(parts)!=2 or not name.endswith('.pth'):
                 continue
             if name.endswith('-nspkg.pth'):
                 continue
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9741e26a34..5a8b2db8d7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -217,18 +217,21 @@ def get_svn_revision(self):
             data = f.read()
             f.close()
 
-            if data.startswith('9') or data.startswith('8'):
+            if data.startswith('<?xml'):
+                dirurl = urlre.search(data).group(1)    # get repository URL
+                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
+            else:
+                try: svnver = int(data.splitlines()[0])
+                except: svnver=-1
+                if data<8:
+                    log.warn("unrecognized .svn/entries format; skipping %s", base)
+                    dirs[:] = []
+                    continue
+                   
                 data = map(str.splitlines,data.split('\n\x0c\n'))
                 del data[0][0]  # get rid of the '8' or '9'
                 dirurl = data[0][3]
                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
-            elif data.startswith('<?xml'):
-                dirurl = urlre.search(data).group(1)    # get repository URL
-                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
-            else:
-                log.warn("unrecognized .svn/entries format; skipping %s", base)
-                dirs[:] = []
-                continue
             if base==os.curdir:
                 base_url = dirurl+'/'   # save the root url
             elif not dirurl.startswith(base_url):
@@ -241,9 +244,6 @@ def get_svn_revision(self):
 
 
 
-
-
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 5bd5ebd490..d5121de5ce 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,6 +1,7 @@
 from distutils.command.sdist import sdist as _sdist
 from distutils.util import convert_path
 from distutils import log
+from glob import glob
 import os, re, sys, pkg_resources
 
 entities = [
@@ -38,7 +39,6 @@ def joinpath(prefix,suffix):
 
 
 
-
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""
     for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
@@ -86,17 +86,21 @@ def entries_finder(dirname, filename):
     f = open(filename,'rU')
     data = f.read()
     f.close()
-    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
+    if data.startswith('<?xml'):
+        for match in entries_pattern.finditer(data):
+            yield joinpath(dirname,unescape(match.group(1)))
+    else:
+        svnver=-1
+        try: svnver = int(data.splitlines()[0])
+        except: pass
+        if svnver<8:
+            log.warn("unrecognized .svn/entries format in %s", dirname)
+            return           
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted
             yield joinpath(dirname, record[0])
-    elif data.startswith('<?xml'):
-        for match in entries_pattern.finditer(data):
-            yield joinpath(dirname,unescape(match.group(1)))
-    else:
-        log.warn("unrecognized .svn/entries format in %s", dirname)
-
+        
 
 finders = [
     (convert_path('CVS/Entries'),
@@ -117,10 +121,6 @@ def entries_finder(dirname, filename):
 
 
 
-
-
-
-
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""
 
@@ -162,6 +162,56 @@ def read_template(self):
             sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
             raise
 
+    # Cribbed from old distutils code, to work around new distutils code
+    # that tries to do some of the same stuff as we do, in a way that makes
+    # us loop.
+    
+    def add_defaults (self):
+        standards = [('README', 'README.txt'), self.distribution.script_name]
+
+        for fn in standards:
+            if type(fn) is tuple:
+                alts = fn
+                got_it = 0
+                for fn in alts:
+                    if os.path.exists(fn):
+                        got_it = 1
+                        self.filelist.append(fn)
+                        break
+
+                if not got_it:
+                    self.warn("standard file not found: should have one of " +
+                              string.join(alts, ', '))
+            else:
+                if os.path.exists(fn):
+                    self.filelist.append(fn)
+                else:
+                    self.warn("standard file '%s' not found" % fn)
+
+        optional = ['test/test*.py', 'setup.cfg']
+        
+        for pattern in optional:
+            files = filter(os.path.isfile, glob(pattern))
+            if files:
+                self.filelist.extend(files)
+
+        if self.distribution.has_pure_modules():
+            build_py = self.get_finalized_command('build_py')
+            self.filelist.extend(build_py.get_source_files())
+
+        if self.distribution.has_ext_modules():
+            build_ext = self.get_finalized_command('build_ext')
+            self.filelist.extend(build_ext.get_source_files())
+
+        if self.distribution.has_c_libraries():
+            build_clib = self.get_finalized_command('build_clib')
+            self.filelist.extend(build_clib.get_source_files())
+
+        if self.distribution.has_scripts():
+            build_scripts = self.get_finalized_command('build_scripts')
+            self.filelist.extend(build_scripts.get_source_files())
+
+
     def check_readme(self):
         alts = ("README", "README.txt")
         for f in alts:
@@ -193,13 +243,4 @@ def make_release_tree(self, base_dir, files):
 
 
 
-
-
-
-
-
-
-
-
-
 #
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 4b7b343760..5fdf2d7e57 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -36,7 +36,7 @@ def full_name(self):
     def version_ok(self,version):
         """Is 'version' sufficiently up-to-date?"""
         return self.attribute is None or self.format is None or \
-            str(version)<>"unknown" and version >= self.requested_version
+            str(version)!="unknown" and version >= self.requested_version
 
 
     def get_version(self, paths=None, default="unknown"):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 30ff35e320..c1218ef218 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -8,7 +8,7 @@
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.errors import DistutilsSetupError
 import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
-import os, distutils.log
+import os, distutils.log, re
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
@@ -61,8 +61,8 @@ def check_nsp(dist, attr, value):
             parent = '.'.join(nsp.split('.')[:-1])
             if parent not in value:
                 distutils.log.warn(
-                    "%r is declared as a package namespace, but %r is not:"
-                    " please correct this in setup.py", nsp, parent
+                    "WARNING: %r is declared as a package namespace, but %r"
+                    " is not: please correct this in setup.py", nsp, parent
                 )
 
 def check_extras(dist, attr, value):
@@ -120,6 +120,47 @@ def check_package_data(dist, attr, value):
         attr+" must be a dictionary mapping package names to lists of "
         "wildcard patterns"
     )
+
+def check_packages(dist, attr, value):
+    for pkgname in value:
+        if not re.match(r'\w+(\.\w+)*', pkgname):
+            distutils.log.warn(
+                "WARNING: %r not a valid package name; please use only"
+                ".-separated package names in setup.py", pkgname
+            )
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 class Distribution(_Distribution):
     """Distribution with support for features, tests, and package data
@@ -415,19 +456,19 @@ def exclude_package(self,package):
         if self.packages:
             self.packages = [
                 p for p in self.packages
-                    if p<>package and not p.startswith(pfx)
+                    if p!=package and not p.startswith(pfx)
             ]
 
         if self.py_modules:
             self.py_modules = [
                 p for p in self.py_modules
-                    if p<>package and not p.startswith(pfx)
+                    if p!=package and not p.startswith(pfx)
             ]
 
         if self.ext_modules:
             self.ext_modules = [
                 p for p in self.ext_modules
-                    if p.name<>package and not p.name.startswith(pfx)
+                    if p.name!=package and not p.name.startswith(pfx)
             ]
 
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index da3fed1248..70b75a6f47 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
+import httplib
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
@@ -8,7 +9,6 @@
 except ImportError:
     from md5 import md5
 from fnmatch import translate
-
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
@@ -42,6 +42,8 @@ def parse_bdist_wininst(name):
 def egg_info_for_url(url):
     scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
     base = urllib2.unquote(path.split('/')[-1])
+    if server=='sourceforge.net' and base=='download':    # XXX Yuck
+        base = urllib2.unquote(path.split('/')[-2])
     if '#' in base: base, fragment = base.split('#',1)
     return base,fragment
 
@@ -64,14 +66,12 @@ def distros_for_location(location, basename, metadata=None):
     if basename.endswith('.egg') and '-' in basename:
         # only one, unambiguous interpretation
         return [Distribution.from_location(location, basename, metadata)]
-
     if basename.endswith('.exe'):
         win_base, py_ver = parse_bdist_wininst(basename)
         if win_base is not None:
             return interpret_distro_name(
                 location, win_base, metadata, py_ver, BINARY_DIST, "win32"
             )
-
     # Try source distro extensions (.zip, .tgz, etc.)
     #
     for ext in EXTENSIONS:
@@ -186,10 +186,10 @@ def process_url(self, url, retrieve=False):
             return
 
         self.info("Reading %s", url)
+        self.fetched_urls[url] = True   # prevent multiple fetch attempts
         f = self.open_url(url, "Download error: %s -- Some packages may not be found!")
         if f is None: return
-        self.fetched_urls[url] = self.fetched_urls[f.url] = True
-
+        self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
             f.close()   # not html, we can't process it
             return
@@ -329,7 +329,7 @@ def obtain(self, requirement, installer=None):
     def check_md5(self, cs, info, filename, tfp):
         if re.match('md5=[0-9a-f]{32}$', info):
             self.debug("Validating md5 checksum for %s", filename)
-            if cs.hexdigest()<>info[4:]:
+            if cs.hexdigest()!=info[4:]:
                 tfp.close()
                 os.unlink(filename)
                 raise DistutilsError(
@@ -409,7 +409,8 @@ def download(self, spec, tmpdir):
 
 
     def fetch_distribution(self,
-        requirement, tmpdir, force_scan=False, source=False, develop_ok=False
+        requirement, tmpdir, force_scan=False, source=False, develop_ok=False,
+        local_index=None, 
     ):
         """Obtain a distribution suitable for fulfilling `requirement`
 
@@ -427,15 +428,15 @@ def fetch_distribution(self,
         set, development and system eggs (i.e., those using the ``.egg-info``
         format) will be ignored.
         """
-
         # process a Requirement
         self.info("Searching for %s", requirement)
         skipped = {}
+        dist = None
 
-        def find(req):
+        def find(env, req):
             # Find a matching distribution; may be called more than once
 
-            for dist in self[req.key]:
+            for dist in env[req.key]:
 
                 if dist.precedence==DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
@@ -444,23 +445,25 @@ def find(req):
                     continue
 
                 if dist in req and (dist.precedence<=SOURCE_DIST or not source):
-                    self.info("Best match: %s", dist)
-                    return dist.clone(
-                        location=self.download(dist.location, tmpdir)
-                    )
+                    return dist
+
+
 
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
+            dist = find(self, requirement)
+            
+        if local_index is not None:
+            dist = dist or find(local_index, requirement)
 
-        dist = find(requirement)
         if dist is None and self.to_scan is not None:
             self.prescan()
-            dist = find(requirement)
+            dist = find(self, requirement)
 
         if dist is None and not force_scan:
             self.find_packages(requirement)
-            dist = find(requirement)
+            dist = find(self, requirement)
 
         if dist is None:
             self.warn(
@@ -468,7 +471,9 @@ def find(req):
                 (source and "a source distribution of " or ""),
                 requirement,
             )
-        return dist
+        self.info("Best match: %s", dist)
+        return dist.clone(location=self.download(dist.location, tmpdir))
+
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`
@@ -485,11 +490,6 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
 
 
 
-
-
-
-
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [d for d in
@@ -573,17 +573,19 @@ def reporthook(self, url, filename, blocknum, blksize, size):
 
 
     def open_url(self, url, warning=None):
-        if url.startswith('file:'):
-            return local_open(url)
+        if url.startswith('file:'): return local_open(url)
         try:
             return open_with_auth(url)
         except urllib2.HTTPError, v:
             return v
         except urllib2.URLError, v:
-            if warning: self.warn(warning, v.reason)
-            else:
-                raise DistutilsError("Download error for %s: %s"
-                                     % (url, v.reason))
+            reason = v.reason
+        except httplib.HTTPException, v: 
+            reason = "%s: %s" % (v.__doc__ or v.__class__.__name__, v)
+        if warning:
+            self.warn(warning, reason)
+        else:
+            raise DistutilsError("Download error for %s: %s" % (url, reason))
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
@@ -611,8 +613,6 @@ def _download_url(self, scheme, url, tmpdir):
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
 
-
-
     def scan_url(self, url):
         self.process_url(url, True)
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 4db0dbdb37..00eb012410 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,14 +1,46 @@
-import os, sys, __builtin__, tempfile, operator
+import os, sys, __builtin__, tempfile, operator, pkg_resources
 _os = sys.modules[os.name]
 _open = open
+_file = file
+
 from distutils.errors import DistutilsError
+from pkg_resources import working_set
+
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
-
     old_dir = os.getcwd()
     save_argv = sys.argv[:]
     save_path = sys.path[:]
@@ -16,13 +48,16 @@ def run_setup(setup_script, args):
     temp_dir = os.path.join(setup_dir,'temp')
     if not os.path.isdir(temp_dir): os.makedirs(temp_dir)
     save_tmp = tempfile.tempdir
-
+    save_modules = sys.modules.copy()
+    pr_state = pkg_resources.__getstate__()
     try:
-        tempfile.tempdir = temp_dir
-        os.chdir(setup_dir)
+        tempfile.tempdir = temp_dir; os.chdir(setup_dir)
         try:
             sys.argv[:] = [setup_script]+list(args)
             sys.path.insert(0, setup_dir)
+            # reset to include setup dir, w/clean callback list
+            working_set.__init__()  
+            working_set.callbacks.append(lambda dist:dist.activate())
             DirectorySandbox(setup_dir).run(
                 lambda: execfile(
                     "setup.py",
@@ -34,11 +69,17 @@ def run_setup(setup_script, args):
                 raise
             # Normal exit, just return
     finally:
+        pkg_resources.__setstate__(pr_state)
+        sys.modules.update(save_modules)
+        for key in list(sys.modules):
+            if key not in save_modules: del sys.modules[key]
         os.chdir(old_dir)
         sys.path[:] = save_path
         sys.argv[:] = save_argv
         tempfile.tempdir = save_tmp
 
+
+
 class AbstractSandbox:
     """Wrap 'os' module and 'open()' builtin for virtualizing setup scripts"""
 
@@ -58,15 +99,16 @@ def run(self, func):
         """Run 'func' under os sandboxing"""
         try:
             self._copy(self)
-            __builtin__.open = __builtin__.file = self._open
+            __builtin__.file = self._file
+            __builtin__.open = self._open
             self._active = True
             return func()
         finally:
             self._active = False
-            __builtin__.open = __builtin__.file = _open
+            __builtin__.open = _file
+            __builtin__.file = _open
             self._copy(_os)
 
-
     def _mk_dual_path_wrapper(name):
         original = getattr(_os,name)
         def wrap(self,src,dst,*args,**kw):
@@ -75,7 +117,6 @@ def wrap(self,src,dst,*args,**kw):
             return original(src,dst,*args,**kw)
         return wrap
 
-
     for name in ["rename", "link", "symlink"]:
         if hasattr(_os,name): locals()[name] = _mk_dual_path_wrapper(name)
 
@@ -88,7 +129,8 @@ def wrap(self,path,*args,**kw):
             return original(path,*args,**kw)
         return wrap
 
-    _open = _mk_single_path_wrapper('file', _open)
+    _open = _mk_single_path_wrapper('open', _open)
+    _file = _mk_single_path_wrapper('file', _file)
     for name in [
         "stat", "listdir", "chdir", "open", "chmod", "chown", "mkdir",
         "remove", "unlink", "rmdir", "utime", "lchown", "chroot", "lstat",
@@ -96,7 +138,6 @@ def wrap(self,path,*args,**kw):
     ]:
         if hasattr(_os,name): locals()[name] = _mk_single_path_wrapper(name)
 
-
     def _mk_single_with_return(name):
         original = getattr(_os,name)
         def wrap(self,path,*args,**kw):
@@ -187,22 +228,22 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
+    def _file(self, path, mode='r', *args, **kw):
+        if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
+            self._violation("file", path, mode, *args, **kw)
+        return _file(path,mode,*args,**kw)
+
     def open(self, file, flags, mode=0777):
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode)
         return _os.open(file,flags,mode)
 
-
 WRITE_FLAGS = reduce(
-    operator.or_,
-    [getattr(_os, a, 0) for a in
+    operator.or_, [getattr(_os, a, 0) for a in
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
 )
 
-
-
-
 class SandboxViolation(DistutilsError):
     """A setup script attempted to modify the filesystem outside the sandbox"""
 
diff --git a/version.dat b/version.dat
index 32144c8eb9..16ecd2aaf1 100755
--- a/version.dat
+++ b/version.dat
@@ -1,6 +1,6 @@
 [setuptools]
 status = 'release candidate'
 major = 0
-build = 9
+build = 10
 minor = 6
 

From 11e0e840b1d2b9b2e4326facb2f05eacec71bafa Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 12 Oct 2009 20:05:56 +0000
Subject: [PATCH 1070/8469] Backport fixes for issues 16 & 23 from trunk

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075386
---
 pkg_resources.py           | 20 ++++++++++----------
 setuptools/archive_util.py |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index baff42253c..79db00b8c2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -20,18 +20,18 @@
 except NameError:
     from sets import ImmutableSet as frozenset
 
-from os import utime, rename, unlink    # capture these to bypass sandboxing
+# capture these to bypass sandboxing
+from os import utime, rename, unlink, mkdir
 from os import open as os_open
+from os.path import isdir, split
 
 
-
-
-
-
-
-
-
-
+def _bypass_ensure_directory(name, mode=0777):
+    # Sandbox-bypassing version of ensure_directory()
+    dirname, filename = split(name)
+    if dirname and filename and not isdir(dirname):
+        _bypass_ensure_directory(dirname)
+        mkdir(dirname, mode)
 
 
 
@@ -957,7 +957,7 @@ def get_cache_path(self, archive_name, names=()):
         extract_path = self.extraction_path or get_default_cache()
         target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
         try:
-            ensure_directory(target_path)
+            _bypass_ensure_directory(target_path)
         except:
             self.extraction_error()
 
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 511f05ad5d..5d72e7edc6 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -189,7 +189,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                     if dst:
                         if dst.endswith(os.sep):
                             dst = dst[:-1]
-                        tarobj._extract_member(member,dst)  # XXX Ugh
+                        try:
+                            tarobj._extract_member(member,dst)  # XXX Ugh
+                        except tarfile.ExtractError:
+                            pass    # chown/chmod/mkfifo/mknode/makedev failed
         return True
     finally:
         tarobj.close()
@@ -200,6 +203,3 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile
 
 
-
-
-

From 81e2bb6c275be23a335e2735bb346559357b9d7e Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 12 Oct 2009 20:21:43 +0000
Subject: [PATCH 1071/8469] Windows 64/Vista UAC fixes

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075388
---
 setuptools/cli.exe                 | Bin 6656 -> 7168 bytes
 setuptools/command/easy_install.py |  45 +++++++++++++++++++++++++++--
 setuptools/gui.exe                 | Bin 7168 -> 7168 bytes
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
index 3173b2b21dd54f1008d0a1046418eefb5f9c2989..491544004c39e95525c3d0177761ae52129f8d17 100755
GIT binary patch
literal 7168
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

delta 2581
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
Hhbj3NM6ug1

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a5a23ad49b..af4e349768 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1590,12 +1590,53 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                 yield (name+ext, hdr+script_text, 't', [name+x for x in old])
                 yield (
                     name+'.exe', resource_string('setuptools', launcher),
-                    'b' # write in binary mode
-                )
+                    'b') # write in binary mode
+                yield (name+'.exe.manifest', _launcher_manifest % (name,), 't')
             else:
                 # On other platforms, we assume the right thing to do is to
                 # just write the stub with no extension.
                 yield (name, header+script_text)
+
+_launcher_manifest = """
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity version="1.0.0.0"
+ processorArchitecture="X86"
+ name="%s.exe"
+ type="win32"/>
+
+ <!-- Identify the application security requirements. -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>"""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
     """Recursively delete a directory tree.
diff --git a/setuptools/gui.exe b/setuptools/gui.exe
index 53d4ff81af0e50b1996de048db0726d561613809..5231ed9013c4c7b5f0c60ca523c75b54f50c6678 100755
GIT binary patch
delta 3357
zcmcguZ*UXG6<-~PE!&c%1QTd%f}D{Z6O6H`lTdJyBSgfZKn%vIJ46+-bOr@k(nxp4
zq$M)QqCO5~4ChQ~2QqOXGlUQMkYuRIFjTb&f2Ns~I4Q$~ejp{uoRKnhJ04f0Zq?tO
z&e*i+*Y4=)w{Q3N-oE#C_wIUE_O2Z0XP3P8>H5QmDhzKPetS8y|KY=*KgtkRS;K@I
z>IA+=AcTxt@MqP91<q<V(z3nI>lWM?GbwKy7M0W|>%#ege&rLxB5OTY*Aa<OlXm*Y
z9j<(!wwG|pI-hPvJ+?q7E`-c#9H~#f*HD%;9AS%#9L9zlk~k$3Wgc6_WJ;A)YzNa{
zs=UG4>xT`nlAg7*YI`Xm@kvWxcP^JxKQ$9F=11=mYcBz#A*pd1OO?N|_Uf~m(FPc?
zFdD0x;mx?aZC0A*mPcVvtQ=97ff&oMs>4Kx%E9|3N0!E$aAe`xIz((70hi@C8jUI8
zm;e}uNnU5w<1iUALW?H_?+F%cdA@Bk)KN=(2!3MU-V_#V1RCfNoszkFDazW_Z7|J~
zW8Wr)n*SuVNZ>pHPTD*$yQ$@x9bHPYs&5owjW5U5ZX@FVE0U0DoW`N)0Ee{5;pwdc
z)H9`C1VyT_FIAs{m&6&G>a4)5bj=IYi<ZO~hYAiTy#;IUYeeAESI*oQ389*_$>tj6
zvw})9O(&M*sFh$+n8L@IMw7Ct@E~)&M7daKd*lH2NJ^nJ3oaoj7TZG?lN#;nNzBAD
zCfXe;QOrgUGf}LBjq90H#maf3i+Q?OSzOe_+*hnPi<VY=ge>Dpaolod&f0#*U;2{5
ze9QSHUH07~<z&%nMl4dkD3X{}MT)=pW#)0Ca=p0Glr1F0a1q(6Ul%G1OGcUfg-WL6
zmrSrg`MK%QMXOPf1V6FuCoX5IP5P=emMK%C`6~4mC?A_v*w4*HQGbD`)zjK|!f}eO
zNlS?{6TcxAj2&0(=4FNvWsAA$M<e3bX*;dYTFaS|-a8LlUQafR_Fb{OJ`x`h(-;ss
z^A+#CW3vn<d+!uk21nA?&H?b}G+}6@2_wm(tEUWNh8|EfH9J?iYM#GwtKHNvD!pVk
zN?TDt1o7d&a=BQ>Dm$mHr09C-U(Fm6WE0C6hm1HPv6Vzvkh9A3sgihxmA9}bj7rF|
zFnV(_X0thANjxc~gn80r;@l&2#a!8OI`u<w5+PV0<cPXHo6G%pn={prj6L}!rbxP&
zlPlu1iyBO%&*!t!?c0W|96c-8b=H~c9B^uP?*tu8#}K0yT)PzAJ0<TmO3n$KkDMfC
zrE8*Dc23A*R^B@$Wt=JO+i(Tqp~pGlxJ(a@`UxH>I5qL4rBB9`?D$hG%b~upEQ?}W
z&Lrbk#ZA)BP$dCX!p672;JaADU^L;l0G}pV1EcKtjIJPKArv>Ptz*@mG&*k>d26xU
z%WTdw(=v+HT+flSji7z73q5H=ezVj+&Y8Yx(-orI6Rkn+LpE9}B)@kGImO?H?b&|V
z{uXDB>>Hz9=}F3o-6<TVn&q_t%*5`Lyt-6=j1I&n#Y%b6A=<kkE|ARww0A``4-cX<
zka)iubRt{hqhg`l!^U&Mb}6;*AFzy)$n$siTyACMIkA+HKItg`T|CxF;-L25Hf|V~
z9OKeubsdhJW=p~!>z?(D?%B9lkI^80lV~?3x`{rYw~Abszc2sPNEbUmqIXx29IBM9
z%F(>CRw1(670VheeMg~Ra%AvN8b%WbXehF%E*VL%D<nr|mVs}#4F<y8Sjv<>iUers
z5^WjjG6vMaf97)O{jsb~ys77wzD2dS<mi6tQW}A?^pNE@Gg=ktC8QIlSC+2g8JWvz
zoUvE(FB1md!9Sz%`;s)25sT!+q#0D5yNNzF?``w}bL?2VlzNO1ykd_ZW8056Tvysk
zYdWspU9m7`uID(y{C$KV2tij_suIJrYSdI_TD9)`GiKRo)i(LNyG(BKLz_^%&s?wE
zEG^qwOYdQ?<=64io_fuO6TXKztVfvtddc9n=VLL9ZA3CU4-V27w7ihcja$x?@|<;b
zG~0rcHjt~z=&0&Aq2suY6?j=to=L}M9j!Xn>PU1n>d5NI>1fxnK9A9=mHI%Fj?e12
zP{)vtTXpp7xLwC~9beLMr;c77dvp}?h<c#nbhkBBxcjX~%H|fJj+w<AK5qVCP;7?k
zBM&q`{h}`{h;IL8kq_^&)wsRhaILMnqt+Jjy}}1OYdV%JA$4`j@e7Lq!Pmtv4@G#<
z8(bFV{XtKi=e;$|9z$gd{gl$1w-s*$=sRbPol`0o&MO$l%+}5L6pQw5CgdPw5ONH1
z5<=TM!1IugAfH2SL$Z+KErgUo9)eUuRzR8{&5#!%+aWJQ1jwt9e#mq?g8rM3cOXf~
zwJo^Ux6zq`lp>^B$Wsv7{y%|5^NW2)WdAd;0^;)cgAtyP`-zM1;XU1itRk*phz}5s
zxWc^KOV$%tB;?*5=q67Pmum+vbh&*2cX&sHJOe%Ca=D;*2w5AQQQ>A|UgHDZzHl%=
z$P0PBvn%Muavo?AUU0cXA(yZxgb|6j+>r<$7KnnN_#PiV*NY7<U$6sDD}$@cy^9aI
zg`Fg7a0LU}^l1Zik@xoj`q7ZzCukh9iE-nDpSoyeJZ?YE6d}8q&QRDF5IV^r#uq_K
z9-f?Ly7(?nXb&MHOvJY%;P&I>5C<$<!a)y@Z~bdzU6|)L_&UPw@E-CFd5#y>2D`f4
z0q+K1fL}viFkob3&@1|R<@XPkL^sdq%^>+fA^YiAtKi0!2t6O@46Y$&W<$^o51Lm;
z4>-4&R$gce?9^<$jvfym5`4kHI-g(Q!{nhk`h`MR0`EaymD3~I71MT}-VEgj<t`;u
PZd8tz*DA?!7E<<a^XF>C

delta 2828
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
RF7jT@8gi}1MV2yaeg>2UBi#T1


From da607e59a42f29d99defe7e74cf7321d1d575aaa Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 12 Oct 2009 20:23:55 +0000
Subject: [PATCH 1072/8469] Update change log

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075389
---
 EasyInstall.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 20e2053a32..b03a29a142 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1218,6 +1218,10 @@ Release Notes/Change History
 ============================
 
 0.6c10
+ * Fix easy_install.exe giving UAC errors on Windows Vista
+
+ * Fix installed script .exe files not working with 64-bit Python on Windows
+ 
  * Support for the most recent Sourceforge download link insanity
 
  * Stop crashing on certain types of HTTP error

From e3aaece7b04a0947d15862cdcf0baf9900342e13 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Wed, 14 Oct 2009 02:53:15 +0000
Subject: [PATCH 1073/8469] Add a better link to the files

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075399
---
 README.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 50ef99b307..03a2afcd53 100755
--- a/README.txt
+++ b/README.txt
@@ -90,7 +90,7 @@ Downloads
 All setuptools downloads can be found at `the project's home page in the Python
 Package Index`_.  Scroll to the very bottom of the page to find the links.
 
-.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools
+.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
 
 In addition to the PyPI downloads, the development version of ``setuptools``   
 is available from the `Python SVN sandbox`_, and in-development versions of the 
@@ -159,3 +159,4 @@ Credits
   "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
   use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
 
+.. _files:

From de0eb5ca27896c10e01e1686913cbf01f4f540cb Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 19:46:34 +0000
Subject: [PATCH 1074/8469] Release update, fix string.join in README warning

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075540
---
 ez_setup.py                          | 4 ++++
 release.sh                           | 1 +
 setuptools.egg-info/entry_points.txt | 2 +-
 setuptools/command/sdist.py          | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f4de7e4b03..bb8b5acc46 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,6 +28,10 @@
     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+    'setuptools-0.6c10-py2.3.egg': 'cb00cbd3d93b66f6c118a1c042113f93',
+    'setuptools-0.6c10-py2.4.egg': 'be702e15b4b61628e059d6ab88335a87',
+    'setuptools-0.6c10-py2.5.egg': '79b809922c0ce55e2d8b5b0cc31da0f2',
+    'setuptools-0.6c10-py2.6.egg': 'c4b741e774a793609d508ff4a2a21194',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
diff --git a/release.sh b/release.sh
index 2d2da5eb53..59558707fc 100755
--- a/release.sh
+++ b/release.sh
@@ -12,6 +12,7 @@ export VERSION="0.6c10"
 python2.3 setup.py -q release source --target-version=2.3 upload && \
 python2.4 setup.py -q release binary --target-version=2.4 upload && \
 python2.5 setup.py -q release binary --target-version=2.5 upload && \
+python2.6 setup.py -q release binary --target-version=2.6 upload && \
 python2.3 ez_setup.py --md5update dist/setuptools-$VERSION*-py2.?.egg && \
   cp ez_setup.py virtual-python.py ~/distrib/ && \
   cp ez_setup.py ~/projects/ez_setup/__init__.py && \
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 10f1da6c73..2642c316ea 100755
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -31,7 +31,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.5 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d5121de5ce..d84afdb850 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -181,7 +181,7 @@ def add_defaults (self):
 
                 if not got_it:
                     self.warn("standard file not found: should have one of " +
-                              string.join(alts, ', '))
+                              ', '.join(alts))
             else:
                 if os.path.exists(fn):
                     self.filelist.append(fn)

From 7742bceaefff829d1c886e410f5124902c52516c Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:03:29 +0000
Subject: [PATCH 1075/8469] Missing launcher fixes

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075544
---
 launcher.c         |  11 ++++++-----
 setuptools/cli.exe | Bin 7168 -> 7168 bytes
 setuptools/gui.exe | Bin 7168 -> 7168 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/launcher.c b/launcher.c
index c8022505f4..201219cc46 100755
--- a/launcher.c
+++ b/launcher.c
@@ -81,17 +81,18 @@ char *quoted(char *data) {
 
 
 char *loadable_exe(char *exename) {
-    HINSTANCE hPython;  /* DLL handle for python executable */
+    /* HINSTANCE hPython;  DLL handle for python executable */
     char *result;
 
-    hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    if (!hPython) return NULL;
+    /* hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (!hPython) return NULL; */
 
     /* Return the absolute filename for spawnv */
     result = calloc(MAX_PATH, sizeof(char));
-    if (result) GetModuleFileName(hPython, result, MAX_PATH);
+    strncpy(result, exename, MAX_PATH);
+    /*if (result) GetModuleFileName(hPython, result, MAX_PATH);
 
-    FreeLibrary(hPython);
+    FreeLibrary(hPython); */
     return result;
 }
 
diff --git a/setuptools/cli.exe b/setuptools/cli.exe
index 491544004c39e95525c3d0177761ae52129f8d17..8906ff77a26d30d63766158b2cebe1284188e637 100755
GIT binary patch
delta 1642
zcmcgr?@v=#7(S=HKud3XYetz+1}H6pV~Pt-9GF}jIL&^6K*j=WZb;@Pf`eOwi=>UU
z3)kAD<RxY?vWO&$AKVwH#4M<HshQcb51S(k$#j7QlS^n~ml#4Aa`&Ec%$$F~PV(eA
z?~n7o&w0<ifyzK-bkKbM*Ly?Zx6IvcI`n&~>7E&COud=gl+J#I5OQ6D)ATF!PHZ-1
zo9Gnm7CLAPj0oGkB@RMDOVXJWhGFPqc0v}qaCb-W*znvAO|A6^x&VI(+uhSF=>0c%
zonl5R{w-9cc^qk2DVPv+mq>{2gkxzh`;Xy~QHv~-kft0S6AEP#cI7poc~=UJ;_2YZ
ztWuClV0A`WC@hz&f=7Q5Pp;<%S2U&M*_?WolYu#l_UO|~U&Q8N7we=tb*bBmJ?4}8
zJ_}0vPK1}za}W5^QFUBDkBMrYN6*G0kxA5&x(b)zWaWobrI@A#8E+kJRv!ct7Mu*b
zx8ZU^G`+y<#IXM58ipgWVpgR&Y%fQj`k>vIizvm+_P})dCXp2iYBH<*CeVysRD|6b
zJ-Zr%iL5(#c~%r_Gu8)j_G%ox7G{R)ENnVV?8huH6TF?(3OSZ{H?Cz85*U~vK5O8{
z3~Ffe+0_b<-UNe|3OWuqEQhQIFom6*gktMXS_Ey@GWTydm5}C3N|WZ-2J0T4(G-_-
zQ)9xWV9Z)g{V;1iOKah1W=~BuPEL&nmkpmwRXhSJB;|Nx@2X)e+(L1YYdSV&QVCit
zh1FThAcTI;`X<0_i_zENXIs7$MXwr~eQX$NwMVam$F{An=KhVAIT#oARb89M$f>zV
zNM{+W$_kI&#L}e7XBo%|H;Z9moCW9LL$PE->M>8HbiKlK4ZsD_omYcT9O-=2`u+#)
zaeOs4Vm-9}>|ekyVv#8tg;g=%aXICS)Lmf(N1((Wqe-}L-$HLenxk>=l>&URWkV?q
zX=+?~PF;#jZDCJrWR0-U8@?qR$7~L^{e0Ol-fL}-@6dvKu40HRX3F8b&{eqL_>BGl
zqEwE5+a75r{S^A7QYyoUw3*(Y(4@U)|D$@DM5BgR=RD6j$vMG!BYr<D&%(Kuv&gxG
z^D565xJ@`$b1vjuw$6U<e(tE?T*+DHoW=PF=O)f=oLe{_=6s0ran4=qjK5H7c%0du
zEqH;-HuM=pCL~rMPi)9~NQcVP$FoJ#w%SHQ=IaSLf_Snnp>Gv!?J3_+=xb^i+LZ0@
zZy@9};v8ZaaS_4R*T|EI+lae}KM_fU=^!B@A{&v9*ovq?$cVQQEr^d0U5FEi0OBm-
z$r{G}Wkd||<3Zvlf8ZvGaG<0@1Y7@~sG{|T&#3yZsELy~IrRByQ=ih?-EsURxk&2z
lKT+y?dpbJ%`rw<~cfjGUfd=<c2)G59a+g8U?F1L~`~zuC90mXY

delta 1637
zcmchWe@t6d6vyu^Z_ppFKZqTUmhsE-%i$=KDO0w*VR1}xlriuJV=_k*&@H&`VK7cx
z?Yiu(b}1e+_s1|J{)~wv3L2K6X{>HB;U9GpqW;06OCF;JG=wzBe4g9h#YO$wn|$-R
zJ?GqW&pG!sSRbs9oyyvH=DXp@BUxVu$ncL<IwHVMo!_`w_6^AdmknN_Z=!X)RF|it
zYp_i?M9;y9P*c`tAtbzFJ@K5TY3k2rLgo+S?y}%A;j!Ad;&BP82YwT3oOX<yFZ<g$
zNiibrUxoYExh&h!A4&>phe(L(g(K^>1U|%kqk2gq;kexUmQXB_$ok?o{Q0dlJc_47
zt8;QuI)LRFWv+<iRs@&&44%xyhF0Tp<v(M*EM^zRESO`rE_GA-9J@)esn#(A-to(l
zdQy)iQ8V0??b!WEHddWbXRu18z@_fN1JO^hmUJt;1RG0#1tT&g%uCpHtV6jLO6qYk
ztZ!|-9b(x<Wp*rCJ@+TNqZ8#UOGm_9hc@L}w{|rum$ToMa3#A$WX*-*63cu7XwJRV
z1KV;20-f!lr0ufDrN<HpQea6UO?nom;v0mLqH<}H8N(~`4i><!$0``rvlyWyaJsj%
z6wJg1snogD34Rv0AEmc~G8^@!x(;+Fu#rbQ+h0z$;9c-*&h8BY1_WQ6C4+|GXS3ML
z{y{TK;eb8*Iywm<eUG8lh^cX0$04cTN=u;BP)&b=Rzp7h0{RUNGz{+=PSb~=);K^L
zVbqwXTlfPm8aJ8*?2BGvM}LQ_#tD3cv!+7pnH)?Pp1YxGN`p%^LBe#WZf+G8O%D1c
z7{vnm9#n{xxi7G{I_?s%-Fw_P=m(%jbQbJFYt*;gb>PW#FE~KE8p*ustMG<+2b*Mi
z!IW5N`5^6yHoea#`VOe#1Wmz+xq@DVugvX@OGWrBDNU{l$CZS9o3av}s$hpT`v`MA
zJh+0F7d!Cs`%;?rcvp9#HXho(j4rZZlp+P;Wq87Jlzs!#7B}_64a-*Qhr6v+v>Cds
zrS$vpptUh8kn&0-7Sqa-oGRxs=MrZDek3eT<ZR}&aaMB@PCci<DRH_u-5CbT>baqT
z)5E!e^I6V)oQFAkI3MHO&)LV>%Q?g;XNdoo^bk2sNR8mg){3O@T>By&c4vQ_C+ar$
zw&O?aC8Q5^b4{U*v=K6Oi){&Q``U&}@&ZBhoJPHlI*)oA#nu?|bJR5I2h?>`3T50&
zh#ggkDo1TWHK3YNov0qv(<mAB66zG{=6VhH7f@rUIBI4u36Sf!SwmT{q-xX-RxYmp
zr?5?#%l@OXe-}1>G(Vp@&y%L1e%b3EIOIEajLeV+{XSny|5N^h{^w!T(VA=4wG15W
b<(8(QodgygjZot}0vDXs5O?Zf+G+a>{tydr

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
index 5231ed9013c4c7b5f0c60ca523c75b54f50c6678..474838d5220133fc3bd4898bce43e12ffd0be09f 100755
GIT binary patch
delta 1575
zcmcgr{ZCs}7(S=Hz%9M~Fl)PYMPQ?4fVg#rIhJ8^nRFSMA23+NFmxFsPGMhgS->nQ
zvunboHYt12_ya^4iP;Y`F{6@2(OlETMYH`fi7`42GmzW`l2$VbGTik&<t)zq0iNW^
zbI<!c=Y8Mvo_3&mpgJ*V9{v9IaO_3XAL-$rDonS{P;2V8Y*jk?6hg>VI7dIk;N)hL
z$3&-Lm(WgIU`*H+D6<n1U2>d1V;F`$VI$;j7k*tA{8l`+T~q7)f-b=C!ZzOw69fN>
zS1CHO`sc7a$8XQUOp!%FcT0rmPB@<PO!zn+85d=lL^b8;gitJ#n7g16x3?V8aXcMa
znN^Ci29{@>NijL73V!`5Jh|qLtY}Kv<DLfQ$wSYAE%E5m7qEED%_^x*-G0J?HRdw<
zUJ+aR8Y**r^}V^+bV`38eQJSU_h63r6t<GR3GcwkvX5jlv6k-2c<IDJbw08v;$Yad
z4Yv~#xkUjd%K8TnP>v@{S(bw_TM%RFe4BA6u9UL9A7*klNi0!BlUe2$fadL_670%5
zxw9#<=(>(~XGt+PV|@@uuck06vTZCRvf;31-(bRzk!!A2@QSa{2XI>S&}JAEtLPQ@
zQao&_&qo6qr=ZlbgO<P{OQr7zoIzCU%{Zpa&ku&u=QYLc_)24aOv8kwhK6C*GDPd3
zGr!X-<DAq~WZCF-tBPO1hDZ=ESiTDB{3op@ROvS?e+JfDlXO4auogN-^6*S__HV;b
zYy5gW{AH~uEWD39b0j6~-Tm1dDrfJ+qdIe7RnvW_m3(v_+N835{p>Z)W-C3*DxF&~
zjD?M{_p<4l{UX=cWc3hw;~n=}UwgeRg^$4|r>kqPIRrPQ5=$b%e7GPj`Ro_7Qap5t
z6&-^Owj|BKP1_dw1^j7i+H<K0-(%TO%A=Z^Qr4+U@#!t>tl=7C(*E8hy#1^fdwP4>
zFkWqKOKsO8&s|1|Eac0vg6L%!vY)2k!m2%pf2F4#JLp@`?kJ}+#2uUIFO#1-_L#%>
z8f2147y+I09On$@Ma~=W*TH-u=Q_?3=Q7T#+%NDw;atPHm~-VC9|`Q^fhx|`oMp}~
z&c`@6b3Vkmh4WF)hdH0(+yy_c3qUcgzTgtg$s&3330Im92Xn7@B-7TqCPL;K2sws$
zxIV(zD(<yMVmC0>+&H|+6Ygsy<Q>Gjh!Mmnf~}8{rx4c=w-CP}G6>TFLL`I-QHZEO
zR3T)<ONbW45kwc_3}OH=gm}0{@cSYniTLgS36o#(BZIJGOT`Gb{=cS5)(Sq>)qk6s
z?Du-<`WaJ?(tV=+R6iLdp}sejhVGN?9X&np$;Ow#?yH4HUndOs1eo?!LdNF=H}(Gm
DOG5w0

delta 1713
zcmcgrZA?>F7(TaL;THNuEKFJ=iUq+jJ{&3z#tMNA9h)G++yIA@CbDUm_13UN*J{^=
zYg1D^`>`LgNz}z`i9diX{9xLo6ZeBZo0}mfOEAIZ0$sp_kcQ3OJ*PcpX4~(b<jHgH
zd!F;Y&->nceO11y@L)>ug}Xz+*L3Idhwg9F5s}vE-1<`4H6Rm0mg!mHa|Flob=f*0
zMt6%xgh4timK7W{5fWH6e{@RIH1)2LkojZS-4PubxK<HS8XTfpNgs)2b`i??g1-+Z
z1Sk^c3$%Kj!}J`^{V`E(G!UXX>G5^jy~D^iA~~HT5RrSYh?|@wn6;@Dk3X6NBe?Bf
zo0ant0+wfl9R;1`is(=~aWkp)uSMjde`;EoW*0Pz#_-ciwI}YeN{U4_eWpi^xn=c~
z1WS)-NveI%wN#jns#7qj<T}(^=tJMYN}?0)z{0YB2Sw7syc11_+m(m@n1sQwwzVuP
z4X5T6Sm9Xx^iLdz#tT`N_Mov6G38;m_8=q|vgacDQ|e{|>&+i=vdl6S(sl`zbaz_6
zx1-G;v)pNLNN`BNB1;l%l$dS?ufQKOC{q(G7+95SnShmt3&!flP$*Fh_ZgOgh1eXG
zN{4!t-^F$$u@#k>kSpGKs5^>A-sosM8*4@_`diwb4J+w{_|D7_kKXs~40`GE7+DG%
zeO;;)u2a9%qkjn!Hm=h&ChZV1X}-Qhn5O&mIl?II)7J<d`i1_y@B*z!f3I#QT2Z3@
zxaP@HWQPc^q#RRP`d!oJZ^2^dYZXP9VZsbU!kUez5h6^n8o$zC(#K0Pnfw9k6&<mu
zU??epxyPE8nBh6dmB1_>l^Ta?rnfS->E_nxVuo$w_iG5I_@m-Yq$kxL=}b<r-4GN<
zS(&fs7DG{HKl=zyC%o-s-d>?y277Kbq9NBx=b^U~L&BS}s@~-1;-l2Cg+>fE)0c@r
zsPQ_>c8#iraUo8Jja!A=^tQ3Bel`!UIj+gYfrt{7*DI@`$*pifH0v-sdeyUvd01?y
zxi_w9Z+3P^D<b|E=Ws+8)1ATGz#M(cbVB%nPMgYw7W&w<LvYjQ&Ba0!?KbBNKacs$
z^(o$Xi<5-IT0xAn%6WzJGUr@;bWCU9+{D?!xr8&}EO8b&J2^WzmnYd<P{ji^oEtcA
z;QT)41Dua>?%{lpa~J2MoO?MBaF&yd|1U8_&U9kE<)T$eiRC%RGObI(P<iTTwn10g
z+lGIlg^;7blQoGLX(eRxsn{}N2U>?VXM24(IS+gSTmr5FY~29g1g3%ezyc5l()SZ$
z1vUbOz;>VpXaYKb9^hR-20jD^fhX%C_LqShKm@qApLodvHh%ynSSkT(nO&^^$Jn#U
zV*lan-^RvH<m3qUOQdn2Pi}GdA90;LN$!!C-7Z&i-#hNZ?hojQZC|EQ*W7=&mq!{0
Y>Ihx3)zdQjaeCQaLL+vGPTMVi0Rf;fYXATM


From 33415044219744c3d3c27096959f4e5e4fb6998e Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:06:29 +0000
Subject: [PATCH 1076/8469] Update to version 0.6c11

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075545
---
 ez_setup.py            | 2 +-
 release.sh             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 version.dat            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bb8b5acc46..3b598c5031 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c10"
+DEFAULT_VERSION = "0.6c11"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
diff --git a/release.sh b/release.sh
index 59558707fc..00ffa57d4d 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@
 # If your initials aren't PJE, don't run it.  :)
 #
 
-export VERSION="0.6c10"
+export VERSION="0.6c11"
 
 python2.3 setup.py -q release source --target-version=2.3 upload && \
 python2.4 setup.py -q release binary --target-version=2.4 upload && \
diff --git a/setup.py b/setup.py
index 198ae88d9a..b9a40769a8 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 execfile(convert_path('setuptools/command/__init__.py'), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6c10"
+VERSION = "0.6c11"
 
 from setuptools import setup, find_packages
 import sys
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a9f6544de9..a314ca7e0e 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c10'
+__version__ = '0.6c11'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/version.dat b/version.dat
index 16ecd2aaf1..d312dddcbe 100755
--- a/version.dat
+++ b/version.dat
@@ -1,6 +1,6 @@
 [setuptools]
 status = 'release candidate'
 major = 0
-build = 10
+build = 11
 minor = 6
 

From 86439f1b2b983c8a41448f86895d9646a3b0568a Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:19:30 +0000
Subject: [PATCH 1077/8469] Build correct filenames for py2.6 "cross-compile"

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075546
---
 release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 00ffa57d4d..e184d0212b 100755
--- a/release.sh
+++ b/release.sh
@@ -8,11 +8,11 @@
 #
 
 export VERSION="0.6c11"
-
+python2.3 setup.py -q egg_info  # force upload to be available
 python2.3 setup.py -q release source --target-version=2.3 upload && \
 python2.4 setup.py -q release binary --target-version=2.4 upload && \
 python2.5 setup.py -q release binary --target-version=2.5 upload && \
-python2.6 setup.py -q release binary --target-version=2.6 upload && \
+python2.6 setup.py -q release binary --target-version=2.6 -p win32 upload && \
 python2.3 ez_setup.py --md5update dist/setuptools-$VERSION*-py2.?.egg && \
   cp ez_setup.py virtual-python.py ~/distrib/ && \
   cp ez_setup.py ~/projects/ez_setup/__init__.py && \

From c5d26a405390ac00223a0a1967e6f134ac69ed5b Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:47:44 +0000
Subject: [PATCH 1078/8469] Fix the elusive "double upload bdist_wininst" bug

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075548
---
 setuptools/command/bdist_wininst.py | 67 +++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 93e6846d79..e8521f834c 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -2,26 +2,24 @@
 import os, sys
 
 class bdist_wininst(_bdist_wininst):
+    _good_upload = _bad_upload = None
 
     def create_exe(self, arcname, fullname, bitmap=None):
         _bdist_wininst.create_exe(self, arcname, fullname, bitmap)
-        dist_files = getattr(self.distribution, 'dist_files', [])
-
+        installer_name = self.get_installer_filename(fullname) 
         if self.target_version:
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32-py%s.exe" %
-                                           (fullname, self.target_version))
             pyversion = self.target_version
-
-            # fix 2.5 bdist_wininst ignoring --target-version spec
-            bad = ('bdist_wininst','any',installer_name)
-            if bad in dist_files:
-                dist_files.remove(bad)
+            # fix 2.5+ bdist_wininst ignoring --target-version spec
+            self._bad_upload = ('bdist_wininst', 'any', installer_name)
         else:
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32.exe" % fullname)
             pyversion = 'any'
-        good = ('bdist_wininst', pyversion, installer_name)
+        self._good_upload = ('bdist_wininst', pyversion, installer_name)
+        
+    def _fix_upload_names(self):
+        good, bad = self._good_upload, self._bad_upload
+        dist_files = getattr(self.distribution, 'dist_files', [])
+        if bad in dist_files:
+            dist_files.remove(bad)
         if good not in dist_files:
             dist_files.append(good)
 
@@ -36,6 +34,49 @@ def run(self):
         self._is_running = True
         try:
             _bdist_wininst.run(self)
+            self._fix_upload_names()
         finally:
             self._is_running = False
+
+
+    if not hasattr(_bdist_wininst, 'get_installer_filename'):
+        def get_installer_filename(self, fullname):
+            # Factored out to allow overriding in subclasses
+            if self.target_version:
+                # if we create an installer for a specific python version,
+                # it's better to include this in the name
+                installer_name = os.path.join(self.dist_dir,
+                                              "%s.win32-py%s.exe" %
+                                               (fullname, self.target_version))
+            else:
+                installer_name = os.path.join(self.dist_dir,
+                                              "%s.win32.exe" % fullname)
+            return installer_name
+    # get_installer_filename()
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

From 0b6145a275ffa6ff89ed286f47b6af033d664c2b Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:49:47 +0000
Subject: [PATCH 1079/8469] Update change logs for release

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075549
---
 EasyInstall.txt | 6 ++++--
 setuptools.txt  | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index b03a29a142..2bf69e9040 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1217,11 +1217,13 @@ displayed MD5 info (broken onto two lines for readability)::
 Release Notes/Change History
 ============================
 
+0.6c11
+ * Fix installed script .exe files not working with 64-bit Python on Windows
+   (wasn't actually released in 0.6c10 due to a lost checkin)
+
 0.6c10
  * Fix easy_install.exe giving UAC errors on Windows Vista
 
- * Fix installed script .exe files not working with 64-bit Python on Windows
- 
  * Support for the most recent Sourceforge download link insanity
 
  * Stop crashing on certain types of HTTP error
diff --git a/setuptools.txt b/setuptools.txt
index 93940528ae..c709a9081c 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2632,6 +2632,9 @@ XXX
 Release Notes/Change History
 ----------------------------
 
+0.6c11
+ * Fix "bdist_wininst upload" trying to upload same file twice
+
 0.6c10
  * Fix for the Python 2.6.3 build_ext API change
 

From 2015618bf61262dbb18bffd4086b683dd2d0e85d Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 19 Oct 2009 21:51:24 +0000
Subject: [PATCH 1080/8469] Fixed MD5's

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075550
---
 ez_setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3b598c5031..7aab12d11d 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,10 +28,10 @@
     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c10-py2.3.egg': 'cb00cbd3d93b66f6c118a1c042113f93',
-    'setuptools-0.6c10-py2.4.egg': 'be702e15b4b61628e059d6ab88335a87',
-    'setuptools-0.6c10-py2.5.egg': '79b809922c0ce55e2d8b5b0cc31da0f2',
-    'setuptools-0.6c10-py2.6.egg': 'c4b741e774a793609d508ff4a2a21194',
+    'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
+    'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
+    'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
+    'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',

From e3e7199a5e9487b16beb24c59d111303f765c097 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Tue, 20 Oct 2009 14:16:29 +0000
Subject: [PATCH 1081/8469] Update MD5's

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075567
---
 ez_setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 7aab12d11d..1ff1d3e7a6 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -32,6 +32,10 @@
     'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
     'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
     'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
+    'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
+    'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
+    'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
+    'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
     'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',

From 2a5eaaedacf84a2992fd800203276b1079b96bd1 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Wed, 28 Oct 2009 17:12:45 +0000
Subject: [PATCH 1082/8469] Bump version

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075925
---
 ez_setup.py            | 2 +-
 release.sh             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 version.dat            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1ff1d3e7a6..997c453d1f 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -14,7 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import sys
-DEFAULT_VERSION = "0.6c11"
+DEFAULT_VERSION = "0.6c12"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
diff --git a/release.sh b/release.sh
index e184d0212b..5e38b70efa 100755
--- a/release.sh
+++ b/release.sh
@@ -7,7 +7,7 @@
 # If your initials aren't PJE, don't run it.  :)
 #
 
-export VERSION="0.6c11"
+export VERSION="0.6c12"
 python2.3 setup.py -q egg_info  # force upload to be available
 python2.3 setup.py -q release source --target-version=2.3 upload && \
 python2.4 setup.py -q release binary --target-version=2.4 upload && \
diff --git a/setup.py b/setup.py
index b9a40769a8..d496268742 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 execfile(convert_path('setuptools/command/__init__.py'), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6c11"
+VERSION = "0.6c12"
 
 from setuptools import setup, find_packages
 import sys
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a314ca7e0e..71eeff4974 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c11'
+__version__ = '0.6c12'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/version.dat b/version.dat
index d312dddcbe..86f4657540 100755
--- a/version.dat
+++ b/version.dat
@@ -1,6 +1,6 @@
 [setuptools]
 status = 'release candidate'
 major = 0
-build = 11
+build = 12
 minor = 6
 

From 03cee8b587cf41af1a4ad1071cb6aa7b97c4f182 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Wed, 28 Oct 2009 17:12:57 +0000
Subject: [PATCH 1083/8469] Fix for issue 88

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075926
---
 EasyInstall.txt             | 4 ++++
 setuptools/package_index.py | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 2bf69e9040..6dad8c4192 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1217,6 +1217,10 @@ displayed MD5 info (broken onto two lines for readability)::
 Release Notes/Change History
 ============================
 
+0.6final
+ * Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
+   URLs (i.e., ones with a ``user:password@host``).
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 70b75a6f47..1a4fabdeca 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,6 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
-import httplib
+import httplib, urllib
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
@@ -701,7 +701,7 @@ def open_with_auth(url):
     scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
 
     if scheme in ('http', 'https'):
-        auth, host = urllib2.splituser(netloc)
+        auth, host = urllib.splituser(netloc)
     else:
         auth = None
 

From 4478cdc28c1550f64b7918e3d88af08d0c28a0cb Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Thu, 5 Nov 2009 16:00:25 +0000
Subject: [PATCH 1084/8469] Backport to 0.6

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4076123
---
 EasyInstall.txt             | 3 +++
 setuptools/package_index.py | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 6dad8c4192..df11309a65 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1221,6 +1221,9 @@ Release Notes/Change History
  * Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
    URLs (i.e., ones with a ``user:password@host``).
 
+ * Fixed bogus AttributeError when no local or downloadable packages are
+   available
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1a4fabdeca..78b07f4bbe 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -471,8 +471,9 @@ def find(env, req):
                 (source and "a source distribution of " or ""),
                 requirement,
             )
-        self.info("Best match: %s", dist)
-        return dist.clone(location=self.download(dist.location, tmpdir))
+        else:
+            self.info("Best match: %s", dist)
+            return dist.clone(location=self.download(dist.location, tmpdir))
 
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
@@ -489,7 +490,6 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         return None
 
 
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [d for d in

From 16dc2a11fb1b33955ad55ab00f186fcc909e35f6 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Mon, 1 Feb 2010 16:42:04 +0000
Subject: [PATCH 1085/8469] Backport SF download fix

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4077904
---
 EasyInstall.txt             | 2 ++
 setuptools/package_index.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index df11309a65..45bdf0c857 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1224,6 +1224,8 @@ Release Notes/Change History
  * Fixed bogus AttributeError when no local or downloadable packages are
    available
 
+ * Fix for recent Sourceforge downloading changes
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 78b07f4bbe..32498d0fd4 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -590,9 +590,8 @@ def open_url(self, url, warning=None):
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
         #
-        name = filter(None,urlparse.urlparse(url)[2].split('/'))
+        name, fragment = egg_info_for_url(url)
         if name:
-            name = name[-1]
             while '..' in name:
                 name = name.replace('..','.').replace('\\','_')
         else:
@@ -613,6 +612,7 @@ def _download_url(self, scheme, url, tmpdir):
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
 
+
     def scan_url(self, url):
         self.process_url(url, True)
 

From 9e86a83d9b16147dfda3ae2d74c2ed82c1c893a7 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Thu, 29 Apr 2010 16:09:17 +0000
Subject: [PATCH 1086/8469] Fix a problem with sandbox swapping 'open' and
 'file' builtins. Support sandbox access to os.devnull.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4080622
---
 setuptools/sandbox.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 00eb012410..4c5e7129db 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -105,8 +105,8 @@ def run(self, func):
             return func()
         finally:
             self._active = False
-            __builtin__.open = _file
-            __builtin__.file = _open
+            __builtin__.open = _open
+            __builtin__.file = _file
             self._copy(_os)
 
     def _mk_dual_path_wrapper(name):
@@ -203,10 +203,10 @@ def _open(self, path, mode='r', *args, **kw):
             self._violation("open", path, mode, *args, **kw)
         return _open(path,mode,*args,**kw)
 
-    def tmpnam(self):
-        self._violation("tmpnam")
+    def tmpnam(self): self._violation("tmpnam")
 
     def _ok(self,path):
+        if hasattr(_os,'devnull') and path==_os.devnull: return True
         active = self._active
         try:
             self._active = False

From 97128303bf077da33cc5b30ce71d853fb730b589 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Sun, 22 Aug 2010 23:09:12 +0000
Subject: [PATCH 1087/8469] Fix quotes handling for GUI scripts on Windows when
 Python is in a directory with a space in the name.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4084273
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index af4e349768..014fc70d25 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1583,7 +1583,7 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
 
-                if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
+                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
                     hdr = new_header
                 else:
                     hdr = header

From 7cfca7995a9e5de15663ea4f6e754aa001e6ea98 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Sat, 2 Oct 2010 19:16:45 +0000
Subject: [PATCH 1088/8469] Tarfile link support, and handle .pyd/.dll files
 installed as data on win32.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4085190
---
 EasyInstall.txt                    |  5 +++++
 setuptools/archive_util.py         | 18 +++++++++---------
 setuptools/command/easy_install.py |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 45bdf0c857..96ccc55fd0 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1226,6 +1226,11 @@ Release Notes/Change History
 
  * Fix for recent Sourceforge downloading changes
 
+ * Handle .exe's containing .pyd or .dll files installed as "data" on win32
+
+ * Extract copies of hardlinked and symlinked files in tarballs when extracting
+   source
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 5d72e7edc6..be81374653 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -180,11 +180,15 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     try:
         tarobj.chown = lambda *args: None   # don't do any chowning!
         for member in tarobj:
-            if member.isfile() or member.isdir():
-                name = member.name
-                # don't extract absolute paths or ones with .. in them
-                if not name.startswith('/') and '..' not in name:
-                    dst = os.path.join(extract_dir, *name.split('/'))                
+            name = member.name
+            # don't extract absolute paths or ones with .. in them
+            if not name.startswith('/') and '..' not in name:
+                dst = os.path.join(extract_dir, *name.split('/'))
+
+                while member.islnk() or member.issym():
+                    member = tarobj._getmember(member.linkname, member)
+    
+                if member.isfile() or member.isdir():
                     dst = progress_filter(name, dst)
                     if dst:
                         if dst.endswith(os.sep):
@@ -198,8 +202,4 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         tarobj.close()
 
 
-
-
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile
-
-
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 014fc70d25..90f29320af 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1274,7 +1274,7 @@ def get_exe_prefixes(exe_filename):
 
     prefixes = [
         ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''),
-        ('PLATLIB/', ''),
+        ('PLATLIB/', ''), ('DATA/lib/site-packages/', ''),
         ('SCRIPTS/', 'EGG-INFO/scripts/')
     ]
     z = zipfile.ZipFile(exe_filename)

From e6990dd3de14acea85f2285dddc5956318f139ee Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Sat, 9 Oct 2010 03:24:25 +0000
Subject: [PATCH 1089/8469] Backport from trunk

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4085332
---
 setuptools/archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index be81374653..15d38de56e 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -185,10 +185,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
             if not name.startswith('/') and '..' not in name:
                 dst = os.path.join(extract_dir, *name.split('/'))
 
-                while member.islnk() or member.issym():
+                while member is not None and member.islnk() or member.issym():
                     member = tarobj._getmember(member.linkname, member)
     
-                if member.isfile() or member.isdir():
+                if member is not None and member.isfile() or member.isdir():
                     dst = progress_filter(name, dst)
                     if dst:
                         if dst.endswith(os.sep):

From f86fa331e8d2165d9aba0bc6d44af1db987d5239 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Sat, 9 Oct 2010 03:33:27 +0000
Subject: [PATCH 1090/8469] Backport.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4085334
---
 setuptools/archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 15d38de56e..eae3729a69 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -185,10 +185,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
             if not name.startswith('/') and '..' not in name:
                 dst = os.path.join(extract_dir, *name.split('/'))
 
-                while member is not None and member.islnk() or member.issym():
+                while member is not None and (member.islnk() or member.issym()):
                     member = tarobj._getmember(member.linkname, member)
     
-                if member is not None and member.isfile() or member.isdir():
+                if member is not None and (member.isfile() or member.isdir()):
                     dst = progress_filter(name, dst)
                     if dst:
                         if dst.endswith(os.sep):

From ca8f80843db50fd079df0b62180d85c83cd937cc Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Tue, 12 Oct 2010 15:44:18 +0000
Subject: [PATCH 1091/8469] Backport

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4085381
---
 setuptools/archive_util.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index eae3729a69..d26b383bc3 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -6,7 +6,7 @@
     "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
 ]
 
-import zipfile, tarfile, os, shutil
+import zipfile, tarfile, os, shutil, posixpath
 from pkg_resources import ensure_directory
 from distutils.errors import DistutilsError
 
@@ -169,14 +169,12 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     by ``tarfile.open()``).  See ``unpack_archive()`` for an explanation
     of the `progress_filter` argument.
     """
-
     try:
         tarobj = tarfile.open(filename)
     except tarfile.TarError:
         raise UnrecognizedFormat(
             "%s is not a compressed or uncompressed tar file" % (filename,)
         )
-
     try:
         tarobj.chown = lambda *args: None   # don't do any chowning!
         for member in tarobj:
@@ -184,9 +182,12 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
             # don't extract absolute paths or ones with .. in them
             if not name.startswith('/') and '..' not in name:
                 dst = os.path.join(extract_dir, *name.split('/'))
-
                 while member is not None and (member.islnk() or member.issym()):
-                    member = tarobj._getmember(member.linkname, member)
+                    linkpath = member.linkname
+                    if member.issym():
+                        linkpath = posixpath.join(posixpath.dirname(member.name), linkpath)
+                        linkpath = posixpath.normpath(linkpath)
+                    member = tarobj._getmember(linkpath)
     
                 if member is not None and (member.isfile() or member.isdir()):
                     dst = progress_filter(name, dst)
@@ -201,5 +202,4 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     finally:
         tarobj.close()
 
-
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile

From 2e97ab0fbc5862025968cf6d10b6011f2a585cf1 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Thu, 20 Jan 2011 18:50:00 +0000
Subject: [PATCH 1092/8469] Fix path problems when pkg_resources is installed,
 but not setuptools. (Also, remove some obsolete MD5s.)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4088124
---
 ez_setup.py | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 997c453d1f..d8d25db1c5 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -18,16 +18,6 @@
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
     'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
     'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
     'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
@@ -36,23 +26,6 @@
     'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
     'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
     'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
     'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
     'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
     'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
@@ -112,11 +85,11 @@ def do_download():
             "\n\n(Currently using %r)"
             ) % (version, e.args[0])
             sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return do_download()
     except pkg_resources.DistributionNotFound:
-        return do_download()
+        pass
+
+    del pkg_resources, sys.modules['pkg_resources']    # reload ok
+    return do_download()
 
 def download_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,

From 9f3c9810de9de1358d4f62ebd74bdf2c866c7d73 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Wed, 23 Mar 2011 20:38:12 +0000
Subject: [PATCH 1093/8469] Backport.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4088793
---
 EasyInstall.txt             |  4 ++++
 setuptools/package_index.py | 45 +++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 96ccc55fd0..91b6cc178a 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1231,6 +1231,10 @@ Release Notes/Change History
  * Extract copies of hardlinked and symlinked files in tarballs when extracting
    source
 
+ * Support HTTP servers that return multiple 'Content-Length' headers
+
+ * Support user/password credentials in Subversion (svnserve) URLs
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 32498d0fd4..9a9c5d62e7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -550,7 +550,7 @@ def _download_to(self, url, filename):
             bs = self.dl_blocksize
             size = -1
             if "content-length" in headers:
-                size = int(headers["Content-Length"])
+                size = max(map(int,headers.getheaders("Content-Length")))
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')
             while True:
@@ -639,10 +639,39 @@ def _download_html(self, url, headers, filename):
         os.unlink(filename)
         raise DistutilsError("Unexpected HTML page found at "+url)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        creds = ''
+        if url.lower().startswith('svn:') and '@' in url:
+            scheme, netloc, path, p, q, f = urlparse.urlparse(url)
+            if not netloc and path.startswith('//') and '/' in path[2:]:
+                netloc, path = path[2:].split('/',1)
+                auth, host = urllib.splituser(netloc)
+                if auth:
+                    if ':' in auth:
+                        user, pw = auth.split(':',1)
+                        creds = " --username=%s --password=%s" % (user, pw)
+                    else:
+                        creds = " --username="+auth
+                    netloc = host
+                    url = urlparse.urlunparse((scheme, netloc, url, p, q, f))
         self.info("Doing subversion checkout from %s to %s", url, filename)
-        os.system("svn checkout -q %s %s" % (url, filename))
+        os.system("svn checkout%s -q %s %s" % (creds, url, filename))
         return filename
 
     def debug(self, msg, *args):
@@ -654,6 +683,18 @@ def info(self, msg, *args):
     def warn(self, msg, *args):
         log.warn(msg, *args)
 
+
+
+
+
+
+
+
+
+
+
+
+
 # This pattern matches a character entity reference (a decimal numeric
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub

From 8d7af6e22f1275ac58b3eccfd43db6e83dfc6e33 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Wed, 23 Mar 2011 21:09:16 +0000
Subject: [PATCH 1094/8469] Fixed skipping extraction of files or directories
 containing '..' in their names.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4088795
---
 EasyInstall.txt            | 6 ++++++
 setuptools/archive_util.py | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 91b6cc178a..753baf65ed 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1235,6 +1235,12 @@ Release Notes/Change History
 
  * Support user/password credentials in Subversion (svnserve) URLs
 
+ * Fixed problems accessing /dev/null inside the script sandbox, and the sandbox
+   swapping the ``open`` and file`` builtins.
+
+ * Fixed skipping extraction of files or directories containing '..' in their
+   names
+
 0.6c11
  * Fix installed script .exe files not working with 64-bit Python on Windows
    (wasn't actually released in 0.6c10 due to a lost checkin)
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index d26b383bc3..d44264f821 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -138,7 +138,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
             name = info.filename
 
             # don't extract absolute paths or ones with .. in them
-            if name.startswith('/') or '..' in name:
+            if name.startswith('/') or '..' in name.split('/'):
                 continue
 
             target = os.path.join(extract_dir, *name.split('/'))
@@ -180,7 +180,7 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         for member in tarobj:
             name = member.name
             # don't extract absolute paths or ones with .. in them
-            if not name.startswith('/') and '..' not in name:
+            if not name.startswith('/') and '..' not in name.split('/'):
                 dst = os.path.join(extract_dir, *name.split('/'))
                 while member is not None and (member.islnk() or member.issym()):
                     linkpath = member.linkname

From a6e8eec3e46dfa7e37259c63da244049ce08f603 Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Tue, 31 May 2011 20:10:56 +0000
Subject: [PATCH 1095/8469] Document 64-bit Windows workaround

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4088846
---
 README.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 03a2afcd53..22d76da2db 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,17 @@ Installation Instructions
 Windows
 =======
 
-Install setuptools using the provided ``.exe`` installer.  If you've previously
+32-bit version of Python
+    Install setuptools using the provided ``.exe`` installer.
+
+64-bit versions of Python
+    Download `ez_setup.py`_ and run it; it will download the appropriate .egg file and install it for you.  (Currently, the provided ``.exe`` installer does not support 64-bit versions of Python for Windows, due to a `distutils installer compatibility issue`_
+
+.. _ez_setup.py: http://peak.telecommunity.com/dist/ez_setup.py
+.. _distutils installer compatibility issue: http://bugs.python.org/issue6792
+
+
+NOTE: Regardless of what sort of Python you're using, if you've previously
 installed older versions of setuptools, please delete all ``setuptools*.egg``
 and ``setuptools.pth`` files from your system's ``site-packages`` directory
 (and any other ``sys.path`` directories) FIRST.

From 58a658b26d1c95b31d02050dcccd648d2e4ce27b Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 20 Jun 2011 22:55:16 +0100
Subject: [PATCH 1096/8469] Changes to support 2.x and 3.x in the same
 codebase.

--HG--
branch : distribute
extra : rebase_source : 7d3608edee54a43789f0574d702fb839628b5071
---
 pkg_resources.py                      | 67 +++++++++++++++-------
 setup.py                              |  6 +-
 setuptools/command/alias.py           | 14 ++---
 setuptools/command/bdist_egg.py       |  5 +-
 setuptools/command/easy_install.py    | 52 ++++++++++-------
 setuptools/command/egg_info.py        | 10 ++--
 setuptools/command/install_scripts.py |  2 +-
 setuptools/command/rotate.py          |  1 +
 setuptools/command/saveopts.py        |  3 +-
 setuptools/command/sdist.py           |  2 +-
 setuptools/command/setopt.py          |  4 +-
 setuptools/command/upload.py          | 18 +++---
 setuptools/command/upload_docs.py     | 11 ++--
 setuptools/compat.py                  | 73 ++++++++++++++++++++++++
 setuptools/depends.py                 |  4 +-
 setuptools/dist.py                    |  9 ++-
 setuptools/package_index.py           | 82 +++++++++++++++------------
 setuptools/sandbox.py                 | 17 +++---
 setuptools/tests/__init__.py          | 10 ++--
 setuptools/tests/doctest.py           | 58 +++++++++----------
 setuptools/tests/server.py            |  7 +--
 setuptools/tests/test_develop.py      |  5 +-
 setuptools/tests/test_easy_install.py |  7 +--
 setuptools/tests/test_packageindex.py | 22 ++++---
 setuptools/tests/test_resources.py    | 17 +++---
 tests/install_test.py                 | 18 +++---
 tests/manual_test.py                  |  2 +-
 tests/test_distribute_setup.py        |  6 +-
 28 files changed, 332 insertions(+), 200 deletions(-)
 create mode 100644 setuptools/compat.py

diff --git a/pkg_resources.py b/pkg_resources.py
index 52d92669b3..f64745cb6e 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -14,12 +14,35 @@
 """
 
 import sys, os, zipimport, time, re, imp, types
-from urlparse import urlparse, urlunparse
+try:
+    from urlparse import urlparse, urlunparse
+except ImportError:
+    from urllib.parse import urlparse, urlunparse
 
 try:
     frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
+try:
+    basestring
+    next = lambda o: o.next()
+    from cStringIO import StringIO
+    def exec_(code, globs=None, locs=None):
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+except NameError:
+    basestring = str
+    from io import StringIO
+    exec_ = eval("exec")
+    def execfile(fn, globs, locs):
+        exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
 # capture these to bypass sandboxing
 from os import utime
@@ -42,7 +65,7 @@
 # attribute is present to decide wether to reinstall the package
 _distribute = True
 
-def _bypass_ensure_directory(name, mode=0777):
+def _bypass_ensure_directory(name, mode=0x1FF):  # 0777
     # Sandbox-bypassing version of ensure_directory()
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')
@@ -56,20 +79,20 @@ def _bypass_ensure_directory(name, mode=0777):
 
 def _declare_state(vartype, **kw):
     g = globals()
-    for name, val in kw.iteritems():
+    for name, val in kw.items():
         g[name] = val
         _state_vars[name] = vartype
 
 def __getstate__():
     state = {}
     g = globals()
-    for k, v in _state_vars.iteritems():
+    for k, v in _state_vars.items():
         state[k] = g['_sget_'+v](g[k])
     return state
 
 def __setstate__(state):
     g = globals()
-    for k, v in state.iteritems():
+    for k, v in state.items():
         g['_sset_'+_state_vars[k]](k, g[k], v)
     return state
 
@@ -639,7 +662,7 @@ def find_plugins(self,
             env = full_env + plugin_env
 
         shadow_set = self.__class__([])
-        map(shadow_set.add, self)   # put all our entries in shadow_set
+        list(map(shadow_set.add, self))   # put all our entries in shadow_set
 
         for project_name in plugin_projects:
 
@@ -650,7 +673,8 @@ def find_plugins(self,
                 try:
                     resolvees = shadow_set.resolve(req, env, installer)
 
-                except ResolutionError,v:
+                except ResolutionError:
+                    v = sys.exc_info()[1]
                     error_info[dist] = v    # save error info
                     if fallback:
                         continue    # try the next older version of project
@@ -658,7 +682,7 @@ def find_plugins(self,
                         break       # give up on this project, keep going
 
                 else:
-                    map(shadow_set.add, resolvees)
+                    list(map(shadow_set.add, resolvees))
                     distributions.update(dict.fromkeys(resolvees))
 
                     # success, no need to try any more versions of this project
@@ -708,7 +732,8 @@ def __getstate__(self):
         return (self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
                 self.callbacks[:])
 
-    def __setstate__(self, (entries, keys, by_key, callbacks)):
+    def __setstate__(self, e_k_b_c):
+        entries, keys, by_key, callbacks = e_k_b_c
         self.entries = entries[:]
         self.entry_keys = keys.copy()
         self.by_key = by_key.copy()
@@ -1021,7 +1046,7 @@ def postprocess(self, tempname, filename):
 
         if os.name == 'posix':
             # Make the resource executable
-            mode = ((os.stat(tempname).st_mode) | 0555) & 07777
+            mode = ((os.stat(tempname).st_mode) | 0x16D) & 0xFFF # 0555, 07777
             os.chmod(tempname, mode)
 
 
@@ -1239,7 +1264,7 @@ def run_script(self,script_name,namespace):
                 len(script_text), 0, script_text.split('\n'), script_filename
             )
             script_code = compile(script_text,script_filename,'exec')
-            exec script_code in namespace, namespace
+            exec_(script_code, namespace, namespace)
 
     def _has(self, path):
         raise NotImplementedError(
@@ -1711,7 +1736,7 @@ def StringIO(*args, **kw):
     try:
         from cStringIO import StringIO
     except ImportError:
-        from StringIO import StringIO
+        from io import StringIO
     return StringIO(*args,**kw)
 
 def find_nothing(importer, path_item, only=False):
@@ -1999,8 +2024,8 @@ def load(self, require=True, env=None, installer=None):
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
             raise UnknownExtra("Can't require() without a distribution", self)
-        map(working_set.add,
-            working_set.resolve(self.dist.requires(self.extras),env,installer))
+        list(map(working_set.add,
+            working_set.resolve(self.dist.requires(self.extras),env,installer)))
 
 
 
@@ -2064,7 +2089,7 @@ def parse_group(cls, group, lines, dist=None):
     def parse_map(cls, data, dist=None):
         """Parse a map of entry point groups"""
         if isinstance(data,dict):
-            data = data.items()
+            data = list(data.items())
         else:
             data = split_sections(data)
         maps = {}
@@ -2229,7 +2254,7 @@ def activate(self,path=None):
         self.insert_on(path)
         if path is sys.path:
             fixup_namespace_packages(self.location)
-            map(declare_namespace, self._get_metadata('namespace_packages.txt'))
+            list(map(declare_namespace, self._get_metadata('namespace_packages.txt')))
 
 
     def egg_name(self):
@@ -2258,7 +2283,7 @@ def __str__(self):
     def __getattr__(self,attr):
         """Delegate all unrecognized public attributes to .metadata provider"""
         if attr.startswith('_'):
-            raise AttributeError,attr
+            raise AttributeError(attr)
         return getattr(self._provider, attr)
 
     #@classmethod
@@ -2337,7 +2362,7 @@ def insert_on(self, path, loc = None):
 
         nloc = _normalize_cached(loc)
         bdir = os.path.dirname(nloc)
-        npath= map(_normalize_cached, path)
+        npath = list(map(_normalize_cached, path))
 
         bp = None
         for p, item in enumerate(npath):
@@ -2466,7 +2491,7 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
         while not TERMINATOR(line,p):
             if CONTINUE(line,p):
                 try:
-                    line = lines.next(); p = 0
+                    line = next(lines); p = 0
                 except StopIteration:
                     raise ValueError(
                         "\\ must not appear on the last nonblank line"
@@ -2558,7 +2583,7 @@ def __eq__(self,other):
 
     def __contains__(self,item):
         if isinstance(item,Distribution):
-            if item.key <> self.key: return False
+            if item.key != self.key: return False
             if self.index: item = item.parsed_version  # only get if we need it
         elif isinstance(item,basestring):
             item = parse_version(item)
@@ -2727,5 +2752,5 @@ def _initialize(g):
 # all distributions added to the working set in the future (e.g. by
 # calling ``require()``) will get activated as well.
 add_activation_listener(lambda dist: dist.activate())
-working_set.entries=[]; map(working_set.add_entry,sys.path) # match order
+working_set.entries=[]; list(map(working_set.add_entry,sys.path)) # match order
 
diff --git a/setup.py b/setup.py
index bfb6240646..5b444bf7e7 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,8 @@
 import os
 
 src_root = None
-if sys.version_info >= (3,):
+do_2to3 = False
+if sys.version_info >= (3,) and do_2to3:
     tmp_src = os.path.join("build", "src")
     from distutils.filelist import FileList
     from distutils import dir_util, file_util, util, log
@@ -66,7 +67,8 @@ def build_package_data(self):
                 # previous version doesn't have convert_2to3_doctests)
                 if not hasattr(self.distribution, 'convert_2to3_doctests'):
                     continue
-
+                if not do_2to3:
+                    continue
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index f5368b29e9..52384e1a28 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -9,7 +9,7 @@ def shquote(arg):
     """Quote an argument for later parsing by shlex.split()"""
     for c in '"', "'", "\\", "#":
         if c in arg: return repr(arg)
-    if arg.split()<>[arg]:
+    if arg.split() != [arg]:
         return repr(arg)
     return arg        
 
@@ -33,7 +33,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         option_base.finalize_options(self)
-        if self.remove and len(self.args)<>1:
+        if self.remove and len(self.args) != 1:
             raise DistutilsOptionError(
                 "Must specify exactly one argument (the alias name) when "
                 "using --remove"
@@ -43,10 +43,10 @@ def run(self):
         aliases = self.distribution.get_option_dict('aliases')
 
         if not self.args:
-            print "Command Aliases"
-            print "---------------"
+            print("Command Aliases")
+            print("---------------")
             for alias in aliases:
-                print "setup.py alias", format_alias(alias, aliases)
+                print("setup.py alias", format_alias(alias, aliases))
             return
 
         elif len(self.args)==1:
@@ -54,10 +54,10 @@ def run(self):
             if self.remove:
                 command = None
             elif alias in aliases:
-                print "setup.py alias", format_alias(alias, aliases)
+                print("setup.py alias", format_alias(alias, aliases))
                 return
             else:
-                print "No alias definition found for %r" % alias
+                print("No alias definition found for %r" % alias)
                 return
         else:
             alias = self.args[0]
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 68ca15c799..007f3ba93c 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -17,6 +17,7 @@
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
 from types import CodeType
+from setuptools.compat import basestring, next
 from setuptools.extension import Library
 
 def strip_module(filename):
@@ -379,7 +380,7 @@ def get_ext_outputs(self):
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
     walker = os.walk(egg_dir)
-    base,dirs,files = walker.next()
+    base,dirs,files = next(walker)
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
     yield base,dirs,files
@@ -407,7 +408,7 @@ def write_safety_flag(egg_dir, safe):
     for flag,fn in safety_flags.items():
         fn = os.path.join(egg_dir, fn)
         if os.path.exists(fn):
-            if safe is None or bool(safe)<>flag:
+            if safe is None or bool(safe) != flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe)==flag:
             f=open(fn,'wt'); f.write('\n'); f.close()
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 58e7ab3913..b8a1034683 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -25,6 +25,7 @@
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
+from setuptools.compat import iteritems, maxsize, xrange, basestring, unicode
 from pkg_resources import yield_lines, normalize_path, resource_string, \
         ensure_directory, get_distribution, find_distributions, \
         Environment, Requirement, Distribution, \
@@ -187,7 +188,7 @@ def delete_blockers(self, blockers):
 
     def finalize_options(self):
         if self.version:
-            print 'distribute %s' % get_distribution('distribute').version
+            print('distribute %s' % get_distribution('distribute').version)
             sys.exit()
 
         py_version = sys.version.split()[0]
@@ -367,7 +368,7 @@ def pseudo_tempname(self):
         try:
             pid = os.getpid()
         except:
-            pid = random.randint(0,sys.maxint)
+            pid = random.randint(0, maxsize)
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
     def warn_deprecated_options(self):
@@ -412,7 +413,7 @@ def check_site_dir(self):
             self.pth_file = None
 
         PYTHONPATH = os.environ.get('PYTHONPATH','').split(os.pathsep)
-        if instdir not in map(normalize_path, filter(None,PYTHONPATH)):
+        if instdir not in map(normalize_path, [_f for _f in PYTHONPATH if _f]):
             # only PYTHONPATH dirs need a site.py, so pretend it's there
             self.sitepy_installed = True
         elif self.multi_version and not os.path.exists(pth_file):
@@ -668,11 +669,13 @@ def process_distribution(self, requirement, dist, deps=True, *info):
             distros = WorkingSet([]).resolve(
                 [requirement], self.local_index, self.easy_install
             )
-        except DistributionNotFound, e:
+        except DistributionNotFound:
+            e = sys.exc_info()[1]
             raise DistutilsError(
                 "Could not find required distribution %s" % e.args
             )
-        except VersionConflict, e:
+        except VersionConflict:
+            e = sys.exc_info()[1]
             raise DistutilsError(
                 "Installed distribution %s conflicts with requirement %s"
                 % e.args
@@ -758,7 +761,7 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target,0755)
+            chmod(target,0x1ED) # 0755
 
 
 
@@ -872,7 +875,7 @@ def install_exe(self, dist_filename, tmpdir):
             f = open(pkg_inf,'w')
             f.write('Metadata-Version: 1.0\n')
             for k,v in cfg.items('metadata'):
-                if k<>'target_version':
+                if k != 'target_version':
                     f.write('%s: %s\n' % (k.replace('_','-').title(), v))
             f.close()
         script_dir = os.path.join(egg_info,'scripts')
@@ -1069,7 +1072,8 @@ def run_setup(self, setup_script, setup_base, args):
         )
         try:
             run_setup(setup_script, args)
-        except SystemExit, v:
+        except SystemExit:
+            v = sys.exc_info()[1]
             raise DistutilsError("Setup script exited with %s" % (v.args[0],))
 
     def build_and_install(self, setup_script, setup_base):
@@ -1149,7 +1153,7 @@ def pf(src,dst):
         self.byte_compile(to_compile)
         if not self.dry_run:
             for f in to_chmod:
-                mode = ((os.stat(f)[stat.ST_MODE]) | 0555) & 07755
+                mode = ((os.stat(f)[stat.ST_MODE]) | 0x16D) & 0xFED  # 0555, 07755
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
@@ -1263,10 +1267,10 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for name, path in self.config_vars.iteritems():
+        for name, path in iteritems(self.config_vars):
             if path.startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0700)" % path)
-                os.makedirs(path, 0700)
+                os.makedirs(path, 0x1C0)    # 0700
 
 
 
@@ -1317,7 +1321,8 @@ def _expand(self, *attrs):
 
 def get_site_dirs():
     # return a list of 'site' dirs
-    sitedirs = filter(None,os.environ.get('PYTHONPATH','').split(os.pathsep))
+    sitedirs = [_f for _f in os.environ.get('PYTHONPATH',
+                                            '').split(os.pathsep) if _f]
     prefixes = [sys.prefix]
     if sys.exec_prefix != sys.prefix:
         prefixes.append(sys.exec_prefix)
@@ -1355,7 +1360,7 @@ def get_site_dirs():
     if HAS_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
-    sitedirs = map(normalize_path, sitedirs)
+    sitedirs = list(map(normalize_path, sitedirs))
 
     return sitedirs
 
@@ -1417,7 +1422,8 @@ def extract_wininst_cfg(dist_filename):
             return None
         f.seek(prepended-12)
 
-        import struct, StringIO, ConfigParser
+        from setuptools.compat import StringIO, ConfigParser
+        import struct
         tag, cfglen, bmlen = struct.unpack("<iii",f.read(12))
         if tag not in (0x1234567A, 0x1234567B):
             return None     # not a valid tag
@@ -1425,7 +1431,7 @@ def extract_wininst_cfg(dist_filename):
         f.seek(prepended-(12+cfglen))
         cfg = ConfigParser.RawConfigParser({'version':'','target_version':''})
         try:
-            cfg.readfp(StringIO.StringIO(f.read(cfglen).split(chr(0),1)[0]))
+            cfg.readfp(StringIO(f.read(cfglen).split(chr(0),1)[0]))
         except ConfigParser.Error:
             return None
         if not cfg.has_section('metadata') or not cfg.has_section('Setup'):
@@ -1460,7 +1466,7 @@ def get_exe_prefixes(exe_filename):
                 if parts[1].endswith('.egg-info'):
                     prefixes.insert(0,('/'.join(parts[:2]), 'EGG-INFO/'))
                     break
-            if len(parts)<>2 or not name.endswith('.pth'):
+            if len(parts) != 2 or not name.endswith('.pth'):
                 continue
             if name.endswith('-nspkg.pth'):
                 continue
@@ -1490,11 +1496,12 @@ class PthDistributions(Environment):
     dirty = False
 
     def __init__(self, filename, sitedirs=()):
-        self.filename = filename; self.sitedirs=map(normalize_path, sitedirs)
+        self.filename = filename
+        self.sitedirs = list(map(normalize_path, sitedirs))
         self.basedir = normalize_path(os.path.dirname(self.filename))
         self._load(); Environment.__init__(self, [], None, None)
         for path in yield_lines(self.paths):
-            map(self.add, find_distributions(path, True))
+            list(map(self.add, find_distributions(path, True)))
 
     def _load(self):
         self.paths = []
@@ -1623,7 +1630,7 @@ def auto_chmod(func, arg, exc):
         chmod(arg, stat.S_IWRITE)
         return func(arg)
     exc = sys.exc_info()
-    raise exc[0], (exc[1][0], exc[1][1] + (" %s %s" % (func,arg)))
+    raise exc[0](exc[1][0], exc[1][1] + (" %s %s" % (func,arg)))
 
 def uncache_zipdir(path):
     """Ensure that the importer caches dont have stale info for `path`"""
@@ -1723,7 +1730,8 @@ def chmod(path, mode):
     log.debug("changing mode of %s to %o", path, mode)
     try:
         _chmod(path, mode)
-    except os.error, e:
+    except os.error:
+        e = sys.exc_info()[1]
         log.debug("chmod failed: %s", e)
 
 def fix_jython_executable(executable, options):
@@ -1799,7 +1807,7 @@ def onerror(*args):
     names = []
     try:
         names = os.listdir(path)
-    except os.error, err:
+    except os.error:
         onerror(os.listdir, path, sys.exc_info())
     for name in names:
         fullname = os.path.join(path, name)
@@ -1812,7 +1820,7 @@ def onerror(*args):
         else:
             try:
                 os.remove(fullname)
-            except os.error, err:
+            except os.error:
                 onerror(os.remove, fullname, sys.exc_info())
     try:
         os.rmdir(path)
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 46cdf4e097..9ccbe68fb8 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -8,11 +8,12 @@
 from distutils.errors import *
 from distutils import log
 from setuptools.command.sdist import sdist
+from setuptools.compat import basestring
 from distutils.util import convert_path
 from distutils.filelist import FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
-from sdist import walk_revctrl
+from setuptools.command.sdist import walk_revctrl
 
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
@@ -51,7 +52,7 @@ def initialize_options(self):
         self.vtags = None
 
     def save_version_info(self, filename):
-        from setopt import edit_config
+        from setuptools.command.setopt import edit_config
         edit_config(
             filename,
             {'egg_info':
@@ -220,7 +221,7 @@ def get_svn_revision(self):
             f.close()
 
             if data.startswith('10') or data.startswith('9') or data.startswith('8'):
-                data = map(str.splitlines,data.split('\n\x0c\n'))
+                data = list(map(str.splitlines,data.split('\n\x0c\n')))
                 del data[0][0]  # get rid of the '8' or '9' or '10'
                 dirurl = data[0][3]
                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
@@ -386,7 +387,8 @@ def write_pkg_info(cmd, basename, filename):
             metadata.name, metadata.version = oldname, oldver
 
         safe = getattr(cmd.distribution,'zip_safe',None)
-        import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
+        from setuptools.command import bdist_egg
+        bdist_egg.write_safety_flag(cmd.egg_info, safe)
 
 def warn_depends_obsolete(cmd, basename, filename):
     if os.path.exists(filename):
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 6ce1b99319..251190bad7 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -49,5 +49,5 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target,0755)
+            chmod(target,0x1ED)  # 0755
 
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 11b6eae82b..b10acfb41f 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -1,5 +1,6 @@
 import distutils, os
 from setuptools import Command
+from setuptools.compat import basestring
 from distutils.util import convert_path
 from distutils import log
 from distutils.errors import *
diff --git a/setuptools/command/saveopts.py b/setuptools/command/saveopts.py
index 1180a440c9..7209be4cd9 100755
--- a/setuptools/command/saveopts.py
+++ b/setuptools/command/saveopts.py
@@ -9,10 +9,9 @@ class saveopts(option_base):
 
     def run(self):
         dist = self.distribution
-        commands = dist.command_options.keys()
         settings = {}
 
-        for cmd in commands:
+        for cmd in dist.command_options:
 
             if cmd=='saveopts':
                 continue    # don't save our own options!
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 3442fe4be6..499a3fb9c2 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -178,7 +178,7 @@ def add_defaults(self):
 
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
-            files = filter(os.path.isfile, glob(pattern))
+            files = list(filter(os.path.isfile, glob(pattern)))
             if files:
                 self.filelist.extend(files)
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index dbf3a94ec1..aa468c88fe 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -47,9 +47,9 @@ def edit_config(filename, settings, dry_run=False):
     while a dictionary lists settings to be changed or deleted in that section.
     A setting of ``None`` means to delete that setting.
     """
-    from ConfigParser import RawConfigParser
+    from setuptools.compat import ConfigParser
     log.debug("Reading configuration from %s", filename)
-    opts = RawConfigParser()
+    opts = ConfigParser.RawConfigParser()
     opts.read([filename])
     for section, options in settings.items():
         if options is None:
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 1f49745e3e..6b18d761da 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -11,13 +11,12 @@
 except ImportError:
     from md5 import md5
 import os
+import sys
 import socket
 import platform
-import ConfigParser
-import httplib
 import base64
-import urlparse
-import cStringIO as StringIO
+
+from setuptools.compat import urlparse, StringIO, httplib, ConfigParser
 
 class upload(Command):
 
@@ -49,7 +48,7 @@ def finalize_options(self):
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 self.announce('Using PyPI login from %s' % rc)
@@ -148,14 +147,14 @@ def upload_file(self, command, pyversion, filename):
         # We can't use urllib2 since we need to send the Basic
         # auth right with the first request
         schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
+            urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
             http = httplib.HTTPConnection(netloc)
         elif schema == 'https':
             http = httplib.HTTPSConnection(netloc)
         else:
-            raise AssertionError, "unsupported schema "+schema
+            raise AssertionError("unsupported schema " + schema)
 
         data = ''
         loglevel = log.INFO
@@ -168,7 +167,8 @@ def upload_file(self, command, pyversion, filename):
             http.putheader('Authorization', auth)
             http.endheaders()
             http.send(body)
-        except socket.error, e:
+        except socket.error:
+            e = sys.exc_info()[1]
             self.announce(str(e), log.ERROR)
             return
 
@@ -180,4 +180,4 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
+            print('-'*75, r.read(), '-'*75)
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 213f7b588e..505ddadb3a 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -8,9 +8,7 @@
 import os
 import socket
 import zipfile
-import httplib
 import base64
-import urlparse
 import tempfile
 import sys
 
@@ -22,6 +20,8 @@
 except ImportError:
     from setuptools.command.upload import upload
 
+from setuptools.compat import httplib, urlparse
+
 _IS_PYTHON3 = sys.version > '3'
 
 try:
@@ -137,7 +137,7 @@ def upload_file(self, filename):
         # We can't use urllib2 since we need to send the Basic
         # auth right with the first request
         schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
+            urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
             conn = httplib.HTTPConnection(netloc)
@@ -157,7 +157,8 @@ def upload_file(self, filename):
             conn.putheader('Authorization', auth)
             conn.endheaders()
             conn.send(body)
-        except socket.error, e:
+        except socket.error:
+            e = sys.exc_info()[1]
             self.announce(str(e), log.ERROR)
             return
 
@@ -175,4 +176,4 @@ def upload_file(self, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
+            print('-'*75, r.read(), '-'*75)
diff --git a/setuptools/compat.py b/setuptools/compat.py
new file mode 100644
index 0000000000..dfbb314d6d
--- /dev/null
+++ b/setuptools/compat.py
@@ -0,0 +1,73 @@
+import sys
+
+if sys.version_info[0] < 3:
+    PY3 = False
+
+    basestring = basestring
+    import __builtin__ as builtins
+    import ConfigParser
+    from cStringIO import StringIO
+    BytesIO = StringIO
+    execfile = execfile
+    func_code = lambda o: o.func_code
+    func_globals = lambda o: o.func_globals
+    im_func = lambda o: o.im_func
+    from htmlentitydefs import name2codepoint
+    import httplib
+    from BaseHTTPServer import HTTPServer
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+    iteritems = lambda o: o.iteritems
+    long_type = long
+    maxsize = sys.maxint
+    next = lambda o: o.next()
+    numeric_types = (int, long, float)
+    reduce = reduce
+    unichr = unichr
+    unicode = unicode
+    from urllib import url2pathname
+    import urllib2
+    from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
+    from urlparse import urlparse, urlunparse, urljoin
+    xrange = xrange
+
+    def exec_(code, globs=None, locs=None):
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+
+else:
+    PY3 = True
+
+    basestring = str
+    import builtins
+    import configparser as ConfigParser
+    exec_ = eval('exec')
+    from io import StringIO, BytesIO
+    func_code = lambda o: o.__code__
+    func_globals = lambda o: o.__globals__
+    im_func = lambda o: o.__func__
+    from html.entities import name2codepoint
+    import http.client as httplib
+    from http.server import HTTPServer, SimpleHTTPRequestHandler
+    iteritems = lambda o: o.items
+    long_type = int
+    maxsize = sys.maxsize
+    next = next
+    numeric_types = (int, float)
+    from functools import reduce
+    unichr = chr
+    unicode = str
+    from urllib.error import HTTPError, URLError
+    import urllib.request as urllib2
+    from urllib.request import urlopen, url2pathname
+    from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
+    xrange = range
+
+    def execfile(fn, globs, locs):
+        exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 4b7b343760..8b9d1217b1 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -36,7 +36,7 @@ def full_name(self):
     def version_ok(self,version):
         """Is 'version' sufficiently up-to-date?"""
         return self.attribute is None or self.format is None or \
-            str(version)<>"unknown" and version >= self.requested_version
+            str(version) != "unknown" and version >= self.requested_version
 
 
     def get_version(self, paths=None, default="unknown"):
@@ -103,7 +103,7 @@ def _iter_code(code):
             ptr += 3
 
             if op==EXTENDED_ARG:
-                extended_arg = arg * 65536L
+                extended_arg = arg * long_type(65536)
                 continue
 
         else:
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0ad18122cf..ebe02065be 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,11 +1,13 @@
 __all__ = ['Distribution']
 
 import re
+import sys
 from distutils.core import Distribution as _Distribution
 from setuptools.depends import Require
 from setuptools.command.install import install
 from setuptools.command.sdist import sdist
 from setuptools.command.install_lib import install_lib
+from setuptools.compat import numeric_types, basestring
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.errors import DistutilsSetupError
 import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
@@ -100,7 +102,8 @@ def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:
         pkg_resources.EntryPoint.parse_map(value)
-    except ValueError, e:
+    except ValueError:
+        e = sys.exc_info()[1]
         raise DistutilsSetupError(e)
 
 def check_test_suite(dist, attr, value):
@@ -223,7 +226,7 @@ def __init__ (self, attrs=None):
             if not hasattr(self,ep.name):
                 setattr(self,ep.name,None)
         _Distribution.__init__(self,attrs)
-        if isinstance(self.metadata.version, (int,long,float)):
+        if isinstance(self.metadata.version, numeric_types):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 
@@ -526,7 +529,7 @@ def _exclude_packages(self,packages):
             raise DistutilsSetupError(
                 "packages: setting must be a list or tuple (%r)" % (packages,)
             )
-        map(self.exclude_package, packages)
+        list(map(self.exclude_package, packages))
 
 
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f064b110d5..589dade619 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,9 +1,12 @@
 """PyPI and direct package downloading"""
-import sys, os.path, re, urlparse, urllib, urllib2, shutil, random, socket, cStringIO
-import httplib
+import sys, os.path, re, shutil, random, socket
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
+from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
+                               urlparse, urlunparse, unquote, splituser,
+                               url2pathname, name2codepoint,
+                               unichr, urljoin)
 try:
     from hashlib import md5
 except ImportError:
@@ -52,8 +55,8 @@ def parse_bdist_wininst(name):
 
 
 def egg_info_for_url(url):
-    scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
-    base = urllib2.unquote(path.split('/')[-1])
+    scheme, server, path, parameters, query, fragment = urlparse(url)
+    base = unquote(path.split('/')[-1])
     if '#' in base: base, fragment = base.split('#',1)
     return base,fragment
 
@@ -144,14 +147,14 @@ def find_external_links(url, page):
         rels = map(str.strip, rel.lower().split(','))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                yield urljoin(url, htmldecode(match.group(1)))
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                yield urljoin(url, htmldecode(match.group(1)))
 
 user_agent = "Python-urllib/%s distribute/%s" % (
     sys.version[:3], require('distribute')[0].version
@@ -190,7 +193,7 @@ def process_url(self, url, retrieve=False):
                 self.debug("Found link: %s", url)
 
         if dists or not retrieve or url in self.fetched_urls:
-            map(self.add, dists)
+            list(map(self.add, dists))
             return  # don't need the actual page
 
         if not self.url_ok(url):
@@ -209,7 +212,7 @@ def process_url(self, url, retrieve=False):
         base = f.url     # handle redirects
         page = f.read()
         if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
-            if isinstance(f, urllib2.HTTPError):
+            if isinstance(f, HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
             else:
@@ -217,7 +220,7 @@ def process_url(self, url, retrieve=False):
             page = page.decode(charset, "ignore")
         f.close()
         for match in HREF.finditer(page):
-            link = urlparse.urljoin(base, htmldecode(match.group(1)))
+            link = urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
         if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
             page = self.process_index(url, page)
@@ -236,11 +239,11 @@ def process_filename(self, fn, nested=False):
         dists = distros_for_filename(fn)
         if dists:
             self.debug("Found: %s", fn)
-            map(self.add, dists)
+            list(map(self.add, dists))
 
     def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
-        if (s and s.group(1).lower()=='file') or self.allows(urlparse.urlparse(url)[1]):
+        if (s and s.group(1).lower()=='file') or self.allows(urlparse(url)[1]):
             return True
         msg = "\nLink to % s ***BLOCKED*** by --allow-hosts\n"
         if fatal:
@@ -256,7 +259,8 @@ def scan_egg_links(self, search_path):
                         self.scan_egg_link(item, entry)
 
     def scan_egg_link(self, path, entry):
-        lines = filter(None, map(str.strip, open(os.path.join(path, entry))))
+        lines = [_f for _f in map(str.strip,
+                                  open(os.path.join(path, entry))) if _f]
         if len(lines)==2:
             for dist in find_distributions(os.path.join(path, lines[0])):
                 dist.location = os.path.join(path, *lines)
@@ -268,9 +272,9 @@ def process_index(self,url,page):
         def scan(link):
             # Process a URL to see if it's for a package page
             if link.startswith(self.index_url):
-                parts = map(
-                    urllib2.unquote, link[len(self.index_url):].split('/')
-                )
+                parts = list(map(
+                    unquote, link[len(self.index_url):].split('/')
+                ))
                 if len(parts)==2 and '#' not in parts[1]:
                     # it's a package page, sanitize and index it
                     pkg = safe_name(parts[0])
@@ -282,7 +286,7 @@ def scan(link):
         # process an index page into the package-page index
         for match in HREF.finditer(page):
             try:
-                scan( urlparse.urljoin(url, htmldecode(match.group(1))) )
+                scan( urljoin(url, htmldecode(match.group(1))) )
             except ValueError:
                 pass
 
@@ -351,7 +355,7 @@ def obtain(self, requirement, installer=None):
     def check_md5(self, cs, info, filename, tfp):
         if re.match('md5=[0-9a-f]{32}$', info):
             self.debug("Validating md5 checksum for %s", filename)
-            if cs.hexdigest()<>info[4:]:
+            if cs.hexdigest() != info[4:]:
                 tfp.close()
                 os.unlink(filename)
                 raise DistutilsError(
@@ -377,7 +381,7 @@ def add_find_links(self, urls):
     def prescan(self):
         """Scan urls scheduled for prescanning (e.g. --find-links)"""
         if self.to_scan:
-            map(self.scan_url, self.to_scan)
+            list(map(self.scan_url, self.to_scan))
         self.to_scan = None     # from now on, go ahead and process immediately
 
     def not_found_in_index(self, requirement):
@@ -569,7 +573,7 @@ def _download_to(self, url, filename):
             if '#' in url:
                 url, info = url.split('#', 1)
             fp = self.open_url(url)
-            if isinstance(fp, urllib2.HTTPError):
+            if isinstance(fp, HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
                 )
@@ -608,28 +612,33 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url)
-        except (ValueError, httplib.InvalidURL), v:
+        except (ValueError, httplib.InvalidURL):
+            v = sys.exc_info()[1]
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
             else:
                 raise DistutilsError('%s %s' % (url, msg))
-        except urllib2.HTTPError, v:
+        except urllib2.HTTPError:
+            v = sys.exc_info()[1]
             return v
-        except urllib2.URLError, v:
+        except urllib2.URLError:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason))
-        except httplib.BadStatusLine, v:
+        except httplib.BadStatusLine:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.line)
             else:
                 raise DistutilsError('%s returned a bad status line. '
                                      'The server might be down, %s' % \
                                              (url, v.line))
-        except httplib.HTTPException, v:
+        except httplib.HTTPException:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v)
             else:
@@ -639,7 +648,7 @@ def open_url(self, url, warning=None):
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
         #
-        name = filter(None,urlparse.urlparse(url)[2].split('/'))
+        name = [_f for _f in urlparse(url)[2].split('/') if _f]
         if name:
             name = name[-1]
             while '..' in name:
@@ -657,7 +666,7 @@ def _download_url(self, scheme, url, tmpdir):
         if scheme=='svn' or scheme.startswith('svn+'):
             return self._download_svn(url, filename)
         elif scheme=='file':
-            return urllib.url2pathname(urlparse.urlparse(url)[2])
+            return url2pathname(urlparse.urlparse(url)[2])
         else:
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
@@ -722,7 +731,6 @@ def decode_entity(match):
     elif what.startswith('#'):
         what = int(what[1:])
     else:
-        from htmlentitydefs import name2codepoint
         what = name2codepoint.get(what, match.group(0))
     return uchr(what)
 
@@ -760,16 +768,16 @@ def _socket_timeout(*args, **kwargs):
 def open_with_auth(url):
     """Open a urllib2 request, handling HTTP authentication"""
 
-    scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
+    scheme, netloc, path, params, query, frag = urlparse(url)
 
     if scheme in ('http', 'https'):
-        auth, host = urllib2.splituser(netloc)
+        auth, host = splituser(netloc)
     else:
         auth = None
 
     if auth:
-        auth = "Basic " + urllib2.unquote(auth).encode('base64').strip()
-        new_url = urlparse.urlunparse((scheme,host,path,params,query,frag))
+        auth = "Basic " + unquote(auth).encode('base64').strip()
+        new_url = urlunparse((scheme,host,path,params,query,frag))
         request = urllib2.Request(new_url)
         request.add_header("Authorization", auth)
     else:
@@ -781,9 +789,9 @@ def open_with_auth(url):
     if auth:
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
-        s2, h2, path2, param2, query2, frag2 = urlparse.urlparse(fp.url)
+        s2, h2, path2, param2, query2, frag2 = urlparse(fp.url)
         if s2==scheme and h2==host:
-            fp.url = urlparse.urlunparse((s2,netloc,path2,param2,query2,frag2))
+            fp.url = urlunparse((s2,netloc,path2,param2,query2,frag2))
 
     return fp
 
@@ -805,8 +813,8 @@ def fix_sf_url(url):
 
 def local_open(url):
     """Read a local path, with special support for directories"""
-    scheme, server, path, param, query, frag = urlparse.urlparse(url)
-    filename = urllib.url2pathname(path)
+    scheme, server, path, param, query, frag = urlparse(url)
+    filename = url2pathname(path)
     if os.path.isfile(filename):
         return urllib2.urlopen(url)
     elif path.endswith('/') and os.path.isdir(filename):
@@ -827,8 +835,8 @@ def local_open(url):
     else:
         status, message, body = 404, "Path not found", "Not found"
 
-    return urllib2.HTTPError(url, status, message,
-            {'content-type':'text/html'}, cStringIO.StringIO(body))
+    return HTTPError(url, status, message,
+            {'content-type':'text/html'}, StringIO(body))
 
 
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 8e0c09b5ea..41f1119b4c 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,4 +1,4 @@
-import os, sys, __builtin__, tempfile, operator, pkg_resources
+import os, sys, tempfile, operator, pkg_resources
 _os = sys.modules[os.name]
 try:
     _file = file
@@ -6,6 +6,8 @@
     _file = None
 _open = open
 from distutils.errors import DistutilsError
+from setuptools.compat import builtins, execfile, reduce
+
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
@@ -32,7 +34,8 @@ def run_setup(setup_script, args):
                     {'__file__':setup_script, '__name__':'__main__'}
                 )
             )
-        except SystemExit, v:
+        except SystemExit:
+            v = sys.exc_info()[1]
             if v.args and v.args[0]:
                 raise
             # Normal exit, just return
@@ -66,15 +69,15 @@ def run(self, func):
         try:
             self._copy(self)
             if _file:
-                __builtin__.file = self._file
-            __builtin__.open = self._open
+                builtins.file = self._file
+            builtins.open = self._open
             self._active = True
             return func()
         finally:
             self._active = False
             if _file:
-                __builtin__.file = _file
-            __builtin__.open = _open
+                builtins.file = _file
+            builtins.open = _open
             self._copy(_os)
 
 
@@ -225,7 +228,7 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
-    def open(self, file, flags, mode=0777):
+    def open(self, file, flags, mode=0x1FF):    # 0777
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode)
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 9af44a88bb..669bb8262f 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -7,6 +7,7 @@
 from setuptools import Feature
 from distutils.core import Extension
 extract_constant, get_module_constant = None, None
+from setuptools.compat import func_code
 from setuptools.depends import *
 from distutils.version import StrictVersion, LooseVersion
 from distutils.util import convert_path
@@ -50,17 +51,18 @@ def f1():
             x = "test"
             y = z
 
+        fc = func_code(f1)
         # unrecognized name
-        self.assertEqual(extract_constant(f1.func_code,'q', -1), None)
+        self.assertEqual(extract_constant(fc,'q', -1), None)
 
         # constant assigned
-        self.assertEqual(extract_constant(f1.func_code,'x', -1), "test")
+        self.assertEqual(extract_constant(fc,'x', -1), "test")
 
         # expression assigned
-        self.assertEqual(extract_constant(f1.func_code,'y', -1), -1)
+        self.assertEqual(extract_constant(fc,'y', -1), -1)
 
         # recognized name, not assigned
-        self.assertEqual(extract_constant(f1.func_code,'z', -1), None)
+        self.assertEqual(extract_constant(fc,'z', -1), None)
 
 
     def testFindModule(self):
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index be399a9d22..1f23fd8e93 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -9,7 +9,7 @@
 try:
     basestring
 except NameError:
-    basestring = str,unicode
+    basestring = str
 
 try:
     enumerate
@@ -109,7 +109,7 @@ def _test():
 import sys, traceback, inspect, linecache, os, re, types
 import unittest, difflib, pdb, tempfile
 import warnings
-from StringIO import StringIO
+from setuptools.compat import StringIO, execfile, exec_, func_code, im_func
 
 # Don't whine about the deprecated is_private function in this
 # module's tests.
@@ -240,7 +240,7 @@ def _normalize_module(module, depth=2):
     """
     if inspect.ismodule(module):
         return module
-    elif isinstance(module, (str, unicode)):
+    elif isinstance(module, basestring):
         return __import__(module, globals(), locals(), ["*"])
     elif module is None:
         return sys.modules[sys._getframe(depth).f_globals['__name__']]
@@ -367,9 +367,9 @@ def trace_dispatch(self, *args):
 # [XX] Normalize with respect to os.path.pardir?
 def _module_relative_path(module, path):
     if not inspect.ismodule(module):
-        raise TypeError, 'Expected a module: %r' % module
+        raise TypeError('Expected a module: %r' % module)
     if path.startswith('/'):
-        raise ValueError, 'Module-relative files may not have absolute paths'
+        raise ValueError('Module-relative files may not have absolute paths')
 
     # Find the base directory for the path.
     if hasattr(module, '__file__'):
@@ -877,7 +877,7 @@ def _from_module(self, module, object):
         if module is None:
             return True
         elif inspect.isfunction(object):
-            return module.__dict__ is object.func_globals
+            return module.__dict__ is func_globals(object)
         elif inspect.isclass(object):
             return module.__name__ == object.__module__
         elif inspect.getmodule(object) is not None:
@@ -895,7 +895,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
         add them to `tests`.
         """
         if self._verbose:
-            print 'Finding tests in %s' % name
+            print('Finding tests in %s' % name)
 
         # If we've already processed this object, then ignore it.
         if id(obj) in seen:
@@ -948,7 +948,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
                 if isinstance(val, staticmethod):
                     val = getattr(obj, valname)
                 if isinstance(val, classmethod):
-                    val = getattr(obj, valname).im_func
+                    val = im_func(getattr(obj, valname))
 
                 # Recurse to methods, properties, and nested classes.
                 if ((inspect.isfunction(val) or inspect.isclass(val) or
@@ -1020,8 +1020,8 @@ def _find_lineno(self, obj, source_lines):
                     break
 
         # Find the line number for functions & methods.
-        if inspect.ismethod(obj): obj = obj.im_func
-        if inspect.isfunction(obj): obj = obj.func_code
+        if inspect.ismethod(obj): obj = im_func(obj)
+        if inspect.isfunction(obj): obj = func_code(obj)
         if inspect.istraceback(obj): obj = obj.tb_frame
         if inspect.isframe(obj): obj = obj.f_code
         if inspect.iscode(obj):
@@ -1250,8 +1250,8 @@ def __run(self, test, compileflags, out):
             # keyboard interrupts.)
             try:
                 # Don't blink!  This is where the user's code gets run.
-                exec compile(example.source, filename, "single",
-                             compileflags, 1) in test.globs
+                exec_(compile(example.source, filename, "single",
+                              compileflags, 1), test.globs)
                 self.debugger.set_continue() # ==== Example Finished ====
                 exception = None
             except KeyboardInterrupt:
@@ -1335,7 +1335,7 @@ def __patched_linecache_getlines(self, filename, module_globals=None):
         if m and m.group('name') == self.test.name:
             example = self.test.examples[int(m.group('examplenum'))]
             return example.source.splitlines(True)
-        elif self.save_linecache_getlines.func_code.co_argcount>1:
+        elif func_code(self.save_linecache_getlines).co_argcount > 1:
             return self.save_linecache_getlines(filename, module_globals)
         else:
             return self.save_linecache_getlines(filename)
@@ -1427,28 +1427,28 @@ def summarize(self, verbose=None):
                 failed.append(x)
         if verbose:
             if notests:
-                print len(notests), "items had no tests:"
+                print(len(notests), "items had no tests:")
                 notests.sort()
                 for thing in notests:
-                    print "   ", thing
+                    print("   ", thing)
             if passed:
-                print len(passed), "items passed all tests:"
+                print(len(passed), "items passed all tests:")
                 passed.sort()
                 for thing, count in passed:
-                    print " %3d tests in %s" % (count, thing)
+                    print(" %3d tests in %s" % (count, thing))
         if failed:
-            print self.DIVIDER
-            print len(failed), "items had failures:"
+            print(self.DIVIDER)
+            print(len(failed), "items had failures:")
             failed.sort()
             for thing, (f, t) in failed:
-                print " %3d of %3d in %s" % (f, t, thing)
+                print(" %3d of %3d in %s" % (f, t, thing))
         if verbose:
-            print totalt, "tests in", len(self._name2ft), "items."
-            print totalt - totalf, "passed and", totalf, "failed."
+            print(totalt, "tests in", len(self._name2ft), "items.")
+            print(totalt - totalf, "passed and", totalf, "failed.")
         if totalf:
-            print "***Test Failed***", totalf, "failures."
+            print("***Test Failed***", totalf, "failures.")
         elif verbose:
-            print "Test passed."
+            print("Test passed.")
         return totalf, totalt
 
     #/////////////////////////////////////////////////////////////////
@@ -1458,8 +1458,8 @@ def merge(self, other):
         d = self._name2ft
         for name, (f, t) in other._name2ft.items():
             if name in d:
-                print "*** DocTestRunner.merge: '" + name + "' in both" \
-                    " testers; summing outcomes."
+                print("*** DocTestRunner.merge: '" + name + "' in both" \
+                    " testers; summing outcomes.")
                 f2, t2 = d[name]
                 f = f + f2
                 t = t + t2
@@ -2037,10 +2037,10 @@ def __init__(self, mod=None, globs=None, verbose=None,
     def runstring(self, s, name):
         test = DocTestParser().get_doctest(s, self.globs, name, None, None)
         if self.verbose:
-            print "Running string", name
+            print("Running string", name)
         (f,t) = self.testrunner.run(test)
         if self.verbose:
-            print f, "of", t, "examples failed in string", name
+            print(f, "of", t, "examples failed in string", name)
         return (f,t)
 
     def rundoc(self, object, name=None, module=None):
@@ -2552,7 +2552,7 @@ def debug_script(src, pm=False, globs=None):
             try:
                 execfile(srcfilename, globs, globs)
             except:
-                print sys.exc_info()[1]
+                print(sys.exc_info()[1])
                 pdb.post_mortem(sys.exc_info()[2])
         else:
             # Note that %r is vital here.  '%s' instead can, e.g., cause
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index f4aaaa1cfc..c70fab7bc2 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -1,10 +1,9 @@
 """Basic http server for tests to simulate PyPI or custom indexes
 """
-import urllib2
 import sys
 from threading import Thread
-from BaseHTTPServer import HTTPServer
-from SimpleHTTPServer import SimpleHTTPRequestHandler
+from setuptools.compat import (urllib2, URLError, HTTPServer,
+                               SimpleHTTPRequestHandler)
 
 class IndexServer(HTTPServer):
     """Basic single-threaded http server simulating a package index
@@ -39,7 +38,7 @@ def stop(self):
                                 None, 5)
             else:
                 urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port)
-        except urllib2.URLError:
+        except URLError:
             pass
         self.thread.join()
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 5576d5e5f2..752a70e9db 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -4,11 +4,11 @@
 import os, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
 from setuptools.command import easy_install as easy_install_pkg
+from setuptools.compat import StringIO
 from setuptools.dist import Distribution
 
 SETUP_PY = """\
@@ -73,7 +73,8 @@ def test_develop_with_setup_requires(self):
         try:
             try:
                 dist = Distribution({'setup_requires': ['I_DONT_EXIST']})
-            except DistutilsError, e:
+            except DistutilsError:
+                e = sys.exc_info()[1]
                 error = str(e)
                 if error ==  wanted:
                     pass
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 85616605c2..af5644c5e2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -3,7 +3,7 @@
 import sys
 import os, shutil, tempfile, unittest
 import site
-from StringIO import StringIO
+from setuptools.compat import StringIO, next
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -67,7 +67,7 @@ def test_get_script_args(self):
 
         old_platform = sys.platform
         try:
-            name, script = get_script_args(dist).next()
+            name, script = next(get_script_args(dist))
         finally:
             sys.platform = old_platform
 
@@ -125,8 +125,7 @@ def test_no_find_links(self):
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
         cmd.args = ['ok']
         cmd.ensure_finalized()
-        keys = cmd.package_index.scanned_urls.keys()
-        keys.sort()
+        keys = sorted(cmd.package_index.scanned_urls.keys())
         self.assertEquals(keys, ['link1', 'link2'])
 
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 00d44ca689..8c685c01ca 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -2,10 +2,11 @@
 """
 # More would be better!
 import sys
-import os, shutil, tempfile, unittest, urllib2
+import os, shutil, tempfile, unittest
 import pkg_resources
+from setuptools.compat import urllib2, httplib, HTTPError
 import setuptools.package_index
-from server import IndexServer
+from tests.server import IndexServer
 
 class TestPackageIndex(unittest.TestCase):
 
@@ -14,10 +15,11 @@ def test_bad_urls(self):
         url = 'http://127.0.0.1:0/nonesuch/test_package_index'
         try:
             v = index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assert_(url in str(v))
         else:
-            self.assert_(isinstance(v,urllib2.HTTPError))
+            self.assert_(isinstance(v, HTTPError))
 
         # issue 16
         # easy_install inquant.contentmirror.plone breaks because of a typo
@@ -29,13 +31,13 @@ def test_bad_urls(self):
         url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk'
         try:
             v = index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assert_(url in str(v))
         else:
-            self.assert_(isinstance(v, urllib2.HTTPError))
+            self.assert_(isinstance(v, HTTPError))
 
         def _urlopen(*args):
-            import httplib
             raise httplib.BadStatusLine('line')
 
         old_urlopen = urllib2.urlopen
@@ -44,7 +46,8 @@ def _urlopen(*args):
         try:
             try:
                 v = index.open_url(url)
-            except Exception, v:
+            except Exception:
+                v = sys.exc_info()[1]
                 self.assert_('line' in str(v))
             else:
                 raise AssertionError('Should have raise here!')
@@ -55,7 +58,8 @@ def _urlopen(*args):
         url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
         try:
             index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assert_('nonnumeric port' in str(v))
 
 
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c10ca21083..57536221da 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -3,7 +3,8 @@
 # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove
 from unittest import TestCase, makeSuite; from pkg_resources import *
 from setuptools.command.easy_install import get_script_header, is_sh
-import os, pkg_resources, sys, StringIO, tempfile, shutil
+from setuptools.compat import StringIO, iteritems
+import os, pkg_resources, sys, tempfile, shutil
 try: frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
@@ -139,7 +140,7 @@ def testResolve(self):
         for i in range(3):
             targets = list(ws.resolve(parse_requirements("Foo"), ad))
             self.assertEqual(targets, [Foo])
-            map(ws.add,targets)
+            list(map(ws.add,targets))
         self.assertRaises(VersionConflict, ws.resolve,
             parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
@@ -262,7 +263,7 @@ def testRejects(self):
 
     def checkSubMap(self, m):
         self.assertEqual(len(m), len(self.submap_expect))
-        for key, ep in self.submap_expect.iteritems():
+        for key, ep in iteritems(self.submap_expect):
             self.assertEqual(repr(m.get(key)), repr(ep))
 
     submap_expect = dict(
@@ -286,10 +287,10 @@ def testParseList(self):
     def testParseMap(self):
         m = EntryPoint.parse_map({'xyz':self.submap_str})
         self.checkSubMap(m['xyz'])
-        self.assertEqual(m.keys(),['xyz'])
+        self.assertEqual(list(m.keys()),['xyz'])
         m = EntryPoint.parse_map("[xyz]\n"+self.submap_str)
         self.checkSubMap(m['xyz'])
-        self.assertEqual(m.keys(),['xyz'])
+        self.assertEqual(list(m.keys()),['xyz'])
         self.assertRaises(ValueError, EntryPoint.parse_map, ["[xyz]", "[xyz]"])
         self.assertRaises(ValueError, EntryPoint.parse_map, self.submap_str)
 
@@ -549,12 +550,12 @@ def test_get_script_header_jython_workaround(self):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = sys.stderr = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
             self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
-            sys.stdout = sys.stderr = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
@@ -606,7 +607,7 @@ def test_two_levels_deep(self):
         self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys())
         try:
             import pkg1.pkg2
-        except ImportError, e:
+        except ImportError:
             self.fail("Distribute tried to import the parent namespace package")
         # check the _namespace_packages dict
         self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys())
diff --git a/tests/install_test.py b/tests/install_test.py
index 02deb81860..97b79933e7 100644
--- a/tests/install_test.py
+++ b/tests/install_test.py
@@ -1,19 +1,19 @@
-import urllib2
 import sys
 import os
+from setuptools.compat import urllib2
 
 if os.path.exists('distribute_setup.py'):
-    print 'distribute_setup.py exists in the current dir, aborting'
+    print('distribute_setup.py exists in the current dir, aborting')
     sys.exit(2)
 
-print '**** Starting Test'
-print '\n\n'
+print('**** Starting Test')
+print('\n\n')
 
 is_jython = sys.platform.startswith('java')
 if is_jython:
     import subprocess
 
-print 'Downloading bootstrap'
+print('Downloading bootstrap')
 file = urllib2.urlopen('http://nightly.ziade.org/distribute_setup.py')
 f = open('distribute_setup.py', 'w')
 f.write(file.read())
@@ -27,7 +27,7 @@
     res = os.spawnv(os.P_WAIT, sys.executable, args)
 
 if res != 0:
-    print '**** Test failed, please send me the output at tarek@ziade.org'
+    print('**** Test failed, please send me the output at tarek@ziade.org')
     os.remove('distribute_setup.py')
     sys.exit(2)
 
@@ -63,11 +63,11 @@
     else:
         res = os.spawnv(os.P_WAIT, sys.executable, args)
 
-    print '\n\n'
+    print('\n\n')
     if res:
-        print '**** Test is OK'
+        print('**** Test is OK')
     else:
-        print '**** Test failed, please send me the output at tarek@ziade.org'
+        print('**** Test failed, please send me the output at tarek@ziade.org')
 finally:
     if os.path.exists(script_name):
         os.remove(script_name)
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 0d5051f165..223567f439 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -9,7 +9,7 @@
 import tempfile
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
-from urllib2 import urlopen
+from setuptools.compat import urlopen
 
 try:
     import subprocess
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 4151587fcc..37c6cf82d0 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -17,7 +17,7 @@
 class TestSetup(unittest.TestCase):
 
     def urlopen(self, url):
-        return open(self.tarball)
+        return open(self.tarball, 'rb')
 
     def setUp(self):
         self.old_sys_path = copy.copy(sys.path)
@@ -28,7 +28,7 @@ def setUp(self):
                     "--dist-dir", "%s" % self.tmpdir)
         tarball = os.listdir(self.tmpdir)[0]
         self.tarball = os.path.join(self.tmpdir, tarball)
-        import urllib2
+        from setuptools.compat import urllib2
         urllib2.urlopen = self.urlopen
 
     def tearDown(self):
@@ -38,7 +38,7 @@ def tearDown(self):
 
     def test_build_egg(self):
         # making it an egg
-        egg = _build_egg(self.tarball, self.tmpdir)
+        egg = _build_egg('Egg to be built', self.tarball, self.tmpdir)
 
         # now trying to import it
         sys.path[0] = egg

From e65d621e1661512a4bcfb7d9a5320d3faa96aebe Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 21 Jun 2011 08:11:40 +0100
Subject: [PATCH 1097/8469] Fixed some bugs - tests now all pass under Python
 3.3.

--HG--
branch : distribute
extra : rebase_source : 3498bfdc0d4c15e4276673b52e924c461ca353f0
---
 setuptools/compat.py                  | 4 ++--
 setuptools/tests/test_packageindex.py | 2 +-
 tests/api_tests.txt                   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index dfbb314d6d..725818668b 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -16,7 +16,7 @@
     import httplib
     from BaseHTTPServer import HTTPServer
     from SimpleHTTPServer import SimpleHTTPRequestHandler
-    iteritems = lambda o: o.iteritems
+    iteritems = lambda o: o.iteritems()
     long_type = long
     maxsize = sys.maxint
     next = lambda o: o.next()
@@ -55,7 +55,7 @@ def exec_(code, globs=None, locs=None):
     from html.entities import name2codepoint
     import http.client as httplib
     from http.server import HTTPServer, SimpleHTTPRequestHandler
-    iteritems = lambda o: o.items
+    iteritems = lambda o: o.items()
     long_type = int
     maxsize = sys.maxsize
     next = next
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 8c685c01ca..cabbb48cd9 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -6,7 +6,7 @@
 import pkg_resources
 from setuptools.compat import urllib2, httplib, HTTPError
 import setuptools.package_index
-from tests.server import IndexServer
+from setuptools.tests.server import IndexServer
 
 class TestPackageIndex(unittest.TestCase):
 
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 6cf6e66f27..c2e63b24e9 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -39,7 +39,7 @@ Distributions have various introspectable attributes::
     >>> dist.py_version == sys.version[:3]
     True
 
-    >>> print dist.platform
+    >>> print(dist.platform)
     None
 
 Including various computed attributes::
@@ -199,7 +199,7 @@ shows up once when iterating the working set:
 You can ask a WorkingSet to ``find()`` a distribution matching a requirement::
 
     >>> from pkg_resources import Requirement
-    >>> print ws.find(Requirement.parse("Foo==1.0"))    # no match, return None
+    >>> print(ws.find(Requirement.parse("Foo==1.0")))   # no match, return None
     None
 
     >>> ws.find(Requirement.parse("Bar==0.9"))  # match, return distribution
@@ -211,7 +211,7 @@ working set triggers a ``pkg_resources.VersionConflict`` error:
     >>> try:
     ...     ws.find(Requirement.parse("Bar==1.0"))
     ... except VersionConflict:
-    ...     print 'ok'
+    ...     print('ok')
     ok
 
 You can subscribe a callback function to receive notifications whenever a new
@@ -219,7 +219,7 @@ distribution is added to a working set.  The callback is immediately invoked
 once for each existing distribution in the working set, and then is called
 again for new distributions added thereafter::
 
-    >>> def added(dist): print "Added", dist
+    >>> def added(dist): print("Added", dist)
     >>> ws.subscribe(added)
     Added Bar 0.9
     >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12") 

From 5861e0443331531fda2525fc4a714101968cb537 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 21 Jun 2011 09:32:50 +0100
Subject: [PATCH 1098/8469] Fixed some bugs, tests now also all pass on 2.7 and
 3.2.

--HG--
branch : distribute
extra : rebase_source : 25c6042a716c49e3576605c3cf4e2878d5b85c18
---
 setuptools/compat.py | 2 +-
 tests/api_tests.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 725818668b..7427c17fe7 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -6,7 +6,7 @@
     basestring = basestring
     import __builtin__ as builtins
     import ConfigParser
-    from cStringIO import StringIO
+    from StringIO import StringIO
     BytesIO = StringIO
     execfile = execfile
     func_code = lambda o: o.func_code
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index c2e63b24e9..65443e093d 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -219,7 +219,7 @@ distribution is added to a working set.  The callback is immediately invoked
 once for each existing distribution in the working set, and then is called
 again for new distributions added thereafter::
 
-    >>> def added(dist): print("Added", dist)
+    >>> def added(dist): print("Added %s" % dist)
     >>> ws.subscribe(added)
     Added Bar 0.9
     >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12") 

From 6e67978d8e96d4e60462389ec71bfd2d51ac9109 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 21 Jun 2011 13:16:40 +0100
Subject: [PATCH 1099/8469] Fixed execfile in compat.py.

--HG--
branch : distribute
extra : rebase_source : cf31870fee8b718e14e209d957905c8d7573beba
---
 setuptools/compat.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 7427c17fe7..c5d28be560 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -69,5 +69,10 @@ def exec_(code, globs=None, locs=None):
     from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
     xrange = range
 
-    def execfile(fn, globs, locs):
+    def execfile(fn, globs=None, locs=None):
+        if globs is None:
+            globs = globals()
+        if locs is None:
+            locs = globs
         exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+

From 32ba6930fa97bbeac9392cac3ed49aac87fd1018 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 21 Jun 2011 14:36:38 +0100
Subject: [PATCH 1100/8469] Fixed execfile in pkg_resources.

--HG--
branch : distribute
extra : rebase_source : 3148f97cc98edf62e982cb14b4b90527c4fc11fb
---
 pkg_resources.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index f64745cb6e..ae1f6c4d16 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -41,7 +41,11 @@ def exec_(code, globs=None, locs=None):
     basestring = str
     from io import StringIO
     exec_ = eval("exec")
-    def execfile(fn, globs, locs):
+    def execfile(fn, globs=None, locs=None):
+        if globs is None:
+            globs = globals()
+        if locs is None:
+            locs = globs
         exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
 # capture these to bypass sandboxing

From ac3ba239c54965e464e6047fd872f02ca1c0cb99 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 10 Oct 2012 09:39:21 +0100
Subject: [PATCH 1101/8469] Post-merge fixes for Python 3.

--HG--
branch : distribute
extra : source : 6b9041dea7b9197f6ea1fb993d7a05dd4f7c580d
---
 pkg_resources.py                      |  2 +-
 setuptools/command/easy_install.py    | 11 ++++++-----
 setuptools/compat.py                  |  7 +++++++
 setuptools/tests/test_bdist_egg.py    |  2 +-
 setuptools/tests/test_packageindex.py |  2 +-
 setuptools/tests/test_sdist.py        |  3 +--
 setuptools/tests/test_test.py         |  4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9f4c55bcd4..b63e3f0f26 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2518,7 +2518,7 @@ def _compute_dependencies(self):
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
             distvers, mark = self._preparse_requirement(req)
-            parsed = parse_requirements(distvers).next()
+            parsed = next(parse_requirements(distvers))
             parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
             
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 75d7b24b78..8ce71614fb 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -34,7 +34,8 @@
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
-from setuptools.compat import iteritems, maxsize, xrange, basestring, unicode
+from setuptools.compat import (iteritems, maxsize, xrange, basestring, unicode,
+                               reraise)
 from pkg_resources import yield_lines, normalize_path, resource_string, \
         ensure_directory, get_distribution, find_distributions, \
         Environment, Requirement, Distribution, \
@@ -1133,7 +1134,7 @@ def _set_fetcher_options(self, base):
             'site_dirs', 'allow_hosts',
         )
         fetch_options = {}
-        for key, val in ei_opts.iteritems():
+        for key, val in ei_opts.items():
             if key not in fetch_directives: continue
             fetch_options[key.replace('_', '-')] = val[1]
         # create a settings dictionary suitable for `edit_config`
@@ -1686,8 +1687,8 @@ def auto_chmod(func, arg, exc):
     if func is os.remove and os.name=='nt':
         chmod(arg, stat.S_IWRITE)
         return func(arg)
-    exc = sys.exc_info()
-    raise exc[0](exc[1][0], exc[1][1] + (" %s %s" % (func,arg)))
+    et, ev, _ = sys.exc_info()
+    reraise(et, (ev[0], ev[1] + (" %s %s" % (func,arg))))
 
 def uncache_zipdir(path):
     """Ensure that the importer caches dont have stale info for `path`"""
@@ -1888,7 +1889,7 @@ def onerror(*args):
         onerror(os.rmdir, path, sys.exc_info())
 
 def current_umask():
-    tmp = os.umask(022)
+    tmp = os.umask(0x12)    # 022
     os.umask(tmp)
     return tmp
 
diff --git a/setuptools/compat.py b/setuptools/compat.py
index c5d28be560..6d4ea539ef 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -41,6 +41,8 @@ def exec_(code, globs=None, locs=None):
             locs = globs
         exec("""exec code in globs, locs""")
 
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb""")
 else:
     PY3 = True
 
@@ -76,3 +78,8 @@ def execfile(fn, globs=None, locs=None):
             locs = globs
         exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 7da122cc31..1a12218645 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,9 +4,9 @@
 import os, re, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.bdist_egg import bdist_egg
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d9e5022438..b596d37fc5 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -3,7 +3,7 @@
 import sys
 import unittest
 import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError
+from setuptools.compat import urllib2, httplib, HTTPError, unicode
 import distutils.errors
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 7e2f0a498b..49007c3dc4 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -7,9 +7,8 @@
 import sys
 import tempfile
 import unittest
-from StringIO import StringIO
-
 
+from setuptools.compat import StringIO
 from setuptools.command.sdist import sdist
 from setuptools.dist import Distribution
 
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index ad7cbd0f96..e7022995dc 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -6,9 +6,9 @@
 import os, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.test import test
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -121,4 +121,4 @@ def test_test(self):
                 pass
         finally:
             sys.stdout = old_stdout
-            
\ No newline at end of file
+            

From 7cf9cd93c2fddb7f7f5fe6c1fcc140e9d6c93232 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 13:54:35 -0500
Subject: [PATCH 1102/8469] Minor fix previously fixed in a merge

--HG--
branch : distribute
---
 setuptools/compat.py       | 2 ++
 setuptools/tests/server.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 6d4ea539ef..27d472b55b 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -16,6 +16,7 @@
     import httplib
     from BaseHTTPServer import HTTPServer
     from SimpleHTTPServer import SimpleHTTPRequestHandler
+    from BaseHTTPServer import BaseHTTPRequestHandler
     iteritems = lambda o: o.iteritems()
     long_type = long
     maxsize = sys.maxint
@@ -57,6 +58,7 @@ def exec_(code, globs=None, locs=None):
     from html.entities import name2codepoint
     import http.client as httplib
     from http.server import HTTPServer, SimpleHTTPRequestHandler
+    from http.server import BaseHTTPRequestHandler
     iteritems = lambda o: o.items()
     long_type = int
     maxsize = sys.maxsize
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index c734334077..0e7407bb0d 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -3,7 +3,7 @@
 import sys
 import time
 import threading
-import BaseHTTPServer
+from setuptools.compat import BaseHTTPRequestHandler
 from setuptools.compat import (urllib2, URLError, HTTPServer,
                                SimpleHTTPRequestHandler)
 
@@ -56,7 +56,7 @@ def base_url(self):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
-class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+class RequestRecorder(BaseHTTPRequestHandler):
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)

From e3f7235a944f5758780de74aac548e27a09e39a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 13:55:16 -0500
Subject: [PATCH 1103/8469] Updated win_script_wrapper to run on Python 2 and
 Python 3

--HG--
branch : distribute
---
 setuptools/tests/win_script_wrapper.txt | 77 +++++++++++++++----------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 2e1bff7434..1fe47bc56c 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -16,16 +16,18 @@ Let's create a simple script, foo-script.py:
     >>> import os, sys, tempfile
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
+    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
+    >>> bytes = f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+    >>> f.close()
 
 Note that the script starts with a Unix-style '#!' line saying which
 Python executable to run.  The wrapper will use this to find the
@@ -34,9 +36,11 @@ correct Python executable.
 We'll also copy cli.exe to the sample-directory with the name foo.exe:
 
     >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'foo.exe'), 'wb').write(
+    >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
+    >>> bytes = f.write(
     ...     pkg_resources.resource_string('setuptools', 'cli.exe')
     ...     )
+    >>> f.close()
 
 When the copy of cli.exe, foo.exe in this example, runs, it examines
 the path name it was run with and computes a Python script path name
@@ -45,12 +49,12 @@ GUI programs, the suffix '-script-pyw' is added.)  This is why we
 named out script the way we did.  Now we can run out script by running
 the wrapper:
 
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))
-    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
-    >>> input.write('hello\nworld\n')
-    >>> input.close()
-    >>> print output.read(),
+    >>> import subprocess
+    >>> cmd = [os.path.join(sample_directory, 'foo.exe'), 'arg1', 'arg 2',
+    ...     'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
+    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+    >>> stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
+    >>> bytes = sys.stdout.write(stdout.decode('ascii').replace('\r\n', '\n'))
     \foo-script.py
     ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
     'hello\nworld\n'
@@ -77,21 +81,23 @@ to start the interactive interpreter.  You can combine multiple
 options as usual. For example, to run in optimized mode and
 enter the interpreter after running the script, you could use -Oi:
 
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
-    ... """#!%(python_exe)s  -Oi  
+    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
+    >>> bytes = f.write(
+    ... """#!%(python_exe)s  -Oi
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... sys.ps1 = '---'
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-
-    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
-    >>> input.close()
-    >>> print output.read(),
+    >>> f.close()
+    >>> cmd = [os.path.join(sample_directory, 'foo.exe')]
+    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+    >>> stdout, stderr = proc.communicate()
+    >>> bytes = sys.stdout.write(stdout.decode('ascii').replace('\r\n', '\n'))
     \foo-script.py
     []
     ''
@@ -105,29 +111,38 @@ Now let's test the GUI version with the simple scipt, bar-script.py:
     >>> import os, sys, tempfile
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'bar-script.pyw'), 'w').write(
+    >>> f = open(os.path.join(sample_directory, 'bar-script.pyw'), 'w')
+    >>> bytes = f.write(
     ... """#!%(python_exe)s
     ... import sys
-    ... open(sys.argv[1], 'wb').write(repr(sys.argv[2]))
+    ... open(sys.argv[1], 'wb').write(repr(sys.argv[2]).encode('ascii'))
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+    >>> f.close()
 
 We'll also copy gui.exe to the sample-directory with the name bar.exe:
 
     >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'bar.exe'), 'wb').write(
+    >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
+    >>> bytes = f.write(
     ...     pkg_resources.resource_string('setuptools', 'gui.exe')
     ...     )
+    >>> f.close()
 
 Finally, we'll run the script and check the result:
 
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
-    ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
-    >>> input.close()
-    >>> print output.read()
+    >>> cmd = [
+    ...     os.path.join(sample_directory, 'bar.exe'),
+    ...     os.path.join(sample_directory, 'test_output.txt'),
+    ...     'Test Argument',
+    ... ]
+    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+    >>> stdout, stderr = proc.communicate()
+    >>> print(stdout.decode('ascii'))
     <BLANKLINE>
-    >>> print open(os.path.join(sample_directory, 'test_output.txt'), 'rb').read()
+    >>> f_out = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
+    >>> print(f_out.read().decode('ascii'))
     'Test Argument'
+    >>> f_out.close()
 
 
 We're done with the sample_directory:

From 94fc39cb62df19e85b07658f2fa5d0b4a7bf9303 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 10 Oct 2012 10:49:54 +0100
Subject: [PATCH 1104/8469] Fixed some resource leaks.

--HG--
branch : distribute
extra : source : 98c929e25fee11a99eb125dd9a13521321d68dd3
---
 setuptools/compat.py                  |  8 +++--
 setuptools/tests/server.py            |  1 +
 setuptools/tests/test_develop.py      | 17 +++++++----
 setuptools/tests/test_dist_info.py    | 43 ++++++++++++++++-----------
 setuptools/tests/test_easy_install.py |  2 +-
 5 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 27d472b55b..05417c6e32 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -78,10 +78,14 @@ def execfile(fn, globs=None, locs=None):
             globs = globals()
         if locs is None:
             locs = globs
-        exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+        f = open(fn)
+        try:
+            source = f.read()
+        finally:
+            f.close()
+        exec_(compile(source, fn, 'exec'), globs, locs)
 
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
             raise value.with_traceback(tb)
         raise value
-
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 0e7407bb0d..ae2381e355 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -51,6 +51,7 @@ def stop(self):
             # ignore any errors; all that's important is the request
             pass
         self.thread.join()
+        self.socket.close()
 
     def base_url(self):
         port = self.server_port
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ecd2212d11..0813959d3e 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -43,7 +43,7 @@ def setUp(self):
         f = open(init, 'w')
         f.write(INIT_PY)
         f.close()
-        
+
         os.chdir(self.dir)
         self.old_base = site.USER_BASE
         site.USER_BASE = tempfile.mkdtemp()
@@ -53,7 +53,7 @@ def setUp(self):
     def tearDown(self):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
-        
+
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         shutil.rmtree(site.USER_BASE)
@@ -89,8 +89,16 @@ def test_develop(self):
         self.assertEqual(content, ['easy-install.pth', 'foo.egg-link'])
 
         # Check that we are using the right code.
-        path = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt').read().split()[0].strip()
-        init = open(os.path.join(path, 'foo', '__init__.py'), 'rt').read().strip()
+        f = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt')
+        try:
+            path = f.read().split()[0].strip()
+        finally:
+            f.close()
+        f = open(os.path.join(path, 'foo', '__init__.py'), 'rt')
+        try:
+            init = f.read().strip()
+        finally:
+            f.close()
         if sys.version < "3":
             self.assertEqual(init, 'print "foo"')
         else:
@@ -112,4 +120,3 @@ def notest_develop_with_setup_requires(self):
                     pass
         finally:
             os.chdir(old_dir)
-
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 623ccc471a..93ab8816d3 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -50,27 +50,34 @@ def setUp(self):
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
-        open(os.path.join(versioned, 'METADATA'), 'w+').write(DALS(
-            """
-            Metadata-Version: 1.2
-            Name: VersionedDistribution
-            Requires-Dist: splort (4)
-            Provides-Extra: baz
-            Requires-Dist: quux (>=1.1); extra == 'baz'
-            """))
-
+        f = open(os.path.join(versioned, 'METADATA'), 'w+')
+        try:
+            f.write(DALS(
+                """
+                Metadata-Version: 1.2
+                Name: VersionedDistribution
+                Requires-Dist: splort (4)
+                Provides-Extra: baz
+                Requires-Dist: quux (>=1.1); extra == 'baz'
+                """))
+        finally:
+            f.close()
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
-        open(os.path.join(unversioned, 'METADATA'), 'w+').write(DALS(
-            """
-            Metadata-Version: 1.2
-            Name: UnversionedDistribution
-            Version: 0.3
-            Requires-Dist: splort (==4)
-            Provides-Extra: baz
-            Requires-Dist: quux (>=1.1); extra == 'baz'
-            """))
+        f = open(os.path.join(unversioned, 'METADATA'), 'w+')
+        try:
+            f.write(DALS(
+                """
+                Metadata-Version: 1.2
+                Name: UnversionedDistribution
+                Version: 0.3
+                Requires-Dist: splort (==4)
+                Provides-Extra: baz
+                Requires-Dist: quux (>=1.1); extra == 'baz'
+                """))
+        finally:
+            f.close()
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aab4b6179e..34faeaad52 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -233,7 +233,7 @@ def test_local_index(self):
         f = open(egg_file, 'w')
         try:
             f.write('Name: foo\n')
-        except:
+        finally:
             f.close()
 
         sys.path.append(target)

From cc6f2911a225cd23b8fd0af4daad92131ee823ba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 15:01:03 +0100
Subject: [PATCH 1105/8469] In merge branch, a late version of distribute

--HG--
branch : Setuptools-Distribute merge

From 4a2bb4b699ab4e37663a216501b1ff1f6bef0ccd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Mar 2013 11:32:56 -0500
Subject: [PATCH 1106/8469] Restore the project name and URL to pypi

--HG--
branch : Setuptools-Distribute merge
extra : source : 2e7a227d01bff8b6bdd865d2c9f14ff91eb910ef
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 607954d03a..771cb74a4b 100755
--- a/setup.py
+++ b/setup.py
@@ -157,7 +157,7 @@ def _linkified(rst_path):
 readme_file.close()
 
 dist = setup(
-    name="distribute",
+    name="setuptools",
     version=VERSION,
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
@@ -166,7 +166,7 @@ def _linkified(rst_path):
     license="PSF or ZPL",
     long_description = long_description,
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://packages.python.org/distribute",
+    url = "http://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),

From a0a725d980140be92866bd7c27f01d99b16f7979 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 1 Mar 2013 12:04:30 -0500
Subject: [PATCH 1107/8469] Fix broken documentation on pre/post versions

--HG--
branch : setuptools-0.6
extra : source : 86385567abb93fb56c7b67b39a703ba4728b87b8
---
 setuptools.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools.txt b/setuptools.txt
index c709a9081c..eee3052557 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -217,11 +217,7 @@ For the most part, setuptools' interpretation of version numbers is intuitive,
 but here are a few tips that will keep you out of trouble in the corner cases:
 
 * Don't use ``-`` or any other character than ``.`` as a separator, unless you
-  really want a post-release.  Remember that ``2.1-rc2`` means you've
-  *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates
-  you're putting out *before* ``2.1``.  If you accidentally distribute copies
-  of a post-release that you meant to be a pre-release, the only safe fix is to
-  bump your main release number (e.g. to ``2.1.1``) and re-release the project.
+  really want a post-release.
 
 * Don't stick adjoining pre-release tags together without a dot or number
   between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
@@ -239,7 +235,7 @@ but here are a few tips that will keep you out of trouble in the corner cases:
     >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
     True
     >>> parse_version('2.1-rc2') < parse_version('2.1')
-    False
+    True
     >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
     True
 

From 7b80ff95a04569e39da9ae0fb33f0b90988e22dc Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 1 Mar 2013 12:18:34 -0500
Subject: [PATCH 1108/8469] Add doc fix to change log

--HG--
branch : setuptools-0.6
---
 setuptools.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools.txt b/setuptools.txt
index eee3052557..177f35190a 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2628,6 +2628,10 @@ XXX
 Release Notes/Change History
 ----------------------------
 
+0.6c12
+ * Fix documentation describing incorrect pre/post release version comparison
+   logic.
+ 
 0.6c11
  * Fix "bdist_wininst upload" trying to upload same file twice
 

From 890c8b348838b24d9eaa1725dcf858021f54d88d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Mar 2013 12:20:57 -0500
Subject: [PATCH 1109/8469] Updated documentation to reflect merged target
 name, only keeping legacy references to Distribute.

--HG--
branch : Setuptools-Distribute merge
extra : source : 7c68dd2a22cf2dc0ad77f1cca857736586aa5753
---
 docs/_templates/indexsidebar.html |  8 +--
 docs/conf.py                      | 14 ++---
 docs/easy_install.txt             | 12 +++--
 docs/index.txt                    | 32 ++++-------
 docs/python3.txt                  | 31 ++++++-----
 docs/roadmap.txt                  | 88 +++----------------------------
 docs/setuptools.txt               |  6 +--
 docs/using.txt                    | 19 ++-----
 8 files changed, 60 insertions(+), 150 deletions(-)

diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 932909f3e1..9d49ae5dc2 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -1,8 +1,8 @@
-<h3>Download</h3> 
+<h3>Download</h3>
 
-<p>Current version: <b>{{ version }}</b></p> 
-<p>Get Distribute from the <a href="http://pypi.python.org/pypi/distribute"> Python Package Index</a>
+<p>Current version: <b>{{ version }}</b></p>
+<p>Get Setuptools from the <a href="http://pypi.python.org/pypi/setuptools"> Python Package Index</a>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="http://bitbucket.org/tarek/distribute">Distribute project page</a> </p>
+<p>Visit the <a href="http://bitbucket.org/jaraco/setuptools">Setuptools project page</a> </p>
diff --git a/docs/conf.py b/docs/conf.py
index 586e3fe6ad..4f878f642d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Distribute documentation build configuration file, created by
+# Setuptools documentation build configuration file, created by
 # sphinx-quickstart on Fri Jul 17 14:22:37 2009.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Distribute'
-copyright = u'2009-2011, The fellowship of the packaging'
+project = u'Setuptools'
+copyright = u'2009-2013, The fellowship of the packaging'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -106,10 +106,10 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "Distribute documentation"
+html_title = "Setuptools documentation"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = "Distribute"
+html_short_title = "Setuptools"
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -161,7 +161,7 @@
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Distributedoc'
+htmlhelp_basename = 'Setuptoolsdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -175,7 +175,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Distribute.tex', ur'Distribute Documentation',
+  ('index', 'Setuptools.tex', ur'Setuptools Documentation',
    ur'The fellowship of the packaging', 'manual'),
 ]
 
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 9b4fcfbb6e..dac0fa8fcb 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -94,7 +94,7 @@ directory, you can also retarget the installation location for scripts so they
 go on a directory that's already on the ``PATH``.  For more information see the
 sections below on `Command-Line Options`_ and `Configuration Files`_.  You
 can pass command line options (such as ``--script-dir``) to
-``distribute_setup.py`` to control where ``easy_install.exe`` will be installed.
+``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
 
 
 
@@ -776,10 +776,12 @@ Command-Line Options
     package not being available locally, or due to the use of the ``--update``
     or ``-U`` option.
 
-``--no-find-links`` Blocks the addition of any link. (New in Distribute 0.6.11)
-    This is useful if you want to avoid adding links defined in a project
-    easy_install is installing (wether it's a requested project or a
-    dependency.). When used, ``--find-links`` is ignored.
+``--no-find-links`` Blocks the addition of any link.
+    This parameter is useful if you want to avoid adding links defined in a
+    project easy_install is installing (whether it's a requested project or a
+    dependency). When used, ``--find-links`` is ignored.
+
+    Added in Distribute 0.6.11 and Setuptools 0.7.
 
 ``--delete-conflicting, -D`` (Removed in 0.6a11)
     (As of 0.6a11, this option is no longer necessary; please do not use it!)
diff --git a/docs/index.txt b/docs/index.txt
index 5f3b945b20..21442b93b5 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,16 +1,15 @@
-Welcome to Distribute's documentation!
-======================================
+Welcome to Setuptools' documentation!
+=====================================
 
-`Distribute` is a fork of the `Setuptools` project.
+Setuptools is a fully-featured, actively-maintained, and stable library
+designed to facilitate packaging Python projects, where packaging includes:
 
-Distribute is intended to replace Setuptools as the standard method for
-working with Python module distributions.
-
-For those who may wonder why they should switch to Distribute over Setuptools, it’s quite simple:
-
-- Distribute is a drop-in replacement for Setuptools
-- The code is actively maintained, and has over 10 commiters
-- Distribute offers Python 3 support !
+ - Python package and module definitions
+ - Distribution package metadata
+ - Test hooks
+ - Project installation
+ - Platform-specific details
+ - Python 3 support
 
 Documentation content:
 
@@ -23,14 +22,3 @@ Documentation content:
    setuptools
    easy_install
    pkg_resources
-
-
-.. image:: http://python-distribute.org/pip_distribute.png
-
-Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0
-
-Copy & paste::
-
- curl -O http://python-distribute.org/distribute_setup.py
- python distribute_setup.py
- easy_install pip
\ No newline at end of file
diff --git a/docs/python3.txt b/docs/python3.txt
index 2f6cde4ab3..1e019951c4 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -1,18 +1,19 @@
 =====================================================
-Supporting both Python 2 and Python 3 with Distribute
+Supporting both Python 2 and Python 3 with Setuptools
 =====================================================
 
-Starting with version 0.6.2, Distribute supports Python 3. Installing and
-using distribute for Python 3 code works exactly the same as for Python 2
-code, but Distribute also helps you to support Python 2 and Python 3 from
+Starting with Distribute version 0.6.2 and Setuptools 0.7, the Setuptools
+project supported Python 3. Installing and
+using setuptools for Python 3 code works exactly the same as for Python 2
+code, but Setuptools also helps you to support Python 2 and Python 3 from
 the same source code by letting you run 2to3 on the code as a part of the
 build process, by setting the keyword parameter ``use_2to3`` to True.
 
 
-Distribute as help during porting
+Setuptools as help during porting
 =================================
 
-Distribute can make the porting process much easier by automatically running
+Setuptools can make the porting process much easier by automatically running
 2to3 as a part of the test running. To do this you need to configure the
 setup.py so that you can run the unit tests with ``python setup.py test``.
 
@@ -24,10 +25,10 @@ The test command will now first run the build command during which the code
 will be converted with 2to3, and the tests will then be run from the build
 directory, as opposed from the source directory as is normally done.
 
-Distribute will convert all Python files, and also all doctests in Python
+Setuptools will convert all Python files, and also all doctests in Python
 files. However, if you have doctests located in separate text files, these
 will not automatically be converted. By adding them to the
-``convert_2to3_doctests`` keyword parameter Distrubute will convert them as
+``convert_2to3_doctests`` keyword parameter Setuptools will convert them as
 well.
 
 By default, the conversion uses all fixers in the ``lib2to3.fixers`` package.
@@ -86,12 +87,14 @@ Advanced features
 If you don't want to run the 2to3 conversion on the doctests in Python files,
 you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.
 
-Note on compatibility with setuptools
-=====================================
+Note on compatibility with older versions of setuptools
+=======================================================
 
-Setuptools do not know about the new keyword parameters to support Python 3.
+Setuptools earlier than 0.7 does not know about the new keyword parameters to
+support Python 3.
 As a result it will warn about the unknown keyword parameters if you use
-setuptools instead of Distribute under Python 2. This is not an error, and
+those versions of setuptools instead of Distribute under Python 2. This output
+is not an error, and
 install process will continue as normal, but if you want to get rid of that
 error this is easy. Simply conditionally add the new parameters into an extra
 dict and pass that dict into setup()::
@@ -117,5 +120,5 @@ dict and pass that dict into setup()::
         **extra
     )
 
-This way the parameters will only be used under Python 3, where you have to
-use Distribute.
+This way the parameters will only be used under Python 3, where Distribute or
+Setuptools 0.7 or later is required.
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index ea5070eaaf..44bcdb0ff8 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -2,85 +2,13 @@
 Roadmap
 =======
 
-Distribute has two branches:
+Setuptools has merged with Distribute and to provide a unified codebase for
+ongoing development.
 
-- 0.6.x : provides a Setuptools-0.6cX compatible version
-- 0.7.x : will provide a refactoring
-
-0.6.x
-=====
-
-Not "much" is going to happen here, we want this branch to be helpful
-to the community *today* by addressing the 40-or-so bugs
-that were found in Setuptools and never fixed. This is eventually
-happen soon because its development is
-fast : there are up to 5 commiters that are working on it very often
-(and the number grows weekly.)
-
-The biggest issue with this branch is that it is providing the same
-packages and modules setuptools does, and this
-requires some bootstrapping work where we make sure once Distribute is
-installed, all Distribution that requires Setuptools
-will continue to work. This is done by faking the metadata of
-Setuptools 0.6c9. That's the only way we found to do this.
-
-There's one major thing though: thanks to the work of Lennart, Alex,
-Martin, this branch supports Python 3,
-which is great to have to speed up Py3 adoption.
-
-The goal of the 0.6.x is to remove as much bugs as we can, and try if
-possible to remove the patches done
-on Distutils. We will support 0.6.x maintenance for years and we will
-promote its usage everywhere instead of
-Setuptools.
-
-Some new commands are added there, when they are helpful and don't
-interact with the rest. I am thinking
-about "upload_docs" that let you upload documentation to PyPI. The
-goal is to move it to Distutils
-at some point, if the documentation feature of PyPI stays and starts to be used.
-
-0.7.x
-=====
-
-We've started to refactor Distribute with this roadmap in mind (and
-no, as someone said, it's not vaporware,
-we've done a lot already)
-
-- 0.7.x can be installed and used with 0.6.x
-
-- easy_install is going to be deprecated ! use Pip !
-
-- the version system will be deprecated, in favor of the one in Distutils
-
-- no more Distutils monkey-patch that happens once you use the code
-  (things like 'from distutils import cmd; cmd.Command = CustomCommand')
-
-- no more custom site.py (that is: if something misses in Python's
-  site.py we'll add it there instead of patching it)
-
-- no more namespaced packages system, if PEP 382 (namespaces package
-  support) makes it to 2.7
-
-- The code is splitted in many packages and might be distributed under
-  several distributions.
-
- - distribute.resources: that's the old pkg_resources, but
-   reorganized in clean, pep-8 modules. This package will
-   only contain the query APIs and will focus on being PEP 376
-   compatible. We will promote its usage and see if Pip wants
-   to use it as a basis.
-   It will probably shrink a lot though, once the stdlib provides PEP 376 support.
-
- - distribute.entrypoints: that's the old pkg_resources entry points
-   system, but on its own. it uses distribute.resources
-
- - distribute.index: that's package_index and a few other things.
-   everything required to interact with PyPI. We will promote
-   its usage and see if Pip wants to use it as a basis.
-
- - distribute.core (might be renamed to main): that's everything
-   else, and uses the other packages.
-
-Goal: A first release before (or when) Python 2.7 / 3.2 is out.
+This new effort will draw from the resources of both projects to leverage
+community contribution for ongoing advancement but also maintain stability
+for the user base.
 
+An initial release of Setuptools 0.7 will attempt to be compatible both with
+Setuptools 0.6c11 and Distribute 0.6.36. Where compatibility cannot be
+achieved, the changes should be well-documented.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index fe8bb3f615..2504dcda17 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1,8 +1,8 @@
 ==================================================
-Building and Distributing Packages with Distribute
+Building and Distributing Packages with Setuptools
 ==================================================
 
-``Distribute`` is a collection of enhancements to the Python ``distutils``
+``Setuptools`` is a collection of enhancements to the Python ``distutils``
 (for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum
 of Python 2.4) that allow you to more easily build and distribute Python
 packages, especially ones that have dependencies on other packages.
@@ -15,7 +15,7 @@ including just a single `bootstrap module`_ (an 8K .py file), your package will
 automatically download and install ``setuptools`` if the user is building your
 package from source and doesn't have a suitable version already installed.
 
-.. _bootstrap module: http://nightly.ziade.org/distribute_setup.py
+.. _bootstrap module: http://bitbucket.org/jaraco/setuptools/downloads/ez_setup.py
 
 Feature Highlights:
 
diff --git a/docs/using.txt b/docs/using.txt
index 192f1dc234..6f93c3867c 100644
--- a/docs/using.txt
+++ b/docs/using.txt
@@ -1,21 +1,10 @@
 ================================
-Using Distribute in your project
+Using Setuptools in your project
 ================================
 
-To use Distribute in your project, the recommended way is to ship
-`distribute_setup.py` alongside your `setup.py` script and call 
+To use Setuptools in your project, the recommended way is to ship
+`ez_setup.py` alongside your `setup.py` script and call
 it at the very begining of `setup.py` like this::
 
-    from distribute_setup import use_setuptools
+    from ez_setup import use_setuptools
     use_setuptools()
-
-Another way is to add ``Distribute`` in the ``install_requires`` option::
-
-    from setuptools import setup
-
-    setup(...
-          install_requires=['distribute']
-    )
-
-
-XXX to be finished

From 70c61d89a8c7d548a42f843579ca540b39655ca9 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 1 Mar 2013 12:23:20 -0500
Subject: [PATCH 1110/8469] Default index URL to use SSL version of PyPI

--HG--
branch : setuptools-0.6
extra : source : b95868385a32c0103133105788c70850656662c6
---
 setuptools/command/easy_install.py | 2 +-
 setuptools/package_index.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 90f29320af..71794865b9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -156,7 +156,7 @@ def finalize_options(self):
                 else:
                     self.all_site_dirs.append(normalize_path(d))
         if not self.editable: self.check_site_dir()
-        self.index_url = self.index_url or "http://pypi.python.org/simple"
+        self.index_url = self.index_url or "https://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
             if path_item not in self.shadow_path:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9a9c5d62e7..1668e76547 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -149,7 +149,7 @@ def find_external_links(url, page):
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
-    def __init__(self, index_url="http://pypi.python.org/simple", hosts=('*',),
+    def __init__(self, index_url="https://pypi.python.org/simple", hosts=('*',),
         *args, **kw
     ):
         Environment.__init__(self,*args,**kw)

From 1e8086f7f574d170d946bb6cb21f56ef4064e008 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Mar 2013 12:24:24 -0500
Subject: [PATCH 1111/8469] Add original author of setuptools, PJ Eby, to
 CONTRIBUTORS

--HG--
branch : Setuptools-Distribute merge
extra : source : 9417b02804bcd1f1b316a68860faa3c19f88897c
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 22c90aba19..a5f050cd3a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -19,6 +19,7 @@ Contributors
 * Martin von Löwis
 * Noufal Ibrahim
 * Pete Hollobon
+* Philip J. Eby
 * Philip Jenvey
 * Reinout van Rees
 * Robert Myers

From 07f79506c315c983f6cbba7d67cb68f0f668af44 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 1 Mar 2013 12:26:46 -0500
Subject: [PATCH 1112/8469] Add SSL fix to change log

--HG--
branch : setuptools-0.6
---
 EasyInstall.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 753baf65ed..1e7c890945 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1217,7 +1217,9 @@ displayed MD5 info (broken onto two lines for readability)::
 Release Notes/Change History
 ============================
 
-0.6final
+0.6c12
+ * Default --index-URL to SSL version of PyPI
+
  * Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
    URLs (i.e., ones with a ``user:password@host``).
 

From fdd1a61ec9dc1b46c0d1486d3a5052f1ffe60d16 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Mar 2013 12:29:58 -0500
Subject: [PATCH 1113/8469] update devguide

--HG--
branch : Setuptools-Distribute merge
extra : source : 441c08cdeb3dc45ba0f34a98d3538db1c2f8532e
---
 DEVGUIDE.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index 8dcabfd1d7..db556480e7 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -2,11 +2,11 @@
 Quick notes for contributors
 ============================
 
-Distribute is using Mercurial.
+Setuptools is developed using the DVCS Mercurial.
 
 Grab the code at bitbucket::
 
-    $ hg clone https://bitbucket.org/tarek/distribute
+    $ hg clone https://bitbucket.org/jaraco/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
 bitbucket, commit the changes to your repository, and then make a pull request
@@ -14,8 +14,8 @@ on bitbucket. If you make some changes, don't forget to:
 
 - add a note in CHANGES.txt
 
-And remember that 0.6 (the only development line) is only bug fixes, and the
-APIs should be fully backward compatible with Setuptools.
+Please commit bug-fixes against the current maintenance branch and new
+features to the default branch.
 
 You can run the tests via::
 

From 192602a4ec9bd661a3561800e3c278bcc1f8c5f0 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 1 Mar 2013 14:05:34 -0500
Subject: [PATCH 1114/8469] Backport formats documentation from trunk

--HG--
branch : setuptools-0.6
---
 doc/formats.txt | 696 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 696 insertions(+)
 create mode 100644 doc/formats.txt

diff --git a/doc/formats.txt b/doc/formats.txt
new file mode 100644
index 0000000000..dbfc28129f
--- /dev/null
+++ b/doc/formats.txt
@@ -0,0 +1,696 @@
+=====================================
+The Internal Structure of Python Eggs
+=====================================
+
+STOP! This is not the first document you should read!
+
+This document assumes you have at least some passing familiarity with
+*using* setuptools, the ``pkg_resources`` module, and EasyInstall.  It
+does not attempt to explain basic concepts like inter-project
+dependencies, nor does it contain detailed lexical syntax for most
+file formats.  Neither does it explain concepts like "namespace
+packages" or "resources" in any detail, as all of these subjects are
+covered at length in the setuptools developer's guide and the
+``pkg_resources`` reference manual.
+
+Instead, this is **internal** documentation for how those concepts and
+features are *implemented* in concrete terms.  It is intended for people
+who are working on the setuptools code base, who want to be able to
+troubleshoot setuptools problems, want to write code that reads the file
+formats involved, or want to otherwise tinker with setuptools-generated
+files and directories.
+
+Note, however, that these are all internal implementation details and
+are therefore subject to change; stick to the published API if you don't
+want to be responsible for keeping your code from breaking when
+setuptools changes.  You have been warned.
+
+
+.. contents:: **Table of Contents**
+
+
+----------------------
+Eggs and their Formats
+----------------------
+
+A "Python egg" is a logical structure embodying the release of a
+specific version of a Python project, comprising its code, resources,
+and metadata. There are multiple formats that can be used to physically
+encode a Python egg, and others can be developed. However, a key
+principle of Python eggs is that they should be discoverable and
+importable. That is, it should be possible for a Python application to
+easily and efficiently find out what eggs are present on a system, and
+to ensure that the desired eggs' contents are importable.
+
+There are two basic formats currently implemented for Python eggs:
+
+1. ``.egg`` format: a directory or zipfile *containing* the project's
+   code and resources, along with an ``EGG-INFO`` subdirectory that
+   contains the project's metadata
+
+2. ``.egg-info`` format: a file or directory placed *adjacent* to the
+   project's code and resources, that directly contains the project's
+   metadata.
+
+Both formats can include arbitrary Python code and resources, including
+static data files, package and non-package directories, Python
+modules, C extension modules, and so on.  But each format is optimized
+for different purposes.
+
+The ``.egg`` format is well-suited to distribution and the easy
+uninstallation or upgrades of code, since the project is essentially
+self-contained within a single directory or file, unmingled with any
+other projects' code or resources.  It also makes it possible to have
+multiple versions of a project simultaneously installed, such that
+individual programs can select the versions they wish to use.
+
+The ``.egg-info`` format, on the other hand, was created to support
+backward-compatibility, performance, and ease of installation for system
+packaging tools that expect to install all projects' code and resources
+to a single directory (e.g. ``site-packages``).  Placing the metadata
+in that same directory simplifies the installation process, since it
+isn't necessary to create ``.pth`` files or otherwise modify
+``sys.path`` to include each installed egg.
+
+Its disadvantage, however, is that it provides no support for clean
+uninstallation or upgrades, and of course only a single version of a
+project can be installed to a given directory. Thus, support from a
+package management tool is required. (This is why setuptools' "install"
+command refers to this type of egg installation as "single-version,
+externally managed".)  Also, they lack sufficient data to allow them to
+be copied from their installation source.  easy_install can "ship" an
+application by copying ``.egg`` files or directories to a target
+location, but it cannot do this for ``.egg-info`` installs, because
+there is no way to tell what code and resources belong to a particular
+egg -- there may be several eggs "scrambled" together in a single
+installation location, and the ``.egg-info`` format does not currently
+include a way to list the files that were installed.  (This may change
+in a future version.)
+
+
+Code and Resources
+==================
+
+The layout of the code and resources is dictated by Python's normal
+import layout, relative to the egg's "base location".
+
+For the ``.egg`` format, the base location is the ``.egg`` itself. That
+is, adding the ``.egg`` filename or directory name to ``sys.path``
+makes its contents importable.
+
+For the ``.egg-info`` format, however, the base location is the
+directory that *contains* the ``.egg-info``, and thus it is the
+directory that must be added to ``sys.path`` to make the egg importable.
+(Note that this means that the "normal" installation of a package to a
+``sys.path`` directory is sufficient to make it an "egg" if it has an
+``.egg-info`` file or directory installed alongside of it.)
+
+
+Project Metadata
+=================
+
+If eggs contained only code and resources, there would of course be
+no difference between them and any other directory or zip file on
+``sys.path``.  Thus, metadata must also be included, using a metadata
+file or directory.
+
+For the ``.egg`` format, the metadata is placed in an ``EGG-INFO``
+subdirectory, directly within the ``.egg`` file or directory.  For the
+``.egg-info`` format, metadata is stored directly within the
+``.egg-info`` directory itself.
+
+The minimum project metadata that all eggs must have is a standard
+Python ``PKG-INFO`` file, named ``PKG-INFO`` and placed within the
+metadata directory appropriate to the format.  Because it's possible for
+this to be the only metadata file included, ``.egg-info`` format eggs
+are not required to be a directory; they can just be a ``.egg-info``
+file that directly contains the ``PKG-INFO`` metadata.  This eliminates
+the need to create a directory just to store one file.  This option is
+*not* available for ``.egg`` formats, since setuptools always includes
+other metadata.  (In fact, setuptools itself never generates
+``.egg-info`` files, either; the support for using files was added so
+that the requirement could easily be satisfied by other tools, such
+as the distutils in Python 2.5).
+
+In addition to the ``PKG-INFO`` file, an egg's metadata directory may
+also include files and directories representing various forms of
+optional standard metadata (see the section on `Standard Metadata`_,
+below) or user-defined metadata required by the project.  For example,
+some projects may define a metadata format to describe their application
+plugins, and metadata in this format would then be included by plugin
+creators in their projects' metadata directories.
+
+
+Filename-Embedded Metadata
+==========================
+
+To allow introspection of installed projects and runtime resolution of
+inter-project dependencies, a certain amount of information is embedded
+in egg filenames.  At a minimum, this includes the project name, and
+ideally will also include the project version number.  Optionally, it
+can also include the target Python version and required runtime
+platform if platform-specific C code is included.  The syntax of an
+egg filename is as follows::
+
+    name ["-" version ["-py" pyver ["-" required_platform]]] "." ext
+
+The "name" and "version" should be escaped using the ``to_filename()``
+function provided by ``pkg_resources``, after first processing them with
+``safe_name()`` and ``safe_version()`` respectively.  These latter two
+functions can also be used to later "unescape" these parts of the
+filename.  (For a detailed description of these transformations, please
+see the "Parsing Utilities" section of the ``pkg_resources`` manual.)
+
+The "pyver" string is the Python major version, as found in the first
+3 characters of ``sys.version``.  "required_platform" is essentially
+a distutils ``get_platform()`` string, but with enhancements to properly
+distinguish Mac OS versions.  (See the ``get_build_platform()``
+documentation in the "Platform Utilities" section of the
+``pkg_resources`` manual for more details.)
+
+Finally, the "ext" is either ``.egg`` or ``.egg-info``, as appropriate
+for the egg's format.
+
+Normally, an egg's filename should include at least the project name and
+version, as this allows the runtime system to find desired project
+versions without having to read the egg's PKG-INFO to determine its
+version number.
+
+Setuptools, however, only includes the version number in the filename
+when an ``.egg`` file is built using the ``bdist_egg`` command, or when
+an ``.egg-info`` directory is being installed by the
+``install_egg_info`` command. When generating metadata for use with the
+original source tree, it only includes the project name, so that the
+directory will not have to be renamed each time the project's version
+changes.
+
+This is especially important when version numbers change frequently, and
+the source metadata directory is kept under version control with the
+rest of the project.  (As would be the case when the project's source
+includes project-defined metadata that is not generated from by
+setuptools from data in the setup script.)
+
+
+Egg Links
+=========
+
+In addition to the ``.egg`` and ``.egg-info`` formats, there is a third
+egg-related extension that you may encounter on occasion: ``.egg-link``
+files.
+
+These files are not eggs, strictly speaking. They simply provide a way
+to reference an egg that is not physically installed in the desired
+location. They exist primarily as a cross-platform alternative to
+symbolic links, to support "installing" code that is being developed in
+a different location than the desired installation location. For
+example, if a user is developing an application plugin in their home
+directory, but the plugin needs to be "installed" in an application
+plugin directory, running "setup.py develop -md /path/to/app/plugins"
+will install an ``.egg-link`` file in ``/path/to/app/plugins``, that
+tells the egg runtime system where to find the actual egg (the user's
+project source directory and its ``.egg-info`` subdirectory).
+
+``.egg-link`` files are named following the format for ``.egg`` and
+``.egg-info`` names, but only the project name is included; no version,
+Python version, or platform information is included.  When the runtime
+searches for available eggs, ``.egg-link`` files are opened and the
+actual egg file/directory name is read from them.
+
+Each ``.egg-link`` file should contain a single file or directory name,
+with no newlines.  This filename should be the base location of one or
+more eggs.  That is, the name must either end in ``.egg``, or else it
+should be the parent directory of one or more ``.egg-info`` format eggs.
+
+As of setuptools 0.6c6, the path may be specified as a platform-independent
+(i.e. ``/``-separated) relative path from the directory containing the
+``.egg-link`` file, and a second line may appear in the file, specifying a
+platform-independent relative path from the egg's base directory to its
+setup script directory.  This allows installation tools such as EasyInstall
+to find the project's setup directory and build eggs or perform other setup
+commands on it.
+
+
+-----------------
+Standard Metadata
+-----------------
+
+In addition to the minimum required ``PKG-INFO`` metadata, projects can
+include a variety of standard metadata files or directories, as
+described below.  Except as otherwise noted, these files and directories
+are automatically generated by setuptools, based on information supplied
+in the setup script or through analysis of the project's code and
+resources.
+
+Most of these files and directories are generated via "egg-info
+writers" during execution of the setuptools ``egg_info`` command, and
+are listed in the ``egg_info.writers`` entry point group defined by
+setuptools' own ``setup.py`` file.
+
+Project authors can register their own metadata writers as entry points
+in this group (as described in the setuptools manual under "Adding new
+EGG-INFO Files") to cause setuptools to generate project-specific
+metadata files or directories during execution of the ``egg_info``
+command.  It is up to project authors to document these new metadata
+formats, if they create any.
+
+
+``.txt`` File Formats
+=====================
+
+Files described in this section that have ``.txt`` extensions have a
+simple lexical format consisting of a sequence of text lines, each line
+terminated by a linefeed character (regardless of platform).  Leading
+and trailing whitespace on each line is ignored, as are blank lines and
+lines whose first nonblank character is a ``#`` (comment symbol).  (This
+is the parsing format defined by the ``yield_lines()`` function of
+the ``pkg_resources`` module.)
+
+All ``.txt`` files defined by this section follow this format, but some
+are also "sectioned" files, meaning that their contents are divided into
+sections, using square-bracketed section headers akin to Windows
+``.ini`` format.  Note that this does *not* imply that the lines within
+the sections follow an ``.ini`` format, however.  Please see an
+individual metadata file's documentation for a description of what the
+lines and section names mean in that particular file.
+
+Sectioned files can be parsed using the ``split_sections()`` function;
+see the "Parsing Utilities" section of the ``pkg_resources`` manual for
+for details.
+
+
+Dependency Metadata
+===================
+
+
+``requires.txt``
+----------------
+
+This is a "sectioned" text file.  Each section is a sequence of
+"requirements", as parsed by the ``parse_requirements()`` function;
+please see the ``pkg_resources`` manual for the complete requirement
+parsing syntax.
+
+The first, unnamed section (i.e., before the first section header) in
+this file is the project's core requirements, which must be installed
+for the project to function.  (Specified using the ``install_requires``
+keyword to ``setup()``).
+
+The remaining (named) sections describe the project's "extra"
+requirements, as specified using the ``extras_require`` keyword to
+``setup()``.  The section name is the name of the optional feature, and
+the section body lists that feature's dependencies.
+
+Note that it is not normally necessary to inspect this file directly;
+``pkg_resources.Distribution`` objects have a ``requires()`` method
+that can be used to obtain ``Requirement`` objects describing the
+project's core and optional dependencies.
+
+
+
+``dependency_links.txt``
+------------------------
+
+A list of dependency URLs, one per line, as specified using the
+``dependency_links`` keyword to ``setup()``.  These may be direct
+download URLs, or the URLs of web pages containing direct download
+links, and will be used by EasyInstall to find dependencies, as though
+the user had manually provided them via the ``--find-links`` command
+line option.  Please see the setuptools manual and EasyInstall manual
+for more information on specifying this option, and for information on
+how EasyInstall processes ``--find-links`` URLs.
+
+
+``depends.txt`` -- Obsolete, do not create!
+-------------------------------------------
+
+This file follows an identical format to ``requires.txt``, but is
+obsolete and should not be used.  The earliest versions of setuptools
+required users to manually create and maintain this file, so the runtime
+still supports reading it, if it exists.  The new filename was created
+so that it could be automatically generated from ``setup()`` information
+without overwriting an existing hand-created ``depends.txt``, if one
+was already present in the project's source ``.egg-info`` directory.
+
+
+``namespace_packages.txt`` -- Namespace Package Metadata
+========================================================
+
+A list of namespace package names, one per line, as supplied to the
+``namespace_packages`` keyword to ``setup()``.  Please see the manuals
+for setuptools and ``pkg_resources`` for more information about
+namespace packages.
+
+
+``entry_points.txt`` -- "Entry Point"/Plugin Metadata
+=====================================================
+
+This is a "sectioned" text file, whose contents encode the
+``entry_points`` keyword supplied to ``setup()``.  All sections are
+named, as the section names specify the entry point groups in which the
+corresponding section's entry points are registered.
+
+Each section is a sequence of "entry point" lines, each parseable using
+the ``EntryPoint.parse`` classmethod; please see the ``pkg_resources``
+manual for the complete entry point parsing syntax.
+
+Note that it is not necessary to parse this file directly; the
+``pkg_resources`` module provides a variety of APIs to locate and load
+entry points automatically.  Please see the setuptools and
+``pkg_resources`` manuals for details on the nature and uses of entry
+points.
+
+
+The ``scripts`` Subdirectory
+============================
+
+This directory is currently only created for ``.egg`` files built by
+the setuptools ``bdist_egg`` command.  It will contain copies of all
+of the project's "traditional" scripts (i.e., those specified using the
+``scripts`` keyword to ``setup()``).  This is so that they can be
+reconstituted when an ``.egg`` file is installed.
+
+The scripts are placed here using the disutils' standard
+``install_scripts`` command, so any ``#!`` lines reflect the Python
+installation where the egg was built.  But instead of copying the
+scripts to the local script installation directory, EasyInstall writes
+short wrapper scripts that invoke the original scripts from inside the
+egg, after ensuring that sys.path includes the egg and any eggs it
+depends on.  For more about `script wrappers`_, see the section below on
+`Installation and Path Management Issues`_.
+
+
+Zip Support Metadata
+====================
+
+
+``native_libs.txt``
+-------------------
+
+A list of C extensions and other dynamic link libraries contained in
+the egg, one per line.  Paths are ``/``-separated and relative to the
+egg's base location.
+
+This file is generated as part of ``bdist_egg`` processing, and as such
+only appears in ``.egg`` files (and ``.egg`` directories created by
+unpacking them).  It is used to ensure that all libraries are extracted
+from a zipped egg at the same time, in case there is any direct linkage
+between them.  Please see the `Zip File Issues`_ section below for more
+information on library and resource extraction from ``.egg`` files.
+
+
+``eager_resources.txt``
+-----------------------
+
+A list of resource files and/or directories, one per line, as specified
+via the ``eager_resources`` keyword to ``setup()``.  Paths are
+``/``-separated and relative to the egg's base location.
+
+Resource files or directories listed here will be extracted
+simultaneously, if any of the named resources are extracted, or if any
+native libraries listed in ``native_libs.txt`` are extracted.  Please
+see the setuptools manual for details on what this feature is used for
+and how it works, as well as the `Zip File Issues`_ section below.
+
+
+``zip-safe`` and ``not-zip-safe``
+---------------------------------
+
+These are zero-length files, and either one or the other should exist.
+If ``zip-safe`` exists, it means that the project will work properly
+when installedas an ``.egg`` zipfile, and conversely the existence of
+``not-zip-safe`` means the project should not be installed as an
+``.egg`` file.  The ``zip_safe`` option to setuptools' ``setup()``
+determines which file will be written. If the option isn't provided,
+setuptools attempts to make its own assessment of whether the package
+can work, based on code and content analysis.
+
+If neither file is present at installation time, EasyInstall defaults
+to assuming that the project should be unzipped.  (Command-line options
+to EasyInstall, however, take precedence even over an existing
+``zip-safe`` or ``not-zip-safe`` file.)
+
+Note that these flag files appear only in ``.egg`` files generated by
+``bdist_egg``, and in ``.egg`` directories created by unpacking such an
+``.egg`` file.
+
+
+
+``top_level.txt`` -- Conflict Management Metadata
+=================================================
+
+This file is a list of the top-level module or package names provided
+by the project, one Python identifier per line.
+
+Subpackages are not included; a project containing both a ``foo.bar``
+and a ``foo.baz`` would include only one line, ``foo``, in its
+``top_level.txt``.
+
+This data is used by ``pkg_resources`` at runtime to issue a warning if
+an egg is added to ``sys.path`` when its contained packages may have
+already been imported.
+
+(It was also once used to detect conflicts with non-egg packages at
+installation time, but in more recent versions, setuptools installs eggs
+in such a way that they always override non-egg packages, thus
+preventing a problem from arising.)
+
+
+``SOURCES.txt`` -- Source Files Manifest
+========================================
+
+This file is roughly equivalent to the distutils' ``MANIFEST`` file.
+The differences are as follows:
+
+* The filenames always use ``/`` as a path separator, which must be
+  converted back to a platform-specific path whenever they are read.
+
+* The file is automatically generated by setuptools whenever the
+  ``egg_info`` or ``sdist`` commands are run, and it is *not*
+  user-editable.
+
+Although this metadata is included with distributed eggs, it is not
+actually used at runtime for any purpose.  Its function is to ensure
+that setuptools-built *source* distributions can correctly discover
+what files are part of the project's source, even if the list had been
+generated using revision control metadata on the original author's
+system.
+
+In other words, ``SOURCES.txt`` has little or no runtime value for being
+included in distributed eggs, and it is possible that future versions of
+the ``bdist_egg`` and ``install_egg_info`` commands will strip it before
+installation or distribution.  Therefore, do not rely on its being
+available outside of an original source directory or source
+distribution.
+
+
+------------------------------
+Other Technical Considerations
+------------------------------
+
+
+Zip File Issues
+===============
+
+Although zip files resemble directories, they are not fully
+substitutable for them.  Most platforms do not support loading dynamic
+link libraries contained in zipfiles, so it is not possible to directly
+import C extensions from ``.egg`` zipfiles.  Similarly, there are many
+existing libraries -- whether in Python or C -- that require actual
+operating system filenames, and do not work with arbitrary "file-like"
+objects or in-memory strings, and thus cannot operate directly on the
+contents of zip files.
+
+To address these issues, the ``pkg_resources`` module provides a
+"resource API" to support obtaining either the contents of a resource,
+or a true operating system filename for the resource.  If the egg
+containing the resource is a directory, the resource's real filename
+is simply returned.  However, if the egg is a zipfile, then the
+resource is first extracted to a cache directory, and the filename
+within the cache is returned.
+
+The cache directory is determined by the ``pkg_resources`` API; please
+see the ``set_cache_path()`` and ``get_default_cache()`` documentation
+for details.
+
+
+The Extraction Process
+----------------------
+
+Resources are extracted to a cache subdirectory whose name is based
+on the enclosing ``.egg`` filename and the path to the resource.  If
+there is already a file of the correct name, size, and timestamp, its
+filename is returned to the requester.  Otherwise, the desired file is
+extracted first to a temporary name generated using
+``mkstemp(".$extract",target_dir)``, and then its timestamp is set to
+match the one in the zip file, before renaming it to its final name.
+(Some collision detection and resolution code is used to handle the
+fact that Windows doesn't overwrite files when renaming.)
+
+If a resource directory is requested, all of its contents are
+recursively extracted in this fashion, to ensure that the directory
+name can be used as if it were valid all along.
+
+If the resource requested for extraction is listed in the
+``native_libs.txt`` or ``eager_resources.txt`` metadata files, then
+*all* resources listed in *either* file will be extracted before the
+requested resource's filename is returned, thus ensuring that all
+C extensions and data used by them will be simultaneously available.
+
+
+Extension Import Wrappers
+-------------------------
+
+Since Python's built-in zip import feature does not support loading
+C extension modules from zipfiles, the setuptools ``bdist_egg`` command
+generates special import wrappers to make it work.
+
+The wrappers are ``.py`` files (along with corresponding ``.pyc``
+and/or ``.pyo`` files) that have the same module name as the
+corresponding C extension.  These wrappers are located in the same
+package directory (or top-level directory) within the zipfile, so that
+say, ``foomodule.so`` will get a corresponding ``foo.py``, while
+``bar/baz.pyd`` will get a corresponding ``bar/baz.py``.
+
+These wrapper files contain a short stanza of Python code that asks
+``pkg_resources`` for the filename of the corresponding C extension,
+then reloads the module using the obtained filename.  This will cause
+``pkg_resources`` to first ensure that all of the egg's C extensions
+(and any accompanying "eager resources") are extracted to the cache
+before attempting to link to the C library.
+
+Note, by the way, that ``.egg`` directories will also contain these
+wrapper files.  However, Python's default import priority is such that
+C extensions take precedence over same-named Python modules, so the
+import wrappers are ignored unless the egg is a zipfile.
+
+
+Installation and Path Management Issues
+=======================================
+
+Python's initial setup of ``sys.path`` is very dependent on the Python
+version and installation platform, as well as how Python was started
+(i.e., script vs. ``-c`` vs. ``-m`` vs. interactive interpreter).
+In fact, Python also provides only two relatively robust ways to affect
+``sys.path`` outside of direct manipulation in code: the ``PYTHONPATH``
+environment variable, and ``.pth`` files.
+
+However, with no cross-platform way to safely and persistently change
+environment variables, this leaves ``.pth`` files as EasyInstall's only
+real option for persistent configuration of ``sys.path``.
+
+But ``.pth`` files are rather strictly limited in what they are allowed
+to do normally.  They add directories only to the *end* of ``sys.path``,
+after any locally-installed ``site-packages`` directory, and they are
+only processed *in* the ``site-packages`` directory to start with.
+
+This is a double whammy for users who lack write access to that
+directory, because they can't create a ``.pth`` file that Python will
+read, and even if a sympathetic system administrator adds one for them
+that calls ``site.addsitedir()`` to allow some other directory to
+contain ``.pth`` files, they won't be able to install newer versions of
+anything that's installed in the systemwide ``site-packages``, because
+their paths will still be added *after* ``site-packages``.
+
+So EasyInstall applies two workarounds to solve these problems.
+
+The first is that EasyInstall leverages ``.pth`` files' "import" feature
+to manipulate ``sys.path`` and ensure that anything EasyInstall adds
+to a ``.pth`` file will always appear before both the standard library
+and the local ``site-packages`` directories.  Thus, it is always
+possible for a user who can write a Python-read ``.pth`` file to ensure
+that their packages come first in their own environment.
+
+Second, when installing to a ``PYTHONPATH`` directory (as opposed to
+a "site" directory like ``site-packages``) EasyInstall will also install
+a special version of the ``site`` module.  Because it's in a
+``PYTHONPATH`` directory, this module will get control before the
+standard library version of ``site`` does.  It will record the state of
+``sys.path`` before invoking the "real" ``site`` module, and then
+afterwards it processes any ``.pth`` files found in ``PYTHONPATH``
+directories, including all the fixups needed to ensure that eggs always
+appear before the standard library in sys.path, but are in a relative
+order to one another that is defined by their ``PYTHONPATH`` and
+``.pth``-prescribed sequence.
+
+The net result of these changes is that ``sys.path`` order will be
+as follows at runtime:
+
+1. The ``sys.argv[0]`` directory, or an emtpy string if no script
+   is being executed.
+
+2. All eggs installed by EasyInstall in any ``.pth`` file in each
+   ``PYTHONPATH`` directory, in order first by ``PYTHONPATH`` order,
+   then normal ``.pth`` processing order (which is to say alphabetical
+   by ``.pth`` filename, then by the order of listing within each
+   ``.pth`` file).
+
+3. All eggs installed by EasyInstall in any ``.pth`` file in each "site"
+   directory (such as ``site-packages``), following the same ordering
+   rules as for the ones on ``PYTHONPATH``.
+
+4. The ``PYTHONPATH`` directories themselves, in their original order
+
+5. Any paths from ``.pth`` files found on ``PYTHONPATH`` that were *not*
+   eggs installed by EasyInstall, again following the same relative
+   ordering rules.
+
+6. The standard library and "site" directories, along with the contents
+   of any ``.pth`` files found in the "site" directories.
+
+Notice that sections 1, 4, and 6 comprise the "normal" Python setup for
+``sys.path``.  Sections 2 and 3 are inserted to support eggs, and
+section 5 emulates what the "normal" semantics of ``.pth`` files on
+``PYTHONPATH`` would be if Python natively supported them.
+
+For further discussion of the tradeoffs that went into this design, as
+well as notes on the actual magic inserted into ``.pth`` files to make
+them do these things, please see also the following messages to the
+distutils-SIG mailing list:
+
+* http://mail.python.org/pipermail/distutils-sig/2006-February/006026.html
+* http://mail.python.org/pipermail/distutils-sig/2006-March/006123.html
+
+
+Script Wrappers
+---------------
+
+EasyInstall never directly installs a project's original scripts to
+a script installation directory.  Instead, it writes short wrapper
+scripts that first ensure that the project's dependencies are active
+on sys.path, before invoking the original script.  These wrappers
+have a #! line that points to the version of Python that was used to
+install them, and their second line is always a comment that indicates
+the type of script wrapper, the project version required for the script
+to run, and information identifying the script to be invoked.
+
+The format of this marker line is::
+
+    "# EASY-INSTALL-" script_type ": " tuple_of_strings "\n"
+
+The ``script_type`` is one of ``SCRIPT``, ``DEV-SCRIPT``, or
+``ENTRY-SCRIPT``.  The ``tuple_of_strings`` is a comma-separated
+sequence of Python string constants.  For ``SCRIPT`` and ``DEV-SCRIPT``
+wrappers, there are two strings: the project version requirement, and
+the script name (as a filename within the ``scripts`` metadata
+directory).  For ``ENTRY-SCRIPT`` wrappers, there are three:
+the project version requirement, the entry point group name, and the
+entry point name.  (See the "Automatic Script Creation" section in the
+setuptools manual for more information about entry point scripts.)
+
+In each case, the project version requirement string will be a string
+parseable with the ``pkg_resources`` modules' ``Requirement.parse()``
+classmethod.  The only difference between a ``SCRIPT`` wrapper and a
+``DEV-SCRIPT`` is that a ``DEV-SCRIPT`` actually executes the original
+source script in the project's source tree, and is created when the
+"setup.py develop" command is run.  A ``SCRIPT`` wrapper, on the other
+hand, uses the "installed" script written to the ``EGG-INFO/scripts``
+subdirectory of the corresponding ``.egg`` zipfile or directory.
+(``.egg-info`` eggs do not have script wrappers associated with them,
+except in the "setup.py develop" case.)
+
+The purpose of including the marker line in generated script wrappers is
+to facilitate introspection of installed scripts, and their relationship
+to installed eggs.  For example, an uninstallation tool could use this
+data to identify what scripts can safely be removed, and/or identify
+what scripts would stop working if a particular egg is uninstalled.
+

From ceee7fff6e3eaf606a2b88888febf45ac0eb9ed7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 12:28:49 -0500
Subject: [PATCH 1115/8469] Remove special Distribute handling from
 pkg_resources module

--HG--
branch : Setuptools-Distribute merge
extra : source : 57da23339d58d215d98d8877a0e13103f4a8c9b9
---
 pkg_resources.py | 64 ++++--------------------------------------------
 1 file changed, 5 insertions(+), 59 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 69601480d3..49f71c232b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -39,15 +39,6 @@
 else:
     importlib_bootstrap = None
 
-# This marker is used to simplify the process that checks is the
-# setuptools package was installed by the Setuptools project
-# or by the Distribute project, in case Setuptools creates
-# a distribution with the same version.
-#
-# The bootstrapping script for instance, will check if this
-# attribute is present to decide wether to reinstall the package
-_distribute = True
-
 def _bypass_ensure_directory(name, mode=0777):
     # Sandbox-bypassing version of ensure_directory()
     if not WRITE_SUPPORT:
@@ -551,7 +542,7 @@ def add(self, dist, entry=None, insert=True):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None, replacement=True):
+    def resolve(self, requirements, env=None, installer=None):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -570,9 +561,6 @@ def resolve(self, requirements, env=None, installer=None, replacement=True):
 
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
-            if _override_setuptools(req) and replacement:
-                req = Requirement.parse('distribute')
-
             if req in processed:
                 # Ignore cyclic or redundant dependencies
                 continue
@@ -2346,17 +2334,6 @@ def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
         loc = loc or self.location
-
-        if self.project_name == 'setuptools':
-            try:
-                version = self.version
-            except ValueError:
-                version = ''
-            if '0.7' in version:
-                raise ValueError(
-                    "A 0.7-series setuptools cannot be installed "
-                    "with distribute. Found one at %s" % str(self.location))
-
         if not loc:
             return
 
@@ -2395,7 +2372,7 @@ def insert_on(self, path, loc = None):
 
 
     def check_version_conflict(self):
-        if self.key=='distribute':
+        if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(
 
         nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
@@ -2676,22 +2653,11 @@ def __hash__(self):
     def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
     #@staticmethod
-    def parse(s, replacement=True):
+    def parse(s):
         reqs = list(parse_requirements(s))
         if reqs:
-            if len(reqs) == 1:
-                founded_req = reqs[0]
-                # if asked for setuptools distribution
-                # and if distribute is installed, we want to give
-                # distribute instead
-                if _override_setuptools(founded_req) and replacement:
-                    distribute = list(parse_requirements('distribute'))
-                    if len(distribute) == 1:
-                        return distribute[0]
-                    return founded_req
-                else:
-                    return founded_req
-
+            if len(reqs)==1:
+                return reqs[0]
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
 
@@ -2708,26 +2674,6 @@ def parse(s, replacement=True):
 }
 
 
-def _override_setuptools(req):
-    """Return True when distribute wants to override a setuptools dependency.
-
-    We want to override when the requirement is setuptools and the version is
-    a variant of 0.6.
-
-    """
-    if req.project_name == 'setuptools':
-        if not len(req.specs):
-            # Just setuptools: ok
-            return True
-        for comparator, version in req.specs:
-            if comparator in ['==', '>=', '>']:
-                if '0.7' in version:
-                    # We want some setuptools not from the 0.6 series.
-                    return False
-        return True
-    return False
-
-
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
     if not isinstance(cls,type):

From d59170df908bc3eed9783181906a74b577fbfc5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 12:42:41 -0500
Subject: [PATCH 1116/8469] Back out distribute-specific references in
 easy_install command module

--HG--
branch : Setuptools-Distribute merge
extra : source : 474b4e90c3c64ac0f8194dd68666bb137fd57988
---
 setuptools/command/easy_install.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0d72f75843..8d44817f77 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -7,7 +7,7 @@
 packages.  For detailed documentation, see the accompanying EasyInstall.txt
 file, or visit the `EasyInstall home page`__.
 
-__ http://packages.python.org/distribute/easy_install.html
+__ http://packages.python.org/setuptools/easy_install.html
 
 """
 import sys
@@ -200,7 +200,7 @@ def delete_blockers(self, blockers):
 
     def finalize_options(self):
         if self.version:
-            print 'distribute %s' % get_distribution('distribute').version
+            print 'setuptools %s' % get_distribution('setuptools').version
             sys.exit()
 
         py_version = sys.version.split()[0]
@@ -465,7 +465,7 @@ def cant_write_to_target(self):
 For information on other options, you may wish to consult the
 documentation at:
 
-  http://packages.python.org/distribute/easy_install.html
+  http://packages.python.org/setuptools/easy_install.html
 
 Please make the appropriate changes for your system and try again.
 """
@@ -1164,7 +1164,8 @@ def update_pth(self,dist):
         if not self.dry_run:
 
             self.pth_file.save()
-            if dist.key=='distribute':
+
+            if dist.key=='setuptools':
                 # Ensure that setuptools itself never becomes unavailable!
                 # XXX should this check for latest version?
                 filename = os.path.join(self.install_dir,'setuptools.pth')
@@ -1249,7 +1250,7 @@ def no_default_version_msg(self):
 * You can set up the installation directory to support ".pth" files by
   using one of the approaches described here:
 
-  http://packages.python.org/distribute/easy_install.html#custom-installation-locations
+  http://packages.python.org/setuptools/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again.""" % (
         self.install_dir, os.environ.get('PYTHONPATH','')
@@ -1271,7 +1272,7 @@ def install_site_py(self):
             return  # already did it, or don't need to
 
         sitepy = os.path.join(self.install_dir, "site.py")
-        source = resource_string(Requirement.parse("distribute"), "site.py")
+        source = resource_string(Requirement.parse("setuptools"), "site.py")
         current = ""
 
         if os.path.exists(sitepy):

From 4febe30d3a406b342ef398c95a8cfec6018aa86e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 12:46:21 -0500
Subject: [PATCH 1117/8469] Backed out distribute-specific references in
 package_index module

--HG--
branch : Setuptools-Distribute merge
extra : source : 619f12674c8d42831a59dc805b7b9cbf375a831d
---
 setuptools/package_index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0ee21e3b7b..d4d4631a86 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -154,8 +154,8 @@ def find_external_links(url, page):
             if match:
                 yield urlparse.urljoin(url, htmldecode(match.group(1)))
 
-user_agent = "Python-urllib/%s distribute/%s" % (
-    sys.version[:3], require('distribute')[0].version
+user_agent = "Python-urllib/%s setuptools/%s" % (
+    sys.version[:3], require('setuptools')[0].version
 )
 
 

From 57a6e413d32ca4cb0854bb9efb275dd757116a99 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 12:49:20 -0500
Subject: [PATCH 1118/8469] Backed out distribute-specific reference in
 setuptools package

--HG--
branch : Setuptools-Distribute merge
extra : source : c8cbca6cc8241eebe20562282c560d8e620a55c6
---
 setuptools/__init__.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9de373f98e..08de43498b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -14,16 +14,6 @@
     'find_packages'
 ]
 
-# This marker is used to simplify the process that checks is the
-# setuptools package was installed by the Setuptools project
-# or by the Distribute project, in case Setuptools creates
-# a distribution with the same version.
-#
-# The distribute_setup script for instance, will check if this
-# attribute is present to decide whether to reinstall the package
-# or not.
-_distribute = True
-
 bootstrap_install_from = None
 
 # If we run 2to3 on .py files, should we also convert docstrings?
@@ -51,7 +41,7 @@ def find_packages(where='.', exclude=()):
                 os.path.isfile(os.path.join(fn,'__init__.py'))
             ):
                 out.append(prefix+name); stack.append((fn,prefix+name+'.'))
-    for pat in list(exclude)+['ez_setup', 'distribute_setup']:
+    for pat in list(exclude)+['ez_setup']:
         from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out

From 31e60749d1eb7cf20a948407c07ad08b330c185e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 12:50:23 -0500
Subject: [PATCH 1119/8469] Rename distribute_setup back to ez_setup

--HG--
branch : Setuptools-Distribute merge
rename : distribute_setup.py => ez_setup.py
extra : source : 6672af83b8acc0a4f88dd0e7a4df55591b878565
---
 distribute_setup.py => ez_setup.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename distribute_setup.py => ez_setup.py (100%)

diff --git a/distribute_setup.py b/ez_setup.py
similarity index 100%
rename from distribute_setup.py
rename to ez_setup.py

From e601a3231382da411900b0a2d04f6ba64a1e2067 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Mar 2013 20:50:10 -0500
Subject: [PATCH 1120/8469] Removed the bulk of the anti-setuptools logic in
 ez_setup.py

--HG--
branch : Setuptools-Distribute merge
extra : source : 68b6b7a23e9150de6f2cc6ea37e1233ddbf79b22
---
 ez_setup.py | 338 +++++-----------------------------------------------
 1 file changed, 33 insertions(+), 305 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f630bca4f9..d311a0b9fb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,10 +1,10 @@
 #!python
-"""Bootstrap distribute installation
+"""Bootstrap setuptools installation
 
 If you want to use setuptools in your package's setup.py, just include this
 file in the same directory with it, and add this to the top of your setup.py::
 
-    from distribute_setup import use_setuptools
+    from ez_setup import use_setuptools
     use_setuptools()
 
 If you want to require a specific version of setuptools, set a download
@@ -16,8 +16,6 @@
 import os
 import shutil
 import sys
-import time
-import fnmatch
 import tempfile
 import tarfile
 import optparse
@@ -50,20 +48,7 @@ def quote(arg):
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
 DEFAULT_VERSION = "0.6.36"
-DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
-SETUPTOOLS_FAKED_VERSION = "0.6c11"
-
-SETUPTOOLS_PKG_INFO = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: %s
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-""" % SETUPTOOLS_FAKED_VERSION
+DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 
 def _install(tarball, install_args=()):
@@ -83,7 +68,7 @@ def _install(tarball, install_args=()):
         log.warn('Now working in %s', subdir)
 
         # installing
-        log.warn('Installing Distribute')
+        log.warn('Installing Setuptools')
         if not _python_cmd('setup.py', 'install', *install_args):
             log.warn('Something went wrong during the installation.')
             log.warn('See the error message above.')
@@ -111,7 +96,7 @@ def _build_egg(egg, tarball, to_dir):
         log.warn('Now working in %s', subdir)
 
         # building an egg
-        log.warn('Building a Distribute egg in %s', to_dir)
+        log.warn('Building a Setuptools egg in %s', to_dir)
         _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
 
     finally:
@@ -124,7 +109,7 @@ def _build_egg(egg, tarball, to_dir):
 
 
 def _do_download(version, download_base, to_dir, download_delay):
-    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+    egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg'
                        % (version, sys.version_info[0], sys.version_info[1]))
     if not os.path.exists(egg):
         tarball = download_setuptools(version, download_base,
@@ -136,50 +121,42 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15, no_fake=True):
+                   to_dir=os.curdir, download_delay=15):
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
         'setuptools' in sys.modules
     try:
-        try:
-            import pkg_resources
-            if not hasattr(pkg_resources, '_distribute'):
-                if not no_fake:
-                    _fake_setuptools()
-                raise ImportError
-        except ImportError:
-            return _do_download(version, download_base, to_dir, download_delay)
-        try:
-            pkg_resources.require("distribute>=" + version)
-            return
-        except pkg_resources.VersionConflict:
-            e = sys.exc_info()[1]
-            if was_imported:
-                sys.stderr.write(
-                "The required version of distribute (>=%s) is not available,\n"
-                "and can't be installed while this script is running. Please\n"
-                "install a more recent version first, using\n"
-                "'easy_install -U distribute'."
-                "\n\n(Currently using %r)\n" % (version, e.args[0]))
-                sys.exit(2)
-            else:
-                del pkg_resources, sys.modules['pkg_resources']    # reload ok
-                return _do_download(version, download_base, to_dir,
-                                    download_delay)
-        except pkg_resources.DistributionNotFound:
+        import pkg_resources
+    except ImportError:
+        return _do_download(version, download_base, to_dir, download_delay)
+    try:
+        pkg_resources.require("setuptools>=" + version)
+        return
+    except pkg_resources.VersionConflict:
+        e = sys.exc_info()[1]
+        if was_imported:
+            sys.stderr.write(
+            "The required version of setuptools (>=%s) is not available,\n"
+            "and can't be installed while this script is running. Please\n"
+            "install a more recent version first, using\n"
+            "'easy_install -U setuptools'."
+            "\n\n(Currently using %r)\n" % (version, e.args[0]))
+            sys.exit(2)
+        else:
+            del pkg_resources, sys.modules['pkg_resources']    # reload ok
             return _do_download(version, download_base, to_dir,
                                 download_delay)
-    finally:
-        if not no_fake:
-            _create_fake_setuptools_pkg_info(to_dir)
+    except pkg_resources.DistributionNotFound:
+        return _do_download(version, download_base, to_dir,
+                            download_delay)
 
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
-    """Download distribute from a specified location and return its filename
+    """Download setuptools from a specified location and return its filename
 
-    `version` should be a valid distribute version number that is available
+    `version` should be a valid setuptools version number that is available
     as an egg for download under the `download_base` URL (which should end
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download
@@ -191,7 +168,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         from urllib.request import urlopen
     except ImportError:
         from urllib2 import urlopen
-    tgz_name = "distribute-%s.tar.gz" % version
+    tgz_name = "setuptools-%s.tar.gz" % version
     url = download_base + tgz_name
     saveto = os.path.join(to_dir, tgz_name)
     src = dst = None
@@ -212,255 +189,6 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     return os.path.realpath(saveto)
 
 
-def _no_sandbox(function):
-    def __no_sandbox(*args, **kw):
-        try:
-            from setuptools.sandbox import DirectorySandbox
-            if not hasattr(DirectorySandbox, '_old'):
-                def violation(*args):
-                    pass
-                DirectorySandbox._old = DirectorySandbox._violation
-                DirectorySandbox._violation = violation
-                patched = True
-            else:
-                patched = False
-        except ImportError:
-            patched = False
-
-        try:
-            return function(*args, **kw)
-        finally:
-            if patched:
-                DirectorySandbox._violation = DirectorySandbox._old
-                del DirectorySandbox._old
-
-    return __no_sandbox
-
-
-def _patch_file(path, content):
-    """Will backup the file then patch it"""
-    f = open(path)
-    existing_content = f.read()
-    f.close()
-    if existing_content == content:
-        # already patched
-        log.warn('Already patched.')
-        return False
-    log.warn('Patching...')
-    _rename_path(path)
-    f = open(path, 'w')
-    try:
-        f.write(content)
-    finally:
-        f.close()
-    return True
-
-_patch_file = _no_sandbox(_patch_file)
-
-
-def _same_content(path, content):
-    f = open(path)
-    existing_content = f.read()
-    f.close()
-    return existing_content == content
-
-
-def _rename_path(path):
-    new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s to %s', path, new_name)
-    os.rename(path, new_name)
-    return new_name
-
-
-def _remove_flat_installation(placeholder):
-    if not os.path.isdir(placeholder):
-        log.warn('Unkown installation at %s', placeholder)
-        return False
-    found = False
-    for file in os.listdir(placeholder):
-        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
-            found = True
-            break
-    if not found:
-        log.warn('Could not locate setuptools*.egg-info')
-        return
-
-    log.warn('Moving elements out of the way...')
-    pkg_info = os.path.join(placeholder, file)
-    if os.path.isdir(pkg_info):
-        patched = _patch_egg_dir(pkg_info)
-    else:
-        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
-
-    if not patched:
-        log.warn('%s already patched.', pkg_info)
-        return False
-    # now let's move the files out of the way
-    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
-        element = os.path.join(placeholder, element)
-        if os.path.exists(element):
-            _rename_path(element)
-        else:
-            log.warn('Could not find the %s element of the '
-                     'Setuptools distribution', element)
-    return True
-
-_remove_flat_installation = _no_sandbox(_remove_flat_installation)
-
-
-def _after_install(dist):
-    log.warn('After install bootstrap.')
-    placeholder = dist.get_command_obj('install').install_purelib
-    _create_fake_setuptools_pkg_info(placeholder)
-
-
-def _create_fake_setuptools_pkg_info(placeholder):
-    if not placeholder or not os.path.exists(placeholder):
-        log.warn('Could not find the install location')
-        return
-    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-            (SETUPTOOLS_FAKED_VERSION, pyver)
-    pkg_info = os.path.join(placeholder, setuptools_file)
-    if os.path.exists(pkg_info):
-        log.warn('%s already exists', pkg_info)
-        return
-
-    log.warn('Creating %s', pkg_info)
-    try:
-        f = open(pkg_info, 'w')
-    except EnvironmentError:
-        log.warn("Don't have permissions to write %s, skipping", pkg_info)
-        return
-    try:
-        f.write(SETUPTOOLS_PKG_INFO)
-    finally:
-        f.close()
-
-    pth_file = os.path.join(placeholder, 'setuptools.pth')
-    log.warn('Creating %s', pth_file)
-    f = open(pth_file, 'w')
-    try:
-        f.write(os.path.join(os.curdir, setuptools_file))
-    finally:
-        f.close()
-
-_create_fake_setuptools_pkg_info = _no_sandbox(
-    _create_fake_setuptools_pkg_info
-)
-
-
-def _patch_egg_dir(path):
-    # let's check if it's already patched
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    if os.path.exists(pkg_info):
-        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
-            log.warn('%s already patched.', pkg_info)
-            return False
-    _rename_path(path)
-    os.mkdir(path)
-    os.mkdir(os.path.join(path, 'EGG-INFO'))
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    f = open(pkg_info, 'w')
-    try:
-        f.write(SETUPTOOLS_PKG_INFO)
-    finally:
-        f.close()
-    return True
-
-_patch_egg_dir = _no_sandbox(_patch_egg_dir)
-
-
-def _before_install():
-    log.warn('Before install bootstrap.')
-    _fake_setuptools()
-
-
-def _under_prefix(location):
-    if 'install' not in sys.argv:
-        return True
-    args = sys.argv[sys.argv.index('install') + 1:]
-    for index, arg in enumerate(args):
-        for option in ('--root', '--prefix'):
-            if arg.startswith('%s=' % option):
-                top_dir = arg.split('root=')[-1]
-                return location.startswith(top_dir)
-            elif arg == option:
-                if len(args) > index:
-                    top_dir = args[index + 1]
-                    return location.startswith(top_dir)
-        if arg == '--user' and USER_SITE is not None:
-            return location.startswith(USER_SITE)
-    return True
-
-
-def _fake_setuptools():
-    log.warn('Scanning installed packages')
-    try:
-        import pkg_resources
-    except ImportError:
-        # we're cool
-        log.warn('Setuptools or Distribute does not seem to be installed.')
-        return
-    ws = pkg_resources.working_set
-    try:
-        setuptools_dist = ws.find(
-            pkg_resources.Requirement.parse('setuptools', replacement=False)
-            )
-    except TypeError:
-        # old distribute API
-        setuptools_dist = ws.find(
-            pkg_resources.Requirement.parse('setuptools')
-        )
-
-    if setuptools_dist is None:
-        log.warn('No setuptools distribution found')
-        return
-    # detecting if it was already faked
-    setuptools_location = setuptools_dist.location
-    log.warn('Setuptools installation detected at %s', setuptools_location)
-
-    # if --root or --preix was provided, and if
-    # setuptools is not located in them, we don't patch it
-    if not _under_prefix(setuptools_location):
-        log.warn('Not patching, --root or --prefix is installing Distribute'
-                 ' in another location')
-        return
-
-    # let's see if its an egg
-    if not setuptools_location.endswith('.egg'):
-        log.warn('Non-egg installation')
-        res = _remove_flat_installation(setuptools_location)
-        if not res:
-            return
-    else:
-        log.warn('Egg installation')
-        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
-        if (os.path.exists(pkg_info) and
-            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
-            log.warn('Already patched.')
-            return
-        log.warn('Patching...')
-        # let's create a fake egg replacing setuptools one
-        res = _patch_egg_dir(setuptools_location)
-        if not res:
-            return
-    log.warn('Patching complete.')
-    _relaunch()
-
-
-def _relaunch():
-    log.warn('Relaunching...')
-    # we have to relaunch the process
-    # pip marker to avoid a relaunch bug
-    _cmd1 = ['-c', 'install', '--single-version-externally-managed']
-    _cmd2 = ['-c', 'install', '--record']
-    if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
-        sys.argv[0] = 'setup.py'
-    args = [sys.executable] + sys.argv
-    sys.exit(subprocess.call(args))
-
-
 def _extractall(self, path=".", members=None):
     """Extract all members from the archive to the current working
        directory and set owner, modification time and permissions on
@@ -510,7 +238,7 @@ def sorter(dir1, dir2):
 
 def _build_install_args(options):
     """
-    Build the arguments to 'python setup.py install' on the distribute package
+    Build the arguments to 'python setup.py install' on the setuptools package
     """
     install_args = []
     if options.user_install:
@@ -531,7 +259,7 @@ def _parse_args():
     parser.add_option(
         '--download-base', dest='download_base', metavar="URL",
         default=DEFAULT_URL,
-        help='alternative URL from where to download the distribute package')
+        help='alternative URL from where to download the setuptools package')
     options, args = parser.parse_args()
     # positional arguments are ignored
     return options

From c1767ecf01540e87f89451a1d5fe9ff2ce1266d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Mar 2013 12:50:40 -0400
Subject: [PATCH 1121/8469] Remove references to distribute in setup.py

--HG--
branch : Setuptools-Distribute merge
extra : source : bee46cf41b11c416b5597c616bac574b8a83de0e
---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 771cb74a4b..23146fcc9e 100755
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
     manifest_file.close()
     dir_util.create_tree(tmp_src, fl.files)
     outfiles_2to3 = []
-    dist_script = os.path.join("build", "src", "distribute_setup.py")
+    dist_script = os.path.join("build", "src", "ez_setup.py")
     for f in fl.files:
         outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
         if copied and outf.endswith(".py") and outf != dist_script:
@@ -82,7 +82,7 @@ def build_package_data(self):
 class test(_test):
     """Specific test class to avoid rewriting the entry_points.txt"""
     def run(self):
-        entry_points = os.path.join('distribute.egg-info', 'entry_points.txt')
+        entry_points = os.path.join('setuptools.egg-info', 'entry_points.txt')
 
         if not os.path.exists(entry_points):
             _test.run(self)
@@ -130,7 +130,7 @@ def _being_installed():
     return  'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
-    from distribute_setup import _before_install
+    from ez_setup import _before_install
     _before_install()
 
 # return contents of reStructureText file with linked issue references
@@ -249,5 +249,5 @@ def _linkified(rst_path):
 )
 
 if _being_installed():
-    from distribute_setup import _after_install
+    from ez_setup import _after_install
     _after_install(dist)

From cfd4a052e4f899269435180f87a1615417513385 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Mar 2013 13:16:49 -0400
Subject: [PATCH 1122/8469] Removed more distribute-specific, anti-setuptools
 code in setup.py

--HG--
branch : Setuptools-Distribute merge
extra : source : 8efeb91ad396dc12014a3992fc458cdb1fc35206
---
 setup.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index 23146fcc9e..d21ff02344 100755
--- a/setup.py
+++ b/setup.py
@@ -107,27 +107,16 @@ def run(self):
                 f.close()
 
 
-# if we are installing Distribute using "python setup.py install"
-# we need to get setuptools out of the way
-def _easy_install_marker():
-    return (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
-            sys.argv[3] == '--dist-dir' and 'egg-dist-tmp-' in sys.argv[-1])
-
 def _buildout_marker():
     command = os.environ.get('_')
     if command:
         return 'buildout' in os.path.basename(command)
 
 def _being_installed():
-    if os.environ.get('DONT_PATCH_SETUPTOOLS') is not None:
-        return False
     if _buildout_marker():
         # Installed by buildout, don't mess with a global setuptools.
         return False
-    # easy_install marker
-    if "--help" in sys.argv[1:] or "-h" in sys.argv[1:]: # Don't bother doing anything if they're just asking for help
-        return False
-    return  'install' in sys.argv[1:] or _easy_install_marker()
+    return 'install' in sys.argv[1:]
 
 if _being_installed():
     from ez_setup import _before_install

From 74ac500de5709742b769c8bde05817b3bcdbebfe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Mar 2013 13:19:18 -0400
Subject: [PATCH 1123/8469] Removed references to removed methods in ez_setup

--HG--
branch : Setuptools-Distribute merge
extra : source : 4b38838e17b59d3705735e111219e20d89632481
---
 setup.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/setup.py b/setup.py
index d21ff02344..6cd15f25ab 100755
--- a/setup.py
+++ b/setup.py
@@ -107,21 +107,6 @@ def run(self):
                 f.close()
 
 
-def _buildout_marker():
-    command = os.environ.get('_')
-    if command:
-        return 'buildout' in os.path.basename(command)
-
-def _being_installed():
-    if _buildout_marker():
-        # Installed by buildout, don't mess with a global setuptools.
-        return False
-    return 'install' in sys.argv[1:]
-
-if _being_installed():
-    from ez_setup import _before_install
-    _before_install()
-
 # return contents of reStructureText file with linked issue references
 def _linkified(rst_path):
     bitroot = 'http://bitbucket.org/tarek/distribute'
@@ -236,7 +221,3 @@ def _linkified(rst_path):
         """).strip().splitlines(),
     scripts = scripts,
 )
-
-if _being_installed():
-    from ez_setup import _after_install
-    _after_install(dist)

From 5dd873205fbd31f653b5a2bca68477306c7c64fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 10:42:23 -0700
Subject: [PATCH 1124/8469] Restore entry_points.txt in egg-info. This file
 must be present if one desires to build or install setuptools on a system
 which doesn't already have some form of setuptools installed (such as a clean
 Python installation that has just cloned setuptools). This file could be
 omitted if we choose to only support installing via a setuptools-built sdist

--HG--
branch : Setuptools-Distribute merge
extra : source : a267228055f4402890b8143c6e9be5ea8074037e
---
 setuptools.egg-info/entry_points.txt | 62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 setuptools.egg-info/entry_points.txt

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
new file mode 100644
index 0000000000..663882d630
--- /dev/null
+++ b/setuptools.egg-info/entry_points.txt
@@ -0,0 +1,62 @@
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+

From 0281ae614b34e729dd3f67b938bee9ce90c12b45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 11:02:06 -0700
Subject: [PATCH 1125/8469] Updated references in tests to refer to setuptools
 in favor of distribute

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : 1ffe834b5ecad0e5fd0ae44cb63e6541d9006004
---
 setuptools/tests/test_easy_install.py | 12 ++++++------
 setuptools/tests/test_packageindex.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 582219cef9..4a65a8d243 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -266,10 +266,10 @@ def test_local_index(self):
                 del os.environ['PYTHONPATH']
 
     def test_setup_requires(self):
-        """Regression test for issue #318
+        """Regression test for Distribute issue #318
 
-        Ensures that a package with setup_requires can be installed when
-        distribute is installed in the user site-packages without causing a
+        Ensure that a package with setup_requires can be installed when
+        setuptools is installed in the user site-packages without causing a
         SandboxViolation.
         """
 
@@ -373,13 +373,13 @@ def create_sdist(self, installer):
         doesn't exist) and invoke installer on it.
         """
         def build_sdist(dir):
-            dist_path = os.path.join(dir, 'distribute-test-fetcher-1.0.tar.gz')
+            dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
             make_trivial_sdist(
                 dist_path,
                 textwrap.dedent("""
                     import setuptools
                     setuptools.setup(
-                        name="distribute-test-fetcher",
+                        name="setuptools-test-fetcher",
                         version="1.0",
                         setup_requires = ['does-not-exist'],
                     )
@@ -447,7 +447,7 @@ def argv_context(f, repl):
 
 def reset_setup_stop_context(f):
     """
-    When the distribute tests are run using setup.py test, and then
+    When the setuptools tests are run using setup.py test, and then
     one wants to invoke another setup() command (such as easy_install)
     within those tests, it's necessary to reset the global variable
     in distutils.core so that the setup() command will run naturally.
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 3e446b54d4..9c4bfadb0c 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -110,7 +110,7 @@ def test_links_priority(self):
         - someone reuploads the package (with a different md5)
         - while easy_installing, an MD5 error occurs because the external link
           is used
-        -> Distribute should use the link from pypi, not the external one.
+        -> Setuptools should use the link from pypi, not the external one.
         """
         if sys.platform.startswith('java'):
             # Skip this test on jython because binding to :0 fails

From 6482552f94c24cdc52c9badf6923640a4e9efa4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 11:10:22 -0700
Subject: [PATCH 1126/8469] Removed tests relevant to the co-existence of
 distribute and setuptools; retained some tests that are still relevant

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : c87a0b28f0bcd679ae5a34770b0f4fb908f2aee3
---
 setuptools/tests/test_resources.py | 43 +++++-------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 292b78d1ab..f10fc99925 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -197,29 +197,6 @@ def testDistroDependsOptions(self):
         )
         self.assertRaises(UnknownExtra, d.requires, ["foo"])
 
-    def testSetuptoolsDistributeCombination(self):
-        # Ensure that installing a 0.7-series setuptools fails.  PJE says that
-        # it will not co-exist.
-        ws = WorkingSet([])
-        d = Distribution(
-            "/some/path",
-            project_name="setuptools",
-            version="0.7a1")
-        self.assertRaises(ValueError, ws.add, d)
-        # A 0.6-series is no problem
-        d2 = Distribution(
-            "/some/path",
-            project_name="setuptools",
-            version="0.6c9")
-        ws.add(d2)
-
-        # a unexisting version needs to work
-        ws = WorkingSet([])
-        d3 = Distribution(
-            "/some/path",
-            project_name="setuptools")
-        ws.add(d3)
-
 
 class EntryPointTests(TestCase):
 
@@ -372,21 +349,13 @@ def testVersionEquality(self):
         self.assertTrue(d("foo-0.3a3.egg") in r2)
         self.assertTrue(d("foo-0.3a5.egg") in r2)
 
-    def testDistributeSetuptoolsOverride(self):
-        # Plain setuptools or distribute mean we return distribute.
-        self.assertEqual(
-            Requirement.parse('setuptools').project_name, 'distribute')
-        self.assertEqual(
-            Requirement.parse('distribute').project_name, 'distribute')
-        # setuptools lower than 0.7 means distribute
-        self.assertEqual(
-            Requirement.parse('setuptools==0.6c9').project_name, 'distribute')
-        self.assertEqual(
-            Requirement.parse('setuptools==0.6c10').project_name, 'distribute')
-        self.assertEqual(
-            Requirement.parse('setuptools>=0.6').project_name, 'distribute')
+    def testSetuptoolsProjectName(self):
+        """
+        The setuptools project should implement the setuptools package.
+        """
+
         self.assertEqual(
-            Requirement.parse('setuptools < 0.7').project_name, 'distribute')
+            Requirement.parse('setuptools').project_name, 'setuptools')
         # setuptools 0.7 and higher means setuptools.
         self.assertEqual(
             Requirement.parse('setuptools == 0.7').project_name, 'setuptools')

From 7a12d0b7937c832c0ce5b306105ceb5c5b08bd63 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 11:11:34 -0700
Subject: [PATCH 1127/8469] Updated a couple more references from Distribute to
 Setuptools

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ad9f8f344d7e705ddc354757fbe741b34b576b1b
---
 setuptools/tests/test_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index f10fc99925..9c2ed9c91d 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -559,7 +559,7 @@ class NamespaceTests(TestCase):
 
     def setUp(self):
         self._ns_pkgs = pkg_resources._namespace_packages.copy()
-        self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-")
+        self._tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
         os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
         self._prev_sys_path = sys.path[:]
         sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
@@ -603,7 +603,7 @@ def test_two_levels_deep(self):
         try:
             import pkg1.pkg2
         except ImportError, e:
-            self.fail("Distribute tried to import the parent namespace package")
+            self.fail("Setuptools tried to import the parent namespace package")
         # check the _namespace_packages dict
         self._assertIn("pkg1.pkg2", pkg_resources._namespace_packages.keys())
         self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])

From 9418f48c8f3baefbae00d12e6872f0d174bc9335 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 11:27:50 -0700
Subject: [PATCH 1128/8469] Updated install_test to reference the new bootstrap
 script

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ae9d4dbfa6770634bf65bba6f0b6f236074aa9d5
---
 tests/install_test.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tests/install_test.py b/tests/install_test.py
index 02deb81860..c8a28decbd 100644
--- a/tests/install_test.py
+++ b/tests/install_test.py
@@ -2,8 +2,10 @@
 import sys
 import os
 
-if os.path.exists('distribute_setup.py'):
-    print 'distribute_setup.py exists in the current dir, aborting'
+bootstrap_name = 'ez_setup.py'
+
+if os.path.exists(bootstrap_name):
+    print bootstrap_name + ' exists in the current dir, aborting'
     sys.exit(2)
 
 print '**** Starting Test'
@@ -14,24 +16,28 @@
     import subprocess
 
 print 'Downloading bootstrap'
-file = urllib2.urlopen('http://nightly.ziade.org/distribute_setup.py')
-f = open('distribute_setup.py', 'w')
+file = urllib2.urlopen('https://bitbucket.org/jaraco/setuptools-private'
+    '/src/tip/' + bootstrap_name)
+f = open(bootstrap_name, 'w')
 f.write(file.read())
 f.close()
 
 # running it
-args = [sys.executable]  + ['distribute_setup.py']
+args = [sys.executable, bootstrap_name]
 if is_jython:
     res = subprocess.call(args)
 else:
     res = os.spawnv(os.P_WAIT, sys.executable, args)
 
+fail_message = ('**** Test failed; please report the output to the '
+    'setuptools bugtracker.')
+
 if res != 0:
-    print '**** Test failed, please send me the output at tarek@ziade.org'
-    os.remove('distribute_setup.py')
+    print(fail_message)
+    os.remove(bootstrap_name)
     sys.exit(2)
 
-# now checking if Distribute is installed
+# now checking if Setuptools is installed
 script = """\
 import sys
 try:
@@ -67,9 +73,9 @@
     if res:
         print '**** Test is OK'
     else:
-        print '**** Test failed, please send me the output at tarek@ziade.org'
+        print(fail_message)
 finally:
     if os.path.exists(script_name):
         os.remove(script_name)
-    os.remove('distribute_setup.py')
+    os.remove(bootstrap_name)
 

From 45728d9be1d67fac6369e89941cf1bb4d0f8e520 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 11:28:35 -0700
Subject: [PATCH 1129/8469] Removing install_test altogether (the only thing it
 tests is the presence of the deprecated setuptools._distribute attribute)

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : 05075288d1f0557ec75ceda127699ef8152a466f
---
 tests/install_test.py | 81 -------------------------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 tests/install_test.py

diff --git a/tests/install_test.py b/tests/install_test.py
deleted file mode 100644
index c8a28decbd..0000000000
--- a/tests/install_test.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import urllib2
-import sys
-import os
-
-bootstrap_name = 'ez_setup.py'
-
-if os.path.exists(bootstrap_name):
-    print bootstrap_name + ' exists in the current dir, aborting'
-    sys.exit(2)
-
-print '**** Starting Test'
-print '\n\n'
-
-is_jython = sys.platform.startswith('java')
-if is_jython:
-    import subprocess
-
-print 'Downloading bootstrap'
-file = urllib2.urlopen('https://bitbucket.org/jaraco/setuptools-private'
-    '/src/tip/' + bootstrap_name)
-f = open(bootstrap_name, 'w')
-f.write(file.read())
-f.close()
-
-# running it
-args = [sys.executable, bootstrap_name]
-if is_jython:
-    res = subprocess.call(args)
-else:
-    res = os.spawnv(os.P_WAIT, sys.executable, args)
-
-fail_message = ('**** Test failed; please report the output to the '
-    'setuptools bugtracker.')
-
-if res != 0:
-    print(fail_message)
-    os.remove(bootstrap_name)
-    sys.exit(2)
-
-# now checking if Setuptools is installed
-script = """\
-import sys
-try:
-    import setuptools
-except ImportError:
-    sys.exit(0)
-
-sys.exit(hasattr(setuptools, "_distribute"))
-"""
-
-root = 'script'
-seed = 0
-script_name = '%s%d.py' % (root, seed)
-
-while os.path.exists(script_name):
-    seed += 1
-    script_name = '%s%d.py' % (root, seed)
-
-f = open(script_name, 'w')
-try:
-    f.write(script)
-finally:
-    f.close()
-
-try:
-    args = [sys.executable]  + [script_name]
-    if is_jython:
-        res = subprocess.call(args)
-    else:
-        res = os.spawnv(os.P_WAIT, sys.executable, args)
-
-    print '\n\n'
-    if res:
-        print '**** Test is OK'
-    else:
-        print(fail_message)
-finally:
-    if os.path.exists(script_name):
-        os.remove(script_name)
-    os.remove(bootstrap_name)
-

From 06b90a07da2bc7fded73743ca5bbf38200e972d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 12:01:43 -0700
Subject: [PATCH 1130/8469] Updated manual test to test against setuptools

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ff968de5ea0e28052c0b53fecdcf0c348a6faf04
---
 tests/manual_test.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 0d5051f165..44cf2d0657 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -51,9 +51,8 @@ def _tempdir(*args, **kwargs):
     extensions
 """
 
-BOOTSTRAP = 'http://python-distribute.org/bootstrap.py'
+BOOTSTRAP = 'http://downloads.buildout.org/1/bootstrap.py'
 PYVER = sys.version.split()[0][:3]
-DEV_URL = 'http://bitbucket.org/tarek/distribute/get/0.6-maintenance.zip#egg=distribute-dev'
 
 _VARS = {'base': '.',
          'py_version_short': PYVER}
@@ -66,26 +65,25 @@ def _tempdir(*args, **kwargs):
 
 @tempdir
 def test_virtualenv():
-    """virtualenv with distribute"""
+    """virtualenv with setuptools"""
     purelib = os.path.abspath(Template(PURELIB).substitute(**_VARS))
-    _system_call('virtualenv', '--no-site-packages', '.', '--distribute')
-    _system_call('bin/easy_install', 'distribute==dev')
+    _system_call('virtualenv', '--no-site-packages', '.')
+    _system_call('bin/easy_install', 'setuptools==dev')
     # linux specific
     site_pkg = os.listdir(purelib)
     site_pkg.sort()
-    assert 'distribute' in site_pkg[0]
+    assert 'setuptools' in site_pkg[0]
     easy_install = os.path.join(purelib, 'easy-install.pth')
     with open(easy_install) as f:
         res = f.read()
-    assert 'distribute' in res
-    assert 'setuptools' not in res
+    assert 'setuptools' in res
 
 @tempdir
 def test_full():
     """virtualenv + pip + buildout"""
     _system_call('virtualenv', '--no-site-packages', '.')
-    _system_call('bin/easy_install', '-q', 'distribute==dev')
-    _system_call('bin/easy_install', '-qU', 'distribute==dev')
+    _system_call('bin/easy_install', '-q', 'setuptools==dev')
+    _system_call('bin/easy_install', '-qU', 'setuptools==dev')
     _system_call('bin/easy_install', '-q', 'pip')
     _system_call('bin/pip', 'install', '-q', 'zc.buildout')
 
@@ -95,16 +93,16 @@ def test_full():
     with open('bootstrap.py', 'w') as f:
         f.write(urlopen(BOOTSTRAP).read())
 
-    _system_call('bin/python', 'bootstrap.py', '--distribute')
+    _system_call('bin/python', 'bootstrap.py')
     _system_call('bin/buildout', '-q')
     eggs = os.listdir('eggs')
     eggs.sort()
     assert len(eggs) == 3
-    assert eggs[0].startswith('distribute')
-    assert eggs[1:] == ['extensions-0.3-py2.6.egg',
-                        'zc.recipe.egg-1.2.2-py2.6.egg']
+    assert eggs[1].startswith('setuptools')
+    del eggs[1]
+    assert eggs == ['extensions-0.3-py2.6.egg',
+        'zc.recipe.egg-1.2.2-py2.6.egg']
 
 if __name__ == '__main__':
     test_virtualenv()
     test_full()
-

From c49ceeb20b4478dcd089be4f1ebe1684fb880bb5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 12:06:28 -0700
Subject: [PATCH 1131/8469] Update test_distribute_setup to reference
 ez_setup.py

--HG--
branch : Setuptools-Distribute merge
rename : tests/test_distribute_setup.py => tests/test_ez_setup.py
extra : rebase_source : d6fe218013147bd6a4e43220356d539d7764da11
---
 ...st_distribute_setup.py => test_ez_setup.py} | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)
 rename tests/{test_distribute_setup.py => test_ez_setup.py} (75%)

diff --git a/tests/test_distribute_setup.py b/tests/test_ez_setup.py
similarity index 75%
rename from tests/test_distribute_setup.py
rename to tests/test_ez_setup.py
index 1f3da058d1..922bd88465 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_ez_setup.py
@@ -9,10 +9,9 @@
 TOPDIR = os.path.split(CURDIR)[0]
 sys.path.insert(0, TOPDIR)
 
-from distribute_setup import (use_setuptools, _build_egg, _python_cmd,
-                              _do_download, _install, DEFAULT_URL,
-                              DEFAULT_VERSION)
-import distribute_setup
+from ez_setup import (use_setuptools, _build_egg, _python_cmd, _do_download,
+    _install, DEFAULT_URL, DEFAULT_VERSION)
+import ez_setup
 
 class TestSetup(unittest.TestCase):
 
@@ -54,20 +53,11 @@ def test_do_download(self):
     def test_install(self):
         def _faked(*args):
             return True
-        distribute_setup.python_cmd = _faked
+        ez_setup.python_cmd = _faked
         _install(self.tarball)
 
     def test_use_setuptools(self):
         self.assertEqual(use_setuptools(), None)
 
-        # make sure fake_setuptools is not called by default
-        import pkg_resources
-        del pkg_resources._distribute
-        def fake_setuptools(*args):
-            raise AssertionError
-
-        pkg_resources._fake_setuptools = fake_setuptools
-        use_setuptools()
-
 if __name__ == '__main__':
     unittest.main()

From 79c654f4976d7e5258feef30c7d948665ac7d8cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 17:10:43 -0700
Subject: [PATCH 1132/8469] Revert README to match setuptools-0.6

--HG--
branch : Setuptools-Distribute merge
extra : source : 5d3a4df9b11a90b744762470fc7b784ca5412da9
---
 README.txt | 312 ++++++++++++++++++++++++-----------------------------
 1 file changed, 143 insertions(+), 169 deletions(-)

diff --git a/README.txt b/README.txt
index a827f4a627..12b1e390b6 100755
--- a/README.txt
+++ b/README.txt
@@ -1,228 +1,202 @@
 ===============================
-Installing and Using Distribute
+Installing and Using Setuptools
 ===============================
 
 .. contents:: **Table of Contents**
 
------------
-Disclaimers
------------
-
-About the fork
-==============
-
-`Distribute` is a fork of the `Setuptools` project.
-
-Distribute is intended to replace Setuptools as the standard method
-for working with Python module distributions.
-
-The fork has two goals:
-
-- Providing a backward compatible version to replace Setuptools
-  and make all distributions that depend on Setuptools work as
-  before, but with less bugs and behaviorial issues.
 
-  This work is done in the 0.6.x series.
+----------------------------------
+Security Issues - Read this First!
+----------------------------------
 
-  Starting with version 0.6.2, Distribute supports Python 3.
-  Installing and using distribute for Python 3 code works exactly
-  the same as for Python 2 code, but Distribute also helps you to support
-  Python 2 and Python 3 from the same source code by letting you run 2to3
-  on the code as a part of the build process, by setting the keyword parameter
-  ``use_2to3`` to True. See http://packages.python.org/distribute for more
-  information.
+Setuptools and ``easy_install`` currently default to allowing automated
+download and execution of code from anywhere on the internet, without actually
+verifying the owners of the websites or the authors of the code.  If you want
+your installation to be more secure, you will need to:
 
-- Refactoring the code, and releasing it in several distributions.
-  This work is being done in the 0.7.x series but not yet released.
+ 1. Manually install the `requests <https://pypi.python.org/pypi/requests>`_
+    library **after** installing setuptools, using an SSL-enabled browser or
+    other tool.  (This will enable SSL certificate verification.)
 
-The roadmap is still evolving, and the page that is up-to-date is
-located at : `http://packages.python.org/distribute/roadmap`.
+ 2. Configure your default ``--allow-hosts`` setting so that ``easy_install``
+    will only download from sites you trust.  (E.g., to only download from
+    ``pypi.python.org`` or some other trusted package index.)
 
-If you install `Distribute` and want to switch back for any reason to
-`Setuptools`, get to the `Uninstallation instructions`_ section.
+ 3. If you are using a Python version less than 2.6, you will also need to
+    install the `SSL backport module <https://pypi.python.org/pypi/requests>`_
+    to enable SSL downloads from PyPI.  (Unfortunately, the ``requests``
+    package does not support older versions of Python at this time, so SSL
+    certificate verification will not be enabled.  But at least you'll still be
+    able to use PyPI, which is in the process of switching to an all-SSL policy
+    for downloads.
+    
+For more information on how to do all of the above, and for other security-
+related information, please see the full `setuptools security documentation
+<http://peak.telecommunity.com/DevCenter/SetuptoolsSecurity>`_.
 
-More documentation
-==================
-
-You can get more information in the Sphinx-based documentation, located
-at http://packages.python.org/distribute. This documentation includes the old
-Setuptools documentation that is slowly replaced, and brand new content.
-
-About the installation process
-==============================
-
-The `Distribute` installer modifies your installation by de-activating an
-existing installation of `Setuptools` in a bootstrap process. This process
-has been tested in various installation schemes and contexts but in case of a
-bug during this process your Python installation might be left in a broken
-state. Since all modified files and directories are copied before the
-installation starts, you will be able to get back to a normal state by reading
-the instructions in the `Uninstallation instructions`_ section.
-
-In any case, it is recommended to save you `site-packages` directory before
-you start the installation of `Distribute`.
 
 -------------------------
 Installation Instructions
 -------------------------
 
-Distribute is only released as a source distribution.
-
-It can be installed using pip, and can be done so with the source tarball,
-or by using the ``distribute_setup.py`` script provided online.
-
-``distribute_setup.py`` is the simplest and preferred way on all systems.
+Windows
+=======
 
-distribute_setup.py
-===================
+32-bit version of Python
+    Install setuptools using the provided ``.exe`` installer.
 
-Download
-`distribute_setup.py <http://python-distribute.org/distribute_setup.py>`_
-and execute it, using the Python interpreter of your choice.
+64-bit versions of Python
+    Download `ez_setup.py`_ and run it; it will download the appropriate .egg file and install it for you.  (Currently, the provided ``.exe`` installer does not support 64-bit versions of Python for Windows, due to a `distutils installer compatibility issue`_
 
-If your shell has the ``curl`` program you can do::
+.. _ez_setup.py: http://peak.telecommunity.com/dist/ez_setup.py
+.. _distutils installer compatibility issue: http://bugs.python.org/issue6792
 
-    $ curl -O http://python-distribute.org/distribute_setup.py
-    $ python distribute_setup.py
 
-Notice this file is also provided in the source release.
+NOTE: Regardless of what sort of Python you're using, if you've previously
+installed older versions of setuptools, please delete all ``setuptools*.egg``
+and ``setuptools.pth`` files from your system's ``site-packages`` directory
+(and any other ``sys.path`` directories) FIRST.
 
-pip
-===
+If you are upgrading a previous version of setuptools that was installed using
+an ``.exe`` installer, please be sure to also *uninstall that older version*
+via your system's "Add/Remove Programs" feature, BEFORE installing the newer
+version.
 
-Run easy_install or pip::
+Once installation is complete, you will find an ``easy_install.exe`` program in
+your Python ``Scripts`` subdirectory.  Be sure to add this directory to your
+``PATH`` environment variable, if you haven't already done so.
 
-    $ pip install distribute
 
-Source installation
-===================
+RPM-Based Systems
+=================
 
-Download the source tarball, uncompress it, then run the install command::
+Install setuptools using the provided source RPM.  The included ``.spec`` file
+assumes you are installing using the default ``python`` executable, and is not
+specific to a particular Python version.  The ``easy_install`` executable will
+be installed to a system ``bin`` directory such as ``/usr/bin``.
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
-    $ tar -xzvf distribute-0.6.36.tar.gz
-    $ cd distribute-0.6.36
-    $ python setup.py install
+If you wish to install to a location other than the default Python
+installation's default ``site-packages`` directory (and ``$prefix/bin`` for
+scripts), please use the ``.egg``-based installation approach described in the
+following section.
 
----------------------------
-Uninstallation Instructions
----------------------------
 
-Like other distutils-based distributions, Distribute doesn't provide an
-uninstaller yet. It's all done manually! We are all waiting for PEP 376
-support in Python.
-
-Distribute is installed in three steps:
-
-1. it gets out of the way an existing installation of Setuptools
-2. it installs a `fake` setuptools installation
-3. it installs distribute
-
-Distribute can be removed like this:
-
-- remove the ``distribute*.egg`` file located in your site-packages directory
-- remove the ``setuptools.pth`` file located in you site-packages directory
-- remove the easy_install script located in you ``sys.prefix/bin`` directory
-- remove the ``setuptools*.egg`` directory located in your site-packages directory,
-  if any.
-
-If you want to get back to setuptools:
-
-- reinstall setuptools using its instruction.
-
-Lastly:
-
-- remove the *.OLD.* directory located in your site-packages directory if any,
-  **once you have checked everything was working correctly again**.
+Cygwin, Mac OS X, Linux, Other
+==============================
 
--------------------------
-Quick help for developers
--------------------------
+1. Download the appropriate egg for your version of Python (e.g.
+   ``setuptools-0.6c9-py2.4.egg``).  Do NOT rename it.
 
-To create an egg which is compatible with Distribute, use the same
-practice as with Setuptools, e.g.::
+2. Run it as if it were a shell script, e.g. ``sh setuptools-0.6c9-py2.4.egg``.
+   Setuptools will install itself using the matching version of Python (e.g.
+   ``python2.4``), and will place the ``easy_install`` executable in the
+   default location for installing Python scripts (as determined by the
+   standard distutils configuration files, or by the Python installation).
 
-    from setuptools import setup
+If you want to install setuptools to somewhere other than ``site-packages`` or
+your default distutils installation locations for libraries and scripts, you
+may include EasyInstall command-line options such as ``--prefix``,
+``--install-dir``, and so on, following the ``.egg`` filename on the same
+command line.  For example::
 
-    setup(...
-    )
+    sh setuptools-0.6c9-py2.4.egg --prefix=~
 
-To use `pkg_resources` to access data files in the egg, you should
-require the Setuptools distribution explicitly::
+You can use ``--help`` to get a full options list, but we recommend consulting
+the `EasyInstall manual`_ for detailed instructions, especially `the section
+on custom installation locations`_.
 
-    from setuptools import setup
+.. _EasyInstall manual: http://peak.telecommunity.com/DevCenter/EasyInstall
+.. _the section on custom installation locations: http://peak.telecommunity.com/DevCenter/EasyInstall#custom-installation-locations
 
-    setup(...
-        install_requires=['setuptools']
-    )
 
-Only if you need Distribute-specific functionality should you depend
-on it explicitly. In this case, replace the Setuptools dependency::
+Cygwin Note
+-----------
 
-    from setuptools import setup
+If you are trying to install setuptools for the **Windows** version of Python
+(as opposed to the Cygwin version that lives in ``/usr/bin``), you must make
+sure that an appropriate executable (``python2.3``, ``python2.4``, or
+``python2.5``) is on your **Cygwin** ``PATH`` when invoking the egg.  For
+example, doing the following at a Cygwin bash prompt will install setuptools
+for the **Windows** Python found at ``C:\\Python24``::
 
-    setup(...
-        install_requires=['distribute']
-    )
+    ln -s /cygdrive/c/Python24/python.exe python2.4
+    PATH=.:$PATH sh setuptools-0.6c9-py2.4.egg
+    rm python2.4
 
------------
-Install FAQ
------------
 
-- **Why is Distribute wrapping my Setuptools installation?**
+Downloads
+=========
 
-   Since Distribute is a fork, and since it provides the same package
-   and modules, it renames the existing Setuptools egg and inserts a
-   new one which merely wraps the Distribute code. This way, full
-   backwards compatibility is kept for packages which rely on the
-   Setuptools modules.
+All setuptools downloads can be found at `the project's home page in the Python
+Package Index`_.  Scroll to the very bottom of the page to find the links.
 
-   At the same time, packages can meet their dependency on Setuptools
-   without actually installing it (which would disable Distribute).
+.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
 
-- **How does Distribute interact with virtualenv?**
+In addition to the PyPI downloads, the development version of ``setuptools``   
+is available from the `Python SVN sandbox`_, and in-development versions of the 
+`0.6 branch`_ are available as well.
 
-  Everytime you create a virtualenv it will install setuptools by default.
-  You either need to re-install Distribute in it right after or pass the
-  ``--distribute`` option when creating it.
+.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
 
-  Once installed, your virtualenv will use Distribute transparently.
+.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
 
-  Although, if you have Setuptools installed in your system-wide Python,
-  and if the virtualenv you are in was generated without the `--no-site-packages`
-  option, the Distribute installation will stop.
+--------------------------------
+Using Setuptools and EasyInstall
+--------------------------------
 
-  You need in this case to build a virtualenv with the `--no-site-packages`
-  option or to install `Distribute` globally.
+Here are some of the available manuals, tutorials, and other resources for
+learning about Setuptools, Python Eggs, and EasyInstall:
 
-- **How does Distribute interacts with zc.buildout?**
+* `The EasyInstall user's guide and reference manual`_
+* `The setuptools Developer's Guide`_
+* `The pkg_resources API reference`_
+* `Package Compatibility Notes`_ (user-maintained)
+* `The Internal Structure of Python Eggs`_
 
-  You can use Distribute in your zc.buildout, with the --distribute option,
-  starting at zc.buildout 1.4.2::
+Questions, comments, and bug reports should be directed to the `distutils-sig
+mailing list`_.  If you have written (or know of) any tutorials, documentation,
+plug-ins, or other resources for setuptools users, please let us know about
+them there, so this reference list can be updated.  If you have working,
+*tested* patches to correct problems or add features, you may submit them to
+the `setuptools bug tracker`_.
 
-  $ python bootstrap.py --distribute
+.. _setuptools bug tracker: http://bugs.python.org/setuptools/
+.. _Package Compatibility Notes: http://peak.telecommunity.com/DevCenter/PackageNotes
+.. _The Internal Structure of Python Eggs: http://peak.telecommunity.com/DevCenter/EggFormats
+.. _The setuptools Developer's Guide: http://peak.telecommunity.com/DevCenter/setuptools
+.. _The pkg_resources API reference: http://peak.telecommunity.com/DevCenter/PkgResources
+.. _The EasyInstall user's guide and reference manual: http://peak.telecommunity.com/DevCenter/EasyInstall
+.. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
 
-  For previous zc.buildout versions, *the only thing* you need to do
-  is use the bootstrap at `http://python-distribute.org/bootstrap.py`.  Run
-  that bootstrap and ``bin/buildout`` (and all other buildout-generated
-  scripts) will transparently use distribute instead of setuptools.  You do
-  not need a specific buildout release.
 
-  A shared eggs directory is no problem (since 0.6.6): the setuptools egg is
-  left in place unmodified.  So other buildouts that do not yet use the new
-  bootstrap continue to work just fine.  And there is no need to list
-  ``distribute`` somewhere in your eggs: using the bootstrap is enough.
+-------
+Credits
+-------
 
-  The source code for the bootstrap script is located at
-  `http://bitbucket.org/tarek/buildout-distribute`.
+* The original design for the ``.egg`` format and the ``pkg_resources`` API was
+  co-created by Phillip Eby and Bob Ippolito.  Bob also implemented the first
+  version of ``pkg_resources``, and supplied the OS X operating system version
+  compatibility algorithm.
 
+* Ian Bicking implemented many early "creature comfort" features of
+  easy_install, including support for downloading via Sourceforge and
+  Subversion repositories.  Ian's comments on the Web-SIG about WSGI
+  application deployment also inspired the concept of "entry points" in eggs,
+  and he has given talks at PyCon and elsewhere to inform and educate the
+  community about eggs and setuptools.
 
+* Jim Fulton contributed time and effort to build automated tests of various
+  aspects of ``easy_install``, and supplied the doctests for the command-line
+  ``.exe`` wrappers on Windows.
 
------------------------------
-Feedback and getting involved
------------------------------
+* Phillip J. Eby is the principal author and maintainer of setuptools, and
+  first proposed the idea of an importable binary distribution format for
+  Python application plug-ins.
 
-- Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig
-- Issue tracker: http://bitbucket.org/tarek/distribute/issues/
-- Code Repository: http://bitbucket.org/tarek/distribute
+* Significant parts of the implementation of setuptools were funded by the Open
+  Source Applications Foundation, to provide a plug-in infrastructure for the
+  Chandler PIM application.  In addition, many OSAF staffers (such as Mike
+  "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
+  use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
 
+.. _files:

From 1ec0efe5d55c06f421840cce007580516645f0d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 15:38:52 +0100
Subject: [PATCH 1133/8469] This revision is where the distribute fork occurred

--HG--
branch : Setuptools-Distribute merge

From 44e41d4b39ba45fa6329cdfefea82adc02242f3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 17:23:50 -0700
Subject: [PATCH 1134/8469] Copied changes from setuptools-0.6 for
 pkg_resources.py

--HG--
branch : Setuptools-Distribute merge
extra : source : ead8ad8c5e5f750d70b7f040f61c0664a2128c1e
---
 pkg_resources.py | 113 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 77 insertions(+), 36 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9edb6c0bd9..79db00b8c2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,17 +13,25 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, new
+import sys, os, zipimport, time, re, imp
 
 try:
     frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
 
-from os import utime, rename, unlink    # capture these to bypass sandboxing
+# capture these to bypass sandboxing
+from os import utime, rename, unlink, mkdir
 from os import open as os_open
+from os.path import isdir, split
 
 
+def _bypass_ensure_directory(name, mode=0777):
+    # Sandbox-bypassing version of ensure_directory()
+    dirname, filename = split(name)
+    if dirname and filename and not isdir(dirname):
+        _bypass_ensure_directory(dirname)
+        mkdir(dirname, mode)
 
 
 
@@ -31,8 +39,41 @@
 
 
 
+_state_vars = {}
 
+def _declare_state(vartype, **kw):
+    g = globals()
+    for name, val in kw.iteritems():
+        g[name] = val
+        _state_vars[name] = vartype
+
+def __getstate__():
+    state = {}
+    g = globals()
+    for k, v in _state_vars.iteritems():
+        state[k] = g['_sget_'+v](g[k])
+    return state
+
+def __setstate__(state):
+    g = globals()
+    for k, v in state.iteritems():
+        g['_sset_'+_state_vars[k]](k, g[k], v)
+    return state
+
+def _sget_dict(val):
+    return val.copy()
+
+def _sset_dict(key, ob, state):
+    ob.clear()
+    ob.update(state)
+
+def _sget_object(val):
+    return val.__getstate__()
 
+def _sset_object(key, ob, state):
+    ob.__setstate__(state)
+
+_sget_none = _sset_none = lambda *args: None
 
 
 
@@ -164,14 +205,8 @@ def get_provider(moduleOrReq):
 
 def _macosx_vers(_cache=[]):
     if not _cache:
-        info = os.popen('/usr/bin/sw_vers').read().splitlines()
-        for line in info:
-            key, value = line.split(None, 1)
-            if key == 'ProductVersion:':
-                _cache.append(value.strip().split("."))
-                break
-        else:
-            raise ValueError, "What?!"
+        from platform import mac_ver
+        _cache.append(mac_ver()[0].split('.'))
     return _cache[0]
 
 def _macosx_arch(machine):
@@ -203,6 +238,12 @@ def get_build_platform():
 
 
 
+
+
+
+
+
+
 def compatible_platforms(provided,required):
     """Can code for the `provided` platform run on the `required` platform?
 
@@ -387,7 +428,7 @@ def __init__(self, entries=None):
     def add_entry(self, entry):
         """Add a path item to ``.entries``, finding any distributions on it
 
-        ``find_distributions(entry,False)`` is used to find distributions
+        ``find_distributions(entry, True)`` is used to find distributions
         corresponding to the path entry, and they are added.  `entry` is
         always appended to ``.entries``, even if it is already present.
         (This is because ``sys.path`` can contain the same value more than
@@ -622,7 +663,6 @@ def require(self, *requirements):
         activated to fulfill the requirements; all relevant distributions are
         included, even if they were already activated in this working set.
         """
-
         needed = self.resolve(parse_requirements(requirements))
 
         for dist in needed:
@@ -630,7 +670,6 @@ def require(self, *requirements):
 
         return needed
 
-
     def subscribe(self, callback):
         """Invoke `callback` for all distributions (including existing ones)"""
         if callback in self.callbacks:
@@ -639,19 +678,21 @@ def subscribe(self, callback):
         for dist in self:
             callback(dist)
 
-
     def _added_new(self, dist):
         for callback in self.callbacks:
             callback(dist)
 
+    def __getstate__(self):
+        return (
+            self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
+            self.callbacks[:]
+        )
 
-
-
-
-
-
-
-
+    def __setstate__(self, (entries, keys, by_key, callbacks)):
+        self.entries = entries[:]
+        self.entry_keys = keys.copy()
+        self.by_key = by_key.copy()
+        self.callbacks = callbacks[:]
 
 
 class Environment(object):
@@ -916,7 +957,7 @@ def get_cache_path(self, archive_name, names=()):
         extract_path = self.extraction_path or get_default_cache()
         target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
         try:
-            ensure_directory(target_path)
+            _bypass_ensure_directory(target_path)
         except:
             self.extraction_error()
 
@@ -1597,7 +1638,7 @@ def get_importer(path_item):
 
 
 
-_distribution_finders = {}
+_declare_state('dict', _distribution_finders = {})
 
 def register_finder(importer_type, distribution_finder):
     """Register `distribution_finder` to find distributions in sys.path items
@@ -1646,7 +1687,7 @@ def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
 
-    if os.path.isdir(path_item):
+    if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
         if path_item.lower().endswith('.egg'):
             # unpacked egg
             yield Distribution.from_filename(
@@ -1679,8 +1720,8 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(ImpWrapper,find_on_path)
 
-_namespace_handlers = {}
-_namespace_packages = {}
+_declare_state('dict', _namespace_handlers = {})
+_declare_state('dict', _namespace_packages = {})
 
 def register_namespace_handler(importer_type, namespace_handler):
     """Register `namespace_handler` to declare namespace packages
@@ -1709,7 +1750,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = new.module(packageName)
+        module = sys.modules[packageName] = imp.new_module(packageName)
         module.__path__ = []; _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
@@ -2220,12 +2261,9 @@ def insert_on(self, path, loc = None):
         if not loc:
             return
 
-        if path is sys.path:
-            self.check_version_conflict()
-
         nloc = _normalize_cached(loc)
         bdir = os.path.dirname(nloc)
-        npath= map(_normalize_cached, path)
+        npath= [(p and _normalize_cached(p) or p) for p in path]
 
         bp = None
         for p, item in enumerate(npath):
@@ -2233,10 +2271,14 @@ def insert_on(self, path, loc = None):
                 break
             elif item==bdir and self.precedence==EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
+                if path is sys.path:
+                    self.check_version_conflict()
                 path.insert(p, loc)
                 npath.insert(p, nloc)
                 break
         else:
+            if path is sys.path:
+                self.check_version_conflict()
             path.append(loc)
             return
 
@@ -2253,7 +2295,6 @@ def insert_on(self, path, loc = None):
         return
 
 
-
     def check_version_conflict(self):
         if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(
@@ -2267,7 +2308,7 @@ def check_version_conflict(self):
                 continue
 
             fn = getattr(sys.modules[modname], '__file__', None)
-            if fn and normalize_path(fn).startswith(loc):
+            if fn and (normalize_path(fn).startswith(loc) or fn.startswith(loc)):
                 continue
             issue_warning(
                 "Module %s was already imported from %s, but %s is being added"
@@ -2444,7 +2485,7 @@ def __eq__(self,other):
 
     def __contains__(self,item):
         if isinstance(item,Distribution):
-            if item.key <> self.key: return False
+            if item.key != self.key: return False
             if self.index: item = item.parsed_version  # only get if we need it
         elif isinstance(item,basestring):
             item = parse_version(item)
@@ -2541,7 +2582,7 @@ def _mkstemp(*args,**kw):
         os.open = old_open  # and then put it back
 
 
-# Set up global resource manager
+# Set up global resource manager (deliberately not state-saved)
 _manager = ResourceManager()
 def _initialize(g):
     for name in dir(_manager):
@@ -2550,7 +2591,7 @@ def _initialize(g):
 _initialize(globals())
 
 # Prepare the master working set and make the ``require()`` API available
-working_set = WorkingSet()
+_declare_state('object', working_set = WorkingSet())
 try:
     # Does the main program list any requirements?
     from __main__ import __requires__

From 5b2e22a7985daad2d7e44efc8b73d202d287a645 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2013 17:42:11 -0700
Subject: [PATCH 1135/8469] Remove newlines to simplify merge

--HG--
branch : Setuptools-Distribute merge
extra : source : 78b5054a6eefc60e57c76e14d968286fa8aa19c6
---
 pkg_resources.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 79db00b8c2..abb90b1a00 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -34,11 +34,6 @@ def _bypass_ensure_directory(name, mode=0777):
         mkdir(dirname, mode)
 
 
-
-
-
-
-
 _state_vars = {}
 
 def _declare_state(vartype, **kw):

From 4a327c5c8d2cae9d8abdc26109e4bae2f6f325e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Mar 2013 16:32:07 -0400
Subject: [PATCH 1136/8469] Adding MERGE notes

--HG--
branch : Setuptools-Distribute merge
extra : source : c404c8580bd1450d84cc4f0f32245ebd1130bcfc
---
 MERGE.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 MERGE.txt

diff --git a/MERGE.txt b/MERGE.txt
new file mode 100644
index 0000000000..e4cd20a0f5
--- /dev/null
+++ b/MERGE.txt
@@ -0,0 +1,25 @@
+With the merge of Setuptools and Distribute, the following concessions were
+made:
+
+Differences from setuptools 0.6c12:
+
+Major Changes
+-------------
+
+* Python 3 support.
+* Improved support for GAE.
+* Sort order of Distributions in pkg_resources now prefers PyPI to external
+  links (Distribute issue 163).
+
+Minor Changes
+-------------
+
+* Wording of some output has changed to replace contractions with their
+  canonical form (i.e. prefer "could not" to "couldn't").
+
+Differences from Distribute 0.6.35:
+
+Major Changes
+-------------
+
+* The _distribute property of the setuptools module has been removed.

From 9eebb2dfe17fa129f2201add401c8fb6eb0ebcc1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 10:39:35 -0400
Subject: [PATCH 1137/8469] Distributions are once again installed as zipped
 eggs by default.

--HG--
branch : Setuptools-Distribute merge
extra : source : f3b1c801d877734669007ad4f5d8cee091a6c767
---
 MERGE.txt                          | 5 +++++
 setuptools/command/easy_install.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/MERGE.txt b/MERGE.txt
index e4cd20a0f5..bcff09da48 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -23,3 +23,8 @@ Major Changes
 -------------
 
 * The _distribute property of the setuptools module has been removed.
+* Distributions are once again installed as zipped eggs by default, per the
+  rationale given in `the seminal bug report
+  <http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
+  should remain and no substantial justification was given in the `Distribute
+  report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8d44817f77..4ca0526d9d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -704,7 +704,7 @@ def should_unzip(self, dist):
             return True
         if not dist.has_metadata('zip-safe'):
             return True
-        return True
+        return False
 
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)

From f86079e4b6629d75a4650be64bdcbe89724138a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 10:42:11 -0400
Subject: [PATCH 1138/8469] Backed out improper fix for distribute issue #174

--HG--
branch : Setuptools-Distribute merge
extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908
---
 MERGE.txt                          | 7 +++++++
 setuptools/command/easy_install.py | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index bcff09da48..ecb140da26 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -28,3 +28,10 @@ Major Changes
   <http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
   should remain and no substantial justification was given in the `Distribute
   report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
+
+Minor Changes
+-------------
+
+* The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
+  has been rolled-back, as the comment on the ticket indicates that the patch
+  addressed a symptom and not the fundamental issue.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4ca0526d9d..655478b312 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -655,8 +655,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         self.update_pth(dist)
         self.package_index.add(dist)
         self.local_index.add(dist)
-        if not self.editable:
-            self.install_egg_scripts(dist)
+        self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
         if (dist.has_metadata('dependency_links.txt') and

From eafde2c8f2870bbe61084c73783b71a3329cafa0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 10:45:40 -0400
Subject: [PATCH 1139/8469] easy_install once again honors setup.cfg if found
 in the current directory

--HG--
branch : Setuptools-Distribute merge
extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83
---
 MERGE.txt                             |  4 +++
 setuptools/command/easy_install.py    |  6 -----
 setuptools/tests/test_easy_install.py | 37 +--------------------------
 3 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index ecb140da26..550273fb29 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -35,3 +35,7 @@ Minor Changes
 * The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
   has been rolled-back, as the comment on the ticket indicates that the patch
   addressed a symptom and not the fundamental issue.
+* ``easy_install`` (the command) once again honors setup.cfg if found in the
+  current directory. The "mis-behavior" characterized in `#99
+  <https://bitbucket.org/tarek/distribute/issue/99>`_ is actually intended
+  behavior, and no substantial rationale was given for the deviation.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 655478b312..47c1a3d899 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1925,12 +1925,6 @@ class DistributionWithoutHelpCommands(Distribution):
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
 
-        def find_config_files(self):
-            files = Distribution.find_config_files(self)
-            if 'setup.cfg' in files:
-                files.remove('setup.cfg')
-            return files
-
     if argv is None:
         argv = sys.argv[1:]
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4a65a8d243..395056e723 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -13,7 +13,7 @@
 import distutils.core
 
 from setuptools.sandbox import run_setup, SandboxViolation
-from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, main
+from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -84,41 +84,6 @@ def test_get_script_args(self):
 
         self.assertEqual(script, WANTED)
 
-    def test_no_setup_cfg(self):
-        # makes sure easy_install as a command (main)
-        # doesn't use a setup.cfg file that is located
-        # in the current working directory
-        dir = tempfile.mkdtemp()
-        setup_cfg = open(os.path.join(dir, 'setup.cfg'), 'w')
-        setup_cfg.write('[easy_install]\nfind_links = http://example.com')
-        setup_cfg.close()
-        setup_py = open(os.path.join(dir, 'setup.py'), 'w')
-        setup_py.write(SETUP_PY)
-        setup_py.close()
-
-        from setuptools.dist import Distribution
-
-        def _parse_command_line(self):
-            msg = 'Error: a local setup.cfg was used'
-            opts = self.command_options
-            if 'easy_install' in opts:
-                assert 'find_links' not in opts['easy_install'], msg
-            return self._old_parse_command_line()
-
-        Distribution._old_parse_command_line = Distribution.parse_command_line
-        Distribution.parse_command_line = _parse_command_line
-
-        old_wd = os.getcwd()
-        try:
-            os.chdir(dir)
-            reset_setup_stop_context(
-                lambda: self.assertRaises(SystemExit, main, [])
-            )
-        finally:
-            os.chdir(old_wd)
-            shutil.rmtree(dir)
-            Distribution.parse_command_line = Distribution._old_parse_command_line
-
     def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at
         # the project level

From 59cf01356e2611dd921d4cece2176fc9ea7cce59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 23:55:42 -0400
Subject: [PATCH 1140/8469] Move where add_defaults is defined to align with
 setuptools

--HG--
branch : Setuptools-Distribute merge
extra : source : 6728b2be550b4ed4015d5cdc88bc49141bc40878
---
 setuptools/command/sdist.py | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2fa3771aa6..b8c8495eec 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -157,7 +157,7 @@ def run(self):
         import distutils.command
         if 'check' not in distutils.command.__all__:
             self.check_metadata()
-            
+
         self.make_distribution()
 
         dist_files = getattr(self.distribution,'dist_files',[])
@@ -166,6 +166,26 @@ def run(self):
             if data not in dist_files:
                 dist_files.append(data)
 
+    def __read_template_hack(self):
+        # This grody hack closes the template file (MANIFEST.in) if an
+        #  exception occurs during read_template.
+        # Doing so prevents an error when easy_install attempts to delete the
+        #  file.
+        try:
+            _sdist.read_template(self)
+        except:
+            sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
+            raise
+    # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
+    #  has been fixed, so only override the method if we're using an earlier
+    #  Python.
+    if (
+            sys.version_info < (2,7,2)
+            or (3,0) <= sys.version_info < (3,1,4)
+            or (3,2) <= sys.version_info < (3,2,1)
+        ):
+        read_template = __read_template_hack
+
     def add_defaults(self):
         standards = [READMES,
                      self.distribution.script_name]
@@ -219,26 +239,6 @@ def add_defaults(self):
             build_scripts = self.get_finalized_command('build_scripts')
             self.filelist.extend(build_scripts.get_source_files())
 
-    def __read_template_hack(self):
-        # This grody hack closes the template file (MANIFEST.in) if an
-        #  exception occurs during read_template.
-        # Doing so prevents an error when easy_install attempts to delete the
-        #  file.
-        try:
-            _sdist.read_template(self)
-        except:
-            sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
-            raise
-    # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
-    #  has been fixed, so only override the method if we're using an earlier
-    #  Python.
-    if (
-            sys.version_info < (2,7,2)
-            or (3,0) <= sys.version_info < (3,1,4)
-            or (3,2) <= sys.version_info < (3,2,1)
-        ):
-        read_template = __read_template_hack
-
     def check_readme(self):
         for f in READMES:
             if os.path.exists(f):

From 6b9f1df35359a8a7b43975b32ee79d8f7259d8c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Mar 2013 11:01:29 -0700
Subject: [PATCH 1141/8469] Update sandbox.py to latest from setuptools-0.6

--HG--
branch : Setuptools-Distribute merge
extra : source : 7f4dd650af5779b69ae13fe6a1b4adce386b5489
---
 setuptools/sandbox.py | 79 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 19 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 4db0dbdb37..4c5e7129db 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,14 +1,46 @@
-import os, sys, __builtin__, tempfile, operator
+import os, sys, __builtin__, tempfile, operator, pkg_resources
 _os = sys.modules[os.name]
 _open = open
+_file = file
+
 from distutils.errors import DistutilsError
+from pkg_resources import working_set
+
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
-
     old_dir = os.getcwd()
     save_argv = sys.argv[:]
     save_path = sys.path[:]
@@ -16,13 +48,16 @@ def run_setup(setup_script, args):
     temp_dir = os.path.join(setup_dir,'temp')
     if not os.path.isdir(temp_dir): os.makedirs(temp_dir)
     save_tmp = tempfile.tempdir
-
+    save_modules = sys.modules.copy()
+    pr_state = pkg_resources.__getstate__()
     try:
-        tempfile.tempdir = temp_dir
-        os.chdir(setup_dir)
+        tempfile.tempdir = temp_dir; os.chdir(setup_dir)
         try:
             sys.argv[:] = [setup_script]+list(args)
             sys.path.insert(0, setup_dir)
+            # reset to include setup dir, w/clean callback list
+            working_set.__init__()  
+            working_set.callbacks.append(lambda dist:dist.activate())
             DirectorySandbox(setup_dir).run(
                 lambda: execfile(
                     "setup.py",
@@ -34,11 +69,17 @@ def run_setup(setup_script, args):
                 raise
             # Normal exit, just return
     finally:
+        pkg_resources.__setstate__(pr_state)
+        sys.modules.update(save_modules)
+        for key in list(sys.modules):
+            if key not in save_modules: del sys.modules[key]
         os.chdir(old_dir)
         sys.path[:] = save_path
         sys.argv[:] = save_argv
         tempfile.tempdir = save_tmp
 
+
+
 class AbstractSandbox:
     """Wrap 'os' module and 'open()' builtin for virtualizing setup scripts"""
 
@@ -58,15 +99,16 @@ def run(self, func):
         """Run 'func' under os sandboxing"""
         try:
             self._copy(self)
-            __builtin__.open = __builtin__.file = self._open
+            __builtin__.file = self._file
+            __builtin__.open = self._open
             self._active = True
             return func()
         finally:
             self._active = False
-            __builtin__.open = __builtin__.file = _open
+            __builtin__.open = _open
+            __builtin__.file = _file
             self._copy(_os)
 
-
     def _mk_dual_path_wrapper(name):
         original = getattr(_os,name)
         def wrap(self,src,dst,*args,**kw):
@@ -75,7 +117,6 @@ def wrap(self,src,dst,*args,**kw):
             return original(src,dst,*args,**kw)
         return wrap
 
-
     for name in ["rename", "link", "symlink"]:
         if hasattr(_os,name): locals()[name] = _mk_dual_path_wrapper(name)
 
@@ -88,7 +129,8 @@ def wrap(self,path,*args,**kw):
             return original(path,*args,**kw)
         return wrap
 
-    _open = _mk_single_path_wrapper('file', _open)
+    _open = _mk_single_path_wrapper('open', _open)
+    _file = _mk_single_path_wrapper('file', _file)
     for name in [
         "stat", "listdir", "chdir", "open", "chmod", "chown", "mkdir",
         "remove", "unlink", "rmdir", "utime", "lchown", "chroot", "lstat",
@@ -96,7 +138,6 @@ def wrap(self,path,*args,**kw):
     ]:
         if hasattr(_os,name): locals()[name] = _mk_single_path_wrapper(name)
 
-
     def _mk_single_with_return(name):
         original = getattr(_os,name)
         def wrap(self,path,*args,**kw):
@@ -162,10 +203,10 @@ def _open(self, path, mode='r', *args, **kw):
             self._violation("open", path, mode, *args, **kw)
         return _open(path,mode,*args,**kw)
 
-    def tmpnam(self):
-        self._violation("tmpnam")
+    def tmpnam(self): self._violation("tmpnam")
 
     def _ok(self,path):
+        if hasattr(_os,'devnull') and path==_os.devnull: return True
         active = self._active
         try:
             self._active = False
@@ -187,22 +228,22 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
+    def _file(self, path, mode='r', *args, **kw):
+        if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
+            self._violation("file", path, mode, *args, **kw)
+        return _file(path,mode,*args,**kw)
+
     def open(self, file, flags, mode=0777):
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode)
         return _os.open(file,flags,mode)
 
-
 WRITE_FLAGS = reduce(
-    operator.or_,
-    [getattr(_os, a, 0) for a in
+    operator.or_, [getattr(_os, a, 0) for a in
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
 )
 
-
-
-
 class SandboxViolation(DistutilsError):
     """A setup script attempted to modify the filesystem outside the sandbox"""
 

From 742bd477e51562a8548d3a18bd3695c76a618fc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Mar 2013 13:56:46 -0700
Subject: [PATCH 1142/8469] Copy changes to package_index from 1aae1efe5733

--HG--
branch : Setuptools-Distribute merge
extra : source : db6acae7b8cfb92007fe8e7ae4f392481b080a00
---
 setuptools/package_index.py | 113 ++++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 36 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index da3fed1248..9a9c5d62e7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
+import httplib, urllib
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
@@ -8,7 +9,6 @@
 except ImportError:
     from md5 import md5
 from fnmatch import translate
-
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
@@ -42,6 +42,8 @@ def parse_bdist_wininst(name):
 def egg_info_for_url(url):
     scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
     base = urllib2.unquote(path.split('/')[-1])
+    if server=='sourceforge.net' and base=='download':    # XXX Yuck
+        base = urllib2.unquote(path.split('/')[-2])
     if '#' in base: base, fragment = base.split('#',1)
     return base,fragment
 
@@ -64,14 +66,12 @@ def distros_for_location(location, basename, metadata=None):
     if basename.endswith('.egg') and '-' in basename:
         # only one, unambiguous interpretation
         return [Distribution.from_location(location, basename, metadata)]
-
     if basename.endswith('.exe'):
         win_base, py_ver = parse_bdist_wininst(basename)
         if win_base is not None:
             return interpret_distro_name(
                 location, win_base, metadata, py_ver, BINARY_DIST, "win32"
             )
-
     # Try source distro extensions (.zip, .tgz, etc.)
     #
     for ext in EXTENSIONS:
@@ -186,10 +186,10 @@ def process_url(self, url, retrieve=False):
             return
 
         self.info("Reading %s", url)
+        self.fetched_urls[url] = True   # prevent multiple fetch attempts
         f = self.open_url(url, "Download error: %s -- Some packages may not be found!")
         if f is None: return
-        self.fetched_urls[url] = self.fetched_urls[f.url] = True
-
+        self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
             f.close()   # not html, we can't process it
             return
@@ -329,7 +329,7 @@ def obtain(self, requirement, installer=None):
     def check_md5(self, cs, info, filename, tfp):
         if re.match('md5=[0-9a-f]{32}$', info):
             self.debug("Validating md5 checksum for %s", filename)
-            if cs.hexdigest()<>info[4:]:
+            if cs.hexdigest()!=info[4:]:
                 tfp.close()
                 os.unlink(filename)
                 raise DistutilsError(
@@ -409,7 +409,8 @@ def download(self, spec, tmpdir):
 
 
     def fetch_distribution(self,
-        requirement, tmpdir, force_scan=False, source=False, develop_ok=False
+        requirement, tmpdir, force_scan=False, source=False, develop_ok=False,
+        local_index=None, 
     ):
         """Obtain a distribution suitable for fulfilling `requirement`
 
@@ -427,15 +428,15 @@ def fetch_distribution(self,
         set, development and system eggs (i.e., those using the ``.egg-info``
         format) will be ignored.
         """
-
         # process a Requirement
         self.info("Searching for %s", requirement)
         skipped = {}
+        dist = None
 
-        def find(req):
+        def find(env, req):
             # Find a matching distribution; may be called more than once
 
-            for dist in self[req.key]:
+            for dist in env[req.key]:
 
                 if dist.precedence==DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
@@ -444,23 +445,25 @@ def find(req):
                     continue
 
                 if dist in req and (dist.precedence<=SOURCE_DIST or not source):
-                    self.info("Best match: %s", dist)
-                    return dist.clone(
-                        location=self.download(dist.location, tmpdir)
-                    )
+                    return dist
+
+
 
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
+            dist = find(self, requirement)
+            
+        if local_index is not None:
+            dist = dist or find(local_index, requirement)
 
-        dist = find(requirement)
         if dist is None and self.to_scan is not None:
             self.prescan()
-            dist = find(requirement)
+            dist = find(self, requirement)
 
         if dist is None and not force_scan:
             self.find_packages(requirement)
-            dist = find(requirement)
+            dist = find(self, requirement)
 
         if dist is None:
             self.warn(
@@ -468,7 +471,10 @@ def find(req):
                 (source and "a source distribution of " or ""),
                 requirement,
             )
-        return dist
+        else:
+            self.info("Best match: %s", dist)
+            return dist.clone(location=self.download(dist.location, tmpdir))
+
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`
@@ -484,12 +490,6 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         return None
 
 
-
-
-
-
-
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [d for d in
@@ -550,7 +550,7 @@ def _download_to(self, url, filename):
             bs = self.dl_blocksize
             size = -1
             if "content-length" in headers:
-                size = int(headers["Content-Length"])
+                size = max(map(int,headers.getheaders("Content-Length")))
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')
             while True:
@@ -573,24 +573,25 @@ def reporthook(self, url, filename, blocknum, blksize, size):
 
 
     def open_url(self, url, warning=None):
-        if url.startswith('file:'):
-            return local_open(url)
+        if url.startswith('file:'): return local_open(url)
         try:
             return open_with_auth(url)
         except urllib2.HTTPError, v:
             return v
         except urllib2.URLError, v:
-            if warning: self.warn(warning, v.reason)
-            else:
-                raise DistutilsError("Download error for %s: %s"
-                                     % (url, v.reason))
+            reason = v.reason
+        except httplib.HTTPException, v: 
+            reason = "%s: %s" % (v.__doc__ or v.__class__.__name__, v)
+        if warning:
+            self.warn(warning, reason)
+        else:
+            raise DistutilsError("Download error for %s: %s" % (url, reason))
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
         #
-        name = filter(None,urlparse.urlparse(url)[2].split('/'))
+        name, fragment = egg_info_for_url(url)
         if name:
-            name = name[-1]
             while '..' in name:
                 name = name.replace('..','.').replace('\\','_')
         else:
@@ -612,7 +613,6 @@ def _download_url(self, scheme, url, tmpdir):
             return self._attempt_download(url, filename)
 
 
-
     def scan_url(self, url):
         self.process_url(url, True)
 
@@ -639,10 +639,39 @@ def _download_html(self, url, headers, filename):
         os.unlink(filename)
         raise DistutilsError("Unexpected HTML page found at "+url)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        creds = ''
+        if url.lower().startswith('svn:') and '@' in url:
+            scheme, netloc, path, p, q, f = urlparse.urlparse(url)
+            if not netloc and path.startswith('//') and '/' in path[2:]:
+                netloc, path = path[2:].split('/',1)
+                auth, host = urllib.splituser(netloc)
+                if auth:
+                    if ':' in auth:
+                        user, pw = auth.split(':',1)
+                        creds = " --username=%s --password=%s" % (user, pw)
+                    else:
+                        creds = " --username="+auth
+                    netloc = host
+                    url = urlparse.urlunparse((scheme, netloc, url, p, q, f))
         self.info("Doing subversion checkout from %s to %s", url, filename)
-        os.system("svn checkout -q %s %s" % (url, filename))
+        os.system("svn checkout%s -q %s %s" % (creds, url, filename))
         return filename
 
     def debug(self, msg, *args):
@@ -654,6 +683,18 @@ def info(self, msg, *args):
     def warn(self, msg, *args):
         log.warn(msg, *args)
 
+
+
+
+
+
+
+
+
+
+
+
+
 # This pattern matches a character entity reference (a decimal numeric
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
@@ -701,7 +742,7 @@ def open_with_auth(url):
     scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
 
     if scheme in ('http', 'https'):
-        auth, host = urllib2.splituser(netloc)
+        auth, host = urllib.splituser(netloc)
     else:
         auth = None
 

From a65b6ea00662c72fff9a887b1313c439e32a9219 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Thu, 11 Apr 2013 18:04:06 -0700
Subject: [PATCH 1143/8469] Skip test when file system encoding is not
 suitable. Fixes #55 and Distribute #363.

---
 CHANGES.txt                    | 2 ++
 setuptools/tests/test_sdist.py | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f97dca3c18..b97c10046a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ CHANGES
   launcher for 'develop' installs).
 * ``ez_setup.py`` now ensures partial downloads are cleaned up following
   a failed download.
+* Distribute #363 and Issue #55: Skip an sdist test that fails on locales
+  other than UTF-8.
 
 -----
 1.1.6
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 438f7cedbd..19f6d4cd0f 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-
+import locale
 import os
 import shutil
 import sys
@@ -10,6 +10,7 @@
 import unicodedata
 
 from setuptools.compat import StringIO, unicode
+from setuptools.tests.py26compat import skipIf
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -318,6 +319,8 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
+    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
+            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From 46d1c4ed7df5722771e382a55fb79d9f1d16e389 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Thu, 25 Apr 2013 20:32:21 -0400
Subject: [PATCH 1144/8469] Fix spurious test breakage on 2.7 (grafted from
 aeb004b22c9472066322f4b0319588cddf63f699)

--HG--
branch : setuptools-0.6
extra : source : aeb004b22c9472066322f4b0319588cddf63f699
---
 setuptools/tests/test_resources.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 03e5d0f83b..fdd405af88 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -507,7 +507,7 @@ def test_get_script_header(self):
     def test_get_script_header_jython_workaround(self):
         platform = sys.platform
         sys.platform = 'java1.5.0_13'
-        stdout = sys.stdout
+        stdout, stderr = sys.stdout, sys.stderr
         try:
             # A mock sys.executable that uses a shebang line (this file)
             exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
@@ -517,17 +517,17 @@ def test_get_script_header_jython_workaround(self):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
             self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
-            sys.stdout = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
             self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
         finally:
             sys.platform = platform
-            sys.stdout = stdout
+            sys.stdout, sys.stderr = stdout, stderr
 

From 737fe613840baf2e10246ffb83f86690a0b1561b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 07:43:28 -0400
Subject: [PATCH 1145/8469] Copy changes to dist.py from 1aae1efe5733

--HG--
branch : Setuptools-Distribute merge
extra : source : a79dd619dc8637e5c9b7de32bd8c5389c995dcb9
---
 setuptools/dist.py | 53 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 30ff35e320..c1218ef218 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -8,7 +8,7 @@
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.errors import DistutilsSetupError
 import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
-import os, distutils.log
+import os, distutils.log, re
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
@@ -61,8 +61,8 @@ def check_nsp(dist, attr, value):
             parent = '.'.join(nsp.split('.')[:-1])
             if parent not in value:
                 distutils.log.warn(
-                    "%r is declared as a package namespace, but %r is not:"
-                    " please correct this in setup.py", nsp, parent
+                    "WARNING: %r is declared as a package namespace, but %r"
+                    " is not: please correct this in setup.py", nsp, parent
                 )
 
 def check_extras(dist, attr, value):
@@ -120,6 +120,47 @@ def check_package_data(dist, attr, value):
         attr+" must be a dictionary mapping package names to lists of "
         "wildcard patterns"
     )
+
+def check_packages(dist, attr, value):
+    for pkgname in value:
+        if not re.match(r'\w+(\.\w+)*', pkgname):
+            distutils.log.warn(
+                "WARNING: %r not a valid package name; please use only"
+                ".-separated package names in setup.py", pkgname
+            )
+            
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 class Distribution(_Distribution):
     """Distribution with support for features, tests, and package data
@@ -415,19 +456,19 @@ def exclude_package(self,package):
         if self.packages:
             self.packages = [
                 p for p in self.packages
-                    if p<>package and not p.startswith(pfx)
+                    if p!=package and not p.startswith(pfx)
             ]
 
         if self.py_modules:
             self.py_modules = [
                 p for p in self.py_modules
-                    if p<>package and not p.startswith(pfx)
+                    if p!=package and not p.startswith(pfx)
             ]
 
         if self.ext_modules:
             self.ext_modules = [
                 p for p in self.ext_modules
-                    if p.name<>package and not p.name.startswith(pfx)
+                    if p.name!=package and not p.name.startswith(pfx)
             ]
 
 

From b03a9e293b94b338027c4983c2ac3764692dd297 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 07:59:45 -0400
Subject: [PATCH 1146/8469] Copy changes to setuptools/archive_util.py
 setuptools/depends.py setuptools/extension.py and setuptools/__init__.py from
 1aae1efe5733

--HG--
branch : Setuptools-Distribute merge
extra : source : a3f8891a67625e751eacbf027d66feff19779da4
---
 setuptools/__init__.py     |  2 +-
 setuptools/archive_util.py | 36 ++++++++++++++++++------------------
 setuptools/depends.py      |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 56cbf7673b..71eeff4974 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c9'
+__version__ = '0.6c12'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 511f05ad5d..d44264f821 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -6,7 +6,7 @@
     "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
 ]
 
-import zipfile, tarfile, os, shutil
+import zipfile, tarfile, os, shutil, posixpath
 from pkg_resources import ensure_directory
 from distutils.errors import DistutilsError
 
@@ -138,7 +138,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
             name = info.filename
 
             # don't extract absolute paths or ones with .. in them
-            if name.startswith('/') or '..' in name:
+            if name.startswith('/') or '..' in name.split('/'):
                 continue
 
             target = os.path.join(extract_dir, *name.split('/'))
@@ -169,37 +169,37 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     by ``tarfile.open()``).  See ``unpack_archive()`` for an explanation
     of the `progress_filter` argument.
     """
-
     try:
         tarobj = tarfile.open(filename)
     except tarfile.TarError:
         raise UnrecognizedFormat(
             "%s is not a compressed or uncompressed tar file" % (filename,)
         )
-
     try:
         tarobj.chown = lambda *args: None   # don't do any chowning!
         for member in tarobj:
-            if member.isfile() or member.isdir():
-                name = member.name
-                # don't extract absolute paths or ones with .. in them
-                if not name.startswith('/') and '..' not in name:
-                    dst = os.path.join(extract_dir, *name.split('/'))                
+            name = member.name
+            # don't extract absolute paths or ones with .. in them
+            if not name.startswith('/') and '..' not in name.split('/'):
+                dst = os.path.join(extract_dir, *name.split('/'))
+                while member is not None and (member.islnk() or member.issym()):
+                    linkpath = member.linkname
+                    if member.issym():
+                        linkpath = posixpath.join(posixpath.dirname(member.name), linkpath)
+                        linkpath = posixpath.normpath(linkpath)
+                    member = tarobj._getmember(linkpath)
+    
+                if member is not None and (member.isfile() or member.isdir()):
                     dst = progress_filter(name, dst)
                     if dst:
                         if dst.endswith(os.sep):
                             dst = dst[:-1]
-                        tarobj._extract_member(member,dst)  # XXX Ugh
+                        try:
+                            tarobj._extract_member(member,dst)  # XXX Ugh
+                        except tarfile.ExtractError:
+                            pass    # chown/chmod/mkfifo/mknode/makedev failed
         return True
     finally:
         tarobj.close()
 
-
-
-
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile
-
-
-
-
-
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 4b7b343760..5fdf2d7e57 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -36,7 +36,7 @@ def full_name(self):
     def version_ok(self,version):
         """Is 'version' sufficiently up-to-date?"""
         return self.attribute is None or self.format is None or \
-            str(version)<>"unknown" and version >= self.requested_version
+            str(version)!="unknown" and version >= self.requested_version
 
 
     def get_version(self, paths=None, default="unknown"):

From b33cf3e333837cf2fa04af79bcd46094a047741b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 08:38:09 -0400
Subject: [PATCH 1147/8469] Copy changes to easy_install.py from 1aae1efe5733

--HG--
branch : Setuptools-Distribute merge
extra : source : 835ac45ae9db9a12fa13648ac556ac43c85f750b
---
 setuptools/command/easy_install.py | 63 ++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f06b6ddd7b..90f29320af 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -204,7 +204,7 @@ def finalize_options(self):
         self.outputs = []
 
     def run(self):
-        if self.verbose<>self.distribution.verbose:
+        if self.verbose!=self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
             for spec in self.args:
@@ -252,7 +252,7 @@ def check_site_dir(self):
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
         is_site_dir = instdir in self.all_site_dirs
 
-        if not is_site_dir:
+        if not is_site_dir and not self.multi_version:
             # No?  Then directly test whether it does .pth file processing
             is_site_dir = self.check_pth_processing()
         else:
@@ -430,9 +430,9 @@ def easy_install(self, spec, deps=False):
 
             self.check_editable(spec)
             dist = self.package_index.fetch_distribution(
-                spec, tmpdir, self.upgrade, self.editable, not self.always_copy
+                spec, tmpdir, self.upgrade, self.editable, not self.always_copy,
+                self.local_index
             )
-
             if dist is None:
                 msg = "Could not find suitable distribution for %r" % spec
                 if self.always_copy:
@@ -722,7 +722,7 @@ def install_exe(self, dist_filename, tmpdir):
             f = open(pkg_inf,'w')
             f.write('Metadata-Version: 1.0\n')
             for k,v in cfg.items('metadata'):
-                if k<>'target_version':
+                if k!='target_version':
                     f.write('%s: %s\n' % (k.replace('_','-').title(), v))
             f.close()
         script_dir = os.path.join(egg_info,'scripts')
@@ -988,7 +988,6 @@ def unpack_and_compile(self, egg_path, destination):
         def pf(src,dst):
             if dst.endswith('.py') and not src.startswith('EGG-INFO/'):
                 to_compile.append(dst)
-                to_chmod.append(dst)
             elif dst.endswith('.dll') or dst.endswith('.so'):
                 to_chmod.append(dst)
             self.unpack_progress(src,dst)
@@ -1023,6 +1022,7 @@ def byte_compile(self, to_compile):
 
 
 
+
     def no_default_version_msg(self):
         return """bad install directory or PYTHONPATH
 
@@ -1274,7 +1274,7 @@ def get_exe_prefixes(exe_filename):
 
     prefixes = [
         ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''),
-        ('PLATLIB/', ''),
+        ('PLATLIB/', ''), ('DATA/lib/site-packages/', ''),
         ('SCRIPTS/', 'EGG-INFO/scripts/')
     ]
     z = zipfile.ZipFile(exe_filename)
@@ -1286,7 +1286,7 @@ def get_exe_prefixes(exe_filename):
                 if parts[1].endswith('.egg-info'):
                     prefixes.insert(0,('/'.join(parts[:2]), 'EGG-INFO/'))
                     break
-            if len(parts)<>2 or not name.endswith('.pth'):
+            if len(parts)!=2 or not name.endswith('.pth'):
                 continue
             if name.endswith('-nspkg.pth'):
                 continue
@@ -1583,19 +1583,60 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
 
-                if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
+                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
                     hdr = new_header
                 else:
                     hdr = header
                 yield (name+ext, hdr+script_text, 't', [name+x for x in old])
                 yield (
                     name+'.exe', resource_string('setuptools', launcher),
-                    'b' # write in binary mode
-                )
+                    'b') # write in binary mode
+                yield (name+'.exe.manifest', _launcher_manifest % (name,), 't')
             else:
                 # On other platforms, we assume the right thing to do is to
                 # just write the stub with no extension.
                 yield (name, header+script_text)
+
+_launcher_manifest = """
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity version="1.0.0.0"
+ processorArchitecture="X86"
+ name="%s.exe"
+ type="win32"/>
+
+ <!-- Identify the application security requirements. -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>"""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
     """Recursively delete a directory tree.

From ff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 May 2013 23:09:46 -0400
Subject: [PATCH 1148/8469] Copy changes from 1aae1efe5733 for
 setuptools/command/* (except easy_install.py

--HG--
branch : Setuptools-Distribute merge
extra : source : 0c89fbb19c269ce1cb3bc3e9ece9864127768169
---
 setuptools/command/alias.py         |  4 +-
 setuptools/command/bdist_egg.py     |  6 +--
 setuptools/command/bdist_wininst.py | 67 ++++++++++++++++++-----
 setuptools/command/build_ext.py     | 18 +++----
 setuptools/command/egg_info.py      | 22 ++++----
 setuptools/command/sdist.py         | 83 +++++++++++++++++++++--------
 6 files changed, 141 insertions(+), 59 deletions(-)

diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index f5368b29e9..40c00b550b 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -9,7 +9,7 @@ def shquote(arg):
     """Quote an argument for later parsing by shlex.split()"""
     for c in '"', "'", "\\", "#":
         if c in arg: return repr(arg)
-    if arg.split()<>[arg]:
+    if arg.split()!=[arg]:
         return repr(arg)
     return arg        
 
@@ -33,7 +33,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         option_base.finalize_options(self)
-        if self.remove and len(self.args)<>1:
+        if self.remove and len(self.args)!=1:
             raise DistutilsOptionError(
                 "Must specify exactly one argument (the alias name) when "
                 "using --remove"
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9e852a3f15..7e5a37995c 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -165,12 +165,13 @@ def call_command(self,cmdname,**kw):
     def run(self):
         # Generate metadata first
         self.run_command("egg_info")
-
         # We run install_lib before install_data, because some data hacks
         # pull their data path from the install_lib command.
         log.info("installing library code to %s" % self.bdist_dir)
         instcmd = self.get_finalized_command('install')
         old_root = instcmd.root; instcmd.root = None
+        if self.distribution.has_c_libraries() and not self.skip_build:
+            self.run_command('build_clib')
         cmd = self.call_command('install_lib', warn_dir=0)
         instcmd.root = old_root
 
@@ -190,7 +191,6 @@ def run(self):
         to_compile.extend(self.make_init_files())
         if to_compile:
             cmd.byte_compile(to_compile)
-
         if self.distribution.data_files:
             self.do_install_data()
 
@@ -398,7 +398,7 @@ def write_safety_flag(egg_dir, safe):
     for flag,fn in safety_flags.items():
         fn = os.path.join(egg_dir, fn)
         if os.path.exists(fn):
-            if safe is None or bool(safe)<>flag:
+            if safe is None or bool(safe)!=flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe)==flag:
             f=open(fn,'wb'); f.write('\n'); f.close()
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 93e6846d79..e8521f834c 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -2,26 +2,24 @@
 import os, sys
 
 class bdist_wininst(_bdist_wininst):
+    _good_upload = _bad_upload = None
 
     def create_exe(self, arcname, fullname, bitmap=None):
         _bdist_wininst.create_exe(self, arcname, fullname, bitmap)
-        dist_files = getattr(self.distribution, 'dist_files', [])
-
+        installer_name = self.get_installer_filename(fullname) 
         if self.target_version:
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32-py%s.exe" %
-                                           (fullname, self.target_version))
             pyversion = self.target_version
-
-            # fix 2.5 bdist_wininst ignoring --target-version spec
-            bad = ('bdist_wininst','any',installer_name)
-            if bad in dist_files:
-                dist_files.remove(bad)
+            # fix 2.5+ bdist_wininst ignoring --target-version spec
+            self._bad_upload = ('bdist_wininst', 'any', installer_name)
         else:
-            installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32.exe" % fullname)
             pyversion = 'any'
-        good = ('bdist_wininst', pyversion, installer_name)
+        self._good_upload = ('bdist_wininst', pyversion, installer_name)
+        
+    def _fix_upload_names(self):
+        good, bad = self._good_upload, self._bad_upload
+        dist_files = getattr(self.distribution, 'dist_files', [])
+        if bad in dist_files:
+            dist_files.remove(bad)
         if good not in dist_files:
             dist_files.append(good)
 
@@ -36,6 +34,49 @@ def run(self):
         self._is_running = True
         try:
             _bdist_wininst.run(self)
+            self._fix_upload_names()
         finally:
             self._is_running = False
+
+
+    if not hasattr(_bdist_wininst, 'get_installer_filename'):
+        def get_installer_filename(self, fullname):
+            # Factored out to allow overriding in subclasses
+            if self.target_version:
+                # if we create an installer for a specific python version,
+                # it's better to include this in the name
+                installer_name = os.path.join(self.dist_dir,
+                                              "%s.win32-py%s.exe" %
+                                               (fullname, self.target_version))
+            else:
+                installer_name = os.path.join(self.dist_dir,
+                                              "%s.win32.exe" % fullname)
+            return installer_name
+    # get_installer_filename()
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c0aaa8e80c..f6f3355dcb 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -82,15 +82,15 @@ def swig_sources(self, sources, *otherargs):
 
     def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self,fullname)
-        ext = self.ext_map[fullname]
-        if isinstance(ext,Library):
-            fn, ext = os.path.splitext(filename)
-            return self.shlib_compiler.library_filename(fn,libtype)
-        elif use_stubs and ext._links_to_dynamic:
-            d,fn = os.path.split(filename)
-            return os.path.join(d,'dl-'+fn)
-        else:
-            return filename
+        if fullname in self.ext_map:
+            ext = self.ext_map[fullname]
+            if isinstance(ext,Library):
+                fn, ext = os.path.splitext(filename)
+                return self.shlib_compiler.library_filename(fn,libtype)
+            elif use_stubs and ext._links_to_dynamic:
+                d,fn = os.path.split(filename)
+                return os.path.join(d,'dl-'+fn)
+        return filename
 
     def initialize_options(self):
         _build_ext.initialize_options(self)
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9741e26a34..5a8b2db8d7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -217,18 +217,21 @@ def get_svn_revision(self):
             data = f.read()
             f.close()
 
-            if data.startswith('9') or data.startswith('8'):
+            if data.startswith('<?xml'):
+                dirurl = urlre.search(data).group(1)    # get repository URL
+                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
+            else:
+                try: svnver = int(data.splitlines()[0])
+                except: svnver=-1
+                if data<8:
+                    log.warn("unrecognized .svn/entries format; skipping %s", base)
+                    dirs[:] = []
+                    continue
+                   
                 data = map(str.splitlines,data.split('\n\x0c\n'))
                 del data[0][0]  # get rid of the '8' or '9'
                 dirurl = data[0][3]
                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
-            elif data.startswith('<?xml'):
-                dirurl = urlre.search(data).group(1)    # get repository URL
-                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
-            else:
-                log.warn("unrecognized .svn/entries format; skipping %s", base)
-                dirs[:] = []
-                continue
             if base==os.curdir:
                 base_url = dirurl+'/'   # save the root url
             elif not dirurl.startswith(base_url):
@@ -241,9 +244,6 @@ def get_svn_revision(self):
 
 
 
-
-
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 5bd5ebd490..d84afdb850 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,6 +1,7 @@
 from distutils.command.sdist import sdist as _sdist
 from distutils.util import convert_path
 from distutils import log
+from glob import glob
 import os, re, sys, pkg_resources
 
 entities = [
@@ -38,7 +39,6 @@ def joinpath(prefix,suffix):
 
 
 
-
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""
     for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
@@ -86,17 +86,21 @@ def entries_finder(dirname, filename):
     f = open(filename,'rU')
     data = f.read()
     f.close()
-    if data.startswith('9') or data.startswith('8'):    # subversion 1.5/1.4
+    if data.startswith('<?xml'):
+        for match in entries_pattern.finditer(data):
+            yield joinpath(dirname,unescape(match.group(1)))
+    else:
+        svnver=-1
+        try: svnver = int(data.splitlines()[0])
+        except: pass
+        if svnver<8:
+            log.warn("unrecognized .svn/entries format in %s", dirname)
+            return           
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted
             yield joinpath(dirname, record[0])
-    elif data.startswith('<?xml'):
-        for match in entries_pattern.finditer(data):
-            yield joinpath(dirname,unescape(match.group(1)))
-    else:
-        log.warn("unrecognized .svn/entries format in %s", dirname)
-
+        
 
 finders = [
     (convert_path('CVS/Entries'),
@@ -117,10 +121,6 @@ def entries_finder(dirname, filename):
 
 
 
-
-
-
-
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""
 
@@ -162,6 +162,56 @@ def read_template(self):
             sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
             raise
 
+    # Cribbed from old distutils code, to work around new distutils code
+    # that tries to do some of the same stuff as we do, in a way that makes
+    # us loop.
+    
+    def add_defaults (self):
+        standards = [('README', 'README.txt'), self.distribution.script_name]
+
+        for fn in standards:
+            if type(fn) is tuple:
+                alts = fn
+                got_it = 0
+                for fn in alts:
+                    if os.path.exists(fn):
+                        got_it = 1
+                        self.filelist.append(fn)
+                        break
+
+                if not got_it:
+                    self.warn("standard file not found: should have one of " +
+                              ', '.join(alts))
+            else:
+                if os.path.exists(fn):
+                    self.filelist.append(fn)
+                else:
+                    self.warn("standard file '%s' not found" % fn)
+
+        optional = ['test/test*.py', 'setup.cfg']
+        
+        for pattern in optional:
+            files = filter(os.path.isfile, glob(pattern))
+            if files:
+                self.filelist.extend(files)
+
+        if self.distribution.has_pure_modules():
+            build_py = self.get_finalized_command('build_py')
+            self.filelist.extend(build_py.get_source_files())
+
+        if self.distribution.has_ext_modules():
+            build_ext = self.get_finalized_command('build_ext')
+            self.filelist.extend(build_ext.get_source_files())
+
+        if self.distribution.has_c_libraries():
+            build_clib = self.get_finalized_command('build_clib')
+            self.filelist.extend(build_clib.get_source_files())
+
+        if self.distribution.has_scripts():
+            build_scripts = self.get_finalized_command('build_scripts')
+            self.filelist.extend(build_scripts.get_source_files())
+
+
     def check_readme(self):
         alts = ("README", "README.txt")
         for f in alts:
@@ -193,13 +243,4 @@ def make_release_tree(self, base_dir, files):
 
 
 
-
-
-
-
-
-
-
-
-
 #

From 2ef81e9e51106d228200737348d6646fe94ab435 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 09:37:53 -0400
Subject: [PATCH 1149/8469] Updated merge notes

--HG--
branch : Setuptools-Distribute merge
extra : source : 9d926f62c15cff2f25a9c8b8e9a2984246a5ba5c
---
 MERGE.txt | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/MERGE.txt b/MERGE.txt
index df2689f373..9cc94d3e00 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -1,3 +1,61 @@
+Process
+=======
+
+In order to try to accurately reflect the fork and then re-merge of the
+projects, the merge process brought both code trees together into one
+repository and grafted the Distribute fork onto the Setuptools development
+line (as if it had been created as a branch in the first place).
+
+The rebase to get distribute onto setuptools went something like this::
+
+    hg phase -d -f -r 26b4c29b62db
+    hg rebase -s 26b4c29b62db -d 7a5cf59c78d7
+
+The technique required a late version of mercurial (2.5) to work correctly.
+
+The only code that was included was the code that was ancestral to the public
+releases of Distribute 0.6. Additionally, because Setuptools was not hosted
+on Mercurial at the time of the fork and because the Distribute fork did not
+include a complete conversion of the Setuptools history, the Distribute
+changesets had to be re-applied to a new, different conversion of the
+Setuptools SVN repository. As a result, all of the hashes have changed.
+
+Distribute was grafted in a 'distribute' branch and the 'setuptools-0.6'
+branch was targeted for the merge. The 'setuptools' branch remains with
+unreleased code and may be incorporated in the future.
+
+Reconciling Differences
+=======================
+
+There were both technical and philosophical differences between Setuptools
+and Distribute. To reconcile these differences in a manageable way, the
+following technique was undertaken:
+
+In the 'distribute' branch, first remove code that is no longer relevant to
+setuptools (such as the setuptools patching code).
+
+Next, in the 'distribute' branch, at the point where the fork occurred (such
+that the code is still essentially pristine setuptools), copy changes for a
+single file or small group of files from a late revision of that file in the
+'setuptools-0.6' branch (1aae1efe5733 was used) and commit those changes. This
+step creates a new head. That head is then merged. It is in this Mercurial
+merge operation that the fundamental differences between Distribute and
+Setuptools are reconciled, but since only a single file or small set of files
+are used, the scope is limited.
+
+Finally, once all files have been reconciled and merged, the tip of the
+'distribute' branch represents the merged code. It is then merged with the
+'setuptools-0.6' branch, deferring to the 'distribute' branch::
+
+    hg update null
+    hg merge 1aae1efe5733
+    hg ci -m "New beginning in a default branch"
+    hg merge distribute --tool internal:other
+    hg ci -m "Merge with Distribute"
+
+Concessions
+===========
+
 With the merge of Setuptools and Distribute, the following concessions were
 made:
 
@@ -22,7 +80,7 @@ Minor Changes
   Distribute-based script launchers are used and they launch Python as a
   subprocess, rather than loading the Python DLL in-process.
 
-Differences from Distribute 0.6.35:
+Differences from Distribute 0.6.36:
 
 Major Changes
 -------------

From e7d341af8987659ae1fa79701515c16238fe22f6 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sat, 4 May 2013 16:21:50 -0400
Subject: [PATCH 1150/8469] Backport experimental environment marker support
 from the trunk

--HG--
branch : setuptools-0.6
---
 pkg_resources.py                     | 152 ++++++++++++++++++++++++---
 setuptools.egg-info/entry_points.txt |   3 +-
 setuptools/dist.py                   |   8 +-
 3 files changed, 143 insertions(+), 20 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 79db00b8c2..3192f2005d 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -144,7 +144,7 @@ def get_supported_platform():
     # Parsing functions and string utilities
     'parse_requirements', 'parse_version', 'safe_name', 'safe_version',
     'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections',
-    'safe_extra', 'to_filename',
+    'safe_extra', 'to_filename', 'invalid_marker', 'evaluate_marker',
 
     # filesystem utilities
     'ensure_directory', 'normalize_path',
@@ -1146,6 +1146,129 @@ def to_filename(name):
 
 
 
+_marker_names = {
+    'os': ['name'], 'sys': ['platform'],
+    'platform': ['version','machine','python_implementation'],
+    'python_version': [], 'python_full_version': [], 'extra':[],
+}
+
+_marker_values = {
+    'os_name': lambda: os.name,
+    'sys_platform': lambda: sys.platform,
+    'python_full_version': lambda: sys.version.split()[0],
+    'python_version': lambda:'%s.%s' % (sys.version_info[0], sys.version_info[1]),
+    'platform_version': lambda: _platinfo('version'),
+    'platform_machine': lambda: _platinfo('machine'),
+    'python_implementation': lambda: _platinfo('python_implementation') or _pyimp(),
+}
+
+def _platinfo(attr):
+    try:
+        import platform
+    except ImportError:
+        return ''
+    return getattr(platform, attr, lambda:'')()
+
+def _pyimp():
+    if sys.platform=='cli':
+        return 'IronPython'
+    elif sys.platform.startswith('java'):
+        return 'Jython'
+    elif '__pypy__' in sys.builtin_module_names:
+        return 'PyPy'
+    else:
+        return 'CPython'                
+
+def invalid_marker(text):
+    """Validate text as a PEP 426 environment marker; return exception or False"""
+    try:
+        evaluate_marker(text)
+    except SyntaxError:
+        return sys.exc_info()[1]            
+    return False
+
+def evaluate_marker(text, extra=None, _ops={}):
+    """Evaluate a PEP 426 environment marker; SyntaxError if marker is invalid"""
+
+    if not _ops:
+
+        from token import NAME, STRING
+        import token, symbol, operator
+        
+        def and_test(nodelist):
+            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+            return reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+        
+        def test(nodelist):
+            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+            return reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+        
+        def atom(nodelist):
+            t = nodelist[1][0]
+            if t == token.LPAR:
+                if nodelist[2][0] == token.RPAR:
+                    raise SyntaxError("Empty parentheses")
+                return interpret(nodelist[2])
+            raise SyntaxError("Language feature not supported in environment markers")
+        
+        def comparison(nodelist):
+            if len(nodelist)>4:
+                raise SyntaxError("Chained comparison not allowed in environment markers")
+            comp = nodelist[2][1]
+            cop = comp[1]
+            if comp[0] == NAME:
+                if len(nodelist[2]) == 3:
+                    if cop == 'not':
+                        cop = 'not in'
+                    else:
+                        cop = 'is not'
+            try:
+                cop = _ops[cop]
+            except KeyError:
+                raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
+            return cop(evaluate(nodelist[1]), evaluate(nodelist[3]))
+        
+        _ops.update({
+            symbol.test: test, symbol.and_test: and_test, symbol.atom: atom,
+            symbol.comparison: comparison, 'not in': lambda x,y: x not in y,
+            'in': lambda x,y: x in y, '==': operator.eq, '!=': operator.ne,
+        })
+        if hasattr(symbol,'or_test'):
+            _ops[symbol.or_test] = test
+
+    def interpret(nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        try:
+            op = _ops[nodelist[0]]
+        except KeyError:
+            raise SyntaxError("Comparison or logical expression expected")
+            raise SyntaxError("Language feature not supported in environment markers: "+symbol.sym_name[nodelist[0]])
+        return op(nodelist)
+        
+    def evaluate(nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        kind = nodelist[0]
+        name = nodelist[1]
+        #while len(name)==2: name = name[1]
+        if kind==NAME:
+            try:
+                op = _marker_values[name]
+            except KeyError:
+                raise SyntaxError("Unknown name %r" % name)
+            return op()
+        if kind==STRING:
+            s = nodelist[1]
+            if s[:1] not in "'\"" or s.startswith('"""') or s.startswith("'''") \
+            or '\\' in s:
+                raise SyntaxError(
+                    "Only plain strings allowed in environment markers")
+            return s[1:-1]
+        raise SyntaxError("Language feature not supported in environment markers")
+
+    import parser        
+    return interpret(parser.expr(text).totuple(1)[1])
+
+
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
 
@@ -1925,7 +2048,6 @@ def parse_version(s):
                 parts.pop()
         parts.append(part)
     return tuple(parts)
-
 class EntryPoint(object):
     """Object representing an advertised importable object"""
 
@@ -2139,7 +2261,14 @@ def _dep_map(self):
             dm = self.__dep_map = {None: []}
             for name in 'requires.txt', 'depends.txt':
                 for extra,reqs in split_sections(self._get_metadata(name)):
-                    if extra: extra = safe_extra(extra)
+                    if extra:
+                        if ':' in extra:
+                            extra, marker = extra.split(':',1)
+                            if invalid_marker(marker):
+                                reqs=[] # XXX warn
+                            elif not evaluate_marker(marker):
+                                reqs=[]
+                        extra = safe_extra(extra) or None                                                            
                     dm.setdefault(extra,[]).extend(parse_requirements(reqs))
             return dm
     _dep_map = property(_dep_map)
@@ -2163,6 +2292,8 @@ def _get_metadata(self,name):
             for line in self.get_metadata_lines(name):
                 yield line
 
+
+
     def activate(self,path=None):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None: path = sys.path
@@ -2201,6 +2332,9 @@ def __getattr__(self,attr):
             raise AttributeError,attr
         return getattr(self._provider, attr)
 
+
+
+
     #@classmethod
     def from_filename(cls,filename,metadata=None, **kw):
         return cls.from_location(
@@ -2242,18 +2376,6 @@ def get_entry_info(self, group, name):
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
     def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2642c316ea..04fbe4bee9 100755
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -7,6 +7,7 @@ build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -31,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.3 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/dist.py b/setuptools/dist.py
index c1218ef218..582cc557d9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -47,7 +47,6 @@ def assert_string_list(dist, attr, value):
         raise DistutilsSetupError(
             "%r must be a list of strings (got %r)" % (attr,value)
         )
-
 def check_nsp(dist, attr, value):
     """Verify that namespace packages are valid"""
     assert_string_list(dist,attr,value)
@@ -69,6 +68,10 @@ def check_extras(dist, attr, value):
     """Verify that extras_require mapping is valid"""
     try:
         for k,v in value.items():
+            if ':' in k:
+                k,m = k.split(':',1)
+                if pkg_resources.invalid_marker(m):
+                    raise DistutilsSetupError("Invalid environment marker: "+m)
             list(pkg_resources.parse_requirements(v))
     except (TypeError,ValueError,AttributeError):
         raise DistutilsSetupError(
@@ -77,9 +80,6 @@ def check_extras(dist, attr, value):
             "requirement specifiers."
         )
 
-
-
-
 def assert_bool(dist, attr, value):
     """Verify that value is True, False, 0, or 1"""
     if bool(value) != value:

From d53be3dea895338e9f19947b59e2c06488c57fbb Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sat, 4 May 2013 15:34:27 -0400
Subject: [PATCH 1151/8469] Enable safe SSL dependency installs via
 "easy_install setuptools[ssl]" (grafted from
 695a82c1934090e7c56ba74e7b5a2bdc13071698)

--HG--
branch : setuptools-0.6
extra : source : 695a82c1934090e7c56ba74e7b5a2bdc13071698
---
 setup.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/setup.py b/setup.py
index d496268742..b868d50869 100755
--- a/setup.py
+++ b/setup.py
@@ -91,31 +91,31 @@
     Topic :: System :: Archiving :: Packaging
     Topic :: System :: Systems Administration
     Topic :: Utilities""".splitlines() if f.strip()],
-    scripts = scripts,
+    extras_require = {
+        "ssl:sys_platform=='win32'": "wincertstore==0.1",
+        "ssl:sys_platform=='win32' and python_version in '2.3, 2.4'": "ctypes==1.0.2",
+        "ssl:python_version in '2.3, 2.4, 2.5'":"ssl==1.16",
+    },
+    dependency_links = [
+        'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
+        'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
+        'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3',
+        'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.4.exe/download#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
+        'http://peak.telecommunity.com/dist/ssl-1.16-py2.3-win32.egg#md5=658f74b3eb6f32050e8531bb73de8e74',
+        'http://peak.telecommunity.com/dist/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
+        'http://peak.telecommunity.com/dist/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
+    ],
+    scripts = [],
 
     # uncomment for testing
     # setup_requires = ['setuptools>=0.6a0'],
+    # tests_require = "setuptools[ssl]",
 )
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

From c2488982d312b8eb577fbf7e364d0860102cf14d Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sat, 4 May 2013 16:02:34 -0400
Subject: [PATCH 1152/8469] Make sure ssl is installable even from source
 checkout (grafted from 0ecea0fc56e1c862ef57dac038e00cbff4e171bc)

--HG--
branch : setuptools-0.6
extra : source : 0ecea0fc56e1c862ef57dac038e00cbff4e171bc
---
 setuptools.egg-info/dependency_links.txt |  7 +++++++
 setuptools.egg-info/requires.txt         | 10 ++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 setuptools.egg-info/dependency_links.txt
 create mode 100644 setuptools.egg-info/requires.txt

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
new file mode 100644
index 0000000000..a659a050c6
--- /dev/null
+++ b/setuptools.egg-info/dependency_links.txt
@@ -0,0 +1,7 @@
+http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
+http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
+http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3
+http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.4.exe/download#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
+http://peak.telecommunity.com/dist/ssl-1.16-py2.3-win32.egg#md5=658f74b3eb6f32050e8531bb73de8e74
+http://peak.telecommunity.com/dist/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
+http://peak.telecommunity.com/dist/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
new file mode 100644
index 0000000000..517f15d8a2
--- /dev/null
+++ b/setuptools.egg-info/requires.txt
@@ -0,0 +1,10 @@
+
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version in '2.3, 2.4']
+ctypes==1.0.2
+
+[ssl:python_version in '2.3, 2.4, 2.5']
+ssl==1.16
\ No newline at end of file

From 27d44ebd4ca443c9df123f308b46cc1cbd7d2404 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sat, 4 May 2013 16:07:01 -0400
Subject: [PATCH 1153/8469] Low-level SSL verification w/out warnings or
 options; automatically uses it if it can, won't if it doesn't. (grafted from
 8dc579408781836ecf30b637665ad7f2509933a5)

--HG--
branch : setuptools-0.6
extra : source : 8dc579408781836ecf30b637665ad7f2509933a5
---
 setuptools/package_index.py |  28 ++--
 setuptools/ssl_support.py   | 246 ++++++++++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+), 14 deletions(-)
 create mode 100644 setuptools/ssl_support.py

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1668e76547..aab2bb231f 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,6 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
-import httplib, urllib
+import httplib, urllib; from setuptools import ssl_support
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
@@ -145,12 +145,11 @@ def find_external_links(url, page):
     urllib2.__version__, require('setuptools')[0].version
 )
 
-
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
     def __init__(self, index_url="https://pypi.python.org/simple", hosts=('*',),
-        *args, **kw
+        ca_bundle=None, verify_ssl=True, *args, **kw
     ):
         Environment.__init__(self,*args,**kw)
         self.index_url = index_url + "/"[:not index_url.endswith('/')]
@@ -159,8 +158,9 @@ def __init__(self, index_url="https://pypi.python.org/simple", hosts=('*',),
         self.package_pages = {}
         self.allows = re.compile('|'.join(map(translate,hosts))).match
         self.to_scan = []
-
-
+        if verify_ssl and ssl_support.is_available and (ca_bundle or ssl_support.find_ca_bundle()):
+            self.opener = ssl_support.opener_for(ca_bundle)
+        else: self.opener = urllib2.urlopen
 
     def process_url(self, url, retrieve=False):
         """Evaluate a URL as a possible download, and maybe retrieve it"""
@@ -575,12 +575,13 @@ def reporthook(self, url, filename, blocknum, blksize, size):
     def open_url(self, url, warning=None):
         if url.startswith('file:'): return local_open(url)
         try:
-            return open_with_auth(url)
-        except urllib2.HTTPError, v:
-            return v
-        except urllib2.URLError, v:
-            reason = v.reason
-        except httplib.HTTPException, v: 
+            return open_with_auth(url, self.opener)
+        except urllib2.HTTPError:
+            return sys.exc_info()[1]
+        except urllib2.URLError:
+            reason = sys.exc_info()[1].reason
+        except httplib.HTTPException:
+            v = sys.exc_info()[1]
             reason = "%s: %s" % (v.__doc__ or v.__class__.__name__, v)
         if warning:
             self.warn(warning, reason)
@@ -612,7 +613,6 @@ def _download_url(self, scheme, url, tmpdir):
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
 
-
     def scan_url(self, url):
         self.process_url(url, True)
 
@@ -736,7 +736,7 @@ def htmldecode(text):
 
 
 
-def open_with_auth(url):
+def open_with_auth(url, opener=urllib2.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
     scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
@@ -755,7 +755,7 @@ def open_with_auth(url):
         request = urllib2.Request(url)
 
     request.add_header('User-Agent', user_agent)
-    fp = urllib2.urlopen(request)
+    fp = opener(request)
 
     if auth:
         # Put authentication info back into request URL if same host,
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
new file mode 100644
index 0000000000..fe9d5df240
--- /dev/null
+++ b/setuptools/ssl_support.py
@@ -0,0 +1,246 @@
+import sys, os, socket, urllib2, atexit, re
+
+try:
+    import ssl
+except ImportError:
+    ssl = None
+
+__all__ = [
+    'VerifyingHTTPSHandler', 'find_ca_bundle', 'is_available', 'cert_paths',
+    'opener_for'
+]
+
+cert_paths = """
+/etc/pki/tls/certs/ca-bundle.crt
+/etc/ssl/certs/ca-certificates.crt
+/usr/share/ssl/certs/ca-bundle.crt
+/usr/local/share/certs/ca-root.crt
+/etc/ssl/cert.pem
+/System/Library/OpenSSL/certs/cert.pem
+""".strip().split()
+
+
+HTTPSHandler = HTTPSConnection = object
+
+for what, where in (
+    ('HTTPSHandler', ['urllib2','urllib.request']),
+    ('HTTPSConnection', ['httplib', 'http.client']),
+):
+    for module in where:
+        try:
+            exec("from %s import %s" % (module, what))
+        except ImportError:
+            pass
+
+is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
+
+
+
+
+
+
+try:
+    from socket import create_connection
+except ImportError:
+    _GLOBAL_DEFAULT_TIMEOUT = getattr(socket, '_GLOBAL_DEFAULT_TIMEOUT', object())
+    def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
+                          source_address=None):
+        """Connect to *address* and return the socket object.
+    
+        Convenience function.  Connect to *address* (a 2-tuple ``(host,
+        port)``) and return the socket object.  Passing the optional
+        *timeout* parameter will set the timeout on the socket instance
+        before attempting to connect.  If no *timeout* is supplied, the
+        global default timeout setting returned by :func:`getdefaulttimeout`
+        is used.  If *source_address* is set it must be a tuple of (host, port)
+        for the socket to bind as a source address before making the connection.
+        An host of '' or port 0 tells the OS to use the default.
+        """   
+        host, port = address
+        err = None
+        for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+            af, socktype, proto, canonname, sa = res
+            sock = None
+            try:
+                sock = socket.socket(af, socktype, proto)
+                if timeout is not _GLOBAL_DEFAULT_TIMEOUT:
+                    sock.settimeout(timeout)
+                if source_address:
+                    sock.bind(source_address)
+                sock.connect(sa)
+                return sock
+
+            except error:
+                err = True
+                if sock is not None:
+                    sock.close()    
+        if err:
+            raise
+        else:
+            raise error("getaddrinfo returns an empty list")
+
+
+try:
+    from ssl import CertificateError, match_hostname
+except ImportError:
+    class CertificateError(ValueError):
+        pass
+       
+    def _dnsname_to_pat(dn):
+        pats = []
+        for frag in dn.split(r'.'):
+            if frag == '*':
+                # When '*' is a fragment by itself, it matches a non-empty dotless
+                # fragment.
+                pats.append('[^.]+')
+            else:
+                # Otherwise, '*' matches any dotless fragment.
+                frag = re.escape(frag)
+                pats.append(frag.replace(r'\*', '[^.]*'))
+        return re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+       
+    def match_hostname(cert, hostname):
+        """Verify that *cert* (in decoded format as returned by
+        SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 rules
+        are mostly followed, but IP addresses are not accepted for *hostname*.
+    
+        CertificateError is raised on failure. On success, the function
+        returns nothing.
+        """
+        if not cert:
+            raise ValueError("empty or no certificate")
+        dnsnames = []
+        san = cert.get('subjectAltName', ())
+        for key, value in san:
+            if key == 'DNS':
+                if _dnsname_to_pat(value).match(hostname):
+                    return
+                dnsnames.append(value)
+        if not dnsnames:
+            # The subject is only checked when there is no dNSName entry
+            # in subjectAltName
+            for sub in cert.get('subject', ()):
+                for key, value in sub:
+                    # XXX according to RFC 2818, the most specific Common Name
+                    # must be used.
+                    if key == 'commonName':
+                        if _dnsname_to_pat(value).match(hostname):
+                            return
+                        dnsnames.append(value)
+        if len(dnsnames) > 1:
+            raise CertificateError("hostname %r "
+                "doesn't match either of %s"
+                % (hostname, ', '.join(map(repr, dnsnames))))
+        elif len(dnsnames) == 1:
+            raise CertificateError("hostname %r "
+                "doesn't match %r"
+                % (hostname, dnsnames[0]))
+        else:
+            raise CertificateError("no appropriate commonName or "
+                "subjectAltName fields were found")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+class VerifyingHTTPSHandler(HTTPSHandler):
+    """Simple verifying handler: no auth, subclasses, timeouts, etc."""
+
+    def __init__(self, ca_bundle):
+        self.ca_bundle = ca_bundle
+        HTTPSHandler.__init__(self)
+
+    def https_open(self, req):
+        return self.do_open(
+            lambda host, **kw: VerifyingHTTPSConn(host, self.ca_bundle, **kw), req
+        )
+
+
+class VerifyingHTTPSConn(HTTPSConnection):
+    """Simple verifying connection: no auth, subclasses, timeouts, etc."""
+    def __init__(self, host, ca_bundle, **kw):         
+        HTTPSConnection.__init__(self, host, **kw)
+        self.ca_bundle = ca_bundle
+
+    def connect(self):
+        sock = create_connection(
+            (self.host, self.port), getattr(self,'source_address',None)
+        )
+        self.sock = ssl.wrap_socket(
+            sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
+        )               
+        try:
+            match_hostname(self.sock.getpeercert(), self.host)
+        except CertificateError:
+            self.sock.shutdown(socket.SHUT_RDWR)
+            self.sock.close()
+            raise
+
+def opener_for(ca_bundle=None):
+    """Get a urlopen() replacement that uses ca_bundle for verification"""
+    return urllib2.build_opener(
+        VerifyingHTTPSHandler(ca_bundle or find_ca_bundle())
+    ).open
+
+        
+
+_wincerts = None
+
+def get_win_certfile():
+    global _wincerts
+    if _wincerts is not None:
+        return _wincerts.name
+
+    try:        
+        from wincertstore import CertFile
+    except ImportError:
+        return None
+
+    class MyCertFile(CertFile):
+        def __init__(self, stores=(), certs=()):
+            CertFile.__init__(self)
+            for store in stores:
+                self.addstore(store)
+            self.addcerts(certs)
+            atexit.register(self.close)            
+
+    _wincerts = MyCertFile(stores=['CA', 'ROOT'])
+    return _wincerts.name
+    
+def find_ca_bundle():
+    """Return an existing CA bundle path, or None"""
+    if os.name=='nt':
+        return get_win_certfile()
+    else:
+        for cert_path in cert_paths:
+            if os.path.isfile(cert_path):
+                return cert_path
+
+
+
+
+
+
+
+
+
+

From d6faaf34a953d9c30c9c64c4038470881958ddc1 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sat, 4 May 2013 16:32:55 -0400
Subject: [PATCH 1154/8469] Merge environment marker tests from the trunk

--HG--
branch : setuptools-0.6
---
 api_tests.txt | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/api_tests.txt b/api_tests.txt
index 735ad8dd68..cb25454bb5 100755
--- a/api_tests.txt
+++ b/api_tests.txt
@@ -328,3 +328,94 @@ setuptools is provided as well::
     >>> cp("darwin-8.2.0-Power_Macintosh", "macosx-10.3-ppc")
     False
 
+
+Environment Markers
+-------------------
+
+    >>> from pkg_resources import invalid_marker as im, evaluate_marker as em
+    >>> import os
+
+    >>> print(im("sys_platform"))
+    Comparison or logical expression expected
+
+    >>> print(im("sys_platform=="))
+    unexpected EOF while parsing (line 1)
+    
+    >>> print(im("sys_platform=='win32'"))
+    False
+
+    >>> print(im("sys=='x'"))
+    Unknown name 'sys'
+
+    >>> print(im("(extra)"))
+    Comparison or logical expression expected
+
+    >>> print(im("(extra"))
+    unexpected EOF while parsing (line 1)
+
+    >>> print(im("os.open('foo')=='y'"))
+    Language feature not supported in environment markers
+    
+    >>> print(im("'x'=='y' and os.open('foo')=='y'"))   # no short-circuit!
+    Language feature not supported in environment markers
+
+    >>> print(im("'x'=='x' or os.open('foo')=='y'"))   # no short-circuit!
+    Language feature not supported in environment markers
+
+    >>> print(im("'x' < 'y'"))
+    '<' operator not allowed in environment markers
+    
+    >>> print(im("'x' < 'y' < 'z'"))
+    Chained comparison not allowed in environment markers
+
+    >>> print(im("r'x'=='x'"))
+    Only plain strings allowed in environment markers
+    
+    >>> print(im("'''x'''=='x'"))
+    Only plain strings allowed in environment markers
+    
+    >>> print(im('"""x"""=="x"'))
+    Only plain strings allowed in environment markers
+    
+    >>> print(im(r"'x\n'=='x'"))
+    Only plain strings allowed in environment markers
+
+    >>> print(im("os.open=='y'"))
+    Language feature not supported in environment markers
+    
+    >>> em('"x"=="x"')
+    True
+
+    >>> em('"x"=="y"')
+    False
+
+    >>> em('"x"=="y" and "x"=="x"')
+    False
+
+    >>> em('"x"=="y" or "x"=="x"')
+    True
+
+    >>> em('"x"=="y" and "x"=="q" or "z"=="z"')
+    True
+
+    >>> em('"x"=="y" and ("x"=="q" or "z"=="z")')
+    False
+
+    >>> em('"x"=="y" and "z"=="z" or "x"=="q"')
+    False
+
+    >>> em('"x"=="x" and "z"=="z" or "x"=="q"')
+    True
+
+    >>> em("sys_platform=='win32'") == (sys.platform=='win32')
+    True
+
+    >>> em("'x' in 'yx'")
+    True
+
+    >>> em("'yx' in 'x'")
+    False
+
+
+
+

From 476342be985a7478e13618b578d111f7781b108b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:37:14 -0400
Subject: [PATCH 1155/8469] Updated merge notes to reflect less invasive change
 (and regression). Thanks PJE for pointing out the flaw in my reasoning.

--HG--
branch : Setuptools-Distribute merge
extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3
---
 MERGE.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 9cc94d3e00..37e85d8545 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -76,9 +76,7 @@ Minor Changes
 
 * Wording of some output has changed to replace contractions with their
   canonical form (i.e. prefer "could not" to "couldn't").
-* Manifest files are no longer written for .exe launchers. The
-  Distribute-based script launchers are used and they launch Python as a
-  subprocess, rather than loading the Python DLL in-process.
+* Manifest files are only written for 32-bit .exe launchers.
 
 Differences from Distribute 0.6.36:
 

From 430529414dec7264d11400d2c1bd8a207ee76904 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Sun, 5 May 2013 14:35:27 -0400
Subject: [PATCH 1156/8469] Add support for fallback to 'certifi' module, if
 installed+active. (grafted from 4a183cf275264653005072be25a644273463ba83)

--HG--
branch : setuptools-0.6
extra : source : 4a183cf275264653005072be25a644273463ba83
---
 setup.py                                 |  4 ++--
 setuptools.egg-info/dependency_links.txt |  1 +
 setuptools.egg-info/requires.txt         |  3 +++
 setuptools/ssl_support.py                | 14 +++++++-------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index b868d50869..c13f9320ab 100755
--- a/setup.py
+++ b/setup.py
@@ -95,8 +95,10 @@
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
         "ssl:sys_platform=='win32' and python_version in '2.3, 2.4'": "ctypes==1.0.2",
         "ssl:python_version in '2.3, 2.4, 2.5'":"ssl==1.16",
+        "certs": "certifi==0.0.8",
     },
     dependency_links = [
+        'http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3',
@@ -119,5 +121,3 @@
 
 
 
-
-
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index a659a050c6..d490c30035 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,3 +1,4 @@
+http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
 http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 517f15d8a2..9ddbc5aca0 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,6 +3,9 @@
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
+[certs]
+certifi==0.0.8
+
 [ssl:sys_platform=='win32' and python_version in '2.3, 2.4']
 ctypes==1.0.2
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index fe9d5df240..f1d8c92032 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,4 +1,5 @@
 import sys, os, socket, urllib2, atexit, re
+from pkg_resources import ResolutionError, ExtractionError
 
 try:
     import ssl
@@ -38,7 +39,6 @@
 
 
 
-
 try:
     from socket import create_connection
 except ImportError:
@@ -225,7 +225,8 @@ def __init__(self, stores=(), certs=()):
 
     _wincerts = MyCertFile(stores=['CA', 'ROOT'])
     return _wincerts.name
-    
+
+
 def find_ca_bundle():
     """Return an existing CA bundle path, or None"""
     if os.name=='nt':
@@ -234,11 +235,10 @@ def find_ca_bundle():
         for cert_path in cert_paths:
             if os.path.isfile(cert_path):
                 return cert_path
-
-
-
-
-
+    try:
+        return pkg_resources.resource_filename('certifi', 'cacert.pem')
+    except (ImportError, ResolutionError, ExtractionError):
+        return None
 
 
 

From c46bdf7f7f29f9cba3ff89450fb8cb49d9ddc109 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 11:54:22 +0100
Subject: [PATCH 1157/8469] Update merge notes again to reflect revised
 technique

--HG--
branch : Setuptools-Distribute merge
---
 MERGE.txt | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 37e85d8545..cf5ecd5747 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -31,27 +31,34 @@ There were both technical and philosophical differences between Setuptools
 and Distribute. To reconcile these differences in a manageable way, the
 following technique was undertaken:
 
-In the 'distribute' branch, first remove code that is no longer relevant to
-setuptools (such as the setuptools patching code).
+Create a 'Setuptools-Distribute merge' branch, based on a late release of
+Distribute (0.6.35). This was done with a00b441856c4.
 
-Next, in the 'distribute' branch, at the point where the fork occurred (such
-that the code is still essentially pristine setuptools), copy changes for a
+In that branch, first remove code that is no longer relevant to
+Setuptools (such as the setuptools patching code).
+
+Next, in the the merge branch, create another base from at the point where the
+fork occurred (such that the code is still essentially an older but pristine
+setuptools). This base can be found as 955792b069d0. This creates two heads
+in the merge branch, each with a basis in the fork.
+
+Then, repeatedly copy changes for a
 single file or small group of files from a late revision of that file in the
-'setuptools-0.6' branch (1aae1efe5733 was used) and commit those changes. This
-step creates a new head. That head is then merged. It is in this Mercurial
+'setuptools-0.6' branch (1aae1efe5733 was used) and commit those changes on
+the setuptools-only head. That head is then merged with the head with
+Distribute changes. It is in this Mercurial
 merge operation that the fundamental differences between Distribute and
 Setuptools are reconciled, but since only a single file or small set of files
 are used, the scope is limited.
 
 Finally, once all files have been reconciled and merged, the tip of the
-'distribute' branch represents the merged code. It is then merged with the
-'setuptools-0.6' branch, deferring to the 'distribute' branch::
-
-    hg update null
-    hg merge 1aae1efe5733
-    hg ci -m "New beginning in a default branch"
-    hg merge distribute --tool internal:other
-    hg ci -m "Merge with Distribute"
+merge branch represents the merged code.
+
+Originally, jaraco attempted all of this using anonymous heads in the
+Distribute branch, but later realized this technique made for a somewhat
+unclear merge process, so the changes were re-committed as described above
+for clarity. In this way, the "distribute" and "setuptools" branches can
+continue to track the official "distribute" changesets.
 
 Concessions
 ===========

From a0d19667eaa92bd95f2bebfcb50a68d0921282eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 12:10:02 +0100
Subject: [PATCH 1158/8469] Updated merge notes again to reference relevant
 changesets and final process

--HG--
branch : Setuptools-Distribute merge
---
 MERGE.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index cf5ecd5747..f836f35414 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,14 +51,15 @@ merge operation that the fundamental differences between Distribute and
 Setuptools are reconciled, but since only a single file or small set of files
 are used, the scope is limited.
 
-Finally, once all files have been reconciled and merged, the tip of the
-merge branch represents the merged code.
+Finally, once all the challenging files have been reconciled and merged, the
+remaining changes from the setuptools-0.6 branch are merged, deferring to the
+reconciled changes (a1fa855a5a62 and 160ccaa46be0).
 
 Originally, jaraco attempted all of this using anonymous heads in the
 Distribute branch, but later realized this technique made for a somewhat
 unclear merge process, so the changes were re-committed as described above
 for clarity. In this way, the "distribute" and "setuptools" branches can
-continue to track the official "distribute" changesets.
+continue to track the official Distribute changesets.
 
 Concessions
 ===========

From 94e2f8b4674735b16f02651a9fac29a7d5f75835 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 May 2013 08:10:01 -0400
Subject: [PATCH 1159/8469] Re-ran egg_info on Python 2.7 (causes upload
 command to disappear)

---
 setuptools.egg-info/entry_points.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 5b799e94f1..663882d630 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -7,7 +7,6 @@ build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
-upload = setuptools.command.upload:upload
 upload_docs = setuptools.command.upload_docs:upload_docs
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias

From 40da992b5e706a5bb5ac438256633828c2640f53 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 May 2013 08:13:26 -0400
Subject: [PATCH 1160/8469] Setuptools 0.7 only supports Python 2.4+. Moved
 external references for ctypes and Windows SSL builds to an authoritative
 location (with the project on bitbucket).

---
 setup.py                                 | 11 +++++------
 setuptools.egg-info/dependency_links.txt |  7 +++----
 setuptools.egg-info/requires.txt         |  8 ++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index 164f4edbc1..c5dcbdbaaf 100755
--- a/setup.py
+++ b/setup.py
@@ -209,8 +209,8 @@ def run(self):
         """).strip().splitlines(),
     extras_require = {
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
-        "ssl:sys_platform=='win32' and python_version in '2.3, 2.4'": "ctypes==1.0.2",
-        "ssl:python_version in '2.3, 2.4, 2.5'":"ssl==1.16",
+        "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
+        "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
         "certs": "certifi==0.0.8",
     },
     dependency_links = [
@@ -218,10 +218,9 @@ def run(self):
         'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3',
-        'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.4.exe/download#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
-        'http://peak.telecommunity.com/dist/ssl-1.16-py2.3-win32.egg#md5=658f74b3eb6f32050e8531bb73de8e74',
-        'http://peak.telecommunity.com/dist/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
-        'http://peak.telecommunity.com/dist/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
+        'http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
+        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
+        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
     ],
     scripts = [],
     # tests_require = "setuptools[ssl]",
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index d490c30035..a725f332b7 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -2,7 +2,6 @@ http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e
 http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
 http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3
-http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.4.exe/download#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
-http://peak.telecommunity.com/dist/ssl-1.16-py2.3-win32.egg#md5=658f74b3eb6f32050e8531bb73de8e74
-http://peak.telecommunity.com/dist/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
-http://peak.telecommunity.com/dist/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
+http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
+http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
+http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9ddbc5aca0..91d84d9ca8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version in '2.3, 2.4']
-ctypes==1.0.2
-
-[ssl:python_version in '2.3, 2.4, 2.5']
+[ssl:python_version in '2.4, 2.5']
 ssl==1.16
\ No newline at end of file

From 17bc3630ba27ac4ce6fe4537f071e5621c31a5bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 May 2013 08:22:02 -0400
Subject: [PATCH 1161/8469] Update versions in preparation for an 0.7b1 release

---
 docs/conf.py | 4 ++--
 ez_setup.py  | 2 +-
 release.py   | 6 ++----
 setup.py     | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 9a60cfe18f..25022b031e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.40'
+version = '0.7b1'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.40'
+release = '0.7b1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 57f019b12d..cb9fafb24d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -47,7 +47,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.40"
+DEFAULT_VERSION = "0.7b1"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/release.py b/release.py
index 2dc51ae822..48871986e4 100644
--- a/release.py
+++ b/release.py
@@ -22,8 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.40'
-PACKAGE_INDEX = 'https://pypi.python.org/pypi'
+VERSION = '0.7b1'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version():
@@ -33,8 +32,7 @@ def get_next_version():
 
 NEXT_VERSION = get_next_version()
 
-files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
-	'README.txt', 'distribute_setup.py')
+files_with_versions = 'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py'
 
 def get_repo_name():
 	"""
diff --git a/setup.py b/setup.py
index c5dcbdbaaf..8bd55b1846 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.40"
+VERSION = "0.7b1"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 9073ffa68ed6e3e73484d8b9d2e6d79eacd3c96f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 May 2013 08:24:51 -0400
Subject: [PATCH 1162/8469] Added tag 0.7b1 for changeset 9b2e2aa06e05

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b433c91f43..34b79febd1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -49,3 +49,4 @@ be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
 2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
 f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
 d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
+9b2e2aa06e058c63e06c5e42a7f279ddae2dfb7d 0.7b1

From 22a549287b1c504420e40d21501c55f9bc62db3a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 May 2013 07:52:19 -0400
Subject: [PATCH 1163/8469] Revert README to match setuptools-0.6 branch
 (originally copied from requests implementation which was not used).

---
 README.txt | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/README.txt b/README.txt
index 12b1e390b6..22d76da2db 100755
--- a/README.txt
+++ b/README.txt
@@ -5,36 +5,6 @@ Installing and Using Setuptools
 .. contents:: **Table of Contents**
 
 
-----------------------------------
-Security Issues - Read this First!
-----------------------------------
-
-Setuptools and ``easy_install`` currently default to allowing automated
-download and execution of code from anywhere on the internet, without actually
-verifying the owners of the websites or the authors of the code.  If you want
-your installation to be more secure, you will need to:
-
- 1. Manually install the `requests <https://pypi.python.org/pypi/requests>`_
-    library **after** installing setuptools, using an SSL-enabled browser or
-    other tool.  (This will enable SSL certificate verification.)
-
- 2. Configure your default ``--allow-hosts`` setting so that ``easy_install``
-    will only download from sites you trust.  (E.g., to only download from
-    ``pypi.python.org`` or some other trusted package index.)
-
- 3. If you are using a Python version less than 2.6, you will also need to
-    install the `SSL backport module <https://pypi.python.org/pypi/requests>`_
-    to enable SSL downloads from PyPI.  (Unfortunately, the ``requests``
-    package does not support older versions of Python at this time, so SSL
-    certificate verification will not be enabled.  But at least you'll still be
-    able to use PyPI, which is in the process of switching to an all-SSL policy
-    for downloads.
-    
-For more information on how to do all of the above, and for other security-
-related information, please see the full `setuptools security documentation
-<http://peak.telecommunity.com/DevCenter/SetuptoolsSecurity>`_.
-
-
 -------------------------
 Installation Instructions
 -------------------------

From af3f2330cc900f367d3ba4eb425b846148c8b414 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 May 2013 07:56:07 -0400
Subject: [PATCH 1164/8469] Updated readme to include note about removing
 distribute as well

---
 README.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index 22d76da2db..69e327642a 100755
--- a/README.txt
+++ b/README.txt
@@ -23,8 +23,9 @@ Windows
 
 
 NOTE: Regardless of what sort of Python you're using, if you've previously
-installed older versions of setuptools, please delete all ``setuptools*.egg``
-and ``setuptools.pth`` files from your system's ``site-packages`` directory
+installed older versions of setuptools or distribute, please delete all
+``setuptools*.egg``, ``distribute*.egg``, and ``setuptools.pth`` files and
+directories from your system's ``site-packages`` directory
 (and any other ``sys.path`` directories) FIRST.
 
 If you are upgrading a previous version of setuptools that was installed using
@@ -102,8 +103,8 @@ Package Index`_.  Scroll to the very bottom of the page to find the links.
 
 .. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
 
-In addition to the PyPI downloads, the development version of ``setuptools``   
-is available from the `Python SVN sandbox`_, and in-development versions of the 
+In addition to the PyPI downloads, the development version of ``setuptools``
+is available from the `Python SVN sandbox`_, and in-development versions of the
 `0.6 branch`_ are available as well.
 
 .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06

From cd39b89526cd1a7f37d144cf07820cd2ca052f69 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 May 2013 07:58:03 -0400
Subject: [PATCH 1165/8469] Reindent long lines

---
 README.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 69e327642a..6297ca01cd 100755
--- a/README.txt
+++ b/README.txt
@@ -16,7 +16,10 @@ Windows
     Install setuptools using the provided ``.exe`` installer.
 
 64-bit versions of Python
-    Download `ez_setup.py`_ and run it; it will download the appropriate .egg file and install it for you.  (Currently, the provided ``.exe`` installer does not support 64-bit versions of Python for Windows, due to a `distutils installer compatibility issue`_
+    Download `ez_setup.py`_ and run it; it will download the appropriate .egg
+    file and install it for you.  (Currently, the provided ``.exe`` installer
+    does not support 64-bit versions of Python for Windows, due to a
+    `distutils installer compatibility issue`_
 
 .. _ez_setup.py: http://peak.telecommunity.com/dist/ez_setup.py
 .. _distutils installer compatibility issue: http://bugs.python.org/issue6792

From b4fffca5bc50fffaff74404fe6dc3157c8246a73 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 May 2013 08:03:19 -0400
Subject: [PATCH 1166/8469] Replaced telecommunity link with bitbucket link

---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 6297ca01cd..63dfd54078 100755
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ Windows
     does not support 64-bit versions of Python for Windows, due to a
     `distutils installer compatibility issue`_
 
-.. _ez_setup.py: http://peak.telecommunity.com/dist/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/default/ez_setup.py
 .. _distutils installer compatibility issue: http://bugs.python.org/issue6792
 
 

From 5da758824995633435c165754b8c7b7342b8372a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 May 2013 08:19:41 -0400
Subject: [PATCH 1167/8469] Update documentation references to point to new
 anticipated location at pythonhosted.org

---
 README.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.txt b/README.txt
index 63dfd54078..07bdbc2eca 100755
--- a/README.txt
+++ b/README.txt
@@ -134,12 +134,12 @@ them there, so this reference list can be updated.  If you have working,
 *tested* patches to correct problems or add features, you may submit them to
 the `setuptools bug tracker`_.
 
-.. _setuptools bug tracker: http://bugs.python.org/setuptools/
-.. _Package Compatibility Notes: http://peak.telecommunity.com/DevCenter/PackageNotes
-.. _The Internal Structure of Python Eggs: http://peak.telecommunity.com/DevCenter/EggFormats
-.. _The setuptools Developer's Guide: http://peak.telecommunity.com/DevCenter/setuptools
-.. _The pkg_resources API reference: http://peak.telecommunity.com/DevCenter/PkgResources
-.. _The EasyInstall user's guide and reference manual: http://peak.telecommunity.com/DevCenter/EasyInstall
+.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
+.. _Package Compatibility Notes: https://pythonhosted.org/setuptools/PackageNotes
+.. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
+.. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
+.. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html
+.. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
 
 

From 7ad02bac8fa7250a96bad6c864e82792e6427273 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Wed, 15 May 2013 17:55:20 -0400
Subject: [PATCH 1168/8469] Fix broken devnull check; fixes issue 93 (grafted
 from 4dd378f0f048fbb1906dc5e71ef736fc4f089211)

--HG--
branch : setuptools-0.6
extra : source : 4dd378f0f048fbb1906dc5e71ef736fc4f089211
---
 setuptools/sandbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 4c5e7129db..8b889a783d 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -206,7 +206,7 @@ def _open(self, path, mode='r', *args, **kw):
     def tmpnam(self): self._violation("tmpnam")
 
     def _ok(self,path):
-        if hasattr(_os,'devnull') and path==_os.devnull: return True
+        if hasattr(os,'devnull') and path==os.devnull: return True
         active = self._active
         try:
             self._active = False

From 150a2700ce85b5b574d2f7fc13f5f72039190230 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 May 2013 18:51:22 -0400
Subject: [PATCH 1169/8469] Correct spelling of the seminal author's name

---
 CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d35d9e1153..9007aecedb 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -20,7 +20,7 @@ Contributors
 * Martin von Löwis
 * Noufal Ibrahim
 * Pete Hollobon
-* Philip J. Eby
+* Phillip J. Eby
 * Philip Jenvey
 * Reinout van Rees
 * Robert Myers

From 95b4277b80b7b35e1c9f16c487f6fb3fe804ac47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 May 2013 18:55:02 -0400
Subject: [PATCH 1170/8469] Indicate that environment markers are experimental

---
 CHANGES.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 566d10fe5d..9f2b4f1473 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,9 +11,12 @@ CHANGES
 Added several features that were slated for setuptools 0.6c12:
 
 * Index URL now defaults to HTTPS.
-* Added environment marker support. Now clients may designate a PEP-426
-  environment marker for "extra" dependencies. For an example, see the
-  Setuptools ``setup.py`` script.
+* Added experimental environment marker support. Now clients may designate a
+  PEP-426 environment marker for "extra" dependencies. Setuptools uses this
+  feature in ``setup.py`` for optional SSL and certificate validation support
+  on older platforms. Based on Distutils-SIG discussions, the syntax is
+  somewhat tentative. There should probably be a PEP with a firmer spec before
+  the feature should be considered suitable for use.
 * Added support for SSL certificate validation when installing packages from
   an HTTPS service.
 

From 585abe8ae6bfdb75f12181629e029b37a7cf3ea6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 May 2013 18:55:41 -0400
Subject: [PATCH 1171/8469] Remove ctypes link for Python 2.3 (not supported)

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8bd55b1846..90baa789ea 100755
--- a/setup.py
+++ b/setup.py
@@ -217,7 +217,6 @@ def run(self):
         'http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
-        'http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3',
         'http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
         'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
         'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',

From ac16aa2d54815d3e805c60a38afa5f4c9f3d282f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 16 May 2013 08:17:22 -0400
Subject: [PATCH 1172/8469] Remove redundant exception for os.devnull

--HG--
branch : Setuptools-Distribute merge
---
 setuptools/sandbox.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e026ff13e5..f309512532 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -61,7 +61,7 @@ def run_setup(setup_script, args):
             sys.argv[:] = [setup_script]+list(args)
             sys.path.insert(0, setup_dir)
             # reset to include setup dir, w/clean callback list
-            working_set.__init__()  
+            working_set.__init__()
             working_set.callbacks.append(lambda dist:dist.activate())
             DirectorySandbox(setup_dir).run(
                 lambda: execfile(
@@ -241,7 +241,6 @@ def tmpnam(self):
         self._violation("tmpnam")
 
     def _ok(self,path):
-        if hasattr(_os,'devnull') and path==_os.devnull: return True
         active = self._active
         try:
             self._active = False

From 16e9ae36591d3cdeb2a097f32a6782361b66e0c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 21:58:08 -0400
Subject: [PATCH 1173/8469] Update test to work with latest SSL-enabled URL
 opening technique.

---
 setuptools.egg-info/dependency_links.txt |   1 -
 setuptools.egg-info/entry_points.txt     | 124 +++++++++++------------
 setuptools/tests/test_packageindex.py    |  16 ++-
 3 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index a725f332b7..a54d9039cc 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,7 +1,6 @@
 http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
-http://sourceforge.net/projects/ctypes/files/ctypes/1.0.2/ctypes-1.0.2.win32-py2.3.exe/download#md5=9afe4b75240a8808a24df7a76b6081e3
 http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
 http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
 http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 663882d630..2965458969 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 9c4bfadb0c..ad856e81f5 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -46,18 +46,14 @@ def _urlopen(*args):
             import httplib
             raise httplib.BadStatusLine('line')
 
-        old_urlopen = urllib2.urlopen
-        urllib2.urlopen = _urlopen
+        index.opener = _urlopen
         url = 'http://example.com'
         try:
-            try:
-                v = index.open_url(url)
-            except Exception, v:
-                self.assertTrue('line' in str(v))
-            else:
-                raise AssertionError('Should have raise here!')
-        finally:
-            urllib2.urlopen = old_urlopen
+            v = index.open_url(url)
+        except Exception, v:
+            self.assertTrue('line' in str(v))
+        else:
+            raise AssertionError('Should have raise here!')
 
     def test_bad_url_double_scheme(self):
         """

From 1ad68c6f3dee2d96f831e078dd7b58a4c39c08c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 22:21:42 -0400
Subject: [PATCH 1174/8469] Try doctest with full exception name

---
 tests/api_tests.txt | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index cb25454bb5..b55740213a 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -211,8 +211,8 @@ working set triggers a ``pkg_resources.VersionConflict`` error:
     >>> ws.find(Requirement.parse("Bar==1.0")) # doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
       ...
-    VersionConflict: (Bar 0.9 (http://example.com/something),
-                      Requirement.parse('Bar==1.0'))
+    pkg_resources.VersionConflict: (Bar 0.9 (http://example.com/something),
+                                    Requirement.parse('Bar==1.0'))
 
 You can subscribe a callback function to receive notifications whenever a new
 distribution is added to a working set.  The callback is immediately invoked
@@ -222,14 +222,14 @@ again for new distributions added thereafter::
     >>> def added(dist): print "Added", dist
     >>> ws.subscribe(added)
     Added Bar 0.9
-    >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12") 
+    >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12")
     >>> ws.add(foo12)
     Added Foo 1.2
 
 Note, however, that only the first distribution added for a given project name
 will trigger a callback, even during the initial ``subscribe()`` callback::
 
-    >>> foo14 = Distribution(project_name="Foo", version="1.4", location="f14") 
+    >>> foo14 = Distribution(project_name="Foo", version="1.4", location="f14")
     >>> ws.add(foo14)   # no callback, because Foo 1.2 is already active
 
     >>> ws = WorkingSet([])
@@ -237,7 +237,7 @@ will trigger a callback, even during the initial ``subscribe()`` callback::
     >>> ws.add(foo14)
     >>> ws.subscribe(added)
     Added Foo 1.2
-    
+
 And adding a callback more than once has no effect, either::
 
     >>> ws.subscribe(added)     # no callbacks
@@ -260,7 +260,7 @@ Finding Plugins
     >>> plugins.add(foo12)
     >>> plugins.add(foo14)
     >>> plugins.add(just_a_test)
-    
+
 In the simplest case, we just get the newest version of each distribution in
 the plugin environment::
 
@@ -318,7 +318,7 @@ number does not matter::
     >>> cp("macosx-9.5-ppc", reqd)
     False
 
-Backwards compatibility for packages made via earlier versions of 
+Backwards compatibility for packages made via earlier versions of
 setuptools is provided as well::
 
     >>> cp("darwin-8.2.0-Power_Macintosh", reqd)
@@ -340,7 +340,7 @@ Environment Markers
 
     >>> print(im("sys_platform=="))
     unexpected EOF while parsing (line 1)
-    
+
     >>> print(im("sys_platform=='win32'"))
     False
 
@@ -355,7 +355,7 @@ Environment Markers
 
     >>> print(im("os.open('foo')=='y'"))
     Language feature not supported in environment markers
-    
+
     >>> print(im("'x'=='y' and os.open('foo')=='y'"))   # no short-circuit!
     Language feature not supported in environment markers
 
@@ -364,25 +364,25 @@ Environment Markers
 
     >>> print(im("'x' < 'y'"))
     '<' operator not allowed in environment markers
-    
+
     >>> print(im("'x' < 'y' < 'z'"))
     Chained comparison not allowed in environment markers
 
     >>> print(im("r'x'=='x'"))
     Only plain strings allowed in environment markers
-    
+
     >>> print(im("'''x'''=='x'"))
     Only plain strings allowed in environment markers
-    
+
     >>> print(im('"""x"""=="x"'))
     Only plain strings allowed in environment markers
-    
+
     >>> print(im(r"'x\n'=='x'"))
     Only plain strings allowed in environment markers
 
     >>> print(im("os.open=='y'"))
     Language feature not supported in environment markers
-    
+
     >>> em('"x"=="x"')
     True
 

From 28c5207103c91950079cbe58ac6b7455af351d49 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 22:37:40 -0400
Subject: [PATCH 1175/8469] Update doctest to use syntax suitable for Python 2
 and Python 3. Credit to Lennart Regebro for the [hints in his
 book](http://python3porting.com/problems.html#handling-expected-exceptions).

---
 tests/api_tests.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index b55740213a..06e14a33b9 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -208,11 +208,14 @@ You can ask a WorkingSet to ``find()`` a distribution matching a requirement::
 Note that asking for a conflicting version of a distribution already in a
 working set triggers a ``pkg_resources.VersionConflict`` error:
 
-    >>> ws.find(Requirement.parse("Bar==1.0")) # doctest: +NORMALIZE_WHITESPACE
-    Traceback (most recent call last):
-      ...
-    pkg_resources.VersionConflict: (Bar 0.9 (http://example.com/something),
-                                    Requirement.parse('Bar==1.0'))
+    >>> try:
+    ...     ws.find(Requirement.parse("Bar==1.0"))
+    ... except pkg_resources.VersionConflict:
+    ...     exc = sys.exc_info()[1]
+    ...     print(str(exc))
+    ... else:
+    ...     raise AssertionError("VersionConflict was not raised")
+    (Bar 0.9 (http://examples.com/something), Requirement.parse('Bar==1.0'))
 
 You can subscribe a callback function to receive notifications whenever a new
 distribution is added to a working set.  The callback is immediately invoked

From efc915b3a20012ab7a6200b7b99fa970ea6dfbe4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 22:45:59 -0400
Subject: [PATCH 1176/8469] Fix typo

---
 tests/api_tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 06e14a33b9..364b3d6f1b 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -215,7 +215,7 @@ working set triggers a ``pkg_resources.VersionConflict`` error:
     ...     print(str(exc))
     ... else:
     ...     raise AssertionError("VersionConflict was not raised")
-    (Bar 0.9 (http://examples.com/something), Requirement.parse('Bar==1.0'))
+    (Bar 0.9 (http://example.com/something), Requirement.parse('Bar==1.0'))
 
 You can subscribe a callback function to receive notifications whenever a new
 distribution is added to a working set.  The callback is immediately invoked

From f1427c0e80b583800c59f4013d08b45a4cbb8250 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:13:47 -0400
Subject: [PATCH 1177/8469] SVN is no longer used.

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index d7dfbb772e..176cc47e09 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,5 @@
 [egg_info]
 tag_build = dev
-tag_svn_revision = 1
 
 [aliases]
 release = egg_info -RDb ''

From 0465490edb621f16353aa5ac7d9661cf69accf8b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:30:20 -0400
Subject: [PATCH 1178/8469] Updated get_next_version to bump arbitrary versions
 and added doctests.

---
 release.py | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/release.py b/release.py
index 283340fb5a..10c21e24b1 100644
--- a/release.py
+++ b/release.py
@@ -25,12 +25,32 @@
 VERSION = '0.7b1'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
-def get_next_version():
-	digits = map(int, VERSION.split('.'))
-	digits[-1] += 1
-	return '.'.join(map(str, digits))
+def get_next_version(version):
+	"""
+	Infer a next version from the current version by incrementing the last
+	number or appending a number.
+
+	>>> get_next_version('1.0')
+	'1.1'
+
+	>>> get_next_version('1.0b')
+	'1.0b1'
+
+	>>> get_next_version('1.0.9')
+	'1.0.10'
+
+	>>> get_next_version('1')
+	'2'
+
+	>>> get_next_version('')
+	'1'
+	"""
+	def incr(match):
+		ver = int(match.group(0) or '0')
+		return str(ver + 1)
+	return re.sub('\d*$', incr, version)
 
-NEXT_VERSION = get_next_version()
+NEXT_VERSION = get_next_version(VERSION)
 
 files_with_versions = 'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py'
 

From 6075a86ef9810670e9b89c9f4321aad19158fad0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:36:21 -0400
Subject: [PATCH 1179/8469] Bump to 0.7b2 for next release

---
 docs/conf.py | 4 ++--
 ez_setup.py  | 2 +-
 release.py   | 2 +-
 setup.py     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 25022b031e..3ce8913e9e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7b1'
+version = '0.7b2'
 # The full version, including alpha/beta/rc tags.
-release = '0.7b1'
+release = '0.7b2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index cb9fafb24d..34882266b5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -47,7 +47,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.7b1"
+DEFAULT_VERSION = "0.7b2"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/release.py b/release.py
index 10c21e24b1..229f8ed857 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7b1'
+VERSION = '0.7b2'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version(version):
diff --git a/setup.py b/setup.py
index 134336ea96..f43b07e2e4 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7b1"
+VERSION = "0.7b2"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 0496e68c19f392c9da7081935709c8f8f0f01605 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:46:08 -0400
Subject: [PATCH 1180/8469] Extract function for uploading to pypi

---
 release.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/release.py b/release.py
index 229f8ed857..98a3944ff5 100644
--- a/release.py
+++ b/release.py
@@ -132,21 +132,7 @@ def do_release():
 
 	subprocess.check_call(['hg', 'update', VERSION])
 
-	linkify('CHANGES.txt', 'CHANGES (links).txt')
-
-	has_docs = build_docs()
-	if os.path.isdir('./dist'):
-		shutil.rmtree('./dist')
-	cmd = [
-		sys.executable, 'setup.py', '-q',
-		'egg_info', '-RD', '-b', '',
-		'sdist',
-		'register', '-r', PACKAGE_INDEX,
-		'upload', '-r', PACKAGE_INDEX,
-	]
-	if has_docs:
-		cmd.extend(['upload_docs', '-r', PACKAGE_INDEX])
-	subprocess.check_call(cmd)
+	upload_to_pypi()
 	upload_bootstrap_script()
 
 	# update to the tip for the next operation
@@ -163,6 +149,23 @@ def do_release():
 
 	add_milestone_and_version()
 
+def upload_to_pypi():
+	linkify('CHANGES.txt', 'CHANGES (links).txt')
+
+	has_docs = build_docs()
+	if os.path.isdir('./dist'):
+		shutil.rmtree('./dist')
+	cmd = [
+		sys.executable, 'setup.py', '-q',
+		'egg_info', '-RD', '-b', '',
+		'sdist',
+		'register', '-r', PACKAGE_INDEX,
+		'upload', '-r', PACKAGE_INDEX,
+	]
+	if has_docs:
+		cmd.extend(['upload_docs', '-r', PACKAGE_INDEX])
+	subprocess.check_call(cmd)
+
 def has_sphinx():
 	try:
 		devnull = open(os.path.devnull, 'wb')

From 1bc6912c187819269f60ec7851a43a778b6881b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:47:04 -0400
Subject: [PATCH 1181/8469] Added tag 0.7b2 for changeset 8951daac6c1b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f27c75b999..0909dae156 100644
--- a/.hgtags
+++ b/.hgtags
@@ -53,3 +53,4 @@ d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
+8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2

From 8f52bc5f9db7b202461c6d2421930545a683fb5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:59:46 -0400
Subject: [PATCH 1182/8469] Bump to next anticipated version

---
 docs/conf.py | 4 ++--
 ez_setup.py  | 2 +-
 release.py   | 2 +-
 setup.py     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3ce8913e9e..1a896681ec 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7b2'
+version = '0.7b3'
 # The full version, including alpha/beta/rc tags.
-release = '0.7b2'
+release = '0.7b3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 34882266b5..ec3d3fd76c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -47,7 +47,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.7b2"
+DEFAULT_VERSION = "0.7b3"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/release.py b/release.py
index 98a3944ff5..f3d8387202 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7b2'
+VERSION = '0.7b3'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version(version):
diff --git a/setup.py b/setup.py
index f43b07e2e4..9334d7d84f 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7b2"
+VERSION = "0.7b3"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 59d45d94058826e754c7f36fe0605ab9e1160b62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 23:53:44 -0400
Subject: [PATCH 1183/8469] Support get_headers on Python 3 and Python 2

---
 setuptools/package_index.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 2701c87394..8a3c96dec8 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -608,7 +608,10 @@ def _download_to(self, url, filename):
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                size = max(map(int,headers.getheaders("Content-Length")))
+                if not hasattr(headers, 'get_all'):
+                    # Older versions of Python don't have the get_all method
+                    headers.get_all = headers.getheaders
+                size = max(map(int,headers.get_all("Content-Length")))
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')
             while True:

From cc51ff77f4914497a98b7223723995f05e8ab1a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 May 2013 14:32:23 -0400
Subject: [PATCH 1184/8469] Fix use of getheaders on Python 3

---
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools/package_index.py          |   7 +-
 setuptools/py27compat.py             |  15 ++++
 3 files changed, 80 insertions(+), 66 deletions(-)
 create mode 100644 setuptools/py27compat.py

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2965458969..663882d630 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8a3c96dec8..133677e87c 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -13,6 +13,7 @@
     from md5 import md5
 from fnmatch import translate
 from .py24compat import wraps
+from setuptools.py27compat import get_all_headers
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
@@ -608,10 +609,8 @@ def _download_to(self, url, filename):
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                if not hasattr(headers, 'get_all'):
-                    # Older versions of Python don't have the get_all method
-                    headers.get_all = headers.getheaders
-                size = max(map(int,headers.get_all("Content-Length")))
+                sizes = get_all_headers(headers, 'Content-Length')
+                size = max(map(int, sizes))
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')
             while True:
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
new file mode 100644
index 0000000000..9d2886db99
--- /dev/null
+++ b/setuptools/py27compat.py
@@ -0,0 +1,15 @@
+"""
+Compatibility Support for Python 2.7 and earlier
+"""
+
+import sys
+
+def get_all_headers(message, key):
+	"""
+	Given an HTTPMessage, return all headers matching a given key.
+	"""
+	return message.get_all(key)
+
+if sys.version_info < (3,):
+	def get_all_headers(message, key):
+		return message.getheaders(key)

From 06bb0278e3cdc05207b3670bd30eb23f9c8a1076 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 May 2013 15:32:30 -0400
Subject: [PATCH 1185/8469] Re-generate egg_info

---
 setuptools.egg-info/entry_points.txt | 86 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 ++---
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 663882d630..2a1ffddaff 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
 zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
 convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+test_loader = setuptools.dist:check_importable
 tests_require = setuptools.dist:check_requirements
+include_package_data = setuptools.dist:assert_bool
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+use_2to3_fixers = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+egg_info = setuptools.command.egg_info:egg_info
+alias = setuptools.command.alias:alias
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+register = setuptools.command.register:register
+test = setuptools.command.test:test
+build_py = setuptools.command.build_py:build_py
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+rotate = setuptools.command.rotate:rotate
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+upload_docs = setuptools.command.upload_docs:upload_docs
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
+build_ext = setuptools.command.build_ext:build_ext
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 91d84d9ca8..668f4ee242 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [certs]
 certifi==0.0.8
 
 [ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ssl==1.16
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file

From 14439716f80f8c24996de8d2179003a32f1cff3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 May 2013 15:54:55 -0400
Subject: [PATCH 1186/8469] Added tag 0.7b3 for changeset 63e4eb2d6120

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 076d63bec2..2d205d9953 100644
--- a/.hgtags
+++ b/.hgtags
@@ -55,3 +55,4 @@ ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
+63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3

From 2a6828a3a6f98a6f6e0e97b02b1c6e397130a473 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 May 2013 16:04:05 -0400
Subject: [PATCH 1187/8469] Bump version for subsequent release

---
 docs/conf.py | 4 ++--
 ez_setup.py  | 2 +-
 release.py   | 2 +-
 setup.py     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 1a896681ec..b702d35895 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7b3'
+version = '0.7b4'
 # The full version, including alpha/beta/rc tags.
-release = '0.7b3'
+release = '0.7b4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index ec3d3fd76c..2ea5dbab94 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -47,7 +47,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.7b3"
+DEFAULT_VERSION = "0.7b4"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/release.py b/release.py
index f3d8387202..bd944647ec 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7b3'
+VERSION = '0.7b4'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version(version):
diff --git a/setup.py b/setup.py
index 9334d7d84f..131b065e47 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7b3"
+VERSION = "0.7b4"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From d45dccf4ef6db592e73337da6a04ca1e4445341f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 10:51:36 -0400
Subject: [PATCH 1188/8469] Add note about dropped support for Python 2.3

---
 MERGE.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MERGE.txt b/MERGE.txt
index f836f35414..16fbdc68a6 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -78,6 +78,7 @@ Major Changes
   packages.
 * Sort order of Distributions in pkg_resources now prefers PyPI to external
   links (Distribute issue 163).
+* Python 2.4 or greater is required (drop support for Python 2.3).
 
 Minor Changes
 -------------

From 9d50157d521db8e339228d6da0d7fa0ef126b927 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 10:56:46 -0400
Subject: [PATCH 1189/8469] Remove Python 2.3 support from ez_setup.py

---
 ez_setup.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2ea5dbab94..acd7e39cfe 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -19,6 +19,7 @@
 import tempfile
 import tarfile
 import optparse
+import subprocess
 
 from distutils import log
 
@@ -27,29 +28,12 @@
 except ImportError:
     USER_SITE = None
 
-try:
-    import subprocess
-
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        return subprocess.call(args) == 0
-
-except ImportError:
-    # will be used for python 2.3
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        # quoting arguments if windows
-        if sys.platform == 'win32':
-            def quote(arg):
-                if ' ' in arg:
-                    return '"%s"' % arg
-                return arg
-            args = [quote(arg) for arg in args]
-        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-
 DEFAULT_VERSION = "0.7b4"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
+def _python_cmd(*args):
+    args = (sys.executable,) + args
+    return subprocess.call(args) == 0
 
 def _install(tarball, install_args=()):
     # extracting the tarball

From 6cf253f0799970f6e7c86ba18cec6e1231dbe493 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 11:52:53 -0400
Subject: [PATCH 1190/8469] Add support for Python 3.3 in environment marker
 tests

---
 tests/api_tests.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 364b3d6f1b..d03da14e12 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -341,8 +341,8 @@ Environment Markers
     >>> print(im("sys_platform"))
     Comparison or logical expression expected
 
-    >>> print(im("sys_platform=="))
-    unexpected EOF while parsing (line 1)
+    >>> print(im("sys_platform=="))  # doctest: +ELLIPSIS
+    unexpected EOF while parsing (...line 1)
 
     >>> print(im("sys_platform=='win32'"))
     False
@@ -353,8 +353,8 @@ Environment Markers
     >>> print(im("(extra)"))
     Comparison or logical expression expected
 
-    >>> print(im("(extra"))
-    unexpected EOF while parsing (line 1)
+    >>> print(im("(extra"))  # doctest: +ELLIPSIS
+    unexpected EOF while parsing (...line 1)
 
     >>> print(im("os.open('foo')=='y'"))
     Language feature not supported in environment markers

From dd5da9cf82d57afdf074c873c6403beb830df7e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:01:15 -0400
Subject: [PATCH 1191/8469] Resave with excess whitespace removed

---
 setuptools/ssl_support.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index f1d8c92032..d662a1fc6d 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -46,7 +46,7 @@
     def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
                           source_address=None):
         """Connect to *address* and return the socket object.
-    
+
         Convenience function.  Connect to *address* (a 2-tuple ``(host,
         port)``) and return the socket object.  Passing the optional
         *timeout* parameter will set the timeout on the socket instance
@@ -55,7 +55,7 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
         is used.  If *source_address* is set it must be a tuple of (host, port)
         for the socket to bind as a source address before making the connection.
         An host of '' or port 0 tells the OS to use the default.
-        """   
+        """
         host, port = address
         err = None
         for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
@@ -73,7 +73,7 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
             except error:
                 err = True
                 if sock is not None:
-                    sock.close()    
+                    sock.close()
         if err:
             raise
         else:
@@ -85,7 +85,7 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
 except ImportError:
     class CertificateError(ValueError):
         pass
-       
+
     def _dnsname_to_pat(dn):
         pats = []
         for frag in dn.split(r'.'):
@@ -98,12 +98,12 @@ def _dnsname_to_pat(dn):
                 frag = re.escape(frag)
                 pats.append(frag.replace(r'\*', '[^.]*'))
         return re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
-       
+
     def match_hostname(cert, hostname):
         """Verify that *cert* (in decoded format as returned by
         SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 rules
         are mostly followed, but IP addresses are not accepted for *hostname*.
-    
+
         CertificateError is raised on failure. On success, the function
         returns nothing.
         """
@@ -177,7 +177,7 @@ def https_open(self, req):
 
 class VerifyingHTTPSConn(HTTPSConnection):
     """Simple verifying connection: no auth, subclasses, timeouts, etc."""
-    def __init__(self, host, ca_bundle, **kw):         
+    def __init__(self, host, ca_bundle, **kw):
         HTTPSConnection.__init__(self, host, **kw)
         self.ca_bundle = ca_bundle
 
@@ -187,7 +187,7 @@ def connect(self):
         )
         self.sock = ssl.wrap_socket(
             sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
-        )               
+        )
         try:
             match_hostname(self.sock.getpeercert(), self.host)
         except CertificateError:
@@ -201,7 +201,7 @@ def opener_for(ca_bundle=None):
         VerifyingHTTPSHandler(ca_bundle or find_ca_bundle())
     ).open
 
-        
+
 
 _wincerts = None
 
@@ -210,7 +210,7 @@ def get_win_certfile():
     if _wincerts is not None:
         return _wincerts.name
 
-    try:        
+    try:
         from wincertstore import CertFile
     except ImportError:
         return None
@@ -221,7 +221,7 @@ def __init__(self, stores=(), certs=()):
             for store in stores:
                 self.addstore(store)
             self.addcerts(certs)
-            atexit.register(self.close)            
+            atexit.register(self.close)
 
     _wincerts = MyCertFile(stores=['CA', 'ROOT'])
     return _wincerts.name

From 9b12dd9c3ff59b8925f5abb6548e8e8eea455b4c Mon Sep 17 00:00:00 2001
From: Eric Larson <eric@ionrock.org>
Date: Tue, 28 May 2013 14:33:43 -0500
Subject: [PATCH 1192/8469] Import resource_filename from pkg_resources

--HG--
extra : source : 14737efaf19e5a19c92f54c94163003d381aed0b
---
 setuptools/ssl_support.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index d662a1fc6d..312a509761 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,5 +1,5 @@
 import sys, os, socket, urllib2, atexit, re
-from pkg_resources import ResolutionError, ExtractionError
+from pkg_resources import ResolutionError, ExtractionError, resource_filename
 
 try:
     import ssl
@@ -236,7 +236,7 @@ def find_ca_bundle():
             if os.path.isfile(cert_path):
                 return cert_path
     try:
-        return pkg_resources.resource_filename('certifi', 'cacert.pem')
+        return resource_filename('certifi', 'cacert.pem')
     except (ImportError, ResolutionError, ExtractionError):
         return None
 

From 4b6e1f43acfe225d0f52f066984e61674f162b83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:09:12 -0400
Subject: [PATCH 1193/8469] Prefer namespaced usage

---
 setuptools/ssl_support.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 312a509761..6dca5fab89 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,5 +1,6 @@
 import sys, os, socket, urllib2, atexit, re
-from pkg_resources import ResolutionError, ExtractionError, resource_filename
+import pkg_resources
+from pkg_resources import ResolutionError, ExtractionError
 
 try:
     import ssl
@@ -236,7 +237,7 @@ def find_ca_bundle():
             if os.path.isfile(cert_path):
                 return cert_path
     try:
-        return resource_filename('certifi', 'cacert.pem')
+        return pkg_resources.resource_filename('certifi', 'cacert.pem')
     except (ImportError, ResolutionError, ExtractionError):
         return None
 

From 6962fdf6d1d306e2ff57a71c80c44ca39e0b2284 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:10:10 -0400
Subject: [PATCH 1194/8469] Updated changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a11ab36476..daa7622d26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,12 @@ Added several features that were slated for setuptools 0.6c12:
 * Added support for SSL certificate validation when installing packages from
   an HTTPS service.
 
+-----
+0.7b4
+-----
+
+* Issue #3: Fixed NameError in SSL support.
+
 ------
 0.6.44
 ------

From 213781b9db1194885abdce521b9f766a33f9280d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:15:37 -0400
Subject: [PATCH 1195/8469] Temporarily disable uploading until PyPI is used
 again

---
 release.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/release.py b/release.py
index bd944647ec..33fb294a53 100644
--- a/release.py
+++ b/release.py
@@ -159,11 +159,13 @@ def upload_to_pypi():
 		sys.executable, 'setup.py', '-q',
 		'egg_info', '-RD', '-b', '',
 		'sdist',
-		'register', '-r', PACKAGE_INDEX,
-		'upload', '-r', PACKAGE_INDEX,
+		#'register', '-r', PACKAGE_INDEX,
+		#'upload', '-r', PACKAGE_INDEX,
 	]
 	if has_docs:
-		cmd.extend(['upload_docs', '-r', PACKAGE_INDEX])
+		cmd.extend([
+			#'upload_docs', '-r', PACKAGE_INDEX
+		])
 	subprocess.check_call(cmd)
 
 def has_sphinx():

From 715d09f7e80a6979939b9e72541277cadb4c6e97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:16:33 -0400
Subject: [PATCH 1196/8469] Added tag 0.7b4 for changeset 53b4ac9a748a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7314696f80..5e073ef606 100644
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
 63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
+53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4

From a1bc841f097ac20ee5a6526c804398ffb3604c80 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:16:42 -0400
Subject: [PATCH 1197/8469] Bumped to 0.7b5 in preparation for next release.

---
 docs/conf.py                         |  4 +-
 ez_setup.py                          |  2 +-
 release.py                           |  2 +-
 setup.py                             |  2 +-
 setuptools.egg-info/entry_points.txt | 86 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 ++---
 6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index b702d35895..8cd3b069dc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7b4'
+version = '0.7b5'
 # The full version, including alpha/beta/rc tags.
-release = '0.7b4'
+release = '0.7b5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index acd7e39cfe..6f401d9d90 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7b4"
+DEFAULT_VERSION = "0.7b5"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 33fb294a53..e0c6a5ebb9 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7b4'
+VERSION = '0.7b5'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version(version):
diff --git a/setup.py b/setup.py
index 131b065e47..684ef64f83 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7b4"
+VERSION = "0.7b5"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2a1ffddaff..663882d630 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
 
 [egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
 use_2to3 = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
 use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
 namespace_packages = setuptools.dist:check_nsp
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
 packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
 
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-egg_info = setuptools.command.egg_info:egg_info
-alias = setuptools.command.alias:alias
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-register = setuptools.command.register:register
-test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
-upload_docs = setuptools.command.upload_docs:upload_docs
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-build_ext = setuptools.command.build_ext:build_ext
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 668f4ee242..91d84d9ca8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[certs]
-certifi==0.0.8
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+[certs]
+certifi==0.0.8
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file

From a8e437006a04ec091b4a88434698e4e7c7d3b0fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:18:28 -0400
Subject: [PATCH 1198/8469] No need to upload bootstrap script as it's
 referenced from the docs.

---
 release.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/release.py b/release.py
index e0c6a5ebb9..5a1bc3dfe1 100644
--- a/release.py
+++ b/release.py
@@ -133,7 +133,6 @@ def do_release():
 	subprocess.check_call(['hg', 'update', VERSION])
 
 	upload_to_pypi()
-	upload_bootstrap_script()
 
 	# update to the tip for the next operation
 	subprocess.check_call(['hg', 'update'])
@@ -192,14 +191,6 @@ def build_docs():
 	subprocess.check_call(cmd, cwd='docs')
 	return True
 
-def upload_bootstrap_script():
-	scp_command = 'pscp' if sys.platform.startswith('win') else 'scp'
-	try:
-		subprocess.check_call([scp_command, 'distribute_setup.py',
-			'pypi@ziade.org:python-distribute.org/'])
-	except:
-		print("Unable to upload bootstrap script. Ask Tarek to do it.")
-
 def linkify(source, dest):
 	with open(source) as source:
 		out = _linkified_text(source.read())

From a87aad81100c8ec8a457f7e15ddd3e04a83e82f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 17:24:43 -0400
Subject: [PATCH 1199/8469] Make sure there's a blank line between files

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 684ef64f83..e05e5957bf 100755
--- a/setup.py
+++ b/setup.py
@@ -114,7 +114,7 @@ def run(self):
 else:
     # but if the release script has not run, fall back to the source file
     changes_file = open('CHANGES.txt')
-long_description = readme_file.read() + changes_file.read()
+long_description = readme_file.read() + '\n' + changes_file.read()
 readme_file.close()
 changes_file.close()
 

From d58f9a5feafbeb74b6205c43a4d8cc58923814de Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Fri, 31 May 2013 15:30:35 -0400
Subject: [PATCH 1200/8469] Correct missing import in ssl_support (grafted from
 3b91f246d8de2f54b4b764dfe362a3677a001162)

--HG--
branch : setuptools-0.6
extra : source : 3b91f246d8de2f54b4b764dfe362a3677a001162
---
 setuptools/ssl_support.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index f1d8c92032..2e615db374 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,5 +1,5 @@
-import sys, os, socket, urllib2, atexit, re
-from pkg_resources import ResolutionError, ExtractionError
+import sys, os, socket, urllib2, atexit
+from pkg_resources import ResolutionError, ExtractionError, resource_filename
 
 try:
     import ssl
@@ -236,7 +236,7 @@ def find_ca_bundle():
             if os.path.isfile(cert_path):
                 return cert_path
     try:
-        return pkg_resources.resource_filename('certifi', 'cacert.pem')
+        return resource_filename('certifi', 'cacert.pem')
     except (ImportError, ResolutionError, ExtractionError):
         return None
 

From b09c79d8508e13407dc7c6c93ae0239d5ab4fc23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Jun 2013 17:23:35 -0400
Subject: [PATCH 1201/8469] Updated README to reflect preferred installation
 techniques, HTTPS links, and more references to bitbucket hosting. The
 preferred installation technique now is running 'ez_setup.py' on all
 platforms.

---
 README.txt | 114 ++++++++++++++++++++++++-----------------------------
 1 file changed, 51 insertions(+), 63 deletions(-)

diff --git a/README.txt b/README.txt
index 07bdbc2eca..d2136b2ce5 100755
--- a/README.txt
+++ b/README.txt
@@ -9,25 +9,33 @@ Installing and Using Setuptools
 Installation Instructions
 -------------------------
 
-Windows
-=======
+Upgrading from Distribute
+=========================
+
+Currently, Distribute disallows installing Setuptools 0.7 over Distribute.
+You must first uninstall any active version of Distribute first. One way to
+do this is to remove all ``setuptools*`` and ``distribute*`` from your
+``site-packgaes`` directory.
+
 
-32-bit version of Python
-    Install setuptools using the provided ``.exe`` installer.
+Upgrading from Setuptools 0.6
+=============================
 
-64-bit versions of Python
-    Download `ez_setup.py`_ and run it; it will download the appropriate .egg
-    file and install it for you.  (Currently, the provided ``.exe`` installer
-    does not support 64-bit versions of Python for Windows, due to a
-    `distutils installer compatibility issue`_
+Upgrading from prior versions of Setuptools is supported. Initial reports
+good success in this regard.
+
+Windows
+=======
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/default/ez_setup.py
-.. _distutils installer compatibility issue: http://bugs.python.org/issue6792
+The recommended way to install setuptools on Windows is to download
+`ez_setup.py`_ and run it. The script will download the appropriate .egg
+file and install it for you.
 
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
 
-NOTE: Regardless of what sort of Python you're using, if you've previously
-installed older versions of setuptools or distribute, please delete all
-``setuptools*.egg``, ``distribute*.egg``, and ``setuptools.pth`` files and
+For best results, regardless of what sort of Python you're using, if you've
+previously installed older versions of setuptools or distribute, please delete
+all ``setuptools*.egg``, ``distribute*.egg``, and ``setuptools.pth`` files and
 directories from your system's ``site-packages`` directory
 (and any other ``sys.path`` directories) FIRST.
 
@@ -37,65 +45,46 @@ via your system's "Add/Remove Programs" feature, BEFORE installing the newer
 version.
 
 Once installation is complete, you will find an ``easy_install.exe`` program in
-your Python ``Scripts`` subdirectory.  Be sure to add this directory to your
-``PATH`` environment variable, if you haven't already done so.
+your Python ``Scripts`` subdirectory.  For simple invocation and best results,
+add this directory to your ``PATH`` environment variable, if it is not already
+present.
 
 
-RPM-Based Systems
-=================
+Unix-based Systems including Mac OS X
+=====================================
 
-Install setuptools using the provided source RPM.  The included ``.spec`` file
-assumes you are installing using the default ``python`` executable, and is not
-specific to a particular Python version.  The ``easy_install`` executable will
-be installed to a system ``bin`` directory such as ``/usr/bin``.
+Download `ez_setup.py`_ and run it using the target Python version. The script
+will download the appropriate version and install it for you::
 
-If you wish to install to a location other than the default Python
-installation's default ``site-packages`` directory (and ``$prefix/bin`` for
-scripts), please use the ``.egg``-based installation approach described in the
-following section.
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py -O - | python
 
+Note that you will may need to invoke the command with superuser privileges to
+install to the system Python.
 
-Cygwin, Mac OS X, Linux, Other
-==============================
+Alternatively, on Python 2.6 and later, Setuptools may be installed to a
+user-local path::
 
-1. Download the appropriate egg for your version of Python (e.g.
-   ``setuptools-0.6c9-py2.4.egg``).  Do NOT rename it.
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
+    > python ez_setup.py --user
 
-2. Run it as if it were a shell script, e.g. ``sh setuptools-0.6c9-py2.4.egg``.
-   Setuptools will install itself using the matching version of Python (e.g.
-   ``python2.4``), and will place the ``easy_install`` executable in the
-   default location for installing Python scripts (as determined by the
-   standard distutils configuration files, or by the Python installation).
 
-If you want to install setuptools to somewhere other than ``site-packages`` or
-your default distutils installation locations for libraries and scripts, you
-may include EasyInstall command-line options such as ``--prefix``,
-``--install-dir``, and so on, following the ``.egg`` filename on the same
-command line.  For example::
+Advanced Installation
+=====================
 
-    sh setuptools-0.6c9-py2.4.egg --prefix=~
+For more advanced installation options, such as installing to custom
+locations or prefixes, download and extract the source
+tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
+and run setup.py with any supported distutils and Setuptools options.
+For example::
 
-You can use ``--help`` to get a full options list, but we recommend consulting
+    setuptools-0.7$ python setup.py --prefix=/opt/setuptools
+
+Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
 on custom installation locations`_.
 
-.. _EasyInstall manual: http://peak.telecommunity.com/DevCenter/EasyInstall
-.. _the section on custom installation locations: http://peak.telecommunity.com/DevCenter/EasyInstall#custom-installation-locations
-
-
-Cygwin Note
------------
-
-If you are trying to install setuptools for the **Windows** version of Python
-(as opposed to the Cygwin version that lives in ``/usr/bin``), you must make
-sure that an appropriate executable (``python2.3``, ``python2.4``, or
-``python2.5``) is on your **Cygwin** ``PATH`` when invoking the egg.  For
-example, doing the following at a Cygwin bash prompt will install setuptools
-for the **Windows** Python found at ``C:\\Python24``::
-
-    ln -s /cygdrive/c/Python24/python.exe python2.4
-    PATH=.:$PATH sh setuptools-0.6c9-py2.4.egg
-    rm python2.4
+.. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall
+.. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations
 
 
 Downloads
@@ -107,12 +96,11 @@ Package Index`_.  Scroll to the very bottom of the page to find the links.
 .. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
 
 In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `Python SVN sandbox`_, and in-development versions of the
+is available from the `Bitbucket repo`_, and in-development versions of the
 `0.6 branch`_ are available as well.
 
-.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-
-.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
+.. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev
+.. _0.6 branch: https://bitbucket.org/pypa/setuptools/get/setuptools-0.6.tar.gz#egg=setuptools-dev06
 
 --------------------------------
 Using Setuptools and EasyInstall

From 94e105c2c105782f332eeb0d2a00ef225883e06b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Jun 2013 17:26:20 -0400
Subject: [PATCH 1202/8469] README.txt now references specific versions again

---
 release.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 5a1bc3dfe1..d146de2cfc 100644
--- a/release.py
+++ b/release.py
@@ -52,7 +52,9 @@ def incr(match):
 
 NEXT_VERSION = get_next_version(VERSION)
 
-files_with_versions = 'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py'
+files_with_versions = (
+	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py', 'README.txt',
+)
 
 def get_repo_name():
 	"""

From ef0f5481a2324a3cec28102af88cd5a5ee43af9b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Jun 2013 17:54:24 -0400
Subject: [PATCH 1203/8469] Updated release script to allow setting of the
 version to be released at release time (but still infer a next release).

---
 release.py | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/release.py b/release.py
index d146de2cfc..d38903074a 100644
--- a/release.py
+++ b/release.py
@@ -25,24 +25,30 @@
 VERSION = '0.7b5'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
-def get_next_version(version):
+def set_versions():
+	global VERSION
+	version = raw_input("Release as version [%s]> " % VERSION)
+	if version != VERSION:
+		VERSION = bump_versions(version)
+
+def infer_next_version(version):
 	"""
 	Infer a next version from the current version by incrementing the last
 	number or appending a number.
 
-	>>> get_next_version('1.0')
+	>>> infer_next_version('1.0')
 	'1.1'
 
-	>>> get_next_version('1.0b')
+	>>> infer_next_version('1.0b')
 	'1.0b1'
 
-	>>> get_next_version('1.0.9')
+	>>> infer_next_version('1.0.9')
 	'1.0.10'
 
-	>>> get_next_version('1')
+	>>> infer_next_version('1')
 	'2'
 
-	>>> get_next_version('')
+	>>> infer_next_version('')
 	'1'
 	"""
 	def incr(match):
@@ -50,8 +56,6 @@ def incr(match):
 		return str(ver + 1)
 	return re.sub('\d*$', incr, version)
 
-NEXT_VERSION = get_next_version(VERSION)
-
 files_with_versions = (
 	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py', 'README.txt',
 )
@@ -85,7 +89,7 @@ def get_mercurial_creds(system='https://bitbucket.org', username=None):
 	Credential = collections.namedtuple('Credential', 'username password')
 	return Credential(username, password)
 
-def add_milestone_and_version(version=NEXT_VERSION):
+def add_milestone_and_version(version):
 	auth = 'Basic ' + ':'.join(get_mercurial_creds()).encode('base64').strip()
 	headers = {
 		'Authorization': auth,
@@ -101,12 +105,17 @@ def add_milestone_and_version(version=NEXT_VERSION):
 		except urllib2.HTTPError as e:
 			print(e.fp.read())
 
-def bump_versions():
-	list(map(bump_version, files_with_versions))
+def bump_versions(target_ver):
+	for filename in files_with_versions:
+		bump_version(filename, target_ver)
+	subprocess.check_call(['hg', 'ci', '-m',
+		'Bumped to {target_ver} in preparation for next '
+		'release.'.format(**vars())])
+	return target_ver
 
-def bump_version(filename):
+def bump_version(filename, target_ver):
 	with open(filename, 'rb') as f:
-		lines = [line.replace(VERSION, NEXT_VERSION) for line in f]
+		lines = [line.replace(VERSION, target_ver) for line in f]
 	with open(filename, 'wb') as f:
 		f.writelines(lines)
 
@@ -116,6 +125,8 @@ def do_release():
 
 	assert has_sphinx(), "You must have Sphinx installed to release"
 
+	set_versions()
+
 	res = raw_input('Have you read through the SCM changelog and '
 		'confirmed the changelog is current for releasing {VERSION}? '
 		.format(**globals()))
@@ -140,15 +151,12 @@ def do_release():
 	subprocess.check_call(['hg', 'update'])
 
 	# we just tagged the current version, bump for the next release.
-	bump_versions()
-	subprocess.check_call(['hg', 'ci', '-m',
-		'Bumped to {NEXT_VERSION} in preparation for next '
-		'release.'.format(**globals())])
+	next_ver = bump_versions(infer_next_version(VERSION))
 
 	# push the changes
 	subprocess.check_call(['hg', 'push'])
 
-	add_milestone_and_version()
+	add_milestone_and_version(next_ver)
 
 def upload_to_pypi():
 	linkify('CHANGES.txt', 'CHANGES (links).txt')

From d3b8352bccc50525a050238904cef9385650c01c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 09:54:33 -0400
Subject: [PATCH 1204/8469] Refactor docs to describe uninstallation in a
 single section.

---
 README.txt | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/README.txt b/README.txt
index d2136b2ce5..f6827e4963 100755
--- a/README.txt
+++ b/README.txt
@@ -13,10 +13,7 @@ Upgrading from Distribute
 =========================
 
 Currently, Distribute disallows installing Setuptools 0.7 over Distribute.
-You must first uninstall any active version of Distribute first. One way to
-do this is to remove all ``setuptools*`` and ``distribute*`` from your
-``site-packgaes`` directory.
-
+You must first uninstall any active version of Distribute first.
 
 Upgrading from Setuptools 0.6
 =============================
@@ -33,16 +30,7 @@ file and install it for you.
 
 .. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
 
-For best results, regardless of what sort of Python you're using, if you've
-previously installed older versions of setuptools or distribute, please delete
-all ``setuptools*.egg``, ``distribute*.egg``, and ``setuptools.pth`` files and
-directories from your system's ``site-packages`` directory
-(and any other ``sys.path`` directories) FIRST.
-
-If you are upgrading a previous version of setuptools that was installed using
-an ``.exe`` installer, please be sure to also *uninstall that older version*
-via your system's "Add/Remove Programs" feature, BEFORE installing the newer
-version.
+For best results, uninstall previous versions FIRST.
 
 Once installation is complete, you will find an ``easy_install.exe`` program in
 your Python ``Scripts`` subdirectory.  For simple invocation and best results,
@@ -102,6 +90,23 @@ is available from the `Bitbucket repo`_, and in-development versions of the
 .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev
 .. _0.6 branch: https://bitbucket.org/pypa/setuptools/get/setuptools-0.6.tar.gz#egg=setuptools-dev06
 
+Uninstalling
+============
+
+On Windows, if Setuptools was installed using an ``.exe`` or ``.msi``
+installer, simply use the uninstall feature of "Add/Remove Programs" in the
+Control Panel.
+
+Otherwise, to uninstall Setuptools or Distribute, regardless of the Python
+version, delete all ``setuptools*`` and ``distribute*`` files and
+directories from your system's ``site-packages`` directory
+(and any other ``sys.path`` directories) FIRST.
+
+If you are upgrading or otherwise plan to re-install Setuptools or Distribute,
+nothing further needs to be done. If you want to completely remove Setuptools,
+you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts
+and associated executables installed to the Python scripts directory.
+
 --------------------------------
 Using Setuptools and EasyInstall
 --------------------------------

From dc25db5fb15a3b8e11667ee9ea8ec1457c99797f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 09:57:07 -0400
Subject: [PATCH 1205/8469] Restored egg-link for setuptools 0.6 to minimize
 flux for setuptools 0.6 users.

---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index f6827e4963..99dda8dceb 100755
--- a/README.txt
+++ b/README.txt
@@ -88,7 +88,7 @@ is available from the `Bitbucket repo`_, and in-development versions of the
 `0.6 branch`_ are available as well.
 
 .. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev
-.. _0.6 branch: https://bitbucket.org/pypa/setuptools/get/setuptools-0.6.tar.gz#egg=setuptools-dev06
+.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
 
 Uninstalling
 ============

From 35657c3486bf9943c3d31ffc2e61e18cdd4b9332 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 10:36:22 -0400
Subject: [PATCH 1206/8469] Add links to Uninstalling section

---
 README.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 99dda8dceb..215337168d 100755
--- a/README.txt
+++ b/README.txt
@@ -13,7 +13,8 @@ Upgrading from Distribute
 =========================
 
 Currently, Distribute disallows installing Setuptools 0.7 over Distribute.
-You must first uninstall any active version of Distribute first.
+You must first uninstall any active version of Distribute first (see
+`Uninstalling`_).
 
 Upgrading from Setuptools 0.6
 =============================
@@ -30,7 +31,7 @@ file and install it for you.
 
 .. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
 
-For best results, uninstall previous versions FIRST.
+For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
 Once installation is complete, you will find an ``easy_install.exe`` program in
 your Python ``Scripts`` subdirectory.  For simple invocation and best results,

From 87818a14ed9897a88737f287b634191337a2ed2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 10:46:47 -0400
Subject: [PATCH 1207/8469] Bumped to 0.7 in preparation for next release.

---
 README.txt   | 6 +++---
 docs/conf.py | 4 ++--
 ez_setup.py  | 2 +-
 release.py   | 2 +-
 setup.py     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 215337168d..1003cf570e 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7b5/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py
     > python ez_setup.py --user
 
 
diff --git a/docs/conf.py b/docs/conf.py
index 8cd3b069dc..f38127c081 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7b5'
+version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.7b5'
+release = '0.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 6f401d9d90..0a4bf346cf 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7b5"
+DEFAULT_VERSION = "0.7"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index d38903074a..ee69487584 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7b5'
+VERSION = '0.7'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index e05e5957bf..7de1025f09 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7b5"
+VERSION = "0.7"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 9f551f0f9eda458347a802a7e7c616035c44d0b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 10:48:15 -0400
Subject: [PATCH 1208/8469] Added tag 0.7 for changeset 7f2c08e9ca22

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3795b833bb..11c91397dd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -59,3 +59,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
 53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
+7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7

From ccc570ac00b66b799cd8e626543340786df1bcd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Jun 2013 11:37:26 -0400
Subject: [PATCH 1209/8469] Bumped to 0.7.1 in preparation for next release.

---
 README.txt                           | 10 ++--
 docs/conf.py                         |  4 +-
 ez_setup.py                          |  2 +-
 release.py                           |  2 +-
 setup.py                             |  2 +-
 setuptools.egg-info/entry_points.txt | 70 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 +++---
 7 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/README.txt b/README.txt
index 1003cf570e..39f35cf51e 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7.1 over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.1$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index f38127c081..61775604d9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7'
+version = '0.7.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.7'
+release = '0.7.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 0a4bf346cf..5a0af32c5f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7"
+DEFAULT_VERSION = "0.7.1"
 DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index ee69487584..0332bf15a3 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7'
+VERSION = '0.7.1'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index 7de1025f09..d6322004dc 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7"
+VERSION = "0.7.1"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 663882d630..f101286d2b 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
 [distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
 build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
 saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install = setuptools.command.install:install
 easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+egg_info = setuptools.command.egg_info:egg_info
+build_ext = setuptools.command.build_ext:build_ext
+setopt = setuptools.command.setopt:setopt
+develop = setuptools.command.develop:develop
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+register = setuptools.command.register:register
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
+test = setuptools.command.test:test
+rotate = setuptools.command.rotate:rotate
 
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
 entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
 use_2to3_fixers = setuptools.dist:assert_string_list
 include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
+packages = setuptools.dist:check_packages
 eager_resources = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+exclude_package_data = setuptools.dist:check_package_data
 zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 91d84d9ca8..2f2a364fa2 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [certs]
 certifi==0.0.8
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ssl==1.16
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file

From ef75b8b873d459003cbf90d320d5941cc82f9405 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 10:56:14 -0400
Subject: [PATCH 1210/8469] Correct pkg_resources reference again (broken in
 e002a2ff195b)

---
 setuptools/ssl_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 32c8ee3cd7..6dca5fab89 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -237,7 +237,7 @@ def find_ca_bundle():
             if os.path.isfile(cert_path):
                 return cert_path
     try:
-        return resource_filename('certifi', 'cacert.pem')
+        return pkg_resources.resource_filename('certifi', 'cacert.pem')
     except (ImportError, ResolutionError, ExtractionError):
         return None
 

From ee9f6452378fe46b0cef14ceee7a83a4922505dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 10:57:28 -0400
Subject: [PATCH 1211/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 74e28d6e06..bd1e29da2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.1
+-----
+
+* Fix NameError (Issue #3) again - broken in bad merge.
+
 ---
 0.7
 ---

From 9ca207c7fafdfae6b054077766b0df55dd95a0b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 11:14:38 -0400
Subject: [PATCH 1212/8469] Added tag 0.7.1 for changeset 024dd30ed702

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 11c91397dd..667a02aac0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -60,3 +60,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
+024dd30ed702135f5328975042566e48cc479d7d 0.7.1

From c5e74cbc8d7a3899f1f276be59d2a7b52e551eab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 11:18:47 -0400
Subject: [PATCH 1213/8469] Use https in ez_setup (fixes #10)

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 70 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 +++---
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5a0af32c5f..cb1ee506a2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
     USER_SITE = None
 
 DEFAULT_VERSION = "0.7.1"
-DEFAULT_URL = "http://pypi.python.org/packages/source/s/setuptools/"
+DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
     args = (sys.executable,) + args
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index f101286d2b..663882d630 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
 [distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
 build_py = setuptools.command.build_py:build_py
-sdist = setuptools.command.sdist:sdist
-install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
 saveopts = setuptools.command.saveopts:saveopts
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install = setuptools.command.install:install
-easy_install = setuptools.command.easy_install:easy_install
 egg_info = setuptools.command.egg_info:egg_info
-build_ext = setuptools.command.build_ext:build_ext
-setopt = setuptools.command.setopt:setopt
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
 register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install_lib = setuptools.command.install_lib:install_lib
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
 test = setuptools.command.test:test
-rotate = setuptools.command.rotate:rotate
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
 
 [egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
 entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
-eager_resources = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-exclude_package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
 use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
 namespace_packages = setuptools.dist:check_nsp
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 2f2a364fa2..91d84d9ca8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[certs]
+certifi==0.0.8
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file

From 0bbfe3d3d2e8bbddd492b0a50793d1352a33c3cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 11:19:45 -0400
Subject: [PATCH 1214/8469] Updated changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bd1e29da2d..a7bf1ac678 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.2
+-----
+
+* Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
+
 -----
 0.7.1
 -----

From 609e9c41cef5b938482b1f0f77334283b89b0750 Mon Sep 17 00:00:00 2001
From: pje <none@none>
Date: Mon, 3 Jun 2013 13:25:04 -0400
Subject: [PATCH 1215/8469] Fix missing import (grafted from
 1375a2f096ce47e2b9b7b27559671a5344a1189f)

--HG--
branch : setuptools-0.6
extra : source : 1375a2f096ce47e2b9b7b27559671a5344a1189f
---
 setuptools/ssl_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2e615db374..f6485a69de 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,4 +1,4 @@
-import sys, os, socket, urllib2, atexit
+import sys, os, socket, urllib2, atexit, re
 from pkg_resources import ResolutionError, ExtractionError, resource_filename
 
 try:

From 6b694814e0f877a45aff1091849ec09abd8f0ed2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Jun 2013 14:20:13 -0400
Subject: [PATCH 1216/8469] Bumped to 0.7.2 in preparation for next release.

---
 README.txt   | 10 +++++-----
 docs/conf.py |  4 ++--
 ez_setup.py  |  2 +-
 release.py   |  2 +-
 setup.py     |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index 39f35cf51e..3b7563bc3d 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7.1 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7.2 over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.1/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.1$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.2$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 61775604d9..e28153942f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.1'
+version = '0.7.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.1'
+release = '0.7.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index cb1ee506a2..7f09dae453 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.1"
+DEFAULT_VERSION = "0.7.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 0332bf15a3..b43233c4bb 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.1'
+VERSION = '0.7.2'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index d6322004dc..d650ab752f 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.1"
+VERSION = "0.7.2"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 34160eb2ed3da6bf4f57c882ccdd5d6fab3bc76b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Jun 2013 20:08:21 -0400
Subject: [PATCH 1217/8469] Resave with excess whitespace removed

---
 pkg_resources.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5b095562e7..ea6cf8bba5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1201,14 +1201,14 @@ def _pyimp():
     elif '__pypy__' in sys.builtin_module_names:
         return 'PyPy'
     else:
-        return 'CPython'                
+        return 'CPython'
 
 def invalid_marker(text):
     """Validate text as a PEP 426 environment marker; return exception or False"""
     try:
         evaluate_marker(text)
     except SyntaxError:
-        return sys.exc_info()[1]            
+        return sys.exc_info()[1]
     return False
 
 def evaluate_marker(text, extra=None, _ops={}):
@@ -1218,15 +1218,15 @@ def evaluate_marker(text, extra=None, _ops={}):
 
         from token import NAME, STRING
         import token, symbol, operator
-        
+
         def and_test(nodelist):
             # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
             return reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-        
+
         def test(nodelist):
             # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
             return reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-        
+
         def atom(nodelist):
             t = nodelist[1][0]
             if t == token.LPAR:
@@ -1234,7 +1234,7 @@ def atom(nodelist):
                     raise SyntaxError("Empty parentheses")
                 return interpret(nodelist[2])
             raise SyntaxError("Language feature not supported in environment markers")
-        
+
         def comparison(nodelist):
             if len(nodelist)>4:
                 raise SyntaxError("Chained comparison not allowed in environment markers")
@@ -1251,7 +1251,7 @@ def comparison(nodelist):
             except KeyError:
                 raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
             return cop(evaluate(nodelist[1]), evaluate(nodelist[3]))
-        
+
         _ops.update({
             symbol.test: test, symbol.and_test: and_test, symbol.atom: atom,
             symbol.comparison: comparison, 'not in': lambda x,y: x not in y,
@@ -1268,7 +1268,7 @@ def interpret(nodelist):
             raise SyntaxError("Comparison or logical expression expected")
             raise SyntaxError("Language feature not supported in environment markers: "+symbol.sym_name[nodelist[0]])
         return op(nodelist)
-        
+
     def evaluate(nodelist):
         while len(nodelist)==2: nodelist = nodelist[1]
         kind = nodelist[0]
@@ -1289,7 +1289,7 @@ def evaluate(nodelist):
             return s[1:-1]
         raise SyntaxError("Language feature not supported in environment markers")
 
-    import parser        
+    import parser
     return interpret(parser.expr(text).totuple(1)[1])
 
 
@@ -2393,7 +2393,7 @@ def _dep_map(self):
                                 reqs=[] # XXX warn
                             elif not evaluate_marker(marker):
                                 reqs=[]
-                        extra = safe_extra(extra) or None                                                            
+                        extra = safe_extra(extra) or None
                     dm.setdefault(extra,[]).extend(parse_requirements(reqs))
             return dm
     _dep_map = property(_dep_map)

From 1541dc716cc580c95883347832b689d3b8eb009b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Jun 2013 11:51:21 -0400
Subject: [PATCH 1218/8469] Use markerlib for markers in 'extras'

---
 CHANGES.txt      |  1 +
 pkg_resources.py | 88 +++++-------------------------------------------
 2 files changed, 10 insertions(+), 79 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a7bf1ac678..0a679ec32c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.7.2
 -----
 
+* Issue #14: Prefer markerlib for evaluation of marker expressions in extras.
 * Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
 
 -----
diff --git a/pkg_resources.py b/pkg_resources.py
index ea6cf8bba5..cdd732d2b2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1211,86 +1211,16 @@ def invalid_marker(text):
         return sys.exc_info()[1]
     return False
 
-def evaluate_marker(text, extra=None, _ops={}):
+def evaluate_marker(text):
     """Evaluate a PEP 426 environment marker; SyntaxError if marker is invalid"""
-
-    if not _ops:
-
-        from token import NAME, STRING
-        import token, symbol, operator
-
-        def and_test(nodelist):
-            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
-        def test(nodelist):
-            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
-        def atom(nodelist):
-            t = nodelist[1][0]
-            if t == token.LPAR:
-                if nodelist[2][0] == token.RPAR:
-                    raise SyntaxError("Empty parentheses")
-                return interpret(nodelist[2])
-            raise SyntaxError("Language feature not supported in environment markers")
-
-        def comparison(nodelist):
-            if len(nodelist)>4:
-                raise SyntaxError("Chained comparison not allowed in environment markers")
-            comp = nodelist[2][1]
-            cop = comp[1]
-            if comp[0] == NAME:
-                if len(nodelist[2]) == 3:
-                    if cop == 'not':
-                        cop = 'not in'
-                    else:
-                        cop = 'is not'
-            try:
-                cop = _ops[cop]
-            except KeyError:
-                raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
-            return cop(evaluate(nodelist[1]), evaluate(nodelist[3]))
-
-        _ops.update({
-            symbol.test: test, symbol.and_test: and_test, symbol.atom: atom,
-            symbol.comparison: comparison, 'not in': lambda x,y: x not in y,
-            'in': lambda x,y: x in y, '==': operator.eq, '!=': operator.ne,
-        })
-        if hasattr(symbol,'or_test'):
-            _ops[symbol.or_test] = test
-
-    def interpret(nodelist):
-        while len(nodelist)==2: nodelist = nodelist[1]
-        try:
-            op = _ops[nodelist[0]]
-        except KeyError:
-            raise SyntaxError("Comparison or logical expression expected")
-            raise SyntaxError("Language feature not supported in environment markers: "+symbol.sym_name[nodelist[0]])
-        return op(nodelist)
-
-    def evaluate(nodelist):
-        while len(nodelist)==2: nodelist = nodelist[1]
-        kind = nodelist[0]
-        name = nodelist[1]
-        #while len(name)==2: name = name[1]
-        if kind==NAME:
-            try:
-                op = _marker_values[name]
-            except KeyError:
-                raise SyntaxError("Unknown name %r" % name)
-            return op()
-        if kind==STRING:
-            s = nodelist[1]
-            if s[:1] not in "'\"" or s.startswith('"""') or s.startswith("'''") \
-            or '\\' in s:
-                raise SyntaxError(
-                    "Only plain strings allowed in environment markers")
-            return s[1:-1]
-        raise SyntaxError("Language feature not supported in environment markers")
-
-    import parser
-    return interpret(parser.expr(text).totuple(1)[1])
+    import _markerlib
+    # markerlib implements Metadata 1.2 (PEP 345) environment markers.
+    # Translate the variables to Metadata 2.0 (PEP 426).
+    env = _markerlib.default_environment()
+    for key in env.keys():
+        new_key = key.replace('.', '_')
+        env[new_key] = env.pop(key)
+    return _markerlib.interpret(text, env)
 
 
 class NullProvider:

From 468bb206e7a97aecb6df3cfec463b77c94acaf9c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Jun 2013 12:08:18 -0400
Subject: [PATCH 1219/8469] Expand documentation on evaluate_marker and
 indicate its legacy status.

---
 pkg_resources.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ea6cf8bba5..4dbbba59d1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1211,8 +1211,16 @@ def invalid_marker(text):
         return sys.exc_info()[1]
     return False
 
-def evaluate_marker(text, extra=None, _ops={}):
-    """Evaluate a PEP 426 environment marker; SyntaxError if marker is invalid"""
+def _evaluate_marker_legacy(text, extra=None, _ops={}):
+    """
+    Evaluate a PEP 426 environment marker on CPython 2.4+.
+    Return a boolean indicating the marker result in this environment.
+    Raise SyntaxError if marker is invalid.
+
+    This implementation uses the 'parser' module, which is not implemented on
+    Jython and has been superseded by the 'ast' module in Python 2.6 and
+    later.
+    """
 
     if not _ops:
 
@@ -1292,6 +1300,7 @@ def evaluate(nodelist):
     import parser
     return interpret(parser.expr(text).totuple(1)[1])
 
+evaluate_marker = _evaluate_marker_legacy
 
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""

From 0cfd8865097b9093ee1fd50c49ceabad411c885e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Jun 2013 16:04:12 -0400
Subject: [PATCH 1220/8469] Translate NameError into SyntaxError to meet
 prescribed API

--HG--
extra : histedit_source : 6ed89212bff75512c980d3fc0f98117510f3b576
---
 pkg_resources.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4225ae55f8..83901bb897 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1316,7 +1316,12 @@ def evaluate_marker(text):
     for key in env.keys():
         new_key = key.replace('.', '_')
         env[new_key] = env.pop(key)
-    return _markerlib.interpret(text, env)
+    try:
+        result = _markerlib.interpret(text, env)
+    except NameError:
+        e = sys.exc_info()[1]
+        raise SyntaxError(e.args[0])
+    return result
 
 # support marker evaluation on Python 2.4+
 if sys.version_info < (2,6) and _pyimp() == 'CPython':

From 7ae6e5e399dfd2274395aa11570184e47ee7144e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 09:23:43 -0400
Subject: [PATCH 1221/8469] Prefer local implementation to markerlib
 implementation as markerlib implementation is not as complete.

--HG--
extra : histedit_source : 3855347db7042dc34032b6bfa7b4c4e5239c1c3f
---
 CHANGES.txt      |  4 +---
 pkg_resources.py | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 01c70cce3a..34177d6347 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,9 +6,7 @@ CHANGES
 0.7.2
 -----
 
-* Issue #14: Prefer markerlib for evaluation of marker expressions in extras.
-  Fall back to implementation based on 'parser' for Python 2.5 and 2.4
-  clients.
+* Issue #14: Use markerlib when the `parser` module is not available.
 * Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
 
 -----
diff --git a/pkg_resources.py b/pkg_resources.py
index 83901bb897..1706dcd42f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -39,6 +39,11 @@
 else:
     importlib_bootstrap = None
 
+try:
+    import parser
+except ImportError:
+    pass
+
 def _bypass_ensure_directory(name, mode=0777):
     # Sandbox-bypassing version of ensure_directory()
     if not WRITE_SUPPORT:
@@ -1211,7 +1216,7 @@ def invalid_marker(text):
         return sys.exc_info()[1]
     return False
 
-def _evaluate_marker_legacy(text, extra=None, _ops={}):
+def evaluate_marker(text, extra=None, _ops={}):
     """
     Evaluate a PEP 426 environment marker on CPython 2.4+.
     Return a boolean indicating the marker result in this environment.
@@ -1297,17 +1302,13 @@ def evaluate(nodelist):
             return s[1:-1]
         raise SyntaxError("Language feature not supported in environment markers")
 
-    import parser
     return interpret(parser.expr(text).totuple(1)[1])
 
-def evaluate_marker(text):
+def _markerlib_evaluate(text):
     """
-    Evaluate a PEP 426 environment marker.
+    Evaluate a PEP 426 environment marker using markerlib.
     Return a boolean indicating the marker result in this environment.
     Raise SyntaxError if marker is invalid.
-
-    Note the implementation is incomplete as it does not support parentheses
-    for grouping.
     """
     import _markerlib
     # markerlib implements Metadata 1.2 (PEP 345) environment markers.
@@ -1323,9 +1324,10 @@ def evaluate_marker(text):
         raise SyntaxError(e.args[0])
     return result
 
-# support marker evaluation on Python 2.4+
-if sys.version_info < (2,6) and _pyimp() == 'CPython':
-    evaluate_marker = _evaluate_marker_legacy
+if 'parser' not in globals():
+    # fallback to less-complete _markerlib implementation if 'parser' module
+    #  is not available.
+    evaluate_marker = _markerlib_evaluate
 
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""

From 87db22d06a93278635e4fc551872be3b40c5a249 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:03:05 -0400
Subject: [PATCH 1222/8469] Allow uploading the docs

---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index b43233c4bb..70ca05abb3 100644
--- a/release.py
+++ b/release.py
@@ -173,7 +173,7 @@ def upload_to_pypi():
 	]
 	if has_docs:
 		cmd.extend([
-			#'upload_docs', '-r', PACKAGE_INDEX
+			'upload_docs', '-r', PACKAGE_INDEX
 		])
 	subprocess.check_call(cmd)
 

From acce77b1dfb768dd7fdec3b76dc5c64d27320f82 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:14:32 -0400
Subject: [PATCH 1223/8469] Moved MERGE.txt into the setuptools documentation.

--HG--
rename : MERGE.txt => docs/merge.txt
---
 CHANGES.txt                 | 2 +-
 docs/index.txt              | 1 +
 MERGE.txt => docs/merge.txt | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename MERGE.txt => docs/merge.txt (96%)

diff --git a/CHANGES.txt b/CHANGES.txt
index 34177d6347..aac22ad0ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,7 +19,7 @@ CHANGES
 0.7
 ---
 
-* Merged Setuptools and Distribute. See MERGE.txt for details.
+* Merged Setuptools and Distribute. See docs/merge.txt for details.
 
 Added several features that were slated for setuptools 0.6c12:
 
diff --git a/docs/index.txt b/docs/index.txt
index 21442b93b5..162a5f6f7c 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,6 +16,7 @@ Documentation content:
 .. toctree::
    :maxdepth: 2
 
+   merge
    roadmap
    python3
    using
diff --git a/MERGE.txt b/docs/merge.txt
similarity index 96%
rename from MERGE.txt
rename to docs/merge.txt
index 16fbdc68a6..23d1e8579f 100644
--- a/MERGE.txt
+++ b/docs/merge.txt
@@ -1,3 +1,9 @@
+Merge with Distribute
+~~~~~~~~~~~~~~~~~~~~~
+
+In 2013, the fork of Distribute was merged back into Setuptools. This
+document describes some of the details of the merge.
+
 Process
 =======
 

From cc7cbd0f79e527ba94490686a53cec6e4182384a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:18:39 -0400
Subject: [PATCH 1224/8469] Adding merge FAQ as part of the project docs.

---
 docs/merge-faq.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/merge-faq.txt

diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
new file mode 100644
index 0000000000..db26afb937
--- /dev/null
+++ b/docs/merge-faq.txt
@@ -0,0 +1,44 @@
+#Where does the merge occur?#
+
+The merge is occurring between the heads of the default branch of Distribute and the setuptools-0.6 branch of Setuptools. The Setuptools SVN repo has been converted to a Mercurial repo hosted on Bitbucket. The work is still underway, so the exact changesets included may change, although the anticipated merge targets are Setuptools at 0.6c12 and Distribute at 0.6.35.
+
+#What happens to other branches?#
+
+Distribute 0.7 was abandoned long ago and won't be included in the resulting code tree, but may be retained for posterity in the original repo.
+Setuptools default branch (also 0.7 development) may also be abandoned or may be incorporated into the new merged line if desirable (and as resources allow).
+
+#What history is lost/changed?#
+
+As setuptools was not on Mercurial when the fork occurred and as Distribute did not include the full setuptools history (prior to the creation of the setuptools-0.6 branch), the two source trees were not compatible. In order to most effectively communicate the code history, the Distribute code was grafted onto the (originally private) setuptools Mercurial repo. Although this grafting maintained the full code history with names, dates, and changes, it did lose the original hashes of those changes. Therefore, references to changes by hash (including tags) are lost.
+Additionally, any heads that were not actively merged into the Distribute 0.6.35 release were also omitted. As a result, the changesets included in the merge repo are those from the original setuptools repo and all changesets ancestral to the Distribute 0.6.35 release.
+
+#What features will be in the merged code base?#
+
+In general, all "features" added in distribute will be included in setuptools. Where there exist conflicts or undesirable features, we will be explicit about what these limitations are. Changes that are  backward-incompatible from setuptools 0.6 to distribute will likely be  removed, and these also will be well documented.
+Bootstrapping scripts (ez_setup/distribute_setup) and docs, as with  distribute, will be maintained in the repository and built as part of  the release process. Documentation and bootstrapping scripts will be  hosted at python.org, as they are with distribute now. Documentation at  telecommunity will be updated to refer or redirect to the new, merged  docs.
+On  the whole, the merged setuptools should be largely compatible with the  latest releases of both setuptools and distribute and will be an easy  transition for users of either library.
+
+#Who is invited to contribute? Who is excluded?#
+
+While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the  community, especially those most familiar with Python packaging and its challenges to join us in the effort.
+
+We have lots of  ideas for how we'd like to improve the codebase, release process,  everything.  Like distribute, the post-merge setuptools will have its  source hosted on bitbucket.  (So if you're currently a distribute  contributor, about the only thing that's going to change is the URL of  the repository you follow.)  Also like distribute, it'll support Python  3, and hopefully we'll soon merge Vinay Sajip's patches to make it run  on Python 3 without needing 2to3 to be run on the code first.
+While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
+
+#Why Setuptools and not Distribute or another name?#
+
+We do, however,  understand that this announcement might be unsettling for some.  The  setuptools name has been subjected to a lot of deprecation in recent  years, so the idea that it will now be the preferred name instead of distribute might be somewhat difficult or disorienting for some.   We considered use of another name (Distribute or an entirely new name),  but that would serve to only complicate matters further. Instead, our goal is to simplify the packaging landscape but without losing any hard-won advancements.  We hope  that the people who worked to spread the first message will be equally  enthusiastic about spreading the new one, and we especially look forward to seeing the new posters and slogans celebrating setuptools.
+
+#What is the timeframe of release?#
+
+There are no hard timeframes for any of this effort, although progress is underway and a draft merge is underway and being tested privately.   As an unfunded volunteer effort, our time to put in on it is limited,  and we've both had some recent health and other challenges that have  made working on this difficult, which in part explains why we haven't met our original deadline of a completed merge before PyCon.
+
+The final Setuptools 0.7 was cut on June 1, 2013 and will be released to PyPI shortly thereafter.
+
+#What version number can I expect for the new release?#
+
+The new release will roughly follow the previous trend for setuptools and release the new release as 0.7. This number is somewhat arbitrary, but we wanted something other than 0.6 to distinguish it from its ancestor forks but not 1.0 to avoid putting too much emphasis on the release itself and to focus on merging the functionality. In the future, the project will likely adopt a versioning scheme similar to semver to convey semantic meaning about the release in the version number.
+
+#How specifically was the merge enacted?#
+
+Details about the actual merge process are included in the repository as MERGE.txt.

From bede52c54ea4b7bd36ba5d5ce148648a7c296976 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:23:33 -0400
Subject: [PATCH 1225/8469] Reformatted faq for RST

---
 docs/merge-faq.txt | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index db26afb937..c2f90e7f49 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -1,44 +1,53 @@
-#Where does the merge occur?#
+Where does the merge occur?
+========================================================
 
 The merge is occurring between the heads of the default branch of Distribute and the setuptools-0.6 branch of Setuptools. The Setuptools SVN repo has been converted to a Mercurial repo hosted on Bitbucket. The work is still underway, so the exact changesets included may change, although the anticipated merge targets are Setuptools at 0.6c12 and Distribute at 0.6.35.
 
-#What happens to other branches?#
+What happens to other branches?
+========================================================
 
 Distribute 0.7 was abandoned long ago and won't be included in the resulting code tree, but may be retained for posterity in the original repo.
+
 Setuptools default branch (also 0.7 development) may also be abandoned or may be incorporated into the new merged line if desirable (and as resources allow).
 
-#What history is lost/changed?#
+What history is lost/changed?
+========================================================
 
 As setuptools was not on Mercurial when the fork occurred and as Distribute did not include the full setuptools history (prior to the creation of the setuptools-0.6 branch), the two source trees were not compatible. In order to most effectively communicate the code history, the Distribute code was grafted onto the (originally private) setuptools Mercurial repo. Although this grafting maintained the full code history with names, dates, and changes, it did lose the original hashes of those changes. Therefore, references to changes by hash (including tags) are lost.
+
 Additionally, any heads that were not actively merged into the Distribute 0.6.35 release were also omitted. As a result, the changesets included in the merge repo are those from the original setuptools repo and all changesets ancestral to the Distribute 0.6.35 release.
 
-#What features will be in the merged code base?#
+What features will be in the merged code base?
+========================================================
 
 In general, all "features" added in distribute will be included in setuptools. Where there exist conflicts or undesirable features, we will be explicit about what these limitations are. Changes that are  backward-incompatible from setuptools 0.6 to distribute will likely be  removed, and these also will be well documented.
+
 Bootstrapping scripts (ez_setup/distribute_setup) and docs, as with  distribute, will be maintained in the repository and built as part of  the release process. Documentation and bootstrapping scripts will be  hosted at python.org, as they are with distribute now. Documentation at  telecommunity will be updated to refer or redirect to the new, merged  docs.
+
 On  the whole, the merged setuptools should be largely compatible with the  latest releases of both setuptools and distribute and will be an easy  transition for users of either library.
 
-#Who is invited to contribute? Who is excluded?#
+Who is invited to contribute? Who is excluded?
+========================================================
 
 While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the  community, especially those most familiar with Python packaging and its challenges to join us in the effort.
 
 We have lots of  ideas for how we'd like to improve the codebase, release process,  everything.  Like distribute, the post-merge setuptools will have its  source hosted on bitbucket.  (So if you're currently a distribute  contributor, about the only thing that's going to change is the URL of  the repository you follow.)  Also like distribute, it'll support Python  3, and hopefully we'll soon merge Vinay Sajip's patches to make it run  on Python 3 without needing 2to3 to be run on the code first.
+
 While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
 
-#Why Setuptools and not Distribute or another name?#
+Why Setuptools and not Distribute or another name?
+========================================================
 
 We do, however,  understand that this announcement might be unsettling for some.  The  setuptools name has been subjected to a lot of deprecation in recent  years, so the idea that it will now be the preferred name instead of distribute might be somewhat difficult or disorienting for some.   We considered use of another name (Distribute or an entirely new name),  but that would serve to only complicate matters further. Instead, our goal is to simplify the packaging landscape but without losing any hard-won advancements.  We hope  that the people who worked to spread the first message will be equally  enthusiastic about spreading the new one, and we especially look forward to seeing the new posters and slogans celebrating setuptools.
 
-#What is the timeframe of release?#
+What is the timeframe of release?
+========================================================
 
 There are no hard timeframes for any of this effort, although progress is underway and a draft merge is underway and being tested privately.   As an unfunded volunteer effort, our time to put in on it is limited,  and we've both had some recent health and other challenges that have  made working on this difficult, which in part explains why we haven't met our original deadline of a completed merge before PyCon.
 
 The final Setuptools 0.7 was cut on June 1, 2013 and will be released to PyPI shortly thereafter.
 
-#What version number can I expect for the new release?#
+What version number can I expect for the new release?
+========================================================
 
 The new release will roughly follow the previous trend for setuptools and release the new release as 0.7. This number is somewhat arbitrary, but we wanted something other than 0.6 to distinguish it from its ancestor forks but not 1.0 to avoid putting too much emphasis on the release itself and to focus on merging the functionality. In the future, the project will likely adopt a versioning scheme similar to semver to convey semantic meaning about the release in the version number.
-
-#How specifically was the merge enacted?#
-
-Details about the actual merge process are included in the repository as MERGE.txt.

From 5c041343fab9b643998e4390e109f69171841d94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:26:56 -0400
Subject: [PATCH 1226/8469] Add heading

---
 docs/merge-faq.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index c2f90e7f49..65fce3c0ba 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -1,3 +1,6 @@
+Setuptools/Distribute Merge FAQ
+-------------------------------
+
 Where does the merge occur?
 ========================================================
 

From 6790d075bfbe3723fd1ac88e202938f63edde164 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:29:25 -0400
Subject: [PATCH 1227/8469] Linked FAQ

---
 docs/merge.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/merge.txt b/docs/merge.txt
index 23d1e8579f..ba37d6e4ca 100644
--- a/docs/merge.txt
+++ b/docs/merge.txt
@@ -4,6 +4,11 @@ Merge with Distribute
 In 2013, the fork of Distribute was merged back into Setuptools. This
 document describes some of the details of the merge.
 
+.. toctree::
+   :maxdepth: 2
+
+   merge-faq
+
 Process
 =======
 

From 50e511b8292c08d1cf049e7f4060014491579ea1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 10:51:47 -0400
Subject: [PATCH 1228/8469] Added sections on upgrading

---
 docs/merge-faq.txt | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index 65fce3c0ba..520130985e 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -1,5 +1,29 @@
 Setuptools/Distribute Merge FAQ
--------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+How do I upgrade from Distribute?
+=================================
+
+Distribute specifically prohibits installation of Setuptools 0.7 from Distribute 0.6. There are then two options for upgrading.
+
+Note that after upgrading using either technique, the only option to downgrade to either version is to completely uninstall Distribute and Setuptools 0.7 versions before reinstalling an 0.6 release.
+
+Use Distribute 0.7
+------------------
+
+The PYPA has put together a compatibility wrapper, a new release of Distribute version 0.7. This package will install over Distribute 0.6.x installations and will replace Distribute with a simple wrapper that requires Setuptools 0.7 or later. This technique is experimental, but initial results indicate this technique is the easiest upgrade path.
+
+
+Uninstall
+---------
+
+First, completely uninstall Distribute. Since Distribute does not have an automated installation routine, this process is manual. Follow the instructions in the README for uninstalling.
+
+
+How do I upgrade from Setuptools 0.6?
+=====================================
+
+There are no special instructions for upgrading over older versions of Setuptools. Simply use `easy_install -U` or run the latest `ez_setup.py`.
 
 Where does the merge occur?
 ========================================================

From 248d2bf54df0e592505508b9523b4102a3ca7cdd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 11:01:15 -0400
Subject: [PATCH 1229/8469] Fix 'set_versions'

---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 70ca05abb3..733314376b 100644
--- a/release.py
+++ b/release.py
@@ -27,7 +27,7 @@
 
 def set_versions():
 	global VERSION
-	version = raw_input("Release as version [%s]> " % VERSION)
+	version = raw_input("Release as version [%s]> " % VERSION) or VERSION
 	if version != VERSION:
 		VERSION = bump_versions(version)
 

From ffa2bfc63255aba2d74bbd89ee4c95be92d09b56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 11:01:23 -0400
Subject: [PATCH 1230/8469] Added tag 0.7.2 for changeset d04c05f035e3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 667a02aac0..e08a06c209 100644
--- a/.hgtags
+++ b/.hgtags
@@ -61,3 +61,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
 024dd30ed702135f5328975042566e48cc479d7d 0.7.1
+d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2

From 91c8bc673be3727f707f58251afa6a35bb6da3d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 11:01:36 -0400
Subject: [PATCH 1231/8469] Bumped to 0.7.3 in preparation for next release.

---
 README.txt   | 10 +++++-----
 docs/conf.py |  4 ++--
 ez_setup.py  |  2 +-
 release.py   |  2 +-
 setup.py     |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index 3b7563bc3d..b4a2383074 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7.2 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7.3 over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.2$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.3$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index e28153942f..3861b79a55 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.2'
+version = '0.7.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.2'
+release = '0.7.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 7f09dae453..ba0d781e7d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.2"
+DEFAULT_VERSION = "0.7.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 733314376b..0e3cd34f5a 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.2'
+VERSION = '0.7.3'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index d650ab752f..1433bb2f68 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.2"
+VERSION = "0.7.3"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 74264d3bf2de7cc80b084639e427b7d3127601d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 22:10:49 -0400
Subject: [PATCH 1232/8469] Bump version so it's reported correctly

---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 414b4b5de1..0f29f575e5 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7'
+__version__ = '0.7.3'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 4e455160ca42bc6cf1eb628de5f2098120fbf03f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Jun 2013 22:11:38 -0400
Subject: [PATCH 1233/8469] Add __init__.py to the list of 'files with
 versions'

---
 release.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.py b/release.py
index 0e3cd34f5a..0136c4b78f 100644
--- a/release.py
+++ b/release.py
@@ -58,6 +58,7 @@ def incr(match):
 
 files_with_versions = (
 	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py', 'README.txt',
+	'setuptools/__init__.py',
 )
 
 def get_repo_name():

From fbbc3e1980d80e113852951f36aaaccc72c57c9e Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 11 Jun 2013 08:50:52 +0200
Subject: [PATCH 1234/8469] Update some URLs.

---
 DEVGUIDE.txt                          |  2 +-
 README.txt                            |  2 +-
 docs/_templates/indexsidebar.html     |  4 ++--
 docs/easy_install.txt                 |  8 ++++----
 docs/setuptools.txt                   |  6 +++---
 release.py                            |  2 +-
 setup.py                              | 14 +++++++-------
 setuptools/command/upload.py          |  2 +-
 setuptools/tests/test_packageindex.py |  2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index db556480e7..f96d811556 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -6,7 +6,7 @@ Setuptools is developed using the DVCS Mercurial.
 
 Grab the code at bitbucket::
 
-    $ hg clone https://bitbucket.org/jaraco/setuptools
+    $ hg clone https://bitbucket.org/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
 bitbucket, commit the changes to your repository, and then make a pull request
diff --git a/README.txt b/README.txt
index b4a2383074..23627e6660 100755
--- a/README.txt
+++ b/README.txt
@@ -82,7 +82,7 @@ Downloads
 All setuptools downloads can be found at `the project's home page in the Python
 Package Index`_.  Scroll to the very bottom of the page to find the links.
 
-.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
+.. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools
 
 In addition to the PyPI downloads, the development version of ``setuptools``
 is available from the `Bitbucket repo`_, and in-development versions of the
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 9d49ae5dc2..a27c85fefd 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -1,8 +1,8 @@
 <h3>Download</h3>
 
 <p>Current version: <b>{{ version }}</b></p>
-<p>Get Setuptools from the <a href="http://pypi.python.org/pypi/setuptools"> Python Package Index</a>
+<p>Get Setuptools from the <a href="https://pypi.python.org/pypi/setuptools"> Python Package Index</a>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="http://bitbucket.org/jaraco/setuptools">Setuptools project page</a> </p>
+<p>Visit the <a href="https://bitbucket.org/pypa/setuptools">Setuptools project page</a> </p>
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index dac0fa8fcb..12bc73ea87 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -31,7 +31,7 @@ Using "Easy Install"
 Installing "Easy Install"
 -------------------------
 
-Please see the `setuptools PyPI page <http://pypi.python.org/pypi/setuptools>`_
+Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
@@ -806,7 +806,7 @@ Command-Line Options
 
 ``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
     Specifies the base URL of the Python Package Index.  The default is
-    http://pypi.python.org/simple if not specified.  When a package is requested
+    https://pypi.python.org/simple if not specified.  When a package is requested
     that is not locally available or linked from a ``--find-links`` download
     page, the package index will be searched for download pages for the needed
     package, and those download pages will be searched for links to download
@@ -995,7 +995,7 @@ that the User installation scheme alone does not provide, e.g. the ability to hi
 
 Please refer to the `virtualenv`_ documentation for more details.
 
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
+.. _virtualenv: https://pypi.python.org/pypi/virtualenv
 
 
 
@@ -1128,7 +1128,7 @@ History
 0.6c7
  * ``ftp:`` download URLs now work correctly.
 
- * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to use
+ * The default ``--index-url`` is now ``https://pypi.python.org/simple``, to use
    the Python Package Index's new simpler (and faster!) REST API.
 
 0.6c6
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2504dcda17..543141f7ed 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -15,7 +15,7 @@ including just a single `bootstrap module`_ (an 8K .py file), your package will
 automatically download and install ``setuptools`` if the user is building your
 package from source and doesn't have a suitable version already installed.
 
-.. _bootstrap module: http://bitbucket.org/jaraco/setuptools/downloads/ez_setup.py
+.. _bootstrap module: https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
 
 Feature Highlights:
 
@@ -2406,7 +2406,7 @@ The ``upload`` command has a few options worth noting:
 
 ``--repository=URL, -r URL``
     The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+    https://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 .. _upload_docs:
 
@@ -2468,7 +2468,7 @@ The ``upload_docs`` command has the following options:
 
 ``--repository=URL, -r URL``
     The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+    https://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 
 --------------------------------
diff --git a/release.py b/release.py
index 0136c4b78f..632bf4cb38 100644
--- a/release.py
+++ b/release.py
@@ -234,7 +234,7 @@ def _linkified_text(rst_content):
 
 	anchors = sorted(anchors)
 
-	bitroot = 'http://bitbucket.org/tarek/distribute'
+	bitroot = 'https://bitbucket.org/tarek/distribute'
 	rst_content += "\n"
 	for x in anchors:
 		issue = re.findall(r'\d+', x)[0]
diff --git a/setup.py b/setup.py
index 1433bb2f68..4ea6ad00d9 100755
--- a/setup.py
+++ b/setup.py
@@ -128,7 +128,7 @@ def run(self):
     license="PSF or ZPL",
     long_description = long_description,
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://pypi.python.org/pypi/setuptools",
+    url = "https://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
@@ -210,12 +210,12 @@ def run(self):
         "certs": "certifi==0.0.8",
     },
     dependency_links = [
-        'http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
-        'http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
-        'http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
-        'http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
-        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
-        'http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
+        'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
+        'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
+        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
+        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
     ],
     scripts = [],
     # tests_require = "setuptools[ssl]",
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 21b9615c42..4b500f68c5 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -23,7 +23,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index ad856e81f5..1060e787a5 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -97,7 +97,7 @@ def test_links_priority(self):
         """
         Download links from the pypi simple index should be used before
         external download links.
-        http://bitbucket.org/tarek/distribute/issue/163/md5-validation-error
+        https://bitbucket.org/tarek/distribute/issue/163
 
         Usecase :
         - someone uploads a package on pypi, a md5 is generated

From 8385649c3afa07a8bc4924a5ad6572227bef0d29 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 11 Jun 2013 09:10:33 +0200
Subject: [PATCH 1235/8469] Update some URLs (packages.python.org ->
 pythonhosted.org).

---
 CHANGES.txt                        | 2 +-
 docs/setuptools.txt                | 2 +-
 setuptools/command/easy_install.py | 6 +++---
 setuptools/command/upload_docs.py  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aac22ad0ce..c56a917b75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -495,7 +495,7 @@ how it parses version numbers.
   This closes issue #52.
 
 * Added an upload_docs command to easily upload project documentation to
-  PyPI's http://packages.python.org. This close issue #56.
+  PyPI's https://pythonhosted.org. This close issue #56.
 
 * Fixed a bootstrap bug on the use_setuptools() API.
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 543141f7ed..5d80b23096 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2414,7 +2414,7 @@ The ``upload`` command has a few options worth noting:
 ======================================================
 
 PyPI now supports uploading project documentation to the dedicated URL
-http://packages.python.org/<project>/.
+https://pythonhosted.org/<project>/.
 
 The ``upload_docs`` command will create the necessary zip file out of a
 documentation directory and will post to the repository.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f29faf9d0c..b90fee0a03 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -7,7 +7,7 @@
 packages.  For detailed documentation, see the accompanying EasyInstall.txt
 file, or visit the `EasyInstall home page`__.
 
-__ http://packages.python.org/setuptools/easy_install.html
+__ https://pythonhosted.org/setuptools/easy_install.html
 
 """
 import sys
@@ -467,7 +467,7 @@ def cant_write_to_target(self):
 For information on other options, you may wish to consult the
 documentation at:
 
-  http://packages.python.org/setuptools/easy_install.html
+  https://pythonhosted.org/setuptools/easy_install.html
 
 Please make the appropriate changes for your system and try again.
 """
@@ -1254,7 +1254,7 @@ def no_default_version_msg(self):
 * You can set up the installation directory to support ".pth" files by
   using one of the approaches described here:
 
-  http://packages.python.org/setuptools/easy_install.html#custom-installation-locations
+  https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again.""" % (
         self.install_dir, os.environ.get('PYTHONPATH','')
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 1d5a744512..6df3f394e1 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -2,7 +2,7 @@
 """upload_docs
 
 Implements a Distutils 'upload_docs' subcommand (upload documentation to
-PyPI's packages.python.org).
+PyPI's pythonhosted.org).
 """
 
 import os
@@ -185,7 +185,7 @@ def upload_file(self, filename):
         elif r.status == 301:
             location = r.getheader('Location')
             if location is None:
-                location = 'http://packages.python.org/%s/' % meta.get_name()
+                location = 'https://pythonhosted.org/%s/' % meta.get_name()
             self.announce('Upload successful. Visit %s' % location,
                           log.INFO)
         else:

From 91054c5ec0c8783b017e3874132c0c3e691272c9 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 11 Jun 2013 09:29:22 +0200
Subject: [PATCH 1236/8469] Rename
 DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment variable to
 SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.

---
 CHANGES.txt | 7 +++++++
 setup.py    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c56a917b75..0bda615353 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.7.3
+-----
+
+* Rename DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment
+  variable to SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.
+
 -----
 0.7.2
 -----
diff --git a/setup.py b/setup.py
index 4ea6ad00d9..d788f7a8f6 100755
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
 
 # specific command that is used to generate windows .exe files

From 0dfd7768a9a75bec3c2592b8d0b2a4fed4d825ab Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 12 Jun 2013 02:21:08 +0200
Subject: [PATCH 1237/8469] Issue #1: Disable installation of Windows-specific
 files on non-Windows systems.

---
 CHANGES.txt | 1 +
 setup.py    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0bda615353..9b1e48d94f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Rename DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment
   variable to SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.
+* Issue #1: Disable installation of Windows-specific files on non-Windows systems.
 
 -----
 0.7.2
diff --git a/setup.py b/setup.py
index d788f7a8f6..1260b17299 100755
--- a/setup.py
+++ b/setup.py
@@ -118,6 +118,11 @@ def run(self):
 readme_file.close()
 changes_file.close()
 
+package_data = {'setuptools': ['site-patch.py']}
+if sys.platform == 'win32':
+    package_data.setdefault('setuptools', []).extend(['*.exe'])
+    package_data.setdefault('setuptools.command', []).extend(['*.xml'])
+
 dist = setup(
     name="setuptools",
     version=VERSION,
@@ -132,7 +137,7 @@ def run(self):
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
-    package_data = {'setuptools':['*.exe', 'site-patch.py'], 'setuptools.command':['*.xml']},
+    package_data = package_data,
 
     py_modules = ['pkg_resources', 'easy_install'],
 

From c04abca662dcbffd00d928e06fbf32b9f49f8e57 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 12 Jun 2013 03:53:21 +0200
Subject: [PATCH 1238/8469] Use new sysconfig module with Python 2.7 or >=3.2.

---
 CHANGES.txt                        |  1 +
 pkg_resources.py                   |  5 +++--
 setuptools/command/bdist_egg.py    | 12 ++++++++----
 setuptools/command/build_ext.py    | 24 +++++++++++++++---------
 setuptools/command/easy_install.py | 18 +++++++++++++++---
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9b1e48d94f..59e37ad675 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES
 * Rename DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment
   variable to SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.
 * Issue #1: Disable installation of Windows-specific files on non-Windows systems.
+* Use new sysconfig module with Python 2.7 or >=3.2.
 
 -----
 0.7.2
diff --git a/pkg_resources.py b/pkg_resources.py
index 1706dcd42f..4d816e2ac0 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -245,9 +245,10 @@ def get_build_platform():
     needs some hacks for Linux and Mac OS X.
     """
     try:
-        from distutils.util import get_platform
-    except ImportError:
+        # Python 2.7 or >=3.2
         from sysconfig import get_platform
+    except ImportError:
+        from distutils.util import get_platform
 
     plat = get_platform()
     if sys.platform == "darwin" and not plat.startswith('macosx-'):
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index c3356bb7d0..1ba0499e92 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -7,10 +7,14 @@
 from setuptools import Command
 from distutils.dir_util import remove_tree, mkpath
 try:
-    from distutils.sysconfig import get_python_version, get_python_lib
+    # Python 2.7 or >=3.2
+    from sysconfig import get_path, get_python_version
+    def _get_purelib():
+        return get_path("purelib")
 except ImportError:
-    from sysconfig import get_python_version
-    from distutils.sysconfig import get_python_lib
+    from distutils.sysconfig import get_python_lib, get_python_version
+    def _get_purelib():
+        return get_python_lib(False)
 
 from distutils import log
 from distutils.errors import DistutilsSetupError
@@ -130,7 +134,7 @@ def do_install_data(self):
         # Hack for packages that install data to install's --install-lib
         self.get_finalized_command('install').install_lib = self.bdist_dir
 
-        site_packages = os.path.normcase(os.path.realpath(get_python_lib()))
+        site_packages = os.path.normcase(os.path.realpath(_get_purelib()))
         old, self.distribution.data_files = self.distribution.data_files,[]
 
         for item in old:
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index f2a53258cd..50a039ce50 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -9,9 +9,15 @@
 from distutils.file_util import copy_file
 from setuptools.extension import Library
 from distutils.ccompiler import new_compiler
-from distutils.sysconfig import customize_compiler, get_config_var
-get_config_var("LDSHARED")  # make sure _config_vars is initialized
-from distutils.sysconfig import _config_vars
+from distutils.sysconfig import customize_compiler
+try:
+    # Python 2.7 or >=3.2
+    from sysconfig import _CONFIG_VARS
+except ImportError:
+    from distutils.sysconfig import get_config_var
+    get_config_var("LDSHARED")  # make sure _config_vars is initialized
+    del get_config_var
+    from distutils.sysconfig import _config_vars as _CONFIG_VARS
 from distutils import log
 from distutils.errors import *
 
@@ -131,16 +137,16 @@ def setup_shlib_compiler(self):
             compiler=self.compiler, dry_run=self.dry_run, force=self.force
         )
         if sys.platform == "darwin":
-            tmp = _config_vars.copy()
+            tmp = _CONFIG_VARS.copy()
             try:
                 # XXX Help!  I don't have any idea whether these are right...
-                _config_vars['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
-                _config_vars['CCSHARED'] = " -dynamiclib"
-                _config_vars['SO'] = ".dylib"
+                _CONFIG_VARS['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
+                _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
+                _CONFIG_VARS['SO'] = ".dylib"
                 customize_compiler(compiler)
             finally:
-                _config_vars.clear()
-                _config_vars.update(tmp)
+                _CONFIG_VARS.clear()
+                _CONFIG_VARS.update(tmp)
         else:
             customize_compiler(compiler)
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b90fee0a03..60b3e01104 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -25,9 +25,22 @@
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
+try:
+    # Python 2.7 or >=3.2
+    from sysconfig import get_config_vars, get_path
+    def _get_platlib():
+        return get_path("platlib")
+    def _get_purelib():
+        return get_path("purelib")
+except ImportError:
+    from distutils.sysconfig import get_config_vars, get_python_lib
+    def _get_platlib():
+        return get_python_lib(True)
+    def _get_purelib():
+        return get_python_lib(False)
+
 from distutils.util import get_platform
 from distutils.util import convert_path, subst_vars
-from distutils.sysconfig import get_python_lib, get_config_vars
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
     DistutilsError, DistutilsPlatformError
 from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
@@ -1398,8 +1411,7 @@ def get_site_dirs():
                                          'Python',
                                          sys.version[:3],
                                          'site-packages'))
-    for plat_specific in (0,1):
-        site_lib = get_python_lib(plat_specific)
+    for site_lib in (_get_purelib(), _get_platlib()):
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
     if HAS_USER_SITE:

From 8e657eac1ef02faedca99df319fff6b63f4a4305 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 15 Jun 2013 15:34:53 +0100
Subject: [PATCH 1239/8469] Initial commit. All tests pass on 2.7, 3.2 and 3.3,
 though there are some atexit errors in the multiprocessing module in 2.7/3.2
 (seemingly unrelated to setuptools).

--HG--
branch : single-codebase
---
 .hgignore                                |  1 +
 pkg_resources.py                         | 69 ++++++++++++------
 setup.py                                 |  6 +-
 setuptools.egg-info/dependency_links.txt | 12 ++--
 setuptools.egg-info/requires.txt         | 14 ++--
 setuptools/command/alias.py              | 10 +--
 setuptools/command/bdist_egg.py          |  3 +-
 setuptools/command/easy_install.py       | 53 ++++++++------
 setuptools/command/egg_info.py           | 11 +--
 setuptools/command/install_egg_info.py   |  1 +
 setuptools/command/install_scripts.py    |  2 +-
 setuptools/command/rotate.py             |  1 +
 setuptools/command/sdist.py              |  2 +-
 setuptools/command/setopt.py             |  4 +-
 setuptools/command/upload.py             | 15 ++--
 setuptools/command/upload_docs.py        | 18 +++--
 setuptools/compat.py                     | 91 ++++++++++++++++++++++++
 setuptools/depends.py                    |  2 +-
 setuptools/dist.py                       |  9 ++-
 setuptools/package_index.py              | 88 ++++++++++++-----------
 setuptools/sandbox.py                    | 16 +++--
 setuptools/ssl_support.py                |  7 +-
 setuptools/tests/__init__.py             | 10 +--
 setuptools/tests/doctest.py              | 58 +++++++--------
 setuptools/tests/server.py               | 18 ++---
 setuptools/tests/test_bdist_egg.py       |  2 +-
 setuptools/tests/test_develop.py         | 11 +--
 setuptools/tests/test_easy_install.py    | 18 +++--
 setuptools/tests/test_packageindex.py    | 23 +++---
 setuptools/tests/test_resources.py       | 17 ++---
 setuptools/tests/test_sdist.py           | 15 ++--
 setuptools/tests/test_test.py            |  2 +-
 tests/api_tests.txt                      |  6 +-
 tests/manual_test.py                     |  2 +-
 34 files changed, 389 insertions(+), 228 deletions(-)
 create mode 100644 setuptools/compat.py

diff --git a/.hgignore b/.hgignore
index 4e5d0bcfca..56be0c948c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
 *.swp
 .coverage
 distribute.egg-info
+setuptools.egg-info
 build
 dist
 lib
diff --git a/pkg_resources.py b/pkg_resources.py
index 4d816e2ac0..03aa75ad03 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,13 +13,41 @@
 method.
 """
 
-import sys, os, time, re, imp, types, zipfile, zipimport
-from urlparse import urlparse, urlunparse
+import sys, os, zipfile, zipimport, time, re, imp, types
+try:
+    from urlparse import urlparse, urlunparse
+except ImportError:
+    from urllib.parse import urlparse, urlunparse
 
 try:
     frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
+try:
+    basestring
+    next = lambda o: o.next()
+    from cStringIO import StringIO
+    def exec_(code, globs=None, locs=None):
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+except NameError:
+    basestring = str
+    from io import StringIO
+    from functools import reduce
+    exec_ = eval("exec")
+    def execfile(fn, globs=None, locs=None):
+        if globs is None:
+            globs = globals()
+        if locs is None:
+            locs = globs
+        exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
 # capture these to bypass sandboxing
 from os import utime
@@ -44,7 +72,7 @@
 except ImportError:
     pass
 
-def _bypass_ensure_directory(name, mode=0777):
+def _bypass_ensure_directory(name, mode=0x1FF):  # 0777
     # Sandbox-bypassing version of ensure_directory()
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')
@@ -58,20 +86,20 @@ def _bypass_ensure_directory(name, mode=0777):
 
 def _declare_state(vartype, **kw):
     g = globals()
-    for name, val in kw.iteritems():
+    for name, val in kw.items():
         g[name] = val
         _state_vars[name] = vartype
 
 def __getstate__():
     state = {}
     g = globals()
-    for k, v in _state_vars.iteritems():
+    for k, v in _state_vars.items():
         state[k] = g['_sget_'+v](g[k])
     return state
 
 def __setstate__(state):
     g = globals()
-    for k, v in state.iteritems():
+    for k, v in state.items():
         g['_sset_'+_state_vars[k]](k, g[k], v)
     return state
 
@@ -650,7 +678,7 @@ def find_plugins(self,
             env = full_env + plugin_env
 
         shadow_set = self.__class__([])
-        map(shadow_set.add, self)   # put all our entries in shadow_set
+        list(map(shadow_set.add, self))   # put all our entries in shadow_set
 
         for project_name in plugin_projects:
 
@@ -661,7 +689,8 @@ def find_plugins(self,
                 try:
                     resolvees = shadow_set.resolve(req, env, installer)
 
-                except ResolutionError,v:
+                except ResolutionError:
+                    v = sys.exc_info()[1]
                     error_info[dist] = v    # save error info
                     if fallback:
                         continue    # try the next older version of project
@@ -669,7 +698,7 @@ def find_plugins(self,
                         break       # give up on this project, keep going
 
                 else:
-                    map(shadow_set.add, resolvees)
+                    list(map(shadow_set.add, resolvees))
                     distributions.update(dict.fromkeys(resolvees))
 
                     # success, no need to try any more versions of this project
@@ -718,7 +747,8 @@ def __getstate__(self):
             self.callbacks[:]
         )
 
-    def __setstate__(self, (entries, keys, by_key, callbacks)):
+    def __setstate__(self, e_k_b_c):
+        entries, keys, by_key, callbacks = e_k_b_c
         self.entries = entries[:]
         self.entry_keys = keys.copy()
         self.by_key = by_key.copy()
@@ -1029,7 +1059,7 @@ def postprocess(self, tempname, filename):
 
         if os.name == 'posix':
             # Make the resource executable
-            mode = ((os.stat(tempname).st_mode) | 0555) & 07777
+            mode = ((os.stat(tempname).st_mode) | 0x16D) & 0xFFF # 0555, 07777
             os.chmod(tempname, mode)
 
 
@@ -1401,7 +1431,7 @@ def run_script(self,script_name,namespace):
                 len(script_text), 0, script_text.split('\n'), script_filename
             )
             script_code = compile(script_text,script_filename,'exec')
-            exec script_code in namespace, namespace
+            exec_(script_code, namespace, namespace)
 
     def _has(self, path):
         raise NotImplementedError(
@@ -1921,7 +1951,7 @@ def StringIO(*args, **kw):
     try:
         from cStringIO import StringIO
     except ImportError:
-        from StringIO import StringIO
+        from io import StringIO
     return StringIO(*args,**kw)
 
 def find_nothing(importer, path_item, only=False):
@@ -2219,8 +2249,8 @@ def load(self, require=True, env=None, installer=None):
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
             raise UnknownExtra("Can't require() without a distribution", self)
-        map(working_set.add,
-            working_set.resolve(self.dist.requires(self.extras),env,installer))
+        list(map(working_set.add,
+            working_set.resolve(self.dist.requires(self.extras),env,installer)))
 
 
 
@@ -2491,7 +2521,7 @@ def __str__(self):
     def __getattr__(self,attr):
         """Delegate all unrecognized public attributes to .metadata provider"""
         if attr.startswith('_'):
-            raise AttributeError,attr
+            raise AttributeError(attr)
         return getattr(self._provider, attr)
 
 
@@ -2672,7 +2702,7 @@ def _compute_dependencies(self):
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
             distvers, mark = self._preparse_requirement(req)
-            parsed = parse_requirements(distvers).next()
+            parsed = next(parse_requirements(distvers))
             parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
 
@@ -2747,7 +2777,7 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
         while not TERMINATOR(line,p):
             if CONTINUE(line,p):
                 try:
-                    line = lines.next(); p = 0
+                    line = next(lines); p = 0
                 except StopIteration:
                     raise ValueError(
                         "\\ must not appear on the last nonblank line"
@@ -2976,6 +3006,5 @@ def _initialize(g):
 # all distributions added to the working set in the future (e.g. by
 # calling ``require()``) will get activated as well.
 add_activation_listener(lambda dist: dist.activate())
-working_set.entries=[]; map(working_set.add_entry,sys.path) # match order
-
+working_set.entries=[]; list(map(working_set.add_entry,sys.path)) # match order
 
diff --git a/setup.py b/setup.py
index 1260b17299..7ed396d056 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 src_root = None
-if sys.version_info >= (3,):
+do_2to3 = False
+if sys.version_info >= (3,) and do_2to3:
     tmp_src = os.path.join("build", "src")
     from distutils.filelist import FileList
     from distutils import dir_util, file_util, util, log
@@ -75,7 +76,8 @@ def build_package_data(self):
                 # previous version doesn't have convert_2to3_doctests)
                 if not hasattr(self.distribution, 'convert_2to3_doctests'):
                     continue
-
+                if not do_2to3:
+                    continue
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index a54d9039cc..c688b7eaab 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,6 +1,6 @@
-http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
-http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
-http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
-http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
-http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
-http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
+https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
+https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
+https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
+https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
+https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 91d84d9ca8..2f2a364fa2 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [certs]
 certifi==0.0.8
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ssl==1.16
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 40c00b550b..4c08c48dad 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -43,10 +43,10 @@ def run(self):
         aliases = self.distribution.get_option_dict('aliases')
 
         if not self.args:
-            print "Command Aliases"
-            print "---------------"
+            print("Command Aliases")
+            print("---------------")
             for alias in aliases:
-                print "setup.py alias", format_alias(alias, aliases)
+                print("setup.py alias", format_alias(alias, aliases))
             return
 
         elif len(self.args)==1:
@@ -54,10 +54,10 @@ def run(self):
             if self.remove:
                 command = None
             elif alias in aliases:
-                print "setup.py alias", format_alias(alias, aliases)
+                print("setup.py alias", format_alias(alias, aliases))
                 return
             else:
-                print "No alias definition found for %r" % alias
+                print("No alias definition found for %r" % alias)
                 return
         else:
             alias = self.args[0]
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 1ba0499e92..de72ea0463 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -21,6 +21,7 @@ def _get_purelib():
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
 from types import CodeType
+from setuptools.compat import basestring, next
 from setuptools.extension import Library
 
 def strip_module(filename):
@@ -383,7 +384,7 @@ def get_ext_outputs(self):
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
     walker = os.walk(egg_dir)
-    base,dirs,files = walker.next()
+    base,dirs,files = next(walker)
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
     yield base,dirs,files
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 60b3e01104..f71128b00f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -49,6 +49,8 @@ def _get_purelib():
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
+from setuptools.compat import (iteritems, maxsize, xrange, basestring, unicode,
+                               reraise)
 from pkg_resources import yield_lines, normalize_path, resource_string, \
         ensure_directory, get_distribution, find_distributions, \
         Environment, Requirement, Distribution, \
@@ -56,7 +58,10 @@ def _get_purelib():
          DistributionNotFound, VersionConflict, \
         DEVELOP_DIST
 
-sys_executable = os.path.normpath(sys.executable)
+if '__VENV_LAUNCHER__' in os.environ:
+    sys_executable = os.environ['__VENV_LAUNCHER__']
+else:
+    sys_executable = os.path.normpath(sys.executable)
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
@@ -215,7 +220,7 @@ def delete_blockers(self, blockers):
 
     def finalize_options(self):
         if self.version:
-            print 'setuptools %s' % get_distribution('setuptools').version
+            print('setuptools %s' % get_distribution('setuptools').version)
             sys.exit()
 
         py_version = sys.version.split()[0]
@@ -395,7 +400,7 @@ def pseudo_tempname(self):
         try:
             pid = os.getpid()
         except:
-            pid = random.randint(0,sys.maxint)
+            pid = random.randint(0, maxsize)
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
     def warn_deprecated_options(self):
@@ -698,11 +703,13 @@ def process_distribution(self, requirement, dist, deps=True, *info):
             distros = WorkingSet([]).resolve(
                 [requirement], self.local_index, self.easy_install
             )
-        except DistributionNotFound, e:
+        except DistributionNotFound:
+            e = sys.exc_info()[1]
             raise DistutilsError(
                 "Could not find required distribution %s" % e.args
             )
-        except VersionConflict, e:
+        except VersionConflict:
+            e = sys.exc_info()[1]
             raise DistutilsError(
                 "Installed distribution %s conflicts with requirement %s"
                 % e.args
@@ -793,7 +800,7 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0777-mask)
+            chmod(target, 0o777-mask)
 
 
 
@@ -1104,7 +1111,8 @@ def run_setup(self, setup_script, setup_base, args):
         )
         try:
             run_setup(setup_script, args)
-        except SystemExit, v:
+        except SystemExit:
+            v = sys.exc_info()[1]
             raise DistutilsError("Setup script exited with %s" % (v.args[0],))
 
     def build_and_install(self, setup_script, setup_base):
@@ -1146,7 +1154,7 @@ def _set_fetcher_options(self, base):
             'site_dirs', 'allow_hosts',
         )
         fetch_options = {}
-        for key, val in ei_opts.iteritems():
+        for key, val in iteritems(ei_opts):
             if key not in fetch_directives: continue
             fetch_options[key.replace('_', '-')] = val[1]
         # create a settings dictionary suitable for `edit_config`
@@ -1211,7 +1219,7 @@ def pf(src,dst):
         self.byte_compile(to_compile)
         if not self.dry_run:
             for f in to_chmod:
-                mode = ((os.stat(f)[stat.ST_MODE]) | 0555) & 07755
+                mode = ((os.stat(f)[stat.ST_MODE]) | 0x16D) & 0xFED  # 0555, 07755
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
@@ -1326,10 +1334,10 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for name, path in self.config_vars.iteritems():
+        for name, path in iteritems(self.config_vars):
             if path.startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0700)" % path)
-                os.makedirs(path, 0700)
+                os.makedirs(path, 0x1C0)    # 0700
 
 
 
@@ -1380,7 +1388,7 @@ def _expand(self, *attrs):
 
 def get_site_dirs():
     # return a list of 'site' dirs
-    sitedirs = filter(None,os.environ.get('PYTHONPATH','').split(os.pathsep))
+    sitedirs = list(filter(None,os.environ.get('PYTHONPATH','').split(os.pathsep)))
     prefixes = [sys.prefix]
     if sys.exec_prefix != sys.prefix:
         prefixes.append(sys.exec_prefix)
@@ -1417,7 +1425,7 @@ def get_site_dirs():
     if HAS_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
-    sitedirs = map(normalize_path, sitedirs)
+    sitedirs = list(map(normalize_path, sitedirs))
 
     return sitedirs
 
@@ -1479,7 +1487,7 @@ def extract_wininst_cfg(dist_filename):
             return None
         f.seek(prepended-12)
 
-        import struct, StringIO, ConfigParser
+        from setuptools.compat import StringIO, ConfigParser
         tag, cfglen, bmlen = struct.unpack("<iii",f.read(12))
         if tag not in (0x1234567A, 0x1234567B):
             return None     # not a valid tag
@@ -1567,11 +1575,11 @@ class PthDistributions(Environment):
     dirty = False
 
     def __init__(self, filename, sitedirs=()):
-        self.filename = filename; self.sitedirs=map(normalize_path, sitedirs)
+        self.filename = filename; self.sitedirs = list(map(normalize_path, sitedirs))
         self.basedir = normalize_path(os.path.dirname(self.filename))
         self._load(); Environment.__init__(self, [], None, None)
         for path in yield_lines(self.paths):
-            map(self.add, find_distributions(path, True))
+            list(map(self.add, find_distributions(path, True)))
 
     def _load(self):
         self.paths = []
@@ -1699,8 +1707,8 @@ def auto_chmod(func, arg, exc):
     if func is os.remove and os.name=='nt':
         chmod(arg, stat.S_IWRITE)
         return func(arg)
-    exc = sys.exc_info()
-    raise exc[0], (exc[1][0], exc[1][1] + (" %s %s" % (func,arg)))
+    et, ev, _ = sys.exc_info()
+    reraise(et, (ev[0], ev[1] + (" %s %s" % (func,arg))))
 
 def uncache_zipdir(path):
     """Ensure that the importer caches dont have stale info for `path`"""
@@ -1800,7 +1808,8 @@ def chmod(path, mode):
     log.debug("changing mode of %s to %o", path, mode)
     try:
         _chmod(path, mode)
-    except os.error, e:
+    except os.error:
+        e = sys.exc_info()[1]
         log.debug("chmod failed: %s", e)
 
 def fix_jython_executable(executable, options):
@@ -1914,7 +1923,7 @@ def onerror(*args):
     names = []
     try:
         names = os.listdir(path)
-    except os.error, err:
+    except os.error:
         onerror(os.listdir, path, sys.exc_info())
     for name in names:
         fullname = os.path.join(path, name)
@@ -1927,7 +1936,7 @@ def onerror(*args):
         else:
             try:
                 os.remove(fullname)
-            except os.error, err:
+            except os.error:
                 onerror(os.remove, fullname, sys.exc_info())
     try:
         os.rmdir(path)
@@ -1935,7 +1944,7 @@ def onerror(*args):
         onerror(os.rmdir, path, sys.exc_info())
 
 def current_umask():
-    tmp = os.umask(022)
+    tmp = os.umask(0x12)    # 022
     os.umask(tmp)
     return tmp
 
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cd3ea19895..c77bd69db4 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -8,11 +8,12 @@
 from distutils.errors import *
 from distutils import log
 from setuptools.command.sdist import sdist
+from setuptools.compat import basestring, PY3
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
-from sdist import walk_revctrl
+from setuptools.command.sdist import walk_revctrl
 
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
@@ -51,7 +52,7 @@ def initialize_options(self):
         self.vtags = None
 
     def save_version_info(self, filename):
-        from setopt import edit_config
+        from setuptools.command.setopt import edit_config
         edit_config(
             filename,
             {'egg_info':
@@ -282,7 +283,7 @@ def append(self, item):
             item = item[:-1]
         path = convert_path(item)
 
-        if sys.version_info >= (3,):
+        if PY3:
             try:
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
@@ -336,7 +337,7 @@ def write_manifest (self):
         named by 'self.manifest'.
         """
         # The manifest must be UTF-8 encodable. See #303.
-        if sys.version_info >= (3,):
+        if PY3:
             files = []
             for file in self.filelist.files:
                 try:
@@ -415,7 +416,7 @@ def write_pkg_info(cmd, basename, filename):
             metadata.name, metadata.version = oldname, oldver
 
         safe = getattr(cmd.distribution,'zip_safe',None)
-        import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
+        from setuptools.command import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
 
 def warn_depends_obsolete(cmd, basename, filename):
     if os.path.exists(filename):
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index f44b34b555..87ddff9c17 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,5 +1,6 @@
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
+from setuptools.compat import PY3
 from distutils import log, dir_util
 import os, shutil, pkg_resources
 
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 8245603597..4e6b1a9a84 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -50,5 +50,5 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0777-mask)
+            chmod(target, 0o777-mask)
 
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 11b6eae82b..b10acfb41f 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -1,5 +1,6 @@
 import distutils, os
 from setuptools import Command
+from setuptools.compat import basestring
 from distutils.util import convert_path
 from distutils import log
 from distutils.errors import *
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index f8f964b396..39cd604396 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -210,7 +210,7 @@ def add_defaults(self):
 
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
-            files = filter(os.path.isfile, glob(pattern))
+            files = list(filter(os.path.isfile, glob(pattern)))
             if files:
                 self.filelist.extend(files)
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index dbf3a94ec1..aa468c88fe 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -47,9 +47,9 @@ def edit_config(filename, settings, dry_run=False):
     while a dictionary lists settings to be changed or deleted in that section.
     A setting of ``None`` means to delete that setting.
     """
-    from ConfigParser import RawConfigParser
+    from setuptools.compat import ConfigParser
     log.debug("Reading configuration from %s", filename)
-    opts = RawConfigParser()
+    opts = ConfigParser.RawConfigParser()
     opts.read([filename])
     for section, options in settings.items():
         if options is None:
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 4b500f68c5..7ef0e6ec58 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -13,11 +13,9 @@
 import os
 import socket
 import platform
-import ConfigParser
-import httplib
 import base64
-import urlparse
-import cStringIO as StringIO
+
+from setuptools.compat import urlparse, StringIO, httplib, ConfigParser
 
 class upload(Command):
 
@@ -49,7 +47,7 @@ def finalize_options(self):
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 self.announce('Using PyPI login from %s' % rc)
@@ -149,14 +147,14 @@ def upload_file(self, command, pyversion, filename):
         # We can't use urllib2 since we need to send the Basic
         # auth right with the first request
         schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
+            urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
             http = httplib.HTTPConnection(netloc)
         elif schema == 'https':
             http = httplib.HTTPSConnection(netloc)
         else:
-            raise AssertionError, "unsupported schema "+schema
+            raise AssertionError("unsupported schema " + schema)
 
         data = ''
         loglevel = log.INFO
@@ -181,5 +179,4 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
-
+            print('-'*75, r.read(), '-'*75)
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 6df3f394e1..0a54578904 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -8,8 +8,6 @@
 import os
 import socket
 import zipfile
-import httplib
-import urlparse
 import tempfile
 import sys
 import shutil
@@ -25,12 +23,19 @@
 except ImportError:
     from setuptools.command.upload import upload
 
+from setuptools.compat import httplib, urlparse
+
+if sys.version_info >= (3,):
+    errors = 'surrogateescape'
+else:
+    errors = 'strict'
+
 
 # This is not just a replacement for byte literals
 # but works as a general purpose encoder
 def b(s, encoding='utf-8'):
     if isinstance(s, unicode):
-        return s.encode(encoding)
+        return s.encode(encoding, errors)
     return s
 
 
@@ -154,7 +159,7 @@ def upload_file(self, filename):
         # We can't use urllib2 since we need to send the Basic
         # auth right with the first request
         schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
+            urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
             conn = httplib.HTTPConnection(netloc)
@@ -174,7 +179,8 @@ def upload_file(self, filename):
             conn.putheader('Authorization', auth)
             conn.endheaders()
             conn.send(body)
-        except socket.error, e:
+        except socket.error:
+            e = sys.exc_info()[1]
             self.announce(str(e), log.ERROR)
             return
 
@@ -192,4 +198,4 @@ def upload_file(self, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
+            print('-'*75, r.read(), '-'*75)
diff --git a/setuptools/compat.py b/setuptools/compat.py
new file mode 100644
index 0000000000..49438502fc
--- /dev/null
+++ b/setuptools/compat.py
@@ -0,0 +1,91 @@
+import sys
+
+if sys.version_info[0] < 3:
+    PY3 = False
+
+    basestring = basestring
+    import __builtin__ as builtins
+    import ConfigParser
+    from StringIO import StringIO
+    BytesIO = StringIO
+    execfile = execfile
+    func_code = lambda o: o.func_code
+    func_globals = lambda o: o.func_globals
+    im_func = lambda o: o.im_func
+    from htmlentitydefs import name2codepoint
+    import httplib
+    from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+    iteritems = lambda o: o.iteritems()
+    long_type = long
+    maxsize = sys.maxint
+    next = lambda o: o.next()
+    numeric_types = (int, long, float)
+    reduce = reduce
+    unichr = unichr
+    unicode = unicode
+    from urllib import url2pathname, quote # Python 2.4 has no quote in urllib2
+    import urllib2
+    from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
+    from urlparse import urlparse, urlunparse, urljoin
+    xrange = xrange
+    from itertools import ifilterfalse
+
+    def exec_(code, globs=None, locs=None):
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb""")
+else:
+    PY3 = True
+
+    basestring = str
+    import builtins
+    import configparser as ConfigParser
+    exec_ = eval('exec')
+    from io import StringIO, BytesIO
+    func_code = lambda o: o.__code__
+    func_globals = lambda o: o.__globals__
+    im_func = lambda o: o.__func__
+    from html.entities import name2codepoint
+    import http.client as httplib
+    from http.server import HTTPServer, SimpleHTTPRequestHandler, BaseHTTPRequestHandler
+    iteritems = lambda o: o.items()
+    long_type = int
+    maxsize = sys.maxsize
+    next = next
+    numeric_types = (int, float)
+    from functools import reduce
+    unichr = chr
+    unicode = str
+    from urllib.error import HTTPError, URLError
+    import urllib.request as urllib2
+    from urllib.request import urlopen, url2pathname
+    from urllib.parse import urlparse, urlunparse, quote, unquote, splituser, urljoin
+    xrange = range
+    from itertools import filterfalse as ifilterfalse
+
+    def execfile(fn, globs=None, locs=None):
+        if globs is None:
+            globs = globals()
+        if locs is None:
+            locs = globs
+        f = open(fn)
+        try:
+            source = f.read()
+        finally:
+            f.close()
+        exec_(compile(source, fn, 'exec'), globs, locs)
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 5fdf2d7e57..f1ef2736bc 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -103,7 +103,7 @@ def _iter_code(code):
             ptr += 3
 
             if op==EXTENDED_ARG:
-                extended_arg = arg * 65536L
+                extended_arg = arg * long_type(65536)
                 continue
 
         else:
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 907ce550e0..0188921540 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,11 +1,13 @@
 __all__ = ['Distribution']
 
 import re
+import sys
 from distutils.core import Distribution as _Distribution
 from setuptools.depends import Require
 from setuptools.command.install import install
 from setuptools.command.sdist import sdist
 from setuptools.command.install_lib import install_lib
+from setuptools.compat import numeric_types, basestring
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.errors import DistutilsSetupError
 import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
@@ -100,7 +102,8 @@ def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:
         pkg_resources.EntryPoint.parse_map(value)
-    except ValueError, e:
+    except ValueError:
+        e = sys.exc_info()[1]
         raise DistutilsSetupError(e)
 
 def check_test_suite(dist, attr, value):
@@ -264,7 +267,7 @@ def __init__ (self, attrs=None):
             if not hasattr(self,ep.name):
                 setattr(self,ep.name,None)
         _Distribution.__init__(self,attrs)
-        if isinstance(self.metadata.version, (int,long,float)):
+        if isinstance(self.metadata.version, numeric_types):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 
@@ -568,7 +571,7 @@ def _exclude_packages(self,packages):
             raise DistutilsSetupError(
                 "packages: setting must be a list or tuple (%r)" % (packages,)
             )
-        map(self.exclude_package, packages)
+        list(map(self.exclude_package, packages))
 
 
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4f39c70abb..5ee6fd27a6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,12 +1,14 @@
 """PyPI and direct package downloading"""
-import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
-import itertools
-import base64
-import httplib, urllib
-from setuptools import ssl_support
+import sys, os.path, re, shutil, random, socket
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
+
+from setuptools import ssl_support
+from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
+                               urlparse, urlunparse, unquote, splituser,
+                               url2pathname, name2codepoint, ifilterfalse,
+                               unichr, urljoin)
 try:
     from hashlib import md5
 except ImportError:
@@ -57,7 +59,7 @@ def parse_bdist_wininst(name):
 
 
 def egg_info_for_url(url):
-    scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
+    scheme, server, path, parameters, query, fragment = urlparse(url)
     base = urllib2.unquote(path.split('/')[-1])
     if server=='sourceforge.net' and base=='download':    # XXX Yuck
         base = urllib2.unquote(path.split('/')[-2])
@@ -146,7 +148,7 @@ def unique_everseen(iterable, key=None):
     seen = set()
     seen_add = seen.add
     if key is None:
-        for element in itertools.ifilterfalse(seen.__contains__, iterable):
+        for element in ifilterfalse(seen.__contains__, iterable):
             seen_add(element)
             yield element
     else:
@@ -178,14 +180,14 @@ def find_external_links(url, page):
         rels = map(str.strip, rel.lower().split(','))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                yield urljoin(url, htmldecode(match.group(1)))
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                yield urljoin(url, htmldecode(match.group(1)))
 
 user_agent = "Python-urllib/%s setuptools/%s" % (
     sys.version[:3], require('setuptools')[0].version
@@ -224,7 +226,7 @@ def process_url(self, url, retrieve=False):
                 self.debug("Found link: %s", url)
 
         if dists or not retrieve or url in self.fetched_urls:
-            map(self.add, dists)
+            list(map(self.add, dists))
             return  # don't need the actual page
 
         if not self.url_ok(url):
@@ -243,7 +245,7 @@ def process_url(self, url, retrieve=False):
         base = f.url     # handle redirects
         page = f.read()
         if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
-            if isinstance(f, urllib2.HTTPError):
+            if isinstance(f, HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
             else:
@@ -251,7 +253,7 @@ def process_url(self, url, retrieve=False):
             page = page.decode(charset, "ignore")
         f.close()
         for match in HREF.finditer(page):
-            link = urlparse.urljoin(base, htmldecode(match.group(1)))
+            link = urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
         if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
             page = self.process_index(url, page)
@@ -270,11 +272,11 @@ def process_filename(self, fn, nested=False):
         dists = distros_for_filename(fn)
         if dists:
             self.debug("Found: %s", fn)
-            map(self.add, dists)
+            list(map(self.add, dists))
 
     def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
-        if (s and s.group(1).lower()=='file') or self.allows(urlparse.urlparse(url)[1]):
+        if (s and s.group(1).lower()=='file') or self.allows(urlparse(url)[1]):
             return True
         msg = "\nLink to % s ***BLOCKED*** by --allow-hosts\n"
         if fatal:
@@ -290,7 +292,7 @@ def scan_egg_links(self, search_path):
                         self.scan_egg_link(item, entry)
 
     def scan_egg_link(self, path, entry):
-        lines = filter(None, map(str.strip, open(os.path.join(path, entry))))
+        lines = list(filter(None, map(str.strip, open(os.path.join(path, entry)))))
         if len(lines)==2:
             for dist in find_distributions(os.path.join(path, lines[0])):
                 dist.location = os.path.join(path, *lines)
@@ -302,9 +304,9 @@ def process_index(self,url,page):
         def scan(link):
             # Process a URL to see if it's for a package page
             if link.startswith(self.index_url):
-                parts = map(
-                    urllib2.unquote, link[len(self.index_url):].split('/')
-                )
+                parts = list(map(
+                    unquote, link[len(self.index_url):].split('/')
+                ))
                 if len(parts)==2 and '#' not in parts[1]:
                     # it's a package page, sanitize and index it
                     pkg = safe_name(parts[0])
@@ -316,7 +318,7 @@ def scan(link):
         # process an index page into the package-page index
         for match in HREF.finditer(page):
             try:
-                scan( urlparse.urljoin(url, htmldecode(match.group(1))) )
+                scan( urljoin(url, htmldecode(match.group(1))) )
             except ValueError:
                 pass
 
@@ -411,7 +413,7 @@ def add_find_links(self, urls):
     def prescan(self):
         """Scan urls scheduled for prescanning (e.g. --find-links)"""
         if self.to_scan:
-            map(self.scan_url, self.to_scan)
+            list(map(self.scan_url, self.to_scan))
         self.to_scan = None     # from now on, go ahead and process immediately
 
     def not_found_in_index(self, requirement):
@@ -598,7 +600,7 @@ def _download_to(self, url, filename):
             if '#' in url:
                 url, info = url.split('#', 1)
             fp = self.open_url(url)
-            if isinstance(fp, urllib2.HTTPError):
+            if isinstance(fp, HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
                 )
@@ -637,28 +639,33 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url, self.opener)
-        except (ValueError, httplib.InvalidURL), v:
+        except (ValueError, httplib.InvalidURL):
+            v = sys.exc_info()[1]
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
             else:
                 raise DistutilsError('%s %s' % (url, msg))
-        except urllib2.HTTPError, v:
+        except urllib2.HTTPError:
+            v = sys.exc_info()[1]
             return v
-        except urllib2.URLError, v:
+        except urllib2.URLError:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason))
-        except httplib.BadStatusLine, v:
+        except httplib.BadStatusLine:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.line)
             else:
                 raise DistutilsError('%s returned a bad status line. '
                                      'The server might be down, %s' % \
                                              (url, v.line))
-        except httplib.HTTPException, v:
+        except httplib.HTTPException:
+            v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v)
             else:
@@ -689,7 +696,7 @@ def _download_url(self, scheme, url, tmpdir):
         elif scheme.startswith('hg+'):
             return self._download_hg(url, filename)
         elif scheme=='file':
-            return urllib.url2pathname(urlparse.urlparse(url)[2])
+            return url2pathname(urlparse(url)[2])
         else:
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
@@ -739,7 +746,7 @@ def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
-            scheme, netloc, path, p, q, f = urlparse.urlparse(url)
+            scheme, netloc, path, p, q, f = urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/',1)
                 auth, host = urllib.splituser(netloc)
@@ -750,13 +757,13 @@ def _download_svn(self, url, filename):
                     else:
                         creds = " --username="+auth
                     netloc = host
-                    url = urlparse.urlunparse((scheme, netloc, url, p, q, f))
+                    url = urlunparse((scheme, netloc, url, p, q, f))
         self.info("Doing subversion checkout from %s to %s", url, filename)
         os.system("svn checkout%s -q %s %s" % (creds, url, filename))
         return filename
 
     def _vcs_split_rev_from_url(self, url, pop_prefix=False):
-        scheme, netloc, path, query, frag = urlparse.urlsplit(url)
+        scheme, netloc, path, query, frag = urlsplit(url)
 
         scheme = scheme.split('+', 1)[-1]
 
@@ -768,7 +775,7 @@ def _vcs_split_rev_from_url(self, url, pop_prefix=False):
             path, rev = path.rsplit('@', 1)
 
         # Also, discard fragment
-        url = urlparse.urlunsplit((scheme, netloc, path, query, ''))
+        url = urlunsplit((scheme, netloc, path, query, ''))
 
         return url, rev
 
@@ -842,7 +849,6 @@ def decode_entity(match):
     elif what.startswith('#'):
         what = int(what[1:])
     else:
-        from htmlentitydefs import name2codepoint
         what = name2codepoint.get(what, match.group(0))
     return uchr(what)
 
@@ -896,7 +902,7 @@ def _encode_auth(auth):
 def open_with_auth(url, opener=urllib2.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
-    scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
+    scheme, netloc, path, params, query, frag = urlparse(url)
 
     # Double scheme does not raise on Mac OS X as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
@@ -904,13 +910,13 @@ def open_with_auth(url, opener=urllib2.urlopen):
         raise httplib.InvalidURL("nonnumeric port: ''")
 
     if scheme in ('http', 'https'):
-        auth, host = urllib.splituser(netloc)
+        auth, host = splituser(netloc)
     else:
         auth = None
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        new_url = urlparse.urlunparse((scheme,host,path,params,query,frag))
+        new_url = urlunparse((scheme,host,path,params,query,frag))
         request = urllib2.Request(new_url)
         request.add_header("Authorization", auth)
     else:
@@ -922,9 +928,9 @@ def open_with_auth(url, opener=urllib2.urlopen):
     if auth:
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
-        s2, h2, path2, param2, query2, frag2 = urlparse.urlparse(fp.url)
+        s2, h2, path2, param2, query2, frag2 = urlparse(fp.url)
         if s2==scheme and h2==host:
-            fp.url = urlparse.urlunparse((s2,netloc,path2,param2,query2,frag2))
+            fp.url = urlunparse((s2,netloc,path2,param2,query2,frag2))
 
     return fp
 
@@ -946,8 +952,8 @@ def fix_sf_url(url):
 
 def local_open(url):
     """Read a local path, with special support for directories"""
-    scheme, server, path, param, query, frag = urlparse.urlparse(url)
-    filename = urllib.url2pathname(path)
+    scheme, server, path, param, query, frag = urlparse(url)
+    filename = url2pathname(path)
     if os.path.isfile(filename):
         return urllib2.urlopen(url)
     elif path.endswith('/') and os.path.isdir(filename):
@@ -968,8 +974,8 @@ def local_open(url):
     else:
         status, message, body = 404, "Path not found", "Not found"
 
-    return urllib2.HTTPError(url, status, message,
-            {'content-type':'text/html'}, cStringIO.StringIO(body))
+    return HTTPError(url, status, message,
+            {'content-type':'text/html'}, StringIO(body))
 
 
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index f309512532..090cb34c3d 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,4 +1,4 @@
-import os, sys, __builtin__, tempfile, operator, pkg_resources
+import os, sys, tempfile, operator, pkg_resources
 if os.name == "java":
     import org.python.modules.posix.PosixModule as _os
 else:
@@ -9,6 +9,7 @@
     _file = None
 _open = open
 from distutils.errors import DistutilsError
+from setuptools.compat import builtins, execfile, reduce
 from pkg_resources import working_set
 
 __all__ = [
@@ -69,7 +70,8 @@ def run_setup(setup_script, args):
                     {'__file__':setup_script, '__name__':'__main__'}
                 )
             )
-        except SystemExit, v:
+        except SystemExit:
+            v = sys.exc_info()[1]
             if v.args and v.args[0]:
                 raise
             # Normal exit, just return
@@ -111,15 +113,15 @@ def run(self, func):
         try:
             self._copy(self)
             if _file:
-                __builtin__.file = self._file
-            __builtin__.open = self._open
+                builtins.file = self._file
+            builtins.open = self._open
             self._active = True
             return func()
         finally:
             self._active = False
             if _file:
-                __builtin__.file = _file
-            __builtin__.open = _open
+                builtins.file = _file
+            builtins.open = _open
             self._copy(_os)
 
     def _mk_dual_path_wrapper(name):
@@ -267,7 +269,7 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
-    def open(self, file, flags, mode=0777):
+    def open(self, file, flags, mode=0x1FF):    # 0777
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode)
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 6dca5fab89..af718a4b6f 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,7 +1,12 @@
-import sys, os, socket, urllib2, atexit, re
+import sys, os, socket, atexit, re
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
 
+try:
+    import urllib2
+except ImportError:
+    import urllib.request as urllib2
+
 try:
     import ssl
 except ImportError:
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b6988a08d7..cb26a05273 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -10,6 +10,7 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
+from setuptools.compat import func_code
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools import Feature
@@ -53,17 +54,18 @@ def f1():
             x = "test"
             y = z
 
+        fc = func_code(f1)
         # unrecognized name
-        self.assertEqual(dep.extract_constant(f1.func_code,'q', -1), None)
+        self.assertEqual(dep.extract_constant(fc,'q', -1), None)
 
         # constant assigned
-        self.assertEqual(dep.extract_constant(f1.func_code,'x', -1), "test")
+        self.assertEqual(dep.extract_constant(fc,'x', -1), "test")
 
         # expression assigned
-        self.assertEqual(dep.extract_constant(f1.func_code,'y', -1), -1)
+        self.assertEqual(dep.extract_constant(fc,'y', -1), -1)
 
         # recognized name, not assigned
-        self.assertEqual(dep.extract_constant(f1.func_code,'z', -1), None)
+        self.assertEqual(dep.extract_constant(fc,'z', -1), None)
 
     def testFindModule(self):
         self.assertRaises(ImportError, dep.find_module, 'no-such.-thing')
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index cc1e06c398..35d588d074 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -9,7 +9,7 @@
 try:
     basestring
 except NameError:
-    basestring = str,unicode
+    basestring = str
 
 try:
     enumerate
@@ -109,7 +109,7 @@ def _test():
 import sys, traceback, inspect, linecache, os, re, types
 import unittest, difflib, pdb, tempfile
 import warnings
-from StringIO import StringIO
+from setuptools.compat import StringIO, execfile, exec_, func_code, im_func
 
 # Don't whine about the deprecated is_private function in this
 # module's tests.
@@ -240,7 +240,7 @@ def _normalize_module(module, depth=2):
     """
     if inspect.ismodule(module):
         return module
-    elif isinstance(module, (str, unicode)):
+    elif isinstance(module, basestring):
         return __import__(module, globals(), locals(), ["*"])
     elif module is None:
         return sys.modules[sys._getframe(depth).f_globals['__name__']]
@@ -367,9 +367,9 @@ def trace_dispatch(self, *args):
 # [XX] Normalize with respect to os.path.pardir?
 def _module_relative_path(module, path):
     if not inspect.ismodule(module):
-        raise TypeError, 'Expected a module: %r' % module
+        raise TypeError('Expected a module: %r' % module)
     if path.startswith('/'):
-        raise ValueError, 'Module-relative files may not have absolute paths'
+        raise ValueError('Module-relative files may not have absolute paths')
 
     # Find the base directory for the path.
     if hasattr(module, '__file__'):
@@ -877,7 +877,7 @@ def _from_module(self, module, object):
         if module is None:
             return True
         elif inspect.isfunction(object):
-            return module.__dict__ is object.func_globals
+            return module.__dict__ is func_globals(object)
         elif inspect.isclass(object):
             return module.__name__ == object.__module__
         elif inspect.getmodule(object) is not None:
@@ -895,7 +895,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
         add them to `tests`.
         """
         if self._verbose:
-            print 'Finding tests in %s' % name
+            print('Finding tests in %s' % name)
 
         # If we've already processed this object, then ignore it.
         if id(obj) in seen:
@@ -948,7 +948,7 @@ def _find(self, tests, obj, name, module, source_lines, globs, seen):
                 if isinstance(val, staticmethod):
                     val = getattr(obj, valname)
                 if isinstance(val, classmethod):
-                    val = getattr(obj, valname).im_func
+                    val = im_func(getattr(obj, valname))
 
                 # Recurse to methods, properties, and nested classes.
                 if ((inspect.isfunction(val) or inspect.isclass(val) or
@@ -1020,8 +1020,8 @@ def _find_lineno(self, obj, source_lines):
                     break
 
         # Find the line number for functions & methods.
-        if inspect.ismethod(obj): obj = obj.im_func
-        if inspect.isfunction(obj): obj = obj.func_code
+        if inspect.ismethod(obj): obj = im_func(obj)
+        if inspect.isfunction(obj): obj = func_code(obj)
         if inspect.istraceback(obj): obj = obj.tb_frame
         if inspect.isframe(obj): obj = obj.f_code
         if inspect.iscode(obj):
@@ -1250,8 +1250,8 @@ def __run(self, test, compileflags, out):
             # keyboard interrupts.)
             try:
                 # Don't blink!  This is where the user's code gets run.
-                exec compile(example.source, filename, "single",
-                             compileflags, 1) in test.globs
+                exec_(compile(example.source, filename, "single",
+                              compileflags, 1), test.globs)
                 self.debugger.set_continue() # ==== Example Finished ====
                 exception = None
             except KeyboardInterrupt:
@@ -1335,7 +1335,7 @@ def __patched_linecache_getlines(self, filename, module_globals=None):
         if m and m.group('name') == self.test.name:
             example = self.test.examples[int(m.group('examplenum'))]
             return example.source.splitlines(True)
-        elif self.save_linecache_getlines.func_code.co_argcount>1:
+        elif func_code(self.save_linecache_getlines).co_argcount > 1:
             return self.save_linecache_getlines(filename, module_globals)
         else:
             return self.save_linecache_getlines(filename)
@@ -1427,28 +1427,28 @@ def summarize(self, verbose=None):
                 failed.append(x)
         if verbose:
             if notests:
-                print len(notests), "items had no tests:"
+                print(len(notests), "items had no tests:")
                 notests.sort()
                 for thing in notests:
-                    print "   ", thing
+                    print("   ", thing)
             if passed:
-                print len(passed), "items passed all tests:"
+                print(len(passed), "items passed all tests:")
                 passed.sort()
                 for thing, count in passed:
-                    print " %3d tests in %s" % (count, thing)
+                    print(" %3d tests in %s" % (count, thing))
         if failed:
-            print self.DIVIDER
-            print len(failed), "items had failures:"
+            print(self.DIVIDER)
+            print(len(failed), "items had failures:")
             failed.sort()
             for thing, (f, t) in failed:
-                print " %3d of %3d in %s" % (f, t, thing)
+                print(" %3d of %3d in %s" % (f, t, thing))
         if verbose:
-            print totalt, "tests in", len(self._name2ft), "items."
-            print totalt - totalf, "passed and", totalf, "failed."
+            print(totalt, "tests in", len(self._name2ft), "items.")
+            print(totalt - totalf, "passed and", totalf, "failed.")
         if totalf:
-            print "***Test Failed***", totalf, "failures."
+            print("***Test Failed***", totalf, "failures.")
         elif verbose:
-            print "Test passed."
+            print("Test passed.")
         return totalf, totalt
 
     #/////////////////////////////////////////////////////////////////
@@ -1458,8 +1458,8 @@ def merge(self, other):
         d = self._name2ft
         for name, (f, t) in other._name2ft.items():
             if name in d:
-                print "*** DocTestRunner.merge: '" + name + "' in both" \
-                    " testers; summing outcomes."
+                print("*** DocTestRunner.merge: '" + name + "' in both" \
+                    " testers; summing outcomes.")
                 f2, t2 = d[name]
                 f = f + f2
                 t = t + t2
@@ -2039,10 +2039,10 @@ def __init__(self, mod=None, globs=None, verbose=None,
     def runstring(self, s, name):
         test = DocTestParser().get_doctest(s, self.globs, name, None, None)
         if self.verbose:
-            print "Running string", name
+            print("Running string", name)
         (f,t) = self.testrunner.run(test)
         if self.verbose:
-            print f, "of", t, "examples failed in string", name
+            print(f, "of", t, "examples failed in string", name)
         return (f,t)
 
     def rundoc(self, object, name=None, module=None):
@@ -2556,7 +2556,7 @@ def debug_script(src, pm=False, globs=None):
             try:
                 execfile(srcfilename, globs, globs)
             except:
-                print sys.exc_info()[1]
+                print(sys.exc_info()[1])
                 pdb.post_mortem(sys.exc_info()[2])
         else:
             # Note that %r is vital here.  '%s' instead can, e.g., cause
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index b2ab7acc7c..5f5ed6bbe1 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -1,12 +1,11 @@
 """Basic http server for tests to simulate PyPI or custom indexes
 """
-import urllib2
 import sys
 import time
-import threading
-import BaseHTTPServer
-from BaseHTTPServer import HTTPServer
-from SimpleHTTPServer import SimpleHTTPRequestHandler
+from threading import Thread
+from setuptools.compat import (urllib2, URLError, HTTPServer,
+                               SimpleHTTPRequestHandler,
+                               BaseHTTPRequestHandler)
 
 class IndexServer(HTTPServer):
     """Basic single-threaded http server simulating a package index
@@ -29,7 +28,7 @@ def serve(self):
             self.handle_request()
 
     def start(self):
-        self.thread = threading.Thread(target=self.serve)
+        self.thread = Thread(target=self.serve)
         self.thread.start()
 
     def stop(self):
@@ -52,25 +51,26 @@ def stop(self):
             # ignore any errors; all that's important is the request
             pass
         self.thread.join()
+        self.socket.close()
 
     def base_url(self):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
-class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+class RequestRecorder(BaseHTTPRequestHandler):
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)
         self.send_response(200, 'OK')
 
-class MockServer(HTTPServer, threading.Thread):
+class MockServer(HTTPServer, Thread):
     """
     A simple HTTP Server that records the requests made to it.
     """
     def __init__(self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
         HTTPServer.__init__(self, server_address, RequestHandlerClass)
-        threading.Thread.__init__(self)
+        Thread.__init__(self)
         self.setDaemon(True)
         self.requests = []
 
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 7da122cc31..1a12218645 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,9 +4,9 @@
 import os, re, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.bdist_egg import bdist_egg
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 315058c575..e2939fea66 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -4,11 +4,11 @@
 import os, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
 from setuptools.command import easy_install as easy_install_pkg
+from setuptools.compat import StringIO
 from setuptools.dist import Distribution
 
 SETUP_PY = """\
@@ -43,7 +43,7 @@ def setUp(self):
         f = open(init, 'w')
         f.write(INIT_PY)
         f.close()
-        
+
         os.chdir(self.dir)
         self.old_base = site.USER_BASE
         site.USER_BASE = tempfile.mkdtemp()
@@ -51,9 +51,9 @@ def setUp(self):
         site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
             return
-        
+
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         shutil.rmtree(site.USER_BASE)
@@ -109,7 +109,8 @@ def notest_develop_with_setup_requires(self):
         try:
             try:
                 dist = Distribution({'setup_requires': ['I_DONT_EXIST']})
-            except DistutilsError, e:
+            except DistutilsError:
+                e = sys.exc_info()[1]
                 error = str(e)
                 if error ==  wanted:
                     pass
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 395056e723..66d43b624a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -8,10 +8,9 @@
 import site
 import textwrap
 import tarfile
-import urlparse
-import StringIO
 import distutils.core
 
+from setuptools.compat import StringIO, BytesIO, next, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args
 from setuptools.command.easy_install import  PthDistributions
@@ -78,7 +77,7 @@ def test_get_script_args(self):
 
         old_platform = sys.platform
         try:
-            name, script = [i for i in get_script_args(dist).next()][0:2]
+            name, script = [i for i in next(get_script_args(dist))][0:2]
         finally:
             sys.platform = old_platform
 
@@ -104,8 +103,7 @@ def test_no_find_links(self):
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
         cmd.args = ['ok']
         cmd.ensure_finalized()
-        keys = cmd.package_index.scanned_urls.keys()
-        keys.sort()
+        keys = sorted(cmd.package_index.scanned_urls.keys())
         self.assertEqual(keys, ['link1', 'link2'])
 
 
@@ -269,8 +267,8 @@ def test_setup_requires(self):
 
         old_stdout = sys.stdout
         old_stderr = sys.stderr
-        sys.stdout = StringIO.StringIO()
-        sys.stderr = StringIO.StringIO()
+        sys.stdout = StringIO()
+        sys.stderr = StringIO()
         try:
             reset_setup_stop_context(
                 lambda: run_setup(test_setup_py, ['install'])
@@ -294,7 +292,7 @@ def test_setup_requires_honors_fetch_params(self):
         p_index = setuptools.tests.server.MockServer()
         p_index.start()
         netloc = 1
-        p_index_loc = urlparse.urlparse(p_index.url)[netloc]
+        p_index_loc = urlparse(p_index.url)[netloc]
         if p_index_loc.endswith(':0'):
             # Some platforms (Jython) don't find a port to which to bind,
             #  so skip this test for them.
@@ -361,9 +359,9 @@ def make_trivial_sdist(dist_path, setup_py):
     setup_py_file = tarfile.TarInfo(name='setup.py')
     try:
         # Python 3 (StringIO gets converted to io module)
-        MemFile = StringIO.BytesIO
+        MemFile = BytesIO
     except AttributeError:
-        MemFile = StringIO.StringIO
+        MemFile = StringIO
     setup_py_bytes = MemFile(setup_py.encode('utf-8'))
     setup_py_file.size = len(setup_py_bytes.getvalue())
     dist = tarfile.open(dist_path, 'w:gz')
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 1060e787a5..c2ff05392e 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -2,12 +2,11 @@
 """
 import sys
 import unittest
-import urllib2
 import pkg_resources
-import httplib
+from setuptools.compat import urllib2, httplib, HTTPError, unicode
 import distutils.errors
 import setuptools.package_index
-from server import IndexServer
+from setuptools.tests.server import IndexServer
 
 class TestPackageIndex(unittest.TestCase):
 
@@ -16,10 +15,11 @@ def test_bad_url_bad_port(self):
         url = 'http://127.0.0.1:0/nonesuch/test_package_index'
         try:
             v = index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assertTrue(url in str(v))
         else:
-            self.assertTrue(isinstance(v,urllib2.HTTPError))
+            self.assertTrue(isinstance(v, HTTPError))
 
     def test_bad_url_typo(self):
         # issue 16
@@ -32,10 +32,11 @@ def test_bad_url_typo(self):
         url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk'
         try:
             v = index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assertTrue(url in str(v))
         else:
-            self.assertTrue(isinstance(v, urllib2.HTTPError))
+            self.assertTrue(isinstance(v, HTTPError))
 
     def test_bad_url_bad_status_line(self):
         index = setuptools.package_index.PackageIndex(
@@ -43,14 +44,14 @@ def test_bad_url_bad_status_line(self):
         )
 
         def _urlopen(*args):
-            import httplib
             raise httplib.BadStatusLine('line')
 
         index.opener = _urlopen
         url = 'http://example.com'
         try:
             v = index.open_url(url)
-        except Exception, v:
+        except Exception:
+            v = sys.exc_info()[1]
             self.assertTrue('line' in str(v))
         else:
             raise AssertionError('Should have raise here!')
@@ -67,8 +68,8 @@ def test_bad_url_double_scheme(self):
         url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
         try:
             index.open_url(url)
-        except distutils.errors.DistutilsError, error:
-            msg = unicode(error)
+        except distutils.errors.DistutilsError:
+            msg = unicode(sys.exc_info()[1])
             assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
             return
         raise RuntimeError("Did not raise")
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 34e341b535..df5261d1ff 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -3,7 +3,8 @@
 # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove
 from unittest import TestCase, makeSuite; from pkg_resources import *
 from setuptools.command.easy_install import get_script_header, is_sh
-import os, pkg_resources, sys, StringIO, tempfile, shutil
+from setuptools.compat import StringIO, iteritems
+import os, pkg_resources, sys, tempfile, shutil
 try: frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
@@ -149,7 +150,7 @@ def testResolve(self):
         for i in range(3):
             targets = list(ws.resolve(parse_requirements("Foo"), ad))
             self.assertEqual(targets, [Foo])
-            map(ws.add,targets)
+            list(map(ws.add,targets))
         self.assertRaises(VersionConflict, ws.resolve,
             parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
@@ -249,7 +250,7 @@ def testRejects(self):
 
     def checkSubMap(self, m):
         self.assertEqual(len(m), len(self.submap_expect))
-        for key, ep in self.submap_expect.iteritems():
+        for key, ep in iteritems(self.submap_expect):
             self.assertEqual(repr(m.get(key)), repr(ep))
 
     submap_expect = dict(
@@ -273,10 +274,10 @@ def testParseList(self):
     def testParseMap(self):
         m = EntryPoint.parse_map({'xyz':self.submap_str})
         self.checkSubMap(m['xyz'])
-        self.assertEqual(m.keys(),['xyz'])
+        self.assertEqual(list(m.keys()),['xyz'])
         m = EntryPoint.parse_map("[xyz]\n"+self.submap_str)
         self.checkSubMap(m['xyz'])
-        self.assertEqual(m.keys(),['xyz'])
+        self.assertEqual(list(m.keys()),['xyz'])
         self.assertRaises(ValueError, EntryPoint.parse_map, ["[xyz]", "[xyz]"])
         self.assertRaises(ValueError, EntryPoint.parse_map, self.submap_str)
 
@@ -537,12 +538,12 @@ def getProperty(property):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = sys.stderr = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
             self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
-            sys.stdout = sys.stderr = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
@@ -602,7 +603,7 @@ def test_two_levels_deep(self):
         self._assertIn("pkg1", pkg_resources._namespace_packages.keys())
         try:
             import pkg1.pkg2
-        except ImportError, e:
+        except ImportError:
             self.fail("Setuptools tried to import the parent namespace package")
         # check the _namespace_packages dict
         self._assertIn("pkg1.pkg2", pkg_resources._namespace_packages.keys())
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f51d45678f..c1e7864b29 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -7,11 +7,10 @@
 import sys
 import tempfile
 import unittest
-import urllib
 import unicodedata
-from StringIO import StringIO
 
 
+from setuptools.compat import StringIO, quote, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -149,7 +148,8 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # The manifest should be UTF-8 encoded
         try:
             u_contents = contents.decode('UTF-8')
-        except UnicodeDecodeError, e:
+        except UnicodeDecodeError:
+            e = sys.exc_info()[1]
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
@@ -190,7 +190,8 @@ def test_write_manifest_allows_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError, e:
+            except UnicodeDecodeError:
+                e = sys.exc_info()[1]
                 self.fail(e)
 
             # The manifest should contain the UTF-8 filename
@@ -228,7 +229,8 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError, e:
+            except UnicodeDecodeError:
+                e = sys.exc_info()[1]
                 self.fail(e)
 
             # The Latin-1 filename should have been skipped
@@ -307,7 +309,8 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             try:
                 try:
                     cmd.read_manifest()
-                except UnicodeDecodeError, e:
+                except UnicodeDecodeError:
+                    e = sys.exc_info()[1]
                     self.fail(e)
             finally:
                 unquiet()
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index ad7cbd0f96..d6e68590ab 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -6,9 +6,9 @@
 import os, shutil, tempfile, unittest
 import tempfile
 import site
-from StringIO import StringIO
 
 from distutils.errors import DistutilsError
+from setuptools.compat import StringIO
 from setuptools.command.test import test
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index d03da14e12..86ca245d80 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -39,7 +39,7 @@ Distributions have various introspectable attributes::
     >>> dist.py_version == sys.version[:3]
     True
 
-    >>> print dist.platform
+    >>> print(dist.platform)
     None
 
 Including various computed attributes::
@@ -199,7 +199,7 @@ shows up once when iterating the working set:
 You can ask a WorkingSet to ``find()`` a distribution matching a requirement::
 
     >>> from pkg_resources import Requirement
-    >>> print ws.find(Requirement.parse("Foo==1.0"))    # no match, return None
+    >>> print(ws.find(Requirement.parse("Foo==1.0")))   # no match, return None
     None
 
     >>> ws.find(Requirement.parse("Bar==0.9"))  # match, return distribution
@@ -222,7 +222,7 @@ distribution is added to a working set.  The callback is immediately invoked
 once for each existing distribution in the working set, and then is called
 again for new distributions added thereafter::
 
-    >>> def added(dist): print "Added", dist
+    >>> def added(dist): print("Added %s" % dist)
     >>> ws.subscribe(added)
     Added Bar 0.9
     >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12")
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 44cf2d0657..3eab99e1c7 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -9,7 +9,7 @@
 import tempfile
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
-from urllib2 import urlopen
+from setuptools.compat import urlopen
 
 try:
     import subprocess

From c003c86fc22b8d20b81226d1e74c95a5c885e314 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 15 Jun 2013 15:56:28 +0100
Subject: [PATCH 1240/8469] Updated to fix errors on 2.5.

--HG--
branch : single-codebase
---
 setuptools/command/easy_install.py    | 2 +-
 setuptools/command/install_scripts.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f71128b00f..cf80926c9b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -800,7 +800,7 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0o777-mask)
+            chmod(target,0x1FF - mask) # 0777
 
 
 
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 4e6b1a9a84..ad522f6cef 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -50,5 +50,5 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0o777-mask)
+            chmod(target,0x1FF - mask)  # 0777
 

From 67f9020e66d82dbf0b0ada5772a960ecc054d850 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 14:18:30 -0500
Subject: [PATCH 1241/8469] Remove unused import

--HG--
branch : distribute
---
 setuptools/tests/test_sdist.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ececa765dc..f48decf6c4 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,7 @@
 import unittest
 import unicodedata
 
-from setuptools.compat import StringIO, urllib
+from setuptools.compat import StringIO
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -337,7 +337,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         if sys.version_info >= (3,):
             fs_enc = sys.getfilesystemencoding()
 
-            if sys.platform == 'win32': 
+            if sys.platform == 'win32':
                 if fs_enc == 'cp1252':
                     # Python 3 mangles the UTF-8 filename
                     filename = filename.decode('cp1252')
@@ -372,14 +372,14 @@ def test_sdist_with_latin1_encoded_filename(self):
         if sys.version_info >= (3,):
             #not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
-                # Latin-1 is similar to Windows-1252 however 
+                # Latin-1 is similar to Windows-1252 however
                 # on mbcs filesys it is not in latin-1 encoding
                 fs_enc = sys.getfilesystemencoding()
                 if fs_enc == 'mbcs':
                     filename = filename.decode('mbcs')
                 else:
                     filename = filename.decode('latin-1')
-                    
+
                 self.assertTrue(filename in cmd.filelist.files)
             else:
                 # The Latin-1 filename should have been skipped

From b827baba9c89188f92579fe943da4f0dadde9fda Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Jun 2013 08:23:32 -0500
Subject: [PATCH 1242/8469] Update exceptions for Python 3 compatibility

--HG--
branch : distribute
extra : rebase_source : 354795c0a0b8a864583f2549ce869e719be265d2
---
 setuptools/tests/test_sdist.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f48decf6c4..1682989aea 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -147,7 +147,8 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # The manifest should be UTF-8 encoded
         try:
             u_contents = contents.decode('UTF-8')
-        except UnicodeDecodeError, e:
+        except UnicodeDecodeError:
+            e = sys.exc_info()[1]
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
@@ -188,7 +189,8 @@ def test_write_manifest_allows_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError, e:
+            except UnicodeDecodeError:
+                e = sys.exc_info()[1]
                 self.fail(e)
 
             # The manifest should contain the UTF-8 filename
@@ -226,7 +228,8 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError, e:
+            except UnicodeDecodeError:
+                e = sys.exc_info()[1]
                 self.fail(e)
 
             # The Latin-1 filename should have been skipped
@@ -305,7 +308,8 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             try:
                 try:
                     cmd.read_manifest()
-                except UnicodeDecodeError, e:
+                except UnicodeDecodeError:
+                    e = sys.exc_info()[1]
                     self.fail(e)
             finally:
                 unquiet()

From f52d063aa81f64bbb71562510a87d3aedbad2ed9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Jun 2013 10:20:56 -0500
Subject: [PATCH 1243/8469] Re-save test modules with UTF-8 encoding

--HG--
branch : distribute
extra : rebase_source : 6728580b2f2f10026fe0f196db7ea5510acac704
extra : histedit_source : f4fbf02bbe3e4e39caf1aa2f5a354c99d9249e65
---
 setuptools/tests/test_test.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index e7022995dc..7a06a40329 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*- 
+# -*- coding: UTF-8 -*-
 
 """develop tests
 """
@@ -23,7 +23,7 @@
 )
 """
 
-NS_INIT = """# -*- coding: Latin-1 -*- 
+NS_INIT = """# -*- coding: Latin-1 -*-
 # Söme Arbiträry Ünicode to test Issüé 310
 try:
     __import__('pkg_resources').declare_namespace(__name__)
@@ -77,7 +77,7 @@ def setUp(self):
         f = open(init, 'wt')
         f.write(TEST_PY)
         f.close()
-        
+
         os.chdir(self.dir)
         self.old_base = site.USER_BASE
         site.USER_BASE = tempfile.mkdtemp()
@@ -87,7 +87,7 @@ def setUp(self):
     def tearDown(self):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
-        
+
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         shutil.rmtree(site.USER_BASE)
@@ -98,7 +98,7 @@ def tearDown(self):
     def test_test(self):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
-        
+
         dist = Distribution(dict(
             name='foo',
             packages=['name', 'name.space', 'name.space.tests'],
@@ -121,4 +121,4 @@ def test_test(self):
                 pass
         finally:
             sys.stdout = old_stdout
-            
+

From 4d2396983ae8db3429a4e1a96f6112ef0c659422 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Jun 2013 10:38:20 -0500
Subject: [PATCH 1244/8469] Use unicode from compat module

--HG--
branch : distribute
extra : rebase_source : c4dd03dba58146eed2f620cd6d6b7ab52ee9d109
extra : histedit_source : 02c194ea1c97e8aea64fd23d77efc1bade185c0a
---
 setuptools/tests/test_sdist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 1682989aea..438f7cedbd 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,7 @@
 import unittest
 import unicodedata
 
-from setuptools.compat import StringIO
+from setuptools.compat import StringIO, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -55,7 +55,7 @@ def b(s, encoding='utf-8'):
 
 # Convert to POSIX path
 def posix(path):
-    if sys.version_info >= (3,) and not isinstance(path, unicode):
+    if sys.version_info >= (3,) and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')

From 3c86c861ab9665df0e502f250a7471d09240e413 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Jun 2013 10:55:09 -0500
Subject: [PATCH 1245/8469] Fix Python3 compatibility issue in filterfalse

--HG--
branch : distribute
extra : rebase_source : 71e3e89efe6483924a07e7f9819ee86f08dbf1f2
extra : histedit_source : fa75c7bc174b248c74da7b4efd5f6f05c36b6ae4
---
 setuptools/compat.py        | 3 +++
 setuptools/package_index.py | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 05417c6e32..e2f64de236 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -1,4 +1,5 @@
 import sys
+import itertools
 
 if sys.version_info[0] < 3:
     PY3 = False
@@ -30,6 +31,7 @@
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin
     xrange = xrange
+    filterfalse = itertools.ifilterfalse
 
     def exec_(code, globs=None, locs=None):
         if globs is None:
@@ -72,6 +74,7 @@ def exec_(code, globs=None, locs=None):
     from urllib.request import urlopen, url2pathname
     from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
     xrange = range
+    filterfalse = itertools.filterfalse
 
     def execfile(fn, globs=None, locs=None):
         if globs is None:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 85a1deebe8..1e2a086dc1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,6 +1,5 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, shutil, random, socket
-import itertools
 import base64
 from pkg_resources import *
 from distutils import log
@@ -9,6 +8,7 @@
                                urlparse, urlunparse, unquote, splituser,
                                url2pathname, name2codepoint,
                                unichr, urljoin)
+from setuptools.compat import filterfalse
 try:
     from hashlib import md5
 except ImportError:
@@ -148,7 +148,7 @@ def unique_everseen(iterable, key=None):
     seen = set()
     seen_add = seen.add
     if key is None:
-        for element in itertools.ifilterfalse(seen.__contains__, iterable):
+        for element in filterfalse(seen.__contains__, iterable):
             seen_add(element)
             yield element
     else:

From 744a61f18bbfcbf7dfaa08886185b4595d8b7bcb Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 17 Jun 2013 19:23:33 +0100
Subject: [PATCH 1246/8469] Misc. updates following 2to3 checks.

--HG--
branch : single-codebase
---
 docs/conf.py                         |   8 +-
 pkg_resources.py                     |   3 +-
 release.py                           |  17 ++++-
 setuptools.egg-info/entry_points.txt |  92 +++++++++++------------
 setuptools.egg-info/requires.txt     |   6 +-
 setuptools/command/easy_install.py   |   2 +
 setuptools/command/egg_info.py       |   4 +-
 setuptools/command/test.py           |   2 +-
 setuptools/command/upload.py         |   4 +-
 setuptools/command/upload_docs.py    |   4 +-
 setuptools/extension.py              |   2 +-
 setuptools/package_index.py          |   4 +-
 setuptools/sandbox.py                |   2 +-
 setuptools/script template (dev).py  |   5 +-
 setuptools/tests/__init__.py         |   2 +-
 tests/test_ez_setup.py               |   5 +-
 tests/test_pkg_resources.py          | 107 ++++++++++++++-------------
 17 files changed, 147 insertions(+), 122 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3861b79a55..44d8378a01 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Setuptools'
-copyright = u'2009-2013, The fellowship of the packaging'
+project = 'Setuptools'
+copyright = '2009-2013, The fellowship of the packaging'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -175,8 +175,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Setuptools.tex', ur'Setuptools Documentation',
-   ur'The fellowship of the packaging', 'manual'),
+  ('index', 'Setuptools.tex', 'Setuptools Documentation',
+   'The fellowship of the packaging', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/pkg_resources.py b/pkg_resources.py
index 03aa75ad03..521a7e0007 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2492,7 +2492,8 @@ def activate(self,path=None):
         self.insert_on(path)
         if path is sys.path:
             fixup_namespace_packages(self.location)
-            map(declare_namespace, self._get_metadata('namespace_packages.txt'))
+            list(map(declare_namespace,
+                     self._get_metadata('namespace_packages.txt')))
 
 
     def egg_name(self):
diff --git a/release.py b/release.py
index 632bf4cb38..2e35feb127 100644
--- a/release.py
+++ b/release.py
@@ -17,6 +17,15 @@
 import itertools
 import re
 
+try:
+    from urllib2 import urlopen, Request, HTTPError
+    from itertools import izip_longest
+except ImportError:
+    from urllib.request import urlopen, Request
+    from urllib.error import HTTPError
+    raw_input = input
+    from itertools import zip_longest as izip_longest
+
 try:
 	import keyring
 except Exception:
@@ -99,11 +108,11 @@ def add_milestone_and_version(version):
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
 			.format(repo = get_repo_name(), type=type))
-		req = urllib2.Request(url = url, headers = headers,
+		req = Request(url = url, headers = headers,
 			data='name='+version)
 		try:
-			urllib2.urlopen(req)
-		except urllib2.HTTPError as e:
+			urlopen(req)
+		except HTTPError as e:
 			print(e.fp.read())
 
 def bump_versions(target_ver):
@@ -225,7 +234,7 @@ def _linkified_text(rst_content):
 	anchors = []
 	linkified_parts = [_linkified_part(part, anchors)
 		for part in plain_text_parts]
-	pairs = itertools.izip_longest(
+	pairs = izip_longest(
 		linkified_parts,
 		HREF_pattern.findall(rst_content),
 		fillvalue='',
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 663882d630..64d167676d 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+entry_points = setuptools.dist:check_entry_points
+convert_2to3_doctests = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+zip_safe = setuptools.dist:assert_bool
+
 [distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+test = setuptools.command.test:test
+easy_install = setuptools.command.easy_install:easy_install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
 setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
+install = setuptools.command.install:install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+alias = setuptools.command.alias:alias
 saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
+sdist = setuptools.command.sdist:sdist
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
 register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
+build_py = setuptools.command.build_py:build_py
 install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 2f2a364fa2..5ff415da83 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,11 +1,11 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
+[certs]
+certifi==0.0.8
+
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index cf80926c9b..c53ca9f284 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -285,6 +285,8 @@ def finalize_options(self):
             self.script_dir = self.install_scripts
         # default --record from the install command
         self.set_undefined_options('install', ('record', 'record'))
+        # Should this be moved to the if statement below? It's not used
+        # elsewhere
         normpath = map(normalize_path, sys.path)
         self.all_site_dirs = get_site_dirs()
         if self.site_dirs is not None:
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index c77bd69db4..1a61dfcbb9 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -235,8 +235,8 @@ def get_svn_revision(self):
                     log.warn("unrecognized .svn/entries format; skipping %s", base)
                     dirs[:] = []
                     continue
-                   
-                data = map(str.splitlines,data.split('\n\x0c\n'))
+
+                data = list(map(str.splitlines,data.split('\n\x0c\n')))
                 del data[0][0]  # get rid of the '8' or '9' or '10'
                 dirurl = data[0][3]
                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index a02ac14240..db2fc7b140 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -154,7 +154,7 @@ def run_tests(self):
                 for name in sys.modules:
                     if name.startswith(module):
                         del_modules.append(name)
-                map(sys.modules.__delitem__, del_modules)
+                list(map(sys.modules.__delitem__, del_modules))
 
         loader_ep = EntryPoint.parse("x="+self.test_loader)
         loader_class = loader_ep.load(require=False)
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 7ef0e6ec58..02d955eda6 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -11,6 +11,7 @@
 except ImportError:
     from md5 import md5
 import os
+import sys
 import socket
 import platform
 import base64
@@ -167,7 +168,8 @@ def upload_file(self, command, pyversion, filename):
             http.putheader('Authorization', auth)
             http.endheaders()
             http.send(body)
-        except socket.error, e:
+        except socket.error:
+            e = sys.exc_info()[1]
             self.announce(str(e), log.ERROR)
             return
 
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 0a54578904..e07b885d9d 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -23,7 +23,7 @@
 except ImportError:
     from setuptools.command.upload import upload
 
-from setuptools.compat import httplib, urlparse
+from setuptools.compat import httplib, urlparse, unicode, iteritems
 
 if sys.version_info >= (3,):
     errors = 'surrogateescape'
@@ -131,7 +131,7 @@ def upload_file(self, filename):
         sep_boundary = b('\n--') + b(boundary)
         end_boundary = sep_boundary + b('--')
         body = []
-        for key, values in data.iteritems():
+        for key, values in iteritems(data):
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if type(values) != type([]):
diff --git a/setuptools/extension.py b/setuptools/extension.py
index eb8b836cc3..d7892d3d9f 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -35,7 +35,7 @@ def pyx_to_c(source):
             if source.endswith('.pyx'):
                 source = source[:-4] + '.c'
             return source
-        self.sources = map(pyx_to_c, self.sources)
+        self.sources = list(map(pyx_to_c, self.sources))
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5ee6fd27a6..25936b9158 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -177,7 +177,7 @@ def find_external_links(url, page):
 
     for match in REL.finditer(page):
         tag, rel = match.groups()
-        rels = map(str.strip, rel.lower().split(','))
+        rels = set(map(str.strip, rel.lower().split(',')))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
                 yield urljoin(url, htmldecode(match.group(1)))
@@ -749,7 +749,7 @@ def _download_svn(self, url, filename):
             scheme, netloc, path, p, q, f = urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/',1)
-                auth, host = urllib.splituser(netloc)
+                auth, host = splituser(netloc)
                 if auth:
                     if ':' in auth:
                         user, pw = auth.split(':',1)
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 090cb34c3d..a5a01a4642 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -85,7 +85,7 @@ def run_setup(setup_script, args):
             # exclude any encodings modules. See #285
             and not mod_name.startswith('encodings.')
         ]
-        map(sys.modules.__delitem__, del_modules)
+        list(map(sys.modules.__delitem__, del_modules))
         os.chdir(old_dir)
         sys.path[:] = save_path
         sys.argv[:] = save_argv
diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
index 6dd9dd4525..901790e7bd 100644
--- a/setuptools/script template (dev).py	
+++ b/setuptools/script template (dev).py	
@@ -3,4 +3,7 @@
 from pkg_resources import require; require("""%(spec)r""")
 del require
 __file__ = """%(dev_path)r"""
-execfile(__file__)
+try:
+    execfile(__file__)
+except NameError:
+    exec(compile(open(__file__).read(), __file__, 'exec'))
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index cb26a05273..1cd5df2bac 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -2,7 +2,7 @@
 import sys
 import os
 import unittest
-import doctest
+from setuptools.tests import doctest
 import distutils.core
 import distutils.cmd
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 922bd88465..6dd4c0558d 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -27,7 +27,10 @@ def setUp(self):
                     "--dist-dir", "%s" % self.tmpdir)
         tarball = os.listdir(self.tmpdir)[0]
         self.tarball = os.path.join(self.tmpdir, tarball)
-        import urllib2
+        try:
+            import urllib2
+        except ImportError:
+            import urllib.request as urllib2
         urllib2.urlopen = self.urlopen
 
     def tearDown(self):
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 7009b4abc0..b05ea44b37 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -5,57 +5,62 @@
 
 import pkg_resources
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
 class EggRemover(unicode):
-	def __call__(self):
-		if self in sys.path:
-			sys.path.remove(self)
-		if os.path.exists(self):
-			os.remove(self)
+    def __call__(self):
+        if self in sys.path:
+            sys.path.remove(self)
+        if os.path.exists(self):
+            os.remove(self)
 
 class TestZipProvider(object):
-	finalizers = []
-
-	@classmethod
-	def setup_class(cls):
-		"create a zip egg and add it to sys.path"
-		egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False)
-		zip_egg = zipfile.ZipFile(egg, 'w')
-		zip_info = zipfile.ZipInfo()
-		zip_info.filename = 'mod.py'
-		zip_info.date_time = 2013, 5, 12, 13, 25, 0
-		zip_egg.writestr(zip_info, 'x = 3\n')
-		zip_info = zipfile.ZipInfo()
-		zip_info.filename = 'data.dat'
-		zip_info.date_time = 2013, 5, 12, 13, 25, 0
-		zip_egg.writestr(zip_info, 'hello, world!')
-		zip_egg.close()
-		egg.close()
-
-		sys.path.append(egg.name)
-		cls.finalizers.append(EggRemover(egg.name))
-
-	@classmethod
-	def teardown_class(cls):
-		for finalizer in cls.finalizers:
-			finalizer()
-
-	def test_resource_filename_rewrites_on_change(self):
-		"""
-		If a previous call to get_resource_filename has saved the file, but
-		the file has been subsequently mutated with different file of the
-		same size and modification time, it should not be overwritten on a
-		subsequent call to get_resource_filename.
-		"""
-		import mod
-		manager = pkg_resources.ResourceManager()
-		zp = pkg_resources.ZipProvider(mod)
-		filename = zp.get_resource_filename(manager, 'data.dat')
-		assert os.stat(filename).st_mtime == 1368379500
-		f = open(filename, 'wb')
-		f.write('hello, world?')
-		f.close()
-		os.utime(filename, (1368379500, 1368379500))
-		filename = zp.get_resource_filename(manager, 'data.dat')
-		f = open(filename)
-		assert f.read() == 'hello, world!'
-		manager.cleanup_resources()
+    finalizers = []
+
+    @classmethod
+    def setup_class(cls):
+        "create a zip egg and add it to sys.path"
+        egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False)
+        zip_egg = zipfile.ZipFile(egg, 'w')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'mod.py'
+        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_egg.writestr(zip_info, 'x = 3\n')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'data.dat'
+        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_egg.writestr(zip_info, 'hello, world!')
+        zip_egg.close()
+        egg.close()
+
+        sys.path.append(egg.name)
+        cls.finalizers.append(EggRemover(egg.name))
+
+    @classmethod
+    def teardown_class(cls):
+        for finalizer in cls.finalizers:
+            finalizer()
+
+    def test_resource_filename_rewrites_on_change(self):
+        """
+        If a previous call to get_resource_filename has saved the file, but
+        the file has been subsequently mutated with different file of the
+        same size and modification time, it should not be overwritten on a
+        subsequent call to get_resource_filename.
+        """
+        import mod
+        manager = pkg_resources.ResourceManager()
+        zp = pkg_resources.ZipProvider(mod)
+        filename = zp.get_resource_filename(manager, 'data.dat')
+        assert os.stat(filename).st_mtime == 1368379500
+        f = open(filename, 'wb')
+        f.write('hello, world?')
+        f.close()
+        os.utime(filename, (1368379500, 1368379500))
+        filename = zp.get_resource_filename(manager, 'data.dat')
+        f = open(filename)
+        assert f.read() == 'hello, world!'
+        manager.cleanup_resources()

From 38af6239b1823908c3c2522245d41bd4105ec1e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 15:31:41 -0500
Subject: [PATCH 1247/8469] Update release script to run under Python 3

---
 release.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/release.py b/release.py
index 632bf4cb38..0a2e2bde12 100644
--- a/release.py
+++ b/release.py
@@ -11,12 +11,21 @@
 import shutil
 import os
 import sys
-import urllib2
 import getpass
 import collections
 import itertools
 import re
 
+try:
+	import urllib.request as urllib_request
+except ImportError:
+	import urllib2 as urllib_request
+
+try:
+	input = raw_input
+except NameError:
+	pass
+
 try:
 	import keyring
 except Exception:
@@ -27,7 +36,7 @@
 
 def set_versions():
 	global VERSION
-	version = raw_input("Release as version [%s]> " % VERSION) or VERSION
+	version = input("Release as version [%s]> " % VERSION) or VERSION
 	if version != VERSION:
 		VERSION = bump_versions(version)
 
@@ -99,11 +108,11 @@ def add_milestone_and_version(version):
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
 			.format(repo = get_repo_name(), type=type))
-		req = urllib2.Request(url = url, headers = headers,
+		req = urllib_request.Request(url = url, headers = headers,
 			data='name='+version)
 		try:
-			urllib2.urlopen(req)
-		except urllib2.HTTPError as e:
+			urllib_request.urlopen(req)
+		except urllib_request.HTTPError as e:
 			print(e.fp.read())
 
 def bump_versions(target_ver):
@@ -116,7 +125,10 @@ def bump_versions(target_ver):
 
 def bump_version(filename, target_ver):
 	with open(filename, 'rb') as f:
-		lines = [line.replace(VERSION, target_ver) for line in f]
+		lines = [
+			line.replace(VERSION.encode('ascii'), target_ver.encode('ascii'))
+			for line in f
+		]
 	with open(filename, 'wb') as f:
 		f.writelines(lines)
 

From 49baf51edde145b96913aaf0151eb4dff400b3e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 15:31:53 -0500
Subject: [PATCH 1248/8469] Bumped to 0.8 in preparation for next release.

---
 README.txt             | 10 +++++-----
 docs/conf.py           |  4 ++--
 ez_setup.py            |  2 +-
 release.py             |  2 +-
 setup.py               |  2 +-
 setuptools/__init__.py |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.txt b/README.txt
index 23627e6660..10cde2cfcd 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7.3 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.8 over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.3$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.8$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 3861b79a55..d2e5276cc0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.3'
+version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.3'
+release = '0.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index ba0d781e7d..c225c6ae6d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.3"
+DEFAULT_VERSION = "0.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 0a2e2bde12..937fadfcb9 100644
--- a/release.py
+++ b/release.py
@@ -31,7 +31,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.3'
+VERSION = '0.8'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index 7ed396d056..c88e6c7554 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.3"
+VERSION = "0.8"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 0f29f575e5..a8e7617abc 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.3'
+__version__ = '0.8'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From f17e432dd427e2f894232e57a6b47143f85f7d97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 15:35:42 -0500
Subject: [PATCH 1249/8469] Updated changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 59e37ad675..d75d769f03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+0.8
+---
+
+* Code base now runs on Python 2.4 - Python 3.3 without Python 2to3
+  conversion.
+
 -----
 0.7.3
 -----

From a5bbf67399a6c56e8611a3747faaa52d6b835649 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 15:50:27 -0500
Subject: [PATCH 1250/8469] Backed out changeset: 7292c3a723e3 See
 https://bitbucket.org/pypa/setuptools/commits/7292c3a723e3b7b6fdd2bede2374dd1777809e7d
 for discussion

---
 CHANGES.txt | 2 --
 setup.py    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 59e37ad675..77ab44aadb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,6 @@ CHANGES
 0.7.3
 -----
 
-* Rename DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment
-  variable to SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.
 * Issue #1: Disable installation of Windows-specific files on non-Windows systems.
 * Use new sysconfig module with Python 2.7 or >=3.2.
 
diff --git a/setup.py b/setup.py
index 1260b17299..eeae866ee1 100755
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
 
 # specific command that is used to generate windows .exe files

From 1b793f1d7fc075506cf16e9bdb1abfb610f0e151 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 16:06:33 -0500
Subject: [PATCH 1251/8469] Added tag 0.7.3 for changeset d212e48e0cef

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e08a06c209..cc2b422560 100644
--- a/.hgtags
+++ b/.hgtags
@@ -62,3 +62,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
 024dd30ed702135f5328975042566e48cc479d7d 0.7.1
 d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
+d212e48e0cef689acba57ed017289c027660b23c 0.7.3

From 1e5582e523ce94c205884548ef200ea3a29aff13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 16:07:13 -0500
Subject: [PATCH 1252/8469] Bumped to 0.7.4 in preparation for next release.

---
 README.txt                               | 10 +++++-----
 docs/conf.py                             |  4 ++--
 ez_setup.py                              |  2 +-
 release.py                               |  2 +-
 setup.py                                 |  2 +-
 setuptools.egg-info/dependency_links.txt | 12 ++++++------
 setuptools/__init__.py                   |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/README.txt b/README.txt
index 23627e6660..f9270e9354 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7.3 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7.4 over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.3/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.3$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.4$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 3861b79a55..909a551048 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.3'
+version = '0.7.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.3'
+release = '0.7.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index ba0d781e7d..668224937c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.3"
+DEFAULT_VERSION = "0.7.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 632bf4cb38..c3ed3f4536 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.3'
+VERSION = '0.7.4'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index eeae866ee1..ece0370eef 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.3"
+VERSION = "0.7.4"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index a54d9039cc..c688b7eaab 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,6 +1,6 @@
-http://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
-http://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
-http://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
-http://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
-http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
-http://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
+https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
+https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
+https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
+https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
+https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 0f29f575e5..f7612bce09 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.3'
+__version__ = '0.7.4'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 16b2bc31e07f8fa14d27bc504dc0bbc73da900be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 16:15:34 -0500
Subject: [PATCH 1253/8469] Update version to indicate a range of versions when
 discussing upgrade from Distribute

---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index f9270e9354..19b7c4713e 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.7.4 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7+ over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 

From 5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Jun 2013 16:19:49 -0500
Subject: [PATCH 1254/8469] Added tag 0.8b1 for changeset 74c6c1226805

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cc2b422560..6e35338e09 100644
--- a/.hgtags
+++ b/.hgtags
@@ -63,3 +63,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 024dd30ed702135f5328975042566e48cc479d7d 0.7.1
 d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
 d212e48e0cef689acba57ed017289c027660b23c 0.7.3
+74c6c12268059986f9cc0b535399594f1d131201 0.8b1

From 49b893267e951f9e53d9e7611286c95319beaf20 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 11:50:14 +0100
Subject: [PATCH 1255/8469] Post-merge fixes.

--HG--
branch : single-codebase
---
 setuptools.egg-info/requires.txt | 11 ++++-------
 setuptools/command/egg_info.py   |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 77cddef252..c06a8a0b3e 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,16 +1,13 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
-[certs]
-certifi==0.0.8
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
 
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6b0d242699..5a71415629 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -283,7 +283,7 @@ def append(self, item):
             item = item[:-1]
         path = convert_path(item)
 
-        if PY3:
+        if sys.version_info >= (3,):
             try:
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
@@ -337,7 +337,7 @@ def write_manifest (self):
         named by 'self.manifest'.
         """
         # The manifest must be UTF-8 encodable. See #303.
-        if PY3:
+        if sys.version_info >= (3,):
             files = []
             for file in self.filelist.files:
                 try:

From 7161829fd5e4515903ce56b711e551bc75c35ba7 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 12:07:26 +0100
Subject: [PATCH 1256/8469] More post-merge fixes.

--HG--
branch : single-codebase
---
 setuptools.egg-info/requires.txt       | 12 ++++++------
 setuptools/command/install_egg_info.py |  1 -
 setuptools/compat.py                   |  4 ++--
 setuptools/sandbox.py                  |  1 -
 setuptools/tests/test_sdist.py         |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index c06a8a0b3e..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 87ddff9c17..f44b34b555 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,6 +1,5 @@
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
-from setuptools.compat import PY3
 from distutils import log, dir_util
 import os, shutil, pkg_resources
 
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 437fb7109c..e2f64de236 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -26,7 +26,7 @@
     reduce = reduce
     unichr = unichr
     unicode = unicode
-    from urllib import url2pathname, quote # Python 2.4 has no quote in urllib2
+    from urllib import url2pathname
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin
@@ -72,7 +72,7 @@ def exec_(code, globs=None, locs=None):
     from urllib.error import HTTPError, URLError
     import urllib.request as urllib2
     from urllib.request import urlopen, url2pathname
-    from urllib.parse import urlparse, urlunparse, quote, unquote, splituser, urljoin
+    from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
     xrange = range
     filterfalse = itertools.filterfalse
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 91dfc5195f..4e527446ce 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -9,7 +9,6 @@
     _file = None
 _open = open
 from distutils.errors import DistutilsError
-from setuptools.compat import builtins, execfile, reduce
 from pkg_resources import working_set
 
 from setuptools.compat import builtins, execfile, reduce
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a58b749c95..b8f89e0628 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -10,7 +10,7 @@
 import unicodedata
 
 
-from setuptools.compat import StringIO, quote, unicode
+from setuptools.compat import StringIO, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution

From f91bf3924a2f4e3d4c7f075b792002dae97d46b4 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 12:19:32 +0100
Subject: [PATCH 1257/8469] Add back accidentally deleted import.

--HG--
branch : single-codebase
---
 setuptools.egg-info/requires.txt   | 10 +++++-----
 setuptools/command/easy_install.py |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..221040f812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 000fefa0c9..3194644e84 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1491,6 +1491,7 @@ def extract_wininst_cfg(dist_filename):
         f.seek(prepended-12)
 
         from setuptools.compat import StringIO, ConfigParser
+        import struct
         tag, cfglen, bmlen = struct.unpack("<iii",f.read(12))
         if tag not in (0x1234567A, 0x1234567B):
             return None     # not a valid tag

From 9ea9ca10b152b97e6eeb57da26aed8f88cc67136 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 12:32:17 +0100
Subject: [PATCH 1258/8469] Tidied up imports.

--HG--
branch : single-codebase
---
 setuptools.egg-info/requires.txt | 6 +++---
 setuptools/ssl_support.py        | 5 -----
 setuptools/tests/test_sdist.py   | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 221040f812..0b577c9748 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,11 +1,11 @@
 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [certs]
 certifi==0.0.8
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index e749b3127f..2aec655a09 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,11 +3,6 @@
 from pkg_resources import ResolutionError, ExtractionError
 from setuptools.compat import urllib2
 
-try:
-    import urllib2
-except ImportError:
-    import urllib.request as urllib2
-
 try:
     import ssl
 except ImportError:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index b8f89e0628..438f7cedbd 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,6 @@
 import unittest
 import unicodedata
 
-
 from setuptools.compat import StringIO, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
@@ -56,7 +55,7 @@ def b(s, encoding='utf-8'):
 
 # Convert to POSIX path
 def posix(path):
-    if sys.version_info >= (3,) and not isinstance(path, unicode):
+    if sys.version_info >= (3,) and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')

From 2eb4eeaf4e06d8bcf3cf1288ae2d6a53ef96f59d Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 12:38:18 +0100
Subject: [PATCH 1259/8469] Minor change to minimise diffs with upstream.

--HG--
branch : single-codebase
---
 pkg_resources.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index e03667e098..0978836466 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -40,7 +40,6 @@ def exec_(code, globs=None, locs=None):
 except NameError:
     basestring = str
     from io import StringIO
-    from functools import reduce
     exec_ = eval("exec")
     def execfile(fn, globs=None, locs=None):
         if globs is None:
@@ -48,6 +47,8 @@ def execfile(fn, globs=None, locs=None):
         if locs is None:
             locs = globs
         exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+    import functools
+    reduce = functools.reduce
 
 # capture these to bypass sandboxing
 from os import utime

From 1c5400fd8216c101b7d120e1b079e46add869ade Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 19 Jun 2013 12:39:48 +0100
Subject: [PATCH 1260/8469] Minor change to minimise diffs with upstream.

--HG--
branch : single-codebase
---
 pkg_resources.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0978836466..3dc85525e0 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2493,8 +2493,7 @@ def activate(self,path=None):
         self.insert_on(path)
         if path is sys.path:
             fixup_namespace_packages(self.location)
-            list(map(declare_namespace,
-                     self._get_metadata('namespace_packages.txt')))
+            list(map(declare_namespace, self._get_metadata('namespace_packages.txt')))
 
 
     def egg_name(self):

From 5a3dbe5d5b8cb07a292b8fee2cd83fbc1bcbd16f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 08:38:55 -0500
Subject: [PATCH 1261/8469] Add test capturing failure on Python 3 in
 egg_info.get_svn_revision (#20). egg_info.get_svn_revision is now a
 staticmethod.

---
 MANIFEST.in                       |   2 +-
 setuptools/command/egg_info.py    |   5 +-
 setuptools/tests/entries-v10      | 615 ++++++++++++++++++++++++++++++
 setuptools/tests/test_egg_info.py |  40 ++
 4 files changed, 659 insertions(+), 3 deletions(-)
 create mode 100644 setuptools/tests/entries-v10
 create mode 100644 setuptools/tests/test_egg_info.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 68337800cc..ff1021234a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe *.xml
 recursive-include tests *.py *.c *.pyx *.txt
-recursive-include setuptools/tests *.html
+recursive-include setuptools/tests *.html entries*
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
 include *.py
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cd3ea19895..5863d2d4bb 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -210,7 +210,8 @@ def tags(self):
 
 
 
-    def get_svn_revision(self):
+    @staticmethod
+    def get_svn_revision():
         revision = 0
         urlre = re.compile('url="([^"]+)"')
         revre = re.compile('committed-rev="(\d+)"')
@@ -234,7 +235,7 @@ def get_svn_revision(self):
                     log.warn("unrecognized .svn/entries format; skipping %s", base)
                     dirs[:] = []
                     continue
-                   
+
                 data = map(str.splitlines,data.split('\n\x0c\n'))
                 del data[0][0]  # get rid of the '8' or '9' or '10'
                 dirurl = data[0][3]
diff --git a/setuptools/tests/entries-v10 b/setuptools/tests/entries-v10
new file mode 100644
index 0000000000..4446c50137
--- /dev/null
+++ b/setuptools/tests/entries-v10
@@ -0,0 +1,615 @@
+10
+
+dir
+89001
+http://svn.python.org/projects/sandbox/branches/setuptools-0.6
+http://svn.python.org/projects
+
+
+
+2013-06-03T17:26:03.052972Z
+89000
+phillip.eby
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6015fed2-1504-0410-9fe1-9d1591cc4771
+
+api_tests.txt
+file
+
+
+
+
+2013-06-19T13:20:47.948712Z
+dec366372ca14fbeaeb26f492bcf5725
+2013-05-15T22:04:59.389374Z
+88997
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12312
+
+setuptools.egg-info
+dir
+
+README.txt
+file
+
+
+
+
+2013-06-19T13:20:47.948712Z
+26f0dd5d095522ba3ad999b6b6777b92
+2011-05-31T20:10:56.416725Z
+88846
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7615
+
+easy_install.py
+file
+
+
+
+
+2013-06-19T13:20:47.948712Z
+97b52fe7253bf4683f9f626f015eb72e
+2006-09-20T20:48:18.716070Z
+51935
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+126
+
+setuptools
+dir
+
+launcher.c
+file
+
+
+
+
+2013-06-19T13:20:47.924700Z
+e5a8e77de9022688b80f77fc6d742fee
+2009-10-19T21:03:29.785400Z
+75544
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7476
+
+ez_setup.py
+file
+
+
+
+
+2013-06-19T13:20:47.924700Z
+17e8ec5e08faccfcb08b5f8d5167ca14
+2011-01-20T18:50:00.815420Z
+88124
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8350
+
+version
+file
+
+
+
+
+2013-06-19T13:20:47.924700Z
+e456da09e0c9e224a56302f8316b6dbf
+2007-01-09T19:21:05.921317Z
+53317
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1143
+
+setup.py
+file
+
+
+
+
+2013-06-19T13:20:47.924700Z
+d4e5b3c16bd61bfef6c0bb9377a3a3ea
+2013-05-15T22:04:59.389374Z
+88997
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5228
+
+release.sh
+file
+
+
+
+
+2013-06-19T13:20:47.932704Z
+b1fd4054a1c107ff0f27baacd97be94c
+2009-10-28T17:12:45.227140Z
+75925
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1044
+
+pkg_resources.txt
+file
+
+
+
+
+2013-06-19T13:20:47.928702Z
+f497e7c92a4de207cbd9ab1943f93388
+2009-10-12T20:00:02.336146Z
+75385
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+94518
+
+site.py
+file
+
+
+
+
+2013-06-19T13:20:47.932704Z
+ebaac6fb6525f77ca950d22e6f8315df
+2006-03-11T00:39:09.666740Z
+42965
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2362
+
+version.dat
+file
+
+
+
+
+2013-06-19T13:20:47.932704Z
+8e14ecea32b9874cd7d29277494554c0
+2009-10-28T17:12:45.227140Z
+75925
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+80
+
+virtual-python.py
+file
+
+
+
+
+2013-06-19T13:20:47.932704Z
+aa857add3b5563238f0a904187f5ded9
+2005-10-17T02:26:39.000000Z
+41262
+pje
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3898
+
+setup.cfg
+file
+
+
+
+
+2013-06-19T13:20:47.932704Z
+eda883e744fce83f8107ad8dc8303536
+2006-09-21T22:26:48.050256Z
+51965
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+296
+
+setuptools.txt
+file
+
+
+
+
+2013-06-19T13:20:47.940708Z
+11926256f06046b196eaf814772504e7
+2013-05-15T22:04:59.389374Z
+88997
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+149832
+
+pkg_resources.py
+file
+
+
+
+
+2013-06-19T13:20:47.940708Z
+b63a30f5f0f0225a788c2c0e3430b3cf
+2013-05-15T22:04:59.389374Z
+88997
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+90397
+
+tests
+dir
+
+wikiup.cfg
+file
+
+
+
+
+2013-06-19T13:20:47.944710Z
+34ad845a5e0a0b46458557fa910bf429
+2008-08-21T17:23:50.797633Z
+65935
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+136
+
+EasyInstall.txt
+file
+
+
+
+
+2013-06-19T13:20:47.944710Z
+e97387c517f70fc18a377e42d19d64d4
+2013-05-15T22:04:59.389374Z
+88997
+phillip.eby
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+82495
+
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
new file mode 100644
index 0000000000..f26a1f5191
--- /dev/null
+++ b/setuptools/tests/test_egg_info.py
@@ -0,0 +1,40 @@
+import os
+import tempfile
+import shutil
+import unittest
+
+import pkg_resources
+from setuptools.command import egg_info
+
+ENTRIES_V10 = pkg_resources.resource_string(__name__, 'entries-v10')
+"An entries file generated with svn 1.6.17 against the legacy Setuptools repo"
+
+class TestEggInfo(unittest.TestCase):
+
+    def setUp(self):
+        self.test_dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(self.test_dir, '.svn'))
+
+        self.old_cwd = os.getcwd()
+        os.chdir(self.test_dir)
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.test_dir)
+
+    def _write_entries(self, entries):
+        fn = os.path.join(self.test_dir, '.svn', 'entries')
+        entries_f = open(fn, 'wb')
+        entries_f.write(entries)
+        entries_f.close()
+
+    def test_version_10_format(self):
+        """
+        """
+        self._write_entries(ENTRIES_V10)
+        rev = egg_info.egg_info.get_svn_revision()
+        self.assertEqual(rev, '89000')
+
+
+def test_suite():
+    return unittest.defaultTestLoader.loadTestsFromName(__name__)

From e2b6f95a403f2152dacba8229ea8b91aecc3328e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 08:47:43 -0500
Subject: [PATCH 1262/8469] Reference parsed svn version variable instead of
 the whole of the data. Fixes #20

---
 CHANGES.txt                    | 6 ++++++
 setuptools/command/egg_info.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 77ab44aadb..d736ca2ca6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.4
+-----
+
+* Issue #20: Fix comparison of parsed SVN version on Python 3.
+
 -----
 0.7.3
 -----
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5863d2d4bb..b283b28af1 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -231,7 +231,7 @@ def get_svn_revision():
             else:
                 try: svnver = int(data.splitlines()[0])
                 except: svnver=-1
-                if data<8:
+                if svnver<8:
                     log.warn("unrecognized .svn/entries format; skipping %s", base)
                     dirs[:] = []
                     continue

From af8cbefb0b5e07834e80bacc7278350b183ca63d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 08:51:21 -0500
Subject: [PATCH 1263/8469] Added tag 0.7.4 for changeset 85640475dda0

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cc2b422560..1cc2fd4850 100644
--- a/.hgtags
+++ b/.hgtags
@@ -63,3 +63,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 024dd30ed702135f5328975042566e48cc479d7d 0.7.1
 d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
 d212e48e0cef689acba57ed017289c027660b23c 0.7.3
+85640475dda0621f20e11db0995fa07f51744a98 0.7.4

From aa2269f68c8708f6498300f7d0a93a3a5eba562f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 08:51:59 -0500
Subject: [PATCH 1264/8469] Bumped to 0.7.5 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index 19b7c4713e..e0329345a2 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.4/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.4$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.5$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 909a551048..88d9540d30 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.4'
+version = '0.7.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.4'
+release = '0.7.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 668224937c..a0aa1299b3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.4"
+DEFAULT_VERSION = "0.7.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index c3ed3f4536..8d2f0bc76f 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.4'
+VERSION = '0.7.5'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index ece0370eef..8986e94935 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.4"
+VERSION = "0.7.5"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index f7612bce09..6be7006a02 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.4'
+__version__ = '0.7.5'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From cc4d57dcb6b12fe3b4bf20b9f848d71986723763 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 15:22:49 -0500
Subject: [PATCH 1265/8469] Restore Python 2.4 compatibility in
 test_easy_install. Fixes #21

---
 setuptools/tests/test_easy_install.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 395056e723..d17a534047 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -272,11 +272,12 @@ def test_setup_requires(self):
         sys.stdout = StringIO.StringIO()
         sys.stderr = StringIO.StringIO()
         try:
-            reset_setup_stop_context(
-                lambda: run_setup(test_setup_py, ['install'])
-            )
-        except SandboxViolation:
-            self.fail('Installation caused SandboxViolation')
+            try:
+                reset_setup_stop_context(
+                    lambda: run_setup(test_setup_py, ['install'])
+                )
+            except SandboxViolation:
+                self.fail('Installation caused SandboxViolation')
         finally:
             sys.stdout = old_stdout
             sys.stderr = old_stderr

From 54cea58c9eb477f8d53c44a6555dbc1f7531fbb8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Jun 2013 15:24:41 -0500
Subject: [PATCH 1266/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d736ca2ca6..078b532f21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.5
+-----
+
+* Issue #21: Restore Python 2.4 compatibility in ``test_easy_install``.
+
 -----
 0.7.4
 -----

From 0016f3777955977828aecdc47a9814506a434d7b Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 20 Jun 2013 09:43:59 +0200
Subject: [PATCH 1267/8469] Include Windows-specific files in tarball even when
 MANIFEST.in does not include them.

---
 release.py | 4 +++-
 setup.py   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index 937fadfcb9..175e14631f 100644
--- a/release.py
+++ b/release.py
@@ -188,7 +188,9 @@ def upload_to_pypi():
 		cmd.extend([
 			'upload_docs', '-r', PACKAGE_INDEX
 		])
-	subprocess.check_call(cmd)
+	env = os.environ.copy()
+	env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
+	subprocess.check_call(cmd, env=env)
 
 def has_sphinx():
 	try:
diff --git a/setup.py b/setup.py
index 8afdf23531..432a43b5d2 100755
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,7 @@ def run(self):
 changes_file.close()
 
 package_data = {'setuptools': ['site-patch.py']}
-if sys.platform == 'win32':
+if sys.platform == 'win32' or os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES") not in (None, "", "0"):
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 

From 6d6dddc57e58e2387930040dfb56dd270408cb24 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 20 Jun 2013 10:03:23 +0200
Subject: [PATCH 1268/8469] Add support for
 SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable. Support for old
 DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable is kept temporarily
 for backward compatibility.

--HG--
extra : source : eb58c3fe7c0881cbb28de1c523f083ad8e7f427d
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8986e94935..fcf61e753c 100755
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,8 @@
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \
+    os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"):
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
 
 # specific command that is used to generate windows .exe files

From 72495bf98af2c556721126fceff8a5e7d8283a91 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 20 Jun 2013 10:03:23 +0200
Subject: [PATCH 1269/8469] Add support for
 SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable. Support for old
 DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable is kept temporarily
 for backward compatibility.

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 432a43b5d2..d56c491ad9 100755
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,8 @@
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \
+    os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"):
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
 
 # specific command that is used to generate windows .exe files

From d26d42296c45c25703e7c1fb76bf78fc5aa8347e Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Fri, 28 Jun 2013 21:55:47 -0500
Subject: [PATCH 1270/8469] Quick addition to get past svn test in another
 package.

--HG--
extra : rebase_source : a36601a66f574d7c0919b7c885dcae7b820bb7dd
---
 setuptools/command/egg_info.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 642687b23f..7daaee0f50 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,6 +15,9 @@
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
 from setuptools.command.sdist import walk_revctrl
 
+#requires python >= 2.4
+from subprocess import Popen as _Popen, PIPE as _PIPE
+
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
 
@@ -216,6 +219,8 @@ def get_svn_revision():
         revision = 0
         urlre = re.compile('url="([^"]+)"')
         revre = re.compile('committed-rev="(\d+)"')
+        urlre11 = re.compile('<url>([^<>]+)</url>')
+        revre11 = re.compile('<commit\s+[^>]*revision="(\d+)"')
 
         for base,dirs,files in os.walk(os.curdir):
             if '.svn' not in dirs:
@@ -236,11 +241,17 @@ def get_svn_revision():
                     log.warn("unrecognized .svn/entries format; skipping %s", base)
                     dirs[:] = []
                     continue
+                elif svnver > 10:
+                    p = _Popen(['svn', 'info', '--xml'], stdout=_PIPE, shell=(sys.platform=='win32'))
+                    data =  unicode(p.communicate()[0], encoding='utf-8')
+                    dirurl = urlre11.search(data).group(1)
+                    localrev = max([int(m.group(1)) for m in revre11.finditer(data)]+[0])
+                else:
+                    data = list(map(str.splitlines,data.split('\n\x0c\n')))
+                    del data[0][0]  # get rid of the '8' or '9' or '10'
+                    dirurl = data[0][3]
+                    localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
 
-                data = list(map(str.splitlines,data.split('\n\x0c\n')))
-                del data[0][0]  # get rid of the '8' or '9' or '10'
-                dirurl = data[0][3]
-                localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
             if base==os.curdir:
                 base_url = dirurl+'/'   # save the root url
             elif not dirurl.startswith(base_url):
@@ -253,6 +264,8 @@ def get_svn_revision():
 
 
 
+
+
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")

From d259c91f17d0bf9a0ac91d61d0ea0c0b5e7f618f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:40:04 -0400
Subject: [PATCH 1271/8469] update changelog

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4036e94919..e4fcc37ea9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,10 @@ CHANGES
 -----
 
 * Issue #21: Restore Python 2.4 compatibility in ``test_easy_install``.
+* Distribute #375: Merged additional warning from Distribute 0.6.46.
+* Now honor the environment variable
+  ``SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT`` in addition to the now
+  deprecated ``DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT``.
 
 -----
 0.7.4

From f5a609f696a9fdc85cefd09f97865282fa341631 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:47:03 -0400
Subject: [PATCH 1272/8469] Add comment to capture the purpose of the
 environment variable

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index fcf61e753c..cb0ce01230 100755
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,10 @@
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
+
+# Gentoo distributions manage the python-version-specific scripts themselves,
+# so they define an environment variable to suppress the creation of the
+# version-specific scripts.
 if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \
     os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"):
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])

From 0c7de199c1a686ba1577ceb5bfce8ac43667faf7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:53:50 -0400
Subject: [PATCH 1273/8469] Added tag 0.7.5 for changeset dd5bbc116c53

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1cc2fd4850..f67224cd68 100644
--- a/.hgtags
+++ b/.hgtags
@@ -64,3 +64,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
 d212e48e0cef689acba57ed017289c027660b23c 0.7.3
 85640475dda0621f20e11db0995fa07f51744a98 0.7.4
+dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5

From b99749aa06cc7c235cb456a81ad50187d701fc4c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:54:10 -0400
Subject: [PATCH 1274/8469] Bumped to 0.7.6 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index e0329345a2..bb57ea7674 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.5/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.5$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.6$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 88d9540d30..0cae162181 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.5'
+version = '0.7.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.5'
+release = '0.7.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index a0aa1299b3..f68388f11a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.5"
+DEFAULT_VERSION = "0.7.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 8d2f0bc76f..46f32bbc9a 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.5'
+VERSION = '0.7.6'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index cb0ce01230..f2bd1fd526 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.5"
+VERSION = "0.7.6"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6be7006a02..5920170ba3 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.5'
+__version__ = '0.7.6'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 3013f393422403874c383cf8a07783cbe770b339 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 11:09:12 -0400
Subject: [PATCH 1275/8469] Added tag 0.8b2 for changeset 512744f3f306

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cf5cd38e36..2ee2b6682b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -67,3 +67,4 @@ d212e48e0cef689acba57ed017289c027660b23c 0.7.3
 85640475dda0621f20e11db0995fa07f51744a98 0.7.4
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
+512744f3f306aea0fdde4cfd600af8b2d6e773e7 0.8b2

From 0f89549e4bfdbc404deaf1f62fe8d95f5220416d Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 29 Jun 2013 16:54:17 -0500
Subject: [PATCH 1276/8469] Add svn_util.py
 http://bugs.python.org/setuptools/file51/svn_versioning_2.patch by Jason
 Coombs

--HG--
extra : rebase_source : 4004028579ee1efa18c8326c664876f99048e6f6
---
 setuptools/svn_utils.py | 110 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 setuptools/svn_utils.py

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
new file mode 100644
index 0000000000..2a200fdf7b
--- /dev/null
+++ b/setuptools/svn_utils.py
@@ -0,0 +1,110 @@
+import os
+import re
+
+def get_entries_files(base, recurse=True):
+    for base,dirs,files in os.walk(os.curdir):
+        if '.svn' not in dirs:
+            dirs[:] = []
+            continue    # no sense walking uncontrolled subdirs
+        dirs.remove('.svn')
+        f = open(os.path.join(base,'.svn','entries'))
+        yield f.read()
+        f.close()
+
+class SVNEntries(object):
+    def __init__(self, data):
+        self.data = data
+
+    @classmethod
+    def load(class_, base):
+        filename = os.path.join(base, '.svn', 'entries')
+        f = open(filename)
+        result = SVNEntries.read(f)
+        f.close()
+        return result
+
+    @classmethod
+    def read(class_, file):
+        data = file.read()
+        is_xml = data.startswith('<?xml')
+        class_ = [SVNEntriesText, SVNEntriesXML][is_xml]
+        return class_(data)
+
+    def parse_revision(self):
+        all_revs = self.parse_revision_numbers() + [0]
+        return max(all_revs)
+
+class SVNEntriesText(SVNEntries):
+    known_svn_versions = {
+        '1.4.x': 8,
+        '1.5.x': 9,
+        '1.6.x': 10,
+        }
+
+    def __get_cached_sections(self):
+        return self.sections
+        
+    def get_sections(self):
+        SECTION_DIVIDER = '\f\n'
+        sections = self.data.split(SECTION_DIVIDER)
+        sections = map(str.splitlines, sections)
+        try:
+            # remove the SVN version number from the first line
+            svn_version = int(sections[0].pop(0))
+            if not svn_version in self.known_svn_versions.values():
+                log.warn("Unknown subversion verson %d", svn_version)
+        except ValueError:
+            return
+        self.sections = sections
+        self.get_sections = self.__get_cached_sections
+        return self.sections
+
+    def is_valid(self):
+        return bool(self.get_sections())
+    
+    def get_url(self):
+        return self.get_sections()[0][4]
+
+    def parse_revision_numbers(self):
+        revision_line_number = 9
+        rev_numbers = [
+            int(section[revision_line_number])
+            for section in self.get_sections()
+            if len(section)>revision_line_number
+                and section[revision_line_number]
+            ]
+        return rev_numbers
+    
+    def get_undeleted_records(self):
+        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
+        result = [
+            section[0]
+            for section in self.get_sections()
+            if undeleted(section)
+            ]
+        return result
+
+class SVNEntriesXML(SVNEntries):
+    def is_valid(self):
+        return True
+
+    def get_url(self):
+        "Get repository URL"
+        urlre = re.compile('url="([^"]+)"')
+        return urlre.search(self.data).group(1)
+
+    def parse_revision_numbers(self):
+        revre = re.compile('committed-rev="(\d+)"')
+        return [
+            int(m.group(1))
+            for m in revre.finditer(self.data)
+            ]
+    
+    def get_undeleted_records(self):
+        entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I)
+        results = [
+            unescape(match.group(1))
+            for match in entries_pattern.finditer(self.data)
+            ]
+        return results
+

From 89e84d11a149696aab37645db0b9c4f50fded1f7 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 00:13:56 -0500
Subject: [PATCH 1277/8469] Added a class for getting SVN information with a
 cmd. Using XML because the regular output is probably internationalized. Need
 to inspect setuptools/command/egg_info.py    setuptools/command/sdist.py   
 setuptools/package_index.py    to see how used again to see if we will every
 be parsing a    raw XML file or if always from .svn/enteries, if so    looks
 like we can just replace the whole of the file parsing.

--HG--
extra : rebase_source : 5e10e3b43fbe12f890d09923c1050f8384db7f84
---
 setuptools/svn_utils.py | 116 ++++++++++++++++++++++++++++++++++------
 1 file changed, 100 insertions(+), 16 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 2a200fdf7b..ad3b5f1585 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,6 +1,10 @@
 import os
 import re
 
+#requires python >= 2.4
+from subprocess import Popen as _Popen, PIPE as _PIPE
+
+
 def get_entries_files(base, recurse=True):
     for base,dirs,files in os.walk(os.curdir):
         if '.svn' not in dirs:
@@ -12,6 +16,17 @@ def get_entries_files(base, recurse=True):
         f.close()
 
 class SVNEntries(object):
+    known_svn_versions = {
+        '1.4.x': 8,
+        '1.5.x': 9,
+        '1.6.x': 10,
+        #11 didn't exist (maybe 1.7-dev)
+        #12 is the number in the file there is another
+        #number in .svn/wb.db that is at larger so
+        #looks like they won't be updating it any longer.
+        '1.7.x+': 12,
+        }
+
     def __init__(self, data):
         self.data = data
 
@@ -26,8 +41,27 @@ def load(class_, base):
     @classmethod
     def read(class_, file):
         data = file.read()
-        is_xml = data.startswith('<?xml')
-        class_ = [SVNEntriesText, SVNEntriesXML][is_xml]
+
+        if data.startswith('<?xml'):
+            #entries were originally xml so pre-1.4.x
+            return SVNEntriesXML(data)
+        else:
+            try:
+                eol = data.index('\n')
+                svn_version = int(data[:eol])
+                data = data[eol+1:]  # remove the revision number and newline
+            except ValueError:
+                log.warn('Unable to parse SVN entries file starting with %r' % data[:20])
+                svn_version = None
+
+            version_known = svn_version in class_.known_svn_versions
+            if version_known and svn_version <= 10:
+                return SVNEntriesText(data)
+            else:
+                if not version_known:
+                    log.warn("Unknown subversion verson %d", svn_version)
+                class_ = SVNEntriesCmd
+
         return class_(data)
 
     def parse_revision(self):
@@ -35,11 +69,6 @@ def parse_revision(self):
         return max(all_revs)
 
 class SVNEntriesText(SVNEntries):
-    known_svn_versions = {
-        '1.4.x': 8,
-        '1.5.x': 9,
-        '1.6.x': 10,
-        }
 
     def __get_cached_sections(self):
         return self.sections
@@ -47,15 +76,7 @@ def __get_cached_sections(self):
     def get_sections(self):
         SECTION_DIVIDER = '\f\n'
         sections = self.data.split(SECTION_DIVIDER)
-        sections = map(str.splitlines, sections)
-        try:
-            # remove the SVN version number from the first line
-            svn_version = int(sections[0].pop(0))
-            if not svn_version in self.known_svn_versions.values():
-                log.warn("Unknown subversion verson %d", svn_version)
-        except ValueError:
-            return
-        self.sections = sections
+        self.sections = map(str.splitlines, sections)
         self.get_sections = self.__get_cached_sections
         return self.sections
 
@@ -108,3 +129,66 @@ def get_undeleted_records(self):
             ]
         return results
 
+
+class SVNEntriesCMD(SVNEntries):
+    entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
+    entryre = re.compile(r'<entry.*?</entry>', re.M or re.I)
+    urlre = re.compile('<root>(.*?)</root>', re.I)
+    revre = re.compile('<commit\s+[^>]*revision="(\d+)"', re.I)
+    namere = re.compile('<name>(.*?)</name>', re.I)
+
+    def __get_cached_dir_data(self):
+        return self.dir_data
+
+    def __get_cached_entries(self):
+        return self.entries
+
+    def is_valid(self):
+        return bool(self.get_dir_data())
+
+    def get_dir_data(self):
+        #regard the shell argument, see: http://bugs.python.org/issue8557
+        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
+        proc = _Popen(['svn', 'info', '--xml', self.path], 
+                      stdout=_PIPE, shell=(sys.platform=='win32'))
+        data =  unicode(proc.communicate()[0], encoding='utf-8')
+        self.dir_data = self.entryre.findall(data)
+        self.get_dir_data = self.__get_cached_dir_data
+        return self.dir_data
+
+    def get_entries(self):
+        #regard the shell argument, see: http://bugs.python.org/issue8557
+        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
+        proc = _Popen(['svn', 'list', '--xml', self.path], 
+                      stdout=_PIPE, shell=(sys.platform=='win32'))
+        data =  unicode(proc.communicate()[0], encoding='utf-8')
+        self.dir_data = self.entryre.findall(data)
+        self.get_dir_data = self.__get_cached_dir_data
+        return self.dir_data
+
+    def get_url(self):
+        "Get repository URL"
+        return self.urlre.search(self.get_sections()[0]).group(1)
+
+    def parse_revision_numbers(self):
+        #NOTE: if one has recently commited, the new revision doesn't get updated until svn update
+        if not self.is_valid():
+            return list()
+        else:
+            return [
+                int(m.group(1)) 
+                for entry in self.get_enteries()
+                for m in self.revre.finditer(entry)
+            ]
+    
+    def get_undeleted_records(self):
+        #NOTE: Need to pars enteries?
+        if not self.is_valid():
+            return list()
+        else:
+            return [
+                m.group(1))
+                for entry in self.get_enteries()
+                for m in self.namere.finditer(entry)                
+            ]
+

From fa323cad32fa1804f84b6421417828fbc9b15da0 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 00:30:48 -0500
Subject: [PATCH 1278/8469] cleaned up the svn module, I think I can drop the
 old entry parsing all together

--HG--
extra : rebase_source : 16b995fc27ea40fff0dd51734aea47775ff0033a
---
 setuptools/svn_utils.py | 86 +++++++----------------------------------
 1 file changed, 15 insertions(+), 71 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index ad3b5f1585..3311d9cf32 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -15,96 +15,40 @@ def get_entries_files(base, recurse=True):
         yield f.read()
         f.close()
 
+#It would seem that svn info --xml and svn list --xml were fully supported by 1.3.x
+#the special casing of the entry files seem to start at 1.4.x, so if we check
+#for xml in entries and then fall back to the command line, this should catch everything.
+
 class SVNEntries(object):
-    known_svn_versions = {
-        '1.4.x': 8,
-        '1.5.x': 9,
-        '1.6.x': 10,
-        #11 didn't exist (maybe 1.7-dev)
-        #12 is the number in the file there is another
-        #number in .svn/wb.db that is at larger so
-        #looks like they won't be updating it any longer.
-        '1.7.x+': 12,
-        }
-
-    def __init__(self, data):
+
+    def __init__(self, path, data):
+        self.path = path
         self.data = data
 
     @classmethod
     def load(class_, base):
         filename = os.path.join(base, '.svn', 'entries')
         f = open(filename)
-        result = SVNEntries.read(f)
+        result = SVNEntries.read(f, None)
         f.close()
         return result
 
     @classmethod
-    def read(class_, file):
+    def read(class_, file, path=None):
         data = file.read()
 
         if data.startswith('<?xml'):
             #entries were originally xml so pre-1.4.x
-            return SVNEntriesXML(data)
+            return SVNEntriesXML(data, path)
+        else if path is None:
+            raise ValueError('Must have path to call svn')
         else:
-            try:
-                eol = data.index('\n')
-                svn_version = int(data[:eol])
-                data = data[eol+1:]  # remove the revision number and newline
-            except ValueError:
-                log.warn('Unable to parse SVN entries file starting with %r' % data[:20])
-                svn_version = None
-
-            version_known = svn_version in class_.known_svn_versions
-            if version_known and svn_version <= 10:
-                return SVNEntriesText(data)
-            else:
-                if not version_known:
-                    log.warn("Unknown subversion verson %d", svn_version)
-                class_ = SVNEntriesCmd
-
-        return class_(data)
+            return SVNEntriesCMD(data, path)
 
     def parse_revision(self):
         all_revs = self.parse_revision_numbers() + [0]
         return max(all_revs)
 
-class SVNEntriesText(SVNEntries):
-
-    def __get_cached_sections(self):
-        return self.sections
-        
-    def get_sections(self):
-        SECTION_DIVIDER = '\f\n'
-        sections = self.data.split(SECTION_DIVIDER)
-        self.sections = map(str.splitlines, sections)
-        self.get_sections = self.__get_cached_sections
-        return self.sections
-
-    def is_valid(self):
-        return bool(self.get_sections())
-    
-    def get_url(self):
-        return self.get_sections()[0][4]
-
-    def parse_revision_numbers(self):
-        revision_line_number = 9
-        rev_numbers = [
-            int(section[revision_line_number])
-            for section in self.get_sections()
-            if len(section)>revision_line_number
-                and section[revision_line_number]
-            ]
-        return rev_numbers
-    
-    def get_undeleted_records(self):
-        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
-        result = [
-            section[0]
-            for section in self.get_sections()
-            if undeleted(section)
-            ]
-        return result
-
 class SVNEntriesXML(SVNEntries):
     def is_valid(self):
         return True
@@ -171,7 +115,7 @@ def get_url(self):
         return self.urlre.search(self.get_sections()[0]).group(1)
 
     def parse_revision_numbers(self):
-        #NOTE: if one has recently commited, the new revision doesn't get updated until svn update
+        #NOTE: if one has recently committed, the new revision doesn't get updated until SVN update
         if not self.is_valid():
             return list()
         else:
@@ -182,7 +126,7 @@ def parse_revision_numbers(self):
             ]
     
     def get_undeleted_records(self):
-        #NOTE: Need to pars enteries?
+        #NOTE: Need to parse entities?
         if not self.is_valid():
             return list()
         else:

From 82a8940be2ae4f000a95a964b0d945175a0a7cd7 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 02:04:47 -0500
Subject: [PATCH 1279/8469] added querying externals to the classes

--HG--
extra : rebase_source : 9b76763b0ba0dc1ac6de130b04f6bb5ebf546fe6
---
 setuptools/svn_utils.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 3311d9cf32..d36f64eaa5 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -49,6 +49,28 @@ def parse_revision(self):
         all_revs = self.parse_revision_numbers() + [0]
         return max(all_revs)
 
+    def __get_cached_external_dirs(self):
+        return self.external_dirs
+
+    def get_external_dirs(self):
+        #regard the shell argument, see: http://bugs.python.org/issue8557
+        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
+        proc = _Popen(['svn', 'propget', self.path], 
+                      stdout=_PIPE, shell=(sys.platform=='win32'))
+        data = unicode(proc.communicate()[0], encoding='utf-8').splitlines()
+        data = [line.split() for line in data]
+
+        # http://svnbook.red-bean.com/en/1.6/svn.advanced.externals.html
+        #there appears to be three possible formats for externals since 1.5
+        #but looks like we only need the local relative path names so it's just
+        #2 either the first column or the last (of 2 or 3)
+        index = -1
+        if all("://" in line[-1] for line in data):
+            index = 0
+        
+        self.external_dirs = [line[index] for line in data]
+        return self.dir_data
+
 class SVNEntriesXML(SVNEntries):
     def is_valid(self):
         return True

From fa86abbd33b3576c3218bc6003042b1a635b6519 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Jun 2013 13:04:07 -0400
Subject: [PATCH 1280/8469] Added tag 0.8b3 for changeset 8af9839a7640

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2ee2b6682b..905e248cdf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -68,3 +68,4 @@ d212e48e0cef689acba57ed017289c027660b23c 0.7.3
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 512744f3f306aea0fdde4cfd600af8b2d6e773e7 0.8b2
+8af9839a76407eebf3610fcd3e7973f1625abaa2 0.8b3

From 8d389a37b8237d9dfb3f2b92baf79acda9c5b3f1 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 13:13:33 -0500
Subject: [PATCH 1281/8469] Added SVNTextEntries for the moment as a fallback
 for no SVN/Rev8-10 Added Externals processing for all formats Will use
 dir-prop[-base] as a fallback otherwise CMD.

--HG--
extra : rebase_source : dc27f779f22d5f9795c425b92d34db29d62b495d
---
 setuptools/command/egg_info.py |  36 +++------
 setuptools/command/sdist.py    |  45 ++---------
 setuptools/svn_utils.py        | 135 +++++++++++++++++++++++++++++----
 3 files changed, 135 insertions(+), 81 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 7daaee0f50..7ed50d7374 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,6 +9,7 @@
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
+from setuptools import svn_util
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
@@ -217,40 +218,21 @@ def tags(self):
     @staticmethod
     def get_svn_revision():
         revision = 0
-        urlre = re.compile('url="([^"]+)"')
-        revre = re.compile('committed-rev="(\d+)"')
-        urlre11 = re.compile('<url>([^<>]+)</url>')
-        revre11 = re.compile('<commit\s+[^>]*revision="(\d+)"')
 
         for base,dirs,files in os.walk(os.curdir):
             if '.svn' not in dirs:
                 dirs[:] = []
                 continue    # no sense walking uncontrolled subdirs
             dirs.remove('.svn')
-            f = open(os.path.join(base,'.svn','entries'))
-            data = f.read()
-            f.close()
 
-            if data.startswith('<?xml'):
-                dirurl = urlre.search(data).group(1)    # get repository URL
-                localrev = max([int(m.group(1)) for m in revre.finditer(data)]+[0])
-            else:
-                try: svnver = int(data.splitlines()[0])
-                except: svnver=-1
-                if svnver<8:
-                    log.warn("unrecognized .svn/entries format; skipping %s", base)
-                    dirs[:] = []
-                    continue
-                elif svnver > 10:
-                    p = _Popen(['svn', 'info', '--xml'], stdout=_PIPE, shell=(sys.platform=='win32'))
-                    data =  unicode(p.communicate()[0], encoding='utf-8')
-                    dirurl = urlre11.search(data).group(1)
-                    localrev = max([int(m.group(1)) for m in revre11.finditer(data)]+[0])
-                else:
-                    data = list(map(str.splitlines,data.split('\n\x0c\n')))
-                    del data[0][0]  # get rid of the '8' or '9' or '10'
-                    dirurl = data[0][3]
-                    localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
+            enteries = svn_util.SVNEntries.load(base)
+            if not entries.is_valid:
+                log.warn(" get_svn_revision: Cannot determine how to read enteries.")
+                dirs[:] = []
+                continue
+
+            localrev = entries.parse_revsion()
+            dirurl = entries.get_url()
 
             if base==os.curdir:
                 base_url = dirurl+'/'   # save the root url
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 39cd604396..e0c4b7e51c 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,6 +4,7 @@
 from glob import glob
 import os, re, sys, pkg_resources
 from glob import glob
+from setuptools.svn_util import SVNEntries
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -61,49 +62,13 @@ def _default_revctrl(dirname=''):
 
 def externals_finder(dirname, filename):
     """Find any 'svn:externals' directories"""
-    found = False
-    f = open(filename,'rt')
-    for line in iter(f.readline, ''):    # can't use direct iter!
-        parts = line.split()
-        if len(parts)==2:
-            kind,length = parts
-            data = f.read(int(length))
-            if kind=='K' and data=='svn:externals':
-                found = True
-            elif kind=='V' and found:
-                f.close()
-                break
-    else:
-        f.close()
-        return
-
-    for line in data.splitlines():
-        parts = line.split()
-        if parts:
-            yield joinpath(dirname, parts[0])
-
+    for name in SVNEntries.load(dirname).get_external_dirs(filename):
+        yield joinpath(dirname, name)
 
-entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I)
 
 def entries_finder(dirname, filename):
-    f = open(filename,'rU')
-    data = f.read()
-    f.close()
-    if data.startswith('<?xml'):
-        for match in entries_pattern.finditer(data):
-            yield joinpath(dirname,unescape(match.group(1)))
-    else:
-        svnver=-1
-        try: svnver = int(data.splitlines()[0])
-        except: pass
-        if svnver<8:
-            log.warn("unrecognized .svn/entries format in %s", os.path.abspath(dirname))
-            return           
-        for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
-            # subversion 1.6/1.5/1.4
-            if not record or len(record)>=6 and record[5]=="delete":
-                continue    # skip deleted
-            yield joinpath(dirname, record[0])
+    for record in SVNEntries.load(dirname).get_undeleted_records():
+        yield joinpath(dirname, record)
         
 
 finders = [
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index d36f64eaa5..dff1c4b0e4 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -19,14 +19,29 @@ def get_entries_files(base, recurse=True):
 #the special casing of the entry files seem to start at 1.4.x, so if we check
 #for xml in entries and then fall back to the command line, this should catch everything.
 
+#TODO add the text entry back, and make its use dependent on the non existence of svn?
+
 class SVNEntries(object):
+    svn_tool_version = ''
 
     def __init__(self, path, data):
         self.path = path
         self.data = data
+        if not self.svn_tool_version:
+            self.svn_tool_version = self.get_svn_tool_version()
+
+    @staticmethod 
+    def get_svn_tool_version():
+        proc = _Popen(['svn', 'propget', self.path], 
+                      stdout=_PIPE, shell=(sys.platform=='win32'))
+        data = unicode(proc.communicate()[0], encoding='utf-8')
+        if data is not not:
+            return data.strip()
+        else:
+            return ''
 
     @classmethod
-    def load(class_, base):
+    def load_dir(class_, base):
         filename = os.path.join(base, '.svn', 'entries')
         f = open(filename)
         result = SVNEntries.read(f, None)
@@ -41,9 +56,14 @@ def read(class_, file, path=None):
             #entries were originally xml so pre-1.4.x
             return SVNEntriesXML(data, path)
         else if path is None:
-            raise ValueError('Must have path to call svn')
+            result = SVNEntriesText(data, path)
         else:
-            return SVNEntriesCMD(data, path)
+            class_.svn_tool_version = class_.get_svn_tool_version()
+            result = SVNEntriesText(data, path)
+            if result.is_valid():
+                return svnentriescmd(data, path)
+            else:
+                return result
 
     def parse_revision(self):
         all_revs = self.parse_revision_numbers() + [0]
@@ -52,12 +72,29 @@ def parse_revision(self):
     def __get_cached_external_dirs(self):
         return self.external_dirs
 
-    def get_external_dirs(self):
-        #regard the shell argument, see: http://bugs.python.org/issue8557
-        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
-        proc = _Popen(['svn', 'propget', self.path], 
-                      stdout=_PIPE, shell=(sys.platform=='win32'))
-        data = unicode(proc.communicate()[0], encoding='utf-8').splitlines()
+    def __get_externals_data(self, filename):
+        found = False
+        f = open(filename,'rt')
+        for line in iter(f.readline, ''):    # can't use direct iter!
+            parts = line.split()
+            if len(parts)==2:
+                kind,length = parts
+                data = f.read(int(length))
+                if kind=='K' and data=='svn:externals':
+                    found = True
+                elif kind=='V' and found:
+                    f.close()
+                    break
+        else:
+            f.close()
+            return ''
+
+    def get_external_dirs(self, filename):
+        data = self.__get_externals_data(filename)
+
+        if not data:
+            return
+
         data = [line.split() for line in data]
 
         # http://svnbook.red-bean.com/en/1.6/svn.advanced.externals.html
@@ -65,11 +102,63 @@ def get_external_dirs(self):
         #but looks like we only need the local relative path names so it's just
         #2 either the first column or the last (of 2 or 3)
         index = -1
-        if all("://" in line[-1] for line in data):
+        if all("://" in line[-1] or not line[-1] for line in data):
             index = 0
-        
-        self.external_dirs = [line[index] for line in data]
-        return self.dir_data
+
+        self.external_dirs = [line[index] for line in data if line[index]]
+        self.get_external_dirs = self.__get_cached_external_dirs
+        return self.external_dirs                
+
+class SVNEntriesText(SVNEntries):
+    known_svn_versions = {
+        '1.4.x': 8,
+        '1.5.x': 9,
+        '1.6.x': 10,
+        }
+
+    def __get_cached_sections(self):
+        return self.sections
+
+    def get_sections(self):
+        SECTION_DIVIDER = '\f\n' # or '\n\x0c\n'?
+        sections = self.data.split(SECTION_DIVIDER)
+        sections = list(map(str.splitlines, sections))
+        try:
+            # remove the SVN version number from the first line
+            svn_version = int(sections[0].pop(0))
+            if not svn_version in self.known_svn_versions.values():
+                log.warn("Unknown subversion verson %d", svn_version)
+        except ValueError:
+            return
+        self.sections = sections
+        self.get_sections = self.__get_cached_sections
+        return self.sections
+
+    def is_valid(self):
+        return bool(self.get_sections())
+    
+    def get_url(self):
+        return self.get_sections()[0][4]
+
+    def parse_revision_numbers(self):
+        revision_line_number = 9
+        rev_numbers = [
+            int(section[revision_line_number])
+            for section in self.get_sections()
+            if len(section)>revision_line_number
+                and section[revision_line_number]
+            ]
+        return rev_numbers
+    
+    def get_undeleted_records(self):
+        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
+        result = [
+            section[0]
+            for section in self.get_sections()
+            if undeleted(section)
+            ]
+        return result
+
 
 class SVNEntriesXML(SVNEntries):
     def is_valid(self):
@@ -85,6 +174,7 @@ def parse_revision_numbers(self):
         return [
             int(m.group(1))
             for m in revre.finditer(self.data)
+            if m.group(1)
             ]
     
     def get_undeleted_records(self):
@@ -92,6 +182,7 @@ def get_undeleted_records(self):
         results = [
             unescape(match.group(1))
             for match in entries_pattern.finditer(self.data)
+            if m.group(1)
             ]
         return results
 
@@ -145,6 +236,7 @@ def parse_revision_numbers(self):
                 int(m.group(1)) 
                 for entry in self.get_enteries()
                 for m in self.revre.finditer(entry)
+                if m.group(1)
             ]
     
     def get_undeleted_records(self):
@@ -155,6 +247,21 @@ def get_undeleted_records(self):
             return [
                 m.group(1))
                 for entry in self.get_enteries()
-                for m in self.namere.finditer(entry)                
+                for m in self.namere.finditer(entry)
+                if m.group(1)
             ]
 
+    def __get_externals_data(self, filename):
+
+        #othewise will be called twice.
+        if filename.lower() != 'dir-props':
+            return ''
+
+        #regard the shell argument, see: http://bugs.python.org/issue8557
+        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
+        proc = _Popen(['svn', 'propget', self.path], 
+                  stdout=_PIPE, shell=(sys.platform=='win32'))
+        try:
+            return unicode(proc.communicate()[0], encoding='utf-8').splitlines()
+        except ValueError:
+            return ''

From e944e616cd78173151a2533b50ce664a8bffa526 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 17:16:31 -0500
Subject: [PATCH 1282/8469] Added an svn test module (needs fixing) Added a
 small externals example for tests (currently not used)

--HG--
extra : rebase_source : 5f2b31f8aa68a4b4f30e071b8b4bdad98c2cc595
---
 setuptools/tests/svn17_example.zip | Bin 0 -> 1656 bytes
 setuptools/tests/test_svn.py       |  73 +++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 setuptools/tests/svn17_example.zip
 create mode 100644 setuptools/tests/test_svn.py

diff --git a/setuptools/tests/svn17_example.zip b/setuptools/tests/svn17_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d208f42c052187c23ff5c59870948278194c241c
GIT binary patch
literal 1656
zcmWIWW@h1H0D-C1_ng2CC?Nu*i_7v1&Er!m5_1c3QuXsoGE$5515k97Oiz+v2dV^N
zX&gFAQj1IU3MvZ{i;ER_xe)q)RNZqjKkn$k4b%t15*Yf6QWH~hQ}s$JN}z5qL^0qX
z&;XzwIFJIeP@P<oky(@yUyxW-Qi<enkiP7RPgz)i>Ooi@uRcSN{g@WF+69OaXMhpN
z03!^SKZty@jyMC1K?WG37$Dn$>UGSpNAkK6lHWlZk^QcK&+kV1SUgXX)yCvnZH&um
z<Z#F9cw>E}fM;Y9;l`cLfnfjy0uTx<3Bgi5stM@n9;B6#K><h_0WoSKgqQ%$1p(d&
zgRo@)pl+x^MHmJlvIDXy*m42L6o`j518G#}ASDc7<RDywEmwd{fq3gRUUR_71l=&?
zm;z-n5P%q_!-&sO;AlfP3_Z6X49mr97&z}B8-^|Uf}IAA|8@8b1LY$`cwx&)2v<GF
zZxBX+;dhoM6P^GA<uPKNm4x3Qtj<D?M+HbwLE~`=e$${4$;t-O!~=vi%nS_AfO;4h
E08Z_8H~;_u

literal 0
HcmV?d00001

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
new file mode 100644
index 0000000000..90f213b475
--- /dev/null
+++ b/setuptools/tests/test_svn.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+"""svn tests"""
+
+
+import os
+import sys
+import tempfile
+import unittest
+import shutil
+import stat
+
+import setuptools.command.egg_info as egg_info
+#requires python >= 2.4
+from subprocess import call as _call
+
+def _remove_dir(target):
+    
+    #on windows this seems to a problem
+    for dir_path, dirs, files in os.walk(target):
+        os.chmod(dir_path, stat.S_IWRITE)
+        for filename in files:
+            os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
+    shutil.rmtree(target)
+
+class TestEmptySvn(unittest.TestCase):
+
+
+
+    def setUp(self):
+        self.temp_dir = tempfile.mkdtemp()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.temp_dir)
+        #apparently there is a standing bug in python about having
+        #to use shell=True in windows to get a path search.
+        if _call(['svnadmin', 'create', 'svn'], shell=(sys.platform == 'win32')):
+            raise 'Failed to create SVN repository'
+
+        self.svnrepo = os.path.join(self.temp_dir, 'svn')
+
+        if _call(['svn', 'checkout', 'file:///' + self.svnrepo.replace('\\','/'), 'co']):
+            os.chdir(self.old_cwd)
+            _remove_dir(self.temp_dir)
+            raise 'Failed to checkout SVN repository'
+
+        os.chdir(os.path.join(self.temp_dir, 'co'))
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        _remove_dir(self.temp_dir)
+
+    def test_can_get_revision_empty(self):
+        """Check that svn revision can be retrieved from an working set on an empty repository."""
+        self.assertEquals('0', egg_info._get_svn_revision())
+
+    def test_can_get_revision_single_commit(self):
+        """Check that svn revision can be retrieved from an working set on an empty repository."""
+    
+        open('README', 'w').close()
+        exitcode = _call(['svn', 'add', 'README'], shell=(sys.platform == 'win32'))
+        self.assertEqual(0, exitcode)
+        
+        exitcode = _call(['svn', 'commit', '-m', '"README added"'], shell=(sys.platform == 'win32'))
+        self.assertEqual(0, exitcode)
+
+        exitcode = _call(['svn', 'update'], shell=(sys.platform == 'win32'))
+        self.assertEqual(0, exitcode)
+
+        self.assertEquals('1', egg_info._get_svn_revision())
+
+
+def test_suite():
+    return unittest.defaultTestLoader.loadTestsFromName(__name__)
+

From 05fbc85a834bbd43850e736ffbe3b081f4fc4a26 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 19:03:56 -0500
Subject: [PATCH 1283/8469] minor naming issues in egg_info.py

--HG--
extra : rebase_source : d5877c7a9fe537d567d557bbcc7e89a596fa3c87
---
 setuptools/command/egg_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 7ed50d7374..4332111989 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,7 +9,7 @@
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
-from setuptools import svn_util
+from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
@@ -225,7 +225,7 @@ def get_svn_revision():
                 continue    # no sense walking uncontrolled subdirs
             dirs.remove('.svn')
 
-            enteries = svn_util.SVNEntries.load(base)
+            entries = svn_utils.SVNEntries.load_dir(base)
             if not entries.is_valid:
                 log.warn(" get_svn_revision: Cannot determine how to read enteries.")
                 dirs[:] = []

From 0fd60933763224ddc0fe96b1c94831dd091da25b Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 19:04:15 -0500
Subject: [PATCH 1284/8469] minor naming issues sdist

--HG--
extra : rebase_source : e7def1d2445a55291163753761d52922d1252dcb
---
 setuptools/command/sdist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index e0c4b7e51c..3614da5e7f 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,7 +4,7 @@
 from glob import glob
 import os, re, sys, pkg_resources
 from glob import glob
-from setuptools.svn_util import SVNEntries
+from setuptools.svn_utils import SVNEntries
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -62,7 +62,7 @@ def _default_revctrl(dirname=''):
 
 def externals_finder(dirname, filename):
     """Find any 'svn:externals' directories"""
-    for name in SVNEntries.load(dirname).get_external_dirs(filename):
+    for name in SVNEnteries.load(dirname).get_external_dirs(filename):
         yield joinpath(dirname, name)
 
 

From 67212a8d81a3694ee075f75f5041542f1655dab1 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 19:05:00 -0500
Subject: [PATCH 1285/8469] minor cleanups, added imports,

--HG--
extra : rebase_source : 3761997a8747b58e3d85bec53097116b9d6e166d
---
 setuptools/svn_utils.py | 118 +++++++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 50 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index dff1c4b0e4..34adc75e95 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,25 +1,37 @@
 import os
 import re
+import sys
+from distutils import log
+from xml.sax.saxutils import unescape
 
 #requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
 def get_entries_files(base, recurse=True):
-    for base,dirs,files in os.walk(os.curdir):
+    for base, dirs, _ in os.walk(os.curdir):
         if '.svn' not in dirs:
             dirs[:] = []
             continue    # no sense walking uncontrolled subdirs
         dirs.remove('.svn')
-        f = open(os.path.join(base,'.svn','entries'))
+        f = open(os.path.join(base, '.svn', 'entries'))
         yield f.read()
         f.close()
 
-#It would seem that svn info --xml and svn list --xml were fully supported by 1.3.x
-#the special casing of the entry files seem to start at 1.4.x, so if we check
-#for xml in entries and then fall back to the command line, this should catch everything.
+#It would seem that svn info --xml and svn list --xml were fully
+#supported by 1.3.x the special casing of the entry files seem to start at
+#1.4.x, so if we check for xml in entries and then fall back to the command
+#line, this should catch everything.
 
-#TODO add the text entry back, and make its use dependent on the non existence of svn?
+#subprocess is called several times with shell=(sys.platform=='win32')
+#see the follow for more information:
+#       http://bugs.python.org/issue8557
+#       http://stackoverflow.com/questions/5658622/
+#              python-subprocess-popen-environment-path
+
+
+#TODO add the text entry back, and make its use dependent on the
+#     non existence of svn?
 
 class SVNEntries(object):
     svn_tool_version = ''
@@ -30,12 +42,12 @@ def __init__(self, path, data):
         if not self.svn_tool_version:
             self.svn_tool_version = self.get_svn_tool_version()
 
-    @staticmethod 
+    @staticmethod
     def get_svn_tool_version():
-        proc = _Popen(['svn', 'propget', self.path], 
+        proc = _Popen(['svn', '--version', '--quiet'],
                       stdout=_PIPE, shell=(sys.platform=='win32'))
         data = unicode(proc.communicate()[0], encoding='utf-8')
-        if data is not not:
+        if data:
             return data.strip()
         else:
             return ''
@@ -55,13 +67,13 @@ def read(class_, file, path=None):
         if data.startswith('<?xml'):
             #entries were originally xml so pre-1.4.x
             return SVNEntriesXML(data, path)
-        else if path is None:
+        elif path is None:
             result = SVNEntriesText(data, path)
         else:
             class_.svn_tool_version = class_.get_svn_tool_version()
             result = SVNEntriesText(data, path)
             if result.is_valid():
-                return svnentriescmd(data, path)
+                return SVNEntriesCMD(data, path)
             else:
                 return result
 
@@ -78,11 +90,11 @@ def __get_externals_data(self, filename):
         for line in iter(f.readline, ''):    # can't use direct iter!
             parts = line.split()
             if len(parts)==2:
-                kind,length = parts
+                kind, length = parts
                 data = f.read(int(length))
-                if kind=='K' and data=='svn:externals':
+                if kind == 'K' and data == 'svn:externals':
                     found = True
-                elif kind=='V' and found:
+                elif kind == 'V' and found:
                     f.close()
                     break
         else:
@@ -95,19 +107,26 @@ def get_external_dirs(self, filename):
         if not data:
             return
 
-        data = [line.split() for line in data]
-
         # http://svnbook.red-bean.com/en/1.6/svn.advanced.externals.html
         #there appears to be three possible formats for externals since 1.5
         #but looks like we only need the local relative path names so it's just
-        #2 either the first column or the last (of 2 or 3)
-        index = -1
-        if all("://" in line[-1] or not line[-1] for line in data):
-            index = 0
+        #2 either the first column or the last (of 2 or 3) Looks like
+        #mix and matching is allowed.
+        data = list()
+        for line in data:
+            line = line.split()
+            if not line:
+                continue
+
+            #TODO: urlparse?
+            if "://" in line[-1] or ":\\\\" in line[-1]:
+                data.append(line[-1])
+            else:
+                data.append(line[0])
 
-        self.external_dirs = [line[index] for line in data if line[index]]
+        self.external_dirs = data
         self.get_external_dirs = self.__get_cached_external_dirs
-        return self.external_dirs                
+        return self.external_dirs
 
 class SVNEntriesText(SVNEntries):
     known_svn_versions = {
@@ -122,7 +141,7 @@ def __get_cached_sections(self):
     def get_sections(self):
         SECTION_DIVIDER = '\f\n' # or '\n\x0c\n'?
         sections = self.data.split(SECTION_DIVIDER)
-        sections = list(map(str.splitlines, sections))
+        sections = [section.splitlines() for section in sections]
         try:
             # remove the SVN version number from the first line
             svn_version = int(sections[0].pop(0))
@@ -136,7 +155,7 @@ def get_sections(self):
 
     def is_valid(self):
         return bool(self.get_sections())
-    
+
     def get_url(self):
         return self.get_sections()[0][4]
 
@@ -149,7 +168,7 @@ def parse_revision_numbers(self):
                 and section[revision_line_number]
             ]
         return rev_numbers
-    
+
     def get_undeleted_records(self):
         undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
         result = [
@@ -166,23 +185,24 @@ def is_valid(self):
 
     def get_url(self):
         "Get repository URL"
-        urlre = re.compile('url="([^"]+)"')
+        urlre = re.compile(r'url="([^"]+)"')
         return urlre.search(self.data).group(1)
 
     def parse_revision_numbers(self):
-        revre = re.compile('committed-rev="(\d+)"')
+        revre = re.compile(r'committed-rev="(\d+)"')
         return [
             int(m.group(1))
             for m in revre.finditer(self.data)
             if m.group(1)
             ]
-    
+
     def get_undeleted_records(self):
-        entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I)
+        entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")',
+                                     re.I)
         results = [
             unescape(match.group(1))
             for match in entries_pattern.finditer(self.data)
-            if m.group(1)
+            if match.group(1)
             ]
         return results
 
@@ -190,9 +210,9 @@ def get_undeleted_records(self):
 class SVNEntriesCMD(SVNEntries):
     entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
     entryre = re.compile(r'<entry.*?</entry>', re.M or re.I)
-    urlre = re.compile('<root>(.*?)</root>', re.I)
-    revre = re.compile('<commit\s+[^>]*revision="(\d+)"', re.I)
-    namere = re.compile('<name>(.*?)</name>', re.I)
+    urlre = re.compile(r'<root>(.*?)</root>', re.I)
+    revre = re.compile(r'<commit\s+[^>]*revision="(\d+)"', re.I)
+    namere = re.compile(r'<name>(.*?)</name>', re.I)
 
     def __get_cached_dir_data(self):
         return self.dir_data
@@ -204,9 +224,8 @@ def is_valid(self):
         return bool(self.get_dir_data())
 
     def get_dir_data(self):
-        #regard the shell argument, see: http://bugs.python.org/issue8557
-        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
-        proc = _Popen(['svn', 'info', '--xml', self.path], 
+        #regarding the shell argument, see: http://bugs.python.org/issue8557
+        proc = _Popen(['svn', 'info', '--xml', self.path],
                       stdout=_PIPE, shell=(sys.platform=='win32'))
         data =  unicode(proc.communicate()[0], encoding='utf-8')
         self.dir_data = self.entryre.findall(data)
@@ -214,39 +233,39 @@ def get_dir_data(self):
         return self.dir_data
 
     def get_entries(self):
-        #regard the shell argument, see: http://bugs.python.org/issue8557
-        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
-        proc = _Popen(['svn', 'list', '--xml', self.path], 
+        #regarding the shell argument, see: http://bugs.python.org/issue8557
+        proc = _Popen(['svn', 'list', '--xml', self.path],
                       stdout=_PIPE, shell=(sys.platform=='win32'))
         data =  unicode(proc.communicate()[0], encoding='utf-8')
-        self.dir_data = self.entryre.findall(data)
+        self.entries = self.entryre.findall(data)
         self.get_dir_data = self.__get_cached_dir_data
-        return self.dir_data
+        return self.entries
 
     def get_url(self):
         "Get repository URL"
-        return self.urlre.search(self.get_sections()[0]).group(1)
+        return self.urlre.search(self.get_entries()[0]).group(1)
 
     def parse_revision_numbers(self):
-        #NOTE: if one has recently committed, the new revision doesn't get updated until SVN update
+        #NOTE: if one has recently committed,
+        #      the new revision doesn't get updated until SVN update
         if not self.is_valid():
             return list()
         else:
             return [
-                int(m.group(1)) 
-                for entry in self.get_enteries()
+                int(m.group(1))
+                for entry in self.get_enries()
                 for m in self.revre.finditer(entry)
                 if m.group(1)
             ]
-    
+
     def get_undeleted_records(self):
         #NOTE: Need to parse entities?
         if not self.is_valid():
             return list()
         else:
             return [
-                m.group(1))
-                for entry in self.get_enteries()
+                m.group(1)
+                for entry in self.get_entries()
                 for m in self.namere.finditer(entry)
                 if m.group(1)
             ]
@@ -258,8 +277,7 @@ def __get_externals_data(self, filename):
             return ''
 
         #regard the shell argument, see: http://bugs.python.org/issue8557
-        #       and http://stackoverflow.com/questions/5658622/python-subprocess-popen-environment-path
-        proc = _Popen(['svn', 'propget', self.path], 
+        proc = _Popen(['svn', 'propget', self.path],
                   stdout=_PIPE, shell=(sys.platform=='win32'))
         try:
             return unicode(proc.communicate()[0], encoding='utf-8').splitlines()

From ec450c5e222fa97ff401ab80a650cbedf268f98c Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 19:06:22 -0500
Subject: [PATCH 1286/8469] Oops didn't return a value

--HG--
extra : rebase_source : aebdebb47c60311cf7f81c4c7238dd25b6b8cadb
---
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools.egg-info/requires.txt     |  10 +--
 setuptools/svn_utils.py              |   2 +-
 3 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 64d167676d..2965458969 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
-
-[distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-alias = setuptools.command.alias:alias
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-register = setuptools.command.register:register
-build_py = setuptools.command.build_py:build_py
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-egg_info = setuptools.command.egg_info:egg_info
-build_ext = setuptools.command.build_ext:build_ext
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..91d84d9ca8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 34adc75e95..52a1c07b80 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -68,7 +68,7 @@ def read(class_, file, path=None):
             #entries were originally xml so pre-1.4.x
             return SVNEntriesXML(data, path)
         elif path is None:
-            result = SVNEntriesText(data, path)
+            return SVNEntriesText(data, path)
         else:
             class_.svn_tool_version = class_.get_svn_tool_version()
             result = SVNEntriesText(data, path)

From c7bd44256ce9f77a54e22561405b06690a805e94 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 21:11:35 -0500
Subject: [PATCH 1287/8469] Finished some 1.7 tests, and updated the zip file
 to include the .svn dirs Several fixes to get the code to pass the tests

--HG--
extra : rebase_source : 76e13888a6efc871cc254076c7e58f201af24472
---
 setuptools/command/egg_info.py     |   2 +-
 setuptools/svn_utils.py            |  69 +++++++++++++----------
 setuptools/tests/svn17_example.zip | Bin 1656 -> 19342 bytes
 setuptools/tests/test_svn.py       |  85 +++++++++++++++++------------
 4 files changed, 92 insertions(+), 64 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 4332111989..9d30b12541 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -231,7 +231,7 @@ def get_svn_revision():
                 dirs[:] = []
                 continue
 
-            localrev = entries.parse_revsion()
+            localrev = entries.parse_revision()
             dirurl = entries.get_url()
 
             if base==os.curdir:
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 52a1c07b80..7d30d32258 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -45,7 +45,8 @@ def __init__(self, path, data):
     @staticmethod
     def get_svn_tool_version():
         proc = _Popen(['svn', '--version', '--quiet'],
-                      stdout=_PIPE, shell=(sys.platform=='win32'))
+                      stdout=_PIPE, stderr=_PIPE,
+                      shell=(sys.platform=='win32'))
         data = unicode(proc.communicate()[0], encoding='utf-8')
         if data:
             return data.strip()
@@ -56,7 +57,7 @@ def get_svn_tool_version():
     def load_dir(class_, base):
         filename = os.path.join(base, '.svn', 'entries')
         f = open(filename)
-        result = SVNEntries.read(f, None)
+        result = SVNEntries.read(f, base)
         f.close()
         return result
 
@@ -66,16 +67,15 @@ def read(class_, file, path=None):
 
         if data.startswith('<?xml'):
             #entries were originally xml so pre-1.4.x
-            return SVNEntriesXML(data, path)
+            return SVNEntriesXML(path, data)
         elif path is None:
-            return SVNEntriesText(data, path)
+            return SVNEntriesText(path, data)
         else:
-            class_.svn_tool_version = class_.get_svn_tool_version()
-            result = SVNEntriesText(data, path)
+            result = SVNEntriesText(path, data)
             if result.is_valid():
-                return SVNEntriesCMD(data, path)
-            else:
                 return result
+            else:
+                return SVNEntriesCMD(path, data)
 
     def parse_revision(self):
         all_revs = self.parse_revision_numbers() + [0]
@@ -84,8 +84,11 @@ def parse_revision(self):
     def __get_cached_external_dirs(self):
         return self.external_dirs
 
-    def __get_externals_data(self, filename):
+    def _get_externals_data(self, filename):
         found = False
+        if not os.path.isfile(filename):
+            return
+
         f = open(filename,'rt')
         for line in iter(f.readline, ''):    # can't use direct iter!
             parts = line.split()
@@ -102,7 +105,9 @@ def __get_externals_data(self, filename):
             return ''
 
     def get_external_dirs(self, filename):
-        data = self.__get_externals_data(filename)
+        filename = os.path.join(self.path, '.svn', filename)
+
+        data = self._get_externals_data(filename)
 
         if not data:
             return
@@ -112,7 +117,7 @@ def get_external_dirs(self, filename):
         #but looks like we only need the local relative path names so it's just
         #2 either the first column or the last (of 2 or 3) Looks like
         #mix and matching is allowed.
-        data = list()
+        externals = list()
         for line in data:
             line = line.split()
             if not line:
@@ -120,11 +125,11 @@ def get_external_dirs(self, filename):
 
             #TODO: urlparse?
             if "://" in line[-1] or ":\\\\" in line[-1]:
-                data.append(line[-1])
+                externals.append(line[0])
             else:
-                data.append(line[0])
+                externals.append(line[-1])
 
-        self.external_dirs = data
+        self.external_dirs = externals
         self.get_external_dirs = self.__get_cached_external_dirs
         return self.external_dirs
 
@@ -139,16 +144,20 @@ def __get_cached_sections(self):
         return self.sections
 
     def get_sections(self):
-        SECTION_DIVIDER = '\f\n' # or '\n\x0c\n'?
-        sections = self.data.split(SECTION_DIVIDER)
-        sections = [section.splitlines() for section in sections]
+        # remove the SVN version number from the first line
+        svn_version, _, sections = self.data.partition("\n")
         try:
-            # remove the SVN version number from the first line
-            svn_version = int(sections[0].pop(0))
+            svn_version = int(svn_version)
             if not svn_version in self.known_svn_versions.values():
-                log.warn("Unknown subversion verson %d", svn_version)
+                log.warn("SVNEntriesText: Unknown subversion verson %d."
+                         "  Maybe another parser will work,", svn_version)
         except ValueError:
             return
+
+        SECTION_DIVIDER = '\f\n' # or '\n\x0c\n'?
+        sections = sections.split(SECTION_DIVIDER)
+        sections = [section.splitlines() for section in sections if section]
+
         self.sections = sections
         self.get_sections = self.__get_cached_sections
         return self.sections
@@ -209,8 +218,8 @@ def get_undeleted_records(self):
 
 class SVNEntriesCMD(SVNEntries):
     entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
-    entryre = re.compile(r'<entry.*?</entry>', re.M or re.I)
-    urlre = re.compile(r'<root>(.*?)</root>', re.I)
+    entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
+    urlre = re.compile(r'<url>(.*?)</url>', re.I)
     revre = re.compile(r'<commit\s+[^>]*revision="(\d+)"', re.I)
     namere = re.compile(r'<name>(.*?)</name>', re.I)
 
@@ -238,12 +247,12 @@ def get_entries(self):
                       stdout=_PIPE, shell=(sys.platform=='win32'))
         data =  unicode(proc.communicate()[0], encoding='utf-8')
         self.entries = self.entryre.findall(data)
-        self.get_dir_data = self.__get_cached_dir_data
+        self.get_entries = self.__get_cached_entries
         return self.entries
 
     def get_url(self):
         "Get repository URL"
-        return self.urlre.search(self.get_entries()[0]).group(1)
+        return self.urlre.search(self.get_dir_data()[0]).group(1)
 
     def parse_revision_numbers(self):
         #NOTE: if one has recently committed,
@@ -253,7 +262,7 @@ def parse_revision_numbers(self):
         else:
             return [
                 int(m.group(1))
-                for entry in self.get_enries()
+                for entry in self.get_entries()
                 for m in self.revre.finditer(entry)
                 if m.group(1)
             ]
@@ -270,16 +279,18 @@ def get_undeleted_records(self):
                 if m.group(1)
             ]
 
-    def __get_externals_data(self, filename):
+    def _get_externals_data(self, filename):
 
         #othewise will be called twice.
-        if filename.lower() != 'dir-props':
+        if os.path.basename(filename).lower() != 'dir-props':
             return ''
 
         #regard the shell argument, see: http://bugs.python.org/issue8557
-        proc = _Popen(['svn', 'propget', self.path],
+        proc = _Popen(['svn', 'propget', 'svn:externals', self.path],
                   stdout=_PIPE, shell=(sys.platform=='win32'))
         try:
-            return unicode(proc.communicate()[0], encoding='utf-8').splitlines()
+            lines = unicode(proc.communicate()[0], encoding='utf-8')
+            lines = [line for line in lines.splitlines() if line]
+            return lines
         except ValueError:
             return ''
diff --git a/setuptools/tests/svn17_example.zip b/setuptools/tests/svn17_example.zip
index d208f42c052187c23ff5c59870948278194c241c..cfabd2b2d4cb975d4bf160f5bd991e7bf28f8ec8 100644
GIT binary patch
literal 19342
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
LXzDj{fxrD9{;(+L

delta 34
kcmeC1&iI38!waU(hpcLtMOfJwfPe=GYnT}ro-u)V0JoF}kpKVy

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 90f213b475..1a41e4271c 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -3,18 +3,20 @@
 
 
 import os
+import zipfile
 import sys
 import tempfile
 import unittest
 import shutil
 import stat
 
-import setuptools.command.egg_info as egg_info
+from setuptools import svn_utils
+
 #requires python >= 2.4
 from subprocess import call as _call
 
 def _remove_dir(target):
-    
+
     #on windows this seems to a problem
     for dir_path, dirs, files in os.walk(target):
         os.chmod(dir_path, stat.S_IWRITE)
@@ -22,50 +24,65 @@ def _remove_dir(target):
             os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
     shutil.rmtree(target)
 
-class TestEmptySvn(unittest.TestCase):
+class TestSvnVersion(unittest.TestCase):
 
+    def test_no_svn_found(self):
+        old_path = os.environ['path']
+        os.environ['path'] = ''
+        try:
+            version = svn_utils.SVNEntries.get_svn_tool_version()
+            self.assertEqual(version, '')
+        finally:
+            os.environ['path'] = old_path
 
+    def test_svn_should_exist(self):
+        version = svn_utils.SVNEntries.get_svn_tool_version()
+        self.assertNotEqual(version, '')
 
-    def setUp(self):
-        self.temp_dir = tempfile.mkdtemp()
-        self.old_cwd = os.getcwd()
-        os.chdir(self.temp_dir)
-        #apparently there is a standing bug in python about having
-        #to use shell=True in windows to get a path search.
-        if _call(['svnadmin', 'create', 'svn'], shell=(sys.platform == 'win32')):
-            raise 'Failed to create SVN repository'
 
-        self.svnrepo = os.path.join(self.temp_dir, 'svn')
+class TestSvn_1_7(unittest.TestCase):
 
-        if _call(['svn', 'checkout', 'file:///' + self.svnrepo.replace('\\','/'), 'co']):
-            os.chdir(self.old_cwd)
-            _remove_dir(self.temp_dir)
-            raise 'Failed to checkout SVN repository'
+    def setUp(self):
+        self.temp_dir = tempfile.mkdtemp()
+        zip_file, source, target = [None, None, None]
+        try:
+            zip_file = zipfile.ZipFile(os.path.join('setuptools', 'tests',
+                                                    'svn17_example.zip'))
+            for files in zip_file.namelist():
+                zip_file.extract(files, self.temp_dir)
+        finally:
+            if zip_file:
+                zip_file.close()
+            del zip_file
 
-        os.chdir(os.path.join(self.temp_dir, 'co'))
+        self.old_cwd = os.getcwd()
+        os.chdir(os.path.join(self.temp_dir, 'svn17_example'))
 
     def tearDown(self):
         os.chdir(self.old_cwd)
         _remove_dir(self.temp_dir)
 
-    def test_can_get_revision_empty(self):
-        """Check that svn revision can be retrieved from an working set on an empty repository."""
-        self.assertEquals('0', egg_info._get_svn_revision())
-
-    def test_can_get_revision_single_commit(self):
-        """Check that svn revision can be retrieved from an working set on an empty repository."""
-    
-        open('README', 'w').close()
-        exitcode = _call(['svn', 'add', 'README'], shell=(sys.platform == 'win32'))
-        self.assertEqual(0, exitcode)
-        
-        exitcode = _call(['svn', 'commit', '-m', '"README added"'], shell=(sys.platform == 'win32'))
-        self.assertEqual(0, exitcode)
-
-        exitcode = _call(['svn', 'update'], shell=(sys.platform == 'win32'))
-        self.assertEqual(0, exitcode)
+    def test_svnentrycmd_is_valid(self):
+        entries = svn_utils.SVNEntries.load_dir('.')
+        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
+        self.assertTrue(entries.is_valid())
+
+    def test_svnentrycmd_is_valid(self):
+        entries = svn_utils.SVNEntries.load_dir('.')
+        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
+        self.assertTrue(entries.is_valid())
+        self.assertEqual(entries.get_url(),
+                         'file:///C:/development/svn_example/repo1')
+
+    def test_svnentrycmd_enteries(self):
+        entries = svn_utils.SVNEntries.load_dir('.')
+        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
+        self.assertEqual(entries.parse_revision(), 3)
+        self.assertEqual(set(entries.get_undeleted_records()),
+                         set([u'readme.txt', u'other']))
+        self.assertEqual(set(entries.get_external_dirs('dir-props')),
+            set([u'third_party3', u'third_party2', u'third_party']))
 
-        self.assertEquals('1', egg_info._get_svn_revision())
 
 
 def test_suite():

From bac43dea180fde8c14b990ee1117fba56b9ab435 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sun, 30 Jun 2013 22:02:20 -0500
Subject: [PATCH 1288/8469] py3 fixes

--HG--
extra : rebase_source : 29629f51bacee1ae8394c559e4440dafcb9179d1
---
 setuptools.egg-info/entry_points.txt | 96 ++++++++++++++--------------
 setuptools/svn_utils.py              | 41 ++++++------
 2 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2965458969..e5b7443aec 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
 [console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
 dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
 extras_require = setuptools.dist:check_extras
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
 exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
+use_2to3 = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+namespace_packages = setuptools.dist:check_nsp
 convert_2to3_doctests = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
 tests_require = setuptools.dist:check_requirements
+include_package_data = setuptools.dist:assert_bool
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[distutils.commands]
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_ext = setuptools.command.build_ext:build_ext
+install_lib = setuptools.command.install_lib:install_lib
+develop = setuptools.command.develop:develop
+sdist = setuptools.command.sdist:sdist
+saveopts = setuptools.command.saveopts:saveopts
+easy_install = setuptools.command.easy_install:easy_install
+rotate = setuptools.command.rotate:rotate
+install = setuptools.command.install:install
+alias = setuptools.command.alias:alias
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+register = setuptools.command.register:register
+egg_info = setuptools.command.egg_info:egg_info
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+test = setuptools.command.test:test
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 7d30d32258..86fed4d1b2 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,6 +1,7 @@
 import os
 import re
 import sys
+import codecs
 from distutils import log
 from xml.sax.saxutils import unescape
 
@@ -8,15 +9,6 @@
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
-def get_entries_files(base, recurse=True):
-    for base, dirs, _ in os.walk(os.curdir):
-        if '.svn' not in dirs:
-            dirs[:] = []
-            continue    # no sense walking uncontrolled subdirs
-        dirs.remove('.svn')
-        f = open(os.path.join(base, '.svn', 'entries'))
-        yield f.read()
-        f.close()
 
 #It would seem that svn info --xml and svn list --xml were fully
 #supported by 1.3.x the special casing of the entry files seem to start at
@@ -28,7 +20,19 @@ def get_entries_files(base, recurse=True):
 #       http://bugs.python.org/issue8557
 #       http://stackoverflow.com/questions/5658622/
 #              python-subprocess-popen-environment-path
+def _run_command(args, stdout=_PIPE, stderr=_PIPE):
+        #regarding the shell argument, see: http://bugs.python.org/issue8557
+        proc = _Popen(args, stdout=stdout, stderr=stderr,
+                      shell=(sys.platform=='win32'))
 
+        data = proc.communicate()[0]
+        #TODO: this is probably NOT always utf-8
+        try:
+            data = unicode(data, encoding='utf-8')
+        except NameError:
+            data = str(data, encoding='utf-8')
+
+        return proc.returncode, data
 
 #TODO add the text entry back, and make its use dependent on the
 #     non existence of svn?
@@ -44,10 +48,7 @@ def __init__(self, path, data):
 
     @staticmethod
     def get_svn_tool_version():
-        proc = _Popen(['svn', '--version', '--quiet'],
-                      stdout=_PIPE, stderr=_PIPE,
-                      shell=(sys.platform=='win32'))
-        data = unicode(proc.communicate()[0], encoding='utf-8')
+        _, data = _run_command(['svn', '--version', '--quiet'])
         if data:
             return data.strip()
         else:
@@ -234,18 +235,14 @@ def is_valid(self):
 
     def get_dir_data(self):
         #regarding the shell argument, see: http://bugs.python.org/issue8557
-        proc = _Popen(['svn', 'info', '--xml', self.path],
-                      stdout=_PIPE, shell=(sys.platform=='win32'))
-        data =  unicode(proc.communicate()[0], encoding='utf-8')
+        _, data = _run_command(['svn', 'info', '--xml', self.path])
         self.dir_data = self.entryre.findall(data)
         self.get_dir_data = self.__get_cached_dir_data
         return self.dir_data
 
     def get_entries(self):
         #regarding the shell argument, see: http://bugs.python.org/issue8557
-        proc = _Popen(['svn', 'list', '--xml', self.path],
-                      stdout=_PIPE, shell=(sys.platform=='win32'))
-        data =  unicode(proc.communicate()[0], encoding='utf-8')
+        _, data = _run_command(['svn', 'list', '--xml', self.path])
         self.entries = self.entryre.findall(data)
         self.get_entries = self.__get_cached_entries
         return self.entries
@@ -285,11 +282,9 @@ def _get_externals_data(self, filename):
         if os.path.basename(filename).lower() != 'dir-props':
             return ''
 
-        #regard the shell argument, see: http://bugs.python.org/issue8557
-        proc = _Popen(['svn', 'propget', 'svn:externals', self.path],
-                  stdout=_PIPE, shell=(sys.platform=='win32'))
         try:
-            lines = unicode(proc.communicate()[0], encoding='utf-8')
+            _, lines = _run_command(['svn',
+                                     'propget', 'svn:externals', self.path])
             lines = [line for line in lines.splitlines() if line]
             return lines
         except ValueError:

From 4b83e45e7990de017b4982c963752dac0015e78c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:33:29 -0400
Subject: [PATCH 1289/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a2084ddbd0..587e336c51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.6
+-----
+
+* Distribute #375: Repair AttributeError created in last release.
+
 -----
 0.7.5
 -----

From a6a5e085c5161eff974d4838a1d28c87af0305da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:33:54 -0400
Subject: [PATCH 1290/8469] Added tag 0.7.6 for changeset 48d3d26cbea6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 04e46e5cc8..b8bea36e42 100644
--- a/.hgtags
+++ b/.hgtags
@@ -67,3 +67,4 @@ d212e48e0cef689acba57ed017289c027660b23c 0.7.3
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
+48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6

From b69b0368a7201f5b21e8d4fd0fb1379db87090c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:34:20 -0400
Subject: [PATCH 1291/8469] Bumped to 0.7.7 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index bb57ea7674..c3d5b3c640 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.6/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.6$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.7$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 0cae162181..a90d886676 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.6'
+version = '0.7.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.6'
+release = '0.7.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index f68388f11a..62bc0361ab 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.6"
+DEFAULT_VERSION = "0.7.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 46f32bbc9a..a4f72f7251 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.6'
+VERSION = '0.7.7'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index f2bd1fd526..9b1c67f70f 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.6"
+VERSION = "0.7.7"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 5920170ba3..e93245abec 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.6'
+__version__ = '0.7.7'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 50b0b7602fcda151cbf4ddfdade6abef96c9dd3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:44:43 -0400
Subject: [PATCH 1292/8469] Added tag 0.8b4 for changeset 5b3c7981a02b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 00e2bade8c..a9c0a4ccf7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -71,3 +71,4 @@ dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 8af9839a76407eebf3610fcd3e7973f1625abaa2 0.8b3
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
+5b3c7981a02b4a86af1b10ae16492899b515d485 0.8b4

From b487b362c4c93cc90f0ad783040679ac2cebfdd9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:50:40 -0400
Subject: [PATCH 1293/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 31d6bc89de..2ea4ef4233 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.7
+-----
+
+* Distribute #375: Repair AttributeError created in last release (redo).
+
 -----
 0.7.6
 -----

From 1bc7b7b3dd81a74d4be2bc0c4e95ba8d29dc58d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:55:26 -0400
Subject: [PATCH 1294/8469] Issue #30: Added test for get_cache_path (but it
 doesn't yet get run)

---
 CHANGES.txt                 | 1 +
 tests/test_pkg_resources.py | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2ea4ef4233..b9a9e9f032 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 -----
 
 * Distribute #375: Repair AttributeError created in last release (redo).
+* Issue #30: Added test for get_cache_path.
 
 -----
 0.7.6
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 7009b4abc0..6e4a93482a 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -59,3 +59,11 @@ def test_resource_filename_rewrites_on_change(self):
 		f = open(filename)
 		assert f.read() == 'hello, world!'
 		manager.cleanup_resources()
+
+class TestResourceManager(object):
+	def test_get_cache_path(self):
+		mgr = pkg_resources.ResourceManager()
+		path = mgr.get_cache_path('foo')
+		type_ = str(type(path))
+		message = "Unexpected type from get_cache_path: " + type_
+		assert isinstance(path, (unicode, str)), message

From 178a4ab5c3af80c077572fd01d748084b35844e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:00:35 -0400
Subject: [PATCH 1295/8469] Patched test so it can be run on Python 3

---
 tests/test_pkg_resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 6e4a93482a..f32561735c 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -5,6 +5,11 @@
 
 import pkg_resources
 
+try:
+	unicode
+except NameError:
+	unicode = str
+
 class EggRemover(unicode):
 	def __call__(self):
 		if self in sys.path:

From d9b32bd186ce6804fca2df9ece07c2fabb1737e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:01:19 -0400
Subject: [PATCH 1296/8469] Added tag 0.7.7 for changeset 1506fa538fff

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 19abdaf7c5..d3012fe842 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,3 +69,4 @@ dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
+1506fa538fff01e70424530a32a44e070720cf3c 0.7.7

From 83c974c56ebc4689171913da1a6af3249b56ec6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:01:32 -0400
Subject: [PATCH 1297/8469] Bumped to 0.7.8 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index c3d5b3c640..77acd2bac1 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.7/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.7$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.8$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index a90d886676..8bbf4bea88 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.7'
+version = '0.7.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.7'
+release = '0.7.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 62bc0361ab..6baa9b9921 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.7"
+DEFAULT_VERSION = "0.7.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index a4f72f7251..61e6862d88 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.7'
+VERSION = '0.7.8'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index 9b1c67f70f..a4d6d55633 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.7"
+VERSION = "0.7.8"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index e93245abec..104ea06498 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.7'
+__version__ = '0.7.8'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 78c3e6b7b3a12d74416f43995d50b04bdb817f0b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:08:16 -0400
Subject: [PATCH 1298/8469] Fix test failure

---
 tests/test_pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 398f1acc04..dfa27120e8 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -56,7 +56,7 @@ def test_resource_filename_rewrites_on_change(self):
         zp = pkg_resources.ZipProvider(mod)
         filename = zp.get_resource_filename(manager, 'data.dat')
         assert os.stat(filename).st_mtime == 1368379500
-        f = open(filename, 'wb')
+        f = open(filename, 'w')
         f.write('hello, world?')
         f.close()
         os.utime(filename, (1368379500, 1368379500))

From e0764d14a608fa8c2f420ea9f843072987a18a16 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 12:24:57 -0400
Subject: [PATCH 1299/8469] Added tag 0.8b5 for changeset 567939379497

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 426fff2ede..0bfb4aca92 100644
--- a/.hgtags
+++ b/.hgtags
@@ -74,3 +74,4 @@ ee2c967017024197b38e39ced852808265387a4b 0.6.47
 5b3c7981a02b4a86af1b10ae16492899b515d485 0.8b4
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
+5679393794978a1d3e1e087472b8a0fdf3d8423c 0.8b5

From ed30b72b2d7a36ca72cf5aedf84d771bbfbeef81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Jul 2013 14:16:40 -0400
Subject: [PATCH 1300/8469] No need to thunk here - the preferred module is
 already imported above

---
 pkg_resources.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ec1ba1fb4a..74ab231ddb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1972,15 +1972,6 @@ def find_in_zip(importer, path_item, only=False):
 
 register_finder(zipimport.zipimporter, find_in_zip)
 
-def StringIO(*args, **kw):
-    """Thunk to load the real StringIO on demand"""
-    global StringIO
-    try:
-        from cStringIO import StringIO
-    except ImportError:
-        from io import StringIO
-    return StringIO(*args,**kw)
-
 def find_nothing(importer, path_item, only=False):
     return ()
 register_finder(object,find_nothing)

From 1cd926faeaf2c6206200317f328f16f9503879a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Jul 2013 14:21:23 -0400
Subject: [PATCH 1301/8469] Issue #32: Fixed TypeError in get_resource_stream
 on zipped eggs

---
 pkg_resources.py                     |  6 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 ++---
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 74ab231ddb..bbc2f09a10 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -28,7 +28,7 @@
 try:
     basestring
     next = lambda o: o.next()
-    from cStringIO import StringIO
+    from cStringIO import StringIO as BytesIO
     def exec_(code, globs=None, locs=None):
         if globs is None:
             frame = sys._getframe(1)
@@ -41,7 +41,7 @@ def exec_(code, globs=None, locs=None):
         exec("""exec code in globs, locs""")
 except NameError:
     basestring = str
-    from io import StringIO
+    from io import BytesIO
     exec_ = eval("exec")
     def execfile(fn, globs=None, locs=None):
         if globs is None:
@@ -1402,7 +1402,7 @@ def get_resource_filename(self, manager, resource_name):
         return self._fn(self.module_path, resource_name)
 
     def get_resource_stream(self, manager, resource_name):
-        return StringIO(self.get_resource_string(manager, resource_name))
+        return BytesIO(self.get_resource_string(manager, resource_name))
 
     def get_resource_string(self, manager, resource_name):
         return self._get(self._fn(self.module_path, resource_name))
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 64d167676d..24461149e1 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
-
 [distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
+build_py = setuptools.command.build_py:build_py
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-alias = setuptools.command.alias:alias
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
 register = setuptools.command.register:register
-build_py = setuptools.command.build_py:build_py
 install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
+saveopts = setuptools.command.saveopts:saveopts
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install = setuptools.command.install:install
+setopt = setuptools.command.setopt:setopt
+easy_install = setuptools.command.easy_install:easy_install
 egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_lib = setuptools.command.install_lib:install_lib
+test = setuptools.command.test:test
+rotate = setuptools.command.rotate:rotate
 
 [egg_info.writers]
 requires.txt = setuptools.command.egg_info:write_requirements
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
+entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
+eager_resources = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+exclude_package_data = setuptools.dist:check_package_data
+extras_require = setuptools.dist:check_extras
+test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..2f2a364fa2 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file

From 6ac7256ce1b286f9870ea203308333666fa552bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Jul 2013 14:26:25 -0400
Subject: [PATCH 1302/8469] Added tag 0.8b6 for changeset 26f59ec0f0f6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0bfb4aca92..816334d2c0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,4 @@ ee2c967017024197b38e39ced852808265387a4b 0.6.47
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
 5679393794978a1d3e1e087472b8a0fdf3d8423c 0.8b5
+26f59ec0f0f69714d28a891aaad048e3b9fcd6f7 0.8b6

From a40c11b0e8c045bc5b1f6e83e1014f3d6b94fe66 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 09:55:43 -0500
Subject: [PATCH 1303/8469] If using a command, we can query the working copy
 version directly.

--HG--
extra : rebase_source : e329ddea4345c4acd90997e8994bd3715926cfbb
---
 setuptools/svn_utils.py      | 52 +++++++++++++++++++++++++++---------
 setuptools/tests/test_svn.py |  2 +-
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 86fed4d1b2..c052f67147 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -216,14 +216,40 @@ def get_undeleted_records(self):
             ]
         return results
 
+import xml.dom.pulldom
 
 class SVNEntriesCMD(SVNEntries):
+    #<info>
+    #  <entry path=''      //Entry Path
+    #         revision=''
+    #         kind=''>
+    #    <url>
+    #    <repository>
+    #       <root>...</root>
+    #       <uuid>...</uuid>
+    #    </repository>
+    #    <wc-info>
+    #       ...
+    #    </wc-info>
+    #    <commit revision=''>
+    #       ...
+    #    </commit>
+    #  </entry>
+    #  ...
+    #</info>
     entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
     entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
     urlre = re.compile(r'<url>(.*?)</url>', re.I)
     revre = re.compile(r'<commit\s+[^>]*revision="(\d+)"', re.I)
     namere = re.compile(r'<name>(.*?)</name>', re.I)
 
+    #svnversion return values (previous implementations return max revision)
+    #   4123:4168     mixed revision working copy
+    #   4168M         modified working copy
+    #   4123S         switched working copy
+    #   4123:4168MS   mixed revision, modified, switched working copy
+    svnverre = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
+
     def __get_cached_dir_data(self):
         return self.dir_data
 
@@ -251,18 +277,20 @@ def get_url(self):
         "Get repository URL"
         return self.urlre.search(self.get_dir_data()[0]).group(1)
 
-    def parse_revision_numbers(self):
-        #NOTE: if one has recently committed,
-        #      the new revision doesn't get updated until SVN update
-        if not self.is_valid():
-            return list()
-        else:
-            return [
-                int(m.group(1))
-                for entry in self.get_entries()
-                for m in self.revre.finditer(entry)
-                if m.group(1)
-            ]
+
+    def parse_revision(self):
+        _, data = _run_command(['svnversion', self.path])
+        parsed = self.svnverre.match(data)
+        if parsed:
+            log.warn('Parsed!')
+            try:
+                #No max needed this command summarizes working copy since 1.0
+                return int(parsed.group(2))
+            except ValueError:
+                #This should only happen if the revision is WAY too big.
+                pass
+        log.warn(repr(data))
+        return 0
 
     def get_undeleted_records(self):
         #NOTE: Need to parse entities?
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 1a41e4271c..b6950ea3fe 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -77,7 +77,7 @@ def test_svnentrycmd_is_valid(self):
     def test_svnentrycmd_enteries(self):
         entries = svn_utils.SVNEntries.load_dir('.')
         self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
-        self.assertEqual(entries.parse_revision(), 3)
+        self.assertEqual(entries.parse_revision(), 4)
         self.assertEqual(set(entries.get_undeleted_records()),
                          set([u'readme.txt', u'other']))
         self.assertEqual(set(entries.get_external_dirs('dir-props')),

From 6e9b5f8ca3b25013702055e1ffcec2c9ac074933 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 10:01:05 -0500
Subject: [PATCH 1304/8469] If using a command, we can query the working copy
 version directly.

--HG--
extra : rebase_source : 0990530647692240d7b7126df1e1cdd5ae463ebb
---
 setuptools/svn_utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index c052f67147..bbf10da7bc 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -277,6 +277,8 @@ def get_url(self):
         "Get repository URL"
         return self.urlre.search(self.get_dir_data()[0]).group(1)
 
+    def __get_cached_revision(self):
+        return self.revision
 
     def parse_revision(self):
         _, data = _run_command(['svnversion', self.path])
@@ -285,11 +287,12 @@ def parse_revision(self):
             log.warn('Parsed!')
             try:
                 #No max needed this command summarizes working copy since 1.0
-                return int(parsed.group(2))
+                self.revision = int(parsed.group(2))
+                self.parse_revision = self.__get_cached_revision
+                return self.revision
             except ValueError:
                 #This should only happen if the revision is WAY too big.
                 pass
-        log.warn(repr(data))
         return 0
 
     def get_undeleted_records(self):

From 59532e4f0735aaf782119b5e9f353ab17a2b06ad Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 10:01:55 -0500
Subject: [PATCH 1305/8469] Remove some temporary logging

--HG--
extra : rebase_source : f613c3c009ab69ab51c7de82b49ffaef63ea7461
---
 setuptools/svn_utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index bbf10da7bc..e46e5ab604 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -284,7 +284,6 @@ def parse_revision(self):
         _, data = _run_command(['svnversion', self.path])
         parsed = self.svnverre.match(data)
         if parsed:
-            log.warn('Parsed!')
             try:
                 #No max needed this command summarizes working copy since 1.0
                 self.revision = int(parsed.group(2))

From 6937c39c7f21cd6cda8271092b7672712e012674 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 11:06:35 -0500
Subject: [PATCH 1306/8469] get_url now uses pulldom

--HG--
extra : rebase_source : 233926ea03e438c2e86546c62e555a007654cacd
---
 setuptools/svn_utils.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index e46e5ab604..57cf6849fc 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -4,12 +4,12 @@
 import codecs
 from distutils import log
 from xml.sax.saxutils import unescape
+import xml.dom.pulldom
 
 #requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
-
 #It would seem that svn info --xml and svn list --xml were fully
 #supported by 1.3.x the special casing of the entry files seem to start at
 #1.4.x, so if we check for xml in entries and then fall back to the command
@@ -180,6 +180,7 @@ def parse_revision_numbers(self):
         return rev_numbers
 
     def get_undeleted_records(self):
+        #Note for self this skip and only returns the children
         undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
         result = [
             section[0]
@@ -239,8 +240,6 @@ class SVNEntriesCMD(SVNEntries):
     #</info>
     entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
     entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
-    urlre = re.compile(r'<url>(.*?)</url>', re.I)
-    revre = re.compile(r'<commit\s+[^>]*revision="(\d+)"', re.I)
     namere = re.compile(r'<name>(.*?)</name>', re.I)
 
     #svnversion return values (previous implementations return max revision)
@@ -257,13 +256,22 @@ def __get_cached_entries(self):
         return self.entries
 
     def is_valid(self):
-        return bool(self.get_dir_data())
+        return self.get_dir_data() is not None
 
     def get_dir_data(self):
-        #regarding the shell argument, see: http://bugs.python.org/issue8557
+        #This returns the info entry for the directory ONLY
         _, data = _run_command(['svn', 'info', '--xml', self.path])
-        self.dir_data = self.entryre.findall(data)
-        self.get_dir_data = self.__get_cached_dir_data
+
+        doc = xml.dom.pulldom.parseString(data)
+        self.dir_data = None
+        for event, node in doc:
+            if event=='START_ELEMENT' and node.nodeName=='entry':
+                doc.expandNode(node)
+                self.dir_data = node
+                break
+
+        if self.dir_data:
+            self.get_dir_data = self.__get_cached_dir_data
         return self.dir_data
 
     def get_entries(self):
@@ -273,9 +281,14 @@ def get_entries(self):
         self.get_entries = self.__get_cached_entries
         return self.entries
 
+
+
     def get_url(self):
         "Get repository URL"
-        return self.urlre.search(self.get_dir_data()[0]).group(1)
+        url_element = self.get_dir_data().getElementsByTagName("url")[0]
+        url_text = [t.nodeValue for t in url_element.childNodes
+                                if t.nodeType == t.TEXT_NODE]
+        return "".join(url_text)
 
     def __get_cached_revision(self):
         return self.revision

From b46fff3b028fb1c0c423eddd6d53ca9f70a10bb0 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 11:20:20 -0500
Subject: [PATCH 1307/8469] get_svn_method now direectly called
 svn_utils.parse_revision

--HG--
extra : rebase_source : 4af53ce7fcf4d69c0d65800e57fabec7d081ce35
---
 setuptools/command/egg_info.py | 26 +--------------------
 setuptools/svn_utils.py        | 41 ++++++++++++++++++----------------
 setuptools/tests/test_svn.py   |  4 ++++
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9d30b12541..345ec8aec0 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -217,31 +217,7 @@ def tags(self):
 
     @staticmethod
     def get_svn_revision():
-        revision = 0
-
-        for base,dirs,files in os.walk(os.curdir):
-            if '.svn' not in dirs:
-                dirs[:] = []
-                continue    # no sense walking uncontrolled subdirs
-            dirs.remove('.svn')
-
-            entries = svn_utils.SVNEntries.load_dir(base)
-            if not entries.is_valid:
-                log.warn(" get_svn_revision: Cannot determine how to read enteries.")
-                dirs[:] = []
-                continue
-
-            localrev = entries.parse_revision()
-            dirurl = entries.get_url()
-
-            if base==os.curdir:
-                base_url = dirurl+'/'   # save the root url
-            elif not dirurl.startswith(base_url):
-                dirs[:] = []
-                continue    # not part of the same svn tree, skip it
-            revision = max(revision, localrev)
-
-        return str(revision or get_pkg_info_revision())
+        return str(svn_utils.parse_revision(os.curdir))
 
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 57cf6849fc..e45f05bca6 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -34,6 +34,25 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE):
 
         return proc.returncode, data
 
+#svnversion return values (previous implementations return max revision)
+#   4123:4168     mixed revision working copy
+#   4168M         modified working copy
+#   4123S         switched working copy
+#   4123:4168MS   mixed revision, modified, switched working copy
+_SVN_VER_RE = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
+
+def parse_revision(path):
+    _, data = _run_command(['svnversion', path])
+    parsed = _SVN_VER_RE.match(data)
+    if parsed:
+        try:
+            #No max needed this command summarizes working copy since 1.0
+            return int(parsed.group(2))
+        except ValueError:
+            #This should only happen if the revision is WAY too big.
+            pass
+    return 0
+
 #TODO add the text entry back, and make its use dependent on the
 #     non existence of svn?
 
@@ -242,13 +261,6 @@ class SVNEntriesCMD(SVNEntries):
     entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
     namere = re.compile(r'<name>(.*?)</name>', re.I)
 
-    #svnversion return values (previous implementations return max revision)
-    #   4123:4168     mixed revision working copy
-    #   4168M         modified working copy
-    #   4123S         switched working copy
-    #   4123:4168MS   mixed revision, modified, switched working copy
-    svnverre = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
-
     def __get_cached_dir_data(self):
         return self.dir_data
 
@@ -294,18 +306,9 @@ def __get_cached_revision(self):
         return self.revision
 
     def parse_revision(self):
-        _, data = _run_command(['svnversion', self.path])
-        parsed = self.svnverre.match(data)
-        if parsed:
-            try:
-                #No max needed this command summarizes working copy since 1.0
-                self.revision = int(parsed.group(2))
-                self.parse_revision = self.__get_cached_revision
-                return self.revision
-            except ValueError:
-                #This should only happen if the revision is WAY too big.
-                pass
-        return 0
+        self.revision = parse_revision(self.path)
+        self.parse_revision = self.__get_cached_revision
+        return self.revision
 
     def get_undeleted_records(self):
         #NOTE: Need to parse entities?
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index b6950ea3fe..5e8a3e1baf 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -11,6 +11,7 @@
 import stat
 
 from setuptools import svn_utils
+from setuptools.command import egg_info
 
 #requires python >= 2.4
 from subprocess import call as _call
@@ -83,6 +84,9 @@ def test_svnentrycmd_enteries(self):
         self.assertEqual(set(entries.get_external_dirs('dir-props')),
             set([u'third_party3', u'third_party2', u'third_party']))
 
+    def test_egg_info(self):
+        rev = egg_info.egg_info.get_svn_revision()
+        self.assertEqual(rev, '4')
 
 
 def test_suite():

From dda57f982edf3a5f6758bfcc0016f66ec138c510 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 11:27:45 -0500
Subject: [PATCH 1308/8469] get_svn_method now direectly called
 svn_utils.parse_revision

--HG--
extra : rebase_source : c902dd83f2c3df73f3a6f84e08bd8a77b201cc21
---
 setuptools/command/sdist.py |  3 ++-
 setuptools/svn_utils.py     | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 3614da5e7f..2a37c3085c 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,6 +5,7 @@
 import os, re, sys, pkg_resources
 from glob import glob
 from setuptools.svn_utils import SVNEntries
+from setuptools import svn_utils
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -69,7 +70,7 @@ def externals_finder(dirname, filename):
 def entries_finder(dirname, filename):
     for record in SVNEntries.load(dirname).get_undeleted_records():
         yield joinpath(dirname, record)
-        
+
 
 finders = [
     (convert_path('CVS/Entries'),
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index e45f05bca6..93912b1a71 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -185,9 +185,6 @@ def get_sections(self):
     def is_valid(self):
         return bool(self.get_sections())
 
-    def get_url(self):
-        return self.get_sections()[0][4]
-
     def parse_revision_numbers(self):
         revision_line_number = 9
         rev_numbers = [
@@ -213,11 +210,6 @@ class SVNEntriesXML(SVNEntries):
     def is_valid(self):
         return True
 
-    def get_url(self):
-        "Get repository URL"
-        urlre = re.compile(r'url="([^"]+)"')
-        return urlre.search(self.data).group(1)
-
     def parse_revision_numbers(self):
         revre = re.compile(r'committed-rev="(\d+)"')
         return [
@@ -295,13 +287,6 @@ def get_entries(self):
 
 
 
-    def get_url(self):
-        "Get repository URL"
-        url_element = self.get_dir_data().getElementsByTagName("url")[0]
-        url_text = [t.nodeValue for t in url_element.childNodes
-                                if t.nodeType == t.TEXT_NODE]
-        return "".join(url_text)
-
     def __get_cached_revision(self):
         return self.revision
 

From d30f79227d14b87b2610bcf726de1c20e7cbf10f Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 11:28:54 -0500
Subject: [PATCH 1309/8469] finished remove get_url() doesn't seem needed

--HG--
extra : rebase_source : 7dc845ac0d00407fe087e15d04fc3f75962d0fe6
---
 setuptools/tests/test_svn.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 5e8a3e1baf..d4216491a6 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -72,8 +72,6 @@ def test_svnentrycmd_is_valid(self):
         entries = svn_utils.SVNEntries.load_dir('.')
         self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
         self.assertTrue(entries.is_valid())
-        self.assertEqual(entries.get_url(),
-                         'file:///C:/development/svn_example/repo1')
 
     def test_svnentrycmd_enteries(self):
         entries = svn_utils.SVNEntries.load_dir('.')

From 44989bd50e225241c1dfc7e60c5a973586a4fc13 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 12:24:21 -0500
Subject: [PATCH 1310/8469] cannot use list since that requires repo access,
 initial recurse parsing

--HG--
extra : rebase_source : 87deb8066a0cb067e7bccc63cc156b7fed30ea29
---
 setuptools/command/sdist.py  |  2 +-
 setuptools/svn_utils.py      | 62 ++++++++++++++++++++++++------------
 setuptools/tests/test_svn.py |  9 ++++++
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2a37c3085c..92f8d46843 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -68,7 +68,7 @@ def externals_finder(dirname, filename):
 
 
 def entries_finder(dirname, filename):
-    for record in SVNEntries.load(dirname).get_undeleted_records():
+    for record in svn_utils.parse_manifest(dirname):
         yield joinpath(dirname, record)
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 93912b1a71..5ada2e316f 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -53,6 +53,36 @@ def parse_revision(path):
             pass
     return 0
 
+#svn list returns relative o
+def parse_manifest(path):
+    #NOTE: Need to parse entities?
+    _, data = _run_command(['svn', 'info', '-R', '--xml', path])
+
+    doc = xml.dom.pulldom.parseString(data)
+    entries = list()
+    for event, node in doc:
+        if event=='START_ELEMENT' and node.nodeName=='entry':
+            doc.expandNode(node)
+            entries.append(node)
+
+    if entries:
+        return [
+            _get_entry_name(element)
+            for element in entries[1:]
+            if _get_entry_schedule(element).lower() != 'deleted'
+            ]
+    else:
+        return []
+
+def _get_entry_name(entry):
+    return entry.getAttribute('path')
+
+def _get_entry_schedule(entry):
+    schedule = entry.getElementsByTagName('schedule')[0]
+    return "".join([t.nodeValue for t in schedule.childNodes
+                                if t.nodeType == t.TEXT_NODE])
+
+
 #TODO add the text entry back, and make its use dependent on the
 #     non existence of svn?
 
@@ -253,35 +283,28 @@ class SVNEntriesCMD(SVNEntries):
     entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
     namere = re.compile(r'<name>(.*?)</name>', re.I)
 
-    def __get_cached_dir_data(self):
-        return self.dir_data
-
     def __get_cached_entries(self):
         return self.entries
 
     def is_valid(self):
-        return self.get_dir_data() is not None
+        return bool(self.get_entries())
 
     def get_dir_data(self):
         #This returns the info entry for the directory ONLY
-        _, data = _run_command(['svn', 'info', '--xml', self.path])
+        return self.get_entries()[0]
+
+    def get_entries(self):
+        #regarding the shell argument, see: http://bugs.python.org/issue8557
+        _, data = _run_command(['svn', 'info',
+                                '--depth', 'immediates', '--xml', self.path])
 
         doc = xml.dom.pulldom.parseString(data)
-        self.dir_data = None
+        self.entries = list()
         for event, node in doc:
             if event=='START_ELEMENT' and node.nodeName=='entry':
                 doc.expandNode(node)
-                self.dir_data = node
-                break
+                self.entries.append(node)
 
-        if self.dir_data:
-            self.get_dir_data = self.__get_cached_dir_data
-        return self.dir_data
-
-    def get_entries(self):
-        #regarding the shell argument, see: http://bugs.python.org/issue8557
-        _, data = _run_command(['svn', 'list', '--xml', self.path])
-        self.entries = self.entryre.findall(data)
         self.get_entries = self.__get_cached_entries
         return self.entries
 
@@ -301,10 +324,9 @@ def get_undeleted_records(self):
             return list()
         else:
             return [
-                m.group(1)
-                for entry in self.get_entries()
-                for m in self.namere.finditer(entry)
-                if m.group(1)
+                _get_entry_name(element)
+                for element in self.get_entries()[1:]
+                if _get_entry_schedule(element).lower() != 'deleted'
             ]
 
     def _get_externals_data(self, filename):
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index d4216491a6..678508c0f5 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -12,6 +12,7 @@
 
 from setuptools import svn_utils
 from setuptools.command import egg_info
+from setuptools.command import sdist
 
 #requires python >= 2.4
 from subprocess import call as _call
@@ -86,6 +87,14 @@ def test_egg_info(self):
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '4')
 
+    def test_entry_iterator(self):
+        expected = set([
+            os.path.join('.', 'readme.txt'),
+            os.path.join('.', 'other'),
+            os.path.join('.', 'other', 'test.py'),
+            ])
+        self.assertEqual(set(x for x in sdist.entries_finder('.', '')),
+                         expected)
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)

From 3ca3f2d64dfcd377227cc2bbdfbc2e4c528e0098 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 12:44:57 -0500
Subject: [PATCH 1311/8469] cannot use list since that requires repo access,
 initial recurse parsing

--HG--
extra : rebase_source : 23fbf9ca969a6a0205247ec69e5b674452839f2e
---
 setuptools/command/sdist.py |  2 +-
 setuptools/svn_utils.py     | 88 +++++++++++++++++++++----------------
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 92f8d46843..81b92f4411 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -68,7 +68,7 @@ def externals_finder(dirname, filename):
 
 
 def entries_finder(dirname, filename):
-    for record in svn_utils.parse_manifest(dirname):
+    for record in svn_utils.parse_dir_entries(dirname):
         yield joinpath(dirname, record)
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 5ada2e316f..f373379c16 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -9,11 +9,10 @@
 #requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
-
-#It would seem that svn info --xml and svn list --xml were fully
-#supported by 1.3.x the special casing of the entry files seem to start at
-#1.4.x, so if we check for xml in entries and then fall back to the command
-#line, this should catch everything.
+#NOTE: Use of the command line options
+#      require SVN 1.3 or newer (December 2005)
+#      and SVN 1.3 hsan't been supported by the
+#      developers since mid 2008.
 
 #subprocess is called several times with shell=(sys.platform=='win32')
 #see the follow for more information:
@@ -42,7 +41,12 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE):
 _SVN_VER_RE = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
 
 def parse_revision(path):
-    _, data = _run_command(['svnversion', path])
+    code, data = _run_command(['svnversion', path])
+
+    if code:
+        log.warn("svnversion failed")
+        return []
+
     parsed = _SVN_VER_RE.match(data)
     if parsed:
         try:
@@ -53,10 +57,14 @@ def parse_revision(path):
             pass
     return 0
 
-#svn list returns relative o
-def parse_manifest(path):
-    #NOTE: Need to parse entities?
-    _, data = _run_command(['svn', 'info', '-R', '--xml', path])
+
+def parse_dir_entries(path):
+    code, data = _run_command(['svn', 'info',
+                            '--depth', 'immediates', '--xml', path])
+
+    if code:
+        log.warn("svn info failed")
+        return []
 
     doc = xml.dom.pulldom.parseString(data)
     entries = list()
@@ -82,6 +90,38 @@ def _get_entry_schedule(entry):
     return "".join([t.nodeValue for t in schedule.childNodes
                                 if t.nodeType == t.TEXT_NODE])
 
+#--xml wasn't supported until 1.5.x
+#-R without --xml parses a bit funny
+def parse_externals(path):
+    try:
+        _, lines = _run_command(['svn',
+                                 'propget', 'svn:externals', path])
+
+        if code:
+            log.warn("svn propget failed")
+            return []
+
+        lines = [line for line in lines.splitlines() if line]
+    except ValueError:
+        lines = []
+
+    externals = []
+    for line in lines:
+        line = line.split()
+        if not line:
+            continue
+
+        #TODO: urlparse?
+        if "://" in line[-1] or ":\\\\" in line[-1]:
+            externals.append(line[0])
+        else:
+            externals.append(line[-1])
+
+    return externals
+
+
+
+
 
 #TODO add the text entry back, and make its use dependent on the
 #     non existence of svn?
@@ -155,33 +195,7 @@ def _get_externals_data(self, filename):
             return ''
 
     def get_external_dirs(self, filename):
-        filename = os.path.join(self.path, '.svn', filename)
-
-        data = self._get_externals_data(filename)
-
-        if not data:
-            return
-
-        # http://svnbook.red-bean.com/en/1.6/svn.advanced.externals.html
-        #there appears to be three possible formats for externals since 1.5
-        #but looks like we only need the local relative path names so it's just
-        #2 either the first column or the last (of 2 or 3) Looks like
-        #mix and matching is allowed.
-        externals = list()
-        for line in data:
-            line = line.split()
-            if not line:
-                continue
-
-            #TODO: urlparse?
-            if "://" in line[-1] or ":\\\\" in line[-1]:
-                externals.append(line[0])
-            else:
-                externals.append(line[-1])
-
-        self.external_dirs = externals
-        self.get_external_dirs = self.__get_cached_external_dirs
-        return self.external_dirs
+        return parse_externals(self.path)
 
 class SVNEntriesText(SVNEntries):
     known_svn_versions = {

From e6a901a1f7d454f64fb6f1b13d8f777f3a836abd Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 12:49:15 -0500
Subject: [PATCH 1312/8469] got some global version done, SVN 1.3.x or later
 now required

--HG--
extra : rebase_source : def9ab923ee6455791c92334ee79c09d9164c43e
---
 setuptools/command/sdist.py  |  2 +-
 setuptools/svn_utils.py      |  2 +-
 setuptools/tests/test_svn.py | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 81b92f4411..70ab2c84d4 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -63,7 +63,7 @@ def _default_revctrl(dirname=''):
 
 def externals_finder(dirname, filename):
     """Find any 'svn:externals' directories"""
-    for name in SVNEnteries.load(dirname).get_external_dirs(filename):
+    for name in svn_utils.parse_externals(dirname):
         yield joinpath(dirname, name)
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index f373379c16..5783489cd9 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -94,7 +94,7 @@ def _get_entry_schedule(entry):
 #-R without --xml parses a bit funny
 def parse_externals(path):
     try:
-        _, lines = _run_command(['svn',
+        code, lines = _run_command(['svn',
                                  'propget', 'svn:externals', path])
 
         if code:
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 678508c0f5..44637909bd 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -91,11 +91,19 @@ def test_entry_iterator(self):
         expected = set([
             os.path.join('.', 'readme.txt'),
             os.path.join('.', 'other'),
-            os.path.join('.', 'other', 'test.py'),
             ])
         self.assertEqual(set(x for x in sdist.entries_finder('.', '')),
                          expected)
 
+    def test_external_iterator(self):
+        expected = set([
+            os.path.join('.', 'third_party'),
+            os.path.join('.', 'third_party2'),
+            os.path.join('.', 'third_party3'),
+            ])
+        self.assertEqual(set(x for x in sdist.externals_finder('.', '')),
+                         expected)
+
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
 

From 0fb7894e8fca0cbd3454fbff2afc45f51cfdd156 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 12:53:02 -0500
Subject: [PATCH 1313/8469] removed the objects

--HG--
extra : rebase_source : 19c8be226a698813103dc2393b3b154060d90669
---
 setuptools/command/sdist.py  |   1 -
 setuptools/svn_utils.py      | 242 +----------------------------------
 setuptools/tests/test_svn.py |  23 +---
 3 files changed, 8 insertions(+), 258 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 70ab2c84d4..081d3c98d2 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,7 +4,6 @@
 from glob import glob
 import os, re, sys, pkg_resources
 from glob import glob
-from setuptools.svn_utils import SVNEntries
 from setuptools import svn_utils
 
 READMES = ('README', 'README.rst', 'README.txt')
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 5783489cd9..657393e2e5 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -119,240 +119,10 @@ def parse_externals(path):
 
     return externals
 
+def get_svn_tool_version():
+    _, data = _run_command(['svn', '--version', '--quiet'])
+    if data:
+        return data.strip()
+    else:
+        return ''
 
-
-
-
-#TODO add the text entry back, and make its use dependent on the
-#     non existence of svn?
-
-class SVNEntries(object):
-    svn_tool_version = ''
-
-    def __init__(self, path, data):
-        self.path = path
-        self.data = data
-        if not self.svn_tool_version:
-            self.svn_tool_version = self.get_svn_tool_version()
-
-    @staticmethod
-    def get_svn_tool_version():
-        _, data = _run_command(['svn', '--version', '--quiet'])
-        if data:
-            return data.strip()
-        else:
-            return ''
-
-    @classmethod
-    def load_dir(class_, base):
-        filename = os.path.join(base, '.svn', 'entries')
-        f = open(filename)
-        result = SVNEntries.read(f, base)
-        f.close()
-        return result
-
-    @classmethod
-    def read(class_, file, path=None):
-        data = file.read()
-
-        if data.startswith('<?xml'):
-            #entries were originally xml so pre-1.4.x
-            return SVNEntriesXML(path, data)
-        elif path is None:
-            return SVNEntriesText(path, data)
-        else:
-            result = SVNEntriesText(path, data)
-            if result.is_valid():
-                return result
-            else:
-                return SVNEntriesCMD(path, data)
-
-    def parse_revision(self):
-        all_revs = self.parse_revision_numbers() + [0]
-        return max(all_revs)
-
-    def __get_cached_external_dirs(self):
-        return self.external_dirs
-
-    def _get_externals_data(self, filename):
-        found = False
-        if not os.path.isfile(filename):
-            return
-
-        f = open(filename,'rt')
-        for line in iter(f.readline, ''):    # can't use direct iter!
-            parts = line.split()
-            if len(parts)==2:
-                kind, length = parts
-                data = f.read(int(length))
-                if kind == 'K' and data == 'svn:externals':
-                    found = True
-                elif kind == 'V' and found:
-                    f.close()
-                    break
-        else:
-            f.close()
-            return ''
-
-    def get_external_dirs(self, filename):
-        return parse_externals(self.path)
-
-class SVNEntriesText(SVNEntries):
-    known_svn_versions = {
-        '1.4.x': 8,
-        '1.5.x': 9,
-        '1.6.x': 10,
-        }
-
-    def __get_cached_sections(self):
-        return self.sections
-
-    def get_sections(self):
-        # remove the SVN version number from the first line
-        svn_version, _, sections = self.data.partition("\n")
-        try:
-            svn_version = int(svn_version)
-            if not svn_version in self.known_svn_versions.values():
-                log.warn("SVNEntriesText: Unknown subversion verson %d."
-                         "  Maybe another parser will work,", svn_version)
-        except ValueError:
-            return
-
-        SECTION_DIVIDER = '\f\n' # or '\n\x0c\n'?
-        sections = sections.split(SECTION_DIVIDER)
-        sections = [section.splitlines() for section in sections if section]
-
-        self.sections = sections
-        self.get_sections = self.__get_cached_sections
-        return self.sections
-
-    def is_valid(self):
-        return bool(self.get_sections())
-
-    def parse_revision_numbers(self):
-        revision_line_number = 9
-        rev_numbers = [
-            int(section[revision_line_number])
-            for section in self.get_sections()
-            if len(section)>revision_line_number
-                and section[revision_line_number]
-            ]
-        return rev_numbers
-
-    def get_undeleted_records(self):
-        #Note for self this skip and only returns the children
-        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
-        result = [
-            section[0]
-            for section in self.get_sections()
-            if undeleted(section)
-            ]
-        return result
-
-
-class SVNEntriesXML(SVNEntries):
-    def is_valid(self):
-        return True
-
-    def parse_revision_numbers(self):
-        revre = re.compile(r'committed-rev="(\d+)"')
-        return [
-            int(m.group(1))
-            for m in revre.finditer(self.data)
-            if m.group(1)
-            ]
-
-    def get_undeleted_records(self):
-        entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")',
-                                     re.I)
-        results = [
-            unescape(match.group(1))
-            for match in entries_pattern.finditer(self.data)
-            if match.group(1)
-            ]
-        return results
-
-import xml.dom.pulldom
-
-class SVNEntriesCMD(SVNEntries):
-    #<info>
-    #  <entry path=''      //Entry Path
-    #         revision=''
-    #         kind=''>
-    #    <url>
-    #    <repository>
-    #       <root>...</root>
-    #       <uuid>...</uuid>
-    #    </repository>
-    #    <wc-info>
-    #       ...
-    #    </wc-info>
-    #    <commit revision=''>
-    #       ...
-    #    </commit>
-    #  </entry>
-    #  ...
-    #</info>
-    entrypathre = re.compile(r'<entry\s+[^>]*path="(\.+)">', re.I)
-    entryre = re.compile(r'<entry.*?</entry>', re.DOTALL or re.I)
-    namere = re.compile(r'<name>(.*?)</name>', re.I)
-
-    def __get_cached_entries(self):
-        return self.entries
-
-    def is_valid(self):
-        return bool(self.get_entries())
-
-    def get_dir_data(self):
-        #This returns the info entry for the directory ONLY
-        return self.get_entries()[0]
-
-    def get_entries(self):
-        #regarding the shell argument, see: http://bugs.python.org/issue8557
-        _, data = _run_command(['svn', 'info',
-                                '--depth', 'immediates', '--xml', self.path])
-
-        doc = xml.dom.pulldom.parseString(data)
-        self.entries = list()
-        for event, node in doc:
-            if event=='START_ELEMENT' and node.nodeName=='entry':
-                doc.expandNode(node)
-                self.entries.append(node)
-
-        self.get_entries = self.__get_cached_entries
-        return self.entries
-
-
-
-    def __get_cached_revision(self):
-        return self.revision
-
-    def parse_revision(self):
-        self.revision = parse_revision(self.path)
-        self.parse_revision = self.__get_cached_revision
-        return self.revision
-
-    def get_undeleted_records(self):
-        #NOTE: Need to parse entities?
-        if not self.is_valid():
-            return list()
-        else:
-            return [
-                _get_entry_name(element)
-                for element in self.get_entries()[1:]
-                if _get_entry_schedule(element).lower() != 'deleted'
-            ]
-
-    def _get_externals_data(self, filename):
-
-        #othewise will be called twice.
-        if os.path.basename(filename).lower() != 'dir-props':
-            return ''
-
-        try:
-            _, lines = _run_command(['svn',
-                                     'propget', 'svn:externals', self.path])
-            lines = [line for line in lines.splitlines() if line]
-            return lines
-        except ValueError:
-            return ''
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 44637909bd..6f8399dd93 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -32,13 +32,13 @@ def test_no_svn_found(self):
         old_path = os.environ['path']
         os.environ['path'] = ''
         try:
-            version = svn_utils.SVNEntries.get_svn_tool_version()
+            version = svn_utils.get_svn_tool_version()
             self.assertEqual(version, '')
         finally:
             os.environ['path'] = old_path
 
     def test_svn_should_exist(self):
-        version = svn_utils.SVNEntries.get_svn_tool_version()
+        version = svn_utils.get_svn_tool_version()
         self.assertNotEqual(version, '')
 
 
@@ -64,25 +64,6 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         _remove_dir(self.temp_dir)
 
-    def test_svnentrycmd_is_valid(self):
-        entries = svn_utils.SVNEntries.load_dir('.')
-        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
-        self.assertTrue(entries.is_valid())
-
-    def test_svnentrycmd_is_valid(self):
-        entries = svn_utils.SVNEntries.load_dir('.')
-        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
-        self.assertTrue(entries.is_valid())
-
-    def test_svnentrycmd_enteries(self):
-        entries = svn_utils.SVNEntries.load_dir('.')
-        self.assertIsInstance(entries, svn_utils.SVNEntriesCMD)
-        self.assertEqual(entries.parse_revision(), 4)
-        self.assertEqual(set(entries.get_undeleted_records()),
-                         set([u'readme.txt', u'other']))
-        self.assertEqual(set(entries.get_external_dirs('dir-props')),
-            set([u'third_party3', u'third_party2', u'third_party']))
-
     def test_egg_info(self):
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '4')

From f553edb0df7c17b81457820e9333adc56b04d8b9 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 12:59:35 -0500
Subject: [PATCH 1314/8469] use urlparse for url detection

--HG--
extra : rebase_source : 0c502ce268425d0236072fe11c5631e8282956f0
---
 setuptools/svn_utils.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 657393e2e5..0f54ba54ca 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -3,8 +3,8 @@
 import sys
 import codecs
 from distutils import log
-from xml.sax.saxutils import unescape
 import xml.dom.pulldom
+import urlparse
 
 #requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
@@ -82,9 +82,11 @@ def parse_dir_entries(path):
     else:
         return []
 
+
 def _get_entry_name(entry):
     return entry.getAttribute('path')
 
+
 def _get_entry_schedule(entry):
     schedule = entry.getElementsByTagName('schedule')[0]
     return "".join([t.nodeValue for t in schedule.childNodes
@@ -111,14 +113,14 @@ def parse_externals(path):
         if not line:
             continue
 
-        #TODO: urlparse?
-        if "://" in line[-1] or ":\\\\" in line[-1]:
+        if urlparse.urlsplit(line[-1])[0]:
             externals.append(line[0])
         else:
             externals.append(line[-1])
 
     return externals
 
+
 def get_svn_tool_version():
     _, data = _run_command(['svn', '--version', '--quiet'])
     if data:

From adb810246108bfe67f4ac92ab0f644d250cce515 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 4 Jul 2013 13:10:35 -0500
Subject: [PATCH 1315/8469] consolidated externals and enteries because
 enteries need to file to interate over and both get called by the same
 callback. pep8 on svn_utils

--HG--
extra : rebase_source : fa65ebfc167041b5c2e1b2bd901e9354cfaea57e
---
 setuptools/command/sdist.py  | 16 ++++++-------
 setuptools/svn_utils.py      | 46 ++++++++++++++++++++----------------
 setuptools/tests/test_svn.py | 13 ++++------
 3 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 081d3c98d2..5cc2139be6 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -60,23 +60,21 @@ def _default_revctrl(dirname=''):
                     for item in _default_revctrl(path):
                         yield item
 
-def externals_finder(dirname, filename):
-    """Find any 'svn:externals' directories"""
-    for name in svn_utils.parse_externals(dirname):
-        yield joinpath(dirname, name)
-
 
-def entries_finder(dirname, filename):
+def entries_externals_finder(dirname, filename):
     for record in svn_utils.parse_dir_entries(dirname):
         yield joinpath(dirname, record)
 
+    for name in svn_utils.parse_externals(dirname):
+        yield joinpath(dirname, name)
+
 
 finders = [
     (convert_path('CVS/Entries'),
         re_finder(re.compile(r"^\w?/([^/]+)/", re.M))),
-    (convert_path('.svn/entries'), entries_finder),
-    (convert_path('.svn/dir-props'), externals_finder),
-    (convert_path('.svn/dir-prop-base'), externals_finder),  # svn 1.4
+    #combined externals due to common interface
+    #combined externals and enteries due to lack of dir_props in 1.7
+    (convert_path('.svn/entries'), entries_externals_finder),
 ]
 
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 0f54ba54ca..350f17c85e 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -14,6 +14,15 @@
 #      and SVN 1.3 hsan't been supported by the
 #      developers since mid 2008.
 
+
+#svnversion return values (previous implementations return max revision)
+#   4123:4168     mixed revision working copy
+#   4168M         modified working copy
+#   4123S         switched working copy
+#   4123:4168MS   mixed revision, modified, switched working copy
+_SVN_VER_RE = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
+
+
 #subprocess is called several times with shell=(sys.platform=='win32')
 #see the follow for more information:
 #       http://bugs.python.org/issue8557
@@ -22,7 +31,7 @@
 def _run_command(args, stdout=_PIPE, stderr=_PIPE):
         #regarding the shell argument, see: http://bugs.python.org/issue8557
         proc = _Popen(args, stdout=stdout, stderr=stderr,
-                      shell=(sys.platform=='win32'))
+                      shell=(sys.platform == 'win32'))
 
         data = proc.communicate()[0]
         #TODO: this is probably NOT always utf-8
@@ -33,12 +42,17 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE):
 
         return proc.returncode, data
 
-#svnversion return values (previous implementations return max revision)
-#   4123:4168     mixed revision working copy
-#   4168M         modified working copy
-#   4123S         switched working copy
-#   4123:4168MS   mixed revision, modified, switched working copy
-_SVN_VER_RE = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
+
+def _get_entry_name(entry):
+    return entry.getAttribute('path')
+
+
+def _get_entry_schedule(entry):
+    schedule = entry.getElementsByTagName('schedule')[0]
+    return "".join([t.nodeValue
+                    for t in schedule.childNodes
+                    if t.nodeType == t.TEXT_NODE])
+
 
 def parse_revision(path):
     code, data = _run_command(['svnversion', path])
@@ -60,7 +74,7 @@ def parse_revision(path):
 
 def parse_dir_entries(path):
     code, data = _run_command(['svn', 'info',
-                            '--depth', 'immediates', '--xml', path])
+                               '--depth', 'immediates', '--xml', path])
 
     if code:
         log.warn("svn info failed")
@@ -69,7 +83,7 @@ def parse_dir_entries(path):
     doc = xml.dom.pulldom.parseString(data)
     entries = list()
     for event, node in doc:
-        if event=='START_ELEMENT' and node.nodeName=='entry':
+        if event == 'START_ELEMENT' and node.nodeName == 'entry':
             doc.expandNode(node)
             entries.append(node)
 
@@ -78,26 +92,17 @@ def parse_dir_entries(path):
             _get_entry_name(element)
             for element in entries[1:]
             if _get_entry_schedule(element).lower() != 'deleted'
-            ]
+        ]
     else:
         return []
 
 
-def _get_entry_name(entry):
-    return entry.getAttribute('path')
-
-
-def _get_entry_schedule(entry):
-    schedule = entry.getElementsByTagName('schedule')[0]
-    return "".join([t.nodeValue for t in schedule.childNodes
-                                if t.nodeType == t.TEXT_NODE])
-
 #--xml wasn't supported until 1.5.x
 #-R without --xml parses a bit funny
 def parse_externals(path):
     try:
         code, lines = _run_command(['svn',
-                                 'propget', 'svn:externals', path])
+                                    'propget', 'svn:externals', path])
 
         if code:
             log.warn("svn propget failed")
@@ -127,4 +132,3 @@ def get_svn_tool_version():
         return data.strip()
     else:
         return ''
-
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 6f8399dd93..7f5f6108e8 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -17,6 +17,7 @@
 #requires python >= 2.4
 from subprocess import call as _call
 
+
 def _remove_dir(target):
 
     #on windows this seems to a problem
@@ -26,6 +27,7 @@ def _remove_dir(target):
             os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
     shutil.rmtree(target)
 
+
 class TestSvnVersion(unittest.TestCase):
 
     def test_no_svn_found(self):
@@ -68,21 +70,16 @@ def test_egg_info(self):
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '4')
 
-    def test_entry_iterator(self):
+    def test_iterator(self):
         expected = set([
             os.path.join('.', 'readme.txt'),
             os.path.join('.', 'other'),
-            ])
-        self.assertEqual(set(x for x in sdist.entries_finder('.', '')),
-                         expected)
-
-    def test_external_iterator(self):
-        expected = set([
             os.path.join('.', 'third_party'),
             os.path.join('.', 'third_party2'),
             os.path.join('.', 'third_party3'),
             ])
-        self.assertEqual(set(x for x in sdist.externals_finder('.', '')),
+        self.assertEqual(set(x for x
+                               in sdist.entries_externals_finder('.', '')),
                          expected)
 
 def test_suite():

From 1286069e4cf50a575f1a98fff46f12a324de7c67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 22:06:56 -0400
Subject: [PATCH 1316/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1a47f4db68..172a858289 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.7.8
+-----
+
+* Distribute #375: Yet another fix for yet another regression.
+
 -----
 0.7.7
 -----

From 60eebc12f4f00c1fc2e928957bf62926aecbe444 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 22:09:07 -0400
Subject: [PATCH 1317/8469] Added tag 0.7.8 for changeset 236de1de68b1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b626edfa60..5fd7f2ad8a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -71,3 +71,4 @@ ee2c967017024197b38e39ced852808265387a4b 0.6.47
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
 f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
+236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8

From 3d3aae58dbe4b67aaf39238e6508af83e95c7b5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 22:09:24 -0400
Subject: [PATCH 1318/8469] Bumped to 0.7.9 in preparation for next release.

---
 README.txt             | 8 ++++----
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 release.py             | 2 +-
 setup.py               | 2 +-
 setuptools/__init__.py | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index 77acd2bac1..9b17a260af 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.7.9/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.9/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.8/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.7.9/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.7.8$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.7.9$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 8bbf4bea88..5d6a58e9fa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.8'
+version = '0.7.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.8'
+release = '0.7.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 6baa9b9921..91819da992 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.7.8"
+DEFAULT_VERSION = "0.7.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 61e6862d88..6d7bc3a9b5 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.7.8'
+VERSION = '0.7.9'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index a4d6d55633..5226ae4ed6 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.7.8"
+VERSION = "0.7.9"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 104ea06498..e740e3d038 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.7.8'
+__version__ = '0.7.9'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From f113f36b29298a1428b17315b8c35740c69d5725 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 22:14:45 -0400
Subject: [PATCH 1319/8469] Added tag 0.8b7 for changeset 979d598822bc

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4d6efc9866..910f608ad5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -78,3 +78,4 @@ cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 26f59ec0f0f69714d28a891aaad048e3b9fcd6f7 0.8b6
 f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
 236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
+979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7

From 5b7992850b0cddec9bc405042359cf751d970d59 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Fri, 5 Jul 2013 08:23:44 -0500
Subject: [PATCH 1320/8469] urlparse --> urllib.parse in py3

--HG--
extra : rebase_source : b845737250a36a725f75aa04109ea357f09955d0
---
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/command/egg_info.py       |  2 +-
 setuptools/svn_utils.py              |  7 ++-
 4 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index e5b7443aec..aa01bde9f2 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+convert_2to3_doctests = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
 packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-eager_resources = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
 entry_points = setuptools.dist:check_entry_points
-namespace_packages = setuptools.dist:check_nsp
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-use_2to3_fixers = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
 package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
-tests_require = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-requires.txt = setuptools.command.egg_info:write_requirements
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+exclude_package_data = setuptools.dist:check_package_data
+dependency_links = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
 
 [distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
+upload_docs = setuptools.command.upload_docs:upload_docs
+build_py = setuptools.command.build_py:build_py
 develop = setuptools.command.develop:develop
-sdist = setuptools.command.sdist:sdist
-saveopts = setuptools.command.saveopts:saveopts
-easy_install = setuptools.command.easy_install:easy_install
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 rotate = setuptools.command.rotate:rotate
-install = setuptools.command.install:install
-alias = setuptools.command.alias:alias
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+setopt = setuptools.command.setopt:setopt
+saveopts = setuptools.command.saveopts:saveopts
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+test = setuptools.command.test:test
 register = setuptools.command.register:register
-egg_info = setuptools.command.egg_info:egg_info
+easy_install = setuptools.command.easy_install:easy_install
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-test = setuptools.command.test:test
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
+egg_info = setuptools.command.egg_info:egg_info
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+entry_points.txt = setuptools.command.egg_info:write_entries
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 91d84d9ca8..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,11 +1,11 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [certs]
 certifi==0.0.8
 
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 345ec8aec0..cb557361ba 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,7 +9,7 @@
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
-from setuptools import svn_utils
+from .. import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 350f17c85e..10c5861dee 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -4,7 +4,11 @@
 import codecs
 from distutils import log
 import xml.dom.pulldom
-import urlparse
+
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse
 
 #requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
@@ -40,6 +44,7 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE):
         except NameError:
             data = str(data, encoding='utf-8')
 
+        #communciate calls wait()
         return proc.returncode, data
 
 

From 0c39ec94423bda77dc46dc6c82294cdfd7447f89 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Fri, 5 Jul 2013 10:37:42 -0500
Subject: [PATCH 1321/8469] fixed some issues with OSError have to emulate
 zipfile extract on py2.5 and earlier for tests

--HG--
extra : rebase_source : c6ad4eab19a2a454b8b8043d88d9582168f617aa
---
 setuptools/command/egg_info.py |  2 +-
 setuptools/svn_utils.py        | 16 +++++--
 setuptools/tests/test_svn.py   | 87 ++++++++++++++++++++++++++++++++--
 3 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cb557361ba..345ec8aec0 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,7 +9,7 @@
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
-from .. import svn_utils
+from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 10c5861dee..932ee75cc0 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -34,10 +34,14 @@
 #              python-subprocess-popen-environment-path
 def _run_command(args, stdout=_PIPE, stderr=_PIPE):
         #regarding the shell argument, see: http://bugs.python.org/issue8557
-        proc = _Popen(args, stdout=stdout, stderr=stderr,
-                      shell=(sys.platform == 'win32'))
+        try:
+            proc = _Popen(args, stdout=stdout, stderr=stderr,
+                          shell=(sys.platform == 'win32'))
+
+            data = proc.communicate()[0]
+        except OSError:
+            return 1, ''
 
-        data = proc.communicate()[0]
         #TODO: this is probably NOT always utf-8
         try:
             data = unicode(data, encoding='utf-8')
@@ -60,11 +64,13 @@ def _get_entry_schedule(entry):
 
 
 def parse_revision(path):
-    code, data = _run_command(['svnversion', path])
+    code, data = _run_command(['svnversion', '-c', path])
 
     if code:
         log.warn("svnversion failed")
-        return []
+        return 0
+    else:
+        log.warn('Version: %s' % data.strip())
 
     parsed = _SVN_VER_RE.match(data)
     if parsed:
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 7f5f6108e8..8b73452ffa 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -17,6 +17,54 @@
 #requires python >= 2.4
 from subprocess import call as _call
 
+def _extract(self, member, path=None, pwd=None):
+    """for zipfile py2.5 borrowed from cpython"""
+    if not isinstance(member, zipfile.ZipInfo):
+        member = self.getinfo(member)
+
+    if path is None:
+        path = os.getcwd()
+
+    return _extract_member(self, member, path, pwd)
+
+def _extract_from_zip(self, name, dest_path):
+    dest_file = open(dest_path, 'wb')
+    try:
+        dest_file.write(self.read(name))
+    finally:
+        dest_file.close()
+
+def _extract_member(self, member, targetpath, pwd):
+    """for zipfile py2.5 borrowed from cpython"""
+    # build the destination pathname, replacing
+    # forward slashes to platform specific separators.
+    # Strip trailing path separator, unless it represents the root.
+    if (targetpath[-1:] in (os.path.sep, os.path.altsep)
+        and len(os.path.splitdrive(targetpath)[1]) > 1):
+        targetpath = targetpath[:-1]
+
+    # don't include leading "/" from file name if present
+    if member.filename[0] == '/':
+        targetpath = os.path.join(targetpath, member.filename[1:])
+    else:
+        targetpath = os.path.join(targetpath, member.filename)
+
+    targetpath = os.path.normpath(targetpath)
+
+    # Create all upper directories if necessary.
+    upperdirs = os.path.dirname(targetpath)
+    if upperdirs and not os.path.exists(upperdirs):
+        os.makedirs(upperdirs)
+
+    if member.filename[-1] == '/':
+        if not os.path.isdir(targetpath):
+            os.mkdir(targetpath)
+        return targetpath
+
+    _extract_from_zip(self, member.filename, targetpath)
+
+    return targetpath
+
 
 def _remove_dir(target):
 
@@ -31,13 +79,21 @@ def _remove_dir(target):
 class TestSvnVersion(unittest.TestCase):
 
     def test_no_svn_found(self):
-        old_path = os.environ['path']
-        os.environ['path'] = ''
+        path_variable = None
+        for env in os.environ:
+            if env.lower() == 'path':
+                path_variable = env
+
+        if path_variable is None:
+            self.skipTest('Cannot figure out how to modify path')
+
+        old_path = os.environ[path_variable]
+        os.environ[path_variable] = ''
         try:
             version = svn_utils.get_svn_tool_version()
             self.assertEqual(version, '')
         finally:
-            os.environ['path'] = old_path
+            os.environ[path_variable] = old_path
 
     def test_svn_should_exist(self):
         version = svn_utils.get_svn_tool_version()
@@ -47,13 +103,21 @@ def test_svn_should_exist(self):
 class TestSvn_1_7(unittest.TestCase):
 
     def setUp(self):
+        version = svn_utils.get_svn_tool_version()
+        ver_list = [int(x) for x in version.split('.')]
+        if ver_list < [1,7,0]:
+            self.version_err = 'Insufficent Subversion (%s)' % version
+        else:
+            self.version_err = None
+
+
         self.temp_dir = tempfile.mkdtemp()
         zip_file, source, target = [None, None, None]
         try:
             zip_file = zipfile.ZipFile(os.path.join('setuptools', 'tests',
                                                     'svn17_example.zip'))
             for files in zip_file.namelist():
-                zip_file.extract(files, self.temp_dir)
+                _extract(zip_file, files, self.temp_dir)
         finally:
             if zip_file:
                 zip_file.close()
@@ -66,11 +130,26 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         _remove_dir(self.temp_dir)
 
+    def _chk_skip(self):
+        if self.version_err is not None:
+            if hasattr(self, 'skipTest'):
+                self.skipTest(self.version_err)
+            else:
+                sys.stderr.write(self.version_error + "\n")
+                return True
+        return False
+
     def test_egg_info(self):
+        if self._chk_skip:
+            return
+
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '4')
 
     def test_iterator(self):
+        if self._chk_skip:
+            return
+
         expected = set([
             os.path.join('.', 'readme.txt'),
             os.path.join('.', 'other'),

From 9a9486878f01e21b86e7a2ab317bfe10f3352665 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Fri, 5 Jul 2013 10:43:04 -0500
Subject: [PATCH 1322/8469] some odd errors.. not sure what still has the
 directory in use..

--HG--
extra : rebase_source : c3c3369ee8fc51f6625e8e59552ccf01f5332887
---
 setuptools/tests/test_svn.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 8b73452ffa..6036f85c80 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -127,8 +127,12 @@ def setUp(self):
         os.chdir(os.path.join(self.temp_dir, 'svn17_example'))
 
     def tearDown(self):
-        os.chdir(self.old_cwd)
-        _remove_dir(self.temp_dir)
+        try:
+            os.chdir(self.old_cwd)
+            _remove_dir(self.temp_dir)
+        except OSError:
+            #sigh?
+            pass
 
     def _chk_skip(self):
         if self.version_err is not None:

From 16088e1dd88bbe5497c4e6e1f5239eacec583bef Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Fri, 5 Jul 2013 11:30:40 -0500
Subject: [PATCH 1323/8469] added some cmdline testing for svn_util and allowed
 negative numbers in the min number from svnversion.

--HG--
extra : rebase_source : 8d9c8557e3702b3194fc20d47f5fc07c21521fbe
---
 setuptools/svn_utils.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 932ee75cc0..193528218d 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -24,7 +24,7 @@
 #   4168M         modified working copy
 #   4123S         switched working copy
 #   4123:4168MS   mixed revision, modified, switched working copy
-_SVN_VER_RE = re.compile(r'(?:(\d+):)?(\d+)([a-z]*)\s*$', re.I)
+_SVN_VER_RE = re.compile(r'(?:([\-0-9]+):)?(\d+)([a-z]*)\s*$', re.I)
 
 
 #subprocess is called several times with shell=(sys.platform=='win32')
@@ -91,6 +91,8 @@ def parse_dir_entries(path):
         log.warn("svn info failed")
         return []
 
+    data = codecs.encode(data, 'UTF-8')
+
     doc = xml.dom.pulldom.parseString(data)
     entries = list()
     for event, node in doc:
@@ -143,3 +145,14 @@ def get_svn_tool_version():
         return data.strip()
     else:
         return ''
+
+if __name__ == '__main__':
+    def entries_externals_finder(dirname):
+        for record in parse_dir_entries(dirname):
+            yield os.path.join(dirname, record)
+
+        for name in parse_externals(dirname):
+            yield os.path.join(dirname, name)
+
+    for name in entries_externals_finder(sys.argv[1]):
+        print(name)
\ No newline at end of file

From a4db48e4c0fb7955d79cc798101438620a81f056 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:06:22 -0400
Subject: [PATCH 1324/8469] Re-enable automatic registration and upload of the
 released package

---
 release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index 175e14631f..3afa7fb595 100644
--- a/release.py
+++ b/release.py
@@ -181,8 +181,8 @@ def upload_to_pypi():
 		sys.executable, 'setup.py', '-q',
 		'egg_info', '-RD', '-b', '',
 		'sdist',
-		#'register', '-r', PACKAGE_INDEX,
-		#'upload', '-r', PACKAGE_INDEX,
+		'register', '-r', PACKAGE_INDEX,
+		'upload', '-r', PACKAGE_INDEX,
 	]
 	if has_docs:
 		cmd.extend([

From 937eface0298a04427d97491de4c16a9889d7fe0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:07:34 -0400
Subject: [PATCH 1325/8469] Fixed two more NameErrors on Python 3 in release
 script

---
 release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index 3afa7fb595..39d0b61398 100644
--- a/release.py
+++ b/release.py
@@ -140,7 +140,7 @@ def do_release():
 
 	set_versions()
 
-	res = raw_input('Have you read through the SCM changelog and '
+	res = input('Have you read through the SCM changelog and '
 		'confirmed the changelog is current for releasing {VERSION}? '
 		.format(**globals()))
 	if not res.lower().startswith('y'):
@@ -148,7 +148,7 @@ def do_release():
 		raise SystemExit(1)
 
 	print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
-	res = raw_input('Have you or has someone verified that the tests '
+	res = input('Have you or has someone verified that the tests '
 		'pass on this revision? ')
 	if not res.lower().startswith('y'):
 		print("Please do that")

From bfca4fa13f18c4b92486fb075c5f25779123d105 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:10:10 -0400
Subject: [PATCH 1326/8469] Fixed AttributeError around izip_longest

---
 release.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 39d0b61398..654db012f3 100644
--- a/release.py
+++ b/release.py
@@ -26,6 +26,11 @@
 except NameError:
 	pass
 
+try:
+	zip_longest = itertools.zip_longest
+except AttributeError:
+	zip_longest = itertools.izip_longest
+
 try:
 	import keyring
 except Exception:
@@ -239,7 +244,7 @@ def _linkified_text(rst_content):
 	anchors = []
 	linkified_parts = [_linkified_part(part, anchors)
 		for part in plain_text_parts]
-	pairs = itertools.izip_longest(
+	pairs = zip_longest(
 		linkified_parts,
 		HREF_pattern.findall(rst_content),
 		fillvalue='',

From 73e4762324f76746d03c89306b2b2bb7917a13a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:11:54 -0400
Subject: [PATCH 1327/8469] Added tag 0.8 for changeset e3d70539e79f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 910f608ad5..96b3c0bb0a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -79,3 +79,4 @@ cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
 f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
 236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
 979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7
+e3d70539e79f39a97f69674ab038661961a1eb43 0.8

From 70dc35dcc21fdb1918e5562d105427aeea424c28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:12:49 -0400
Subject: [PATCH 1328/8469] Bumped to 0.9 in preparation for next release.

---
 README.txt                           |  8 ++--
 docs/conf.py                         |  4 +-
 ez_setup.py                          |  2 +-
 release.py                           |  2 +-
 setup.py                             |  6 +--
 setuptools.egg-info/entry_points.txt | 72 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +--
 setuptools/__init__.py               |  2 +-
 8 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/README.txt b/README.txt
index 7fe2d64af2..2fa3d872d4 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.8/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.8$ python setup.py --prefix=/opt/setuptools
+    setuptools-0.9$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/docs/conf.py b/docs/conf.py
index 3fccd87f72..7113c36535 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.8'
+version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.8'
+release = '0.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index c225c6ae6d..61187113b5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.8"
+DEFAULT_VERSION = "0.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 654db012f3..69899988de 100644
--- a/release.py
+++ b/release.py
@@ -36,7 +36,7 @@
 except Exception:
 	pass
 
-VERSION = '0.8'
+VERSION = '0.9'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
diff --git a/setup.py b/setup.py
index e6d62b183a..61a4308a69 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.8"
+VERSION = "0.9"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
@@ -219,10 +219,10 @@ def run(self):
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
         "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
         "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
-        "certs": "certifi==0.0.8",
+        "certs": "certifi==0.0.9",
     },
     dependency_links = [
-        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 24461149e1..5db5e49550 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
 [distutils.commands]
-build_py = setuptools.command.build_py:build_py
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-register = setuptools.command.register:register
-install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
-saveopts = setuptools.command.saveopts:saveopts
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install = setuptools.command.install:install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_lib = setuptools.command.install_lib:install_lib
 setopt = setuptools.command.setopt:setopt
-easy_install = setuptools.command.easy_install:easy_install
-egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
+build_py = setuptools.command.build_py:build_py
+install_scripts = setuptools.command.install_scripts:install_scripts
+saveopts = setuptools.command.saveopts:saveopts
+alias = setuptools.command.alias:alias
 sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+rotate = setuptools.command.rotate:rotate
 upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install_lib = setuptools.command.install_lib:install_lib
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+egg_info = setuptools.command.egg_info:egg_info
 test = setuptools.command.test:test
-rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+install = setuptools.command.install:install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+easy_install = setuptools.command.easy_install:easy_install
+register = setuptools.command.register:register
 
 [egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-use_2to3_fixers = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-zip_safe = setuptools.dist:assert_bool
 include_package_data = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
+zip_safe = setuptools.dist:assert_bool
+use_2to3 = setuptools.dist:assert_bool
 eager_resources = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
-exclude_package_data = setuptools.dist:check_package_data
+test_loader = setuptools.dist:check_importable
 extras_require = setuptools.dist:check_extras
-test_suite = setuptools.dist:check_test_suite
+exclude_package_data = setuptools.dist:check_package_data
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
 package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
 namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 2f2a364fa2..bf85f734f5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a8e7617abc..bc62cf82ab 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.8'
+__version__ = '0.9'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From e8aebd11d3f1c50140ae8143a29387b8f5280393 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jul 2013 13:24:44 -0400
Subject: [PATCH 1329/8469] Use requests for updating milestone and version

---
 release.py | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/release.py b/release.py
index 69899988de..d54b249539 100644
--- a/release.py
+++ b/release.py
@@ -16,10 +16,7 @@
 import itertools
 import re
 
-try:
-	import urllib.request as urllib_request
-except ImportError:
-	import urllib2 as urllib_request
+import requests
 
 try:
 	input = raw_input
@@ -79,7 +76,7 @@ def get_repo_name():
 	"""
 	Get the repo name from the hgrc default path.
 	"""
-	default = subprocess.check_output('hg paths default').strip()
+	default = subprocess.check_output('hg paths default').strip().decode('utf-8')
 	parts = default.split('/')
 	if parts[-1] == '':
 		parts.pop()
@@ -105,20 +102,13 @@ def get_mercurial_creds(system='https://bitbucket.org', username=None):
 	return Credential(username, password)
 
 def add_milestone_and_version(version):
-	auth = 'Basic ' + ':'.join(get_mercurial_creds()).encode('base64').strip()
-	headers = {
-		'Authorization': auth,
-	}
 	base = 'https://api.bitbucket.org'
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
 			.format(repo = get_repo_name(), type=type))
-		req = urllib_request.Request(url = url, headers = headers,
-			data='name='+version)
-		try:
-			urllib_request.urlopen(req)
-		except urllib_request.HTTPError as e:
-			print(e.fp.read())
+		resp = requests.post(url=url,
+			data='name='+version, auth=get_mercurial_creds())
+		resp.raise_for_status()
 
 def bump_versions(target_ver):
 	for filename in files_with_versions:

From 411379b73db3bc4955e369affc448cd10ac025e6 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 6 Jul 2013 06:24:30 -0500
Subject: [PATCH 1330/8469] some notes on things that needs to be fixed after
 all

--HG--
extra : rebase_source : 5777bafbb7069238b8aa485cfbc23c13b019080f
---
 setuptools.egg-info/entry_points.txt | 88 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/svn_utils.py              | 13 +++-
 3 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index aa01bde9f2..20002e2547 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-packages = setuptools.dist:check_packages
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-zip_safe = setuptools.dist:assert_bool
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
-use_2to3 = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-
 [distutils.commands]
-upload_docs = setuptools.command.upload_docs:upload_docs
-build_py = setuptools.command.build_py:build_py
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 rotate = setuptools.command.rotate:rotate
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+develop = setuptools.command.develop:develop
 setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
 install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install = setuptools.command.install:install
 test = setuptools.command.test:test
-register = setuptools.command.register:register
-easy_install = setuptools.command.easy_install:easy_install
-alias = setuptools.command.alias:alias
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
 sdist = setuptools.command.sdist:sdist
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
 
 [egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.5 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..91d84d9ca8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,11 +1,11 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [certs]
 certifi==0.0.8
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 193528218d..a4c53f154b 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -82,7 +82,7 @@ def parse_revision(path):
             pass
     return 0
 
-
+#TODO: Need to do this with the -R because only root has .svn in 1.7.x
 def parse_dir_entries(path):
     code, data = _run_command(['svn', 'info',
                                '--depth', 'immediates', '--xml', path])
@@ -110,7 +110,16 @@ def parse_dir_entries(path):
         return []
 
 
-#--xml wasn't supported until 1.5.x
+#--xml wasn't supported until 1.5.x need to do -R
+#TODO: -R looks like directories are seperated by blank lines
+#      with dir - prepened to first directory
+#      what about directories with spaces?
+#          put quotes around them
+#      what about the URL's?
+#          same
+#      convert to UTF-8 and use csv
+#         delimiter = space
+#
 #-R without --xml parses a bit funny
 def parse_externals(path):
     try:

From 5ae92f8fba0d7fe8d59477011816c0aef7b25db7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jul 2013 09:15:39 -0400
Subject: [PATCH 1331/8469] Point to permalink for ez_setup.py in README. Fixes
 #25.

---
 README.txt | 8 ++++----
 release.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index 2fa3d872d4..0a3bb21db4 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/0.9/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
     > python ez_setup.py --user
 
 
@@ -66,7 +66,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-0.9$ python setup.py --prefix=/opt/setuptools
+    setuptools-x.x$ python setup.py --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
diff --git a/release.py b/release.py
index d54b249539..152f0d9aab 100644
--- a/release.py
+++ b/release.py
@@ -68,7 +68,7 @@ def incr(match):
 	return re.sub('\d*$', incr, version)
 
 files_with_versions = (
-	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py', 'README.txt',
+	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
 	'setuptools/__init__.py',
 )
 

From 22ee649e178479934b2c658acf8de044e53d1670 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jul 2013 09:19:36 -0400
Subject: [PATCH 1332/8469] Added stubbed upload_ez_setup function

---
 release.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/release.py b/release.py
index 152f0d9aab..28be68b63f 100644
--- a/release.py
+++ b/release.py
@@ -154,6 +154,7 @@ def do_release():
 	subprocess.check_call(['hg', 'update', VERSION])
 
 	upload_to_pypi()
+	upload_ez_setup()
 
 	# update to the tip for the next operation
 	subprocess.check_call(['hg', 'update'])
@@ -187,6 +188,13 @@ def upload_to_pypi():
 	env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 	subprocess.check_call(cmd, env=env)
 
+def upload_ez_setup():
+	"""
+	TODO: upload ez_setup.py to a permalinked location. Currently, this
+	location is https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py .
+	In the long term, it should be on PyPI.
+	"""
+
 def has_sphinx():
 	try:
 		devnull = open(os.path.devnull, 'wb')

From 7a7469f9828f0d54f24e207cdc19fcf4ec126d45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jul 2013 09:20:04 -0400
Subject: [PATCH 1333/8469] Spaces for indent

---
 release.py | 376 ++++++++++++++++++++++++++---------------------------
 1 file changed, 188 insertions(+), 188 deletions(-)

diff --git a/release.py b/release.py
index 28be68b63f..3631799355 100644
--- a/release.py
+++ b/release.py
@@ -19,259 +19,259 @@
 import requests
 
 try:
-	input = raw_input
+    input = raw_input
 except NameError:
-	pass
+    pass
 
 try:
-	zip_longest = itertools.zip_longest
+    zip_longest = itertools.zip_longest
 except AttributeError:
-	zip_longest = itertools.izip_longest
+    zip_longest = itertools.izip_longest
 
 try:
-	import keyring
+    import keyring
 except Exception:
-	pass
+    pass
 
 VERSION = '0.9'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
-	global VERSION
-	version = input("Release as version [%s]> " % VERSION) or VERSION
-	if version != VERSION:
-		VERSION = bump_versions(version)
+    global VERSION
+    version = input("Release as version [%s]> " % VERSION) or VERSION
+    if version != VERSION:
+        VERSION = bump_versions(version)
 
 def infer_next_version(version):
-	"""
-	Infer a next version from the current version by incrementing the last
-	number or appending a number.
+    """
+    Infer a next version from the current version by incrementing the last
+    number or appending a number.
 
-	>>> infer_next_version('1.0')
-	'1.1'
+    >>> infer_next_version('1.0')
+    '1.1'
 
-	>>> infer_next_version('1.0b')
-	'1.0b1'
+    >>> infer_next_version('1.0b')
+    '1.0b1'
 
-	>>> infer_next_version('1.0.9')
-	'1.0.10'
+    >>> infer_next_version('1.0.9')
+    '1.0.10'
 
-	>>> infer_next_version('1')
-	'2'
+    >>> infer_next_version('1')
+    '2'
 
-	>>> infer_next_version('')
-	'1'
-	"""
-	def incr(match):
-		ver = int(match.group(0) or '0')
-		return str(ver + 1)
-	return re.sub('\d*$', incr, version)
+    >>> infer_next_version('')
+    '1'
+    """
+    def incr(match):
+        ver = int(match.group(0) or '0')
+        return str(ver + 1)
+    return re.sub('\d*$', incr, version)
 
 files_with_versions = (
-	'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
-	'setuptools/__init__.py',
+    'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
+    'setuptools/__init__.py',
 )
 
 def get_repo_name():
-	"""
-	Get the repo name from the hgrc default path.
-	"""
-	default = subprocess.check_output('hg paths default').strip().decode('utf-8')
-	parts = default.split('/')
-	if parts[-1] == '':
-		parts.pop()
-	return '/'.join(parts[-2:])
+    """
+    Get the repo name from the hgrc default path.
+    """
+    default = subprocess.check_output('hg paths default').strip().decode('utf-8')
+    parts = default.split('/')
+    if parts[-1] == '':
+        parts.pop()
+    return '/'.join(parts[-2:])
 
 def get_mercurial_creds(system='https://bitbucket.org', username=None):
-	"""
-	Return named tuple of username,password in much the same way that
-	Mercurial would (from the keyring).
-	"""
-	# todo: consider getting this from .hgrc
-	username = username or getpass.getuser()
-	keyring_username = '@@'.join((username, system))
-	system = 'Mercurial'
-	password = (
-		keyring.get_password(system, keyring_username)
-		if 'keyring' in globals()
-		else None
-	)
-	if not password:
-		password = getpass.getpass()
-	Credential = collections.namedtuple('Credential', 'username password')
-	return Credential(username, password)
+    """
+    Return named tuple of username,password in much the same way that
+    Mercurial would (from the keyring).
+    """
+    # todo: consider getting this from .hgrc
+    username = username or getpass.getuser()
+    keyring_username = '@@'.join((username, system))
+    system = 'Mercurial'
+    password = (
+        keyring.get_password(system, keyring_username)
+        if 'keyring' in globals()
+        else None
+    )
+    if not password:
+        password = getpass.getpass()
+    Credential = collections.namedtuple('Credential', 'username password')
+    return Credential(username, password)
 
 def add_milestone_and_version(version):
-	base = 'https://api.bitbucket.org'
-	for type in 'milestones', 'versions':
-		url = (base + '/1.0/repositories/{repo}/issues/{type}'
-			.format(repo = get_repo_name(), type=type))
-		resp = requests.post(url=url,
-			data='name='+version, auth=get_mercurial_creds())
-		resp.raise_for_status()
+    base = 'https://api.bitbucket.org'
+    for type in 'milestones', 'versions':
+        url = (base + '/1.0/repositories/{repo}/issues/{type}'
+            .format(repo = get_repo_name(), type=type))
+        resp = requests.post(url=url,
+            data='name='+version, auth=get_mercurial_creds())
+        resp.raise_for_status()
 
 def bump_versions(target_ver):
-	for filename in files_with_versions:
-		bump_version(filename, target_ver)
-	subprocess.check_call(['hg', 'ci', '-m',
-		'Bumped to {target_ver} in preparation for next '
-		'release.'.format(**vars())])
-	return target_ver
+    for filename in files_with_versions:
+        bump_version(filename, target_ver)
+    subprocess.check_call(['hg', 'ci', '-m',
+        'Bumped to {target_ver} in preparation for next '
+        'release.'.format(**vars())])
+    return target_ver
 
 def bump_version(filename, target_ver):
-	with open(filename, 'rb') as f:
-		lines = [
-			line.replace(VERSION.encode('ascii'), target_ver.encode('ascii'))
-			for line in f
-		]
-	with open(filename, 'wb') as f:
-		f.writelines(lines)
+    with open(filename, 'rb') as f:
+        lines = [
+            line.replace(VERSION.encode('ascii'), target_ver.encode('ascii'))
+            for line in f
+        ]
+    with open(filename, 'wb') as f:
+        f.writelines(lines)
 
 def do_release():
-	assert all(map(os.path.exists, files_with_versions)), (
-		"Expected file(s) missing")
+    assert all(map(os.path.exists, files_with_versions)), (
+        "Expected file(s) missing")
 
-	assert has_sphinx(), "You must have Sphinx installed to release"
+    assert has_sphinx(), "You must have Sphinx installed to release"
 
-	set_versions()
+    set_versions()
 
-	res = input('Have you read through the SCM changelog and '
-		'confirmed the changelog is current for releasing {VERSION}? '
-		.format(**globals()))
-	if not res.lower().startswith('y'):
-		print("Please do that")
-		raise SystemExit(1)
+    res = input('Have you read through the SCM changelog and '
+        'confirmed the changelog is current for releasing {VERSION}? '
+        .format(**globals()))
+    if not res.lower().startswith('y'):
+        print("Please do that")
+        raise SystemExit(1)
 
-	print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
-	res = input('Have you or has someone verified that the tests '
-		'pass on this revision? ')
-	if not res.lower().startswith('y'):
-		print("Please do that")
-		raise SystemExit(2)
+    print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
+    res = input('Have you or has someone verified that the tests '
+        'pass on this revision? ')
+    if not res.lower().startswith('y'):
+        print("Please do that")
+        raise SystemExit(2)
 
-	subprocess.check_call(['hg', 'tag', VERSION])
+    subprocess.check_call(['hg', 'tag', VERSION])
 
-	subprocess.check_call(['hg', 'update', VERSION])
+    subprocess.check_call(['hg', 'update', VERSION])
 
-	upload_to_pypi()
-	upload_ez_setup()
+    upload_to_pypi()
+    upload_ez_setup()
 
-	# update to the tip for the next operation
-	subprocess.check_call(['hg', 'update'])
+    # update to the tip for the next operation
+    subprocess.check_call(['hg', 'update'])
 
-	# we just tagged the current version, bump for the next release.
-	next_ver = bump_versions(infer_next_version(VERSION))
+    # we just tagged the current version, bump for the next release.
+    next_ver = bump_versions(infer_next_version(VERSION))
 
-	# push the changes
-	subprocess.check_call(['hg', 'push'])
+    # push the changes
+    subprocess.check_call(['hg', 'push'])
 
-	add_milestone_and_version(next_ver)
+    add_milestone_and_version(next_ver)
 
 def upload_to_pypi():
-	linkify('CHANGES.txt', 'CHANGES (links).txt')
-
-	has_docs = build_docs()
-	if os.path.isdir('./dist'):
-		shutil.rmtree('./dist')
-	cmd = [
-		sys.executable, 'setup.py', '-q',
-		'egg_info', '-RD', '-b', '',
-		'sdist',
-		'register', '-r', PACKAGE_INDEX,
-		'upload', '-r', PACKAGE_INDEX,
-	]
-	if has_docs:
-		cmd.extend([
-			'upload_docs', '-r', PACKAGE_INDEX
-		])
-	env = os.environ.copy()
-	env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
-	subprocess.check_call(cmd, env=env)
+    linkify('CHANGES.txt', 'CHANGES (links).txt')
+
+    has_docs = build_docs()
+    if os.path.isdir('./dist'):
+        shutil.rmtree('./dist')
+    cmd = [
+        sys.executable, 'setup.py', '-q',
+        'egg_info', '-RD', '-b', '',
+        'sdist',
+        'register', '-r', PACKAGE_INDEX,
+        'upload', '-r', PACKAGE_INDEX,
+    ]
+    if has_docs:
+        cmd.extend([
+            'upload_docs', '-r', PACKAGE_INDEX
+        ])
+    env = os.environ.copy()
+    env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
+    subprocess.check_call(cmd, env=env)
 
 def upload_ez_setup():
-	"""
-	TODO: upload ez_setup.py to a permalinked location. Currently, this
-	location is https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py .
-	In the long term, it should be on PyPI.
-	"""
+    """
+    TODO: upload ez_setup.py to a permalinked location. Currently, this
+    location is https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py .
+    In the long term, it should be on PyPI.
+    """
 
 def has_sphinx():
-	try:
-		devnull = open(os.path.devnull, 'wb')
-		subprocess.Popen(['sphinx-build', '--version'], stdout=devnull,
-			stderr=subprocess.STDOUT).wait()
-	except Exception:
-		return False
-	return True
+    try:
+        devnull = open(os.path.devnull, 'wb')
+        subprocess.Popen(['sphinx-build', '--version'], stdout=devnull,
+            stderr=subprocess.STDOUT).wait()
+    except Exception:
+        return False
+    return True
 
 def build_docs():
-	if not os.path.isdir('docs'):
-		return
-	if os.path.isdir('docs/build'):
-		shutil.rmtree('docs/build')
-	cmd = [
-		'sphinx-build',
-		'-b', 'html',
-		'-d', 'build/doctrees',
-		'.',
-		'build/html',
-	]
-	subprocess.check_call(cmd, cwd='docs')
-	return True
+    if not os.path.isdir('docs'):
+        return
+    if os.path.isdir('docs/build'):
+        shutil.rmtree('docs/build')
+    cmd = [
+        'sphinx-build',
+        '-b', 'html',
+        '-d', 'build/doctrees',
+        '.',
+        'build/html',
+    ]
+    subprocess.check_call(cmd, cwd='docs')
+    return True
 
 def linkify(source, dest):
-	with open(source) as source:
-		out = _linkified_text(source.read())
-	with open(dest, 'w') as dest:
-		dest.write(out)
+    with open(source) as source:
+        out = _linkified_text(source.read())
+    with open(dest, 'w') as dest:
+        dest.write(out)
 
 def _linkified(rst_path):
-	"return contents of reStructureText file with linked issue references"
-	rst_file = open(rst_path)
-	rst_content = rst_file.read()
-	rst_file.close()
+    "return contents of reStructureText file with linked issue references"
+    rst_file = open(rst_path)
+    rst_content = rst_file.read()
+    rst_file.close()
 
-	return _linkified_text(rst_content)
+    return _linkified_text(rst_content)
 
 def _linkified_text(rst_content):
-	# first identify any existing HREFs so they're not changed
-	HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
-
-	# split on the HREF pattern, returning the parts to be linkified
-	plain_text_parts = HREF_pattern.split(rst_content)
-	anchors = []
-	linkified_parts = [_linkified_part(part, anchors)
-		for part in plain_text_parts]
-	pairs = zip_longest(
-		linkified_parts,
-		HREF_pattern.findall(rst_content),
-		fillvalue='',
-	)
-	rst_content = ''.join(flatten(pairs))
-
-	anchors = sorted(anchors)
-
-	bitroot = 'https://bitbucket.org/tarek/distribute'
-	rst_content += "\n"
-	for x in anchors:
-		issue = re.findall(r'\d+', x)[0]
-		rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
-	rst_content += "\n"
-	return rst_content
+    # first identify any existing HREFs so they're not changed
+    HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
+
+    # split on the HREF pattern, returning the parts to be linkified
+    plain_text_parts = HREF_pattern.split(rst_content)
+    anchors = []
+    linkified_parts = [_linkified_part(part, anchors)
+        for part in plain_text_parts]
+    pairs = zip_longest(
+        linkified_parts,
+        HREF_pattern.findall(rst_content),
+        fillvalue='',
+    )
+    rst_content = ''.join(flatten(pairs))
+
+    anchors = sorted(anchors)
+
+    bitroot = 'https://bitbucket.org/tarek/distribute'
+    rst_content += "\n"
+    for x in anchors:
+        issue = re.findall(r'\d+', x)[0]
+        rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
+    rst_content += "\n"
+    return rst_content
 
 def flatten(listOfLists):
-	"Flatten one level of nesting"
-	return itertools.chain.from_iterable(listOfLists)
+    "Flatten one level of nesting"
+    return itertools.chain.from_iterable(listOfLists)
 
 
 def _linkified_part(text, anchors):
-	"""
-	Linkify a part and collect any anchors generated
-	"""
-	revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
+    """
+    Linkify a part and collect any anchors generated
+    """
+    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
 
-	anchors.extend(revision.findall(text)) # ['Issue #43', ...]
-	return revision.sub(r'`\1`_', text)
+    anchors.extend(revision.findall(text)) # ['Issue #43', ...]
+    return revision.sub(r'`\1`_', text)
 
 if __name__ == '__main__':
-	do_release()
+    do_release()

From 9c45197cdf596b15822e5b15e3442c75322af130 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 9 Jul 2013 21:12:09 -0400
Subject: [PATCH 1334/8469] Creating branch for 0.7 maintenance

--HG--
branch : 0.7-maintenance

From 2a05cb8c9f72d15f953d932e5343235fc024fec3 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Tue, 9 Jul 2013 22:05:50 -0400
Subject: [PATCH 1335/8469] Add the pure python sha implementations from PyPy
 to handle Python 2.4

--HG--
extra : rebase_source : ffdfb8a18db6ad43a669231a47e2674964776b48
---
 setuptools/_backport/__init__.py         |   0
 setuptools/_backport/hashlib/__init__.py | 146 +++++++++
 setuptools/_backport/hashlib/_sha.py     | 359 +++++++++++++++++++++++
 setuptools/_backport/hashlib/_sha256.py  | 260 ++++++++++++++++
 setuptools/_backport/hashlib/_sha512.py  | 288 ++++++++++++++++++
 5 files changed, 1053 insertions(+)
 create mode 100644 setuptools/_backport/__init__.py
 create mode 100644 setuptools/_backport/hashlib/__init__.py
 create mode 100644 setuptools/_backport/hashlib/_sha.py
 create mode 100644 setuptools/_backport/hashlib/_sha256.py
 create mode 100644 setuptools/_backport/hashlib/_sha512.py

diff --git a/setuptools/_backport/__init__.py b/setuptools/_backport/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/_backport/hashlib/__init__.py b/setuptools/_backport/hashlib/__init__.py
new file mode 100644
index 0000000000..5aeab496af
--- /dev/null
+++ b/setuptools/_backport/hashlib/__init__.py
@@ -0,0 +1,146 @@
+# $Id$
+#
+#  Copyright (C) 2005   Gregory P. Smith (greg@krypto.org)
+#  Licensed to PSF under a Contributor Agreement.
+#
+
+__doc__ = """hashlib module - A common interface to many hash functions.
+
+new(name, string='') - returns a new hash object implementing the
+                       given hash function; initializing the hash
+                       using the given string data.
+
+Named constructor functions are also available, these are much faster
+than using new():
+
+md5(), sha1(), sha224(), sha256(), sha384(), and sha512()
+
+More algorithms may be available on your platform but the above are
+guaranteed to exist.
+
+NOTE: If you want the adler32 or crc32 hash functions they are available in
+the zlib module.
+
+Choose your hash function wisely.  Some have known collision weaknesses.
+sha384 and sha512 will be slow on 32 bit platforms.
+
+Hash objects have these methods:
+ - update(arg): Update the hash object with the string arg. Repeated calls
+                are equivalent to a single call with the concatenation of all
+                the arguments.
+ - digest():    Return the digest of the strings passed to the update() method
+                so far. This may contain non-ASCII characters, including
+                NUL bytes.
+ - hexdigest(): Like digest() except the digest is returned as a string of
+                double length, containing only hexadecimal digits.
+ - copy():      Return a copy (clone) of the hash object. This can be used to
+                efficiently compute the digests of strings that share a common
+                initial substring.
+
+For example, to obtain the digest of the string 'Nobody inspects the
+spammish repetition':
+
+    >>> import hashlib
+    >>> m = hashlib.md5()
+    >>> m.update("Nobody inspects")
+    >>> m.update(" the spammish repetition")
+    >>> m.digest()
+    '\\xbbd\\x9c\\x83\\xdd\\x1e\\xa5\\xc9\\xd9\\xde\\xc9\\xa1\\x8d\\xf0\\xff\\xe9'
+
+More condensed:
+
+    >>> hashlib.sha224("Nobody inspects the spammish repetition").hexdigest()
+    'a4337bc45a8fc544c03f52dc550cd6e1e87021bc896588bd79e901e2'
+
+"""
+
+# This tuple and __get_builtin_constructor() must be modified if a new
+# always available algorithm is added.
+__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512')
+
+algorithms = __always_supported
+
+__all__ = __always_supported + ('new', 'algorithms')
+
+
+def __get_builtin_constructor(name):
+    try:
+        if name in ('SHA1', 'sha1'):
+            import _sha
+            return _sha.new
+        elif name in ('MD5', 'md5'):
+            import md5
+            return md5.new
+        elif name in ('SHA256', 'sha256', 'SHA224', 'sha224'):
+            import _sha256
+            bs = name[3:]
+            if bs == '256':
+                return _sha256.sha256
+            elif bs == '224':
+                return _sha256.sha224
+        elif name in ('SHA512', 'sha512', 'SHA384', 'sha384'):
+            import _sha512
+            bs = name[3:]
+            if bs == '512':
+                return _sha512.sha512
+            elif bs == '384':
+                return _sha512.sha384
+    except ImportError:
+        pass  # no extension module, this hash is unsupported.
+
+    raise ValueError('unsupported hash type %s' % name)
+
+
+def __get_openssl_constructor(name):
+    try:
+        f = getattr(_hashlib, 'openssl_' + name)
+        # Allow the C module to raise ValueError.  The function will be
+        # defined but the hash not actually available thanks to OpenSSL.
+        f()
+        # Use the C function directly (very fast)
+        return f
+    except (AttributeError, ValueError):
+        return __get_builtin_constructor(name)
+
+
+def __py_new(name, string=''):
+    """new(name, string='') - Return a new hashing object using the named algorithm;
+    optionally initialized with a string.
+    """
+    return __get_builtin_constructor(name)(string)
+
+
+def __hash_new(name, string=''):
+    """new(name, string='') - Return a new hashing object using the named algorithm;
+    optionally initialized with a string.
+    """
+    try:
+        return _hashlib.new(name, string)
+    except ValueError:
+        # If the _hashlib module (OpenSSL) doesn't support the named
+        # hash, try using our builtin implementations.
+        # This allows for SHA224/256 and SHA384/512 support even though
+        # the OpenSSL library prior to 0.9.8 doesn't provide them.
+        return __get_builtin_constructor(name)(string)
+
+
+try:
+    import _hashlib
+    new = __hash_new
+    __get_hash = __get_openssl_constructor
+except ImportError:
+    new = __py_new
+    __get_hash = __get_builtin_constructor
+
+for __func_name in __always_supported:
+    # try them all, some may not work due to the OpenSSL
+    # version not supporting that algorithm.
+    try:
+        globals()[__func_name] = __get_hash(__func_name)
+    except ValueError:
+        import logging
+        logging.exception('code for hash %s was not found.', __func_name)
+
+# Cleanup locals()
+del __always_supported, __func_name, __get_hash
+del __py_new, __hash_new, __get_openssl_constructor
diff --git a/setuptools/_backport/hashlib/_sha.py b/setuptools/_backport/hashlib/_sha.py
new file mode 100644
index 0000000000..d49993c887
--- /dev/null
+++ b/setuptools/_backport/hashlib/_sha.py
@@ -0,0 +1,359 @@
+# -*- coding: iso-8859-1 -*-
+"""A sample implementation of SHA-1 in pure Python.
+
+   Framework adapted from Dinu Gherman's MD5 implementation by
+   J. Hallén and L. Creighton. SHA-1 implementation based directly on
+   the text of the NIST standard FIPS PUB 180-1.
+"""
+
+
+__date__    = '2004-11-17'
+__version__ = 0.91 # Modernised by J. Hallén and L. Creighton for Pypy
+
+
+import struct, copy
+
+
+# ======================================================================
+# Bit-Manipulation helpers
+#
+#   _long2bytes() was contributed by Barry Warsaw
+#   and is reused here with tiny modifications.
+# ======================================================================
+
+def _long2bytesBigEndian(n, blocksize=0):
+    """Convert a long integer to a byte string.
+
+    If optional blocksize is given and greater than zero, pad the front
+    of the byte string with binary zeros so that the length is a multiple
+    of blocksize.
+    """
+
+    # After much testing, this algorithm was deemed to be the fastest.
+    s = ''
+    pack = struct.pack
+    while n > 0:
+        s = pack('>I', n & 0xffffffff) + s
+        n = n >> 32
+
+    # Strip off leading zeros.
+    for i in range(len(s)):
+        if s[i] != '\000':
+            break
+    else:
+        # Only happens when n == 0.
+        s = '\000'
+        i = 0
+
+    s = s[i:]
+
+    # Add back some pad bytes. This could be done more efficiently
+    # w.r.t. the de-padding being done above, but sigh...
+    if blocksize > 0 and len(s) % blocksize:
+        s = (blocksize - len(s) % blocksize) * '\000' + s
+
+    return s
+
+
+def _bytelist2longBigEndian(list):
+    "Transform a list of characters into a list of longs."
+
+    imax = len(list) // 4
+    hl = [0] * imax
+
+    j = 0
+    i = 0
+    while i < imax:
+        b0 = ord(list[j]) << 24
+        b1 = ord(list[j+1]) << 16
+        b2 = ord(list[j+2]) << 8
+        b3 = ord(list[j+3])
+        hl[i] = b0 | b1 | b2 | b3
+        i = i+1
+        j = j+4
+
+    return hl
+
+
+def _rotateLeft(x, n):
+    "Rotate x (32 bit) left n bits circularly."
+
+    return (x << n) | (x >> (32-n))
+
+
+# ======================================================================
+# The SHA transformation functions
+#
+# ======================================================================
+
+def f0_19(B, C, D):
+    return (B & C) | ((~ B) & D)
+
+def f20_39(B, C, D):
+    return B ^ C ^ D
+
+def f40_59(B, C, D):
+    return (B & C) | (B & D) | (C & D)
+
+def f60_79(B, C, D):
+    return B ^ C ^ D
+
+
+f = [f0_19, f20_39, f40_59, f60_79]
+
+# Constants to be used
+K = [
+    0x5A827999, # ( 0 <= t <= 19)
+    0x6ED9EBA1, # (20 <= t <= 39)
+    0x8F1BBCDC, # (40 <= t <= 59)
+    0xCA62C1D6  # (60 <= t <= 79)
+    ]
+
+class sha:
+    "An implementation of the MD5 hash function in pure Python."
+
+    digest_size = digestsize = 20
+    block_size = 1
+
+    def __init__(self):
+        "Initialisation."
+
+        # Initial message length in bits(!).
+        self.length = 0
+        self.count = [0, 0]
+
+        # Initial empty message as a sequence of bytes (8 bit characters).
+        self.input = []
+
+        # Call a separate init function, that can be used repeatedly
+        # to start from scratch on the same object.
+        self.init()
+
+
+    def init(self):
+        "Initialize the message-digest and set all fields to zero."
+
+        self.length = 0
+        self.input = []
+
+        # Initial 160 bit message digest (5 times 32 bit).
+        self.H0 = 0x67452301
+        self.H1 = 0xEFCDAB89
+        self.H2 = 0x98BADCFE
+        self.H3 = 0x10325476
+        self.H4 = 0xC3D2E1F0
+
+    def _transform(self, W):
+
+        for t in range(16, 80):
+            W.append(_rotateLeft(
+                W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1) & 0xffffffff)
+
+        A = self.H0
+        B = self.H1
+        C = self.H2
+        D = self.H3
+        E = self.H4
+
+        """
+        This loop was unrolled to gain about 10% in speed
+        for t in range(0, 80):
+            TEMP = _rotateLeft(A, 5) + f[t/20] + E + W[t] + K[t/20]
+            E = D
+            D = C
+            C = _rotateLeft(B, 30) & 0xffffffff
+            B = A
+            A = TEMP & 0xffffffff
+        """
+
+        for t in range(0, 20):
+            TEMP = _rotateLeft(A, 5) + ((B & C) | ((~ B) & D)) + E + W[t] + K[0]
+            E = D
+            D = C
+            C = _rotateLeft(B, 30) & 0xffffffff
+            B = A
+            A = TEMP & 0xffffffff
+
+        for t in range(20, 40):
+            TEMP = _rotateLeft(A, 5) + (B ^ C ^ D) + E + W[t] + K[1]
+            E = D
+            D = C
+            C = _rotateLeft(B, 30) & 0xffffffff
+            B = A
+            A = TEMP & 0xffffffff
+
+        for t in range(40, 60):
+            TEMP = _rotateLeft(A, 5) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]
+            E = D
+            D = C
+            C = _rotateLeft(B, 30) & 0xffffffff
+            B = A
+            A = TEMP & 0xffffffff
+
+        for t in range(60, 80):
+            TEMP = _rotateLeft(A, 5) + (B ^ C ^ D)  + E + W[t] + K[3]
+            E = D
+            D = C
+            C = _rotateLeft(B, 30) & 0xffffffff
+            B = A
+            A = TEMP & 0xffffffff
+
+
+        self.H0 = (self.H0 + A) & 0xffffffff
+        self.H1 = (self.H1 + B) & 0xffffffff
+        self.H2 = (self.H2 + C) & 0xffffffff
+        self.H3 = (self.H3 + D) & 0xffffffff
+        self.H4 = (self.H4 + E) & 0xffffffff
+
+
+    # Down from here all methods follow the Python Standard Library
+    # API of the sha module.
+
+    def update(self, inBuf):
+        """Add to the current message.
+
+        Update the md5 object with the string arg. Repeated calls
+        are equivalent to a single call with the concatenation of all
+        the arguments, i.e. m.update(a); m.update(b) is equivalent
+        to m.update(a+b).
+
+        The hash is immediately calculated for all full blocks. The final
+        calculation is made in digest(). It will calculate 1-2 blocks,
+        depending on how much padding we have to add. This allows us to
+        keep an intermediate value for the hash, so that we only need to
+        make minimal recalculation if we call update() to add more data
+        to the hashed string.
+        """
+
+        leninBuf = len(inBuf)
+
+        # Compute number of bytes mod 64.
+        index = (self.count[1] >> 3) & 0x3F
+
+        # Update number of bits.
+        self.count[1] = self.count[1] + (leninBuf << 3)
+        if self.count[1] < (leninBuf << 3):
+            self.count[0] = self.count[0] + 1
+        self.count[0] = self.count[0] + (leninBuf >> 29)
+
+        partLen = 64 - index
+
+        if leninBuf >= partLen:
+            self.input[index:] = list(inBuf[:partLen])
+            self._transform(_bytelist2longBigEndian(self.input))
+            i = partLen
+            while i + 63 < leninBuf:
+                self._transform(_bytelist2longBigEndian(list(inBuf[i:i+64])))
+                i = i + 64
+            else:
+                self.input = list(inBuf[i:leninBuf])
+        else:
+            i = 0
+            self.input = self.input + list(inBuf)
+
+
+    def digest(self):
+        """Terminate the message-digest computation and return digest.
+
+        Return the digest of the strings passed to the update()
+        method so far. This is a 16-byte string which may contain
+        non-ASCII characters, including null bytes.
+        """
+
+        H0 = self.H0
+        H1 = self.H1
+        H2 = self.H2
+        H3 = self.H3
+        H4 = self.H4
+        input = [] + self.input
+        count = [] + self.count
+
+        index = (self.count[1] >> 3) & 0x3f
+
+        if index < 56:
+            padLen = 56 - index
+        else:
+            padLen = 120 - index
+
+        padding = ['\200'] + ['\000'] * 63
+        self.update(padding[:padLen])
+
+        # Append length (before padding).
+        bits = _bytelist2longBigEndian(self.input[:56]) + count
+
+        self._transform(bits)
+
+        # Store state in digest.
+        digest = _long2bytesBigEndian(self.H0, 4) + \
+                 _long2bytesBigEndian(self.H1, 4) + \
+                 _long2bytesBigEndian(self.H2, 4) + \
+                 _long2bytesBigEndian(self.H3, 4) + \
+                 _long2bytesBigEndian(self.H4, 4)
+
+        self.H0 = H0
+        self.H1 = H1
+        self.H2 = H2
+        self.H3 = H3
+        self.H4 = H4
+        self.input = input
+        self.count = count
+
+        return digest
+
+
+    def hexdigest(self):
+        """Terminate and return digest in HEX form.
+
+        Like digest() except the digest is returned as a string of
+        length 32, containing only hexadecimal digits. This may be
+        used to exchange the value safely in email or other non-
+        binary environments.
+        """
+        return ''.join(['%02x' % ord(c) for c in self.digest()])
+
+    def copy(self):
+        """Return a clone object.
+
+        Return a copy ('clone') of the md5 object. This can be used
+        to efficiently compute the digests of strings that share
+        a common initial substring.
+        """
+
+        return copy.deepcopy(self)
+
+
+# ======================================================================
+# Mimic Python top-level functions from standard library API
+# for consistency with the _sha module of the standard library.
+# ======================================================================
+
+# These are mandatory variables in the module. They have constant values
+# in the SHA standard.
+
+digest_size = 20
+digestsize = 20
+blocksize = 1
+
+def new(arg=None):
+    """Return a new sha crypto object.
+
+    If arg is present, the method call update(arg) is made.
+    """
+
+    crypto = sha()
+    if arg:
+        crypto.update(arg)
+
+    return crypto
+
+
+if __name__ == "__main__":
+    a_str = "just a test string"
+
+    assert 'da39a3ee5e6b4b0d3255bfef95601890afd80709' == new().hexdigest()
+    assert '3f0cf2e3d9e5903e839417dfc47fed6bfa6457f6' == new(a_str).hexdigest()
+    assert '0852b254078fe3772568a4aba37b917f3d4066ba' == new(a_str*7).hexdigest()
+
+    s = new(a_str)
+    s.update(a_str)
+    assert '8862c1b50967f39d3db6bdc2877d9ccebd3102e5' == s.hexdigest()
diff --git a/setuptools/_backport/hashlib/_sha256.py b/setuptools/_backport/hashlib/_sha256.py
new file mode 100644
index 0000000000..805dbd086c
--- /dev/null
+++ b/setuptools/_backport/hashlib/_sha256.py
@@ -0,0 +1,260 @@
+import struct
+
+SHA_BLOCKSIZE = 64
+SHA_DIGESTSIZE = 32
+
+
+def new_shaobject():
+    return {
+        'digest': [0]*8,
+        'count_lo': 0,
+        'count_hi': 0,
+        'data': [0]* SHA_BLOCKSIZE,
+        'local': 0,
+        'digestsize': 0
+    }
+
+ROR = lambda x, y: (((x & 0xffffffff) >> (y & 31)) | (x << (32 - (y & 31)))) & 0xffffffff
+Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
+Maj = lambda x, y, z: (((x | y) & z) | (x & y))
+S = lambda x, n: ROR(x, n)
+R = lambda x, n: (x & 0xffffffff) >> n
+Sigma0 = lambda x: (S(x, 2) ^ S(x, 13) ^ S(x, 22))
+Sigma1 = lambda x: (S(x, 6) ^ S(x, 11) ^ S(x, 25))
+Gamma0 = lambda x: (S(x, 7) ^ S(x, 18) ^ R(x, 3))
+Gamma1 = lambda x: (S(x, 17) ^ S(x, 19) ^ R(x, 10))
+
+def sha_transform(sha_info):
+    W = []
+
+    d = sha_info['data']
+    for i in xrange(0,16):
+        W.append( (d[4*i]<<24) + (d[4*i+1]<<16) + (d[4*i+2]<<8) + d[4*i+3])
+
+    for i in xrange(16,64):
+        W.append( (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xffffffff )
+
+    ss = sha_info['digest'][:]
+
+    def RND(a,b,c,d,e,f,g,h,i,ki):
+        t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i];
+        t1 = Sigma0(a) + Maj(a, b, c);
+        d += t0;
+        h  = t0 + t1;
+        return d & 0xffffffff, h & 0xffffffff
+
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],0,0x428a2f98);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],1,0x71374491);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],2,0xb5c0fbcf);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],3,0xe9b5dba5);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],4,0x3956c25b);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],5,0x59f111f1);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],6,0x923f82a4);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],7,0xab1c5ed5);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],8,0xd807aa98);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],9,0x12835b01);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],10,0x243185be);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],11,0x550c7dc3);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],12,0x72be5d74);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],13,0x80deb1fe);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],14,0x9bdc06a7);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],15,0xc19bf174);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],16,0xe49b69c1);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],17,0xefbe4786);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],18,0x0fc19dc6);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],19,0x240ca1cc);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],20,0x2de92c6f);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],21,0x4a7484aa);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],22,0x5cb0a9dc);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],23,0x76f988da);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],24,0x983e5152);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],25,0xa831c66d);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],26,0xb00327c8);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],27,0xbf597fc7);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],28,0xc6e00bf3);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],29,0xd5a79147);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],30,0x06ca6351);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],31,0x14292967);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],32,0x27b70a85);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],33,0x2e1b2138);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],34,0x4d2c6dfc);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],35,0x53380d13);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],36,0x650a7354);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],37,0x766a0abb);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],38,0x81c2c92e);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],39,0x92722c85);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],40,0xa2bfe8a1);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],41,0xa81a664b);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],42,0xc24b8b70);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],43,0xc76c51a3);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],44,0xd192e819);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],45,0xd6990624);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],46,0xf40e3585);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],47,0x106aa070);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],48,0x19a4c116);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],49,0x1e376c08);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],50,0x2748774c);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],51,0x34b0bcb5);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],52,0x391c0cb3);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],53,0x4ed8aa4a);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],54,0x5b9cca4f);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],55,0x682e6ff3);
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],56,0x748f82ee);
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],57,0x78a5636f);
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],58,0x84c87814);
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],59,0x8cc70208);
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],60,0x90befffa);
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],61,0xa4506ceb);
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],62,0xbef9a3f7);
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],63,0xc67178f2);
+
+    dig = []
+    for i, x in enumerate(sha_info['digest']):
+        dig.append( (x + ss[i]) & 0xffffffff )
+    sha_info['digest'] = dig
+
+def sha_init():
+    sha_info = new_shaobject()
+    sha_info['digest'] = [0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19]
+    sha_info['count_lo'] = 0
+    sha_info['count_hi'] = 0
+    sha_info['local'] = 0
+    sha_info['digestsize'] = 32
+    return sha_info
+
+def sha224_init():
+    sha_info = new_shaobject()
+    sha_info['digest'] = [0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4]
+    sha_info['count_lo'] = 0
+    sha_info['count_hi'] = 0
+    sha_info['local'] = 0
+    sha_info['digestsize'] = 28
+    return sha_info
+
+def getbuf(s):
+    if isinstance(s, str):
+        return s
+    elif isinstance(s, unicode):
+        return str(s)
+    else:
+        return buffer(s)
+
+def sha_update(sha_info, buffer):
+    count = len(buffer)
+    buffer_idx = 0
+    clo = (sha_info['count_lo'] + (count << 3)) & 0xffffffff
+    if clo < sha_info['count_lo']:
+        sha_info['count_hi'] += 1
+    sha_info['count_lo'] = clo
+
+    sha_info['count_hi'] += (count >> 29)
+
+    if sha_info['local']:
+        i = SHA_BLOCKSIZE - sha_info['local']
+        if i > count:
+            i = count
+
+        # copy buffer
+        for x in enumerate(buffer[buffer_idx:buffer_idx+i]):
+            sha_info['data'][sha_info['local']+x[0]] = struct.unpack('B', x[1])[0]
+
+        count -= i
+        buffer_idx += i
+
+        sha_info['local'] += i
+        if sha_info['local'] == SHA_BLOCKSIZE:
+            sha_transform(sha_info)
+            sha_info['local'] = 0
+        else:
+            return
+
+    while count >= SHA_BLOCKSIZE:
+        # copy buffer
+        sha_info['data'] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + SHA_BLOCKSIZE]]
+        count -= SHA_BLOCKSIZE
+        buffer_idx += SHA_BLOCKSIZE
+        sha_transform(sha_info)
+
+
+    # copy buffer
+    pos = sha_info['local']
+    sha_info['data'][pos:pos+count] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + count]]
+    sha_info['local'] = count
+
+def sha_final(sha_info):
+    lo_bit_count = sha_info['count_lo']
+    hi_bit_count = sha_info['count_hi']
+    count = (lo_bit_count >> 3) & 0x3f
+    sha_info['data'][count] = 0x80;
+    count += 1
+    if count > SHA_BLOCKSIZE - 8:
+        # zero the bytes in data after the count
+        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
+        sha_transform(sha_info)
+        # zero bytes in data
+        sha_info['data'] = [0] * SHA_BLOCKSIZE
+    else:
+        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
+
+    sha_info['data'][56] = (hi_bit_count >> 24) & 0xff
+    sha_info['data'][57] = (hi_bit_count >> 16) & 0xff
+    sha_info['data'][58] = (hi_bit_count >>  8) & 0xff
+    sha_info['data'][59] = (hi_bit_count >>  0) & 0xff
+    sha_info['data'][60] = (lo_bit_count >> 24) & 0xff
+    sha_info['data'][61] = (lo_bit_count >> 16) & 0xff
+    sha_info['data'][62] = (lo_bit_count >>  8) & 0xff
+    sha_info['data'][63] = (lo_bit_count >>  0) & 0xff
+
+    sha_transform(sha_info)
+
+    dig = []
+    for i in sha_info['digest']:
+        dig.extend([ ((i>>24) & 0xff), ((i>>16) & 0xff), ((i>>8) & 0xff), (i & 0xff) ])
+    return ''.join([chr(i) for i in dig])
+
+class sha256(object):
+    digest_size = digestsize = SHA_DIGESTSIZE
+    block_size = SHA_BLOCKSIZE
+
+    def __init__(self, s=None):
+        self._sha = sha_init()
+        if s:
+            sha_update(self._sha, getbuf(s))
+
+    def update(self, s):
+        sha_update(self._sha, getbuf(s))
+
+    def digest(self):
+        return sha_final(self._sha.copy())[:self._sha['digestsize']]
+
+    def hexdigest(self):
+        return ''.join(['%.2x' % ord(i) for i in self.digest()])
+
+    def copy(self):
+        new = sha256.__new__(sha256)
+        new._sha = self._sha.copy()
+        return new
+
+class sha224(sha256):
+    digest_size = digestsize = 28
+
+    def __init__(self, s=None):
+        self._sha = sha224_init()
+        if s:
+            sha_update(self._sha, getbuf(s))
+
+    def copy(self):
+        new = sha224.__new__(sha224)
+        new._sha = self._sha.copy()
+        return new
+
+if __name__ == "__main__":
+    a_str = "just a test string"
+
+    assert 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' == sha256().hexdigest()
+    assert 'd7b553c6f09ac85d142415f857c5310f3bbbe7cdd787cce4b985acedd585266f' == sha256(a_str).hexdigest()
+    assert '8113ebf33c97daa9998762aacafe750c7cefc2b2f173c90c59663a57fe626f21' == sha256(a_str*7).hexdigest()
+
+    s = sha256(a_str)
+    s.update(a_str)
+    assert '03d9963e05a094593190b6fc794cb1a3e1ac7d7883f0b5855268afeccc70d461' == s.hexdigest()
diff --git a/setuptools/_backport/hashlib/_sha512.py b/setuptools/_backport/hashlib/_sha512.py
new file mode 100644
index 0000000000..68ff46f308
--- /dev/null
+++ b/setuptools/_backport/hashlib/_sha512.py
@@ -0,0 +1,288 @@
+"""
+This code was Ported from CPython's sha512module.c
+"""
+
+import struct
+
+SHA_BLOCKSIZE = 128
+SHA_DIGESTSIZE = 64
+
+
+def new_shaobject():
+    return {
+        'digest': [0]*8,
+        'count_lo': 0,
+        'count_hi': 0,
+        'data': [0]* SHA_BLOCKSIZE,
+        'local': 0,
+        'digestsize': 0
+    }
+
+ROR64 = lambda x, y: (((x & 0xffffffffffffffff) >> (y & 63)) | (x << (64 - (y & 63)))) & 0xffffffffffffffff
+Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
+Maj = lambda x, y, z: (((x | y) & z) | (x & y))
+S = lambda x, n: ROR64(x, n)
+R = lambda x, n: (x & 0xffffffffffffffff) >> n
+Sigma0 = lambda x: (S(x, 28) ^ S(x, 34) ^ S(x, 39))
+Sigma1 = lambda x: (S(x, 14) ^ S(x, 18) ^ S(x, 41))
+Gamma0 = lambda x: (S(x, 1) ^ S(x, 8) ^ R(x, 7))
+Gamma1 = lambda x: (S(x, 19) ^ S(x, 61) ^ R(x, 6))
+
+def sha_transform(sha_info):
+    W = []
+
+    d = sha_info['data']
+    for i in xrange(0,16):
+        W.append( (d[8*i]<<56) + (d[8*i+1]<<48) + (d[8*i+2]<<40) + (d[8*i+3]<<32) + (d[8*i+4]<<24) + (d[8*i+5]<<16) + (d[8*i+6]<<8) + d[8*i+7])
+
+    for i in xrange(16,80):
+        W.append( (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xffffffffffffffff )
+
+    ss = sha_info['digest'][:]
+
+    def RND(a,b,c,d,e,f,g,h,i,ki):
+        t0 = (h + Sigma1(e) + Ch(e, f, g) + ki + W[i]) & 0xffffffffffffffff
+        t1 = (Sigma0(a) + Maj(a, b, c)) & 0xffffffffffffffff
+        d = (d + t0) & 0xffffffffffffffff
+        h = (t0 + t1) & 0xffffffffffffffff
+        return d & 0xffffffffffffffff, h & 0xffffffffffffffff
+
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],0,0x428a2f98d728ae22)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],1,0x7137449123ef65cd)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],2,0xb5c0fbcfec4d3b2f)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],3,0xe9b5dba58189dbbc)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],4,0x3956c25bf348b538)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],5,0x59f111f1b605d019)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],6,0x923f82a4af194f9b)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],7,0xab1c5ed5da6d8118)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],8,0xd807aa98a3030242)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],9,0x12835b0145706fbe)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],10,0x243185be4ee4b28c)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],11,0x550c7dc3d5ffb4e2)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],12,0x72be5d74f27b896f)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],13,0x80deb1fe3b1696b1)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],14,0x9bdc06a725c71235)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],15,0xc19bf174cf692694)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],16,0xe49b69c19ef14ad2)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],17,0xefbe4786384f25e3)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],18,0x0fc19dc68b8cd5b5)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],19,0x240ca1cc77ac9c65)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],20,0x2de92c6f592b0275)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],21,0x4a7484aa6ea6e483)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],22,0x5cb0a9dcbd41fbd4)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],23,0x76f988da831153b5)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],24,0x983e5152ee66dfab)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],25,0xa831c66d2db43210)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],26,0xb00327c898fb213f)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],27,0xbf597fc7beef0ee4)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],28,0xc6e00bf33da88fc2)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],29,0xd5a79147930aa725)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],30,0x06ca6351e003826f)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],31,0x142929670a0e6e70)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],32,0x27b70a8546d22ffc)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],33,0x2e1b21385c26c926)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],34,0x4d2c6dfc5ac42aed)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],35,0x53380d139d95b3df)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],36,0x650a73548baf63de)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],37,0x766a0abb3c77b2a8)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],38,0x81c2c92e47edaee6)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],39,0x92722c851482353b)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],40,0xa2bfe8a14cf10364)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],41,0xa81a664bbc423001)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],42,0xc24b8b70d0f89791)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],43,0xc76c51a30654be30)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],44,0xd192e819d6ef5218)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],45,0xd69906245565a910)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],46,0xf40e35855771202a)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],47,0x106aa07032bbd1b8)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],48,0x19a4c116b8d2d0c8)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],49,0x1e376c085141ab53)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],50,0x2748774cdf8eeb99)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],51,0x34b0bcb5e19b48a8)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],52,0x391c0cb3c5c95a63)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],53,0x4ed8aa4ae3418acb)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],54,0x5b9cca4f7763e373)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],55,0x682e6ff3d6b2b8a3)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],56,0x748f82ee5defb2fc)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],57,0x78a5636f43172f60)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],58,0x84c87814a1f0ab72)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],59,0x8cc702081a6439ec)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],60,0x90befffa23631e28)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],61,0xa4506cebde82bde9)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],62,0xbef9a3f7b2c67915)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],63,0xc67178f2e372532b)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],64,0xca273eceea26619c)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],65,0xd186b8c721c0c207)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],66,0xeada7dd6cde0eb1e)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],67,0xf57d4f7fee6ed178)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],68,0x06f067aa72176fba)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],69,0x0a637dc5a2c898a6)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],70,0x113f9804bef90dae)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],71,0x1b710b35131c471b)
+    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],72,0x28db77f523047d84)
+    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],73,0x32caab7b40c72493)
+    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],74,0x3c9ebe0a15c9bebc)
+    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],75,0x431d67c49c100d4c)
+    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],76,0x4cc5d4becb3e42b6)
+    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],77,0x597f299cfc657e2a)
+    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],78,0x5fcb6fab3ad6faec)
+    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],79,0x6c44198c4a475817)
+
+    dig = []
+    for i, x in enumerate(sha_info['digest']):
+        dig.append( (x + ss[i]) & 0xffffffffffffffff )
+    sha_info['digest'] = dig
+
+def sha_init():
+    sha_info = new_shaobject()
+    sha_info['digest'] = [ 0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1, 0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179]
+    sha_info['count_lo'] = 0
+    sha_info['count_hi'] = 0
+    sha_info['local'] = 0
+    sha_info['digestsize'] = 64
+    return sha_info
+
+def sha384_init():
+    sha_info = new_shaobject()
+    sha_info['digest'] = [ 0xcbbb9d5dc1059ed8, 0x629a292a367cd507, 0x9159015a3070dd17, 0x152fecd8f70e5939, 0x67332667ffc00b31, 0x8eb44a8768581511, 0xdb0c2e0d64f98fa7, 0x47b5481dbefa4fa4]
+    sha_info['count_lo'] = 0
+    sha_info['count_hi'] = 0
+    sha_info['local'] = 0
+    sha_info['digestsize'] = 48
+    return sha_info
+
+def getbuf(s):
+    if isinstance(s, str):
+        return s
+    elif isinstance(s, unicode):
+        return str(s)
+    else:
+        return buffer(s)
+
+def sha_update(sha_info, buffer):
+    count = len(buffer)
+    buffer_idx = 0
+    clo = (sha_info['count_lo'] + (count << 3)) & 0xffffffff
+    if clo < sha_info['count_lo']:
+        sha_info['count_hi'] += 1
+    sha_info['count_lo'] = clo
+
+    sha_info['count_hi'] += (count >> 29)
+
+    if sha_info['local']:
+        i = SHA_BLOCKSIZE - sha_info['local']
+        if i > count:
+            i = count
+
+        # copy buffer
+        for x in enumerate(buffer[buffer_idx:buffer_idx+i]):
+            sha_info['data'][sha_info['local']+x[0]] = struct.unpack('B', x[1])[0]
+
+        count -= i
+        buffer_idx += i
+
+        sha_info['local'] += i
+        if sha_info['local'] == SHA_BLOCKSIZE:
+            sha_transform(sha_info)
+            sha_info['local'] = 0
+        else:
+            return
+
+    while count >= SHA_BLOCKSIZE:
+        # copy buffer
+        sha_info['data'] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + SHA_BLOCKSIZE]]
+        count -= SHA_BLOCKSIZE
+        buffer_idx += SHA_BLOCKSIZE
+        sha_transform(sha_info)
+
+    # copy buffer
+    pos = sha_info['local']
+    sha_info['data'][pos:pos+count] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + count]]
+    sha_info['local'] = count
+
+def sha_final(sha_info):
+    lo_bit_count = sha_info['count_lo']
+    hi_bit_count = sha_info['count_hi']
+    count = (lo_bit_count >> 3) & 0x7f
+    sha_info['data'][count] = 0x80;
+    count += 1
+    if count > SHA_BLOCKSIZE - 16:
+        # zero the bytes in data after the count
+        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
+        sha_transform(sha_info)
+        # zero bytes in data
+        sha_info['data'] = [0] * SHA_BLOCKSIZE
+    else:
+        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
+
+    sha_info['data'][112] = 0;
+    sha_info['data'][113] = 0;
+    sha_info['data'][114] = 0;
+    sha_info['data'][115] = 0;
+    sha_info['data'][116] = 0;
+    sha_info['data'][117] = 0;
+    sha_info['data'][118] = 0;
+    sha_info['data'][119] = 0;
+
+    sha_info['data'][120] = (hi_bit_count >> 24) & 0xff
+    sha_info['data'][121] = (hi_bit_count >> 16) & 0xff
+    sha_info['data'][122] = (hi_bit_count >>  8) & 0xff
+    sha_info['data'][123] = (hi_bit_count >>  0) & 0xff
+    sha_info['data'][124] = (lo_bit_count >> 24) & 0xff
+    sha_info['data'][125] = (lo_bit_count >> 16) & 0xff
+    sha_info['data'][126] = (lo_bit_count >>  8) & 0xff
+    sha_info['data'][127] = (lo_bit_count >>  0) & 0xff
+
+    sha_transform(sha_info)
+
+    dig = []
+    for i in sha_info['digest']:
+        dig.extend([ ((i>>56) & 0xff), ((i>>48) & 0xff), ((i>>40) & 0xff), ((i>>32) & 0xff), ((i>>24) & 0xff), ((i>>16) & 0xff), ((i>>8) & 0xff), (i & 0xff) ])
+    return ''.join([chr(i) for i in dig])
+
+class sha512(object):
+    digest_size = digestsize = SHA_DIGESTSIZE
+    block_size = SHA_BLOCKSIZE
+
+    def __init__(self, s=None):
+        self._sha = sha_init()
+        if s:
+            sha_update(self._sha, getbuf(s))
+
+    def update(self, s):
+        sha_update(self._sha, getbuf(s))
+
+    def digest(self):
+        return sha_final(self._sha.copy())[:self._sha['digestsize']]
+
+    def hexdigest(self):
+        return ''.join(['%.2x' % ord(i) for i in self.digest()])
+
+    def copy(self):
+        new = sha512.__new__(sha512)
+        new._sha = self._sha.copy()
+        return new
+
+class sha384(sha512):
+    digest_size = digestsize = 48
+
+    def __init__(self, s=None):
+        self._sha = sha384_init()
+        if s:
+            sha_update(self._sha, getbuf(s))
+
+    def copy(self):
+        new = sha384.__new__(sha384)
+        new._sha = self._sha.copy()
+        return new
+
+if __name__ == "__main__":
+    a_str = "just a test string"
+
+    assert sha512().hexdigest() == "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
+    assert sha512(a_str).hexdigest() == "68be4c6664af867dd1d01c8d77e963d87d77b702400c8fabae355a41b8927a5a5533a7f1c28509bbd65c5f3ac716f33be271fbda0ca018b71a84708c9fae8a53"
+    assert sha512(a_str*7).hexdigest() == "3233acdbfcfff9bff9fc72401d31dbffa62bd24e9ec846f0578d647da73258d9f0879f7fde01fe2cc6516af3f343807fdef79e23d696c923d79931db46bf1819"
+
+    s = sha512(a_str)
+    s.update(a_str)
+    assert s.hexdigest() == "341aeb668730bbb48127d5531115f3c39d12cb9586a6ca770898398aff2411087cfe0b570689adf328cddeb1f00803acce6737a19f310b53bbdb0320828f75bb"

From dcba8b90b84506a7325f8e576d10ccb8d2e9a415 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Tue, 9 Jul 2013 22:12:15 -0400
Subject: [PATCH 1336/8469] Add a shim for python 2.4 compatability with
 hashlib

--HG--
extra : rebase_source : 5f573e600aadbe9c95561ee28c05cee02c7db559
---
 setuptools/py24compat.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/py24compat.py b/setuptools/py24compat.py
index c5d7d2045d..40e9ae0f74 100644
--- a/setuptools/py24compat.py
+++ b/setuptools/py24compat.py
@@ -9,3 +9,9 @@
     def wraps(func):
         "Just return the function unwrapped"
         return lambda x: x
+
+
+try:
+    import hashlib
+except ImportError:
+    from setuptools._backport import hashlib

From 37e2f6f5395586e12eb57a4b6fd598b29744de0c Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Tue, 9 Jul 2013 22:30:25 -0400
Subject: [PATCH 1337/8469] Enable using any guarenteed hash as a hash function

--HG--
extra : rebase_source : 1c5040c4a89dfcd4ec8cf2ad64825d5bc73ebe30
---
 setuptools/package_index.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 61a66c6d2f..e29a142cc6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -11,11 +11,8 @@
                                url2pathname, name2codepoint,
                                unichr, urljoin)
 from setuptools.compat import filterfalse
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
 from fnmatch import translate
+from setuptools.py24compat import hashlib
 from setuptools.py24compat import wraps
 from setuptools.py27compat import get_all_headers
 
@@ -28,6 +25,7 @@
 )
 URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
+_HASH_RE = re.compile(r'(sha1|sha224|sha384|sha256|sha512|md5)=([a-f0-9]+)')
 
 __all__ = [
     'PackageIndex', 'distros_for_url', 'parse_bdist_wininst',
@@ -387,15 +385,19 @@ def obtain(self, requirement, installer=None):
 
 
 
-    def check_md5(self, cs, info, filename, tfp):
-        if re.match('md5=[0-9a-f]{32}$', info):
-            self.debug("Validating md5 checksum for %s", filename)
-            if cs.hexdigest() != info[4:]:
+    def check_hash(self, cs, info, filename, tfp):
+        match = _HASH_RE.search(info)
+        if match:
+            hash_name = match.group(1)
+            hash_data = match.group(2)
+            self.debug("Validating %s checksum for %s", hash_name, filename)
+            if cs.hexdigest() != hash_data:
                 tfp.close()
                 os.unlink(filename)
                 raise DistutilsError(
-                    "MD5 validation failed for "+os.path.basename(filename)+
-                    "; possible download problem?"
+                    "%s validation failed for %s; "
+                    "possible download problem?" % (
+                                    hash_name, os.path.basename(filename))
                 )
 
     def add_find_links(self, urls):
@@ -598,16 +600,19 @@ def gen_setup(self, filename, fragment, tmpdir):
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
         # Download the file
-        fp, tfp, info = None, None, None
+        fp, tfp, cs, info = None, None, None, None
         try:
             if '#' in url:
                 url, info = url.split('#', 1)
+                hmatch = _HASH_RE.search(info)
+                hash_name = hmatch.group(1)
+                hash_data = hmatch.group(2)
+                cs = hashlib.new(hash_name)
             fp = self.open_url(url)
             if isinstance(fp, HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
                 )
-            cs = md5()
             headers = fp.info()
             blocknum = 0
             bs = self.dl_blocksize
@@ -621,13 +626,14 @@ def _download_to(self, url, filename):
             while True:
                 block = fp.read(bs)
                 if block:
-                    cs.update(block)
+                    if cs is not None:
+                        cs.update(block)
                     tfp.write(block)
                     blocknum += 1
                     self.reporthook(url, filename, blocknum, bs, size)
                 else:
                     break
-            if info: self.check_md5(cs, info, filename, tfp)
+            if info: self.check_hash(cs, info, filename, tfp)
             return headers
         finally:
             if fp: fp.close()

From 1ba2a40c16a04be7daec1f9c032c0553e5124fc8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 11:51:03 -0400
Subject: [PATCH 1338/8469] Updated changelog and contributors

---
 CHANGES.txt      | 6 ++++++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bec396bd51..166eb74635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+0.9
+---
+
+* `package_index` now validates hashes other than MD5 in download links.
+
 ---
 0.8
 ---
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8515babe6c..f1966505a7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -9,6 +9,7 @@ Contributors
 * Daniel Stutzbach
 * Daniel Holth
 * Dirley Rodrigues
+* Donald Stufft
 * Grigory Petrov
 * Hanno Schlichting
 * Jannis Leidel

From f72612a28fad26d2538a2e260bd158aaacf378e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 11:53:03 -0400
Subject: [PATCH 1339/8469] Added tag 0.9 for changeset 3078b1e56639

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 96b3c0bb0a..ad33c10ba0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -80,3 +80,4 @@ f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
 236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
 979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7
 e3d70539e79f39a97f69674ab038661961a1eb43 0.8
+3078b1e566399bf0c5590f3528df03d0c23a0777 0.9

From 87750d2cf138ed8f0e600e61db9a4b340f0f4b9a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 11:54:35 -0400
Subject: [PATCH 1340/8469] Bumped to 0.10 in preparation for next release.

---
 docs/conf.py                             |  4 +-
 ez_setup.py                              |  2 +-
 release.py                               |  4 +-
 setup.py                                 |  6 +-
 setuptools.egg-info/dependency_links.txt |  2 +-
 setuptools.egg-info/entry_points.txt     | 72 ++++++++++++------------
 setuptools.egg-info/requires.txt         |  8 +--
 setuptools/__init__.py                   |  2 +-
 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7113c36535..d99639d6f3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9'
+version = '0.10'
 # The full version, including alpha/beta/rc tags.
-release = '0.9'
+release = '0.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 61187113b5..14eef9245e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9"
+DEFAULT_VERSION = "0.10"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/release.py b/release.py
index 3631799355..443d455d21 100644
--- a/release.py
+++ b/release.py
@@ -33,7 +33,7 @@
 except Exception:
     pass
 
-VERSION = '0.9'
+VERSION = '0.10'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def set_versions():
@@ -53,7 +53,7 @@ def infer_next_version(version):
     >>> infer_next_version('1.0b')
     '1.0b1'
 
-    >>> infer_next_version('1.0.9')
+    >>> infer_next_version('1.0.10')
     '1.0.10'
 
     >>> infer_next_version('1')
diff --git a/setup.py b/setup.py
index 61a4308a69..c748f07c16 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.9"
+VERSION = "0.10"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
@@ -219,10 +219,10 @@ def run(self):
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
         "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
         "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
-        "certs": "certifi==0.0.9",
+        "certs": "certifi==0.0.10",
     },
     dependency_links = [
-        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.10.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index c688b7eaab..643fcf123c 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,4 +1,4 @@
-https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
 https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 5db5e49550..33d6692145 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
 [distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install_lib = setuptools.command.install_lib:install_lib
-setopt = setuptools.command.setopt:setopt
 build_ext = setuptools.command.build_ext:build_ext
 build_py = setuptools.command.build_py:build_py
-install_scripts = setuptools.command.install_scripts:install_scripts
-saveopts = setuptools.command.saveopts:saveopts
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
+install = setuptools.command.install:install
 rotate = setuptools.command.rotate:rotate
 upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+sdist = setuptools.command.sdist:sdist
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 egg_info = setuptools.command.egg_info:egg_info
-test = setuptools.command.test:test
+setopt = setuptools.command.setopt:setopt
+register = setuptools.command.register:register
 develop = setuptools.command.develop:develop
-install = setuptools.command.install:install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+saveopts = setuptools.command.saveopts:saveopts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
 easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
+alias = setuptools.command.alias:alias
 
 [egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-include_package_data = setuptools.dist:assert_bool
-zip_safe = setuptools.dist:assert_bool
-use_2to3 = setuptools.dist:assert_bool
 eager_resources = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
 test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-exclude_package_data = setuptools.dist:check_package_data
+test_suite = setuptools.dist:check_test_suite
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
 package_data = setuptools.dist:check_package_data
+convert_2to3_doctests = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
 use_2to3_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
+entry_points = setuptools.dist:check_entry_points
+dependency_links = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
 packages = setuptools.dist:check_packages
+zip_safe = setuptools.dist:assert_bool
 namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index bf85f734f5..7fe852184e 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [certs]
-certifi==0.0.8
+certifi==0.0.9
 
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index bc62cf82ab..9158fd75ff 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9'
+__version__ = '0.10'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From aff12162f1b2278a6c41c0abb9896f8b4ec5c5b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 15:10:38 -0400
Subject: [PATCH 1341/8469] Factored out the setuptools-specific code from
 release.py and moved the common functionality into jaraco.packaging. Use
 jaraco.packaging to enact releases.

---
 release.py | 214 +++--------------------------------------------------
 1 file changed, 9 insertions(+), 205 deletions(-)

diff --git a/release.py b/release.py
index 443d455d21..e44ca0f105 100644
--- a/release.py
+++ b/release.py
@@ -1,225 +1,32 @@
-#!/usr/bin/env python
-
 """
-Script to fully automate the release process. Requires Python 2.6+
-with sphinx installed and the 'hg' command on the path.
+Setuptools is released using 'jaraco.packaging.release'. To make a release,
+install jaraco.packaging and run 'python -m jaraco.packaging.release'
 """
 
-from __future__ import print_function
-
-import subprocess
-import shutil
+import re
 import os
-import sys
-import getpass
-import collections
 import itertools
-import re
-
-import requests
-
-try:
-    input = raw_input
-except NameError:
-    pass
 
 try:
     zip_longest = itertools.zip_longest
 except AttributeError:
     zip_longest = itertools.izip_longest
 
-try:
-    import keyring
-except Exception:
-    pass
-
-VERSION = '0.10'
-PACKAGE_INDEX = 'https://pypi.python.org/pypi'
-
-def set_versions():
-    global VERSION
-    version = input("Release as version [%s]> " % VERSION) or VERSION
-    if version != VERSION:
-        VERSION = bump_versions(version)
-
-def infer_next_version(version):
-    """
-    Infer a next version from the current version by incrementing the last
-    number or appending a number.
+def before_upload():
+    _linkify('CHANGES.txt', 'CHANGES (linked).txt')
 
-    >>> infer_next_version('1.0')
-    '1.1'
-
-    >>> infer_next_version('1.0b')
-    '1.0b1'
-
-    >>> infer_next_version('1.0.10')
-    '1.0.10'
-
-    >>> infer_next_version('1')
-    '2'
-
-    >>> infer_next_version('')
-    '1'
-    """
-    def incr(match):
-        ver = int(match.group(0) or '0')
-        return str(ver + 1)
-    return re.sub('\d*$', incr, version)
+version = '0.10'
 
 files_with_versions = (
     'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
     'setuptools/__init__.py',
 )
 
-def get_repo_name():
-    """
-    Get the repo name from the hgrc default path.
-    """
-    default = subprocess.check_output('hg paths default').strip().decode('utf-8')
-    parts = default.split('/')
-    if parts[-1] == '':
-        parts.pop()
-    return '/'.join(parts[-2:])
-
-def get_mercurial_creds(system='https://bitbucket.org', username=None):
-    """
-    Return named tuple of username,password in much the same way that
-    Mercurial would (from the keyring).
-    """
-    # todo: consider getting this from .hgrc
-    username = username or getpass.getuser()
-    keyring_username = '@@'.join((username, system))
-    system = 'Mercurial'
-    password = (
-        keyring.get_password(system, keyring_username)
-        if 'keyring' in globals()
-        else None
-    )
-    if not password:
-        password = getpass.getpass()
-    Credential = collections.namedtuple('Credential', 'username password')
-    return Credential(username, password)
+test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 
-def add_milestone_and_version(version):
-    base = 'https://api.bitbucket.org'
-    for type in 'milestones', 'versions':
-        url = (base + '/1.0/repositories/{repo}/issues/{type}'
-            .format(repo = get_repo_name(), type=type))
-        resp = requests.post(url=url,
-            data='name='+version, auth=get_mercurial_creds())
-        resp.raise_for_status()
+os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
-def bump_versions(target_ver):
-    for filename in files_with_versions:
-        bump_version(filename, target_ver)
-    subprocess.check_call(['hg', 'ci', '-m',
-        'Bumped to {target_ver} in preparation for next '
-        'release.'.format(**vars())])
-    return target_ver
-
-def bump_version(filename, target_ver):
-    with open(filename, 'rb') as f:
-        lines = [
-            line.replace(VERSION.encode('ascii'), target_ver.encode('ascii'))
-            for line in f
-        ]
-    with open(filename, 'wb') as f:
-        f.writelines(lines)
-
-def do_release():
-    assert all(map(os.path.exists, files_with_versions)), (
-        "Expected file(s) missing")
-
-    assert has_sphinx(), "You must have Sphinx installed to release"
-
-    set_versions()
-
-    res = input('Have you read through the SCM changelog and '
-        'confirmed the changelog is current for releasing {VERSION}? '
-        .format(**globals()))
-    if not res.lower().startswith('y'):
-        print("Please do that")
-        raise SystemExit(1)
-
-    print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
-    res = input('Have you or has someone verified that the tests '
-        'pass on this revision? ')
-    if not res.lower().startswith('y'):
-        print("Please do that")
-        raise SystemExit(2)
-
-    subprocess.check_call(['hg', 'tag', VERSION])
-
-    subprocess.check_call(['hg', 'update', VERSION])
-
-    upload_to_pypi()
-    upload_ez_setup()
-
-    # update to the tip for the next operation
-    subprocess.check_call(['hg', 'update'])
-
-    # we just tagged the current version, bump for the next release.
-    next_ver = bump_versions(infer_next_version(VERSION))
-
-    # push the changes
-    subprocess.check_call(['hg', 'push'])
-
-    add_milestone_and_version(next_ver)
-
-def upload_to_pypi():
-    linkify('CHANGES.txt', 'CHANGES (links).txt')
-
-    has_docs = build_docs()
-    if os.path.isdir('./dist'):
-        shutil.rmtree('./dist')
-    cmd = [
-        sys.executable, 'setup.py', '-q',
-        'egg_info', '-RD', '-b', '',
-        'sdist',
-        'register', '-r', PACKAGE_INDEX,
-        'upload', '-r', PACKAGE_INDEX,
-    ]
-    if has_docs:
-        cmd.extend([
-            'upload_docs', '-r', PACKAGE_INDEX
-        ])
-    env = os.environ.copy()
-    env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
-    subprocess.check_call(cmd, env=env)
-
-def upload_ez_setup():
-    """
-    TODO: upload ez_setup.py to a permalinked location. Currently, this
-    location is https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py .
-    In the long term, it should be on PyPI.
-    """
-
-def has_sphinx():
-    try:
-        devnull = open(os.path.devnull, 'wb')
-        subprocess.Popen(['sphinx-build', '--version'], stdout=devnull,
-            stderr=subprocess.STDOUT).wait()
-    except Exception:
-        return False
-    return True
-
-def build_docs():
-    if not os.path.isdir('docs'):
-        return
-    if os.path.isdir('docs/build'):
-        shutil.rmtree('docs/build')
-    cmd = [
-        'sphinx-build',
-        '-b', 'html',
-        '-d', 'build/doctrees',
-        '.',
-        'build/html',
-    ]
-    subprocess.check_call(cmd, cwd='docs')
-    return True
-
-def linkify(source, dest):
+def _linkify(source, dest):
     with open(source) as source:
         out = _linkified_text(source.read())
     with open(dest, 'w') as dest:
@@ -272,6 +79,3 @@ def _linkified_part(text, anchors):
 
     anchors.extend(revision.findall(text)) # ['Issue #43', ...]
     return revision.sub(r'`\1`_', text)
-
-if __name__ == '__main__':
-    do_release()

From cf134c837ad5f63d6a2497a0e14c76bff3c4b18f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 15:12:29 -0400
Subject: [PATCH 1342/8469] Remove unused import

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index c748f07c16..8a320ee325 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 import sys
 import os
 import textwrap
-import re
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))

From a90b375539ee0b1c3279508b65dc5b94b687719f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 15:15:56 -0400
Subject: [PATCH 1343/8469] Remove 2to3 build support for setuptools itself

---
 setup.py | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/setup.py b/setup.py
index 8a320ee325..a88fd0413f 100755
--- a/setup.py
+++ b/setup.py
@@ -8,34 +8,6 @@
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 src_root = None
-do_2to3 = False
-if sys.version_info >= (3,) and do_2to3:
-    tmp_src = os.path.join("build", "src")
-    from distutils.filelist import FileList
-    from distutils import dir_util, file_util, util, log
-    log.set_verbosity(1)
-    fl = FileList()
-    manifest_file = open("MANIFEST.in")
-    for line in manifest_file:
-        fl.process_template_line(line)
-    manifest_file.close()
-    dir_util.create_tree(tmp_src, fl.files)
-    outfiles_2to3 = []
-    dist_script = os.path.join("build", "src", "ez_setup.py")
-    for f in fl.files:
-        outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
-        if copied and outf.endswith(".py") and outf != dist_script:
-            outfiles_2to3.append(outf)
-        if copied and outf.endswith('api_tests.txt'):
-            # XXX support this in distutils as well
-            from lib2to3.main import main
-            main('lib2to3.fixes', ['-wd', os.path.join(tmp_src, 'tests', 'api_tests.txt')])
-
-    util.run_2to3(outfiles_2to3)
-
-    # arrange setup to use the copy
-    sys.path.insert(0, os.path.abspath(tmp_src))
-    src_root = tmp_src
 
 from distutils.util import convert_path
 
@@ -76,15 +48,6 @@ def build_package_data(self):
                 outf, copied = self.copy_file(srcfile, target)
                 srcfile = os.path.abspath(srcfile)
 
-                # avoid a bootstrapping issue with easy_install -U (when the
-                # previous version doesn't have convert_2to3_doctests)
-                if not hasattr(self.distribution, 'convert_2to3_doctests'):
-                    continue
-                if not do_2to3:
-                    continue
-                if copied and srcfile in self.distribution.convert_2to3_doctests:
-                    self.__doctests_2to3.append(outf)
-
 class test(_test):
     """Specific test class to avoid rewriting the entry_points.txt"""
     def run(self):

From 392032ad941ffd8cd56f8908ebcdbb768c62c156 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 15:19:28 -0400
Subject: [PATCH 1344/8469] Allow setup script to be imported

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index a88fd0413f..49dcd79fe4 100755
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ def run(self):
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
-dist = setup(
+setup_params = dict(
     name="setuptools",
     version=VERSION,
     description="Easily download, build, install, upgrade, and uninstall "
@@ -194,3 +194,6 @@ def run(self):
     scripts = [],
     # tests_require = "setuptools[ssl]",
 )
+
+if __name__ == '__main__':
+    dist = setup(**setup_params)

From fb535e22bf4e09b0f6f8a91d33b9757052dd8ada Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 15:20:41 -0400
Subject: [PATCH 1345/8469] Now that setup script is importable, the release
 script can grab the version from setup.py

---
 release.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/release.py b/release.py
index e44ca0f105..5dae8cea38 100644
--- a/release.py
+++ b/release.py
@@ -15,11 +15,8 @@
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (linked).txt')
 
-version = '0.10'
-
 files_with_versions = (
-    'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
-    'setuptools/__init__.py',
+    'docs/conf.py', 'setup.py', 'ez_setup.py', 'setuptools/__init__.py',
 )
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"

From 0be93889e5c04b7573736d312dc4f904c23f6a2e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 16:14:20 -0400
Subject: [PATCH 1346/8469] Allow other arguments and kwargs to os.open when in
 the sandbox. Fixes Distribute #386.

---
 CHANGES.txt           | 6 ++++++
 setuptools/sandbox.py | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 166eb74635..23a198ce45 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.9.1
+-----
+
+* Distribute #386: Allow other positional and keyword arguments to os.open.
+
 ---
 0.9
 ---
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 4e527446ce..29fc07b8d9 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -270,11 +270,11 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
-    def open(self, file, flags, mode=0x1FF):    # 0777
+    def open(self, file, flags, mode=0x1FF, *args, **kw):    # 0777
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
-            self._violation("os.open", file, flags, mode)
-        return _os.open(file,flags,mode)
+            self._violation("os.open", file, flags, mode, *args, **kw)
+        return _os.open(file,flags,mode, *args, **kw)
 
 WRITE_FLAGS = reduce(
     operator.or_, [getattr(_os, a, 0) for a in

From 9298e5f23a1edbbab4b2da4ca9e9496b8e69c0dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 16:16:01 -0400
Subject: [PATCH 1347/8469] Regenerated bundled egg-info

---
 setuptools.egg-info/dependency_links.txt |  2 +-
 setuptools.egg-info/entry_points.txt     | 92 ++++++++++++------------
 setuptools.egg-info/requires.txt         | 14 ++--
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index 643fcf123c..aea106c504 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,4 +1,4 @@
-https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/c/certifi/certifi-0.0.10.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
 https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 33d6692145..45cc56a1bf 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-build_ext = setuptools.command.build_ext:build_ext
-build_py = setuptools.command.build_py:build_py
-install = setuptools.command.install:install
-rotate = setuptools.command.rotate:rotate
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-sdist = setuptools.command.sdist:sdist
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-saveopts = setuptools.command.saveopts:saveopts
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-easy_install = setuptools.command.easy_install:easy_install
-alias = setuptools.command.alias:alias
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-eager_resources = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+dependency_links = setuptools.dist:assert_string_list
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
 convert_2to3_doctests = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
 extras_require = setuptools.dist:check_extras
+eager_resources = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+install_requires = setuptools.dist:check_requirements
 use_2to3_fixers = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
 entry_points = setuptools.dist:check_entry_points
-dependency_links = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
 zip_safe = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
+tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
 
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+[egg_info.writers]
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
+[distutils.commands]
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_py = setuptools.command.build_py:build_py
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+alias = setuptools.command.alias:alias
+rotate = setuptools.command.rotate:rotate
+install = setuptools.command.install:install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+develop = setuptools.command.develop:develop
+register = setuptools.command.register:register
+install_scripts = setuptools.command.install_scripts:install_scripts
+upload_docs = setuptools.command.upload_docs:upload_docs
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 7fe852184e..66f2468830 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[certs]
-certifi==0.0.9
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
+[certs]
+certifi==0.0.10
+
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file

From 21ba9de1f81928b82344d3f61031cb14f1451cdc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 16:16:58 -0400
Subject: [PATCH 1348/8469] Bumped to 0.9.1 in preparation for next release.

---
 docs/conf.py           | 4 ++--
 ez_setup.py            | 2 +-
 setup.py               | 6 +++---
 setuptools/__init__.py | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index d99639d6f3..3c71f326d0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.10'
+version = '0.9.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.10'
+release = '0.9.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ez_setup.py b/ez_setup.py
index 14eef9245e..0b11f1a7a1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.10"
+DEFAULT_VERSION = "0.9.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setup.py b/setup.py
index 49dcd79fe4..a82475cd07 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.10"
+VERSION = "0.9.1"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
@@ -181,10 +181,10 @@ def run(self):
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
         "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
         "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
-        "certs": "certifi==0.0.10",
+        "certs": "certifi==0.0.9.1",
     },
     dependency_links = [
-        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.10.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.1.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9158fd75ff..7da5a3bdfc 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.10'
+__version__ = '0.9.1'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From d6507eda8166ce8929019bfb65518ad747d01007 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 20:25:56 -0400
Subject: [PATCH 1349/8469] Correct reference to certifi version (updated
 incorrectly by release.py script)

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index a82475cd07..14c3995954 100755
--- a/setup.py
+++ b/setup.py
@@ -181,10 +181,10 @@ def run(self):
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
         "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
         "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
-        "certs": "certifi==0.0.9.1",
+        "certs": "certifi==0.0.8",
     },
     dependency_links = [
-        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.9.1.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
         'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
         'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',

From 2de1c553de6472ce3e830b32fcbf39043321ba2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 20:33:57 -0400
Subject: [PATCH 1350/8469] Updated egg_info with corrected metadata

---
 setuptools.egg-info/dependency_links.txt |  2 +-
 setuptools.egg-info/entry_points.txt     | 90 ++++++++++++------------
 setuptools.egg-info/requires.txt         | 14 ++--
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index aea106c504..c688b7eaab 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,4 +1,4 @@
-https://pypi.python.org/packages/source/c/certifi/certifi-0.0.10.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
 https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
 https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 45cc56a1bf..6a9cb799d3 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[distutils.commands]
+install_scripts = setuptools.command.install_scripts:install_scripts
+install_lib = setuptools.command.install_lib:install_lib
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
+easy_install = setuptools.command.easy_install:easy_install
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+install = setuptools.command.install:install
+build_ext = setuptools.command.build_ext:build_ext
+develop = setuptools.command.develop:develop
+egg_info = setuptools.command.egg_info:egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+saveopts = setuptools.command.saveopts:saveopts
+setopt = setuptools.command.setopt:setopt
+sdist = setuptools.command.sdist:sdist
+rotate = setuptools.command.rotate:rotate
+alias = setuptools.command.alias:alias
+build_py = setuptools.command.build_py:build_py
+
 [console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
 extras_require = setuptools.dist:check_extras
-eager_resources = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
 install_requires = setuptools.dist:check_requirements
 use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 entry_points = setuptools.dist:check_entry_points
 zip_safe = setuptools.dist:assert_bool
-use_2to3 = setuptools.dist:assert_bool
-package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-include_package_data = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+use_2to3 = setuptools.dist:assert_bool
 
-[egg_info.writers]
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
-[distutils.commands]
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
-alias = setuptools.command.alias:alias
-rotate = setuptools.command.rotate:rotate
-install = setuptools.command.install:install
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-develop = setuptools.command.develop:develop
-register = setuptools.command.register:register
-install_scripts = setuptools.command.install_scripts:install_scripts
-upload_docs = setuptools.command.upload_docs:upload_docs
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 66f2468830..dac9e411a4 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
-[certs]
-certifi==0.0.10
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
+[certs]
+certifi==0.0.8
\ No newline at end of file

From 0cb9cd7aaa256fc5e14900958250a8911afa08ba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 20:44:13 -0400
Subject: [PATCH 1351/8469] setup.py now loads the version from
 setuptools/__init__.py, limiting the places where release.py must keep in
 sync.

---
 release.py | 2 +-
 setup.py   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/release.py b/release.py
index 5dae8cea38..34b250b2e2 100644
--- a/release.py
+++ b/release.py
@@ -16,7 +16,7 @@ def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (linked).txt')
 
 files_with_versions = (
-    'docs/conf.py', 'setup.py', 'ez_setup.py', 'setuptools/__init__.py',
+    'docs/conf.py', 'ez_setup.py', 'setuptools/__init__.py',
 )
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
diff --git a/setup.py b/setup.py
index 14c3995954..b6bb7e526f 100755
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,8 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.9.1"
 
-from setuptools import setup, find_packages
+import setuptools
 from setuptools.command.build_py import build_py as _build_py
 from setuptools.command.test import test as _test
 
@@ -94,7 +93,7 @@ def run(self):
 
 setup_params = dict(
     name="setuptools",
-    version=VERSION,
+    version=setuptools.__version__,
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="The fellowship of the packaging",
@@ -105,7 +104,7 @@ def run(self):
     url = "https://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
-    packages = find_packages(),
+    packages = setuptools.find_packages(),
     package_data = package_data,
 
     py_modules = ['pkg_resources', 'easy_install'],
@@ -196,4 +195,4 @@ def run(self):
 )
 
 if __name__ == '__main__':
-    dist = setup(**setup_params)
+    dist = setuptools.setup(**setup_params)

From 5896424c4061b74ed9625077131df0f8e4cd2a10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 20:48:26 -0400
Subject: [PATCH 1352/8469] Have the documentation also grab the version from
 setuptools/__init__.py

---
 docs/conf.py | 5 +++--
 release.py   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3c71f326d0..fbdb8b51e6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,6 +15,7 @@
 # serve to show the default.
 
 import sys, os
+import setuptools
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -48,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.1'
+version = setuptools.__version__
 # The full version, including alpha/beta/rc tags.
-release = '0.9.1'
+release = setuptools.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 34b250b2e2..0e1a539707 100644
--- a/release.py
+++ b/release.py
@@ -16,7 +16,7 @@ def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (linked).txt')
 
 files_with_versions = (
-    'docs/conf.py', 'ez_setup.py', 'setuptools/__init__.py',
+    'ez_setup.py', 'setuptools/__init__.py',
 )
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"

From c652e7e73d2ff6865085a8ca6af54f441104a908 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 21:51:15 -0400
Subject: [PATCH 1353/8469] Re-wrote link inference to now respect specific
 patterns and generate links to known issue trackers.

---
 CHANGES.txt | 281 ++++++++++++++++++++++++++--------------------------
 release.py  |  75 +++++---------
 2 files changed, 165 insertions(+), 191 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 23a198ce45..94403c8fc6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -106,7 +106,7 @@ Added several features that were slated for setuptools 0.6c12:
 
 * Move warning check in ``get_cache_path`` to follow the directory creation
   to avoid errors when the cache path does not yet exist. Fixes the error
-  reported in #375.
+  reported in Distribute #375.
 
 ------
 0.6.48
@@ -126,7 +126,7 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.46
 ------
 
-* Issue #375: Issue a warning if the PYTHON_EGG_CACHE or otherwise
+* Distribute #375: Issue a warning if the PYTHON_EGG_CACHE or otherwise
   customized egg cache location specifies a directory that's group- or
   world-writable.
 
@@ -134,7 +134,7 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.45
 ------
 
-* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+* Distribute #379: ``distribute_setup.py`` now traps VersionConflict as well,
   restoring ability to upgrade from an older setuptools version.
 
 ------
@@ -148,21 +148,21 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.43
 ------
 
-* Issue #378: Restore support for Python 2.4 Syntax (regression in 0.6.42).
+* Distribute #378: Restore support for Python 2.4 Syntax (regression in 0.6.42).
 
 ------
 0.6.42
 ------
 
 * External links finder no longer yields duplicate links.
-* Issue #337: Moved site.py to setuptools/site-patch.py (graft of very old
+* Distribute #337: Moved site.py to setuptools/site-patch.py (graft of very old
   patch from setuptools trunk which inspired PR #31).
 
 ------
 0.6.41
 ------
 
-* Issue #27: Use public api for loading resources from zip files rather than
+* Distribute #27: Use public api for loading resources from zip files rather than
   the private method `_zip_directory_cache`.
 * Added a new function ``easy_install.get_win_launcher`` which may be used by
   third-party libraries such as buildout to get a suitable script launcher.
@@ -171,7 +171,7 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.40
 ------
 
-* Issue #376: brought back cli.exe and gui.exe that were deleted in the
+* Distribute #376: brought back cli.exe and gui.exe that were deleted in the
   previous release.
 
 ------
@@ -182,7 +182,7 @@ Added several features that were slated for setuptools 0.6c12:
 * Fix possible issue in GUI launchers where the subsystem was not supplied to
   the linker.
 * Launcher build script now refactored for robustness.
-* Issue #375: Resources extracted from a zip egg to the file system now also
+* Distribute #375: Resources extracted from a zip egg to the file system now also
   check the contents of the file against the zip contents during each
   invocation of get_resource_filename.
 
@@ -190,13 +190,13 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.38
 ------
 
-* Issue #371: The launcher manifest file is now installed properly.
+* Distribute #371: The launcher manifest file is now installed properly.
 
 ------
 0.6.37
 ------
 
-* Issue #143: Launcher scripts, including easy_install itself, are now
+* Distribute #143: Launcher scripts, including easy_install itself, are now
   accompanied by a manifest on 32-bit Windows environments to avoid the
   Installer Detection Technology and thus undesirable UAC elevation described
   in `this Microsoft article
@@ -206,8 +206,7 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.36
 ------
 
-* Pull Request #35: In `Buildout issue 64
-  <https://github.com/buildout/buildout/issues/64>`_, it was reported that
+* Pull Request #35: In Buildout #64, it was reported that
   under Python 3, installation of distutils scripts could attempt to copy
   the ``__pycache__`` directory as a file, causing an error, apparently only
   under Windows. Easy_install now skips all directories when processing
@@ -221,7 +220,7 @@ Added several features that were slated for setuptools 0.6c12:
 Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
 how it parses version numbers.
 
-* Issue #278: Restored compatibility with distribute 0.6.22 and setuptools
+* Distribute #278: Restored compatibility with distribute 0.6.22 and setuptools
   0.6. Updated the documentation to match more closely with the version
   parsing as intended in setuptools 0.6.
 
@@ -229,7 +228,7 @@ how it parses version numbers.
 0.6.34
 ------
 
-* Issue #341: 0.6.33 fails to build under Python 2.4.
+* Distribute #341: 0.6.33 fails to build under Python 2.4.
 
 ------
 0.6.33
@@ -238,11 +237,11 @@ how it parses version numbers.
 * Fix 2 errors with Jython 2.5.
 * Fix 1 failure with Jython 2.5 and 2.7.
 * Disable workaround for Jython scripts on Linux systems.
-* Issue #336: `setup.py` no longer masks failure exit code when tests fail.
+* Distribute #336: `setup.py` no longer masks failure exit code when tests fail.
 * Fix issue in pkg_resources where try/except around a platform-dependent
   import would trigger hook load failures on Mercurial. See pull request 32
   for details.
-* Issue #341: Fix a ResourceWarning.
+* Distribute #341: Fix a ResourceWarning.
 
 ------
 0.6.32
@@ -250,19 +249,18 @@ how it parses version numbers.
 
 * Fix test suite with Python 2.6.
 * Fix some DeprecationWarnings and ResourceWarnings.
-* Issue #335: Backed out `setup_requires` superceding installed requirements
+* Distribute #335: Backed out `setup_requires` superceding installed requirements
   until regression can be addressed.
 
 ------
 0.6.31
 ------
 
-* Issue #303: Make sure the manifest only ever contains UTF-8 in Python 3.
-* Issue #329: Properly close files created by tests for compatibility with
+* Distribute #303: Make sure the manifest only ever contains UTF-8 in Python 3.
+* Distribute #329: Properly close files created by tests for compatibility with
   Jython.
-* Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and
-  `#1981 <http://bugs.jython.org/issue1981>`_.
-* Issue #334: Provide workaround for packages that reference `sys.__stdout__`
+* Work around Jython #1980 and Jython #1981.
+* Distribute #334: Provide workaround for packages that reference `sys.__stdout__`
   such as numpy does. This change should address
   `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
   as the system encoding is UTF-8 or the IO encoding is specified in the
@@ -271,7 +269,7 @@ how it parses version numbers.
      PYTHONIOENCODING=utf8 pip install numpy
 
 * Fix for encoding issue when installing from Windows executable on Python 3.
-* Issue #323: Allow `setup_requires` requirements to supercede installed
+* Distribute #323: Allow `setup_requires` requirements to supercede installed
   requirements. Added some new keyword arguments to existing pkg_resources
   methods. Also had to updated how __path__ is handled for namespace packages
   to ensure that when a new egg distribution containing a namespace package is
@@ -283,7 +281,7 @@ how it parses version numbers.
 0.6.30
 ------
 
-* Issue #328: Clean up temporary directories in distribute_setup.py.
+* Distribute #328: Clean up temporary directories in distribute_setup.py.
 * Fix fatal bug in distribute_setup.py.
 
 ------
@@ -291,28 +289,28 @@ how it parses version numbers.
 ------
 
 * Pull Request #14: Honor file permissions in zip files.
-* Issue #327: Merged pull request #24 to fix a dependency problem with pip.
+* Distribute #327: Merged pull request #24 to fix a dependency problem with pip.
 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
   to produce uploadable documentation.
-* Issue #326: `upload_docs` provided mangled auth credentials under Python 3.
-* Issue #320: Fix check for "createable" in distribute_setup.py.
-* Issue #305: Remove a warning that was triggered during normal operations.
-* Issue #311: Print metadata in UTF-8 independent of platform.
-* Issue #303: Read manifest file with UTF-8 encoding under Python 3.
-* Issue #301: Allow to run tests of namespace packages when using 2to3.
-* Issue #304: Prevent import loop in site.py under Python 3.3.
-* Issue #283: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
-* Issue #299: The develop command didn't work on Python 3, when using 2to3,
+* Distribute #326: `upload_docs` provided mangled auth credentials under Python 3.
+* Distribute #320: Fix check for "createable" in distribute_setup.py.
+* Distribute #305: Remove a warning that was triggered during normal operations.
+* Distribute #311: Print metadata in UTF-8 independent of platform.
+* Distribute #303: Read manifest file with UTF-8 encoding under Python 3.
+* Distribute #301: Allow to run tests of namespace packages when using 2to3.
+* Distribute #304: Prevent import loop in site.py under Python 3.3.
+* Distribute #283: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
+* Distribute #299: The develop command didn't work on Python 3, when using 2to3,
   as the egg link would go to the Python 2 source. Linking to the 2to3'd code
   in build/lib makes it work, although you will have to rebuild the module
   before testing it.
-* Issue #306: Even if 2to3 is used, we build in-place under Python 2.
-* Issue #307: Prints the full path when .svn/entries is broken.
-* Issue #313: Support for sdist subcommands (Python 2.7)
-* Issue #314: test_local_index() would fail an OS X.
-* Issue #310: Non-ascii characters in a namespace __init__.py causes errors.
-* Issue #218: Improved documentation on behavior of `package_data` and
+* Distribute #306: Even if 2to3 is used, we build in-place under Python 2.
+* Distribute #307: Prints the full path when .svn/entries is broken.
+* Distribute #313: Support for sdist subcommands (Python 2.7)
+* Distribute #314: test_local_index() would fail an OS X.
+* Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
+* Distribute #218: Improved documentation on behavior of `package_data` and
   `include_package_data`. Files indicated by `package_data` are now included
   in the manifest.
 * `distribute_setup.py` now allows a `--download-base` argument for retrieving
@@ -322,10 +320,10 @@ how it parses version numbers.
 0.6.28
 ------
 
-* Issue #294: setup.py can now be invoked from any directory.
+* Distribute #294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
 * Added support for .dist-info directories.
-* Issue #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
+* Distribute #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
   Python 3.3.
 
 ------
@@ -336,15 +334,15 @@ how it parses version numbers.
 * Distribute now recognizes README.rst as a standard, default readme file.
 * Exclude 'encodings' modules when removing modules from sys.modules.
   Workaround for #285.
-* Issue #231: Don't fiddle with system python when used with buildout
+* Distribute #231: Don't fiddle with system python when used with buildout
   (bootstrap.py)
 
 ------
 0.6.26
 ------
 
-* Issue #183: Symlinked files are now extracted from source distributions.
-* Issue #227: Easy_install fetch parameters are now passed during the
+* Distribute #183: Symlinked files are now extracted from source distributions.
+* Distribute #227: Easy_install fetch parameters are now passed during the
   installation of a source distribution; now fulfillment of setup_requires
   dependencies will honor the parameters passed to easy_install.
 
@@ -352,65 +350,65 @@ how it parses version numbers.
 0.6.25
 ------
 
-* Issue #258: Workaround a cache issue
-* Issue #260: distribute_setup.py now accepts the --user parameter for
+* Distribute #258: Workaround a cache issue
+* Distribute #260: distribute_setup.py now accepts the --user parameter for
   Python 2.6 and later.
-* Issue #262: package_index.open_with_auth no longer throws LookupError
+* Distribute #262: package_index.open_with_auth no longer throws LookupError
   on Python 3.
-* Issue #269: AttributeError when an exception occurs reading Manifest.in
+* Distribute #269: AttributeError when an exception occurs reading Manifest.in
   on late releases of Python.
-* Issue #272: Prevent TypeError when namespace package names are unicode
+* Distribute #272: Prevent TypeError when namespace package names are unicode
   and single-install-externally-managed is used. Also fixes PIP issue
   449.
-* Issue #273: Legacy script launchers now install with Python2/3 support.
+* Distribute #273: Legacy script launchers now install with Python2/3 support.
 
 ------
 0.6.24
 ------
 
-* Issue #249: Added options to exclude 2to3 fixers
+* Distribute #249: Added options to exclude 2to3 fixers
 
 ------
 0.6.23
 ------
 
-* Issue #244: Fixed a test
-* Issue #243: Fixed a test
-* Issue #239: Fixed a test
-* Issue #240: Fixed a test
-* Issue #241: Fixed a test
-* Issue #237: Fixed a test
-* Issue #238: easy_install now uses 64bit executable wrappers on 64bit Python
-* Issue #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
-* Issue #207: Windows cli and gui wrappers pass CTRL-C to child python process
-* Issue #227: easy_install now passes its arguments to setup.py bdist_egg
-* Issue #225: Fixed a NameError on Python 2.5, 2.4
+* Distribute #244: Fixed a test
+* Distribute #243: Fixed a test
+* Distribute #239: Fixed a test
+* Distribute #240: Fixed a test
+* Distribute #241: Fixed a test
+* Distribute #237: Fixed a test
+* Distribute #238: easy_install now uses 64bit executable wrappers on 64bit Python
+* Distribute #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
+* Distribute #207: Windows cli and gui wrappers pass CTRL-C to child python process
+* Distribute #227: easy_install now passes its arguments to setup.py bdist_egg
+* Distribute #225: Fixed a NameError on Python 2.5, 2.4
 
 ------
 0.6.21
 ------
 
-* Issue #225: FIxed a regression on py2.4
+* Distribute #225: FIxed a regression on py2.4
 
 ------
 0.6.20
 ------
 
-* Issue #135: Include url in warning when processing URLs in package_index.
-* Issue #212: Fix issue where easy_instal fails on Python 3 on windows installer.
-* Issue #213: Fix typo in documentation.
+* Distribute #135: Include url in warning when processing URLs in package_index.
+* Distribute #212: Fix issue where easy_instal fails on Python 3 on windows installer.
+* Distribute #213: Fix typo in documentation.
 
 ------
 0.6.19
 ------
 
-* Issue 206: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
+* Distribute #206: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
 
 ------
 0.6.18
 ------
 
-* Issue 210: Fixed a regression introduced by Issue 204 fix.
+* Distribute #210: Fixed a regression introduced by Distribute #204 fix.
 
 ------
 0.6.17
@@ -419,21 +417,21 @@ how it parses version numbers.
 * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment
   variable to allow to disable installation of easy_install-${version} script.
 * Support Python >=3.1.4 and >=3.2.1.
-* Issue 204: Don't try to import the parent of a namespace package in
+* Distribute #204: Don't try to import the parent of a namespace package in
   declare_namespace
-* Issue 196: Tolerate responses with multiple Content-Length headers
-* Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires
+* Distribute #196: Tolerate responses with multiple Content-Length headers
+* Distribute #205: Sandboxing doesn't preserve working_set. Leads to setup_requires
   problems.
 
 ------
 0.6.16
 ------
 
-* Builds sdist gztar even on Windows (avoiding Issue 193).
-* Issue 192: Fixed metadata omitted on Windows when package_dir
+* Builds sdist gztar even on Windows (avoiding Distribute #193).
+* Distribute #192: Fixed metadata omitted on Windows when package_dir
   specified with forward-slash.
-* Issue 195: Cython build support.
-* Issue 200: Issues with recognizing 64-bit packages on Windows.
+* Distribute #195: Cython build support.
+* Distribute #200: Issues with recognizing 64-bit packages on Windows.
 
 ------
 0.6.15
@@ -441,49 +439,49 @@ how it parses version numbers.
 
 * Fixed typo in bdist_egg
 * Several issues under Python 3 has been solved.
-* Issue 146: Fixed missing DLL files after easy_install of windows exe package.
+* Distribute #146: Fixed missing DLL files after easy_install of windows exe package.
 
 ------
 0.6.14
 ------
 
-* Issue 170: Fixed unittest failure. Thanks to Toshio.
-* Issue 171: Fixed race condition in unittests cause deadlocks in test suite.
-* Issue 143: Fixed a lookup issue with easy_install.
+* Distribute #170: Fixed unittest failure. Thanks to Toshio.
+* Distribute #171: Fixed race condition in unittests cause deadlocks in test suite.
+* Distribute #143: Fixed a lookup issue with easy_install.
   Thanks to David and Zooko.
-* Issue 174: Fixed the edit mode when its used with setuptools itself
+* Distribute #174: Fixed the edit mode when its used with setuptools itself
 
 ------
 0.6.13
 ------
 
-* Issue 160: 2.7 gives ValueError("Invalid IPv6 URL")
-* Issue 150: Fixed using ~/.local even in a --no-site-packages virtualenv
-* Issue 163: scan index links before external links, and don't use the md5 when
+* Distribute #160: 2.7 gives ValueError("Invalid IPv6 URL")
+* Distribute #150: Fixed using ~/.local even in a --no-site-packages virtualenv
+* Distribute #163: scan index links before external links, and don't use the md5 when
   comparing two distributions
 
 ------
 0.6.12
 ------
 
-* Issue 149: Fixed various failures on 2.3/2.4
+* Distribute #149: Fixed various failures on 2.3/2.4
 
 ------
 0.6.11
 ------
 
 * Found another case of SandboxViolation - fixed
-* Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
+* Distribute #15 and Distribute #48: Introduced a socket timeout of 15 seconds on url openings
 * Added indexsidebar.html into MANIFEST.in
-* Issue 108: Fixed TypeError with Python3.1
-* Issue 121: Fixed --help install command trying to actually install.
-* Issue 112: Added an os.makedirs so that Tarek's solution will work.
-* Issue 133: Added --no-find-links to easy_install
+* Distribute #108: Fixed TypeError with Python3.1
+* Distribute #121: Fixed --help install command trying to actually install.
+* Distribute #112: Added an os.makedirs so that Tarek's solution will work.
+* Distribute #133: Added --no-find-links to easy_install
 * Added easy_install --user
-* Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
-* Issue 134: removed spurious UserWarnings. Patch by VanLindberg
-* Issue 138: cant_write_to_target error when setup_requires is used.
-* Issue 147: respect the sys.dont_write_bytecode flag
+* Distribute #100: Fixed develop --user not taking '.' in PYTHONPATH into account
+* Distribute #134: removed spurious UserWarnings. Patch by VanLindberg
+* Distribute #138: cant_write_to_target error when setup_requires is used.
+* Distribute #147: respect the sys.dont_write_bytecode flag
 
 ------
 0.6.10
@@ -497,27 +495,27 @@ how it parses version numbers.
 0.6.9
 -----
 
-* Issue 90: unknown setuptools version can be added in the working set
-* Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore
+* Distribute #90: unknown setuptools version can be added in the working set
+* Distribute #87: setupt.py doesn't try to convert distribute_setup.py anymore
   Initial Patch by arfrever.
-* Issue 89: added a side bar with a download link to the doc.
-* Issue 86: fixed missing sentence in pkg_resources doc.
+* Distribute #89: added a side bar with a download link to the doc.
+* Distribute #86: fixed missing sentence in pkg_resources doc.
 * Added a nicer error message when a DistributionNotFound is raised.
-* Issue 80: test_develop now works with Python 3.1
-* Issue 93: upload_docs now works if there is an empty sub-directory.
-* Issue 70: exec bit on non-exec files
-* Issue 99: now the standalone easy_install command doesn't uses a
+* Distribute #80: test_develop now works with Python 3.1
+* Distribute #93: upload_docs now works if there is an empty sub-directory.
+* Distribute #70: exec bit on non-exec files
+* Distribute #99: now the standalone easy_install command doesn't uses a
   "setup.cfg" if any exists in the working directory. It will use it
   only if triggered by ``install_requires`` from a setup.py call
   (install, develop, etc).
-* Issue 101: Allowing ``os.devnull`` in Sandbox
-* Issue 92: Fixed the "no eggs" found error with MacPort
+* Distribute #101: Allowing ``os.devnull`` in Sandbox
+* Distribute #92: Fixed the "no eggs" found error with MacPort
   (platform.mac_ver() fails)
-* Issue 103: test_get_script_header_jython_workaround not run
+* Distribute #103: test_get_script_header_jython_workaround not run
   anymore under py3 with C or POSIX local. Contributed by Arfrever.
-* Issue 104: remvoved the assertion when the installation fails,
+* Distribute #104: remvoved the assertion when the installation fails,
   with a nicer message for the end user.
-* Issue 100: making sure there's no SandboxViolation when
+* Distribute #100: making sure there's no SandboxViolation when
   the setup script patches setuptools.
 
 -----
@@ -531,8 +529,8 @@ how it parses version numbers.
 0.6.7
 -----
 
-* Issue 58: Added --user support to the develop command
-* Issue 11: Generated scripts now wrap their call to the script entry point
+* Distribute #58: Added --user support to the develop command
+* Distribute #11: Generated scripts now wrap their call to the script entry point
   in the standard "if name == 'main'"
 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv
   can drive an installation that doesn't patch a global setuptools.
@@ -540,17 +538,17 @@ how it parses version numbers.
   http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719
   and determined that it no longer applies. Distribute should work fine with
   Unladen Swallow 2009Q3.
-* Issue 21: Allow PackageIndex.open_url to gracefully handle all cases of a
+* Distribute #21: Allow PackageIndex.open_url to gracefully handle all cases of a
   httplib.HTTPException instead of just InvalidURL and BadStatusLine.
 * Removed virtual-python.py from this distribution and updated documentation
   to point to the actively maintained virtualenv instead.
-* Issue 64: use_setuptools no longer rebuilds the distribute egg every
+* Distribute #64: use_setuptools no longer rebuilds the distribute egg every
   time it is run
 * use_setuptools now properly respects the requested version
 * use_setuptools will no longer try to import a distribute egg for the
   wrong Python version
-* Issue 74: no_fake should be True by default.
-* Issue 72: avoid a bootstrapping issue with easy_install -U
+* Distribute #74: no_fake should be True by default.
+* Distribute #72: avoid a bootstrapping issue with easy_install -U
 
 -----
 0.6.6
@@ -563,10 +561,10 @@ how it parses version numbers.
 0.6.5
 -----
 
-* Issue 65: cli.exe and gui.exe are now generated at build time,
+* Distribute #65: cli.exe and gui.exe are now generated at build time,
   depending on the platform in use.
 
-* Issue 67: Fixed doc typo (PEP 381/382)
+* Distribute #67: Fixed doc typo (PEP 381/382)
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
   setuptools.  And an error is raised when installing a 0.7 setuptools with
@@ -583,10 +581,10 @@ how it parses version numbers.
 -----
 
 * Added the generation of `distribute_setup_3k.py` during the release.
-  This closes issue #52.
+  This closes Distribute #52.
 
 * Added an upload_docs command to easily upload project documentation to
-  PyPI's https://pythonhosted.org. This close issue #56.
+  PyPI's https://pythonhosted.org. This close issue Distribute #56.
 
 * Fixed a bootstrap bug on the use_setuptools() API.
 
@@ -612,29 +610,29 @@ setuptools
 ==========
 
 * Added Python 3 support; see docs/python3.txt.
-  This closes http://bugs.python.org/setuptools/issue39.
+  This closes Old Setuptools #39.
 
 * Added option to run 2to3 automatically when installing on Python 3.
-  This closes issue #31.
+  This closes issue Distribute #31.
 
 * Fixed invalid usage of requirement.parse, that broke develop -d.
-  This closes http://bugs.python.org/setuptools/issue44.
+  This closes Old Setuptools #44.
 
 * Fixed script launcher for 64-bit Windows.
-  This closes http://bugs.python.org/setuptools/issue2.
+  This closes Old Setuptools #2.
 
 * KeyError when compiling extensions.
-  This closes http://bugs.python.org/setuptools/issue41.
+  This closes Old Setuptools #41.
 
 bootstrapping
 =============
 
-* Fixed bootstrap not working on Windows. This closes issue #49.
+* Fixed bootstrap not working on Windows. This closes issue Distribute #49.
 
-* Fixed 2.6 dependencies. This closes issue #50.
+* Fixed 2.6 dependencies. This closes issue Distribute #50.
 
 * Make sure setuptools is patched when running through easy_install
-  This closes http://bugs.python.org/setuptools/issue40.
+  This closes Old Setuptools #40.
 
 -----
 0.6.1
@@ -644,14 +642,13 @@ setuptools
 ==========
 
 * package_index.urlopen now catches BadStatusLine and malformed url errors.
-  This closes issue #16 and issue #18.
+  This closes Distribute #16 and Distribute #18.
 
-* zip_ok is now False by default. This closes
-  http://bugs.python.org/setuptools/issue33.
+* zip_ok is now False by default. This closes Old Setuptools #33.
 
-* Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
+* Fixed invalid URL error catching. Old Setuptools #20.
 
-* Fixed invalid bootstraping with easy_install installation (issue #40).
+* Fixed invalid bootstraping with easy_install installation (Distribute #40).
   Thanks to Florian Schulze for the help.
 
 * Removed buildout/bootstrap.py. A new repository will create a specific
@@ -663,7 +660,7 @@ bootstrapping
 
 * The boostrap process leave setuptools alone if detected in the system
   and --root or --prefix is provided, but is not in the same location.
-  This closes issue #10.
+  This closes Distribute #10.
 
 ---
 0.6
@@ -673,18 +670,18 @@ setuptools
 ==========
 
 * Packages required at build time where not fully present at install time.
-  This closes issue #12.
+  This closes Distribute #12.
 
-* Protected against failures in tarfile extraction. This closes issue #10.
+* Protected against failures in tarfile extraction. This closes Distribute #10.
 
-* Made Jython api_tests.txt doctest compatible. This closes issue #7.
+* Made Jython api_tests.txt doctest compatible. This closes Distribute #7.
 
 * sandbox.py replaced builtin type file with builtin function open. This
-  closes issue #6.
+  closes Distribute #6.
 
-* Immediately close all file handles. This closes issue #3.
+* Immediately close all file handles. This closes Distribute #3.
 
-* Added compatibility with Subversion 1.6. This references issue #1.
+* Added compatibility with Subversion 1.6. This references Distribute #1.
 
 pkg_resources
 =============
@@ -693,18 +690,18 @@ pkg_resources
   instead. Based on a patch from ronaldoussoren. This closes issue #5.
 
 * Fixed a SandboxViolation for mkdir that could occur in certain cases.
-  This closes issue #13.
+  This closes Distribute #13.
 
 * Allow to find_on_path on systems with tight permissions to fail gracefully.
-  This closes issue #9.
+  This closes Distribute #9.
 
 * Corrected inconsistency between documentation and code of add_entry.
-  This closes issue #8.
+  This closes Distribute #8.
 
-* Immediately close all file handles. This closes issue #3.
+* Immediately close all file handles. This closes Distribute #3.
 
 easy_install
 ============
 
-* Immediately close all file handles. This closes issue #3.
+* Immediately close all file handles. This closes Distribute #3.
 
diff --git a/release.py b/release.py
index 0e1a539707..5e99e74cfd 100644
--- a/release.py
+++ b/release.py
@@ -13,7 +13,7 @@
     zip_longest = itertools.izip_longest
 
 def before_upload():
-    _linkify('CHANGES.txt', 'CHANGES (linked).txt')
+    _linkify('CHANGES.txt', 'CHANGES (links).txt')
 
 files_with_versions = (
     'ez_setup.py', 'setuptools/__init__.py',
@@ -23,56 +23,33 @@ def before_upload():
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
+link_patterns = [
+    r"(Issue )?#(?P<issue>\d+)",
+    r"Distribute #(?P<distribute>\d+)",
+    r"Buildout #(?P<buildout>\d+)",
+    r"Old Setuptools #(?P<old_setuptools>\d+)",
+    r"Jython #(?P<jython>\d+)",
+]
+
+issue_urls = dict(
+    issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
+    distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
+    buildout='https://github.com/buildout/buildout/issues/{buildout}',
+    old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
+    jython='http://bugs.jython.org/issue{jython}',
+)
+
 def _linkify(source, dest):
+    pattern = '|'.join(link_patterns)
     with open(source) as source:
-        out = _linkified_text(source.read())
+        out = re.sub(pattern, replacer, source.read())
     with open(dest, 'w') as dest:
         dest.write(out)
 
-def _linkified(rst_path):
-    "return contents of reStructureText file with linked issue references"
-    rst_file = open(rst_path)
-    rst_content = rst_file.read()
-    rst_file.close()
-
-    return _linkified_text(rst_content)
-
-def _linkified_text(rst_content):
-    # first identify any existing HREFs so they're not changed
-    HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
-
-    # split on the HREF pattern, returning the parts to be linkified
-    plain_text_parts = HREF_pattern.split(rst_content)
-    anchors = []
-    linkified_parts = [_linkified_part(part, anchors)
-        for part in plain_text_parts]
-    pairs = zip_longest(
-        linkified_parts,
-        HREF_pattern.findall(rst_content),
-        fillvalue='',
-    )
-    rst_content = ''.join(flatten(pairs))
-
-    anchors = sorted(anchors)
-
-    bitroot = 'https://bitbucket.org/tarek/distribute'
-    rst_content += "\n"
-    for x in anchors:
-        issue = re.findall(r'\d+', x)[0]
-        rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
-    rst_content += "\n"
-    return rst_content
-
-def flatten(listOfLists):
-    "Flatten one level of nesting"
-    return itertools.chain.from_iterable(listOfLists)
-
-
-def _linkified_part(text, anchors):
-    """
-    Linkify a part and collect any anchors generated
-    """
-    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
-
-    anchors.extend(revision.findall(text)) # ['Issue #43', ...]
-    return revision.sub(r'`\1`_', text)
+def replacer(match):
+    text = match.group(0)
+    match_dict = match.groupdict()
+    for key in match_dict:
+        if match_dict[key]:
+            url = issue_urls[key].format(**match_dict)
+            return "`{text} <{url}>`_".format(text=text, url=url)

From 76e2e18d7f610731aac39200257da2e412fa004d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 22:00:41 -0400
Subject: [PATCH 1354/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 94403c8fc6..ba965b6911 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 -----
 
 * Distribute #386: Allow other positional and keyword arguments to os.open.
+* Corrected dependency on certifi mis-referenced in 0.9.
 
 ---
 0.9

From 6b915734dcc4cdeaaaa6e03ac9aca1c9279e528f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 22:02:40 -0400
Subject: [PATCH 1355/8469] Added tag 0.9.1 for changeset 9e5a8f734662

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ad33c10ba0..e289751a40 100644
--- a/.hgtags
+++ b/.hgtags
@@ -81,3 +81,4 @@ f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
 979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7
 e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 3078b1e566399bf0c5590f3528df03d0c23a0777 0.9
+9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1

From bbd4994b81eefd1a652f3fa9dca7d6e93107b392 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jul 2013 22:03:28 -0400
Subject: [PATCH 1356/8469] Bumped to 0.9.2 in preparation for next release.

---
 ez_setup.py                          |   2 +-
 setuptools.egg-info/entry_points.txt | 102 +++++++++++++--------------
 setuptools.egg-info/requires.txt     |   8 +--
 setuptools/__init__.py               |   2 +-
 4 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0b11f1a7a1..f90a2b9a8c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.1"
+DEFAULT_VERSION = "0.9.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 6a9cb799d3..b804cc292d 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-install_scripts = setuptools.command.install_scripts:install_scripts
-install_lib = setuptools.command.install_lib:install_lib
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-register = setuptools.command.register:register
-easy_install = setuptools.command.easy_install:easy_install
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-install = setuptools.command.install:install
-build_ext = setuptools.command.build_ext:build_ext
-develop = setuptools.command.develop:develop
-egg_info = setuptools.command.egg_info:egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-saveopts = setuptools.command.saveopts:saveopts
-setopt = setuptools.command.setopt:setopt
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-alias = setuptools.command.alias:alias
-build_py = setuptools.command.build_py:build_py
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+[egg_info.writers]
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 eager_resources = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-entry_points = setuptools.dist:check_entry_points
+install_requires = setuptools.dist:check_requirements
 zip_safe = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
+extras_require = setuptools.dist:check_extras
+entry_points = setuptools.dist:check_entry_points
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+dependency_links = setuptools.dist:assert_string_list
 packages = setuptools.dist:check_packages
 use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[distutils.commands]
+build_ext = setuptools.command.build_ext:build_ext
+saveopts = setuptools.command.saveopts:saveopts
+rotate = setuptools.command.rotate:rotate
+upload_docs = setuptools.command.upload_docs:upload_docs
+build_py = setuptools.command.build_py:build_py
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+register = setuptools.command.register:register
+easy_install = setuptools.command.easy_install:easy_install
 
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index dac9e411a4..e7f0f3b867 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,8 +1,5 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
@@ -10,4 +7,7 @@ wincertstore==0.1
 ssl==1.16
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 7da5a3bdfc..e698bb4eeb 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.1'
+__version__ = '0.9.2'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 95bf90f3dae23f3d672450d94adfbcc55f9e252a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 12:06:54 -0400
Subject: [PATCH 1357/8469] Extracted hash-checking functionality into its own
 classes. Hashes are no longer checked when the proper pattern isn't detected.
 Fixes #42.

---
 setuptools/package_index.py | 99 +++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 26 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e29a142cc6..4c4a647d4a 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -25,7 +25,6 @@
 )
 URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
-_HASH_RE = re.compile(r'(sha1|sha224|sha384|sha256|sha512|md5)=([a-f0-9]+)')
 
 __all__ = [
     'PackageIndex', 'distros_for_url', 'parse_bdist_wininst',
@@ -193,6 +192,61 @@ def find_external_links(url, page):
     sys.version[:3], require('setuptools')[0].version
 )
 
+class ContentChecker(object):
+    """
+    A null content checker that defines the interface for checking content
+    """
+    def feed(self, block):
+        """
+        Feed a block of data to the hash.
+        """
+        return
+
+    def check(self):
+        """
+        Check the hash. Return False if validation fails.
+        """
+        return True
+
+    def report(self, reporter, template):
+        """
+        Call reporter with information about the checker (hash name)
+        substituted into the template.
+        """
+        return
+
+class HashChecker(ContentChecker):
+    pattern = re.compile(
+        r'(?P<hash_name>sha1|sha224|sha384|sha256|sha512|md5)='
+        r'(?P<expected>[a-f0-9]+)'
+    )
+
+    def __init__(self, hash_name, expected):
+        self.hash = hashlib.new(hash_name)
+        self.expected = expected
+
+    @classmethod
+    def from_url(cls, url):
+        "Construct a (possibly null) ContentChecker from a URL"
+        fragment = urlparse(url)[-1]
+        if not fragment:
+            return ContentChecker()
+        match = cls.pattern.search(fragment)
+        if not match:
+            return ContentChecker()
+        return cls(**match.groupdict())
+
+    def feed(self, block):
+        self.hash.update(block)
+
+    def check(self):
+        return self.hash.hexdigest() == self.expected
+
+    def report(self, reporter, template):
+        msg = template % self.hash.name
+        return reporter(msg)
+
+
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
@@ -385,20 +439,20 @@ def obtain(self, requirement, installer=None):
 
 
 
-    def check_hash(self, cs, info, filename, tfp):
-        match = _HASH_RE.search(info)
-        if match:
-            hash_name = match.group(1)
-            hash_data = match.group(2)
-            self.debug("Validating %s checksum for %s", hash_name, filename)
-            if cs.hexdigest() != hash_data:
-                tfp.close()
-                os.unlink(filename)
-                raise DistutilsError(
-                    "%s validation failed for %s; "
-                    "possible download problem?" % (
-                                    hash_name, os.path.basename(filename))
-                )
+    def check_hash(self, checker, filename, tfp):
+        """
+        checker is a ContentChecker
+        """
+        checker.report(self.debug,
+            "Validating %%s checksum for %s" % filename)
+        if not checker.valid():
+            tfp.close()
+            os.unlink(filename)
+            raise DistutilsError(
+                "%s validation failed for %s; "
+                "possible download problem?" % (
+                                checker.hash.name, os.path.basename(filename))
+            )
 
     def add_find_links(self, urls):
         """Add `urls` to the list that will be prescanned for searches"""
@@ -600,14 +654,9 @@ def gen_setup(self, filename, fragment, tmpdir):
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
         # Download the file
-        fp, tfp, cs, info = None, None, None, None
+        fp, tfp, info = None, None, None
         try:
-            if '#' in url:
-                url, info = url.split('#', 1)
-                hmatch = _HASH_RE.search(info)
-                hash_name = hmatch.group(1)
-                hash_data = hmatch.group(2)
-                cs = hashlib.new(hash_name)
+            checker = HashChecker.from_url(url)
             fp = self.open_url(url)
             if isinstance(fp, HTTPError):
                 raise DistutilsError(
@@ -626,14 +675,13 @@ def _download_to(self, url, filename):
             while True:
                 block = fp.read(bs)
                 if block:
-                    if cs is not None:
-                        cs.update(block)
+                    checker.feed(block)
                     tfp.write(block)
                     blocknum += 1
                     self.reporthook(url, filename, blocknum, bs, size)
                 else:
                     break
-            if info: self.check_hash(cs, info, filename, tfp)
+            self.check_hash(checker, filename, tfp)
             return headers
         finally:
             if fp: fp.close()
@@ -642,7 +690,6 @@ def _download_to(self, url, filename):
     def reporthook(self, url, filename, blocknum, blksize, size):
         pass    # no-op
 
-
     def open_url(self, url, warning=None):
         if url.startswith('file:'):
             return local_open(url)

From fdb212207c256eea656a21742aad8fba56a29bab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 12:19:12 -0400
Subject: [PATCH 1358/8469] Added a test to prove the basic usage of content
 checks

---
 setuptools/tests/test_packageindex.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 92d1e2e037..4fceee3999 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -141,3 +141,14 @@ def test_parse_bdist_wininst(self):
             'reportlab-2.5.win-amd64-py2.7.exe'), ('reportlab-2.5', '2.7', 'win-amd64'))
         self.assertEqual(setuptools.package_index.parse_bdist_wininst(
             'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64'))
+
+class TestContentCheckers(unittest.TestCase):
+
+    def test_md5(self):
+        checker = setuptools.package_index.HashChecker.from_url(
+            'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
+        self.assertEqual(checker.hash.name, 'md5')
+        checker.feed('You should probably not be using MD5'.encode('ascii'))
+        self.assertEqual(checker.hash.hexdigest(),
+            'f12895fdffbd45007040d2e44df98478')
+        self.assertTrue(checker.check())

From d4cd26a8fa8df163a03a61366fba2eebf1424a35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:01:02 -0400
Subject: [PATCH 1359/8469] Added a couple of additional tests, including one
 capturing #42.

---
 setuptools/tests/test_packageindex.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 4fceee3999..d3698c9e60 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -152,3 +152,17 @@ def test_md5(self):
         self.assertEqual(checker.hash.hexdigest(),
             'f12895fdffbd45007040d2e44df98478')
         self.assertTrue(checker.check())
+
+    def test_other_fragment(self):
+        "Content checks should succeed silently if no hash is present"
+        checker = setuptools.package_index.HashChecker.from_url(
+            'http://foo/bar#something%20completely%20different')
+        checker.feed('anything'.encode('ascii'))
+        self.assertTrue(checker.check())
+
+    def test_blank_md5(self):
+        "Content checks should succeed if a hash is empty"
+        checker = setuptools.package_index.HashChecker.from_url(
+            'http://foo/bar#md5=')
+        checker.feed('anything'.encode('ascii'))
+        self.assertTrue(checker.check())

From 8750c6386b57142cbc6a28e78a68b2075baf610e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:09:32 -0400
Subject: [PATCH 1360/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ba965b6911..48eca12b99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.9.2
+-----
+
+* Issue #42: Fix regression where blank checksums would trigger an
+  ``AttributeError``.
+
 -----
 0.9.1
 -----

From d898bb88343082816677b868996cbb33d52b4d80 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:12:21 -0400
Subject: [PATCH 1361/8469] Added tag 0.9.2 for changeset 37444bb32e17

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e289751a40..0087dff932 100644
--- a/.hgtags
+++ b/.hgtags
@@ -82,3 +82,4 @@ f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
 e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 3078b1e566399bf0c5590f3528df03d0c23a0777 0.9
 9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1
+37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2

From b34eec598da6d2668de58cba166f5ac5d063ba9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:13:25 -0400
Subject: [PATCH 1362/8469] Bumped to 0.9.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 82 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 10 ++--
 setuptools/__init__.py               |  2 +-
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f90a2b9a8c..943a00ea9c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.2"
+DEFAULT_VERSION = "0.9.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index b804cc292d..f85b03e565 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [distutils.setup_keywords]
-eager_resources = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
+use_2to3 = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
 test_loader = setuptools.dist:check_importable
 use_2to3_fixers = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
+packages = setuptools.dist:check_packages
+dependency_links = setuptools.dist:assert_string_list
 test_suite = setuptools.dist:check_test_suite
 include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+eager_resources = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
+entry_points = setuptools.dist:check_entry_points
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+package_data = setuptools.dist:check_package_data
+zip_safe = setuptools.dist:assert_bool
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.commands]
-build_ext = setuptools.command.build_ext:build_ext
-saveopts = setuptools.command.saveopts:saveopts
-rotate = setuptools.command.rotate:rotate
-upload_docs = setuptools.command.upload_docs:upload_docs
-build_py = setuptools.command.build_py:build_py
-develop = setuptools.command.develop:develop
 install_lib = setuptools.command.install_lib:install_lib
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-egg_info = setuptools.command.egg_info:egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+register = setuptools.command.register:register
 setopt = setuptools.command.setopt:setopt
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_scripts = setuptools.command.install_scripts:install_scripts
+saveopts = setuptools.command.saveopts:saveopts
 install = setuptools.command.install:install
+build_ext = setuptools.command.build_ext:build_ext
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_py = setuptools.command.build_py:build_py
+rotate = setuptools.command.rotate:rotate
 test = setuptools.command.test:test
-register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+install_scripts = setuptools.command.install_scripts:install_scripts
 easy_install = setuptools.command.easy_install:easy_install
+egg_info = setuptools.command.egg_info:egg_info
 
 [console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e7f0f3b867..221040f812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index e698bb4eeb..55c149c353 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.2'
+__version__ = '0.9.3'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 915f05b7445af2c51b63d22e429d9a7397221518 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:31:00 -0400
Subject: [PATCH 1363/8469] Use 'is_valid' instead of simply 'valid' or
 'check', which are less clear about the purpose of the method. Fixes
 AttributeError introduces in 0.9.2. Fixes #42.

---
 CHANGES.txt                           | 6 ++++++
 setuptools/package_index.py           | 6 +++---
 setuptools/tests/test_packageindex.py | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 48eca12b99..010e56153f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.9.3
+-----
+
+* Issue #42: Fix new ``AttributeError`` introduced in last fix.
+
 -----
 0.9.2
 -----
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4c4a647d4a..70aabd1bd6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -202,7 +202,7 @@ def feed(self, block):
         """
         return
 
-    def check(self):
+    def is_valid(self):
         """
         Check the hash. Return False if validation fails.
         """
@@ -239,7 +239,7 @@ def from_url(cls, url):
     def feed(self, block):
         self.hash.update(block)
 
-    def check(self):
+    def is_valid(self):
         return self.hash.hexdigest() == self.expected
 
     def report(self, reporter, template):
@@ -445,7 +445,7 @@ def check_hash(self, checker, filename, tfp):
         """
         checker.report(self.debug,
             "Validating %%s checksum for %s" % filename)
-        if not checker.valid():
+        if not checker.is_valid():
             tfp.close()
             os.unlink(filename)
             raise DistutilsError(
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d3698c9e60..4f2d382c35 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -151,18 +151,18 @@ def test_md5(self):
         checker.feed('You should probably not be using MD5'.encode('ascii'))
         self.assertEqual(checker.hash.hexdigest(),
             'f12895fdffbd45007040d2e44df98478')
-        self.assertTrue(checker.check())
+        self.assertTrue(checker.is_valid())
 
     def test_other_fragment(self):
         "Content checks should succeed silently if no hash is present"
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#something%20completely%20different')
         checker.feed('anything'.encode('ascii'))
-        self.assertTrue(checker.check())
+        self.assertTrue(checker.is_valid())
 
     def test_blank_md5(self):
         "Content checks should succeed if a hash is empty"
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=')
         checker.feed('anything'.encode('ascii'))
-        self.assertTrue(checker.check())
+        self.assertTrue(checker.is_valid())

From 541c84c09ba12ccba4110aa2eb086e3cf5c9b4ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:33:12 -0400
Subject: [PATCH 1364/8469] Added tag 0.9.3 for changeset 3e9d2e89de3a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0087dff932..259cf484e4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -83,3 +83,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 3078b1e566399bf0c5590f3528df03d0c23a0777 0.9
 9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1
 37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2
+3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3

From 8cbf071653bf990df550d6fa9b7b0b10f23143aa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 13:34:57 -0400
Subject: [PATCH 1365/8469] Bumped to 0.9.4 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 88 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 12 ++--
 setuptools/__init__.py               |  2 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 943a00ea9c..b9b2fd3f66 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.3"
+DEFAULT_VERSION = "0.9.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index f85b03e565..7d399be6ad 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-test_loader = setuptools.dist:check_importable
-use_2to3_fixers = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-dependency_links = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-include_package_data = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-eager_resources = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.commands]
-install_lib = setuptools.command.install_lib:install_lib
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+rotate = setuptools.command.rotate:rotate
 sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-alias = setuptools.command.alias:alias
-register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
 saveopts = setuptools.command.saveopts:saveopts
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install = setuptools.command.install:install
+setopt = setuptools.command.setopt:setopt
+upload_docs = setuptools.command.upload_docs:upload_docs
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_scripts = setuptools.command.install_scripts:install_scripts
 build_ext = setuptools.command.build_ext:build_ext
+egg_info = setuptools.command.egg_info:egg_info
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 build_py = setuptools.command.build_py:build_py
-rotate = setuptools.command.rotate:rotate
 test = setuptools.command.test:test
+register = setuptools.command.register:register
+install_lib = setuptools.command.install_lib:install_lib
 develop = setuptools.command.develop:develop
-install_scripts = setuptools.command.install_scripts:install_scripts
-easy_install = setuptools.command.easy_install:easy_install
-egg_info = setuptools.command.egg_info:egg_info
+
+[distutils.setup_keywords]
+use_2to3_fixers = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+use_2to3 = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+eager_resources = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+extras_require = setuptools.dist:check_extras
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+test_suite = setuptools.dist:check_test_suite
+include_package_data = setuptools.dist:assert_bool
 
 [console_scripts]
-easy_install = setuptools.command.easy_install:main
 easy_install-3.3 = setuptools.command.easy_install:main
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-requires.txt = setuptools.command.egg_info:write_requirements
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+easy_install = setuptools.command.easy_install:main
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 221040f812..c06a8a0b3e 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[certs]
-certifi==0.0.8
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 55c149c353..597b128181 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.3'
+__version__ = '0.9.4'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 6cd0dbf7751bdce24975f384f5d810f5175b98a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 14:30:13 -0400
Subject: [PATCH 1366/8469] better variable name

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index b6bb7e526f..4b90dfbd5a 100755
--- a/setup.py
+++ b/setup.py
@@ -11,13 +11,13 @@
 
 from distutils.util import convert_path
 
-d = {}
+command_ns = {}
 init_path = convert_path('setuptools/command/__init__.py')
 init_file = open(init_path)
-exec(init_file.read(), d)
+exec(init_file.read(), command_ns)
 init_file.close()
 
-SETUP_COMMANDS = d['__all__']
+SETUP_COMMANDS = command_ns['__all__']
 
 import setuptools
 from setuptools.command.build_py import build_py as _build_py

From bae650322899670688e66ff7167cbf1ab34d8dd0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 14:40:17 -0400
Subject: [PATCH 1367/8469] Load version from the file rather than by importing
 the module (which is subject to variance based on sys.path). Fixes #43.

---
 CHANGES.txt | 7 +++++++
 setup.py    | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 010e56153f..fa8bd09364 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.9.4
+-----
+
+* Issue #43: Fix issue (introduced in 0.9.1) with version resolution when
+  upgrading over other releases of Setuptools.
+
 -----
 0.9.3
 -----
diff --git a/setup.py b/setup.py
index 4b90dfbd5a..d716ee2ec9 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,12 @@
 
 SETUP_COMMANDS = command_ns['__all__']
 
+main_ns = {}
+init_path = convert_path('setuptools/__init__.py')
+init_file = open(init_path)
+exec(init_file.read(), main_ns)
+init_file.close()
+
 import setuptools
 from setuptools.command.build_py import build_py as _build_py
 from setuptools.command.test import test as _test
@@ -93,7 +99,7 @@ def run(self):
 
 setup_params = dict(
     name="setuptools",
-    version=setuptools.__version__,
+    version=main_ns['__version__'],
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="The fellowship of the packaging",

From b7cf45dbdd48c26901d256df5a028bf41a90536e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 14:45:36 -0400
Subject: [PATCH 1368/8469] Added tag 0.9.4 for changeset 1aef141fc968

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 259cf484e4..8c6482c0b4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -84,3 +84,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1
 37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2
 3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3
+1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4

From 15b5b526ba4c6502a827069aead546b77ac3d4a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 14:46:29 -0400
Subject: [PATCH 1369/8469] Bumped to 0.9.5 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 72 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 +++---
 setuptools/__init__.py               |  2 +-
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b9b2fd3f66..fc1d6170cc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.4"
+DEFAULT_VERSION = "0.9.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 7d399be6ad..26422c4d46 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [egg_info.writers]
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
 entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 requires.txt = setuptools.command.egg_info:write_requirements
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 
 [distutils.commands]
-rotate = setuptools.command.rotate:rotate
-sdist = setuptools.command.sdist:sdist
-saveopts = setuptools.command.saveopts:saveopts
+alias = setuptools.command.alias:alias
+register = setuptools.command.register:register
+build_ext = setuptools.command.build_ext:build_ext
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
+install_lib = setuptools.command.install_lib:install_lib
 setopt = setuptools.command.setopt:setopt
 upload_docs = setuptools.command.upload_docs:upload_docs
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
 egg_info = setuptools.command.egg_info:egg_info
+saveopts = setuptools.command.saveopts:saveopts
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+install = setuptools.command.install:install
 build_py = setuptools.command.build_py:build_py
-test = setuptools.command.test:test
-register = setuptools.command.register:register
-install_lib = setuptools.command.install_lib:install_lib
-develop = setuptools.command.develop:develop
+rotate = setuptools.command.rotate:rotate
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-use_2to3_fixers = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-dependency_links = setuptools.dist:assert_string_list
 packages = setuptools.dist:check_packages
-use_2to3 = setuptools.dist:assert_bool
-package_data = setuptools.dist:check_package_data
+convert_2to3_doctests = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
+dependency_links = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-eager_resources = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
 test_loader = setuptools.dist:check_importable
-test_suite = setuptools.dist:check_test_suite
+zip_safe = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 include_package_data = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+entry_points = setuptools.dist:check_entry_points
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
 
 [console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index c06a8a0b3e..6d385dc746 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 597b128181..2ef6b3be67 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.4'
+__version__ = '0.9.5'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 7ddd872c63a9465340eadae59868d85ac1d43e67 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 15 Jul 2013 12:35:21 -0700
Subject: [PATCH 1370/8469] Fix backported ssl_match_hostname for
 http://bugs.python.org/issue17980

---
 setuptools/ssl_support.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2aec655a09..f8a780a95b 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -88,9 +88,16 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
     class CertificateError(ValueError):
         pass
 
-    def _dnsname_to_pat(dn):
+    def _dnsname_to_pat(dn, max_wildcards=1):
         pats = []
         for frag in dn.split(r'.'):
+            if frag.count('*') > max_wildcards:
+                # Issue #17980: avoid denials of service by refusing more
+                # than one wildcard per fragment.  A survery of established
+                # policy among SSL implementations showed it to be a
+                # reasonable choice.
+                raise CertificateError(
+                    "too many wildcards in certificate DNS name: " + repr(dn))
             if frag == '*':
                 # When '*' is a fragment by itself, it matches a non-empty dotless
                 # fragment.

From fe0cad564d7e036d3b7b6d4ac59dc30d9abdb338 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 16:41:50 -0400
Subject: [PATCH 1371/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 release.py  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa8bd09364..2c1af0c519 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.9.5
+-----
+
+* Python #17980: Fix security vulnerability in SSL certificate validation.
+
 -----
 0.9.4
 -----
diff --git a/release.py b/release.py
index 5e99e74cfd..659b408668 100644
--- a/release.py
+++ b/release.py
@@ -29,6 +29,7 @@ def before_upload():
     r"Buildout #(?P<buildout>\d+)",
     r"Old Setuptools #(?P<old_setuptools>\d+)",
     r"Jython #(?P<jython>\d+)",
+    r"Python #(?P<python>\d+)",
 ]
 
 issue_urls = dict(
@@ -37,6 +38,7 @@ def before_upload():
     buildout='https://github.com/buildout/buildout/issues/{buildout}',
     old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
     jython='http://bugs.jython.org/issue{jython}',
+    python='http://bugs.python.org/issue{python}',
 )
 
 def _linkify(source, dest):

From fae1bf32e9e161646a9a1c8932e04d5593edf933 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 17:13:07 -0400
Subject: [PATCH 1372/8469] Added tag 0.9.5 for changeset 88e3d6788fac

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8c6482c0b4..54f16ccdd3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -85,3 +85,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2
 3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3
 1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4
+88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5

From d00b66d5f530da930fdd89cdfdf0ff954f88a141 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jul 2013 17:13:48 -0400
Subject: [PATCH 1373/8469] Bumped to 0.9.6 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 82 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 12 ++--
 setuptools/__init__.py               |  2 +-
 4 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index fc1d6170cc..2535472190 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.5"
+DEFAULT_VERSION = "0.9.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 26422c4d46..669a59d644 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
 [egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-requires.txt = setuptools.command.egg_info:write_requirements
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 
 [distutils.commands]
-alias = setuptools.command.alias:alias
-register = setuptools.command.register:register
-build_ext = setuptools.command.build_ext:build_ext
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_lib = setuptools.command.install_lib:install_lib
-setopt = setuptools.command.setopt:setopt
-upload_docs = setuptools.command.upload_docs:upload_docs
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-test = setuptools.command.test:test
 egg_info = setuptools.command.egg_info:egg_info
 saveopts = setuptools.command.saveopts:saveopts
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install = setuptools.command.install:install
-build_py = setuptools.command.build_py:build_py
+develop = setuptools.command.develop:develop
+test = setuptools.command.test:test
 rotate = setuptools.command.rotate:rotate
+build_py = setuptools.command.build_py:build_py
+register = setuptools.command.register:register
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+setopt = setuptools.command.setopt:setopt
+build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+sdist = setuptools.command.sdist:sdist
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install_scripts = setuptools.command.install_scripts:install_scripts
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+install_lib = setuptools.command.install_lib:install_lib
 
 [distutils.setup_keywords]
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
 test_loader = setuptools.dist:check_importable
-zip_safe = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+tests_require = setuptools.dist:check_requirements
 package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
 namespace_packages = setuptools.dist:check_nsp
-entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
 use_2to3 = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-test_suite = setuptools.dist:check_test_suite
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_fixers = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 6d385dc746..256342f0e4 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2ef6b3be67..74b1029421 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.5'
+__version__ = '0.9.6'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 3e72e7f7eacca7db638f7230f93cf696d49c77bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 17 Jul 2013 11:28:44 -0400
Subject: [PATCH 1374/8469] Add compatibility for Python 2.4 when querying the
 hash name. Fixes #44

---
 CHANGES.txt                           |   7 ++
 setuptools.egg-info/entry_points.txt  | 124 +++++++++++++-------------
 setuptools.egg-info/requires.txt      |   6 +-
 setuptools/package_index.py           |  17 +++-
 setuptools/tests/test_packageindex.py |  16 +++-
 5 files changed, 103 insertions(+), 67 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2c1af0c519..6e993ada5c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.9.6
+-----
+
+* Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a `.name`
+  attribute.
+
 -----
 0.9.5
 -----
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 669a59d644..870a6dbee6 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
-[distutils.commands]
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-egg_info = setuptools.command.egg_info:egg_info
-saveopts = setuptools.command.saveopts:saveopts
-develop = setuptools.command.develop:develop
-test = setuptools.command.test:test
-rotate = setuptools.command.rotate:rotate
-build_py = setuptools.command.build_py:build_py
-register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-easy_install = setuptools.command.easy_install:easy_install
-install = setuptools.command.install:install
-setopt = setuptools.command.setopt:setopt
-build_ext = setuptools.command.build_ext:build_ext
-upload_docs = setuptools.command.upload_docs:upload_docs
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-sdist = setuptools.command.sdist:sdist
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_scripts = setuptools.command.install_scripts:install_scripts
-install_lib = setuptools.command.install_lib:install_lib
-
-[distutils.setup_keywords]
-zip_safe = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-entry_points = setuptools.dist:check_entry_points
-tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-eager_resources = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+
+[distutils.commands]
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+egg_info = setuptools.command.egg_info:egg_info
+saveopts = setuptools.command.saveopts:saveopts
+develop = setuptools.command.develop:develop
+test = setuptools.command.test:test
+rotate = setuptools.command.rotate:rotate
+build_py = setuptools.command.build_py:build_py
+register = setuptools.command.register:register
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+setopt = setuptools.command.setopt:setopt
+build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+sdist = setuptools.command.sdist:sdist
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_scripts = setuptools.command.install_scripts:install_scripts
+install_lib = setuptools.command.install_lib:install_lib
+
+[distutils.setup_keywords]
+zip_safe = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+entry_points = setuptools.dist:check_entry_points
+tests_require = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+eager_resources = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_fixers = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 256342f0e4..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
\ No newline at end of file
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 70aabd1bd6..47f00c0012 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -242,8 +242,23 @@ def feed(self, block):
     def is_valid(self):
         return self.hash.hexdigest() == self.expected
 
+    def _get_hash_name(self):
+        """
+        Python 2.4 implementation of MD5 doesn't supply a .name attribute
+        so provide that name.
+
+        When Python 2.4 is no longer required, replace invocations of this
+        method with simply 'self.hash.name'.
+        """
+        try:
+            return self.hash.name
+        except AttributeError:
+            if 'md5' in str(type(self.hash)):
+                return 'md5'
+            raise
+
     def report(self, reporter, template):
-        msg = template % self.hash.name
+        msg = template % self._get_hash_name()
         return reporter(msg)
 
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 4f2d382c35..3791914ac6 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -147,7 +147,6 @@ class TestContentCheckers(unittest.TestCase):
     def test_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
-        self.assertEqual(checker.hash.name, 'md5')
         checker.feed('You should probably not be using MD5'.encode('ascii'))
         self.assertEqual(checker.hash.hexdigest(),
             'f12895fdffbd45007040d2e44df98478')
@@ -166,3 +165,18 @@ def test_blank_md5(self):
             'http://foo/bar#md5=')
         checker.feed('anything'.encode('ascii'))
         self.assertTrue(checker.is_valid())
+
+    def test_get_hash_name_md5(self):
+        checker = setuptools.package_index.HashChecker.from_url(
+            'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
+        if sys.version_info >= (2,5):
+            self.assertEqual(checker.hash.name, 'md5')
+        else:
+            # Python 2.4 compatability
+            self.assertEqual(checker._get_hash_name(), 'md5')
+
+    def test_report(self):
+        checker = setuptools.package_index.HashChecker.from_url(
+            'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
+        rep = checker.report(lambda x: x, 'My message about %s')
+        self.assertEqual(rep, 'My message about md5')

From 55d6e17857d97eb80ef1eb5905227b1f3d71e627 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 17 Jul 2013 21:08:22 -0400
Subject: [PATCH 1375/8469] Added tag 0.9.6 for changeset acc6c5d61d0f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 54f16ccdd3..bb4ffc144b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -86,3 +86,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3
 1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4
 88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5
+acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6

From d748f5e7c9107123704a0907bdb87a2eb5e149a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 17 Jul 2013 21:08:57 -0400
Subject: [PATCH 1376/8469] Bumped to 0.9.7 in preparation for next release.

---
 ez_setup.py                          |   2 +-
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools.egg-info/requires.txt     |   8 +-
 setuptools/__init__.py               |   2 +-
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2535472190..22f14f7332 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.6"
+DEFAULT_VERSION = "0.9.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 870a6dbee6..d64b3c288e 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
-[distutils.commands]
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-egg_info = setuptools.command.egg_info:egg_info
-saveopts = setuptools.command.saveopts:saveopts
-develop = setuptools.command.develop:develop
-test = setuptools.command.test:test
-rotate = setuptools.command.rotate:rotate
-build_py = setuptools.command.build_py:build_py
-register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-easy_install = setuptools.command.easy_install:easy_install
-install = setuptools.command.install:install
-setopt = setuptools.command.setopt:setopt
-build_ext = setuptools.command.build_ext:build_ext
-upload_docs = setuptools.command.upload_docs:upload_docs
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-sdist = setuptools.command.sdist:sdist
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_scripts = setuptools.command.install_scripts:install_scripts
-install_lib = setuptools.command.install_lib:install_lib
-
-[distutils.setup_keywords]
-zip_safe = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-entry_points = setuptools.dist:check_entry_points
-tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-eager_resources = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+exclude_package_data = setuptools.dist:check_package_data
+extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[egg_info.writers]
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
+
+[distutils.commands]
+test = setuptools.command.test:test
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_lib = setuptools.command.install_lib:install_lib
+rotate = setuptools.command.rotate:rotate
+saveopts = setuptools.command.saveopts:saveopts
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_py = setuptools.command.build_py:build_py
+register = setuptools.command.register:register
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..0b577c9748 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
 
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 74b1029421..18dd363d12 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.6'
+__version__ = '0.9.7'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From b8a80d2f4a95c4d6c7db7536fc00f1fc5708321d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Jul 2013 09:09:52 -0400
Subject: [PATCH 1377/8469] Updated README and setup.py to reference PyPA

---
 README.txt | 6 +++++-
 setup.py   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 0a3bb21db4..d57e1258fd 100755
--- a/README.txt
+++ b/README.txt
@@ -157,7 +157,7 @@ Credits
   aspects of ``easy_install``, and supplied the doctests for the command-line
   ``.exe`` wrappers on Windows.
 
-* Phillip J. Eby is the principal author and maintainer of setuptools, and
+* Phillip J. Eby is the seminal author of setuptools, and
   first proposed the idea of an importable binary distribution format for
   Python application plug-ins.
 
@@ -167,4 +167,8 @@ Credits
   "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
   use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
 
+* Since the merge with Distribute, Jason R. Coombs is the
+  maintainer of setuptools.  The project is maintained in coordination with
+  the Python Packaging Authority (PyPA) and the larger Python community.
+
 .. _files:
diff --git a/setup.py b/setup.py
index d716ee2ec9..978644d223 100755
--- a/setup.py
+++ b/setup.py
@@ -102,7 +102,7 @@ def run(self):
     version=main_ns['__version__'],
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
-    author="The fellowship of the packaging",
+    author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     license="PSF or ZPL",
     long_description = long_description,

From d01d1da2bed3f0ebefde89878e1e1597f3c50ca1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Jul 2013 09:10:24 -0400
Subject: [PATCH 1378/8469] Remove excess whitespace

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 978644d223..629f2fff24 100755
--- a/setup.py
+++ b/setup.py
@@ -119,7 +119,7 @@ def run(self):
 
     cmdclass = {'test': test},
     entry_points = {
-        "distutils.commands" : [
+        "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
             for cmd in SETUP_COMMANDS
         ],

From 32ce1f20d60722db8cc99eecdc4b7bf6e627730e Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Fri, 19 Jul 2013 19:02:37 -0400
Subject: [PATCH 1379/8469] Make certain no previous imports of old versions of
 pkg_resources are floating around before importing the newly installed
 setuptools.

---
 ez_setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 22f14f7332..6b2a023b33 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -100,6 +100,8 @@ def _do_download(version, download_base, to_dir, download_delay):
                                       to_dir, download_delay)
         _build_egg(egg, tarball, to_dir)
     sys.path.insert(0, egg)
+    if 'pkg_resources' in sys.modules:
+        del sys.modules['pkg_resources']
     import setuptools
     setuptools.bootstrap_install_from = egg
 

From 28efa26aa909ea60533c0719ed5f7aaa6adf8fb2 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 20 Jul 2013 11:15:20 -0400
Subject: [PATCH 1380/8469] add _-separated keys to environment markers

---
 _markerlib/markers.py              | 4 ++++
 setuptools/tests/test_markerlib.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/_markerlib/markers.py b/_markerlib/markers.py
index c93d7f3b67..fa837061e0 100644
--- a/_markerlib/markers.py
+++ b/_markerlib/markers.py
@@ -49,6 +49,10 @@ def python_implementation():
          'extra': None # wheel extension
         }
 
+for var in list(_VARS.keys()):
+    if '.' in var:
+        _VARS[var.replace('.', '_')] = _VARS[var]
+
 def default_environment():
     """Return copy of default PEP 385 globals dictionary."""
     return dict(_VARS)
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index aa461846b6..dae71cba46 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -19,20 +19,24 @@ def test_markers(self):
         self.assertTrue(interpret(""))
         
         self.assertTrue(interpret("os.name != 'buuuu'"))
+        self.assertTrue(interpret("os_name != 'buuuu'"))
         self.assertTrue(interpret("python_version > '1.0'"))
         self.assertTrue(interpret("python_version < '5.0'"))
         self.assertTrue(interpret("python_version <= '5.0'"))
         self.assertTrue(interpret("python_version >= '1.0'"))
         self.assertTrue(interpret("'%s' in os.name" % os_name))
+        self.assertTrue(interpret("'%s' in os_name" % os_name))
         self.assertTrue(interpret("'buuuu' not in os.name"))
         
         self.assertFalse(interpret("os.name == 'buuuu'"))
+        self.assertFalse(interpret("os_name == 'buuuu'"))
         self.assertFalse(interpret("python_version < '1.0'"))
         self.assertFalse(interpret("python_version > '5.0'"))
         self.assertFalse(interpret("python_version >= '5.0'"))
         self.assertFalse(interpret("python_version <= '1.0'"))
         self.assertFalse(interpret("'%s' not in os.name" % os_name))
         self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))    
+        self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'"))    
         
         environment = default_environment()
         environment['extra'] = 'test'

From fae83a533275d9c6e21d2ede79aaa942ceacd5dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Jul 2013 05:09:34 -0400
Subject: [PATCH 1381/8469] Add comment and link back to justification.

--HG--
extra : rebase_source : e6f4e62a87e24933c8821fdef141d194b90874d3
---
 ez_setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 6b2a023b33..55434eb71e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -100,8 +100,12 @@ def _do_download(version, download_base, to_dir, download_delay):
                                       to_dir, download_delay)
         _build_egg(egg, tarball, to_dir)
     sys.path.insert(0, egg)
+
+    # Remove previously-imported pkg_resources if present (see
+    # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details).
     if 'pkg_resources' in sys.modules:
         del sys.modules['pkg_resources']
+
     import setuptools
     setuptools.bootstrap_install_from = egg
 

From 370e8115107724f358c753cfd7395586c7eb4081 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Jul 2013 23:57:00 -0400
Subject: [PATCH 1382/8469] #34: Update the 'bootstrap' bookmark as part of the
 release process.

--HG--
extra : rebase_source : 549f10a7b864152871edccf3d0f9e0bf57fb8bf0
---
 release.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/release.py b/release.py
index 659b408668..6635033505 100644
--- a/release.py
+++ b/release.py
@@ -6,6 +6,7 @@
 import re
 import os
 import itertools
+import subprocess
 
 try:
     zip_longest = itertools.zip_longest
@@ -14,6 +15,7 @@
 
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
+    _add_bootstrap_bookmark()
 
 files_with_versions = (
     'ez_setup.py', 'setuptools/__init__.py',
@@ -55,3 +57,8 @@ def replacer(match):
         if match_dict[key]:
             url = issue_urls[key].format(**match_dict)
             return "`{text} <{url}>`_".format(text=text, url=url)
+
+
+def _add_bootstrap_bookmark():
+    cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f']
+    subprocess.Popen(cmd)

From 76d45c48ae73175e0aca44286c4323b631daac46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Jul 2013 00:00:08 -0400
Subject: [PATCH 1383/8469] #34: Refer to the new canonical location of the
 bootstrap script

--HG--
extra : rebase_source : 4468b50706cd9ab6d0ae990ee6f785b314837dba
---
 README.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.txt b/README.txt
index d57e1258fd..53608bae8e 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
@@ -45,7 +45,7 @@ Unix-based Systems including Mac OS X
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py -O - | python
+    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python.
@@ -53,7 +53,7 @@ install to the system Python.
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
+    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
     > python ez_setup.py --user
 
 

From b9928121417a205e64f18b98f7d3cea05f41511b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Jul 2013 00:00:50 -0400
Subject: [PATCH 1384/8469] Add whitespace to remove linter warnings

--HG--
extra : rebase_source : 2f37f043a6cc87cc015efa318699bc09785dbd87
---
 release.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release.py b/release.py
index 6635033505..31cb64e439 100644
--- a/release.py
+++ b/release.py
@@ -13,6 +13,7 @@
 except AttributeError:
     zip_longest = itertools.izip_longest
 
+
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
     _add_bootstrap_bookmark()
@@ -43,6 +44,7 @@ def before_upload():
     python='http://bugs.python.org/issue{python}',
 )
 
+
 def _linkify(source, dest):
     pattern = '|'.join(link_patterns)
     with open(source) as source:
@@ -50,6 +52,7 @@ def _linkify(source, dest):
     with open(dest, 'w') as dest:
         dest.write(out)
 
+
 def replacer(match):
     text = match.group(0)
     match_dict = match.groupdict()

From 70067439d3b2b53cf2112ed0faf52c30b30ef3cd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Jul 2013 00:01:32 -0400
Subject: [PATCH 1385/8469] Remove unused imports in release script (usage
 masked by compatibilty technique).

--HG--
extra : rebase_source : 4f9aabd0efe87de76f85f91c4c379e48f68ffac4
---
 release.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/release.py b/release.py
index 31cb64e439..bad7e0eea7 100644
--- a/release.py
+++ b/release.py
@@ -5,14 +5,8 @@
 
 import re
 import os
-import itertools
 import subprocess
 
-try:
-    zip_longest = itertools.zip_longest
-except AttributeError:
-    zip_longest = itertools.izip_longest
-
 
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')

From b4ba33898f4d67af70319a0bb64edca72fc3ecee Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 20 Jul 2013 17:45:04 -0500
Subject: [PATCH 1386/8469] Additional Tests, Various fixes, and encoding
 dealings

--HG--
extra : rebase_source : 2734e79e08e194923eab8c70f92cb77bce7daccf
---
 setuptools/command/egg_info.py               |   2 +-
 setuptools/command/sdist.py                  |  84 ++---
 setuptools/compat.py                         |   2 +
 setuptools/svn_utils.py                      | 376 +++++++++++++------
 setuptools/tests/environment.py              | 104 +++++
 setuptools/tests/svn_data/svn13_example.zip  | Bin 0 -> 48818 bytes
 setuptools/tests/svn_data/svn13_ext_list.txt |   3 +
 setuptools/tests/svn_data/svn13_ext_list.xml |   0
 setuptools/tests/svn_data/svn13_info.xml     | 121 ++++++
 setuptools/tests/svn_data/svn14_example.zip  | Bin 0 -> 31077 bytes
 setuptools/tests/svn_data/svn14_ext_list.txt |   4 +
 setuptools/tests/svn_data/svn14_ext_list.xml |   0
 setuptools/tests/svn_data/svn14_info.xml     | 119 ++++++
 setuptools/tests/svn_data/svn15_example.zip  | Bin 0 -> 31143 bytes
 setuptools/tests/svn_data/svn15_ext_list.txt |   4 +
 setuptools/tests/svn_data/svn15_ext_list.xml |  19 +
 setuptools/tests/svn_data/svn15_info.xml     | 125 ++++++
 setuptools/tests/svn_data/svn16_example.zip  | Bin 0 -> 29418 bytes
 setuptools/tests/svn_data/svn16_ext_list.txt |   4 +
 setuptools/tests/svn_data/svn16_ext_list.xml |  19 +
 setuptools/tests/svn_data/svn16_info.xml     | 125 ++++++
 setuptools/tests/svn_data/svn17_example.zip  | Bin 0 -> 46954 bytes
 setuptools/tests/svn_data/svn17_ext_list.txt |   4 +
 setuptools/tests/svn_data/svn17_ext_list.xml |  19 +
 setuptools/tests/svn_data/svn17_info.xml     | 130 +++++++
 setuptools/tests/svn_data/svn18_example.zip  | Bin 0 -> 47477 bytes
 setuptools/tests/svn_data/svn18_ext_list.txt |   4 +
 setuptools/tests/svn_data/svn18_ext_list.xml |  19 +
 setuptools/tests/svn_data/svn18_info.xml     | 136 +++++++
 setuptools/tests/test_egg_info.py            |  13 +
 setuptools/tests/test_sdist.py               |  64 +++-
 setuptools/tests/test_svn.py                 | 305 +++++++++------
 32 files changed, 1528 insertions(+), 277 deletions(-)
 create mode 100644 setuptools/tests/environment.py
 create mode 100644 setuptools/tests/svn_data/svn13_example.zip
 create mode 100644 setuptools/tests/svn_data/svn13_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn13_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn13_info.xml
 create mode 100644 setuptools/tests/svn_data/svn14_example.zip
 create mode 100644 setuptools/tests/svn_data/svn14_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn14_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn14_info.xml
 create mode 100644 setuptools/tests/svn_data/svn15_example.zip
 create mode 100644 setuptools/tests/svn_data/svn15_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn15_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn15_info.xml
 create mode 100644 setuptools/tests/svn_data/svn16_example.zip
 create mode 100644 setuptools/tests/svn_data/svn16_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn16_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn16_info.xml
 create mode 100644 setuptools/tests/svn_data/svn17_example.zip
 create mode 100644 setuptools/tests/svn_data/svn17_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn17_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn17_info.xml
 create mode 100644 setuptools/tests/svn_data/svn18_example.zip
 create mode 100644 setuptools/tests/svn_data/svn18_ext_list.txt
 create mode 100644 setuptools/tests/svn_data/svn18_ext_list.xml
 create mode 100644 setuptools/tests/svn_data/svn18_info.xml

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 345ec8aec0..3170064815 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -217,7 +217,7 @@ def tags(self):
 
     @staticmethod
     def get_svn_revision():
-        return str(svn_utils.parse_revision(os.curdir))
+        return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
 
 
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 5cc2139be6..e1112ff930 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -8,73 +8,58 @@
 
 READMES = ('README', 'README.rst', 'README.txt')
 
-entities = [
-    ("&lt;","<"), ("&gt;", ">"), ("&quot;", '"'), ("&apos;", "'"),
-    ("&amp;", "&")
-]
 
-def unescape(data):
-    for old,new in entities:
-        data = data.replace(old,new)
-    return data
+def walk_revctrl(dirname=''):
+    """Find all files under revision control"""
+    for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
+        for item in ep.load()(dirname):
+            yield item
+
+
+#TODO will need test case
+class re_finder(object):
 
-def re_finder(pattern, postproc=None):
-    def find(dirname, filename):
+    def __init__(self, path, pattern, postproc=None):
+        self.pattern = pattern
+        self.postproc = postproc
+        self.path = convert_path(path)
+
+    def _finder(self, dirname, filename):
         f = open(filename,'rU')
-        data = f.read()
-        f.close()
-        for match in pattern.finditer(data):
+        try:
+            data = f.read()
+        finally:
+            f.close()
+        for match in self.pattern.finditer(data):
             path = match.group(1)
             if postproc:
+                #postproc used to be used when the svn finder
+                #was an re_finder for calling unescape
                 path = postproc(path)
-            yield joinpath(dirname,path)
-    return find
-
-def joinpath(prefix,suffix):
-    if not prefix:
-        return suffix
-    return os.path.join(prefix,suffix)
-
-
-
+            yield svn_utils.joinpath(dirname,path)
 
+    def __call__(self, dirname=''):
+        path = svn_utils.joinpath(dirname, self.path)
 
-
-
-
-
-def walk_revctrl(dirname=''):
-    """Find all files under revision control"""
-    for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
-        for item in ep.load()(dirname):
-            yield item
-
-def _default_revctrl(dirname=''):
-    for path, finder in finders:
-        path = joinpath(dirname,path)
         if os.path.isfile(path):
-            for path in finder(dirname,path):
+            for path in self._finder(dirname,path):
                 if os.path.isfile(path):
                     yield path
                 elif os.path.isdir(path):
-                    for item in _default_revctrl(path):
+                    for item in self.find(path):
                         yield item
 
 
-def entries_externals_finder(dirname, filename):
-    for record in svn_utils.parse_dir_entries(dirname):
-        yield joinpath(dirname, record)
-
-    for name in svn_utils.parse_externals(dirname):
-        yield joinpath(dirname, name)
+def _default_revctrl(dirname=''):
+    'Primary svn_cvs entry point'
+    for finder in finders:
+        for item in finder(dirname):
+            yield item
 
 
 finders = [
-    (convert_path('CVS/Entries'),
-        re_finder(re.compile(r"^\w?/([^/]+)/", re.M))),
-    #combined externals due to common interface
-    #combined externals and enteries due to lack of dir_props in 1.7
-    (convert_path('.svn/entries'), entries_externals_finder),
+    re_finder('CVS/Entries', re.compile(r"^\w?/([^/]+)/", re.M)),
+    svn_utils.svn_finder,
 ]
 
 
@@ -88,6 +73,7 @@ def entries_externals_finder(dirname, filename):
 
 
 
+
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""
 
diff --git a/setuptools/compat.py b/setuptools/compat.py
index e2f64de236..94fe23e92d 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -26,6 +26,7 @@
     reduce = reduce
     unichr = unichr
     unicode = unicode
+    bytes = str
     from urllib import url2pathname
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
@@ -69,6 +70,7 @@ def exec_(code, globs=None, locs=None):
     from functools import reduce
     unichr = chr
     unicode = str
+    bytes = bytes
     from urllib.error import HTTPError, URLError
     import urllib.request as urllib2
     from urllib.request import urlopen, url2pathname
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index a4c53f154b..09aa5e25c8 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,31 +1,22 @@
 import os
 import re
 import sys
-import codecs
 from distutils import log
 import xml.dom.pulldom
+import shlex
+import locale
+import unicodedata
+from setuptools.compat import unicode, bytes
 
 try:
     import urlparse
 except ImportError:
     import urllib.parse as urlparse
 
-#requires python >= 2.4
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
-#NOTE: Use of the command line options
-#      require SVN 1.3 or newer (December 2005)
-#      and SVN 1.3 hsan't been supported by the
-#      developers since mid 2008.
-
-
-#svnversion return values (previous implementations return max revision)
-#   4123:4168     mixed revision working copy
-#   4168M         modified working copy
-#   4123S         switched working copy
-#   4123:4168MS   mixed revision, modified, switched working copy
-_SVN_VER_RE = re.compile(r'(?:([\-0-9]+):)?(\d+)([a-z]*)\s*$', re.I)
-
+#NOTE: Use of the command line options require SVN 1.3 or newer (December 2005)
+#      and SVN 1.3 hasn't been supported by the developers since mid 2008.
 
 #subprocess is called several times with shell=(sys.platform=='win32')
 #see the follow for more information:
@@ -33,27 +24,20 @@
 #       http://stackoverflow.com/questions/5658622/
 #              python-subprocess-popen-environment-path
 def _run_command(args, stdout=_PIPE, stderr=_PIPE):
-        #regarding the shell argument, see: http://bugs.python.org/issue8557
-        try:
-            proc = _Popen(args, stdout=stdout, stderr=stderr,
-                          shell=(sys.platform == 'win32'))
-
-            data = proc.communicate()[0]
-        except OSError:
-            return 1, ''
-
-        #TODO: this is probably NOT always utf-8
-        try:
-            data = unicode(data, encoding='utf-8')
-        except NameError:
-            data = str(data, encoding='utf-8')
+    #regarding the shell argument, see: http://bugs.python.org/issue8557
+    try:
+        args = [fsdecode(x) for x in args]
+        proc = _Popen(args, stdout=stdout, stderr=stderr,
+                      shell=(sys.platform == 'win32'))
 
-        #communciate calls wait()
-        return proc.returncode, data
+        data = proc.communicate()[0]
+    except OSError:
+        return 1, ''
 
+    data = consoledecode(data)
 
-def _get_entry_name(entry):
-    return entry.getAttribute('path')
+    #communciate calls wait()
+    return proc.returncode, data
 
 
 def _get_entry_schedule(entry):
@@ -63,105 +47,283 @@ def _get_entry_schedule(entry):
                     if t.nodeType == t.TEXT_NODE])
 
 
-def parse_revision(path):
-    code, data = _run_command(['svnversion', '-c', path])
+def _get_target_property(target):
+    property_text = target.getElementsByTagName('property')[0]
+    return "".join([t.nodeValue
+                    for t in property_text.childNodes
+                    if t.nodeType == t.TEXT_NODE])
 
-    if code:
-        log.warn("svnversion failed")
-        return 0
+
+def _get_xml_data(decoded_str):
+    if sys.version_info < (3, 0):
+        #old versions want an encoded string
+        data = decoded_str.encode('utf-8')
     else:
-        log.warn('Version: %s' % data.strip())
+        data = decoded_str
+    return data
 
-    parsed = _SVN_VER_RE.match(data)
-    if parsed:
-        try:
-            #No max needed this command summarizes working copy since 1.0
-            return int(parsed.group(2))
-        except ValueError:
-            #This should only happen if the revision is WAY too big.
-            pass
-    return 0
-
-#TODO: Need to do this with the -R because only root has .svn in 1.7.x
-def parse_dir_entries(path):
-    code, data = _run_command(['svn', 'info',
-                               '--depth', 'immediates', '--xml', path])
-
-    if code:
-        log.warn("svn info failed")
-        return []
 
-    data = codecs.encode(data, 'UTF-8')
+def joinpath(prefix, suffix):
+    if not prefix or prefix == '.':
+        return suffix
+    return os.path.join(prefix, suffix)
+
+
+def fsencode(path):
+    "Path must be unicode or in file system encoding already"
+    encoding = sys.getfilesystemencoding()
+
+    if isinstance(path, unicode):
+        path = path.encode()
+    elif not isinstance(path, bytes):
+        raise TypeError('%s is not a string or byte type'
+                        % type(path).__name__)
+
+    #getfilessystemencoding doesn't have the mac-roman issue
+    if encoding == 'utf-8' and sys.platform == 'darwin':
+        path = path.decode('utf-8')
+        path = unicodedata.normalize('NFD', path)
+        path = path.encode('utf-8')
 
-    doc = xml.dom.pulldom.parseString(data)
+    return path
+
+def fsdecode(path):
+    "Path must be unicode or in file system encoding already"
+    encoding = sys.getfilesystemencoding()
+    if isinstance(path, bytes):
+        path = path.decode(encoding)
+    elif not isinstance(path, unicode):
+        raise TypeError('%s is not a byte type'
+                        % type(path).__name__)
+
+    return unicodedata.normalize('NFC', path)
+
+def consoledecode(text):
+    encoding = locale.getpreferredencoding()
+    return text.decode(encoding)
+
+
+def parse_dir_entries(decoded_str):
+    '''Parse the entries from a recursive info xml'''
+    doc = xml.dom.pulldom.parseString(_get_xml_data(decoded_str))
     entries = list()
+
     for event, node in doc:
         if event == 'START_ELEMENT' and node.nodeName == 'entry':
             doc.expandNode(node)
-            entries.append(node)
-
-    if entries:
-        return [
-            _get_entry_name(element)
-            for element in entries[1:]
-            if _get_entry_schedule(element).lower() != 'deleted'
-        ]
-    else:
-        return []
+            if not _get_entry_schedule(node).startswith('delete'):
+                entries.append((node.getAttribute('path'),
+                                node.getAttribute('kind')))
 
+    return entries[1:]  # do not want the root directory
 
-#--xml wasn't supported until 1.5.x need to do -R
-#TODO: -R looks like directories are seperated by blank lines
-#      with dir - prepened to first directory
-#      what about directories with spaces?
-#          put quotes around them
-#      what about the URL's?
-#          same
-#      convert to UTF-8 and use csv
-#         delimiter = space
-#
-#-R without --xml parses a bit funny
-def parse_externals(path):
-    try:
-        code, lines = _run_command(['svn',
-                                    'propget', 'svn:externals', path])
 
-        if code:
-            log.warn("svn propget failed")
-            return []
+def parse_externals_xml(decoded_str, prefix=''):
+    '''Parse a propget svn:externals xml'''
+    prefix = os.path.normpath(prefix)
+
+    doc = xml.dom.pulldom.parseString(_get_xml_data(decoded_str))
+    externals = list()
+
+    for event, node in doc:
+        if event == 'START_ELEMENT' and node.nodeName == 'target':
+            doc.expandNode(node)
+            path = os.path.normpath(node.getAttribute('path'))
+            if os.path.normcase(path).startswith(prefix):
+                path = path[len(prefix)+1:]
 
-        lines = [line for line in lines.splitlines() if line]
-    except ValueError:
-        lines = []
+            data = _get_target_property(node)
+            for external in parse_external_prop(data):
+                externals.append(joinpath(path, external))
 
+    return externals  # do not want the root directory
+
+
+def parse_external_prop(lines):
+    """
+    Parse the value of a retrieved svn:externals entry.
+
+    possible token setups (with quotng and backscaping in laters versions)
+        URL[@#] EXT_FOLDERNAME
+        [-r#] URL EXT_FOLDERNAME
+        EXT_FOLDERNAME [-r#] URL
+    """
     externals = []
-    for line in lines:
-        line = line.split()
+    for line in lines.splitlines():
+        line = line.lstrip() #there might be a "\ "
         if not line:
             continue
 
+        if sys.version_info < (3, 0):
+            #shlex handles NULLs just fine and shlex in 2.7 tries to encode
+            #as ascii automatiically
+            line = line.encode('utf-8')
+        line = shlex.split(line)
+        if sys.version_info < (3, 0):
+            line = [x.decode('utf-8') for x in line]
+
+        #EXT_FOLDERNAME is either the first or last depending on where
+        #the URL falls
         if urlparse.urlsplit(line[-1])[0]:
-            externals.append(line[0])
+            external = line[0]
         else:
-            externals.append(line[-1])
+            external = line[-1]
+
+        externals.append(os.path.normpath(external))
 
     return externals
 
 
-def get_svn_tool_version():
-    _, data = _run_command(['svn', '--version', '--quiet'])
-    if data:
-        return data.strip()
-    else:
-        return ''
+class SvnInfo(object):
+    '''
+    Generic svn_info object.  No has little knowledge of how to extract
+    information.  Use cls.load to instatiate according svn version.
 
-if __name__ == '__main__':
-    def entries_externals_finder(dirname):
-        for record in parse_dir_entries(dirname):
-            yield os.path.join(dirname, record)
+    Paths are not filesystem encoded.
+    '''
 
-        for name in parse_externals(dirname):
-            yield os.path.join(dirname, name)
+    @staticmethod
+    def get_svn_version():
+        code, data = _run_command(['svn', '--version', '--quiet'])
+        if code == 0 and data:
+            return unicode(data).strip()
+        else:
+            return unicode('')
+
+    #svnversion return values (previous implementations return max revision)
+    #   4123:4168     mixed revision working copy
+    #   4168M         modified working copy
+    #   4123S         switched working copy
+    #   4123:4168MS   mixed revision, modified, switched working copy
+    revision_re = re.compile(r'(?:([\-0-9]+):)?(\d+)([a-z]*)\s*$', re.I)
+
+    @classmethod
+    def load(cls, dirname=''):
+        code, data = _run_command(['svn', 'info', os.path.normpath(dirname)])
+        svn_version = tuple(cls.get_svn_version().split('.'))
+        base_svn_version = tuple(int(x) for x in svn_version[:2])
+        if code and base_svn_version:
+            #Not an SVN repository or compatible one
+            return SvnInfo(dirname)
+        elif base_svn_version < (1, 3):
+            log.warn('Insufficent version of SVN found')
+            return SvnInfo(dirname)
+        elif base_svn_version < (1, 5):
+            return Svn13Info(dirname)
+        else:
+            return Svn15Info(dirname)
+
+    def __init__(self, path=''):
+        self.path = path
+        self._entries = None
+        self._externals = None
+
+    def get_revision(self):
+        'Retrieve the directory revision informatino using svnversion'
+        code, data = _run_command(['svnversion', '-c', self.path])
+        if code:
+            log.warn("svnversion failed")
+            return 0
 
-    for name in entries_externals_finder(sys.argv[1]):
+        parsed = self.revision_re.match(data)
+        if parsed:
+            return int(parsed.group(2))
+        else:
+            return 0
+
+    @property
+    def entries(self):
+        if self._entries is None:
+            self._entries = self.get_entries()
+        return self._entries
+
+    @property
+    def externals(self):
+        if self._externals is None:
+            self._externals = self.get_externals()
+        return self._externals
+
+    def iter_externals(self):
+        '''
+        Iterate over the svn:external references in the repository path.
+        '''
+        for item in self.externals:
+            yield item
+
+    def iter_files(self):
+        '''
+        Iterate over the non-deleted file entries in the repository path
+        '''
+        for item, kind in self.entries:
+            if kind.lower()=='file':
+                yield item
+
+    def iter_dirs(self, include_root=True):
+        '''
+        Iterate over the non-deleted file entries in the repository path
+        '''
+        if include_root:
+            yield self.path
+        for item, kind in self.entries:
+            if kind.lower()=='dir':
+                yield item
+
+    def get_entries(self):
+        return []
+
+    def get_externals(self):
+        return []
+
+class Svn13Info(SvnInfo):
+    def get_entries(self):
+        code, data = _run_command(['svn', 'info', '-R', '--xml', self.path])
+
+        if code:
+            log.debug("svn info failed")
+            return []
+
+        return parse_dir_entries(data)
+
+    def get_externals(self):
+        #Previous to 1.5 --xml was not supported for svn propget and the -R
+        #output format breaks the shlex compatible semantics.
+        cmd = ['svn', 'propget', 'svn:externals']
+        result = []
+        for folder in self.iter_dirs():
+            code, lines = _run_command(cmd + [folder])
+            if code != 0:
+                log.warn("svn propget failed")
+                return []
+            for external in parse_external_prop(lines):
+                if folder:
+                    external = os.path.join(folder, external)
+                result.append(os.path.normpath(external))
+
+        return result
+
+
+class Svn15Info(Svn13Info):
+    def get_externals(self):
+        cmd = ['svn', 'propget', 'svn:externals', self.path, '-R', '--xml']
+        code, lines = _run_command(cmd)
+        if code:
+            log.debug("svn propget failed")
+            return []
+        return parse_externals_xml(lines, prefix=os.path.abspath(self.path))
+
+
+def svn_finder(dirname=''):
+    #combined externals due to common interface
+    #combined externals and entries due to lack of dir_props in 1.7
+    info = SvnInfo.load(dirname)
+    for path in info.iter_files():
+        yield fsencode(path)
+
+    for path in info.iter_externals():
+        sub_info = SvnInfo.load(path)
+        for sub_path in sub_info.iter_files():
+            yield fsencode(sub_path)
+
+if __name__ == '__main__':
+    for name in svn_finder(sys.argv[1]):
         print(name)
\ No newline at end of file
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
new file mode 100644
index 0000000000..7c754b8e8c
--- /dev/null
+++ b/setuptools/tests/environment.py
@@ -0,0 +1,104 @@
+import os
+import zipfile
+import sys
+import tempfile
+import unittest
+import shutil
+import stat
+
+
+def _extract(self, member, path=None, pwd=None):
+    """for zipfile py2.5 borrowed from cpython"""
+    if not isinstance(member, zipfile.ZipInfo):
+        member = self.getinfo(member)
+
+    if path is None:
+        path = os.getcwd()
+
+    return _extract_member(self, member, path, pwd)
+
+
+def _extract_from_zip(self, name, dest_path):
+    dest_file = open(dest_path, 'wb')
+    try:
+        dest_file.write(self.read(name))
+    finally:
+        dest_file.close()
+
+def _extract_member(self, member, targetpath, pwd):
+    """for zipfile py2.5 borrowed from cpython"""
+    # build the destination pathname, replacing
+    # forward slashes to platform specific separators.
+    # Strip trailing path separator, unless it represents the root.
+    if (targetpath[-1:] in (os.path.sep, os.path.altsep)
+        and len(os.path.splitdrive(targetpath)[1]) > 1):
+        targetpath = targetpath[:-1]
+
+    # don't include leading "/" from file name if present
+    if member.filename[0] == '/':
+        targetpath = os.path.join(targetpath, member.filename[1:])
+    else:
+        targetpath = os.path.join(targetpath, member.filename)
+
+    targetpath = os.path.normpath(targetpath)
+
+    # Create all upper directories if necessary.
+    upperdirs = os.path.dirname(targetpath)
+    if upperdirs and not os.path.exists(upperdirs):
+        os.makedirs(upperdirs)
+
+    if member.filename[-1] == '/':
+        if not os.path.isdir(targetpath):
+            os.mkdir(targetpath)
+        return targetpath
+
+    _extract_from_zip(self, member.filename, targetpath)
+
+    return targetpath
+
+
+def _remove_dir(target):
+
+    #on windows this seems to a problem
+    for dir_path, dirs, files in os.walk(target):
+        os.chmod(dir_path, stat.S_IWRITE)
+        for filename in files:
+            os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
+    shutil.rmtree(target)
+
+
+class ZippedEnvironment(unittest.TestCase):
+
+    datafile = None
+    dataname = None
+    old_cwd = None
+
+    def setUp(self):
+        if not os.path.isfile(self.datafile):
+            self.old_cwd = None
+            return
+
+        self.old_cwd = os.getcwd()
+
+        self.temp_dir = tempfile.mkdtemp()
+        zip_file, source, target = [None, None, None]
+        try:
+            zip_file = zipfile.ZipFile(self.datafile)
+            for files in zip_file.namelist():
+                _extract(zip_file, files, self.temp_dir)
+        finally:
+            if zip_file:
+                zip_file.close()
+            del zip_file
+
+        os.chdir(os.path.join(self.temp_dir, self.dataname))
+
+    def tearDown(self):
+        try:
+            if self.old_cwd:
+                os.chdir(self.old_cwd)
+                _remove_dir(self.temp_dir)
+        except OSError:
+            #sigh?
+            pass
+
diff --git a/setuptools/tests/svn_data/svn13_example.zip b/setuptools/tests/svn_data/svn13_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d85fb84f2ba03bc03ab2386b40e244924c614d36
GIT binary patch
literal 48818
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

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn13_ext_list.txt b/setuptools/tests/svn_data/svn13_ext_list.txt
new file mode 100644
index 0000000000..0bb0f43809
--- /dev/null
+++ b/setuptools/tests/svn_data/svn13_ext_list.txt
@@ -0,0 +1,3 @@
+third_party3 file:///C:/development/svn_example/repos/svn13/extra1
+third_party2 -r3 file:///C:/development/svn_example/repos/svn13/extra1
+third_party -r1 file:///C:/development/svn_example/repos/svn13/extra1
diff --git a/setuptools/tests/svn_data/svn13_ext_list.xml b/setuptools/tests/svn_data/svn13_ext_list.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/tests/svn_data/svn13_info.xml b/setuptools/tests/svn_data/svn13_info.xml
new file mode 100644
index 0000000000..5c96520ab4
--- /dev/null
+++ b/setuptools/tests/svn_data/svn13_info.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<info>
+<entry
+   kind="dir"
+   path="svn13_example"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<prop-updated>2013-07-13T15:33:23.187500Z</prop-updated>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:33:28.359375Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn13_example\a file"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main/a%20file</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:33:21.109375Z</text-updated>
+<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:33:21.312500Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn13_example\to_delete"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main/to_delete</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>delete</schedule>
+<text-updated>2013-07-13T15:33:28.140625Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:33:28.359375Z</date>
+</commit>
+</entry>
+<entry
+   kind="dir"
+   path="svn13_example\folder"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main/folder</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<prop-updated>2013-07-13T15:33:26.187500Z</prop-updated>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:33:26.312500Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn13_example\folder\quest.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main/folder/quest.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:33:20.109375Z</text-updated>
+<checksum>795240c6a830c14f83961e57e07dad12</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:33:20.312500Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn13_example\folder\lalala.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn13/main/folder/lalala.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn13/main</root>
+<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:33:19.375000Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:33:19.609375Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/svn_data/svn14_example.zip b/setuptools/tests/svn_data/svn14_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..57093c0b7cc51ace56f71c7eadb4c450c6814493
GIT binary patch
literal 31077
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
CQJJFv

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn14_ext_list.txt b/setuptools/tests/svn_data/svn14_ext_list.txt
new file mode 100644
index 0000000000..800a09659d
--- /dev/null
+++ b/setuptools/tests/svn_data/svn14_ext_list.txt
@@ -0,0 +1,4 @@
+third_party3 file:///C:/development/svn_example/repos/svn13/extra1
+third_party2 -r3 file:///C:/development/svn_example/repos/svn13/extra1
+third_party -r1 file:///C:/development/svn_example/repos/svn13/extra1
+
diff --git a/setuptools/tests/svn_data/svn14_ext_list.xml b/setuptools/tests/svn_data/svn14_ext_list.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/tests/svn_data/svn14_info.xml b/setuptools/tests/svn_data/svn14_info.xml
new file mode 100644
index 0000000000..a896a77f74
--- /dev/null
+++ b/setuptools/tests/svn_data/svn14_info.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<info>
+<entry
+   kind="dir"
+   path="svn14_example"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:34:14.406250Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn14_example\a file"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main/a%20file</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:34:08.109375Z</text-updated>
+<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:34:08.390625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn14_example\to_delete"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main/to_delete</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>delete</schedule>
+<text-updated>2013-07-13T15:34:14.125000Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:34:14.406250Z</date>
+</commit>
+</entry>
+<entry
+   kind="dir"
+   path="svn14_example\folder"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main/folder</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:34:12.390625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn14_example\folder\quest.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main/folder/quest.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:34:07.109375Z</text-updated>
+<checksum>795240c6a830c14f83961e57e07dad12</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:34:07.390625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn14_example\folder\lalala.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn14/main/folder/lalala.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn14/main</root>
+<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<text-updated>2013-07-13T15:34:06.250000Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:34:06.531250Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/svn_data/svn15_example.zip b/setuptools/tests/svn_data/svn15_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..52a1d45bb7516bdf8acf951c5e6ccaa39c5de500
GIT binary patch
literal 31143
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
DPBk<7

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn15_ext_list.txt b/setuptools/tests/svn_data/svn15_ext_list.txt
new file mode 100644
index 0000000000..75fde4e699
--- /dev/null
+++ b/setuptools/tests/svn_data/svn15_ext_list.txt
@@ -0,0 +1,4 @@
+third_party3 file:///C:/development/svn_example/repos/svn15/extra1
+-r3 file:///C:/development/svn_example/repos/svn15/extra1 third_party2
+file:///C:/development/svn_example/repos/svn15/extra1@r1 third_party
+
diff --git a/setuptools/tests/svn_data/svn15_ext_list.xml b/setuptools/tests/svn_data/svn15_ext_list.xml
new file mode 100644
index 0000000000..6950b3c5ce
--- /dev/null
+++ b/setuptools/tests/svn_data/svn15_ext_list.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<properties>
+<target
+   path="C:/development/svn_example/svn15_example/folder">
+<property
+   name="svn:externals">third_party3 file:///C:/development/svn_example/repos/svn15/extra2
+-r3 file:///C:/development/svn_example/repos/svn15/extra2 third_party2
+file:///C:/development/svn_example/repos/svn15/extra2@r1 third_party大介
+</property>
+</target>
+<target
+   path="C:/development/svn_example/svn15_example">
+<property
+   name="svn:externals">third_party3 file:///C:/development/svn_example/repos/svn15/extra1
+-r3 file:///C:/development/svn_example/repos/svn15/extra1 third_party2
+file:///C:/development/svn_example/repos/svn15/extra1@r1 third_party大介
+</property>
+</target>
+</properties>
diff --git a/setuptools/tests/svn_data/svn15_info.xml b/setuptools/tests/svn_data/svn15_info.xml
new file mode 100644
index 0000000000..0b3550afb8
--- /dev/null
+++ b/setuptools/tests/svn_data/svn15_info.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<info>
+<entry
+   kind="dir"
+   path="svn15_example"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:34:49.562500Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn15_example\a file"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main/a%20file</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:34:43.109375Z</text-updated>
+<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:34:43.484375Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn15_example\to_delete"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main/to_delete</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>delete</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:34:49.125000Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:34:49.562500Z</date>
+</commit>
+</entry>
+<entry
+   kind="dir"
+   path="svn15_example\folder"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main/folder</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:34:47.515625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn15_example\folder\quest.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main/folder/quest.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:34:42.109375Z</text-updated>
+<checksum>795240c6a830c14f83961e57e07dad12</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:34:42.484375Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn15_example\folder\lalala.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn15/main/folder/lalala.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn15/main</root>
+<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:34:41.375000Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:34:41.734375Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/svn_data/svn16_example.zip b/setuptools/tests/svn_data/svn16_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e886b2afde2150efda58d1f7f999e43846ac721f
GIT binary patch
literal 29418
zcmdsAd0b8D|G!x(p^}i2ZrLidXDOmo6k%*plGLTEy>6Q*gsjO{ld)yVz7%80k~KRi
zN({1O$zUvFtKoOfxjpwh&vVW__uQI4=KH(zx;`CW=XrnD_vdq#r|-z2jhpBS$d7o;
z8yD(_x<51t850+7-OFE;5D*p_DzY3Y_usZ={96m+RM`pYf?#6tf?I1%5{ZBKp7;vc
zPY4o6_l%5=i0nBfAV#$Q`f-hORxRc~_8VcG-!4bbA;J96dJRLzHgk<Nn)OLv;Wgx;
zQ+c;bGb(5PRI3=MpSs3uiRz2iwFiP0m>gMOrnmlih3;L+q#mvM_q=1X*l3ESaq0Ix
zLD925xtK={xqmj^$3Avx<mj091uuRME}S>CXwZn<du?Wa`O>sGuv4A#N#9%Z-hLz0
zZPrL2&}Ua$6fTJti(=NV@S1*}Q20x3+RLW>GHc(3Ce7bB)wa)J7qt(8I=0u|zusCL
zo^SfG?Sg5awrVw-lQ+{pTXb&L*5T^!Z!H?8rJrSUYvP5^zeapoI=a2bo-vtWKb^bh
zCT#S-V&^gN!kMTs8-pE04w80lPJ70L3Ac^=+@|-WvTdPz3q+1H#`(PH)9dGMr<xw6
z8GYQhCw2`>SY8$__Dvb`Qpfdk(UY3tm(yR&JbFs+MU+v;u#kZZ<}UB5KeBSr72WU8
zoO4=K+s&MPZq3fr+A%xyhxmnOyYEWrG2pYraMRxSWu_t5oT@6-W>1<M9xO0U@JuZ)
zxiugz(L8wIIh(0IUq1H!*b+EQAPB^g$dKJ(vKY%!gn4Rv`KQJ}r{QTU2T>wQkWg7g
zovJ~sEufO}_`?D2Es3AWZx7;&W;~U}^r->Dsp3!(`IppECSeiLBH`57a1&um4blhF
zWpRxx6)h`?@DCD&iX`;Pv_tX5+R0fgEE4hw9tC6hC-I4dJeLxf<mp_|;6SF`O1qAv
z2{<AoGocZYhJfLDb_#35IDKkFXpkrxaux1hW`)<Cf)N^dUc&vr+cO9VlF+)zgQCvk
z;5B0dHeNf@yN=gfHf&yXY@xf6O>ME&ps@v$42Dg*I;DGPjWB)ThIIYx&P&A^<AamR
zY-)^~8n3Z?KI^e#*xDJXk)xB|&v^E8+N0B5p61N7`8!8&qR?`@3P>v{v3>6moA;Ga
zTZJGtW}INN0l#G&4?i!|c1v3Af9Bfc4dEY~?>xL{yk7Ur174x|A6}$AaNXI#?aH=B
zQExl6Y!oQI_iMn@)naXzep)8CmVNM<>a*)^#MSPG0T$Wk-9-=HSq7i)kn6TIWcZ<f
z)I>dX4!oG$_p{}Wv`JdQ4o%&sAGNyfx%bbWf1U^pskr~HNK-QAUS`Jqf4Y@FTe&pw
zncki!i&j7Pwp%c?^t<uqW!iUJC;i-XGVbpkTE1~k{;`t{J!b`!h3pirt^8h=<6fSW
zy0zyVFXNnk^VhgeGw5OTVY~B#iP1+l76t{Seco+pHq4^yJNMbUo47qxNqA?PKHOty
zx5!7|-g!NFXHz`UN#-_zU>ZhmojIe<R$KTALWL{9<we#9af0l_jn7tLIDT(pEwsYm
zz|$*)29W<*ND?G6`a{e1%&Y3ITEt@Hw-?Vvqhdud5@b!2ArYa8!okr2;!r@U?4{k2
z8v>z2+-6gS=kkf10^hTcBOX1)deHu-osC;#B+nW;Wc10T3UH+4x=|Jy-Vrg8r-vk1
z933Q#42YH_+Hf$hTn0tXXQAPB;R_7gsR#sf2p+TGr3AGIAhlclN1PkjLbdXr^Zp)F
zYMf?f{k}(JrhaCwMc*{{>GyUt8=K<fJx0}ah3BKo`9U=+mTnqT{l#<lzDGm+#@^Yy
zZ)Jy|g9d69H||L8p1N$U`P6;a$)(3%-FEiA9QAN;L6mu#AXa7Kres&&5Z^(j6%z)3
zwht^y95-Ogt(=Tr^DnAu+$?I_(V@q>v|bf$N4boPpPrX~KR)})w>~Kqw=ej<^o&S-
zK6A<1Avy*@;l52GpY_y#(`QbU*~p{nT|R{xYo!cINiz-E@U+AB*q_CPe=bN~SbDL|
zz7u*MrW+1lBf9<U_dzS&O}Z^`*B9udoT(b>bo{S~thkEbPaN63y{g*5!$!sT=K1x1
z>&<p}=X>t5L3!WDoqr}*_0=1eJF^jJ70l}bYyK`~D<iz&_Ec^;m<{ozl+cW=u*l`!
zBwsgZOK3!X-S}%pFE=PSAbgrA1|>D;pde9@5c;2BZj(0S_}buv`2^ru;_F-=U@uqu
z(PO<v%h-9%^*oKUR@$>4`~79O&hS~ZIA&)^ymu?jXC)mD7azKCzT~3!r)C`rtA4gm
z-Q;QI>Nic$;rqQYWxve3azXXCb9w!32m8gY%i20R;Kpl7xmSrzb-SWj<2TH`7G_yG
z=;O{%QDNZygk3pZ18@0G8=0!%Hg}VX;LgwTQ=TjS(8_w;YrC;W@;??4H1Uwm^*Hh<
zo@7n(JEA@|dIv}XVuHoP#S<dJ#9;w3v8bDgJ|>KjM8^h7Vu`stAUsG&4E>_$@PN=5
zVYEmLJDr)<-IY)X=`MH{+AFsZpBhmnv03^~12v?R8x1F1EBvY$t^g%#!i<+!>x$q%
zp8IlVE~L}3Cc8<4a-2_#wryaGwzXtw(N=y7L!yWlZP0{Yi>_M)wCEDAkoyC*RV$BQ
z@?T+RTVww^WJau|*zEeYKQHcRdw1o5)s-6`jkTVy<7k@w^z7Asj<)J!*VM#_cJCW-
zWnb9+i+;aVjZJ?lSs5UHQT{k<;#skSXHuqkU3t4hdnabbY#Nd4*=p0SGk12J%Be6r
zI4D%tdS#-;ui^>2eh$rXGu{?bq;BsRHhqC+$kmK|j||&_>Ky%x;vY+Ph4;=|cCcul
zSANkov!u5IlR0f~3LYNZnr`3s+kwA)M(Qq4v#QNJHo@X*uND^u>X<lW=`<QYCDms_
zmh=5TFBi5<jZm*>Z~C}KZ}aBF<cc&&Mu6i*&oMeDj(E2CMQn1}b$M6UDOdHw=j9kj
zRIE9WoVKO;i^1d1&U{(;dBDZdDH<QIs(NRC|312^+{hqJq;<u_V|8VIs%fj)^CFfm
zGKe>9{V?9lx4-V0177bJU7b_pw>|J-;ktj?ef%`*=b<)Ftn)gRw|CdNZQbpSP00NT
zQ4_-bt`{2auF?MVdczMv!<v6x@c0lLAKHMHYiRSYTZ#{%@oD~y<sg2O^<fjaM8|%&
zs6P*)V*pPThsyv#@ai{LFqZxwm@5d6$v#fRPpsFo5VtaHj391eA^xL7qwLJWSeuo`
zWng^yoK`4JsA-}{7)gHJ>tn1>tXDu_uqYgzoy>(kGq6v?=Oy5b2G2{-LVRe2&%A^!
z$we)ECOT+2KJ>zm_#i$}mPWepN)3WH<kJP8k;~TdzdLdf9*}*y5<e-X1(FBQ85b^p
zK4Y7$C2PGmtjzh`)UdUL>)J%=a+Z4onBq-;>h2B4WXSE`y3<M4ldU0bPhY*P%T5xp
z2_}X^?wWwt0CV9D>yUF++D$9{KJC9$P&%PtN%`CL8rvo;?%=oMbo#Qrsy}NT=4;Nk
zxNKn5?_t{HVHQiAV=PkRZXA1YLv*s*>iU*RyL|U&X+0?EqgCB@{r11hCQAzLbor*{
zozzb_Ve*nsi*vRV&#_y2RwdnW>b^U*EdyNtzU_0S<DN)^J*V4;>Gr9LoV#wt^;L;O
z?e}i1+IC_@VEfYVcW&?fVS2rAzus@Dht59^ei@mhwe;D1lNoR9qo%(6UF|RP_*E%Y
zQSq}HgSum0iCS^yD(nY7T*!Q=Rd<6I4lETJay2d*<gb@J2863=IBzTI)mUpw>0Ziy
zL)o0aKAi2$PN{YHL{JI8^SJm|PCwfB@_AA2-F`U3SVPB`7NrrxZ=V}5JPplwTz8s<
z+$XZol)jDbAq|3};)q+!%=^>`EOj;@s9VRw8(C{NEq-`qe~%6CzaH~zvf9pA9BeY6
zsF}|4HhZ);8mTQZ(O98=<WOw?!5y0zU->Q^a{KQENoG}tvgVICQK9AgaM_21dnZ5k
z4Nq%%wXs&s(=W|@F28uM{r=3jC5^UfPE7l>IJaAA>iQ=8FK3TE*W#&Zvg&13?@p5R
zlhrQ8e{}H<opwp=+u`@Coj08SWc$|XYoGQvpI+!1e#6DKS(wgg&mFpLF3!7AwNx-J
zF?H>p?!_Bgn*T9R-)>y?xKl1EgLmd8W)Ha8_G68;Q`x8!&1ZY8>Ut@2OYUmZZt9xh
zfos2wDk`+rH<)T|d-ceL4^AFd>&9n~UvuG})A9UtCj-BOS2uO~k(5$yKV$l88S6_Q
zx)c7FeVBE}bSGPt;Mu_JK<w+l42Q45M;Eq=AlHHKhA}Tfn7YvGKvN#gWpb|?$y$)U
zPcyx2_J(BQ=m_z3Ain5)!-dGWrn}~-dDg0hpxAJcqh#v98)-A|j(m0LY-qEJMRRgm
zwpq5TgHf~Lr@v;Vt@UW0_ra-4(@IGn(~xyHC;O#4#2x>!@K@2A_x2-3nLo+T{LOCd
z^IuMl+_!4nqpjLC-PWY_sJT}impbQdUo|7=Jo~bN(Jp0Hzn$0aUz_NkR{G7Rwpxp3
z7SfNojb3jiCr|RrycXuNYLuI^tCt&kSwr|l?k(ZE*P3FuuXC7>`B-#7Is%?m%<+wV
z1wL8MD??ejKz((hvlNXIob3uK4@z(O7cuNv&AeZUcn(~8{718wc?pJSPp2zq8)VN?
zJf57r&=#U!{8@mIi#X~oYQd-~9ocU=r>c4ry>LNe1--EDY|sl!yha#UlQ(fM_*Xn=
zfAec#^ltTw>N|^@XI(LR+SY8I>4cox+Je;`wGGVv>KL}HHsO<r-e@DOqU_H{@7%HT
zD&M`cdP(@kFCz+m+y3<G+wB`lN|Se&I)Ax&v9R0AZvC&P&GTPZoj2QVpkBt?TYE3<
z6{gR=;rpf7x+byLyVPf04mBB69IV!=%s8!DZSb5~EpJ;MJZAId$m{!2PS^Ka9sH_Y
zV7)n3pp`2c-sSkp6>CRkbPes4d3URe*}&#ktZe3&2mIJys~5dK`X9$P$*<l=FS~wu
z`V~DFGxf?a$)#t5=KmO!m%r)#mZbaH{rBe`4mtH`rf)>J#l`ctr!R9B*tTx1yMK|{
zH1qbIPur;076$ZN9$@F~ci{N2U)qQC7(1o$rMBa{G+OA|vuA$G@2~VvHg%YCFfM*T
zulOwI^Wt%@M;+|wYw16FcwV3IF1nTTmb}imd%VP0(sAwzhboFZ*~cSJs;G+%AIjk@
zZ)lx*H`cl}_)raJV`Z!ZF%OT%szFo&b39=Vw@?u?5ZUj;lEuoqSu@uBf6=TNR?+N7
zhenxZO-HM<d6$Kqh{%y&N8&4Y3}WaoW`yeqbX+hOx{6~0BjQBSLP@YlNWBCjjtCb{
zjffW7*)(8K0NC{(6rdIOR4t$Cmo#)xfOO(hy$YBFDp&b~0v&fE)Ur=U;wO%{Beyy6
zYUCU;==+=hi$jL3C0%Ap4H>kT;p!qQjKj;IoQRu`^{*o4`?nO|D!c*7d<zafkGd#F
z$C%e!2d~N}4DusJ899jw-)aL>O!|Q4#9K9kzf^iJI`+D1M5)*9TW;$ncDDA`-j&&F
zb@I$DN7XI97da-MNE5miv}oj(^y=s@o_h_}Bs_Wh(EnTJojwnS_e%?Tl&62RaQV&V
zJ{Mv-o-N$%(sYQ<I#-8H;!AduvnF?M9NEKq){Q5vJHPfb80fIC`>T^v+xz90WR&*m
zYkt$T?UX{lu(<o84IjIE%^Vx>ORI6YJF1Iw$2e-~*^B2MtlDJe?lAZ-&DxvmBkVGN
zRRdNtTO0HKKEq{vm`2W+3p<Zo1|ARaA(V$EZ2Uql179xoW6w`m6M7lCGV0fWq(c{O
ziJTHaRN(9Z%$wkhpa9yYw==L0fPB2l(gARjcxps@mcCNN10?5Ky3RXvM3mqvl|};u
z?4i)4-ZLXoLZD6lL3~i|(hvx#zf~a~r9L}QwCZ8X4VBz=C6rvZqtjCIc;ry|>$jGz
zuS2ZEyv<H=4j0JCFjEYKZJ!kBGxB3heEo<oY6Jy>>@I*2XPmQLNt%(7J)M%^m^Mp#
zNr!H6f)RBIc4R@UV?!7VxDZIDb<8b3hB6nDA#x*buCid!90bG3mIqD*5{ekU4W>N;
zH(NejjHR+rc+sGi9bt!}O9qA;Z=OQsAdoUkDa+{24DXZaA+wB3lMjmEuzgH0dTrpx
z6=ce!Ptl=LX0ytB>R6gGQgqx{O9b7cF>4rUW0~8XU<La95lNYkOFCznPt4lM6d>~`
zQ;q@z*TFy_QGrDLEaenDgNzZNtMY;Vy`)7mNuvq7b7edZTPU*#)CQ1Hjo`6FEp(F)
zN5>O}1W5~|Oa+eQ)s;C_NJMWQ15%o;FiN98u24ydORgMgBSRr`<QxN~?x`pYqj9u5
zm5M+f>gS%Js4M8pV92iUSso0dIhb51ps+v(iZdOBVM(bP-E-ENz#u<l)mt>hQv=?~
zBezEsKRZkn`tyP}lmy4LFQvffZZR164JR;5t1#`qlCl-Z;>BYyTiJG60Z1}@oz=K(
zWiLK}f=k*^CaO>tO%ipgLR7SI;7H&YM#OLAc194law4*q;Eu#gRB-@_qDmPY-$T?}
zhDv7AbDpU51|!)B4VO>!ixMiVxRjbtH!^rXQZGaiM|G|+)8@-IE3xVk`CvEVkhV!X
zp_axzJa&}nK?Z&Uw;oty0ci~+8UQIC9spAW@18=ue=o(+gcCO7^f+sq0rugNE6q`R
zrzk|FV-05*NO2&625^Sqo;H$sT1Z58hdg9Dw_(7CdA?Li;}QlWD;iE|I+aMkDtUmi
z9ES1EW+YRoic8qFcn3F;8AztC6;WsCPz}HS19s)Xm<Pt1QS1!lkZVTNF&Abx87A5F
zB6(plTA=HaO%#xDOXajmVgzLZOFI#|-w(6}lDK~756se*06vgReCFh7Ei;^Swq6T9
z&ZZ1!FJJ(POD^B{L{yljoC;{e!ePNN7d+~LeE#t4B@MC;NK^%B(;zb*egN$z^8lFy
zDlK^jfmQ*!_srTuYBM@hxjF7*S4x6o+B4GJM7Qz5xjCagYT?g*;5r4W08fEqsY<k`
z;Fs=3AfB3}Sr1RKzR1PuGoTQ=g6w^_yG%i{p57^;Al8II5zlD)R1TRii`gCl??dcl
zSInGLF{5|n;2?qY#U-6LOf}GoTB5uf4KHfc6Ze!;fvzgp6CexN145@OT-Y?V35jgz
zNu-40fIyWD!-HhRB^?N60h`J4frL-z1z%UOFf_0nmt2KP59B1YPb)r_vsNaTBET24
z517e_P7|d(6tP9_vaD7!pa>I4ZL7xAF&8E}O|&LP3PoYBdk_g5+bbxW0s{HQ1eOLI
z-I@q9_IUolEYk$Q2QuMU3x$TGmEVS-NS=nXPZPjoTypuIE;*8bgOpPNB_13W9CN{=
z9@x(xo}F|+)&YsCz)m{oH1VT8DnJ~>+8GyAwx)8yVVfQ$!Ligcv|2<2WS{;rG9rhZ
zc;Z(Z@yrd{Gw|CfaH&+fw58O*B^@XxH##Hgl+;HZuHgoF1_TbM#^oU=M5V*TuW(S>
zL&!!z*hM7<T9k`$iR&YO*wSfN4}DlEoi(L^gA_Ro-98A@-In?&2yZ&#r5Bp&L~#)x
z{0bHw0*#2Bj(h`&4S|4r<@W$4I6C?SD+kWb!+`p6N!J%s4U`CvE3XF1#W*xL=28Lm
zga+~Z_>>3(%{p)yf$RhU>FBLNl@(q_@`pe_UTQ!D48sFf!6gn)Wo6wTU1Y2xB>v_U
zFL;7zVOU@_E@|g8`4yc#RfyMO6g!_~_QWB<F_*<%5sR<$f+mR*HW~LYIL2{dzC>r<
zR>UjKicMxENLUeIFfMULU|zI99I%*|A}|rc_`q;n(y?dOKKcyqEhm26yAv>ES5*h9
zsDK2Iuec!Tn3Ff~dUoLQJ^V5Yj5{iSJB161Tknw#RNN%hOVb?P^9i@0DBid%12=#N
zGTPZ5gJ*i$N)~By+D$a%Yc@O21A}qN<#_tZJ*mM(r8Gb(9@vXZE_BrXR>W(R@=Fd5
zJ3G6BgaZ=zL8<{g*1|<UTowUxto5&l2CNjoI*S0kaLMH%bD4f*eBSZb4;w{5Rssp4
z#D#5#VD~0oapW1Dy2muq7sTKa1*o{>(gMwqMM`VY@GM3BP_C2){4y2zgDX?%N0UM#
z6U>M|6h?zJHQ{*RnFx;Ic;HWn4UnwJVdz1<FUa;_=hq=?sVDqE&iuZFI)=gUQJj7N
zPWFX+++bwUAvb@*1&5K2z(kaG1ax~X+!6E$RzTg1m`5S9^a213<YMDh3{!ExqLn_)
zL@_XX7XVnegx!o|)9sgJnf*Mm(aOT{z%dstYV$`Pxa{==QVK{ETgv>T&G1~0UamWK
zQtWRU8=CJ~ncnGn7Lw}VnDzzR7Fsy*_9~?h*R2eI4SWNRrMl3*f!}0CZ}y}TiYY1r
z+BfuTwDoiib4)_t5l|!E_*SS6*8V^t-kw%PJ&r*WM0y(lFA91LCyT;^C+fdflxT6R
zQ3Ai=g^Ak!fG0Mc1aOl9iO24HIsxJ0qzQ?je1RFUL4qUVP&KmQ0(>C3ijaQXK;ouy
z<FZ`u0t{So6&rem@7#^kR=T>BGnKjh0`22_xnOOPu6oHnjUqQ7C-0fXXl~qn{5dxm
zqmLIj=23kdWDpZk+Q-qY!7!b6Hs$bY-P0SEK0di(9|a5)DA1hEFcqf_v}{kCDF$Yz
z3}7TK>GWmBlr9^RveeD_VWV_`<AGx?T-4@aJaE~m0;Cj>C^kD)pnZI`QrHl4ur@2*
zsJTe0gJZm$31`bb^qfv!QK}NZ*H<oef&GiJ|8Ed^Pe{T`=TUm#l8%X@dBR62J-Frx
zpaX~zIL3V<f1a=+HmmUW3C(z{Ap-D<)PXk=I?66#$PgV;N*%DvkX0FwA3zy!Ovg#l
zaAQSmcT(sZY`6jJ1n7|uOQ8)unkOndQvp0&!d7#$<S8ZaQMSS{!7&#$YP%}&`%(CK
zoSU)Oeb3HVG)oJK^c%&E4^b4{@j-^+60br6K=wi31l_}pi#<cYalkR{XC?!o!_-S|
zJeFY!VBiwB5oQ{6n98-}j4e$q^>HoCD4k@CA|%|cW5o#zD1<*K`*TWquLs%f<Jdu2
zZqOgf+(C5{AcwWw$e3#I0gircnY<CRj}wbAzk$sqph%d2()kVD6AjOAuN4EbjBfxJ
zNI}UKhM_ny(GR{zr#>crl`9K5!1torIT1kNlCBr#^hW0{32kb_3mT<E91a}Auy|-u
zi$fH{vNIvbCLqxuOPP>_hO4!otZc|eoUaTtUAwHE7-)e@E=SNsO#0v6R-ymN_b%Zg
z26+Y~oA>d2Ltl7`;|Kch<s2IPGyLHjo_DC_>UO-`%`f**$Ft`ieN#zDM0+$RJe_QC
dxbfTq$0LU}RV9`bq!9nLbs`?x6Ke|u{|AJ}{!0J=

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn16_ext_list.txt b/setuptools/tests/svn_data/svn16_ext_list.txt
new file mode 100644
index 0000000000..3ca54893cf
--- /dev/null
+++ b/setuptools/tests/svn_data/svn16_ext_list.txt
@@ -0,0 +1,4 @@
+"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
+'third party3b' file:///C:/development/svn_example/repos/svn16/extra1 
+-r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn16_ext_list.xml b/setuptools/tests/svn_data/svn16_ext_list.xml
new file mode 100644
index 0000000000..8ddaed0a19
--- /dev/null
+++ b/setuptools/tests/svn_data/svn16_ext_list.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<properties>
+<target
+   path="C:/development/svn_example/svn16_example/folder">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra2 
+-r3 file:///C:/development/svn_example/repos/svn16/extra2 third\ party2
+file:///C:/development/svn_example/repos/svn16/extra2@r1 third_party大介
+</property>
+</target>
+<target
+   path="C:/development/svn_example/svn16_example">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
+-r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
+</property>
+</target>
+</properties>
diff --git a/setuptools/tests/svn_data/svn16_info.xml b/setuptools/tests/svn_data/svn16_info.xml
new file mode 100644
index 0000000000..745469c958
--- /dev/null
+++ b/setuptools/tests/svn_data/svn16_info.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<info>
+<entry
+   kind="dir"
+   path="svn16_example"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:17.390625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn16_example\a file"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main/a%20file</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:14.578125Z</text-updated>
+<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:35:14.906250Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn16_example\to_delete"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main/to_delete</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>delete</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:17.046875Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:17.390625Z</date>
+</commit>
+</entry>
+<entry
+   kind="dir"
+   path="svn16_example\folder"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main/folder</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:35:16.406250Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn16_example\folder\quest.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main/folder/quest.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:14.078125Z</text-updated>
+<checksum>795240c6a830c14f83961e57e07dad12</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:35:14.421875Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn16_example\folder\lalala.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn16/main/folder/lalala.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn16/main</root>
+<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:12.171875Z</text-updated>
+<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:35:13.906250Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/svn_data/svn17_example.zip b/setuptools/tests/svn_data/svn17_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ba0e8823fe5849788881274d87ba878a6e52d43c
GIT binary patch
literal 46954
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
PJB@s^JCA(!rcM6?#2I%_

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn17_ext_list.txt b/setuptools/tests/svn_data/svn17_ext_list.txt
new file mode 100644
index 0000000000..a8b832a885
--- /dev/null
+++ b/setuptools/tests/svn_data/svn17_ext_list.txt
@@ -0,0 +1,4 @@
+"third party3" file:///C:/development/svn_example/repos/svn17/extra1 
+'third party3b' file:///C:/development/svn_example/repos/svn17/extra1 
+-r3 file:///C:/development/svn_example/repos/svn17/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn17/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn17_ext_list.xml b/setuptools/tests/svn_data/svn17_ext_list.xml
new file mode 100644
index 0000000000..2879bb6548
--- /dev/null
+++ b/setuptools/tests/svn_data/svn17_ext_list.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<properties>
+<target
+   path="C:/development/svn_example/svn17_example">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
+-r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
+</property>
+</target>
+<target
+   path="C:/development/svn_example/svn17_example/folder">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn17/extra2 
+-r3 file:///C:/development/svn_example/repos/svn17/extra2 third\ party2
+file:///C:/development/svn_example/repos/svn17/extra2@r1 third_party大介
+</property>
+</target>
+</properties>
diff --git a/setuptools/tests/svn_data/svn17_info.xml b/setuptools/tests/svn_data/svn17_info.xml
new file mode 100644
index 0000000000..6cffeffd2e
--- /dev/null
+++ b/setuptools/tests/svn_data/svn17_info.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<info>
+<entry
+   kind="dir"
+   path="svn17_example"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn17/main</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:36.171875Z</date>
+</commit>
+</entry>
+<entry
+   path="svn17_example\folder"
+   revision="6"
+   kind="dir">
+<url>file:///C:/development/svn_example/repos/svn17/main/folder</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:35:34.859375Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn17_example\folder\quest.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn17/main/folder/quest.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:32.812500Z</text-updated>
+<checksum>bc80eba9e7a10c0a571a4678c520bc9683f3bac2</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:35:33.109375Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn17_example\folder\lalala.txt"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn17/main/folder/lalala.txt</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:32.343750Z</text-updated>
+<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:35:32.687500Z</date>
+</commit>
+</entry>
+<entry
+   path="svn17_example\a file"
+   revision="6"
+   kind="file">
+<url>file:///C:/development/svn_example/repos/svn17/main/a%20file</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:33.187500Z</text-updated>
+<checksum>43785ab4b1816b49f242990883292813cd4f486c</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:35:33.515625Z</date>
+</commit>
+</entry>
+<entry
+   path="svn17_example\to_delete"
+   revision="6"
+   kind="file">
+<url>file:///C:/development/svn_example/repos/svn17/main/to_delete</url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn17/main</root>
+<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
+<schedule>delete</schedule>
+<depth>infinity</depth>
+<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:36.171875Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/svn_data/svn18_example.zip b/setuptools/tests/svn_data/svn18_example.zip
new file mode 100644
index 0000000000000000000000000000000000000000..4362f8e9ea7416ab16ac73f9e49aae8374ccce06
GIT binary patch
literal 47477
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
SiGZIY@ZTw5Rh`5K-TGgxyk=Yg

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/svn18_ext_list.txt b/setuptools/tests/svn_data/svn18_ext_list.txt
new file mode 100644
index 0000000000..c90a5f1137
--- /dev/null
+++ b/setuptools/tests/svn_data/svn18_ext_list.txt
@@ -0,0 +1,4 @@
+"third party3" file:///C:/development/svn_example/repos/svn18/extra1 
+'third party3b' file:///C:/development/svn_example/repos/svn18/extra1 
+-r3 file:///C:/development/svn_example/repos/svn18/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn18/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn18_ext_list.xml b/setuptools/tests/svn_data/svn18_ext_list.xml
new file mode 100644
index 0000000000..9b5e9e96fa
--- /dev/null
+++ b/setuptools/tests/svn_data/svn18_ext_list.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<properties>
+<target
+   path="C:/development/svn_example/svn18_example">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
+-r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
+file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
+</property>
+</target>
+<target
+   path="C:/development/svn_example/svn18_example/folder">
+<property
+   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn18/extra2 
+-r3 file:///C:/development/svn_example/repos/svn18/extra2 third\ party2
+file:///C:/development/svn_example/repos/svn18/extra2@r1 third_party大介
+</property>
+</target>
+</properties>
diff --git a/setuptools/tests/svn_data/svn18_info.xml b/setuptools/tests/svn_data/svn18_info.xml
new file mode 100644
index 0000000000..7ca55995d0
--- /dev/null
+++ b/setuptools/tests/svn_data/svn18_info.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<info>
+<entry
+   path="svn18_example"
+   revision="6"
+   kind="dir">
+<url>file:///C:/development/svn_example/repos/svn18/main</url>
+<relative-url>^/</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:57.796875Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn18_example\a file"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn18/main/a%20file</url>
+<relative-url>^/a%20file</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:54.906250Z</text-updated>
+<checksum>43785ab4b1816b49f242990883292813cd4f486c</checksum>
+</wc-info>
+<commit
+   revision="3">
+<author>ptt</author>
+<date>2013-07-13T15:35:55.265625Z</date>
+</commit>
+</entry>
+<entry
+   kind="file"
+   path="svn18_example\to_delete"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn18/main/to_delete</url>
+<relative-url>^/to_delete</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>delete</schedule>
+<depth>infinity</depth>
+<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
+</wc-info>
+<commit
+   revision="6">
+<author>ptt</author>
+<date>2013-07-13T15:35:57.796875Z</date>
+</commit>
+</entry>
+<entry
+   kind="dir"
+   path="svn18_example\folder"
+   revision="6">
+<url>file:///C:/development/svn_example/repos/svn18/main/folder</url>
+<relative-url>^/folder</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="5">
+<author>ptt</author>
+<date>2013-07-13T15:35:56.750000Z</date>
+</commit>
+</entry>
+<entry
+   path="svn18_example\folder\quest.txt"
+   revision="6"
+   kind="file">
+<url>file:///C:/development/svn_example/repos/svn18/main/folder/quest.txt</url>
+<relative-url>^/folder/quest.txt</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:54.484375Z</text-updated>
+<checksum>bc80eba9e7a10c0a571a4678c520bc9683f3bac2</checksum>
+</wc-info>
+<commit
+   revision="2">
+<author>ptt</author>
+<date>2013-07-13T15:35:54.843750Z</date>
+</commit>
+</entry>
+<entry
+   path="svn18_example\folder\lalala.txt"
+   revision="6"
+   kind="file">
+<url>file:///C:/development/svn_example/repos/svn18/main/folder/lalala.txt</url>
+<relative-url>^/folder/lalala.txt</relative-url>
+<repository>
+<root>file:///C:/development/svn_example/repos/svn18/main</root>
+<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
+</repository>
+<wc-info>
+<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+<text-updated>2013-07-13T15:35:54.015625Z</text-updated>
+<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
+</wc-info>
+<commit
+   revision="1">
+<author>ptt</author>
+<date>2013-07-13T15:35:54.375000Z</date>
+</commit>
+</entry>
+</info>
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index f26a1f5191..95667b696a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,10 +1,12 @@
 import os
+import sys
 import tempfile
 import shutil
 import unittest
 
 import pkg_resources
 from setuptools.command import egg_info
+from setuptools import svn_utils
 
 ENTRIES_V10 = pkg_resources.resource_string(__name__, 'entries-v10')
 "An entries file generated with svn 1.6.17 against the legacy Setuptools repo"
@@ -31,6 +33,17 @@ def _write_entries(self, entries):
     def test_version_10_format(self):
         """
         """
+        #keeping this set for 1.6 is a good check on the get_svn_revision
+        #to ensure I return using svnversion what would had been returned
+        version_str = svn_utils.SvnInfo.get_svn_version()
+        version = [int(x) for x in version_str.split('.')[:2]]
+        if version != [1,6]:
+            if hasattr(self, 'skipTest'):
+                self.skipTest('')
+            else:
+                sys.stderr.write('\n   Skipping due to SVN Version\n')
+                return
+
         self._write_entries(ENTRIES_V10)
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '89000')
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 438f7cedbd..8d6aff1969 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -8,12 +8,14 @@
 import tempfile
 import unittest
 import unicodedata
+from setuptools.tests import environment
 
 from setuptools.compat import StringIO, unicode
-from setuptools.command.sdist import sdist
+from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
-
+from setuptools import svn_utils
+from setuptools.svn_utils import fsencode
 
 SETUP_ATTRS = {
     'name': 'sdist_test',
@@ -395,6 +397,64 @@ def test_sdist_with_latin1_encoded_filename(self):
             self.assertTrue(filename in cmd.filelist.files)
 
 
+class TestSvn(environment.ZippedEnvironment):
+
+    def setUp(self):
+        version = svn_utils.SvnInfo.get_svn_version()
+        self.base_version = tuple([int(x) for x in version.split('.')][:2])
+
+        if not self.base_version:
+            raise ValueError('No SVN tools installed')
+        elif self.base_version < (1,3):
+            raise ValueError('Insufficient SVN Version %s' % version)
+        elif self.base_version >= (1,9):
+            #trying the latest version
+            self.base_version = (1,8)
+
+        self.dataname = "svn%i%i_example" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvn, self).setUp()
+
+    def test_walksvn(self):
+        if self.base_version >= (1,6):
+            folder2 = 'third party2'
+            folder3 = 'third party3'
+        else:
+            folder2 = 'third_party2'
+            folder3 = 'third_party3'
+
+        #TODO is this right
+        expected = set([
+            os.path.join('a file'),
+            os.path.join(folder2, 'Changes.txt'),
+            os.path.join(folder2, 'MD5SUMS'),
+            os.path.join(folder2, 'README.txt'),
+            os.path.join(folder3, 'Changes.txt'),
+            os.path.join(folder3, 'MD5SUMS'),
+            os.path.join(folder3, 'README.txt'),
+            os.path.join(folder3, 'TODO.txt'),
+            os.path.join(folder3, 'fin'),
+            os.path.join('third_party', 'README.txt'),
+            os.path.join('folder', folder2, 'Changes.txt'),
+            os.path.join('folder', folder2, 'MD5SUMS'),
+            os.path.join('folder', folder2, 'WatashiNiYomimasu.txt'),
+            os.path.join( 'folder', folder3, 'Changes.txt'),
+            os.path.join('folder', folder3, 'fin'),
+            os.path.join('folder', folder3, 'MD5SUMS'),
+            os.path.join('folder', folder3, 'oops'),
+            os.path.join('folder', folder3, 'WatashiNiYomimasu.txt'),
+            os.path.join('folder', folder3, 'ZuMachen.txt'),
+            os.path.join('folder', 'third_party', 'WatashiNiYomimasu.txt'),
+            os.path.join('folder', 'lalala.txt'),
+            os.path.join('folder', 'quest.txt'),
+            #The example will have a deleted file (or should) but shouldn't return it
+            ])
+        expected = set(fsencode(x) for x in expected)
+        self.assertEqual(set(x for x in walk_revctrl()), expected)
+
+
+
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
 
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 6036f85c80..4a6e7effab 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -3,77 +3,20 @@
 
 
 import os
-import zipfile
 import sys
-import tempfile
 import unittest
-import shutil
-import stat
+import codecs
+from setuptools.tests import environment
+from setuptools.svn_utils import fsencode
+from setuptools.compat import unicode, unichr
 
 from setuptools import svn_utils
-from setuptools.command import egg_info
-from setuptools.command import sdist
 
 #requires python >= 2.4
 from subprocess import call as _call
 
-def _extract(self, member, path=None, pwd=None):
-    """for zipfile py2.5 borrowed from cpython"""
-    if not isinstance(member, zipfile.ZipInfo):
-        member = self.getinfo(member)
+from distutils import log
 
-    if path is None:
-        path = os.getcwd()
-
-    return _extract_member(self, member, path, pwd)
-
-def _extract_from_zip(self, name, dest_path):
-    dest_file = open(dest_path, 'wb')
-    try:
-        dest_file.write(self.read(name))
-    finally:
-        dest_file.close()
-
-def _extract_member(self, member, targetpath, pwd):
-    """for zipfile py2.5 borrowed from cpython"""
-    # build the destination pathname, replacing
-    # forward slashes to platform specific separators.
-    # Strip trailing path separator, unless it represents the root.
-    if (targetpath[-1:] in (os.path.sep, os.path.altsep)
-        and len(os.path.splitdrive(targetpath)[1]) > 1):
-        targetpath = targetpath[:-1]
-
-    # don't include leading "/" from file name if present
-    if member.filename[0] == '/':
-        targetpath = os.path.join(targetpath, member.filename[1:])
-    else:
-        targetpath = os.path.join(targetpath, member.filename)
-
-    targetpath = os.path.normpath(targetpath)
-
-    # Create all upper directories if necessary.
-    upperdirs = os.path.dirname(targetpath)
-    if upperdirs and not os.path.exists(upperdirs):
-        os.makedirs(upperdirs)
-
-    if member.filename[-1] == '/':
-        if not os.path.isdir(targetpath):
-            os.mkdir(targetpath)
-        return targetpath
-
-    _extract_from_zip(self, member.filename, targetpath)
-
-    return targetpath
-
-
-def _remove_dir(target):
-
-    #on windows this seems to a problem
-    for dir_path, dirs, files in os.walk(target):
-        os.chmod(dir_path, stat.S_IWRITE)
-        for filename in files:
-            os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
-    shutil.rmtree(target)
 
 
 class TestSvnVersion(unittest.TestCase):
@@ -90,81 +33,207 @@ def test_no_svn_found(self):
         old_path = os.environ[path_variable]
         os.environ[path_variable] = ''
         try:
-            version = svn_utils.get_svn_tool_version()
+            version = svn_utils.SvnInfo.get_svn_version()
             self.assertEqual(version, '')
         finally:
             os.environ[path_variable] = old_path
 
     def test_svn_should_exist(self):
-        version = svn_utils.get_svn_tool_version()
+        version = svn_utils.SvnInfo.get_svn_version()
         self.assertNotEqual(version, '')
 
+def _read_utf8_file(path):
+    fileobj = None
+    try:
+        fileobj = codecs.open(path, 'r', 'utf-8')
+        data = fileobj.read()
+        return data
+    finally:
+        if fileobj:
+            fileobj.close()
 
-class TestSvn_1_7(unittest.TestCase):
 
-    def setUp(self):
-        version = svn_utils.get_svn_tool_version()
-        ver_list = [int(x) for x in version.split('.')]
-        if ver_list < [1,7,0]:
-            self.version_err = 'Insufficent Subversion (%s)' % version
+class ParserInfoXML(unittest.TestCase):
+
+    def parse_tester(self, svn_name, ext_spaces):
+        path = os.path.join('setuptools', 'tests',
+                            'svn_data', svn_name + '_info.xml')
+        #Remember these are pre-generated to test XML parsing
+        #  so these paths might not valid on your system
+        example_base = "%s_example" % svn_name
+
+        data = _read_utf8_file(path)
+
+        if ext_spaces:
+            folder2 = 'third party2'
+            folder3 = 'third party3'
         else:
-            self.version_err = None
+            folder2 = 'third_party2'
+            folder3 = 'third_party3'
 
+        expected = set([
+            ("\\".join((example_base, 'a file')), 'file'),
+            ("\\".join((example_base, 'folder')), 'dir'),
+            ("\\".join((example_base, 'folder', 'lalala.txt')), 'file'),
+            ("\\".join((example_base, 'folder', 'quest.txt')), 'file'),
+            ])
+        self.assertEqual(set(x for x in svn_utils.parse_dir_entries(data)),
+                         expected)
 
-        self.temp_dir = tempfile.mkdtemp()
-        zip_file, source, target = [None, None, None]
-        try:
-            zip_file = zipfile.ZipFile(os.path.join('setuptools', 'tests',
-                                                    'svn17_example.zip'))
-            for files in zip_file.namelist():
-                _extract(zip_file, files, self.temp_dir)
-        finally:
-            if zip_file:
-                zip_file.close()
-            del zip_file
+    def test_svn13(self):
+        self.parse_tester('svn13', False)
 
-        self.old_cwd = os.getcwd()
-        os.chdir(os.path.join(self.temp_dir, 'svn17_example'))
+    def test_svn14(self):
+        self.parse_tester('svn14', False)
 
-    def tearDown(self):
-        try:
-            os.chdir(self.old_cwd)
-            _remove_dir(self.temp_dir)
-        except OSError:
-            #sigh?
-            pass
-
-    def _chk_skip(self):
-        if self.version_err is not None:
-            if hasattr(self, 'skipTest'):
-                self.skipTest(self.version_err)
-            else:
-                sys.stderr.write(self.version_error + "\n")
-                return True
-        return False
-
-    def test_egg_info(self):
-        if self._chk_skip:
-            return
-
-        rev = egg_info.egg_info.get_svn_revision()
-        self.assertEqual(rev, '4')
-
-    def test_iterator(self):
-        if self._chk_skip:
-            return
+    def test_svn15(self):
+        self.parse_tester('svn15', False)
+
+    def test_svn16(self):
+        self.parse_tester('svn16', True)
+
+    def test_svn17(self):
+        self.parse_tester('svn17', True)
+
+    def test_svn18(self):
+        self.parse_tester('svn18', True)
+
+class ParserExternalXML(unittest.TestCase):
+
+    def parse_tester(self, svn_name, ext_spaces):
+        path = os.path.join('setuptools', 'tests',
+                            'svn_data', svn_name + '_ext_list.xml')
+        example_base = svn_name + '_example'
+        data = _read_utf8_file(path)
+
+        if ext_spaces:
+            folder2 = 'third party2'
+            folder3 = 'third party3'
+        else:
+            folder2 = 'third_party2'
+            folder3 = 'third_party3'
 
         expected = set([
-            os.path.join('.', 'readme.txt'),
-            os.path.join('.', 'other'),
-            os.path.join('.', 'third_party'),
-            os.path.join('.', 'third_party2'),
-            os.path.join('.', 'third_party3'),
+            "\\".join((example_base, folder2)),
+            "\\".join((example_base, folder3)),
+                                     #third_party大介
+            "\\".join((example_base,
+                       unicode('third_party') +
+                       unichr(0x5927) + unichr(0x4ecb))),
+            "\\".join((example_base, 'folder', folder2)),
+            "\\".join((example_base, 'folder', folder3)),
+            "\\".join((example_base, 'folder',
+                       unicode('third_party') +
+                       unichr(0x5927) + unichr(0x4ecb))),
             ])
-        self.assertEqual(set(x for x
-                               in sdist.entries_externals_finder('.', '')),
+
+        dir_base = r'c:\development\svn_example'
+        self.assertEqual(set(x for x \
+            in svn_utils.parse_externals_xml(data, dir_base)), expected)
+
+    def test_svn15(self):
+        self.parse_tester('svn15', False)
+
+    def test_svn16(self):
+        self.parse_tester('svn16', True)
+
+    def test_svn17(self):
+        self.parse_tester('svn17', True)
+
+    def test_svn18(self):
+        self.parse_tester('svn18', True)
+
+
+class ParseExternal(unittest.TestCase):
+
+    def parse_tester(self, svn_name, ext_spaces):
+        path = os.path.join('setuptools', 'tests',
+                            'svn_data', svn_name + '_ext_list.txt')
+        example_base = svn_name + '_example'
+        data = _read_utf8_file(path)
+
+        if ext_spaces:
+            expected = set(['third party2', 'third party3',
+                            'third party3b', 'third_party'])
+        else:
+            expected = set(['third_party2', 'third_party3', 'third_party'])
+
+        self.assertEqual(set(x for x in svn_utils.parse_external_prop(data)),
                          expected)
 
+    def test_svn13(self):
+        self.parse_tester('svn13', False)
+
+    def test_svn14(self):
+        self.parse_tester('svn14', False)
+
+    def test_svn15(self):
+        self.parse_tester('svn15', False)
+
+    def test_svn16(self):
+        self.parse_tester('svn16', True)
+
+    def test_svn17(self):
+        self.parse_tester('svn17', True)
+
+    def test_svn18(self):
+        self.parse_tester('svn18', True)
+
+
+class TestSvn(environment.ZippedEnvironment):
+
+    def setUp(self):
+        version = svn_utils.SvnInfo.get_svn_version()
+        self.base_version = tuple([int(x) for x in version.split('.')[:2]])
+
+        if not self.base_version:
+            raise ValueError('No SVN tools installed')
+        elif self.base_version < (1,3):
+            raise ValueError('Insufficient SVN Version %s' % version)
+        elif self.base_version >= (1,9):
+            #trying the latest version
+            self.base_version = (1,8)
+
+        self.dataname = "svn%i%i_example" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvn, self).setUp()
+
+    def test_revision(self):
+        rev = svn_utils.SvnInfo.load('.').get_revision()
+        self.assertEqual(rev, 6)
+
+    def test_entries(self):
+        expected = set([
+            (os.path.join('a file'), 'file'),
+            (os.path.join('folder'), 'dir'),
+            (os.path.join('folder', 'lalala.txt'), 'file'),
+            (os.path.join('folder', 'quest.txt'), 'file'),
+            #The example will have a deleted file (or should)
+            #but shouldn't return it
+            ])
+        info = svn_utils.SvnInfo.load('.')
+        self.assertEqual(set(x for x in info.entries), expected)
+
+    def test_externals(self):
+        if self.base_version >= (1,6):
+            folder2 = 'third party2'
+            folder3 = 'third party3'
+        else:
+            folder2 = 'third_party2'
+            folder3 = 'third_party3'
+
+        expected = set([
+            os.path.join(folder2),
+            os.path.join(folder3),
+            os.path.join('third_party'),
+            os.path.join('folder', folder2),
+            os.path.join('folder', folder3),
+            os.path.join('folder', 'third_party'),
+            ])
+        info = svn_utils.SvnInfo.load('.')
+        self.assertEqual(set([x for x in info.externals]), expected)
+
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
 

From 37c48a4da11b40a5a8a3c801525b637bb2934df1 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 20 Jul 2013 18:06:14 -0500
Subject: [PATCH 1387/8469] using git for travis-ci.org

--HG--
extra : rebase_source : 88756de63c01ff057d8e6deebb0682c68feebd7f
---
 .hgignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgignore b/.hgignore
index 56be0c948c..13367726df 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,3 +13,5 @@ include
 \.Python
 *.swp
 CHANGES (links).txt
+.git2
+.gitignore

From 469a541cb5fca1a161fdc888679c1868870c5c8e Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 20 Jul 2013 19:15:23 -0500
Subject: [PATCH 1388/8469] Tweaks to get everything to pass again.

--HG--
extra : rebase_source : 352b6baf81e891d13f7310bbeb94d2cfce9dbad8
---
 setuptools/svn_utils.py      |  4 ++++
 setuptools/tests/test_svn.py | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 09aa5e25c8..17b211d7c1 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -121,6 +121,7 @@ def parse_dir_entries(decoded_str):
 def parse_externals_xml(decoded_str, prefix=''):
     '''Parse a propget svn:externals xml'''
     prefix = os.path.normpath(prefix)
+    prefix = os.path.normcase(prefix)
 
     doc = xml.dom.pulldom.parseString(_get_xml_data(decoded_str))
     externals = list()
@@ -129,6 +130,9 @@ def parse_externals_xml(decoded_str, prefix=''):
         if event == 'START_ELEMENT' and node.nodeName == 'target':
             doc.expandNode(node)
             path = os.path.normpath(node.getAttribute('path'))
+            log.warn('')
+            log.warn('PRE: %s' % prefix)
+            log.warn('PTH: %s' % path)
             if os.path.normcase(path).startswith(prefix):
                 path = path[len(prefix)+1:]
 
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 4a6e7effab..59ecb25b1a 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -114,20 +114,21 @@ def parse_tester(self, svn_name, ext_spaces):
             folder3 = 'third_party3'
 
         expected = set([
-            "\\".join((example_base, folder2)),
-            "\\".join((example_base, folder3)),
+            os.sep.join((example_base, folder2)),
+            os.sep.join((example_base, folder3)),
                                      #third_party大介
-            "\\".join((example_base,
+            os.sep.join((example_base,
                        unicode('third_party') +
                        unichr(0x5927) + unichr(0x4ecb))),
-            "\\".join((example_base, 'folder', folder2)),
-            "\\".join((example_base, 'folder', folder3)),
-            "\\".join((example_base, 'folder',
+            os.sep.join((example_base, 'folder', folder2)),
+            os.sep.join((example_base, 'folder', folder3)),
+            os.sep.join((example_base, 'folder',
                        unicode('third_party') +
                        unichr(0x5927) + unichr(0x4ecb))),
             ])
 
-        dir_base = r'c:\development\svn_example'
+        expected = set(os.path.normpath(x) for x in expected)
+        dir_base = os.sep.join(('C:', 'development', 'svn_example'))
         self.assertEqual(set(x for x \
             in svn_utils.parse_externals_xml(data, dir_base)), expected)
 

From 8c645eb0c310e8ff4efe73849279ea391d25bced Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 20 Jul 2013 19:53:07 -0500
Subject: [PATCH 1389/8469] Removed extra stuff in egg_info

--HG--
extra : rebase_source : 4b3cf921154e759744963b34aaf42018477deb29
---
 setuptools/command/egg_info.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 3170064815..a0ba530590 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,8 +16,6 @@
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
 from setuptools.command.sdist import walk_revctrl
 
-#requires python >= 2.4
-from subprocess import Popen as _Popen, PIPE as _PIPE
 
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"

From 937a7dee0b5de773f164d7e3b143113c270733eb Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 22 Jul 2013 17:32:14 +0000
Subject: [PATCH 1390/8469] package_index.py : fix hash_name

---
 setuptools/package_index.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 47f00c0012..b1b38f03ec 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -222,7 +222,8 @@ class HashChecker(ContentChecker):
     )
 
     def __init__(self, hash_name, expected):
-        self.hash = hashlib.new(hash_name)
+        self.hash_name = hash_name
+        self.hash = hashlib.new(hash_name)        
         self.expected = expected
 
     @classmethod
@@ -242,23 +243,8 @@ def feed(self, block):
     def is_valid(self):
         return self.hash.hexdigest() == self.expected
 
-    def _get_hash_name(self):
-        """
-        Python 2.4 implementation of MD5 doesn't supply a .name attribute
-        so provide that name.
-
-        When Python 2.4 is no longer required, replace invocations of this
-        method with simply 'self.hash.name'.
-        """
-        try:
-            return self.hash.name
-        except AttributeError:
-            if 'md5' in str(type(self.hash)):
-                return 'md5'
-            raise
-
     def report(self, reporter, template):
-        msg = template % self._get_hash_name()
+        msg = template % self.hash_name
         return reporter(msg)
 
 

From 99c854fe2766858883ef6a248462627ba137ca14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 22:19:08 +0200
Subject: [PATCH 1391/8469] Add pypy to Travis platforms

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 83efa5a439..b684935f92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,6 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - pypy
 # command to run tests
 script: python setup.py test

From 9caf92acf6972f283f368aa42ed186aafb28502b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 22:34:04 +0200
Subject: [PATCH 1392/8469] Update test to reflect the copy of the hash name
 stored because pypy doesn't implement the undocumented .name attribute on
 HASH objects.

---
 setuptools/tests/test_packageindex.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 3791914ac6..7f5dc585d3 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -169,11 +169,7 @@ def test_blank_md5(self):
     def test_get_hash_name_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
-        if sys.version_info >= (2,5):
-            self.assertEqual(checker.hash.name, 'md5')
-        else:
-            # Python 2.4 compatability
-            self.assertEqual(checker._get_hash_name(), 'md5')
+        self.assertEqual(checker.hash_name, 'md5')
 
     def test_report(self):
         checker = setuptools.package_index.HashChecker.from_url(

From 3762e907f5a0a081c79eaa571051f38c711308af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 22:54:58 +0200
Subject: [PATCH 1393/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6e993ada5c..301b718132 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.9.7
+-----
+
+* Issue #49: Correct AttributeError on PyPy where a hashlib.HASH object does
+  not have a `.name` attribute.
+
 -----
 0.9.6
 -----

From c7a99e2ccc7dedfd5beb04698abf05b216ab7460 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 22:56:01 +0200
Subject: [PATCH 1394/8469] Added tag 0.9.7 for changeset 19965a03c1d5

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bb4ffc144b..8f492918f0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -87,3 +87,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4
 88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5
 acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
+19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7

From 429e83e9c0fb2b0cf4ba038dc4340367bef4e735 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 22:57:09 +0200
Subject: [PATCH 1395/8469] Bumped to 0.9.8 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 56 ++++++++++++++--------------
 setuptools/__init__.py               |  2 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 55434eb71e..8f11fa2f16 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.7"
+DEFAULT_VERSION = "0.9.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index d64b3c288e..55aa158eb7 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,11 +1,8 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
 [distutils.setup_keywords]
+exclude_package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
 use_2to3 = setuptools.dist:assert_bool
 namespace_packages = setuptools.dist:check_nsp
 package_data = setuptools.dist:check_package_data
@@ -13,50 +10,53 @@ use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 dependency_links = setuptools.dist:assert_string_list
 use_2to3_fixers = setuptools.dist:assert_string_list
 test_suite = setuptools.dist:check_test_suite
-exclude_package_data = setuptools.dist:check_package_data
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+convert_2to3_doctests = setuptools.dist:assert_string_list
 include_package_data = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
+extras_require = setuptools.dist:check_extras
 entry_points = setuptools.dist:check_entry_points
 zip_safe = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-requires.txt = setuptools.command.egg_info:write_requirements
 
 [distutils.commands]
-test = setuptools.command.test:test
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
 develop = setuptools.command.develop:develop
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
 setopt = setuptools.command.setopt:setopt
 egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
-upload_docs = setuptools.command.upload_docs:upload_docs
-easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
 install = setuptools.command.install:install
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
-rotate = setuptools.command.rotate:rotate
+upload_docs = setuptools.command.upload_docs:upload_docs
 saveopts = setuptools.command.saveopts:saveopts
+alias = setuptools.command.alias:alias
 install_scripts = setuptools.command.install_scripts:install_scripts
 build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+easy_install = setuptools.command.easy_install:easy_install
+rotate = setuptools.command.rotate:rotate
+install_lib = setuptools.command.install_lib:install_lib
 register = setuptools.command.register:register
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 18dd363d12..8c708bd628 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.7'
+__version__ = '0.9.8'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 8fa3b1dce8af41e3fd9acbb1b2db0dd38bcfb09b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Jul 2013 23:03:43 +0200
Subject: [PATCH 1396/8469] Update changelog to reflect other minor changes
 included in the latest release

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 301b718132..41d5949a8b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,9 @@ CHANGES
 
 * Issue #49: Correct AttributeError on PyPy where a hashlib.HASH object does
   not have a `.name` attribute.
+* Issue #34: Documentation now refers to bootstrap script in code repository
+  referenced by bookmark.
+* Add underscore-separated keys to environment markers (markerlib).
 
 -----
 0.9.6

From a09c0b0efd3b71306b9293837850aec1887f6b98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 22:31:56 +0200
Subject: [PATCH 1397/8469] Remove unused imports

---
 setuptools/package_index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b1b38f03ec..88f0480919 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,6 +1,5 @@
 """PyPI and direct package downloading"""
-import sys, os.path, re, shutil, random, socket
-import itertools
+import sys, os.path, re, shutil, socket
 import base64
 from setuptools import ssl_support
 from pkg_resources import *
@@ -223,7 +222,7 @@ class HashChecker(ContentChecker):
 
     def __init__(self, hash_name, expected):
         self.hash_name = hash_name
-        self.hash = hashlib.new(hash_name)        
+        self.hash = hashlib.new(hash_name)
         self.expected = expected
 
     @classmethod

From 9505e8bf8b0ca5cf33befc3f8818cb519c74cc0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 22:33:16 +0200
Subject: [PATCH 1398/8469] Clean up imports in package_index

---
 setuptools/package_index.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 88f0480919..76421c3b81 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,6 +1,11 @@
 """PyPI and direct package downloading"""
-import sys, os.path, re, shutil, socket
+import sys
+import os
+import re
+import shutil
+import socket
 import base64
+
 from setuptools import ssl_support
 from pkg_resources import *
 from distutils import log

From a58abed83f51c263547294fbfb57e5a44a32e5a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 22:38:26 +0200
Subject: [PATCH 1399/8469] Re-indent several function signatures to reduce
 linter warnings

---
 setuptools/package_index.py | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 76421c3b81..4c2e10f9f7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -109,9 +109,10 @@ def distros_for_filename(filename, metadata=None):
     )
 
 
-def interpret_distro_name(location, basename, metadata,
-    py_version=None, precedence=SOURCE_DIST, platform=None
-):
+def interpret_distro_name(
+        location, basename, metadata, py_version=None, precedence=SOURCE_DIST,
+        platform=None
+        ):
     """Generate alternative interpretations of a source distro name
 
     Note: if `location` is a filesystem filename, you should call
@@ -255,9 +256,10 @@ def report(self, reporter, template):
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
-    def __init__(self, index_url="https://pypi.python.org/simple", hosts=('*',),
-        ca_bundle=None, verify_ssl=True, *args, **kw
-    ):
+    def __init__(
+            self, index_url="https://pypi.python.org/simple", hosts=('*',),
+            ca_bundle=None, verify_ssl=True, *args, **kw
+            ):
         Environment.__init__(self,*args,**kw)
         self.index_url = index_url + "/"[:not index_url.endswith('/')]
         self.scanned_urls = {}
@@ -378,7 +380,7 @@ def scan(link):
         # process an index page into the package-page index
         for match in HREF.finditer(page):
             try:
-                scan( urljoin(url, htmldecode(match.group(1))) )
+                scan(urljoin(url, htmldecode(match.group(1))))
             except ValueError:
                 pass
 
@@ -530,10 +532,10 @@ def download(self, spec, tmpdir):
         return getattr(self.fetch_distribution(spec, tmpdir),'location',None)
 
 
-    def fetch_distribution(self,
-        requirement, tmpdir, force_scan=False, source=False, develop_ok=False,
-        local_index=None
-    ):
+    def fetch_distribution(
+            self, requirement, tmpdir, force_scan=False, source=False,
+            develop_ok=False, local_index=None
+            ):
         """Obtain a distribution suitable for fulfilling `requirement`
 
         `requirement` must be a ``pkg_resources.Requirement`` instance.
@@ -616,7 +618,8 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
 
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
-        dists = match and [d for d in
+        dists = match and [
+            d for d in
             interpret_distro_name(filename, match.group(1), None) if d.version
         ] or []
 
@@ -722,9 +725,11 @@ def open_url(self, url, warning=None):
             if warning:
                 self.warn(warning, v.line)
             else:
-                raise DistutilsError('%s returned a bad status line. '
-                                     'The server might be down, %s' % \
-                                             (url, v.line))
+                raise DistutilsError(
+                    '%s returned a bad status line. The server might be '
+                    'down, %s' %
+                    (url, v.line)
+                )
         except httplib.HTTPException:
             v = sys.exc_info()[1]
             if warning:

From 7b42936dc2dacbf91504c495b6cae569a1d88c95 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 22:40:18 +0200
Subject: [PATCH 1400/8469] Normalize whitespace in package_index.py

---
 setuptools/package_index.py | 79 +------------------------------------
 1 file changed, 2 insertions(+), 77 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4c2e10f9f7..9abd967950 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -403,8 +403,6 @@ def scan(link):
         else:
             return ""   # no sense double-scanning non-package pages
 
-
-
     def need_version_info(self, url):
         self.scan_all(
             "Page at %s links to .py file(s) without version info; an index "
@@ -435,17 +433,14 @@ def find_packages(self, requirement):
             self.scan_url(url)
 
     def obtain(self, requirement, installer=None):
-        self.prescan(); self.find_packages(requirement)
+        self.prescan()
+        self.find_packages(requirement)
         for dist in self[requirement.key]:
             if dist in requirement:
                 return dist
             self.debug("%s does not match %s", requirement, dist)
         return super(PackageIndex, self).obtain(requirement,installer)
 
-
-
-
-
     def check_hash(self, checker, filename, tfp):
         """
         checker is a ContentChecker
@@ -531,7 +526,6 @@ def download(self, spec, tmpdir):
                     )
         return getattr(self.fetch_distribution(spec, tmpdir),'location',None)
 
-
     def fetch_distribution(
             self, requirement, tmpdir, force_scan=False, source=False,
             develop_ok=False, local_index=None
@@ -573,8 +567,6 @@ def find(req, env=None):
                 if dist in req and (dist.precedence<=SOURCE_DIST or not source):
                     return dist
 
-
-
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
@@ -601,7 +593,6 @@ def find(req, env=None):
             self.info("Best match: %s", dist)
             return dist.clone(location=self.download(dist.location, tmpdir))
 
-
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`
 
@@ -615,7 +606,6 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
             return dist.location
         return None
 
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [
@@ -770,7 +760,6 @@ def _download_url(self, scheme, url, tmpdir):
     def scan_url(self, url):
         self.process_url(url, True)
 
-
     def _attempt_download(self, url, filename):
         headers = self._download_to(url, filename)
         if 'html' in headers.get('content-type','').lower():
@@ -793,21 +782,6 @@ def _download_html(self, url, headers, filename):
         os.unlink(filename)
         raise DistutilsError("Unexpected HTML page found at "+url)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
         creds = ''
@@ -886,18 +860,6 @@ def info(self, msg, *args):
     def warn(self, msg, *args):
         log.warn(msg, *args)
 
-
-
-
-
-
-
-
-
-
-
-
-
 # This pattern matches a character entity reference (a decimal numeric
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
@@ -922,20 +884,6 @@ def htmldecode(text):
     """Decode HTML entities in the given text."""
     return entity_sub(decode_entity, text)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def socket_timeout(timeout=15):
     def _socket_timeout(func):
         def _socket_timeout(*args, **kwargs):
@@ -1004,15 +952,6 @@ def open_with_auth(url, opener=urllib2.urlopen):
 open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
 
 
-
-
-
-
-
-
-
-
-
 def fix_sf_url(url):
     return url      # backward compatibility
 
@@ -1042,17 +981,3 @@ def local_open(url):
 
     return HTTPError(url, status, message,
             {'content-type':'text/html'}, StringIO(body))
-
-
-
-
-
-
-
-
-
-
-
-
-
-# this line is a kludge to keep the trailing blank lines for pje's editor

From 9a3cc1cd285136180c9b59c821a01f755ddf8874 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 22:47:05 +0200
Subject: [PATCH 1401/8469] Replace import * with explicit imports, allowing
 linter to detect the missing imports reported in #53.

---
 setuptools/package_index.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9abd967950..f2ef50d8ba 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -6,8 +6,12 @@
 import socket
 import base64
 
+from pkg_resources import (
+    CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
+    require, Environment, find_distributions, safe_name, safe_version,
+    to_filename, Requirement, DEVELOP_DIST,
+)
 from setuptools import ssl_support
-from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
 from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,

From fd77197ba1cc95ddfd2744ff8e9953bbf9f11def Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 23:00:24 +0200
Subject: [PATCH 1402/8469] Add 'urlsplit' and 'urlunsplit' to compat module

---
 setuptools/compat.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index e2f64de236..3a961c0e3e 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -29,7 +29,7 @@
     from urllib import url2pathname
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
-    from urlparse import urlparse, urlunparse, urljoin
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
     xrange = xrange
     filterfalse = itertools.ifilterfalse
 
@@ -72,7 +72,10 @@ def exec_(code, globs=None, locs=None):
     from urllib.error import HTTPError, URLError
     import urllib.request as urllib2
     from urllib.request import urlopen, url2pathname
-    from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
+    from urllib.parse import (
+        urlparse, urlunparse, unquote, splituser, urljoin, urlsplit,
+        urlunsplit,
+    )
     xrange = range
     filterfalse = itertools.filterfalse
 

From d2f68c57b5fbca47a9389c6cf3399f956a6c2aa6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 23:01:43 +0200
Subject: [PATCH 1403/8469] Import urlsplit and urlunsplit from compat module.
 Fixes #53.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f2ef50d8ba..26b6583c75 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,7 +17,7 @@
 from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
                                urlparse, urlunparse, unquote, splituser,
                                url2pathname, name2codepoint,
-                               unichr, urljoin)
+                               unichr, urljoin, urlsplit, urlunsplit)
 from setuptools.compat import filterfalse
 from fnmatch import translate
 from setuptools.py24compat import hashlib

From 3d5510a01906bebf369cde304706ce5f52117afe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 23:03:19 +0200
Subject: [PATCH 1404/8469] Make PackageIndex._vcs_split_rev_from_url a static
 method (as it doesn't have any instance or class references).

---
 setuptools/package_index.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 26b6583c75..9c9d76a186 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -806,7 +806,8 @@ def _download_svn(self, url, filename):
         os.system("svn checkout%s -q %s %s" % (creds, url, filename))
         return filename
 
-    def _vcs_split_rev_from_url(self, url, pop_prefix=False):
+    @staticmethod
+    def _vcs_split_rev_from_url(url, pop_prefix=False):
         scheme, netloc, path, query, frag = urlsplit(url)
 
         scheme = scheme.split('+', 1)[-1]

From 7d0d8a87e47b174e006760cc5d938c862766af60 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jul 2013 23:10:05 +0200
Subject: [PATCH 1405/8469] Add test to exercise the basic functionality of
 _vcs_split_rev_from_url

---
 setuptools/tests/test_packageindex.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 7f5dc585d3..08969b7e8c 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -142,6 +142,15 @@ def test_parse_bdist_wininst(self):
         self.assertEqual(setuptools.package_index.parse_bdist_wininst(
             'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64'))
 
+    def test__vcs_split_rev_from_url(self):
+        """
+        Test the basic usage of _vcs_split_rev_from_url
+        """
+        vsrfu = setuptools.package_index.PackageIndex._vcs_split_rev_from_url
+        url, rev = vsrfu('https://example.com/bar@2995')
+        self.assertEqual(url, 'https://example.com/bar')
+        self.assertEqual(rev, '2995')
+
 class TestContentCheckers(unittest.TestCase):
 
     def test_md5(self):

From 5b54c7a2e277685dd7d2c88ddf36ce0c0106b343 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Jul 2013 10:26:18 +0200
Subject: [PATCH 1406/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 41d5949a8b..34bdf6510f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.9.8
+-----
+
+* Issue #53: Fix NameErrors in `_vcs_split_rev_from_url`.
+
 -----
 0.9.7
 -----

From 9dcc92c2c65b80ce6f7a101af327af109f77324f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Jul 2013 10:28:04 +0200
Subject: [PATCH 1407/8469] Added tag 0.9.8 for changeset e0a6e225ad6b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8f492918f0..21e59929e2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -88,3 +88,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5
 acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
 19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7
+e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8

From 2f182743da1da836ec7b0cf56fa5e3453cd27ca8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Jul 2013 10:28:27 +0200
Subject: [PATCH 1408/8469] Bumped to 0.9.9 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 88 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/__init__.py               |  2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 8f11fa2f16..4eb79510d0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.8"
+DEFAULT_VERSION = "0.9.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 55aa158eb7..4b9fe8a60f 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-tests_require = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
-zip_safe = setuptools.dist:assert_bool
-
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+test_loader = setuptools.dist:check_importable
+namespace_packages = setuptools.dist:check_nsp
+convert_2to3_doctests = setuptools.dist:assert_string_list
 
 [distutils.commands]
-develop = setuptools.command.develop:develop
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-setopt = setuptools.command.setopt:setopt
 egg_info = setuptools.command.egg_info:egg_info
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-install = setuptools.command.install:install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-saveopts = setuptools.command.saveopts:saveopts
 alias = setuptools.command.alias:alias
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_py = setuptools.command.build_py:build_py
 sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
 easy_install = setuptools.command.easy_install:easy_install
-rotate = setuptools.command.rotate:rotate
-install_lib = setuptools.command.install_lib:install_lib
 register = setuptools.command.register:register
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+build_ext = setuptools.command.build_ext:build_ext
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..668f4ee242 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
+[certs]
+certifi==0.0.8
 
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
-[certs]
-certifi==0.0.8
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
 
 [ssl:sys_platform=='win32']
 wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8c708bd628..6dc64e5ed9 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 import os
 import sys
 
-__version__ = '0.9.8'
+__version__ = '0.9.9'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'

From 43f8c9aaff8c71c1c1e841827509c405c20ce909 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Jul 2013 10:34:33 +0200
Subject: [PATCH 1409/8469] For docs, load the setuptools version from the
 setup script, where it's authoritative, rather than from the library, which
 might not be ./setuptools

---
 docs/conf.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index fbdb8b51e6..661ac48602 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,8 +14,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
-import setuptools
+import setup
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -49,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = setuptools.__version__
+version = setup.setup_params['version']
 # The full version, including alpha/beta/rc tags.
-release = setuptools.__version__
+release = setup.setup_params['version']
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 3a53d2576dc84c77e7d2b9a8099f97cea3047215 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Jul 2013 09:52:26 +0200
Subject: [PATCH 1410/8469] Update release script to always push the bootstrap
 bookmark.

---
 release.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release.py b/release.py
index bad7e0eea7..da8ee85931 100644
--- a/release.py
+++ b/release.py
@@ -7,6 +7,9 @@
 import os
 import subprocess
 
+import pkg_resources
+
+pkg_resources.require('jaraco.packaging>=1.1')
 
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
@@ -20,6 +23,9 @@ def before_upload():
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
+# override the push command to include the bootstrap bookmark.
+push_command = ['hg', 'push', '-B', 'bootstrap']
+
 link_patterns = [
     r"(Issue )?#(?P<issue>\d+)",
     r"Distribute #(?P<distribute>\d+)",

From 1ead1921de7de5c980b5a75a668fcf4b4e6567bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 5 Aug 2013 00:21:36 +0200
Subject: [PATCH 1411/8469] Unlink destination file before writing scripts.

---
 setuptools/command/easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3194644e84..dd1e3b2524 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -799,6 +799,8 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
         mask = current_umask()
         if not self.dry_run:
             ensure_directory(target)
+            if os.path.exists(target):
+                os.unlink(target)
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()

From 2311414e0a72615785c4dcc9a1a2590b44430ab5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 07:08:48 +0200
Subject: [PATCH 1412/8469] Hint to wheel that the code is universal

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 176cc47e09..0a0079e055 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,3 +16,6 @@ upload-dir = docs/build/html
 
 [sdist]
 formats=gztar
+
+[wheel]
+universal=1

From 2acd7e9e1223672687a5c628407fc8528f64246a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 17:14:16 +0200
Subject: [PATCH 1413/8469] Move version into its own file so that setuptools
 machinery isn't necessary to elicit the version.

--HG--
extra : rebase_source : 1611131e6765a30fd0fe94d8455418ccd3ae46ae
---
 release.py             | 2 +-
 setuptools/__init__.py | 2 +-
 setuptools/version.py  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/version.py

diff --git a/release.py b/release.py
index da8ee85931..c2b331c712 100644
--- a/release.py
+++ b/release.py
@@ -16,7 +16,7 @@ def before_upload():
     _add_bootstrap_bookmark()
 
 files_with_versions = (
-    'ez_setup.py', 'setuptools/__init__.py',
+    'ez_setup.py', 'setuptools/version.py',
 )
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6dc64e5ed9..45b95f90b1 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,8 +7,8 @@
 from distutils.util import convert_path
 import os
 import sys
+from setuptools.version import __version__
 
-__version__ = '0.9.9'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/setuptools/version.py b/setuptools/version.py
new file mode 100644
index 0000000000..1b1a934d4b
--- /dev/null
+++ b/setuptools/version.py
@@ -0,0 +1 @@
+__version__ = '0.9.9'

From 047f8663da4dfe9ef6c2aa4e804d1621fde4563f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 17:16:04 +0200
Subject: [PATCH 1414/8469] Use version from version module in setup script

--HG--
extra : rebase_source : b262af35810ec8ef1eacec3dd91806f53a9a6ea2
---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 629f2fff24..d08d714420 100755
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,10 @@
 SETUP_COMMANDS = command_ns['__all__']
 
 main_ns = {}
-init_path = convert_path('setuptools/__init__.py')
-init_file = open(init_path)
-exec(init_file.read(), main_ns)
-init_file.close()
+ver_path = convert_path('setuptools/version.py')
+ver_file = open(ver_path)
+exec(ver_file.read(), main_ns)
+ver_file.close()
 
 import setuptools
 from setuptools.command.build_py import build_py as _build_py

From 3e53e141e0a0f03738b3943d0b0d77b1bf49883e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 17:20:10 +0200
Subject: [PATCH 1415/8469] Sphinx allows a callable named 'setup' to be
 provided in the config. If present, it attempts to call it. Therefore, use
 another name when importing the setup module. The docs may now be built using
 'setup.py build_sphinx'.

--HG--
extra : rebase_source : a5f5e0d9d624f976b7a12e44adf3cc94d4f6ac44
---
 docs/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 661ac48602..9929aaf692 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import setup
+import setup as setup_script
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = setup.setup_params['version']
+version = setup_script.setup_params['version']
 # The full version, including alpha/beta/rc tags.
-release = setup.setup_params['version']
+release = setup_script.setup_params['version']
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From d16ffd375e9c8211c4520cab688d5c2a44e5b66b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 17:37:49 +0200
Subject: [PATCH 1416/8469] Created a new section of the documentation
 pertaining to development.

--HG--
extra : rebase_source : 4d756b98daa068d888074b53f5708c1245fa70ba
---
 docs/development.txt | 35 +++++++++++++++++++++++++++++++++++
 docs/formats.txt     | 20 --------------------
 docs/index.txt       |  1 +
 docs/releases.txt    |  4 ++++
 4 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 docs/development.txt
 create mode 100644 docs/releases.txt

diff --git a/docs/development.txt b/docs/development.txt
new file mode 100644
index 0000000000..ba927c7360
--- /dev/null
+++ b/docs/development.txt
@@ -0,0 +1,35 @@
+-------------------------
+Development on Setuptools
+-------------------------
+
+Setuptools is maintained by the Python community under the Python Packaging
+Authority (PyPA) and led by Jason R. Coombs.
+
+This document describes the process by which Setuptools is developed.
+This document assumes the reader has some passing familiarity with
+*using* setuptools, the ``pkg_resources`` module, and EasyInstall.  It
+does not attempt to explain basic concepts like inter-project
+dependencies, nor does it contain detailed lexical syntax for most
+file formats.  Neither does it explain concepts like "namespace
+packages" or "resources" in any detail, as all of these subjects are
+covered at length in the setuptools developer's guide and the
+``pkg_resources`` reference manual.
+
+Instead, this is **internal** documentation for how those concepts and
+features are *implemented* in concrete terms.  It is intended for people
+who are working on the setuptools code base, who want to be able to
+troubleshoot setuptools problems, want to write code that reads the file
+formats involved, or want to otherwise tinker with setuptools-generated
+files and directories.
+
+Note, however, that these are all internal implementation details and
+are therefore subject to change; stick to the published API if you don't
+want to be responsible for keeping your code from breaking when
+setuptools changes.  You have been warned.
+
+.. toctree::
+   :maxdepth: 1
+
+   formats
+   releases
+
diff --git a/docs/formats.txt b/docs/formats.txt
index dbfc28129f..ef28353e6a 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -4,26 +4,6 @@ The Internal Structure of Python Eggs
 
 STOP! This is not the first document you should read!
 
-This document assumes you have at least some passing familiarity with
-*using* setuptools, the ``pkg_resources`` module, and EasyInstall.  It
-does not attempt to explain basic concepts like inter-project
-dependencies, nor does it contain detailed lexical syntax for most
-file formats.  Neither does it explain concepts like "namespace
-packages" or "resources" in any detail, as all of these subjects are
-covered at length in the setuptools developer's guide and the
-``pkg_resources`` reference manual.
-
-Instead, this is **internal** documentation for how those concepts and
-features are *implemented* in concrete terms.  It is intended for people
-who are working on the setuptools code base, who want to be able to
-troubleshoot setuptools problems, want to write code that reads the file
-formats involved, or want to otherwise tinker with setuptools-generated
-files and directories.
-
-Note, however, that these are all internal implementation details and
-are therefore subject to change; stick to the published API if you don't
-want to be responsible for keeping your code from breaking when
-setuptools changes.  You have been warned.
 
 
 .. contents:: **Table of Contents**
diff --git a/docs/index.txt b/docs/index.txt
index 162a5f6f7c..8c68651def 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -23,3 +23,4 @@ Documentation content:
    setuptools
    easy_install
    pkg_resources
+   development
diff --git a/docs/releases.txt b/docs/releases.txt
new file mode 100644
index 0000000000..8119e8cf66
--- /dev/null
+++ b/docs/releases.txt
@@ -0,0 +1,4 @@
+==========================
+Setuptools Release Process
+==========================
+

From e324a315edb8512f59a424a7aa2038d270870a41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 21:13:58 +0200
Subject: [PATCH 1417/8469] Fleshed out a few details on the release process.

--HG--
extra : rebase_source : 6d4ed995049ac55ae4d4526960865bac2fa3d251
---
 docs/releases.txt | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/releases.txt b/docs/releases.txt
index 8119e8cf66..5d1419be7c 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -1,4 +1,18 @@
-==========================
-Setuptools Release Process
-==========================
+===============
+Release Process
+===============
 
+In order to allow for rapid, predictable releases, Setuptools uses a
+mechanical technique for releases. The release script, ``release.py`` in the
+repository, defines the details of the releases, and is executed by the
+`jaraco.packaging <https://bitbucket.org/jaraco/jaraco.packaging>`_ release
+module. The script does some checks (some interactive) and fully automates
+the release process.
+
+A Setuptools release manager must have maintainer access on PyPI to the
+project and administrative access to the BitBucket project.
+
+Release Managers
+----------------
+
+Currently, the project has one release manager, Jason R. Coombs.

From e550b63a52654c4c22127d373ad4e02ce1ce149d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 22:43:21 +0200
Subject: [PATCH 1418/8469] Syntax update for easy_install command

--HG--
extra : rebase_source : d7fa5f788d2151d0aecf0bc7730ad73c5379320f
---
 setuptools/command/easy_install.py | 229 +++++++++++------------------
 1 file changed, 85 insertions(+), 144 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index dd1e3b2524..febfdcd10c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1,5 +1,6 @@
 #!python
-"""\
+
+"""
 Easy Install
 ------------
 
@@ -10,6 +11,7 @@
 __ https://pythonhosted.org/setuptools/easy_install.html
 
 """
+
 import sys
 import os
 import zipimport
@@ -21,10 +23,11 @@
 import random
 import platform
 from glob import glob
+from distutils import log, dir_util
+
 import pkg_resources
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
-from distutils import log, dir_util
 try:
     # Python 2.7 or >=3.2
     from sysconfig import get_config_vars, get_path
@@ -51,12 +54,12 @@ def _get_purelib():
 from setuptools.command import bdist_egg, egg_info
 from setuptools.compat import (iteritems, maxsize, xrange, basestring, unicode,
                                reraise)
-from pkg_resources import yield_lines, normalize_path, resource_string, \
-        ensure_directory, get_distribution, find_distributions, \
-        Environment, Requirement, Distribution, \
-        PathMetadata, EggMetadata, WorkingSet, \
-         DistributionNotFound, VersionConflict, \
-        DEVELOP_DIST
+from pkg_resources import (
+    yield_lines, normalize_path, resource_string, ensure_directory,
+    get_distribution, find_distributions, Environment, Requirement,
+    Distribution, PathMetadata, EggMetadata, WorkingSet, DistributionNotFound,
+    VersionConflict, DEVELOP_DIST,
+)
 
 if '__VENV_LAUNCHER__' in os.environ:
     sys_executable = os.environ['__VENV_LAUNCHER__']
@@ -75,7 +78,7 @@ def _get_purelib():
 def is_64bit():
     return struct.calcsize("P") == 8
 
-def samefile(p1,p2):
+def samefile(p1, p2):
     if hasattr(os.path,'samefile') and (
         os.path.exists(p1) and os.path.exists(p2)
     ):
@@ -126,19 +129,20 @@ class easy_install(Command):
         ("build-directory=", "b",
             "download/extract/build in DIR; keep the results"),
         ('optimize=', 'O',
-         "also compile with optimization: -O1 for \"python -O\", "
-         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
+            "also compile with optimization: -O1 for \"python -O\", "
+            "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
         ('record=', None,
-         "filename in which to record list of installed files"),
+            "filename in which to record list of installed files"),
         ('always-unzip', 'Z', "don't install as a zipfile, no matter what"),
         ('site-dirs=','S',"list of directories where .pth files work"),
         ('editable', 'e', "Install specified packages in editable form"),
         ('no-deps', 'N', "don't install dependencies"),
         ('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
-        ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"),
+        ('local-snapshots-ok', 'l',
+            "allow building eggs from local checkouts"),
         ('version', None, "print version information and exit"),
         ('no-find-links', None,
-         "Don't load find-links defined in packages being installed")
+            "Don't load find-links defined in packages being installed")
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
@@ -147,11 +151,10 @@ class easy_install(Command):
     ]
 
     if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "install in user site-package '%s'" % site.USER_SITE))
+        help_msg = "install in user site-package '%s'" % site.USER_SITE
+        user_options.append(('user', None, help_msg))
         boolean_options.append('user')
 
-
     negative_opt = {'always-unzip': 'zip-ok'}
     create_index = PackageIndex
 
@@ -226,19 +229,20 @@ def finalize_options(self):
         py_version = sys.version.split()[0]
         prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
 
-        self.config_vars = {'dist_name': self.distribution.get_name(),
-                            'dist_version': self.distribution.get_version(),
-                            'dist_fullname': self.distribution.get_fullname(),
-                            'py_version': py_version,
-                            'py_version_short': py_version[0:3],
-                            'py_version_nodot': py_version[0] + py_version[2],
-                            'sys_prefix': prefix,
-                            'prefix': prefix,
-                            'sys_exec_prefix': exec_prefix,
-                            'exec_prefix': exec_prefix,
-                            # Only python 3.2+ has abiflags
-                            'abiflags': getattr(sys, 'abiflags', ''),
-                           }
+        self.config_vars = {
+            'dist_name': self.distribution.get_name(),
+            'dist_version': self.distribution.get_version(),
+            'dist_fullname': self.distribution.get_fullname(),
+            'py_version': py_version,
+            'py_version_short': py_version[0:3],
+            'py_version_nodot': py_version[0] + py_version[2],
+            'sys_prefix': prefix,
+            'prefix': prefix,
+            'sys_exec_prefix': exec_prefix,
+            'exec_prefix': exec_prefix,
+            # Only python 3.2+ has abiflags
+            'abiflags': getattr(sys, 'abiflags', ''),
+        }
 
         if HAS_USER_SITE:
             self.config_vars['userbase'] = self.install_userbase
@@ -351,7 +355,6 @@ def finalize_options(self):
 
         self.outputs = []
 
-
     def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
@@ -456,7 +459,7 @@ def check_site_dir(self):
         self.install_dir = instdir
 
     def cant_write_to_target(self):
-        msg = """can't create or remove files in install directory
+        template = """can't create or remove files in install directory
 
 The following error occurred while trying to add or remove files in the
 installation directory:
@@ -467,7 +470,8 @@ def cant_write_to_target(self):
 the distutils default setting) was:
 
     %s
-"""     % (sys.exc_info()[1], self.install_dir,)
+"""
+        msg = template % (sys.exc_info()[1], self.install_dir,)
 
         if not os.path.exists(self.install_dir):
             msg += """
@@ -493,9 +497,6 @@ def cant_write_to_target(self):
 """
         raise DistutilsError(msg)
 
-
-
-
     def check_pth_processing(self):
         """Empirically verify whether .pth files are supported in inst. dir"""
         instdir = self.install_dir
@@ -580,11 +581,6 @@ def check_editable(self,spec):
                 (spec.key, self.build_directory)
             )
 
-
-
-
-
-
     def easy_install(self, spec, deps=False):
         tmpdir = tempfile.mkdtemp(prefix="easy_install-")
         download = None
@@ -662,8 +658,6 @@ def install_item(self, spec, download, tmpdir, deps, install_needed=False):
                 if dist in spec:
                     return dist
 
-
-
     def select_scheme(self, name):
         """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
@@ -673,9 +667,6 @@ def select_scheme(self, name):
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
 
-
-
-
     def process_distribution(self, requirement, dist, deps=True, *info):
         self.update_pth(dist)
         self.package_index.add(dist)
@@ -684,7 +675,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
         if (dist.has_metadata('dependency_links.txt') and
-            not self.no_find_links):
+                not self.no_find_links):
             self.package_index.add_find_links(
                 dist.get_metadata_lines('dependency_links.txt')
             )
@@ -735,10 +726,8 @@ def should_unzip(self, dist):
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)
         if os.path.exists(dst):
-            log.warn(
-               "%r already exists in %s; build directory %s will not be kept",
-               spec.key, self.build_directory, setup_base
-            )
+            msg = "%r already exists in %s; build directory %s will not be kept"
+            log.warn(msg, spec.key, self.build_directory, setup_base)
             return setup_base
         if os.path.isdir(dist_filename):
             setup_base = dist_filename
@@ -751,7 +740,8 @@ def maybe_move(self, spec, dist_filename, setup_base):
                 if os.path.isdir(dist_filename):
                     # if the only thing there is a directory, move it instead
                     setup_base = dist_filename
-        ensure_directory(dst); shutil.move(setup_base, dst)
+        ensure_directory(dst)
+        shutil.move(setup_base, dst)
         return dst
 
     def install_wrapper_scripts(self, dist):
@@ -759,8 +749,6 @@ def install_wrapper_scripts(self, dist):
             for args in get_script_args(dist):
                 self.write_script(*args)
 
-
-
     def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""
         spec = str(dist.as_requirement())
@@ -806,9 +794,6 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             f.close()
             chmod(target, 0x1FF-mask) # 0777
 
-
-
-
     def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them
         if dist_filename.lower().endswith('.egg'):
@@ -824,8 +809,7 @@ def install_eggs(self, spec, dist_filename, tmpdir):
             setup_base = os.path.abspath(dist_filename)
 
         if (setup_base.startswith(tmpdir)   # something we downloaded
-            and self.build_directory and spec is not None
-        ):
+                and self.build_directory and spec is not None):
             setup_base = self.maybe_move(spec, dist_filename, setup_base)
 
         # Find the setup.py file
@@ -899,14 +883,15 @@ def install_exe(self, dist_filename, tmpdir):
                 "%s is not a valid distutils Windows .exe" % dist_filename
             )
         # Create a dummy distribution object until we build the real distro
-        dist = Distribution(None,
+        dist = Distribution(
+            None,
             project_name=cfg.get('metadata','name'),
-            version=cfg.get('metadata','version'), platform=get_platform()
+            version=cfg.get('metadata','version'), platform=get_platform(),
         )
 
         # Convert the .exe to an unpacked egg
         egg_path = dist.location = os.path.join(tmpdir, dist.egg_name()+'.egg')
-        egg_tmp  = egg_path+'.tmp'
+        egg_tmp = egg_path + '.tmp'
         egg_info = os.path.join(egg_tmp, 'EGG-INFO')
         pkg_inf = os.path.join(egg_info, 'PKG-INFO')
         ensure_directory(pkg_inf)   # make sure EGG-INFO dir exists
@@ -967,7 +952,8 @@ def process(src,dst):
                 resource = parts[-1]
                 parts[-1] = bdist_egg.strip_module(parts[-1])+'.py'
                 pyfile = os.path.join(egg_tmp, *parts)
-                to_compile.append(pyfile); stubs.append(pyfile)
+                to_compile.append(pyfile)
+                stubs.append(pyfile)
                 bdist_egg.write_stub(resource, pyfile)
         self.byte_compile(to_compile)   # compile .py's
         bdist_egg.write_safety_flag(os.path.join(egg_tmp,'EGG-INFO'),
@@ -1166,8 +1152,7 @@ def _set_fetcher_options(self, base):
         cfg_filename = os.path.join(base, 'setup.cfg')
         setopt.edit_config(cfg_filename, settings)
 
-
-    def update_pth(self,dist):
+    def update_pth(self, dist):
         if self.pth_file is None:
             return
 
@@ -1209,9 +1194,10 @@ def unpack_progress(self, src, dst):
         return dst     # only unpack-and-compile skips files for dry run
 
     def unpack_and_compile(self, egg_path, destination):
-        to_compile = []; to_chmod = []
+        to_compile = []
+        to_chmod = []
 
-        def pf(src,dst):
+        def pf(src, dst):
             if dst.endswith('.py') and not src.startswith('EGG-INFO/'):
                 to_compile.append(dst)
             elif dst.endswith('.dll') or dst.endswith('.so'):
@@ -1245,16 +1231,8 @@ def byte_compile(self, to_compile):
         finally:
             log.set_verbosity(self.verbose)     # restore original verbosity
 
-
-
-
-
-
-
-
-
     def no_default_version_msg(self):
-        return """bad install directory or PYTHONPATH
+        template = """bad install directory or PYTHONPATH
 
 You are attempting to install a package to a directory that is not
 on PYTHONPATH and which Python does not read ".pth" files from.  The
@@ -1281,18 +1259,8 @@ def no_default_version_msg(self):
 
   https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
 
-Please make the appropriate changes for your system and try again.""" % (
-        self.install_dir, os.environ.get('PYTHONPATH','')
-    )
-
-
-
-
-
-
-
-
-
+Please make the appropriate changes for your system and try again."""
+        return template % self.install_dir, os.environ.get('PYTHONPATH','')
 
     def install_site_py(self):
         """Make sure there's a site.py in the target dir, if needed"""
@@ -1330,9 +1298,6 @@ def install_site_py(self):
 
         self.sitepy_installed = True
 
-
-
-
     def create_home_path(self):
         """Create directories under ~."""
         if not self.user:
@@ -1343,22 +1308,16 @@ def create_home_path(self):
                 self.debug_print("os.makedirs('%s', 0700)" % path)
                 os.makedirs(path, 0x1C0)    # 0700
 
-
-
-
-
-
-
     INSTALL_SCHEMES = dict(
         posix = dict(
             install_dir = '$base/lib/python$py_version_short/site-packages',
-            script_dir  = '$base/bin',
+            script_dir = '$base/bin',
         ),
     )
 
     DEFAULT_SCHEME = dict(
         install_dir = '$base/Lib/site-packages',
-        script_dir  = '$base/Scripts',
+        script_dir = '$base/Scripts',
     )
 
     def _expand(self, *attrs):
@@ -1382,14 +1341,6 @@ def _expand(self, *attrs):
                     val = os.path.expanduser(val)
                 setattr(self, attr, val)
 
-
-
-
-
-
-
-
-
 def get_site_dirs():
     # return a list of 'site' dirs
     sitedirs = [_f for _f in os.environ.get('PYTHONPATH',
@@ -1524,12 +1475,6 @@ def extract_wininst_cfg(dist_filename):
         f.close()
 
 
-
-
-
-
-
-
 def get_exe_prefixes(exe_filename):
     """Get exe->egg path translations for a given .exe file"""
 
@@ -1563,7 +1508,8 @@ def get_exe_prefixes(exe_filename):
     finally:
         z.close()
     prefixes = [(x.lower(),y) for x, y in prefixes]
-    prefixes.sort(); prefixes.reverse()
+    prefixes.sort()
+    prefixes.reverse()
     return prefixes
 
 
@@ -1584,7 +1530,8 @@ def __init__(self, filename, sitedirs=()):
         self.filename = filename
         self.sitedirs = list(map(normalize_path, sitedirs))
         self.basedir = normalize_path(os.path.dirname(self.filename))
-        self._load(); Environment.__init__(self, [], None, None)
+        self._load()
+        Environment.__init__(self, [], None, None)
         for path in yield_lines(self.paths):
             list(map(self.add, find_distributions(path, True)))
 
@@ -1639,7 +1586,8 @@ def save(self):
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
             f = open(self.filename,'wt')
-            f.write(data); f.close()
+            f.write(data)
+            f.close()
 
         elif os.path.exists(self.filename):
             log.debug("Deleting empty %s", self.filename)
@@ -1647,22 +1595,22 @@ def save(self):
 
         self.dirty = False
 
-    def add(self,dist):
+    def add(self, dist):
         """Add `dist` to the distribution map"""
         if (dist.location not in self.paths and (
                 dist.location not in self.sitedirs or
-                dist.location == os.getcwd() #account for '.' being in PYTHONPATH
+                dist.location == os.getcwd() # account for '.' being in PYTHONPATH
                 )):
             self.paths.append(dist.location)
             self.dirty = True
-        Environment.add(self,dist)
+        Environment.add(self, dist)
 
-    def remove(self,dist):
+    def remove(self, dist):
         """Remove `dist` from the distribution map"""
         while dist.location in self.paths:
-            self.paths.remove(dist.location); self.dirty = True
-        Environment.remove(self,dist)
-
+            self.paths.remove(dist.location)
+            self.dirty = True
+        Environment.remove(self, dist)
 
     def make_relative(self,path):
         npath, last = os.path.split(normalize_path(path))
@@ -1784,14 +1732,6 @@ def nt_quote_arg(arg):
 
     return ''.join(result)
 
-
-
-
-
-
-
-
-
 def is_python_script(script_text, filename):
     """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc.
     """
@@ -1830,10 +1770,11 @@ def fix_jython_executable(executable, options):
         # shebang line interpreter)
         if options:
             # Can't apply the workaround, leave it broken
-            log.warn("WARNING: Unable to adapt shebang line for Jython,"
-                             " the following script is NOT executable\n"
-                     "         see http://bugs.jython.org/issue1112 for"
-                             " more information.")
+            log.warn(
+                "WARNING: Unable to adapt shebang line for Jython,"
+                " the following script is NOT executable\n"
+                "         see http://bugs.jython.org/issue1112 for"
+                " more information.")
         else:
             return '/usr/bin/env %s' % executable
     return executable
@@ -1957,8 +1898,11 @@ def current_umask():
 
 def bootstrap():
     # This function is called when setuptools*.egg is run using /bin/sh
-    import setuptools; argv0 = os.path.dirname(setuptools.__path__[0])
-    sys.argv[0] = argv0; sys.argv.append(argv0); main()
+    import setuptools
+    argv0 = os.path.dirname(setuptools.__path__[0])
+    sys.argv[0] = argv0
+    sys.argv.append(argv0)
+    main()
 
 def main(argv=None, **kw):
     from setuptools import setup
@@ -1970,9 +1914,10 @@ def main(argv=None, **kw):
    or: %(script)s --help
 """
 
-    def gen_usage (script_name):
-        script = os.path.basename(script_name)
-        return USAGE % vars()
+    def gen_usage(script_name):
+        return USAGE % dict(
+            script=os.path.basename(script_name),
+        )
 
     def with_ei_usage(f):
         old_gen_usage = distutils.core.gen_usage
@@ -1998,7 +1943,3 @@ def _show_help(self,*args,**kw):
             distclass=DistributionWithoutHelpCommands, **kw
         )
     )
-
-
-
-

From e15ad8afcac113fb1091a4a8951d8e59adbd5ba9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 22:56:52 +0200
Subject: [PATCH 1419/8469] Beginning extraction of ScriptWriter classes for
 writing console and gui scripts

--HG--
extra : rebase_source : 24c34791314ba58ecb0c7dca7bd7fa02a3a84949
---
 setuptools/command/easy_install.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index febfdcd10c..bac38d7610 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1780,24 +1780,27 @@ def fix_jython_executable(executable, options):
     return executable
 
 
+class ScriptWriter(object):
+    template = (
+        "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
+        "__requires__ = %(spec)r\n"
+        "import sys\n"
+        "from pkg_resources import load_entry_point\n"
+        "\n"
+        "if __name__ == '__main__':"
+        "\n"
+        "    sys.exit(\n"
+        "        load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
+        "    )\n"
+    )
+
 def get_script_args(dist, executable=sys_executable, wininst=False):
     """Yield write_script() argument tuples for a distribution's entrypoints"""
     spec = str(dist.as_requirement())
     header = get_script_header("", executable, wininst)
     for group in 'console_scripts', 'gui_scripts':
         for name, ep in dist.get_entry_map(group).items():
-            script_text = (
-                "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
-                "__requires__ = %(spec)r\n"
-                "import sys\n"
-                "from pkg_resources import load_entry_point\n"
-                "\n"
-                "if __name__ == '__main__':"
-                "\n"
-                "    sys.exit(\n"
-                "        load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
-                "    )\n"
-            ) % locals()
+            script_text = ScriptWriter.template % locals()
             if sys.platform=='win32' or wininst:
                 # On Windows/wininst, add a .py extension and an .exe launcher
                 if group=='gui_scripts':

From 46196e8239a9a8f523774f7d48bdf3b810bd083b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:00:28 +0200
Subject: [PATCH 1420/8469] extract launcher type indication

--HG--
extra : rebase_source : 940b4a8a2c6efe60a2c532e943173ccff0515790
---
 setuptools/command/easy_install.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index bac38d7610..e667d0a339 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1798,12 +1798,13 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
     """Yield write_script() argument tuples for a distribution's entrypoints"""
     spec = str(dist.as_requirement())
     header = get_script_header("", executable, wininst)
-    for group in 'console_scripts', 'gui_scripts':
+    for type_ in 'console', 'gui':
+        group = type_ + '_scripts'
         for name, ep in dist.get_entry_map(group).items():
             script_text = ScriptWriter.template % locals()
             if sys.platform=='win32' or wininst:
                 # On Windows/wininst, add a .py extension and an .exe launcher
-                if group=='gui_scripts':
+                if type_=='gui':
                     launcher_type = 'gui'
                     ext = '-script.pyw'
                     old = ['.pyw']

From c1d0c2734b87687777adf584c2e2a9a457de3307 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:04:36 +0200
Subject: [PATCH 1421/8469] Moved get_script_args into a ScriptWriter class
 method

--HG--
extra : rebase_source : 2acd6e7c81e54fa495f8b0eaf667b77f40c6495a
---
 setuptools/command/easy_install.py | 84 ++++++++++++++++--------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e667d0a339..49bf20c34f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1794,47 +1794,51 @@ class ScriptWriter(object):
         "    )\n"
     )
 
-def get_script_args(dist, executable=sys_executable, wininst=False):
-    """Yield write_script() argument tuples for a distribution's entrypoints"""
-    spec = str(dist.as_requirement())
-    header = get_script_header("", executable, wininst)
-    for type_ in 'console', 'gui':
-        group = type_ + '_scripts'
-        for name, ep in dist.get_entry_map(group).items():
-            script_text = ScriptWriter.template % locals()
-            if sys.platform=='win32' or wininst:
-                # On Windows/wininst, add a .py extension and an .exe launcher
-                if type_=='gui':
-                    launcher_type = 'gui'
-                    ext = '-script.pyw'
-                    old = ['.pyw']
-                    new_header = re.sub('(?i)python.exe','pythonw.exe',header)
-                else:
-                    launcher_type = 'cli'
-                    ext = '-script.py'
-                    old = ['.py','.pyc','.pyo']
-                    new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
-                    hdr = new_header
+    @classmethod
+    def get_script_args(cls, dist, executable=sys_executable, wininst=False):
+        """Yield write_script() argument tuples for a distribution's entrypoints"""
+        spec = str(dist.as_requirement())
+        header = get_script_header("", executable, wininst)
+        for type_ in 'console', 'gui':
+            group = type_ + '_scripts'
+            for name, ep in dist.get_entry_map(group).items():
+                script_text = cls.template % locals()
+                if sys.platform=='win32' or wininst:
+                    # On Windows/wininst, add a .py extension and an .exe launcher
+                    if type_=='gui':
+                        launcher_type = 'gui'
+                        ext = '-script.pyw'
+                        old = ['.pyw']
+                        new_header = re.sub('(?i)python.exe','pythonw.exe',header)
+                    else:
+                        launcher_type = 'cli'
+                        ext = '-script.py'
+                        old = ['.py','.pyc','.pyo']
+                        new_header = re.sub('(?i)pythonw.exe','python.exe',header)
+                    if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
+                        hdr = new_header
+                    else:
+                        hdr = header
+                    yield (name+ext, hdr+script_text, 't', [name+x for x in old])
+                    yield (
+                        name+'.exe', get_win_launcher(launcher_type),
+                        'b' # write in binary mode
+                    )
+                    if not is_64bit():
+                        # install a manifest for the launcher to prevent Windows
+                        #  from detecting it as an installer (which it will for
+                        #  launchers like easy_install.exe). Consider only
+                        #  adding a manifest for launchers detected as installers.
+                        #  See Distribute #143 for details.
+                        m_name = name + '.exe.manifest'
+                        yield (m_name, load_launcher_manifest(name), 't')
                 else:
-                    hdr = header
-                yield (name+ext, hdr+script_text, 't', [name+x for x in old])
-                yield (
-                    name+'.exe', get_win_launcher(launcher_type),
-                    'b' # write in binary mode
-                )
-                if not is_64bit():
-                    # install a manifest for the launcher to prevent Windows
-                    #  from detecting it as an installer (which it will for
-                    #  launchers like easy_install.exe). Consider only
-                    #  adding a manifest for launchers detected as installers.
-                    #  See Distribute #143 for details.
-                    m_name = name + '.exe.manifest'
-                    yield (m_name, load_launcher_manifest(name), 't')
-            else:
-                # On other platforms, we assume the right thing to do is to
-                # just write the stub with no extension.
-                yield (name, header+script_text)
+                    # On other platforms, we assume the right thing to do is to
+                    # just write the stub with no extension.
+                    yield (name, header+script_text)
+
+# for backward-compatibility
+get_script_args = ScriptWriter.get_script_args
 
 def get_win_launcher(type):
     """

From 82d2bd87c1019450433d6be2188381cacdeb4b29 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:10:27 +0200
Subject: [PATCH 1422/8469] Extract protected _get_script_args to capture type
 parameter.

--HG--
extra : rebase_source : d5458d1469b8b411d3937fa52996fdf96e601029
---
 setuptools/command/easy_install.py | 77 ++++++++++++++++--------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 49bf20c34f..b766074482 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1797,45 +1797,50 @@ class ScriptWriter(object):
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         """Yield write_script() argument tuples for a distribution's entrypoints"""
+        for type_ in 'console', 'gui':
+            for res in cls._get_script_args(type_, dist, executable, wininst):
+                yield res
+
+    @classmethod
+    def _get_script_args(cls, type_, dist, executable, wininst):
         spec = str(dist.as_requirement())
         header = get_script_header("", executable, wininst)
-        for type_ in 'console', 'gui':
-            group = type_ + '_scripts'
-            for name, ep in dist.get_entry_map(group).items():
-                script_text = cls.template % locals()
-                if sys.platform=='win32' or wininst:
-                    # On Windows/wininst, add a .py extension and an .exe launcher
-                    if type_=='gui':
-                        launcher_type = 'gui'
-                        ext = '-script.pyw'
-                        old = ['.pyw']
-                        new_header = re.sub('(?i)python.exe','pythonw.exe',header)
-                    else:
-                        launcher_type = 'cli'
-                        ext = '-script.py'
-                        old = ['.py','.pyc','.pyo']
-                        new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                    if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
-                        hdr = new_header
-                    else:
-                        hdr = header
-                    yield (name+ext, hdr+script_text, 't', [name+x for x in old])
-                    yield (
-                        name+'.exe', get_win_launcher(launcher_type),
-                        'b' # write in binary mode
-                    )
-                    if not is_64bit():
-                        # install a manifest for the launcher to prevent Windows
-                        #  from detecting it as an installer (which it will for
-                        #  launchers like easy_install.exe). Consider only
-                        #  adding a manifest for launchers detected as installers.
-                        #  See Distribute #143 for details.
-                        m_name = name + '.exe.manifest'
-                        yield (m_name, load_launcher_manifest(name), 't')
+        group = type_ + '_scripts'
+        for name, ep in dist.get_entry_map(group).items():
+            script_text = cls.template % locals()
+            if sys.platform=='win32' or wininst:
+                # On Windows/wininst, add a .py extension and an .exe launcher
+                if type_=='gui':
+                    launcher_type = 'gui'
+                    ext = '-script.pyw'
+                    old = ['.pyw']
+                    new_header = re.sub('(?i)python.exe','pythonw.exe',header)
+                else:
+                    launcher_type = 'cli'
+                    ext = '-script.py'
+                    old = ['.py','.pyc','.pyo']
+                    new_header = re.sub('(?i)pythonw.exe','python.exe',header)
+                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
+                    hdr = new_header
                 else:
-                    # On other platforms, we assume the right thing to do is to
-                    # just write the stub with no extension.
-                    yield (name, header+script_text)
+                    hdr = header
+                yield (name+ext, hdr+script_text, 't', [name+x for x in old])
+                yield (
+                    name+'.exe', get_win_launcher(launcher_type),
+                    'b' # write in binary mode
+                )
+                if not is_64bit():
+                    # install a manifest for the launcher to prevent Windows
+                    #  from detecting it as an installer (which it will for
+                    #  launchers like easy_install.exe). Consider only
+                    #  adding a manifest for launchers detected as installers.
+                    #  See Distribute #143 for details.
+                    m_name = name + '.exe.manifest'
+                    yield (m_name, load_launcher_manifest(name), 't')
+            else:
+                # On other platforms, we assume the right thing to do is to
+                # just write the stub with no extension.
+                yield (name, header+script_text)
 
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args

From 29e0ce1ef9eaa7854167f281c98c4fe9eb3891ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:30:30 +0200
Subject: [PATCH 1423/8469] Adapted signature on _get_script_args so it
 accurately abstracts windows/other behavior.

--HG--
extra : rebase_source : f57970b6ee6a79e0ef4dc277356e789ff8a341ff
---
 setuptools/command/easy_install.py | 85 ++++++++++++++++--------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b766074482..cbcc7c8524 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1796,51 +1796,54 @@ class ScriptWriter(object):
 
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):
-        """Yield write_script() argument tuples for a distribution's entrypoints"""
+        """
+        Yield write_script() argument tuples for a distribution's entrypoints
+        """
+        spec = str(dist.as_requirement())
+        header = get_script_header("", executable, wininst)
         for type_ in 'console', 'gui':
-            for res in cls._get_script_args(type_, dist, executable, wininst):
-                yield res
+            group = type_ + '_scripts'
+            for name, ep in dist.get_entry_map(group).items():
+                script_text = cls.template % locals()
+                for res in cls._get_script_args(type_, name, header,
+                        script_text, wininst):
+                    yield res
 
     @classmethod
-    def _get_script_args(cls, type_, dist, executable, wininst):
-        spec = str(dist.as_requirement())
-        header = get_script_header("", executable, wininst)
-        group = type_ + '_scripts'
-        for name, ep in dist.get_entry_map(group).items():
-            script_text = cls.template % locals()
-            if sys.platform=='win32' or wininst:
-                # On Windows/wininst, add a .py extension and an .exe launcher
-                if type_=='gui':
-                    launcher_type = 'gui'
-                    ext = '-script.pyw'
-                    old = ['.pyw']
-                    new_header = re.sub('(?i)python.exe','pythonw.exe',header)
-                else:
-                    launcher_type = 'cli'
-                    ext = '-script.py'
-                    old = ['.py','.pyc','.pyo']
-                    new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
-                    hdr = new_header
-                else:
-                    hdr = header
-                yield (name+ext, hdr+script_text, 't', [name+x for x in old])
-                yield (
-                    name+'.exe', get_win_launcher(launcher_type),
-                    'b' # write in binary mode
-                )
-                if not is_64bit():
-                    # install a manifest for the launcher to prevent Windows
-                    #  from detecting it as an installer (which it will for
-                    #  launchers like easy_install.exe). Consider only
-                    #  adding a manifest for launchers detected as installers.
-                    #  See Distribute #143 for details.
-                    m_name = name + '.exe.manifest'
-                    yield (m_name, load_launcher_manifest(name), 't')
+    def _get_script_args(cls, type_, name, dist, executable, wininst):
+        if sys.platform=='win32' or wininst:
+            # On Windows/wininst, add a .py extension and an .exe launcher
+            if type_=='gui':
+                launcher_type = 'gui'
+                ext = '-script.pyw'
+                old = ['.pyw']
+                new_header = re.sub('(?i)python.exe','pythonw.exe',header)
             else:
-                # On other platforms, we assume the right thing to do is to
-                # just write the stub with no extension.
-                yield (name, header+script_text)
+                launcher_type = 'cli'
+                ext = '-script.py'
+                old = ['.py','.pyc','.pyo']
+                new_header = re.sub('(?i)pythonw.exe','python.exe',header)
+            if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
+                hdr = new_header
+            else:
+                hdr = header
+            yield (name+ext, hdr+script_text, 't', [name+x for x in old])
+            yield (
+                name+'.exe', get_win_launcher(launcher_type),
+                'b' # write in binary mode
+            )
+            if not is_64bit():
+                # install a manifest for the launcher to prevent Windows
+                #  from detecting it as an installer (which it will for
+                #  launchers like easy_install.exe). Consider only
+                #  adding a manifest for launchers detected as installers.
+                #  See Distribute #143 for details.
+                m_name = name + '.exe.manifest'
+                yield (m_name, load_launcher_manifest(name), 't')
+        else:
+            # On other platforms, we assume the right thing to do is to
+            # just write the stub with no extension.
+            yield (name, header+script_text)
 
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args

From 1c7102c9ffa7735769b90ab5c7d02357c6dfa41d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:40:20 +0200
Subject: [PATCH 1424/8469] Move specialized Windows behavior to a specialized
 subclass

--HG--
extra : rebase_source : f56a411c3cace611952133b96a48ed92888f75a1
---
 setuptools/command/easy_install.py | 84 +++++++++++++++++-------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index cbcc7c8524..fbf3245cc9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1799,51 +1799,63 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         """
         Yield write_script() argument tuples for a distribution's entrypoints
         """
+        gen_class = cls.get_writer(wininst)
         spec = str(dist.as_requirement())
         header = get_script_header("", executable, wininst)
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
             for name, ep in dist.get_entry_map(group).items():
-                script_text = cls.template % locals()
-                for res in cls._get_script_args(type_, name, header,
-                        script_text, wininst):
+                script_text = gen_class.template % locals()
+                for res in gen_class._get_script_args(type_, name, header,
+                        script_text):
                     yield res
 
     @classmethod
-    def _get_script_args(cls, type_, name, dist, executable, wininst):
-        if sys.platform=='win32' or wininst:
-            # On Windows/wininst, add a .py extension and an .exe launcher
-            if type_=='gui':
-                launcher_type = 'gui'
-                ext = '-script.pyw'
-                old = ['.pyw']
-                new_header = re.sub('(?i)python.exe','pythonw.exe',header)
-            else:
-                launcher_type = 'cli'
-                ext = '-script.py'
-                old = ['.py','.pyc','.pyo']
-                new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-            if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
-                hdr = new_header
-            else:
-                hdr = header
-            yield (name+ext, hdr+script_text, 't', [name+x for x in old])
-            yield (
-                name+'.exe', get_win_launcher(launcher_type),
-                'b' # write in binary mode
-            )
-            if not is_64bit():
-                # install a manifest for the launcher to prevent Windows
-                #  from detecting it as an installer (which it will for
-                #  launchers like easy_install.exe). Consider only
-                #  adding a manifest for launchers detected as installers.
-                #  See Distribute #143 for details.
-                m_name = name + '.exe.manifest'
-                yield (m_name, load_launcher_manifest(name), 't')
+    def get_writer(cls, force_windows):
+        if force_windows or sys.platform=='win32':
+            return WindowsScriptWriter
+        return cls
+
+    @classmethod
+    def _get_script_args(cls, type_, name, header, script_text):
+        # Simply write the stub with no extension.
+        yield (name, header+script_text)
+
+
+class WindowsScriptWriter(ScriptWriter):
+    @classmethod
+    def _get_script_args(cls, type_, name, header, script_text):
+        """
+        For Windows, add a .py extension and an .exe launcher
+        """
+        if type_=='gui':
+            launcher_type = 'gui'
+            ext = '-script.pyw'
+            old = ['.pyw']
+            new_header = re.sub('(?i)python.exe','pythonw.exe',header)
         else:
-            # On other platforms, we assume the right thing to do is to
-            # just write the stub with no extension.
-            yield (name, header+script_text)
+            launcher_type = 'cli'
+            ext = '-script.py'
+            old = ['.py','.pyc','.pyo']
+            new_header = re.sub('(?i)pythonw.exe','python.exe',header)
+        if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
+            hdr = new_header
+        else:
+            hdr = header
+        yield (name+ext, hdr+script_text, 't', [name+x for x in old])
+        yield (
+            name+'.exe', get_win_launcher(launcher_type),
+            'b' # write in binary mode
+        )
+        if not is_64bit():
+            # install a manifest for the launcher to prevent Windows
+            #  from detecting it as an installer (which it will for
+            #  launchers like easy_install.exe). Consider only
+            #  adding a manifest for launchers detected as installers.
+            #  See Distribute #143 for details.
+            m_name = name + '.exe.manifest'
+            yield (m_name, load_launcher_manifest(name), 't')
+
 
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args

From 8d09363e908c030761026e9400283db10213b625 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Aug 2013 23:57:22 +0200
Subject: [PATCH 1425/8469] Name variable for clarity

--HG--
extra : rebase_source : 6787fb9e99b28fa2d9504d18018878ccf193d521
---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fbf3245cc9..5066d6663e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1842,7 +1842,8 @@ def _get_script_args(cls, type_, name, header, script_text):
             hdr = new_header
         else:
             hdr = header
-        yield (name+ext, hdr+script_text, 't', [name+x for x in old])
+        blockers = [name+x for x in old]
+        yield (name+ext, hdr+script_text, 't', blockers)
         yield (
             name+'.exe', get_win_launcher(launcher_type),
             'b' # write in binary mode

From 6c256c7653a517912e603187111cfafc7c82d7dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Aug 2013 00:25:19 +0200
Subject: [PATCH 1426/8469] Extract _adjust_header method

--HG--
extra : rebase_source : 63809401ac0769504a143981e518ef31488ea400
---
 setuptools/command/easy_install.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5066d6663e..b18380242b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1832,16 +1832,11 @@ def _get_script_args(cls, type_, name, header, script_text):
             launcher_type = 'gui'
             ext = '-script.pyw'
             old = ['.pyw']
-            new_header = re.sub('(?i)python.exe','pythonw.exe',header)
         else:
             launcher_type = 'cli'
             ext = '-script.py'
             old = ['.py','.pyc','.pyo']
-            new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-        if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
-            hdr = new_header
-        else:
-            hdr = header
+        hdr = cls._adjust_header(type_, header)
         blockers = [name+x for x in old]
         yield (name+ext, hdr+script_text, 't', blockers)
         yield (
@@ -1857,6 +1852,23 @@ def _get_script_args(cls, type_, name, header, script_text):
             m_name = name + '.exe.manifest'
             yield (m_name, load_launcher_manifest(name), 't')
 
+    @staticmethod
+    def _adjust_header(type_, orig_header):
+        """
+        Make sure 'pythonw' is used for gui and and 'python' is used for
+        console (regardless of what sys.executable is).
+        """
+        pattern = 'pythonw.exe'
+        repl = 'python.exe'
+        if type_ == 'gui':
+            pattern, repl = repl, pattern
+        new_header = re.sub(string=orig_header, pattern=re.escape(pattern),
+            repl=repl, flags=re.IGNORECASE)
+        clean_header = new_header[2:-1].strip('"')
+        if sys.platform == 'win32' and not os.path.exists(clean_header):
+            # the adjusted version doesn't exist, so return the original
+            return orig_header
+        return new_header
 
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args

From a78c722a5cb3756dd0fb83badc66c50fda85c144 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Aug 2013 10:38:01 +0200
Subject: [PATCH 1427/8469] Use a pattern object to invoke the substitution in
 _adjust_header, restoring Python 2.4-2.6 compatibility.

--HG--
extra : rebase_source : 4245d65731ca4433c80cf260906085500ab6c357
---
 setuptools/command/easy_install.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b18380242b..f82125d64f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1862,8 +1862,8 @@ def _adjust_header(type_, orig_header):
         repl = 'python.exe'
         if type_ == 'gui':
             pattern, repl = repl, pattern
-        new_header = re.sub(string=orig_header, pattern=re.escape(pattern),
-            repl=repl, flags=re.IGNORECASE)
+        pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
+        new_header = pattern_ob.sub(string=orig_header, repl=repl)
         clean_header = new_header[2:-1].strip('"')
         if sys.platform == 'win32' and not os.path.exists(clean_header):
             # the adjusted version doesn't exist, so return the original

From e8319c9ece0460cb905e92c31756fd86d6b88cc7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Aug 2013 10:48:46 +0200
Subject: [PATCH 1428/8469] Add docstring

--HG--
extra : rebase_source : 79c95e70593d4e4177c3c1f9625e427d9ce0a16c
---
 setuptools/command/easy_install.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f82125d64f..6c1ea631d9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1781,6 +1781,11 @@ def fix_jython_executable(executable, options):
 
 
 class ScriptWriter(object):
+    """
+    Encapsulates behavior around writing entry point scripts for console and
+    gui apps.
+    """
+
     template = (
         "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
         "__requires__ = %(spec)r\n"

From 89132919af71ebee6af2ab46288321e56c48a780 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Aug 2013 10:52:43 +0200
Subject: [PATCH 1429/8469] Use a single, multiline literal to express the
 template for clarity.

--HG--
extra : rebase_source : df5f817f45451b3a2c4093c12bb7b2b51f8ff3b7
---
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools/command/easy_install.py   |  24 +++---
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 4b9fe8a60f..ba887a084a 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-entry_points.txt = setuptools.command.egg_info:write_entries
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-namespace_packages = setuptools.dist:check_nsp
-convert_2to3_doctests = setuptools.dist:assert_string_list
-
-[distutils.commands]
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[egg_info.writers]
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+entry_points.txt = setuptools.command.egg_info:write_entries
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+test_loader = setuptools.dist:check_importable
+namespace_packages = setuptools.dist:check_nsp
+convert_2to3_doctests = setuptools.dist:assert_string_list
+
+[distutils.commands]
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+egg_info = setuptools.command.egg_info:egg_info
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+easy_install = setuptools.command.easy_install:easy_install
+register = setuptools.command.register:register
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+build_ext = setuptools.command.build_ext:build_ext
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6c1ea631d9..5be48bb1e8 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -22,6 +22,7 @@
 import stat
 import random
 import platform
+import textwrap
 from glob import glob
 from distutils import log, dir_util
 
@@ -1786,18 +1787,17 @@ class ScriptWriter(object):
     gui apps.
     """
 
-    template = (
-        "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
-        "__requires__ = %(spec)r\n"
-        "import sys\n"
-        "from pkg_resources import load_entry_point\n"
-        "\n"
-        "if __name__ == '__main__':"
-        "\n"
-        "    sys.exit(\n"
-        "        load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
-        "    )\n"
-    )
+    template = textwrap.dedent("""
+        # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
+        __requires__ = %(spec)r
+        import sys
+        from pkg_resources import load_entry_point
+
+        if __name__ == '__main__':
+            sys.exit(
+                load_entry_point(%(spec)r, %(group)r, %(name)r)()
+            )
+    """).lstrip()
 
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):

From 81329a6d0753e879e67f279f5f0e7a4ef3346966 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 06:12:27 -0400
Subject: [PATCH 1430/8469] Update link to bug tracker.

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5d80b23096..a9368caa29 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -3226,5 +3226,5 @@ confirmed via the list are actual bugs, and which you have reduced to a minimal
 set of steps to reproduce.
 
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-.. _setuptools bug tracker: http://bugs.python.org/setuptools/
+.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/
 

From c05e0003478a36d698e938121978aafb43223599 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 06:21:36 -0400
Subject: [PATCH 1431/8469] Corrected syntax in setuptools documentation around
 console scripts with extra requirements. Fixes #62.

---
 docs/setuptools.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index a9368caa29..6dfe0b4c8d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -713,10 +713,11 @@ declare it like this, so that the "PDF" requirements are only resolved if the
         name="Project-A",
         ...
         entry_points = {
-            'console_scripts':
-                ['rst2pdf = project_a.tools.pdfgen [PDF]'],
-                ['rst2html = project_a.tools.htmlgen'],
+            'console_scripts': [
+                'rst2pdf = project_a.tools.pdfgen [PDF]',
+                'rst2html = project_a.tools.htmlgen',
                 # more script entry points ...
+            ],
         }
     )
 

From b748722cdd854504dea3209b722ee868302d8541 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 06:54:34 -0400
Subject: [PATCH 1432/8469] Removed references to distribute_setup.py

---
 docs/setuptools.txt | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 6dfe0b4c8d..b46e59398f 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -72,7 +72,7 @@ is available from the `Python SVN sandbox`_, and in-development versions of the
 
 .. contents:: **Table of Contents**
 
-.. _distribute_setup.py: `bootstrap module`_
+.. _ez_setup.py: `bootstrap module`_
 
 
 -----------------
@@ -95,7 +95,7 @@ other than Python's ``site-packages`` directory.
 If you want the current in-development version of setuptools, you should first
 install a stable version, and then run::
 
-    distribute_setup.py setuptools==dev
+    ez_setup.py setuptools==dev
 
 This will download and install the latest development (i.e. unstable) version
 of setuptools from the Python Subversion sandbox.
@@ -529,7 +529,7 @@ Python must be available via the ``PATH`` environment variable, under its
 "long" name.  That is, if the egg is built for Python 2.3, there must be a
 ``python2.3`` executable present in a directory on ``PATH``.
 
-This feature is primarily intended to support distribute_setup the installation of
+This feature is primarily intended to support ez_setup the installation of
 setuptools itself on non-Windows platforms, but may also be useful for other
 projects as well.
 
@@ -1148,20 +1148,20 @@ Using ``setuptools``...  Without bundling it!
 
 Your users might not have ``setuptools`` installed on their machines, or even
 if they do, it might not be the right version.  Fixing this is easy; just
-download `distribute_setup.py`_, and put it in the same directory as your ``setup.py``
+download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
 script.  (Be sure to add it to your revision control system, too.)  Then add
 these two lines to the very top of your setup script, before the script imports
 anything from setuptools:
 
 .. code-block:: python
 
-    import distribute_setup
-    distribute_setup.use_setuptools()
+    import ez_setup
+    ez_setup.use_setuptools()
 
-That's it.  The ``distribute_setup`` module will automatically download a matching
+That's it.  The ``ez_setup`` module will automatically download a matching
 version of ``setuptools`` from PyPI, if it isn't present on the target system.
 Whenever you install an updated version of setuptools, you should also update
-your projects' ``distribute_setup.py`` files, so that a matching version gets installed
+your projects' ``ez_setup.py`` files, so that a matching version gets installed
 on the target machine(s).
 
 By the way, setuptools supports the new PyPI "upload" command, so you can use
@@ -1191,7 +1191,7 @@ relevant to your project and your target audience isn't already familiar with
 setuptools and ``easy_install``.
 
 Network Access
-    If your project is using ``distribute_setup``, you should inform users of the
+    If your project is using ``ez_setup``, you should inform users of the
     need to either have network access, or to preinstall the correct version of
     setuptools using the `EasyInstall installation instructions`_.  Those
     instructions also have tips for dealing with firewalls as well as how to
@@ -1271,27 +1271,27 @@ Creating System Packages
 Managing Multiple Projects
 --------------------------
 
-If you're managing several projects that need to use ``distribute_setup``, and you
+If you're managing several projects that need to use ``ez_setup``, and you
 are using Subversion as your revision control system, you can use the
-"svn:externals" property to share a single copy of ``distribute_setup`` between
+"svn:externals" property to share a single copy of ``ez_setup`` between
 projects, so that it will always be up-to-date whenever you check out or update
 an individual project, without having to manually update each project to use
 a new version.
 
 However, because Subversion only supports using directories as externals, you
-have to turn ``distribute_setup.py`` into ``distribute_setup/__init__.py`` in order
-to do this, then create "externals" definitions that map the ``distribute_setup``
+have to turn ``ez_setup.py`` into ``ez_setup/__init__.py`` in order
+to do this, then create "externals" definitions that map the ``ez_setup``
 directory into each project.  Also, if any of your projects use
 ``find_packages()`` on their setup directory, you will need to exclude the
-resulting ``distribute_setup`` package, to keep it from being included in your
+resulting ``ez_setup`` package, to keep it from being included in your
 distributions, e.g.::
 
     setup(
         ...
-        packages = find_packages(exclude=['distribute_setup']),
+        packages = find_packages(exclude=['ez_setup']),
     )
 
-Of course, the ``distribute_setup`` package will still be included in your
+Of course, the ``ez_setup`` package will still be included in your
 packages' source distributions, as it needs to be.
 
 For your convenience, you may use the following external definition, which will
@@ -2700,8 +2700,8 @@ XXX
 Reusing ``setuptools`` Code
 ===========================
 
-``distribute_setup``
---------------------
+``ez_setup``
+------------
 
 XXX
 

From 244412f118232255578bb99afee7cd22872a9839 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 06:57:36 -0400
Subject: [PATCH 1433/8469] Removed section on Managing Multiple Projects. It
 only works for Subversion, which is substantially replaced by other SCM
 systems.

---
 docs/setuptools.txt | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index b46e59398f..235a85b53a 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1267,45 +1267,6 @@ Creating System Packages
     resolve the issue.
 
 
-
-Managing Multiple Projects
---------------------------
-
-If you're managing several projects that need to use ``ez_setup``, and you
-are using Subversion as your revision control system, you can use the
-"svn:externals" property to share a single copy of ``ez_setup`` between
-projects, so that it will always be up-to-date whenever you check out or update
-an individual project, without having to manually update each project to use
-a new version.
-
-However, because Subversion only supports using directories as externals, you
-have to turn ``ez_setup.py`` into ``ez_setup/__init__.py`` in order
-to do this, then create "externals" definitions that map the ``ez_setup``
-directory into each project.  Also, if any of your projects use
-``find_packages()`` on their setup directory, you will need to exclude the
-resulting ``ez_setup`` package, to keep it from being included in your
-distributions, e.g.::
-
-    setup(
-        ...
-        packages = find_packages(exclude=['ez_setup']),
-    )
-
-Of course, the ``ez_setup`` package will still be included in your
-packages' source distributions, as it needs to be.
-
-For your convenience, you may use the following external definition, which will
-track the latest version of setuptools::
-
-    ez_setup svn://svn.eby-sarna.com/svnroot/ez_setup
-
-You can set this by executing this command in your project directory::
-
-    svn propedit svn:externals .
-
-And then adding the line shown above to the file that comes up for editing.
-
-
 Setting the ``zip_safe`` flag
 -----------------------------
 

From 06123063b78bab12b523f5d6f09125f7282504ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 07:02:53 -0400
Subject: [PATCH 1434/8469] Update transitional note to reflect that the change
 never took place.

---
 docs/setuptools.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 235a85b53a..7bc307e062 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1378,20 +1378,21 @@ other copies will ever be loaded!)
 TRANSITIONAL NOTE
 ~~~~~~~~~~~~~~~~~
 
-Setuptools 0.6a automatically calls ``declare_namespace()`` for you at runtime,
-but the 0.7a versions will *not*.  This is because the automatic declaration
+Setuptools automatically calls ``declare_namespace()`` for you at runtime,
+but future versions may *not*.  This is because the automatic declaration
 feature has some negative side effects, such as needing to import all namespace
 packages during the initialization of the ``pkg_resources`` runtime, and also
 the need for ``pkg_resources`` to be explicitly imported before any namespace
-packages work at all.  Beginning with the 0.7a releases, you'll be responsible
+packages work at all.  In some future releases, you'll be responsible
 for including your own declaration lines, and the automatic declaration feature
 will be dropped to get rid of the negative side effects.
 
-During the remainder of the 0.6 development cycle, therefore, setuptools will
-warn you about missing ``declare_namespace()`` calls in your ``__init__.py``
-files, and you should correct these as soon as possible before setuptools 0.7a1
-is released.  Namespace packages without declaration lines will not work
-correctly once a user has upgraded to setuptools 0.7a1, so it's important that
+During the remainder of the current development cycle, therefore, setuptools
+will warn you about missing ``declare_namespace()`` calls in your
+``__init__.py`` files, and you should correct these as soon as possible
+before the compatibility support is removed.
+Namespace packages without declaration lines will not work
+correctly once a user has upgraded to a later version, so it's important that
 you make this change now in order to avoid having your code break in the field.
 Our apologies for the inconvenience, and thank you for your patience.
 

From c0e1e72eade9a007bb1f22da0bab39befb5301c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 07:09:55 -0400
Subject: [PATCH 1435/8469] Moved 'history' to changes.txt

---
 CHANGES.txt         | 584 ++++++++++++++++++++++++++++++++++++++++++++
 docs/setuptools.txt | 494 -------------------------------------
 2 files changed, 584 insertions(+), 494 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 34bdf6510f..b2729aaca1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -755,3 +755,587 @@ easy_install
 
 * Immediately close all file handles. This closes Distribute #3.
 
+-----
+0.6c9
+-----
+
+ * Fixed a missing files problem when using Windows source distributions on
+   non-Windows platforms, due to distutils not handling manifest file line
+   endings correctly.
+
+ * Updated Pyrex support to work with Pyrex 0.9.6 and higher.
+
+ * Minor changes for Jython compatibility, including skipping tests that can't
+   work on Jython.
+
+ * Fixed not installing eggs in ``install_requires`` if they were also used for
+   ``setup_requires`` or ``tests_require``.
+
+ * Fixed not fetching eggs in ``install_requires`` when running tests.
+
+ * Allow ``ez_setup.use_setuptools()`` to upgrade existing setuptools
+   installations when called from a standalone ``setup.py``.
+
+ * Added a warning if a namespace package is declared, but its parent package
+   is not also declared as a namespace.
+
+ * Support Subversion 1.5
+
+ * Removed use of deprecated ``md5`` module if ``hashlib`` is available
+
+ * Fixed ``bdist_wininst upload`` trying to upload the ``.exe`` twice
+
+ * Fixed ``bdist_egg`` putting a ``native_libs.txt`` in the source package's
+   ``.egg-info``, when it should only be in the built egg's ``EGG-INFO``.
+
+ * Ensure that _full_name is set on all shared libs before extensions are
+   checked for shared lib usage.  (Fixes a bug in the experimental shared
+   library build support.)
+
+ * Fix to allow unpacked eggs containing native libraries to fail more
+   gracefully under Google App Engine (with an ``ImportError`` loading the
+   C-based module, instead of getting a ``NameError``).
+
+-----
+0.6c7
+-----
+
+ * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and
+   ``egg_info`` command failing on new, uncommitted SVN directories.
+
+ * Fix import problems with nested namespace packages installed via
+   ``--root`` or ``--single-version-externally-managed``, due to the
+   parent package not having the child package as an attribute.
+
+-----
+0.6c6
+-----
+
+ * Added ``--egg-path`` option to ``develop`` command, allowing you to force
+   ``.egg-link`` files to use relative paths (allowing them to be shared across
+   platforms on a networked drive).
+
+ * Fix not building binary RPMs correctly.
+
+ * Fix "eggsecutables" (such as setuptools' own egg) only being runnable with
+   bash-compatible shells.
+
+ * Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there
+   was whitespace inside a quoted argument or at the end of the ``#!`` line
+   (a regression introduced in 0.6c4).
+
+ * Fix ``test`` command possibly failing if an older version of the project
+   being tested was installed on ``sys.path`` ahead of the test source
+   directory.
+
+ * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
+   their names as packages.
+
+-----
+0.6c5
+-----
+
+ * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg``
+   packages under Python versions less than 2.5.
+
+ * Fix uploaded ``bdist_wininst`` packages being described as suitable for
+   "any" version by Python 2.5, even if a ``--target-version`` was specified.
+
+-----
+0.6c4
+-----
+
+ * Overhauled Windows script wrapping to support ``bdist_wininst`` better.
+   Scripts installed with ``bdist_wininst`` will always use ``#!python.exe`` or
+   ``#!pythonw.exe`` as the executable name (even when built on non-Windows
+   platforms!), and the wrappers will look for the executable in the script's
+   parent directory (which should find the right version of Python).
+
+ * Fix ``upload`` command not uploading files built by ``bdist_rpm`` or
+   ``bdist_wininst`` under Python 2.3 and 2.4.
+
+ * Add support for "eggsecutable" headers: a ``#!/bin/sh`` script that is
+   prepended to an ``.egg`` file to allow it to be run as a script on Unix-ish
+   platforms.  (This is mainly so that setuptools itself can have a single-file
+   installer on Unix, without doing multiple downloads, dealing with firewalls,
+   etc.)
+
+ * Fix problem with empty revision numbers in Subversion 1.4 ``entries`` files
+
+ * Use cross-platform relative paths in ``easy-install.pth`` when doing
+   ``develop`` and the source directory is a subdirectory of the installation
+   target directory.
+
+ * Fix a problem installing eggs with a system packaging tool if the project
+   contained an implicit namespace package; for example if the ``setup()``
+   listed a namespace package ``foo.bar`` without explicitly listing ``foo``
+   as a namespace package.
+
+-----
+0.6c3
+-----
+
+ * Fixed breakages caused by Subversion 1.4's new "working copy" format
+
+-----
+0.6c2
+-----
+
+ * The ``ez_setup`` module displays the conflicting version of setuptools (and
+   its installation location) when a script requests a version that's not
+   available.
+
+ * Running ``setup.py develop`` on a setuptools-using project will now install
+   setuptools if needed, instead of only downloading the egg.
+
+-----
+0.6c1
+-----
+
+ * Fixed ``AttributeError`` when trying to download a ``setup_requires``
+   dependency when a distribution lacks a ``dependency_links`` setting.
+
+ * Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte, so
+   as to play better with packaging tools that complain about zero-length
+   files.
+
+ * Made ``setup.py develop`` respect the ``--no-deps`` option, which it
+   previously was ignoring.
+
+ * Support ``extra_path`` option to ``setup()`` when ``install`` is run in
+   backward-compatibility mode.
+
+ * Source distributions now always include a ``setup.cfg`` file that explicitly
+   sets ``egg_info`` options such that they produce an identical version number
+   to the source distribution's version number.  (Previously, the default
+   version number could be different due to the use of ``--tag-date``, or if
+   the version was overridden on the command line that built the source
+   distribution.)
+
+-----
+0.6b4
+-----
+
+ * Fix ``register`` not obeying name/version set by ``egg_info`` command, if
+   ``egg_info`` wasn't explicitly run first on the same command line.
+
+ * Added ``--no-date`` and ``--no-svn-revision`` options to ``egg_info``
+   command, to allow suppressing tags configured in ``setup.cfg``.
+
+ * Fixed redundant warnings about missing ``README`` file(s); it should now
+   appear only if you are actually a source distribution.
+
+-----
+0.6b3
+-----
+
+ * Fix ``bdist_egg`` not including files in subdirectories of ``.egg-info``.
+
+ * Allow ``.py`` files found by the ``include_package_data`` option to be
+   automatically included.  Remove duplicate data file matches if both
+   ``include_package_data`` and ``package_data`` are used to refer to the same
+   files.
+
+-----
+0.6b1
+-----
+
+ * Strip ``module`` from the end of compiled extension modules when computing
+   the name of a ``.py`` loader/wrapper.  (Python's import machinery ignores
+   this suffix when searching for an extension module.)
+
+------
+0.6a11
+------
+
+ * Added ``test_loader`` keyword to support custom test loaders
+
+ * Added ``setuptools.file_finders`` entry point group to allow implementing
+   revision control plugins.
+
+ * Added ``--identity`` option to ``upload`` command.
+
+ * Added ``dependency_links`` to allow specifying URLs for ``--find-links``.
+
+ * Enhanced test loader to scan packages as well as modules, and call
+   ``additional_tests()`` if present to get non-unittest tests.
+
+ * Support namespace packages in conjunction with system packagers, by omitting
+   the installation of any ``__init__.py`` files for namespace packages, and
+   adding a special ``.pth`` file to create a working package in
+   ``sys.modules``.
+
+ * Made ``--single-version-externally-managed`` automatic when ``--root`` is
+   used, so that most system packagers won't require special support for
+   setuptools.
+
+ * Fixed ``setup_requires``, ``tests_require``, etc. not using ``setup.cfg`` or
+   other configuration files for their option defaults when installing, and
+   also made the install use ``--multi-version`` mode so that the project
+   directory doesn't need to support .pth files.
+
+ * ``MANIFEST.in`` is now forcibly closed when any errors occur while reading
+   it.  Previously, the file could be left open and the actual error would be
+   masked by problems trying to remove the open file on Windows systems.
+
+------
+0.6a10
+------
+
+ * Fixed the ``develop`` command ignoring ``--find-links``.
+
+-----
+0.6a9
+-----
+
+ * The ``sdist`` command no longer uses the traditional ``MANIFEST`` file to
+   create source distributions.  ``MANIFEST.in`` is still read and processed,
+   as are the standard defaults and pruning.  But the manifest is built inside
+   the project's ``.egg-info`` directory as ``SOURCES.txt``, and it is rebuilt
+   every time the ``egg_info`` command is run.
+
+ * Added the ``include_package_data`` keyword to ``setup()``, allowing you to
+   automatically include any package data listed in revision control or
+   ``MANIFEST.in``
+
+ * Added the ``exclude_package_data`` keyword to ``setup()``, allowing you to
+   trim back files included via the ``package_data`` and
+   ``include_package_data`` options.
+
+ * Fixed ``--tag-svn-revision`` not working when run from a source
+   distribution.
+
+ * Added warning for namespace packages with missing ``declare_namespace()``
+
+ * Added ``tests_require`` keyword to ``setup()``, so that e.g. packages
+   requiring ``nose`` to run unit tests can make this dependency optional
+   unless the ``test`` command is run.
+
+ * Made all commands that use ``easy_install`` respect its configuration
+   options, as this was causing some problems with ``setup.py install``.
+
+ * Added an ``unpack_directory()`` driver to ``setuptools.archive_util``, so
+   that you can process a directory tree through a processing filter as if it
+   were a zipfile or tarfile.
+
+ * Added an internal ``install_egg_info`` command to use as part of old-style
+   ``install`` operations, that installs an ``.egg-info`` directory with the
+   package.
+
+ * Added a ``--single-version-externally-managed`` option to the ``install``
+   command so that you can more easily wrap a "flat" egg in a system package.
+
+ * Enhanced ``bdist_rpm`` so that it installs single-version eggs that
+   don't rely on a ``.pth`` file.  The ``--no-egg`` option has been removed,
+   since all RPMs are now built in a more backwards-compatible format.
+
+ * Support full roundtrip translation of eggs to and from ``bdist_wininst``
+   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
+   egg in an .exe that will safely install it as an egg (i.e., with metadata
+   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
+   back into an ``.egg`` file or directory and install it as such.
+
+
+-----
+0.6a8
+-----
+
+ * Fixed some problems building extensions when Pyrex was installed, especially
+   with Python 2.4 and/or packages using SWIG.
+
+ * Made ``develop`` command accept all the same options as ``easy_install``,
+   and use the ``easy_install`` command's configuration settings as defaults.
+
+ * Made ``egg_info --tag-svn-revision`` fall back to extracting the revision
+   number from ``PKG-INFO`` in case it is being run on a source distribution of
+   a snapshot taken from a Subversion-based project.
+
+ * Automatically detect ``.dll``, ``.so`` and ``.dylib`` files that are being
+   installed as data, adding them to ``native_libs.txt`` automatically.
+
+ * Fixed some problems with fresh checkouts of projects that don't include
+   ``.egg-info/PKG-INFO`` under revision control and put the project's source
+   code directly in the project directory.  If such a package had any
+   requirements that get processed before the ``egg_info`` command can be run,
+   the setup scripts would fail with a "Missing 'Version:' header and/or
+   PKG-INFO file" error, because the egg runtime interpreted the unbuilt
+   metadata in a directory on ``sys.path`` (i.e. the current directory) as
+   being a corrupted egg.  Setuptools now monkeypatches the distribution
+   metadata cache to pretend that the egg has valid version information, until
+   it has a chance to make it actually be so (via the ``egg_info`` command).
+
+-----
+0.6a5
+-----
+
+ * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
+
+-----
+0.6a3
+-----
+
+ * Added ``gui_scripts`` entry point group to allow installing GUI scripts
+   on Windows and other platforms.  (The special handling is only for Windows;
+   other platforms are treated the same as for ``console_scripts``.)
+
+-----
+0.6a2
+-----
+
+ * Added ``console_scripts`` entry point group to allow installing scripts
+   without the need to create separate script files.  On Windows, console
+   scripts get an ``.exe`` wrapper so you can just type their name.  On other
+   platforms, the scripts are written without a file extension.
+
+-----
+0.6a1
+-----
+
+ * Added support for building "old-style" RPMs that don't install an egg for
+   the target package, using a ``--no-egg`` option.
+
+ * The ``build_ext`` command now works better when using the ``--inplace``
+   option and multiple Python versions.  It now makes sure that all extensions
+   match the current Python version, even if newer copies were built for a
+   different Python version.
+
+ * The ``upload`` command no longer attaches an extra ``.zip`` when uploading
+   eggs, as PyPI now supports egg uploads without trickery.
+
+ * The ``ez_setup`` script/module now displays a warning before downloading
+   the setuptools egg, and attempts to check the downloaded egg against an
+   internal MD5 checksum table.
+
+ * Fixed the ``--tag-svn-revision`` option of ``egg_info`` not finding the
+   latest revision number; it was using the revision number of the directory
+   containing ``setup.py``, not the highest revision number in the project.
+
+ * Added ``eager_resources`` setup argument
+
+ * The ``sdist`` command now recognizes Subversion "deleted file" entries and
+   does not include them in source distributions.
+
+ * ``setuptools`` now embeds itself more thoroughly into the distutils, so that
+   other distutils extensions (e.g. py2exe, py2app) will subclass setuptools'
+   versions of things, rather than the native distutils ones.
+
+ * Added ``entry_points`` and ``setup_requires`` arguments to ``setup()``;
+   ``setup_requires`` allows you to automatically find and download packages
+   that are needed in order to *build* your project (as opposed to running it).
+
+ * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
+   metadata writers using entry points, so that they can be extended by
+   third-party packages.  See `Creating distutils Extensions`_ above for more
+   details.
+
+ * The vestigial ``depends`` command has been removed.  It was never finished
+   or documented, and never would have worked without EasyInstall - which it
+   pre-dated and was never compatible with.
+
+------
+0.5a12
+------
+
+ * The zip-safety scanner now checks for modules that might be used with
+   ``python -m``, and marks them as unsafe for zipping, since Python 2.4 can't
+   handle ``-m`` on zipped modules.
+
+------
+0.5a11
+------
+
+ * Fix breakage of the "develop" command that was caused by the addition of
+   ``--always-unzip`` to the ``easy_install`` command.
+
+-----
+0.5a9
+-----
+
+ * Include ``svn:externals`` directories in source distributions as well as
+   normal subversion-controlled files and directories.
+
+ * Added ``exclude=patternlist`` option to ``setuptools.find_packages()``
+
+ * Changed --tag-svn-revision to include an "r" in front of the revision number
+   for better readability.
+
+ * Added ability to build eggs without including source files (except for any
+   scripts, of course), using the ``--exclude-source-files`` option to
+   ``bdist_egg``.
+
+ * ``setup.py install`` now automatically detects when an "unmanaged" package
+   or module is going to be on ``sys.path`` ahead of a package being installed,
+   thereby preventing the newer version from being imported.  If this occurs,
+   a warning message is output to ``sys.stderr``, but installation proceeds
+   anyway.  The warning message informs the user what files or directories
+   need deleting, and advises them they can also use EasyInstall (with the
+   ``--delete-conflicting`` option) to do it automatically.
+
+ * The ``egg_info`` command now adds a ``top_level.txt`` file to the metadata
+   directory that lists all top-level modules and packages in the distribution.
+   This is used by the ``easy_install`` command to find possibly-conflicting
+   "unmanaged" packages when installing the distribution.
+
+ * Added ``zip_safe`` and ``namespace_packages`` arguments to ``setup()``.
+   Added package analysis to determine zip-safety if the ``zip_safe`` flag
+   is not given, and advise the author regarding what code might need changing.
+
+ * Fixed the swapped ``-d`` and ``-b`` options of ``bdist_egg``.
+
+-----
+0.5a8
+-----
+
+ * The "egg_info" command now always sets the distribution metadata to "safe"
+   forms of the distribution name and version, so that distribution files will
+   be generated with parseable names (i.e., ones that don't include '-' in the
+   name or version).  Also, this means that if you use the various ``--tag``
+   options of "egg_info", any distributions generated will use the tags in the
+   version, not just egg distributions.
+
+ * Added support for defining command aliases in distutils configuration files,
+   under the "[aliases]" section.  To prevent recursion and to allow aliases to
+   call the command of the same name, a given alias can be expanded only once
+   per command-line invocation.  You can define new aliases with the "alias"
+   command, either for the local, global, or per-user configuration.
+
+ * Added "rotate" command to delete old distribution files, given a set of
+   patterns to match and the number of files to keep.  (Keeps the most
+   recently-modified distribution files matching each pattern.)
+
+ * Added "saveopts" command that saves all command-line options for the current
+   invocation to the local, global, or per-user configuration file.  Useful for
+   setting defaults without having to hand-edit a configuration file.
+
+ * Added a "setopt" command that sets a single option in a specified distutils
+   configuration file.
+
+-----
+0.5a7
+-----
+
+ * Added "upload" support for egg and source distributions, including a bug
+   fix for "upload" and a temporary workaround for lack of .egg support in
+   PyPI.
+
+-----
+0.5a6
+-----
+
+ * Beefed up the "sdist" command so that if you don't have a MANIFEST.in, it
+   will include all files under revision control (CVS or Subversion) in the
+   current directory, and it will regenerate the list every time you create a
+   source distribution, not just when you tell it to.  This should make the
+   default "do what you mean" more often than the distutils' default behavior
+   did, while still retaining the old behavior in the presence of MANIFEST.in.
+
+ * Fixed the "develop" command always updating .pth files, even if you
+   specified ``-n`` or ``--dry-run``.
+
+ * Slightly changed the format of the generated version when you use
+   ``--tag-build`` on the "egg_info" command, so that you can make tagged
+   revisions compare *lower* than the version specified in setup.py (e.g. by
+   using ``--tag-build=dev``).
+
+-----
+0.5a5
+-----
+
+ * Added ``develop`` command to ``setuptools``-based packages.  This command
+   installs an ``.egg-link`` pointing to the package's source directory, and
+   script wrappers that ``execfile()`` the source versions of the package's
+   scripts.  This lets you put your development checkout(s) on sys.path without
+   having to actually install them.  (To uninstall the link, use
+   use ``setup.py develop --uninstall``.)
+
+ * Added ``egg_info`` command to ``setuptools``-based packages.  This command
+   just creates or updates the "projectname.egg-info" directory, without
+   building an egg.  (It's used by the ``bdist_egg``, ``test``, and ``develop``
+   commands.)
+
+ * Enhanced the ``test`` command so that it doesn't install the package, but
+   instead builds any C extensions in-place, updates the ``.egg-info``
+   metadata, adds the source directory to ``sys.path``, and runs the tests
+   directly on the source.  This avoids an "unmanaged" installation of the
+   package to ``site-packages`` or elsewhere.
+
+ * Made ``easy_install`` a standard ``setuptools`` command, moving it from
+   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
+   that if you were importing or extending it, you must now change your imports
+   accordingly.  ``easy_install.py`` is still installed as a script, but not as
+   a module.
+
+-----
+0.5a4
+-----
+
+ * Setup scripts using setuptools can now list their dependencies directly in
+   the setup.py file, without having to manually create a ``depends.txt`` file.
+   The ``install_requires`` and ``extras_require`` arguments to ``setup()``
+   are used to create a dependencies file automatically.  If you are manually
+   creating ``depends.txt`` right now, please switch to using these setup
+   arguments as soon as practical, because ``depends.txt`` support will be
+   removed in the 0.6 release cycle.  For documentation on the new arguments,
+   see the ``setuptools.dist.Distribution`` class.
+
+ * Setup scripts using setuptools now always install using ``easy_install``
+   internally, for ease of uninstallation and upgrading.
+
+-----
+0.5a1
+-----
+
+ * Added support for "self-installation" bootstrapping.  Packages can now
+   include ``ez_setup.py`` in their source distribution, and add the following
+   to their ``setup.py``, in order to automatically bootstrap installation of
+   setuptools as part of their setup process::
+
+    from ez_setup import use_setuptools
+    use_setuptools()
+
+    from setuptools import setup
+    # etc...
+
+-----
+0.4a2
+-----
+
+ * Added ``ez_setup.py`` installer/bootstrap script to make initial setuptools
+   installation easier, and to allow distributions using setuptools to avoid
+   having to include setuptools in their source distribution.
+
+ * All downloads are now managed by the ``PackageIndex`` class (which is now
+   subclassable and replaceable), so that embedders can more easily override
+   download logic, give download progress reports, etc.  The class has also
+   been moved to the new ``setuptools.package_index`` module.
+
+ * The ``Installer`` class no longer handles downloading, manages a temporary
+   directory, or tracks the ``zip_ok`` option.  Downloading is now handled
+   by ``PackageIndex``, and ``Installer`` has become an ``easy_install``
+   command class based on ``setuptools.Command``.
+
+ * There is a new ``setuptools.sandbox.run_setup()`` API to invoke a setup
+   script in a directory sandbox, and a new ``setuptools.archive_util`` module
+   with an ``unpack_archive()`` API.  These were split out of EasyInstall to
+   allow reuse by other tools and applications.
+
+ * ``setuptools.Command`` now supports reinitializing commands using keyword
+   arguments to set/reset options.  Also, ``Command`` subclasses can now set
+   their ``command_consumes_arguments`` attribute to ``True`` in order to
+   receive an ``args`` option containing the rest of the command line.
+
+-----
+0.3a2
+-----
+
+ * Added new options to ``bdist_egg`` to allow tagging the egg's version number
+   with a subversion revision number, the current date, or an explicit tag
+   value.  Run ``setup.py bdist_egg --help`` to get more information.
+
+ * Misc. bug fixes
+
+-----
+0.3a1
+-----
+
+ * Initial release.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7bc307e062..6e9a692741 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2685,500 +2685,6 @@ XXX
 
 XXX
 
-History
-=======
-
-0.6c9
- * Fixed a missing files problem when using Windows source distributions on
-   non-Windows platforms, due to distutils not handling manifest file line
-   endings correctly.
-
- * Updated Pyrex support to work with Pyrex 0.9.6 and higher.
-
- * Minor changes for Jython compatibility, including skipping tests that can't
-   work on Jython.
-
- * Fixed not installing eggs in ``install_requires`` if they were also used for
-   ``setup_requires`` or ``tests_require``.
-
- * Fixed not fetching eggs in ``install_requires`` when running tests.
-
- * Allow ``ez_setup.use_setuptools()`` to upgrade existing setuptools
-   installations when called from a standalone ``setup.py``.
-
- * Added a warning if a namespace package is declared, but its parent package
-   is not also declared as a namespace.
-
- * Support Subversion 1.5
-
- * Removed use of deprecated ``md5`` module if ``hashlib`` is available
-
- * Fixed ``bdist_wininst upload`` trying to upload the ``.exe`` twice
-
- * Fixed ``bdist_egg`` putting a ``native_libs.txt`` in the source package's
-   ``.egg-info``, when it should only be in the built egg's ``EGG-INFO``.
-
- * Ensure that _full_name is set on all shared libs before extensions are
-   checked for shared lib usage.  (Fixes a bug in the experimental shared
-   library build support.)
-
- * Fix to allow unpacked eggs containing native libraries to fail more
-   gracefully under Google App Engine (with an ``ImportError`` loading the
-   C-based module, instead of getting a ``NameError``).
-
-0.6c7
- * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and
-   ``egg_info`` command failing on new, uncommitted SVN directories.
-
- * Fix import problems with nested namespace packages installed via
-   ``--root`` or ``--single-version-externally-managed``, due to the
-   parent package not having the child package as an attribute.
-
-0.6c6
- * Added ``--egg-path`` option to ``develop`` command, allowing you to force
-   ``.egg-link`` files to use relative paths (allowing them to be shared across
-   platforms on a networked drive).
-
- * Fix not building binary RPMs correctly.
-
- * Fix "eggsecutables" (such as setuptools' own egg) only being runnable with
-   bash-compatible shells.
-
- * Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there
-   was whitespace inside a quoted argument or at the end of the ``#!`` line
-   (a regression introduced in 0.6c4).
-
- * Fix ``test`` command possibly failing if an older version of the project
-   being tested was installed on ``sys.path`` ahead of the test source
-   directory.
-
- * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
-   their names as packages.
-
-0.6c5
- * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg``
-   packages under Python versions less than 2.5.
-
- * Fix uploaded ``bdist_wininst`` packages being described as suitable for
-   "any" version by Python 2.5, even if a ``--target-version`` was specified.
-
-0.6c4
- * Overhauled Windows script wrapping to support ``bdist_wininst`` better.
-   Scripts installed with ``bdist_wininst`` will always use ``#!python.exe`` or
-   ``#!pythonw.exe`` as the executable name (even when built on non-Windows
-   platforms!), and the wrappers will look for the executable in the script's
-   parent directory (which should find the right version of Python).
-
- * Fix ``upload`` command not uploading files built by ``bdist_rpm`` or
-   ``bdist_wininst`` under Python 2.3 and 2.4.
-
- * Add support for "eggsecutable" headers: a ``#!/bin/sh`` script that is
-   prepended to an ``.egg`` file to allow it to be run as a script on Unix-ish
-   platforms.  (This is mainly so that setuptools itself can have a single-file
-   installer on Unix, without doing multiple downloads, dealing with firewalls,
-   etc.)
-
- * Fix problem with empty revision numbers in Subversion 1.4 ``entries`` files
-
- * Use cross-platform relative paths in ``easy-install.pth`` when doing
-   ``develop`` and the source directory is a subdirectory of the installation
-   target directory.
-
- * Fix a problem installing eggs with a system packaging tool if the project
-   contained an implicit namespace package; for example if the ``setup()``
-   listed a namespace package ``foo.bar`` without explicitly listing ``foo``
-   as a namespace package.
-
-0.6c3
- * Fixed breakages caused by Subversion 1.4's new "working copy" format
-
-0.6c2
- * The ``ez_setup`` module displays the conflicting version of setuptools (and
-   its installation location) when a script requests a version that's not
-   available.
-
- * Running ``setup.py develop`` on a setuptools-using project will now install
-   setuptools if needed, instead of only downloading the egg.
-
-0.6c1
- * Fixed ``AttributeError`` when trying to download a ``setup_requires``
-   dependency when a distribution lacks a ``dependency_links`` setting.
-
- * Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte, so
-   as to play better with packaging tools that complain about zero-length
-   files.
-
- * Made ``setup.py develop`` respect the ``--no-deps`` option, which it
-   previously was ignoring.
-
- * Support ``extra_path`` option to ``setup()`` when ``install`` is run in
-   backward-compatibility mode.
-
- * Source distributions now always include a ``setup.cfg`` file that explicitly
-   sets ``egg_info`` options such that they produce an identical version number
-   to the source distribution's version number.  (Previously, the default
-   version number could be different due to the use of ``--tag-date``, or if
-   the version was overridden on the command line that built the source
-   distribution.)
-
-0.6b4
- * Fix ``register`` not obeying name/version set by ``egg_info`` command, if
-   ``egg_info`` wasn't explicitly run first on the same command line.
-
- * Added ``--no-date`` and ``--no-svn-revision`` options to ``egg_info``
-   command, to allow suppressing tags configured in ``setup.cfg``.
-
- * Fixed redundant warnings about missing ``README`` file(s); it should now
-   appear only if you are actually a source distribution.
-
-0.6b3
- * Fix ``bdist_egg`` not including files in subdirectories of ``.egg-info``.
-
- * Allow ``.py`` files found by the ``include_package_data`` option to be
-   automatically included.  Remove duplicate data file matches if both
-   ``include_package_data`` and ``package_data`` are used to refer to the same
-   files.
-
-0.6b1
- * Strip ``module`` from the end of compiled extension modules when computing
-   the name of a ``.py`` loader/wrapper.  (Python's import machinery ignores
-   this suffix when searching for an extension module.)
-
-0.6a11
- * Added ``test_loader`` keyword to support custom test loaders
-
- * Added ``setuptools.file_finders`` entry point group to allow implementing
-   revision control plugins.
-
- * Added ``--identity`` option to ``upload`` command.
-
- * Added ``dependency_links`` to allow specifying URLs for ``--find-links``.
-
- * Enhanced test loader to scan packages as well as modules, and call
-   ``additional_tests()`` if present to get non-unittest tests.
-
- * Support namespace packages in conjunction with system packagers, by omitting
-   the installation of any ``__init__.py`` files for namespace packages, and
-   adding a special ``.pth`` file to create a working package in
-   ``sys.modules``.
-
- * Made ``--single-version-externally-managed`` automatic when ``--root`` is
-   used, so that most system packagers won't require special support for
-   setuptools.
-
- * Fixed ``setup_requires``, ``tests_require``, etc. not using ``setup.cfg`` or
-   other configuration files for their option defaults when installing, and
-   also made the install use ``--multi-version`` mode so that the project
-   directory doesn't need to support .pth files.
-
- * ``MANIFEST.in`` is now forcibly closed when any errors occur while reading
-   it.  Previously, the file could be left open and the actual error would be
-   masked by problems trying to remove the open file on Windows systems.
-
-0.6a10
- * Fixed the ``develop`` command ignoring ``--find-links``.
-
-0.6a9
- * The ``sdist`` command no longer uses the traditional ``MANIFEST`` file to
-   create source distributions.  ``MANIFEST.in`` is still read and processed,
-   as are the standard defaults and pruning.  But the manifest is built inside
-   the project's ``.egg-info`` directory as ``SOURCES.txt``, and it is rebuilt
-   every time the ``egg_info`` command is run.
-
- * Added the ``include_package_data`` keyword to ``setup()``, allowing you to
-   automatically include any package data listed in revision control or
-   ``MANIFEST.in``
-
- * Added the ``exclude_package_data`` keyword to ``setup()``, allowing you to
-   trim back files included via the ``package_data`` and
-   ``include_package_data`` options.
-
- * Fixed ``--tag-svn-revision`` not working when run from a source
-   distribution.
-
- * Added warning for namespace packages with missing ``declare_namespace()``
-
- * Added ``tests_require`` keyword to ``setup()``, so that e.g. packages
-   requiring ``nose`` to run unit tests can make this dependency optional
-   unless the ``test`` command is run.
-
- * Made all commands that use ``easy_install`` respect its configuration
-   options, as this was causing some problems with ``setup.py install``.
-
- * Added an ``unpack_directory()`` driver to ``setuptools.archive_util``, so
-   that you can process a directory tree through a processing filter as if it
-   were a zipfile or tarfile.
-
- * Added an internal ``install_egg_info`` command to use as part of old-style
-   ``install`` operations, that installs an ``.egg-info`` directory with the
-   package.
-
- * Added a ``--single-version-externally-managed`` option to the ``install``
-   command so that you can more easily wrap a "flat" egg in a system package.
-
- * Enhanced ``bdist_rpm`` so that it installs single-version eggs that
-   don't rely on a ``.pth`` file.  The ``--no-egg`` option has been removed,
-   since all RPMs are now built in a more backwards-compatible format.
-
- * Support full roundtrip translation of eggs to and from ``bdist_wininst``
-   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
-   egg in an .exe that will safely install it as an egg (i.e., with metadata
-   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
-   back into an ``.egg`` file or directory and install it as such.
-
-
-0.6a8
- * Fixed some problems building extensions when Pyrex was installed, especially
-   with Python 2.4 and/or packages using SWIG.
-
- * Made ``develop`` command accept all the same options as ``easy_install``,
-   and use the ``easy_install`` command's configuration settings as defaults.
-
- * Made ``egg_info --tag-svn-revision`` fall back to extracting the revision
-   number from ``PKG-INFO`` in case it is being run on a source distribution of
-   a snapshot taken from a Subversion-based project.
-
- * Automatically detect ``.dll``, ``.so`` and ``.dylib`` files that are being
-   installed as data, adding them to ``native_libs.txt`` automatically.
-
- * Fixed some problems with fresh checkouts of projects that don't include
-   ``.egg-info/PKG-INFO`` under revision control and put the project's source
-   code directly in the project directory.  If such a package had any
-   requirements that get processed before the ``egg_info`` command can be run,
-   the setup scripts would fail with a "Missing 'Version:' header and/or
-   PKG-INFO file" error, because the egg runtime interpreted the unbuilt
-   metadata in a directory on ``sys.path`` (i.e. the current directory) as
-   being a corrupted egg.  Setuptools now monkeypatches the distribution
-   metadata cache to pretend that the egg has valid version information, until
-   it has a chance to make it actually be so (via the ``egg_info`` command).
-
-0.6a5
- * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
-
-0.6a3
- * Added ``gui_scripts`` entry point group to allow installing GUI scripts
-   on Windows and other platforms.  (The special handling is only for Windows;
-   other platforms are treated the same as for ``console_scripts``.)
-
-0.6a2
- * Added ``console_scripts`` entry point group to allow installing scripts
-   without the need to create separate script files.  On Windows, console
-   scripts get an ``.exe`` wrapper so you can just type their name.  On other
-   platforms, the scripts are written without a file extension.
-
-0.6a1
- * Added support for building "old-style" RPMs that don't install an egg for
-   the target package, using a ``--no-egg`` option.
-
- * The ``build_ext`` command now works better when using the ``--inplace``
-   option and multiple Python versions.  It now makes sure that all extensions
-   match the current Python version, even if newer copies were built for a
-   different Python version.
-
- * The ``upload`` command no longer attaches an extra ``.zip`` when uploading
-   eggs, as PyPI now supports egg uploads without trickery.
-
- * The ``ez_setup`` script/module now displays a warning before downloading
-   the setuptools egg, and attempts to check the downloaded egg against an
-   internal MD5 checksum table.
-
- * Fixed the ``--tag-svn-revision`` option of ``egg_info`` not finding the
-   latest revision number; it was using the revision number of the directory
-   containing ``setup.py``, not the highest revision number in the project.
-
- * Added ``eager_resources`` setup argument
-
- * The ``sdist`` command now recognizes Subversion "deleted file" entries and
-   does not include them in source distributions.
-
- * ``setuptools`` now embeds itself more thoroughly into the distutils, so that
-   other distutils extensions (e.g. py2exe, py2app) will subclass setuptools'
-   versions of things, rather than the native distutils ones.
-
- * Added ``entry_points`` and ``setup_requires`` arguments to ``setup()``;
-   ``setup_requires`` allows you to automatically find and download packages
-   that are needed in order to *build* your project (as opposed to running it).
-
- * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
-   metadata writers using entry points, so that they can be extended by
-   third-party packages.  See `Creating distutils Extensions`_ above for more
-   details.
-
- * The vestigial ``depends`` command has been removed.  It was never finished
-   or documented, and never would have worked without EasyInstall - which it
-   pre-dated and was never compatible with.
-
-0.5a12
- * The zip-safety scanner now checks for modules that might be used with
-   ``python -m``, and marks them as unsafe for zipping, since Python 2.4 can't
-   handle ``-m`` on zipped modules.
-
-0.5a11
- * Fix breakage of the "develop" command that was caused by the addition of
-   ``--always-unzip`` to the ``easy_install`` command.
-
-0.5a9
- * Include ``svn:externals`` directories in source distributions as well as
-   normal subversion-controlled files and directories.
-
- * Added ``exclude=patternlist`` option to ``setuptools.find_packages()``
-
- * Changed --tag-svn-revision to include an "r" in front of the revision number
-   for better readability.
-
- * Added ability to build eggs without including source files (except for any
-   scripts, of course), using the ``--exclude-source-files`` option to
-   ``bdist_egg``.
-
- * ``setup.py install`` now automatically detects when an "unmanaged" package
-   or module is going to be on ``sys.path`` ahead of a package being installed,
-   thereby preventing the newer version from being imported.  If this occurs,
-   a warning message is output to ``sys.stderr``, but installation proceeds
-   anyway.  The warning message informs the user what files or directories
-   need deleting, and advises them they can also use EasyInstall (with the
-   ``--delete-conflicting`` option) to do it automatically.
-
- * The ``egg_info`` command now adds a ``top_level.txt`` file to the metadata
-   directory that lists all top-level modules and packages in the distribution.
-   This is used by the ``easy_install`` command to find possibly-conflicting
-   "unmanaged" packages when installing the distribution.
-
- * Added ``zip_safe`` and ``namespace_packages`` arguments to ``setup()``.
-   Added package analysis to determine zip-safety if the ``zip_safe`` flag
-   is not given, and advise the author regarding what code might need changing.
-
- * Fixed the swapped ``-d`` and ``-b`` options of ``bdist_egg``.
-
-0.5a8
- * The "egg_info" command now always sets the distribution metadata to "safe"
-   forms of the distribution name and version, so that distribution files will
-   be generated with parseable names (i.e., ones that don't include '-' in the
-   name or version).  Also, this means that if you use the various ``--tag``
-   options of "egg_info", any distributions generated will use the tags in the
-   version, not just egg distributions.
-
- * Added support for defining command aliases in distutils configuration files,
-   under the "[aliases]" section.  To prevent recursion and to allow aliases to
-   call the command of the same name, a given alias can be expanded only once
-   per command-line invocation.  You can define new aliases with the "alias"
-   command, either for the local, global, or per-user configuration.
-
- * Added "rotate" command to delete old distribution files, given a set of
-   patterns to match and the number of files to keep.  (Keeps the most
-   recently-modified distribution files matching each pattern.)
-
- * Added "saveopts" command that saves all command-line options for the current
-   invocation to the local, global, or per-user configuration file.  Useful for
-   setting defaults without having to hand-edit a configuration file.
-
- * Added a "setopt" command that sets a single option in a specified distutils
-   configuration file.
-
-0.5a7
- * Added "upload" support for egg and source distributions, including a bug
-   fix for "upload" and a temporary workaround for lack of .egg support in
-   PyPI.
-
-0.5a6
- * Beefed up the "sdist" command so that if you don't have a MANIFEST.in, it
-   will include all files under revision control (CVS or Subversion) in the
-   current directory, and it will regenerate the list every time you create a
-   source distribution, not just when you tell it to.  This should make the
-   default "do what you mean" more often than the distutils' default behavior
-   did, while still retaining the old behavior in the presence of MANIFEST.in.
-
- * Fixed the "develop" command always updating .pth files, even if you
-   specified ``-n`` or ``--dry-run``.
-
- * Slightly changed the format of the generated version when you use
-   ``--tag-build`` on the "egg_info" command, so that you can make tagged
-   revisions compare *lower* than the version specified in setup.py (e.g. by
-   using ``--tag-build=dev``).
-
-0.5a5
- * Added ``develop`` command to ``setuptools``-based packages.  This command
-   installs an ``.egg-link`` pointing to the package's source directory, and
-   script wrappers that ``execfile()`` the source versions of the package's
-   scripts.  This lets you put your development checkout(s) on sys.path without
-   having to actually install them.  (To uninstall the link, use
-   use ``setup.py develop --uninstall``.)
-
- * Added ``egg_info`` command to ``setuptools``-based packages.  This command
-   just creates or updates the "projectname.egg-info" directory, without
-   building an egg.  (It's used by the ``bdist_egg``, ``test``, and ``develop``
-   commands.)
-
- * Enhanced the ``test`` command so that it doesn't install the package, but
-   instead builds any C extensions in-place, updates the ``.egg-info``
-   metadata, adds the source directory to ``sys.path``, and runs the tests
-   directly on the source.  This avoids an "unmanaged" installation of the
-   package to ``site-packages`` or elsewhere.
-
- * Made ``easy_install`` a standard ``setuptools`` command, moving it from
-   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
-   that if you were importing or extending it, you must now change your imports
-   accordingly.  ``easy_install.py`` is still installed as a script, but not as
-   a module.
-
-0.5a4
- * Setup scripts using setuptools can now list their dependencies directly in
-   the setup.py file, without having to manually create a ``depends.txt`` file.
-   The ``install_requires`` and ``extras_require`` arguments to ``setup()``
-   are used to create a dependencies file automatically.  If you are manually
-   creating ``depends.txt`` right now, please switch to using these setup
-   arguments as soon as practical, because ``depends.txt`` support will be
-   removed in the 0.6 release cycle.  For documentation on the new arguments,
-   see the ``setuptools.dist.Distribution`` class.
-
- * Setup scripts using setuptools now always install using ``easy_install``
-   internally, for ease of uninstallation and upgrading.
-
-0.5a1
- * Added support for "self-installation" bootstrapping.  Packages can now
-   include ``ez_setup.py`` in their source distribution, and add the following
-   to their ``setup.py``, in order to automatically bootstrap installation of
-   setuptools as part of their setup process::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-    from setuptools import setup
-    # etc...
-
-0.4a2
- * Added ``ez_setup.py`` installer/bootstrap script to make initial setuptools
-   installation easier, and to allow distributions using setuptools to avoid
-   having to include setuptools in their source distribution.
-
- * All downloads are now managed by the ``PackageIndex`` class (which is now
-   subclassable and replaceable), so that embedders can more easily override
-   download logic, give download progress reports, etc.  The class has also
-   been moved to the new ``setuptools.package_index`` module.
-
- * The ``Installer`` class no longer handles downloading, manages a temporary
-   directory, or tracks the ``zip_ok`` option.  Downloading is now handled
-   by ``PackageIndex``, and ``Installer`` has become an ``easy_install``
-   command class based on ``setuptools.Command``.
-
- * There is a new ``setuptools.sandbox.run_setup()`` API to invoke a setup
-   script in a directory sandbox, and a new ``setuptools.archive_util`` module
-   with an ``unpack_archive()`` API.  These were split out of EasyInstall to
-   allow reuse by other tools and applications.
-
- * ``setuptools.Command`` now supports reinitializing commands using keyword
-   arguments to set/reset options.  Also, ``Command`` subclasses can now set
-   their ``command_consumes_arguments`` attribute to ``True`` in order to
-   receive an ``args`` option containing the rest of the command line.
-
-0.3a2
- * Added new options to ``bdist_egg`` to allow tagging the egg's version number
-   with a subversion revision number, the current date, or an explicit tag
-   value.  Run ``setup.py bdist_egg --help`` to get more information.
-
- * Misc. bug fixes
-
-0.3a1
- * Initial release.
 
 Mailing List and Bug Tracker
 ============================

From 7f2f3ad3ef977afd8973abd180390692e23c2e10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 07:15:41 -0400
Subject: [PATCH 1436/8469] Update links to point to local documentation, not
 legacy docs.

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 6e9a692741..9cda719558 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -88,9 +88,9 @@ current stable version of setuptools.  In particular, be sure to read the
 section on `Custom Installation Locations`_ if you are installing anywhere
 other than Python's ``site-packages`` directory.
 
-.. _EasyInstall Installation Instructions: http://peak.telecommunity.com/DevCenter/EasyInstall#installation-instructions
+.. _EasyInstall Installation Instructions: easy_install.html#installation-instructions
 
-.. _Custom Installation Locations: http://peak.telecommunity.com/DevCenter/EasyInstall#custom-installation-locations
+.. _Custom Installation Locations: easy_install.html#custom-installation-locations
 
 If you want the current in-development version of setuptools, you should first
 install a stable version, and then run::

From b0126d08b69e1eb9e238db49767e2120f6079a12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 07:16:06 -0400
Subject: [PATCH 1437/8469] Fix typo

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 9cda719558..bd80b960d0 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -652,7 +652,7 @@ A more complete example would be:
     ``vcs+proto://host/path@revision#egg=project-version``
 
 Be careful with the version. It should match the one inside the project files.
-If you want do disregard the version, you have to omit it both in the
+If you want to disregard the version, you have to omit it both in the
 ``requires`` and in the URL's fragment.
 
 This will do a checkout (or a clone, in Git and Mercurial parlance) to a

From 82cff1a329896a88f3ee53a9303c295efc99206e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Aug 2013 07:23:37 -0400
Subject: [PATCH 1438/8469] Updated more references to EasyInstall
 documentation.

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bd80b960d0..dfa9ecdd1c 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -20,7 +20,7 @@ package from source and doesn't have a suitable version already installed.
 Feature Highlights:
 
 * Automatically find/download/install/upgrade dependencies at build time using
-  the `EasyInstall tool <http://peak.telecommunity.com/DevCenter/EasyInstall>`_,
+  the `EasyInstall tool <easy_install.html>`_,
   which supports downloading via HTTP, FTP, Subversion, and SourceForge, and
   automatically scans web pages linked from PyPI to find download links.  (It's
   the closest thing to CPAN currently available for Python.)
@@ -1947,7 +1947,7 @@ them in a ``[develop]`` section or on the command line.
 ============================================
 
 This command runs the `EasyInstall tool
-<http://peak.telecommunity.com/DevCenter/EasyInstall>`_ for you.  It is exactly
+<easy_install.html>`_ for you.  It is exactly
 equivalent to running the ``easy_install`` command.  All command line arguments
 following this command are consumed and not processed further by the distutils,
 so this must be the last command listed on the command line.  Please see

From 409327e443b73125a1a8803a5323a6dadbef7119 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 20:25:04 -0400
Subject: [PATCH 1439/8469] Clean up imports

---
 setuptools.egg-info/requires.txt   | 14 +++++++-------
 setuptools/tests/test_resources.py | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 668f4ee242..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[certs]
-certifi==0.0.8
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index df5261d1ff..949ebef4f6 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -1,11 +1,21 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove
-from unittest import TestCase, makeSuite; from pkg_resources import *
+
+import os
+import sys
+import tempfile
+import shutil
+from unittest import TestCase
+
+import pkg_resources
+from pkg_resources import *
+
 from setuptools.command.easy_install import get_script_header, is_sh
 from setuptools.compat import StringIO, iteritems
-import os, pkg_resources, sys, tempfile, shutil
-try: frozenset
+
+try:
+    frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
 

From a2d99b96997341955cd281ab8454b60555c0af48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 20:36:15 -0400
Subject: [PATCH 1440/8469] Spruce up syntax to to address linter warnings

---
 setuptools/tests/test_resources.py | 68 ++++++++++++------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 949ebef4f6..909f1df356 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-# NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove
+# NOTE: the shebang and encoding lines are for ScriptHeaderTests do not remove
 
 import os
 import sys
@@ -83,14 +83,20 @@ def testCollection(self):
         # Nominal case: no distros on path, should yield all applicable
         self.assertEqual(ad.best_match(req,ws).version, '1.9')
         # If a matching distro is already installed, should return only that
-        ws.add(foo14); self.assertEqual(ad.best_match(req,ws).version, '1.4')
+        ws.add(foo14)
+        self.assertEqual(ad.best_match(req,ws).version, '1.4')
 
         # If the first matching distro is unsuitable, it's a version conflict
-        ws = WorkingSet([]); ws.add(foo12); ws.add(foo14)
+        ws = WorkingSet([])
+        ws.add(foo12)
+        ws.add(foo14)
         self.assertRaises(VersionConflict, ad.best_match, req, ws)
 
         # If more than one match on the path, the first one takes precedence
-        ws = WorkingSet([]); ws.add(foo14); ws.add(foo12); ws.add(foo14);
+        ws = WorkingSet([])
+        ws.add(foo14)
+        ws.add(foo12)
+        ws.add(foo14)
         self.assertEqual(ad.best_match(req,ws).version, '1.4')
 
     def checkFooPkg(self,d):
@@ -127,7 +133,6 @@ def testDistroMetadata(self):
         )
         self.checkFooPkg(d)
 
-
     def distRequires(self, txt):
         return Distribution("/foo", metadata=Metadata(('depends.txt', txt)))
 
@@ -141,11 +146,11 @@ def testDistroDependsSimple(self):
         for v in "Twisted>=1.5", "Twisted>=1.5\nZConfig>=2.0":
             self.checkRequires(self.distRequires(v), v)
 
-
     def testResolve(self):
-        ad = Environment([]); ws = WorkingSet([])
+        ad = Environment([])
+        ws = WorkingSet([])
         # Resolving no requirements -> nothing to install
-        self.assertEqual( list(ws.resolve([],ad)), [] )
+        self.assertEqual(list(ws.resolve([],ad)), [])
         # Request something not in the collection -> DistributionNotFound
         self.assertRaises(
             DistributionNotFound, ws.resolve, parse_requirements("Foo"), ad
@@ -154,7 +159,8 @@ def testResolve(self):
             "/foo_dir/Foo-1.2.egg",
             metadata=Metadata(('depends.txt', "[bar]\nBaz>=2.0"))
         )
-        ad.add(Foo); ad.add(Distribution.from_filename("Foo-0.9.egg"))
+        ad.add(Foo)
+        ad.add(Distribution.from_filename("Foo-0.9.egg"))
 
         # Request thing(s) that are available -> list to activate
         for i in range(3):
@@ -179,9 +185,8 @@ def testResolve(self):
             list(ws.resolve(parse_requirements("Foo[bar]"), ad)), [Foo,Baz]
         )
         # Requests for conflicting versions produce VersionConflict
-        self.assertRaises( VersionConflict,
-            ws.resolve, parse_requirements("Foo==1.2\nFoo!=1.2"), ad
-        )
+        self.assertRaises(VersionConflict,
+            ws.resolve, parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
 
     def testDistroDependsOptions(self):
         d = self.distRequires("""
@@ -314,8 +319,8 @@ def testOrdering(self):
     def testBasicContains(self):
         r = Requirement("Twisted", [('>=','1.2')], ())
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
-        twist11  = Distribution.from_filename("Twisted-1.1.egg")
-        twist12  = Distribution.from_filename("Twisted-1.2.egg")
+        twist11 = Distribution.from_filename("Twisted-1.1.egg")
+        twist12 = Distribution.from_filename("Twisted-1.2.egg")
         self.assertTrue(parse_version('1.2') in r)
         self.assertTrue(parse_version('1.1') not in r)
         self.assertTrue('1.2' in r)
@@ -331,7 +336,6 @@ def testAdvancedContains(self):
         for v in ('1.2c1','1.3.1','1.5','1.9.1','2.0','2.5','3.0','4.0'):
             self.assertTrue(v not in r, (v,r))
 
-
     def testOptionsAndHashing(self):
         r1 = Requirement.parse("Twisted[foo,bar]>=1.2")
         r2 = Requirement.parse("Twisted[bar,FOO]>=1.2")
@@ -376,15 +380,6 @@ def testSetuptoolsProjectName(self):
             Requirement.parse('setuptools >= 0.7').project_name, 'setuptools')
 
 
-
-
-
-
-
-
-
-
-
 class ParseTests(TestCase):
 
     def testEmptyParse(self):
@@ -398,9 +393,7 @@ def testYielding(self):
             self.assertEqual(list(pkg_resources.yield_lines(inp)),out)
 
     def testSplitting(self):
-        self.assertEqual(
-            list(
-                pkg_resources.split_sections("""
+        sample = """
                     x
                     [Y]
                     z
@@ -413,8 +406,7 @@ def testSplitting(self):
                     [q]
                     v
                     """
-                )
-            ),
+        self.assertEqual(list(pkg_resources.split_sections(sample)),
             [(None,["x"]), ("Y",["z","a"]), ("b",["c"]), ("d",[]), ("q",["v"])]
         )
         self.assertRaises(ValueError,list,pkg_resources.split_sections("[foo"))
@@ -465,7 +457,8 @@ def c(s1,s2):
         c('0pre1', '0.0c1')
         c('0.0.0preview1', '0c1')
         c('0.0c1', '0-rc1')
-        c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')
+        c('1.2a1', '1.2.a.1')
+        c('1.2...a', '1.2a')
 
     def testVersionOrdering(self):
         def c(s1,s2):
@@ -502,12 +495,6 @@ def c(s1,s2):
                 c(v2,v1)
 
 
-
-
-
-
-
-
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'
 
@@ -525,7 +512,7 @@ def test_get_script_header(self):
     def test_get_script_header_jython_workaround(self):
         # This test doesn't work with Python 3 in some locales
         if (sys.version_info >= (3,) and os.environ.get("LC_CTYPE")
-            in (None, "C", "POSIX")):
+                in (None, "C", "POSIX")):
             return
 
         class java:
@@ -564,8 +551,6 @@ def getProperty(property):
             sys.stdout, sys.stderr = stdout, stderr
 
 
-
-
 class NamespaceTests(TestCase):
 
     def setUp(self):
@@ -620,6 +605,5 @@ def test_two_levels_deep(self):
         self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
         # check the __path__ attribute contains both paths
         self.assertEqual(pkg1.pkg2.__path__, [
-                os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"),
-                os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2") ])
-
+            os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"),
+            os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2")])

From 27d755c7c26d3b677134accf6a92de58e6e97827 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 21:18:21 -0400
Subject: [PATCH 1441/8469] Remove import *

---
 setuptools.egg-info/requires.txt   |  8 +++---
 setuptools/tests/test_resources.py | 40 ++++++++++++++++--------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..5ff415da83 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,8 +1,5 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
@@ -10,4 +7,7 @@ wincertstore==0.1
 certifi==0.0.8
 
 [ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ssl==1.16
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 909f1df356..06fbba502d 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -9,7 +9,9 @@
 from unittest import TestCase
 
 import pkg_resources
-from pkg_resources import *
+from pkg_resources import (parse_requirements, VersionConflict, parse_version,
+    Distribution, EntryPoint, Requirement, safe_version, safe_name,
+    WorkingSet)
 
 from setuptools.command.easy_install import get_script_header, is_sh
 from setuptools.compat import StringIO, iteritems
@@ -25,11 +27,11 @@ def safe_repr(obj, short=False):
         result = repr(obj)
     except Exception:
         result = object.__repr__(obj)
-    if not short or len(result) < _MAX_LENGTH:
+    if not short or len(result) < pkg_resources._MAX_LENGTH:
         return result
-    return result[:_MAX_LENGTH] + ' [truncated]...'
+    return result[:pkg_resources._MAX_LENGTH] + ' [truncated]...'
 
-class Metadata(EmptyProvider):
+class Metadata(pkg_resources.EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 
     def __init__(self,*pairs):
@@ -42,18 +44,20 @@ def get_metadata(self,name):
         return self.metadata[name]
 
     def get_metadata_lines(self,name):
-        return yield_lines(self.get_metadata(name))
+        return pkg_resources.yield_lines(self.get_metadata(name))
+
+dist_from_fn = pkg_resources.Distribution.from_filename
 
 class DistroTests(TestCase):
 
     def testCollection(self):
         # empty path should produce no distributions
-        ad = Environment([], platform=None, python=None)
+        ad = pkg_resources.Environment([], platform=None, python=None)
         self.assertEqual(list(ad), [])
         self.assertEqual(ad['FooPkg'],[])
-        ad.add(Distribution.from_filename("FooPkg-1.3_1.egg"))
-        ad.add(Distribution.from_filename("FooPkg-1.4-py2.4-win32.egg"))
-        ad.add(Distribution.from_filename("FooPkg-1.2-py2.4.egg"))
+        ad.add(dist_from_fn("FooPkg-1.3_1.egg"))
+        ad.add(dist_from_fn("FooPkg-1.4-py2.4-win32.egg"))
+        ad.add(dist_from_fn("FooPkg-1.2-py2.4.egg"))
 
         # Name is in there now
         self.assertTrue(ad['FooPkg'])
@@ -70,14 +74,14 @@ def testCollection(self):
             [dist.version for dist in ad['FooPkg']], ['1.4','1.2']
         )
         # And inserting adds them in order
-        ad.add(Distribution.from_filename("FooPkg-1.9.egg"))
+        ad.add(dist_from_fn("FooPkg-1.9.egg"))
         self.assertEqual(
             [dist.version for dist in ad['FooPkg']], ['1.9','1.4','1.2']
         )
 
         ws = WorkingSet([])
-        foo12 = Distribution.from_filename("FooPkg-1.2-py2.4.egg")
-        foo14 = Distribution.from_filename("FooPkg-1.4-py2.4-win32.egg")
+        foo12 = dist_from_fn("FooPkg-1.2-py2.4.egg")
+        foo14 = dist_from_fn("FooPkg-1.4-py2.4-win32.egg")
         req, = parse_requirements("FooPkg>=1.3")
 
         # Nominal case: no distros on path, should yield all applicable
@@ -119,9 +123,9 @@ def testDistroBasics(self):
         self.assertEqual(d.platform, None)
 
     def testDistroParse(self):
-        d = Distribution.from_filename("FooPkg-1.3_1-py2.4-win32.egg")
+        d = dist_from_fn("FooPkg-1.3_1-py2.4-win32.egg")
         self.checkFooPkg(d)
-        d = Distribution.from_filename("FooPkg-1.3_1-py2.4-win32.egg-info")
+        d = dist_from_fn("FooPkg-1.3_1-py2.4-win32.egg-info")
         self.checkFooPkg(d)
 
     def testDistroMetadata(self):
@@ -147,13 +151,13 @@ def testDistroDependsSimple(self):
             self.checkRequires(self.distRequires(v), v)
 
     def testResolve(self):
-        ad = Environment([])
+        ad = pkg_resources.Environment([])
         ws = WorkingSet([])
         # Resolving no requirements -> nothing to install
         self.assertEqual(list(ws.resolve([],ad)), [])
         # Request something not in the collection -> DistributionNotFound
         self.assertRaises(
-            DistributionNotFound, ws.resolve, parse_requirements("Foo"), ad
+            pkg_resources.DistributionNotFound, ws.resolve, parse_requirements("Foo"), ad
         )
         Foo = Distribution.from_filename(
             "/foo_dir/Foo-1.2.egg",
@@ -173,7 +177,7 @@ def testResolve(self):
 
         # Request an extra that causes an unresolved dependency for "Baz"
         self.assertRaises(
-            DistributionNotFound, ws.resolve,parse_requirements("Foo[bar]"), ad
+            pkg_resources.DistributionNotFound, ws.resolve,parse_requirements("Foo[bar]"), ad
         )
         Baz = Distribution.from_filename(
             "/foo_dir/Baz-2.1.egg", metadata=Metadata(('depends.txt', "Foo"))
@@ -211,7 +215,7 @@ def testDistroDependsOptions(self):
             d,"Twisted>=1.5 fcgiapp>=0.1 ZConfig>=2.0 docutils>=0.3".split(),
             ["fastcgi", "docgen"]
         )
-        self.assertRaises(UnknownExtra, d.requires, ["foo"])
+        self.assertRaises(pkg_resources.UnknownExtra, d.requires, ["foo"])
 
 
 class EntryPointTests(TestCase):

From 4378eda9d4c5d20a79d6df6770ed83421fc1abcb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 21:52:34 -0400
Subject: [PATCH 1442/8469] Fixed test_get_script_header failures on Windows
 when Python is in a directory with spaces

---
 setuptools/tests/test_resources.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 06fbba502d..15f44da4a8 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -13,7 +13,8 @@
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
     WorkingSet)
 
-from setuptools.command.easy_install import get_script_header, is_sh
+from setuptools.command.easy_install import (get_script_header, is_sh,
+    nt_quote_arg)
 from setuptools.compat import StringIO, iteritems
 
 try:
@@ -505,10 +506,12 @@ class ScriptHeaderTests(TestCase):
     def test_get_script_header(self):
         if not sys.platform.startswith('java') or not is_sh(sys.executable):
             # This test is for non-Jython platforms
+            expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
             self.assertEqual(get_script_header('#!/usr/local/bin/python'),
-                             '#!%s\n' % os.path.normpath(sys.executable))
+                expected)
+            expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
             self.assertEqual(get_script_header('#!/usr/bin/python -x'),
-                             '#!%s  -x\n' % os.path.normpath(sys.executable))
+                expected)
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)

From c5779cbe9f0e1b77ad650c2ce19e4358ddce7226 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 22:02:00 -0400
Subject: [PATCH 1443/8469] Added test to capture behavior expected behavior on
 Windows with spaces in the filename

---
 setuptools.egg-info/requires.txt   | 12 ++++++------
 setuptools/tests/test_resources.py |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 5ff415da83..5de4d6e7c8 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 15f44da4a8..c9fcf76c9b 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -502,6 +502,7 @@ def c(s1,s2):
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'
+    exe_with_spaces = r'C:\Program Files\Python33\python.exe'
 
     def test_get_script_header(self):
         if not sys.platform.startswith('java') or not is_sh(sys.executable):
@@ -515,6 +516,9 @@ def test_get_script_header(self):
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.exe_with_spaces)
+            self.assertEqual(candidate, '#!"%s"\n' % self.exe_with_spaces)
 
     def test_get_script_header_jython_workaround(self):
         # This test doesn't work with Python 3 in some locales

From f3f0c144dcfec41924e2e3eac3cbbaa81cb53819 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 22:12:06 -0400
Subject: [PATCH 1444/8469] Fixed script header generation in easy_install
 tests. Fixes #37.

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2732bb3ee5..189e3d55df 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,7 +14,7 @@
 
 from setuptools.compat import StringIO, BytesIO, next, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
-from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args
+from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, nt_quote_arg
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -52,7 +52,7 @@ def as_requirement(self):
     sys.exit(
         load_entry_point('spec', 'console_scripts', 'name')()
     )
-""" % fix_jython_executable(sys.executable, "")
+""" % nt_quote_arg(fix_jython_executable(sys.executable, ""))
 
 SETUP_PY = """\
 from setuptools import setup

From 4b432e0f50e9f5871a2f7375b406be7258bfa22c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 22:45:59 -0400
Subject: [PATCH 1445/8469] Issue 50: Removed filename and line number from
 SyntaxErrors returned by invalid_marker. This change simplifies the test and
 paves the way for supporting PyPy.

---
 CHANGES.txt         | 10 ++++++++++
 pkg_resources.py    | 12 +++++++++++-
 tests/api_tests.txt |  8 ++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b2729aaca1..d3c6f9897e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+---
+1.0
+---
+
+* Issue #50: Normalized API of environment marker support. Specifically,
+  removed line number and filename from SyntaxErrors when returned from
+  `pkg_resources.invalid_marker`. Any clients depending on the specific
+  string representation of exceptions returned by that function may need to
+  be updated to account for this change.
+
 -----
 0.9.8
 -----
diff --git a/pkg_resources.py b/pkg_resources.py
index 36a0e6ed30..7c3bdccde0 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1267,12 +1267,22 @@ def _pyimp():
     else:
         return 'CPython'
 
+def normalize_exception(exc):
+    """
+    Given a SyntaxError from a marker evaluation, normalize the error message:
+     - Remove indications of filename and line number.
+    """
+    exc.filename = None
+    exc.lineno = None
+    return exc
+
+
 def invalid_marker(text):
     """Validate text as a PEP 426 environment marker; return exception or False"""
     try:
         evaluate_marker(text)
     except SyntaxError:
-        return sys.exc_info()[1]
+        return normalize_exception(sys.exc_info()[1])
     return False
 
 def evaluate_marker(text, extra=None, _ops={}):
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 86ca245d80..38b762d2d2 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -341,8 +341,8 @@ Environment Markers
     >>> print(im("sys_platform"))
     Comparison or logical expression expected
 
-    >>> print(im("sys_platform=="))  # doctest: +ELLIPSIS
-    unexpected EOF while parsing (...line 1)
+    >>> print(im("sys_platform=="))
+    unexpected EOF while parsing
 
     >>> print(im("sys_platform=='win32'"))
     False
@@ -353,8 +353,8 @@ Environment Markers
     >>> print(im("(extra)"))
     Comparison or logical expression expected
 
-    >>> print(im("(extra"))  # doctest: +ELLIPSIS
-    unexpected EOF while parsing (...line 1)
+    >>> print(im("(extra"))
+    unexpected EOF while parsing
 
     >>> print(im("os.open('foo')=='y'"))
     Language feature not supported in environment markers

From b383fe311089ed6488916614acbf085521c12e48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 22:53:38 -0400
Subject: [PATCH 1446/8469] Replaced overly-specific error messages with more
 general ones for improved cross-implementation compatibility. Fixes #50.

---
 CHANGES.txt         | 2 ++
 pkg_resources.py    | 6 ++++++
 tests/api_tests.txt | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d3c6f9897e..b9a53a0cb9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES
   `pkg_resources.invalid_marker`. Any clients depending on the specific
   string representation of exceptions returned by that function may need to
   be updated to account for this change.
+* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
+  normalized for cross-implementation consistency.
 
 -----
 0.9.8
diff --git a/pkg_resources.py b/pkg_resources.py
index 7c3bdccde0..5514a09902 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1271,9 +1271,15 @@ def normalize_exception(exc):
     """
     Given a SyntaxError from a marker evaluation, normalize the error message:
      - Remove indications of filename and line number.
+     - Replace platform-specific error messages with standard error messages.
     """
+    subs = {
+        'unexpected EOF while parsing': 'invalid syntax',
+        'parenthesis is never closed': 'invalid syntax',
+    }
     exc.filename = None
     exc.lineno = None
+    exc.msg = subs.get(exc.msg, exc.msg)
     return exc
 
 
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 38b762d2d2..d34f231410 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -342,7 +342,7 @@ Environment Markers
     Comparison or logical expression expected
 
     >>> print(im("sys_platform=="))
-    unexpected EOF while parsing
+    invalid syntax
 
     >>> print(im("sys_platform=='win32'"))
     False
@@ -354,7 +354,7 @@ Environment Markers
     Comparison or logical expression expected
 
     >>> print(im("(extra"))
-    unexpected EOF while parsing
+    invalid syntax
 
     >>> print(im("os.open('foo')=='y'"))
     Language feature not supported in environment markers

From da1761c890a5d754caece50df870c30f9dfdd4f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Aug 2013 22:57:08 -0400
Subject: [PATCH 1447/8469] Bumped to 1.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4eb79510d0..5a5ff26084 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -28,7 +28,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "0.9.9"
+DEFAULT_VERSION = "1.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 1b1a934d4b..7e49527e38 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '0.9.9'
+__version__ = '1.0'

From 3e6dd67c4ae9a6df3c25fb4a04d62f7297d47f3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 09:04:34 -0400
Subject: [PATCH 1448/8469] Issue 60: Implemented experimental opt-in support
 for using native launchers rather than installing launcher executables. My
 initial experience with this technique has been very positive.

---
 CHANGES.txt                        |  7 ++++
 docs/easy_install.txt              |  9 +++++
 setuptools/command/easy_install.py | 63 +++++++++++++++++++++---------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b9a53a0cb9..c45b793b79 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,13 @@ CHANGES
 1.0
 ---
 
+* On Windows, Setuptools supports deferring to Vinay Sajip's `pylauncher
+  <https://bitbucket.org/pypa/pylauncher>`_ (included with Python 3.3) to
+  launch console and GUI scripts and not install its own launcher
+  executables. This experimental functionality is currently only enabled if
+  the ``SETUPTOOLS_USE_PYLAUNCHER`` environment variable is set (to anything).
+  In the future, this behavior may become default, but only after it has
+  matured and seen substantial adoption.
 * Issue #50: Normalized API of environment marker support. Specifically,
   removed line number and filename from SyntaxErrors when returned from
   `pkg_resources.invalid_marker`. Any clients depending on the specific
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 12bc73ea87..92e770b7bd 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -96,6 +96,15 @@ sections below on `Command-Line Options`_ and `Configuration Files`_.  You
 can pass command line options (such as ``--script-dir``) to
 ``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
 
+Setuptools also supports deferring to an external launcher such as
+`pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
+Enable this experimental functionality by setting the
+``SETUPTOOLS_USE_PYLAUNCHER`` environment variable. Setuptools will then not
+install its own launcher executable, but will install scripts as simple
+scripts with a .py (or .pyw) extension appended. If these extensions are
+associated with the pylauncher and listed in the PATHEXT environment variable,
+these scripts can then be invoked simply and directly just like any other
+executable.
 
 
 Downloading and Installing a Package
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5be48bb1e8..6a45e59617 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1818,7 +1818,7 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
     @classmethod
     def get_writer(cls, force_windows):
         if force_windows or sys.platform=='win32':
-            return WindowsScriptWriter
+            return WindowsScriptWriter.get_writer()
         return cls
 
     @classmethod
@@ -1828,6 +1828,49 @@ def _get_script_args(cls, type_, name, header, script_text):
 
 
 class WindowsScriptWriter(ScriptWriter):
+    @classmethod
+    def get_writer(cls):
+        """
+        Get a script writer suitable for Windows
+        """
+        # for compatibility, return the writer that creates exe launchers
+        #  unless the SETUPTOOLS_USE_PYLAUNCHER is set, indicating
+        #  future behavior.
+        use_legacy = 'SETUPTOOLS_USE_PYLAUNCHER' not in os.environ
+        if use_legacy:
+            return WindowsLauncherScriptWriter
+        return cls
+
+    @classmethod
+    def _get_script_args(cls, type_, name, header, script_text):
+        "For Windows, add a .py extension"
+        ext = dict(console='.py', gui='.pyw')[type_]
+        old = ['.py', '.pyc', '.pyo', '.pyw', '.exe']
+        old.remove(ext)
+        header = cls._adjust_header(type_, header)
+        blockers = [name+x for x in old]
+        yield name+ext, header+script_text, 't', blockers
+
+    @staticmethod
+    def _adjust_header(type_, orig_header):
+        """
+        Make sure 'pythonw' is used for gui and and 'python' is used for
+        console (regardless of what sys.executable is).
+        """
+        pattern = 'pythonw.exe'
+        repl = 'python.exe'
+        if type_ == 'gui':
+            pattern, repl = repl, pattern
+        pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
+        new_header = pattern_ob.sub(string=orig_header, repl=repl)
+        clean_header = new_header[2:-1].strip('"')
+        if sys.platform == 'win32' and not os.path.exists(clean_header):
+            # the adjusted version doesn't exist, so return the original
+            return orig_header
+        return new_header
+
+
+class WindowsLauncherScriptWriter(WindowsScriptWriter):
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         """
@@ -1857,24 +1900,6 @@ def _get_script_args(cls, type_, name, header, script_text):
             m_name = name + '.exe.manifest'
             yield (m_name, load_launcher_manifest(name), 't')
 
-    @staticmethod
-    def _adjust_header(type_, orig_header):
-        """
-        Make sure 'pythonw' is used for gui and and 'python' is used for
-        console (regardless of what sys.executable is).
-        """
-        pattern = 'pythonw.exe'
-        repl = 'python.exe'
-        if type_ == 'gui':
-            pattern, repl = repl, pattern
-        pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
-        new_header = pattern_ob.sub(string=orig_header, repl=repl)
-        clean_header = new_header[2:-1].strip('"')
-        if sys.platform == 'win32' and not os.path.exists(clean_header):
-            # the adjusted version doesn't exist, so return the original
-            return orig_header
-        return new_header
-
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args
 

From 8f7b0128ebb408b980162863eb865bf9e6e3ce22 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 09:27:33 -0400
Subject: [PATCH 1449/8469] Minimum Python version is 2.4

---
 docs/easy_install.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 92e770b7bd..03f816de02 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -35,9 +35,8 @@ Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
-You will need at least Python 2.3.5, or if you are on a 64-bit platform, Python
-2.4.  An ``easy_install`` script will be installed in the normal location for
-Python scripts on your platform.
+You will need at least Python 2.4.  An ``easy_install`` script will be
+installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
 are installling to Python's primary ``site-packages`` directory.  If this is

From e29ad44c0a1e8025c154c9afb4418f143019379f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 10:14:22 -0400
Subject: [PATCH 1450/8469] Issue #63: Initial implementation of a mechanism
 for securely bootstrapping setuptools, leveraging system tools for trust
 validation.

---
 ez_setup.py | 75 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 18 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5a5ff26084..98d15f22b1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -20,6 +20,7 @@
 import tarfile
 import optparse
 import subprocess
+import platform
 
 from distutils import log
 
@@ -141,6 +142,59 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         return _do_download(version, download_base, to_dir,
                             download_delay)
 
+def download_file_powershell(url, target):
+    """
+    Download the file at url to target using Powershell (which will validate
+    trust). Raise an exception if the command cannot complete.
+    """
+    target = os.path.abspath(target)
+    cmd = [
+        'powershell',
+        '-Command',
+        "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
+    ]
+    subprocess.check_call(cmd)
+
+download_file_powershell.viable = (
+    lambda: platform.name() == 'Windows' and platform.win32_ver()[1] >= '6'
+)
+
+def download_file_insecure(url, target):
+    """
+    Use Python to download the file, even though it cannot authenticate the
+    connection.
+    """
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    src = dst = None
+    try:
+        src = urlopen(url)
+        # Read/write all in one block, so we don't create a corrupt file
+        # if the download is interrupted.
+        data = src.read()
+        dst = open(target, "wb")
+        dst.write(data)
+    finally:
+        if src:
+            src.close()
+        if dst:
+            dst.close()
+
+download_file_insecure.viable = lambda: True
+
+def get_best_downloader():
+    downloaders = [
+        download_file_powershell,
+        #download_file_curl,
+        #download_file_wget,
+        download_file_insecure,
+    ]
+
+    for dl in downloaders:
+        if dl.viable():
+            return dl
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
@@ -154,28 +208,13 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     """
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
     tgz_name = "setuptools-%s.tar.gz" % version
     url = download_base + tgz_name
     saveto = os.path.join(to_dir, tgz_name)
-    src = dst = None
     if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            log.warn("Downloading %s", url)
-            src = urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = src.read()
-            dst = open(saveto, "wb")
-            dst.write(data)
-        finally:
-            if src:
-                src.close()
-            if dst:
-                dst.close()
+        log.warn("Downloading %s", url)
+        downloader = get_best_downloader()
+        downloader(url, saveto)
     return os.path.realpath(saveto)
 
 

From f051b3d36871ccd9f0f5fc770047c497f196547a Mon Sep 17 00:00:00 2001
From: Kai Hoppert <kai.hoppert@online.de>
Date: Sat, 10 Aug 2013 18:24:23 +0200
Subject: [PATCH 1451/8469] Added .pypirc authentication support for getting
 eggs

--HG--
extra : histedit_source : ebdc22b1f156f8af40265c5772addcfda6ae11d8
---
 setuptools/package_index.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9c9d76a186..ca228997d6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -6,6 +6,8 @@
 import socket
 import base64
 
+import ConfigParser
+
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     require, Environment, find_distributions, safe_name, safe_version,
@@ -918,6 +920,37 @@ def _encode_auth(auth):
     # strip the trailing carriage return
     return encoded.rstrip()
 
+class PyPirc:
+
+    def __init__(self):
+        """
+            Extract pypirc authentication information from home directory
+        """
+        self.dict_ = {}
+
+        if os.environ.has_key('HOME'):
+            rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if os.path.exists(rc):
+                config = ConfigParser.ConfigParser({
+                        'username' : '',
+                        'password' : '',
+                        'repository' : ''})
+                config.read(rc)
+
+                for section in config.sections():
+                    if config.get(section, 'repository').strip():
+                        value = '%s:%s'%(config.get(section, 'username').strip(),
+                                         config.get(section, 'password').strip())
+                        self.dict_[config.get(section, 'repository').strip()] = value
+                        
+    def __call__(self, url):
+        """ """
+        for base_url, auth in self.dict_.items():
+            if url.startswith(base_url):
+                return auth
+
+
+
 def open_with_auth(url, opener=urllib2.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
@@ -933,6 +966,10 @@ def open_with_auth(url, opener=urllib2.urlopen):
     else:
         auth = None
 
+    if not auth:
+        auth = PyPirc()(url)
+        log.info('Authentication found for URL: %s'%url)
+
     if auth:
         auth = "Basic " + _encode_auth(auth)
         new_url = urlunparse((scheme,host,path,params,query,frag))

From 87a0b2190cb40c18f5dd98e7842c197e17a452e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 12:35:20 -0400
Subject: [PATCH 1452/8469] Implemented curl support for bootstrapping.

---
 ez_setup.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 98d15f22b1..3b0862602e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -159,6 +159,20 @@ def download_file_powershell(url, target):
     lambda: platform.name() == 'Windows' and platform.win32_ver()[1] >= '6'
 )
 
+def download_file_curl(url, target):
+    cmd = ['curl %(url)r -o %(target)s']
+    subprocess.check_call(cmd)
+
+def has_curl():
+    cmd = ['curl --version']
+    try:
+        subprocess.check_call(cmd)
+    except:
+        return False
+    return True
+
+download_file_curl.viable = has_curl
+
 def download_file_insecure(url, target):
     """
     Use Python to download the file, even though it cannot authenticate the
@@ -187,7 +201,7 @@ def download_file_insecure(url, target):
 def get_best_downloader():
     downloaders = [
         download_file_powershell,
-        #download_file_curl,
+        download_file_curl,
         #download_file_wget,
         download_file_insecure,
     ]

From 6e757a7f0364d7a43ea2c2844b28690d30137661 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 12:43:23 -0400
Subject: [PATCH 1453/8469] Implemented download using wget

---
 ez_setup.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3b0862602e..3b41ab8bf3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -160,11 +160,11 @@ def download_file_powershell(url, target):
 )
 
 def download_file_curl(url, target):
-    cmd = ['curl %(url)r -o %(target)s']
+    cmd = ['curl', url, '-o', target]
     subprocess.check_call(cmd)
 
 def has_curl():
-    cmd = ['curl --version']
+    cmd = ['curl', '--version']
     try:
         subprocess.check_call(cmd)
     except:
@@ -173,6 +173,20 @@ def has_curl():
 
 download_file_curl.viable = has_curl
 
+def download_file_wget(url, target):
+    cmd = ['wget', url, '-q', '-O', target]
+    subprocess.check_call(cmd)
+
+def has_wget():
+    cmd = ['wget', '--version']
+    try:
+        subprocess.check_call(cmd)
+    except:
+        return False
+    return True
+
+download_file_curl.viable = has_wget
+
 def download_file_insecure(url, target):
     """
     Use Python to download the file, even though it cannot authenticate the
@@ -202,7 +216,7 @@ def get_best_downloader():
     downloaders = [
         download_file_powershell,
         download_file_curl,
-        #download_file_wget,
+        download_file_wget,
         download_file_insecure,
     ]
 

From 3f9eef3cde6b1a03d64535fa02dd4f1c5d8b2a08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 12:48:35 -0400
Subject: [PATCH 1454/8469] Use more explicit command-line parameters

---
 ez_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3b41ab8bf3..72d250a247 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -160,7 +160,7 @@ def download_file_powershell(url, target):
 )
 
 def download_file_curl(url, target):
-    cmd = ['curl', url, '-o', target]
+    cmd = ['curl', url, '--silent', '--output', target]
     subprocess.check_call(cmd)
 
 def has_curl():
@@ -174,7 +174,7 @@ def has_curl():
 download_file_curl.viable = has_curl
 
 def download_file_wget(url, target):
-    cmd = ['wget', url, '-q', '-O', target]
+    cmd = ['wget', url, '--quiet', '--output-document', target]
     subprocess.check_call(cmd)
 
 def has_wget():

From 8e7f9858be7f4869b4ff9d9b81fea2093086be3d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 13:09:56 -0400
Subject: [PATCH 1455/8469] Suppress output when checking viability of
 wget/curl. Fixed viability assignment and Windows platform detection.

---
 ez_setup.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 72d250a247..a9c9cbf07e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -156,7 +156,7 @@ def download_file_powershell(url, target):
     subprocess.check_call(cmd)
 
 download_file_powershell.viable = (
-    lambda: platform.name() == 'Windows' and platform.win32_ver()[1] >= '6'
+    lambda: platform.system() == 'Windows' and platform.win32_ver()[1] >= '6'
 )
 
 def download_file_curl(url, target):
@@ -165,10 +165,13 @@ def download_file_curl(url, target):
 
 def has_curl():
     cmd = ['curl', '--version']
+    devnull = open(os.path.devnull, 'wb')
     try:
-        subprocess.check_call(cmd)
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
     except:
         return False
+    finally:
+        devnull.close()
     return True
 
 download_file_curl.viable = has_curl
@@ -179,13 +182,16 @@ def download_file_wget(url, target):
 
 def has_wget():
     cmd = ['wget', '--version']
+    devnull = open(os.path.devnull, 'wb')
     try:
-        subprocess.check_call(cmd)
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
     except:
         return False
+    finally:
+        devnull.close()
     return True
 
-download_file_curl.viable = has_wget
+download_file_wget.viable = has_wget
 
 def download_file_insecure(url, target):
     """

From 38798cd5dcb8c5353d31ed0f882118067f09547f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 13:18:06 -0400
Subject: [PATCH 1456/8469] Restore Python 2.4 compatibility in ez_setup

---
 ez_setup.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index a9c9cbf07e..00cf47aa35 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,6 +36,15 @@ def _python_cmd(*args):
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 
+def _check_call_py24(cmd, *args, **kwargs):
+    res = subprocess.call(cmd, *args, **kwargs)
+    class CalledProcessError(Exception):
+        pass
+    if not res == 0:
+        msg = "Command '%s' return non-zero exit status %d" % (cmd, res)
+        raise CalledProcessError(msg)
+vars(subprocess).setdefault('check_call', _check_call_py24)
+
 def _install(tarball, install_args=()):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()

From ab7021eb36d66bbe00f711f31a5471af2bc73974 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 13:23:42 -0400
Subject: [PATCH 1457/8469] Updated changelog. Fixes #63.

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c45b793b79..a030c15151 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,10 @@ CHANGES
   be updated to account for this change.
 * Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
   normalized for cross-implementation consistency.
+* Issue #63: Bootstrap script (ez_setup.py) now prefers Powershell, curl, or
+  wget for retrieving the Setuptools tarball for improved security of the
+  install. The script will still fall back to a simple ``urlopen`` on
+  platforms that do not have these tools.
 
 -----
 0.9.8

From 6f6edeb7c7b1fb95b02f78ff3794c387afce084c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Aug 2013 13:29:00 -0400
Subject: [PATCH 1458/8469] Added tag 1.0b1 for changeset 7b91ff93a30e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 21e59929e2..b91a42d7ee 100644
--- a/.hgtags
+++ b/.hgtags
@@ -89,3 +89,4 @@ e3d70539e79f39a97f69674ab038661961a1eb43 0.8
 acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
 19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7
 e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
+7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1

From 8a33154bb30c9c0ca193d13d8b8ce3818e045d71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Aug 2013 08:24:29 -0400
Subject: [PATCH 1459/8469] Officially deprecated Features functionality (per
 #65).

---
 CHANGES.txt        |  1 +
 setuptools/dist.py | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a030c15151..50310ef2af 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,7 @@ CHANGES
   wget for retrieving the Setuptools tarball for improved security of the
   install. The script will still fall back to a simple ``urlopen`` on
   platforms that do not have these tools.
+* Issue #65: Deprecated the ``Features`` functionality.
 
 -----
 0.9.8
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0188921540..e9d0b5a2b4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -2,6 +2,7 @@
 
 import re
 import sys
+import warnings
 from distutils.core import Distribution as _Distribution
 from setuptools.depends import Require
 from setuptools.command.install import install
@@ -132,7 +133,7 @@ def check_packages(dist, attr, value):
                 "WARNING: %r not a valid package name; please use only"
                 ".-separated package names in setup.py", pkgname
             )
-            
+
 
 
 
@@ -194,7 +195,8 @@ class Distribution(_Distribution):
         EasyInstall and requests one of your extras, the corresponding
         additional requirements will be installed if needed.
 
-     'features' -- a dictionary mapping option names to 'setuptools.Feature'
+     'features' **deprecated** -- a dictionary mapping option names to
+        'setuptools.Feature'
         objects.  Features are a portion of the distribution that can be
         included or excluded based on user options, inter-feature dependencies,
         and availability on the current system.  Excluded features are omitted
@@ -252,6 +254,8 @@ def __init__ (self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
+        if 'features' in attrs or 'require_features' in attrs:
+            Feature.warn_deprecated()
         self.require_features = []
         self.features = {}
         self.dist_files = []
@@ -745,7 +749,13 @@ def handle_display_options(self, option_order):
 
 
 class Feature:
-    """A subset of the distribution that can be excluded if unneeded/wanted
+    """
+    **deprecated** -- The `Feature` facility was never completely implemented
+    or supported, `has reported issues
+    <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
+    a future version.
+
+    A subset of the distribution that can be excluded if unneeded/wanted
 
     Features are created using these keyword arguments:
 
@@ -794,9 +804,17 @@ class Feature:
     Aside from the methods, the only feature attributes that distributions look
     at are 'description' and 'optional'.
     """
+
+    @staticmethod
+    def warn_deprecated():
+        warnings.warn("Features are deprecated and will be removed in "
+            "a future version. See http://bitbucket.org/pypa/setuptools/65.",
+            DeprecationWarning)
+
     def __init__(self, description, standard=False, available=True,
         optional=True, require_features=(), remove=(), **extras
     ):
+        self.warn_deprecated()
 
         self.description = description
         self.standard = standard

From ebff930a7530b053c6d058d6213f2673331b350e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Aug 2013 08:44:47 -0400
Subject: [PATCH 1460/8469] Restored tunnel (proxy) support in SSL connections.
 Fixes #52.

---
 CHANGES.txt               | 2 ++
 setuptools/ssl_support.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 50310ef2af..be1061e97a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,8 @@ CHANGES
   install. The script will still fall back to a simple ``urlopen`` on
   platforms that do not have these tools.
 * Issue #65: Deprecated the ``Features`` functionality.
+* Issue #52: In ``VerifyingHTTPSConn``, handle a tunnelled (proxied)
+  connection.
 
 -----
 0.9.8
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index f8a780a95b..90359b2c51 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -194,6 +194,12 @@ def connect(self):
         sock = create_connection(
             (self.host, self.port), getattr(self,'source_address',None)
         )
+
+        # Handle the socket if a (proxy) tunnel is present
+        if hasattr(self, '_tunnel') and getattr(self, '_tunnel_host', None):
+            self.sock = sock
+            self._tunnel()
+
         self.sock = ssl.wrap_socket(
             sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
         )

From e621ce6f3099b83548cede7425a5af25b0f0ec8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Aug 2013 08:54:56 -0400
Subject: [PATCH 1461/8469] Fix TypeError when no attrs were passed

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index e9d0b5a2b4..9dbf04bad7 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -254,7 +254,8 @@ def __init__ (self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
-        if 'features' in attrs or 'require_features' in attrs:
+        _attrs_dict = attrs or {}
+        if 'features' in _attrs_dict or 'require_features' in _attrs_dict:
             Feature.warn_deprecated()
         self.require_features = []
         self.features = {}

From f9a347b122e96104599befa5c7d73ca1d74f4cd5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Aug 2013 08:57:35 -0400
Subject: [PATCH 1462/8469] Added tag 1.0b2 for changeset aba16323ec93

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b91a42d7ee..27fca8d483 100644
--- a/.hgtags
+++ b/.hgtags
@@ -90,3 +90,4 @@ acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
 19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7
 e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
 7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1
+aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2

From a64f2c39bc2e5d3382f2573a570a161a41499fa7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Aug 2013 09:18:52 -0400
Subject: [PATCH 1463/8469] Allow the test to fail on its own merits rather
 than failing with a not-so-useful message; removed Python 2.3 support.

---
 tests/manual_test.py | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 3eab99e1c7..e6489b1ced 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -1,31 +1,16 @@
 #!/usr/bin/env python
-import sys
-
-if sys.version_info[0] >= 3:
-    raise NotImplementedError('Py3 not supported in this test yet')
 
+import sys
 import os
 import shutil
 import tempfile
+import subprocess
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
 from setuptools.compat import urlopen
 
-try:
-    import subprocess
-    def _system_call(*args):
-        assert subprocess.call(args) == 0
-except ImportError:
-    # Python 2.3
-    def _system_call(*args):
-        # quoting arguments if windows
-        if sys.platform == 'win32':
-            def quote(arg):
-                if ' ' in arg:
-                    return '"%s"' % arg
-                return arg
-            args = [quote(arg) for arg in args]
-        assert os.system(' '.join(args)) == 0
+def _system_call(*args):
+    assert subprocess.call(args) == 0
 
 def tempdir(func):
     def _tempdir(*args, **kwargs):

From 561255d9c8572edf080614ca6d9e2176e903cef5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 18:00:33 -0400
Subject: [PATCH 1464/8469] Reorganize imports

---
 pkg_resources.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5514a09902..0e079242fd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,7 +13,14 @@
 method.
 """
 
-import sys, os, time, re, imp, types, zipfile, zipimport
+import sys
+import os
+import time
+import re
+import imp
+import types
+import zipfile
+import zipimport
 import warnings
 import stat
 try:

From 578adf060369c2b705559754ac584c48cb61e0d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 18:00:46 -0400
Subject: [PATCH 1465/8469] Remove unused import

---
 pkg_resources.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0e079242fd..c6f5708912 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -18,7 +18,6 @@
 import time
 import re
 import imp
-import types
 import zipfile
 import zipimport
 import warnings

From dc61ad53fcfa41cfc6d980b0114c9ea5d9daf2ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 18:11:50 -0400
Subject: [PATCH 1466/8469] Normalize whitespace

---
 pkg_resources.py | 332 +++++++----------------------------------------
 1 file changed, 48 insertions(+), 284 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index c6f5708912..0297601629 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -128,8 +128,6 @@ def _sset_object(key, ob, state):
 _sget_none = _sset_none = lambda *args: None
 
 
-
-
 def get_supported_platform():
     """Return this platform's maximum compatible version.
 
@@ -143,33 +141,14 @@ def get_supported_platform():
     If this condition occurs for any other platform with a version in its
     platform strings, this function should be extended accordingly.
     """
-    plat = get_build_platform(); m = macosVersionString.match(plat)
+    plat = get_build_platform()
+    m = macosVersionString.match(plat)
     if m is not None and sys.platform == "darwin":
         try:
             plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
         except ValueError:
             pass    # not Mac OS X
     return plat
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 __all__ = [
     # Basic resource access and distribution/entry point discovery
@@ -212,6 +191,7 @@ def get_supported_platform():
     # Deprecated/backward compatibility only
     'run_main', 'AvailableDistributions',
 ]
+
 class ResolutionError(Exception):
     """Abstract base for dependency resolution errors"""
     def __repr__(self):
@@ -228,7 +208,7 @@ class UnknownExtra(ResolutionError):
 _provider_factories = {}
 
 PY_MAJOR = sys.version[:3]
-EGG_DIST    = 3
+EGG_DIST = 3
 BINARY_DIST = 2
 SOURCE_DIST = 1
 CHECKOUT_DIST = 0
@@ -305,11 +285,6 @@ def get_build_platform():
 get_platform = get_build_platform   # XXX backward compat
 
 
-
-
-
-
-
 def compatible_platforms(provided,required):
     """Can code for the `provided` platform run on the `required` platform?
 
@@ -335,7 +310,7 @@ def compatible_platforms(provided,required):
                 dversion = int(provDarwin.group(1))
                 macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2))
                 if dversion == 7 and macosversion >= "10.3" or \
-                    dversion == 8 and macosversion >= "10.4":
+                        dversion == 8 and macosversion >= "10.4":
 
                     #import warnings
                     #warnings.warn("Mac eggs should be rebuilt to "
@@ -346,11 +321,9 @@ def compatible_platforms(provided,required):
 
         # are they the same major version and machine type?
         if provMac.group(1) != reqMac.group(1) or \
-            provMac.group(3) != reqMac.group(3):
+                provMac.group(3) != reqMac.group(3):
             return False
 
-
-
         # is the required OS major update >= the provided one?
         if int(provMac.group(2)) > int(reqMac.group(2)):
             return False
@@ -416,14 +389,6 @@ def run_script(script_name, namespace):
         """Execute the named script in the supplied namespace dictionary"""
 
 
-
-
-
-
-
-
-
-
 class IResourceProvider(IMetadataProvider):
     """An object that provides access to package resources"""
 
@@ -452,19 +417,6 @@ def resource_listdir(resource_name):
         """List of resource names in the directory (like ``os.listdir()``)"""
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 class WorkingSet(object):
     """A collection of active distributions on sys.path (or a similar list)"""
 
@@ -481,7 +433,6 @@ def __init__(self, entries=None):
         for entry in entries:
             self.add_entry(entry)
 
-
     def add_entry(self, entry):
         """Add a path item to ``.entries``, finding any distributions on it
 
@@ -497,15 +448,10 @@ def add_entry(self, entry):
         for dist in find_distributions(entry, True):
             self.add(dist, entry, False)
 
-
     def __contains__(self,dist):
         """True if `dist` is the active distribution for its project"""
         return self.by_key.get(dist.key) == dist
 
-
-
-
-
     def find(self, req):
         """Find a distribution matching requirement `req`
 
@@ -545,8 +491,6 @@ def run_script(self, requires, script_name):
         ns['__name__'] = name
         self.require(requires)[0].run_script(script_name, ns)
 
-
-
     def __iter__(self):
         """Yield distributions for non-duplicate projects in the working set
 
@@ -639,9 +583,8 @@ def resolve(self, requirements, env=None, installer=None):
 
         return to_activate    # return list of distros to activate
 
-    def find_plugins(self,
-        plugin_env, full_env=None, installer=None, fallback=True
-    ):
+    def find_plugins(self, plugin_env, full_env=None, installer=None,
+            fallback=True):
         """Find all activatable distributions in `plugin_env`
 
         Example usage::
@@ -718,10 +661,6 @@ def find_plugins(self,
 
         return distributions, error_info
 
-
-
-
-
     def require(self, *requirements):
         """Ensure that distributions matching `requirements` are activated
 
@@ -799,7 +738,7 @@ def can_add(self, dist):
         """
         return (self.python is None or dist.py_version is None
             or dist.py_version==self.python) \
-           and compatible_platforms(dist.platform,self.platform)
+            and compatible_platforms(dist.platform,self.platform)
 
     def remove(self, dist):
         """Remove `dist` from the environment"""
@@ -845,7 +784,6 @@ def add(self,dist):
                 if dist.key in self._cache:
                     _sort_dists(self._cache[dist.key])
 
-
     def best_match(self, req, working_set, installer=None):
         """Find distribution best matching `req` and usable on `working_set`
 
@@ -884,9 +822,6 @@ def __iter__(self):
         for key in self._distmap.keys():
             if self[key]: yield key
 
-
-
-
     def __iadd__(self, other):
         """In-place addition of a distribution or environment"""
         if isinstance(other,Distribution):
@@ -926,8 +861,6 @@ class ExtractionError(RuntimeError):
     """
 
 
-
-
 class ResourceManager:
     """Manage resource extraction and packages"""
     extraction_path = None
@@ -989,27 +922,13 @@ def extraction_error(self):
 Perhaps your account does not have write access to this directory?  You can
 change the cache directory by setting the PYTHON_EGG_CACHE environment
 variable to point to an accessible directory.
-"""         % (old_exc, cache_path)
+""" % (old_exc, cache_path)
         )
-        err.manager        = self
-        err.cache_path     = cache_path
+        err.manager = self
+        err.cache_path = cache_path
         err.original_error = old_exc
         raise err
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def get_cache_path(self, archive_name, names=()):
         """Return absolute location in cache for `archive_name` and `names`
 
@@ -1059,23 +978,6 @@ def _warn_unsafe_extraction_path(path):
                 "PYTHON_EGG_CACHE environment variable)." % path)
             warnings.warn(msg, UserWarning)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def postprocess(self, tempname, filename):
         """Perform any platform-specific postprocessing of `tempname`
 
@@ -1096,27 +998,6 @@ def postprocess(self, tempname, filename):
             mode = ((os.stat(tempname).st_mode) | 0x16D) & 0xFFF # 0555, 07777
             os.chmod(tempname, mode)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def set_extraction_path(self, path):
         """Set the base path where resources will be extracted to, if needed.
 
@@ -1156,8 +1037,6 @@ def cleanup_resources(self, force=False):
         """
         # XXX
 
-
-
 def get_default_cache():
     """Determine the default cache location
 
@@ -1233,13 +1112,6 @@ def to_filename(name):
     """
     return name.replace('-','_')
 
-
-
-
-
-
-
-
 _marker_names = {
     'os': ['name'], 'sys': ['platform'],
     'platform': ['version','machine','python_implementation'],
@@ -1311,7 +1183,9 @@ def evaluate_marker(text, extra=None, _ops={}):
     if not _ops:
 
         from token import NAME, STRING
-        import token, symbol, operator
+        import token
+        import symbol
+        import operator
 
         def and_test(nodelist):
             # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
@@ -1377,7 +1251,7 @@ def evaluate(nodelist):
         if kind==STRING:
             s = nodelist[1]
             if s[:1] not in "'\"" or s.startswith('"""') or s.startswith("'''") \
-            or '\\' in s:
+                    or '\\' in s:
                 raise SyntaxError(
                     "Only plain strings allowed in environment markers")
             return s[1:-1]
@@ -1456,7 +1330,6 @@ def resource_isdir(self,resource_name):
     def metadata_isdir(self,name):
         return self.egg_info and self._isdir(self._fn(self.egg_info,name))
 
-
     def resource_listdir(self,resource_name):
         return self._listdir(self._fn(self.module_path,resource_name))
 
@@ -1534,11 +1407,6 @@ def _setup_prefix(self):
             old = path
             path, base = os.path.split(path)
 
-
-
-
-
-
 class DefaultProvider(EggProvider):
     """Provides access to package resources in the filesystem"""
 
@@ -1571,9 +1439,9 @@ class EmptyProvider(NullProvider):
     """Provider that returns nothing for all requests"""
 
     _isdir = _has = lambda self,path: False
-    _get          = lambda self,path: ''
-    _listdir      = lambda self,path: []
-    module_path   = None
+    _get = lambda self,path: ''
+    _listdir = lambda self,path: []
+    module_path = None
 
     def __init__(self):
         pass
@@ -1774,28 +1642,6 @@ def _resource_to_zip(self,resource_name):
 register_loader_type(zipimport.zipimporter, ZipProvider)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class FileMetadata(EmptyProvider):
     """Metadata handler for standalone PKG-INFO files
 
@@ -1826,20 +1672,6 @@ def get_metadata_lines(self,name):
         return yield_lines(self.get_metadata(name))
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class PathMetadata(DefaultProvider):
     """Metadata provider for egg directories
 
@@ -1920,8 +1752,6 @@ def load_module(self, fullname):
         return mod
 
 
-
-
 def get_importer(path_item):
     """Retrieve a PEP 302 "importer" for the given path item
 
@@ -1959,10 +1789,6 @@ def get_importer(path_item):
     del ImpLoader, ImpImporter
 
 
-
-
-
-
 _declare_state('dict', _distribution_finders = {})
 
 def register_finder(importer_type, distribution_finder):
@@ -2186,12 +2012,12 @@ def yield_lines(strs):
 
 LINE_END = re.compile(r"\s*(#.*)?$").match         # whitespace and comment
 CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match    # line continuation
-DISTRO   = re.compile(r"\s*((\w|[-.])+)").match    # Distribution or extra
-VERSION  = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match  # ver. info
-COMMA    = re.compile(r"\s*,").match               # comma between items
+DISTRO = re.compile(r"\s*((\w|[-.])+)").match    # Distribution or extra
+VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match  # ver. info
+COMMA = re.compile(r"\s*,").match               # comma between items
 OBRACKET = re.compile(r"\s*\[").match
 CBRACKET = re.compile(r"\s*\]").match
-MODULE   = re.compile(r"\w+(\.\w+)*$").match
+MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
     r"(?P<name>[^-]+)"
     r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?",
@@ -2293,8 +2119,6 @@ def require(self, env=None, installer=None):
         list(map(working_set.add,
             working_set.resolve(self.dist.requires(self.extras),env,installer)))
 
-
-
     #@classmethod
     def parse(cls, src, dist=None):
         """Parse a single entry point from string `src`
@@ -2329,13 +2153,6 @@ def parse(cls, src, dist=None):
 
     parse = classmethod(parse)
 
-
-
-
-
-
-
-
     #@classmethod
     def parse_group(cls, group, lines, dist=None):
         """Parse an entry point group"""
@@ -2386,10 +2203,9 @@ class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
 
-    def __init__(self,
-        location=None, metadata=None, project_name=None, version=None,
-        py_version=PY_MAJOR, platform=None, precedence = EGG_DIST
-    ):
+    def __init__(self, location=None, metadata=None, project_name=None,
+            version=None, py_version=PY_MAJOR, platform=None,
+            precedence=EGG_DIST):
         self.project_name = safe_name(project_name or 'Unknown')
         if version is not None:
             self._version = safe_version(version)
@@ -2417,7 +2233,6 @@ def from_location(cls,location,basename,metadata=None,**kw):
         )
     from_location = classmethod(from_location)
 
-
     hashcmp = property(
         lambda self: (
             getattr(self,'parsed_version',()),
@@ -2483,9 +2298,6 @@ def version(self):
                 )
     version = property(version)
 
-
-
-
     #@property
     def _dep_map(self):
         try:
@@ -2525,8 +2337,6 @@ def _get_metadata(self,name):
             for line in self.get_metadata_lines(name):
                 yield line
 
-
-
     def activate(self,path=None):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None: path = sys.path
@@ -2535,7 +2345,6 @@ def activate(self,path=None):
             fixup_namespace_packages(self.location)
             list(map(declare_namespace, self._get_metadata('namespace_packages.txt')))
 
-
     def egg_name(self):
         """Return what this distribution's standard .egg filename should be"""
         filename = "%s-%s-py%s" % (
@@ -2565,9 +2374,6 @@ def __getattr__(self,attr):
             raise AttributeError(attr)
         return getattr(self._provider, attr)
 
-
-
-
     #@classmethod
     def from_filename(cls,filename,metadata=None, **kw):
         return cls.from_location(
@@ -2603,12 +2409,6 @@ def get_entry_info(self, group, name):
         """Return the EntryPoint object for `group`+`name`, or ``None``"""
         return self.get_entry_map(group).get(name)
 
-
-
-
-
-
-
     def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
@@ -2649,7 +2449,6 @@ def insert_on(self, path, loc = None):
 
         return
 
-
     def check_version_conflict(self):
         if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(
@@ -2658,8 +2457,7 @@ def check_version_conflict(self):
         loc = normalize_path(self.location)
         for modname in self._get_metadata('top_level.txt'):
             if (modname not in sys.modules or modname in nsp
-                or modname in _namespace_packages
-            ):
+                    or modname in _namespace_packages):
                 continue
             if modname in ('pkg_resources', 'setuptools', 'site'):
                 continue
@@ -2690,9 +2488,6 @@ def clone(self,**kw):
         kw.setdefault('metadata', self._provider)
         return self.__class__(**kw)
 
-
-
-
     #@property
     def extras(self):
         return [dep for dep in self._dep_map if dep]
@@ -2762,9 +2557,11 @@ def reqs_for_extra(extra):
         return dm
 
 
-_distributionImpl = {'.egg': Distribution,
-                     '.egg-info': Distribution,
-                     '.dist-info': DistInfoDistribution }
+_distributionImpl = {
+    '.egg': Distribution,
+    '.egg-info': Distribution,
+    '.dist-info': DistInfoDistribution,
+    }
 
 
 def issue_warning(*args,**kw):
@@ -2781,27 +2578,6 @@ def issue_warning(*args,**kw):
     warn(stacklevel = level+1, *args, **kw)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
@@ -2818,7 +2594,8 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
         while not TERMINATOR(line,p):
             if CONTINUE(line,p):
                 try:
-                    line = next(lines); p = 0
+                    line = next(lines)
+                    p = 0
                 except StopIteration:
                     raise ValueError(
                         "\\ must not appear on the last nonblank line"
@@ -2869,21 +2646,6 @@ def _sort_dists(dists):
     dists[::-1] = [d for hc,d in tmp]
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class Requirement:
     def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
@@ -2918,14 +2680,16 @@ def __contains__(self,item):
         compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1
         for parsed,trans,op,ver in self.index:
             action = trans[compare(item,parsed)] # Indexing: 0, 1, -1
-            if action=='F':     return False
-            elif action=='T':   return True
-            elif action=='+':   last = True
+            if action=='F':
+                return False
+            elif action=='T':
+                return True
+            elif action=='+':
+                last = True
             elif action=='-' or last is None:   last = False
         if last is None: last = True    # no rules encountered
         return last
 
-
     def __hash__(self):
         return self.__hash
 
@@ -2944,12 +2708,12 @@ def parse(s):
 
 state_machine = {
     #       =><
-    '<' :  '--T',
-    '<=':  'T-T',
-    '>' :  'F+F',
-    '>=':  'T+F',
-    '==':  'T..',
-    '!=':  'F++',
+    '<': '--T',
+    '<=': 'T-T',
+    '>': 'F+F',
+    '>=': 'T+F',
+    '==': 'T..',
+    '!=': 'F++',
 }
 
 
@@ -3047,5 +2811,5 @@ def _initialize(g):
 # all distributions added to the working set in the future (e.g. by
 # calling ``require()``) will get activated as well.
 add_activation_listener(lambda dist: dist.activate())
-working_set.entries=[]; list(map(working_set.add_entry,sys.path)) # match order
-
+working_set.entries=[]
+list(map(working_set.add_entry,sys.path)) # match order

From e78ad5671effbd18d7e5c2a803c462d54c401b35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 23:20:09 -0400
Subject: [PATCH 1467/8469] Remove -script scripts also

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6a45e59617..6322c9b6b9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1845,7 +1845,7 @@ def get_writer(cls):
     def _get_script_args(cls, type_, name, header, script_text):
         "For Windows, add a .py extension"
         ext = dict(console='.py', gui='.pyw')[type_]
-        old = ['.py', '.pyc', '.pyo', '.pyw', '.exe']
+        old = ['.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)
         blockers = [name+x for x in old]

From 78baec3378b60814b0062d4f89a9fe6bec41885a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 23:34:30 -0400
Subject: [PATCH 1468/8469] Use .pya extension instead of simply .py to avoid
 creating scripts that are importable as modules.

--HG--
extra : histedit_source : ef811b339d08652c845c5556fd7e2d0f38ee12df
---
 setuptools/command/easy_install.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6322c9b6b9..53f2e7cf3b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1844,8 +1844,8 @@ def get_writer(cls):
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         "For Windows, add a .py extension"
-        ext = dict(console='.py', gui='.pyw')[type_]
-        old = ['.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
+        ext = dict(console='.pya', gui='.pyw')[type_]
+        old = ['.pya', '.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)
         blockers = [name+x for x in old]

From 372be090c5acab13a5cc88893c50c09a7b7ec56e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2013 23:48:42 -0400
Subject: [PATCH 1469/8469] Warn when scripts are installed but PATHEXT isn't
 set

--HG--
extra : histedit_source : a1c329f92ee71a707955e352b63987af9de6e120
---
 setuptools/command/easy_install.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 53f2e7cf3b..a0171e3d23 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -23,6 +23,7 @@
 import random
 import platform
 import textwrap
+import warnings
 from glob import glob
 from distutils import log, dir_util
 
@@ -1845,6 +1846,9 @@ def get_writer(cls):
     def _get_script_args(cls, type_, name, header, script_text):
         "For Windows, add a .py extension"
         ext = dict(console='.pya', gui='.pyw')[type_]
+        if ext not in os.environ['PATHEXT'].lower().split(';'):
+            warnings.warn("%s not listed in PATHEXT; scripts will not be "
+                "recognized as executables." % ext, UserWarning)
         old = ['.pya', '.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)

From 38c43e388fe9aeff84388ff73447504353adc3f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Aug 2013 13:30:54 -0400
Subject: [PATCH 1470/8469] Fix template rendering error

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index febfdcd10c..8b88cd1d45 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1260,7 +1260,7 @@ def no_default_version_msg(self):
   https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again."""
-        return template % self.install_dir, os.environ.get('PYTHONPATH','')
+        return template % (self.install_dir, os.environ.get('PYTHONPATH',''))
 
     def install_site_py(self):
         """Make sure there's a site.py in the target dir, if needed"""

From 9ccb56080758c5056b5af308af8dec0ac2fe5568 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Aug 2013 13:33:53 -0400
Subject: [PATCH 1471/8469] Added tag 1.0b3 for changeset 8a98492f0d85

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 27fca8d483..35ccbea610 100644
--- a/.hgtags
+++ b/.hgtags
@@ -91,3 +91,4 @@ acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
 e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
 7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1
 aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
+8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3

From 25f13ea57a53b04866f1c3a0a961c951812bdb43 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Aug 2013 19:58:54 -0400
Subject: [PATCH 1472/8469] Set stacklevel on DeprecationWarning for more
 relevant locality.

---
 setuptools/dist.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 9dbf04bad7..5c84b8d4b9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -808,9 +808,12 @@ class Feature:
 
     @staticmethod
     def warn_deprecated():
-        warnings.warn("Features are deprecated and will be removed in "
-            "a future version. See http://bitbucket.org/pypa/setuptools/65.",
-            DeprecationWarning)
+        warnings.warn(
+            "Features are deprecated and will be removed in a future "
+                "version. See http://bitbucket.org/pypa/setuptools/65.",
+            DeprecationWarning,
+            stacklevel=3,
+        )
 
     def __init__(self, description, standard=False, available=True,
         optional=True, require_features=(), remove=(), **extras

From bb513b623c58b69cc7cf846c99c9e10762fa76c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 10:24:43 -0400
Subject: [PATCH 1473/8469] Updated changelog to highlight
 backward-incompatible changes

---
 CHANGES.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index be1061e97a..16160f7aab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,13 +13,6 @@ CHANGES
   the ``SETUPTOOLS_USE_PYLAUNCHER`` environment variable is set (to anything).
   In the future, this behavior may become default, but only after it has
   matured and seen substantial adoption.
-* Issue #50: Normalized API of environment marker support. Specifically,
-  removed line number and filename from SyntaxErrors when returned from
-  `pkg_resources.invalid_marker`. Any clients depending on the specific
-  string representation of exceptions returned by that function may need to
-  be updated to account for this change.
-* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
-  normalized for cross-implementation consistency.
 * Issue #63: Bootstrap script (ez_setup.py) now prefers Powershell, curl, or
   wget for retrieving the Setuptools tarball for improved security of the
   install. The script will still fall back to a simple ``urlopen`` on
@@ -28,6 +21,16 @@ CHANGES
 * Issue #52: In ``VerifyingHTTPSConn``, handle a tunnelled (proxied)
   connection.
 
+Backward-incompatible changes:
+
+* Issue #50: Normalized API of environment marker support. Specifically,
+  removed line number and filename from SyntaxErrors when returned from
+  `pkg_resources.invalid_marker`. Any clients depending on the specific
+  string representation of exceptions returned by that function may need to
+  be updated to account for this change.
+* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
+  normalized for cross-implementation consistency.
+
 -----
 0.9.8
 -----

From 3eb3c69afbe1d2ebbc98943a896ccbfc913113c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 10:28:20 -0400
Subject: [PATCH 1474/8469] Updated changelog once more to provide a
 re-assuring narrative about the backward-incompatible changes.

---
 CHANGES.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 16160f7aab..db9c637ce9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,7 +21,11 @@ CHANGES
 * Issue #52: In ``VerifyingHTTPSConn``, handle a tunnelled (proxied)
   connection.
 
-Backward-incompatible changes:
+Backward-Incompatible Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This release includes a couple of backward-incompatible changes, but most if
+not all users will find 1.0 a drop-in replacement for 0.9.
 
 * Issue #50: Normalized API of environment marker support. Specifically,
   removed line number and filename from SyntaxErrors when returned from

From 2473aa6da27cb95c1582aee1bb188f76e0deb258 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 10:44:18 -0400
Subject: [PATCH 1475/8469] Changed the launcher relevant environment variable
 to SETUPTOOLS_LAUNCHER and it now accepts different strings 'natural' and
 'executable', instead of only reflecting a boolean value.

---
 CHANGES.txt                        |  6 ++++--
 docs/easy_install.txt              |  8 +++++---
 setuptools/command/easy_install.py | 16 ++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index db9c637ce9..b2e2677035 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,9 +10,11 @@ CHANGES
   <https://bitbucket.org/pypa/pylauncher>`_ (included with Python 3.3) to
   launch console and GUI scripts and not install its own launcher
   executables. This experimental functionality is currently only enabled if
-  the ``SETUPTOOLS_USE_PYLAUNCHER`` environment variable is set (to anything).
+  the ``SETUPTOOLS_LAUNCHER`` environment variable is set to "natural".
   In the future, this behavior may become default, but only after it has
-  matured and seen substantial adoption.
+  matured and seen substantial adoption. The ``SETUPTOOLS_LAUNCHER`` also
+  accepts "executable" to force the default behavior of creating launcher
+  executables.
 * Issue #63: Bootstrap script (ez_setup.py) now prefers Powershell, curl, or
   wget for retrieving the Setuptools tarball for improved security of the
   install. The script will still fall back to a simple ``urlopen`` on
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 03f816de02..744b4967ae 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -98,12 +98,14 @@ can pass command line options (such as ``--script-dir``) to
 Setuptools also supports deferring to an external launcher such as
 `pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
 Enable this experimental functionality by setting the
-``SETUPTOOLS_USE_PYLAUNCHER`` environment variable. Setuptools will then not
+``SETUPTOOLS_LAUNCHER`` environment variable to "natural". Setuptools will
+then not
 install its own launcher executable, but will install scripts as simple
-scripts with a .py (or .pyw) extension appended. If these extensions are
+scripts with a .pya (or .pyw) extension appended. If these extensions are
 associated with the pylauncher and listed in the PATHEXT environment variable,
 these scripts can then be invoked simply and directly just like any other
-executable.
+executable. This behavior may become default in a future version. To force
+the use of executable launchers, set ``SETUPTOOLS_LAUNCHER`` to "executable".
 
 
 Downloading and Installing a Package
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index cf4402a5fd..19d6e49490 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1834,13 +1834,13 @@ def get_writer(cls):
         """
         Get a script writer suitable for Windows
         """
-        # for compatibility, return the writer that creates exe launchers
-        #  unless the SETUPTOOLS_USE_PYLAUNCHER is set, indicating
-        #  future behavior.
-        use_legacy = 'SETUPTOOLS_USE_PYLAUNCHER' not in os.environ
-        if use_legacy:
-            return WindowsLauncherScriptWriter
-        return cls
+        writer_lookup = dict(
+            executable=WindowsExecutableLauncherWriter,
+            natural=cls,
+        )
+        # for compatibility, use the executable launcher by default
+        launcher = os.environ.get('SETUPTOOLS_LAUNCHER', 'executable')
+        return writer_lookup[launcher]
 
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
@@ -1874,7 +1874,7 @@ def _adjust_header(type_, orig_header):
         return new_header
 
 
-class WindowsLauncherScriptWriter(WindowsScriptWriter):
+class WindowsExecutableLauncherWriter(WindowsScriptWriter):
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         """

From dcbb8ac6ad28f5cdc924ddf7482fa9b856b49681 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 12:13:20 -0400
Subject: [PATCH 1476/8469] Reorganized the documentation to cover the
 different launcher techniques.

---
 docs/easy_install.txt | 92 +++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 30 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 744b4967ae..cb05aaccc0 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -76,36 +76,10 @@ section on `Custom Installation Locations`_ for more details.
 Windows Notes
 ~~~~~~~~~~~~~
 
-On Windows, an ``easy_install.exe`` launcher will also be installed, so that
-you can just type ``easy_install`` as long as it's on your ``PATH``.  If typing
-``easy_install`` at the command prompt doesn't work, check to make sure your
-``PATH`` includes the appropriate ``C:\\Python2X\\Scripts`` directory.  On
-most current versions of Windows, you can change the ``PATH`` by right-clicking
-"My Computer", choosing "Properties" and selecting the "Advanced" tab, then
-clicking the "Environment Variables" button.  ``PATH`` will be in the "System
-Variables" section, and you will need to exit and restart your command shell
-(command.com, cmd.exe, bash, or other) for the change to take effect.  Be sure
-to add a ``;`` after the last item on ``PATH`` before adding the scripts
-directory to it.
-
-Note that instead of changing your ``PATH`` to include the Python scripts
-directory, you can also retarget the installation location for scripts so they
-go on a directory that's already on the ``PATH``.  For more information see the
-sections below on `Command-Line Options`_ and `Configuration Files`_.  You
-can pass command line options (such as ``--script-dir``) to
-``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
-
-Setuptools also supports deferring to an external launcher such as
-`pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
-Enable this experimental functionality by setting the
-``SETUPTOOLS_LAUNCHER`` environment variable to "natural". Setuptools will
-then not
-install its own launcher executable, but will install scripts as simple
-scripts with a .pya (or .pyw) extension appended. If these extensions are
-associated with the pylauncher and listed in the PATHEXT environment variable,
-these scripts can then be invoked simply and directly just like any other
-executable. This behavior may become default in a future version. To force
-the use of executable launchers, set ``SETUPTOOLS_LAUNCHER`` to "executable".
+Installing setuptools will provide an ``easy_install`` command according to
+the techniques described in `Executables and Launchers`_. If the
+``easy_install`` command is not available after installation, that section
+provides details on how to configure Windows to make the commands available.
 
 
 Downloading and Installing a Package
@@ -315,6 +289,64 @@ installations, so that Python won't lock us out of using anything but the most
 recently-installed version of the package.)
 
 
+Executables and Launchers
+-------------------------
+
+On Unix systems, scripts are installed with as natural files with a "#!"
+header and no extension and they launch under the Python version indicated in
+the header.
+
+On Windows, there is no mechanism to "execute" files without extensions, so
+EasyInstall provides two techniques to mirror the Unix behavior. The behavior
+is indicated by the SETUPTOOLS_LAUNCHER environment variable, which may be
+"executable" (default) or "natural".
+
+Regardless of the technique used, the script(s) will be installed to a Scripts
+directory (by default in the Python installation directory). It is recommended
+for EasyInstall that you ensure this directory is in the PATH environment
+variable. The easiest way to ensure the Scripts directory is in the PATH is
+to run ``Tools\Scripts\win_add2path.py`` from the Python directory (requires
+Python 2.6 or later).
+
+Note that instead of changing your ``PATH`` to include the Python scripts
+directory, you can also retarget the installation location for scripts so they
+go on a directory that's already on the ``PATH``.  For more information see
+`Command-Line Options`_ and `Configuration Files`_.  During installation,
+pass command line options (such as ``--script-dir``) to
+``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
+
+
+Windows Executable Launcher
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the "executable" launcher is used, EasyInstall will create a '.exe'
+launcher of the same name beside each installed script (including
+``easy_install`` itself). These small .exe files launch the script of the
+same name using the Python version indicated in the '#!' header.
+
+This behavior is currently default. To force
+the use of executable launchers, set ``SETUPTOOLS_LAUNCHER`` to "executable".
+
+Natural Script Launcher
+~~~~~~~~~~~~~~~~~~~~~~~
+
+EasyInstall also supports deferring to an external launcher such as
+`pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
+Enable this experimental functionality by setting the
+``SETUPTOOLS_LAUNCHER`` environment variable to "natural". EasyInstall will
+then install scripts as simple
+scripts with a .pya (or .pyw) extension appended. If these extensions are
+associated with the pylauncher and listed in the PATHEXT environment variable,
+these scripts can then be invoked simply and directly just like any other
+executable. This behavior may become default in a future version.
+
+EasyInstall uses the .pya extension instead of simply
+the typical '.py' extension. This distinct extension is necessary to prevent
+Python
+from treating the scripts as importable modules (where name conflicts exist).
+Current releases of pylauncher do not yet associate with .pya files by
+default, but future versions should do so.
+
 
 Tips & Techniques
 -----------------

From d1d7dc6411b95ca5908c9628b4d74079b774f458 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 14:22:10 -0400
Subject: [PATCH 1477/8469] Updated docs in Multiple Python Versions to
 reference supported Python versions.

---
 docs/easy_install.txt | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index cb05aaccc0..26001c75eb 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -351,20 +351,18 @@ default, but future versions should do so.
 Tips & Techniques
 -----------------
 
-
 Multiple Python Versions
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-As of version 0.6a11, EasyInstall installs itself under two names:
+EasyInstall installs itself under two names:
 ``easy_install`` and ``easy_install-N.N``, where ``N.N`` is the Python version
-used to install it.  Thus, if you install EasyInstall for both Python 2.3 and
-2.4, you can use the ``easy_install-2.3`` or ``easy_install-2.4`` scripts to
-install packages for Python 2.3 or 2.4, respectively.
-
-Also, if you're working with Python version 2.4 or higher, you can run Python
-with ``-m easy_install`` to run that particular Python version's
-``easy_install`` command.
+used to install it.  Thus, if you install EasyInstall for both Python 3.2 and
+2.7, you can use the ``easy_install-3.2`` or ``easy_install-2.7`` scripts to
+install packages for the respective Python version.
 
+Setuptools also supplies easy_install as a runnable module which may be
+invoked using ``python -m easy_install`` for any Python with Setuptools
+installed.
 
 Restricting Downloads with ``--allow-hosts``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From e282a1f42c47484c4fa52b8321c4ee367a150f2d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 14:45:02 -0400
Subject: [PATCH 1478/8469] Removed the --delete-conflicting and
 --ignore-conflicts-at-my-risk options, which have long been deprecated and
 indicated that they're not used.

---
 CHANGES.txt                        |  2 ++
 docs/easy_install.txt              | 29 ++------------------
 setuptools/command/easy_install.py | 44 +++---------------------------
 3 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b2e2677035..a075c3c8f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,8 @@ not all users will find 1.0 a drop-in replacement for 0.9.
   be updated to account for this change.
 * Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
   normalized for cross-implementation consistency.
+* Removed ``--ignore-conflicts-at-my-risk`` and ``--delete-conflicting``
+  options to easy_install. These options have been deprecated since 0.6a11.
 
 -----
 0.9.8
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 26001c75eb..42a5323d23 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -572,14 +572,12 @@ install``, becuase the ``distutils`` just install new packages on top of old
 ones, possibly combining two unrelated packages or leaving behind modules that
 have been deleted in the newer version of the package.)
 
-By default, EasyInstall will stop the installation if it detects a conflict
+EasyInstall will stop the installation if it detects a conflict
 between an existing, "unmanaged" package, and a module or package in any of
 the distributions you're installing.  It will display a list of all of the
 existing files and directories that would need to be deleted for the new
-package to be able to function correctly.  You can then either delete these
-conflicting files and directories yourself and re-run EasyInstall, or you can
-just use the ``--delete-conflicting`` or ``--ignore-conflicts-at-my-risk``
-options, as described under `Command-Line Options`_, below.
+package to be able to function correctly.  To proceed, you must manually
+delete these conflicting files and directories and re-run EasyInstall.
 
 Of course, once you've replaced all of your existing "unmanaged" packages with
 versions managed by EasyInstall, you won't have any more conflicts to worry
@@ -823,27 +821,6 @@ Command-Line Options
 
     Added in Distribute 0.6.11 and Setuptools 0.7.
 
-``--delete-conflicting, -D`` (Removed in 0.6a11)
-    (As of 0.6a11, this option is no longer necessary; please do not use it!)
-
-    If you are replacing a package that was previously installed *without*
-    using EasyInstall, the old version may end up on ``sys.path`` before the
-    version being installed with EasyInstall.  EasyInstall will normally abort
-    the installation of a package if it detects such a conflict, and ask you to
-    manually remove the conflicting files or directories.  If you specify this
-    option, however, EasyInstall will attempt to delete the files or
-    directories itself, and then proceed with the installation.
-
-``--ignore-conflicts-at-my-risk`` (Removed in 0.6a11)
-    (As of 0.6a11, this option is no longer necessary; please do not use it!)
-
-    Ignore conflicting packages and proceed with installation anyway, even
-    though it means the package probably won't work properly.  If the
-    conflicting package is in a directory you can't write to, this may be your
-    only option, but you will need to take more invasive measures to get the
-    installed package to work, like manually adding it to ``PYTHONPATH`` or to
-    ``sys.path`` at runtime.
-
 ``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
     Specifies the base URL of the Python Package Index.  The default is
     https://pypi.python.org/simple if not specified.  When a package is requested
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 19d6e49490..66dc798bda 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -125,9 +125,6 @@ class easy_install(Command):
         ("always-copy", "a", "Copy all needed packages to install dir"),
         ("index-url=", "i", "base URL of Python Package Index"),
         ("find-links=", "f", "additional URL(s) to search for packages"),
-        ("delete-conflicting", "D", "no longer needed; don't use this"),
-        ("ignore-conflicts-at-my-risk", None,
-            "no longer needed; don't use this"),
         ("build-directory=", "b",
             "download/extract/build in DIR; keep the results"),
         ('optimize=', 'O',
@@ -148,7 +145,7 @@ class easy_install(Command):
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
-        'delete-conflicting', 'ignore-conflicts-at-my-risk', 'editable',
+        'editable',
         'no-deps', 'local-snapshots-ok', 'version'
     ]
 
@@ -197,8 +194,6 @@ def initialize_options(self):
         # Options not specifiable via command line
         self.package_index = None
         self.pth_file = self.always_copy_from = None
-        self.delete_conflicting = None
-        self.ignore_conflicts_at_my_risk = None
         self.site_dirs = None
         self.installed_projects = {}
         self.sitepy_installed = False
@@ -342,11 +337,6 @@ def finalize_options(self):
             except ValueError:
                 raise DistutilsOptionError("--optimize must be 0, 1, or 2")
 
-        if self.delete_conflicting and self.ignore_conflicts_at_my_risk:
-            raise DistutilsOptionError(
-                "Can't use both --delete-conflicting and "
-                "--ignore-conflicts-at-my-risk at the same time"
-            )
         if self.editable and not self.build_directory:
             raise DistutilsArgError(
                 "Must specify a build directory (-b) when using --editable"
@@ -411,12 +401,7 @@ def pseudo_tempname(self):
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
     def warn_deprecated_options(self):
-        if self.delete_conflicting or self.ignore_conflicts_at_my_risk:
-            log.warn(
-                "Note: The -D, --delete-conflicting and"
-                " --ignore-conflicts-at-my-risk no longer have any purpose"
-                " and should not be used."
-            )
+        pass
 
     def check_site_dir(self):
         """Verify that self.install_dir is .pth-capable dir, if needed"""
@@ -1005,10 +990,6 @@ def check_conflicts(self, dist):
         return dist
 
     def found_conflicts(self, dist, blockers):
-        if self.delete_conflicting:
-            log.warn("Attempting to delete conflicting packages:")
-            return self.delete_blockers(blockers)
-
         msg = """\
 -------------------------------------------------------------------------
 CONFLICT WARNING:
@@ -1021,29 +1002,12 @@ def found_conflicts(self, dist, blockers):
 
    %s
 
+-------------------------------------------------------------------------
 """ % '\n   '.join(blockers)
 
-        if self.ignore_conflicts_at_my_risk:
-            msg += """\
-(Note: you can run EasyInstall on '%s' with the
---delete-conflicting option to attempt deletion of the above files
-and/or directories.)
-""" % dist.project_name
-        else:
-            msg += """\
-Note: you can attempt this installation again with EasyInstall, and use
-either the --delete-conflicting (-D) option or the
---ignore-conflicts-at-my-risk option, to either delete the above files
-and directories, or to ignore the conflicts, respectively.  Note that if
-you ignore the conflicts, the installed package(s) may not work.
-"""
-        msg += """\
--------------------------------------------------------------------------
-"""
         sys.stderr.write(msg)
         sys.stderr.flush()
-        if not self.ignore_conflicts_at_my_risk:
-            raise DistutilsError("Installation aborted due to conflicts")
+        raise DistutilsError("Installation aborted due to conflicts")
 
     def installation_report(self, req, dist, what="Installed"):
         """Helpful installation message for display to package users"""

From 6af26d45169f1632beb50f3071155c0bfd0d5b38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:28:07 -0400
Subject: [PATCH 1479/8469] Added tag 1.0 for changeset c385fdf1f976

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 35ccbea610..96735c09b3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -92,3 +92,4 @@ e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
 7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1
 aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
 8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3
+c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0

From 16e24b7f483babb855aaeb62f72d63b7315fe33d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:28:27 -0400
Subject: [PATCH 1480/8469] Bumped to 1.1 in preparation for next release.

---
 ez_setup.py                          |   2 +-
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools.egg-info/requires.txt     |   8 +-
 setuptools/version.py                |   2 +-
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 00cf47aa35..3d835d3a1d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.0"
+DEFAULT_VERSION = "1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index ba887a084a..df9b9c2d76 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-entry_points.txt = setuptools.command.egg_info:write_entries
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-namespace_packages = setuptools.dist:check_nsp
-convert_2to3_doctests = setuptools.dist:assert_string_list
-
-[distutils.commands]
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-
+[distutils.commands]
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+setopt = setuptools.command.setopt:setopt
+register = setuptools.command.register:register
+easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
+sdist = setuptools.command.sdist:sdist
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+egg_info = setuptools.command.egg_info:egg_info
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_py = setuptools.command.build_py:build_py
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_lib = setuptools.command.install_lib:install_lib
+develop = setuptools.command.develop:develop
+rotate = setuptools.command.rotate:rotate
+build_ext = setuptools.command.build_ext:build_ext
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+saveopts = setuptools.command.saveopts:saveopts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+
+[distutils.setup_keywords]
+tests_require = setuptools.dist:check_requirements
+install_requires = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+dependency_links = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+use_2to3 = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+entry_points = setuptools.dist:check_entry_points
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+entry_points.txt = setuptools.command.egg_info:write_entries
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 5de4d6e7c8..c06a8a0b3e 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,8 +1,5 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
@@ -10,4 +7,7 @@ wincertstore==0.1
 ctypes==1.0.2
 
 [ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ssl==1.16
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 7e49527e38..439eb0cd22 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.0'
+__version__ = '1.1'

From 3ce0aff78df0d02864946a34a622dd08d7a29c5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:44:47 -0400
Subject: [PATCH 1481/8469] Use jaraco.packaging 2.0 to invoke pushing the
 bookmark as a separate operation from pushing the other changesets.

---
 release.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index c2b331c712..221d8a6765 100644
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@
 
 import pkg_resources
 
-pkg_resources.require('jaraco.packaging>=1.1')
+pkg_resources.require('jaraco.packaging>=2.0')
 
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
@@ -24,7 +24,15 @@ def before_upload():
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
 # override the push command to include the bootstrap bookmark.
-push_command = ['hg', 'push', '-B', 'bootstrap']
+def after_push():
+    """
+    Push the bootstrap bookmark
+    """
+    push_command = ['hg', 'push', '-B', 'bootstrap']
+    # don't use check_call here because mercurial will return a non-zero
+    # code even if it succeeds at pushing the bookmark (because there are
+    # no changesets to be pushed). !dm mercurial
+    subprocess.call(push_command)
 
 link_patterns = [
     r"(Issue )?#(?P<issue>\d+)",

From 271dfce00c557029b348a170c9eab15e9f3a430b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:46:35 -0400
Subject: [PATCH 1482/8469] Refactor for clarity

---
 release.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/release.py b/release.py
index 221d8a6765..4c9df8ccdf 100644
--- a/release.py
+++ b/release.py
@@ -15,6 +15,9 @@ def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
     _add_bootstrap_bookmark()
 
+def after_push():
+    _push_bootstrap_bookmark()
+
 files_with_versions = (
     'ez_setup.py', 'setuptools/version.py',
 )
@@ -23,17 +26,6 @@ def before_upload():
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
-# override the push command to include the bootstrap bookmark.
-def after_push():
-    """
-    Push the bootstrap bookmark
-    """
-    push_command = ['hg', 'push', '-B', 'bootstrap']
-    # don't use check_call here because mercurial will return a non-zero
-    # code even if it succeeds at pushing the bookmark (because there are
-    # no changesets to be pushed). !dm mercurial
-    subprocess.call(push_command)
-
 link_patterns = [
     r"(Issue )?#(?P<issue>\d+)",
     r"Distribute #(?P<distribute>\d+)",
@@ -73,3 +65,13 @@ def replacer(match):
 def _add_bootstrap_bookmark():
     cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f']
     subprocess.Popen(cmd)
+
+def _push_bootstrap_bookmark():
+    """
+    Push the bootstrap bookmark
+    """
+    push_command = ['hg', 'push', '-B', 'bootstrap']
+    # don't use check_call here because mercurial will return a non-zero
+    # code even if it succeeds at pushing the bookmark (because there are
+    # no changesets to be pushed). !dm mercurial
+    subprocess.call(push_command)

From de71398660ecb616b5285334fa7c9fc10610126c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:48:00 -0400
Subject: [PATCH 1483/8469] Encapsulate bootstrap bookmark functionality

---
 release.py | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/release.py b/release.py
index 4c9df8ccdf..edf6f4be75 100644
--- a/release.py
+++ b/release.py
@@ -13,10 +13,10 @@
 
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
-    _add_bootstrap_bookmark()
+    BootstrapBookmark.add()
 
 def after_push():
-    _push_bootstrap_bookmark()
+    BootstrapBookmark.push()
 
 files_with_versions = (
     'ez_setup.py', 'setuptools/version.py',
@@ -61,17 +61,19 @@ def replacer(match):
             url = issue_urls[key].format(**match_dict)
             return "`{text} <{url}>`_".format(text=text, url=url)
 
-
-def _add_bootstrap_bookmark():
-    cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f']
-    subprocess.Popen(cmd)
-
-def _push_bootstrap_bookmark():
-    """
-    Push the bootstrap bookmark
-    """
-    push_command = ['hg', 'push', '-B', 'bootstrap']
-    # don't use check_call here because mercurial will return a non-zero
-    # code even if it succeeds at pushing the bookmark (because there are
-    # no changesets to be pushed). !dm mercurial
-    subprocess.call(push_command)
+class BootstrapBookmark:
+    @staticmethod
+    def add():
+        cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f']
+        subprocess.Popen(cmd)
+
+    @staticmethod
+    def push():
+        """
+        Push the bootstrap bookmark
+        """
+        push_command = ['hg', 'push', '-B', 'bootstrap']
+        # don't use check_call here because mercurial will return a non-zero
+        # code even if it succeeds at pushing the bookmark (because there are
+        # no changesets to be pushed). !dm mercurial
+        subprocess.call(push_command)

From d3eaf21c8918ce65bde30893b00adf18cf2f3a70 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 15:48:59 -0400
Subject: [PATCH 1484/8469] Extract bookmark name into the class

---
 release.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/release.py b/release.py
index edf6f4be75..85d8f86fd8 100644
--- a/release.py
+++ b/release.py
@@ -62,17 +62,19 @@ def replacer(match):
             return "`{text} <{url}>`_".format(text=text, url=url)
 
 class BootstrapBookmark:
-    @staticmethod
-    def add():
-        cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f']
+    name = 'bootstrap'
+
+    @classmethod
+    def add(cls):
+        cmd = ['hg', 'bookmark', '-i', cls.name, '-f']
         subprocess.Popen(cmd)
 
-    @staticmethod
-    def push():
+    @classmethod
+    def push(cls):
         """
         Push the bootstrap bookmark
         """
-        push_command = ['hg', 'push', '-B', 'bootstrap']
+        push_command = ['hg', 'push', '-B', cls.name]
         # don't use check_call here because mercurial will return a non-zero
         # code even if it succeeds at pushing the bookmark (because there are
         # no changesets to be pushed). !dm mercurial

From b7bff0cdb501916d9f99edcd5e9d453066f982a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 16:42:00 -0400
Subject: [PATCH 1485/8469] Remove linked changes file after upload and push

---
 release.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release.py b/release.py
index 85d8f86fd8..15f71a2d69 100644
--- a/release.py
+++ b/release.py
@@ -11,11 +11,14 @@
 
 pkg_resources.require('jaraco.packaging>=2.0')
 
+
 def before_upload():
     _linkify('CHANGES.txt', 'CHANGES (links).txt')
     BootstrapBookmark.add()
 
+
 def after_push():
+    os.remove('CHANGES (links).txt')
     BootstrapBookmark.push()
 
 files_with_versions = (

From cc220f8f36d5b873e377329906dbd1a7d1f99833 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Aug 2013 16:55:20 -0400
Subject: [PATCH 1486/8469] Corrected title formatting and hyperlink to correct
 Sphinx errors

---
 CHANGES.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a075c3c8f7..9f1d15b302 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,7 +24,7 @@ CHANGES
   connection.
 
 Backward-Incompatible Changes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=============================
 
 This release includes a couple of backward-incompatible changes, but most if
 not all users will find 1.0 a drop-in replacement for 0.9.
@@ -1162,8 +1162,9 @@ easy_install
 
  * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
    metadata writers using entry points, so that they can be extended by
-   third-party packages.  See `Creating distutils Extensions`_ above for more
-   details.
+   third-party packages.  See `Creating distutils Extensions
+   <http://pythonhosted.org/setuptools/setuptools.html#creating-distutils-extensions>`_
+   for more details.
 
  * The vestigial ``depends`` command has been removed.  It was never finished
    or documented, and never would have worked without EasyInstall - which it

From a72b003bd4caedb79e8e1d2c168fd8b5f111b5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne@mayonnaise.net>
Date: Sun, 18 Aug 2013 21:03:04 +0200
Subject: [PATCH 1487/8469] Fix spelling

---
 docs/using.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using.txt b/docs/using.txt
index 6f93c3867c..e44847d642 100644
--- a/docs/using.txt
+++ b/docs/using.txt
@@ -4,7 +4,7 @@ Using Setuptools in your project
 
 To use Setuptools in your project, the recommended way is to ship
 `ez_setup.py` alongside your `setup.py` script and call
-it at the very begining of `setup.py` like this::
+it at the very beginning of `setup.py` like this::
 
     from ez_setup import use_setuptools
     use_setuptools()

From c8d8126ffba6a9201b293fab0c8b0fc6346c129b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 19 Aug 2013 09:59:04 -0400
Subject: [PATCH 1488/8469] Powershell isn't installed by default on Windows
 Server 2008. Also it's possible that Powershell is present on older systems.
 Now use direct detection of a Powershell executable to determine viability of
 that technique for a downloader. Fixes #67.

---
 ez_setup.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 00cf47aa35..837ef3f347 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -164,9 +164,20 @@ def download_file_powershell(url, target):
     ]
     subprocess.check_call(cmd)
 
-download_file_powershell.viable = (
-    lambda: platform.system() == 'Windows' and platform.win32_ver()[1] >= '6'
-)
+def has_powershell():
+    if platform.system() != 'Windows':
+        return False
+    cmd = ['powershell', '-Command', 'echo test']
+    devnull = open(os.path.devnull, 'wb')
+    try:
+        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+    except:
+        return False
+    finally:
+        devnull.close()
+    return True
+
+download_file_powershell.viable = has_powershell
 
 def download_file_curl(url, target):
     cmd = ['curl', url, '--silent', '--output', target]

From b72b9d1d538f200a3531903c6cd7a1bf7e3e22bd Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 25 Aug 2013 20:56:46 +1000
Subject: [PATCH 1489/8469] Document __main__.__requires__

Also modernises the initial overview for pkg_resources, and helps
make it clear that it covers anything with an egg-info directory,
not just egg files.

--HG--
branch : docs_update_for_requires
---
 docs/pkg_resources.txt | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 480f9547ce..b2166b546a 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -18,19 +18,16 @@ packages.
 Overview
 --------
 
-Eggs are a distribution format for Python modules, similar in concept to Java's
-"jars" or Ruby's "gems".  They differ from previous Python distribution formats
-in that they are importable (i.e. they can be added to ``sys.path``), and they
-are *discoverable*, meaning that they carry metadata that unambiguously
-identifies their contents and dependencies, and thus can be *automatically*
-found and added to ``sys.path`` in response to simple requests of the form,
-"get me everything I need to use docutils' PDF support".
-
 The ``pkg_resources`` module provides runtime facilities for finding,
-introspecting, activating and using eggs and other "pluggable" distribution
-formats.  Because these are new concepts in Python (and not that well-
-established in other languages either), it helps to have a few special terms
-for talking about eggs and how they can be used:
+introspecting, activating and using installed Python distributions. Some
+of the more advanced features (notably the support for parallel installation
+of multiple versions) rely specifically on the "egg" format (either as a
+zip archive or subdirectory), while others (such as plugin discovery) will
+work correctly so long as "egg-info" metadata directories are available for
+relevant distributions.
+
+The following terms are needed in order to explain the capabilities offered
+by this module:
 
 project
     A library, framework, script, plugin, application, or collection of data
@@ -79,9 +76,13 @@ eggs
     with ``.egg`` and follows the egg naming conventions, and contain an
     ``EGG-INFO`` subdirectory (zipped or otherwise).  Development eggs are
     normal directories of Python code with one or more ``ProjectName.egg-info``
-    subdirectories.  And egg links are ``*.egg-link`` files that contain the
-    name of a built or development egg, to support symbolic linking on
-    platforms that do not have native symbolic links.
+    subdirectories. The development egg format is also used to provide a
+    default version of a distribution that is available to software that
+    doesn't use ``pkg_resources`` to request specific versions. Egg links
+    are ``*.egg-link`` files that contain the name of a built or
+    development egg, to support symbolic linking on platforms that do not
+    have native symbolic links (or where the symbolic link support is
+    limited).
 
 (For more information about these terms and concepts, see also this
 `architectural overview`_ of ``pkg_resources`` and Python Eggs in general.)
@@ -190,6 +191,17 @@ not provide any way to detect arbitrary changes to a list object like
     is designed so that the ``working_set`` is used by default, such that you
     don't have to explicitly refer to it most of the time.
 
+All distributions available directly on ``sys.path`` will be activated
+automatically when ``pkg_resources`` is imported. This behaviour can cause
+version conflicts for applications which require non-default versions of
+those distributions. To handle this situation, ``pkg_resources`` checks for a
+``__requires__`` attribute in the ``__main__`` module when initializing the
+default working set, and uses this to ensure a suitable version of each
+affected distribution is activated. For example::
+
+    __requires__ = ["CherryPy < 3"] # Must be set before pkg_resources import
+    import pkg_resources
+
 
 Basic ``WorkingSet`` Methods
 ----------------------------

From 0c3e350abfd455c6bf2678308cc26bef015b8d48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 14:39:24 -0400
Subject: [PATCH 1490/8469] Reorganize imports

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 5c84b8d4b9..dfce015daf 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,18 +1,23 @@
 __all__ = ['Distribution']
 
 import re
+import os
 import sys
 import warnings
+import distutils.log
+import distutils.core
+import distutils.cmd
 from distutils.core import Distribution as _Distribution
+from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
+    DistutilsSetupError)
+
 from setuptools.depends import Require
 from setuptools.command.install import install
 from setuptools.command.sdist import sdist
 from setuptools.command.install_lib import install_lib
 from setuptools.compat import numeric_types, basestring
-from distutils.errors import DistutilsOptionError, DistutilsPlatformError
-from distutils.errors import DistutilsSetupError
-import setuptools, pkg_resources, distutils.core, distutils.dist, distutils.cmd
-import os, distutils.log
+import setuptools
+import pkg_resources
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded

From aece98c7d09ab1107ad77d2d4bfbec8d91fca127 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 14:40:08 -0400
Subject: [PATCH 1491/8469] Remove unused imports

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index dfce015daf..c90f73c2cb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -12,11 +12,7 @@
     DistutilsSetupError)
 
 from setuptools.depends import Require
-from setuptools.command.install import install
-from setuptools.command.sdist import sdist
-from setuptools.command.install_lib import install_lib
 from setuptools.compat import numeric_types, basestring
-import setuptools
 import pkg_resources
 
 def _get_unpatched(cls):

From 2ec8add337856baa2fba48b161ef380d5d007a02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 14:42:33 -0400
Subject: [PATCH 1492/8469] Trim excess whitespace

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c90f73c2cb..c5b02f99f4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -136,38 +136,6 @@ def check_packages(dist, attr, value):
             )
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class Distribution(_Distribution):
     """Distribution with support for features, tests, and package data
 
@@ -251,7 +219,7 @@ def patch_missing_pkg_info(self, attrs):
             dist._version = pkg_resources.safe_version(str(attrs['version']))
             self._patched_dist = dist
 
-    def __init__ (self, attrs=None):
+    def __init__(self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
@@ -368,23 +336,6 @@ def _set_global_opts_from_features(self):
         self.global_options = self.feature_options = go + self.global_options
         self.negative_opt = self.feature_negopt = no
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def _finalize_features(self):
         """Add/remove features and resolve dependencies between them"""
 
@@ -402,7 +353,6 @@ def _finalize_features(self):
                 feature.exclude_from(self)
                 self._set_feature(name,0)
 
-
     def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
@@ -422,10 +372,6 @@ def print_commands(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
-
-
-
-
     def _set_feature(self,name,status):
         """Set feature's inclusion status"""
         setattr(self,self._feature_attrname(name),status)
@@ -440,8 +386,8 @@ def include_feature(self,name):
         if self.feature_is_included(name)==0:
             descr = self.features[name].description
             raise DistutilsOptionError(
-               descr + " is required, but was excluded or is not available"
-           )
+                descr + " is required, but was excluded or is not available"
+            )
         self.features[name].include_in(self)
         self._set_feature(name,1)
 
@@ -489,7 +435,6 @@ def exclude_package(self,package):
                     if p.name != package and not p.name.startswith(pfx)
             ]
 
-
     def has_contents_for(self,package):
         """Return true if 'exclude_package(package)' would do something"""
 
@@ -499,15 +444,6 @@ def has_contents_for(self,package):
             if p==package or p.startswith(pfx):
                 return True
 
-
-
-
-
-
-
-
-
-
     def _exclude_misc(self,name,value):
         """Handle 'exclude()' for list/tuple attrs without a special handler"""
         if not isinstance(value,sequence):
@@ -579,17 +515,6 @@ def _exclude_packages(self,packages):
             )
         list(map(self.exclude_package, packages))
 
-
-
-
-
-
-
-
-
-
-
-
     def _parse_command_opts(self, parser, args):
         # Remove --with-X/--without-X options when processing command args
         self.global_options = self.__class__.global_options
@@ -616,21 +541,6 @@ def _parse_command_opts(self, parser, args):
 
         return nargs
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def get_cmdline_options(self):
         """Return a '{cmd: {opt:val}}' map of all command-line options
 
@@ -671,7 +581,6 @@ def get_cmdline_options(self):
 
         return d
 
-
     def iter_distribution_names(self):
         """Yield all packages, modules, and extension names in distribution"""
 
@@ -690,7 +599,6 @@ def iter_distribution_names(self):
                 name = name[:-6]
             yield name
 
-
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
         (--help-commands or the metadata display options) on the command
@@ -732,24 +640,6 @@ def handle_display_options(self, option_order):
     module.Distribution = Distribution
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class Feature:
     """
     **deprecated** -- The `Feature` facility was never completely implemented
@@ -817,8 +707,7 @@ def warn_deprecated():
         )
 
     def __init__(self, description, standard=False, available=True,
-        optional=True, require_features=(), remove=(), **extras
-    ):
+            optional=True, require_features=(), remove=(), **extras):
         self.warn_deprecated()
 
         self.description = description
@@ -870,8 +759,6 @@ def include_in(self,dist):
         for f in self.require_features:
             dist.include_feature(f)
 
-
-
     def exclude_from(self,dist):
 
         """Ensure feature is excluded from distribution
@@ -888,8 +775,6 @@ def exclude_from(self,dist):
             for item in self.remove:
                 dist.exclude_package(item)
 
-
-
     def validate(self,dist):
 
         """Verify that feature makes sense in context of distribution
@@ -909,7 +794,3 @@ def validate(self,dist):
                     " doesn't contain any packages or modules under %s"
                     % (self.description, item, item)
                 )
-
-
-
-

From 4041d1f4667aa4bd7f7373ff7cc626b0d9f5d10c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 21:22:34 -0400
Subject: [PATCH 1493/8469] Updated error message reported when `--allow-hosts`
 blocks a link to provide a less startling user experience. Fixes #71.

---
 CHANGES.txt                 | 7 +++++++
 setuptools/package_index.py | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9f1d15b302..b95b71027a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+1.1
+---
+
+* Issue #71 (Distribute Issue #333): EasyInstall now puts less emphasis on the
+  condition when a host is blocked via ``--allow-hosts``.
+
 ---
 1.0
 ---
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9c9d76a186..d949063eda 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -343,7 +343,8 @@ def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
         if (s and s.group(1).lower()=='file') or self.allows(urlparse(url)[1]):
             return True
-        msg = "\nLink to % s ***BLOCKED*** by --allow-hosts\n"
+        msg = ("\nNote: Bypassing %s (disallowed host; see "
+            "http://bit.ly/1dg9ijs for details).\n")
         if fatal:
             raise DistutilsError(msg % url)
         else:

From 57e2b3119270044162edf4263b4ec7ea1e2adca9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 21:27:33 -0400
Subject: [PATCH 1494/8469] Updated changelog entry to reference the pertinent
 issue.

---
 CHANGES.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b95b71027a..70c0ffd6f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,14 +13,14 @@ CHANGES
 1.0
 ---
 
-* On Windows, Setuptools supports deferring to Vinay Sajip's `pylauncher
-  <https://bitbucket.org/pypa/pylauncher>`_ (included with Python 3.3) to
-  launch console and GUI scripts and not install its own launcher
-  executables. This experimental functionality is currently only enabled if
-  the ``SETUPTOOLS_LAUNCHER`` environment variable is set to "natural".
-  In the future, this behavior may become default, but only after it has
-  matured and seen substantial adoption. The ``SETUPTOOLS_LAUNCHER`` also
-  accepts "executable" to force the default behavior of creating launcher
+* Issue #60: On Windows, Setuptools supports deferring to another launcher,
+  such as Vinay Sajip's `pylauncher <https://bitbucket.org/pypa/pylauncher>`_
+  (included with Python 3.3) to launch console and GUI scripts and not install
+  its own launcher executables. This experimental functionality is currently
+  only enabled if  the ``SETUPTOOLS_LAUNCHER`` environment variable is set to
+  "natural". In the future, this behavior may become default, but only after
+  it has matured and seen substantial adoption. The ``SETUPTOOLS_LAUNCHER``
+  also accepts "executable" to force the default behavior of creating launcher
   executables.
 * Issue #63: Bootstrap script (ez_setup.py) now prefers Powershell, curl, or
   wget for retrieving the Setuptools tarball for improved security of the

From ae675b923b2079bad5d2bba83502cefc83a1edc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Aug 2013 21:27:34 -0400
Subject: [PATCH 1495/8469] Nest try/except/finally for use on Python 2.4.
 Fixes #72.

---
 CHANGES.txt |  1 +
 ez_setup.py | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 70c0ffd6f6..3e2caeb0ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Issue #71 (Distribute Issue #333): EasyInstall now puts less emphasis on the
   condition when a host is blocked via ``--allow-hosts``.
+* Issue #72: Restored Python 2.4 compatibility in ``ez_setup.py``.
 
 ---
 1.0
diff --git a/ez_setup.py b/ez_setup.py
index 40db5a577f..7a597d2226 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -170,9 +170,10 @@ def has_powershell():
     cmd = ['powershell', '-Command', 'echo test']
     devnull = open(os.path.devnull, 'wb')
     try:
-        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-    except:
-        return False
+        try:
+            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+        except:
+            return False
     finally:
         devnull.close()
     return True
@@ -187,9 +188,10 @@ def has_curl():
     cmd = ['curl', '--version']
     devnull = open(os.path.devnull, 'wb')
     try:
-        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-    except:
-        return False
+        try:
+            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+        except:
+            return False
     finally:
         devnull.close()
     return True
@@ -204,9 +206,10 @@ def has_wget():
     cmd = ['wget', '--version']
     devnull = open(os.path.devnull, 'wb')
     try:
-        subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-    except:
-        return False
+        try:
+            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
+        except:
+            return False
     finally:
         devnull.close()
     return True

From 7fa044fd170dc56ac8c484aa4739285d568150a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Aug 2013 21:42:33 -0400
Subject: [PATCH 1496/8469] Added tag 1.1 for changeset d943b67fe80d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 96735c09b3..3957034c42 100644
--- a/.hgtags
+++ b/.hgtags
@@ -93,3 +93,4 @@ e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
 aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
 8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3
 c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
+d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1

From db4b127a0370bb7f2bfaa77b3163c0f26ee980ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Aug 2013 21:43:00 -0400
Subject: [PATCH 1497/8469] Bumped to 1.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 ++---
 setuptools/version.py                |  2 +-
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 7a597d2226..13d0949f61 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1"
+DEFAULT_VERSION = "1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index df9b9c2d76..abcafd65e7 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-install_scripts = setuptools.command.install_scripts:install_scripts
-install = setuptools.command.install:install
-setopt = setuptools.command.setopt:setopt
-register = setuptools.command.register:register
-easy_install = setuptools.command.easy_install:easy_install
-test = setuptools.command.test:test
-sdist = setuptools.command.sdist:sdist
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-egg_info = setuptools.command.egg_info:egg_info
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_py = setuptools.command.build_py:build_py
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_lib = setuptools.command.install_lib:install_lib
-develop = setuptools.command.develop:develop
-rotate = setuptools.command.rotate:rotate
-build_ext = setuptools.command.build_ext:build_ext
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-saveopts = setuptools.command.saveopts:saveopts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-tests_require = setuptools.dist:check_requirements
-install_requires = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
 packages = setuptools.dist:check_packages
-eager_resources = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+entry_points = setuptools.dist:check_entry_points
 include_package_data = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+test_loader = setuptools.dist:check_importable
+install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[distutils.commands]
+easy_install = setuptools.command.easy_install:easy_install
+build_ext = setuptools.command.build_ext:build_ext
+install = setuptools.command.install:install
+saveopts = setuptools.command.saveopts:saveopts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+install_scripts = setuptools.command.install_scripts:install_scripts
+egg_info = setuptools.command.egg_info:egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+sdist = setuptools.command.sdist:sdist
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+rotate = setuptools.command.rotate:rotate
+register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index c06a8a0b3e..6d385dc746 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 439eb0cd22..64477cf292 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1'
+__version__ = '1.2'

From 48ab068f3683139591a03a47ffc50f0b42b767cd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Aug 2013 21:45:05 -0400
Subject: [PATCH 1498/8469] Update reference to distribute.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e2caeb0ce..928673bc9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 1.1
 ---
 
-* Issue #71 (Distribute Issue #333): EasyInstall now puts less emphasis on the
+* Issue #71 (Distribute #333): EasyInstall now puts less emphasis on the
   condition when a host is blocked via ``--allow-hosts``.
 * Issue #72: Restored Python 2.4 compatibility in ``ez_setup.py``.
 

From afe5e690c83adb9efea6f2eb774d9bf9798053fb Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Fri, 30 Aug 2013 21:55:23 +1000
Subject: [PATCH 1499/8469] Add back a more descriptive intro

--HG--
branch : docs_update_for_requires
---
 docs/pkg_resources.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index b2166b546a..6c93b57d88 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -26,6 +26,21 @@ zip archive or subdirectory), while others (such as plugin discovery) will
 work correctly so long as "egg-info" metadata directories are available for
 relevant distributions.
 
+Eggs are a distribution format for Python modules, similar in concept to
+Java's "jars" or Ruby's "gems", or the "wheel" format defined in PEP 427.
+However, unlike a pure distribution format, egg can also be installed and
+added directly to ``sys.path`` as an import location. When installed in
+this way, eggs are *discoverable*, meaning that they carry metadata that
+unambiguously identifies their contents and dependencies. This means that
+an installed egg can be *automatically* found and added to ``sys.path`` in
+response to simple requests of the form, "get me everything I need to use
+docutils' PDF support". This feature allows mutually conflicting versions of
+a distribution to co-exist in the same Python installation, with individual
+applications activating the desired version at runtime by manipulating the
+contents of ``sys.path`` (this differs from the virtual environment
+approach, which involves creating isolated environments for each
+application).
+
 The following terms are needed in order to explain the capabilities offered
 by this module:
 

From b9ae0569d22adc9f83301f180ebcb17ae7ae2e6f Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Fri, 30 Aug 2013 21:58:51 +1000
Subject: [PATCH 1500/8469] Typo fix

--HG--
branch : docs_update_for_requires
---
 docs/pkg_resources.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 6c93b57d88..3aac47203f 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -28,7 +28,7 @@ relevant distributions.
 
 Eggs are a distribution format for Python modules, similar in concept to
 Java's "jars" or Ruby's "gems", or the "wheel" format defined in PEP 427.
-However, unlike a pure distribution format, egg can also be installed and
+However, unlike a pure distribution format, eggs can also be installed and
 added directly to ``sys.path`` as an import location. When installed in
 this way, eggs are *discoverable*, meaning that they carry metadata that
 unambiguously identifies their contents and dependencies. This means that

From 0424d55854a4814a17377460975b791a8cb24a62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 31 Aug 2013 12:12:16 -0400
Subject: [PATCH 1501/8469] ez_setup.py now takes a --insecure argument to
 bypass the secure downloaders. download_setuptools also now accepts a new
 keyword argument 'download_factory', enabling programmitic invocation to
 customize the downloader resolution. Fixes #75. Thanks to Pablo Algarvio for
 the report and suggestions.

---
 CHANGES.txt      |  7 +++++++
 CONTRIBUTORS.txt |  1 +
 ez_setup.py      | 16 +++++++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e2caeb0ce..7ac75d7dc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+next
+----
+
+* Issue #75: Add ``--insecure`` option to ez_setup.py to accommodate
+  environments where a trusted SSL connection cannot be validated.
+
 ---
 1.1
 ---
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f1966505a7..dd0b8c7f11 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -21,6 +21,7 @@ Contributors
 * Marc Abramowitz
 * Martin von Löwis
 * Noufal Ibrahim
+* Pedro Algarvio
 * Pete Hollobon
 * Phillip J. Eby
 * Philip Jenvey
diff --git a/ez_setup.py b/ez_setup.py
index 7a597d2226..5c49446001 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -254,7 +254,8 @@ def get_best_downloader():
             return dl
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                        to_dir=os.curdir, delay=15):
+                        to_dir=os.curdir, delay=15,
+                        downloader_factory=get_best_downloader):
     """Download setuptools from a specified location and return its filename
 
     `version` should be a valid setuptools version number that is available
@@ -262,6 +263,9 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download
     attempt.
+
+    ``downloader_factory`` should be a function taking no arguments and
+    returning a function for downloading a URL to a target.
     """
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
@@ -270,7 +274,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     saveto = os.path.join(to_dir, tgz_name)
     if not os.path.exists(saveto):  # Avoid repeated downloads
         log.warn("Downloading %s", url)
-        downloader = get_best_downloader()
+        downloader = downloader_factory()
         downloader(url, saveto)
     return os.path.realpath(saveto)
 
@@ -346,6 +350,11 @@ def _parse_args():
         '--download-base', dest='download_base', metavar="URL",
         default=DEFAULT_URL,
         help='alternative URL from where to download the setuptools package')
+    parser.add_option(
+        '--insecure', dest='downloader_factory', action='store_const',
+        const=lambda: download_file_insecure, default=get_best_downloader,
+        help='Use internal, non-validating downloader'
+    )
     options, args = parser.parse_args()
     # positional arguments are ignored
     return options
@@ -353,7 +362,8 @@ def _parse_args():
 def main(version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()
-    tarball = download_setuptools(download_base=options.download_base)
+    tarball = download_setuptools(download_base=options.download_base,
+        downloader_factory=options.downloader_factory)
     return _install(tarball, _build_install_args(options))
 
 if __name__ == '__main__':

From 2e0ef2a83c7e662b1bd48926c1dc82bc44aa5efd Mon Sep 17 00:00:00 2001
From: Kai Hoppert <kai.hoppert@online.de>
Date: Sun, 1 Sep 2013 14:41:44 +0200
Subject: [PATCH 1502/8469] Add documentation

--HG--
extra : histedit_source : ff07b41a59ac22e1c05ce4fd42c6771378e80f13
---
 docs/easy_install.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 03f816de02..ffe6a268e6 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -454,6 +454,30 @@ You can do this with both index page URLs and direct download URLs.  As long
 as any HTML pages read by easy_install use *relative* links to point to the
 downloads, the same user ID and password will be used to do the downloading.
 
+Authentication against privat repository
+----------------------------------------
+
+To get these things running. You need a .pypirc file in your home directory. The file should has the following format.
+
+Example
+
+::
+
+    [distutils]
+    index-servers = myrepos
+
+    [myrepos]
+    repository: http://myrepos.com
+    username:MY_USER
+    password:MY_PASSORD
+
+In your buildout.cfg you have to add the eggserver url under find-links. The example is for an mypypi egg server. /eggs provides a flat package list.
+
+Example
+
+::
+
+    find-links = http://myrepos.com/eggs
 
 Controlling Build Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~

From 01ef8a46f78d30526b57339e71f80f79e5a0d9dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 13:51:42 -0400
Subject: [PATCH 1503/8469] Remove unused import

---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 45b95f90b1..266661bcbe 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,5 +1,5 @@
 """Extensions to the 'distutils' for large or complex distributions"""
-from setuptools.extension import Extension, Library
+from setuptools.extension import Extension
 from setuptools.dist import Distribution, Feature, _get_unpatched
 import distutils.core, setuptools.command
 from setuptools.depends import Require

From 231b4c70dee105919e04c9ee3e1dcadb52546251 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 13:53:47 -0400
Subject: [PATCH 1504/8469] Remove unused import

---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 266661bcbe..3373e240b5 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,7 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 from setuptools.extension import Extension
 from setuptools.dist import Distribution, Feature, _get_unpatched
-import distutils.core, setuptools.command
+import distutils.core
 from setuptools.depends import Require
 from distutils.core import Command as _Command
 from distutils.util import convert_path

From 396a217ad725e25c8761edf3678dea349d06e023 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 13:55:59 -0400
Subject: [PATCH 1505/8469] Reorganize imports

---
 setuptools/__init__.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 3373e240b5..b048d9fd12 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,19 +1,23 @@
 """Extensions to the 'distutils' for large or complex distributions"""
-from setuptools.extension import Extension
-from setuptools.dist import Distribution, Feature, _get_unpatched
+
+import os
+import sys
 import distutils.core
-from setuptools.depends import Require
 from distutils.core import Command as _Command
 from distutils.util import convert_path
-import os
-import sys
-from setuptools.version import __version__
+
+import setuptools.version
+from setuptools.extension import Extension
+from setuptools.dist import Distribution, Feature, _get_unpatched
+from setuptools.depends import Require
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
 ]
 
+__version__ = setuptools.version.__version__
+
 bootstrap_install_from = None
 
 # If we run 2to3 on .py files, should we also convert docstrings?

From 053ed7e2f6885b001a85fc0a8759f2226a2f178a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:00:19 -0400
Subject: [PATCH 1506/8469] Refactor for clarity

---
 setuptools/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index b048d9fd12..2eb51a1f73 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -41,10 +41,14 @@ def find_packages(where='.', exclude=()):
         where,prefix = stack.pop(0)
         for name in os.listdir(where):
             fn = os.path.join(where,name)
-            if ('.' not in name and os.path.isdir(fn) and
-                os.path.isfile(os.path.join(fn,'__init__.py'))
-            ):
-                out.append(prefix+name); stack.append((fn,prefix+name+'.'))
+            looks_like_package = (
+                '.' not in name
+                and os.path.isdir(fn)
+                and os.path.isfile(os.path.join(fn,'__init__.py'))
+            )
+            if looks_like_package:
+                out.append(prefix+name)
+                stack.append((fn,prefix+name+'.'))
     for pat in list(exclude)+['ez_setup']:
         from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]

From 26ea618c278baa8ea77bf3f81f8abf5e3c1cf416 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:01:55 -0400
Subject: [PATCH 1507/8469] Move imports to leader

---
 setuptools/__init__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2eb51a1f73..820f7f556d 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import distutils.core
+import distutils.filelist
 from distutils.core import Command as _Command
 from distutils.util import convert_path
 
@@ -44,11 +45,11 @@ def find_packages(where='.', exclude=()):
             looks_like_package = (
                 '.' not in name
                 and os.path.isdir(fn)
-                and os.path.isfile(os.path.join(fn,'__init__.py'))
+                and os.path.isfile(os.path.join(fn, '__init__.py'))
             )
             if looks_like_package:
                 out.append(prefix+name)
-                stack.append((fn,prefix+name+'.'))
+                stack.append((fn, prefix+name+'.'))
     for pat in list(exclude)+['ez_setup']:
         from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]
@@ -75,7 +76,6 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
             setattr(cmd,k,v)    # update command with keywords
         return cmd
 
-import distutils.core
 distutils.core.Command = Command    # we can't patch distutils.cmd, alas
 
 def findall(dir = os.curdir):
@@ -91,7 +91,6 @@ def findall(dir = os.curdir):
         all_files.extend(filter(os.path.isfile, files))
     return all_files
 
-import distutils.filelist
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 # sys.dont_write_bytecode was introduced in Python 2.6.

From 352f5f5c49dbd9d0a71106b7d380adce2543d020 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:04:53 -0400
Subject: [PATCH 1508/8469] Refactor _dont_write_bytecode detection

---
 setuptools/__init__.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 820f7f556d..48bc1a4b75 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -94,8 +94,10 @@ def findall(dir = os.curdir):
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 # sys.dont_write_bytecode was introduced in Python 2.6.
-if ((hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode) or
-    (not hasattr(sys, "dont_write_bytecode") and os.environ.get("PYTHONDONTWRITEBYTECODE"))):
-    _dont_write_bytecode = True
-else:
-    _dont_write_bytecode = False
+_dont_write_bytecode = (
+    (hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode)
+    or (
+        not hasattr(sys, "dont_write_bytecode")
+        and os.environ.get("PYTHONDONTWRITEBYTECODE")
+    )
+)

From 420493f6338b6511cddb6b6bcafcdb33415afe4b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:12:15 -0400
Subject: [PATCH 1509/8469] More simply resolve _dont_write_bytecode.

---
 setuptools/__init__.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 48bc1a4b75..fc9b7b936c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -94,10 +94,5 @@ def findall(dir = os.curdir):
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 # sys.dont_write_bytecode was introduced in Python 2.6.
-_dont_write_bytecode = (
-    (hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode)
-    or (
-        not hasattr(sys, "dont_write_bytecode")
-        and os.environ.get("PYTHONDONTWRITEBYTECODE")
-    )
-)
+_dont_write_bytecode = getattr(sys, 'dont_write_bytecode',
+    bool(os.environ.get("PYTHONDONTWRITEBYTECODE")))

From a81b616547845b80c52e642bfe56180676d46d0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:16:19 -0400
Subject: [PATCH 1510/8469] Move imports to header

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 66dc798bda..a7a40e267a 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -24,6 +24,8 @@
 import platform
 import textwrap
 import warnings
+import site
+import struct
 from glob import glob
 from distutils import log, dir_util
 
@@ -73,10 +75,8 @@ def _get_purelib():
     'main', 'get_exe_prefixes',
 ]
 
-import site
 HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE
 
-import struct
 def is_64bit():
     return struct.calcsize("P") == 8
 

From 05ea2dae700821c491b3fd1cc665c26e1b7a5ed8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:18:14 -0400
Subject: [PATCH 1511/8469] Normalize style

---
 setuptools/command/easy_install.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a7a40e267a..7aff9c840b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -502,7 +502,8 @@ def check_pth_processing(self):
         else:
             try:
                 f.write("import os; f = open(%r, 'w'); f.write('OK'); f.close()\n" % (ok_file,))
-                f.close(); f=None
+                f.close()
+                f=None
                 executable = sys.executable
                 if os.name=='nt':
                     dirname,basename = os.path.split(executable)
@@ -521,9 +522,12 @@ def check_pth_processing(self):
                     )
                     return True
             finally:
-                if f: f.close()
-                if os.path.exists(ok_file): os.unlink(ok_file)
-                if os.path.exists(pth_file): os.unlink(pth_file)
+                if f:
+                    f.close()
+                if os.path.exists(ok_file):
+                    os.unlink(ok_file)
+                if os.path.exists(pth_file):
+                    os.unlink(pth_file)
         if not self.multi_version:
             log.warn("TEST FAILED: %s does NOT support .pth files", instdir)
         return False

From 3860484b6cc33cc499b56c96a6332263be562bfe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:21:33 -0400
Subject: [PATCH 1512/8469] Refactor for nicer indentation

---
 setuptools/command/easy_install.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7aff9c840b..755b15d63e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -81,14 +81,13 @@ def is_64bit():
     return struct.calcsize("P") == 8
 
 def samefile(p1, p2):
-    if hasattr(os.path,'samefile') and (
-        os.path.exists(p1) and os.path.exists(p2)
-    ):
-        return os.path.samefile(p1,p2)
-    return (
-        os.path.normpath(os.path.normcase(p1)) ==
-        os.path.normpath(os.path.normcase(p2))
-    )
+    both_exist = os.path.exists(p1) and os.path.exists(p2)
+    use_samefile = hasattr(os.path, 'samefile') and both_exist
+    if use_samefile:
+        return os.path.samefile(p1, p2)
+    norm_p1 = os.path.normpath(os.path.normcase(p1))
+    norm_p2 = os.path.normpath(os.path.normcase(p2))
+    return norm_p1 == norm_p2
 
 if sys.version_info <= (3,):
     def _to_ascii(s):

From b1dfe6c40f83f5b1efab707c356aa08fdeb1b62b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:23:39 -0400
Subject: [PATCH 1513/8469] Rename variable to avoid conflation with global

---
 setuptools/command/easy_install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 755b15d63e..78d96696b2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -882,10 +882,10 @@ def install_exe(self, dist_filename, tmpdir):
         # Convert the .exe to an unpacked egg
         egg_path = dist.location = os.path.join(tmpdir, dist.egg_name()+'.egg')
         egg_tmp = egg_path + '.tmp'
-        egg_info = os.path.join(egg_tmp, 'EGG-INFO')
-        pkg_inf = os.path.join(egg_info, 'PKG-INFO')
+        _egg_info = os.path.join(egg_tmp, 'EGG-INFO')
+        pkg_inf = os.path.join(_egg_info, 'PKG-INFO')
         ensure_directory(pkg_inf)   # make sure EGG-INFO dir exists
-        dist._provider = PathMetadata(egg_tmp, egg_info)    # XXX
+        dist._provider = PathMetadata(egg_tmp, _egg_info)    # XXX
         self.exe_to_egg(dist_filename, egg_tmp)
 
         # Write EGG-INFO/PKG-INFO
@@ -896,7 +896,7 @@ def install_exe(self, dist_filename, tmpdir):
                 if k != 'target_version':
                     f.write('%s: %s\n' % (k.replace('_','-').title(), v))
             f.close()
-        script_dir = os.path.join(egg_info,'scripts')
+        script_dir = os.path.join(_egg_info,'scripts')
         self.delete_blockers(   # delete entry-point scripts to avoid duping
             [os.path.join(script_dir,args[0]) for args in get_script_args(dist)]
         )

From 6826957239fac24794af05c81a8fb176467c698f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:24:03 -0400
Subject: [PATCH 1514/8469] Remove unused import

---
 setuptools/command/easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 78d96696b2..737a6fc363 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -962,7 +962,6 @@ def check_conflicts(self, dist):
 
         return dist     # XXX temporarily disable until new strategy is stable
         from imp import find_module, get_suffixes
-        from glob import glob
 
         blockers = []
         names = dict.fromkeys(dist._get_metadata('top_level.txt')) # XXX private attr

From 234c0fc5d3ecde835fd130a8d072fcffba7e172c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Sep 2013 14:29:35 -0400
Subject: [PATCH 1515/8469] Remove long-disabled functionality
 'check_conflicts'.

---
 setuptools/command/easy_install.py | 57 +-----------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 737a6fc363..6ce19fa4df 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -640,7 +640,7 @@ def install_item(self, spec, download, tmpdir, deps, install_needed=False):
             for dist in dists:
                 self.process_distribution(spec, dist, deps)
         else:
-            dists = [self.check_conflicts(self.egg_distribution(download))]
+            dists = [self.egg_distribution(download)]
             self.process_distribution(spec, dists[0], deps, "Using")
 
         if spec is not None:
@@ -838,7 +838,6 @@ def install_egg(self, egg_path, tmpdir):
             ensure_directory(destination)
 
         dist = self.egg_distribution(egg_path)
-        self.check_conflicts(dist)
         if not samefile(egg_path, destination):
             if os.path.isdir(destination) and not os.path.islink(destination):
                 dir_util.remove_tree(destination, dry_run=self.dry_run)
@@ -957,60 +956,6 @@ def process(src,dst):
                     f.write('\n'.join(locals()[name])+'\n')
                     f.close()
 
-    def check_conflicts(self, dist):
-        """Verify that there are no conflicting "old-style" packages"""
-
-        return dist     # XXX temporarily disable until new strategy is stable
-        from imp import find_module, get_suffixes
-
-        blockers = []
-        names = dict.fromkeys(dist._get_metadata('top_level.txt')) # XXX private attr
-
-        exts = {'.pyc':1, '.pyo':1}     # get_suffixes() might leave one out
-        for ext,mode,typ in get_suffixes():
-            exts[ext] = 1
-
-        for path,files in expand_paths([self.install_dir]+self.all_site_dirs):
-            for filename in files:
-                base,ext = os.path.splitext(filename)
-                if base in names:
-                    if not ext:
-                        # no extension, check for package
-                        try:
-                            f, filename, descr = find_module(base, [path])
-                        except ImportError:
-                            continue
-                        else:
-                            if f: f.close()
-                            if filename not in blockers:
-                                blockers.append(filename)
-                    elif ext in exts and base!='site':  # XXX ugh
-                        blockers.append(os.path.join(path,filename))
-        if blockers:
-            self.found_conflicts(dist, blockers)
-
-        return dist
-
-    def found_conflicts(self, dist, blockers):
-        msg = """\
--------------------------------------------------------------------------
-CONFLICT WARNING:
-
-The following modules or packages have the same names as modules or
-packages being installed, and will be *before* the installed packages in
-Python's search path.  You MUST remove all of the relevant files and
-directories before you will be able to use the package(s) you are
-installing:
-
-   %s
-
--------------------------------------------------------------------------
-""" % '\n   '.join(blockers)
-
-        sys.stderr.write(msg)
-        sys.stderr.flush()
-        raise DistutilsError("Installation aborted due to conflicts")
-
     def installation_report(self, req, dist, what="Installed"):
         """Helpful installation message for display to package users"""
         msg = "\n%(what)s %(eggloc)s%(extras)s"

From bd959a59df72cacea485bedccd8f5d452e0aa353 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:39:26 -0400
Subject: [PATCH 1516/8469] Remove import *

---
 setuptools/command/upload.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 02d955eda6..8d258d5a89 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -2,10 +2,10 @@
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
-from distutils.errors import *
+from distutils import errors
+from distutils import log
 from distutils.core import Command
 from distutils.spawn import spawn
-from distutils import log
 try:
     from hashlib import md5
 except ImportError:
@@ -45,7 +45,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         if self.identity and not self.sign:
-            raise DistutilsOptionError(
+            raise errors.DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
         if 'HOME' in os.environ:
@@ -68,7 +68,7 @@ def finalize_options(self):
 
     def run(self):
         if not self.distribution.dist_files:
-            raise DistutilsOptionError("No dist file created in earlier command")
+            raise errors.DistutilsOptionError("No dist file created in earlier command")
         for command, pyversion, filename in self.distribution.dist_files:
             self.upload_file(command, pyversion, filename)
 

From 701115d88ba8b59b890672d131bc061c80e889c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:40:40 -0400
Subject: [PATCH 1517/8469] Use isinstance for type comparison

---
 setuptools/command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 8d258d5a89..93da7a395a 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -122,7 +122,7 @@ def upload_file(self, command, pyversion, filename):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if isinstance(value, list):
                 value = [value]
             for value in value:
                 if type(value) is tuple:

From aa3e70d8a887dc71ecc8170d04a623fa5542360f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:41:05 -0400
Subject: [PATCH 1518/8469] Remove unused variable

---
 setuptools/command/upload.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 93da7a395a..dde4decd7f 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -158,7 +158,6 @@ def upload_file(self, command, pyversion, filename):
             raise AssertionError("unsupported schema " + schema)
 
         data = ''
-        loglevel = log.INFO
         try:
             http.connect()
             http.putrequest("POST", url)

From ca3e8a370652c0735cb3921d43152e1014bbd946 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:46:55 -0400
Subject: [PATCH 1519/8469] Correct AttributeError in upload command on Python
 2.4. Fixes #76

---
 CHANGES.txt                  | 7 ++++---
 setuptools/command/upload.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a73957118..b0d0da3ef4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,13 @@
 CHANGES
 =======
 
-----
-next
-----
+-----
+1.1.1
+-----
 
 * Issue #75: Add ``--insecure`` option to ez_setup.py to accommodate
   environments where a trusted SSL connection cannot be validated.
+* Issue #76: Fix AttributeError in upload command with Python 2.4.
 
 ---
 1.1
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index dde4decd7f..5476b5ecc2 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -119,7 +119,7 @@ def upload_file(self, command, pyversion, filename):
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
-        body = StringIO.StringIO()
+        body = StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
             if isinstance(value, list):

From 5840ec69294a4ff2f499f2465434aaf9288a7177 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:48:50 -0400
Subject: [PATCH 1520/8469] Bumped to 1.1.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 975501e417..da0522f19e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.2"
+DEFAULT_VERSION = "1.1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 64477cf292..b3ddbc41f3 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.2'
+__version__ = '1.1.1'

From cd04261b69743dd545338cd9628ac18afc526d94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:48:52 -0400
Subject: [PATCH 1521/8469] Added tag 1.1.1 for changeset 2e42e8654610

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3957034c42..040273df88 100644
--- a/.hgtags
+++ b/.hgtags
@@ -94,3 +94,4 @@ aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
 8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3
 c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
 d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
+2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1

From bb6bcc421feb339c8cb876edc1f3eb18159aa6a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Sep 2013 22:49:15 -0400
Subject: [PATCH 1522/8469] Bumped to 1.1.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/version.py                |  2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index da0522f19e..62bcd0a712 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.1"
+DEFAULT_VERSION = "1.1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index abcafd65e7..73898c7291 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-eager_resources = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
 convert_2to3_doctests = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
 packages = setuptools.dist:check_packages
-use_2to3 = setuptools.dist:assert_bool
-entry_points = setuptools.dist:check_entry_points
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
 include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
-test_loader = setuptools.dist:check_importable
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+use_2to3 = setuptools.dist:assert_bool
 tests_require = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+exclude_package_data = setuptools.dist:check_package_data
 dependency_links = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[distutils.commands]
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+build_py = setuptools.command.build_py:build_py
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+setopt = setuptools.command.setopt:setopt
+saveopts = setuptools.command.saveopts:saveopts
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+register = setuptools.command.register:register
+easy_install = setuptools.command.easy_install:easy_install
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+egg_info = setuptools.command.egg_info:egg_info
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [egg_info.writers]
+entry_points.txt = setuptools.command.egg_info:write_entries
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 
-[distutils.commands]
-easy_install = setuptools.command.easy_install:easy_install
-build_ext = setuptools.command.build_ext:build_ext
-install = setuptools.command.install:install
-saveopts = setuptools.command.saveopts:saveopts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-install_scripts = setuptools.command.install_scripts:install_scripts
-egg_info = setuptools.command.egg_info:egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-sdist = setuptools.command.sdist:sdist
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-alias = setuptools.command.alias:alias
-rotate = setuptools.command.rotate:rotate
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_lib = setuptools.command.install_lib:install_lib
-build_py = setuptools.command.build_py:build_py
-setopt = setuptools.command.setopt:setopt
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 6d385dc746..e7f0f3b867 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index b3ddbc41f3..7b344eca4a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.1'
+__version__ = '1.1.2'

From 705e6255fca83f5ff2b194e6529968017cefaaa3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:33:13 -0400
Subject: [PATCH 1523/8469] Correct 404 errors when URLs contain fragments.
 Fixes #69.

---
 setuptools/compat.py        |  5 +++--
 setuptools/package_index.py |  2 +-
 setuptools/py26compat.py    | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 setuptools/py26compat.py

diff --git a/setuptools/compat.py b/setuptools/compat.py
index e2f64de236..6094ca7418 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -26,7 +26,7 @@
     reduce = reduce
     unichr = unichr
     unicode = unicode
-    from urllib import url2pathname
+    from urllib import url2pathname, splittag
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin
@@ -72,7 +72,8 @@ def exec_(code, globs=None, locs=None):
     from urllib.error import HTTPError, URLError
     import urllib.request as urllib2
     from urllib.request import urlopen, url2pathname
-    from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin
+    from urllib.parse import (urlparse, urlunparse, unquote, splituser,
+        urljoin, splittag)
     xrange = range
     filterfalse = itertools.filterfalse
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4c4a647d4a..a09048b446 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -657,7 +657,7 @@ def _download_to(self, url, filename):
         fp, tfp, info = None, None, None
         try:
             checker = HashChecker.from_url(url)
-            fp = self.open_url(url)
+            fp = self.open_url(strip_fragment(url))
             if isinstance(fp, HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
new file mode 100644
index 0000000000..6fc0088312
--- /dev/null
+++ b/setuptools/py26compat.py
@@ -0,0 +1,19 @@
+"""
+Compatibility Support for Python 2.6 and earlier
+"""
+
+import sys
+
+from setuptools.compat import splittag
+
+def strip_fragment(url):
+	"""
+	In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
+	later was patched to disregard the fragment when making URL requests.
+	Do the same for Python 2.6 and earlier.
+	"""
+	url, fragment = splittag(url)
+	return url
+
+if sys.version_info < (2,7):
+	strip_fragment = lambda x: x

From ca2798727269cd4433ae355ef64a7cffd3807aaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:36:06 -0400
Subject: [PATCH 1524/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b0d0da3ef4..cb300d47c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+1.1.2
+-----
+
+* Issue #69: Correct issue where 404 errors are returned for URLs with
+  fragments in them (such as #egg=).
+
 -----
 1.1.1
 -----

From eb61edf878f2c22cf88209bc241f46c37c684d69 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:37:04 -0400
Subject: [PATCH 1525/8469] Added tag 1.1.2 for changeset 462fe5ccd8be

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 040273df88..5f99eb5872 100644
--- a/.hgtags
+++ b/.hgtags
@@ -95,3 +95,4 @@ aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
 c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
 d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
 2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1
+462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2

From 4c466d70b1625083222056be277b575e0446f185 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:37:25 -0400
Subject: [PATCH 1526/8469] Bumped to 1.1.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 84 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 10 ++--
 setuptools/version.py                |  2 +-
 4 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 62bcd0a712..01fcb9d2f4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.2"
+DEFAULT_VERSION = "1.1.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 73898c7291..6edb7741d4 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
 [distutils.setup_keywords]
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-packages = setuptools.dist:check_packages
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-zip_safe = setuptools.dist:assert_bool
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
-entry_points = setuptools.dist:check_entry_points
+install_requires = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
 use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
 tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+convert_2to3_doctests = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
 package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
 exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
 use_2to3_fixers = setuptools.dist:assert_string_list
 
+[egg_info.writers]
+requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.commands]
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+sdist = setuptools.command.sdist:sdist
+rotate = setuptools.command.rotate:rotate
+test = setuptools.command.test:test
+alias = setuptools.command.alias:alias
 build_py = setuptools.command.build_py:build_py
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
 build_ext = setuptools.command.build_ext:build_ext
+install_lib = setuptools.command.install_lib:install_lib
+saveopts = setuptools.command.saveopts:saveopts
+easy_install = setuptools.command.easy_install:easy_install
+register = setuptools.command.register:register
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
+install = setuptools.command.install:install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+develop = setuptools.command.develop:develop
+install_scripts = setuptools.command.install_scripts:install_scripts
+egg_info = setuptools.command.egg_info:egg_info
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 setopt = setuptools.command.setopt:setopt
-saveopts = setuptools.command.saveopts:saveopts
-install_scripts = setuptools.command.install_scripts:install_scripts
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-register = setuptools.command.register:register
-easy_install = setuptools.command.easy_install:easy_install
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e7f0f3b867..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 7b344eca4a..7bb021e2f3 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.2'
+__version__ = '1.1.3'

From 559c85e2d4093e5a3163b7fe01cbb2f0180c9141 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:39:47 -0400
Subject: [PATCH 1527/8469] Add the import, omitted from the previous commit.

---
 CHANGES.txt                 | 6 ++++++
 setuptools/package_index.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cb300d47c8..633e8d5f10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+1.1.3
+-----
+
+* Fix NameError in previous patch.
+
 -----
 1.1.2
 -----
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a6672c70ba..4c9e40a7b1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -22,6 +22,7 @@
 from fnmatch import translate
 from setuptools.py24compat import hashlib
 from setuptools.py24compat import wraps
+from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')

From ad24b4aa2be03dd3dcd509c13171aefafb5e3008 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:40:03 -0400
Subject: [PATCH 1528/8469] Added tag 1.1.3 for changeset ddf3561d6a54

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f99eb5872..800a5e4089 100644
--- a/.hgtags
+++ b/.hgtags
@@ -96,3 +96,4 @@ c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
 d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
 2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1
 462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2
+ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3

From 6e15af98b61f4e12c25719ee2535fac722616c68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Sep 2013 09:40:24 -0400
Subject: [PATCH 1529/8469] Bumped to 1.1.4 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 96 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 01fcb9d2f4..79713bd814 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.3"
+DEFAULT_VERSION = "1.1.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 6edb7741d4..d6b5406049 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-dependency_links = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-include_package_data = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
 [distutils.commands]
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-test = setuptools.command.test:test
-alias = setuptools.command.alias:alias
-build_py = setuptools.command.build_py:build_py
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
-saveopts = setuptools.command.saveopts:saveopts
-easy_install = setuptools.command.easy_install:easy_install
 register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install = setuptools.command.install:install
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
 develop = setuptools.command.develop:develop
 install_scripts = setuptools.command.install_scripts:install_scripts
-egg_info = setuptools.command.egg_info:egg_info
+build_py = setuptools.command.build_py:build_py
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
+egg_info = setuptools.command.egg_info:egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
+install = setuptools.command.install:install
 setopt = setuptools.command.setopt:setopt
 upload_docs = setuptools.command.upload_docs:upload_docs
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
+rotate = setuptools.command.rotate:rotate
+sdist = setuptools.command.sdist:sdist
+saveopts = setuptools.command.saveopts:saveopts
+
+[distutils.setup_keywords]
+test_suite = setuptools.dist:check_test_suite
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+entry_points = setuptools.dist:check_entry_points
+dependency_links = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+requires.txt = setuptools.command.egg_info:write_requirements
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..0b577c9748 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
 
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 7bb021e2f3..bc50bee689 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.3'
+__version__ = '1.1.4'

From 3117a6c743787dc2d409d4c34934d3bcc8f27206 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Sep 2013 17:10:09 -0400
Subject: [PATCH 1530/8469] Fix boolean test, incorrectly changed. Off-by-one
 errors are particularly ugly with booleans ;) Fixes #77

---
 setuptools/command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 93da7a395a..575e121e4e 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -122,7 +122,7 @@ def upload_file(self, command, pyversion, filename):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if isinstance(value, list):
+            if not isinstance(value, list):
                 value = [value]
             for value in value:
                 if type(value) is tuple:

From 8aa2f12d9167bb0dadde5049420d980d18d07d7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Sep 2013 17:18:08 -0400
Subject: [PATCH 1531/8469] Added tag 1.1.4 for changeset f94c7e4fa030

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 800a5e4089..be682de63c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -97,3 +97,4 @@ d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
 2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1
 462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2
 ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
+f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4

From a0645ece948f89821606db290c511cc391804472 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Sep 2013 17:18:31 -0400
Subject: [PATCH 1532/8469] Bumped to 1.1.5 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 68 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 +++---
 setuptools/version.py                |  2 +-
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 79713bd814..4118de3b69 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.4"
+DEFAULT_VERSION = "1.1.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index d6b5406049..139acb1d49 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,48 +1,48 @@
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
 [distutils.commands]
+rotate = setuptools.command.rotate:rotate
+build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
 register = setuptools.command.register:register
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-develop = setuptools.command.develop:develop
+saveopts = setuptools.command.saveopts:saveopts
 install_scripts = setuptools.command.install_scripts:install_scripts
-build_py = setuptools.command.build_py:build_py
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-egg_info = setuptools.command.egg_info:egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 alias = setuptools.command.alias:alias
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 easy_install = setuptools.command.easy_install:easy_install
-test = setuptools.command.test:test
-install = setuptools.command.install:install
+egg_info = setuptools.command.egg_info:egg_info
 setopt = setuptools.command.setopt:setopt
 upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-rotate = setuptools.command.rotate:rotate
-sdist = setuptools.command.sdist:sdist
-saveopts = setuptools.command.saveopts:saveopts
+install_lib = setuptools.command.install_lib:install_lib
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+test = setuptools.command.test:test
+build_ext = setuptools.command.build_ext:build_ext
+develop = setuptools.command.develop:develop
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
 [distutils.setup_keywords]
-test_suite = setuptools.dist:check_test_suite
-packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 use_2to3_fixers = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+install_requires = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
 test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
+use_2to3 = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
 zip_safe = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
+tests_require = setuptools.dist:check_requirements
 eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
 namespace_packages = setuptools.dist:check_nsp
-use_2to3 = setuptools.dist:assert_bool
-entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
 dependency_links = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
@@ -51,12 +51,12 @@ svn_cvs = setuptools.command.sdist:_default_revctrl
 eggsecutable = setuptools.command.easy_install:bootstrap
 
 [egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-requires.txt = setuptools.command.egg_info:write_requirements
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..256342f0e4 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index bc50bee689..99d2a6fad1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.4'
+__version__ = '1.1.5'

From 61aacdd173df9aaf20698769b1715bfcc6b5e416 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Sep 2013 15:19:34 -0400
Subject: [PATCH 1533/8469] Reorganize imports

---
 setuptools/command/sdist.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 39cd604396..a7ce7ac0aa 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,9 +1,12 @@
+import os
+import re
+import sys
+from glob import glob
+
+import pkg_resources
 from distutils.command.sdist import sdist as _sdist
 from distutils.util import convert_path
 from distutils import log
-from glob import glob
-import os, re, sys, pkg_resources
-from glob import glob
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -98,13 +101,13 @@ def entries_finder(dirname, filename):
         except: pass
         if svnver<8:
             log.warn("unrecognized .svn/entries format in %s", os.path.abspath(dirname))
-            return           
+            return
         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
             # subversion 1.6/1.5/1.4
             if not record or len(record)>=6 and record[5]=="delete":
                 continue    # skip deleted
             yield joinpath(dirname, record[0])
-        
+
 
 finders = [
     (convert_path('CVS/Entries'),

From 2b6a00de2632bd044a260c86aec9e29083b2adf1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Sep 2013 15:21:41 -0400
Subject: [PATCH 1534/8469] Remove excess whitespace. Delint one if statement.

---
 setuptools/command/sdist.py | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a7ce7ac0aa..6d63e819e7 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -37,14 +37,6 @@ def joinpath(prefix,suffix):
         return suffix
     return os.path.join(prefix,suffix)
 
-
-
-
-
-
-
-
-
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""
     for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
@@ -118,16 +110,6 @@ def entries_finder(dirname, filename):
 ]
 
 
-
-
-
-
-
-
-
-
-
-
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""
 
@@ -182,11 +164,12 @@ def __read_template_hack(self):
     # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
     #  has been fixed, so only override the method if we're using an earlier
     #  Python.
-    if (
-            sys.version_info < (2,7,2)
-            or (3,0) <= sys.version_info < (3,1,4)
-            or (3,2) <= sys.version_info < (3,2,1)
-        ):
+    has_leaky_handle = (
+        sys.version_info < (2,7,2)
+        or (3,0) <= sys.version_info < (3,1,4)
+        or (3,2) <= sys.version_info < (3,2,1)
+    )
+    if has_leaky_handle:
         read_template = __read_template_hack
 
     def add_defaults(self):
@@ -251,7 +234,6 @@ def check_readme(self):
                 "standard file not found: should have one of " +', '.join(READMES)
             )
 
-
     def make_release_tree(self, base_dir, files):
         _sdist.make_release_tree(self, base_dir, files)
 
@@ -298,10 +280,3 @@ def read_manifest(self):
                 continue
             self.filelist.append(line)
         manifest.close()
-
-
-
-
-
-
-#

From 60f74823070a2c4154d20ac8a87fd15cca6bb9a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Sep 2013 09:44:06 -0400
Subject: [PATCH 1535/8469] Correct boolean logic in fix for #69

---
 setuptools/py26compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 6fc0088312..738b0cc40b 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -15,5 +15,5 @@ def strip_fragment(url):
 	url, fragment = splittag(url)
 	return url
 
-if sys.version_info < (2,7):
+if sys.version_info >= (2,7):
 	strip_fragment = lambda x: x

From a0c75a6cbda55a2b1ae1ab650491eacb3eb4a385 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Sep 2013 09:45:03 -0400
Subject: [PATCH 1536/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 634edd4e1c..de8285a2e0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+1.1.5
+-----
+
+* Issue #69: Second attempt at fix (logic was reversed).
+
 -----
 1.1.4
 -----

From f9dc7c3a2b1360c0c0d85c3a2fc88701175e8d04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Sep 2013 09:59:38 -0400
Subject: [PATCH 1537/8469] Added tag 1.1.5 for changeset d9bb58331007

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index be682de63c..50bb2d5000 100644
--- a/.hgtags
+++ b/.hgtags
@@ -98,3 +98,4 @@ d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
 462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2
 ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
 f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
+d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5

From 2b3d8ead29f777fe3e1c6d26c7d110cbc554c721 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Sep 2013 09:59:59 -0400
Subject: [PATCH 1538/8469] Bumped to 1.1.6 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 76 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4118de3b69..b02f3f17b0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.5"
+DEFAULT_VERSION = "1.1.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 139acb1d49..4acc9af406 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.commands]
+alias = setuptools.command.alias:alias
+build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
 rotate = setuptools.command.rotate:rotate
-build_py = setuptools.command.build_py:build_py
-sdist = setuptools.command.sdist:sdist
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-register = setuptools.command.register:register
-saveopts = setuptools.command.saveopts:saveopts
 install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
+saveopts = setuptools.command.saveopts:saveopts
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_lib = setuptools.command.install_lib:install_lib
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-test = setuptools.command.test:test
-build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+register = setuptools.command.register:register
 develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
+sdist = setuptools.command.sdist:sdist
 
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
 entry_points = setuptools.dist:check_entry_points
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
-test_suite = setuptools.dist:check_test_suite
 test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
 dependency_links = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
 packages = setuptools.dist:check_packages
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
 
 [egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 entry_points.txt = setuptools.command.egg_info:write_entries
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 256342f0e4..e8e2105dd0 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,5 +1,8 @@
 
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
@@ -7,7 +10,4 @@ wincertstore==0.1
 certifi==0.0.8
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 99d2a6fad1..6ebd335c55 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.5'
+__version__ = '1.1.6'

From 115bb41b011e5dd064fdc5a74aa7d5f71cdbe37d Mon Sep 17 00:00:00 2001
From: "Suresh V." <suresh@grafware.com>
Date: Tue, 17 Sep 2013 12:32:02 +0530
Subject: [PATCH 1539/8469] Don't leave junk file behind

---
 ez_setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index b02f3f17b0..03458b701d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -200,7 +200,11 @@ def has_curl():
 
 def download_file_wget(url, target):
     cmd = ['wget', url, '--quiet', '--output-document', target]
-    subprocess.check_call(cmd)
+    try:
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError:
+        os.unlink(target)
+        raise
 
 def has_wget():
     cmd = ['wget', '--version']

From 9e4208becb775a69014c2e02b6a10f899efde1e7 Mon Sep 17 00:00:00 2001
From: Suresh V <suresh@grafware.com>
Date: Tue, 17 Sep 2013 23:14:42 +0530
Subject: [PATCH 1540/8469] implement for all downloaders and check file
 existence before removing

---
 ez_setup.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 03458b701d..945f55d90b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -162,7 +162,12 @@ def download_file_powershell(url, target):
         '-Command',
         "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
     ]
-    subprocess.check_call(cmd)
+    try:
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError:
+        if os.access(target, os.F_OK):
+            os.unlink(target)
+        raise
 
 def has_powershell():
     if platform.system() != 'Windows':
@@ -182,7 +187,12 @@ def has_powershell():
 
 def download_file_curl(url, target):
     cmd = ['curl', url, '--silent', '--output', target]
-    subprocess.check_call(cmd)
+    try:
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError:
+        if os.access(target, os.F_OK):
+            os.unlink(target)
+        raise
 
 def has_curl():
     cmd = ['curl', '--version']
@@ -203,7 +213,8 @@ def download_file_wget(url, target):
     try:
         subprocess.check_call(cmd)
     except subprocess.CalledProcessError:
-        os.unlink(target)
+        if os.access(target, os.F_OK):
+            os.unlink(target)
         raise
 
 def has_wget():

From a7cac0e348ab9be0d56a390e87ea2ab74c69a12a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Sep 2013 10:01:46 -0400
Subject: [PATCH 1541/8469] Adding test capturing Distribute #349

--HG--
extra : amend_source : 2f401317ae94e6291ae91f8da75173781bc4c48c
---
 setuptools/tests/script-with-bom.py |  3 +++
 setuptools/tests/test_sandbox.py    | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 setuptools/tests/script-with-bom.py

diff --git a/setuptools/tests/script-with-bom.py b/setuptools/tests/script-with-bom.py
new file mode 100644
index 0000000000..22dee0d2a3
--- /dev/null
+++ b/setuptools/tests/script-with-bom.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+result = 'passed'
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 1609ee861b..3dad137683 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -5,7 +5,10 @@
 import shutil
 import unittest
 import tempfile
+import types
 
+import pkg_resources
+import setuptools.sandbox
 from setuptools.sandbox import DirectorySandbox, SandboxViolation
 
 def has_win32com():
@@ -62,5 +65,15 @@ def test_win32com(self):
             finally:
                 if os.path.exists(target): os.remove(target)
 
+    def test_setup_py_with_BOM(self):
+        """
+        It should be possible to execute a setup.py with a Byte Order Mark
+        """
+        target = pkg_resources.resource_filename(__name__,
+            'script-with-bom.py')
+        namespace = types.ModuleType('namespace')
+        setuptools.sandbox.execfile(target, vars(namespace))
+        assert namespace.result == 'passed'
+
 if __name__ == '__main__':
     unittest.main()

From 052e7b4453d950d11025107e9c98fa0be744d72f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Sep 2013 10:10:08 -0400
Subject: [PATCH 1542/8469] execfile now opens target in binary mode for better
 compatibility. Fixes Distribute #349.

---
 CHANGES.txt          | 7 +++++++
 setuptools/compat.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index de8285a2e0..1b91a2c269 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+1.1.6
+-----
+
+* Distribute #349: ``sandbox.execfile`` now opens the target file in binary
+  mode, thus honoring a BOM in the file when compiled.
+
 -----
 1.1.5
 -----
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 860c39f347..529a5fbc4d 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -84,7 +84,7 @@ def execfile(fn, globs=None, locs=None):
             globs = globals()
         if locs is None:
             locs = globs
-        f = open(fn)
+        f = open(fn, 'rb')
         try:
             source = f.read()
         finally:

From 376c4fad8ed418c0371ffdcdcc2bc5066a525421 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Sep 2013 10:20:12 -0400
Subject: [PATCH 1543/8469] Added tag 1.1.6 for changeset 5e426bdeb46b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 50bb2d5000..bd3b7d3608 100644
--- a/.hgtags
+++ b/.hgtags
@@ -99,3 +99,4 @@ d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
 ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
 f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
 d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
+5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6

From 0d7e10fd181ad260256be32cb86125211cf46be9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Sep 2013 10:20:36 -0400
Subject: [PATCH 1544/8469] Bumped to 1.1.7 in preparation for next release.

---
 ez_setup.py                          |   2 +-
 setuptools.egg-info/entry_points.txt | 100 +++++++++++++--------------
 setuptools.egg-info/requires.txt     |  10 +--
 setuptools/version.py                |   2 +-
 4 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b02f3f17b0..9f2bd46103 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.6"
+DEFAULT_VERSION = "1.1.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 4acc9af406..4a09dd1c26 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[distutils.commands]
-alias = setuptools.command.alias:alias
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-rotate = setuptools.command.rotate:rotate
-install_scripts = setuptools.command.install_scripts:install_scripts
-saveopts = setuptools.command.saveopts:saveopts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-egg_info = setuptools.command.egg_info:egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-upload_docs = setuptools.command.upload_docs:upload_docs
-easy_install = setuptools.command.easy_install:easy_install
-install = setuptools.command.install:install
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-build_py = setuptools.command.build_py:build_py
-setopt = setuptools.command.setopt:setopt
-sdist = setuptools.command.sdist:sdist
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [distutils.setup_keywords]
+packages = setuptools.dist:check_packages
+install_requires = setuptools.dist:check_requirements
 eager_resources = setuptools.dist:assert_string_list
 include_package_data = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-namespace_packages = setuptools.dist:check_nsp
-use_2to3 = setuptools.dist:assert_bool
-zip_safe = setuptools.dist:assert_bool
-entry_points = setuptools.dist:check_entry_points
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
 test_loader = setuptools.dist:check_importable
+extras_require = setuptools.dist:check_extras
+use_2to3_fixers = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
 dependency_links = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+
+[distutils.commands]
+rotate = setuptools.command.rotate:rotate
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_scripts = setuptools.command.install_scripts:install_scripts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_py = setuptools.command.build_py:build_py
+build_ext = setuptools.command.build_ext:build_ext
+install = setuptools.command.install:install
+sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
+saveopts = setuptools.command.saveopts:saveopts
+develop = setuptools.command.develop:develop
+alias = setuptools.command.alias:alias
+register = setuptools.command.register:register
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+test = setuptools.command.test:test
+easy_install = setuptools.command.easy_install:easy_install
+install_lib = setuptools.command.install_lib:install_lib
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e8e2105dd0..0b577c9748 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 6ebd335c55..9910ac22e5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.6'
+__version__ = '1.1.7'

From 621f405d07fc9f3509a186c7650c6752b0436e01 Mon Sep 17 00:00:00 2001
From: Niklas Rigemo <niklas.rigemo@gmail.com>
Date: Thu, 19 Sep 2013 12:48:10 +0200
Subject: [PATCH 1545/8469] PEP8: Corrected multiple statements on one line
 (semicolon)

--HG--
branch : patch1
---
 setuptools/script template (dev).py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
index 901790e7bd..1069cb0e52 100644
--- a/setuptools/script template (dev).py	
+++ b/setuptools/script template (dev).py	
@@ -1,6 +1,7 @@
 # EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
 __requires__ = """%(spec)r"""
-from pkg_resources import require; require("""%(spec)r""")
+from pkg_resources import require
+require("""%(spec)r""")
 del require
 __file__ = """%(dev_path)r"""
 try:

From 1ed46282652e83edc8b88f64a279aacee182553d Mon Sep 17 00:00:00 2001
From: Niklas Rigemo <niklas.rigemo@gmail.com>
Date: Thu, 19 Sep 2013 12:55:55 +0200
Subject: [PATCH 1546/8469] Bug Correction: Avoid double execution when the
 application throws NameError exception.

--HG--
branch : patch1
---
 setuptools/script template (dev).py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
index 1069cb0e52..b3fe209ecb 100644
--- a/setuptools/script template (dev).py	
+++ b/setuptools/script template (dev).py	
@@ -1,10 +1,11 @@
 # EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
 __requires__ = """%(spec)r"""
+import sys
 from pkg_resources import require
 require("""%(spec)r""")
 del require
 __file__ = """%(dev_path)r"""
-try:
+if sys.version_info < (3, 0):
     execfile(__file__)
-except NameError:
+else:
     exec(compile(open(__file__).read(), __file__, 'exec'))

From ce3c43cbd5e2c08ec63e6765fca8c590dd4df2b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Sep 2013 21:29:03 -0400
Subject: [PATCH 1547/8469] extract _clean_check call

---
 ez_setup.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 16b8016dcd..c3069e7a71 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -151,6 +151,18 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         return _do_download(version, download_base, to_dir,
                             download_delay)
 
+def _clean_check(cmd, target):
+    """
+    Run the command to download target. If the command fails, clean up before
+    re-raising the error.
+    """
+    try:
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError:
+        if os.access(target, os.F_OK):
+            os.unlink(target)
+        raise
+
 def download_file_powershell(url, target):
     """
     Download the file at url to target using Powershell (which will validate
@@ -162,12 +174,7 @@ def download_file_powershell(url, target):
         '-Command',
         "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
     ]
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError:
-        if os.access(target, os.F_OK):
-            os.unlink(target)
-        raise
+    _clean_check(cmd, target)
 
 def has_powershell():
     if platform.system() != 'Windows':
@@ -187,12 +194,7 @@ def has_powershell():
 
 def download_file_curl(url, target):
     cmd = ['curl', url, '--silent', '--output', target]
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError:
-        if os.access(target, os.F_OK):
-            os.unlink(target)
-        raise
+    _clean_check(cmd, target)
 
 def has_curl():
     cmd = ['curl', '--version']
@@ -210,12 +212,7 @@ def has_curl():
 
 def download_file_wget(url, target):
     cmd = ['wget', url, '--quiet', '--output-document', target]
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError:
-        if os.access(target, os.F_OK):
-            os.unlink(target)
-        raise
+    _clean_check(cmd, target)
 
 def has_wget():
     cmd = ['wget', '--version']

From 49ce80613b7fcffd1882f7fb082e5bcc30e976f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Sep 2013 21:51:13 -0400
Subject: [PATCH 1548/8469] Update changelog

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1b91a2c269..f97dca3c18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+-----
+1.1.7
+-----
+
+* Fixed behavior of NameError handling in 'script template (dev).py' (script
+  launcher for 'develop' installs).
+* ``ez_setup.py`` now ensures partial downloads are cleaned up following
+  a failed download.
+
 -----
 1.1.6
 -----

From 30bb58f069cf1624f35cfbdb725e8e443ff64330 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 28 Sep 2013 12:14:12 -0500
Subject: [PATCH 1549/8469] Added a legacy fallback test Added in code to after
 a deprecation warning parse the .svn files Should also parse externals.

--HG--
extra : rebase_source : 9dd3bcf22cb56eb0826051f9e477f155e47cdbf6
---
 setuptools.egg-info/entry_points.txt | 124 +++++++-------
 setuptools.egg-info/requires.txt     |   8 +-
 setuptools/svn_utils.py              | 240 +++++++++++++++++++++++++--
 setuptools/tests/test_egg_info.py    |  21 +++
 4 files changed, 310 insertions(+), 83 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index d64b3c288e..478fac7dc1 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-use_2to3 = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-exclude_package_data = setuptools.dist:check_package_data
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
-entry_points = setuptools.dist:check_entry_points
-zip_safe = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[egg_info.writers]
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-requires.txt = setuptools.command.egg_info:write_requirements
-
-[distutils.commands]
-test = setuptools.command.test:test
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
-build_ext = setuptools.command.build_ext:build_ext
-upload_docs = setuptools.command.upload_docs:upload_docs
-easy_install = setuptools.command.easy_install:easy_install
-install = setuptools.command.install:install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
-rotate = setuptools.command.rotate:rotate
-saveopts = setuptools.command.saveopts:saveopts
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_py = setuptools.command.build_py:build_py
-register = setuptools.command.register:register
-
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+exclude_package_data = setuptools.dist:check_package_data
+extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+convert_2to3_doctests = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[egg_info.writers]
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
+
+[distutils.commands]
+test = setuptools.command.test:test
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+easy_install = setuptools.command.easy_install:easy_install
+install = setuptools.command.install:install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_lib = setuptools.command.install_lib:install_lib
+rotate = setuptools.command.rotate:rotate
+saveopts = setuptools.command.saveopts:saveopts
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_py = setuptools.command.build_py:build_py
+register = setuptools.command.register:register
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 91d84d9ca8..221040f812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
@@ -9,5 +9,5 @@ ctypes==1.0.2
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 17b211d7c1..22b45cd7ea 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -6,7 +6,9 @@
 import shlex
 import locale
 import unicodedata
+import warnings
 from setuptools.compat import unicode, bytes
+from xml.sax.saxutils import unescape
 
 try:
     import urlparse
@@ -23,6 +25,8 @@
 #       http://bugs.python.org/issue8557
 #       http://stackoverflow.com/questions/5658622/
 #              python-subprocess-popen-environment-path
+
+
 def _run_command(args, stdout=_PIPE, stderr=_PIPE):
     #regarding the shell argument, see: http://bugs.python.org/issue8557
     try:
@@ -63,10 +67,10 @@ def _get_xml_data(decoded_str):
     return data
 
 
-def joinpath(prefix, suffix):
+def joinpath(prefix, *suffix):
     if not prefix or prefix == '.':
-        return suffix
-    return os.path.join(prefix, suffix)
+        return os.path.join(*suffix)
+    return os.path.join(prefix, *suffix)
 
 
 def fsencode(path):
@@ -87,6 +91,7 @@ def fsencode(path):
 
     return path
 
+
 def fsdecode(path):
     "Path must be unicode or in file system encoding already"
     encoding = sys.getfilesystemencoding()
@@ -98,6 +103,7 @@ def fsdecode(path):
 
     return unicodedata.normalize('NFC', path)
 
+
 def consoledecode(text):
     encoding = locale.getpreferredencoding()
     return text.decode(encoding)
@@ -130,9 +136,7 @@ def parse_externals_xml(decoded_str, prefix=''):
         if event == 'START_ELEMENT' and node.nodeName == 'target':
             doc.expandNode(node)
             path = os.path.normpath(node.getAttribute('path'))
-            log.warn('')
-            log.warn('PRE: %s' % prefix)
-            log.warn('PTH: %s' % path)
+
             if os.path.normcase(path).startswith(prefix):
                 path = path[len(prefix)+1:]
 
@@ -154,7 +158,7 @@ def parse_external_prop(lines):
     """
     externals = []
     for line in lines.splitlines():
-        line = line.lstrip() #there might be a "\ "
+        line = line.lstrip()  # there might be a "\ "
         if not line:
             continue
 
@@ -178,6 +182,26 @@ def parse_external_prop(lines):
     return externals
 
 
+def parse_prop_file(filename, key):
+    found = False
+    f = open(filename, 'rt')
+    data = ''
+    try:
+        for line in iter(f.readline, ''):    # can't use direct iter!
+            parts = line.split()
+            if len(parts) == 2:
+                kind, length = parts
+                data = f.read(int(length))
+                if kind == 'K' and data == key:
+                    found = True
+                elif kind == 'V' and found:
+                    break
+    finally:
+        f.close()
+
+    return data
+
+
 class SvnInfo(object):
     '''
     Generic svn_info object.  No has little knowledge of how to extract
@@ -203,14 +227,24 @@ def get_svn_version():
 
     @classmethod
     def load(cls, dirname=''):
-        code, data = _run_command(['svn', 'info', os.path.normpath(dirname)])
+        normdir = os.path.normpath(dirname)
+        code, data = _run_command(['svn', 'info', normdir])
+        has_svn = os.path.isdir(os.path.join(normdir, '.svn'))
         svn_version = tuple(cls.get_svn_version().split('.'))
-        base_svn_version = tuple(int(x) for x in svn_version[:2])
-        if code and base_svn_version:
-            #Not an SVN repository or compatible one
-            return SvnInfo(dirname)
-        elif base_svn_version < (1, 3):
-            log.warn('Insufficent version of SVN found')
+
+        try:
+            base_svn_version = tuple(int(x) for x in svn_version[:2])
+        except ValueError:
+            base_svn_version = tuple()
+
+        if has_svn and (code or not base_svn_version 
+                             or base_svn_version < (1, 3)):
+            log.warn('Fallback onto .svn parsing')
+            warnings.warn(("No SVN 1.3+ command found: falling back "
+                           "on pre 1.7 .svn parsing"), DeprecationWarning)
+            return SvnFileInfo(dirname)
+        elif not has_svn:
+            log.warn('Not SVN Repository')
             return SvnInfo(dirname)
         elif base_svn_version < (1, 5):
             return Svn13Info(dirname)
@@ -259,7 +293,7 @@ def iter_files(self):
         Iterate over the non-deleted file entries in the repository path
         '''
         for item, kind in self.entries:
-            if kind.lower()=='file':
+            if kind.lower() == 'file':
                 yield item
 
     def iter_dirs(self, include_root=True):
@@ -269,7 +303,7 @@ def iter_dirs(self, include_root=True):
         if include_root:
             yield self.path
         for item, kind in self.entries:
-            if kind.lower()=='dir':
+            if kind.lower() == 'dir':
                 yield item
 
     def get_entries(self):
@@ -278,6 +312,7 @@ def get_entries(self):
     def get_externals(self):
         return []
 
+
 class Svn13Info(SvnInfo):
     def get_entries(self):
         code, data = _run_command(['svn', 'info', '-R', '--xml', self.path])
@@ -316,6 +351,73 @@ def get_externals(self):
         return parse_externals_xml(lines, prefix=os.path.abspath(self.path))
 
 
+class SvnFileInfo(SvnInfo):
+
+    def __init__(self, path=''):
+        super(SvnFileInfo, self).__init__(path)
+        self._directories = None
+        self._revision = None
+
+    def _walk_svn(self, base):
+        entry_file = joinpath(base, '.svn', 'entries')
+        if os.path.isfile(entry_file):
+            entries = SVNEntriesFile.load(base)
+            yield (base, False, entries.parse_revision())
+            for path in entries.get_undeleted_records():
+                path = joinpath(base, path)
+                if os.path.isfile(path):
+                    yield (path, True, None)
+                elif os.path.isdir(path):
+                    for item in self._walk_svn(path):
+                        yield item
+
+    def _build_entries(self):
+        dirs = list()
+        files = list()
+        rev = 0
+        for path, isfile, dir_rev in self._walk_svn(self.path):
+            if isfile:
+                files.append(path)
+            else:
+                dirs.append(path)
+                rev = max(rev, dir_rev)
+
+        self._directories = dirs
+        self._entries = files
+        self._revision = rev
+
+    def get_entries(self):
+        if self._entries is None:
+            self._build_entries()
+        return self._entries
+
+    def get_revision(self):
+        if self._revision is None:
+            self._build_entries()
+        return self._revision
+
+    def get_externals(self):
+        if self._directories is None:
+            self._build_entries()
+
+        prop_files = [['.svn', 'dir-prop-base'],
+                      ['.svn', 'dir-props']]
+        externals = []
+
+        for dirname in self._directories:
+            prop_file = None
+            for rel_parts in prop_files:
+                filename = joinpath(dirname, *rel_parts)
+                if os.path.isfile(filename):
+                    prop_file = filename
+
+            if prop_file is not None:
+                ext_prop = parse_prop_file(prop_file, 'svn:externals')
+                externals.extend(parse_external_prop(ext_prop))
+
+        return externals
+
+
 def svn_finder(dirname=''):
     #combined externals due to common interface
     #combined externals and entries due to lack of dir_props in 1.7
@@ -328,6 +430,110 @@ def svn_finder(dirname=''):
         for sub_path in sub_info.iter_files():
             yield fsencode(sub_path)
 
+
+class SVNEntriesFile(object):
+    def __init__(self, data):
+        self.data = data
+
+    @classmethod
+    def load(class_, base):
+        filename = os.path.join(base, '.svn', 'entries')
+        f = open(filename)
+        try:
+            result = SVNEntriesFile.read(f)
+        finally:
+            f.close()
+        return result
+
+    @classmethod
+    def read(class_, fileobj):
+        data = fileobj.read()
+        is_xml = data.startswith('<?xml')
+        class_ = [SVNEntriesFileText, SVNEntriesFileXML][is_xml]
+        return class_(data)
+
+    def parse_revision(self):
+        all_revs = self.parse_revision_numbers() + [0]
+        return max(all_revs)
+
+
+class SVNEntriesFileText(SVNEntriesFile):
+    known_svn_versions = {
+        '1.4.x': 8,
+        '1.5.x': 9,
+        '1.6.x': 10,
+    }
+
+    def __get_cached_sections(self):
+        return self.sections
+
+    def get_sections(self):
+        SECTION_DIVIDER = '\f\n'
+        sections = self.data.split(SECTION_DIVIDER)
+        sections = [x for x in map(str.splitlines, sections)]
+        try:
+            # remove the SVN version number from the first line
+            svn_version = int(sections[0].pop(0))
+            if not svn_version in self.known_svn_versions.values():
+                log.warn("Unknown subversion verson %d", svn_version)
+        except ValueError:
+            return
+        self.sections = sections
+        self.get_sections = self.__get_cached_sections
+        return self.sections
+
+    def is_valid(self):
+        return bool(self.get_sections())
+
+    def get_url(self):
+        return self.get_sections()[0][4]
+
+    def parse_revision_numbers(self):
+        revision_line_number = 9
+        rev_numbers = [
+            int(section[revision_line_number])
+            for section in self.get_sections()
+            if (len(section) > revision_line_number
+                and section[revision_line_number])
+        ]
+        return rev_numbers
+
+    def get_undeleted_records(self):
+        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
+        result = [
+            section[0]
+            for section in self.get_sections()
+            if undeleted(section)
+        ]
+        return result
+
+
+class SVNEntriesFileXML(SVNEntriesFile):
+    def is_valid(self):
+        return True
+
+    def get_url(self):
+        "Get repository URL"
+        urlre = re.compile('url="([^"]+)"')
+        return urlre.search(self.data).group(1)
+
+    def parse_revision_numbers(self):
+        revre = re.compile(r'committed-rev="(\d+)"')
+        return [
+            int(m.group(1))
+            for m in revre.finditer(self.data)
+        ]
+
+    def get_undeleted_records(self):
+        entries_pattern = \
+            re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I)
+        results = [
+            unescape(match.group(1))
+            for match in entries_pattern.finditer(self.data)
+        ]
+        return results
+
+
 if __name__ == '__main__':
     for name in svn_finder(sys.argv[1]):
-        print(name)
\ No newline at end of file
+        print(name)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 95667b696a..7abafd7165 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -48,6 +48,27 @@ def test_version_10_format(self):
         rev = egg_info.egg_info.get_svn_revision()
         self.assertEqual(rev, '89000')
 
+    def test_version_10_format_legacy_parser(self):
+        """
+        """
+        path_variable = None
+        for env in os.environ:
+            if env.lower() == 'path':
+                path_variable = env
+
+        if path_variable is None:
+            self.skipTest('Cannot figure out how to modify path')
+
+        old_path = os.environ[path_variable]
+        os.environ[path_variable] = ''
+        try:
+            self._write_entries(ENTRIES_V10)
+            rev = egg_info.egg_info.get_svn_revision()
+        finally:
+            os.environ[path_variable] = old_path
+
+        self.assertEqual(rev, '89000')
+
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)

From 69cd661c7786c927a48c0a48f1438b6f13b3f1d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2013 21:44:40 -0400
Subject: [PATCH 1550/8469] Added tag 1.1.7 for changeset cc9b19cd0ec6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bd3b7d3608..db97710cd4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -100,3 +100,4 @@ ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
 f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
 d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
 5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
+cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7

From 1e0a9fb4a7f76e45970d11955caf5a1e5eb1db47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2013 21:45:02 -0400
Subject: [PATCH 1551/8469] Bumped to 1.1.8 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 86 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/version.py                |  2 +-
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c3069e7a71..a46b9005ab 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.7"
+DEFAULT_VERSION = "1.1.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 4a09dd1c26..a5f253cec7 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-use_2to3_fixers = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.commands]
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 rotate = setuptools.command.rotate:rotate
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_scripts = setuptools.command.install_scripts:install_scripts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
 build_ext = setuptools.command.build_ext:build_ext
-install = setuptools.command.install:install
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-saveopts = setuptools.command.saveopts:saveopts
+install_lib = setuptools.command.install_lib:install_lib
 develop = setuptools.command.develop:develop
+saveopts = setuptools.command.saveopts:saveopts
+build_py = setuptools.command.build_py:build_py
+upload_docs = setuptools.command.upload_docs:upload_docs
+egg_info = setuptools.command.egg_info:egg_info
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+sdist = setuptools.command.sdist:sdist
 alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
 register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
 test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-install_lib = setuptools.command.install_lib:install_lib
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+setopt = setuptools.command.setopt:setopt
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+[distutils.setup_keywords]
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+convert_2to3_doctests = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..7a47af1df0 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 9910ac22e5..f0be1393db 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.7'
+__version__ = '1.1.8'

From 78a4d637f1db446d06f68929d76e76acd7121628 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 28 Oct 2013 10:54:34 -0700
Subject: [PATCH 1552/8469] Import socket.error so the code throws the correct
 exception

---
 setuptools/ssl_support.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2aec655a09..479b0d2fa2 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -44,6 +44,7 @@
 try:
     from socket import create_connection
 except ImportError:
+    from socket import error
     _GLOBAL_DEFAULT_TIMEOUT = getattr(socket, '_GLOBAL_DEFAULT_TIMEOUT', object())
     def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
                           source_address=None):

From 38fcb3e366ee7a21ff5f0f550fe190b1326fc04b Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 28 Oct 2013 10:35:37 -0700
Subject: [PATCH 1553/8469] Update ssl_match_hostname to match new stdlib code
 that fixes a security issue with IDNA domains.

---
 setuptools/ssl_support.py | 76 +++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 22 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 90359b2c51..4941d94e75 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -88,30 +88,62 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
     class CertificateError(ValueError):
         pass
 
-    def _dnsname_to_pat(dn, max_wildcards=1):
+    def _dnsname_match(dn, hostname, max_wildcards=1):
+        """Matching according to RFC 6125, section 6.4.3
+
+        http://tools.ietf.org/html/rfc6125#section-6.4.3
+        """
         pats = []
-        for frag in dn.split(r'.'):
-            if frag.count('*') > max_wildcards:
-                # Issue #17980: avoid denials of service by refusing more
-                # than one wildcard per fragment.  A survery of established
-                # policy among SSL implementations showed it to be a
-                # reasonable choice.
-                raise CertificateError(
-                    "too many wildcards in certificate DNS name: " + repr(dn))
-            if frag == '*':
-                # When '*' is a fragment by itself, it matches a non-empty dotless
-                # fragment.
-                pats.append('[^.]+')
-            else:
-                # Otherwise, '*' matches any dotless fragment.
-                frag = re.escape(frag)
-                pats.append(frag.replace(r'\*', '[^.]*'))
-        return re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+        if not dn:
+            return False
+
+        # Ported from python3-syntax:
+        # leftmost, *remainder = dn.split(r'.')
+        parts = dn.split(r'.')
+        leftmost = parts[0]
+        remainder = parts[1:]
+
+        wildcards = leftmost.count('*')
+        if wildcards > max_wildcards:
+            # Issue #17980: avoid denials of service by refusing more
+            # than one wildcard per fragment.  A survey of established
+            # policy among SSL implementations showed it to be a
+            # reasonable choice.
+            raise CertificateError(
+                "too many wildcards in certificate DNS name: " + repr(dn))
+
+        # speed up common case w/o wildcards
+        if not wildcards:
+            return dn.lower() == hostname.lower()
+
+        # RFC 6125, section 6.4.3, subitem 1.
+        # The client SHOULD NOT attempt to match a presented identifier in which
+        # the wildcard character comprises a label other than the left-most label.
+        if leftmost == '*':
+            # When '*' is a fragment by itself, it matches a non-empty dotless
+            # fragment.
+            pats.append('[^.]+')
+        elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
+            # RFC 6125, section 6.4.3, subitem 3.
+            # The client SHOULD NOT attempt to match a presented identifier
+            # where the wildcard character is embedded within an A-label or
+            # U-label of an internationalized domain name.
+            pats.append(re.escape(leftmost))
+        else:
+            # Otherwise, '*' matches any dotless string, e.g. www*
+            pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
+
+        # add the remaining fragments, ignore any wildcards
+        for frag in remainder:
+            pats.append(re.escape(frag))
+
+        pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+        return pat.match(hostname)
 
     def match_hostname(cert, hostname):
         """Verify that *cert* (in decoded format as returned by
-        SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 rules
-        are mostly followed, but IP addresses are not accepted for *hostname*.
+        SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
+        rules are followed, but IP addresses are not accepted for *hostname*.
 
         CertificateError is raised on failure. On success, the function
         returns nothing.
@@ -122,7 +154,7 @@ def match_hostname(cert, hostname):
         san = cert.get('subjectAltName', ())
         for key, value in san:
             if key == 'DNS':
-                if _dnsname_to_pat(value).match(hostname):
+                if _dnsname_match(value, hostname):
                     return
                 dnsnames.append(value)
         if not dnsnames:
@@ -133,7 +165,7 @@ def match_hostname(cert, hostname):
                     # XXX according to RFC 2818, the most specific Common Name
                     # must be used.
                     if key == 'commonName':
-                        if _dnsname_to_pat(value).match(hostname):
+                        if _dnsname_match(value, hostname):
                             return
                         dnsnames.append(value)
         if len(dnsnames) > 1:

From ad6bce6ab02836ea6d90e69e5c6f3b851532874a Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 28 Oct 2013 10:43:08 -0700
Subject: [PATCH 1554/8469] Look for the backports-ssl_match_hostname module
 from pypi before using our bundled/backported code

---
 setuptools/ssl_support.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 4941d94e75..e1cf8040ce 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -85,9 +85,18 @@ def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
 try:
     from ssl import CertificateError, match_hostname
 except ImportError:
+    try:
+        from backports.ssl_match_hostname import CertificateError
+        from backports.ssl_match_hostname import match_hostname
+    except ImportError:
+        CertificateError = None
+        match_hostname = None
+
+if not CertificateError:
     class CertificateError(ValueError):
         pass
 
+if not match_hostname:
     def _dnsname_match(dn, hostname, max_wildcards=1):
         """Matching according to RFC 6125, section 6.4.3
 

From 035751b53a195645de0e51ba6b4a78f5774bed61 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Oct 2013 14:11:15 -0400
Subject: [PATCH 1555/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b97c10046a..b4e7846e58 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+1.2
+---
+
+* Issue #26: Add support for SVN 1.7. Special thanks to Philip Thiem for the
+  contribution.
+
 -----
 1.1.7
 -----

From 55b1ecfe8fea02b83fcb055f71c9b4bc32800d14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Oct 2013 14:13:35 -0400
Subject: [PATCH 1556/8469] Bump to 1.2 in preparation for feature release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index f0be1393db..64477cf292 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.8'
+__version__ = '1.2'

From f960a71cc4e03238bb20f92a32be96f058c95fc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Oct 2013 14:15:53 -0400
Subject: [PATCH 1557/8469] Added tag 1.2b1 for changeset 4c7dc4ae2440

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index db97710cd4..2e646d8fb0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -101,3 +101,4 @@ f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
 d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
 5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
 cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
+4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1

From 93bc29b8990b7976506be6aabc3bb50f3744909b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Oct 2013 14:40:50 -0400
Subject: [PATCH 1558/8469] Also bump version in ez_setup.py

---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index a46b9005ab..5dd5ab9abe 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.1.8"
+DEFAULT_VERSION = "1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):

From 45928d50cd992a38a0df25813bd13617c13c1462 Mon Sep 17 00:00:00 2001
From: Jonathan Dye <jonathan@lulz.bz>
Date: Thu, 31 Oct 2013 03:35:56 -0600
Subject: [PATCH 1559/8469] fixes a bug where a Basic auth digest header can
 get encoded with newlines inside

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4c9e40a7b1..94873620b8 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -918,7 +918,7 @@ def _encode_auth(auth):
     # convert back to a string
     encoded = encoded_bytes.decode()
     # strip the trailing carriage return
-    return encoded.rstrip()
+    return encoded.replace('\n','')
 
 def open_with_auth(url, opener=urllib2.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""

From af2c7f274540acf6a6d61c8b82383725a3c00056 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 14:10:30 -0400
Subject: [PATCH 1560/8469] Include wheels in standard release. Fixes #93.

--HG--
extra : amend_source : 142fda8f9cdb6612326d2aed5712f8fe86aec8ac
---
 release.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.py b/release.py
index 15f71a2d69..f4dff0d29d 100644
--- a/release.py
+++ b/release.py
@@ -25,6 +25,8 @@ def after_push():
     'ez_setup.py', 'setuptools/version.py',
 )
 
+dist_commands = 'sdist', 'bdist_wheel'
+
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"

From af3fd3f34f11fc0019a7be355c54ddc2136c4539 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 14:27:11 -0400
Subject: [PATCH 1561/8469] Update changelog

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b4e7846e58..7934de0f51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,9 @@ CHANGES
 
 * Issue #26: Add support for SVN 1.7. Special thanks to Philip Thiem for the
   contribution.
+* Issue #94: Wheels are now distributed with every release.
+* Setuptools "natural" launcher support, introduced in 1.0, is now officially
+  supported.
 
 -----
 1.1.7

From ba69a7d1b51dab692c6efc58b1cc7350061bdbf0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 14:30:54 -0400
Subject: [PATCH 1562/8469] Added tag 1.2 for changeset 77921bbe3931

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2e646d8fb0..ee4f63a283 100644
--- a/.hgtags
+++ b/.hgtags
@@ -102,3 +102,4 @@ d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
 5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
 cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1
+77921bbe3931caf40474dc36e55d3d541981c749 1.2

From 2644c5e54c7d5dae012a09f7d73d473d31aa2857 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 14:31:25 -0400
Subject: [PATCH 1563/8469] Bumped to 1.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/version.py                |  2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5dd5ab9abe..64eaca559e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.2"
+DEFAULT_VERSION = "1.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index a5f253cec7..718c478726 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+tests_require = setuptools.dist:check_requirements
+include_package_data = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
 
 [distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-rotate = setuptools.command.rotate:rotate
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
-develop = setuptools.command.develop:develop
-saveopts = setuptools.command.saveopts:saveopts
-build_py = setuptools.command.build_py:build_py
+test = setuptools.command.test:test
 upload_docs = setuptools.command.upload_docs:upload_docs
-egg_info = setuptools.command.egg_info:egg_info
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_py = setuptools.command.build_py:build_py
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 sdist = setuptools.command.sdist:sdist
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
+develop = setuptools.command.develop:develop
 register = setuptools.command.register:register
-test = setuptools.command.test:test
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
 setopt = setuptools.command.setopt:setopt
-
-[distutils.setup_keywords]
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-zip_safe = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-convert_2to3_doctests = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-use_2to3_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
+rotate = setuptools.command.rotate:rotate
+install_scripts = setuptools.command.install_scripts:install_scripts
+saveopts = setuptools.command.saveopts:saveopts
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install = setuptools.command.install:install
+easy_install = setuptools.command.easy_install:easy_install
+egg_info = setuptools.command.egg_info:egg_info
+build_ext = setuptools.command.build_ext:build_ext
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 7a47af1df0..0b577c9748 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
-[certs]
-certifi==0.0.8
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
+[certs]
+certifi==0.0.8
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 64477cf292..6f4fa58fe0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.2'
+__version__ = '1.3'

From e30f30948f572ee32229103a2f2438766a98e040 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 11:30:24 -0500
Subject: [PATCH 1564/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7934de0f51..73ba3df5ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+---
+1.3
+---
+
+* Address security vulnerability in SSL match_hostname check as reported in
+  Python #17997.
+* Prefer `backports.ssl_match_hostname
+  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ for backport
+  implementation if present.
+
 ---
 1.2
 ---

From 14e2b1c3fdd82c926e1e1122d9656a07d41328c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 11:36:16 -0500
Subject: [PATCH 1565/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 73ba3df5ba..6ae840b3cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ CHANGES
 * Prefer `backports.ssl_match_hostname
   <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ for backport
   implementation if present.
+* Correct NameError in ``ssl_support`` module (``socket.error``).
 
 ---
 1.2

From 816b15494393c74219373a268c29a6460a0a636e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 11:37:49 -0500
Subject: [PATCH 1566/8469] Added tag 1.3 for changeset 19873119647d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ee4f63a283..6d2e01aa2f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -103,3 +103,4 @@ d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
 cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1
 77921bbe3931caf40474dc36e55d3d541981c749 1.2
+19873119647deae8a68e9ed683317b9ee170a8d8 1.3

From c92770125e3f86384d7a0020215dc7a7016af9f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 11:38:19 -0500
Subject: [PATCH 1567/8469] Bumped to 1.4 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 64eaca559e..72d35a5b42 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.3"
+DEFAULT_VERSION = "1.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 718c478726..fdf63bf086 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.3 = setuptools.command.easy_install:main
 
-[distutils.setup_keywords]
-tests_require = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
 requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 
 [distutils.commands]
-test = setuptools.command.test:test
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
 install_lib = setuptools.command.install_lib:install_lib
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
 register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-rotate = setuptools.command.rotate:rotate
-install_scripts = setuptools.command.install_scripts:install_scripts
-saveopts = setuptools.command.saveopts:saveopts
-alias = setuptools.command.alias:alias
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install = setuptools.command.install:install
 easy_install = setuptools.command.easy_install:easy_install
+setopt = setuptools.command.setopt:setopt
 egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+develop = setuptools.command.develop:develop
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_py = setuptools.command.build_py:build_py
+rotate = setuptools.command.rotate:rotate
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+alias = setuptools.command.alias:alias
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+namespace_packages = setuptools.dist:check_nsp
+packages = setuptools.dist:check_packages
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+tests_require = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+include_package_data = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c9748..6d385dc746 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,8 +1,5 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
@@ -10,4 +7,7 @@ ssl==1.16
 certifi==0.0.8
 
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 6f4fa58fe0..0f663085de 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3'
+__version__ = '1.4'

From 71a3053e854c5f059a9d71d94cbb1bc8a4e641f3 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Mon, 4 Nov 2013 11:26:03 -0800
Subject: [PATCH 1568/8469] Add svn test data

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index ff1021234a..76822cbda2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
 recursive-include setuptools *.py *.txt *.exe *.xml
 recursive-include tests *.py *.c *.pyx *.txt
 recursive-include setuptools/tests *.html entries*
+recursive-include setuptools/tests/svn_data *.zip
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
 include *.py

From 748f46273dbaf80b04cf69b8cbd0f4cf6e37a9b6 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Tue, 5 Nov 2013 14:11:53 +0000
Subject: [PATCH 1569/8469] Removed verbose warning from svn_utils.py

---
 setuptools/svn_utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 22b45cd7ea..55dbb74d3c 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -244,7 +244,6 @@ def load(cls, dirname=''):
                            "on pre 1.7 .svn parsing"), DeprecationWarning)
             return SvnFileInfo(dirname)
         elif not has_svn:
-            log.warn('Not SVN Repository')
             return SvnInfo(dirname)
         elif base_svn_version < (1, 5):
             return Svn13Info(dirname)

From 69a13626755104a3e92294e31018c183c4eeefc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Nov 2013 19:46:13 -0500
Subject: [PATCH 1570/8469] Remove svn17_example.zip

---
 setuptools/tests/svn17_example.zip | Bin 19342 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 setuptools/tests/svn17_example.zip

diff --git a/setuptools/tests/svn17_example.zip b/setuptools/tests/svn17_example.zip
deleted file mode 100644
index cfabd2b2d4cb975d4bf160f5bd991e7bf28f8ec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19342
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
LXzDj{fxrD9{;(+L


From 009ebf9ed37dc39af25a465219a082efab99cc13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Nov 2013 20:15:23 -0500
Subject: [PATCH 1571/8469] Delint (remove unused imports, excess whitespace,
 unnecessary syntax, and unused variables)

---
 setuptools/tests/test_svn.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 59ecb25b1a..5418b9a43e 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -3,21 +3,13 @@
 
 
 import os
-import sys
 import unittest
 import codecs
 from setuptools.tests import environment
-from setuptools.svn_utils import fsencode
 from setuptools.compat import unicode, unichr
 
 from setuptools import svn_utils
 
-#requires python >= 2.4
-from subprocess import call as _call
-
-from distutils import log
-
-
 
 class TestSvnVersion(unittest.TestCase):
 
@@ -64,13 +56,6 @@ def parse_tester(self, svn_name, ext_spaces):
 
         data = _read_utf8_file(path)
 
-        if ext_spaces:
-            folder2 = 'third party2'
-            folder3 = 'third party3'
-        else:
-            folder2 = 'third_party2'
-            folder3 = 'third_party3'
-
         expected = set([
             ("\\".join((example_base, 'a file')), 'file'),
             ("\\".join((example_base, 'folder')), 'dir'),
@@ -116,7 +101,7 @@ def parse_tester(self, svn_name, ext_spaces):
         expected = set([
             os.sep.join((example_base, folder2)),
             os.sep.join((example_base, folder3)),
-                                     #third_party大介
+            # folder is third_party大介
             os.sep.join((example_base,
                        unicode('third_party') +
                        unichr(0x5927) + unichr(0x4ecb))),
@@ -129,7 +114,7 @@ def parse_tester(self, svn_name, ext_spaces):
 
         expected = set(os.path.normpath(x) for x in expected)
         dir_base = os.sep.join(('C:', 'development', 'svn_example'))
-        self.assertEqual(set(x for x \
+        self.assertEqual(set(x for x
             in svn_utils.parse_externals_xml(data, dir_base)), expected)
 
     def test_svn15(self):
@@ -150,7 +135,6 @@ class ParseExternal(unittest.TestCase):
     def parse_tester(self, svn_name, ext_spaces):
         path = os.path.join('setuptools', 'tests',
                             'svn_data', svn_name + '_ext_list.txt')
-        example_base = svn_name + '_example'
         data = _read_utf8_file(path)
 
         if ext_spaces:
@@ -237,4 +221,3 @@ def test_externals(self):
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
-

From bfddd8a736a240ac17fa1641fec9214e0c1b44c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Nov 2013 01:07:16 -0500
Subject: [PATCH 1572/8469] Updated changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6ae840b3cf..11b8a50290 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+1.3.1
+-----
+
+* Remove exuberant warning in SVN support when SVN is not used.
+
 ---
 1.3
 ---

From 40b052c6cbb4349a43e6bf6c09bdab359e1a4689 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Nov 2013 01:14:46 -0500
Subject: [PATCH 1573/8469] Bumped to 1.3.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 72d35a5b42..3536ff681b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.4"
+DEFAULT_VERSION = "1.3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0f663085de..72837bdc78 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4'
+__version__ = '1.3.1'

From c2b98268b7bf2afa73a40680257207cce52d9469 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Nov 2013 01:14:48 -0500
Subject: [PATCH 1574/8469] Added tag 1.3.1 for changeset a197b626075a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6d2e01aa2f..c198d993de 100644
--- a/.hgtags
+++ b/.hgtags
@@ -104,3 +104,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1
 77921bbe3931caf40474dc36e55d3d541981c749 1.2
 19873119647deae8a68e9ed683317b9ee170a8d8 1.3
+a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1

From 52e317a70799cceedb959be2206ec5985d9c280d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Nov 2013 01:15:23 -0500
Subject: [PATCH 1575/8469] Bumped to 1.3.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3536ff681b..4da59fcd76 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.3.1"
+DEFAULT_VERSION = "1.3.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index fdf63bf086..73498a4c3b 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-entry_points.txt = setuptools.command.egg_info:write_entries
-requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
 [distutils.commands]
-install = setuptools.command.install:install
-install_lib = setuptools.command.install_lib:install_lib
-register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
 develop = setuptools.command.develop:develop
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-install_scripts = setuptools.command.install_scripts:install_scripts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+register = setuptools.command.register:register
+test = setuptools.command.test:test
 build_py = setuptools.command.build_py:build_py
+install_scripts = setuptools.command.install_scripts:install_scripts
 rotate = setuptools.command.rotate:rotate
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
+saveopts = setuptools.command.saveopts:saveopts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 alias = setuptools.command.alias:alias
+install_lib = setuptools.command.install_lib:install_lib
+easy_install = setuptools.command.easy_install:easy_install
+sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[egg_info.writers]
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-namespace_packages = setuptools.dist:check_nsp
-packages = setuptools.dist:check_packages
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-tests_require = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 test_suite = setuptools.dist:check_test_suite
-include_package_data = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+dependency_links = setuptools.dist:assert_string_list
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
+namespace_packages = setuptools.dist:check_nsp
 use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
 test_loader = setuptools.dist:check_importable
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+extras_require = setuptools.dist:check_extras
+entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 6d385dc746..5ff415da83 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
+[ssl:sys_platform=='win32']
+wincertstore==0.1
 
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 72837bdc78..e39833240e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3.1'
+__version__ = '1.3.2'

From b42ef986b9ce537638ea931422063f97a18f8981 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 7 Nov 2013 21:11:18 -0600
Subject: [PATCH 1576/8469] removed fsencode and fsdecode replaced fsencode
 with decode_as_string - decoded utf8 or console input to decode_as_string
 should be called on encoded string before joining BUG_FIX - It would seem
 that there is a issue wiht the legacy file listing   which this commit fits. 
 I have no clue how any of the other stuff would   had even worked.

---
 setuptools/svn_utils.py | 97 +++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 53 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 55dbb74d3c..6ac31a2471 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -27,18 +27,18 @@
 #              python-subprocess-popen-environment-path
 
 
-def _run_command(args, stdout=_PIPE, stderr=_PIPE):
+def _run_command(args, stdout=_PIPE, stderr=_PIPE, encoding=None, stream=0):
     #regarding the shell argument, see: http://bugs.python.org/issue8557
     try:
-        args = [fsdecode(x) for x in args]
         proc = _Popen(args, stdout=stdout, stderr=stderr,
                       shell=(sys.platform == 'win32'))
 
-        data = proc.communicate()[0]
+        data = proc.communicate()[stream]
     except OSError:
         return 1, ''
 
-    data = consoledecode(data)
+    #doubled checked and 
+    data = decode_as_string(data, encoding)
 
     #communciate calls wait()
     return proc.returncode, data
@@ -73,40 +73,28 @@ def joinpath(prefix, *suffix):
     return os.path.join(prefix, *suffix)
 
 
-def fsencode(path):
-    "Path must be unicode or in file system encoding already"
-    encoding = sys.getfilesystemencoding()
-
-    if isinstance(path, unicode):
-        path = path.encode()
-    elif not isinstance(path, bytes):
-        raise TypeError('%s is not a string or byte type'
-                        % type(path).__name__)
-
-    #getfilessystemencoding doesn't have the mac-roman issue
-    if encoding == 'utf-8' and sys.platform == 'darwin':
-        path = path.decode('utf-8')
-        path = unicodedata.normalize('NFD', path)
-        path = path.encode('utf-8')
-
-    return path
-
-
-def fsdecode(path):
-    "Path must be unicode or in file system encoding already"
-    encoding = sys.getfilesystemencoding()
-    if isinstance(path, bytes):
-        path = path.decode(encoding)
-    elif not isinstance(path, unicode):
-        raise TypeError('%s is not a byte type'
-                        % type(path).__name__)
-
-    return unicodedata.normalize('NFC', path)
+def decode_as_string(text, encoding=None):
+    """
+    Decode the console or file output explicitly using getpreferredencoding.
+    The text paraemeter should be a encoded string, if not no decode occurs
+    If no encoding is given, getpreferredencoding is used.  If encoding is 
+    specified, that is used instead.  This would be needed for SVN --xml 
+    output.  Unicode is explicitly put in composed NFC form.
+    
+    --xml should be UTF-8 (SVN Issue 2938) the discussion on the Subversion 
+    DEV List from 2007 seems to indicate the same.
+    """
+    #text should be a byte string    
 
+    if encoding is None:
+        encoding = locale.getpreferredencoding()
 
-def consoledecode(text):
-    encoding = locale.getpreferredencoding()
-    return text.decode(encoding)
+    if not isinstance(text, unicode):
+        text = text.decode(encoding)
+    
+    text = unicodedata.normalize('NFC', text)
+    
+    return text
 
 
 def parse_dir_entries(decoded_str):
@@ -141,6 +129,7 @@ def parse_externals_xml(decoded_str, prefix=''):
                 path = path[len(prefix)+1:]
 
             data = _get_target_property(node)
+            #data should be decoded already 
             for external in parse_external_prop(data):
                 externals.append(joinpath(path, external))
 
@@ -177,6 +166,7 @@ def parse_external_prop(lines):
         else:
             external = line[-1]
 
+        external = decode_as_string(external, encoding="utf-8")
         externals.append(os.path.normpath(external))
 
     return externals
@@ -214,9 +204,9 @@ class SvnInfo(object):
     def get_svn_version():
         code, data = _run_command(['svn', '--version', '--quiet'])
         if code == 0 and data:
-            return unicode(data).strip()
+            return data.strip()
         else:
-            return unicode('')
+            return ''
 
     #svnversion return values (previous implementations return max revision)
     #   4123:4168     mixed revision working copy
@@ -314,7 +304,8 @@ def get_externals(self):
 
 class Svn13Info(SvnInfo):
     def get_entries(self):
-        code, data = _run_command(['svn', 'info', '-R', '--xml', self.path])
+        code, data = _run_command(['svn', 'info', '-R', '--xml', self.path],
+                                  encoding="utf-8")
 
         if code:
             log.debug("svn info failed")
@@ -328,10 +319,11 @@ def get_externals(self):
         cmd = ['svn', 'propget', 'svn:externals']
         result = []
         for folder in self.iter_dirs():
-            code, lines = _run_command(cmd + [folder])
+            code, lines = _run_command(cmd + [folder], encoding="utf-8")
             if code != 0:
                 log.warn("svn propget failed")
                 return []
+            #lines should a str
             for external in parse_external_prop(lines):
                 if folder:
                     external = os.path.join(folder, external)
@@ -343,7 +335,7 @@ def get_externals(self):
 class Svn15Info(Svn13Info):
     def get_externals(self):
         cmd = ['svn', 'propget', 'svn:externals', self.path, '-R', '--xml']
-        code, lines = _run_command(cmd)
+        code, lines = _run_command(cmd, encoding="utf-8")
         if code:
             log.debug("svn propget failed")
             return []
@@ -363,6 +355,7 @@ def _walk_svn(self, base):
             entries = SVNEntriesFile.load(base)
             yield (base, False, entries.parse_revision())
             for path in entries.get_undeleted_records():
+                path = decode_as_string(path)
                 path = joinpath(base, path)
                 if os.path.isfile(path):
                     yield (path, True, None)
@@ -371,18 +364,17 @@ def _walk_svn(self, base):
                         yield item
 
     def _build_entries(self):
-        dirs = list()
-        files = list()
+        entries = list()
+
         rev = 0
         for path, isfile, dir_rev in self._walk_svn(self.path):
             if isfile:
-                files.append(path)
+                entries.append((path, 'file'))
             else:
-                dirs.append(path)
+                entries.append((path, 'dir'))
                 rev = max(rev, dir_rev)
 
-        self._directories = dirs
-        self._entries = files
+        self._entries = entries
         self._revision = rev
 
     def get_entries(self):
@@ -396,14 +388,11 @@ def get_revision(self):
         return self._revision
 
     def get_externals(self):
-        if self._directories is None:
-            self._build_entries()
-
         prop_files = [['.svn', 'dir-prop-base'],
                       ['.svn', 'dir-props']]
         externals = []
 
-        for dirname in self._directories:
+        for dirname in self.iter_dirs():
             prop_file = None
             for rel_parts in prop_files:
                 filename = joinpath(dirname, *rel_parts)
@@ -412,6 +401,8 @@ def get_externals(self):
 
             if prop_file is not None:
                 ext_prop = parse_prop_file(prop_file, 'svn:externals')
+                #ext_prop should be utf-8 coming from svn:externals
+                ext_prop = decode_as_string(ext_prop, encoding="utf-8")
                 externals.extend(parse_external_prop(ext_prop))
 
         return externals
@@ -422,12 +413,12 @@ def svn_finder(dirname=''):
     #combined externals and entries due to lack of dir_props in 1.7
     info = SvnInfo.load(dirname)
     for path in info.iter_files():
-        yield fsencode(path)
+        yield path
 
     for path in info.iter_externals():
         sub_info = SvnInfo.load(path)
         for sub_path in sub_info.iter_files():
-            yield fsencode(sub_path)
+            yield sub_path
 
 
 class SVNEntriesFile(object):

From d1e38c815d6b284caf5d5f15b358af9baa330b4a Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 7 Nov 2013 21:12:03 -0600
Subject: [PATCH 1577/8469] fixed imports on test_svn, look like it was an
 artifact anyway.

---
 setuptools/tests/test_svn.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 59ecb25b1a..cf98141aa6 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -7,7 +7,6 @@
 import unittest
 import codecs
 from setuptools.tests import environment
-from setuptools.svn_utils import fsencode
 from setuptools.compat import unicode, unichr
 
 from setuptools import svn_utils

From d0526b9ca5baad5b23180d32cf8b387bfcea0eaa Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 7 Nov 2013 21:13:10 -0600
Subject: [PATCH 1578/8469] Fixed the various tests that depended on fsencode.
 Added a test to run egg_info on a dummy SVN package. Added a second similar
 test that invokes the legacy code.

---
 setuptools/tests/svn_data/dummy13.zip | Bin 0 -> 9243 bytes
 setuptools/tests/svn_data/dummy14.zip | Bin 0 -> 7496 bytes
 setuptools/tests/svn_data/dummy15.zip | Bin 0 -> 7506 bytes
 setuptools/tests/svn_data/dummy16.zip | Bin 0 -> 7155 bytes
 setuptools/tests/svn_data/dummy17.zip | Bin 0 -> 7512 bytes
 setuptools/tests/svn_data/dummy18.zip | Bin 0 -> 7639 bytes
 setuptools/tests/test_sdist.py        |  82 +++++++++++++++++++++++++-
 7 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 setuptools/tests/svn_data/dummy13.zip
 create mode 100644 setuptools/tests/svn_data/dummy14.zip
 create mode 100644 setuptools/tests/svn_data/dummy15.zip
 create mode 100644 setuptools/tests/svn_data/dummy16.zip
 create mode 100644 setuptools/tests/svn_data/dummy17.zip
 create mode 100644 setuptools/tests/svn_data/dummy18.zip

diff --git a/setuptools/tests/svn_data/dummy13.zip b/setuptools/tests/svn_data/dummy13.zip
new file mode 100644
index 0000000000000000000000000000000000000000..47764342d7c76f44ef5f210abc609f4c6a268574
GIT binary patch
literal 9243
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
L$99AFwu1ix{F!sx

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/dummy14.zip b/setuptools/tests/svn_data/dummy14.zip
new file mode 100644
index 0000000000000000000000000000000000000000..02ed8cf08457e9183d39aadddf6688be2f728a52
GIT binary patch
literal 7496
zcmc&(4Nz276y6mvTtN{HP*OofNVa7$)WjI&XAwhw<R?K*L|t@|WszM4$;=>?R0u;*
z)UqtGA2AhwDnr9e$r?m0NyR8DEzK~e)X34^ean6Kyu0^3n9-Tu%zAim@A>XI=Q}@l
zjf=AD+E;;|v9He!<9}%X$AOb`78;F<0|NcygjE&PDkrc?V_uXcEOk(nb4zzW`eS{P
zQlaSEmHW_3^;wo2gWg<Q_Epvqt+Vd-v*WgoE7dL?y1(Y_K;v3f<ajszmE*~wPF{nR
zbuCSElJ<q_%TtQIPX^yUF<V#EGSH!PSM@IU;)sE<$=5xa(=Ha@U2x#wW4q2J{CR(Q
zvZHUTZ}j-;mt3d2R!-WsRb3bzel#O?;i*x-?yt)K^j6*<H{v$Ee?4~OR#RC<>!JEr
zZx)zW#td^<<sGp~y<4-|`OAHF^S4!Oe!BF)ZyB}8ORFw^e67}{t*Ljp{f$7k(wfXZ
z%io*QF#l17+U}*P%6Zj|_TC$grhXpUx1g$EviDC~@8~Ao@Bdoj8>akHTL0yRyn9o3
zu8285D>w7><(y5GZlT-NC-a9jMFb6cx!ifL)4OBBw!hOoaCFJszciQU1f=?Jj~(=<
z{*jXxT5tWGdvxijH)2yyd>eG}?C2-7uFFqf+hZ4AK66j$w8V<a>4kGc3vUcGXY89D
z(V|aFDcLgjm&UroN)$1bHIiHy`cEj^--UZapFVUL(oH$WG|N*e5@ZDxWH)+Cc8)3g
ziCJl8y%2701+~cr2W>Kg4TvAyHsP^BvFP(G1jTC2;Em!<e%yA<Ql5WgQ&?n3%miJ6
z#*$}2f8jL|x6q2TGKykj65}U^CMCwkcUGIsu_7lXaEekoc`P64V@;YEri)3?iEKkT
z=AdZeoHX^>t>33|Z?AA4nbSmv#7vCPB_wJLS%RYH*3_z&dAjRz>vHGyygH!mpUAiR
zezPLo>^%5L;MMCjbzbYoZZ?lu)HE$QI^^BN>FRxlgCn}D=CyUdw_}Kt$N2QpC%xy5
zJszGOab8)rZ0(alADx*|_00R~6RjS%^R)SZnsf|?OB)-n3ki?bNjR+^vUm3<dEwlC
z^zoI}W7b<1W^1w+3&y7Bn2etMZ!IQMrrFbA%r@m%tiN$m@qh5mN;B$%eR!Jrs67|y
zbIb-)R<Ms&6QBw3dE5zP4$bM_HYYJ=gA|~1#)GxIGs$L~I~-0&3CBbu`6HbxFttIJ
zNpElmc7;*dM9R)Asvz_PyLjgV&(VDd9?7~EMOfHi?MB)jkG=dMr*sY1k^0*x=QrS<
z)DTi~MC)kZSo?+7<u1nSKfGmV2>9S!V&g~g;Tt20L$aS&sZ%~veRyb_f2~QmBzf6P
z$H~*r1kPx1xuPx`YP@UMxO4T-m3Jyz&dv-j+*@5VeD8~qCFcUZ&8**l_`ct|q^6iL
zK2!EMrVV=Wj}*=DsPo5f-g&LaKWX#IA(?NshN;fqUbyt;jf}W!+0$CxbJIsYU3Q?b
z_4lGYZT;z#qdRLxtf`3h8|2u$?3q(j{o8amyAjVLAHr(ik8P%H&8M9|fW47LMtZ9R
zW=C|CK<o@5HSEKZtror6B2hf(A{5Y(uGCaRmcf#m3abbqF<k**W&&bbM0J4npqIoM
z+LM|zMeFEBZ<q39Cu)KWGVvy%8|^$-n}cJ|OYgCz3-GY?Hkk3Cr%G?=1<uyqJJDix
z%Y@oNkNn?SqYF4Z>4n5tx&=Ce^|<FfoK~moGL9eRSvQ8E94dMcI(m4*bN2_8!jpej
zD%=$o*Y!0+nj4f@?x_CEgx=$#h-SLFJ1MYc<cDEEGhei!`bE86+=p`Nu(Varx|v}0
zi2jpl_3b?YqKrEBg&RV_vVYzI{@rSX)Zh(KzEcwS@J3imG6ca#rzP|hJwdn$o<cF`
z!43R420REU-wz7ZM+7vU1!NY*owfqMLu+h{Cw3XKW&sUCDiX8?#{^3;kkmB-10e=f
zNdtj#2RW3l#1Q=IsnugWIb!6;ujL7GtayzLG3cVH6<mqHTV=qh(Mk3MMT<A^$XG&Z
z(kJi}ogmnbVh!;#D73QRGrAV?;8@Cm`-s3-NQ2WC9+uxT{Z{e7SQ2)zu0=5DUr7Ul
z2Eeqsaq|n^ytttIZaLIxmk$?NZSE@Ra#HP?*qCsaE^L&<rkjJW2>YNkHtrlu<op?J
zBM{Ybo?*%pmn-=1fH+PIPj3MkCA7|-wwjwzU{nRwSE2@^aw|?{>+nNYKo1dwg$42O
zs-U>sR!f0BcqJ5Db%_N;vXtdQ>`Ji<+0~HLc26!!9^FWkK>33pn1ucJuH$<<mU3zD
zF2o6eOoAX(nPVa0=>bbfI(i)LDIg)z6#yjbKo0c>Wn5@R(+HMgORS8erxW5XG@b0U
z(T}o6L~A^oV2Qzq5v=<vELJUS5XPj^Jo|ILE?`-ptmEHdXpqCimqv(n>=6=waD%a(
zSJr)fk@p=fiCGE-9h(87*xYABvGWysjh1q7{X}p<+;`k~JOY+kFRF5^z>pA%o?XP2
zEnq{ja~8)6OEDZfXElOlXo%R+5gfjjF)KSxXN_A0&lM~oXXp_kK!ks%BYbehlRX0N
z<5<dhTwIJNbY}(^UA$pvv5&D7`<i{f_7ZGG1!aje5SzGke&Ba#n|z)el!p|z8?2s|
z5RN9V*uq=Va1W2bu7XoNIj4@~ST0UY%vcyaOjKN@v6Le!DFFz_V1omg`JhmwF(9Zn
z0Th^{Ss=KpVJT-%FOlC)0g(22x$^*0UxnaqfULL&0Ki-fLGU<?PmiUX6)qwxN_vp!
zlld27;K*a$SV9bX>~$7l90C}4&V>kgyv3TajEl18nlJiK246)N?)!bMBYOJ}lq+)w

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/dummy15.zip b/setuptools/tests/svn_data/dummy15.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ed8daeeba491cf3e4807d75c208392d4baf68fdd
GIT binary patch
literal 7506
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
K_(%6Zr+)#7&13)o

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/dummy16.zip b/setuptools/tests/svn_data/dummy16.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b6e98d6c40a392cfd9c3f5413f5b91193f5d8a32
GIT binary patch
literal 7155
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
WiS0;tM09KKMfIcee=n_vqW%G27!pVT

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/dummy17.zip b/setuptools/tests/svn_data/dummy17.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d96e15133499e6e6606d2c5893cd230e9a5508bb
GIT binary patch
literal 7512
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

literal 0
HcmV?d00001

diff --git a/setuptools/tests/svn_data/dummy18.zip b/setuptools/tests/svn_data/dummy18.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a72678384d629814afd32ae1afd2eb72631ac9b3
GIT binary patch
literal 7639
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
VVK)^a4`dvKzbab7-np@f{RgV$yHfxF

literal 0
HcmV?d00001

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 65a9f0b335..716893dcbe 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
+from __future__ import with_statement
 import locale
 import os
 import shutil
@@ -8,6 +9,7 @@
 import tempfile
 import unittest
 import unicodedata
+import re
 from setuptools.tests import environment
 
 from setuptools.compat import StringIO, unicode
@@ -16,7 +18,6 @@
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
 from setuptools import svn_utils
-from setuptools.svn_utils import fsencode
 
 SETUP_ATTRS = {
     'name': 'sdist_test',
@@ -400,6 +401,83 @@ def test_sdist_with_latin1_encoded_filename(self):
             self.assertTrue(filename in cmd.filelist.files)
 
 
+def soruce_test(self):
+    code, data = svn_utils._run_command([sys.executable, "setup.py", "egg_info"], stream=1)
+        
+    if code:
+        raise AssertionError(data)
+
+    sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
+    contents = """CHANGES.txt
+CONTRIBUTORS.txt
+HISTORY.txt
+LICENSE
+MANIFEST.in
+README.txt
+setup.py
+dummy/__init__.py
+dummy/test.txt
+dummy.egg-info/PKG-INFO
+dummy.egg-info/SOURCES.txt
+dummy.egg-info/dependency_links.txt
+dummy.egg-info/top_level.txt"""
+
+    with open(sources, 'r') as infile:
+        read_contents = infile.read()
+
+    self.assertEqual(contents, read_contents)
+
+
+class TestSvnDummy(environment.ZippedEnvironment):
+
+    def setUp(self):
+        version = svn_utils.SvnInfo.get_svn_version()
+        self.base_version = tuple([int(x) for x in version.split('.')][:2])
+
+        if not self.base_version:
+            raise ValueError('No SVN tools installed')
+        elif self.base_version < (1,3):
+            raise ValueError('Insufficient SVN Version %s' % version)
+        elif self.base_version >= (1,9):
+            #trying the latest version
+            self.base_version = (1,8)
+
+        self.dataname = "dummy%i%i" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvnDummy, self).setUp()
+            
+    def test_sources(self):
+        soruce_test(self)
+
+
+class TestSvnDummyLegacy(environment.ZippedEnvironment):
+
+    def setUp(self):
+        self.base_version = (1,6)
+        self.path_variable = None
+        for env in os.environ:
+            if env.lower() == 'path':
+                self.path_variable = env
+        self.old_path = os.environ[self.path_variable]
+        os.environ[self.path_variable] = ''
+
+        if self.path_variable is None:
+            self.skipTest('Cannot figure out how to modify path')
+
+        self.dataname = "dummy%i%i" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvnDummyLegacy, self).setUp()
+
+    def tearDown(self):
+        os.environ[self.path_variable] = self.old_path
+        super(TestSvnDummyLegacy, self).tearDown()
+
+    def test_sources(self):
+        soruce_test(self)
+
+
 class TestSvn(environment.ZippedEnvironment):
 
     def setUp(self):
@@ -453,11 +531,9 @@ def test_walksvn(self):
             os.path.join('folder', 'quest.txt'),
             #The example will have a deleted file (or should) but shouldn't return it
             ])
-        expected = set(fsencode(x) for x in expected)
         self.assertEqual(set(x for x in walk_revctrl()), expected)
 
 
-
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
 

From ad255716d932f3ce553cc5319ef5acd905a49957 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Nov 2013 13:45:46 -0500
Subject: [PATCH 1579/8469] Update changelog. Fixes #99.

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 11b8a50290..7110e23269 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+1.3.2
+-----
+
+* Issue #99: Fix filename encoding issues in SVN support.
+
 -----
 1.3.1
 -----

From cee23ae6e829d88a8902ce34de39c2a4a2843c19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Nov 2013 13:48:18 -0500
Subject: [PATCH 1580/8469] Added tag 1.3.2 for changeset 076b472a9e3f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c198d993de..b0b1a80723 100644
--- a/.hgtags
+++ b/.hgtags
@@ -105,3 +105,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 77921bbe3931caf40474dc36e55d3d541981c749 1.2
 19873119647deae8a68e9ed683317b9ee170a8d8 1.3
 a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
+076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2

From 4e9314f8dd906adf47410285bf9f68f59636f372 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Nov 2013 13:52:09 -0500
Subject: [PATCH 1581/8469] Bumped to 1.3.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 84 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 14 ++---
 setuptools/version.py                |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4da59fcd76..0057e2750b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.3.2"
+DEFAULT_VERSION = "1.3.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 73498a4c3b..fb38112eb7 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.commands]
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 build_ext = setuptools.command.build_ext:build_ext
-egg_info = setuptools.command.egg_info:egg_info
 setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
+install_lib = setuptools.command.install_lib:install_lib
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-develop = setuptools.command.develop:develop
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+sdist = setuptools.command.sdist:sdist
+easy_install = setuptools.command.easy_install:easy_install
+upload_docs = setuptools.command.upload_docs:upload_docs
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-register = setuptools.command.register:register
 test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
-install_scripts = setuptools.command.install_scripts:install_scripts
-rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+alias = setuptools.command.alias:alias
 saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-alias = setuptools.command.alias:alias
-install_lib = setuptools.command.install_lib:install_lib
-easy_install = setuptools.command.easy_install:easy_install
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
+build_py = setuptools.command.build_py:build_py
+rotate = setuptools.command.rotate:rotate
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.setup_keywords]
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 eager_resources = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
 install_requires = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-test_suite = setuptools.dist:check_test_suite
-packages = setuptools.dist:check_packages
-dependency_links = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
+extras_require = setuptools.dist:check_extras
+test_loader = setuptools.dist:check_importable
 use_2to3 = setuptools.dist:assert_bool
+packages = setuptools.dist:check_packages
 zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
 entry_points = setuptools.dist:check_entry_points
-include_package_data = setuptools.dist:assert_bool
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 5ff415da83..221040f812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
-[certs]
-certifi==0.0.8
-
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
 [ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+ctypes==1.0.2
+
+[certs]
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index e39833240e..07f744ca5d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3.2'
+__version__ = '1.3.3'

From 76423012b5b51691dd059b1276351099e52c787e Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Mon, 11 Nov 2013 17:07:52 -0600
Subject: [PATCH 1582/8469] For .svn legacy fallback, look for the files in the
 .svn not the directory.    (Fixed unexpected deprecation warning from
 prombredanne) Also removed the warning from fallback, only a deprecation
 warning is issued. Environment.py whitespacing Created a specialized command
 executor for tests in Environment.py Legacy Test in test_egg_info now
 supresses the deprecation warning. PythonPath is now explicitly controlled to
 allow setup.py test on clean    python installations.  *Fixes Issue #101*
 Moved some dummy svn tests from test_sdist to test_egg_info since    they are
 egg_info tests. Downgraded a with statement in a test since we haven't
 offically dropped    2.4 support, however, maybe it is time. Added a test
 case to ensure no extranuous output on sdist with a simple    dummy package
 without rev ctrl.

---
 setuptools/svn_utils.py             |   9 +-
 setuptools/tests/environment.py     |  50 +++++++++-
 setuptools/tests/svn_data/dummy.zip | Bin 0 -> 1771 bytes
 setuptools/tests/test_egg_info.py   |  96 +++++++++++++++++-
 setuptools/tests/test_sdist.py      | 149 +++++++++++++---------------
 5 files changed, 221 insertions(+), 83 deletions(-)
 create mode 100644 setuptools/tests/svn_data/dummy.zip

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 6ac31a2471..224d11ea53 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -219,7 +219,13 @@ def get_svn_version():
     def load(cls, dirname=''):
         normdir = os.path.normpath(dirname)
         code, data = _run_command(['svn', 'info', normdir])
-        has_svn = os.path.isdir(os.path.join(normdir, '.svn'))
+        # Must check for some contents, as some use empty directories
+        # in testcases
+        svn_dir = os.path.join(normdir, '.svn')
+        has_svn = (os.path.isfile(os.path.join(svn_dir, 'entries')) or
+                   os.path.isfile(os.path.join(svn_dir, 'dir-props')) or
+                   os.path.isfile(os.path.join(svn_dir, 'dir-prop-base')))
+
         svn_version = tuple(cls.get_svn_version().split('.'))
 
         try:
@@ -229,7 +235,6 @@ def load(cls, dirname=''):
 
         if has_svn and (code or not base_svn_version 
                              or base_svn_version < (1, 3)):
-            log.warn('Fallback onto .svn parsing')
             warnings.warn(("No SVN 1.3+ command found: falling back "
                            "on pre 1.7 .svn parsing"), DeprecationWarning)
             return SvnFileInfo(dirname)
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index 7c754b8e8c..b41e15495e 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -5,6 +5,9 @@
 import unittest
 import shutil
 import stat
+import unicodedata
+
+from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
 def _extract(self, member, path=None, pwd=None):
@@ -25,13 +28,14 @@ def _extract_from_zip(self, name, dest_path):
     finally:
         dest_file.close()
 
+
 def _extract_member(self, member, targetpath, pwd):
     """for zipfile py2.5 borrowed from cpython"""
     # build the destination pathname, replacing
     # forward slashes to platform specific separators.
     # Strip trailing path separator, unless it represents the root.
     if (targetpath[-1:] in (os.path.sep, os.path.altsep)
-        and len(os.path.splitdrive(targetpath)[1]) > 1):
+            and len(os.path.splitdrive(targetpath)[1]) > 1):
         targetpath = targetpath[:-1]
 
     # don't include leading "/" from file name if present
@@ -102,3 +106,47 @@ def tearDown(self):
             #sigh?
             pass
 
+
+def run_setup_py(cmd, pypath=None, path=None,
+                 data_stream=0, env=None):
+    """
+    Execution command for tests, separate from those used by the
+    code directly to prevent accidental behavior issues
+    """
+    if env is None:
+        env = dict()
+
+    #override the python path if needed
+    if pypath is None:
+        env["PYTHONPATH"] = os.environ.get("PYTHONPATH", "")
+    else:
+        env["PYTHONPATH"] = pypath
+
+    #oeride the execution path if needed
+    if path is None:
+        env["PATH"] = os.environ.get("PATH", "")
+    else:
+        env["PATH"] = pypath
+
+    #Apparently this might be needed in windows platforms
+    if "SYSTEMROOT" in os.environ:
+        env["SYSTEMROOT"] = os.environ["SYSTEMROOT"]
+
+    cmd = [sys.executable, "setup.py"] + list(cmd)
+
+    #regarding the shell argument, see: http://bugs.python.org/issue8557
+    try:
+        proc = _Popen(cmd, stdout=_PIPE, stderr=_PIPE,
+                      shell=(sys.platform == 'win32'), env=env)
+
+        data = proc.communicate()[data_stream]
+    except OSError:
+        return 1, ''
+
+    #decode the console string if needed
+    if hasattr(data,  "decode"):
+        data = data.decode()  # should use the preffered encoding
+        data = unicodedata.normalize('NFC', data)
+
+    #communciate calls wait()
+    return proc.returncode, data
diff --git a/setuptools/tests/svn_data/dummy.zip b/setuptools/tests/svn_data/dummy.zip
new file mode 100644
index 0000000000000000000000000000000000000000..1347be53eb29eb8e4b9e0afe82372630708b3092
GIT binary patch
literal 1771
zcmWIWW@Zs#00GOn>CRvVlwbqWDW$o&mHGidHC$j(rCF$I1mS9&JskbqU4!*XDoSuG
z7egrb_X`Q~bP5ge4}$A~I3pU(89Z=3gd79X4^aalOHzwV@ViGGO-FouW?p7Ve7s&k
zC2mh3{OsWw40L}aemi*KcKCQYyZQyYf=mWEm4o3rFf^mW7Tt>n@;ZSSVY08IpQoE^
zaEM-JUTn`^t_B4O*Ybnq8GNr~fBp1WC~~DOtyn<mkjbmJn-3~Zx1LjMS#~`-!q;&{
zNQ}<b{kCqLTp7PO|E*Exm3By*V62*9ecUC@?H1$YhKa^jJ1)m9^ID~I>b>;$3WF*}
z-2N1RJ3PqM(Z$yl)tizaw{P54;Q~|z!hCSm#i=Ew1;7wYE6UGR0CP(6^K*(7GII;^
zi%K9Oyj)-jjl9I%R9kg$bgAnol%*CGXXfYGsvGDT>KUqQ@^S@uGcwsT;7Xq=Ks!MI
z<WdlTL^~IQ0+`3hAi=OEB5<SfopX#Znoa*~CWsF)7gw5wnF}%p#D<uQl){m%cy+Pc
zS^;Qe&^JG@RWKT#6=GmxL9SE);$R?#T7i};h_?q<-hp`q6h!TCdoTkkXj;j2P{6?G
zACrB+zQN}U5foo+L^B<h`>^=|W;%?<XNx$BEsxP`LCUd|S|o^Kkpv?wQjl^vHY;H9
z4Wse-g%`yNceoYMl7V>Rag`si=vDv*QxV*Fq|yZ0iVJgU*%Xm72P~7|^ML@04;YwW
zfrKa`kZpkF4VcL=8rcTSf&|$UdT<+H#R{_dRdK(JKzR>lE{qQFW(Cz=4BS9y&ceVj
J4`>Pl0|35xlF|SG

literal 0
HcmV?d00001

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7abafd7165..28682dfd0b 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,3 +1,4 @@
+
 import os
 import sys
 import tempfile
@@ -5,12 +6,15 @@
 import unittest
 
 import pkg_resources
+import warnings
 from setuptools.command import egg_info
+from setuptools.tests import environment
 from setuptools import svn_utils
 
 ENTRIES_V10 = pkg_resources.resource_string(__name__, 'entries-v10')
 "An entries file generated with svn 1.6.17 against the legacy Setuptools repo"
 
+
 class TestEggInfo(unittest.TestCase):
 
     def setUp(self):
@@ -37,7 +41,7 @@ def test_version_10_format(self):
         #to ensure I return using svnversion what would had been returned
         version_str = svn_utils.SvnInfo.get_svn_version()
         version = [int(x) for x in version_str.split('.')[:2]]
-        if version != [1,6]:
+        if version != [1, 6]:
             if hasattr(self, 'skipTest'):
                 self.skipTest('')
             else:
@@ -61,14 +65,104 @@ def test_version_10_format_legacy_parser(self):
 
         old_path = os.environ[path_variable]
         os.environ[path_variable] = ''
+        #catch_warnings not available until py26
+        warning_filters = warnings.filters
+        warnings.filters = warning_filters[:]
         try:
+            warnings.simplefilter("ignore", DeprecationWarning)
             self._write_entries(ENTRIES_V10)
             rev = egg_info.egg_info.get_svn_revision()
         finally:
+            #restore the warning filters
+            warnings.filters = warning_filters
+            #restore the os path
             os.environ[path_variable] = old_path
 
         self.assertEqual(rev, '89000')
 
+DUMMY_SOURCE_TXT = """CHANGES.txt
+CONTRIBUTORS.txt
+HISTORY.txt
+LICENSE
+MANIFEST.in
+README.txt
+setup.py
+dummy/__init__.py
+dummy/test.txt
+dummy.egg-info/PKG-INFO
+dummy.egg-info/SOURCES.txt
+dummy.egg-info/dependency_links.txt
+dummy.egg-info/top_level.txt"""
+
+
+class TestSvnDummy(environment.ZippedEnvironment):
+
+    def setUp(self):
+        version = svn_utils.SvnInfo.get_svn_version()
+        self.base_version = tuple([int(x) for x in version.split('.')][:2])
+
+        if not self.base_version:
+            raise ValueError('No SVN tools installed')
+        elif self.base_version < (1, 3):
+            raise ValueError('Insufficient SVN Version %s' % version)
+        elif self.base_version >= (1, 9):
+            #trying the latest version
+            self.base_version = (1, 8)
+
+        self.dataname = "dummy%i%i" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvnDummy, self).setUp()
+
+    def test_sources(self):
+        code, data = environment.run_setup_py(["sdist"],
+                                              pypath=self.old_cwd,
+                                              data_stream=1)
+        if code:
+            raise AssertionError(data)
+
+        sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
+        infile = open(sources, 'r')
+        try:
+            read_contents = infile.read()
+        finally:
+            infile.close()
+            del infile
+
+        self.assertEqual(DUMMY_SOURCE_TXT, read_contents)
+
+        return data
+
+
+class TestSvnDummyLegacy(environment.ZippedEnvironment):
+
+    def setUp(self):
+        self.base_version = (1, 6)
+        self.dataname = "dummy%i%i" % self.base_version
+        self.datafile = os.path.join('setuptools', 'tests',
+                                     'svn_data', self.dataname + ".zip")
+        super(TestSvnDummyLegacy, self).setUp()
+
+    def test_sources(self):
+        code, data = environment.run_setup_py(["sdist"],
+                                              pypath=self.old_cwd,
+                                              path="",
+                                              data_stream=1)
+        if code:
+            raise AssertionError(data)
+
+        sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
+        infile = open(sources, 'r')
+        try:
+            read_contents = infile.read()
+        finally:
+            infile.close()
+            del infile
+
+        self.assertEqual(DUMMY_SOURCE_TXT, read_contents)
+
+        return data
+
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 716893dcbe..b42dcc5769 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-from __future__ import with_statement
 import locale
 import os
 import shutil
@@ -401,81 +400,73 @@ def test_sdist_with_latin1_encoded_filename(self):
             self.assertTrue(filename in cmd.filelist.files)
 
 
-def soruce_test(self):
-    code, data = svn_utils._run_command([sys.executable, "setup.py", "egg_info"], stream=1)
-        
-    if code:
-        raise AssertionError(data)
-
-    sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
-    contents = """CHANGES.txt
-CONTRIBUTORS.txt
-HISTORY.txt
-LICENSE
-MANIFEST.in
-README.txt
-setup.py
-dummy/__init__.py
-dummy/test.txt
-dummy.egg-info/PKG-INFO
-dummy.egg-info/SOURCES.txt
-dummy.egg-info/dependency_links.txt
-dummy.egg-info/top_level.txt"""
-
-    with open(sources, 'r') as infile:
-        read_contents = infile.read()
-
-    self.assertEqual(contents, read_contents)
-
-
-class TestSvnDummy(environment.ZippedEnvironment):
-
-    def setUp(self):
-        version = svn_utils.SvnInfo.get_svn_version()
-        self.base_version = tuple([int(x) for x in version.split('.')][:2])
-
-        if not self.base_version:
-            raise ValueError('No SVN tools installed')
-        elif self.base_version < (1,3):
-            raise ValueError('Insufficient SVN Version %s' % version)
-        elif self.base_version >= (1,9):
-            #trying the latest version
-            self.base_version = (1,8)
-
-        self.dataname = "dummy%i%i" % self.base_version
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvnDummy, self).setUp()
-            
-    def test_sources(self):
-        soruce_test(self)
-
-
-class TestSvnDummyLegacy(environment.ZippedEnvironment):
+class TestDummyOutput(environment.ZippedEnvironment):
 
     def setUp(self):
-        self.base_version = (1,6)
-        self.path_variable = None
-        for env in os.environ:
-            if env.lower() == 'path':
-                self.path_variable = env
-        self.old_path = os.environ[self.path_variable]
-        os.environ[self.path_variable] = ''
-
-        if self.path_variable is None:
-            self.skipTest('Cannot figure out how to modify path')
-
-        self.dataname = "dummy%i%i" % self.base_version
         self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvnDummyLegacy, self).setUp()
-
-    def tearDown(self):
-        os.environ[self.path_variable] = self.old_path
-        super(TestSvnDummyLegacy, self).tearDown()
+                                     'svn_data', "dummy.zip")
+        self.dataname = "dummy"
+        super(TestDummyOutput, self).setUp()
+
+    def _run(self):
+        code, data = environment.run_setup_py(["sdist"],
+                                              pypath=self.old_cwd,
+                                              data_stream=0)
+        if code:
+            info = "DIR: " + os.path.abspath('.')
+            info += "\n  SDIST RETURNED: %i\n\n" % code
+            info += data
+            raise AssertionError(info)
+
+        datalines = data.splitlines()
+
+        possible = (
+            "running sdist",
+            "running egg_info",
+            "creating dummy\.egg-info",
+            "writing dummy\.egg-info",
+            "writing top-level names to dummy\.egg-info",
+            "writing dependency_links to dummy\.egg-info",
+            "writing manifest file 'dummy\.egg-info",
+            "reading manifest file 'dummy\.egg-info",
+            "reading manifest template 'MANIFEST\.in'",
+            "writing manifest file 'dummy\.egg-info",
+            "creating dummy-0.1.1",
+            "making hard links in dummy-0\.1\.1",
+            "copying files to dummy-0\.1\.1",
+            "copying \S+ -> dummy-0\.1\.1",
+            "copying dummy",
+            "copying dummy\.egg-info",
+            "hard linking \S+ -> dummy-0\.1\.1",
+            "hard linking dummy",
+            "hard linking dummy\.egg-info",
+            "Writing dummy-0\.1\.1",
+            "creating dist",
+            "creating 'dist",
+            "Creating tar archive",
+            "running check",
+            "adding 'dummy-0\.1\.1",
+            "tar .+ dist/dummy-0\.1\.1\.tar dummy-0\.1\.1",
+            "gzip .+ dist/dummy-0\.1\.1\.tar",
+            "removing 'dummy-0\.1\.1' \\(and everything under it\\)",
+        )
+
+        print("    DIR: " + os.path.abspath('.'))
+        for line in datalines:
+            found = False
+            for pattern in possible:
+                if re.match(pattern, line):
+                    print("   READ: " + line)
+                    found = True
+                    break
+            if not found:
+                raise AssertionError("Unexpexected: %s\n-in-\n%s"
+                                     % (line, data))
+
+        return data
 
     def test_sources(self):
-        soruce_test(self)
+        self._run()
 
 
 class TestSvn(environment.ZippedEnvironment):
@@ -486,11 +477,11 @@ def setUp(self):
 
         if not self.base_version:
             raise ValueError('No SVN tools installed')
-        elif self.base_version < (1,3):
+        elif self.base_version < (1, 3):
             raise ValueError('Insufficient SVN Version %s' % version)
-        elif self.base_version >= (1,9):
+        elif self.base_version >= (1, 9):
             #trying the latest version
-            self.base_version = (1,8)
+            self.base_version = (1, 8)
 
         self.dataname = "svn%i%i_example" % self.base_version
         self.datafile = os.path.join('setuptools', 'tests',
@@ -498,7 +489,7 @@ def setUp(self):
         super(TestSvn, self).setUp()
 
     def test_walksvn(self):
-        if self.base_version >= (1,6):
+        if self.base_version >= (1, 6):
             folder2 = 'third party2'
             folder3 = 'third party3'
         else:
@@ -520,7 +511,7 @@ def test_walksvn(self):
             os.path.join('folder', folder2, 'Changes.txt'),
             os.path.join('folder', folder2, 'MD5SUMS'),
             os.path.join('folder', folder2, 'WatashiNiYomimasu.txt'),
-            os.path.join( 'folder', folder3, 'Changes.txt'),
+            os.path.join('folder', folder3, 'Changes.txt'),
             os.path.join('folder', folder3, 'fin'),
             os.path.join('folder', folder3, 'MD5SUMS'),
             os.path.join('folder', folder3, 'oops'),
@@ -529,11 +520,11 @@ def test_walksvn(self):
             os.path.join('folder', 'third_party', 'WatashiNiYomimasu.txt'),
             os.path.join('folder', 'lalala.txt'),
             os.path.join('folder', 'quest.txt'),
-            #The example will have a deleted file (or should) but shouldn't return it
-            ])
+            # The example will have a deleted file
+            #  (or should) but shouldn't return it
+        ])
         self.assertEqual(set(x for x in walk_revctrl()), expected)
 
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
-

From 2988952f831be3769896f729f0d7f1ae07f6bdee Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Mon, 11 Nov 2013 18:27:52 -0600
Subject: [PATCH 1583/8469] Earlier Versions of python used gzip and tar
 directly.  So I need to make sure they are in the paths for the legacy tests
 (why did it work before). Let us hope that svn is not in that directory...

---
 setuptools/tests/environment.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index b41e15495e..bd2c53d2a2 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -107,6 +107,15 @@ def tearDown(self):
             pass
 
 
+def _which_dirs(cmd):
+    result = set()
+    for path in os.environ.get('PATH', '').split(os.pathsep):
+        filename = os.path.join(path, cmd)
+        if os.access(filename, os.X_OK):
+            result.add(path)
+    return result
+
+
 def run_setup_py(cmd, pypath=None, path=None,
                  data_stream=0, env=None):
     """
@@ -115,22 +124,19 @@ def run_setup_py(cmd, pypath=None, path=None,
     """
     if env is None:
         env = dict()
+        for envname in os.environ:
+            env[envname] = os.environ[envname]
 
     #override the python path if needed
-    if pypath is None:
-        env["PYTHONPATH"] = os.environ.get("PYTHONPATH", "")
-    else:
+    if pypath is not None:
         env["PYTHONPATH"] = pypath
 
-    #oeride the execution path if needed
-    if path is None:
-        env["PATH"] = os.environ.get("PATH", "")
-    else:
-        env["PATH"] = pypath
-
-    #Apparently this might be needed in windows platforms
-    if "SYSTEMROOT" in os.environ:
-        env["SYSTEMROOT"] = os.environ["SYSTEMROOT"]
+    #overide the execution path if needed
+    if path is not None:
+        env["PATH"] = path
+    if not env.get("PATH", ""):
+        env["PATH"] = _which_dirs("tar").union(_which_dirs("gzip"))
+        env["PATH"] = os.pathsep.join(env["PATH"])
 
     cmd = [sys.executable, "setup.py"] + list(cmd)
 

From bc18704db50ff099b386e25fa7f3883ef3f3386b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 Nov 2013 08:14:38 -0500
Subject: [PATCH 1584/8469] Correct changelog entry. Fixes #104.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7110e23269..865a89138f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,7 +31,7 @@ CHANGES
 
 * Issue #26: Add support for SVN 1.7. Special thanks to Philip Thiem for the
   contribution.
-* Issue #94: Wheels are now distributed with every release.
+* Issue #93: Wheels are now distributed with every release.
 * Setuptools "natural" launcher support, introduced in 1.0, is now officially
   supported.
 

From 3822e3e7ad8cda5012b602f7e8f52cdd44665dd3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 09:35:20 -0500
Subject: [PATCH 1585/8469] Delint syntax

--HG--
extra : amend_source : 0f58aa917ebc71efd2904638fac3838fd0b0e4dd
---
 setuptools/package_index.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ca228997d6..a0bb936dc5 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -920,29 +920,29 @@ def _encode_auth(auth):
     # strip the trailing carriage return
     return encoded.rstrip()
 
-class PyPirc:
+class PyPirc(object):
 
     def __init__(self):
         """
-            Extract pypirc authentication information from home directory
+        Extract pypirc authentication information from home directory
         """
         self.dict_ = {}
 
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 config = ConfigParser.ConfigParser({
-                        'username' : '',
-                        'password' : '',
-                        'repository' : ''})
+                        'username': '',
+                        'password': '',
+                        'repository': ''})
                 config.read(rc)
 
                 for section in config.sections():
                     if config.get(section, 'repository').strip():
-                        value = '%s:%s'%(config.get(section, 'username').strip(),
+                        value = '%s:%s' % (config.get(section, 'username').strip(),
                                          config.get(section, 'password').strip())
                         self.dict_[config.get(section, 'repository').strip()] = value
-                        
+
     def __call__(self, url):
         """ """
         for base_url, auth in self.dict_.items():
@@ -950,7 +950,6 @@ def __call__(self, url):
                 return auth
 
 
-
 def open_with_auth(url, opener=urllib2.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
@@ -968,7 +967,7 @@ def open_with_auth(url, opener=urllib2.urlopen):
 
     if not auth:
         auth = PyPirc()(url)
-        log.info('Authentication found for URL: %s'%url)
+        log.info('Authentication found for URL: %s' % url)
 
     if auth:
         auth = "Basic " + _encode_auth(auth)

From b79e972b8928224516e5361342c4d2f11c83fb24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 09:44:07 -0500
Subject: [PATCH 1586/8469] Refactor for flatter code

---
 setuptools/package_index.py | 38 +++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a0bb936dc5..2e0f20920a 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -928,20 +928,30 @@ def __init__(self):
         """
         self.dict_ = {}
 
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                config = ConfigParser.ConfigParser({
-                        'username': '',
-                        'password': '',
-                        'repository': ''})
-                config.read(rc)
-
-                for section in config.sections():
-                    if config.get(section, 'repository').strip():
-                        value = '%s:%s' % (config.get(section, 'username').strip(),
-                                         config.get(section, 'password').strip())
-                        self.dict_[config.get(section, 'repository').strip()] = value
+        if 'HOME' not in os.environ:
+            return
+
+        rc = os.path.join(os.environ['HOME'], '.pypirc')
+        if not os.path.exists(rc):
+            return
+
+        initial = dict.fromkeys(['username', 'password', 'repository'], '')
+        config = ConfigParser.ConfigParser(initial)
+        config.read(rc)
+
+        sections_with_repositories = [
+            section for section in config.sections()
+            if config.get(section, 'repository').strip()
+        ]
+
+        for section in sections_with_repositories:
+            auth = (
+                config.get(section, 'username').strip(),
+                config.get(section, 'password').strip(),
+            )
+            value = '%s:%s' % auth
+            repo = config.get(section, 'repository').strip()
+            self.dict_[repo] = value
 
     def __call__(self, url):
         """ """

From e405a2b4861216e3c6b50c79f7b26289656fdb41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 09:52:58 -0500
Subject: [PATCH 1587/8469] Extract 'Credential' class for representing a
 username/password credential

---
 setuptools/package_index.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 2e0f20920a..3154eccb05 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -920,6 +920,21 @@ def _encode_auth(auth):
     # strip the trailing carriage return
     return encoded.rstrip()
 
+class Credential(object):
+    """
+    A username/password pair. Use like a namedtuple.
+    """
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
+
+    def __iter__(self):
+        yield self.username
+        yield self.password
+
+    def __str__(self):
+        return '%(username)s:%(password)s' % vars(self)
+
 class PyPirc(object):
 
     def __init__(self):
@@ -945,13 +960,12 @@ def __init__(self):
         ]
 
         for section in sections_with_repositories:
-            auth = (
+            cred = Credential(
                 config.get(section, 'username').strip(),
                 config.get(section, 'password').strip(),
             )
-            value = '%s:%s' % auth
             repo = config.get(section, 'repository').strip()
-            self.dict_[repo] = value
+            self.dict_[repo] = cred
 
     def __call__(self, url):
         """ """
@@ -976,7 +990,7 @@ def open_with_auth(url, opener=urllib2.urlopen):
         auth = None
 
     if not auth:
-        auth = PyPirc()(url)
+        auth = str(PyPirc()(url))
         log.info('Authentication found for URL: %s' % url)
 
     if auth:

From fccf9357c484e4b475348dfbef321e544e2a3cab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 09:56:22 -0500
Subject: [PATCH 1588/8469] Use 'expanduser' for better compatibilty.

---
 setuptools/package_index.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3154eccb05..5f328a03c6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -943,10 +943,7 @@ def __init__(self):
         """
         self.dict_ = {}
 
-        if 'HOME' not in os.environ:
-            return
-
-        rc = os.path.join(os.environ['HOME'], '.pypirc')
+        rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if not os.path.exists(rc):
             return
 

From bf742c3f6069802d26c09118dd6c36d55634e22d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:08:50 -0500
Subject: [PATCH 1589/8469] Derive PyPirc from ConfigParser for more general
 purpose use.

---
 setuptools/package_index.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5f328a03c6..5b8dc35704 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -935,34 +935,35 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPirc(object):
+class PyPirc(ConfigParser.ConfigParser):
 
     def __init__(self):
         """
-        Extract pypirc authentication information from home directory
+        Load from ~/.pypirc
         """
-        self.dict_ = {}
+        defaults = dict.fromkeys(['username', 'password', 'repository'], '')
+        super(PyPirc, self).__init__(defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
-        if not os.path.exists(rc):
-            return
-
-        initial = dict.fromkeys(['username', 'password', 'repository'], '')
-        config = ConfigParser.ConfigParser(initial)
-        config.read(rc)
+        if os.path.exists(rc):
+            self.read(rc)
 
+    @property
+    def dict_(self):
+        dict_ = {}
         sections_with_repositories = [
-            section for section in config.sections()
-            if config.get(section, 'repository').strip()
+            section for section in self.sections()
+            if self.get(section, 'repository').strip()
         ]
 
         for section in sections_with_repositories:
             cred = Credential(
-                config.get(section, 'username').strip(),
-                config.get(section, 'password').strip(),
+                self.get(section, 'username').strip(),
+                self.get(section, 'password').strip(),
             )
-            repo = config.get(section, 'repository').strip()
-            self.dict_[repo] = cred
+            repo = self.get(section, 'repository').strip()
+            dict_[repo] = cred
+        return dict_
 
     def __call__(self, url):
         """ """

From b7ee88761b75f2c63eb5553f7b28e5e8a88be186 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:20:22 -0500
Subject: [PATCH 1590/8469] Replaced __call__ with find_credential (for clarity
 of purpose). Removed dict_.

---
 setuptools/package_index.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5b8dc35704..c63ae29a35 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -949,8 +949,8 @@ def __init__(self):
             self.read(rc)
 
     @property
-    def dict_(self):
-        dict_ = {}
+    def creds_by_repository(self):
+        creds = {}
         sections_with_repositories = [
             section for section in self.sections()
             if self.get(section, 'repository').strip()
@@ -962,14 +962,17 @@ def dict_(self):
                 self.get(section, 'password').strip(),
             )
             repo = self.get(section, 'repository').strip()
-            dict_[repo] = cred
-        return dict_
+            creds[repo] = cred
+        return creds
 
-    def __call__(self, url):
-        """ """
-        for base_url, auth in self.dict_.items():
-            if url.startswith(base_url):
-                return auth
+    def find_credential(self, url):
+        """
+        If the URL indicated appears to be a repository defined in this
+        config, return the credential for that repository.
+        """
+        for repository, cred in self.creds_by_repository.items():
+            if url.startswith(repository):
+                return cred
 
 
 def open_with_auth(url, opener=urllib2.urlopen):
@@ -988,8 +991,10 @@ def open_with_auth(url, opener=urllib2.urlopen):
         auth = None
 
     if not auth:
-        auth = str(PyPirc()(url))
-        log.info('Authentication found for URL: %s' % url)
+        cred = PyPirc().find_credential(url)
+        if cred:
+            auth = str(cred)
+            log.info('Authentication found for URL: %s' % url)
 
     if auth:
         auth = "Basic " + _encode_auth(auth)

From 113f55577768c9434b33b799521e4f70fdecd8de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:22:59 -0500
Subject: [PATCH 1591/8469] Get ConfigParser module from compat module for
 Python 3 compatibility.

---
 setuptools/package_index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index c63ae29a35..482ba38b40 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -6,8 +6,6 @@
 import socket
 import base64
 
-import ConfigParser
-
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     require, Environment, find_distributions, safe_name, safe_version,
@@ -19,7 +17,8 @@
 from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
                                urlparse, urlunparse, unquote, splituser,
                                url2pathname, name2codepoint,
-                               unichr, urljoin, urlsplit, urlunsplit)
+                               unichr, urljoin, urlsplit, urlunsplit,
+                               ConfigParser)
 from setuptools.compat import filterfalse
 from fnmatch import translate
 from setuptools.py24compat import hashlib

From 117a8a57a9a06521f028eb4e1afc1f6fd4dd8dc8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:28:27 -0500
Subject: [PATCH 1592/8469] Construct the 'creds' dictionary directly rather
 than building imperatively.

---
 setuptools/package_index.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 482ba38b40..0a409604ce 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -949,20 +949,19 @@ def __init__(self):
 
     @property
     def creds_by_repository(self):
-        creds = {}
         sections_with_repositories = [
             section for section in self.sections()
             if self.get(section, 'repository').strip()
         ]
 
-        for section in sections_with_repositories:
-            cred = Credential(
-                self.get(section, 'username').strip(),
-                self.get(section, 'password').strip(),
-            )
-            repo = self.get(section, 'repository').strip()
-            creds[repo] = cred
-        return creds
+        return dict(map(self._get_repo_cred, sections_with_repositories))
+
+    def _get_repo_cred(self, section):
+        repo = self.get(section, 'repository').strip()
+        return repo, Credential(
+            self.get(section, 'username').strip(),
+            self.get(section, 'password').strip(),
+        )
 
     def find_credential(self, url):
         """

From 75345928c3e2cb0f88cdf44d33752e1ed6b19290 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:29:59 -0500
Subject: [PATCH 1593/8469] Renamed class for proper capitalization and for
 clarity.

---
 setuptools/package_index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0a409604ce..a61d3c743b 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -934,14 +934,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPirc(ConfigParser.ConfigParser):
+class PyPIConfig(ConfigParser.ConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        super(PyPirc, self).__init__(defaults)
+        super(PyPIConfig, self).__init__(defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):
@@ -989,7 +989,7 @@ def open_with_auth(url, opener=urllib2.urlopen):
         auth = None
 
     if not auth:
-        cred = PyPirc().find_credential(url)
+        cred = PyPIConfig().find_credential(url)
         if cred:
             auth = str(cred)
             log.info('Authentication found for URL: %s' % url)

From cee7279fb782fd97b8e7ce06642054ee45ca0564 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:34:14 -0500
Subject: [PATCH 1594/8469] Updated message when credentials used from .pypirc

---
 setuptools/package_index.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a61d3c743b..231311ec4d 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -992,7 +992,8 @@ def open_with_auth(url, opener=urllib2.urlopen):
         cred = PyPIConfig().find_credential(url)
         if cred:
             auth = str(cred)
-            log.info('Authentication found for URL: %s' % url)
+            info = cred.username, url
+            log.info('Authenticating as %s for %s (from .pypirc)' % info)
 
     if auth:
         auth = "Basic " + _encode_auth(auth)

From 915b99c8440fe0aa04609ce249a0e845f5b97e44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 10:39:19 -0500
Subject: [PATCH 1595/8469] Updated documentation on .pypirc support for
 credentials.

---
 docs/easy_install.txt | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index ffe6a268e6..a56dee496c 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -454,30 +454,15 @@ You can do this with both index page URLs and direct download URLs.  As long
 as any HTML pages read by easy_install use *relative* links to point to the
 downloads, the same user ID and password will be used to do the downloading.
 
-Authentication against privat repository
-----------------------------------------
-
-To get these things running. You need a .pypirc file in your home directory. The file should has the following format.
-
-Example
-
-::
-
-    [distutils]
-    index-servers = myrepos
-
-    [myrepos]
-    repository: http://myrepos.com
-    username:MY_USER
-    password:MY_PASSORD
-
-In your buildout.cfg you have to add the eggserver url under find-links. The example is for an mypypi egg server. /eggs provides a flat package list.
-
-Example
-
-::
+Using .pypirc Credentials
+-------------------------
 
-    find-links = http://myrepos.com/eggs
+In additional to supplying credentials in the URL, ``easy_install`` will also
+honor credentials if present in the .pypirc file. Teams maintaining a private
+repository of packages may already have defined access credentials for
+uploading packages according to the distutils documentation. ``easy_install``
+will attempt to honor those if present. Refer to the distutils documentation
+for Python 2.5 or later for details on the syntax.
 
 Controlling Build Options
 ~~~~~~~~~~~~~~~~~~~~~~~~~

From 9b316f1fa946fa24d770ba8c03dcfeec700d37cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 14:48:29 -0500
Subject: [PATCH 1596/8469] ConfigParser is not a new style class.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 26d1d4add3..bc276a26fe 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -943,7 +943,7 @@ def __init__(self):
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        super(PyPIConfig, self).__init__(defaults)
+        ConfigParser.ConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):

From 79f4299c37142ecc9643e38632ab8ee6695e0f65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 14:58:07 -0500
Subject: [PATCH 1597/8469] Updated changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 865a89138f..c991f221eb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+1.4
+---
+
+* Issue #27: ``easy_install`` will now use credentials from .pypirc if
+  present for connecting to the package index.
+
 -----
 1.3.2
 -----

From 8b1bf6c0d690e91c095a2390592fb31ccf2294cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 15:00:11 -0500
Subject: [PATCH 1598/8469] Bumped to 1.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0057e2750b..72d35a5b42 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.3.3"
+DEFAULT_VERSION = "1.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 07f744ca5d..0f663085de 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3.3'
+__version__ = '1.4'

From c743916e11ca05fa36882346adba1434a696b8ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 15:00:28 -0500
Subject: [PATCH 1599/8469] Added tag 1.4b1 for changeset 0d1bdb99a535

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b0b1a80723..27fc93b6fa 100644
--- a/.hgtags
+++ b/.hgtags
@@ -106,3 +106,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 19873119647deae8a68e9ed683317b9ee170a8d8 1.3
 a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
 076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
+0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1

From 7ade322c4e685aef1adab02ca3bad6444acc2466 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 15:12:31 -0500
Subject: [PATCH 1600/8469] Update docstring to reflect failure reported in
 pull request #21

---
 setuptools/package_index.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index bc276a26fe..2e8f62e222 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -908,8 +908,13 @@ def _encode_auth(auth):
     """
     A function compatible with Python 2.3-3.3 that will encode
     auth from a URL suitable for an HTTP header.
-    >>> _encode_auth('username%3Apassword')
-    u'dXNlcm5hbWU6cGFzc3dvcmQ='
+    >>> str(_encode_auth('username%3Apassword'))
+    'dXNlcm5hbWU6cGFzc3dvcmQ='
+
+    Long auth strings should not cause a newline to be inserted.
+    >>> long_auth = 'username:' + 'password'*10
+    >>> chr(10) in str(_encode_auth(long_auth))
+    False
     """
     auth_s = unquote(auth)
     # convert to bytes

From 79a0eec1af142ea63590187bfffc1b48de633e97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 15:16:51 -0500
Subject: [PATCH 1601/8469] Add support for linking Pull Requests in changelog.

--HG--
extra : rebase_source : f94412eefa4bf0f073a8ee30821dfc5a7a6f0d8a
---
 release.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release.py b/release.py
index f4dff0d29d..3dbfac24ba 100644
--- a/release.py
+++ b/release.py
@@ -33,6 +33,7 @@ def after_push():
 
 link_patterns = [
     r"(Issue )?#(?P<issue>\d+)",
+    r"Pull Request ?#(?P<pull_request>\d+)",
     r"Distribute #(?P<distribute>\d+)",
     r"Buildout #(?P<buildout>\d+)",
     r"Old Setuptools #(?P<old_setuptools>\d+)",
@@ -41,6 +42,8 @@ def after_push():
 ]
 
 issue_urls = dict(
+    pull_request='https://bitbucket.org'
+        '/pypa/setuptools/pull-request/{pull_request}',
     issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
     distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
     buildout='https://github.com/buildout/buildout/issues/{buildout}',

From 3f0364fcc1b6f183f81f7e8774b6de803638b209 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Nov 2013 15:19:19 -0500
Subject: [PATCH 1602/8469] Update changelog for Pull Request #21.

--HG--
extra : rebase_source : d89b8c105bd561122c6ae8d9b302db6f0eb6060c
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c991f221eb..e515f3bba6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 
 * Issue #27: ``easy_install`` will now use credentials from .pypirc if
   present for connecting to the package index.
+* Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
+  when the username/password pair length indicates wrapping.
 
 -----
 1.3.2

From 6a5be25a5dad39bbba71aa2bd1ccb479e9e7814c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Nov 2013 10:05:02 -0500
Subject: [PATCH 1603/8469] Issue #108: Make a note about current limitations
 of setuptools wheels.

---
 CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e515f3bba6..e23fa69236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,7 +40,10 @@ CHANGES
 
 * Issue #26: Add support for SVN 1.7. Special thanks to Philip Thiem for the
   contribution.
-* Issue #93: Wheels are now distributed with every release.
+* Issue #93: Wheels are now distributed with every release. Note that as
+  reported in Issue #108, as of Pip 1.4, scripts aren't installed properly
+  from wheels. Therefore, if using Pip to install setuptools from a wheel,
+  the ``easy_install`` command will not be available.
 * Setuptools "natural" launcher support, introduced in 1.0, is now officially
   supported.
 

From e72a9f07fc35f140531fb917a83962fc508a210e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Nov 2013 10:06:02 -0500
Subject: [PATCH 1604/8469] Added tag 1.4 for changeset a13f8c18ce74

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 27fc93b6fa..146ccec892 100644
--- a/.hgtags
+++ b/.hgtags
@@ -107,3 +107,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
 a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
 076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
 0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1
+a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4

From 5219786775784fe0f8c3742e37e1889ad2c2307f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Nov 2013 10:06:32 -0500
Subject: [PATCH 1605/8469] Bumped to 1.5 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 10 ++--
 setuptools/version.py                |  2 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 72d35a5b42..e611b05f5d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.4"
+DEFAULT_VERSION = "1.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index fb38112eb7..0d2df68264 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[distutils.setup_keywords]
+convert_2to3_doctests = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+packages = setuptools.dist:check_packages
+install_requires = setuptools.dist:check_requirements
+eager_resources = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+
 [egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
 [distutils.commands]
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
 build_ext = setuptools.command.build_ext:build_ext
+rotate = setuptools.command.rotate:rotate
+install = setuptools.command.install:install
+easy_install = setuptools.command.easy_install:easy_install
 setopt = setuptools.command.setopt:setopt
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 install_lib = setuptools.command.install_lib:install_lib
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-sdist = setuptools.command.sdist:sdist
-easy_install = setuptools.command.easy_install:easy_install
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 test = setuptools.command.test:test
-develop = setuptools.command.develop:develop
-alias = setuptools.command.alias:alias
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
-install = setuptools.command.install:install
+egg_info = setuptools.command.egg_info:egg_info
 install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 build_py = setuptools.command.build_py:build_py
-rotate = setuptools.command.rotate:rotate
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-extras_require = setuptools.dist:check_extras
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-packages = setuptools.dist:check_packages
-zip_safe = setuptools.dist:assert_bool
-include_package_data = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+saveopts = setuptools.command.saveopts:saveopts
+upload_docs = setuptools.command.upload_docs:upload_docs
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 221040f812..e7f0f3b867 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32']
+wincertstore==0.1
+
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 0f663085de..fcb6b5dc0d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4'
+__version__ = '1.5'

From f5cd7f424d0432cbca7d31648702249f2e76b087 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Thu, 21 Nov 2013 14:01:42 +0000
Subject: [PATCH 1606/8469] Made a more sophisticated encoding heuristic that
 runs at module load.

---
 setuptools/svn_utils.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 224d11ea53..98a1ff2e1e 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -5,6 +5,7 @@
 import xml.dom.pulldom
 import shlex
 import locale
+import codecs
 import unicodedata
 import warnings
 from setuptools.compat import unicode, bytes
@@ -72,6 +73,32 @@ def joinpath(prefix, *suffix):
         return os.path.join(*suffix)
     return os.path.join(prefix, *suffix)
 
+def determine_console_encoding():
+    try:
+        #try for the preferred encoding
+        encoding = locale.getpreferredencoding()
+    
+        #see if the locale.getdefaultlocale returns null
+        #some versions of python\platforms return US-ASCII
+        #when it cannot determine an encoding
+        if not encoding or encoding == "US-ASCII":
+            encoding = locale.getdefaultlocale()[1]
+        
+        if encoding:
+            codecs.lookup(encoding)  # make sure a lookup error is not made
+            
+    except locale.Error, LookupError:
+        encoding = None
+        
+    #olders pythons defaulted to this
+    if not encoding:
+        return "US-ASCII"
+    elif encoding.startswith("mac-") and os.platform == "darwin":
+        return "utf-8"
+    else:
+        return encoding
+    
+_console_encoding = determine_console_encoding()
 
 def decode_as_string(text, encoding=None):
     """
@@ -87,7 +114,7 @@ def decode_as_string(text, encoding=None):
     #text should be a byte string    
 
     if encoding is None:
-        encoding = locale.getpreferredencoding()
+        encoding = _console_encoding
 
     if not isinstance(text, unicode):
         text = text.decode(encoding)

From 3f5053737eaf08ad854d40d23743f701d3bbdcc9 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Thu, 21 Nov 2013 14:11:23 +0000
Subject: [PATCH 1607/8469] small syntax error.

---
 setuptools/svn_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 98a1ff2e1e..93ddb292be 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -87,7 +87,7 @@ def determine_console_encoding():
         if encoding:
             codecs.lookup(encoding)  # make sure a lookup error is not made
             
-    except locale.Error, LookupError:
+    except (locale.Error, LookupError):
         encoding = None
         
     #olders pythons defaulted to this

From 73c86d052de82327bdd0e22dd35de55f78d4186b Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 21 Nov 2013 17:25:55 -0600
Subject: [PATCH 1608/8469] forgot to add in the mac default.

---
 setuptools/svn_utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 93ddb292be..e8570e5244 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -91,9 +91,12 @@ def determine_console_encoding():
         encoding = None
         
     #olders pythons defaulted to this
+    is_osx = sys.platform == "darwin"
     if not encoding:
-        return "US-ASCII"
-    elif encoding.startswith("mac-") and os.platform == "darwin":
+        return ["utf-8", "US-ASCII"][is_osx]
+    elif encoding.startswith("mac-") and is_osx:
+        #certain version of pythons would return mac-roman as default
+        #OSX as a left over of earlier mac versions.
         return "utf-8"
     else:
         return encoding

From 4319a969dc616c915d8e5091246df5faf0b080e8 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Thu, 21 Nov 2013 23:50:50 +0000
Subject: [PATCH 1609/8469] small logic error

---
 setuptools/svn_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index e8570e5244..f0960da622 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -93,7 +93,7 @@ def determine_console_encoding():
     #olders pythons defaulted to this
     is_osx = sys.platform == "darwin"
     if not encoding:
-        return ["utf-8", "US-ASCII"][is_osx]
+        return ["US-ASCII", "utf-8"][is_osx]
     elif encoding.startswith("mac-") and is_osx:
         #certain version of pythons would return mac-roman as default
         #OSX as a left over of earlier mac versions.

From cc90c5093d272397f08e33e4e75bf762d419df27 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Fri, 22 Nov 2013 00:51:45 +0000
Subject: [PATCH 1610/8469] extraneous comment left in

---
 setuptools/svn_utils.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index f0960da622..0d65bd30eb 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -90,12 +90,11 @@ def determine_console_encoding():
     except (locale.Error, LookupError):
         encoding = None
         
-    #olders pythons defaulted to this
     is_osx = sys.platform == "darwin"
     if not encoding:
         return ["US-ASCII", "utf-8"][is_osx]
     elif encoding.startswith("mac-") and is_osx:
-        #certain version of pythons would return mac-roman as default
+        #certain versions of python would return mac-roman as default
         #OSX as a left over of earlier mac versions.
         return "utf-8"
     else:

From 63f856f5797afb3497818820f038c00ed10c0518 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 16:39:09 -0500
Subject: [PATCH 1611/8469] Use sys.getfilesystemencoding for decoding
 bdist_wininst config. Fixes #114.

---
 CHANGES.txt                        | 7 +++++++
 setuptools/command/easy_install.py | 7 +++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e23fa69236..9190aee290 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+1.4.1
+-----
+
+* Issue #114: Use ``sys.getfilesystemencoding`` for decoding config in
+  ``bdist_wininst`` distributions.
+
 ---
 1.4
 ---
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6ce19fa4df..d329f4cb50 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1373,10 +1373,9 @@ def extract_wininst_cfg(dist_filename):
             else:
                 null_byte = chr(0)
             config = part.split(null_byte, 1)[0]
-            # Now the config is in bytes, but on Python 3, it must be
-            #  unicode for the RawConfigParser, so decode it. Is this the
-            #  right encoding?
-            config = config.decode('ascii')
+            # Now the config is in bytes, but for RawConfigParser, it should
+            #  be text, so decode it.
+            config = config.decode(sys.getfilesystemencoding())
             cfg.readfp(StringIO(config))
         except ConfigParser.Error:
             return None

From ed7e0cc37c7a3f451092783a8f68c5773a4c32e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 17:45:01 -0500
Subject: [PATCH 1612/8469] Update changelog. Fixes #105 and Fixes #113.

--HG--
extra : amend_source : 10cadb252bc504ef25c9f9cf7f3cdc5bf03fd367
---
 CHANGES.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9190aee290..b20d16839c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,29 @@ CHANGES
 * Issue #114: Use ``sys.getfilesystemencoding`` for decoding config in
   ``bdist_wininst`` distributions.
 
+* Issue #105 and Issue #113: Establish a more robust technique for
+  determining the terminal encoding::
+
+    1. Try ``getpreferredencoding``
+    2. If that returns US_ASCII or None, try the encoding from
+       ``getdefaultlocale``. If that encoding was a "fallback" because Python
+       could not figure it out from the environment or OS, encoding remains
+       unresolved.
+    3. If the encoding is resolved, then make sure Python actually implements
+       the encoding.
+    4. On the event of an error or unknown codec, revert to fallbacks
+       (UTF-8 on Darwin, ASCII on everything else).
+    5. On the encoding is 'mac-roman' on Darwin, use UTF-8 as 'mac-roman' was
+       a bug on older Python releases.
+
+    On a side note, it would seem that the encoding only matters for when SVN
+    does not yet support ``--xml`` and when getting repository and svn version
+    numbers. The ``--xml`` technique should yield UTF-8 according to some
+    messages on the SVN mailing lists. So if the version numbers are always
+    7-bit ASCII clean, it may be best to only support the file parsing methods
+    for legacy SVN releases and support for SVN without the subprocess command
+    would simple go away as support for the older SVNs does.
+
 ---
 1.4
 ---

From d0fd5b0ea208361970897485deb5fac5b9a23224 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 17:50:44 -0500
Subject: [PATCH 1613/8469] Travis has dropped support for Python 2.5
 (http://about.travis-ci.org/blog/2013-11-18-upcoming-build-environment-updates/).

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b684935f92..e13a5d4fde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.5
   - 2.6
   - 2.7
   - 3.2

From 49860a858af9ba68fc332ef914ae650c843e62d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 17:53:20 -0500
Subject: [PATCH 1614/8469] Bumped to 1.4.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e611b05f5d..79e0896258 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.5"
+DEFAULT_VERSION = "1.4.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index fcb6b5dc0d..8e3c933cd0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.5'
+__version__ = '1.4.1'

From 617ffd19b3e13b46c1ab849ae394fb0ce8a0f6a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 17:53:23 -0500
Subject: [PATCH 1615/8469] Added tag 1.4.1 for changeset 9a5f26d7df8e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 146ccec892..c01565ac3d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -108,3 +108,4 @@ a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
 076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
 0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1
 a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
+9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1

From 1e811c32250676cc83e79e4063d5420eb72a8f83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2013 17:53:50 -0500
Subject: [PATCH 1616/8469] Bumped to 1.4.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 66 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     | 10 ++---
 setuptools/version.py                |  2 +-
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 79e0896258..9dc2c8729b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.4.1"
+DEFAULT_VERSION = "1.4.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 0d2df68264..2bf6c8ce4e 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
 [distutils.setup_keywords]
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
 include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
 tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
 use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
 packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
 dependency_links = setuptools.dist:assert_string_list
 exclude_package_data = setuptools.dist:check_package_data
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 
 [egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.commands]
-alias = setuptools.command.alias:alias
-build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
 rotate = setuptools.command.rotate:rotate
-install = setuptools.command.install:install
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
 test = setuptools.command.test:test
-register = setuptools.command.register:register
-egg_info = setuptools.command.egg_info:egg_info
-install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 build_py = setuptools.command.build_py:build_py
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 saveopts = setuptools.command.saveopts:saveopts
+build_ext = setuptools.command.build_ext:build_ext
+install_lib = setuptools.command.install_lib:install_lib
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+register = setuptools.command.register:register
+alias = setuptools.command.alias:alias
+install = setuptools.command.install:install
 upload_docs = setuptools.command.upload_docs:upload_docs
-sdist = setuptools.command.sdist:sdist
 develop = setuptools.command.develop:develop
+install_scripts = setuptools.command.install_scripts:install_scripts
+egg_info = setuptools.command.egg_info:egg_info
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
+setopt = setuptools.command.setopt:setopt
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e7f0f3b867..e4fb4954ff 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [certs]
 certifi==0.0.8
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
\ No newline at end of file
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 8e3c933cd0..98d186bed7 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4.1'
+__version__ = '1.4.2'

From dbe5fff6e83e67c7249c38ab4bde5d70e80e5ad0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:00:15 -0500
Subject: [PATCH 1617/8469] Drop support for Python 2.5 and Python 2.4. Fixes
 #41.

---
 CHANGES.txt            | 7 +++++++
 docs/easy_install.txt  | 2 +-
 docs/pkg_resources.txt | 2 +-
 docs/setuptools.txt    | 6 +++---
 ez_setup.py            | 2 +-
 pkg_resources.py       | 2 +-
 setup.py               | 8 --------
 setuptools/version.py  | 2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b20d16839c..1331de955d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+2.0
+---
+
+* Issue #41: Dropped support for Python 2.4 and Python 2.5. Clients requiring
+  setuptools for those versions of Python should use setuptools 1.x.
+
 -----
 1.4.1
 -----
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index a69ddd59f1..6739ba16ad 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
-You will need at least Python 2.4.  An ``easy_install`` script will be
+You will need at least Python 2.6.  An ``easy_install`` script will be
 installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 3aac47203f..8dd3e9abda 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -975,7 +975,7 @@ parsed_version
 
 py_version
     The major/minor Python version the distribution supports, as a string.
-    For example, "2.3" or "2.4".  The default is the current version of Python.
+    For example, "2.7" or "3.4".  The default is the current version of Python.
 
 platform
     A string representing the platform the distribution is intended for, or
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index dfa9ecdd1c..9bc8ea44b2 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -3,9 +3,9 @@ Building and Distributing Packages with Setuptools
 ==================================================
 
 ``Setuptools`` is a collection of enhancements to the Python ``distutils``
-(for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum
-of Python 2.4) that allow you to more easily build and distribute Python
-packages, especially ones that have dependencies on other packages.
+(for Python 2.6 and up) that allow developers to more easily build and
+distribute Python packages, especially ones that have dependencies on other
+packages.
 
 Packages built and distributed using ``setuptools`` look to the user like
 ordinary Python packages based on the ``distutils``.  Your users don't need to
diff --git a/ez_setup.py b/ez_setup.py
index 9dc2c8729b..a6f4815850 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.4.2"
+DEFAULT_VERSION = "2.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/pkg_resources.py b/pkg_resources.py
index 0297601629..2c19898bc1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -716,7 +716,7 @@ def __init__(self, search_path=None, platform=get_supported_platform(), python=P
         `platform` is an optional string specifying the name of the platform
         that platform-specific distributions must be compatible with.  If
         unspecified, it defaults to the current platform.  `python` is an
-        optional string naming the desired version of Python (e.g. ``'2.4'``);
+        optional string naming the desired version of Python (e.g. ``'3.3'``);
         it defaults to the current version.
 
         You may explicitly set `platform` (and/or `python`) to ``None`` if you
diff --git a/setup.py b/setup.py
index d08d714420..97cc68d019 100755
--- a/setup.py
+++ b/setup.py
@@ -169,8 +169,6 @@ def run(self):
         License :: OSI Approved :: Python Software Foundation License
         License :: OSI Approved :: Zope Public License
         Operating System :: OS Independent
-        Programming Language :: Python :: 2.4
-        Programming Language :: Python :: 2.5
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
@@ -184,17 +182,11 @@ def run(self):
         """).strip().splitlines(),
     extras_require = {
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
-        "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2",
-        "ssl:python_version in '2.4, 2.5'":"ssl==1.16",
         "certs": "certifi==0.0.8",
     },
     dependency_links = [
         'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
-        'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
-        'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc',
-        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5',
-        'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b',
     ],
     scripts = [],
     # tests_require = "setuptools[ssl]",
diff --git a/setuptools/version.py b/setuptools/version.py
index 98d186bed7..3b3dacb9af 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4.2'
+__version__ = '2.0'

From 47e5462bc732ffd5f363b4a60d5a6dd9efa0af3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:07:33 -0500
Subject: [PATCH 1618/8469] Remove py24compat module

---
 setuptools/_backport/__init__.py         |   0
 setuptools/_backport/hashlib/__init__.py | 146 ---------
 setuptools/_backport/hashlib/_sha.py     | 359 -----------------------
 setuptools/_backport/hashlib/_sha256.py  | 260 ----------------
 setuptools/_backport/hashlib/_sha512.py  | 288 ------------------
 setuptools/package_index.py              |   4 +-
 6 files changed, 2 insertions(+), 1055 deletions(-)
 delete mode 100644 setuptools/_backport/__init__.py
 delete mode 100644 setuptools/_backport/hashlib/__init__.py
 delete mode 100644 setuptools/_backport/hashlib/_sha.py
 delete mode 100644 setuptools/_backport/hashlib/_sha256.py
 delete mode 100644 setuptools/_backport/hashlib/_sha512.py

diff --git a/setuptools/_backport/__init__.py b/setuptools/_backport/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setuptools/_backport/hashlib/__init__.py b/setuptools/_backport/hashlib/__init__.py
deleted file mode 100644
index 5aeab496af..0000000000
--- a/setuptools/_backport/hashlib/__init__.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id$
-#
-#  Copyright (C) 2005   Gregory P. Smith (greg@krypto.org)
-#  Licensed to PSF under a Contributor Agreement.
-#
-
-__doc__ = """hashlib module - A common interface to many hash functions.
-
-new(name, string='') - returns a new hash object implementing the
-                       given hash function; initializing the hash
-                       using the given string data.
-
-Named constructor functions are also available, these are much faster
-than using new():
-
-md5(), sha1(), sha224(), sha256(), sha384(), and sha512()
-
-More algorithms may be available on your platform but the above are
-guaranteed to exist.
-
-NOTE: If you want the adler32 or crc32 hash functions they are available in
-the zlib module.
-
-Choose your hash function wisely.  Some have known collision weaknesses.
-sha384 and sha512 will be slow on 32 bit platforms.
-
-Hash objects have these methods:
- - update(arg): Update the hash object with the string arg. Repeated calls
-                are equivalent to a single call with the concatenation of all
-                the arguments.
- - digest():    Return the digest of the strings passed to the update() method
-                so far. This may contain non-ASCII characters, including
-                NUL bytes.
- - hexdigest(): Like digest() except the digest is returned as a string of
-                double length, containing only hexadecimal digits.
- - copy():      Return a copy (clone) of the hash object. This can be used to
-                efficiently compute the digests of strings that share a common
-                initial substring.
-
-For example, to obtain the digest of the string 'Nobody inspects the
-spammish repetition':
-
-    >>> import hashlib
-    >>> m = hashlib.md5()
-    >>> m.update("Nobody inspects")
-    >>> m.update(" the spammish repetition")
-    >>> m.digest()
-    '\\xbbd\\x9c\\x83\\xdd\\x1e\\xa5\\xc9\\xd9\\xde\\xc9\\xa1\\x8d\\xf0\\xff\\xe9'
-
-More condensed:
-
-    >>> hashlib.sha224("Nobody inspects the spammish repetition").hexdigest()
-    'a4337bc45a8fc544c03f52dc550cd6e1e87021bc896588bd79e901e2'
-
-"""
-
-# This tuple and __get_builtin_constructor() must be modified if a new
-# always available algorithm is added.
-__always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512')
-
-algorithms = __always_supported
-
-__all__ = __always_supported + ('new', 'algorithms')
-
-
-def __get_builtin_constructor(name):
-    try:
-        if name in ('SHA1', 'sha1'):
-            import _sha
-            return _sha.new
-        elif name in ('MD5', 'md5'):
-            import md5
-            return md5.new
-        elif name in ('SHA256', 'sha256', 'SHA224', 'sha224'):
-            import _sha256
-            bs = name[3:]
-            if bs == '256':
-                return _sha256.sha256
-            elif bs == '224':
-                return _sha256.sha224
-        elif name in ('SHA512', 'sha512', 'SHA384', 'sha384'):
-            import _sha512
-            bs = name[3:]
-            if bs == '512':
-                return _sha512.sha512
-            elif bs == '384':
-                return _sha512.sha384
-    except ImportError:
-        pass  # no extension module, this hash is unsupported.
-
-    raise ValueError('unsupported hash type %s' % name)
-
-
-def __get_openssl_constructor(name):
-    try:
-        f = getattr(_hashlib, 'openssl_' + name)
-        # Allow the C module to raise ValueError.  The function will be
-        # defined but the hash not actually available thanks to OpenSSL.
-        f()
-        # Use the C function directly (very fast)
-        return f
-    except (AttributeError, ValueError):
-        return __get_builtin_constructor(name)
-
-
-def __py_new(name, string=''):
-    """new(name, string='') - Return a new hashing object using the named algorithm;
-    optionally initialized with a string.
-    """
-    return __get_builtin_constructor(name)(string)
-
-
-def __hash_new(name, string=''):
-    """new(name, string='') - Return a new hashing object using the named algorithm;
-    optionally initialized with a string.
-    """
-    try:
-        return _hashlib.new(name, string)
-    except ValueError:
-        # If the _hashlib module (OpenSSL) doesn't support the named
-        # hash, try using our builtin implementations.
-        # This allows for SHA224/256 and SHA384/512 support even though
-        # the OpenSSL library prior to 0.9.8 doesn't provide them.
-        return __get_builtin_constructor(name)(string)
-
-
-try:
-    import _hashlib
-    new = __hash_new
-    __get_hash = __get_openssl_constructor
-except ImportError:
-    new = __py_new
-    __get_hash = __get_builtin_constructor
-
-for __func_name in __always_supported:
-    # try them all, some may not work due to the OpenSSL
-    # version not supporting that algorithm.
-    try:
-        globals()[__func_name] = __get_hash(__func_name)
-    except ValueError:
-        import logging
-        logging.exception('code for hash %s was not found.', __func_name)
-
-# Cleanup locals()
-del __always_supported, __func_name, __get_hash
-del __py_new, __hash_new, __get_openssl_constructor
diff --git a/setuptools/_backport/hashlib/_sha.py b/setuptools/_backport/hashlib/_sha.py
deleted file mode 100644
index d49993c887..0000000000
--- a/setuptools/_backport/hashlib/_sha.py
+++ /dev/null
@@ -1,359 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-"""A sample implementation of SHA-1 in pure Python.
-
-   Framework adapted from Dinu Gherman's MD5 implementation by
-   J. Hallén and L. Creighton. SHA-1 implementation based directly on
-   the text of the NIST standard FIPS PUB 180-1.
-"""
-
-
-__date__    = '2004-11-17'
-__version__ = 0.91 # Modernised by J. Hallén and L. Creighton for Pypy
-
-
-import struct, copy
-
-
-# ======================================================================
-# Bit-Manipulation helpers
-#
-#   _long2bytes() was contributed by Barry Warsaw
-#   and is reused here with tiny modifications.
-# ======================================================================
-
-def _long2bytesBigEndian(n, blocksize=0):
-    """Convert a long integer to a byte string.
-
-    If optional blocksize is given and greater than zero, pad the front
-    of the byte string with binary zeros so that the length is a multiple
-    of blocksize.
-    """
-
-    # After much testing, this algorithm was deemed to be the fastest.
-    s = ''
-    pack = struct.pack
-    while n > 0:
-        s = pack('>I', n & 0xffffffff) + s
-        n = n >> 32
-
-    # Strip off leading zeros.
-    for i in range(len(s)):
-        if s[i] != '\000':
-            break
-    else:
-        # Only happens when n == 0.
-        s = '\000'
-        i = 0
-
-    s = s[i:]
-
-    # Add back some pad bytes. This could be done more efficiently
-    # w.r.t. the de-padding being done above, but sigh...
-    if blocksize > 0 and len(s) % blocksize:
-        s = (blocksize - len(s) % blocksize) * '\000' + s
-
-    return s
-
-
-def _bytelist2longBigEndian(list):
-    "Transform a list of characters into a list of longs."
-
-    imax = len(list) // 4
-    hl = [0] * imax
-
-    j = 0
-    i = 0
-    while i < imax:
-        b0 = ord(list[j]) << 24
-        b1 = ord(list[j+1]) << 16
-        b2 = ord(list[j+2]) << 8
-        b3 = ord(list[j+3])
-        hl[i] = b0 | b1 | b2 | b3
-        i = i+1
-        j = j+4
-
-    return hl
-
-
-def _rotateLeft(x, n):
-    "Rotate x (32 bit) left n bits circularly."
-
-    return (x << n) | (x >> (32-n))
-
-
-# ======================================================================
-# The SHA transformation functions
-#
-# ======================================================================
-
-def f0_19(B, C, D):
-    return (B & C) | ((~ B) & D)
-
-def f20_39(B, C, D):
-    return B ^ C ^ D
-
-def f40_59(B, C, D):
-    return (B & C) | (B & D) | (C & D)
-
-def f60_79(B, C, D):
-    return B ^ C ^ D
-
-
-f = [f0_19, f20_39, f40_59, f60_79]
-
-# Constants to be used
-K = [
-    0x5A827999, # ( 0 <= t <= 19)
-    0x6ED9EBA1, # (20 <= t <= 39)
-    0x8F1BBCDC, # (40 <= t <= 59)
-    0xCA62C1D6  # (60 <= t <= 79)
-    ]
-
-class sha:
-    "An implementation of the MD5 hash function in pure Python."
-
-    digest_size = digestsize = 20
-    block_size = 1
-
-    def __init__(self):
-        "Initialisation."
-
-        # Initial message length in bits(!).
-        self.length = 0
-        self.count = [0, 0]
-
-        # Initial empty message as a sequence of bytes (8 bit characters).
-        self.input = []
-
-        # Call a separate init function, that can be used repeatedly
-        # to start from scratch on the same object.
-        self.init()
-
-
-    def init(self):
-        "Initialize the message-digest and set all fields to zero."
-
-        self.length = 0
-        self.input = []
-
-        # Initial 160 bit message digest (5 times 32 bit).
-        self.H0 = 0x67452301
-        self.H1 = 0xEFCDAB89
-        self.H2 = 0x98BADCFE
-        self.H3 = 0x10325476
-        self.H4 = 0xC3D2E1F0
-
-    def _transform(self, W):
-
-        for t in range(16, 80):
-            W.append(_rotateLeft(
-                W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16], 1) & 0xffffffff)
-
-        A = self.H0
-        B = self.H1
-        C = self.H2
-        D = self.H3
-        E = self.H4
-
-        """
-        This loop was unrolled to gain about 10% in speed
-        for t in range(0, 80):
-            TEMP = _rotateLeft(A, 5) + f[t/20] + E + W[t] + K[t/20]
-            E = D
-            D = C
-            C = _rotateLeft(B, 30) & 0xffffffff
-            B = A
-            A = TEMP & 0xffffffff
-        """
-
-        for t in range(0, 20):
-            TEMP = _rotateLeft(A, 5) + ((B & C) | ((~ B) & D)) + E + W[t] + K[0]
-            E = D
-            D = C
-            C = _rotateLeft(B, 30) & 0xffffffff
-            B = A
-            A = TEMP & 0xffffffff
-
-        for t in range(20, 40):
-            TEMP = _rotateLeft(A, 5) + (B ^ C ^ D) + E + W[t] + K[1]
-            E = D
-            D = C
-            C = _rotateLeft(B, 30) & 0xffffffff
-            B = A
-            A = TEMP & 0xffffffff
-
-        for t in range(40, 60):
-            TEMP = _rotateLeft(A, 5) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2]
-            E = D
-            D = C
-            C = _rotateLeft(B, 30) & 0xffffffff
-            B = A
-            A = TEMP & 0xffffffff
-
-        for t in range(60, 80):
-            TEMP = _rotateLeft(A, 5) + (B ^ C ^ D)  + E + W[t] + K[3]
-            E = D
-            D = C
-            C = _rotateLeft(B, 30) & 0xffffffff
-            B = A
-            A = TEMP & 0xffffffff
-
-
-        self.H0 = (self.H0 + A) & 0xffffffff
-        self.H1 = (self.H1 + B) & 0xffffffff
-        self.H2 = (self.H2 + C) & 0xffffffff
-        self.H3 = (self.H3 + D) & 0xffffffff
-        self.H4 = (self.H4 + E) & 0xffffffff
-
-
-    # Down from here all methods follow the Python Standard Library
-    # API of the sha module.
-
-    def update(self, inBuf):
-        """Add to the current message.
-
-        Update the md5 object with the string arg. Repeated calls
-        are equivalent to a single call with the concatenation of all
-        the arguments, i.e. m.update(a); m.update(b) is equivalent
-        to m.update(a+b).
-
-        The hash is immediately calculated for all full blocks. The final
-        calculation is made in digest(). It will calculate 1-2 blocks,
-        depending on how much padding we have to add. This allows us to
-        keep an intermediate value for the hash, so that we only need to
-        make minimal recalculation if we call update() to add more data
-        to the hashed string.
-        """
-
-        leninBuf = len(inBuf)
-
-        # Compute number of bytes mod 64.
-        index = (self.count[1] >> 3) & 0x3F
-
-        # Update number of bits.
-        self.count[1] = self.count[1] + (leninBuf << 3)
-        if self.count[1] < (leninBuf << 3):
-            self.count[0] = self.count[0] + 1
-        self.count[0] = self.count[0] + (leninBuf >> 29)
-
-        partLen = 64 - index
-
-        if leninBuf >= partLen:
-            self.input[index:] = list(inBuf[:partLen])
-            self._transform(_bytelist2longBigEndian(self.input))
-            i = partLen
-            while i + 63 < leninBuf:
-                self._transform(_bytelist2longBigEndian(list(inBuf[i:i+64])))
-                i = i + 64
-            else:
-                self.input = list(inBuf[i:leninBuf])
-        else:
-            i = 0
-            self.input = self.input + list(inBuf)
-
-
-    def digest(self):
-        """Terminate the message-digest computation and return digest.
-
-        Return the digest of the strings passed to the update()
-        method so far. This is a 16-byte string which may contain
-        non-ASCII characters, including null bytes.
-        """
-
-        H0 = self.H0
-        H1 = self.H1
-        H2 = self.H2
-        H3 = self.H3
-        H4 = self.H4
-        input = [] + self.input
-        count = [] + self.count
-
-        index = (self.count[1] >> 3) & 0x3f
-
-        if index < 56:
-            padLen = 56 - index
-        else:
-            padLen = 120 - index
-
-        padding = ['\200'] + ['\000'] * 63
-        self.update(padding[:padLen])
-
-        # Append length (before padding).
-        bits = _bytelist2longBigEndian(self.input[:56]) + count
-
-        self._transform(bits)
-
-        # Store state in digest.
-        digest = _long2bytesBigEndian(self.H0, 4) + \
-                 _long2bytesBigEndian(self.H1, 4) + \
-                 _long2bytesBigEndian(self.H2, 4) + \
-                 _long2bytesBigEndian(self.H3, 4) + \
-                 _long2bytesBigEndian(self.H4, 4)
-
-        self.H0 = H0
-        self.H1 = H1
-        self.H2 = H2
-        self.H3 = H3
-        self.H4 = H4
-        self.input = input
-        self.count = count
-
-        return digest
-
-
-    def hexdigest(self):
-        """Terminate and return digest in HEX form.
-
-        Like digest() except the digest is returned as a string of
-        length 32, containing only hexadecimal digits. This may be
-        used to exchange the value safely in email or other non-
-        binary environments.
-        """
-        return ''.join(['%02x' % ord(c) for c in self.digest()])
-
-    def copy(self):
-        """Return a clone object.
-
-        Return a copy ('clone') of the md5 object. This can be used
-        to efficiently compute the digests of strings that share
-        a common initial substring.
-        """
-
-        return copy.deepcopy(self)
-
-
-# ======================================================================
-# Mimic Python top-level functions from standard library API
-# for consistency with the _sha module of the standard library.
-# ======================================================================
-
-# These are mandatory variables in the module. They have constant values
-# in the SHA standard.
-
-digest_size = 20
-digestsize = 20
-blocksize = 1
-
-def new(arg=None):
-    """Return a new sha crypto object.
-
-    If arg is present, the method call update(arg) is made.
-    """
-
-    crypto = sha()
-    if arg:
-        crypto.update(arg)
-
-    return crypto
-
-
-if __name__ == "__main__":
-    a_str = "just a test string"
-
-    assert 'da39a3ee5e6b4b0d3255bfef95601890afd80709' == new().hexdigest()
-    assert '3f0cf2e3d9e5903e839417dfc47fed6bfa6457f6' == new(a_str).hexdigest()
-    assert '0852b254078fe3772568a4aba37b917f3d4066ba' == new(a_str*7).hexdigest()
-
-    s = new(a_str)
-    s.update(a_str)
-    assert '8862c1b50967f39d3db6bdc2877d9ccebd3102e5' == s.hexdigest()
diff --git a/setuptools/_backport/hashlib/_sha256.py b/setuptools/_backport/hashlib/_sha256.py
deleted file mode 100644
index 805dbd086c..0000000000
--- a/setuptools/_backport/hashlib/_sha256.py
+++ /dev/null
@@ -1,260 +0,0 @@
-import struct
-
-SHA_BLOCKSIZE = 64
-SHA_DIGESTSIZE = 32
-
-
-def new_shaobject():
-    return {
-        'digest': [0]*8,
-        'count_lo': 0,
-        'count_hi': 0,
-        'data': [0]* SHA_BLOCKSIZE,
-        'local': 0,
-        'digestsize': 0
-    }
-
-ROR = lambda x, y: (((x & 0xffffffff) >> (y & 31)) | (x << (32 - (y & 31)))) & 0xffffffff
-Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
-Maj = lambda x, y, z: (((x | y) & z) | (x & y))
-S = lambda x, n: ROR(x, n)
-R = lambda x, n: (x & 0xffffffff) >> n
-Sigma0 = lambda x: (S(x, 2) ^ S(x, 13) ^ S(x, 22))
-Sigma1 = lambda x: (S(x, 6) ^ S(x, 11) ^ S(x, 25))
-Gamma0 = lambda x: (S(x, 7) ^ S(x, 18) ^ R(x, 3))
-Gamma1 = lambda x: (S(x, 17) ^ S(x, 19) ^ R(x, 10))
-
-def sha_transform(sha_info):
-    W = []
-
-    d = sha_info['data']
-    for i in xrange(0,16):
-        W.append( (d[4*i]<<24) + (d[4*i+1]<<16) + (d[4*i+2]<<8) + d[4*i+3])
-
-    for i in xrange(16,64):
-        W.append( (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xffffffff )
-
-    ss = sha_info['digest'][:]
-
-    def RND(a,b,c,d,e,f,g,h,i,ki):
-        t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i];
-        t1 = Sigma0(a) + Maj(a, b, c);
-        d += t0;
-        h  = t0 + t1;
-        return d & 0xffffffff, h & 0xffffffff
-
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],0,0x428a2f98);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],1,0x71374491);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],2,0xb5c0fbcf);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],3,0xe9b5dba5);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],4,0x3956c25b);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],5,0x59f111f1);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],6,0x923f82a4);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],7,0xab1c5ed5);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],8,0xd807aa98);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],9,0x12835b01);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],10,0x243185be);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],11,0x550c7dc3);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],12,0x72be5d74);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],13,0x80deb1fe);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],14,0x9bdc06a7);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],15,0xc19bf174);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],16,0xe49b69c1);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],17,0xefbe4786);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],18,0x0fc19dc6);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],19,0x240ca1cc);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],20,0x2de92c6f);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],21,0x4a7484aa);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],22,0x5cb0a9dc);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],23,0x76f988da);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],24,0x983e5152);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],25,0xa831c66d);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],26,0xb00327c8);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],27,0xbf597fc7);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],28,0xc6e00bf3);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],29,0xd5a79147);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],30,0x06ca6351);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],31,0x14292967);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],32,0x27b70a85);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],33,0x2e1b2138);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],34,0x4d2c6dfc);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],35,0x53380d13);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],36,0x650a7354);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],37,0x766a0abb);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],38,0x81c2c92e);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],39,0x92722c85);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],40,0xa2bfe8a1);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],41,0xa81a664b);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],42,0xc24b8b70);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],43,0xc76c51a3);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],44,0xd192e819);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],45,0xd6990624);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],46,0xf40e3585);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],47,0x106aa070);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],48,0x19a4c116);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],49,0x1e376c08);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],50,0x2748774c);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],51,0x34b0bcb5);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],52,0x391c0cb3);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],53,0x4ed8aa4a);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],54,0x5b9cca4f);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],55,0x682e6ff3);
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],56,0x748f82ee);
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],57,0x78a5636f);
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],58,0x84c87814);
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],59,0x8cc70208);
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],60,0x90befffa);
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],61,0xa4506ceb);
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],62,0xbef9a3f7);
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],63,0xc67178f2);
-
-    dig = []
-    for i, x in enumerate(sha_info['digest']):
-        dig.append( (x + ss[i]) & 0xffffffff )
-    sha_info['digest'] = dig
-
-def sha_init():
-    sha_info = new_shaobject()
-    sha_info['digest'] = [0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19]
-    sha_info['count_lo'] = 0
-    sha_info['count_hi'] = 0
-    sha_info['local'] = 0
-    sha_info['digestsize'] = 32
-    return sha_info
-
-def sha224_init():
-    sha_info = new_shaobject()
-    sha_info['digest'] = [0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4]
-    sha_info['count_lo'] = 0
-    sha_info['count_hi'] = 0
-    sha_info['local'] = 0
-    sha_info['digestsize'] = 28
-    return sha_info
-
-def getbuf(s):
-    if isinstance(s, str):
-        return s
-    elif isinstance(s, unicode):
-        return str(s)
-    else:
-        return buffer(s)
-
-def sha_update(sha_info, buffer):
-    count = len(buffer)
-    buffer_idx = 0
-    clo = (sha_info['count_lo'] + (count << 3)) & 0xffffffff
-    if clo < sha_info['count_lo']:
-        sha_info['count_hi'] += 1
-    sha_info['count_lo'] = clo
-
-    sha_info['count_hi'] += (count >> 29)
-
-    if sha_info['local']:
-        i = SHA_BLOCKSIZE - sha_info['local']
-        if i > count:
-            i = count
-
-        # copy buffer
-        for x in enumerate(buffer[buffer_idx:buffer_idx+i]):
-            sha_info['data'][sha_info['local']+x[0]] = struct.unpack('B', x[1])[0]
-
-        count -= i
-        buffer_idx += i
-
-        sha_info['local'] += i
-        if sha_info['local'] == SHA_BLOCKSIZE:
-            sha_transform(sha_info)
-            sha_info['local'] = 0
-        else:
-            return
-
-    while count >= SHA_BLOCKSIZE:
-        # copy buffer
-        sha_info['data'] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + SHA_BLOCKSIZE]]
-        count -= SHA_BLOCKSIZE
-        buffer_idx += SHA_BLOCKSIZE
-        sha_transform(sha_info)
-
-
-    # copy buffer
-    pos = sha_info['local']
-    sha_info['data'][pos:pos+count] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + count]]
-    sha_info['local'] = count
-
-def sha_final(sha_info):
-    lo_bit_count = sha_info['count_lo']
-    hi_bit_count = sha_info['count_hi']
-    count = (lo_bit_count >> 3) & 0x3f
-    sha_info['data'][count] = 0x80;
-    count += 1
-    if count > SHA_BLOCKSIZE - 8:
-        # zero the bytes in data after the count
-        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
-        sha_transform(sha_info)
-        # zero bytes in data
-        sha_info['data'] = [0] * SHA_BLOCKSIZE
-    else:
-        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
-
-    sha_info['data'][56] = (hi_bit_count >> 24) & 0xff
-    sha_info['data'][57] = (hi_bit_count >> 16) & 0xff
-    sha_info['data'][58] = (hi_bit_count >>  8) & 0xff
-    sha_info['data'][59] = (hi_bit_count >>  0) & 0xff
-    sha_info['data'][60] = (lo_bit_count >> 24) & 0xff
-    sha_info['data'][61] = (lo_bit_count >> 16) & 0xff
-    sha_info['data'][62] = (lo_bit_count >>  8) & 0xff
-    sha_info['data'][63] = (lo_bit_count >>  0) & 0xff
-
-    sha_transform(sha_info)
-
-    dig = []
-    for i in sha_info['digest']:
-        dig.extend([ ((i>>24) & 0xff), ((i>>16) & 0xff), ((i>>8) & 0xff), (i & 0xff) ])
-    return ''.join([chr(i) for i in dig])
-
-class sha256(object):
-    digest_size = digestsize = SHA_DIGESTSIZE
-    block_size = SHA_BLOCKSIZE
-
-    def __init__(self, s=None):
-        self._sha = sha_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def update(self, s):
-        sha_update(self._sha, getbuf(s))
-
-    def digest(self):
-        return sha_final(self._sha.copy())[:self._sha['digestsize']]
-
-    def hexdigest(self):
-        return ''.join(['%.2x' % ord(i) for i in self.digest()])
-
-    def copy(self):
-        new = sha256.__new__(sha256)
-        new._sha = self._sha.copy()
-        return new
-
-class sha224(sha256):
-    digest_size = digestsize = 28
-
-    def __init__(self, s=None):
-        self._sha = sha224_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def copy(self):
-        new = sha224.__new__(sha224)
-        new._sha = self._sha.copy()
-        return new
-
-if __name__ == "__main__":
-    a_str = "just a test string"
-
-    assert 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' == sha256().hexdigest()
-    assert 'd7b553c6f09ac85d142415f857c5310f3bbbe7cdd787cce4b985acedd585266f' == sha256(a_str).hexdigest()
-    assert '8113ebf33c97daa9998762aacafe750c7cefc2b2f173c90c59663a57fe626f21' == sha256(a_str*7).hexdigest()
-
-    s = sha256(a_str)
-    s.update(a_str)
-    assert '03d9963e05a094593190b6fc794cb1a3e1ac7d7883f0b5855268afeccc70d461' == s.hexdigest()
diff --git a/setuptools/_backport/hashlib/_sha512.py b/setuptools/_backport/hashlib/_sha512.py
deleted file mode 100644
index 68ff46f308..0000000000
--- a/setuptools/_backport/hashlib/_sha512.py
+++ /dev/null
@@ -1,288 +0,0 @@
-"""
-This code was Ported from CPython's sha512module.c
-"""
-
-import struct
-
-SHA_BLOCKSIZE = 128
-SHA_DIGESTSIZE = 64
-
-
-def new_shaobject():
-    return {
-        'digest': [0]*8,
-        'count_lo': 0,
-        'count_hi': 0,
-        'data': [0]* SHA_BLOCKSIZE,
-        'local': 0,
-        'digestsize': 0
-    }
-
-ROR64 = lambda x, y: (((x & 0xffffffffffffffff) >> (y & 63)) | (x << (64 - (y & 63)))) & 0xffffffffffffffff
-Ch = lambda x, y, z: (z ^ (x & (y ^ z)))
-Maj = lambda x, y, z: (((x | y) & z) | (x & y))
-S = lambda x, n: ROR64(x, n)
-R = lambda x, n: (x & 0xffffffffffffffff) >> n
-Sigma0 = lambda x: (S(x, 28) ^ S(x, 34) ^ S(x, 39))
-Sigma1 = lambda x: (S(x, 14) ^ S(x, 18) ^ S(x, 41))
-Gamma0 = lambda x: (S(x, 1) ^ S(x, 8) ^ R(x, 7))
-Gamma1 = lambda x: (S(x, 19) ^ S(x, 61) ^ R(x, 6))
-
-def sha_transform(sha_info):
-    W = []
-
-    d = sha_info['data']
-    for i in xrange(0,16):
-        W.append( (d[8*i]<<56) + (d[8*i+1]<<48) + (d[8*i+2]<<40) + (d[8*i+3]<<32) + (d[8*i+4]<<24) + (d[8*i+5]<<16) + (d[8*i+6]<<8) + d[8*i+7])
-
-    for i in xrange(16,80):
-        W.append( (Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]) & 0xffffffffffffffff )
-
-    ss = sha_info['digest'][:]
-
-    def RND(a,b,c,d,e,f,g,h,i,ki):
-        t0 = (h + Sigma1(e) + Ch(e, f, g) + ki + W[i]) & 0xffffffffffffffff
-        t1 = (Sigma0(a) + Maj(a, b, c)) & 0xffffffffffffffff
-        d = (d + t0) & 0xffffffffffffffff
-        h = (t0 + t1) & 0xffffffffffffffff
-        return d & 0xffffffffffffffff, h & 0xffffffffffffffff
-
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],0,0x428a2f98d728ae22)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],1,0x7137449123ef65cd)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],2,0xb5c0fbcfec4d3b2f)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],3,0xe9b5dba58189dbbc)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],4,0x3956c25bf348b538)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],5,0x59f111f1b605d019)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],6,0x923f82a4af194f9b)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],7,0xab1c5ed5da6d8118)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],8,0xd807aa98a3030242)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],9,0x12835b0145706fbe)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],10,0x243185be4ee4b28c)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],11,0x550c7dc3d5ffb4e2)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],12,0x72be5d74f27b896f)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],13,0x80deb1fe3b1696b1)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],14,0x9bdc06a725c71235)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],15,0xc19bf174cf692694)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],16,0xe49b69c19ef14ad2)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],17,0xefbe4786384f25e3)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],18,0x0fc19dc68b8cd5b5)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],19,0x240ca1cc77ac9c65)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],20,0x2de92c6f592b0275)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],21,0x4a7484aa6ea6e483)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],22,0x5cb0a9dcbd41fbd4)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],23,0x76f988da831153b5)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],24,0x983e5152ee66dfab)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],25,0xa831c66d2db43210)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],26,0xb00327c898fb213f)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],27,0xbf597fc7beef0ee4)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],28,0xc6e00bf33da88fc2)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],29,0xd5a79147930aa725)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],30,0x06ca6351e003826f)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],31,0x142929670a0e6e70)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],32,0x27b70a8546d22ffc)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],33,0x2e1b21385c26c926)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],34,0x4d2c6dfc5ac42aed)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],35,0x53380d139d95b3df)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],36,0x650a73548baf63de)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],37,0x766a0abb3c77b2a8)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],38,0x81c2c92e47edaee6)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],39,0x92722c851482353b)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],40,0xa2bfe8a14cf10364)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],41,0xa81a664bbc423001)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],42,0xc24b8b70d0f89791)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],43,0xc76c51a30654be30)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],44,0xd192e819d6ef5218)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],45,0xd69906245565a910)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],46,0xf40e35855771202a)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],47,0x106aa07032bbd1b8)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],48,0x19a4c116b8d2d0c8)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],49,0x1e376c085141ab53)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],50,0x2748774cdf8eeb99)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],51,0x34b0bcb5e19b48a8)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],52,0x391c0cb3c5c95a63)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],53,0x4ed8aa4ae3418acb)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],54,0x5b9cca4f7763e373)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],55,0x682e6ff3d6b2b8a3)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],56,0x748f82ee5defb2fc)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],57,0x78a5636f43172f60)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],58,0x84c87814a1f0ab72)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],59,0x8cc702081a6439ec)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],60,0x90befffa23631e28)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],61,0xa4506cebde82bde9)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],62,0xbef9a3f7b2c67915)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],63,0xc67178f2e372532b)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],64,0xca273eceea26619c)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],65,0xd186b8c721c0c207)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],66,0xeada7dd6cde0eb1e)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],67,0xf57d4f7fee6ed178)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],68,0x06f067aa72176fba)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],69,0x0a637dc5a2c898a6)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],70,0x113f9804bef90dae)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],71,0x1b710b35131c471b)
-    ss[3], ss[7] = RND(ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],72,0x28db77f523047d84)
-    ss[2], ss[6] = RND(ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],73,0x32caab7b40c72493)
-    ss[1], ss[5] = RND(ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],ss[5],74,0x3c9ebe0a15c9bebc)
-    ss[0], ss[4] = RND(ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],ss[4],75,0x431d67c49c100d4c)
-    ss[7], ss[3] = RND(ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],ss[3],76,0x4cc5d4becb3e42b6)
-    ss[6], ss[2] = RND(ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],ss[2],77,0x597f299cfc657e2a)
-    ss[5], ss[1] = RND(ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],ss[1],78,0x5fcb6fab3ad6faec)
-    ss[4], ss[0] = RND(ss[1],ss[2],ss[3],ss[4],ss[5],ss[6],ss[7],ss[0],79,0x6c44198c4a475817)
-
-    dig = []
-    for i, x in enumerate(sha_info['digest']):
-        dig.append( (x + ss[i]) & 0xffffffffffffffff )
-    sha_info['digest'] = dig
-
-def sha_init():
-    sha_info = new_shaobject()
-    sha_info['digest'] = [ 0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1, 0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179]
-    sha_info['count_lo'] = 0
-    sha_info['count_hi'] = 0
-    sha_info['local'] = 0
-    sha_info['digestsize'] = 64
-    return sha_info
-
-def sha384_init():
-    sha_info = new_shaobject()
-    sha_info['digest'] = [ 0xcbbb9d5dc1059ed8, 0x629a292a367cd507, 0x9159015a3070dd17, 0x152fecd8f70e5939, 0x67332667ffc00b31, 0x8eb44a8768581511, 0xdb0c2e0d64f98fa7, 0x47b5481dbefa4fa4]
-    sha_info['count_lo'] = 0
-    sha_info['count_hi'] = 0
-    sha_info['local'] = 0
-    sha_info['digestsize'] = 48
-    return sha_info
-
-def getbuf(s):
-    if isinstance(s, str):
-        return s
-    elif isinstance(s, unicode):
-        return str(s)
-    else:
-        return buffer(s)
-
-def sha_update(sha_info, buffer):
-    count = len(buffer)
-    buffer_idx = 0
-    clo = (sha_info['count_lo'] + (count << 3)) & 0xffffffff
-    if clo < sha_info['count_lo']:
-        sha_info['count_hi'] += 1
-    sha_info['count_lo'] = clo
-
-    sha_info['count_hi'] += (count >> 29)
-
-    if sha_info['local']:
-        i = SHA_BLOCKSIZE - sha_info['local']
-        if i > count:
-            i = count
-
-        # copy buffer
-        for x in enumerate(buffer[buffer_idx:buffer_idx+i]):
-            sha_info['data'][sha_info['local']+x[0]] = struct.unpack('B', x[1])[0]
-
-        count -= i
-        buffer_idx += i
-
-        sha_info['local'] += i
-        if sha_info['local'] == SHA_BLOCKSIZE:
-            sha_transform(sha_info)
-            sha_info['local'] = 0
-        else:
-            return
-
-    while count >= SHA_BLOCKSIZE:
-        # copy buffer
-        sha_info['data'] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + SHA_BLOCKSIZE]]
-        count -= SHA_BLOCKSIZE
-        buffer_idx += SHA_BLOCKSIZE
-        sha_transform(sha_info)
-
-    # copy buffer
-    pos = sha_info['local']
-    sha_info['data'][pos:pos+count] = [struct.unpack('B',c)[0] for c in buffer[buffer_idx:buffer_idx + count]]
-    sha_info['local'] = count
-
-def sha_final(sha_info):
-    lo_bit_count = sha_info['count_lo']
-    hi_bit_count = sha_info['count_hi']
-    count = (lo_bit_count >> 3) & 0x7f
-    sha_info['data'][count] = 0x80;
-    count += 1
-    if count > SHA_BLOCKSIZE - 16:
-        # zero the bytes in data after the count
-        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
-        sha_transform(sha_info)
-        # zero bytes in data
-        sha_info['data'] = [0] * SHA_BLOCKSIZE
-    else:
-        sha_info['data'] = sha_info['data'][:count] + ([0] * (SHA_BLOCKSIZE - count))
-
-    sha_info['data'][112] = 0;
-    sha_info['data'][113] = 0;
-    sha_info['data'][114] = 0;
-    sha_info['data'][115] = 0;
-    sha_info['data'][116] = 0;
-    sha_info['data'][117] = 0;
-    sha_info['data'][118] = 0;
-    sha_info['data'][119] = 0;
-
-    sha_info['data'][120] = (hi_bit_count >> 24) & 0xff
-    sha_info['data'][121] = (hi_bit_count >> 16) & 0xff
-    sha_info['data'][122] = (hi_bit_count >>  8) & 0xff
-    sha_info['data'][123] = (hi_bit_count >>  0) & 0xff
-    sha_info['data'][124] = (lo_bit_count >> 24) & 0xff
-    sha_info['data'][125] = (lo_bit_count >> 16) & 0xff
-    sha_info['data'][126] = (lo_bit_count >>  8) & 0xff
-    sha_info['data'][127] = (lo_bit_count >>  0) & 0xff
-
-    sha_transform(sha_info)
-
-    dig = []
-    for i in sha_info['digest']:
-        dig.extend([ ((i>>56) & 0xff), ((i>>48) & 0xff), ((i>>40) & 0xff), ((i>>32) & 0xff), ((i>>24) & 0xff), ((i>>16) & 0xff), ((i>>8) & 0xff), (i & 0xff) ])
-    return ''.join([chr(i) for i in dig])
-
-class sha512(object):
-    digest_size = digestsize = SHA_DIGESTSIZE
-    block_size = SHA_BLOCKSIZE
-
-    def __init__(self, s=None):
-        self._sha = sha_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def update(self, s):
-        sha_update(self._sha, getbuf(s))
-
-    def digest(self):
-        return sha_final(self._sha.copy())[:self._sha['digestsize']]
-
-    def hexdigest(self):
-        return ''.join(['%.2x' % ord(i) for i in self.digest()])
-
-    def copy(self):
-        new = sha512.__new__(sha512)
-        new._sha = self._sha.copy()
-        return new
-
-class sha384(sha512):
-    digest_size = digestsize = 48
-
-    def __init__(self, s=None):
-        self._sha = sha384_init()
-        if s:
-            sha_update(self._sha, getbuf(s))
-
-    def copy(self):
-        new = sha384.__new__(sha384)
-        new._sha = self._sha.copy()
-        return new
-
-if __name__ == "__main__":
-    a_str = "just a test string"
-
-    assert sha512().hexdigest() == "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
-    assert sha512(a_str).hexdigest() == "68be4c6664af867dd1d01c8d77e963d87d77b702400c8fabae355a41b8927a5a5533a7f1c28509bbd65c5f3ac716f33be271fbda0ca018b71a84708c9fae8a53"
-    assert sha512(a_str*7).hexdigest() == "3233acdbfcfff9bff9fc72401d31dbffa62bd24e9ec846f0578d647da73258d9f0879f7fde01fe2cc6516af3f343807fdef79e23d696c923d79931db46bf1819"
-
-    s = sha512(a_str)
-    s.update(a_str)
-    assert s.hexdigest() == "341aeb668730bbb48127d5531115f3c39d12cb9586a6ca770898398aff2411087cfe0b570689adf328cddeb1f00803acce6737a19f310b53bbdb0320828f75bb"
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4a3f49c72c..12a062b522 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -5,6 +5,8 @@
 import shutil
 import socket
 import base64
+import hashlib
+from functools import wraps
 
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
@@ -21,8 +23,6 @@
                                ConfigParser)
 from setuptools.compat import filterfalse
 from fnmatch import translate
-from setuptools.py24compat import hashlib
-from setuptools.py24compat import wraps
 from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
 

From 5da2968ad780b119434eac97712b2a69071c613f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:09:53 -0500
Subject: [PATCH 1619/8469] Clean up imports

---
 setuptools/ssl_support.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 346188f2f8..135d239b1c 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -1,4 +1,8 @@
-import sys, os, socket, atexit, re
+import os
+import socket
+import atexit
+import re
+
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
 from setuptools.compat import urllib2

From ac003eead133c6fc031a6fc6d5991461b564a917 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:10:23 -0500
Subject: [PATCH 1620/8469] Remove excess whitespace

--HG--
extra : amend_source : 28d918108715cbb5711ca31f67c5ed4d8978bb97
---
 setuptools/ssl_support.py | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 135d239b1c..840c618ab9 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -41,10 +41,6 @@
 
 is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
 
-
-
-
-
 try:
     from socket import create_connection
 except ImportError:
@@ -195,28 +191,6 @@ def match_hostname(cert, hostname):
                 "subjectAltName fields were found")
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 class VerifyingHTTPSHandler(HTTPSHandler):
     """Simple verifying handler: no auth, subclasses, timeouts, etc."""
 
@@ -263,7 +237,6 @@ def opener_for(ca_bundle=None):
     ).open
 
 
-
 _wincerts = None
 
 def get_win_certfile():
@@ -300,8 +273,3 @@ def find_ca_bundle():
         return pkg_resources.resource_filename('certifi', 'cacert.pem')
     except (ImportError, ResolutionError, ExtractionError):
         return None
-
-
-
-
-

From f0e9b4a76e82216467de39f5a038946c7bc50255 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:13:28 -0500
Subject: [PATCH 1621/8469] Remove backward-compatiblity implementation of
 create_connection.

---
 setuptools/ssl_support.py | 45 ++-------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 840c618ab9..7b5f429f8f 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -41,47 +41,6 @@
 
 is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
 
-try:
-    from socket import create_connection
-except ImportError:
-    from socket import error
-    _GLOBAL_DEFAULT_TIMEOUT = getattr(socket, '_GLOBAL_DEFAULT_TIMEOUT', object())
-    def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
-                          source_address=None):
-        """Connect to *address* and return the socket object.
-
-        Convenience function.  Connect to *address* (a 2-tuple ``(host,
-        port)``) and return the socket object.  Passing the optional
-        *timeout* parameter will set the timeout on the socket instance
-        before attempting to connect.  If no *timeout* is supplied, the
-        global default timeout setting returned by :func:`getdefaulttimeout`
-        is used.  If *source_address* is set it must be a tuple of (host, port)
-        for the socket to bind as a source address before making the connection.
-        An host of '' or port 0 tells the OS to use the default.
-        """
-        host, port = address
-        err = None
-        for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
-            af, socktype, proto, canonname, sa = res
-            sock = None
-            try:
-                sock = socket.socket(af, socktype, proto)
-                if timeout is not _GLOBAL_DEFAULT_TIMEOUT:
-                    sock.settimeout(timeout)
-                if source_address:
-                    sock.bind(source_address)
-                sock.connect(sa)
-                return sock
-
-            except error:
-                err = True
-                if sock is not None:
-                    sock.close()
-        if err:
-            raise
-        else:
-            raise error("getaddrinfo returns an empty list")
-
 
 try:
     from ssl import CertificateError, match_hostname
@@ -211,8 +170,8 @@ def __init__(self, host, ca_bundle, **kw):
         self.ca_bundle = ca_bundle
 
     def connect(self):
-        sock = create_connection(
-            (self.host, self.port), getattr(self,'source_address',None)
+        sock = socket.create_connection(
+            (self.host, self.port), getattr(self, 'source_address', None)
         )
 
         # Handle the socket if a (proxy) tunnel is present

From a2062b812cbf41ac6666975d05ab8c79de723d10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:14:38 -0500
Subject: [PATCH 1622/8469] Remove unused variable

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 97cc68d019..50d0e4c55b 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,6 @@
 class build_py(_build_py):
     def build_package_data(self):
         """Copy data files into build directory"""
-        lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)

From a37fa9563065819a8520b1a7c501949a5a5d8df4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:30:17 -0500
Subject: [PATCH 1623/8469] Updated environment-specific console script
 generation to use modern style.

---
 setup.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index 50d0e4c55b..6cf52521fd 100755
--- a/setup.py
+++ b/setup.py
@@ -31,14 +31,23 @@
 
 scripts = []
 
-console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-
-# Gentoo distributions manage the python-version-specific scripts themselves,
-# so they define an environment variable to suppress the creation of the
-# version-specific scripts.
-if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \
-    os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"):
-    console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
+def _gen_console_scripts():
+    yield "easy_install = setuptools.command.easy_install:main"
+
+    # Gentoo distributions manage the python-version-specific scripts
+    # themselves, so those platforms define an environment variable to
+    # suppress the creation of the version-specific scripts.
+    var_names = (
+        'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
+        'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
+    )
+    if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
+        return
+    yield ("easy_install-{shortver} = setuptools.command.easy_install:main"
+        .format(shortver=sys.version[:3]))
+
+console_scripts = list(_gen_console_scripts())
+
 
 # specific command that is used to generate windows .exe files
 class build_py(_build_py):

From 4c1a43d14d52098c269efc98dc004de85e52f19e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:41:06 -0500
Subject: [PATCH 1624/8469] Use with statement in setup.py

---
 setup.py | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/setup.py b/setup.py
index 6cf52521fd..80d943adda 100755
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,15 @@
 
 command_ns = {}
 init_path = convert_path('setuptools/command/__init__.py')
-init_file = open(init_path)
-exec(init_file.read(), command_ns)
-init_file.close()
+with open(init_path) as init_file:
+    exec(init_file.read(), command_ns)
 
 SETUP_COMMANDS = command_ns['__all__']
 
 main_ns = {}
 ver_path = convert_path('setuptools/version.py')
-ver_file = open(ver_path)
-exec(ver_file.read(), main_ns)
-ver_file.close()
+with open(ver_path) as ver_file:
+    exec(ver_file.read(), main_ns)
 
 import setuptools
 from setuptools.command.build_py import build_py as _build_py
@@ -70,23 +68,17 @@ def run(self):
             _test.run(self)
             return # even though _test.run will raise SystemExit
 
-        f = open(entry_points)
-
-        # running the test
-        try:
+        # save the content
+        with open(entry_points) as f:
             ep_content = f.read()
-        finally:
-            f.close()
 
+        # run the test
         try:
             _test.run(self)
         finally:
-            # restoring the file
-            f = open(entry_points, 'w')
-            try:
+            # restore the file
+            with open(entry_points, 'w') as f:
                 f.write(ep_content)
-            finally:
-                f.close()
 
 
 readme_file = open('README.txt')
@@ -96,9 +88,9 @@ def run(self):
 else:
     # but if the release script has not run, fall back to the source file
     changes_file = open('CHANGES.txt')
-long_description = readme_file.read() + '\n' + changes_file.read()
-readme_file.close()
-changes_file.close()
+with readme_file:
+    with changes_file:
+        long_description = readme_file.read() + '\n' + changes_file.read()
 
 package_data = {'setuptools': ['site-patch.py']}
 if sys.platform == 'win32' or os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES") not in (None, "", "0"):

From dfd8cf27fae82862038a4961107702f345c526ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:41:25 -0500
Subject: [PATCH 1625/8469] Fix long line in windows_specific_files override.

---
 setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 80d943adda..15ba65f6d5 100755
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,11 @@ def run(self):
         long_description = readme_file.read() + '\n' + changes_file.read()
 
 package_data = {'setuptools': ['site-patch.py']}
-if sys.platform == 'win32' or os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES") not in (None, "", "0"):
+force_windows_specific_files = (
+    os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
+    not in (None, "", "0")
+)
+if sys.platform == 'win32' or force_windows_specific_files:
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 

From 85e1c4f71cbc256ce0337ed775aacd3635e8ce5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:51:03 -0500
Subject: [PATCH 1626/8469] Use textwrap.dedent for multiline string. Use new
 style string formatter.

---
 ez_setup.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a6f4815850..c38e96e5bf 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -21,6 +21,7 @@
 import optparse
 import subprocess
 import platform
+import textwrap
 
 from distutils import log
 
@@ -134,14 +135,16 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         pkg_resources.require("setuptools>=" + version)
         return
     except pkg_resources.VersionConflict:
-        e = sys.exc_info()[1]
         if was_imported:
-            sys.stderr.write(
-            "The required version of setuptools (>=%s) is not available,\n"
-            "and can't be installed while this script is running. Please\n"
-            "install a more recent version first, using\n"
-            "'easy_install -U setuptools'."
-            "\n\n(Currently using %r)\n" % (version, e.args[0]))
+            msg = textwrap.dedent("""
+                The required version of setuptools (>={version}) is not available,
+                and can't be installed while this script is running. Please
+                install a more recent version first, using
+                'easy_install -U setuptools'.
+
+                (Currently using {VC_err.args[0]!r})
+                """).format(VC_err = sys.exc_info()[1], version=version)
+            sys.stderr.write(msg)
             sys.exit(2)
         else:
             del pkg_resources, sys.modules['pkg_resources']    # reload ok

From e8e1b1d37b6ccfd0b46ceab1241c338159de8370 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:52:45 -0500
Subject: [PATCH 1627/8469] Remove obvious comment.

---
 ez_setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index c38e96e5bf..2b2eac0fe2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -123,7 +123,6 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                    to_dir=os.curdir, download_delay=15):
-    # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
         'setuptools' in sys.modules

From c070a1bb116494a694877eb8a2f30f1fd9e9eae5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:55:03 -0500
Subject: [PATCH 1628/8469] Remove empty logic branch.

---
 ez_setup.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2b2eac0fe2..0cc4a055d6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -145,13 +145,12 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                 """).format(VC_err = sys.exc_info()[1], version=version)
             sys.stderr.write(msg)
             sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return _do_download(version, download_base, to_dir,
-                                download_delay)
+
+        # otherwise, reload ok
+        del pkg_resources, sys.modules['pkg_resources']
+        return _do_download(version, download_base, to_dir, download_delay)
     except pkg_resources.DistributionNotFound:
-        return _do_download(version, download_base, to_dir,
-                            download_delay)
+        return _do_download(version, download_base, to_dir, download_delay)
 
 def _clean_check(cmd, target):
     """

From 833054f82f8d4389a66f8959ed8c9211ff5fa835 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:57:33 -0500
Subject: [PATCH 1629/8469] Reorder exception handlers to work around warning
 about 'pkg_resources' being undefined.

---
 ez_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0cc4a055d6..4703ed29c4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -133,6 +133,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         pkg_resources.require("setuptools>=" + version)
         return
+    except pkg_resources.DistributionNotFound:
+        return _do_download(version, download_base, to_dir, download_delay)
     except pkg_resources.VersionConflict:
         if was_imported:
             msg = textwrap.dedent("""
@@ -149,8 +151,6 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         # otherwise, reload ok
         del pkg_resources, sys.modules['pkg_resources']
         return _do_download(version, download_base, to_dir, download_delay)
-    except pkg_resources.DistributionNotFound:
-        return _do_download(version, download_base, to_dir, download_delay)
 
 def _clean_check(cmd, target):
     """

From eaa998caab3cd3c97161963bdc1957d2db974d76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 15:58:45 -0500
Subject: [PATCH 1630/8469] Remove Python 2.3 compatibility support

---
 ez_setup.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4703ed29c4..3c39ab4313 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -316,13 +316,7 @@ def _extractall(self, path=".", members=None):
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
-    if sys.version_info < (2, 4):
-        def sorter(dir1, dir2):
-            return cmp(dir1.name, dir2.name)
-        directories.sort(sorter)
-        directories.reverse()
-    else:
-        directories.sort(key=operator.attrgetter('name'), reverse=True)
+    directories.sort(key=operator.attrgetter('name'), reverse=True)
 
     # Set correct owner, mtime and filemode on directories.
     for tarinfo in directories:

From 4d327300b0139f159d1c24cd076572a99fd55b50 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:01:00 -0500
Subject: [PATCH 1631/8469] Updated size and link regarding bootstrap module

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 9bc8ea44b2..fd10d3d13c 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -11,11 +11,11 @@ Packages built and distributed using ``setuptools`` look to the user like
 ordinary Python packages based on the ``distutils``.  Your users don't need to
 install or even know about setuptools in order to use them, and you don't
 have to include the entire setuptools package in your distributions.  By
-including just a single `bootstrap module`_ (an 8K .py file), your package will
+including just a single `bootstrap module`_ (a 12K .py file), your package will
 automatically download and install ``setuptools`` if the user is building your
 package from source and doesn't have a suitable version already installed.
 
-.. _bootstrap module: https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py
+.. _bootstrap module: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
 
 Feature Highlights:
 

From 2833cdcce09e10448c5a7846a58bdc22f0021b93 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:02:08 -0500
Subject: [PATCH 1632/8469] Remove feature highlight that's no longer relevant.

---
 docs/setuptools.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index fd10d3d13c..d48ad34f0d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -28,10 +28,7 @@ Feature Highlights:
 * Create `Python Eggs <http://peak.telecommunity.com/DevCenter/PythonEggs>`_ -
   a single-file importable distribution format
 
-* Include data files inside your package directories, where your code can
-  actually use them.  (Python 2.4 distutils also supports this feature, but
-  setuptools provides the feature for Python 2.3 packages also, and supports
-  accessing data files in zipped packages too.)
+* Enhanced support for accessing data files hosted in zipped packages.
 
 * Automatically include all packages in your source tree, without listing them
   individually in setup.py

From 39dd5934be0a44d1f0452975a17784bddb276a82 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:04:34 -0500
Subject: [PATCH 1633/8469] Remove upload command (no longer relevant on Python
 2.6+

---
 setuptools/command/__init__.py |   6 +-
 setuptools/command/upload.py   | 183 ---------------------------------
 2 files changed, 1 insertion(+), 188 deletions(-)
 delete mode 100755 setuptools/command/upload.py

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index b063fa1925..29c9d75ad1 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -1,17 +1,13 @@
 __all__ = [
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
-    'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
+    'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
     'register', 'bdist_wininst', 'upload_docs',
 ]
 
 from setuptools.command import install_scripts
 import sys
 
-if sys.version>='2.5':
-    # In Python 2.5 and above, distutils includes its own upload command
-    __all__.remove('upload')
-
 from distutils.command.bdist import bdist
 
 if 'egg' not in bdist.format_commands:
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
deleted file mode 100755
index a6eff3855b..0000000000
--- a/setuptools/command/upload.py
+++ /dev/null
@@ -1,183 +0,0 @@
-"""distutils.command.upload
-
-Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-
-from distutils import errors
-from distutils import log
-from distutils.core import Command
-from distutils.spawn import spawn
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
-import os
-import sys
-import socket
-import platform
-import base64
-
-from setuptools.compat import urlparse, StringIO, httplib, ConfigParser
-
-class upload(Command):
-
-    description = "upload binary package to PyPI"
-
-    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
-        ('show-response', None,
-         'display full response text from server'),
-        ('sign', 's',
-         'sign files to upload using gpg'),
-        ('identity=', 'i', 'GPG identity used to sign files'),
-        ]
-    boolean_options = ['show-response', 'sign']
-
-    def initialize_options(self):
-        self.username = ''
-        self.password = ''
-        self.repository = ''
-        self.show_response = 0
-        self.sign = False
-        self.identity = None
-
-    def finalize_options(self):
-        if self.identity and not self.sign:
-            raise errors.DistutilsOptionError(
-                "Must use --sign for --identity to have meaning"
-            )
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                self.announce('Using PyPI login from %s' % rc)
-                config = ConfigParser.ConfigParser({
-                        'username':'',
-                        'password':'',
-                        'repository':''})
-                config.read(rc)
-                if not self.repository:
-                    self.repository = config.get('server-login', 'repository')
-                if not self.username:
-                    self.username = config.get('server-login', 'username')
-                if not self.password:
-                    self.password = config.get('server-login', 'password')
-        if not self.repository:
-            self.repository = self.DEFAULT_REPOSITORY
-
-    def run(self):
-        if not self.distribution.dist_files:
-            raise errors.DistutilsOptionError("No dist file created in earlier command")
-        for command, pyversion, filename in self.distribution.dist_files:
-            self.upload_file(command, pyversion, filename)
-
-    def upload_file(self, command, pyversion, filename):
-        # Sign if requested
-        if self.sign:
-            gpg_args = ["gpg", "--detach-sign", "-a", filename]
-            if self.identity:
-                gpg_args[2:2] = ["--local-user", self.identity]
-            spawn(gpg_args,
-                  dry_run=self.dry_run)
-
-        # Fill in the data
-        f = open(filename,'rb')
-        content = f.read()
-        f.close()
-        basename = os.path.basename(filename)
-        comment = ''
-        if command=='bdist_egg' and self.distribution.has_ext_modules():
-            comment = "built on %s" % platform.platform(terse=1)
-        data = {
-            ':action':'file_upload',
-            'protocol_version':'1',
-            'name':self.distribution.get_name(),
-            'version':self.distribution.get_version(),
-            'content':(basename,content),
-            'filetype':command,
-            'pyversion':pyversion,
-            'md5_digest':md5(content).hexdigest(),
-            }
-        if command == 'bdist_rpm':
-            dist, version, id = platform.dist()
-            if dist:
-                comment = 'built for %s %s' % (dist, version)
-        elif command == 'bdist_dumb':
-            comment = 'built for %s' % platform.platform(terse=1)
-        data['comment'] = comment
-
-        if self.sign:
-            asc_file = open(filename + ".asc")
-            data['gpg_signature'] = (os.path.basename(filename) + ".asc", asc_file.read())
-            asc_file.close()
-
-        # set up the authentication
-        auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
-
-        # Build up the MIME payload for the POST data
-        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = '\n--' + boundary
-        end_boundary = sep_boundary + '--'
-        body = StringIO()
-        for key, value in data.items():
-            # handle multiple entries for the same name
-            if not isinstance(value, list):
-                value = [value]
-            for value in value:
-                if type(value) is tuple:
-                    fn = ';filename="%s"' % value[0]
-                    value = value[1]
-                else:
-                    fn = ""
-                value = str(value)
-                body.write(sep_boundary)
-                body.write('\nContent-Disposition: form-data; name="%s"'%key)
-                body.write(fn)
-                body.write("\n\n")
-                body.write(value)
-                if value and value[-1] == '\r':
-                    body.write('\n')  # write an extra newline (lurve Macs)
-        body.write(end_boundary)
-        body.write("\n")
-        body = body.getvalue()
-
-        self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
-
-        # build the Request
-        # We can't use urllib2 since we need to send the Basic
-        # auth right with the first request
-        schema, netloc, url, params, query, fragments = \
-            urlparse(self.repository)
-        assert not params and not query and not fragments
-        if schema == 'http':
-            http = httplib.HTTPConnection(netloc)
-        elif schema == 'https':
-            http = httplib.HTTPSConnection(netloc)
-        else:
-            raise AssertionError("unsupported schema " + schema)
-
-        data = ''
-        try:
-            http.connect()
-            http.putrequest("POST", url)
-            http.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
-            http.putheader('Content-length', str(len(body)))
-            http.putheader('Authorization', auth)
-            http.endheaders()
-            http.send(body)
-        except socket.error:
-            e = sys.exc_info()[1]
-            self.announce(str(e), log.ERROR)
-            return
-
-        r = http.getresponse()
-        if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
-                          log.INFO)
-        else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
-                          log.ERROR)
-        if self.show_response:
-            print('-'*75, r.read(), '-'*75)

From ba268e837c5fd269c9030c28d85fff6423c1bdec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:07:54 -0500
Subject: [PATCH 1634/8469] Removing py24compat module

---
 setuptools/py24compat.py | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 setuptools/py24compat.py

diff --git a/setuptools/py24compat.py b/setuptools/py24compat.py
deleted file mode 100644
index 40e9ae0f74..0000000000
--- a/setuptools/py24compat.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-Forward-compatibility support for Python 2.4 and earlier
-"""
-
-# from jaraco.compat 1.2
-try:
-    from functools import wraps
-except ImportError:
-    def wraps(func):
-        "Just return the function unwrapped"
-        return lambda x: x
-
-
-try:
-    import hashlib
-except ImportError:
-    from setuptools._backport import hashlib

From aa90fa16d02e956b87e0a892683f0ba2e9ecdc03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:10:52 -0500
Subject: [PATCH 1635/8469] Use modern syntax for exception handling in
 ez_setup.py. This change will also prevent Python 2.4 and Python 2.5 users
 from invoking it.

---
 ez_setup.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3c39ab4313..147ab14d4f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -135,7 +135,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         return
     except pkg_resources.DistributionNotFound:
         return _do_download(version, download_base, to_dir, download_delay)
-    except pkg_resources.VersionConflict:
+    except pkg_resources.VersionConflict as VC_err:
         if was_imported:
             msg = textwrap.dedent("""
                 The required version of setuptools (>={version}) is not available,
@@ -144,7 +144,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                 'easy_install -U setuptools'.
 
                 (Currently using {VC_err.args[0]!r})
-                """).format(VC_err = sys.exc_info()[1], version=version)
+                """).format(VC_err=VC_err, version=version)
             sys.stderr.write(msg)
             sys.exit(2)
 
@@ -325,8 +325,7 @@ def _extractall(self, path=".", members=None):
             self.chown(tarinfo, dirpath)
             self.utime(tarinfo, dirpath)
             self.chmod(tarinfo, dirpath)
-        except ExtractError:
-            e = sys.exc_info()[1]
+        except ExtractError as e:
             if self.errorlevel > 1:
                 raise
             else:

From b14f0645fe1613c87dbb4e623b02f572d8af2c70 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:13:08 -0500
Subject: [PATCH 1636/8469] Simplify _build_install_args now that Python 2.6 is
 required.

---
 ez_setup.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 147ab14d4f..79e5c46a3b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -336,13 +336,7 @@ def _build_install_args(options):
     """
     Build the arguments to 'python setup.py install' on the setuptools package
     """
-    install_args = []
-    if options.user_install:
-        if sys.version_info < (2, 6):
-            log.warn("--user requires Python 2.6 or later")
-            raise SystemExit(1)
-        install_args.append('--user')
-    return install_args
+    return ['--user'] if options.user_install else []
 
 def _parse_args():
     """

From 6448b98096c81ee02505edaf38430912426665b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:14:37 -0500
Subject: [PATCH 1637/8469] Regenerate egg_info based on new setup.py

---
 setuptools.egg-info/dependency_links.txt |  4 -
 setuptools.egg-info/entry_points.txt     | 96 ++++++++++++------------
 setuptools.egg-info/requires.txt         | 10 +--
 3 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index c688b7eaab..b1c9a2c9c6 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,6 +1,2 @@
 https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
-https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb
 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
-https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc
-https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5
-https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2bf6c8ce4e..d423a67d0d 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-include_package_data = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.3 = setuptools.command.easy_install:main
 
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
+[distutils.setup_keywords]
+use_2to3_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
+dependency_links = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+include_package_data = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
+zip_safe = setuptools.dist:assert_bool
+
 [distutils.commands]
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-test = setuptools.command.test:test
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
-alias = setuptools.command.alias:alias
+test = setuptools.command.test:test
 install = setuptools.command.install:install
-upload_docs = setuptools.command.upload_docs:upload_docs
+register = setuptools.command.register:register
 develop = setuptools.command.develop:develop
-install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 egg_info = setuptools.command.egg_info:egg_info
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
 setopt = setuptools.command.setopt:setopt
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+easy_install = setuptools.command.easy_install:easy_install
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_lib = setuptools.command.install_lib:install_lib
+rotate = setuptools.command.rotate:rotate
+sdist = setuptools.command.sdist:sdist
+alias = setuptools.command.alias:alias
+saveopts = setuptools.command.saveopts:saveopts
+build_py = setuptools.command.build_py:build_py
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+install_scripts = setuptools.command.install_scripts:install_scripts
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..9a6bf43731 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,7 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
 certifi==0.0.8
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
\ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file

From 6474847292f1cf4fcda55afe2cd5e46497ce339f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:19:00 -0500
Subject: [PATCH 1638/8469] The one use of xrange could also use range, so just
 use range.

---
 setuptools/command/easy_install.py | 4 ++--
 setuptools/compat.py               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d329f4cb50..fd133b6c6e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -56,7 +56,7 @@ def _get_purelib():
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
-from setuptools.compat import (iteritems, maxsize, xrange, basestring, unicode,
+from setuptools.compat import (iteritems, maxsize, basestring, unicode,
                                reraise)
 from pkg_resources import (
     yield_lines, normalize_path, resource_string, ensure_directory,
@@ -376,7 +376,7 @@ def run(self):
                 outputs = self.outputs
                 if self.root:               # strip any package prefix
                     root_len = len(self.root)
-                    for counter in xrange(len(outputs)):
+                    for counter in range(len(outputs)):
                         outputs[counter] = outputs[counter][root_len:]
                 from distutils import file_util
                 self.execute(
diff --git a/setuptools/compat.py b/setuptools/compat.py
index bbc98d6644..8b7ea90423 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -31,7 +31,6 @@
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
-    xrange = xrange
     filterfalse = itertools.ifilterfalse
 
     def exec_(code, globs=None, locs=None):
@@ -78,7 +77,6 @@ def exec_(code, globs=None, locs=None):
         urlparse, urlunparse, unquote, splituser, urljoin, urlsplit,
         urlunsplit, splittag,
     )
-    xrange = range
     filterfalse = itertools.filterfalse
 
     def execfile(fn, globs=None, locs=None):

From f07c527906b54fa8245c6804ae8062c8ddd6c6d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:25:01 -0500
Subject: [PATCH 1639/8469] Drop compatibility function exec_, required for
 Python 2.5 and earlier.

---
 pkg_resources.py            |  6 +++---
 setuptools/compat.py        | 16 ++--------------
 setuptools/tests/doctest.py |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2c19898bc1..5642e3529c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -35,7 +35,7 @@
     basestring
     next = lambda o: o.next()
     from cStringIO import StringIO as BytesIO
-    def exec_(code, globs=None, locs=None):
+    def exec(code, globs=None, locs=None):
         if globs is None:
             frame = sys._getframe(1)
             globs = frame.f_globals
@@ -54,7 +54,7 @@ def execfile(fn, globs=None, locs=None):
             globs = globals()
         if locs is None:
             locs = globs
-        exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+        exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
     import functools
     reduce = functools.reduce
 
@@ -1354,7 +1354,7 @@ def run_script(self,script_name,namespace):
                 len(script_text), 0, script_text.split('\n'), script_filename
             )
             script_code = compile(script_text,script_filename,'exec')
-            exec_(script_code, namespace, namespace)
+            exec(script_code, namespace, namespace)
 
     def _has(self, path):
         raise NotImplementedError(
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 8b7ea90423..fdb7d8ed9f 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -33,18 +33,7 @@
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
     filterfalse = itertools.ifilterfalse
 
-    def exec_(code, globs=None, locs=None):
-        if globs is None:
-            frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
-            del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
-
-    exec_("""def reraise(tp, value, tb=None):
+    exec("""def reraise(tp, value, tb=None):
     raise tp, value, tb""")
 else:
     PY3 = True
@@ -52,7 +41,6 @@ def exec_(code, globs=None, locs=None):
     basestring = str
     import builtins
     import configparser as ConfigParser
-    exec_ = eval('exec')
     from io import StringIO, BytesIO
     func_code = lambda o: o.__code__
     func_globals = lambda o: o.__globals__
@@ -89,7 +77,7 @@ def execfile(fn, globs=None, locs=None):
             source = f.read()
         finally:
             f.close()
-        exec_(compile(source, fn, 'exec'), globs, locs)
+        exec(compile(source, fn, 'exec'), globs, locs)
 
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index 35d588d074..0c160fe4d4 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -1250,7 +1250,7 @@ def __run(self, test, compileflags, out):
             # keyboard interrupts.)
             try:
                 # Don't blink!  This is where the user's code gets run.
-                exec_(compile(example.source, filename, "single",
+                exec(compile(example.source, filename, "single",
                               compileflags, 1), test.globs)
                 self.debugger.set_continue() # ==== Example Finished ====
                 exception = None

From e7a210418a9949a4b6e9b5ccbaf4c9349de1ad93 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:29:48 -0500
Subject: [PATCH 1640/8469] Remove exec compatibility from pkg_resources also.

---
 pkg_resources.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5642e3529c..5aeafc9ff3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -35,20 +35,9 @@
     basestring
     next = lambda o: o.next()
     from cStringIO import StringIO as BytesIO
-    def exec(code, globs=None, locs=None):
-        if globs is None:
-            frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
-            del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
 except NameError:
     basestring = str
     from io import BytesIO
-    exec_ = eval("exec")
     def execfile(fn, globs=None, locs=None):
         if globs is None:
             globs = globals()

From 7b7f1ed5a7a8b14269dcc69de42e383558308030 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:36:16 -0500
Subject: [PATCH 1641/8469] Remove stray import of exec_

---
 setuptools/tests/doctest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index 0c160fe4d4..47293c3c9c 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -109,7 +109,7 @@ def _test():
 import sys, traceback, inspect, linecache, os, re, types
 import unittest, difflib, pdb, tempfile
 import warnings
-from setuptools.compat import StringIO, execfile, exec_, func_code, im_func
+from setuptools.compat import StringIO, execfile, func_code, im_func
 
 # Don't whine about the deprecated is_private function in this
 # module's tests.

From 715085069e4882ee67d6898f12b975c05dd6b769 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:42:28 -0500
Subject: [PATCH 1642/8469] Remove compatibility around reduce.

---
 pkg_resources.py      | 8 ++++----
 setuptools/sandbox.py | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5aeafc9ff3..be8c6c57f9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -22,6 +22,8 @@
 import zipimport
 import warnings
 import stat
+import functools
+
 try:
     from urlparse import urlparse, urlunparse
 except ImportError:
@@ -44,8 +46,6 @@ def execfile(fn, globs=None, locs=None):
         if locs is None:
             locs = globs
         exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
-    import functools
-    reduce = functools.reduce
 
 # capture these to bypass sandboxing
 from os import utime
@@ -1178,11 +1178,11 @@ def evaluate_marker(text, extra=None, _ops={}):
 
         def and_test(nodelist):
             # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+            return functools.reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
 
         def test(nodelist):
             # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+            return functools.reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
 
         def atom(nodelist):
             t = nodelist[1][0]
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 29fc07b8d9..27914f2ed0 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,4 +1,5 @@
 import os, sys, tempfile, operator, pkg_resources
+import functools
 if os.name == "java":
     import org.python.modules.posix.PosixModule as _os
 else:
@@ -11,7 +12,7 @@
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
-from setuptools.compat import builtins, execfile, reduce
+from setuptools.compat import builtins, execfile
 
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
@@ -276,7 +277,7 @@ def open(self, file, flags, mode=0x1FF, *args, **kw):    # 0777
             self._violation("os.open", file, flags, mode, *args, **kw)
         return _os.open(file,flags,mode, *args, **kw)
 
-WRITE_FLAGS = reduce(
+WRITE_FLAGS = functools.reduce(
     operator.or_, [getattr(_os, a, 0) for a in
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
 )

From ecb026c64b97e1675ab830c4474331a6e03361a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:48:27 -0500
Subject: [PATCH 1643/8469] Modernize style on sandbox.py

---
 setuptools/sandbox.py | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 27914f2ed0..6dd1ca0784 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,5 +1,11 @@
-import os, sys, tempfile, operator, pkg_resources
+import os
+import sys
+import tempfile
+import operator
 import functools
+
+import pkg_resources
+
 if os.name == "java":
     import org.python.modules.posix.PosixModule as _os
 else:
@@ -18,34 +24,6 @@
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
     old_dir = os.getcwd()
@@ -94,7 +72,6 @@ def run_setup(setup_script, args):
         tempfile.tempdir = save_tmp
 
 
-
 class AbstractSandbox:
     """Wrap 'os' module and 'open()' builtin for virtualizing setup scripts"""
 
@@ -137,7 +114,6 @@ def wrap(self,src,dst,*args,**kw):
     for name in ["rename", "link", "symlink"]:
         if hasattr(_os,name): locals()[name] = _mk_dual_path_wrapper(name)
 
-
     def _mk_single_path_wrapper(name, original=None):
         original = original or getattr(_os,name)
         def wrap(self,path,*args,**kw):
@@ -250,7 +226,7 @@ def _ok(self,path):
             self._active = False
             realpath = os.path.normcase(os.path.realpath(path))
             if (self._exempted(realpath) or realpath == self._sandbox
-                or realpath.startswith(self._prefix)):
+                    or realpath.startswith(self._prefix)):
                 return True
         finally:
             self._active = active

From 5535cfdb003ac412d4146617928c966fb5f5626e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:56:31 -0500
Subject: [PATCH 1644/8469] Resave with excess whitespace removed

---
 setuptools/svn_utils.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 0d65bd30eb..8388a8acc6 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -38,7 +38,7 @@ def _run_command(args, stdout=_PIPE, stderr=_PIPE, encoding=None, stream=0):
     except OSError:
         return 1, ''
 
-    #doubled checked and 
+    #doubled checked and
     data = decode_as_string(data, encoding)
 
     #communciate calls wait()
@@ -77,19 +77,19 @@ def determine_console_encoding():
     try:
         #try for the preferred encoding
         encoding = locale.getpreferredencoding()
-    
+
         #see if the locale.getdefaultlocale returns null
         #some versions of python\platforms return US-ASCII
         #when it cannot determine an encoding
         if not encoding or encoding == "US-ASCII":
             encoding = locale.getdefaultlocale()[1]
-        
+
         if encoding:
             codecs.lookup(encoding)  # make sure a lookup error is not made
-            
+
     except (locale.Error, LookupError):
         encoding = None
-        
+
     is_osx = sys.platform == "darwin"
     if not encoding:
         return ["US-ASCII", "utf-8"][is_osx]
@@ -99,30 +99,30 @@ def determine_console_encoding():
         return "utf-8"
     else:
         return encoding
-    
+
 _console_encoding = determine_console_encoding()
 
 def decode_as_string(text, encoding=None):
     """
     Decode the console or file output explicitly using getpreferredencoding.
     The text paraemeter should be a encoded string, if not no decode occurs
-    If no encoding is given, getpreferredencoding is used.  If encoding is 
-    specified, that is used instead.  This would be needed for SVN --xml 
+    If no encoding is given, getpreferredencoding is used.  If encoding is
+    specified, that is used instead.  This would be needed for SVN --xml
     output.  Unicode is explicitly put in composed NFC form.
-    
-    --xml should be UTF-8 (SVN Issue 2938) the discussion on the Subversion 
+
+    --xml should be UTF-8 (SVN Issue 2938) the discussion on the Subversion
     DEV List from 2007 seems to indicate the same.
     """
-    #text should be a byte string    
+    #text should be a byte string
 
     if encoding is None:
         encoding = _console_encoding
 
     if not isinstance(text, unicode):
         text = text.decode(encoding)
-    
+
     text = unicodedata.normalize('NFC', text)
-    
+
     return text
 
 
@@ -158,7 +158,7 @@ def parse_externals_xml(decoded_str, prefix=''):
                 path = path[len(prefix)+1:]
 
             data = _get_target_property(node)
-            #data should be decoded already 
+            #data should be decoded already
             for external in parse_external_prop(data):
                 externals.append(joinpath(path, external))
 
@@ -262,7 +262,7 @@ def load(cls, dirname=''):
         except ValueError:
             base_svn_version = tuple()
 
-        if has_svn and (code or not base_svn_version 
+        if has_svn and (code or not base_svn_version
                              or base_svn_version < (1, 3)):
             warnings.warn(("No SVN 1.3+ command found: falling back "
                            "on pre 1.7 .svn parsing"), DeprecationWarning)

From 8c12f1907e901d9791d25359c00db1e851aba931 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 16:56:46 -0500
Subject: [PATCH 1645/8469] Remove unused import

---
 setuptools/svn_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 8388a8acc6..7ee7867845 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -8,7 +8,7 @@
 import codecs
 import unicodedata
 import warnings
-from setuptools.compat import unicode, bytes
+from setuptools.compat import unicode
 from xml.sax.saxutils import unescape
 
 try:

From 9121e19a1f3923456855f816d1ec7385d33aa018 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 17:01:49 -0500
Subject: [PATCH 1646/8469] Refactor SvnInfo.load for cleaner logic and less
 wrapping. Also removed empty logic branch.

---
 setuptools/svn_utils.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 7ee7867845..a9bdc5c334 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -262,17 +262,18 @@ def load(cls, dirname=''):
         except ValueError:
             base_svn_version = tuple()
 
-        if has_svn and (code or not base_svn_version
-                             or base_svn_version < (1, 3)):
+        if not has_svn:
+            return SvnInfo(dirname)
+
+        if code or not base_svn_version or base_svn_version < (1, 3):
             warnings.warn(("No SVN 1.3+ command found: falling back "
                            "on pre 1.7 .svn parsing"), DeprecationWarning)
             return SvnFileInfo(dirname)
-        elif not has_svn:
-            return SvnInfo(dirname)
-        elif base_svn_version < (1, 5):
+
+        if base_svn_version < (1, 5):
             return Svn13Info(dirname)
-        else:
-            return Svn15Info(dirname)
+
+        return Svn15Info(dirname)
 
     def __init__(self, path=''):
         self.path = path

From 79e0d772345dd1ca9de73635c9eac47bb505ae03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Nov 2013 17:08:23 -0500
Subject: [PATCH 1647/8469] Remove reduce compatibility references (intended
 for earlier commit).

---
 setuptools/compat.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index fdb7d8ed9f..8af8aa742d 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -23,7 +23,6 @@
     maxsize = sys.maxint
     next = lambda o: o.next()
     numeric_types = (int, long, float)
-    reduce = reduce
     unichr = unichr
     unicode = unicode
     bytes = str
@@ -54,7 +53,6 @@
     maxsize = sys.maxsize
     next = next
     numeric_types = (int, float)
-    from functools import reduce
     unichr = chr
     unicode = str
     bytes = bytes

From 373ed664bf8d16b0a96edaa607a82e89f64453eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:12:11 -0500
Subject: [PATCH 1648/8469] Remove Python 2.4 compatibility from ez_setup.py

---
 ez_setup.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 79e5c46a3b..bb451114ac 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -37,15 +37,6 @@ def _python_cmd(*args):
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 
-def _check_call_py24(cmd, *args, **kwargs):
-    res = subprocess.call(cmd, *args, **kwargs)
-    class CalledProcessError(Exception):
-        pass
-    if not res == 0:
-        msg = "Command '%s' return non-zero exit status %d" % (cmd, res)
-        raise CalledProcessError(msg)
-vars(subprocess).setdefault('check_call', _check_call_py24)
-
 def _install(tarball, install_args=()):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()

From 13f43fe5d5e468fef508c390912c715f02a51839 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:19:30 -0500
Subject: [PATCH 1649/8469] Use sets to determine presence of imported modules.

---
 ez_setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bb451114ac..4d76ec2713 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -115,8 +115,8 @@ def _do_download(version, download_base, to_dir, download_delay):
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                    to_dir=os.curdir, download_delay=15):
     to_dir = os.path.abspath(to_dir)
-    was_imported = 'pkg_resources' in sys.modules or \
-        'setuptools' in sys.modules
+    rep_modules = 'pkg_resources', 'setuptools'
+    imported = set(sys.modules).intersection(rep_modules)
     try:
         import pkg_resources
     except ImportError:
@@ -127,7 +127,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     except pkg_resources.DistributionNotFound:
         return _do_download(version, download_base, to_dir, download_delay)
     except pkg_resources.VersionConflict as VC_err:
-        if was_imported:
+        if imported:
             msg = textwrap.dedent("""
                 The required version of setuptools (>={version}) is not available,
                 and can't be installed while this script is running. Please

From 727779f0ec69dea4624c684b551192f59211f697 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:21:20 -0500
Subject: [PATCH 1650/8469] Update documentation

---
 ez_setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4d76ec2713..2aa994b337 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,14 +1,14 @@
 #!python
 """Bootstrap setuptools installation
 
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
+To use setuptools in your package's setup.py, include this
+file in the same directory and add this to the top of your setup.py::
 
     from ez_setup import use_setuptools
     use_setuptools()
 
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
+To require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, simply supply
 the appropriate options to ``use_setuptools()``.
 
 This file can also be run as a script to install or upgrade setuptools.

From 151c018dbea53c09c07f0483ffb05118cb6c51f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:31:11 -0500
Subject: [PATCH 1651/8469] upload module is no more

---
 setuptools/command/upload_docs.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 12bc916bb1..4ad3433e0c 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -17,11 +17,7 @@
 
 from distutils import log
 from distutils.errors import DistutilsOptionError
-
-try:
-    from distutils.command.upload import upload
-except ImportError:
-    from setuptools.command.upload import upload
+from distutils.command.upload import upload
 
 from setuptools.compat import httplib, urlparse, unicode, iteritems
 

From df8f2c2c45fde489e92932e9a4094075566b617d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:32:06 -0500
Subject: [PATCH 1652/8469] Use PY3 from compat module

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

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 4ad3433e0c..ef4cf80653 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -19,11 +19,9 @@
 from distutils.errors import DistutilsOptionError
 from distutils.command.upload import upload
 
-from setuptools.compat import httplib, urlparse, unicode, iteritems
+from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3
 
-_IS_PYTHON3 = sys.version > '3'
-
-if _IS_PYTHON3:
+if PY3:
     errors = 'surrogateescape'
 else:
     errors = 'strict'

From 5745e031d72cbfd141e059e716a97a11739fcac5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:35:35 -0500
Subject: [PATCH 1653/8469] Fix pyflakes warnings

---
 setuptools/command/upload_docs.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ef4cf80653..702bbadd68 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -130,7 +130,7 @@ def upload_file(self, filename):
         for key, values in iteritems(data):
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
-            if type(values) != type([]):
+            if isinstance(values, list):
                 values = [values]
             for value in values:
                 if type(value) is tuple:
@@ -165,12 +165,11 @@ def upload_file(self, filename):
             raise AssertionError("unsupported schema "+schema)
 
         data = ''
-        loglevel = log.INFO
         try:
             conn.connect()
             conn.putrequest("POST", url)
-            conn.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
+            content_type = 'multipart/form-data; boundary=%s' % boundary
+            conn.putheader('Content-type', content_type)
             conn.putheader('Content-length', str(len(body)))
             conn.putheader('Authorization', auth)
             conn.endheaders()

From 76b703645976e4ca41e00fa7ebafa36d6805c7e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:36:51 -0500
Subject: [PATCH 1654/8469] Use PY3 indicator

---
 setuptools/command/upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 702bbadd68..a69958d81e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -118,7 +118,7 @@ def upload_file(self, filename):
         # set up the authentication
         credentials = b(self.username + ':' + self.password)
         credentials = standard_b64encode(credentials)
-        if sys.version_info >= (3,):
+        if PY3:
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 

From bcf0e76db414d1c8f7a671289c642a7b4a4b77e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:38:46 -0500
Subject: [PATCH 1655/8469] Use ternary operator to select encoding error
 behavior.

---
 setuptools/command/upload_docs.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index a69958d81e..8ee35cb039 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -21,10 +21,7 @@
 
 from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3
 
-if PY3:
-    errors = 'surrogateescape'
-else:
-    errors = 'strict'
+errors = 'surrogateescape' if PY3 else 'strict'
 
 
 # This is not just a replacement for byte literals

From fef4d5165d47e33a2143bba3961eefeff6ca218a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:46:03 -0500
Subject: [PATCH 1656/8469] Normalize whitespace, removing pyflakes warnings.

---
 setuptools/command/egg_info.py | 107 +++++++--------------------------
 1 file changed, 21 insertions(+), 86 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a0ba530590..a1ce862c04 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -3,7 +3,10 @@
 Create a distribution's .egg-info directory and contents"""
 
 # This module should be kept compatible with Python 2.3
-import os, re, sys
+import os
+import re
+import sys
+
 from setuptools import Command
 from distutils.errors import *
 from distutils import log
@@ -36,12 +39,6 @@ class egg_info(Command):
     negative_opt = {'no-svn-revision': 'tag-svn-revision',
                     'no-date': 'tag-date'}
 
-
-
-
-
-
-
     def initialize_options(self):
         self.egg_name = None
         self.egg_version = None
@@ -55,35 +52,16 @@ def initialize_options(self):
 
     def save_version_info(self, filename):
         from setuptools.command.setopt import edit_config
-        edit_config(
-            filename,
-            {'egg_info':
-                {'tag_svn_revision':0, 'tag_date': 0, 'tag_build': self.tags()}
-            }
+        values = dict(
+            egg_info=dict(
+                tag_svn_revision=0,
+                tag_date=0,
+                tag_build=self.tags(),
+            )
         )
+        edit_config(filename, values)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    def finalize_options (self):
+    def finalize_options(self):
         self.egg_name = safe_name(self.distribution.get_name())
         self.vtags = self.tags()
         self.egg_version = self.tagged_version()
@@ -123,7 +101,6 @@ def finalize_options (self):
             pd._parsed_version = parse_version(self.egg_version)
             self.distribution._patched_dist = None
 
-
     def write_or_delete_file(self, what, filename, data, force=False):
         """Write `data` to `filename` or delete if empty
 
@@ -194,34 +171,14 @@ def tags(self):
             os.path.exists('.svn') or os.path.exists('PKG-INFO')
         ):  version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
-            import time; version += time.strftime("-%Y%m%d")
+            import time
+            version += time.strftime("-%Y%m%d")
         return version
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     @staticmethod
     def get_svn_revision():
         return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
 
-
-
-
-
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")
@@ -269,17 +226,11 @@ def append(self, item):
                 self.files.append(path)
 
 
-
-
-
-
-
-
 class manifest_maker(sdist):
 
     template = "MANIFEST.in"
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.use_defaults = 1
         self.prune = 1
         self.manifest_only = 1
@@ -301,7 +252,7 @@ def run(self):
         self.filelist.remove_duplicates()
         self.write_manifest()
 
-    def write_manifest (self):
+    def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
@@ -340,7 +291,7 @@ def add_defaults(self):
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
-    def prune_file_list (self):
+    def prune_file_list(self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
         self.filelist.exclude_pattern(None, prefix=build.build_base)
@@ -349,7 +300,7 @@ def prune_file_list (self):
         self.filelist.exclude_pattern(sep+r'(RCS|CVS|\.svn)'+sep, is_regex=1)
 
 
-def write_file (filename, contents):
+def write_file(filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
@@ -360,24 +311,12 @@ def write_file (filename, contents):
     f.write(contents)
     f.close()
 
-
-
-
-
-
-
-
-
-
-
-
-
 def write_pkg_info(cmd, basename, filename):
     log.info("writing %s", filename)
     if not cmd.dry_run:
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
-        metadata.name, oldname   = cmd.egg_name, metadata.name
+        metadata.name, oldname = cmd.egg_name, metadata.name
         try:
             # write unescaped data to PKG-INFO, so older pkg_resources
             # can still parse it
@@ -406,14 +345,14 @@ def write_requirements(cmd, basename, filename):
 
 def write_toplevel_names(cmd, basename, filename):
     pkgs = dict.fromkeys(
-        [k.split('.',1)[0]
+        [
+            k.split('.',1)[0]
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
     cmd.write_file("top-level names", filename, '\n'.join(pkgs)+'\n')
 
 
-
 def overwrite_arg(cmd, basename, filename):
     write_arg(cmd, basename, filename, True)
 
@@ -452,7 +391,3 @@ def get_pkg_info_revision():
                 return int(match.group(1))
         f.close()
     return 0
-
-
-
-#

From b436cf3d092afc3021fe1d6bd1165762b60bf643 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:46:54 -0500
Subject: [PATCH 1657/8469] Remove import *

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1ce862c04..b421612923 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -8,7 +8,7 @@
 import sys
 
 from setuptools import Command
-from distutils.errors import *
+import distutils.errors
 from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring
@@ -71,7 +71,7 @@ def finalize_options(self):
                 parse_requirements('%s==%s' % (self.egg_name,self.egg_version))
             )
         except ValueError:
-            raise DistutilsOptionError(
+            raise distutils.errors.DistutilsOptionError(
                 "Invalid distribution name or version syntax: %s-%s" %
                 (self.egg_name,self.egg_version)
             )

From a14216e2f541e8b9f2f875ffeefeb4e5495eac1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:47:29 -0500
Subject: [PATCH 1658/8469] Prefer paranthetical import to line continuation.

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index b421612923..9b7e6b421a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,8 +15,8 @@
 from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
-from pkg_resources import parse_requirements, safe_name, parse_version, \
-    safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
+from pkg_resources import (parse_requirements, safe_name, parse_version,
+    safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 from setuptools.command.sdist import walk_revctrl
 
 

From bc47a75d4d97f34f9ad49a5142c351c74354cd41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:48:22 -0500
Subject: [PATCH 1659/8469] Remove historical comment about compatibility.

---
 setuptools/command/egg_info.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9b7e6b421a..5953aad4f6 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -2,7 +2,6 @@
 
 Create a distribution's .egg-info directory and contents"""
 
-# This module should be kept compatible with Python 2.3
 import os
 import re
 import sys

From 8a94f99bfbb19859aed1d96e5d169c80b51936d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 13:58:22 -0500
Subject: [PATCH 1660/8469] Extract py31compat module for get_config_vars and
 get_path

---
 setuptools/command/easy_install.py | 17 +++--------------
 setuptools/py31compat.py           | 11 +++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 setuptools/py31compat.py

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fd133b6c6e..61d5145032 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -32,19 +32,7 @@
 import pkg_resources
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
-try:
-    # Python 2.7 or >=3.2
-    from sysconfig import get_config_vars, get_path
-    def _get_platlib():
-        return get_path("platlib")
-    def _get_purelib():
-        return get_path("purelib")
-except ImportError:
-    from distutils.sysconfig import get_config_vars, get_python_lib
-    def _get_platlib():
-        return get_python_lib(True)
-    def _get_purelib():
-        return get_python_lib(False)
+from setuptools.py31compat import get_path, get_config_vars
 
 from distutils.util import get_platform
 from distutils.util import convert_path, subst_vars
@@ -1288,7 +1276,8 @@ def get_site_dirs():
                                          'Python',
                                          sys.version[:3],
                                          'site-packages'))
-    for site_lib in (_get_purelib(), _get_platlib()):
+    lib_paths = get_path('purelib'), get_path('platlib')
+    for site_lib in lib_paths:
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
     if HAS_USER_SITE:
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
new file mode 100644
index 0000000000..dbb324b0e3
--- /dev/null
+++ b/setuptools/py31compat.py
@@ -0,0 +1,11 @@
+__all__ = ['get_config_vars', 'get_path']
+
+try:
+    # Python 2.7 or >=3.2
+    from sysconfig import get_config_vars, get_path
+except ImportError:
+    from distutils.sysconfig import get_config_vars, get_python_lib
+    def get_path(name):
+        if name not in ('platlib', 'purelib'):
+            raise ValueError("Name must be purelib or platlib")
+        return get_python_lib(name=='platlib')

From 57bf0b99a118d93749fdeef7aad95c7d82e53be6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:00:50 -0500
Subject: [PATCH 1661/8469] Use dict lookup default for sys_executable

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 61d5145032..2f422f4749 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -53,10 +53,8 @@
     VersionConflict, DEVELOP_DIST,
 )
 
-if '__VENV_LAUNCHER__' in os.environ:
-    sys_executable = os.environ['__VENV_LAUNCHER__']
-else:
-    sys_executable = os.path.normpath(sys.executable)
+sys_executable = os.environ.get('__VENV_LAUNCHER__',
+    os.path.normpath(sys.executable))
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',

From d52f1865ccc7cc10389ff731ff4e84302fd83010 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:12:05 -0500
Subject: [PATCH 1662/8469] Remove easy_install.HAS_USER_SITE and just defer to
 site.ENABLE_USER_SITE.

---
 CHANGES.txt                           |  3 +++
 setuptools/command/easy_install.py    | 14 ++++++--------
 setuptools/tests/test_easy_install.py |  8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1331de955d..2736d4c13c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,9 @@ CHANGES
 
 * Issue #41: Dropped support for Python 2.4 and Python 2.5. Clients requiring
   setuptools for those versions of Python should use setuptools 1.x.
+* Removed ``setuptools.command.easy_install.HAS_USER_SITE``. Clients
+  expecting this boolean variable should use ``site.ENABLE_USER_SITE``
+  instead.
 
 -----
 1.4.1
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2f422f4749..9775bffcc2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -61,8 +61,6 @@
     'main', 'get_exe_prefixes',
 ]
 
-HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE
-
 def is_64bit():
     return struct.calcsize("P") == 8
 
@@ -134,7 +132,7 @@ class easy_install(Command):
         'no-deps', 'local-snapshots-ok', 'version'
     ]
 
-    if HAS_USER_SITE:
+    if site.ENABLE_USER_SITE:
         help_msg = "install in user site-package '%s'" % site.USER_SITE
         user_options.append(('user', None, help_msg))
         boolean_options.append('user')
@@ -143,7 +141,7 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        if HAS_USER_SITE:
+        if site.ENABLE_USER_SITE:
             whereami = os.path.abspath(__file__)
             self.user = whereami.startswith(site.USER_SITE)
         else:
@@ -168,7 +166,7 @@ def initialize_options(self):
         self.install_data = None
         self.install_base = None
         self.install_platbase = None
-        if HAS_USER_SITE:
+        if site.ENABLE_USER_SITE:
             self.install_userbase = site.USER_BASE
             self.install_usersite = site.USER_SITE
         else:
@@ -226,13 +224,13 @@ def finalize_options(self):
             'abiflags': getattr(sys, 'abiflags', ''),
         }
 
-        if HAS_USER_SITE:
+        if site.ENABLE_USER_SITE:
             self.config_vars['userbase'] = self.install_userbase
             self.config_vars['usersite'] = self.install_usersite
 
         # fix the install_dir if "--user" was used
         #XXX: duplicate of the code in the setup command
-        if self.user and HAS_USER_SITE:
+        if self.user and site.ENABLE_USER_SITE:
             self.create_home_path()
             if self.install_userbase is None:
                 raise DistutilsPlatformError(
@@ -1278,7 +1276,7 @@ def get_site_dirs():
     for site_lib in lib_paths:
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
-    if HAS_USER_SITE:
+    if site.ENABLE_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
     sitedirs = list(map(normalize_path, sitedirs))
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 189e3d55df..bb1615d3f1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -141,7 +141,7 @@ def setUp(self):
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
         if sys.version >= "2.6":
-            self.old_has_site = easy_install_pkg.HAS_USER_SITE
+            self.old_enable_site = site.ENABLE_USER_SITE
             self.old_file = easy_install_pkg.__file__
             self.old_base = site.USER_BASE
             site.USER_BASE = tempfile.mkdtemp()
@@ -157,11 +157,11 @@ def tearDown(self):
             shutil.rmtree(site.USER_SITE)
             site.USER_BASE = self.old_base
             site.USER_SITE = self.old_site
-            easy_install_pkg.HAS_USER_SITE = self.old_has_site
+            site.ENABLE_USER_SITE = self.old_enable_site
             easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
-        easy_install_pkg.HAS_USER_SITE = True # disabled sometimes
+        site.ENABLE_USER_SITE = True # disabled sometimes
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP
@@ -178,7 +178,7 @@ def test_multiproc_atexit(self):
         _LOG.info('this should not break')
 
     def test_user_install_not_implied_without_usersite_enabled(self):
-        easy_install_pkg.HAS_USER_SITE = False # usually enabled
+        site.ENABLE_USER_SITE = False # usually enabled
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP

From 6267e434d557e667edafe8842fe5c854e44105fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:16:02 -0500
Subject: [PATCH 1663/8469] Remove Python 2.5 compatibility in easy_install
 test setup.

---
 setuptools/tests/test_easy_install.py | 34 ++++++++++++---------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index bb1615d3f1..cdcad4fbb3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -140,31 +140,29 @@ def setUp(self):
         f.close()
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
-        if sys.version >= "2.6":
-            self.old_enable_site = site.ENABLE_USER_SITE
-            self.old_file = easy_install_pkg.__file__
-            self.old_base = site.USER_BASE
-            site.USER_BASE = tempfile.mkdtemp()
-            self.old_site = site.USER_SITE
-            site.USER_SITE = tempfile.mkdtemp()
-            easy_install_pkg.__file__ = site.USER_SITE
+
+        self.old_enable_site = site.ENABLE_USER_SITE
+        self.old_file = easy_install_pkg.__file__
+        self.old_base = site.USER_BASE
+        site.USER_BASE = tempfile.mkdtemp()
+        self.old_site = site.USER_SITE
+        site.USER_SITE = tempfile.mkdtemp()
+        easy_install_pkg.__file__ = site.USER_SITE
 
     def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
-        if sys.version >= "2.6":
-            shutil.rmtree(site.USER_BASE)
-            shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
-            site.ENABLE_USER_SITE = self.old_enable_site
-            easy_install_pkg.__file__ = self.old_file
+
+        shutil.rmtree(site.USER_BASE)
+        shutil.rmtree(site.USER_SITE)
+        site.USER_BASE = self.old_base
+        site.USER_SITE = self.old_site
+        site.ENABLE_USER_SITE = self.old_enable_site
+        easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
         site.ENABLE_USER_SITE = True # disabled sometimes
         #XXX: replace with something meaningfull
-        if sys.version < "2.6":
-            return #SKIP
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = easy_install(dist)
@@ -180,8 +178,6 @@ def test_multiproc_atexit(self):
     def test_user_install_not_implied_without_usersite_enabled(self):
         site.ENABLE_USER_SITE = False # usually enabled
         #XXX: replace with something meaningfull
-        if sys.version < "2.6":
-            return #SKIP
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = easy_install(dist)

From 88ce73b58748de6041073019f23d1aa6c23a3fb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:43:27 -0500
Subject: [PATCH 1664/8469] backout 983513e397f3 now that contextlib and with
 statements are available

---
 setuptools/tests/test_easy_install.py | 82 ++++++++++-----------------
 1 file changed, 30 insertions(+), 52 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index cdcad4fbb3..5fba8c587b 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -6,6 +6,7 @@
 import tempfile
 import unittest
 import site
+import contextlib
 from setuptools.compat import StringIO, BytesIO, next
 from setuptools.compat import urlparse
 import textwrap
@@ -269,9 +270,8 @@ def test_setup_requires(self):
         sys.stderr = StringIO()
         try:
             try:
-                reset_setup_stop_context(
-                    lambda: run_setup(test_setup_py, ['install'])
-                )
+                with reset_setup_stop_context():
+                    run_setup(test_setup_py, ['install'])
             except SandboxViolation:
                 self.fail('Installation caused SandboxViolation')
         finally:
@@ -296,45 +296,33 @@ def test_setup_requires_honors_fetch_params(self):
             # Some platforms (Jython) don't find a port to which to bind,
             #  so skip this test for them.
             return
-
-        # I realize this is all-but-impossible to read, because it was
-        #  ported from some well-factored, safe code using 'with'. If you
-        #  need to maintain this code, consider making the changes in
-        #  the parent revision (of this comment) and then port the changes
-        #  back for Python 2.4 (or deprecate Python 2.4).
-
-        def install(dist_file):
-            def install_at(temp_install_dir):
-                def install_env():
+        # create an sdist that has a build-time dependency.
+        with TestSetupRequires.create_sdist() as dist_file:
+            with tempdir_context() as temp_install_dir:
+                with environment_context(PYTHONPATH=temp_install_dir):
                     ei_params = ['--index-url', p_index.url,
                         '--allow-hosts', p_index_loc,
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
-                    def install_clean_reset():
-                        def install_clean_argv():
+                    with reset_setup_stop_context():
+                        with argv_context(['easy_install']):
                             # attempt to install the dist. It should fail because
                             #  it doesn't exist.
                             self.assertRaises(SystemExit,
                                 easy_install_pkg.main, ei_params)
-                        argv_context(install_clean_argv, ['easy_install'])
-                    reset_setup_stop_context(install_clean_reset)
-                environment_context(install_env, PYTHONPATH=temp_install_dir)
-            tempdir_context(install_at)
-
-        # create an sdist that has a build-time dependency.
-        self.create_sdist(install)
-
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
         self.assertTrue(2 <= len(p_index.requests) <= 3)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
-    def create_sdist(self, installer):
+    @staticmethod
+    @contextlib.contextmanager
+    def create_sdist():
         """
-        Create an sdist with a setup_requires dependency (of something that
-        doesn't exist) and invoke installer on it.
+        Return an sdist with a setup_requires dependency (of something that
+        doesn't exist)
         """
-        def build_sdist(dir):
+        with tempdir_context() as dir:
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
             make_trivial_sdist(
                 dist_path,
@@ -346,8 +334,7 @@ def build_sdist(dir):
                         setup_requires = ['does-not-exist'],
                     )
                 """).lstrip())
-            installer(dist_path)
-        tempdir_context(build_sdist)
+            yield dist_path
 
 
 def make_trivial_sdist(dist_path, setup_py):
@@ -370,44 +357,37 @@ def make_trivial_sdist(dist_path, setup_py):
         dist.close()
 
 
-def tempdir_context(f, cd=lambda dir:None):
-    """
-    Invoke f in the context
-    """
+@contextlib.contextmanager
+def tempdir_context(cd=lambda dir:None):
     temp_dir = tempfile.mkdtemp()
     orig_dir = os.getcwd()
     try:
         cd(temp_dir)
-        f(temp_dir)
+        yield temp_dir
     finally:
         cd(orig_dir)
         shutil.rmtree(temp_dir)
 
-def environment_context(f, **updates):
-    """
-    Invoke f in the context
-    """
+@contextlib.contextmanager
+def environment_context(**updates):
     old_env = os.environ.copy()
     os.environ.update(updates)
     try:
-        f()
+        yield
     finally:
         for key in updates:
             del os.environ[key]
         os.environ.update(old_env)
 
-def argv_context(f, repl):
-    """
-    Invoke f in the context
-    """
+@contextlib.contextmanager
+def argv_context(repl):
     old_argv = sys.argv[:]
     sys.argv[:] = repl
-    try:
-        f()
-    finally:
-        sys.argv[:] = old_argv
+    yield
+    sys.argv[:] = old_argv
 
-def reset_setup_stop_context(f):
+@contextlib.contextmanager
+def reset_setup_stop_context():
     """
     When the setuptools tests are run using setup.py test, and then
     one wants to invoke another setup() command (such as easy_install)
@@ -416,7 +396,5 @@ def reset_setup_stop_context(f):
     """
     setup_stop_after = distutils.core._setup_stop_after
     distutils.core._setup_stop_after = None
-    try:
-        f()
-    finally:
-        distutils.core._setup_stop_after = setup_stop_after
+    yield
+    distutils.core._setup_stop_after = setup_stop_after

From 4ba80b5874929c4408f0af68a6ff2a152c03c314 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:49:22 -0500
Subject: [PATCH 1665/8469] Remove unused variable and clean whitespace

---
 setuptools/tests/test_easy_install.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 5fba8c587b..01f07e6734 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,7 +16,7 @@
 from setuptools.compat import StringIO, BytesIO, next, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, nt_quote_arg
-from setuptools.command.easy_install import  PthDistributions
+from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 from pkg_resources import Distribution as PRDistribution
@@ -243,7 +243,6 @@ def test_setup_requires(self):
 
         test_pkg = os.path.join(self.dir, 'test_pkg')
         test_setup_py = os.path.join(test_pkg, 'setup.py')
-        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
         os.mkdir(test_pkg)
 
         f = open(test_setup_py, 'w')

From bb31268118c393bd686ec190e257e6e398a88855 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:49:48 -0500
Subject: [PATCH 1666/8469] Remove redundant imports

---
 setuptools/tests/test_easy_install.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 01f07e6734..f8663f0726 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -7,8 +7,6 @@
 import unittest
 import site
 import contextlib
-from setuptools.compat import StringIO, BytesIO, next
-from setuptools.compat import urlparse
 import textwrap
 import tarfile
 import distutils.core

From 074413b0804d00a6d1d62bad5b12fdef92291aeb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 14:51:14 -0500
Subject: [PATCH 1667/8469] Reindent long line

---
 setuptools/tests/test_easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f8663f0726..24436d7024 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -13,7 +13,8 @@
 
 from setuptools.compat import StringIO, BytesIO, next, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
-from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, nt_quote_arg
+from setuptools.command.easy_install import (
+    easy_install, fix_jython_executable, get_script_args, nt_quote_arg)
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution

From f8c923f27aa52c5447d8669e8246e3cc27282e21 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 15:00:08 -0500
Subject: [PATCH 1668/8469] Move the global import logic for
 test_multiproc_atexit into the test where it is used.

---
 setuptools/tests/test_easy_install.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 24436d7024..a90ae23fc1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -9,6 +9,7 @@
 import contextlib
 import textwrap
 import tarfile
+import logging
 import distutils.core
 
 from setuptools.compat import StringIO, BytesIO, next, urlparse
@@ -21,17 +22,6 @@
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
 
-try:
-    # import multiprocessing solely for the purpose of testing its existence
-    __import__('multiprocessing')
-    import logging
-    _LOG = logging.getLogger('test_easy_install')
-    logging.basicConfig(level=logging.INFO, stream=sys.stderr)
-    _MULTIPROC = True
-except ImportError:
-    _MULTIPROC = False
-    _LOG = None
-
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -171,9 +161,15 @@ def test_user_install_implied(self):
         self.assertTrue(cmd.user, 'user should be implied')
 
     def test_multiproc_atexit(self):
-        if not _MULTIPROC:
+        try:
+            __import__('multiprocessing')
+        except ImportError:
+            # skip the test if multiprocessing is not available
             return
-        _LOG.info('this should not break')
+
+        log = logging.getLogger('test_easy_install')
+        logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+        log.info('this should not break')
 
     def test_user_install_not_implied_without_usersite_enabled(self):
         site.ENABLE_USER_SITE = False # usually enabled

From 9c5b87a057da48d44457021e2dcb843eb7122977 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 15:08:41 -0500
Subject: [PATCH 1669/8469] Reorganize imports

---
 setuptools/command/build_py.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 8751acd493..c9aa07ed25 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -1,4 +1,6 @@
-import os.path, sys, fnmatch
+import os
+import sys
+import fnmatch
 from distutils.command.build_py import build_py as _build_py
 from distutils.util import convert_path
 from glob import glob

From 9ccef555dd1f257fd9fa15bdecdbf4c19196a180 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 15:20:38 -0500
Subject: [PATCH 1670/8469] Extracted module for lib2to3 Mixin customization.

---
 setuptools/command/build_py.py | 54 ++-----------------------------
 setuptools/lib2to3_ex.py       | 58 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 52 deletions(-)
 create mode 100644 setuptools/lib2to3_ex.py

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index c9aa07ed25..0d8e8757f7 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -6,61 +6,11 @@
 from glob import glob
 
 try:
-    from distutils.util import Mixin2to3 as _Mixin2to3
-    # add support for converting doctests that is missing in 3.1 distutils
-    from distutils import log
-    from lib2to3.refactor import RefactoringTool, get_fixers_from_package
-    import setuptools
-    class DistutilsRefactoringTool(RefactoringTool):
-        def log_error(self, msg, *args, **kw):
-            log.error(msg, *args)
-
-        def log_message(self, msg, *args):
-            log.info(msg, *args)
-
-        def log_debug(self, msg, *args):
-            log.debug(msg, *args)
-
-    class Mixin2to3(_Mixin2to3):
-        def run_2to3(self, files, doctests = False):
-            # See of the distribution option has been set, otherwise check the
-            # setuptools default.
-            if self.distribution.use_2to3 is not True:
-                return
-            if not files:
-                return
-            log.info("Fixing "+" ".join(files))
-            self.__build_fixer_names()
-            self.__exclude_fixers()
-            if doctests:
-                if setuptools.run_2to3_on_doctests:
-                    r = DistutilsRefactoringTool(self.fixer_names)
-                    r.refactor(files, write=True, doctests_only=True)
-            else:
-                _Mixin2to3.run_2to3(self, files)
-
-        def __build_fixer_names(self):
-            if self.fixer_names: return
-            self.fixer_names = []
-            for p in setuptools.lib2to3_fixer_packages:
-                self.fixer_names.extend(get_fixers_from_package(p))
-            if self.distribution.use_2to3_fixers is not None:
-                for p in self.distribution.use_2to3_fixers:
-                    self.fixer_names.extend(get_fixers_from_package(p))
-
-        def __exclude_fixers(self):
-            excluded_fixers = getattr(self, 'exclude_fixers', [])
-            if self.distribution.use_2to3_exclude_fixers is not None:
-                excluded_fixers.extend(self.distribution.use_2to3_exclude_fixers)
-            for fixer_name in excluded_fixers:
-                if fixer_name in self.fixer_names:
-                    self.fixer_names.remove(fixer_name)
-
+    from setuptools.lib2to3_ex import Mixin2to3
 except ImportError:
     class Mixin2to3:
         def run_2to3(self, files, doctests=True):
-            # Nothing done in 2.x
-            pass
+            "do nothing"
 
 class build_py(_build_py, Mixin2to3):
     """Enhanced 'build_py' command that includes data files with packages
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
new file mode 100644
index 0000000000..feef591a88
--- /dev/null
+++ b/setuptools/lib2to3_ex.py
@@ -0,0 +1,58 @@
+"""
+Customized Mixin2to3 support:
+
+ - adds support for converting doctests
+
+
+This module raises an ImportError on Python 2.
+"""
+
+from distutils.util import Mixin2to3 as _Mixin2to3
+from distutils import log
+from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+import setuptools
+
+class DistutilsRefactoringTool(RefactoringTool):
+    def log_error(self, msg, *args, **kw):
+        log.error(msg, *args)
+
+    def log_message(self, msg, *args):
+        log.info(msg, *args)
+
+    def log_debug(self, msg, *args):
+        log.debug(msg, *args)
+
+class Mixin2to3(_Mixin2to3):
+    def run_2to3(self, files, doctests = False):
+        # See of the distribution option has been set, otherwise check the
+        # setuptools default.
+        if self.distribution.use_2to3 is not True:
+            return
+        if not files:
+            return
+        log.info("Fixing "+" ".join(files))
+        self.__build_fixer_names()
+        self.__exclude_fixers()
+        if doctests:
+            if setuptools.run_2to3_on_doctests:
+                r = DistutilsRefactoringTool(self.fixer_names)
+                r.refactor(files, write=True, doctests_only=True)
+        else:
+            _Mixin2to3.run_2to3(self, files)
+
+    def __build_fixer_names(self):
+        if self.fixer_names: return
+        self.fixer_names = []
+        for p in setuptools.lib2to3_fixer_packages:
+            self.fixer_names.extend(get_fixers_from_package(p))
+        if self.distribution.use_2to3_fixers is not None:
+            for p in self.distribution.use_2to3_fixers:
+                self.fixer_names.extend(get_fixers_from_package(p))
+
+    def __exclude_fixers(self):
+        excluded_fixers = getattr(self, 'exclude_fixers', [])
+        if self.distribution.use_2to3_exclude_fixers is not None:
+            excluded_fixers.extend(self.distribution.use_2to3_exclude_fixers)
+        for fixer_name in excluded_fixers:
+            if fixer_name in self.fixer_names:
+                self.fixer_names.remove(fixer_name)

From a193991b4b347ecc403be76005e098d4abeef2b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 Nov 2013 15:25:35 -0500
Subject: [PATCH 1671/8469] Delint build_py

---
 setuptools/command/build_py.py | 43 +++++++++++++---------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 0d8e8757f7..090b44d265 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import fnmatch
+import textwrap
 from distutils.command.build_py import build_py as _build_py
 from distutils.util import convert_path
 from glob import glob
@@ -49,9 +50,10 @@ def run(self):
         # output files are.
         self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
 
-    def __getattr__(self,attr):
+    def __getattr__(self, attr):
         if attr=='data_files':  # lazily compute data files
-            self.data_files = files = self._get_data_files(); return files
+            self.data_files = files = self._get_data_files()
+            return files
         return _build_py.__getattr__(self,attr)
 
     def build_module(self, module, module_file, package):
@@ -78,7 +80,7 @@ def _get_data_files(self):
             filenames = [
                 file[plen:] for file in self.find_data_files(package, src_dir)
                 ]
-            data.append( (package, src_dir, build_dir, filenames) )
+            data.append((package, src_dir, build_dir, filenames))
         return data
 
     def find_data_files(self, package, src_dir):
@@ -93,7 +95,6 @@ def find_data_files(self, package, src_dir):
 
     def build_package_data(self):
         """Copy data files into build directory"""
-        lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
@@ -104,7 +105,6 @@ def build_package_data(self):
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 
-
     def analyze_manifest(self):
         self.manifest_files = mf = {}
         if not self.distribution.include_package_data:
@@ -169,10 +169,10 @@ def check_package(self, package, package_dir):
         if 'declare_namespace'.encode() not in f.read():
             from distutils import log
             log.warn(
-               "WARNING: %s is a namespace package, but its __init__.py does\n"
-               "not declare_namespace(); setuptools 0.7 will REQUIRE this!\n"
-               '(See the setuptools manual under "Namespace Packages" for '
-               "details.)\n", package
+                "WARNING: %s is a namespace package, but its __init__.py does\n"
+                "not declare_namespace(); setuptools 0.7 will REQUIRE this!\n"
+                '(See the setuptools manual under "Namespace Packages" for '
+                "details.)\n", package
             )
         f.close()
         return init_py
@@ -181,14 +181,12 @@ def initialize_options(self):
         self.packages_checked={}
         _build_py.initialize_options(self)
 
-
     def get_package_dir(self, package):
         res = _build_py.get_package_dir(self, package)
         if self.distribution.src_root is not None:
             return os.path.join(self.distribution.src_root, res)
         return res
 
-
     def exclude_data_files(self, package, src_dir, files):
         """Filter filenames for package's data files in 'src_dir'"""
         globs = (self.exclude_package_data.get('', [])
@@ -212,21 +210,12 @@ def assert_relative(path):
     if not os.path.isabs(path):
         return path
     from distutils.errors import DistutilsSetupError
-    raise DistutilsSetupError(
-"""Error: setup script specifies an absolute path:
-
-    %s
-
-setup() arguments must *always* be /-separated paths relative to the
-setup.py directory, *never* absolute paths.
-""" % path
-    )
-
-
-
-
-
-
-
+    msg = textwrap.dedent("""
+        Error: setup script specifies an absolute path:
 
+            %s
 
+        setup() arguments must *always* be /-separated paths relative to the
+        setup.py directory, *never* absolute paths.
+        """).lstrip() % path
+    raise DistutilsSetupError(msg)

From 698d467b411cef3fd3b06b522d9b70f6b5057976 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Nov 2013 12:24:41 -0500
Subject: [PATCH 1672/8469] Updated installation notes to describe installation
 on Python 2.4 and Python 2.5.

---
 README.txt | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 53608bae8e..0cc3dd42fc 100755
--- a/README.txt
+++ b/README.txt
@@ -33,7 +33,7 @@ file and install it for you.
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
-Once installation is complete, you will find an ``easy_install.exe`` program in
+Once installation is complete, you will find an ``easy_install`` program in
 your Python ``Scripts`` subdirectory.  For simple invocation and best results,
 add this directory to your ``PATH`` environment variable, if it is not already
 present.
@@ -48,7 +48,9 @@ will download the appropriate version and install it for you::
     > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
-install to the system Python.
+install to the system Python::
+
+    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | sudo python
 
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
@@ -57,6 +59,14 @@ user-local path::
     > python ez_setup.py --user
 
 
+Python 2.4 and Python 2.5 support
+=================================
+
+Setuptools 2.0 and later requires Python 2.6 or later. To install setuptools
+on Python 2.4 or Python 2.5, use the bootstrap script for Setuptools 1.x:
+https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py.
+
+
 Advanced Installation
 =====================
 

From 1199d17859540ba791ad81cf44d08f293c0acd64 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Nov 2013 12:27:44 -0500
Subject: [PATCH 1673/8469] Moved merge documentation to the end, reducing the
 prominence of the docs.

---
 docs/index.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.txt b/docs/index.txt
index 8c68651def..53839beed9 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,7 +16,6 @@ Documentation content:
 .. toctree::
    :maxdepth: 2
 
-   merge
    roadmap
    python3
    using
@@ -24,3 +23,4 @@ Documentation content:
    easy_install
    pkg_resources
    development
+   merge

From bf9c84eadae80290a5cd2cadd2c9b5b5e456e546 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Nov 2013 12:27:54 -0500
Subject: [PATCH 1674/8469] Updated roadmap to reflect current status.

---
 docs/roadmap.txt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 44bcdb0ff8..8f175b9f75 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -2,13 +2,5 @@
 Roadmap
 =======
 
-Setuptools has merged with Distribute and to provide a unified codebase for
-ongoing development.
-
-This new effort will draw from the resources of both projects to leverage
-community contribution for ongoing advancement but also maintain stability
-for the user base.
-
-An initial release of Setuptools 0.7 will attempt to be compatible both with
-Setuptools 0.6c11 and Distribute 0.6.36. Where compatibility cannot be
-achieved, the changes should be well-documented.
+Setuptools is primarily in maintenance mode. The project attempts to address
+user issues, concerns, and feature requests in a timely fashion.

From f9bfe4d3011feff382adfbd8ee87a3701e03ce28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 05:21:03 -0500
Subject: [PATCH 1675/8469] Modernize syntax

---
 pkg_resources.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index be8c6c57f9..3334bdfab1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1891,14 +1891,17 @@ def _handle_ns(packageName, path_item):
     module = sys.modules.get(packageName)
     if module is None:
         module = sys.modules[packageName] = imp.new_module(packageName)
-        module.__path__ = []; _set_parent_ns(packageName)
+        module.__path__ = []
+        _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
     handler = _find_adapter(_namespace_handlers, importer)
     subpath = handler(importer,path_item,packageName,module)
     if subpath is not None:
-        path = module.__path__; path.append(subpath)
-        loader.load_module(packageName); module.__path__ = path
+        path = module.__path__
+        path.append(subpath)
+        loader.load_module(packageName)
+        module.__path__ = path
     return subpath
 
 def declare_namespace(packageName):
@@ -2409,7 +2412,6 @@ def insert_on(self, path, loc = None):
         bdir = os.path.dirname(nloc)
         npath= [(p and _normalize_cached(p) or p) for p in path]
 
-        bp = None
         for p, item in enumerate(npath):
             if item==nloc:
                 break

From 051b809052ca5531320cdfbfa5161b4afe9d6b2f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 05:24:31 -0500
Subject: [PATCH 1676/8469] Remove internal implementation of ImpImporter and
 ImpLoader as comments indicate they're only required for Python 2.4.

---
 pkg_resources.py | 76 +-----------------------------------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 3334bdfab1..71f46f6055 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1701,81 +1701,7 @@ def __init__(self, importer):
             self.module_path = importer.archive
         self._setup_prefix()
 
-
-class ImpWrapper:
-    """PEP 302 Importer that wraps Python's "normal" import algorithm"""
-
-    def __init__(self, path=None):
-        self.path = path
-
-    def find_module(self, fullname, path=None):
-        subname = fullname.split(".")[-1]
-        if subname != fullname and self.path is None:
-            return None
-        if self.path is None:
-            path = None
-        else:
-            path = [self.path]
-        try:
-            file, filename, etc = imp.find_module(subname, path)
-        except ImportError:
-            return None
-        return ImpLoader(file, filename, etc)
-
-
-class ImpLoader:
-    """PEP 302 Loader that wraps Python's "normal" import algorithm"""
-
-    def __init__(self, file, filename, etc):
-        self.file = file
-        self.filename = filename
-        self.etc = etc
-
-    def load_module(self, fullname):
-        try:
-            mod = imp.load_module(fullname, self.file, self.filename, self.etc)
-        finally:
-            if self.file: self.file.close()
-        # Note: we don't set __loader__ because we want the module to look
-        # normal; i.e. this is just a wrapper for standard import machinery
-        return mod
-
-
-def get_importer(path_item):
-    """Retrieve a PEP 302 "importer" for the given path item
-
-    If there is no importer, this returns a wrapper around the builtin import
-    machinery.  The returned importer is only cached if it was created by a
-    path hook.
-    """
-    try:
-        importer = sys.path_importer_cache[path_item]
-    except KeyError:
-        for hook in sys.path_hooks:
-            try:
-                importer = hook(path_item)
-            except ImportError:
-                pass
-            else:
-                break
-        else:
-            importer = None
-
-    sys.path_importer_cache.setdefault(path_item,importer)
-    if importer is None:
-        try:
-            importer = ImpWrapper(path_item)
-        except ImportError:
-            pass
-    return importer
-
-try:
-    from pkgutil import get_importer, ImpImporter
-except ImportError:
-    pass    # Python 2.3 or 2.4, use our own implementation
-else:
-    ImpWrapper = ImpImporter    # Python 2.5, use pkgutil's implementation
-    del ImpLoader, ImpImporter
+from pkgutil import get_importer, ImpImporter as ImpWrapper
 
 
 _declare_state('dict', _distribution_finders = {})

From 7e656969999482e4a51aabe16e8200180270e4f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 05:25:12 -0500
Subject: [PATCH 1677/8469] Move import to the header

---
 pkg_resources.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 71f46f6055..828f9443cd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -23,6 +23,7 @@
 import warnings
 import stat
 import functools
+from pkgutil import get_importer, ImpImporter as ImpWrapper
 
 try:
     from urlparse import urlparse, urlunparse
@@ -1701,9 +1702,6 @@ def __init__(self, importer):
             self.module_path = importer.archive
         self._setup_prefix()
 
-from pkgutil import get_importer, ImpImporter as ImpWrapper
-
-
 _declare_state('dict', _distribution_finders = {})
 
 def register_finder(importer_type, distribution_finder):

From 4e2c005f8702ed7e2bce31425748eb83f3e9db0f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 05:33:34 -0500
Subject: [PATCH 1678/8469] Use pkgutil namespace. Still export get_importer as
 it's referenced in __all__.

--HG--
extra : amend_source : fe3ad40ffbb67cc7f3407a37ac42671ea3ecb983
---
 CHANGES.txt      | 2 ++
 pkg_resources.py | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2736d4c13c..d28b07beb9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES
 * Removed ``setuptools.command.easy_install.HAS_USER_SITE``. Clients
   expecting this boolean variable should use ``site.ENABLE_USER_SITE``
   instead.
+* Removed ``pkg_resources.ImpWrapper``. Clients that expected this class
+  should use ``pkgutil.ImpImporter`` instead.
 
 -----
 1.4.1
diff --git a/pkg_resources.py b/pkg_resources.py
index 828f9443cd..36a7b3069e 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -23,7 +23,8 @@
 import warnings
 import stat
 import functools
-from pkgutil import get_importer, ImpImporter as ImpWrapper
+import pkgutil
+from pkgutil import get_importer
 
 try:
     from urlparse import urlparse, urlunparse
@@ -1778,7 +1779,7 @@ def find_on_path(importer, path_item, only=False):
                         for item in find_distributions(os.path.join(path_item,line.rstrip())):
                             yield item
                         break
-register_finder(ImpWrapper,find_on_path)
+register_finder(pkgutil.ImpImporter,find_on_path)
 
 if importlib_bootstrap is not None:
     register_finder(importlib_bootstrap.FileFinder, find_on_path)
@@ -1882,7 +1883,7 @@ def file_ns_handler(importer, path_item, packageName, module):
         # Only return the path if it's not already there
         return subpath
 
-register_namespace_handler(ImpWrapper,file_ns_handler)
+register_namespace_handler(pkgutil.ImpImporter,file_ns_handler)
 register_namespace_handler(zipimport.zipimporter,file_ns_handler)
 
 if importlib_bootstrap is not None:

From 35d9509cd23b7830c91398fa5b3f2ffe6ffe7403 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 05:49:33 -0500
Subject: [PATCH 1679/8469] Reindent for clarity

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

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4a3f49c72c..4ffafa286e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1053,5 +1053,5 @@ def local_open(url):
     else:
         status, message, body = 404, "Path not found", "Not found"
 
-    return HTTPError(url, status, message,
-            {'content-type':'text/html'}, StringIO(body))
+    headers = {'content-type': 'text/html'}
+    return HTTPError(url, status, message, headers, StringIO(body))

From a87729f8b64b95cc203ae8e71fc6b5150725e1e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 06:05:38 -0500
Subject: [PATCH 1680/8469] Adding test capturing #116

---
 setuptools/tests/test_packageindex.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 08969b7e8c..5a0c3946e4 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -151,6 +151,20 @@ def test__vcs_split_rev_from_url(self):
         self.assertEqual(url, 'https://example.com/bar')
         self.assertEqual(rev, '2995')
 
+    def test_local_index(self):
+        f = open('index.html', 'w')
+        f.write('<div>content</div>')
+        f.close()
+        try:
+            import urllib.request
+            import os
+            url = 'file:' + urllib.request.pathname2url(os.getcwd()) + '/'
+            res = setuptools.package_index.local_open(url)
+        finally:
+            os.remove('index.html')
+        assert 'content' in res.read()
+
+
 class TestContentCheckers(unittest.TestCase):
 
     def test_md5(self):

From 4ae4faeb1262435260ee8a5f2a0ab910fe96ea23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 06:08:30 -0500
Subject: [PATCH 1681/8469] Moved imports to the top, made them compatible with
 Python 2, and added a docstring.

---
 setuptools/compat.py                  |  4 ++--
 setuptools/tests/test_packageindex.py | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index bbc98d6644..9a191465bb 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -27,7 +27,7 @@
     unichr = unichr
     unicode = unicode
     bytes = str
-    from urllib import url2pathname, splittag
+    from urllib import url2pathname, splittag, pathname2url
     import urllib2
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
@@ -73,7 +73,7 @@ def exec_(code, globs=None, locs=None):
     bytes = bytes
     from urllib.error import HTTPError, URLError
     import urllib.request as urllib2
-    from urllib.request import urlopen, url2pathname
+    from urllib.request import urlopen, url2pathname, pathname2url
     from urllib.parse import (
         urlparse, urlunparse, unquote, splituser, urljoin, urlsplit,
         urlunsplit, splittag,
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 5a0c3946e4..664566a36c 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,9 +1,10 @@
 """Package Index Tests
 """
 import sys
+import os
 import unittest
 import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError, unicode
+from setuptools.compat import urllib2, httplib, HTTPError, unicode, pathname2url
 import distutils.errors
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
@@ -152,13 +153,14 @@ def test__vcs_split_rev_from_url(self):
         self.assertEqual(rev, '2995')
 
     def test_local_index(self):
+        """
+        local_open should be able to read an index from the file system.
+        """
         f = open('index.html', 'w')
         f.write('<div>content</div>')
         f.close()
         try:
-            import urllib.request
-            import os
-            url = 'file:' + urllib.request.pathname2url(os.getcwd()) + '/'
+            url = 'file:' + pathname2url(os.getcwd()) + '/'
             res = setuptools.package_index.local_open(url)
         finally:
             os.remove('index.html')

From ec3014377e1369116da3bf71b6c5acaa3168b9dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 06:12:06 -0500
Subject: [PATCH 1682/8469] Corrected a TypeError when reading a local package
 index on Python 3. Fixes #116.

---
 CHANGES.txt                 | 7 +++++++
 setuptools/package_index.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b20d16839c..09c6479ea8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+1.4.2
+-----
+
+* Issue #116: Correct TypeError when reading a local package index on Python
+  3.
+
 -----
 1.4.1
 -----
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4ffafa286e..ef247cf3c8 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1039,7 +1039,7 @@ def local_open(url):
         files = []
         for f in os.listdir(filename):
             if f=='index.html':
-                fp = open(os.path.join(filename,f),'rb')
+                fp = open(os.path.join(filename,f),'r')
                 body = fp.read()
                 fp.close()
                 break

From 6d127bcf9ce4a600d5fea2120eb5c85e376d7b17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 06:15:19 -0500
Subject: [PATCH 1683/8469] Added tag 1.4.2 for changeset 274cb3beba4f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c01565ac3d..ab959fc35e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -109,3 +109,4 @@ a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
 0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1
 a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1
+274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2

From af3e8f78ae796b4e517547608a6cafaa835c430f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2013 06:15:45 -0500
Subject: [PATCH 1684/8469] Bumped to 1.4.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 92 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  6 +-
 setuptools/version.py                |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9dc2c8729b..9b380b0131 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "1.4.2"
+DEFAULT_VERSION = "1.4.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 2bf6c8ce4e..f574d18208 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-include_package_data = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
-
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
 [console_scripts]
-easy_install = setuptools.command.easy_install:main
 easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 
 [distutils.commands]
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
+egg_info = setuptools.command.egg_info:egg_info
+saveopts = setuptools.command.saveopts:saveopts
+develop = setuptools.command.develop:develop
 test = setuptools.command.test:test
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
 build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
-alias = setuptools.command.alias:alias
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 install = setuptools.command.install:install
+register = setuptools.command.register:register
+setopt = setuptools.command.setopt:setopt
+build_ext = setuptools.command.build_ext:build_ext
 upload_docs = setuptools.command.upload_docs:upload_docs
-develop = setuptools.command.develop:develop
-install_scripts = setuptools.command.install_scripts:install_scripts
-egg_info = setuptools.command.egg_info:egg_info
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-setopt = setuptools.command.setopt:setopt
+alias = setuptools.command.alias:alias
+sdist = setuptools.command.sdist:sdist
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+zip_safe = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+entry_points = setuptools.dist:check_entry_points
+tests_require = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+dependency_links = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+include_package_data = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+eager_resources = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_fixers = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954ff..256342f0e4 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
 
 
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
 [ssl:sys_platform=='win32']
 wincertstore==0.1
 
 [certs]
 certifi==0.0.8
 
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
 [ssl:python_version in '2.4, 2.5']
 ssl==1.16
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 98d186bed7..4e7c72a597 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4.2'
+__version__ = '1.4.3'

From 8bbdac7d065e408f3f320e4523274e10e1c469fc Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 7 Dec 2013 00:13:19 -0600
Subject: [PATCH 1685/8469] Modified setuptools.test.environment.ZipEnvironment
 to not choke on a bypassed   setUp. test_egg_info, test_sdist, and test_svn
 all had tests that needed to be   bypassed when svn was not present. 
 tests.py26compat contains a SkipIf   decorator for skipping.  This worked
 after ironing a few wrinkles.  The   conditions is evaluated and stored in
 test_svn._svn_check.

---
 setuptools/tests/environment.py   |  7 +++++++
 setuptools/tests/test_egg_info.py | 21 +++++++++++++--------
 setuptools/tests/test_sdist.py    |  7 ++++++-
 setuptools/tests/test_svn.py      | 31 +++++++++++++++++++++++++++----
 4 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index bd2c53d2a2..476d280ae2 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -78,6 +78,9 @@ class ZippedEnvironment(unittest.TestCase):
     old_cwd = None
 
     def setUp(self):
+        if self.datafile is None or self.dataname is None:
+            return
+
         if not os.path.isfile(self.datafile):
             self.old_cwd = None
             return
@@ -98,6 +101,10 @@ def setUp(self):
         os.chdir(os.path.join(self.temp_dir, self.dataname))
 
     def tearDown(self):
+        #Assume setUp was never completed
+        if self.dataname is None or self.datafile is None:
+            return
+
         try:
             if self.old_cwd:
                 os.chdir(self.old_cwd)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 28682dfd0b..278543662f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -8,8 +8,9 @@
 import pkg_resources
 import warnings
 from setuptools.command import egg_info
-from setuptools.tests import environment
 from setuptools import svn_utils
+from setuptools.tests import environment, test_svn
+from setuptools.tests.py26compat import skipIf
 
 ENTRIES_V10 = pkg_resources.resource_string(__name__, 'entries-v10')
 "An entries file generated with svn 1.6.17 against the legacy Setuptools repo"
@@ -33,7 +34,8 @@ def _write_entries(self, entries):
         entries_f = open(fn, 'wb')
         entries_f.write(entries)
         entries_f.close()
-
+   
+    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_version_10_format(self):
         """
         """
@@ -60,11 +62,9 @@ def test_version_10_format_legacy_parser(self):
             if env.lower() == 'path':
                 path_variable = env
 
-        if path_variable is None:
-            self.skipTest('Cannot figure out how to modify path')
-
-        old_path = os.environ[path_variable]
-        os.environ[path_variable] = ''
+        if path_variable:
+            old_path = os.environ[path_variable]
+            os.environ[path_variable] = ''
         #catch_warnings not available until py26
         warning_filters = warnings.filters
         warnings.filters = warning_filters[:]
@@ -76,7 +76,8 @@ def test_version_10_format_legacy_parser(self):
             #restore the warning filters
             warnings.filters = warning_filters
             #restore the os path
-            os.environ[path_variable] = old_path
+            if path_variable:
+                os.environ[path_variable] = old_path
 
         self.assertEqual(rev, '89000')
 
@@ -99,6 +100,9 @@ class TestSvnDummy(environment.ZippedEnvironment):
 
     def setUp(self):
         version = svn_utils.SvnInfo.get_svn_version()
+        if not version:  # None or Empty
+            return None
+
         self.base_version = tuple([int(x) for x in version.split('.')][:2])
 
         if not self.base_version:
@@ -114,6 +118,7 @@ def setUp(self):
                                      'svn_data', self.dataname + ".zip")
         super(TestSvnDummy, self).setUp()
 
+    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_sources(self):
         code, data = environment.run_setup_py(["sdist"],
                                               pypath=self.old_cwd,
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index b42dcc5769..71d10757bc 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,8 @@
 import unittest
 import unicodedata
 import re
-from setuptools.tests import environment
+from setuptools.tests import environment, test_svn
+from setuptools.tests.py26compat import skipIf
 
 from setuptools.compat import StringIO, unicode
 from setuptools.tests.py26compat import skipIf
@@ -473,6 +474,9 @@ class TestSvn(environment.ZippedEnvironment):
 
     def setUp(self):
         version = svn_utils.SvnInfo.get_svn_version()
+        if not version:  # None or Empty
+            return
+
         self.base_version = tuple([int(x) for x in version.split('.')][:2])
 
         if not self.base_version:
@@ -488,6 +492,7 @@ def setUp(self):
                                      'svn_data', self.dataname + ".zip")
         super(TestSvn, self).setUp()
 
+    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_walksvn(self):
         if self.base_version >= (1, 6):
             folder2 = 'third party2'
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 5418b9a43e..afee32b6d2 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -3,12 +3,25 @@
 
 
 import os
+import sys
 import unittest
 import codecs
+import subprocess
 from setuptools.tests import environment
 from setuptools.compat import unicode, unichr
 
 from setuptools import svn_utils
+from setuptools.tests.py26compat import skipIf
+
+
+def _do_svn_check():
+    try:
+        subprocess.check_call(["svn", "--version"],
+                              shell=(sys.platform == 'win32'))
+        return True
+    except (OSError, subprocess.CalledProcessError):
+        return False
+_svn_check = _do_svn_check()
 
 
 class TestSvnVersion(unittest.TestCase):
@@ -20,7 +33,10 @@ def test_no_svn_found(self):
                 path_variable = env
 
         if path_variable is None:
-            self.skipTest('Cannot figure out how to modify path')
+            try:
+                self.skipTest('Cannot figure out how to modify path')
+            except AttributeError:  # PY26 doesn't have this
+                return
 
         old_path = os.environ[path_variable]
         os.environ[path_variable] = ''
@@ -30,6 +46,7 @@ def test_no_svn_found(self):
         finally:
             os.environ[path_variable] = old_path
 
+    @skipIf(not _svn_check, "No SVN to text, in the first place")
     def test_svn_should_exist(self):
         version = svn_utils.SvnInfo.get_svn_version()
         self.assertNotEqual(version, '')
@@ -169,11 +186,14 @@ class TestSvn(environment.ZippedEnvironment):
 
     def setUp(self):
         version = svn_utils.SvnInfo.get_svn_version()
+        if not version:  # empty or null
+            self.dataname = None
+            self.datafile = None
+            return
+
         self.base_version = tuple([int(x) for x in version.split('.')[:2]])
 
-        if not self.base_version:
-            raise ValueError('No SVN tools installed')
-        elif self.base_version < (1,3):
+        if self.base_version < (1,3):
             raise ValueError('Insufficient SVN Version %s' % version)
         elif self.base_version >= (1,9):
             #trying the latest version
@@ -184,10 +204,12 @@ def setUp(self):
                                      'svn_data', self.dataname + ".zip")
         super(TestSvn, self).setUp()
 
+    @skipIf(not _svn_check, "No SVN to text, in the first place")
     def test_revision(self):
         rev = svn_utils.SvnInfo.load('.').get_revision()
         self.assertEqual(rev, 6)
 
+    @skipIf(not _svn_check, "No SVN to text, in the first place")
     def test_entries(self):
         expected = set([
             (os.path.join('a file'), 'file'),
@@ -200,6 +222,7 @@ def test_entries(self):
         info = svn_utils.SvnInfo.load('.')
         self.assertEqual(set(x for x in info.entries), expected)
 
+    @skipIf(not _svn_check, "No SVN to text, in the first place")
     def test_externals(self):
         if self.base_version >= (1,6):
             folder2 = 'third party2'

From 7a8e4a536be8c6cc8f313e6f0e6b907ffc55b205 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 11:44:40 -0500
Subject: [PATCH 1686/8469] Normalize whitespace in function signatures

--HG--
extra : histedit_source : 471b9c3fbde309c39492f2a567a26993c1dc94de
---
 setuptools/sandbox.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 6dd1ca0784..7354e46a7f 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -220,7 +220,7 @@ def _open(self, path, mode='r', *args, **kw):
     def tmpnam(self):
         self._violation("tmpnam")
 
-    def _ok(self,path):
+    def _ok(self, path):
         active = self._active
         try:
             self._active = False
@@ -235,13 +235,13 @@ def _exempted(self, filepath):
         exception_matches = map(filepath.startswith, self._exceptions)
         return True in exception_matches
 
-    def _remap_input(self,operation,path,*args,**kw):
+    def _remap_input(self, operation, path, *args, **kw):
         """Called for path inputs"""
         if operation in self.write_ops and not self._ok(path):
             self._violation(operation, os.path.realpath(path), *args, **kw)
         return path
 
-    def _remap_pair(self,operation,src,dst,*args,**kw):
+    def _remap_pair(self, operation, src, dst, *args, **kw):
         """Called for path pairs like rename, link, and symlink operations"""
         if not self._ok(src) or not self._ok(dst):
             self._violation(operation, src, dst, *args, **kw)

From 47a464565e66612086c02d35c470ad20909e3931 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 11:55:44 -0500
Subject: [PATCH 1687/8469] Always return a boolean in DirectorySandbox._ok

--HG--
extra : histedit_source : b0072af02db4ba170105a4eb3f8a033dce678869
---
 setuptools/sandbox.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 7354e46a7f..49c4ea93ad 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -200,7 +200,10 @@ class DirectorySandbox(AbstractSandbox):
     def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
         self._prefix = os.path.join(self._sandbox,'')
-        self._exceptions = [os.path.normcase(os.path.realpath(path)) for path in exceptions]
+        self._exceptions = [
+            os.path.normcase(os.path.realpath(path))
+            for path in exceptions
+        ]
         AbstractSandbox.__init__(self)
 
     def _violation(self, operation, *args, **kw):
@@ -225,9 +228,11 @@ def _ok(self, path):
         try:
             self._active = False
             realpath = os.path.normcase(os.path.realpath(path))
-            if (self._exempted(realpath) or realpath == self._sandbox
-                    or realpath.startswith(self._prefix)):
-                return True
+            return (
+                self._exempted(realpath)
+                or realpath == self._sandbox
+                or realpath.startswith(self._prefix)
+            )
         finally:
             self._active = active
 

From f196854eeb75ecd5b3e676e29b0f29137af25826 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 12:14:52 -0500
Subject: [PATCH 1688/8469] Use any for matching exceptions in
 DirectorySandbox.

--HG--
extra : histedit_source : 9a99f28235a96543a3ca2da4ec691da0e1cd880c
---
 setuptools/sandbox.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 49c4ea93ad..d50f1f6629 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -237,8 +237,11 @@ def _ok(self, path):
             self._active = active
 
     def _exempted(self, filepath):
-        exception_matches = map(filepath.startswith, self._exceptions)
-        return True in exception_matches
+        exception_matches = any(
+            filepath.startswith(exception)
+            for exception in self._exceptions
+        )
+        return exception_matches
 
     def _remap_input(self, operation, path, *args, **kw):
         """Called for path inputs"""

From 3915375e6b94d7f41be271aec3c3e37efcba8c27 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 12:15:25 -0500
Subject: [PATCH 1689/8469] Use any on a generator instead

--HG--
extra : histedit_source : 7924e09d06d2f6db58371735314caeee77aa2d3d
---
 setuptools/sandbox.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index d50f1f6629..50fb02a3f1 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -237,11 +237,11 @@ def _ok(self, path):
             self._active = active
 
     def _exempted(self, filepath):
-        exception_matches = any(
+        exception_matches = (
             filepath.startswith(exception)
             for exception in self._exceptions
         )
-        return exception_matches
+        return any(exception_matches)
 
     def _remap_input(self, operation, path, *args, **kw):
         """Called for path inputs"""

From ef565f9ddd20ca66d1c1ff57da4ceb91038010e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 12:28:15 -0500
Subject: [PATCH 1690/8469] Add support for exempting a path based on a regular
 expression.

--HG--
extra : histedit_source : 2f1f4146ec1d5196cb65602302185a12060cfa17
---
 setuptools/sandbox.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 50fb02a3f1..26960846e9 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -3,6 +3,8 @@
 import tempfile
 import operator
 import functools
+import itertools
+import re
 
 import pkg_resources
 
@@ -197,6 +199,9 @@ class DirectorySandbox(AbstractSandbox):
         "utime", "lchown", "chroot", "mkfifo", "mknod", "tempnam",
     ])
 
+    _exception_patterns = []
+    "allow writing to paths that match the pattern"
+
     def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
         self._prefix = os.path.join(self._sandbox,'')
@@ -237,11 +242,16 @@ def _ok(self, path):
             self._active = active
 
     def _exempted(self, filepath):
-        exception_matches = (
+        start_matches = (
             filepath.startswith(exception)
             for exception in self._exceptions
         )
-        return any(exception_matches)
+        pattern_matches = (
+            re.match(pattern, filepath)
+            for pattern in self._exception_patterns
+        )
+        candidates = itertools.chain(start_matches, pattern_matches)
+        return any(candidates)
 
     def _remap_input(self, operation, path, *args, **kw):
         """Called for path inputs"""

From d30d526eb40a4855a3589d895aac75900aedfc44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 12:36:45 -0500
Subject: [PATCH 1691/8469] Exempt lib2to3 pickled grammars from the
 DirectorySandboxing. Fixes #121.

--HG--
extra : histedit_source : 6cd9a3c6003d3f6de2f8e676b61589db4dffafb0
---
 CHANGES.txt           | 1 +
 setuptools/sandbox.py | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f04f5b916a..90e2aaa8fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 2.0
 ---
 
+* Issue #121: Exempt lib2to3 pickled grammars from DirectorySandbox.
 * Issue #41: Dropped support for Python 2.4 and Python 2.5. Clients requiring
   setuptools for those versions of Python should use setuptools 1.x.
 * Removed ``setuptools.command.easy_install.HAS_USER_SITE``. Clients
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 26960846e9..042c595897 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -199,8 +199,11 @@ class DirectorySandbox(AbstractSandbox):
         "utime", "lchown", "chroot", "mkfifo", "mknod", "tempnam",
     ])
 
-    _exception_patterns = []
-    "allow writing to paths that match the pattern"
+    _exception_patterns = [
+        # Allow lib2to3 to attempt to save a pickled grammar object (#121)
+        '.*lib2to3.*\.pickle$',
+    ]
+    "exempt writing to paths that match the pattern"
 
     def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))

From 6e2a9a85733698257f6c5e8df571bb0b50ab8096 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 13:28:41 -0500
Subject: [PATCH 1692/8469] Added tag 2.0 for changeset 0bb1df93c2ea

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ab959fc35e..528c2336f7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -110,3 +110,4 @@ a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
 a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1
 274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2
+0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0

From 1b36a4f1bd2b098eb1b83f795ec0aa6fe6652e44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Dec 2013 13:29:08 -0500
Subject: [PATCH 1693/8469] Bumped to 2.1 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 94 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2aa994b337..371000f9bd 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.0"
+DEFAULT_VERSION = "2.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index d423a67d0d..23b577f60a 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [distutils.setup_keywords]
-use_2to3_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-dependency_links = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
+exclude_package_data = setuptools.dist:check_package_data
 include_package_data = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
-test_loader = setuptools.dist:check_importable
+entry_points = setuptools.dist:check_entry_points
+dependency_links = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
 zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+eager_resources = setuptools.dist:assert_string_list
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+entry_points.txt = setuptools.command.egg_info:write_entries
 
 [distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+egg_info = setuptools.command.egg_info:egg_info
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+rotate = setuptools.command.rotate:rotate
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+upload_docs = setuptools.command.upload_docs:upload_docs
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
+develop = setuptools.command.develop:develop
+install_lib = setuptools.command.install_lib:install_lib
 test = setuptools.command.test:test
-install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
 register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
 build_ext = setuptools.command.build_ext:build_ext
-setopt = setuptools.command.setopt:setopt
 easy_install = setuptools.command.easy_install:easy_install
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
-rotate = setuptools.command.rotate:rotate
-sdist = setuptools.command.sdist:sdist
 alias = setuptools.command.alias:alias
-saveopts = setuptools.command.saveopts:saveopts
-build_py = setuptools.command.build_py:build_py
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9a6bf43731..4fd464d812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 3b3dacb9af..d980f276af 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.0'
+__version__ = '2.1'

From ac8e93fa52d31e906391b937d9cfe98b3b98874d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Dec 2013 09:11:53 -0500
Subject: [PATCH 1694/8469] Remove unreachable code

---
 pkg_resources.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 36a7b3069e..4a69564a26 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1225,7 +1225,6 @@ def interpret(nodelist):
             op = _ops[nodelist[0]]
         except KeyError:
             raise SyntaxError("Comparison or logical expression expected")
-            raise SyntaxError("Language feature not supported in environment markers: "+symbol.sym_name[nodelist[0]])
         return op(nodelist)
 
     def evaluate(nodelist):

From 6dd1517317b3457df2370ac8bd9e0d070251e2bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Dec 2013 09:12:03 -0500
Subject: [PATCH 1695/8469] Remove commented code

---
 pkg_resources.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4a69564a26..cf81e7523b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1231,7 +1231,6 @@ def evaluate(nodelist):
         while len(nodelist)==2: nodelist = nodelist[1]
         kind = nodelist[0]
         name = nodelist[1]
-        #while len(name)==2: name = name[1]
         if kind==NAME:
             try:
                 op = _marker_values[name]

From 706797871041656997c422c76db0e834c9aa6b55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Dec 2013 10:00:57 -0500
Subject: [PATCH 1696/8469] Remove _marker_names (unused)

---
 pkg_resources.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index cf81e7523b..31411d22ba 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1103,12 +1103,6 @@ def to_filename(name):
     """
     return name.replace('-','_')
 
-_marker_names = {
-    'os': ['name'], 'sys': ['platform'],
-    'platform': ['version','machine','python_implementation'],
-    'python_version': [], 'python_full_version': [], 'extra':[],
-}
-
 _marker_values = {
     'os_name': lambda: os.name,
     'sys_platform': lambda: sys.platform,

From 5dfdad23a56b4187222274785b6ed9a7996a92e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Dec 2013 10:05:17 -0500
Subject: [PATCH 1697/8469] Encapsulate marker evaluation functionality in a
 class.

---
 pkg_resources.py | 212 ++++++++++++++++++++++++++---------------------
 1 file changed, 116 insertions(+), 96 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 31411d22ba..42b20e3a7f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -24,6 +24,9 @@
 import stat
 import functools
 import pkgutil
+import token
+import symbol
+import operator
 from pkgutil import get_importer
 
 try:
@@ -1103,16 +1106,6 @@ def to_filename(name):
     """
     return name.replace('-','_')
 
-_marker_values = {
-    'os_name': lambda: os.name,
-    'sys_platform': lambda: sys.platform,
-    'python_full_version': lambda: sys.version.split()[0],
-    'python_version': lambda:'%s.%s' % (sys.version_info[0], sys.version_info[1]),
-    'platform_version': lambda: _platinfo('version'),
-    'platform_machine': lambda: _platinfo('machine'),
-    'python_implementation': lambda: _platinfo('python_implementation') or _pyimp(),
-}
-
 def _platinfo(attr):
     try:
         import platform
@@ -1130,108 +1123,133 @@ def _pyimp():
     else:
         return 'CPython'
 
-def normalize_exception(exc):
-    """
-    Given a SyntaxError from a marker evaluation, normalize the error message:
-     - Remove indications of filename and line number.
-     - Replace platform-specific error messages with standard error messages.
-    """
-    subs = {
-        'unexpected EOF while parsing': 'invalid syntax',
-        'parenthesis is never closed': 'invalid syntax',
+
+class MarkerEvaluation(object):
+    values = {
+        'os_name': lambda: os.name,
+        'sys_platform': lambda: sys.platform,
+        'python_full_version': lambda: sys.version.split()[0],
+        'python_version': lambda:'%s.%s' % (sys.version_info[0], sys.version_info[1]),
+        'platform_version': lambda: _platinfo('version'),
+        'platform_machine': lambda: _platinfo('machine'),
+        'python_implementation': lambda: _platinfo('python_implementation') or _pyimp(),
     }
-    exc.filename = None
-    exc.lineno = None
-    exc.msg = subs.get(exc.msg, exc.msg)
-    return exc
 
+    @classmethod
+    def is_invalid_marker(cls, text):
+        """
+        Validate text as a PEP 426 environment marker; return an exception
+        if invalid or False otherwise.
+        """
+        try:
+            cls.evaluate_marker(text)
+        except SyntaxError:
+            return cls.normalize_exception(sys.exc_info()[1])
+        return False
 
-def invalid_marker(text):
-    """Validate text as a PEP 426 environment marker; return exception or False"""
-    try:
-        evaluate_marker(text)
-    except SyntaxError:
-        return normalize_exception(sys.exc_info()[1])
-    return False
+    @staticmethod
+    def normalize_exception(exc):
+        """
+        Given a SyntaxError from a marker evaluation, normalize the error message:
+         - Remove indications of filename and line number.
+         - Replace platform-specific error messages with standard error messages.
+        """
+        subs = {
+            'unexpected EOF while parsing': 'invalid syntax',
+            'parenthesis is never closed': 'invalid syntax',
+        }
+        exc.filename = None
+        exc.lineno = None
+        exc.msg = subs.get(exc.msg, exc.msg)
+        return exc
+
+    @classmethod
+    def and_test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        return functools.reduce(operator.and_, [cls.interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+
+    @classmethod
+    def test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        return functools.reduce(operator.or_, [cls.interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+
+    @classmethod
+    def atom(cls, nodelist):
+        t = nodelist[1][0]
+        if t == token.LPAR:
+            if nodelist[2][0] == token.RPAR:
+                raise SyntaxError("Empty parentheses")
+            return cls.interpret(nodelist[2])
+        raise SyntaxError("Language feature not supported in environment markers")
 
-def evaluate_marker(text, extra=None, _ops={}):
-    """
-    Evaluate a PEP 426 environment marker on CPython 2.4+.
-    Return a boolean indicating the marker result in this environment.
-    Raise SyntaxError if marker is invalid.
+    @classmethod
+    def comparison(cls, nodelist):
+        if len(nodelist)>4:
+            raise SyntaxError("Chained comparison not allowed in environment markers")
+        comp = nodelist[2][1]
+        cop = comp[1]
+        if comp[0] == token.NAME:
+            if len(nodelist[2]) == 3:
+                if cop == 'not':
+                    cop = 'not in'
+                else:
+                    cop = 'is not'
+        try:
+            cop = cls.get_op(cop)
+        except KeyError:
+            raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
+        return cop(cls.evaluate(nodelist[1]), cls.evaluate(nodelist[3]))
+
+    @classmethod
+    def get_op(cls, op):
+        ops = {
+            symbol.test: cls.test,
+            symbol.and_test: cls.and_test,
+            symbol.atom: cls.atom,
+            symbol.comparison: cls.comparison,
+            'not in': lambda x, y: x not in y,
+            'in': lambda x, y: x in y,
+            '==': operator.eq,
+            '!=': operator.ne,
+        }
+        if hasattr(symbol, 'or_test'):
+            ops[symbol.or_test] = cls.test
+        return ops[op]
+
+    @classmethod
+    def evaluate_marker(cls, text, extra=None):
+        """
+        Evaluate a PEP 426 environment marker on CPython 2.4+.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
 
-    This implementation uses the 'parser' module, which is not implemented on
-    Jython and has been superseded by the 'ast' module in Python 2.6 and
-    later.
-    """
+        This implementation uses the 'parser' module, which is not implemented on
+        Jython and has been superseded by the 'ast' module in Python 2.6 and
+        later.
+        """
+        return cls.interpret(parser.expr(text).totuple(1)[1])
 
-    if not _ops:
-
-        from token import NAME, STRING
-        import token
-        import symbol
-        import operator
-
-        def and_test(nodelist):
-            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return functools.reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
-        def test(nodelist):
-            # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-            return functools.reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
-        def atom(nodelist):
-            t = nodelist[1][0]
-            if t == token.LPAR:
-                if nodelist[2][0] == token.RPAR:
-                    raise SyntaxError("Empty parentheses")
-                return interpret(nodelist[2])
-            raise SyntaxError("Language feature not supported in environment markers")
-
-        def comparison(nodelist):
-            if len(nodelist)>4:
-                raise SyntaxError("Chained comparison not allowed in environment markers")
-            comp = nodelist[2][1]
-            cop = comp[1]
-            if comp[0] == NAME:
-                if len(nodelist[2]) == 3:
-                    if cop == 'not':
-                        cop = 'not in'
-                    else:
-                        cop = 'is not'
-            try:
-                cop = _ops[cop]
-            except KeyError:
-                raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
-            return cop(evaluate(nodelist[1]), evaluate(nodelist[3]))
-
-        _ops.update({
-            symbol.test: test, symbol.and_test: and_test, symbol.atom: atom,
-            symbol.comparison: comparison, 'not in': lambda x,y: x not in y,
-            'in': lambda x,y: x in y, '==': operator.eq, '!=': operator.ne,
-        })
-        if hasattr(symbol,'or_test'):
-            _ops[symbol.or_test] = test
-
-    def interpret(nodelist):
+    @classmethod
+    def interpret(cls, nodelist):
         while len(nodelist)==2: nodelist = nodelist[1]
         try:
-            op = _ops[nodelist[0]]
+            op = cls.get_op(nodelist[0])
         except KeyError:
             raise SyntaxError("Comparison or logical expression expected")
         return op(nodelist)
 
-    def evaluate(nodelist):
+    @classmethod
+    def evaluate(cls, nodelist):
         while len(nodelist)==2: nodelist = nodelist[1]
         kind = nodelist[0]
         name = nodelist[1]
-        if kind==NAME:
+        if kind==token.NAME:
             try:
-                op = _marker_values[name]
+                op = cls.values[name]
             except KeyError:
                 raise SyntaxError("Unknown name %r" % name)
             return op()
-        if kind==STRING:
+        if kind==token.STRING:
             s = nodelist[1]
             if s[:1] not in "'\"" or s.startswith('"""') or s.startswith("'''") \
                     or '\\' in s:
@@ -1240,8 +1258,6 @@ def evaluate(nodelist):
             return s[1:-1]
         raise SyntaxError("Language feature not supported in environment markers")
 
-    return interpret(parser.expr(text).totuple(1)[1])
-
 def _markerlib_evaluate(text):
     """
     Evaluate a PEP 426 environment marker using markerlib.
@@ -1262,7 +1278,11 @@ def _markerlib_evaluate(text):
         raise SyntaxError(e.args[0])
     return result
 
-if 'parser' not in globals():
+invalid_marker = MarkerEvaluation.is_invalid_marker
+
+if 'parser' in globals():
+    evaluate_marker = MarkerEvaluation.evaluate_marker
+else:
     # fallback to less-complete _markerlib implementation if 'parser' module
     #  is not available.
     evaluate_marker = _markerlib_evaluate

From 02a2d475691af0932df4306b24d101b2880f2e79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Dec 2013 10:07:17 -0500
Subject: [PATCH 1698/8469] Remove compatibility functions for platform
 information.

---
 pkg_resources.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 42b20e3a7f..c6228545d2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -27,6 +27,7 @@
 import token
 import symbol
 import operator
+import platform
 from pkgutil import get_importer
 
 try:
@@ -1106,23 +1107,6 @@ def to_filename(name):
     """
     return name.replace('-','_')
 
-def _platinfo(attr):
-    try:
-        import platform
-    except ImportError:
-        return ''
-    return getattr(platform, attr, lambda:'')()
-
-def _pyimp():
-    if sys.platform=='cli':
-        return 'IronPython'
-    elif sys.platform.startswith('java'):
-        return 'Jython'
-    elif '__pypy__' in sys.builtin_module_names:
-        return 'PyPy'
-    else:
-        return 'CPython'
-
 
 class MarkerEvaluation(object):
     values = {
@@ -1130,9 +1114,9 @@ class MarkerEvaluation(object):
         'sys_platform': lambda: sys.platform,
         'python_full_version': lambda: sys.version.split()[0],
         'python_version': lambda:'%s.%s' % (sys.version_info[0], sys.version_info[1]),
-        'platform_version': lambda: _platinfo('version'),
-        'platform_machine': lambda: _platinfo('machine'),
-        'python_implementation': lambda: _platinfo('python_implementation') or _pyimp(),
+        'platform_version': platform.version,
+        'platform_machine': platform.machine,
+        'python_implementation': platform.python_implementation,
     }
 
     @classmethod

From 37d5f8a96d4708b336fc8c6655ef4b0789afd6ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Dec 2013 22:10:07 -0500
Subject: [PATCH 1699/8469] Correct regression in upload_docs in syntax
 adjustment. Fixes #124.

---
 CHANGES.txt                       | 6 ++++++
 setuptools/command/upload_docs.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 90e2aaa8fd..0f5873344d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+2.0.1
+-----
+
+* Issue #124: Fixed error in list detection in upload_docs.
+
 ---
 2.0
 ---
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 8ee35cb039..cad7a52d1b 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -127,7 +127,7 @@ def upload_file(self, filename):
         for key, values in iteritems(data):
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
-            if isinstance(values, list):
+            if not isinstance(values, list):
                 values = [values]
             for value in values:
                 if type(value) is tuple:

From 5b632217631edcc9c9ea1d401d4537869f7a5c2f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Dec 2013 22:26:26 -0500
Subject: [PATCH 1700/8469] Bumped to 2.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 371000f9bd..b8abb6f4ea 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1"
+DEFAULT_VERSION = "2.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index d980f276af..3f3907994a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1'
+__version__ = '2.0.1'

From 07b44aac6d5ae27e1a7ca7ffdbb17419e284d7bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Dec 2013 22:35:29 -0500
Subject: [PATCH 1701/8469] Require wheel in release script

---
 release.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.py b/release.py
index 3dbfac24ba..c5e8debbc9 100644
--- a/release.py
+++ b/release.py
@@ -10,6 +10,7 @@
 import pkg_resources
 
 pkg_resources.require('jaraco.packaging>=2.0')
+pkg_resources.require('wheel')
 
 
 def before_upload():

From b0371f722a076a35d4b5a0c271c5f2d870430c93 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Dec 2013 22:35:53 -0500
Subject: [PATCH 1702/8469] Added tag 2.0.1 for changeset bbdba51e1bc1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 528c2336f7..5cd010da8f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -111,3 +111,4 @@ a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1
 274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2
 0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0
+bbdba51e1bc1779728ed351529252f73543ace65 2.0.1

From 074f677e7212f97c4b3774b9c0d26c68ac4a92fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Dec 2013 22:37:16 -0500
Subject: [PATCH 1703/8469] Bumped to 2.0.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 82 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b8abb6f4ea..fca25de9ca 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.0.1"
+DEFAULT_VERSION = "2.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 23b577f60a..0b71cbdfd5 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
 [distutils.setup_keywords]
+use_2to3 = setuptools.dist:assert_bool
 convert_2to3_doctests = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-exclude_package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
 entry_points = setuptools.dist:check_entry_points
-dependency_links = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
 test_suite = setuptools.dist:check_test_suite
+packages = setuptools.dist:check_packages
 namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
+exclude_package_data = setuptools.dist:check_package_data
+tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
 eager_resources = setuptools.dist:assert_string_list
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-entry_points.txt = setuptools.command.egg_info:write_entries
-
 [distutils.commands]
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
 egg_info = setuptools.command.egg_info:egg_info
 saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
 rotate = setuptools.command.rotate:rotate
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-upload_docs = setuptools.command.upload_docs:upload_docs
-build_py = setuptools.command.build_py:build_py
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install = setuptools.command.install:install
 setopt = setuptools.command.setopt:setopt
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_ext = setuptools.command.build_ext:build_ext
 test = setuptools.command.test:test
-install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
 register = setuptools.command.register:register
-build_ext = setuptools.command.build_ext:build_ext
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+install_lib = setuptools.command.install_lib:install_lib
+install_scripts = setuptools.command.install_scripts:install_scripts
+sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
 easy_install = setuptools.command.easy_install:easy_install
-alias = setuptools.command.alias:alias
-install = setuptools.command.install:install
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+develop = setuptools.command.develop:develop
+build_py = setuptools.command.build_py:build_py
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 
 [console_scripts]
+easy_install-3.4 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fd464d812..9a6bf43731 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 3f3907994a..668c3446ee 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.0.1'
+__version__ = '2.0.2'

From a606f1f9b98810666dea3682e7def0d322988b3b Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 17 Dec 2013 09:27:37 -0500
Subject: [PATCH 1704/8469] ENH: use #!/usr/bin/env python for the shebang
 instead of non-working on POSIX systems plain #!python

---
 ez_setup.py                        | 2 +-
 setuptools/command/easy_install.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index fca25de9ca..9dd695a1d1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python
 """Bootstrap setuptools installation
 
 To use setuptools in your package's setup.py, include this
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9775bffcc2..08ebf3e589 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python
 
 """
 Easy Install

From 03882a7d0d48dd842f95a2644d33f63d31f1e8a8 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Fri, 20 Dec 2013 22:09:39 +0100
Subject: [PATCH 1705/8469] Fix NameError during installation with Python
 implementations (e.g. Jython) not containing parser module.

---
 CHANGES.txt      |  7 +++++++
 pkg_resources.py | 54 ++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0f5873344d..2db678f777 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+2.0.2
+-----
+
+* Fix NameError during installation with Python implementations (e.g. Jython)
+  not containing parser module.
+
 -----
 2.0.1
 -----
diff --git a/pkg_resources.py b/pkg_resources.py
index c6228545d2..efe5d34d77 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1213,6 +1213,32 @@ def evaluate_marker(cls, text, extra=None):
         """
         return cls.interpret(parser.expr(text).totuple(1)[1])
 
+    @classmethod
+    def _markerlib_evaluate(cls, text):
+        """
+        Evaluate a PEP 426 environment marker using markerlib.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
+        """
+        import _markerlib
+        # markerlib implements Metadata 1.2 (PEP 345) environment markers.
+        # Translate the variables to Metadata 2.0 (PEP 426).
+        env = _markerlib.default_environment()
+        for key in env.keys():
+            new_key = key.replace('.', '_')
+            env[new_key] = env.pop(key)
+        try:
+            result = _markerlib.interpret(text, env)
+        except NameError:
+            e = sys.exc_info()[1]
+            raise SyntaxError(e.args[0])
+        return result
+
+    if 'parser' not in globals():
+        # Fall back to less-complete _markerlib implementation if 'parser' module
+        # is not available.
+        evaluate_marker = _markerlib_evaluate
+
     @classmethod
     def interpret(cls, nodelist):
         while len(nodelist)==2: nodelist = nodelist[1]
@@ -1242,34 +1268,8 @@ def evaluate(cls, nodelist):
             return s[1:-1]
         raise SyntaxError("Language feature not supported in environment markers")
 
-def _markerlib_evaluate(text):
-    """
-    Evaluate a PEP 426 environment marker using markerlib.
-    Return a boolean indicating the marker result in this environment.
-    Raise SyntaxError if marker is invalid.
-    """
-    import _markerlib
-    # markerlib implements Metadata 1.2 (PEP 345) environment markers.
-    # Translate the variables to Metadata 2.0 (PEP 426).
-    env = _markerlib.default_environment()
-    for key in env.keys():
-        new_key = key.replace('.', '_')
-        env[new_key] = env.pop(key)
-    try:
-        result = _markerlib.interpret(text, env)
-    except NameError:
-        e = sys.exc_info()[1]
-        raise SyntaxError(e.args[0])
-    return result
-
 invalid_marker = MarkerEvaluation.is_invalid_marker
-
-if 'parser' in globals():
-    evaluate_marker = MarkerEvaluation.evaluate_marker
-else:
-    # fallback to less-complete _markerlib implementation if 'parser' module
-    #  is not available.
-    evaluate_marker = _markerlib_evaluate
+evaluate_marker = MarkerEvaluation.evaluate_marker
 
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""

From 379096d8a1e4be86f8b2e36a0ec66fa75e2edbb8 Mon Sep 17 00:00:00 2001
From: Menghan Zheng <menghan412@gmail.com>
Date: Tue, 24 Dec 2013 14:16:43 +0800
Subject: [PATCH 1706/8469] fix setuptools don't search download location in
 dependency_links bug

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0e51b72c55..167c34e5b4 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -582,8 +582,9 @@ def find(req, env=None):
         if local_index is not None:
             dist = dist or find(requirement, local_index)
 
-        if dist is None and self.to_scan is not None:
-            self.prescan()
+        if dist is None:
+            if self.to_scan is not None:
+                self.prescan()
             dist = find(requirement)
 
         if dist is None and not force_scan:

From caa91ca543b5f68074da8d8fd79e842bb9634cae Mon Sep 17 00:00:00 2001
From: William Grzybowski <wg@FreeBSD.org>
Date: Wed, 25 Dec 2013 10:34:02 +0000
Subject: [PATCH 1707/8469] Fix postproc reference

--HG--
branch : postproc
---
 setuptools/command/sdist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 6249e75c63..77a3852b96 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -35,10 +35,10 @@ def _finder(self, dirname, filename):
             f.close()
         for match in self.pattern.finditer(data):
             path = match.group(1)
-            if postproc:
+            if self.postproc:
                 #postproc used to be used when the svn finder
                 #was an re_finder for calling unescape
-                path = postproc(path)
+                path = self.postproc(path)
             yield svn_utils.joinpath(dirname,path)
     def __call__(self, dirname=''):
         path = svn_utils.joinpath(dirname, self.path)

From e94241196cc546ab4a65b125066c7fab629b8fd3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2013 10:36:02 -0500
Subject: [PATCH 1708/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2db678f777..1ced30f823 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Fix NameError during installation with Python implementations (e.g. Jython)
   not containing parser module.
+* Fix NameError in ``sdist:re_finder``.
 
 -----
 2.0.1

From a47d7746390d4e787115c629a98c5dfbf0c7246b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2013 10:39:48 -0500
Subject: [PATCH 1709/8469] Added tag 2.0.2 for changeset 5a62ac60ba31

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5cd010da8f..fb95f12667 100644
--- a/.hgtags
+++ b/.hgtags
@@ -112,3 +112,4 @@ a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2
 0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0
 bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
+5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2

From 465f771654baf972034a4e21648bac48ec132f3d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2013 10:41:44 -0500
Subject: [PATCH 1710/8469] Bumped to 2.0.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 98 ++++++++++++++--------------
 setuptools/version.py                |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9dd695a1d1..1149df8108 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.0.2"
+DEFAULT_VERSION = "2.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 0b71cbdfd5..1a9b384948 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.setup_keywords]
-use_2to3 = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-packages = setuptools.dist:check_packages
-namespace_packages = setuptools.dist:check_nsp
-exclude_package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
-dependency_links = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-
-[distutils.commands]
-egg_info = setuptools.command.egg_info:egg_info
-saveopts = setuptools.command.saveopts:saveopts
-rotate = setuptools.command.rotate:rotate
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install = setuptools.command.install:install
-setopt = setuptools.command.setopt:setopt
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-alias = setuptools.command.alias:alias
-register = setuptools.command.register:register
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-install_lib = setuptools.command.install_lib:install_lib
-install_scripts = setuptools.command.install_scripts:install_scripts
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-easy_install = setuptools.command.easy_install:easy_install
-develop = setuptools.command.develop:develop
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-
 [console_scripts]
-easy_install-3.4 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 requires.txt = setuptools.command.egg_info:write_requirements
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+
+[distutils.setup_keywords]
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
+install_requires = setuptools.dist:check_requirements
+include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+dependency_links = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+use_2to3 = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[distutils.commands]
+sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+build_py = setuptools.command.build_py:build_py
+easy_install = setuptools.command.easy_install:easy_install
+develop = setuptools.command.develop:develop
+build_ext = setuptools.command.build_ext:build_ext
+rotate = setuptools.command.rotate:rotate
+egg_info = setuptools.command.egg_info:egg_info
+install_lib = setuptools.command.install_lib:install_lib
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
+install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
+upload_docs = setuptools.command.upload_docs:upload_docs
+setopt = setuptools.command.setopt:setopt
+saveopts = setuptools.command.saveopts:saveopts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install = setuptools.command.install:install
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 668c3446ee..e7c12d2851 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '2.0.3'

From b7b28d118a55f4738c593055b9fcc30c2e8b4b59 Mon Sep 17 00:00:00 2001
From: Marcus Smith <qwcode@gmail.com>
Date: Sat, 4 Jan 2014 18:58:03 -0800
Subject: [PATCH 1711/8469] convert "find_in_zip" into "find_eggs_in_zip" to
 prevent it from walking whl files this specifically prevents a failure when
 wheels are nested under an egg dir
 https://bitbucket.org/pypa/setuptools/issue/129

--HG--
branch : zip_path
---
 pkg_resources.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index efe5d34d77..39881b56b5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1717,7 +1717,14 @@ def find_distributions(path_item, only=False):
     finder = _find_adapter(_distribution_finders, importer)
     return finder(importer, path_item, only)
 
-def find_in_zip(importer, path_item, only=False):
+def find_eggs_in_zip(importer, path_item, only=False):
+    """
+    Find eggs in zip files; possibly multiple nested eggs.
+    """
+    if importer.archive.endswith('.whl'):
+        # wheels are not supported with this finder
+        # they don't have PKG-INFO metadata, and won't ever contain eggs
+        return
     metadata = EggMetadata(importer)
     if metadata.has_metadata('PKG-INFO'):
         yield Distribution.from_filename(path_item, metadata=metadata)
@@ -1726,10 +1733,10 @@ def find_in_zip(importer, path_item, only=False):
     for subitem in metadata.resource_listdir('/'):
         if subitem.endswith('.egg'):
             subpath = os.path.join(path_item, subitem)
-            for dist in find_in_zip(zipimport.zipimporter(subpath), subpath):
+            for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
                 yield dist
 
-register_finder(zipimport.zipimporter, find_in_zip)
+register_finder(zipimport.zipimporter, find_eggs_in_zip)
 
 def find_nothing(importer, path_item, only=False):
     return ()

From 818e80e00093764b261ac4c2595aedb9f194cf0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Jan 2014 12:31:44 -0500
Subject: [PATCH 1712/8469] Fix Python 3 failure when constructing an
 egg_fetcher. Fixes #131.

---
 CHANGES.txt        | 6 ++++++
 setuptools/dist.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ced30f823..83081957cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+2.0.3
+-----
+
+* Issue #131: Fix RuntimeError when constructing an egg fetcher.
+
 -----
 2.0.2
 -----
diff --git a/setuptools/dist.py b/setuptools/dist.py
index c5b02f99f4..3126cb96dd 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -295,7 +295,7 @@ def fetch_build_egg(self, req):
                 'find_links', 'site_dirs', 'index_url', 'optimize',
                 'site_dirs', 'allow_hosts'
             )
-            for key in opts.keys():
+            for key in list(opts):
                 if key not in keep:
                     del opts[key]   # don't use any other settings
             if self.dependency_links:

From e81800c109d87617f2c82a4f53a565f9c26e0614 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Jan 2014 10:21:11 -0500
Subject: [PATCH 1713/8469] Remove excess whitespace

--HG--
extra : rebase_source : 4d1b9f2354d8966b2bd8c375662e5f29817adbb3
---
 setuptools/command/install.py | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 247c4f259c..459cd3cd59 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -1,4 +1,6 @@
-import setuptools, sys, glob
+import setuptools
+import sys
+import glob
 from distutils.command.install import install as _install
 from distutils.errors import DistutilsArgError
 
@@ -15,7 +17,7 @@ class install(_install):
     ]
     new_commands = [
         ('install_egg_info', lambda self: True),
-        ('install_scripts',  lambda self: True),
+        ('install_scripts', lambda self: True),
     ]
     _nc = dict(new_commands)
 
@@ -46,7 +48,6 @@ def handle_extra_path(self):
         self.path_file = None
         self.extra_dirs = ''
 
-
     def run(self):
         # Explicit request for old-style install?  Just do it
         if self.old_and_unmanageable or self.single_version_externally_managed:
@@ -72,11 +73,6 @@ def run(self):
         else:
             self.do_egg_install()
 
-
-
-
-
-
     def do_egg_install(self):
 
         easy_install = self.distribution.get_command_class('easy_install')
@@ -105,20 +101,3 @@ def do_egg_install(self):
 install.sub_commands = [
         cmd for cmd in _install.sub_commands if cmd[0] not in install._nc
     ] + install.new_commands
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#

From 40a5af7a50dc95b31da4745912c6f0aa016fb820 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Jan 2014 20:22:51 -0500
Subject: [PATCH 1714/8469] Update changelog

---
 CHANGES.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 83081957cf..d3ba1ee5c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
------
-2.0.3
------
+---
+2.1
+---
 
+* Issue #129: Suppress inspection of '*.whl' files when searching for files
+  in a zip-imported file.
 * Issue #131: Fix RuntimeError when constructing an egg fetcher.
 
 -----

From 16d7da6bfd5995009e65787aad8bb71112b24156 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Jan 2014 21:23:41 -0500
Subject: [PATCH 1715/8469] Use native decorator syntax in pkg_resources

---
 pkg_resources.py | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 39881b56b5..4bc05e57f5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1,4 +1,5 @@
-"""Package resource API
+"""
+Package resource API
 --------------------
 
 A resource is a logical file contained within a package, or a logical
@@ -2039,7 +2040,7 @@ def require(self, env=None, installer=None):
         list(map(working_set.add,
             working_set.resolve(self.dist.requires(self.extras),env,installer)))
 
-    #@classmethod
+    @classmethod
     def parse(cls, src, dist=None):
         """Parse a single entry point from string `src`
 
@@ -2071,9 +2072,7 @@ def parse(cls, src, dist=None):
         else:
             return cls(name.strip(), value.strip(), attrs, extras, dist)
 
-    parse = classmethod(parse)
-
-    #@classmethod
+    @classmethod
     def parse_group(cls, group, lines, dist=None):
         """Parse an entry point group"""
         if not MODULE(group):
@@ -2086,9 +2085,7 @@ def parse_group(cls, group, lines, dist=None):
             this[ep.name]=ep
         return this
 
-    parse_group = classmethod(parse_group)
-
-    #@classmethod
+    @classmethod
     def parse_map(cls, data, dist=None):
         """Parse a map of entry point groups"""
         if isinstance(data,dict):
@@ -2107,8 +2104,6 @@ def parse_map(cls, data, dist=None):
             maps[group] = cls.parse_group(group, lines, dist)
         return maps
 
-    parse_map = classmethod(parse_map)
-
 
 def _remove_md5_fragment(location):
     if not location:
@@ -2135,7 +2130,7 @@ def __init__(self, location=None, metadata=None, project_name=None,
         self.precedence = precedence
         self._provider = metadata or empty_provider
 
-    #@classmethod
+    @classmethod
     def from_location(cls,location,basename,metadata=None,**kw):
         project_name, version, py_version, platform = [None]*4
         basename, ext = os.path.splitext(basename)
@@ -2151,7 +2146,6 @@ def from_location(cls,location,basename,metadata=None,**kw):
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
         )
-    from_location = classmethod(from_location)
 
     hashcmp = property(
         lambda self: (
@@ -2184,16 +2178,15 @@ def __ne__(self, other):
     # metadata until/unless it's actually needed.  (i.e., some distributions
     # may not know their name or version without loading PKG-INFO)
 
-    #@property
+    @property
     def key(self):
         try:
             return self._key
         except AttributeError:
             self._key = key = self.project_name.lower()
             return key
-    key = property(key)
 
-    #@property
+    @property
     def parsed_version(self):
         try:
             return self._parsed_version
@@ -2201,9 +2194,7 @@ def parsed_version(self):
             self._parsed_version = pv = parse_version(self.version)
             return pv
 
-    parsed_version = property(parsed_version)
-
-    #@property
+    @property
     def version(self):
         try:
             return self._version
@@ -2216,9 +2207,8 @@ def version(self):
                 raise ValueError(
                     "Missing 'Version:' header and/or %s file" % self.PKG_INFO, self
                 )
-    version = property(version)
 
-    #@property
+    @property
     def _dep_map(self):
         try:
             return self.__dep_map
@@ -2236,7 +2226,6 @@ def _dep_map(self):
                         extra = safe_extra(extra) or None
                     dm.setdefault(extra,[]).extend(parse_requirements(reqs))
             return dm
-    _dep_map = property(_dep_map)
 
     def requires(self,extras=()):
         """List of Requirements needed for this distro if `extras` are used"""
@@ -2294,13 +2283,12 @@ def __getattr__(self,attr):
             raise AttributeError(attr)
         return getattr(self._provider, attr)
 
-    #@classmethod
+    @classmethod
     def from_filename(cls,filename,metadata=None, **kw):
         return cls.from_location(
             _normalize_cached(filename), os.path.basename(filename), metadata,
             **kw
         )
-    from_filename = classmethod(from_filename)
 
     def as_requirement(self):
         """Return a ``Requirement`` that matches this distribution exactly"""
@@ -2407,10 +2395,9 @@ def clone(self,**kw):
         kw.setdefault('metadata', self._provider)
         return self.__class__(**kw)
 
-    #@property
+    @property
     def extras(self):
         return [dep for dep in self._dep_map if dep]
-    extras = property(extras)
 
 
 class DistInfoDistribution(Distribution):
@@ -2614,7 +2601,7 @@ def __hash__(self):
 
     def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
-    #@staticmethod
+    @staticmethod
     def parse(s):
         reqs = list(parse_requirements(s))
         if reqs:
@@ -2623,8 +2610,6 @@ def parse(s):
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
 
-    parse = staticmethod(parse)
-
 state_machine = {
     #       =><
     '<': '--T',

From e393331c51ab99ce33d9dfbbf88fb3b6f6081f4b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jan 2014 21:17:33 +0000
Subject: [PATCH 1716/8469] Bumped to 2.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1149df8108..ba03f0a7d7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.0.3"
+DEFAULT_VERSION = "2.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index e7c12d2851..d980f276af 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.0.3'
+__version__ = '2.1'

From 379e0d4914f42134dd26d570be33ca3e41caed6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jan 2014 21:17:37 +0000
Subject: [PATCH 1717/8469] Added tag 2.1 for changeset c49c651997eb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fb95f12667..2de8cd9986 100644
--- a/.hgtags
+++ b/.hgtags
@@ -113,3 +113,4 @@ a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0
 bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
 5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
+c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1

From bdea417e6e6f724447019e3e709c04b9249964f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jan 2014 21:19:08 +0000
Subject: [PATCH 1718/8469] Bumped to 2.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 80 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index ba03f0a7d7..a781d1d237 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1"
+DEFAULT_VERSION = "2.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 1a9b384948..6b10d6dcf4 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,3 +1,13 @@
+[egg_info.writers]
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.4 = setuptools.command.easy_install:main
@@ -5,58 +15,48 @@ easy_install-3.4 = setuptools.command.easy_install:main
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-
 [distutils.setup_keywords]
-test_loader = setuptools.dist:check_importable
-tests_require = setuptools.dist:check_requirements
-install_requires = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+dependency_links = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
 convert_2to3_doctests = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
 package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-dependency_links = setuptools.dist:assert_string_list
-exclude_package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
-entry_points = setuptools.dist:check_entry_points
-use_2to3 = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
 zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+entry_points = setuptools.dist:check_entry_points
+namespace_packages = setuptools.dist:check_nsp
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
 
 [distutils.commands]
-sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
-easy_install = setuptools.command.easy_install:easy_install
-develop = setuptools.command.develop:develop
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
+upload_docs = setuptools.command.upload_docs:upload_docs
 egg_info = setuptools.command.egg_info:egg_info
-install_lib = setuptools.command.install_lib:install_lib
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 register = setuptools.command.register:register
+install_lib = setuptools.command.install_lib:install_lib
 install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
-upload_docs = setuptools.command.upload_docs:upload_docs
-setopt = setuptools.command.setopt:setopt
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 saveopts = setuptools.command.saveopts:saveopts
+rotate = setuptools.command.rotate:rotate
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+develop = setuptools.command.develop:develop
+alias = setuptools.command.alias:alias
 install = setuptools.command.install:install
+build_ext = setuptools.command.build_ext:build_ext
+build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+easy_install = setuptools.command.easy_install:easy_install
+setopt = setuptools.command.setopt:setopt
+test = setuptools.command.test:test
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9a6bf43731..4fd464d812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index d980f276af..2b9ccf1770 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1'
+__version__ = '2.2'

From 14c283c0f3ee785359863ab4a347b53ee6f192a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jan 2014 21:26:49 +0000
Subject: [PATCH 1719/8469] Correct RST syntax

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d3ba1ee5c4..a76a147b77 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 2.1
 ---
 
-* Issue #129: Suppress inspection of '*.whl' files when searching for files
+* Issue #129: Suppress inspection of ``*.whl`` files when searching for files
   in a zip-imported file.
 * Issue #131: Fix RuntimeError when constructing an egg fetcher.
 

From db9f0ca1c7741653a7b5ba538672172edf116876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2014 11:43:55 -0500
Subject: [PATCH 1720/8469] Add credit to Tarek for Distribute work.

--HG--
extra : rebase_source : 1a0e14224de7b1e289582a557aafb17e6164e8cf
---
 README.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.txt b/README.txt
index 0cc3dd42fc..ed1b41d47e 100755
--- a/README.txt
+++ b/README.txt
@@ -177,6 +177,10 @@ Credits
   "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
   use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
 
+* Tarek Ziadé is the principal author of the Distribute fork, which
+  re-invigorated the community on the project, encouraged renewed innovation,
+  and addressed many defects.
+
 * Since the merge with Distribute, Jason R. Coombs is the
   maintainer of setuptools.  The project is maintained in coordination with
   the Python Packaging Authority (PyPA) and the larger Python community.

From 1f261491243925164a2ff93be8a2e5c61b23a1e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2014 19:02:33 -0500
Subject: [PATCH 1721/8469] Correct usage in README. Fixes #136

--HG--
extra : rebase_source : f3c2a273556a2236d251c3d6ae49d96170b2db24
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index ed1b41d47e..6079c2e555 100755
--- a/README.txt
+++ b/README.txt
@@ -76,7 +76,7 @@ tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
 and run setup.py with any supported distutils and Setuptools options.
 For example::
 
-    setuptools-x.x$ python setup.py --prefix=/opt/setuptools
+    setuptools-x.x$ python setup.py install --prefix=/opt/setuptools
 
 Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section

From f547377479ff30d39a121b3ba1b753dcaf544eb2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jan 2014 20:08:10 -0500
Subject: [PATCH 1722/8469] Add docstring

---
 ez_setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index a781d1d237..1420c114df 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -34,6 +34,9 @@
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
+    """
+    Return True if the command succeeded.
+    """
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 

From 2c66805878d8f2b46241d8944e8b5af20eeeb9e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 27 Jan 2014 11:02:52 -0500
Subject: [PATCH 1723/8469] Backed out changeset: ef949e6e6de1, which was
 itself a backout of the fix for Distribute #323, so this backout restores
 that fix and also Fixes #141.

---
 pkg_resources.py                      |  39 +++++--
 setuptools/dist.py                    |   5 +-
 setuptools/tests/test_easy_install.py | 141 +++++++++++++++++++-------
 3 files changed, 135 insertions(+), 50 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4bc05e57f5..bde30989fe 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -504,7 +504,7 @@ def __iter__(self):
                     seen[key]=1
                     yield self.by_key[key]
 
-    def add(self, dist, entry=None, insert=True):
+    def add(self, dist, entry=None, insert=True, replace=False):
         """Add `dist` to working set, associated with `entry`
 
         If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
@@ -512,8 +512,9 @@ def add(self, dist, entry=None, insert=True):
         set's ``.entries`` (if it wasn't already present).
 
         `dist` is only added to the working set if it's for a project that
-        doesn't already have a distribution in the set.  If it's added, any
-        callbacks registered with the ``subscribe()`` method will be called.
+        doesn't already have a distribution in the set, unless `replace=True`.
+        If it's added, any callbacks registered with the ``subscribe()`` method
+        will be called.
         """
         if insert:
             dist.insert_on(self.entries, entry)
@@ -522,7 +523,7 @@ def add(self, dist, entry=None, insert=True):
             entry = dist.location
         keys = self.entry_keys.setdefault(entry,[])
         keys2 = self.entry_keys.setdefault(dist.location,[])
-        if dist.key in self.by_key:
+        if not replace and dist.key in self.by_key:
             return      # ignore hidden distros
 
         self.by_key[dist.key] = dist
@@ -532,7 +533,8 @@ def add(self, dist, entry=None, insert=True):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None):
+    def resolve(self, requirements, env=None, installer=None,
+            replace_conflicting=False):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -542,6 +544,12 @@ def resolve(self, requirements, env=None, installer=None):
         will be invoked with each requirement that cannot be met by an
         already-installed distribution; it should return a ``Distribution`` or
         ``None``.
+
+        Unless `replace_conflicting=True`, raises a VersionConflict exception if
+        any requirements are found on the path that have the correct name but
+        the wrong version.  Otherwise, if an `installer` is supplied it will be
+        invoked to obtain the correct version of the requirement and activate
+        it.
         """
 
         requirements = list(requirements)[::-1]  # set up the stack
@@ -558,10 +566,18 @@ def resolve(self, requirements, env=None, installer=None):
             if dist is None:
                 # Find the best distribution and add it to the map
                 dist = self.by_key.get(req.key)
-                if dist is None:
+                if dist is None or (dist not in req and replace_conflicting):
+                    ws = self
                     if env is None:
-                        env = Environment(self.entries)
-                    dist = best[req.key] = env.best_match(req, self, installer)
+                        if dist is None:
+                            env = Environment(self.entries)
+                        else:
+                            # Use an empty environment and workingset to avoid
+                            # any further conflicts with the conflicting
+                            # distribution
+                            env = Environment([])
+                            ws = WorkingSet([])
+                    dist = best[req.key] = env.best_match(req, ws, installer)
                     if dist is None:
                         #msg = ("The '%s' distribution was not found on this "
                         #       "system, and is required by this application.")
@@ -1811,6 +1827,7 @@ def namespace_handler(importer,path_entry,moduleName,module):
 
 def _handle_ns(packageName, path_item):
     """Ensure that named package includes a subpath of path_item (if needed)"""
+
     importer = get_importer(path_item)
     if importer is None:
         return None
@@ -1825,12 +1842,14 @@ def _handle_ns(packageName, path_item):
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
     handler = _find_adapter(_namespace_handlers, importer)
-    subpath = handler(importer,path_item,packageName,module)
+    subpath = handler(importer, path_item, packageName, module)
     if subpath is not None:
         path = module.__path__
         path.append(subpath)
         loader.load_module(packageName)
-        module.__path__ = path
+        for path_item in path:
+            if path_item not in module.__path__:
+                module.__path__.append(path_item)
     return subpath
 
 def declare_namespace(packageName):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 3126cb96dd..0801ae74ff 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -260,9 +260,10 @@ def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         from pkg_resources import working_set, parse_requirements
         for dist in working_set.resolve(
-            parse_requirements(requires), installer=self.fetch_build_egg
+            parse_requirements(requires), installer=self.fetch_build_egg,
+            replace_conflicting=True
         ):
-            working_set.add(dist)
+            working_set.add(dist, replace=True)
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a90ae23fc1..8c797d550a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -19,8 +19,10 @@
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
+from pkg_resources import working_set, VersionConflict
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
+import pkg_resources
 
 class FakeDist(object):
     def get_entry_map(self, group):
@@ -230,47 +232,15 @@ def test_setup_requires(self):
         SandboxViolation.
         """
 
-        test_setup_attrs = {
-            'name': 'test_pkg', 'version': '0.0',
-            'setup_requires': ['foobar'],
-            'dependency_links': [os.path.abspath(self.dir)]
-        }
-
-        test_pkg = os.path.join(self.dir, 'test_pkg')
+        test_pkg = create_setup_requires_package(self.dir)
         test_setup_py = os.path.join(test_pkg, 'setup.py')
-        os.mkdir(test_pkg)
-
-        f = open(test_setup_py, 'w')
-        f.write(textwrap.dedent("""\
-            import setuptools
-            setuptools.setup(**%r)
-        """ % test_setup_attrs))
-        f.close()
 
-        foobar_path = os.path.join(self.dir, 'foobar-0.1.tar.gz')
-        make_trivial_sdist(
-            foobar_path,
-            textwrap.dedent("""\
-                import setuptools
-                setuptools.setup(
-                    name='foobar',
-                    version='0.1'
-                )
-            """))
-
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
         try:
-            try:
+            with quiet_context():
                 with reset_setup_stop_context():
                     run_setup(test_setup_py, ['install'])
-            except SandboxViolation:
-                self.fail('Installation caused SandboxViolation')
-        finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+        except SandboxViolation:
+            self.fail('Installation caused SandboxViolation')
 
 
 class TestSetupRequires(unittest.TestCase):
@@ -290,8 +260,10 @@ def test_setup_requires_honors_fetch_params(self):
             # Some platforms (Jython) don't find a port to which to bind,
             #  so skip this test for them.
             return
-        # create an sdist that has a build-time dependency.
-        with TestSetupRequires.create_sdist() as dist_file:
+        with quiet_context():
+          # TODO: correct indentation here
+          # create an sdist that has a build-time dependency.
+          with TestSetupRequires.create_sdist() as dist_file:
             with tempdir_context() as temp_install_dir:
                 with environment_context(PYTHONPATH=temp_install_dir):
                     ei_params = ['--index-url', p_index.url,
@@ -330,6 +302,81 @@ def create_sdist():
                 """).lstrip())
             yield dist_path
 
+    def test_setup_requires_overrides_version_conflict(self):
+        """
+        Regression test for issue #323.
+
+        Ensures that a distribution's setup_requires requirements can still be
+        installed and used locally even if a conflicting version of that
+        requirement is already on the path.
+        """
+
+        pr_state = pkg_resources.__getstate__()
+        fake_dist = PRDistribution('does-not-matter', project_name='foobar',
+                                   version='0.0')
+        working_set.add(fake_dist)
+
+        def setup_and_run(temp_dir):
+            test_pkg = create_setup_requires_package(temp_dir)
+            test_setup_py = os.path.join(test_pkg, 'setup.py')
+            try:
+                stdout, stderr = quiet_context(
+                    lambda: reset_setup_stop_context(
+                        # Don't even need to install the package, just running
+                        # the setup.py at all is sufficient
+                        lambda: run_setup(test_setup_py, ['--name'])
+                ))
+            except VersionConflict:
+                self.fail('Installing setup.py requirements caused '
+                          'VersionConflict')
+
+            lines = stdout.splitlines()
+            self.assertTrue(len(lines) > 0)
+            self.assertTrue(lines[-1].strip(), 'test_pkg')
+
+        try:
+            tempdir_context(setup_and_run)
+        finally:
+            pkg_resources.__setstate__(pr_state)
+
+
+def create_setup_requires_package(path):
+    """Creates a source tree under path for a trivial test package that has a
+    single requirement in setup_requires--a tarball for that requirement is
+    also created and added to the dependency_links argument.
+    """
+
+    test_setup_attrs = {
+        'name': 'test_pkg', 'version': '0.0',
+        'setup_requires': ['foobar==0.1'],
+        'dependency_links': [os.path.abspath(path)]
+    }
+
+    test_pkg = os.path.join(path, 'test_pkg')
+    test_setup_py = os.path.join(test_pkg, 'setup.py')
+    test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+    os.mkdir(test_pkg)
+
+    f = open(test_setup_py, 'w')
+    f.write(textwrap.dedent("""\
+        import setuptools
+        setuptools.setup(**%r)
+    """ % test_setup_attrs))
+    f.close()
+
+    foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
+    make_trivial_sdist(
+        foobar_path,
+        textwrap.dedent("""\
+            import setuptools
+            setuptools.setup(
+                name='foobar',
+                version='0.1'
+            )
+        """))
+
+    return test_pkg
+
 
 def make_trivial_sdist(dist_path, setup_py):
     """Create a simple sdist tarball at dist_path, containing just a
@@ -392,3 +439,21 @@ def reset_setup_stop_context():
     distutils.core._setup_stop_after = None
     yield
     distutils.core._setup_stop_after = setup_stop_after
+
+
+@contextlib.contextmanager
+def quiet_context():
+    """
+    Redirect stdout/stderr to StringIO objects to prevent console output from
+    distutils commands.
+    """
+
+    old_stdout = sys.stdout
+    old_stderr = sys.stderr
+    new_stdout = sys.stdout = StringIO.StringIO()
+    new_stderr = sys.stderr = StringIO.StringIO()
+    try:
+        yield new_stdout, new_stderr
+    finally:
+        sys.stdout = old_stdout
+        sys.stderr = old_stderr

From 15890a34456e31755d991bcbb2970591e32c8131 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 18:29:43 -0500
Subject: [PATCH 1724/8469] Normalize whitespace

--HG--
extra : source : e4abff0dc46f1c089d8a61bac2406a57df406dcc
---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 77a3852b96..aa6f47f00e 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -40,6 +40,7 @@ def _finder(self, dirname, filename):
                 #was an re_finder for calling unescape
                 path = self.postproc(path)
             yield svn_utils.joinpath(dirname,path)
+
     def __call__(self, dirname=''):
         path = svn_utils.joinpath(dirname, self.path)
 
@@ -65,7 +66,6 @@ def _default_revctrl(dirname=''):
 ]
 
 
-
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""
 

From a61674f1324778f8b231c569325eab60e0e78482 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 18:33:57 -0500
Subject: [PATCH 1725/8469] Use a default that generates to the default
 behavior; no need to employ None as a sentry value.

--HG--
extra : source : 2c7c7486ddc40ee4272b23e1fafd51ab1611dc28
---
 setuptools/command/sdist.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index aa6f47f00e..b59cc390b9 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -22,7 +22,7 @@ def walk_revctrl(dirname=''):
 #TODO will need test case
 class re_finder(object):
 
-    def __init__(self, path, pattern, postproc=None):
+    def __init__(self, path, pattern, postproc=lambda x: x):
         self.pattern = pattern
         self.postproc = postproc
         self.path = convert_path(path)
@@ -35,10 +35,9 @@ def _finder(self, dirname, filename):
             f.close()
         for match in self.pattern.finditer(data):
             path = match.group(1)
-            if self.postproc:
-                #postproc used to be used when the svn finder
-                #was an re_finder for calling unescape
-                path = self.postproc(path)
+            # postproc was formerly used when the svn finder
+            # was an re_finder for calling unescape
+            path = self.postproc(path)
             yield svn_utils.joinpath(dirname,path)
 
     def __call__(self, dirname=''):

From d505855a1a59213b8a02d50870305c62c52d8399 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 18:57:02 -0500
Subject: [PATCH 1726/8469] Implement self.find. Fixes #139.

--HG--
extra : amend_source : 98be824b4f846eb5fa8a8b046c3ef52a9fc2af4d
---
 setuptools/command/sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index e1112ff930..1bd07e6511 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -38,7 +38,7 @@ def _finder(self, dirname, filename):
                 path = postproc(path)
             yield svn_utils.joinpath(dirname,path)
 
-    def __call__(self, dirname=''):
+    def find(self, dirname=''):
         path = svn_utils.joinpath(dirname, self.path)
 
         if os.path.isfile(path):
@@ -48,6 +48,7 @@ def __call__(self, dirname=''):
                 elif os.path.isdir(path):
                     for item in self.find(path):
                         yield item
+    __call__ = find
 
 
 def _default_revctrl(dirname=''):

From dbdef26b5b1968b49b49966da045799b8553ebe1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:04:23 -0500
Subject: [PATCH 1727/8469] Rename the path attribute to entries_path for
 clarity. Added a docstring. Refactored 'find' method for flatness.

--HG--
extra : source : 686317ef97be5076001b23e61f552dc1e85e29c8
---
 setuptools/command/sdist.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 04cbccdf7f..76e1c5f18b 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -21,11 +21,15 @@ def walk_revctrl(dirname=''):
 
 #TODO will need test case
 class re_finder(object):
+    """
+    Finder that locates files based on entries in a file matched by a
+    regular expression.
+    """
 
     def __init__(self, path, pattern, postproc=lambda x: x):
         self.pattern = pattern
         self.postproc = postproc
-        self.path = convert_path(path)
+        self.entries_path = convert_path(path)
 
     def _finder(self, dirname, filename):
         f = open(filename,'rU')
@@ -38,18 +42,20 @@ def _finder(self, dirname, filename):
             # postproc was formerly used when the svn finder
             # was an re_finder for calling unescape
             path = self.postproc(path)
-            yield svn_utils.joinpath(dirname,path)
+            yield svn_utils.joinpath(dirname, path)
 
     def find(self, dirname=''):
-        path = svn_utils.joinpath(dirname, self.path)
-
-        if os.path.isfile(path):
-            for path in self._finder(dirname,path):
-                if os.path.isfile(path):
-                    yield path
-                elif os.path.isdir(path):
-                    for item in self.find(path):
-                        yield item
+        path = svn_utils.joinpath(dirname, self.entries_path)
+
+        if not os.path.isfile(path):
+            # entries file doesn't exist
+            return
+        for path in self._finder(dirname,path):
+            if os.path.isfile(path):
+                yield path
+            elif os.path.isdir(path):
+                for item in self.find(path):
+                    yield item
     __call__ = find
 
 

From b2e88257f67e94bc922265285e602fc5ecea5830 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:30:53 -0500
Subject: [PATCH 1728/8469] Disable bdist_wheel until issue #143 is solved.

---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index c5e8debbc9..5735e10cd2 100644
--- a/release.py
+++ b/release.py
@@ -26,7 +26,7 @@ def after_push():
     'ez_setup.py', 'setuptools/version.py',
 )
 
-dist_commands = 'sdist', 'bdist_wheel'
+dist_commands = 'sdist',# 'bdist_wheel'
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 

From 5d7afc92bc7faeed4fdfdcfcaba324bd1b02d124 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:31:09 -0500
Subject: [PATCH 1729/8469] Bumped to 2.1.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1420c114df..b162118075 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.2"
+DEFAULT_VERSION = "2.1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 2b9ccf1770..55fa725bd5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.2'
+__version__ = '2.1.1'

From e958dad9e656ac020ac62499c87f35fb2c0a4283 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:31:10 -0500
Subject: [PATCH 1730/8469] Added tag 2.1.1 for changeset b5be6c2b828c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2de8cd9986..c1b5f5efbe 100644
--- a/.hgtags
+++ b/.hgtags
@@ -114,3 +114,4 @@ a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
 bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
 5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
 c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
+b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1

From fca0b24f0fa5b41d136b7083449c21ea2705d193 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:31:35 -0500
Subject: [PATCH 1731/8469] Bumped to 2.1.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 92 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b162118075..c768e3c719 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1.1"
+DEFAULT_VERSION = "2.1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 6b10d6dcf4..90ea9dde43 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
 test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
 test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 install_requires = setuptools.dist:check_requirements
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+namespace_packages = setuptools.dist:check_nsp
+extras_require = setuptools.dist:check_extras
 zip_safe = setuptools.dist:assert_bool
 entry_points = setuptools.dist:check_entry_points
-namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-use_2to3_fixers = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
+use_2to3 = setuptools.dist:assert_bool
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
+
+[egg_info.writers]
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+entry_points.txt = setuptools.command.egg_info:write_entries
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 
 [distutils.commands]
+develop = setuptools.command.develop:develop
+sdist = setuptools.command.sdist:sdist
+install_lib = setuptools.command.install_lib:install_lib
+saveopts = setuptools.command.saveopts:saveopts
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 upload_docs = setuptools.command.upload_docs:upload_docs
 egg_info = setuptools.command.egg_info:egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 register = setuptools.command.register:register
-install_lib = setuptools.command.install_lib:install_lib
+setopt = setuptools.command.setopt:setopt
 install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-saveopts = setuptools.command.saveopts:saveopts
-rotate = setuptools.command.rotate:rotate
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-develop = setuptools.command.develop:develop
-alias = setuptools.command.alias:alias
-install = setuptools.command.install:install
-build_ext = setuptools.command.build_ext:build_ext
+easy_install = setuptools.command.easy_install:easy_install
 build_py = setuptools.command.build_py:build_py
-sdist = setuptools.command.sdist:sdist
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
+rotate = setuptools.command.rotate:rotate
+build_ext = setuptools.command.build_ext:build_ext
 test = setuptools.command.test:test
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+alias = setuptools.command.alias:alias
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fd464d812..9a6bf43731 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 55fa725bd5..f811561263 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1.1'
+__version__ = '2.1.2'

From e26fe38be5fd14ebff95ccb3d24765a0e81fd197 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:38:34 -0500
Subject: [PATCH 1732/8469] Bumped to 2.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c768e3c719..1420c114df 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1.2"
+DEFAULT_VERSION = "2.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index f811561263..2b9ccf1770 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1.2'
+__version__ = '2.2'

From 7fef71ce0efb6ceb39522ac4ba78566734244c86 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:39:05 -0500
Subject: [PATCH 1733/8469] Added tag 2.2b1 for changeset ab1c2a26e06f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c1b5f5efbe..fe5e9da463 100644
--- a/.hgtags
+++ b/.hgtags
@@ -115,3 +115,4 @@ bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
 5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
 c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
 b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
+ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1

From 23c24bd67e7f2f2d5d53f9d0b09302dce21ef0b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 19:47:08 -0500
Subject: [PATCH 1734/8469] Missed the last two words.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0937e02342..4b5f4e0c27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ---
 
 * Issue #141: Restored fix for allowing setup_requires dependencies to
-  override installed dependencies.
+  override installed dependencies during setup.
 
 -----
 2.1.1

From 92bed83a85874a95faa052b3ffab4f7cbf65c94c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:13:05 -0500
Subject: [PATCH 1735/8469] Update global reference.

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 8c797d550a..38ee83ea0d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -450,8 +450,8 @@ def quiet_context():
 
     old_stdout = sys.stdout
     old_stderr = sys.stderr
-    new_stdout = sys.stdout = StringIO.StringIO()
-    new_stderr = sys.stderr = StringIO.StringIO()
+    new_stdout = sys.stdout = StringIO()
+    new_stderr = sys.stderr = StringIO()
     try:
         yield new_stdout, new_stderr
     finally:

From 477d825d98155aa143bf6eb985d5d491368c63b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:16:45 -0500
Subject: [PATCH 1736/8469] Reindent according to TODO (indent was reserved to
 minimize the diff)

---
 setuptools/tests/test_easy_install.py | 29 +++++++++++++--------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 38ee83ea0d..10c6fb617a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -261,21 +261,20 @@ def test_setup_requires_honors_fetch_params(self):
             #  so skip this test for them.
             return
         with quiet_context():
-          # TODO: correct indentation here
-          # create an sdist that has a build-time dependency.
-          with TestSetupRequires.create_sdist() as dist_file:
-            with tempdir_context() as temp_install_dir:
-                with environment_context(PYTHONPATH=temp_install_dir):
-                    ei_params = ['--index-url', p_index.url,
-                        '--allow-hosts', p_index_loc,
-                        '--exclude-scripts', '--install-dir', temp_install_dir,
-                        dist_file]
-                    with reset_setup_stop_context():
-                        with argv_context(['easy_install']):
-                            # attempt to install the dist. It should fail because
-                            #  it doesn't exist.
-                            self.assertRaises(SystemExit,
-                                easy_install_pkg.main, ei_params)
+            # create an sdist that has a build-time dependency.
+            with TestSetupRequires.create_sdist() as dist_file:
+                with tempdir_context() as temp_install_dir:
+                    with environment_context(PYTHONPATH=temp_install_dir):
+                        ei_params = ['--index-url', p_index.url,
+                            '--allow-hosts', p_index_loc,
+                            '--exclude-scripts', '--install-dir', temp_install_dir,
+                            dist_file]
+                        with reset_setup_stop_context():
+                            with argv_context(['easy_install']):
+                                # attempt to install the dist. It should fail because
+                                #  it doesn't exist.
+                                self.assertRaises(SystemExit,
+                                    easy_install_pkg.main, ei_params)
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
         self.assertTrue(2 <= len(p_index.requests) <= 3)

From 023cc7621f21b660b1eed7561f1a4c8caabb125c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:19:16 -0500
Subject: [PATCH 1737/8469] Remove unused variable

---
 setuptools/tests/test_easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 10c6fb617a..e58379aba9 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -353,7 +353,6 @@ def create_setup_requires_package(path):
 
     test_pkg = os.path.join(path, 'test_pkg')
     test_setup_py = os.path.join(test_pkg, 'setup.py')
-    test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
     os.mkdir(test_pkg)
 
     f = open(test_setup_py, 'w')

From 929245d2582e5dba93540838981494fd5a57dbdf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:35:39 -0500
Subject: [PATCH 1738/8469] Rewrite merged tests to use context managers

---
 setuptools/tests/test_easy_install.py | 35 ++++++++++++---------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e58379aba9..fbba1803f1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -315,26 +315,23 @@ def test_setup_requires_overrides_version_conflict(self):
                                    version='0.0')
         working_set.add(fake_dist)
 
-        def setup_and_run(temp_dir):
-            test_pkg = create_setup_requires_package(temp_dir)
-            test_setup_py = os.path.join(test_pkg, 'setup.py')
-            try:
-                stdout, stderr = quiet_context(
-                    lambda: reset_setup_stop_context(
-                        # Don't even need to install the package, just running
-                        # the setup.py at all is sufficient
-                        lambda: run_setup(test_setup_py, ['--name'])
-                ))
-            except VersionConflict:
-                self.fail('Installing setup.py requirements caused '
-                          'VersionConflict')
-
-            lines = stdout.splitlines()
-            self.assertTrue(len(lines) > 0)
-            self.assertTrue(lines[-1].strip(), 'test_pkg')
-
         try:
-            tempdir_context(setup_and_run)
+            with tempdir_context() as temp_dir:
+                test_pkg = create_setup_requires_package(temp_dir)
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                with quiet_context() as (stdout, stderr):
+                    with reset_setup_stop_context():
+                        try:
+                            # Don't even need to install the package, just
+                            # running the setup.py at all is sufficient
+                            run_setup(test_setup_py, ['--name'])
+                        except VersionConflict:
+                            self.fail('Installing setup.py requirements '
+                                'caused a VersionConflict')
+
+                lines = stdout.splitlines()
+                self.assertTrue(len(lines) > 0)
+                self.assertTrue(lines[-1].strip(), 'test_pkg')
         finally:
             pkg_resources.__setstate__(pr_state)
 

From 20f0eabf20453410b1beffdd2e0d686f4d711564 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:50:03 -0500
Subject: [PATCH 1739/8469] Use readlines on StringIO. Ensure quiet_context
 returns rewound buffers.

---
 setuptools/tests/test_easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fbba1803f1..d2cc7a0fe6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -329,7 +329,7 @@ def test_setup_requires_overrides_version_conflict(self):
                             self.fail('Installing setup.py requirements '
                                 'caused a VersionConflict')
 
-                lines = stdout.splitlines()
+                lines = stdout.readlines()
                 self.assertTrue(len(lines) > 0)
                 self.assertTrue(lines[-1].strip(), 'test_pkg')
         finally:
@@ -450,5 +450,7 @@ def quiet_context():
     try:
         yield new_stdout, new_stderr
     finally:
+        new_stdout.seek(0)
+        new_stderr.seek(0)
         sys.stdout = old_stdout
         sys.stderr = old_stderr

From f5167344b22647d8bc877019bd73c82c50dfb093 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 21:57:56 -0500
Subject: [PATCH 1740/8469] Open readme with codecs to enable explicit encoding
 declaration. Fixes #144.

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 15ba65f6d5..de254361d6 100755
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 import sys
 import os
 import textwrap
+import codecs
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -81,7 +82,8 @@ def run(self):
                 f.write(ep_content)
 
 
-readme_file = open('README.txt')
+readme_file = codecs.open('README.txt', encoding='utf-8')
+
 # the release script adds hyperlinks to issues
 if os.path.exists('CHANGES (links).txt'):
     changes_file = open('CHANGES (links).txt')

From c87de5d6670c583184e2a33ffa8eb1146e4b98c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 22:00:39 -0500
Subject: [PATCH 1741/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index dbe33d0a12..455dada1a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+2.1.2
+-----
+
+* Issue #144: Read long_description using codecs module to avoid errors
+  installing on systems where LANG=C.
+
 -----
 2.1.1
 -----

From d7bca1babc543c8bcfef6b65ea230493d3467543 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 22:01:16 -0500
Subject: [PATCH 1742/8469] Added tag 2.1.2 for changeset caab085e829f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c1b5f5efbe..c54b5df01c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -115,3 +115,4 @@ bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
 5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
 c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
 b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
+caab085e829f29679d0e47430b2761af6b20fc76 2.1.2

From df38635fd938de9964ad4e3ab861bc7d1ce760f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2014 22:01:42 -0500
Subject: [PATCH 1743/8469] Bumped to 2.1.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 76 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c768e3c719..eb2c3fac53 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.1.2"
+DEFAULT_VERSION = "2.1.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 90ea9dde43..cd85d500be 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [distutils.setup_keywords]
-packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
+exclude_package_data = setuptools.dist:check_package_data
 use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
+extras_require = setuptools.dist:check_extras
 test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
 convert_2to3_doctests = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-namespace_packages = setuptools.dist:check_nsp
-extras_require = setuptools.dist:check_extras
-zip_safe = setuptools.dist:assert_bool
-entry_points = setuptools.dist:check_entry_points
-exclude_package_data = setuptools.dist:check_package_data
+test_loader = setuptools.dist:check_importable
+dependency_links = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
 include_package_data = setuptools.dist:assert_bool
 package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+zip_safe = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 use_2to3 = setuptools.dist:assert_bool
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
+namespace_packages = setuptools.dist:check_nsp
+tests_require = setuptools.dist:check_requirements
 
 [egg_info.writers]
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
-requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.commands]
 develop = setuptools.command.develop:develop
-sdist = setuptools.command.sdist:sdist
-install_lib = setuptools.command.install_lib:install_lib
 saveopts = setuptools.command.saveopts:saveopts
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
 upload_docs = setuptools.command.upload_docs:upload_docs
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
+test = setuptools.command.test:test
+build_ext = setuptools.command.build_ext:build_ext
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 setopt = setuptools.command.setopt:setopt
-install_scripts = setuptools.command.install_scripts:install_scripts
+rotate = setuptools.command.rotate:rotate
 easy_install = setuptools.command.easy_install:easy_install
+install_lib = setuptools.command.install_lib:install_lib
+egg_info = setuptools.command.egg_info:egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 build_py = setuptools.command.build_py:build_py
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
 install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+sdist = setuptools.command.sdist:sdist
+
+[console_scripts]
+easy_install-3.4 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
 
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9a6bf43731..4fd464d812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index f811561263..2d31b1c326 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.1.2'
+__version__ = '2.1.3'

From dc18e9bab9e5bca57269775572a4e77fcef98b78 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Feb 2014 09:31:48 -0500
Subject: [PATCH 1744/8469] Added comment emphasizing the importance of
 bdist_wheel. Using Python 3.3 fixes #143.

--HG--
extra : amend_source : 46787fd35452f54da1a8afd2bf8a30dff920d8a2
---
 release.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 5735e10cd2..d2f82775b6 100644
--- a/release.py
+++ b/release.py
@@ -26,7 +26,8 @@ def after_push():
     'ez_setup.py', 'setuptools/version.py',
 )
 
-dist_commands = 'sdist',# 'bdist_wheel'
+# bdist_wheel must be included or pip will break
+dist_commands = 'sdist', 'bdist_wheel'
 
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 

From ed2b58f7db37491f8ffa83c7dafbdb4b5b2ddbb4 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Fri, 7 Feb 2014 17:38:25 +0100
Subject: [PATCH 1745/8469] Use io.open() instead of codecs.open().
 (builtins.open() is io.open() in Python 3.)

---
 setup.py                     | 6 +++---
 setuptools/tests/test_svn.py | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index de254361d6..dc4391c27a 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 """Distutils setup file, used to install or test 'setuptools'"""
-import sys
+import io
 import os
+import sys
 import textwrap
-import codecs
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -82,7 +82,7 @@ def run(self):
                 f.write(ep_content)
 
 
-readme_file = codecs.open('README.txt', encoding='utf-8')
+readme_file = io.open('README.txt', encoding='utf-8')
 
 # the release script adds hyperlinks to issues
 if os.path.exists('CHANGES (links).txt'):
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index afee32b6d2..3340036210 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 """svn tests"""
 
-
+import io
 import os
+import subprocess
 import sys
 import unittest
-import codecs
-import subprocess
 from setuptools.tests import environment
 from setuptools.compat import unicode, unichr
 
@@ -54,7 +53,7 @@ def test_svn_should_exist(self):
 def _read_utf8_file(path):
     fileobj = None
     try:
-        fileobj = codecs.open(path, 'r', 'utf-8')
+        fileobj = io.open(path, 'r', encoding='utf-8')
         data = fileobj.read()
         return data
     finally:

From 57f35446cba456564e83fbfe8b72189606228142 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Feb 2014 21:34:14 -0500
Subject: [PATCH 1746/8469] Update changelog; Fixes #128.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 86e843bae2..1ead9360d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 
 * Issue #141: Restored fix for allowing setup_requires dependencies to
   override installed dependencies during setup.
+* Issue #128: Fixed issue where only the first dependency link was honored
+  in a distribution where multiple dependency links were supplied.
 
 -----
 2.1.2

From 1fc1bb4cccc4414d39cdb4f94c3e0680c81ecb1d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Feb 2014 21:37:07 -0500
Subject: [PATCH 1747/8469] Added tag 2.2 for changeset 39f7ef5ef221

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 19b3167da8..e3af502655 100644
--- a/.hgtags
+++ b/.hgtags
@@ -117,3 +117,4 @@ c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
 b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
 ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1
 caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
+39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2

From bc5fdecacdb06e44977e72aa17a18c486dba098c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Feb 2014 21:37:39 -0500
Subject: [PATCH 1748/8469] Bumped to 2.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 82 ++++++++++++++--------------
 setuptools/version.py                |  2 +-
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1420c114df..784a69b10f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.2"
+DEFAULT_VERSION = "2.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index cd85d500be..5e417433f7 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[distutils.setup_keywords]
-entry_points = setuptools.dist:check_entry_points
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-test_suite = setuptools.dist:check_test_suite
-convert_2to3_doctests = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-dependency_links = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-include_package_data = setuptools.dist:assert_bool
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-zip_safe = setuptools.dist:assert_bool
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-tests_require = setuptools.dist:check_requirements
-
 [egg_info.writers]
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 requires.txt = setuptools.command.egg_info:write_requirements
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 
 [distutils.commands]
+install = setuptools.command.install:install
 develop = setuptools.command.develop:develop
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+build_ext = setuptools.command.build_ext:build_ext
+install_scripts = setuptools.command.install_scripts:install_scripts
+rotate = setuptools.command.rotate:rotate
 saveopts = setuptools.command.saveopts:saveopts
 alias = setuptools.command.alias:alias
-upload_docs = setuptools.command.upload_docs:upload_docs
-test = setuptools.command.test:test
-build_ext = setuptools.command.build_ext:build_ext
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-setopt = setuptools.command.setopt:setopt
-rotate = setuptools.command.rotate:rotate
 easy_install = setuptools.command.easy_install:easy_install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 install_lib = setuptools.command.install_lib:install_lib
 egg_info = setuptools.command.egg_info:egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+sdist = setuptools.command.sdist:sdist
 build_py = setuptools.command.build_py:build_py
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+upload_docs = setuptools.command.upload_docs:upload_docs
 register = setuptools.command.register:register
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-sdist = setuptools.command.sdist:sdist
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
+setopt = setuptools.command.setopt:setopt
+
+[distutils.setup_keywords]
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
+use_2to3 = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+extras_require = setuptools.dist:check_extras
+convert_2to3_doctests = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
+tests_require = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
+include_package_data = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+exclude_package_data = setuptools.dist:check_package_data
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [console_scripts]
-easy_install-3.4 = setuptools.command.easy_install:main
 easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 2b9ccf1770..93bbb90e96 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.2'
+__version__ = '2.3'

From 646d7585da63b3fe5b4b2d5bf057b3795ac21241 Mon Sep 17 00:00:00 2001
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 16 Dec 2013 22:44:35 -0200
Subject: [PATCH 1749/8469] Do not override _bytecode_filenames

The overridden version cannot handle Python 3.x while distutils verion can
handle it just fine.

--HG--
extra : rebase_source : 86fa56285849e97780e91eff405881bfb72184d5
---
 setuptools/command/install_lib.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 82afa1421b..c508cd3317 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -4,18 +4,6 @@
 class install_lib(_install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
 
-    def _bytecode_filenames (self, py_filenames):
-        bytecode_files = []
-        for py_file in py_filenames:
-            if not py_file.endswith('.py'):
-                continue
-            if self.compile:
-                bytecode_files.append(py_file + "c")
-            if self.optimize > 0:
-                bytecode_files.append(py_file + "o")
-
-        return bytecode_files
-
     def run(self):
         self.build()
         outfiles = self.install()

From bd83591f366938374961d42757d04b25b08004a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Feb 2014 22:06:55 -0500
Subject: [PATCH 1750/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ead9360d4..4214aca5b9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+2.3
+---
+
+* Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
+  available in Python 2.6 and later, but also has better compatibility with
+  Python 3 environments.
+
 ---
 2.2
 ---

From 69eb2865b8fae0760f9cb62d099ec7e92a908672 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Feb 2014 10:16:37 -0500
Subject: [PATCH 1751/8469] Adding comment referencing #134.

---
 setuptools/command/easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 08ebf3e589..8e39ee8024 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -743,6 +743,8 @@ def get_template(filename):
             return clean_template
 
         if is_script:
+            # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+            #  on script file naming and downstream issues with SVR4
             template_name = 'script template.py'
             if dev_path:
                 template_name = template_name.replace('.py', ' (dev).py')

From e8e9a565526ac00b508da4717e9ae1f548083ae0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 13:19:29 -0500
Subject: [PATCH 1752/8469] More succinctly implement declare_state.

---
 pkg_resources.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index bde30989fe..73225e69bf 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -90,10 +90,8 @@ def _bypass_ensure_directory(name, mode=0x1FF):  # 0777
 _state_vars = {}
 
 def _declare_state(vartype, **kw):
-    g = globals()
-    for name, val in kw.items():
-        g[name] = val
-        _state_vars[name] = vartype
+    globals().update(kw)
+    _state_vars.update(dict.from_keys(kw, vartype))
 
 def __getstate__():
     state = {}
@@ -2339,6 +2337,8 @@ def get_entry_info(self, group, name):
     def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
+        if 'foo' in path:
+            import pdb; pdb.set_trace()
         loc = loc or self.location
         if not loc:
             return

From cdc3b090d087825fe13d7b04846658d2bc8dae3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 13:27:18 -0500
Subject: [PATCH 1753/8469] Move comments

---
 pkg_resources.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 73225e69bf..2f3fbd2e0e 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2704,26 +2704,33 @@ def _initialize(g):
 _initialize(globals())
 
 # Prepare the master working set and make the ``require()`` API available
-_declare_state('object', working_set = WorkingSet())
+_declare_state('object', working_set=WorkingSet())
 try:
     # Does the main program list any requirements?
     from __main__ import __requires__
 except ImportError:
-    pass # No: just use the default working set based on sys.path
+    # No: just use the default working set based on sys.path
+    pass
 else:
     # Yes: ensure the requirements are met, by prefixing sys.path if necessary
     try:
         working_set.require(__requires__)
-    except VersionConflict:     # try it without defaults already on sys.path
-        working_set = WorkingSet([])    # by starting with an empty path
+    except VersionConflict:
+        # try it without defaults already on sys.path
+        # by starting with an empty path
+        working_set = WorkingSet([])
         for dist in working_set.resolve(
             parse_requirements(__requires__), Environment()
         ):
             working_set.add(dist)
-        for entry in sys.path:  # add any missing entries from sys.path
+
+        # add any missing entries from sys.path
+        for entry in sys.path:
             if entry not in working_set.entries:
                 working_set.add_entry(entry)
-        sys.path[:] = working_set.entries   # then copy back to sys.path
+
+        # then copy back to sys.path
+        sys.path[:] = working_set.entries
 
 require = working_set.require
 iter_entry_points = working_set.iter_entry_points

From be05a93a7e1aabf31a0f90be3851fa941115808a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 13:31:50 -0500
Subject: [PATCH 1754/8469] Simplify syntax of for loop

---
 pkg_resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2f3fbd2e0e..0b987e8f99 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2719,9 +2719,9 @@ def _initialize(g):
         # try it without defaults already on sys.path
         # by starting with an empty path
         working_set = WorkingSet([])
-        for dist in working_set.resolve(
-            parse_requirements(__requires__), Environment()
-        ):
+        reqs = parse_requirements(__requires__)
+        dists = working_set.resolve(reqs, Environment())
+        for dist in dists:
             working_set.add(dist)
 
         # add any missing entries from sys.path

From b884660784a7404aa16bd3649e2a768ccb93901d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 14:04:11 -0500
Subject: [PATCH 1755/8469] Moved master working set construction into
 classmethods of WorkingSet.

---
 pkg_resources.py | 71 ++++++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0b987e8f99..0120ab4f6a 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -427,6 +427,48 @@ def __init__(self, entries=None):
         for entry in entries:
             self.add_entry(entry)
 
+    @classmethod
+    def _build_master(cls):
+        """
+        Prepare the master working set.
+        """
+        ws = cls()
+        try:
+            from __main__ import __requires__
+        except ImportError:
+            # The main program does not list any requirements
+            return ws
+
+        # ensure the requirements are met
+        try:
+            ws.require(__requires__)
+        except VersionConflict:
+            return cls._build_from_requirements(__requires__)
+
+        return ws
+
+    @classmethod
+    def _build_from_requirements(cls, req_spec):
+        """
+        Build a working set from a requirement spec. Rewrites sys.path.
+        """
+        # try it without defaults already on sys.path
+        # by starting with an empty path
+        ws = cls([])
+        reqs = parse_requirements(req_spec)
+        dists = working_set.resolve(reqs, Environment())
+        for dist in dists:
+            ws.add(dist)
+
+        # add any missing entries from sys.path
+        for entry in sys.path:
+            if entry not in ws.entries:
+                ws.add_entry(entry)
+
+        # then copy back to sys.path
+        sys.path[:] = ws.entries
+        return ws
+
     def add_entry(self, entry):
         """Add a path item to ``.entries``, finding any distributions on it
 
@@ -2704,33 +2746,8 @@ def _initialize(g):
 _initialize(globals())
 
 # Prepare the master working set and make the ``require()`` API available
-_declare_state('object', working_set=WorkingSet())
-try:
-    # Does the main program list any requirements?
-    from __main__ import __requires__
-except ImportError:
-    # No: just use the default working set based on sys.path
-    pass
-else:
-    # Yes: ensure the requirements are met, by prefixing sys.path if necessary
-    try:
-        working_set.require(__requires__)
-    except VersionConflict:
-        # try it without defaults already on sys.path
-        # by starting with an empty path
-        working_set = WorkingSet([])
-        reqs = parse_requirements(__requires__)
-        dists = working_set.resolve(reqs, Environment())
-        for dist in dists:
-            working_set.add(dist)
-
-        # add any missing entries from sys.path
-        for entry in sys.path:
-            if entry not in working_set.entries:
-                working_set.add_entry(entry)
-
-        # then copy back to sys.path
-        sys.path[:] = working_set.entries
+working_set = WorkingSet._build_master()
+_declare_state('object', working_set=working_set)
 
 require = working_set.require
 iter_entry_points = working_set.iter_entry_points

From 0e44d6b2abc8aa8dba6569fe089d49c9359716ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 14:12:47 -0500
Subject: [PATCH 1756/8469] I checked this syntax, then failed to update the
 code before committing.

---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0120ab4f6a..9e98e67173 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -91,7 +91,7 @@ def _bypass_ensure_directory(name, mode=0x1FF):  # 0777
 
 def _declare_state(vartype, **kw):
     globals().update(kw)
-    _state_vars.update(dict.from_keys(kw, vartype))
+    _state_vars.update(dict.fromkeys(kw, vartype))
 
 def __getstate__():
     state = {}

From 8a1154915bef1dbf5c9b106f1037ae3bdf19749b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 14:25:59 -0500
Subject: [PATCH 1757/8469] Neglected to remove another reference to the global
 'working_set'

---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9e98e67173..b0acfcdf39 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -456,7 +456,7 @@ def _build_from_requirements(cls, req_spec):
         # by starting with an empty path
         ws = cls([])
         reqs = parse_requirements(req_spec)
-        dists = working_set.resolve(reqs, Environment())
+        dists = ws.resolve(reqs, Environment())
         for dist in dists:
             ws.add(dist)
 

From c7308a00fabc74f1a3315d676a7c93fff40d7224 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 14:28:11 -0500
Subject: [PATCH 1758/8469] Remove debug code, unintentionally committed.

---
 pkg_resources.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index b0acfcdf39..2a47c58b93 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2379,8 +2379,6 @@ def get_entry_info(self, group, name):
     def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
-        if 'foo' in path:
-            import pdb; pdb.set_trace()
         loc = loc or self.location
         if not loc:
             return

From 790486c38d8c3912b37ffdc326654de96dc0c862 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 14:49:19 -0500
Subject: [PATCH 1759/8469] Normalize indentation in docstrings and function
 params

---
 ez_setup.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 784a69b10f..65c92dc6d8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -116,7 +116,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15):
+        to_dir=os.curdir, download_delay=15):
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
@@ -261,9 +261,9 @@ def get_best_downloader():
             return dl
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                        to_dir=os.curdir, delay=15,
-                        downloader_factory=get_best_downloader):
-    """Download setuptools from a specified location and return its filename
+        to_dir=os.curdir, delay=15, downloader_factory=get_best_downloader):
+    """
+    Download setuptools from a specified location and return its filename
 
     `version` should be a valid setuptools version number that is available
     as an egg for download under the `download_base` URL (which should end
@@ -287,11 +287,12 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
 
 
 def _extractall(self, path=".", members=None):
-    """Extract all members from the archive to the current working
-       directory and set owner, modification time and permissions on
-       directories afterwards. `path' specifies a different directory
-       to extract to. `members' is optional and must be a subset of the
-       list returned by getmembers().
+    """
+    Extract all members from the archive to the current working
+    directory and set owner, modification time and permissions on
+    directories afterwards. `path' specifies a different directory
+    to extract to. `members' is optional and must be a subset of the
+    list returned by getmembers().
     """
     import copy
     import operator

From 2fbffe9bf4bf6c71c5bbe94e3386d69a2db5f37c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 15:08:37 -0500
Subject: [PATCH 1760/8469] Replace _extractall with the canonical
 TarFile.extractall.

---
 ez_setup.py | 46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 65c92dc6d8..3e5907dcf9 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -48,7 +48,7 @@ def _install(tarball, install_args=()):
     try:
         os.chdir(tmpdir)
         tar = tarfile.open(tarball)
-        _extractall(tar)
+        tar.extractall()
         tar.close()
 
         # going in the directory
@@ -76,7 +76,7 @@ def _build_egg(egg, tarball, to_dir):
     try:
         os.chdir(tmpdir)
         tar = tarfile.open(tarball)
-        _extractall(tar)
+        tar.extractall()
         tar.close()
 
         # going in the directory
@@ -285,48 +285,6 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         downloader(url, saveto)
     return os.path.realpath(saveto)
 
-
-def _extractall(self, path=".", members=None):
-    """
-    Extract all members from the archive to the current working
-    directory and set owner, modification time and permissions on
-    directories afterwards. `path' specifies a different directory
-    to extract to. `members' is optional and must be a subset of the
-    list returned by getmembers().
-    """
-    import copy
-    import operator
-    from tarfile import ExtractError
-    directories = []
-
-    if members is None:
-        members = self
-
-    for tarinfo in members:
-        if tarinfo.isdir():
-            # Extract directories with a safe mode.
-            directories.append(tarinfo)
-            tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 448  # decimal for oct 0700
-        self.extract(tarinfo, path)
-
-    # Reverse sort directories.
-    directories.sort(key=operator.attrgetter('name'), reverse=True)
-
-    # Set correct owner, mtime and filemode on directories.
-    for tarinfo in directories:
-        dirpath = os.path.join(path, tarinfo.name)
-        try:
-            self.chown(tarinfo, dirpath)
-            self.utime(tarinfo, dirpath)
-            self.chmod(tarinfo, dirpath)
-        except ExtractError as e:
-            if self.errorlevel > 1:
-                raise
-            else:
-                self._dbg(1, "tarfile: %s" % e)
-
-
 def _build_install_args(options):
     """
     Build the arguments to 'python setup.py install' on the setuptools package

From 52dcb6d1c888a4a7a047f380783f572055a175dc Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Fri, 14 Apr 2006 19:13:24 +0000
Subject: [PATCH 1761/8469] Don't eagerly import namespace packages.  This was
 the big reason for branching to 0.7 now, as I wanted this wart gone before
 anything went into Python 2.5.  But it's gone now, yay!

--HG--
extra : source : f3c5c19842064dd4a497baef0171aac54464a484
extra : amend_source : 3f79e71eedfc5f37a1813967bb53cf9d92a11919
---
 CHANGES.txt                    | 13 +++++++++++++
 docs/pkg_resources.txt         | 17 ++++++++++-------
 pkg_resources.py               |  4 +++-
 setuptools/command/build_py.py | 10 +++++-----
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4214aca5b9..8200b99a95 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,19 @@
 CHANGES
 =======
 
+---
+3.0
+---
+
+* Issue #12: Namespace packages are now imported lazily.  That is, the mere
+  declaration of a namespace package in an egg on ``sys.path`` no longer
+  causes it to be imported when ``pkg_resources`` is imported.  Note that this
+  change means that all of a namespace package's ``__init__.py`` files must
+  include a ``declare_namespace()`` call in order to ensure that they will be
+  handled properly at runtime.  In 2.x it was possible to get away without
+  including the declaration, but only at the cost of forcing namespace
+  packages to be imported early, which 3.0 no longer does.
+
 ---
 2.3
 ---
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 8dd3e9abda..18b68db731 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -137,13 +137,16 @@ Namespace Package Support
 
 A namespace package is a package that only contains other packages and modules,
 with no direct contents of its own.  Such packages can be split across
-multiple, separately-packaged distributions.  Normally, you do not need to use
-the namespace package APIs directly; instead you should supply the
-``namespace_packages`` argument to ``setup()`` in your project's ``setup.py``.
-See the `setuptools documentation on namespace packages`_ for more information.
-
-However, if for some reason you need to manipulate namespace packages or
-directly alter ``sys.path`` at runtime, you may find these APIs useful:
+multiple, separately-packaged distributions.  They are normally used to split
+up large packages produced by a single organization, such as in the ``zope``
+namespace package for Zope Corporation packages, and the ``peak`` namespace
+package for the Python Enterprise Application Kit.
+
+To create a namespace package, you list it in the ``namespace_packages``
+argument to ``setup()``, in your project's ``setup.py``.  (See the `setuptools
+documentation on namespace packages`_ for more information on this.)  Also,
+you must add a ``declare_namespace()`` call in the package's ``__init__.py``
+file(s):
 
 ``declare_namespace(name)``
     Declare that the dotted package name `name` is a "namespace package" whose
diff --git a/pkg_resources.py b/pkg_resources.py
index 2a47c58b93..2d656f1a2b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2311,7 +2311,9 @@ def activate(self,path=None):
         self.insert_on(path)
         if path is sys.path:
             fixup_namespace_packages(self.location)
-            list(map(declare_namespace, self._get_metadata('namespace_packages.txt')))
+            for pkg in self._get_metadata('namespace_packages.txt'):
+                if pkg in sys.modules:
+                    declare_namespace(pkg)
 
     def egg_name(self):
         """Return what this distribution's standard .egg filename should be"""
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 090b44d265..1efabc02b7 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -167,12 +167,12 @@ def check_package(self, package, package_dir):
 
         f = open(init_py,'rbU')
         if 'declare_namespace'.encode() not in f.read():
-            from distutils import log
-            log.warn(
-                "WARNING: %s is a namespace package, but its __init__.py does\n"
-                "not declare_namespace(); setuptools 0.7 will REQUIRE this!\n"
+            from distutils.errors import DistutilsError
+            raise DistutilsError(
+                "Namespace package problem: %s is a namespace package, but its\n"
+                "__init__.py does not call declare_namespace()! Please fix it.\n"
                 '(See the setuptools manual under "Namespace Packages" for '
-                "details.)\n", package
+                "details.)\n" % (package,)
             )
         f.close()
         return init_py

From 027e75e50a80d91feaad81d496da4d7d1714804f Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Fri, 14 Apr 2006 19:17:37 +0000
Subject: [PATCH 1762/8469] Namespace package doc tweaks.

--HG--
extra : source : 81bfac3cf9a11fbb52b43cb3106419085ac8aee5
extra : histedit_source : 942f45916acfe482998d0cb7adefc08f095dcf0c
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d48ad34f0d..d277dcb5d3 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1369,7 +1369,7 @@ You must include the ``declare_namespace()``  line in the ``__init__.py`` of
 order to ensure that the namespace will be declared regardless of which
 project's copy of ``__init__.py`` is loaded first.  If the first loaded
 ``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!)
+other copies will ever be loaded!
 
 
 TRANSITIONAL NOTE

From d9c4d3c51e93c08a76d310e549c6d5de260667bb Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 3 Apr 2013 02:02:44 +0400
Subject: [PATCH 1763/8469] Added support for Windows RT (arm).

--HG--
branch : distribute
extra : rebase_source : c181b8cc551936e48bdc88d9435018d0d9de00b2
---
 launcher.c                         |   8 ++++++++
 setuptools/cli-arm-32.exe          | Bin 0 -> 9216 bytes
 setuptools/command/easy_install.py |   3 +++
 setuptools/gui-arm-32.exe          | Bin 0 -> 9216 bytes
 4 files changed, 11 insertions(+)
 create mode 100644 setuptools/cli-arm-32.exe
 create mode 100644 setuptools/gui-arm-32.exe

diff --git a/launcher.c b/launcher.c
index ea4c80b5c4..be69f0c6e9 100755
--- a/launcher.c
+++ b/launcher.c
@@ -14,6 +14,14 @@
        gcc -DGUI=0           -mno-cygwin -O -s -o setuptools/cli.exe launcher.c
        gcc -DGUI=1 -mwindows -mno-cygwin -O -s -o setuptools/gui.exe launcher.c
 
+    To build for Windows RT, install both Visual Studio Express for Windows 8
+    and for Windows Desktop (both freeware), create "win32" application using
+    "Windows Desktop" version, create new "ARM" target via
+    "Configuration Manager" menu and modify ".vcxproj" file by adding
+    "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>" tag
+    as child of "PropertyGroup" tags that has "Debug|ARM" and "Release|ARM"
+    properties.
+
     It links to msvcrt.dll, but this shouldn't be a problem since it doesn't
     actually run Python in the same process.  Note that using 'exec' instead
     of 'spawn' doesn't work, because on Windows this leads to the Python
diff --git a/setuptools/cli-arm-32.exe b/setuptools/cli-arm-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..e2d4c3224b7d0d351273f441138047b73da4448c
GIT binary patch
literal 9216
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

literal 0
HcmV?d00001

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0d72f75843..b675e55923 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -19,6 +19,7 @@
 import re
 import stat
 import random
+import platform
 from glob import glob
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
@@ -1834,6 +1835,8 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     ext, launcher = '-script.py', 'cli.exe'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
+                if platform.machine().lower() == 'arm' :
+                    launcher = launcher.replace(".", "-arm.")
                 if is_64bit():
                     launcher = launcher.replace(".", "-64.")
                 else:
diff --git a/setuptools/gui-arm-32.exe b/setuptools/gui-arm-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..01863fa6705aa16245a428a5581020bcc124a620
GIT binary patch
literal 9216
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

literal 0
HcmV?d00001


From 15c27d768157550dd606e3a407eebb19c06c3823 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 3 Apr 2013 02:05:53 +0400
Subject: [PATCH 1764/8469] Respected PEP-8.

--HG--
branch : distribute
extra : rebase_source : 58252278f993ece0a9b96c58c58f2851fa07e048
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b675e55923..3a848269a7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1835,7 +1835,7 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     ext, launcher = '-script.py', 'cli.exe'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if platform.machine().lower() == 'arm' :
+                if platform.machine().lower() == 'arm':
                     launcher = launcher.replace(".", "-arm.")
                 if is_64bit():
                     launcher = launcher.replace(".", "-64.")

From d8189bb53bbd7b3c38ee6c31844087f100143f51 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 3 Apr 2013 02:06:39 +0400
Subject: [PATCH 1765/8469] Respected project coding standard.

--HG--
branch : distribute
extra : rebase_source : ca79464fdbf6a8765b8928b99c8ef2ab69e35e42
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3a848269a7..a6ca741fd1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1835,7 +1835,7 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     ext, launcher = '-script.py', 'cli.exe'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if platform.machine().lower() == 'arm':
+                if platform.machine().lower()=='arm':
                     launcher = launcher.replace(".", "-arm.")
                 if is_64bit():
                     launcher = launcher.replace(".", "-64.")

From abc8fccd3d4f1b4df28f53cdf6ab6ce993097573 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 8 May 2013 00:51:13 +0400
Subject: [PATCH 1766/8469] Refactoring before introducing Windows RT ARM
 build.

--HG--
branch : distribute
extra : rebase_source : 96035e75dcfab459652403b1001f34c12205fd7f
---
 msvc-build-launcher.cmd | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 3666d723a8..f6d7fcbbba 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -1,15 +1,30 @@
 @echo off
 
 REM VCVARSALL may be in Program Files or Program Files (x86)
-PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
-PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
+REM Use old Visual Studio 2008 so created .exe will be compatible with
+REM old Windows versions. Free express edition can be downloaded via:
+REM http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso
+set PATH_OLD=%PATH%
+set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
 
 REM set up the environment to compile to x86
-call VCVARSALL x86
-cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
-cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+call VCVARSALL x86 >nul 2>&1
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+) else (
+  echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
+)
 
 REM now for 64-bit
-call VCVARSALL x86_amd64
-cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
-cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
\ No newline at end of file
+call VCVARSALL x86_amd64 >nul 2>&1
+if "%ERRORLEVEL%"=="0" (
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
+) else (
+  echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
+)
+
+set PATH=%PATH_OLD%
+

From bc2687f1dbf1f96e79ab2afb06f19d3ed3fba672 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 8 May 2013 00:54:52 +0400
Subject: [PATCH 1767/8469] Added Windows 8 RT ARM build.

--HG--
branch : distribute
extra : rebase_source : 3ddd6c8cfc2d46a1b2aaffa482b87cd19e9687fa
---
 msvc-build-launcher.cmd | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index f6d7fcbbba..fb5935c057 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -26,5 +26,21 @@ if "%ERRORLEVEL%"=="0" (
   echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
 )
 
+REM Windows RT ARM build requires both freeware
+REM "Visual Studio Express 2012 for Windows 8" and
+REM "Visual Studio Express 2012 for Windows Desktop" to be installed from
+REM http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products
+set PATH=%PATH_OLD%
+set PATH=C:\Program Files\Microsoft Visual Studio 11.0\VC;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC;%PATH%
+call VCVARSALL x86_arm >nul 2>&1
+if "%ERRORLEVEL%"=="0" (
+  echo Building Windows RT Version ...
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm-32.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm-32.exe
+) else (
+  echo Visual Studio ^(Express^) 2012 not found to build Windows RT Version
+)
+
 set PATH=%PATH_OLD%
 

From 328600bdabf9645cd6f8a16c9f735384c8bfb2b0 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 8 May 2013 00:56:39 +0400
Subject: [PATCH 1768/8469] ARM executables rebuilt.

--HG--
branch : distribute
extra : rebase_source : 385d71111170f3cb8fcdea2fc807d4e409621078
---
 setuptools/cli-arm-32.exe | Bin 9216 -> 69120 bytes
 setuptools/gui-arm-32.exe | Bin 9216 -> 69120 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/setuptools/cli-arm-32.exe b/setuptools/cli-arm-32.exe
index e2d4c3224b7d0d351273f441138047b73da4448c..2f40402d4370fd0b032331896762593dd75b5ae0 100644
GIT binary patch
literal 69120
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
J|K&OGe*tckh(rJY

delta 7
OcmZpe!_wffKm`B`e*&!l

diff --git a/setuptools/gui-arm-32.exe b/setuptools/gui-arm-32.exe
index 01863fa6705aa16245a428a5581020bcc124a620..537aff3774ecd62f4c26c55d0cc12f85c8a20a1a 100644
GIT binary patch
literal 69120
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

delta 7
OcmZpe!_wffKm`B`e*&!l


From b07cff51a39f25ef1efd88bd0f672718e875978c Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 8 May 2013 01:00:00 +0400
Subject: [PATCH 1769/8469] Fixed a (probably) bug with GUI windows launcher
 actually being compiled as CONSOLE windows application. The "GUI=0" and
 "GUI=1" is a compiler definition that affects how compiled code will work
 (.py or .pyw file to launch etc). But executable type is defined by a linker
 and can be changed only via /SUBSYSTEM command-line key.

--HG--
branch : distribute
extra : rebase_source : f909e335ae948d7743e07e690c7d564ad0f98c15
---
 msvc-build-launcher.cmd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index fb5935c057..939fb65636 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -11,8 +11,8 @@ set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
 REM set up the environment to compile to x86
 call VCVARSALL x86 >nul 2>&1
 if "%ERRORLEVEL%"=="0" (
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
 ) else (
   echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
 )
@@ -20,8 +20,8 @@ if "%ERRORLEVEL%"=="0" (
 REM now for 64-bit
 call VCVARSALL x86_amd64 >nul 2>&1
 if "%ERRORLEVEL%"=="0" (
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
+  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
+  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
 ) else (
   echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
 )

From 03be2a031c1a9a881d48ca6c206e61bd39d77881 Mon Sep 17 00:00:00 2001
From: Grigory Petrov <grigory.v.p@gmail.com>
Date: Wed, 8 May 2013 01:44:35 +0400
Subject: [PATCH 1770/8469] Added comment about Visual Studio 2008 Express and
 64-bit compilation.

--HG--
branch : distribute
extra : rebase_source : fb9ba33e9eff145bb3e162f34ae2f0101079d0be
---
 msvc-build-launcher.cmd | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 939fb65636..6d76284287 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -18,12 +18,15 @@ if "%ERRORLEVEL%"=="0" (
 )
 
 REM now for 64-bit
+REM Visual Studio 2008 Express can't create 64-bit executable without
+REM modifications. Either use higher edition or search google how to
+REM modify Express installation.
 call VCVARSALL x86_amd64 >nul 2>&1
 if "%ERRORLEVEL%"=="0" (
   cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
   cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
 ) else (
-  echo Visual Studio ^(Express^) 2008 not found to build Windows 64-bit version
+  echo Visual Studio 2008 not found to build Windows 64-bit version
 )
 
 REM Windows RT ARM build requires both freeware

From dca1e7421f068482b0e307509c1624cb90dbbe3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 May 2013 13:53:28 +0100
Subject: [PATCH 1771/8469] Updated changelog and contributors

--HG--
branch : distribute
extra : rebase_source : 0af5a5ae5cd823756e3461f202571a4a9d0e8fc3
---
 CHANGES.txt      | 8 ++++++++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cae946e0dc..7acd35abb8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,14 @@ CHANGES
 =======
 
 ------
+0.6.39
+------
+
+* Add support for console launchers on ARM platforms.
+* Fix possible issue in GUI launchers where the subsystem was not supplied to
+  the linker.
+* Launcher build script now refactored for robustness.
+
 0.6.35
 ------
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 22c90aba19..487e0a44d7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -8,6 +8,7 @@ Contributors
 * Christophe Combelles
 * Daniel Stutzbach
 * Daniel Holth
+* Grigory Petrov
 * Hanno Schlichting
 * Jannis Leidel
 * Jason R. Coombs

From 6cf20b5f3ea5e6cd05eae3838b4f296c32234f7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 May 2013 19:31:29 +0100
Subject: [PATCH 1772/8469] Adapted msvc-build-launcher to use the SDK, which
 is freely available and will target x64.

--HG--
branch : distribute
extra : rebase_source : 3bb4cc57e38d6fc2d8043ce89c57a5016833d890
---
 msvc-build-launcher.cmd | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 6d76284287..b59c510b3b 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -1,32 +1,30 @@
 @echo off
 
 REM VCVARSALL may be in Program Files or Program Files (x86)
-REM Use old Visual Studio 2008 so created .exe will be compatible with
-REM old Windows versions. Free express edition can be downloaded via:
-REM http://download.microsoft.com/download/8/B/5/8B5804AD-4990-40D0-A6AA-CE894CBBB3DC/VS2008ExpressENUX1397868.iso
+REM Use old Windows SDK 6.1 so created .exe will be compatible with
+REM old Windows versions.
+REM Windows SDK 6.1 may be downloaded at:
+REM  http://www.microsoft.com/en-us/download/details.aspx?id=11310
 set PATH_OLD=%PATH%
-set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
-set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
+set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
 
 REM set up the environment to compile to x86
-call VCVARSALL x86 >nul 2>&1
+call VCVARS32
 if "%ERRORLEVEL%"=="0" (
   cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
   cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
 ) else (
-  echo Visual Studio ^(Express^) 2008 not found to build Windows 32-bit version
+  echo Windows SDK 6.1 not found to build Windows 32-bit version
 )
 
 REM now for 64-bit
-REM Visual Studio 2008 Express can't create 64-bit executable without
-REM modifications. Either use higher edition or search google how to
-REM modify Express installation.
-call VCVARSALL x86_amd64 >nul 2>&1
+call VCVARS64
 if "%ERRORLEVEL%"=="0" (
   cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
   cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
 ) else (
-  echo Visual Studio 2008 not found to build Windows 64-bit version
+  echo Windows SDK 6.1 not found to build Windows 64-bit version
 )
 
 REM Windows RT ARM build requires both freeware

From 254034545b0e936fec613ef964ceb43528330e58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 May 2013 19:32:02 +0100
Subject: [PATCH 1773/8469] Rebuilt the launcher using MS Windows SDK 6.1 with
 the /SUBSYSTEM parameters

--HG--
branch : distribute
extra : rebase_source : 35455b8da14f931b6c4b77bb66b85416c3e13ec5
---
 setuptools/cli-32.exe | Bin 69632 -> 65536 bytes
 setuptools/cli-64.exe | Bin 75264 -> 74752 bytes
 setuptools/gui-32.exe | Bin 65536 -> 65536 bytes
 setuptools/gui-64.exe | Bin 75264 -> 75264 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
index 9b7717b78bbf71f105ccde26746a0f6e3a4d12db..3671e959cabab1e3b82a13edfadbc5fd890a4d99 100644
GIT binary patch
delta 12509
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

delta 14610
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
adUcZeWwbjcw~d5XMs1<4FEooY>c0T7t3!MM

diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
index 265585afc4042ce55c59d28ef1aab37f0a68ecdc..99e63a2661f369b7813f4afec929ea0898767fd6 100644
GIT binary patch
delta 16353
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

delta 16471
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

diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
index 3f64af7de42fd6597b4c6cf50896d32a98a7d6a2..534502814afb759c326900fc053dc2a7399d7d1f 100644
GIT binary patch
delta 1319
zcmZ8hO=w(I6h1TabXAa|Aq^!IU0AS);6}kD_2p$^1}0=WZ<-*8_&V=Qa+^2zKJL4(
zb_7Wl0l{%$d03?=_)`Qewpe#AY!!4N6>(7su3Q8=$)LE1T~rF5bKgu&x)|=yJNKOL
z`_6Y}ecf4Kcix^T^v+FswJrbp=7&#T?hb!%?B48tV$WB)|I#}C`m^1Ow0`r-6WtBF
zKG(f!*C)Hb*!6h#BU<aCxxzWlJ$mRstqf2tl%V(Cn<u{9I#9amyuVebXCL$qkN!}2
z0ZsX=FrEsrrd1P@1VCm#_ePGr1D?jf46j{)D<vN(QYI=w&**3_kYR)x{>dKN9vS-$
z%F>|rv@oI>L_Ri+P!eD_o7^5<yTg^{RhUMYKU)Gg=J*j}438D*8&`M3P+J5K6d2SH
zP|R;V)oxS0s*vcy1i$c2piLTAWJ|g5H)G2)dn%O%U@DIZ?d22#Y;u}e5n-bfBV2<S
zjL_iyc%N|^sM|vR&m7?M?BLGB<8#hQxne1Y<+DwUnI5Gh&HzU;cV|5KwOC1J@Kn0I
zjJiflkZ|1Ms?{JdWvvxOep;NvAfDAoh(5M^H;PmfUa}->%m%(MR#-~9Ud6B?n;P4k
z3ck&*?ToJa9O-&BfJd0(LV2F|zf<kSAQGW%Ww4Ae<usy%0_ZkHnBY@h3Xb!h^vb_X
z^2q|)WfAvay_~uIk@0t(CF&`%a&Ws?RRJ~Oln!)<Eb(=g^p9pY`iBm?aGi0L<r$%s
zWW2u7LM|sz&3@{SjczzgB1CT`&<!=8Mn+6`48nKW-Tv6xMXN(@H-Nxd6x7%tvY1{h
zok&r4YN%UElLMM)`%9vqX7&xyTpcw0l2tI(nraWMQwhPhHs~Y<+YQl1H?a<&9b72Y
zO>|PeD%NBOpIHcX%oTch2w@=DhD|+iK8byP&zVe3t(-2*MrpFb$*0p+3pLHrAH}LS
zAH=y1B-WAAJ>m^DR0Dd&wLM`p7SHF#W%1al^w8UXLowS7psHxjF!w*);@)xjni6at
zfJ>H=FJ2>fGvGxk8H^shm3MS7%I;~nu!qk=YU0$erOxjQTY?82D&d=aq9|!+@DIUN
zUGRZMG!8W0<GZ;3hG1`IcmF*4lq}UT2>BJjO@>{T;X*4vKh9JK-Qz(4`0*?MuP+Y%
E2ix=8Gynhq

delta 1357
zcmZ8hO^6&-5U%d&i+G4JEW^4i_=E02B#^{|m<@J1vu1S0oy_!R4tnYBuGx9no_@pY
z*SZss8T6{4X+4Mr5u-sN2Mu}(Mh_kg1T~i^DjFhTv+EB5FM<K9UeCl`2Zr}vy?RyO
z_f=JoM$TyDyt3c=?$vp3xP0!J{SW-KM^66MOjX`*&U@waw7z-bl)RVL-S2%WZL^-1
z`^@^0Y@796IY(<#gk6pS<6ol!P_s&K>CPYP6WcFPvTnC-1Gqqzr;PRN4(o=UkE}aB
zcHa8cI+CAUpDBN7J&wAvCbTCbY$zFGngT@m*XvUcz6PGcKu^pr!0A#8$umi1jGk8U
z;UI}(RPa~6<NDO}_fSbRDo+V5!XR#8sD(@b{><mEmxq6Irn-!>7>j3ZfP0))jM#^}
zZMx&^ZWJklz_A$A1d!ynp6vA~Uri+F!Xx~mr30n2el_Vx7uFeD5!sVjq5&Q)d?I5!
zfB=^{%z}u~AM_DEgF_gj#{c7e$njD2MDibVfDiJW8@px?I7>;_P>w2VA@-Rbg(J=Y
zQ@Oh_8+>b5(?htNt*oGG5ECRE*Enk}NOeUiNuKZ6hcW0cC?rHD&EAb;8N$<sWP{nj
z=XRB)B=agp)g)Bd<4|xeKfh64ZL+89H2`)o#l=dU_dihXqd_bpQ_5fkVV~p2DLIfe
zL)gQoA{9K$d(x}8*~=#b=r<N|3)VBayE!%cveTxTA}a?s?3xUy2+Jx^18Rv+@^o{~
zdLqBLS)Os>JR_?l&k7|IM%>a$Br7RAN%zy`<4#*d=ye0-%X$`Tad4m!zQ}KGP7mKU
zN)!zT&~}arDs2!ORDS75hHB72)sc#NAVgDPlD)(HeG#sXOa7tJFjI<hkDI3&!J=t|
zL8`ImiypeE=>gioiBeO?OUZL$m_%^OKxks2kw1Yjmh43ndffXY_v>5E)Yeo?*IJ0P
zw9CN{W}OZynxrds&8r9fLI;xTuF@^yzMQB5SMA{zHyVujqIFq3?p1pD*meu~tTTX`
zq)EeK0^nz^9;a_e!R-U^zM<3-#|fSXUM$n`@WBg3O~=FR9)mZw@L9}sKhxY)FKu&c
z!#|v&rHh%OpljoA1ZQ=j2{ferK;bREOWQ33`<wjc?{mAmr6vXuzXG_(F)K;5*eTBU
TG1YPPcvJwsI@|i=%+7xS4U5)x

diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
index 3ab4378e1d401d198b92a33ce249d29bcdb26a63..966409aac92a0131da587fcaed8d980ee1136559 100644
GIT binary patch
delta 1443
zcmZ`(O^6&-5U!qS0*MC&#kk~_MfVtU@S-u<PG`m}%w*T?$<9HeymZ&>yyQ*4_RVYD
z$z^g;#8Z|<M_n+YA)pBae?at<;K9M<kdx7f7;+IoLIedP_*3<IW->WAFubnns(N32
z^;Ms|;-9?YpW5SnxBhh4pMBxX=IXw0hU5SIosWl!vo8;yr1N_A{4l1o*Euu{-TC6M
z<IaWQR(C!(Y|*(a<2KiT(Ql~&ki6;xy#4yKW8ZC<h5Jfd0lp=Va^6qx_kJsFyyrde
ziGT5q7j0bndq@9k?-{g}HEBbg;F8fXcDn$^ZwhIv+C(y4Rk(Qc7{(UfgwUX{<FEkW
zvvP!#nRd0p&>D46q=`ZUe{j{hPI84+sqm2KAVvQGmDHjMjkGcrDx#WOq)q{DZHRxi
z_y4+^RMcq#?D8Xpn8D5x6=Zlpk{AbZi^r(Ph+pE|P<J{6pe9qgZ4YNeRv4RS3u#LS
z@NRk8s>A8aGEFLL@H;~<?g@3CTIj>xA|)xj0N-;_#^2~=2p8c1DzrEapV2?%H_&us
zdY2f0a}G{!45kx^HUDthcKp!wF=m#MsW=e=FzZLS!~XC4s~hY8KG;9a_*Wz~Bt~rj
zyv4qn*2nX#nx`?>B#uoFV4dHDBD1+cnvlgc3qLcgn&{e!F`BMDTRMm$s~SXr_uX@#
zl#bzugTKVIL4%)zaEbVNi1}Hp)X9MBrG@T_P%?445vvH-Xu2_rNK2kFd_jCo+w)#k
zb*TVl<p=>=G=aj}$CktKCy!+c;)My5Po%cdCjBJ~3BX=XD8Ry|-y}sjp~3A^O$$=M
zQ6o%`B=_YT*SxvG<DU0OIe<$8;du|2pg!2`c{AHz^P4ikuq{kO*K=j%{+>nnii2hz
z{m9WlSeOLU5zH*W8Rspw03aHirqH=#OiM$?#|s_7`3dC7@CkA>_=$r1AG!+5SYUs}
zg^u=zSRG8+v_3SJkQ&XqZC2s_ywyTO+j*l@3+p0_tfB3sCTGeM_zgYo32shD(JIX|
z%zlx?f~Lf<5ImP*4+Z_g0BV}H6N{yRUwI&W{dlf$uAoMqAb1BLRJx0!jX70JV)Q`>
zU~{US#oT7OZL)UWxhJd%+erPis*}AtG5XH%tpP+pdz}e`lYUq3^$_eI2lcWyx2s)V
iCVg-k36ybH(qyq!*pG3qqt6Aa9^mrlAC$c#JO2YYi}FMO

delta 1393
zcmZ`(O{g1H6h4!Tu8Iq*KA+uGrF11y(1qx;FK<lj)8r*2dCj7Aao@~IbM0jAaB~M=
zx-b=`;O;#_8xW+3RZv8%AiA@4Ay~T_sEXQl^XLy&anVf|wms)glBNq6!<}>I{Cwv-
z-<hN5-J|E-jhCEjn+sm;v*%8~^Y`lIbn=`Vo=X3*_NDYII%`iXr`PG+dgeg-lRaNc
zuiEoq`mQ}!(i?QvrQhKkn@>KztyTmGj=7LN{AcC#*0%iD?wMOoeR%f29fKd8SJ4#L
zrSVjNHLZN?^#D3<OGr~vx*?-OAy(JkMBl)1@H7fDaVr3Pk#8VHMm-gxXLPtvL_vre
zZgSR&3X%{@GQ<_pMe_a~ijhI>X=$V{!UpAhP^t*v`cT}S8{E1Vl;vpw>~b3+VhlTT
zl#t;Sf<Rk{4>*i^f;i?_Pj$Nlpe!S*_5w#VjL;^Dm!q~Sz=?d_gsah8G75_8aD$;|
zbv%_s1_tnA77}E)0Kaik#^3D62;aji7^1;h_>6v!+eF=!(LG`SKDTfZtudNHTyj^V
zj^&5S`xqMvrsPBjz`WbQ9p-<(|2*8hvwbjP{QD&}B*tw3Z17!Ksl!QJN+O?g634m^
z@IHU>L~Ig`G$DiQ2Cguyvgnzj){4r0l-q|QE@?!75AAy)43!TDE&LkO1`U2Mcs1f@
zJM&X5R>*)0x#iw|5z4^oMjS%;g{JGXh?L|h!*|5jti9JMg*{3@Q3=8#TQq^pdYLVY
z<6j=j48$*|Og<l(W{30_EC&D!9FT#9O}9mgvO<Hua%Ck*0c%?5K1uGI<G(t)o!3Wu
z9A_?HfHNcEIFIF^%op=>Z@VoSpw|()sVYfm<Wk=t{J>80yFRgm5E`aIcLj3`aMIpp
zdjPO9I!Ue%wV9Zv^bcDl4Hxe`>JrH6=rVmAoU##h%+S7P`x$Qx@pxj!riGzFEKzGo
zufw`qO4@DIw2yz}%3ejp4WnrvsjWxyQ@Bkv=>aazdeQPMFswlq#1f{!#Z2OyhHuE}
z8UrXR+DFXR1h#ktTz)c1_%x$J9wB%hc%kayct?(9+>d_&1^8g5ooZs@#I#r~8~3?U
zRnj{x=XBHh<39^mEkGS;lVhQA+VAT9H<aMQsFHVfKf9K%lOi|_AZ6UeD5$nG`)TfV
S{DWYf1DyNz<Gl06Q+EL*j`A1)


From c92962cb8abb9fe1897f87cc7b3fa9afd5bd7677 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 May 2013 15:04:17 +0100
Subject: [PATCH 1774/8469] Update comment to clarify why 'Visual Studio' is
 referenced for the SDK.

--HG--
branch : distribute
extra : rebase_source : 1f0b5eeb82b7551c66b15fb4379ec03e61d68344
---
 msvc-build-launcher.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index b59c510b3b..6097aaf881 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -1,11 +1,12 @@
 @echo off
 
-REM VCVARSALL may be in Program Files or Program Files (x86)
 REM Use old Windows SDK 6.1 so created .exe will be compatible with
 REM old Windows versions.
 REM Windows SDK 6.1 may be downloaded at:
 REM  http://www.microsoft.com/en-us/download/details.aspx?id=11310
 set PATH_OLD=%PATH%
+
+REM The SDK creates a false install of Visual Studio at one of these locations
 set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
 set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
 

From 23e024076a9902aa8aeedd9947c0fa5a4e5408f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 May 2013 15:23:44 +0100
Subject: [PATCH 1775/8469] Use x64 cross tools for building 64-bit launcher.
 I'm suspicious the only impact this will have is to enable building 64-bit
 launcher on 32-bit hosts. Also rebuilt launchers.

--HG--
branch : distribute
extra : rebase_source : 329591eb07b9d25717caee614012c8278926559d
---
 msvc-build-launcher.cmd |   3 ++-
 setuptools/cli-32.exe   | Bin 65536 -> 65536 bytes
 setuptools/cli-64.exe   | Bin 74752 -> 74752 bytes
 setuptools/gui-32.exe   | Bin 65536 -> 65536 bytes
 setuptools/gui-64.exe   | Bin 75264 -> 75264 bytes
 5 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 6097aaf881..07c474d4dd 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -20,7 +20,8 @@ if "%ERRORLEVEL%"=="0" (
 )
 
 REM now for 64-bit
-call VCVARS64
+REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
+call VCVARSx86_amd64
 if "%ERRORLEVEL%"=="0" (
   cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
   cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
index 3671e959cabab1e3b82a13edfadbc5fd890a4d99..b1487b7819e7286577a043c7726fbe0ca1543083 100644
GIT binary patch
delta 16
YcmZo@U}<Pznec-7$A<2WuSNd@06w7zX8-^I

delta 16
YcmZo@U}<Pznec-7?u@RDuSNd@06k9#GXMYp

diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
index 99e63a2661f369b7813f4afec929ea0898767fd6..675e6bf3743f3d3011c238657e7128ee9960ef7f 100644
GIT binary patch
delta 19
bcmZoT!P0PoWx@+)fsNgbueZKt6jcTQS?36)

delta 19
bcmZoT!P0PoWx@;QA2YfdUvGWQD5?wqVh#y&

diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
index 534502814afb759c326900fc053dc2a7399d7d1f..f8d3509653ba8f80ca7f3aa7f95616142ba83a94 100644
GIT binary patch
delta 16
XcmZo@U}<Pznec&`abx$!&%FNuI5r1)

delta 16
YcmZo@U}<Pznec)6#f+|vpLzcS06pvoMgRZ+

diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
index 966409aac92a0131da587fcaed8d980ee1136559..330c51a5dde15a0bb610a48cd0ca11770c914dae 100644
GIT binary patch
delta 19
bcmZoT!_shuWx@ky$&KBOkGDQ%lvM=)S|<po

delta 19
bcmZoT!_shuWx@kyhM8TBkGDQ%lvM=)SWO6a


From e16d0f5833d18c32f19cffe9c3fc6c6b69584c01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 May 2013 15:24:43 +0100
Subject: [PATCH 1776/8469] Removing legacy word-size-agnostic launchers.

--HG--
branch : distribute
extra : rebase_source : 5c5d41bbbd0a6731f81cf48afd436be6e9524ec9
---
 setuptools/cli.exe | Bin 69632 -> 0 bytes
 setuptools/gui.exe | Bin 65536 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 setuptools/cli.exe
 delete mode 100644 setuptools/gui.exe

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
deleted file mode 100644
index 9b7717b78bbf71f105ccde26746a0f6e3a4d12db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69632
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
bsj9#HerbVUTHu!!_@xDYX@UROTi|~I?X2KC

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
deleted file mode 100644
index 3f64af7de42fd6597b4c6cf50896d32a98a7d6a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65536
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


From a011aa8e2f3b911c809a5eb52f57e0584786ea4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 14:06:08 +0100
Subject: [PATCH 1777/8469] Updated tests of win_script_wrapper to use 32-bit
 wrappers

--HG--
branch : distribute
extra : source : 26421e9ba211b7e14171673c46c45692b6c8501d
---
 setuptools/tests/win_script_wrapper.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 9f7c81d6b7..9ccc96f07a 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -38,7 +38,7 @@ We'll also copy cli.exe to the sample-directory with the name foo.exe:
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
     >>> f.write(
-    ...     pkg_resources.resource_string('setuptools', 'cli.exe')
+    ...     pkg_resources.resource_string('setuptools', 'cli-32.exe')
     ...     )
     >>> f.close()
 
@@ -83,7 +83,7 @@ enter the interpreter after running the script, you could use -Oi:
 
     >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
     >>> f.write(
-    ... """#!%(python_exe)s  -Oi  
+    ... """#!%(python_exe)s  -Oi
     ... import sys
     ... input = repr(sys.stdin.read())
     ... print sys.argv[0][-14:]
@@ -126,7 +126,7 @@ We'll also copy gui.exe to the sample-directory with the name bar.exe:
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
     >>> f.write(
-    ...     pkg_resources.resource_string('setuptools', 'gui.exe')
+    ...     pkg_resources.resource_string('setuptools', 'gui-32.exe')
     ...     )
     >>> f.close()
 

From 8aeb4633600f478ad3ff743b58df55d6c22cd2cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 14:01:53 -0400
Subject: [PATCH 1778/8469] Added tag 0.6.39 for changeset d737b2039c5f

--HG--
branch : distribute
extra : rebase_source : 72d42023ba7b68f0f14f73dcbeb29b75cd334b94
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e01ab6986e..b433c91f43 100644
--- a/.hgtags
+++ b/.hgtags
@@ -48,3 +48,4 @@ c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
 be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
 2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
 f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
+d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39

From 3ab400cd437e4839cb8d4cc70dd5889a5b0c7469 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 14:13:13 -0400
Subject: [PATCH 1779/8469] Bumped to 0.6.40 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 355bf27e11fdf906de100c2a47145d44fac082cc
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 7 ++++---
 setup.py            | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index c2bfc20f64..610c52ce33 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.39.tar.gz
-    $ tar -xzvf distribute-0.6.39.tar.gz
-    $ cd distribute-0.6.39
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.40.tar.gz
+    $ tar -xzvf distribute-0.6.40.tar.gz
+    $ cd distribute-0.6.40
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index f9dc2d7425..c098b9d269 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.39"
+DEFAULT_VERSION = "0.6.40"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index fc60a00841..ac332deb98 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.39'
+version = '0.6.40'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.39'
+release = '0.6.40'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index aeb989d52b..0f64fe87e0 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,8 @@
 except Exception:
 	pass
 
-VERSION = '0.6.39'
+VERSION = '0.6.40'
+PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
@@ -118,9 +119,9 @@ def do_release():
 	if os.path.isdir('./dist'):
 		shutil.rmtree('./dist')
 	cmd = [sys.executable, 'setup.py', '-q', 'egg_info', '-RD', '-b', '',
-		'sdist', 'register', 'upload']
+		'sdist', 'register', 'upload', '-r', PACKAGE_INDEX]
 	if has_docs:
-		cmd.append('upload_docs')
+		cmd.extend(['upload_docs', '-r', PACKAGE_INDEX])
 	subprocess.check_call(cmd)
 	upload_bootstrap_script()
 
diff --git a/setup.py b/setup.py
index eeec315368..9d15793cfd 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.39"
+VERSION = "0.6.40"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From c814c26df28f82dc18c3000a130e6b7c4a4b41f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 14:18:08 -0400
Subject: [PATCH 1780/8469] Use HTTPS for uploading the distribution to PyPI.

--HG--
branch : distribute
extra : rebase_source : e80c6f51364bbc373c016479e4b9e3e11be2db97
---
 release.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/release.py b/release.py
index aeb989d52b..b39ed73b26 100644
--- a/release.py
+++ b/release.py
@@ -23,6 +23,7 @@
 	pass
 
 VERSION = '0.6.39'
+PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
@@ -117,10 +118,15 @@ def do_release():
 	has_docs = build_docs()
 	if os.path.isdir('./dist'):
 		shutil.rmtree('./dist')
-	cmd = [sys.executable, 'setup.py', '-q', 'egg_info', '-RD', '-b', '',
-		'sdist', 'register', 'upload']
+	cmd = [
+		sys.executable, 'setup.py', '-q',
+		'egg_info', '-RD', '-b', '',
+		'sdist',
+		'register', '-r', PACKAGE_INDEX,
+		'upload', '-r', PACKAGE_INDEX,
+	]
 	if has_docs:
-		cmd.append('upload_docs')
+		cmd.extend(['upload_docs', '-r', PACKAGE_INDEX])
 	subprocess.check_call(cmd)
 	upload_bootstrap_script()
 

From 068ab0e3a6e5146137ee9f913e3b1fbc5b337c22 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 14:44:35 -0400
Subject: [PATCH 1781/8469] Fix error in changelog RST

--HG--
branch : distribute
extra : rebase_source : dce6b630b2c568a650c30a8e868d0d03cf36cb19
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0f57bb95b8..6053c70376 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ CHANGES
   check the contents of the file against the zip contents during each
   invocation of get_resource_filename.
 
+------
 0.6.38
 ------
 

From 9c6e0172e04e260af141ddf0362c6141a375763a Mon Sep 17 00:00:00 2001
From: "guy@guyr-air.infinidat.com" <guy@guyr-air.infinidat.com>
Date: Mon, 13 May 2013 15:21:51 +0300
Subject: [PATCH 1782/8469] issue #376: copying cli-32.exe to cli.exe and
 gui-32.exe to gui.exe to prevent breakage of other modules that take the
 binaries from distribute

--HG--
branch : distribute
extra : rebase_source : fb86f5549568529753c0be2357128f41039ed740
---
 setuptools/cli.exe | Bin 0 -> 65536 bytes
 setuptools/gui.exe | Bin 0 -> 65536 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 setuptools/cli.exe
 create mode 100644 setuptools/gui.exe

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
new file mode 100644
index 0000000000000000000000000000000000000000..b1487b7819e7286577a043c7726fbe0ca1543083
GIT binary patch
literal 65536
zcmeFae|%KMxj%k3yGc&ShO@v10t8qfC>m5WpovRhA=wa=z=p_%6%z1@blsvwI0vv2
zNIY4alVK~j)mwY3trY!Sy|tffZ$+^cObBMdpZutbN^PuECoa`kXb2K>zVBzw<_Fq)
zU-$d^{_*|%@qt&)nVIv<%rnnC&oeX6JTqHy>n_PINs<G9rYTAL@TPx0@%--}9r!$a
z((i^#&t<$Zd7o|Z8<TGd-?_=NVdM9{v+=gOJh$I=_ub!9J^yrvXQOtv=gzx5rAw<k
zcYSZ|9am>%4a-Xw9jfY!Ot@}WQUBkK=MqH|Mf{(O%J6=?F0E)R-u5-_q9XB5EmFjL
zRMB1HZ7a&fd)b}0hpCKjVjS>G(qfxk>Uow`_J8Y;?6yo>h9td;lqFW`r_=Cu;je?@
zJ}aCeNvRaYzy7!6vsuJK8t7Ip04X137Vm)<B}y|cNYZo>`v3N5I`@q}=|CK){8#_3
zR`1xV;$zJbJP0ppD|Paae;!F%bM?lxx2d-wfQV@O6ujTW-;jSkRCTolCLPMh2Nx=)
zGP{NVA?TB&mP=FqZ|whc3RJSvJUJGyHOs!nBie<k<-z=e)r`kVud+vM0lsONB<Y9b
z0<+))qcqReE=`GTutop6y*iN=`x&*3EzZknc4W?3rP&uIJaeXK<D%wvS9N4nkT;0D
zPW$-+vpsE9St6ytWVaCXsHU`%GVdR^wE=Xv01fto0vp%r_OvPOWj3j{W@V_Y;fxbp
zySskme5v4&(U>PA7G%%m<=|b-UJ~!-boN$bi#jT{Hcy&A=Niq?KHpr`Y-?=MzKk{I
zIl-)f*v>o`q`5M7OP+gKtTfLZsOCS(qPDr~x8=!_5`6-VLD0EMY5XaI$Uqq@V-Jap
zR-V}6Ja=V~*CHdz@F4Rb<?;{KZ*yd>ij_JtwPEG;g{#zT!Uq*Py$3gDv`Z2tYF|X8
zYEi!^3#I2mi!9?8K!AuX>_C;=ltI=m5eE7*@I4UZ&p}=3ho&bc^h3P|C;`K|s)PJt
z@!8GLOb})@Yp*SMou>fLhC@WZw%7ar>1Sm0aW&hPm&@Wqv5z<cJW4gM&zmkfJJ+a@
zj6&r=dVrlbR^{dLe--p{MqAX8%7LY}g_XQXq&T82+UL#6!luP}xs6BE?<fb3E#r6f
ze^S%+ZFw$9UEExnmrHC?k~jf28Qa}v(?%Aw6cJb9i=;f%LL7GNV)O&mRYm+WAK2)J
zoc6N?AE0A$CG}^`sG(_iS>i_&0GwOEjRhPMrYB*+WA64e$@ELiFO?ay?gvgcC<n$Y
z<L^1CK%h$vSZG@q;PL(x?eqG1V1nyS(*z5;SA+M!_HB5xgCaCQzioLANgKIa^30b|
zP)0-wnAuW?PuhpB1D*9VD+*d7r2(|XN$tU(8-F?I^V~ojiGY&$x^&Sr^ySP^J_*UW
zrARijT__0kuL5&8h*xu#MI`axM$bS5AWndQ;JM+aKJrO?BE}`X#TVcgz$PT9E&8Dq
zZ6JXIg6WKy%Zx0-)XbKtWRx0n<OM3tY=>1!dbl2?B=#{!9_2$Llg!~3%n@58CG`RW
z1LPlkk=p2eFSa3N`&F?g@~A1mHitQyVq0yNK4^CN8joui^5gTpuf^0f+qMtEYVL?F
z$fu`~#PaZA)VQ4Amx;XbZ%EJqQT~UlXZwx7HHW!>vn=MgCVU7v0(=qWSe%!~9KS(N
zgLM=3LHzO$mU+*{wx!#)wXd#auhgvU=lF&*IVnT+hZ`~0nCHPOETKA3I;S!sQ8$^{
zZcv4UbEsTEpxvZ3yazYCQD1%G)vA+(ndH~oy5$RmDNA{h9?j)8QlvdBd-|V!63d!_
zr{P-1vS(7D+|itM9Rk61MnI<ijY!Ly%7^jv=YUlg`cLmOwOJ@HClJm79G^?wO8q+)
z2vf7m?6nYbY6S#*GNiuY5H+x^+G@?tJP#TL9re>+K~KhBa?C)KKh+E*p-K?e54p;H
z-uNb0vkbWyR)1lbnp%G$OG`vjpo}PU*o}&pp;`PEODluTuiNcFBFmELneD_AsyG+G
zkGm*r)oMJHmxrXL#=Plxfj%;6&nXBm<I#%{teK#)2aU^vKFj+G2|d8ZfX<DYT4pfZ
zfo|^HD@jrnxXrnoJ(D*BEsHtwkuBFp`spvA2GpIQLK~G_Fij)vWt2{I(c2x~KW)!t
zCOE{y+%GQUQ^og%kazlaaoZ=NV(uK8O?>)d`#6i)km>UtDzrb-*V{hPU&@;WB&3=+
zxL1-^s(vuM%+x$5wc!b>TMmX_2j=|8Kt*)b-4;r#_ff_ny|oEKpX@DE=!THWD9l;8
zEWjV=HO&BTAtLP*tp;IMlM0_Vn8(sUqI$?Nv_U1G^tEZC@of=jxa%BH_{Ai!MYo}y
zE@)vjviC#f;TCVZ=HXtX$EDFgCrJNz+eAX#tsgc!-#{X?u;vu7>K}|6xr+Y+O$ixV
zZ+D5)r){a?S581&?=jW!dQYD^njLNZDwQ49Kbq9~QJUTP@Z(p`mlCNjK7uj2dw$*y
z?Fs@NOQ3Fcxb;G+-Z81QBhBuJS%CWlpf9gp&E>m+$xzI$NMcrT+APveYg4QEVhkj#
zC+2qrf~MxI;{Q2Zk_`Xps%rkG7-Dkc{@y;QZ4Oz0#y`#fgd*BZP3DWK6>a+@*L<mM
zcZ+wv6pXlQp*qv|N$8nGnzy|!owe_wFT`9w_5eJz=cRm7?ApYLBWTQ~Z~Xh0d`OLq
zTT$CqaQsCoH<7xV;0<Sr-s;g0IvOs}L}lA&k-l0$xByYj4z~8BGDno!&c4z=oz(hi
z8grx*iDYlPN`q&LaV@ehXt=Ne8MeK-x}c@DjsM$J%twl6LU~JSD&H^}!^3Q<i@!_g
zv@vrzI}>D@EZXPo+Bl`5Zw>0+GLF5OFNogis^p(SM>i~SO7+N+7^b&-f@XG3hYwRL
zs{rPg^&WTKXuZW1;J*Vf^E(^LEqH+VoqCH0;~Qle%pqFtZQVGjSX7wPu*PZbFwOi{
zG*lGy6QCZdX|wX?4#`^~>lfT8wQf{0k4{L2{|oR+{f=JfFn@0V9WOeR5QLU=M!U6~
zB7d(sir<zi(J(xWuRwrR^cpgzK1ceMKSTyn=7h94qQ})c3tBJ-kufbC-S8FZ{*A-+
z;wE$p2;6zcG#Z^Q=wCTDUVHvM{Uf{T%s<wYuE%Y9r%meyA9u+1R(iScdR70ky|pt%
zO*{K56g<p=`;6dF!Rj_V9Z4Kex3fBWL}~ny1nH|{??HFC&$rtV!@%g$GEs~YjUt-3
zyg5y8xAoVl=3`2GjRmRwg}nzj?Kb^myE<wR3=lWy37hs;ROnh+ySnXsoC;P)_ZOlx
zK7zQFs(oe^qFNu3t$Ssyg|9J2k2}y#^%uW0`}(%CH2YD#%Pcs^MniW#E!k`h>Z!)#
z>Ws#2b>jJh;6zDv(pxgML&lgyPQ#zcbb!!sgpiDoqu{tG6%!Ja>nvz7KufAa>qaA#
z=oV|HC9oE}Y-%~C<~B7KIy+)gcYDw!`k|a8<5gBx6?_n^Hfnl`YGk#JRXDw`Y3W5Z
zF72K~Dqd=&sK!kRIocXZ$WcQ@HMx}F(UwwzM=dX^$<yW*)lApsLU0ONe1#L$wDK}<
z+m`P7xi@OFy|1a`^g5Sax&QBIL?i`BM9fM)?J~l{Rc2^%VhrUz829&peWXrWCnHlz
z(^x9cG-`TL;&SCcT7aJf@*!}hy(}@hIc?50YSx@pYQ~(aH5qypGnehQvcielAG{aU
zX~0_@&*J%hxyYZhxenZpYC#MBj39u^sFM>J%<uNLp{5+>??vDyuV3EiM+4QdBA;io
zzdv6tSFL<#t<s2TfRwNG7HQKrPlW>QrIPdbG7F+JhObn}j(kln(mY$%K{!!5k#)1E
ziz+3WTCrR!=CNXVR%|-O_{kh9N!CV3M%Px+KVv3eg)|H^tUYmMQB9Bbm&lY5<g+!A
z3q(W{bNLa7G-%8GR2a%BXjxsm@<>uSRpgw1Z~T#cB&t&nSAs!Ug_}|kVHMz$WCS?l
zqwD<1@hy6X9b^#7A}+?pyqY#|7U^Uy<!oE$R#G6OIHC7~?928tC#m||`Rwb!vt=?X
zUvCU&<zZuqgAMm)Z5TgaQb)3^o#QYflyA_|`O&KZm&VE*-qc-V@o_Xmrh)G=FTI?~
zaUiwZw;@Gy>*X6#P>C%ujL9h3=b(@6wKWGF78?2)w89yy=;G^09Q<ASzGu)Qw(X;0
z{;ohoCMo#dETWJz;bQfN@r_l;$_tKiy+f|A>y^}WR?(y1w&Cj}$@F5L2YsfEL<3pY
z8Z-dF^8sAbhP4Aqi=v(obhDs>e#QftDyng66L`)T%)98HH5&8BF<Y>v2#E?5hTb_9
zH2mD~chFE=MQHmw0&)Lo6u2YqKeGV1@zG*g<1#Bwv#zb_%-_+JlMrxKd<~ir3Ze1+
zy(_eP6{~SYKhV+(S~~v~1yt)79UHaSeZ5h0^WBheRNU;+TO4|;1L|kljg`GxMRVY5
zgy-B?`L%XKbD$65%Wkaf(<V0uOoUxGf)z4#f3Kscu6N_X#60DBpQ${*$V`+W)Q3=C
zVh%!IBlLCRI)r)=>P<|yYD*~1E|lWFafIgb%{TqMMK!$}&wwd`weq~AJfD%@n)sU_
zUiHfyy0+TP&cgr)(wf;G1RCO$+F-8vOp><HO7p|jNn-Q6t|xsd^WT9I=Ikc$B){h>
zOt(p4nn%&aNx*RFpHZMF4f(Ufvk=7?JRPMYo=R06O@dN!hp9(J{WAdZdPL@b!%!G%
zLqHJ$fo+g=B{EqW3P?d+m=J67#;*QZ08JwbS`rFm!NrD0j{xSFfN^d-(+{H;KZnVO
zq>c^Kn`akV>TQ^)nUX?$=?!SjnvZ-^xEv3@Td*3+ToB$GLi`Q1f1eLu;*Pvh0=OLj
zdhtFgHl&UZQ-JSB8KgFySnsCLa+gvITEM<JVb|Z0=_NNbv&@H6(`bHB@Igt@ghI@c
zl*U&;NMph*gq!`YU((D;uXAEi{}>T?_A^wxGy~aKk5P9rYN}h!*-ueoBA*hw4DFOr
zciPZ8^v@j#d(UsI=5c%~N>l%e$W7+;ycJQ_!+(R9k!HS|Ec90*HCfot5kX%T)t%N-
zi~Jqxa4NIzB;-ca!0JvWei7b)=I>ieG+2$PYbd;x;wr_LQoMggi&;CG;F7fIhG-(%
zJ!c$nrEc$qdPCdkvnu1mRQk}y|2ztlU(w@aFd)D-lsL#-NVQSwulrLY!m_|0v*K-t
zB7y%f8D%CG3s<7iT|s_@7ZVu%+>P|Sc?3OwD#DH8xgHD=<f-VsApaaa9sX=8nv;#Z
z`k}l%#O<|7rBhsro=L%+c2xoT1-LwYZBh#O<!BUXr-(Z|lREpYkzkpMTP0~-Q7W02
zwZh$V@M_pc5wh%Sm%o^4qt8t_^m(klPsMxqW>>+Hq9%@@@^GtBaXR79?>LQ?^WZ#C
z2`ni`a{1lFpInCsiUb$05edblZ^2mnBP=hXEp>8aJojRG7BaJEcKD<{j}yzhTP#U?
z=Aa#XBtim8=Gg?r4Uj`5WN-&1pw{2h8%&)Z;9p{i7uubJoO^Qd2$-{7c$u@ERF>y&
zqN~6wdfjPB!z|)D^aBs!k+_=q&oG%~7!{|m@ca2}v;&KPJ2>;78Umj~@P&9JSqLha
zzlFYP<2&bKzVZaVB-Mc?2YHnu!LA|`O$fbh{3s#N;_-HA4$=p_MZ|rGufc4|OmzUu
z^JPvljA~1&s$+Aa<w()zNx!G<0L@dyGr)f#BOMeS6)ST`QZT9-X)BDf9E^O4EH=;B
zE*o==+8m?Sfptj=P=j*yt%Pm3WkA!^$&z|GbdnQQQMu~aAXl=XRo6Mq&w=2&97(@S
z($~pS2zk2aJAG=JelIfRnTs4-Gueoy6w{_W-;!`D2U;p&H9!}KX!)wyGt%13G>Z>O
zBaXr}qS-H-6;8gFl+j!hB|&HG__QCH?uAZY6+qd0>UH`KS<+@;OtPgV@|*2uh0NaK
zb;wtOjM^yvHpr<LUa2YUt!L-)wNxOQvg7UAl}UBoaAs>tzb)z&!{3Y1&uQu2YF0;6
z-&pJkNPw~TIeP9tMbGFy@$3@M*Ts{I=TY%&5zoVT@~P)d6APo+yaISwqj*6}fd26l
zSTkcVuiyVH03~%8i#~&ZzGlPMWCA!0Gf#IJR{FI;?gP_@en$)RA<KPQ>9elZzErW?
z-z!$}DeP6T*8k_BYkgYiUq~IY)=yyvyM1}}O7uIRM!^y9drD&sLd~O$*hyeu#5%<D
zB|MuR{sPa&<4WTs;8UXSCjiNK>=0hc&P=2=ADrQtvtr8#<-kGZK>Z2~i+YDr(2b==
zcR`DCps{r;k|OD?J&uqOeF)jSt;!F64YPom7yZ+9fQ}L6K;B(=8G8lk_6m~j6~x@z
zCDMtQotu#j_2}HA-lTK8dcDqNby|73nvIwet;T0PM(}dy%>!Xa=e&Wit+N2(1_4tK
zJ>Ho&@F}G;2jTj!uGD5=No4gi+tKUoGxifUO6&p|zC}*Q`Nt@!^HZd-C<VXUGE6z}
zYOGW~YKVB}>-c2srIvNJB1pwv_RV7Hs}lRAC|1y*^It@P6dqcjDCIs;$|7}n{a0bN
zwEnC0YEJ!ETa@VSNVnP}A=G&bfqB<!qf3&BkW{O;I*ahh!r#?-)j-(OIT_(*`<&~w
z3HA5cW@%$e`m=&S$*g^tLCz@<0M`kCCyB^pUPuD`kpR{zjc?QYPNne;dVddtKfN`j
zaX-DcDvf*Ty+UdHHQvTv;)Yn1ge#yte=uO|J&YiKVh)%++R_{)&I_qiSd0WOwwE}M
zKLJhMY%j5@ZER5*pMVy>1mb=`bXK5zVw9e>%7YwwQE9vvGOqVjDG&Y)-L5pEZIaIC
zt1d9l3jE3C<x2EN7|!Ysdg9Sts0z6xi~B92`HDn$#vVI|kHS`EJa!sEBl<X=N~|0e
z#G}+#WRvWC64CQfBGXLJSBXA?#3B7;AUgP28#eff33<>jm|E(KL}PG`1?WOK18iyR
zr@EEK-#D<=?b9-MKLq7qL@AMpXFN*8q(*e^0F2H-_4k1j+Inw(tI~Km%BD8|oIZZL
z3U#LP!ouD_m~3*fC^b0{i;`Lh@J}(6VsVI}X;M5&;!2eyMl~<&Z4!WS0Y`~eMhmOX
z*{Fz-wZUowjBH+3?(n{;&a#?E?5n&i88K>u>i%i|!DBr`8qsAZj-fVnlD&ENu7UOj
zcr8tPJKsdI-m^h@@FMC~8b8KU@3}+S`I1Qgj`G7<7-#jKJJoyip1alQde8Ti=;Qd-
zEqbZmLK{d(>TSv1K-&|`*$o3Y^LH_kih}8`ftlRO=24yNSd>_EospK1t)P)MNSMz5
zMFbXV!)H|iohdPqaK2TlCsdyXsw|yVJM_5R`8Fcji2AR-qupV#6XH@LR3unydzvBM
z4f~1F_TbC*c}(zSLwgMXgM4Bpq**9!s9VzD=qH!e1;$?DRCY2k%qp0&7j#pf$VRk@
zJ}vAuqB{{t3Z*G@GUUh<RahMtFhwyjk)sMzr4_lDBo%wm1?Ew<pEzDWl-uxWJxW(S
zme6Q9$r7u~*=q@WxCI^x)$b=M|BjXmCLRK`hJZRJi82A?y-FLA>=QH+(oZ~6)oG_G
zm7oW8n-SZG)I^@nHz|$JLoI;48x87n8XKNR#<&=^F9+-;eGV0gPPh}0%>uwt*&h7^
zikjIJeH*WM^eCR-1*y{y7<3vkDAAj#<hY}|)uZNEl<988lt+1aVQ<1g!t+y1WES>P
zqW!0sNgW>q8t;8)$CzynZ~LYZ=TGX#rStC(HZCa)yTB3evmPy_-~(OswN&RE!Vcqf
zp@Gi}J#;B+uy|&hmNr=+9n;P-K_62nm1xV3H2SPw#e|IhbXfof`+6|7-a1piP-HwN
z7^H{2zdg+^sM$1pNn(G@e>T6pEQuKCV2I4dULmNrfxpt(oApIA)u1V4mx*V)ZKf|V
zchNeer}=!|H??#5LN6WbNlX_CYfykKg_THOR9^_2FTwuZg0(8r_mh$V#aE#VnGn{e
zeCl;DfP%p?tggB$k@J+TKa!uwd@4m9VSVvf-3M5SiBUWMu?`fM{}^?u#Rg7oj438}
zF(JrR5f9(+cj98FDW)K7zZihT$5@OwgKx%nE3=G6vK4Y@Bde<-Gp$1S)m91meo|RL
zn<`b;MO(K26BC3>4jV6|nK2@IAd(jIpM#El1d*~p8E?Q^LTFiSdXY#}J?38eXq6wU
zILE&{2PF4XZYiYgP2}og_GW_ZL=T`a(o6hRfQ6D1w{88ns)Va232{Fagx$LRq%S0O
zl)0Az+ySZ5pA=~!CT4ui_9ihZH^Qxh#U26>6Z7Hbqn#h2z5ie)Ybiu*0bt+kjg>s@
zjA<Te+x6L%J}EKXCyl?tC*6y`SMYZff1{CJnvdz?E#UyIH1B}!gaNm%H|Bp7#ui@(
z%oNtXQp6YWU}CIctPO>{aix*=UiZ)(*qFTw&sY<UCyANuK8K{sX1gzSn6XuE_vK0L
zzG=hSeU~9x*zTJ}dxI>C@-?(l4s4*jzOJb5O{H-dahv}rm2DF96vkFyo8F5}t^)$F
zZ(9oMi~Bo>vl1%_AO0!k4`R(0WECATr`T9CY<emo<caMP7+pC8BYll5)vw8`??*{r
zQwa1doJQE+frH9%)8A24O!>DxmPlhFq~FmY!A0jT?5Z*B+?Z-mztE>vHrpWqH$Nq7
znQ$bS14=<K=P<2<wbKUBCzDz~Nwd$g_PdY~mJ)PknIrr-mL;(=XMopVX(6vP9zl!D
zG8t8u=>F3%*>!CDalr@dER`@@Y?!6d@*<PA64UCJIO-D{+shmcuo$LBx>vxe+Ey;C
zzAb-8pA`ZV>?nizOJLlY2g_U%w^_#AX+&7PCq<)De2EOb$F4aLln1f;?205wZvaM#
zVFVXXgXYER?xJ1UNedWLbhw#43pHVVJOXQCT7oAT1xqP@drH6g1<S->K{s|^C-D8~
zII-`VG_Cp(PnuTk%;)M~Y9hy;0G87Oi^b`fGFXmJv{=-iJc*G;s){U*MNc7w4PZX$
zFG5NYGosTWBeCdAJRx94bOr)R^%*-w;fF~?jmJo-7}k16tTxu|e7FZm>vqP@h}UDJ
zMb_<%9ulu7Tg2<vB$|&tC^RDTJ7N`%xTwhn&1g*%jMzDVutmMrtSTNQWXCw9mbgHc
zSQk?Rq?y?(K)r~>PMX=bAQTgbqx%Agz--_|=gN^3-U*{nC`=`o*^BWB5aoD5zDc^L
zbCPah$}ndW(fDOKfCnSmYs?O0|98q>)A^t1Kmi5fV)^NK<0K|?>Ztkpg{wAx87u#*
zeqqFx;gPHrpt<9XQ}|ZXmRbrVBf~@9!{b|~w(2b~o%2V>(ripi+vjs*FBxfV+~`j#
zwUV4ks{+SXm<c0&r6KeC5rkopzl66j6a9?+$nen{e9~GIIv0{&3jd(>d9E1#@;j=6
z)uOkr_4gLM5-{%ICcH@ey-Dse{MZBUT1zu282Bo>*21v||3a&=U&8)UQ`x`eDO#(a
z$+2t;o8*GowEI!b(%StdRN6V}iP(KElBg`U#9@D{z*)%O`vf>Iabn-XiXWl4ADbAC
zbxL$JvcOIfTh5KDUbfOny8snu^oxD!YWTy%94p!42i&pJ2V91~3)1fIfdSdg-sO4d
z0#s^?wrun5SjhZ6>?CT{-mI^K=Fel0?4c+GlPClQ3ODjHfx<bfb!|YLTAMfm$~F|;
zzUi(GI2jc0gto%WFHCQ)PbR4%le@x}%Msf$Gn>-kp8?Z8kIzIS{LZ2kPIYA1qR0t$
zn7?WzV-v+FcYYJ4Hb@syr5~l=QXFk8m(jW!<oq3}hoUN{(zpzPWU;St4WBx5kz$$J
zstdZw%J~Xa)f0lN%jHF>w}53gPr_z=9*MvMv}fS8675hU*yDz=>Qxqp`&p8$PzafG
z#m<%=%AZ_k$Zh6-SXSFN%1V}W(ZY$4no;C;s{g~%TEA5qZDWZ>Vk4~|HI(T3pO(1a
zDly^=Z=limT__6dNkqF<O)qXlFWR+|h=Y&CAT5mkLH;f(3SopqcV`3xyoaI#cJoZI
zim;&G0GtxTkTVqo4z&eA!rAH-<PNvS(l(>HhpOr_vsaOh;YYEgH_}4<XGm>}xWc;#
zn?;DgBeLc+Ou7F;1!12zVqb04b$E-(L8Pvlop1dlMR<bP+lzA4QYLl#oVuz6cm(EQ
z;W=YB{ik))y=}SxV~#Y-JE9cTiWGBJ8vh#n6tWyja?=(jex4Nl0ne6Hft8KlkV35y
z+y&dDCbKdpJ6!*f9e$D*QZ(PwG9*?lf;3mNx%oX9!Dm#%Tj>sXK7|7O2c;w@PH!A`
z$}(qT%e{);@wHLrOr+~eoF4r(b2T#R>l_%jYgt>r>5{5}aWNyvNppn~*97@Ca5!n)
zRB&u!64`2fsMa0iy>Oxm@QbJ?bpB*$d`r@}3#0zCM9#0Uq@}4Awna{XqNUUrOuWc%
zslzKgZj_jgN(3Qdj%SMs)!HOMgJ?$SA5m?n;P?V#d2f=I&$4o7cdM>mQ?y*xMg;gx
zgc(g7CW7dRu|;*V=I(Ayq5ilg`3a_A7|!c@Ic8!~S)viH$y!IUBc2WN3Q-Bvj^$c3
z5<sx!+AtAP?XbA>`_KmLmGEEV1Gd_1d=iz5E(t<VUtR&}*5~|vF-8WPHZkV-dpSZz
zp_pr!Gxc~5uY<A@^EYRi-j}!SIA#*7YuofZ0ZDU<FPT}zCJ=W74^VFOBqlYZ^z9Ct
znpJI{sOCq(3^0R-^me(SFPx2e+bIFLTI}*=5Tu69@DqdIKdD`5F%49^IqMZF*38aD
z71(fbhEG!8)PhF}%!TM2><dpIQPFbva~SF(6L|_oSg~2j>p!M007t}T351I#sty)U
z+#Si`84w_Buz4?P3V#KB5SPf|6%DG44C5i97KEp0qBcViqnfK8ixAqFYTieA`GW(w
zAaRLIV{Rh7ntx26`g<b-#gL;{Hz3<k?DQn<ll%HHt7-aNNgEa5Q|P1E;2FVHjLjkQ
z`T-Xxw7Q2{9Y#SISPD$<Tbr+rbgU>ie*R0Z-#Na;r%mD}%<5Jvs_7s90pggwVaNJy
z;Gz5ncB#LFXNdQ_W-sV26M91L>)3K<zv8-CZ&&nBu)9dR+1}I*&}Lh1fJ$0Sh=Bu1
zZIV!tHtTQUYHDH4Y44xZ5%^qP#jpQBOzXUV(rydFEg-4H)}rs&NhB^VDy~OgsRcp)
zBQj;caunT&@|oX7tBL@ERuek?2okS5fdLs%LT$*NCE(OF3x;97gEqE-ocb9DFl2Q!
zgtm63uT#EgNyte@*InzB9Z1=+&_xdqJ!aCwM~?tK*3e@^?B#m2W|4N3p`^dmSjEDp
zr5EJ*DeEctDj!a93cWB2&A~*29n=53!&rXK`>HxJ|5fbYYy!?SjKig2`8l{-`R#sJ
z{y|JM;N@7?!z#|5{daszTz&pedK?9JQ8F;@qU0|0D_iceAI?7tSL#Z>U6e&#kwgbP
zkkbtwSlf+Cu<f@_ncfPo253+zF_re*BqkMOz=e-l@dSF=3tHNe6Mx!NOm-RZ<2n>!
z2^i*I1ua#Wv>X0&z_aSn73?s&*dqlVd-T@)W9p>J$FO7ZOZr;Fjpb*IiZ0<kj-=(t
z)3frtzZVEN)Zu&;5GEyyDoKyR4}t#_Nqfj|4VZ{Qpi+zi1s_y<&#G{Aa&GbPMOY+9
zMu&t)2l!LwN5#q;zBt0;6CDn2Z&SxMOE<QuqarD*i|U-p1COE7rnIv5v>VIdYQtLL
z+vF=8tIkQ-iCW8@Pz=4^uQuJ=>}nca<}1w6IQAlU`d|lyHiM6o3qDTHh2A>nrl2_S
zA+q^%P|?VQl|Hvwh66uk?P7j%C%U{@zVS76a{Yy?)f|yCw>|CZvLrN|l>4FS+vXAI
zH~1Q@M_VFOIwyh-O%sQD3<-Z4nfz%+pMuT$dA}3f(Y)N<c#Ca<Hc{-Aj|5{d<1iXZ
zo-tGXE}|+3jBfS)BafO0JZ&L^nBNGx!%&i(k|jT2v%Ep@)Id7GlWuGz+R=G5+`2DW
z)a`k83dV!1XXu&z6g?+ALC@Kb)3f+dJlE~aJ}h2YFNxQLN5m`jA@Q2FOT4byiPxhK
zrncaPvkrTn6K}_!eR#*Pnmk1DXa@$0c&dc34gYu3$34$Yo-f5ypTaYP)@Z5EAVe%L
z79fULyzOojc5hm0T5GmFJpjT`w=@qL21F6dx9}hS>_d<iZ+bBSNLanucs{{|sq9Nu
zZ%5j$dIA$Db&Ad%>KL78sm^jCQ2QJXENk|S6i>1Swe1^0VH!|z6vhVJ3d~qpZgqg?
zzXJ`{qP%dJwHn(Uw4c1)+4_+yvo*He^{Zd~>O~p~F~0$D{+lmT#%8yz$>m$BosT^*
z0nr20&}O%cv?bbkjJiUE8qVZG$Ol*3*xZhC4DtbUv%|~|qj@h=J~GK)1f2?6ni^AS
zZU9&Mjpv%9p98c#N(mlVtgend_5~7@=MO8-+r5XkjLvWM1!50n(f5dF84tfLw0Q}(
zm*9+g613dxj758q1+@iGGXVyKBgR-iD*K=c=}3jXt{(VYjZ9Vis|CbfrAYwv)gXY_
zQ4v6I3!prr+D<=J)7@%Qhu1Goo8W5RnM%bbM$r5yo02?~go2uOrV+Uka(kl)NYvB=
ziJ(Qrc=R;N`2{d8IC6yuvxg}q);OGU*^kC<_2?JJZgJKx9*$a$VY4ft=wFT9f@+7O
zj$`$od74}ad%Gmf_rA69AldC`VZZbwE$pF`3rQ)z)dl0=BiP1ZJ-dY$-og#)1bxSP
zNgczsgfSnLVGH~D`xwSpJO32GZILW~7K4{qB>)7j@ZQ<NRquK%CdOgGwE<m;>40L*
znbh<k|G`<n?<OE)VVDVMWCQ4WfcB5bU=AtqL#CZZ1^b}qlhbb~9C*-Gk;ZxAT`V0Y
zybkv}y{}K37*C}jNCD~Cih>GjdU1BZa@I@C(fhvEMh*p00h0JY@9QPky)JkP4t`7=
zqP*~?>!A&M*52<x2k*Th{F-zns1|+)7*@OCH45wZaE#_Jpf@pHc?`&iqX9+x9zkQ3
z#(yT{uqtVpS=@!-#!nke{xxk-Yyf0~*(t(n5msJ^!~C*MP!4Ndq{RF@00SGz1&Krf
zl7x`PN^-FpYdVe!k1rrQ)O`+Ple1_!S03m=74>zWqxiQFifLao4{wB9^g%?F=gS~0
zM>_u(!b6Igk78KGX%zF_BQvo$i2dd%>Ll%S;>zYS8{}-d^88%#^8m>@n(H6JN4eBH
z0j1d%dV4m1hFL&aSv{tK$Ix%EF=8gH*LA?R>-5G>76)qa5?U!q{5zOkM$(KDXRO2(
zGaf}bx2|K?&R=KDobU79gq@AE{9S-_z5ubTUu>V?@OfJ|ccbj>v{^6<LJ%vN_+lT5
zs+VQoBJBbzaqyAIfg+76Ibk<ohp|+arK#>CO_g}6Xg2YP5?z6EY1!XzyS@qf0Ycyo
zuOK0K^{@C^(P8ojvDHkzYo|CVWwttu893J<y#^+hB@U&rn!3T0f)?HX1<Az8=m$z;
z84_P?0&WlocJb_!`cw(tn=;==vp-BaJ7}^<vkj)5GB<|@BxD3D3m20zCAX#9AzLA%
zHeAJuNh-{DyURAfZT&N3>rN%fv?<X)A_D19F*sY|SK`=n3hiSh@}3UycJ4WiH(bHN
zbUmqcI2E<H#I??F`i~;nm*C<{G3o5OtmefzxlK(?W9UPt^?{_R4jL<mG)z;|t{nRI
z35>GnumQA32}vG6{NITX#smVXGT-f&W{?OLdm#JQzu|LRVj9_7JPjAE=2mf)a`9Ab
zAy_6`@*nHK5Zl4;M_QX+{4AWn;AI>6ng`K$p?E4K0IPv1nYAu|;3Z1JysS<AUUB&Z
z&@#*(cou0$s4dFTZe<VbvtnZq!)oOs{F}_@DHn%f0h22Bz;l-Xygvx=wvPbJ=czn?
za4`J^1Sw++(os(-O7^h_4k30Gv1ow*3jo*yuOlp`=K1je*G1A%BvDKgg|#5YBM4&7
z6Fcw+#8`T96Shm$F-4CMRvOmRzlU3yc>^y2SSS?R4u@cwoDv##^y~sxs3TZ9P{;%d
zV4{fxRJ6JmKGh2ygURWXjF~(9skC^I_ki6)F#9EEOd#ZJVmWw7$<^jN><83bny&>Y
zLev|G5KaS;mcdAD^#EG;S!iW2dlFE;4^Gs>Ag}%LHh~9<rUs`{k*H`89YP}tZwN9_
z5Nb4>{Qrg)EWdHM7sD`c1JExBvYFoV>hx-(khc<7V#FIC<h0_$S~x^Q-Xqi}81h0S
z`z(%QOf59lZteEL8@Cf<Egd#yUDjAzwgL0B?HFrwc{U|)Sf3nluR1}w+xceXKz4pV
zDF<3R#md&RV)B~jccRiE>scXhtpKePdPzHNO}c{S>_$Md+4Z2J`3~AJd3QY$$aFIX
z`~CFMe8)VB4>GIofqW${KcIdLn~0fokH)b<em8~*vP0#B*Wwcfs_7_=ve2~sD0Cwh
z4X~qPqW%M5l^nSL-&NiFUsQeeSbx>K{=2Hp>_(s@oc@#bn%UH3)&+`=hYRR5kn9dZ
z4t}=DW@k4MKznW507XWFA~^)<B}jO2XA!N;-9#m#*l;v`Co<_-f^MC^gCL=EAEC~D
z;8WB52Ias8vj}~36ULEv*{WTgK1{L~8r$6<UY<ovHi3v~o-iID>W8V7CdN|4i6qAM
z4ebxmQmUl=ftwL8iI;^*g+j63Erc38A%+wZ;C|f;g&~0xDhNPW0h~tJdNR=LCeA_F
z+`OLKFu)Did$N&(XP^abKo7X0_}Qc+i1%iQ04)<N6RtU%hyow&e})9WON1!ABurbj
zSe5(+yGE=FcDHWzM$lQ1Z?>CA%1Iyuqv1qukiSCW1Bc&-h@49tFbOAM`K$%MhYGq;
z(=Mdb8GBlv@Exc~)FVe+e8f?}(3glDZXwD$X&-}Zr%EHufLK``s0(E{f(m10Gpv~1
zip{cOe+QoUHphy6YQ=n3>^&=1YQ<i&V&ztBzZF|mOkGKpJVOZ}R|iHdYfRoAhPD`o
zCJfAjO>5Ar<~s<uzn7}5Uivr6h%|Jr#I~<T-l^66Eav$kuMl+A-Czo(;)D~h21A_*
zQ`$fw6Ok*(FQ;<(B5a<J1c>h2oIp|=g`GTNh0%lGX3!tM2{;A|w$fM&6xeLy#&FBW
zLg$8`qxT*s`p<kP{FI20Bq8#+h)~a(@94z@fxIM8dq{xP(RwifN@|u~OhA%2g_*aT
zWO5IE*-dg3Po<1&m-?_UCn%BE66HNfnNu2R6tx5x!vsx*e~$$I3b+71-N?j8VH#)w
z2u!(M#6@{R?1`9`T<@Vo{xRYha7AVO8L$Pq_Kxt1N(i1+U@-~+tM2Jnl;!>0eF79t
za`&uDxqFzE1tpCq?*5dbmvA>3m(ux<kWSVVOF6@ag?XYYR>Ap^S5b0}94oOE(<En$
z!u;GijRYIYiiCzU!>x6)Op5~OTCvw2;0wtUob>WYcvweLn*2RYH5c0bU(rF-f+I~e
zJ?;Jr(tMPJ0|^`4<^~5H^sJ2edjcqjt{$0)Qv~`U4^)Gz(0`5=KwY!|f-Tvtyx{Mh
z>UY-HodcW0prhZm;p_foQ6+hf2l<u`8iBB-=?pz}zcz*!!uA`N$aE~WIpFqu4VnV?
zo-95=e42t!iI1_GgLA`ZxTinmQW}4NG`2+6JNk^_*djq;ddC;~VR*GW0Rc<))4~;g
z2LDMLdW{_CRVQa6OiuGzWHovkZVzODhQ2)jTTloaCA8|ORvPQ6bQ~a?8!NZrbl8%d
z{GLVLi#U9?eL^*zV&kXaC_#%Te{Z5fKkPxRwAFGijIrd5F`k?;MzdBpU9)32kS*M<
zlV`D$N30zl6+ZY?Rh9fosNJat!B{j>Ohc{B6>^iD7!8eD4O5Y*?yiCAaCS<~NYV+e
zhRHr%y%HyDErVkvwwGnv>kvLO-rTR7pmo&@vJdL!n2n#~q3B!C%!r+T--lM~JvOCr
zmX&ZPC4eH3zMZf!;lp@*Xt+p=5T$WG!r={2V83@`)=~Ac2U1bZXBG-lfSt0eBkU(X
zBsp=58&D1u0S23U?Wx6=&4)aSdmK=~W#JVlCwwu5)X?WQ^p~LYyTw0bl>rj~{NsJV
zan9z#Apbr&%YW{*w@2(R&YC`73g3c4@(;rh-7PqhhQ|>F-4+^^RuM2Fc83FigO{62
zKsg6dy~={YUOskRc7jj<O28b9t{nuDlkIVNY*KhSN~-23iv>*Ly2!btcgsodhiaaF
z(Nrfzump#s%=((j!^xyq;0+K8nAcaC*^fYXVZw?9q@DMn+llsSHX>hA1Z0_%q`Njc
zOeE)5^kMVbq|hXU=vWCIk%UpXI(fk9RTw<1<4v^u?B%~hoHUL1ymCKHgxQDre~Ohj
z^d85?E!F&ORD%QiC617{XH)q;;lk9jDTT%DaafQPuv#zQ^bu7ATt>$hVvAy<Po&l)
zQ`Ku*FQ%YzkMOr)#t!YFqg%9OjU#5@jI<-jUlJea_!hV`L^fQ}WQ@nK%X)Ym(obiW
z9tIf5EK1lz(3lRSMsjd~A6sX1%pMaYPQ&yaAU|(83}~9OpspSw#gHj%|E5y|0NeO4
z0BMnlU|#@v$PWp-o#nJ_3GVAS=aUZ5qZ)f*?VA*a6EWiCUEJaA+xVr>vB7<upy=`6
zK~=->`GOD2F7$Fc8S&#d-jJr7(>HPy^SbCOY;q)zN!e7K+yM^r=h#~t3dIqrFK`n<
zCWLBTQF)H?&_Q-k_@P+0N#J~Z@;EFjpJP9)yfEKg6;xihC#~Q(ZYh#;qTQRvvpOgC
zSG^ZDX0R2q{XOr+jl&k`Ez`a4Y{Y_Htc?20qPHk7(ifJ`L-K^L%WiOp6rg*D1{_>^
z;NUXg%>qvs%rFQj3@McOm7u2O$gv!KdljX@JDk1*#1|Q)^fF&wE1z`!sNP{qPFaTf
z#0ZxdTwg#Zrfdbr#r}<G`Ve<5>=F&}qOo#d(l#A<^XgOJ1`lz$Z!2mWEtukH0>@N`
zI(+e;%#kF%0kCc1td+=iIaw0-kj`l9*ONiM1}sR^L(3Awf~$6`=uBEivRA8$iqzrk
z<aa-C>a9-u``*_!e*WDSr~RP!@FuyaNORz<w6!}i45Y_!lRPR*7HIuqs^%oOKH$_z
zb{PF46zPWuuqA7Z3T%rxjU{W~_pV=%l_;%~SymVo!+=B2WA+Q)ckA-Ld&J4MuhQ4z
z#0D!CpC{1g1@=DyA@7N8e`Ynk*a6$Vw)ltG`_eMvWot>`6Sc*=`r{20Us4QXqV>Iz
z;&Y3C+#iop{OaOZfBb%mPb_}0KmGv4hZp~d;^`>A8F6#-TI_P32pQYg!Yu)ftTa!+
z{uwgL)?fr&xw?NG0)Ol&1iAOjp@)wirFbMw2l&deh}glRfCFAZUw*gSY1d@E#p!L|
zcm_?kSID*A)=jDO8Fa2`GiOs7{QWP{k8Kf8xSW{bCfJvg{t72C>gg9VcPv)3Sz9C}
zl;5gO!Jmx3wfU`DDc=MRNFFc6>2FLjZiC<*AQX4gBeBNZvWlG$Ck^4`(=M~L#I3AN
z=ZZQ<=V@wwITqVLe6Qc^)IUzSk%F-<@xKocdb{b77=3`+yqg}0VF#$yyXleKx(x8q
zXoKPJ2;u&Px(;y0NszV3-=U>rAo$xWa9e^a16By_P?Ufn|H6y1It-12KgUIfHl8g7
z7yZFlxCZI4A1z&LR2+>jT)Pv+P|DR7H{moQ%MuKgP26LDwW#7$-B?y}iWsYUl~FnZ
z&Yh<cAMow45#X>w(w`zbS;{1H%i1b)c}FNQ7L>)=Sn}GzaaLSC^e5^9@$FK?um#wU
zRT`XTjfHCqTKF048dwrX9I+U57-WGxD=v+$5>fc}gsF4yLQYHNlmC*L{dfna`*0e$
zCb{(s5*8dO9s}l79%^N+q(2(!Iw+3C3*c!b_>FDg)t4Z%X0Ud1HbwY0vVlOWC{*E5
z3eo0n4Qw%kNHeLSP<Xjrsc&`JwLIo?7kg5FJXXyvo=mUd#Z%~&UM%^3YSU7AiI}?6
zy#nDMuEtV9?9IWr({HIv<>gpr!CpmYRxzSr7|bE|d>kDyr&zTu400V?93i@~t2qsu
zQlCW}3*oR2#)HpV$S9^0t62TLW|dHtSP<mPkb#{nsh?XMQm>8Js`xTM1D1xmCBdoy
z-*z>4Ma*#qW?WO=7MzSR%zl<E^DmkLBW{O`>C*@~NxvK`uO|k~sUb)^<dW*=e<V4W
zMnQ=t!l$iy3S0)N3R;3jI{O>8sN-Zl2B*tv1_`TQb{M0;-Su;)XfE7y<nR6M6x=jd
zMsw;pW;(nH<mR-d6gU$(n<pyIx4|ENB6*3R4WrC-ItvQxV1=_e&Gb8)Y-Okb)ir*A
z!=Si*L3_IXq6gP!UChvafs!2U3rulz7%fv8JAno+{_v=dIT>17S>o)H#K+<TSy|~|
zC=kT$JA|OiwBaas!I4Bt+5GystJDjG?Pb`c!&HqfdBA3-t-f#y#)GazRzV9~bNsz@
zU7o-9SSOq<M=lbTr>t6l1|8A9q_&_B)#U<587SO5CqrF``|^r$AT|Ktsl14$T4-ce
za~hgwHO|CRs=uX)EIv93VlOk(@oBlUtTTuK7}?X?QzW7oWpH&4M<QBMyAs9Ob&q7)
z`Y)q6<HT|*SY0%MtmEL)L$Cx`6ZS9!Az0NkVLiN7tm*o0I#+GXo{r9iX*eBigO7k6
zccrl9@X7B9R8__5&hcTGmC;7nA!jjaoww;G?C)bOv}pnBY5g=M=1|~Oe?83E?*ObT
z1b2ullG*Kj)j=xY2n;<|0p)w>%(WrTUt>*4ewWE9BqqPRHvlmm_(No#gNRobd_evZ
z+SM>R!?{Uy##0G`SS>NtvOMWMTeV@4lofmE1MY<qC1BMPZ2%DYLs?nHT^Fw+iN)6y
zO;U&ZeCuExzhJ%o#%4c@+TgX3AFn#r;|o;d9u@yN^BwqvfGXDn_|p&|OiOzan_PwU
zc@HMe=Kw{<2Xeve<@?Zfa<an64KvR(D2}xyR>AjOh0R^N-^_lBlDfQSmBx*rAug;L
zM(!9F>Cv6v?hBwUz5vxg@PW1yw$>+*LwF9MzF;+fI$y|j@&kEp_OHE3z@WXsn_)V-
z1cT&0WZgr4WI!*4bewMw`Ew>U9kx%!7N&kjj}V-y>X(;%;`=>pC^)<uSF@sRYR37a
zd&m<Zu?9Cmp|#ns6Z%?jf!1SYA4a&K%d*qa`;drZW(l|!g7cp%@OKq-!8t4az*3Z)
z$c&!VaOoFramws6glqKqcZ}IoLG9}PR*+c2QCZ;*Se7lD0qJJp&c6*VTy#icV=n&$
z)>E+vv_SaXhzrNC#5mlI)<GwsnRPM)D|6*Qsm-Bx_+W^(T71}sD+*G#f-=^?(m#i$
zyQ<E&V&w}T>1LbWO8cBktOV@~+J%;q{#VHtvxzI4k{34Nq7>`8CeG&fBIk9Dr`5ct
zK~6Zm<0YADO5%;!e7Ysik>A=Do8LDO`g$PLn+yr{iY|f>Xin^6u{xLctmgJ!-0T90
zz=0_S+?+ba3Q)xDIRDZBo-%iA9?#>jfepC}D1a!agS&um`A-gQm~YxgqS#fm!mUIf
z1#Y-|$o(QML)T$<^?Jyzf|@d`tAf1nIm+wgD$0mUuu@=y0YN4<)%$P25nPB|*Lg2)
znZXxP?NbJBB0Bz-s2v;WIG+mylbh+CcOl$_c?7iv?r$W|0%qC}n6U`QDx8&7)xn4@
zR^hI!GHRT#SDD!)tH|hv%aszXr7RUPT&DILw#1A5O5yuTlnxY-xX}?3??vT-)p%30
zZu_lhR_9X0t!2}tu0z|P>_D<XS%FQ62zMjaoA7NS7q>xArfE_=?XQ3PN+99B#9u@m
zbhF0mK^!`8XSQh5(aA1^o#gDuP9h}Z-No9@uSNP{)=qExvBW}zS0RP2Q3K4e&SM`O
z`|Q}s%p=;l^JiHXpm4_@zPQeRVn4QVxEF9+<c*3Ku$wcM<m1D5T%K9*0YWlD&hzi%
zAmaNHdzGEQU1+GM_Ml7Br`1EI#4WX0B%&_D%nb~4mM;rbR)#%y4xE{=TpkYLN=SLF
zF%A7irzmD(c?9Sg1!LI;C)_WvKD;Gwmi|>Abl%@KUmcsZIkxJzE|v)=fBimO-}<`n
zGQh?(Pr)ID7pdDR;zlI#?Aix~nBnFzuv8n#!uk0Q+SJ@faB2bS!%b0g!D0T(y(U)A
z;T&@V_`wA$CZ7v3gHvk+44Pr2>?2Wz(<5%fWLKE?<eK;7nD<QQ*-1dm*l-(f75j{a
z^@8JMP&1EV%7ae-jD5*kv1_q<Cial&>k)i6%}+2qfk<?{OE?a?RPvux;>KUvFkOzj
zd*x-7CT^JH&k5#n)*O_v+Y)Y~xo*Q7K<<vy(4Mk)w(vup0x!@*e*kCD6c`Mdi7DVe
zuzAFgu??Uvp8%*e&nACxxVb7n*p22@RkPx?kOjS%G(EWtH(*-^F2iqO(rH<iD!{X$
z&~DQGFh^;_u?2&huoC2T7r=Q!9LK^=UKKGZ8HF%CwUt?Zvx7eS?~*@*c6G#ATa+ri
zU9-vd@=J0zz|2DdLY?=a0KVjPEH!5Gh2pguF6;^Tq~AwiyZ~vIldHIH1dD*Dh%jL!
zW3q_Shm+ZLJfYF~I(i#=52(P+>UQXlQ0EIsO1kwbQM&F^EDHr0nh^tqwh)D2B7?_n
zilAi&`QQE=G)hu@5lxJ9;K%_k0oJMH<2)NCd6<`o@)-0kXC=MmSfHk`cDiQkG`}$q
z6y~3x0xU+5+li9FoOHubIR>^gcpbyJc)-h;taj85W;S(+Ri@{gWqvXhWtv(Cf0>$e
z$lbp%!;Bqs(+)|yc1RbX^k5a#NV3>Jpjg%eryF=Q*T`t}QyBQb7ImkwPZNC^B_zF(
zX9T(9EIyHg$#JkFe-8TyIOC_SA3Sie8c8r`C00{j8cFzr7LXdYIx2CGz~tKqz*{(&
zWQ18k{xfpq06{0AH#WZ!<c#9H1ZDO2H;*II#%JQ$xeYyx{G<64#0HT$euNgO*ceY7
z7y1~}VN77XuWg<l=_ok9f}Fx#n{xSI0VW)4t)jVxIB1AT<b1e;yP&|nq$>(Di9HWr
zfsSP->B2i6qq!$mQ&>m2y&rCJ<(~y}+y7L>SNvLN4Kb7IUjt@^Au7Aq<MG`iZu{ZH
z2pnq44>)mgC1zF|GxQc*KD;q8ux7+CO`gv4T{Ko#v%dU$!4bW!U*Im9JC8WPF|nPt
zQeq*D8N(MD6*w)9sp$!PsEXxY%SOT9ngx4}<vnn*#_-mC(59)aUpa2lznZt%9+`J5
zyV>ErS=JWN_Ex?Am1omf_Ueg5Y;lU?{E5k{_LcT!Xj6f}<gtm|*i9V+Umo2@ekb^d
zRfaq{<banNtCHDD2Yj9E73Yjw9kimtbD0cBDWF9=8AEEV>Cr#788zpWDC|YJ$FPUh
z^t4`dMCO4fZ?5%zxH*M=Xos;&<U)4uJ4kuQ`#w&Lz%TzEhxZ;?^Bxd5U-WDm!(Kb_
z`T2JytH5`$-Jwk;q^?bji{0EI(x0=irB4Fidw?cNk=Y^#T?r^kWQ$~Di3}pcCmQQZ
z>_9=AzOOXaqY@0rG3PNB0<=u~L&(1bPZ>||5?Nc*401J9D1EI>2oMpc)z>K!eDq!w
zWId4pJ{e<0SWvfgUui~8;tB!e0$GPZg&c_gjv992vsk0RI|H+_UL(yYoe9_aE)!P2
zv-rMyo0xoC1|XKT4GhI*zXTBuOFl_z{YbHwJAY4ehpI{}P{enUC0TYxKo(J)Q?)+o
zPc%`NTIC|Oue`(pD0kK0TOw&0`Wi={NYS^#1LF=-92g$o5lI*&2ldDrAOR~9u{q%g
zHfPzy@A-#gi$|QPjFr2w<?`2jkQMWBoRAlw-c*9!?9lI$-9kF{sMI1@eJI^1ruGT@
z;O?ymVf9Ak!{CA4xLLTH_PZ@^cu`O-16q>Q84g3yg;!hkRLbSDa_teq*X_0o`0%0m
z(D0WWy)eqKb)m*1j<Dnr#%mW{2Y3?YVW$p7jx;yB2CAXfCVr+bkxkrxwcTN+5@M{(
zg()+`mF4~RVsHSP4@)__$AvX#!ftOV!DV6>SlgW~LW&z_k`#mg{XMrDKH2a&a2oX{
z?OepcE{Zi*>!*tSUT2tkG>HrbRGDl&kD=FMKan;-2`q;f|CSQ=YW`cTolfk)%-73%
zOugw0wkplou3o$h7v3;b#eKb96b(4y^&A0;q|(}Mk@gyv)|f}9l4nS4sS|gb8}sGZ
zO$f-we22dF=cU4(<fWezzciPXG#~D3ZEQhTH7zN@@vE&4!D0}}&(0s89FQ3<+wWh2
zVdX6dA(kF4EIgd--TX>uv@xxpDeTp6XtZ-|X)jLLEb@LC+g8-eCK(kjtbdgsE(c=x
zl>sG62d=SkaaMWIix5;#>jejNV2^%b-sZH(ybzhoS3A6`Wv#^0Zx=k9#*sAk#1`9x
zg4;z3?lMvrV-u6~Rw%f^kB{!61`g42OJ$U1K-n#IupP2-FDB}){5NeCy=0G3e)uGy
z={N<B)R>N?vBlS7%Ty@Y)vV@REcc>O<AQ>u{538kBpWw7NTb{=<LM2_T6Oc{bZC)L
zq(#yly6M@JTVFSdw8&dS^uyR#>8?`tR>C8`xnfJdp*$J|(n#)?bC)n}^~OrC!yU@T
zVjJ$LMG6d0#)4j>^tztTIUpTYdxdx@G1@zaF24f)0ZVMg&AqWz1-(pjwe~rdVDvzO
z-Y1$=+YR3lC0b8S)_Uo4{|6AqyL4bc>7xPVO$-}qT0gyq4-P0x#DF5ce2dr^P(bf3
zLfLMSQ7Y+M4K~wW!@_5v!isY-=a=kWA|<&cgT6Q8DJMrZkTtDeIj1>vAOx}s<@_d1
zY3fgWLCU#Eko8R>E54!e9Ya3e>xd=Ex?~7h{Vv09l;-qeraP3u-MfVXsF0zO?5U(`
z^wu%@M_m}8!JSo$^b4L~bzP?Zrg`FXy`slVWP$DUSIvU%6Q9vAoh9_%dzcqgIhc3q
z@}8-EneS@D^fouVF}x=?a_>oP2b(|z{}(Xt0p>kzWdchg+-o<OvkN(|P3FwF<lB22
zyO1NBKMo%ib`td@_oFgWXoh+tY|tTgv&*ot5|>_Rs(&#i2qa5f%mtOBe}#Du+bI~2
zZQE5kwSsVd3kSKe_+S=4mY1@k{<aLq^{eck8$o<nH4>kaw)wW?FWyyJU`~A#Uh`JL
zC^X_(4ZV3}Ve|;}X2m&n%LNA;mXCSQmr4GExNpatrWV`RjbtrmH#xjF$=WK&l8~Uf
z%h+2a;JvYJh2Tb`=FHSpO{E6@`V_5zRh+@VKRGio1JYxG?G!_z1wDCepMo4(CV&7s
z`DRCQqR@kSWcGcBajydvvhR~(P#Uo<28GnmnK#J>04fQ<sFag<)mogH+1CoLYyy|o
zO|7rXl(bC2dXSngGQ4b%NqaN4HI>q&0U%j}44QEt&ADPPS*R}Q5R;-4pJ&_vMFtyk
zrZLP|Jc5KCx=`z~A0xR&(sdB)b8L9*UYju&w&ii&2{g`v+?Z>L$%2-yPopGKtA-p~
z;230bvKz@5dvT^1>y%u+_W<l3^e=f2Mls@;H)pmb7U23pUA+On5dz<tAUnwqO(&O)
z-@Zf#i4(X+NvB)D>QYe>n7J$$!|t#Ef3ua=4%>5a07wiT;uz~;TG0K3O2$tJV2_vX
z<wi&2hY;episL$buxb~G@ZaqhD9~<#ldeEiom3dk^8G6S+k*UG9;YhmdV^wDdg$7i
zYy^q7QGAe}CLn77-*<W(mN11dQ4Jo=z_kM~9U9SD@Xs>#7K-OgJc~4!Fa~$Rwt#y=
zF6U1H87y3Xh*#3CI2x7k(E~Vk9snp7+t@me<EoX|EbEe$H0wtN?D6Imc_|+py=d&6
zj^djhyByE@i@0gE{-RBri9zW6G1^nOjL$=fz-T6)`i-i71%jhTI!jOwE`RW-Bj^%d
z%Yt+}P64AEXd&~?XJ{}vyFCWMXKCG~>5h7(aTg*yL6&#lde}D0-LYscFo1b8z|zcF
z=|;?hsF~e?nGj`O19-rRR8?-oQH20f%<NP6&K?ug5(Qv)GCBu2ah-tjzyi?Sh?XMS
z9HsW*V!r5iAj8d>OtiY71;1!Qdm~Y*3>VqQ^{u$;DZ4o^t7-YUri#DQ%{Ta|6WoB5
zxLG;S8sP7q5sguAWHG8U|22CBHi~@S!^#6sqF}&AeMrZ`dk&Zq6H$0jS-0Vpm;#Z+
zcx--IKv>!jfr&Y2#0&%?sklR_61Kw_6;z39&4@0^+?Ey5au8UB3~=lbtqs83eJ;SF
z)RjyE`7FmCBHR@KW1?ynBSx~f7VRYh8Bt;`WoI_N>-(ww67EL?3k{SB9EKFy?mw4x
zNx?^9tJ3#VQ8s1gTZouZD&G|43Onx{_?OH{(IzV|6cij;r}u%>ttBP8Kqkf5OYO6|
zISIJT6lr|gG%SPHc?BhvXqf5|g{CC&RIk7#ECEA&=RJ8tfxQ9`YMF%%j;<Do`jq=G
ze2umI<@nBqH;=NgY`R66#fBTDN@3@4d?+|VEC5ypf4&UvVwMz&jsV9+X(J}dT@~Oi
z53=C$Bf&{5MugCxBwmy91#iTn<%oDIT$_s6!}Qe@UDZ5te*IU&@WTayTJ2Jn&teRm
zFth><`>7BU4v{$McG4;(AIJV;(HTe&fO)7~OG*a2d4a%}AZ&tG-Zo|DjUtVz&KE6#
zK|;BIG0N`r;EN>~5P2nf3=J!yCRHGPut|i6{v_r9R+Gxu!{V#em&ywx=g(iKqgkVM
z(X5n6*2;B8j?bryHm4+C>kOCA*C2SNkJ`8Qf8M@-qM=t%V6c6+iZsGwNc-kd`+WE!
z8nlf-V&7^A$!Ylo)2yZLnPasDjj-({Nc)?jDY)r}+F)<D33;)eXo0=mYQa-bdmCRa
z=ne+M%d@bkiFLt#Ss9B_x%sW)p2z@e4Ftn<G%hK)C-EygjXy~WndnZ|mfs$THO{8Y
z|44vUr+qI0dOzIpTEc1V6Ih&&lvS2sTdlVQTJ-TS&>%4nEEA)w^m7O1UQ$=)%zlP}
zONt<-{v=5uc!5Ob((?8FlqPBG_5A`yy(*GgTO=eDzcw)%Cfejy)<gu2nTdHx>77Ex
z+r+g=xe)r^2ZO8N!1}^*V(pyA-+7+$=YkacLj-k?*razdfk?h!qSY%gODK4wmWO{X
zPPn<koQ7)-a9ZSJ(``KerInZeKokeNC>0|XuNcVV1N(22`Mm(ZQJ2*NaMqCiDU9+M
z!*Ep){R&PjSKN&TXB%-Z8Ou}-EWXyEe`Hf%4)7vUG#K5Py}NWKF4h=LWVJ4`xw?l+
zf$Qz*#Ax1&B9oMHh)QX0(Qh&(3~9y?#uxFkLpqg8m&eFGXqyws$+nH+za1!u+Vt<p
z3G-sxK%2(#9}NHq10x@oY|K%sF>@|$jDp4t7maBT@by!vG1&J_?=DS4W3Hu<x?>6w
zu^D>0gT`DfGs$gel^vGnqMFm{Sbi<)U=^ovM}T{v_J7pCAK<HK;4i5rYraFfgY*j$
zGNyO$V3#gw78UcBTEs20XoQTC*g71?|MMF#H(D_Gc^3R00hwTMkv3e;yLj+XLh4+s
z%q$AYYHm69mA4F2o_BSZ4x8Y>-2wQGBXnZ^mrGc?bvo8MSvz1spgD`Uk!U$&1RXiB
ziRLDk1WeoL$6{zZ(?vgjfdRksQ|J|JABy`ECh`m*He~nmN52(q!R-kxq=%5#(KIn}
zL~My()Fw7f<R<|!B!jiL=kA;iaIxQchU-5gPQZSrtYPQET@3_-e9tiO_aRp&{Z^HZ
zJHTlb-mWRlN|Wqch>H;>;rMA{+(1;m2|oZ);nqGU6zokoKJN)7dKi3EIEij9ciXht
zv8{BCA-qf{#{6gCkKc>mtqAa$FGGaMK#t4K@nbN(oBm8cIMe$S7UyjwVs!oZt(d7|
zb7u36v2AI6Mx7gFOt#8!i!#n&PTXIHyGV1R3^>@om0y9&buceznv`%ftx7WsYkJ68
z{~S5%M*=IvZ_I!|FZ|~vJF-4R!5u?^u^+US9nODKzmT%6BDOV&Lb4ea3U_`R1vJAA
zm;KzPN&FU+$qq-ZTw&O#+%e=Ff|CJ>;X`W~@D#>A8Uzz08Hu~S8w&sUN9<g|BW^3$
zeDDWS+=KJ@svzxwe_1r4kyb#3RaN9WA71+znNrbv@VxF4Ql`pAF@Yqq`}ct17!psV
zq!f@EJ-2-d-LBzxEh@}WWgmXVs9Qe*)^O*ymV5o~I-Ae%yLS^jyf&1^XHYoC{>CSW
zMaZFqcBaJ7AbD{0QyR{S8-5R)eFl}o|Dq<3+(O(~@Q@@qUI8rpFf@<leWElzh=lDW
z)_%r$l)v$YSm`{uSi+of%P9Ush&DTfJ?-4M^g7PABt~Gr2|w`?LQ+OtA{xQo2$vMn
zALoi-m~Whm0>R7YtXnVW*CkLFO;bNc&1^Q&q^imS5H5D_u)|n@dtbATexLU{scQ8K
z{0foM_$;z`D{_?w{|y0C%Z20&&Dpt&zQ4BJpWKci^kI?7NTNTQzcmF_o`V!e;%S6F
zJS-FAa39pi-)sRKso=2>!1=<ZMWAmv04DozN>vs8dX%H8Dv@R(LV%#G#~Sxxe+^nk
zsF9cd2PUF0g@!sqqHC~&(nUH^^o|=R5a~Cl2D*y$vd2Tp+J6RX39$y8jC@|dM``>3
zErhERybREN)Ngz)K(XBinxhZ?z-DtnP*59RErJ3Uc=n_hba%dh+}n%wo{lYr=q9UE
zNAnjagDSo7TKZ!=T~H-1s4|QE+%D-??CRk+dI9(x8jC{;Ek6>v6A|<R6a@NsXpOjc
zKQRr&fnN?f3iknkINBK=n}q6c-%%H^KL6qP?y1PmW4)*>F|MDKC@eYBn%UGK26~-S
zGl-TwzX2rlBrtR0_pr!G^)Di+J$6S2j0<80!7u-pfeRop27#nBXiP?;sZB=^zi}n7
zAr7(_6R7j)KmsR<{*jkNW#yot?{0$VS<-$1guRjcj<CrZ6tWJlryd|on$(z0fQeZ{
z#GL%UL}IEaM9A-3=oFIQINm~jIRZj{bHEhoLVj}w<<~><>k{(o9F*Uje);_sb@7}A
zvkP7}TkuPvgR*;^=>84a4Ul{9rG1P|boI`dV;+7?wu*naOZ0FxRS61_^r9v-4);#E
zY5N&2uGCzxSQS4)W<PLwLM!Md;Sk7!y>sa|*9KaGF6Q$mfW3*gX-Hq_MK4Yyrgnj;
zodHzA?*st-l3xx)@D%p)2KtC<gxqJJBc|xVR~(!A<Ufcb;;}o<40QkWhyFqLPeCF&
zUUWY=@zTB@-A65jP50X#GBh0^|NI6BAud|sn^B*+S>|_(x0A0EZx^o>Z#NH$cMe}d
z@9X(O5%utS;+@BD5bx>y8u6aNFBk8be3E$2;$y@+mn-63$kWAp4mbZdVdyhA`}jEo
z&CR9!jChyx)8f6DpAzo?|ATnn!e1Bf75tERui`I>_Zt43c(3Kph<BJjA>QlxqvE}R
zKP28N-znZ(d82r5<J<5i6rQgKm+`wP_4!5$-Y$Yo6kH*K<Oj|xM39s+Um$`HQSb&4
ze1w8CM39`j_+$}$oPwi8@CgcLir`Zeln~Sp%^0}xQgn(so27YE#mx!O1AoLmInKr6
z*Vh))T?$BfO{8pwKTANQ1o?}U@{K~a<KP~y*G%U5iB*cro4O*I617s?-qcmelucGj
zjyH8pGUYZaCD)s}Hkq>2O7VD8!^xClk+M0@JA1uI3G#eO>Bk1M4dD+9c}&Na7W~x4
z^W9I2X`?aIn(tqUC}u^N3E@Iznw~oF3u^DPqlM#C$AYCAxt@OBJiKYxf-=kv?Mt<@
z@X&POMyy+@81d_RUncfmaw-S2oM7@C!T;0Vxd290UW<AsGbBR@%pgI-dk|0*#3&CF
z0ydEZf)W@AB&3QG$zT#g5|h1oSON(XY?3jR+SaPa(~79Ix3<SVL~XStKodZUAXZU1
z6_itV&TupyBg7h+`>lV^B$Ei%bK85*z2}~RmA&`>e*f!VYyE3s2}W2t*mRDL+r|C9
z-BHe;*vF%45dPr)Anr&THpVEgmMG^A`}nF4xLvr{9lmX$=(*rPy-;UNcrz=pvd2^n
zSL)zXy(+bgPpeXY3}em*(8-p1R3Xtv6xu5|ZyY%94b*Ei^$HB@{&Xygz<DtdNR|Bx
zU*#HVe2GU;&gE_E8LA+eOC;w|J8TKbaD*ED<(~3Q?p?lTe-tiXQn=BF(db8%VEA10
zqjfj*F!LkAhBIjH)zBdUP6W@y^tR*dZX2T-g?7<1ql_su>SZ$vqKpY~r}R<HrfX(;
zv@s0F!7~eNh70}%wqxT?8Hk-Aw7+e{t|KRWyQ21--OY-m>4}Ze^cBgxPX`g{_}Sgj
z;{Nz*KOU0)AzWJ|{oj-ROTOmlKz&%Al>X0?;}_&#p&K`I^QR^C95bfVxkWI_+D`>}
zt>jK%J**<`M(5?Cj?edJXX?3IZ!;XX-nOD`GBoXw3DKcgA;t75cZw>n{P>CB`0p+K
zcAB=$-}-B*tgp>p$pu-PZ65}AingU;cc-aP{CS#uZd=cv$ANvoIBDKk^!U`zi)x%3
zO}h2-qJ1qkU#m*}V0Y?_%kHo$RFtnJ+SeK_Wq7hX)HW*&_EV*V7;VM3zT1~HZlWN`
zKoT$!a07{e3vdAbjBlN4$hhwmPm`y~^EA)XJllD;^X%Z+!LyTRCr|jI_jNVdg@vQp
z+HIYo=I{rl(xt$9;9f}^>G<1FMlUsve79;Ja*=r%*&;MYIBb)C4ZNt7u23h8@9Bhr
zpMU&B7x}i|PcFf;Z_?6_@=99aKKaz@lS$Gi9h8L-5_p@PKNA5D&^XsN?nwPSo9_eF
zdLOFR`$a_3QnpZ-p1%4Z+V`RAh5Cq)+akhI18NxRvkz>(52a_FTXLDI5iv;namw&C
z@GIa&U@veGcnx?Tpsh#J)+2c)@=WBJz%zlTizmXO--_pnfa<p#Jh7_%Ejv$?=tuUA
z)kfNP=x-nqm<)v5m~zts5q+V)scl3*SYa%;UVRsyY&^f(dg~9Wg%*hhYoYxJLPx|(
zyLhoMjaZk#yErH2VR^I5Oc=}*dj)i^)fj9R?+BBm{H^{s0yly{HDz~!Ux|pkc2Z$%
z1RP@FrXY0vJ?72C$q&4u)bxi8Qd?B9Ca7OE?$5#PV6w{Px{`#Vi9)<uL<~64Vi^(j
z{uYI9q^XIkTQmRVvF<Xo_+M{3%rxjjqI;bXkmz3Q4rr0+GWcdg2<-cE5*?hX?^y|a
zqfY`hD*@Qy{@sC_J!XYVj#E8^JW#)$6NdR?h5ES~Q24v-L}0jiRd;IUbd|m@`?%7u
z6(;G$QxmlO`j?$B?<asFdi_+gu!vrk9Xus%V-9;<P?BsUUWAe`&^JHc(VCtp0y2TY
zeAt`P6Y#=GR%|4Dd<7_0j*6g0ai8LLgtLVQ?wh@h^8|OQoLjkV2~~lc!NH-AC`?#X
zU|h*U9a4eO@iBK&tYdZpu4wu|m>#>Dr^J1SBolnyV}9RqJggkQ8*<!YIsQsHJ{WRb
zgJb@VNBN=_2}O@s$$QLY%KZ`Cx62<emqjU~B$z(WWBwA);B@&y$NiHMQgn5k(I+F|
zI8mJ<hBak(E-pc6{WR<^Pw)*Ak2!-5dZT}BHcjN#0x8?2T%?<Xk}*kwAQMDuPZuvE
zw@dl(9O5zOhCDeQbSZ!Ie&K0O3AuB8krRwMKM+9f&4QPNZX(e^a(m;@#?jE0HlaPi
zW+ZISaC3N@s2&Xi)yD|)B3QYRyw`_+s75N(T97zMx>+(SQV0ZRd4+J6-wAV;j}bDG
zv%Io9W*{f53OE^I*<~OQmV|J^>++U~gs?uqU)AONpuecLv!SalJPu)+X(BJ{f_@Sb
zzO^&8k<xE5KP7$i;fRz0N(t@exF<=CJE`V<4f3LJpW4$C*_V3`wrBcn122ur<%VUP
zIaNq$X58;#VsVx&x!8>7HQx#X)yd+Fi7lCizq9=a15F?HhL8a-u~!iV24Y#T^QU!{
zzy%a@KNyVRv@S+2W^M_82|+%>&P54kmL$+nE{9_yh&RjZ#d!=%aOw5)#$eD|pOKzl
zro`tR4>7@@#^heAX)EMxiF)EM$opT5EPsMOt83~$^A}r{yuZuunYhI78Nb9#po4sS
z9bXXlmrD%Xd|2k;BD{-CLiQf4p4jVY!aTfX$$?N4<?e#qS_tYheH+J5#sp=mK7R7r
ztGKn`kN;%@_T%N+!p2{6Z{ZT_-a^JN9p-#lPvqq`UINcau?sDe5S*&13s<cQ{V=h>
z@HW_`44C#^9PeKepR(9t^ix+E_T()7&373PfdQcx5<zy$(J;r}aA*9o#h&H)EAnsV
zhC=XgnA)F!bh*%4PMgox2{FJ0W+`hvSAozyW=uAZJkndnBcE@U`kLxa(bQrQg(0>d
zW6?^fPSE2)<fAw4=kNH<ShYBv(>R)C9OLM|7oMi*QJXFi0yOtBOB^24%Q{IIMghjK
zzr7ECJkUUM1NN;M!~Gh^%nP*Ee0G%)<I7Hr4j}e0$*|!FWfgkly*H7k&|m6qP%q=1
z_oeUxSLDi?&yt{SW+p(3hn&+GJ8M1G+LtRQhd7PJkL8Ms*1k@cF@)g8AQj3!Yq?>c
zCt3Vlio;UG%JAx0$gewJc0L!s@JzE^cQ}9hvac;EFoH{5<fmWL_;O8KLCvSba9?Nh
zwYh!G`%|+Ms)kW$2NydlFE{L|2iA_|)2@vFqJ=tf5!QCxN`EmbmE&cz2;9sCKj%NK
zNU*&L(?_cAXF>-zKgHecr=pD6z7x@U|5~UW$gZvHPc0`w^<R6LnFJT&OlD$KtHz+$
zU>an11p`i85cF8iVrFY$?WJRB(CCI_ao25US9JC2K$r@F#Bi9TUS4RZ?!KMRv9o(o
zPU$Cx$&J{e^&=Q?X!rREbDV+EOBaQpQGbW?%0`C$h0ZJXAAtLYapTDIO5#5%+&Dq}
z!I2;2bK6AzECtpB-Di+5JFiIU;IrLf&wpM~Ww_vZC6vZz<Y@vYfMdX6U>~pxcpd=9
z{X3jjBr|_dDm@aI2+R_f|Ly0MM}H{!s`HA6*9)9i9;YmFq9Me#U-5nn(D(?SG0uBl
zk<ef5yrR+#r`3(sf7y8@l=f1xxCJN#N&y|%2-E@J2k4u>!+AwA^9P^d@AJSu;JCPi
z`{r*suPE$5&KG&P=1Z_&gjTD2wu{9r-#M_eGc`i>i!uiI&P5v|&!lC*8wa(xpP(gC
zDA#L{I2=Uuk-28IymRPqfSIt&#91c}i<OXTz6k>I#RErv3nvcIClH@!{vM)zJ_weD
zu_-L8NU*G<xQC7$Bg`f~d>lC{d0L!!VW10^+~>qmNB~Y8H+F}!P8_d(PpvjzMJQmr
z)F<LB!IdzF`7%cck^aLb_J<@DD#CfB0B$E^bzV@-Vr`q!&`=<s^68_Wa_GZ_v^?aY
zU=VZGXAzm5x{LcyVkUd8JxnNsqtS!3fw-nje@5tui@0AmI$b-*P5O7)s<z9AVj!{a
zusK!aLirXkGmKBs9|=}}+<^)RB1ao<^{^>kX;2B~<|3JfJeWv@IXo~nTtp$}Gjie>
zs8UDG*kid(%i5QCBp~MA;#I186PI-nZ&k7!k8BiLJSuR>h7ArSYHD~<iO|JiNP|OD
zR=9Lm@@Ua+Eq87EAwAZBPGrH*)zP)xEF>B0I<PUu3WRluor4HwG59U@*GT3C4#)*>
z=T6L{zqglekt0JjG5z&|GWb4?+B5+{p^fgTufl_KesA{@I&g7rNq==^SGc5GcM%$N
zDBG2)qExz*Z;jGN_-iD-y8i2BCq)p}2lKcspLg>w-;qwg(()HXrZa3jd!}spuwBVX
zwmX!iwU<Qo&ds@10tJ4pnneT?LI)M|HS1v7YY$x9Bv-SsJ$Cl+xPAV;6Eqk-srxG9
z{LT5_#k!V#{GO}ibh%Xvw5jxHs@yzGY~@?`(yJD$GqsX;X$pypI5DT^o5eVu9#Z@z
zw!tumU}_j8#vZXTB&Vb!;K(WYBw))aIfHo=I@urFFfxYS9PyXWVFQN5U;5Dw%tIz$
zw`nTQR_c;mZr;Y5QwPf3_^KR#GvcZKkFXD~jQGWdi~_bGh!>?#7uoQnunw|OlU~+c
z^L5Ak3zWhaA4B^FhMMboO0k*O2GL)lD9_<$5b>czbCvKcSt+u*gA*=%dH>Q-Bc11h
zzO7jbXN)&5mBf=w2anK6P$YcJZQoWa2#E!v{hFKxxm7Fc)Fc9iC35{|Lp7bIDjrhC
zgMiGf4r2yquH{U7WdMio;XS4Y%Ry{q7#kv#gZ07i`7eo#MMh_o68E*Fd_#nrri^4b
zX+slbsv>+8pmck%oLDU<yTk`c&RTk8mVQAOK~qMQ#2raos*zaqlvJZo>L()8NRJ#Z
z8DReF_eq2zsjEXGs)yS{k}ykS1B!ZrY0f6O65^lslJv3g&wfpDg-&EwF8wrc=hSwm
zPlV&n%%yE_@onOwK?)`GNJ6MQ0drMuBYWCH5dkD)uErh@*k}#GcFl<-;;TN+5vb|b
zctkCv;*zL7f)A;QuO%(81r0)&aUz4EQu;kA!k@7i8RZ)koMaWW`5cC6n@{w!!J$5d
zx}l)4VP4xL=BKi&c^{n_Qi`q@G{vimblcVR53b#<Dz&@nl0LRIeY=p^I1%{g=J)$y
zJ4tny{}tcKG0i7qLLJtU;jl;LnJu8bQak(kB&;UDjom{#=dp=&3s}YXYz3C()*?Ie
zpOr>*X$FUOQFm!A8JKahNSiBdY+x3bJZfD8n{--FLUM4+Mx@{vM<W!B9QJEa7>_ep
zkk)U=K8R(rhU(X_faI*ZO}cn`5t*O}lx^j8|0rt-)o=Axn^DGcQTi!#7hxLTq?|HQ
zB;T6(nrsCeYK0_o%)IO+CP{n#+|;w1ZmvD2c-J{i88bp63RjyKOE!B!D3U{RCs*Zh
z&^%65VM(J34230U4bHS}M@SYS9TEK}c%)2<$h1|T;##zRtjRt@#1T%J=kAhOiw+Z%
z7DpyWVK@6%9K^uVD9LDKj)dR^aZK6$@Lt)l;sj@`QSzBm{TlLG{JKM_^60Zr2w~nr
zr>P-BaV8OjjWm?hQ3$ZCx+lyD%q`~4iNF9xWKi$t&pzBhwN9Dq-o^v9@=abLR#|<P
zZAhQVQAqt{KX8b!o72`jV*h~V{I<6~6`|CSYi!tcFRq-OP_ri!l#8;keBk$FyRh37
zh-vx<nho1V<uSlQEH;(ry7_afSZop_PK$8boQKoq+i)shoyMOs4}aFK<j<xGJnq14
zb2)CC*WtE#b4An68qy4#ciQ16Pbjcq3r`~(syir#2qbbvYtKWddcXwdfk_9bi9C9n
ze)1pT^3siP-~5MsCpR}_o2eh^LneJBm*p>KZqkLal4YCRR9VNhIM|rBqmzzcImvcx
z66fD`zj4}M-A;gyA17cSC-oI$`q?*q&8~)Qv|C#(aSFd|hYbf}FFVB?n3Q?Svt+Td
z#AW4x=9X}?aizE|`r{}3l-H&b6-{_j#STR!lD001vu;K>KT;*^ChCevBwCMFpg{JI
zv``4YsjK1&142Pl%%A#u3rbGso1<_fngd1`+}!pMu@z5Me_5UFxiPYKqFL4_`WXmY
zeWJrZUKzrrMuBcHupOq4Wr12sE*T-*CXh;FA=)Q+BMN(?DJ!kq?%Ww`xlG3e;lz2t
zY?tl;i?gHO_79VwJ_cThq^>FqRUPlqS?IuI+CfSbNkv_1l~7eGaCwRmuOF|ic1ac2
z9ldo$TN~LhX~J01P75nyi&d8=Y@QNZ5e<=6v_R3rM}nN}5ae`^LV&sAD<=;*z=!~`
zvJ0@i!orMuT*5kyXNzJnxfU!+#FTW(syy@yj7XX8#zD_9TWBSg(;KZ25VO;is;-&R
zf(29n3U}agkC`j4sjX{=`D1EkCC@enOA~v{GOLYQKAdPN6+?W+QE4fLMhrW4RG<SI
z@?qI-KY>bH5^K(rm4T}`=ra<6GP2}cRBE9K8^r(O+ZvKpJDL~qNguPmwQZp-8m7V@
zN^KFU8@Q*E7UJswZD=OYtct4KqA&NDKSOfc-#M>@o#)4;YLqtENdFS^3K9&dFBr|M
z*loqE3X2sMmi8hv#7H5<kgna*Z>rqGc_y=ShEbHT^m7S`?4d%B+(-6dYGI-*t5E+<
z^P3gqvBIHjFQNKiDKj-p;Y*MmMAXOK^8{gVhrBn?Un}%9(JqaGPiann?Ll$aX-{n1
z!AnT<v!xN*zo+dH+)yR$d)}fNUUOcJ)Xz$%vH5mur0%L;@p((;IW$raH52Q@7``Z{
z?rO>WyjwZ7y=hrziEYVZVX)-}D^!8a+Bc<5#*3h1xvWqS7I$WL>iwNNvp;P<;TX`|
zOF6ZibFB4T(YJC~mj~?Ev*ln|9sgYVFTcLiEi{YE;!ZWj>X*aK9|va;HulW-D`RH9
zw=O#R&of(j+rwMS%oCi;+oFskQ}@q2q4x)O3<fKs&%WtzzFD};-G{Hxx)V?F$WHWF
z7(*i07&g=2&}`P4G>k5e6yDx`kLvQs@M`+D)vGA+`X6%Dl9YOA?Qrurfg>XqT9E@^
zgWxOT&hX+yo>7=HCb!3BO$p54I3{j@qbN!+nu>Ti*O~vw`5RU!f_JXS+*x#-zFp@m
zr}GGVhgT1=p-TFp#dtAVjM3QdpDoi{l*z?1s=d~(E;Fkn=*i8+oB<M)E&5W?I^M)M
zknOw+hdKDcP%Q}tuai)WoEa!7&-Iumsf3KA>cJ3Ib?Vh+rZWNZ$pO`dl8LcBv_cAA
zc18lYB|rc<0u%wEdTGEup|%_S`L>@ui4LTkvnNApm<q=y*er!iCv8V>#>+b4WIF<}
z^J}=w7L&$J%unXCb|Wy{z3WVlMDNhz3o7S-3)6oqjx)7WX0HTEH<C-Do)>{-=9>q+
zXXtoVPHKfVJMk8bt&h;MII}u~0l79^#`5CdW6Ef!eb|E&Q{UJ$n$yP;^Jd)qhw~ej
zB?c~nN*%0zm%$}MD%|<q*x?^2$-sGY)_qDIsjoQeKH{k^*%_~Mm`JG>VZuS8W+Qtf
zS+Uu?;oSPL<h#s;p3UgxZ3c;@9(LZhh9?&RH`z;Ufi?^GL|RbrQ|i$u#k>L}G`jMH
zn3`(J{6K%B(Gykos(!d}z)Wr!%sjC6=V@s)qG1MJN~uoVlq{jeI#XKPMI;@L^`RBZ
z<X%K$e<C_&9&p~HQ%fuI$-p5?U{jDsR}QoVqzzw}E77mP5v&U`27f1F&0F8zlxE2)
ze=M@fh-;2;q_!ewec2frY%fKQkh6Y#Ck=~JBu;z6vOFXzd7O1mkt`yaC)8Gn>0Fhm
zEI{|uQr0z1gk4W{mj*%4Z*00DBL5ko{4X}2{Dl0wAi#aSmq_r~FBHL|;}P&0k>OU!
zhx64h5vSKwffV0W4JQs2dFBrfQx(B{AK=BGc`U!}S&BFnE6QSvw?`~m^}8j(4$IzQ
z_WzjR?fD!VI8Aa=N;O96$f<JeDN}@@k24)dnpa7nV{o~|y480HWd%qi09M-w5HA7H
z5t)dJA9OeU2(Ddz+nofIxgaM#sfN{v)}n+p872aEFyGb(<(TUTpJ(1Bv9RRP<lWbe
zn*X9W;yA^EqlAv1#u2Gg|1wrNw~{@z1W#o_GFNuVYLs|BsZ*hkg_h`Il0YDiCHm+W
zmS~Y0wwCC%sMd>IWzW@IV2KtfOm4MwFVU~FM5pwL+-yY-+$4mvEEjvjP+5JUm8n(w
zTE>U0(q9W!VAi2soP~_07HUw%Pt_tTYxD^79a6Fw-(PjP4xwLxv3Ycv!%RV}m`xvC
zX`nx*(H@IF+EJ)392Ul)-t@Oj>L>VGb7%C~V}eWde6yYkCcYR2>L5_BFiz*D#3I_*
zY)|v0XvW#xv=Y0=d;t!!=&NUW2H8t2>2H>>rUwQga=@Hd8s$Z+x+rNk0%K7J*cGvn
za#2GFTwHgcx}(hY&AoeJJ>OtvvdouZfGLkWz?5@JX6KrhfDJ0`xz(qU+f2hY)2ykx
zl5dMrs#`m^OO;aljpVNpXHI7j?NBazjFr-P<5NZ{lysyym6ILI!i}auR#r=s8-sHH
zo|F}x&aDr!mLdRfA3dBON<#lrL!uSm7=o9syd*hDuX`F0HkX``(5Ixonj|KOyUg3^
zQc-Q1zi|oXoEJ7t`z@l)r8HbVnV=3@R147(4T%Z?MF>|u+vhb+dmd}f?PMV8SW8Om
zNGeF;<~ukE61hiT7Fejt`7XmU^|R{ev+p#`i$*Qly)%e2TjDu=LV)p<*h6u5gyTBv
zF2X}pxW+%<Fj!P}AZas9RZ`k$Jvv1owwn8%W?{}x!+bkqQCghlz9l!;d?w_cXMXg@
z&=}JPT7tF@L2ahnMB72@q!wG|Y3@>;eRIVAvq#45Tg=WlQSFR|)0f>5G`p(9xM7}|
zFKtPEbWZkN=1qLjD*3c&W=C5QZ78nOyIt7^bEIKqkTQs5B8y0Tx?-c7F3RU`pPOs`
z_?hl<U&@p~CMd0Mfz5AN1#S&Vwsi0NvWloHbK|_KEOMjJm}q8E=E&9JuvOv6IZ8ov
zcoQ8$o#cQM?=kPAi}LePW480inT%^k+4bRRjjowT_3NF_?RV~cwfUrD02;pIjR9GK
zQO@U%q%4cq2SOIu>A-(AYe*|k@#n%-mt4P66m+?M)nmWXqWP-^>As_PEzQPQQFQR8
z8-h3Q39C3Q91oVz2*#A-KL%2bY;8!cmJ9uHA`|<v{z~0`eQ`+GHZb5=o_|mCd#>C8
z$NX`>3!Xc-34zzMQ(s0p^HbkPL0@}t>MK)QkhQHnsYONA8Y3sjLq95yD8o_vXX;;L
z>_rtUVz~Yrx{&>y!BX_$%=h%m(WLsmNbc^@hvIY`rx=`G3p{Y^ZC06YKwy@l-|)Hh
zU=6u>PjJFvP!kJ(Tc+sbM_EIjrY|G=W}4NvvWB>k^nM4`K&TNt=8t0byviN1Lph6=
zm_yLKL?eam;`vUGWXllNQpvgH+$3sPb_yL=Bg|EjmK*vv&mK-$JqW8%=|ASK>2#&P
z_Hr|Y5Dkgu7#^X*C_?v-?p6bh!n7?WmSW!JeSwnSm}M7T5((zV1Sgd@d05#6N@`iq
zIof-m%Wyrh&Os_zmvwFpf)UBIy{<8BeDtovo%NaL&_|tBV$bJ-C;E$apFPY)zG1$1
z&owMVml>CDJKAdL5zE6EYkt$pYmLfF?wDG0`I8N*#DQu4-A7E6KcN`U27=18Fz;s6
zgRIKZJ=&bE;>8osoUL9Ryh=TbC>SSDx$a_ae4Sb3Y{(ciQKVJ&x*C=an(TMl4xLH2
zXX$$5{C?<{&`X7#bw|C!?@WU>(wf=M60Egk4C)t`yyBd`(C=(qFld4VoFf6R4+pHN
zK8Ll6cJ>?zJRuIOK|)?8A%{uGgm6egv3W?S%i_2=V{%GzdHk`#X)(c}lhxAXtow#+
zFHp)}cHUdTEBD@=-@HTIVx!PQ#~t7^T8*<#^hS~|xc9~6%di^At;m{`IHO;U1JyJ&
z?$6LV#Y%45gWjnIu3a5-`VNydN5;meS;L)mKjUK-hMMbbbJA&Cbq9~|S=gw!q$wS}
z<Z(t^y7;u%;xGk;LG3lcOw_zt$NHvB?!ZTuJIo+vtIY)W*7UDg7nZYhgoJ`|`U@?#
zf&SRW>>!$M`UNJWuIMmgl*gmkLk_ZS(?`c%lMZ(&XFK8NP#)0^vSl6vFEG>}Yt=qY
z>WCarV-#iQR(@uObO3d9Zj~Ae<}6f(n;Hky?Oz`=r|lj-I0#^gmZN5;ee)19uN-uf
zbLW7xnioz$Qqpv@afoy00q1WU<dahvrqv*^Tb#kb-RY_O47=@EAgz1AjGqJEU%$BD
z#{P{%{LcENgC^i$Gs0h&&6#v8aM9Ug50ykMQMk~#qpD^cswS=IIHD-)jLMD@Eu?Zl
zXzx^j#tYp#^O##HK)x^gH2Y8oBzw6P^DLtqvNE>|&pEgH8343To6masFPXZZ+i2fw
zw(TOJh6NWV1zH#tgBTU7eP2E-U^0`E%lVvRweM3##v6R|Hc)r2ZWu6UP8uu_SKF^7
z5Ei+b&tX|(bW>KeN_C)b7q?VhC2@*pFT<#gaK20zQb%f_ppm8Xf&=AdHBgp?2g=0N
zzUt06{THYVS>0fh!O|&%MP5GTWr9DpB_rmtxWJV%cw()<Th-`+9pNw^epR)x<&H5y
zNn}p<5E>yvDADh1(g)ek#K;gD6diD^_G>B>y~3*2ri=>?y@k#|fr6r^y=jEkKl3E7
z4M}aqf+KgXac<4$1&vT`xA250AV##H0=5ek@I!)vK3Iwme$0oDmHS)WNy*wIdYTYj
zZRu7LFxIS58JMfP!&x-K4>+HK()5vW=nSz9Me#w3T`4{giqU44ixK<NS-`KgQcF~+
z$)Xx~#$%3oPu5N7C1^%ShRb#_>rd!tunBaOeaO;`@Gg0VSi}FyYeUlc*jfuoTFFEd
zOR8Z4RTBHrnM_v=qLS_KTIyGvYt1|?i!+C4y??`sV=b9MS0Ju6Q)C6T`W3;Z%o85d
ziENh~l0#_RtCgzGELP8JHB9M!#^AHfT3W1T^h?P+q1$V+gEe9y%{FPzuSsRs@Ay-r
z&&$%MWa*cg*GZ8R;SHL@d5gHczoSYe+a|;+l&uAZooROH4pP=g`GeNXPLfFzb`#S1
z2_-JE19Kg4B`^wb`OGw9drEbu!t~n%qeIJiU}$Ld55)5#)skz}?aZlPlQ8z#UJ#-|
zYO^vmzd2P;V*j5ETWQQ}A;NIjCB|%xCEmF;jXrG6JdLv!xSAK@X@Sdl!B-26nk^;Q
zowGGGn&>N2cRRN_tq77S`L(hZ^0u`V19Af$;OpSM*@-NJvG_<B4C7r?o87^iy*8Wb
zMrpq6c67@_sMBrzt2>@@hy5J^v<IIiJ1y|!Q!YK$isdqQoTPDML_TG>d5CVZ8v5tF
zwQ7lkRx1I6-#=R@`m)Md`q#Na+?08k)vz7fn~b?P7;2Kt8t}>IiMVUrKGxYujGZWb
zLanz`MzcgG7IDuLahiX|7e$b)I}hh9p%{<(HOiH54&kp~Ytv~>ArTCn#S8~^$oQ)X
zh^?`%yGTMs6NUtL_ntBL;MA&#6mDP#8v#36b}%i_U$y`ln#i)B;*>S*Pvjco$ClL?
z%=q~elnuXpj0WVh4c6?B5^b?x@W;C;BYJ#|yQV(-^BV8xS@qdyP_7}XGtF%KKWAjn
zLectNCDB|O$s?N`pgU^fn(!runKLO{ZL*IDdN#goZ=z)9FDy|a4b+7tIf&rq{hz40
z&UP~#62@?Yv#|LPJJk&HQ3e)?F*x^tH_b5TT8Z=h%QKll3XntrekU{W1ucz%R_!vl
zu6JTwtI@B2wku%k4*@aLHLf+aS<jd)!%M#cTQ)o{<ty6y;vrvlB!}@s{CO0_`ltZs
z3fJ>dHs*_rgZ{Wh2W%`KXEPa`u}qU^8Nd`Gtzm`f-1-zBi0iySJ$H?3COIw5Sts}8
z<+Vm%m)h*yTBpLCW?Q^x1F!Vd+Cd-yYm=~2?%cW>C+BZ7&rJ<xIqNRtBg?sU36IuH
zGk8uOY8JK)$4P80(iq7HrP*8qcI&NRs5o4XL)iMFv+i5c$~Hy3oMB$wp_-Th?yNKL
zAangr28eU(Pbpw+wfW(1ey17vQuDUsxUj8DIfV^QQ0G0jGyEy5^P3)CLis=cawvai
z-5gx4GVHJ%DF#_>{WkI2`jH<!Izhz8W}oAaF^s~#^M*_X2XtOm#D*kvo)l8G*-}>+
z<t5PsS#I^dD)cT0YpM^@RaIwOUV(>b9w~ZgNut<T7H`U!4Nfz|w82YY^r-kX#J6>(
zRG;4bHiKMr_Jpiv$aIiF9yPwvac%awnv<K8gmQS^5Q443>2~cp8C&!2=C}j(2#tMi
zjAaHm5bPpSUwa%RYp-#*{ngfz;(tXArj2S*S=&8{L(57D#>Sy>ye}&aBu|6{WXYoR
zJy=+9jhe&f&&Pd^I=}K3&D!?hXM~&KKNL|-rI@I}J}9IBm%CT4Pr(h2lA`RU!W}#z
zTt1O71J@X3uEEEm16dpYC#BMwiUd{3p3PQWl4fnzvSl_Q9@M}hNeE;-!hE}nWGGc1
zPd%s4GDneKLvjGcS1HB`9XaviNE~IJ5)rQKQ@w;(FbQa{p*Dyv{NvkHXAi;5a-v(C
z`r^gH3Wfzd%G^(xROzgOnu~kNc%v|Y{{$u`D4$wu6mDT|WDAsPz{x$PmVRmi?cZF+
z-U3yHJ4XL3ya%Jx{3B1Os@RU`W_KkhwTO`EP<`_mS~KR8U+7dTIE{Ja&Tt#Gon$nl
zE(dWJp-%nLFGR6dIAy<_TXIXDnE(n>ay2-K8OIy5nAx_qmLyOgtQ6Fj%*-=qe@HKi
z0nCq$syuW4!}7)5RiQ;?m+>J6id0FQbux>KbU4=#b?)3Fg%G{}A@pSk=NYO@J@Gx(
z+{gD5$inzGt&2vIBM=9%&Ys$We)D#=;$X>?T(d~*H3&8|nSsg$L4-o()4BCDnT9d8
zE_0<UD}u4Lw;fd;UFHK1Sw-$AMSfUDn)r(v5hd^Sk`)Y2*Ymsk6l$eaD9LZJB+_ZC
z?#wseq9VdWMx##Wq_ehmu!z%RL@#$oFo~*F_DyBDl?uh~G*>`&P_=OS)^ylwt2<5*
zvwCk}v{^^0RD(Mo4Ce-R%T811{Z?J%>mVhkZSqsZUab`AH#ms$5NI#mLjx`}s<cDr
zd(bT?x#j~c4Ean`t;tA{$e7DliznxUyYchy8+U-d7c;x*N+iTJseQy>ob@d<%w|L(
zocFxQ+iwIN$`Lbg(^wA>sk1CDaCHq1dn;88aoAtv)vqavty0V_rw}n1A$&%RTW^fp
zY)}2T(vF=bG5SC~B*4=@Q8ksK&3H(1Umvsi=+-mqUO_!8b(bJ>RT_kck`^w4=oz2-
zwmQq2dD6<s{fq(TOjQ^`MAUW8j=)Q)pKZQtBiUBnNhi3h<-*+j`^bGNgVvX9{sEGR
zNO&hvNz2S>)<X=Yal0`ZAdBD?=G#SKJjZ;G*RVweNW@0_IHN=HbIvdd$%?KtCDDXl
zS-puTv{HE}Vwupja?ML6W68l~ZcsT0fl8=k*}`^H<U@)jw_TZWQdA3@6ACGl0(xdK
zv6O82hzlWrpNr9j5G_^2VwJ3Rizru3uw+-GLsw+ulN!^ZTID%+Zm>hOs(rtPvK;BG
z{Y=ms-NO?H{RW<b%v>f<@R!l@1ap~PGv8k0k3-q__{PCC@7C5Fh^ikPxV*RPmYM_6
z0kfvSzBw?k$ERj&%~qlI8?ow$vto~Q!31rW=wT=8P}xDGS$oy?u<(xFOYiHeWgsP#
zT)aFG=O0)ID^^KfcN36{h|5_lk9ol<i^Xs#!VJ1=)5TyRo4{4=Mm$HcD9|-JJ&<fh
zkv<f^_enN#g)O(Tku&Sh7?;YX7>2Erhw1%VG`GJQ^J0PAl8jr?Yx*E!U4=K2it(Ud
zQ6rhrtZtLI1dW*3;fTHQ-7(GY#w6b|7=sK8vsi6UF!k;QP1I`7T{{)D%r}j9f6JY_
z`axh=-H>^}`P?qy;<rl2GrJD5de^xKlln23Oy<F+EPK<&BrJD#Zc35s&LNx|Ji}&J
zXm_K>er7j3=la1cXR(2P^}~G5U@)^Y9R^W~(Yf&ei6pNG>XS)n>Z@{y@SU?&+x_PP
zwi4TIm{g4?h9h`GI^_u<CDQ?3teJ-(%{L@AWgch0dr;Ksu;h1GD-v@Vd?KD%8=f^m
z;~-ZoK9U+x<NkT(4r1pAmLrJ72_nawwuDKdgr0<*Fp4!2$;P1$QjoiH>ccL{tvDS(
zC7i=<#ERSNqK5joFl%3Dof%|KBvEU5qQ@ea%d`kN0xVuIHgfZRyPgfKsk;4%Cssd!
zRZy@kcG~O{Xfb=dB)TDUpTCpV$~J|+y5e-hioLf6Tpsh<?=bFK?P5~WABz$q<20L1
zgK^Njk^zL6F8vdO>o_n_hSP(E;qsV|s#j?^8BAB(5Hf@{N#z(eFM>tMXu;~1uk&K#
zE;Rzpm%)M=;(^<h1j!5clYZyCd5BydPFZnUI5nru$8oe_LALrZ21JRzsDzD_MOjK(
zk00E|rj4;t{uou#?P7|O!p$-N?LHWDp|9zbIyggai<?WN4itPete-Y-G=orT;ji9@
zLZ=ymGJHhw=e8|l=poY$b}_LL$-0_PXX|5f%|!A;LiZHb1)@|=P1CS_a;kCA%$JSh
zxHn`U3rtF09;IJZvp#yJae2*p+iYVjBMKEb-&RqNfxq_i50rAjaJMzrB+u3l!Dye9
ziMZoyHmr2-3XD;W@iY-=yLLglF9DNcS7U9=rn>O${@GT2SY*Q<WH6{6fu7s|*TK2<
zT3P#Nn0GR%^BYE+f1!axn_2WK8jB`q6;Wudt(Y3NX71&$7WkD1)-24lgPvS-^RHD$
z_24>}7pOi8US|%YNHQuI9Dx}gPKACg9BY2xSRbtn$9iuY9oSBsmKgV3c(wEn=%-nK
zD|%o2NhvE{vveJc2sn-K3I^M)_Ob0-oNJyT-AUD_7&*4H{_58PGyIvmsB7>#GLE9O
zM_%Yt+6~?L-bud7E~=~mV~m!R6?=_4{MCo0O}Rex{k}23X2mR8`5ssCbIoY$sMFI9
zV=R9en4=k(1bGJ`JxbOSr0X_SY1>&AMP{IxnuM;$(R1rZhlZsNjrRzXB)?&li~var
z?B}%klDLWDf^4)nO#Q>nX4L#{frSueKHj{6e&Bw?L>`d{`ZHFsWS3ZmQoc`R>p!Zt
z)MWNo*@Q0+(@KUAHQ#)n2!1ZmKjktmg>5tXOlEwvo@l;@bE{CFH1qfBRZ%~VD0^FK
zYxkW_5R7B$+uR~XI@m1DA|0`t2h;L9#E9HeM)1wN?ybHta2K0&yD%+>v34#tOPGE6
z`4T2CtnhJRUgKcr&fU(Poo6zxgN->hy>T#X%%RSme-YWd)|AY6<Q>vM0lNYNQ&yn%
zUR-P#5K5nU)Yx-dWQHOQ5Jo1y$g%9Mk}!8IeeMr47nESfX>;2=StXRpPm!JqVOg!O
zss1JtXWbeChf1w%MT>HGxYweE6iHzp10k|K23P|lvUm(HB!wrCOfHOAC+sN2t35LB
zOh)u5<f*#!IgOW4DXvp=1(w6XCDf~{2e47@U+w>B9syRTR=6tT`Fqj2nANt5guo2m
zFRo1DZ{oTuaTy*M?|e>p@X=?|N4fNYq|h*m3`rtjb3S)K(tr~W*Ak!p*pjtM&|QE`
z1g;w|3YQ_Trwmq5RfH^6ge+BrELDUoRfH^6gsiVr1gXj)W9({XO@BJWxitVf8QE40
zLOB<V*u~}OEb%~M+|m&GzUoKm-f$<4BQ9%Yue(_y!71{a^buyY_Xq#|XDDPs%>2Ws
z#?1K7`D%?yj@5<1AMJ1LLKc%*@PGU7yMNKNXMh&qIPd`w1JXJYm<B8WRsu!9-9SC?
zFz__+B5(jW4s-yHF5&^nKrT=M+zs3V+z<Q!*a;j0jsd5DGl2bbjG6(Xfr&seun_n<
zPy*Z!JPqsx{seRYgCIwZ1g-=!fTchQPzP)SegOOo_$_c4I0bY7age!&1CxR40S|CH
zPzG!S?gbtLegW(T4g>E39l%IX`-wm@a3j$7_kLoU_KWm1ZQ4y~+M(s#*}g5UJIHUI
zPSYM7*7F_qSY1$D>MeBZ<?cJYy4$<HSa+`~FZ8-sSC+4FS5%g-@>W$%;b7krZdIkX
zK=(%axhGU<{MY7`8>NNrvT{ksyGmSfD<~6()x~9nZqEk2sJu*h8hXL)rCx%Nv^H*R
zh4Ps~G%44(vEA{?E4*bY)KyihDvK-hDHR(epUO-M>aj|vX=}79ZIxE8Rcc=TP0<Rq
zQvT7GTA603_bVh>ZDN^GT57!tV<JYH(52a8w3uj@Ju@@2pZumLX&x2Wo$Og2>(H)C
zO3L#<8gjb@-_RT@i&pZ}wDlG1`8fyy(bwVN;ozTqYEO+#*R)Fkeo@gjd%u`iNB_71
z@dF1rU4t(gk}&k*OA?0-A2D*&=rQiGmyR1h;j+soUUB85$yZIeI_a8gr%szb<GSRO
znW?j8U;nkV^c&`6WX_$JHUGw&7Gy76<XOBVXDJptm*;=|=37?WdfUo^+gBBOSKm=o
zTykgWnzHhWyDF=6W9_>28}9zb#_CO*6`47+OuE!lUR<VoD=E`WTBf!{Tgcx9+EndY
zS}cRN1**Im-riy7mR8NJ^m;X(IbJ=tpwv+B^CI5UOH0dFN#shSOfO#Jb$cr-%PZZQ
zHjvI;x?oXGj^!esTF(51^CCXAj78b$^B4BGESZrsb=ttV^fGrrMMY`xssg>3AyZUP
z<z7?3uq?n`*S%{hbQ!Xx<pm7gBCmUnJDhiE@$Hobl^fi})VZ?KyGk$JFeT1Y>Mf}9
zGO)|^f>p#MMnvkDSGlW<ii+||e7pr~+^Z@4n(|67Y4Ey6m0*f0Jmr`2O&u6_l{>ws
z7zSx)=geOaF>~~y;wpDRRh4(m?WG&sg+^s@*&XgOl3FXppd!U(#d>i;Y4P1E`M9ML
zo;e~F_7c;5yKx8K?hWNeWn@{WxaaF`g03mA(%q%ScX~-(s#EE$GD>xK`D*v7g3?mS
zjFyrzUA3xwO@*4`6R%!XT6u+gwNbW8wW*rn1wDl-tI{itRXUaDzw*o|EzK?{E>m@v
zdS5H`R@1wz+_<C2T~$%Aij{)k41fZrb3}thw%0X%+N-<nUaRw#EVbHOFQU-pWvjeX
zzIuB|K2o+M$zu*FN%?v*C=B^un=JlDnOb!iIXxlVMc#r6tF)wZ?R8&L$92UK5mmqS
z#G7%!cvX7gm&BVc@hS{P+uGtv-6$yS=^*Jzm4TFtIdOruzpcDXmhGz<II?=Hg|)j}
z*Q7|io_eeGlzC89PInc0*A}nx_Jj?!k#~Is^M*}9TBc`as&>9cwU0rLp)hM0cEx%T
zdqSa%f;;<$zi_*RA{7?s1r%YR)#VY>Qce0w?_GwsN(v*Rd`W15p#xdT))X_L7<AI#
zGTe<aqe>cZUBTaR%G35qstwOO?!9I7T6x(TZ<$UVB&=$~^M);`yu*-yRjR=yteQ`&
zS;TaiuobdCcdtZ}ge-4fHG(xQyLeS)c~$vp-JM&kYB^`pr0(`uU@dwqPg)%FVak*#
z+AQ|&J1SYt$_iMKjj}t-%GZ@$PalSwFjLm(v2k&1q7rPTTO#x0<g^R2zWR;gT^RfF
zdm!SyiFdUb;*JiC?svpDyWh7(yu<A4cIU1@_xpDu-eYQN?y0G*VMDgvQ*+OjnuLD+
z*patx-AaLyl4?9P^_oMQczLoXuZI1WP1)nACwuqAn)(`IX>7|yMMVxr?D~p|brlu8
z_G7&NzyG<lzW*kIA6ftU`ke1O3ry+D{?%z;{MS2tt=97|O8aX6B2(C+_56#5xcycB
zh2y*bzwdwT3;pj#!{h(q5fD||{SSfXuk;J|pggxk_56#D`fC5e@y|D=|6^`{Z3akA
z3H%G^C|^DAE)ntm5B&Ou|7x}E3FXpy-mSN&D47H`wOf33TkrX1eM6)F-llKex9!{a
zf9Jd3d*J&IKJ@TEJo1k}_~E15AKUTx6Hor=sUQE3pFI83pZ(J_KmWxqfA#Fn=bnGz
z*S~r3rQiN;SM%;Ydw<{3x^Mr1mk<8o&?|?Jyn6JtKfeCPu{Ym(`}jZq>75fN-+k}Y
zzx?@qv+Z94r~mDP58FTb_m4Y1Idiu2)4zPy#pTGq`9O5x1J74F5dCM@|35qbzq$SY
z+JW@K{^~&bpI!f~teI=p%&Zd9gjUFJvOAlfTV6Ks)3UR#E-bv77k-{>O-lzj6LXGJ
zM`vwe`P%OHMVywzImcVUk<<#1Zrov1>6&(<QL56o5nNf)O0TFa7MetMLFK9<o^!po
zR~j5t#qY*~GWAM6lD<Z|lBPylk`7QtybY3u#Fw}dN6RVDjmkniB)!UF^|rLgsH_UP
z<#`LsyrGY!pwZ%-U0$YqbBxflK$o~0@if9~gp)8D{u+n;5RD~|qiOlN99<oH#C=(n
zw{p?#C7cuH_Z*Ui;(_0Sf+{_oGv-=I4i!d)a<jgzWVCE(N(Fa#Zzx}%t}V;STr&0A
zDH#hOKaeL`QvwP?c_<b&wAzO%Q*#=CcAz<E6&i;&qN!*xX*hm!7A;(~Z0UGy3TIyV
z4%3sS+^&+reNCZqzlFRuaH?3dq`X`*;Fo1R{+IsNT$HXIhC^v1_TlT;X^TN)A3A?h
zkaeNtX&N+m^$dT%0qstH;qQHY{9hc`+y7vM|Bol6X)git3&+1V!hhEEG%XE?^zWPh
zdoz3cAC8DG@qV7#+dndY@lTy?`OAAO@8NRv&1cv3R=5lKfBdxz`;SUb(^3HWT`2xl
z^LqRDE$3%9_V({vzB?Cwx&Kc+J#~9A;{8~k_9|b}6Yd)k?|t)|p5Hsa$aLQRdYbkj
zAir>ZBmJ+sIZe9;i1gppryTXS_V$nL*F@;USBGfC;q?2K?~0NO$CrF(miG4V8~^$Z
zz5OHem-q{7zuf=oExrBw_UHKT_4e<Z{!8Ega{r~<d;9k-|I1JG_U}6{zx^Z2U*q?O
zCwuz5Z#fqHtamzn{fl<@_U~KI0SD5wrJs^X=r>3MojVc!>izt0p32|GQ&|!<&s*lL
zgt#=vqLj_iD@!xiLc4)ag`Y0mhdDx04|5>O?0E&n`rPu$94I-ZUTbI6zNgJmypm8b
zw#R?6K}3&8G^?PjuoMj96G=6@ywE81&V^XJ5Sk64-_kOLVn3%6QZdB99CllX;qZc@
z7kCTSdcWZQm!4Ftg!43Ql0B!?3odbKG&x8?(hCbA7K8uvi;85TR7l)8<!jbZq6Nie
zWZy1jwbFsHBXz%C(#X*ZEk}505=Y9rbVG$#n`QYHK*g*Oq##}U9hg(8msadkf$Qu`
z!_>R(7W^M7e*=<zSs3Zivh2&sic|{~X0Bfal11&wPBAgY*eTrwy<d->UzOp7hJJ^)
z(nEEn>)w|f1UFHnFHL(gIt%)yVs2=UsdtN!af>R6N2;LxK6<|NfDkslh4af`eF+6m
z)0!jQ!9K$7ITAO0jz`lHq%{_0X3P5tN(1MlxKNE5FdyxD`_j@X0$BW%S@IR)qI^x>
zyE!eh<x3T@LwX~k^goMeuceCoIv?ET`}REAT8$y?O!NZihau7+qv_X_ImC15+au{^
zg*g?)WmY%e6eSsE_E0u+bm3l9rE9w+&o6pt3oZ~NPph-%6&HHv6cto1EzcH8@eLbv
zueSUA=`dO!SN&kk8ci#(=UOyz)dKmp#fG<XgU4H`xH7N_RC$>_CDPVQi&xzl8mB*r
zXq(Ugqj7T7_*7`$Qn*y<Rchq&raf$1qL(f!TL+S>{aBS?iP!3mTf-#?^-i5iIkYIy
zvkydkGkwAIZ-|;(YE%_T+BX=hS9>d&X@8DhFekg9!fHo)VvMc3EtZyt8%Q%FL(vv#
z)_jt-m-$7!IlWy7(<b>ZP|O!=%4zS*IFa1D*?m7zHOeWzo6==yb4tsryrBtvuQggi
z>ruM)a71ku8G41G%jkWeSExKKMrK~bDzG86%1Nf!ErdI}rlO$I+g;n--Y%5-n3OSM
z9OV{N77Jr0UArlB$->M9oCgX^IV_dgmcUk!bT#ddR-D2`tF7<Lq%A_7EAtph04cpH
zgwBAy-GGlqoBj9i|LzvpB?|HQ$<v}xh05y+JtH0nS_#&3!JqgG{P*v_Ti~m<z`{SL
z{pRPxewXpD<I>dFDt#B-`T)nMV2ubY{4f4woL&rs$D}RvZs(Z@^aBP0$f0Qcfmk3O
zaD<-XCf`y7@e`h0*iX`xxbj3Rhsr~yi?|I2E((F<Jr)r6>41EvhrZ{8zFFW^oFyUm
zoY0eHTBV=QQ}SjxR_Uza=>}MEkw-%21CX*xJ)}G}fRwp5^xVQz{C$A<*8x%<xd3<t
z@Pp9zcAiqc#{tRjM}UNT4v;z>0>u9fK>QPF6ltGuoAKJcHblus#4r3Eeullm-+iBb
z{ri6ZweT1652y2A@9DbW&#J5Yg1`S7ZE<0ygjK%_6UF~))L&|G!66XZ$uBqr-2Zjj
zfSUY2J`{?Ef`>)h9gnkNt=zI<%h*uoJo%3Gvi%9`S^L8iUGkQ;sYX4YB7F0Xw|2NK
z?=SqVMfO#GX`$z{Uom`oDEv;szw+3r$A)YF@|gM9%~oO&f4kG)v|Ysz-BF9*y7eu$
zcH3JeZ(SP^(t52udhAappr>84$%<L}Zx-!tPAFt}4gW&KztLga@bq3O{H@<o&c0<8
zd)47zQ6Nog|1eFf_$W=QADON_Nd6LDp3>KX=g3d?)=o1`;TQ*b%AWlwPua^IJY^Ce
ze?Lv_#ZU7T9HXA+5T3X26r5%}&tW{f{+y-_=ed{X2%h)y6kMT@=V+c8Jjd`n@h@qb
zo99zJ$MSsURGP91=Hj`YZ;j^$9_{a?X?OEH!BYm?ah^e*2YDWXzWY^x;iK><NmuF=
zT9h<tpA!21!H?6l?*iL^dx3hO4yXav0~J6Ka0}o8vVd7YGB6ED0wx0!f$@MF7zrc-
z34jZT2kb!Sztbmx2}t-8JdXi~fxW<sz%#((z@xw;z&2nbPyzI}_w>2+=@jadL7(4y
z#b1Zbp`VPADB?+6d4_+|PVRo+k#0QiPsT~)ucpF^-~N%s&+_Cfjr9Hxzk4$Nw)lss
zmkZ@sGN!|sN4^W6LqL8q7E^(*12QhY4?GLJ27C+*reTtRg@9a?3CEd<Up}x7cmVhn
sa1{7=KrVY;4P*nQ!2j#Nzb3L0-REZu{lfJw?Z8eMa0{>$=sSM?C)~1m4*&oF

literal 0
HcmV?d00001

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
new file mode 100644
index 0000000000000000000000000000000000000000..f8d3509653ba8f80ca7f3aa7f95616142ba83a94
GIT binary patch
literal 65536
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

literal 0
HcmV?d00001


From 78d61e2deaed2a016b0b0f8ed908609123eaa88c Mon Sep 17 00:00:00 2001
From: "guy@guyr-air.rzn.co.il" <guy@guyr-air.rzn.co.il>
Date: Tue, 14 May 2013 00:13:46 +0300
Subject: [PATCH 1783/8469] Issue #376: preparing for release; CHANGES.tx t

--HG--
branch : distribute
extra : rebase_source : 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6053c70376..792f3e7ee3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.40
+------
+
+* Issue #376: brought back cli.exe and gui.exe that were deleted in the previous release;
+  
 ------
 0.6.39
 ------

From 788f2aa286e6efc430b2f581c6323a83275ac28f Mon Sep 17 00:00:00 2001
From: Guy Rozendorn <guy.rzn.co.il>
Date: Tue, 14 May 2013 11:12:46 +0300
Subject: [PATCH 1784/8469] Added tag 0.6.40 for changeset 0a783fa0dceb

--HG--
branch : distribute
extra : rebase_source : a9c82cebb8e9cb93674a7ff1ea4c08508c4ed114
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b433c91f43..621bdedd5c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -49,3 +49,4 @@ be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
 2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
 f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
 d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
+0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40

From 41a57f84efc8284964450615dca400bc17bbbb4e Mon Sep 17 00:00:00 2001
From: Guy Rozendorn <guy.rzn.co.il>
Date: Tue, 14 May 2013 11:15:38 +0300
Subject: [PATCH 1785/8469] Bumped to 0.6.41 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 235fe544e2119364d2f4270a6c5ca20db4645324
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 610c52ce33..cacf74e195 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.40.tar.gz
-    $ tar -xzvf distribute-0.6.40.tar.gz
-    $ cd distribute-0.6.40
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.41.tar.gz
+    $ tar -xzvf distribute-0.6.41.tar.gz
+    $ cd distribute-0.6.41
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index c098b9d269..7a2d2a2b2a 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.40"
+DEFAULT_VERSION = "0.6.41"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index ac332deb98..b645cce759 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.40'
+version = '0.6.41'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.40'
+release = '0.6.41'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 2dc51ae822..8a3af24fd3 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.40'
+VERSION = '0.6.41'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 9d15793cfd..314960896e 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.40"
+VERSION = "0.6.41"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From b867ca5a7faf5a60f7966837f393f667b51e2cee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 02:20:54 -0400
Subject: [PATCH 1786/8469] Capture the need to update cli.exe and gui.exe

--HG--
branch : distribute
extra : rebase_source : da0bcff89ef2ab6d49419e10b503e4987c875a3f
---
 msvc-build-launcher.cmd | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 07c474d4dd..e54c4f6c33 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -19,6 +19,12 @@ if "%ERRORLEVEL%"=="0" (
   echo Windows SDK 6.1 not found to build Windows 32-bit version
 )
 
+REM buildout (and possibly other implementations) currently depend on
+REM the 32-bit launcher scripts without the -32 in the filename, so copy them
+REM there for now.
+copy setuptools/cli-32.exe setuptools/cli.exe
+copy setuptools/gui-32.exe setuptools/gui.exe
+
 REM now for 64-bit
 REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
 call VCVARSx86_amd64

From b5d83f95a99b5e52d36fac68735e84ee73d364fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 02:44:52 -0400
Subject: [PATCH 1787/8469] Edit changelog.

--HG--
branch : distribute
extra : rebase_source : bf835a86ab7c996cd47bb196619a09b85fa01db9
---
 CHANGES.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 792f3e7ee3..2e0b747ceb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,9 @@ CHANGES
 0.6.40
 ------
 
-* Issue #376: brought back cli.exe and gui.exe that were deleted in the previous release;
-  
+* Issue #376: brought back cli.exe and gui.exe that were deleted in the
+  previous release.
+
 ------
 0.6.39
 ------

From 289b359721b9a717984c5200d7d5adbfccc8da20 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 02:47:41 -0400
Subject: [PATCH 1788/8469] Extract get_win_launcher function

--HG--
branch : distribute
extra : rebase_source : 14dbef22dbc8376cc3632ce53be0d61b7976b889
---
 CHANGES.txt                        |  7 +++++++
 setuptools/command/easy_install.py | 31 +++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2e0b747ceb..864edfba88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.41
+------
+
+* Added a new function ``easy_install.get_win_launcher`` which may be used by
+  third-party libraries such as buildout to get a suitable script launcher.
+
 ------
 0.6.40
 ------
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 10a8f27201..df6107d77d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1833,26 +1833,22 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
             if sys.platform=='win32' or wininst:
                 # On Windows/wininst, add a .py extension and an .exe launcher
                 if group=='gui_scripts':
-                    ext, launcher = '-script.pyw', 'gui.exe'
+                    launcher_type = 'gui'
+                    ext = '-script.pyw'
                     old = ['.pyw']
                     new_header = re.sub('(?i)python.exe','pythonw.exe',header)
                 else:
-                    ext, launcher = '-script.py', 'cli.exe'
+                    launcher_type = 'cli'
+                    ext = '-script.py'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if platform.machine().lower()=='arm':
-                    launcher = launcher.replace(".", "-arm.")
-                if is_64bit():
-                    launcher = launcher.replace(".", "-64.")
-                else:
-                    launcher = launcher.replace(".", "-32.")
                 if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
                     hdr = new_header
                 else:
                     hdr = header
                 yield (name+ext, hdr+script_text, 't', [name+x for x in old])
                 yield (
-                    name+'.exe', resource_string('setuptools', launcher),
+                    name+'.exe', get_win_launcher(launcher_type),
                     'b' # write in binary mode
                 )
                 if not is_64bit():
@@ -1868,6 +1864,23 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                 # just write the stub with no extension.
                 yield (name, header+script_text)
 
+def get_win_launcher(type):
+    """
+    Load the Windows launcher (executable) suitable for launching a script.
+
+    `type` should be either 'cli' or 'gui'
+
+    Returns the executable as a byte string.
+    """
+    launcher_fn = '%s.exe' % type
+    if platform.machine().lower()=='arm':
+        launcher_fn = launcher_fn.replace(".", "-arm.")
+    if is_64bit():
+        launcher_fn = launcher_fn.replace(".", "-64.")
+    else:
+        launcher_fn = launcher_fn.replace(".", "-32.")
+    return resource_string('setuptools', launcher_fn)
+
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
     if sys.version_info[0] < 3:

From 0b0d47d267599d19e5ac5ce442c7f9c92bd1177d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 22:52:40 -0400
Subject: [PATCH 1789/8469] Delint release script

--HG--
branch : distribute
---
 release.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release.py b/release.py
index 8a3af24fd3..ad4070a143 100644
--- a/release.py
+++ b/release.py
@@ -69,7 +69,7 @@ def add_milestone_and_version(version=NEXT_VERSION):
 	auth = 'Basic ' + ':'.join(get_mercurial_creds()).encode('base64').strip()
 	headers = {
 		'Authorization': auth,
-		}
+	}
 	base = 'https://api.bitbucket.org'
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
@@ -159,14 +159,14 @@ def build_docs():
 		return
 	if os.path.isdir('docs/build'):
 		shutil.rmtree('docs/build')
-	subprocess.check_call([
+	cmd = [
 		'sphinx-build',
 		'-b', 'html',
 		'-d', 'build/doctrees',
 		'.',
 		'build/html',
-		],
-		cwd='docs')
+	]
+	subprocess.check_call(cmd, cwd='docs')
 	return True
 
 def upload_bootstrap_script():

From c0a6a1347041a816d51331285a183fd8b8f69182 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 May 2013 22:54:11 -0400
Subject: [PATCH 1790/8469] Update reference to Travis CI using setuptools
 mirror

--HG--
branch : distribute
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index ad4070a143..e46cd31752 100644
--- a/release.py
+++ b/release.py
@@ -103,7 +103,7 @@ def do_release():
 		print("Please do that")
 		raise SystemExit(1)
 
-	print("Travis-CI tests: http://travis-ci.org/#!/jaraco/distribute")
+	print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
 	res = raw_input('Have you or has someone verified that the tests '
 		'pass on this revision? ')
 	if not res.lower().startswith('y'):

From 1f43ab9b03178a3eb3a00f509338dc1bd40808a1 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 2 Feb 2013 18:26:56 -0600
Subject: [PATCH 1791/8469] This changes distribute to use zipfile for
 obtaining a manifest of zip files instead of zipimpot._zip_directory_cache. 
 As I don't see any place that the cache is being clear, should in effect
 remove the zipimport private variable dependency

--HG--
branch : distribute
extra : rebase_source : 275dd3d5a2f55dba541f7f12a1bf8ee7c3465825
---
 pkg_resources.py | 48 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index f8de449e87..e1bf9ee0bc 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,7 +13,8 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, types
+import sys, os, zipimport, time, re, imp, types
+import zipfile
 from urlparse import urlparse, urlunparse
 
 try:
@@ -1348,7 +1349,33 @@ def __init__(self):
 
 empty_provider = EmptyProvider()
 
-
+def build_zipmanifest(path):
+    """
+    This builds a similar dictionary to the zipimport directory
+    caches.  However instead of tuples, ZipInfo objects are stored.
+
+    The translation of the tuple is as follows:
+      * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
+              on pypy it is the same (one reason why distribute did work
+              in some cases on pypy and win32).
+      * [1] - zipinfo.compress_type
+      * [2] - zipinfo.compress_size
+      * [3] - zipinfo.file_size
+      * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
+              len(ascii encoding of filename) otherwise
+      * [5] - (zipinfo.date_time[0] - 1980) << 9 | 
+               zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
+      * [6] - (zipinfo.date_time[3] - 1980) << 11 | 
+               zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
+      * [7] - zipinfo.CRC
+    """
+    zipinfo = dict()
+    with zipfile.ZipFile(path) as zfile:
+        for zitem in zfile.namelist():
+            zpath = zitem.replace('/', os.sep)
+            zipinfo[zpath] = zfile.getinfo(zitem)
+            assert zipinfo[zpath] is not None
+    return zipinfo
 
 
 class ZipProvider(EggProvider):
@@ -1358,7 +1385,7 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self,module)
-        self.zipinfo = zipimport._zip_directory_cache[self.loader.archive]
+        self.zipinfo = build_zipmanifest(self.load.archive)
         self.zip_pre = self.loader.archive+os.sep
 
     def _zipinfo_name(self, fspath):
@@ -1393,12 +1420,10 @@ def get_resource_filename(self, manager, resource_name):
         return self._extract_resource(manager, zip_path)
 
     @staticmethod
-    def _get_date_and_size(zip_stat):
-        t,d,size = zip_stat[5], zip_stat[6], zip_stat[3]
-        date_time = (
-            (d>>9)+1980, (d>>5)&0xF, d&0x1F,                      # ymd
-            (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1   # hms, etc.
-        )
+    def _get_date_and_size(zip_stat):
+        size = zip_stat.file_size
+        date_time = zip_stat.date_time + (0, 0, -1) #ymdhms+wday, yday, dst
+        #1980 offset already done
         timestamp = time.mktime(date_time)
         return timestamp, size
 
@@ -1411,7 +1436,7 @@ def _extract_resource(self, manager, zip_path):
                 )
             return os.path.dirname(last)  # return the extracted directory name
 
-        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
 
         if not WRITE_SUPPORT:
             raise IOError('"os.rename" and "os.unlink" are not supported '
@@ -1610,7 +1635,7 @@ class EggMetadata(ZipProvider):
     def __init__(self, importer):
         """Create a metadata provider from a zipimporter"""
 
-        self.zipinfo = zipimport._zip_directory_cache[importer.archive]
+        self.zipinfo = build_zipmanifest(importer.archive)
         self.zip_pre = importer.archive+os.sep
         self.loader = importer
         if importer.prefix:
@@ -2841,3 +2866,4 @@ def _initialize(g):
 add_activation_listener(lambda dist: dist.activate())
 working_set.entries=[]; map(working_set.add_entry,sys.path) # match order
 
+

From 4350a091eecb5af1dd461442c311d981550bedb5 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Mon, 4 Feb 2013 23:43:35 -0600
Subject: [PATCH 1792/8469] A few non-python 3 print statements

--HG--
branch : distribute
extra : rebase_source : 75f0b0e993a44ccfef8292717af58943e187d4cd
---
 setuptools/tests/win_script_wrapper.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 9ccc96f07a..82719273b4 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -21,11 +21,11 @@ Let's create a simple script, foo-script.py:
     ... """#!%(python_exe)s
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
 
@@ -54,7 +54,7 @@ the wrapper:
     ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
     >>> input.write('hello\nworld\n')
     >>> input.close()
-    >>> print output.read(),
+    >>> print(output.read(),)
     \foo-script.py
     ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
     'hello\nworld\n'
@@ -86,18 +86,18 @@ enter the interpreter after running the script, you could use -Oi:
     ... """#!%(python_exe)s  -Oi
     ... import sys
     ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
+    ... print(sys.argv[0][-14:])
+    ... print(sys.argv[1:])
+    ... print(input)
     ... if __debug__:
-    ...     print 'non-optimized'
+    ...     print('non-optimized')
     ... sys.ps1 = '---'
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
 
     >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
     >>> input.close()
-    >>> print output.read(),
+    >>> print(output.read(),)
     \foo-script.py
     []
     ''
@@ -136,10 +136,10 @@ Finally, we'll run the script and check the result:
     >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
     ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
     >>> input.close()
-    >>> print output.read()
+    >>> print(output.read())
     <BLANKLINE>
     >>> f = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
-    >>> print f.read()
+    >>> print(f.read())
     'Test Argument'
     >>> f.close()
 

From 0c10ea7a063c2d3f3c3c539c1d601fd8d95429dd Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Tue, 5 Feb 2013 09:55:53 -0600
Subject: [PATCH 1793/8469] minor cleanups

--HG--
branch : distribute
extra : rebase_source : a872a0ee0700a60994fea3417193998d9e9456a3
---
 pkg_resources.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index e1bf9ee0bc..144323cb67 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1349,6 +1349,7 @@ def __init__(self):
 
 empty_provider = EmptyProvider()
 
+
 def build_zipmanifest(path):
     """
     This builds a similar dictionary to the zipimport directory
@@ -1363,9 +1364,9 @@ def build_zipmanifest(path):
       * [3] - zipinfo.file_size
       * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
               len(ascii encoding of filename) otherwise
-      * [5] - (zipinfo.date_time[0] - 1980) << 9 | 
+      * [5] - (zipinfo.date_time[0] - 1980) << 9 |
                zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
-      * [6] - (zipinfo.date_time[3] - 1980) << 11 | 
+      * [6] - (zipinfo.date_time[3] - 1980) << 11 |
                zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
       * [7] - zipinfo.CRC
     """
@@ -1422,7 +1423,7 @@ def get_resource_filename(self, manager, resource_name):
     @staticmethod
     def _get_date_and_size(zip_stat):
         size = zip_stat.file_size
-        date_time = zip_stat.date_time + (0, 0, -1) #ymdhms+wday, yday, dst
+        date_time = zip_stat.date_time + (0, 0, -1) # ymdhms+wday, yday, dst
         #1980 offset already done
         timestamp = time.mktime(date_time)
         return timestamp, size

From 4e2823bc3f2f5505ee15fc72ebcc287e5061199d Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 10:46:33 -0600
Subject: [PATCH 1794/8469] Seems to be an issue with using ZipFile as a
 context on python 3.1

--HG--
branch : distribute
extra : rebase_source : d81c62a1c2efbeefc848979e07b16506213c0949
---
 pkg_resources.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 144323cb67..c29afb5631 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1371,11 +1371,15 @@ def build_zipmanifest(path):
       * [7] - zipinfo.CRC
     """
     zipinfo = dict()
-    with zipfile.ZipFile(path) as zfile:
+    zfile = zipfile.ZipFile(path)
+    #Got ZipFile has not __exit__ on python 3.1
+    try:
         for zitem in zfile.namelist():
             zpath = zitem.replace('/', os.sep)
             zipinfo[zpath] = zfile.getinfo(zitem)
             assert zipinfo[zpath] is not None
+    finally:
+        zfile.close()
     return zipinfo
 
 

From 6f6de308e3ade9a262308297f0a96af261c9dde5 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 11:34:11 -0600
Subject: [PATCH 1795/8469] Backout the pkg_resources.py fix

--HG--
branch : distribute
extra : rebase_source : d144d2afc763c9ed6420d32bad3015075d265226
---
 pkg_resources.py                        | 51 +++++--------------------
 setuptools/tests/win_script_wrapper.txt |  6 ++-
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index c29afb5631..fbae7b57b7 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,8 +13,7 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, types
-import zipfile
+import sys, os, zipimport, time, re, imp, types
 from urlparse import urlparse, urlunparse
 
 try:
@@ -1350,37 +1349,6 @@ def __init__(self):
 empty_provider = EmptyProvider()
 
 
-def build_zipmanifest(path):
-    """
-    This builds a similar dictionary to the zipimport directory
-    caches.  However instead of tuples, ZipInfo objects are stored.
-
-    The translation of the tuple is as follows:
-      * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
-              on pypy it is the same (one reason why distribute did work
-              in some cases on pypy and win32).
-      * [1] - zipinfo.compress_type
-      * [2] - zipinfo.compress_size
-      * [3] - zipinfo.file_size
-      * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
-              len(ascii encoding of filename) otherwise
-      * [5] - (zipinfo.date_time[0] - 1980) << 9 |
-               zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
-      * [6] - (zipinfo.date_time[3] - 1980) << 11 |
-               zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
-      * [7] - zipinfo.CRC
-    """
-    zipinfo = dict()
-    zfile = zipfile.ZipFile(path)
-    #Got ZipFile has not __exit__ on python 3.1
-    try:
-        for zitem in zfile.namelist():
-            zpath = zitem.replace('/', os.sep)
-            zipinfo[zpath] = zfile.getinfo(zitem)
-            assert zipinfo[zpath] is not None
-    finally:
-        zfile.close()
-    return zipinfo
 
 
 class ZipProvider(EggProvider):
@@ -1390,7 +1358,7 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self,module)
-        self.zipinfo = build_zipmanifest(self.load.archive)
+        self.zipinfo = zipimport._zip_directory_cache[self.loader.archive]
         self.zip_pre = self.loader.archive+os.sep
 
     def _zipinfo_name(self, fspath):
@@ -1425,10 +1393,12 @@ def get_resource_filename(self, manager, resource_name):
         return self._extract_resource(manager, zip_path)
 
     @staticmethod
-    def _get_date_and_size(zip_stat):
-        size = zip_stat.file_size
-        date_time = zip_stat.date_time + (0, 0, -1) # ymdhms+wday, yday, dst
-        #1980 offset already done
+    def _get_date_and_size(zip_stat):
+        t,d,size = zip_stat[5], zip_stat[6], zip_stat[3]
+        date_time = (
+            (d>>9)+1980, (d>>5)&0xF, d&0x1F,                      # ymd
+            (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1   # hms, etc.
+        )
         timestamp = time.mktime(date_time)
         return timestamp, size
 
@@ -1441,7 +1411,7 @@ def _extract_resource(self, manager, zip_path):
                 )
             return os.path.dirname(last)  # return the extracted directory name
 
-        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
 
         if not WRITE_SUPPORT:
             raise IOError('"os.rename" and "os.unlink" are not supported '
@@ -1640,7 +1610,7 @@ class EggMetadata(ZipProvider):
     def __init__(self, importer):
         """Create a metadata provider from a zipimporter"""
 
-        self.zipinfo = build_zipmanifest(importer.archive)
+        self.zipinfo = zipimport._zip_directory_cache[importer.archive]
         self.zip_pre = importer.archive+os.sep
         self.loader = importer
         if importer.prefix:
@@ -2871,4 +2841,3 @@ def _initialize(g):
 add_activation_listener(lambda dist: dist.activate())
 working_set.entries=[]; map(working_set.add_entry,sys.path) # match order
 
-
diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 82719273b4..3dc725c849 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -54,11 +54,12 @@ the wrapper:
     ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
     >>> input.write('hello\nworld\n')
     >>> input.close()
-    >>> print(output.read(),)
+    >>> print(output.read())
     \foo-script.py
     ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
     'hello\nworld\n'
     non-optimized
+    <BLANKLINE>
 
 This example was a little pathological in that it exercised windows
 (MS C runtime) quoting rules:
@@ -97,11 +98,12 @@ enter the interpreter after running the script, you could use -Oi:
 
     >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
     >>> input.close()
-    >>> print(output.read(),)
+    >>> print(output.read())
     \foo-script.py
     []
     ''
     ---
+    <BLANKLINE>
 
 Testing the GUI Version
 -----------------------

From e183ab7e708f7875f15f0a4651aaa85b6693882f Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 11:35:08 -0600
Subject: [PATCH 1796/8469] Reapply with unix file endings, to make a better
 diff

--HG--
branch : distribute
extra : rebase_source : 8fdc661ab1dd38af6d692df15ff65392860a60d1
---
 pkg_resources.py | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index fbae7b57b7..878c4ea117 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,7 +13,7 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, types
+import sys, os, time, re, imp, types, zipfile, zipimport
 from urlparse import urlparse, urlunparse
 
 try:
@@ -1349,6 +1349,37 @@ def __init__(self):
 empty_provider = EmptyProvider()
 
 
+def build_zipmanifest(path):
+    """
+    This builds a similar dictionary to the zipimport directory
+    caches.  However instead of tuples, ZipInfo objects are stored.
+
+    The translation of the tuple is as follows:
+      * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
+              on pypy it is the same (one reason why distribute did work
+              in some cases on pypy and win32).
+      * [1] - zipinfo.compress_type
+      * [2] - zipinfo.compress_size
+      * [3] - zipinfo.file_size
+      * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
+              len(ascii encoding of filename) otherwise
+      * [5] - (zipinfo.date_time[0] - 1980) << 9 |
+               zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
+      * [6] - (zipinfo.date_time[3] - 1980) << 11 |
+               zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
+      * [7] - zipinfo.CRC
+    """
+    zipinfo = dict()
+    zfile = zipfile.ZipFile(path)
+    #Got ZipFile has not __exit__ on python 3.1
+    try:
+        for zitem in zfile.namelist():
+            zpath = zitem.replace('/', os.sep)
+            zipinfo[zpath] = zfile.getinfo(zitem)
+            assert zipinfo[zpath] is not None
+    finally:
+        zfile.close()
+    return zipinfo
 
 
 class ZipProvider(EggProvider):
@@ -1358,7 +1389,7 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self,module)
-        self.zipinfo = zipimport._zip_directory_cache[self.loader.archive]
+        self.zipinfo = build_zipmanifest(self.load.archive)
         self.zip_pre = self.loader.archive+os.sep
 
     def _zipinfo_name(self, fspath):
@@ -1394,11 +1425,9 @@ def get_resource_filename(self, manager, resource_name):
 
     @staticmethod
     def _get_date_and_size(zip_stat):
-        t,d,size = zip_stat[5], zip_stat[6], zip_stat[3]
-        date_time = (
-            (d>>9)+1980, (d>>5)&0xF, d&0x1F,                      # ymd
-            (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1   # hms, etc.
-        )
+        size = zip_stat.file_size
+        date_time = zip_stat.date_time + (0, 0, -1)  # ymdhms+wday, yday, dst
+        #1980 offset already done
         timestamp = time.mktime(date_time)
         return timestamp, size
 
@@ -1610,7 +1639,7 @@ class EggMetadata(ZipProvider):
     def __init__(self, importer):
         """Create a metadata provider from a zipimporter"""
 
-        self.zipinfo = zipimport._zip_directory_cache[importer.archive]
+        self.zipinfo = build_zipmanifest(importer.archive)
         self.zip_pre = importer.archive+os.sep
         self.loader = importer
         if importer.prefix:
@@ -2841,3 +2870,4 @@ def _initialize(g):
 add_activation_listener(lambda dist: dist.activate())
 working_set.entries=[]; map(working_set.add_entry,sys.path) # match order
 
+

From 4bb7aab67a2ba4c890732d053a64737486b31b60 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 15:02:50 -0600
Subject: [PATCH 1797/8469] There were some failing tests on windows.  I assume
 this is a NTFS vs FAT or NT versus 9x things... Seemed odd.  In any case.  My
 filesystem is deifnitely NOT cp1252.

--HG--
branch : distribute
extra : rebase_source : c4d64aff6b811ba36bbf33cd4cf2a12f563a6880
---
 setuptools/tests/test_sdist.py | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a9d5d6e56c..7e6c837c6b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -337,10 +337,16 @@ def test_sdist_with_utf8_encoded_filename(self):
             filename = decompose(filename)
 
         if sys.version_info >= (3,):
-            if sys.platform == 'win32':
-                # Python 3 mangles the UTF-8 filename
-                filename = filename.decode('cp1252')
-                self.assertTrue(filename in cmd.filelist.files)
+            fs_enc = sys.getfilesystemencoding()
+
+            if sys.platform == 'win32': 
+                if fs_enc == 'cp1252':
+                    # Python 3 mangles the UTF-8 filename
+                    filename = filename.decode('cp1252')
+                    self.assertTrue(filename in cmd.filelist.files)
+                else:
+                    filename = filename.decode('mbcs')
+                    self.assertTrue(filename in cmd.filelist.files)
             else:
                 filename = filename.decode('utf-8')
                 self.assertTrue(filename in cmd.filelist.files)
@@ -357,6 +363,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         # Latin-1 filename
         filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
         open(filename, 'w').close()
+        self.assertTrue(os.path.isfile(filename))
 
         quiet()
         try:
@@ -365,16 +372,27 @@ def test_sdist_with_latin1_encoded_filename(self):
             unquiet()
 
         if sys.version_info >= (3,):
-            filename = filename.decode('latin-1')
+            fs_enc = sys.getfilesystemencoding()
+
+
+            #not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
-                # Latin-1 is similar to Windows-1252
+                # Latin-1 is similar to Windows-1252 however 
+                # on mbcs filesys it is not in latin-1 encoding
+                if fs_enc == 'mbcs':
+                    filename = filename.decode('mbcs')
+                else:
+                    filename = filename.decode('latin-1')
+                    
                 self.assertTrue(filename in cmd.filelist.files)
             else:
                 # The Latin-1 filename should have been skipped
+                filename = filename.decode('latin-1')
                 self.assertFalse(filename in cmd.filelist.files)
         else:
             # No conversion takes place under Python 2 and the file
             # is included. We shall keep it that way for BBB.
+            filename = filename.decode('latin-1')
             self.assertTrue(filename in cmd.filelist.files)
 
 

From 968ff8401b82ad8454191f564c903b137a8e8714 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 15:04:00 -0600
Subject: [PATCH 1798/8469] old win wrapper script not expecting return values
 from write() python 3 no longer has popen4 had some issue with ^M on end on
 line.

--HG--
branch : distribute
extra : rebase_source : 5b2c834e9a8dfd4027791cacef7c2bfe03652f31
---
 setuptools/tests/win_script_wrapper.txt | 61 +++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 3dc725c849..db1daf6bcc 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -17,7 +17,7 @@ Let's create a simple script, foo-script.py:
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... input = repr(sys.stdin.read())
@@ -37,7 +37,7 @@ We'll also copy cli.exe to the sample-directory with the name foo.exe:
 
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ...     pkg_resources.resource_string('setuptools', 'cli-32.exe')
     ...     )
     >>> f.close()
@@ -49,12 +49,32 @@ GUI programs, the suffix '-script-pyw' is added.)  This is why we
 named out script the way we did.  Now we can run out script by running
 the wrapper:
 
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))
-    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
-    >>> input.write('hello\nworld\n')
+    >>> from subprocess import Popen, PIPE, STDOUT
+    >>> try:
+    ...     unicode=unicode
+    ... except:
+    ...     unicode=str
+    >>> def popen4(cmd, *args):
+    ...     if hasattr(os, 'popen4'):
+    ...         input, output = os.popen4(cmd + " ".join(args))
+    ...         return input, output
+    ...     else:
+    ...         #emulate popen4 in python 3
+    ...         if cmd[0] == '"' and cmd[-1] != '"':
+    ...             cmd = cmd[1:]
+    ...         cmd += " ".join(args)
+    ...         p = Popen(cmd, shell=True, bufsize=0,
+    ...                               stdin=PIPE, stdout=PIPE, stderr=STDOUT)
+    ...         return p.stdin, p.stdout
+    
+    >>> input, output = popen4('"' + nt_quote_arg(os.path.join(sample_directory, 'foo.exe')), 
+    ...                        r' arg1', r'"arg 2"', r'"arg \"2\\\""', r'"arg 4\\"', r'"arg5 a\\b"')
+    >>> bytes_written = input.write('hello\nworld\n'.encode('utf-8'))
     >>> input.close()
-    >>> print(output.read())
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     \foo-script.py
     ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
     'hello\nworld\n'
@@ -83,7 +103,7 @@ options as usual. For example, to run in optimized mode and
 enter the interpreter after running the script, you could use -Oi:
 
     >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s  -Oi
     ... import sys
     ... input = repr(sys.stdin.read())
@@ -96,9 +116,12 @@ enter the interpreter after running the script, you could use -Oi:
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
 
-    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
+    >>> input, output = popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
     >>> input.close()
-    >>> print(output.read())
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     \foo-script.py
     []
     ''
@@ -114,11 +137,11 @@ Now let's test the GUI version with the simple scipt, bar-script.py:
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> f = open(os.path.join(sample_directory, 'bar-script.pyw'), 'w')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... f = open(sys.argv[1], 'wb')
-    ... f.write(repr(sys.argv[2]))
+    ... bytes_written = f.write(repr(sys.argv[2]).encode('utf-8'))
     ... f.close()
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
     >>> f.close()
@@ -127,21 +150,23 @@ We'll also copy gui.exe to the sample-directory with the name bar.exe:
 
     >>> import pkg_resources
     >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
-    >>> f.write(
+    >>> bytes_written = f.write(
     ...     pkg_resources.resource_string('setuptools', 'gui-32.exe')
     ...     )
     >>> f.close()
 
 Finally, we'll run the script and check the result:
 
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
-    ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
+    >>> input, output = popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe')),
+    ...               r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
     >>> input.close()
-    >>> print(output.read())
+    >>> # This is needed for line ending differences between py2 and py3 on win32
+    >>> msg = unicode(output.read(), encoding='utf-8').split("\n")
+    >>> for line in msg:
+    ...     print(line.strip()) 
     <BLANKLINE>
     >>> f = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
-    >>> print(f.read())
+    >>> print(unicode(f.read(), encoding='utf-8'))
     'Test Argument'
     >>> f.close()
 

From e9685aa408ac3d118890bd9944bd26260e519908 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 16 Feb 2013 15:22:46 -0600
Subject: [PATCH 1799/8469] don't decode in python 2.x.  that's my oops

--HG--
branch : distribute
extra : rebase_source : 4b981d54c6a171d7a6500c6c62838d8c368ae0b1
---
 setuptools/tests/test_sdist.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 7e6c837c6b..f51d45678f 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -372,13 +372,11 @@ def test_sdist_with_latin1_encoded_filename(self):
             unquiet()
 
         if sys.version_info >= (3,):
-            fs_enc = sys.getfilesystemencoding()
-
-
             #not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
                 # Latin-1 is similar to Windows-1252 however 
                 # on mbcs filesys it is not in latin-1 encoding
+                fs_enc = sys.getfilesystemencoding()
                 if fs_enc == 'mbcs':
                     filename = filename.decode('mbcs')
                 else:
@@ -392,7 +390,6 @@ def test_sdist_with_latin1_encoded_filename(self):
         else:
             # No conversion takes place under Python 2 and the file
             # is included. We shall keep it that way for BBB.
-            filename = filename.decode('latin-1')
             self.assertTrue(filename in cmd.filelist.files)
 
 

From c7444dbad6e996c53b3f73f0dba71b3b3a33f8bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 09:18:49 -0400
Subject: [PATCH 1800/8469] Correct reference to self.loader.

--HG--
branch : distribute
---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 878c4ea117..74acecd52f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1348,7 +1348,7 @@ def __init__(self):
 
 empty_provider = EmptyProvider()
 
-
+
 def build_zipmanifest(path):
     """
     This builds a similar dictionary to the zipimport directory
@@ -1389,7 +1389,7 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self,module)
-        self.zipinfo = build_zipmanifest(self.load.archive)
+        self.zipinfo = build_zipmanifest(self.loader.archive)
         self.zip_pre = self.loader.archive+os.sep
 
     def _zipinfo_name(self, fspath):

From e8a18a275aa500ae0b85eccb51ca4d154bfbe8dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 09:29:07 -0400
Subject: [PATCH 1801/8469] Update changelog and contributors

--HG--
branch : distribute
---
 CHANGES.txt      | 2 ++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 864edfba88..a0c2c3cddb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.41
 ------
 
+* Issue #27: Use public api for loading resources from zip files rather than
+  the private method `_zip_directory_cache`.
 * Added a new function ``easy_install.get_win_launcher`` which may be used by
   third-party libraries such as buildout to get a suitable script launcher.
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 487e0a44d7..e5e0ed511b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -21,6 +21,7 @@ Contributors
 * Noufal Ibrahim
 * Pete Hollobon
 * Philip Jenvey
+* Philip Thiem
 * Reinout van Rees
 * Robert Myers
 * Stefan H. Holek

From 565a2093c5d608218c90852488e37dfeeaa9641b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 09:58:04 -0400
Subject: [PATCH 1802/8469] Added tag 0.6.41 for changeset ad107e9b4bee

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 621bdedd5c..78cdfc1411 100644
--- a/.hgtags
+++ b/.hgtags
@@ -50,3 +50,4 @@ be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
 f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
 d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
+ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41

From cf2a28328628a15a95ec354f8c3a4421d3652e31 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 09:59:08 -0400
Subject: [PATCH 1803/8469] Bumped to 0.6.42 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index cacf74e195..9ab453564e 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.41.tar.gz
-    $ tar -xzvf distribute-0.6.41.tar.gz
-    $ cd distribute-0.6.41
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.42.tar.gz
+    $ tar -xzvf distribute-0.6.42.tar.gz
+    $ cd distribute-0.6.42
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 7a2d2a2b2a..53345bbd80 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.41"
+DEFAULT_VERSION = "0.6.42"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index b645cce759..bd9028b685 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.41'
+version = '0.6.42'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.41'
+release = '0.6.42'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index e46cd31752..b657d990eb 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.41'
+VERSION = '0.6.42'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 314960896e..8f350c4ea2 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.41"
+VERSION = "0.6.42"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From e3207bd63bcf365a1f91b7c3e75a4b3354435501 Mon Sep 17 00:00:00 2001
From: Dirley Rodrigues <dirleyrls@gmail.com>
Date: Mon, 4 Feb 2013 11:30:58 -0200
Subject: [PATCH 1804/8469] Improve external links finder to not yield
 duplicate links.

--HG--
branch : distribute
extra : rebase_source : 78e932fca32ee0ee1f50794cf998f4e7db78131b
---
 CHANGES.txt                 |  7 +++++++
 setuptools/package_index.py | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a0c2c3cddb..dadd0c7777 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.42
+------
+
+* External links finder no longer yields duplicate links.
+
 ------
 0.6.41
 ------
@@ -61,6 +67,7 @@ CHANGES
 0.6.35
 ------
 
+
 Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
 how it parses version numbers.
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0ee21e3b7b..4393c83a02 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -139,20 +139,26 @@ def interpret_distro_name(location, basename, metadata,
 
 def find_external_links(url, page):
     """Find rel="homepage" and rel="download" links in `page`, yielding URLs"""
+    seen = set()
 
     for match in REL.finditer(page):
         tag, rel = match.groups()
         rels = map(str.strip, rel.lower().split(','))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                url = urlparse.urljoin(url, htmldecode(match.group(1)))
+                if not url in seen:
+                    yield url
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                yield urlparse.urljoin(url, htmldecode(match.group(1)))
+                url = urlparse.urljoin(url, htmldecode(match.group(1)))
+                if not url in seen:
+                    yield url
+
 
 user_agent = "Python-urllib/%s distribute/%s" % (
     sys.version[:3], require('distribute')[0].version

From 116420fe62842f18f2d37de46c2177028231755a Mon Sep 17 00:00:00 2001
From: Dirley Rodrigues <dirleyrls@gmail.com>
Date: Mon, 4 Feb 2013 11:39:28 -0200
Subject: [PATCH 1805/8469] avoid naming problems

--HG--
branch : distribute
extra : rebase_source : 29eeb99013055b8d27cad7f7e8898d06a865b188
---
 setuptools/package_index.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4393c83a02..984feef4d2 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -139,25 +139,25 @@ def interpret_distro_name(location, basename, metadata,
 
 def find_external_links(url, page):
     """Find rel="homepage" and rel="download" links in `page`, yielding URLs"""
-    seen = set()
+    seen_links = set()
 
     for match in REL.finditer(page):
         tag, rel = match.groups()
         rels = map(str.strip, rel.lower().split(','))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                url = urlparse.urljoin(url, htmldecode(match.group(1)))
-                if not url in seen:
-                    yield url
+                link = urlparse.urljoin(url, htmldecode(match.group(1)))
+                if not link in seen_links:
+                    yield link
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                url = urlparse.urljoin(url, htmldecode(match.group(1)))
-                if not url in seen:
-                    yield url
+                link = urlparse.urljoin(url, htmldecode(match.group(1)))
+                if not link in seen_links:
+                    yield link
 
 
 user_agent = "Python-urllib/%s distribute/%s" % (

From d7ba7ce3c4ce2427d78cb2393bd062aa3a8496b4 Mon Sep 17 00:00:00 2001
From: Dirley Rodrigues <dirleyrls@gmail.com>
Date: Mon, 4 Feb 2013 11:54:53 -0200
Subject: [PATCH 1806/8469] actually filter the links

--HG--
branch : distribute
extra : rebase_source : cb6e3497e1f8594181f10110cbc833bd6c81f89e
---
 setuptools/package_index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 984feef4d2..8974a64790 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -148,6 +148,7 @@ def find_external_links(url, page):
             for match in HREF.finditer(tag):
                 link = urlparse.urljoin(url, htmldecode(match.group(1)))
                 if not link in seen_links:
+                    seen_links.add(link)
                     yield link
 
     for tag in ("<th>Home Page", "<th>Download URL"):
@@ -157,6 +158,7 @@ def find_external_links(url, page):
             if match:
                 link = urlparse.urljoin(url, htmldecode(match.group(1)))
                 if not link in seen_links:
+                    seen_links.add(link)
                     yield link
 
 

From 4a45583a15586a574c857826c3807d9123ef4418 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 10:27:13 -0400
Subject: [PATCH 1807/8469] Added Dirley to contributors

--HG--
branch : distribute
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e5e0ed511b..d6aa151d91 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -8,6 +8,7 @@ Contributors
 * Christophe Combelles
 * Daniel Stutzbach
 * Daniel Holth
+* Dirley Rodrigues
 * Grigory Petrov
 * Hanno Schlichting
 * Jannis Leidel

From b8327d7f646141415beb30acd39ce8840ebc708b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 10:36:51 -0400
Subject: [PATCH 1808/8469] Add unique_everseen from Python 2.7 docs

--HG--
branch : distribute
---
 setuptools/package_index.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8974a64790..e542f58677 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib, urllib2, shutil, random, socket, cStringIO
+import itertools
 import base64
 import httplib
 from pkg_resources import *
@@ -134,6 +135,24 @@ def interpret_distro_name(location, basename, metadata,
             platform = platform
         )
 
+# From Python 2.7 docs
+def unique_everseen(iterable, key=None):
+    "List unique elements, preserving order. Remember all elements ever seen."
+    # unique_everseen('AAAABBBCCDAABBB') --> A B C D
+    # unique_everseen('ABBCcAD', str.lower) --> A B C D
+    seen = set()
+    seen_add = seen.add
+    if key is None:
+        for element in itertools.ifilterfalse(seen.__contains__, iterable):
+            seen_add(element)
+            yield element
+    else:
+        for element in iterable:
+            k = key(element)
+            if k not in seen:
+                seen_add(k)
+                yield element
+
 REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
 # this line is here to fix emacs' cruddy broken syntax highlighting
 

From 3b9a57a0c80ee11995fbe937e7dbeca3d83ec10a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 11:02:05 -0400
Subject: [PATCH 1809/8469] Use a wrapper to ensure unique values on
 find_external_links. Factors out uniqueness test into a re-usable decorator
 and simplifies the body of find_external_links.

--HG--
branch : distribute
---
 setuptools/package_index.py | 24 +++++++++++++++---------
 setuptools/py24compat.py    | 11 +++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 setuptools/py24compat.py

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e542f58677..0a3f9e05dc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -12,6 +12,8 @@
     from md5 import md5
 from fnmatch import translate
 
+from .py24compat import wraps
+
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
@@ -153,32 +155,36 @@ def unique_everseen(iterable, key=None):
                 seen_add(k)
                 yield element
 
+def unique_values(func):
+    """
+    Wrap a function returning an iterable such that the resulting iterable
+    only ever yields unique items.
+    """
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        return unique_everseen(func(*args, **kwargs))
+    return wrapper
+
 REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
 # this line is here to fix emacs' cruddy broken syntax highlighting
 
+@unique_values
 def find_external_links(url, page):
     """Find rel="homepage" and rel="download" links in `page`, yielding URLs"""
-    seen_links = set()
 
     for match in REL.finditer(page):
         tag, rel = match.groups()
         rels = map(str.strip, rel.lower().split(','))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                link = urlparse.urljoin(url, htmldecode(match.group(1)))
-                if not link in seen_links:
-                    seen_links.add(link)
-                    yield link
+                yield urlparse.urljoin(url, htmldecode(match.group(1)))
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                link = urlparse.urljoin(url, htmldecode(match.group(1)))
-                if not link in seen_links:
-                    seen_links.add(link)
-                    yield link
+                yield urlparse.urljoin(url, htmldecode(match.group(1)))
 
 
 user_agent = "Python-urllib/%s distribute/%s" % (
diff --git a/setuptools/py24compat.py b/setuptools/py24compat.py
new file mode 100644
index 0000000000..c5d7d2045d
--- /dev/null
+++ b/setuptools/py24compat.py
@@ -0,0 +1,11 @@
+"""
+Forward-compatibility support for Python 2.4 and earlier
+"""
+
+# from jaraco.compat 1.2
+try:
+    from functools import wraps
+except ImportError:
+    def wraps(func):
+        "Just return the function unwrapped"
+        return lambda x: x

From 8c89c9438e9e461acc7587b60c79fb94b4d1f06d Mon Sep 17 00:00:00 2001
From: PJ Eby <distutils-sig@python.org>
Date: Fri, 14 Apr 2006 19:38:38 +0000
Subject: [PATCH 1810/8469] First round of prepping setuptools for inclusion in
 Python 2.5: move site.py to setuptools/site-patch.py; reinstate 'python -m
 easy_install' support; use distutils' "upload" command when running under
 2.5.

--HG--
branch : distribute
extra : source : fbb6c89a74aa47a556a936202d2e50051b067940
extra : histedit_source : 778122fc56bcca6f5a1dbd5a475df11d29028730
---
 setup.py                            | 10 +++-------
 setuptools/command/easy_install.py  |  2 +-
 site.py => setuptools/site-patch.py |  0
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename site.py => setuptools/site-patch.py (100%)
 mode change 100755 => 100644

diff --git a/setup.py b/setup.py
index 8f350c4ea2..a9b7bb0f8f 100755
--- a/setup.py
+++ b/setup.py
@@ -158,20 +158,18 @@ def _being_installed():
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
-    package_data = {'setuptools':['*.exe'], 'setuptools.command':['*.xml']},
+    package_data = {'setuptools':['*.exe', 'site-patch.py'], 'setuptools.command':['*.xml']},
 
-    py_modules = ['pkg_resources', 'easy_install', 'site'],
+    py_modules = ['pkg_resources', 'easy_install'],
 
     zip_safe = (sys.version>="2.5"),   # <2.5 needs unzipped for -m to work
 
     cmdclass = {'test': test},
     entry_points = {
-
         "distutils.commands" : [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
             for cmd in SETUP_COMMANDS
         ],
-
         "distutils.setup_keywords": [
             "eager_resources        = setuptools.dist:assert_string_list",
             "namespace_packages     = setuptools.dist:check_nsp",
@@ -192,7 +190,6 @@ def _being_installed():
             "use_2to3_fixers        = setuptools.dist:assert_string_list",
             "use_2to3_exclude_fixers = setuptools.dist:assert_string_list",
         ],
-
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
@@ -203,7 +200,6 @@ def _being_installed():
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
-
         "console_scripts": console_scripts,
 
         "setuptools.file_finders":
@@ -211,7 +207,7 @@ def _being_installed():
 
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
-        },
+    },
 
 
     classifiers = textwrap.dedent("""
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index df6107d77d..77b0bc3176 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1277,7 +1277,7 @@ def install_site_py(self):
             return  # already did it, or don't need to
 
         sitepy = os.path.join(self.install_dir, "site.py")
-        source = resource_string(Requirement.parse("distribute"), "site.py")
+        source = resource_string("setuptools", "site-patch.py")
         current = ""
 
         if os.path.exists(sitepy):
diff --git a/site.py b/setuptools/site-patch.py
old mode 100755
new mode 100644
similarity index 100%
rename from site.py
rename to setuptools/site-patch.py

From ea42db5cb8c6b047ed510fb937a4110b102b92ea Mon Sep 17 00:00:00 2001
From: Armin Rigo <arigo@tunes.org>
Date: Mon, 17 Apr 2006 09:22:35 +0000
Subject: [PATCH 1811/8469] Fix for a bug exposed by r45232:

    /path/to/uninstalled/python setup.py build_ext

now failed with pyconfig.h not found.  Prior to r45232
the above command did not look for pyconfig.h, but the
bug is really in the look-up code: expecting to find it
in os.curdir is a rather fragile idea.
---
 sysconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index eafd49e7af..8d66cc2e7e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -31,7 +31,7 @@
 
 python_build = os.path.isfile(landmark)
 
-del argv0_path, landmark
+del landmark
 
 
 def get_python_version():
@@ -185,7 +185,7 @@ def customize_compiler(compiler):
 def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build:
-        inc_dir = os.curdir
+        inc_dir = argv0_path
     else:
         inc_dir = get_python_inc(plat_specific=1)
     if get_python_version() < '2.2':

From 8e8c8486409ae4fe7a424a541307265b07d82753 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 17 Apr 2006 14:43:30 +0000
Subject: [PATCH 1812/8469] disutils checks if MACOSX_DEPLOYMENT_TARGET is
 consistent with the value at configure time. The current check is too strict
 and doesn't allow building extensions that can only run on newer versions of
 the OS than the version python was build for, that is python build for 10.3
 or later and an extension for 10.4. This patch relaxes this check.

This turned out to be a reimplementation of patch 1193190.
---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8d66cc2e7e..72aa511700 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -372,7 +372,7 @@ def _init_posix():
         if cur_target == '':
             cur_target = cfg_target
             os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
-        if cfg_target != cur_target:
+        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
             raise DistutilsPlatformError(my_msg)

From c4c2a4987d1138c0ae217701f994abf29cdd7148 Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Fri, 21 Apr 2006 10:40:58 +0000
Subject: [PATCH 1813/8469] Merge p3yk branch with the trunk up to revision
 45595. This breaks a fair number of tests, all because of the
 codecs/_multibytecodecs issue described here (it's not a Py3K issue, just
 something Py3K discovers):
 http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
---
 command/build_ext.py        | 13 ++++++-
 command/install.py          |  1 +
 command/install_egg_info.py | 75 +++++++++++++++++++++++++++++++++++++
 command/upload.py           | 11 +++++-
 log.py                      |  7 +++-
 sysconfig.py                | 21 ++++++++---
 6 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 command/install_egg_info.py

diff --git a/command/build_ext.py b/command/build_ext.py
index 6ea5d57998..5771252123 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -185,7 +185,9 @@ def finalize_options (self):
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
+               (sys.platform.startswith('linux') and
+                sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -688,6 +690,13 @@ def get_libraries (self, ext):
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib, "m"] + extra
         else:
-            return ext.libraries
+            from distutils import sysconfig
+            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+                template = "python%d.%d"
+                pythonlib = (template %
+                             (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+                return ext.libraries + [pythonlib]
+            else:
+                return ext.libraries
 
 # class build_ext
diff --git a/command/install.py b/command/install.py
index 7723761117..453151d08b 100644
--- a/command/install.py
+++ b/command/install.py
@@ -601,6 +601,7 @@ def has_data (self):
                     ('install_headers', has_headers),
                     ('install_scripts', has_scripts),
                     ('install_data',    has_data),
+                    ('install_egg_info', lambda self:True),
                    ]
 
 # class install
diff --git a/command/install_egg_info.py b/command/install_egg_info.py
new file mode 100644
index 0000000000..c31ac29668
--- /dev/null
+++ b/command/install_egg_info.py
@@ -0,0 +1,75 @@
+"""distutils.command.install_egg_info
+
+Implements the Distutils 'install_egg_info' command, for installing
+a package's PKG-INFO metadata."""
+
+
+from distutils.cmd import Command
+from distutils import log, dir_util
+import os, sys, re
+
+class install_egg_info(Command):
+    """Install an .egg-info file for the package"""
+
+    description = "Install package's PKG-INFO metadata as an .egg-info file"
+    user_options = [
+        ('install-dir=', 'd', "directory to install to"),
+    ]
+
+    def initialize_options(self):
+        self.install_dir = None
+
+    def finalize_options(self):
+        self.set_undefined_options('install_lib',('install_dir','install_dir'))
+        basename = "%s-%s-py%s.egg-info" % (
+            to_filename(safe_name(self.distribution.get_name())),
+            to_filename(safe_version(self.distribution.get_version())),
+            sys.version[:3]
+        )
+        self.target = os.path.join(self.install_dir, basename)
+        self.outputs = [self.target]
+
+    def run(self):
+        target = self.target
+        if os.path.isdir(target) and not os.path.islink(target):
+            dir_util.remove_tree(target, dry_run=self.dry_run)
+        elif os.path.exists(target):
+            self.execute(os.unlink,(self.target,),"Removing "+target)
+        log.info("Writing %s", target)
+        if not self.dry_run:
+            f = open(target, 'w')
+            self.distribution.metadata.write_pkg_file(f)
+            f.close()
+
+    def get_outputs(self):
+        return self.outputs
+
+
+# The following routines are taken from setuptools' pkg_resources module and
+# can be replaced by importing them from pkg_resources once it is included
+# in the stdlib.
+
+def safe_name(name):
+    """Convert an arbitrary string to a standard distribution name
+
+    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '-', name)
+
+
+def safe_version(version):
+    """Convert an arbitrary string to a standard version string
+
+    Spaces become dots, and all other non-alphanumeric characters become
+    dashes, with runs of multiple dashes condensed to a single dash.
+    """
+    version = version.replace(' ','.')
+    return re.sub('[^A-Za-z0-9.]+', '-', version)
+
+
+def to_filename(name):
+    """Convert a project or version name to its filename-escaped form
+
+    Any '-' characters are currently replaced with '_'.
+    """
+    return name.replace('-','_')
diff --git a/command/upload.py b/command/upload.py
index 62767a348e..6f4ce81f79 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -29,6 +29,7 @@ class upload(Command):
          'display full response text from server'),
         ('sign', 's',
          'sign files to upload using gpg'),
+        ('identity=', 'i', 'GPG identity used to sign files'),
         ]
     boolean_options = ['show-response', 'sign']
 
@@ -38,8 +39,13 @@ def initialize_options(self):
         self.repository = ''
         self.show_response = 0
         self.sign = False
+        self.identity = None
 
     def finalize_options(self):
+        if self.identity and not self.sign:
+            raise DistutilsOptionError(
+                "Must use --sign for --identity to have meaning"
+            )
         if os.environ.has_key('HOME'):
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
@@ -67,7 +73,10 @@ def run(self):
     def upload_file(self, command, pyversion, filename):
         # Sign if requested
         if self.sign:
-            spawn(("gpg", "--detach-sign", "-a", filename),
+            gpg_args = ["gpg", "--detach-sign", "-a", filename]
+            if self.identity:
+                gpg_args[2:2] = ["--local-user", self.identity]
+            spawn(gpg_args,
                   dry_run=self.dry_run)
 
         # Fill in the data - send all the meta-data in case we need to
diff --git a/log.py b/log.py
index cf3ee136e0..95d4c1c5a2 100644
--- a/log.py
+++ b/log.py
@@ -20,7 +20,12 @@ def __init__(self, threshold=WARN):
 
     def _log(self, level, msg, args):
         if level >= self.threshold:
-            print msg % args
+            if not args:
+                # msg may contain a '%'. If args is empty,
+                # don't even try to string-format
+                print msg
+            else:
+                print msg % args
             sys.stdout.flush()
 
     def log(self, level, msg, *args):
diff --git a/sysconfig.py b/sysconfig.py
index dc603be8b7..49536f0d3f 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -31,7 +31,7 @@
 
 python_build = os.path.isfile(landmark)
 
-del argv0_path, landmark
+del landmark
 
 
 def get_python_version():
@@ -185,7 +185,7 @@ def customize_compiler(compiler):
 def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build:
-        inc_dir = os.curdir
+        inc_dir = argv0_path
     else:
         inc_dir = get_python_inc(plat_specific=1)
     if get_python_version() < '2.2':
@@ -213,8 +213,8 @@ def parse_config_h(fp, g=None):
     """
     if g is None:
         g = {}
-    define_rx = re.compile("#define ([A-Z][A-Z0-9_]+) (.*)\n")
-    undef_rx = re.compile("/[*] #undef ([A-Z][A-Z0-9_]+) [*]/\n")
+    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
+    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
     #
     while 1:
         line = fp.readline()
@@ -351,6 +351,17 @@ def _init_posix():
 
         raise DistutilsPlatformError(my_msg)
 
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(file(filename), g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
     # On MacOSX we need to check the setting of the environment variable
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
@@ -361,7 +372,7 @@ def _init_posix():
         if cur_target == '':
             cur_target = cfg_target
             os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
-        if cfg_target != cur_target:
+        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
             raise DistutilsPlatformError(my_msg)

From aca28c3c53d3a26bed0130d101ca283bd517f2b9 Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@activestate.com>
Date: Tue, 25 Apr 2006 00:34:50 +0000
Subject: [PATCH 1814/8469] Put break at correct level so *all* root HKEYs
 acutally get checked for an installed VC6. Otherwise only the first such tree
 gets checked and this warning doesn't get displayed.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index f88f36526c..d24d0ac6e0 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -618,7 +618,7 @@ def get_msvc_paths(self, path, platform='x86'):
                         "but the expected registry settings are not present.\n"
                         "You must at least run the Visual Studio GUI once "
                         "so that these entries are created.")
-                break
+                    break
         return []
 
     def set_path_env_var(self, name):

From a3c755c1adfd523cfd16d54e90c9ef1bb50f9915 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 28 Apr 2006 16:58:52 +0000
Subject: [PATCH 1815/8469] Bug #1478326: don't allow '/' in
 distutils.util.get_platform machine names since this value is used to name
 the build directory.

---
 util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util.py b/util.py
index 387e9bdc93..061092b673 100644
--- a/util.py
+++ b/util.py
@@ -45,6 +45,7 @@ def get_platform ():
     osname = string.lower(osname)
     osname = string.replace(osname, '/', '')
     machine = string.replace(machine, ' ', '_')
+    machine = string.replace(machine, '/', '-')
 
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --

From 9115c7ba3b080c10b08610e08a1e3bcec03352e7 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sat, 29 Apr 2006 11:31:35 +0000
Subject: [PATCH 1816/8469] Patch 1471883: --enable-universalsdk on Mac OS X

---
 sysconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 72aa511700..2a18d2beb0 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -366,8 +366,8 @@ def _init_posix():
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
     # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
-        cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
+    if sys.platform == 'darwin' and g.has_key('MACOSX_DEPLOYMENT_TARGET'):
+        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
             cur_target = cfg_target

From 91bcdf7042985faabfa0efe6fb435a7d55dca67d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 30 Apr 2006 08:57:35 +0000
Subject: [PATCH 1817/8469] In stdlib, use hashlib instead of deprecated md5
 and sha modules.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 6f4ce81f79..4a9ed398a0 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 from distutils.core import Command
 from distutils.spawn import spawn
 from distutils import log
-from md5 import md5
+from hashlib import md5
 import os
 import socket
 import platform

From e22f2ec8532760515e2f60c974283a7b9a841fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 1 May 2006 16:14:16 +0000
Subject: [PATCH 1818/8469] Rename parameters to match the documentation (which
 in turn matches Microsoft's documentation). Drop unused parameter in
 CAB.append.

---
 command/bdist_msi.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f05d66cb5d..75db8773f1 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005 Martin v. Löwis
+# Copyright (C) 2005, 2006 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst
@@ -16,7 +16,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils import log
 import msilib
-from msilib import schema, sequence, uisample
+from msilib import schema, sequence, text
 from msilib import Directory, Feature, Dialog, add_data
 
 class PyDialog(Dialog):
@@ -374,8 +374,8 @@ def add_ui(self):
                   ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
                   ("ProgressDlg", None, 1280)])
 
-        add_data(db, 'ActionText', uisample.ActionText)
-        add_data(db, 'UIText', uisample.UIText)
+        add_data(db, 'ActionText', text.ActionText)
+        add_data(db, 'UIText', text.UIText)
         #####################################################################
         # Standard dialogs: FatalError, UserExit, ExitDialog
         fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
@@ -502,9 +502,9 @@ def add_ui(self):
 
         seldlg.back("< Back", None, active=0)
         c = seldlg.next("Next >", "Cancel")
-        c.event("SetTargetPath", "TARGETDIR", order=1)
-        c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2)
-        c.event("EndDialog", "Return", order=3)
+        c.event("SetTargetPath", "TARGETDIR", ordering=1)
+        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
+        c.event("EndDialog", "Return", ordering=3)
 
         c = seldlg.cancel("Cancel", "DirectoryCombo")
         c.event("SpawnDialog", "CancelDlg")
@@ -561,7 +561,7 @@ def add_ui(self):
 
         c = whichusers.next("Next >", "Cancel")
         c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
-        c.event("EndDialog", "Return", order = 2)
+        c.event("EndDialog", "Return", ordering = 2)
 
         c = whichusers.cancel("Cancel", "AdminInstall")
         c.event("SpawnDialog", "CancelDlg")

From eef192824d14409f513b9f2acb842aa6ed2b8f5c Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 23 May 2006 11:47:16 +0000
Subject: [PATCH 1819/8469] Disable linking extensions with -lpython2.5 for
 darwin. This should fix bug #1487105.

---
 command/build_ext.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index fbb74768ba..00f8a6b9ae 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -689,6 +689,11 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib, "m"] + extra
+
+        elif sys.platform == 'darwin':
+            # Don't use the default code below
+            return ext.libraries
+
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):

From 0856fd358badca3ac456fd79ba1442dfce7118f6 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 23 May 2006 12:01:11 +0000
Subject: [PATCH 1820/8469] Patch #1488098.

This patchs makes it possible to create a universal build on OSX 10.4 and use
the result to build extensions on 10.3. It also makes it possible to override
the '-arch' and '-isysroot' compiler arguments for specific extensions.
---
 sysconfig.py     | 15 ++++++++++++
 unixccompiler.py | 64 ++++++++++++++++++++++++++++++++++++++++++++++--
 util.py          | 48 ++++++++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2a18d2beb0..2ba3c4db5d 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -500,6 +500,21 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        if sys.platform == 'darwin':
+            kernel_version = os.uname()[2] # Kernel version (8.4.3)
+            major_version = int(kernel_version.split('.')[0])
+
+            if major_version < 8:
+                # On Mac OS X before 10.4, check if -arch and -isysroot
+                # are in CFLAGS or LDFLAGS and remove them if they are.
+                # This is needed when building extensions on a 10.3 system
+                # using a universal build of python.
+                for key in ('LDFLAGS', 'BASECFLAGS'):
+                    flags = _config_vars[key]
+                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                    flags = re.sub('-isysroot [^ \t]* ', ' ', flags)
+                    _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 56998c3507..e612cfc2ec 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -42,6 +42,48 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
+def _darwin_compiler_fixup(compiler_so, cc_args):
+    """
+    This function will strip '-isysroot PATH' and '-arch ARCH' from the
+    compile flags if the user has specified one them in extra_compile_flags.
+
+    This is needed because '-arch ARCH' adds another architecture to the
+    build, without a way to remove an architecture. Furthermore GCC will
+    barf if multiple '-isysroot' arguments are present.
+    """
+    stripArch = stripSysroot = 0
+
+    compiler_so = list(compiler_so)
+    kernel_version = os.uname()[2] # 8.4.3
+    major_version = int(kernel_version.split('.')[0])
+
+    if major_version < 8:
+        # OSX before 10.4.0, these don't support -arch and -isysroot at
+        # all.
+        stripArch = stripSysroot = True
+    else:
+        stripArch = '-arch' in cc_args
+        stripSysroot = '-isysroot' in cc_args
+
+    if stripArch:
+        while 1:
+            try:
+                index = compiler_so.index('-arch')
+                # Strip this argument and the next one:
+                del compiler_so[index:index+2]
+            except ValueError:
+                break
+
+    if stripSysroot:
+        try:
+            index = compiler_so.index('-isysroot')
+            # Strip this argument and the next one:
+            del compiler_so[index:index+1]
+        except ValueError:
+            pass
+
+    return compiler_so
+
 class UnixCCompiler(CCompiler):
 
     compiler_type = 'unix'
@@ -108,8 +150,11 @@ def preprocess(self, source,
                 raise CompileError, msg
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        compiler_so = self.compiler_so
+        if sys.platform == 'darwin':
+            compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
         try:
-            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg
@@ -172,7 +217,22 @@ def link(self, target_desc, objects,
                 else:
                     linker = self.linker_so[:]
                 if target_lang == "c++" and self.compiler_cxx:
-                    linker[0] = self.compiler_cxx[0]
+                    # skip over environment variable settings if /usr/bin/env
+                    # is used to set up the linker's environment.
+                    # This is needed on OSX. Note: this assumes that the
+                    # normal and C++ compiler have the same environment 
+                    # settings.
+                    i = 0
+                    if os.path.basename(linker[0]) == "env":
+                        i = 1
+                        while '=' in linker[i]:
+                            i = i + 1
+
+                    linker[i] = self.compiler_cxx[i]
+
+                if sys.platform == 'darwin':
+                    linker = _darwin_compiler_fixup(linker, ld_args)
+
                 self.spawn(linker + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
diff --git a/util.py b/util.py
index 061092b673..623c41e280 100644
--- a/util.py
+++ b/util.py
@@ -67,6 +67,54 @@ def get_platform ():
         m = rel_re.match(release)
         if m:
             release = m.group()
+    elif osname[:6] == "darwin":
+        #
+        # For our purposes, we'll assume that the system version from 
+        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set 
+        # to. This makes the compatibility story a bit more sane because the
+        # machine is going to compile and link as if it were 
+        # MACOSX_DEPLOYMENT_TARGET.
+        from distutils.sysconfig import get_config_vars
+        cfgvars = get_config_vars()
+
+        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
+        if not macver:
+            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+
+        if not macver:
+            # Get the system version. Reading this plist is a documented
+            # way to get the system version (see the documentation for
+            # the Gestalt Manager)
+            try:
+                f = open('/System/Library/CoreServices/SystemVersion.plist')
+            except IOError:
+                # We're on a plain darwin box, fall back to the default
+                # behaviour.
+                pass
+            else:
+                m = re.search(
+                        r'<key>ProductUserVisibleVersion</key>\s*' +
+                        r'<string>(.*?)</string>', f.read())
+                f.close()
+                if m is not None:
+                     macver = '.'.join(m.group(1).split('.')[:2])
+                # else: fall back to the default behaviour
+
+        if macver:
+            from distutils.sysconfig import get_config_vars
+            release = macver
+            osname = "macosx"
+
+
+            if (release + '.') < '10.4.' and \
+                    get_config_vars().get('UNIVERSALSDK', '').strip():
+                # The universal build will build fat binaries, but not on
+                # systems before 10.4
+                machine = 'fat'
+
+            elif machine in ('PowerPC', 'Power_Macintosh'):
+                # Pick a sane name for the PPC architecture.
+                machine = 'ppc'
 
     return "%s-%s-%s" % (osname, release, machine)
 

From 57e5a01e0a790b43902fc19615d1a81ffa888c7a Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 23 May 2006 21:54:23 +0000
Subject: [PATCH 1821/8469] Whitespace normalization.

---
 unixccompiler.py | 2 +-
 util.py          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index e612cfc2ec..324819d4a5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -220,7 +220,7 @@ def link(self, target_desc, objects,
                     # skip over environment variable settings if /usr/bin/env
                     # is used to set up the linker's environment.
                     # This is needed on OSX. Note: this assumes that the
-                    # normal and C++ compiler have the same environment 
+                    # normal and C++ compiler have the same environment
                     # settings.
                     i = 0
                     if os.path.basename(linker[0]) == "env":
diff --git a/util.py b/util.py
index 623c41e280..cfcc6a951e 100644
--- a/util.py
+++ b/util.py
@@ -69,10 +69,10 @@ def get_platform ():
             release = m.group()
     elif osname[:6] == "darwin":
         #
-        # For our purposes, we'll assume that the system version from 
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set 
+        # For our purposes, we'll assume that the system version from
+        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
         # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were 
+        # machine is going to compile and link as if it were
         # MACOSX_DEPLOYMENT_TARGET.
         from distutils.sysconfig import get_config_vars
         cfgvars = get_config_vars()
@@ -97,7 +97,7 @@ def get_platform ():
                         r'<string>(.*?)</string>', f.read())
                 f.close()
                 if m is not None:
-                     macver = '.'.join(m.group(1).split('.')[:2])
+                    macver = '.'.join(m.group(1).split('.')[:2])
                 # else: fall back to the default behaviour
 
         if macver:

From e6ecfaefb58476548380b845c21cffc4a797fcc2 Mon Sep 17 00:00:00 2001
From: Bob Ippolito <bob@redivi.com>
Date: Fri, 26 May 2006 14:07:23 +0000
Subject: [PATCH 1822/8469] Fix distutils so that libffi will cross-compile
 between darwin/x86 and darwin/ppc

---
 ccompiler.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 6dad757a6a..1349abeb65 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,7 +15,6 @@
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
-from distutils.sysconfig import python_build
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -368,7 +367,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
 
         # Get the list of expected output (object) files
         objects = self.object_filenames(sources,
-                                        strip_dir=python_build,
+                                        strip_dir=0,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
@@ -475,8 +474,7 @@ def _prep_compile(self, sources, output_dir, depends=None):
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=python_build,
-                                        output_dir=output_dir)
+        objects = self.object_filenames(sources, output_dir=output_dir)
         assert len(objects) == len(sources)
 
         if self.force:

From 9cc8b6b8399a7a3b3ce1c8fc308f3f01a39ef975 Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Sat, 27 May 2006 19:21:47 +0000
Subject: [PATCH 1823/8469] Much-needed merge (using svnmerge.py this time) of
 trunk changes into p3yk. Inherits test_gzip/test_tarfile failures on 64-bit
 platforms from the trunk, but I don't want the merge to hang around too long
 (even though the regular p3yk-contributors are/have been busy with other
 things.)

Merged revisions 45621-46490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r45621 | george.yoshida | 2006-04-21 18:34:17 +0200 (Fri, 21 Apr 2006) | 2 lines

  Correct the grammar
........
  r45622 | tim.peters | 2006-04-21 18:34:54 +0200 (Fri, 21 Apr 2006) | 2 lines

  Whitespace normalization.
........
  r45624 | thomas.heller | 2006-04-21 18:48:56 +0200 (Fri, 21 Apr 2006) | 1 line

  Merge in changes from ctypes 0.9.9.6 upstream version.
........
  r45625 | thomas.heller | 2006-04-21 18:51:04 +0200 (Fri, 21 Apr 2006) | 1 line

  Merge in changes from ctypes 0.9.9.6 upstream version.
........
  r45630 | thomas.heller | 2006-04-21 20:29:17 +0200 (Fri, 21 Apr 2006) | 8 lines

  Documentation for ctypes.
  I think that 'generic operating system services' is the best category.
  Note that the Doc/lib/libctypes.latex file is generated from reST sources.
  You are welcome to make typo fixes, and I'll try to keep the reST sources
  in sync, but markup changes would be lost - they should be fixed in the tool
  that creates the latex file.
  The conversion script is external/ctypes/docs/manual/mkpydoc.py.
........
  r45631 | tim.peters | 2006-04-21 23:18:10 +0200 (Fri, 21 Apr 2006) | 24 lines

  SF bug #1473760 TempFile can hang on Windows.

  Python 2.4 changed ntpath.abspath to do an import
  inside the function.  As a result, due to Python's
  import lock, anything calling abspath on Windows
  (directly, or indirectly like tempfile.TemporaryFile)
  hung when it was called from a thread spawned as a
  side effect of importing a module.

  This is a depressingly frequent problem, and
  deserves a more general fix.  I'm settling for
  a micro-fix here because this specific one accounts
  for a report of Zope Corp's ZEO hanging on Windows,
  and it was an odd way to change abspath to begin
  with (ntpath needs a different implementation
  depending on whether we're actually running on
  Windows, and the _obvious_ way to arrange for that
  is not to bury a possibly-failing import _inside_
  the function).

  Note that if/when other micro-fixes of this kind
  get made, the new Lib/test/threaded_import_hangers.py
  is a convenient place to add tests for them.
........
  r45634 | phillip.eby | 2006-04-21 23:53:37 +0200 (Fri, 21 Apr 2006) | 2 lines

  Guido wrote contextlib, not me, but thanks anyway.  ;)
........
  r45636 | andrew.kuchling | 2006-04-22 03:51:41 +0200 (Sat, 22 Apr 2006) | 1 line

  Typo fixes
........
  r45638 | andrew.kuchling | 2006-04-22 03:58:40 +0200 (Sat, 22 Apr 2006) | 1 line

  Fix comment typo
........
  r45639 | andrew.kuchling | 2006-04-22 04:06:03 +0200 (Sat, 22 Apr 2006) | 8 lines

  Make copy of test_mailbox.py.  We'll still want to check the backward
  compatibility classes in the new mailbox.py that I'll be committing in
  a few minutes.

  One change has been made: the tests use len(mbox) instead of len(mbox.boxes).
  The 'boxes' attribute was never documented and contains some internal state
  that seems unlikely to have been useful.
........
  r45640 | andrew.kuchling | 2006-04-22 04:32:43 +0200 (Sat, 22 Apr 2006) | 16 lines

  Add Gregory K. Johnson's revised version of mailbox.py (funded by
  the 2005 Summer of Code).

  The revision adds a number of new mailbox classes that support adding
  and removing messages; these classes also support mailbox locking and
  default to using email.Message instead of rfc822.Message.

  The old mailbox classes are largely left alone for backward compatibility.
  The exception is the Maildir class, which was present in the old module
  and now inherits from the new classes.  The Maildir class's interface
  is pretty simple, though, so I think it'll be compatible with existing
  code.

  (The change to the NEWS file also adds a missing word to a different
  news item, which unfortunately required rewrapping the line.)
........
  r45641 | tim.peters | 2006-04-22 07:52:59 +0200 (Sat, 22 Apr 2006) | 2 lines

  Whitespace normalization.
........
  r45642 | neal.norwitz | 2006-04-22 08:07:46 +0200 (Sat, 22 Apr 2006) | 1 line

  Add libctypes as a dep
........
  r45643 | martin.v.loewis | 2006-04-22 13:15:41 +0200 (Sat, 22 Apr 2006) | 1 line

  Fix more ssize_t problems.
........
  r45644 | martin.v.loewis | 2006-04-22 13:40:03 +0200 (Sat, 22 Apr 2006) | 1 line

  Fix more ssize_t issues.
........
  r45645 | george.yoshida | 2006-04-22 17:10:49 +0200 (Sat, 22 Apr 2006) | 2 lines

  Typo fixes
........
  r45647 | martin.v.loewis | 2006-04-22 17:19:54 +0200 (Sat, 22 Apr 2006) | 1 line

  Port to Python 2.5. Drop .DEF file. Change output file names to .pyd.
........
  r45648 | george.yoshida | 2006-04-22 17:27:14 +0200 (Sat, 22 Apr 2006) | 3 lines

  - add versionadded tag
  - make arbitrary arguments come last
........
  r45649 | hyeshik.chang | 2006-04-22 17:48:15 +0200 (Sat, 22 Apr 2006) | 3 lines

  Remove $CJKCodecs$ RCS tags.  The CJKCodecs isn't maintained outside
  anymore.
........
  r45654 | greg.ward | 2006-04-23 05:47:58 +0200 (Sun, 23 Apr 2006) | 2 lines

  Update optparse to Optik 1.5.1.
........
  r45658 | george.yoshida | 2006-04-23 11:27:10 +0200 (Sun, 23 Apr 2006) | 2 lines

  wrap SyntaxError with \exception{}
........
  r45660 | ronald.oussoren | 2006-04-23 13:59:25 +0200 (Sun, 23 Apr 2006) | 6 lines

  Patch 1471925 - Weak linking support for OSX

  This patch causes several symbols in the socket and posix module to be weakly
  linked on OSX and disables usage of ftime on OSX. These changes make it possible
  to use a binary build on OSX 10.4 on a 10.3 system.
........
  r45661 | ronald.oussoren | 2006-04-23 14:36:23 +0200 (Sun, 23 Apr 2006) | 5 lines

  Patch 1471761 - test for broken poll at runtime

  This patch checks if poll is broken when the select module is loaded instead
  of doing so at configure-time. This functionality is only active on Mac OS X.
........
  r45662 | nick.coghlan | 2006-04-23 17:13:32 +0200 (Sun, 23 Apr 2006) | 1 line

  Add a Context Types section to parallel the Iterator Types section (uses the same terminology as the 2.5a1 implementation)
........
  r45663 | nick.coghlan | 2006-04-23 17:14:37 +0200 (Sun, 23 Apr 2006) | 1 line

  Update contextlib documentation to use the same terminology as the module implementation
........
  r45664 | gerhard.haering | 2006-04-23 17:24:26 +0200 (Sun, 23 Apr 2006) | 2 lines

  Updated the sqlite3 module to the external pysqlite 2.2.2 version.
........
  r45666 | nick.coghlan | 2006-04-23 17:39:16 +0200 (Sun, 23 Apr 2006) | 1 line

  Update with statement documentation to use same terminology as 2.5a1 implementation
........
  r45667 | nick.coghlan | 2006-04-23 18:05:04 +0200 (Sun, 23 Apr 2006) | 1 line

  Add a (very) brief mention of the with statement to the end of chapter 8
........
  r45668 | nick.coghlan | 2006-04-23 18:35:19 +0200 (Sun, 23 Apr 2006) | 1 line

  Take 2 on mentioning the with statement, this time without inadvertently killing the Unicode examples
........
  r45669 | nick.coghlan | 2006-04-23 19:04:07 +0200 (Sun, 23 Apr 2006) | 1 line

  Backdated NEWS entry to record the implementation of PEP 338 for alpha 1
........
  r45670 | tim.peters | 2006-04-23 20:13:45 +0200 (Sun, 23 Apr 2006) | 2 lines

  Whitespace normalization.
........
  r45671 | skip.montanaro | 2006-04-23 21:14:27 +0200 (Sun, 23 Apr 2006) | 1 line

  first cut at trace module doc
........
  r45672 | skip.montanaro | 2006-04-23 21:26:33 +0200 (Sun, 23 Apr 2006) | 1 line

  minor tweak
........
  r45673 | skip.montanaro | 2006-04-23 21:30:50 +0200 (Sun, 23 Apr 2006) | 1 line

  it's always helpful if the example works...
........
  r45674 | skip.montanaro | 2006-04-23 21:32:14 +0200 (Sun, 23 Apr 2006) | 1 line

  correct example
........
  r45675 | andrew.kuchling | 2006-04-23 23:01:04 +0200 (Sun, 23 Apr 2006) | 1 line

  Edits to the PEP 343 section
........
  r45676 | andrew.kuchling | 2006-04-23 23:51:10 +0200 (Sun, 23 Apr 2006) | 1 line

  Add two items
........
  r45677 | tim.peters | 2006-04-24 04:03:16 +0200 (Mon, 24 Apr 2006) | 5 lines

  Bug #1337990: clarified that `doctest` does not support examples
  requiring both expected output and an exception.

  I'll backport to 2.4 next.
........
  r45679 | nick.coghlan | 2006-04-24 05:04:43 +0200 (Mon, 24 Apr 2006) | 1 line

  Note changes made to PEP 343 related documentation
........
  r45681 | nick.coghlan | 2006-04-24 06:17:02 +0200 (Mon, 24 Apr 2006) | 1 line

  Change PEP 343 related documentation to use the term context specifier instead of context object
........
  r45682 | nick.coghlan | 2006-04-24 06:32:47 +0200 (Mon, 24 Apr 2006) | 1 line

  Add unit tests for the -m and -c command line switches
........
  r45683 | nick.coghlan | 2006-04-24 06:37:15 +0200 (Mon, 24 Apr 2006) | 1 line

  Fix contextlib.nested to cope with exit methods raising and handling exceptions
........
  r45685 | nick.coghlan | 2006-04-24 06:59:28 +0200 (Mon, 24 Apr 2006) | 1 line

  Fix broken contextlib test from last checkin (I'd've sworn I tested that before checking it in. . .)
........
  r45686 | nick.coghlan | 2006-04-24 07:24:26 +0200 (Mon, 24 Apr 2006) | 1 line

  Back out new command line tests (broke buildbot)
........
  r45687 | nick.coghlan | 2006-04-24 07:52:15 +0200 (Mon, 24 Apr 2006) | 1 line

  More reliable version of new command line tests that just checks the exit codes
........
  r45688 | thomas.wouters | 2006-04-24 13:37:13 +0200 (Mon, 24 Apr 2006) | 4 lines


  Stop test_tcl's testLoadTk from leaking the Tk commands 'loadtk' registers.
........
  r45690 | andrew.kuchling | 2006-04-24 16:30:47 +0200 (Mon, 24 Apr 2006) | 2 lines

  Edits, using the new term
  'context specifier' in a few places
........
  r45697 | phillip.eby | 2006-04-24 22:53:13 +0200 (Mon, 24 Apr 2006) | 2 lines

  Revert addition of setuptools
........
  r45698 | tim.peters | 2006-04-25 00:45:13 +0200 (Tue, 25 Apr 2006) | 2 lines

  Whitespace normalization.
........
  r45700 | trent.mick | 2006-04-25 02:34:50 +0200 (Tue, 25 Apr 2006) | 4 lines

  Put break at correct level so *all* root HKEYs acutally get checked for
  an installed VC6. Otherwise only the first such tree gets checked and this
  warning doesn't get displayed.
........
  r45701 | tim.peters | 2006-04-25 05:31:36 +0200 (Tue, 25 Apr 2006) | 3 lines

  Patch #1475231:  add a new SKIP doctest option, thanks to
  Edward Loper.
........
  r45702 | neal.norwitz | 2006-04-25 07:04:35 +0200 (Tue, 25 Apr 2006) | 1 line

  versionadded for SKIP
........
  r45703 | neal.norwitz | 2006-04-25 07:05:03 +0200 (Tue, 25 Apr 2006) | 1 line

  Restore Walters name
........
  r45704 | neal.norwitz | 2006-04-25 07:49:42 +0200 (Tue, 25 Apr 2006) | 1 line

  Revert previous change, SKIP had a versionadded elsewhere
........
  r45706 | nick.coghlan | 2006-04-25 12:56:51 +0200 (Tue, 25 Apr 2006) | 31 lines

  Move the PEP 343 documentation and implementation closer to the
  terminology in the alpha 1 documentation.

   - "context manager" reverts to its alpha 1 definition
   - the term "context specifier" goes away entirely
   - contextlib.GeneratorContextManager is renamed GeneratorContext

  There are still a number of changes relative to alpha 1:

    - the expression in the with statement is explicitly called the
      "context expression" in the language reference
    - the terms 'with statement context', 'context object' or 'with
      statement context' are used in several places instead of a bare
      'context'. The aim of this is to avoid ambiguity in relation to the
      runtime context set up when the block is executed, and the context
      objects that already exist in various application domains (such as
      decimal.Context)
    - contextlib.contextmanager is renamed to contextfactory
      This best reflects the nature of the function resulting from the
      use of that decorator
    - decimal.ContextManager is renamed to WithStatementContext
      Simple dropping the 'Manager' part wasn't possible due to the
      fact that decimal.Context already exists and means something
      different. WithStatementContext is ugly but workable.

  A technically unrelated change snuck into this commit:
  contextlib.closing now avoids the overhead of creating a
  generator, since it's trivial to implement that particular
  context manager directly.
........
  r45707 | nick.coghlan | 2006-04-25 13:05:56 +0200 (Tue, 25 Apr 2006) | 1 line

  Fix latex typo
........
  r45708 | thomas.wouters | 2006-04-25 14:28:56 +0200 (Tue, 25 Apr 2006) | 4 lines


  Fix markup glitch in unittest docs. Will backport.
........
  r45710 | andrew.kuchling | 2006-04-25 14:31:38 +0200 (Tue, 25 Apr 2006) | 1 line

  Add two items; easy_install is now off the table, though pkgutil still is
........
  r45711 | andrew.kuchling | 2006-04-25 14:47:25 +0200 (Tue, 25 Apr 2006) | 1 line

  Rework context terminology
........
  r45712 | thomas.wouters | 2006-04-25 15:53:23 +0200 (Tue, 25 Apr 2006) | 9 lines


  SF bug/patch #1433877: string parameter to ioctl not null terminated

  The new char-array used in ioctl calls wasn't explicitly NUL-terminated;
  quite probably the cause for the test_pty failures on Solaris that we
  circumvented earlier. (I wasn't able to reproduce it with this patch, but it
  has been somewhat elusive to start with.)
........
  r45713 | george.yoshida | 2006-04-25 16:09:58 +0200 (Tue, 25 Apr 2006) | 2 lines

  minor tweak
........
  r45714 | thomas.wouters | 2006-04-25 17:08:10 +0200 (Tue, 25 Apr 2006) | 7 lines


  Fix SF bug #1476111: SystemError in socket sendto. The AF_INET6 and
  AF_PACKET cases in getsockaddrarg were missing their own checks for
  tuple-ness of the address argument, which means a confusing SystemError was
  raised by PyArg_ParseTuple instead.
........
  r45715 | thomas.wouters | 2006-04-25 17:29:46 +0200 (Tue, 25 Apr 2006) | 10 lines


  Define MAXPATHLEN to be at least PATH_MAX, if that's defined. Python uses
  MAXPATHLEN-sized buffers for various output-buffers (like to realpath()),
  and that's correct on BSD platforms, but not Linux (which uses PATH_MAX, and
  does not define MAXPATHLEN.) Cursory googling suggests Linux is following a
  newer standard than BSD, but in cases like this, who knows. Using the
  greater of PATH_MAX and 1024 as a fallback for MAXPATHLEN seems to be the
  most portable solution.
........
  r45717 | thomas.heller | 2006-04-25 20:26:08 +0200 (Tue, 25 Apr 2006) | 3 lines

  Fix compiler warnings on Darwin.
  Patch by Brett Canon, see
  https://sourceforge.net/tracker/?func=detail&atid=532156&aid=1475959&group_id=71702
........
  r45718 | guido.van.rossum | 2006-04-25 22:12:45 +0200 (Tue, 25 Apr 2006) | 4 lines

  Implement MvL's improvement on __context__ in Condition;
  this can just call __context__ on the underlying lock.
  (The same change for Semaphore does *not* work!)
........
  r45721 | tim.peters | 2006-04-26 03:15:53 +0200 (Wed, 26 Apr 2006) | 13 lines

  Rev 45706 renamed stuff in contextlib.py, but didn't rename
  uses of it in test_with.py.  As a result, test_with has been skipped
  (due to failing imports) on all buildbot boxes since.  Alas, that's
  not a test failure -- you have to pay attention to the

      1 skip unexpected on PLATFORM:
          test_with

  kinds of output at the ends of test runs to notice that this got
  broken.

  It's likely that more renaming in test_with.py would be desirable.
........
  r45722 | fred.drake | 2006-04-26 07:15:41 +0200 (Wed, 26 Apr 2006) | 1 line

  markup fixes, cleanup
........
  r45723 | fred.drake | 2006-04-26 07:19:39 +0200 (Wed, 26 Apr 2006) | 1 line

  minor adjustment suggested by Peter Gephardt
........
  r45724 | neal.norwitz | 2006-04-26 07:34:03 +0200 (Wed, 26 Apr 2006) | 10 lines

  Patch from Aldo Cortesi (OpenBSD buildbot owner).

  After the patch (45590) to add extra debug stats to the gc module, Python
  was crashing on OpenBSD due to:
  	Fatal Python error: Interpreter not initialized (version mismatch?)

  This seems to occur due to calling collect() when initialized (in pythonrun.c)
  is set to 0.  Now, the import will occur in the init function which
  shouldn't suffer this problem.
........
  r45725 | neal.norwitz | 2006-04-26 08:26:12 +0200 (Wed, 26 Apr 2006) | 3 lines

  Fix this test on Solaris.  There can be embedded \r, so don't just replace
  the one at the end.
........
  r45727 | nick.coghlan | 2006-04-26 13:50:04 +0200 (Wed, 26 Apr 2006) | 1 line

  Fix an error in the last contextlib.closing example
........
  r45728 | andrew.kuchling | 2006-04-26 14:21:06 +0200 (Wed, 26 Apr 2006) | 1 line

  [Bug #1475080] Fix example
........
  r45729 | andrew.kuchling | 2006-04-26 14:23:39 +0200 (Wed, 26 Apr 2006) | 1 line

  Add labels to all sections
........
  r45730 | thomas.wouters | 2006-04-26 17:53:30 +0200 (Wed, 26 Apr 2006) | 7 lines


  The result of SF patch #1471578: big-memory tests for strings, lists and
  tuples. Lots to be added, still, but this will give big-memory people
  something to play with in 2.5 alpha 2, and hopefully get more people to
  write these tests.
........
  r45731 | tim.peters | 2006-04-26 19:11:16 +0200 (Wed, 26 Apr 2006) | 2 lines

  Whitespace normalization.
........
  r45732 | martin.v.loewis | 2006-04-26 19:19:44 +0200 (Wed, 26 Apr 2006) | 1 line

  Use GS- and bufferoverlowU.lib where appropriate, for AMD64.
........
  r45733 | thomas.wouters | 2006-04-26 20:46:01 +0200 (Wed, 26 Apr 2006) | 5 lines


  Add tests for += and *= on strings, and fix the memory-use estimate for the
  list.extend tests (they were estimating half the actual use.)
........
  r45734 | thomas.wouters | 2006-04-26 21:14:46 +0200 (Wed, 26 Apr 2006) | 5 lines


  Some more test-size-estimate fixes: test_append and test_insert trigger a
  list resize, which overallocates.
........
  r45735 | hyeshik.chang | 2006-04-26 21:20:26 +0200 (Wed, 26 Apr 2006) | 3 lines

  Fix build on MIPS for libffi.  I haven't tested this yet because I
  don't have an access on MIPS machines.  Will be tested by buildbot. :)
........
  r45737 | fred.drake | 2006-04-27 01:40:32 +0200 (Thu, 27 Apr 2006) | 1 line

  one more place to use the current Python version
........
  r45738 | fred.drake | 2006-04-27 02:02:24 +0200 (Thu, 27 Apr 2006) | 3 lines

  - update version numbers in file names again, until we have a better way
  - elaborate instructions for Cygwin support (closes SF #839709)
........
  r45739 | fred.drake | 2006-04-27 02:20:14 +0200 (Thu, 27 Apr 2006) | 1 line

  add missing word
........
  r45740 | anthony.baxter | 2006-04-27 04:11:24 +0200 (Thu, 27 Apr 2006) | 2 lines

  2.5a2
........
  r45741 | anthony.baxter | 2006-04-27 04:13:13 +0200 (Thu, 27 Apr 2006) | 1 line

  2.5a2
........
  r45749 | andrew.kuchling | 2006-04-27 14:22:37 +0200 (Thu, 27 Apr 2006) | 1 line

  Now that 2.5a2 is out, revert to the current date
........
  r45750 | andrew.kuchling | 2006-04-27 14:23:07 +0200 (Thu, 27 Apr 2006) | 1 line

  Bump document version
........
  r45751 | andrew.kuchling | 2006-04-27 14:34:39 +0200 (Thu, 27 Apr 2006) | 6 lines

  [Bug #1477102] Add necessary import to example

  This may be a useful style question for the docs -- should examples show
  the necessary imports, or should it be assumed that the reader will
  figure it out?  In the What's New, I'm not consistent but usually opt
  for omitting the imports.
........
  r45753 | andrew.kuchling | 2006-04-27 14:38:35 +0200 (Thu, 27 Apr 2006) | 1 line

  [Bug #1477140] Import Error base class
........
  r45754 | andrew.kuchling | 2006-04-27 14:42:54 +0200 (Thu, 27 Apr 2006) | 1 line

  Mention the xmlrpclib.Error base class, which is used in one of the examples
........
  r45756 | george.yoshida | 2006-04-27 15:41:07 +0200 (Thu, 27 Apr 2006) | 2 lines

  markup fix
........
  r45757 | thomas.wouters | 2006-04-27 15:46:59 +0200 (Thu, 27 Apr 2006) | 4 lines


  Some more size-estimate fixes, for large-list-tests.
........
  r45758 | thomas.heller | 2006-04-27 17:50:42 +0200 (Thu, 27 Apr 2006) | 3 lines

  Rerun the libffi configuration if any of the files used for that
  are newer then fficonfig.py.
........
  r45766 | thomas.wouters | 2006-04-28 00:37:50 +0200 (Fri, 28 Apr 2006) | 6 lines


  Some style fixes and size-calculation fixes. Also do the small-memory run
  using a prime number, rather than a convenient power-of-2-and-multiple-of-5,
  so incorrect testing algorithms fail more easily.
........
  r45767 | thomas.wouters | 2006-04-28 00:38:32 +0200 (Fri, 28 Apr 2006) | 6 lines


  Do the small-memory run of big-meormy tests using a prime number, rather
  than a convenient power-of-2-and-multiple-of-5, so incorrect testing
  algorithms fail more easily.
........
  r45768 | david.goodger | 2006-04-28 00:53:05 +0200 (Fri, 28 Apr 2006) | 1 line

  Added SVN access for Steven Bethard and Talin, for PEP updating.
........
  r45770 | thomas.wouters | 2006-04-28 01:13:20 +0200 (Fri, 28 Apr 2006) | 16 lines


   - Add new Warning class, ImportWarning

   - Warn-raise ImportWarning when importing would have picked up a directory
     as package, if only it'd had an __init__.py. This swaps two tests (for
     case-ness and __init__-ness), but case-test is not really more expensive,
     and it's not in a speed-critical section.

   - Test for the new warning by importing a common non-package directory on
     sys.path: site-packages

   - In regrtest.py, silence warnings generated by the build-environment
     because Modules/ (which is added to sys.path for Setup-created modules)
     has 'zlib' and '_ctypes' directories without __init__.py's.
........
  r45771 | thomas.wouters | 2006-04-28 01:41:27 +0200 (Fri, 28 Apr 2006) | 6 lines


  Add more ignores of ImportWarnings; these are all just potential triggers
  (since they won't trigger if zlib is already sucessfully imported); they
  were found by grepping .py files, instead of looking at warning output :)
........
  r45773 | neal.norwitz | 2006-04-28 06:32:20 +0200 (Fri, 28 Apr 2006) | 1 line

  Add some whitespace to be more consistent.
........
  r45774 | neal.norwitz | 2006-04-28 06:34:43 +0200 (Fri, 28 Apr 2006) | 5 lines

  Try to really fix the slow buildbots this time.
  Printing to stdout, doesn't mean the data was actually written.
  It depends on the buffering, so we need to flush.  This will hopefully
  really fix the buildbots getting killed due to no output on the slow bots.
........
  r45775 | neal.norwitz | 2006-04-28 07:28:05 +0200 (Fri, 28 Apr 2006) | 1 line

  Fix some warnings on Mac OS X 10.4
........
  r45776 | neal.norwitz | 2006-04-28 07:28:30 +0200 (Fri, 28 Apr 2006) | 1 line

  Fix a warning on alpha
........
  r45777 | neal.norwitz | 2006-04-28 07:28:54 +0200 (Fri, 28 Apr 2006) | 1 line

  Fix a warning on ppc (debian)
........
  r45778 | george.yoshida | 2006-04-28 18:09:45 +0200 (Fri, 28 Apr 2006) | 2 lines

  fix markup glitch
........
  r45780 | georg.brandl | 2006-04-28 18:31:17 +0200 (Fri, 28 Apr 2006) | 3 lines

  Add SeaMonkey to the list of Mozilla browsers.
........
  r45781 | georg.brandl | 2006-04-28 18:36:55 +0200 (Fri, 28 Apr 2006) | 2 lines

  Bug #1475009: clarify ntpath.join behavior with absolute components
........
  r45783 | george.yoshida | 2006-04-28 18:40:14 +0200 (Fri, 28 Apr 2006) | 2 lines

  correct a dead link
........
  r45785 | georg.brandl | 2006-04-28 18:54:25 +0200 (Fri, 28 Apr 2006) | 4 lines

  Bug #1472949: stringify IOErrors in shutil.copytree when appending
  them to the Error errors list.
........
  r45786 | georg.brandl | 2006-04-28 18:58:52 +0200 (Fri, 28 Apr 2006) | 3 lines

  Bug #1478326: don't allow '/' in distutils.util.get_platform machine names
  since this value is used to name the build directory.
........
  r45788 | thomas.heller | 2006-04-28 19:02:18 +0200 (Fri, 28 Apr 2006) | 1 line

  Remove a duplicated test (the same test is in test_incomplete.py).
........
  r45792 | georg.brandl | 2006-04-28 21:09:24 +0200 (Fri, 28 Apr 2006) | 3 lines

  Bug #1478429: make datetime.datetime.fromtimestamp accept every float,
  possibly "rounding up" to the next whole second.
........
  r45796 | george.yoshida | 2006-04-29 04:43:30 +0200 (Sat, 29 Apr 2006) | 2 lines

  grammar fix
........
  r45800 | ronald.oussoren | 2006-04-29 13:31:35 +0200 (Sat, 29 Apr 2006) | 2 lines

  Patch 1471883: --enable-universalsdk on Mac OS X
........
  r45801 | andrew.kuchling | 2006-04-29 13:53:15 +0200 (Sat, 29 Apr 2006) | 1 line

  Add item
........
  r45802 | andrew.kuchling | 2006-04-29 14:10:28 +0200 (Sat, 29 Apr 2006) | 1 line

  Make case of 'ZIP' consistent
........
  r45803 | andrew.kuchling | 2006-04-29 14:10:43 +0200 (Sat, 29 Apr 2006) | 1 line

  Add item
........
  r45808 | martin.v.loewis | 2006-04-29 14:37:25 +0200 (Sat, 29 Apr 2006) | 3 lines

  Further changes for #1471883: Edit Misc/NEWS, and
  add expat_config.h.
........
  r45809 | brett.cannon | 2006-04-29 23:29:50 +0200 (Sat, 29 Apr 2006) | 2 lines

  Fix docstring for contextfactory; mentioned old contextmanager name.
........
  r45810 | gerhard.haering | 2006-04-30 01:12:41 +0200 (Sun, 30 Apr 2006) | 3 lines

  This is the start of documentation for the sqlite3 module. Please feel free to
  find a better place for the link to it than alongside bsddb & friends.
........
  r45811 | andrew.kuchling | 2006-04-30 03:07:09 +0200 (Sun, 30 Apr 2006) | 1 line

  Add two items
........
  r45814 | george.yoshida | 2006-04-30 05:49:56 +0200 (Sun, 30 Apr 2006) | 2 lines

  Use \versionchanged instead of \versionadded for new parameter support.
........
  r45815 | georg.brandl | 2006-04-30 09:06:11 +0200 (Sun, 30 Apr 2006) | 2 lines

  Patch #1470846: fix urllib2 ProxyBasicAuthHandler.
........
  r45817 | georg.brandl | 2006-04-30 10:57:35 +0200 (Sun, 30 Apr 2006) | 3 lines

  In stdlib, use hashlib instead of deprecated md5 and sha modules.
........
  r45819 | georg.brandl | 2006-04-30 11:23:59 +0200 (Sun, 30 Apr 2006) | 3 lines

  Patch #1470976: don't NLST files when retrieving over FTP.
........
  r45821 | georg.brandl | 2006-04-30 13:13:56 +0200 (Sun, 30 Apr 2006) | 6 lines

  Bug #1473625: stop cPickle making float dumps locale dependent in protocol 0.

  On the way, add a decorator to test_support to facilitate running single
  test functions in different locales with automatic cleanup.
........
  r45822 | phillip.eby | 2006-04-30 17:59:26 +0200 (Sun, 30 Apr 2006) | 2 lines

  Fix infinite regress when inspecting <string> or <stdin> frames.
........
  r45824 | georg.brandl | 2006-04-30 19:42:26 +0200 (Sun, 30 Apr 2006) | 3 lines

  Fix another problem in inspect: if the module for an object cannot be found, don't try to give its __dict__ to linecache.
........
  r45825 | georg.brandl | 2006-04-30 20:14:54 +0200 (Sun, 30 Apr 2006) | 3 lines

  Patch #1472854: make the rlcompleter.Completer class usable on non-
  UNIX platforms.
........
  r45826 | georg.brandl | 2006-04-30 21:34:19 +0200 (Sun, 30 Apr 2006) | 3 lines

  Patch #1479438: add \keyword markup for "with".
........
  r45827 | andrew.kuchling | 2006-04-30 23:19:31 +0200 (Sun, 30 Apr 2006) | 1 line

  Add urllib2 HOWTO from Michael Foord
........
  r45828 | andrew.kuchling | 2006-04-30 23:19:49 +0200 (Sun, 30 Apr 2006) | 1 line

  Add item
........
  r45830 | barry.warsaw | 2006-05-01 05:03:02 +0200 (Mon, 01 May 2006) | 11 lines

  Port forward from 2.4 branch:

  Patch #1464708 from William McVey: fixed handling of nested comments in mail
  addresses.  E.g.

  "Foo ((Foo Bar)) <foo@example.com>"

  Fixes for both rfc822.py and email package.  This patch needs to be back
  ported to Python 2.3 for email 2.5.
........
  r45832 | fred.drake | 2006-05-01 08:25:58 +0200 (Mon, 01 May 2006) | 4 lines

  - minor clarification in section title
  - markup adjustments
  (there is clearly much to be done in this section)
........
  r45833 | martin.v.loewis | 2006-05-01 08:28:01 +0200 (Mon, 01 May 2006) | 2 lines

  Work around deadlock risk. Will backport.
........
  r45836 | andrew.kuchling | 2006-05-01 14:45:02 +0200 (Mon, 01 May 2006) | 1 line

  Some ElementTree fixes: import from xml, not xmlcore; fix case of module name; mention list() instead of getchildren()
........
  r45837 | gerhard.haering | 2006-05-01 17:14:48 +0200 (Mon, 01 May 2006) | 3 lines

  Further integration of the documentation for the sqlite3 module. There's still
  quite some content to move over from the pysqlite manual, but it's a start now.
........
  r45838 | martin.v.loewis | 2006-05-01 17:56:03 +0200 (Mon, 01 May 2006) | 2 lines

  Rename uisample to text, drop all non-text tables.
........
  r45839 | martin.v.loewis | 2006-05-01 18:12:44 +0200 (Mon, 01 May 2006) | 2 lines

  Add msilib documentation.
........
  r45840 | martin.v.loewis | 2006-05-01 18:14:16 +0200 (Mon, 01 May 2006) | 4 lines

  Rename parameters to match the documentation (which
  in turn matches Microsoft's documentation).
  Drop unused parameter in CAB.append.
........
  r45841 | fred.drake | 2006-05-01 18:28:54 +0200 (Mon, 01 May 2006) | 1 line

  add dependency
........
  r45842 | andrew.kuchling | 2006-05-01 18:30:25 +0200 (Mon, 01 May 2006) | 1 line

  Markup fixes; add some XXX comments noting problems
........
  r45843 | andrew.kuchling | 2006-05-01 18:32:49 +0200 (Mon, 01 May 2006) | 1 line

  Add item
........
  r45844 | andrew.kuchling | 2006-05-01 19:06:54 +0200 (Mon, 01 May 2006) | 1 line

  Markup fixes
........
  r45850 | neal.norwitz | 2006-05-02 06:43:14 +0200 (Tue, 02 May 2006) | 3 lines

  SF #1479181: split open() and file() from being aliases for each other.
........
  r45852 | neal.norwitz | 2006-05-02 08:23:22 +0200 (Tue, 02 May 2006) | 1 line

  Try to fix breakage caused by patch #1479181, r45850
........
  r45853 | fred.drake | 2006-05-02 08:53:59 +0200 (Tue, 02 May 2006) | 3 lines

  SF #1479988: add methods to allow access to weakrefs for the
  weakref.WeakKeyDictionary and weakref.WeakValueDictionary
........
  r45854 | neal.norwitz | 2006-05-02 09:27:47 +0200 (Tue, 02 May 2006) | 5 lines

  Fix breakage from patch 1471883 (r45800 & r45808) on OSF/1.
  The problem was that pyconfig.h was being included before some system headers
  which caused redefinitions and other breakage.  This moves system headers
  after expat_config.h which includes pyconfig.h.
........
  r45855 | vinay.sajip | 2006-05-02 10:35:36 +0200 (Tue, 02 May 2006) | 1 line

  Replaced my dumb way of calculating seconds to midnight with Tim Peters' much more sensible suggestion. What was I thinking ?!?
........
  r45856 | andrew.kuchling | 2006-05-02 13:30:03 +0200 (Tue, 02 May 2006) | 1 line

  Provide encoding as keyword argument; soften warning paragraph about encodings
........
  r45858 | guido.van.rossum | 2006-05-02 19:36:09 +0200 (Tue, 02 May 2006) | 2 lines

  Fix the formatting of KeyboardInterrupt -- a bad issubclass() call.
........
  r45862 | guido.van.rossum | 2006-05-02 21:47:52 +0200 (Tue, 02 May 2006) | 7 lines

  Get rid of __context__, per the latest changes to PEP 343 and python-dev
  discussion.
  There are two places of documentation that still mention __context__:
  Doc/lib/libstdtypes.tex -- I wasn't quite sure how to rewrite that without
  spending a whole lot of time thinking about it; and whatsnew, which Andrew
  usually likes to change himself.
........
  r45863 | armin.rigo | 2006-05-02 21:52:32 +0200 (Tue, 02 May 2006) | 4 lines

  Documentation bug: PySet_Pop() returns a new reference (because the
  caller becomes the owner of that reference).
........
  r45864 | guido.van.rossum | 2006-05-02 22:47:36 +0200 (Tue, 02 May 2006) | 4 lines

  Hopefully this will fix the spurious failures of test_mailbox.py that I'm
  experiencing.  (This code and mailbox.py itself are full of calls to file()
  that should be calls to open() -- but I'm not fixing those.)
........
  r45865 | andrew.kuchling | 2006-05-02 23:44:33 +0200 (Tue, 02 May 2006) | 1 line

  Use open() instead of file()
........
  r45866 | andrew.kuchling | 2006-05-03 00:47:49 +0200 (Wed, 03 May 2006) | 1 line

  Update context manager section for removal of __context__
........
  r45867 | fred.drake | 2006-05-03 03:46:52 +0200 (Wed, 03 May 2006) | 1 line

  remove unnecessary assignment
........
  r45868 | fred.drake | 2006-05-03 03:48:24 +0200 (Wed, 03 May 2006) | 4 lines

  tell LaTeX2HTML to:
  - use UTF-8 output
  - not mess with the >>> prompt!
........
  r45869 | fred.drake | 2006-05-03 04:04:40 +0200 (Wed, 03 May 2006) | 3 lines

  avoid ugly markup based on the unfortunate conversions of ">>" and "<<" to
  guillemets; no need for magic here
........
  r45870 | fred.drake | 2006-05-03 04:12:47 +0200 (Wed, 03 May 2006) | 1 line

  at least comment on why curly-quotes are not enabled
........
  r45871 | fred.drake | 2006-05-03 04:27:40 +0200 (Wed, 03 May 2006) | 1 line

  one more place to avoid extra markup
........
  r45872 | fred.drake | 2006-05-03 04:29:09 +0200 (Wed, 03 May 2006) | 1 line

  one more place to avoid extra markup (how many will there be?)
........
  r45873 | fred.drake | 2006-05-03 04:29:39 +0200 (Wed, 03 May 2006) | 1 line

  fix up whitespace in prompt strings
........
  r45876 | tim.peters | 2006-05-03 06:46:14 +0200 (Wed, 03 May 2006) | 2 lines

  Whitespace normalization.
........
  r45877 | martin.v.loewis | 2006-05-03 06:52:04 +0200 (Wed, 03 May 2006) | 2 lines

  Correct some formulations, fix XXX comments.
........
  r45879 | georg.brandl | 2006-05-03 07:05:02 +0200 (Wed, 03 May 2006) | 2 lines

  Patch #1480067: don't redirect HTTP digest auth in urllib2
........
  r45881 | georg.brandl | 2006-05-03 07:15:10 +0200 (Wed, 03 May 2006) | 3 lines

  Move network tests from test_urllib2 to test_urllib2net.
........
  r45887 | nick.coghlan | 2006-05-03 15:02:47 +0200 (Wed, 03 May 2006) | 1 line

  Finish bringing SVN into line with latest version of PEP 343 by getting rid of all remaining references to context objects that I could find. Without a __context__() method context objects no longer exist. Also get test_with working again, and adopt a suggestion from Neal for decimal.Context.get_manager()
........
  r45888 | nick.coghlan | 2006-05-03 15:17:49 +0200 (Wed, 03 May 2006) | 1 line

  Get rid of a couple more context object references, fix some markup and clarify what happens when a generator context function swallows an exception.
........
  r45889 | georg.brandl | 2006-05-03 19:46:13 +0200 (Wed, 03 May 2006) | 3 lines

  Add seamonkey to list of Windows browsers too.
........
  r45890 | georg.brandl | 2006-05-03 20:03:22 +0200 (Wed, 03 May 2006) | 3 lines

  RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary.
........
  r45891 | georg.brandl | 2006-05-03 20:12:33 +0200 (Wed, 03 May 2006) | 2 lines

  Bug #1472191: convert breakpoint indices to ints before comparing them to ints
........
  r45893 | georg.brandl | 2006-05-03 20:18:32 +0200 (Wed, 03 May 2006) | 3 lines

  Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package.
........
  r45894 | thomas.heller | 2006-05-03 20:35:39 +0200 (Wed, 03 May 2006) | 1 line

  Don't fail the tests when libglut.so or libgle.so cannot be loaded.
........
  r45895 | georg.brandl | 2006-05-04 07:08:10 +0200 (Thu, 04 May 2006) | 2 lines

  Bug #1481530: allow "from os.path import ..." with imputil
........
  r45897 | martin.v.loewis | 2006-05-04 07:51:03 +0200 (Thu, 04 May 2006) | 2 lines

  Patch #1475845: Raise IndentationError for unexpected indent.
........
  r45898 | martin.v.loewis | 2006-05-04 12:08:42 +0200 (Thu, 04 May 2006) | 1 line

  Implement os.{chdir,rename,rmdir,remove} using Win32 directly.
........
  r45899 | martin.v.loewis | 2006-05-04 14:04:27 +0200 (Thu, 04 May 2006) | 2 lines

  Drop now-unnecessary arguments to posix_2str.
........
  r45900 | martin.v.loewis | 2006-05-04 16:27:52 +0200 (Thu, 04 May 2006) | 1 line

  Update checks to consider Windows error numbers.
........
  r45913 | thomas.heller | 2006-05-05 20:42:14 +0200 (Fri, 05 May 2006) | 2 lines

  Export the 'free' standard C function for use in the test suite.
........
  r45914 | thomas.heller | 2006-05-05 20:43:24 +0200 (Fri, 05 May 2006) | 3 lines

  Fix memory leaks in the ctypes test suite, reported by valgrind, by
  free()ing the memory we allocate.
........
  r45915 | thomas.heller | 2006-05-05 20:46:27 +0200 (Fri, 05 May 2006) | 1 line

  oops - the function is exported as 'my_free', not 'free'.
........
  r45916 | thomas.heller | 2006-05-05 21:14:24 +0200 (Fri, 05 May 2006) | 2 lines

  Clean up.
........
  r45920 | george.yoshida | 2006-05-06 15:09:45 +0200 (Sat, 06 May 2006) | 2 lines

  describe optional arguments for DocFileSuite
........
  r45924 | george.yoshida | 2006-05-06 16:16:51 +0200 (Sat, 06 May 2006) | 2 lines

  Use \versionchanged for the feature change
........
  r45925 | martin.v.loewis | 2006-05-06 18:32:54 +0200 (Sat, 06 May 2006) | 1 line

  Port access, chmod, parts of getcwdu, mkdir, and utime to direct Win32 API.
........
  r45926 | martin.v.loewis | 2006-05-06 22:04:08 +0200 (Sat, 06 May 2006) | 2 lines

  Handle ERROR_ALREADY_EXISTS.
........
  r45931 | andrew.kuchling | 2006-05-07 19:12:12 +0200 (Sun, 07 May 2006) | 1 line

  [Patch #1479977] Revised version of urllib2 HOWTO, edited by John J. Lee
........
  r45932 | andrew.kuchling | 2006-05-07 19:14:53 +0200 (Sun, 07 May 2006) | 1 line

  Minor language edit
........
  r45934 | georg.brandl | 2006-05-07 22:44:34 +0200 (Sun, 07 May 2006) | 3 lines

  Patch #1483395: add new TLDs to cookielib
........
  r45936 | martin.v.loewis | 2006-05-08 07:25:56 +0200 (Mon, 08 May 2006) | 2 lines

  Add missing PyMem_Free.
........
  r45938 | georg.brandl | 2006-05-08 19:28:47 +0200 (Mon, 08 May 2006) | 3 lines

  Add test for rev. 45934.
........
  r45939 | georg.brandl | 2006-05-08 19:36:08 +0200 (Mon, 08 May 2006) | 3 lines

  Patch #1479302: Make urllib2 digest auth and basic auth play together.
........
  r45940 | georg.brandl | 2006-05-08 19:48:01 +0200 (Mon, 08 May 2006) | 3 lines

  Patch #1478993: take advantage of BaseException/Exception split in cookielib
........
  r45941 | neal.norwitz | 2006-05-09 07:38:56 +0200 (Tue, 09 May 2006) | 5 lines

  Micro optimization.  In the first case, we know that frame->f_exc_type
  is NULL, so there's no reason to do anything with it.  In the second case,
  we know frame->f_exc_type is not NULL, so we can just do an INCREF.
........
  r45943 | thomas.heller | 2006-05-09 22:20:15 +0200 (Tue, 09 May 2006) | 2 lines

  Disable a test that is unreliable.
........
  r45944 | tim.peters | 2006-05-10 04:43:01 +0200 (Wed, 10 May 2006) | 4 lines

  Variant of patch #1478292.  doctest.register_optionflag(name)
  shouldn't create a new flag when `name` is already the name of
  an option flag.
........
  r45947 | neal.norwitz | 2006-05-10 08:57:58 +0200 (Wed, 10 May 2006) | 14 lines

  Fix problems found by Coverity.

  longobject.c: also fix an ssize_t problem
    <a> could have been NULL, so hoist the size calc to not use <a>.

  _ssl.c: under fail: self is DECREF'd, but it would have been NULL.

  _elementtree.c: delete self if there was an error.

  _csv.c: I'm not sure if lineterminator could have been anything other than
  a string.  However, other string method calls are checked, so check this
  one too.
........
  r45948 | thomas.wouters | 2006-05-10 17:04:11 +0200 (Wed, 10 May 2006) | 4 lines


  Ignore reflog.txt, too.
........
  r45949 | georg.brandl | 2006-05-10 17:59:06 +0200 (Wed, 10 May 2006) | 3 lines

  Bug #1482988: indicate more prominently that the Stats class is in the pstats module.
........
  r45950 | georg.brandl | 2006-05-10 18:09:03 +0200 (Wed, 10 May 2006) | 2 lines

  Bug #1485447: subprocess: document that the "cwd" parameter isn't used to find the executable. Misc. other markup fixes.
........
  r45952 | georg.brandl | 2006-05-10 18:11:44 +0200 (Wed, 10 May 2006) | 2 lines

  Bug #1484978: curses.panel: clarify that Panel objects are destroyed on garbage collection.
........
  r45954 | georg.brandl | 2006-05-10 18:26:03 +0200 (Wed, 10 May 2006) | 4 lines

  Patch #1484695: Update the tarfile module to version 0.8. This fixes
  a couple of issues, notably handling of long file names using the
  GNU LONGNAME extension.
........
  r45955 | georg.brandl | 2006-05-10 19:13:20 +0200 (Wed, 10 May 2006) | 4 lines

  Patch #721464: pdb.Pdb instances can now be given explicit stdin and
  stdout arguments, making it possible to redirect input and output
  for remote debugging.
........
  r45956 | andrew.kuchling | 2006-05-10 19:19:04 +0200 (Wed, 10 May 2006) | 1 line

  Clarify description of exception handling
........
  r45957 | georg.brandl | 2006-05-10 22:09:23 +0200 (Wed, 10 May 2006) | 2 lines

  Fix two small errors in argument lists.
........
  r45960 | brett.cannon | 2006-05-11 07:11:33 +0200 (Thu, 11 May 2006) | 5 lines

  Detect if %zd is supported by printf() during configure and sets
  PY_FORMAT_SIZE_T appropriately.  Removes warnings on
  OS X under gcc 4.0.1 when PY_FORMAT_SIZE_T is set to "" instead of "z" as is
  needed.
........
  r45963 | neal.norwitz | 2006-05-11 09:51:59 +0200 (Thu, 11 May 2006) | 1 line

  Don't mask a no memory error with a less meaningful one as discussed on python-checkins
........
  r45964 | martin.v.loewis | 2006-05-11 15:28:43 +0200 (Thu, 11 May 2006) | 3 lines

  Change WindowsError to carry the Win32 error code in winerror,
  and the DOS error code in errno. Revert changes where
  WindowsError catch blocks unnecessarily special-case OSError.
........
  r45965 | george.yoshida | 2006-05-11 17:53:27 +0200 (Thu, 11 May 2006) | 2 lines

  Grammar fix
........
  r45967 | andrew.kuchling | 2006-05-11 18:32:24 +0200 (Thu, 11 May 2006) | 1 line

  typo fix
........
  r45968 | tim.peters | 2006-05-11 18:37:42 +0200 (Thu, 11 May 2006) | 5 lines

  BaseThreadedTestCase.setup():  stop special-casing WindowsError.

  Rev 45964 fiddled with WindowsError, and broke test_bsddb3 on all
  the Windows buildbot slaves as a result.  This should repair it.
........
  r45969 | georg.brandl | 2006-05-11 21:57:09 +0200 (Thu, 11 May 2006) | 2 lines

  Typo fix.
........
  r45970 | tim.peters | 2006-05-12 03:57:59 +0200 (Fri, 12 May 2006) | 5 lines

  SF patch #1473132:  Improve docs for tp_clear and tp_traverse,
  by Collin Winter.

  Bugfix candidate (but I'm not going to bother).
........
  r45974 | martin.v.loewis | 2006-05-12 14:27:28 +0200 (Fri, 12 May 2006) | 4 lines

  Dynamically allocate path name buffer for Unicode
  path name in listdir. Fixes #1431582.
  Stop overallocating MAX_PATH characters for ANSI
  path names. Stop assigning to errno.
........
  r45975 | martin.v.loewis | 2006-05-12 15:57:36 +0200 (Fri, 12 May 2006) | 1 line

  Move icon files into DLLs dir. Fixes #1477968.
........
  r45976 | george.yoshida | 2006-05-12 18:40:11 +0200 (Fri, 12 May 2006) | 2 lines

  At first there were 6 steps, but one was removed after that.
........
  r45977 | martin.v.loewis | 2006-05-12 19:22:04 +0200 (Fri, 12 May 2006) | 1 line

  Fix alignment error on Itanium.
........
  r45978 | george.yoshida | 2006-05-12 19:25:26 +0200 (Fri, 12 May 2006) | 3 lines

  Duplicated description about the illegal continue usage can be found in nearly the same place.
  They are same, so keep the original one and remove the later-added one.
........
  r45980 | thomas.heller | 2006-05-12 20:16:03 +0200 (Fri, 12 May 2006) | 2 lines

  Add missing svn properties.
........
  r45981 | thomas.heller | 2006-05-12 20:47:35 +0200 (Fri, 12 May 2006) | 1 line

  set svn properties
........
  r45982 | thomas.heller | 2006-05-12 21:31:46 +0200 (Fri, 12 May 2006) | 1 line

  add svn:eol-style native svn:keywords Id
........
  r45987 | gerhard.haering | 2006-05-13 01:49:49 +0200 (Sat, 13 May 2006) | 3 lines

  Integrated the rest of the pysqlite reference manual into the Python
  documentation. Ready to be reviewed and improved upon.
........
  r45988 | george.yoshida | 2006-05-13 08:53:31 +0200 (Sat, 13 May 2006) | 2 lines

  Add \exception markup
........
  r45990 | martin.v.loewis | 2006-05-13 15:34:04 +0200 (Sat, 13 May 2006) | 2 lines

  Revert 43315: Printing of %zd must be signed.
........
  r45992 | tim.peters | 2006-05-14 01:28:20 +0200 (Sun, 14 May 2006) | 11 lines

  Teach PyString_FromFormat, PyErr_Format, and PyString_FromFormatV
  about "%u", "%lu" and "%zu" formats.

  Since PyString_FromFormat and PyErr_Format have exactly the same rules
  (both inherited from PyString_FromFormatV), it would be good if someone
  with more LaTeX Fu changed one of them to just point to the other.
  Their docs were way out of synch before this patch, and I just did a
  mass copy+paste to repair that.

  Not a backport candidate (this is a new feature).
........
  r45993 | tim.peters | 2006-05-14 01:31:05 +0200 (Sun, 14 May 2006) | 2 lines

  Typo repair.
........
  r45994 | tim.peters | 2006-05-14 01:33:19 +0200 (Sun, 14 May 2006) | 2 lines

  Remove lie in new comment.
........
  r45995 | ronald.oussoren | 2006-05-14 21:56:34 +0200 (Sun, 14 May 2006) | 11 lines

  Rework the build system for osx applications:

  * Don't use xcodebuild for building PythonLauncher, but use a normal unix
    makefile. This makes it a lot easier to use the same build flags as for the
    rest of python (e.g. make a universal version of python launcher)
  * Convert the mac makefile-s to makefile.in-s and use configure to set makefile
    variables instead of forwarding them as command-line arguments
  * Add a C version of pythonw, that we you can use '#!/usr/local/bin/pythonw'
  * Build IDLE.app using bundlebuilder instead of BuildApplet, that will allow
    easier modification of the bundle contents later on.
........
  r45996 | ronald.oussoren | 2006-05-14 22:35:41 +0200 (Sun, 14 May 2006) | 6 lines

  A first cut at replacing the icons on MacOS X. This replaces all icons by icons
  based on the new python.org logo. These are also the first icons that are
  "proper" OSX icons.

  These icons were created by Jacob Rus.
........
  r45997 | ronald.oussoren | 2006-05-14 23:07:41 +0200 (Sun, 14 May 2006) | 3 lines

  I missed one small detail in my rewrite of the osx build files: the path
  to the Python.app template.
........
  r45998 | martin.v.loewis | 2006-05-15 07:51:36 +0200 (Mon, 15 May 2006) | 2 lines

  Fix memory leak.
........
  r45999 | neal.norwitz | 2006-05-15 08:48:14 +0200 (Mon, 15 May 2006) | 1 line

  Move items implemented after a2 into the new a3 section
........
  r46000 | neal.norwitz | 2006-05-15 09:04:36 +0200 (Mon, 15 May 2006) | 5 lines

  - Bug #1487966: Fix SystemError with conditional expression in assignment

  Most of the test_syntax changes are just updating the numbers.
........
  r46001 | neal.norwitz | 2006-05-15 09:17:23 +0200 (Mon, 15 May 2006) | 1 line

  Patch #1488312, Fix memory alignment problem on SPARC in unicode.  Will backport
........
  r46003 | martin.v.loewis | 2006-05-15 11:22:27 +0200 (Mon, 15 May 2006) | 3 lines

  Remove bogus DECREF of self.
  Change __str__() functions to METH_O.
  Change WindowsError__str__ to use PyTuple_Pack.
........
  r46005 | georg.brandl | 2006-05-15 21:30:35 +0200 (Mon, 15 May 2006) | 3 lines

  [ 1488881 ] tarfile.py: support for file-objects and bz2 (cp. #1488634)
........
  r46007 | tim.peters | 2006-05-15 22:44:10 +0200 (Mon, 15 May 2006) | 9 lines

  ReadDetectFileobjTest:  repair Windows disasters by opening
  the file object in binary mode.

  The Windows buildbot slaves shouldn't swap themselves to death
  anymore.  However, test_tarfile may still fail because of a
  temp directory left behind from a previous failing run.
  Windows buildbot owners may need to remove that directory
  by hand.
........
  r46009 | tim.peters | 2006-05-15 23:32:25 +0200 (Mon, 15 May 2006) | 3 lines

  test_directory():  Remove the leftover temp directory that's making
  the Windows buildbots fail test_tarfile.
........
  r46010 | martin.v.loewis | 2006-05-16 09:05:37 +0200 (Tue, 16 May 2006) | 4 lines

  - Test for sys/statvfs.h before including it, as statvfs is present
    on some OSX installation, but its header file is not.
  Will backport to 2.4
........
  r46012 | georg.brandl | 2006-05-16 09:38:27 +0200 (Tue, 16 May 2006) | 3 lines

  Patch #1435422: zlib's compress and decompress objects now have a
  copy() method.
........
  r46015 | andrew.kuchling | 2006-05-16 18:11:54 +0200 (Tue, 16 May 2006) | 1 line

  Add item
........
  r46016 | andrew.kuchling | 2006-05-16 18:27:31 +0200 (Tue, 16 May 2006) | 3 lines

  PEP 243 has been withdrawn, so don't refer to it any more.
  The PyPI upload material has been moved into the section on PEP314.
........
  r46017 | george.yoshida | 2006-05-16 19:42:16 +0200 (Tue, 16 May 2006) | 2 lines

  Update for 'ImportWarning'
........
  r46018 | george.yoshida | 2006-05-16 20:07:00 +0200 (Tue, 16 May 2006) | 4 lines

  Mention that Exception is now a subclass of BaseException.
  Remove a sentence that says that BaseException inherits from BaseException.
  (I guess this is just a copy & paste mistake.)
........
  r46019 | george.yoshida | 2006-05-16 20:26:10 +0200 (Tue, 16 May 2006) | 2 lines

  Document ImportWarning
........
  r46020 | tim.peters | 2006-05-17 01:22:20 +0200 (Wed, 17 May 2006) | 2 lines

  Whitespace normalization.
........
  r46021 | tim.peters | 2006-05-17 01:24:08 +0200 (Wed, 17 May 2006) | 2 lines

  Text files missing the SVN eol-style property.
........
  r46022 | tim.peters | 2006-05-17 03:30:11 +0200 (Wed, 17 May 2006) | 2 lines

  PyZlib_copy(), PyZlib_uncopy():  Repair leaks on the normal-case path.
........
  r46023 | georg.brandl | 2006-05-17 16:06:07 +0200 (Wed, 17 May 2006) | 3 lines

  Remove misleading comment about type-class unification.
........
  r46024 | georg.brandl | 2006-05-17 16:11:36 +0200 (Wed, 17 May 2006) | 3 lines

  Apply patch #1489784 from Michael Foord.
........
  r46025 | georg.brandl | 2006-05-17 16:18:20 +0200 (Wed, 17 May 2006) | 3 lines

  Fix typo in os.utime docstring (patch #1490189)
........
  r46026 | georg.brandl | 2006-05-17 16:26:50 +0200 (Wed, 17 May 2006) | 3 lines

  Patch #1490224: set time.altzone correctly on Cygwin.
........
  r46027 | georg.brandl | 2006-05-17 16:45:06 +0200 (Wed, 17 May 2006) | 4 lines

  Add global debug flag to cookielib to avoid heavy dependency on the logging module.
  Resolves #1484758.
........
  r46028 | georg.brandl | 2006-05-17 16:56:04 +0200 (Wed, 17 May 2006) | 3 lines

  Patch #1486962: Several bugs in the turtle Tk demo module were fixed
  and several features added, such as speed and geometry control.
........
  r46029 | georg.brandl | 2006-05-17 17:17:00 +0200 (Wed, 17 May 2006) | 4 lines

  Delay-import some large modules to speed up urllib2 import.
  (fixes #1484793).
........
  r46030 | georg.brandl | 2006-05-17 17:51:16 +0200 (Wed, 17 May 2006) | 3 lines

  Patch #1180296: improve locale string formatting functions
........
  r46032 | tim.peters | 2006-05-18 04:06:40 +0200 (Thu, 18 May 2006) | 2 lines

  Whitespace normalization.
........
  r46033 | georg.brandl | 2006-05-18 08:11:19 +0200 (Thu, 18 May 2006) | 3 lines

  Amendments to patch #1484695.
........
  r46034 | georg.brandl | 2006-05-18 08:18:06 +0200 (Thu, 18 May 2006) | 3 lines

  Remove unused import.
........
  r46035 | georg.brandl | 2006-05-18 08:33:27 +0200 (Thu, 18 May 2006) | 3 lines

  Fix test_locale for platforms without a default thousands separator.
........
  r46036 | neal.norwitz | 2006-05-18 08:51:46 +0200 (Thu, 18 May 2006) | 1 line

  Little cleanup
........
  r46037 | georg.brandl | 2006-05-18 09:01:27 +0200 (Thu, 18 May 2006) | 4 lines

  Bug #1462152: file() now checks more thoroughly for invalid mode
  strings and removes a possible "U" before passing the mode to the
  C library function.
........
  r46038 | georg.brandl | 2006-05-18 09:20:05 +0200 (Thu, 18 May 2006) | 3 lines

  Bug #1490688: properly document %e, %f, %g format subtleties.
........
  r46039 | vinay.sajip | 2006-05-18 09:28:58 +0200 (Thu, 18 May 2006) | 1 line

  Changed status from "beta" to "production"; since logging has been part of the stdlib since 2.3, it should be safe to make this assertion ;-)
........
  r46040 | ronald.oussoren | 2006-05-18 11:04:15 +0200 (Thu, 18 May 2006) | 2 lines

  Fix some minor issues with the generated application bundles on MacOSX
........
  r46041 | andrew.kuchling | 2006-05-19 02:03:55 +0200 (Fri, 19 May 2006) | 1 line

  Typo fix; add clarifying word
........
  r46044 | neal.norwitz | 2006-05-19 08:31:23 +0200 (Fri, 19 May 2006) | 3 lines

  Fix #132 from Coverity, retval could have been derefed
  if a continue inside a try failed.
........
  r46045 | neal.norwitz | 2006-05-19 08:43:50 +0200 (Fri, 19 May 2006) | 2 lines

  Fix #1474677, non-keyword argument following keyword.
........
  r46046 | neal.norwitz | 2006-05-19 09:00:58 +0200 (Fri, 19 May 2006) | 4 lines

  Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.

  I suppose this could be backported if anyone cares.
........
  r46047 | neal.norwitz | 2006-05-19 09:05:01 +0200 (Fri, 19 May 2006) | 7 lines

  Oops, I forgot to include this file in the last commit (46046):

  Bug/Patch #1481770: Use .so extension for shared libraries on HP-UX for ia64.

  I suppose this could be backported if anyone cares.
........
  r46050 | ronald.oussoren | 2006-05-19 20:17:31 +0200 (Fri, 19 May 2006) | 6 lines

  * Change working directory to the users home
    directory, that makes the file open/save
    dialogs more useable.
  * Don't use argv emulator, its not needed
    for idle.
........
  r46052 | tim.peters | 2006-05-19 21:16:34 +0200 (Fri, 19 May 2006) | 2 lines

  Whitespace normalization.
........
  r46054 | ronald.oussoren | 2006-05-20 08:17:01 +0200 (Sat, 20 May 2006) | 9 lines

  Fix bug #1000914 (again).

  This patches a file that is generated by bgen, however the code is now the
  same as a current copy of bgen would generate.  Without this patch most types
  in the Carbon.CF module are unusable.

  I haven't managed to coax bgen into generating a complete copy of _CFmodule.c
  yet :-(, hence the manual patching.
........
  r46055 | george.yoshida | 2006-05-20 17:36:19 +0200 (Sat, 20 May 2006) | 3 lines

  - markup fix
  - add clarifying words
........
  r46057 | george.yoshida | 2006-05-20 18:29:14 +0200 (Sat, 20 May 2006) | 3 lines

  - Add 'as' and 'with' as new keywords in 2.5.
  - Regenerate keyword lists with reswords.py.
........
  r46058 | george.yoshida | 2006-05-20 20:07:26 +0200 (Sat, 20 May 2006) | 2 lines

  Apply patch #1492147 from Mike Foord.
........
  r46059 | andrew.kuchling | 2006-05-20 21:25:16 +0200 (Sat, 20 May 2006) | 1 line

  Minor edits
........
  r46061 | george.yoshida | 2006-05-21 06:22:59 +0200 (Sun, 21 May 2006) | 2 lines

  Fix the TeX compile error.
........
  r46062 | george.yoshida | 2006-05-21 06:40:32 +0200 (Sun, 21 May 2006) | 2 lines

  Apply patch #1492255 from Mike Foord.
........
  r46063 | martin.v.loewis | 2006-05-22 10:48:14 +0200 (Mon, 22 May 2006) | 1 line

  Patch 1490384: New Icons for the PC build.
........
  r46064 | martin.v.loewis | 2006-05-22 11:15:18 +0200 (Mon, 22 May 2006) | 1 line

  Patch #1492356: Port to Windows CE (patch set 1).
........
  r46065 | tim.peters | 2006-05-22 13:29:41 +0200 (Mon, 22 May 2006) | 4 lines

  Define SIZEOF_{DOUBLE,FLOAT} on Windows.  Else
  Michael Hudson's nice gimmicks for IEEE special
  values (infinities, NaNs) don't work.
........
  r46070 | bob.ippolito | 2006-05-22 16:31:24 +0200 (Mon, 22 May 2006) | 2 lines

  GzipFile.readline performance improvement (~30-40%), patch #1281707
........
  r46071 | bob.ippolito | 2006-05-22 17:22:46 +0200 (Mon, 22 May 2006) | 1 line

  Revert gzip readline performance patch #1281707 until a more generic performance improvement can be found
........
  r46073 | fredrik.lundh | 2006-05-22 17:35:12 +0200 (Mon, 22 May 2006) | 4 lines

  docstring tweaks: count counts non-overlapping substrings, not
  total number of occurences
........
  r46075 | bob.ippolito | 2006-05-22 17:59:12 +0200 (Mon, 22 May 2006) | 1 line

  Apply revised patch for GzipFile.readline performance #1281707
........
  r46076 | fredrik.lundh | 2006-05-22 18:29:30 +0200 (Mon, 22 May 2006) | 3 lines

  needforspeed: speed up unicode repeat, unicode string copy
........
  r46079 | fredrik.lundh | 2006-05-22 19:12:58 +0200 (Mon, 22 May 2006) | 4 lines

  needforspeed: use memcpy for "long" strings; use a better algorithm
  for long repeats.
........
  r46084 | tim.peters | 2006-05-22 21:17:04 +0200 (Mon, 22 May 2006) | 7 lines

  PyUnicode_Join():  Recent code changes introduced new
  compiler warnings on Windows (signed vs unsigned mismatch
  in comparisons).  Cleaned that up by switching more locals
  to Py_ssize_t.  Simplified overflow checking (it can _be_
  simpler because while these things are declared as
  Py_ssize_t, then should in fact never be negative).
........
  r46085 | tim.peters | 2006-05-23 07:47:16 +0200 (Tue, 23 May 2006) | 3 lines

  unicode_repeat():  Change type of local to Py_ssize_t,
  since that's what it should be.
........
  r46094 | fredrik.lundh | 2006-05-23 12:10:57 +0200 (Tue, 23 May 2006) | 3 lines

  needforspeed: check first *and* last character before doing a full memcmp
........
  r46095 | fredrik.lundh | 2006-05-23 12:12:21 +0200 (Tue, 23 May 2006) | 4 lines

  needforspeed: fixed unicode "in" operator to use same implementation
  approach as find/index
........
  r46096 | richard.jones | 2006-05-23 12:37:38 +0200 (Tue, 23 May 2006) | 7 lines

  Merge from rjones-funccall branch.

  Applied patch zombie-frames-2.diff from sf patch 876206 with updates for
  Python 2.5 and also modified to retain the free_list to avoid the 67%
  slow-down in pybench recursion test. 5% speed up in function call pybench.
........
  r46098 | ronald.oussoren | 2006-05-23 13:04:24 +0200 (Tue, 23 May 2006) | 2 lines

  Avoid creating a mess when installing a framework for the second time.
........
  r46101 | georg.brandl | 2006-05-23 13:17:21 +0200 (Tue, 23 May 2006) | 3 lines

  PyErr_NewException now accepts a tuple of base classes as its
  "base" parameter.
........
  r46103 | ronald.oussoren | 2006-05-23 13:47:16 +0200 (Tue, 23 May 2006) | 3 lines

  Disable linking extensions with -lpython2.5 for darwin. This should fix bug
  #1487105.
........
  r46104 | ronald.oussoren | 2006-05-23 14:01:11 +0200 (Tue, 23 May 2006) | 6 lines

  Patch #1488098.

  This patchs makes it possible to create a universal build on OSX 10.4 and use
  the result to build extensions on 10.3. It also makes it possible to override
  the '-arch' and '-isysroot' compiler arguments for specific extensions.
........
  r46108 | andrew.kuchling | 2006-05-23 14:44:36 +0200 (Tue, 23 May 2006) | 1 line

  Add some items; mention the sprint
........
  r46109 | andrew.kuchling | 2006-05-23 14:47:01 +0200 (Tue, 23 May 2006) | 1 line

  Mention string improvements
........
  r46110 | andrew.kuchling | 2006-05-23 14:49:35 +0200 (Tue, 23 May 2006) | 4 lines

  Use 'speed' instead of 'performance', because I agree with the argument
  at http://zestyping.livejournal.com/193260.html that 'erformance' really means
  something more general.
........
  r46113 | ronald.oussoren | 2006-05-23 17:09:57 +0200 (Tue, 23 May 2006) | 2 lines

  An improved script for building the binary distribution on MacOSX.
........
  r46128 | richard.jones | 2006-05-23 20:28:17 +0200 (Tue, 23 May 2006) | 3 lines

  Applied patch 1337051 by Neal Norwitz, saving 4 ints on frame objects.
........
  r46129 | richard.jones | 2006-05-23 20:32:11 +0200 (Tue, 23 May 2006) | 1 line

  fix broken merge
........
  r46130 | bob.ippolito | 2006-05-23 20:41:17 +0200 (Tue, 23 May 2006) | 1 line

  Update Misc/NEWS for gzip patch #1281707
........
  r46131 | bob.ippolito | 2006-05-23 20:43:47 +0200 (Tue, 23 May 2006) | 1 line

  Update Misc/NEWS for gzip patch #1281707
........
  r46132 | fredrik.lundh | 2006-05-23 20:44:25 +0200 (Tue, 23 May 2006) | 7 lines

  needforspeed: use append+reverse for rsplit, use "bloom filters" to
  speed up splitlines and strip with charsets; etc.  rsplit is now as
  fast as split in all our tests (reverse takes no time at all), and
  splitlines() is nearly as fast as a plain split("\n") in our tests.
  and we're not done yet... ;-)
........
  r46133 | tim.peters | 2006-05-23 20:45:30 +0200 (Tue, 23 May 2006) | 38 lines

  Bug #1334662 / patch #1335972:  int(string, base) wrong answers.

  In rare cases of strings specifying true values near sys.maxint,
  and oddball bases (not decimal or a power of 2), int(string, base)
  could deliver insane answers.  This repairs all such problems, and
  also speeds string->int significantly.  On my box, here are %
  speedups for decimal strings of various lengths:

  length speedup
  ------ -------
   1       12.4%
   2       15.7%
   3       20.6%
   4       28.1%
   5       33.2%
   6       37.5%
   7       41.9%
   8       46.3%
   9       51.2%
  10       19.5%
  11       19.9%
  12       23.9%
  13       23.7%
  14       23.3%
  15       24.9%
  16       25.3%
  17       28.3%
  18       27.9%
  19       35.7%

  Note that the difference between 9 and 10 is the difference between
  short and long Python ints on a 32-bit box.  The patch doesn't
  actually do anything to speed conversion to long:  the speedup is
  due to detecting "unsigned long" overflow more quickly.

  This is a bugfix candidate, but it's a non-trivial patch and it
  would be painful to separate the "bug fix" from the "speed up" parts.
........
  r46134 | bob.ippolito | 2006-05-23 20:46:41 +0200 (Tue, 23 May 2006) | 1 line

  Patch #1493701: performance enhancements for struct module.
........
  r46136 | andrew.kuchling | 2006-05-23 21:00:45 +0200 (Tue, 23 May 2006) | 1 line

  Remove duplicate item
........
  r46141 | bob.ippolito | 2006-05-23 21:09:51 +0200 (Tue, 23 May 2006) | 1 line

  revert #1493701
........
  r46142 | bob.ippolito | 2006-05-23 21:11:34 +0200 (Tue, 23 May 2006) | 1 line

  patch #1493701: performance enhancements for struct module
........
  r46144 | bob.ippolito | 2006-05-23 21:12:41 +0200 (Tue, 23 May 2006) | 1 line

  patch #1493701: performance enhancements for struct module
........
  r46148 | bob.ippolito | 2006-05-23 21:25:52 +0200 (Tue, 23 May 2006) | 1 line

  fix linking issue, warnings, in struct
........
  r46149 | andrew.kuchling | 2006-05-23 21:29:38 +0200 (Tue, 23 May 2006) | 1 line

  Add two items
........
  r46150 | bob.ippolito | 2006-05-23 21:31:23 +0200 (Tue, 23 May 2006) | 1 line

  forward declaration for PyStructType
........
  r46151 | bob.ippolito | 2006-05-23 21:32:25 +0200 (Tue, 23 May 2006) | 1 line

  fix typo in _struct
........
  r46152 | andrew.kuchling | 2006-05-23 21:32:35 +0200 (Tue, 23 May 2006) | 1 line

  Add item
........
  r46153 | tim.peters | 2006-05-23 21:34:37 +0200 (Tue, 23 May 2006) | 3 lines

  Get the Windows build working again (recover from
  `struct` module changes).
........
  r46155 | fredrik.lundh | 2006-05-23 21:47:35 +0200 (Tue, 23 May 2006) | 3 lines

  return 0 on misses, not -1.
........
  r46156 | tim.peters | 2006-05-23 23:51:35 +0200 (Tue, 23 May 2006) | 4 lines

  test_struct grew weird behavior under regrtest.py -R,
  due to a module-level cache.  Clearing the cache should
  make it stop showing up in refleak reports.
........
  r46157 | tim.peters | 2006-05-23 23:54:23 +0200 (Tue, 23 May 2006) | 2 lines

  Whitespace normalization.
........
  r46158 | tim.peters | 2006-05-23 23:55:53 +0200 (Tue, 23 May 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r46161 | fredrik.lundh | 2006-05-24 12:20:36 +0200 (Wed, 24 May 2006) | 3 lines

  use Py_ssize_t for string indexes (thanks, neal!)
........
  r46173 | fredrik.lundh | 2006-05-24 16:28:11 +0200 (Wed, 24 May 2006) | 14 lines

  needforspeed: use "fastsearch" for count and findstring helpers.  this
  results in a 2.5x speedup on the stringbench count tests, and a 20x (!)
  speedup on the stringbench search/find/contains test, compared to 2.5a2.

  for more on the algorithm, see:

      http://effbot.org/zone/stringlib.htm

  if you get weird results, you can disable the new algoritm by undefining
  USE_FAST in Objects/unicodeobject.c.

  enjoy /F
........
  r46182 | fredrik.lundh | 2006-05-24 17:11:01 +0200 (Wed, 24 May 2006) | 3 lines

  needforspeedindeed: use fastsearch also for __contains__
........
  r46184 | bob.ippolito | 2006-05-24 17:32:06 +0200 (Wed, 24 May 2006) | 1 line

  refactor unpack, add unpack_from
........
  r46189 | fredrik.lundh | 2006-05-24 18:35:18 +0200 (Wed, 24 May 2006) | 4 lines

  needforspeed: refactored the replace code slightly; special-case
  constant-length changes; use fastsearch to locate the first match.
........
  r46198 | andrew.dalke | 2006-05-24 20:55:37 +0200 (Wed, 24 May 2006) | 10 lines

  Added a slew of test for string replace, based various corner cases from
  the Need For Speed sprint coding.  Includes commented out overflow tests
  which will be uncommented once the code is fixed.

  This test will break the 8-bit string tests because
      "".replace("", "A") == "" when it should == "A"

  We have a fix for it, which should be added tomorrow.
........
  r46200 | tim.peters | 2006-05-24 22:27:18 +0200 (Wed, 24 May 2006) | 2 lines

  We can't leave the checked-in tests broken.
........
  r46201 | tim.peters | 2006-05-24 22:29:44 +0200 (Wed, 24 May 2006) | 2 lines

  Whitespace normalization.
........
  r46202 | tim.peters | 2006-05-24 23:00:45 +0200 (Wed, 24 May 2006) | 4 lines

  Disable the damn empty-string replace test -- it can't
  be make to pass now for unicode if it passes for str, or
  vice versa.
........
  r46203 | tim.peters | 2006-05-24 23:10:40 +0200 (Wed, 24 May 2006) | 58 lines

  Heavily fiddled variant of patch #1442927: PyLong_FromString optimization.

  ``long(str, base)`` is now up to 6x faster for non-power-of-2 bases.  The
  largest speedup is for inputs with about 1000 decimal digits.  Conversion
  from non-power-of-2 bases remains quadratic-time in the number of input
  digits (it was and remains linear-time for bases 2, 4, 8, 16 and 32).

  Speedups at various lengths for decimal inputs, comparing 2.4.3 with
  current trunk.  Note that it's actually a bit slower for 1-digit strings:

    len  speedup
   ----  -------
     1     -4.5%
     2      4.6%
     3      8.3%
     4     12.7%
     5     16.9%
     6     28.6%
     7     35.5%
     8     44.3%
     9     46.6%
    10     55.3%
    11     65.7%
    12     77.7%
    13     73.4%
    14     75.3%
    15     85.2%
    16    103.0%
    17     95.1%
    18    112.8%
    19    117.9%
    20    128.3%
    30    174.5%
    40    209.3%
    50    236.3%
    60    254.3%
    70    262.9%
    80    295.8%
    90    297.3%
   100    324.5%
   200    374.6%
   300    403.1%
   400    391.1%
   500    388.7%
   600    440.6%
   700    468.7%
   800    498.0%
   900    507.2%
  1000    501.2%
  2000    450.2%
  3000    463.2%
  4000    452.5%
  5000    440.6%
  6000    439.6%
  7000    424.8%
  8000    418.1%
  9000    417.7%
........
  r46204 | andrew.kuchling | 2006-05-25 02:23:03 +0200 (Thu, 25 May 2006) | 1 line

  Minor edits; add an item
........
  r46205 | fred.drake | 2006-05-25 04:42:25 +0200 (Thu, 25 May 2006) | 3 lines

  fix broken links in PDF
  (SF patch #1281291, contributed by Rory Yorke)
........
  r46208 | walter.doerwald | 2006-05-25 10:53:28 +0200 (Thu, 25 May 2006) | 2 lines

  Replace tab inside comment with space.
........
  r46209 | thomas.wouters | 2006-05-25 13:25:51 +0200 (Thu, 25 May 2006) | 4 lines


  Fix #1488915, Multiple dots in relative import statement raise SyntaxError.

........
  r46210 | thomas.wouters | 2006-05-25 13:26:25 +0200 (Thu, 25 May 2006) | 5 lines


  Update graminit.c for the fix for #1488915, Multiple dots in relative import
  statement raise SyntaxError, and add testcase.
........
  r46211 | andrew.kuchling | 2006-05-25 14:27:59 +0200 (Thu, 25 May 2006) | 1 line

  Add entry; and fix a typo
........
  r46214 | fredrik.lundh | 2006-05-25 17:22:03 +0200 (Thu, 25 May 2006) | 7 lines

  needforspeed: speed up upper and lower for 8-bit string objects.
  (the unicode versions of these are still 2x faster on windows,
  though...)

  based on work by Andrew Dalke, with tweaks by yours truly.
........
  r46216 | fredrik.lundh | 2006-05-25 17:49:45 +0200 (Thu, 25 May 2006) | 5 lines

  needforspeed: make new upper/lower work properly for single-character
  strings too... (thanks to georg brandl for spotting the exact problem
  faster than anyone else)
........
  r46217 | kristjan.jonsson | 2006-05-25 17:53:30 +0200 (Thu, 25 May 2006) | 1 line

  Added a new macro, Py_IS_FINITE(X).  On windows there is an intrinsic for this and it is more efficient than to use !Py_IS_INFINITE(X) && !Py_IS_NAN(X).  No change on other platforms
........
  r46219 | fredrik.lundh | 2006-05-25 18:10:12 +0200 (Thu, 25 May 2006) | 4 lines

  needforspeed: _toupper/_tolower is a SUSv2 thing; fall back on ISO C
  versions if they're not defined.
........
  r46220 | andrew.kuchling | 2006-05-25 18:23:15 +0200 (Thu, 25 May 2006) | 1 line

  Fix comment typos
........
  r46221 | andrew.dalke | 2006-05-25 18:30:52 +0200 (Thu, 25 May 2006) | 2 lines

  Added tests for implementation error we came up with in the need for speed sprint.
........
  r46222 | andrew.kuchling | 2006-05-25 18:34:54 +0200 (Thu, 25 May 2006) | 1 line

  Fix another typo
........
  r46223 | kristjan.jonsson | 2006-05-25 18:39:27 +0200 (Thu, 25 May 2006) | 1 line

  Fix incorrect documentation for the Py_IS_FINITE(X) macro.
........
  r46224 | fredrik.lundh | 2006-05-25 18:46:54 +0200 (Thu, 25 May 2006) | 3 lines

  needforspeed: check for overflow in replace (from Andrew Dalke)
........
  r46226 | fredrik.lundh | 2006-05-25 19:08:14 +0200 (Thu, 25 May 2006) | 5 lines

  needforspeed: new replace implementation by Andrew Dalke.  replace is
  now about 3x faster on my machine, for the replace tests from string-
  bench.
........
  r46227 | tim.peters | 2006-05-25 19:34:03 +0200 (Thu, 25 May 2006) | 5 lines

  A new table to help string->integer conversion was added yesterday to
  both mystrtoul.c and longobject.c.  Share the table instead.  Also
  cut its size by 64 entries (they had been used for an inscrutable
  trick originally, but the code no longer tries to use that trick).
........
  r46229 | andrew.dalke | 2006-05-25 19:53:00 +0200 (Thu, 25 May 2006) | 11 lines

  Fixed problem identified by Georg.  The special-case in-place code for replace
  made a copy of the string using PyString_FromStringAndSize(s, n) and modify
  the copied string in-place.  However, 1 (and 0) character strings are shared
  from a cache.  This cause "A".replace("A", "a") to change the cached version
  of "A" -- used by everyone.

  Now may the copy with NULL as the string and do the memcpy manually.  I've
  added regression tests to check if this happens in the future.  Perhaps
  there should be a PyString_Copy for this case?
........
  r46230 | fredrik.lundh | 2006-05-25 19:55:31 +0200 (Thu, 25 May 2006) | 4 lines

  needforspeed: use "fastsearch" for count.  this results in a 3x speedup
  for the related stringbench tests.
........
  r46231 | andrew.dalke | 2006-05-25 20:03:25 +0200 (Thu, 25 May 2006) | 4 lines

  Code had returned an ssize_t, upcast to long, then converted with PyInt_FromLong.
  Now using PyInt_FromSsize_t.
........
  r46233 | andrew.kuchling | 2006-05-25 20:11:16 +0200 (Thu, 25 May 2006) | 1 line

  Comment typo
........
  r46234 | andrew.dalke | 2006-05-25 20:18:39 +0200 (Thu, 25 May 2006) | 4 lines

  Added overflow test for adding two (very) large strings where the
  new string is over max Py_ssize_t.  I have no way to test it on my
  box or any box I have access to.  At least it doesn't break anything.
........
  r46235 | bob.ippolito | 2006-05-25 20:20:23 +0200 (Thu, 25 May 2006) | 1 line

  Faster path for PyLong_FromLongLong, using PyLong_FromLong algorithm
........
  r46238 | georg.brandl | 2006-05-25 20:44:09 +0200 (Thu, 25 May 2006) | 3 lines

  Guard the _active.remove() call to avoid errors when there is no _active list.
........
  r46239 | fredrik.lundh | 2006-05-25 20:44:29 +0200 (Thu, 25 May 2006) | 4 lines

  needforspeed: use fastsearch also for find/index and contains.  the
  related tests are now about 10x faster.
........
  r46240 | bob.ippolito | 2006-05-25 20:44:50 +0200 (Thu, 25 May 2006) | 1 line

  Struct now unpacks to PY_LONG_LONG directly when possible, also include #ifdef'ed out code that will return int instead of long when in bounds (not active since it's an API and doc change)
........
  r46241 | jack.diederich | 2006-05-25 20:47:15 +0200 (Thu, 25 May 2006) | 1 line

  * eliminate warning by reverting tmp_s type to 'const char*'
........
  r46242 | bob.ippolito | 2006-05-25 21:03:19 +0200 (Thu, 25 May 2006) | 1 line

  Fix Cygwin compiler issue
........
  r46243 | bob.ippolito | 2006-05-25 21:15:27 +0200 (Thu, 25 May 2006) | 1 line

  fix a struct regression where long would be returned for short unsigned integers
........
  r46244 | georg.brandl | 2006-05-25 21:15:31 +0200 (Thu, 25 May 2006) | 4 lines

  Replace PyObject_CallFunction calls with only object args
  with PyObject_CallFunctionObjArgs, which is 30% faster.
........
  r46245 | fredrik.lundh | 2006-05-25 21:19:05 +0200 (Thu, 25 May 2006) | 3 lines

  needforspeed: use insert+reverse instead of append
........
  r46246 | bob.ippolito | 2006-05-25 21:33:38 +0200 (Thu, 25 May 2006) | 1 line

  Use LONG_MIN and LONG_MAX to check Python integer bounds instead of the incorrect INT_MIN and INT_MAX
........
  r46248 | bob.ippolito | 2006-05-25 21:56:56 +0200 (Thu, 25 May 2006) | 1 line

  Use faster struct pack/unpack functions for the endian table that matches the host's
........
  r46249 | bob.ippolito | 2006-05-25 21:59:56 +0200 (Thu, 25 May 2006) | 1 line

  enable darwin/x86 support for libffi and hence ctypes (doesn't yet support --enable-universalsdk)
........
  r46252 | georg.brandl | 2006-05-25 22:28:10 +0200 (Thu, 25 May 2006) | 4 lines

  Someone seems to just have copy-pasted the docs of
  tp_compare to tp_richcompare ;)
........
  r46253 | brett.cannon | 2006-05-25 22:44:08 +0200 (Thu, 25 May 2006) | 2 lines

  Swap out bare malloc()/free() use for PyMem_MALLOC()/PyMem_FREE() .
........
  r46254 | bob.ippolito | 2006-05-25 22:52:38 +0200 (Thu, 25 May 2006) | 1 line

  squelch gcc4 darwin/x86 compiler warnings
........
  r46255 | bob.ippolito | 2006-05-25 23:09:45 +0200 (Thu, 25 May 2006) | 1 line

  fix test_float regression and 64-bit size mismatch issue
........
  r46256 | georg.brandl | 2006-05-25 23:11:56 +0200 (Thu, 25 May 2006) | 3 lines

  Add a x-ref to newer calling APIs.
........
  r46257 | ronald.oussoren | 2006-05-25 23:30:54 +0200 (Thu, 25 May 2006) | 2 lines

  Fix minor typo in prep_cif.c
........
  r46259 | brett.cannon | 2006-05-25 23:33:11 +0200 (Thu, 25 May 2006) | 4 lines

  Change test_values so that it compares the lowercasing of group names since getgrall() can return all lowercase names while getgrgid() returns proper casing.

  Discovered on Ubuntu 5.04 (custom).
........
  r46261 | tim.peters | 2006-05-25 23:50:17 +0200 (Thu, 25 May 2006) | 7 lines

  Some Win64 pre-release in 2000 didn't support
  QueryPerformanceCounter(), but we believe Win64 does
  support it now.  So use in time.clock().

  It would be peachy if someone with a Win64 box tried
  this ;-)
........
  r46262 | tim.peters | 2006-05-25 23:52:19 +0200 (Thu, 25 May 2006) | 2 lines

  Whitespace normalization.
........
  r46263 | bob.ippolito | 2006-05-25 23:58:05 +0200 (Thu, 25 May 2006) | 1 line

  Add missing files from x86 darwin ctypes patch
........
  r46264 | brett.cannon | 2006-05-26 00:00:14 +0200 (Fri, 26 May 2006) | 2 lines

  Move over to use of METH_O and METH_NOARGS.
........
  r46265 | tim.peters | 2006-05-26 00:25:25 +0200 (Fri, 26 May 2006) | 3 lines

  Repair idiot typo, and complete the job of trying to
  use the Windows time.clock() implementation on Win64.
........
  r46266 | tim.peters | 2006-05-26 00:28:46 +0200 (Fri, 26 May 2006) | 9 lines

  Patch #1494387: SVN longobject.c compiler warnings

  The SIGCHECK macro defined here has always been bizarre, but
  it apparently causes compiler warnings on "Sun Studio 11".
  I believe the warnings are bogus, but it doesn't hurt to make
  the macro definition saner.

  Bugfix candidate (but I'm not going to bother).
........
  r46268 | fredrik.lundh | 2006-05-26 01:27:53 +0200 (Fri, 26 May 2006) | 8 lines

  needforspeed: partition for 8-bit strings.  for some simple tests,
  this is on par with a corresponding find, and nearly twice as fast
  as split(sep, 1)

  full tests, a unicode version, and documentation will follow to-
  morrow.
........
  r46271 | andrew.kuchling | 2006-05-26 03:46:22 +0200 (Fri, 26 May 2006) | 1 line

  Add Soc student
........
  r46272 | ronald.oussoren | 2006-05-26 10:41:25 +0200 (Fri, 26 May 2006) | 3 lines

  Without this patch OSX users couldn't add new help sources because the code
  tried to update one item in a tuple.
........
  r46273 | fredrik.lundh | 2006-05-26 10:54:28 +0200 (Fri, 26 May 2006) | 5 lines

  needforspeed: partition implementation, part two.

  feel free to improve the documentation and the docstrings.
........
  r46274 | georg.brandl | 2006-05-26 11:05:54 +0200 (Fri, 26 May 2006) | 3 lines

  Clarify docs for str.partition().
........
  r46278 | fredrik.lundh | 2006-05-26 11:46:59 +0200 (Fri, 26 May 2006) | 5 lines

  needforspeed: use METH_O for argument handling, which made partition some
  ~15% faster for the current tests (which is noticable faster than a corre-
  sponding find call).  thanks to neal-who-never-sleeps for the tip.
........
  r46280 | fredrik.lundh | 2006-05-26 12:27:17 +0200 (Fri, 26 May 2006) | 5 lines

  needforspeed: use Py_ssize_t for the fastsearch counter and skip
  length (thanks, neal!).  and yes, I've verified that this doesn't
  slow things down ;-)
........
  r46285 | andrew.dalke | 2006-05-26 13:11:38 +0200 (Fri, 26 May 2006) | 2 lines

  Added a few more test cases for whitespace split.  These strings have leading whitespace.
........
  r46286 | jack.diederich | 2006-05-26 13:15:17 +0200 (Fri, 26 May 2006) | 1 line

  use Py_ssize_t in places that may need it
........
  r46287 | andrew.dalke | 2006-05-26 13:15:22 +0200 (Fri, 26 May 2006) | 2 lines

  Added split whitespace checks for characters other than space.
........
  r46288 | ronald.oussoren | 2006-05-26 13:17:55 +0200 (Fri, 26 May 2006) | 2 lines

  Fix buglet in postinstall script, it would generate an invalid .cshrc file.
........
  r46290 | georg.brandl | 2006-05-26 13:26:11 +0200 (Fri, 26 May 2006) | 3 lines

  Add "partition" to UserString.
........
  r46291 | fredrik.lundh | 2006-05-26 13:29:39 +0200 (Fri, 26 May 2006) | 5 lines

  needforspeed: added Py_LOCAL macro, based on the LOCAL macro used
  for SRE and others.  applied Py_LOCAL to relevant portion of ceval,
  which gives a 1-2% speedup on my machine.  ymmv.
........
  r46292 | jack.diederich | 2006-05-26 13:37:20 +0200 (Fri, 26 May 2006) | 1 line

  when generating python code prefer to generate valid python code
........
  r46293 | fredrik.lundh | 2006-05-26 13:38:15 +0200 (Fri, 26 May 2006) | 3 lines

  use Py_LOCAL also for string and unicode objects
........
  r46294 | ronald.oussoren | 2006-05-26 13:38:39 +0200 (Fri, 26 May 2006) | 12 lines

  - Search the sqlite specific search directories
    after the normal include directories when looking
    for the version of sqlite to use.
  - On OSX:
    * Extract additional include and link directories
      from the CFLAGS and LDFLAGS, if the user has
      bothered to specify them we might as wel use them.
    * Add '-Wl,-search_paths_first' to the extra_link_args
      for readline and sqlite. This makes it possible to
      use a static library to override the system provided
      dynamic library.
........
  r46295 | ronald.oussoren | 2006-05-26 13:43:26 +0200 (Fri, 26 May 2006) | 6 lines

  Integrate installing a framework in the 'make install'
  target. Until now users had to use 'make frameworkinstall'
  to install python when it is configured with '--enable-framework'.
  This tends to confuse users that don't hunt for readme files
  hidden in platform specific directories :-)
........
  r46297 | fredrik.lundh | 2006-05-26 13:54:04 +0200 (Fri, 26 May 2006) | 4 lines

  needforspeed: added PY_LOCAL_AGGRESSIVE macro to enable "aggressive"
  LOCAL inlining; also added some missing whitespace
........
  r46298 | andrew.kuchling | 2006-05-26 14:01:44 +0200 (Fri, 26 May 2006) | 1 line

  Typo fixes
........
  r46299 | fredrik.lundh | 2006-05-26 14:01:49 +0200 (Fri, 26 May 2006) | 4 lines

  Py_LOCAL shouldn't be used for data; it works for some .NET 2003 compilers,
  but Trent's copy thinks that it's an anachronism...
........
  r46300 | martin.blais | 2006-05-26 14:03:27 +0200 (Fri, 26 May 2006) | 12 lines

  Support for buffer protocol for socket and struct.

  * Added socket.recv_buf() and socket.recvfrom_buf() methods, that use the buffer
    protocol (send and sendto already did).

  * Added struct.pack_to(), that is the corresponding buffer compatible method to
    unpack_from().

  * Fixed minor typos in arraymodule.
........
  r46302 | ronald.oussoren | 2006-05-26 14:23:20 +0200 (Fri, 26 May 2006) | 6 lines

  - Remove previous version of the binary distribution script for OSX
  - Some small bugfixes for the IDLE.app wrapper
  - Tweaks to build-installer to ensure that python gets build in the right way,
    including sqlite3.
  - Updated readme files
........
  r46305 | tim.peters | 2006-05-26 14:26:21 +0200 (Fri, 26 May 2006) | 2 lines

  Whitespace normalization.
........
  r46307 | andrew.dalke | 2006-05-26 14:28:15 +0200 (Fri, 26 May 2006) | 7 lines

  I like tests.

  The new split functions use a preallocated list.  Added tests which exceed
  the preallocation size, to exercise list appends/resizes.

  Also added more edge case tests.
........
  r46308 | andrew.dalke | 2006-05-26 14:31:00 +0200 (Fri, 26 May 2006) | 2 lines

  Test cases for off-by-one errors in string split with multicharacter pattern.
........
  r46309 | tim.peters | 2006-05-26 14:31:20 +0200 (Fri, 26 May 2006) | 2 lines

  Whitespace normalization.
........
  r46313 | andrew.kuchling | 2006-05-26 14:39:48 +0200 (Fri, 26 May 2006) | 1 line

  Add str.partition()
........
  r46314 | bob.ippolito | 2006-05-26 14:52:53 +0200 (Fri, 26 May 2006) | 1 line

  quick hack to fix busted binhex test
........
  r46316 | andrew.dalke | 2006-05-26 15:05:55 +0200 (Fri, 26 May 2006) | 2 lines

  Added more rstrip tests, including for prealloc'ed arrays
........
  r46320 | bob.ippolito | 2006-05-26 15:15:44 +0200 (Fri, 26 May 2006) | 1 line

  fix #1229380 No struct.pack exception for some out of range integers
........
  r46325 | tim.peters | 2006-05-26 15:39:17 +0200 (Fri, 26 May 2006) | 2 lines

  Use open() to open files (was using file()).
........
  r46327 | andrew.dalke | 2006-05-26 16:00:45 +0200 (Fri, 26 May 2006) | 37 lines

  Changes to string.split/rsplit on whitespace to preallocate space in the
  results list.

  Originally it allocated 0 items and used the list growth during append.  Now
  it preallocates 12 items so the first few appends don't need list reallocs.

  ("Here are some words ."*2).split(None, 1) is 7% faster
  ("Here are some words ."*2).split() is is 15% faster

    (Your milage may vary, see dealership for details.)

  File parsing like this

      for line in f:
          count += len(line.split())

  is also about 15% faster.  There is a slowdown of about 3% for large
  strings because of the additional overhead of checking if the append is
  to a preallocated region of the list or not.  This will be the rare case.
  It could be improved with special case code but we decided it was not
  useful enough.

  There is a cost of 12*sizeof(PyObject *) bytes per list.  For the normal
  case of file parsing this is not a problem because of the lists have
  a short lifetime.  We have not come up with cases where this is a problem
  in real life.

  I chose 12 because human text averages about 11 words per line in books,
  one of my data sets averages 6.2 words with a final peak at 11 words per
  line, and I work with a tab delimited data set with 8 tabs per line (or
  9 words per line).  12 encompasses all of these.

  Also changed the last rstrip code to append then reverse, rather than
  doing insert(0).  The strip() and rstrip() times are now comparable.
........
  r46328 | tim.peters | 2006-05-26 16:02:05 +0200 (Fri, 26 May 2006) | 5 lines

  Explicitly close files.  I'm trying to stop the frequent spurious test_tarfile
  failures on Windows buildbots, but it's hard to know how since the regrtest
  failure output is useless here, and it never fails when a buildbot slave runs
  test_tarfile the second time in verbose mode.
........
  r46329 | andrew.kuchling | 2006-05-26 16:03:41 +0200 (Fri, 26 May 2006) | 1 line

  Add buffer support for struct, socket
........
  r46330 | andrew.kuchling | 2006-05-26 16:04:19 +0200 (Fri, 26 May 2006) | 1 line

  Typo fix
........
  r46331 | bob.ippolito | 2006-05-26 16:07:23 +0200 (Fri, 26 May 2006) | 1 line

  Fix distutils so that libffi will cross-compile between darwin/x86 and darwin/ppc
........
  r46333 | bob.ippolito | 2006-05-26 16:23:21 +0200 (Fri, 26 May 2006) | 1 line

  Fix _struct typo that broke some 64-bit platforms
........
  r46335 | bob.ippolito | 2006-05-26 16:29:35 +0200 (Fri, 26 May 2006) | 1 line

  Enable PY_USE_INT_WHEN_POSSIBLE in struct
........
  r46343 | andrew.dalke | 2006-05-26 17:21:01 +0200 (Fri, 26 May 2006) | 2 lines

  Eeked out another 3% or so performance in split whitespace by cleaning up the algorithm.
........
  r46352 | andrew.dalke | 2006-05-26 18:22:52 +0200 (Fri, 26 May 2006) | 3 lines

  Test for more edge strip cases; leading and trailing separator gets removed
  even with strip(..., 0)
........
  r46354 | bob.ippolito | 2006-05-26 18:23:28 +0200 (Fri, 26 May 2006) | 1 line

  fix signed/unsigned mismatch in struct
........
  r46355 | steve.holden | 2006-05-26 18:27:59 +0200 (Fri, 26 May 2006) | 5 lines

  Add -t option to allow easy test selection.
  Action verbose option correctly.
  Tweak operation counts. Add empty and new instances tests.
  Enable comparisons across different warp factors. Change version.
........
  r46356 | fredrik.lundh | 2006-05-26 18:32:42 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: use Py_LOCAL on a few more locals in stringobject.c
........
  r46357 | thomas.heller | 2006-05-26 18:42:44 +0200 (Fri, 26 May 2006) | 4 lines

  For now, I gave up with automatic conversion of reST to Python-latex,
  so I'm writing this in latex now.

  Skeleton for the ctypes reference.
........
  r46358 | tim.peters | 2006-05-26 18:49:28 +0200 (Fri, 26 May 2006) | 3 lines

  Repair Windows compiler warnings about mixing
  signed and unsigned integral types in comparisons.
........
  r46359 | tim.peters | 2006-05-26 18:52:04 +0200 (Fri, 26 May 2006) | 2 lines

  Whitespace normalization.
........
  r46360 | tim.peters | 2006-05-26 18:53:04 +0200 (Fri, 26 May 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r46362 | fredrik.lundh | 2006-05-26 19:04:58 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: stringlib refactoring (in progress)
........
  r46363 | thomas.heller | 2006-05-26 19:18:33 +0200 (Fri, 26 May 2006) | 1 line

  Write some docs.
........
  r46364 | fredrik.lundh | 2006-05-26 19:22:38 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: stringlib refactoring (in progress)
........
  r46366 | fredrik.lundh | 2006-05-26 19:26:39 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: cleanup
........
  r46367 | fredrik.lundh | 2006-05-26 19:31:41 +0200 (Fri, 26 May 2006) | 4 lines

  needforspeed: remove remaining USE_FAST macros; if fastsearch was
  broken, someone would have noticed by now ;-)
........
  r46368 | steve.holden | 2006-05-26 19:41:32 +0200 (Fri, 26 May 2006) | 5 lines

  Use minimum calibration time rather than avergae to avoid
  the illusion of negative run times. Halt with an error if
  run times go below 10 ms, indicating that results will be
  unreliable.
........
  r46370 | thomas.heller | 2006-05-26 19:47:40 +0200 (Fri, 26 May 2006) | 2 lines

  Reordered, and wrote more docs.
........
  r46372 | georg.brandl | 2006-05-26 20:03:31 +0200 (Fri, 26 May 2006) | 9 lines

  Need for speed: Patch #921466 : sys.path_importer_cache is now used to cache valid and
    invalid file paths for the built-in import machinery which leads to
    fewer open calls on startup.

    Also fix issue with PEP 302 style import hooks which lead to more open()
    calls than necessary.
........
  r46373 | fredrik.lundh | 2006-05-26 20:05:34 +0200 (Fri, 26 May 2006) | 3 lines

  removed unnecessary include
........
  r46377 | fredrik.lundh | 2006-05-26 20:15:38 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: added rpartition implementation
........
  r46380 | fredrik.lundh | 2006-05-26 20:24:15 +0200 (Fri, 26 May 2006) | 5 lines

  needspeed: rpartition documentation, tests, and a bug fixes.

  feel free to add more tests and improve the documentation.
........
  r46381 | steve.holden | 2006-05-26 20:26:21 +0200 (Fri, 26 May 2006) | 4 lines

  Revert tests to MAL's original round sizes to retiain comparability
  from long ago and far away. Stop calling this pybench 1.4 because it
  isn't. Remove the empty test, which was a bad idea.
........
  r46387 | andrew.kuchling | 2006-05-26 20:41:18 +0200 (Fri, 26 May 2006) | 1 line

  Add rpartition() and path caching
........
  r46388 | andrew.dalke | 2006-05-26 21:02:09 +0200 (Fri, 26 May 2006) | 10 lines

  substring split now uses /F's fast string matching algorithm.
    (If compiled without FAST search support, changed the pre-memcmp test
     to check the last character as well as the first.  This gave a 25%
     speedup for my test case.)

  Rewrote the split algorithms so they stop when maxsplit gets to 0.
  Previously they did a string match first then checked if the maxsplit
  was reached.  The new way prevents a needless string search.
........
  r46391 | brett.cannon | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 2 lines

  Change C spacing to 4 spaces by default to match PEP 7 for new C files.
........
  r46392 | georg.brandl | 2006-05-26 21:04:47 +0200 (Fri, 26 May 2006) | 3 lines

  Exception isn't the root of all exception classes anymore.
........
  r46397 | fredrik.lundh | 2006-05-26 21:23:21 +0200 (Fri, 26 May 2006) | 3 lines

  added rpartition method to UserString class
........
  r46398 | fredrik.lundh | 2006-05-26 21:24:53 +0200 (Fri, 26 May 2006) | 4 lines

  needforspeed: stringlib refactoring, continued.  added count and
  find helpers; updated unicodeobject to use stringlib_count
........
  r46400 | fredrik.lundh | 2006-05-26 21:29:05 +0200 (Fri, 26 May 2006) | 4 lines

  needforspeed: stringlib refactoring: use stringlib/find for unicode
  find
........
  r46403 | fredrik.lundh | 2006-05-26 21:33:03 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: use a macro to fix slice indexes
........
  r46404 | thomas.heller | 2006-05-26 21:43:45 +0200 (Fri, 26 May 2006) | 1 line

  Write more docs.
........
  r46406 | fredrik.lundh | 2006-05-26 21:48:07 +0200 (Fri, 26 May 2006) | 3 lines

  needforspeed: stringlib refactoring: use stringlib/find for string find
........
  r46407 | andrew.kuchling | 2006-05-26 21:51:10 +0200 (Fri, 26 May 2006) | 1 line

  Comment typo
........
  r46409 | georg.brandl | 2006-05-26 22:04:44 +0200 (Fri, 26 May 2006) | 3 lines

  Replace Py_BuildValue("OO") by PyTuple_Pack.
........
  r46411 | georg.brandl | 2006-05-26 22:14:47 +0200 (Fri, 26 May 2006) | 2 lines

  Patch #1492218: document None being a constant.
........
  r46415 | georg.brandl | 2006-05-26 22:22:50 +0200 (Fri, 26 May 2006) | 3 lines

  Simplify calling.
........
  r46416 | andrew.dalke | 2006-05-26 22:25:22 +0200 (Fri, 26 May 2006) | 4 lines

  Added limits to the replace code so it does not count all of the matching
  patterns in a string, only the number needed by the max limit.
........
  r46417 | bob.ippolito | 2006-05-26 22:25:23 +0200 (Fri, 26 May 2006) | 1 line

  enable all of the struct tests, use ssize_t, fix some whitespace
........
  r46418 | tim.peters | 2006-05-26 22:56:56 +0200 (Fri, 26 May 2006) | 2 lines

  Record Iceland sprint attendees.
........
  r46421 | tim.peters | 2006-05-26 23:51:13 +0200 (Fri, 26 May 2006) | 2 lines

  Whitespace normalization.
........
  r46422 | steve.holden | 2006-05-27 00:17:54 +0200 (Sat, 27 May 2006) | 2 lines

  Add Richard Tew to developers
........
  r46423 | steve.holden | 2006-05-27 00:33:20 +0200 (Sat, 27 May 2006) | 2 lines

  Update help text and documentaition.
........
  r46424 | steve.holden | 2006-05-27 00:39:27 +0200 (Sat, 27 May 2006) | 2 lines

  Blasted typos ...
........
  r46425 | andrew.dalke | 2006-05-27 00:49:03 +0200 (Sat, 27 May 2006) | 2 lines

  Added description of why splitlines doesn't use the prealloc strategy
........
  r46426 | tim.peters | 2006-05-27 01:14:37 +0200 (Sat, 27 May 2006) | 19 lines

  Patch 1145039.

  set_exc_info(), reset_exc_info():  By exploiting the
  likely (who knows?) invariant that when an exception's
  `type` is NULL, its `value` and `traceback` are also NULL,
  save some cycles in heavily-executed code.

  This is a "a kronar saved is a kronar earned" patch:  the
  speedup isn't reliably measurable, but it obviously does
  reduce the operation count in the normal (no exception
  raised) path through PyEval_EvalFrameEx().

  The tim-exc_sanity branch tries to push this harder, but
  is still blowing up (at least in part due to pre-existing
  subtle bugs that appear to have no other visible
  consequences!).

  Not a bugfix candidate.
........
  r46429 | steve.holden | 2006-05-27 02:51:52 +0200 (Sat, 27 May 2006) | 2 lines

  Reinstate new-style object tests.
........
  r46430 | neal.norwitz | 2006-05-27 07:18:57 +0200 (Sat, 27 May 2006) | 1 line

  Fix compiler warning (and whitespace) on Mac OS 10.4.  (A lot of this code looked duplicated, I wonder if a utility function could help reduce the duplication here.)
........
  r46431 | neal.norwitz | 2006-05-27 07:21:30 +0200 (Sat, 27 May 2006) | 4 lines

  Fix Coverity warnings.
   - Check the correct variable (str_obj, not str) for NULL
   - sep_len was already verified it wasn't 0
........
  r46432 | martin.v.loewis | 2006-05-27 10:36:52 +0200 (Sat, 27 May 2006) | 2 lines

  Patch 1494554: Update numeric properties to Unicode 4.1.
........
  r46433 | martin.v.loewis | 2006-05-27 10:54:29 +0200 (Sat, 27 May 2006) | 2 lines

  Explain why 'consumed' is initialized.
........
  r46436 | fredrik.lundh | 2006-05-27 12:05:10 +0200 (Sat, 27 May 2006) | 3 lines

  needforspeed: more stringlib refactoring
........
  r46438 | fredrik.lundh | 2006-05-27 12:39:48 +0200 (Sat, 27 May 2006) | 5 lines

  needforspeed: backed out the Py_LOCAL-isation of ceval; the massive in-
  lining killed performance on certain Intel boxes, and the "aggressive"
  macro itself gives most of the benefits on others.
........
  r46439 | andrew.dalke | 2006-05-27 13:04:36 +0200 (Sat, 27 May 2006) | 2 lines

  fixed typo
........
  r46440 | martin.v.loewis | 2006-05-27 13:07:49 +0200 (Sat, 27 May 2006) | 2 lines

  Revert bogus change committed in 46432 to this file.
........
  r46444 | andrew.kuchling | 2006-05-27 13:26:33 +0200 (Sat, 27 May 2006) | 1 line

  Add Py_LOCAL macros
........
  r46450 | bob.ippolito | 2006-05-27 13:47:12 +0200 (Sat, 27 May 2006) | 1 line

  Remove the range checking and int usage #defines from _struct and strip out the now-dead code
........
  r46454 | bob.ippolito | 2006-05-27 14:11:36 +0200 (Sat, 27 May 2006) | 1 line

  Fix up struct docstrings, add struct.pack_to function for symmetry
........
  r46456 | richard.jones | 2006-05-27 14:29:24 +0200 (Sat, 27 May 2006) | 2 lines

  Conversion of exceptions over from faked-up classes to new-style C types.
........
  r46457 | georg.brandl | 2006-05-27 14:30:25 +0200 (Sat, 27 May 2006) | 3 lines

  Add news item for new-style exception class branch merge.
........
  r46458 | tim.peters | 2006-05-27 14:36:53 +0200 (Sat, 27 May 2006) | 3 lines

  More random thrashing trying to understand spurious
  Windows failures.  Who's keeping a bz2 file open?
........
  r46460 | andrew.kuchling | 2006-05-27 15:44:37 +0200 (Sat, 27 May 2006) | 1 line

  Mention new-style exceptions
........
  r46461 | richard.jones | 2006-05-27 15:50:42 +0200 (Sat, 27 May 2006) | 1 line

  credit where credit is due
........
  r46462 | georg.brandl | 2006-05-27 16:02:03 +0200 (Sat, 27 May 2006) | 3 lines

  Always close BZ2Proxy object. Remove unnecessary struct usage.
........
  r46463 | tim.peters | 2006-05-27 16:13:13 +0200 (Sat, 27 May 2006) | 2 lines

  The cheery optimism of old age.
........
  r46464 | andrew.dalke | 2006-05-27 16:16:40 +0200 (Sat, 27 May 2006) | 2 lines

  cleanup - removed trailing whitespace
........
  r46465 | georg.brandl | 2006-05-27 16:41:55 +0200 (Sat, 27 May 2006) | 3 lines

  Remove spurious semicolons after macro invocations.
........
  r46468 | fredrik.lundh | 2006-05-27 16:58:20 +0200 (Sat, 27 May 2006) | 4 lines

  needforspeed: replace improvements, changed to Py_LOCAL_INLINE
  where appropriate
........
  r46469 | fredrik.lundh | 2006-05-27 17:20:22 +0200 (Sat, 27 May 2006) | 4 lines

  needforspeed: stringlib refactoring: changed find_obj to find_slice,
  to enable use from stringobject
........
  r46470 | fredrik.lundh | 2006-05-27 17:26:19 +0200 (Sat, 27 May 2006) | 3 lines

  needforspeed: stringlib refactoring: use find_slice for stringobject
........
  r46472 | kristjan.jonsson | 2006-05-27 17:41:31 +0200 (Sat, 27 May 2006) | 1 line

  Add a PCBuild8 build directory for building with Visual Studio .NET 2005.  Contains a special project to perform profile guided optimizations on the pythoncore.dll, by instrumenting and running pybench.py
........
  r46473 | jack.diederich | 2006-05-27 17:44:34 +0200 (Sat, 27 May 2006) | 3 lines

  needforspeed: use PyObject_MALLOC instead of system malloc for small
  allocations.  Use PyMem_MALLOC for larger (1k+) chunks.  1%-2% speedup.
........
  r46474 | bob.ippolito | 2006-05-27 17:53:49 +0200 (Sat, 27 May 2006) | 1 line

  fix struct regression on 64-bit platforms
........
  r46475 | richard.jones | 2006-05-27 18:07:28 +0200 (Sat, 27 May 2006) | 1 line

  doc string additions and tweaks
........
  r46477 | richard.jones | 2006-05-27 18:15:11 +0200 (Sat, 27 May 2006) | 1 line

  move semicolons
........
  r46478 | george.yoshida | 2006-05-27 18:32:44 +0200 (Sat, 27 May 2006) | 2 lines

  minor markup nits
........
  r46488 | george.yoshida | 2006-05-27 18:51:43 +0200 (Sat, 27 May 2006) | 3 lines

  End of Ch.3 is now about "with statement".
  Avoid obsolescence by directly referring to the section.
........
  r46489 | george.yoshida | 2006-05-27 19:09:17 +0200 (Sat, 27 May 2006) | 2 lines

  fix typo
........
---
 ccompiler.py         |  6 ++---
 command/bdist_msi.py | 16 +++++------
 command/build_ext.py |  5 ++++
 command/upload.py    |  2 +-
 msvccompiler.py      |  2 +-
 sysconfig.py         | 19 +++++++++++--
 unixccompiler.py     | 64 ++++++++++++++++++++++++++++++++++++++++++--
 util.py              | 49 +++++++++++++++++++++++++++++++++
 8 files changed, 145 insertions(+), 18 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 6dad757a6a..1349abeb65 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -15,7 +15,6 @@
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
-from distutils.sysconfig import python_build
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -368,7 +367,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
 
         # Get the list of expected output (object) files
         objects = self.object_filenames(sources,
-                                        strip_dir=python_build,
+                                        strip_dir=0,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
@@ -475,8 +474,7 @@ def _prep_compile(self, sources, output_dir, depends=None):
         which source files can be skipped.
         """
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, strip_dir=python_build,
-                                        output_dir=output_dir)
+        objects = self.object_filenames(sources, output_dir=output_dir)
         assert len(objects) == len(sources)
 
         if self.force:
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f05d66cb5d..75db8773f1 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005 Martin v. Löwis
+# Copyright (C) 2005, 2006 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst
@@ -16,7 +16,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils import log
 import msilib
-from msilib import schema, sequence, uisample
+from msilib import schema, sequence, text
 from msilib import Directory, Feature, Dialog, add_data
 
 class PyDialog(Dialog):
@@ -374,8 +374,8 @@ def add_ui(self):
                   ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
                   ("ProgressDlg", None, 1280)])
 
-        add_data(db, 'ActionText', uisample.ActionText)
-        add_data(db, 'UIText', uisample.UIText)
+        add_data(db, 'ActionText', text.ActionText)
+        add_data(db, 'UIText', text.UIText)
         #####################################################################
         # Standard dialogs: FatalError, UserExit, ExitDialog
         fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
@@ -502,9 +502,9 @@ def add_ui(self):
 
         seldlg.back("< Back", None, active=0)
         c = seldlg.next("Next >", "Cancel")
-        c.event("SetTargetPath", "TARGETDIR", order=1)
-        c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2)
-        c.event("EndDialog", "Return", order=3)
+        c.event("SetTargetPath", "TARGETDIR", ordering=1)
+        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
+        c.event("EndDialog", "Return", ordering=3)
 
         c = seldlg.cancel("Cancel", "DirectoryCombo")
         c.event("SpawnDialog", "CancelDlg")
@@ -561,7 +561,7 @@ def add_ui(self):
 
         c = whichusers.next("Next >", "Cancel")
         c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
-        c.event("EndDialog", "Return", order = 2)
+        c.event("EndDialog", "Return", ordering = 2)
 
         c = whichusers.cancel("Cancel", "AdminInstall")
         c.event("SpawnDialog", "CancelDlg")
diff --git a/command/build_ext.py b/command/build_ext.py
index 5771252123..9626710b0c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -689,6 +689,11 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib, "m"] + extra
+
+        elif sys.platform == 'darwin':
+            # Don't use the default code below
+            return ext.libraries
+
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):
diff --git a/command/upload.py b/command/upload.py
index 6f4ce81f79..4a9ed398a0 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 from distutils.core import Command
 from distutils.spawn import spawn
 from distutils import log
-from md5 import md5
+from hashlib import md5
 import os
 import socket
 import platform
diff --git a/msvccompiler.py b/msvccompiler.py
index f88f36526c..d24d0ac6e0 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -618,7 +618,7 @@ def get_msvc_paths(self, path, platform='x86'):
                         "but the expected registry settings are not present.\n"
                         "You must at least run the Visual Studio GUI once "
                         "so that these entries are created.")
-                break
+                    break
         return []
 
     def set_path_env_var(self, name):
diff --git a/sysconfig.py b/sysconfig.py
index 49536f0d3f..e1397a1988 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -366,8 +366,8 @@ def _init_posix():
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
     # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and g.has_key('CONFIGURE_MACOSX_DEPLOYMENT_TARGET'):
-        cfg_target = g['CONFIGURE_MACOSX_DEPLOYMENT_TARGET']
+    if sys.platform == 'darwin' and g.has_key('MACOSX_DEPLOYMENT_TARGET'):
+        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
             cur_target = cfg_target
@@ -500,6 +500,21 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        if sys.platform == 'darwin':
+            kernel_version = os.uname()[2] # Kernel version (8.4.3)
+            major_version = int(kernel_version.split('.')[0])
+
+            if major_version < 8:
+                # On Mac OS X before 10.4, check if -arch and -isysroot
+                # are in CFLAGS or LDFLAGS and remove them if they are.
+                # This is needed when building extensions on a 10.3 system
+                # using a universal build of python.
+                for key in ('LDFLAGS', 'BASECFLAGS'):
+                    flags = _config_vars[key]
+                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                    flags = re.sub('-isysroot [^ \t]* ', ' ', flags)
+                    _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 56998c3507..324819d4a5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -42,6 +42,48 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
+def _darwin_compiler_fixup(compiler_so, cc_args):
+    """
+    This function will strip '-isysroot PATH' and '-arch ARCH' from the
+    compile flags if the user has specified one them in extra_compile_flags.
+
+    This is needed because '-arch ARCH' adds another architecture to the
+    build, without a way to remove an architecture. Furthermore GCC will
+    barf if multiple '-isysroot' arguments are present.
+    """
+    stripArch = stripSysroot = 0
+
+    compiler_so = list(compiler_so)
+    kernel_version = os.uname()[2] # 8.4.3
+    major_version = int(kernel_version.split('.')[0])
+
+    if major_version < 8:
+        # OSX before 10.4.0, these don't support -arch and -isysroot at
+        # all.
+        stripArch = stripSysroot = True
+    else:
+        stripArch = '-arch' in cc_args
+        stripSysroot = '-isysroot' in cc_args
+
+    if stripArch:
+        while 1:
+            try:
+                index = compiler_so.index('-arch')
+                # Strip this argument and the next one:
+                del compiler_so[index:index+2]
+            except ValueError:
+                break
+
+    if stripSysroot:
+        try:
+            index = compiler_so.index('-isysroot')
+            # Strip this argument and the next one:
+            del compiler_so[index:index+1]
+        except ValueError:
+            pass
+
+    return compiler_so
+
 class UnixCCompiler(CCompiler):
 
     compiler_type = 'unix'
@@ -108,8 +150,11 @@ def preprocess(self, source,
                 raise CompileError, msg
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        compiler_so = self.compiler_so
+        if sys.platform == 'darwin':
+            compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
         try:
-            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg
@@ -172,7 +217,22 @@ def link(self, target_desc, objects,
                 else:
                     linker = self.linker_so[:]
                 if target_lang == "c++" and self.compiler_cxx:
-                    linker[0] = self.compiler_cxx[0]
+                    # skip over environment variable settings if /usr/bin/env
+                    # is used to set up the linker's environment.
+                    # This is needed on OSX. Note: this assumes that the
+                    # normal and C++ compiler have the same environment
+                    # settings.
+                    i = 0
+                    if os.path.basename(linker[0]) == "env":
+                        i = 1
+                        while '=' in linker[i]:
+                            i = i + 1
+
+                    linker[i] = self.compiler_cxx[i]
+
+                if sys.platform == 'darwin':
+                    linker = _darwin_compiler_fixup(linker, ld_args)
+
                 self.spawn(linker + ld_args)
             except DistutilsExecError, msg:
                 raise LinkError, msg
diff --git a/util.py b/util.py
index 889bf13603..1265f4c4e3 100644
--- a/util.py
+++ b/util.py
@@ -45,6 +45,7 @@ def get_platform ():
     osname = string.lower(osname)
     osname = string.replace(osname, '/', '')
     machine = string.replace(machine, ' ', '_')
+    machine = string.replace(machine, '/', '-')
 
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --
@@ -66,6 +67,54 @@ def get_platform ():
         m = rel_re.match(release)
         if m:
             release = m.group()
+    elif osname[:6] == "darwin":
+        #
+        # For our purposes, we'll assume that the system version from
+        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
+        # to. This makes the compatibility story a bit more sane because the
+        # machine is going to compile and link as if it were
+        # MACOSX_DEPLOYMENT_TARGET.
+        from distutils.sysconfig import get_config_vars
+        cfgvars = get_config_vars()
+
+        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
+        if not macver:
+            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+
+        if not macver:
+            # Get the system version. Reading this plist is a documented
+            # way to get the system version (see the documentation for
+            # the Gestalt Manager)
+            try:
+                f = open('/System/Library/CoreServices/SystemVersion.plist')
+            except IOError:
+                # We're on a plain darwin box, fall back to the default
+                # behaviour.
+                pass
+            else:
+                m = re.search(
+                        r'<key>ProductUserVisibleVersion</key>\s*' +
+                        r'<string>(.*?)</string>', f.read())
+                f.close()
+                if m is not None:
+                    macver = '.'.join(m.group(1).split('.')[:2])
+                # else: fall back to the default behaviour
+
+        if macver:
+            from distutils.sysconfig import get_config_vars
+            release = macver
+            osname = "macosx"
+
+
+            if (release + '.') < '10.4.' and \
+                    get_config_vars().get('UNIVERSALSDK', '').strip():
+                # The universal build will build fat binaries, but not on
+                # systems before 10.4
+                machine = 'fat'
+
+            elif machine in ('PowerPC', 'Power_Macintosh'):
+                # Pick a sane name for the PPC architecture.
+                machine = 'ppc'
 
     return "%s-%s-%s" % (osname, release, machine)
 

From 5baff4ddf909616e95ebd3eb3febcc6ebfa471d9 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 27 Jun 2006 10:08:25 +0000
Subject: [PATCH 1824/8469] MacOSX: fix rather dumb buglet that made it
 impossible to create extensions on OSX 10.3 when using a binary distribution
 build on 10.4.

---
 sysconfig.py     | 2 +-
 unixccompiler.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2ba3c4db5d..c3b1e4ecfb 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -512,7 +512,7 @@ def get_config_vars(*args):
                 for key in ('LDFLAGS', 'BASECFLAGS'):
                     flags = _config_vars[key]
                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                    flags = re.sub('-isysroot [^ \t]* ', ' ', flags)
+                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
                     _config_vars[key] = flags
 
     if args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 324819d4a5..6cd14f7728 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -78,7 +78,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         try:
             index = compiler_so.index('-isysroot')
             # Strip this argument and the next one:
-            del compiler_so[index:index+1]
+            del compiler_so[index:index+2]
         except ValueError:
             pass
 

From 07d3e934ec7648b1c34a414ecd2da1ecd82b4813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 3 Jul 2006 12:28:58 +0000
Subject: [PATCH 1825/8469] Bug #1267547: Put proper recursive setup.py call
 into the spec file generated by bdist_rpm.

---
 command/bdist_rpm.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 738e3f7269..5b09965867 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -467,7 +467,8 @@ def _make_spec_file(self):
 
         # rpm scripts
         # figure out default build script
-        def_build = "%s setup.py build" % self.python
+        def_setup_call = "%s %s" % (self.python,os.path.basename(sys.argv[0]))
+        def_build = "%s build" % def_setup_call
         if self.use_rpm_opt_flags:
             def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build
 
@@ -481,9 +482,9 @@ def _make_spec_file(self):
             ('prep', 'prep_script', "%setup"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
-             ("%s setup.py install "
+             ("%s install "
               "--root=$RPM_BUILD_ROOT "
-              "--record=INSTALLED_FILES") % self.python),
+              "--record=INSTALLED_FILES") % def_setup_call),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),

From 26275077cfdade84786eef6b0bdf0f082bccdb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 10 Jul 2006 07:23:48 +0000
Subject: [PATCH 1826/8469] Introduce DISTUTILS_USE_SDK as a flag to determine
 whether the SDK environment should be used. Fixes #1508010.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index d24d0ac6e0..d725905bd0 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -237,7 +237,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
 
     def initialize(self):
         self.__paths = []
-        if os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
+        if os.environ.has_key("DISTUTILS_USE_SDK") and os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
             self.cc = "cl.exe"

From c536bc62ba9d9ab1ada6951d08f7638b8b13ac22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 10 Jul 2006 07:26:41 +0000
Subject: [PATCH 1827/8469] Change error message to indicate that VS2003 is
 necessary to build extension modules, not the .NET SDK.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index d725905bd0..c96d527478 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -131,7 +131,7 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
         except KeyError, exc: #
             raise DistutilsPlatformError, \
-                  ("The .NET Framework SDK needs to be installed before "
+                  ("Visual Studio 2003 needs to be installed before "
                    "building extensions for Python.")
 
         p = r"Software\Microsoft\NET Framework Setup\Product"

From 50345b356d829f38ac236b497f5eca14852db45e Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Mon, 10 Jul 2006 19:18:35 +0000
Subject: [PATCH 1828/8469] Fix SF#1457312: bad socket error handling in
 distutils "upload" command.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 4a9ed398a0..67ba080427 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -185,7 +185,7 @@ def upload_file(self, command, pyversion, filename):
             http.endheaders()
             http.send(body)
         except socket.error, e:
-            self.announce(e.msg, log.ERROR)
+            self.announce(str(e), log.ERROR)
             return
 
         r = http.getresponse()

From c26881ae32a53f1cfc3389764c10a16ff034bc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 27 Jul 2006 06:38:16 +0000
Subject: [PATCH 1829/8469] Bump distutils version to 2.5, as several new
 features have been introduced since 2.4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a1dbb4b5ef..8a28531c8c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,4 +12,4 @@
 
 __revision__ = "$Id$"
 
-__version__ = "2.4.0"
+__version__ = "2.5.0"

From 747bd24f77e15e41ecc476bc63cf71a56709a7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 30 Jul 2006 13:14:05 +0000
Subject: [PATCH 1830/8469] Base __version__ on sys.version_info, as distutils
 is no longer maintained separatedly.

---
 __init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8a28531c8c..9c60e54690 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,4 +12,6 @@
 
 __revision__ = "$Id$"
 
-__version__ = "2.5.0"
+import sys
+__version__ = "%d.%d.%d" % sys.version_info[:3]
+del sys

From 44994ba49455c4f3ba2c3c5f2e0cc9780168cb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 30 Jul 2006 13:27:31 +0000
Subject: [PATCH 1831/8469] Mention Cygwin in distutils error message about a
 missing VS 2003. Fixes #1257728.

---
 msvccompiler.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index c96d527478..0d72837ed3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -131,8 +131,10 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
         except KeyError, exc: #
             raise DistutilsPlatformError, \
-                  ("Visual Studio 2003 needs to be installed before "
-                   "building extensions for Python.")
+                  ("""Python was built with Visual Studio 2003;
+extensions must be built with a compiler than can generate compatible binaries.
+Visual Studio 2003 was not found on this system. If you have Cygwin installed,
+you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
 
         p = r"Software\Microsoft\NET Framework Setup\Product"
         for base in HKEYS:

From e11eb794d3d6a0845f8d742935a884c82f9eaaf0 Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Fri, 11 Aug 2006 14:57:12 +0000
Subject: [PATCH 1832/8469] Merged revisions 46753-51188 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines

  Make binascii.hexlify() use s# for its arguments instead of t# to actually
  match its documentation stating it accepts any read-only buffer.
........
  r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines

  Buffer objects would return the read or write buffer for a wrapped object when
  the char buffer was requested.  Now it actually returns the char buffer if
  available or raises a TypeError if it isn't (as is raised for the other buffer
  types if they are not present but requested).

  Not a backport candidate since it does change semantics of the buffer object
  (although it could be argued this is enough of a bug to bother backporting).
........
  r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line

  Update functools section
........
  r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines

  Whitespace normalization.

  Since test_file is implicated in mysterious test failures
  when followed by test_optparse, if I had any brains I'd
  look at the checkin that last changed test_file ;-)
........
  r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines

  To boost morale :-), force test_optparse to run immediately
  after test_file until we can figure out how to fix it.
  (See python-dev; at the moment we don't even know which checkin
  caused the problem.)
........
  r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines

  AutoFileTests.tearDown():  Removed mysterious undocumented
  try/except.  Remove TESTFN.

  Throughout:  used open() instead of file(), and wrapped
  long lines.
........
  r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines

  testUnicodeOpen():  I have no idea why, but making this
  test clean up after itself appears to fix the test failures
  when test_optparse follows test_file.

  test_main():  Get rid of TESTFN no matter what.  That's
  also enough to fix the mystery failures.  Doesn't hurt
  to fix them twice :-)
........
  r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines

  Remove the temporary hack to force test_optparse to
  run immediately after test_file.  At least 8 buildbot
  boxes passed since the underlying problem got fixed,
  and they all failed before the fix, so there's no point
  to this anymore.
........
  r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line

  Fix grammar and reflow
........
  r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line

  Markup fix
........
  r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line

  [Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly.   2.4 bugfix candidate.
........
  r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines

  Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005.
  Make the definition #ARRAYSIZE conditional.  VisualStudio .NET 2005 already has it defined using a better gimmick.
........
  r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines

  Import wsgiref into the stdlib, as of the external version 0.1-r2181.
........
  r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line

  Add note about XMLGenerator bugfix
........
  r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line

  Add note about wsgiref
........
  r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines

  Fix inconsistency in naming within an enum.
........
  r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines

  Test file.__exit__.
........
  r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines

  svn:ignore .pyc and .pyo files.
........
  r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines

  RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument.
........
  r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line

  Describe startswith()/endswiith() change; add reminder about wsgiref
........
  r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines

  Implementing a happy idea from Georg Brandl:  make runtest() try to
  clean up files and directories the tests often leave behind by
  mistake.  This is the first time in history I don't have a bogus
  "db_home" directory after running the tests ;-)

  Also worked on runtest's docstring, to say something about all the
  arguments, and to document the non-obvious return values.

  New functions runtest_inner() and cleanup_test_droppings() in
  support of the above.
........
  r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line

  Remove unused variable
........
  r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line

  Add some wsgiref text
........
  r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line

  set eol-style svn property
........
  r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line

  set eol-style svn property
........
  r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines

  Make use of new str.startswith/endswith semantics.
  Occurences in email and compiler were ignored due to backwards compat requirements.
........
  r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines

  An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute.  This can lead to an infinite recursion.

  Closes bug #532646, again.  Will be backported.
........
  r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines

  Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block.
........
  r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines

  Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError.
  Also improve error message on overflow.
........
  r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines

  Port cygwin kill_python changes from 2.4 branch.
........
  r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines

  SF bug #1503294.

  PyThreadState_GET() complains if the tstate is NULL, but only in debug mode.
........
  r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines

  Patch #1495999: Part two of Windows CE changes.
  - update header checks, using autoconf
  - provide dummies for getenv, environ, and GetVersion
  - adjust MSC_VER check in socketmodule.c
........
  r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line

  document the class, not its initializer
........
  r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines

  Sync with Optik docs (rev 518):
    * restore "Extending optparse" section
    * document ALWAYS_TYPED_ACTIONS (SF #1449311)
........
  r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines

  Upgrade to ctypes version 0.9.9.7.

  Summary of changes:

  - support for 'variable sized' data
  - support for anonymous structure/union fields
  - fix severe bug with certain arrays or structures containing more than 256 fields
........
  r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines

  Upgrade to ctypes version 0.9.9.7.

  Summary of changes:

  - support for 'variable sized' data
  - support for anonymous structure/union fields
  - fix severe bug with certain arrays or structures containing more than 256 fields
........
  r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines

  SF patch #1303595: improve description of __builtins__, explaining how it
  varies between __main__ and other modules, and strongly suggest not touching
  it but using __builtin__ if absolutely necessary
........
  r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line

  credit for SF patch #1303595
........
  r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines

  New docs for ctypes.
........
  r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line

  Fix a wrong printf format.
........
  r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line

  Fix the second occurrence of the problematic printf format.
........
  r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line

  Don't use C++ comment.
........
  r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line

  Handle failure of PyMem_Realloc.
........
  r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines

  Suppress warning on MacOSX about possible use before set of proc.
........
  r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines

  shuffle() doscstring:  Removed warning about sequence length
  versus generator period.  While this was a real weakness of the
  older WH generator for lists with just a few dozen elements,
  and so could potentially bite the naive ;-), the Twister should
  show excellent behavior up to at least 600 elements.

  Module docstring:  reflowed some jarringly short lines.
........
  r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines

  Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately,
  i.e. do *not* expand tabs, but treat them as whitespace that is not
  equivalent to spaces.  Add a couple of test cases.  Clarify docs.
........
  r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines

  Fix Coverity # 146.  newDBSequenceObject would deref dbobj, so it can't be NULL.

  We know it's not NULL from the ParseTuple and DbObject_Check will verify
  it's not NULL.
........
  r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines

  Wrap some long lines
  Top/Bottom factor out some common expressions
  Add a XXX comment about widing offset.
........
  r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line

  Add versionadded to doc
........
  r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines

  Update doc to make it agree with code.
  Bottom factor out some common code.
........
  r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines

  f_code can't be NULL based on Frame_New and other code that derefs it.
  So there doesn't seem to be much point to checking here.
........
  r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line

  Fix errors found by pychecker
........
  r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line

  warnings was imported at module scope, no need to import again
........
  r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines

  Fix errors found by pychecker.
  I think these changes are correct, but I'm not sure.  Could someone
  who knows how this module works test it?  It can at least start on
  the cmd line.
........
  r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line

  Fix errors found by pychecker
........
  r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines

  This patch improves the L&F of IDLE on OSX. The changes are conditionalized on
  being in an IDLE.app bundle on darwin. This does a slight reorganisation of the
  menus and adds support for file-open events.
........
  r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line

  SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks.
........
  r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines

  Bug #1498146: fix optparse to handle Unicode strings in option help,
  description, and epilog.
........
  r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines

  Release the GIL during COM method calls, to avoid deadlocks in
  Python coded COM objects.
........
  r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines

  Remove message about using make frameworkinstall, that's no longer necesssary
........
  r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines

  Use configure to substitute the correct prefix instead of hardcoding
........
  r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines

  - Change fixapplepython23.py to ensure that it will run with /usr/bin/python
    on intel macs.
  - Fix some minor problems in the installer for OSX
........
  r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines

  Try to fix several networking tests.  The problem is that if hosts have
  a search path setup, some of these hosts resolve to the wrong address.
  By appending a period to the hostname, the hostname should only resolve
  to what we want it to resolve to.  Hopefully this doesn't break different bots.
........
  r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines

  Try to fix another networking test.  The problem is that if hosts have
  a search path setup, some of these hosts resolve to the wrong address.
  By appending a period to the hostname, the hostname should only resolve
  to what we want it to resolve to.  Hopefully this doesn't break different bots.

  Also add more info to failure message to aid debugging test failure.
........
  r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines

  Fix test on PPC64 buildbot.  It raised an IOError (really an URLError which
  derives from an IOError).  That seems valid.  Env Error includes both OSError
  and IOError, so this seems like a reasonable fix.
........
  r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines

  compare_generic_iter():  Fixed the failure of test_wsgiref's testFileWrapper
  when running with -O.

  test_simple_validation_error still fails under -O.  That appears to be because
  wsgiref's validate.py uses `assert` statements all over the place to check
  arguments for sanity.  That should all be changed (it's not a logical error
  in the software if a user passes bogus arguments, so this isn't a reasonable
  use for `assert` -- checking external preconditions should generally raise
  ValueError or TypeError instead, as appropriate).
........
  r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line

  Get test to pass on S/390.  Shout if you think this change is incorrect.
........
  r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line

  Cleanup Py_ssize_t a little (get rid of second #ifdef)
........
  r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix some Py_ssize_t issues
........
  r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix some Py_ssize_t issues
........
  r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines

  Cleanup: Remove import of types to get StringTypes, we can just use basestring.
........
  r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line

  Don't truncate if size_t is bigger than uint
........
  r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line

  Don't leak the list object if there's an error allocating the item storage.  Backport candidate
........
  r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix typo.  Backport if anyone cares. :-)
........
  r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix indentation of case and a Py_ssize_t issue.
........
  r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines

  Get rid of f_restricted too.  Doc the other 4 ints that were already removed
  at the NeedForSpeed sprint.
........
  r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix the socket tests so they can be run concurrently.  Backport candidate
........
  r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line

  i and j are initialized below when used.  No need to do it twice
........
  r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line

  Remove unused import
........
  r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line

  Impl ssize_t
........
  r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines

  Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy

  copy is only in newer versions of zlib.  This should allow zlibmodule
  to work with older versions like the Tru64 buildbot.
........
  r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines

  Sync w/external release 0.1.2.  Please see PEP 360 before making changes to external packages.
........
  r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines

  Get rid of function pointer cast.
........
  r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines

  I don't know how that happend, but the entire file contents was
  duplicated.  Thanks to Simon Percivall for the heads up.
........
  r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix site module docstring to match the code
........
  r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line

  Fix site module docstring to match the code for Mac OSX, too
........
  r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line

  The site module documentation also described the Windows behaviour incorrectly.
........
  r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line

  Make the -m switch conform to the documentation of sys.path by behaving like the -c switch
........
  r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines

  Fix the CRT argument error handling for VisualStudio .NET 2005.  Install a CRT error handler and disable the assertion for debug builds.  This causes CRT to set errno to EINVAL.
  This update fixes crash cases in the test suite where the default CRT error handler would cause process exit.
........
  r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line

  Add pep-291 compatibility markers.
........
  r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines

  Add the uuid module.

  This module has been tested so far on Windows XP (Python 2.4 and 2.5a2),
  Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2).
........
  r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines

  Added missing svn:eol-style property to text files.
........
  r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines

  get_matching_blocks():  rewrote code & comments so they match; added
  more comments about why it's this way at all; and removed what looked
  like needless expense (sorting (i, j, k) triples directly should give
  exactly the same order as sorting (i, (i, j, k)) pairs).
........
  r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line

  Don't fail if another process is listening on our port.
........
  r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines

  Initialize the type object so pychecker can't crash the interpreter.
........
  r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line

  Verify the crash due to EncodingMap not initialized does not return
........
  r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines

  Add some windows datatypes that were missing from this file, and add
  the aliases defined in windows header files for the structures.
........
  r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines

  Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER.
  VARIANT_BOOL is a special _ctypes data type, not c_short.
........
  r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines

  Linecache contains support for PEP302 loaders, but fails to deal with loaders
  that return None to indicate that the module is valid but no source is
  available. This patch fixes that.
........
  r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line

  Mention uuid module
........
  r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines

  Fix passing errors to the encoder and decoder functions.
........
  r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines

  errors is an attribute in the incremental decoder
  not an argument.
........
  r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines

  Patch #1454481:  Make thread stack size runtime tunable.

  Heavily revised, comprising revisions:
  46640 - original trunk revision (backed out in r46655)
  46647 - markup fix (backed out in r46655)
  46692:46918 merged from branch aimacintyre-sf1454481

  branch tested on buildbots (Windows buildbots had problems
  not related to these changes).
........
  r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines

  Remove unused variable.
........
  r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line

  Add ability to set stack size
........
  r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines

  Update pybench to version 2.0.
........
  r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines

  Revert wrong svn copy.
........
  r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines

  fix exception usage
........
  r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines

  Updated to pybench 2.0.

  See svn.python.org/external/pybench-2.0 for the original import of that
  version.

  Note that platform.py was not copied over from pybench-2.0 since
  it is already part of Python 2.5.
........
  r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines

  Increase the small thread stack size to get the test
  to pass reliably on the one buildbot that insists on
  more than 32kB of thread stack.
........
  r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines

  More docs for ctypes.
........
  r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines

  Ignore .pyc and .pyo files in Pybench.
........
  r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines

  If a classic class defined a __coerce__() method that just returned its two
  arguments in reverse, the interpreter would infinitely recourse trying to get a
  coercion that worked.  So put in a recursion check after a coercion is made and
  the next call to attempt to use the coerced values.

  Fixes bug #992017 and closes crashers/coerce.py .
........
  r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines

  Merged changes from external pysqlite 2.3.0 release. Documentation updates will
  follow in a few hours at the latest. Then we should be ready for beta1.
........
  r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines

  Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed.
........
  r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines

  Updated documentation for pysqlite 2.3.0 API.
........
  r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines

  SequenceMatcher.get_matching_blocks():  This now guarantees that
  adjacent triples in the result list describe non-adjacent matching
  blocks.  That's _nice_ to have, and Guido said he wanted it.

  Not a bugfix candidate:  Guido or not ;-), this changes visible
  endcase semantics (note that some tests had to change), and
  nothing about this was documented before.  Since it was working
  as designed, and behavior was consistent with the docs, it wasn't
  "a bug".
........
  r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines

  Repaired typo in new comment.
........
  r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines

  - make some disabled tests run what they intend when enabled
  - remove some over-zealous triple-quoting
........
  r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines

  add tests for two cases that are handled correctly in the current code,
  but that SF patch 1504676 as written mis-handles
........
  r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line

  explain an XXX in more detail
........
  r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line

  Patch #1455898: Incremental mode for "mbcs" codec.
........
  r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines

  Bug #1339007: Shelf objects now don't raise an exception in their
  __del__ method when initialization failed.
........
  r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line

  Fix docstring.
........
  r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines

  Bug #1501122: mention __gt__ &co in description of comparison order.
........
  r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line

  Write more docs.
........
  r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines

  Bug #1153163: describe __add__ vs __radd__ behavior when adding
  objects of same type/of subclasses of the other.
........
  r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines

  Bug #1202018: add some common mime.types locations.
........
  r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines

  Bug #1117556: SimpleHTTPServer now tries to find and use the system's
  mime.types file for determining MIME types.
........
  r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line

  Document paramflags.
........
  r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line

  Add an __all__ list, since this module does 'from ctypes import *'.
........
  r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line

  Add item
........
  r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines

  Bug #805015: doc error in PyUnicode_FromEncodedObject.
........
  r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines

  - Added version checks in C code to make sure we don't trigger bugs in older
    SQLite versions.
  - Added version checks in test suite so that we don't execute tests that we
    know will fail with older (buggy) SQLite versions.

  Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6
  (latest one now). The sqlite3 module can be built against all these SQLite
  versions and the sqlite3 module does its best to not trigger bugs in SQLite,
  but using SQLite 3.3.3 or later is recommended.
........
  r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines

  Speculative checkin (requires approval of Gerhard Haering)

  This backs out the test changes in 46962 which prevented crashes
  by not running the tests via a version check.  All the version checks
  added in that rev were removed from the tests.

  Code was added to the error handler in connection.c that seems
  to work with older versions of sqlite including 3.1.3.
........
  r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line

  Try to narrow window of failure on slow/busy boxes (ppc64 buildbot)
........
  r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines

  Make import/lookup of mbcs fail on non-Windows systems.
........
  r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines

  Patch #1446489	(zipfile: support for ZIP64)
........
  r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines

  Re-revert this change.  Install the version check and don't run the test
  until Gerhard has time to fully debug the issue.  This affects versions
  before 3.2.1 (possibly only versions earlier than 3.1.3).

  Based on discussion on python-checkins.
........
  r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines

  - bsddb: multithreaded DB access using the simple bsddb module interface
    now works reliably.  It has been updated to use automatic BerkeleyDB
    deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry
    database calls that would previously deadlock. [SF python bug #775414]
........
  r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines

  minor documentation cleanup.  mention the bsddb.db interface explicitly by name.
........
  r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines

  Steal the trick from test_compiler to print out a slow msg.
  This will hopefully get the buildbots to pass.  Not sure this
  test will be feasible or even work.  But everything is red now,
  so it can't get much worse.
........
  r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line

  Print some more info to get an idea of how much longer the test will last
........
  r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines

  Try to reduce the extreme peak memory and disk-space use
  of this test.  It probably still requires more disk space
  than most buildbots have, and in any case is still so
  intrusive that if we don't find another way to test this I'm
  taking my buildbot offline permanently ;-)
........
  r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines

  Oops -- I introduced an off-by-6436159488 error.
........
  r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line

  Disable this test until we can determine what to do about it
........
  r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line

  Param name is dir, not directory.  Update docstring.  Backport candidate
........
  r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line

  Add missing period in comment.
........
  r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line

  Fix whitespace, there are memory leaks in this module.
........
  r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines

  SF patch 1504676: Make sgmllib char and entity references pluggable
  (implementation/tests contributed by Sam Ruby)
........
  r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line

  fix change that broke the htmllib tests
........
  r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines

  Patch #763580:  Add name and value arguments to
  Tkinter variable classes.
........
  r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines

  Patch #1096231: Add default argument to wm_iconbitmap.
........
  r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines

  Patch #1494750: Destroy master after deleting children.
........
  r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines

  markup fix
........
  r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines

  Update url.

  Old url returned status code:301 Moved permanently.
........
  r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines

  Patch #812986: Update the canvas even if not tracing.
........
  r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines

  Patch #815924: Restore ability to pass type= and icon=
........
  r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line

  Fix typo in docstring
........
  r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line

  Fix memory leak reported by valgrind while running test_subprocess
........
  r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line

  remove unnecessary markup
........
  r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines

  Prevent spurious leaks when running regrtest.py -R.  There may be more
  issues that crop up from time to time, but this change seems to have been
  pretty stable (no spurious warnings) for about a week.

  Other modules which use threads may require similar use of
  threading_setup/threading_cleanup from test_support.
........
  r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines

  The hppa ubuntu box sometimes hangs forever in these tests.  My guess
  is that the wait is failing for some reason.  Use WNOHANG, so we won't
  wait until the buildbot kills the test suite.

  I haven't been able to reproduce the failure, so I'm not sure if
  this will help or not.  Hopefully, this change will cause the test
  to fail, rather than hang.  That will be better since we will get
  the rest of the test results.  It may also help us debug the real problem.
........
  r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line

  Revert 47014 until it is more robust
........
  r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines

  Fix typos.
  Fix doctest example.
  Mention in the tutorial that 'errcheck' is explained in the ref manual.
  Use better wording in some places.
  Remoce code examples that shouldn't be in the tutorial.
  Remove some XXX notices.
........
  r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines

  Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c.
........
  r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line

  Use Py_ssize_t
........
  r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines

  Add news entry about error msg improvement.
........
  r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines

  Try to repair the failing test on the OpenBSD buildbot.  Trial and error...
........
  r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines

  Patch #1506645: add Python wrappers for the curses functions
  is_term_resized, resize_term and resizeterm. This uses three
  separate configure checks (one for each function).
........
  r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines

  Make check order match in configure and configure.in.
........
  r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines

  Repair KeyError when running test_threaded_import under -R,
  as reported by Neal on python-dev.
........
  r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines

  Next try to fix the OpenBSD buildbot tests:
  Use ctypes.util.find_library to locate the C runtime library
  on platforms where is returns useful results.
........
  r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines

  TestHelp.make_parser():  This was making a permanent change to
  os.environ (setting envar COLUMNS), which at least caused
  test_float_default() to fail if the tests were run more than once.

  This repairs the test_optparse -R failures Neal reported on
  python-dev.  It also explains some seemingly bizarre test_optparse
  failures we saw a couple weeks ago on the buildbots, when
  test_optparse failed due to test_file failing to clean up after
  itself, and then test_optparse failed in an entirely different
  way when regrtest's -w option ran test_optparse a second time.
  It's now obvious that make_parser() permanently changing os.environ
  was responsible for the second half of that.
........
  r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines

  Preparing for 2.5b1.
........
  r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line

  remove non-working document formats from edist
........
  r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines

  Fixed a memory leak that was introduced with incorrect usage of the Python weak
  reference API in pysqlite 2.2.1.

  Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release.
........
  r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines

  Remove Python 2.3 compatibility comment.
........
  r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines

  Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338).
........
  r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines

  [ 1295808 ] expat symbols should be namespaced in pyexpat
  (http://python.org/sf/1295808)
........
  r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line

  Uncomment wsgiref section
........
  r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line

  Add four library items
........
  r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line

  Terminology and typography fixes
........
  r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line

  Add introductory paragraphs summarizing the release; minor edits
........
  r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line

  Minor edits and rearrangements; markup fix
........
  r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line

  [Bug #1504456] Mention xml -> xmlcore change
........
  r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines

  Raise TestSkipped when the test socket connection is refused.
........
  r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines

  Fix typo of exception name.
........
  r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines

  At the C level, tuple arguments are passed in directly to the exception
  constructor, meaning it is treated as *args, not as a single argument.  This
  means using the 'message' attribute won't work (until Py3K comes around),
  and so one must grab from 'arg' to get the error number.
........
  r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line

  Link to LibRef module documentation
........
  r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line

  Note some of Barry's work
........
  r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line

  Bump version
........
  r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines

  fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally
........
  r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines

  Make test_fcntl aware of netbsd3.
........
  r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines

  Patch #1509001: expected skips for netbsd3.
........
  r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines

  Removed call to enable_callback_tracebacks that slipped in by accident.
........
  r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines

  Fix for an obscure bug introduced by revs 46806 and 46808, with a test.
  The problem of checking too eagerly for recursive calls is the
  following: if a RuntimeError is caused by recursion, and if code needs
  to normalize it immediately (as in the 2nd test), then
  PyErr_NormalizeException() needs a call to the RuntimeError class to
  instantiate it, and this hits the recursion limit again...  causing
  PyErr_NormalizeException() to never finish.

  Moved this particular recursion check to slot_tp_call(), which is not
  involved in instantiating built-in exceptions.

  Backport candidate.
........
  r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines

  Copy the wsgiref package during make install.
........
  r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line

  Reset the doc date to today for the automatic doc builds
........
  r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line

  Mention how to suppress warnings
........
  r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines

  Set lineno correctly on list, tuple and dict literals.
........
  r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines

  Test for correct compilation of try-except-finally stmt.
  Test for correct lineno on list, tuple, dict literals.
........
  r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line

  fix markup nit
........
  r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines

  'warning's was improperly requiring that a command-line Warning category be
  both a subclass of Warning and a subclass of types.ClassType.  The latter is no
  longer true thanks to new-style exceptions.

  Closes bug #1510580.  Thanks to AMK for the test.
........
  r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines

  MacOSX: Add a message to the first screen of the installer that tells
  users how to avoid updates to their shell profile.
........
  r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines

  Fix my name ;)
........
  r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines

  Small fixes, mostly in the markup.
........
  r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line

  Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled.
........
  r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line

  Applied patch #1506758: Prevent MemoryErrors with large MAXFD.
........
  r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line

  Fix refleak
........
  r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines

  - SF bug #853506: IP6 address parsing in sgmllib
    ('[' and ']' were not accepted in unquoted attribute values)

  - cleaned up tests of character and entity reference decoding so the
    tests cover the documented relationships among handle_charref,
    handle_entityref, convert_charref, convert_codepoint, and
    convert_entityref, without bringing up Unicode issues that sgmllib
    cannot be involved in
........
  r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines

  Fit Makefile for the Python doc environment better; this is a step toward
  including the howtos in the build process.

  	* Put LaTeX output in ../paper-<whatever>/.
  	* Put HTML output in ../html/
  	* Explain some of the Makefile variables
  	* Remove some cruft dating to my environment (e.g. the 'web' target)

  This makefile isn't currently invoked by the documentation build process,
  so these changes won't destabilize anything.
........
  r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines

  Bug #1511381: codec_getstreamcodec() in codec.c is corrected to
  omit a default "error" argument for NULL pointer.  This allows
  the parser to take a codec from cjkcodecs again.
  (Reported by Taewook Kang and reviewed by Walter Doerwald)
........
  r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines

  Workaround for bug #1512124

  Without this patch IDLE will get unresponsive when you open the debugger
  window on OSX. This is both using the system Tcl/Tk on Tiger as the latest
  universal download from tk-components.sf.net.
........
  r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines

  Drop the calldll demo's for macos, calldll isn't present anymore, no need
  to keep the demo's around.
........
  r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines

  Use a path without a double slash to compile the .py files after installation
  (macosx, binary installer). This fixes bug #1508369 for python 2.5.
........
  r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines

  Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to
  be installed.
........
  r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line

  [Bug #1511998] Various comments from Nick Coghlan; thanks!
........
  r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line

  Describe workaround for PyRange_New()'s removal
........
  r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines

  [Bug #1512163] Fix typo.

  This change will probably break tests on FreeBSD buildbots, but I'll check in
  a fix for that next.
........
  r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines

  [Bug #1512163] Use one set of locking methods, lockf();
  remove the flock() calls.

  On FreeBSD, the two methods lockf() and flock() end up using the same
  mechanism and the second one fails.  A Linux man page claims that the
  two methods are orthogonal (so locks acquired one way don't interact
  with locks acquired the other way) but that clearly must be false.
........
  r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines

  Add a test for a conflicting lock.

  On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight.
  I'll see how the buildbots like it.
........
  r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line

  Windows doesn't have os.fork().  I'll just disable this test for now
........
  r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines

  Attempt to fix build failure on OS X and Debian alpha; the symptom is
  consistent with os.wait() returning immediately because some other
  subprocess had previously exited; the test suite then immediately
  tries to lock the mailbox and gets an error saying it's already
  locked.

  To fix this, do a waitpid() so the test suite only continues once
  the intended child process has exited.
........
  r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line

  Ignore some more warnings in the dynamic linker on an older gentoo
........
  r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines

  Instead of doing a make test, run the regression tests out of the installed
  copy.  This will hopefully catch problems where directories are added
  under Lib/ but not to Makefile.pre.in.  This breaks out the 2 runs
  of the test suite with and without -O which is also nicer.
........
  r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines

  Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3.

  No need to install lib-old, it's empty in 2.5.
........
  r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line

  Test unimportant change to verify buildbot does not try to build
........
  r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line

  Try again: test unimportant change to verify buildbot does not try to build
........
  r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line

  Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in)
........
  r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line

  Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
........
  r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines

  MacOSX: fix rather dumb buglet that made it impossible to create extensions on
  OSX 10.3 when using a binary distribution build on 10.4.
........
  r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines

  Use staticly build copies of zlib and bzip2 to build the OSX installer, that
  way the resulting binaries have a better change of running on 10.3.

  This patch also updates the search logic for sleepycat db3/4, without this
  patch you cannot use a sleepycat build with a non-standard prefix; with this
  you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at
  configure-time. This change is needed to build the binary installer for OSX.
........
  r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines

  macosx: Install a libpython2.5.a inside the framework as a symlink to the actual
  dylib at the root of the framework, that way tools that expect a unix-like
  install (python-config, but more importantly external products like
  mod_python) work correctly.
........
  r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines

  According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN
  can be returned if fcntl (lockf) fails.  This fixes the test failure
  on Tru64 by checking for either error rather than just EAGAIN.
........
  r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines

  Fix bug #1512695: cPickle.loads could crash if it was interrupted with
  a KeyboardInterrupt since PyTuple_Pack was passed a NULL.

  Will backport.
........
  r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line

  Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__')
........
  r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines

  A couple of crashers of the "won't fix" kind.
........
  r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line

  [Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me.
........
  r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line

  [Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section.  Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter.  Fred, please move if you see fit.
........
  r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines

  Fix end_fill().
........
  r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines

  Mention the expat upgrade and pyexpat fix I put in 2.5b1.
........
  r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines

  SF bug #1504333: sgmlib should allow angle brackets in quoted values
  (modified patch by Sam Ruby; changed to use separate REs for start and end
   tags to reduce matching cost for end tags; extended tests; updated to avoid
   breaking previous changes to support IPv6 addresses in unquoted attribute
   values)
........
  r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line

  document recent bugfixes in sgmllib
........
  r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines

  Add new utility function, reap_children(), to test_support.  This should
  be called at the end of each test that spawns children (perhaps it
  should be called from regrtest instead?).  This will hopefully prevent
  some of the unexplained failures in the buildbots (hppa and alpha)
  during tests that spawn children.  The problems were not reproducible.
  There were many zombies that remained at the end of several tests.
  In the worst case, this shouldn't cause any more problems,
  though it may not help either.  Time will tell.
........
  r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines

  This should fix the buildbot failure on s/390 which can't connect to gmail.org.
  It makes the error message consistent and always sends to stderr.

  It would be much better for all the networking tests to hit only python.org.
........
  r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines

  Protect the thread api calls in the _ctypes extension module within
  #ifdef WITH_THREADS/#endif blocks.  Found by Sam Rushing.
........
  r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines

  Patch #1509163: MS Toolkit Compiler no longer available
........
  r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line

  add string methods to index
........
  r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line

  Fixed bug in fileConfig() which failed to clear logging._handlerList
........
  r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines

  Whitespace normalization.
........
  r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line

  Silence compiler warning
........
  r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line

  Another problem reported by Coverity.  Backport candidate.
........
  r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines

  Revert the use of PY_FORMAT_SIZE_T in PyErr_Format.
........
  r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines

  Remove now-unused fidding with PY_FORMAT_SIZE_T.
........
  r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines

  Document decorator usage of property.
........
  r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines

  - consistency nit: always include "()" in \function and \method
    (*should* be done by the presentation, but that requires changes all over)
  - avoid spreading the __name meme
........
  r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line

  Added entry for fileConfig() bugfix.
........
  r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line

  Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly.
........
  r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines

  Release all forwarded functions in .close. Fixes #1513223.
........
  r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines

  SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data
  handler would cause a segfault.  This merges in Expat's lib/xmlparse.c
  revisions 1.154 and 1.155, which fix this and a closely related problem
  (the later does not affect Python).

  Moved the crasher test to the tests for xml.parsers.expat.
........
  r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines

  The sqlite3 module did cut off data from the SQLite database at the first null
  character before sending it to a custom converter. This has been fixed now.
........
  r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line

  Correct arithmetic in access on Win32. Fixes #1513646.
........
  r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line

  Cleanup: Remove commented out code.
........
  r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line

  Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag.
........
  r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines

  Fixes so that _ctypes can be compiled with the MingW compiler.

  It seems that the definition of '__attribute__(x)' was responsible for
  the compiler ignoring the '__fastcall' attribute on the
  ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some
  time to figure this out.
........
  r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines

  Add a new function uses_seh() to the _ctypes extension module.  This
  will return True if Windows Structured Exception handling (SEH) is
  used when calling functions, False otherwise.

  Currently, only MSVC supports SEH.

  Fix the test so that it doesn't crash when run with MingW compiled
  _ctypes.  Note that two tests are still failing when mingw is used, I
  suspect structure layout differences and function calling conventions
  between MSVC and MingW.
........
  r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines

  Only setup canvas when it is first created.
  Fixes #1514703
........
  r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines

  Reimplement turtle.circle using a polyline, to allow correct
  filling of arcs. Also fixes #1514693.
........
  r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines

  Bug #1514693: Update turtle's heading when switching between
  degrees and radians.
........
  r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines

  Document functions added in 2.3 and 2.5.
........
  r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines

  Bug #1417699: Reject locale-specific decimal point in float()
  and atof().
........
  r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines

  Bug #1267547: Put proper recursive setup.py call into the
  spec file generated by bdist_rpm.
........
  r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines

  Patch #825417: Fix timeout processing in expect,
  read_until. Will backport to 2.4.
........
  r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines

  Put method-wrappers into trashcan. Fixes #927248.
........
  r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line

  [Bug #1515932] Clarify description of slice assignment
........
  r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines

  [Bug #1511911] Clarify description of optional arguments to sorted()
     by improving the xref to the section on lists, and by
     copying the explanations of the arguments (with a slight modification).
........
  r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line

  Fix build problems with the platform SDK on windows.  It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft.  Must test with an undocumented macro, __STDC_SECURE_LIB__ too.
........
  r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines

  Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number
  of bugs in that port. The most annoying ones were due to some subtle differences
  between the document ABI and the actual implementation :-(

  (there are no python unittests that fail without this patch, but without it
   some of libffi's unittests fail).
........
  r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines

  Remove remaining references to OverflowWarning.
........
  r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines

  Fix the bitfield test when _ctypes is compiled with MingW.  Structures
  containing bitfields may have different layout on MSVC and MingW .
........
  r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines


  Fix bug in passing tuples to string.Template. All other values (with working
  str() or repr()) would work, just not multi-value tuples. Probably not a
  backport candidate, since it changes the behaviour of passing a
  single-element tuple:

  >>> string.Template("$foo").substitute(dict(foo=(1,)))

  '(1,)'

  versus

  '1'
........
  r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines

  Patch #1517490: fix glitches in filter() docs.
........
  r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines

  no need to elaborate "string".
........
  r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines

  Fix refleaks reported by Shane Hathaway in SF patch #1515361.  This change
  contains only the changes related to leaking the copy variable.
........
  r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines

  - back out Expat change; the final fix to Expat will be different
  - change the pyexpat wrapper to not be so sensitive to this detail of the
    Expat implementation (the ex-crasher test still passes)
........
  r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line

  Add a NEWS entry for a recent pyexpat fix
........
  r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines

  Add sqlite3.dll to the DLLs component, not to the TkDLLs component.
  Fixes #1517388.
........
  r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line

  Properly quote compileall and Lib paths in case TARGETDIR has a space.
........
  r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines

  Revert the change done in svn revision 47206:

  Add a new function uses_seh() to the _ctypes extension module.  This
  will return True if Windows Structured Exception handling (SEH) is
  used when calling functions, False otherwise.
........
  r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines

  A couple of examples about how to attack the fact that _PyType_Lookup()
  returns a borrowed ref.  Many of the calls are open to attack.
........
  r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines

  The test that calls a function with invalid arguments and catches the
  resulting Windows access violation will not be run by default.
........
  r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines

  Patch #1517790: It is now possible to use custom objects in the ctypes
  foreign function argtypes sequence as long as they provide a
  from_param method, no longer is it required that the object is a
  ctypes type.
........
  r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines

  Document the Struture and Union constructors.
........
  r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines

  Document the changes in svn revision 47263, from patch #1517790.
........
  r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines

  This patch solves the problem Skip was seeing with zlib, this patch ensures that
  configure uses similar compiler flags as setup.py when doing the zlib test.

  Without this patch configure would use the first shared library on the linker
  path, with this patch it uses the first shared or static library on that path
  just like setup.py.
........
  r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines


  NEWS entry for r47267: fixing configure's zlib probing.
........
  r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines

  added XMLParser alias for cElementTree compatibility
........
  r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line

  Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6
........
  r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line

  Update the tutorial section on relative imports
........
  r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line

  Ignore ImportWarning by default
........
  r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line

  Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs
........
  r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line

  Add NEWS entries for the ImportWarning change and documentation update
........
  r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line

  ImportWarning is now silent by default
........
  r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines

  Document the correct return type of PyLong_AsUnsignedLongLongMask.
........
  r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines

  Add a testcase for r47086 which fixed a bug in codec_getstreamcodec().
........
  r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines

  Test using all CJK encodings for the testcases which don't require
  specific encodings.
........
  r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines

  Properly generate logical file ids. Fixes #1515998.
  Also correct typo in Control.mapping.
........
  r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines

  Restore rev 47014:

  The hppa ubuntu box sometimes hangs forever in these tests.  My guess
  is that the wait is failing for some reason.  Use WNOHANG, so we won't
  wait until the buildbot kills the test suite.

  I haven't been able to reproduce the failure, so I'm not sure if
  this will help or not.  Hopefully, this change will cause the test
  to fail, rather than hang.  That will be better since we will get
  the rest of the test results.  It may also help us debug the real problem.

  *** The reason this originally failed was because there were many
  zombie children outstanding before rev 47158 cleaned them up.
  There are still hangs in test_subprocess that need to be addressed,
  but that will take more work.  This should close some holes.
........
  r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines

  Fix RFC number.
........
  r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line

  Fix SF bug #1519018: 'as' is now validated properly in import statements
........
  r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines

  Add an additional test for bug #1519018.
........
  r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines

  Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
........
  r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines

  Fix SF bug 1441486: bad unary minus folding in compiler.
........
  r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines

  On 64 bit systems, int literals that use less than 64 bits are now ints
  rather than longs.  This also fixes the test for eval(-sys.maxint - 1).
........
  r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines

  Bug #1512814, Fix incorrect lineno's when code at module scope
  started after line 256.
........
  r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line

  Fix doco.  Backport candidate.
........
  r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines

  Part of SF patch #1484695.  This removes dead code.  The chksum was
  already verified in .frombuf() on the lines above.  If there was
  a problem an exception is raised, so there was no way this condition
  could have been true.
........
  r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines

  Patch #1516912: improve Modules support for OpenVMS.
........
  r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines

  Patch #1504046: Add documentation for xml.etree.

  /F wrote the text docs, Englebert Gruber massaged it to latex and I
  did some more massaging to try and improve the consistency and
  fix some name mismatches between the declaration and text.
........
  r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines

  Introduce DISTUTILS_USE_SDK as a flag to determine whether the
  SDK environment should be used. Fixes #1508010.
........
  r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line

  Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK.
........
  r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line

  Add svn:ignore.
........
  r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line

  preparing for 2.5b2
........
  r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines

  Fix bug #1518190: accept any integer or long value in the
  ctypes.c_void_p constructor.
........
  r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines

  Fixed a segfault when ctypes.wintypes were imported on
  non-Windows machines.
........
  r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines

  Assigning None to pointer type structure fields possible overwrote
  wrong fields.
........
  r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines

  Moved the ctypes news entries from the 'Library' section into the
  'Extension Modules' section where they belong, probably.

  This destroyes the original order of the news entries, don't know
  if that is important or not.
........
  r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines

  Fix SF#1516184 and add a test to prevent regression.
........
  r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines

  Fix SF#1457312: bad socket error handling in distutils "upload" command.
........
  r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line

  Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children().
........
  r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines

  After approval from Anthony, merge the tim-current_frames
  branch into the trunk.  This adds a new sys._current_frames()
  function, which returns a dict mapping thread id to topmost
  thread stack frame.
........
  r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines

  Patch #1519566: Remove unused _tofill member.
  Make begin_fill idempotent.
  Update demo2 to demonstrate filling of concave shapes.
........
  r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines

  #1494314: Fix a regression with high-numbered sockets in 2.4.3. This
  means that select() on sockets > FD_SETSIZE (typically 1024) work again.
  The patch makes sockets use poll() internally where available.
........
  r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line

  Add missing Py_DECREF.
........
  r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line

  Add missing Py_DECREFs.
........
  r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line

  Bump version number;  add sys._current_frames
........
  r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines

  When a foreign function is retrived by calling __getitem__ on a ctypes
  library instance, do not set it as attribute.
........
  r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines

  Change the ctypes version number to 1.0.0.
........
  r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines

  Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
........
  r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line

  Fix function name in error msg
........
  r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines

  Fix uninitialized memory read reported by Valgrind when running doctest.
  This could happen if size == 0.
........
  r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line

  Actually change the MAGIC #.  Create a new section for 2.5c1 and mention the impact of changing the MAGIC #.
........
  r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines

  Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to
  load shared libraries.
........
  r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines

  Fix the wrong description of LibraryLoader.LoadLibrary, and document
  the DEFAULT_MODE constant.
........
  r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines

  Accept long options "--help" and "--version".
........
  r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines

  A misspelled preprocessor symbol caused ctypes to be always compiled
  without thread support.  Replaced WITH_THREADS with WITH_THREAD.
........
  r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines

  Fix #1521375.  When running with root priviledges, 'gcc -o /dev/null'
  did overwrite /dev/null.  Use a temporary file instead of /dev/null.
........
  r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines

  Fix misleading words.
........
  r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line

  Typo fix
........
  r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines

  Patch #1521874: grammar errors in doanddont.tex.
........
  r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line

  Try to improve grammar further.
........
  r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line

  Extend build_ssl to Win64, using VSExtComp.
........
  r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line

  Add debug output to analyse buildbot failure.
........
  r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line

  Fix Debug build of _ssl.
........
  r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line

  Mention new options
........
  r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line

  Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode.
........
  r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines

  Make the prototypes of our private PyUnicode_FromWideChar and
  PyUnicode_AsWideChar replacement functions compatible to the official
  functions by using Py_ssize_t instead of int.
........
  r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines

  Patch #1521817: The index range checking on ctypes arrays containing
  exactly one element is enabled again.
........
  r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines

  Updates for the ctypes documentation.
........
  r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines

  typo
........
  r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines

  Bug #15187702 : ext/win-cookbook.html has a broken link to distutils
........
  r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line

  Patch #1220874: Update the binhex module for Mach-O.
........
  r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line

  clean up some link markup
........
  r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines

  Bug #1512814, Fix incorrect lineno's when code within a function
  had more than 255 blank lines.  Byte codes need to go first, line #s second.
........
  r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines

  a & b were dereffed above, so they are known to be valid pointers.
  z is known to be NULL, nothing to DECREF.

  Reported by Klockwork, #107.
........
  r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines

  self is dereffed (and passed as first arg), so it's known to be good.
  func is returned from PyArg_ParseTuple and also dereffed.

  Reported by Klocwork, #30 (self one at least).
........
  r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines

  proto was dereffed above and is known to be good.  No need for X.

  Reported by Klocwork, #39.
........
  r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines

  Fix memory leaks in some conditions.

  Reported by Klocwork #152.
........
  r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines

  Fix memory leak under some conditions.

  Reported by Klocwork, #98.
........
  r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines

  Use sizeof(buffer) instead of duplicating the constants to ensure they won't
  be wrong.

  The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1
  to strncat.  strncat copies n+1 bytes from src (not dest).

  Reported by Klocwork #58.
........
  r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines

  Handle a NULL name properly.

  Reported by Klocwork #67
........
  r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines

  PyFunction_SetDefaults() is documented as taking None or a tuple.
  A NULL would crash the PyTuple_Check().  Now make NULL return a SystemError.

  Reported by Klocwork #73.
........
  r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines

  Stop INCREFing name, then checking if it's NULL.  name (f_name) should never
  be NULL so assert it.  Fix one place where we could have passed NULL.

  Reported by Klocwork #66.
........
  r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines

  otherset is known to be non-NULL based on checks before and DECREF after.
  DECREF otherset rather than XDECREF in error conditions too.

  Reported by Klockwork #154.
........
  r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines

  Reported by Klocwork #151.

  v2 can be NULL if exception2 is NULL.  I don't think that condition can happen,
  but I'm not sure it can't either.  Now the code will protect against either
  being NULL.
........
  r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line

  Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool.
........
  r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines

  document xmlcore (still minimal; needs mention in each of the xml.* modules)
  SF bug #1504456 (partial)
........
  r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines

  Remove usage of sets module (patch #1500609).
........
  r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines

  Add missing NEWS item (#1522771)
........
  r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line

  Attribute more features
........
  r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines

  Patch 1479219 - Tal Einat
  1. 'as' highlighted as builtin in comment string on import line
  2. Comments such as "#False identity" which start with a keyword immediately
     after the '#' character aren't colored as comments.
  3. u or U beginning unicode string not correctly highlighted

  Closes bug 1325071
........
  r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines

  decode_rfc2231(): Be more robust against buggy RFC 2231 encodings.
  Specifically, instead of raising a ValueError when there is a single tick in
  the parameter, simply return that the entire string unquoted, with None for
  both the charset and the language.  Also, if there are more than 2 ticks in
  the parameter, interpret the first three parts as the standard RFC 2231 parts,
  then the rest of the parts as the encoded string.

  Test cases added.

  Original fewer-than-3-parts fix by Tokio Kikuchi.

  Resolves SF bug # 1218081.  I will back port the fix and tests to Python 2.4
  (email 3.0) and Python 2.3 (email 2.5).

  Also, bump the version number to email 4.0.1, removing the 'alpha' moniker.
........
  r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines

  Rebinding Tab key was inserting 'tab' instead of 'Tab'.  Bug 1179168.
........
  r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines

  Fix bug #1520914.  Starting in 2.4, time.strftime() began to check the bounds
  of values in the time tuple passed in.  Unfortunately people came to rely on
  undocumented behaviour of setting unneeded values to 0, regardless of if it was
  within the valid range.  Now those values force the value internally to the
  minimum value when 0 is passed in.
........
  r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line

  Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón
........
  r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines

  Patch #1524429: Use repr instead of backticks again.
........
  r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines

  SF bug 1524317: configure --without-threads fails to build

  Moved the code for _PyThread_CurrentFrames() up, so it's no longer
  in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in
  one).

  Changed test_sys's test_current_frames() so it passes with or without
  thread supported compiled in.

  Note that test_sys fails when Python is compiled without threads,
  but for an unrelated reason (the old test_exit() fails with an
  indirect ImportError on the `thread` module).  There are also
  other unrelated compilation failures without threads, in extension
  modules (like ctypes); at least the core compiles again.

  Do we really support --without-threads?  If so, there are several
  problems remaining.
........
  r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines

  Make sure the _ctypes extension can be compiled when WITH_THREAD is
  not defined on Windows, even if that configuration is probably not
  supported at all.
........
  r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines

  Revert r50706 (Whitespace normalization) and
  r50697: Comments and docs cleanups, and some little fixes
  per recommendation from Raymond Hettinger.
........
  r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines

  Fix SF#1516184 (again) and add a test to prevent regression.
  (There was a problem with empty filenames still causing recursion)
........
  r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines

  Guard for _active being None in __del__ method.
........
  r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line

  Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler.
........
  r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line

  markup fix
........
  r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines

  Avoid occasional failure to detect closing paren properly.
  Patch 1407280 Tal Einat

  M    ParenMatch.py
  M    NEWS.txt
  M    CREDITS.txt
........
  r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line

  Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower().
........
  r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line

  Add some asserts that we got good params passed
........
  r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines

  Move the initialization of some pointers earlier.  The problem is
  that if we call Py_DECREF(frame) like we do if allocating locals fails,
  frame_dealloc() will try to use these bogus values and crash.
........
  r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines

  Handle allocation failures gracefully.  Found with failmalloc.
  Many (all?) of these could be backported.
........
  r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line

  Speel initialise write.  Tanks Anthony.
........
  r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines

  Handle more memory allocation failures without crashing.
........
  r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines

  More RFC 2231 improvements for the email 4.0 package.  As Mark Sapiro rightly
  points out there are really two types of continued headers defined in this
  RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded
  parameters with the form "name*0="), but we were were handling them both the
  same way and that isn't correct.

  This patch should be much more RFC compliant in that only encoded params are
  %-decoded and the charset/language information is only extract if there are
  any encoded params in the segments.  If there are no encoded params then the
  RFC says that there will be no charset/language parts.

  Note however that this will change the return value for Message.get_param() in
  some cases.  For example, whereas before if you had all unencoded param
  continuations you would have still gotten a 3-tuple back from this method
  (with charset and language == None), you will now get just a string.  I don't
  believe this is a backward incompatible change though because the
  documentation for this method already indicates that either return value is
  possible and that you must do an isinstance(val, tuple) check to discriminate
  between the two.  (Yeah that API kind of sucks but we can't change /that/
  without breaking code.)

  Test cases, some documentation updates, and a NEWS item accompany this patch.
........
  r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines

  Fix check for empty list (vs. None).
........
  r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines

  Remove an XXX marker in a comment.
........
  r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line

  Fix more memory allocation issues found with failmalloc.
........
  r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line

  Don't fail if the directory already exists
........
  r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines

  Be a lot smarter about whether this test passes: instead of assuming
  that a 2.93 sec audio file will always take 3.1 sec (as it did on the
  hardware I had when I first wrote the test), expect that it will take
  2.93 sec +/- 10%, and only fail if it's outside of that range.
  Compute the expected
........
  r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines

  Tooltips failed on new-syle class __init__ args.  Bug 1027566 Loren Guthrie
........
  r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line

  Handle more mem alloc issues found with failmalloc
........
  r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines

  If the for loop isn't entered, entryblock will be NULL.  If passed
  to stackdepth_walk it will be dereffed.

  Not sure if I found with failmalloc or Klockwork #55.
........
  r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines

  Move the initialization of size_a down below the check for a being NULL.

  Reported by Klocwork #106
........
  r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines

  Check the allocation of b_objects and return if there was a failure.
  Also fix a few memory leaks in other failure scenarios.

  It seems that if b_objects == Py_None, we will have an extra ref to
  b_objects.  Add XXX comment so hopefully someone documents why the
  else isn't necessary or adds it in.

  Reported by Klocwork #20
........
  r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines

  Fix memory leaks spotted by Klocwork #37.
........
  r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines

  nextlink can be NULL if teedataobject_new fails, so use XINCREF.
  Ensure that dataobj is never NULL.

  Reported by Klocwork #102
........
  r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines

  Ensure we don't write beyond errText.  I think I got this right, but
  it definitely could use some review to ensure I'm not off by one
  and there's no possible overflow/wrap-around of bytes_left.
  Reported by Klocwork #1.

  Fix a problem if there is a failure allocating self->db.
  Found with failmalloc.
........
  r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines

  Without this patch CMD-W won't close EditorWindows on MacOS X. This solves
  part of bug #1517990.
........
  r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines

  Fix for bug #1517996: Class and Path browsers show Tk menu

  This patch replaces the menubar that is used by AquaTk for windows without a
  menubar of their own by one that is more appropriate for IDLE.
........
  r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines

  Build updates for OS/2 EMX port
........
  r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines

  bugfix: PyThread_start_new_thread() returns the thread ID, not a flag;
  will backport.
........
  r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines

  Get mailbox module working on OS/2 EMX port.
........
  r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line

  Resync optparse with Optik 1.5.3: minor tweaks for/to tests.
........
  r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines

  Update list of unsupported systems. Fixes #1510853.
........
  r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line

  Patch #1448199: Release GIL around ConnectRegistry.
........
  r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines

  Patch #1232023: Don't include empty path component from registry,
  so that the current directory does not get added to sys.path.
  Also fixes #1526785.
........
  r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines

  Bug #1524310: Properly report errors from FindNextFile in os.listdir.
  Will backport to 2.4.
........
  r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines

  Patch #1523356: fix determining include dirs in python-config.

  Also don't install "python-config" when doing altinstall, but
  always install "python-config2.x" and make a link to it like
  with the main executable.
........
  r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines

  Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly.
........
  r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines

  Patch #1515343: Fix printing of deprecated string exceptions with a
  value in the traceback module.
........
  r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines

  EditorWindow failed when used stand-alone if sys.ps1 not set.
  Bug 1010370 Dave Florek

  M    EditorWindow.py
  M    PyShell.py
  M    NEWS.txt
........
  r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines

  - EditorWindow.test() was failing.  Bug 1417598

  M    EditorWindow.py
  M    ScriptBinding.py
  M    NEWS.txt
........
  r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines

  Repair accidental NameError.
........
  r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines

  Don't use standard assert: want tests to fail even when run with -O.
  Delete cruft.
........
  r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines

  current_frames_with_threads():  There's actually no way
  to guess /which/ line the spawned thread is in at the time
  sys._current_frames() is called:  we know it finished
  enter_g.set(), but can't know whether the instruction
  counter has advanced to the following leave_g.wait().
  The latter is overwhelming most likely, but not guaranteed,
  and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot
  found it on the other line once.  Changed the test so it
  passes in either case.
........
  r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines

  Bug #1525817: Don't truncate short lines in IDLE's tool tips.
........
  r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines

  Bug #978833: Really close underlying socket in _socketobject.close.
  Will backport to 2.4.
........
  r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line

  Revert incomplete checkin.
........
  r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines

  Patch #1525766: correctly pass onerror arg to recursive calls
  of pkg.walk_packages. Also improve the docstrings.
........
  r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines

  Add comment for changes to test_ossaudiodev.
........
  r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines

  Fix a bug in the messages for an assert failure where not enough arguments to a string
  were being converted in the format.
........
  r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines

  Document why is and is not a good way to fix the gc_inspection crasher.
........
  r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines

  Added another crasher, which hit me today (I was not intentionally
  writing such code, of course, but it took some gdb time to figure out
  what my bug was).
........
  r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines

  Document the crashers that will not go away soon as "won't fix",
  and explain why.
........
  r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines

  Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead
  of 'ln -s', this avoid problems when reinstalling python.
........
  r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines

  Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not
  without causing problems for anyone that is on a case-insensitive filesystem).

  Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the
  actual file is named macosmodule.c. This is no problem on the (default)
  case-insensitive filesystem, but doesn't work on case-sensitive filesystems.
........
  r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines

  Fix bug #1517990: IDLE keybindings on OSX

  This adds a new key definition for OSX, which is slightly different from the
  classic mac definition.

  Also add NEWS item for a couple of bugfixes I added recently.
........
  r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line

  Hmm, only python2.x is installed, not plain python.  Did that change recently?
........
  r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines

  Forward port some fixes that were in email 2.5 but for some reason didn't make
  it into email 4.0.  Specifically, in Message.get_content_charset(), handle RFC
  2231 headers that contain an encoding not known to Python, or a character in
  the data that isn't in the charset encoding.  Also forward port the
  appropriate unit tests.
........
  r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines

  NEWS entry for #1525766.
........
  r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines

  Bug #1459963: properly capitalize HTTP header names.
........
  r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines

  Part of bug #1523610: fix miscalculation of buffer length.

  Also add a guard against NULL in converttuple and add a test case
  (that previously would have crashed).
........
  r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines

  Bug #978833: Really close underlying socket in _socketobject.close.
  Fix httplib.HTTPConnection.getresponse to not close the
  socket if it is still needed for the response.
........
  r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line

  [Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below.  Fix from Paul Eggert.  I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment.
........
  r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line

  Correct error message
........
  r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line

  Minor grammar fix
........
  r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line

  Put news item in right section
........
  r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line

  Use sys.exc_info()
........
  r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line

  Use sys.exc_info()
........
  r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines

  Allow the 'onerror' argument to walk_packages() to catch any Exception, not
  just ImportError.  This allows documentation tools to better skip unimportable
  packages.
........
  r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines

  Bug #1521947:  possible bug in mystrtol.c with recent gcc.

  In general, C doesn't define anything about what happens when
  an operation on a signed integral type overflows, and PyOS_strtol()
  did several formally undefined things of that nature on signed
  longs.  Some version of gcc apparently tries to exploit that now,
  and PyOS_strtol() could fail to detect overflow then.

  Tried to repair all that, although it seems at least as likely to me
  that we'll get screwed by bad platform definitions for LONG_MIN
  and/or LONG_MAX now.  For that reason, I don't recommend backporting
  this.

  Note that I have no box on which this makes a lick of difference --
  can't really test it, except to note that it didn't break anything
  on my boxes.

  Silent change:  PyOS_strtol() used to return the hard-coded 0x7fffffff
  in case of overflow.  Now it returns LONG_MAX.  They're the same only on
  32-bit boxes (although C doesn't guarantee that either ...).
........
  r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines

  Don't kill a normal instance of python running on windows when checking
  to kill a cygwin instance.  build\\python.exe was matching a normal windows
  instance.  Prefix that with a \\ to ensure build is a directory and not
  PCbuild.  As discussed on python-dev.
........
  r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines

  Closure can't be NULL at this point since we know it's a tuple.

  Reported by Klocwork # 74.
........
  r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line

  No functional change.  Add comment and assert to describe why there cannot be overflow which was reported by Klocwork.  Discussed on python-dev
........
  r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines

  Bump distutils version to 2.5, as several new features
  have been introduced since 2.4.
........
  r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line

  Reformat docstring; fix typo
........
  r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines

  Add test_main() methods. These three tests were never run
  by regrtest.py.

  We really need a simpler testing framework.
........
  r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines

  News for patch #1529686.
........
  r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines

  Amend news entry.
........
  r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines

  Make uuid test suite pass on this box by requesting output with LC_ALL=C.
........
  r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line

  Add example
........
  r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines

  Remove code that is no longer used (ctypes.com).

  Fix the DllGetClassObject and DllCanUnloadNow so that they forward the
  call to the comtypes.server.inprocserver module.

  The latter was never documented, never used by published code, and
  didn't work anyway, so I think it does not deserve a NEWS entry (but I
  might be wrong).
........
  r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line

  Typo fix ('publically' is rare, poss. non-standard)
........
  r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line

  Add missing word
........
  r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line

  Repair typos
........
  r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line

  Update URL; add example
........
  r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line

  Add punctuation mark; add some examples
........
  r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line

  Mention base64 module; rewrite last sentence to be more positive
........
  r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line

  If binhex is higher-level than binascii, it should come first in the chapter
........
  r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines

  check_node():  stop spraying mystery output to stderr.

  When a node number disagrees, keep track of all sources & the
  node numbers they reported, and stick all that in the error message.

  Changed all callers to supply a non-empty "source" argument; made
  the "source" argument non-optional.

  On my box, test_uuid still fails, but with the less confusing output:

  AssertionError: different sources disagree on node:
      from source 'getnode1', node was 00038a000015
      from source 'getnode2', node was 00038a000015
      from source 'ipconfig', node was 001111b2b7bf

  Only the last one appears to be correct; e.g.,

  C:\Code\python\PCbuild>getmac

  Physical Address    Transport Name
  =================== ==========================================================
  00-11-11-B2-B7-BF   \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1}
  62-A1-AC-6C-FD-BE   \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A}
  E2-1F-01-C6-5D-88   \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4}

  I can't find anything on my box with MAC 00-03-8a-00-00-15, and am
  not clear on where that comes from.
........
  r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line

  Reword paragraph
........
  r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line

  Add example
........
  r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line

  Add example
........
  r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines

  Patch #1520294: Support for getset and member descriptors in types.py,
  inspect.py, and pydoc.py.  Specifically, this allows for querying the type of
  an object against these built-in C types and more importantly, for getting
  their docstrings printed in the interactive interpreter's help() function.

  This patch includes a new built-in module called _types which provides
  definitions of getset and member descriptors for use by the types.py module.
  These types are exposed as types.GetSetDescriptorType and
  types.MemberDescriptorType.  Query functions are provided as
  inspect.isgetsetdescriptor() and inspect.ismemberdescriptor().  The
  implementations of these are robust enough to work with Python implementations
  other than CPython, which may not have these fundamental types.

  The patch also includes documentation and test suite updates.

  I commit these changes now under these guiding principles:

  1. Silence is assent.  The release manager has not said "no", and of the few
     people that cared enough to respond to the thread, the worst vote was "0".

  2. It's easier to ask for forgiveness than permission.

  3. It's so dang easy to revert stuff in svn, that you could view this as a
     forcing function. :)

  Windows build patches will follow.
........
  r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines

  Bug #1529297:  The rewrite of doctest for Python 2.4 unintentionally
  lost that tests are sorted by name before being run.  ``DocTestFinder``
  has been changed to sort the list of tests it returns.
........
  r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines

  Enable the building of the _types module on Windows.

  Note that this has only been tested for VS 2003 since that's all I have.
........
  r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines

  defdict_reduce():  Plug leaks.

  We didn't notice these before because test_defaultdict didn't
  actually do anything before Georg fixed that earlier today.
  Neal's next refleak run then showed test_defaultdict leaking
  9 references on each run.  That's repaired by this checkin.
........
  r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines

  News about the repaired memory leak in defaultdict.
........
  r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines

  - pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename
    methods now allow their database parameter to be None as the
    sleepycat API allows.

  Also adds an appropriate test case for DBEnv.dbrename and dbremove.
........
  r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line

  Ensure the actual number matches the expected count
........
  r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines

  Live with that "the hardware address" is an ill-defined
  concept, and that different ways of trying to find "the
  hardware address" may return different results.  Certainly
  true on both of my Windows boxes, and in different ways
  (see whining on python-dev).
........
  r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines

  Try to find the MAC addr on various flavours of Unix.  This seems hopeless.
  The reduces the test_uuid failures, but there's still another method failing.
........
  r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines

  Add UUID for upcoming 2.5b3.
........
  r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines

  Allow socketmodule to compile on NetBSD -current, whose bluetooth API
  differs from both Linux and FreeBSD. Accepted by Neal Norwitz.
........
  r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line

  [Patch #1529811] Correction to description of r|* mode
........
  r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line

  Typo fix
........
  r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line

  Add example
........
  r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line

  Add example
........
  r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line

  Don't overwrite built-in name; add some blank lines for readability
........
  r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line

  Add example.  Should I propagate this example to all the other DBM-ish modules, too?
........
  r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines

  Patch #1529686: also run test_email_codecs with regrtest.py.
........
  r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines

  Fix spelling.
........
  r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines

  Remove a useless XXX comment.
  Cosmetic changes to the code so that the #ifdef _UNICODE block
  doesn't mess emacs code formatting.
........
  r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines

  Bug #1529871: The speed enhancement patch #921466 broke Python's compliance
  with PEP 302.  This was fixed by adding an ``imp.NullImporter`` type that is
  used in ``sys.path_importer_cache`` to cache non-directory paths and avoid
  excessive filesystem operations during imports.
........
  r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines

  Fix svn merge spew.
........
  r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines

  Patch #1529514: More openbsd platforms for ctypes.
  Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59.

  Approved by Neal.
........
  r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines

  Bug #835255: The "closure" argument to new.function() is now documented.
........
  r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines

  Bug #1441397: The compiler module now recognizes module and function
  docstrings correctly as it did in Python 2.4.
........
  r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines

  Revert rev 42617, it was introduced to work around bug #1441397.
  test_compiler now passes again.
........
  r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line

  update target version number
........
  r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line

  Add example
........
  r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line

  Update URL
........
  r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line

  Reword paragraph to match the order of the subsequent sections
........
  r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line

  [Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit
........
  r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line

  [Bug #1519571] Document some missing functions: setup(), title(), done()
........
  r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line

  Fix docstring punctuation
........
  r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line

  [Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique.  Raymond, please feel free to edit or revert.
........
  r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line

  [Bug #1530382] Document SSL.server(), .issuer() methods
........
  r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line

  Typo fix
........
  r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line

  Tweak wording
........
  r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines

  Fix typo
........
  r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines

  [Bug #1528258] Mention that the 'data' argument can be None.

  The constructor docs referred the reader to the add_data() method's docs,
  but they weren't very helpful.  I've simply copied an earlier explanation
  of 'data' that's more useful.
........
  r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line

  Set bug/patch count.  Take a bow, everyone!
........
  r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines

  expunge the xmlcore changes:
    41667, 41668 - initial switch to xmlcore
    47044        - mention of xmlcore in What's New
    50687        - mention of xmlcore in the library reference

  re-apply xmlcore changes to xml:
    41674        - line ending changes (re-applied manually), directory props
    41677        - add cElementTree wrapper
    41678        - PSF licensing for etree
    41812        - whitespace normalization
    42724        - fix svn:eol-style settings
    43681, 43682 - remove Python version-compatibility cruft from minidom
    46773        - fix encoding of \r\n\t in attr values in saxutils
    47269        - added XMLParser alias for cElementTree compatibility

  additional tests were added in Lib/test/test_sax.py that failed with
  the xmlcore changes; these relate to SF bugs #1511497, #1513611
........
  r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines

  Reorganize the docs for 'file' and 'open()' after some discussion with Fred.

  We want to encourage users to write open() when opening a file, but
  open() was described with a single paragraph and
  'file' had lots of explanation of the mode and bufsize arguments.

  I've shrunk the description of 'file' to cross-reference to the 'File
  objects' section, and to open() for an explanation of the arguments.

  open() now has all the paragraphs about the mode string.  The bufsize
  argument was moved up so that it isn't buried at the end; now there's
  1 paragraph on mode, 1 on bufsize, and then 3 more on mode.  Various
  other edits and rearrangements were made in the process.

  It's probably best to read the final text and not to try to make sense
  of the diffs.
........
  r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line

  restore test un-intentionally removed in the xmlcore purge (revision 50941)
........
  r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines

  make the reference to older versions of the documentation a link
  to the right page on python.org
........
  r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line

  document the footnote usage pattern
........
  r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line

  emphasize and oddball nuance of LaTeX comment syntax
........
  r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line

  [Patch #1490989 from Skip Montanaro]  Mention debugging builds in the API documentation.  I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit.
........
  r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines

  Disable these tests until they are reliable across platforms.
  These problems may mask more important, real problems.

  One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu.
  They pass on Windows and some Linux boxes.
........
  r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line

  [Patch #1068277] Clarify that os.path.exists() can return False depending on permissions.  Fred approved committing this patch in December 2004!
........
  r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines

  SF bug #1193966: Weakref types documentation misplaced

  The information about supporting weakrefs with types defined in C extensions
  is moved to the Extending & Embedding manual.  Py_TPFLAGS_HAVE_WEAKREFS is
  no longer mentioned since it is part of Py_TPFLAGS_DEFAULT.
........
  r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines

  Add a comment to the csv reader documentation that explains why the
  treatment of newlines changed in 2.5.  Pulled almost verbatim from a comment
  by Andrew McNamara in <http://python.org/sf/1465014>.
........
  r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines

  If the executable doesn't exist, there's no reason to try to start it.
  This prevents garbage about command not found being printed on Solaris.
........
  r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line

  fix minor markup error that introduced extra punctuation
........
  r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines

  Disable test_getnode too, since this is also unreliable.
........
  r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line

  Follow TeX's conventions for hyphens
........
  r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line

  Fix case for 'Unix'
........
  r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line

  markup cleanups
........
  r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line

  Minor typo fixes
........
  r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line

  [Bug #793553] Correct description of keyword arguments for SSL authentication
........
  r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line

  lots of markup nits, most commonly Unix/unix --> \UNIX
........
  r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line

  update information on wxPython, from Robin Dunn
........
  r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines

  remove possibly-outdated comment on what GUI toolkit is most commonly used;
  it is hard to know whether this is right, and it does not add valuable reference information
  at any rate
........
  r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines

  - remove yet another reference to how commonly Tkinter is (thought to be) used
  - fix an internal section reference
........
  r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines

  Patch #1531113: Fix augmented assignment with yield expressions.
  Also fix a SystemError when trying to assign to yield expressions.
........
  r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines

  Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn().
  This provides the proper warning for struct.pack().
  PyErr_Warn() is now deprecated in favor of PyErr_WarnEx().
  As mentioned by Tim Peters on python-dev.
........
  r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines

  Bug #1515471: string.replace() accepts character buffers again.
  Pass the char* and size around rather than PyObject's.
........
  r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line

  Whitespace normalization
........
  r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines

  Clarify that __op__ methods must return NotImplemented if they don't support the operation.
........
  r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines

  Bug #1002398: The documentation for os.path.sameopenfile now correctly
  refers to file descriptors, not file objects.
........
  r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines

  Don't copy directory stat times in shutil.copytree on Windows
  Fixes #1525866.
........
  r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines

  Base __version__ on sys.version_info, as distutils is
  no longer maintained separatedly.
........
  r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines

  Mention Cygwin in distutils error message about a missing VS 2003.
  Fixes #1257728.
........
  r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines

  Drop usage of test -e in configure as it is not portable.
  Fixes #1439538
  Will backport to 2.4
  Also regenerate pyconfig.h.in.
........
  r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines

  Fix makefile changes for python-config.
........
  r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines

  Rename struct.pack_to to struct.pack_into as changed in revision 46642.
........
  r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines

  Typo fix
........
  r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line

  Add some asserts and update comments
........
  r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line

  Verify that the signal handlers were really called
........
  r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines

  Try to prevent hangs on Tru64/Alpha buildbot.  I'm not certain this will help
  and may need to be reverted if it causes problems.
........
  r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines

  Bug #1531349: right <-> left glitch in __rop__ description.
........
  r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines

  Whitespace normalization.
........
  r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines

  Redo the comment about the 2.5 change in quoted-newline handling.
........
  r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines

  ZipFile.close():  Killed one of the struct.pack deprecation
  warnings on Win32.

  Also added an XXX about the line:

                  pos3 = self.fp.tell()

  `pos3` is never referenced, and I have no idea what the code
  intended to do instead.
........
  r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines

  ZipFile.close():  Kill the other struct.pack deprecation
  warning on Windows.

  Afraid I can't detect a pattern to when the pack formats decide
  to use a signed or unsigned format code -- appears nearly
  arbitrary to my eyes.  So I left all the pack formats alone and
  changed the special-case data values instead.
........
  r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line

  minor tweaks
........
  r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line

  minor tweaks
........
  r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line

  Add refcounts for PyErr_WarnEx
........
  r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines

  Document PyErr_WarnEx.  (Bad Neal!  No biscuit!)

  Is the explanation of the 'stacklevel' parameter clear?  Please feel free
  to edit it.

  I don't have LaTeX installed on this machine, so haven't verified that the
  markup is correct.  Will check tonight, or maybe the automatic doc build will
  tell me.
........
  r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line

  Add PyErr_WarnEx()
........
  r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line

  Mention csv newline changes
........
  r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line

  Typo fix
........
  r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line

  Remove reference to  notation
........
  r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines

  Fix function name.
........
  r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line

  [Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own.  This means string methods will now show up in the ToC.  (Should the types come before or after the functions+exceptions+constants chapter?  I've put them after, for now.)
........
  r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line

  [Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match
........
  r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line

  Update list of files; fix a typo
........
  r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line

  typo fix
........
  r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines

  Fix a potential segfault and various potentail refcount leaks
  in the cast() function.
........
  r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line

  Minimal useful docstring for CopyComPointer.
........
  r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines

  [Patch #1520905] Attempt to suppress core file created by test_subprocess.py.
  Patch by Douglas Greiman.

  The test_run_abort() testcase produces a core file on Unix systems,
  even though the test is successful. This can be confusing or alarming
  to someone who runs 'make test' and then finds that the Python
  interpreter apparently crashed.
........
  r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines

  os.urandom no longer masks unrelated exceptions like SystemExit or
  KeyboardInterrupt.
........
  r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines

  Speed up PyType_stgdict and PyObject_stgdict.
........
  r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines

  Make sure the postinstall action that optionally updates the user's profile
  on MacOS X actually works correctly in all cases.
........
  r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines

  This fixes bug #1527397: PythonLauncher runs scripts with the wrong working
  directory. It also fixes a bug where PythonLauncher failed to launch scripts
  when the scriptname (or the path to the script) contains quotes.
........
  r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines

  Try to squash struct.pack warnings on the "amd64 gentoo trunk"
  buildbot (& possibly other 64-bit boxes) during test_gzip.

  The native zlib crc32 function returns an unsigned 32-bit integer,
  which the Python wrapper implicitly casts to C long.  Therefore the
  same crc can "look negative" on a 32-bit box but "look positive" on
  a 64-bit box.  This patch papers over that platform difference when
  writing the crc to file.

  It may be better to change the Python wrapper, either to make
  the result "look positive" on all platforms (which means it may
  have to return a Python long at times on a 32-bit box), or to
  keep the sign the same across boxes.  But that would be a visible
  change in what users see, while the current hack changes no
  visible behavior (well, apart from stopping the struct deprecation
  warning).

  Note that the module-level write32() function is no longer used.
........
  r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines

  Prevent memory leak on error.

  Reported by Klocwork #36
........
  r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines

  _Stream.close():  Try to kill struct.pack() warnings when
  writing the crc to file on the "PPC64 Debian trunk" buildbot
  when running test_tarfile.

  This is again a case where the native zlib crc is an unsigned
  32-bit int, but the Python wrapper implicitly casts it to
  signed C long, so that "the sign bit looks different" on
  different platforms.
........
  r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines

  Updated documentation for the script that builds the OSX installer.
........
  r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines

  _PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long.
........
  r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line

  v is already checked for NULL, so just DECREF it
........
  r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line

  Let us know when there was a problem and the child had to kill the parent
........
  r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines

  Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during
  a socket operation on a socket with a timeout, the exception will be
  caught correctly.  Previously, the exception was not caught.
........
  r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line

  Add some explanation about Klocwork and Coverity static analysis
........
  r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line

  pre-release machinations
........
  r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines

  A few nore words about what ctypes does.
  Document that using the wrong calling convention can also raise
  'ValueError: Procedure called with the wrong number of arguments'.
........
  r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line

  Fix a mistake.
........
  r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines

  Correction of patch #1455898: In the mbcs decoder, set final=False
  for stream decoder, but final=True for the decode function.
........
  r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines

  Bug #1531405, format_exception no longer raises an exception if
  str(exception) raised an exception.
........
  r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines

  Bug #1191458: tracing over for loops now produces a line event
  on each iteration.  I'm not positive this is the best way to handle
  this.  I'm also not sure that there aren't other cases where
  the lnotab is generated incorrectly.  It would be great if people
  that use pdb or tracing could test heavily.

  Also:
   * Remove dead/duplicated code that wasn't used/necessary
     because we already handled the docstring prior to entering the loop.
   * add some debugging code into the compiler (#if 0'd out).
........
  r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines

  Bug #1333982: string/number constants were inappropriately stored
  in the byte code and co_consts even if they were not used, ie
  immediately popped off the stack.
........
  r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line

  There were really two issues
........
  r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line

  SF patch #1534048 (bug #1531003): fix typo in error message
........
  r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines

  fix typos
........
  r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines

  Fix bug caused by first decrefing, then increfing.
........
  r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines

  Fix the 'compiler' package to generate correct code for MAKE_CLOSURE.
  In the 2.5 development cycle, MAKE_CLOSURE as changed to take free
  variables as a tuple rather than as individual items on the stack.
  Closes patch #1534084.
........
  r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines

  Change fix for segfaulting property(), add a NEWS entry and a test.
........
  r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines

  Better fix for bug #1531405, not executing str(value) twice.
........
  r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line

  On Windows, make PyErr_Warn an exported function again.
........
  r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines

  Fix #1530448 - fix ctypes build failure on solaris 10.

  The '-mimpure-text' linker flag is required when linking _ctypes.so.
........
  r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines

  Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd.
  Fix the name of the pdb file as well.
........
  r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line

  Typo fixes
........
  r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line

  Fix mangled sentence
........
  r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines

  Fix #1530559, struct.pack raises TypeError where it used to convert.
  Passing float arguments to struct.pack when integers are expected
  now triggers a DeprecationWarning.
........
  r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines

  Patch #1534922: correct and enhance unittest docs.
........
  r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines

  Bug #1535182: really test the xreadlines() method of bz2 objects.
........
  r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines

  Bug #1535081: A leading underscore has been added to the names of
  the md5 and sha modules, so add it in Modules/Setup.dist too.
........
  r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines

  Bug #1535165: fixed a segfault in input() and raw_input() when
  sys.stdin is closed.
........
  r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines

  Don't produce output in test_builtin.
........
  r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines

  test_threading now skips testing alternate thread stack sizes on
  platforms that don't support changing thread stack size.
........
  r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines

  [Patch #1464056] Ensure that we use the panelw library when linking with ncursesw.
  Once I see how the buildbots react, I'll backport this to 2.4.
........
  r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines

  webbrowser: Silence stderr output if no gconftool or gnome browser found
........
  r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines

  Remove "non-mapping" and "non-sequence" from TypeErrors raised by
  PyMapping_Size and PySequence_Size.

  Because len() tries first sequence, then mapping size, it will always
  raise a "non-mapping object has no len" error which is confusing.
........
  r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines

  memcmp() can return values other than -1, 0, and +1 but tp_compare
  must not.
........
  r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line

  Remove accidently committed, duplicated test.
........
  r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line

  Reword paragraph to clarify
........
  r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line

  Move obmalloc item into C API section
........
  r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line

  'Other changes' section now has only one item; move the item elsewhere and remove the section
........
  r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line

  Bump version number
........
  r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines

  Bug #1536828: typo: TypeType should have been StringType.
........
  r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines

  Bug #1536660: separate two words.
........
  r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines

  ``str`` is now the same object as ``types.StringType``.
........
  r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines

  Introduce an upper bound on tuple nesting depth in
  C argument format strings; fixes rest of #1523610.
........
  r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines

  __hash__ may now return long int; the final hash
    value is obtained by invoking hash on the long int.
  Fixes #1536021.
........
  r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line

  [Bug #1536021] Mention __hash__ change
........
  r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line

  [Patch #1534027] Add notes on locale module changes
........
  r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line

  Add missing 'self' parameters
........
  r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line

  Reindent code
........
  r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines

  Fix and test for an infinite C recursion.
........
  r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines

  It's unlikely that future versions will require _POSIX_C_SOURCE
........
  r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines

  Concatenation on a long string breaks (SF #1526585).
........
  r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines

  1.  When used w/o subprocess, all exceptions were preceeded by an error
      message claiming they were IDLE internal errors (since 1.2a1).
  2.  Add Ronald Oussoren to CREDITS

  M    NEWS.txt
  M    PyShell.py
  M    CREDITS.txt
........
  r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines

  As a slight enhancement to the previous checkin, improve the
  internal error reporting by moving message to IDLE console.
........
  r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line

  Typo fix
........
  r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines

  ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
........
  r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines

  Add some commentary on -mimpure-text.
........
  r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines

  Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1)
........
  r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines

  test_copytree_simple():  This was leaving behind two new temp
  directories each time it ran, at least on Windows.

  Several changes:  explicitly closed all files; wrapped long
  lines; stopped suppressing errors when removing a file or
  directory fails (removing /shouldn't/ fail!); and changed
  what appeared to be incorrect usage of os.removedirs() (that
  doesn't remove empty directories at and /under/ the given
  path, instead it must be given an empty leaf directory and
  then deletes empty directories moving /up/ the path -- could
  be that the conceptually simpler shutil.rmtree() was really
  actually intended here).
........
---
 __init__.py          | 4 +++-
 command/bdist_rpm.py | 7 ++++---
 command/upload.py    | 2 +-
 msvccompiler.py      | 8 +++++---
 sysconfig.py         | 2 +-
 unixccompiler.py     | 2 +-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/__init__.py b/__init__.py
index a1dbb4b5ef..9c60e54690 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,4 +12,6 @@
 
 __revision__ = "$Id$"
 
-__version__ = "2.4.0"
+import sys
+__version__ = "%d.%d.%d" % sys.version_info[:3]
+del sys
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 738e3f7269..5b09965867 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -467,7 +467,8 @@ def _make_spec_file(self):
 
         # rpm scripts
         # figure out default build script
-        def_build = "%s setup.py build" % self.python
+        def_setup_call = "%s %s" % (self.python,os.path.basename(sys.argv[0]))
+        def_build = "%s build" % def_setup_call
         if self.use_rpm_opt_flags:
             def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build
 
@@ -481,9 +482,9 @@ def _make_spec_file(self):
             ('prep', 'prep_script', "%setup"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
-             ("%s setup.py install "
+             ("%s install "
               "--root=$RPM_BUILD_ROOT "
-              "--record=INSTALLED_FILES") % self.python),
+              "--record=INSTALLED_FILES") % def_setup_call),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),
diff --git a/command/upload.py b/command/upload.py
index 4a9ed398a0..67ba080427 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -185,7 +185,7 @@ def upload_file(self, command, pyversion, filename):
             http.endheaders()
             http.send(body)
         except socket.error, e:
-            self.announce(e.msg, log.ERROR)
+            self.announce(str(e), log.ERROR)
             return
 
         r = http.getresponse()
diff --git a/msvccompiler.py b/msvccompiler.py
index d24d0ac6e0..0d72837ed3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -131,8 +131,10 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
         except KeyError, exc: #
             raise DistutilsPlatformError, \
-                  ("The .NET Framework SDK needs to be installed before "
-                   "building extensions for Python.")
+                  ("""Python was built with Visual Studio 2003;
+extensions must be built with a compiler than can generate compatible binaries.
+Visual Studio 2003 was not found on this system. If you have Cygwin installed,
+you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
 
         p = r"Software\Microsoft\NET Framework Setup\Product"
         for base in HKEYS:
@@ -237,7 +239,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
 
     def initialize(self):
         self.__paths = []
-        if os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
+        if os.environ.has_key("DISTUTILS_USE_SDK") and os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
             self.cc = "cl.exe"
diff --git a/sysconfig.py b/sysconfig.py
index e1397a1988..76fe256c00 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -512,7 +512,7 @@ def get_config_vars(*args):
                 for key in ('LDFLAGS', 'BASECFLAGS'):
                     flags = _config_vars[key]
                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                    flags = re.sub('-isysroot [^ \t]* ', ' ', flags)
+                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
                     _config_vars[key] = flags
 
     if args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 324819d4a5..6cd14f7728 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -78,7 +78,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         try:
             index = compiler_so.index('-isysroot')
             # Strip this argument and the next one:
-            del compiler_so[index:index+1]
+            del compiler_so[index:index+2]
         except ValueError:
             pass
 

From 4c9e5df1bd52b0bad6fcfb2ac599999a00c8f413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Wed, 16 Aug 2006 08:13:26 +0000
Subject: [PATCH 1833/8469] Revert to having static version numbers again.

---
 __init__.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/__init__.py b/__init__.py
index 9c60e54690..21d34c767b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,6 +12,12 @@
 
 __revision__ = "$Id$"
 
-import sys
-__version__ = "%d.%d.%d" % sys.version_info[:3]
-del sys
+# Distutils version
+#
+# Please coordinate with Marc-Andre Lemburg <mal@egenix.com> when adding
+# new features to distutils that would warrant bumping the version number.
+#
+# In general, major and minor version should loosely follow the Python
+# version number the distutils code was shipped with.
+#
+__version__ = "2.5.0"

From 61e2384194c8c759b122464be8f82c562301a108 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 18 Aug 2006 22:13:04 +0000
Subject: [PATCH 1834/8469] Get rid of dict.has_key(). Boy this has a lot of
 repercussions! Not all code has been fixed yet; this is just a checkpoint...
 The C API still has PyDict_HasKey() and _HasKeyString(); not sure if I want
 to change those just yet.

---
 archive_util.py      |  2 +-
 ccompiler.py         |  2 +-
 command/build_ext.py |  2 +-
 core.py              |  6 +++---
 dist.py              |  8 ++++----
 fancy_getopt.py      |  8 ++++----
 sysconfig.py         | 22 +++++++++++-----------
 text_file.py         |  4 ++--
 util.py              |  6 +++---
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index b725a14b41..059d5447f6 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -124,7 +124,7 @@ def visit (z, dirname, names):
 
 def check_archive_formats (formats):
     for format in formats:
-        if not ARCHIVE_FORMATS.has_key(format):
+        if format not in ARCHIVE_FORMATS:
             return format
     else:
         return None
diff --git a/ccompiler.py b/ccompiler.py
index 1349abeb65..0ed9a40a35 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -159,7 +159,7 @@ class (via the 'executables' class attribute), but most will have:
         # basically the same things with Unix C compilers.
 
         for key in args.keys():
-            if not self.executables.has_key(key):
+            if key not in self.executables:
                 raise ValueError, \
                       "unknown executable '%s' for class %s" % \
                       (key, self.__class__.__name__)
diff --git a/command/build_ext.py b/command/build_ext.py
index 9626710b0c..cd67544b7a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -341,7 +341,7 @@ def check_extensions_list (self, extensions):
 
             # Medium-easy stuff: same syntax/semantics, different names.
             ext.runtime_library_dirs = build_info.get('rpath')
-            if build_info.has_key('def_file'):
+            if 'def_file' in build_info:
                 log.warn("'def_file' element of build info dict "
                          "no longer supported")
 
diff --git a/core.py b/core.py
index c9c6f037a7..85a28fe795 100644
--- a/core.py
+++ b/core.py
@@ -101,9 +101,9 @@ class found in 'cmdclass' is used in place of the default, which is
     else:
         klass = Distribution
 
-    if not attrs.has_key('script_name'):
+    if 'script_name' not in attrs:
         attrs['script_name'] = os.path.basename(sys.argv[0])
-    if not attrs.has_key('script_args'):
+    if 'script_args'  not in attrs:
         attrs['script_args'] = sys.argv[1:]
 
     # Create the Distribution instance, using the remaining arguments
@@ -111,7 +111,7 @@ class found in 'cmdclass' is used in place of the default, which is
     try:
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError, msg:
-        if attrs.has_key('name'):
+        if 'name' not in attrs:
             raise SystemExit, "error in %s setup command: %s" % \
                   (attrs['name'], msg)
         else:
diff --git a/dist.py b/dist.py
index ff49886d97..d098cb9713 100644
--- a/dist.py
+++ b/dist.py
@@ -239,7 +239,7 @@ def __init__ (self, attrs=None):
                     for (opt, val) in cmd_options.items():
                         opt_dict[opt] = ("setup script", val)
 
-            if attrs.has_key('licence'):
+            if 'licence' in attrs:
                 attrs['license'] = attrs['licence']
                 del attrs['licence']
                 msg = "'licence' distribution option is deprecated; use 'license'"
@@ -343,7 +343,7 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             user_file = os.path.join(os.environ.get('HOME'), user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
@@ -388,7 +388,7 @@ def parse_config_files (self, filenames=None):
         # If there was a "global" section in the config file, use it
         # to set Distribution options.
 
-        if self.command_options.has_key('global'):
+        if 'global' in self.command_options:
             for (opt, (src, val)) in self.command_options['global'].items():
                 alias = self.negative_opt.get(opt)
                 try:
@@ -907,7 +907,7 @@ def _set_command_options (self, command_obj, option_dict=None):
 
             try:
                 is_string = type(value) is StringType
-                if neg_opt.has_key(option) and is_string:
+                if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
                     setattr(command_obj, option, strtobool(value))
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 218ed73f98..31cf0c5c3b 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -97,7 +97,7 @@ def set_option_table (self, option_table):
         self._build_index()
 
     def add_option (self, long_option, short_option=None, help_string=None):
-        if self.option_index.has_key(long_option):
+        if long_option in self.option_index:
             raise DistutilsGetoptError, \
                   "option conflict: already an option '%s'" % long_option
         else:
@@ -109,7 +109,7 @@ def add_option (self, long_option, short_option=None, help_string=None):
     def has_option (self, long_option):
         """Return true if the option table for this parser has an
         option with long name 'long_option'."""
-        return self.option_index.has_key(long_option)
+        return long_option in self.option_index
 
     def get_attr_name (self, long_option):
         """Translate long option name 'long_option' to the form it
@@ -121,11 +121,11 @@ def get_attr_name (self, long_option):
     def _check_alias_dict (self, aliases, what):
         assert type(aliases) is DictionaryType
         for (alias, opt) in aliases.items():
-            if not self.option_index.has_key(alias):
+            if alias not in self.option_index:
                 raise DistutilsGetoptError, \
                       ("invalid %s '%s': "
                        "option '%s' not defined") % (what, alias, alias)
-            if not self.option_index.has_key(opt):
+            if opt not in self.option_index:
                 raise DistutilsGetoptError, \
                       ("invalid %s '%s': "
                        "aliased option '%s' not defined") % (what, alias, opt)
diff --git a/sysconfig.py b/sysconfig.py
index 76fe256c00..0ea4bb7334 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -150,22 +150,22 @@ def customize_compiler(compiler):
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO')
 
-        if os.environ.has_key('CC'):
+        if 'CC' in os.environ:
             cc = os.environ['CC']
-        if os.environ.has_key('CXX'):
+        if 'CXX' in os.environ:
             cxx = os.environ['CXX']
-        if os.environ.has_key('LDSHARED'):
+        if 'LDSHARED' in os.environ:
             ldshared = os.environ['LDSHARED']
-        if os.environ.has_key('CPP'):
+        if 'CPP' in os.environ:
             cpp = os.environ['CPP']
         else:
             cpp = cc + " -E"           # not always
-        if os.environ.has_key('LDFLAGS'):
+        if 'LDFLAGS' in os.environ:
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if os.environ.has_key('CFLAGS'):
+        if 'CFLAGS' in os.environ:
             cflags = opt + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if os.environ.has_key('CPPFLAGS'):
+        if 'CPPFLAGS' in os.environ:
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
             cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
@@ -277,12 +277,12 @@ def parse_makefile(fn, g=None):
             if m:
                 n = m.group(1)
                 found = True
-                if done.has_key(n):
+                if n in done:
                     item = str(done[n])
-                elif notdone.has_key(n):
+                elif n in notdone:
                     # get it on a subsequent round
                     found = False
-                elif os.environ.has_key(n):
+                elif n in os.environ:
                     # do it like make: fall back to environment
                     item = os.environ[n]
                 else:
@@ -366,7 +366,7 @@ def _init_posix():
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
     # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and g.has_key('MACOSX_DEPLOYMENT_TARGET'):
+    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
         cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
diff --git a/text_file.py b/text_file.py
index 67efd65e36..ff2878de1b 100644
--- a/text_file.py
+++ b/text_file.py
@@ -89,7 +89,7 @@ def __init__ (self, filename=None, file=None, **options):
         # set values for all options -- either from client option hash
         # or fallback to default_options
         for opt in self.default_options.keys():
-            if options.has_key (opt):
+            if opt in options:
                 setattr (self, opt, options[opt])
 
             else:
@@ -97,7 +97,7 @@ def __init__ (self, filename=None, file=None, **options):
 
         # sanity check client option hash
         for opt in options.keys():
-            if not self.default_options.has_key (opt):
+            if opt not in self.default_options:
                 raise KeyError, "invalid TextFile option '%s'" % opt
 
         if file is None:
diff --git a/util.py b/util.py
index 1265f4c4e3..1bcda93fe0 100644
--- a/util.py
+++ b/util.py
@@ -200,11 +200,11 @@ def check_environ ():
     if _environ_checked:
         return
 
-    if os.name == 'posix' and not os.environ.has_key('HOME'):
+    if os.name == 'posix' and 'HOME' not in os.environ:
         import pwd
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
-    if not os.environ.has_key('PLAT'):
+    if 'PLAT' not in os.environ:
         os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
@@ -222,7 +222,7 @@ def subst_vars (s, local_vars):
     check_environ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)
-        if local_vars.has_key(var_name):
+        if var_name in local_vars:
             return str(local_vars[var_name])
         else:
             return os.environ[var_name]

From cacb980ab0e5e233a16ebdcea087b89b2f97f79a Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 20 Aug 2006 16:25:10 +0000
Subject: [PATCH 1835/8469] Get rid of a bunch more has_key() uses.  We
 *really* need a tool for this. test_aepack now passes.  IDLE still needs to
 be converted (among others).

---
 dir_util.py     | 2 +-
 msvccompiler.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index a4aff58e3d..92f49346f7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -207,7 +207,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
             cmd[0](cmd[1])
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
-            if _path_created.has_key(abspath):
+            if abspath in _path_created:
                 del _path_created[abspath]
         except (IOError, OSError), exc:
             log.warn(grok_environment_error(
diff --git a/msvccompiler.py b/msvccompiler.py
index 0d72837ed3..9ec3508c76 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -239,7 +239,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
 
     def initialize(self):
         self.__paths = []
-        if os.environ.has_key("DISTUTILS_USE_SDK") and os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
+        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
             self.cc = "cl.exe"

From 75682ad15d892d2159454279c881771f44e2500f Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Mon, 21 Aug 2006 19:07:27 +0000
Subject: [PATCH 1836/8469] Merge current trunk into p3yk. This includes the
 PyNumber_Index API change, which unfortunately means the errors from the
 bytes type change somewhat:

bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a
TypeError (either that, or bytes(1.0) also raises a ValueError --
PyNumber_AsSsize_t() can only raise one type of exception.)

Merged revisions 51188-51433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines

  Retrieval of previous shell command was not always preserving indentation
  since 1.2a1) Patch 1528468 Tal Einat.
........
  r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines

  Chris McDonough's patch to defend against certain DoS attacks on FieldStorage.
  SF bug #1112549.
........
  r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines

  News item for SF bug 1112549.
........
  r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines

  Fix title -- it's rc1, not beta3.
........
  r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines

  Update dangling references to the 3.2 database to
  mention that this is UCD 4.1 now.
........
  r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines

  Followup to bug #1069160.

  PyThreadState_SetAsyncExc():  internal correctness changes wrt
  refcount safety and deadlock avoidance.  Also added a basic test
  case (relying on ctypes) and repaired the docs.
........
  r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines

  Whitespace normalization broke test_cgi, because a line
  of quoted test data relied on preserving a single trailing
  blank.  Changed the string from raw to regular, and forced
  in the trailing blank via an explicit \x20 escape.
........
  r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines

  test_PyThreadState_SetAsyncExc():  This is failing on some
  64-bit boxes.  I have no idea what the ctypes docs mean
  by "integers", and blind-guessing here that it intended to
  mean the signed C "int" type, in which case perhaps I can
  repair this by feeding the thread id argument to type
  ctypes.c_long().

  Also made the worker thread daemonic, so it doesn't hang
  Python shutdown if the test continues to fail.
........
  r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines

  force_test_exit():  This has been completely ineffective
  at stopping test_signal from hanging forever on the Tru64
  buildbot.  That could be because there's no such thing as
  signal.SIGALARM.  Changed to the idiotic (but standard)
  signal.SIGALRM instead, and added some more debug output.
........
  r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines

  Fix the failures on cygwin (2006-08-10 fixed the actual locking issue).

  The first hunk changes the colon to an ! like other Windows variants.
  We need to always wait on the child so the lock gets released and
  no other tests fail.  This is the try/finally in the second hunk.
........
  r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines

  Add Chris McDonough (latest cgi.py patch)
........
  r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines

  logging's atexit hook now runs even if the rest of the module has
  already been cleaned up.
........
  r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines


  Add ignore of *.pyc and *.pyo to Lib/xml/etree/.
........
  r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines

  When a ctypes C callback function is called, zero out the result
  storage before converting the result to C data.  See the comment in
  the code for details.

  Provide a better context for errors when the conversion of a callback
  function's result cannot be converted.
........
  r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines

  Klocwork made another run and found a bunch more problems.
  This is the first batch of fixes that should be easy to verify based on context.

  This fixes problem numbers: 220 (ast), 323-324 (symtable),
  321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree).
........
  r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines

  Even though _Py_Mangle() isn't truly public anyone can call it and
  there was no verification that privateobj was a PyString.  If it wasn't
  a string, this could have allowed a NULL pointer to creep in below and crash.

  I wonder if this should be PyString_CheckExact?  Must identifiers be strings
  or can they be subclasses?

  Klocwork #275
........
  r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines

  It's highly unlikely, though possible for PyEval_Get*() to return NULLs.
  So be safe and do an XINCREF.

  Klocwork # 221-222.
........
  r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines

  This code is actually not used unless WITHOUT_COMPLEX is defined.
  However, there was no error checking that PyFloat_FromDouble returned
  a valid pointer.  I believe this change is correct as it seemed
  to follow other code in the area.

  Klocwork # 292.
........
  r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines

  Handle NULL nodes while parsing.  I'm not entirely sure this is correct.
  There might be something else that needs to be done to setup the error.

  Klocwork #295.
........
  r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines

  If _stat_float_times is false, we will try to INCREF ival which could be NULL.
  Return early in that case.  The caller checks for PyErr_Occurred so this
  should be ok.

  Klocwork #297
........
  r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines

  Move the assert which checks for a NULL pointer first.
  Klocwork #274.
........
  r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines

  Try to handle a malloc failure.  I'm not entirely sure this is correct.
  There might be something else we need to do to handle the exception.

  Klocwork # 212-213
........
  r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines

  I'm not sure why this code allocates this string for the error message.
  I think it would be better to always use snprintf and have the format
  limit the size of the name appropriately (like %.200s).

  Klocwork #340
........
  r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines

  Check returned pointer is valid.
  Klocwork #233
........
  r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line

  Whoops, how did that get in there. :-)  Revert all the parts of 51227 that were not supposed to go it.  Only Modules/_ctypes/cfields.c was supposed to be changed
........
  r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines

  Don't deref v if it's NULL.

  Klocwork #214
........
  r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines

  Check return of PyMem_MALLOC (garbage) is non-NULL.
  Check seq in both portions of if/else.

  Klocwork #289-290.
........
  r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines

  PyModule_GetDict() can fail, produce fatal errors if this happens on startup.

  Klocwork #298-299.
........
  r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines

  Verify verdat which is returned from malloc is not NULL.
  Ensure we don't pass NULL to free.

  Klocwork #306 (at least the first part, checking malloc)
........
  r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines

  test_signal:  Signal handling on the Tru64 buildbot
  appears to be utterly insane.  Plug some theoretical
  insecurities in the test script:

  - Verify that the SIGALRM handler was actually installed.

  - Don't call alarm() before the handler is installed.

  - Move everything that can fail inside the try/finally,
    so the test cleans up after itself more often.

  - Try sending all the expected signals in
    force_test_exit(), not just SIGALRM.  Since that was
    fixed to actually send SIGALRM (instead of invisibly
    dying with an AttributeError), we've seen that sending
    SIGALRM alone does not stop this from hanging.

  - Move the "kill the child" business into the finally
    clause, so the child doesn't survive test failure
    to send SIGALRM to other tests later (there are also
    baffling SIGALRM-related failures in test_socket).

  - Cancel the alarm in the finally clause -- if the
    test dies early, we again don't want SIGALRM showing
    up to confuse a later test.

  Alas, this still relies on timing luck wrt the spawned
  script that sends the test signals, but it's hard to see
  how waiting for seconds can so often be so unlucky.

  test_threadedsignals:  curiously, this test never fails
  on Tru64, but doesn't normally signal SIGALRM.  Anyway,
  fixed an obvious (but probably inconsequential) logic
  error.
........
  r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines

  Ah, fudge.  One of the prints here actually "shouldn't be"
  protected by "if verbose:", which caused the test to fail on
  all non-Windows boxes.

  Note that I deliberately didn't convert this to unittest yet,
  because I expect it would be even harder to debug this on Tru64
  after conversion.
........
  r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines

  Repair logging test spew caused by rev. 51206.
........
  r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines

  Patch #1538606, Patch to fix __index__() clipping.

  I modified this patch some by fixing style, some error checking, and adding
  XXX comments.  This patch requires review and some changes are to be expected.
  I'm checking in now to get the greatest possible review and establish a
  baseline for moving forward.  I don't want this to hold up release if possible.
........
  r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines

  Fix a couple of bugs exposed by the new __index__ code.  The 64-bit buildbots
  were failing due to inappropriate clipping of numbers larger than 2**31
  with new-style classes. (typeobject.c)  In reviewing the code for classic
  classes, there were 2 problems.  Any negative value return could be returned.
  Always return -1 if there was an error.  Also make the checks similar
  with the new-style classes.  I believe this is correct for 32 and 64 bit
  boxes, including Windows64.

  Add a test of classic classes too.
........
  r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line

  SF bug #1539336, distutils example code missing
........
  r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines

  Move/copy assert for tstate != NULL before first use.
  Verify that PyEval_Get{Globals,Locals} returned valid pointers.

  Klocwork 231-232
........
  r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines

  Handle a whole lot of failures from PyString_FromInternedString().

  Should fix most of Klocwork 234-272.
........
  r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines

  cpathname could be NULL if it was longer than MAXPATHLEN.  Don't try
  to write the .pyc to NULL.

  Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.

  Klocwork 282, 283, 285
........
  r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines

  Fix segfault when doing string formatting on subclasses of long if
  __oct__, __hex__ don't return a string.

  Klocwork 308
........
  r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines

  Check return result of PyModule_GetDict().
  Fix a bunch of refleaks in the init of the module.  This would only be found
  when running python -v.
........
  r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines

  Handle malloc and fopen failures more gracefully.

  Klocwork 180-181
........
  r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines

  It's very unlikely, though possible that source is not a string.  Verify
  that PyString_AsString() returns a valid pointer.  (The problem can
  arise when zlib.decompress doesn't return a string.)

  Klocwork 346
........
  r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines

  Handle failures from lookup.

  Klocwork 341-342
........
  r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines

  Handle failure from PyModule_GetDict() (Klocwork 208).

  Fix a bunch of refleaks in the init of the module.  This would only be found
  when running python -v.
........
  r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines

  Really address the issue of where to place the assert for leftblock.
  (Followup of Klocwork 274)
........
  r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines

  Handle malloc failure.

  Klocwork 281
........
  r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines

  Handle alloca failures.

  Klocwork 225-228
........
  r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line

  Get rid of compiler warning
........
  r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line

  Ignore pgen.exe and kill_python.exe for cygwin
........
  r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines

  Can't return NULL from a void function.  If there is a memory error,
  about the best we can do is call PyErr_WriteUnraisable and go on.
  We won't be able to do the call below either, so verify delstr is valid.
........
  r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line

  Update purify doc some.
........
  r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines

  Remove unused, buggy test function.
  Fixes klockwork issue #207.
........
  r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines

  Check for NULL return value from new_CArgObject().
  Fixes klockwork issues #183, #184, #185.
........
  r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines

  Check for NULL return value of GenericCData_new().
  Fixes klockwork issues #188, #189.
........
  r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines

  Revert the change that tries to zero out a closure's result storage
  area because the size if unknown in source/callproc.c.
........
  r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines

  Slightly revised version of patch #1538956:

  Replace UnicodeDecodeErrors raised during == and !=
  compares of Unicode and other objects with a new
  UnicodeWarning.

  All other comparisons continue to raise exceptions.
  Exceptions other than UnicodeDecodeErrors are also left
  untouched.
........
  r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines

  Apply the patch #1532975 plus ideas from the patch #1533481.

  ctypes instances no longer have the internal and undocumented
  '_as_parameter_' attribute which was used to adapt them to foreign
  function calls; this mechanism is replaced by a function pointer in
  the type's stgdict.

  In the 'from_param' class methods, try the _as_parameter_ attribute if
  other conversions are not possible.

  This makes the documented _as_parameter_ mechanism work as intended.

  Change the ctypes version number to 1.0.1.
........
  r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines

  Readd NEWS items that were accidentally removed by r51276.
........
  r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines

  Improve markup in PyUnicode_RichCompare.
........
  r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines

  Correct an accidentally removed previous patch.
........
  r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines

  Patch #1536908: Add support for AMD64 / OpenBSD.
  Remove the -no-stack-protector compiler flag for OpenBSD
  as it has been reported to be unneeded.
........
  r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line

  News item for rev 51281.
........
  r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines

  Fix refleak introduced in rev. 51248.
........
  r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines

  Make tabnanny recognize IndentationErrors raised by tokenize.
  Add a test to test_inspect to make sure indented source
  is recognized correctly. (fixes #1224621)
........
  r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines

  Patch #1535500: fix segfault in BZ2File.writelines and make sure it
  raises the correct exceptions.
........
  r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines

  Add an additional test: BZ2File write methods should raise IOError
  when file is read-only.
........
  r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines

  Patch #1536071: trace.py should now find the full module name of a
  file correctly even on Windows.
........
  r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines

  Cookie.py shouldn't "bogusly" use string._idmap.
........
  r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines

  Patch #1511317: don't crash on invalid hostname info
........
  r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines

  Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.
  Now we're even. :-)
........
  r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines

  Fix the test for SocketServer so it should pass on cygwin and not fail
  sporadically on other platforms.  This is really a band-aid that doesn't
  fix the underlying issue in SocketServer.  It's not clear if it's worth
  it to fix SocketServer, however, I opened a bug to track it:

  	http://python.org/sf/1540386
........
  r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines

  Update the docstring to use a version a little newer than 1999.  This was
  taken from a Debian patch.  Should we update the version for each release?
........
  r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines

  Subclasses of int/long are allowed to define an __index__.
........
  r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line

  Check for NULL return value from new_CArgObject calls.
........
  r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines

  The 'with' statement is now a Code Context block opener
........
  r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line

  preparing for 2.5c1
........
  r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line

  preparing for 2.5c1 - no, really this time
........
  r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines

  Patch #1540892: site.py Quitter() class attempts to close sys.stdin
  before raising SystemExit, allowing IDLE to honor quit() and exit().

  M    Lib/site.py
  M    Lib/idlelib/PyShell.py
  M    Lib/idlelib/CREDITS.txt
  M    Lib/idlelib/NEWS.txt
  M    Misc/NEWS
........
  r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines

  Update code and tests to support the 'bytes_le' attribute (for
  little-endian byte order on Windows), and to work around clocks
  with low resolution yielding duplicate UUIDs.

  Anthony Baxter has approved this change.
........
  r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines

  Get quit() and exit() to work cleanly when not using subprocess.
........
  r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines

  Revert to having static version numbers again.
........
  r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines

  Build _hashlib on Windows. Build OpenSSL with masm assembler code.
  Fixes #1535502.
........
  r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines

  Add commented assert statements to check that the result of
  PyObject_stgdict() and PyType_stgdict() calls are non-NULL before
  dereferencing the result.  Hopefully this fixes what klocwork is
  complaining about.

  Fix a few other nits as well.
........
  r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line

  news entry for 51307
........
  r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line

  Add UnicodeWarning
........
  r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line

  Bump document version to 1.0; remove pystone paragraph
........
  r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line

  Link to docs; remove an XXX comment
........
  r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line

  Make cl build step compile-only (/c). Remove libs from source list.
........
  r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines

  The __repr__ method of a NULL py_object does no longer raise an
  exception.  Remove a stray '?' character from the exception text
  when the value is retrieved of such an object.

  Includes tests.
........
  r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line

  Update bug/patch counts
........
  r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line

  Wording/typo fixes
........
  r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines

  Remove the special casing of Py_None when converting the return value
  of the Python part of a callback function to C.  If it cannot be
  converted, call PyErr_WriteUnraisable with the exception we got.
  Before, arbitrary data has been passed to the calling C code in this
  case.

  (I'm not really sure the NEWS entry is understandable, but I cannot
  find better words)
........
  r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines

  Add NEWS item mentioning the reverted distutils version number patch.
........
  r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines

  SF#1534630

  ignore data that arrives before the opening start tag
........
  r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line

  Grammar fix
........
  r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines

  Tutorial:

      Clarify somewhat how parameters are passed to functions
      (especially explain what integer means).

      Correct the table - Python integers and longs can both be used.
      Further clarification to the table comparing ctypes types, Python
      types, and C types.

  Reference:

      Replace integer by C ``int`` where it makes sense.
........
  r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines

  File menu hotkeys: there were three 'p' assignments.  Reassign the
  'Save Copy As' and 'Print' hotkeys to 'y' and 't'.  Change the
  Shell menu hotkey from 's' to 'l'.

  M    Bindings.py
  M    PyShell.py
  M    NEWS.txt
........
  r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines

  Fix a bug in the ``compiler`` package that caused invalid code to be
  generated for generator expressions.
........
  r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines

  Merge 51340 and 51341 from 2.5 branch:
  Leave tk build directory to restore original path.
  Invoke debug mk1mf.pl after running Configure.
........
  r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines

  Bug #1541863: uuid.uuid1 failed to generate unique identifiers
  on systems with low clock resolution.
........
  r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line

  Add template for 2.6 on HEAD
........
  r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line

  More post-release wibble
........
  r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line

  Try to get Windows bots working again
........
  r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line

  Try to get Windows bots working again. Take 2
........
  r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line

  Try to get Unix bots install working again.
........
  r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line

  Set version to 2.6a0, seems more consistent.
........
  r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line

  More version wibble
........
  r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines

  Bug #1541682: Fix example in the "Refcount details" API docs.
  Additionally, remove a faulty example showing PySequence_SetItem applied
  to a newly created list object and add notes that this isn't a good idea.
........
  r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines

  Updating IDLE's version number to match Python's (as per python-dev
  discussion).
........
  r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line

  RPM specfile updates
........
  r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines

  Typo in tp_clear docs.
........
  r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line

  Minor edits
........
  r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines

  Add asserts to check for 'impossible' NULL values, with comments.
  In one place where I'n not 1000% sure about the non-NULL, raise
  a RuntimeError for safety.

  This should fix the klocwork issues that Neal sent me.  If so,
  it should be applied to the release25-maint branch also.
........
  r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines

  Move initialization of interned strings to before allocating the
  object so we don't leak op.  (Fixes an earlier patch to this code)

  Klockwork #350
........
  r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines

  Move assert to after NULL check, otherwise we deref NULL in the assert.

  Klocwork #307
........
  r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines

  SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
........
  r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines

  Move initialization to after the asserts for non-NULL values.

  Klocwork 286-287.

  (I'm not backporting this, but if someone wants to, feel free.)
........
  r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines

  Handle PyString_FromInternedString() failing (unlikely, but possible).

  Klocwork #325

  (I'm not backporting this, but if someone wants to, feel free.)
........
  r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines

  Patch #1542948: fix urllib2 header casing issue. With new test.
........
  r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines

  Move peephole optimizer to separate file.
........
  r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines

  Move peephole optimizer to separate file.  (Forgot .h in previous checkin.)
........
  r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines

  Fix bug #1543303, tarfile adds padding that breaks gunzip.
  Patch # 1543897.

  Will backport to 2.5
........
  r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines

  Add assert to make Klocwork happy (#276)
........
---
 __init__.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/__init__.py b/__init__.py
index 9c60e54690..21d34c767b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,6 +12,12 @@
 
 __revision__ = "$Id$"
 
-import sys
-__version__ = "%d.%d.%d" % sys.version_info[:3]
-del sys
+# Distutils version
+#
+# Please coordinate with Marc-Andre Lemburg <mal@egenix.com> when adding
+# new features to distutils that would warrant bumping the version number.
+#
+# In general, major and minor version should loosely follow the Python
+# version number the distutils code was shipped with.
+#
+__version__ = "2.5.0"

From 6c4f3892adad5878f43e5246f8794c3de5b685e1 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 24 Aug 2006 00:41:19 +0000
Subject: [PATCH 1837/8469] Restructure comparison dramatically.  There is no
 longer a default *ordering* between objects; there is only a default equality
 test (defined by an object being equal to itself only).  Read the comment in
 object.c.  The current implementation never uses a three-way comparison to
 compute a rich comparison, but it does use a rich comparison to compute a
 three-way comparison.  I'm not quite done ripping out all the calls to
 PyObject_Compare/Cmp, or replacing tp_compare implementations with
 tp_richcompare implementations; but much of that has happened (to make most
 unit tests pass).

The following tests still fail, because I need help deciding
or understanding:

test_codeop -- depends on comparing code objects
test_datetime -- need Tim Peters' opinion
test_marshal -- depends on comparing code objects
test_mutants -- need help understanding it

The problem with test_codeop and test_marshal is this: these tests
compare two different code objects and expect them to be equal.
Is that still a feature we'd like to support?  I've temporarily
removed the comparison and hash code from code objects, so they
use the default (equality by pointer only) comparison.

For the other two tests, run them to see for yourself.
(There may be more failing test with "-u all".)

A general problem with getting lots of these tests to pass is
the reality that for object types that have a natural total ordering,
implementing __cmp__ is much more convenient than implementing
__eq__, __ne__, __lt__, and so on.  Should we go back to allowing
__cmp__ to provide a total ordering?  Should we provide some other
way to implement rich comparison with a single method override?
Alex proposed a __key__() method; I've considered a __richcmp__()
method.  Or perhaps __cmp__() just shouldn't be killed off...
---
 version.py | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/version.py b/version.py
index 71a5614719..2cd36365e7 100644
--- a/version.py
+++ b/version.py
@@ -32,7 +32,8 @@
 class Version:
     """Abstract base class for version numbering classes.  Just provides
     constructor (__init__) and reproducer (__repr__), because those
-    seem to be the same for all version numbering classes.
+    seem to be the same for all version numbering classes; and route
+    rich comparisons to __cmp__.
     """
 
     def __init__ (self, vstring=None):
@@ -42,6 +43,42 @@ def __init__ (self, vstring=None):
     def __repr__ (self):
         return "%s ('%s')" % (self.__class__.__name__, str(self))
 
+    def __eq__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c == 0
+
+    def __ne__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c != 0
+
+    def __lt__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c < 0
+
+    def __le__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c <= 0
+
+    def __gt__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c > 0
+
+    def __ge__(self, other):
+        c = self.__cmp__(other)
+        if c is NotImplemented:
+            return c
+        return c >= 0
+
 
 # Interface for version-number classes -- must be implemented
 # by the following classes (the concrete ones -- Version should

From f4e988990abc4e2e3408af5bf07bb08203347252 Mon Sep 17 00:00:00 2001
From: Alex Martelli <aleaxit@gmail.com>
Date: Thu, 24 Aug 2006 02:58:11 +0000
Subject: [PATCH 1838/8469] Anna Ravenscroft identified many occurrences of
 "file" used to open a file in the stdlib and changed each of them to use
 "open" instead.  At this time there are no other known occurrences that can
 be safely changed (in Lib and all subdirectories thereof).

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0ea4bb7334..96923bdca4 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -354,7 +354,7 @@ def _init_posix():
     # load the installed pyconfig.h:
     try:
         filename = get_config_h_filename()
-        parse_config_h(file(filename), g)
+        parse_config_h(open(filename), g)
     except IOError, msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):

From e9ab4dbfd784248dbcfc3332f76526872c8e114d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 4 Oct 2006 15:25:28 +0000
Subject: [PATCH 1839/8469] Add MSVC8 project files to create wininst-8.exe.

---
 command/wininst-8.exe | Bin 0 -> 61440 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 command/wininst-8.exe

diff --git a/command/wininst-8.exe b/command/wininst-8.exe
new file mode 100644
index 0000000000000000000000000000000000000000..7403bfabf5cc10c13ef2b6a2ea276b4f6d26ff37
GIT binary patch
literal 61440
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

literal 0
HcmV?d00001


From a731ab145f5bca79f452269c2dfc52ab0ad6f6de Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Fri, 6 Oct 2006 13:18:26 +0000
Subject: [PATCH 1840/8469] [Bug #1545341] Allow 'classifier' parameter to be a
 tuple as well as a list.  Will backport.

---
 command/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/register.py b/command/register.py
index dec9aa2bf2..5fcc8d2764 100644
--- a/command/register.py
+++ b/command/register.py
@@ -251,7 +251,7 @@ def post_to_server(self, data, auth=None):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
                 value = unicode(value).encode("utf-8")

From 942bf846fffbdd0aa873115756281bd91d155dea Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 8 Oct 2006 17:49:52 +0000
Subject: [PATCH 1841/8469] MacOSX: distutils changes the values of BASECFLAGS
 and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that
 those flags can be used to compile code (the universal build uses compiler
 flags that aren't supported on 10.3). This patches gives the same treatment
 to CFLAGS, PY_CFLAGS and BLDSHARED.

---
 sysconfig.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index c3b1e4ecfb..0cfafab99b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -509,7 +509,10 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS'):
+                for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
                     flags = _config_vars[key]
                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)

From ab8b0e572d34555fd27810253833db03dd2efb0b Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 8 Oct 2006 17:50:26 +0000
Subject: [PATCH 1842/8469] Backport of r52233

---
 sysconfig.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index c3b1e4ecfb..bf52a27474 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -509,7 +509,11 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS'):
+                for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
                     flags = _config_vars[key]
                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)

From e3d14a32164b47b216074647f6e3a05ede126198 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 8 Oct 2006 17:51:46 +0000
Subject: [PATCH 1843/8469] MacOSX: The universal build requires that users
 have the MacOSX10.4u SDK installed to build extensions. This patch makes
 distutils emit a warning when the compiler should use an SDK but that SDK is
 not installed, hopefully reducing some confusion.

---
 unixccompiler.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index 6cd14f7728..d1fd1d9511 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -82,6 +82,22 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
+    # Check if the SDK that is used during compilation actually exists, 
+    # the universal build requires the usage of a universal SDK and not all
+    # users have that installed by default.
+    sysroot = None
+    if '-isysroot' in cc_args:
+        idx = cc_args.index('-isysroot')
+        sysroot = cc_args[idx+1]
+    elif '-isysroot' in compiler_so:
+        idx = compiler_so.index('-isysroot')
+        sysroot = compiler_so[idx+1]
+
+    if sysroot and not os.path.isdir(sysroot):
+        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
+                sysroot)
+        log.warn("Please check your Xcode installation")
+
     return compiler_so
 
 class UnixCCompiler(CCompiler):

From 364819cca89dfd6c2bfe1c7cdac42073baa01ba3 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 8 Oct 2006 17:52:37 +0000
Subject: [PATCH 1844/8469] Backport of r52236

---
 unixccompiler.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index 6cd14f7728..d1fd1d9511 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -82,6 +82,22 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
+    # Check if the SDK that is used during compilation actually exists, 
+    # the universal build requires the usage of a universal SDK and not all
+    # users have that installed by default.
+    sysroot = None
+    if '-isysroot' in cc_args:
+        idx = cc_args.index('-isysroot')
+        sysroot = cc_args[idx+1]
+    elif '-isysroot' in compiler_so:
+        idx = compiler_so.index('-isysroot')
+        sysroot = compiler_so[idx+1]
+
+    if sysroot and not os.path.isdir(sysroot):
+        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
+                sysroot)
+        log.warn("Please check your Xcode installation")
+
     return compiler_so
 
 class UnixCCompiler(CCompiler):

From 299c49adb264eb716796a042441fa013b094e2c2 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 9 Oct 2006 17:13:26 +0000
Subject: [PATCH 1845/8469] [Bug #1545341] Let the 'classifiers' parameter be a
 tuple as well as a list.

---
 command/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/register.py b/command/register.py
index dec9aa2bf2..5fcc8d2764 100644
--- a/command/register.py
+++ b/command/register.py
@@ -251,7 +251,7 @@ def post_to_server(self, data, auth=None):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
                 value = unicode(value).encode("utf-8")

From 3624acc8638f40e03e87655ec596501dece3042f Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Wed, 18 Oct 2006 05:09:12 +0000
Subject: [PATCH 1846/8469] Whitespace normalization.

---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index d1fd1d9511..75e8a5316e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -82,7 +82,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
-    # Check if the SDK that is used during compilation actually exists, 
+    # Check if the SDK that is used during compilation actually exists,
     # the universal build requires the usage of a universal SDK and not all
     # users have that installed by default.
     sysroot = None

From a31ffb0ff77ad8260c85cab5c713d20688e2dc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 4 Nov 2006 18:14:06 +0000
Subject: [PATCH 1847/8469] - Patch #1060577: Extract list of RPM files from
 spec file in   bdist_rpm Will backport to 2.5.

---
 command/bdist_rpm.py | 60 ++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 5b09965867..03ef070c87 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -337,37 +337,47 @@ def run (self):
         if not self.keep_temp:
             rpm_cmd.append('--clean')
         rpm_cmd.append(spec_path)
+        # Determine the binary rpm names that should be built out of this spec
+        # file
+        # Note that some of these may not be really built (if the file
+        # list is empty)
+        nvr_string = "%{name}-%{version}-%{release}"
+        src_rpm = nvr_string + ".src.rpm"
+        non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
+        q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
+            src_rpm, non_src_rpm, spec_path)
+
+        out = os.popen(q_cmd)
+        binary_rpms = []
+        source_rpm = None
+        while 1:
+            line = out.readline()
+            if not line:
+                break
+            l = string.split(string.strip(line))
+            assert(len(l) == 2)
+            binary_rpms.append(l[1])
+            # The source rpm is named after the first entry in the spec file
+            if source_rpm is None:
+                source_rpm = l[0]
+
+        status = out.close()
+        if status:
+            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
         self.spawn(rpm_cmd)
 
-        # XXX this is a nasty hack -- we really should have a proper way to
-        # find out the names of the RPM files created; also, this assumes
-        # that RPM creates exactly one source and one binary RPM.
         if not self.dry_run:
             if not self.binary_only:
-                srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
-                assert len(srpms) == 1, \
-                       "unexpected number of SRPM files found: %s" % srpms
-                dist_file = ('bdist_rpm', 'any',
-                             self._dist_path(srpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(srpms[0], self.dist_dir)
+                srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
+                assert(os.path.exists(srpm))
+                self.move_file(srpm, self.dist_dir)
 
             if not self.source_only:
-                rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
-                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
-                                                   "*/*debuginfo*.rpm"))
-                if debuginfo:
-                    rpms.remove(debuginfo[0])
-                assert len(rpms) == 1, \
-                       "unexpected number of RPM files found: %s" % rpms
-                dist_file = ('bdist_rpm', get_python_version(),
-                             self._dist_path(rpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(rpms[0], self.dist_dir)
-                if debuginfo:
-                    dist_file = ('bdist_rpm', get_python_version(),
-                                 self._dist_path(debuginfo[0]))
-                    self.move_file(debuginfo[0], self.dist_dir)
+                for rpm in binary_rpms:
+                    rpm = os.path.join(rpm_dir['RPMS'], rpm)
+                    if os.path.exists(rpm):
+                        self.move_file(rpm, self.dist_dir)
     # run()
 
     def _dist_path(self, path):

From cf89211da249d28e2aa80ebb440380672878d59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 4 Nov 2006 18:14:22 +0000
Subject: [PATCH 1848/8469] Patch #1060577: Extract list of RPM files from spec
 file in bdist_rpm

---
 command/bdist_rpm.py | 60 ++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 5b09965867..03ef070c87 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -337,37 +337,47 @@ def run (self):
         if not self.keep_temp:
             rpm_cmd.append('--clean')
         rpm_cmd.append(spec_path)
+        # Determine the binary rpm names that should be built out of this spec
+        # file
+        # Note that some of these may not be really built (if the file
+        # list is empty)
+        nvr_string = "%{name}-%{version}-%{release}"
+        src_rpm = nvr_string + ".src.rpm"
+        non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
+        q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
+            src_rpm, non_src_rpm, spec_path)
+
+        out = os.popen(q_cmd)
+        binary_rpms = []
+        source_rpm = None
+        while 1:
+            line = out.readline()
+            if not line:
+                break
+            l = string.split(string.strip(line))
+            assert(len(l) == 2)
+            binary_rpms.append(l[1])
+            # The source rpm is named after the first entry in the spec file
+            if source_rpm is None:
+                source_rpm = l[0]
+
+        status = out.close()
+        if status:
+            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
         self.spawn(rpm_cmd)
 
-        # XXX this is a nasty hack -- we really should have a proper way to
-        # find out the names of the RPM files created; also, this assumes
-        # that RPM creates exactly one source and one binary RPM.
         if not self.dry_run:
             if not self.binary_only:
-                srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
-                assert len(srpms) == 1, \
-                       "unexpected number of SRPM files found: %s" % srpms
-                dist_file = ('bdist_rpm', 'any',
-                             self._dist_path(srpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(srpms[0], self.dist_dir)
+                srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
+                assert(os.path.exists(srpm))
+                self.move_file(srpm, self.dist_dir)
 
             if not self.source_only:
-                rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
-                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
-                                                   "*/*debuginfo*.rpm"))
-                if debuginfo:
-                    rpms.remove(debuginfo[0])
-                assert len(rpms) == 1, \
-                       "unexpected number of RPM files found: %s" % rpms
-                dist_file = ('bdist_rpm', get_python_version(),
-                             self._dist_path(rpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(rpms[0], self.dist_dir)
-                if debuginfo:
-                    dist_file = ('bdist_rpm', get_python_version(),
-                                 self._dist_path(debuginfo[0]))
-                    self.move_file(debuginfo[0], self.dist_dir)
+                for rpm in binary_rpms:
+                    rpm = os.path.join(rpm_dir['RPMS'], rpm)
+                    if os.path.exists(rpm):
+                        self.move_file(rpm, self.dist_dir)
     # run()
 
     def _dist_path(self, path):

From 5a83e9120fb4a858150b3ddfe7d7a9c7b7e9f7d6 Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Fri, 10 Nov 2006 00:33:36 +0000
Subject: [PATCH 1849/8469] Fix SF#1566719: not creating site-packages (or
 other target directory) when installing .egg-info for a project that contains
 no modules or packages, while using --root (as in bdist_rpm).

---
 command/install_egg_info.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index c31ac29668..c8880310df 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -35,6 +35,9 @@ def run(self):
             dir_util.remove_tree(target, dry_run=self.dry_run)
         elif os.path.exists(target):
             self.execute(os.unlink,(self.target,),"Removing "+target)
+        elif not os.path.isdir(self.install_dir):
+            self.execute(os.makedirs, (self.install_dir,),
+                         "Creating "+self.install_dir)
         log.info("Writing %s", target)
         if not self.dry_run:
             f = open(target, 'w')

From cff70f8bd97d2c1072fcead0aab6a6ea16b8f473 Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Fri, 10 Nov 2006 17:13:29 +0000
Subject: [PATCH 1850/8469] Fix SF#1566719: not creating site-packages (or
 other target directory) when installing .egg-info for a project that contains
 no modules or packages, while using --root (as in bdist_rpm).  (Backport from
 trunk)

---
 command/install_egg_info.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index c31ac29668..c8880310df 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -35,6 +35,9 @@ def run(self):
             dir_util.remove_tree(target, dry_run=self.dry_run)
         elif os.path.exists(target):
             self.execute(os.unlink,(self.target,),"Removing "+target)
+        elif not os.path.isdir(self.install_dir):
+            self.execute(os.makedirs, (self.install_dir,),
+                         "Creating "+self.install_dir)
         log.info("Writing %s", target)
         if not self.dry_run:
             f = open(target, 'w')

From 1b618f36541a2feff0f6a9614b47605e3ca8add8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 12 Nov 2006 18:56:03 +0000
Subject: [PATCH 1851/8469] Patch #1360200: Use unmangled_version RPM spec
 field to deal with file name mangling. Will backport to 2.5.

---
 command/bdist_rpm.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 03ef070c87..6f0e0d881c 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -391,6 +391,7 @@ def _make_spec_file(self):
         spec_file = [
             '%define name ' + self.distribution.get_name(),
             '%define version ' + self.distribution.get_version().replace('-','_'),
+            '%define unmangled_version ' + self.distribution.get_version(),
             '%define release ' + self.release.replace('-','_'),
             '',
             'Summary: ' + self.distribution.get_description(),
@@ -412,9 +413,9 @@ def _make_spec_file(self):
         # but only after it has run: and we create the spec file before
         # running "sdist", in case of --spec-only.
         if self.use_bzip2:
-            spec_file.append('Source0: %{name}-%{version}.tar.bz2')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.bz2')
         else:
-            spec_file.append('Source0: %{name}-%{version}.tar.gz')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.gz')
 
         spec_file.extend([
             'License: ' + self.distribution.get_license(),
@@ -489,7 +490,7 @@ def _make_spec_file(self):
         # are just text that we drop in as-is.  Hmmm.
 
         script_options = [
-            ('prep', 'prep_script', "%setup"),
+            ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
              ("%s install "

From e63244103d3f57f2539f575704fe9f7fdad77aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 12 Nov 2006 18:56:18 +0000
Subject: [PATCH 1852/8469] Patch #1360200: Use unmangled_version RPM spec
 field to deal with file name mangling.

---
 command/bdist_rpm.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 03ef070c87..6f0e0d881c 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -391,6 +391,7 @@ def _make_spec_file(self):
         spec_file = [
             '%define name ' + self.distribution.get_name(),
             '%define version ' + self.distribution.get_version().replace('-','_'),
+            '%define unmangled_version ' + self.distribution.get_version(),
             '%define release ' + self.release.replace('-','_'),
             '',
             'Summary: ' + self.distribution.get_description(),
@@ -412,9 +413,9 @@ def _make_spec_file(self):
         # but only after it has run: and we create the spec file before
         # running "sdist", in case of --spec-only.
         if self.use_bzip2:
-            spec_file.append('Source0: %{name}-%{version}.tar.bz2')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.bz2')
         else:
-            spec_file.append('Source0: %{name}-%{version}.tar.gz')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.gz')
 
         spec_file.extend([
             'License: ' + self.distribution.get_license(),
@@ -489,7 +490,7 @@ def _make_spec_file(self):
         # are just text that we drop in as-is.  Hmmm.
 
         script_options = [
-            ('prep', 'prep_script', "%setup"),
+            ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
              ("%s install "

From 6188d82d9f938c426b361a467b459d7a0ff21db5 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 3 Dec 2006 17:13:54 +0000
Subject: [PATCH 1853/8469] - Fix build failure on kfreebsd and on the hurd.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 00f8a6b9ae..2413829369 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               (sys.platform.startswith('linux') and
+               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
                 sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions

From f2107aba5992adb79db1e79607b500541270f89b Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 3 Dec 2006 17:16:41 +0000
Subject: [PATCH 1854/8469] - Fix build failure on kfreebsd and on the hurd.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 00f8a6b9ae..2413829369 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               (sys.platform.startswith('linux') and
+               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
                 sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions

From 6c3e3687e30a200343363312dc6ee61e0dce9d8b Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Wed, 13 Dec 2006 04:49:30 +0000
Subject: [PATCH 1855/8469] Four months of trunk changes (including a few
 releases...)

Merged revisions 51434-53004 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line

  Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev
........
  r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines

  Patch #1542451: disallow continue anywhere under a finally

  I'm undecided if this should be backported to 2.5 or 2.5.1.
  Armin suggested to wait (I'm of the same opinion).  Thomas W thinks
  it's fine to go in 2.5.
........
  r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines

  Handle a few more error conditions.

  Klocwork 301 and 302.  Will backport.
........
  r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines

  Patch #1541585: fix buffer overrun when performing repr() on
  a unicode string in a build with wide unicode (UCS-4) support.

  This code could be improved, so add an XXX comment.
........
  r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line

  Try to get the windows bots working again with the new peephole.c
........
  r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line

  patch for documentation for recent uuid changes (from ping)
........
  r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line

  Alexander Belopolsky pointed out that pos is a size_t
........
  r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines

  Expose column offset information in parse trees.
........
  r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line

  Move functional howto into trunk
........
  r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines

  Baby steps towards better tests for tokenize
........
  r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines

  x**2 should about equal x*x (including for a float x such that the result is
  inf) but didn't; added a test to test_float to verify that, and ignored the
  ERANGE value for errno in the pow operation to make the new test pass (with
  help from Marilyn Davis at the Google Python Sprint -- thanks!).
........
  r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines

  Bug fixes large and small for tokenize.

  Small: Always generate a NL or NEWLINE token following
         a COMMENT token.  The old code did not generate an NL token if
         the comment was on a line by itself.

  Large: The output of untokenize() will now match the
         input exactly if it is passed the full token sequence.  The
         old, crufty output is still generated if a limited input
         sequence is provided, where limited means that it does not
         include position information for tokens.

  Remaining bug: There is no CONTINUATION token (\) so there is no way
  for untokenize() to handle such code.

  Also, expanded the number of doctests in hopes of eventually removing
  the old-style tests that compare against a golden file.

  Bug fix candidate for Python 2.5.1. (Sigh.)
........
  r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines

  Replace dead code with an assert.

  Now that COMMENT tokens are reliably followed by NL or NEWLINE,
  there is never a need to add extra newlines in untokenize.
........
  r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines

  Reverting the patch that tried to fix the issue whereby x**2 raises
  OverflowError while x*x succeeds and produces infinity; apparently
  these inconsistencies cannot be fixed across ``all'' platforms and
  there's a widespread feeling that therefore ``every'' platform
  should keep suffering forevermore.  Ah well.
........
  r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines


  Fix SF bug #1545837: array.array borks on deepcopy.
  array.__deepcopy__() needs to take an argument, even if it doesn't actually
  use it. Will backport to 2.5 and 2.4 (if applicable.)
........
  r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines

  Patch #1545507: Exclude ctypes package in Win64 MSI file.
  Will backport to 2.5.
........
  r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line

  importing types is not necessary if we use isinstance
........
  r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines

  Port _ctypes.pyd to win64 on AMD64.
........
  r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines

  Add missing file for _ctypes.pyd port to win64 on AMD64.
........
  r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines

  Build _ctypes.pyd for win AMD64 into the MSVC project file.
  Since MSVC doesn't know about .asm files, a helper batch file is needed
  to find ml64.exe in predefined locations.  The helper script hardcodes
  the path to the MS Platform SDK.
........
  r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines

  The regular expression engine in '_sre' can segfault when interpreting
  bogus bytecode.  It is unclear whether this is a real bug or a "won't
  fix" case like bogus_code_obj.py.
........
  r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines

  Whitespace normalization.
........
  r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines

  A new test here relied on preserving invisible trailing
  whitespace in expected output.  Stop that.
........
  r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines

  - Move functions common to all path modules into genericpath.py and have the
    OS speicifc path modules import them.
  - Have os2emxpath import common functions fron ntpath instead of using copies
........
  r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line

  Fix a couple of typos.
........
  r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines

  Fix a buglet in the error reporting (SF bug report #1546372).

  This should probably go into Python 2.5 or 2.5.1 as well.
........
  r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines

  Doc fix: hashlib objects don't always return a digest of 16 bytes.
  Backport candidate for 2.5.
........
  r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line

  Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5)
........
  r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line

  Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...)
........
  r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines

  Make sure memory is properly cleaned up in file_init.

  Backport candidate.
........
  r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines

  Fix comment about indentation level in C files.
........
  r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines

  Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but
  have all new files use 4 spaces (to match current PEP 7 style).
........
  r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines

  - SF patch #1550263: Enhance and correct unittest docs
  - various minor cleanups for improved consistency
........
  r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines

  evalfile() should be execfile().
........
  r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line

  SF #1547931, fix typo (missing and).  Will backport to 2.5
........
  r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line

  Bug #1548092: fix curses.tparm seg fault on invalid input.  Needs backport to 2.5.1 and earlier.
........
  r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines

  Bug #1550714: fix SystemError from itertools.tee on negative value for n.

  Needs backport to 2.5.1 and earlier.
........
  r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line

  Make decimal.ContextManager a private implementation detail of decimal.localcontext()
........
  r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line

  Further corrections to the decimal module context management documentation
........
  r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line

  Fix documentation nits for decimal context managers.
........
  r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line

  Add missing word in comment
........
  r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines

  Hmm, this test has failed at least twice recently on the OpenBSD and
  Debian sparc buildbots.  Since this goes through a lot of tests
  and hits the disk a lot it could be slow (especially if NFS is involved).
  I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt.
  The code was stolen from test_compiler.
........
  r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line

  Fix final documentation nits before backporting decimal module fixes to 2.5
........
  r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line

  Typo fix for decimal docs
........
  r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line

  NEWS entry on trunk for decimal module changes
........
  r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line

  Fix endcase for str.rpartition()
........
  r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines

  "Conceptual" merge of rev 51711 from the 2.5 branch.

  i_divmod():  As discussed on Python-Dev, changed the overflow
  checking to live happily with recent gcc optimizations that
  assume signed integer arithmetic never overflows.

  This differs from the corresponding change on the 2.5 and 2.4
  branches, using a less obscure approach, but one that /may/
  tickle platform idiocies in their definitions of LONG_MIN.
  The 2.4 + 2.5 change avoided introducing a dependence on
  LONG_MIN, at the cost of substantially goofier code.
........
  r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines

  Whitespace normalization.
........
  r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines

  Add missing svn:eol-style property to text files.
........
  r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines

  Fix SF bug #1546288, crash in dict_equal.
........
  r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line

  Fix SF #1552093, eval docstring typo (3 ps in mapping)
........
  r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line

  This was found by Guido AFAIK on p3yk (sic) branch.
........
  r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line

  Add a NEWS entry for str.rpartition() change
........
  r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line

  Patch #1540470, for OpenBSD 4.0.  Backport candidate for 2.[34].
........
  r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines

  Bug #1520864 (again): unpacking singleton tuples in list comprehensions and
  generator expressions (x for x, in ... ) works again.

  Sigh, I only fixed for loops the first time, not list comps and genexprs too.
  I couldn't find any more unpacking cases where there is a similar bug lurking.

  This code should be refactored to eliminate the duplication.  I'm sure
  the listcomp/genexpr code can be refactored.  I'm not sure if the for loop
  can re-use any of the same code though.

  Will backport to 2.5 (the only place it matters).
........
  r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line

  Add a comment about some refactoring.  (There's probably more that should be done.)  I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
........
  r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line

  M-x untabify
........
  r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines

  Fix a few bugs on cjkcodecs found by Oren Tirosh:
  - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly.
  - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312
    codepoints to conform the standard.
  - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2
    codepoints now.
........
  r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines

  Fix a typo: 2013 -> 0213
........
  r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines

  Bug #1552618: change docs of dict.has_key() to reflect recommendation
  to use "in".
........
  r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line

  Rearrange example a bit, and show rpartition() when separator is not found
........
  r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line

  [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info().  Reported by Russell Warren
........
  r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines

  [Bug #1526834] Fix crash in pdb when you do 'b f(';
  the function name was placed into a regex pattern and the unbalanced paren
  caused re.compile() to report an error
........
  r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines

  Update the PCBuild8 solution.
  Facilitate cross-compilation by having binaries in separate Win32 and x64 directories.
  Rationalized configs by making proper use of platforms/configurations.
  Remove pythoncore_pgo project.
  Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation.
  Removed I64 support, but this can be easily added by copying the x64 platform settings.
........
  r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines

  Fixing #1531862: Do not close standard file descriptors in the
  subprocess module.
........
  r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line

  Revert 51758 because it broke all the buildbots
........
  r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines

  Bug #1551427: fix a wrong NULL pointer check in the win32 version
  of os.urandom().
........
  r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines

  Bug #1550983: emit better error messages for erroneous relative
  imports (if not in package and if beyond toplevel package).
........
  r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line

  with and as are now keywords.  There are some generated files I can't recreate.
........
  r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines

  Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack.
  Also make sure that every exception class has __module__ set to
  'exceptions'.
........
  r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines

  Fix missing import of the types module in logging.config.
........
  r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines

  Add news item for bug fix of SF bug report #1546372.
........
  r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines

  Fixed subprocess bug #1531862 again, after removing tests
  offending buildbot
........
  r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line

  Fix refcounts and add error checks.
........
  r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line

  Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314
........
  r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines

  Fix a glaring error and update some version numbers.
........
  r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line

  Typo fix
........
  r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines

  [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select()
  if an input hook has been defined.  Patch by Richard Boulton.

  This select() code is only executed with readline 2.1, or if
  READLINE_CALLBACKS is defined.

  Backport candidate for 2.5, 2.4, probably earlier versions too.
........
  r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines

  Add a warning notice on top of the generated grammar.txt.
........
  r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines

  Anonymous structure fields that have a bit-width specified did not work,
  and they gave a strange error message from PyArg_ParseTuple:
      function takes exactly 2 arguments (3 given).

  With tests.
........
  r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines

  The cast function did not accept c_char_p or c_wchar_p instances
  as first argument, and failed with a 'bad argument to internal function'
  error message.
........
  r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line

  Add missing NEWS entry for rev 51803
........
  r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line

  Add missing word
........
  r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line

  Explain SQLite a bit more clearly
........
  r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line

  Explain SQLite a bit more clearly
........
  r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line

  Use native SQLite types
........
  r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line

  Use native SQLite types
........
  r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line

  Fix typo in example
........
  r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines

  Remove the __unicode__ method from exceptions.  Allows unicode() to be called
  on exception classes.  Would require introducing a tp_unicode slot to make it
  work otherwise.

  Fixes bug #1551432 and will be backported.
........
  r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines

  Forward port of 51850 from release25-maint branch.

  As mentioned on python-dev, reverting patch #1504333 because it introduced
  an infinite loop in rev 47154.

  This patch also adds a test to prevent the regression.
........
  r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines

  Properly handle a NULL returned from PyArena_New().
  (Also fix some whitespace)

  Klocwork #364.
........
  r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line

  Add a "crasher" taken from the sgml bug report referenced in the comment
........
  r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines

  Forward-port of rev. 51857:

  Building with HP's cc on HP-UX turned up a couple of problems.
  _PyGILState_NoteThreadState was declared as static inconsistently.
  Make it static as it's not necessary outside of this module.

  Some tests failed because errno was reset to 0. (I think the tests
  that failed were at least: test_fcntl and test_mailbox).
  Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS.
  This only affected debug builds.
........
  r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines

  Forward-port 51862: Add sgml_input.html.
........
  r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line

  Markup typo fix
........
  r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line

  Some editing, markup fixes
........
  r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line

  More wordsmithing
........
  r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line

  Make --help mention that -v can be supplied multiple times
........
  r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line

  Rewrite help message to remove some of the parentheticals.  (There were a lot of them.)
........
  r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines

  Fix grammar errors and improve clarity.
........
  r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines

  Correct elementtree module index entry.
........
  r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines

  - fix module name in links in formatted documentation
  - minor markup cleanup
  (forward-ported from release25-maint revision 51888)
........
  r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines

  revise explanation of returns_unicode to reflect bool values
  and to include the default value
  (merged from release25-maint revision 51890)
........
  r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines

  Patch #1557515: Add RLIMIT_SBSIZE.
........
  r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines

  Port of revision 51902 in release25-maint to the trunk
........
  r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines

  Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version
  of python changes (2.5 -> 2.6). Bug #1552935.
........
  r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines

  Make this thing executable.
........
  r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines

  Fixes a bug with bsddb.DB.stat where the flags and txn keyword
  arguments are transposed.  (reported by Louis Zechtzer)
  ..already committed to release24-maint
  ..needs committing to release25-maint
........
  r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines

  Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed
  from exceptions.
........
  r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines

  Allow exceptions to be directly sliced again
  (e.g., ``BaseException(1,2,3)[0:2]``).

  Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev.  This
  should be backported to 2.5 .
........
  r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines

  Make python.vim output more deterministic.
........
  r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines

  Fix typo.
........
  r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines

  * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t
    which breaks negative counts
  * added test for negative numbers
  will backport to 2.5.1
........
  r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line

  added itertools.count(-n) fix
........
  r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines

  Fix %zd string formatting on Mac OS X so it prints negative numbers.

  In addition to testing positive numbers, verify negative numbers work in configure.
  In order to avoid compiler warnings on OS X 10.4, also change the order of the check
  for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format
  for Py_ssize_t.  This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't
  defined at configure time.  Need to verify the buildbot results.

  Backport candidate (if everyone thinks this patch can't be improved).
........
  r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines

  Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).

  These tests should be improved.  Hopefully this fixes variations when
  flipping back and forth between fpdef and fplist.

  Backport candidate.
........
  r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines

  Mostly revert this file to the same version as before.  Only force setting
  of PY_FORMAT_SIZE_T to "l" for Mac OSX.  I don't know a better define
  to use.  This should get rid of the warnings on other platforms and Mac too.
........
  r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line

  add boilerplate "What's New" document so the docs will build
........
  r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line

  Remove extra semi-colons reported by Johnny Lee on python-dev.  Backport if anyone cares.
........
  r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line

  SF Bug #1563963, add missing word and cleanup first sentance
........
  r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines

  Make output on test_strptime() be more verbose in face of failure.  This is in
  hopes that more information will help debug the failing test on HPPA Ubuntu.
........
  r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines

  Fix webbrowser.BackgroundBrowser on Windows.
........
  r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines

  Fix a bug in the parser's future statement handling that led to "with"
  not being recognized as a keyword after, e.g., this statement:
  from __future__ import division, with_statement
........
  r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines

  Fix a bug in traceback.format_exception_only() that led to an error
  being raised when print_exc() was called without an exception set.
  In version 2.4, this printed "None", restored that behavior.
........
  r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines

  Another crasher.
........
  r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines

  Make the error message for when the time data and format do not match clearer.
........
  r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line

  Add news item for rev. 51815
........
  r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line

  Make examples do error checking on Py_InitModule
........
  r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines

  Very minor grammatical fix in a comment.
........
  r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines

  SF bug #1567976 : fix typo

  Will backport to 2.5.
........
  r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines

  wording change
........
  r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines

  Bug #1567375: a minor logical glitch in example description.
........
  r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1565661: in webbrowser, split() the command for the default
  GNOME browser in case it is a command with args.
........
  r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines

  Patch #1567691: super() and new.instancemethod() now don't accept
  keyword arguments any more (previously they accepted them, but didn't
  use them).
........
  r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1566800: make sure that EnvironmentError can be called with any
  number of arguments, as was the case in Python 2.4.
........
  r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines

  Bug #1566663: remove obsolete example from datetime docs.
........
  r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1566602: correct failure of posixpath unittest when $HOME ends
  with a slash.
........
  r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes
  keep_blank_values and strict_parsing keyword arguments.
........
  r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1560617: in pyclbr, return full module name not only for classes,
  but also for functions.
........
  r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1556784: allow format strings longer than 127 characters in
  datetime's strftime function.
........
  r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1446043: correctly raise a LookupError if an encoding name given
  to encodings.search_function() contains a dot.
........
  r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines

  Bug #1546052: clarify that PyString_FromString(AndSize) copies the
  string pointed to by its parameter.
........
  r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines

  Convert test_import to unittest.
........
  r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines

  Some syntax errors were being caught by tokenize during the tabnanny
  check, resulting in obscure error messages.  Do the syntax check
  first.  Bug 1562716, 1562719
........
  r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines

  Add comment explaining that error msgs may be due to user code when
  running w/o subprocess.
........
  r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines

  Fix test for uintptr_t. Fixes #1568842.
  Will backport.
........
  r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines

  Guard uintptr_t test with HAVE_STDINT_H, test for
  stdint.h. Will backport.
........
  r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line

  Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622).
........
  r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line

  Documentation clarified to mention optional parameters.
........
  r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line

  Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622).
........
  r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines

  Fix minor typo in a comment.
........
  r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines

  Convert test_imp over to unittest.
........
  r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines

  decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to
  test for parts > 3 when we use .split(..., 2).
........
  r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines

  Fix for SF bug 1569998: break permitted inside try.

  The compiler was checking that there was something on the fblock
  stack, but not that there was a loop on the stack.  Fixed that and
  added a test for the specific syntax error.

  Bug fix candidate.
........
  r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines

  Fix integer negation and absolute value to not rely
  on undefined behaviour of the C compiler anymore.
  Will backport to 2.5 and 2.4.
........
  r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line

  Forward port r52134: Add uuids for 2.4.4.
........
  r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines

  Compilation problem caused by conflicting typedefs for uint32_t
  (unsigned long vs. unsigned int).
........
  r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines

  Forward-port of r52136,52138: a review of overflow-detecting code.

  * unified the way intobject, longobject and mystrtoul handle
    values around -sys.maxint-1.

  * in general, trying to entierely avoid overflows in any computation
    involving signed ints or longs is extremely involved.  Fixed a few
    simple cases where a compiler might be too clever (but that's all
    guesswork).

  * more overflow checks against bad data in marshal.c.

  * 2.5 specific: fixed a number of places that were still confusing int
    and Py_ssize_t.  Some of them could potentially have caused
    "real-world" breakage.

  * list.pop(x): fixing overflow issues on x was messy.  I just reverted
    to PyArg_ParseTuple("n"), which does the right thing.  (An obscure
    test was trying to give a Decimal to list.pop()... doesn't make
    sense any more IMHO)

  * trying to write a few tests...
........
  r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines

  Cause a PyObject_Malloc() failure to trigger a MemoryError, and then
  add 'if (PyErr_Occurred())' checks to various places so that NULL is
  returned properly.

  2.4 backport candidate.
........
  r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line

  Add MSVC8 project files to create wininst-8.exe.
........
  r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines

  Clarify what "re-initialization" means for init_builtin() and init_dynamic().

  Also remove warning about re-initialization as possibly raising an execption as
  both call _PyImport_FindExtension() which pulls any module that was already
  imported from the Python process' extension cache and just copies the __dict__
  into the module stored in sys.modules.
........
  r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines

  - update links
  - remove Sleepycat name now that they have been bought
........
  r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line

  Case fix
........
  r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines

  Fix name.
........
  r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line

  [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list.  Will backport.
........
  r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines

  A very minor bug fix: this code looks like it is designed to accept
  any hue value and do the modulo itself, except it doesn't quite do
  it in all cases.  At least, the "cannot get here" comment was wrong.
........
  r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line

  Comment grammar
........
  r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines

  Note that the excel_tab class is registered as the "excel-tab" dialect.
  Fixes 1572471.  Make a similar change for the excel class and clean up
  references to the Dialects and Formatting Parameters section in a few
  places.
........
  r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines

  Add missing NEWS entry for rev. 52129.
........
  r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines

  Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault
  when encoding non-BMP unicode characters.  (Submitted by Ray Chason)
........
  r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines

  Add version number to the link to the python documentation in
  /Developer/Documentation/Python, better for users that install multiple versions
  of python.
........
  r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines

  Fix for bug #1570284
........
  r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines

  MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a
  universal build of python on OSX 10.3 to ensure that those flags can be used
  to compile code (the universal build uses compiler flags that aren't supported
  on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and
  BLDSHARED.
........
  r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines

  MacOSX: The universal build requires that users have the MacOSX10.4u SDK
  installed to build extensions. This patch makes distutils emit a warning when
  the compiler should use an SDK but that SDK is not installed, hopefully reducing
  some confusion.
........
  r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines

  MacOSX: add more logic to recognize the correct startup file to patch to the
  shell profile patching post-install script.
........
  r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line

  Add news item for rev. 52211 change
........
  r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line

  Fix wording in comment
........
  r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines

  Patch #1572724: fix typo ('=' instead of '==') in _msi.c.
........
  r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines

  List gc.get_count() in the module docstring.
........
  r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line

  Bug #1565150: Fix subsecond processing for os.utime on Windows.
........
  r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines

  MacOSX: fix permission problem in the generated installer
........
  r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines

  Bug #1575746: fix typo in property() docs.
........
  r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines

  Bug #813342: Start the IDLE subprocess with -Qnew if the parent
  is started with that option.
........
  r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines

  Bug #1565919: document set types in the Language Reference.
........
  r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines

  Bug #1550524: better heuristics to find correct class definition
  in inspect.findsource().
........
  r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines

  Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode
  arguments with the system default encoding just like the write()
  method does, instead of converting it to a raw buffer.
........
  r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines

  Bug #1546628: add a note about urlparse.urljoin() and absolute paths.
........
  r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines

  Bug #1545497: when given an explicit base, int() did ignore NULs
  embedded in the string to convert.
........
  r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines

  Add a note to fpectl docs that it's not built by default
  (bug #1556261).
........
  r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines

  Bug #1560114: the Mac filesystem does have accurate information
  about the case of filenames.
........
  r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines

  Small grammar fix, thanks Sjoerd.
........
  r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines

  Fix tarfile depending on buggy int('1\0', base) behavior.
........
  r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines

  Bug #1283491: follow docstring convention wrt. keyword-able args in sum().
........
  r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines

  Bug #1560179: speed up posixpath.(dir|base)name
........
  r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines

  Clean up the language of a sentence relating to the connect() function and
  user-defined datatypes.
........
  r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines

  Update the peephole optimizer to remove more dead code (jumps after returns)
  and inline jumps to returns.
........
  r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines

  Patch #1576954: Update VC6 build directory; remove redundant
  files in VC7. Will backport to 2.5.
........
  r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line

  Patch #1576166: Support os.utime for directories on Windows NT+.
........
  r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines

  Patch #1577551: Add ctypes and ET build support for VC6.
  Will backport to 2.5.
........
  r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line

  Loosen the test for equal time stamps.
........
  r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines

  Bug #1567666: Emulate GetFileAttributesExA for Win95.
  Will backport to 2.5.
........
  r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines

  Round to int, because some systems support sub-second time stamps in stat, but not in utime.
  Also be consistent with modifying only mtime, not atime.
........
  r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines

  Set the eol-style for project files to "CRLF".
........
  r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines

  Drop binary property on dsp files, set eol-style
  to CRLF instead.
........
  r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines

  Remove binary property, set eol-style to CRLF instead.
........
  r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines

  Mention the bdist_msi module. Will backport to 2.5.
........
  r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines

  Fix turtle so that you can launch the demo2 function on its own instead of only
  when the module is launched as a script.
........
  r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines

  Patch #1457736: Update VC6 to use current PCbuild settings.
  Will backport to 2.5.
........
  r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines

  Remove obsolete file. Will backport.
........
  r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines

  Forward-port r52358:
  - Bug #1578513: Cross compilation was broken by a change to configure.
  Repair so that it's back to how it was in 2.4.3.
........
  r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines

  ctypes callback functions only support 'fundamental' result types.
  Check this and raise an error when something else is used - before
  this change ctypes would hang or crash when such a callback was
  called.  This is a partial fix for #1574584.

  Will backport to release25-maint.
........
  r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines

  newIobject():  repaired incorrect cast to quiet MSVC warning.
........
  r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines

  Whitespace normalization.
........
  r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines

  Add missing svn:eol-style to text files.
........
  r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines

  Add check for the PyArg_ParseTuple format, and declare
  it if it is supported.
........
  r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines

  Fix various minor errors in passing arguments to
  PyArg_ParseTuple.
........
  r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines

  Restore CFLAGS after checking for __attribute__
........
  r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line

  [Bug #1576348] Fix typo in example
........
  r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines

  Port test___future__ to unittest.
........
  r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines

  Patch #1580674: with this patch os.readlink uses the filesystem encoding to
  decode unicode objects and returns an unicode object when the argument is one.
........
  r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines

  Patch #1580872: Remove duplicate declaration of PyCallable_Check.
  Will backport to 2.5.
........
  r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines

  - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
    ctypes isn't considered as requiring executable stacks.
  Will backport to 2.5.
........
  r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines

  Remove passwd.adjunct.byname from list of maps
  for test_nis. Will backport to 2.5.
........
  r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines

  Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated
........
  r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line

  [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation.  Reported by David Faure.
........
  r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line

  Typo fix
........
  r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines

  Patch #1549049: Rewrite type conversion in structmember.
  Fixes #1545696 and #1566140. Will backport to 2.5.
........
  r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines

  Check for values.h. Will backport.
........
  r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines

  Get DBL_MAX from float.h not values.h. Will backport.
........
  r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines

  Patch #1567274: Support SMTP over TLS.
........
  r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line

  Set svn:keywords property
........
  r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line

  Add item
........
  r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line

  Some wording changes and markup fixes
........
  r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line

  [Bug #1585690] Note that line_num was added in Python 2.5
........
  r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line

  [Bug #1583946] Reword description of server and issuer
........
  r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line

  [Bug #1562583] Mention the set_reuse_addr() method
........
  r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines

  [Bug #1542016] Report PCALL_POP value.  This makes the return value of sys.callstats() match its docstring.

  Backport candidate.  Though it's an API change, this is a pretty obscure
  portion of the API.
........
  r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line

  Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules
........
  r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line

  [Bug #1576241] Let functools.wraps work with built-in functions
........
  r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line

  [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error
........
  r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line

  Clarify docstring
........
  r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines

  [Patch #1574068 by Scott Dial] urllib and urllib2 were using
  base64.encodestring() for encoding authentication data.
  encodestring() can include newlines for very long input, which
  produced broken HTTP headers.
........
  r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line

  Check db_setup_debug for a few print statements; change sqlite_setup_debug to False
........
  r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line

  [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed
........
  r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines

  WindowsError.str should display the windows error code,
  not the posix error code; with test.
  Fixes #1576174.

  Will backport to release25-maint.
........
  r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines

  Modulefinder now handles absolute and relative imports, including
  tests.

  Will backport to release25-maint.
........
  r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines

  Patch #1552024: add decorator support to unparse.py demo script.
........
  r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines

  Port test_bufio to unittest.
........
  r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines

  Convert test_global, test_scope and test_grammar to unittest.

  I tried to enclose all tests which must be run at the toplevel
  (instead of inside a method) in exec statements.
........
  r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines

  Update outstanding bugs test file.
........
  r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines

  Convert test_math to unittest.
........
  r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines

  Convert test_opcodes to unittest.
........
  r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines

  Fix nth() itertool recipe.
........
  r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines

  make test_grammar pass with python -O
........
  r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines

  Add some asserts.  In sysmodule, I think these were to try to silence
  some warnings from Klokwork.  They verify the assumptions of the format
  of svn version output.

  The assert in the thread module helped debug a problem on HP-UX.
........
  r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines

  Fix warnings with HP's C compiler.  It doesn't recognize that infinite
  loops are, um, infinite.  These conditions should not be able to happen.

  Will backport.
........
  r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines

  Fix crash in test on HP-UX.  Apparently, it's not possible to delete a lock if
  it's held (even by the current thread).

  Will backport.
........
  r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines

  Fix bug #1565514, SystemError not raised on too many nested blocks.
  It seems like this should be a different error than SystemError, but
  I don't have any great ideas and SystemError was raised in 2.4 and earlier.

  Will backport.
........
  r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines

  Prevent crash if alloc of garbage fails.  Found by Typo.pl.

  Will backport.
........
  r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines

  Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either.

  Will backport.
........
  r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines

  Fix test_modulefinder so it doesn't fail when run after test_distutils.
........
  r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines

  From SF 1557890, fix problem of using wrong type in example.

  Will backport.
........
  r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines

  Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and
  fix all codecs file wrappers to work correctly with the "with"
  statement (bug #1586513).
........
  r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines

  Clean up a leftover from old listcomp generation code.
........
  r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines

  Bug #1586448: the compiler module now emits the same bytecode for
  list comprehensions as the builtin compiler, using the LIST_APPEND
  opcode.
........
  r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines

  Remove trailing comma.
........
  r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines

  Bug #1357915: allow all sequence types for shell arguments in
  subprocess.
........
  r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines

  Patch #1583880: fix tarfile's problems with long names and posix/
  GNU modes.
........
  r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines

  Test assert if __debug__ is true.
........
  r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines

  Fix the new EncodedFile test to work with big endian platforms.
........
  r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines

  Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders.
........
  r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines

  Bug #1586773: extend hashlib docstring.
........
  r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines

  Update comments, remove commented out code.
  Move assembler structure next to assembler code to make it easier to
  move it to a separate file.
........
  r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines

  Bug #1576657: when setting a KeyError for a tuple key, make sure that
  the tuple isn't used as the "exception arguments tuple".
........
  r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_mmap to unittest.
........
  r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_poll to unittest.
........
  r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_nis to unittest.
........
  r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_types to unittest.
........
  r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_cookie to unittest.
........
  r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_cgi to unittest.
........
  r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines

  Completely convert test_httplib to unittest.
........
  r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines

  Convert test_MimeWriter to unittest.
........
  r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines

  Convert test_openpty to unittest.
........
  r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines

  Remove leftover test output file.
........
  r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines

  Move the check for openpty to the beginning.
........
  r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines

  Add tests for basic argument errors.
........
  r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines

  Add tests for incremental codecs with an errors
  argument.
........
  r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line

  Fix refleak
........
  r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line

  I'm assuming this is correct, it fixes the tests so they pass again
........
  r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line

  Change to improve speed of _fixupChildren
........
  r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line

  Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now).
........
  r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines

  Replace the XXX marker in the 'Arrays and pointers' reference manual
  section with a link to the tutorial sections.

  Will backport to release25-maint.
........
  r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines

  Fix a code example by adding a missing import.

  Fixes #1557890.

  Will backport to release25-maint.
........
  r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines

  Whitespace normalization.
........
  r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines

  - Patch #1060577: Extract list of RPM files from spec file in
    bdist_rpm
  Will backport to 2.5.
........
  r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines

  Bug #1588287: fix invalid assertion for `1,2` in debug builds.

  Will backport
........
  r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line

  Update link
........
  r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line

  note that user can control directory location even if default dir is used
........
  r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines

  Fix a number of typos in strings and comments (sf#1589070)
........
  r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines

  Whitespace changes to make the source more compliant with PEP8 (SF#1589070)
........
  r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines

  Fix markup.

  Will backport to release25-maint.
........
  r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines

  Fix grammatical error as well.

  Will backport to release25-maint.
........
  r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line

  Add missing word
........
  r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines

  Correctly forward exception in instance_contains().
  Fixes #1591996. Patch contributed by Neal Norwitz.
  Will backport.
........
  r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines

  News entry for 52662.
........
  r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines

  Patch #1351744: Add askyesnocancel helper for tkMessageBox.
........
  r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines

  Patch #1592072: fix docs for return value of PyErr_CheckSignals.
........
  r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines

  Bug #1592533: rename variable in heapq doc example, to avoid shadowing
  "sorted".
........
  r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line

  Add section on the functional module
........
  r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line

  Add section on operator module; make a few edits
........
  r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line

  Add table of contents; this required fixing a few headings.  Some more smalle edits.
........
  r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line

  More edits
........
  r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines

  Patch #838546: Make terminal become controlling in pty.fork().
  Will backport to 2.5.
........
  r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines

  Patch #1592250: Add elidge argument to Tkinter.Text.search.
........
  r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines

  [Bug #1569790] mailbox.Maildir.get_folder() loses factory information

  Both the Maildir and MH classes had this bug; the patch fixes both classes
  and adds a test.

  Will backport to 25-maint.
........
  r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line

  [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk
........
  r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines

  Replace C++ comment with C comment (fixes SF bug #1593525).
........
  r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines

  [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash

  Two changes:

  Where possible, use link()/remove() to move files into a directory; this
  makes it easier to avoid overwriting an existing file.

  Use _create_carefully() to create files in tmp/, which uses O_EXCL.

  Backport candidate.
........
  r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines

  Fix SF#1566719: not creating site-packages (or other target directory) when
  installing .egg-info for a project that contains no modules or packages,
  while using --root (as in bdist_rpm).
........
  r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line

  Reword entry
........
  r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line

  [Feature request #1542920] Link to wsgi.org
........
  r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines

  Bug #1594742: wrong word in stringobject doc.
........
  r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines

  Bug #1594758: wording improvement for dict.update() docs.
........
  r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines

  Patch #1065257: Support passing open files as body in
  HTTPConnection.request().
........
  r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines

  Patch #1355023: support whence argument for GzipFile.seek.
........
  r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines

  Bug #1067760: Deprecate passing floats to file.seek.
........
  r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines

  Patch #1359217: Ignore 2xx response before 150 response.
  Will backport to 2.5.
........
  r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines

  Patch #1360200: Use unmangled_version RPM spec field to deal with
  file name mangling.
  Will backport to 2.5.
........
  r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines

  Fix typo.
........
  r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines

  Bug #1594809: add a note to README regarding PYTHONPATH and make install.
........
  r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines

  Bug #1597576: mention that the new base64 api has been introduced in py2.4.
........
  r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines

  Bug #1597824: return the registered function from atexit.register()
  to facilitate usage as a decorator.
........
  r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines

  Bug #1588217: don't parse "= " as a soft line break in binascii's
  a2b_qp() function, instead leave it in the string as quopri.decode()
  does.
........
  r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines

  Remove file-locking in MH.pack() method.
  This change looks massive but it's mostly a re-indenting after
  removing some try...finally blocks.

  Also adds a test case that does a pack() while the mailbox is locked; this
  test would have turned up bugs in the original code on some platforms.

  In both nmh and GNU Mailutils' implementation of MH-format mailboxes,
  no locking is done of individual message files when renaming them.

  The original mailbox.py code did do locking, which meant that message
  files had to be opened.  This code was buggy on certain platforms
  (found through reading the code); there were code paths that closed
  the file object and then called _unlock_file() on it.

  Will backport to 25-maint once I see how the buildbots react to this patch.
........
  r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines

  Patch #1538878: Don't make tkSimpleDialog dialogs transient if
  the parent window is withdrawn. This mirrors what dialog.tcl
  does.
  Will backport to 2.5.
........
  r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines

  Patch #1594554: Always close a tkSimpleDialog on ok(), even
  if an exception occurs.
  Will backport to 2.5.
........
  r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines

  Patch #1472877: Fix Tix subwidget name resolution.
  Will backport to 2.5.
........
  r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line

  Expand checking in test_sha
........
  r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines

  Patch [ 1586791 ] better error msgs for some TypeErrors
........
  r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines

  Make cStringIO.truncate raise IOError for negative
  arguments (even for -1). Fixes the last bit of
  #1359365.
........
  r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line

  Add a test case of data w/ bytes > 127
........
  r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines

  Patch #1070046: Marshal new-style objects like InstanceType
  in xmlrpclib.
........
  r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines

  Speed up function calls into the math module by using METH_O.
  There should be no functional changes. However, the error msgs are
  slightly different.  Also verified that the module dict is not NULL on init.
........
  r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines

  markup fix
........
  r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines

  Further markup fix.
........
  r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines

  Jython compatibility fix: if uu.decode() opened its output file, be sure to
  close it.
........
  r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines

  Bug #1599782: Fix segfault on bsddb.db.DB().type().

  The problem is that _DB_get_type() can't be called without the GIL
  because it calls a bunch of PyErr_* APIs when an error occurs.
  There were no other cases in this file that it was called without the GIL.
  Removing the BEGIN/END THREAD around _DB_get_type() made everything work.

  Will backport.
........
  r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line

  Oops, convert tabs to spaces
........
  r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line

  Fix SF #1599879, socket.gethostname should ref getfqdn directly.
........
  r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines

  Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
  and _CRT_NONSTDC_NO_DEPRECATE.
  Will backport.
........
  r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines

  Patch #1362975: Rework CodeContext indentation algorithm to
  avoid hard-coding pixel widths. Also make the text's scrollbar
  a child of the text frame, not the top widget.
........
  r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines

  Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig'))
  SF bug #1601501.
........
  r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines

  Bug #1601630: little improvement to getopt docs
........
  r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines

  a test for an error condition not covered by existing tests
  (noticed this when writing the equivalent code for pypy)
........
  r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line

  Fix and/add typo
........
  r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line

  ... and the number of the counting shall be three.
........
  r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line

  Fix bug #1598620: A ctypes structure cannot contain itself.
........
  r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines

  Disable _XOPEN_SOURCE on NetBSD 1.x.
  Will backport to 2.5
........
  r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines

  Bug #1603321: make pstats.Stats accept Unicode file paths.
........
  r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines

  Bug #1603789: grammatical error in Tkinter docs.
........
  r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines

  Fix #1563807: _ctypes built on AIX fails with ld ffi error.

  The contents of ffi_darwin.c must be compiled unless __APPLE__ is
  defined and __ppc__ is not.

  Will backport.
........
  r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines

  Forgot a case where the locals can now be a general mapping
  instead of just a dictionary.  (backporting...)
........
  r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines

  Update version.
........
  r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines

  Move xdrlib tests from the module into a separate test script,
  port the tests to unittest and add a few new tests.
........
  r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line

  Add name to credits (for untokenize).
........
  r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines

  Move IDLE news into NEWS.txt.
........
  r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines

  Patch #1544279: Improve thread-safety of the socket module by moving
  the sock_addr_t storage out of the socket object.
  Will backport to 2.5.
........
  r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines

  Patch #1371075: Make ConfigParser accept optional dict type
  for ordering, sorting, etc.
........
  r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines

  - Fix build failure on kfreebsd and on the hurd.
........
  r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines

  fix a versionchanged tag
........
  r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines

  Fix pickle doc typo
  Patch #1608758
........
  r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines

  Patch #1610437: fix a tarfile bug with long filename headers.
........
  r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines

  Fix a bad assumption that all objects assigned to '__loader__' on a module
  will have a '_files' attribute.
........
  r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines

  RFE #1592899: mention string.maketrans() in docs for str.translate,
  remove reference to the old regex module in the former's doc.
........
  r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line

  Eliminate two redundant calls to PyObject_Hash().
........
  r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines

  Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209).
........
  r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines

  Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug
  1576657).
........
  r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines

  Add test for SF bug 1576657
........
  r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines

  #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force
  English output.
........
  r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines

  Patch #1608267: fix a race condition in os.makedirs() is the directory
  to be created is already there.
........
  r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines

  - Fix the build of the library reference in info format.
........
  r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line

  Fix a typo
........
  r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines

  Move errno imports back to individual functions.
........
  r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line

  Patch by Jeremy Katz (SF #1609407)
........
  r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line

  Patch by "cuppatea" (SF #1503765)
........
---
 command/bdist_rpm.py        |  67 +++++++++++++++++++++---------------
 command/build_ext.py        |   2 +-
 command/install_egg_info.py |   3 ++
 command/register.py         |   2 +-
 command/wininst-8.exe       | Bin 0 -> 61440 bytes
 sysconfig.py                |   5 ++-
 unixccompiler.py            |  16 +++++++++
 7 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 command/wininst-8.exe

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 5b09965867..6f0e0d881c 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -337,37 +337,47 @@ def run (self):
         if not self.keep_temp:
             rpm_cmd.append('--clean')
         rpm_cmd.append(spec_path)
+        # Determine the binary rpm names that should be built out of this spec
+        # file
+        # Note that some of these may not be really built (if the file
+        # list is empty)
+        nvr_string = "%{name}-%{version}-%{release}"
+        src_rpm = nvr_string + ".src.rpm"
+        non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
+        q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
+            src_rpm, non_src_rpm, spec_path)
+
+        out = os.popen(q_cmd)
+        binary_rpms = []
+        source_rpm = None
+        while 1:
+            line = out.readline()
+            if not line:
+                break
+            l = string.split(string.strip(line))
+            assert(len(l) == 2)
+            binary_rpms.append(l[1])
+            # The source rpm is named after the first entry in the spec file
+            if source_rpm is None:
+                source_rpm = l[0]
+
+        status = out.close()
+        if status:
+            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
         self.spawn(rpm_cmd)
 
-        # XXX this is a nasty hack -- we really should have a proper way to
-        # find out the names of the RPM files created; also, this assumes
-        # that RPM creates exactly one source and one binary RPM.
         if not self.dry_run:
             if not self.binary_only:
-                srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
-                assert len(srpms) == 1, \
-                       "unexpected number of SRPM files found: %s" % srpms
-                dist_file = ('bdist_rpm', 'any',
-                             self._dist_path(srpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(srpms[0], self.dist_dir)
+                srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
+                assert(os.path.exists(srpm))
+                self.move_file(srpm, self.dist_dir)
 
             if not self.source_only:
-                rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
-                debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
-                                                   "*/*debuginfo*.rpm"))
-                if debuginfo:
-                    rpms.remove(debuginfo[0])
-                assert len(rpms) == 1, \
-                       "unexpected number of RPM files found: %s" % rpms
-                dist_file = ('bdist_rpm', get_python_version(),
-                             self._dist_path(rpms[0]))
-                self.distribution.dist_files.append(dist_file)
-                self.move_file(rpms[0], self.dist_dir)
-                if debuginfo:
-                    dist_file = ('bdist_rpm', get_python_version(),
-                                 self._dist_path(debuginfo[0]))
-                    self.move_file(debuginfo[0], self.dist_dir)
+                for rpm in binary_rpms:
+                    rpm = os.path.join(rpm_dir['RPMS'], rpm)
+                    if os.path.exists(rpm):
+                        self.move_file(rpm, self.dist_dir)
     # run()
 
     def _dist_path(self, path):
@@ -381,6 +391,7 @@ def _make_spec_file(self):
         spec_file = [
             '%define name ' + self.distribution.get_name(),
             '%define version ' + self.distribution.get_version().replace('-','_'),
+            '%define unmangled_version ' + self.distribution.get_version(),
             '%define release ' + self.release.replace('-','_'),
             '',
             'Summary: ' + self.distribution.get_description(),
@@ -402,9 +413,9 @@ def _make_spec_file(self):
         # but only after it has run: and we create the spec file before
         # running "sdist", in case of --spec-only.
         if self.use_bzip2:
-            spec_file.append('Source0: %{name}-%{version}.tar.bz2')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.bz2')
         else:
-            spec_file.append('Source0: %{name}-%{version}.tar.gz')
+            spec_file.append('Source0: %{name}-%{unmangled_version}.tar.gz')
 
         spec_file.extend([
             'License: ' + self.distribution.get_license(),
@@ -479,7 +490,7 @@ def _make_spec_file(self):
         # are just text that we drop in as-is.  Hmmm.
 
         script_options = [
-            ('prep', 'prep_script', "%setup"),
+            ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
             ('build', 'build_script', def_build),
             ('install', 'install_script',
              ("%s install "
diff --git a/command/build_ext.py b/command/build_ext.py
index cd67544b7a..f79eee3b74 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               (sys.platform.startswith('linux') and
+               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
                 sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index c31ac29668..c8880310df 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -35,6 +35,9 @@ def run(self):
             dir_util.remove_tree(target, dry_run=self.dry_run)
         elif os.path.exists(target):
             self.execute(os.unlink,(self.target,),"Removing "+target)
+        elif not os.path.isdir(self.install_dir):
+            self.execute(os.makedirs, (self.install_dir,),
+                         "Creating "+self.install_dir)
         log.info("Writing %s", target)
         if not self.dry_run:
             f = open(target, 'w')
diff --git a/command/register.py b/command/register.py
index f8912621c8..3177476b3b 100644
--- a/command/register.py
+++ b/command/register.py
@@ -256,7 +256,7 @@ def post_to_server(self, data, auth=None):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
                 value = unicode(value).encode("utf-8")
diff --git a/command/wininst-8.exe b/command/wininst-8.exe
new file mode 100644
index 0000000000000000000000000000000000000000..7403bfabf5cc10c13ef2b6a2ea276b4f6d26ff37
GIT binary patch
literal 61440
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

literal 0
HcmV?d00001

diff --git a/sysconfig.py b/sysconfig.py
index 96923bdca4..8989d92b4e 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -509,7 +509,10 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS'):
+                for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
                     flags = _config_vars[key]
                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
diff --git a/unixccompiler.py b/unixccompiler.py
index 6cd14f7728..75e8a5316e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -82,6 +82,22 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
+    # Check if the SDK that is used during compilation actually exists,
+    # the universal build requires the usage of a universal SDK and not all
+    # users have that installed by default.
+    sysroot = None
+    if '-isysroot' in cc_args:
+        idx = cc_args.index('-isysroot')
+        sysroot = cc_args[idx+1]
+    elif '-isysroot' in compiler_so:
+        idx = compiler_so.index('-isysroot')
+        sysroot = compiler_so[idx+1]
+
+    if sysroot and not os.path.isdir(sysroot):
+        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
+                sysroot)
+        log.warn("Please check your Xcode installation")
+
     return compiler_so
 
 class UnixCCompiler(CCompiler):

From ba04afa355a9b33a8dc4e52e11de3b11cae13afd Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 10 Jan 2007 16:19:56 +0000
Subject: [PATCH 1856/8469] SF patch 1631942 by Collin Winter: (a) "except E,
 V" -> "except E as V" (b) V is now limited to a simple name (local variable)
 (c) V is now deleted at the end of the except block

---
 bcppcompiler.py     | 10 +++++-----
 command/register.py |  4 ++--
 command/sdist.py    |  2 +-
 command/upload.py   |  2 +-
 core.py             |  8 ++++----
 cygwinccompiler.py  |  6 +++---
 dir_util.py         |  7 ++++---
 dist.py             |  6 +++---
 emxccompiler.py     |  6 +++---
 fancy_getopt.py     |  2 +-
 file_util.py        | 23 +++++++++++++++--------
 msvccompiler.py     | 12 ++++++------
 spawn.py            |  8 ++++----
 sysconfig.py        |  4 ++--
 unixccompiler.py    |  8 ++++----
 util.py             |  2 +-
 16 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index ca524a5b88..6968cb8f6f 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -115,7 +115,7 @@ def compile(self, sources,
                 # This needs to be compiled to a .res file -- do it now.
                 try:
                     self.spawn (["brcc32", "-fo", obj, src])
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise CompileError, msg
                 continue # the 'for' loop
 
@@ -139,7 +139,7 @@ def compile(self, sources,
                 self.spawn ([self.cc] + compile_opts + pp_opts +
                             [input_opt, output_opt] +
                             extra_postargs + [src])
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
 
         return objects
@@ -164,7 +164,7 @@ def create_static_lib (self,
                 pass                    # XXX what goes here?
             try:
                 self.spawn ([self.lib] + lib_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LibError, msg
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -298,7 +298,7 @@ def link (self,
             self.mkpath (os.path.dirname (output_filename))
             try:
                 self.spawn ([self.linker] + ld_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LinkError, msg
 
         else:
@@ -391,7 +391,7 @@ def preprocess (self,
                 self.mkpath(os.path.dirname(output_file))
             try:
                 self.spawn(pp_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 print msg
                 raise CompileError, msg
 
diff --git a/command/register.py b/command/register.py
index 3177476b3b..cb9525ab0e 100644
--- a/command/register.py
+++ b/command/register.py
@@ -284,11 +284,11 @@ def post_to_server(self, data, auth=None):
         data = ''
         try:
             result = opener.open(req)
-        except urllib2.HTTPError, e:
+        except urllib2.HTTPError as e:
             if self.show_response:
                 data = e.fp.read()
             result = e.code, e.msg
-        except urllib2.URLError, e:
+        except urllib2.URLError as e:
             result = 500, str(e)
         else:
             if self.show_response:
diff --git a/command/sdist.py b/command/sdist.py
index 3dfe6f21a7..eb2db505dd 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -333,7 +333,7 @@ def read_template (self):
 
             try:
                 self.filelist.process_template_line(line)
-            except DistutilsTemplateError, msg:
+            except DistutilsTemplateError as msg:
                 self.warn("%s, line %d: %s" % (template.filename,
                                                template.current_line,
                                                msg))
diff --git a/command/upload.py b/command/upload.py
index 67ba080427..7f96a475b6 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -184,7 +184,7 @@ def upload_file(self, command, pyversion, filename):
             http.putheader('Authorization', auth)
             http.endheaders()
             http.send(body)
-        except socket.error, e:
+        except socket.error as e:
             self.announce(str(e), log.ERROR)
             return
 
diff --git a/core.py b/core.py
index 85a28fe795..4dc8eb01aa 100644
--- a/core.py
+++ b/core.py
@@ -110,7 +110,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # (ie. everything except distclass) to initialize it
     try:
         _setup_distribution = dist = klass(attrs)
-    except DistutilsSetupError, msg:
+    except DistutilsSetupError as msg:
         if 'name' not in attrs:
             raise SystemExit, "error in %s setup command: %s" % \
                   (attrs['name'], msg)
@@ -135,7 +135,7 @@ class found in 'cmdclass' is used in place of the default, which is
     # fault, so turn them into SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
-    except DistutilsArgError, msg:
+    except DistutilsArgError as msg:
         raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
 
     if DEBUG:
@@ -151,7 +151,7 @@ class found in 'cmdclass' is used in place of the default, which is
             dist.run_commands()
         except KeyboardInterrupt:
             raise SystemExit, "interrupted"
-        except (IOError, os.error), exc:
+        except (IOError, os.error) as exc:
             error = grok_environment_error(exc)
 
             if DEBUG:
@@ -161,7 +161,7 @@ class found in 'cmdclass' is used in place of the default, which is
                 raise SystemExit, error
 
         except (DistutilsError,
-                CCompilerError), msg:
+                CCompilerError) as msg:
             if DEBUG:
                 raise
             else:
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 4fd23e6dc6..44b5850834 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -142,13 +142,13 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
                 self.spawn(["windres", "-i", src, "-o", obj])
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
         else: # for other files use the C-compiler
             try:
                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                            extra_postargs)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
 
     def link (self,
@@ -379,7 +379,7 @@ def check_config_h():
         s = f.read()
         f.close()
 
-    except IOError, exc:
+    except IOError as exc:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
         return (CONFIG_H_UNCERTAIN,
diff --git a/dir_util.py b/dir_util.py
index 92f49346f7..398f242974 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -75,7 +75,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
             try:
                 os.mkdir(head)
                 created_dirs.append(head)
-            except OSError, exc:
+            except OSError as exc:
                 raise DistutilsFileError, \
                       "could not create '%s': %s" % (head, exc[-1])
 
@@ -142,7 +142,8 @@ def copy_tree (src, dst,
               "cannot copy tree '%s': not a directory" % src
     try:
         names = os.listdir(src)
-    except os.error, (errno, errstr):
+    except os.error as e:
+        (errno, errstr) = e
         if dry_run:
             names = []
         else:
@@ -209,7 +210,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
             abspath = os.path.abspath(cmd[1])
             if abspath in _path_created:
                 del _path_created[abspath]
-        except (IOError, OSError), exc:
+        except (IOError, OSError) as exc:
             log.warn(grok_environment_error(
                     exc, "error removing %s: " % directory))
 
diff --git a/dist.py b/dist.py
index d098cb9713..d21c5e2f1b 100644
--- a/dist.py
+++ b/dist.py
@@ -398,7 +398,7 @@ def parse_config_files (self, filenames=None):
                         setattr(self, opt, strtobool(val))
                     else:
                         setattr(self, opt, val)
-                except ValueError, msg:
+                except ValueError as msg:
                     raise DistutilsOptionError, msg
 
     # parse_config_files ()
@@ -515,7 +515,7 @@ def _parse_command_opts (self, parser, args):
         # it takes.
         try:
             cmd_class = self.get_command_class(command)
-        except DistutilsModuleError, msg:
+        except DistutilsModuleError as msg:
             raise DistutilsArgError, msg
 
         # Require that the command class be derived from Command -- want
@@ -917,7 +917,7 @@ def _set_command_options (self, command_obj, option_dict=None):
                     raise DistutilsOptionError, \
                           ("error in %s: command '%s' has no such option '%s'"
                            % (source, command_name, option))
-            except ValueError, msg:
+            except ValueError as msg:
                 raise DistutilsOptionError, msg
 
     def reinitialize_command (self, command, reinit_subcommands=0):
diff --git a/emxccompiler.py b/emxccompiler.py
index f52e63232d..8aef2b7a9d 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -79,13 +79,13 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             # gcc requires '.rc' compiled to binary ('.res') files !!!
             try:
                 self.spawn(["rc", "-r", src])
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
         else: # for other files use the C-compiler
             try:
                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                            extra_postargs)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
 
     def link (self,
@@ -275,7 +275,7 @@ def check_config_h():
         s = f.read()
         f.close()
 
-    except IOError, exc:
+    except IOError as exc:
         # if we can't read this file, we cannot say it is wrong
         # the compiler will complain later about this file as missing
         return (CONFIG_H_UNCERTAIN,
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 31cf0c5c3b..62a24e8524 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -256,7 +256,7 @@ def getopt (self, args=None, object=None):
         short_opts = string.join(self.short_opts)
         try:
             opts, args = getopt.getopt(args, short_opts, self.long_opts)
-        except getopt.error, msg:
+        except getopt.error as msg:
             raise DistutilsArgError, msg
 
         for opt, val in opts:
diff --git a/file_util.py b/file_util.py
index 37b152ed8a..c225ad3172 100644
--- a/file_util.py
+++ b/file_util.py
@@ -32,27 +32,31 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
     try:
         try:
             fsrc = open(src, 'rb')
-        except os.error, (errno, errstr):
+        except os.error as e:
+            (errno, errstr) = e
             raise DistutilsFileError, \
                   "could not open '%s': %s" % (src, errstr)
 
         if os.path.exists(dst):
             try:
                 os.unlink(dst)
-            except os.error, (errno, errstr):
+            except os.error as e:
+                (errno, errstr) = e
                 raise DistutilsFileError, \
                       "could not delete '%s': %s" % (dst, errstr)
 
         try:
             fdst = open(dst, 'wb')
-        except os.error, (errno, errstr):
+        except os.error as e:
+            (errno, errstr) = e
             raise DistutilsFileError, \
                   "could not create '%s': %s" % (dst, errstr)
 
         while 1:
             try:
                 buf = fsrc.read(buffer_size)
-            except os.error, (errno, errstr):
+            except os.error as e:
+                (errno, errstr) = e
                 raise DistutilsFileError, \
                       "could not read from '%s': %s" % (src, errstr)
 
@@ -61,7 +65,8 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
 
             try:
                 fdst.write(buf)
-            except os.error, (errno, errstr):
+            except os.error as e:
+                (errno, errstr) = e
                 raise DistutilsFileError, \
                       "could not write to '%s': %s" % (dst, errstr)
 
@@ -146,7 +151,7 @@ def copy_file (src, dst,
         import macostools
         try:
             macostools.copy(src, dst, 0, preserve_times)
-        except os.error, exc:
+        except os.error as exc:
             raise DistutilsFileError, \
                   "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
 
@@ -217,7 +222,8 @@ def move_file (src, dst,
     copy_it = 0
     try:
         os.rename(src, dst)
-    except os.error, (num, msg):
+    except os.error as e:
+        (num, msg) = e
         if num == errno.EXDEV:
             copy_it = 1
         else:
@@ -228,7 +234,8 @@ def move_file (src, dst,
         copy_file(src, dst)
         try:
             os.unlink(src)
-        except os.error, (num, msg):
+        except os.error as e:
+            (num, msg) = e
             try:
                 os.unlink(dst)
             except os.error:
diff --git a/msvccompiler.py b/msvccompiler.py
index 9ec3508c76..968a4ffd46 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -129,7 +129,7 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
             else:
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
-        except KeyError, exc: #
+        except KeyError as exc: #
             raise DistutilsPlatformError, \
                   ("""Python was built with Visual Studio 2003;
 extensions must be built with a compiler than can generate compatible binaries.
@@ -371,7 +371,7 @@ def compile(self, sources,
                 try:
                     self.spawn ([self.rc] + pp_opts +
                                 [output_opt] + [input_opt])
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise CompileError, msg
                 continue
             elif ext in self._mc_extensions:
@@ -400,7 +400,7 @@ def compile(self, sources,
                     self.spawn ([self.rc] +
                                 ["/fo" + obj] + [rc_file])
 
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise CompileError, msg
                 continue
             else:
@@ -414,7 +414,7 @@ def compile(self, sources,
                 self.spawn ([self.cc] + compile_opts + pp_opts +
                             [input_opt, output_opt] +
                             extra_postargs)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
 
         return objects
@@ -440,7 +440,7 @@ def create_static_lib (self,
                 pass                    # XXX what goes here?
             try:
                 self.spawn ([self.lib] + lib_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LibError, msg
 
         else:
@@ -519,7 +519,7 @@ def link (self,
             self.mkpath (os.path.dirname (output_filename))
             try:
                 self.spawn ([self.linker] + ld_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LinkError, msg
 
         else:
diff --git a/spawn.py b/spawn.py
index e5654ff009..6b07f52ebe 100644
--- a/spawn.py
+++ b/spawn.py
@@ -78,7 +78,7 @@ def _spawn_nt (cmd,
         # spawn for NT requires a full path to the .exe
         try:
             rc = os.spawnv(os.P_WAIT, executable, cmd)
-        except OSError, exc:
+        except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError, \
                   "command '%s' failed: %s" % (cmd[0], exc[-1])
@@ -103,7 +103,7 @@ def _spawn_os2 (cmd,
         # spawnv for OS/2 EMX requires a full path to the .exe
         try:
             rc = os.spawnv(os.P_WAIT, executable, cmd)
-        except OSError, exc:
+        except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError, \
                   "command '%s' failed: %s" % (cmd[0], exc[-1])
@@ -131,7 +131,7 @@ def _spawn_posix (cmd,
             #print "cmd[0] =", cmd[0]
             #print "cmd =", cmd
             exec_fn(cmd[0], cmd)
-        except OSError, e:
+        except OSError as e:
             sys.stderr.write("unable to execute %s: %s\n" %
                              (cmd[0], e.strerror))
             os._exit(1)
@@ -146,7 +146,7 @@ def _spawn_posix (cmd,
         while 1:
             try:
                 (pid, status) = os.waitpid(pid, 0)
-            except OSError, exc:
+            except OSError as exc:
                 import errno
                 if exc.errno == errno.EINTR:
                     continue
diff --git a/sysconfig.py b/sysconfig.py
index 8989d92b4e..9de7234683 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -344,7 +344,7 @@ def _init_posix():
     try:
         filename = get_makefile_filename()
         parse_makefile(filename, g)
-    except IOError, msg:
+    except IOError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
             my_msg = my_msg + " (%s)" % msg.strerror
@@ -355,7 +355,7 @@ def _init_posix():
     try:
         filename = get_config_h_filename()
         parse_config_h(open(filename), g)
-    except IOError, msg:
+    except IOError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
             my_msg = my_msg + " (%s)" % msg.strerror
diff --git a/unixccompiler.py b/unixccompiler.py
index 75e8a5316e..0795f1206d 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -162,7 +162,7 @@ def preprocess(self, source,
                 self.mkpath(os.path.dirname(output_file))
             try:
                 self.spawn(pp_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError, msg
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
@@ -172,7 +172,7 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         try:
             self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
-        except DistutilsExecError, msg:
+        except DistutilsExecError as msg:
             raise CompileError, msg
 
     def create_static_lib(self, objects, output_libname,
@@ -196,7 +196,7 @@ def create_static_lib(self, objects, output_libname,
             if self.ranlib:
                 try:
                     self.spawn(self.ranlib + [output_filename])
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise LibError, msg
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -250,7 +250,7 @@ def link(self, target_desc, objects,
                     linker = _darwin_compiler_fixup(linker, ld_args)
 
                 self.spawn(linker + ld_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LinkError, msg
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
diff --git a/util.py b/util.py
index 1bcda93fe0..16d8bcba4d 100644
--- a/util.py
+++ b/util.py
@@ -229,7 +229,7 @@ def _subst (match, local_vars=local_vars):
 
     try:
         return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
-    except KeyError, var:
+    except KeyError as var:
         raise ValueError, "invalid variable '$%s'" % var
 
 # subst_vars ()

From 4e0a58cc6113aa5ab73196de13b16d500ff46fe6 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 9 Feb 2007 05:37:30 +0000
Subject: [PATCH 1857/8469] Fix most trivially-findable print statements.

There's one major and one minor category still unfixed:
doctests are the major category (and I hope to be able to augment the
refactoring tool to refactor bona fide doctests soon);
other code generating print statements in strings is the minor category.

(Oh, and I don't know if the compiler package works.)
---
 bcppcompiler.py      |  2 +-
 ccompiler.py         |  2 +-
 cmd.py               |  8 ++++----
 command/bdist_rpm.py | 10 ++++-----
 command/config.py    |  4 ++--
 command/install.py   |  6 +++---
 command/register.py  | 30 +++++++++++++--------------
 command/upload.py    |  2 +-
 core.py              |  4 ++--
 dist.py              | 48 ++++++++++++++++++++++----------------------
 fancy_getopt.py      |  6 +++---
 filelist.py          |  2 +-
 log.py               |  4 ++--
 mwerkscompiler.py    |  4 ++--
 spawn.py             |  2 +-
 tests/test_dist.py   |  4 ++--
 text_file.py         | 12 +++++------
 17 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 6968cb8f6f..b6a3bf62ce 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -392,7 +392,7 @@ def preprocess (self,
             try:
                 self.spawn(pp_args)
             except DistutilsExecError as msg:
-                print msg
+                print(msg)
                 raise CompileError, msg
 
     # preprocess()
diff --git a/ccompiler.py b/ccompiler.py
index 0ed9a40a35..25d90c8a9a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1026,7 +1026,7 @@ def announce (self, msg, level=1):
     def debug_print (self, msg):
         from distutils.debug import DEBUG
         if DEBUG:
-            print msg
+            print(msg)
 
     def warn (self, msg):
         sys.stderr.write ("warning: %s\n" % msg)
diff --git a/cmd.py b/cmd.py
index 3cd5858920..be0a3e23f6 100644
--- a/cmd.py
+++ b/cmd.py
@@ -163,14 +163,14 @@ def dump_options (self, header=None, indent=""):
         from distutils.fancy_getopt import longopt_xlate
         if header is None:
             header = "command options for '%s':" % self.get_command_name()
-        print indent + header
+        print(indent + header)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
             option = string.translate(option, longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
-            print indent + "%s = %s" % (option, value)
+            print(indent + "%s = %s" % (option, value))
 
 
     def run (self):
@@ -199,7 +199,7 @@ def debug_print (self, msg):
         """
         from distutils.debug import DEBUG
         if DEBUG:
-            print msg
+            print(msg)
             sys.stdout.flush()
 
 
@@ -475,4 +475,4 @@ def get_outputs (self):
 
 
 if __name__ == "__main__":
-    print "ok"
+    print("ok")
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 6f0e0d881c..bbcf2927dc 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -267,11 +267,11 @@ def finalize_package_data (self):
     def run (self):
 
         if DEBUG:
-            print "before _get_package_data():"
-            print "vendor =", self.vendor
-            print "packager =", self.packager
-            print "doc_files =", self.doc_files
-            print "changelog =", self.changelog
+            print("before _get_package_data():")
+            print("vendor =", self.vendor)
+            print("packager =", self.packager)
+            print("doc_files =", self.doc_files)
+            print("changelog =", self.changelog)
 
         # make directories
         if self.spec_only:
diff --git a/command/config.py b/command/config.py
index 520c1b0c76..42465693be 100644
--- a/command/config.py
+++ b/command/config.py
@@ -359,9 +359,9 @@ def check_header (self, header, include_dirs=None,
 
 def dump_file (filename, head=None):
     if head is None:
-        print filename + ":"
+        print(filename + ":")
     else:
-        print head
+        print(head)
 
     file = open(filename)
     sys.stdout.write(file.read())
diff --git a/command/install.py b/command/install.py
index 453151d08b..fd5d6d1f39 100644
--- a/command/install.py
+++ b/command/install.py
@@ -292,7 +292,7 @@ def finalize_options (self):
 
         if DEBUG:
             from pprint import pprint
-            print "config vars:"
+            print("config vars:")
             pprint(self.config_vars)
 
         # Expand "~" and configuration variables in the installation
@@ -347,7 +347,7 @@ def finalize_options (self):
     def dump_dirs (self, msg):
         if DEBUG:
             from distutils.fancy_getopt import longopt_xlate
-            print msg + ":"
+            print(msg + ":")
             for opt in self.user_options:
                 opt_name = opt[0]
                 if opt_name[-1] == "=":
@@ -359,7 +359,7 @@ def dump_dirs (self, msg):
                 else:
                     opt_name = string.translate(opt_name, longopt_xlate)
                     val = getattr(self, opt_name)
-                print "  %s: %s" % (opt_name, val)
+                print("  %s: %s" % (opt_name, val))
 
 
     def finalize_unix (self):
diff --git a/command/register.py b/command/register.py
index cb9525ab0e..48070ee83b 100644
--- a/command/register.py
+++ b/command/register.py
@@ -86,14 +86,14 @@ def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
         response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
-        print response.read()
+        print(response.read())
 
     def verify_metadata(self):
         ''' Send the metadata to the package index server to be checked.
         '''
         # send the info to the server and report the result
         (code, result) = self.post_to_server(self.build_post_data('verify'))
-        print 'Server response (%s): %s'%(code, result)
+        print('Server response (%s): %s'%(code, result))
 
     def send_metadata(self):
         ''' Send the metadata to the package index server.
@@ -128,7 +128,7 @@ def send_metadata(self):
         if os.environ.has_key('HOME'):
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
-                print 'Using PyPI login from %s'%rc
+                print('Using PyPI login from %s'%rc)
                 config = ConfigParser.ConfigParser()
                 config.read(rc)
                 username = config.get('server-login', 'username')
@@ -138,17 +138,17 @@ def send_metadata(self):
         # get the user's login info
         choices = '1 2 3 4'.split()
         while choice not in choices:
-            print '''We need to know who you are, so please choose either:
+            print('''We need to know who you are, so please choose either:
  1. use your existing login,
  2. register as a new user,
  3. have the server generate a new password for you (and email it to you), or
  4. quit
-Your selection [default 1]: ''',
+Your selection [default 1]: ''', end=' ')
             choice = raw_input()
             if not choice:
                 choice = '1'
             elif choice not in choices:
-                print 'Please choose one of the four options!'
+                print('Please choose one of the four options!')
 
         if choice == '1':
             # get the username and password
@@ -165,13 +165,13 @@ def send_metadata(self):
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s'%(code, result)
+            print('Server response (%s): %s'%(code, result))
 
             # possibly save the login
             if os.environ.has_key('HOME') and config is None and code == 200:
                 rc = os.path.join(os.environ['HOME'], '.pypirc')
-                print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)'%rc
+                print('I can store your PyPI login so future submissions will be faster.')
+                print('(the login will be stored in %s)'%rc)
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
@@ -200,22 +200,22 @@ def send_metadata(self):
                 if data['password'] != data['confirm']:
                     data['password'] = ''
                     data['confirm'] = None
-                    print "Password and confirm don't match!"
+                    print("Password and confirm don't match!")
             while not data['email']:
                 data['email'] = raw_input('   EMail: ')
             code, result = self.post_to_server(data)
             if code != 200:
-                print 'Server response (%s): %s'%(code, result)
+                print('Server response (%s): %s'%(code, result))
             else:
-                print 'You will receive an email shortly.'
-                print 'Follow the instructions in it to complete registration.'
+                print('You will receive an email shortly.')
+                print('Follow the instructions in it to complete registration.')
         elif choice == '3':
             data = {':action': 'password_reset'}
             data['email'] = ''
             while not data['email']:
                 data['email'] = raw_input('Your email address: ')
             code, result = self.post_to_server(data)
-            print 'Server response (%s): %s'%(code, result)
+            print('Server response (%s): %s'%(code, result))
 
     def build_post_data(self, action):
         # figure the data to send - the metadata plus some additional
@@ -295,5 +295,5 @@ def post_to_server(self, data, auth=None):
                 data = result.read()
             result = 200, 'OK'
         if self.show_response:
-            print '-'*75, data, '-'*75
+            print('-'*75, data, '-'*75)
         return result
diff --git a/command/upload.py b/command/upload.py
index 7f96a475b6..438ae99a9c 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -196,4 +196,4 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
+            print('-'*75, r.read(), '-'*75)
diff --git a/core.py b/core.py
index 4dc8eb01aa..6242775c11 100644
--- a/core.py
+++ b/core.py
@@ -125,7 +125,7 @@ class found in 'cmdclass' is used in place of the default, which is
     dist.parse_config_files()
 
     if DEBUG:
-        print "options (after parsing config files):"
+        print("options (after parsing config files):")
         dist.dump_option_dicts()
 
     if _setup_stop_after == "config":
@@ -139,7 +139,7 @@ class found in 'cmdclass' is used in place of the default, which is
         raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
 
     if DEBUG:
-        print "options (after parsing command line):"
+        print("options (after parsing command line):")
         dist.dump_option_dicts()
 
     if _setup_stop_after == "commandline":
diff --git a/dist.py b/dist.py
index d21c5e2f1b..ca7a2f9952 100644
--- a/dist.py
+++ b/dist.py
@@ -290,22 +290,22 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
             commands.sort()
 
         if header is not None:
-            print indent + header
+            print(indent + header)
             indent = indent + "  "
 
         if not commands:
-            print indent + "no commands known yet"
+            print(indent + "no commands known yet")
             return
 
         for cmd_name in commands:
             opt_dict = self.command_options.get(cmd_name)
             if opt_dict is None:
-                print indent + "no option dict for '%s' command" % cmd_name
+                print(indent + "no option dict for '%s' command" % cmd_name)
             else:
-                print indent + "option dict for '%s' command:" % cmd_name
+                print(indent + "option dict for '%s' command:" % cmd_name)
                 out = pformat(opt_dict)
                 for line in string.split(out, "\n"):
-                    print indent + "  " + line
+                    print(indent + "  " + line)
 
     # dump_option_dicts ()
 
@@ -365,11 +365,11 @@ def parse_config_files (self, filenames=None):
         if filenames is None:
             filenames = self.find_config_files()
 
-        if DEBUG: print "Distribution.parse_config_files():"
+        if DEBUG: print("Distribution.parse_config_files():")
 
         parser = ConfigParser()
         for filename in filenames:
-            if DEBUG: print "  reading", filename
+            if DEBUG: print("  reading", filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
@@ -636,14 +636,14 @@ def _show_help (self,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            print
+            print()
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            print
+            print()
 
         for command in self.commands:
             if type(command) is ClassType and issubclass(command, Command):
@@ -657,9 +657,9 @@ def _show_help (self,
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            print
+            print()
 
-        print gen_usage(self.script_name)
+        print(gen_usage(self.script_name))
         return
 
     # _show_help ()
@@ -678,8 +678,8 @@ def handle_display_options (self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            print
-            print gen_usage(self.script_name)
+            print()
+            print(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -695,12 +695,12 @@ def handle_display_options (self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    print string.join(value, ',')
+                    print(string.join(value, ','))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    print string.join(value, '\n')
+                    print(string.join(value, '\n'))
                 else:
-                    print value
+                    print(value)
                 any_display_options = 1
 
         return any_display_options
@@ -712,7 +712,7 @@ def print_command_list (self, commands, header, max_length):
         'print_commands()'.
         """
 
-        print header + ":"
+        print(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -723,7 +723,7 @@ def print_command_list (self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            print "  %-*s  %s" % (max_length, cmd, description)
+            print("  %-*s  %s" % (max_length, cmd, description))
 
     # print_command_list ()
 
@@ -757,7 +757,7 @@ def print_commands (self):
                                 "Standard commands",
                                 max_length)
         if extra_commands:
-            print
+            print()
             self.print_command_list(extra_commands,
                                     "Extra commands",
                                     max_length)
@@ -862,8 +862,8 @@ def get_command_obj (self, command, create=1):
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
             if DEBUG:
-                print "Distribution.get_command_obj(): " \
-                      "creating '%s' command object" % command
+                print("Distribution.get_command_obj(): " \
+                      "creating '%s' command object" % command)
 
             klass = self.get_command_class(command)
             cmd_obj = self.command_obj[command] = klass(self)
@@ -893,9 +893,9 @@ def _set_command_options (self, command_obj, option_dict=None):
         if option_dict is None:
             option_dict = self.get_option_dict(command_name)
 
-        if DEBUG: print "  setting options for '%s' command:" % command_name
+        if DEBUG: print("  setting options for '%s' command:" % command_name)
         for (option, (source, value)) in option_dict.items():
-            if DEBUG: print "    %s = %s (from %s)" % (option, value, source)
+            if DEBUG: print("    %s = %s (from %s)" % (option, value, source))
             try:
                 bool_opts = map(translate_longopt, command_obj.boolean_options)
             except AttributeError:
@@ -1219,4 +1219,4 @@ def fix_help_options (options):
 
 if __name__ == "__main__":
     dist = Distribution()
-    print "ok"
+    print("ok")
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 62a24e8524..646f8e1ee6 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -497,6 +497,6 @@ def __init__ (self, options=[]):
 say, "How should I know?"].)"""
 
     for w in (10, 20, 30, 40):
-        print "width: %d" % w
-        print string.join(wrap_text(text, w), "\n")
-        print
+        print("width: %d" % w)
+        print(string.join(wrap_text(text, w), "\n"))
+        print()
diff --git a/filelist.py b/filelist.py
index 4bbdd1f00f..e4a83d6484 100644
--- a/filelist.py
+++ b/filelist.py
@@ -53,7 +53,7 @@ def debug_print (self, msg):
         """
         from distutils.debug import DEBUG
         if DEBUG:
-            print msg
+            print(msg)
 
     # -- List-like methods ---------------------------------------------
 
diff --git a/log.py b/log.py
index 95d4c1c5a2..e4959d6492 100644
--- a/log.py
+++ b/log.py
@@ -23,9 +23,9 @@ def _log(self, level, msg, args):
             if not args:
                 # msg may contain a '%'. If args is empty,
                 # don't even try to string-format
-                print msg
+                print(msg)
             else:
-                print msg % args
+                print(msg % args)
             sys.stdout.flush()
 
     def log(self, level, msg, *args):
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 0de123d9e9..9db1a39b17 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -160,9 +160,9 @@ def link (self,
         settings['libraries'] = libraries
         settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
         if self.dry_run:
-            print 'CALLING LINKER IN', os.getcwd()
+            print('CALLING LINKER IN', os.getcwd())
             for key, value in settings.items():
-                print '%20.20s %s'%(key, value)
+                print('%20.20s %s'%(key, value))
             return
         # Build the export file
         exportfilename = os.path.join(build_temp, exportname)
diff --git a/spawn.py b/spawn.py
index 6b07f52ebe..c75931c3ab 100644
--- a/spawn.py
+++ b/spawn.py
@@ -109,7 +109,7 @@ def _spawn_os2 (cmd,
                   "command '%s' failed: %s" % (cmd[0], exc[-1])
         if rc != 0:
             # and this reflects the command running but failing
-            print "command '%s' failed with exit status %d" % (cmd[0], rc)
+            print("command '%s' failed with exit status %d" % (cmd[0], rc))
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 4d2a7cdf1a..8d4b07037c 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -74,8 +74,8 @@ def test_command_packages_configfile(self):
         sys.argv.append("build")
         f = open(TESTFN, "w")
         try:
-            print >>f, "[global]"
-            print >>f, "command_packages = foo.bar, splat"
+            print("[global]", file=f)
+            print("command_packages = foo.bar, splat", file=f)
             f.close()
             d = self.create_distribution([TESTFN])
             self.assertEqual(d.get_command_packages(),
diff --git a/text_file.py b/text_file.py
index ff2878de1b..10ee1be783 100644
--- a/text_file.py
+++ b/text_file.py
@@ -342,13 +342,13 @@ def test_input (count, description, file, expected_result):
         result = file.readlines ()
         # result = string.join (result, '')
         if result == expected_result:
-            print "ok %d (%s)" % (count, description)
+            print("ok %d (%s)" % (count, description))
         else:
-            print "not ok %d (%s):" % (count, description)
-            print "** expected:"
-            print expected_result
-            print "** received:"
-            print result
+            print("not ok %d (%s):" % (count, description))
+            print("** expected:")
+            print(expected_result)
+            print("** received:")
+            print(result)
 
 
     filename = "test.txt"

From 16a4375780a8081b708a0236c31c22555e2969e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 9 Feb 2007 12:36:48 +0000
Subject: [PATCH 1858/8469] Bug #1600860: Search for shared python library in
 LIBDIR, not lib/python/config, on "linux" and "gnu" systems. Will backport.

---
 command/build_ext.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2413829369..542b77a7ad 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -185,9 +185,7 @@ def finalize_options (self):
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
-                sysconfig.get_config_var('Py_ENABLE_SHARED')):
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -197,6 +195,17 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
+        # for extensions under Linux with a shared Python library,
+        # Python's library directory must be appended to library_dirs
+        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
+                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            if string.find(sys.executable, sys.exec_prefix) != -1:
+                # building third party extensions
+                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+            else:
+                # building python standard extensions
+                self.library_dirs.append('.')
+
         # The argument parsing will result in self.define being a string, but
         # it has to be a list of 2-tuples.  All the preprocessor symbols
         # specified by the 'define' option will be set to '1'.  Multiple

From 0624f6d5917587a042fd6ba4c3642c7bafeddcb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 9 Feb 2007 12:37:12 +0000
Subject: [PATCH 1859/8469] Bug #1600860: Search for shared python library in
 LIBDIR, not lib/python/config, on "linux" and "gnu" systems.

---
 command/build_ext.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2413829369..542b77a7ad 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -185,9 +185,7 @@ def finalize_options (self):
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
-                sysconfig.get_config_var('Py_ENABLE_SHARED')):
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -197,6 +195,17 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
+        # for extensions under Linux with a shared Python library,
+        # Python's library directory must be appended to library_dirs
+        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
+                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            if string.find(sys.executable, sys.exec_prefix) != -1:
+                # building third party extensions
+                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+            else:
+                # building python standard extensions
+                self.library_dirs.append('.')
+
         # The argument parsing will result in self.define being a string, but
         # it has to be a list of 2-tuples.  All the preprocessor symbols
         # specified by the 'define' option will be set to '1'.  Multiple

From a8bf57767e4e8ba7c99e9a51f30861707124c642 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 9 Feb 2007 20:13:25 +0000
Subject: [PATCH 1860/8469] Fix a bunch of doctests with the -d option of
 refactor.py. We still have 27 failing tests (down from 39).

---
 versionpredicate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versionpredicate.py b/versionpredicate.py
index ba8b6c021b..434b34f184 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -40,7 +40,7 @@ class VersionPredicate:
     The str() of a `VersionPredicate` provides a normalized
     human-readable version of the expression::
 
-    >>> print v
+    >>> print(v)
     pyepat.abc (> 1.0, < 3333.3a1, != 1555.1b3)
 
     The `satisfied_by()` method can be used to determine with a given

From 0eaf9a8276f4587601ba9514243c1f06e4511cb8 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sun, 11 Feb 2007 06:12:03 +0000
Subject: [PATCH 1861/8469] - PEP 3106: dict.iterkeys(), .iteritems(),
 .itervalues() are now gone;   and .keys(), .items(), .values() return dict
 views.

The dict views aren't fully functional yet; in particular, they can't
be compared to sets yet.  but they are useful as "iterator wells".

There are still 27 failing unit tests; I expect that many of these
have fairly trivial fixes, but there are so many, I could use help.
---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9de7234683..220b03310c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -271,7 +271,7 @@ def parse_makefile(fn, g=None):
 
     # do variable interpolation here
     while notdone:
-        for name in notdone.keys():
+        for name in list(notdone):
             value = notdone[name]
             m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
             if m:

From a67f7d4700f890ac5822401b756dc0b20a6eb421 Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Fri, 23 Feb 2007 15:07:44 +0000
Subject: [PATCH 1862/8469] Merged revisions 53623-53858 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line

  We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
  r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines

  Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
  r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines

  1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
     Suggested solution by Christos Georgiou, Bug 791968.
  2. Clean up tests, were not failing when they should have been.
  4. Remove some camelcase and an unneeded try/except block.
........
  r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines

  Clean up ModifiedInterpreter.runcode() structure
........
  r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line

  Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
  r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines

  Patch #1652681: create nonexistent files in append mode and
  allow appending to empty files.
........
  r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines

  Updated patch (CodeContext.061217.patch) to
  [ 1362975 ] CodeContext - Improved text indentation
  Tal Einat 16Dec06
........
  r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines

  narrow exception per [ 1540849 ] except too broad
........
  r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines

  [ 1621265 ] Auto-completion list placement
  Move AC window below input line unless not enough space, then put it above.
  Patch: Tal Einat
........
  r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines

  Handle AttributeError during calltip lookup
........
  r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines

  SF #1615701:  make d.update(m) honor __getitem__() and keys() in dict subclasses
........
  r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line

  SF: 1397711 Set docs conflated immutable and hashable
........
  r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line

  Check for a common user error with defaultdict().
........
  r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line

  Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
  r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line

  Silence compiler warning
........
  r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line

  Do not let overflows in enumerate() and count() pass silently.
........
  r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line

  Bypass set specific optimizations for set and frozenset subclasses.
........
  r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line

  Fix docstring bug
........
  r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines

  Bug #1653736: Complain about keyword arguments to time.isoformat.
  Will backport to 2.5.
........
  r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines

  Corrected some bugs in AutoComplete.  Also, Page Up/Down in ACW implemented;
  mouse and cursor selection in ACWindow implemented; double Tab inserts current
  selection and closes ACW (similar to double-click and Return); scroll wheel now
  works in ACW.  Added AutoComplete instructions to IDLE Help.
........
  r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines

  Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
  Will backport.
........
  r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines

  Bug #1600860: Search for shared python library in LIBDIR, not
  lib/python/config, on "linux" and "gnu" systems.
  Will backport.
........
  r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines

  Update broken link. Will backport to 2.5.
........
  r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines

  Bug #1656078: typo in in profile docs.
........
  r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines

  Change a very minor inconsistency (that is purely cosmetic) in the AST
  definition.
........
  r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line

  fix trace.py --ignore-dir
........
  r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines

  Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
  r53731).
........
  r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines

  Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
  is specified at the top of the file.  Also add a note that Python/Python-ast.c
  needs to be committed separately after a change to the AST grammar to capture
  the revision number of the change (which is what __version__ is set to).
........
  r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines

  Bug #1656581: Point out that external file objects are supposed to be
  at position 0.
........
  r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines

  Patch 1463026: Support default namespace in XMLGenerator.
  Fixes #847665. Will backport.
........
  r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines

  Fix the line to what is my guess at the original author's meaning.
  (The line has no effect anyway, but is present because it's
  customary call the base class __init__).
........
  r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines

  Patch #685268: Consider a package's __path__ in imputil.
  Will backport.
........
  r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines

  Patch #698833: Support file decryption in zipfile.
........
  r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines

  Patch #1517891: Make 'a' create the file if it doesn't exist.
  Fixes #1514451.
........
  r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines

  Bug #1658794: Remove extraneous 'this'.
  Will backport to 2.5.
........
  r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines

  Patch #1657276: Make NETLINK_DNRTMSG conditional.
  Will backport.
........
  r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines

  Patch #1647484: Renamed GzipFile's filename attribute to name. The
  filename attribute is still accessible as a property that emits a
  DeprecationWarning.
........
  r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines

  Strip the '.gz' extension from the filename that is written to the
  gzip header.
........
  r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines

  Patch #1432399: Add HCI sockets.
........
  r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines

  Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
  r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines

  Ignore directory time stamps when considering
  whether to rerun libffi configure.
........
  r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines

  A missing binary mode in AppendTest caused failures in Windows
  Buildbot.
........
  r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines

  Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
  r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines

  Make functools.wraps() docs a bit clearer.
........
  r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines

  Patch #1494140: Add documentation for the new struct.Struct object.
........
  r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines

  Add missing \versionadded.
........
  r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines

  Update the encoding package's search function to use absolute imports when
  calling __import__.  This helps make the expected search locations for encoding
  modules be more explicit.

  One could use an explicit value for __path__ when making the call to __import__
  to force the exact location searched for encodings.  This would give the most
  strict search path possible if one is worried about malicious code being
  imported.  The unfortunate side-effect of that is that if __path__ was modified
  on 'encodings' on purpose in a safe way it would not be picked up in future
  __import__ calls.
........
  r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines

  Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
  r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line

  Minor fix for currentframe (SF #1652788).
........
  r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines

  Extend work on revision 52962:  Eliminate redundant calls to PyObject_Hash().
........
  r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line

  Add merge() function to heapq.
........
  r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line

  Add tie-breaker count to preserve sort stability.
........
  r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line

  Use C heapreplace() instead of slower _siftup() in pure python.
........
  r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line

  Add test for merge stability
........
  r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line

  Provide an example of defaultdict with non-zero constant factory function.
........
  r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines

  Moved misplaced news item.
........
  r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines

  Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
  functions on platforms where the underlying system calls are available.
........
  r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line

  Fixup docstrings for merge().
........
  r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line

  Fixup set/dict interoperability.
........
  r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line

  Add itertools.izip_longest().
........
  r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line

  Remove filler struct item and fix leak.
........
---
 command/build_ext.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index f79eee3b74..bbe514626d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -185,9 +185,7 @@ def finalize_options (self):
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
-               ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
-                sysconfig.get_config_var('Py_ENABLE_SHARED')):
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
             if string.find(sys.executable, sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -197,6 +195,17 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
+        # for extensions under Linux with a shared Python library,
+        # Python's library directory must be appended to library_dirs
+        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
+                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            if string.find(sys.executable, sys.exec_prefix) != -1:
+                # building third party extensions
+                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+            else:
+                # building python standard extensions
+                self.library_dirs.append('.')
+
         # The argument parsing will result in self.define being a string, but
         # it has to be a list of 2-tuples.  All the preprocessor symbols
         # specified by the 'define' option will be set to '1'.  Multiple

From 4b5b20c7db13586c89f2de8110f9b3af5a8e69be Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 13 Mar 2007 10:19:22 +0000
Subject: [PATCH 1863/8469] Patch #1569798: fix a bug in distutils when
 building Python from a directory within sys.exec_prefix.

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

diff --git a/command/build_ext.py b/command/build_ext.py
index 542b77a7ad..82474de823 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
                                                       "python" + get_python_version(),
@@ -199,7 +199,7 @@ def finalize_options (self):
         # Python's library directory must be appended to library_dirs
         if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
                 and sysconfig.get_config_var('Py_ENABLE_SHARED'):
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:

From e936d6d24f1cb257cb2a66a70c32c89f65306d0a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 13 Mar 2007 10:19:35 +0000
Subject: [PATCH 1864/8469] Patch #1569798: fix a bug in distutils when
 building Python from a directory within sys.exec_prefix.  (backport from rev.
 54331)

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

diff --git a/command/build_ext.py b/command/build_ext.py
index 542b77a7ad..82474de823 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
                                                       "python" + get_python_version(),
@@ -199,7 +199,7 @@ def finalize_options (self):
         # Python's library directory must be appended to library_dirs
         if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
                 and sysconfig.get_config_var('Py_ENABLE_SHARED'):
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:

From b0ac75c972effad4c578498808683e20da236ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Fri, 30 Mar 2007 15:01:42 +0000
Subject: [PATCH 1865/8469] Bump the patch level version of distutils since
 there were a few bug fixes since the 2.5.0 release.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 21d34c767b..86ad44fe3a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,4 +20,4 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.5.0"
+__version__ = "2.5.1"

From fcee36f5b542e0eee58aa86aaa14a447ae3c03c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Sat, 31 Mar 2007 21:02:43 +0000
Subject: [PATCH 1866/8469] Bump the patch level version of distutils since
 there were a few bug fixes since the 2.5.0 release.

Backport of r54615.
---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 21d34c767b..86ad44fe3a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,4 +20,4 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.5.0"
+__version__ = "2.5.1"

From e49345974375c27eddb6aa6a576e5b30688e3511 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 1 Apr 2007 18:24:22 +0000
Subject: [PATCH 1867/8469] SF #1685563, MSVCCompiler creates redundant and
 long PATH strings

If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated.  On Windows, this is a problem because the
path is limited to 4k.  There's no benefit in adding a path multiple
times, so prevent that from occuring.  We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.

Will backport.
---
 msvccompiler.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 0d72837ed3..29a9020956 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -187,6 +187,19 @@ def get_build_architecture():
     j = string.find(sys.version, ")", i)
     return sys.version[i+len(prefix):j]
 
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
 
 
 class MSVCCompiler (CCompiler) :
@@ -270,6 +283,7 @@ def initialize(self):
                 self.__paths.append(p)
         except KeyError:
             pass
+        self.__paths = normalize_and_reduce_paths(self.__paths)
         os.environ['path'] = string.join(self.__paths, ';')
 
         self.preprocess_options = None

From 1085c6753feacd1c88d97e59031217679ef25e6a Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 1 Apr 2007 18:29:47 +0000
Subject: [PATCH 1868/8469] Backport 54644: SF #1685563, MSVCCompiler creates
 redundant and long PATH strings

If MSVCCompiler.initialize() was called multiple times, the path
would get duplicated.  On Windows, this is a problem because the
path is limited to 4k.  There's no benefit in adding a path multiple
times, so prevent that from occuring.  We also normalize the path
before checking for duplicates so things like /a and /a/ won't both
be stored.
---
 msvccompiler.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/msvccompiler.py b/msvccompiler.py
index 0d72837ed3..29a9020956 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -187,6 +187,19 @@ def get_build_architecture():
     j = string.find(sys.version, ")", i)
     return sys.version[i+len(prefix):j]
 
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
 
 
 class MSVCCompiler (CCompiler) :
@@ -270,6 +283,7 @@ def initialize(self):
                 self.__paths.append(p)
         except KeyError:
             pass
+        self.__paths = normalize_and_reduce_paths(self.__paths)
         os.environ['path'] = string.join(self.__paths, ';')
 
         self.preprocess_options = None

From 57e9dc4a5d61c5572467c3fe69e816c357647a6f Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 17 Apr 2007 08:48:32 +0000
Subject: [PATCH 1869/8469] Remove functions in string module that are also
 string methods.  Also remove:  * all calls to functions in the string module
 (except maketrans)  * everything from stropmodule except for maketrans()
 which is still used

---
 cmd.py                   |  6 +++---
 command/bdist.py         |  2 +-
 command/bdist_msi.py     |  2 +-
 command/bdist_rpm.py     | 18 +++++++++---------
 command/bdist_wininst.py | 10 +++++-----
 command/build_clib.py    |  5 ++---
 command/build_ext.py     | 24 ++++++++++++------------
 command/build_py.py      | 14 +++++++-------
 command/config.py        | 10 +++++-----
 command/install.py       | 12 ++++++------
 command/install_lib.py   |  2 +-
 command/register.py      |  4 ++--
 command/sdist.py         |  6 +++---
 cygwinccompiler.py       |  5 ++---
 dist.py                  | 24 ++++++++++++------------
 emxccompiler.py          |  5 ++---
 extension.py             |  6 +++---
 fancy_getopt.py          | 14 +++++++-------
 filelist.py              | 16 ++++++++--------
 msvccompiler.py          | 22 +++++++++++-----------
 mwerkscompiler.py        |  6 +++---
 spawn.py                 | 12 ++++++------
 sysconfig.py             |  7 +++----
 text_file.py             | 22 +++++++++++-----------
 util.py                  | 26 ++++++++++++--------------
 version.py               | 17 ++++++++---------
 26 files changed, 145 insertions(+), 152 deletions(-)

diff --git a/cmd.py b/cmd.py
index be0a3e23f6..ebd99310ea 100644
--- a/cmd.py
+++ b/cmd.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from types import *
 from distutils.errors import *
 from distutils import util, dir_util, file_util, archive_util, dep_util
@@ -166,7 +166,7 @@ def dump_options (self, header=None, indent=""):
         print(indent + header)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = string.translate(option, longopt_xlate)
+            option = option.translate(longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
@@ -415,7 +415,7 @@ def make_file (self, infiles, outfile, func, args,
         """
         if exec_msg is None:
             exec_msg = "generating %s from %s" % \
-                       (outfile, string.join(infiles, ', '))
+                       (outfile, ', '.join(infiles))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
 
diff --git a/command/bdist.py b/command/bdist.py
index 23c25a55a8..d6897d2d09 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 from distutils.core import Command
 from distutils.errors import *
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 75db8773f1..f31bdedac6 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -7,7 +7,7 @@
 Implements the bdist_msi command.
 """
 
-import sys, os, string
+import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index bbcf2927dc..ef2bdfd808 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 import glob
 from types import *
 from distutils.core import Command
@@ -354,7 +354,7 @@ def run (self):
             line = out.readline()
             if not line:
                 break
-            l = string.split(string.strip(line))
+            l = line.strip().split()
             assert(len(l) == 2)
             binary_rpms.append(l[1])
             # The source rpm is named after the first entry in the spec file
@@ -437,9 +437,9 @@ def _make_spec_file(self):
                       'Conflicts',
                       'Obsoletes',
                       ):
-            val = getattr(self, string.lower(field))
+            val = getattr(self, field.lower())
             if type(val) is ListType:
-                spec_file.append('%s: %s' % (field, string.join(val)))
+                spec_file.append('%s: %s' % (field, ' '.join(val)))
             elif val is not None:
                 spec_file.append('%s: %s' % (field, val))
 
@@ -452,7 +452,7 @@ def _make_spec_file(self):
 
         if self.build_requires:
             spec_file.append('BuildRequires: ' +
-                             string.join(self.build_requires))
+                             ' '.join(self.build_requires))
 
         if self.icon:
             spec_file.append('Icon: ' + os.path.basename(self.icon))
@@ -513,7 +513,7 @@ def _make_spec_file(self):
                     '',
                     '%' + rpm_opt,])
                 if val:
-                    spec_file.extend(string.split(open(val, 'r').read(), '\n'))
+                    spec_file.extend(open(val, 'r').read().split('\n'))
                 else:
                     spec_file.append(default)
 
@@ -526,7 +526,7 @@ def _make_spec_file(self):
             ])
 
         if self.doc_files:
-            spec_file.append('%doc ' + string.join(self.doc_files))
+            spec_file.append('%doc ' + ' '.join(self.doc_files))
 
         if self.changelog:
             spec_file.extend([
@@ -544,8 +544,8 @@ def _format_changelog(self, changelog):
         if not changelog:
             return changelog
         new_changelog = []
-        for line in string.split(string.strip(changelog), '\n'):
-            line = string.strip(line)
+        for line in changelog.strip().split('\n'):
+            line = line.strip()
             if line[0] == '*':
                 new_changelog.extend(['', line])
             elif line[0] == '-':
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 49afca0472..21465a82ff 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -135,7 +135,7 @@ def run (self):
         # Use a custom scheme for the zip-file, because we have to decide
         # at installation time which scheme to use.
         for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
-            value = string.upper(key)
+            value = key.upper()
             if key == 'headers':
                 value = value + '/Include/$dist_name'
             setattr(install,
@@ -192,14 +192,14 @@ def get_inidata (self):
 
         # Escape newline characters
         def escape(s):
-            return string.replace(s, "\n", "\\n")
+            return s.replace("\n", "\\n")
 
         for name in ["author", "author_email", "description", "maintainer",
                      "maintainer_email", "name", "url", "version"]:
             data = getattr(metadata, name, "")
             if data:
                 info = info + ("\n    %s: %s" % \
-                               (string.capitalize(name), escape(data)))
+                               (name.capitalize(), escape(data)))
                 lines.append("%s=%s" % (name, escape(data)))
 
         # The [setup] section contains entries controlling
@@ -220,7 +220,7 @@ def escape(s):
         build_info = "Built %s with distutils-%s" % \
                      (time.ctime(time.time()), distutils.__version__)
         lines.append("build_info=%s" % build_info)
-        return string.join(lines, "\n")
+        return "\n".join(lines)
 
     # get_inidata()
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 69d8c75166..07f5817986 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -18,7 +18,7 @@
 # two modules, mainly because a number of subtle details changed in the
 # cut 'n paste.  Sigh.
 
-import os, string
+import os
 from types import *
 from distutils.core import Command
 from distutils.errors import *
@@ -93,8 +93,7 @@ def finalize_options (self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs,
-                                             os.pathsep)
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
diff --git a/command/build_ext.py b/command/build_ext.py
index bbe514626d..d0cd16293b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from types import *
 from distutils.core import Command
 from distutils.errors import *
@@ -138,7 +138,7 @@ def finalize_options (self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
@@ -156,12 +156,12 @@ def finalize_options (self):
         if self.library_dirs is None:
             self.library_dirs = []
         elif type(self.library_dirs) is StringType:
-            self.library_dirs = string.split(self.library_dirs, os.pathsep)
+            self.library_dirs = self.library_dirs.split(os.pathsep)
 
         if self.rpath is None:
             self.rpath = []
         elif type(self.rpath) is StringType:
-            self.rpath = string.split(self.rpath, os.pathsep)
+            self.rpath = self.rpath.split(os.pathsep)
 
         # for extensions under windows use different directories
         # for Release and Debug builds.
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.find(sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
                                                       "python" + get_python_version(),
@@ -199,7 +199,7 @@ def finalize_options (self):
         # Python's library directory must be appended to library_dirs
         if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
                 and sysconfig.get_config_var('Py_ENABLE_SHARED'):
-            if string.find(sys.executable, sys.exec_prefix) != -1:
+            if sys.executable.find(sys.exec_prefix) != -1:
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:
@@ -212,14 +212,14 @@ def finalize_options (self):
         # symbols can be separated with commas.
 
         if self.define:
-            defines = string.split(self.define, ',')
+            defines = self.define.split(',')
             self.define = map(lambda symbol: (symbol, '1'), defines)
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
         # be separated with commas here.
         if self.undef:
-            self.undef = string.split(self.undef, ',')
+            self.undef = self.undef.split(',')
 
         if self.swig_opts is None:
             self.swig_opts = []
@@ -429,8 +429,8 @@ def build_extension(self, ext):
             # ignore build-lib -- put the compiled extension into
             # the source tree along with pure Python modules
 
-            modpath = string.split(fullname, '.')
-            package = string.join(modpath[0:-1], '.')
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[0:-1])
             base = modpath[-1]
 
             build_py = self.get_finalized_command('build_py')
@@ -617,7 +617,7 @@ def get_ext_filename (self, ext_name):
         """
 
         from distutils.sysconfig import get_config_var
-        ext_path = string.split(ext_name, '.')
+        ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
@@ -634,7 +634,7 @@ def get_export_symbols (self, ext):
         the .pyd file (DLL) must export the module "init" function.
         """
 
-        initfunc_name = "init" + string.split(ext.name,'.')[-1]
+        initfunc_name = "init" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/command/build_py.py b/command/build_py.py
index 3b7ec62c59..990824bdff 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, string, os
+import sys, os
 from types import *
 from glob import glob
 
@@ -150,7 +150,7 @@ def get_package_dir (self, package):
            distribution, where package 'package' should be found
            (at least according to the 'package_dir' option, if any)."""
 
-        path = string.split(package, '.')
+        path = package.split('.')
 
         if not self.package_dir:
             if path:
@@ -161,7 +161,7 @@ def get_package_dir (self, package):
             tail = []
             while path:
                 try:
-                    pdir = self.package_dir[string.join(path, '.')]
+                    pdir = self.package_dir['.'.join(path)]
                 except KeyError:
                     tail.insert(0, path[-1])
                     del path[-1]
@@ -272,8 +272,8 @@ def find_modules (self):
         #   - don't check for __init__.py in directory for empty package
 
         for module in self.py_modules:
-            path = string.split(module, '.')
-            package = string.join(path[0:-1], '.')
+            path = module.split('.')
+            package = '.'.join(path[0:-1])
             module_base = path[-1]
 
             try:
@@ -342,7 +342,7 @@ def get_outputs (self, include_bytecode=1):
         modules = self.find_all_modules()
         outputs = []
         for (package, module, module_file) in modules:
-            package = string.split(package, '.')
+            package = package.split('.')
             filename = self.get_module_outfile(self.build_lib, package, module)
             outputs.append(filename)
             if include_bytecode:
@@ -362,7 +362,7 @@ def get_outputs (self, include_bytecode=1):
 
     def build_module (self, module, module_file, package):
         if type(package) is StringType:
-            package = string.split(package, '.')
+            package = package.split('.')
         elif type(package) not in (ListType, TupleType):
             raise TypeError, \
                   "'package' must be a string (dot-separated), list, or tuple"
diff --git a/command/config.py b/command/config.py
index 42465693be..3374db9e66 100644
--- a/command/config.py
+++ b/command/config.py
@@ -13,7 +13,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
@@ -74,7 +74,7 @@ def finalize_options (self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         elif type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         if self.libraries is None:
             self.libraries = []
@@ -84,7 +84,7 @@ def finalize_options (self):
         if self.library_dirs is None:
             self.library_dirs = []
         elif type(self.library_dirs) is StringType:
-            self.library_dirs = string.split(self.library_dirs, os.pathsep)
+            self.library_dirs = self.library_dirs.split(os.pathsep)
 
 
     def run (self):
@@ -163,7 +163,7 @@ def _clean (self, *filenames):
         if not filenames:
             filenames = self.temp_files
             self.temp_files = []
-        log.info("removing: %s", string.join(filenames))
+        log.info("removing: %s", ' '.join(filenames))
         for filename in filenames:
             try:
                 os.remove(filename)
@@ -322,7 +322,7 @@ def check_func (self, func,
         else:
             body.append("  %s;" % func)
         body.append("}")
-        body = string.join(body, "\n") + "\n"
+        body = "\n".join(body) + "\n"
 
         return self.try_link(body, headers, include_dirs,
                              libraries, library_dirs)
diff --git a/command/install.py b/command/install.py
index fd5d6d1f39..c03a90e82c 100644
--- a/command/install.py
+++ b/command/install.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG
@@ -269,7 +269,7 @@ def finalize_options (self):
         # $platbase in the other installation directories and not worry
         # about needing recursive variable expansion (shudder).
 
-        py_version = (string.split(sys.version))[0]
+        py_version = sys.version.split()[0]
         (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
@@ -353,11 +353,11 @@ def dump_dirs (self, msg):
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
                 if self.negative_opt.has_key(opt_name):
-                    opt_name = string.translate(self.negative_opt[opt_name],
-                                                longopt_xlate)
+                    opt_name = self.negative_opt[opt_name].translate(
+                                                               longopt_xlate)
                     val = not getattr(self, opt_name)
                 else:
-                    opt_name = string.translate(opt_name, longopt_xlate)
+                    opt_name = opt_name.translate(longopt_xlate)
                     val = getattr(self, opt_name)
                 print("  %s: %s" % (opt_name, val))
 
@@ -464,7 +464,7 @@ def handle_extra_path (self):
 
         if self.extra_path is not None:
             if type(self.extra_path) is StringType:
-                self.extra_path = string.split(self.extra_path, ',')
+                self.extra_path = self.extra_path.split(',')
 
             if len(self.extra_path) == 1:
                 path_file = extra_dirs = self.extra_path[0]
diff --git a/command/install_lib.py b/command/install_lib.py
index 08ff543449..65d25f7af2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -2,7 +2,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
diff --git a/command/register.py b/command/register.py
index 48070ee83b..33567981bb 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, urllib2, getpass, urlparse
+import sys, os, urllib2, getpass, urlparse
 import StringIO, ConfigParser
 
 from distutils.core import Command
@@ -67,7 +67,7 @@ def check_metadata(self):
 
         if missing:
             self.warn("missing required meta-data: " +
-                      string.join(missing, ", "))
+                      ", ".join(missing))
 
         if metadata.author:
             if not metadata.author_email:
diff --git a/command/sdist.py b/command/sdist.py
index eb2db505dd..8e1c066023 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from types import *
 from glob import glob
 from distutils.core import Command
@@ -166,7 +166,7 @@ def check_metadata (self):
 
         if missing:
             self.warn("missing required meta-data: " +
-                      string.join(missing, ", "))
+                      ", ".join(missing))
 
         if metadata.author:
             if not metadata.author_email:
@@ -279,7 +279,7 @@ def add_defaults (self):
 
                 if not got_it:
                     self.warn("standard file not found: should have one of " +
-                              string.join(alts, ', '))
+                              ', '.join(alts))
             else:
                 if os.path.exists(fn):
                     self.filelist.append(fn)
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 44b5850834..fae6848165 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -365,10 +365,9 @@ def check_config_h():
     # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string
     # if sys.version contains GCC then python was compiled with
     # GCC, and the pyconfig.h file should be OK
-    if string.find(sys.version,"GCC") >= 0:
+    if sys.version.find("GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
 
     fn = sysconfig.get_config_h_filename()
@@ -387,7 +386,7 @@ def check_config_h():
 
     else:
         # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
-        if string.find(s,"__GNUC__") >= 0:
+        if s.find("__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
             return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
diff --git a/dist.py b/dist.py
index ca7a2f9952..7ed1b5cf2c 100644
--- a/dist.py
+++ b/dist.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from types import *
 from copy import copy
 
@@ -304,7 +304,7 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
             else:
                 print(indent + "option dict for '%s' command:" % cmd_name)
                 out = pformat(opt_dict)
-                for line in string.split(out, "\n"):
+                for line in out.split("\n"):
                     print(indent + "  " + line)
 
     # dump_option_dicts ()
@@ -378,7 +378,7 @@ def parse_config_files (self, filenames=None):
                 for opt in options:
                     if opt != '__name__':
                         val = parser.get(section,opt)
-                        opt = string.replace(opt, '-', '_')
+                        opt = opt.replace('-', '_')
                         opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -599,14 +599,14 @@ def finalize_options (self):
         keywords = self.metadata.keywords
         if keywords is not None:
             if type(keywords) is StringType:
-                keywordlist = string.split(keywords, ',')
-                self.metadata.keywords = map(string.strip, keywordlist)
+                keywordlist = keywords.split(',')
+                self.metadata.keywords = [x.strip() for x in keywordlist]
 
         platforms = self.metadata.platforms
         if platforms is not None:
             if type(platforms) is StringType:
-                platformlist = string.split(platforms, ',')
-                self.metadata.platforms = map(string.strip, platformlist)
+                platformlist = platforms.split(',')
+                self.metadata.platforms = [x.strip() for x in platformlist]
 
     def _show_help (self,
                     parser,
@@ -695,10 +695,10 @@ def handle_display_options (self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    print(string.join(value, ','))
+                    print(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    print(string.join(value, '\n'))
+                    print('\n'.join(value))
                 else:
                     print(value)
                 any_display_options = 1
@@ -803,9 +803,9 @@ def get_command_packages (self):
         """Return a list of packages from which commands are loaded."""
         pkgs = self.command_packages
         if not isinstance(pkgs, type([])):
-            pkgs = string.split(pkgs or "", ",")
+            pkgs = (pkgs or "").split(",")
             for i in range(len(pkgs)):
-                pkgs[i] = string.strip(pkgs[i])
+                pkgs[i] = pkgs[i].strip()
             pkgs = filter(None, pkgs)
             if "distutils.command" not in pkgs:
                 pkgs.insert(0, "distutils.command")
@@ -1100,7 +1100,7 @@ def write_pkg_file (self, file):
         long_desc = rfc822_escape( self.get_long_description() )
         file.write('Description: %s\n' % long_desc)
 
-        keywords = string.join( self.get_keywords(), ',')
+        keywords = ','.join(self.get_keywords())
         if keywords:
             file.write('Keywords: %s\n' % keywords )
 
diff --git a/emxccompiler.py b/emxccompiler.py
index 8aef2b7a9d..f4b90dcd00 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -261,10 +261,9 @@ def check_config_h():
     # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string
     # if sys.version contains GCC then python was compiled with
     # GCC, and the pyconfig.h file should be OK
-    if string.find(sys.version,"GCC") >= 0:
+    if sys.version.find("GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
 
     fn = sysconfig.get_config_h_filename()
@@ -283,7 +282,7 @@ def check_config_h():
 
     else:
         # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
-        if string.find(s,"__GNUC__") >= 0:
+        if s.find("__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
             return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
diff --git a/extension.py b/extension.py
index 440d128cdc..0fcbcc141a 100644
--- a/extension.py
+++ b/extension.py
@@ -5,7 +5,7 @@
 
 __revision__ = "$Id$"
 
-import os, string, sys
+import os, sys
 from types import *
 
 try:
@@ -128,7 +128,7 @@ def __init__ (self, name, sources,
         if len(kw):
             L = kw.keys() ; L.sort()
             L = map(repr, L)
-            msg = "Unknown Extension options: " + string.join(L, ', ')
+            msg = "Unknown Extension options: " + ', '.join(L)
             if warnings is not None:
                 warnings.warn(msg)
             else:
@@ -195,7 +195,7 @@ def read_setup_file (filename):
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = string.find(value, "=")
+                equals = value.find("=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 646f8e1ee6..317a3a4860 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -115,7 +115,7 @@ def get_attr_name (self, long_option):
         """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
-        return string.translate(long_option, longopt_xlate)
+        return long_option.translate(longopt_xlate)
 
 
     def _check_alias_dict (self, aliases, what):
@@ -253,7 +253,7 @@ def getopt (self, args=None, object=None):
 
         self._grok_option_table()
 
-        short_opts = string.join(self.short_opts)
+        short_opts = ' '.join(self.short_opts)
         try:
             opts, args = getopt.getopt(args, short_opts, self.long_opts)
         except getopt.error as msg:
@@ -420,8 +420,8 @@ def wrap_text (text, width):
     if len(text) <= width:
         return [text]
 
-    text = string.expandtabs(text)
-    text = string.translate(text, WS_TRANS)
+    text = text.expandtabs()
+    text = text.translate(WS_TRANS)
     chunks = re.split(r'( +|-+)', text)
     chunks = filter(None, chunks)      # ' - ' results in empty strings
     lines = []
@@ -460,7 +460,7 @@ def wrap_text (text, width):
 
         # and store this line in the list-of-all-lines -- as a single
         # string, of course!
-        lines.append(string.join(cur_line, ''))
+        lines.append(''.join(cur_line))
 
     # while chunks
 
@@ -473,7 +473,7 @@ def translate_longopt (opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
-    return string.translate(opt, longopt_xlate)
+    return opt.translate(longopt_xlate)
 
 
 class OptionDummy:
@@ -498,5 +498,5 @@ def __init__ (self, options=[]):
 
     for w in (10, 20, 30, 40):
         print("width: %d" % w)
-        print(string.join(wrap_text(text, w), "\n"))
+        print("\n".join(wrap_text(text, w)))
         print()
diff --git a/filelist.py b/filelist.py
index e4a83d6484..bc668cfad3 100644
--- a/filelist.py
+++ b/filelist.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import os, string, re
+import os, re
 import fnmatch
 from types import *
 from glob import glob
@@ -84,7 +84,7 @@ def remove_duplicates (self):
     # -- "File template" methods ---------------------------------------
 
     def _parse_template_line (self, line):
-        words = string.split(line)
+        words = line.split()
         action = words[0]
 
         patterns = dir = dir_pattern = None
@@ -133,28 +133,28 @@ def process_template_line (self, line):
         # right number of words on the line for that action -- so we
         # can proceed with minimal error-checking.
         if action == 'include':
-            self.debug_print("include " + string.join(patterns))
+            self.debug_print("include " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=1):
                     log.warn("warning: no files found matching '%s'",
                              pattern)
 
         elif action == 'exclude':
-            self.debug_print("exclude " + string.join(patterns))
+            self.debug_print("exclude " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=1):
                     log.warn(("warning: no previously-included files "
                               "found matching '%s'"), pattern)
 
         elif action == 'global-include':
-            self.debug_print("global-include " + string.join(patterns))
+            self.debug_print("global-include " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=0):
                     log.warn(("warning: no files found matching '%s' " +
                               "anywhere in distribution"), pattern)
 
         elif action == 'global-exclude':
-            self.debug_print("global-exclude " + string.join(patterns))
+            self.debug_print("global-exclude " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=0):
                     log.warn(("warning: no previously-included files matching "
@@ -163,7 +163,7 @@ def process_template_line (self, line):
 
         elif action == 'recursive-include':
             self.debug_print("recursive-include %s %s" %
-                             (dir, string.join(patterns)))
+                             (dir, ' '.join(patterns)))
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
                     log.warn(("warning: no files found matching '%s' " +
@@ -172,7 +172,7 @@ def process_template_line (self, line):
 
         elif action == 'recursive-exclude':
             self.debug_print("recursive-exclude %s %s" %
-                             (dir, string.join(patterns)))
+                             (dir, ' '.join(patterns)))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, prefix=dir):
                     log.warn(("warning: no previously-included files matching "
diff --git a/msvccompiler.py b/msvccompiler.py
index 968a4ffd46..ca1feaa088 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -12,7 +12,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
@@ -148,7 +148,7 @@ def load_macros(self, version):
 
     def sub(self, s):
         for k, v in self.macros.items():
-            s = string.replace(s, k, v)
+            s = s.replace(k, v)
         return s
 
 def get_build_version():
@@ -159,7 +159,7 @@ def get_build_version():
     """
 
     prefix = "MSC v."
-    i = string.find(sys.version, prefix)
+    i = sys.version.find(prefix)
     if i == -1:
         return 6
     i = i + len(prefix)
@@ -181,10 +181,10 @@ def get_build_architecture():
     """
 
     prefix = " bit ("
-    i = string.find(sys.version, prefix)
+    i = sys.version.find(prefix)
     if i == -1:
         return "Intel"
-    j = string.find(sys.version, ")", i)
+    j = sys.version.find(")", i)
     return sys.version[i+len(prefix):j]
 
 
@@ -266,11 +266,11 @@ def initialize(self):
 
         # extend the MSVC path with the current path
         try:
-            for p in string.split(os.environ['path'], ';'):
+            for p in os.environ['path'].split(';'):
                 self.__paths.append(p)
         except KeyError:
             pass
-        os.environ['path'] = string.join(self.__paths, ';')
+        os.environ['path'] = ';'.join(self.__paths)
 
         self.preprocess_options = None
         if self.__arch == "Intel":
@@ -579,7 +579,7 @@ def find_exe(self, exe):
                 return fn
 
         # didn't find it; try existing path
-        for p in string.split(os.environ['Path'],';'):
+        for p in os.environ['Path'].split(';'):
             fn = os.path.join(os.path.abspath(p),exe)
             if os.path.isfile(fn):
                 return fn
@@ -608,9 +608,9 @@ def get_msvc_paths(self, path, platform='x86'):
             d = read_values(base, key)
             if d:
                 if self.__version >= 7:
-                    return string.split(self.__macros.sub(d[path]), ";")
+                    return self.__macros.sub(d[path]).split(";")
                 else:
-                    return string.split(d[path], ";")
+                    return d[path].split(";")
         # MSVC 6 seems to create the registry entries we need only when
         # the GUI is run.
         if self.__version == 6:
@@ -635,4 +635,4 @@ def set_path_env_var(self, name):
         else:
             p = self.get_msvc_paths(name)
         if p:
-            os.environ[name] = string.join(p, ';')
+            os.environ[name] = ';'.join(p)
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 9db1a39b17..028ea8250d 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -8,7 +8,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from types import *
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
@@ -213,11 +213,11 @@ def _filename_to_abs(self, filename):
             curdir = os.getcwd()
             filename = os.path.join(curdir, filename)
         # Finally remove .. components
-        components = string.split(filename, ':')
+        components = filename.split(':')
         for i in range(1, len(components)):
             if components[i] == '..':
                 components[i] = ''
-        return string.join(components, ':')
+        return ':'.join(components)
 
     def library_dir_option (self, dir):
         """Return the compiler option to add 'dir' to the list of
diff --git a/spawn.py b/spawn.py
index c75931c3ab..c70c10bf7c 100644
--- a/spawn.py
+++ b/spawn.py
@@ -10,7 +10,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys, os
 from distutils.errors import *
 from distutils import log
 
@@ -59,7 +59,7 @@ def _nt_quote_args (args):
     # quoting?)
 
     for i in range(len(args)):
-        if string.find(args[i], ' ') != -1:
+        if args[i].find(' ') != -1:
             args[i] = '"%s"' % args[i]
     return args
 
@@ -73,7 +73,7 @@ def _spawn_nt (cmd,
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
-    log.info(string.join([executable] + cmd[1:], ' '))
+    log.info(' '.join([executable] + cmd[1:]))
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:
@@ -98,7 +98,7 @@ def _spawn_os2 (cmd,
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
-    log.info(string.join([executable] + cmd[1:], ' '))
+    log.info(' '.join([executable] + cmd[1:]))
     if not dry_run:
         # spawnv for OS/2 EMX requires a full path to the .exe
         try:
@@ -119,7 +119,7 @@ def _spawn_posix (cmd,
                   verbose=0,
                   dry_run=0):
 
-    log.info(string.join(cmd, ' '))
+    log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
@@ -184,7 +184,7 @@ def find_executable(executable, path=None):
     """
     if path is None:
         path = os.environ['PATH']
-    paths = string.split(path, os.pathsep)
+    paths = path.split(os.pathsep)
     (base, ext) = os.path.splitext(executable)
     if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
         executable = executable + '.exe'
diff --git a/sysconfig.py b/sysconfig.py
index 220b03310c..ea2e059778 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -13,7 +13,6 @@
 
 import os
 import re
-import string
 import sys
 
 from .errors import DistutilsPlatformError
@@ -261,7 +260,7 @@ def parse_makefile(fn, g=None):
         m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            v = string.strip(v)
+            v = v.strip()
             if "$" in v:
                 notdone[n] = v
             else:
@@ -295,7 +294,7 @@ def parse_makefile(fn, g=None):
                     else:
                         try: value = int(value)
                         except ValueError:
-                            done[name] = string.strip(value)
+                            done[name] = value.strip()
                         else:
                             done[name] = value
                         del notdone[name]
@@ -399,7 +398,7 @@ def _init_posix():
             # relative to the srcdir, which after installation no longer makes
             # sense.
             python_lib = get_python_lib(standard_lib=1)
-            linkerscript_path = string.split(g['LDSHARED'])[0]
+            linkerscript_path = g['LDSHARED'].split()[0]
             linkerscript_name = os.path.basename(linkerscript_path)
             linkerscript = os.path.join(python_lib, 'config',
                                         linkerscript_name)
diff --git a/text_file.py b/text_file.py
index 10ee1be783..c23a31dd9c 100644
--- a/text_file.py
+++ b/text_file.py
@@ -7,7 +7,7 @@
 __revision__ = "$Id$"
 
 from types import *
-import sys, os, string
+import sys, os
 
 
 class TextFile:
@@ -142,7 +142,7 @@ def gen_error (self, msg, line=None):
         else:
             outmsg.append("line %d: " % line)
         outmsg.append(str(msg))
-        return string.join(outmsg, "")
+        return "".join(outmsg)
 
 
     def error (self, msg, line=None):
@@ -196,7 +196,7 @@ def readline (self):
                 # unescape it (and any other escaped "#"'s that might be
                 # lurking in there) and otherwise leave the line alone.
 
-                pos = string.find (line, "#")
+                pos = line.find ("#")
                 if pos == -1:           # no "#" -- no comments
                     pass
 
@@ -219,11 +219,11 @@ def readline (self):
                     #   # comment that should be ignored
                     #   there
                     # result in "hello there".
-                    if string.strip(line) == "":
+                    if line.strip () == "":
                         continue
 
                 else:                   # it's an escaped "#"
-                    line = string.replace (line, "\\#", "#")
+                    line = line.replace("\\#", "#")
 
 
             # did previous line end with a backslash? then accumulate
@@ -235,7 +235,7 @@ def readline (self):
                     return buildup_line
 
                 if self.collapse_join:
-                    line = string.lstrip (line)
+                    line = line.lstrip ()
                 line = buildup_line + line
 
                 # careful: pay attention to line number when incrementing it
@@ -259,11 +259,11 @@ def readline (self):
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
             if self.lstrip_ws and self.rstrip_ws:
-                line = string.strip (line)
+                line = line.strip ()
             elif self.lstrip_ws:
-                line = string.lstrip (line)
+                line = line.lstrip ()
             elif self.rstrip_ws:
-                line = string.rstrip (line)
+                line = line.rstrip ()
 
             # blank line (whether we rstrip'ed or not)? skip to next line
             # if appropriate
@@ -313,7 +313,7 @@ def unreadline (self, line):
   continues on next line
 """
     # result 1: no fancy options
-    result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
+    result1 = map (lambda x: x + "\n", test_data.split ("\n")[0:-1])
 
     # result 2: just strip comments
     result2 = ["\n",
@@ -340,7 +340,7 @@ def unreadline (self, line):
 
     def test_input (count, description, file, expected_result):
         result = file.readlines ()
-        # result = string.join (result, '')
+        # result = ''.join (result)
         if result == expected_result:
             print("ok %d (%s)" % (count, description))
         else:
diff --git a/util.py b/util.py
index 16d8bcba4d..6f15ce8b5e 100644
--- a/util.py
+++ b/util.py
@@ -42,10 +42,9 @@ def get_platform ():
 
     # Convert the OS name to lowercase, remove '/' characters
     # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
-    osname = string.lower(osname)
-    osname = string.replace(osname, '/', '')
-    machine = string.replace(machine, ' ', '_')
-    machine = string.replace(machine, '/', '-')
+    osname = osname.lower().replace('/', '')
+    machine = machine.replace(' ', '_')
+    machine = machine.replace('/', '-')
 
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --
@@ -139,7 +138,7 @@ def convert_path (pathname):
     if pathname[-1] == '/':
         raise ValueError, "path '%s' cannot end with '/'" % pathname
 
-    paths = string.split(pathname, '/')
+    paths = pathname.split('/')
     while '.' in paths:
         paths.remove('.')
     if not paths:
@@ -178,7 +177,7 @@ def change_root (new_root, pathname):
             return os.path.join(new_root, pathname)
         else:
             # Chop off volume name from start of path
-            elements = string.split(pathname, ":", 1)
+            elements = pathname.split(":", 1)
             pathname = ":" + elements[1]
             return os.path.join(new_root, pathname)
 
@@ -281,7 +280,7 @@ def split_quoted (s):
     # bit of a brain-bender to get it working right, though...
     if _wordchars_re is None: _init_regex()
 
-    s = string.strip(s)
+    s = s.strip()
     words = []
     pos = 0
 
@@ -294,7 +293,7 @@ def split_quoted (s):
 
         if s[end] in string.whitespace: # unescaped, unquoted whitespace: now
             words.append(s[:end])       # we definitely have a word delimiter
-            s = string.lstrip(s[end:])
+            s = s[end:].lstrip()
             pos = 0
 
         elif s[end] == '\\':            # preserve whatever is being escaped;
@@ -354,7 +353,7 @@ def strtobool (val):
     are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
     'val' is anything else.
     """
-    val = string.lower(val)
+    val = val.lower()
     if val in ('y', 'yes', 't', 'true', 'on', '1'):
         return 1
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
@@ -445,7 +444,7 @@ def byte_compile (py_files,
             #if prefix:
             #    prefix = os.path.abspath(prefix)
 
-            script.write(string.join(map(repr, py_files), ",\n") + "]\n")
+            script.write(",\n".join(map(repr, py_files)) + "]\n")
             script.write("""
 byte_compile(files, optimize=%r, force=%r,
              prefix=%r, base_dir=%r,
@@ -507,7 +506,6 @@ def rfc822_escape (header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = string.split(header, '\n')
-    lines = map(string.strip, lines)
-    header = string.join(lines, '\n' + 8*' ')
-    return header
+    lines = [x.strip() for x in header.split('\n')]
+    sep = '\n' + 8*' '
+    return sep.join(lines)
diff --git a/version.py b/version.py
index 2cd36365e7..2db6b18f1e 100644
--- a/version.py
+++ b/version.py
@@ -26,8 +26,7 @@
     of the same class, thus must follow the same rules)
 """
 
-import string, re
-from types import StringType
+import re
 
 class Version:
     """Abstract base class for version numbering classes.  Just provides
@@ -147,12 +146,12 @@ def parse (self, vstring):
             match.group(1, 2, 4, 5, 6)
 
         if patch:
-            self.version = tuple(map(string.atoi, [major, minor, patch]))
+            self.version = tuple(map(int, [major, minor, patch]))
         else:
-            self.version = tuple(map(string.atoi, [major, minor]) + [0])
+            self.version = tuple(map(int, [major, minor]) + [0])
 
         if prerelease:
-            self.prerelease = (prerelease[0], string.atoi(prerelease_num))
+            self.prerelease = (prerelease[0], int(prerelease_num))
         else:
             self.prerelease = None
 
@@ -160,9 +159,9 @@ def parse (self, vstring):
     def __str__ (self):
 
         if self.version[2] == 0:
-            vstring = string.join(map(str, self.version[0:2]), '.')
+            vstring = '.'.join(map(str, self.version[0:2]))
         else:
-            vstring = string.join(map(str, self.version), '.')
+            vstring = '.'.join(map(str, self.version))
 
         if self.prerelease:
             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
@@ -171,7 +170,7 @@ def __str__ (self):
 
 
     def __cmp__ (self, other):
-        if isinstance(other, StringType):
+        if isinstance(other, str):
             other = StrictVersion(other)
 
         compare = cmp(self.version, other.version)
@@ -327,7 +326,7 @@ def __repr__ (self):
 
 
     def __cmp__ (self, other):
-        if isinstance(other, StringType):
+        if isinstance(other, str):
             other = LooseVersion(other)
 
         return cmp(self.version, other.version)

From 44168b43a0a197dc0295f0e80734880cecf658ea Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 24 Apr 2007 15:27:13 +0000
Subject: [PATCH 1870/8469] Bug #1706381: Specifying the SWIG option "-c++" in
 the setup.py file (as opposed to the command line) will now write file names
 ending in ".cpp" too.

---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 82474de823..12d4083743 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -533,7 +533,8 @@ def swig_sources (self, sources, extension):
         if self.swig_cpp:
             log.warn("--swig-cpp is deprecated - use --swig-opts=-c++")
 
-        if self.swig_cpp or ('-c++' in self.swig_opts):
+        if self.swig_cpp or ('-c++' in self.swig_opts) or \
+           ('-c++' in extension.swig_opts):
             target_ext = '.cpp'
         else:
             target_ext = '.c'

From 092ed8384228a0ca24fd297dde6243b6751a46a0 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 24 Apr 2007 15:27:25 +0000
Subject: [PATCH 1871/8469] Bug #1706381: Specifying the SWIG option "-c++" in
 the setup.py file (as opposed to the command line) will now write file names
 ending in ".cpp" too.  (backport from rev. 54941)

---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 82474de823..12d4083743 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -533,7 +533,8 @@ def swig_sources (self, sources, extension):
         if self.swig_cpp:
             log.warn("--swig-cpp is deprecated - use --swig-opts=-c++")
 
-        if self.swig_cpp or ('-c++' in self.swig_opts):
+        if self.swig_cpp or ('-c++' in self.swig_opts) or \
+           ('-c++' in extension.swig_opts):
             target_ext = '.cpp'
         else:
             target_ext = '.c'

From 0086340118b6b5d4243cb84b3e4c6df726a064da Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 25 Apr 2007 06:42:41 +0000
Subject: [PATCH 1872/8469] Whitespace normalization

---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index d1fd1d9511..75e8a5316e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -82,7 +82,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
-    # Check if the SDK that is used during compilation actually exists, 
+    # Check if the SDK that is used during compilation actually exists,
     # the universal build requires the usage of a universal SDK and not all
     # users have that installed by default.
     sysroot = None

From 078fadd293abe8b159cb6185a3ded2e87210c5f8 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 27 Apr 2007 19:54:29 +0000
Subject: [PATCH 1873/8469] Merged revisions 53952-54987 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r53954 | jeremy.hylton | 2007-02-26 10:41:18 -0800 (Mon, 26 Feb 2007) | 10 lines

  Do not copy free variables to locals in class namespaces.

  Fixes bug 1569356, but at the cost of a minor incompatibility in
  locals().  Add test that verifies that the class namespace is not
  polluted.  Also clarify the behavior in the library docs.

  Along the way, cleaned up the dict_to_map and map_to_dict
  implementations and added some comments that explain what they do.
........
  r53955 | jeremy.hylton | 2007-02-26 11:00:20 -0800 (Mon, 26 Feb 2007) | 2 lines

  Fix assertion.
........
  r53969 | neal.norwitz | 2007-02-26 14:41:45 -0800 (Mon, 26 Feb 2007) | 3 lines

  When printing an unraisable error, don't print exceptions. before the name.
  This duplicates the behavior whening normally printing exceptions.
........
  r53970 | andrew.kuchling | 2007-02-26 15:02:47 -0800 (Mon, 26 Feb 2007) | 1 line

  Markup fix
........
  r53975 | neal.norwitz | 2007-02-26 15:48:27 -0800 (Mon, 26 Feb 2007) | 3 lines

  SF #1669182, 2.5 was already fixed.  Just assert in 2.6 since string exceptions
  are gone.
........
  r53976 | andrew.kuchling | 2007-02-26 15:54:17 -0800 (Mon, 26 Feb 2007) | 1 line

  Add some items
........
  r53981 | jeremy.hylton | 2007-02-26 17:01:59 -0800 (Mon, 26 Feb 2007) | 4 lines

  Fix long-standing bug in name mangling for package imports

  Reported by Mike Verdone.
........
  r53993 | jeremy.hylton | 2007-02-27 08:00:06 -0800 (Tue, 27 Feb 2007) | 2 lines

  tabify
........
  r53994 | jeremy.hylton | 2007-02-27 08:13:23 -0800 (Tue, 27 Feb 2007) | 5 lines

  tabify

  Note that ast.c still has a mix of tabs and spaces, because it
  attempts to use four-space indents for more of the new code.
........
  r53996 | jeremy.hylton | 2007-02-27 09:24:48 -0800 (Tue, 27 Feb 2007) | 2 lines

  whitespace normalization
........
  r53997 | jeremy.hylton | 2007-02-27 10:29:45 -0800 (Tue, 27 Feb 2007) | 24 lines

  Add checking for a number of metaclass error conditions.

  We add some new rules that are required for preserving internal
  invariants of types.

  1.  If type (or a subclass of type) appears in bases, it must appear
      before any non-type bases.  If a non-type base (like a regular
      new-style class) occurred first, it could trick type into
      allocating the new class an __dict__ which must be impossible.

  2. There are several checks that are made of bases when creating a
     type.  Those checks are now repeated when assigning to __bases__.
     We also add the restriction that assignment to __bases__ may not
     change the metaclass of the type.

  Add new tests for these cases and for a few other oddball errors that
  were no previously tested.  Remove a crasher test that was fixed.

  Also some internal refactoring:  Extract the code to find the most
  derived metaclass of a type and its bases.  It is now needed in two
  places.  Rewrite the TypeError checks in test_descr to use doctest.
  The tests now clearly show what exception they expect to see.
........
  r53998 | jeremy.hylton | 2007-02-27 10:33:31 -0800 (Tue, 27 Feb 2007) | 2 lines

  Add news about changes to metaclasses and __bases__ error checking.
........
  r54016 | armin.rigo | 2007-02-28 01:25:29 -0800 (Wed, 28 Feb 2007) | 3 lines

  Modify the segfaulting example to show why r53997 is not a solution to
  it.
........
  r54022 | brett.cannon | 2007-02-28 10:15:00 -0800 (Wed, 28 Feb 2007) | 2 lines

  Add a test for instantiating SyntaxError with no arguments.
........
  r54026 | raymond.hettinger | 2007-02-28 10:27:41 -0800 (Wed, 28 Feb 2007) | 1 line

  Docstring nit.
........
  r54033 | raymond.hettinger | 2007-02-28 10:37:52 -0800 (Wed, 28 Feb 2007) | 1 line

  Prepare collections module for pure python code entries.
........
  r54053 | raymond.hettinger | 2007-02-28 22:16:43 -0800 (Wed, 28 Feb 2007) | 1 line

  Add collections.NamedTuple
........
  r54054 | neal.norwitz | 2007-02-28 23:04:41 -0800 (Wed, 28 Feb 2007) | 1 line

  Add Pat and Eric for work on PEP 3101 in the sandbox
........
  r54061 | andrew.kuchling | 2007-03-01 06:36:12 -0800 (Thu, 01 Mar 2007) | 1 line

  Add NamedTuple
........
  r54080 | georg.brandl | 2007-03-02 06:37:12 -0800 (Fri, 02 Mar 2007) | 2 lines

  Bug #1628895: some better tries to find HTML documentation in pydoc.
........
  r54086 | raymond.hettinger | 2007-03-02 11:20:46 -0800 (Fri, 02 Mar 2007) | 1 line

  Fix embarrassing typo and fix constantification of None
........
  r54088 | georg.brandl | 2007-03-02 12:30:14 -0800 (Fri, 02 Mar 2007) | 2 lines

  Bugs #1668032, #1668036, #1669304: clarify behavior of PyMem_Realloc and _Resize.
........
  r54114 | georg.brandl | 2007-03-04 09:18:54 -0800 (Sun, 04 Mar 2007) | 2 lines

  Fix a bug in test_dict and test_userdict, found at the PyPy sprint.
........
  r54124 | skip.montanaro | 2007-03-04 12:52:28 -0800 (Sun, 04 Mar 2007) | 2 lines

  Teach setup.py how to find Berkeley DB on Macs using MacPorts.
........
  r54125 | skip.montanaro | 2007-03-04 12:54:12 -0800 (Sun, 04 Mar 2007) | 1 line

  note MacPorts/BerkDB change in setup.py
........
  r54136 | neal.norwitz | 2007-03-04 23:52:01 -0800 (Sun, 04 Mar 2007) | 1 line

  Added Pete for 3101 too
........
  r54138 | facundo.batista | 2007-03-05 08:31:54 -0800 (Mon, 05 Mar 2007) | 1 line

  Minor corrections to docs, and an explanation comentary
........
  r54139 | georg.brandl | 2007-03-05 14:28:08 -0800 (Mon, 05 Mar 2007) | 3 lines

  Patch #1674228: when assigning a slice (old-style), check for the
  sq_ass_slice instead of the sq_slice slot.
........
  r54149 | georg.brandl | 2007-03-06 01:33:01 -0800 (Tue, 06 Mar 2007) | 3 lines

  Nit: a struct field is set to GenericAlloc, not GenericAlloc().
........
  r54150 | georg.brandl | 2007-03-06 02:02:47 -0800 (Tue, 06 Mar 2007) | 3 lines

  Patch #1671450: add a section about subclassing builtin types to the
  "extending and embedding" tutorial.
........
  r54152 | martin.v.loewis | 2007-03-06 02:41:24 -0800 (Tue, 06 Mar 2007) | 2 lines

  Patch #1121142: Implement ZipFile.open.
........
  r54154 | georg.brandl | 2007-03-06 03:51:14 -0800 (Tue, 06 Mar 2007) | 2 lines

  A test case for the fix in #1674228.
........
  r54156 | georg.brandl | 2007-03-06 03:52:24 -0800 (Tue, 06 Mar 2007) | 2 lines

  Patch #1672481: fix bug in idlelib.MultiCall.
........
  r54159 | georg.brandl | 2007-03-06 04:17:50 -0800 (Tue, 06 Mar 2007) | 1 line

  Bug #1674503: close the file opened by execfile() in an error condition.
........
  r54160 | georg.brandl | 2007-03-06 05:32:52 -0800 (Tue, 06 Mar 2007) | 3 lines

  Fix another reincarnation of bug #1576657 in defaultdict.
........
  r54162 | georg.brandl | 2007-03-06 05:35:00 -0800 (Tue, 06 Mar 2007) | 2 lines

  A test case for the defaultdict KeyError bug.
........
  r54164 | georg.brandl | 2007-03-06 05:37:45 -0800 (Tue, 06 Mar 2007) | 3 lines

  Patch #1663234: you can now run doctest on test files and modules
  using "python -m doctest [-v] filename ...".
........
  r54165 | martin.v.loewis | 2007-03-06 06:43:00 -0800 (Tue, 06 Mar 2007) | 3 lines

  Patch #912410: Replace HTML entity references for attribute values
  in HTMLParser.
........
  r54166 | skip.montanaro | 2007-03-06 07:41:38 -0800 (Tue, 06 Mar 2007) | 1 line

  patch 1673619 - identify extension modules which cannot be built
........
  r54167 | guido.van.rossum | 2007-03-06 07:50:01 -0800 (Tue, 06 Mar 2007) | 5 lines

  Patch #1646728: datetime.fromtimestamp fails with negative
  fractional times.  With unittest.

  Somebody please backport to 2.5.
........
  r54169 | georg.brandl | 2007-03-06 09:49:14 -0800 (Tue, 06 Mar 2007) | 2 lines

  Fix cmp vs. key argument for list.sort.
........
  r54170 | georg.brandl | 2007-03-06 10:21:32 -0800 (Tue, 06 Mar 2007) | 2 lines

  Small nit, found by Neal.
........
  r54171 | georg.brandl | 2007-03-06 10:29:58 -0800 (Tue, 06 Mar 2007) | 3 lines

  Patch #1602128: clarify that richcmp methods can return NotImplemented
  and should return True or False otherwise.
........
  r54173 | georg.brandl | 2007-03-06 10:41:12 -0800 (Tue, 06 Mar 2007) | 2 lines

  Patch #1638879: don't accept strings with embedded NUL bytes in long().
........
  r54175 | georg.brandl | 2007-03-06 10:47:31 -0800 (Tue, 06 Mar 2007) | 2 lines

  Patch #1673121: update README wrt. OSX default shell.
........
  r54177 | georg.brandl | 2007-03-06 10:59:11 -0800 (Tue, 06 Mar 2007) | 3 lines

  Patch #1654417: make operator.{get,set,del}slice use the full range
  of Py_ssize_t.
........
  r54180 | walter.doerwald | 2007-03-06 12:38:57 -0800 (Tue, 06 Mar 2007) | 4 lines

  Patch for bug #1633621: if curses.resizeterm() or
  curses.resize_term() is called, update _curses.LINES,
  _curses.COLS, curses.LINES and curses.COLS.
........
  r54182 | walter.doerwald | 2007-03-06 13:15:24 -0800 (Tue, 06 Mar 2007) | 2 lines

  Document change to curses.
........
  r54188 | georg.brandl | 2007-03-06 16:34:46 -0800 (Tue, 06 Mar 2007) | 5 lines

  Variant of patch #697613: don't exit the interpreter on a SystemExit
  exception if the -i command line option or PYTHONINSPECT environment
  variable is given, but break into the interactive interpreter just like
  on other exceptions or normal program exit.
   (backport)
........
  r54189 | georg.brandl | 2007-03-06 16:40:28 -0800 (Tue, 06 Mar 2007) | 4 lines

  Patch #703779: unset __file__ in __main__ after running a file. This
  makes the filenames the warning module prints much more sensible when
  a PYTHONSTARTUP file is used.
........
  r54192 | george.yoshida | 2007-03-06 20:21:18 -0800 (Tue, 06 Mar 2007) | 2 lines

  add versionadded info
........
  r54195 | georg.brandl | 2007-03-06 23:39:06 -0800 (Tue, 06 Mar 2007) | 2 lines

  Patch #812285: allow multiple auth schemes in AbstractBasicAuthHandler.
........
  r54197 | georg.brandl | 2007-03-07 00:31:51 -0800 (Wed, 07 Mar 2007) | 3 lines

  Patch #1001604: glob.glob() now returns unicode filenames if it was
  given a unicode argument and os.listdir() returns unicode filenames.
........
  r54199 | georg.brandl | 2007-03-07 01:09:40 -0800 (Wed, 07 Mar 2007) | 3 lines

  Patches #1550273, #1550272: fix a few bugs in unittest and add a
  comprehensive test suite for the module.
........
  r54201 | georg.brandl | 2007-03-07 01:21:06 -0800 (Wed, 07 Mar 2007) | 3 lines

  Patch #787789: allow to pass custom TestRunner instances to unittest's
  main() function.
........
  r54202 | georg.brandl | 2007-03-07 01:34:45 -0800 (Wed, 07 Mar 2007) | 2 lines

  Patch #1669331: clarify shutil.copyfileobj() behavior wrt. file position.
........
  r54204 | martin.v.loewis | 2007-03-07 03:04:33 -0800 (Wed, 07 Mar 2007) | 2 lines

  Bug #1115886: os.path.splitext('.cshrc') gives now ('.cshrc', '').
........
  r54206 | georg.brandl | 2007-03-07 03:37:42 -0800 (Wed, 07 Mar 2007) | 2 lines

  Patch #1675471: convert test_pty to unittest.
........
  r54207 | georg.brandl | 2007-03-07 03:54:49 -0800 (Wed, 07 Mar 2007) | 4 lines

  Add some sanity checks to unittest.TestSuite's addTest(s) methods.
  Fixes #878275.
........
  r54209 | guido.van.rossum | 2007-03-07 07:16:29 -0800 (Wed, 07 Mar 2007) | 3 lines

  Windows doesn't support negative timestamps.  Skip the tests involving them
  if os.name == "nt".
........
  r54219 | martin.v.loewis | 2007-03-08 05:42:43 -0800 (Thu, 08 Mar 2007) | 2 lines

  Add missing ) in parenthical remark.
........
  r54220 | georg.brandl | 2007-03-08 09:49:06 -0800 (Thu, 08 Mar 2007) | 2 lines

  Fix #1676656: \em is different from \emph...
........
  r54222 | georg.brandl | 2007-03-08 10:37:31 -0800 (Thu, 08 Mar 2007) | 2 lines

  Add a NEWS entry for rev. 54207,8.
........
  r54225 | raymond.hettinger | 2007-03-08 11:24:27 -0800 (Thu, 08 Mar 2007) | 1 line

  SF 1676321:  empty() returned wrong result
........
  r54227 | collin.winter | 2007-03-08 11:58:14 -0800 (Thu, 08 Mar 2007) | 1 line

  Backported r54226 from p3yk: Move test_unittest, test_doctest and test_doctest2 higher up in the testing order.
........
  r54230 | raymond.hettinger | 2007-03-08 13:33:47 -0800 (Thu, 08 Mar 2007) | 1 line

  SF #1637850:  make_table in difflib did not work with unicode
........
  r54232 | collin.winter | 2007-03-08 14:16:25 -0800 (Thu, 08 Mar 2007) | 1 line

  Patch #1668482: don't use '-' in mkstemp
........
  r54233 | brett.cannon | 2007-03-08 15:58:11 -0800 (Thu, 08 Mar 2007) | 10 lines

  Introduce test.test_support.TransientResource.  It's a context manager to
  surround calls to resources that may or may not be available.  Specifying the
  expected exception and attributes to be raised if the resource is not available
  prevents overly broad catching of exceptions.

  This is meant to help suppress spurious failures by raising
  test.test_support.ResourceDenied if the exception matches.  It would probably
  be good to go through the various network tests and surround the calls to catch
  connection timeouts (as done with test_socket_ssl in this commit).
........
  r54234 | collin.winter | 2007-03-08 19:15:56 -0800 (Thu, 08 Mar 2007) | 1 line

  Patch #1481079: Support of HTTP_REFERER in CGIHTTPServer.py
........
  r54235 | collin.winter | 2007-03-08 19:26:32 -0800 (Thu, 08 Mar 2007) | 1 line

  Add NEWS item for patch #1481079 (r54234).
........
  r54237 | neal.norwitz | 2007-03-08 21:59:01 -0800 (Thu, 08 Mar 2007) | 1 line

  Fix SF #1676971, Complex OverflowError has a typo
........
  r54239 | georg.brandl | 2007-03-09 04:58:41 -0800 (Fri, 09 Mar 2007) | 2 lines

  Typo.
........
  r54240 | martin.v.loewis | 2007-03-09 07:35:55 -0800 (Fri, 09 Mar 2007) | 2 lines

  Patch #957003: Implement smtplib.LMTP.
........
  r54243 | collin.winter | 2007-03-09 10:09:10 -0800 (Fri, 09 Mar 2007) | 2 lines

  Bug #1629566: clarify the docs on the return values of parsedate() and parsedate_tz() in email.utils and rfc822.
........
  r54244 | thomas.heller | 2007-03-09 11:21:28 -0800 (Fri, 09 Mar 2007) | 3 lines

  Fix bug #1646630: ctypes.string_at(buf, 0) and ctypes.wstring_at(buf, 0)
  returned string up to the first NUL character.
........
  r54245 | martin.v.loewis | 2007-03-09 11:36:01 -0800 (Fri, 09 Mar 2007) | 2 lines

  Add Ziga Seilnacht.
........
  r54247 | collin.winter | 2007-03-09 12:33:07 -0800 (Fri, 09 Mar 2007) | 2 lines

  Patch #1491866: change the complex() constructor to allow parthensized forms. This means complex(repr(x)) now works instead of raising a ValueError.
........
  r54248 | thomas.heller | 2007-03-09 12:39:22 -0800 (Fri, 09 Mar 2007) | 7 lines

  Bug #1651235: When a tuple was passed to a ctypes function call,
  Python would crash instead of raising an error.

  The crash was caused by a section of code that should have been
  removed long ago, at that time ctypes had other ways to pass
  parameters to function calls.
........
  r54250 | collin.winter | 2007-03-09 15:30:39 -0800 (Fri, 09 Mar 2007) | 1 line

  Hashing simplification pointed out by Thomas Wouters.
........
  r54252 | collin.winter | 2007-03-09 18:23:40 -0800 (Fri, 09 Mar 2007) | 5 lines

  * Unlink test files before and after each test; hopefully this will cut down on recent buildbot failures in test_islink.
  * Drop safe_remove() in favor of test_support.unlink().
  * Fix the indentation of test_samefile so that it runs.
........
  r54253 | collin.winter | 2007-03-09 18:51:26 -0800 (Fri, 09 Mar 2007) | 3 lines

  Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket.
  Will backport.
........
  r54254 | neal.norwitz | 2007-03-09 19:19:18 -0800 (Fri, 09 Mar 2007) | 4 lines

  Simplify a little by handling the TCP case first.
  Update to use predominant style of spaces around = in args list
  and print to stderr if debugging.
........
  r54256 | collin.winter | 2007-03-09 19:35:34 -0800 (Fri, 09 Mar 2007) | 1 line

  Add proper attribution for a bug fix.
........
  r54257 | georg.brandl | 2007-03-09 23:38:14 -0800 (Fri, 09 Mar 2007) | 2 lines

  Typos.
........
  r54260 | collin.winter | 2007-03-10 06:33:32 -0800 (Sat, 10 Mar 2007) | 1 line

  Convert an assert to a raise so it works even in the presence of -O.
........
  r54262 | collin.winter | 2007-03-10 06:41:48 -0800 (Sat, 10 Mar 2007) | 2 lines

  Patch #1599845: Add an option to disable the implicit calls to server_bind() and server_activate() in the constructors for TCPServer, SimpleXMLRPCServer and DocXMLRPCServer.
........
  r54268 | georg.brandl | 2007-03-11 00:28:46 -0800 (Sun, 11 Mar 2007) | 2 lines

  Add missing "return" statements in exception handler.
........
  r54270 | ziga.seilnacht | 2007-03-11 08:54:54 -0700 (Sun, 11 Mar 2007) | 3 lines

  Patch #1675981: remove unreachable code from type.__new__() method.
  __dict__ and __weakref__ are removed from the slots tuple earlier
  in the code, in the loop that mangles slot names. Will backport.
........
  r54271 | collin.winter | 2007-03-11 09:00:20 -0700 (Sun, 11 Mar 2007) | 3 lines

  Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap the IndexError caused by passing in an invalid breakpoint number.
  Will backport.
........
  r54274 | vinay.sajip | 2007-03-11 11:32:07 -0700 (Sun, 11 Mar 2007) | 1 line

  Fix resource leak reported in SF #1516995.
........
  r54278 | collin.winter | 2007-03-11 18:55:54 -0700 (Sun, 11 Mar 2007) | 4 lines

  Patch #1678662: ftp.python.org does not exist. So the testcode in urllib.py must use a more
  stable FTP.
  Will backport.
........
  r54280 | barry.warsaw | 2007-03-11 20:20:01 -0700 (Sun, 11 Mar 2007) | 8 lines

  Tokio Kikuchi's fix for SF bug #1629369; folding whitespace allowed in the
  display name of an email address, e.g.

  Foo
  \tBar <foo@example.com>

  Test case added by Barry.
........
  r54282 | skip.montanaro | 2007-03-11 20:30:50 -0700 (Sun, 11 Mar 2007) | 4 lines

  Sane humans would call these invalid tests, but Andrew McNamara pointed out
  that given the inputs in these tests Excel does indeed produce the output
  these tests expect.  Document that for future confused folks.
........
  r54283 | martin.v.loewis | 2007-03-12 03:50:39 -0700 (Mon, 12 Mar 2007) | 2 lines

  Bug #1675511: Use -Kpic instead of -xcode=pic32 on Solaris/x86.
........
  r54285 | martin.v.loewis | 2007-03-12 04:01:10 -0700 (Mon, 12 Mar 2007) | 2 lines

  Patch #1677862: Require a space or tab after import in .pth files.
........
  r54287 | georg.brandl | 2007-03-12 06:17:36 -0700 (Mon, 12 Mar 2007) | 8 lines

  Backport from Py3k branch:

  Patch #1591665: implement the __dir__() special function lookup in PyObject_Dir.

  Had to change a few bits of the patch because classobjs and __methods__ are still
  in Py2.6.
........
  r54288 | georg.brandl | 2007-03-12 07:30:05 -0700 (Mon, 12 Mar 2007) | 3 lines

  Bug #1678647: write a newline after printing an exception in any
  case, even when converting the value to a string failed.
........
  r54290 | collin.winter | 2007-03-12 08:57:19 -0700 (Mon, 12 Mar 2007) | 1 line

  Patch #1678088: convert test_operations to use unittest, fold the result into test_dict.
........
  r54291 | collin.winter | 2007-03-12 09:11:39 -0700 (Mon, 12 Mar 2007) | 3 lines

  Bug #742342: make Python stop segfaulting on infinitely-recursive reload()s. Fixed by patch #922167.
  Will backport.
........
  r54292 | georg.brandl | 2007-03-12 09:15:09 -0700 (Mon, 12 Mar 2007) | 2 lines

  Typo fix.
........
  r54295 | collin.winter | 2007-03-12 10:24:07 -0700 (Mon, 12 Mar 2007) | 1 line

  Patch #1670993: Refactor test_threadedtempfile.py to use unittest.
........
  r54296 | tim.peters | 2007-03-12 11:07:52 -0700 (Mon, 12 Mar 2007) | 2 lines

  Whitespace normalization.
........
  r54297 | tim.peters | 2007-03-12 11:09:22 -0700 (Mon, 12 Mar 2007) | 2 lines

  Set missing svn:eol-style property on text files.
........
  r54315 | brett.cannon | 2007-03-12 19:34:09 -0700 (Mon, 12 Mar 2007) | 8 lines

  Add test.test_support.transient_internet .  Returns a context manager that
  nests test.test_support.TransientResource context managers that capture
  exceptions raised when the Internet connection is flaky.

  Initially using in test_socket_ssl but should probably be expanded to cover any
  test that should not raise the captured exceptions if the Internet connection
  works.
........
  r54316 | brett.cannon | 2007-03-12 20:05:40 -0700 (Mon, 12 Mar 2007) | 2 lines

  Fix a typo where the variable name was not updated.
........
  r54318 | neal.norwitz | 2007-03-12 21:59:58 -0700 (Mon, 12 Mar 2007) | 1 line

  Add Jerry Seutter for a bunch of his recent patches refactoring tests
........
  r54319 | neal.norwitz | 2007-03-12 22:07:14 -0700 (Mon, 12 Mar 2007) | 7 lines

  Add some other acks for recent checkins:

  Brian Leair  - 922167
  Tomer Filiba - 1591665
  Jeremy Jones - 1192590
........
  r54321 | neal.norwitz | 2007-03-12 22:31:38 -0700 (Mon, 12 Mar 2007) | 9 lines

  Fix some style nits:
    * lines too long
    * wrong indentation
    * space after a function name
    * wrong function name in error string
    * simplifying some logic

  Also add an error check to PyDict_SetItemString.
........
  r54322 | georg.brandl | 2007-03-13 00:23:16 -0700 (Tue, 13 Mar 2007) | 2 lines

  Typo and grammar fixes.
........
  r54323 | georg.brandl | 2007-03-13 00:50:57 -0700 (Tue, 13 Mar 2007) | 2 lines

  Patch #1679379: add documentation for fnmatch.translate().
........
  r54325 | georg.brandl | 2007-03-13 00:57:51 -0700 (Tue, 13 Mar 2007) | 2 lines

  Patch #1642844: comments to clarify the complexobject constructor.
........
  r54326 | georg.brandl | 2007-03-13 01:14:27 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1668100: urllib2 now correctly raises URLError instead of
  OSError if accessing a local file via the file:// protocol fails.
........
  r54327 | georg.brandl | 2007-03-13 02:32:11 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1635454: the csv.DictWriter class now includes the offending
  field names in its exception message if you try to write a record with
  a dictionary containing fields not in the CSV field names list.
........
  r54328 | georg.brandl | 2007-03-13 02:41:31 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1555098: use str.join() instead of repeated string
  concatenation in robotparser.
........
  r54329 | georg.brandl | 2007-03-13 03:06:48 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1542681: add entries for "with", "as" and "CONTEXTMANAGERS" to
  pydoc's help keywords.
........
  r54331 | georg.brandl | 2007-03-13 03:19:22 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1569798: fix a bug in distutils when building Python from a
  directory within sys.exec_prefix.
........
  r54333 | martin.v.loewis | 2007-03-13 03:24:00 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1449244: Support Unicode strings in
  email.message.Message.{set_charset,get_content_charset}.
  Will backport.
........
  r54335 | lars.gustaebel | 2007-03-13 03:47:19 -0700 (Tue, 13 Mar 2007) | 34 lines

  This is the implementation of POSIX.1-2001 (pax) format read/write
  support.

  The TarInfo class now contains all necessary logic to process and
  create tar header data which has been moved there from the TarFile
  class. The fromtarfile() method was added. The new path and linkpath
  properties are aliases for the name and linkname attributes in
  correspondence to the pax naming scheme.

  The TarFile constructor and classmethods now accept a number of
  keyword arguments which could only be set as attributes before (e.g.
  dereference, ignore_zeros). The encoding and pax_headers arguments
  were added for pax support. There is a new tarinfo keyword argument
  that allows using subclassed TarInfo objects in TarFile.

  The boolean TarFile.posix attribute is deprecated, because now three
  tar formats are supported. Instead, the desired format for writing is
  specified using the constants USTAR_FORMAT, GNU_FORMAT and PAX_FORMAT
  as the format keyword argument. This change affects TarInfo.tobuf()
  as well.

  The test suite has been heavily reorganized and partially rewritten.
  A new testtar.tar was added that contains sample data in many formats
  from 4 different tar programs.

  Some bugs and quirks that also have been fixed:
  Directory names do no longer have a trailing slash in TarInfo.name or
  TarFile.getnames().
  Adding the same file twice does not create a hardlink file member.
  The TarFile constructor does no longer need a name argument.
  The TarFile._mode attribute was renamed to mode and contains either
  'r', 'w' or 'a'.
........
  r54336 | georg.brandl | 2007-03-13 05:34:25 -0700 (Tue, 13 Mar 2007) | 3 lines

  Bug #1622896: fix a rare corner case where the bz2 module raised an
  error in spite of a succesful compression.
........
  r54338 | lars.gustaebel | 2007-03-13 08:47:07 -0700 (Tue, 13 Mar 2007) | 3 lines

  Quick fix for tests that fail on systems with an encoding other
  than 'iso8859-1'.
........
  r54339 | georg.brandl | 2007-03-13 10:43:32 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1603688: ConfigParser.SafeConfigParser now checks values that
  are set for invalid interpolation sequences that would lead to errors
  on reading back those values.
........
  r54341 | georg.brandl | 2007-03-13 11:15:41 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1581073: add a flag to textwrap that prevents the dropping of
  whitespace while wrapping.
........
  r54343 | georg.brandl | 2007-03-13 11:24:40 -0700 (Tue, 13 Mar 2007) | 2 lines

  Patch #1605192: list allowed states in error messages for imaplib.
........
  r54344 | georg.brandl | 2007-03-13 11:31:49 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1537850: tempfile.NamedTemporaryFile now has a "delete" parameter
  which can be set to False to prevent the default delete-on-close
  behavior.
........
  r54345 | collin.winter | 2007-03-13 11:53:04 -0700 (Tue, 13 Mar 2007) | 9 lines

  Add acks for recent patch checkins:

  Arvin Schnell - 1668482
  S?\195?\169bastien Martini - 1481079
  Heiko Wundram - 1491866
  Damon Kohler - 1545011
  Peter Parente - 1599845
  Bjorn Lindqvist - 1678662
........
  r54346 | georg.brandl | 2007-03-13 12:00:36 -0700 (Tue, 13 Mar 2007) | 2 lines

  Acks for recent patches.
........
  r54347 | georg.brandl | 2007-03-13 12:18:18 -0700 (Tue, 13 Mar 2007) | 3 lines

  Fix a tab.
........
  r54348 | georg.brandl | 2007-03-13 12:32:21 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1533909: the timeit module now accepts callables in addition to
  strings for the code to time and the setup code. Also added two
  convenience functions for instantiating a Timer and calling its methods.
........
  r54352 | georg.brandl | 2007-03-13 13:02:57 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1530482: add pydoc.render_doc() which returns the documentation
  for a thing instead of paging it to stdout, which pydoc.doc() does.
........
  r54357 | thomas.heller | 2007-03-13 13:42:52 -0700 (Tue, 13 Mar 2007) | 1 line

  Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl.
........
  r54358 | georg.brandl | 2007-03-13 13:46:32 -0700 (Tue, 13 Mar 2007) | 2 lines

  Patch #1444529: the builtin compile() now accepts keyword arguments.
   (backport)
........
  r54359 | thomas.heller | 2007-03-13 14:01:39 -0700 (Tue, 13 Mar 2007) | 1 line

  Add versionadded marker for ctypes.c_bool.
........
  r54360 | georg.brandl | 2007-03-13 14:08:15 -0700 (Tue, 13 Mar 2007) | 3 lines

  Patch #1393667: pdb now has a "run" command which restarts the debugged
  Python program, optionally with different arguments.
........
  r54361 | georg.brandl | 2007-03-13 14:32:01 -0700 (Tue, 13 Mar 2007) | 3 lines

  Deprecate commands.getstatus().
........
  r54362 | georg.brandl | 2007-03-13 14:32:56 -0700 (Tue, 13 Mar 2007) | 2 lines

  NEWS entry for getstatus() deprecation.
........
  r54363 | georg.brandl | 2007-03-13 14:58:44 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #1429539: pdb now correctly initializes the __main__ module for
  the debugged script, which means that imports from __main__ work
  correctly now.
........
  r54364 | georg.brandl | 2007-03-13 15:07:36 -0700 (Tue, 13 Mar 2007) | 4 lines

  Patch #957650: "%var%" environment variable references are now properly
  expanded in ntpath.expandvars(), also "~user" home directory references
  are recognized and handled on Windows.
........
  r54365 | georg.brandl | 2007-03-13 15:16:30 -0700 (Tue, 13 Mar 2007) | 2 lines

  Patch #1194449: correctly detect unbound methods in pydoc.
........
  r54367 | georg.brandl | 2007-03-13 15:49:43 -0700 (Tue, 13 Mar 2007) | 5 lines

  Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
  with ASCII value less than 32. Also, it correctly quotes dots only if
  they occur on a single line, as opposed to the previous behavior of
  quoting dots if they are the second character of any line.
........
  r54368 | collin.winter | 2007-03-13 16:02:15 -0700 (Tue, 13 Mar 2007) | 1 line

  Inline PyImport_GetModulesReloading().
........
  r54371 | barry.warsaw | 2007-03-13 21:59:50 -0700 (Tue, 13 Mar 2007) | 6 lines

  SF bug #1582282; decode_header() incorrectly splits not-conformant RFC
  2047-like headers where there is no whitespace between encoded words.  This
  fix changes the matching regexp to include a trailing lookahead assertion that
  the closing ?= must be followed by whitespace, newline, or end-of-string.
  This also changes the regexp to add the MULTILINE flag.
........
  r54372 | gregory.p.smith | 2007-03-14 00:17:40 -0700 (Wed, 14 Mar 2007) | 2 lines

  correct order and names of the less often used keyword parameters.
........
  r54373 | gregory.p.smith | 2007-03-14 00:19:50 -0700 (Wed, 14 Mar 2007) | 5 lines

  Its time to stop listing (Unix, Windows) when we really mean "everything but Mac OS 9"
  now that nobody is likely to use Python on Mac OS 9 and most of the (Mac) platform
  items are all OS X special API specific since OS X is unixy enough for these modules
  to be available out of the box.
........
  r54376 | georg.brandl | 2007-03-14 01:27:52 -0700 (Wed, 14 Mar 2007) | 4 lines

  Bug #767111: fix long-standing bug in urllib which caused an
  AttributeError instead of an IOError when the server's response didn't
  contain a valid HTTP status line.
........
  r54378 | ziga.seilnacht | 2007-03-14 05:24:09 -0700 (Wed, 14 Mar 2007) | 4 lines

  Patch #1680015: Don't modify __slots__ tuple if it contains an unicode
  name. Remove a reference leak that happened if the name could not be
  converted to string. Will backport.
........
  r54386 | martin.v.loewis | 2007-03-14 13:02:31 -0700 (Wed, 14 Mar 2007) | 3 lines

  Patch #1559413: Fix test_cmd_line if sys.executable contains a space.
  Will backport.
........
  r54389 | brett.cannon | 2007-03-14 14:40:13 -0700 (Wed, 14 Mar 2007) | 3 lines

  Note how test_socket_ssl has various exceptions that deal with a flaky Net
  connection are silenced.
........
  r54390 | brett.cannon | 2007-03-14 14:44:15 -0700 (Wed, 14 Mar 2007) | 2 lines

  Raise ResourceDenied in test_urllib2net when the Net connection goes bad.
........
  r54391 | neal.norwitz | 2007-03-14 21:41:20 -0700 (Wed, 14 Mar 2007) | 1 line

  Wrap a long line and fix a typo (is -> if)
........
  r54392 | georg.brandl | 2007-03-15 00:38:14 -0700 (Thu, 15 Mar 2007) | 3 lines

  Patch #1680978: consistently use "alive" instead of "active" in the
  thread lib doc.
........
  r54394 | georg.brandl | 2007-03-15 00:41:30 -0700 (Thu, 15 Mar 2007) | 3 lines

  Patch #1681153: the wave module now closes a file object it opened if
  initialization failed.
........
  r54397 | ziga.seilnacht | 2007-03-15 04:44:55 -0700 (Thu, 15 Mar 2007) | 3 lines

  Patch #1462488: prevent a segfault in object_reduce_ex() by splitting
  the implementation for __reduce__ and __reduce_ex__ into two separate
  functions. Fixes bug #931877. Will backport.
........
  r54404 | collin.winter | 2007-03-15 21:11:30 -0700 (Thu, 15 Mar 2007) | 3 lines

  Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
  Will backport.
........
  r54406 | georg.brandl | 2007-03-16 00:55:09 -0700 (Fri, 16 Mar 2007) | 5 lines

  Bug #1681228: the webbrowser module now correctly uses the default
  GNOME or KDE browser, depending on whether there is a session of one
  of those present. Also, it tries the Windows default browser before
  trying Mozilla variants.
   (backport)
........
  r54407 | georg.brandl | 2007-03-16 01:22:40 -0700 (Fri, 16 Mar 2007) | 4 lines

  Patch #1273829: os.walk() now has a "followlinks" parameter. If set to
  True (which is not the default), it visits symlinks pointing to
  directories.
........
  r54408 | georg.brandl | 2007-03-16 01:24:21 -0700 (Fri, 16 Mar 2007) | 2 lines

  Add \versionadded tag.
........
  r54409 | georg.brandl | 2007-03-16 01:33:47 -0700 (Fri, 16 Mar 2007) | 2 lines

  RFE #1670167: fix in isinstance() docs.
........
  r54412 | ziga.seilnacht | 2007-03-16 04:59:38 -0700 (Fri, 16 Mar 2007) | 3 lines

  Patch #1623563: allow __class__ assignment for classes with __slots__.
  The old and the new class are still required to have the same slot
  names, but the order in which they are specified is not relevant.
........
  r54413 | ziga.seilnacht | 2007-03-16 05:11:11 -0700 (Fri, 16 Mar 2007) | 2 lines

  Whitespace cleanup. Also remove the empty lines
  from the previous check in.
........
  r54414 | jeremy.hylton | 2007-03-16 07:49:11 -0700 (Fri, 16 Mar 2007) | 2 lines

  Remove warning: funcion declaration isn't a prototype
........
  r54415 | jeremy.hylton | 2007-03-16 08:59:47 -0700 (Fri, 16 Mar 2007) | 11 lines

  Clean up formatting of this file.

  The file should now follow PEP 7, except that it uses 4 space indents
  (in the style of Py3k).  This particular code would be really hard to
  read with the regular tab idents.

  Other changes:
   - reflow long lines
   - change multi-line conditionals to have test at end of line
........
  r54417 | collin.winter | 2007-03-16 14:13:35 -0700 (Fri, 16 Mar 2007) | 1 line

  Patch #1676994: Refactor test_popen2 to use unittest.
........
  r54418 | collin.winter | 2007-03-16 14:15:35 -0700 (Fri, 16 Mar 2007) | 1 line

  Remove test/output/test_popen2 (missed in r54417).
........
  r54419 | collin.winter | 2007-03-16 15:16:08 -0700 (Fri, 16 Mar 2007) | 1 line

  Patch 1339796: add a relpath() function to os.path.
........
  r54421 | georg.brandl | 2007-03-17 09:08:45 -0700 (Sat, 17 Mar 2007) | 5 lines

  Patch #1675423: PyComplex_AsCComplex() now tries to convert an object
  to complex using its __complex__() method before falling back to the
  __float__() method. Therefore, the functions in the cmath module now
  can operate on objects that define a __complex__() method.
   (backport)
........
  r54423 | gregory.p.smith | 2007-03-17 15:33:35 -0700 (Sat, 17 Mar 2007) | 2 lines

  move note to the correct section
........
  r54426 | georg.brandl | 2007-03-18 01:25:00 -0700 (Sun, 18 Mar 2007) | 2 lines

  Patch #1682878: the new socket methods are recv_into and recvfrom_into, not *_buf.
........
  r54432 | georg.brandl | 2007-03-18 11:28:25 -0700 (Sun, 18 Mar 2007) | 2 lines

  Patch #1678339: test case for bug in difflib.
........
  r54439 | collin.winter | 2007-03-19 11:52:08 -0700 (Mon, 19 Mar 2007) | 1 line

  Patch #1630118: add a SpooledTemporaryFile class to tempfile.
........
  r54441 | georg.brandl | 2007-03-19 12:02:48 -0700 (Mon, 19 Mar 2007) | 2 lines

  Patch #1683328: fixes and enhancements for "unparse" demo.
........
  r54456 | neal.norwitz | 2007-03-19 22:07:28 -0700 (Mon, 19 Mar 2007) | 1 line

  Add some doc that was left out from some change to platform.py
........
  r54457 | neal.norwitz | 2007-03-19 22:08:23 -0700 (Mon, 19 Mar 2007) | 1 line

  Add a comment about 3k migration
........
  r54458 | neal.norwitz | 2007-03-19 22:21:21 -0700 (Mon, 19 Mar 2007) | 1 line

  Get rid of deprecation warning when testing commands.getstatus()
........
  r54459 | neal.norwitz | 2007-03-19 22:23:09 -0700 (Mon, 19 Mar 2007) | 4 lines

  Try backing out 54407 to see if it corrects the problems on the Windows
  buildbots.  This rev was backported, so we will need to keep both branches
  in sync, pending the outcome of the test after this checkin.
........
  r54460 | neal.norwitz | 2007-03-19 23:13:25 -0700 (Mon, 19 Mar 2007) | 1 line

  Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail).  Should be backported (assuming it works :-)
........
  r54461 | neal.norwitz | 2007-03-19 23:16:26 -0700 (Mon, 19 Mar 2007) | 1 line

  Try to make this test more resistant to dropping from previous runs (ie, files that may exist but cause the test to fail).  Should be backported (assuming it works :-)
........
  r54462 | neal.norwitz | 2007-03-19 23:53:17 -0700 (Mon, 19 Mar 2007) | 5 lines

  Try to be a little more resilient to errors.  This might help the test
  pass, but my guess is that it won't.  I'm guessing that some other
  test is leaving this file open which means it can't be removed
  under Windows AFAIK.
........
  r54463 | neal.norwitz | 2007-03-20 01:14:57 -0700 (Tue, 20 Mar 2007) | 8 lines

  Try to get test_urllib to pass on Windows by closing the file.
  I'm guessing that's the problem.  h.getfile() must be called *after*
  h.getreply() and the fp can be None.

  I'm not entirely convinced this is the best fix (or even correct).
  The buildbots will tell us if things improve or not.  I don't
  know if this needs to be backported (assuming it actually works).
........
  r54465 | raymond.hettinger | 2007-03-20 14:27:24 -0700 (Tue, 20 Mar 2007) | 1 line

  Extend work on rev 52962 and 53829 eliminating redundant PyObject_Hash() calls and fixing set/dict interoperability.
........
  r54468 | georg.brandl | 2007-03-20 16:05:14 -0700 (Tue, 20 Mar 2007) | 2 lines

  Fix for glob.py if filesystem encoding is None.
........
  r54479 | neal.norwitz | 2007-03-20 23:39:48 -0700 (Tue, 20 Mar 2007) | 1 line

  Remove unused file spotted by Paul Hankin
........
  r54480 | georg.brandl | 2007-03-21 02:00:39 -0700 (Wed, 21 Mar 2007) | 3 lines

  Patch #1682205: a TypeError while unpacking an iterable is no longer
  masked by a generic one with the message "unpack non-sequence".
........
  r54482 | georg.brandl | 2007-03-21 02:10:29 -0700 (Wed, 21 Mar 2007) | 2 lines

  New test for rev. 54407 which only uses directories under TESTFN.
........
  r54483 | georg.brandl | 2007-03-21 02:16:53 -0700 (Wed, 21 Mar 2007) | 2 lines

  Patch #1684834: document some utility C API functions.
........
  r54485 | georg.brandl | 2007-03-21 04:51:25 -0700 (Wed, 21 Mar 2007) | 2 lines

  Fix #1684254: split BROWSER contents with shlex to avoid displaying 'URL'.
........
  r54487 | andrew.kuchling | 2007-03-21 07:32:43 -0700 (Wed, 21 Mar 2007) | 1 line

  Add comments on maintenance of this file
........
  r54489 | andrew.kuchling | 2007-03-21 09:57:32 -0700 (Wed, 21 Mar 2007) | 1 line

  Fix sentence, and fix typo in example
........
  r54490 | andrew.kuchling | 2007-03-21 09:59:20 -0700 (Wed, 21 Mar 2007) | 1 line

  Put code examples at left margin instead of indenting them
........
  r54491 | facundo.batista | 2007-03-21 12:41:24 -0700 (Wed, 21 Mar 2007) | 1 line

  Minor clarification, saying that blocking means no timeout (from bug #882297)
........
  r54492 | ziga.seilnacht | 2007-03-21 13:07:56 -0700 (Wed, 21 Mar 2007) | 2 lines

  Bug #1675967: re patterns pickled with older Python versions can
  now be unpickled. Will backport.
........
  r54495 | raymond.hettinger | 2007-03-21 13:33:57 -0700 (Wed, 21 Mar 2007) | 1 line

  Add test and fix for fromkeys() optional argument.
........
  r54524 | georg.brandl | 2007-03-22 01:05:45 -0700 (Thu, 22 Mar 2007) | 2 lines

  Bug #1685704: use -m switch in timeit docs.
........
  r54533 | thomas.heller | 2007-03-22 12:44:31 -0700 (Thu, 22 Mar 2007) | 5 lines

  Back out "Patch #1643874: memory leak in ctypes fixed."

  The code in this patch leaves no way to give up the ownership of a
  BSTR instance.
........
  r54538 | thomas.heller | 2007-03-22 13:34:37 -0700 (Thu, 22 Mar 2007) | 2 lines

  Explain the purpose of the b_needsfree flag (forward ported from release25-maint).
........
  r54539 | guido.van.rossum | 2007-03-22 21:58:42 -0700 (Thu, 22 Mar 2007) | 12 lines

  - Bug #1683368: The object.__init__() and object.__new__() methods are
    now stricter in rejecting excess arguments.  The only time when
    either allows excess arguments is when it is not overridden and the
    other one is.  For backwards compatibility, when both are
    overridden, it is a deprecation warning (for now; maybe a Py3k
    warning later).

  When merging this into 3.0, the warnings should become errors.

  Note: without the change to string.py, lots of spurious warnings happen.
  What's going on there?
........
  r54540 | neal.norwitz | 2007-03-22 22:17:23 -0700 (Thu, 22 Mar 2007) | 1 line

  Add Mark Dickinson for SF # 1675423.
........
  r54541 | martin.v.loewis | 2007-03-23 03:35:49 -0700 (Fri, 23 Mar 2007) | 3 lines

  Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.
  Will backport.
........
  r54543 | martin.v.loewis | 2007-03-23 06:27:15 -0700 (Fri, 23 Mar 2007) | 3 lines

  Bug #978833: Revert r50844, as it broke _socketobject.dup.
  Will backport.
........
  r54545 | guido.van.rossum | 2007-03-23 11:53:03 -0700 (Fri, 23 Mar 2007) | 8 lines

  Add a type.__init__() method that enforces the same signature as
  type.__new__(), and then calls object.__init__(cls), just to be anal.

  This allows us to restore the code in string.py's _TemplateMetaclass
  that called super(...).__init__(name, bases, dct), which I commented
  out yesterday since it broke due to the stricter argument checking
  added to object.__init__().
........
  r54546 | facundo.batista | 2007-03-23 11:54:07 -0700 (Fri, 23 Mar 2007) | 4 lines


  Added a 'create_connect()' function to socket.py, which creates a
  connection with an optional timeout, and modified httplib.py to
  use this function in HTTPConnection. Applies patch 1676823.
........
  r54547 | guido.van.rossum | 2007-03-23 12:39:01 -0700 (Fri, 23 Mar 2007) | 2 lines

  Add note about type.__init__().
........
  r54553 | thomas.heller | 2007-03-23 12:55:27 -0700 (Fri, 23 Mar 2007) | 5 lines

  Prevent creation (followed by a segfault) of array types when the size
  overflows the valid Py_ssize_t range.  Check return values of
  PyMem_Malloc.

  Will backport to release25-maint.
........
  r54555 | facundo.batista | 2007-03-23 13:23:08 -0700 (Fri, 23 Mar 2007) | 6 lines


  Surrounded with try/finally to socket's default timeout setting
  changes in the tests, so failing one test won't produce strange
  results in others. Also relaxed the timeout settings in the test
  (where actually the value didn't mean anything).
........
  r54556 | collin.winter | 2007-03-23 15:24:39 -0700 (Fri, 23 Mar 2007) | 1 line

  Make test_relpath() pass on Windows.
........
  r54559 | ziga.seilnacht | 2007-03-24 07:24:26 -0700 (Sat, 24 Mar 2007) | 6 lines

  Patch #1489771: update syntax rules in Python Reference Manual.
  Python 2.5 added support for explicit relative import statements and
  yield expressions, which were missing in the manual.
  Also fix grammar productions that used the names from the Grammar file,
  markup that broke the generated grammar.txt, and wrap some lines that
  broke the pdf output.  Will backport.
........
  r54565 | georg.brandl | 2007-03-24 15:20:34 -0700 (Sat, 24 Mar 2007) | 2 lines

  Remove typo accent.
........
  r54566 | georg.brandl | 2007-03-24 15:27:56 -0700 (Sat, 24 Mar 2007) | 2 lines

  Revert accidental change.
........
  r54567 | brett.cannon | 2007-03-24 18:32:36 -0700 (Sat, 24 Mar 2007) | 3 lines

  Change the docs to no longer claim that unittest is preferred over doctest for
  regression tests.
........
  r54568 | facundo.batista | 2007-03-24 18:53:21 -0700 (Sat, 24 Mar 2007) | 4 lines


  Redone the tests, using the infrastructure already present
  for threading and socket serving.
........
  r54570 | facundo.batista | 2007-03-24 20:20:05 -0700 (Sat, 24 Mar 2007) | 3 lines


  Closing the HTTP connection after each test, and listening more.
........
  r54572 | georg.brandl | 2007-03-25 11:44:35 -0700 (Sun, 25 Mar 2007) | 2 lines

  Markup fix.
........
  r54573 | georg.brandl | 2007-03-25 12:04:55 -0700 (Sun, 25 Mar 2007) | 2 lines

  Markup fix.
........
  r54580 | facundo.batista | 2007-03-26 13:18:31 -0700 (Mon, 26 Mar 2007) | 5 lines


  Added an optional timeout to FTP class. Also I started a test_ftplib.py
  file to test the ftp lib (right now I included a basic test, the timeout
  one, and nothing else).
........
  r54581 | georg.brandl | 2007-03-26 13:28:28 -0700 (Mon, 26 Mar 2007) | 2 lines

  Some nits.
........
  r54582 | facundo.batista | 2007-03-26 13:56:09 -0700 (Mon, 26 Mar 2007) | 4 lines


  Forgot to add the file before the previous commit, here go
  the ftplib tests.
........
  r54585 | facundo.batista | 2007-03-27 11:23:21 -0700 (Tue, 27 Mar 2007) | 5 lines


  Added an optional timeout to poplib.POP3. Also created a
  test_poplib.py file with a basic test and the timeout
  ones. Docs are also updated.
........
  r54586 | facundo.batista | 2007-03-27 11:50:29 -0700 (Tue, 27 Mar 2007) | 3 lines


  The basic test cases of poplib.py.
........
  r54594 | facundo.batista | 2007-03-27 20:45:20 -0700 (Tue, 27 Mar 2007) | 4 lines


  Bug 1688393. Adds a control of negative values in
  socket.recvfrom, which caused an ugly crash.
........
  r54599 | facundo.batista | 2007-03-28 11:25:54 -0700 (Wed, 28 Mar 2007) | 5 lines


  Added timeout to smtplib (to SMTP and SMTP_SSL). Also created
  the test_smtplib.py file, with a basic test and the timeout
  ones. Docs are updated too.
........
  r54603 | collin.winter | 2007-03-28 16:34:06 -0700 (Wed, 28 Mar 2007) | 3 lines

  Consolidate patches #1690164, 1683397, and 1690169, all of which refactor XML-related test suites. The patches are applied together because they use a common output/xmltests file.
  Thanks to Jerry Seutter for all three patches.
........
  r54604 | collin.winter | 2007-03-28 19:28:16 -0700 (Wed, 28 Mar 2007) | 1 line

  Make test_zipfile clean up its temporary files properly.
........
  r54605 | georg.brandl | 2007-03-29 00:41:32 -0700 (Thu, 29 Mar 2007) | 2 lines

  These are actually methods.
........
  r54606 | georg.brandl | 2007-03-29 05:42:07 -0700 (Thu, 29 Mar 2007) | 4 lines

  In Windows' time.clock(), when QueryPerformanceFrequency() fails,
  the C lib's clock() is used, but it must be divided by CLOCKS_PER_SEC
  as for the POSIX implementation (thanks to #pypy).
........
  r54608 | facundo.batista | 2007-03-29 11:22:35 -0700 (Thu, 29 Mar 2007) | 5 lines


  Added timout parameter to telnetlib.Telnet. Also created
  test_telnetlib.py with a basic test and timeout ones.
  Docs are also updated.
........
  r54613 | facundo.batista | 2007-03-30 06:00:35 -0700 (Fri, 30 Mar 2007) | 4 lines


  Added the posibility to pass the timeout to FTP.connect, not only when
  instantiating the class. Docs and tests are updated.
........
  r54614 | collin.winter | 2007-03-30 07:01:25 -0700 (Fri, 30 Mar 2007) | 1 line

  Bug #1688274: add documentation for C-level class objects.
........
  r54615 | marc-andre.lemburg | 2007-03-30 08:01:42 -0700 (Fri, 30 Mar 2007) | 4 lines

  Bump the patch level version of distutils since there were a few bug fixes since
  the 2.5.0 release.
........
  r54617 | georg.brandl | 2007-03-30 08:49:05 -0700 (Fri, 30 Mar 2007) | 2 lines

  Markup fix.
........
  r54618 | georg.brandl | 2007-03-30 10:39:39 -0700 (Fri, 30 Mar 2007) | 2 lines

  Label name fix.
........
  r54619 | georg.brandl | 2007-03-30 10:47:21 -0700 (Fri, 30 Mar 2007) | 2 lines

  Duplicate label fix.
........
  r54620 | georg.brandl | 2007-03-30 10:48:39 -0700 (Fri, 30 Mar 2007) | 2 lines

  Markup fix.
........
  r54623 | andrew.kuchling | 2007-03-30 11:00:15 -0700 (Fri, 30 Mar 2007) | 1 line

  Add item.  (Oops, accidentally checked this in on my branch)
........
  r54624 | georg.brandl | 2007-03-30 12:01:38 -0700 (Fri, 30 Mar 2007) | 2 lines

  Duplicate label fix.
........
  r54625 | georg.brandl | 2007-03-30 12:14:02 -0700 (Fri, 30 Mar 2007) | 2 lines

  Markup fix.
........
  r54629 | georg.brandl | 2007-03-31 03:17:31 -0700 (Sat, 31 Mar 2007) | 2 lines

  repair string literal.
........
  r54630 | georg.brandl | 2007-03-31 04:54:58 -0700 (Sat, 31 Mar 2007) | 2 lines

  Markup fix.
........
  r54631 | georg.brandl | 2007-03-31 04:58:36 -0700 (Sat, 31 Mar 2007) | 2 lines

  Duplicate label fix.
........
  r54632 | georg.brandl | 2007-03-31 04:59:54 -0700 (Sat, 31 Mar 2007) | 2 lines

  Typo fix.
........
  r54633 | neal.norwitz | 2007-03-31 11:54:18 -0700 (Sat, 31 Mar 2007) | 1 line

  Fix method names.  Will backport.
........
  r54634 | georg.brandl | 2007-03-31 11:56:11 -0700 (Sat, 31 Mar 2007) | 4 lines

  Bug #1655392: don't add -L/usr/lib/pythonX.Y/config to the LDFLAGS
  returned by python-config if Python was built with --enable-shared
  because that prevented the shared library from being used.
........
  r54637 | collin.winter | 2007-03-31 12:31:34 -0700 (Sat, 31 Mar 2007) | 1 line

  Shut up an occaisonal buildbot error due to test files being left around.
........
  r54644 | neal.norwitz | 2007-04-01 11:24:22 -0700 (Sun, 01 Apr 2007) | 11 lines

  SF #1685563, MSVCCompiler creates redundant and long PATH strings

  If MSVCCompiler.initialize() was called multiple times, the path
  would get duplicated.  On Windows, this is a problem because the
  path is limited to 4k.  There's no benefit in adding a path multiple
  times, so prevent that from occuring.  We also normalize the path
  before checking for duplicates so things like /a and /a/ won't both
  be stored.

  Will backport.
........
  r54646 | brett.cannon | 2007-04-01 11:47:27 -0700 (Sun, 01 Apr 2007) | 8 lines

  time.strptime's caching of its locale object was being recreated when the
  locale changed but not used during the function call it was recreated during.

  The test in this checkin is untested (OS X does not have the proper locale
  support for me to test), although the fix for the bug this deals with
  was tested by the OP (#1290505).  Once the buildbots verify the test at least
  doesn't fail it becomes a backport candidate.
........
  r54647 | brett.cannon | 2007-04-01 12:46:19 -0700 (Sun, 01 Apr 2007) | 3 lines

  Fix the test for recreating the locale cache object by not worrying about if
  one of the test locales cannot be set.
........
  r54649 | georg.brandl | 2007-04-01 14:29:15 -0700 (Sun, 01 Apr 2007) | 2 lines

  Fix a lot of markup and meta-information glitches.
........
  r54650 | georg.brandl | 2007-04-01 14:39:52 -0700 (Sun, 01 Apr 2007) | 2 lines

  Another fix.
........
  r54651 | georg.brandl | 2007-04-01 15:39:10 -0700 (Sun, 01 Apr 2007) | 2 lines

  Lots of explicit class names for method and member descs.
........
  r54652 | georg.brandl | 2007-04-01 15:40:12 -0700 (Sun, 01 Apr 2007) | 2 lines

  Explicit class names.
........
  r54653 | georg.brandl | 2007-04-01 15:47:31 -0700 (Sun, 01 Apr 2007) | 2 lines

  Some semantic fixes.
........
  r54654 | georg.brandl | 2007-04-01 16:29:10 -0700 (Sun, 01 Apr 2007) | 2 lines

  Remove bogus entry.
........
  r54655 | georg.brandl | 2007-04-01 16:31:30 -0700 (Sun, 01 Apr 2007) | 2 lines

  Fix the class name of strings.
........
  r54658 | raymond.hettinger | 2007-04-02 10:29:30 -0700 (Mon, 02 Apr 2007) | 1 line

  SF #1693079:  Cannot save empty array in shelve
........
  r54663 | raymond.hettinger | 2007-04-02 15:54:21 -0700 (Mon, 02 Apr 2007) | 3 lines

  Array module's buffer interface can now handle empty arrays.
........
  r54664 | guido.van.rossum | 2007-04-02 16:55:37 -0700 (Mon, 02 Apr 2007) | 5 lines

  Fix warnings about object.__init__() signature.
  Two (test_array and test_descr) were bug IMO; the third (copy_reg)
  is a work-around which recognizes that object.__init__() doesn't do
  anything.
........
  r54666 | raymond.hettinger | 2007-04-02 17:02:11 -0700 (Mon, 02 Apr 2007) | 1 line

  SF 1602378 Clarify docstrings for bisect
........
  r54668 | raymond.hettinger | 2007-04-02 18:39:43 -0700 (Mon, 02 Apr 2007) | 3 lines

  SF #1382213:  Tutorial section 9.5.1 ignores MRO for new-style classes
........
  r54669 | matthias.klose | 2007-04-02 21:35:59 -0700 (Mon, 02 Apr 2007) | 4 lines

  - Fix an off-by-one bug in locale.strxfrm().

    patch taken from http://bugs.debian.org/416934.
........
  r54671 | georg.brandl | 2007-04-03 00:04:27 -0700 (Tue, 03 Apr 2007) | 9 lines

  Fix the strange case of

  \begin{methoddesc}[NNTP]{...}

  where

  \ifx#1\@undefined ended up comparing N and N, therefore executing
  the true part of the conditional, blowing up at \@undefined.
........
  r54672 | facundo.batista | 2007-04-03 07:05:08 -0700 (Tue, 03 Apr 2007) | 4 lines


  Now using unittest for the tests infraestructure. Also split the
  tests in those who need the network, and that who doesn't.
........
  r54673 | walter.doerwald | 2007-04-03 09:08:10 -0700 (Tue, 03 Apr 2007) | 4 lines

  Move the functionality for catching warnings in test_warnings.py into a separate
  class to that reusing the functionality in test_structmembers.py doesn't rerun
  the tests from test_warnings.py.
........
  r54674 | walter.doerwald | 2007-04-03 09:16:24 -0700 (Tue, 03 Apr 2007) | 2 lines

  Document that CatchWarningTests is reused by test_structmembers.py.
........
  r54675 | walter.doerwald | 2007-04-03 09:53:43 -0700 (Tue, 03 Apr 2007) | 4 lines

  Add tests for the filename.

  Test that the stacklevel is handled correctly.
........
  r54676 | facundo.batista | 2007-04-03 10:29:48 -0700 (Tue, 03 Apr 2007) | 6 lines


  Added a SSL server to test_socket_ssl.py to be able to test
  locally. Now, it checks if have openssl available and run
  those specific tests (it starts openssl at the beggining of
  all the tests and then kills it at the end).
........
  r54677 | walter.doerwald | 2007-04-03 11:33:29 -0700 (Tue, 03 Apr 2007) | 6 lines

  Implement a contextmanager test.test_support.catch_warning that can
  be used to catch the last warning issued by the warning framework.

  Change test_warnings.py and test_structmembers.py to use this
  new contextmanager.
........
  r54678 | facundo.batista | 2007-04-03 14:15:34 -0700 (Tue, 03 Apr 2007) | 4 lines


  Changed the whole structure of startup and checking if the
  server is available. Hope to not get more false alarms.
........
  r54681 | facundo.batista | 2007-04-04 07:10:40 -0700 (Wed, 04 Apr 2007) | 4 lines


  Fixed the way that the .pem files are looked for, and changed
  how to kill the process in win32 to use the _handle attribute.
........
  r54682 | guido.van.rossum | 2007-04-04 10:43:02 -0700 (Wed, 04 Apr 2007) | 4 lines

  Fix a race condition in this test -- instead of assuming that it will take
  the test server thread at most 0.5 seconds to get ready, use an event
  variable.
........
  r54683 | collin.winter | 2007-04-04 11:14:17 -0700 (Wed, 04 Apr 2007) | 1 line

  Clean up imports.
........
  r54684 | collin.winter | 2007-04-04 11:16:24 -0700 (Wed, 04 Apr 2007) | 1 line

  Stop using test_support.verify().
........
  r54685 | martin.v.loewis | 2007-04-04 11:30:36 -0700 (Wed, 04 Apr 2007) | 2 lines

  Bug #1686475: Support stat'ing open files on Windows again.
  Will backport to 2.5.
........
  r54687 | collin.winter | 2007-04-04 11:33:40 -0700 (Wed, 04 Apr 2007) | 1 line

  Make test_getopt use unittest.
........
  r54688 | collin.winter | 2007-04-04 11:36:30 -0700 (Wed, 04 Apr 2007) | 1 line

  Make test_softspace use unittest.
........
  r54689 | ziga.seilnacht | 2007-04-04 11:38:47 -0700 (Wed, 04 Apr 2007) | 2 lines

  Fix WalkTests.test_traversal() on Windows.  The cleanup in
  MakedirTests.setUp() can now be removed.
........
  r54695 | raymond.hettinger | 2007-04-05 11:00:03 -0700 (Thu, 05 Apr 2007) | 3 lines

  Bug #1563759: struct.unpack doens't support buffer protocol objects
........
  r54697 | collin.winter | 2007-04-05 13:05:07 -0700 (Thu, 05 Apr 2007) | 1 line

  Convert test_long_future to use unittest.
........
  r54698 | collin.winter | 2007-04-05 13:08:56 -0700 (Thu, 05 Apr 2007) | 1 line

  Convert test_normalization to use unittest.
........
  r54699 | andrew.kuchling | 2007-04-05 18:11:58 -0700 (Thu, 05 Apr 2007) | 1 line

  Some grammar fixes
........
  r54704 | collin.winter | 2007-04-06 12:27:40 -0700 (Fri, 06 Apr 2007) | 1 line

  Convert test_stringprep to use unittest.
........
  r54705 | collin.winter | 2007-04-06 12:32:32 -0700 (Fri, 06 Apr 2007) | 1 line

  Import cleanup in test_crypt.
........
  r54706 | collin.winter | 2007-04-06 13:00:05 -0700 (Fri, 06 Apr 2007) | 1 line

  Convert test_gc to use unittest.
........
  r54707 | collin.winter | 2007-04-06 13:03:11 -0700 (Fri, 06 Apr 2007) | 1 line

  Convert test_module to use unittest.
........
  r54711 | collin.winter | 2007-04-06 21:40:43 -0700 (Fri, 06 Apr 2007) | 1 line

  Convert test_fileinput to use unittest.
........
  r54712 | brett.cannon | 2007-04-07 21:29:32 -0700 (Sat, 07 Apr 2007) | 5 lines

  Doc that file.next() has undefined behaviour when called on a file opened with
  'w'.  Closes bug #1569057.

  To be backported once 2.5 branch is unfrozen.
........
  r54726 | vinay.sajip | 2007-04-09 09:16:10 -0700 (Mon, 09 Apr 2007) | 1 line

  Added optional timeout to SocketHandler.makeSocket (SF #1695948)
........
  r54727 | ziga.seilnacht | 2007-04-09 12:10:29 -0700 (Mon, 09 Apr 2007) | 3 lines

  Patch #1695862: remove old test directory that causes test_urllib failures
  on Windows buildbots.  The change is a one time fix and will be removed
  after a successful buildbot run.
........
  r54729 | facundo.batista | 2007-04-09 20:00:37 -0700 (Mon, 09 Apr 2007) | 3 lines


  Minor fix to the tests pass ok even with -O.
........
  r54730 | collin.winter | 2007-04-09 21:44:49 -0700 (Mon, 09 Apr 2007) | 1 line

  Typo fix.
........
  r54732 | facundo.batista | 2007-04-10 05:58:45 -0700 (Tue, 10 Apr 2007) | 5 lines


  General clean-up. Lot of margin corrections, comments, some typos.
  Exceptions now are raised in the new style. And a mockup class is
  now also new style. Thanks Santiago Pereson.
........
  r54741 | georg.brandl | 2007-04-10 14:39:38 -0700 (Tue, 10 Apr 2007) | 2 lines

  Repair a duplicate label and some obsolete uses of \setindexsubitem.
........
  r54746 | andrew.kuchling | 2007-04-11 06:39:00 -0700 (Wed, 11 Apr 2007) | 1 line

  Add window.chgat() method, submitted via e-mail by Fabian Kreutz
........
  r54747 | andrew.kuchling | 2007-04-11 06:42:25 -0700 (Wed, 11 Apr 2007) | 1 line

  Point readers at the patch submission instructions
........
  r54748 | andrew.kuchling | 2007-04-11 06:47:13 -0700 (Wed, 11 Apr 2007) | 1 line

  Describe undocumented third argument to touchline()
........
  r54757 | georg.brandl | 2007-04-11 10:16:24 -0700 (Wed, 11 Apr 2007) | 3 lines

  Add some missing NULL checks which trigger crashes on low-memory conditions.
  Found by Victor Stinner. Will backport when 2.5 branch is unfrozen.
........
  r54760 | raymond.hettinger | 2007-04-11 11:40:58 -0700 (Wed, 11 Apr 2007) | 1 line

  SF 1191699:  Make slices picklable
........
  r54762 | georg.brandl | 2007-04-11 12:25:11 -0700 (Wed, 11 Apr 2007) | 2 lines

  Exceptions are no longer old-style instances. Fix accordingly.
........
  r54763 | georg.brandl | 2007-04-11 16:28:44 -0700 (Wed, 11 Apr 2007) | 2 lines

  Repair missing spaces after \UNIX.
........
  r54772 | raymond.hettinger | 2007-04-11 21:10:00 -0700 (Wed, 11 Apr 2007) | 1 line

  SF 1193128:  Let str.translate(None) be an identity transformation
........
  r54784 | georg.brandl | 2007-04-12 00:01:19 -0700 (Thu, 12 Apr 2007) | 2 lines

  Patch #1698951: clarify deprecation message in rexec and Bastion
........
  r54785 | ziga.seilnacht | 2007-04-12 01:46:51 -0700 (Thu, 12 Apr 2007) | 2 lines

  Patch #1695862: remove the cleanup code, now that Windows buildbots are green
  again.
........
  r54786 | walter.doerwald | 2007-04-12 03:35:00 -0700 (Thu, 12 Apr 2007) | 3 lines

  Fix utf-8-sig incremental decoder, which didn't recognise a BOM when the
  first chunk fed to the decoder started with a BOM, but was longer than 3 bytes.
........
  r54807 | barry.warsaw | 2007-04-13 11:47:14 -0700 (Fri, 13 Apr 2007) | 8 lines

  Port r54805 from python25-maint branch:

  Add code to read from master_fd in the parent, breaking when we get an OSError
  (EIO can occur on Linux) or there's no more data to read.  Without this,
  test_pty.py can hang on the waitpid() because the child is blocking on the
  stdout write.  This will definitely happen on Mac OS X and could potentially
  happen on other platforms.  See the comment for details.
........
  r54812 | kristjan.jonsson | 2007-04-13 15:07:33 -0700 (Fri, 13 Apr 2007) | 1 line

  Fix a bug when using the __lltrace__ opcode tracer, and a problem sith signed chars in frameobject.c which can occur with opcodes > 127
........
  r54814 | kristjan.jonsson | 2007-04-13 15:20:13 -0700 (Fri, 13 Apr 2007) | 1 line

  Fix potential crash in path manipulation on windows
........
  r54816 | trent.mick | 2007-04-13 16:22:05 -0700 (Fri, 13 Apr 2007) | 4 lines

  Add the necessary dependency for the Windows VC6 build to ensure 'pythoncore'
  is built before '_ctypes' is attempted.
  Will backport to 2.5 once it is unfrozen for 2.5.1.
........
  r54825 | neal.norwitz | 2007-04-13 22:25:50 -0700 (Fri, 13 Apr 2007) | 3 lines

  When __slots__ are set to a unicode string, make it work the same as
  setting a plain string, ie don't expand to single letter identifiers.
........
  r54841 | neal.norwitz | 2007-04-16 00:37:55 -0700 (Mon, 16 Apr 2007) | 1 line

  SF #1701207, Fix bogus assertion (and test it!)
........
  r54844 | collin.winter | 2007-04-16 15:10:32 -0700 (Mon, 16 Apr 2007) | 1 line

  Check the availability of the urlfetch resource earlier than before.
........
  r54849 | martin.v.loewis | 2007-04-16 22:02:01 -0700 (Mon, 16 Apr 2007) | 2 lines

  Add Travis Oliphant.
........
  r54873 | brett.cannon | 2007-04-18 20:44:17 -0700 (Wed, 18 Apr 2007) | 2 lines

  Silence a compiler warning about incompatible pointer types.
........
  r54874 | neal.norwitz | 2007-04-18 22:52:37 -0700 (Wed, 18 Apr 2007) | 2 lines

  SF #1703270, add missing declaration in readline.c to avoid compiler warning.
........
  r54875 | armin.rigo | 2007-04-19 07:44:48 -0700 (Thu, 19 Apr 2007) | 8 lines

  Revert r53997 as per
  http://mail.python.org/pipermail/python-dev/2007-March/071796.html .

  I've kept a couple of still-valid extra tests in test_descr, but didn't
  bother to sort through the new comments and refactorings added in r53997
  to see if some of them could be kept.  If so, they could go in a
  follow-up check-in.
........
  r54876 | armin.rigo | 2007-04-19 07:56:48 -0700 (Thu, 19 Apr 2007) | 2 lines

  Fix a usage of the dangerous pattern decref - modify field - incref.
........
  r54884 | neal.norwitz | 2007-04-19 22:20:38 -0700 (Thu, 19 Apr 2007) | 9 lines

  Add an optional address to copy the failure mails to.

  Detect a conflict in the only file that should have outstanding changes
  when this script is run.  This doesn't matter on the trunk, but does
  when run on a branch.  Trunk always has the date set to today in
  boilerplate.tex.  Each time a release is cut with a different date,
  a conflict occurs.  (We could copy a known good version, but then
  we would lose changes to this file.)
........
  r54918 | georg.brandl | 2007-04-21 13:35:38 -0700 (Sat, 21 Apr 2007) | 3 lines

  Bug #1704790: bind name "sys" locally in __del__ method so that it is
  not cleared before __del__ is run.
........
  r54920 | facundo.batista | 2007-04-21 18:18:56 -0700 (Sat, 21 Apr 2007) | 5 lines


  Added tests for other methods of SSL object. Now we cover
  all the object methods. This is the final step to close
  the #451607 bug.
........
  r54927 | facundo.batista | 2007-04-23 10:08:31 -0700 (Mon, 23 Apr 2007) | 5 lines


  As specified in RFC 2616, 2xx code indicates that the client's
  request was successfully received, understood, and accepted.
  Now in these cases no error is raised. Also fixed tests.
........
  r54929 | collin.winter | 2007-04-23 20:43:46 -0700 (Mon, 23 Apr 2007) | 1 line

  Convert PyUnit -> unittest.
........
  r54931 | collin.winter | 2007-04-23 21:09:52 -0700 (Mon, 23 Apr 2007) | 1 line

  Remove code that hasn't been called in years.
........
  r54932 | neal.norwitz | 2007-04-23 21:53:12 -0700 (Mon, 23 Apr 2007) | 1 line

  Fix SF #1703110, Incorrect example for add_password() (use uri, not host)
........
  r54934 | georg.brandl | 2007-04-24 03:36:42 -0700 (Tue, 24 Apr 2007) | 2 lines

  Some new year updates.
........
  r54938 | facundo.batista | 2007-04-24 06:54:38 -0700 (Tue, 24 Apr 2007) | 4 lines


  Added a comment about last change in urllib2.py (all 2xx responses
  are ok now).
........
  r54939 | georg.brandl | 2007-04-24 08:10:09 -0700 (Tue, 24 Apr 2007) | 2 lines

  Bug #1705717: error in sys.argv docs.
........
  r54941 | georg.brandl | 2007-04-24 08:27:13 -0700 (Tue, 24 Apr 2007) | 4 lines

  Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
  (as opposed to the command line) will now write file names ending in
  ".cpp" too.
........
  r54944 | raymond.hettinger | 2007-04-24 15:13:43 -0700 (Tue, 24 Apr 2007) | 1 line

  Fix markup
........
  r54945 | kristjan.jonsson | 2007-04-24 17:10:50 -0700 (Tue, 24 Apr 2007) | 1 line

  Merge change 54909 from release25-maint:  Fix several minor issues discovered using code analysis in VisualStudio 2005 Team Edition
........
  r54947 | kristjan.jonsson | 2007-04-24 17:17:39 -0700 (Tue, 24 Apr 2007) | 1 line

  Make pythoncore compile cleanly with VisualStudio 2005.  Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
........
  r54948 | kristjan.jonsson | 2007-04-24 17:19:26 -0700 (Tue, 24 Apr 2007) | 1 line

  Remove obsolete comment. Importing of .dll files has been discontinued, only .pyd files supported on windows now.
........
  r54949 | georg.brandl | 2007-04-24 23:24:59 -0700 (Tue, 24 Apr 2007) | 2 lines

  Patch #1698768: updated the "using Python on the Mac" intro.
........
  r54951 | georg.brandl | 2007-04-24 23:25:55 -0700 (Tue, 24 Apr 2007) | 2 lines

  Markup fix.
........
  r54953 | neal.norwitz | 2007-04-24 23:30:05 -0700 (Tue, 24 Apr 2007) | 3 lines

  Whitespace normalization.  Ugh, we really need to do this more often.
  You might want to review this change as it's my first time.  Be gentle. :-)
........
  r54956 | collin.winter | 2007-04-25 10:29:52 -0700 (Wed, 25 Apr 2007) | 1 line

  Standardize on test.test_support.run_unittest() (as opposed to a mix of run_unittest() and run_suite()). Also, add functionality to run_unittest() that admits usage of unittest.TestLoader.loadTestsFromModule().
........
  r54957 | collin.winter | 2007-04-25 10:37:35 -0700 (Wed, 25 Apr 2007) | 1 line

  Remove functionality from test_datetime.test_main() that does reference count checking; 'regrtest.py -R' is the way to do this kind of testing.
........
  r54958 | collin.winter | 2007-04-25 10:57:53 -0700 (Wed, 25 Apr 2007) | 1 line

  Change test_support.have_unicode to use True/False instead of 1/0.
........
  r54959 | tim.peters | 2007-04-25 11:47:18 -0700 (Wed, 25 Apr 2007) | 2 lines

  Whitespace normalization.
........
  r54960 | tim.peters | 2007-04-25 11:48:35 -0700 (Wed, 25 Apr 2007) | 2 lines

  Set missing svn:eol-style property on text files.
........
  r54961 | collin.winter | 2007-04-25 11:54:36 -0700 (Wed, 25 Apr 2007) | 1 line

  Import and raise statement cleanup.
........
  r54969 | collin.winter | 2007-04-25 13:41:34 -0700 (Wed, 25 Apr 2007) | 1 line

  Convert test_ossaudiodev to use unittest.
........
  r54974 | collin.winter | 2007-04-25 14:50:25 -0700 (Wed, 25 Apr 2007) | 1 line

  Fix an issue related to the unittest conversion.
........
  r54979 | fred.drake | 2007-04-25 21:42:19 -0700 (Wed, 25 Apr 2007) | 1 line

  fix some markup errors
........
  r54982 | kristjan.jonsson | 2007-04-26 02:15:08 -0700 (Thu, 26 Apr 2007) | 1 line

  Export function sanitize_the_mode from fileobject.c as _PyFile_SanitizeMode().  Use this function in posixmodule.c when implementing fdopen().  This fixes test_subprocess.py for a VisualStudio 2005 compile.
........
  r54983 | kristjan.jonsson | 2007-04-26 06:44:16 -0700 (Thu, 26 Apr 2007) | 1 line

  The locale "En" appears not to be valid on windows underi VisualStudio.2005.  Added "English" to the test_locale.py to make the testsuite pass for that build
........
  r54984 | steve.holden | 2007-04-26 07:23:12 -0700 (Thu, 26 Apr 2007) | 1 line

  Minor wording change on slicing aide-memoire.
........
  r54985 | kristjan.jonsson | 2007-04-26 08:24:54 -0700 (Thu, 26 Apr 2007) | 1 line

  Accomodate 64 bit time_t in the _bsddb module.
........
---
 __init__.py          |  2 +-
 command/build_ext.py |  7 ++++---
 msvccompiler.py      | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/__init__.py b/__init__.py
index 21d34c767b..86ad44fe3a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,4 +20,4 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.5.0"
+__version__ = "2.5.1"
diff --git a/command/build_ext.py b/command/build_ext.py
index d0cd16293b..2832d5717b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -186,7 +186,7 @@ def finalize_options (self):
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-            if sys.executable.find(sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
                                                       "python" + get_python_version(),
@@ -199,7 +199,7 @@ def finalize_options (self):
         # Python's library directory must be appended to library_dirs
         if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
                 and sysconfig.get_config_var('Py_ENABLE_SHARED'):
-            if sys.executable.find(sys.exec_prefix) != -1:
+            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:
@@ -533,7 +533,8 @@ def swig_sources (self, sources, extension):
         if self.swig_cpp:
             log.warn("--swig-cpp is deprecated - use --swig-opts=-c++")
 
-        if self.swig_cpp or ('-c++' in self.swig_opts):
+        if self.swig_cpp or ('-c++' in self.swig_opts) or \
+           ('-c++' in extension.swig_opts):
             target_ext = '.cpp'
         else:
             target_ext = '.c'
diff --git a/msvccompiler.py b/msvccompiler.py
index ca1feaa088..07c76f1838 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -187,6 +187,19 @@ def get_build_architecture():
     j = sys.version.find(")", i)
     return sys.version[i+len(prefix):j]
 
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
 
 
 class MSVCCompiler (CCompiler) :
@@ -270,7 +283,8 @@ def initialize(self):
                 self.__paths.append(p)
         except KeyError:
             pass
-        os.environ['path'] = ';'.join(self.__paths)
+        self.__paths = normalize_and_reduce_paths(self.__paths)
+        os.environ['path'] = ";".join(self.__paths)
 
         self.preprocess_options = None
         if self.__arch == "Intel":

From 3bf5ce40cfaf14aa42593b4c4e5c28338c31633a Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 27 Apr 2007 23:53:51 +0000
Subject: [PATCH 1874/8469] Checkpoint.  Manipulated things so that string
 literals are always unicode, and a few other compensating changes, e.g. str
 <- unicode, chr <- unichr, and repr() of a unicode string no longer starts
 with 'u'.  Lots of unit tests are broken, but some basic things work, in
 particular distutils works so the extensions can be built, and
 test_builtin.py works.

---
 ccompiler.py            | 12 ++++++------
 cmd.py                  |  9 ++++-----
 command/build_clib.py   |  4 ++--
 command/build_ext.py    | 10 +++++-----
 command/build_py.py     |  2 +-
 command/config.py       |  8 ++++----
 command/install.py      |  2 +-
 command/install_data.py |  3 +--
 dir_util.py             |  2 +-
 dist.py                 |  6 +++---
 extension.py            |  4 ++--
 fancy_getopt.py         |  4 ++--
 filelist.py             |  2 +-
 unixccompiler.py        |  4 ++--
 14 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 25d90c8a9a..50905c1d44 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -168,7 +168,7 @@ class (via the 'executables' class attribute), but most will have:
     # set_executables ()
 
     def set_executable(self, key, value):
-        if type(value) is StringType:
+        if isinstance(value, basestring):
             setattr(self, key, split_quoted(value))
         else:
             setattr(self, key, value)
@@ -193,8 +193,8 @@ def _check_macro_definitions (self, definitions):
             if not (type (defn) is TupleType and
                     (len (defn) == 1 or
                      (len (defn) == 2 and
-                      (type (defn[1]) is StringType or defn[1] is None))) and
-                    type (defn[0]) is StringType):
+                      (isinstance (defn[1], basestring) or defn[1] is None))) and
+                    isinstance (defn[0], basestring)):
                 raise TypeError, \
                       ("invalid macro definition '%s': " % defn) + \
                       "must be tuple (string,), (string, string), or " + \
@@ -344,7 +344,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
         """
         if outdir is None:
             outdir = self.output_dir
-        elif type(outdir) is not StringType:
+        elif not isinstance(outdir, basestring):
             raise TypeError, "'output_dir' must be a string or None"
 
         if macros is None:
@@ -442,7 +442,7 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
         """
         if output_dir is None:
             output_dir = self.output_dir
-        elif type (output_dir) is not StringType:
+        elif not isinstance(output_dir, basestring):
             raise TypeError, "'output_dir' must be a string or None"
 
         if macros is None:
@@ -527,7 +527,7 @@ def _fix_object_args (self, objects, output_dir):
 
         if output_dir is None:
             output_dir = self.output_dir
-        elif type (output_dir) is not StringType:
+        elif not isinstance(output_dir, basestring):
             raise TypeError, "'output_dir' must be a string or None"
 
         return (objects, output_dir)
diff --git a/cmd.py b/cmd.py
index ebd99310ea..ea3799af16 100644
--- a/cmd.py
+++ b/cmd.py
@@ -222,7 +222,7 @@ def _ensure_stringlike (self, option, what, default=None):
         if val is None:
             setattr(self, option, default)
             return default
-        elif type(val) is not StringType:
+        elif not isinstance(val, basestring):
             raise DistutilsOptionError, \
                   "'%s' must be a %s (got `%s`)" % (option, what, val)
         return val
@@ -242,12 +242,11 @@ def ensure_string_list (self, option):
         val = getattr(self, option)
         if val is None:
             return
-        elif type(val) is StringType:
+        elif isinstance(val, basestring):
             setattr(self, option, re.split(r',\s*|\s+', val))
         else:
             if type(val) is ListType:
-                types = map(type, val)
-                ok = (types == [StringType] * len(val))
+                ok = all(isinstance(v, basestring) for v in val)
             else:
                 ok = 0
 
@@ -421,7 +420,7 @@ def make_file (self, infiles, outfile, func, args,
 
 
         # Allow 'infiles' to be a single string
-        if type(infiles) is StringType:
+        if isinstance(infiles, basestring):
             infiles = (infiles,)
         elif type(infiles) not in (ListType, TupleType):
             raise TypeError, \
diff --git a/command/build_clib.py b/command/build_clib.py
index 07f5817986..5434e86c86 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -92,7 +92,7 @@ def finalize_options (self):
 
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type(self.include_dirs) is StringType:
+        if isinstance(self.include_dirs, basestring):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # XXX same as for build_ext -- what about 'self.define' and
@@ -147,7 +147,7 @@ def check_library_list (self, libraries):
                 raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
-            if type(lib[0]) is not StringType:
+            if isinstance(lib[0], basestring) StringType:
                 raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
diff --git a/command/build_ext.py b/command/build_ext.py
index 2832d5717b..0236a26835 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -137,7 +137,7 @@ def finalize_options (self):
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type(self.include_dirs) is StringType:
+        if isinstance(self.include_dirs, basestring):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
@@ -146,7 +146,7 @@ def finalize_options (self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if type(self.libraries) is StringType:
+        if isinstance(self.libraries, basestring):
             self.libraries = [self.libraries]
 
         # Life is easier if we're not forever checking for None, so
@@ -155,12 +155,12 @@ def finalize_options (self):
             self.libraries = []
         if self.library_dirs is None:
             self.library_dirs = []
-        elif type(self.library_dirs) is StringType:
+        elif isinstance(self.library_dirs, basestring):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
         if self.rpath is None:
             self.rpath = []
-        elif type(self.rpath) is StringType:
+        elif isinstance(self.rpath, basestring):
             self.rpath = self.rpath.split(os.pathsep)
 
         # for extensions under windows use different directories
@@ -321,7 +321,7 @@ def check_extensions_list (self, extensions):
                       ("each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
-            if not (type(ext_name) is StringType and
+            if not (isinstance(ext_name, basestring) and
                     extension_name_re.match(ext_name)):
                 raise DistutilsSetupError, \
                       ("first element of each tuple in 'ext_modules' "
diff --git a/command/build_py.py b/command/build_py.py
index 990824bdff..52534bdb47 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -361,7 +361,7 @@ def get_outputs (self, include_bytecode=1):
 
 
     def build_module (self, module, module_file, package):
-        if type(package) is StringType:
+        if isinstance(package, basestring):
             package = package.split('.')
         elif type(package) not in (ListType, TupleType):
             raise TypeError, \
diff --git a/command/config.py b/command/config.py
index 3374db9e66..04cfcde736 100644
--- a/command/config.py
+++ b/command/config.py
@@ -73,17 +73,17 @@ def initialize_options (self):
     def finalize_options (self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        elif type(self.include_dirs) is StringType:
+        elif isinstance(self.include_dirs, basestring):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         if self.libraries is None:
             self.libraries = []
-        elif type(self.libraries) is StringType:
+        elif isinstance(self.libraries, basestring):
             self.libraries = [self.libraries]
 
         if self.library_dirs is None:
             self.library_dirs = []
-        elif type(self.library_dirs) is StringType:
+        elif isinstance(self.library_dirs, basestring):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
 
@@ -212,7 +212,7 @@ def search_cpp (self, pattern, body=None,
         self._check_compiler()
         (src, out) = self._preprocess(body, headers, include_dirs, lang)
 
-        if type(pattern) is StringType:
+        if isinstance(pattern, basestring):
             pattern = re.compile(pattern)
 
         file = open(out)
diff --git a/command/install.py b/command/install.py
index c03a90e82c..cc92e96368 100644
--- a/command/install.py
+++ b/command/install.py
@@ -463,7 +463,7 @@ def handle_extra_path (self):
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
-            if type(self.extra_path) is StringType:
+            if isinstance(self.extra_path, basestring):
                 self.extra_path = self.extra_path.split(',')
 
             if len(self.extra_path) == 1:
diff --git a/command/install_data.py b/command/install_data.py
index 1069830fb3..a95194426b 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -10,7 +10,6 @@
 __revision__ = "$Id$"
 
 import os
-from types import StringType
 from distutils.core import Command
 from distutils.util import change_root, convert_path
 
@@ -48,7 +47,7 @@ def finalize_options (self):
     def run (self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
-            if type(f) is StringType:
+            if isinstance(f, basestring):
                 # it's a simple file, so copy it
                 f = convert_path(f)
                 if self.warn_dir:
diff --git a/dir_util.py b/dir_util.py
index 398f242974..c6f014b260 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -31,7 +31,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     global _path_created
 
     # Detect a common bug -- name is None
-    if not isinstance(name, StringTypes):
+    if not isinstance(name, basestring):
         raise DistutilsInternalError, \
               "mkpath: 'name' must be a string (got %r)" % (name,)
 
diff --git a/dist.py b/dist.py
index 7ed1b5cf2c..89390fb2c5 100644
--- a/dist.py
+++ b/dist.py
@@ -598,13 +598,13 @@ def finalize_options (self):
 
         keywords = self.metadata.keywords
         if keywords is not None:
-            if type(keywords) is StringType:
+            if isinstance(keywords, basestring):
                 keywordlist = keywords.split(',')
                 self.metadata.keywords = [x.strip() for x in keywordlist]
 
         platforms = self.metadata.platforms
         if platforms is not None:
-            if type(platforms) is StringType:
+            if isinstance(platforms, basestring):
                 platformlist = platforms.split(',')
                 self.metadata.platforms = [x.strip() for x in platformlist]
 
@@ -906,7 +906,7 @@ def _set_command_options (self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                is_string = type(value) is StringType
+                is_string = isinstance(value, basestring)
                 if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
diff --git a/extension.py b/extension.py
index 0fcbcc141a..7fe846b8a8 100644
--- a/extension.py
+++ b/extension.py
@@ -103,9 +103,9 @@ def __init__ (self, name, sources,
                   language=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert type(name) is StringType, "'name' must be a string"
+        assert isinstance(name, basestring), "'name' must be a string"
         assert (type(sources) is ListType and
-                map(type, sources) == [StringType]*len(sources)), \
+                all(isinstance(v, basestring) for v in sources)), \
                 "'sources' must be a list of strings"
 
         self.name = name
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 317a3a4860..82e1f4d1dc 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -166,13 +166,13 @@ def _grok_option_table (self):
                 raise ValueError, "invalid option tuple: %r" % (option,)
 
             # Type- and value-check the option names
-            if type(long) is not StringType or len(long) < 2:
+            if not isinstance(long, basestring) or len(long) < 2:
                 raise DistutilsGetoptError, \
                       ("invalid long option '%s': "
                        "must be a string of length >= 2") % long
 
             if (not ((short is None) or
-                     (type(short) is StringType and len(short) == 1))):
+                     (isinstance(short, basestring) and len(short) == 1))):
                 raise DistutilsGetoptError, \
                       ("invalid short option '%s': "
                        "must a single character or None") % short
diff --git a/filelist.py b/filelist.py
index bc668cfad3..a0523531c7 100644
--- a/filelist.py
+++ b/filelist.py
@@ -333,7 +333,7 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
     or just returned as-is (assumes it's a regex object).
     """
     if is_regex:
-        if type(pattern) is StringType:
+        if isinstance(pattern, basestring):
             return re.compile(pattern)
         else:
             return pattern
diff --git a/unixccompiler.py b/unixccompiler.py
index 0795f1206d..a42ab5ed42 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -16,7 +16,7 @@
 __revision__ = "$Id$"
 
 import os, sys
-from types import StringType, NoneType
+from types import NoneType
 from copy import copy
 
 from distutils import sysconfig
@@ -212,7 +212,7 @@ def link(self, target_desc, objects,
 
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
-        if type(output_dir) not in (StringType, NoneType):
+        if not isinstance(output_dir, (basestring, NoneType)):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
             output_filename = os.path.join(output_dir, output_filename)

From 74aa5c74dd3dda2d8f3fef3c83107f3e006d724c Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 2 May 2007 19:09:54 +0000
Subject: [PATCH 1875/8469] Rip out all the u"..." literals and calls to
 unicode().

---
 command/bdist_wininst.py | 4 ++--
 command/build_clib.py    | 2 +-
 command/register.py      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 21465a82ff..5074a1a675 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -247,11 +247,11 @@ def create_exe (self, arcname, fullname, bitmap=None):
 
         # Convert cfgdata from unicode to ascii, mbcs encoded
         try:
-            unicode
+            str
         except NameError:
             pass
         else:
-            if isinstance(cfgdata, unicode):
+            if isinstance(cfgdata, str):
                 cfgdata = cfgdata.encode("mbcs")
 
         # Append the pre-install script
diff --git a/command/build_clib.py b/command/build_clib.py
index 5434e86c86..bdf98bf3f2 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -147,7 +147,7 @@ def check_library_list (self, libraries):
                 raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
-            if isinstance(lib[0], basestring) StringType:
+            if isinstance(lib[0], basestring):
                 raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
diff --git a/command/register.py b/command/register.py
index 33567981bb..2ddabadf88 100644
--- a/command/register.py
+++ b/command/register.py
@@ -259,7 +259,7 @@ def post_to_server(self, data, auth=None):
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                value = unicode(value).encode("utf-8")
+                value = str(value).encode("utf-8")
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")

From b6944798d4c6fe91c594c4e64ef13820f0c1b266 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 7 May 2007 22:24:25 +0000
Subject: [PATCH 1876/8469] Merged revisions 55007-55179 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
  r55077 | guido.van.rossum | 2007-05-02 11:54:37 -0700 (Wed, 02 May 2007) | 2 lines

  Use the new print syntax, at least.
........
  r55142 | fred.drake | 2007-05-04 21:27:30 -0700 (Fri, 04 May 2007) | 1 line

  remove old cruftiness
........
  r55143 | fred.drake | 2007-05-04 21:52:16 -0700 (Fri, 04 May 2007) | 1 line

  make this work with the new Python
........
  r55162 | neal.norwitz | 2007-05-06 22:29:18 -0700 (Sun, 06 May 2007) | 1 line

  Get asdl code gen working with Python 2.3.  Should continue to work with 3.0
........
  r55164 | neal.norwitz | 2007-05-07 00:00:38 -0700 (Mon, 07 May 2007) | 1 line

  Verify checkins to p3yk (sic) branch go to 3000 list.
........
  r55166 | neal.norwitz | 2007-05-07 00:12:35 -0700 (Mon, 07 May 2007) | 1 line

  Fix this test so it runs again by importing warnings_test properly.
........
  r55167 | neal.norwitz | 2007-05-07 01:03:22 -0700 (Mon, 07 May 2007) | 8 lines

  So long xrange.  range() now supports values that are outside
  -sys.maxint to sys.maxint.  floats raise a TypeError.

  This has been sitting for a long time.  It probably has some problems and
  needs cleanup.  Objects/rangeobject.c now uses 4-space indents since
  it is almost completely new.
........
  r55171 | guido.van.rossum | 2007-05-07 10:21:26 -0700 (Mon, 07 May 2007) | 4 lines

  Fix two tests that were previously depending on significant spaces
  at the end of a line (and before that on Python 2.x print behavior
  that has no exact equivalent in 3.0).
........
---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index cc92e96368..a6543ba6a2 100644
--- a/command/install.py
+++ b/command/install.py
@@ -517,7 +517,7 @@ def run (self):
             outputs = self.get_outputs()
             if self.root:               # strip any package prefix
                 root_len = len(self.root)
-                for counter in xrange(len(outputs)):
+                for counter in range(len(outputs)):
                     outputs[counter] = outputs[counter][root_len:]
             self.execute(write_file,
                          (self.record, outputs),

From 0a68cc8e653759fd3913f2bcbc85eeffbb02f194 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 22 May 2007 18:11:13 +0000
Subject: [PATCH 1877/8469] Merged revisions 55407-55513 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line

  fix argument name in documentation; match the implementation
................
  r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line

  Implements class decorators, PEP 3129.
................
  r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines

  obsubmit.
................
  r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines

  Fix bug in test_inspect.  (I presume this is how it should be fixed;
  Jack Diedrich, please verify.)
................
  r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines

  Remove the imageop module.  With imgfile already removed in Python 3.0 and
  rgbimg gone in Python 2.6 the unit tests themselves were made worthless.  Plus
  third-party libraries perform the same function much better.
................
  r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines

  Merged revisions 55324-55467 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines

    HTML-escape the plain traceback in cgitb's HTML output, to prevent
    the traceback inadvertently or maliciously closing the comment and
    injecting HTML into the error page.
  ........
    r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines

    Port rev 55353 from Guido:
    Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC()
    fails.

    Will backport.
  ........
    r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line

    Mention removal of some directories for obsolete platforms
  ........
    r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines

    Change the maintainer of the BeOS port.
  ........
    r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines

    Bug #1719995: don't use deprecated method in sets example.
  ........
    r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines

    Fix bug in marshal where bad data would cause a segfault due to
    lack of an infinite recursion check.

    Contributed by Damien Miller at Google.
  ........
    r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines

    Remove the gopherlib module.  It has been raising a DeprecationWarning since
    Python 2.5.

    Also remove gopher support from urllib/urllib2.  As both imported gopherlib the
    usage of the support would have raised a DeprecationWarning.
  ........
    r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line

    calendar.py gets no benefit from xrange() instead of range()
  ........
    r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines

    Complete deprecation of BaseException.message.  Some subclasses were directly
    accessing the message attribute instead of using the descriptor.
  ........
    r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines

    Reduce the max stack depth to see if this fixes the segfaults on
    Windows and some other boxes.  If this is successful, this rev should
    be backported.  I'm not sure how close to the limit we should push this.
  ........
    r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines

    Set the depth to something very small to try to determine if the
    crashes on Windows are really due to the stack size or possibly
    some other problem.
  ........
    r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines

    Last try for tweaking the max stack depth.  5000 was the original value,
    4000 didn't work either.  1000 does work on Windows.  If 2000 works,
    that will hopefully be a reasonable balance.
  ........
    r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line

    fix argument name in documentation; match the implementation
  ........
    r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line

    Verify neither dumps or loads overflow the stack and segfault.
  ........
    r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line

    Backport PEP 3110's new 'except' syntax to 2.6.
  ........
    r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line

    Improvements to NamedTuple's implementation, tests, and documentation
  ........
    r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line

    Fix beginner mistake -- don't mix spaces and tabs.
  ........
    r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line

    Clear data so random memory does not get freed.  Will backport.
  ........
    r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines

    Whoops, need to pay attention to those test failures.
    Move the clear to *before* the first use, not after.
  ........
    r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line

    Give some clue as to what happened if the test fails.
  ........
    r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines

    Fix docstring for add_package in site.py.
  ........
    r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines

    Remove the rgbimg module.  It has been deprecated since Python 2.5.
  ........
    r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line

    Fix typo in example (should be backported, but my maintenance branch is woefully out of date)
  ........
................
  r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines

  Remove imageop from the Windows build process.
................
  r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line

  Remove callable() builtin
................
  r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines

  Merged revisions 55468-55505 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line

    rotor is long gone.
  ........
    r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line

    Update directories/files at the top-level.
  ........
    r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines

    Try to remove rgbimg from Windows builds.
  ........
    r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines

    Remove the macfs module.  This led to the deprecation of macostools.touched();
    it completely relied on macfs and is a no-op on OS X according to code
    comments.
  ........
    r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines

    Move imgfile import to the global namespace to trigger an import error ASAP to
    prevent creation of a test file.
  ........
    r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines

    Cause posixfile to raise a DeprecationWarning.  Documented as deprecated since
    Ptyhon 1.5.
  ........
    r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line

    Note removed modules
  ........
    r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines

    Add Alexandre Vassalotti.
  ........
    r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines

    fix against r55474 [Remove the macfs module]

    Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex.
  ........
    r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line

    Replace assertion with straight error-checking.
  ........
    r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line

    Allow all alphanumeric and underscores in type and field names.
  ........
    r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines


    Added timeout support to HTTPSConnection, through the
    socket.create_connection function. Also added a small
    test for this, and updated NEWS file.
  ........
    r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines

    Patch #1686487: you can now pass any mapping after '**' in function calls.
  ........
    r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line

    Document new params to HTTPSConnection
  ........
    r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line

    Stop using METH_OLDARGS
  ........
    r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line

    Stop using METH_OLDARGS implicitly
  ........
................
---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 89390fb2c5..e89d942f15 100644
--- a/dist.py
+++ b/dist.py
@@ -569,7 +569,7 @@ def _parse_command_opts (self, parser, args):
                     #print "showing help for option %s of command %s" % \
                     #      (help_option[0],cmd_class)
 
-                    if callable(func):
+                    if hasattr(func, '__call__'):
                         func()
                     else:
                         raise DistutilsClassError(

From 846a6d17bc1356201efb984e23caafff578982f4 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 25 May 2007 18:39:29 +0000
Subject: [PATCH 1878/8469] Minimal fixes to save the bootstrap on OSX.

---
 sysconfig.py | 3 ++-
 text_file.py | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index ea2e059778..51f23a24a5 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -11,6 +11,7 @@
 
 __revision__ = "$Id$"
 
+import io
 import os
 import re
 import sys
@@ -353,7 +354,7 @@ def _init_posix():
     # load the installed pyconfig.h:
     try:
         filename = get_config_h_filename()
-        parse_config_h(open(filename), g)
+        parse_config_h(io.open(filename), g)
     except IOError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
diff --git a/text_file.py b/text_file.py
index c23a31dd9c..9d4d42b4c6 100644
--- a/text_file.py
+++ b/text_file.py
@@ -7,7 +7,7 @@
 __revision__ = "$Id$"
 
 from types import *
-import sys, os
+import sys, os, io
 
 
 class TextFile:
@@ -34,7 +34,7 @@ class TextFile:
        something that provides 'readline()' and 'close()' methods).  It is
        recommended that you supply at least 'filename', so that TextFile
        can include it in warning messages.  If 'file' is not supplied,
-       TextFile creates its own using the 'open()' builtin.
+       TextFile creates its own using 'io.open()'.
 
        The options are all boolean, and affect the value returned by
        'readline()':
@@ -118,7 +118,7 @@ def open (self, filename):
            'filename' and 'file' arguments to the constructor."""
 
         self.filename = filename
-        self.file = open (self.filename, 'r')
+        self.file = io.open (self.filename, 'r')
         self.current_line = 0
 
 

From 6d3419303b176f1986ec06a1421452f227a839c1 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 1 Jun 2007 07:29:12 +0000
Subject: [PATCH 1879/8469] SF 1668596/1720897: distutils now copies data files
 even if package_dir is empty.

This needs to be backported.  I'm too tired tonight.  It would be great
if someone backports this if the buildbots are ok with it.  Otherwise,
I will try to get to it tomorrow.
---
 command/build_py.py    |  4 +++-
 tests/test_build_py.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 621bcb4af3..b9f39bae79 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -114,7 +114,9 @@ def get_data_files (self):
             build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
             # Length of path to strip from found files
-            plen = len(src_dir)+1
+            plen = 0
+            if src_dir:
+                plen = len(src_dir)+1
 
             # Strip directory from globbed filenames
             filenames = [
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 78e4c55ed4..54a4ed80fd 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -1,10 +1,13 @@
 """Tests for distutils.command.build_py."""
 
 import os
+import sys
+import StringIO
 import unittest
 
 from distutils.command.build_py import build_py
 from distutils.core import Distribution
+from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
 
@@ -53,6 +56,38 @@ def test_package_data(self):
         self.assert_("__init__.pyc" in files)
         self.assert_("README.txt" in files)
 
+    def test_empty_package_dir (self):
+        # See SF 1668596/1720897.
+        cwd = os.getcwd()
+
+        # create the distribution files.
+        sources = self.mkdtemp()
+        open(os.path.join(sources, "__init__.py"), "w").close()
+
+        testdir = os.path.join(sources, "doc")
+        os.mkdir(testdir)
+        open(os.path.join(testdir, "testfile"), "w").close()
+
+        os.chdir(sources)
+        sys.stdout = StringIO.StringIO()
+
+        try:
+            dist = Distribution({"packages": ["pkg"],
+                                 "package_dir": {"pkg": ""},
+                                 "package_data": {"pkg": ["doc/*"]}})
+            # script_name need not exist, it just need to be initialized
+            dist.script_name = os.path.join(sources, "setup.py")
+            dist.script_args = ["build"]
+            dist.parse_command_line()
+
+            try:
+                dist.run_commands()
+            except DistutilsFileError:
+                self.fail("failed package_data test when package_dir is ''")
+        finally:
+            # Restore state.
+            os.chdir(cwd)
+            sys.stdout = sys.__stdout__
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From 4951f23221c37e1b9a5b595397529ec8c301f705 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 2 Jun 2007 18:53:07 +0000
Subject: [PATCH 1880/8469] Backport 55731: SF 1668596/1720897: distutils now
 copies data files even if package_dir is empty.

---
 command/build_py.py    |  4 +++-
 tests/test_build_py.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 621bcb4af3..b9f39bae79 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -114,7 +114,9 @@ def get_data_files (self):
             build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
             # Length of path to strip from found files
-            plen = len(src_dir)+1
+            plen = 0
+            if src_dir:
+                plen = len(src_dir)+1
 
             # Strip directory from globbed filenames
             filenames = [
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 78e4c55ed4..54a4ed80fd 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -1,10 +1,13 @@
 """Tests for distutils.command.build_py."""
 
 import os
+import sys
+import StringIO
 import unittest
 
 from distutils.command.build_py import build_py
 from distutils.core import Distribution
+from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
 
@@ -53,6 +56,38 @@ def test_package_data(self):
         self.assert_("__init__.pyc" in files)
         self.assert_("README.txt" in files)
 
+    def test_empty_package_dir (self):
+        # See SF 1668596/1720897.
+        cwd = os.getcwd()
+
+        # create the distribution files.
+        sources = self.mkdtemp()
+        open(os.path.join(sources, "__init__.py"), "w").close()
+
+        testdir = os.path.join(sources, "doc")
+        os.mkdir(testdir)
+        open(os.path.join(testdir, "testfile"), "w").close()
+
+        os.chdir(sources)
+        sys.stdout = StringIO.StringIO()
+
+        try:
+            dist = Distribution({"packages": ["pkg"],
+                                 "package_dir": {"pkg": ""},
+                                 "package_data": {"pkg": ["doc/*"]}})
+            # script_name need not exist, it just need to be initialized
+            dist.script_name = os.path.join(sources, "setup.py")
+            dist.script_args = ["build"]
+            dist.parse_command_line()
+
+            try:
+                dist.run_commands()
+            except DistutilsFileError:
+                self.fail("failed package_data test when package_dir is ''")
+        finally:
+            # Restore state.
+            os.chdir(cwd)
+            sys.stdout = sys.__stdout__
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From b56a8f9ed0bfc43878362c0d08e7292b146f9b81 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 7 Jun 2007 23:15:56 +0000
Subject: [PATCH 1881/8469] Merged revisions 55795-55816 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
  r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines

  Get rid of some remnants of classic classes.  types.ClassType == type.
  Also get rid of almost all uses of the types module and use the builtin name.
........
  r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line

  Remove a use of types, verify commit hook works
........
  r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines

  Fix syntax error introduced by Neal in last checkin.
........
---
 cmd.py           |  5 ++---
 dist.py          | 11 +++++------
 extension.py     |  3 +--
 text_file.py     |  7 +++----
 unixccompiler.py |  3 +--
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cmd.py b/cmd.py
index ea3799af16..8d77e7fb2b 100644
--- a/cmd.py
+++ b/cmd.py
@@ -9,7 +9,6 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from types import *
 from distutils.errors import *
 from distutils import util, dir_util, file_util, archive_util, dep_util
 from distutils import log
@@ -245,7 +244,7 @@ def ensure_string_list (self, option):
         elif isinstance(val, basestring):
             setattr(self, option, re.split(r',\s*|\s+', val))
         else:
-            if type(val) is ListType:
+            if isinstance(val, list):
                 ok = all(isinstance(v, basestring) for v in val)
             else:
                 ok = 0
@@ -422,7 +421,7 @@ def make_file (self, infiles, outfile, func, args,
         # Allow 'infiles' to be a single string
         if isinstance(infiles, basestring):
             infiles = (infiles,)
-        elif type(infiles) not in (ListType, TupleType):
+        elif not isinstance(infiles, (list, tuple)):
             raise TypeError, \
                   "'infiles' must be a string, or a list or tuple of strings"
 
diff --git a/dist.py b/dist.py
index e89d942f15..c01724d83a 100644
--- a/dist.py
+++ b/dist.py
@@ -9,7 +9,6 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from types import *
 from copy import copy
 
 try:
@@ -527,7 +526,7 @@ def _parse_command_opts (self, parser, args):
         # Also make sure that the command object provides a list of its
         # known options.
         if not (hasattr(cmd_class, 'user_options') and
-                type(cmd_class.user_options) is ListType):
+                isinstance(cmd_class.user_options, list)):
             raise DistutilsClassError, \
                   ("command class %s must provide " +
                    "'user_options' attribute (a list of tuples)") % \
@@ -543,7 +542,7 @@ def _parse_command_opts (self, parser, args):
         # Check for help_options in command class.  They have a different
         # format (tuple of four) so we need to preprocess them here.
         if (hasattr(cmd_class, 'help_options') and
-            type(cmd_class.help_options) is ListType):
+            isinstance(cmd_class.help_options, list)):
             help_options = fix_help_options(cmd_class.help_options)
         else:
             help_options = []
@@ -561,7 +560,7 @@ def _parse_command_opts (self, parser, args):
             return
 
         if (hasattr(cmd_class, 'help_options') and
-            type(cmd_class.help_options) is ListType):
+            isinstance(cmd_class.help_options, list)):
             help_option_found=0
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
@@ -646,12 +645,12 @@ def _show_help (self,
             print()
 
         for command in self.commands:
-            if type(command) is ClassType and issubclass(command, Command):
+            if isinstance(command, type) and issubclass(command, Command):
                 klass = command
             else:
                 klass = self.get_command_class(command)
             if (hasattr(klass, 'help_options') and
-                type(klass.help_options) is ListType):
+                isinstance(klass.help_options, list)):
                 parser.set_option_table(klass.user_options +
                                         fix_help_options(klass.help_options))
             else:
diff --git a/extension.py b/extension.py
index 7fe846b8a8..43b0d3fd00 100644
--- a/extension.py
+++ b/extension.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import os, sys
-from types import *
 
 try:
     import warnings
@@ -104,7 +103,7 @@ def __init__ (self, name, sources,
                   **kw                      # To catch unknown keywords
                  ):
         assert isinstance(name, basestring), "'name' must be a string"
-        assert (type(sources) is ListType and
+        assert (isinstance(sources, list) and
                 all(isinstance(v, basestring) for v in sources)), \
                 "'sources' must be a list of strings"
 
diff --git a/text_file.py b/text_file.py
index 9d4d42b4c6..3f6a220dcc 100644
--- a/text_file.py
+++ b/text_file.py
@@ -6,7 +6,6 @@
 
 __revision__ = "$Id$"
 
-from types import *
 import sys, os, io
 
 
@@ -137,7 +136,7 @@ def gen_error (self, msg, line=None):
         if line is None:
             line = self.current_line
         outmsg.append(self.filename + ", ")
-        if type (line) in (ListType, TupleType):
+        if isinstance (line, (list, tuple)):
             outmsg.append("lines %d-%d: " % tuple (line))
         else:
             outmsg.append("line %d: " % line)
@@ -239,7 +238,7 @@ def readline (self):
                 line = buildup_line + line
 
                 # careful: pay attention to line number when incrementing it
-                if type (self.current_line) is ListType:
+                if isinstance (self.current_line, list):
                     self.current_line[1] = self.current_line[1] + 1
                 else:
                     self.current_line = [self.current_line,
@@ -250,7 +249,7 @@ def readline (self):
                     return None
 
                 # still have to be careful about incrementing the line number!
-                if type (self.current_line) is ListType:
+                if isinstance (self.current_line, list):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
diff --git a/unixccompiler.py b/unixccompiler.py
index a42ab5ed42..d07ae1e358 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -16,7 +16,6 @@
 __revision__ = "$Id$"
 
 import os, sys
-from types import NoneType
 from copy import copy
 
 from distutils import sysconfig
@@ -212,7 +211,7 @@ def link(self, target_desc, objects,
 
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
-        if not isinstance(output_dir, (basestring, NoneType)):
+        if not isinstance(output_dir, (basestring, type(None))):
             raise TypeError, "'output_dir' must be a string or None"
         if output_dir is not None:
             output_filename = os.path.join(output_dir, output_filename)

From d9a8d08e4670a883b259554331b4372e8ae18f12 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 11 Jun 2007 05:28:45 +0000
Subject: [PATCH 1882/8469] Add all of the distuils modules that don't seem to
 have explicit tests. :-( Move an import in mworkscompiler so that this module
 can be imported on any platform.  Hopefully this works on all platforms.

---
 mwerkscompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 0de123d9e9..343c6cecae 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -18,7 +18,6 @@
 import distutils.util
 import distutils.dir_util
 from distutils import log
-import mkcwproject
 
 class MWerksCompiler (CCompiler) :
     """Concrete class that implements an interface to MetroWerks CodeWarrior,
@@ -188,6 +187,7 @@ def link (self,
         # doesn't have a clue about our working directory.
         xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
         log.debug("\tCreate XML file %s", xmlfilename)
+        import mkcwproject
         xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
         xmlbuilder.generate()
         xmldata = settings['tmp_projectxmldata']

From 8d56e63638d9152547d8b6f8a4cbdba90cf91a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Mon, 11 Jun 2007 21:38:39 +0000
Subject: [PATCH 1883/8469] Simplify various spots where: str() is called on
 something that already is a string or the existence of the str class is
 checked or a check is done for str twice. These all stem from the initial
 unicode->str replacement.

---
 command/bdist_wininst.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 5074a1a675..55d5d7e1b1 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -246,13 +246,8 @@ def create_exe (self, arcname, fullname, bitmap=None):
             file.write(bitmapdata)
 
         # Convert cfgdata from unicode to ascii, mbcs encoded
-        try:
-            str
-        except NameError:
-            pass
-        else:
-            if isinstance(cfgdata, str):
-                cfgdata = cfgdata.encode("mbcs")
+        if isinstance(cfgdata, str):
+            cfgdata = cfgdata.encode("mbcs")
 
         # Append the pre-install script
         cfgdata = cfgdata + "\0"

From 4beaf762f12da3cb21e32d646c5f01c8bdb7e9ca Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 13 Jun 2007 18:07:49 +0000
Subject: [PATCH 1884/8469] Merged revisions 55817-55961 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines

  PEP 3119 -- the abc module.
................
  r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines

  Implement part of PEP 3119 -- One Trick Ponies.
................
  r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines

  Different way to do one trick ponies, allowing registration (per PEP strawman).
................
  r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines

  Make sure that the magic looking for __hash__ (etc.) doesn't apply to
  real subclasses of Hashable.
................
  r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines

  Add some more examples, e.g. generators and dict views.
................
  r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines

  keys() and items() *are* containers -- just values() isn't.
................
  r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines

  PEP 3127: new octal literals, binary literals.
................
  r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines

  Some octal literal fixes in Tools.
................
  r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines

  Tokenizer changes for PEP 3127.
................
  r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines

  Some docs for PEP 3127.
................
  r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines

  Missed a place in intobject.c. Is that used anymore anyway?
................
  r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines

  Merged revisions 55729-55868 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines

    SF 1668596/1720897: distutils now copies data files
    even if package_dir is empty.

    This needs to be backported.  I'm too tired tonight.  It would be great
    if someone backports this if the buildbots are ok with it.  Otherwise,
    I will try to get to it tomorrow.
  ........
    r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines

    Bug #1722484: remove docstrings again when running with -OO.
  ........
    r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines

    Fix wrong issue number.
  ........
    r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines

    Have configure raise an error when building on AtheOS.  Code specific to AtheOS
    will be removed in Python 2.7.
  ........
    r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line

    Update expected birthday of 2.6
  ........
    r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines

    Backout the original 'fix' to 1721309 which had no effect.
    Different versions of Berkeley DB handle this differently.
    The comments and bug report should have the details.  Memory is allocated
    in 4.4 (and presumably earlier), but not in 4.5.  Thus
    4.5 has the free error, but not earlier versions.

    Mostly update comments, plus make the free conditional.

    This fix was already applied to the 2.5 branch.
  ........
    r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines

    Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
    of ``\s*``.  This prevents patterns from "stealing" bits from other patterns in
    order to make a match work.

    Closes bug #1730389.  Will be backported.
  ........
    r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines

    Fix build on FreeBSD.  Bluetooth HCI API in FreeBSD is quite different
    from Linux's.  Just fix the build for now but the code doesn't
    support the complete capability of HCI on FreeBSD yet.
  ........
    r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines

    Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
    reads a file that ends with incomplete sequence and sizehint argument
    for .read() is specified.
  ........
    r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines

    Fix for Windows: close a temporary file before trying to delete it.
  ........
    r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines

    Patch by Tim Delany (missing DECREF). SF #1731330.
  ........
    r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines

    Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
  ........
    r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines


    FTP.ntransfercmd method now uses create_connection when passive,
    using the timeout received in connection time.
  ........
    r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines


    Added an optional timeout parameter to function urllib2.urlopen,
    with tests in test_urllib2net.py (must have network resource
    enabled to execute them). Also modified test_urllib2.py because
    testing mock classes must take it into acount. Docs are also
    updated.
  ........
    r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line

    Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
  ........
    r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines

    Disallow function calls like foo(None=1).
    Backport from py3k rev. 55708 by Guido.
  ........
    r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines

    Make reindent.py executable.
  ........
    r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines

    Patch #1667860: Fix UnboundLocalError in urllib2.
  ........
    r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line

    Fixing changes to getbuildinfo.c that broke linux builds
  ........
    r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line

    Make this test work with older Python releases where struct has no 't' format character.
  ........
    r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines

    Bug #1733488: Fix compilation of bufferobject.c on AIX.
    Will backport to 2.5.
  ........
    r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines

    [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
    with small modifications.
  ........
    r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line

    Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
  ........
    r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines

    Fix wrong documentation, and correct the punktuation.
    Closes [1700455].
  ........
    r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line

    Fix warnings by using proper function prototype.
  ........
    r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines

    Prevent expandtabs() on string and unicode objects from causing a segfault when
    a large width is passed on 32-bit platforms.  Found by Google.

    It would be good for people to review this especially carefully and verify
    I don't have an off by one error and there is no other way to cause overflow.
  ........
    r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line

    Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
  ........
    r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines

    Patch #1733960: Allow T_LONGLONG to accept ints.
    Will backport to 2.5.
  ........
    r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines

    Fix Windows build.
  ........
    r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines

    Provide LLONG_MAX for S390.
  ........
    r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines


    First version of build scripts for Windows/AMD64 (no external
    components are built yet, and 'kill_python' is disabled).
  ........
    r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines

    For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
    modules in the ReleaseAMD64 configuration because they do not compile.
  ........
    r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line

    Need to set the environment variables, otherwise devenv.com is not found.
  ........
    r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line

    Revert commit 55855.
  ........
................
  r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines

  Fix the refleak counter on test_collections.  The ABC metaclass creates
  a registry which must be cleared on each run.  Otherwise, there *seem*
  to be refleaks when there really aren't any.  (The class is held within
  the registry even though it's no longer needed.)
................
  r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line

  These tests have been removed, so they are no longer needed here
................
  r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines

  Optimize access to True and False in the compiler (if True)
  and the peepholer (LOAD_NAME True).
................
  r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines

  Remove __oct__ and __hex__ and use __index__ for converting
  non-ints before formatting in a base.

  Add a bin() builtin.
................
  r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines

  int(x, 0) does not "guess".
................
  r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines

  Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
  r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines

  Get rid of unused imports and comment.
................
  r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines

  _Abstract.__new__ now requires either no arguments or __init__ overridden.
................
  r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines

  Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
  needing to import _collections.so during the bootstrap (this will become
  apparent in the next submit of os.py).

  Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
  r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines

  Rewrite the _Environ class to use the new collections ABCs.
................
  r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines

  Merged revisions 55869-55912 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line

    Add Atul Varma for patch # 1667860
  ........
    r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line

    Ignore valgrind problems on Ubuntu from ld
  ........
    r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines

    Ignore config.status.lineno which seems new (new autoconf?)
  ........
    r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line

    Prevent these tests from running on Win64 since they don\'t apply there either
  ........
    r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines

    Fix a bug when there was a newline in the string expandtabs was called on.
    This also catches another condition that can overflow.

    Will backport.
  ........
    r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line

    Prevent hang if the port cannot be opened.
  ........
    r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines

    Add all of the distuils modules that don't seem to have explicit tests. :-(
    Move an import in mworkscompiler so that this module can be imported on
    any platform.  Hopefully this works on all platforms.
  ........
    r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines

    SF #1734732, lower case the module names per PEP 8.

    Will backport.
  ........
    r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines

    Not sure why this only fails sometimes on Unix machines. Better
    to disable it and only import msvccompiler on Windows since that's
    the only place it can work anyways.
  ........
    r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines

    Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.

    Will backport
  ........
    r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line

    Reflow long line
  ........
    r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines

    Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
    or "K" codes.
  ........
    r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines


    Added versionchanged flag to all the methods which received
    a new optional timeout parameter, and a versionadded flag to
    the socket.create_connection function.
  ........
................
  r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines

  New super() implementation, for PEP 3135 (though the PEP is not yet updated
  to this design, and small tweaks may still be made later).
................
  r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines

  I'm guessing this module broke when Neal ripped out the types module --
  it used 'list' both as a local variable and as the built-in list type.
  Renamed the local variable since that was easier.
................
  r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines

  Change all occurrences of super(<thisclass>, <firstarg>) to super().
  Seems to have worked, all the tests still pass.
  Exception: test_descr and test_descrtut, which have tons of these
  and are there to test the various usages.
................
  r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line

  Patch #1735485: remove StandardError from the exception hierarchy.
................
  r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines

  Merged revisions 55913-55950 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines

    Apply patch #1734945 to support TurboLinux as distribution.
  ........
    r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines

    Add patch #1726668: Windows Vista support.
  ........
    r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line

    Checkout, but do not yet try to build, exernal sources.
  ........
    r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines

    Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
    right thing to do?).

    Set the /XP64 /RETAIL build enviroment in the makefile when building
    ReleaseAMD64.
  ........
    r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines

    Revert this change, since it breaks the win32 build:

    Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
    right thing to do?).
  ........
    r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines

    Specify the bufferoverflowU.lib to the makefile on the command line
    (for ReleaseAMD64 builds).
  ........
    r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines

    Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
    Build sqlite3.dll and bsddb.
  ........
    r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines

    Don't rebuild Berkeley DB if not needed (this was committed by accident).
  ........
    r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines

    Provide PY_LLONG_MAX on all systems having long long.
    Will backport to 2.5.
  ........
................
  r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines

  Fix a compilation warning.
................
---
 ccompiler.py               |  2 +-
 cmd.py                     |  2 +-
 command/build_py.py        |  4 +++-
 command/build_scripts.py   |  4 ++--
 command/install_scripts.py |  2 +-
 command/register.py        |  2 +-
 dir_util.py                |  4 ++--
 mwerkscompiler.py          |  2 +-
 tests/support.py           |  8 ++++----
 tests/test_build_py.py     | 35 +++++++++++++++++++++++++++++++++++
 10 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 50905c1d44..d4f4adea19 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1040,7 +1040,7 @@ def spawn (self, cmd):
     def move_file (self, src, dst):
         return move_file (src, dst, dry_run=self.dry_run)
 
-    def mkpath (self, name, mode=0777):
+    def mkpath (self, name, mode=0o777):
         mkpath (name, mode, self.dry_run)
 
 
diff --git a/cmd.py b/cmd.py
index 8d77e7fb2b..b2c952c38c 100644
--- a/cmd.py
+++ b/cmd.py
@@ -356,7 +356,7 @@ def execute (self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
 
 
-    def mkpath (self, name, mode=0777):
+    def mkpath (self, name, mode=0o777):
         dir_util.mkpath(name, mode, dry_run=self.dry_run)
 
 
diff --git a/command/build_py.py b/command/build_py.py
index 52534bdb47..8f5609084c 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -114,7 +114,9 @@ def get_data_files (self):
             build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
             # Length of path to strip from found files
-            plen = len(src_dir)+1
+            plen = 0
+            if src_dir:
+                plen = len(src_dir)+1
 
             # Strip directory from globbed filenames
             filenames = [
diff --git a/command/build_scripts.py b/command/build_scripts.py
index bda4480ca5..511b82f999 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -119,8 +119,8 @@ def copy_scripts (self):
                 if self.dry_run:
                     log.info("changing mode of %s", file)
                 else:
-                    oldmode = os.stat(file)[ST_MODE] & 07777
-                    newmode = (oldmode | 0555) & 07777
+                    oldmode = os.stat(file)[ST_MODE] & 0o7777
+                    newmode = (oldmode | 0o555) & 0o7777
                     if newmode != oldmode:
                         log.info("changing mode of %s from %o to %o",
                                  file, oldmode, newmode)
diff --git a/command/install_scripts.py b/command/install_scripts.py
index fe93ef5af2..da2da358ba 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -53,7 +53,7 @@ def run (self):
                 if self.dry_run:
                     log.info("changing mode of %s", file)
                 else:
-                    mode = ((os.stat(file)[ST_MODE]) | 0555) & 07777
+                    mode = ((os.stat(file)[ST_MODE]) | 0o555) & 0o7777
                     log.info("changing mode of %s to %o", file, mode)
                     os.chmod(file, mode)
 
diff --git a/command/register.py b/command/register.py
index 2ddabadf88..53f4293e17 100644
--- a/command/register.py
+++ b/command/register.py
@@ -183,7 +183,7 @@ def send_metadata(self):
                         username, password))
                     f.close()
                     try:
-                        os.chmod(rc, 0600)
+                        os.chmod(rc, 0o600)
                     except:
                         pass
         elif choice == '2':
diff --git a/dir_util.py b/dir_util.py
index c6f014b260..0cfca2e8ff 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -18,7 +18,7 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0777, verbose=0, dry_run=0):
+def mkpath (name, mode=0o777, verbose=0, dry_run=0):
     """Create a directory and any missing ancestor directories.  If the
        directory already exists (or if 'name' is the empty string, which
        means the current directory, which of course exists), then do
@@ -85,7 +85,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 # mkpath ()
 
 
-def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
+def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
 
     """Create all the empty directories under 'base_dir' needed to
        put 'files' there.  'base_dir' is just the a name of a directory
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 028ea8250d..662046ae22 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -18,7 +18,6 @@
 import distutils.util
 import distutils.dir_util
 from distutils import log
-import mkcwproject
 
 class MWerksCompiler (CCompiler) :
     """Concrete class that implements an interface to MetroWerks CodeWarrior,
@@ -188,6 +187,7 @@ def link (self,
         # doesn't have a clue about our working directory.
         xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
         log.debug("\tCreate XML file %s", xmlfilename)
+        import mkcwproject
         xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
         xmlbuilder.generate()
         xmldata = settings['tmp_projectxmldata']
diff --git a/tests/support.py b/tests/support.py
index 475ceee598..91e704cfcc 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -9,12 +9,12 @@
 class LoggingSilencer(object):
 
     def setUp(self):
-        super(LoggingSilencer, self).setUp()
+        super().setUp()
         self.threshold = log.set_threshold(log.FATAL)
 
     def tearDown(self):
         log.set_threshold(self.threshold)
-        super(LoggingSilencer, self).tearDown()
+        super().tearDown()
 
 
 class TempdirManager(object):
@@ -24,11 +24,11 @@ class TempdirManager(object):
     """
 
     def setUp(self):
-        super(TempdirManager, self).setUp()
+        super().setUp()
         self.tempdirs = []
 
     def tearDown(self):
-        super(TempdirManager, self).tearDown()
+        super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
             shutil.rmtree(d)
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 78e4c55ed4..54a4ed80fd 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -1,10 +1,13 @@
 """Tests for distutils.command.build_py."""
 
 import os
+import sys
+import StringIO
 import unittest
 
 from distutils.command.build_py import build_py
 from distutils.core import Distribution
+from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
 
@@ -53,6 +56,38 @@ def test_package_data(self):
         self.assert_("__init__.pyc" in files)
         self.assert_("README.txt" in files)
 
+    def test_empty_package_dir (self):
+        # See SF 1668596/1720897.
+        cwd = os.getcwd()
+
+        # create the distribution files.
+        sources = self.mkdtemp()
+        open(os.path.join(sources, "__init__.py"), "w").close()
+
+        testdir = os.path.join(sources, "doc")
+        os.mkdir(testdir)
+        open(os.path.join(testdir, "testfile"), "w").close()
+
+        os.chdir(sources)
+        sys.stdout = StringIO.StringIO()
+
+        try:
+            dist = Distribution({"packages": ["pkg"],
+                                 "package_dir": {"pkg": ""},
+                                 "package_data": {"pkg": ["doc/*"]}})
+            # script_name need not exist, it just need to be initialized
+            dist.script_name = os.path.join(sources, "setup.py")
+            dist.script_args = ["build"]
+            dist.parse_command_line()
+
+            try:
+                dist.run_commands()
+            except DistutilsFileError:
+                self.fail("failed package_data test when package_dir is ''")
+        finally:
+            # Restore state.
+            os.chdir(cwd)
+            sys.stdout = sys.__stdout__
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From a16a76a14958dc71e70971b0fc346e34491f734e Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sat, 30 Jun 2007 05:01:58 +0000
Subject: [PATCH 1885/8469] Merged revisions 56020-56124 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r56037 | georg.brandl | 2007-06-19 05:33:20 -0700 (Tue, 19 Jun 2007) | 2 lines

  Patch #1739659: don't slice dict.keys() in pydoc.
................
  r56060 | martin.v.loewis | 2007-06-21 13:00:02 -0700 (Thu, 21 Jun 2007) | 2 lines

  Regenerate to add True, False, None.
................
  r56069 | neal.norwitz | 2007-06-21 22:31:56 -0700 (Thu, 21 Jun 2007) | 1 line

  Get the doctest working again after adding None, True, and False as kewyords.
................
  r56070 | neal.norwitz | 2007-06-21 23:25:33 -0700 (Thu, 21 Jun 2007) | 1 line

  Add space to error message.
................
  r56071 | neal.norwitz | 2007-06-21 23:40:04 -0700 (Thu, 21 Jun 2007) | 6 lines

  Get pybench working, primarily
   * Use print function
   * Stop using string module
   * Use sorted instead of assuming dict methods return lists
   * Convert range result to a list
................
  r56089 | collin.winter | 2007-06-26 10:31:48 -0700 (Tue, 26 Jun 2007) | 1 line

  Fix AttributeError in distutils/dir_util.py.
................
  r56124 | guido.van.rossum | 2007-06-29 18:04:31 -0700 (Fri, 29 Jun 2007) | 30 lines

  Merged revisions 56014-56123 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r56019 | lars.gustaebel | 2007-06-18 04:42:11 -0700 (Mon, 18 Jun 2007) | 2 lines

    Added exclude keyword argument to the TarFile.add() method.
  ........
    r56023 | lars.gustaebel | 2007-06-18 13:05:55 -0700 (Mon, 18 Jun 2007) | 3 lines

    Added missing \versionchanged tag for the new exclude
    parameter.
  ........
    r56038 | georg.brandl | 2007-06-19 05:36:00 -0700 (Tue, 19 Jun 2007) | 2 lines

    Bug #1737864: allow empty message in logging format routines.
  ........
    r56040 | georg.brandl | 2007-06-19 05:38:20 -0700 (Tue, 19 Jun 2007) | 2 lines

    Bug #1739115: make shutil.rmtree docs clear wrt. file deletion.
  ........
    r56084 | georg.brandl | 2007-06-25 08:21:23 -0700 (Mon, 25 Jun 2007) | 2 lines

    Bug #1742901: document None behavior of shlex.split.
  ........
    r56091 | georg.brandl | 2007-06-27 07:09:56 -0700 (Wed, 27 Jun 2007) | 2 lines

    Fix a variable name in winreg docs.
  ........
................
---
 dir_util.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 0cfca2e8ff..a6c4416a6f 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -96,14 +96,12 @@ def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
        for 'mkpath()'."""
 
     # First get the list of directories to create
-    need_dir = {}
+    need_dir = set()
     for file in files:
-        need_dir[os.path.join(base_dir, os.path.dirname(file))] = 1
-    need_dirs = need_dir.keys()
-    need_dirs.sort()
+        need_dir.add(os.path.join(base_dir, os.path.dirname(file)))
 
     # Now create them
-    for dir in need_dirs:
+    for dir in sorted(need_dir):
         mkpath(dir, mode, dry_run=dry_run)
 
 # create_tree ()

From 3abb62b2c71e85682cb45612ce358f174a71b545 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 3 Jul 2007 08:25:58 +0000
Subject: [PATCH 1886/8469] Merged revisions 56125-56153 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

........
  r56127 | georg.brandl | 2007-06-30 09:32:49 +0200 (Sat, 30 Jun 2007) | 2 lines

  Fix a place where floor division would be in order.
........
  r56135 | guido.van.rossum | 2007-07-01 06:13:54 +0200 (Sun, 01 Jul 2007) | 28 lines

  Make map() and filter() identical to itertools.imap() and .ifilter(),
  respectively.

  I fixed two bootstrap issues, due to the dynamic import of itertools:

  1. Starting python requires that map() and filter() are not used until
     site.py has added build/lib.<arch> to sys.path.
  2. Building python requires that setup.py and distutils and everything
     they use is free of map() and filter() calls.

  Beyond this, I only fixed the tests in test_builtin.py.
  Others, please help fixing the remaining tests that are now broken!
  The fixes are usually simple:
  a. map(None, X) -> list(X)
  b. map(F, X) -> list(map(F, X))
  c. map(lambda x: F(x), X) -> [F(x) for x in X]
  d. filter(F, X) -> list(filter(F, X))
  e. filter(lambda x: P(x), X) -> [x for x in X if P(x)]

  Someone, please also contribute a fixer for 2to3 to do this.
  It can leave map()/filter() calls alone that are already
  inside a list() or sorted() call or for-loop.

  Only in rare cases have I seen code that depends on map() of lists
  of different lengths going to the end of the longest, or on filter()
  of a string or tuple returning an object of the same type; these
  will need more thought to fix.
........
  r56136 | guido.van.rossum | 2007-07-01 06:22:01 +0200 (Sun, 01 Jul 2007) | 3 lines

  Make it so that test_decimal fails instead of hangs, to help automated
  test runners.
........
  r56139 | georg.brandl | 2007-07-01 18:20:58 +0200 (Sun, 01 Jul 2007) | 2 lines

  Fix a few test cases after the map->imap change.
........
  r56142 | neal.norwitz | 2007-07-02 06:38:12 +0200 (Mon, 02 Jul 2007) | 1 line

  Get a bunch more tests passing after converting map/filter to return iterators.
........
  r56147 | guido.van.rossum | 2007-07-02 15:32:02 +0200 (Mon, 02 Jul 2007) | 4 lines

  Fix the remaining failing unit tests (at least on OSX).
  Also tweaked urllib2 so it doesn't raise socket.gaierror when
  all network interfaces are turned off.
........
---
 dist.py      | 5 ++---
 sysconfig.py | 2 +-
 version.py   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dist.py b/dist.py
index c01724d83a..8f614765ef 100644
--- a/dist.py
+++ b/dist.py
@@ -112,8 +112,7 @@ class Distribution:
         ('obsoletes', None,
          "print the list of packages/modules made obsolete")
         ]
-    display_option_names = map(lambda x: translate_longopt(x[0]),
-                               display_options)
+    display_option_names = [translate_longopt(x[0]) for x in display_options]
 
     # negative options are options that exclude other options
     negative_opt = {'quiet': 'verbose'}
@@ -805,7 +804,7 @@ def get_command_packages (self):
             pkgs = (pkgs or "").split(",")
             for i in range(len(pkgs)):
                 pkgs[i] = pkgs[i].strip()
-            pkgs = filter(None, pkgs)
+            pkgs = [p for p in pkgs if p]
             if "distutils.command" not in pkgs:
                 pkgs.insert(0, "distutils.command")
             self.command_packages = pkgs
diff --git a/sysconfig.py b/sysconfig.py
index 51f23a24a5..346707fa90 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -372,7 +372,7 @@ def _init_posix():
         if cur_target == '':
             cur_target = cfg_target
             os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
-        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
+        elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]:
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
             raise DistutilsPlatformError(my_msg)
diff --git a/version.py b/version.py
index 2db6b18f1e..de20e21f70 100644
--- a/version.py
+++ b/version.py
@@ -148,7 +148,7 @@ def parse (self, vstring):
         if patch:
             self.version = tuple(map(int, [major, minor, patch]))
         else:
-            self.version = tuple(map(int, [major, minor]) + [0])
+            self.version = tuple(map(int, [major, minor])) + (0,)
 
         if prerelease:
             self.prerelease = (prerelease[0], int(prerelease_num))

From 8f2fa921c711ac7d3ff775023a9e85061fddd202 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 16 Jul 2007 23:10:57 +0000
Subject: [PATCH 1887/8469] Change a bunch of file encodings from Latin-1 to
 UTF-8. Remove the encoding from Tix.py (it doesn't seem to need one). Note:
 we still have to keep the "coding: utf-8" declaration for files that aren't
 pure ASCII, as the default per PEP 3120 hasn't been implemented yet.

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

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f31bdedac6..012d06ea69 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005, 2006 Martin v. Löwis
+# -*- coding: utf-8 -*-
+# Copyright (C) 2005, 2006 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst

From 804a12d456aa7253cd54ce0e183277f4459f7d7d Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Tue, 17 Jul 2007 00:38:21 +0000
Subject: [PATCH 1888/8469] Fix a bug in distutils.core's error handling.

---
 core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index 6242775c11..bd9b8542cd 100644
--- a/core.py
+++ b/core.py
@@ -112,10 +112,10 @@ class found in 'cmdclass' is used in place of the default, which is
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError as msg:
         if 'name' not in attrs:
+            raise SystemExit, "error in setup command: %s" % msg
+        else:
             raise SystemExit, "error in %s setup command: %s" % \
                   (attrs['name'], msg)
-        else:
-            raise SystemExit, "error in setup command: %s" % msg
 
     if _setup_stop_after == "init":
         return dist

From 555f239ef6a7c03122bb5b73a3b229fd08634adc Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Tue, 17 Jul 2007 00:39:32 +0000
Subject: [PATCH 1889/8469] Fix two bugs from the map->itertools.imap switch.

---
 filelist.py | 3 +--
 version.py  | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/filelist.py b/filelist.py
index a0523531c7..cc48e48e58 100644
--- a/filelist.py
+++ b/filelist.py
@@ -65,8 +65,7 @@ def extend (self, items):
 
     def sort (self):
         # Not a strict lexical sort!
-        sortable_files = map(os.path.split, self.files)
-        sortable_files.sort()
+        sortable_files = sorted(map(os.path.split, self.files))
         self.files = []
         for sort_tuple in sortable_files:
             self.files.append(os.path.join(*sort_tuple))
diff --git a/version.py b/version.py
index de20e21f70..96b6552197 100644
--- a/version.py
+++ b/version.py
@@ -306,11 +306,11 @@ def parse (self, vstring):
         # from the parsed tuple -- so I just store the string here for
         # use by __str__
         self.vstring = vstring
-        components = filter(lambda x: x and x != '.',
-                            self.component_re.split(vstring))
-        for i in range(len(components)):
+        components = [x for x in self.component_re.split(vstring)
+                              if x and x != '.']
+        for i, obj in enumerate(components):
             try:
-                components[i] = int(components[i])
+                components[i] = int(obj)
             except ValueError:
                 pass
 

From 3bffc1fa4b8b251e239b69f32086413d12932441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 25 Jul 2007 16:24:08 +0000
Subject: [PATCH 1890/8469] Change location of the package index to
 pypi.python.org/pypi.

---
 command/register.py | 2 +-
 command/upload.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/register.py b/command/register.py
index 5fcc8d2764..200e61e240 100644
--- a/command/register.py
+++ b/command/register.py
@@ -17,7 +17,7 @@ class register(Command):
 
     description = ("register the distribution with the Python package index")
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/command/upload.py b/command/upload.py
index 67ba080427..7461e5f453 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -20,7 +20,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',

From 1b328f363d2ec8dc42735a5fae9e133e5e221d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 25 Jul 2007 16:24:23 +0000
Subject: [PATCH 1891/8469] Change location of the package index to
 pypi.python.org/pypi

---
 command/register.py | 2 +-
 command/upload.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/register.py b/command/register.py
index 5fcc8d2764..200e61e240 100644
--- a/command/register.py
+++ b/command/register.py
@@ -17,7 +17,7 @@ class register(Command):
 
     description = ("register the distribution with the Python package index")
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/command/upload.py b/command/upload.py
index 67ba080427..7461e5f453 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -20,7 +20,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',

From 8c45e5f857293b59b834acf6fbaa8428ae6dca70 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 6 Aug 2007 23:33:07 +0000
Subject: [PATCH 1892/8469] Merged revisions 56753-56781 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r56760 | neal.norwitz | 2007-08-05 18:55:39 -0700 (Sun, 05 Aug 2007) | 178 lines

  Merged revisions 56477-56759 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r56485 | facundo.batista | 2007-07-21 17:13:00 -0700 (Sat, 21 Jul 2007) | 5 lines


    Selectively enable tests for asyncore.readwrite based on the presence
    of poll support in the select module (since this is the only case in
    which readwrite can be called). [GSoC - Alan McIntyre]
  ........
    r56488 | nick.coghlan | 2007-07-22 03:18:07 -0700 (Sun, 22 Jul 2007) | 1 line

    Add explicit relative import tests for runpy.run_module
  ........
    r56509 | nick.coghlan | 2007-07-23 06:41:45 -0700 (Mon, 23 Jul 2007) | 5 lines

    Correctly cleanup sys.modules after executing runpy relative import
    tests
    Restore Python 2.4 ImportError when attempting to execute a package
    (as imports cannot be guaranteed to work properly if you try it)
  ........
    r56519 | nick.coghlan | 2007-07-24 06:07:38 -0700 (Tue, 24 Jul 2007) | 1 line

    Tweak runpy test to do a better job of confirming that sys has been manipulated correctly
  ........
    r56520 | nick.coghlan | 2007-07-24 06:58:28 -0700 (Tue, 24 Jul 2007) | 1 line

    Fix an incompatibility between the -i and -m command line switches as reported on python-dev by PJE - runpy.run_module now leaves any changes it makes to the sys module intact after the function terminates
  ........
    r56523 | nick.coghlan | 2007-07-24 07:39:23 -0700 (Tue, 24 Jul 2007) | 1 line

    Try to get rid of spurious failure in test_resource on the Debian buildbots by changing the file size limit before attempting to close the file
  ........
    r56533 | facundo.batista | 2007-07-24 14:20:42 -0700 (Tue, 24 Jul 2007) | 7 lines


    New tests for basic behavior of smtplib.SMTP and
    smtpd.DebuggingServer. Change to use global host & port number
    variables. Modified the 'server' to take a string to send back in
    order to vary test server responses. Added a test for the reaction of
    smtplib.SMTP to a non-200 HELO response. [GSoC - Alan McIntyre]
  ........
    r56538 | nick.coghlan | 2007-07-25 05:57:48 -0700 (Wed, 25 Jul 2007) | 1 line

    More buildbot cleanup - let the OS assign the port for test_urllib2_localnet
  ........
    r56539 | nick.coghlan | 2007-07-25 06:18:58 -0700 (Wed, 25 Jul 2007) | 1 line

    Add a temporary diagnostic message before a strange failure on the alpha Debian buildbot
  ........
    r56543 | martin.v.loewis | 2007-07-25 09:24:23 -0700 (Wed, 25 Jul 2007) | 2 lines

    Change location of the package index to pypi.python.org/pypi
  ........
    r56551 | georg.brandl | 2007-07-26 02:36:25 -0700 (Thu, 26 Jul 2007) | 2 lines

    tabs, newlines and crs are valid XML characters.
  ........
    r56553 | nick.coghlan | 2007-07-26 07:03:00 -0700 (Thu, 26 Jul 2007) | 1 line

    Add explicit test for a misbehaving math.floor
  ........
    r56561 | mark.hammond | 2007-07-26 21:52:32 -0700 (Thu, 26 Jul 2007) | 3 lines

    In consultation with Kristjan Jonsson, only define WINVER and _WINNT_WIN32
    if (a) we are building Python itself and (b) no one previously defined them
  ........
    r56562 | mark.hammond | 2007-07-26 22:08:54 -0700 (Thu, 26 Jul 2007) | 2 lines

    Correctly detect AMD64 architecture on VC2003
  ........
    r56566 | nick.coghlan | 2007-07-27 03:36:30 -0700 (Fri, 27 Jul 2007) | 1 line

    Make test_math error messages more meaningful for small discrepancies in results
  ........
    r56588 | martin.v.loewis | 2007-07-27 11:28:22 -0700 (Fri, 27 Jul 2007) | 2 lines

    Bug #978833: Close https sockets by releasing the _ssl object.
  ........
    r56601 | martin.v.loewis | 2007-07-28 00:03:05 -0700 (Sat, 28 Jul 2007) | 3 lines

    Bug #1704793: Return UTF-16 pair if unicodedata.lookup cannot
    represent the result in a single character.
  ........
    r56604 | facundo.batista | 2007-07-28 07:21:22 -0700 (Sat, 28 Jul 2007) | 9 lines


    Moved all of the capture_server socket setup code into the try block
    so that the event gets set if a failure occurs during server setup
    (otherwise the test will block forever).  Changed to let the OS assign
    the server port number, and client side of test waits for port number
    assignment before proceeding. The test data in DispatcherWithSendTests
    is also sent in multiple send() calls instead of one to make sure this
    works properly. [GSoC - Alan McIntyre]
  ........
    r56611 | georg.brandl | 2007-07-29 01:26:10 -0700 (Sun, 29 Jul 2007) | 2 lines

    Clarify PEP 343 description.
  ........
    r56614 | georg.brandl | 2007-07-29 02:11:15 -0700 (Sun, 29 Jul 2007) | 2 lines

    try-except-finally is new in 2.5.
  ........
    r56617 | facundo.batista | 2007-07-29 07:23:08 -0700 (Sun, 29 Jul 2007) | 9 lines


    Added tests for asynchat classes simple_producer & fifo, and the
    find_prefix_at_end function. Check behavior of a string given as a
    producer.  Added tests for behavior of asynchat.async_chat when given
    int, long, and None terminator arguments. Added usepoll attribute to
    TestAsynchat to allow running the asynchat tests with poll support
    chosen whether it's available or not (improves coverage of asyncore
    code). [GSoC - Alan McIntyre]
  ........
    r56620 | georg.brandl | 2007-07-29 10:38:35 -0700 (Sun, 29 Jul 2007) | 2 lines

    Bug #1763149: use proper slice syntax in docstring.
     (backport)
  ........
    r56624 | mark.hammond | 2007-07-29 17:45:29 -0700 (Sun, 29 Jul 2007) | 4 lines

    Correct use of Py_BUILD_CORE - now make sure it is defined before it is
    referenced, and also fix definition of _WIN32_WINNT.
    Resolves patch 1761803.
  ........
    r56632 | facundo.batista | 2007-07-30 20:03:34 -0700 (Mon, 30 Jul 2007) | 8 lines


    When running asynchat tests on OS X (darwin), the test client now
    overrides asyncore.dispatcher.handle_expt to do nothing, since
    select.poll gives a POLLHUP error at the completion of these tests.
    Added timeout & count arguments to several asyncore.loop calls to
    avoid the possibility of a test hanging up a build. [GSoC - Alan
    McIntyre]
  ........
    r56633 | nick.coghlan | 2007-07-31 06:38:01 -0700 (Tue, 31 Jul 2007) | 1 line

    Eliminate RLock race condition reported in SF bug #1764059
  ........
    r56636 | martin.v.loewis | 2007-07-31 12:57:56 -0700 (Tue, 31 Jul 2007) | 2 lines

    Define _BSD_SOURCE, to get access to POSIX extensions on OpenBSD 4.1+.
  ........
    r56653 | facundo.batista | 2007-08-01 16:18:36 -0700 (Wed, 01 Aug 2007) | 9 lines


    Allow the OS to select a free port for each test server. For
    DebuggingServerTests, construct SMTP objects with a localhost argument
    to avoid abysmally long FQDN lookups (not relevant to items under
    test) on some machines that would cause the test to fail. Moved server
    setup code in the server function inside the try block to avoid the
    possibility of setup failure hanging the test.  Minor edits to conform
    to PEP 8. [GSoC - Alan McIntyre]
  ........
    r56681 | matthias.klose | 2007-08-02 14:33:13 -0700 (Thu, 02 Aug 2007) | 2 lines

    - Allow Emacs 22 for building the documentation in info format.
  ........
    r56689 | neal.norwitz | 2007-08-02 23:46:29 -0700 (Thu, 02 Aug 2007) | 1 line

    Py_ssize_t is defined regardless of HAVE_LONG_LONG.  Will backport
  ........
    r56727 | hyeshik.chang | 2007-08-03 21:10:18 -0700 (Fri, 03 Aug 2007) | 3 lines

    Fix gb18030 codec's bug that doesn't map two-byte characters on
    GB18030 extension in encoding. (bug reported by Bjorn Stabell)
  ........
    r56751 | neal.norwitz | 2007-08-04 20:23:31 -0700 (Sat, 04 Aug 2007) | 7 lines

    Handle errors when generating a warning.
    The value is always written to the returned pointer if getting it was
    successful, even if a warning causes an error. (This probably doesn't matter
    as the caller will probably discard the value.)

    Will backport.
  ........
................
---
 command/register.py | 2 +-
 command/upload.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/register.py b/command/register.py
index 53f4293e17..10a903e33d 100644
--- a/command/register.py
+++ b/command/register.py
@@ -22,7 +22,7 @@ class register(Command):
 
     description = ("register the distribution with the Python package index")
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/command/upload.py b/command/upload.py
index 438ae99a9c..d1cf87a871 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -20,7 +20,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',

From 913423ef2fd98c50b414f552f21604a699430a67 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 9 Aug 2007 01:03:29 +0000
Subject: [PATCH 1893/8469] SF patch# 1770008 by Christian Heimes (plus some
 extras). Completely get rid of StringIO.py and cStringIO.c.

I had to fix a few tests and modules beyond what Christian did, and
invent a few conventions.  E.g. in elementtree, I chose to
write/return Unicode strings whe no encoding is given, but bytes when
an explicit encoding is given.  Also mimetools was made to always
assume binary files.
---
 command/register.py    | 4 ++--
 command/upload.py      | 3 +--
 tests/test_build_py.py | 4 ++--
 tests/test_dist.py     | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/command/register.py b/command/register.py
index 10a903e33d..91081ddb1b 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,7 +8,7 @@
 __revision__ = "$Id$"
 
 import sys, os, urllib2, getpass, urlparse
-import StringIO, ConfigParser
+import io, ConfigParser
 
 from distutils.core import Command
 from distutils.errors import *
@@ -253,7 +253,7 @@ def post_to_server(self, data, auth=None):
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
-        body = StringIO.StringIO()
+        body = io.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
             if type(value) not in (type([]), type( () )):
diff --git a/command/upload.py b/command/upload.py
index d1cf87a871..1ca2fb9052 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -14,7 +14,6 @@
 import httplib
 import base64
 import urlparse
-import cStringIO as StringIO
 
 class upload(Command):
 
@@ -135,7 +134,7 @@ def upload_file(self, command, pyversion, filename):
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
-        body = StringIO.StringIO()
+        body = io.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
             if type(value) != type([]):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 54a4ed80fd..75b6624f5a 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import StringIO
+import io
 import unittest
 
 from distutils.command.build_py import build_py
@@ -69,7 +69,7 @@ def test_empty_package_dir (self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
-        sys.stdout = StringIO.StringIO()
+        sys.stdout = io.StringIO()
 
         try:
             dist = Distribution({"packages": ["pkg"],
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8d4b07037c..23506b5dae 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -4,7 +4,7 @@
 import distutils.dist
 import os
 import shutil
-import StringIO
+import io
 import sys
 import tempfile
 import unittest
@@ -177,7 +177,7 @@ def test_obsoletes_illegal(self):
                            "obsoletes": ["my.pkg (splat)"]})
 
     def format_metadata(self, dist):
-        sio = StringIO.StringIO()
+        sio = io.StringIO()
         dist.metadata.write_pkg_file(sio)
         return sio.getvalue()
 

From 3a44c01ba5f3f9c0b34705d05e934cbae24d7d60 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 12 Aug 2007 00:43:29 +0000
Subject: [PATCH 1894/8469] Kill execfile(), use exec() instead

---
 core.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core.py b/core.py
index bd9b8542cd..d60998240f 100644
--- a/core.py
+++ b/core.py
@@ -179,7 +179,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     keyword args from 'script' to 'setup()', or the contents of the
     config files or command-line.
 
-    'script_name' is a file that will be run with 'execfile()';
+    'script_name' is a file that will be read and run with 'exec()';
     'sys.argv[0]' will be replaced with 'script' for the duration of the
     call.  'script_args' is a list of strings; if supplied,
     'sys.argv[1:]' will be replaced by 'script_args' for the duration of
@@ -217,7 +217,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            execfile(script_name, g, l)
+            exec(open(script_name).read(), g, l)
         finally:
             sys.argv = save_argv
             _setup_stop_after = None

From c2b4b26b086f52d2e029ebcbd5170f5092b39526 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Thu, 16 Aug 2007 14:35:24 +0000
Subject: [PATCH 1895/8469] Remove RISCOS support

---
 command/install_lib.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 65d25f7af2..4efaf9c671 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -9,10 +9,7 @@
 
 
 # Extension for Python source files.
-if hasattr(os, 'extsep'):
-    PYTHON_SOURCE_EXTENSION = os.extsep + "py"
-else:
-    PYTHON_SOURCE_EXTENSION = ".py"
+PYTHON_SOURCE_EXTENSION = ".py"
 
 class install_lib (Command):
 

From 59cd99d0b267019cd9811bc03ec379827b8f8410 Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Fri, 17 Aug 2007 12:57:41 +0000
Subject: [PATCH 1896/8469] Remove support for BeOS

---
 sysconfig.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 346707fa90..c40c2e7425 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -394,24 +394,6 @@ def _init_posix():
 
             g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
 
-        elif sys.platform == 'beos':
-            # Linker script is in the config directory.  In the Makefile it is
-            # relative to the srcdir, which after installation no longer makes
-            # sense.
-            python_lib = get_python_lib(standard_lib=1)
-            linkerscript_path = g['LDSHARED'].split()[0]
-            linkerscript_name = os.path.basename(linkerscript_path)
-            linkerscript = os.path.join(python_lib, 'config',
-                                        linkerscript_name)
-
-            # XXX this isn't the right place to do this: adding the Python
-            # library to the link, if needed, should be in the "build_ext"
-            # command.  (It's also needed for non-MS compilers on Windows, and
-            # it's taken care of for them by the 'build_ext.get_libraries()'
-            # method.)
-            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                             (linkerscript, PREFIX, get_python_version()))
-
     global _config_vars
     _config_vars = g
 

From e9d9c100389e6d04f060f58eeb5e75921e82eb59 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 21 Aug 2007 01:04:47 +0000
Subject: [PATCH 1897/8469] [ 1761786 ] distutils.util.get_platform() return
 value on 64bit Windows As discussed on distutils-sig: Allows the generated
 installer name on 64bit Windows platforms to be different than the name
 generated for 32bit Windows platforms.

---
 util.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index cfcc6a951e..8979634e4b 100644
--- a/util.py
+++ b/util.py
@@ -29,8 +29,27 @@ def get_platform ():
        irix-5.3
        irix64-6.2
 
-    For non-POSIX platforms, currently just returns 'sys.platform'.
+    Windows will return one of:
+       win-x86_64 (64bit Windows on x86_64 (AMD64))
+       win-ia64 (64bit Windows on Itanium)
+       win32 (all others - specifically, sys.platform is returned)
+
+    For other non-POSIX platforms, currently just returns 'sys.platform'.
     """
+    if os.name == 'nt':
+        # sniff sys.version for architecture.
+        prefix = " bit ("
+        i = string.find(sys.version, prefix)
+        if i == -1:
+            return sys.platform
+        j = string.find(sys.version, ")", i)
+        look = sys.version[i+len(prefix):j].lower()
+        if look=='amd64':
+            return 'win-x86_64'
+        if look=='itanium':
+            return 'win-ia64'
+        return sys.platform
+
     if os.name != "posix" or not hasattr(os, 'uname'):
         # XXX what about the architecture? NT is Intel or Alpha,
         # Mac OS is M68k or PPC, etc.

From 8654a69ef372ec3dc466d9fe80f4991d43d1f6cc Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 21 Aug 2007 01:05:16 +0000
Subject: [PATCH 1898/8469] [ 1761786 ] distutils.util.get_platform() return
 value on 64bit Windows As discussed on distutils-sig: Allows the generated
 installer name on 64bit Windows platforms to be different than the name
 generated for 32bit Windows platforms.

---
 command/bdist_msi.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 75db8773f1..a1c0df4bc5 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -633,7 +633,8 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
+        plat = get_platform()
         installer_name = os.path.join(self.dist_dir,
-                                      "%s.win32-py%s.msi" %
-                                       (fullname, self.target_version))
+                                      "%s.%s-py%s.msi" %
+                                       (fullname, plat, self.target_version))
         return installer_name

From 04cd9c5fbf2d2bbdd8621c82fa07ac5347a45bf9 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 24 Aug 2007 16:32:05 +0000
Subject: [PATCH 1899/8469] Merged revisions 57221-57391 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r57227 | facundo.batista | 2007-08-20 17:16:21 -0700 (Mon, 20 Aug 2007) | 5 lines


  Catch ProtocolError exceptions and include the header information in
  test output (to make it easier to debug test failures caused by
  problems in the server). [GSoC - Alan McIntyre]
........
  r57229 | mark.hammond | 2007-08-20 18:04:47 -0700 (Mon, 20 Aug 2007) | 5 lines

  [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows
  As discussed on distutils-sig: Allows the generated installer name on
  64bit Windows platforms to be different than the name generated for
  32bit Windows platforms.
........
  r57230 | mark.hammond | 2007-08-20 18:05:16 -0700 (Mon, 20 Aug 2007) | 5 lines

  [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows
  As discussed on distutils-sig: Allows the generated installer name on
  64bit Windows platforms to be different than the name generated for
  32bit Windows platforms.
........
  r57253 | georg.brandl | 2007-08-20 23:01:18 -0700 (Mon, 20 Aug 2007) | 2 lines

  Demand version 2.5.1 since 2.5 has a bug with codecs.open context managers.
........
  r57254 | georg.brandl | 2007-08-20 23:03:43 -0700 (Mon, 20 Aug 2007) | 2 lines

  Revert accidental checkins from last commit.
........
  r57255 | georg.brandl | 2007-08-20 23:07:08 -0700 (Mon, 20 Aug 2007) | 2 lines

  Bug #1777160: mention explicitly that e.g. -1**2 is -1.
........
  r57256 | georg.brandl | 2007-08-20 23:12:19 -0700 (Mon, 20 Aug 2007) | 3 lines

  Bug #1777168: replace operator names "opa"... with "op1"... and mark everything up as literal,
  to enhance readability.
........
  r57259 | facundo.batista | 2007-08-21 09:57:18 -0700 (Tue, 21 Aug 2007) | 8 lines


  Added test for behavior of operations on an unconnected SMTP object,
  and tests for NOOP, RSET, and VRFY. Corrected typo in a comment for
  testNonnumericPort. Added a check for constructing SMTP objects when
  non-numeric ports are included in the host name. Derived a server from
  SMTPServer to test various ESMTP/SMTP capabilities. Check that a
  second HELO to DebuggingServer returns an error. [GSoC - Alan McIntyre]
........
  r57279 | skip.montanaro | 2007-08-22 12:02:16 -0700 (Wed, 22 Aug 2007) | 2 lines

  Note that BeOS is unsupported as of Python 2.6.
........
  r57280 | skip.montanaro | 2007-08-22 12:05:21 -0700 (Wed, 22 Aug 2007) | 1 line

  whoops - need to check in configure as well
........
  r57284 | alex.martelli | 2007-08-22 14:14:17 -0700 (Wed, 22 Aug 2007) | 5 lines

  Fix compile.c so that it records 0.0 and -0.0 as separate constants in a code
  object's co_consts tuple; add a test to show that the previous behavior (where
  these two constants were "collapsed" into one) causes serious malfunctioning.
........
  r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines

  stop leaving log.0000001 __db.00* and xxx.db turds in developer
  sandboxes when bsddb3 tests are run.
........
  r57301 | jeffrey.yasskin | 2007-08-22 16:14:27 -0700 (Wed, 22 Aug 2007) | 3 lines

  When setup.py fails to find the necessary bits to build some modules, have it
  print a slightly more informative message.
........
  r57320 | brett.cannon | 2007-08-23 07:53:17 -0700 (Thu, 23 Aug 2007) | 2 lines

  Make test_runpy re-entrant.
........
  r57324 | georg.brandl | 2007-08-23 10:54:11 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1768121: fix wrong/missing opcode docs.
........
  r57326 | georg.brandl | 2007-08-23 10:57:05 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1766421: "return code" vs. "status code".
........
  r57328 | georg.brandl | 2007-08-23 11:08:06 -0700 (Thu, 23 Aug 2007) | 2 lines

  Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYNAMIC_LOADING is not defined.
........
  r57331 | georg.brandl | 2007-08-23 11:11:33 -0700 (Thu, 23 Aug 2007) | 2 lines

  Use try-except-finally in contextlib.
........
  r57343 | georg.brandl | 2007-08-23 13:35:00 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1697820: document that the old slice protocol is still used by builtin types.
........
  r57345 | georg.brandl | 2007-08-23 13:40:01 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1573854: fix docs for sqlite3 cursor rowcount attr.
........
  r57347 | georg.brandl | 2007-08-23 13:50:23 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1694833: fix imp.find_module() docs wrt. packages.
........
  r57348 | georg.brandl | 2007-08-23 13:53:28 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1594966: fix misleading usage example
........
  r57349 | georg.brandl | 2007-08-23 13:55:44 -0700 (Thu, 23 Aug 2007) | 2 lines

  Clarify wording a bit.
........
  r57351 | georg.brandl | 2007-08-23 14:18:44 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1752332: httplib no longer uses socket.getaddrinfo().
........
  r57352 | georg.brandl | 2007-08-23 14:21:36 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1734111: document struct.Struct.size.
........
  r57353 | georg.brandl | 2007-08-23 14:27:57 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1688564: document os.path.join's absolute path behavior in the docstring.
........
  r57354 | georg.brandl | 2007-08-23 14:36:05 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1625381: clarify match vs search introduction.
........
  r57355 | georg.brandl | 2007-08-23 14:42:54 -0700 (Thu, 23 Aug 2007) | 2 lines

  Bug #1758696: more info about descriptors.
........
  r57357 | georg.brandl | 2007-08-23 14:55:57 -0700 (Thu, 23 Aug 2007) | 2 lines

  Patch #1779550: remove redundant code in logging.
........
  r57378 | gregory.p.smith | 2007-08-23 22:11:38 -0700 (Thu, 23 Aug 2007) | 2 lines

  Fix bug 1725856.
........
  r57382 | georg.brandl | 2007-08-23 23:10:01 -0700 (Thu, 23 Aug 2007) | 2 lines

  uuid creation is now threadsafe, backport from py3k rev. 57375.
........
  r57389 | georg.brandl | 2007-08-24 04:47:37 -0700 (Fri, 24 Aug 2007) | 2 lines

  Bug #1765375: fix stripping of unwanted LDFLAGS.
........
  r57391 | guido.van.rossum | 2007-08-24 07:53:14 -0700 (Fri, 24 Aug 2007) | 2 lines

  Fix silly typo in test name.
........
---
 command/bdist_msi.py |  5 +++--
 util.py              | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 012d06ea69..5225bed1b2 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -633,7 +633,8 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
+        plat = get_platform()
         installer_name = os.path.join(self.dist_dir,
-                                      "%s.win32-py%s.msi" %
-                                       (fullname, self.target_version))
+                                      "%s.%s-py%s.msi" %
+                                       (fullname, plat, self.target_version))
         return installer_name
diff --git a/util.py b/util.py
index 6f15ce8b5e..9aa857052a 100644
--- a/util.py
+++ b/util.py
@@ -29,8 +29,27 @@ def get_platform ():
        irix-5.3
        irix64-6.2
 
-    For non-POSIX platforms, currently just returns 'sys.platform'.
+    Windows will return one of:
+       win-x86_64 (64bit Windows on x86_64 (AMD64))
+       win-ia64 (64bit Windows on Itanium)
+       win32 (all others - specifically, sys.platform is returned)
+
+    For other non-POSIX platforms, currently just returns 'sys.platform'.
     """
+    if os.name == 'nt':
+        # sniff sys.version for architecture.
+        prefix = " bit ("
+        i = string.find(sys.version, prefix)
+        if i == -1:
+            return sys.platform
+        j = string.find(sys.version, ")", i)
+        look = sys.version[i+len(prefix):j].lower()
+        if look=='amd64':
+            return 'win-x86_64'
+        if look=='itanium':
+            return 'win-ia64'
+        return sys.platform
+
     if os.name != "posix" or not hasattr(os, 'uname'):
         # XXX what about the architecture? NT is Intel or Alpha,
         # Mac OS is M68k or PPC, etc.

From 767edf21398f72156adcea6a418eba9150d06a20 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 29 Aug 2007 13:18:47 +0000
Subject: [PATCH 1900/8469] Fix failure in error handler -- exc[-1] ->
 exc.args[-1].

---
 dir_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index a6c4416a6f..7dc1205c49 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -76,8 +76,8 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
                 os.mkdir(head)
                 created_dirs.append(head)
             except OSError as exc:
-                raise DistutilsFileError, \
-                      "could not create '%s': %s" % (head, exc[-1])
+                raise DistutilsFileError(
+                      "could not create '%s': %s" % (head, exc.args[-1]))
 
         _path_created[abs_head] = 1
     return created_dirs

From aabf8bf21c444cfae978e92e626ba7c0274a9f10 Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Thu, 30 Aug 2007 03:52:21 +0000
Subject: [PATCH 1901/8469] General cleanup, raise normalization in
 Lib/distutils.

---
 __init__.py                |   2 -
 archive_util.py            |  13 +-
 bcppcompiler.py            |  17 +-
 ccompiler.py               | 450 ++++++++++++++++---------------------
 cmd.py                     | 166 ++++++--------
 command/__init__.py        |   2 -
 command/bdist.py           |  34 +--
 command/bdist_dumb.py      |  33 +--
 command/bdist_msi.py       |  28 +--
 command/bdist_rpm.py       |  54 ++---
 command/bdist_wininst.py   |  39 +---
 command/build.py           |  26 +--
 command/build_clib.py      |  97 +++-----
 command/build_ext.py       | 120 ++++------
 command/build_py.py        | 116 +++-------
 command/build_scripts.py   |  20 +-
 command/clean.py           |   6 +-
 command/command_template   |  20 +-
 command/config.py          | 102 ++++-----
 command/install.py         |  85 +++----
 command/install_data.py    |  14 +-
 command/install_headers.py |  16 +-
 command/install_lib.py     |  44 ++--
 command/install_scripts.py |  16 +-
 command/sdist.py           |  89 +++-----
 command/upload.py          |   2 +-
 core.py                    |  24 +-
 cygwinccompiler.py         |  11 +-
 debug.py                   |   2 -
 dep_util.py                |   6 +-
 dir_util.py                |  17 +-
 dist.py                    |  65 ++----
 emxccompiler.py            |   9 +-
 errors.py                  |   2 -
 extension.py               |  12 +-
 fancy_getopt.py            | 137 ++++-------
 file_util.py               |  88 +++-----
 filelist.py                |  97 +++-----
 log.py                     |   2 -
 msvccompiler.py            | 202 ++++++++---------
 mwerkscompiler.py          |  11 +-
 spawn.py                   |  95 +++-----
 sysconfig.py               |  18 +-
 text_file.py               | 147 ++++++------
 unixccompiler.py           |  31 ++-
 util.py                    |  20 +-
 version.py                 |   2 +-
 47 files changed, 966 insertions(+), 1643 deletions(-)

diff --git a/__init__.py b/__init__.py
index 86ad44fe3a..f71c3adb14 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,8 +8,6 @@
    setup (...)
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 # Distutils version
diff --git a/archive_util.py b/archive_util.py
index 059d5447f6..f3f65c6a0c 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,8 +3,6 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -39,8 +37,8 @@ def make_tarball (base_name, base_dir, compress="gzip",
                       'bzip2': ['-f9']}
 
     if compress is not None and compress not in compress_ext.keys():
-        raise ValueError, \
-              "bad value for 'compress': must be None, 'gzip', or 'compress'"
+        raise ValueError(
+              "bad value for 'compress': must be None, 'gzip', or 'compress'")
 
     archive_name = base_name + ".tar"
     mkpath(os.path.dirname(archive_name), dry_run=dry_run)
@@ -86,10 +84,9 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         except DistutilsExecError:
             # XXX really should distinguish between "couldn't find
             # external 'zip' command" and "zip failed".
-            raise DistutilsExecError, \
-                  ("unable to create zip file '%s': "
+            raise DistutilsExecError(("unable to create zip file '%s': "
                    "could neither import the 'zipfile' module nor "
-                   "find a standalone zip utility") % zip_filename
+                   "find a standalone zip utility") % zip_filename)
 
     else:
         log.info("creating '%s' and adding '%s' to it",
@@ -157,7 +154,7 @@ def make_archive (base_name, format,
     try:
         format_info = ARCHIVE_FORMATS[format]
     except KeyError:
-        raise ValueError, "unknown archive format '%s'" % format
+        raise ValueError("unknown archive format '%s'" % format)
 
     func = format_info[0]
     for (arg,val) in format_info[1]:
diff --git a/bcppcompiler.py b/bcppcompiler.py
index b6a3bf62ce..1ab76c5981 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,8 +11,6 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 
@@ -116,7 +114,7 @@ def compile(self, sources,
                 try:
                     self.spawn (["brcc32", "-fo", obj, src])
                 except DistutilsExecError as msg:
-                    raise CompileError, msg
+                    raise CompileError(msg)
                 continue # the 'for' loop
 
             # The next two are both for the real compiler.
@@ -140,7 +138,7 @@ def compile(self, sources,
                             [input_opt, output_opt] +
                             extra_postargs + [src])
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
 
         return objects
 
@@ -165,7 +163,7 @@ def create_static_lib (self,
             try:
                 self.spawn ([self.lib] + lib_args)
             except DistutilsExecError as msg:
-                raise LibError, msg
+                raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
@@ -299,7 +297,7 @@ def link (self,
             try:
                 self.spawn ([self.linker] + ld_args)
             except DistutilsExecError as msg:
-                raise LinkError, msg
+                raise LinkError(msg)
 
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -345,9 +343,8 @@ def object_filenames (self,
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
             (base, ext) = os.path.splitext (os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc','.res']):
-                raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % \
-                      (ext, src_name)
+                raise UnknownFileError("unknown file type '%s' (from '%s')" % \
+                      (ext, src_name))
             if strip_dir:
                 base = os.path.basename (base)
             if ext == '.res':
@@ -393,6 +390,6 @@ def preprocess (self,
                 self.spawn(pp_args)
             except DistutilsExecError as msg:
                 print(msg)
-                raise CompileError, msg
+                raise CompileError(msg)
 
     # preprocess()
diff --git a/ccompiler.py b/ccompiler.py
index d4f4adea19..c33e5ab440 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,12 +3,9 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
-from types import *
 from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
@@ -88,11 +85,7 @@ class CCompiler:
                    }
     language_order = ["c++", "objc", "c"]
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
+    def __init__(self, verbose=0, dry_run=0, force=0):
         self.dry_run = dry_run
         self.force = force
         self.verbose = verbose
@@ -128,11 +121,7 @@ def __init__ (self,
         for key in self.executables.keys():
             self.set_executable(key, self.executables[key])
 
-    # __init__ ()
-
-
-    def set_executables (self, **args):
-
+    def set_executables(self, **kwargs):
         """Define the executables (and options for them) that will be run
         to perform the various stages of compilation.  The exact set of
         executables that may be specified here depends on the compiler
@@ -158,14 +147,11 @@ class (via the 'executables' class attribute), but most will have:
         # discovered at run-time, since there are many different ways to do
         # basically the same things with Unix C compilers.
 
-        for key in args.keys():
+        for key, value in kwargs.items():
             if key not in self.executables:
-                raise ValueError, \
-                      "unknown executable '%s' for class %s" % \
-                      (key, self.__class__.__name__)
-            self.set_executable(key, args[key])
-
-    # set_executables ()
+                raise ValueError("unknown executable '%s' for class %s" % \
+                      (key, self.__class__.__name__))
+            self.set_executable(key, value)
 
     def set_executable(self, key, value):
         if isinstance(value, basestring):
@@ -173,37 +159,32 @@ def set_executable(self, key, value):
         else:
             setattr(self, key, value)
 
-
-    def _find_macro (self, name):
+    def _find_macro(self, name):
         i = 0
         for defn in self.macros:
             if defn[0] == name:
                 return i
-            i = i + 1
-
+            i += 1
         return None
 
-
-    def _check_macro_definitions (self, definitions):
+    def _check_macro_definitions(self, definitions):
         """Ensures that every element of 'definitions' is a valid macro
         definition, ie. either (name,value) 2-tuple or a (name,) tuple.  Do
         nothing if all definitions are OK, raise TypeError otherwise.
         """
         for defn in definitions:
-            if not (type (defn) is TupleType and
-                    (len (defn) == 1 or
-                     (len (defn) == 2 and
-                      (isinstance (defn[1], basestring) or defn[1] is None))) and
+            if not (isinstance(defn, tuple) and
+                    (len(defn) in (1, 2) and
+                      (isinstance (defn[1], basestring) or defn[1] is None)) and
                     isinstance (defn[0], basestring)):
-                raise TypeError, \
-                      ("invalid macro definition '%s': " % defn) + \
+                raise TypeError(("invalid macro definition '%s': " % defn) + \
                       "must be tuple (string,), (string, string), or " + \
-                      "(string, None)"
+                      "(string, None)")
 
 
     # -- Bookkeeping methods -------------------------------------------
 
-    def define_macro (self, name, value=None):
+    def define_macro(self, name, value=None):
         """Define a preprocessor macro for all compilations driven by this
         compiler object.  The optional parameter 'value' should be a
         string; if it is not supplied, then the macro will be defined
@@ -216,11 +197,9 @@ def define_macro (self, name, value=None):
         if i is not None:
             del self.macros[i]
 
-        defn = (name, value)
-        self.macros.append (defn)
+        self.macros.append((name, value))
 
-
-    def undefine_macro (self, name):
+    def undefine_macro(self, name):
         """Undefine a preprocessor macro for all compilations driven by
         this compiler object.  If the same macro is defined by
         'define_macro()' and undefined by 'undefine_macro()' the last call
@@ -236,18 +215,17 @@ def undefine_macro (self, name):
             del self.macros[i]
 
         undefn = (name,)
-        self.macros.append (undefn)
-
+        self.macros.append(undefn)
 
-    def add_include_dir (self, dir):
+    def add_include_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         header files.  The compiler is instructed to search directories in
         the order in which they are supplied by successive calls to
         'add_include_dir()'.
         """
-        self.include_dirs.append (dir)
+        self.include_dirs.append(dir)
 
-    def set_include_dirs (self, dirs):
+    def set_include_dirs(self, dirs):
         """Set the list of directories that will be searched to 'dirs' (a
         list of strings).  Overrides any preceding calls to
         'add_include_dir()'; subsequence calls to 'add_include_dir()' add
@@ -255,10 +233,9 @@ def set_include_dirs (self, dirs):
         any list of standard include directories that the compiler may
         search by default.
         """
-        self.include_dirs = copy (dirs)
-
+        self.include_dirs = copy(dirs)
 
-    def add_library (self, libname):
+    def add_library(self, libname):
         """Add 'libname' to the list of libraries that will be included in
         all links driven by this compiler object.  Note that 'libname'
         should *not* be the name of a file containing a library, but the
@@ -272,63 +249,60 @@ def add_library (self, libname):
         names; the linker will be instructed to link against libraries as
         many times as they are mentioned.
         """
-        self.libraries.append (libname)
+        self.libraries.append(libname)
 
-    def set_libraries (self, libnames):
+    def set_libraries(self, libnames):
         """Set the list of libraries to be included in all links driven by
         this compiler object to 'libnames' (a list of strings).  This does
         not affect any standard system libraries that the linker may
         include by default.
         """
-        self.libraries = copy (libnames)
+        self.libraries = copy(libnames)
 
-
-    def add_library_dir (self, dir):
+    def add_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         libraries specified to 'add_library()' and 'set_libraries()'.  The
         linker will be instructed to search for libraries in the order they
         are supplied to 'add_library_dir()' and/or 'set_library_dirs()'.
         """
-        self.library_dirs.append (dir)
+        self.library_dirs.append(dir)
 
-    def set_library_dirs (self, dirs):
+    def set_library_dirs(self, dirs):
         """Set the list of library search directories to 'dirs' (a list of
         strings).  This does not affect any standard library search path
         that the linker may search by default.
         """
-        self.library_dirs = copy (dirs)
-
+        self.library_dirs = copy(dirs)
 
-    def add_runtime_library_dir (self, dir):
+    def add_runtime_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         shared libraries at runtime.
         """
-        self.runtime_library_dirs.append (dir)
+        self.runtime_library_dirs.append(dir)
 
-    def set_runtime_library_dirs (self, dirs):
+    def set_runtime_library_dirs(self, dirs):
         """Set the list of directories to search for shared libraries at
         runtime to 'dirs' (a list of strings).  This does not affect any
         standard search path that the runtime linker may search by
         default.
         """
-        self.runtime_library_dirs = copy (dirs)
-
+        self.runtime_library_dirs = copy(dirs)
 
-    def add_link_object (self, object):
+    def add_link_object(self, object):
         """Add 'object' to the list of object files (or analogues, such as
         explicitly named library files or the output of "resource
         compilers") to be included in every link driven by this compiler
         object.
         """
-        self.objects.append (object)
+        self.objects.append(object)
 
-    def set_link_objects (self, objects):
+    def set_link_objects(self, objects):
         """Set the list of object files (or analogues) to be included in
         every link to 'objects'.  This does not affect any standard object
         files that the linker may include by default (such as system
         libraries).
         """
-        self.objects = copy (objects)
+        self.objects = copy(objects)
 
 
     # -- Private utility methods --------------------------------------
@@ -345,29 +319,28 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
         if outdir is None:
             outdir = self.output_dir
         elif not isinstance(outdir, basestring):
-            raise TypeError, "'output_dir' must be a string or None"
+            raise TypeError("'output_dir' must be a string or None")
 
         if macros is None:
             macros = self.macros
-        elif type(macros) is ListType:
+        elif isinstance(macros, list):
             macros = macros + (self.macros or [])
         else:
-            raise TypeError, "'macros' (if supplied) must be a list of tuples"
+            raise TypeError("'macros' (if supplied) must be a list of tuples")
 
         if incdirs is None:
             incdirs = self.include_dirs
-        elif type(incdirs) in (ListType, TupleType):
+        elif isinstance(incdirs, (list, tuple)):
             incdirs = list(incdirs) + (self.include_dirs or [])
         else:
-            raise TypeError, \
-                  "'include_dirs' (if supplied) must be a list of strings"
+            raise TypeError(
+                  "'include_dirs' (if supplied) must be a list of strings")
 
         if extra is None:
             extra = []
 
         # Get the list of expected output (object) files
-        objects = self.object_filenames(sources,
-                                        strip_dir=0,
+        objects = self.object_filenames(sources, strip_dir=0,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
@@ -430,7 +403,7 @@ def _get_cc_args(self, pp_opts, debug, before):
             cc_args[:0] = before
         return cc_args
 
-    def _fix_compile_args (self, output_dir, macros, include_dirs):
+    def _fix_compile_args(self, output_dir, macros, include_dirs):
         """Typecheck and fix-up some of the arguments to the 'compile()'
         method, and return fixed-up values.  Specifically: if 'output_dir'
         is None, replaces it with 'self.output_dir'; ensures that 'macros'
@@ -443,28 +416,25 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
         if output_dir is None:
             output_dir = self.output_dir
         elif not isinstance(output_dir, basestring):
-            raise TypeError, "'output_dir' must be a string or None"
+            raise TypeError("'output_dir' must be a string or None")
 
         if macros is None:
             macros = self.macros
-        elif type (macros) is ListType:
+        elif isinstance(macros, list):
             macros = macros + (self.macros or [])
         else:
-            raise TypeError, "'macros' (if supplied) must be a list of tuples"
+            raise TypeError("'macros' (if supplied) must be a list of tuples")
 
         if include_dirs is None:
             include_dirs = self.include_dirs
-        elif type (include_dirs) in (ListType, TupleType):
-            include_dirs = list (include_dirs) + (self.include_dirs or [])
+        elif isinstance(include_dirs, (list, tuple)):
+            include_dirs = list(include_dirs) + (self.include_dirs or [])
         else:
-            raise TypeError, \
-                  "'include_dirs' (if supplied) must be a list of strings"
+            raise TypeError(
+                  "'include_dirs' (if supplied) must be a list of strings")
 
         return output_dir, macros, include_dirs
 
-    # _fix_compile_args ()
-
-
     def _prep_compile(self, sources, output_dir, depends=None):
         """Decide which souce files must be recompiled.
 
@@ -511,29 +481,25 @@ def _prep_compile(self, sources, output_dir, depends=None):
 
         return objects, skip_source
 
-    # _prep_compile ()
-
 
-    def _fix_object_args (self, objects, output_dir):
+    def _fix_object_args(self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
         Specifically: ensure that 'objects' is a list; if output_dir is
         None, replace with self.output_dir.  Return fixed versions of
         'objects' and 'output_dir'.
         """
-        if type (objects) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'objects' must be a list or tuple of strings"
-        objects = list (objects)
+        if not isinstance(objects, (list, tuple)):
+            raise TypeError("'objects' must be a list or tuple of strings")
+        objects = list(objects)
 
         if output_dir is None:
             output_dir = self.output_dir
         elif not isinstance(output_dir, basestring):
-            raise TypeError, "'output_dir' must be a string or None"
+            raise TypeError("'output_dir' must be a string or None")
 
         return (objects, output_dir)
 
-
-    def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
         """Typecheck and fix up some of the arguments supplied to the
         'link_*' methods.  Specifically: ensure that all arguments are
         lists, and augment them with their permanent versions
@@ -542,41 +508,37 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
         """
         if libraries is None:
             libraries = self.libraries
-        elif type (libraries) in (ListType, TupleType):
+        elif isinstance(libraries, (list, tuple)):
             libraries = list (libraries) + (self.libraries or [])
         else:
-            raise TypeError, \
-                  "'libraries' (if supplied) must be a list of strings"
+            raise TypeError(
+                  "'libraries' (if supplied) must be a list of strings")
 
         if library_dirs is None:
             library_dirs = self.library_dirs
-        elif type (library_dirs) in (ListType, TupleType):
+        elif isinstance(library_dirs, (list, tuple)):
             library_dirs = list (library_dirs) + (self.library_dirs or [])
         else:
-            raise TypeError, \
-                  "'library_dirs' (if supplied) must be a list of strings"
+            raise TypeError(
+                  "'library_dirs' (if supplied) must be a list of strings")
 
         if runtime_library_dirs is None:
             runtime_library_dirs = self.runtime_library_dirs
-        elif type (runtime_library_dirs) in (ListType, TupleType):
-            runtime_library_dirs = (list (runtime_library_dirs) +
+        elif isinstance(runtime_library_dirs, (list, tuple)):
+            runtime_library_dirs = (list(runtime_library_dirs) +
                                     (self.runtime_library_dirs or []))
         else:
-            raise TypeError, \
-                  "'runtime_library_dirs' (if supplied) " + \
-                  "must be a list of strings"
+            raise TypeError("'runtime_library_dirs' (if supplied) "
+                            "must be a list of strings")
 
         return (libraries, library_dirs, runtime_library_dirs)
 
-    # _fix_lib_args ()
-
-
-    def _need_link (self, objects, output_file):
+    def _need_link(self, objects, output_file):
         """Return true if we need to relink the files listed in 'objects'
         to recreate 'output_file'.
         """
         if self.force:
-            return 1
+            return True
         else:
             if self.dry_run:
                 newer = newer_group (objects, output_file, missing='newer')
@@ -584,13 +546,11 @@ def _need_link (self, objects, output_file):
                 newer = newer_group (objects, output_file)
             return newer
 
-    # _need_link ()
-
-    def detect_language (self, sources):
+    def detect_language(self, sources):
         """Detect the language of a given file, or list of files. Uses
         language_map, and language_order to do the job.
         """
-        if type(sources) is not ListType:
+        if not isinstance(sources, list):
             sources = [sources]
         lang = None
         index = len(self.language_order)
@@ -606,18 +566,12 @@ def detect_language (self, sources):
                 pass
         return lang
 
-    # detect_language ()
 
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
 
-    def preprocess (self,
-                    source,
-                    output_file=None,
-                    macros=None,
-                    include_dirs=None,
-                    extra_preargs=None,
-                    extra_postargs=None):
+    def preprocess(self, source, output_file=None, macros=None,
+                   include_dirs=None, extra_preargs=None, extra_postargs=None):
         """Preprocess a single C/C++ source file, named in 'source'.
         Output will be written to file named 'output_file', or stdout if
         'output_file' not supplied.  'macros' is a list of macro
@@ -680,10 +634,8 @@ def compile(self, sources, output_dir=None, macros=None,
 
         Raises CompileError on failure.
         """
-
         # A concrete compiler class can either override this method
         # entirely or implement _compile().
-
         macros, objects, extra_postargs, pp_opts, build = \
                 self._setup_compile(output_dir, macros, include_dirs, sources,
                                     depends, extra_postargs)
@@ -701,17 +653,12 @@ def compile(self, sources, output_dir=None, macros=None,
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         """Compile 'src' to product 'obj'."""
-
         # A concrete compiler class that does not override compile()
         # should implement _compile().
         pass
 
-    def create_static_lib (self,
-                           objects,
-                           output_libname,
-                           output_dir=None,
-                           debug=0,
-                           target_lang=None):
+    def create_static_lib(self, objects, output_libname, output_dir=None,
+                          debug=0, target_lang=None):
         """Link a bunch of stuff together to create a static library file.
         The "bunch of stuff" consists of the list of object files supplied
         as 'objects', the extra object files supplied to
@@ -742,20 +689,20 @@ def create_static_lib (self,
     SHARED_LIBRARY = "shared_library"
     EXECUTABLE = "executable"
 
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
         """Link a bunch of stuff together to create an executable or
         shared library file.
 
@@ -804,19 +751,19 @@ def link (self,
 
     # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None,
-                         target_lang=None):
+    def link_shared_lib(self,
+                        objects,
+                        output_libname,
+                        output_dir=None,
+                        libraries=None,
+                        library_dirs=None,
+                        runtime_library_dirs=None,
+                        export_symbols=None,
+                        debug=0,
+                        extra_preargs=None,
+                        extra_postargs=None,
+                        build_temp=None,
+                        target_lang=None):
         self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
@@ -825,19 +772,19 @@ def link_shared_lib (self,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None,
-                            target_lang=None):
+    def link_shared_object(self,
+                           objects,
+                           output_filename,
+                           output_dir=None,
+                           libraries=None,
+                           library_dirs=None,
+                           runtime_library_dirs=None,
+                           export_symbols=None,
+                           debug=0,
+                           extra_preargs=None,
+                           extra_postargs=None,
+                           build_temp=None,
+                           target_lang=None):
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
@@ -845,17 +792,17 @@ def link_shared_object (self,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_executable (self,
-                         objects,
-                         output_progname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         target_lang=None):
+    def link_executable(self,
+                        objects,
+                        output_progname,
+                        output_dir=None,
+                        libraries=None,
+                        library_dirs=None,
+                        runtime_library_dirs=None,
+                        debug=0,
+                        extra_preargs=None,
+                        extra_postargs=None,
+                        target_lang=None):
         self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
                   libraries, library_dirs, runtime_library_dirs, None,
@@ -867,34 +814,30 @@ def link_executable (self,
     # no appropriate default implementation so subclasses should
     # implement all of these.
 
-    def library_dir_option (self, dir):
+    def library_dir_option(self, dir):
         """Return the compiler option to add 'dir' to the list of
         directories searched for libraries.
         """
         raise NotImplementedError
 
-    def runtime_library_dir_option (self, dir):
+    def runtime_library_dir_option(self, dir):
         """Return the compiler option to add 'dir' to the list of
         directories searched for runtime libraries.
         """
         raise NotImplementedError
 
-    def library_option (self, lib):
+    def library_option(self, lib):
         """Return the compiler option to add 'dir' to the list of libraries
         linked into the shared library or executable.
         """
         raise NotImplementedError
 
-    def has_function(self, funcname,
-                     includes=None,
-                     include_dirs=None,
-                     libraries=None,
-                     library_dirs=None):
+    def has_function(self, funcname, includes=None, include_dirs=None,
+                     libraries=None, library_dirs=None):
         """Return a boolean indicating whether funcname is supported on
         the current platform.  The optional arguments can be used to
         augment the compilation environment.
         """
-
         # this can't be included at module scope because it tries to
         # import math which might not be available at that point - maybe
         # the necessary logic should just be inlined?
@@ -982,8 +925,8 @@ def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
             base = os.path.splitdrive(base)[1] # Chop off the drive
             base = base[os.path.isabs(base):]  # If abs, chop off leading /
             if ext not in self.src_extensions:
-                raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % (ext, src_name)
+                raise UnknownFileError(
+                      "unknown file type '%s' (from '%s')" % (ext, src_name))
             if strip_dir:
                 base = os.path.basename(base)
             obj_names.append(os.path.join(output_dir,
@@ -993,24 +936,25 @@ def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
     def shared_object_filename(self, basename, strip_dir=0, output_dir=''):
         assert output_dir is not None
         if strip_dir:
-            basename = os.path.basename (basename)
+            basename = os.path.basename(basename)
         return os.path.join(output_dir, basename + self.shared_lib_extension)
 
     def executable_filename(self, basename, strip_dir=0, output_dir=''):
         assert output_dir is not None
         if strip_dir:
-            basename = os.path.basename (basename)
+            basename = os.path.basename(basename)
         return os.path.join(output_dir, basename + (self.exe_extension or ''))
 
     def library_filename(self, libname, lib_type='static',     # or 'shared'
                          strip_dir=0, output_dir=''):
         assert output_dir is not None
         if lib_type not in ("static", "shared", "dylib"):
-            raise ValueError, "'lib_type' must be \"static\", \"shared\" or \"dylib\""
+            raise ValueError(
+                  "'lib_type' must be \"static\", \"shared\" or \"dylib\"")
         fmt = getattr(self, lib_type + "_lib_format")
         ext = getattr(self, lib_type + "_lib_extension")
 
-        dir, base = os.path.split (libname)
+        dir, base = os.path.split(libname)
         filename = fmt % (base, ext)
         if strip_dir:
             dir = ''
@@ -1020,31 +964,28 @@ def library_filename(self, libname, lib_type='static',     # or 'shared'
 
     # -- Utility methods -----------------------------------------------
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         log.debug(msg)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         from distutils.debug import DEBUG
         if DEBUG:
             print(msg)
 
-    def warn (self, msg):
-        sys.stderr.write ("warning: %s\n" % msg)
+    def warn(self, msg):
+        sys.stderr.write("warning: %s\n" % msg)
 
-    def execute (self, func, args, msg=None, level=1):
+    def execute(self, func, args, msg=None, level=1):
         execute(func, args, msg, self.dry_run)
 
-    def spawn (self, cmd):
-        spawn (cmd, dry_run=self.dry_run)
+    def spawn(self, cmd):
+        spawn(cmd, dry_run=self.dry_run)
 
-    def move_file (self, src, dst):
-        return move_file (src, dst, dry_run=self.dry_run)
+    def move_file(self, src, dst):
+        return move_file(src, dst, dry_run=self.dry_run)
 
-    def mkpath (self, name, mode=0o777):
-        mkpath (name, mode, self.dry_run)
-
-
-# class CCompiler
+    def mkpath(self, name, mode=0o777):
+        mkpath(name, mode, self.dry_run)
 
 
 # Map a sys.platform/os.name ('posix', 'nt') to the default compiler
@@ -1068,16 +1009,14 @@ def mkpath (self, name, mode=0o777):
     )
 
 def get_default_compiler(osname=None, platform=None):
+    """Determine the default compiler to use for the given platform.
 
-    """ Determine the default compiler to use for the given platform.
-
-        osname should be one of the standard Python OS names (i.e. the
-        ones returned by os.name) and platform the common value
-        returned by sys.platform for the platform in question.
-
-        The default values are os.name and sys.platform in case the
-        parameters are not given.
+       osname should be one of the standard Python OS names (i.e. the
+       ones returned by os.name) and platform the common value
+       returned by sys.platform for the platform in question.
 
+       The default values are os.name and sys.platform in case the
+       parameters are not given.
     """
     if osname is None:
         osname = os.name
@@ -1126,11 +1065,7 @@ def show_compilers():
     pretty_printer.print_help("List of available compilers:")
 
 
-def new_compiler (plat=None,
-                  compiler=None,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+def new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0):
     """Generate an instance of some CCompiler subclass for the supplied
     platform/compiler combination.  'plat' defaults to 'os.name'
     (eg. 'posix', 'nt'), and 'compiler' defaults to the default compiler
@@ -1153,7 +1088,7 @@ def new_compiler (plat=None,
         msg = "don't know how to compile C/C++ code on platform '%s'" % plat
         if compiler is not None:
             msg = msg + " with '%s' compiler" % compiler
-        raise DistutilsPlatformError, msg
+        raise DistutilsPlatformError(msg)
 
     try:
         module_name = "distutils." + module_name
@@ -1161,21 +1096,21 @@ def new_compiler (plat=None,
         module = sys.modules[module_name]
         klass = vars(module)[class_name]
     except ImportError:
-        raise DistutilsModuleError, \
+        raise DistutilsModuleError(
               "can't compile C/C++ code: unable to load module '%s'" % \
-              module_name
+              module_name)
     except KeyError:
-        raise DistutilsModuleError, \
-              ("can't compile C/C++ code: unable to find class '%s' " +
-               "in module '%s'") % (class_name, module_name)
+        raise DistutilsModuleError(
+               "can't compile C/C++ code: unable to find class '%s' "
+               "in module '%s'" % (class_name, module_name))
 
     # XXX The None is necessary to preserve backwards compatibility
     # with classes that expect verbose to be the first positional
     # argument.
-    return klass (None, dry_run, force)
+    return klass(None, dry_run, force)
 
 
-def gen_preprocess_options (macros, include_dirs):
+def gen_preprocess_options(macros, include_dirs):
     """Generate C pre-processor options (-D, -U, -I) as used by at least
     two types of compilers: the typical Unix compiler and Visual C++.
     'macros' is the usual thing, a list of 1- or 2-tuples, where (name,)
@@ -1196,35 +1131,29 @@ def gen_preprocess_options (macros, include_dirs):
     # redundancies like this should probably be the province of
     # CCompiler, since the data structures used are inherited from it
     # and therefore common to all CCompiler classes.
-
     pp_opts = []
     for macro in macros:
-
-        if not (type (macro) is TupleType and
-                1 <= len (macro) <= 2):
-            raise TypeError, \
-                  ("bad macro definition '%s': " +
-                   "each element of 'macros' list must be a 1- or 2-tuple") % \
-                  macro
-
-        if len (macro) == 1:        # undefine this macro
-            pp_opts.append ("-U%s" % macro[0])
-        elif len (macro) == 2:
+        if not (isinstance(macro, tuple) and 1 <= len(macro) <= 2):
+            raise TypeError(
+                  "bad macro definition '%s': "
+                  "each element of 'macros' list must be a 1- or 2-tuple"
+                  % macro)
+
+        if len(macro) == 1:        # undefine this macro
+            pp_opts.append("-U%s" % macro[0])
+        elif len(macro) == 2:
             if macro[1] is None:    # define with no explicit value
-                pp_opts.append ("-D%s" % macro[0])
+                pp_opts.append("-D%s" % macro[0])
             else:
                 # XXX *don't* need to be clever about quoting the
                 # macro value here, because we're going to avoid the
                 # shell at all costs when we spawn the command!
-                pp_opts.append ("-D%s=%s" % macro)
+                pp_opts.append("-D%s=%s" % macro)
 
     for dir in include_dirs:
-        pp_opts.append ("-I%s" % dir)
-
+        pp_opts.append("-I%s" % dir)
     return pp_opts
 
-# gen_preprocess_options ()
-
 
 def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
@@ -1236,14 +1165,14 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     lib_opts = []
 
     for dir in library_dirs:
-        lib_opts.append (compiler.library_dir_option (dir))
+        lib_opts.append(compiler.library_dir_option(dir))
 
     for dir in runtime_library_dirs:
-        opt = compiler.runtime_library_dir_option (dir)
-        if type(opt) is ListType:
+        opt = compiler.runtime_library_dir_option(dir)
+        if isinstance(opt, list):
             lib_opts = lib_opts + opt
         else:
-            lib_opts.append (opt)
+            lib_opts.append(opt)
 
     # XXX it's important that we *not* remove redundant library mentions!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
@@ -1252,17 +1181,14 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     # pretty nasty way to arrange your C code.
 
     for lib in libraries:
-        (lib_dir, lib_name) = os.path.split (lib)
+        (lib_dir, lib_name) = os.path.split(lib)
         if lib_dir:
-            lib_file = compiler.find_library_file ([lib_dir], lib_name)
+            lib_file = compiler.find_library_file([lib_dir], lib_name)
             if lib_file:
-                lib_opts.append (lib_file)
+                lib_opts.append(lib_file)
             else:
-                compiler.warn ("no library file corresponding to "
-                               "'%s' found (skipping)" % lib)
+                compiler.warn("no library file corresponding to "
+                              "'%s' found (skipping)" % lib)
         else:
-            lib_opts.append (compiler.library_option (lib))
-
+            lib_opts.append(compiler.library_option (lib))
     return lib_opts
-
-# gen_lib_options ()
diff --git a/cmd.py b/cmd.py
index b2c952c38c..66940f7799 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,8 +4,6 @@
 in the distutils.command package.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
@@ -48,7 +46,7 @@ class Command:
 
     # -- Creation/initialization methods -------------------------------
 
-    def __init__ (self, dist):
+    def __init__(self, dist):
         """Create and initialize a new Command object.  Most importantly,
         invokes the 'initialize_options()' method, which is the real
         initializer and depends on the actual command being
@@ -58,9 +56,9 @@ def __init__ (self, dist):
         from distutils.dist import Distribution
 
         if not isinstance(dist, Distribution):
-            raise TypeError, "dist must be a Distribution instance"
+            raise TypeError("dist must be a Distribution instance")
         if self.__class__ is Command:
-            raise RuntimeError, "Command is an abstract class"
+            raise RuntimeError("Command is an abstract class")
 
         self.distribution = dist
         self.initialize_options()
@@ -95,11 +93,8 @@ def __init__ (self, dist):
         # always calls 'finalize_options()', to respect/update it.
         self.finalized = 0
 
-    # __init__ ()
-
 
     # XXX A more explicit way to customize dry_run would be better.
-
     def __getattr__ (self, attr):
         if attr == 'dry_run':
             myval = getattr(self, "_" + attr)
@@ -108,15 +103,13 @@ def __getattr__ (self, attr):
             else:
                 return myval
         else:
-            raise AttributeError, attr
-
+            raise AttributeError(attr)
 
     def ensure_finalized (self):
         if not self.finalized:
             self.finalize_options()
         self.finalized = 1
 
-
     # Subclasses must define:
     #   initialize_options()
     #     provide default values for all options; may be customized by
@@ -130,7 +123,7 @@ def ensure_finalized (self):
     #     run the command: do whatever it is we're here to do,
     #     controlled by the command's various option values
 
-    def initialize_options (self):
+    def initialize_options(self):
         """Set default values for all the options that this command
         supports.  Note that these defaults may be overridden by other
         commands, by the setup script, by config files, or by the
@@ -140,10 +133,10 @@ def initialize_options (self):
 
         This method must be implemented by all command classes.
         """
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
+        raise RuntimeError("abstract method -- subclass %s must override"
+                           % self.__class__)
 
-    def finalize_options (self):
+    def finalize_options(self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
         assignments from the command-line or from other commands have been
@@ -154,11 +147,11 @@ def finalize_options (self):
 
         This method must be implemented by all command classes.
         """
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
+        raise RuntimeError("abstract method -- subclass %s must override"
+                           % self.__class__)
 
 
-    def dump_options (self, header=None, indent=""):
+    def dump_options(self, header=None, indent=""):
         from distutils.fancy_getopt import longopt_xlate
         if header is None:
             header = "command options for '%s':" % self.get_command_name()
@@ -172,7 +165,7 @@ def dump_options (self, header=None, indent=""):
             print(indent + "%s = %s" % (option, value))
 
 
-    def run (self):
+    def run(self):
         """A command's raison d'etre: carry out the action it exists to
         perform, controlled by the options initialized in
         'initialize_options()', customized by other commands, the setup
@@ -183,16 +176,16 @@ def run (self):
         This method must be implemented by all command classes.
         """
 
-        raise RuntimeError, \
-              "abstract method -- subclass %s must override" % self.__class__
+        raise RuntimeError("abstract method -- subclass %s must override"
+                           % self.__class__)
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         """If the current verbosity level is of greater than or equal to
         'level' print 'msg' to stdout.
         """
         log.log(level, msg)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
@@ -202,7 +195,6 @@ def debug_print (self, msg):
             sys.stdout.flush()
 
 
-
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)
     #
@@ -216,23 +208,23 @@ def debug_print (self, msg):
     # and they can be guaranteed that thereafter, self.foo will be
     # a list of strings.
 
-    def _ensure_stringlike (self, option, what, default=None):
+    def _ensure_stringlike(self, option, what, default=None):
         val = getattr(self, option)
         if val is None:
             setattr(self, option, default)
             return default
         elif not isinstance(val, basestring):
-            raise DistutilsOptionError, \
-                  "'%s' must be a %s (got `%s`)" % (option, what, val)
+            raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
+                                       % (option, what, val))
         return val
 
-    def ensure_string (self, option, default=None):
+    def ensure_string(self, option, default=None):
         """Ensure that 'option' is a string; if not defined, set it to
         'default'.
         """
         self._ensure_stringlike(option, "string", default)
 
-    def ensure_string_list (self, option):
+    def ensure_string_list(self, option):
         """Ensure that 'option' is a list of strings.  If 'option' is
         currently a string, we split it either on /,\s*/ or /\s+/, so
         "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
@@ -247,27 +239,26 @@ def ensure_string_list (self, option):
             if isinstance(val, list):
                 ok = all(isinstance(v, basestring) for v in val)
             else:
-                ok = 0
-
+                ok = False
             if not ok:
-                raise DistutilsOptionError, \
-                      "'%s' must be a list of strings (got %r)" % \
-                      (option, val)
+                raise DistutilsOptionError(
+                      "'%s' must be a list of strings (got %r)"
+                      % (option, val))
 
-    def _ensure_tested_string (self, option, tester,
-                               what, error_fmt, default=None):
+    def _ensure_tested_string(self, option, tester, what, error_fmt,
+                              default=None):
         val = self._ensure_stringlike(option, what, default)
         if val is not None and not tester(val):
-            raise DistutilsOptionError, \
-                  ("error in '%s' option: " + error_fmt) % (option, val)
+            raise DistutilsOptionError(("error in '%s' option: " + error_fmt)
+                                       % (option, val))
 
-    def ensure_filename (self, option):
+    def ensure_filename(self, option):
         """Ensure that 'option' is the name of an existing file."""
         self._ensure_tested_string(option, os.path.isfile,
                                    "filename",
                                    "'%s' does not exist or is not a file")
 
-    def ensure_dirname (self, option):
+    def ensure_dirname(self, option):
         self._ensure_tested_string(option, os.path.isdir,
                                    "directory name",
                                    "'%s' does not exist or is not a directory")
@@ -275,14 +266,13 @@ def ensure_dirname (self, option):
 
     # -- Convenience methods for commands ------------------------------
 
-    def get_command_name (self):
+    def get_command_name(self):
         if hasattr(self, 'command_name'):
             return self.command_name
         else:
             return self.__class__.__name__
 
-
-    def set_undefined_options (self, src_cmd, *option_pairs):
+    def set_undefined_options(self, src_cmd, *option_pairs):
         """Set the values of any "undefined" options from corresponding
         option values in some other command object.  "Undefined" here means
         "is None", which is the convention used to indicate that an option
@@ -296,18 +286,14 @@ def set_undefined_options (self, src_cmd, *option_pairs):
         'src_option' in the 'src_cmd' command object, and copy it to
         'dst_option' in the current command object".
         """
-
         # Option_pairs: list of (src_option, dst_option) tuples
-
         src_cmd_obj = self.distribution.get_command_obj(src_cmd)
         src_cmd_obj.ensure_finalized()
         for (src_option, dst_option) in option_pairs:
             if getattr(self, dst_option) is None:
-                setattr(self, dst_option,
-                        getattr(src_cmd_obj, src_option))
+                setattr(self, dst_option, getattr(src_cmd_obj, src_option))
 
-
-    def get_finalized_command (self, command, create=1):
+    def get_finalized_command(self, command, create=1):
         """Wrapper around Distribution's 'get_command_obj()' method: find
         (create if necessary and 'create' is true) the command object for
         'command', call its 'ensure_finalized()' method, and return the
@@ -319,19 +305,18 @@ def get_finalized_command (self, command, create=1):
 
     # XXX rename to 'get_reinitialized_command()'? (should do the
     # same in dist.py, if so)
-    def reinitialize_command (self, command, reinit_subcommands=0):
-        return self.distribution.reinitialize_command(
-            command, reinit_subcommands)
+    def reinitialize_command(self, command, reinit_subcommands=0):
+        return self.distribution.reinitialize_command(command,
+                                                      reinit_subcommands)
 
-    def run_command (self, command):
+    def run_command(self, command):
         """Run some other command: uses the 'run_command()' method of
         Distribution, which creates and finalizes the command object if
         necessary and then invokes its 'run()' method.
         """
         self.distribution.run_command(command)
 
-
-    def get_sub_commands (self):
+    def get_sub_commands(self):
         """Determine the sub-commands that are relevant in the current
         distribution (ie., that need to be run).  This is based on the
         'sub_commands' class attribute: each tuple in that list may include
@@ -347,62 +332,49 @@ def get_sub_commands (self):
 
     # -- External world manipulation -----------------------------------
 
-    def warn (self, msg):
-        sys.stderr.write("warning: %s: %s\n" %
-                         (self.get_command_name(), msg))
-
+    def warn(self, msg):
+        sys.stderr.write("warning: %s: %s\n" % (self.get_command_name(), msg))
 
-    def execute (self, func, args, msg=None, level=1):
+    def execute(self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
 
-
-    def mkpath (self, name, mode=0o777):
+    def mkpath(self, name, mode=0o777):
         dir_util.mkpath(name, mode, dry_run=self.dry_run)
 
-
-    def copy_file (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, link=None, level=1):
+    def copy_file(self, infile, outfile, preserve_mode=1, preserve_times=1,
+                  link=None, level=1):
         """Copy a file respecting verbose, dry-run and force flags.  (The
         former two default to whatever is in the Distribution object, and
         the latter defaults to false for commands that don't define it.)"""
+        return file_util.copy_file(infile, outfile, preserve_mode,
+                                   preserve_times, not self.force, link,
+                                   dry_run=self.dry_run)
 
-        return file_util.copy_file(
-            infile, outfile,
-            preserve_mode, preserve_times,
-            not self.force,
-            link,
-            dry_run=self.dry_run)
-
-
-    def copy_tree (self, infile, outfile,
-                   preserve_mode=1, preserve_times=1, preserve_symlinks=0,
-                   level=1):
+    def copy_tree (self, infile, outfile, preserve_mode=1, preserve_times=1,
+                   preserve_symlinks=0, level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
         and force flags.
         """
-        return dir_util.copy_tree(
-            infile, outfile,
-            preserve_mode,preserve_times,preserve_symlinks,
-            not self.force,
-            dry_run=self.dry_run)
+        return dir_util.copy_tree(infile, outfile, preserve_mode,
+                                  preserve_times, preserve_symlinks,
+                                  not self.force, dry_run=self.dry_run)
 
     def move_file (self, src, dst, level=1):
         """Move a file respectin dry-run flag."""
-        return file_util.move_file(src, dst, dry_run = self.dry_run)
+        return file_util.move_file(src, dst, dry_run=self.dry_run)
 
-    def spawn (self, cmd, search_path=1, level=1):
+    def spawn(self, cmd, search_path=1, level=1):
         """Spawn an external command respecting dry-run flag."""
         from distutils.spawn import spawn
-        spawn(cmd, search_path, dry_run= self.dry_run)
+        spawn(cmd, search_path, dry_run=self.dry_run)
 
-    def make_archive (self, base_name, format,
-                      root_dir=None, base_dir=None):
-        return archive_util.make_archive(
-            base_name, format, root_dir, base_dir, dry_run=self.dry_run)
+    def make_archive(self, base_name, format, root_dir=None, base_dir=None):
+        return archive_util.make_archive(base_name, format, root_dir, base_dir,
+                                         dry_run=self.dry_run)
 
 
-    def make_file (self, infiles, outfile, func, args,
-                   exec_msg=None, skip_msg=None, level=1):
+    def make_file(self, infiles, outfile, func, args,
+                  exec_msg=None, skip_msg=None, level=1):
         """Special case of 'execute()' for operations that process one or
         more input files and generate one output file.  Works just like
         'execute()', except the operation is skipped and a different
@@ -412,8 +384,7 @@ def make_file (self, infiles, outfile, func, args,
         timestamp checks.
         """
         if exec_msg is None:
-            exec_msg = "generating %s from %s" % \
-                       (outfile, ', '.join(infiles))
+            exec_msg = "generating %s from %s" % (outfile, ', '.join(infiles))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
 
@@ -422,30 +393,25 @@ def make_file (self, infiles, outfile, func, args,
         if isinstance(infiles, basestring):
             infiles = (infiles,)
         elif not isinstance(infiles, (list, tuple)):
-            raise TypeError, \
-                  "'infiles' must be a string, or a list or tuple of strings"
+            raise TypeError(
+                  "'infiles' must be a string, or a list or tuple of strings")
 
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
         if self.force or dep_util.newer_group (infiles, outfile):
             self.execute(func, args, exec_msg, level)
-
         # Otherwise, print the "skip" message
         else:
             log.debug(skip_msg)
 
-    # make_file ()
-
-# class Command
-
 
 # XXX 'install_misc' class not currently used -- it was the base class for
 # both 'install_scripts' and 'install_data', but they outgrew it.  It might
 # still be useful for 'install_headers', though, so I'm keeping it around
 # for the time being.
 
-class install_misc (Command):
+class install_misc(Command):
     """Common base class for installing some files in a subdirectory.
     Currently used by install_data and install_scripts.
     """
diff --git a/command/__init__.py b/command/__init__.py
index 0888c2712b..add83f8740 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -3,8 +3,6 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 __all__ = ['build',
diff --git a/command/bdist.py b/command/bdist.py
index d6897d2d09..69c1b28ff2 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,22 +3,19 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
-from types import *
 from distutils.core import Command
 from distutils.errors import *
 from distutils.util import get_platform
 
 
-def show_formats ():
+def show_formats():
     """Print list of available formats (arguments to "--format" option).
     """
     from distutils.fancy_getopt import FancyGetopt
-    formats=[]
+    formats = []
     for format in bdist.format_commands:
         formats.append(("formats=" + format, None,
                         bdist.format_command[format][1]))
@@ -26,7 +23,7 @@ def show_formats ():
     pretty_printer.print_help("List of available distribution formats:")
 
 
-class bdist (Command):
+class bdist(Command):
 
     description = "create a built (binary) distribution"
 
@@ -84,17 +81,14 @@ class bdist (Command):
                       }
 
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_base = None
         self.plat_name = None
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
 
-    # initialize_options()
-
-
-    def finalize_options (self):
+    def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
             self.plat_name = get_platform()
@@ -112,25 +106,21 @@ def finalize_options (self):
             try:
                 self.formats = [self.default_format[os.name]]
             except KeyError:
-                raise DistutilsPlatformError, \
-                      "don't know how to create built distributions " + \
-                      "on platform %s" % os.name
+                raise DistutilsPlatformError(
+                      "don't know how to create built distributions "
+                      "on platform %s" % os.name)
 
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
-    # finalize_options()
-
-
-    def run (self):
-
+    def run(self):
         # Figure out which sub-commands we need to run.
         commands = []
         for format in self.formats:
             try:
                 commands.append(self.format_command[format][0])
             except KeyError:
-                raise DistutilsOptionError, "invalid format '%s'" % format
+                raise DistutilsOptionError("invalid format '%s'" % format)
 
         # Reinitialize and run each command.
         for i in range(len(self.formats)):
@@ -144,7 +134,3 @@ def run (self):
             if cmd_name in commands[i+1:]:
                 sub_cmd.keep_temp = 1
             self.run_command(cmd_name)
-
-    # run()
-
-# class bdist
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index ccba00955a..f89961769c 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,8 +4,6 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -16,7 +14,7 @@
 from distutils.sysconfig import get_python_version
 from distutils import log
 
-class bdist_dumb (Command):
+class bdist_dumb(Command):
 
     description = "create a \"dumb\" built distribution"
 
@@ -45,8 +43,7 @@ class bdist_dumb (Command):
                        'nt': 'zip',
                        'os2': 'zip' }
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
         self.format = None
@@ -55,11 +52,7 @@ def initialize_options (self):
         self.skip_build = 0
         self.relative = 0
 
-    # initialize_options()
-
-
-    def finalize_options (self):
-
+    def finalize_options(self):
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'dumb')
@@ -68,19 +61,15 @@ def finalize_options (self):
             try:
                 self.format = self.default_format[os.name]
             except KeyError:
-                raise DistutilsPlatformError, \
-                      ("don't know how to create dumb built distributions " +
-                       "on platform %s") % os.name
+                raise DistutilsPlatformError(
+                       "don't know how to create dumb built distributions "
+                       "on platform %s" % os.name)
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
                                    ('plat_name', 'plat_name'))
 
-    # finalize_options()
-
-
-    def run (self):
-
+    def run(self):
         if not self.skip_build:
             self.run_command('build')
 
@@ -108,8 +97,8 @@ def run (self):
         else:
             if (self.distribution.has_ext_modules() and
                 (install.install_base != install.install_platbase)):
-                raise DistutilsPlatformError, \
-                      ("can't make a dumb built distribution where "
+                raise DistutilsPlatformError(
+                       "can't make a dumb built distribution where "
                        "base and platbase are different (%s, %s)"
                        % (repr(install.install_base),
                           repr(install.install_platbase)))
@@ -129,7 +118,3 @@ def run (self):
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
-
-    # run()
-
-# class bdist_dumb
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 5225bed1b2..d313a5082f 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -81,7 +81,7 @@ def xbutton(self, name, title, next, xpos):
         Return the button, so that events can be associated"""
         return self.pushbutton(name, int(self.w*xpos - 28), self.h-27, 56, 17, 3, title, next)
 
-class bdist_msi (Command):
+class bdist_msi(Command):
 
     description = "create a Microsoft Installer (.msi) binary distribution"
 
@@ -114,7 +114,7 @@ class bdist_msi (Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_dir = None
         self.keep_temp = 0
         self.no_target_compile = 0
@@ -125,7 +125,7 @@ def initialize_options (self):
         self.install_script = None
         self.pre_install_script = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
@@ -133,30 +133,29 @@ def finalize_options (self):
         if self.target_version:
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
-                raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
-                      " option must be specified" % (short_version,)
+                raise DistutilsOptionError(
+                      "target version can only be %s, or the '--skip_build'"
+                      " option must be specified" % (short_version,))
         else:
             self.target_version = short_version
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
         if self.pre_install_script:
-            raise DistutilsOptionError, "the pre-install-script feature is not yet implemented"
+            raise DistutilsOptionError(
+                  "the pre-install-script feature is not yet implemented")
 
         if self.install_script:
             for script in self.distribution.scripts:
                 if self.install_script == os.path.basename(script):
                     break
             else:
-                raise DistutilsOptionError, \
-                      "install_script '%s' not found in scripts" % \
-                      self.install_script
+                raise DistutilsOptionError(
+                      "install_script '%s' not found in scripts"
+                      % self.install_script)
         self.install_script_key = None
-    # finalize_options()
 
-
-    def run (self):
+    def run(self):
         if not self.skip_build:
             self.run_command('build')
 
@@ -263,7 +262,8 @@ def add_files(self):
                     key = dir.add_file(file)
                     if file==self.install_script:
                         if self.install_script_key:
-                            raise DistutilsOptionError, "Multiple files with name %s" % file
+                            raise DistutilsOptionError(
+                                  "Multiple files with name %s" % file)
                         self.install_script_key = '[#%s]' % key
 
         cab.commit(db)
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index ef2bdfd808..72f74f9c53 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,13 +3,10 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
 import glob
-from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.util import get_platform
@@ -18,7 +15,7 @@
 from distutils.sysconfig import get_python_version
 from distutils import log
 
-class bdist_rpm (Command):
+class bdist_rpm(Command):
 
     description = "create an RPM distribution"
 
@@ -136,7 +133,7 @@ class bdist_rpm (Command):
                     'rpm2-mode': 'rpm3-mode'}
 
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_base = None
         self.rpm_base = None
         self.dist_dir = None
@@ -180,15 +177,12 @@ def initialize_options (self):
 
         self.force_arch = None
 
-    # initialize_options()
-
-
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
         if self.rpm_base is None:
             if not self.rpm3_mode:
-                raise DistutilsOptionError, \
-                      "you must specify --rpm-base in RPM 2 mode"
+                raise DistutilsOptionError(
+                      "you must specify --rpm-base in RPM 2 mode")
             self.rpm_base = os.path.join(self.bdist_base, "rpm")
 
         if self.python is None:
@@ -197,16 +191,15 @@ def finalize_options (self):
             else:
                 self.python = "python"
         elif self.fix_python:
-            raise DistutilsOptionError, \
-                  "--python and --fix-python are mutually exclusive options"
+            raise DistutilsOptionError(
+                  "--python and --fix-python are mutually exclusive options")
 
         if os.name != 'posix':
-            raise DistutilsPlatformError, \
-                  ("don't know how to create RPM "
+            raise DistutilsPlatformError("don't know how to create RPM "
                    "distributions on platform %s" % os.name)
         if self.binary_only and self.source_only:
-            raise DistutilsOptionError, \
-                  "cannot supply both '--source-only' and '--binary-only'"
+            raise DistutilsOptionError(
+                  "cannot supply both '--source-only' and '--binary-only'")
 
         # don't pass CFLAGS to pure python distributions
         if not self.distribution.has_ext_modules():
@@ -215,16 +208,14 @@ def finalize_options (self):
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
         self.finalize_package_data()
 
-    # finalize_options()
-
-    def finalize_package_data (self):
+    def finalize_package_data(self):
         self.ensure_string('group', "Development/Libraries")
         self.ensure_string('vendor',
                            "%s <%s>" % (self.distribution.get_contact(),
                                         self.distribution.get_contact_email()))
         self.ensure_string('packager')
         self.ensure_string_list('doc_files')
-        if type(self.doc_files) is ListType:
+        if isinstance(self.doc_files, list):
             for readme in ('README', 'README.txt'):
                 if os.path.exists(readme) and readme not in self.doc_files:
                     self.doc_files.append(readme)
@@ -261,11 +252,8 @@ def finalize_package_data (self):
         self.ensure_string_list('obsoletes')
 
         self.ensure_string('force_arch')
-    # finalize_package_data ()
-
-
-    def run (self):
 
+    def run(self):
         if DEBUG:
             print("before _get_package_data():")
             print("vendor =", self.vendor)
@@ -315,9 +303,8 @@ def run (self):
             if os.path.exists(self.icon):
                 self.copy_file(self.icon, source_dir)
             else:
-                raise DistutilsFileError, \
-                      "icon file '%s' does not exist" % self.icon
-
+                raise DistutilsFileError(
+                      "icon file '%s' does not exist" % self.icon)
 
         # build package
         log.info("building RPMs")
@@ -350,7 +337,7 @@ def run (self):
         out = os.popen(q_cmd)
         binary_rpms = []
         source_rpm = None
-        while 1:
+        while True:
             line = out.readline()
             if not line:
                 break
@@ -378,7 +365,6 @@ def run (self):
                     rpm = os.path.join(rpm_dir['RPMS'], rpm)
                     if os.path.exists(rpm):
                         self.move_file(rpm, self.dist_dir)
-    # run()
 
     def _dist_path(self, path):
         return os.path.join(self.dist_dir, os.path.basename(path))
@@ -438,7 +424,7 @@ def _make_spec_file(self):
                       'Obsoletes',
                       ):
             val = getattr(self, field.lower())
-            if type(val) is ListType:
+            if isinstance(val, list):
                 spec_file.append('%s: %s' % (field, ' '.join(val)))
             elif val is not None:
                 spec_file.append('%s: %s' % (field, val))
@@ -536,8 +522,6 @@ def _make_spec_file(self):
 
         return spec_file
 
-    # _make_spec_file ()
-
     def _format_changelog(self, changelog):
         """Format the changelog correctly and convert it to a list of strings
         """
@@ -558,7 +542,3 @@ def _format_changelog(self, changelog):
             del new_changelog[0]
 
         return new_changelog
-
-    # _format_changelog()
-
-# class bdist_rpm
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 55d5d7e1b1..249b74c1bb 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
@@ -15,7 +13,7 @@
 from distutils.sysconfig import get_python_version
 from distutils import log
 
-class bdist_wininst (Command):
+class bdist_wininst(Command):
 
     description = "create an executable installer for MS Windows"
 
@@ -52,7 +50,7 @@ class bdist_wininst (Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_dir = None
         self.keep_temp = 0
         self.no_target_compile = 0
@@ -65,10 +63,8 @@ def initialize_options (self):
         self.install_script = None
         self.pre_install_script = None
 
-    # initialize_options()
-
 
-    def finalize_options (self):
+    def finalize_options(self):
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
@@ -77,9 +73,9 @@ def finalize_options (self):
         if not self.skip_build and self.distribution.has_ext_modules():
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
-                raise DistutilsOptionError, \
+                raise DistutilsOptionError(
                       "target version can only be %s, or the '--skip_build'" \
-                      " option must be specified" % (short_version,)
+                      " option must be specified" % (short_version,))
             self.target_version = short_version
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
@@ -89,13 +85,11 @@ def finalize_options (self):
                 if self.install_script == os.path.basename(script):
                     break
             else:
-                raise DistutilsOptionError, \
-                      "install_script '%s' not found in scripts" % \
-                      self.install_script
-    # finalize_options()
+                raise DistutilsOptionError(
+                      "install_script '%s' not found in scripts"
+                      % self.install_script)
 
-
-    def run (self):
+    def run(self):
         if (sys.platform != "win32" and
             (self.distribution.has_ext_modules() or
              self.distribution.has_c_libraries())):
@@ -175,11 +169,8 @@ def run (self):
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
-    # run()
-
-    def get_inidata (self):
+    def get_inidata(self):
         # Return data describing the installation.
-
         lines = []
         metadata = self.distribution.metadata
 
@@ -222,9 +213,7 @@ def escape(s):
         lines.append("build_info=%s" % build_info)
         return "\n".join(lines)
 
-    # get_inidata()
-
-    def create_exe (self, arcname, fullname, bitmap=None):
+    def create_exe(self, arcname, fullname, bitmap=None):
         import struct
 
         self.mkpath(self.dist_dir)
@@ -272,8 +261,6 @@ def create_exe (self, arcname, fullname, bitmap=None):
         file.write(header)
         file.write(open(arcname, "rb").read())
 
-    # create_exe()
-
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
         if self.target_version:
@@ -286,9 +273,8 @@ def get_installer_filename(self, fullname):
             installer_name = os.path.join(self.dist_dir,
                                           "%s.win32.exe" % fullname)
         return installer_name
-    # get_installer_filename()
 
-    def get_exe_bytes (self):
+    def get_exe_bytes(self):
         from distutils.msvccompiler import get_build_version
         # If a target-version other than the current version has been
         # specified, then using the MSVC version from *this* build is no good.
@@ -320,4 +306,3 @@ def get_exe_bytes (self):
         # used for python.  XXX What about mingw, borland, and so on?
         filename = os.path.join(directory, "wininst-%s.exe" % bv)
         return open(filename, "rb").read()
-# class bdist_wininst
diff --git a/command/build.py b/command/build.py
index 9ae0a292a3..1f2ce06205 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
@@ -11,12 +9,12 @@
 from distutils.util import get_platform
 
 
-def show_compilers ():
+def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
 
-class build (Command):
+class build(Command):
 
     description = "build everything needed to install"
 
@@ -51,7 +49,7 @@ class build (Command):
          "list available compilers", show_compilers),
         ]
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_base = 'build'
         # these are decided only after 'build_base' has its final value
         # (unless overridden by the user or client)
@@ -65,8 +63,7 @@ def initialize_options (self):
         self.force = 0
         self.executable = None
 
-    def finalize_options (self):
-
+    def finalize_options(self):
         plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
 
         # 'build_purelib' and 'build_platlib' just default to 'lib' and
@@ -98,11 +95,8 @@ def finalize_options (self):
 
         if self.executable is None:
             self.executable = os.path.normpath(sys.executable)
-    # finalize_options ()
-
-
-    def run (self):
 
+    def run(self):
         # Run all relevant sub-commands.  This will be some subset of:
         #  - build_py      - pure Python modules
         #  - build_clib    - standalone C libraries
@@ -114,16 +108,16 @@ def run (self):
 
     # -- Predicates for the sub-command list ---------------------------
 
-    def has_pure_modules (self):
+    def has_pure_modules(self):
         return self.distribution.has_pure_modules()
 
-    def has_c_libraries (self):
+    def has_c_libraries(self):
         return self.distribution.has_c_libraries()
 
-    def has_ext_modules (self):
+    def has_ext_modules(self):
         return self.distribution.has_ext_modules()
 
-    def has_scripts (self):
+    def has_scripts(self):
         return self.distribution.has_scripts()
 
 
@@ -132,5 +126,3 @@ def has_scripts (self):
                     ('build_ext',     has_ext_modules),
                     ('build_scripts', has_scripts),
                    ]
-
-# class build
diff --git a/command/build_clib.py b/command/build_clib.py
index bdf98bf3f2..5f95207ca9 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,8 +4,6 @@
 that is included in the module distribution and needed by an extension
 module."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 
@@ -19,18 +17,17 @@
 # cut 'n paste.  Sigh.
 
 import os
-from types import *
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
-def show_compilers ():
+def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
 
-class build_clib (Command):
+class build_clib(Command):
 
     description = "build C/C++ libraries used by Python extensions"
 
@@ -54,7 +51,7 @@ class build_clib (Command):
          "list available compilers", show_compilers),
         ]
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_clib = None
         self.build_temp = None
 
@@ -69,11 +66,8 @@ def initialize_options (self):
         self.force = 0
         self.compiler = None
 
-    # initialize_options()
-
-
-    def finalize_options (self):
 
+    def finalize_options(self):
         # This might be confusing: both build-clib and build-temp default
         # to build-temp as defined by the "build" command.  This is because
         # I think that C libraries are really just temporary build
@@ -98,11 +92,8 @@ def finalize_options (self):
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
 
-    # finalize_options()
-
-
-    def run (self):
 
+    def run(self):
         if not self.libraries:
             return
 
@@ -125,51 +116,41 @@ def run (self):
 
         self.build_libraries(self.libraries)
 
-    # run()
 
-
-    def check_library_list (self, libraries):
+    def check_library_list(self, libraries):
         """Ensure that the list of libraries (presumably provided as a
            command option 'libraries') is valid, i.e. it is a list of
            2-tuples, where the tuples are (library_name, build_info_dict).
            Raise DistutilsSetupError if the structure is invalid anywhere;
            just returns otherwise."""
-
         # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
         # with only names changed to protect the innocent!
-
-        if type(libraries) is not ListType:
-            raise DistutilsSetupError, \
-                  "'libraries' option must be a list of tuples"
+        if not isinstance(libraries, list):
+            raise DistutilsSetupError(
+                  "'libraries' option must be a list of tuples")
 
         for lib in libraries:
-            if type(lib) is not TupleType and len(lib) != 2:
-                raise DistutilsSetupError, \
-                      "each element of 'libraries' must a 2-tuple"
+            if not isinstance(lib, tuple) and len(lib) != 2:
+                raise DistutilsSetupError(
+                      "each element of 'libraries' must a 2-tuple")
 
             if isinstance(lib[0], basestring):
-                raise DistutilsSetupError, \
-                      "first element of each tuple in 'libraries' " + \
-                      "must be a string (the library name)"
+                raise DistutilsSetupError(
+                      "first element of each tuple in 'libraries' "
+                      "must be a string (the library name)")
             if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
-                raise DistutilsSetupError, \
-                      ("bad library name '%s': " +
-                       "may not contain directory separators") % \
-                      lib[0]
-
-            if type(lib[1]) is not DictionaryType:
-                raise DistutilsSetupError, \
-                      "second element of each tuple in 'libraries' " + \
-                      "must be a dictionary (build info)"
-        # for lib
+                raise DistutilsSetupError("bad library name '%s': "
+                       "may not contain directory separators" % lib[0])
 
-    # check_library_list ()
+            if not isinstance(lib[1], dict):
+                raise DistutilsSetupError(
+                      "second element of each tuple in 'libraries' "
+                      "must be a dictionary (build info)")
 
 
-    def get_library_names (self):
+    def get_library_names(self):
         # Assume the library list is valid -- 'check_library_list()' is
         # called from 'finalize_options()', so it should be!
-
         if not self.libraries:
             return None
 
@@ -178,36 +159,30 @@ def get_library_names (self):
             lib_names.append(lib_name)
         return lib_names
 
-    # get_library_names ()
-
 
-    def get_source_files (self):
+    def get_source_files(self):
         self.check_library_list(self.libraries)
         filenames = []
         for (lib_name, build_info) in self.libraries:
             sources = build_info.get('sources')
-            if (sources is None or
-                type(sources) not in (ListType, TupleType) ):
-                raise DistutilsSetupError, \
-                      ("in 'libraries' option (library '%s'), "
+            if sources is None or not isinstance(sources, (list, tuple)):
+                raise DistutilsSetupError(
+                       "in 'libraries' option (library '%s'), "
                        "'sources' must be present and must be "
-                       "a list of source filenames") % lib_name
+                       "a list of source filenames" % lib_name)
 
             filenames.extend(sources)
-
         return filenames
-    # get_source_files ()
-
 
-    def build_libraries (self, libraries):
 
+    def build_libraries(self, libraries):
         for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')
-            if sources is None or type(sources) not in (ListType, TupleType):
-                raise DistutilsSetupError, \
-                      ("in 'libraries' option (library '%s'), " +
-                       "'sources' must be present and must be " +
-                       "a list of source filenames") % lib_name
+            if sources is None or not isinstance(sources, (list, tuple)):
+                raise DistutilsSetupError(
+                       "in 'libraries' option (library '%s'), "
+                       "'sources' must be present and must be "
+                       "a list of source filenames" % lib_name)
             sources = list(sources)
 
             log.info("building '%s' library", lib_name)
@@ -229,9 +204,3 @@ def build_libraries (self, libraries):
             self.compiler.create_static_lib(objects, lib_name,
                                             output_dir=self.build_clib,
                                             debug=self.debug)
-
-        # for libraries
-
-    # build_libraries ()
-
-# class build_lib
diff --git a/command/build_ext.py b/command/build_ext.py
index 0236a26835..a439c49ac6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,12 +4,9 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
-from types import *
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -28,7 +25,7 @@ def show_compilers ():
     show_compilers()
 
 
-class build_ext (Command):
+class build_ext(Command):
 
     description = "build C/C++ extensions (compile/link to build directory)"
 
@@ -94,7 +91,7 @@ class build_ext (Command):
          "list available compilers", show_compilers),
         ]
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.extensions = None
         self.build_lib = None
         self.build_temp = None
@@ -115,7 +112,7 @@ def initialize_options (self):
         self.swig_cpp = None
         self.swig_opts = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         from distutils import sysconfig
 
         self.set_undefined_options('build',
@@ -130,7 +127,6 @@ def finalize_options (self):
 
         self.extensions = self.distribution.ext_modules
 
-
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
         py_include = sysconfig.get_python_inc()
@@ -226,11 +222,7 @@ def finalize_options (self):
         else:
             self.swig_opts = self.swig_opts.split(' ')
 
-    # finalize_options ()
-
-
-    def run (self):
-
+    def run(self):
         from distutils.ccompiler import new_compiler
 
         # 'self.extensions', as supplied by setup.py, is a list of
@@ -289,10 +281,7 @@ def run (self):
         # Now actually compile and link everything.
         self.build_extensions()
 
-    # run ()
-
-
-    def check_extensions_list (self, extensions):
+    def check_extensions_list(self, extensions):
         """Ensure that the list of extensions (presumably provided as a
         command option 'extensions') is valid, i.e. it is a list of
         Extension objects.  We also support the old-style list of 2-tuples,
@@ -302,34 +291,33 @@ def check_extensions_list (self, extensions):
         Raise DistutilsSetupError if the structure is invalid anywhere;
         just returns otherwise.
         """
-        if type(extensions) is not ListType:
-            raise DistutilsSetupError, \
-                  "'ext_modules' option must be a list of Extension instances"
+        if not isinstance(extensions, list):
+            raise DistutilsSetupError(
+                  "'ext_modules' option must be a list of Extension instances")
 
-        for i in range(len(extensions)):
-            ext = extensions[i]
+        for i, ext in enumerate(extensions):
             if isinstance(ext, Extension):
                 continue                # OK! (assume type-checking done
                                         # by Extension constructor)
 
             (ext_name, build_info) = ext
-            log.warn(("old-style (ext_name, build_info) tuple found in "
-                      "ext_modules for extension '%s'"
-                      "-- please convert to Extension instance" % ext_name))
-            if type(ext) is not TupleType and len(ext) != 2:
-                raise DistutilsSetupError, \
-                      ("each element of 'ext_modules' option must be an "
+            log.warn("old-style (ext_name, build_info) tuple found in "
+                     "ext_modules for extension '%s'"
+                     "-- please convert to Extension instance" % ext_name)
+            if not isinstance(ext, tuple) and len(ext) != 2:
+                raise DistutilsSetupError(
+                       "each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
             if not (isinstance(ext_name, basestring) and
                     extension_name_re.match(ext_name)):
-                raise DistutilsSetupError, \
-                      ("first element of each tuple in 'ext_modules' "
+                raise DistutilsSetupError(
+                       "first element of each tuple in 'ext_modules' "
                        "must be the extension name (a string)")
 
-            if type(build_info) is not DictionaryType:
-                raise DistutilsSetupError, \
-                      ("second element of each tuple in 'ext_modules' "
+            if not instance(build_info, DictionaryType):
+                raise DistutilsSetupError(
+                       "second element of each tuple in 'ext_modules' "
                        "must be a dictionary (build info)")
 
             # OK, the (ext_name, build_info) dict is type-safe: convert it
@@ -361,11 +349,10 @@ def check_extensions_list (self, extensions):
                 ext.define_macros = []
                 ext.undef_macros = []
                 for macro in macros:
-                    if not (type(macro) is TupleType and
-                            1 <= len(macro) <= 2):
-                        raise DistutilsSetupError, \
-                              ("'macros' element of build info dict "
-                               "must be 1- or 2-tuple")
+                    if not (isinstance(macro, tuple) and len(macro) in (1, 2)):
+                        raise DistutilsSetupError(
+                              "'macros' element of build info dict "
+                              "must be 1- or 2-tuple")
                     if len(macro) == 1:
                         ext.undef_macros.append(macro[0])
                     elif len(macro) == 2:
@@ -373,24 +360,16 @@ def check_extensions_list (self, extensions):
 
             extensions[i] = ext
 
-        # for extensions
-
-    # check_extensions_list ()
-
-
-    def get_source_files (self):
+    def get_source_files(self):
         self.check_extensions_list(self.extensions)
         filenames = []
 
         # Wouldn't it be neat if we knew the names of header files too...
         for ext in self.extensions:
             filenames.extend(ext.sources)
-
         return filenames
 
-
-    def get_outputs (self):
-
+    def get_outputs(self):
         # Sanity check the 'extensions' list -- can't assume this is being
         # done in the same run as a 'build_extensions()' call (in fact, we
         # can probably assume that it *isn't*!).
@@ -406,8 +385,6 @@ def get_outputs (self):
                                         self.get_ext_filename(fullname)))
         return outputs
 
-    # get_outputs ()
-
     def build_extensions(self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
@@ -417,11 +394,11 @@ def build_extensions(self):
 
     def build_extension(self, ext):
         sources = ext.sources
-        if sources is None or type(sources) not in (ListType, TupleType):
-            raise DistutilsSetupError, \
-                  ("in 'ext_modules' option (extension '%s'), " +
-                   "'sources' must be present and must be " +
-                   "a list of source filenames") % ext.name
+        if sources is None or not isinstance(sources, (list, tuple)):
+            raise DistutilsSetupError(
+                  "in 'ext_modules' option (extension '%s'), "
+                  "'sources' must be present and must be "
+                  "a list of source filenames" % ext.name)
         sources = list(sources)
 
         fullname = self.get_ext_fullname(ext.name)
@@ -512,15 +489,12 @@ def build_extension(self, ext):
             build_temp=self.build_temp,
             target_lang=language)
 
-
-    def swig_sources (self, sources, extension):
-
+    def swig_sources(self, sources, extension):
         """Walk the list of source files in 'sources', looking for SWIG
         interface (.i) files.  Run SWIG on all that are found, and
         return a modified 'sources' list with SWIG source files replaced
         by the generated C (or C++) files.
         """
-
         new_sources = []
         swig_sources = []
         swig_targets = {}
@@ -569,18 +543,14 @@ def swig_sources (self, sources, extension):
 
         return new_sources
 
-    # swig_sources ()
-
-    def find_swig (self):
+    def find_swig(self):
         """Return the name of the SWIG executable.  On Unix, this is
         just "swig" -- it should be in the PATH.  Tries a bit harder on
         Windows.
         """
-
         if os.name == "posix":
             return "swig"
         elif os.name == "nt":
-
             # Look for SWIG in its standard installation directory on
             # Windows (or so I presume!).  If we find it there, great;
             # if not, act like Unix and assume it's in the PATH.
@@ -590,33 +560,28 @@ def find_swig (self):
                     return fn
             else:
                 return "swig.exe"
-
         elif os.name == "os2":
             # assume swig available in the PATH.
             return "swig.exe"
-
         else:
-            raise DistutilsPlatformError, \
-                  ("I don't know how to find (much less run) SWIG "
-                   "on platform '%s'") % os.name
-
-    # find_swig ()
+            raise DistutilsPlatformError(
+                  "I don't know how to find (much less run) SWIG "
+                  "on platform '%s'" % os.name)
 
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
 
-    def get_ext_fullname (self, ext_name):
+    def get_ext_fullname(self, ext_name):
         if self.package is None:
             return ext_name
         else:
             return self.package + '.' + ext_name
 
-    def get_ext_filename (self, ext_name):
+    def get_ext_filename(self, ext_name):
         r"""Convert the name of an extension (eg. "foo.bar") into the name
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-
         from distutils.sysconfig import get_config_var
         ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
@@ -628,19 +593,18 @@ def get_ext_filename (self, ext_name):
             return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
 
-    def get_export_symbols (self, ext):
+    def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
         provided, "init" + module_name.  Only relevant on Windows, where
         the .pyd file (DLL) must export the module "init" function.
         """
-
         initfunc_name = "init" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
 
-    def get_libraries (self, ext):
+    def get_libraries(self, ext):
         """Return the list of libraries to link against when building a
         shared extension.  On most platforms, this is just 'ext.libraries';
         on Windows and OS/2, we add the Python library (eg. python20.dll).
@@ -699,11 +663,9 @@ def get_libraries (self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib, "m"] + extra
-
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
-
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):
@@ -713,5 +675,3 @@ def get_libraries (self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-
-# class build_ext
diff --git a/command/build_py.py b/command/build_py.py
index 8f5609084c..454424f333 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,12 +2,9 @@
 
 Implements the Distutils 'build_py' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 from glob import glob
 
 from distutils.core import Command
@@ -32,8 +29,7 @@ class build_py (Command):
     boolean_options = ['compile', 'force']
     negative_opt = {'no-compile' : 'compile'}
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_lib = None
         self.py_modules = None
         self.package = None
@@ -43,7 +39,7 @@ def initialize_options (self):
         self.optimize = 0
         self.force = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('force', 'force'))
@@ -61,15 +57,14 @@ def finalize_options (self):
 
         # Ick, copied straight from install_lib.py (fancy_getopt needs a
         # type system!  Hell, *everything* needs a type system!!!)
-        if type(self.optimize) is not IntType:
+        if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
                 assert 0 <= self.optimize <= 2
             except (ValueError, AssertionError):
-                raise DistutilsOptionError, "optimize must be 0, 1, or 2"
-
-    def run (self):
+                raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
+    def run(self):
         # XXX copy_file by default preserves atime and mtime.  IMHO this is
         # the right thing to do, but perhaps it should be an option -- in
         # particular, a site administrator might want installed files to
@@ -99,9 +94,7 @@ def run (self):
 
         self.byte_compile(self.get_outputs(include_bytecode=0))
 
-    # run ()
-
-    def get_data_files (self):
+    def get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         data = []
         if not self.packages:
@@ -125,7 +118,7 @@ def get_data_files (self):
             data.append((package, src_dir, build_dir, filenames))
         return data
 
-    def find_data_files (self, package, src_dir):
+    def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""
         globs = (self.package_data.get('', [])
                  + self.package_data.get(package, []))
@@ -137,7 +130,7 @@ def find_data_files (self, package, src_dir):
             files.extend([fn for fn in filelist if fn not in files])
         return files
 
-    def build_package_data (self):
+    def build_package_data(self):
         """Copy data files into build directory"""
         lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
@@ -147,11 +140,10 @@ def build_package_data (self):
                 self.copy_file(os.path.join(src_dir, filename), target,
                                preserve_mode=False)
 
-    def get_package_dir (self, package):
+    def get_package_dir(self, package):
         """Return the directory, relative to the top of the source
            distribution, where package 'package' should be found
            (at least according to the 'package_dir' option, if any)."""
-
         path = package.split('.')
 
         if not self.package_dir:
@@ -187,23 +179,19 @@ def get_package_dir (self, package):
                 else:
                     return ''
 
-    # get_package_dir ()
-
-
-    def check_package (self, package, package_dir):
-
+    def check_package(self, package, package_dir):
         # Empty dir name means current directory, which we can probably
         # assume exists.  Also, os.path.exists and isdir don't know about
         # my "empty string means current dir" convention, so we have to
         # circumvent them.
         if package_dir != "":
             if not os.path.exists(package_dir):
-                raise DistutilsFileError, \
-                      "package directory '%s' does not exist" % package_dir
+                raise DistutilsFileError(
+                      "package directory '%s' does not exist" % package_dir)
             if not os.path.isdir(package_dir):
-                raise DistutilsFileError, \
-                      ("supposed package directory '%s' exists, " +
-                       "but is not a directory") % package_dir
+                raise DistutilsFileError(
+                       "supposed package directory '%s' exists, "
+                       "but is not a directory" % package_dir)
 
         # Require __init__.py for all but the "root package"
         if package:
@@ -218,20 +206,14 @@ def check_package (self, package, package_dir):
         # __init__.py doesn't exist -- so don't return the filename.
         return None
 
-    # check_package ()
-
-
-    def check_module (self, module, module_file):
+    def check_module(self, module, module_file):
         if not os.path.isfile(module_file):
             log.warn("file %s (for module %s) not found", module_file, module)
-            return 0
+            return False
         else:
-            return 1
+            return True
 
-    # check_module ()
-
-
-    def find_package_modules (self, package, package_dir):
+    def find_package_modules(self, package, package_dir):
         self.check_package(package, package_dir)
         module_files = glob(os.path.join(package_dir, "*.py"))
         modules = []
@@ -246,8 +228,7 @@ def find_package_modules (self, package, package_dir):
                 self.debug_print("excluding %s" % setup_script)
         return modules
 
-
-    def find_modules (self):
+    def find_modules(self):
         """Finds individually-specified Python modules, ie. those listed by
         module name in 'self.py_modules'.  Returns a list of tuples (package,
         module_base, filename): 'package' is a tuple of the path through
@@ -256,7 +237,6 @@ def find_modules (self):
         ".py" file (relative to the distribution root) that implements the
         module.
         """
-
         # Map package names to tuples of useful info about the package:
         #    (package_dir, checked)
         # package_dir - the directory where we'll find source files for
@@ -272,7 +252,6 @@ def find_modules (self):
         # just the "package" for a toplevel is empty (either an empty
         # string or empty list, depending on context).  Differences:
         #   - don't check for __init__.py in directory for empty package
-
         for module in self.py_modules:
             path = module.split('.')
             package = '.'.join(path[0:-1])
@@ -301,16 +280,12 @@ def find_modules (self):
 
         return modules
 
-    # find_modules ()
-
-
-    def find_all_modules (self):
+    def find_all_modules(self):
         """Compute the list of all modules that will be built, whether
         they are specified one-module-at-a-time ('self.py_modules') or
         by whole packages ('self.packages').  Return a list of tuples
         (package, module, module_file), just like 'find_modules()' and
         'find_package_modules()' do."""
-
         modules = []
         if self.py_modules:
             modules.extend(self.find_modules())
@@ -319,28 +294,16 @@ def find_all_modules (self):
                 package_dir = self.get_package_dir(package)
                 m = self.find_package_modules(package, package_dir)
                 modules.extend(m)
-
         return modules
 
-    # find_all_modules ()
+    def get_source_files(self):
+        return [module[-1] for module in self.find_all_modules()]
 
-
-    def get_source_files (self):
-
-        modules = self.find_all_modules()
-        filenames = []
-        for module in modules:
-            filenames.append(module[-1])
-
-        return filenames
-
-
-    def get_module_outfile (self, build_dir, package, module):
+    def get_module_outfile(self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
         return os.path.join(*outfile_path)
 
-
-    def get_outputs (self, include_bytecode=1):
+    def get_outputs(self, include_bytecode=1):
         modules = self.find_all_modules()
         outputs = []
         for (package, module, module_file) in modules:
@@ -361,13 +324,12 @@ def get_outputs (self, include_bytecode=1):
 
         return outputs
 
-
-    def build_module (self, module, module_file, package):
+    def build_module(self, module, module_file, package):
         if isinstance(package, basestring):
             package = package.split('.')
-        elif type(package) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'package' must be a string (dot-separated), list, or tuple"
+        elif not isinstance(package, (list, tuple)):
+            raise TypeError(
+                  "'package' must be a string (dot-separated), list, or tuple")
 
         # Now put the module source file into the "build" area -- this is
         # easy, we just copy it somewhere under self.build_lib (the build
@@ -377,25 +339,17 @@ def build_module (self, module, module_file, package):
         self.mkpath(dir)
         return self.copy_file(module_file, outfile, preserve_mode=0)
 
-
-    def build_modules (self):
-
+    def build_modules(self):
         modules = self.find_modules()
         for (package, module, module_file) in modules:
-
             # Now "build" the module -- ie. copy the source file to
             # self.build_lib (the build directory for Python source).
             # (Actually, it gets copied to the directory for this package
             # under self.build_lib.)
             self.build_module(module, module_file, package)
 
-    # build_modules ()
-
-
-    def build_packages (self):
-
+    def build_packages(self):
         for package in self.packages:
-
             # Get list of (package, module, module_file) tuples based on
             # scanning the package directory.  'package' is only included
             # in the tuple so that 'find_modules()' and
@@ -414,10 +368,7 @@ def build_packages (self):
                 assert package == package_
                 self.build_module(module, module_file, package)
 
-    # build_packages ()
-
-
-    def byte_compile (self, files):
+    def byte_compile(self, files):
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
@@ -426,12 +377,9 @@ def byte_compile (self, files):
         # XXX this code is essentially the same as the 'byte_compile()
         # method of the "install_lib" command, except for the determination
         # of the 'prefix' string.  Hmmm.
-
         if self.compile:
             byte_compile(files, optimize=0,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
-
-# class build_py
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 511b82f999..176e6e1073 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_scripts' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
@@ -17,7 +15,7 @@
 # check if Python is called on the first line with this expression
 first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
 
-class build_scripts (Command):
+class build_scripts(Command):
 
     description = "\"build\" scripts (copy and fixup #! line)"
 
@@ -30,14 +28,14 @@ class build_scripts (Command):
     boolean_options = ['force']
 
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_dir = None
         self.scripts = None
         self.force = None
         self.executable = None
         self.outfiles = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('build',
                                    ('build_scripts', 'build_dir'),
                                    ('force', 'force'),
@@ -47,13 +45,13 @@ def finalize_options (self):
     def get_source_files(self):
         return self.scripts
 
-    def run (self):
+    def run(self):
         if not self.scripts:
             return
         self.copy_scripts()
 
 
-    def copy_scripts (self):
+    def copy_scripts(self):
         """Copy each script listed in 'self.scripts'; if it's marked as a
         Python script in the Unix way (first line matches 'first_line_re',
         ie. starts with "\#!" and contains "python"), then adjust the first
@@ -62,7 +60,7 @@ def copy_scripts (self):
         self.mkpath(self.build_dir)
         outfiles = []
         for script in self.scripts:
-            adjust = 0
+            adjust = False
             script = convert_path(script)
             outfile = os.path.join(self.build_dir, os.path.basename(script))
             outfiles.append(outfile)
@@ -88,7 +86,7 @@ def copy_scripts (self):
 
                 match = first_line_re.match(first_line)
                 if match:
-                    adjust = 1
+                    adjust = True
                     post_interp = match.group(1) or ''
 
             if adjust:
@@ -125,7 +123,3 @@ def copy_scripts (self):
                         log.info("changing mode of %s from %o to %o",
                                  file, oldmode, newmode)
                         os.chmod(file, newmode)
-
-    # copy_scripts ()
-
-# class build_scripts
diff --git a/command/clean.py b/command/clean.py
index 02189c531a..ae1d22c376 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -4,8 +4,6 @@
 
 # contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -13,7 +11,7 @@
 from distutils.dir_util import remove_tree
 from distutils import log
 
-class clean (Command):
+class clean(Command):
 
     description = "clean up temporary files from 'build' command"
     user_options = [
@@ -78,5 +76,3 @@ def run(self):
                 log.info("removing '%s'", self.build_base)
             except OSError:
                 pass
-
-# class clean
diff --git a/command/command_template b/command/command_template
index 50bbab7b6e..6106819db8 100644
--- a/command/command_template
+++ b/command/command_template
@@ -10,7 +10,7 @@ __revision__ = "$Id$"
 from distutils.core import Command
 
 
-class x (Command):
+class x(Command):
 
     # Brief (40-50 characters) description of the command
     description = ""
@@ -21,25 +21,13 @@ class x (Command):
                      ""),
                    ]
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         self. = None
         self. = None
         self. = None
 
-    # initialize_options()
-
-
-    def finalize_options (self):
+    def finalize_options(self):
         if self.x is None:
             self.x = 
 
-    # finalize_options()
-
-
-    def run (self):
-
-
-    # run()
-
-# class x
+    def run(self):
diff --git a/command/config.py b/command/config.py
index 04cfcde736..a601234218 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,21 +9,17 @@
 this header file lives".
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
-from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
-LANG_EXT = {'c': '.c',
-            'c++': '.cxx'}
+LANG_EXT = {"c": ".c", "c++": ".cxx"}
 
-class config (Command):
+class config(Command):
 
     description = "prepare to build"
 
@@ -53,7 +49,7 @@ class config (Command):
     # The three standard command methods: since the "config" command
     # does nothing by default, these are empty.
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.compiler = None
         self.cc = None
         self.include_dirs = None
@@ -70,7 +66,7 @@ def initialize_options (self):
         # to clean at some point
         self.temp_files = []
 
-    def finalize_options (self):
+    def finalize_options(self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         elif isinstance(self.include_dirs, basestring):
@@ -86,16 +82,14 @@ def finalize_options (self):
         elif isinstance(self.library_dirs, basestring):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
-
-    def run (self):
+    def run(self):
         pass
 
-
     # Utility methods for actual "config" commands.  The interfaces are
     # loosely based on Autoconf macros of similar names.  Sub-classes
     # may use these freely.
 
-    def _check_compiler (self):
+    def _check_compiler(self):
         """Check that 'self.compiler' really is a CCompiler object;
         if not, make it one.
         """
@@ -113,8 +107,7 @@ def _check_compiler (self):
             if self.library_dirs:
                 self.compiler.set_library_dirs(self.library_dirs)
 
-
-    def _gen_temp_sourcefile (self, body, headers, lang):
+    def _gen_temp_sourcefile(self, body, headers, lang):
         filename = "_configtest" + LANG_EXT[lang]
         file = open(filename, "w")
         if headers:
@@ -127,14 +120,14 @@ def _gen_temp_sourcefile (self, body, headers, lang):
         file.close()
         return filename
 
-    def _preprocess (self, body, headers, include_dirs, lang):
+    def _preprocess(self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         out = "_configtest.i"
         self.temp_files.extend([src, out])
         self.compiler.preprocess(src, out, include_dirs=include_dirs)
         return (src, out)
 
-    def _compile (self, body, headers, include_dirs, lang):
+    def _compile(self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         if self.dump_source:
             dump_file(src, "compiling '%s':" % src)
@@ -143,9 +136,8 @@ def _compile (self, body, headers, include_dirs, lang):
         self.compiler.compile([src], include_dirs=include_dirs)
         return (src, obj)
 
-    def _link (self, body,
-               headers, include_dirs,
-               libraries, library_dirs, lang):
+    def _link(self, body, headers, include_dirs, libraries,
+              library_dirs, lang):
         (src, obj) = self._compile(body, headers, include_dirs, lang)
         prog = os.path.splitext(os.path.basename(src))[0]
         self.compiler.link_executable([obj], prog,
@@ -159,7 +151,7 @@ def _link (self, body,
 
         return (src, obj, prog)
 
-    def _clean (self, *filenames):
+    def _clean(self, *filenames):
         if not filenames:
             filenames = self.temp_files
             self.temp_files = []
@@ -181,7 +173,7 @@ def _clean (self, *filenames):
 
     # XXX need access to the header search path and maybe default macros.
 
-    def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
+    def try_cpp(self, body=None, headers=None, include_dirs=None, lang="c"):
         """Construct a source file from 'body' (a string containing lines
         of C/C++ code) and 'headers' (a list of header files to include)
         and run it through the preprocessor.  Return true if the
@@ -190,17 +182,17 @@ def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
         """
         from distutils.ccompiler import CompileError
         self._check_compiler()
-        ok = 1
+        ok = True
         try:
             self._preprocess(body, headers, include_dirs, lang)
         except CompileError:
-            ok = 0
+            ok = False
 
         self._clean()
         return ok
 
-    def search_cpp (self, pattern, body=None,
-                    headers=None, include_dirs=None, lang="c"):
+    def search_cpp(self, pattern, body=None, headers=None,
+                   include_dirs=None, lang="c"):
         """Construct a source file (just like 'try_cpp()'), run it through
         the preprocessor, and return true if any line of the output matches
         'pattern'.  'pattern' should either be a compiled regex object or a
@@ -216,20 +208,20 @@ def search_cpp (self, pattern, body=None,
             pattern = re.compile(pattern)
 
         file = open(out)
-        match = 0
-        while 1:
+        match = False
+        while True:
             line = file.readline()
             if line == '':
                 break
             if pattern.search(line):
-                match = 1
+                match = True
                 break
 
         file.close()
         self._clean()
         return match
 
-    def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
+    def try_compile(self, body, headers=None, include_dirs=None, lang="c"):
         """Try to compile a source file built from 'body' and 'headers'.
         Return true on success, false otherwise.
         """
@@ -237,18 +229,16 @@ def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
         self._check_compiler()
         try:
             self._compile(body, headers, include_dirs, lang)
-            ok = 1
+            ok = True
         except CompileError:
-            ok = 0
+            ok = False
 
         log.info(ok and "success!" or "failure.")
         self._clean()
         return ok
 
-    def try_link (self, body,
-                  headers=None, include_dirs=None,
-                  libraries=None, library_dirs=None,
-                  lang="c"):
+    def try_link(self, body, headers=None, include_dirs=None,
+                 libraries=None, library_dirs=None, lang="c"):
         """Try to compile and link a source file, built from 'body' and
         'headers', to executable form.  Return true on success, false
         otherwise.
@@ -258,18 +248,16 @@ def try_link (self, body,
         try:
             self._link(body, headers, include_dirs,
                        libraries, library_dirs, lang)
-            ok = 1
+            ok = True
         except (CompileError, LinkError):
-            ok = 0
+            ok = False
 
         log.info(ok and "success!" or "failure.")
         self._clean()
         return ok
 
-    def try_run (self, body,
-                 headers=None, include_dirs=None,
-                 libraries=None, library_dirs=None,
-                 lang="c"):
+    def try_run(self, body, headers=None, include_dirs=None,
+                libraries=None, library_dirs=None, lang="c"):
         """Try to compile, link to an executable, and run a program
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.
@@ -280,9 +268,9 @@ def try_run (self, body,
             src, obj, exe = self._link(body, headers, include_dirs,
                                        libraries, library_dirs, lang)
             self.spawn([exe])
-            ok = 1
+            ok = True
         except (CompileError, LinkError, DistutilsExecError):
-            ok = 0
+            ok = False
 
         log.info(ok and "success!" or "failure.")
         self._clean()
@@ -293,11 +281,8 @@ def try_run (self, body,
     # (these are the ones that are actually likely to be useful
     # when implementing a real-world config command!)
 
-    def check_func (self, func,
-                    headers=None, include_dirs=None,
-                    libraries=None, library_dirs=None,
-                    decl=0, call=0):
-
+    def check_func(self, func, headers=None, include_dirs=None,
+                   libraries=None, library_dirs=None, decl=0, call=0):
         """Determine if function 'func' is available by constructing a
         source file that refers to 'func', and compiles and links it.
         If everything succeeds, returns true; otherwise returns false.
@@ -311,7 +296,6 @@ def check_func (self, func,
         calls it.  'libraries' and 'library_dirs' are used when
         linking.
         """
-
         self._check_compiler()
         body = []
         if decl:
@@ -327,10 +311,8 @@ def check_func (self, func,
         return self.try_link(body, headers, include_dirs,
                              libraries, library_dirs)
 
-    # check_func ()
-
-    def check_lib (self, library, library_dirs=None,
-                   headers=None, include_dirs=None, other_libraries=[]):
+    def check_lib(self, library, library_dirs=None, headers=None,
+                  include_dirs=None, other_libraries=[]):
         """Determine if 'library' is available to be linked against,
         without actually checking that any particular symbols are provided
         by it.  'headers' will be used in constructing the source file to
@@ -340,12 +322,11 @@ def check_lib (self, library, library_dirs=None,
         has symbols that depend on other libraries.
         """
         self._check_compiler()
-        return self.try_link("int main (void) { }",
-                             headers, include_dirs,
-                             [library]+other_libraries, library_dirs)
+        return self.try_link("int main (void) { }", headers, include_dirs,
+                             [library] + other_libraries, library_dirs)
 
-    def check_header (self, header, include_dirs=None,
-                      library_dirs=None, lang="c"):
+    def check_header(self, header, include_dirs=None, library_dirs=None,
+                     lang="c"):
         """Determine if the system header file named by 'header_file'
         exists and can be found by the preprocessor; return true if so,
         false otherwise.
@@ -354,10 +335,7 @@ def check_header (self, header, include_dirs=None,
                             include_dirs=include_dirs)
 
 
-# class config
-
-
-def dump_file (filename, head=None):
+def dump_file(filename, head=None):
     if head is None:
         print(filename + ":")
     else:
diff --git a/command/install.py b/command/install.py
index a6543ba6a2..29cda1ebb7 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,12 +4,9 @@
 
 from distutils import log
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.sysconfig import get_config_vars
@@ -141,7 +138,7 @@ class install (Command):
     negative_opt = {'no-compile' : 'compile'}
 
 
-    def initialize_options (self):
+    def initialize_options(self):
 
         # High-level options: these select both an installation base
         # and scheme.
@@ -215,7 +212,7 @@ def initialize_options (self):
     # party Python modules on various platforms given a wide
     # array of user input is decided.  Yes, it's quite complex!)
 
-    def finalize_options (self):
+    def finalize_options(self):
 
         # This method (and its pliant slaves, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
@@ -233,13 +230,13 @@ def finalize_options (self):
 
         if ((self.prefix or self.exec_prefix or self.home) and
             (self.install_base or self.install_platbase)):
-            raise DistutilsOptionError, \
-                  ("must supply either prefix/exec-prefix/home or " +
+            raise DistutilsOptionError(
+                   "must supply either prefix/exec-prefix/home or " +
                    "install-base/install-platbase -- not both")
 
         if self.home and (self.prefix or self.exec_prefix):
-            raise DistutilsOptionError, \
-                  "must supply either home or prefix/exec-prefix -- not both"
+            raise DistutilsOptionError(
+                  "must supply either home or prefix/exec-prefix -- not both")
 
         # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name != "posix":
@@ -341,10 +338,8 @@ def finalize_options (self):
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
 
-    # finalize_options ()
-
 
-    def dump_dirs (self, msg):
+    def dump_dirs(self, msg):
         if DEBUG:
             from distutils.fancy_getopt import longopt_xlate
             print(msg + ":")
@@ -362,8 +357,7 @@ def dump_dirs (self, msg):
                 print("  %s: %s" % (opt_name, val))
 
 
-    def finalize_unix (self):
-
+    def finalize_unix(self):
         if self.install_base is not None or self.install_platbase is not None:
             if ((self.install_lib is None and
                  self.install_purelib is None and
@@ -371,8 +365,8 @@ def finalize_unix (self):
                 self.install_headers is None or
                 self.install_scripts is None or
                 self.install_data is None):
-                raise DistutilsOptionError, \
-                      ("install-base or install-platbase supplied, but "
+                raise DistutilsOptionError(
+                      "install-base or install-platbase supplied, but "
                       "installation scheme is incomplete")
             return
 
@@ -382,8 +376,8 @@ def finalize_unix (self):
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
-                    raise DistutilsOptionError, \
-                          "must not supply exec-prefix without prefix"
+                    raise DistutilsOptionError(
+                          "must not supply exec-prefix without prefix")
 
                 self.prefix = os.path.normpath(sys.prefix)
                 self.exec_prefix = os.path.normpath(sys.exec_prefix)
@@ -396,11 +390,8 @@ def finalize_unix (self):
             self.install_platbase = self.exec_prefix
             self.select_scheme("unix_prefix")
 
-    # finalize_unix ()
-
-
-    def finalize_other (self):          # Windows and Mac OS for now
 
+    def finalize_other(self):          # Windows and Mac OS for now
         if self.home is not None:
             self.install_base = self.install_platbase = self.home
             self.select_scheme("unix_home")
@@ -412,13 +403,11 @@ def finalize_other (self):          # Windows and Mac OS for now
             try:
                 self.select_scheme(os.name)
             except KeyError:
-                raise DistutilsPlatformError, \
-                      "I don't know how to install stuff on '%s'" % os.name
-
-    # finalize_other ()
+                raise DistutilsPlatformError(
+                      "I don't know how to install stuff on '%s'" % os.name)
 
 
-    def select_scheme (self, name):
+    def select_scheme(self, name):
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
         for key in SCHEME_KEYS:
@@ -427,7 +416,7 @@ def select_scheme (self, name):
                 setattr(self, attrname, scheme[key])
 
 
-    def _expand_attrs (self, attrs):
+    def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
@@ -437,12 +426,12 @@ def _expand_attrs (self, attrs):
                 setattr(self, attr, val)
 
 
-    def expand_basedirs (self):
+    def expand_basedirs(self):
         self._expand_attrs(['install_base',
                             'install_platbase',
                             'root'])
 
-    def expand_dirs (self):
+    def expand_dirs(self):
         self._expand_attrs(['install_purelib',
                             'install_platlib',
                             'install_lib',
@@ -451,14 +440,12 @@ def expand_dirs (self):
                             'install_data',])
 
 
-    def convert_paths (self, *names):
+    def convert_paths(self, *names):
         for name in names:
             attr = "install_" + name
             setattr(self, attr, convert_path(getattr(self, attr)))
 
-
-    def handle_extra_path (self):
-
+    def handle_extra_path(self):
         if self.extra_path is None:
             self.extra_path = self.distribution.extra_path
 
@@ -471,8 +458,8 @@ def handle_extra_path (self):
             elif len(self.extra_path) == 2:
                 (path_file, extra_dirs) = self.extra_path
             else:
-                raise DistutilsOptionError, \
-                      ("'extra_path' option must be a list, tuple, or "
+                raise DistutilsOptionError(
+                      "'extra_path' option must be a list, tuple, or "
                       "comma-separated string with 1 or 2 elements")
 
             # convert to local form in case Unix notation used (as it
@@ -488,10 +475,7 @@ def handle_extra_path (self):
         self.path_file = path_file
         self.extra_dirs = extra_dirs
 
-    # handle_extra_path ()
-
-
-    def change_roots (self, *names):
+    def change_roots(self, *names):
         for name in names:
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
@@ -499,8 +483,7 @@ def change_roots (self, *names):
 
     # -- Command execution methods -------------------------------------
 
-    def run (self):
-
+    def run(self):
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
@@ -535,9 +518,7 @@ def run (self):
                        "you'll have to change the search path yourself"),
                        self.install_lib)
 
-    # run ()
-
-    def create_path_file (self):
+    def create_path_file(self):
         filename = os.path.join(self.install_libbase,
                                 self.path_file + ".pth")
         if self.install_path_file:
@@ -550,7 +531,7 @@ def create_path_file (self):
 
     # -- Reporting methods ---------------------------------------------
 
-    def get_outputs (self):
+    def get_outputs(self):
         # Assemble the outputs of all the sub-commands.
         outputs = []
         for cmd_name in self.get_sub_commands():
@@ -567,7 +548,7 @@ def get_outputs (self):
 
         return outputs
 
-    def get_inputs (self):
+    def get_inputs(self):
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
@@ -579,19 +560,19 @@ def get_inputs (self):
 
     # -- Predicates for sub-command list -------------------------------
 
-    def has_lib (self):
+    def has_lib(self):
         """Return true if the current distribution has any Python
         modules to install."""
         return (self.distribution.has_pure_modules() or
                 self.distribution.has_ext_modules())
 
-    def has_headers (self):
+    def has_headers(self):
         return self.distribution.has_headers()
 
-    def has_scripts (self):
+    def has_scripts(self):
         return self.distribution.has_scripts()
 
-    def has_data (self):
+    def has_data(self):
         return self.distribution.has_data_files()
 
 
@@ -603,5 +584,3 @@ def has_data (self):
                     ('install_data',    has_data),
                     ('install_egg_info', lambda self:True),
                    ]
-
-# class install
diff --git a/command/install_data.py b/command/install_data.py
index a95194426b..2fbac63de0 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -5,15 +5,13 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
 from distutils.core import Command
 from distutils.util import change_root, convert_path
 
-class install_data (Command):
+class install_data(Command):
 
     description = "install data files"
 
@@ -28,7 +26,7 @@ class install_data (Command):
 
     boolean_options = ['force']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.install_dir = None
         self.outfiles = []
         self.root = None
@@ -37,14 +35,14 @@ def initialize_options (self):
         self.data_files = self.distribution.data_files
         self.warn_dir = 1
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('install',
                                    ('install_data', 'install_dir'),
                                    ('root', 'root'),
                                    ('force', 'force'),
                                   )
 
-    def run (self):
+    def run(self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
             if isinstance(f, basestring):
@@ -77,8 +75,8 @@ def run (self):
                         (out, _) = self.copy_file(data, dir)
                         self.outfiles.append(out)
 
-    def get_inputs (self):
+    def get_inputs(self):
         return self.data_files or []
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles
diff --git a/command/install_headers.py b/command/install_headers.py
index 2bd1b04367..7114eaf068 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,15 +3,13 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
 from distutils.core import Command
 
 
-class install_headers (Command):
+class install_headers(Command):
 
     description = "install C/C++ header files"
 
@@ -23,18 +21,18 @@ class install_headers (Command):
 
     boolean_options = ['force']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.install_dir = None
         self.force = 0
         self.outfiles = []
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('install',
                                    ('install_headers', 'install_dir'),
                                    ('force', 'force'))
 
 
-    def run (self):
+    def run(self):
         headers = self.distribution.headers
         if not headers:
             return
@@ -44,10 +42,8 @@ def run (self):
             (out, _) = self.copy_file(header, self.install_dir)
             self.outfiles.append(out)
 
-    def get_inputs (self):
+    def get_inputs(self):
         return self.distribution.headers or []
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles
-
-# class install_headers
diff --git a/command/install_lib.py b/command/install_lib.py
index 4efaf9c671..ac620fccb9 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,9 +1,6 @@
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -11,7 +8,7 @@
 # Extension for Python source files.
 PYTHON_SOURCE_EXTENSION = ".py"
 
-class install_lib (Command):
+class install_lib(Command):
 
     description = "install all Python modules (extensions and pure Python)"
 
@@ -45,8 +42,7 @@ class install_lib (Command):
     boolean_options = ['force', 'compile', 'skip-build']
     negative_opt = {'no-compile' : 'compile'}
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
@@ -55,7 +51,7 @@ def initialize_options (self):
         self.optimize = None
         self.skip_build = None
 
-    def finalize_options (self):
+    def finalize_options(self):
 
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
@@ -70,19 +66,18 @@ def finalize_options (self):
                                   )
 
         if self.compile is None:
-            self.compile = 1
+            self.compile = True
         if self.optimize is None:
-            self.optimize = 0
+            self.optimize = False
 
-        if type(self.optimize) is not IntType:
+        if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
                 assert 0 <= self.optimize <= 2
             except (ValueError, AssertionError):
-                raise DistutilsOptionError, "optimize must be 0, 1, or 2"
-
-    def run (self):
+                raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
+    def run(self):
         # Make sure we have built everything we need first
         self.build()
 
@@ -95,20 +90,18 @@ def run (self):
         if outfiles is not None and self.distribution.has_pure_modules():
             self.byte_compile(outfiles)
 
-    # run ()
-
 
     # -- Top-level worker functions ------------------------------------
     # (called from 'run()')
 
-    def build (self):
+    def build(self):
         if not self.skip_build:
             if self.distribution.has_pure_modules():
                 self.run_command('build_py')
             if self.distribution.has_ext_modules():
                 self.run_command('build_ext')
 
-    def install (self):
+    def install(self):
         if os.path.isdir(self.build_dir):
             outfiles = self.copy_tree(self.build_dir, self.install_dir)
         else:
@@ -117,7 +110,7 @@ def install (self):
             return
         return outfiles
 
-    def byte_compile (self, files):
+    def byte_compile(self, files):
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
@@ -138,8 +131,7 @@ def byte_compile (self, files):
 
     # -- Utility methods -----------------------------------------------
 
-    def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
-
+    def _mutate_outputs(self, has_any, build_cmd, cmd_option, output_dir):
         if not has_any:
             return []
 
@@ -154,9 +146,7 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
 
         return outputs
 
-    # _mutate_outputs ()
-
-    def _bytecode_filenames (self, py_filenames):
+    def _bytecode_filenames(self, py_filenames):
         bytecode_files = []
         for py_file in py_filenames:
             # Since build_py handles package data installation, the
@@ -176,7 +166,7 @@ def _bytecode_filenames (self, py_filenames):
     # -- External interface --------------------------------------------
     # (called by outsiders)
 
-    def get_outputs (self):
+    def get_outputs(self):
         """Return the list of files that would be installed if this command
         were actually run.  Not affected by the "dry-run" flag or whether
         modules have actually been built yet.
@@ -197,9 +187,7 @@ def get_outputs (self):
 
         return pure_outputs + bytecode_outputs + ext_outputs
 
-    # get_outputs ()
-
-    def get_inputs (self):
+    def get_inputs(self):
         """Get the list of files that are input to this command, ie. the
         files that get installed as they are named in the build tree.
         The files in this list correspond one-to-one to the output
@@ -216,5 +204,3 @@ def get_inputs (self):
             inputs.extend(build_ext.get_outputs())
 
         return inputs
-
-# class install_lib
diff --git a/command/install_scripts.py b/command/install_scripts.py
index da2da358ba..ea8d5aa654 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -5,8 +5,6 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -14,7 +12,8 @@
 from distutils import log
 from stat import ST_MODE
 
-class install_scripts (Command):
+
+class install_scripts(Command):
 
     description = "install scripts (Python or otherwise)"
 
@@ -27,14 +26,13 @@ class install_scripts (Command):
 
     boolean_options = ['force', 'skip-build']
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         self.install_dir = None
         self.force = 0
         self.build_dir = None
         self.skip_build = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('build', ('build_scripts', 'build_dir'))
         self.set_undefined_options('install',
                                    ('install_scripts', 'install_dir'),
@@ -42,7 +40,7 @@ def finalize_options (self):
                                    ('skip_build', 'skip_build'),
                                   )
 
-    def run (self):
+    def run(self):
         if not self.skip_build:
             self.run_command('build_scripts')
         self.outfiles = self.copy_tree(self.build_dir, self.install_dir)
@@ -57,10 +55,8 @@ def run (self):
                     log.info("changing mode of %s to %o", file, mode)
                     os.chmod(file, mode)
 
-    def get_inputs (self):
+    def get_inputs(self):
         return self.distribution.scripts or []
 
     def get_outputs(self):
         return self.outfiles or []
-
-# class install_scripts
diff --git a/command/sdist.py b/command/sdist.py
index 8e1c066023..b1c76486ed 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,12 +2,9 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 from glob import glob
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
@@ -82,7 +79,7 @@ class sdist (Command):
     default_format = { 'posix': 'gztar',
                        'nt': 'zip' }
 
-    def initialize_options (self):
+    def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
         self.template = None
@@ -103,7 +100,7 @@ def initialize_options (self):
         self.archive_files = None
 
 
-    def finalize_options (self):
+    def finalize_options(self):
         if self.manifest is None:
             self.manifest = "MANIFEST"
         if self.template is None:
@@ -114,21 +111,20 @@ def finalize_options (self):
             try:
                 self.formats = [self.default_format[os.name]]
             except KeyError:
-                raise DistutilsPlatformError, \
-                      "don't know how to create source distributions " + \
-                      "on platform %s" % os.name
+                raise DistutilsPlatformError(
+                      "don't know how to create source distributions "
+                      "on platform %s" % os.name)
 
         bad_format = archive_util.check_archive_formats(self.formats)
         if bad_format:
-            raise DistutilsOptionError, \
-                  "unknown archive format '%s'" % bad_format
+            raise DistutilsOptionError(
+                  "unknown archive format '%s'" % bad_format)
 
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
 
-    def run (self):
-
+    def run(self):
         # 'filelist' contains the list of files that will make up the
         # manifest
         self.filelist = FileList()
@@ -150,8 +146,7 @@ def run (self):
         # or zipfile, or whatever.
         self.make_distribution()
 
-
-    def check_metadata (self):
+    def check_metadata(self):
         """Ensure that all required elements of meta-data (name, version,
         URL, (author and author_email) or (maintainer and
         maintainer_email)) are supplied by the Distribution object; warn if
@@ -181,17 +176,13 @@ def check_metadata (self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
-    # check_metadata ()
-
-
-    def get_file_list (self):
+    def get_file_list(self):
         """Figure out the list of files to include in the source
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
         depends on the user's options and the state of the filesystem.
         """
-
         # If we have a manifest template, see if it's newer than the
         # manifest; if so, we'll regenerate the manifest.
         template_exists = os.path.isfile(self.template)
@@ -231,9 +222,9 @@ def get_file_list (self):
         # Regenerate the manifest if necessary (or if explicitly told to)
         if manifest_outofdate or neither_exists or force_regen:
             if not template_exists:
-                self.warn(("manifest template '%s' does not exist " +
-                           "(using default file list)") %
-                          self.template)
+                self.warn("manifest template '%s' does not exist "
+                          "(using default file list)"
+                          % self.template)
             self.filelist.findall()
 
             if self.use_defaults:
@@ -251,10 +242,8 @@ def get_file_list (self):
         else:
             self.read_manifest()
 
-    # get_file_list ()
-
 
-    def add_defaults (self):
+    def add_defaults(self):
         """Add all the default files to self.filelist:
           - README or README.txt
           - setup.py
@@ -265,15 +254,14 @@ def add_defaults (self):
         Warns if (README or README.txt) or setup.py are missing; everything
         else is optional.
         """
-
         standards = [('README', 'README.txt'), self.distribution.script_name]
         for fn in standards:
-            if type(fn) is TupleType:
+            if isinstance(fn, tuple):
                 alts = fn
-                got_it = 0
+                got_it = False
                 for fn in alts:
                     if os.path.exists(fn):
-                        got_it = 1
+                        got_it = True
                         self.filelist.append(fn)
                         break
 
@@ -308,25 +296,18 @@ def add_defaults (self):
             build_scripts = self.get_finalized_command('build_scripts')
             self.filelist.extend(build_scripts.get_source_files())
 
-    # add_defaults ()
-
-
-    def read_template (self):
+    def read_template(self):
         """Read and parse manifest template file named by self.template.
 
         (usually "MANIFEST.in") The parsing and processing is done by
         'self.filelist', which updates itself accordingly.
         """
         log.info("reading manifest template '%s'", self.template)
-        template = TextFile(self.template,
-                            strip_comments=1,
-                            skip_blanks=1,
-                            join_lines=1,
-                            lstrip_ws=1,
-                            rstrip_ws=1,
+        template = TextFile(self.template, strip_comments=1, skip_blanks=1,
+                            join_lines=1, lstrip_ws=1, rstrip_ws=1,
                             collapse_join=1)
 
-        while 1:
+        while True:
             line = template.readline()
             if line is None:            # end of file
                 break
@@ -338,10 +319,7 @@ def read_template (self):
                                                template.current_line,
                                                msg))
 
-    # read_template ()
-
-
-    def prune_file_list (self):
+    def prune_file_list(self):
         """Prune off branches that might slip into the file list as created
         by 'read_template()', but really don't belong there:
           * the build tree (typically "build")
@@ -356,8 +334,7 @@ def prune_file_list (self):
         self.filelist.exclude_pattern(None, prefix=base_dir)
         self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
 
-
-    def write_manifest (self):
+    def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
@@ -366,17 +343,14 @@ def write_manifest (self):
                      (self.manifest, self.filelist.files),
                      "writing manifest file '%s'" % self.manifest)
 
-    # write_manifest ()
-
-
-    def read_manifest (self):
+    def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
         fill in 'self.filelist', the list of files to include in the source
         distribution.
         """
         log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest)
-        while 1:
+        while True:
             line = manifest.readline()
             if line == '':              # end of file
                 break
@@ -384,10 +358,7 @@ def read_manifest (self):
                 line = line[0:-1]
             self.filelist.append(line)
 
-    # read_manifest ()
-
-
-    def make_release_tree (self, base_dir, files):
+    def make_release_tree(self, base_dir, files):
         """Create the directory tree that will become the source
         distribution archive.  All directories implied by the filenames in
         'files' are created under 'base_dir', and then we hard link or copy
@@ -429,9 +400,7 @@ def make_release_tree (self, base_dir, files):
 
         self.distribution.metadata.write_pkg_info(base_dir)
 
-    # make_release_tree ()
-
-    def make_distribution (self):
+    def make_distribution(self):
         """Create the source distribution(s).  First, we create the release
         tree with 'make_release_tree()'; then, we create all required
         archive files (according to 'self.formats') from the release tree.
@@ -456,10 +425,8 @@ def make_distribution (self):
         if not self.keep_temp:
             dir_util.remove_tree(base_dir, dry_run=self.dry_run)
 
-    def get_archive_files (self):
+    def get_archive_files(self):
         """Return the list of archive files created when the command
         was run, or None if the command hasn't run yet.
         """
         return self.archive_files
-
-# class sdist
diff --git a/command/upload.py b/command/upload.py
index 1ca2fb9052..b49acd123a 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -170,7 +170,7 @@ def upload_file(self, command, pyversion, filename):
         elif schema == 'https':
             http = httplib.HTTPSConnection(netloc)
         else:
-            raise AssertionError, "unsupported schema "+schema
+            raise AssertionError("unsupported schema "+schema)
 
         data = ''
         loglevel = log.INFO
diff --git a/core.py b/core.py
index d60998240f..0490e6378b 100644
--- a/core.py
+++ b/core.py
@@ -6,12 +6,9 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 
 from distutils.debug import DEBUG
 from distutils.errors import *
@@ -112,10 +109,10 @@ class found in 'cmdclass' is used in place of the default, which is
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError as msg:
         if 'name' not in attrs:
-            raise SystemExit, "error in setup command: %s" % msg
+            raise SystemExit("error in setup command: %s" % msg)
         else:
-            raise SystemExit, "error in %s setup command: %s" % \
-                  (attrs['name'], msg)
+            raise SystemExit("error in %s setup command: %s" % \
+                  (attrs['name'], msg))
 
     if _setup_stop_after == "init":
         return dist
@@ -136,7 +133,7 @@ class found in 'cmdclass' is used in place of the default, which is
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError as msg:
-        raise SystemExit, gen_usage(dist.script_name) + "\nerror: %s" % msg
+        raise SystemExit(gen_usage(dist.script_name) + "\nerror: %s" % msg)
 
     if DEBUG:
         print("options (after parsing command line):")
@@ -150,7 +147,7 @@ class found in 'cmdclass' is used in place of the default, which is
         try:
             dist.run_commands()
         except KeyboardInterrupt:
-            raise SystemExit, "interrupted"
+            raise SystemExit("interrupted")
         except (IOError, os.error) as exc:
             error = grok_environment_error(exc)
 
@@ -158,14 +155,14 @@ class found in 'cmdclass' is used in place of the default, which is
                 sys.stderr.write(error + "\n")
                 raise
             else:
-                raise SystemExit, error
+                raise SystemExit(error)
 
         except (DistutilsError,
                 CCompilerError) as msg:
             if DEBUG:
                 raise
             else:
-                raise SystemExit, "error: " + str(msg)
+                raise SystemExit("error: " + str(msg))
 
     return dist
 
@@ -204,7 +201,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     used to drive the Distutils.
     """
     if stop_after not in ('init', 'config', 'commandline', 'run'):
-        raise ValueError, "invalid value for 'stop_after': %r" % (stop_after,)
+        raise ValueError("invalid value for 'stop_after': %r" % (stop_after,))
 
     global _setup_stop_after, _setup_distribution
     _setup_stop_after = stop_after
@@ -229,10 +226,9 @@ def run_setup (script_name, script_args=None, stop_after="run"):
         raise
 
     if _setup_distribution is None:
-        raise RuntimeError, \
-              ("'distutils.core.setup()' was never called -- "
+        raise RuntimeError(("'distutils.core.setup()' was never called -- "
                "perhaps '%s' is not a Distutils setup script?") % \
-              script_name
+              script_name)
 
     # I wonder if the setup script's namespace -- g and l -- would be of
     # any interest to callers?
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index fae6848165..bec72ca3f1 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -45,8 +45,6 @@
 # * mingw gcc 3.2/ld 2.13 works
 #   (ld supports -shared)
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os,sys,copy
@@ -143,13 +141,13 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             try:
                 self.spawn(["windres", "-i", src, "-o", obj])
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
         else: # for other files use the C-compiler
             try:
                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                            extra_postargs)
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
 
     def link (self,
               target_desc,
@@ -260,9 +258,8 @@ def object_filenames (self,
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
             (base, ext) = os.path.splitext (os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc','.res']):
-                raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % \
-                      (ext, src_name)
+                raise UnknownFileError("unknown file type '%s' (from '%s')" % \
+                      (ext, src_name))
             if strip_dir:
                 base = os.path.basename (base)
             if ext == '.res' or ext == '.rc':
diff --git a/debug.py b/debug.py
index b67139c7d4..2886744402 100644
--- a/debug.py
+++ b/debug.py
@@ -1,7 +1,5 @@
 import os
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
diff --git a/dep_util.py b/dep_util.py
index c139c852e4..a9d589a256 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,8 +4,6 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -19,7 +17,7 @@ def newer (source, target):
     Raise DistutilsFileError if 'source' does not exist.
     """
     if not os.path.exists(source):
-        raise DistutilsFileError, "file '%s' does not exist" % source
+        raise DistutilsFileError("file '%s' does not exist" % source)
     if not os.path.exists(target):
         return 1
 
@@ -39,7 +37,7 @@ def newer_pairwise (sources, targets):
     of 'newer()'.
     """
     if len(sources) != len(targets):
-        raise ValueError, "'sources' and 'targets' must be same length"
+        raise ValueError("'sources' and 'targets' must be same length")
 
     # build a pair of lists (sources, targets) where  source is newer
     n_sources = []
diff --git a/dir_util.py b/dir_util.py
index 7dc1205c49..30e352db42 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,12 +2,9 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, sys
-from types import *
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
@@ -32,8 +29,8 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
 
     # Detect a common bug -- name is None
     if not isinstance(name, basestring):
-        raise DistutilsInternalError, \
-              "mkpath: 'name' must be a string (got %r)" % (name,)
+        raise DistutilsInternalError(
+              "mkpath: 'name' must be a string (got %r)" % (name,))
 
     # XXX what's the better way to handle verbosity? print as we create
     # each directory in the path (the current behaviour), or only announce
@@ -136,8 +133,8 @@ def copy_tree (src, dst,
     from distutils.file_util import copy_file
 
     if not dry_run and not os.path.isdir(src):
-        raise DistutilsFileError, \
-              "cannot copy tree '%s': not a directory" % src
+        raise DistutilsFileError(
+              "cannot copy tree '%s': not a directory" % src)
     try:
         names = os.listdir(src)
     except os.error as e:
@@ -145,8 +142,8 @@ def copy_tree (src, dst,
         if dry_run:
             names = []
         else:
-            raise DistutilsFileError, \
-                  "error listing files in '%s': %s" % (src, errstr)
+            raise DistutilsFileError(
+                  "error listing files in '%s': %s" % (src, errstr))
 
     if not dry_run:
         mkpath(dst)
@@ -176,8 +173,6 @@ def copy_tree (src, dst,
 
     return outputs
 
-# copy_tree ()
-
 # Helper for remove_tree()
 def _build_cmdtuple(path, cmdtuples):
     for f in os.listdir(path):
diff --git a/dist.py b/dist.py
index 8f614765ef..974ee5163b 100644
--- a/dist.py
+++ b/dist.py
@@ -4,8 +4,6 @@
 being built/installed/distributed.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
@@ -264,8 +262,6 @@ def __init__ (self, attrs=None):
 
         self.finalize_options()
 
-    # __init__ ()
-
 
     def get_option_dict (self, command):
         """Get the option dictionary for a given command.  If that
@@ -305,8 +301,6 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
                 for line in out.split("\n"):
                     print(indent + "  " + line)
 
-    # dump_option_dicts ()
-
 
 
     # -- Config file finding/parsing methods ---------------------------
@@ -353,8 +347,6 @@ def find_config_files (self):
 
         return files
 
-    # find_config_files ()
-
 
     def parse_config_files (self, filenames=None):
 
@@ -397,9 +389,7 @@ def parse_config_files (self, filenames=None):
                     else:
                         setattr(self, opt, val)
                 except ValueError as msg:
-                    raise DistutilsOptionError, msg
-
-    # parse_config_files ()
+                    raise DistutilsOptionError(msg)
 
 
     # -- Command-line parsing methods ----------------------------------
@@ -472,12 +462,10 @@ def parse_command_line (self):
 
         # Oops, no commands found -- an end-user error
         if not self.commands:
-            raise DistutilsArgError, "no commands supplied"
+            raise DistutilsArgError("no commands supplied")
 
         # All is well: return true
-        return 1
-
-    # parse_command_line()
+        return True
 
     def _get_toplevel_options (self):
         """Return the non-display options recognized at the top level.
@@ -505,7 +493,7 @@ def _parse_command_opts (self, parser, args):
         # Pull the current command from the head of the command line
         command = args[0]
         if not command_re.match(command):
-            raise SystemExit, "invalid command name '%s'" % command
+            raise SystemExit("invalid command name '%s'" % command)
         self.commands.append(command)
 
         # Dig up the command class that implements this command, so we
@@ -514,22 +502,21 @@ def _parse_command_opts (self, parser, args):
         try:
             cmd_class = self.get_command_class(command)
         except DistutilsModuleError as msg:
-            raise DistutilsArgError, msg
+            raise DistutilsArgError(msg)
 
         # Require that the command class be derived from Command -- want
         # to be sure that the basic "command" interface is implemented.
         if not issubclass(cmd_class, Command):
-            raise DistutilsClassError, \
-                  "command class %s must subclass Command" % cmd_class
+            raise DistutilsClassError(
+                  "command class %s must subclass Command" % cmd_class)
 
         # Also make sure that the command object provides a list of its
         # known options.
         if not (hasattr(cmd_class, 'user_options') and
                 isinstance(cmd_class.user_options, list)):
-            raise DistutilsClassError, \
-                  ("command class %s must provide " +
+            raise DistutilsClassError(("command class %s must provide " +
                    "'user_options' attribute (a list of tuples)") % \
-                  cmd_class
+                  cmd_class)
 
         # If the command class has a list of negative alias options,
         # merge it in with the global negative aliases.
@@ -586,8 +573,6 @@ def _parse_command_opts (self, parser, args):
 
         return args
 
-    # _parse_command_opts ()
-
     def finalize_options (self):
         """Set final values for all the options on the Distribution
         instance, analogous to the .finalize_options() method of Command
@@ -660,8 +645,6 @@ def _show_help (self,
         print(gen_usage(self.script_name))
         return
 
-    # _show_help ()
-
 
     def handle_display_options (self, option_order):
         """If there were any non-global "display-only" options
@@ -703,13 +686,10 @@ def handle_display_options (self, option_order):
 
         return any_display_options
 
-    # handle_display_options()
-
     def print_command_list (self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-
         print(header + ":")
 
         for cmd in commands:
@@ -723,8 +703,6 @@ def print_command_list (self, commands, header, max_length):
 
             print("  %-*s  %s" % (max_length, cmd, description))
 
-    # print_command_list ()
-
 
     def print_commands (self):
         """Print out a help message listing all available commands with a
@@ -734,7 +712,6 @@ def print_commands (self):
         descriptions come from the command class attribute
         'description'.
         """
-
         import distutils.command
         std_commands = distutils.command.__all__
         is_std = {}
@@ -760,8 +737,6 @@ def print_commands (self):
                                     "Extra commands",
                                     max_length)
 
-    # print_commands ()
-
     def get_command_list (self):
         """Get a list of (command, description) tuples.
         The list is divided into "standard commands" (listed in
@@ -771,7 +746,6 @@ def get_command_list (self):
         """
         # Currently this is only used on Mac OS, for the Mac-only GUI
         # Distutils interface (by Jack Jansen)
-
         import distutils.command
         std_commands = distutils.command.__all__
         is_std = {}
@@ -839,18 +813,15 @@ def get_command_class (self, command):
             try:
                 klass = getattr(module, klass_name)
             except AttributeError:
-                raise DistutilsModuleError, \
-                      "invalid command '%s' (no class '%s' in module '%s')" \
-                      % (command, klass_name, module_name)
+                raise DistutilsModuleError(
+                      "invalid command '%s' (no class '%s' in module '%s')"
+                      % (command, klass_name, module_name))
 
             self.cmdclass[command] = klass
             return klass
 
         raise DistutilsModuleError("invalid command '%s'" % command)
 
-
-    # get_command_class ()
-
     def get_command_obj (self, command, create=1):
         """Return the command object for 'command'.  Normally this object
         is cached on a previous call to 'get_command_obj()'; if no command
@@ -912,11 +883,11 @@ def _set_command_options (self, command_obj, option_dict=None):
                 elif hasattr(command_obj, option):
                     setattr(command_obj, option, value)
                 else:
-                    raise DistutilsOptionError, \
-                          ("error in %s: command '%s' has no such option '%s'"
-                           % (source, command_name, option))
+                    raise DistutilsOptionError(
+                          "error in %s: command '%s' has no such option '%s'"
+                          % (source, command_name, option))
             except ValueError as msg:
-                raise DistutilsOptionError, msg
+                raise DistutilsOptionError(msg)
 
     def reinitialize_command (self, command, reinit_subcommands=0):
         """Reinitializes a command to the state it was in when first
@@ -1075,8 +1046,6 @@ def write_pkg_info (self, base_dir):
 
         pkg_info.close()
 
-    # write_pkg_info ()
-
     def write_pkg_file (self, file):
         """Write the PKG-INFO format data to a file object.
         """
@@ -1202,8 +1171,6 @@ def set_obsoletes(self, value):
             distutils.versionpredicate.VersionPredicate(v)
         self.obsoletes = value
 
-# class DistributionMetadata
-
 
 def fix_help_options (options):
     """Convert a 4-tuple 'help_options' list as found in various command
diff --git a/emxccompiler.py b/emxccompiler.py
index f4b90dcd00..d9ee82d58a 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -80,13 +80,13 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             try:
                 self.spawn(["rc", "-r", src])
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
         else: # for other files use the C-compiler
             try:
                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                            extra_postargs)
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
 
     def link (self,
               target_desc,
@@ -189,9 +189,8 @@ def object_filenames (self,
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
             (base, ext) = os.path.splitext (os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc']):
-                raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % \
-                      (ext, src_name)
+                raise UnknownFileError("unknown file type '%s' (from '%s')" % \
+                      (ext, src_name))
             if strip_dir:
                 base = os.path.basename (base)
             if ext == '.rc':
diff --git a/errors.py b/errors.py
index e72221bdba..963d83377c 100644
--- a/errors.py
+++ b/errors.py
@@ -8,8 +8,6 @@
 This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 class DistutilsError (Exception):
diff --git a/extension.py b/extension.py
index 43b0d3fd00..7f5954e45c 100644
--- a/extension.py
+++ b/extension.py
@@ -86,7 +86,7 @@ class Extension:
 
     # When adding arguments to this constructor, be sure to update
     # setup_keywords in core.py.
-    def __init__ (self, name, sources,
+    def __init__(self, name, sources,
                   include_dirs=None,
                   define_macros=None,
                   undef_macros=None,
@@ -125,17 +125,15 @@ def __init__ (self, name, sources,
 
         # If there are unknown keyword options, warn about them
         if len(kw):
-            L = kw.keys() ; L.sort()
-            L = map(repr, L)
+            L = map(repr, sorted(kw))
             msg = "Unknown Extension options: " + ', '.join(L)
             if warnings is not None:
                 warnings.warn(msg)
             else:
                 sys.stderr.write(msg + '\n')
-# class Extension
 
 
-def read_setup_file (filename):
+def read_setup_file(filename):
     from distutils.sysconfig import \
          parse_makefile, expand_makefile_vars, _variable_rx
     from distutils.text_file import TextFile
@@ -151,7 +149,7 @@ def read_setup_file (filename):
                     lstrip_ws=1, rstrip_ws=1)
     extensions = []
 
-    while 1:
+    while True:
         line = file.readline()
         if line is None:                # eof
             break
@@ -241,5 +239,3 @@ def read_setup_file (filename):
         #                       'lib_args': library_args }
 
     return extensions
-
-# read_setup_file ()
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 82e1f4d1dc..5434334e79 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,12 +8,9 @@
   * options set attributes of a passed-in object
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, string, re
-from types import *
 import getopt
 from distutils.errors import *
 
@@ -43,8 +40,7 @@ class FancyGetopt:
         on the command line sets 'verbose' to false
     """
 
-    def __init__ (self, option_table=None):
-
+    def __init__(self, option_table=None):
         # The option table is (currently) a list of tuples.  The
         # tuples may have 3 or four values:
         #   (long_option, short_option, help_string [, repeatable])
@@ -84,58 +80,51 @@ def __init__ (self, option_table=None):
         # but expands short options, converts aliases, etc.
         self.option_order = []
 
-    # __init__ ()
-
-
-    def _build_index (self):
+    def _build_index(self):
         self.option_index.clear()
         for option in self.option_table:
             self.option_index[option[0]] = option
 
-    def set_option_table (self, option_table):
+    def set_option_table(self, option_table):
         self.option_table = option_table
         self._build_index()
 
-    def add_option (self, long_option, short_option=None, help_string=None):
+    def add_option(self, long_option, short_option=None, help_string=None):
         if long_option in self.option_index:
-            raise DistutilsGetoptError, \
-                  "option conflict: already an option '%s'" % long_option
+            raise DistutilsGetoptError(
+                  "option conflict: already an option '%s'" % long_option)
         else:
             option = (long_option, short_option, help_string)
             self.option_table.append(option)
             self.option_index[long_option] = option
 
-
-    def has_option (self, long_option):
+    def has_option(self, long_option):
         """Return true if the option table for this parser has an
         option with long name 'long_option'."""
         return long_option in self.option_index
 
-    def get_attr_name (self, long_option):
+    def get_attr_name(self, long_option):
         """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
         return long_option.translate(longopt_xlate)
 
-
-    def _check_alias_dict (self, aliases, what):
-        assert type(aliases) is DictionaryType
+    def _check_alias_dict(self, aliases, what):
+        assert isinstance(aliases, dict)
         for (alias, opt) in aliases.items():
             if alias not in self.option_index:
-                raise DistutilsGetoptError, \
-                      ("invalid %s '%s': "
-                       "option '%s' not defined") % (what, alias, alias)
+                raise DistutilsGetoptError(("invalid %s '%s': "
+                       "option '%s' not defined") % (what, alias, alias))
             if opt not in self.option_index:
-                raise DistutilsGetoptError, \
-                      ("invalid %s '%s': "
-                       "aliased option '%s' not defined") % (what, alias, opt)
+                raise DistutilsGetoptError(("invalid %s '%s': "
+                       "aliased option '%s' not defined") % (what, alias, opt))
 
-    def set_aliases (self, alias):
+    def set_aliases(self, alias):
         """Set the aliases for this option parser."""
         self._check_alias_dict(alias, "alias")
         self.alias = alias
 
-    def set_negative_aliases (self, negative_alias):
+    def set_negative_aliases(self, negative_alias):
         """Set the negative aliases for this option parser.
         'negative_alias' should be a dictionary mapping option names to
         option names, both the key and value must already be defined
@@ -143,8 +132,7 @@ def set_negative_aliases (self, negative_alias):
         self._check_alias_dict(negative_alias, "negative alias")
         self.negative_alias = negative_alias
 
-
-    def _grok_option_table (self):
+    def _grok_option_table(self):
         """Populate the various data structures that keep tabs on the
         option table.  Called by 'getopt()' before it can do anything
         worthwhile.
@@ -163,19 +151,17 @@ def _grok_option_table (self):
             else:
                 # the option table is part of the code, so simply
                 # assert that it is correct
-                raise ValueError, "invalid option tuple: %r" % (option,)
+                raise ValueError("invalid option tuple: %r" % (option,))
 
             # Type- and value-check the option names
             if not isinstance(long, basestring) or len(long) < 2:
-                raise DistutilsGetoptError, \
-                      ("invalid long option '%s': "
-                       "must be a string of length >= 2") % long
+                raise DistutilsGetoptError(("invalid long option '%s': "
+                       "must be a string of length >= 2") % long)
 
             if (not ((short is None) or
                      (isinstance(short, basestring) and len(short) == 1))):
-                raise DistutilsGetoptError, \
-                      ("invalid short option '%s': "
-                       "must a single character or None") % short
+                raise DistutilsGetoptError("invalid short option '%s': "
+                       "must a single character or None" % short)
 
             self.repeat[long] = repeat
             self.long_opts.append(long)
@@ -185,54 +171,45 @@ def _grok_option_table (self):
                 long = long[0:-1]
                 self.takes_arg[long] = 1
             else:
-
                 # Is option is a "negative alias" for some other option (eg.
                 # "quiet" == "!verbose")?
                 alias_to = self.negative_alias.get(long)
                 if alias_to is not None:
                     if self.takes_arg[alias_to]:
-                        raise DistutilsGetoptError, \
-                              ("invalid negative alias '%s': "
-                               "aliased option '%s' takes a value") % \
-                               (long, alias_to)
+                        raise DistutilsGetoptError(
+                              "invalid negative alias '%s': "
+                              "aliased option '%s' takes a value"
+                              % (long, alias_to))
 
                     self.long_opts[-1] = long # XXX redundant?!
-                    self.takes_arg[long] = 0
-
-                else:
-                    self.takes_arg[long] = 0
+                self.takes_arg[long] = 0
 
             # If this is an alias option, make sure its "takes arg" flag is
             # the same as the option it's aliased to.
             alias_to = self.alias.get(long)
             if alias_to is not None:
                 if self.takes_arg[long] != self.takes_arg[alias_to]:
-                    raise DistutilsGetoptError, \
-                          ("invalid alias '%s': inconsistent with "
-                           "aliased option '%s' (one of them takes a value, "
-                           "the other doesn't") % (long, alias_to)
-
+                    raise DistutilsGetoptError(
+                          "invalid alias '%s': inconsistent with "
+                          "aliased option '%s' (one of them takes a value, "
+                          "the other doesn't"
+                          % (long, alias_to))
 
             # Now enforce some bondage on the long option name, so we can
             # later translate it to an attribute name on some object.  Have
             # to do this a bit late to make sure we've removed any trailing
             # '='.
             if not longopt_re.match(long):
-                raise DistutilsGetoptError, \
-                      ("invalid long option name '%s' " +
-                       "(must be letters, numbers, hyphens only") % long
+                raise DistutilsGetoptError(
+                       "invalid long option name '%s' "
+                       "(must be letters, numbers, hyphens only" % long)
 
             self.attr_name[long] = self.get_attr_name(long)
             if short:
                 self.short_opts.append(short)
                 self.short2long[short[0]] = long
 
-        # for option_table
-
-    # _grok_option_table()
-
-
-    def getopt (self, args=None, object=None):
+    def getopt(self, args=None, object=None):
         """Parse command-line options in args. Store as attributes on object.
 
         If 'args' is None or not supplied, uses 'sys.argv[1:]'.  If
@@ -247,9 +224,9 @@ def getopt (self, args=None, object=None):
             args = sys.argv[1:]
         if object is None:
             object = OptionDummy()
-            created_object = 1
+            created_object = True
         else:
-            created_object = 0
+            created_object = False
 
         self._grok_option_table()
 
@@ -257,7 +234,7 @@ def getopt (self, args=None, object=None):
         try:
             opts, args = getopt.getopt(args, short_opts, self.long_opts)
         except getopt.error as msg:
-            raise DistutilsArgError, msg
+            raise DistutilsArgError(msg)
 
         for opt, val in opts:
             if len(opt) == 2 and opt[0] == '-': # it's a short option
@@ -293,21 +270,17 @@ def getopt (self, args=None, object=None):
         else:
             return args
 
-    # getopt()
-
-
-    def get_option_order (self):
+    def get_option_order(self):
         """Returns the list of (option, value) tuples processed by the
         previous run of 'getopt()'.  Raises RuntimeError if
         'getopt()' hasn't been called yet.
         """
         if self.option_order is None:
-            raise RuntimeError, "'getopt()' hasn't been called yet"
+            raise RuntimeError("'getopt()' hasn't been called yet")
         else:
             return self.option_order
 
-
-    def generate_help (self, header=None):
+    def generate_help(self, header=None):
         """Generate help text (a list of strings, one per suggested line of
         output) from the option table for this FancyGetopt object.
         """
@@ -384,23 +357,16 @@ def generate_help (self, header=None):
 
             for l in text[1:]:
                 lines.append(big_indent + l)
-
-        # for self.option_table
-
         return lines
 
-    # generate_help ()
-
-    def print_help (self, header=None, file=None):
+    def print_help(self, header=None, file=None):
         if file is None:
             file = sys.stdout
         for line in self.generate_help(header):
             file.write(line + "\n")
 
-# class FancyGetopt
-
 
-def fancy_getopt (options, negative_opt, object, args):
+def fancy_getopt(options, negative_opt, object, args):
     parser = FancyGetopt(options)
     parser.set_negative_aliases(negative_opt)
     return parser.getopt(args, object)
@@ -408,13 +374,12 @@ def fancy_getopt (options, negative_opt, object, args):
 
 WS_TRANS = string.maketrans(string.whitespace, ' ' * len(string.whitespace))
 
-def wrap_text (text, width):
+def wrap_text(text, width):
     """wrap_text(text : string, width : int) -> [string]
 
     Split 'text' into multiple lines of no more than 'width' characters
     each, and return the list of strings that results.
     """
-
     if text is None:
         return []
     if len(text) <= width:
@@ -427,7 +392,6 @@ def wrap_text (text, width):
     lines = []
 
     while chunks:
-
         cur_line = []                   # list of chunks (to-be-joined)
         cur_len = 0                     # length of current line
 
@@ -444,7 +408,6 @@ def wrap_text (text, width):
                 break
 
         if chunks:                      # any chunks left to process?
-
             # if the current line is still empty, then we had a single
             # chunk that's too big too fit on a line -- so we break
             # down and break it up at the line width
@@ -462,14 +425,10 @@ def wrap_text (text, width):
         # string, of course!
         lines.append(''.join(cur_line))
 
-    # while chunks
-
     return lines
 
-# wrap_text ()
-
 
-def translate_longopt (opt):
+def translate_longopt(opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
@@ -480,14 +439,12 @@ class OptionDummy:
     """Dummy class just used as a place to hold command-line option
     values as instance attributes."""
 
-    def __init__ (self, options=[]):
+    def __init__(self, options=[]):
         """Create a new OptionDummy instance.  The attributes listed in
         'options' will be initialized to None."""
         for opt in options:
             setattr(self, opt, None)
 
-# class OptionDummy
-
 
 if __name__ == "__main__":
     text = """\
diff --git a/file_util.py b/file_util.py
index c225ad3172..e29e90e6d7 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,8 +3,6 @@
 Utility functions for operating on single files.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
@@ -17,7 +15,7 @@
                  'sym':  'symbolically linking' }
 
 
-def _copy_file_contents (src, dst, buffer_size=16*1024):
+def _copy_file_contents(src, dst, buffer_size=16*1024):
     """Copy the file 'src' to 'dst'; both must be filenames.  Any error
     opening either file, reading from 'src', or writing to 'dst', raises
     DistutilsFileError.  Data is read/written in chunks of 'buffer_size'
@@ -26,7 +24,6 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
     """
     # Stolen from shutil module in the standard library, but with
     # custom error-handling added.
-
     fsrc = None
     fdst = None
     try:
@@ -34,31 +31,30 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             fsrc = open(src, 'rb')
         except os.error as e:
             (errno, errstr) = e
-            raise DistutilsFileError, \
-                  "could not open '%s': %s" % (src, errstr)
+            raise DistutilsFileError("could not open '%s': %s" % (src, errstr))
 
         if os.path.exists(dst):
             try:
                 os.unlink(dst)
             except os.error as e:
                 (errno, errstr) = e
-                raise DistutilsFileError, \
-                      "could not delete '%s': %s" % (dst, errstr)
+                raise DistutilsFileError(
+                      "could not delete '%s': %s" % (dst, errstr))
 
         try:
             fdst = open(dst, 'wb')
         except os.error as e:
             (errno, errstr) = e
-            raise DistutilsFileError, \
-                  "could not create '%s': %s" % (dst, errstr)
+            raise DistutilsFileError(
+                  "could not create '%s': %s" % (dst, errstr))
 
-        while 1:
+        while True:
             try:
                 buf = fsrc.read(buffer_size)
             except os.error as e:
                 (errno, errstr) = e
-                raise DistutilsFileError, \
-                      "could not read from '%s': %s" % (src, errstr)
+                raise DistutilsFileError(
+                      "could not read from '%s': %s" % (src, errstr))
 
             if not buf:
                 break
@@ -67,25 +63,16 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
                 fdst.write(buf)
             except os.error as e:
                 (errno, errstr) = e
-                raise DistutilsFileError, \
-                      "could not write to '%s': %s" % (dst, errstr)
-
+                raise DistutilsFileError(
+                      "could not write to '%s': %s" % (dst, errstr))
     finally:
         if fdst:
             fdst.close()
         if fsrc:
             fsrc.close()
 
-# _copy_file_contents()
-
-def copy_file (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               update=0,
-               link=None,
-               verbose=0,
-               dry_run=0):
-
+def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
+              link=None, verbose=0, dry_run=0):
     """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
     copied there with the same name; otherwise, it must be a filename.  (If
     the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
@@ -120,8 +107,8 @@ def copy_file (src, dst,
     from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
 
     if not os.path.isfile(src):
-        raise DistutilsFileError, \
-              "can't copy '%s': doesn't exist or not a regular file" % src
+        raise DistutilsFileError(
+              "can't copy '%s': doesn't exist or not a regular file" % src)
 
     if os.path.isdir(dst):
         dir = dst
@@ -131,13 +118,12 @@ def copy_file (src, dst,
 
     if update and not newer(src, dst):
         log.debug("not copying %s (output up-to-date)", src)
-        return dst, 0
+        return (dst, 0)
 
     try:
         action = _copy_action[link]
     except KeyError:
-        raise ValueError, \
-              "invalid value '%s' for 'link' argument" % link
+        raise ValueError("invalid value '%s' for 'link' argument" % link)
     if os.path.basename(dst) == os.path.basename(src):
         log.info("%s %s -> %s", action, src, dir)
     else:
@@ -152,8 +138,8 @@ def copy_file (src, dst,
         try:
             macostools.copy(src, dst, 0, preserve_times)
         except os.error as exc:
-            raise DistutilsFileError, \
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
+            raise DistutilsFileError(
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]))
 
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
@@ -180,8 +166,6 @@ def copy_file (src, dst,
 
     return (dst, 1)
 
-# copy_file ()
-
 
 # XXX I suspect this is Unix-specific -- need porting help!
 def move_file (src, dst,
@@ -204,31 +188,30 @@ def move_file (src, dst,
         return dst
 
     if not isfile(src):
-        raise DistutilsFileError, \
-              "can't move '%s': not a regular file" % src
+        raise DistutilsFileError("can't move '%s': not a regular file" % src)
 
     if isdir(dst):
         dst = os.path.join(dst, basename(src))
     elif exists(dst):
-        raise DistutilsFileError, \
-              "can't move '%s': destination '%s' already exists" % \
-              (src, dst)
+        raise DistutilsFileError(
+              "can't move '%s': destination '%s' already exists" %
+              (src, dst))
 
     if not isdir(dirname(dst)):
-        raise DistutilsFileError, \
-              "can't move '%s': destination '%s' not a valid path" % \
-              (src, dst)
+        raise DistutilsFileError(
+              "can't move '%s': destination '%s' not a valid path" %
+              (src, dst))
 
-    copy_it = 0
+    copy_it = False
     try:
         os.rename(src, dst)
     except os.error as e:
         (num, msg) = e
         if num == errno.EXDEV:
-            copy_it = 1
+            copy_it = True
         else:
-            raise DistutilsFileError, \
-                  "couldn't move '%s' to '%s': %s" % (src, dst, msg)
+            raise DistutilsFileError(
+                  "couldn't move '%s' to '%s': %s" % (src, dst, msg))
 
     if copy_it:
         copy_file(src, dst)
@@ -240,15 +223,12 @@ def move_file (src, dst,
                 os.unlink(dst)
             except os.error:
                 pass
-            raise DistutilsFileError, \
-                  ("couldn't move '%s' to '%s' by copy/delete: " +
-                   "delete '%s' failed: %s") % \
-                  (src, dst, src, msg)
-
+            raise DistutilsFileError(
+                  "couldn't move '%s' to '%s' by copy/delete: "
+                  "delete '%s' failed: %s"
+                  % (src, dst, src, msg))
     return dst
 
-# move_file ()
-
 
 def write_file (filename, contents):
     """Create a file with the specified name and write 'contents' (a
diff --git a/filelist.py b/filelist.py
index cc48e48e58..8f801073d5 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,20 +4,16 @@
 and building lists of files.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, re
 import fnmatch
-from types import *
 from glob import glob
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
 
 class FileList:
-
     """A list of files built by on exploring the filesystem and filtered by
     applying various patterns to what we find there.
 
@@ -32,22 +28,19 @@ class FileList:
         filtering applied)
     """
 
-    def __init__(self,
-                 warn=None,
-                 debug_print=None):
+    def __init__(self, warn=None, debug_print=None):
         # ignore argument to FileList, but keep them for backwards
         # compatibility
-
         self.allfiles = None
         self.files = []
 
-    def set_allfiles (self, allfiles):
+    def set_allfiles(self, allfiles):
         self.allfiles = allfiles
 
-    def findall (self, dir=os.curdir):
+    def findall(self, dir=os.curdir):
         self.allfiles = findall(dir)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
@@ -57,13 +50,13 @@ def debug_print (self, msg):
 
     # -- List-like methods ---------------------------------------------
 
-    def append (self, item):
+    def append(self, item):
         self.files.append(item)
 
-    def extend (self, items):
+    def extend(self, items):
         self.files.extend(items)
 
-    def sort (self):
+    def sort(self):
         # Not a strict lexical sort!
         sortable_files = sorted(map(os.path.split, self.files))
         self.files = []
@@ -73,7 +66,7 @@ def sort (self):
 
     # -- Other miscellaneous utility methods ---------------------------
 
-    def remove_duplicates (self):
+    def remove_duplicates(self):
         # Assumes list has been sorted!
         for i in range(len(self.files) - 1, 0, -1):
             if self.files[i] == self.files[i - 1]:
@@ -82,7 +75,7 @@ def remove_duplicates (self):
 
     # -- "File template" methods ---------------------------------------
 
-    def _parse_template_line (self, line):
+    def _parse_template_line(self, line):
         words = line.split()
         action = words[0]
 
@@ -91,36 +84,26 @@ def _parse_template_line (self, line):
         if action in ('include', 'exclude',
                       'global-include', 'global-exclude'):
             if len(words) < 2:
-                raise DistutilsTemplateError, \
-                      "'%s' expects <pattern1> <pattern2> ..." % action
-
+                raise DistutilsTemplateError(
+                      "'%s' expects <pattern1> <pattern2> ..." % action)
             patterns = map(convert_path, words[1:])
-
         elif action in ('recursive-include', 'recursive-exclude'):
             if len(words) < 3:
-                raise DistutilsTemplateError, \
-                      "'%s' expects <dir> <pattern1> <pattern2> ..." % action
-
+                raise DistutilsTemplateError(
+                      "'%s' expects <dir> <pattern1> <pattern2> ..." % action)
             dir = convert_path(words[1])
             patterns = map(convert_path, words[2:])
-
         elif action in ('graft', 'prune'):
             if len(words) != 2:
-                raise DistutilsTemplateError, \
-                     "'%s' expects a single <dir_pattern>" % action
-
+                raise DistutilsTemplateError(
+                      "'%s' expects a single <dir_pattern>" % action)
             dir_pattern = convert_path(words[1])
-
         else:
-            raise DistutilsTemplateError, "unknown action '%s'" % action
+            raise DistutilsTemplateError("unknown action '%s'" % action)
 
         return (action, patterns, dir, dir_pattern)
 
-    # _parse_template_line ()
-
-
-    def process_template_line (self, line):
-
+    def process_template_line(self, line):
         # Parse the line: split it up, make sure the right number of words
         # is there, and return the relevant words.  'action' is always
         # defined: it's the first word of the line.  Which of the other
@@ -149,7 +132,7 @@ def process_template_line (self, line):
             self.debug_print("global-include " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=0):
-                    log.warn(("warning: no files found matching '%s' " +
+                    log.warn(("warning: no files found matching '%s' "
                               "anywhere in distribution"), pattern)
 
         elif action == 'global-exclude':
@@ -165,7 +148,7 @@ def process_template_line (self, line):
                              (dir, ' '.join(patterns)))
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
-                    log.warn(("warning: no files found matching '%s' " +
+                    log.warn(("warning: no files found matching '%s' "
                                 "under directory '%s'"),
                              pattern, dir)
 
@@ -187,19 +170,16 @@ def process_template_line (self, line):
         elif action == 'prune':
             self.debug_print("prune " + dir_pattern)
             if not self.exclude_pattern(None, prefix=dir_pattern):
-                log.warn(("no previously-included directories found " +
+                log.warn(("no previously-included directories found "
                           "matching '%s'"), dir_pattern)
         else:
-            raise DistutilsInternalError, \
-                  "this cannot happen: invalid action '%s'" % action
-
-    # process_template_line ()
+            raise DistutilsInternalError(
+                  "this cannot happen: invalid action '%s'" % action)
 
 
     # -- Filtering/selection methods -----------------------------------
 
-    def include_pattern (self, pattern,
-                         anchor=1, prefix=None, is_regex=0):
+    def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'self.files' that
         match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
         are not quite the same as implemented by the 'fnmatch' module: '*'
@@ -222,9 +202,9 @@ def include_pattern (self, pattern,
 
         Selected strings will be added to self.files.
 
-        Return 1 if files are found.
+        Return True if files are found, False otherwise.
         """
-        files_found = 0
+        files_found = False
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("include_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
@@ -237,12 +217,9 @@ def include_pattern (self, pattern,
             if pattern_re.search(name):
                 self.debug_print(" adding " + name)
                 self.files.append(name)
-                files_found = 1
-
+                files_found = True
         return files_found
 
-    # include_pattern ()
-
 
     def exclude_pattern (self, pattern,
                          anchor=1, prefix=None, is_regex=0):
@@ -250,9 +227,9 @@ def exclude_pattern (self, pattern,
         'pattern'.  Other parameters are the same as for
         'include_pattern()', above.
         The list 'self.files' is modified in place.
-        Return 1 if files are found.
+        Return True if files are found, False otherwise.
         """
-        files_found = 0
+        files_found = False
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("exclude_pattern: applying regex r'%s'" %
                          pattern_re.pattern)
@@ -260,19 +237,14 @@ def exclude_pattern (self, pattern,
             if pattern_re.search(self.files[i]):
                 self.debug_print(" removing " + self.files[i])
                 del self.files[i]
-                files_found = 1
-
+                files_found = True
         return files_found
 
-    # exclude_pattern ()
-
-# class FileList
-
 
 # ----------------------------------------------------------------------
 # Utility functions
 
-def findall (dir = os.curdir):
+def findall(dir=os.curdir):
     """Find all files under 'dir' and return the list of full filenames
     (relative to 'dir').
     """
@@ -300,11 +272,10 @@ def findall (dir = os.curdir):
                 list.append(fullname)
             elif S_ISDIR(mode) and not S_ISLNK(mode):
                 push(fullname)
-
     return list
 
 
-def glob_to_re (pattern):
+def glob_to_re(pattern):
     """Translate a shell-like glob pattern to a regular expression; return
     a string containing the regex.  Differs from 'fnmatch.translate()' in
     that '*' does not match "special characters" (which are
@@ -322,10 +293,8 @@ def glob_to_re (pattern):
     pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re)
     return pattern_re
 
-# glob_to_re ()
 
-
-def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
+def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     """Translate a shell-like wildcard pattern to a compiled regular
     expression.  Return the compiled regex.  If 'is_regex' true,
     then 'pattern' is directly compiled to a regex (if it's a string)
@@ -350,5 +319,3 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
             pattern_re = "^" + pattern_re
 
     return re.compile(pattern_re)
-
-# translate_pattern ()
diff --git a/log.py b/log.py
index e4959d6492..97319a07aa 100644
--- a/log.py
+++ b/log.py
@@ -1,7 +1,5 @@
 """A simple log mechanism styled after PEP 282."""
 
-# This module should be kept compatible with Python 2.1.
-
 # The class here is styled after PEP 282 so that it could later be
 # replaced with a standard Python logging implementation.
 
diff --git a/msvccompiler.py b/msvccompiler.py
index 07c76f1838..f5b67049ef 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -8,8 +8,6 @@
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
@@ -20,11 +18,11 @@
      CCompiler, gen_preprocess_options, gen_lib_options
 from distutils import log
 
-_can_read_reg = 0
+_can_read_reg = False
 try:
     import _winreg
 
-    _can_read_reg = 1
+    _can_read_reg = True
     hkey_mod = _winreg
 
     RegOpenKeyEx = _winreg.OpenKeyEx
@@ -36,14 +34,13 @@
     try:
         import win32api
         import win32con
-        _can_read_reg = 1
+        _can_read_reg = True
         hkey_mod = win32con
 
         RegOpenKeyEx = win32api.RegOpenKeyEx
         RegEnumKey = win32api.RegEnumKey
         RegEnumValue = win32api.RegEnumValue
         RegError = win32api.error
-
     except ImportError:
         log.info("Warning: Can't read registry to find the "
                  "necessary compiler setting\n"
@@ -59,20 +56,19 @@
 
 def read_keys(base, key):
     """Return list of registry keys."""
-
     try:
         handle = RegOpenKeyEx(base, key)
     except RegError:
         return None
     L = []
     i = 0
-    while 1:
+    while True:
         try:
             k = RegEnumKey(handle, i)
         except RegError:
             break
         L.append(k)
-        i = i + 1
+        i += 1
     return L
 
 def read_values(base, key):
@@ -86,14 +82,14 @@ def read_values(base, key):
         return None
     d = {}
     i = 0
-    while 1:
+    while True:
         try:
             name, value, type = RegEnumValue(handle, i)
         except RegError:
             break
         name = name.lower()
         d[convert_mbcs(name)] = convert_mbcs(value)
-        i = i + 1
+        i += 1
     return d
 
 def convert_mbcs(s):
@@ -106,7 +102,6 @@ def convert_mbcs(s):
     return s
 
 class MacroExpander:
-
     def __init__(self, version):
         self.macros = {}
         self.load_macros(version)
@@ -130,8 +125,8 @@ def load_macros(self, version):
             else:
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
         except KeyError as exc: #
-            raise DistutilsPlatformError, \
-                  ("""Python was built with Visual Studio 2003;
+            raise DistutilsPlatformError(
+            """Python was built with Visual Studio 2003;
 extensions must be built with a compiler than can generate compatible binaries.
 Visual Studio 2003 was not found on this system. If you have Cygwin installed,
 you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
@@ -157,7 +152,6 @@ def get_build_version():
     For Python 2.3 and up, the version number is included in
     sys.version.  For earlier versions, assume the compiler is MSVC 6.
     """
-
     prefix = "MSC v."
     i = sys.version.find(prefix)
     if i == -1:
@@ -202,7 +196,7 @@ def normalize_and_reduce_paths(paths):
     return reduced_paths
 
 
-class MSVCCompiler (CCompiler) :
+class MSVCCompiler(CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
        as defined by the CCompiler abstract class."""
 
@@ -232,7 +226,7 @@ class MSVCCompiler (CCompiler) :
     static_lib_format = shared_lib_format = '%s%s'
     exe_extension = '.exe'
 
-    def __init__ (self, verbose=0, dry_run=0, force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
         self.__version = get_build_version()
         self.__arch = get_build_architecture()
@@ -263,11 +257,11 @@ def initialize(self):
         else:
             self.__paths = self.get_msvc_paths("path")
 
-            if len (self.__paths) == 0:
-                raise DistutilsPlatformError, \
-                      ("Python was built with %s, "
+            if len(self.__paths) == 0:
+                raise DistutilsPlatformError("Python was built with %s, "
                        "and extensions need to be built with the same "
-                       "version of the compiler, but it isn't installed." % self.__product)
+                       "version of the compiler, but it isn't installed."
+                       % self.__product)
 
             self.cc = self.find_exe("cl.exe")
             self.linker = self.find_exe("link.exe")
@@ -314,10 +308,10 @@ def initialize(self):
 
     # -- Worker methods ------------------------------------------------
 
-    def object_filenames (self,
-                          source_filenames,
-                          strip_dir=0,
-                          output_dir=''):
+    def object_filenames(self,
+                         source_filenames,
+                         strip_dir=0,
+                         output_dir=''):
         # Copied from ccompiler.py, extended to return .res as 'object'-file
         # for .rc input file
         if output_dir is None: output_dir = ''
@@ -344,17 +338,16 @@ def object_filenames (self,
                                                 base + self.obj_extension))
         return obj_names
 
-    # object_filenames ()
-
 
     def compile(self, sources,
                 output_dir=None, macros=None, include_dirs=None, debug=0,
                 extra_preargs=None, extra_postargs=None, depends=None):
 
-        if not self.initialized: self.initialize()
-        macros, objects, extra_postargs, pp_opts, build = \
-                self._setup_compile(output_dir, macros, include_dirs, sources,
-                                    depends, extra_postargs)
+        if not self.initialized:
+            self.initialize()
+        compile_info = self._setup_compile(output_dir, macros, include_dirs,
+                                           sources, depends, extra_postargs)
+        macros, objects, extra_postargs, pp_opts, build = compile_info
 
         compile_opts = extra_preargs or []
         compile_opts.append ('/c')
@@ -383,13 +376,12 @@ def compile(self, sources,
                 input_opt = src
                 output_opt = "/fo" + obj
                 try:
-                    self.spawn ([self.rc] + pp_opts +
-                                [output_opt] + [input_opt])
+                    self.spawn([self.rc] + pp_opts +
+                               [output_opt] + [input_opt])
                 except DistutilsExecError as msg:
-                    raise CompileError, msg
+                    raise CompileError(msg)
                 continue
             elif ext in self._mc_extensions:
-
                 # Compile .MC to .RC file to .RES file.
                 #   * '-h dir' specifies the directory for the
                 #     generated include file
@@ -401,99 +393,95 @@ def compile(self, sources,
                 # we use the source-directory for the include file and
                 # the build directory for the RC file and message
                 # resources. This works at least for win32all.
-
-                h_dir = os.path.dirname (src)
-                rc_dir = os.path.dirname (obj)
+                h_dir = os.path.dirname(src)
+                rc_dir = os.path.dirname(obj)
                 try:
                     # first compile .MC to .RC and .H file
-                    self.spawn ([self.mc] +
-                                ['-h', h_dir, '-r', rc_dir] + [src])
+                    self.spawn([self.mc] +
+                               ['-h', h_dir, '-r', rc_dir] + [src])
                     base, _ = os.path.splitext (os.path.basename (src))
                     rc_file = os.path.join (rc_dir, base + '.rc')
                     # then compile .RC to .RES file
-                    self.spawn ([self.rc] +
-                                ["/fo" + obj] + [rc_file])
+                    self.spawn([self.rc] +
+                               ["/fo" + obj] + [rc_file])
 
                 except DistutilsExecError as msg:
-                    raise CompileError, msg
+                    raise CompileError(msg)
                 continue
             else:
                 # how to handle this file?
-                raise CompileError (
-                    "Don't know how to compile %s to %s" % \
-                    (src, obj))
+                raise CompileError("Don't know how to compile %s to %s"
+                                   % (src, obj))
 
             output_opt = "/Fo" + obj
             try:
-                self.spawn ([self.cc] + compile_opts + pp_opts +
-                            [input_opt, output_opt] +
-                            extra_postargs)
+                self.spawn([self.cc] + compile_opts + pp_opts +
+                           [input_opt, output_opt] +
+                           extra_postargs)
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
 
         return objects
 
-    # compile ()
 
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0,
+                          target_lang=None):
 
-    def create_static_lib (self,
-                           objects,
-                           output_libname,
-                           output_dir=None,
-                           debug=0,
-                           target_lang=None):
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        output_filename = self.library_filename(output_libname,
+                                                output_dir=output_dir)
 
-        if not self.initialized: self.initialize()
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        output_filename = \
-            self.library_filename (output_libname, output_dir=output_dir)
-
-        if self._need_link (objects, output_filename):
+        if self._need_link(objects, output_filename):
             lib_args = objects + ['/OUT:' + output_filename]
             if debug:
-                pass                    # XXX what goes here?
+                pass # XXX what goes here?
             try:
-                self.spawn ([self.lib] + lib_args)
+                self.([self.lib] + lib_args)
             except DistutilsExecError as msg:
-                raise LibError, msg
-
+                raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    # create_static_lib ()
-
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-
-        if not self.initialized: self.initialize()
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        (libraries, library_dirs, runtime_library_dirs) = fixed_args
 
         if runtime_library_dirs:
             self.warn ("I don't know what to do with 'runtime_library_dirs': "
                        + str (runtime_library_dirs))
 
-        lib_opts = gen_lib_options (self,
-                                    library_dirs, runtime_library_dirs,
-                                    libraries)
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
         if output_dir is not None:
-            output_filename = os.path.join (output_dir, output_filename)
-
-        if self._need_link (objects, output_filename):
+            output_filename = os.path.join(output_dir, output_filename)
 
+        if self._need_link(objects, output_filename):
             if target_desc == CCompiler.EXECUTABLE:
                 if debug:
                     ldflags = self.ldflags_shared_debug[1:]
@@ -530,34 +518,32 @@ def link (self,
             if extra_postargs:
                 ld_args.extend(extra_postargs)
 
-            self.mkpath (os.path.dirname (output_filename))
+            self.mkpath(os.path.dirname(output_filename))
             try:
-                self.spawn ([self.linker] + ld_args)
+                self.spawn([self.linker] + ld_args)
             except DistutilsExecError as msg:
-                raise LinkError, msg
+                raise LinkError(msg)
 
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    # link ()
-
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
     # ccompiler.py.
 
-    def library_dir_option (self, dir):
+    def library_dir_option(self, dir):
         return "/LIBPATH:" + dir
 
-    def runtime_library_dir_option (self, dir):
-        raise DistutilsPlatformError, \
-              "don't know how to set runtime library search path for MSVC++"
+    def runtime_library_dir_option(self, dir):
+        raise DistutilsPlatformError(
+              "don't know how to set runtime library search path for MSVC++")
 
-    def library_option (self, lib):
-        return self.library_filename (lib)
+    def library_option(self, lib):
+        return self.library_filename(lib)
 
 
-    def find_library_file (self, dirs, lib, debug=0):
+    def find_library_file(self, dirs, lib, debug=0):
         # Prefer a debugging library if found (and requested), but deal
         # with it if we don't have one.
         if debug:
@@ -573,8 +559,6 @@ def find_library_file (self, dirs, lib, debug=0):
             # Oops, didn't find it in *any* of 'dirs'
             return None
 
-    # find_library_file ()
-
     # Helper methods for using the MSVC registry settings
 
     def find_exe(self, exe):
@@ -586,7 +570,6 @@ def find_exe(self, exe):
         absolute path that is known to exist.  If none of them work, just
         return the original program name, 'exe'.
         """
-
         for p in self.__paths:
             fn = os.path.join(os.path.abspath(p), exe)
             if os.path.isfile(fn):
@@ -606,7 +589,6 @@ def get_msvc_paths(self, path, platform='x86'):
         Return a list of strings.  The list will be empty if unable to
         access the registry or appropriate registry keys not found.
         """
-
         if not _can_read_reg:
             return []
 
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 662046ae22..25d48ae866 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -4,12 +4,9 @@
 for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
 Windows."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
@@ -96,13 +93,13 @@ def link (self,
 
         # First examine a couple of options for things that aren't implemented yet
         if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
-            raise DistutilsPlatformError, 'Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac'
+            raise DistutilsPlatformError('Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac')
         if runtime_library_dirs:
-            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
+            raise DistutilsPlatformError('Runtime library dirs not implemented yet')
         if extra_preargs or extra_postargs:
-            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
+            raise DistutilsPlatformError('Runtime library dirs not implemented yet')
         if len(export_symbols) != 1:
-            raise DistutilsPlatformError, 'Need exactly one export symbol'
+            raise DistutilsPlatformError('Need exactly one export symbol')
         # Next there are various things for which we need absolute pathnames.
         # This is because we (usually) create the project in a subdirectory of
         # where we are now, and keeping the paths relative is too much work right
diff --git a/spawn.py b/spawn.py
index c70c10bf7c..0aee2bc3eb 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,19 +6,13 @@
 executable name.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
 from distutils.errors import *
 from distutils import log
 
-def spawn (cmd,
-           search_path=1,
-           verbose=0,
-           dry_run=0):
-
+def spawn(cmd, search_path=1, verbose=0, dry_run=0):
     """Run another program, specified as a command list 'cmd', in a new
     process.  'cmd' is just the argument list for the new process, ie.
     cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
@@ -40,34 +34,26 @@ def spawn (cmd,
     elif os.name == 'os2':
         _spawn_os2(cmd, search_path, dry_run=dry_run)
     else:
-        raise DistutilsPlatformError, \
-              "don't know how to spawn programs on platform '%s'" % os.name
+        raise DistutilsPlatformError(
+              "don't know how to spawn programs on platform '%s'" % os.name)
 
-# spawn ()
 
-
-def _nt_quote_args (args):
+def _nt_quote_args(args):
     """Quote command-line arguments for DOS/Windows conventions: just
     wraps every argument which contains blanks in double quotes, and
     returns a new argument list.
     """
-
     # XXX this doesn't seem very robust to me -- but if the Windows guys
     # say it'll work, I guess I'll have to accept it.  (What if an arg
     # contains quotes?  What other magic characters, other than spaces,
     # have to be escaped?  Is there an escaping mechanism other than
     # quoting?)
-
     for i in range(len(args)):
         if args[i].find(' ') != -1:
             args[i] = '"%s"' % args[i]
     return args
 
-def _spawn_nt (cmd,
-               search_path=1,
-               verbose=0,
-               dry_run=0):
-
+def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
     cmd = _nt_quote_args(cmd)
     if search_path:
@@ -80,19 +66,15 @@ def _spawn_nt (cmd,
             rc = os.spawnv(os.P_WAIT, executable, cmd)
         except OSError as exc:
             # this seems to happen when the command isn't found
-            raise DistutilsExecError, \
-                  "command '%s' failed: %s" % (cmd[0], exc[-1])
+            raise DistutilsExecError(
+                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
         if rc != 0:
             # and this reflects the command running but failing
-            raise DistutilsExecError, \
-                  "command '%s' failed with exit status %d" % (cmd[0], rc)
+            raise DistutilsExecError(
+                  "command '%s' failed with exit status %d" % (cmd[0], rc))
 
 
-def _spawn_os2 (cmd,
-                search_path=1,
-                verbose=0,
-                dry_run=0):
-
+def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
     #cmd = _nt_quote_args(cmd)
     if search_path:
@@ -105,75 +87,62 @@ def _spawn_os2 (cmd,
             rc = os.spawnv(os.P_WAIT, executable, cmd)
         except OSError as exc:
             # this seems to happen when the command isn't found
-            raise DistutilsExecError, \
-                  "command '%s' failed: %s" % (cmd[0], exc[-1])
+            raise DistutilsExecError(
+                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
         if rc != 0:
             # and this reflects the command running but failing
             print("command '%s' failed with exit status %d" % (cmd[0], rc))
-            raise DistutilsExecError, \
-                  "command '%s' failed with exit status %d" % (cmd[0], rc)
-
+            raise DistutilsExecError(
+                  "command '%s' failed with exit status %d" % (cmd[0], rc))
 
-def _spawn_posix (cmd,
-                  search_path=1,
-                  verbose=0,
-                  dry_run=0):
 
+def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
 
     pid = os.fork()
-
-    if pid == 0:                        # in the child
+    if pid == 0: # in the child
         try:
-            #print "cmd[0] =", cmd[0]
-            #print "cmd =", cmd
             exec_fn(cmd[0], cmd)
         except OSError as e:
-            sys.stderr.write("unable to execute %s: %s\n" %
-                             (cmd[0], e.strerror))
+            sys.stderr.write("unable to execute %s: %s\n"
+                             % (cmd[0], e.strerror))
             os._exit(1)
 
         sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
         os._exit(1)
-
-
-    else:                               # in the parent
+    else: # in the parent
         # Loop until the child either exits or is terminated by a signal
         # (ie. keep waiting if it's merely stopped)
-        while 1:
+        while True:
             try:
                 (pid, status) = os.waitpid(pid, 0)
             except OSError as exc:
                 import errno
                 if exc.errno == errno.EINTR:
                     continue
-                raise DistutilsExecError, \
-                      "command '%s' failed: %s" % (cmd[0], exc[-1])
+                raise DistutilsExecError(
+                      "command '%s' failed: %s" % (cmd[0], exc[-1]))
             if os.WIFSIGNALED(status):
-                raise DistutilsExecError, \
-                      "command '%s' terminated by signal %d" % \
-                      (cmd[0], os.WTERMSIG(status))
-
+                raise DistutilsExecError(
+                      "command '%s' terminated by signal %d"
+                      % (cmd[0], os.WTERMSIG(status)))
             elif os.WIFEXITED(status):
                 exit_status = os.WEXITSTATUS(status)
                 if exit_status == 0:
                     return              # hey, it succeeded!
                 else:
-                    raise DistutilsExecError, \
-                          "command '%s' failed with exit status %d" % \
-                          (cmd[0], exit_status)
-
+                    raise DistutilsExecError(
+                          "command '%s' failed with exit status %d"
+                          % (cmd[0], exit_status))
             elif os.WIFSTOPPED(status):
                 continue
-
             else:
-                raise DistutilsExecError, \
-                      "unknown error executing '%s': termination status %d" % \
-                      (cmd[0], status)
-# _spawn_posix ()
+                raise DistutilsExecError(
+                      "unknown error executing '%s': termination status %d"
+                      % (cmd[0], status))
 
 
 def find_executable(executable, path=None):
@@ -197,5 +166,3 @@ def find_executable(executable, path=None):
         return None
     else:
         return executable
-
-# find_executable()
diff --git a/sysconfig.py b/sysconfig.py
index c40c2e7425..70a279938c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -27,11 +27,7 @@
 # different (hard-wired) directories.
 
 argv0_path = os.path.dirname(os.path.abspath(sys.executable))
-landmark = os.path.join(argv0_path, "Modules", "Setup")
-
-python_build = os.path.isfile(landmark)
-
-del landmark
+python_build = os.path.isfile(os.path.join(argv0_path, "Modules", "Setup"))
 
 
 def get_python_version():
@@ -105,7 +101,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             return libpython
         else:
             return os.path.join(libpython, "site-packages")
-
     elif os.name == "nt":
         if standard_lib:
             return os.path.join(prefix, "Lib")
@@ -114,7 +109,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return prefix
             else:
                 return os.path.join(PREFIX, "Lib", "site-packages")
-
     elif os.name == "mac":
         if plat_specific:
             if standard_lib:
@@ -126,13 +120,11 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return os.path.join(prefix, "Lib")
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
-
     elif os.name == "os2":
         if standard_lib:
             return os.path.join(PREFIX, "Lib")
         else:
             return os.path.join(PREFIX, "Lib", "site-packages")
-
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "
@@ -216,7 +208,7 @@ def parse_config_h(fp, g=None):
     define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
     undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
     #
-    while 1:
+    while True:
         line = fp.readline()
         if not line:
             break
@@ -254,9 +246,9 @@ def parse_makefile(fn, g=None):
     done = {}
     notdone = {}
 
-    while 1:
+    while True:
         line = fp.readline()
-        if line is None:                # eof
+        if line is None: # eof
             break
         m = _variable_rx.match(line)
         if m:
@@ -325,7 +317,7 @@ def expand_makefile_vars(s, vars):
     # 'parse_makefile()', which takes care of such expansions eagerly,
     # according to make's variable expansion semantics.
 
-    while 1:
+    while True:
         m = _findvar1_rx.search(s) or _findvar2_rx.search(s)
         if m:
             (beg, end) = m.span()
diff --git a/text_file.py b/text_file.py
index 3f6a220dcc..db054fd270 100644
--- a/text_file.py
+++ b/text_file.py
@@ -10,7 +10,6 @@
 
 
 class TextFile:
-
     """Provides a file-like object that takes care of all the things you
        commonly want to do when processing a text file that has some
        line-by-line syntax: strip comments (as long as "#" is your
@@ -75,32 +74,29 @@ class TextFile:
                         'collapse_join':  0,
                       }
 
-    def __init__ (self, filename=None, file=None, **options):
+    def __init__(self, filename=None, file=None, **options):
         """Construct a new TextFile object.  At least one of 'filename'
            (a string) and 'file' (a file-like object) must be supplied.
            They keyword argument options are described above and affect
            the values returned by 'readline()'."""
-
         if filename is None and file is None:
-            raise RuntimeError, \
-                  "you must supply either or both of 'filename' and 'file'"
+            raise RuntimeError("you must supply either or both of 'filename' and 'file'")
 
         # set values for all options -- either from client option hash
         # or fallback to default_options
         for opt in self.default_options.keys():
             if opt in options:
-                setattr (self, opt, options[opt])
-
+                setattr(self, opt, options[opt])
             else:
-                setattr (self, opt, self.default_options[opt])
+                setattr(self, opt, self.default_options[opt])
 
         # sanity check client option hash
         for opt in options.keys():
             if opt not in self.default_options:
-                raise KeyError, "invalid TextFile option '%s'" % opt
+                raise KeyError("invalid TextFile option '%s'" % opt)
 
         if file is None:
-            self.open (filename)
+            self.open(filename)
         else:
             self.filename = filename
             self.file = file
@@ -111,43 +107,37 @@ def __init__ (self, filename=None, file=None, **options):
         # 'unreadline()' operation
         self.linebuf = []
 
-
-    def open (self, filename):
+    def open(self, filename):
         """Open a new file named 'filename'.  This overrides both the
            'filename' and 'file' arguments to the constructor."""
-
         self.filename = filename
-        self.file = io.open (self.filename, 'r')
+        self.file = io.open(self.filename, 'r')
         self.current_line = 0
 
-
-    def close (self):
+    def close(self):
         """Close the current file and forget everything we know about it
            (filename, current line number)."""
-
-        self.file.close ()
+        self.file.close()
         self.file = None
         self.filename = None
         self.current_line = None
 
-
-    def gen_error (self, msg, line=None):
+    def gen_error(self, msg, line=None):
         outmsg = []
         if line is None:
             line = self.current_line
         outmsg.append(self.filename + ", ")
-        if isinstance (line, (list, tuple)):
-            outmsg.append("lines %d-%d: " % tuple (line))
+        if isinstance(line, (list, tuple)):
+            outmsg.append("lines %d-%d: " % tuple(line))
         else:
             outmsg.append("line %d: " % line)
         outmsg.append(str(msg))
         return "".join(outmsg)
 
+    def error(self, msg, line=None):
+        raise ValueError("error: " + self.gen_error(msg, line))
 
-    def error (self, msg, line=None):
-        raise ValueError, "error: " + self.gen_error(msg, line)
-
-    def warn (self, msg, line=None):
+    def warn(self, msg, line=None):
         """Print (to stderr) a warning message tied to the current logical
            line in the current file.  If the current logical line in the
            file spans multiple physical lines, the warning refers to the
@@ -157,8 +147,7 @@ def warn (self, msg, line=None):
            line."""
         sys.stderr.write("warning: " + self.gen_error(msg, line) + "\n")
 
-
-    def readline (self):
+    def readline(self):
         """Read and return a single logical line from the current file (or
            from an internal buffer if lines have previously been "unread"
            with 'unreadline()').  If the 'join_lines' option is true, this
@@ -168,7 +157,6 @@ def readline (self):
            line(s) just read.  Returns None on end-of-file, since the empty
            string can occur if 'rstrip_ws' is true but 'strip_blanks' is
            not."""
-
         # If any "unread" lines waiting in 'linebuf', return the top
         # one.  (We don't actually buffer read-ahead data -- lines only
         # get put in 'linebuf' if the client explicitly does an
@@ -180,10 +168,11 @@ def readline (self):
 
         buildup_line = ''
 
-        while 1:
+        while True:
             # read the line, make it None if EOF
             line = self.file.readline()
-            if line == '': line = None
+            if line == '':
+                line = None
 
             if self.strip_comments and line:
 
@@ -195,8 +184,8 @@ def readline (self):
                 # unescape it (and any other escaped "#"'s that might be
                 # lurking in there) and otherwise leave the line alone.
 
-                pos = line.find ("#")
-                if pos == -1:           # no "#" -- no comments
+                pos = line.find("#")
+                if pos == -1: # no "#" -- no comments
                     pass
 
                 # It's definitely a comment -- either "#" is the first
@@ -218,51 +207,48 @@ def readline (self):
                     #   # comment that should be ignored
                     #   there
                     # result in "hello there".
-                    if line.strip () == "":
+                    if line.strip() == "":
                         continue
-
-                else:                   # it's an escaped "#"
+                else: # it's an escaped "#"
                     line = line.replace("\\#", "#")
 
-
             # did previous line end with a backslash? then accumulate
             if self.join_lines and buildup_line:
                 # oops: end of file
                 if line is None:
-                    self.warn ("continuation line immediately precedes "
-                               "end-of-file")
+                    self.warn("continuation line immediately precedes "
+                              "end-of-file")
                     return buildup_line
 
                 if self.collapse_join:
-                    line = line.lstrip ()
+                    line = line.lstrip()
                 line = buildup_line + line
 
                 # careful: pay attention to line number when incrementing it
-                if isinstance (self.current_line, list):
+                if isinstance(self.current_line, list):
                     self.current_line[1] = self.current_line[1] + 1
                 else:
                     self.current_line = [self.current_line,
-                                         self.current_line+1]
+                                         self.current_line + 1]
             # just an ordinary line, read it as usual
             else:
-                if line is None:        # eof
+                if line is None: # eof
                     return None
 
                 # still have to be careful about incrementing the line number!
-                if isinstance (self.current_line, list):
+                if isinstance(self.current_line, list):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
 
-
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
             if self.lstrip_ws and self.rstrip_ws:
-                line = line.strip ()
+                line = line.strip()
             elif self.lstrip_ws:
-                line = line.lstrip ()
+                line = line.lstrip()
             elif self.rstrip_ws:
-                line = line.rstrip ()
+                line = line.rstrip()
 
             # blank line (whether we rstrip'ed or not)? skip to next line
             # if appropriate
@@ -281,27 +267,21 @@ def readline (self):
             # well, I guess there's some actual content there: return it
             return line
 
-    # readline ()
-
-
-    def readlines (self):
+    def readlines(self):
         """Read and return the list of all logical lines remaining in the
            current file."""
-
         lines = []
-        while 1:
+        while True:
             line = self.readline()
             if line is None:
                 return lines
-            lines.append (line)
+            lines.append(line)
 
-
-    def unreadline (self, line):
+    def unreadline(self, line):
         """Push 'line' (a string) onto an internal buffer that will be
            checked by future 'readline()' calls.  Handy for implementing
            a parser with line-at-a-time lookahead."""
-
-        self.linebuf.append (line)
+        self.linebuf.append(line)
 
 
 if __name__ == "__main__":
@@ -312,7 +292,7 @@ def unreadline (self, line):
   continues on next line
 """
     # result 1: no fancy options
-    result1 = map (lambda x: x + "\n", test_data.split ("\n")[0:-1])
+    result1 = map(lambda x: x + "\n", test_data.split("\n")[0:-1])
 
     # result 2: just strip comments
     result2 = ["\n",
@@ -337,9 +317,8 @@ def unreadline (self, line):
     # "collapse" joined lines
     result6 = ["line 3 continues on next line"]
 
-    def test_input (count, description, file, expected_result):
-        result = file.readlines ()
-        # result = ''.join (result)
+    def test_input(count, description, file, expected_result):
+        result = file.readlines()
         if result == expected_result:
             print("ok %d (%s)" % (count, description))
         else:
@@ -351,31 +330,31 @@ def test_input (count, description, file, expected_result):
 
 
     filename = "test.txt"
-    out_file = open (filename, "w")
-    out_file.write (test_data)
-    out_file.close ()
+    out_file = open(filename, "w")
+    out_file.write(test_data)
+    out_file.close()
 
-    in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (1, "no processing", in_file, result1)
+    in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
+                       lstrip_ws=0, rstrip_ws=0)
+    test_input(1, "no processing", in_file, result1)
 
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (2, "strip comments", in_file, result2)
+    in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
+                       lstrip_ws=0, rstrip_ws=0)
+    test_input(2, "strip comments", in_file, result2)
 
-    in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (3, "strip blanks", in_file, result3)
+    in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
+                       lstrip_ws=0, rstrip_ws=0)
+    test_input(3, "strip blanks", in_file, result3)
 
-    in_file = TextFile (filename)
-    test_input (4, "default processing", in_file, result4)
+    in_file = TextFile(filename)
+    test_input(4, "default processing", in_file, result4)
 
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                        join_lines=1, rstrip_ws=1)
-    test_input (5, "join lines without collapsing", in_file, result5)
+    in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                       join_lines=1, rstrip_ws=1)
+    test_input(5, "join lines without collapsing", in_file, result5)
 
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                        join_lines=1, rstrip_ws=1, collapse_join=1)
-    test_input (6, "join lines with collapsing", in_file, result6)
+    in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                       join_lines=1, rstrip_ws=1, collapse_join=1)
+    test_input(6, "join lines with collapsing", in_file, result6)
 
-    os.remove (filename)
+    os.remove(filename)
diff --git a/unixccompiler.py b/unixccompiler.py
index d07ae1e358..91d0dffd76 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -50,7 +50,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     build, without a way to remove an architecture. Furthermore GCC will
     barf if multiple '-isysroot' arguments are present.
     """
-    stripArch = stripSysroot = 0
+    stripArch = stripSysroot = False
 
     compiler_so = list(compiler_so)
     kernel_version = os.uname()[2] # 8.4.3
@@ -65,7 +65,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         stripSysroot = '-isysroot' in cc_args
 
     if stripArch:
-        while 1:
+        while True:
             try:
                 index = compiler_so.index('-arch')
                 # Strip this argument and the next one:
@@ -137,11 +137,10 @@ class UnixCCompiler(CCompiler):
     if sys.platform == "cygwin":
         exe_extension = ".exe"
 
-    def preprocess(self, source,
-                   output_file=None, macros=None, include_dirs=None,
-                   extra_preargs=None, extra_postargs=None):
-        ignore, macros, include_dirs = \
-            self._fix_compile_args(None, macros, include_dirs)
+    def preprocess(self, source, output_file=None, macros=None,
+                   include_dirs=None, extra_preargs=None, extra_postargs=None):
+        fixed_args = self._fix_compile_args(None, macros, include_dirs)
+        ignore, macros, include_dirs = fixed_args
         pp_opts = gen_preprocess_options(macros, include_dirs)
         pp_args = self.preprocessor + pp_opts
         if output_file:
@@ -162,7 +161,7 @@ def preprocess(self, source,
             try:
                 self.spawn(pp_args)
             except DistutilsExecError as msg:
-                raise CompileError, msg
+                raise CompileError(msg)
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
@@ -172,7 +171,7 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError as msg:
-            raise CompileError, msg
+            raise CompileError(msg)
 
     def create_static_lib(self, objects, output_libname,
                           output_dir=None, debug=0, target_lang=None):
@@ -196,7 +195,7 @@ def create_static_lib(self, objects, output_libname,
                 try:
                     self.spawn(self.ranlib + [output_filename])
                 except DistutilsExecError as msg:
-                    raise LibError, msg
+                    raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
@@ -206,13 +205,14 @@ def link(self, target_desc, objects,
              export_symbols=None, debug=0, extra_preargs=None,
              extra_postargs=None, build_temp=None, target_lang=None):
         objects, output_dir = self._fix_object_args(objects, output_dir)
-        libraries, library_dirs, runtime_library_dirs = \
-            self._fix_lib_args(libraries, library_dirs, runtime_library_dirs)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        libraries, library_dirs, runtime_library_dirs = fixed_args
 
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
         if not isinstance(output_dir, (basestring, type(None))):
-            raise TypeError, "'output_dir' must be a string or None"
+            raise TypeError("'output_dir' must be a string or None")
         if output_dir is not None:
             output_filename = os.path.join(output_dir, output_filename)
 
@@ -241,8 +241,7 @@ def link(self, target_desc, objects,
                     if os.path.basename(linker[0]) == "env":
                         i = 1
                         while '=' in linker[i]:
-                            i = i + 1
-
+                            i += 1
                     linker[i] = self.compiler_cxx[i]
 
                 if sys.platform == 'darwin':
@@ -250,7 +249,7 @@ def link(self, target_desc, objects,
 
                 self.spawn(linker + ld_args)
             except DistutilsExecError as msg:
-                raise LinkError, msg
+                raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
diff --git a/util.py b/util.py
index 9aa857052a..22a8ba23e8 100644
--- a/util.py
+++ b/util.py
@@ -153,9 +153,9 @@ def convert_path (pathname):
     if not pathname:
         return pathname
     if pathname[0] == '/':
-        raise ValueError, "path '%s' cannot be absolute" % pathname
+        raise ValueError("path '%s' cannot be absolute" % pathname)
     if pathname[-1] == '/':
-        raise ValueError, "path '%s' cannot end with '/'" % pathname
+        raise ValueError("path '%s' cannot end with '/'" % pathname)
 
     paths = pathname.split('/')
     while '.' in paths:
@@ -201,8 +201,7 @@ def change_root (new_root, pathname):
             return os.path.join(new_root, pathname)
 
     else:
-        raise DistutilsPlatformError, \
-              "nothing known about platform '%s'" % os.name
+        raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
 
 
 _environ_checked = 0
@@ -248,7 +247,7 @@ def _subst (match, local_vars=local_vars):
     try:
         return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
     except KeyError as var:
-        raise ValueError, "invalid variable '$%s'" % var
+        raise ValueError("invalid variable '$%s'" % var)
 
 # subst_vars ()
 
@@ -326,12 +325,10 @@ def split_quoted (s):
             elif s[end] == '"':         # slurp doubly-quoted string
                 m = _dquote_re.match(s, end)
             else:
-                raise RuntimeError, \
-                      "this can't happen (bad char '%c')" % s[end]
+                raise RuntimeError("this can't happen (bad char '%c')" % s[end])
 
             if m is None:
-                raise ValueError, \
-                      "bad string (mismatched %s quotes?)" % s[end]
+                raise ValueError("bad string (mismatched %s quotes?)" % s[end])
 
             (beg, end) = m.span()
             s = s[:beg] + s[beg+1:end-1] + s[end:]
@@ -378,7 +375,7 @@ def strtobool (val):
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
         return 0
     else:
-        raise ValueError, "invalid truth value %r" % (val,)
+        raise ValueError("invalid truth value %r" % (val,))
 
 
 def byte_compile (py_files,
@@ -502,8 +499,7 @@ def byte_compile (py_files,
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:
-                    raise ValueError, \
-                          ("invalid prefix: filename %r doesn't start with %r"
+                    raise ValueError("invalid prefix: filename %r doesn't start with %r"
                            % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
diff --git a/version.py b/version.py
index 96b6552197..f71b2f6ce3 100644
--- a/version.py
+++ b/version.py
@@ -140,7 +140,7 @@ class StrictVersion (Version):
     def parse (self, vstring):
         match = self.version_re.match(vstring)
         if not match:
-            raise ValueError, "invalid version number '%s'" % vstring
+            raise ValueError("invalid version number '%s'" % vstring)
 
         (major, minor, patch, prerelease, prerelease_num) = \
             match.group(1, 2, 4, 5, 6)

From bf9ae3584f023df6f04f88e17cfe987e004de033 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 30 Aug 2007 05:35:41 +0000
Subject: [PATCH 1902/8469] Stop using the find function on the string module,
 use the string method. This will hopefully fix the problem on a Windows
 buildbot with test_sundry.

---
 util.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/util.py b/util.py
index 22a8ba23e8..e0ae2e5ea2 100644
--- a/util.py
+++ b/util.py
@@ -39,14 +39,14 @@ def get_platform ():
     if os.name == 'nt':
         # sniff sys.version for architecture.
         prefix = " bit ("
-        i = string.find(sys.version, prefix)
+        i = sys.version.find(prefix)
         if i == -1:
             return sys.platform
-        j = string.find(sys.version, ")", i)
+        j = sys.version.find(")", i)
         look = sys.version[i+len(prefix):j].lower()
-        if look=='amd64':
+        if look == 'amd64':
             return 'win-x86_64'
-        if look=='itanium':
+        if look == 'itanium':
             return 'win-ia64'
         return sys.platform
 

From b7375849d526bedd70683539901013baaf9edcea Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Thu, 30 Aug 2007 18:46:25 +0000
Subject: [PATCH 1903/8469] Fix a typo in the distutils cleanup.

---
 msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index f5b67049ef..d239057bac 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -442,7 +442,7 @@ def create_static_lib(self,
             if debug:
                 pass # XXX what goes here?
             try:
-                self.([self.lib] + lib_args)
+                self.spawn([self.lib] + lib_args)
             except DistutilsExecError as msg:
                 raise LibError(msg)
         else:

From 70ba60503c5d76dd223ae450b64f757ade0b9b2c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 31 Aug 2007 10:37:15 +0000
Subject: [PATCH 1904/8469] string.maketrans() now produces translation tables
 for bytes.translate() -- wrong module? Fix all remaining instances that did
 bad things with the new str.translate().

---
 command/install.py | 5 ++---
 fancy_getopt.py    | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/command/install.py b/command/install.py
index 29cda1ebb7..ffd68db269 100644
--- a/command/install.py
+++ b/command/install.py
@@ -348,11 +348,10 @@ def dump_dirs(self, msg):
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
                 if self.negative_opt.has_key(opt_name):
-                    opt_name = self.negative_opt[opt_name].translate(
-                                                               longopt_xlate)
+                    opt_name = longopt_xlate(self.negative_opt[opt_name])
                     val = not getattr(self, opt_name)
                 else:
-                    opt_name = opt_name.translate(longopt_xlate)
+                    opt_name = longopt_xlate(opt_name)
                     val = getattr(self, opt_name)
                 print("  %s: %s" % (opt_name, val))
 
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 5434334e79..15cbdd7162 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -26,7 +26,7 @@
 
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
-longopt_xlate = string.maketrans('-', '_')
+longopt_xlate = lambda s: s.replace('-', '_')
 
 class FancyGetopt:
     """Wrapper around the standard 'getopt()' module that provides some
@@ -107,7 +107,7 @@ def get_attr_name(self, long_option):
         """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
-        return long_option.translate(longopt_xlate)
+        return longopt_xlate(long_option)
 
     def _check_alias_dict(self, aliases, what):
         assert isinstance(aliases, dict)
@@ -372,7 +372,7 @@ def fancy_getopt(options, negative_opt, object, args):
     return parser.getopt(args, object)
 
 
-WS_TRANS = string.maketrans(string.whitespace, ' ' * len(string.whitespace))
+WS_TRANS = {ord(_wschar) : ' ' for _wschar in string.whitespace}
 
 def wrap_text(text, width):
     """wrap_text(text : string, width : int) -> [string]
@@ -432,7 +432,7 @@ def translate_longopt(opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
-    return opt.translate(longopt_xlate)
+    return longopt_xlate(opt)
 
 
 class OptionDummy:

From d597eb5b512b06572e8d5857ed0846c9f431cc6d Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Sat, 1 Sep 2007 20:37:22 +0000
Subject: [PATCH 1905/8469] Run 2to3's fix_has_key over distutils.

---
 command/install.py  | 2 +-
 command/register.py | 4 ++--
 command/upload.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index ffd68db269..f1ebcbf052 100644
--- a/command/install.py
+++ b/command/install.py
@@ -347,7 +347,7 @@ def dump_dirs(self, msg):
                 opt_name = opt[0]
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
-                if self.negative_opt.has_key(opt_name):
+                if opt_name in self.negative_opt:
                     opt_name = longopt_xlate(self.negative_opt[opt_name])
                     val = not getattr(self, opt_name)
                 else:
diff --git a/command/register.py b/command/register.py
index 91081ddb1b..d123d327de 100644
--- a/command/register.py
+++ b/command/register.py
@@ -125,7 +125,7 @@ def send_metadata(self):
         # see if we can short-cut and get the username/password from the
         # config
         config = None
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 print('Using PyPI login from %s'%rc)
@@ -168,7 +168,7 @@ def send_metadata(self):
             print('Server response (%s): %s'%(code, result))
 
             # possibly save the login
-            if os.environ.has_key('HOME') and config is None and code == 200:
+            if 'HOME' in os.environ and config is None and code == 200:
                 rc = os.path.join(os.environ['HOME'], '.pypirc')
                 print('I can store your PyPI login so future submissions will be faster.')
                 print('(the login will be stored in %s)'%rc)
diff --git a/command/upload.py b/command/upload.py
index b49acd123a..34b6692d04 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -45,7 +45,7 @@ def finalize_options(self):
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 self.announce('Using PyPI login from %s' % rc)

From 69af9b586f1c9446c371b23a1c5d6e6a745f848e Mon Sep 17 00:00:00 2001
From: Skip Montanaro <skip@pobox.com>
Date: Sat, 8 Sep 2007 00:34:17 +0000
Subject: [PATCH 1906/8469] be explicit about the actual location of the
 missing file

---
 dep_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dep_util.py b/dep_util.py
index c139c852e4..2c6d7927f0 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -19,7 +19,8 @@ def newer (source, target):
     Raise DistutilsFileError if 'source' does not exist.
     """
     if not os.path.exists(source):
-        raise DistutilsFileError, "file '%s' does not exist" % source
+        raise DistutilsFileError, ("file '%s' does not exist" %
+                                   os.path.abspath(source))
     if not os.path.exists(target):
         return 1
 

From be6286d3fa93348073baeaa554fe14dea328e7ce Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Sat, 8 Sep 2007 17:39:28 +0000
Subject: [PATCH 1907/8469] Merged revisions 57778-58052 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r57820 | georg.brandl | 2007-08-31 08:59:27 +0200 (Fri, 31 Aug 2007) | 2 lines

  Document new shorthand notation for index entries.
........
  r57827 | georg.brandl | 2007-08-31 10:47:51 +0200 (Fri, 31 Aug 2007) | 2 lines

  Fix subitem markup.
........
  r57833 | martin.v.loewis | 2007-08-31 12:01:07 +0200 (Fri, 31 Aug 2007) | 1 line

  Mark registry components as 64-bit on Win64.
........
  r57854 | bill.janssen | 2007-08-31 21:02:23 +0200 (Fri, 31 Aug 2007) | 1 line

  deprecate use of FakeSocket
........
  r57855 | bill.janssen | 2007-08-31 21:02:46 +0200 (Fri, 31 Aug 2007) | 1 line

  remove mentions of socket.ssl in comments
........
  r57856 | bill.janssen | 2007-08-31 21:03:31 +0200 (Fri, 31 Aug 2007) | 1 line

  remove use of non-existent SSLFakeSocket in apparently untested code
........
  r57859 | martin.v.loewis | 2007-09-01 08:36:03 +0200 (Sat, 01 Sep 2007) | 3 lines

  Bug #1737210: Change Manufacturer of Windows installer to PSF.
  Will backport to 2.5.
........
  r57865 | georg.brandl | 2007-09-01 09:51:24 +0200 (Sat, 01 Sep 2007) | 2 lines

  Fix RST link (backport from Py3k).
........
  r57876 | georg.brandl | 2007-09-01 17:49:49 +0200 (Sat, 01 Sep 2007) | 2 lines

  Document sets' ">" and "<" operations (backport from py3k).
........
  r57878 | skip.montanaro | 2007-09-01 19:40:03 +0200 (Sat, 01 Sep 2007) | 4 lines

  Added a note and examples to explain that re.split does not split on an
  empty pattern match. (issue 852532).
........
  r57879 | walter.doerwald | 2007-09-01 20:18:09 +0200 (Sat, 01 Sep 2007) | 2 lines

  Fix wrong function names.
........
  r57880 | walter.doerwald | 2007-09-01 20:34:05 +0200 (Sat, 01 Sep 2007) | 2 lines

  Fix typo.
........
  r57889 | andrew.kuchling | 2007-09-01 22:31:59 +0200 (Sat, 01 Sep 2007) | 1 line

  Markup fix
........
  r57892 | andrew.kuchling | 2007-09-01 22:43:36 +0200 (Sat, 01 Sep 2007) | 1 line

  Add various items
........
  r57895 | andrew.kuchling | 2007-09-01 23:17:58 +0200 (Sat, 01 Sep 2007) | 1 line

  Wording change
........
  r57896 | andrew.kuchling | 2007-09-01 23:18:31 +0200 (Sat, 01 Sep 2007) | 1 line

  Add more items
........
  r57904 | ronald.oussoren | 2007-09-02 11:46:07 +0200 (Sun, 02 Sep 2007) | 3 lines

  Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used
  by the Makefile is also used at configure-time.
........
  r57925 | georg.brandl | 2007-09-03 09:16:46 +0200 (Mon, 03 Sep 2007) | 2 lines

  Fix #883466: don't allow Unicode as arguments to quopri and uu codecs.
........
  r57936 | matthias.klose | 2007-09-04 01:33:04 +0200 (Tue, 04 Sep 2007) | 2 lines

  - Added support for linking the bsddb module against BerkeleyDB 4.6.x.
........
  r57954 | mark.summerfield | 2007-09-04 10:16:15 +0200 (Tue, 04 Sep 2007) | 3 lines

  Added cross-references plus a note about dict & list shallow copying.
........
  r57958 | martin.v.loewis | 2007-09-04 11:51:57 +0200 (Tue, 04 Sep 2007) | 3 lines

  Document that we rely on the OS to release the crypto
  context. Fixes #1626801.
........
  r57960 | martin.v.loewis | 2007-09-04 15:13:14 +0200 (Tue, 04 Sep 2007) | 3 lines

  Patch #1388440: Add set_completion_display_matches_hook and
  get_completion_type to readline.
........
  r57961 | martin.v.loewis | 2007-09-04 16:19:28 +0200 (Tue, 04 Sep 2007) | 3 lines

  Patch #1031213: Decode source line in SyntaxErrors back to its original
  source encoding. Will backport to 2.5.
........
  r57972 | matthias.klose | 2007-09-04 20:17:36 +0200 (Tue, 04 Sep 2007) | 3 lines

  - Makefile.pre.in(buildbottest): Run an optional script pybuildbot.identify
    to include some information about the build environment.
........
  r57973 | matthias.klose | 2007-09-04 21:05:38 +0200 (Tue, 04 Sep 2007) | 2 lines

  - Makefile.pre.in(buildbottest): Remove whitespace at eol.
........
  r57975 | matthias.klose | 2007-09-04 22:46:02 +0200 (Tue, 04 Sep 2007) | 2 lines

  - Fix libffi configure for hppa*-*-linux* | parisc*-*-linux*.
........
  r57980 | bill.janssen | 2007-09-05 02:46:27 +0200 (Wed, 05 Sep 2007) | 1 line

  SSL certificate distinguished names should be represented by tuples
........
  r57985 | martin.v.loewis | 2007-09-05 08:39:17 +0200 (Wed, 05 Sep 2007) | 3 lines

  Patch #1105: Explain that one needs to build the solution
  to get dependencies right.
........
  r57987 | armin.rigo | 2007-09-05 09:51:21 +0200 (Wed, 05 Sep 2007) | 4 lines

  PyDict_GetItem() returns a borrowed reference.
  There are probably a number of places that are open to attacks
  such as the following one, in bltinmodule.c:min_max().
........
  r57991 | martin.v.loewis | 2007-09-05 13:47:34 +0200 (Wed, 05 Sep 2007) | 3 lines

  Patch #786737: Allow building in a tree of symlinks pointing to
  a readonly source.
........
  r57993 | georg.brandl | 2007-09-05 15:36:44 +0200 (Wed, 05 Sep 2007) | 2 lines

  Backport from Py3k: Bug #1684991: explain lookup semantics for __special__ methods (new-style classes only).
........
  r58004 | armin.rigo | 2007-09-06 10:30:51 +0200 (Thu, 06 Sep 2007) | 4 lines

  Patch #1733973 by peaker:
  ptrace_enter_call() assumes no exception is currently set.
  This assumption is broken when throwing into a generator.
........
  r58006 | armin.rigo | 2007-09-06 11:30:38 +0200 (Thu, 06 Sep 2007) | 4 lines

  PyDict_GetItem() returns a borrowed reference.
  This attack is against ceval.c:IMPORT_NAME, which calls an
  object (__builtin__.__import__) without holding a reference to it.
........
  r58013 | georg.brandl | 2007-09-06 16:49:56 +0200 (Thu, 06 Sep 2007) | 2 lines

  Backport from 3k: #1116: fix reference to old filename.
........
  r58021 | thomas.heller | 2007-09-06 22:26:20 +0200 (Thu, 06 Sep 2007) | 1 line

  Fix typo:  c_float represents to C float type.
........
  r58022 | skip.montanaro | 2007-09-07 00:29:06 +0200 (Fri, 07 Sep 2007) | 3 lines

  If this is correct for py3k branch and it's already in the release25-maint
  branch, seems like it ought to be on the trunk as well.
........
  r58023 | gregory.p.smith | 2007-09-07 00:59:59 +0200 (Fri, 07 Sep 2007) | 4 lines

  Apply the fix from Issue1112 to make this test more robust and keep
  windows happy.
........
  r58031 | brett.cannon | 2007-09-07 05:17:50 +0200 (Fri, 07 Sep 2007) | 4 lines

  Make uuid1 and uuid4 tests conditional on whether ctypes can be imported;
  implementation of either function depends on ctypes but uuid as a whole does
  not.
........
  r58032 | brett.cannon | 2007-09-07 06:18:30 +0200 (Fri, 07 Sep 2007) | 6 lines

  Fix a crasher where Python code managed to infinitely recurse in C code without
  ever going back out to Python code in PyObject_Call().  Required introducing a
  static RuntimeError instance so that normalizing an exception there is no
  reliance on a recursive call that would put the exception system over the
  recursion check itself.
........
  r58034 | thomas.heller | 2007-09-07 08:32:17 +0200 (Fri, 07 Sep 2007) | 1 line

  Add a 'c_longdouble' type to the ctypes module.
........
  r58035 | thomas.heller | 2007-09-07 11:30:40 +0200 (Fri, 07 Sep 2007) | 1 line

  Remove unneeded #include.
........
  r58036 | thomas.heller | 2007-09-07 11:33:24 +0200 (Fri, 07 Sep 2007) | 6 lines

  Backport from py3k branch:

  Add a workaround for a strange bug on win64, when _ctypes is compiled
  with the SDK compiler.  This should fix the failing
  Lib\ctypes\test\test_as_parameter.py test.
........
  r58037 | georg.brandl | 2007-09-07 16:14:40 +0200 (Fri, 07 Sep 2007) | 2 lines

  Fix a wrong indentation for sublists.
........
  r58043 | georg.brandl | 2007-09-07 22:10:49 +0200 (Fri, 07 Sep 2007) | 2 lines

  #1095: ln -f doesn't work portably, fix in Makefile.
........
  r58049 | skip.montanaro | 2007-09-08 02:34:17 +0200 (Sat, 08 Sep 2007) | 1 line

  be explicit about the actual location of the missing file
........
---
 dep_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dep_util.py b/dep_util.py
index a9d589a256..07b3549c6f 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -17,7 +17,8 @@ def newer (source, target):
     Raise DistutilsFileError if 'source' does not exist.
     """
     if not os.path.exists(source):
-        raise DistutilsFileError("file '%s' does not exist" % source)
+        raise DistutilsFileError("file '%s' does not exist" %
+                                 os.path.abspath(source))
     if not os.path.exists(target):
         return 1
 

From a68bb215508d8be88a6391cc760e2a203e1b526b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 12 Sep 2007 19:29:28 +0000
Subject: [PATCH 1908/8469] #1120: put explicit version in the shebang lines of
 pydoc, idle and smtpd.py scripts that are installed by setup.py. That way,
 they work when only "make altinstall" is used.

---
 command/build_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index bda4480ca5..b4810c3eac 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -104,7 +104,8 @@ def copy_scripts (self):
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
-                            "python" + sysconfig.get_config_var("EXE")),
+                            "python" + sysconfig.get_config_var("VERSION")
+                                     + sysconfig.get_config_var("EXE")),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()

From 02aa5e870e7910a62c992c30eaced5ef448d43fa Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Wed, 19 Sep 2007 03:06:30 +0000
Subject: [PATCH 1909/8469] Merged revisions
 58095-58132,58136-58148,58151-58197 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r58096 | brett.cannon | 2007-09-10 23:38:27 +0200 (Mon, 10 Sep 2007) | 4 lines

  Fix a possible segfault from recursing too deep to get the repr of a list.

  Closes issue #1096.
........
  r58097 | bill.janssen | 2007-09-10 23:51:02 +0200 (Mon, 10 Sep 2007) | 33 lines

  More work on SSL support.

  * Much expanded test suite:

    All protocols tested against all other protocols.
    All protocols tested with all certificate options.
    Tests for bad key and bad cert.
    Test of STARTTLS functionality.
    Test of RAND_* functions.

  * Fixes for threading/malloc bug.

  * Issue 1065 fixed:

    sslsocket class renamed to SSLSocket.
    sslerror class renamed to SSLError.
    Function "wrap_socket" now used to wrap an existing socket.

  * Issue 1583946 finally fixed:

    Support for subjectAltName added.
    Subject name now returned as proper DN list of RDNs.

  * SSLError exported from socket as "sslerror".

  * RAND_* functions properly exported from ssl.py.

  * Documentation improved:

    Example of how to create a self-signed certificate.
    Better indexing.
........
  r58098 | guido.van.rossum | 2007-09-11 00:02:25 +0200 (Tue, 11 Sep 2007) | 9 lines

  Patch # 1140 (my code, approved by Effbot).

  Make sure the type of the return value of re.sub(x, y, z) is the type
  of y+x (i.e. unicode if either is unicode, str if they are both str)
  even if there are no substitutions or if x==z (which triggered various
  special cases in join_list()).

  Could be backported to 2.5; no need to port to 3.0.
........
  r58099 | guido.van.rossum | 2007-09-11 00:36:02 +0200 (Tue, 11 Sep 2007) | 8 lines

  Patch # 1026 by Benjamin Aranguren (with Alex Martelli):
  Backport abc.py and isinstance/issubclass overloading to 2.6.

  I had to backport test_typechecks.py myself, and make one small change
  to abc.py to avoid duplicate work when x.__class__ and type(x) are the
  same.
........
  r58100 | bill.janssen | 2007-09-11 01:41:24 +0200 (Tue, 11 Sep 2007) | 3 lines

  A better way of finding an open port to test with.
........
  r58101 | bill.janssen | 2007-09-11 03:09:19 +0200 (Tue, 11 Sep 2007) | 4 lines

  Make sure test_ssl doesn't reference the ssl module in a
  context where it can't be imported.
........
  r58102 | bill.janssen | 2007-09-11 04:42:07 +0200 (Tue, 11 Sep 2007) | 3 lines

  Fix some documentation bugs.
........
  r58103 | nick.coghlan | 2007-09-11 16:01:18 +0200 (Tue, 11 Sep 2007) | 1 line

  Always use the -E flag when spawning subprocesses in test_cmd_line (Issue 1056)
........
  r58106 | thomas.heller | 2007-09-11 21:17:48 +0200 (Tue, 11 Sep 2007) | 3 lines

  Disable some tests that fail on the 'ppc Debian unstable' buildbot to
  find out if they cause the segfault on the 'alpha Debian' machine.
........
  r58108 | brett.cannon | 2007-09-11 23:02:28 +0200 (Tue, 11 Sep 2007) | 6 lines

  Generators had their throw() method allowing string exceptions.  That's a
  no-no.

  Fixes issue #1147.  Need to fix 2.5 to raise a proper warning if a string
  exception is passed in.
........
  r58112 | georg.brandl | 2007-09-12 20:03:51 +0200 (Wed, 12 Sep 2007) | 3 lines

  New documentation page for the bdb module.
  (This doesn't need to be merged to Py3k.)
........
  r58114 | georg.brandl | 2007-09-12 20:05:57 +0200 (Wed, 12 Sep 2007) | 2 lines

  Bug #1152: use non-deprecated name in example.
........
  r58115 | georg.brandl | 2007-09-12 20:08:33 +0200 (Wed, 12 Sep 2007) | 2 lines

  Fix #1122: wrong return type documented for various _Size() functions.
........
  r58117 | georg.brandl | 2007-09-12 20:10:56 +0200 (Wed, 12 Sep 2007) | 2 lines

  Fix #1139: PyFile_Encoding really is PyFile_SetEncoding.
........
  r58119 | georg.brandl | 2007-09-12 20:29:18 +0200 (Wed, 12 Sep 2007) | 2 lines

  bug #1154: release memory allocated by "es" PyArg_ParseTuple format specifier.
........
  r58121 | bill.janssen | 2007-09-12 20:52:05 +0200 (Wed, 12 Sep 2007) | 1 line

  root certificate for https://svn.python.org/, used in test_ssl
........
  r58122 | georg.brandl | 2007-09-12 21:00:07 +0200 (Wed, 12 Sep 2007) | 3 lines

  Bug #1153: repr.repr() now doesn't require set and dictionary items
  to be orderable to properly represent them.
........
  r58125 | georg.brandl | 2007-09-12 21:29:28 +0200 (Wed, 12 Sep 2007) | 4 lines

  #1120: put explicit version in the shebang lines of pydoc, idle
  and smtpd.py scripts that are installed by setup.py. That way, they
  work when only "make altinstall" is used.
........
  r58139 | mark.summerfield | 2007-09-13 16:54:30 +0200 (Thu, 13 Sep 2007) | 9 lines

  Replaced variable o with obj in operator.rst because o is easy to
  confuse.

  Added a note about Python 3's collections.Mapping etc., above section
  that describes isMappingType() etc.

  Added xrefs between os, os.path, fileinput, and open().
........
  r58143 | facundo.batista | 2007-09-13 20:13:15 +0200 (Thu, 13 Sep 2007) | 7 lines


  Merged the decimal-branch (revisions 54886 to 58140). Decimal is now
  fully updated to the latests Decimal Specification (v1.66) and the
  latests test cases (v2.56).

  Thanks to Mark Dickinson for all his help during this process.
........
  r58145 | facundo.batista | 2007-09-13 20:42:09 +0200 (Thu, 13 Sep 2007) | 7 lines


  Put the parameter watchexp back in (changed watchexp from an int
  to a bool).  Also second argument to watchexp is now converted
  to Decimal, just as with all the other two-argument operations.

  Thanks Mark Dickinson.
........
  r58147 | andrew.kuchling | 2007-09-14 00:49:34 +0200 (Fri, 14 Sep 2007) | 1 line

  Add various items
........
  r58148 | andrew.kuchling | 2007-09-14 00:50:10 +0200 (Fri, 14 Sep 2007) | 1 line

  Make target unique
........
  r58154 | facundo.batista | 2007-09-14 20:58:34 +0200 (Fri, 14 Sep 2007) | 3 lines


  Included the new functions, and new descriptions.
........
  r58155 | thomas.heller | 2007-09-14 21:40:35 +0200 (Fri, 14 Sep 2007) | 2 lines

  ctypes.util.find_library uses dump(1) instead of objdump(1) on Solaris.
  Fixes issue #1777530; will backport to release25-maint.
........
  r58159 | facundo.batista | 2007-09-14 23:29:52 +0200 (Fri, 14 Sep 2007) | 3 lines


  Some additions (examples and a bit on the tutorial).
........
  r58160 | georg.brandl | 2007-09-15 18:53:36 +0200 (Sat, 15 Sep 2007) | 2 lines

  Remove bdb from the "undocumented modules" list.
........
  r58164 | bill.janssen | 2007-09-17 00:06:00 +0200 (Mon, 17 Sep 2007) | 15 lines

  Add support for asyncore server-side SSL support.  This requires
  adding the 'makefile' method to ssl.SSLSocket, and importing the
  requisite fakefile class from socket.py, and making the appropriate
  changes to it to make it use the SSL connection.

  Added sample HTTPS server to test_ssl.py, and test that uses it.

  Change SSL tests to use https://svn.python.org/, instead of
  www.sf.net and pop.gmail.com.

  Added utility function to ssl module, get_server_certificate,
  to wrap up the several things to be done to pull a certificate
  from a remote server.
........
  r58173 | bill.janssen | 2007-09-17 01:16:46 +0200 (Mon, 17 Sep 2007) | 1 line

  use binary mode when reading files for testAsyncore to make Windows happy
........
  r58175 | raymond.hettinger | 2007-09-17 02:55:00 +0200 (Mon, 17 Sep 2007) | 7 lines

  Sync-up named tuples with the latest version of the ASPN recipe.
  Allows optional commas in the field-name spec (help when named tuples are used in conjuction with sql queries).
  Adds the __fields__ attribute for introspection and to support conversion to dictionary form.
  Adds a  __replace__() method similar to str.replace() but using a named field as a target.
  Clean-up spelling and presentation in doc-strings.
........
  r58176 | brett.cannon | 2007-09-17 05:28:34 +0200 (Mon, 17 Sep 2007) | 5 lines

  Add a bunch of GIL release/acquire points in tp_print implementations and for
  PyObject_Print().

  Closes issue #1164.
........
  r58177 | sean.reifschneider | 2007-09-17 07:45:04 +0200 (Mon, 17 Sep 2007) | 2 lines

  issue1597011: Fix for bz2 module corner-case error due to error checking bug.
........
  r58180 | facundo.batista | 2007-09-17 18:26:50 +0200 (Mon, 17 Sep 2007) | 3 lines


  Decimal is updated, :)
........
  r58181 | facundo.batista | 2007-09-17 19:30:13 +0200 (Mon, 17 Sep 2007) | 5 lines


  The methods always return Decimal classes, even if they're
  executed through a subclass (thanks Mark Dickinson).
  Added a bit of testing for this.
........
  r58183 | sean.reifschneider | 2007-09-17 22:53:21 +0200 (Mon, 17 Sep 2007) | 2 lines

  issue1082: Fixing platform and system for Vista.
........
  r58185 | andrew.kuchling | 2007-09-18 03:36:16 +0200 (Tue, 18 Sep 2007) | 1 line

  Add item; sort properly
........
  r58186 | raymond.hettinger | 2007-09-18 05:33:19 +0200 (Tue, 18 Sep 2007) | 1 line

  Handle corner cased on 0-tuples and 1-tuples.  Add verbose option so people can see how it works.
........
  r58192 | georg.brandl | 2007-09-18 09:24:40 +0200 (Tue, 18 Sep 2007) | 2 lines

  A bit of reordering, also show more subheadings in the lang ref index.
........
  r58193 | facundo.batista | 2007-09-18 18:53:18 +0200 (Tue, 18 Sep 2007) | 4 lines


  Speed up of the various division operations (remainder, divide,
  divideint and divmod). Thanks Mark Dickinson.
........
  r58197 | raymond.hettinger | 2007-09-19 00:18:02 +0200 (Wed, 19 Sep 2007) | 1 line

  Cleanup docs for NamedTuple.
........
---
 command/build_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 176e6e1073..227bb9c7a1 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -102,7 +102,8 @@ def copy_scripts(self):
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
-                            "python" + sysconfig.get_config_var("EXE")),
+                            "python" + sysconfig.get_config_var("VERSION")
+                                     + sysconfig.get_config_var("EXE")),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()

From 4cb4040d3e7687c6e5ec99a6a52217ca9091db9a Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 25 Sep 2007 21:48:09 +0000
Subject: [PATCH 1910/8469] Fix a straggler filter() call.

---
 fancy_getopt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fancy_getopt.py b/fancy_getopt.py
index 15cbdd7162..b3231c3de7 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -388,7 +388,7 @@ def wrap_text(text, width):
     text = text.expandtabs()
     text = text.translate(WS_TRANS)
     chunks = re.split(r'( +|-+)', text)
-    chunks = filter(None, chunks)      # ' - ' results in empty strings
+    chunks = [ch for ch in chunks if ch] # ' - ' results in empty strings
     lines = []
 
     while chunks:

From 27cd6610b468d4cc03dea2c22d74aa3c281d3a66 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 15 Oct 2007 01:27:53 +0000
Subject: [PATCH 1911/8469] Fix yet another stray 2.x-ism (maybe merged?).

---
 dist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 974ee5163b..631df48cd0 100644
--- a/dist.py
+++ b/dist.py
@@ -280,8 +280,7 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
         from pprint import pformat
 
         if commands is None:             # dump all command option dicts
-            commands = self.command_options.keys()
-            commands.sort()
+            commands = sorted(self.command_options.keys())
 
         if header is not None:
             print(indent + header)

From d593487053de01cd756914a5cb5cc6b058c99c03 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 16 Oct 2007 18:12:55 +0000
Subject: [PATCH 1912/8469] Patch# 1258 by Christian Heimes: kill basestring. I
 like this because it makes the code shorter! :-)

---
 ccompiler.py            | 12 ++++++------
 cmd.py                  |  8 ++++----
 command/build_clib.py   |  4 ++--
 command/build_ext.py    | 10 +++++-----
 command/build_py.py     |  2 +-
 command/config.py       |  8 ++++----
 command/install.py      |  2 +-
 command/install_data.py |  2 +-
 dir_util.py             |  2 +-
 dist.py                 |  6 +++---
 extension.py            |  4 ++--
 fancy_getopt.py         |  4 ++--
 filelist.py             |  2 +-
 unixccompiler.py        |  2 +-
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index c33e5ab440..f4edb7c6a6 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -154,7 +154,7 @@ class (via the 'executables' class attribute), but most will have:
             self.set_executable(key, value)
 
     def set_executable(self, key, value):
-        if isinstance(value, basestring):
+        if isinstance(value, str):
             setattr(self, key, split_quoted(value))
         else:
             setattr(self, key, value)
@@ -175,8 +175,8 @@ def _check_macro_definitions(self, definitions):
         for defn in definitions:
             if not (isinstance(defn, tuple) and
                     (len(defn) in (1, 2) and
-                      (isinstance (defn[1], basestring) or defn[1] is None)) and
-                    isinstance (defn[0], basestring)):
+                      (isinstance (defn[1], str) or defn[1] is None)) and
+                    isinstance (defn[0], str)):
                 raise TypeError(("invalid macro definition '%s': " % defn) + \
                       "must be tuple (string,), (string, string), or " + \
                       "(string, None)")
@@ -318,7 +318,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
         """
         if outdir is None:
             outdir = self.output_dir
-        elif not isinstance(outdir, basestring):
+        elif not isinstance(outdir, str):
             raise TypeError("'output_dir' must be a string or None")
 
         if macros is None:
@@ -415,7 +415,7 @@ def _fix_compile_args(self, output_dir, macros, include_dirs):
         """
         if output_dir is None:
             output_dir = self.output_dir
-        elif not isinstance(output_dir, basestring):
+        elif not isinstance(output_dir, str):
             raise TypeError("'output_dir' must be a string or None")
 
         if macros is None:
@@ -494,7 +494,7 @@ def _fix_object_args(self, objects, output_dir):
 
         if output_dir is None:
             output_dir = self.output_dir
-        elif not isinstance(output_dir, basestring):
+        elif not isinstance(output_dir, str):
             raise TypeError("'output_dir' must be a string or None")
 
         return (objects, output_dir)
diff --git a/cmd.py b/cmd.py
index 66940f7799..bd560a661c 100644
--- a/cmd.py
+++ b/cmd.py
@@ -213,7 +213,7 @@ def _ensure_stringlike(self, option, what, default=None):
         if val is None:
             setattr(self, option, default)
             return default
-        elif not isinstance(val, basestring):
+        elif not isinstance(val, str):
             raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
                                        % (option, what, val))
         return val
@@ -233,11 +233,11 @@ def ensure_string_list(self, option):
         val = getattr(self, option)
         if val is None:
             return
-        elif isinstance(val, basestring):
+        elif isinstance(val, str):
             setattr(self, option, re.split(r',\s*|\s+', val))
         else:
             if isinstance(val, list):
-                ok = all(isinstance(v, basestring) for v in val)
+                ok = all(isinstance(v, str) for v in val)
             else:
                 ok = False
             if not ok:
@@ -390,7 +390,7 @@ def make_file(self, infiles, outfile, func, args,
 
 
         # Allow 'infiles' to be a single string
-        if isinstance(infiles, basestring):
+        if isinstance(infiles, str):
             infiles = (infiles,)
         elif not isinstance(infiles, (list, tuple)):
             raise TypeError(
diff --git a/command/build_clib.py b/command/build_clib.py
index 5f95207ca9..34f4983689 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -86,7 +86,7 @@ def finalize_options(self):
 
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if isinstance(self.include_dirs, basestring):
+        if isinstance(self.include_dirs, str):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # XXX same as for build_ext -- what about 'self.define' and
@@ -134,7 +134,7 @@ def check_library_list(self, libraries):
                 raise DistutilsSetupError(
                       "each element of 'libraries' must a 2-tuple")
 
-            if isinstance(lib[0], basestring):
+            if isinstance(lib[0], str):
                 raise DistutilsSetupError(
                       "first element of each tuple in 'libraries' "
                       "must be a string (the library name)")
diff --git a/command/build_ext.py b/command/build_ext.py
index a439c49ac6..ddf8f723f8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -133,7 +133,7 @@ def finalize_options(self):
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if isinstance(self.include_dirs, basestring):
+        if isinstance(self.include_dirs, str):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
@@ -142,7 +142,7 @@ def finalize_options(self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if isinstance(self.libraries, basestring):
+        if isinstance(self.libraries, str):
             self.libraries = [self.libraries]
 
         # Life is easier if we're not forever checking for None, so
@@ -151,12 +151,12 @@ def finalize_options(self):
             self.libraries = []
         if self.library_dirs is None:
             self.library_dirs = []
-        elif isinstance(self.library_dirs, basestring):
+        elif isinstance(self.library_dirs, str):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
         if self.rpath is None:
             self.rpath = []
-        elif isinstance(self.rpath, basestring):
+        elif isinstance(self.rpath, str):
             self.rpath = self.rpath.split(os.pathsep)
 
         # for extensions under windows use different directories
@@ -309,7 +309,7 @@ def check_extensions_list(self, extensions):
                        "each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
-            if not (isinstance(ext_name, basestring) and
+            if not (isinstance(ext_name, str) and
                     extension_name_re.match(ext_name)):
                 raise DistutilsSetupError(
                        "first element of each tuple in 'ext_modules' "
diff --git a/command/build_py.py b/command/build_py.py
index 454424f333..63ced4b470 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -325,7 +325,7 @@ def get_outputs(self, include_bytecode=1):
         return outputs
 
     def build_module(self, module, module_file, package):
-        if isinstance(package, basestring):
+        if isinstance(package, str):
             package = package.split('.')
         elif not isinstance(package, (list, tuple)):
             raise TypeError(
diff --git a/command/config.py b/command/config.py
index a601234218..34f91884d8 100644
--- a/command/config.py
+++ b/command/config.py
@@ -69,17 +69,17 @@ def initialize_options(self):
     def finalize_options(self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        elif isinstance(self.include_dirs, basestring):
+        elif isinstance(self.include_dirs, str):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
         if self.libraries is None:
             self.libraries = []
-        elif isinstance(self.libraries, basestring):
+        elif isinstance(self.libraries, str):
             self.libraries = [self.libraries]
 
         if self.library_dirs is None:
             self.library_dirs = []
-        elif isinstance(self.library_dirs, basestring):
+        elif isinstance(self.library_dirs, str):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
     def run(self):
@@ -204,7 +204,7 @@ def search_cpp(self, pattern, body=None, headers=None,
         self._check_compiler()
         (src, out) = self._preprocess(body, headers, include_dirs, lang)
 
-        if isinstance(pattern, basestring):
+        if isinstance(pattern, str):
             pattern = re.compile(pattern)
 
         file = open(out)
diff --git a/command/install.py b/command/install.py
index f1ebcbf052..b768663c69 100644
--- a/command/install.py
+++ b/command/install.py
@@ -449,7 +449,7 @@ def handle_extra_path(self):
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
-            if isinstance(self.extra_path, basestring):
+            if isinstance(self.extra_path, str):
                 self.extra_path = self.extra_path.split(',')
 
             if len(self.extra_path) == 1:
diff --git a/command/install_data.py b/command/install_data.py
index 2fbac63de0..06a70b4ad4 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -45,7 +45,7 @@ def finalize_options(self):
     def run(self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
-            if isinstance(f, basestring):
+            if isinstance(f, str):
                 # it's a simple file, so copy it
                 f = convert_path(f)
                 if self.warn_dir:
diff --git a/dir_util.py b/dir_util.py
index 30e352db42..1f0d49c25f 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -28,7 +28,7 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
     global _path_created
 
     # Detect a common bug -- name is None
-    if not isinstance(name, basestring):
+    if not isinstance(name, str):
         raise DistutilsInternalError(
               "mkpath: 'name' must be a string (got %r)" % (name,))
 
diff --git a/dist.py b/dist.py
index 631df48cd0..ade2ab795c 100644
--- a/dist.py
+++ b/dist.py
@@ -580,13 +580,13 @@ def finalize_options (self):
 
         keywords = self.metadata.keywords
         if keywords is not None:
-            if isinstance(keywords, basestring):
+            if isinstance(keywords, str):
                 keywordlist = keywords.split(',')
                 self.metadata.keywords = [x.strip() for x in keywordlist]
 
         platforms = self.metadata.platforms
         if platforms is not None:
-            if isinstance(platforms, basestring):
+            if isinstance(platforms, str):
                 platformlist = platforms.split(',')
                 self.metadata.platforms = [x.strip() for x in platformlist]
 
@@ -874,7 +874,7 @@ def _set_command_options (self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                is_string = isinstance(value, basestring)
+                is_string = isinstance(value, str)
                 if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
diff --git a/extension.py b/extension.py
index 7f5954e45c..b271816844 100644
--- a/extension.py
+++ b/extension.py
@@ -102,9 +102,9 @@ def __init__(self, name, sources,
                   language=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, basestring), "'name' must be a string"
+        assert isinstance(name, str), "'name' must be a string"
         assert (isinstance(sources, list) and
-                all(isinstance(v, basestring) for v in sources)), \
+                all(isinstance(v, str) for v in sources)), \
                 "'sources' must be a list of strings"
 
         self.name = name
diff --git a/fancy_getopt.py b/fancy_getopt.py
index b3231c3de7..72441fb43d 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -154,12 +154,12 @@ def _grok_option_table(self):
                 raise ValueError("invalid option tuple: %r" % (option,))
 
             # Type- and value-check the option names
-            if not isinstance(long, basestring) or len(long) < 2:
+            if not isinstance(long, str) or len(long) < 2:
                 raise DistutilsGetoptError(("invalid long option '%s': "
                        "must be a string of length >= 2") % long)
 
             if (not ((short is None) or
-                     (isinstance(short, basestring) and len(short) == 1))):
+                     (isinstance(short, str) and len(short) == 1))):
                 raise DistutilsGetoptError("invalid short option '%s': "
                        "must a single character or None" % short)
 
diff --git a/filelist.py b/filelist.py
index 8f801073d5..6506c30e6b 100644
--- a/filelist.py
+++ b/filelist.py
@@ -301,7 +301,7 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     or just returned as-is (assumes it's a regex object).
     """
     if is_regex:
-        if isinstance(pattern, basestring):
+        if isinstance(pattern, str):
             return re.compile(pattern)
         else:
             return pattern
diff --git a/unixccompiler.py b/unixccompiler.py
index 91d0dffd76..ee975e15fa 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -211,7 +211,7 @@ def link(self, target_desc, objects,
 
         lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
                                    libraries)
-        if not isinstance(output_dir, (basestring, type(None))):
+        if not isinstance(output_dir, (str, type(None))):
             raise TypeError("'output_dir' must be a string or None")
         if output_dir is not None:
             output_filename = os.path.join(output_dir, output_filename)

From 7fba7d60bbce7a9e20d887716e9b87b9496180f5 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 17 Nov 2007 11:46:54 +0000
Subject: [PATCH 1913/8469] The _winreg module returns bytes which must be
 decoded to unicode, not encoded.

---
 msvccompiler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msvccompiler.py b/msvccompiler.py
index d239057bac..6bf969f9d2 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -93,10 +93,10 @@ def read_values(base, key):
     return d
 
 def convert_mbcs(s):
-    enc = getattr(s, "encode", None)
-    if enc is not None:
+    dec = getattr(s, "decode", None)
+    if dec is not None:
         try:
-            s = enc("mbcs")
+            s = dec("mbcs")
         except UnicodeError:
             pass
     return s

From 200d0eac23788226d0326f42258ced7ebf2431b2 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 22 Nov 2007 10:14:26 +0000
Subject: [PATCH 1914/8469] A test that should test for osx >= 10.4.0 actually
 tested for os versions <= 10.4. The end result is that a universal ("fat")
 build will claim to be a single-architecture on on OSX 10.5 (Leopard).

This patch fixes this issue.
---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index cfcc6a951e..731ee988b5 100644
--- a/util.py
+++ b/util.py
@@ -106,7 +106,7 @@ def get_platform ():
             osname = "macosx"
 
 
-            if (release + '.') < '10.4.' and \
+            if (release + '.') >= '10.4.' and \
                     get_config_vars().get('UNIVERSALSDK', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4

From 83cd6eeec1a6e2141517e7944b38efb712536537 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 3 Dec 2007 13:47:29 +0000
Subject: [PATCH 1915/8469] Applied my patch #1455 with some extra fixes for VS
 2005 The new msvc9compiler module supports VS 2005 and VS 2008. I've also
 fixed build_ext to support PCbuild8 and PCbuild9 and backported my fix for
 xxmodule.c from py3k. The old code msvccompiler is still in place in case
 somebody likes to build an extension with VS 2003 or earlier. I've also
 updated the cygwin compiler module for VS 2005 and VS 2008. It works with VS
 2005 but I'm unable to test it with VS 2008. We have to wait for a new
 version of cygwin.

---
 command/build_ext.py |  14 +-
 cygwinccompiler.py   |  48 ++--
 msvc9compiler.py     | 658 +++++++++++++++++++++++++++++++++++++++++++
 msvccompiler.py      |   8 +
 4 files changed, 706 insertions(+), 22 deletions(-)
 create mode 100644 msvc9compiler.py

diff --git a/command/build_ext.py b/command/build_ext.py
index 12d4083743..ecfa177d76 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -17,6 +17,10 @@
 from distutils.extension import Extension
 from distutils import log
 
+if os.name == 'nt':
+    from distutils.msvccompiler import get_build_version
+    MSVC_VERSION = int(get_build_version())
+
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
 extension_name_re = re.compile \
@@ -176,7 +180,15 @@ def finalize_options (self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            if MSVC_VERSION == 9:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild9'))
+            elif MSVC_VERSION == 8:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild8', 'win32release'))
+            else:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 4fd23e6dc6..4ac11eb4b1 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -56,6 +56,29 @@
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
 
+def get_msvcr():
+    """Include the appropriate MSVC runtime library if Python was built
+    with MSVC 7.0 or later.
+    """
+    msc_pos = sys.version.find('MSC v.')
+    if msc_pos != -1:
+        msc_ver = sys.version[msc_pos+6:msc_pos+10]
+        if msc_ver == '1300':
+            # MSVC 7.0
+            return ['msvcr70']
+        elif msc_ver == '1310':
+            # MSVC 7.1
+            return ['msvcr71']
+        elif msc_ver == '1400':
+            # VS2005 / MSVC 8.0
+            return ['msvcr80']
+        elif msc_ver == '1500':
+            # VS2008 / MSVC 9.0
+            return ['msvcr90']
+        else:
+            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+
+
 class CygwinCCompiler (UnixCCompiler):
 
     compiler_type = 'cygwin'
@@ -121,18 +144,9 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
             self.warn(
                 "Consider upgrading to a newer version of gcc")
         else:
-            self.dll_libraries=[]
             # Include the appropriate MSVC runtime library if Python was built
-            # with MSVC 7.0 or 7.1.
-            msc_pos = sys.version.find('MSC v.')
-            if msc_pos != -1:
-                msc_ver = sys.version[msc_pos+6:msc_pos+10]
-                if msc_ver == '1300':
-                    # MSVC 7.0
-                    self.dll_libraries = ['msvcr70']
-                elif msc_ver == '1310':
-                    # MSVC 7.1
-                    self.dll_libraries = ['msvcr71']
+            # with MSVC 7.0 or later.
+            self.dll_libraries = get_msvcr()
 
     # __init__ ()
 
@@ -320,16 +334,8 @@ def __init__ (self,
         self.dll_libraries=[]
 
         # Include the appropriate MSVC runtime library if Python was built
-        # with MSVC 7.0 or 7.1.
-        msc_pos = sys.version.find('MSC v.')
-        if msc_pos != -1:
-            msc_ver = sys.version[msc_pos+6:msc_pos+10]
-            if msc_ver == '1300':
-                # MSVC 7.0
-                self.dll_libraries = ['msvcr70']
-            elif msc_ver == '1310':
-                # MSVC 7.1
-                self.dll_libraries = ['msvcr71']
+        # with MSVC 7.0 or later.
+        self.dll_libraries = get_msvcr()
 
     # __init__ ()
 
diff --git a/msvc9compiler.py b/msvc9compiler.py
new file mode 100644
index 0000000000..a6cff2c04e
--- /dev/null
+++ b/msvc9compiler.py
@@ -0,0 +1,658 @@
+"""distutils.msvc9compiler
+
+Contains MSVCCompiler, an implementation of the abstract CCompiler class
+for the Microsoft Visual Studio 2008.
+
+The module is compatible with VS 2005 and VS 2008. You can find legacy support
+for older versions of VS in distutils.msvccompiler.
+"""
+
+# Written by Perry Stoll
+# hacked by Robin Becker and Thomas Heller to do a better job of
+#   finding DevStudio (through the registry)
+# ported to VS2005 and VS 2008 by Christian Heimes
+
+__revision__ = "$Id$"
+
+import os
+import subprocess
+import sys
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+    CompileError, LibError, LinkError)
+from distutils.ccompiler import (CCompiler, gen_preprocess_options,
+    gen_lib_options)
+from distutils import log
+
+import _winreg
+
+RegOpenKeyEx = _winreg.OpenKeyEx
+RegEnumKey = _winreg.EnumKey
+RegEnumValue = _winreg.EnumValue
+RegError = _winreg.error
+
+HKEYS = (_winreg.HKEY_USERS,
+         _winreg.HKEY_CURRENT_USER,
+         _winreg.HKEY_LOCAL_MACHINE,
+         _winreg.HKEY_CLASSES_ROOT)
+
+VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+NET_BASE = r"Software\Microsoft\.NETFramework"
+ARCHS = {'DEFAULT' : 'x86',
+    'intel' : 'x86', 'x86' : 'x86',
+    'amd64' : 'x64', 'x64' : 'x64',
+    'itanium' : 'ia64', 'ia64' : 'ia64',
+    }
+
+# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
+
+class Reg:
+    """Helper class to read values from the registry
+    """
+
+    @classmethod
+    def get_value(cls, path, key):
+        for base in HKEYS:
+            d = cls.read_values(base, path)
+            if d and key in d:
+                return d[key]
+        raise KeyError(key)
+
+    @classmethod
+    def read_keys(cls, base, key):
+        """Return list of registry keys."""
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        L = []
+        i = 0
+        while True:
+            try:
+                k = RegEnumKey(handle, i)
+            except RegError:
+                break
+            L.append(k)
+            i += 1
+        return L
+
+    @classmethod
+    def read_values(cls, base, key):
+        """Return dict of registry keys and values.
+
+        All names are converted to lowercase.
+        """
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        d = {}
+        i = 0
+        while True:
+            try:
+                name, value, type = RegEnumValue(handle, i)
+            except RegError:
+                break
+            name = name.lower()
+            d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
+            i += 1
+        return d
+
+    @staticmethod
+    def convert_mbcs(s):
+        dec = getattr(s, "decode", None)
+        if dec is not None:
+            try:
+                s = dec("mbcs")
+            except UnicodeError:
+                pass
+        return s
+
+class MacroExpander:
+
+    def __init__(self, version):
+        self.macros = {}
+        self.vsbase = VS_BASE % version
+        self.load_macros(version)
+
+    def set_macro(self, macro, path, key):
+        self.macros["$(%s)" % macro] = Reg.get_value(path, key)
+
+    def load_macros(self, version):
+        self.set_macro("VCInstallDir", self.vsbase + r"\Setup\VC", "productdir")
+        self.set_macro("VSInstallDir", self.vsbase + r"\Setup\VS", "productdir")
+        self.set_macro("FrameworkDir", NET_BASE, "installroot")
+        try:
+            if version >= 8.0:
+                self.set_macro("FrameworkSDKDir", NET_BASE,
+                               "sdkinstallrootv2.0")
+            else:
+                raise KeyError("sdkinstallrootv2.0")
+        except KeyError as exc: #
+            raise DistutilsPlatformError(
+            """Python was built with Visual Studio 2008;
+extensions must be built with a compiler than can generate compatible binaries.
+Visual Studio 2008 was not found on this system. If you have Cygwin installed,
+you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
+
+        if version >= 9.0:
+            self.set_macro("FrameworkVersion", self.vsbase, "clr version")
+            self.set_macro("WindowsSdkDir", WINSDK_BASE, "currentinstallfolder")
+        else:
+            p = r"Software\Microsoft\NET Framework Setup\Product"
+            for base in HKEYS:
+                try:
+                    h = RegOpenKeyEx(base, p)
+                except RegError:
+                    continue
+                key = RegEnumKey(h, 0)
+                d = Reg.get_value(base, r"%s\%s" % (p, key))
+                self.macros["$(FrameworkVersion)"] = d["version"]
+
+    def sub(self, s):
+        for k, v in self.macros.items():
+            s = s.replace(k, v)
+        return s
+
+def get_build_version():
+    """Return the version of MSVC that was used to build Python.
+
+    For Python 2.3 and up, the version number is included in
+    sys.version.  For earlier versions, assume the compiler is MSVC 6.
+    """
+    prefix = "MSC v."
+    i = sys.version.find(prefix)
+    if i == -1:
+        return 6
+    i = i + len(prefix)
+    s, rest = sys.version[i:].split(" ", 1)
+    majorVersion = int(s[:-2]) - 6
+    minorVersion = int(s[2:3]) / 10.0
+    # I don't think paths are affected by minor version in version 6
+    if majorVersion == 6:
+        minorVersion = 0
+    if majorVersion >= 6:
+        return majorVersion + minorVersion
+    # else we don't know what version of the compiler this is
+    return None
+
+def get_build_architecture():
+    """Return the processor architecture.
+
+    Possible results are "x86" or "amd64".
+    """
+    prefix = " bit ("
+    i = sys.version.find(prefix)
+    if i == -1:
+        return "x86"
+    j = sys.version.find(")", i)
+    sysarch = sys.version[i+len(prefix):j].lower()
+    arch = ARCHS.get(sysarch, None)
+    if arch is None:
+        return ARCHS['DEFAULT']
+    else:
+        return arch
+
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
+
+def find_vcvarsall(version):
+    """Find the vcvarsall.bat file
+
+    At first it tries to find the productdir of VS 2008 in the registry. If
+    that fails it falls back to the VS90COMNTOOLS env var.
+    """
+    vsbase = VS_BASE % version
+    try:
+        productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
+                                   "productdir")
+    except KeyError:
+        log.debug("Unable to find productdir in registry")
+        productdir = None
+
+    if not productdir or not os.path.isdir(productdir):
+        toolskey = "VS%0.f0COMNTOOLS" % version
+        toolsdir = os.environ.get(toolskey, None)
+
+        if toolsdir and os.path.isdir(toolsdir):
+            productdir = os.path.join(toolsdir, os.pardir, os.pardir, "VC")
+            productdir = os.path.abspath(productdir)
+            if not os.path.isdir(productdir):
+                log.debug("%s is not a valid directory" % productdir)
+                return None
+        else:
+            log.debug("Env var %s is not set or invalid" % toolskey)
+    if not productdir:
+        log.debug("No productdir found")
+        return None
+    vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+    if os.path.isfile(vcvarsall):
+        return vcvarsall
+    log.debug("Unable to find vcvarsall.bat")
+    return None
+
+def query_vcvarsall(version, arch="x86"):
+    """Launch vcvarsall.bat and read the settings from its environment
+    """
+    vcvarsall = find_vcvarsall(version)
+    interesting = set(("include", "lib", "libpath", "path"))
+    result = {}
+
+    if vcvarsall is None:
+        raise IOError("Unable to find vcvarsall.bat")
+    popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+    if popen.wait() != 0:
+        raise IOError(popen.stderr.read())
+
+    for line in popen.stdout:
+        line = Reg.convert_mbcs(line)
+        if '=' not in line:
+            continue
+        line = line.strip()
+        key, value = line.split('=')
+        key = key.lower()
+        if key in interesting:
+            if value.endswith(os.pathsep):
+                value = value[:-1]
+            result[key] = value
+
+    if len(result) != len(interesting):
+        raise ValueError(str(list(result.keys())))
+
+    return result
+
+# More globals
+VERSION = get_build_version()
+if VERSION < 8.0:
+    raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
+ARCH = get_build_architecture()
+# MACROS = MacroExpander(VERSION)
+VC_ENV = query_vcvarsall(VERSION, ARCH)
+
+class MSVCCompiler(CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
+
+    compiler_type = 'msvc'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.rc']
+    _mc_extensions = ['.mc']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions + _mc_extensions)
+    res_extension = '.res'
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        CCompiler.__init__ (self, verbose, dry_run, force)
+        self.__version = VERSION
+        self.__arch = ARCH
+        self.__root = r"Software\Microsoft\VisualStudio"
+        # self.__macros = MACROS
+        self.__path = []
+        self.initialized = False
+
+    def initialize(self):
+        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
+            # Assume that the SDK set up everything alright; don't try to be
+            # smarter
+            self.cc = "cl.exe"
+            self.linker = "link.exe"
+            self.lib = "lib.exe"
+            self.rc = "rc.exe"
+            self.mc = "mc.exe"
+        else:
+            self.__paths = VC_ENV['path'].split(os.pathsep)
+            os.environ['lib'] = VC_ENV['lib']
+            os.environ['include'] = VC_ENV['include']
+
+            if len(self.__paths) == 0:
+                raise DistutilsPlatformError("Python was built with %s, "
+                       "and extensions need to be built with the same "
+                       "version of the compiler, but it isn't installed."
+                       % self.__product)
+
+            self.cc = self.find_exe("cl.exe")
+            self.linker = self.find_exe("link.exe")
+            self.lib = self.find_exe("lib.exe")
+            self.rc = self.find_exe("rc.exe")   # resource compiler
+            self.mc = self.find_exe("mc.exe")   # message compiler
+            #self.set_path_env_var('lib')
+            #self.set_path_env_var('include')
+
+        # extend the MSVC path with the current path
+        try:
+            for p in os.environ['path'].split(';'):
+                self.__paths.append(p)
+        except KeyError:
+            pass
+        self.__paths = normalize_and_reduce_paths(self.__paths)
+        os.environ['path'] = ";".join(self.__paths)
+
+        self.preprocess_options = None
+        if self.__arch == "x86":
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3',
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3',
+                                          '/Z7', '/D_DEBUG']
+        else:
+            # Win64
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
+                                          '/Z7', '/D_DEBUG']
+
+        self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
+        if self.__version >= 7:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
+                ]
+        self.ldflags_static = [ '/nologo']
+
+        self.initialized = True
+
+    # -- Worker methods ------------------------------------------------
+
+    def object_filenames(self,
+                         source_filenames,
+                         strip_dir=0,
+                         output_dir=''):
+        # Copied from ccompiler.py, extended to return .res as 'object'-file
+        # for .rc input file
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            (base, ext) = os.path.splitext (src_name)
+            base = os.path.splitdrive(base)[1] # Chop off the drive
+            base = base[os.path.isabs(base):]  # If abs, chop off leading /
+            if ext not in self.src_extensions:
+                # Better to raise an exception instead of silently continuing
+                # and later complain about sources and targets having
+                # different lengths
+                raise CompileError ("Don't know how to compile %s" % src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext in self._rc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            elif ext in self._mc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.obj_extension))
+        return obj_names
+
+
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+
+        if not self.initialized:
+            self.initialize()
+        compile_info = self._setup_compile(output_dir, macros, include_dirs,
+                                           sources, depends, extra_postargs)
+        macros, objects, extra_postargs, pp_opts, build = compile_info
+
+        compile_opts = extra_preargs or []
+        compile_opts.append ('/c')
+        if debug:
+            compile_opts.extend(self.compile_options_debug)
+        else:
+            compile_opts.extend(self.compile_options)
+
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
+            if debug:
+                # pass the full pathname to MSVC in debug mode,
+                # this allows the debugger to find the source file
+                # without asking the user to browse for it
+                src = os.path.abspath(src)
+
+            if ext in self._c_extensions:
+                input_opt = "/Tc" + src
+            elif ext in self._cpp_extensions:
+                input_opt = "/Tp" + src
+            elif ext in self._rc_extensions:
+                # compile .RC to .RES file
+                input_opt = src
+                output_opt = "/fo" + obj
+                try:
+                    self.spawn([self.rc] + pp_opts +
+                               [output_opt] + [input_opt])
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            elif ext in self._mc_extensions:
+                # Compile .MC to .RC file to .RES file.
+                #   * '-h dir' specifies the directory for the
+                #     generated include file
+                #   * '-r dir' specifies the target directory of the
+                #     generated RC file and the binary message resource
+                #     it includes
+                #
+                # For now (since there are no options to change this),
+                # we use the source-directory for the include file and
+                # the build directory for the RC file and message
+                # resources. This works at least for win32all.
+                h_dir = os.path.dirname(src)
+                rc_dir = os.path.dirname(obj)
+                try:
+                    # first compile .MC to .RC and .H file
+                    self.spawn([self.mc] +
+                               ['-h', h_dir, '-r', rc_dir] + [src])
+                    base, _ = os.path.splitext (os.path.basename (src))
+                    rc_file = os.path.join (rc_dir, base + '.rc')
+                    # then compile .RC to .RES file
+                    self.spawn([self.rc] +
+                               ["/fo" + obj] + [rc_file])
+
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            else:
+                # how to handle this file?
+                raise CompileError("Don't know how to compile %s to %s"
+                                   % (src, obj))
+
+            output_opt = "/Fo" + obj
+            try:
+                self.spawn([self.cc] + compile_opts + pp_opts +
+                           [input_opt, output_opt] +
+                           extra_postargs)
+            except DistutilsExecError as msg:
+                raise CompileError(msg)
+
+        return objects
+
+
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0,
+                          target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        output_filename = self.library_filename(output_libname,
+                                                output_dir=output_dir)
+
+        if self._need_link(objects, output_filename):
+            lib_args = objects + ['/OUT:' + output_filename]
+            if debug:
+                pass # XXX what goes here?
+            try:
+                self.spawn([self.lib] + lib_args)
+            except DistutilsExecError as msg:
+                raise LibError(msg)
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        (libraries, library_dirs, runtime_library_dirs) = fixed_args
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
+        if output_dir is not None:
+            output_filename = os.path.join(output_dir, output_filename)
+
+        if self._need_link(objects, output_filename):
+            if target_desc == CCompiler.EXECUTABLE:
+                if debug:
+                    ldflags = self.ldflags_shared_debug[1:]
+                else:
+                    ldflags = self.ldflags_shared[1:]
+            else:
+                if debug:
+                    ldflags = self.ldflags_shared_debug
+                else:
+                    ldflags = self.ldflags_shared
+
+            export_opts = []
+            for sym in (export_symbols or []):
+                export_opts.append("/EXPORT:" + sym)
+
+            ld_args = (ldflags + lib_opts + export_opts +
+                       objects + ['/OUT:' + output_filename])
+
+            # The MSVC linker generates .lib and .exp files, which cannot be
+            # suppressed by any linker switches. The .lib files may even be
+            # needed! Make sure they are generated in the temporary build
+            # directory. Since they have different names for debug and release
+            # builds, they can go into the same directory.
+            if export_symbols is not None:
+                (dll_name, dll_ext) = os.path.splitext(
+                    os.path.basename(output_filename))
+                implib_file = os.path.join(
+                    os.path.dirname(objects[0]),
+                    self.library_filename(dll_name))
+                ld_args.append ('/IMPLIB:' + implib_file)
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend(extra_postargs)
+
+            self.mkpath(os.path.dirname(output_filename))
+            try:
+                self.spawn([self.linker] + ld_args)
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
+
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+
+    def library_dir_option(self, dir):
+        return "/LIBPATH:" + dir
+
+    def runtime_library_dir_option(self, dir):
+        raise DistutilsPlatformError(
+              "don't know how to set runtime library search path for MSVC++")
+
+    def library_option(self, lib):
+        return self.library_filename(lib)
+
+
+    def find_library_file(self, dirs, lib, debug=0):
+        # Prefer a debugging library if found (and requested), but deal
+        # with it if we don't have one.
+        if debug:
+            try_names = [lib + "_d", lib]
+        else:
+            try_names = [lib]
+        for dir in dirs:
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename (name))
+                if os.path.exists(libfile):
+                    return libfile
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+
+    # Helper methods for using the MSVC registry settings
+
+    def find_exe(self, exe):
+        """Return path to an MSVC executable program.
+
+        Tries to find the program in several places: first, one of the
+        MSVC program search paths from the registry; next, the directories
+        in the PATH environment variable.  If any of those work, return an
+        absolute path that is known to exist.  If none of them work, just
+        return the original program name, 'exe'.
+        """
+        for p in self.__paths:
+            fn = os.path.join(os.path.abspath(p), exe)
+            if os.path.isfile(fn):
+                return fn
+
+        # didn't find it; try existing path
+        for p in os.environ['Path'].split(';'):
+            fn = os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn):
+                return fn
+
+        return exe
diff --git a/msvccompiler.py b/msvccompiler.py
index 29a9020956..fa123462ec 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -650,3 +650,11 @@ def set_path_env_var(self, name):
             p = self.get_msvc_paths(name)
         if p:
             os.environ[name] = string.join(p, ';')
+
+
+if get_build_version() >= 8.0:
+    log.debug("Importing new compiler from distutils.msvc9compiler")
+    OldMSVCCompiler = MSVCCompiler
+    from distutils.msvc9compiler import MSVCCompiler
+    from distutils.msvc9compiler import get_build_architecture
+    from distutils.msvc9compiler import MacroExpander

From c9618bff1c953979a37bc8a27bd2b4cd435b07b9 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 3 Dec 2007 19:47:54 +0000
Subject: [PATCH 1916/8469] Patch #1537 from Chad Austin Change GeneratorExit's
 base class from Exception to BaseException

---
 msvc9compiler.py | 658 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 658 insertions(+)
 create mode 100644 msvc9compiler.py

diff --git a/msvc9compiler.py b/msvc9compiler.py
new file mode 100644
index 0000000000..a6cff2c04e
--- /dev/null
+++ b/msvc9compiler.py
@@ -0,0 +1,658 @@
+"""distutils.msvc9compiler
+
+Contains MSVCCompiler, an implementation of the abstract CCompiler class
+for the Microsoft Visual Studio 2008.
+
+The module is compatible with VS 2005 and VS 2008. You can find legacy support
+for older versions of VS in distutils.msvccompiler.
+"""
+
+# Written by Perry Stoll
+# hacked by Robin Becker and Thomas Heller to do a better job of
+#   finding DevStudio (through the registry)
+# ported to VS2005 and VS 2008 by Christian Heimes
+
+__revision__ = "$Id$"
+
+import os
+import subprocess
+import sys
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+    CompileError, LibError, LinkError)
+from distutils.ccompiler import (CCompiler, gen_preprocess_options,
+    gen_lib_options)
+from distutils import log
+
+import _winreg
+
+RegOpenKeyEx = _winreg.OpenKeyEx
+RegEnumKey = _winreg.EnumKey
+RegEnumValue = _winreg.EnumValue
+RegError = _winreg.error
+
+HKEYS = (_winreg.HKEY_USERS,
+         _winreg.HKEY_CURRENT_USER,
+         _winreg.HKEY_LOCAL_MACHINE,
+         _winreg.HKEY_CLASSES_ROOT)
+
+VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+NET_BASE = r"Software\Microsoft\.NETFramework"
+ARCHS = {'DEFAULT' : 'x86',
+    'intel' : 'x86', 'x86' : 'x86',
+    'amd64' : 'x64', 'x64' : 'x64',
+    'itanium' : 'ia64', 'ia64' : 'ia64',
+    }
+
+# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
+
+class Reg:
+    """Helper class to read values from the registry
+    """
+
+    @classmethod
+    def get_value(cls, path, key):
+        for base in HKEYS:
+            d = cls.read_values(base, path)
+            if d and key in d:
+                return d[key]
+        raise KeyError(key)
+
+    @classmethod
+    def read_keys(cls, base, key):
+        """Return list of registry keys."""
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        L = []
+        i = 0
+        while True:
+            try:
+                k = RegEnumKey(handle, i)
+            except RegError:
+                break
+            L.append(k)
+            i += 1
+        return L
+
+    @classmethod
+    def read_values(cls, base, key):
+        """Return dict of registry keys and values.
+
+        All names are converted to lowercase.
+        """
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        d = {}
+        i = 0
+        while True:
+            try:
+                name, value, type = RegEnumValue(handle, i)
+            except RegError:
+                break
+            name = name.lower()
+            d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
+            i += 1
+        return d
+
+    @staticmethod
+    def convert_mbcs(s):
+        dec = getattr(s, "decode", None)
+        if dec is not None:
+            try:
+                s = dec("mbcs")
+            except UnicodeError:
+                pass
+        return s
+
+class MacroExpander:
+
+    def __init__(self, version):
+        self.macros = {}
+        self.vsbase = VS_BASE % version
+        self.load_macros(version)
+
+    def set_macro(self, macro, path, key):
+        self.macros["$(%s)" % macro] = Reg.get_value(path, key)
+
+    def load_macros(self, version):
+        self.set_macro("VCInstallDir", self.vsbase + r"\Setup\VC", "productdir")
+        self.set_macro("VSInstallDir", self.vsbase + r"\Setup\VS", "productdir")
+        self.set_macro("FrameworkDir", NET_BASE, "installroot")
+        try:
+            if version >= 8.0:
+                self.set_macro("FrameworkSDKDir", NET_BASE,
+                               "sdkinstallrootv2.0")
+            else:
+                raise KeyError("sdkinstallrootv2.0")
+        except KeyError as exc: #
+            raise DistutilsPlatformError(
+            """Python was built with Visual Studio 2008;
+extensions must be built with a compiler than can generate compatible binaries.
+Visual Studio 2008 was not found on this system. If you have Cygwin installed,
+you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
+
+        if version >= 9.0:
+            self.set_macro("FrameworkVersion", self.vsbase, "clr version")
+            self.set_macro("WindowsSdkDir", WINSDK_BASE, "currentinstallfolder")
+        else:
+            p = r"Software\Microsoft\NET Framework Setup\Product"
+            for base in HKEYS:
+                try:
+                    h = RegOpenKeyEx(base, p)
+                except RegError:
+                    continue
+                key = RegEnumKey(h, 0)
+                d = Reg.get_value(base, r"%s\%s" % (p, key))
+                self.macros["$(FrameworkVersion)"] = d["version"]
+
+    def sub(self, s):
+        for k, v in self.macros.items():
+            s = s.replace(k, v)
+        return s
+
+def get_build_version():
+    """Return the version of MSVC that was used to build Python.
+
+    For Python 2.3 and up, the version number is included in
+    sys.version.  For earlier versions, assume the compiler is MSVC 6.
+    """
+    prefix = "MSC v."
+    i = sys.version.find(prefix)
+    if i == -1:
+        return 6
+    i = i + len(prefix)
+    s, rest = sys.version[i:].split(" ", 1)
+    majorVersion = int(s[:-2]) - 6
+    minorVersion = int(s[2:3]) / 10.0
+    # I don't think paths are affected by minor version in version 6
+    if majorVersion == 6:
+        minorVersion = 0
+    if majorVersion >= 6:
+        return majorVersion + minorVersion
+    # else we don't know what version of the compiler this is
+    return None
+
+def get_build_architecture():
+    """Return the processor architecture.
+
+    Possible results are "x86" or "amd64".
+    """
+    prefix = " bit ("
+    i = sys.version.find(prefix)
+    if i == -1:
+        return "x86"
+    j = sys.version.find(")", i)
+    sysarch = sys.version[i+len(prefix):j].lower()
+    arch = ARCHS.get(sysarch, None)
+    if arch is None:
+        return ARCHS['DEFAULT']
+    else:
+        return arch
+
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
+
+def find_vcvarsall(version):
+    """Find the vcvarsall.bat file
+
+    At first it tries to find the productdir of VS 2008 in the registry. If
+    that fails it falls back to the VS90COMNTOOLS env var.
+    """
+    vsbase = VS_BASE % version
+    try:
+        productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
+                                   "productdir")
+    except KeyError:
+        log.debug("Unable to find productdir in registry")
+        productdir = None
+
+    if not productdir or not os.path.isdir(productdir):
+        toolskey = "VS%0.f0COMNTOOLS" % version
+        toolsdir = os.environ.get(toolskey, None)
+
+        if toolsdir and os.path.isdir(toolsdir):
+            productdir = os.path.join(toolsdir, os.pardir, os.pardir, "VC")
+            productdir = os.path.abspath(productdir)
+            if not os.path.isdir(productdir):
+                log.debug("%s is not a valid directory" % productdir)
+                return None
+        else:
+            log.debug("Env var %s is not set or invalid" % toolskey)
+    if not productdir:
+        log.debug("No productdir found")
+        return None
+    vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+    if os.path.isfile(vcvarsall):
+        return vcvarsall
+    log.debug("Unable to find vcvarsall.bat")
+    return None
+
+def query_vcvarsall(version, arch="x86"):
+    """Launch vcvarsall.bat and read the settings from its environment
+    """
+    vcvarsall = find_vcvarsall(version)
+    interesting = set(("include", "lib", "libpath", "path"))
+    result = {}
+
+    if vcvarsall is None:
+        raise IOError("Unable to find vcvarsall.bat")
+    popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+    if popen.wait() != 0:
+        raise IOError(popen.stderr.read())
+
+    for line in popen.stdout:
+        line = Reg.convert_mbcs(line)
+        if '=' not in line:
+            continue
+        line = line.strip()
+        key, value = line.split('=')
+        key = key.lower()
+        if key in interesting:
+            if value.endswith(os.pathsep):
+                value = value[:-1]
+            result[key] = value
+
+    if len(result) != len(interesting):
+        raise ValueError(str(list(result.keys())))
+
+    return result
+
+# More globals
+VERSION = get_build_version()
+if VERSION < 8.0:
+    raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
+ARCH = get_build_architecture()
+# MACROS = MacroExpander(VERSION)
+VC_ENV = query_vcvarsall(VERSION, ARCH)
+
+class MSVCCompiler(CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
+
+    compiler_type = 'msvc'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.rc']
+    _mc_extensions = ['.mc']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions + _mc_extensions)
+    res_extension = '.res'
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        CCompiler.__init__ (self, verbose, dry_run, force)
+        self.__version = VERSION
+        self.__arch = ARCH
+        self.__root = r"Software\Microsoft\VisualStudio"
+        # self.__macros = MACROS
+        self.__path = []
+        self.initialized = False
+
+    def initialize(self):
+        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
+            # Assume that the SDK set up everything alright; don't try to be
+            # smarter
+            self.cc = "cl.exe"
+            self.linker = "link.exe"
+            self.lib = "lib.exe"
+            self.rc = "rc.exe"
+            self.mc = "mc.exe"
+        else:
+            self.__paths = VC_ENV['path'].split(os.pathsep)
+            os.environ['lib'] = VC_ENV['lib']
+            os.environ['include'] = VC_ENV['include']
+
+            if len(self.__paths) == 0:
+                raise DistutilsPlatformError("Python was built with %s, "
+                       "and extensions need to be built with the same "
+                       "version of the compiler, but it isn't installed."
+                       % self.__product)
+
+            self.cc = self.find_exe("cl.exe")
+            self.linker = self.find_exe("link.exe")
+            self.lib = self.find_exe("lib.exe")
+            self.rc = self.find_exe("rc.exe")   # resource compiler
+            self.mc = self.find_exe("mc.exe")   # message compiler
+            #self.set_path_env_var('lib')
+            #self.set_path_env_var('include')
+
+        # extend the MSVC path with the current path
+        try:
+            for p in os.environ['path'].split(';'):
+                self.__paths.append(p)
+        except KeyError:
+            pass
+        self.__paths = normalize_and_reduce_paths(self.__paths)
+        os.environ['path'] = ";".join(self.__paths)
+
+        self.preprocess_options = None
+        if self.__arch == "x86":
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3',
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3',
+                                          '/Z7', '/D_DEBUG']
+        else:
+            # Win64
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
+                                          '/Z7', '/D_DEBUG']
+
+        self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
+        if self.__version >= 7:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
+                ]
+        self.ldflags_static = [ '/nologo']
+
+        self.initialized = True
+
+    # -- Worker methods ------------------------------------------------
+
+    def object_filenames(self,
+                         source_filenames,
+                         strip_dir=0,
+                         output_dir=''):
+        # Copied from ccompiler.py, extended to return .res as 'object'-file
+        # for .rc input file
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            (base, ext) = os.path.splitext (src_name)
+            base = os.path.splitdrive(base)[1] # Chop off the drive
+            base = base[os.path.isabs(base):]  # If abs, chop off leading /
+            if ext not in self.src_extensions:
+                # Better to raise an exception instead of silently continuing
+                # and later complain about sources and targets having
+                # different lengths
+                raise CompileError ("Don't know how to compile %s" % src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext in self._rc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            elif ext in self._mc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.obj_extension))
+        return obj_names
+
+
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+
+        if not self.initialized:
+            self.initialize()
+        compile_info = self._setup_compile(output_dir, macros, include_dirs,
+                                           sources, depends, extra_postargs)
+        macros, objects, extra_postargs, pp_opts, build = compile_info
+
+        compile_opts = extra_preargs or []
+        compile_opts.append ('/c')
+        if debug:
+            compile_opts.extend(self.compile_options_debug)
+        else:
+            compile_opts.extend(self.compile_options)
+
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
+            if debug:
+                # pass the full pathname to MSVC in debug mode,
+                # this allows the debugger to find the source file
+                # without asking the user to browse for it
+                src = os.path.abspath(src)
+
+            if ext in self._c_extensions:
+                input_opt = "/Tc" + src
+            elif ext in self._cpp_extensions:
+                input_opt = "/Tp" + src
+            elif ext in self._rc_extensions:
+                # compile .RC to .RES file
+                input_opt = src
+                output_opt = "/fo" + obj
+                try:
+                    self.spawn([self.rc] + pp_opts +
+                               [output_opt] + [input_opt])
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            elif ext in self._mc_extensions:
+                # Compile .MC to .RC file to .RES file.
+                #   * '-h dir' specifies the directory for the
+                #     generated include file
+                #   * '-r dir' specifies the target directory of the
+                #     generated RC file and the binary message resource
+                #     it includes
+                #
+                # For now (since there are no options to change this),
+                # we use the source-directory for the include file and
+                # the build directory for the RC file and message
+                # resources. This works at least for win32all.
+                h_dir = os.path.dirname(src)
+                rc_dir = os.path.dirname(obj)
+                try:
+                    # first compile .MC to .RC and .H file
+                    self.spawn([self.mc] +
+                               ['-h', h_dir, '-r', rc_dir] + [src])
+                    base, _ = os.path.splitext (os.path.basename (src))
+                    rc_file = os.path.join (rc_dir, base + '.rc')
+                    # then compile .RC to .RES file
+                    self.spawn([self.rc] +
+                               ["/fo" + obj] + [rc_file])
+
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            else:
+                # how to handle this file?
+                raise CompileError("Don't know how to compile %s to %s"
+                                   % (src, obj))
+
+            output_opt = "/Fo" + obj
+            try:
+                self.spawn([self.cc] + compile_opts + pp_opts +
+                           [input_opt, output_opt] +
+                           extra_postargs)
+            except DistutilsExecError as msg:
+                raise CompileError(msg)
+
+        return objects
+
+
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0,
+                          target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        output_filename = self.library_filename(output_libname,
+                                                output_dir=output_dir)
+
+        if self._need_link(objects, output_filename):
+            lib_args = objects + ['/OUT:' + output_filename]
+            if debug:
+                pass # XXX what goes here?
+            try:
+                self.spawn([self.lib] + lib_args)
+            except DistutilsExecError as msg:
+                raise LibError(msg)
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        (libraries, library_dirs, runtime_library_dirs) = fixed_args
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
+        if output_dir is not None:
+            output_filename = os.path.join(output_dir, output_filename)
+
+        if self._need_link(objects, output_filename):
+            if target_desc == CCompiler.EXECUTABLE:
+                if debug:
+                    ldflags = self.ldflags_shared_debug[1:]
+                else:
+                    ldflags = self.ldflags_shared[1:]
+            else:
+                if debug:
+                    ldflags = self.ldflags_shared_debug
+                else:
+                    ldflags = self.ldflags_shared
+
+            export_opts = []
+            for sym in (export_symbols or []):
+                export_opts.append("/EXPORT:" + sym)
+
+            ld_args = (ldflags + lib_opts + export_opts +
+                       objects + ['/OUT:' + output_filename])
+
+            # The MSVC linker generates .lib and .exp files, which cannot be
+            # suppressed by any linker switches. The .lib files may even be
+            # needed! Make sure they are generated in the temporary build
+            # directory. Since they have different names for debug and release
+            # builds, they can go into the same directory.
+            if export_symbols is not None:
+                (dll_name, dll_ext) = os.path.splitext(
+                    os.path.basename(output_filename))
+                implib_file = os.path.join(
+                    os.path.dirname(objects[0]),
+                    self.library_filename(dll_name))
+                ld_args.append ('/IMPLIB:' + implib_file)
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend(extra_postargs)
+
+            self.mkpath(os.path.dirname(output_filename))
+            try:
+                self.spawn([self.linker] + ld_args)
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
+
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+
+    def library_dir_option(self, dir):
+        return "/LIBPATH:" + dir
+
+    def runtime_library_dir_option(self, dir):
+        raise DistutilsPlatformError(
+              "don't know how to set runtime library search path for MSVC++")
+
+    def library_option(self, lib):
+        return self.library_filename(lib)
+
+
+    def find_library_file(self, dirs, lib, debug=0):
+        # Prefer a debugging library if found (and requested), but deal
+        # with it if we don't have one.
+        if debug:
+            try_names = [lib + "_d", lib]
+        else:
+            try_names = [lib]
+        for dir in dirs:
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename (name))
+                if os.path.exists(libfile):
+                    return libfile
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+
+    # Helper methods for using the MSVC registry settings
+
+    def find_exe(self, exe):
+        """Return path to an MSVC executable program.
+
+        Tries to find the program in several places: first, one of the
+        MSVC program search paths from the registry; next, the directories
+        in the PATH environment variable.  If any of those work, return an
+        absolute path that is known to exist.  If none of them work, just
+        return the original program name, 'exe'.
+        """
+        for p in self.__paths:
+            fn = os.path.join(os.path.abspath(p), exe)
+            if os.path.isfile(fn):
+                return fn
+
+        # didn't find it; try existing path
+        for p in os.environ['Path'].split(';'):
+            fn = os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn):
+                return fn
+
+        return exe

From 57ce0a030801c3b95c04c514bad06f556d5a9933 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 3 Dec 2007 19:53:57 +0000
Subject: [PATCH 1917/8469] Reverting last commit. I had some staled data from
 an attempted svnmerge in my local sandbox

---
 msvc9compiler.py | 658 -----------------------------------------------
 1 file changed, 658 deletions(-)
 delete mode 100644 msvc9compiler.py

diff --git a/msvc9compiler.py b/msvc9compiler.py
deleted file mode 100644
index a6cff2c04e..0000000000
--- a/msvc9compiler.py
+++ /dev/null
@@ -1,658 +0,0 @@
-"""distutils.msvc9compiler
-
-Contains MSVCCompiler, an implementation of the abstract CCompiler class
-for the Microsoft Visual Studio 2008.
-
-The module is compatible with VS 2005 and VS 2008. You can find legacy support
-for older versions of VS in distutils.msvccompiler.
-"""
-
-# Written by Perry Stoll
-# hacked by Robin Becker and Thomas Heller to do a better job of
-#   finding DevStudio (through the registry)
-# ported to VS2005 and VS 2008 by Christian Heimes
-
-__revision__ = "$Id$"
-
-import os
-import subprocess
-import sys
-from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
-    CompileError, LibError, LinkError)
-from distutils.ccompiler import (CCompiler, gen_preprocess_options,
-    gen_lib_options)
-from distutils import log
-
-import _winreg
-
-RegOpenKeyEx = _winreg.OpenKeyEx
-RegEnumKey = _winreg.EnumKey
-RegEnumValue = _winreg.EnumValue
-RegError = _winreg.error
-
-HKEYS = (_winreg.HKEY_USERS,
-         _winreg.HKEY_CURRENT_USER,
-         _winreg.HKEY_LOCAL_MACHINE,
-         _winreg.HKEY_CLASSES_ROOT)
-
-VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
-WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
-NET_BASE = r"Software\Microsoft\.NETFramework"
-ARCHS = {'DEFAULT' : 'x86',
-    'intel' : 'x86', 'x86' : 'x86',
-    'amd64' : 'x64', 'x64' : 'x64',
-    'itanium' : 'ia64', 'ia64' : 'ia64',
-    }
-
-# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
-
-class Reg:
-    """Helper class to read values from the registry
-    """
-
-    @classmethod
-    def get_value(cls, path, key):
-        for base in HKEYS:
-            d = cls.read_values(base, path)
-            if d and key in d:
-                return d[key]
-        raise KeyError(key)
-
-    @classmethod
-    def read_keys(cls, base, key):
-        """Return list of registry keys."""
-        try:
-            handle = RegOpenKeyEx(base, key)
-        except RegError:
-            return None
-        L = []
-        i = 0
-        while True:
-            try:
-                k = RegEnumKey(handle, i)
-            except RegError:
-                break
-            L.append(k)
-            i += 1
-        return L
-
-    @classmethod
-    def read_values(cls, base, key):
-        """Return dict of registry keys and values.
-
-        All names are converted to lowercase.
-        """
-        try:
-            handle = RegOpenKeyEx(base, key)
-        except RegError:
-            return None
-        d = {}
-        i = 0
-        while True:
-            try:
-                name, value, type = RegEnumValue(handle, i)
-            except RegError:
-                break
-            name = name.lower()
-            d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
-            i += 1
-        return d
-
-    @staticmethod
-    def convert_mbcs(s):
-        dec = getattr(s, "decode", None)
-        if dec is not None:
-            try:
-                s = dec("mbcs")
-            except UnicodeError:
-                pass
-        return s
-
-class MacroExpander:
-
-    def __init__(self, version):
-        self.macros = {}
-        self.vsbase = VS_BASE % version
-        self.load_macros(version)
-
-    def set_macro(self, macro, path, key):
-        self.macros["$(%s)" % macro] = Reg.get_value(path, key)
-
-    def load_macros(self, version):
-        self.set_macro("VCInstallDir", self.vsbase + r"\Setup\VC", "productdir")
-        self.set_macro("VSInstallDir", self.vsbase + r"\Setup\VS", "productdir")
-        self.set_macro("FrameworkDir", NET_BASE, "installroot")
-        try:
-            if version >= 8.0:
-                self.set_macro("FrameworkSDKDir", NET_BASE,
-                               "sdkinstallrootv2.0")
-            else:
-                raise KeyError("sdkinstallrootv2.0")
-        except KeyError as exc: #
-            raise DistutilsPlatformError(
-            """Python was built with Visual Studio 2008;
-extensions must be built with a compiler than can generate compatible binaries.
-Visual Studio 2008 was not found on this system. If you have Cygwin installed,
-you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
-
-        if version >= 9.0:
-            self.set_macro("FrameworkVersion", self.vsbase, "clr version")
-            self.set_macro("WindowsSdkDir", WINSDK_BASE, "currentinstallfolder")
-        else:
-            p = r"Software\Microsoft\NET Framework Setup\Product"
-            for base in HKEYS:
-                try:
-                    h = RegOpenKeyEx(base, p)
-                except RegError:
-                    continue
-                key = RegEnumKey(h, 0)
-                d = Reg.get_value(base, r"%s\%s" % (p, key))
-                self.macros["$(FrameworkVersion)"] = d["version"]
-
-    def sub(self, s):
-        for k, v in self.macros.items():
-            s = s.replace(k, v)
-        return s
-
-def get_build_version():
-    """Return the version of MSVC that was used to build Python.
-
-    For Python 2.3 and up, the version number is included in
-    sys.version.  For earlier versions, assume the compiler is MSVC 6.
-    """
-    prefix = "MSC v."
-    i = sys.version.find(prefix)
-    if i == -1:
-        return 6
-    i = i + len(prefix)
-    s, rest = sys.version[i:].split(" ", 1)
-    majorVersion = int(s[:-2]) - 6
-    minorVersion = int(s[2:3]) / 10.0
-    # I don't think paths are affected by minor version in version 6
-    if majorVersion == 6:
-        minorVersion = 0
-    if majorVersion >= 6:
-        return majorVersion + minorVersion
-    # else we don't know what version of the compiler this is
-    return None
-
-def get_build_architecture():
-    """Return the processor architecture.
-
-    Possible results are "x86" or "amd64".
-    """
-    prefix = " bit ("
-    i = sys.version.find(prefix)
-    if i == -1:
-        return "x86"
-    j = sys.version.find(")", i)
-    sysarch = sys.version[i+len(prefix):j].lower()
-    arch = ARCHS.get(sysarch, None)
-    if arch is None:
-        return ARCHS['DEFAULT']
-    else:
-        return arch
-
-def normalize_and_reduce_paths(paths):
-    """Return a list of normalized paths with duplicates removed.
-
-    The current order of paths is maintained.
-    """
-    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
-    reduced_paths = []
-    for p in paths:
-        np = os.path.normpath(p)
-        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
-        if np not in reduced_paths:
-            reduced_paths.append(np)
-    return reduced_paths
-
-def find_vcvarsall(version):
-    """Find the vcvarsall.bat file
-
-    At first it tries to find the productdir of VS 2008 in the registry. If
-    that fails it falls back to the VS90COMNTOOLS env var.
-    """
-    vsbase = VS_BASE % version
-    try:
-        productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
-                                   "productdir")
-    except KeyError:
-        log.debug("Unable to find productdir in registry")
-        productdir = None
-
-    if not productdir or not os.path.isdir(productdir):
-        toolskey = "VS%0.f0COMNTOOLS" % version
-        toolsdir = os.environ.get(toolskey, None)
-
-        if toolsdir and os.path.isdir(toolsdir):
-            productdir = os.path.join(toolsdir, os.pardir, os.pardir, "VC")
-            productdir = os.path.abspath(productdir)
-            if not os.path.isdir(productdir):
-                log.debug("%s is not a valid directory" % productdir)
-                return None
-        else:
-            log.debug("Env var %s is not set or invalid" % toolskey)
-    if not productdir:
-        log.debug("No productdir found")
-        return None
-    vcvarsall = os.path.join(productdir, "vcvarsall.bat")
-    if os.path.isfile(vcvarsall):
-        return vcvarsall
-    log.debug("Unable to find vcvarsall.bat")
-    return None
-
-def query_vcvarsall(version, arch="x86"):
-    """Launch vcvarsall.bat and read the settings from its environment
-    """
-    vcvarsall = find_vcvarsall(version)
-    interesting = set(("include", "lib", "libpath", "path"))
-    result = {}
-
-    if vcvarsall is None:
-        raise IOError("Unable to find vcvarsall.bat")
-    popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-    if popen.wait() != 0:
-        raise IOError(popen.stderr.read())
-
-    for line in popen.stdout:
-        line = Reg.convert_mbcs(line)
-        if '=' not in line:
-            continue
-        line = line.strip()
-        key, value = line.split('=')
-        key = key.lower()
-        if key in interesting:
-            if value.endswith(os.pathsep):
-                value = value[:-1]
-            result[key] = value
-
-    if len(result) != len(interesting):
-        raise ValueError(str(list(result.keys())))
-
-    return result
-
-# More globals
-VERSION = get_build_version()
-if VERSION < 8.0:
-    raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
-ARCH = get_build_architecture()
-# MACROS = MacroExpander(VERSION)
-VC_ENV = query_vcvarsall(VERSION, ARCH)
-
-class MSVCCompiler(CCompiler) :
-    """Concrete class that implements an interface to Microsoft Visual C++,
-       as defined by the CCompiler abstract class."""
-
-    compiler_type = 'msvc'
-
-    # Just set this so CCompiler's constructor doesn't barf.  We currently
-    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
-    # as it really isn't necessary for this sort of single-compiler class.
-    # Would be nice to have a consistent interface with UnixCCompiler,
-    # though, so it's worth thinking about.
-    executables = {}
-
-    # Private class data (need to distinguish C from C++ source for compiler)
-    _c_extensions = ['.c']
-    _cpp_extensions = ['.cc', '.cpp', '.cxx']
-    _rc_extensions = ['.rc']
-    _mc_extensions = ['.mc']
-
-    # Needed for the filename generation methods provided by the
-    # base class, CCompiler.
-    src_extensions = (_c_extensions + _cpp_extensions +
-                      _rc_extensions + _mc_extensions)
-    res_extension = '.res'
-    obj_extension = '.obj'
-    static_lib_extension = '.lib'
-    shared_lib_extension = '.dll'
-    static_lib_format = shared_lib_format = '%s%s'
-    exe_extension = '.exe'
-
-    def __init__(self, verbose=0, dry_run=0, force=0):
-        CCompiler.__init__ (self, verbose, dry_run, force)
-        self.__version = VERSION
-        self.__arch = ARCH
-        self.__root = r"Software\Microsoft\VisualStudio"
-        # self.__macros = MACROS
-        self.__path = []
-        self.initialized = False
-
-    def initialize(self):
-        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
-            # Assume that the SDK set up everything alright; don't try to be
-            # smarter
-            self.cc = "cl.exe"
-            self.linker = "link.exe"
-            self.lib = "lib.exe"
-            self.rc = "rc.exe"
-            self.mc = "mc.exe"
-        else:
-            self.__paths = VC_ENV['path'].split(os.pathsep)
-            os.environ['lib'] = VC_ENV['lib']
-            os.environ['include'] = VC_ENV['include']
-
-            if len(self.__paths) == 0:
-                raise DistutilsPlatformError("Python was built with %s, "
-                       "and extensions need to be built with the same "
-                       "version of the compiler, but it isn't installed."
-                       % self.__product)
-
-            self.cc = self.find_exe("cl.exe")
-            self.linker = self.find_exe("link.exe")
-            self.lib = self.find_exe("lib.exe")
-            self.rc = self.find_exe("rc.exe")   # resource compiler
-            self.mc = self.find_exe("mc.exe")   # message compiler
-            #self.set_path_env_var('lib')
-            #self.set_path_env_var('include')
-
-        # extend the MSVC path with the current path
-        try:
-            for p in os.environ['path'].split(';'):
-                self.__paths.append(p)
-        except KeyError:
-            pass
-        self.__paths = normalize_and_reduce_paths(self.__paths)
-        os.environ['path'] = ";".join(self.__paths)
-
-        self.preprocess_options = None
-        if self.__arch == "x86":
-            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3',
-                                     '/DNDEBUG']
-            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3',
-                                          '/Z7', '/D_DEBUG']
-        else:
-            # Win64
-            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
-                                     '/DNDEBUG']
-            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
-                                          '/Z7', '/D_DEBUG']
-
-        self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
-        if self.__version >= 7:
-            self.ldflags_shared_debug = [
-                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
-                ]
-        self.ldflags_static = [ '/nologo']
-
-        self.initialized = True
-
-    # -- Worker methods ------------------------------------------------
-
-    def object_filenames(self,
-                         source_filenames,
-                         strip_dir=0,
-                         output_dir=''):
-        # Copied from ccompiler.py, extended to return .res as 'object'-file
-        # for .rc input file
-        if output_dir is None: output_dir = ''
-        obj_names = []
-        for src_name in source_filenames:
-            (base, ext) = os.path.splitext (src_name)
-            base = os.path.splitdrive(base)[1] # Chop off the drive
-            base = base[os.path.isabs(base):]  # If abs, chop off leading /
-            if ext not in self.src_extensions:
-                # Better to raise an exception instead of silently continuing
-                # and later complain about sources and targets having
-                # different lengths
-                raise CompileError ("Don't know how to compile %s" % src_name)
-            if strip_dir:
-                base = os.path.basename (base)
-            if ext in self._rc_extensions:
-                obj_names.append (os.path.join (output_dir,
-                                                base + self.res_extension))
-            elif ext in self._mc_extensions:
-                obj_names.append (os.path.join (output_dir,
-                                                base + self.res_extension))
-            else:
-                obj_names.append (os.path.join (output_dir,
-                                                base + self.obj_extension))
-        return obj_names
-
-
-    def compile(self, sources,
-                output_dir=None, macros=None, include_dirs=None, debug=0,
-                extra_preargs=None, extra_postargs=None, depends=None):
-
-        if not self.initialized:
-            self.initialize()
-        compile_info = self._setup_compile(output_dir, macros, include_dirs,
-                                           sources, depends, extra_postargs)
-        macros, objects, extra_postargs, pp_opts, build = compile_info
-
-        compile_opts = extra_preargs or []
-        compile_opts.append ('/c')
-        if debug:
-            compile_opts.extend(self.compile_options_debug)
-        else:
-            compile_opts.extend(self.compile_options)
-
-        for obj in objects:
-            try:
-                src, ext = build[obj]
-            except KeyError:
-                continue
-            if debug:
-                # pass the full pathname to MSVC in debug mode,
-                # this allows the debugger to find the source file
-                # without asking the user to browse for it
-                src = os.path.abspath(src)
-
-            if ext in self._c_extensions:
-                input_opt = "/Tc" + src
-            elif ext in self._cpp_extensions:
-                input_opt = "/Tp" + src
-            elif ext in self._rc_extensions:
-                # compile .RC to .RES file
-                input_opt = src
-                output_opt = "/fo" + obj
-                try:
-                    self.spawn([self.rc] + pp_opts +
-                               [output_opt] + [input_opt])
-                except DistutilsExecError as msg:
-                    raise CompileError(msg)
-                continue
-            elif ext in self._mc_extensions:
-                # Compile .MC to .RC file to .RES file.
-                #   * '-h dir' specifies the directory for the
-                #     generated include file
-                #   * '-r dir' specifies the target directory of the
-                #     generated RC file and the binary message resource
-                #     it includes
-                #
-                # For now (since there are no options to change this),
-                # we use the source-directory for the include file and
-                # the build directory for the RC file and message
-                # resources. This works at least for win32all.
-                h_dir = os.path.dirname(src)
-                rc_dir = os.path.dirname(obj)
-                try:
-                    # first compile .MC to .RC and .H file
-                    self.spawn([self.mc] +
-                               ['-h', h_dir, '-r', rc_dir] + [src])
-                    base, _ = os.path.splitext (os.path.basename (src))
-                    rc_file = os.path.join (rc_dir, base + '.rc')
-                    # then compile .RC to .RES file
-                    self.spawn([self.rc] +
-                               ["/fo" + obj] + [rc_file])
-
-                except DistutilsExecError as msg:
-                    raise CompileError(msg)
-                continue
-            else:
-                # how to handle this file?
-                raise CompileError("Don't know how to compile %s to %s"
-                                   % (src, obj))
-
-            output_opt = "/Fo" + obj
-            try:
-                self.spawn([self.cc] + compile_opts + pp_opts +
-                           [input_opt, output_opt] +
-                           extra_postargs)
-            except DistutilsExecError as msg:
-                raise CompileError(msg)
-
-        return objects
-
-
-    def create_static_lib(self,
-                          objects,
-                          output_libname,
-                          output_dir=None,
-                          debug=0,
-                          target_lang=None):
-
-        if not self.initialized:
-            self.initialize()
-        (objects, output_dir) = self._fix_object_args(objects, output_dir)
-        output_filename = self.library_filename(output_libname,
-                                                output_dir=output_dir)
-
-        if self._need_link(objects, output_filename):
-            lib_args = objects + ['/OUT:' + output_filename]
-            if debug:
-                pass # XXX what goes here?
-            try:
-                self.spawn([self.lib] + lib_args)
-            except DistutilsExecError as msg:
-                raise LibError(msg)
-        else:
-            log.debug("skipping %s (up-to-date)", output_filename)
-
-
-    def link(self,
-             target_desc,
-             objects,
-             output_filename,
-             output_dir=None,
-             libraries=None,
-             library_dirs=None,
-             runtime_library_dirs=None,
-             export_symbols=None,
-             debug=0,
-             extra_preargs=None,
-             extra_postargs=None,
-             build_temp=None,
-             target_lang=None):
-
-        if not self.initialized:
-            self.initialize()
-        (objects, output_dir) = self._fix_object_args(objects, output_dir)
-        fixed_args = self._fix_lib_args(libraries, library_dirs,
-                                        runtime_library_dirs)
-        (libraries, library_dirs, runtime_library_dirs) = fixed_args
-
-        if runtime_library_dirs:
-            self.warn ("I don't know what to do with 'runtime_library_dirs': "
-                       + str (runtime_library_dirs))
-
-        lib_opts = gen_lib_options(self,
-                                   library_dirs, runtime_library_dirs,
-                                   libraries)
-        if output_dir is not None:
-            output_filename = os.path.join(output_dir, output_filename)
-
-        if self._need_link(objects, output_filename):
-            if target_desc == CCompiler.EXECUTABLE:
-                if debug:
-                    ldflags = self.ldflags_shared_debug[1:]
-                else:
-                    ldflags = self.ldflags_shared[1:]
-            else:
-                if debug:
-                    ldflags = self.ldflags_shared_debug
-                else:
-                    ldflags = self.ldflags_shared
-
-            export_opts = []
-            for sym in (export_symbols or []):
-                export_opts.append("/EXPORT:" + sym)
-
-            ld_args = (ldflags + lib_opts + export_opts +
-                       objects + ['/OUT:' + output_filename])
-
-            # The MSVC linker generates .lib and .exp files, which cannot be
-            # suppressed by any linker switches. The .lib files may even be
-            # needed! Make sure they are generated in the temporary build
-            # directory. Since they have different names for debug and release
-            # builds, they can go into the same directory.
-            if export_symbols is not None:
-                (dll_name, dll_ext) = os.path.splitext(
-                    os.path.basename(output_filename))
-                implib_file = os.path.join(
-                    os.path.dirname(objects[0]),
-                    self.library_filename(dll_name))
-                ld_args.append ('/IMPLIB:' + implib_file)
-
-            if extra_preargs:
-                ld_args[:0] = extra_preargs
-            if extra_postargs:
-                ld_args.extend(extra_postargs)
-
-            self.mkpath(os.path.dirname(output_filename))
-            try:
-                self.spawn([self.linker] + ld_args)
-            except DistutilsExecError as msg:
-                raise LinkError(msg)
-
-        else:
-            log.debug("skipping %s (up-to-date)", output_filename)
-
-
-    # -- Miscellaneous methods -----------------------------------------
-    # These are all used by the 'gen_lib_options() function, in
-    # ccompiler.py.
-
-    def library_dir_option(self, dir):
-        return "/LIBPATH:" + dir
-
-    def runtime_library_dir_option(self, dir):
-        raise DistutilsPlatformError(
-              "don't know how to set runtime library search path for MSVC++")
-
-    def library_option(self, lib):
-        return self.library_filename(lib)
-
-
-    def find_library_file(self, dirs, lib, debug=0):
-        # Prefer a debugging library if found (and requested), but deal
-        # with it if we don't have one.
-        if debug:
-            try_names = [lib + "_d", lib]
-        else:
-            try_names = [lib]
-        for dir in dirs:
-            for name in try_names:
-                libfile = os.path.join(dir, self.library_filename (name))
-                if os.path.exists(libfile):
-                    return libfile
-        else:
-            # Oops, didn't find it in *any* of 'dirs'
-            return None
-
-    # Helper methods for using the MSVC registry settings
-
-    def find_exe(self, exe):
-        """Return path to an MSVC executable program.
-
-        Tries to find the program in several places: first, one of the
-        MSVC program search paths from the registry; next, the directories
-        in the PATH environment variable.  If any of those work, return an
-        absolute path that is known to exist.  If none of them work, just
-        return the original program name, 'exe'.
-        """
-        for p in self.__paths:
-            fn = os.path.join(os.path.abspath(p), exe)
-            if os.path.isfile(fn):
-                return fn
-
-        # didn't find it; try existing path
-        for p in os.environ['Path'].split(';'):
-            fn = os.path.join(os.path.abspath(p),exe)
-            if os.path.isfile(fn):
-                return fn
-
-        return exe

From 04bca8195e91cd3520b869da61781cb5649d4164 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 3 Dec 2007 21:02:03 +0000
Subject: [PATCH 1918/8469] Merged revisions 59275-59303 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
NOTE: The merge does NOT contain the modified file Python/import.c from
      r59288. I can't get it running. Nick, please check in the PEP 366
      manually.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

........
  r59279 | georg.brandl | 2007-12-02 19:17:50 +0100 (Sun, 02 Dec 2007) | 2 lines

  Fix a sentence I missed before. Do not merge to 3k.
........
  r59281 | georg.brandl | 2007-12-02 22:58:54 +0100 (Sun, 02 Dec 2007) | 3 lines

  Add documentation for PySys_* functions.
  Written by Charlie Shepherd for GHOP. Also fixes #1245.
........
  r59288 | nick.coghlan | 2007-12-03 13:55:17 +0100 (Mon, 03 Dec 2007) | 1 line

  Implement PEP 366
........
  r59290 | christian.heimes | 2007-12-03 14:47:29 +0100 (Mon, 03 Dec 2007) | 3 lines

  Applied my patch #1455 with some extra fixes for VS 2005
  The new msvc9compiler module supports VS 2005 and VS 2008. I've also fixed build_ext to support PCbuild8 and PCbuild9 and backported my fix for xxmodule.c from py3k. The old code msvccompiler is still in place in case somebody likes to build an extension with VS 2003 or earlier.
  I've also updated the cygwin compiler module for VS 2005 and VS 2008. It works with VS 2005 but I'm unable to test it with VS 2008. We have to wait for a new version of cygwin.
........
  r59291 | christian.heimes | 2007-12-03 14:55:16 +0100 (Mon, 03 Dec 2007) | 1 line

  Added comment to Misc/NEWS for r59290
........
  r59292 | christian.heimes | 2007-12-03 15:28:04 +0100 (Mon, 03 Dec 2007) | 1 line

  I followed MA Lemberg's suggestion and added comments to the late initialization of the type slots.
........
  r59293 | facundo.batista | 2007-12-03 17:29:52 +0100 (Mon, 03 Dec 2007) | 3 lines


  Speedup and cleaning of __str__.  Thanks Mark Dickinson.
........
  r59294 | facundo.batista | 2007-12-03 18:55:00 +0100 (Mon, 03 Dec 2007) | 4 lines


  Faster _fix function, and some reordering for a more elegant
  coding. Thanks Mark Dickinson.
........
  r59295 | martin.v.loewis | 2007-12-03 20:20:02 +0100 (Mon, 03 Dec 2007) | 5 lines

  Issue #1727780: Support loading pickles of random.Random objects created
  on 32-bit systems on 64-bit systems, and vice versa. As a consequence
  of the change, Random pickles created by Python 2.6 cannot be loaded
  in Python 2.5.
........
  r59297 | facundo.batista | 2007-12-03 20:49:54 +0100 (Mon, 03 Dec 2007) | 3 lines


  Two small fixes. Issue 1547.
........
  r59299 | georg.brandl | 2007-12-03 20:57:02 +0100 (Mon, 03 Dec 2007) | 2 lines

  #1548: fix apostroph placement.
........
  r59300 | christian.heimes | 2007-12-03 21:01:02 +0100 (Mon, 03 Dec 2007) | 3 lines

  Patch #1537 from Chad Austin
  Change GeneratorExit's base class from Exception to BaseException
  (This time I'm applying the patch to the correct sandbox.)
........
  r59302 | georg.brandl | 2007-12-03 21:03:46 +0100 (Mon, 03 Dec 2007) | 3 lines

  Add examples to the xmlrpclib docs.
  Written for GHOP by Josip Dzolonga.
........
---
 command/build_ext.py |  14 +-
 cygwinccompiler.py   |  48 ++--
 msvc9compiler.py     | 658 +++++++++++++++++++++++++++++++++++++++++++
 msvccompiler.py      |   8 +
 4 files changed, 706 insertions(+), 22 deletions(-)
 create mode 100644 msvc9compiler.py

diff --git a/command/build_ext.py b/command/build_ext.py
index ddf8f723f8..6d42278e40 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -14,6 +14,10 @@
 from distutils.extension import Extension
 from distutils import log
 
+if os.name == 'nt':
+    from distutils.msvccompiler import get_build_version
+    MSVC_VERSION = int(get_build_version())
+
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
 extension_name_re = re.compile \
@@ -172,7 +176,15 @@ def finalize_options(self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'PCBuild'))
+            if MSVC_VERSION == 9:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild9'))
+            elif MSVC_VERSION == 8:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild8', 'win32release'))
+            else:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PCBuild'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index bec72ca3f1..488752300b 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -54,6 +54,29 @@
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
 
+def get_msvcr():
+    """Include the appropriate MSVC runtime library if Python was built
+    with MSVC 7.0 or later.
+    """
+    msc_pos = sys.version.find('MSC v.')
+    if msc_pos != -1:
+        msc_ver = sys.version[msc_pos+6:msc_pos+10]
+        if msc_ver == '1300':
+            # MSVC 7.0
+            return ['msvcr70']
+        elif msc_ver == '1310':
+            # MSVC 7.1
+            return ['msvcr71']
+        elif msc_ver == '1400':
+            # VS2005 / MSVC 8.0
+            return ['msvcr80']
+        elif msc_ver == '1500':
+            # VS2008 / MSVC 9.0
+            return ['msvcr90']
+        else:
+            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+
+
 class CygwinCCompiler (UnixCCompiler):
 
     compiler_type = 'cygwin'
@@ -119,18 +142,9 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
             self.warn(
                 "Consider upgrading to a newer version of gcc")
         else:
-            self.dll_libraries=[]
             # Include the appropriate MSVC runtime library if Python was built
-            # with MSVC 7.0 or 7.1.
-            msc_pos = sys.version.find('MSC v.')
-            if msc_pos != -1:
-                msc_ver = sys.version[msc_pos+6:msc_pos+10]
-                if msc_ver == '1300':
-                    # MSVC 7.0
-                    self.dll_libraries = ['msvcr70']
-                elif msc_ver == '1310':
-                    # MSVC 7.1
-                    self.dll_libraries = ['msvcr71']
+            # with MSVC 7.0 or later.
+            self.dll_libraries = get_msvcr()
 
     # __init__ ()
 
@@ -317,16 +331,8 @@ def __init__ (self,
         self.dll_libraries=[]
 
         # Include the appropriate MSVC runtime library if Python was built
-        # with MSVC 7.0 or 7.1.
-        msc_pos = sys.version.find('MSC v.')
-        if msc_pos != -1:
-            msc_ver = sys.version[msc_pos+6:msc_pos+10]
-            if msc_ver == '1300':
-                # MSVC 7.0
-                self.dll_libraries = ['msvcr70']
-            elif msc_ver == '1310':
-                # MSVC 7.1
-                self.dll_libraries = ['msvcr71']
+        # with MSVC 7.0 or later.
+        self.dll_libraries = get_msvcr()
 
     # __init__ ()
 
diff --git a/msvc9compiler.py b/msvc9compiler.py
new file mode 100644
index 0000000000..a6cff2c04e
--- /dev/null
+++ b/msvc9compiler.py
@@ -0,0 +1,658 @@
+"""distutils.msvc9compiler
+
+Contains MSVCCompiler, an implementation of the abstract CCompiler class
+for the Microsoft Visual Studio 2008.
+
+The module is compatible with VS 2005 and VS 2008. You can find legacy support
+for older versions of VS in distutils.msvccompiler.
+"""
+
+# Written by Perry Stoll
+# hacked by Robin Becker and Thomas Heller to do a better job of
+#   finding DevStudio (through the registry)
+# ported to VS2005 and VS 2008 by Christian Heimes
+
+__revision__ = "$Id$"
+
+import os
+import subprocess
+import sys
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+    CompileError, LibError, LinkError)
+from distutils.ccompiler import (CCompiler, gen_preprocess_options,
+    gen_lib_options)
+from distutils import log
+
+import _winreg
+
+RegOpenKeyEx = _winreg.OpenKeyEx
+RegEnumKey = _winreg.EnumKey
+RegEnumValue = _winreg.EnumValue
+RegError = _winreg.error
+
+HKEYS = (_winreg.HKEY_USERS,
+         _winreg.HKEY_CURRENT_USER,
+         _winreg.HKEY_LOCAL_MACHINE,
+         _winreg.HKEY_CLASSES_ROOT)
+
+VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+NET_BASE = r"Software\Microsoft\.NETFramework"
+ARCHS = {'DEFAULT' : 'x86',
+    'intel' : 'x86', 'x86' : 'x86',
+    'amd64' : 'x64', 'x64' : 'x64',
+    'itanium' : 'ia64', 'ia64' : 'ia64',
+    }
+
+# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
+
+class Reg:
+    """Helper class to read values from the registry
+    """
+
+    @classmethod
+    def get_value(cls, path, key):
+        for base in HKEYS:
+            d = cls.read_values(base, path)
+            if d and key in d:
+                return d[key]
+        raise KeyError(key)
+
+    @classmethod
+    def read_keys(cls, base, key):
+        """Return list of registry keys."""
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        L = []
+        i = 0
+        while True:
+            try:
+                k = RegEnumKey(handle, i)
+            except RegError:
+                break
+            L.append(k)
+            i += 1
+        return L
+
+    @classmethod
+    def read_values(cls, base, key):
+        """Return dict of registry keys and values.
+
+        All names are converted to lowercase.
+        """
+        try:
+            handle = RegOpenKeyEx(base, key)
+        except RegError:
+            return None
+        d = {}
+        i = 0
+        while True:
+            try:
+                name, value, type = RegEnumValue(handle, i)
+            except RegError:
+                break
+            name = name.lower()
+            d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
+            i += 1
+        return d
+
+    @staticmethod
+    def convert_mbcs(s):
+        dec = getattr(s, "decode", None)
+        if dec is not None:
+            try:
+                s = dec("mbcs")
+            except UnicodeError:
+                pass
+        return s
+
+class MacroExpander:
+
+    def __init__(self, version):
+        self.macros = {}
+        self.vsbase = VS_BASE % version
+        self.load_macros(version)
+
+    def set_macro(self, macro, path, key):
+        self.macros["$(%s)" % macro] = Reg.get_value(path, key)
+
+    def load_macros(self, version):
+        self.set_macro("VCInstallDir", self.vsbase + r"\Setup\VC", "productdir")
+        self.set_macro("VSInstallDir", self.vsbase + r"\Setup\VS", "productdir")
+        self.set_macro("FrameworkDir", NET_BASE, "installroot")
+        try:
+            if version >= 8.0:
+                self.set_macro("FrameworkSDKDir", NET_BASE,
+                               "sdkinstallrootv2.0")
+            else:
+                raise KeyError("sdkinstallrootv2.0")
+        except KeyError as exc: #
+            raise DistutilsPlatformError(
+            """Python was built with Visual Studio 2008;
+extensions must be built with a compiler than can generate compatible binaries.
+Visual Studio 2008 was not found on this system. If you have Cygwin installed,
+you can try compiling with MingW32, by passing "-c mingw32" to setup.py.""")
+
+        if version >= 9.0:
+            self.set_macro("FrameworkVersion", self.vsbase, "clr version")
+            self.set_macro("WindowsSdkDir", WINSDK_BASE, "currentinstallfolder")
+        else:
+            p = r"Software\Microsoft\NET Framework Setup\Product"
+            for base in HKEYS:
+                try:
+                    h = RegOpenKeyEx(base, p)
+                except RegError:
+                    continue
+                key = RegEnumKey(h, 0)
+                d = Reg.get_value(base, r"%s\%s" % (p, key))
+                self.macros["$(FrameworkVersion)"] = d["version"]
+
+    def sub(self, s):
+        for k, v in self.macros.items():
+            s = s.replace(k, v)
+        return s
+
+def get_build_version():
+    """Return the version of MSVC that was used to build Python.
+
+    For Python 2.3 and up, the version number is included in
+    sys.version.  For earlier versions, assume the compiler is MSVC 6.
+    """
+    prefix = "MSC v."
+    i = sys.version.find(prefix)
+    if i == -1:
+        return 6
+    i = i + len(prefix)
+    s, rest = sys.version[i:].split(" ", 1)
+    majorVersion = int(s[:-2]) - 6
+    minorVersion = int(s[2:3]) / 10.0
+    # I don't think paths are affected by minor version in version 6
+    if majorVersion == 6:
+        minorVersion = 0
+    if majorVersion >= 6:
+        return majorVersion + minorVersion
+    # else we don't know what version of the compiler this is
+    return None
+
+def get_build_architecture():
+    """Return the processor architecture.
+
+    Possible results are "x86" or "amd64".
+    """
+    prefix = " bit ("
+    i = sys.version.find(prefix)
+    if i == -1:
+        return "x86"
+    j = sys.version.find(")", i)
+    sysarch = sys.version[i+len(prefix):j].lower()
+    arch = ARCHS.get(sysarch, None)
+    if arch is None:
+        return ARCHS['DEFAULT']
+    else:
+        return arch
+
+def normalize_and_reduce_paths(paths):
+    """Return a list of normalized paths with duplicates removed.
+
+    The current order of paths is maintained.
+    """
+    # Paths are normalized so things like:  /a and /a/ aren't both preserved.
+    reduced_paths = []
+    for p in paths:
+        np = os.path.normpath(p)
+        # XXX(nnorwitz): O(n**2), if reduced_paths gets long perhaps use a set.
+        if np not in reduced_paths:
+            reduced_paths.append(np)
+    return reduced_paths
+
+def find_vcvarsall(version):
+    """Find the vcvarsall.bat file
+
+    At first it tries to find the productdir of VS 2008 in the registry. If
+    that fails it falls back to the VS90COMNTOOLS env var.
+    """
+    vsbase = VS_BASE % version
+    try:
+        productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
+                                   "productdir")
+    except KeyError:
+        log.debug("Unable to find productdir in registry")
+        productdir = None
+
+    if not productdir or not os.path.isdir(productdir):
+        toolskey = "VS%0.f0COMNTOOLS" % version
+        toolsdir = os.environ.get(toolskey, None)
+
+        if toolsdir and os.path.isdir(toolsdir):
+            productdir = os.path.join(toolsdir, os.pardir, os.pardir, "VC")
+            productdir = os.path.abspath(productdir)
+            if not os.path.isdir(productdir):
+                log.debug("%s is not a valid directory" % productdir)
+                return None
+        else:
+            log.debug("Env var %s is not set or invalid" % toolskey)
+    if not productdir:
+        log.debug("No productdir found")
+        return None
+    vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+    if os.path.isfile(vcvarsall):
+        return vcvarsall
+    log.debug("Unable to find vcvarsall.bat")
+    return None
+
+def query_vcvarsall(version, arch="x86"):
+    """Launch vcvarsall.bat and read the settings from its environment
+    """
+    vcvarsall = find_vcvarsall(version)
+    interesting = set(("include", "lib", "libpath", "path"))
+    result = {}
+
+    if vcvarsall is None:
+        raise IOError("Unable to find vcvarsall.bat")
+    popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+    if popen.wait() != 0:
+        raise IOError(popen.stderr.read())
+
+    for line in popen.stdout:
+        line = Reg.convert_mbcs(line)
+        if '=' not in line:
+            continue
+        line = line.strip()
+        key, value = line.split('=')
+        key = key.lower()
+        if key in interesting:
+            if value.endswith(os.pathsep):
+                value = value[:-1]
+            result[key] = value
+
+    if len(result) != len(interesting):
+        raise ValueError(str(list(result.keys())))
+
+    return result
+
+# More globals
+VERSION = get_build_version()
+if VERSION < 8.0:
+    raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
+ARCH = get_build_architecture()
+# MACROS = MacroExpander(VERSION)
+VC_ENV = query_vcvarsall(VERSION, ARCH)
+
+class MSVCCompiler(CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
+
+    compiler_type = 'msvc'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.rc']
+    _mc_extensions = ['.mc']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions + _mc_extensions)
+    res_extension = '.res'
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        CCompiler.__init__ (self, verbose, dry_run, force)
+        self.__version = VERSION
+        self.__arch = ARCH
+        self.__root = r"Software\Microsoft\VisualStudio"
+        # self.__macros = MACROS
+        self.__path = []
+        self.initialized = False
+
+    def initialize(self):
+        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
+            # Assume that the SDK set up everything alright; don't try to be
+            # smarter
+            self.cc = "cl.exe"
+            self.linker = "link.exe"
+            self.lib = "lib.exe"
+            self.rc = "rc.exe"
+            self.mc = "mc.exe"
+        else:
+            self.__paths = VC_ENV['path'].split(os.pathsep)
+            os.environ['lib'] = VC_ENV['lib']
+            os.environ['include'] = VC_ENV['include']
+
+            if len(self.__paths) == 0:
+                raise DistutilsPlatformError("Python was built with %s, "
+                       "and extensions need to be built with the same "
+                       "version of the compiler, but it isn't installed."
+                       % self.__product)
+
+            self.cc = self.find_exe("cl.exe")
+            self.linker = self.find_exe("link.exe")
+            self.lib = self.find_exe("lib.exe")
+            self.rc = self.find_exe("rc.exe")   # resource compiler
+            self.mc = self.find_exe("mc.exe")   # message compiler
+            #self.set_path_env_var('lib')
+            #self.set_path_env_var('include')
+
+        # extend the MSVC path with the current path
+        try:
+            for p in os.environ['path'].split(';'):
+                self.__paths.append(p)
+        except KeyError:
+            pass
+        self.__paths = normalize_and_reduce_paths(self.__paths)
+        os.environ['path'] = ";".join(self.__paths)
+
+        self.preprocess_options = None
+        if self.__arch == "x86":
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3',
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3',
+                                          '/Z7', '/D_DEBUG']
+        else:
+            # Win64
+            self.compile_options = [ '/nologo', '/Ox', '/MD', '/W3', '/GS-' ,
+                                     '/DNDEBUG']
+            self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/GS-',
+                                          '/Z7', '/D_DEBUG']
+
+        self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
+        if self.__version >= 7:
+            self.ldflags_shared_debug = [
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
+                ]
+        self.ldflags_static = [ '/nologo']
+
+        self.initialized = True
+
+    # -- Worker methods ------------------------------------------------
+
+    def object_filenames(self,
+                         source_filenames,
+                         strip_dir=0,
+                         output_dir=''):
+        # Copied from ccompiler.py, extended to return .res as 'object'-file
+        # for .rc input file
+        if output_dir is None: output_dir = ''
+        obj_names = []
+        for src_name in source_filenames:
+            (base, ext) = os.path.splitext (src_name)
+            base = os.path.splitdrive(base)[1] # Chop off the drive
+            base = base[os.path.isabs(base):]  # If abs, chop off leading /
+            if ext not in self.src_extensions:
+                # Better to raise an exception instead of silently continuing
+                # and later complain about sources and targets having
+                # different lengths
+                raise CompileError ("Don't know how to compile %s" % src_name)
+            if strip_dir:
+                base = os.path.basename (base)
+            if ext in self._rc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            elif ext in self._mc_extensions:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.res_extension))
+            else:
+                obj_names.append (os.path.join (output_dir,
+                                                base + self.obj_extension))
+        return obj_names
+
+
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+
+        if not self.initialized:
+            self.initialize()
+        compile_info = self._setup_compile(output_dir, macros, include_dirs,
+                                           sources, depends, extra_postargs)
+        macros, objects, extra_postargs, pp_opts, build = compile_info
+
+        compile_opts = extra_preargs or []
+        compile_opts.append ('/c')
+        if debug:
+            compile_opts.extend(self.compile_options_debug)
+        else:
+            compile_opts.extend(self.compile_options)
+
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
+            if debug:
+                # pass the full pathname to MSVC in debug mode,
+                # this allows the debugger to find the source file
+                # without asking the user to browse for it
+                src = os.path.abspath(src)
+
+            if ext in self._c_extensions:
+                input_opt = "/Tc" + src
+            elif ext in self._cpp_extensions:
+                input_opt = "/Tp" + src
+            elif ext in self._rc_extensions:
+                # compile .RC to .RES file
+                input_opt = src
+                output_opt = "/fo" + obj
+                try:
+                    self.spawn([self.rc] + pp_opts +
+                               [output_opt] + [input_opt])
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            elif ext in self._mc_extensions:
+                # Compile .MC to .RC file to .RES file.
+                #   * '-h dir' specifies the directory for the
+                #     generated include file
+                #   * '-r dir' specifies the target directory of the
+                #     generated RC file and the binary message resource
+                #     it includes
+                #
+                # For now (since there are no options to change this),
+                # we use the source-directory for the include file and
+                # the build directory for the RC file and message
+                # resources. This works at least for win32all.
+                h_dir = os.path.dirname(src)
+                rc_dir = os.path.dirname(obj)
+                try:
+                    # first compile .MC to .RC and .H file
+                    self.spawn([self.mc] +
+                               ['-h', h_dir, '-r', rc_dir] + [src])
+                    base, _ = os.path.splitext (os.path.basename (src))
+                    rc_file = os.path.join (rc_dir, base + '.rc')
+                    # then compile .RC to .RES file
+                    self.spawn([self.rc] +
+                               ["/fo" + obj] + [rc_file])
+
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            else:
+                # how to handle this file?
+                raise CompileError("Don't know how to compile %s to %s"
+                                   % (src, obj))
+
+            output_opt = "/Fo" + obj
+            try:
+                self.spawn([self.cc] + compile_opts + pp_opts +
+                           [input_opt, output_opt] +
+                           extra_postargs)
+            except DistutilsExecError as msg:
+                raise CompileError(msg)
+
+        return objects
+
+
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0,
+                          target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        output_filename = self.library_filename(output_libname,
+                                                output_dir=output_dir)
+
+        if self._need_link(objects, output_filename):
+            lib_args = objects + ['/OUT:' + output_filename]
+            if debug:
+                pass # XXX what goes here?
+            try:
+                self.spawn([self.lib] + lib_args)
+            except DistutilsExecError as msg:
+                raise LibError(msg)
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        (objects, output_dir) = self._fix_object_args(objects, output_dir)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        (libraries, library_dirs, runtime_library_dirs) = fixed_args
+
+        if runtime_library_dirs:
+            self.warn ("I don't know what to do with 'runtime_library_dirs': "
+                       + str (runtime_library_dirs))
+
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
+        if output_dir is not None:
+            output_filename = os.path.join(output_dir, output_filename)
+
+        if self._need_link(objects, output_filename):
+            if target_desc == CCompiler.EXECUTABLE:
+                if debug:
+                    ldflags = self.ldflags_shared_debug[1:]
+                else:
+                    ldflags = self.ldflags_shared[1:]
+            else:
+                if debug:
+                    ldflags = self.ldflags_shared_debug
+                else:
+                    ldflags = self.ldflags_shared
+
+            export_opts = []
+            for sym in (export_symbols or []):
+                export_opts.append("/EXPORT:" + sym)
+
+            ld_args = (ldflags + lib_opts + export_opts +
+                       objects + ['/OUT:' + output_filename])
+
+            # The MSVC linker generates .lib and .exp files, which cannot be
+            # suppressed by any linker switches. The .lib files may even be
+            # needed! Make sure they are generated in the temporary build
+            # directory. Since they have different names for debug and release
+            # builds, they can go into the same directory.
+            if export_symbols is not None:
+                (dll_name, dll_ext) = os.path.splitext(
+                    os.path.basename(output_filename))
+                implib_file = os.path.join(
+                    os.path.dirname(objects[0]),
+                    self.library_filename(dll_name))
+                ld_args.append ('/IMPLIB:' + implib_file)
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend(extra_postargs)
+
+            self.mkpath(os.path.dirname(output_filename))
+            try:
+                self.spawn([self.linker] + ld_args)
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
+
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+
+    def library_dir_option(self, dir):
+        return "/LIBPATH:" + dir
+
+    def runtime_library_dir_option(self, dir):
+        raise DistutilsPlatformError(
+              "don't know how to set runtime library search path for MSVC++")
+
+    def library_option(self, lib):
+        return self.library_filename(lib)
+
+
+    def find_library_file(self, dirs, lib, debug=0):
+        # Prefer a debugging library if found (and requested), but deal
+        # with it if we don't have one.
+        if debug:
+            try_names = [lib + "_d", lib]
+        else:
+            try_names = [lib]
+        for dir in dirs:
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename (name))
+                if os.path.exists(libfile):
+                    return libfile
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
+
+    # Helper methods for using the MSVC registry settings
+
+    def find_exe(self, exe):
+        """Return path to an MSVC executable program.
+
+        Tries to find the program in several places: first, one of the
+        MSVC program search paths from the registry; next, the directories
+        in the PATH environment variable.  If any of those work, return an
+        absolute path that is known to exist.  If none of them work, just
+        return the original program name, 'exe'.
+        """
+        for p in self.__paths:
+            fn = os.path.join(os.path.abspath(p), exe)
+            if os.path.isfile(fn):
+                return fn
+
+        # didn't find it; try existing path
+        for p in os.environ['Path'].split(';'):
+            fn = os.path.join(os.path.abspath(p),exe)
+            if os.path.isfile(fn):
+                return fn
+
+        return exe
diff --git a/msvccompiler.py b/msvccompiler.py
index 6bf969f9d2..3b4e9c9d2d 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -632,3 +632,11 @@ def set_path_env_var(self, name):
             p = self.get_msvc_paths(name)
         if p:
             os.environ[name] = ';'.join(p)
+
+
+if get_build_version() >= 8.0:
+    log.debug("Importing new compiler from distutils.msvc9compiler")
+    OldMSVCCompiler = MSVCCompiler
+    from distutils.msvc9compiler import MSVCCompiler
+    from distutils.msvc9compiler import get_build_architecture
+    from distutils.msvc9compiler import MacroExpander

From c03780a3a80420dab6fb7ffa8471e135a7dec9a2 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 5 Dec 2007 20:10:38 +0000
Subject: [PATCH 1919/8469] Fixed bug #1557 by using popen.communicate() before
 popen.wait()

---
 msvc9compiler.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index a6cff2c04e..828d7fbf7a 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -254,10 +254,13 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
+
+    stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(popen.stderr.read())
+        raise IOError(stderr.decode("mbcs"))
 
-    for line in popen.stdout:
+    stdout = stdout.decode("mbcs")
+    for line in stdout.split("\n"):
         line = Reg.convert_mbcs(line)
         if '=' not in line:
             continue

From 7ea9ff425c9efeff99694a5e4f8d1123f76133d1 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 5 Dec 2007 20:18:38 +0000
Subject: [PATCH 1920/8469] Merged revisions 59333-59370 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59343 | georg.brandl | 2007-12-05 08:02:47 +0100 (Wed, 05 Dec 2007) | 2 lines

  Fix typo.
........
  r59347 | christian.heimes | 2007-12-05 13:31:44 +0100 (Wed, 05 Dec 2007) | 1 line

  Fixed quoting and paths in the sqlite project file
........
  r59348 | christian.heimes | 2007-12-05 13:45:11 +0100 (Wed, 05 Dec 2007) | 1 line

  Fixed error in regrtest. I must have missed the spot.
........
  r59350 | christian.heimes | 2007-12-05 13:49:14 +0100 (Wed, 05 Dec 2007) | 1 line

  merge -r59315:59316 from py3k: Fix issue #1553: An errornous __length_hint__ can make list() raise a SystemError
........
  r59352 | christian.heimes | 2007-12-05 13:52:34 +0100 (Wed, 05 Dec 2007) | 1 line

  Added msg to Misc/NEWS
........
  r59354 | andrew.kuchling | 2007-12-05 14:27:20 +0100 (Wed, 05 Dec 2007) | 1 line

  Spelling fix
........
  r59356 | georg.brandl | 2007-12-05 18:56:50 +0100 (Wed, 05 Dec 2007) | 3 lines

  Add examples to csv, pprint and traceback docs.
  Written by Ross for GHOP.
........
  r59358 | raymond.hettinger | 2007-12-05 19:11:08 +0100 (Wed, 05 Dec 2007) | 1 line

  Error checking was too aggressive (reported by Chris Tismer)
........
  r59359 | georg.brandl | 2007-12-05 19:30:48 +0100 (Wed, 05 Dec 2007) | 2 lines

  Add examples to re docs. Written for GHOP by Dan Finnie.
........
  r59366 | georg.brandl | 2007-12-05 20:49:21 +0100 (Wed, 05 Dec 2007) | 2 lines

  Fix markup.
........
  r59367 | christian.heimes | 2007-12-05 20:57:54 +0100 (Wed, 05 Dec 2007) | 1 line

  Updated documentation and build_tkinter.py script
........
  r59368 | georg.brandl | 2007-12-05 21:03:57 +0100 (Wed, 05 Dec 2007) | 2 lines

  Another markup fix.
........
  r59369 | ronald.oussoren | 2007-12-05 21:07:36 +0100 (Wed, 05 Dec 2007) | 7 lines

  This "fixes" compilation issues for the Carbon._OSA module on OSX Leopard
  by purging bindings to OSA's debug API's. Those APIs we're completely
  unsupported on OSX 10.4 and are no longer available on OSX 10.5.

  Note that this patches a generated file. This is somewhat acceptable because
  regenerating the file is non-trivial and wouldn't use system headers anyway.
........
  r59370 | christian.heimes | 2007-12-05 21:10:38 +0100 (Wed, 05 Dec 2007) | 1 line

  Fixed bug #1557 by using popen.communicate() before popen.wait()
........
---
 msvc9compiler.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index a6cff2c04e..828d7fbf7a 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -254,10 +254,13 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
+
+    stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(popen.stderr.read())
+        raise IOError(stderr.decode("mbcs"))
 
-    for line in popen.stdout:
+    stdout = stdout.decode("mbcs")
+    for line in stdout.split("\n"):
         line = Reg.convert_mbcs(line)
         if '=' not in line:
             continue

From ae50fdd2c427c6dbdb7990bfae890534240d5169 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Thu, 6 Dec 2007 13:15:13 +0000
Subject: [PATCH 1921/8469] Fixed get_config_h_filename for Windows. Without
 the patch it can't find the pyconfig.h file inside a build tree. Added
 several small unit tests for sysconfig.

---
 sysconfig.py            | 22 ++++++++++++++--------
 tests/test_sysconfig.py | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 tests/test_sysconfig.py

diff --git a/sysconfig.py b/sysconfig.py
index 0cfafab99b..2ea7c78b83 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -22,16 +22,17 @@
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
+# Path to the base directory of the project. On Windows the binary may
+# live in project/PCBuild9
+project_base = os.path.dirname(os.path.abspath(sys.executable))
+if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
-
-argv0_path = os.path.dirname(os.path.abspath(sys.executable))
-landmark = os.path.join(argv0_path, "Modules", "Setup")
-
-python_build = os.path.isfile(landmark)
-
-del landmark
+python_build = os.path.isfile(os.path.join(project_base, "Modules",
+                                           "Setup.dist"))
 
 
 def get_python_version():
@@ -185,7 +186,10 @@ def customize_compiler(compiler):
 def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build:
-        inc_dir = argv0_path
+        if os.name == "nt":
+            inc_dir = os.path.join(project_base, "PC")
+        else:
+            inc_dir = project_base
     else:
         inc_dir = get_python_inc(plat_specific=1)
     if get_python_version() < '2.2':
@@ -428,6 +432,8 @@ def _init_nt():
 
     g['SO'] = '.pyd'
     g['EXE'] = ".exe"
+    g['VERSION'] = get_python_version().replace(".", "")
+    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
 
     global _config_vars
     _config_vars = g
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
new file mode 100644
index 0000000000..8337b0d25f
--- /dev/null
+++ b/tests/test_sysconfig.py
@@ -0,0 +1,36 @@
+"""Tests for distutils.dist."""
+
+from distutils import sysconfig
+import os
+import sys
+import unittest
+
+from test.test_support import TESTFN
+
+class SysconfigTestCase(unittest.TestCase):
+
+    def test_get_config_h_filename(self):
+        config_h = sysconfig.get_config_h_filename()
+        self.assert_(os.path.isfile(config_h), config_h)
+
+    def test_get_python_lib(self):
+        lib_dir = sysconfig.get_python_lib()
+        self.assert_(os.path.isdir(lib_dir), lib_dir)
+        # test for pythonxx.lib?
+
+    def test_get_python_inc(self):
+        inc_dir = sysconfig.get_python_inc()
+        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        python_h = os.path.join(inc_dir, "Python.h")
+        self.assert_(os.path.isfile(python_h), python_h)
+
+    def test_get_config_vars(self):
+        cvars = sysconfig.get_config_vars()
+        self.assert_(isinstance(cvars, dict))
+        self.assert_(cvars)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(SysconfigTestCase))
+    return suite

From d1f35e69fb4d6a4e274369771d5d9574e45ecc59 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Thu, 6 Dec 2007 13:55:01 +0000
Subject: [PATCH 1922/8469] Disabled one test that is failing on Unix

---
 tests/test_sysconfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 8337b0d25f..ef7c38bf78 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -15,7 +15,8 @@ def test_get_config_h_filename(self):
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
-        self.assert_(os.path.isdir(lib_dir), lib_dir)
+        # XXX doesn't work on Inux when Python was never installed before
+        #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
 
     def test_get_python_inc(self):

From 115bfed7f4bf7f00580c68cdc64e49e36434e7bb Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 8 Dec 2007 15:33:56 +0000
Subject: [PATCH 1923/8469] Merged revisions 59376-59406 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59377 | georg.brandl | 2007-12-06 01:24:23 +0100 (Thu, 06 Dec 2007) | 2 lines

  Add another GHOP student to ACKS.
........
  r59378 | raymond.hettinger | 2007-12-06 01:56:53 +0100 (Thu, 06 Dec 2007) | 5 lines

  Fix Issue 1045.
  Factor-out common calling code by simplifying the length_hint API.
  Speed-up the function by caching the PyObject_String for the attribute lookup.
........
  r59380 | georg.brandl | 2007-12-06 02:52:24 +0100 (Thu, 06 Dec 2007) | 2 lines

  Diverse markup fixes.
........
  r59383 | georg.brandl | 2007-12-06 10:45:39 +0100 (Thu, 06 Dec 2007) | 2 lines

  Better re.split examples.
........
  r59386 | christian.heimes | 2007-12-06 14:15:13 +0100 (Thu, 06 Dec 2007) | 2 lines

  Fixed get_config_h_filename for Windows. Without the patch it can't find the pyconfig.h file inside a build tree.
  Added several small unit tests for sysconfig.
........
  r59387 | christian.heimes | 2007-12-06 14:30:11 +0100 (Thu, 06 Dec 2007) | 1 line

  Silence more warnings, _CRT_NONSTDC_NO_DEPRECATE is already defined in pyconfig.h but several projects don't include it.
........
  r59389 | christian.heimes | 2007-12-06 14:55:01 +0100 (Thu, 06 Dec 2007) | 1 line

  Disabled one test that is failing on Unix
........
  r59399 | christian.heimes | 2007-12-06 22:13:06 +0100 (Thu, 06 Dec 2007) | 8 lines

  Several Windows related cleanups:
  * Removed a #define from pyconfig.h. The macro was already defined a few lines higher.
  * Fixed path to tix in the build_tkinter.py script
  * Changed make_buildinfo.c to use versions of unlink and strcat which are considered safe by Windows (as suggested by MvL).
  * Removed two defines from pyproject.vsprops that are no longer required. Both are defined in pyconfig.h and make_buildinfo.c doesn't use the unsafe versions any more (as suggested by MvL).
  * Added some more information about PGO and the property files to PCbuild9/readme.txt.

  Are you fine with the changes, Martin?
........
  r59400 | raymond.hettinger | 2007-12-07 02:53:01 +0100 (Fri, 07 Dec 2007) | 4 lines

  Don't have the docs berate themselves.  Keep a professional tone.
  If a todo is needed, put it in the tracker.
........
  r59402 | georg.brandl | 2007-12-07 10:07:10 +0100 (Fri, 07 Dec 2007) | 3 lines

  Increase unit test coverage of SimpleXMLRPCServer.
  Written for GHOP by Turkay Eren.
........
  r59406 | georg.brandl | 2007-12-07 16:16:57 +0100 (Fri, 07 Dec 2007) | 2 lines

  Update to windows doc from Robert.
........
---
 sysconfig.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 70a279938c..191f3d1d18 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -22,13 +22,17 @@
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
+# Path to the base directory of the project. On Windows the binary may
+# live in project/PCBuild9
+project_base = os.path.dirname(os.path.abspath(sys.executable))
+if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
-
-argv0_path = os.path.dirname(os.path.abspath(sys.executable))
-python_build = os.path.isfile(os.path.join(argv0_path, "Modules", "Setup"))
-
+python_build = os.path.isfile(os.path.join(project_base, "Modules",
+                                           "Setup.dist"))
 
 def get_python_version():
     """Return a string containing the major and minor Python version,
@@ -177,7 +181,10 @@ def customize_compiler(compiler):
 def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build:
-        inc_dir = argv0_path
+        if os.name == "nt":
+            inc_dir = os.path.join(project_base, "PC")
+        else:
+            inc_dir = project_base
     else:
         inc_dir = get_python_inc(plat_specific=1)
     if get_python_version() < '2.2':
@@ -402,6 +409,8 @@ def _init_nt():
 
     g['SO'] = '.pyd'
     g['EXE'] = ".exe"
+    g['VERSION'] = get_python_version().replace(".", "")
+    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
 
     global _config_vars
     _config_vars = g

From 329322869d65d079b3bdb40ecba5ecee0bb98d27 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 8 Dec 2007 15:34:59 +0000
Subject: [PATCH 1924/8469] Readded Lib/distutils/tests/test_sysconfig.py
 Somehow it went missing during the merge

---
 tests/test_sysconfig.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tests/test_sysconfig.py

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
new file mode 100644
index 0000000000..ef7c38bf78
--- /dev/null
+++ b/tests/test_sysconfig.py
@@ -0,0 +1,37 @@
+"""Tests for distutils.dist."""
+
+from distutils import sysconfig
+import os
+import sys
+import unittest
+
+from test.test_support import TESTFN
+
+class SysconfigTestCase(unittest.TestCase):
+
+    def test_get_config_h_filename(self):
+        config_h = sysconfig.get_config_h_filename()
+        self.assert_(os.path.isfile(config_h), config_h)
+
+    def test_get_python_lib(self):
+        lib_dir = sysconfig.get_python_lib()
+        # XXX doesn't work on Inux when Python was never installed before
+        #self.assert_(os.path.isdir(lib_dir), lib_dir)
+        # test for pythonxx.lib?
+
+    def test_get_python_inc(self):
+        inc_dir = sysconfig.get_python_inc()
+        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        python_h = os.path.join(inc_dir, "Python.h")
+        self.assert_(os.path.isfile(python_h), python_h)
+
+    def test_get_config_vars(self):
+        cvars = sysconfig.get_config_vars()
+        self.assert_(isinstance(cvars, dict))
+        self.assert_(cvars)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(SysconfigTestCase))
+    return suite

From ed6b063cc4b7549d790cc4f83dcb1bf5fd4f93f6 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Thu, 13 Dec 2007 19:23:16 +0000
Subject: [PATCH 1925/8469] Fixed bug #1613: Makefile's VPATH feature is broken

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2ea7c78b83..aead1a19ba 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -32,7 +32,7 @@
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
 python_build = os.path.isfile(os.path.join(project_base, "Modules",
-                                           "Setup.dist"))
+                                           "Setup.local"))
 
 
 def get_python_version():

From ebbd3f714cc3fb8da8fbc8d2f4daf42fffbef1b9 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 14 Dec 2007 01:24:44 +0000
Subject: [PATCH 1926/8469] Merged revisions 59465-59487 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59467 | georg.brandl | 2007-12-11 17:32:49 +0100 (Tue, 11 Dec 2007) | 2 lines

  Add another GHOP contributor.
........
  r59468 | kurt.kaiser | 2007-12-11 20:35:12 +0100 (Tue, 11 Dec 2007) | 3 lines

  IDLE_tabbedpages.071101.patch Tal Einat
  Cosmetic changes, one bug.  Remove tabpage.py, replaced by tabbedpages.py
........
  r59471 | gerhard.haering | 2007-12-11 22:07:40 +0100 (Tue, 11 Dec 2007) | 9 lines

  Forward-port of commit 59184.

  - Backported a workaround for a bug in SQLite 3.2.x/3.3.x versions where a
    statement recompilation with no bound parameters lead to a segfault
  - Backported a fix necessary because of an SQLite API change in version
    3.5.
    This prevents segfaults when executing empty queries, like our test suite
    does
........
  r59475 | christian.heimes | 2007-12-12 19:09:06 +0100 (Wed, 12 Dec 2007) | 1 line

  Fixed a nasty problem in the xxmodule.c
........
  r59478 | raymond.hettinger | 2007-12-13 01:08:37 +0100 (Thu, 13 Dec 2007) | 1 line

  Fix bug 1604. deque.__init__() did not clear existing contents like list.__init__. Not a backport candidate.
........
  r59480 | alexandre.vassalotti | 2007-12-13 18:58:23 +0100 (Thu, 13 Dec 2007) | 2 lines

  Fix issue #1313119: urlparse "caches" parses regardless of encoding
........
  r59482 | christian.heimes | 2007-12-13 20:23:16 +0100 (Thu, 13 Dec 2007) | 1 line

  Fixed bug #1613: Makefile's VPATH feature is broken
........
  r59484 | guido.van.rossum | 2007-12-13 21:50:10 +0100 (Thu, 13 Dec 2007) | 3 lines

  Patch #1608.  Someone with access to autoconf 2.61 or higher needs to
  run it and check in the resulting configure file.
........
  r59485 | thomas.heller | 2007-12-13 22:20:29 +0100 (Thu, 13 Dec 2007) | 1 line

  Ran autoconf.
........
  r59486 | raymond.hettinger | 2007-12-13 23:55:52 +0100 (Thu, 13 Dec 2007) | 1 line

  Simplify implementation of __replace__()
........
  r59487 | raymond.hettinger | 2007-12-14 00:52:59 +0100 (Fri, 14 Dec 2007) | 1 line

  Small speedup
........
---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 191f3d1d18..c450cd5159 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -32,7 +32,7 @@
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
 python_build = os.path.isfile(os.path.join(project_base, "Modules",
-                                           "Setup.dist"))
+                                           "Setup.local"))
 
 def get_python_version():
     """Return a string containing the major and minor Python version,

From 4e9153cd047c24fc7c7c595885444a4a1e599b8b Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 14 Dec 2007 23:42:36 +0000
Subject: [PATCH 1927/8469] Fixed bug #1628 The detection now works on Unix
 with Makefile, Makefile with VPATH and on Windows.

---
 sysconfig.py            | 6 ++++--
 tests/test_sysconfig.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index aead1a19ba..32b165ffd1 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -31,8 +31,10 @@
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
-python_build = os.path.isfile(os.path.join(project_base, "Modules",
-                                           "Setup.local"))
+# Setup.local is available for Makefile builds including VPATH builds,
+# Setup.dist is available on Windows
+python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn))
+                   for fn in ("Setup.dist", "Setup.local"))
 
 
 def get_python_version():
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index ef7c38bf78..770b7c376f 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -15,7 +15,7 @@ def test_get_config_h_filename(self):
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
-        # XXX doesn't work on Inux when Python was never installed before
+        # XXX doesn't work on Linux when Python was never installed before
         #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
 

From 0f89abbb94e9b4c48d3a5356c564b31862602227 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 15 Dec 2007 01:27:15 +0000
Subject: [PATCH 1928/8469] Merged revisions 59488-59511 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59489 | christian.heimes | 2007-12-14 03:33:57 +0100 (Fri, 14 Dec 2007) | 1 line

  Silence a warning about an unsed variable in debug builds
........
  r59490 | christian.heimes | 2007-12-14 03:35:23 +0100 (Fri, 14 Dec 2007) | 2 lines

  Fixed bug #1620: New @spam.getter property syntax modifies the property in place.
  I added also the feature that a @prop.getter decorator does not overwrite the doc string of the property if it was given as an argument to property().
........
  r59491 | raymond.hettinger | 2007-12-14 03:49:47 +0100 (Fri, 14 Dec 2007) | 1 line

  Cleaner method naming convention
........
  r59492 | christian.heimes | 2007-12-14 04:02:34 +0100 (Fri, 14 Dec 2007) | 1 line

  Fixed a warning in _codecs_iso2022.c and some non C89 conform // comments.
........
  r59493 | christian.heimes | 2007-12-14 05:38:13 +0100 (Fri, 14 Dec 2007) | 1 line

  Fixed warning in ssl module
........
  r59500 | raymond.hettinger | 2007-12-14 19:08:20 +0100 (Fri, 14 Dec 2007) | 1 line

  Add line spacing for readability
........
  r59501 | raymond.hettinger | 2007-12-14 19:12:21 +0100 (Fri, 14 Dec 2007) | 3 lines

  Update method names for named tuples.
........
  r59503 | georg.brandl | 2007-12-14 20:03:36 +0100 (Fri, 14 Dec 2007) | 3 lines

  Add a section about nested listcomps to the tutorial.
  Thanks to Ian Bruntlett and Robert Lehmann.
........
  r59504 | raymond.hettinger | 2007-12-14 20:19:59 +0100 (Fri, 14 Dec 2007) | 1 line

  Faster and simpler _replace() method
........
  r59505 | raymond.hettinger | 2007-12-14 22:51:50 +0100 (Fri, 14 Dec 2007) | 1 line

  Add usage note
........
  r59507 | andrew.kuchling | 2007-12-14 23:41:18 +0100 (Fri, 14 Dec 2007) | 1 line

  Remove warning about URL
........
  r59510 | andrew.kuchling | 2007-12-14 23:52:36 +0100 (Fri, 14 Dec 2007) | 1 line

  Bump the version number, and make a few small edits
........
  r59511 | christian.heimes | 2007-12-15 00:42:36 +0100 (Sat, 15 Dec 2007) | 2 lines

  Fixed bug #1628
  The detection now works on Unix with Makefile, Makefile with VPATH and on Windows.
........
---
 sysconfig.py            | 6 ++++--
 tests/test_sysconfig.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index c450cd5159..ba89c3b864 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -31,8 +31,10 @@
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
-python_build = os.path.isfile(os.path.join(project_base, "Modules",
-                                           "Setup.local"))
+# Setup.local is available for Makefile builds including VPATH builds,
+# Setup.dist is available on Windows
+python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn))
+                   for fn in ("Setup.dist", "Setup.local"))
 
 def get_python_version():
     """Return a string containing the major and minor Python version,
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index ef7c38bf78..770b7c376f 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -15,7 +15,7 @@ def test_get_config_h_filename(self):
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
-        # XXX doesn't work on Inux when Python was never installed before
+        # XXX doesn't work on Linux when Python was never installed before
         #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
 

From c8533b41bab447f51d5e375f239163fcaafdd633 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 31 Dec 2007 14:47:07 +0000
Subject: [PATCH 1929/8469] Added wininst-9.0.exe executable for VS 2008
 Integrated bdist_wininst into PCBuild9 directory

---
 command/bdist_wininst.py                   |   2 +-
 command/{wininst-6.exe => wininst-6.0.exe} | Bin
 command/{wininst-8.exe => wininst-8.0.exe} | Bin
 command/wininst-9.0.exe                    | Bin 0 -> 65536 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename command/{wininst-6.exe => wininst-6.0.exe} (100%)
 rename command/{wininst-8.exe => wininst-8.0.exe} (100%)
 create mode 100644 command/wininst-9.0.exe

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 49afca0472..b0691fb823 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -323,6 +323,6 @@ def get_exe_bytes (self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        filename = os.path.join(directory, "wininst-%s.exe" % bv)
+        filename = os.path.join(directory, "wininst-%.1f.exe" % bv)
         return open(filename, "rb").read()
 # class bdist_wininst
diff --git a/command/wininst-6.exe b/command/wininst-6.0.exe
similarity index 100%
rename from command/wininst-6.exe
rename to command/wininst-6.0.exe
diff --git a/command/wininst-8.exe b/command/wininst-8.0.exe
similarity index 100%
rename from command/wininst-8.exe
rename to command/wininst-8.0.exe
diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
new file mode 100644
index 0000000000000000000000000000000000000000..5e0144c92b58ea750211c540d15667e0b1d1a356
GIT binary patch
literal 65536
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
F{~Ng+{m}pb

literal 0
HcmV?d00001


From 20578b2770e9e8bde5d669aa0764d003797da988 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Mon, 31 Dec 2007 16:14:33 +0000
Subject: [PATCH 1930/8469] Merged revisions 59605-59624 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines

  Some cleanup in the docs.
........
  r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines

  Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
  r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line

  Simpler documentation for itertools.tee().  Should be backported.
........
  r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line

  Improve docs for itertools.groupby().  The use of xrange(0) to create a unique object is less obvious than object().
........
  r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines

  Added wininst-9.0.exe executable for VS 2008
  Integrated bdist_wininst into PCBuild9 directory
........
  r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line

  Moved PCbuild directory to PC/VS7.1
........
  r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line

  Fix paths for build bot
........
  r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line

  Fix paths for build bot, part 2
........
  r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line

  Renamed PCBuild9 directory to PCBuild
........
---
 command/bdist_wininst.py                   |   2 +-
 command/{wininst-6.exe => wininst-6.0.exe} | Bin
 command/{wininst-8.exe => wininst-8.0.exe} | Bin
 command/wininst-9.0.exe                    | Bin 0 -> 65536 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename command/{wininst-6.exe => wininst-6.0.exe} (100%)
 rename command/{wininst-8.exe => wininst-8.0.exe} (100%)
 create mode 100644 command/wininst-9.0.exe

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 249b74c1bb..2d75a38f74 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -304,5 +304,5 @@ def get_exe_bytes(self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        filename = os.path.join(directory, "wininst-%s.exe" % bv)
+        filename = os.path.join(directory, "wininst-%.1f.exe" % bv)
         return open(filename, "rb").read()
diff --git a/command/wininst-6.exe b/command/wininst-6.0.exe
similarity index 100%
rename from command/wininst-6.exe
rename to command/wininst-6.0.exe
diff --git a/command/wininst-8.exe b/command/wininst-8.0.exe
similarity index 100%
rename from command/wininst-8.exe
rename to command/wininst-8.0.exe
diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
new file mode 100644
index 0000000000000000000000000000000000000000..5e0144c92b58ea750211c540d15667e0b1d1a356
GIT binary patch
literal 65536
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
F{~Ng+{m}pb

literal 0
HcmV?d00001


From 96dcf00b8e1a2ee3bdf5b0edbde4f28088a40f0a Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 1 Jan 2008 14:37:32 +0000
Subject: [PATCH 1931/8469] Added support for new Windows build dirs in PC/ to
 distutils.sysconfig

---
 sysconfig.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 32b165ffd1..3cd647becc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -27,6 +27,10 @@
 project_base = os.path.dirname(os.path.abspath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+# PC/VS7.1
+if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use

From fdbce281befb4d8d7bf3c90e9a37f33164da71f7 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 1 Jan 2008 14:42:15 +0000
Subject: [PATCH 1932/8469] Merged revisions 59628-59641 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59631 | christian.heimes | 2007-12-31 20:16:56 +0100 (Mon, 31 Dec 2007) | 1 line

  Fixed path
........
  r59632 | christian.heimes | 2007-12-31 20:20:57 +0100 (Mon, 31 Dec 2007) | 1 line

  Fixed path to _ssl.c in Windows make file
........
  r59633 | christian.heimes | 2007-12-31 20:23:22 +0100 (Mon, 31 Dec 2007) | 1 line

  Fixed path to _ssl.c in Windows make file, take two
........
  r59634 | christian.heimes | 2007-12-31 20:25:22 +0100 (Mon, 31 Dec 2007) | 1 line

  Fixed path to _ssl.c in Windows make file, take three ...
........
  r59635 | neal.norwitz | 2008-01-01 00:48:47 +0100 (Tue, 01 Jan 2008) | 1 line

  Fix refleak
........
  r59637 | guido.van.rossum | 2008-01-01 05:15:29 +0100 (Tue, 01 Jan 2008) | 5 lines

  Fix an odd error which would only occur close to new year's eve, due
  to use of datetime.datetime.now() instead of utcnow() for comparison.
  (I think the test can still fail if it's executed pretty much *at*
  new year's eve, but that's not worth fixing.)
........
  r59638 | christian.heimes | 2008-01-01 14:40:26 +0100 (Tue, 01 Jan 2008) | 1 line

  MSI uses back slashes as path separators
........
  r59639 | christian.heimes | 2008-01-01 14:52:57 +0100 (Tue, 01 Jan 2008) | 1 line

  Added new wininst files to msi.py and adjusted some paths
........
  r59640 | christian.heimes | 2008-01-01 14:58:16 +0100 (Tue, 01 Jan 2008) | 1 line

  The root of the project is two levels up from PC/VS7.1
........
  r59641 | christian.heimes | 2008-01-01 15:37:32 +0100 (Tue, 01 Jan 2008) | 1 line

  Added support for new Windows build dirs in PC/ to distutils.sysconfig
........
---
 sysconfig.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index ba89c3b864..4d790ccbe5 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -27,6 +27,10 @@
 project_base = os.path.dirname(os.path.abspath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+# PC/VS7.1
+if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use

From 30e73c78342c8397efc90d0c9dfbd9f1a7aebf8c Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 2 Jan 2008 18:59:36 +0000
Subject: [PATCH 1933/8469] Patch #1696.  Don't attempt to call None.close() in
 dry-run mode.

---
 command/build_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index bda4480ca5..d26fe94b7e 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -111,7 +111,8 @@ def copy_scripts (self):
                 if f:
                     f.close()
             else:
-                f.close()
+                if f:
+                    f.close()
                 self.copy_file(script, outfile)
 
         if os.name == 'posix':

From 667a1ea083db9823c816fd690d6d61ca0d931710 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 2 Jan 2008 19:00:46 +0000
Subject: [PATCH 1934/8469] Patch #1696.  Don't attempt to close None in
 dry-run mode.

---
 command/build_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index b4810c3eac..6af363b36d 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -112,7 +112,8 @@ def copy_scripts (self):
                 if f:
                     f.close()
             else:
-                f.close()
+                if f:
+                    f.close()
                 self.copy_file(script, outfile)
 
         if os.name == 'posix':

From 2f672dbe9907466088c0283b1ad4bc23b23107b9 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Thu, 3 Jan 2008 23:01:04 +0000
Subject: [PATCH 1935/8469] Merged revisions 59666-59679 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line

  Made vs9to8 Unix compatible
........
  r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines

  Patch #1696.  Don't attempt to close None in dry-run mode.
........
  r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines

  Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
  the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
  r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
  documentation. The only significant difference is that round(x) returns a float
  to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
  r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line

  Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
  r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines

  Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
  Regular Expression inline flags not handled correctly for some unicode
  characters.  (Forward port from 2.5.2.)
........
  r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line

  Added math.isinf() and math.isnan()
........
  r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line

  Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
  r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines

  Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
  Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
  r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line

  Added copysign(x, y) function to the math module
........
---
 command/build_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 227bb9c7a1..7b44264cc2 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -110,7 +110,8 @@ def copy_scripts(self):
                 if f:
                     f.close()
             else:
-                f.close()
+                if f:
+                    f.close()
                 self.copy_file(script, outfile)
 
         if os.name == 'posix':

From 8b891e185114ca8306b56c80aef8866034f179c8 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 6 Jan 2008 21:13:42 +0000
Subject: [PATCH 1936/8469] Fix more exception slicing.

---
 file_util.py | 2 +-
 spawn.py     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/file_util.py b/file_util.py
index e29e90e6d7..69190601fb 100644
--- a/file_util.py
+++ b/file_util.py
@@ -139,7 +139,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
             macostools.copy(src, dst, 0, preserve_times)
         except os.error as exc:
             raise DistutilsFileError(
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]))
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
 
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
diff --git a/spawn.py b/spawn.py
index 0aee2bc3eb..4c536d28af 100644
--- a/spawn.py
+++ b/spawn.py
@@ -67,7 +67,7 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
         except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
             raise DistutilsExecError(
@@ -88,7 +88,7 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
         except OSError as exc:
             # this seems to happen when the command isn't found
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
             print("command '%s' failed with exit status %d" % (cmd[0], rc))
@@ -124,7 +124,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
                 if exc.errno == errno.EINTR:
                     continue
                 raise DistutilsExecError(
-                      "command '%s' failed: %s" % (cmd[0], exc[-1]))
+                      "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
             if os.WIFSIGNALED(status):
                 raise DistutilsExecError(
                       "command '%s' terminated by signal %d"

From 60d10b8328e3c77e3e722bb4015477c9ac7854dd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 6 Jan 2008 21:41:49 +0000
Subject: [PATCH 1937/8469] Missed one because of indirection.

---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index e0ae2e5ea2..917f1d0b93 100644
--- a/util.py
+++ b/util.py
@@ -269,7 +269,7 @@ def grok_environment_error (exc, prefix="error: "):
             # include the filename in the exception object!
             error = prefix + "%s" % exc.strerror
     else:
-        error = prefix + str(exc[-1])
+        error = prefix + str(exc.args[-1])
 
     return error
 

From c39e9fa5952a01de7527da5fc1ec0d04451e300e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 21 Jan 2008 17:42:40 +0000
Subject: [PATCH 1938/8469] #1530959: change distutils build dir for
 --with-pydebug python builds.

---
 command/build.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/build.py b/command/build.py
index 9ae0a292a3..bca031f730 100644
--- a/command/build.py
+++ b/command/build.py
@@ -69,6 +69,12 @@ def finalize_options (self):
 
         plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
 
+        # Make it so Python 2.x and Python 2.x with --with-pydebug don't
+        # share the same build directories. Doing so confuses the build
+        # process for C modules
+        if hasattr(sys, 'gettotalrefcount'):
+            plat_specifier += '-pydebug'
+
         # 'build_purelib' and 'build_platlib' just default to 'lib' and
         # 'lib.<plat>' under the base build directory.  We only use one of
         # them for a given distribution, though --

From 32ff6ab5969de182ade4a74e0159e28e301d79d7 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 21 Jan 2008 20:36:10 +0000
Subject: [PATCH 1939/8469] Merged revisions
 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60151 | christian.heimes | 2008-01-21 14:11:15 +0100 (Mon, 21 Jan 2008) | 1 line

  A bunch of header files were not listed as dependencies for object files. Changes to files like Parser/parser.h weren't picked up by make.
........
  r60152 | georg.brandl | 2008-01-21 15:16:46 +0100 (Mon, 21 Jan 2008) | 3 lines

  #1087741: make mmap.mmap the type of mmap objects, not a
  factory function. Allow it to be subclassed.
........
  r60153 | georg.brandl | 2008-01-21 15:18:14 +0100 (Mon, 21 Jan 2008) | 2 lines

  mmap is an extension module.
........
  r60154 | georg.brandl | 2008-01-21 17:28:13 +0100 (Mon, 21 Jan 2008) | 2 lines

  Fix example.
........
  r60155 | georg.brandl | 2008-01-21 17:34:07 +0100 (Mon, 21 Jan 2008) | 2 lines

  #1555501: document plistlib and move it to the general library.
........
  r60156 | georg.brandl | 2008-01-21 17:36:00 +0100 (Mon, 21 Jan 2008) | 2 lines

  Add a stub for bundlebuilder documentation.
........
  r60157 | georg.brandl | 2008-01-21 17:46:58 +0100 (Mon, 21 Jan 2008) | 2 lines

  Removing bundlebuilder docs again -- it's not to be used anymore (see #779825).
........
  r60158 | georg.brandl | 2008-01-21 17:51:51 +0100 (Mon, 21 Jan 2008) | 2 lines

  #997912: acknowledge nested scopes in tutorial.
........
  r60159 | vinay.sajip | 2008-01-21 18:02:26 +0100 (Mon, 21 Jan 2008) | 1 line

  Fix: #1836: Off-by-one bug in TimedRotatingFileHandler rollover calculation. Patch thanks to Kathryn M. Kowalski.
........
  r60161 | georg.brandl | 2008-01-21 18:13:03 +0100 (Mon, 21 Jan 2008) | 2 lines

  Adapt pydoc to new doc URLs.
........
  r60162 | georg.brandl | 2008-01-21 18:17:00 +0100 (Mon, 21 Jan 2008) | 2 lines

  Fix old link.
........
  r60163 | georg.brandl | 2008-01-21 18:22:06 +0100 (Mon, 21 Jan 2008) | 2 lines

  #1726198: replace while 1: fp.readline() with file iteration.
........
  r60164 | georg.brandl | 2008-01-21 18:29:23 +0100 (Mon, 21 Jan 2008) | 2 lines

  Clarify $ behavior in re docstring. #1631394.
........
  r60165 | vinay.sajip | 2008-01-21 18:39:22 +0100 (Mon, 21 Jan 2008) | 1 line

  Minor documentation change - hyperlink tidied up.
........
  r60166 | georg.brandl | 2008-01-21 18:42:40 +0100 (Mon, 21 Jan 2008) | 2 lines

  #1530959: change distutils build dir for --with-pydebug python builds.
........
  r60167 | vinay.sajip | 2008-01-21 19:16:05 +0100 (Mon, 21 Jan 2008) | 1 line

  Updated to include news on recent logging fixes and documentation changes.
........
  r60168 | georg.brandl | 2008-01-21 19:35:49 +0100 (Mon, 21 Jan 2008) | 3 lines

  Issue #1882: when compiling code from a string, encoding cookies in the
  second line of code were not always recognized correctly.
........
  r60170 | georg.brandl | 2008-01-21 19:36:51 +0100 (Mon, 21 Jan 2008) | 2 lines

  Add NEWS entry for #1882.
........
  r60172 | georg.brandl | 2008-01-21 19:41:24 +0100 (Mon, 21 Jan 2008) | 2 lines

  Use original location of document, which has translations.
........
  r60173 | walter.doerwald | 2008-01-21 21:18:04 +0100 (Mon, 21 Jan 2008) | 2 lines

  Follow PEP 8 in module docstring.
........
  r60175 | georg.brandl | 2008-01-21 21:20:53 +0100 (Mon, 21 Jan 2008) | 2 lines

  Adapt to latest doctools refactoring.
........
---
 command/build.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/build.py b/command/build.py
index 1f2ce06205..4fe95b0cfb 100644
--- a/command/build.py
+++ b/command/build.py
@@ -66,6 +66,12 @@ def initialize_options(self):
     def finalize_options(self):
         plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
 
+        # Make it so Python 2.x and Python 2.x with --with-pydebug don't
+        # share the same build directories. Doing so confuses the build
+        # process for C modules
+        if hasattr(sys, 'gettotalrefcount'):
+            plat_specifier += '-pydebug'
+
         # 'build_purelib' and 'build_platlib' just default to 'lib' and
         # 'lib.<plat>' under the base build directory.  We only use one of
         # them for a given distribution, though --

From ef21fafddb93c89ba8bed432a50727c45d2132e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Fri, 1 Feb 2008 22:58:17 +0000
Subject: [PATCH 1940/8469] Bump distutils version number to match Python
 version.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 86ad44fe3a..8c954c2238 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,4 +20,4 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.5.1"
+__version__ = "2.6.0"

From 2f0340a9ac492d58a9220fe9eef0daccdf997b56 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 3 Feb 2008 14:34:18 +0000
Subject: [PATCH 1941/8469] Fixed paths to Windows build directories in
 build_ext.py Use vsbuild instead of devenv in build.bat and _bsddb.vcproj

---
 command/build_ext.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ecfa177d76..29d5668c61 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -182,13 +182,13 @@ def finalize_options (self):
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
             if MSVC_VERSION == 9:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild9'))
+                                         'PCbuild'))
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild8', 'win32release'))
+                                         'PC', 'VS8.0', 'win32release'))
             else:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild'))
+                                         'PC', 'VS7.1'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory

From e5260241bc5e4e91531a72a9efd5b0f46ad8704e Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 3 Feb 2008 16:51:08 +0000
Subject: [PATCH 1942/8469] Merged revisions
 60481,60485,60489-60520,60523-60527,60530-60533,60535-60538,60540-60551 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

NOTE: I blocked the following revisions:
      svnmerge.py block -r 60521,60522,60528,60529,60534,60539
      The new tests must be merged with lots of manual work.

........
  r60493 | georg.brandl | 2008-02-01 12:59:08 +0100 (Fri, 01 Feb 2008) | 2 lines

  Update IPv6 RFC number.
........
  r60497 | georg.brandl | 2008-02-01 16:50:15 +0100 (Fri, 01 Feb 2008) | 2 lines

  Add link checker builder, written for GHOP by Thomas Lamb.
........
  r60500 | georg.brandl | 2008-02-01 19:08:09 +0100 (Fri, 01 Feb 2008) | 2 lines

  Rename batch file.
........
  r60504 | christian.heimes | 2008-02-01 19:49:26 +0100 (Fri, 01 Feb 2008) | 1 line

  More int -> pid_t.
........
  r60507 | georg.brandl | 2008-02-01 20:24:01 +0100 (Fri, 01 Feb 2008) | 2 lines

  Wording nit.
........
  r60510 | georg.brandl | 2008-02-01 21:45:33 +0100 (Fri, 01 Feb 2008) | 2 lines

  Update for latest sphinx latex writer.
........
  r60511 | raymond.hettinger | 2008-02-01 22:30:23 +0100 (Fri, 01 Feb 2008) | 1 line

  Issue #1996: float.as_integer_ratio() should return fraction in lowest terms.
........
  r60512 | raymond.hettinger | 2008-02-01 23:15:52 +0100 (Fri, 01 Feb 2008) | 1 line

  Integer ratio should return ints instead of longs whereever possible.
........
  r60513 | raymond.hettinger | 2008-02-01 23:22:50 +0100 (Fri, 01 Feb 2008) | 1 line

  labs() takes a long for an input.
........
  r60514 | raymond.hettinger | 2008-02-01 23:42:59 +0100 (Fri, 01 Feb 2008) | 1 line

  Test round-trip on float.as_integer_ratio() and float.__truediv__().
........
  r60515 | marc-andre.lemburg | 2008-02-01 23:58:17 +0100 (Fri, 01 Feb 2008) | 3 lines

  Bump distutils version number to match Python version.
........
  r60516 | raymond.hettinger | 2008-02-02 00:12:19 +0100 (Sat, 02 Feb 2008) | 1 line

  Fix int/long typecase.  Add check for non-binary floating point.
........
  r60517 | raymond.hettinger | 2008-02-02 00:45:44 +0100 (Sat, 02 Feb 2008) | 1 line

  Add protection from weirdness while scaling the mantissa to an integer.
........
  r60518 | raymond.hettinger | 2008-02-02 06:11:40 +0100 (Sat, 02 Feb 2008) | 1 line

  Simpler solution to handling non-IEEE 754 environments.
........
  r60519 | raymond.hettinger | 2008-02-02 06:24:44 +0100 (Sat, 02 Feb 2008) | 1 line

  Neaten-up a bit.
........
  r60520 | georg.brandl | 2008-02-02 10:56:20 +0100 (Sat, 02 Feb 2008) | 2 lines

  Amendments to the urllib2 docs, written for GHOP by Thomas Lamb.
........
  r60525 | georg.brandl | 2008-02-02 11:49:58 +0100 (Sat, 02 Feb 2008) | 3 lines

  Add email example how to send a multipart message.
  Written for GHOP by Martin Matejek.
........
  r60526 | georg.brandl | 2008-02-02 12:05:00 +0100 (Sat, 02 Feb 2008) | 2 lines

  Rewrite test_socketserver as unittest, written for GHOP by Benjamin Petersen.
........
  r60527 | georg.brandl | 2008-02-02 12:05:34 +0100 (Sat, 02 Feb 2008) | 2 lines

  Add GHOP contributor.
........
  r60530 | mark.dickinson | 2008-02-02 18:16:13 +0100 (Sat, 02 Feb 2008) | 2 lines

  Make the Rational constructor accept '3.' and '.2' as well as '3.2'.
........
  r60531 | neal.norwitz | 2008-02-02 19:52:51 +0100 (Sat, 02 Feb 2008) | 1 line

  Update the leaky tests (ie, ignore these tests if they report leaks).  This version has been running for a while.
........
  r60533 | skip.montanaro | 2008-02-02 20:11:57 +0100 (Sat, 02 Feb 2008) | 7 lines

  Split the refleak mail body into two parts, the first being those failing
  tests which are deemed more important issues, the second those which are
  known to have difficult to solve problems and are generally expected to
  leak.  Hopefully this doesn't break the script...
........
  r60535 | georg.brandl | 2008-02-03 01:04:50 +0100 (Sun, 03 Feb 2008) | 3 lines

  Wait for a delay before reaping children -- this should fix the
  test_socketserver failures on several platforms.
........
  r60536 | brett.cannon | 2008-02-03 03:07:55 +0100 (Sun, 03 Feb 2008) | 2 lines

  Fix a minor typo.
........
  r60537 | brett.cannon | 2008-02-03 03:08:45 +0100 (Sun, 03 Feb 2008) | 3 lines

  Directories from CPPFLAGS and LDFLAGS were being added in the reverse order for
  searches as to how they were listed in the environment variable.
........
  r60538 | brett.cannon | 2008-02-03 03:34:14 +0100 (Sun, 03 Feb 2008) | 2 lines

  Remove extra tick marks and add a missing closing parenthesis.
........
  r60540 | andrew.macintyre | 2008-02-03 07:58:06 +0100 (Sun, 03 Feb 2008) | 2 lines

  Update OS/2 EMX build bits for 2.6.
........
  r60541 | andrew.macintyre | 2008-02-03 08:01:11 +0100 (Sun, 03 Feb 2008) | 2 lines

  Rename module definition file to reflect v2.6.
........
  r60542 | andrew.macintyre | 2008-02-03 08:07:31 +0100 (Sun, 03 Feb 2008) | 6 lines

  The wrapper function is supposed to be for spawnvpe() so that's
  what we should call [this wrapper only available on OS/2].

  Backport candidate to 2.5.
........
  r60544 | gregory.p.smith | 2008-02-03 08:20:53 +0100 (Sun, 03 Feb 2008) | 6 lines

  Merge this fix from the pybsddb tree:
  r293 | jcea | 2008-01-31 01:08:19 -0800 (Thu, 31 Jan 2008) | 4 lines

  Solved memory leak when using cursors with
  databases without environment.
........
  r60546 | gregory.p.smith | 2008-02-03 09:01:46 +0100 (Sun, 03 Feb 2008) | 2 lines

  remove a repeated occurance of a hardcoded berkeleydb library version number
........
  r60549 | brett.cannon | 2008-02-03 10:59:21 +0100 (Sun, 03 Feb 2008) | 2 lines

  Add an entry for r60537.
........
  r60550 | georg.brandl | 2008-02-03 13:29:00 +0100 (Sun, 03 Feb 2008) | 2 lines

  #2003: fix sentence.
........
  r60551 | christian.heimes | 2008-02-03 15:34:18 +0100 (Sun, 03 Feb 2008) | 2 lines

  Fixed paths to Windows build directories in build_ext.py
  Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
........
---
 __init__.py          | 2 +-
 command/build_ext.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/__init__.py b/__init__.py
index f71c3adb14..0c3d939dc3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -18,4 +18,4 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.5.1"
+__version__ = "2.6.0"
diff --git a/command/build_ext.py b/command/build_ext.py
index 6d42278e40..ff84bca7a0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -178,13 +178,13 @@ def finalize_options(self):
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
             if MSVC_VERSION == 9:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild9'))
+                                         'PCbuild'))
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild8', 'win32release'))
+                                         'PC', 'VS8.0', 'win32release'))
             else:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCBuild'))
+                                         'PC', 'VS7.1'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory

From 21a51933d80f59b70313d7fb9689ed54093944fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Tue, 5 Feb 2008 14:50:40 +0000
Subject: [PATCH 1943/8469] Keep distutils Python 2.1 compatible (or even
 Python 2.4 in this case).

---
 sysconfig.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3cd647becc..1aaaa28fbf 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -37,8 +37,12 @@
 # different (hard-wired) directories.
 # Setup.local is available for Makefile builds including VPATH builds,
 # Setup.dist is available on Windows
-python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn))
-                   for fn in ("Setup.dist", "Setup.local"))
+def _python_build():
+    for fn in ("Setup.dist", "Setup.local"):
+        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
+            return True
+    return False
+python_build = _python_build()
 
 
 def get_python_version():

From 71947cc1efed4a4f2ce1980ac465d70ea2542f29 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 6 Feb 2008 14:31:34 +0000
Subject: [PATCH 1944/8469] Merged revisions
 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60568 | christian.heimes | 2008-02-04 19:48:38 +0100 (Mon, 04 Feb 2008) | 1 line

  Increase debugging to investige failing tests on some build bots
........
  r60570 | christian.heimes | 2008-02-04 20:30:05 +0100 (Mon, 04 Feb 2008) | 1 line

  Small adjustments for test compact freelist test. It's no passing on Windows as well.
........
  r60573 | amaury.forgeotdarc | 2008-02-04 21:53:14 +0100 (Mon, 04 Feb 2008) | 2 lines

  Correct quotes in NEWS file
........
  r60575 | amaury.forgeotdarc | 2008-02-04 22:45:05 +0100 (Mon, 04 Feb 2008) | 13 lines

  #1750076: Debugger did not step on every iteration of a while statement.

  The mapping between bytecode offsets and source lines (lnotab) did not contain
  an entry for the beginning of the loop.

  Now it does, and the lnotab can be a bit larger:
  in particular, several statements on the same line generate several entries.
  However, this does not bother the settrace function, which will trigger only
  one 'line' event.

  The lnotab seems to be exactly the same as with python2.4.
........
  r60584 | amaury.forgeotdarc | 2008-02-05 01:26:21 +0100 (Tue, 05 Feb 2008) | 3 lines

  Change r60575 broke test_compile:
  there is no need to emit co_lnotab item when both offsets are zeros.
........
  r60587 | skip.montanaro | 2008-02-05 03:32:16 +0100 (Tue, 05 Feb 2008) | 1 line

  sync with most recent version from python-mode sf project
........
  r60588 | lars.gustaebel | 2008-02-05 12:51:40 +0100 (Tue, 05 Feb 2008) | 5 lines

  Issue #2004: Use mode 0700 for temporary directories and default
  permissions for missing directories.

  (will backport to 2.5)
........
  r60590 | georg.brandl | 2008-02-05 13:01:24 +0100 (Tue, 05 Feb 2008) | 2 lines

  Convert external links to internal links. Fixes #2010.
........
  r60592 | marc-andre.lemburg | 2008-02-05 15:50:40 +0100 (Tue, 05 Feb 2008) | 3 lines

  Keep distutils Python 2.1 compatible (or even Python 2.4 in this case).
........
  r60593 | andrew.kuchling | 2008-02-05 17:06:57 +0100 (Tue, 05 Feb 2008) | 5 lines

  Update PEP URL.
  (This code is duplicated between pydoc and DocXMLRPCServer; maybe it
  should be refactored as a GHOP project.)

  2.5.2 backport candidate.
........
  r60596 | guido.van.rossum | 2008-02-05 18:32:15 +0100 (Tue, 05 Feb 2008) | 2 lines

  In the experimental 'Scanner' feature, the group count was set wrong.
........
  r60602 | facundo.batista | 2008-02-05 20:03:32 +0100 (Tue, 05 Feb 2008) | 3 lines


  Issue 1951. Converts wave test cases to unittest.
........
  r60603 | georg.brandl | 2008-02-05 20:07:10 +0100 (Tue, 05 Feb 2008) | 2 lines

  Actually run the test.
........
  r60604 | skip.montanaro | 2008-02-05 20:24:30 +0100 (Tue, 05 Feb 2008) | 2 lines

  correct object name
........
  r60605 | georg.brandl | 2008-02-05 20:58:17 +0100 (Tue, 05 Feb 2008) | 7 lines

  * Use the same code to profile for test_profile and test_cprofile.
  * Convert both to unittest.
  * Use the same unit testing code.
  * Include the expected output in both test files.
  * Make it possible to regenerate the expected output by running
    the file as a script with an '-r' argument.
........
  r60613 | raymond.hettinger | 2008-02-06 02:49:00 +0100 (Wed, 06 Feb 2008) | 1 line

  Sync-up with Py3k work.
........
  r60614 | christian.heimes | 2008-02-06 13:44:34 +0100 (Wed, 06 Feb 2008) | 1 line

  Limit free list of method and builtin function objects to 256 entries each.
........
  r60616 | christian.heimes | 2008-02-06 14:33:44 +0100 (Wed, 06 Feb 2008) | 7 lines

  Unified naming convention for free lists and their limits. All free lists
  in Object/ are named ``free_list``, the counter ``numfree`` and the upper
  limit is a macro ``PyName_MAXFREELIST`` inside an #ifndef block.

  The chances should make it easier to adjust Python for platforms with
  less memory, e.g. mobile phones.
........
---
 sysconfig.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 4d790ccbe5..39216a532f 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -37,8 +37,12 @@
 # different (hard-wired) directories.
 # Setup.local is available for Makefile builds including VPATH builds,
 # Setup.dist is available on Windows
-python_build = any(os.path.isfile(os.path.join(project_base, "Modules", fn))
-                   for fn in ("Setup.dist", "Setup.local"))
+def _python_build():
+    for fn in ("Setup.dist", "Setup.local"):
+        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
+            return True
+    return False
+python_build = _python_build()
 
 def get_python_version():
     """Return a string containing the major and minor Python version,

From b1165a0f3caf19626c96f1b397bd52a9d1c080f4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 21 Feb 2008 14:23:38 +0000
Subject: [PATCH 1945/8469] Close manifest file. This change doesn't make any
 difference to CPython, but is a necessary fix for Jython.

---
 command/sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/command/sdist.py b/command/sdist.py
index 3dfe6f21a7..a06b1953b4 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -383,6 +383,7 @@ def read_manifest (self):
             if line[-1] == '\n':
                 line = line[0:-1]
             self.filelist.append(line)
+        manifest.close()
 
     # read_manifest ()
 

From 36bf11e144f03aaf5cce1d8cd8efcdc1e3a53b35 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 21 Feb 2008 18:18:37 +0000
Subject: [PATCH 1946/8469] Removed uses of dict.has_key() from distutils, and
 uses of callable() from copy_reg.py, so the interpreter now starts up without
 warnings when '-3' is given.  More work like this needs to be done in the
 rest of the stdlib.

---
 archive_util.py      |  2 +-
 ccompiler.py         |  2 +-
 command/build_ext.py |  2 +-
 command/install.py   |  2 +-
 command/register.py  |  4 ++--
 command/upload.py    |  2 +-
 core.py              |  6 +++---
 dir_util.py          |  2 +-
 dist.py              |  8 ++++----
 fancy_getopt.py      |  8 ++++----
 msvccompiler.py      |  2 +-
 sysconfig.py         | 22 +++++++++++-----------
 text_file.py         |  4 ++--
 util.py              |  6 +++---
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 6aa5e635d7..a9c6a5b488 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -124,7 +124,7 @@ def visit (z, dirname, names):
 
 def check_archive_formats (formats):
     for format in formats:
-        if not ARCHIVE_FORMATS.has_key(format):
+        if format not in ARCHIVE_FORMATS:
             return format
     else:
         return None
diff --git a/ccompiler.py b/ccompiler.py
index 1349abeb65..0ed9a40a35 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -159,7 +159,7 @@ class (via the 'executables' class attribute), but most will have:
         # basically the same things with Unix C compilers.
 
         for key in args.keys():
-            if not self.executables.has_key(key):
+            if key not in self.executables:
                 raise ValueError, \
                       "unknown executable '%s' for class %s" % \
                       (key, self.__class__.__name__)
diff --git a/command/build_ext.py b/command/build_ext.py
index 29d5668c61..3042fe0223 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -362,7 +362,7 @@ def check_extensions_list (self, extensions):
 
             # Medium-easy stuff: same syntax/semantics, different names.
             ext.runtime_library_dirs = build_info.get('rpath')
-            if build_info.has_key('def_file'):
+            if 'def_file' in build_info:
                 log.warn("'def_file' element of build info dict "
                          "no longer supported")
 
diff --git a/command/install.py b/command/install.py
index 453151d08b..c62121023d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -352,7 +352,7 @@ def dump_dirs (self, msg):
                 opt_name = opt[0]
                 if opt_name[-1] == "=":
                     opt_name = opt_name[0:-1]
-                if self.negative_opt.has_key(opt_name):
+                if opt_name in self.negative_opt:
                     opt_name = string.translate(self.negative_opt[opt_name],
                                                 longopt_xlate)
                     val = not getattr(self, opt_name)
diff --git a/command/register.py b/command/register.py
index 200e61e240..d1a9100de4 100644
--- a/command/register.py
+++ b/command/register.py
@@ -120,7 +120,7 @@ def send_metadata(self):
         # see if we can short-cut and get the username/password from the
         # config
         config = None
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 print 'Using PyPI login from %s'%rc
@@ -163,7 +163,7 @@ def send_metadata(self):
             print 'Server response (%s): %s'%(code, result)
 
             # possibly save the login
-            if os.environ.has_key('HOME') and config is None and code == 200:
+            if 'HOME' in os.environ and config is None and code == 200:
                 rc = os.path.join(os.environ['HOME'], '.pypirc')
                 print 'I can store your PyPI login so future submissions will be faster.'
                 print '(the login will be stored in %s)'%rc
diff --git a/command/upload.py b/command/upload.py
index 7461e5f453..301a159590 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -46,7 +46,7 @@ def finalize_options(self):
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             rc = os.path.join(os.environ['HOME'], '.pypirc')
             if os.path.exists(rc):
                 self.announce('Using PyPI login from %s' % rc)
diff --git a/core.py b/core.py
index c9c6f037a7..c40dd0a7aa 100644
--- a/core.py
+++ b/core.py
@@ -101,9 +101,9 @@ class found in 'cmdclass' is used in place of the default, which is
     else:
         klass = Distribution
 
-    if not attrs.has_key('script_name'):
+    if 'script_name' not in attrs:
         attrs['script_name'] = os.path.basename(sys.argv[0])
-    if not attrs.has_key('script_args'):
+    if 'script_args' not in attrs:
         attrs['script_args'] = sys.argv[1:]
 
     # Create the Distribution instance, using the remaining arguments
@@ -111,7 +111,7 @@ class found in 'cmdclass' is used in place of the default, which is
     try:
         _setup_distribution = dist = klass(attrs)
     except DistutilsSetupError, msg:
-        if attrs.has_key('name'):
+        if 'name' in attrs:
             raise SystemExit, "error in %s setup command: %s" % \
                   (attrs['name'], msg)
         else:
diff --git a/dir_util.py b/dir_util.py
index 43994db3ff..77f253255f 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -207,7 +207,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
             apply(cmd[0], (cmd[1],))
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
-            if _path_created.has_key(abspath):
+            if abspath in _path_created:
                 del _path_created[abspath]
         except (IOError, OSError), exc:
             log.warn(grok_environment_error(
diff --git a/dist.py b/dist.py
index ff49886d97..d098cb9713 100644
--- a/dist.py
+++ b/dist.py
@@ -239,7 +239,7 @@ def __init__ (self, attrs=None):
                     for (opt, val) in cmd_options.items():
                         opt_dict[opt] = ("setup script", val)
 
-            if attrs.has_key('licence'):
+            if 'licence' in attrs:
                 attrs['license'] = attrs['licence']
                 del attrs['licence']
                 msg = "'licence' distribution option is deprecated; use 'license'"
@@ -343,7 +343,7 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if os.environ.has_key('HOME'):
+        if 'HOME' in os.environ:
             user_file = os.path.join(os.environ.get('HOME'), user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
@@ -388,7 +388,7 @@ def parse_config_files (self, filenames=None):
         # If there was a "global" section in the config file, use it
         # to set Distribution options.
 
-        if self.command_options.has_key('global'):
+        if 'global' in self.command_options:
             for (opt, (src, val)) in self.command_options['global'].items():
                 alias = self.negative_opt.get(opt)
                 try:
@@ -907,7 +907,7 @@ def _set_command_options (self, command_obj, option_dict=None):
 
             try:
                 is_string = type(value) is StringType
-                if neg_opt.has_key(option) and is_string:
+                if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
                     setattr(command_obj, option, strtobool(value))
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 218ed73f98..31cf0c5c3b 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -97,7 +97,7 @@ def set_option_table (self, option_table):
         self._build_index()
 
     def add_option (self, long_option, short_option=None, help_string=None):
-        if self.option_index.has_key(long_option):
+        if long_option in self.option_index:
             raise DistutilsGetoptError, \
                   "option conflict: already an option '%s'" % long_option
         else:
@@ -109,7 +109,7 @@ def add_option (self, long_option, short_option=None, help_string=None):
     def has_option (self, long_option):
         """Return true if the option table for this parser has an
         option with long name 'long_option'."""
-        return self.option_index.has_key(long_option)
+        return long_option in self.option_index
 
     def get_attr_name (self, long_option):
         """Translate long option name 'long_option' to the form it
@@ -121,11 +121,11 @@ def get_attr_name (self, long_option):
     def _check_alias_dict (self, aliases, what):
         assert type(aliases) is DictionaryType
         for (alias, opt) in aliases.items():
-            if not self.option_index.has_key(alias):
+            if alias not in self.option_index:
                 raise DistutilsGetoptError, \
                       ("invalid %s '%s': "
                        "option '%s' not defined") % (what, alias, alias)
-            if not self.option_index.has_key(opt):
+            if opt not in self.option_index:
                 raise DistutilsGetoptError, \
                       ("invalid %s '%s': "
                        "aliased option '%s' not defined") % (what, alias, opt)
diff --git a/msvccompiler.py b/msvccompiler.py
index fa123462ec..f3acb53477 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -252,7 +252,7 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
 
     def initialize(self):
         self.__paths = []
-        if os.environ.has_key("DISTUTILS_USE_SDK") and os.environ.has_key("MSSdk") and self.find_exe("cl.exe"):
+        if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
             self.cc = "cl.exe"
diff --git a/sysconfig.py b/sysconfig.py
index 1aaaa28fbf..506cf385b6 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -161,22 +161,22 @@ def customize_compiler(compiler):
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO')
 
-        if os.environ.has_key('CC'):
+        if 'CC' in os.environ:
             cc = os.environ['CC']
-        if os.environ.has_key('CXX'):
+        if 'CXX' in os.environ:
             cxx = os.environ['CXX']
-        if os.environ.has_key('LDSHARED'):
+        if 'LDSHARED' in os.environ:
             ldshared = os.environ['LDSHARED']
-        if os.environ.has_key('CPP'):
+        if 'CPP' in os.environ:
             cpp = os.environ['CPP']
         else:
             cpp = cc + " -E"           # not always
-        if os.environ.has_key('LDFLAGS'):
+        if 'LDFLAGS' in os.environ:
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if os.environ.has_key('CFLAGS'):
+        if 'CFLAGS' in os.environ:
             cflags = opt + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if os.environ.has_key('CPPFLAGS'):
+        if 'CPPFLAGS' in os.environ:
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
             cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
@@ -291,12 +291,12 @@ def parse_makefile(fn, g=None):
             if m:
                 n = m.group(1)
                 found = True
-                if done.has_key(n):
+                if n in done:
                     item = str(done[n])
-                elif notdone.has_key(n):
+                elif n in notdone:
                     # get it on a subsequent round
                     found = False
-                elif os.environ.has_key(n):
+                elif n in os.environ:
                     # do it like make: fall back to environment
                     item = os.environ[n]
                 else:
@@ -380,7 +380,7 @@ def _init_posix():
     # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
     # it needs to be compatible.
     # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and g.has_key('MACOSX_DEPLOYMENT_TARGET'):
+    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
         cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
diff --git a/text_file.py b/text_file.py
index 67efd65e36..ff2878de1b 100644
--- a/text_file.py
+++ b/text_file.py
@@ -89,7 +89,7 @@ def __init__ (self, filename=None, file=None, **options):
         # set values for all options -- either from client option hash
         # or fallback to default_options
         for opt in self.default_options.keys():
-            if options.has_key (opt):
+            if opt in options:
                 setattr (self, opt, options[opt])
 
             else:
@@ -97,7 +97,7 @@ def __init__ (self, filename=None, file=None, **options):
 
         # sanity check client option hash
         for opt in options.keys():
-            if not self.default_options.has_key (opt):
+            if opt not in self.default_options:
                 raise KeyError, "invalid TextFile option '%s'" % opt
 
         if file is None:
diff --git a/util.py b/util.py
index 8979634e4b..deb9a0a0f1 100644
--- a/util.py
+++ b/util.py
@@ -219,11 +219,11 @@ def check_environ ():
     if _environ_checked:
         return
 
-    if os.name == 'posix' and not os.environ.has_key('HOME'):
+    if os.name == 'posix' and 'HOME' not in os.environ:
         import pwd
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
-    if not os.environ.has_key('PLAT'):
+    if 'PLAT' not in os.environ:
         os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
@@ -241,7 +241,7 @@ def subst_vars (s, local_vars):
     check_environ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)
-        if local_vars.has_key(var_name):
+        if var_name in local_vars:
             return str(local_vars[var_name])
         else:
             return os.environ[var_name]

From a5c15c1aba945408f59b87959d31be1b74a2cb2a Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 22 Feb 2008 16:37:40 +0000
Subject: [PATCH 1947/8469] Merged revisions
 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line

  Added PEP 3101.
........
  r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines

  Fixes contributed by Ori Avtalion.
........
  r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line

  Trim leading zeros from a floating point exponent, per C99.  See issue 1600.  As far as I know, this only affects Windows.  Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).
........
  r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line

  Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it.
........
  r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines

  Close manifest file.
  This change doesn't make any difference to CPython, but is a necessary fix for Jython.
........
  r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines

  Remove news about float repr() -- issue 1580 is still in limbo.
........
  r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines

  Removed uses of dict.has_key() from distutils, and uses of
  callable() from copy_reg.py, so the interpreter now starts up
  without warnings when '-3' is given.  More work like this needs to
  be done in the rest of the stdlib.
........
  r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines

  configure.ac: Remove the configure check for _Bool, it is already done in the
  top-level Python configure script.
  configure, fficonfig.h.in: regenerated.
........
  r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines

  Replace 'has_key()' with 'in'.
  Replace 'raise Error, stuff' with 'raise Error(stuff)'.
........
  r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line

  Update more instances of has_key().
........
  r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines

  Fix a few typos and layout glitches (more work is needed).
  Move 2.5 news to Misc/HISTORY.
........
  r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines

  #2079: typo in userdict docs.
........
  r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines

  Part of #2154: minimal syntax fixes in doc example snippets.
........
  r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line

  First draft for itertools.product().  Docs and other updates forthcoming.
........
  r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line

  Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery)
........
  r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines

  A lot more typo fixes by Ori Avtalion.
........
  r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines

  Don't reference pyshell.
........
  r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines

  Another fix.
........
---
 ccompiler.py     | 6 +++---
 command/sdist.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index f4edb7c6a6..1e09123afc 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -147,11 +147,11 @@ class (via the 'executables' class attribute), but most will have:
         # discovered at run-time, since there are many different ways to do
         # basically the same things with Unix C compilers.
 
-        for key, value in kwargs.items():
+        for key in kwargs:
             if key not in self.executables:
-                raise ValueError("unknown executable '%s' for class %s" % \
+                raise ValueError("unknown executable '%s' for class %s" %
                       (key, self.__class__.__name__))
-            self.set_executable(key, value)
+            self.set_executable(key, kwargs[key])
 
     def set_executable(self, key, value):
         if isinstance(value, str):
diff --git a/command/sdist.py b/command/sdist.py
index b1c76486ed..8289925785 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -357,6 +357,7 @@ def read_manifest(self):
             if line[-1] == '\n':
                 line = line[0:-1]
             self.filelist.append(line)
+        manifest.close()
 
     def make_release_tree(self, base_dir, files):
         """Create the directory tree that will become the source

From c3981d56adcbfdd1e06f1b4fabc554e470ce4646 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 23 Feb 2008 17:40:11 +0000
Subject: [PATCH 1948/8469] Patch #2167 from calvin: Remove unused imports

---
 bcppcompiler.py            | 2 +-
 command/bdist.py           | 2 +-
 command/bdist_dumb.py      | 2 +-
 command/bdist_msi.py       | 2 +-
 command/bdist_rpm.py       | 1 -
 command/build_py.py        | 2 +-
 command/build_scripts.py   | 2 +-
 command/install.py         | 1 -
 command/install_headers.py | 1 -
 command/install_lib.py     | 2 +-
 command/register.py        | 2 +-
 command/sdist.py           | 2 +-
 filelist.py                | 1 -
 tests/test_dist.py         | 2 --
 tests/test_sysconfig.py    | 1 -
 unixccompiler.py           | 1 -
 16 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index ca524a5b88..d4fc53366f 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -16,7 +16,7 @@
 __revision__ = "$Id$"
 
 
-import sys, os
+import os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError, UnknownFileError
diff --git a/command/bdist.py b/command/bdist.py
index 23c25a55a8..d6897d2d09 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 from distutils.core import Command
 from distutils.errors import *
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index ccba00955a..f740c468e7 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -11,7 +11,7 @@
 import os
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree, ensure_relative
+from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
 from distutils import log
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index a1c0df4bc5..a4014525b7 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -7,7 +7,7 @@
 Implements the bdist_msi command.
 """
 
-import sys, os, string
+import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 6f0e0d881c..9aa7030049 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -8,7 +8,6 @@
 __revision__ = "$Id$"
 
 import sys, os, string
-import glob
 from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG
diff --git a/command/build_py.py b/command/build_py.py
index b9f39bae79..be6d2c5b4d 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, string, os
+import string, os
 from types import *
 from glob import glob
 
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 6af363b36d..104be0b349 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os, re
 from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command
diff --git a/command/install.py b/command/install.py
index c62121023d..0d39b91cc3 100644
--- a/command/install.py
+++ b/command/install.py
@@ -17,7 +17,6 @@
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
-from glob import glob
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
diff --git a/command/install_headers.py b/command/install_headers.py
index 2bd1b04367..4895240a4c 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -7,7 +7,6 @@
 
 __revision__ = "$Id$"
 
-import os
 from distutils.core import Command
 
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 08ff543449..81107a85cb 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -2,7 +2,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import os
 from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
diff --git a/command/register.py b/command/register.py
index d1a9100de4..5c588effd3 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, urllib2, getpass, urlparse
+import os, string, urllib2, getpass, urlparse
 import StringIO, ConfigParser
 
 from distutils.core import Command
diff --git a/command/sdist.py b/command/sdist.py
index a06b1953b4..9b37f78982 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import os, string
 from types import *
 from glob import glob
 from distutils.core import Command
diff --git a/filelist.py b/filelist.py
index 43f9aaaf5b..6d27cce64f 100644
--- a/filelist.py
+++ b/filelist.py
@@ -11,7 +11,6 @@
 import os, string, re
 import fnmatch
 from types import *
-from glob import glob
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 4d2a7cdf1a..5ae79332c0 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -3,10 +3,8 @@
 import distutils.cmd
 import distutils.dist
 import os
-import shutil
 import StringIO
 import sys
-import tempfile
 import unittest
 
 from test.test_support import TESTFN
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 770b7c376f..d56f7e9bc5 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,7 +2,6 @@
 
 from distutils import sysconfig
 import os
-import sys
 import unittest
 
 from test.test_support import TESTFN
diff --git a/unixccompiler.py b/unixccompiler.py
index 75e8a5316e..dc759ee8f5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,7 +17,6 @@
 
 import os, sys
 from types import StringType, NoneType
-from copy import copy
 
 from distutils import sysconfig
 from distutils.dep_util import newer

From 6b8ac4a8066f127f3e2009e760eceda2354e3db1 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 23 Feb 2008 18:30:17 +0000
Subject: [PATCH 1949/8469] Merged revisions 60990-61002 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60990 | eric.smith | 2008-02-23 17:05:26 +0100 (Sat, 23 Feb 2008) | 1 line

  Removed duplicate Py_CHARMASK define.  It's already defined in Python.h.
........
  r60991 | andrew.kuchling | 2008-02-23 17:23:05 +0100 (Sat, 23 Feb 2008) | 4 lines

  #1330538: Improve comparison of xmlrpclib.DateTime and datetime instances.
  Remove automatic handling of datetime.date and datetime.time.
  This breaks backward compatibility, but python-dev discussion was strongly
  against this automatic conversion; see the bug for a link.
........
  r60994 | andrew.kuchling | 2008-02-23 17:39:43 +0100 (Sat, 23 Feb 2008) | 1 line

  #835521: Add index entries for various pickle-protocol methods and attributes
........
  r60995 | andrew.kuchling | 2008-02-23 18:10:46 +0100 (Sat, 23 Feb 2008) | 2 lines

  #1433694: minidom's .normalize() failed to set .nextSibling for last element.
  Fix by Malte Helmert
........
  r61000 | christian.heimes | 2008-02-23 18:40:11 +0100 (Sat, 23 Feb 2008) | 1 line

  Patch #2167 from calvin: Remove unused imports
........
  r61001 | christian.heimes | 2008-02-23 18:42:31 +0100 (Sat, 23 Feb 2008) | 1 line

  Patch #1957: syslogmodule: Release GIL when calling syslog(3)
........
  r61002 | christian.heimes | 2008-02-23 18:52:07 +0100 (Sat, 23 Feb 2008) | 2 lines

  Issue #2051 and patch from Alexander Belopolsky:
  Permission for pyc and pyo files are inherited from the py file.
........
---
 bcppcompiler.py            | 2 +-
 command/bdist_dumb.py      | 2 +-
 command/bdist_rpm.py       | 1 -
 command/build_scripts.py   | 2 +-
 command/install.py         | 1 -
 command/install_headers.py | 1 -
 command/register.py        | 2 +-
 filelist.py                | 1 -
 tests/test_dist.py         | 2 --
 tests/test_sysconfig.py    | 1 -
 unixccompiler.py           | 1 -
 11 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 1ab76c5981..c5e5cd2571 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -14,7 +14,7 @@
 __revision__ = "$Id$"
 
 
-import sys, os
+import os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError, UnknownFileError
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index f89961769c..2d39922672 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -9,7 +9,7 @@
 import os
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree, ensure_relative
+from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
 from distutils import log
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 72f74f9c53..83efb8e043 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import sys, os
-import glob
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.util import get_platform
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 7b44264cc2..3ac5b0c0be 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -4,7 +4,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os, re
 from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command
diff --git a/command/install.py b/command/install.py
index b768663c69..e4ee680271 100644
--- a/command/install.py
+++ b/command/install.py
@@ -14,7 +14,6 @@
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.errors import DistutilsOptionError
-from glob import glob
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
diff --git a/command/install_headers.py b/command/install_headers.py
index 7114eaf068..346daaad02 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -5,7 +5,6 @@
 
 __revision__ = "$Id$"
 
-import os
 from distutils.core import Command
 
 
diff --git a/command/register.py b/command/register.py
index d123d327de..40d9f20d1a 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, urllib2, getpass, urlparse
+import os, string, urllib2, getpass, urlparse
 import io, ConfigParser
 
 from distutils.core import Command
diff --git a/filelist.py b/filelist.py
index 6506c30e6b..8eab0a95bf 100644
--- a/filelist.py
+++ b/filelist.py
@@ -8,7 +8,6 @@
 
 import os, re
 import fnmatch
-from glob import glob
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 23506b5dae..91acf45805 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -3,10 +3,8 @@
 import distutils.cmd
 import distutils.dist
 import os
-import shutil
 import io
 import sys
-import tempfile
 import unittest
 
 from test.test_support import TESTFN
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 770b7c376f..d56f7e9bc5 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,7 +2,6 @@
 
 from distutils import sysconfig
 import os
-import sys
 import unittest
 
 from test.test_support import TESTFN
diff --git a/unixccompiler.py b/unixccompiler.py
index ee975e15fa..25a042d075 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -16,7 +16,6 @@
 __revision__ = "$Id$"
 
 import os, sys
-from copy import copy
 
 from distutils import sysconfig
 from distutils.dep_util import newer

From 7eaf2c9799ea499603b40dbf7324c8adb60d8fad Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 6 Mar 2008 06:47:18 +0000
Subject: [PATCH 1950/8469] #1725737: ignore other VC directories other than
 CVS and SVN's too.

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

diff --git a/command/sdist.py b/command/sdist.py
index 9b37f78982..961256c3ac 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -347,14 +347,14 @@ def prune_file_list (self):
           * the build tree (typically "build")
           * the release tree itself (only an issue if we ran "sdist"
             previously with --keep-temp, or it aborted)
-          * any RCS, CVS and .svn directories
+          * any RCS, CVS, .svn, .hg, .git, .bzr, _darcs directories
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
+        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
 
     def write_manifest (self):

From 5533c2dfe6f54d028b6164c6d6586b98c0f82d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 6 Mar 2008 07:14:26 +0000
Subject: [PATCH 1951/8469] Backport of r61263: #1725737: ignore other VC
 directories other than CVS and SVN's too.

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

diff --git a/command/sdist.py b/command/sdist.py
index 3dfe6f21a7..b724a3b7d4 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -347,14 +347,14 @@ def prune_file_list (self):
           * the build tree (typically "build")
           * the release tree itself (only an issue if we ran "sdist"
             previously with --keep-temp, or it aborted)
-          * any RCS, CVS and .svn directories
+          * any RCS, CVS, .svn, .hg, .git, .bzr, _darcs directories
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
+        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
 
     def write_manifest (self):

From b41f4b8c277041837cda7062923b4cde662d5ebb Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 16 Mar 2008 00:07:10 +0000
Subject: [PATCH 1952/8469] Merged revisions
 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61239 | andrew.kuchling | 2008-03-05 01:44:41 +0100 (Wed, 05 Mar 2008) | 1 line

  Add more items; add fragmentary notes
........
  r61240 | amaury.forgeotdarc | 2008-03-05 02:50:33 +0100 (Wed, 05 Mar 2008) | 13 lines

  Issue#2238: some syntax errors from *args or **kwargs expressions
  would give bogus error messages, because of untested exceptions::

      >>> f(**g(1=2))
      XXX undetected error
      Traceback (most recent call last):
        File "<stdin>", line 1, in <module>
      TypeError: 'int' object is not iterable

  instead of the expected SyntaxError: keyword can't be an expression

  Will backport.
........
  r61241 | neal.norwitz | 2008-03-05 06:10:48 +0100 (Wed, 05 Mar 2008) | 3 lines

  Remove the files/dirs after closing the DB so the tests work on Windows.
  Patch from Trent Nelson.  Also simplified removing a file by using test_support.
........
  r61242 | neal.norwitz | 2008-03-05 06:14:18 +0100 (Wed, 05 Mar 2008) | 3 lines

  Get this test to pass even when there is no sound card in the system.
  Patch from Trent Nelson.  (I can't test this.)
........
  r61243 | neal.norwitz | 2008-03-05 06:20:44 +0100 (Wed, 05 Mar 2008) | 3 lines

  Catch OSError when trying to remove a file in case removal fails. This
  should prevent a failure in tearDown masking any real test failure.
........
  r61244 | neal.norwitz | 2008-03-05 06:38:06 +0100 (Wed, 05 Mar 2008) | 5 lines

  Make the timeout longer to give slow machines a chance to pass the test
  before timing out.  This doesn't change the duration of the test under
  normal circumstances.  This is targetted at fixing the spurious failures
  on the FreeBSD buildbot primarily.
........
  r61245 | neal.norwitz | 2008-03-05 06:49:03 +0100 (Wed, 05 Mar 2008) | 1 line

  Tabs -> spaces
........
  r61246 | neal.norwitz | 2008-03-05 06:50:20 +0100 (Wed, 05 Mar 2008) | 1 line

  Use -u urlfetch to run more tests
........
  r61247 | neal.norwitz | 2008-03-05 06:51:20 +0100 (Wed, 05 Mar 2008) | 1 line

  test_smtplib sometimes reports leaks too, suppress it
........
  r61248 | jeffrey.yasskin | 2008-03-05 07:19:56 +0100 (Wed, 05 Mar 2008) | 5 lines

  Fix test_socketserver on Windows after r61099 added several signal.alarm()
  calls (which don't exist on non-Unix platforms).

  Thanks to Trent Nelson for the report and patch.
........
  r61249 | georg.brandl | 2008-03-05 08:10:35 +0100 (Wed, 05 Mar 2008) | 2 lines

  Fix some rst.
........
  r61252 | thomas.heller | 2008-03-05 15:53:39 +0100 (Wed, 05 Mar 2008) | 2 lines

  News entry for yesterdays commit.
........
  r61253 | thomas.heller | 2008-03-05 16:34:29 +0100 (Wed, 05 Mar 2008) | 3 lines

  Issue 1872: Changed the struct module typecode from 't' to '?', for
  compatibility with PEP3118.
........
  r61254 | skip.montanaro | 2008-03-05 17:41:09 +0100 (Wed, 05 Mar 2008) | 4 lines

  Elaborate on the role of the altinstall target when installing multiple
  versions.
........
  r61255 | georg.brandl | 2008-03-05 20:31:44 +0100 (Wed, 05 Mar 2008) | 2 lines

  #2239: PYTHONPATH delimiter is os.pathsep.
........
  r61256 | raymond.hettinger | 2008-03-05 21:59:58 +0100 (Wed, 05 Mar 2008) | 1 line

  C implementation of itertools.permutations().
........
  r61257 | raymond.hettinger | 2008-03-05 22:04:32 +0100 (Wed, 05 Mar 2008) | 1 line

  Small code cleanup.
........
  r61260 | martin.v.loewis | 2008-03-05 23:24:31 +0100 (Wed, 05 Mar 2008) | 2 lines

  cd PCbuild only after deleting all pyc files.
........
  r61261 | raymond.hettinger | 2008-03-06 02:15:52 +0100 (Thu, 06 Mar 2008) | 1 line

  Add examples.
........
  r61262 | andrew.kuchling | 2008-03-06 02:36:27 +0100 (Thu, 06 Mar 2008) | 1 line

  Add two items
........
  r61263 | georg.brandl | 2008-03-06 07:47:18 +0100 (Thu, 06 Mar 2008) | 2 lines

  #1725737: ignore other VC directories other than CVS and SVN's too.
........
  r61264 | martin.v.loewis | 2008-03-06 07:55:22 +0100 (Thu, 06 Mar 2008) | 4 lines

  Patch #2232: os.tmpfile might fail on Windows if the user has no
  permission to create files in the root directory.
  Will backport to 2.5.
........
  r61269 | georg.brandl | 2008-03-06 08:19:15 +0100 (Thu, 06 Mar 2008) | 2 lines

  Expand on re.split behavior with captured expressions.
........
  r61270 | georg.brandl | 2008-03-06 08:22:09 +0100 (Thu, 06 Mar 2008) | 2 lines

  Little clarification of assignments.
........
  r61271 | georg.brandl | 2008-03-06 08:31:34 +0100 (Thu, 06 Mar 2008) | 2 lines

  Add isinstance/issubclass to tutorial.
........
  r61272 | georg.brandl | 2008-03-06 08:34:52 +0100 (Thu, 06 Mar 2008) | 2 lines

  Add missing NEWS entry for r61263.
........
  r61273 | georg.brandl | 2008-03-06 08:41:16 +0100 (Thu, 06 Mar 2008) | 2 lines

  #2225: return nonzero status code from py_compile if not all files could be compiled.
........
  r61274 | georg.brandl | 2008-03-06 08:43:02 +0100 (Thu, 06 Mar 2008) | 2 lines

  #2220: handle matching failure more gracefully.
........
  r61275 | georg.brandl | 2008-03-06 08:45:52 +0100 (Thu, 06 Mar 2008) | 2 lines

  Bug #2220: handle rlcompleter attribute match failure more gracefully.
........
  r61278 | martin.v.loewis | 2008-03-06 14:49:47 +0100 (Thu, 06 Mar 2008) | 1 line

  Rely on x64 platform configuration when building _bsddb on AMD64.
........
  r61279 | martin.v.loewis | 2008-03-06 14:50:28 +0100 (Thu, 06 Mar 2008) | 1 line

  Update db-4.4.20 build procedure.
........
  r61285 | raymond.hettinger | 2008-03-06 21:52:01 +0100 (Thu, 06 Mar 2008) | 1 line

  More tests.
........
  r61286 | raymond.hettinger | 2008-03-06 23:51:36 +0100 (Thu, 06 Mar 2008) | 1 line

  Issue 2246:  itertools grouper object did not participate in GC (should be backported).
........
  r61288 | raymond.hettinger | 2008-03-07 02:33:20 +0100 (Fri, 07 Mar 2008) | 1 line

  Tweak recipes and tests
........
  r61289 | jeffrey.yasskin | 2008-03-07 07:22:15 +0100 (Fri, 07 Mar 2008) | 5 lines

  Progress on issue #1193577 by adding a polling .shutdown() method to
  SocketServers. The core of the patch was written by Pedro Werneck, but any bugs
  are mine. I've also rearranged the code for timeouts in order to avoid
  interfering with the shutdown poll.
........
  r61290 | nick.coghlan | 2008-03-07 15:13:28 +0100 (Fri, 07 Mar 2008) | 1 line

  Speed up with statements by storing the __exit__ method on the stack instead of in a temp variable (bumps the magic number for pyc files)
........
  r61298 | andrew.kuchling | 2008-03-07 22:09:23 +0100 (Fri, 07 Mar 2008) | 1 line

  Grammar fix
........
  r61303 | georg.brandl | 2008-03-08 10:54:06 +0100 (Sat, 08 Mar 2008) | 2 lines

  #2253: fix continue vs. finally docs.
........
  r61304 | marc-andre.lemburg | 2008-03-08 11:01:43 +0100 (Sat, 08 Mar 2008) | 3 lines

  Add new name for Mandrake: Mandriva.
........
  r61305 | georg.brandl | 2008-03-08 11:05:24 +0100 (Sat, 08 Mar 2008) | 2 lines

  #1533486: fix types in refcount intro.
........
  r61312 | facundo.batista | 2008-03-08 17:50:27 +0100 (Sat, 08 Mar 2008) | 5 lines


  Issue 1106316. post_mortem()'s parameter, traceback, is now
  optional: it defaults to the traceback of the exception that is currently
  being handled.
........
  r61313 | jeffrey.yasskin | 2008-03-08 19:26:54 +0100 (Sat, 08 Mar 2008) | 2 lines

  Add tests for with and finally performance to pybench.
........
  r61314 | jeffrey.yasskin | 2008-03-08 21:08:21 +0100 (Sat, 08 Mar 2008) | 2 lines

  Fix pybench for pythons < 2.6, tested back to 2.3.
........
  r61317 | jeffrey.yasskin | 2008-03-08 22:35:15 +0100 (Sat, 08 Mar 2008) | 3 lines

  Well that was dumb. platform.python_implementation returns a function, not a
  string.
........
  r61329 | georg.brandl | 2008-03-09 16:11:39 +0100 (Sun, 09 Mar 2008) | 2 lines

  #2249: document assertTrue and assertFalse.
........
  r61332 | neal.norwitz | 2008-03-09 20:03:42 +0100 (Sun, 09 Mar 2008) | 4 lines

  Introduce a lock to fix a race condition which caused an exception in the test.
  Some buildbots were consistently failing (e.g., amd64).
  Also remove a couple of semi-colons.
........
  r61344 | raymond.hettinger | 2008-03-11 01:19:07 +0100 (Tue, 11 Mar 2008) | 1 line

  Add recipe to docs.
........
  r61350 | guido.van.rossum | 2008-03-11 22:18:06 +0100 (Tue, 11 Mar 2008) | 3 lines

  Fix the overflows in expandtabs().  "This time for sure!"
  (Exploit at request.)
........
  r61351 | raymond.hettinger | 2008-03-11 22:37:46 +0100 (Tue, 11 Mar 2008) | 1 line

  Improve docs for itemgetter().  Show that it works with slices.
........
  r61363 | georg.brandl | 2008-03-13 08:15:56 +0100 (Thu, 13 Mar 2008) | 2 lines

  #2265: fix example.
........
  r61364 | georg.brandl | 2008-03-13 08:17:14 +0100 (Thu, 13 Mar 2008) | 2 lines

  #2270: fix typo.
........
  r61365 | georg.brandl | 2008-03-13 08:21:41 +0100 (Thu, 13 Mar 2008) | 2 lines

  #1720705: add docs about import/threading interaction, wording by Nick.
........
  r61366 | andrew.kuchling | 2008-03-13 12:07:35 +0100 (Thu, 13 Mar 2008) | 1 line

  Add class decorators
........
  r61367 | raymond.hettinger | 2008-03-13 17:43:17 +0100 (Thu, 13 Mar 2008) | 1 line

  Add 2-to-3 support for the itertools moved to builtins or renamed.
........
  r61368 | raymond.hettinger | 2008-03-13 17:43:59 +0100 (Thu, 13 Mar 2008) | 1 line

  Consistent tense.
........
  r61369 | raymond.hettinger | 2008-03-13 20:03:51 +0100 (Thu, 13 Mar 2008) | 1 line

  Issue 2274:  Add heapq.heappushpop().
........
  r61370 | raymond.hettinger | 2008-03-13 20:33:34 +0100 (Thu, 13 Mar 2008) | 1 line

  Simplify the nlargest() code using heappushpop().
........
  r61371 | brett.cannon | 2008-03-13 21:27:00 +0100 (Thu, 13 Mar 2008) | 4 lines

  Move test_thread over to unittest. Commits GHOP 237.

  Thanks Benjamin Peterson for the patch.
........
  r61372 | brett.cannon | 2008-03-13 21:33:10 +0100 (Thu, 13 Mar 2008) | 4 lines

  Move test_tokenize to doctest.

  Done as GHOP 238 by Josip Dzolonga.
........
  r61373 | brett.cannon | 2008-03-13 21:47:41 +0100 (Thu, 13 Mar 2008) | 4 lines

  Convert test_contains, test_crypt, and test_select to unittest.

  Patch from GHOP 294 by David Marek.
........
  r61374 | brett.cannon | 2008-03-13 22:02:16 +0100 (Thu, 13 Mar 2008) | 4 lines

  Move test_gdbm to use unittest.

  Closes issue #1960. Thanks Giampaolo Rodola.
........
  r61375 | brett.cannon | 2008-03-13 22:09:28 +0100 (Thu, 13 Mar 2008) | 4 lines

  Convert test_fcntl to unittest.

  Closes issue #2055. Thanks Giampaolo Rodola.
........
  r61376 | raymond.hettinger | 2008-03-14 06:03:44 +0100 (Fri, 14 Mar 2008) | 1 line

  Leave heapreplace() unchanged.
........
  r61378 | martin.v.loewis | 2008-03-14 14:56:09 +0100 (Fri, 14 Mar 2008) | 2 lines

  Patch #2284: add -x64 option to rt.bat.
........
  r61379 | martin.v.loewis | 2008-03-14 14:57:59 +0100 (Fri, 14 Mar 2008) | 2 lines

  Use -x64 flag.
........
  r61382 | brett.cannon | 2008-03-14 15:03:10 +0100 (Fri, 14 Mar 2008) | 2 lines

  Remove a bad test.
........
  r61383 | mark.dickinson | 2008-03-14 15:23:37 +0100 (Fri, 14 Mar 2008) | 9 lines

  Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently
  across platforms:  it should now raise OverflowError on all
  platforms.  (Previously it raised OverflowError only on
  non IEEE 754 platforms.)

  Also fix the (already existing) test for this behaviour
  so that it actually raises TestFailed instead of just
  referencing it.
........
  r61387 | thomas.heller | 2008-03-14 22:06:21 +0100 (Fri, 14 Mar 2008) | 1 line

  Remove unneeded initializer.
........
  r61388 | martin.v.loewis | 2008-03-14 22:19:28 +0100 (Fri, 14 Mar 2008) | 2 lines

  Run debug version, cd to PCbuild.
........
  r61392 | georg.brandl | 2008-03-15 00:10:34 +0100 (Sat, 15 Mar 2008) | 2 lines

  Remove obsolete paragraph. #2288.
........
  r61395 | georg.brandl | 2008-03-15 01:20:19 +0100 (Sat, 15 Mar 2008) | 2 lines

  Fix lots of broken links in the docs, found by Sphinx' external link checker.
........
  r61396 | skip.montanaro | 2008-03-15 03:32:49 +0100 (Sat, 15 Mar 2008) | 1 line

  note that fork and forkpty raise OSError on failure
........
  r61402 | skip.montanaro | 2008-03-15 17:04:45 +0100 (Sat, 15 Mar 2008) | 1 line

  add %f format to datetime - issue 1158
........
  r61403 | skip.montanaro | 2008-03-15 17:07:11 +0100 (Sat, 15 Mar 2008) | 2 lines

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

diff --git a/command/sdist.py b/command/sdist.py
index 8289925785..b29fc64eca 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -325,14 +325,14 @@ def prune_file_list(self):
           * the build tree (typically "build")
           * the release tree itself (only an issue if we ran "sdist"
             previously with --keep-temp, or it aborted)
-          * any RCS, CVS and .svn directories
+          * any RCS, CVS, .svn, .hg, .git, .bzr, _darcs directories
         """
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'/(RCS|CVS|\.svn)/.*', is_regex=1)
+        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
     def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in

From 7382bd51a39f785fee596182768da1b8deecf6c7 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent.nelson@snakebite.org>
Date: Wed, 19 Mar 2008 06:28:24 +0000
Subject: [PATCH 1953/8469] Issue2290: Support x64 Windows builds that live in
 pcbuild/amd64.  Without it, sysutils._python_build() returns the wrong
 directory, which causes the test_get_config_h_filename method in
 Lib/distutils/tests/test_sysconfig.py to fail.

---
 sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 506cf385b6..27a770b194 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -23,7 +23,8 @@
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
 # Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9
+# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+# it'll live in project/PCbuild/amd64.
 project_base = os.path.dirname(os.path.abspath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
@@ -31,6 +32,10 @@
 if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
                                                 os.path.pardir))
+# PC/AMD64
+if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use

From 227cb3d385365b0716558d21804dbcf8d36b86ba Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 19 Mar 2008 21:50:51 +0000
Subject: [PATCH 1954/8469] Merged revisions
 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r61538 | steven.bethard | 2008-03-18 20:03:50 +0100 (Di, 18 Mär 2008) | 1 line

  cell_compare needs to return -2 instead of NULL.
........
  r61539 | steven.bethard | 2008-03-18 20:04:32 +0100 (Di, 18 Mär 2008) | 1 line

  _have_soundcard() is a bad check for winsound.Beep, since you can have a soundcard but have the beep driver disabled. This revision basically disables the beep tests by wrapping them in a try/except. The Right Way To Do It is to come up with a _have_enabled_beep_driver() and use that.
........
  r61540 | gregory.p.smith | 2008-03-18 20:05:32 +0100 (Di, 18 Mär 2008) | 8 lines

  Fix chown on 64-bit linux.  It needed to take a long (64-bit on 64bit linux) as
  uid and gid input to accept values >=2**31 as valid while still accepting
  negative numbers to pass -1 to chown for "no change".

  Fixes issue1747858.

  This should be backported to release25-maint.
........
  r61556 | steven.bethard | 2008-03-18 20:59:14 +0100 (Di, 18 Mär 2008) | 1 line

  Fix test_atexit so that it still passes when -3 is supplied. (It was catching the warning messages on stdio from using the reload() function.)
........
  r61559 | neal.norwitz | 2008-03-18 21:30:38 +0100 (Di, 18 Mär 2008) | 1 line

  Import the test properly.  This is especially important for py3k.
........
  r61560 | gregory.p.smith | 2008-03-18 21:40:01 +0100 (Di, 18 Mär 2008) | 2 lines

  news entry for the chown fix
........
  r61563 | brett.cannon | 2008-03-18 22:12:42 +0100 (Di, 18 Mär 2008) | 2 lines

  Ignore BIG5HKSCS-2004.TXT which is downloaded as part of a test.
........
  r61565 | steven.bethard | 2008-03-18 22:30:13 +0100 (Di, 18 Mär 2008) | 1 line

  Have regrtest skip test_py3kwarn when the -3 flag is missing.
........
  r61571 | gregory.p.smith | 2008-03-18 23:27:41 +0100 (Di, 18 Mär 2008) | 4 lines

  Add a test to make sure zlib.crc32 and binascii.crc32 return the same thing.
  Fix a buglet in binascii.crc32, the second optional argument could previously
  have a signedness mismatch with the C variable its going into.
........
  r61575 | raymond.hettinger | 2008-03-19 00:22:29 +0100 (Mi, 19 Mär 2008) | 1 line

  Speed-up isinstance() for one easy case.
........
  r61576 | raymond.hettinger | 2008-03-19 00:33:08 +0100 (Mi, 19 Mär 2008) | 1 line

  Issue: 2354: Add 3K warning for the cmp argument to list.sort() and sorted().
........
  r61580 | andrew.kuchling | 2008-03-19 02:05:35 +0100 (Mi, 19 Mär 2008) | 1 line

  Add Jeff Rush
........
  r61581 | gregory.p.smith | 2008-03-19 02:38:35 +0100 (Mi, 19 Mär 2008) | 3 lines

  Mention that crc32 and adler32 are available in a different module (zlib).
  Some people look for them in hashlib.
........
  r61582 | gregory.p.smith | 2008-03-19 02:46:10 +0100 (Mi, 19 Mär 2008) | 3 lines

  Use zlib's crc32 routine instead of binascii when available.  zlib's is faster
  when compiled properly optimized and about the same speed otherwise.
........
  r61586 | david.wolever | 2008-03-19 03:26:57 +0100 (Mi, 19 Mär 2008) | 1 line

  Added my name to ACKS
........
  r61591 | gregory.p.smith | 2008-03-19 04:14:41 +0100 (Mi, 19 Mär 2008) | 5 lines

  Fix the struct module DeprecationWarnings that zipfile was triggering by
  removing all use of signed struct values.

  test_zipfile and test_zipfile64 pass.  no more warnings.
........
  r61593 | raymond.hettinger | 2008-03-19 04:56:59 +0100 (Mi, 19 Mär 2008) | 1 line

  Fix compiler warning.
........
  r61595 | martin.v.loewis | 2008-03-19 05:39:13 +0100 (Mi, 19 Mär 2008) | 2 lines

  Issue #2400: Allow relative imports to "import *".
........
  r61605 | martin.v.loewis | 2008-03-19 07:00:28 +0100 (Mi, 19 Mär 2008) | 2 lines

  Import relimport using a relative import.
........
  r61606 | trent.nelson | 2008-03-19 07:28:24 +0100 (Mi, 19 Mär 2008) | 1 line

  Issue2290: Support x64 Windows builds that live in pcbuild/amd64.  Without it, sysutils._python_build() returns the wrong directory, which causes the test_get_config_h_filename method in Lib/distutils/tests/test_sysconfig.py to fail.
........
  r61613 | trent.nelson | 2008-03-19 08:45:19 +0100 (Mi, 19 Mär 2008) | 3 lines

  Refine the Visual Studio 2008 build solution in order to improve how we deal with external components, as well as fixing outstanding issues with Windows x64 build support.  Introduce two new .vcproj files, _bsddb44.vcproj and sqlite3.vcproj, which replace the previous pre-link event scripts for _bsddb and _sqlite3 respectively.  The new project files inherit from our property files as if they were any other Python module.  This has numerous benefits.  First, the components get built with exactly the same compiler flags and settings as the rest of Python.  Second, it makes it much easier to debug problems in the external components when they're part of the build system.  Third, they'll benefit from profile guided optimisation in the release builds, just like the rest of Python core.

  I've also introduced a slightly new pattern for managing externals in subversion.  New components get checked in as <name>-<version>.x, where <version> matches the exact vendor version string.  After the initial import of the external component, the .x is tagged as .0 (i.e. tcl-8.4.18.x -> tcl-8.4.18.0).  Some components may not need any tweaking, whereas there are others that might (tcl/tk fall into this bucket).  In that case, the relevant modifications are made to the .x branch, which will be subsequently tagged as .1 (and then n+1 going forward) when they build successfully and all tests pass.  Buildbots will be converted to rely on these explicit tags only, which makes it easy for us to switch them over to a new version as and when required.  (Simple change to external(-amd64).bat: if we've bumped tcl to 8.4.18.1, change the .bat to rmdir 8.4.18.0 if it exists and check out a new .1 copy.)
........
  r61614 | trent.nelson | 2008-03-19 08:56:39 +0100 (Mi, 19 Mär 2008) | 1 line

  Remove extraneous apostrophe and semi-colon from AdditionalIncludeDirectories.
........
  r61615 | georg.brandl | 2008-03-19 08:56:40 +0100 (Mi, 19 Mär 2008) | 2 lines

  Remove footnote from versionchanged as it upsets LaTeX.
........
  r61616 | georg.brandl | 2008-03-19 08:57:57 +0100 (Mi, 19 Mär 2008) | 2 lines

  Another one.
........
  r61618 | trent.nelson | 2008-03-19 09:06:03 +0100 (Mi, 19 Mär 2008) | 1 line

  Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk.
........
  r61621 | trent.nelson | 2008-03-19 10:23:08 +0100 (Mi, 19 Mär 2008) | 1 line

  Lets have another try at getting the Windows buildbots in a consistent state before rebuilding using the new process.
........
  r61622 | eric.smith | 2008-03-19 13:09:55 +0100 (Mi, 19 Mär 2008) | 2 lines

  Use test.test_support.captured_stdout instead of a custom contextmanager.
  Thanks Nick Coghlan.
........
  r61623 | eric.smith | 2008-03-19 13:15:10 +0100 (Mi, 19 Mär 2008) | 1 line

  Trivial typo.
........
  r61625 | thomas.heller | 2008-03-19 17:10:57 +0100 (Mi, 19 Mär 2008) | 2 lines

  Checkout sqlite-source when it is not there.
........
  r61627 | brett.cannon | 2008-03-19 17:50:13 +0100 (Mi, 19 Mär 2008) | 5 lines

  test_nis would fail if test.test_support.verbose was true but NIS was not set
  up on the machine.

  Closes issue2411. Thanks Michael Bishop.
........
  r61631 | brett.cannon | 2008-03-19 18:37:43 +0100 (Mi, 19 Mär 2008) | 2 lines

  Use sys.py3kwarning instead of trying to trigger a Py3k-related warning.
........
  r61632 | raymond.hettinger | 2008-03-19 18:45:19 +0100 (Mi, 19 Mär 2008) | 1 line

  Issue 2354: Fix-up compare warning.  Patch contributed by Jeff Balogh.
........
  r61633 | raymond.hettinger | 2008-03-19 18:58:59 +0100 (Mi, 19 Mär 2008) | 1 line

  The filter() function does support a None argument in Py3.0.
........
  r61634 | raymond.hettinger | 2008-03-19 19:01:58 +0100 (Mi, 19 Mär 2008) | 1 line

  Remove itertools warnings I had added before the 2-to-3 handled the migration.
........
---
 sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 39216a532f..d2b2c9a347 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -23,7 +23,8 @@
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
 
 # Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9
+# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+# it'll live in project/PCbuild/amd64.
 project_base = os.path.dirname(os.path.abspath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
@@ -31,6 +32,10 @@
 if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
                                                 os.path.pardir))
+# PC/AMD64
+if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use

From dcf379739cccd5c8dd0d9a606ab52239e659d154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 22 Mar 2008 00:35:10 +0000
Subject: [PATCH 1955/8469] Add build_py_2to3.

---
 command/build_py.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index 63ced4b470..f39ffb878e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -383,3 +383,27 @@ def byte_compile(self, files):
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
+
+class build_py_2to3(build_py):
+    def run(self):
+        from lib2to3.refactor import RefactoringTool
+        self.updated_files = []
+        build_py.run(self)
+        class Options:
+            pass
+        o = Options()
+        o.doctests_only = False
+        o.fix = []
+        o.list_fixes = []
+        o.print_function = False
+        o.verbose = False
+        o.write = True
+        r = RefactoringTool(o)
+        r.refactor_args(self.updated_files)
+
+    def build_module(self, module, module_file, package):
+        res = build_py.build_module(self, module, module_file, package)
+        if res[1]:
+            # file was copied
+            self.updated_files.append(res[0])
+        return res

From 143e8f4fe669de9fb9e1ed23be226c7a4b6b410a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 22 Mar 2008 22:07:43 +0000
Subject: [PATCH 1956/8469] Invoke byte-compilation after running 2to3.

---
 command/build_py.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index f39ffb878e..09f6d2331e 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -386,9 +386,17 @@ def byte_compile(self, files):
 
 class build_py_2to3(build_py):
     def run(self):
-        from lib2to3.refactor import RefactoringTool
         self.updated_files = []
-        build_py.run(self)
+
+        # Base class code
+        if self.py_modules:
+            self.build_modules()
+        if self.packages:
+            self.build_packages()
+            self.build_package_data()
+
+        # 2to3
+        from lib2to3.refactor import RefactoringTool
         class Options:
             pass
         o = Options()
@@ -401,6 +409,9 @@ class Options:
         r = RefactoringTool(o)
         r.refactor_args(self.updated_files)
 
+        # Remaining base class code
+        self.byte_compile(self.get_outputs(include_bytecode=0))
+
     def build_module(self, module, module_file, package):
         res = build_py.build_module(self, module, module_file, package)
         if res[1]:

From 3405aa3e09e63da9af1a4ca90c4ae1c5bf9dcc7d Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 2 Apr 2008 23:33:27 +0000
Subject: [PATCH 1957/8469] release.py induced and manual editing steps for
 3.0a4.

---
 __init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 0c3d939dc3..b583e397e2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -18,4 +18,7 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.6.0"
+
+#--start constants--
+__version__ = "3.0a4"
+#--end constants--

From b2c84945a0906325790271d2d8108fbe81483b70 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 3 Apr 2008 04:10:02 +0000
Subject: [PATCH 1958/8469] Updating for 2.6a2

---
 __init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8c954c2238..d0dd03a3c5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,4 +20,7 @@
 # In general, major and minor version should loosely follow the Python
 # version number the distutils code was shipped with.
 #
-__version__ = "2.6.0"
+
+#--start constants--
+__version__ = "2.6a2"
+#--end constants--

From fb68e5c8dd08660e12a945ace7487a7b2b4daff1 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 4 Apr 2008 05:41:30 +0000
Subject: [PATCH 1959/8469] - Issue #2385: distutils.core.run_script() makes
 __file__ available, so the   controlled environment will more closely mirror
 the typical script   environment.  This supports setup.py scripts that refer
 to data files.

---
 core.py            |  3 ++-
 tests/test_core.py | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_core.py

diff --git a/core.py b/core.py
index c40dd0a7aa..640d6b5955 100644
--- a/core.py
+++ b/core.py
@@ -210,8 +210,9 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     _setup_stop_after = stop_after
 
     save_argv = sys.argv
-    g = {}
+    g = {'__file__': script_name}
     l = {}
+    os.chdir(os.path.dirname(script_name) or os.curdir)
     try:
         try:
             sys.argv[0] = script_name
diff --git a/tests/test_core.py b/tests/test_core.py
new file mode 100644
index 0000000000..6de58d9284
--- /dev/null
+++ b/tests/test_core.py
@@ -0,0 +1,40 @@
+"""Tests for distutils.core."""
+
+import StringIO
+import distutils.core
+import os
+import test.test_support
+import unittest
+
+
+# setup script that uses __file__
+setup_using___file__ = """\
+
+__file__
+
+from distutils.core import setup
+setup()
+"""
+
+
+class CoreTestCase(unittest.TestCase):
+
+    def tearDown(self):
+        os.remove(test.test_support.TESTFN)
+
+    def write_setup(self, text):
+        return fn
+
+    def test_run_setup_provides_file(self):
+        # Make sure the script can use __file__; if that's missing, the test
+        # setup.py script will raise NameError.
+        fn = test.test_support.TESTFN
+        open(fn, "w").write(setup_using___file__)
+        distutils.core.run_setup(fn)
+
+
+def test_suite():
+    return unittest.makeSuite(CoreTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 2e06d2e918a1f2d6e7c8f87853dee6f04e86d6d9 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 4 Apr 2008 11:31:14 +0000
Subject: [PATCH 1960/8469] my previous change did what I said it should not:
 it changed the current directory to the directory in which the setup.py
 script lived (which made __file__ wrong)

fixed, with test that the script is run in the current directory of the caller
---
 core.py            |  1 -
 tests/test_core.py | 54 ++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/core.py b/core.py
index 640d6b5955..32b9026999 100644
--- a/core.py
+++ b/core.py
@@ -212,7 +212,6 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     save_argv = sys.argv
     g = {'__file__': script_name}
     l = {}
-    os.chdir(os.path.dirname(script_name) or os.curdir)
     try:
         try:
             sys.argv[0] = script_name
diff --git a/tests/test_core.py b/tests/test_core.py
index 6de58d9284..4356c21295 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -3,6 +3,8 @@
 import StringIO
 import distutils.core
 import os
+import shutil
+import sys
 import test.test_support
 import unittest
 
@@ -16,21 +18,61 @@
 setup()
 """
 
+setup_prints_cwd = """\
+
+import os
+print os.getcwd()
+
+from distutils.core import setup
+setup()
+"""
+
 
 class CoreTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.old_stdout = sys.stdout
+        self.cleanup_testfn()
+
     def tearDown(self):
-        os.remove(test.test_support.TESTFN)
+        sys.stdout = self.old_stdout
+        self.cleanup_testfn()
+
+    def cleanup_testfn(self):
+        path = test.test_support.TESTFN
+        if os.path.isfile(path):
+            os.remove(path)
+        elif os.path.isdir(path):
+            shutil.rmtree(path)
 
-    def write_setup(self, text):
-        return fn
+    def write_setup(self, text, path=test.test_support.TESTFN):
+        open(path, "w").write(text)
+        return path
 
     def test_run_setup_provides_file(self):
         # Make sure the script can use __file__; if that's missing, the test
         # setup.py script will raise NameError.
-        fn = test.test_support.TESTFN
-        open(fn, "w").write(setup_using___file__)
-        distutils.core.run_setup(fn)
+        distutils.core.run_setup(
+            self.write_setup(setup_using___file__))
+
+    def test_run_setup_uses_current_dir(self):
+        # This tests that the setup script is run with the current directory
+        # as it's own current directory; this was temporarily broken by a
+        # previous patch when TESTFN did not use the current directory.
+        sys.stdout = StringIO.StringIO()
+        cwd = os.getcwd()
+
+        # Create a directory and write the setup.py file there:
+        os.mkdir(test.test_support.TESTFN)
+        setup_py = os.path.join(test.test_support.TESTFN, "setup.py")
+        distutils.core.run_setup(
+            self.write_setup(setup_prints_cwd, path=setup_py))
+
+        output = sys.stdout.getvalue()
+        open("/dev/tty", "w").write("\n\n%r\n\n\n" % (output,))
+        if output.endswith("\n"):
+            output = output[:-1]
+        self.assertEqual(cwd, output)
 
 
 def test_suite():

From 5ad3f56a92652c3996fb97ab7d923ca7e3647fe5 Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Fri, 4 Apr 2008 11:38:51 +0000
Subject: [PATCH 1961/8469] stupid, stupid, stupid!

---
 tests/test_core.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 4356c21295..55d2d5df7e 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -69,7 +69,6 @@ def test_run_setup_uses_current_dir(self):
             self.write_setup(setup_prints_cwd, path=setup_py))
 
         output = sys.stdout.getvalue()
-        open("/dev/tty", "w").write("\n\n%r\n\n\n" % (output,))
         if output.endswith("\n"):
             output = output[:-1]
         self.assertEqual(cwd, output)

From dc94cc0477c3ef464ffc9cd41fac155898e72402 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 5 Apr 2008 04:47:45 +0000
Subject: [PATCH 1962/8469] Merged revisions
 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62127 | trent.nelson | 2008-04-03 08:39:17 -0700 (Thu, 03 Apr 2008) | 1 line

  Remove the building of Berkeley DB step; _bsddb44.vcproj takes care of this for us now.
........
  r62136 | amaury.forgeotdarc | 2008-04-03 16:07:55 -0700 (Thu, 03 Apr 2008) | 9 lines

  #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace
  calls threading.currentThread.

  The correction somewhat improves the code, but it was close.
  Many thanks to the "with" construct, which turns python code into C calls.

  I wonder if it is not better to sys.settrace(None) just after
  running the __main__ module and before finalization.
........
  r62141 | jeffrey.yasskin | 2008-04-03 21:51:19 -0700 (Thu, 03 Apr 2008) | 5 lines

  Doh! os.read() raises an OSError, not an IOError when it's interrupted.

  And fix some flakiness in test_itimer_prof, which could detect that the timer
  had reached 0 before the signal arrived announcing that fact.
........
  r62142 | fred.drake | 2008-04-03 22:41:30 -0700 (Thu, 03 Apr 2008) | 4 lines

  - Issue #2385: distutils.core.run_script() makes __file__ available, so the
    controlled environment will more closely mirror the typical script
    environment.  This supports setup.py scripts that refer to data files.
........
  r62147 | fred.drake | 2008-04-04 04:31:14 -0700 (Fri, 04 Apr 2008) | 6 lines

  my previous change did what I said it should not: it changed the current
  directory to the directory in which the setup.py script lived (which made
  __file__ wrong)

  fixed, with test that the script is run in the current directory of the caller
........
  r62148 | fred.drake | 2008-04-04 04:38:51 -0700 (Fri, 04 Apr 2008) | 2 lines

  stupid, stupid, stupid!
........
  r62150 | jeffrey.yasskin | 2008-04-04 09:48:19 -0700 (Fri, 04 Apr 2008) | 2 lines

  Oops again. EINTR is in errno, not signal.
........
  r62158 | andrew.kuchling | 2008-04-04 19:42:20 -0700 (Fri, 04 Apr 2008) | 1 line

  Minor edits
........
  r62159 | andrew.kuchling | 2008-04-04 19:47:07 -0700 (Fri, 04 Apr 2008) | 1 line

  Markup fix; explain what interval timers do; typo fix
........
  r62160 | andrew.kuchling | 2008-04-04 20:38:39 -0700 (Fri, 04 Apr 2008) | 1 line

  Various edits
........
  r62161 | neal.norwitz | 2008-04-04 21:26:31 -0700 (Fri, 04 Apr 2008) | 9 lines

  Prevent test_sqlite from hanging on older versions of sqlite.
  The problem is that when trying to do the second insert, sqlite seems to sleep
  for a very long time.  Here is the output from strace:

    read(6, "SQLite format 3\0\4\0\1\1\0@  \0\0\0\1\0\0\0\0"..., 1024) = 1024
    nanosleep({4294, 966296000},  <unfinished ...>

  I don't know which version this was fixed in, but 3.2.1 definitely fails.
........
---
 core.py            |  2 +-
 tests/test_core.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_core.py

diff --git a/core.py b/core.py
index 0490e6378b..a4c5e18033 100644
--- a/core.py
+++ b/core.py
@@ -207,7 +207,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     _setup_stop_after = stop_after
 
     save_argv = sys.argv
-    g = {}
+    g = {'__file__': script_name}
     l = {}
     try:
         try:
diff --git a/tests/test_core.py b/tests/test_core.py
new file mode 100644
index 0000000000..8e274dd40d
--- /dev/null
+++ b/tests/test_core.py
@@ -0,0 +1,81 @@
+"""Tests for distutils.core."""
+
+import io
+import distutils.core
+import os
+import shutil
+import sys
+import test.test_support
+import unittest
+
+
+# setup script that uses __file__
+setup_using___file__ = """\
+
+__file__
+
+from distutils.core import setup
+setup()
+"""
+
+setup_prints_cwd = """\
+
+import os
+print(os.getcwd())
+
+from distutils.core import setup
+setup()
+"""
+
+
+class CoreTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.old_stdout = sys.stdout
+        self.cleanup_testfn()
+
+    def tearDown(self):
+        sys.stdout = self.old_stdout
+        self.cleanup_testfn()
+
+    def cleanup_testfn(self):
+        path = test.test_support.TESTFN
+        if os.path.isfile(path):
+            os.remove(path)
+        elif os.path.isdir(path):
+            shutil.rmtree(path)
+
+    def write_setup(self, text, path=test.test_support.TESTFN):
+        open(path, "w").write(text)
+        return path
+
+    def test_run_setup_provides_file(self):
+        # Make sure the script can use __file__; if that's missing, the test
+        # setup.py script will raise NameError.
+        distutils.core.run_setup(
+            self.write_setup(setup_using___file__))
+
+    def test_run_setup_uses_current_dir(self):
+        # This tests that the setup script is run with the current directory
+        # as it's own current directory; this was temporarily broken by a
+        # previous patch when TESTFN did not use the current directory.
+        sys.stdout = io.StringIO()
+        cwd = os.getcwd()
+
+        # Create a directory and write the setup.py file there:
+        os.mkdir(test.test_support.TESTFN)
+        setup_py = os.path.join(test.test_support.TESTFN, "setup.py")
+        distutils.core.run_setup(
+            self.write_setup(setup_prints_cwd, path=setup_py))
+
+        output = sys.stdout.getvalue()
+        if output.endswith("\n"):
+            output = output[:-1]
+        self.assertEqual(cwd, output)
+
+
+def test_suite():
+    return unittest.makeSuite(CoreTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From bbe02c7a83e5792122e71937f50787a18245f27b Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Sat, 5 Apr 2008 23:39:15 +0000
Subject: [PATCH 1963/8469] Fix test_distutils to not fail when running 'make
 test' from a Python build directory that is not the source directory (ie, one
 created using '/path/to/source/configure'.) Leaves this test very slightly
 degraded in that particular case, compared to the build-in-sourcedir case,
 but that case isn't a particularly strong test either: neither test the
 actual path that will be used after installing. There isn't a particularly
 good way to test this, and a poor test beats a failing test.

---
 tests/test_sysconfig.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index d56f7e9bc5..aa1187e77b 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -19,7 +19,27 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
 
     def test_get_python_inc(self):
-        inc_dir = sysconfig.get_python_inc()
+        # The check for srcdir is copied from Python's setup.py,
+        # and is necessary to make this test pass when building
+        # Python in a directory other than the source directory.
+        (srcdir,) = sysconfig.get_config_vars('srcdir')
+        if not srcdir:
+            inc_dir = sysconfig.get_python_inc()
+        else:
+            # This test is not really a proper test: when building
+            # Python from source, even in the same directory,
+            # we won't be testing the same thing as when running
+            # distutils' tests on an installed Python. Nevertheless,
+            # let's try to do our best: if we are running Python's
+            # unittests from a build directory that is not the source
+            # directory, the normal inc_dir will exist, it will just not
+            # contain anything of interest.
+            inc_dir = sysconfig.get_python_inc()
+            self.assert_(os.path.isdir(inc_dir))
+            # Now test the source location, to make sure Python.h does
+            # exist.
+            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
+            inc_dir = os.path.normpath(inc_dir)
         self.assert_(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
         self.assert_(os.path.isfile(python_h), python_h)

From 6b17a395e92863f9bb6e93e067d487ed42c0de9b Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Mon, 7 Apr 2008 00:25:59 +0000
Subject: [PATCH 1964/8469] Merged revisions 62179 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62179 | thomas.wouters | 2008-04-06 01:39:15 +0200 (Sun, 06 Apr 2008) | 10 lines


  Fix test_distutils to not fail when running 'make test' from a Python build
  directory that is not the source directory (ie, one created using
  '/path/to/source/configure'.) Leaves this test very slightly degraded in
  that particular case, compared to the build-in-sourcedir case, but that case
  isn't a particularly strong test either: neither test the actual path that
  will be used after installing. There isn't a particularly good way to test
  this, and a poor test beats a failing test.
........
---
 tests/test_sysconfig.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index d56f7e9bc5..aa1187e77b 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -19,7 +19,27 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
 
     def test_get_python_inc(self):
-        inc_dir = sysconfig.get_python_inc()
+        # The check for srcdir is copied from Python's setup.py,
+        # and is necessary to make this test pass when building
+        # Python in a directory other than the source directory.
+        (srcdir,) = sysconfig.get_config_vars('srcdir')
+        if not srcdir:
+            inc_dir = sysconfig.get_python_inc()
+        else:
+            # This test is not really a proper test: when building
+            # Python from source, even in the same directory,
+            # we won't be testing the same thing as when running
+            # distutils' tests on an installed Python. Nevertheless,
+            # let's try to do our best: if we are running Python's
+            # unittests from a build directory that is not the source
+            # directory, the normal inc_dir will exist, it will just not
+            # contain anything of interest.
+            inc_dir = sysconfig.get_python_inc()
+            self.assert_(os.path.isdir(inc_dir))
+            # Now test the source location, to make sure Python.h does
+            # exist.
+            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
+            inc_dir = os.path.normpath(inc_dir)
         self.assert_(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
         self.assert_(os.path.isfile(python_h), python_h)

From 9351875b842427a4cf795d32ecec02dbd992cff7 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Mon, 7 Apr 2008 01:53:39 +0000
Subject: [PATCH 1965/8469] Issue #2513: enable 64bit cross compilation on
 windows.

---
 command/bdist.py              |   6 ++-
 command/bdist_msi.py          |  20 ++++++----
 command/bdist_wininst.py      |  28 +++++++++----
 command/build.py              |  18 ++++++++-
 command/build_ext.py          |  30 ++++++++++++--
 command/install.py            |   9 +++++
 command/wininst-9.0-amd64.exe | Bin 0 -> 76288 bytes
 msvc9compiler.py              |  72 ++++++++++++++++++++--------------
 msvccompiler.py               |   2 +-
 util.py                       |   4 +-
 10 files changed, 135 insertions(+), 54 deletions(-)
 create mode 100644 command/wininst-9.0-amd64.exe

diff --git a/command/bdist.py b/command/bdist.py
index d6897d2d09..ca3da74c06 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -97,7 +97,10 @@ def initialize_options (self):
     def finalize_options (self):
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
-            self.plat_name = get_platform()
+            if self.skip_build:
+                self.plat_name = get_platform()
+            else:
+                self.plat_name = self.get_finalized_command('build').plat_name
 
         # 'bdist_base' -- parent of per-built-distribution-format
         # temporary directories (eg. we'll probably have
@@ -121,7 +124,6 @@ def finalize_options (self):
 
     # finalize_options()
 
-
     def run (self):
 
         # Figure out which sub-commands we need to run.
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index a4014525b7..f94d9579d2 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -9,11 +9,11 @@
 
 import sys, os
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree
 from distutils.sysconfig import get_python_version
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
+from distutils.util import get_platform
 from distutils import log
 import msilib
 from msilib import schema, sequence, text
@@ -87,6 +87,9 @@ class bdist_msi (Command):
 
     user_options = [('bdist-dir=', None,
                      "temporary directory for creating the distribution"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
@@ -116,6 +119,7 @@ class bdist_msi (Command):
 
     def initialize_options (self):
         self.bdist_dir = None
+        self.plat_name = None
         self.keep_temp = 0
         self.no_target_compile = 0
         self.no_target_optimize = 0
@@ -139,7 +143,10 @@ def finalize_options (self):
         else:
             self.target_version = short_version
 
-        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist',
+                                   ('dist_dir', 'dist_dir'),
+                                   ('plat_name', 'plat_name'),
+                                   )
 
         if self.pre_install_script:
             raise DistutilsOptionError, "the pre-install-script feature is not yet implemented"
@@ -181,7 +188,7 @@ def run (self):
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
                 target_version = sys.version[0:3]
-            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
                                            'lib' + plat_specifier)
@@ -633,8 +640,7 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
-        plat = get_platform()
-        installer_name = os.path.join(self.dist_dir,
-                                      "%s.%s-py%s.msi" %
-                                       (fullname, plat, self.target_version))
+        base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
+                                        self.target_version)
+        installer_name = os.path.join(self.dist_dir, base_name)
         return installer_name
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b0691fb823..02542afbd3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -21,6 +21,9 @@ class bdist_wininst (Command):
 
     user_options = [('bdist-dir=', None,
                      "temporary directory for creating the distribution"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
@@ -54,6 +57,7 @@ class bdist_wininst (Command):
 
     def initialize_options (self):
         self.bdist_dir = None
+        self.plat_name = None
         self.keep_temp = 0
         self.no_target_compile = 0
         self.no_target_optimize = 0
@@ -82,7 +86,10 @@ def finalize_options (self):
                       " option must be specified" % (short_version,)
             self.target_version = short_version
 
-        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist',
+                                   ('dist_dir', 'dist_dir'),
+                                   ('plat_name', 'plat_name'),
+                                  )
 
         if self.install_script:
             for script in self.distribution.scripts:
@@ -110,6 +117,7 @@ def run (self):
         install.root = self.bdist_dir
         install.skip_build = self.skip_build
         install.warn_dir = 0
+        install.plat_name = self.plat_name
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files
@@ -127,7 +135,7 @@ def run (self):
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
                 target_version = sys.version[0:3]
-            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
                                            'lib' + plat_specifier)
@@ -285,11 +293,11 @@ def get_installer_filename(self, fullname):
             # if we create an installer for a specific python version,
             # it's better to include this in the name
             installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32-py%s.exe" %
-                                           (fullname, self.target_version))
+                                          "%s.%s-py%s.exe" %
+                                           (fullname, self.plat_name, self.target_version))
         else:
             installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32.exe" % fullname)
+                                          "%s.%s.exe" % (fullname, self.plat_name))
         return installer_name
     # get_installer_filename()
 
@@ -312,9 +320,9 @@ def get_exe_bytes (self):
                 bv = get_build_version()
             else:
                 if self.target_version < "2.4":
-                    bv = "6"
+                    bv = 6.0
                 else:
-                    bv = "7.1"
+                    bv = 7.1
         else:
             # for current version - use authoritative check.
             bv = get_build_version()
@@ -323,6 +331,10 @@ def get_exe_bytes (self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        filename = os.path.join(directory, "wininst-%.1f.exe" % bv)
+        if self.plat_name == 'win32':
+            sfix = ''
+        else:
+            sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+        filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
         return open(filename, "rb").read()
 # class bdist_wininst
diff --git a/command/build.py b/command/build.py
index bca031f730..7462e9348f 100644
--- a/command/build.py
+++ b/command/build.py
@@ -8,6 +8,7 @@
 
 import sys, os
 from distutils.core import Command
+from distutils.errors import DistutilsOptionError
 from distutils.util import get_platform
 
 
@@ -34,6 +35,9 @@ class build (Command):
          "build directory for scripts"),
         ('build-temp=', 't',
          "temporary build directory"),
+        ('plat-name=', 'p',
+         "platform name to build for, if supported "
+         "(default: %s)" % get_platform()),
         ('compiler=', 'c',
          "specify the compiler type"),
         ('debug', 'g',
@@ -61,13 +65,25 @@ def initialize_options (self):
         self.build_temp = None
         self.build_scripts = None
         self.compiler = None
+        self.plat_name = None
         self.debug = None
         self.force = 0
         self.executable = None
 
     def finalize_options (self):
 
-        plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
+        if self.plat_name is None:
+            self.plat_name = get_platform()
+        else:
+            # plat-name only supported for windows (other platforms are
+            # supported via ./configure flags, if at all).  Avoid misleading
+            # other platforms.
+            if os.name != 'nt':
+                raise DistutilsOptionError(
+                            "--plat-name only supported on Windows (try "
+                            "using './configure --help' on your platform)")
+
+        plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3])
 
         # Make it so Python 2.x and Python 2.x with --with-pydebug don't
         # share the same build directories. Doing so confuses the build
diff --git a/command/build_ext.py b/command/build_ext.py
index 3042fe0223..bf5ad7e00b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -15,6 +15,7 @@
 from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils.util import get_platform
 from distutils import log
 
 if os.name == 'nt':
@@ -60,6 +61,9 @@ class build_ext (Command):
          "directory for compiled extension modules"),
         ('build-temp=', 't',
          "directory for temporary files (build by-products)"),
+        ('plat-name=', 'p',
+         "platform name to cross-compile for, if supported "
+         "(default: %s)" % get_platform()),
         ('inplace', 'i',
          "ignore build-lib and put compiled extensions into the source " +
          "directory alongside your pure Python modules"),
@@ -101,6 +105,7 @@ class build_ext (Command):
     def initialize_options (self):
         self.extensions = None
         self.build_lib = None
+        self.plat_name = None
         self.build_temp = None
         self.inplace = 0
         self.package = None
@@ -127,7 +132,9 @@ def finalize_options (self):
                                    ('build_temp', 'build_temp'),
                                    ('compiler', 'compiler'),
                                    ('debug', 'debug'),
-                                   ('force', 'force'))
+                                   ('force', 'force'),
+                                   ('plat_name', 'plat_name'),
+                                   )
 
         if self.package is None:
             self.package = self.distribution.ext_package
@@ -171,6 +178,9 @@ def finalize_options (self):
         # for Release and Debug builds.
         # also Python's library directory must be appended to library_dirs
         if os.name == 'nt':
+            # the 'libs' directory is for binary installs - we assume that
+            # must be the *native* platform.  But we don't really support
+            # cross-compiling via a binary install anyway, so we let it go.
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs'))
             if self.debug:
                 self.build_temp = os.path.join(self.build_temp, "Debug")
@@ -181,8 +191,17 @@ def finalize_options (self):
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
             if MSVC_VERSION == 9:
-                self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCbuild'))
+                # Use the .lib files for the correct architecture
+                if self.plat_name == 'win32':
+                    suffix = ''
+                else:
+                    # win-amd64 or win-ia64
+                    suffix = self.plat_name[4:]
+                new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
+                if suffix:
+                    new_lib = os.path.join(new_lib, suffix)
+                self.library_dirs.append(new_lib)
+
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS8.0', 'win32release'))
@@ -275,6 +294,11 @@ def run (self):
                                      dry_run=self.dry_run,
                                      force=self.force)
         customize_compiler(self.compiler)
+        # If we are cross-compiling, init the compiler now (if we are not
+        # cross-compiling, init would not hurt, but people may rely on
+        # late initialization of compiler even if they shouldn't...)
+        if os.name == 'nt' and self.plat_name != get_platform():
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
diff --git a/command/install.py b/command/install.py
index 0d39b91cc3..33a1212b0a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -16,6 +16,7 @@
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
+from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
 
 if sys.version < "2.2":
@@ -503,6 +504,14 @@ def run (self):
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
+            # If we built for any other platform, we can't install.
+            build_plat = self.distribution.get_command_obj('build').plat_name
+            # check warn_dir - it is a clue that the 'install' is happening
+            # internally, and not to sys.path, so we don't check the platform
+            # matches what we are running.
+            if self.warn_dir and build_plat != get_platform():
+                raise DistutilsPlatformError("Can't install when "
+                                             "cross-compiling")
 
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..c99ede4b3fcebe39b1a1e33283307e12c42b7b2e
GIT binary patch
literal 76288
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
INt;an1b{yP$^ZZW

literal 0
HcmV?d00001

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 828d7fbf7a..8b1cf9a910 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -22,6 +22,7 @@
 from distutils.ccompiler import (CCompiler, gen_preprocess_options,
     gen_lib_options)
 from distutils import log
+from distutils.util import get_platform
 
 import _winreg
 
@@ -38,13 +39,15 @@
 VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
 WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
 NET_BASE = r"Software\Microsoft\.NETFramework"
-ARCHS = {'DEFAULT' : 'x86',
-    'intel' : 'x86', 'x86' : 'x86',
-    'amd64' : 'x64', 'x64' : 'x64',
-    'itanium' : 'ia64', 'ia64' : 'ia64',
-    }
 
-# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
+# A map keyed by get_platform() return values to values accepted by
+# 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is
+# the param to cross-compile on x86 targetting amd64.)
+PLAT_TO_VCVARS = {
+    'win32' : 'x86',
+    'win-amd64' : 'amd64',
+    'win-ia64' : 'ia64',
+}
 
 class Reg:
     """Helper class to read values from the registry
@@ -176,23 +179,6 @@ def get_build_version():
     # else we don't know what version of the compiler this is
     return None
 
-def get_build_architecture():
-    """Return the processor architecture.
-
-    Possible results are "x86" or "amd64".
-    """
-    prefix = " bit ("
-    i = sys.version.find(prefix)
-    if i == -1:
-        return "x86"
-    j = sys.version.find(")", i)
-    sysarch = sys.version[i+len(prefix):j].lower()
-    arch = ARCHS.get(sysarch, None)
-    if arch is None:
-        return ARCHS['DEFAULT']
-    else:
-        return arch
-
 def normalize_and_reduce_paths(paths):
     """Return a list of normalized paths with duplicates removed.
 
@@ -251,6 +237,7 @@ def query_vcvarsall(version, arch="x86"):
 
     if vcvarsall is None:
         raise IOError("Unable to find vcvarsall.bat")
+    log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
@@ -281,9 +268,7 @@ def query_vcvarsall(version, arch="x86"):
 VERSION = get_build_version()
 if VERSION < 8.0:
     raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
-ARCH = get_build_architecture()
 # MACROS = MacroExpander(VERSION)
-VC_ENV = query_vcvarsall(VERSION, ARCH)
 
 class MSVCCompiler(CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -318,13 +303,25 @@ class MSVCCompiler(CCompiler) :
     def __init__(self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
         self.__version = VERSION
-        self.__arch = ARCH
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
         self.__path = []
+        # target platform (.plat_name is consistent with 'bdist')
+        self.plat_name = None
+        self.__arch = None # deprecated name
         self.initialized = False
 
-    def initialize(self):
+    def initialize(self, plat_name=None):
+        # multi-init means we would need to check platform same each time...
+        assert not self.initialized, "don't init multiple times"
+        if plat_name is None:
+            plat_name = get_platform()
+        # sanity check for platforms to prevent obscure errors later.
+        ok_plats = 'win32', 'win-amd64', 'win-ia64'
+        if plat_name not in ok_plats:
+            raise DistutilsPlatformError("--plat-name must be one of %s" %
+                                         (ok_plats,))
+
         if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
@@ -334,9 +331,24 @@ def initialize(self):
             self.rc = "rc.exe"
             self.mc = "mc.exe"
         else:
-            self.__paths = VC_ENV['path'].split(os.pathsep)
-            os.environ['lib'] = VC_ENV['lib']
-            os.environ['include'] = VC_ENV['include']
+            # On x86, 'vcvars32.bat amd64' creates an env that doesn't work;
+            # to cross compile, you use 'x86_amd64'.
+            # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
+            # compile use 'x86' (ie, it runs the x86 compiler directly)
+            # No idea how itanium handles this, if at all.
+            if plat_name == get_platform() or plat_name == 'win32':
+                # native build or cross-compile to win32
+                plat_spec = PLAT_TO_VCVARS[plat_name]
+            else:
+                # cross compile from win32 -> some 64bit
+                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
+                            PLAT_TO_VCVARS[plat_name]
+
+            vc_env = query_vcvarsall(VERSION, plat_spec)
+
+            self.__paths = vc_env['path'].split(os.pathsep)
+            os.environ['lib'] = vc_env['lib']
+            os.environ['include'] = vc_env['include']
 
             if len(self.__paths) == 0:
                 raise DistutilsPlatformError("Python was built with %s, "
diff --git a/msvccompiler.py b/msvccompiler.py
index f3acb53477..30a9fc6f22 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -656,5 +656,5 @@ def set_path_env_var(self, name):
     log.debug("Importing new compiler from distutils.msvc9compiler")
     OldMSVCCompiler = MSVCCompiler
     from distutils.msvc9compiler import MSVCCompiler
-    from distutils.msvc9compiler import get_build_architecture
+    # get_build_architecture not really relevant now we support cross-compile
     from distutils.msvc9compiler import MacroExpander
diff --git a/util.py b/util.py
index deb9a0a0f1..69d90cffb8 100644
--- a/util.py
+++ b/util.py
@@ -30,7 +30,7 @@ def get_platform ():
        irix64-6.2
 
     Windows will return one of:
-       win-x86_64 (64bit Windows on x86_64 (AMD64))
+       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
        win-ia64 (64bit Windows on Itanium)
        win32 (all others - specifically, sys.platform is returned)
 
@@ -45,7 +45,7 @@ def get_platform ():
         j = string.find(sys.version, ")", i)
         look = sys.version[i+len(prefix):j].lower()
         if look=='amd64':
-            return 'win-x86_64'
+            return 'win-amd64'
         if look=='itanium':
             return 'win-ia64'
         return sys.platform

From f39783d33eeae201072044971535a43415e3e78f Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 9 Apr 2008 08:37:03 +0000
Subject: [PATCH 1966/8469] Merged revisions
 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62194 | jeffrey.yasskin | 2008-04-07 01:04:28 +0200 (Mon, 07 Apr 2008) | 7 lines

  Add enough debugging information to diagnose failures where the
  HandlerBException is ignored, and fix one such problem, where it was thrown
  during the __del__ method of the previous Popen object.

  We may want to find a better way of printing verbose information so it's not
  spammy when the test passes.
........
  r62197 | mark.hammond | 2008-04-07 03:53:39 +0200 (Mon, 07 Apr 2008) | 2 lines

  Issue #2513: enable 64bit cross compilation on windows.
........
  r62198 | mark.hammond | 2008-04-07 03:59:40 +0200 (Mon, 07 Apr 2008) | 2 lines

  correct heading underline for new "Cross-compiling on Windows" section
........
  r62204 | gregory.p.smith | 2008-04-07 08:33:21 +0200 (Mon, 07 Apr 2008) | 4 lines

  Use the new PyFile_IncUseCount & PyFile_DecUseCount calls appropriatly
  within the standard library.  These modules use PyFile_AsFile and later
  release the GIL while operating on the previously returned FILE*.
........
  r62205 | mark.summerfield | 2008-04-07 09:39:23 +0200 (Mon, 07 Apr 2008) | 4 lines

  changed "2500 components" to "several thousand" since the number keeps
  growning:-)
........
  r62214 | georg.brandl | 2008-04-07 20:51:59 +0200 (Mon, 07 Apr 2008) | 2 lines

  #2525: update timezone info examples in the docs.
........
  r62219 | andrew.kuchling | 2008-04-08 01:57:07 +0200 (Tue, 08 Apr 2008) | 1 line

  Write PEP 3127 section; add items
........
  r62220 | andrew.kuchling | 2008-04-08 01:57:21 +0200 (Tue, 08 Apr 2008) | 1 line

  Typo fix
........
  r62221 | andrew.kuchling | 2008-04-08 03:33:10 +0200 (Tue, 08 Apr 2008) | 1 line

  Typographical fix: 32bit -> 32-bit, 64bit -> 64-bit
........
  r62227 | andrew.kuchling | 2008-04-08 23:22:53 +0200 (Tue, 08 Apr 2008) | 1 line

  Add items
........
  r62229 | amaury.forgeotdarc | 2008-04-08 23:27:42 +0200 (Tue, 08 Apr 2008) | 7 lines

  Issue2564: Prevent a hang in "import test.autotest", which runs the entire test
  suite as a side-effect of importing the module.

  - in test_capi, a thread tried to import other modules
  - re.compile() imported sre_parse again on every call.
........
  r62230 | amaury.forgeotdarc | 2008-04-08 23:51:57 +0200 (Tue, 08 Apr 2008) | 2 lines

  Prevent an error when inspect.isabstract() is called with something else than a new-style class.
........
  r62231 | amaury.forgeotdarc | 2008-04-09 00:07:05 +0200 (Wed, 09 Apr 2008) | 8 lines

  Issue 2408: remove the _types module
  It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType),
  when they can easily be obtained with python code.
  These expressions even work with Jython.

  I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 )
  at least this change makes it simpler.
........
  r62233 | amaury.forgeotdarc | 2008-04-09 01:10:07 +0200 (Wed, 09 Apr 2008) | 2 lines

  Add a NEWS entry for previous checkin
........
  r62234 | trent.nelson | 2008-04-09 01:47:30 +0200 (Wed, 09 Apr 2008) | 37 lines

  - Issue #2550: The approach used by client/server code for obtaining ports
    to listen on in network-oriented tests has been refined in an effort to
    facilitate running multiple instances of the entire regression test suite
    in parallel without issue.  test_support.bind_port() has been fixed such
    that it will always return a unique port -- which wasn't always the case
    with the previous implementation, especially if socket options had been
    set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT).  The
    new implementation of bind_port() will actually raise an exception if it
    is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
    SO_REUSEPORT socket option set.  Furthermore, if available, bind_port()
    will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
    This currently only applies to Windows.  This option prevents any other
    sockets from binding to the host/port we've bound to, thus removing the
    possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
    that occurs when a second SOCK_STREAM socket binds and accepts to a
    host/port that's already been bound by another socket.  The optional
    preferred port parameter to bind_port() has been removed.  Under no
    circumstances should tests be hard coding ports!

    test_support.find_unused_port() has also been introduced, which will pass
    a temporary socket object to bind_port() in order to obtain an unused port.
    The temporary socket object is then closed and deleted, and the port is
    returned.  This method should only be used for obtaining an unused port
    in order to pass to an external program (i.e. the -accept [port] argument
    to openssl's s_server mode) or as a parameter to a server-oriented class
    that doesn't give you direct access to the underlying socket used.

    Finally, test_support.HOST has been introduced, which should be used for
    the host argument of any relevant socket calls (i.e. bind and connect).

    The following tests were updated to following the new conventions:
      test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
      test_poplib, test_ftplib, test_telnetlib, test_socketserver,
      test_asynchat and test_socket_ssl.

    It is now possible for multiple instances of the regression test suite to
    run in parallel without issue.
........
  r62235 | gregory.p.smith | 2008-04-09 02:25:17 +0200 (Wed, 09 Apr 2008) | 3 lines

  Fix zlib crash from zlib.decompressobj().flush(val) when val was not positive.
  It tried to allocate negative or zero memory.  That fails.
........
  r62237 | trent.nelson | 2008-04-09 02:34:53 +0200 (Wed, 09 Apr 2008) | 1 line

  Fix typo with regards to self.PORT shadowing class variables with the same name.
........
  r62238 | andrew.kuchling | 2008-04-09 03:08:32 +0200 (Wed, 09 Apr 2008) | 1 line

  Add items
........
  r62239 | jerry.seutter | 2008-04-09 07:07:58 +0200 (Wed, 09 Apr 2008) | 1 line

  Changed test so it no longer runs as a side effect of importing.
........
---
 command/bdist.py              |   5 ++-
 command/bdist_msi.py          |  20 ++++++----
 command/bdist_wininst.py      |  28 +++++++++----
 command/build.py              |  18 ++++++++-
 command/build_ext.py          |  30 ++++++++++++--
 command/install.py            |   9 +++++
 command/wininst-9.0-amd64.exe | Bin 0 -> 76288 bytes
 msvc9compiler.py              |  72 ++++++++++++++++++++--------------
 msvccompiler.py               |   2 +-
 util.py                       |   4 +-
 10 files changed, 135 insertions(+), 53 deletions(-)
 create mode 100644 command/wininst-9.0-amd64.exe

diff --git a/command/bdist.py b/command/bdist.py
index 69c1b28ff2..e3b047c66f 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -91,7 +91,10 @@ def initialize_options(self):
     def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
-            self.plat_name = get_platform()
+            if self.skip_build:
+                self.plat_name = get_platform()
+            else:
+                self.plat_name = self.get_finalized_command('build').plat_name
 
         # 'bdist_base' -- parent of per-built-distribution-format
         # temporary directories (eg. we'll probably have
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index d313a5082f..aab89cd609 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -9,11 +9,11 @@
 
 import sys, os
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree
 from distutils.sysconfig import get_python_version
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
+from distutils.util import get_platform
 from distutils import log
 import msilib
 from msilib import schema, sequence, text
@@ -87,6 +87,9 @@ class bdist_msi(Command):
 
     user_options = [('bdist-dir=', None,
                      "temporary directory for creating the distribution"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
@@ -116,6 +119,7 @@ class bdist_msi(Command):
 
     def initialize_options(self):
         self.bdist_dir = None
+        self.plat_name = None
         self.keep_temp = 0
         self.no_target_compile = 0
         self.no_target_optimize = 0
@@ -139,7 +143,10 @@ def finalize_options(self):
         else:
             self.target_version = short_version
 
-        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist',
+                                   ('dist_dir', 'dist_dir'),
+                                   ('plat_name', 'plat_name'),
+                                   )
 
         if self.pre_install_script:
             raise DistutilsOptionError(
@@ -180,7 +187,7 @@ def run(self):
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
                 target_version = sys.version[0:3]
-            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
                                            'lib' + plat_specifier)
@@ -633,8 +640,7 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
-        plat = get_platform()
-        installer_name = os.path.join(self.dist_dir,
-                                      "%s.%s-py%s.msi" %
-                                       (fullname, plat, self.target_version))
+        base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
+                                        self.target_version)
+        installer_name = os.path.join(self.dist_dir, base_name)
         return installer_name
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 2d75a38f74..bf8d022ae8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -19,6 +19,9 @@ class bdist_wininst(Command):
 
     user_options = [('bdist-dir=', None,
                      "temporary directory for creating the distribution"),
+                    ('plat-name=', 'p',
+                     "platform name to embed in generated filenames "
+                     "(default: %s)" % get_platform()),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
@@ -52,6 +55,7 @@ class bdist_wininst(Command):
 
     def initialize_options(self):
         self.bdist_dir = None
+        self.plat_name = None
         self.keep_temp = 0
         self.no_target_compile = 0
         self.no_target_optimize = 0
@@ -78,7 +82,10 @@ def finalize_options(self):
                       " option must be specified" % (short_version,))
             self.target_version = short_version
 
-        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist',
+                                   ('dist_dir', 'dist_dir'),
+                                   ('plat_name', 'plat_name'),
+                                  )
 
         if self.install_script:
             for script in self.distribution.scripts:
@@ -104,6 +111,7 @@ def run(self):
         install.root = self.bdist_dir
         install.skip_build = self.skip_build
         install.warn_dir = 0
+        install.plat_name = self.plat_name
 
         install_lib = self.reinitialize_command('install_lib')
         # we do not want to include pyc or pyo files
@@ -121,7 +129,7 @@ def run(self):
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
                 target_version = sys.version[0:3]
-            plat_specifier = ".%s-%s" % (get_platform(), target_version)
+            plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
                                            'lib' + plat_specifier)
@@ -267,11 +275,11 @@ def get_installer_filename(self, fullname):
             # if we create an installer for a specific python version,
             # it's better to include this in the name
             installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32-py%s.exe" %
-                                           (fullname, self.target_version))
+                                          "%s.%s-py%s.exe" %
+                                           (fullname, self.plat_name, self.target_version))
         else:
             installer_name = os.path.join(self.dist_dir,
-                                          "%s.win32.exe" % fullname)
+                                          "%s.%s.exe" % (fullname, self.plat_name))
         return installer_name
 
     def get_exe_bytes(self):
@@ -293,9 +301,9 @@ def get_exe_bytes(self):
                 bv = get_build_version()
             else:
                 if self.target_version < "2.4":
-                    bv = "6"
+                    bv = 6.0
                 else:
-                    bv = "7.1"
+                    bv = 7.1
         else:
             # for current version - use authoritative check.
             bv = get_build_version()
@@ -304,5 +312,9 @@ def get_exe_bytes(self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        filename = os.path.join(directory, "wininst-%.1f.exe" % bv)
+        if self.plat_name == 'win32':
+            sfix = ''
+        else:
+            sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+        filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
         return open(filename, "rb").read()
diff --git a/command/build.py b/command/build.py
index 4fe95b0cfb..9c2667cfd2 100644
--- a/command/build.py
+++ b/command/build.py
@@ -6,6 +6,7 @@
 
 import sys, os
 from distutils.core import Command
+from distutils.errors import DistutilsOptionError
 from distutils.util import get_platform
 
 
@@ -32,6 +33,9 @@ class build(Command):
          "build directory for scripts"),
         ('build-temp=', 't',
          "temporary build directory"),
+        ('plat-name=', 'p',
+         "platform name to build for, if supported "
+         "(default: %s)" % get_platform()),
         ('compiler=', 'c',
          "specify the compiler type"),
         ('debug', 'g',
@@ -59,12 +63,24 @@ def initialize_options(self):
         self.build_temp = None
         self.build_scripts = None
         self.compiler = None
+        self.plat_name = None
         self.debug = None
         self.force = 0
         self.executable = None
 
     def finalize_options(self):
-        plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
+        if self.plat_name is None:
+            self.plat_name = get_platform()
+        else:
+            # plat-name only supported for windows (other platforms are
+            # supported via ./configure flags, if at all).  Avoid misleading
+            # other platforms.
+            if os.name != 'nt':
+                raise DistutilsOptionError(
+                            "--plat-name only supported on Windows (try "
+                            "using './configure --help' on your platform)")
+
+        plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3])
 
         # Make it so Python 2.x and Python 2.x with --with-pydebug don't
         # share the same build directories. Doing so confuses the build
diff --git a/command/build_ext.py b/command/build_ext.py
index ff84bca7a0..e01121986c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -12,6 +12,7 @@
 from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils.util import get_platform
 from distutils import log
 
 if os.name == 'nt':
@@ -57,6 +58,9 @@ class build_ext(Command):
          "directory for compiled extension modules"),
         ('build-temp=', 't',
          "directory for temporary files (build by-products)"),
+        ('plat-name=', 'p',
+         "platform name to cross-compile for, if supported "
+         "(default: %s)" % get_platform()),
         ('inplace', 'i',
          "ignore build-lib and put compiled extensions into the source " +
          "directory alongside your pure Python modules"),
@@ -98,6 +102,7 @@ class build_ext(Command):
     def initialize_options(self):
         self.extensions = None
         self.build_lib = None
+        self.plat_name = None
         self.build_temp = None
         self.inplace = 0
         self.package = None
@@ -124,7 +129,9 @@ def finalize_options(self):
                                    ('build_temp', 'build_temp'),
                                    ('compiler', 'compiler'),
                                    ('debug', 'debug'),
-                                   ('force', 'force'))
+                                   ('force', 'force'),
+                                   ('plat_name', 'plat_name'),
+                                   )
 
         if self.package is None:
             self.package = self.distribution.ext_package
@@ -167,6 +174,9 @@ def finalize_options(self):
         # for Release and Debug builds.
         # also Python's library directory must be appended to library_dirs
         if os.name == 'nt':
+            # the 'libs' directory is for binary installs - we assume that
+            # must be the *native* platform.  But we don't really support
+            # cross-compiling via a binary install anyway, so we let it go.
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs'))
             if self.debug:
                 self.build_temp = os.path.join(self.build_temp, "Debug")
@@ -177,8 +187,17 @@ def finalize_options(self):
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
             if MSVC_VERSION == 9:
-                self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PCbuild'))
+                # Use the .lib files for the correct architecture
+                if self.plat_name == 'win32':
+                    suffix = ''
+                else:
+                    # win-amd64 or win-ia64
+                    suffix = self.plat_name[4:]
+                new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
+                if suffix:
+                    new_lib = os.path.join(new_lib, suffix)
+                self.library_dirs.append(new_lib)
+
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS8.0', 'win32release'))
@@ -267,6 +286,11 @@ def run(self):
                                      dry_run=self.dry_run,
                                      force=self.force)
         customize_compiler(self.compiler)
+        # If we are cross-compiling, init the compiler now (if we are not
+        # cross-compiling, init would not hurt, but people may rely on
+        # late initialization of compiler even if they shouldn't...)
+        if os.name == 'nt' and self.plat_name != get_platform():
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
diff --git a/command/install.py b/command/install.py
index e4ee680271..50884c3337 100644
--- a/command/install.py
+++ b/command/install.py
@@ -13,6 +13,7 @@
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
 from distutils.util import convert_path, subst_vars, change_root
+from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
 
 if sys.version < "2.2":
@@ -485,6 +486,14 @@ def run(self):
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
+            # If we built for any other platform, we can't install.
+            build_plat = self.distribution.get_command_obj('build').plat_name
+            # check warn_dir - it is a clue that the 'install' is happening
+            # internally, and not to sys.path, so we don't check the platform
+            # matches what we are running.
+            if self.warn_dir and build_plat != get_platform():
+                raise DistutilsPlatformError("Can't install when "
+                                             "cross-compiling")
 
         # Run all sub-commands (at least those that need to be run)
         for cmd_name in self.get_sub_commands():
diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..c99ede4b3fcebe39b1a1e33283307e12c42b7b2e
GIT binary patch
literal 76288
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
INt;an1b{yP$^ZZW

literal 0
HcmV?d00001

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 828d7fbf7a..8b1cf9a910 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -22,6 +22,7 @@
 from distutils.ccompiler import (CCompiler, gen_preprocess_options,
     gen_lib_options)
 from distutils import log
+from distutils.util import get_platform
 
 import _winreg
 
@@ -38,13 +39,15 @@
 VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
 WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
 NET_BASE = r"Software\Microsoft\.NETFramework"
-ARCHS = {'DEFAULT' : 'x86',
-    'intel' : 'x86', 'x86' : 'x86',
-    'amd64' : 'x64', 'x64' : 'x64',
-    'itanium' : 'ia64', 'ia64' : 'ia64',
-    }
 
-# The globals VERSION, ARCH, MACROS and VC_ENV are defined later
+# A map keyed by get_platform() return values to values accepted by
+# 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is
+# the param to cross-compile on x86 targetting amd64.)
+PLAT_TO_VCVARS = {
+    'win32' : 'x86',
+    'win-amd64' : 'amd64',
+    'win-ia64' : 'ia64',
+}
 
 class Reg:
     """Helper class to read values from the registry
@@ -176,23 +179,6 @@ def get_build_version():
     # else we don't know what version of the compiler this is
     return None
 
-def get_build_architecture():
-    """Return the processor architecture.
-
-    Possible results are "x86" or "amd64".
-    """
-    prefix = " bit ("
-    i = sys.version.find(prefix)
-    if i == -1:
-        return "x86"
-    j = sys.version.find(")", i)
-    sysarch = sys.version[i+len(prefix):j].lower()
-    arch = ARCHS.get(sysarch, None)
-    if arch is None:
-        return ARCHS['DEFAULT']
-    else:
-        return arch
-
 def normalize_and_reduce_paths(paths):
     """Return a list of normalized paths with duplicates removed.
 
@@ -251,6 +237,7 @@ def query_vcvarsall(version, arch="x86"):
 
     if vcvarsall is None:
         raise IOError("Unable to find vcvarsall.bat")
+    log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
@@ -281,9 +268,7 @@ def query_vcvarsall(version, arch="x86"):
 VERSION = get_build_version()
 if VERSION < 8.0:
     raise DistutilsPlatformError("VC %0.1f is not supported by this module" % VERSION)
-ARCH = get_build_architecture()
 # MACROS = MacroExpander(VERSION)
-VC_ENV = query_vcvarsall(VERSION, ARCH)
 
 class MSVCCompiler(CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
@@ -318,13 +303,25 @@ class MSVCCompiler(CCompiler) :
     def __init__(self, verbose=0, dry_run=0, force=0):
         CCompiler.__init__ (self, verbose, dry_run, force)
         self.__version = VERSION
-        self.__arch = ARCH
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
         self.__path = []
+        # target platform (.plat_name is consistent with 'bdist')
+        self.plat_name = None
+        self.__arch = None # deprecated name
         self.initialized = False
 
-    def initialize(self):
+    def initialize(self, plat_name=None):
+        # multi-init means we would need to check platform same each time...
+        assert not self.initialized, "don't init multiple times"
+        if plat_name is None:
+            plat_name = get_platform()
+        # sanity check for platforms to prevent obscure errors later.
+        ok_plats = 'win32', 'win-amd64', 'win-ia64'
+        if plat_name not in ok_plats:
+            raise DistutilsPlatformError("--plat-name must be one of %s" %
+                                         (ok_plats,))
+
         if "DISTUTILS_USE_SDK" in os.environ and "MSSdk" in os.environ and self.find_exe("cl.exe"):
             # Assume that the SDK set up everything alright; don't try to be
             # smarter
@@ -334,9 +331,24 @@ def initialize(self):
             self.rc = "rc.exe"
             self.mc = "mc.exe"
         else:
-            self.__paths = VC_ENV['path'].split(os.pathsep)
-            os.environ['lib'] = VC_ENV['lib']
-            os.environ['include'] = VC_ENV['include']
+            # On x86, 'vcvars32.bat amd64' creates an env that doesn't work;
+            # to cross compile, you use 'x86_amd64'.
+            # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
+            # compile use 'x86' (ie, it runs the x86 compiler directly)
+            # No idea how itanium handles this, if at all.
+            if plat_name == get_platform() or plat_name == 'win32':
+                # native build or cross-compile to win32
+                plat_spec = PLAT_TO_VCVARS[plat_name]
+            else:
+                # cross compile from win32 -> some 64bit
+                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
+                            PLAT_TO_VCVARS[plat_name]
+
+            vc_env = query_vcvarsall(VERSION, plat_spec)
+
+            self.__paths = vc_env['path'].split(os.pathsep)
+            os.environ['lib'] = vc_env['lib']
+            os.environ['include'] = vc_env['include']
 
             if len(self.__paths) == 0:
                 raise DistutilsPlatformError("Python was built with %s, "
diff --git a/msvccompiler.py b/msvccompiler.py
index 3b4e9c9d2d..71146dcfe3 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -638,5 +638,5 @@ def set_path_env_var(self, name):
     log.debug("Importing new compiler from distutils.msvc9compiler")
     OldMSVCCompiler = MSVCCompiler
     from distutils.msvc9compiler import MSVCCompiler
-    from distutils.msvc9compiler import get_build_architecture
+    # get_build_architecture not really relevant now we support cross-compile
     from distutils.msvc9compiler import MacroExpander
diff --git a/util.py b/util.py
index 917f1d0b93..72039a7e6a 100644
--- a/util.py
+++ b/util.py
@@ -30,7 +30,7 @@ def get_platform ():
        irix64-6.2
 
     Windows will return one of:
-       win-x86_64 (64bit Windows on x86_64 (AMD64))
+       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
        win-ia64 (64bit Windows on Itanium)
        win32 (all others - specifically, sys.platform is returned)
 
@@ -45,7 +45,7 @@ def get_platform ():
         j = sys.version.find(")", i)
         look = sys.version[i+len(prefix):j].lower()
         if look == 'amd64':
-            return 'win-x86_64'
+            return 'win-amd64'
         if look == 'itanium':
             return 'win-ia64'
         return sys.platform

From 6d3e6470c91a0dd98c587edd9ef353906a981a17 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 2 May 2008 12:48:15 +0000
Subject: [PATCH 1967/8469] #2581: Vista UAC/elevation support for
 bdist_wininst

---
 command/bdist_wininst.py      |   7 +++++++
 command/wininst-6.0.exe       | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe       | Bin 61440 -> 61440 bytes
 command/wininst-9.0-amd64.exe | Bin 76288 -> 77312 bytes
 command/wininst-9.0.exe       | Bin 65536 -> 66048 bytes
 msvc9compiler.py              |  25 ++++++++++++++++++++++++-
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 02542afbd3..7c43e7459e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -50,6 +50,10 @@ class bdist_wininst (Command):
                      "Fully qualified filename of a script to be run before "
                      "any files are installed.  This script need not be in the "
                      "distribution"),
+                    ('user-access-control=', None,
+                     "specify Vista's UAC handling - 'none'/default=no "
+                     "handling, 'auto'=use UAC if target Python installed for "
+                     "all users, 'force'=always use UAC"),
                    ]
 
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
@@ -68,6 +72,7 @@ def initialize_options (self):
         self.skip_build = 0
         self.install_script = None
         self.pre_install_script = None
+        self.user_access_control = None
 
     # initialize_options()
 
@@ -220,6 +225,8 @@ def escape(s):
         lines.append("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append("target_version=%s" % self.target_version)
+        if self.user_access_control:
+            lines.append("user_access_control=%s" % self.user_access_control)
 
         title = self.title or self.distribution.get_fullname()
         lines.append("title=%s" % escape(title))
diff --git a/command/wininst-6.0.exe b/command/wininst-6.0.exe
index bd715250e780b37e94996e33820070987bcc77fd..10c981993ba2c2e3a977db8ded201a46d529749d 100644
GIT binary patch
delta 19227
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
J=*&lB{};woC0qai

delta 17718
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

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index ee35713940177c0eb8e3cf0435d7a6a9287a27fc..6779aa8d4c1b0d5fb37255f1eea211d92ea6942a 100644
GIT binary patch
delta 24325
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
NZtOiU<M<yJ{2zr1Zq)z)

delta 22932
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
Bkf#6u

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index c99ede4b3fcebe39b1a1e33283307e12c42b7b2e..b4cb062c391d230dbf4a7fc3a16536aa3dbc5b42 100644
GIT binary patch
delta 19961
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
IFg5&t0jk>d#Q*>R

delta 18603
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

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 5e0144c92b58ea750211c540d15667e0b1d1a356..0d04a6678b94b8ecbdde10257396e8c0e85c038c 100644
GIT binary patch
delta 14220
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
Y3Lzl+Y{LX+P*2Vst~WF-?rD$v-(z(%x&QzG

delta 13544
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
CX=EAz

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 8b1cf9a910..c8d52c4237 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -594,14 +594,25 @@ def link(self,
             # needed! Make sure they are generated in the temporary build
             # directory. Since they have different names for debug and release
             # builds, they can go into the same directory.
+            build_temp = os.path.dirname(objects[0])
             if export_symbols is not None:
                 (dll_name, dll_ext) = os.path.splitext(
                     os.path.basename(output_filename))
                 implib_file = os.path.join(
-                    os.path.dirname(objects[0]),
+                    build_temp,
                     self.library_filename(dll_name))
                 ld_args.append ('/IMPLIB:' + implib_file)
 
+            # Embedded manifests are recommended - see MSDN article titled
+            # "How to: Embed a Manifest Inside a C/C++ Application"
+            # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
+            # Ask the linker to generate the manifest in the temp dir, so
+            # we can embed it later.
+            temp_manifest = os.path.join(
+                    build_temp,
+                    os.path.basename(output_filename) + ".manifest")
+            ld_args.append('/MANIFESTFILE:' + temp_manifest)
+
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
@@ -613,6 +624,18 @@ def link(self,
             except DistutilsExecError as msg:
                 raise LinkError(msg)
 
+            # embed the manifest
+            # XXX - this is somewhat fragile - if mt.exe fails, distutils
+            # will still consider the DLL up-to-date, but it will not have a
+            # manifest.  Maybe we should link to a temp file?  OTOH, that
+            # implies a build environment error that shouldn't go undetected.
+            mfid = 1 if target_desc == CCompiler.EXECUTABLE else 2
+            out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
+            try:
+                self.spawn(['mt.exe', '-nologo', '-manifest',
+                            temp_manifest, out_arg])
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 

From 2da7eca35531226358da395c9cd1aacaa81620e9 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 4 May 2008 22:42:01 +0000
Subject: [PATCH 1968/8469] Merged revisions
 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

................
  r62425 | andrew.kuchling | 2008-04-21 03:45:57 +0200 (Mon, 21 Apr 2008) | 1 line

  Comment typo
................
  r62426 | mark.dickinson | 2008-04-21 03:55:50 +0200 (Mon, 21 Apr 2008) | 2 lines

  Silence 'r may be used uninitialized' compiler warning.
................
  r62427 | andrew.kuchling | 2008-04-21 04:08:00 +0200 (Mon, 21 Apr 2008) | 1 line

  Markup fix
................
  r62428 | andrew.kuchling | 2008-04-21 04:08:13 +0200 (Mon, 21 Apr 2008) | 1 line

  Wording changes
................
  r62429 | andrew.kuchling | 2008-04-21 04:14:24 +0200 (Mon, 21 Apr 2008) | 1 line

  Add various items
................
  r62434 | thomas.heller | 2008-04-21 15:46:55 +0200 (Mon, 21 Apr 2008) | 1 line

  Fix typo.
................
  r62435 | david.goodger | 2008-04-21 16:40:22 +0200 (Mon, 21 Apr 2008) | 1 line

  corrections ("reStructuredText" is one word)
................
  r62436 | david.goodger | 2008-04-21 16:43:33 +0200 (Mon, 21 Apr 2008) | 1 line

  capitalization
................
  r62441 | gregory.p.smith | 2008-04-21 19:46:40 +0200 (Mon, 21 Apr 2008) | 2 lines

  explicitly flush after the ... since there wasn't a newline
................
  r62444 | jeroen.ruigrok | 2008-04-21 22:15:39 +0200 (Mon, 21 Apr 2008) | 2 lines

  Windows x64 also falls under VER_PLATFORM_WIN32_NT.
................
  r62446 | gregory.p.smith | 2008-04-21 23:31:08 +0200 (Mon, 21 Apr 2008) | 3 lines

  If sys.stdin is not a tty, fall back to default_getpass after printing
  a warning instead of failing with a termios.error.
................
  r62447 | mark.dickinson | 2008-04-22 00:32:24 +0200 (Tue, 22 Apr 2008) | 8 lines

  test_math and test_cmath are failing on the FreeBSD 6.2 trunk buildbot,
  apparently because tanh(-0.) loses the sign of zero on that platform.
  If true, this is a bug in FreeBSD.

  Added a configure test to verify this.  I still need to figure out
  how best to deal with this failure.
................
  r62448 | amaury.forgeotdarc | 2008-04-22 00:35:30 +0200 (Tue, 22 Apr 2008) | 7 lines

  Issue 2665: On Windows, sys.stderr does not contain a valid file when running without a console.
  It seems to work, but will fail at the first flush.

  This causes IDLE to crash when too many warnings are printed.

  Will backport.
................
  r62450 | benjamin.peterson | 2008-04-22 00:57:00 +0200 (Tue, 22 Apr 2008) | 2 lines

  Fix Sphinx warnings
................
  r62451 | mark.dickinson | 2008-04-22 02:54:27 +0200 (Tue, 22 Apr 2008) | 3 lines

  Make configure test for tanh(-0.) == -0. committed in r62447 actually
  work.  (The test wasn't properly linked with libm.  Sigh.)
................
  r62452 | benjamin.peterson | 2008-04-22 04:16:03 +0200 (Tue, 22 Apr 2008) | 2 lines

  Various io doc updates
................
  r62453 | neal.norwitz | 2008-04-22 07:07:47 +0200 (Tue, 22 Apr 2008) | 1 line

  Add Thomas Lee
................
  r62454 | gregory.p.smith | 2008-04-22 10:08:41 +0200 (Tue, 22 Apr 2008) | 8 lines

  Major improvements:
  * Default to using /dev/tty for the password prompt and input before
    falling back to sys.stdin and sys.stderr.
  * Use sys.stderr instead of sys.stdout.
  * print the 'password may be echoed' warning to stream used to display
    the prompt rather than always sys.stderr.
  * warn() with GetPassWarning when input may be echoed.
................
  r62455 | gregory.p.smith | 2008-04-22 10:11:33 +0200 (Tue, 22 Apr 2008) | 2 lines

  update the getpass entry
................
  r62463 | amaury.forgeotdarc | 2008-04-22 23:14:41 +0200 (Tue, 22 Apr 2008) | 5 lines

  Issue #2670: urllib2.build_opener() failed when two handlers
  derive the same default base class.

  Will backport.
................
  r62465 | skip.montanaro | 2008-04-23 00:45:09 +0200 (Wed, 23 Apr 2008) | 3 lines

  Factor in documentation changes from issue 1753732.
................
  r62466 | gregory.p.smith | 2008-04-23 03:06:42 +0200 (Wed, 23 Apr 2008) | 2 lines

  syntax fixup
................
  r62469 | benjamin.peterson | 2008-04-23 22:38:06 +0200 (Wed, 23 Apr 2008) | 2 lines

  #2673 Fix example typo in optparse docs
................
  r62474 | martin.v.loewis | 2008-04-24 11:50:50 +0200 (Thu, 24 Apr 2008) | 2 lines

  Add Guilherme Polo.
................
  r62476 | martin.v.loewis | 2008-04-24 15:16:36 +0200 (Thu, 24 Apr 2008) | 3 lines

  Remove Py_Refcnt, Py_Type, Py_Size, as they were added only
  for backwards compatibility, yet 2.5 did not have them at all.
................
  r62477 | martin.v.loewis | 2008-04-24 15:17:24 +0200 (Thu, 24 Apr 2008) | 2 lines

  Fix typo.
................
  r62478 | martin.v.loewis | 2008-04-24 15:18:03 +0200 (Thu, 24 Apr 2008) | 2 lines

  Add Jesus Cea.
................
  r62480 | amaury.forgeotdarc | 2008-04-24 20:07:05 +0200 (Thu, 24 Apr 2008) | 4 lines

  Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0).
  This happened only when 8 is the first digit.
  Credits go to Lukas Meuser.
................
  r62485 | amaury.forgeotdarc | 2008-04-24 22:10:26 +0200 (Thu, 24 Apr 2008) | 5 lines

  Disable gc when running test_trace, or we may record the __del__ of collected objects.

  See http://mail.python.org/pipermail/python-checkins/2008-April/068633.html
  the extra events perfectly match several calls to socket._fileobject.__del__()
................
  r62492 | neal.norwitz | 2008-04-25 05:40:17 +0200 (Fri, 25 Apr 2008) | 1 line

  Fix typo (now -> no)
................
  r62497 | armin.rigo | 2008-04-25 11:35:18 +0200 (Fri, 25 Apr 2008) | 2 lines

  A new crasher.
................
  r62498 | thomas.heller | 2008-04-25 17:44:16 +0200 (Fri, 25 Apr 2008) | 1 line

  Add from_buffer and from_buffer_copy class methods to ctypes types.
................
  r62500 | mark.dickinson | 2008-04-25 18:59:09 +0200 (Fri, 25 Apr 2008) | 3 lines

  Issue 2635: fix bug in the fix_sentence_endings option to textwrap.fill.
................
  r62507 | benjamin.peterson | 2008-04-25 23:43:56 +0200 (Fri, 25 Apr 2008) | 2 lines

  Allow test_import to work when it is invoked directly
................
  r62513 | georg.brandl | 2008-04-26 20:31:07 +0200 (Sat, 26 Apr 2008) | 2 lines

  #2691: document PyLong (s)size_t APIs, patch by Alexander Belopolsky.
................
  r62514 | georg.brandl | 2008-04-26 20:32:17 +0200 (Sat, 26 Apr 2008) | 2 lines

  Add missing return type to dealloc.
................
  r62516 | alexandre.vassalotti | 2008-04-27 02:52:24 +0200 (Sun, 27 Apr 2008) | 2 lines

  Fixed URL of PEP 205 in weakref's module docstring.
................
  r62521 | georg.brandl | 2008-04-27 11:39:59 +0200 (Sun, 27 Apr 2008) | 2 lines

  #2677: add note that not all functions may accept keyword args.
................
  r62531 | georg.brandl | 2008-04-27 19:38:55 +0200 (Sun, 27 Apr 2008) | 2 lines

  Use correct XHTML tags.
................
  r62535 | benjamin.peterson | 2008-04-27 20:14:39 +0200 (Sun, 27 Apr 2008) | 2 lines

  #2700 Document PyNumber_ToBase
................
  r62545 | skip.montanaro | 2008-04-27 22:53:57 +0200 (Sun, 27 Apr 2008) | 1 line

  minor wording changes, rewrap a few lines
................
  r62546 | kurt.kaiser | 2008-04-27 23:07:41 +0200 (Sun, 27 Apr 2008) | 7 lines

  Home / Control-A toggles between left margin and end of leading white
  space.  Patch 1196903 Jeff Shute.

  M    idlelib/PyShell.py
  M    idlelib/EditorWindow.py
  M    idlelib/NEWS.txt
................
  r62548 | kurt.kaiser | 2008-04-27 23:38:05 +0200 (Sun, 27 Apr 2008) | 2 lines

  Improved AutoCompleteWindow logic.  Patch 2062 Tal Einat.
................
  r62549 | kurt.kaiser | 2008-04-27 23:52:19 +0200 (Sun, 27 Apr 2008) | 4 lines

  Autocompletion of filenames now support alternate separators, e.g. the
  '/' char on Windows.  Patch 2061 Tal Einat.
................
  r62550 | skip.montanaro | 2008-04-28 00:49:56 +0200 (Mon, 28 Apr 2008) | 6 lines

  A few small changes:
  * The only exception we should catch when trying to import cStringIO is an
    ImportError.
  * Delete the function signatures embedded in the mk*temp docstrings.
  * The tempdir global variable was initialized twice.
................
  r62551 | skip.montanaro | 2008-04-28 00:52:02 +0200 (Mon, 28 Apr 2008) | 4 lines

  Wrap some long paragraphs and include the default values for optional
  function parameters.
................
  r62553 | skip.montanaro | 2008-04-28 04:57:23 +0200 (Mon, 28 Apr 2008) | 7 lines

  Minor cleanups:
  * Avoid creating unused local variables where we can.  Where we can't prefix
    the unused variables with '_'.
  * Avoid shadowing builtins where it won't change the external interface of a
    function.
  * Use None as default path arg to readmodule and readmodule_ex.
................
  r62554 | skip.montanaro | 2008-04-28 04:59:45 +0200 (Mon, 28 Apr 2008) | 6 lines

  Correct documentation to match implementation: "Class" instead of
  "class_descriptor", "Function" instead of "function_descriptor".  Note
  default path value for readmodule*.  Wrap some long paragraphs.  Don't
  mention 'inpackage' which isn't part of the public API.
................
  r62555 | brett.cannon | 2008-04-28 05:23:50 +0200 (Mon, 28 Apr 2008) | 5 lines

  Fix a bug introduced by the warnings rewrite where tracebacks were being
  improperly indented.

  Closes issue #2699.
................
  r62556 | skip.montanaro | 2008-04-28 05:25:37 +0200 (Mon, 28 Apr 2008) | 2 lines

  Wrap some long lines.
................
  r62557 | skip.montanaro | 2008-04-28 05:27:53 +0200 (Mon, 28 Apr 2008) | 6 lines

  Get rid of _test(), _main(), _debug() and _check().  Tests are no longer
  needed (better set available in Lib/test/test_robotparser.py).  Clean up a
  few PEP 8 nits (compound statements on a single line, whitespace around
  operators).
................
  r62558 | brett.cannon | 2008-04-28 06:50:06 +0200 (Mon, 28 Apr 2008) | 3 lines

  Rename the test_traceback_print() function to traceback_print() to prevent
  test_capi from automatically calling the function.
................
  r62559 | georg.brandl | 2008-04-28 07:16:30 +0200 (Mon, 28 Apr 2008) | 2 lines

  Fix markup.
................
  r62569 | amaury.forgeotdarc | 2008-04-28 23:07:06 +0200 (Mon, 28 Apr 2008) | 5 lines

  test_sundry performs minimal tests (a simple import...) on modules that are not tested otherwise.

  Some of them now have tests and can be removed.
  Only 70 to go...
................
  r62574 | andrew.kuchling | 2008-04-29 04:03:54 +0200 (Tue, 29 Apr 2008) | 1 line

  Strip down SSL docs; I'm not managing to get test programs working, so I'll just give a minimal description
................
  r62577 | martin.v.loewis | 2008-04-29 08:10:53 +0200 (Tue, 29 Apr 2008) | 2 lines

  Add Rodrigo and Heiko.
................
  r62593 | nick.coghlan | 2008-04-30 16:23:36 +0200 (Wed, 30 Apr 2008) | 1 line

  Update command line usage documentation to reflect 2.6 changes (also includes some minor cleanups). Addresses TODO list issue 2258
................
  r62595 | andrew.kuchling | 2008-04-30 18:19:55 +0200 (Wed, 30 Apr 2008) | 1 line

  Typo fix
................
  r62604 | benjamin.peterson | 2008-04-30 23:03:58 +0200 (Wed, 30 Apr 2008) | 2 lines

  make test_support's captured_output a bit more robust when exceptions happen
................
  r62605 | georg.brandl | 2008-04-30 23:08:42 +0200 (Wed, 30 Apr 2008) | 2 lines

  #1748: use functools.wraps instead of rolling own metadata update.
................
  r62606 | benjamin.peterson | 2008-04-30 23:25:55 +0200 (Wed, 30 Apr 2008) | 2 lines

  Remove some from __future__ import with_statements
................
  r62608 | benjamin.peterson | 2008-05-01 00:03:36 +0200 (Thu, 01 May 2008) | 2 lines

  Fix typo in whatsnew
................
  r62616 | georg.brandl | 2008-05-01 20:24:32 +0200 (Thu, 01 May 2008) | 2 lines

  Fix synopsis.
................
  r62626 | brett.cannon | 2008-05-02 04:25:09 +0200 (Fri, 02 May 2008) | 6 lines

  Fix a backwards-compatibility mistake where a new optional argument for
  warnings.showwarning() was being used. This broke pre-existing replacements for
  the function since they didn't support the extra argument.

  Closes issue 2705.
................
  r62627 | gregory.p.smith | 2008-05-02 09:26:52 +0200 (Fri, 02 May 2008) | 20 lines

  This should fix issue2632.  A long description of the two competing
  problems is in the bug report (one old, one recently introduced trying
  to fix the old one).  In short:

  buffer data during socket._fileobject.read() and readlines() within a
  cStringIO object instead of a [] of str()s returned from the recv()
  call.

  This prevents excessive memory use due to the size parameter being
  passed to recv() being grossly larger than the actual size of the data
  returned *and* prevents excessive cpu usage due to looping in python
  calling recv() with a very tiny size value if min() is used as the
  previous memory-use bug "fix" did.

  It also documents what the socket._fileobject._rbufsize member is
  actually used for.

  This is a candidate for back porting to 2.5.
................
  r62636 | mark.hammond | 2008-05-02 14:48:15 +0200 (Fri, 02 May 2008) | 2 lines

  #2581: Vista UAC/elevation support for bdist_wininst
................
  r62638 | facundo.batista | 2008-05-02 19:39:00 +0200 (Fri, 02 May 2008) | 3 lines


  Fixed some test structures. Thanks Mark Dickinson.
................
  r62644 | ronald.oussoren | 2008-05-02 21:45:11 +0200 (Fri, 02 May 2008) | 7 lines

  Fix for issue #2573: Can't change the framework name on OS X builds

  This introduces a new configure option: --with-framework-name=NAME
  (defaulting to 'Python'). This allows you to install several copies
  of the Python framework with different names (such as a normal build
  and a debug build).
................
  r62645 | ronald.oussoren | 2008-05-02 21:58:56 +0200 (Fri, 02 May 2008) | 2 lines

  Finish fix for issue2573, previous patch was incomplete.
................
  r62647 | martin.v.loewis | 2008-05-02 23:30:20 +0200 (Fri, 02 May 2008) | 13 lines

  Merged revisions 62263-62646 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r62470 | david.wolever | 2008-04-24 02:11:07 +0200 (Do, 24 Apr 2008) | 3 lines

    Fixed up and applied the patch for #2431 -- speeding up 2to3 with a lookup table.
  ........
    r62646 | martin.v.loewis | 2008-05-02 23:29:27 +0200 (Fr, 02 Mai 2008) | 2 lines

    Fix whitespace.
  ........
................
  r62648 | ronald.oussoren | 2008-05-02 23:42:35 +0200 (Fri, 02 May 2008) | 4 lines

  Fix for #1905: PythonLauncher not working correctly on OSX 10.5/Leopard

  This fixes both Python Launchar and the terminalcommand module.
................
  r62651 | ronald.oussoren | 2008-05-02 23:54:56 +0200 (Fri, 02 May 2008) | 2 lines

  Fix for issue #2520 (cannot import macerrors)
................
  r62652 | benjamin.peterson | 2008-05-03 00:12:58 +0200 (Sat, 03 May 2008) | 2 lines

  capitalization nit for reStructuredText
................
  r62653 | brett.cannon | 2008-05-03 03:02:41 +0200 (Sat, 03 May 2008) | 2 lines

  Fix some indentation errors.
................
  r62656 | brett.cannon | 2008-05-03 05:19:39 +0200 (Sat, 03 May 2008) | 6 lines

  Fix the C implementation of 'warnings' to infer the filename of the module that
  raised an exception properly when __file__ is not set, __name__ == '__main__',
  and sys.argv[0] is a false value.

  Closes issue2743.
................
  r62661 | amaury.forgeotdarc | 2008-05-03 14:21:13 +0200 (Sat, 03 May 2008) | 8 lines

  In test_io, StatefulIncrementalDecoderTest was not part of the test suite.
  And of course, the test failed:
  a bytearray was used without reason in io.TextIOWrapper.tell().

  The difference is that iterating over bytes (i.e. str in python2.6) returns 1-char bytes,
  whereas bytearrays yield integers.
  This code should still work with python3.0
................
  r62663 | benjamin.peterson | 2008-05-03 17:56:42 +0200 (Sat, 03 May 2008) | 2 lines

  The compiling struct is now passed around to all AST helpers (see issue 2720)
................
  r62680 | benjamin.peterson | 2008-05-03 23:35:18 +0200 (Sat, 03 May 2008) | 2 lines

  Moved testing of builtin types out of test_builtin and into type specific modules
................
  r62686 | mark.dickinson | 2008-05-04 04:25:46 +0200 (Sun, 04 May 2008) | 4 lines

  Make sure that Context traps and flags dictionaries have values 0 and 1
  (as documented) rather than True and False.
................
  r62687 | benjamin.peterson | 2008-05-04 05:05:49 +0200 (Sun, 04 May 2008) | 2 lines

  Fix typo in whatsnew
................
  r62696 | georg.brandl | 2008-05-04 11:15:04 +0200 (Sun, 04 May 2008) | 2 lines

  #2752: wrong meaning of '' for socket host.
................
  r62699 | christian.heimes | 2008-05-04 13:50:53 +0200 (Sun, 04 May 2008) | 1 line

  Added note that Python requires at least Win2k SP4
................
  r62700 | gerhard.haering | 2008-05-04 14:59:57 +0200 (Sun, 04 May 2008) | 3 lines

  SQLite requires 64-bit integers in order to build. So the whole HAVE_LONG_LONG
  #ifdefing was useless.
................
  r62701 | gerhard.haering | 2008-05-04 15:15:12 +0200 (Sun, 04 May 2008) | 3 lines

  Applied sqliterow-richcmp.diff patch from Thomas Heller in Issue2152. The
  sqlite3.Row type is now correctly hashable.
................
  r62702 | gerhard.haering | 2008-05-04 15:42:44 +0200 (Sun, 04 May 2008) | 5 lines

  Implemented feature request 2157: Converter names are cut off at '('
  characters. This avoids the common case of something like 'NUMBER(10)' not
  being parsed as 'NUMBER', like expected. Also corrected the docs about
  converter names being case-sensitive. They aren't any longer.
................
  r62703 | georg.brandl | 2008-05-04 17:45:05 +0200 (Sun, 04 May 2008) | 2 lines

  #2757: Remove spare newline.
................
  r62711 | benjamin.peterson | 2008-05-04 21:10:02 +0200 (Sun, 04 May 2008) | 2 lines

  Fix typo in bugs.rst
................
---
 command/bdist_wininst.py      |   7 +++++++
 command/wininst-6.0.exe       | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe       | Bin 61440 -> 61440 bytes
 command/wininst-9.0-amd64.exe | Bin 76288 -> 77312 bytes
 command/wininst-9.0.exe       | Bin 65536 -> 66048 bytes
 msvc9compiler.py              |  25 ++++++++++++++++++++++++-
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index bf8d022ae8..3f0e09bc4c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -48,6 +48,10 @@ class bdist_wininst(Command):
                      "Fully qualified filename of a script to be run before "
                      "any files are installed.  This script need not be in the "
                      "distribution"),
+                    ('user-access-control=', None,
+                     "specify Vista's UAC handling - 'none'/default=no "
+                     "handling, 'auto'=use UAC if target Python installed for "
+                     "all users, 'force'=always use UAC"),
                    ]
 
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
@@ -66,6 +70,7 @@ def initialize_options(self):
         self.skip_build = 0
         self.install_script = None
         self.pre_install_script = None
+        self.user_access_control = None
 
 
     def finalize_options(self):
@@ -211,6 +216,8 @@ def escape(s):
         lines.append("target_optimize=%d" % (not self.no_target_optimize))
         if self.target_version:
             lines.append("target_version=%s" % self.target_version)
+        if self.user_access_control:
+            lines.append("user_access_control=%s" % self.user_access_control)
 
         title = self.title or self.distribution.get_fullname()
         lines.append("title=%s" % escape(title))
diff --git a/command/wininst-6.0.exe b/command/wininst-6.0.exe
index bd715250e780b37e94996e33820070987bcc77fd..10c981993ba2c2e3a977db8ded201a46d529749d 100644
GIT binary patch
delta 19227
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
J=*&lB{};woC0qai

delta 17718
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

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index ee35713940177c0eb8e3cf0435d7a6a9287a27fc..6779aa8d4c1b0d5fb37255f1eea211d92ea6942a 100644
GIT binary patch
delta 24325
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
NZtOiU<M<yJ{2zr1Zq)z)

delta 22932
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
Bkf#6u

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index c99ede4b3fcebe39b1a1e33283307e12c42b7b2e..b4cb062c391d230dbf4a7fc3a16536aa3dbc5b42 100644
GIT binary patch
delta 19961
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
IFg5&t0jk>d#Q*>R

delta 18603
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

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 5e0144c92b58ea750211c540d15667e0b1d1a356..0d04a6678b94b8ecbdde10257396e8c0e85c038c 100644
GIT binary patch
delta 14220
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
Y3Lzl+Y{LX+P*2Vst~WF-?rD$v-(z(%x&QzG

delta 13544
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
CX=EAz

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 8b1cf9a910..c8d52c4237 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -594,14 +594,25 @@ def link(self,
             # needed! Make sure they are generated in the temporary build
             # directory. Since they have different names for debug and release
             # builds, they can go into the same directory.
+            build_temp = os.path.dirname(objects[0])
             if export_symbols is not None:
                 (dll_name, dll_ext) = os.path.splitext(
                     os.path.basename(output_filename))
                 implib_file = os.path.join(
-                    os.path.dirname(objects[0]),
+                    build_temp,
                     self.library_filename(dll_name))
                 ld_args.append ('/IMPLIB:' + implib_file)
 
+            # Embedded manifests are recommended - see MSDN article titled
+            # "How to: Embed a Manifest Inside a C/C++ Application"
+            # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
+            # Ask the linker to generate the manifest in the temp dir, so
+            # we can embed it later.
+            temp_manifest = os.path.join(
+                    build_temp,
+                    os.path.basename(output_filename) + ".manifest")
+            ld_args.append('/MANIFESTFILE:' + temp_manifest)
+
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
@@ -613,6 +624,18 @@ def link(self,
             except DistutilsExecError as msg:
                 raise LinkError(msg)
 
+            # embed the manifest
+            # XXX - this is somewhat fragile - if mt.exe fails, distutils
+            # will still consider the DLL up-to-date, but it will not have a
+            # manifest.  Maybe we should link to a temp file?  OTOH, that
+            # implies a build environment error that shouldn't go undetected.
+            mfid = 1 if target_desc == CCompiler.EXECUTABLE else 2
+            out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
+            try:
+                self.spawn(['mt.exe', '-nologo', '-manifest',
+                            temp_manifest, out_arg])
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 

From e2aef69588355bb9ecd378a778b3d50f00ca14c0 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 6 May 2008 22:41:46 +0000
Subject: [PATCH 1969/8469] Implemented PEP 370

---
 command/install.py | 83 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 6 deletions(-)

diff --git a/command/install.py b/command/install.py
index 33a1212b0a..44c76926ea 100644
--- a/command/install.py
+++ b/command/install.py
@@ -18,6 +18,9 @@
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
+from site import USER_BASE
+from site import USER_SITE
+
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
@@ -51,7 +54,21 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
+    'unix_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     'nt': WINDOWS_SCHEME,
+    'nt_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        },
     'mac': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -59,13 +76,27 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
+    'mac_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
         'headers': '$base/Include/$dist_name',
         'scripts': '$base/Scripts',
         'data'   : '$base',
-        }
+        },
+    'os2_home': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     }
 
 # The keys to an installation scheme; if any new types of files are to be
@@ -86,6 +117,8 @@ class install (Command):
          "(Unix only) prefix for platform-specific files"),
         ('home=', None,
          "(Unix only) home directory to install under"),
+        ('user', None,
+         "install in user site-package '%s'" % USER_SITE),
 
         # Or, just set the base director(y|ies)
         ('install-base=', None,
@@ -137,7 +170,7 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['compile', 'force', 'skip-build']
+    boolean_options = ['compile', 'force', 'skip-build', 'user']
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -148,6 +181,7 @@ def initialize_options (self):
         self.prefix = None
         self.exec_prefix = None
         self.home = None
+        self.user = 0
 
         # These select only the installation base; it's up to the user to
         # specify the installation scheme (currently, that means supplying
@@ -166,6 +200,8 @@ def initialize_options (self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
 
         self.compile = None
         self.optimize = None
@@ -241,6 +277,11 @@ def finalize_options (self):
             raise DistutilsOptionError, \
                   "must supply either home or prefix/exec-prefix -- not both"
 
+        if self.user and (self.prefix or self.exec_prefix or self.home or
+                self.install_base or self.install_platbase):
+            raise DistutilsOptionError("can't combine user with with prefix/"
+                                       "exec_prefix/home or install_(plat)base")
+
         # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name != "posix":
             if self.exec_prefix:
@@ -276,10 +317,13 @@ def finalize_options (self):
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
                             'py_version_short': py_version[0:3],
+                            'py_version_nodot': py_version[0] + py_version[2],
                             'sys_prefix': prefix,
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            'userbase': self.install_userbase,
+                            'usersite': self.install_usersite,
                            }
         self.expand_basedirs()
 
@@ -301,6 +345,10 @@ def finalize_options (self):
 
         self.dump_dirs("post-expand_dirs()")
 
+        # Create directories in the home dir:
+        if self.user:
+            self.create_home_path()
+
         # Pick the actual directory to install all modules to: either
         # install_purelib or install_platlib, depending on whether this
         # module distribution is pure or not.  Of course, if the user
@@ -315,7 +363,8 @@ def finalize_options (self):
         # Convert directories from Unix /-separated syntax to the local
         # convention.
         self.convert_paths('lib', 'purelib', 'platlib',
-                           'scripts', 'data', 'headers')
+                           'scripts', 'data', 'headers',
+                           'userbase', 'usersite')
 
         # Well, we're not actually fully completely finalized yet: we still
         # have to deal with 'extra_path', which is the hack for allowing
@@ -376,7 +425,13 @@ def finalize_unix (self):
                       "installation scheme is incomplete")
             return
 
-        if self.home is not None:
+        if self.user:
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            self.select_scheme("unix_user")
+        elif self.home is not None:
             self.install_base = self.install_platbase = self.home
             self.select_scheme("unix_home")
         else:
@@ -401,7 +456,13 @@ def finalize_unix (self):
 
     def finalize_other (self):          # Windows and Mac OS for now
 
-        if self.home is not None:
+        if self.user:
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            self.select_scheme(os.name + "_user")
+        elif self.home is not None:
             self.install_base = self.install_platbase = self.home
             self.select_scheme("unix_home")
         else:
@@ -431,7 +492,7 @@ def _expand_attrs (self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
-                if os.name == 'posix':
+                if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
@@ -496,6 +557,16 @@ def change_roots (self, *names):
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
+    def create_home_path(self):
+        """Create directories under ~
+        """
+        if not self.user:
+            return
+        home = convert_path(os.path.expanduser("~"))
+        for name, path in self.config_vars.iteritems():
+            if path.startswith(home) and not os.path.isdir(path):
+                self.debug_print("os.makedirs('%s', 0700)" % path)
+                os.makedirs(path, 0700)
 
     # -- Command execution methods -------------------------------------
 

From dd58a30c84365eaa82aa6175dbc52a26ee63bb7f Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 6 May 2008 23:45:46 +0000
Subject: [PATCH 1970/8469] Merged revisions 62774-62775,62785,62787-62788 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62774 | georg.brandl | 2008-05-06 19:11:42 +0200 (Tue, 06 May 2008) | 2 lines

  #2773: fix description of 'g' and 'G' formatting spec.
........
  r62775 | georg.brandl | 2008-05-06 19:20:54 +0200 (Tue, 06 May 2008) | 2 lines

  > != (!<).
........
  r62785 | benjamin.peterson | 2008-05-07 00:18:11 +0200 (Wed, 07 May 2008) | 2 lines

  Fix logic error in Python/_warnings.c and add a test to verify
........
  r62787 | benjamin.peterson | 2008-05-07 00:31:52 +0200 (Wed, 07 May 2008) | 2 lines

  Make the Python implementation of warnings compatible with the C implementation regarding non-callable showwarning
........
  r62788 | christian.heimes | 2008-05-07 00:41:46 +0200 (Wed, 07 May 2008) | 1 line

  Implemented PEP 370
........
---
 command/install.py | 83 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 6 deletions(-)

diff --git a/command/install.py b/command/install.py
index 50884c3337..0a902cee89 100644
--- a/command/install.py
+++ b/command/install.py
@@ -15,6 +15,9 @@
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
+from site import USER_BASE
+from site import USER_SITE
+
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
@@ -48,7 +51,21 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
+    'unix_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     'nt': WINDOWS_SCHEME,
+    'nt_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        },
     'mac': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -56,13 +73,27 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
+    'mac_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
         'headers': '$base/Include/$dist_name',
         'scripts': '$base/Scripts',
         'data'   : '$base',
-        }
+        },
+    'os2_home': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
     }
 
 # The keys to an installation scheme; if any new types of files are to be
@@ -83,6 +114,8 @@ class install (Command):
          "(Unix only) prefix for platform-specific files"),
         ('home=', None,
          "(Unix only) home directory to install under"),
+        ('user', None,
+         "install in user site-package '%s'" % USER_SITE),
 
         # Or, just set the base director(y|ies)
         ('install-base=', None,
@@ -134,7 +167,7 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['compile', 'force', 'skip-build']
+    boolean_options = ['compile', 'force', 'skip-build', 'user']
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -145,6 +178,7 @@ def initialize_options(self):
         self.prefix = None
         self.exec_prefix = None
         self.home = None
+        self.user = 0
 
         # These select only the installation base; it's up to the user to
         # specify the installation scheme (currently, that means supplying
@@ -163,6 +197,8 @@ def initialize_options(self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
 
         self.compile = None
         self.optimize = None
@@ -238,6 +274,11 @@ def finalize_options(self):
             raise DistutilsOptionError(
                   "must supply either home or prefix/exec-prefix -- not both")
 
+        if self.user and (self.prefix or self.exec_prefix or self.home or
+                self.install_base or self.install_platbase):
+            raise DistutilsOptionError("can't combine user with with prefix/"
+                                       "exec_prefix/home or install_(plat)base")
+
         # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name != "posix":
             if self.exec_prefix:
@@ -273,10 +314,13 @@ def finalize_options(self):
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
                             'py_version_short': py_version[0:3],
+                            'py_version_nodot': py_version[0] + py_version[2],
                             'sys_prefix': prefix,
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            'userbase': self.install_userbase,
+                            'usersite': self.install_usersite,
                            }
         self.expand_basedirs()
 
@@ -298,6 +342,10 @@ def finalize_options(self):
 
         self.dump_dirs("post-expand_dirs()")
 
+        # Create directories in the home dir:
+        if self.user:
+            self.create_home_path()
+
         # Pick the actual directory to install all modules to: either
         # install_purelib or install_platlib, depending on whether this
         # module distribution is pure or not.  Of course, if the user
@@ -312,7 +360,8 @@ def finalize_options(self):
         # Convert directories from Unix /-separated syntax to the local
         # convention.
         self.convert_paths('lib', 'purelib', 'platlib',
-                           'scripts', 'data', 'headers')
+                           'scripts', 'data', 'headers',
+                           'userbase', 'usersite')
 
         # Well, we're not actually fully completely finalized yet: we still
         # have to deal with 'extra_path', which is the hack for allowing
@@ -369,7 +418,13 @@ def finalize_unix(self):
                       "installation scheme is incomplete")
             return
 
-        if self.home is not None:
+        if self.user:
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            self.select_scheme("unix_user")
+        elif self.home is not None:
             self.install_base = self.install_platbase = self.home
             self.select_scheme("unix_home")
         else:
@@ -391,7 +446,13 @@ def finalize_unix(self):
 
 
     def finalize_other(self):          # Windows and Mac OS for now
-        if self.home is not None:
+        if self.user:
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            self.select_scheme(os.name + "_user")
+        elif self.home is not None:
             self.install_base = self.install_platbase = self.home
             self.select_scheme("unix_home")
         else:
@@ -419,7 +480,7 @@ def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
-                if os.name == 'posix':
+                if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
@@ -479,6 +540,16 @@ def change_roots(self, *names):
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
+    def create_home_path(self):
+        """Create directories under ~
+        """
+        if not self.user:
+            return
+        home = convert_path(os.path.expanduser("~"))
+        for name, path in self.config_vars.iteritems():
+            if path.startswith(home) and not os.path.isdir(path):
+                self.debug_print("os.makedirs('%s', 0o700)" % path)
+                os.makedirs(path, 0o700)
 
     # -- Command execution methods -------------------------------------
 

From af488a5062e1af5b85b7c25c2a58087cb9905a86 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 8 May 2008 11:54:13 +0000
Subject: [PATCH 1971/8469] Bumping versions for 3.0a5

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b583e397e2..3618c4f727 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0a4"
+__version__ = "3.0a5"
 #--end constants--

From a59a6118c2edd586a14b636043fc27f6509a62f2 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 8 May 2008 13:16:19 +0000
Subject: [PATCH 1972/8469] Bump to 2.6a3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index d0dd03a3c5..e3e32f51bd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6a2"
+__version__ = "2.6a3"
 #--end constants--

From 8a2d33caa7898053d9c911a313660fc39a412bbe Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 8 May 2008 22:09:54 +0000
Subject: [PATCH 1973/8469] Replace instances of os.path.walk with os.walk

---
 archive_util.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index a9c6a5b488..264e66faf2 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -95,18 +95,16 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         log.info("creating '%s' and adding '%s' to it",
                  zip_filename, base_dir)
 
-        def visit (z, dirname, names):
-            for name in names:
-                path = os.path.normpath(os.path.join(dirname, name))
-                if os.path.isfile(path):
-                    z.write(path, path)
-                    log.info("adding '%s'" % path)
-
         if not dry_run:
             z = zipfile.ZipFile(zip_filename, "w",
                                 compression=zipfile.ZIP_DEFLATED)
 
-            os.path.walk(base_dir, visit, z)
+            for dirpath, dirnames, filenames in os.walk(base_dir):
+                for name in filenames:
+                    path = os.path.normpath(os.path.join(dirpath, name))
+                    if os.path.isfile(path):
+                        z.write(path, path)
+                        log.info("adding '%s'" % path)
             z.close()
 
     return zip_filename

From 2e52da55e1a498e632f64468c4babe7f2b542850 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 8 May 2008 22:27:58 +0000
Subject: [PATCH 1974/8469] Merged revisions 62873,62887,62892-62896,62904 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62873 | raymond.hettinger | 2008-05-08 12:18:13 -0500 (Thu, 08 May 2008) | 1 line

  Issue 2778.  Document the temporary frozenset swap in __contains__(), remove(), and discard().
........
  r62887 | brett.cannon | 2008-05-08 14:50:51 -0500 (Thu, 08 May 2008) | 5 lines

  Make test.test_support.catch_warning() take an argument specifying if any
  triggered warnings should be captured. This allows the context manager to be
  used to just prevent the internal state of the 'warnings' framework and thus
  allow triggered warnings to be displayed.
........
  r62892 | brett.cannon | 2008-05-08 15:20:24 -0500 (Thu, 08 May 2008) | 4 lines

  Fix a bug introduced by the addition of the 'record' argument to
  test.test_support.catch_warning() where showwarning() was not being set
  properly.
........
  r62893 | brett.cannon | 2008-05-08 15:20:54 -0500 (Thu, 08 May 2008) | 2 lines

  Document the 'record' argument for test.test_support.catch_warning().
........
  r62894 | brett.cannon | 2008-05-08 15:23:06 -0500 (Thu, 08 May 2008) | 4 lines

  Fix sys.flags to properly expose bytes_warning.

  Closes issue #2790.
........
  r62895 | brett.cannon | 2008-05-08 15:23:54 -0500 (Thu, 08 May 2008) | 2 lines

  Add a missing entry on  the fix for issue #2790.
........
  r62896 | brett.cannon | 2008-05-08 15:24:43 -0500 (Thu, 08 May 2008) | 2 lines

  Add test.test_support.catch_warning()'s new argument.
........
  r62904 | benjamin.peterson | 2008-05-08 17:09:54 -0500 (Thu, 08 May 2008) | 2 lines

  Replace instances of os.path.walk with os.walk
........
---
 archive_util.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index f3f65c6a0c..9444ff012f 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -92,18 +92,16 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         log.info("creating '%s' and adding '%s' to it",
                  zip_filename, base_dir)
 
-        def visit (z, dirname, names):
-            for name in names:
-                path = os.path.normpath(os.path.join(dirname, name))
-                if os.path.isfile(path):
-                    z.write(path, path)
-                    log.info("adding '%s'" % path)
-
         if not dry_run:
             z = zipfile.ZipFile(zip_filename, "w",
                                 compression=zipfile.ZIP_DEFLATED)
 
-            os.path.walk(base_dir, visit, z)
+            for dirpath, dirnames, filenames in os.walk(base_dir):
+                for name in filenames:
+                    path = os.path.normpath(os.path.join(dirpath, name))
+                    if os.path.isfile(path):
+                        z.write(path, path)
+                        log.info("adding '%s'" % path)
             z.close()
 
     return zip_filename

From 78cb86ae70da077547532ef552ebdaee33ac0a72 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 9 May 2008 12:19:09 +0000
Subject: [PATCH 1975/8469] Add --user option to build_ext

---
 command/build_ext.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index bf5ad7e00b..beb3319469 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -10,6 +10,7 @@
 
 import sys, os, string, re
 from types import *
+from site import USER_BASE, USER_SITE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -93,9 +94,11 @@ class build_ext (Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
+        ('user', None,
+         "add user include, library and rpath"),
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
 
     help_options = [
         ('help-compiler', None,
@@ -123,6 +126,7 @@ def initialize_options (self):
         self.swig = None
         self.swig_cpp = None
         self.swig_opts = None
+        self.user = None
 
     def finalize_options (self):
         from distutils import sysconfig
@@ -257,6 +261,16 @@ def finalize_options (self):
         else:
             self.swig_opts = self.swig_opts.split(' ')
 
+        # Finally add the user include and library directories if requested
+        if self.user:
+            user_include = os.path.join(USER_BASE, "include")
+            user_lib = os.path.join(USER_BASE, "lib")
+            if os.path.isdir(user_include):
+                self.include_dirs.append(user_include)
+            if os.path.isdir(user_lib):
+                self.library_dirs.append(user_lib)
+                self.rpath.append(user_lib)
+
     # finalize_options ()
 
 

From 22b54825ad9cfd0d15ebecb4b31b7886f6391833 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 10 May 2008 19:51:55 +0000
Subject: [PATCH 1976/8469] #1858 from Tarek Ziade: Allow multiple repositories
 in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI for discussion.

The patch is slightly revised from Tarek's last patch: I've simplified
the PyPIRCCommand.finalize_options() method to not look at sys.argv.
Tests still pass.
---
 command/register.py | 97 +++++++++++++++++++++++----------------------
 command/upload.py   | 41 ++++++-------------
 core.py             |  1 +
 dist.py             |  7 ++--
 tests/test_dist.py  | 47 ++++++++++++++++++++++
 5 files changed, 113 insertions(+), 80 deletions(-)

diff --git a/command/register.py b/command/register.py
index 5c588effd3..a9ab361a17 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,37 +8,29 @@
 __revision__ = "$Id$"
 
 import os, string, urllib2, getpass, urlparse
-import StringIO, ConfigParser
+import StringIO
 
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.errors import *
+from distutils import log
 
-class register(Command):
+class register(PyPIRCCommand):
 
     description = ("register the distribution with the Python package index")
-
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]"%DEFAULT_REPOSITORY),
+    user_options = PyPIRCCommand.user_options + [
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
-        ('show-response', None,
-         'display full response text from server'),
         ]
-    boolean_options = ['verify', 'show-response', 'list-classifiers']
+    boolean_options = PyPIRCCommand.boolean_options + [
+        'verify', 'list-classifiers']
 
     def initialize_options(self):
-        self.repository = None
-        self.show_response = 0
+        PyPIRCCommand.initialize_options(self)
         self.list_classifiers = 0
 
-    def finalize_options(self):
-        if self.repository is None:
-            self.repository = self.DEFAULT_REPOSITORY
-
     def run(self):
+        self.finalize_options()
+        self._set_config()
         self.check_metadata()
         if self.dry_run:
             self.verify_metadata()
@@ -77,6 +69,23 @@ def check_metadata(self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
+    def _set_config(self):
+        ''' Reads the configuration file and set attributes.
+        '''
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
+            self.has_config = True
+        else:
+            if self.repository not in ('pypi', self.DEFAULT_REPOSITORY):
+                raise ValueError('%s not found in .pypirc' % self.repository)
+            if self.repository == 'pypi':
+                self.repository = self.DEFAULT_REPOSITORY
+            self.has_config = False
+
     def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
@@ -90,6 +99,7 @@ def verify_metadata(self):
         (code, result) = self.post_to_server(self.build_post_data('verify'))
         print 'Server response (%s): %s'%(code, result)
 
+
     def send_metadata(self):
         ''' Send the metadata to the package index server.
 
@@ -99,10 +109,14 @@ def send_metadata(self):
 
             First we try to read the username/password from $HOME/.pypirc,
             which is a ConfigParser-formatted file with a section
-            [server-login] containing username and password entries (both
+            [distutils] containing username and password entries (both
             in clear text). Eg:
 
-                [server-login]
+                [distutils]
+                index-servers =
+                    pypi
+
+                [pypi]
                 username: fred
                 password: sekrit
 
@@ -114,21 +128,15 @@ def send_metadata(self):
              3. set the password to a random string and email the user.
 
         '''
-        choice = 'x'
-        username = password = ''
-
         # see if we can short-cut and get the username/password from the
         # config
-        config = None
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                print 'Using PyPI login from %s'%rc
-                config = ConfigParser.ConfigParser()
-                config.read(rc)
-                username = config.get('server-login', 'username')
-                password = config.get('server-login', 'password')
-                choice = '1'
+        if self.has_config:
+            choice = '1'
+            username = self.username
+            password = self.password
+        else:
+            choice = 'x'
+            username = password = ''
 
         # get the user's login info
         choices = '1 2 3 4'.split()
@@ -155,32 +163,24 @@ def send_metadata(self):
             # set up the authentication
             auth = urllib2.HTTPPasswordMgr()
             host = urlparse.urlparse(self.repository)[1]
-            auth.add_password('pypi', host, username, password)
-
+            auth.add_password(self.realm, host, username, password)
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s'%(code, result)
+            print 'Server response (%s): %s' % (code, result)
 
             # possibly save the login
-            if 'HOME' in os.environ and config is None and code == 200:
-                rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if not self.has_config and code == 200:
                 print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)'%rc
+                print '(the login will be stored in %s)' % self._get_rc_file()
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
                     if not choice:
                         choice = 'n'
                 if choice.lower() == 'y':
-                    f = open(rc, 'w')
-                    f.write('[server-login]\nusername:%s\npassword:%s\n'%(
-                        username, password))
-                    f.close()
-                    try:
-                        os.chmod(rc, 0600)
-                    except:
-                        pass
+                    self._store_pypirc(username, password)
+
         elif choice == '2':
             data = {':action': 'user'}
             data['name'] = data['password'] = data['email'] = ''
@@ -243,7 +243,8 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-
+        self.announce('Registering %s to %s' % (data['name'],
+                                                self.repository), log.INFO)
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
diff --git a/command/upload.py b/command/upload.py
index 301a159590..daf681128d 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
 from distutils.errors import *
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
 from hashlib import md5
@@ -16,53 +16,38 @@
 import urlparse
 import cStringIO as StringIO
 
-class upload(Command):
+class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
-        ('show-response', None,
-         'display full response text from server'),
+    user_options = PyPIRCCommand.user_options + [
         ('sign', 's',
          'sign files to upload using gpg'),
         ('identity=', 'i', 'GPG identity used to sign files'),
         ]
-    boolean_options = ['show-response', 'sign']
+
+    boolean_options = PyPIRCCommand.boolean_options + ['sign']
 
     def initialize_options(self):
+        PyPIRCCommand.initialize_options(self)
         self.username = ''
         self.password = ''
-        self.repository = ''
         self.show_response = 0
         self.sign = False
         self.identity = None
 
     def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
         if self.identity and not self.sign:
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                self.announce('Using PyPI login from %s' % rc)
-                config = ConfigParser.ConfigParser({
-                        'username':'',
-                        'password':'',
-                        'repository':''})
-                config.read(rc)
-                if not self.repository:
-                    self.repository = config.get('server-login', 'repository')
-                if not self.username:
-                    self.username = config.get('server-login', 'username')
-                if not self.password:
-                    self.password = config.get('server-login', 'password')
-        if not self.repository:
-            self.repository = self.DEFAULT_REPOSITORY
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
 
     def run(self):
         if not self.distribution.dist_files:
diff --git a/core.py b/core.py
index 32b9026999..de9ce7d7ff 100644
--- a/core.py
+++ b/core.py
@@ -20,6 +20,7 @@
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
 from distutils.cmd import Command
+from distutils.config import PyPIRCCommand
 from distutils.extension import Extension
 
 # This is a barebones help message generated displayed when the user
diff --git a/dist.py b/dist.py
index d098cb9713..0b13c1e6c1 100644
--- a/dist.py
+++ b/dist.py
@@ -343,10 +343,9 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if 'HOME' in os.environ:
-            user_file = os.path.join(os.environ.get('HOME'), user_filename)
-            if os.path.isfile(user_file):
-                files.append(user_file)
+        user_file = os.path.join(os.path.expanduser('~'), user_filename)
+        if os.path.isfile(user_file):
+            files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 5ae79332c0..2857263730 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -55,6 +55,7 @@ def test_command_packages_unspecified(self):
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_command_packages_cmdline(self):
+        from distutils.tests.test_dist import test_dist
         sys.argv.extend(["--command-packages",
                          "foo.bar,distutils.tests",
                          "test_dist",
@@ -65,6 +66,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
+        print cmd.__class__, test_dist
         self.assert_(isinstance(cmd, test_dist))
         self.assertEqual(cmd.sample_option, "sometext")
 
@@ -179,9 +181,54 @@ def format_metadata(self, dist):
         dist.metadata.write_pkg_file(sio)
         return sio.getvalue()
 
+    def test_custom_pydistutils(self):
+        # fixes #2166
+        # make sure pydistutils.cfg is found
+        old = {}
+        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
+            value = os.environ.get(env)
+            old[env] = value
+            if value is not None:
+                del os.environ[env]
+
+        if os.name == 'posix':
+            user_filename = ".pydistutils.cfg"
+        else:
+            user_filename = "pydistutils.cfg"
+
+        curdir = os.path.dirname(__file__)
+        user_filename = os.path.join(curdir, user_filename)
+        f = open(user_filename, 'w')
+        f.write('.')
+        f.close()
+
+        try:
+            dist = distutils.dist.Distribution()
+
+            # linux-style
+            if sys.platform in ('linux', 'darwin'):
+                os.environ['HOME'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+
+            # win32-style
+            if sys.platform == 'win32':
+                # home drive should be found
+                os.environ['HOMEPATH'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+        finally:
+            for key, value in old.items():
+                if value is None:
+                    continue
+                os.environ[key] = value
+            os.remove(user_filename)
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
     suite.addTest(unittest.makeSuite(MetadataTestCase))
     return suite
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a189b6be0df13ba6b77292b59ea501774804b422 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 10 May 2008 20:52:01 +0000
Subject: [PATCH 1977/8469] Revert r62998 as it broke the build (seems
 distutils.config is missing).

---
 command/register.py | 97 ++++++++++++++++++++++-----------------------
 command/upload.py   | 41 +++++++++++++------
 core.py             |  1 -
 dist.py             |  7 ++--
 tests/test_dist.py  | 47 ----------------------
 5 files changed, 80 insertions(+), 113 deletions(-)

diff --git a/command/register.py b/command/register.py
index a9ab361a17..5c588effd3 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,29 +8,37 @@
 __revision__ = "$Id$"
 
 import os, string, urllib2, getpass, urlparse
-import StringIO
+import StringIO, ConfigParser
 
-from distutils.core import PyPIRCCommand
+from distutils.core import Command
 from distutils.errors import *
-from distutils import log
 
-class register(PyPIRCCommand):
+class register(Command):
 
     description = ("register the distribution with the Python package index")
-    user_options = PyPIRCCommand.user_options + [
+
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]"%DEFAULT_REPOSITORY),
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
+        ('show-response', None,
+         'display full response text from server'),
         ]
-    boolean_options = PyPIRCCommand.boolean_options + [
-        'verify', 'list-classifiers']
+    boolean_options = ['verify', 'show-response', 'list-classifiers']
 
     def initialize_options(self):
-        PyPIRCCommand.initialize_options(self)
+        self.repository = None
+        self.show_response = 0
         self.list_classifiers = 0
 
+    def finalize_options(self):
+        if self.repository is None:
+            self.repository = self.DEFAULT_REPOSITORY
+
     def run(self):
-        self.finalize_options()
-        self._set_config()
         self.check_metadata()
         if self.dry_run:
             self.verify_metadata()
@@ -69,23 +77,6 @@ def check_metadata(self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
-    def _set_config(self):
-        ''' Reads the configuration file and set attributes.
-        '''
-        config = self._read_pypirc()
-        if config != {}:
-            self.username = config['username']
-            self.password = config['password']
-            self.repository = config['repository']
-            self.realm = config['realm']
-            self.has_config = True
-        else:
-            if self.repository not in ('pypi', self.DEFAULT_REPOSITORY):
-                raise ValueError('%s not found in .pypirc' % self.repository)
-            if self.repository == 'pypi':
-                self.repository = self.DEFAULT_REPOSITORY
-            self.has_config = False
-
     def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
@@ -99,7 +90,6 @@ def verify_metadata(self):
         (code, result) = self.post_to_server(self.build_post_data('verify'))
         print 'Server response (%s): %s'%(code, result)
 
-
     def send_metadata(self):
         ''' Send the metadata to the package index server.
 
@@ -109,14 +99,10 @@ def send_metadata(self):
 
             First we try to read the username/password from $HOME/.pypirc,
             which is a ConfigParser-formatted file with a section
-            [distutils] containing username and password entries (both
+            [server-login] containing username and password entries (both
             in clear text). Eg:
 
-                [distutils]
-                index-servers =
-                    pypi
-
-                [pypi]
+                [server-login]
                 username: fred
                 password: sekrit
 
@@ -128,15 +114,21 @@ def send_metadata(self):
              3. set the password to a random string and email the user.
 
         '''
+        choice = 'x'
+        username = password = ''
+
         # see if we can short-cut and get the username/password from the
         # config
-        if self.has_config:
-            choice = '1'
-            username = self.username
-            password = self.password
-        else:
-            choice = 'x'
-            username = password = ''
+        config = None
+        if 'HOME' in os.environ:
+            rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if os.path.exists(rc):
+                print 'Using PyPI login from %s'%rc
+                config = ConfigParser.ConfigParser()
+                config.read(rc)
+                username = config.get('server-login', 'username')
+                password = config.get('server-login', 'password')
+                choice = '1'
 
         # get the user's login info
         choices = '1 2 3 4'.split()
@@ -163,24 +155,32 @@ def send_metadata(self):
             # set up the authentication
             auth = urllib2.HTTPPasswordMgr()
             host = urlparse.urlparse(self.repository)[1]
-            auth.add_password(self.realm, host, username, password)
+            auth.add_password('pypi', host, username, password)
+
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s' % (code, result)
+            print 'Server response (%s): %s'%(code, result)
 
             # possibly save the login
-            if not self.has_config and code == 200:
+            if 'HOME' in os.environ and config is None and code == 200:
+                rc = os.path.join(os.environ['HOME'], '.pypirc')
                 print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)' % self._get_rc_file()
+                print '(the login will be stored in %s)'%rc
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
                     if not choice:
                         choice = 'n'
                 if choice.lower() == 'y':
-                    self._store_pypirc(username, password)
-
+                    f = open(rc, 'w')
+                    f.write('[server-login]\nusername:%s\npassword:%s\n'%(
+                        username, password))
+                    f.close()
+                    try:
+                        os.chmod(rc, 0600)
+                    except:
+                        pass
         elif choice == '2':
             data = {':action': 'user'}
             data['name'] = data['password'] = data['email'] = ''
@@ -243,8 +243,7 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-        self.announce('Registering %s to %s' % (data['name'],
-                                                self.repository), log.INFO)
+
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
diff --git a/command/upload.py b/command/upload.py
index daf681128d..301a159590 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
 from distutils.errors import *
-from distutils.core import PyPIRCCommand
+from distutils.core import Command
 from distutils.spawn import spawn
 from distutils import log
 from hashlib import md5
@@ -16,38 +16,53 @@
 import urlparse
 import cStringIO as StringIO
 
-class upload(PyPIRCCommand):
+class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    user_options = PyPIRCCommand.user_options + [
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server'),
         ('sign', 's',
          'sign files to upload using gpg'),
         ('identity=', 'i', 'GPG identity used to sign files'),
         ]
-
-    boolean_options = PyPIRCCommand.boolean_options + ['sign']
+    boolean_options = ['show-response', 'sign']
 
     def initialize_options(self):
-        PyPIRCCommand.initialize_options(self)
         self.username = ''
         self.password = ''
+        self.repository = ''
         self.show_response = 0
         self.sign = False
         self.identity = None
 
     def finalize_options(self):
-        PyPIRCCommand.finalize_options(self)
         if self.identity and not self.sign:
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        config = self._read_pypirc()
-        if config != {}:
-            self.username = config['username']
-            self.password = config['password']
-            self.repository = config['repository']
-            self.realm = config['realm']
+        if 'HOME' in os.environ:
+            rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if os.path.exists(rc):
+                self.announce('Using PyPI login from %s' % rc)
+                config = ConfigParser.ConfigParser({
+                        'username':'',
+                        'password':'',
+                        'repository':''})
+                config.read(rc)
+                if not self.repository:
+                    self.repository = config.get('server-login', 'repository')
+                if not self.username:
+                    self.username = config.get('server-login', 'username')
+                if not self.password:
+                    self.password = config.get('server-login', 'password')
+        if not self.repository:
+            self.repository = self.DEFAULT_REPOSITORY
 
     def run(self):
         if not self.distribution.dist_files:
diff --git a/core.py b/core.py
index de9ce7d7ff..32b9026999 100644
--- a/core.py
+++ b/core.py
@@ -20,7 +20,6 @@
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
 from distutils.cmd import Command
-from distutils.config import PyPIRCCommand
 from distutils.extension import Extension
 
 # This is a barebones help message generated displayed when the user
diff --git a/dist.py b/dist.py
index 0b13c1e6c1..d098cb9713 100644
--- a/dist.py
+++ b/dist.py
@@ -343,9 +343,10 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        user_file = os.path.join(os.path.expanduser('~'), user_filename)
-        if os.path.isfile(user_file):
-            files.append(user_file)
+        if 'HOME' in os.environ:
+            user_file = os.path.join(os.environ.get('HOME'), user_filename)
+            if os.path.isfile(user_file):
+                files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 2857263730..5ae79332c0 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -55,7 +55,6 @@ def test_command_packages_unspecified(self):
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_command_packages_cmdline(self):
-        from distutils.tests.test_dist import test_dist
         sys.argv.extend(["--command-packages",
                          "foo.bar,distutils.tests",
                          "test_dist",
@@ -66,7 +65,6 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        print cmd.__class__, test_dist
         self.assert_(isinstance(cmd, test_dist))
         self.assertEqual(cmd.sample_option, "sometext")
 
@@ -181,54 +179,9 @@ def format_metadata(self, dist):
         dist.metadata.write_pkg_file(sio)
         return sio.getvalue()
 
-    def test_custom_pydistutils(self):
-        # fixes #2166
-        # make sure pydistutils.cfg is found
-        old = {}
-        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
-            value = os.environ.get(env)
-            old[env] = value
-            if value is not None:
-                del os.environ[env]
-
-        if os.name == 'posix':
-            user_filename = ".pydistutils.cfg"
-        else:
-            user_filename = "pydistutils.cfg"
-
-        curdir = os.path.dirname(__file__)
-        user_filename = os.path.join(curdir, user_filename)
-        f = open(user_filename, 'w')
-        f.write('.')
-        f.close()
-
-        try:
-            dist = distutils.dist.Distribution()
-
-            # linux-style
-            if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = curdir
-                files = dist.find_config_files()
-                self.assert_(user_filename in files)
-
-            # win32-style
-            if sys.platform == 'win32':
-                # home drive should be found
-                os.environ['HOMEPATH'] = curdir
-                files = dist.find_config_files()
-                self.assert_(user_filename in files)
-        finally:
-            for key, value in old.items():
-                if value is None:
-                    continue
-                os.environ[key] = value
-            os.remove(user_filename)
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
     suite.addTest(unittest.makeSuite(MetadataTestCase))
     return suite
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")

From a76f1b7559518a73f906030946db7d12ea21fddc Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 10 May 2008 22:12:38 +0000
Subject: [PATCH 1978/8469] #1858: add distutils.config module

---
 config.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 config.py

diff --git a/config.py b/config.py
new file mode 100644
index 0000000000..cf547698a9
--- /dev/null
+++ b/config.py
@@ -0,0 +1,124 @@
+"""distutils.pypirc
+
+Provides the PyPIRCCommand class, the base class for the command classes
+that uses .pypirc in the distutils.command package.
+"""
+import os
+import sys
+from ConfigParser import ConfigParser
+
+from distutils.core import Command
+
+DEFAULT_PYPIRC = """\
+[pypirc]
+servers =
+    pypi
+
+[pypi]
+username:%s
+password:%s
+"""
+
+class PyPIRCCommand(Command):
+    """Base command that knows how to handle the .pypirc file
+    """
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REALM = 'pypi'
+    repository = None
+    realm = None
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % \
+            DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server')]
+
+    boolean_options = ['show-response']
+
+    def _get_rc_file(self):
+        """Returns rc file path."""
+        return os.path.join(os.path.expanduser('~'), '.pypirc')
+
+    def _store_pypirc(self, username, password):
+        """Creates a default .pypirc file."""
+        rc = self._get_rc_file()
+        f = open(rc, 'w')
+        try:
+            f.write(DEFAULT_PYPIRC % (username, password))
+        finally:
+            f.close()
+        try:
+            os.chmod(rc, 0600)
+        except OSError:
+            # should do something better here
+            pass
+
+    def _read_pypirc(self):
+        """Reads the .pypirc file."""
+        rc = self._get_rc_file()
+        if os.path.exists(rc):
+            print 'Using PyPI login from %s' % rc
+            repository = self.repository or self.DEFAULT_REPOSITORY
+            realm = self.realm or self.DEFAULT_REALM
+
+            config = ConfigParser()
+            config.read(rc)
+            sections = config.sections()
+            if 'distutils' in sections:
+                # let's get the list of servers
+                index_servers = config.get('distutils', 'index-servers')
+                _servers = [server.strip() for server in
+                            index_servers.split('\n')
+                            if server.strip() != '']
+                if _servers == []:
+                    # nothing set, let's try to get the default pypi
+                    if 'pypi' in sections:
+                        _servers = ['pypi']
+                    else:
+                        # the file is not properly defined, returning
+                        # an empty dict
+                        return {}
+                for server in _servers:
+                    current = {'server': server}
+                    current['username'] = config.get(server, 'username')
+                    current['password'] = config.get(server, 'password')
+
+                    # optional params
+                    for key, default in (('repository',
+                                          self.DEFAULT_REPOSITORY),
+                                         ('realm', self.DEFAULT_REALM)):
+                        if config.has_option(server, key):
+                            current[key] = config.get(server, key)
+                        else:
+                            current[key] = default
+                    if (current['server'] == repository or
+                        current['repository'] == repository):
+                        return current
+            elif 'server-login' in sections:
+                # old format
+                server = 'server-login'
+                if config.has_option(server, 'repository'):
+                    repository = config.get(server, 'repository')
+                else:
+                    repository = self.DEFAULT_REPOSITORY
+                return {'username': config.get(server, 'username'),
+                        'password': config.get(server, 'password'),
+                        'repository': repository,
+                        'server': server,
+                        'realm': self.DEFAULT_REALM}
+
+        return {}
+
+    def initialize_options(self):
+        """Initialize options."""
+        self.repository = None
+        self.realm = None
+        self.show_response = 0
+
+    def finalize_options(self):
+        """Finalizes options."""
+        if self.repository is None:
+            self.repository = self.DEFAULT_REPOSITORY
+        if self.realm is None:
+            self.realm = self.DEFAULT_REALM

From 650146240e3815b6cee42887e1919baf4077de40 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sun, 11 May 2008 14:00:00 +0000
Subject: [PATCH 1979/8469] #1858: re-apply patch for this, adding the missing
 files

---
 command/register.py  |  97 +++++++++++++++++++--------------------
 command/upload.py    |  41 ++++++-----------
 core.py              |   1 +
 dist.py              |   7 ++-
 tests/test_config.py | 105 +++++++++++++++++++++++++++++++++++++++++++
 tests/test_dist.py   |  46 +++++++++++++++++++
 tests/test_upload.py |  34 ++++++++++++++
 7 files changed, 251 insertions(+), 80 deletions(-)
 create mode 100644 tests/test_config.py
 create mode 100644 tests/test_upload.py

diff --git a/command/register.py b/command/register.py
index 5c588effd3..a9ab361a17 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,37 +8,29 @@
 __revision__ = "$Id$"
 
 import os, string, urllib2, getpass, urlparse
-import StringIO, ConfigParser
+import StringIO
 
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.errors import *
+from distutils import log
 
-class register(Command):
+class register(PyPIRCCommand):
 
     description = ("register the distribution with the Python package index")
-
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]"%DEFAULT_REPOSITORY),
+    user_options = PyPIRCCommand.user_options + [
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
-        ('show-response', None,
-         'display full response text from server'),
         ]
-    boolean_options = ['verify', 'show-response', 'list-classifiers']
+    boolean_options = PyPIRCCommand.boolean_options + [
+        'verify', 'list-classifiers']
 
     def initialize_options(self):
-        self.repository = None
-        self.show_response = 0
+        PyPIRCCommand.initialize_options(self)
         self.list_classifiers = 0
 
-    def finalize_options(self):
-        if self.repository is None:
-            self.repository = self.DEFAULT_REPOSITORY
-
     def run(self):
+        self.finalize_options()
+        self._set_config()
         self.check_metadata()
         if self.dry_run:
             self.verify_metadata()
@@ -77,6 +69,23 @@ def check_metadata(self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
+    def _set_config(self):
+        ''' Reads the configuration file and set attributes.
+        '''
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
+            self.has_config = True
+        else:
+            if self.repository not in ('pypi', self.DEFAULT_REPOSITORY):
+                raise ValueError('%s not found in .pypirc' % self.repository)
+            if self.repository == 'pypi':
+                self.repository = self.DEFAULT_REPOSITORY
+            self.has_config = False
+
     def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
@@ -90,6 +99,7 @@ def verify_metadata(self):
         (code, result) = self.post_to_server(self.build_post_data('verify'))
         print 'Server response (%s): %s'%(code, result)
 
+
     def send_metadata(self):
         ''' Send the metadata to the package index server.
 
@@ -99,10 +109,14 @@ def send_metadata(self):
 
             First we try to read the username/password from $HOME/.pypirc,
             which is a ConfigParser-formatted file with a section
-            [server-login] containing username and password entries (both
+            [distutils] containing username and password entries (both
             in clear text). Eg:
 
-                [server-login]
+                [distutils]
+                index-servers =
+                    pypi
+
+                [pypi]
                 username: fred
                 password: sekrit
 
@@ -114,21 +128,15 @@ def send_metadata(self):
              3. set the password to a random string and email the user.
 
         '''
-        choice = 'x'
-        username = password = ''
-
         # see if we can short-cut and get the username/password from the
         # config
-        config = None
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                print 'Using PyPI login from %s'%rc
-                config = ConfigParser.ConfigParser()
-                config.read(rc)
-                username = config.get('server-login', 'username')
-                password = config.get('server-login', 'password')
-                choice = '1'
+        if self.has_config:
+            choice = '1'
+            username = self.username
+            password = self.password
+        else:
+            choice = 'x'
+            username = password = ''
 
         # get the user's login info
         choices = '1 2 3 4'.split()
@@ -155,32 +163,24 @@ def send_metadata(self):
             # set up the authentication
             auth = urllib2.HTTPPasswordMgr()
             host = urlparse.urlparse(self.repository)[1]
-            auth.add_password('pypi', host, username, password)
-
+            auth.add_password(self.realm, host, username, password)
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s'%(code, result)
+            print 'Server response (%s): %s' % (code, result)
 
             # possibly save the login
-            if 'HOME' in os.environ and config is None and code == 200:
-                rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if not self.has_config and code == 200:
                 print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)'%rc
+                print '(the login will be stored in %s)' % self._get_rc_file()
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
                     if not choice:
                         choice = 'n'
                 if choice.lower() == 'y':
-                    f = open(rc, 'w')
-                    f.write('[server-login]\nusername:%s\npassword:%s\n'%(
-                        username, password))
-                    f.close()
-                    try:
-                        os.chmod(rc, 0600)
-                    except:
-                        pass
+                    self._store_pypirc(username, password)
+
         elif choice == '2':
             data = {':action': 'user'}
             data['name'] = data['password'] = data['email'] = ''
@@ -243,7 +243,8 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-
+        self.announce('Registering %s to %s' % (data['name'],
+                                                self.repository), log.INFO)
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
diff --git a/command/upload.py b/command/upload.py
index 301a159590..daf681128d 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
 from distutils.errors import *
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
 from hashlib import md5
@@ -16,53 +16,38 @@
 import urlparse
 import cStringIO as StringIO
 
-class upload(Command):
+class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
-        ('show-response', None,
-         'display full response text from server'),
+    user_options = PyPIRCCommand.user_options + [
         ('sign', 's',
          'sign files to upload using gpg'),
         ('identity=', 'i', 'GPG identity used to sign files'),
         ]
-    boolean_options = ['show-response', 'sign']
+
+    boolean_options = PyPIRCCommand.boolean_options + ['sign']
 
     def initialize_options(self):
+        PyPIRCCommand.initialize_options(self)
         self.username = ''
         self.password = ''
-        self.repository = ''
         self.show_response = 0
         self.sign = False
         self.identity = None
 
     def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
         if self.identity and not self.sign:
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                self.announce('Using PyPI login from %s' % rc)
-                config = ConfigParser.ConfigParser({
-                        'username':'',
-                        'password':'',
-                        'repository':''})
-                config.read(rc)
-                if not self.repository:
-                    self.repository = config.get('server-login', 'repository')
-                if not self.username:
-                    self.username = config.get('server-login', 'username')
-                if not self.password:
-                    self.password = config.get('server-login', 'password')
-        if not self.repository:
-            self.repository = self.DEFAULT_REPOSITORY
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
 
     def run(self):
         if not self.distribution.dist_files:
diff --git a/core.py b/core.py
index 32b9026999..de9ce7d7ff 100644
--- a/core.py
+++ b/core.py
@@ -20,6 +20,7 @@
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
 from distutils.cmd import Command
+from distutils.config import PyPIRCCommand
 from distutils.extension import Extension
 
 # This is a barebones help message generated displayed when the user
diff --git a/dist.py b/dist.py
index d098cb9713..0b13c1e6c1 100644
--- a/dist.py
+++ b/dist.py
@@ -343,10 +343,9 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if 'HOME' in os.environ:
-            user_file = os.path.join(os.environ.get('HOME'), user_filename)
-            if os.path.isfile(user_file):
-                files.append(user_file)
+        user_file = os.path.join(os.path.expanduser('~'), user_filename)
+        if os.path.isfile(user_file):
+            files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
diff --git a/tests/test_config.py b/tests/test_config.py
new file mode 100644
index 0000000000..bfce3e3e72
--- /dev/null
+++ b/tests/test_config.py
@@ -0,0 +1,105 @@
+"""Tests for distutils.pypirc.pypirc."""
+import sys
+import os
+import unittest
+
+from distutils.core import PyPIRCCommand
+from distutils.core import Distribution
+
+from distutils.tests import support
+
+PYPIRC = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:secret
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+PYPIRC_OLD = """\
+[server-login]
+username:tarek
+password:secret
+"""
+
+class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
+
+    def setUp(self):
+        """Patches the environment."""
+        if os.environ.has_key('HOME'):
+            self._old_home = os.environ['HOME']
+        else:
+            self._old_home = None
+        curdir = os.path.dirname(__file__)
+        os.environ['HOME'] = curdir
+        self.rc = os.path.join(curdir, '.pypirc')
+        self.dist = Distribution()
+
+        class command(PyPIRCCommand):
+            def __init__(self, dist):
+                PyPIRCCommand.__init__(self, dist)
+            def initialize_options(self):
+                pass
+            finalize_options = initialize_options
+
+        self._cmd = command
+
+    def tearDown(self):
+        """Removes the patch."""
+        if self._old_home is None:
+            del os.environ['HOME']
+        else:
+            os.environ['HOME'] = self._old_home
+        if os.path.exists(self.rc):
+            os.remove(self.rc)
+
+    def test_server_registration(self):
+        # This test makes sure PyPIRCCommand knows how to:
+        # 1. handle several sections in .pypirc
+        # 2. handle the old format
+
+        # new format
+        f = open(self.rc, 'w')
+        try:
+            f.write(PYPIRC)
+        finally:
+            f.close()
+
+        cmd = self._cmd(self.dist)
+        config = cmd._read_pypirc()
+
+        config = config.items()
+        config.sort()
+        waited = [('password', 'secret'), ('realm', 'pypi'),
+                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('server', 'server1'), ('username', 'me')]
+        self.assertEquals(config, waited)
+
+        # old format
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_OLD)
+        f.close()
+
+        config = cmd._read_pypirc()
+        config = config.items()
+        config.sort()
+        waited = [('password', 'secret'), ('realm', 'pypi'),
+                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('server', 'server-login'), ('username', 'tarek')]
+        self.assertEquals(config, waited)
+
+def test_suite():
+    return unittest.makeSuite(PyPIRCCommandTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 5ae79332c0..804c8a4686 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -55,6 +55,7 @@ def test_command_packages_unspecified(self):
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_command_packages_cmdline(self):
+        from distutils.tests.test_dist import test_dist
         sys.argv.extend(["--command-packages",
                          "foo.bar,distutils.tests",
                          "test_dist",
@@ -179,9 +180,54 @@ def format_metadata(self, dist):
         dist.metadata.write_pkg_file(sio)
         return sio.getvalue()
 
+    def test_custom_pydistutils(self):
+        # fixes #2166
+        # make sure pydistutils.cfg is found
+        old = {}
+        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
+            value = os.environ.get(env)
+            old[env] = value
+            if value is not None:
+                del os.environ[env]
+
+        if os.name == 'posix':
+            user_filename = ".pydistutils.cfg"
+        else:
+            user_filename = "pydistutils.cfg"
+
+        curdir = os.path.dirname(__file__)
+        user_filename = os.path.join(curdir, user_filename)
+        f = open(user_filename, 'w')
+        f.write('.')
+        f.close()
+
+        try:
+            dist = distutils.dist.Distribution()
+
+            # linux-style
+            if sys.platform in ('linux', 'darwin'):
+                os.environ['HOME'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+
+            # win32-style
+            if sys.platform == 'win32':
+                # home drive should be found
+                os.environ['HOMEPATH'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+        finally:
+            for key, value in old.items():
+                if value is None:
+                    continue
+                os.environ[key] = value
+            os.remove(user_filename)
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
     suite.addTest(unittest.makeSuite(MetadataTestCase))
     return suite
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_upload.py b/tests/test_upload.py
new file mode 100644
index 0000000000..b05ab1f78b
--- /dev/null
+++ b/tests/test_upload.py
@@ -0,0 +1,34 @@
+"""Tests for distutils.command.upload."""
+import sys
+import os
+import unittest
+
+from distutils.command.upload import upload
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+class uploadTestCase(PyPIRCCommandTestCase):
+
+    def test_finalize_options(self):
+
+        # new format
+        f = open(self.rc, 'w')
+        f.write(PYPIRC)
+        f.close()
+
+        dist = Distribution()
+        cmd = upload(dist)
+        cmd.finalize_options()
+        for attr, waited in (('username', 'me'), ('password', 'secret'),
+                             ('realm', 'pypi'),
+                             ('repository', 'http://pypi.python.org/pypi')):
+            self.assertEquals(getattr(cmd, attr), waited)
+
+
+def test_suite():
+    return unittest.makeSuite(uploadTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 9dd1c5afa5e07e7da296484f3508464e9622a5bf Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sun, 11 May 2008 19:15:52 +0000
Subject: [PATCH 1980/8469] Add message to test assertion

---
 tests/test_dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 804c8a4686..05342af829 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -215,7 +215,8 @@ def test_custom_pydistutils(self):
                 # home drive should be found
                 os.environ['HOMEPATH'] = curdir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files)
+                self.assert_(user_filename in files,
+                             '%r not found in %r' % (user_filename, files))
         finally:
             for key, value in old.items():
                 if value is None:

From 34cbcc09ce17524bcef6b344b93a8968f2c34582 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sun, 11 May 2008 20:08:33 +0000
Subject: [PATCH 1981/8469] Try setting HOME env.var to fix test on Win32

---
 tests/test_dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 05342af829..8f1288e9f6 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -213,7 +213,7 @@ def test_custom_pydistutils(self):
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOMEPATH'] = curdir
+                os.environ['HOME'] = curdir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files,
                              '%r not found in %r' % (user_filename, files))

From 2a4ac571e1458d6871960e7fc687eaba5b6b778d Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Wed, 14 May 2008 22:44:22 +0000
Subject: [PATCH 1982/8469] Updated import statements to use the new
 `configparser` module name. Updated the documentation to use the new name.
 Revert addition of the stub entry for the old name.

Georg, I am reverting your changes since this commit should propagate
to py3k.
---
 command/upload.py | 2 +-
 config.py         | 2 +-
 dist.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index daf681128d..ecc06f05ec 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -10,7 +10,7 @@
 import os
 import socket
 import platform
-import ConfigParser
+import configparser
 import httplib
 import base64
 import urlparse
diff --git a/config.py b/config.py
index cf547698a9..e9ba40260c 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,7 @@
 """
 import os
 import sys
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from distutils.core import Command
 
diff --git a/dist.py b/dist.py
index 0b13c1e6c1..e4ab3363d8 100644
--- a/dist.py
+++ b/dist.py
@@ -359,7 +359,7 @@ def find_config_files (self):
 
     def parse_config_files (self, filenames=None):
 
-        from ConfigParser import ConfigParser
+        from configparser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()

From 9285f7c07f1c115cfbf61b15b00925f1ea4be940 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Wed, 14 May 2008 22:59:42 +0000
Subject: [PATCH 1983/8469] Renamed ConfigParser to configparser. Merged
 revisions 63247-63248 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63247 | georg.brandl | 2008-05-14 18:30:31 -0400 (Wed, 14 May 2008) | 2 lines

  Update configparser docs for lowercasing rename.
........
  r63248 | alexandre.vassalotti | 2008-05-14 18:44:22 -0400 (Wed, 14 May 2008) | 8 lines

  Updated import statements to use the new `configparser` module name.
  Updated the documentation to use the new name.
  Revert addition of the stub entry for the old name.

  Georg, I am reverting your changes since this commit should propagate
  to py3k.
........
---
 command/upload.py | 2 +-
 dist.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 34b6692d04..23999ae9ca 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -10,7 +10,7 @@
 import os
 import socket
 import platform
-import ConfigParser
+import configparser
 import httplib
 import base64
 import urlparse
diff --git a/dist.py b/dist.py
index ade2ab795c..847eb902cf 100644
--- a/dist.py
+++ b/dist.py
@@ -349,7 +349,7 @@ def find_config_files (self):
 
     def parse_config_files (self, filenames=None):
 
-        from ConfigParser import ConfigParser
+        from configparser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()

From 04c09e98e06c0b9467e8f22c52d2fe052fd505e1 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 00:33:57 +0000
Subject: [PATCH 1984/8469] Revert distutils changes done in r63248.

As explained by Marc-Andre Lemburg, distutils needs to stay
backward-compatible. Therefore, it should use the old ConfigParser
module name.
---
 command/upload.py | 2 +-
 config.py         | 2 +-
 dist.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index ecc06f05ec..daf681128d 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -10,7 +10,7 @@
 import os
 import socket
 import platform
-import configparser
+import ConfigParser
 import httplib
 import base64
 import urlparse
diff --git a/config.py b/config.py
index e9ba40260c..cf547698a9 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,7 @@
 """
 import os
 import sys
-from configparser import ConfigParser
+from ConfigParser import ConfigParser
 
 from distutils.core import Command
 
diff --git a/dist.py b/dist.py
index e4ab3363d8..0b13c1e6c1 100644
--- a/dist.py
+++ b/dist.py
@@ -359,7 +359,7 @@ def find_config_files (self):
 
     def parse_config_files (self, filenames=None):
 
-        from configparser import ConfigParser
+        from ConfigParser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()

From 7af87d550e429290a39a66350c57fd30141080f1 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 02:14:05 +0000
Subject: [PATCH 1985/8469] Fixed configparser import in distutils.config.

---
 config.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 config.py

diff --git a/config.py b/config.py
new file mode 100644
index 0000000000..e9ba40260c
--- /dev/null
+++ b/config.py
@@ -0,0 +1,124 @@
+"""distutils.pypirc
+
+Provides the PyPIRCCommand class, the base class for the command classes
+that uses .pypirc in the distutils.command package.
+"""
+import os
+import sys
+from configparser import ConfigParser
+
+from distutils.core import Command
+
+DEFAULT_PYPIRC = """\
+[pypirc]
+servers =
+    pypi
+
+[pypi]
+username:%s
+password:%s
+"""
+
+class PyPIRCCommand(Command):
+    """Base command that knows how to handle the .pypirc file
+    """
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REALM = 'pypi'
+    repository = None
+    realm = None
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % \
+            DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server')]
+
+    boolean_options = ['show-response']
+
+    def _get_rc_file(self):
+        """Returns rc file path."""
+        return os.path.join(os.path.expanduser('~'), '.pypirc')
+
+    def _store_pypirc(self, username, password):
+        """Creates a default .pypirc file."""
+        rc = self._get_rc_file()
+        f = open(rc, 'w')
+        try:
+            f.write(DEFAULT_PYPIRC % (username, password))
+        finally:
+            f.close()
+        try:
+            os.chmod(rc, 0600)
+        except OSError:
+            # should do something better here
+            pass
+
+    def _read_pypirc(self):
+        """Reads the .pypirc file."""
+        rc = self._get_rc_file()
+        if os.path.exists(rc):
+            print 'Using PyPI login from %s' % rc
+            repository = self.repository or self.DEFAULT_REPOSITORY
+            realm = self.realm or self.DEFAULT_REALM
+
+            config = ConfigParser()
+            config.read(rc)
+            sections = config.sections()
+            if 'distutils' in sections:
+                # let's get the list of servers
+                index_servers = config.get('distutils', 'index-servers')
+                _servers = [server.strip() for server in
+                            index_servers.split('\n')
+                            if server.strip() != '']
+                if _servers == []:
+                    # nothing set, let's try to get the default pypi
+                    if 'pypi' in sections:
+                        _servers = ['pypi']
+                    else:
+                        # the file is not properly defined, returning
+                        # an empty dict
+                        return {}
+                for server in _servers:
+                    current = {'server': server}
+                    current['username'] = config.get(server, 'username')
+                    current['password'] = config.get(server, 'password')
+
+                    # optional params
+                    for key, default in (('repository',
+                                          self.DEFAULT_REPOSITORY),
+                                         ('realm', self.DEFAULT_REALM)):
+                        if config.has_option(server, key):
+                            current[key] = config.get(server, key)
+                        else:
+                            current[key] = default
+                    if (current['server'] == repository or
+                        current['repository'] == repository):
+                        return current
+            elif 'server-login' in sections:
+                # old format
+                server = 'server-login'
+                if config.has_option(server, 'repository'):
+                    repository = config.get(server, 'repository')
+                else:
+                    repository = self.DEFAULT_REPOSITORY
+                return {'username': config.get(server, 'username'),
+                        'password': config.get(server, 'password'),
+                        'repository': repository,
+                        'server': server,
+                        'realm': self.DEFAULT_REALM}
+
+        return {}
+
+    def initialize_options(self):
+        """Initialize options."""
+        self.repository = None
+        self.realm = None
+        self.show_response = 0
+
+    def finalize_options(self):
+        """Finalizes options."""
+        if self.repository is None:
+            self.repository = self.DEFAULT_REPOSITORY
+        if self.realm is None:
+            self.realm = self.DEFAULT_REALM

From 1ea453fe09439490fd90dff0675db494b5b82b86 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 15 May 2008 20:06:51 +0000
Subject: [PATCH 1986/8469] Use lowercase version of module name

---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index cf547698a9..e9ba40260c 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,7 @@
 """
 import os
 import sys
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from distutils.core import Command
 

From f543720ad42bf00329d322a6ae72f69a9e3d90b4 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Thu, 15 May 2008 20:07:39 +0000
Subject: [PATCH 1987/8469] Import class from distutils.cmd, not .core, to
 avoid circular import

---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index e9ba40260c..edba47f579 100644
--- a/config.py
+++ b/config.py
@@ -7,7 +7,7 @@
 import sys
 from configparser import ConfigParser
 
-from distutils.core import Command
+from distutils.cmd import Command
 
 DEFAULT_PYPIRC = """\
 [pypirc]

From c926aa0be33963fb9fe9c776acf77df7a25770c1 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 20:13:54 +0000
Subject: [PATCH 1988/8469] Fixed another missed ConfigParser import rename.

---
 command/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/register.py b/command/register.py
index 40d9f20d1a..b6a36f5bfe 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,7 +8,7 @@
 __revision__ = "$Id$"
 
 import os, string, urllib2, getpass, urlparse
-import io, ConfigParser
+import io, configparser
 
 from distutils.core import Command
 from distutils.errors import *

From a2b4da6548ce557e87cbc6a40bf312fb308d4d4b Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 20:30:56 +0000
Subject: [PATCH 1989/8469] Revert r63323: Use lowercase version of module
 name.

The distutils module should continue to use the old ConfigParser name,
for backward-compatibility.
---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index edba47f579..f1117beed1 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,7 @@
 """
 import os
 import sys
-from configparser import ConfigParser
+from ConfigParser import ConfigParser
 
 from distutils.cmd import Command
 

From 67495c271aba3864b15d2e9f2fab5cb7c775edc0 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 22:09:29 +0000
Subject: [PATCH 1990/8469] Merged revisions
 62914-62916,62918-62919,62921-62922,62924-62942,62944-62945,62947-62949 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62914 | skip.montanaro | 2008-05-08 20:45:00 -0400 (Thu, 08 May 2008) | 4 lines

  Add an example about using NamedTemporaryFile() to replace mktemp().  I'm
  unclear whether the verbatim text should have been indented or by how much.
........
  r62915 | benjamin.peterson | 2008-05-08 20:50:40 -0400 (Thu, 08 May 2008) | 2 lines

  reindent example
........
  r62927 | georg.brandl | 2008-05-09 02:09:25 -0400 (Fri, 09 May 2008) | 2 lines

  #2788: add .hgignore file.
........
  r62928 | georg.brandl | 2008-05-09 02:10:43 -0400 (Fri, 09 May 2008) | 2 lines

  #2781: fix function name.
........
  r62929 | georg.brandl | 2008-05-09 02:18:27 -0400 (Fri, 09 May 2008) | 2 lines

  Add a sentence to basicConfig() that is in the docstring.
........
  r62930 | georg.brandl | 2008-05-09 02:26:54 -0400 (Fri, 09 May 2008) | 2 lines

  Add another link to colorsys docs.
........
  r62931 | georg.brandl | 2008-05-09 02:36:07 -0400 (Fri, 09 May 2008) | 2 lines

  Add Kodos as a re reference.
........
  r62932 | georg.brandl | 2008-05-09 02:39:58 -0400 (Fri, 09 May 2008) | 2 lines

  Add a note about using reload().
........
  r62933 | andrew.kuchling | 2008-05-09 07:46:05 -0400 (Fri, 09 May 2008) | 3 lines

  Update planned release date.
  Uncomment PEP 370 section.
  Add some module items
........
  r62934 | christian.heimes | 2008-05-09 08:19:09 -0400 (Fri, 09 May 2008) | 1 line

  Add --user option to build_ext
........
  r62948 | mark.dickinson | 2008-05-09 13:54:23 -0400 (Fri, 09 May 2008) | 3 lines

  Issue #2487.  math.ldexp(x, n) raised OverflowError when n was large and
  negative; fix to return an (appropriately signed) zero instead.
........
  r62949 | martin.v.loewis | 2008-05-09 14:21:55 -0400 (Fri, 09 May 2008) | 1 line

  Use the CHM file name that Sphinx assigns.
........
---
 command/build_ext.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index e01121986c..73cc00ba0f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+from site import USER_BASE, USER_SITE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -90,9 +91,11 @@ class build_ext(Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
+        ('user', None,
+         "add user include, library and rpath"),
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
 
     help_options = [
         ('help-compiler', None,
@@ -120,6 +123,7 @@ def initialize_options(self):
         self.swig = None
         self.swig_cpp = None
         self.swig_opts = None
+        self.user = None
 
     def finalize_options(self):
         from distutils import sysconfig
@@ -253,6 +257,16 @@ def finalize_options(self):
         else:
             self.swig_opts = self.swig_opts.split(' ')
 
+        # Finally add the user include and library directories if requested
+        if self.user:
+            user_include = os.path.join(USER_BASE, "include")
+            user_lib = os.path.join(USER_BASE, "lib")
+            if os.path.isdir(user_include):
+                self.include_dirs.append(user_include)
+            if os.path.isdir(user_lib):
+                self.library_dirs.append(user_lib)
+                self.rpath.append(user_lib)
+
     def run(self):
         from distutils.ccompiler import new_compiler
 

From f71e81f1f9cf18ae21fe3e17c4ac17e83b3ef403 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Fri, 16 May 2008 00:03:33 +0000
Subject: [PATCH 1991/8469] Merged revisions
 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62998 | andrew.kuchling | 2008-05-10 15:51:55 -0400 (Sat, 10 May 2008) | 7 lines

  #1858 from Tarek Ziade:
  Allow multiple repositories in .pypirc; see http://wiki.python.org/moin/EnhancedPyPI
  for discussion.

  The patch is slightly revised from Tarek's last patch: I've simplified
  the PyPIRCCommand.finalize_options() method to not look at sys.argv.
  Tests still pass.
........
  r63000 | alexandre.vassalotti | 2008-05-10 15:59:16 -0400 (Sat, 10 May 2008) | 5 lines

  Cleaned up io._BytesIO.write().

  I am amazed that the old code, for inserting null-bytes, actually
  worked. Who wrote that thing? Oh, it is me... doh.
........
  r63002 | brett.cannon | 2008-05-10 16:52:01 -0400 (Sat, 10 May 2008) | 2 lines

  Revert r62998 as it broke the build (seems distutils.config is missing).
........
  r63014 | andrew.kuchling | 2008-05-10 18:12:38 -0400 (Sat, 10 May 2008) | 1 line

  #1858: add distutils.config module
........
  r63027 | brett.cannon | 2008-05-10 21:09:32 -0400 (Sat, 10 May 2008) | 2 lines

  Flesh out the 3.0 deprecation to suggest using the ctypes module.
........
  r63028 | skip.montanaro | 2008-05-10 22:59:30 -0400 (Sat, 10 May 2008) | 4 lines

  Copied two versions of the example from the interactive session.  Delete
  one.
........
  r63037 | georg.brandl | 2008-05-11 03:02:17 -0400 (Sun, 11 May 2008) | 2 lines

  reload() takes the module itself.
........
  r63038 | alexandre.vassalotti | 2008-05-11 03:06:04 -0400 (Sun, 11 May 2008) | 4 lines

  Added test framework for handling module renames.
  Factored the import guard in test_py3kwarn.TestStdlibRemovals into
  a context manager, namely test_support.CleanImport.
........
  r63039 | georg.brandl | 2008-05-11 03:06:05 -0400 (Sun, 11 May 2008) | 2 lines

  #2742: ``''`` is not converted to NULL in getaddrinfo.
........
  r63040 | alexandre.vassalotti | 2008-05-11 03:08:12 -0400 (Sun, 11 May 2008) | 2 lines

  Fixed typo in a comment of test_support.CleanImport.
........
  r63041 | alexandre.vassalotti | 2008-05-11 03:10:25 -0400 (Sun, 11 May 2008) | 2 lines

  Removed a dead line of code.
........
  r63043 | georg.brandl | 2008-05-11 04:47:53 -0400 (Sun, 11 May 2008) | 2 lines

  #2812: document property.getter/setter/deleter.
........
  r63049 | georg.brandl | 2008-05-11 05:06:30 -0400 (Sun, 11 May 2008) | 2 lines

  #1153769: document PEP 237 changes to string formatting.
........
  r63050 | georg.brandl | 2008-05-11 05:11:40 -0400 (Sun, 11 May 2008) | 2 lines

  #2809: elaborate str.split docstring a bit.
........
  r63051 | georg.brandl | 2008-05-11 06:13:59 -0400 (Sun, 11 May 2008) | 2 lines

  Fix typo.
........
  r63052 | georg.brandl | 2008-05-11 06:33:27 -0400 (Sun, 11 May 2008) | 2 lines

  #2709: clarification.
........
  r63053 | georg.brandl | 2008-05-11 06:42:28 -0400 (Sun, 11 May 2008) | 2 lines

  #2659: add ``break_on_hyphens`` to TextWrapper.
........
  r63057 | georg.brandl | 2008-05-11 06:59:39 -0400 (Sun, 11 May 2008) | 2 lines

  #2741: clarification of value range for address_family.
........
  r63058 | georg.brandl | 2008-05-11 07:09:35 -0400 (Sun, 11 May 2008) | 2 lines

  #2452: timeout is used for all blocking operations.
........
  r63059 | andrew.kuchling | 2008-05-11 09:33:56 -0400 (Sun, 11 May 2008) | 2 lines

  #1792: Improve performance of marshal.dumps() on large objects by increasing
  the size of the buffer more quickly.
........
  r63060 | andrew.kuchling | 2008-05-11 10:00:00 -0400 (Sun, 11 May 2008) | 1 line

  #1858: re-apply patch for this, adding the missing files
........
  r63061 | benjamin.peterson | 2008-05-11 10:13:25 -0400 (Sun, 11 May 2008) | 2 lines

  Add the "until" command to pdb
........
  r63062 | georg.brandl | 2008-05-11 10:17:13 -0400 (Sun, 11 May 2008) | 2 lines

  Add some sentence endings.
........
---
 command/register.py  |  95 +++++++++++++++++++--------------------
 command/upload.py    |  41 ++++++-----------
 config.py            |   4 +-
 core.py              |   1 +
 dist.py              |   7 ++-
 tests/test_config.py | 103 +++++++++++++++++++++++++++++++++++++++++++
 tests/test_dist.py   |  46 +++++++++++++++++++
 tests/test_upload.py |  34 ++++++++++++++
 8 files changed, 250 insertions(+), 81 deletions(-)
 create mode 100644 tests/test_config.py
 create mode 100644 tests/test_upload.py

diff --git a/command/register.py b/command/register.py
index b6a36f5bfe..89cb2d410c 100644
--- a/command/register.py
+++ b/command/register.py
@@ -8,42 +8,34 @@
 __revision__ = "$Id$"
 
 import os, string, urllib2, getpass, urlparse
-import io, configparser
+import io
 
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.errors import *
+from distutils import log
 
 def raw_input(prompt):
     sys.stdout.write(prompt)
     sys.stdout.flush()
     return sys.stdin.readline()
 
-class register(Command):
+class register(PyPIRCCommand):
 
     description = ("register the distribution with the Python package index")
-
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]"%DEFAULT_REPOSITORY),
+    user_options = PyPIRCCommand.user_options + [
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
-        ('show-response', None,
-         'display full response text from server'),
         ]
-    boolean_options = ['verify', 'show-response', 'list-classifiers']
+    boolean_options = PyPIRCCommand.boolean_options + [
+        'verify', 'list-classifiers']
 
     def initialize_options(self):
-        self.repository = None
-        self.show_response = 0
+        PyPIRCCommand.initialize_options(self)
         self.list_classifiers = 0
 
-    def finalize_options(self):
-        if self.repository is None:
-            self.repository = self.DEFAULT_REPOSITORY
-
     def run(self):
+        self.finalize_options()
+        self._set_config()
         self.check_metadata()
         if self.dry_run:
             self.verify_metadata()
@@ -82,6 +74,23 @@ def check_metadata(self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
+    def _set_config(self):
+        ''' Reads the configuration file and set attributes.
+        '''
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
+            self.has_config = True
+        else:
+            if self.repository not in ('pypi', self.DEFAULT_REPOSITORY):
+                raise ValueError('%s not found in .pypirc' % self.repository)
+            if self.repository == 'pypi':
+                self.repository = self.DEFAULT_REPOSITORY
+            self.has_config = False
+
     def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
@@ -95,6 +104,7 @@ def verify_metadata(self):
         (code, result) = self.post_to_server(self.build_post_data('verify'))
         print('Server response (%s): %s'%(code, result))
 
+
     def send_metadata(self):
         ''' Send the metadata to the package index server.
 
@@ -104,10 +114,14 @@ def send_metadata(self):
 
             First we try to read the username/password from $HOME/.pypirc,
             which is a ConfigParser-formatted file with a section
-            [server-login] containing username and password entries (both
+            [distutils] containing username and password entries (both
             in clear text). Eg:
 
-                [server-login]
+                [distutils]
+                index-servers =
+                    pypi
+
+                [pypi]
                 username: fred
                 password: sekrit
 
@@ -119,21 +133,15 @@ def send_metadata(self):
              3. set the password to a random string and email the user.
 
         '''
-        choice = 'x'
-        username = password = ''
-
         # see if we can short-cut and get the username/password from the
         # config
-        config = None
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                print('Using PyPI login from %s'%rc)
-                config = ConfigParser.ConfigParser()
-                config.read(rc)
-                username = config.get('server-login', 'username')
-                password = config.get('server-login', 'password')
-                choice = '1'
+        if self.has_config:
+            choice = '1'
+            username = self.username
+            password = self.password
+        else:
+            choice = 'x'
+            username = password = ''
 
         # get the user's login info
         choices = '1 2 3 4'.split()
@@ -160,32 +168,24 @@ def send_metadata(self):
             # set up the authentication
             auth = urllib2.HTTPPasswordMgr()
             host = urlparse.urlparse(self.repository)[1]
-            auth.add_password('pypi', host, username, password)
-
+            auth.add_password(self.realm, host, username, password)
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
             print('Server response (%s): %s'%(code, result))
 
             # possibly save the login
-            if 'HOME' in os.environ and config is None and code == 200:
-                rc = os.path.join(os.environ['HOME'], '.pypirc')
+            if not self.has_config and code == 200:
                 print('I can store your PyPI login so future submissions will be faster.')
-                print('(the login will be stored in %s)'%rc)
+                print('(the login will be stored in %s)' % self._get_rc_file())
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
                     if not choice:
                         choice = 'n'
                 if choice.lower() == 'y':
-                    f = open(rc, 'w')
-                    f.write('[server-login]\nusername:%s\npassword:%s\n'%(
-                        username, password))
-                    f.close()
-                    try:
-                        os.chmod(rc, 0o600)
-                    except:
-                        pass
+                    self._store_pypirc(username, password)
+
         elif choice == '2':
             data = {':action': 'user'}
             data['name'] = data['password'] = data['email'] = ''
@@ -248,7 +248,8 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-
+        self.announce('Registering %s to %s' % (data['name'],
+                                                self.repository), log.INFO)
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
diff --git a/command/upload.py b/command/upload.py
index 23999ae9ca..603336c954 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
 from distutils.errors import *
-from distutils.core import Command
+from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
 from hashlib import md5
@@ -15,53 +15,38 @@
 import base64
 import urlparse
 
-class upload(Command):
+class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
-
-    user_options = [
-        ('repository=', 'r',
-         "url of repository [default: %s]" % DEFAULT_REPOSITORY),
-        ('show-response', None,
-         'display full response text from server'),
+    user_options = PyPIRCCommand.user_options + [
         ('sign', 's',
          'sign files to upload using gpg'),
         ('identity=', 'i', 'GPG identity used to sign files'),
         ]
-    boolean_options = ['show-response', 'sign']
+
+    boolean_options = PyPIRCCommand.boolean_options + ['sign']
 
     def initialize_options(self):
+        PyPIRCCommand.initialize_options(self)
         self.username = ''
         self.password = ''
-        self.repository = ''
         self.show_response = 0
         self.sign = False
         self.identity = None
 
     def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
         if self.identity and not self.sign:
             raise DistutilsOptionError(
                 "Must use --sign for --identity to have meaning"
             )
-        if 'HOME' in os.environ:
-            rc = os.path.join(os.environ['HOME'], '.pypirc')
-            if os.path.exists(rc):
-                self.announce('Using PyPI login from %s' % rc)
-                config = ConfigParser.ConfigParser({
-                        'username':'',
-                        'password':'',
-                        'repository':''})
-                config.read(rc)
-                if not self.repository:
-                    self.repository = config.get('server-login', 'repository')
-                if not self.username:
-                    self.username = config.get('server-login', 'username')
-                if not self.password:
-                    self.password = config.get('server-login', 'password')
-        if not self.repository:
-            self.repository = self.DEFAULT_REPOSITORY
+        config = self._read_pypirc()
+        if config != {}:
+            self.username = config['username']
+            self.password = config['password']
+            self.repository = config['repository']
+            self.realm = config['realm']
 
     def run(self):
         if not self.distribution.dist_files:
diff --git a/config.py b/config.py
index e9ba40260c..a625aec5e6 100644
--- a/config.py
+++ b/config.py
@@ -49,7 +49,7 @@ def _store_pypirc(self, username, password):
         finally:
             f.close()
         try:
-            os.chmod(rc, 0600)
+            os.chmod(rc, 0o600)
         except OSError:
             # should do something better here
             pass
@@ -58,7 +58,7 @@ def _read_pypirc(self):
         """Reads the .pypirc file."""
         rc = self._get_rc_file()
         if os.path.exists(rc):
-            print 'Using PyPI login from %s' % rc
+            print('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
             realm = self.realm or self.DEFAULT_REALM
 
diff --git a/core.py b/core.py
index a4c5e18033..6e4892039e 100644
--- a/core.py
+++ b/core.py
@@ -17,6 +17,7 @@
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
 from distutils.cmd import Command
+from distutils.config import PyPIRCCommand
 from distutils.extension import Extension
 
 # This is a barebones help message generated displayed when the user
diff --git a/dist.py b/dist.py
index 847eb902cf..ddde909fbd 100644
--- a/dist.py
+++ b/dist.py
@@ -334,10 +334,9 @@ def find_config_files (self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if 'HOME' in os.environ:
-            user_file = os.path.join(os.environ.get('HOME'), user_filename)
-            if os.path.isfile(user_file):
-                files.append(user_file)
+        user_file = os.path.join(os.path.expanduser('~'), user_filename)
+        if os.path.isfile(user_file):
+            files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
diff --git a/tests/test_config.py b/tests/test_config.py
new file mode 100644
index 0000000000..016ba4cc70
--- /dev/null
+++ b/tests/test_config.py
@@ -0,0 +1,103 @@
+"""Tests for distutils.pypirc.pypirc."""
+import sys
+import os
+import unittest
+
+from distutils.core import PyPIRCCommand
+from distutils.core import Distribution
+
+from distutils.tests import support
+
+PYPIRC = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:secret
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+PYPIRC_OLD = """\
+[server-login]
+username:tarek
+password:secret
+"""
+
+class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
+
+    def setUp(self):
+        """Patches the environment."""
+        if 'HOME' in os.environ:
+            self._old_home = os.environ['HOME']
+        else:
+            self._old_home = None
+        curdir = os.path.dirname(__file__)
+        os.environ['HOME'] = curdir
+        self.rc = os.path.join(curdir, '.pypirc')
+        self.dist = Distribution()
+
+        class command(PyPIRCCommand):
+            def __init__(self, dist):
+                PyPIRCCommand.__init__(self, dist)
+            def initialize_options(self):
+                pass
+            finalize_options = initialize_options
+
+        self._cmd = command
+
+    def tearDown(self):
+        """Removes the patch."""
+        if self._old_home is None:
+            del os.environ['HOME']
+        else:
+            os.environ['HOME'] = self._old_home
+        if os.path.exists(self.rc):
+            os.remove(self.rc)
+
+    def test_server_registration(self):
+        # This test makes sure PyPIRCCommand knows how to:
+        # 1. handle several sections in .pypirc
+        # 2. handle the old format
+
+        # new format
+        f = open(self.rc, 'w')
+        try:
+            f.write(PYPIRC)
+        finally:
+            f.close()
+
+        cmd = self._cmd(self.dist)
+        config = cmd._read_pypirc()
+
+        config = list(sorted(config.items()))
+        waited = [('password', 'secret'), ('realm', 'pypi'),
+                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('server', 'server1'), ('username', 'me')]
+        self.assertEquals(config, waited)
+
+        # old format
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_OLD)
+        f.close()
+
+        config = cmd._read_pypirc()
+        config = list(sorted(config.items()))
+        waited = [('password', 'secret'), ('realm', 'pypi'),
+                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('server', 'server-login'), ('username', 'tarek')]
+        self.assertEquals(config, waited)
+
+def test_suite():
+    return unittest.makeSuite(PyPIRCCommandTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 91acf45805..81459ace53 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -55,6 +55,7 @@ def test_command_packages_unspecified(self):
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_command_packages_cmdline(self):
+        from distutils.tests.test_dist import test_dist
         sys.argv.extend(["--command-packages",
                          "foo.bar,distutils.tests",
                          "test_dist",
@@ -179,9 +180,54 @@ def format_metadata(self, dist):
         dist.metadata.write_pkg_file(sio)
         return sio.getvalue()
 
+    def test_custom_pydistutils(self):
+        # fixes #2166
+        # make sure pydistutils.cfg is found
+        old = {}
+        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
+            value = os.environ.get(env)
+            old[env] = value
+            if value is not None:
+                del os.environ[env]
+
+        if os.name == 'posix':
+            user_filename = ".pydistutils.cfg"
+        else:
+            user_filename = "pydistutils.cfg"
+
+        curdir = os.path.dirname(__file__)
+        user_filename = os.path.join(curdir, user_filename)
+        f = open(user_filename, 'w')
+        f.write('.')
+        f.close()
+
+        try:
+            dist = distutils.dist.Distribution()
+
+            # linux-style
+            if sys.platform in ('linux', 'darwin'):
+                os.environ['HOME'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+
+            # win32-style
+            if sys.platform == 'win32':
+                # home drive should be found
+                os.environ['HOMEPATH'] = curdir
+                files = dist.find_config_files()
+                self.assert_(user_filename in files)
+        finally:
+            for key, value in old.items():
+                if value is None:
+                    continue
+                os.environ[key] = value
+            os.remove(user_filename)
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
     suite.addTest(unittest.makeSuite(MetadataTestCase))
     return suite
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_upload.py b/tests/test_upload.py
new file mode 100644
index 0000000000..b05ab1f78b
--- /dev/null
+++ b/tests/test_upload.py
@@ -0,0 +1,34 @@
+"""Tests for distutils.command.upload."""
+import sys
+import os
+import unittest
+
+from distutils.command.upload import upload
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+class uploadTestCase(PyPIRCCommandTestCase):
+
+    def test_finalize_options(self):
+
+        # new format
+        f = open(self.rc, 'w')
+        f.write(PYPIRC)
+        f.close()
+
+        dist = Distribution()
+        cmd = upload(dist)
+        cmd.finalize_options()
+        for attr, waited in (('username', 'me'), ('password', 'secret'),
+                             ('realm', 'pypi'),
+                             ('repository', 'http://pypi.python.org/pypi')):
+            self.assertEquals(getattr(cmd, attr), waited)
+
+
+def test_suite():
+    return unittest.makeSuite(uploadTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 17a42fcbc36865bdf006384e396f968312103464 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Fri, 16 May 2008 00:41:41 +0000
Subject: [PATCH 1992/8469] Merged revisions
 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines

  #2709 followup: better description of Tk's pros and cons.
........
  r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines

  #1326: document and test zipimporter.archive and zipimporter.prefix.
........
  r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines

  #2816: clarify error messages for EOF while scanning strings.
........
  r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines

  #2787: Flush stdout after writing test name, helpful when running
  hanging or long-running tests. Patch by Adam Olsen.
........
  r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines

  #2803: fix wrong invocation of heappush in seldom-reached code.
  Thanks to Matt Harden.
........
  r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines

  broaden .bzrignore
........
  r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line

  Add message to test assertion
........
  r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line

  Try setting HOME env.var to fix test on Win32
........
  r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines

  #2809 followup: even better split docstring.
........
  r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines

  - #2250: Exceptions raised during evaluation of names in rlcompleter's
    ``Completer.complete()`` method are now caught and ignored.
........
  r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines

  Clarify os.strerror()s exception behavior.
........
  r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines

  #2535: remove duplicated method.
........
  r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines

  Moved the Queue module stub in lib-old.
........
---
 tests/test_dist.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 81459ace53..dd0773508e 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -213,9 +213,10 @@ def test_custom_pydistutils(self):
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOMEPATH'] = curdir
+                os.environ['HOME'] = curdir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files)
+                self.assert_(user_filename in files,
+                             '%r not found in %r' % (user_filename, files))
         finally:
             for key, value in old.items():
                 if value is None:

From 372161eb00ab6befb04dd3a2a85d38238efd5b0e Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Fri, 16 May 2008 02:06:59 +0000
Subject: [PATCH 1993/8469] Fixed import of configparser in the distutils
 module.

If configparser is unavailable, try to import configparser using its
old name. This is required for backward-compatibility with older
Python versions.
---
 command/upload.py | 7 ++++++-
 config.py         | 6 +++++-
 dist.py           | 7 +++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index daf681128d..92c4bf204e 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -10,11 +10,16 @@
 import os
 import socket
 import platform
-import ConfigParser
 import httplib
 import base64
 import urlparse
 import cStringIO as StringIO
+try:
+    from configparser import ConfigParser
+except ImportError:
+    # For backward-compatibility with Python versions < 2.6.
+    from ConfigParser import ConfigParser
+
 
 class upload(PyPIRCCommand):
 
diff --git a/config.py b/config.py
index f1117beed1..35a21ec211 100644
--- a/config.py
+++ b/config.py
@@ -5,7 +5,11 @@
 """
 import os
 import sys
-from ConfigParser import ConfigParser
+try:
+    from configparser import ConfigParser
+except ImportError:
+    # For backward-compatibility with Python versions < 2.6.
+    from ConfigParser import ConfigParser
 
 from distutils.cmd import Command
 
diff --git a/dist.py b/dist.py
index 0b13c1e6c1..6299919fdf 100644
--- a/dist.py
+++ b/dist.py
@@ -358,8 +358,11 @@ def find_config_files (self):
 
 
     def parse_config_files (self, filenames=None):
-
-        from ConfigParser import ConfigParser
+        try:
+            from configparser import ConfigParser
+        except ImportError:
+            # For backward-compatibility with Python versions < 2.6.
+            from ConfigParser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()

From fbd52989678335fca9cbf0007209bd04513036eb Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Fri, 16 May 2008 04:39:54 +0000
Subject: [PATCH 1994/8469] Merged revisions
 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines

  #2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
  r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines

  Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
  r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines

  Fix a refleak in the _warnings module.
........
  r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line

  List all the removes and renamed modules
........
  r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines

  Rewrap some lines in test_py3kwarn.
........
  r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines

  Add NEWS entry for #2831.
........
  r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines

  Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
  in r62788.
........
  r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines

  Fix another "refleak" by clearing the filters after test.
........
  r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines

  Install the json package and tests as well as the lib2to3 tests
  so the tests work when run from an install directory.
  They are currently skipped on the daily runs (not from the buildbots)
  for checking refleaks, etc.
........
  r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line

  Note some removals and a rename
........
  r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines

  Add a snippet for the deprecation directive for docs.
........
  r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines

  disable the crashing test.  I will also file a bug.  This crash does
  not appear to be a new bug, its just that the test coverage went up
  recently exposing it.  (I verified that by testing this test code on
  an older Modules/_bsddb.c)
........
  r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines

  #2863: add gen.__name__ and add this name to generator repr().
........
  r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line

  Import class from distutils.cmd, not .core, to avoid circular import
........
  r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines

  Fixed typo in a doctest of test_genexps.
........
  r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines

  add Mac modules to the list of deprecated ones
........
  r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines

  fix typos in whatsnew
........
  r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines

  make test_platform a bit more assertive (We'll see what the buildbots say.)
........
---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index a625aec5e6..6ffccaa095 100644
--- a/config.py
+++ b/config.py
@@ -7,7 +7,7 @@
 import sys
 from configparser import ConfigParser
 
-from distutils.core import Command
+from distutils.cmd import Command
 
 DEFAULT_PYPIRC = """\
 [pypirc]

From 9c132229971073925b69493eb88596556c7a658c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 18 May 2008 11:52:36 +0000
Subject: [PATCH 1995/8469] GHOP #257: test distutils' build_ext command,
 written by Josip Dzolonga.

---
 tests/test_build_ext.py | 72 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/test_build_ext.py

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
new file mode 100644
index 0000000000..b5c2aa2339
--- /dev/null
+++ b/tests/test_build_ext.py
@@ -0,0 +1,72 @@
+import sys
+import os
+import tempfile
+import shutil
+from StringIO import StringIO
+
+from distutils.core import Extension, Distribution
+from distutils.command.build_ext import build_ext
+from distutils import sysconfig
+
+import unittest
+from test import test_support
+
+class BuildExtTestCase(unittest.TestCase):
+    def setUp(self):
+        # Create a simple test environment
+        # Note that we're making changes to sys.path
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.sys_path = sys.path[:]
+        sys.path.append(self.tmp_dir)
+
+        xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
+        shutil.copy(xx_c, self.tmp_dir)
+
+    def test_build_ext(self):
+        xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
+        xx_ext = Extension('xx', [xx_c])
+        dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
+        dist.package_dir = self.tmp_dir
+        cmd = build_ext(dist)
+        cmd.build_lib = self.tmp_dir
+        cmd.build_temp = self.tmp_dir
+
+        old_stdout = sys.stdout
+        if not test_support.verbose:
+            # silence compiler output
+            sys.stdout = StringIO()
+        try:
+            cmd.ensure_finalized()
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+
+        import xx
+
+        for attr in ('error', 'foo', 'new', 'roj'):
+            self.assert_(hasattr(xx, attr))
+
+        self.assertEquals(xx.foo(2, 5), 7)
+        self.assertEquals(xx.foo(13,15), 28)
+        self.assertEquals(xx.new().demo(), None)
+        doc = 'This is a template module just for instruction.'
+        self.assertEquals(xx.__doc__, doc)
+        self.assert_(isinstance(xx.Null(), xx.Null))
+        self.assert_(isinstance(xx.Str(), xx.Str))
+
+    def tearDown(self):
+        # Get everything back to normal
+        test_support.unload('xx')
+        sys.path = self.sys_path
+        # XXX on Windows the test leaves a directory with xx.pyd in TEMP
+        shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+
+def test_suite():
+    if not sysconfig.python_build:
+        if test_support.verbose:
+            print 'test_build_ext: The test must be run in a python build dir'
+        return unittest.TestSuite()
+    else: return unittest.makeSuite(BuildExtTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 0c96212a691e860e15ae057f59b5dab114d90c90 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 May 2008 21:35:26 +0000
Subject: [PATCH 1996/8469] #2621 rename test.test_support to test.support

---
 tests/test_core.py      | 10 +++++-----
 tests/test_dist.py      |  2 +-
 tests/test_sysconfig.py |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 8e274dd40d..170d76751e 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -5,7 +5,7 @@
 import os
 import shutil
 import sys
-import test.test_support
+import test.support
 import unittest
 
 
@@ -39,13 +39,13 @@ def tearDown(self):
         self.cleanup_testfn()
 
     def cleanup_testfn(self):
-        path = test.test_support.TESTFN
+        path = test.support.TESTFN
         if os.path.isfile(path):
             os.remove(path)
         elif os.path.isdir(path):
             shutil.rmtree(path)
 
-    def write_setup(self, text, path=test.test_support.TESTFN):
+    def write_setup(self, text, path=test.support.TESTFN):
         open(path, "w").write(text)
         return path
 
@@ -63,8 +63,8 @@ def test_run_setup_uses_current_dir(self):
         cwd = os.getcwd()
 
         # Create a directory and write the setup.py file there:
-        os.mkdir(test.test_support.TESTFN)
-        setup_py = os.path.join(test.test_support.TESTFN, "setup.py")
+        os.mkdir(test.support.TESTFN)
+        setup_py = os.path.join(test.support.TESTFN, "setup.py")
         distutils.core.run_setup(
             self.write_setup(setup_prints_cwd, path=setup_py))
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index dd0773508e..f1b11c1745 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -7,7 +7,7 @@
 import sys
 import unittest
 
-from test.test_support import TESTFN
+from test.support import TESTFN
 
 
 class test_dist(distutils.cmd.Command):
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index aa1187e77b..c6ab9aa5d5 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -4,7 +4,7 @@
 import os
 import unittest
 
-from test.test_support import TESTFN
+from test.support import TESTFN
 
 class SysconfigTestCase(unittest.TestCase):
 

From ca303a98aa60ae1678585125caeb983e27a2b096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 24 May 2008 09:00:04 +0000
Subject: [PATCH 1997/8469] Use announce instead of print, to suppress output
 in the testsuite.

---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index 35a21ec211..e07f8ac998 100644
--- a/config.py
+++ b/config.py
@@ -62,7 +62,7 @@ def _read_pypirc(self):
         """Reads the .pypirc file."""
         rc = self._get_rc_file()
         if os.path.exists(rc):
-            print 'Using PyPI login from %s' % rc
+            self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
             realm = self.realm or self.DEFAULT_REALM
 

From f21c3f4abd01a3a0e8d94b71aa43e817ccebca98 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 May 2008 07:25:25 +0000
Subject: [PATCH 1998/8469] ConfigParser renaming reversal part 3: move module
 into place and adapt imports.

---
 command/upload.py | 6 +-----
 config.py         | 6 +-----
 dist.py           | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 92c4bf204e..8805d41da0 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -14,11 +14,7 @@
 import base64
 import urlparse
 import cStringIO as StringIO
-try:
-    from configparser import ConfigParser
-except ImportError:
-    # For backward-compatibility with Python versions < 2.6.
-    from ConfigParser import ConfigParser
+from ConfigParser import ConfigParser
 
 
 class upload(PyPIRCCommand):
diff --git a/config.py b/config.py
index e07f8ac998..e3a4c57e33 100644
--- a/config.py
+++ b/config.py
@@ -5,11 +5,7 @@
 """
 import os
 import sys
-try:
-    from configparser import ConfigParser
-except ImportError:
-    # For backward-compatibility with Python versions < 2.6.
-    from ConfigParser import ConfigParser
+from ConfigParser import ConfigParser
 
 from distutils.cmd import Command
 
diff --git a/dist.py b/dist.py
index 6299919fdf..0a21380973 100644
--- a/dist.py
+++ b/dist.py
@@ -358,11 +358,7 @@ def find_config_files (self):
 
 
     def parse_config_files (self, filenames=None):
-        try:
-            from configparser import ConfigParser
-        except ImportError:
-            # For backward-compatibility with Python versions < 2.6.
-            from ConfigParser import ConfigParser
+        from ConfigParser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()

From 281cb13d4994a8d61b79b5d0fbc26eb3e2b29d23 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 May 2008 07:45:51 +0000
Subject: [PATCH 1999/8469] #2879: rename _winreg to winreg.

---
 msvc9compiler.py | 18 +++++++++---------
 msvccompiler.py  | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index c8d52c4237..fdb74aeabf 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -24,17 +24,17 @@
 from distutils import log
 from distutils.util import get_platform
 
-import _winreg
+import winreg
 
-RegOpenKeyEx = _winreg.OpenKeyEx
-RegEnumKey = _winreg.EnumKey
-RegEnumValue = _winreg.EnumValue
-RegError = _winreg.error
+RegOpenKeyEx = winreg.OpenKeyEx
+RegEnumKey = winreg.EnumKey
+RegEnumValue = winreg.EnumValue
+RegError = winreg.error
 
-HKEYS = (_winreg.HKEY_USERS,
-         _winreg.HKEY_CURRENT_USER,
-         _winreg.HKEY_LOCAL_MACHINE,
-         _winreg.HKEY_CLASSES_ROOT)
+HKEYS = (winreg.HKEY_USERS,
+         winreg.HKEY_CURRENT_USER,
+         winreg.HKEY_LOCAL_MACHINE,
+         winreg.HKEY_CLASSES_ROOT)
 
 VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
 WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
diff --git a/msvccompiler.py b/msvccompiler.py
index 71146dcfe3..1cd0f91d5f 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -20,15 +20,15 @@
 
 _can_read_reg = False
 try:
-    import _winreg
+    import winreg
 
     _can_read_reg = True
-    hkey_mod = _winreg
+    hkey_mod = winreg
 
-    RegOpenKeyEx = _winreg.OpenKeyEx
-    RegEnumKey = _winreg.EnumKey
-    RegEnumValue = _winreg.EnumValue
-    RegError = _winreg.error
+    RegOpenKeyEx = winreg.OpenKeyEx
+    RegEnumKey = winreg.EnumKey
+    RegEnumValue = winreg.EnumValue
+    RegError = winreg.error
 
 except ImportError:
     try:
@@ -44,7 +44,7 @@
     except ImportError:
         log.info("Warning: Can't read registry to find the "
                  "necessary compiler setting\n"
-                 "Make sure that Python modules _winreg, "
+                 "Make sure that Python modules winreg, "
                  "win32api or win32con are installed.")
         pass
 

From b923b203a06f4768e4793c212c10ab2594784536 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 25 May 2008 18:19:30 +0000
Subject: [PATCH 2000/8469] Merged revisions
 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63412 | georg.brandl | 2008-05-17 19:57:01 +0200 (Sat, 17 May 2008) | 2 lines

  #961805: fix Edit.text_modified().
........
  r63445 | georg.brandl | 2008-05-18 10:52:59 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #180 by Michael Schneider: add examples to the socketserver documentation.
........
  r63446 | georg.brandl | 2008-05-18 11:12:20 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #134, #171, #137: unit tests for the three HTTPServer modules.
........
  r63447 | georg.brandl | 2008-05-18 12:39:26 +0200 (Sun, 18 May 2008) | 3 lines

  Take namedtuple item names only from ascii_letters (this blew up on OSX),
  and make sure there are no duplicate names.
........
  r63449 | georg.brandl | 2008-05-18 13:46:51 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #217: add support for compiling Python with coverage checking enabled.
........
  r63450 | georg.brandl | 2008-05-18 13:52:36 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #257: test distutils' build_ext command, written by Josip Dzolonga.
........
  r63452 | georg.brandl | 2008-05-18 15:34:06 +0200 (Sun, 18 May 2008) | 2 lines

  Add GHOP students.
........
  r63454 | georg.brandl | 2008-05-18 18:32:48 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #121: improve test_pydoc, by Benjamin Peterson.
........
  r63459 | benjamin.peterson | 2008-05-18 22:48:07 +0200 (Sun, 18 May 2008) | 2 lines

  bring test_pydoc up to my high standards (now that I have them)
........
  r63463 | georg.brandl | 2008-05-18 23:10:19 +0200 (Sun, 18 May 2008) | 2 lines

  Fix test_pyclbr after another platform-dependent function was added to urllib.
........
  r63465 | benjamin.peterson | 2008-05-19 01:07:07 +0200 (Mon, 19 May 2008) | 2 lines

  change some imports in tests so they will not be skipped in 3.0
........
  r63470 | georg.brandl | 2008-05-19 18:47:25 +0200 (Mon, 19 May 2008) | 2 lines

  test_httpservers has unpredictable refcount behavior.
........
  r63483 | georg.brandl | 2008-05-20 08:15:36 +0200 (Tue, 20 May 2008) | 2 lines

  Activate two more test cases in test_httpservers.
........
  r63484 | georg.brandl | 2008-05-20 08:47:31 +0200 (Tue, 20 May 2008) | 2 lines

  Argh, this is the *actual* test that works under Windows.
........
  r63496 | georg.brandl | 2008-05-20 10:07:36 +0200 (Tue, 20 May 2008) | 2 lines

  Improve diffing logic and output for test_pydoc.
........
  r63497 | georg.brandl | 2008-05-20 10:10:03 +0200 (Tue, 20 May 2008) | 2 lines

  Use inspect.getabsfile() to get the documented module's filename.
........
  r63499 | georg.brandl | 2008-05-20 10:25:48 +0200 (Tue, 20 May 2008) | 3 lines

  Patch #1775025: allow opening zipfile members via ZipInfo instances.
  Patch by Graham Horler.
........
  r63500 | georg.brandl | 2008-05-20 10:40:43 +0200 (Tue, 20 May 2008) | 2 lines

  #2592: delegate nb_index and the floor/truediv slots in weakref.proxy.
........
  r63501 | georg.brandl | 2008-05-20 10:48:34 +0200 (Tue, 20 May 2008) | 2 lines

  #615772: raise a more explicit error from Tkinter.Misc.__contains__.
........
  r63530 | benjamin.peterson | 2008-05-22 02:57:02 +0200 (Thu, 22 May 2008) | 2 lines

  use more specific asserts in test_opcode
........
  r63531 | benjamin.peterson | 2008-05-22 03:02:23 +0200 (Thu, 22 May 2008) | 2 lines

  remove redundant invocation of json doctests
........
  r63540 | benjamin.peterson | 2008-05-23 01:09:26 +0200 (Fri, 23 May 2008) | 3 lines

  fix test_pydoc so it works on make installed Python installations
  Also let it pass when invoked directly
........
  r63614 | georg.brandl | 2008-05-25 10:07:37 +0200 (Sun, 25 May 2008) | 2 lines

  #2959: allow multiple close() calls for GzipFile.
........
---
 tests/test_build_ext.py | 72 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/test_build_ext.py

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
new file mode 100644
index 0000000000..96c0a2395b
--- /dev/null
+++ b/tests/test_build_ext.py
@@ -0,0 +1,72 @@
+import sys
+import os
+import tempfile
+import shutil
+from io import StringIO
+
+from distutils.core import Extension, Distribution
+from distutils.command.build_ext import build_ext
+from distutils import sysconfig
+
+import unittest
+from test import support
+
+class BuildExtTestCase(unittest.TestCase):
+    def setUp(self):
+        # Create a simple test environment
+        # Note that we're making changes to sys.path
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.sys_path = sys.path[:]
+        sys.path.append(self.tmp_dir)
+
+        xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
+        shutil.copy(xx_c, self.tmp_dir)
+
+    def test_build_ext(self):
+        xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
+        xx_ext = Extension('xx', [xx_c])
+        dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
+        dist.package_dir = self.tmp_dir
+        cmd = build_ext(dist)
+        cmd.build_lib = self.tmp_dir
+        cmd.build_temp = self.tmp_dir
+
+        old_stdout = sys.stdout
+        if not support.verbose:
+            # silence compiler output
+            sys.stdout = StringIO()
+        try:
+            cmd.ensure_finalized()
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+
+        import xx
+
+        for attr in ('error', 'foo', 'new', 'roj'):
+            self.assert_(hasattr(xx, attr))
+
+        self.assertEquals(xx.foo(2, 5), 7)
+        self.assertEquals(xx.foo(13,15), 28)
+        self.assertEquals(xx.new().demo(), None)
+        doc = 'This is a template module just for instruction.'
+        self.assertEquals(xx.__doc__, doc)
+        self.assert_(isinstance(xx.Null(), xx.Null))
+        self.assert_(isinstance(xx.Str(), xx.Str))
+
+    def tearDown(self):
+        # Get everything back to normal
+        support.unload('xx')
+        sys.path = self.sys_path
+        # XXX on Windows the test leaves a directory with xx.pyd in TEMP
+        shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+
+def test_suite():
+    if not sysconfig.python_build:
+        if support.verbose:
+            print('test_build_ext: The test must be run in a python build dir')
+        return unittest.TestSuite()
+    else: return unittest.makeSuite(BuildExtTestCase)
+
+if __name__ == '__main__':
+    support.run_unittest(test_suite())

From 46e1390e226138292126a2ffb6a8e960ff570e85 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 26 May 2008 11:42:40 +0000
Subject: [PATCH 2001/8469] On Windows, we must build a debug version iff
 running a debug build of Python

---
 tests/test_build_ext.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b5c2aa2339..a658f1aa1c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -28,6 +28,10 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
+        if os.name == "nt":
+            # On Windows, we must build a debug version iff running
+            # a debug build of Python
+            cmd.debug = sys.executable.endswith("_d.exe")
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 

From 882263289e030cef4305d310473f9d80401caa56 Mon Sep 17 00:00:00 2001
From: Thomas Heller <theller@ctypes.org>
Date: Mon, 26 May 2008 11:51:44 +0000
Subject: [PATCH 2002/8469] Merged revisions 63670 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63670 | thomas.heller | 2008-05-26 13:42:40 +0200 (Mo, 26 Mai 2008) | 4 lines

  On Windows, we must build a debug version iff running a debug build of
  Python
........
---
 tests/test_build_ext.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 96c0a2395b..20c10745cb 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -28,6 +28,10 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
+        if os.name == "nt":
+            # On Windows, we must build a debug version iff running
+            # a debug build of Python
+            cmd.debug = sys.executable.endswith("_d.exe")
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 

From 208bfafeaaa2900a5bacd8534cc7b8f3bab0b947 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 26 May 2008 16:32:26 +0000
Subject: [PATCH 2003/8469] Create http package. #2883.

---
 command/upload.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 603336c954..2cad2c7bd5 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -11,7 +11,7 @@
 import socket
 import platform
 import configparser
-import httplib
+import http.client
 import base64
 import urlparse
 
@@ -151,9 +151,9 @@ def upload_file(self, command, pyversion, filename):
             urlparse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
-            http = httplib.HTTPConnection(netloc)
+            http = http.client.HTTPConnection(netloc)
         elif schema == 'https':
-            http = httplib.HTTPSConnection(netloc)
+            http = http.client.HTTPSConnection(netloc)
         else:
             raise AssertionError("unsupported schema "+schema)
 

From 52ba3bb9b2d0a33e082e139a2a2e48154dbf60e2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 26 May 2008 17:01:57 +0000
Subject: [PATCH 2004/8469] Merged revisions 63575 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63575 | martin.v.loewis | 2008-05-24 11:00:04 +0200 (Sat, 24 May 2008) | 3 lines

  Use announce instead of print, to suppress output in
  the testsuite.
........
---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index 6ffccaa095..0ecfe0cc34 100644
--- a/config.py
+++ b/config.py
@@ -58,7 +58,7 @@ def _read_pypirc(self):
         """Reads the .pypirc file."""
         rc = self._get_rc_file()
         if os.path.exists(rc):
-            print('Using PyPI login from %s' % rc)
+            self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
             realm = self.realm or self.DEFAULT_REALM
 

From 92a963ecf18661f11b3e8eea815b6a1bcb69cba3 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 28 May 2008 01:54:55 +0000
Subject: [PATCH 2005/8469] bdist_wininst now works correctly when both
 --skip-build and --plat-name are specified.

---
 command/bdist_wininst.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 7c43e7459e..f18e318cb9 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -79,6 +79,12 @@ def initialize_options (self):
 
     def finalize_options (self):
         if self.bdist_dir is None:
+            if self.skip_build and self.plat_name:
+                # If build is skipped and plat_name is overridden, bdist will
+                # not see the correct 'plat_name' - so set that up manually.
+                bdist = self.distribution.get_command_obj('bdist')
+                bdist.plat_name = self.plat_name
+                # next the command will be initialized using that name
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
         if not self.target_version:

From 4416152bdd4d21c96ac792ecefe9db9239460e73 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Sat, 31 May 2008 05:11:07 +0000
Subject: [PATCH 2006/8469] Fix bdist_wininst --user-access-control for win2k

---
 command/wininst-6.0.exe       | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe       | Bin 61440 -> 65536 bytes
 command/wininst-9.0-amd64.exe | Bin 77312 -> 77824 bytes
 command/wininst-9.0.exe       | Bin 66048 -> 66048 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.0.exe b/command/wininst-6.0.exe
index 10c981993ba2c2e3a977db8ded201a46d529749d..f57c855a613e2de2b00fff1df431b8d08d171077 100644
GIT binary patch
delta 9158
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

delta 9339
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

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 6779aa8d4c1b0d5fb37255f1eea211d92ea6942a..1433bc1ad3775ec9277e13ca8bdca3a5dbc23643 100644
GIT binary patch
delta 16824
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

delta 16530
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

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index b4cb062c391d230dbf4a7fc3a16536aa3dbc5b42..9dedfcdc2398df99f9540120dba9421452795948 100644
GIT binary patch
delta 11202
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
Naa-a$;W1jP{@;-hzHI;i

delta 10853
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

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 0d04a6678b94b8ecbdde10257396e8c0e85c038c..9102ecdb51fb3af90b850165af47b79c7c330036 100644
GIT binary patch
delta 1296
zcmYL}drZ?;6vywmEr=6>pe5zugINOzDpIkn#pPCoIS__A2Ziy7;w)&8%@#KwScPh8
z(<mOZXBJT>A;T?mHydt|*@%WY$1pzPl;Ngv<j3fyiI17Z@Y^Z;v73B;_x$cT_uO;8
z_xHQ*7OlHQ`(*@ZD{qMv7zs(xgK03I|Iv$O&<@We@cCN!6&Hlh;g)4s5k3R%;I8mw
z2;$N33~sH)zVKG~PF78@YN1JfJn3c57un_gs3w4K<of6;4xeF9%t}6St&EAaa`*`g
zr%JA0ExE1$;Ib@=o6X^*bn0!OUth@BrSp^7TK_3S@k3QTlR23&CAkRu;)h`!b|q|u
z^O&A^oyQkQNIDMS!cV7t3kPN8^hOOVmp78rG(2JH;n|)<v@y2l;t@s(dqU}|A5glP
zF_f<GMB8i)yo1M5O}l-;=3wcuonT|ei{9Ml?j;QgG|#0q21aa-knPVs<=A;Zuwqr0
zvsbX@3z7cZj$%hV<E$>^EOv0l+^SCR7R(cH^{TE8RmbSX7!ba~=f*x|aLHH+zTlqV
z2UN}fi}^i{#j2_n_j(-Eg(_8bHDhU<aWuQRdovA(ZHsh8SUe46Zso?ncuF6o#C2&K
zVJ7~VHVBKbV~+QQGuF_C?*q9YBUif9y8!k{^V})G)w@_YuP>qBL=hMCB<YwUr6GY+
zLjoU=3+LAXjN;ME{e1KurY=|o8o7Nz4nRG2WmUsf)Efu+o!{{vqYX}@W#KP$4zby0
z@M1xBJlJtVb~Dt-;cPw3Iz6PScHd>?<e#eQ2}HLTs3JAnO<Jni4tgqghtOckglV|e
zlogxOud2-#rjm4%9M2C6rX0c#O;%WrH%tZm*$sTroC0l_Z=R9poX1F1Z^c9ZuE(97
zb(x+1+`yV*Z^c=q3|q`~;Kv8%O|TxzEh}Lnc32Gjen0+f>B>)1_WvC!#o3^Y{1q}>
z8<k!f8EzxV>%z{Nj|k>_VmAgJwY#P%<>Rr-m2=~<R^_)b!<jX53A-0BiuBx}Gdoco
z+R0K>7u(={v{_T29c!)TDDwbq-d;|NO;B3#3+pU+39njnKr5qj_C>`!ZV=4dlxk@*
zxF+=G8N%Pf_E$zB8BgZVfv0#SUk`&goPV4r)JlJWPXnLJ_*VlO2+G^5)rq^WlnC~y
zl!~<rrY#f9P4IHT+K8Mt1iMa@R0#GpF+eE9-b%sl5#}nv{w3<y33iKUtP$)iadU%U
z);9&~A%=((8wE>o2$o6gC0_SA4H2HF&P-n(mR5A?&qpxk%S-j<WsJo7iWZin_iKJw
zvr6fdiIq_tKEbr=2FQ>fRX@?d3OrO}lUHk2Xn5>)ndE2z=#a;1y8+&lRhzZ}T$499
z4*}Qh#B=rEhq~Qc96V{O9NuyhzIyvCpJI0kI->D*uTe1FyP`E&H+EA=#TncXmPEcS
zc<Z)_X16BCVd}ut*g6WVCr0U)nNEFHBNh!L(6v)LkQlaOhhPV#cL1Yf5^aLfr#aS6
NH4FBdoI7$Y?mz75{M!Hk

delta 1235
zcmXApeNfaz7{~Y7J6;+k-thoai6dSV<W-IiYp>=|UOmJRP+k&<^X!GuJCb-2IH=C^
zM)6_FUR5ZaglU@g4{@gC3`w0r%^*~iiE7|yP}qxFTKw9ho%!suJNxW+_Ia6YX;-$i
zD?jlB<;cbR>u@nF1uI6wYMRlCC2$P-IndQgco!4gW9VN`VX6Cacn_Q0!=M)ryRV`T
z%5m7e6JFuv9$F<l!QWZ5j?%kD{3owwfI433T~5J-gT6WR!Y1zPr=_qDa|1ZNn$Kxq
zHh`Vy1w~M(=4O=+RN=XVT=>F=Jmct78*a;Tf4mPN(qt|U2j7B6@npy@Xv3AEBlKDp
zho#*BDfq!7r(gpwTUMt4B_9ooR?zFZgApB}1v)}nhq{Om9CXQ5%n7*_zCzBc=SYMC
zG<Y;Bb&unD_3N#(v%>3WBj`xdkWFuP=nojq=?}QB%7IlajC4578?8-UZaZ^Y*4Bmy
zUGvjMmv!jX#>Tyj805h8Hb$&x7d!O(48~wWiOF?nFj7KV<UrMehUH<|vQG{qVw2=#
zGc?I*&s}6r8kU;Y5@H?Njh)do;EjJr--HMpi?P9R{_ILO3Km`y>kl;U2W*TR4mq7F
z!aA!GX<3M>$d#lhSCZ;^<!TeaCA=8_8jbxCHz(vnBL65M9YnpR5-Z>gu1mT}y(aOo
zWE~tqWAat_4Rt9R=ohoUN59ggvL3rqtbkm#Mg`&DPswtz{VQqYXIbuWdbg`VWF)0U
zL@uWo#Vq+uV?k;><Y0ShqF>=9S+<@H=x|yV8UH!Rh%|ubQ?;-Qm6~iC`5oqKB4Iz)
zYnF#r#u1SMTj^~_)1SS)rubfm-dSL<m3}5=BG;Ip440+tfQ`5}Ek~4TEKN=QFXO*y
zCpG?3_^+;~Sjwc!VsYzDQ6iJufToKP`<>z>=O4!`0TTJ&MJugXSeO%MuHgLRYZiYw
zA<KrI3fH?gA=B#M5VmO}VH!_pHD2}OBGlq7qS78x56)@B!GQkh>7eI^^jE!nc`YNh
z=BTu0wZ-FHhI*(Lr!(h8Lr!JIz&-TMR>1_uWOvhRMt(8du7Hnu$p)tae&L}7@<V&}
zZ)W7vB1W=`85tBjS;EK}LHQO&9tdzNBSEE%m<4YOjtg{Uj2so*6Pzk%Bz7AkhXg5A
zj5G+|sAlB8pzS$EJ``-LVPr}$C(s!gDYTo_o*j41@%9XStF%`&=t+n@Bg&SsYR1o=
zm%Mr9CB^xIe5sFbE%T!AKAI|OA(oF<+)+R#ep97`ueo3KdIh~w&$k-eK{Vs!_Rj$d
z`QaTegJ_T?FH8X)Z9w_O(=Idcl9Arn$)jt>08dcH*^Pd>L{x_ao0-cjjP5!{Mt8H$
zu)u}ShD+wzYB!ZQs>Ey8Q-w@tSP({y2l&MZ$2h^fEXxxXMt-+o-gt=kIku07x@j92
b*}!e%=<Pep7!f_WF#4>FMDW;|Z-f2=yp7Xb


From dcd2eb88e377b96a037acf6da4729aafe95607d5 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 5 Jun 2008 12:58:24 +0000
Subject: [PATCH 2007/8469] MacOS X: Enable 4-way universal builds

This patch adds a new configure argument on OSX:
        --with-universal-archs=[32-bit|64-bit|all]

When used with the --enable-universalsdk option this controls which
CPU architectures are includes in the framework. The default is 32-bit,
meaning i386 and ppc. The most useful alternative is 'all', which includes
all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).

This includes limited support for the Carbon bindings in 64-bit mode as well,
limited because (a) I haven't done extensive testing and (b) a large portion
of the Carbon API's aren't available in 64-bit mode anyway.

I've also duplicated a feature of Apple's build of python: setting the
environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
extensions using distutils.
---
 sysconfig.py     | 20 ++++++++++++++++++++
 unixccompiler.py |  8 +++++++-
 util.py          | 11 +++++++++--
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 27a770b194..9993fba1ab 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -539,6 +539,26 @@ def get_config_vars(*args):
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
                     _config_vars[key] = flags
 
+            else:
+
+                # Allow the user to override the architecture flags using
+                # an environment variable.
+                # NOTE: This name was introduced by Apple in OSX 10.5 and
+                # is used by several scripting languages distributed with
+                # that OS release.
+
+                if 'ARCHFLAGS' in os.environ:
+                    arch = os.environ['ARCHFLAGS']
+                    for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                        flags = _config_vars[key]
+                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                        flags = flags + ' ' + arch
+                        _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:
diff --git a/unixccompiler.py b/unixccompiler.py
index dc759ee8f5..6144efc070 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -64,7 +64,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         stripArch = '-arch' in cc_args
         stripSysroot = '-isysroot' in cc_args
 
-    if stripArch:
+    if stripArch or 'ARCHFLAGS' in os.environ:
         while 1:
             try:
                 index = compiler_so.index('-arch')
@@ -73,6 +73,12 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
             except ValueError:
                 break
 
+    if 'ARCHFLAGS' in os.environ and not stripArch:
+        # User specified different -arch flags in the environ,
+        # see also distutils.sysconfig
+        compiler_so = compiler_so + ' ' + os.environ['ARCHFLAGS']
+
+
     if stripSysroot:
         try:
             index = compiler_so.index('-isysroot')
diff --git a/util.py b/util.py
index 69d90cffb8..262a9b8b04 100644
--- a/util.py
+++ b/util.py
@@ -125,12 +125,19 @@ def get_platform ():
             osname = "macosx"
 
 
-            if (release + '.') < '10.4.' and \
-                    get_config_vars().get('UNIVERSALSDK', '').strip():
+            if (release + '.') >= '10.4.' and \
+                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4
+                #
+                # Try to detect 4-way universal builds, those have machine-type
+                # 'universal' instead of 'fat'.
+
                 machine = 'fat'
 
+                if '-arch x86_64' in get_config_vars().get('CFLAGS'):
+                    machine = 'universal'
+
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'

From ff2fd5ca8a081c349f525318bbe8e07c8f1fcc3f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 10 Jun 2008 16:57:31 +0000
Subject: [PATCH 2008/8469] Merged revisions
 63724,63726,63732,63744,63754-63755,63757-63758,63760,63775,63781-63782,63787,63805-63808,63818-63819,63823-63824
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63724 | gregory.p.smith | 2008-05-26 22:22:14 +0200 (Mon, 26 May 2008) | 6 lines

  Fixes issue2791: subprocess.Popen.communicate leaked a file descripton until
  the last reference to the Popen instance was dropped.  Adding explicit
  close() calls fixes it.

  Candidate for backport to release25-maint.
........
  r63726 | benjamin.peterson | 2008-05-26 22:43:24 +0200 (Mon, 26 May 2008) | 2 lines

  fix minor grammar typo
........
  r63732 | benjamin.peterson | 2008-05-26 23:44:26 +0200 (Mon, 26 May 2008) | 2 lines

  remove duplication in test module
........
  r63744 | lars.gustaebel | 2008-05-27 14:39:23 +0200 (Tue, 27 May 2008) | 3 lines

  Do not close external file objects passed to tarfile.open(mode='w:bz2')
  when the TarFile is closed.
........
  r63754 | benjamin.peterson | 2008-05-28 03:12:35 +0200 (Wed, 28 May 2008) | 2 lines

  update tutorial function with more appropiate one from Eric Smith
........
  r63755 | mark.hammond | 2008-05-28 03:54:55 +0200 (Wed, 28 May 2008) | 2 lines

  bdist_wininst now works correctly when both --skip-build and --plat-name are specified.
........
  r63757 | georg.brandl | 2008-05-28 13:21:39 +0200 (Wed, 28 May 2008) | 2 lines

  #2989: add PyType_Modified().
........
  r63758 | benjamin.peterson | 2008-05-28 13:51:41 +0200 (Wed, 28 May 2008) | 2 lines

  fix spelling
........
  r63760 | georg.brandl | 2008-05-28 17:41:36 +0200 (Wed, 28 May 2008) | 2 lines

  #2990: prevent inconsistent state while updating method cache.
........
  r63775 | georg.brandl | 2008-05-29 09:18:17 +0200 (Thu, 29 May 2008) | 2 lines

  Two fixes in bytearray docs.
........
  r63781 | georg.brandl | 2008-05-29 09:38:37 +0200 (Thu, 29 May 2008) | 2 lines

  #2988: add note about catching CookieError when parsing untrusted cookie data.
........
  r63782 | georg.brandl | 2008-05-29 09:45:26 +0200 (Thu, 29 May 2008) | 2 lines

  #2985: allow i8 in XMLRPC responses.
........
  r63787 | georg.brandl | 2008-05-29 16:35:39 +0200 (Thu, 29 May 2008) | 2 lines

  Revert #2990 patch; it's not necessary as Armin showed.
........
  r63805 | raymond.hettinger | 2008-05-30 08:37:27 +0200 (Fri, 30 May 2008) | 1 line

  Issue 2784: fix leaks in exception exit.
........
  r63806 | raymond.hettinger | 2008-05-30 08:49:47 +0200 (Fri, 30 May 2008) | 1 line

  Issue 2855: Fix obscure crasher by slowing down the entire module.  Mimics what was done to dictionaries in r59223.
........
  r63807 | raymond.hettinger | 2008-05-30 09:16:53 +0200 (Fri, 30 May 2008) | 1 line

  Issue 2903:  Add __name__ in globals for namedtuple namespace.
........
  r63808 | georg.brandl | 2008-05-30 09:54:16 +0200 (Fri, 30 May 2008) | 2 lines

  #2999: fix name of third parameter in unicode.replace()'s docstring.
........
  r63818 | georg.brandl | 2008-05-30 21:12:13 +0200 (Fri, 30 May 2008) | 2 lines

  getloadavg() is not available on Windows.
........
  r63819 | georg.brandl | 2008-05-30 21:17:29 +0200 (Fri, 30 May 2008) | 2 lines

  Better quote with single quotes.
........
  r63823 | benjamin.peterson | 2008-05-30 22:44:39 +0200 (Fri, 30 May 2008) | 2 lines

  fix grammar
........
  r63824 | marc-andre.lemburg | 2008-05-30 22:52:18 +0200 (Fri, 30 May 2008) | 5 lines

  Update the locale module alias table.

  Closes #3011.
........
---
 command/bdist_wininst.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3f0e09bc4c..ae7d4fde2e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -75,6 +75,12 @@ def initialize_options(self):
 
     def finalize_options(self):
         if self.bdist_dir is None:
+            if self.skip_build and self.plat_name:
+                # If build is skipped and plat_name is overridden, bdist will
+                # not see the correct 'plat_name' - so set that up manually.
+                bdist = self.distribution.get_command_obj('bdist')
+                bdist.plat_name = self.plat_name
+                # next the command will be initialized using that name
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
         if not self.target_version:

From a7d9be62dc156189214df813236f2ff56a66016a Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Wed, 11 Jun 2008 17:46:10 +0000
Subject: [PATCH 2009/8469] Follow-up of PEP 3121: Correct the exported symbol
 for extension modules built by distutils

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

diff --git a/command/build_ext.py b/command/build_ext.py
index 73cc00ba0f..c0eef62815 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -646,10 +646,10 @@ def get_ext_filename(self, ext_name):
     def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
-        provided, "init" + module_name.  Only relevant on Windows, where
+        provided, "PyInit_" + module_name.  Only relevant on Windows, where
         the .pyd file (DLL) must export the module "init" function.
         """
-        initfunc_name = "init" + ext.name.split('.')[-1]
+        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols

From b06cbddbcbe9c30374cca3e0ecc4d96b61f39d7e Mon Sep 17 00:00:00 2001
From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Wed, 18 Jun 2008 20:49:58 +0000
Subject: [PATCH 2010/8469] Make a new urllib package .

It consists of code from urllib, urllib2, urlparse, and robotparser.
The old modules have all been removed.  The new package has five
submodules: urllib.parse, urllib.request, urllib.response,
urllib.error, and urllib.robotparser.  The urllib.request.urlopen()
function uses the url opener from urllib2.

Note that the unittests have not been renamed for the
beta, but they will be renamed in the future.

Joint work with Senthil Kumaran.
---
 command/register.py | 20 +++++++++++---------
 command/upload.py   |  7 ++++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/command/register.py b/command/register.py
index 89cb2d410c..6d5c459924 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,8 +7,9 @@
 
 __revision__ = "$Id$"
 
-import os, string, urllib2, getpass, urlparse
+import os, string, getpass
 import io
+import urllib.parse, urllib.request
 
 from distutils.core import PyPIRCCommand
 from distutils.errors import *
@@ -94,7 +95,8 @@ def _set_config(self):
     def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
-        response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
+        url = self.repository+'?:action=list_classifiers'
+        response = urllib.request.urlopen(url)
         print(response.read())
 
     def verify_metadata(self):
@@ -166,8 +168,8 @@ def send_metadata(self):
                 password = getpass.getpass('Password: ')
 
             # set up the authentication
-            auth = urllib2.HTTPPasswordMgr()
-            host = urlparse.urlparse(self.repository)[1]
+            auth = urllib.request.HTTPPasswordMgr()
+            host = urllib.parse.urlparse(self.repository)[1]
             auth.add_password(self.realm, host, username, password)
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
@@ -276,20 +278,20 @@ def post_to_server(self, data, auth=None):
             'Content-type': 'multipart/form-data; boundary=%s; charset=utf-8'%boundary,
             'Content-length': str(len(body))
         }
-        req = urllib2.Request(self.repository, body, headers)
+        req = urllib.request.Request(self.repository, body, headers)
 
         # handle HTTP and include the Basic Auth handler
-        opener = urllib2.build_opener(
-            urllib2.HTTPBasicAuthHandler(password_mgr=auth)
+        opener = urllib.request.build_opener(
+            urllib.request.HTTPBasicAuthHandler(password_mgr=auth)
         )
         data = ''
         try:
             result = opener.open(req)
-        except urllib2.HTTPError as e:
+        except urllib.error.HTTPError as e:
             if self.show_response:
                 data = e.fp.read()
             result = e.code, e.msg
-        except urllib2.URLError as e:
+        except urllib.error.URLError as e:
             result = 500, str(e)
         else:
             if self.show_response:
diff --git a/command/upload.py b/command/upload.py
index 2cad2c7bd5..5049f03e93 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -13,7 +13,7 @@
 import configparser
 import http.client
 import base64
-import urlparse
+import urllib.parse
 
 class upload(PyPIRCCommand):
 
@@ -145,10 +145,11 @@ def upload_file(self, command, pyversion, filename):
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
 
         # build the Request
-        # We can't use urllib2 since we need to send the Basic
+        # We can't use urllib since we need to send the Basic
         # auth right with the first request
+        # TODO(jhylton): Can we fix urllib?
         schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
+            urllib.parse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
             http = http.client.HTTPConnection(netloc)

From 6f6285e128b5c81398538d25ece8a9af988bfb4a Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 19 Jun 2008 00:35:43 +0000
Subject: [PATCH 2011/8469] Bump to 3.0b1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 3618c4f727..54fc2369d0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0a5"
+__version__ = "3.0b1"
 #--end constants--

From 07491092fe0ca819ef1c40ec6fb32710d4f2b872 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 19 Jun 2008 01:48:07 +0000
Subject: [PATCH 2012/8469] Bumping to 2.6b1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e3e32f51bd..a192357896 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6a3"
+__version__ = "2.6b1"
 #--end constants--

From e518d13e52d41fc198d3c3f5fc42275b2ca2c614 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 16 Jul 2008 02:02:25 +0000
Subject: [PATCH 2013/8469] Merged revisions 63828 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63828 | mark.hammond | 2008-05-31 07:11:07 +0200 (Sat, 31 May 2008) | 2 lines

  Fix bdist_wininst --user-access-control for win2k
........
---
 command/wininst-6.0.exe       | Bin 61440 -> 61440 bytes
 command/wininst-7.1.exe       | Bin 61440 -> 65536 bytes
 command/wininst-9.0-amd64.exe | Bin 77312 -> 77824 bytes
 command/wininst-9.0.exe       | Bin 66048 -> 66048 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-6.0.exe b/command/wininst-6.0.exe
index 10c981993ba2c2e3a977db8ded201a46d529749d..f57c855a613e2de2b00fff1df431b8d08d171077 100644
GIT binary patch
delta 9158
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

delta 9339
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

diff --git a/command/wininst-7.1.exe b/command/wininst-7.1.exe
index 6779aa8d4c1b0d5fb37255f1eea211d92ea6942a..1433bc1ad3775ec9277e13ca8bdca3a5dbc23643 100644
GIT binary patch
delta 16824
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

delta 16530
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

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index b4cb062c391d230dbf4a7fc3a16536aa3dbc5b42..9dedfcdc2398df99f9540120dba9421452795948 100644
GIT binary patch
delta 11202
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
Naa-a$;W1jP{@;-hzHI;i

delta 10853
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

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 0d04a6678b94b8ecbdde10257396e8c0e85c038c..9102ecdb51fb3af90b850165af47b79c7c330036 100644
GIT binary patch
delta 1296
zcmYL}drZ?;6vywmEr=6>pe5zugINOzDpIkn#pPCoIS__A2Ziy7;w)&8%@#KwScPh8
z(<mOZXBJT>A;T?mHydt|*@%WY$1pzPl;Ngv<j3fyiI17Z@Y^Z;v73B;_x$cT_uO;8
z_xHQ*7OlHQ`(*@ZD{qMv7zs(xgK03I|Iv$O&<@We@cCN!6&Hlh;g)4s5k3R%;I8mw
z2;$N33~sH)zVKG~PF78@YN1JfJn3c57un_gs3w4K<of6;4xeF9%t}6St&EAaa`*`g
zr%JA0ExE1$;Ib@=o6X^*bn0!OUth@BrSp^7TK_3S@k3QTlR23&CAkRu;)h`!b|q|u
z^O&A^oyQkQNIDMS!cV7t3kPN8^hOOVmp78rG(2JH;n|)<v@y2l;t@s(dqU}|A5glP
zF_f<GMB8i)yo1M5O}l-;=3wcuonT|ei{9Ml?j;QgG|#0q21aa-knPVs<=A;Zuwqr0
zvsbX@3z7cZj$%hV<E$>^EOv0l+^SCR7R(cH^{TE8RmbSX7!ba~=f*x|aLHH+zTlqV
z2UN}fi}^i{#j2_n_j(-Eg(_8bHDhU<aWuQRdovA(ZHsh8SUe46Zso?ncuF6o#C2&K
zVJ7~VHVBKbV~+QQGuF_C?*q9YBUif9y8!k{^V})G)w@_YuP>qBL=hMCB<YwUr6GY+
zLjoU=3+LAXjN;ME{e1KurY=|o8o7Nz4nRG2WmUsf)Efu+o!{{vqYX}@W#KP$4zby0
z@M1xBJlJtVb~Dt-;cPw3Iz6PScHd>?<e#eQ2}HLTs3JAnO<Jni4tgqghtOckglV|e
zlogxOud2-#rjm4%9M2C6rX0c#O;%WrH%tZm*$sTroC0l_Z=R9poX1F1Z^c9ZuE(97
zb(x+1+`yV*Z^c=q3|q`~;Kv8%O|TxzEh}Lnc32Gjen0+f>B>)1_WvC!#o3^Y{1q}>
z8<k!f8EzxV>%z{Nj|k>_VmAgJwY#P%<>Rr-m2=~<R^_)b!<jX53A-0BiuBx}Gdoco
z+R0K>7u(={v{_T29c!)TDDwbq-d;|NO;B3#3+pU+39njnKr5qj_C>`!ZV=4dlxk@*
zxF+=G8N%Pf_E$zB8BgZVfv0#SUk`&goPV4r)JlJWPXnLJ_*VlO2+G^5)rq^WlnC~y
zl!~<rrY#f9P4IHT+K8Mt1iMa@R0#GpF+eE9-b%sl5#}nv{w3<y33iKUtP$)iadU%U
z);9&~A%=((8wE>o2$o6gC0_SA4H2HF&P-n(mR5A?&qpxk%S-j<WsJo7iWZin_iKJw
zvr6fdiIq_tKEbr=2FQ>fRX@?d3OrO}lUHk2Xn5>)ndE2z=#a;1y8+&lRhzZ}T$499
z4*}Qh#B=rEhq~Qc96V{O9NuyhzIyvCpJI0kI->D*uTe1FyP`E&H+EA=#TncXmPEcS
zc<Z)_X16BCVd}ut*g6WVCr0U)nNEFHBNh!L(6v)LkQlaOhhPV#cL1Yf5^aLfr#aS6
NH4FBdoI7$Y?mz75{M!Hk

delta 1235
zcmXApeNfaz7{~Y7J6;+k-thoai6dSV<W-IiYp>=|UOmJRP+k&<^X!GuJCb-2IH=C^
zM)6_FUR5ZaglU@g4{@gC3`w0r%^*~iiE7|yP}qxFTKw9ho%!suJNxW+_Ia6YX;-$i
zD?jlB<;cbR>u@nF1uI6wYMRlCC2$P-IndQgco!4gW9VN`VX6Cacn_Q0!=M)ryRV`T
z%5m7e6JFuv9$F<l!QWZ5j?%kD{3owwfI433T~5J-gT6WR!Y1zPr=_qDa|1ZNn$Kxq
zHh`Vy1w~M(=4O=+RN=XVT=>F=Jmct78*a;Tf4mPN(qt|U2j7B6@npy@Xv3AEBlKDp
zho#*BDfq!7r(gpwTUMt4B_9ooR?zFZgApB}1v)}nhq{Om9CXQ5%n7*_zCzBc=SYMC
zG<Y;Bb&unD_3N#(v%>3WBj`xdkWFuP=nojq=?}QB%7IlajC4578?8-UZaZ^Y*4Bmy
zUGvjMmv!jX#>Tyj805h8Hb$&x7d!O(48~wWiOF?nFj7KV<UrMehUH<|vQG{qVw2=#
zGc?I*&s}6r8kU;Y5@H?Njh)do;EjJr--HMpi?P9R{_ILO3Km`y>kl;U2W*TR4mq7F
z!aA!GX<3M>$d#lhSCZ;^<!TeaCA=8_8jbxCHz(vnBL65M9YnpR5-Z>gu1mT}y(aOo
zWE~tqWAat_4Rt9R=ohoUN59ggvL3rqtbkm#Mg`&DPswtz{VQqYXIbuWdbg`VWF)0U
zL@uWo#Vq+uV?k;><Y0ShqF>=9S+<@H=x|yV8UH!Rh%|ubQ?;-Qm6~iC`5oqKB4Iz)
zYnF#r#u1SMTj^~_)1SS)rubfm-dSL<m3}5=BG;Ip440+tfQ`5}Ek~4TEKN=QFXO*y
zCpG?3_^+;~Sjwc!VsYzDQ6iJufToKP`<>z>=O4!`0TTJ&MJugXSeO%MuHgLRYZiYw
zA<KrI3fH?gA=B#M5VmO}VH!_pHD2}OBGlq7qS78x56)@B!GQkh>7eI^^jE!nc`YNh
z=BTu0wZ-FHhI*(Lr!(h8Lr!JIz&-TMR>1_uWOvhRMt(8du7Hnu$p)tae&L}7@<V&}
zZ)W7vB1W=`85tBjS;EK}LHQO&9tdzNBSEE%m<4YOjtg{Uj2so*6Pzk%Bz7AkhXg5A
zj5G+|sAlB8pzS$EJ``-LVPr}$C(s!gDYTo_o*j41@%9XStF%`&=t+n@Bg&SsYR1o=
zm%Mr9CB^xIe5sFbE%T!AKAI|OA(oF<+)+R#ep97`ueo3KdIh~w&$k-eK{Vs!_Rj$d
z`QaTegJ_T?FH8X)Z9w_O(=Idcl9Arn$)jt>08dcH*^Pd>L{x_ao0-cjjP5!{Mt8H$
zu)u}ShD+wzYB!ZQs>Ey8Q-w@tSP({y2l&MZ$2h^fEXxxXMt-+o-gt=kIku07x@j92
b*}!e%=<Pep7!f_WF#4>FMDW;|Z-f2=yp7Xb


From bd559affbcf751d932274da766e8e762c23e1f87 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 16 Jul 2008 02:17:56 +0000
Subject: [PATCH 2014/8469] Merged revisions 63955 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63955 | ronald.oussoren | 2008-06-05 14:58:24 +0200 (Thu, 05 Jun 2008) | 20 lines

  MacOS X: Enable 4-way universal builds

  This patch adds a new configure argument on OSX:
          --with-universal-archs=[32-bit|64-bit|all]

  When used with the --enable-universalsdk option this controls which
  CPU architectures are includes in the framework. The default is 32-bit,
  meaning i386 and ppc. The most useful alternative is 'all', which includes
  all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).

  This includes limited support for the Carbon bindings in 64-bit mode as well,
  limited because (a) I haven't done extensive testing and (b) a large portion
  of the Carbon API's aren't available in 64-bit mode anyway.

  I've also duplicated a feature of Apple's build of python: setting the
  environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
  extensions using distutils.
........
---
 sysconfig.py     | 20 ++++++++++++++++++++
 unixccompiler.py |  8 +++++++-
 util.py          | 11 +++++++++--
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d2b2c9a347..3a120dd584 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -516,6 +516,26 @@ def get_config_vars(*args):
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
                     _config_vars[key] = flags
 
+            else:
+
+                # Allow the user to override the architecture flags using
+                # an environment variable.
+                # NOTE: This name was introduced by Apple in OSX 10.5 and
+                # is used by several scripting languages distributed with
+                # that OS release.
+
+                if 'ARCHFLAGS' in os.environ:
+                    arch = os.environ['ARCHFLAGS']
+                    for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                        flags = _config_vars[key]
+                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                        flags = flags + ' ' + arch
+                        _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 25a042d075..87ce9217fd 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -63,7 +63,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         stripArch = '-arch' in cc_args
         stripSysroot = '-isysroot' in cc_args
 
-    if stripArch:
+    if stripArch or 'ARCHFLAGS' in os.environ:
         while True:
             try:
                 index = compiler_so.index('-arch')
@@ -72,6 +72,12 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
             except ValueError:
                 break
 
+    if 'ARCHFLAGS' in os.environ and not stripArch:
+        # User specified different -arch flags in the environ,
+        # see also distutils.sysconfig
+        compiler_so = compiler_so + ' ' + os.environ['ARCHFLAGS']
+
+
     if stripSysroot:
         try:
             index = compiler_so.index('-isysroot')
diff --git a/util.py b/util.py
index 72039a7e6a..76798b9506 100644
--- a/util.py
+++ b/util.py
@@ -124,12 +124,19 @@ def get_platform ():
             osname = "macosx"
 
 
-            if (release + '.') < '10.4.' and \
-                    get_config_vars().get('UNIVERSALSDK', '').strip():
+            if (release + '.') >= '10.4.' and \
+                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4
+                #
+                # Try to detect 4-way universal builds, those have machine-type
+                # 'universal' instead of 'fat'.
+
                 machine = 'fat'
 
+                if '-arch x86_64' in get_config_vars().get('CFLAGS'):
+                    machine = 'universal'
+
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'

From cc23416383cd1931421722ea974a8b8fcc273d10 Mon Sep 17 00:00:00 2001
From: Jesse Noller <jnoller@gmail.com>
Date: Wed, 16 Jul 2008 13:24:06 +0000
Subject: [PATCH 2015/8469] Apply patch for issue 3090: ARCHFLAGS parsing
 incorrect

---
 unixccompiler.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 6144efc070..045368a925 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -76,8 +76,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
         # see also distutils.sysconfig
-        compiler_so = compiler_so + ' ' + os.environ['ARCHFLAGS']
-
+        compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
         try:

From 859dfb6ac16f97bbbd9632c03ac655ad5e3e5d59 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 18 Jul 2008 02:28:44 +0000
Subject: [PATCH 2016/8469] Bumping to 3.0b2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 54fc2369d0..48bb00560b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0b1"
+__version__ = "3.0b2"
 #--end constants--

From 5656e21cbe602ccf223815c23bad6f8411d039d0 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 18 Jul 2008 03:20:07 +0000
Subject: [PATCH 2017/8469] Bumping to 2.6b2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a192357896..06ec0d4bf8 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6b1"
+__version__ = "2.6b2"
 #--end constants--

From e6c78afba556f44c4d87f6e5392a7ffba98a45c9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 23 Jul 2008 16:10:53 +0000
Subject: [PATCH 2018/8469] Merged revisions
 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65012 | jesse.noller | 2008-07-16 15:24:06 +0200 (Wed, 16 Jul 2008) | 2 lines

  Apply patch for issue 3090: ARCHFLAGS parsing incorrect
........
  r65035 | georg.brandl | 2008-07-16 23:19:28 +0200 (Wed, 16 Jul 2008) | 2 lines

  #3045: fix pydoc behavior for TEMP path with spaces.
........
  r65037 | georg.brandl | 2008-07-16 23:31:41 +0200 (Wed, 16 Jul 2008) | 2 lines

  #1608818: errno can get set by every call to readdir().
........
  r65038 | georg.brandl | 2008-07-17 00:04:20 +0200 (Thu, 17 Jul 2008) | 2 lines

  #3305: self->stream can be NULL.
........
  r65039 | georg.brandl | 2008-07-17 00:09:17 +0200 (Thu, 17 Jul 2008) | 2 lines

  #3345: fix docstring.
........
  r65040 | georg.brandl | 2008-07-17 00:33:18 +0200 (Thu, 17 Jul 2008) | 2 lines

  #3312: fix two sqlite3 crashes.
........
  r65048 | georg.brandl | 2008-07-17 01:35:54 +0200 (Thu, 17 Jul 2008) | 2 lines

  #3388: add a paragraph about using "with" for file objects.
........
  r65057 | gregory.p.smith | 2008-07-17 05:13:05 +0200 (Thu, 17 Jul 2008) | 2 lines

  news note for r63052
........
  r65077 | jesse.noller | 2008-07-17 23:01:05 +0200 (Thu, 17 Jul 2008) | 3 lines

  Fix issue 3395, update _debugInfo to be _debug_info
........
  r65091 | ronald.oussoren | 2008-07-18 07:48:03 +0200 (Fri, 18 Jul 2008) | 2 lines

  Last bit of a fix for issue3381 (addon for my patch in r65061)
........
  r65092 | vinay.sajip | 2008-07-18 10:59:06 +0200 (Fri, 18 Jul 2008) | 1 line

  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65093 | vinay.sajip | 2008-07-18 11:00:00 +0200 (Fri, 18 Jul 2008) | 1 line

  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65094 | vinay.sajip | 2008-07-18 11:00:35 +0200 (Fri, 18 Jul 2008) | 1 line

  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65095 | vinay.sajip | 2008-07-18 11:01:10 +0200 (Fri, 18 Jul 2008) | 1 line

  Issue #3389: Allow resolving dotted names for handlers in logging configuration files. Thanks to Philip Jenvey for the patch.
........
  r65097 | georg.brandl | 2008-07-18 12:20:59 +0200 (Fri, 18 Jul 2008) | 2 lines

  Remove duplicate entry in __all__.
........
  r65098 | georg.brandl | 2008-07-18 12:29:30 +0200 (Fri, 18 Jul 2008) | 2 lines

  Correct attribute name.
........
  r65099 | georg.brandl | 2008-07-18 13:15:06 +0200 (Fri, 18 Jul 2008) | 3 lines

  Document the different meaning of precision for {:f} and {:g}.
  Also document how inf and nan are formatted. #3404.
........
  r65127 | raymond.hettinger | 2008-07-19 02:42:03 +0200 (Sat, 19 Jul 2008) | 1 line

  Improve accuracy of gamma test function
........
  r65128 | raymond.hettinger | 2008-07-19 02:43:00 +0200 (Sat, 19 Jul 2008) | 1 line

  Add recipe to the itertools docs.
........
  r65131 | georg.brandl | 2008-07-19 12:08:55 +0200 (Sat, 19 Jul 2008) | 2 lines

  #3378: in case of no memory, don't leak even more memory. :)
........
  r65133 | georg.brandl | 2008-07-19 14:39:10 +0200 (Sat, 19 Jul 2008) | 3 lines

  #3302: fix segfaults when passing None for arguments that can't
  be NULL for the C functions.
........
  r65134 | georg.brandl | 2008-07-19 14:46:12 +0200 (Sat, 19 Jul 2008) | 2 lines

  #3303: fix crash with invalid Py_DECREF in strcoll().
........
  r65135 | georg.brandl | 2008-07-19 15:00:22 +0200 (Sat, 19 Jul 2008) | 3 lines

  #3319: don't raise ZeroDivisionError if number of rounds is so
  low that benchtime is zero.
........
  r65136 | georg.brandl | 2008-07-19 15:09:42 +0200 (Sat, 19 Jul 2008) | 3 lines

  #3323: mention that if inheriting from a class without __slots__,
  the subclass will have a __dict__ available too.
........
  r65139 | georg.brandl | 2008-07-19 15:48:44 +0200 (Sat, 19 Jul 2008) | 2 lines

  Add ordering info for findall and finditer.
........
  r65149 | raymond.hettinger | 2008-07-20 01:21:57 +0200 (Sun, 20 Jul 2008) | 1 line

  Fix compress() recipe in docs to use itertools.
........
  r65150 | raymond.hettinger | 2008-07-20 01:58:47 +0200 (Sun, 20 Jul 2008) | 1 line

  Clean-up itertools docs and recipes.
........
  r65151 | gregory.p.smith | 2008-07-20 02:22:08 +0200 (Sun, 20 Jul 2008) | 9 lines

  fix issue3120 - don't truncate handles on 64-bit Windows.

  This is still messy, realistically PC/_subprocess.c should never cast pointers
  to python numbers and back at all.

  I don't have a 64-bit windows build environment because microsoft apparently
  thinks that should cost money.  Time to watch the buildbots.  It builds and
  passes tests on 32-bit windows.
........
  r65155 | georg.brandl | 2008-07-20 13:50:29 +0200 (Sun, 20 Jul 2008) | 2 lines

  #926501: add info where to put the docstring.
........
  r65158 | neal.norwitz | 2008-07-20 21:35:23 +0200 (Sun, 20 Jul 2008) | 1 line

  Fix a couple of names in error messages that were wrong
........
  r65159 | neal.norwitz | 2008-07-20 22:39:36 +0200 (Sun, 20 Jul 2008) | 1 line

  Fix misspeeld method name (negative)
........
  r65176 | amaury.forgeotdarc | 2008-07-21 23:36:24 +0200 (Mon, 21 Jul 2008) | 4 lines

  Increment version number in NEWS file, and move items that were added after 2.6b2.

  (I thought there was a script to automate this kind of updates)
........
  r65177 | amaury.forgeotdarc | 2008-07-22 00:00:38 +0200 (Tue, 22 Jul 2008) | 5 lines

  Issue2378: pdb would delete free variables when stepping into a class statement.

  The problem was introduced by r53954, the correction is to restore the symmetry between
  PyFrame_FastToLocals and PyFrame_LocalsToFast
........
  r65178 | benjamin.peterson | 2008-07-22 00:05:34 +0200 (Tue, 22 Jul 2008) | 1 line

  don't use assert statement
........
  r65183 | ronald.oussoren | 2008-07-22 09:06:00 +0200 (Tue, 22 Jul 2008) | 2 lines

  Fix buglet in fix for issue3381
........
  r65184 | ronald.oussoren | 2008-07-22 09:06:33 +0200 (Tue, 22 Jul 2008) | 2 lines

  Fix build issue on OSX 10.4, somehow this wasn't committed before.
........
  r65187 | raymond.hettinger | 2008-07-22 20:54:02 +0200 (Tue, 22 Jul 2008) | 1 line

  Remove out-of-date section on Exact/Inexact.
........
  r65188 | raymond.hettinger | 2008-07-22 21:00:47 +0200 (Tue, 22 Jul 2008) | 1 line

  Tuples now have both count() and index().
........
  r65189 | raymond.hettinger | 2008-07-22 21:03:05 +0200 (Tue, 22 Jul 2008) | 1 line

  Fix credits for math.sum()
........
  r65190 | raymond.hettinger | 2008-07-22 21:18:50 +0200 (Tue, 22 Jul 2008) | 1 line

  One more attribution.
........
  r65192 | benjamin.peterson | 2008-07-23 01:44:37 +0200 (Wed, 23 Jul 2008) | 1 line

  remove unneeded import
........
  r65194 | benjamin.peterson | 2008-07-23 15:25:06 +0200 (Wed, 23 Jul 2008) | 1 line

  use isinstance
........
---
 unixccompiler.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 87ce9217fd..d65ab321b6 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -75,8 +75,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
         # see also distutils.sysconfig
-        compiler_so = compiler_so + ' ' + os.environ['ARCHFLAGS']
-
+        compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
         try:

From a52ff5544a4ddb9aa9b5e94543f45cf7ad7f348e Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sat, 26 Jul 2008 20:09:45 +0000
Subject: [PATCH 2019/8469] Remove incorrect usages of map() in distutils.
 Reported by Lisandro Dalcin.

---
 cmd.py               | 2 +-
 command/build_ext.py | 2 +-
 dist.py              | 3 ++-
 filelist.py          | 4 ++--
 mwerkscompiler.py    | 6 +++---
 text_file.py         | 3 ++-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmd.py b/cmd.py
index bd560a661c..c6572caa5f 100644
--- a/cmd.py
+++ b/cmd.py
@@ -158,7 +158,7 @@ def dump_options(self, header=None, indent=""):
         print(indent + header)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = option.translate(longopt_xlate)
+            option = longopt_xlate(option)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
diff --git a/command/build_ext.py b/command/build_ext.py
index c0eef62815..2db53f134d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -244,7 +244,7 @@ def finalize_options(self):
 
         if self.define:
             defines = self.define.split(',')
-            self.define = map(lambda symbol: (symbol, '1'), defines)
+            self.define = [(symbol, '1') for symbol in defines]
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
diff --git a/dist.py b/dist.py
index ddde909fbd..8bcb88c31b 100644
--- a/dist.py
+++ b/dist.py
@@ -864,7 +864,8 @@ def _set_command_options (self, command_obj, option_dict=None):
         for (option, (source, value)) in option_dict.items():
             if DEBUG: print("    %s = %s (from %s)" % (option, value, source))
             try:
-                bool_opts = map(translate_longopt, command_obj.boolean_options)
+                bool_opts = [translate_longopt(o)
+                             for o in command_obj.boolean_options]
             except AttributeError:
                 bool_opts = []
             try:
diff --git a/filelist.py b/filelist.py
index 8eab0a95bf..a80c71e8c7 100644
--- a/filelist.py
+++ b/filelist.py
@@ -85,13 +85,13 @@ def _parse_template_line(self, line):
             if len(words) < 2:
                 raise DistutilsTemplateError(
                       "'%s' expects <pattern1> <pattern2> ..." % action)
-            patterns = map(convert_path, words[1:])
+            patterns = [convert_path(w) for w in words[1:]]
         elif action in ('recursive-include', 'recursive-exclude'):
             if len(words) < 3:
                 raise DistutilsTemplateError(
                       "'%s' expects <dir> <pattern1> <pattern2> ..." % action)
             dir = convert_path(words[1])
-            patterns = map(convert_path, words[2:])
+            patterns = [convert_path(w) for w in words[2:]]
         elif action in ('graft', 'prune'):
             if len(words) != 2:
                 raise DistutilsTemplateError(
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
index 25d48ae866..130cd6147b 100644
--- a/mwerkscompiler.py
+++ b/mwerkscompiler.py
@@ -104,10 +104,10 @@ def link (self,
         # This is because we (usually) create the project in a subdirectory of
         # where we are now, and keeping the paths relative is too much work right
         # now.
-        sources = map(self._filename_to_abs, self.__sources)
-        include_dirs = map(self._filename_to_abs, self.__include_dirs)
+        sources = [self._filename_to_abs(s) for s in self.__sources]
+        include_dirs = [self._filename_to_abs(d) for d in self.__include_dirs]
         if objects:
-            objects = map(self._filename_to_abs, objects)
+            objects = [self._filename_to_abs(o) for o in objects]
         else:
             objects = []
         if build_temp:
diff --git a/text_file.py b/text_file.py
index db054fd270..266466c1eb 100644
--- a/text_file.py
+++ b/text_file.py
@@ -292,7 +292,7 @@ def unreadline(self, line):
   continues on next line
 """
     # result 1: no fancy options
-    result1 = map(lambda x: x + "\n", test_data.split("\n")[0:-1])
+    result1 = [x + "\n" for x in test_data.split("\n")[:-1]]
 
     # result 2: just strip comments
     result2 = ["\n",
@@ -357,4 +357,5 @@ def test_input(count, description, file, expected_result):
                        join_lines=1, rstrip_ws=1, collapse_join=1)
     test_input(6, "join lines with collapsing", in_file, result6)
 
+    del in_file
     os.remove(filename)

From 4c8a00dd7b5c30ef7f88deaf6e76be5815cee1fb Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 14 Aug 2008 05:50:43 +0000
Subject: [PATCH 2020/8469] Fixed test_distutils error (test_build_ext) on VC6.

---
 command/build_ext.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index beb3319469..8cf7888117 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -209,9 +209,12 @@ def finalize_options (self):
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS8.0', 'win32release'))
-            else:
+            elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))
+            else:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PC', 'VC6'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory

From dd8e87105079fbf52d866825dc56482a40732b99 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 14 Aug 2008 07:35:13 +0000
Subject: [PATCH 2021/8469] Merged revisions 65667 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65667 | hirokazu.yamamoto | 2008-08-14 14:50:43 +0900 | 1 line

  Fixed test_distutils error (test_build_ext) on VC6.
........
---
 command/build_ext.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2db53f134d..7ef5becc6f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -205,9 +205,12 @@ def finalize_options(self):
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS8.0', 'win32release'))
-            else:
+            elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))
+            else:
+                self.library_dirs.append(os.path.join(sys.exec_prefix,
+                                         'PC', 'VC6'))
 
         # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
         # import libraries in its "Config" subdirectory

From bc2dcae88fe834e1fe0de12f0b01df8763fa7d38 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 17 Aug 2008 04:16:04 +0000
Subject: [PATCH 2022/8469] Update distutils so that it triggers no warnings
 when run under -3.

---
 command/build_ext.py | 2 +-
 command/build_py.py  | 4 ++--
 core.py              | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8cf7888117..1461409f60 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -679,7 +679,7 @@ def get_ext_filename (self, ext_name):
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
             return apply(os.path.join, ext_path) + '_d' + so_ext
-        return apply(os.path.join, ext_path) + so_ext
+        return os.path.join(*ext_path) + so_ext
 
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
diff --git a/command/build_py.py b/command/build_py.py
index be6d2c5b4d..3bf1267328 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -169,7 +169,7 @@ def get_package_dir (self, package):
                     del path[-1]
                 else:
                     tail.insert(0, pdir)
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
             else:
                 # Oops, got all the way through 'path' without finding a
                 # match in package_dir.  If package_dir defines a directory
@@ -337,7 +337,7 @@ def get_source_files (self):
 
     def get_module_outfile (self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
-        return apply(os.path.join, outfile_path)
+        return os.path.join(*outfile_path)
 
 
     def get_outputs (self, include_bytecode=1):
diff --git a/core.py b/core.py
index de9ce7d7ff..a0e44ea631 100644
--- a/core.py
+++ b/core.py
@@ -218,7 +218,8 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            execfile(script_name, g, l)
+            with open(script_name, 'r') as file:
+                exec file.read() in g, l
         finally:
             sys.argv = save_argv
             _setup_stop_after = None

From 93cbbc9e4f93377f401d264b08561fe580ea2bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Mon, 18 Aug 2008 11:13:45 +0000
Subject: [PATCH 2023/8469] Restore Python 2.3 compatibility and remove "with"
 usage.

---
 core.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core.py b/core.py
index a0e44ea631..62a3389b53 100644
--- a/core.py
+++ b/core.py
@@ -218,8 +218,7 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            with open(script_name, 'r') as file:
-                exec file.read() in g, l
+            exec open(script_name, 'r').read() in g, l
         finally:
             sys.argv = save_argv
             _setup_stop_after = None

From 07f55be128098cc6915ebd7671a1a13078291e9e Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Mon, 18 Aug 2008 19:23:47 +0000
Subject: [PATCH 2024/8469] #2234 distutils failed with mingw binutils
 2.18.50.20080109. Be less strict when parsing these version numbers, they
 don't necessarily follow the python numbering scheme.

---
 cygwinccompiler.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 4ac11eb4b1..94a7bd96ee 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -404,7 +404,7 @@ def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
         If not possible it returns None for it.
     """
-    from distutils.version import StrictVersion
+    from distutils.version import LooseVersion
     from distutils.spawn import find_executable
     import re
 
@@ -415,7 +415,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            gcc_version = StrictVersion(result.group(1))
+            gcc_version = LooseVersion(result.group(1))
         else:
             gcc_version = None
     else:
@@ -427,7 +427,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            ld_version = StrictVersion(result.group(1))
+            ld_version = LooseVersion(result.group(1))
         else:
             ld_version = None
     else:
@@ -439,7 +439,7 @@ def get_versions():
         out.close()
         result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            dllwrap_version = StrictVersion(result.group(1))
+            dllwrap_version = LooseVersion(result.group(1))
         else:
             dllwrap_version = None
     else:

From 478e78efb66d39ece39152d4d41f3842f147a48b Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Mon, 18 Aug 2008 19:33:42 +0000
Subject: [PATCH 2025/8469] Issue #2234: distutils failed with mingw binutils
 2.18.50.20080109. Be less strict when parsing these version numbers, they
 don't necessarily follow the python numbering scheme.

Backport of r65834
---
 cygwinccompiler.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 4fd23e6dc6..6d1ba16be6 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -398,7 +398,7 @@ def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
         If not possible it returns None for it.
     """
-    from distutils.version import StrictVersion
+    from distutils.version import LooseVersion
     from distutils.spawn import find_executable
     import re
 
@@ -409,7 +409,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            gcc_version = StrictVersion(result.group(1))
+            gcc_version = LooseVersion(result.group(1))
         else:
             gcc_version = None
     else:
@@ -421,7 +421,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            ld_version = StrictVersion(result.group(1))
+            ld_version = LooseVersion(result.group(1))
         else:
             ld_version = None
     else:
@@ -433,7 +433,7 @@ def get_versions():
         out.close()
         result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
         if result:
-            dllwrap_version = StrictVersion(result.group(1))
+            dllwrap_version = LooseVersion(result.group(1))
         else:
             dllwrap_version = None
     else:

From 9b46d3fc54dc19f29a4d7503e8c06dcfbebd7b5a Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 19 Aug 2008 17:56:33 +0000
Subject: [PATCH 2026/8469] #2834: Change re module semantics, so that str and
 bytes mixing is forbidden, and str (unicode) patterns get full unicode
 matching by default. The re.ASCII flag is also introduced to ask for ASCII
 matching instead.

---
 cygwinccompiler.py  | 6 +++---
 emxccompiler.py     | 2 +-
 sysconfig.py        | 2 +-
 util.py             | 2 +-
 version.py          | 2 +-
 versionpredicate.py | 6 ++++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 488752300b..da2c74a2b1 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -409,7 +409,7 @@ def get_versions():
         out = os.popen(gcc_exe + ' -dumpversion','r')
         out_string = out.read()
         out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
+        result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
             gcc_version = StrictVersion(result.group(1))
         else:
@@ -421,7 +421,7 @@ def get_versions():
         out = os.popen(ld_exe + ' -v','r')
         out_string = out.read()
         out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
+        result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
             ld_version = StrictVersion(result.group(1))
         else:
@@ -433,7 +433,7 @@ def get_versions():
         out = os.popen(dllwrap_exe + ' --version','r')
         out_string = out.read()
         out.close()
-        result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
+        result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
             dllwrap_version = StrictVersion(result.group(1))
         else:
diff --git a/emxccompiler.py b/emxccompiler.py
index d9ee82d58a..62a4c5b4e8 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -300,7 +300,7 @@ def get_versions():
         out = os.popen(gcc_exe + ' -dumpversion','r')
         out_string = out.read()
         out.close()
-        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
         if result:
             gcc_version = StrictVersion(result.group(1))
         else:
diff --git a/sysconfig.py b/sysconfig.py
index 3a120dd584..b17743a865 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -512,7 +512,7 @@ def get_config_vars(*args):
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
                     flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                    flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
                     _config_vars[key] = flags
 
diff --git a/util.py b/util.py
index 76798b9506..b87dfbe065 100644
--- a/util.py
+++ b/util.py
@@ -81,7 +81,7 @@ def get_platform ():
         return "%s-%s.%s" % (osname, version, release)
     elif osname[:6] == "cygwin":
         osname = "cygwin"
-        rel_re = re.compile (r'[\d.]+')
+        rel_re = re.compile (r'[\d.]+', re.ASCII)
         m = rel_re.match(release)
         if m:
             release = m.group()
diff --git a/version.py b/version.py
index f71b2f6ce3..907f71c313 100644
--- a/version.py
+++ b/version.py
@@ -134,7 +134,7 @@ class StrictVersion (Version):
     """
 
     version_re = re.compile(r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
-                            re.VERBOSE)
+                            re.VERBOSE | re.ASCII)
 
 
     def parse (self, vstring):
diff --git a/versionpredicate.py b/versionpredicate.py
index 434b34f184..b0dd9f45bf 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -5,7 +5,8 @@
 import operator
 
 
-re_validPackage = re.compile(r"(?i)^\s*([a-z_]\w*(?:\.[a-z_]\w*)*)(.*)")
+re_validPackage = re.compile(r"(?i)^\s*([a-z_]\w*(?:\.[a-z_]\w*)*)(.*)",
+    re.ASCII)
 # (package) (rest)
 
 re_paren = re.compile(r"^\s*\((.*)\)\s*$") # (list) inside of parentheses
@@ -153,7 +154,8 @@ def split_provision(value):
     global _provision_rx
     if _provision_rx is None:
         _provision_rx = re.compile(
-            "([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$")
+            "([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$",
+            re.ASCII)
     value = value.strip()
     m = _provision_rx.match(value)
     if not m:

From 677cbea5d0294da0039c6645d0c5a8abce8efcd0 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 19 Aug 2008 18:57:56 +0000
Subject: [PATCH 2027/8469] Merged revisions
 65780,65782,65785,65809,65812,65834,65846,65859,65861 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65780 | antoine.pitrou | 2008-08-17 15:15:07 -0500 (Sun, 17 Aug 2008) | 3 lines

  #3580: fix a failure in test_os
........
  r65782 | benjamin.peterson | 2008-08-17 15:33:45 -0500 (Sun, 17 Aug 2008) | 1 line

  set svn:executable on a script
........
  r65785 | amaury.forgeotdarc | 2008-08-17 16:05:18 -0500 (Sun, 17 Aug 2008) | 3 lines

  Fix a refleak in bytearray.split and bytearray.rsplit, detected by
     regrtest.py -R:: test_bytes
........
  r65809 | nick.coghlan | 2008-08-18 07:42:46 -0500 (Mon, 18 Aug 2008) | 1 line

  Belated NEWS entry for r65642
........
  r65812 | nick.coghlan | 2008-08-18 08:32:19 -0500 (Mon, 18 Aug 2008) | 1 line

  Fix typo
........
  r65834 | amaury.forgeotdarc | 2008-08-18 14:23:47 -0500 (Mon, 18 Aug 2008) | 4 lines

  #2234 distutils failed with mingw binutils 2.18.50.20080109.
  Be less strict when parsing these version numbers,
  they don't necessarily follow the python numbering scheme.
........
  r65846 | georg.brandl | 2008-08-18 18:09:49 -0500 (Mon, 18 Aug 2008) | 2 lines

  Fix grammar.
........
  r65859 | thomas.heller | 2008-08-19 12:47:13 -0500 (Tue, 19 Aug 2008) | 2 lines

  Fix strange character in the docstring.
........
  r65861 | benjamin.peterson | 2008-08-19 12:59:23 -0500 (Tue, 19 Aug 2008) | 1 line

  get unparse to at least unparse its self
........
---
 cygwinccompiler.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index da2c74a2b1..ea4c7971fd 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -400,7 +400,7 @@ def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
         If not possible it returns None for it.
     """
-    from distutils.version import StrictVersion
+    from distutils.version import LooseVersion
     from distutils.spawn import find_executable
     import re
 
@@ -411,7 +411,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
-            gcc_version = StrictVersion(result.group(1))
+            gcc_version = LooseVersion(result.group(1))
         else:
             gcc_version = None
     else:
@@ -423,7 +423,7 @@ def get_versions():
         out.close()
         result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
-            ld_version = StrictVersion(result.group(1))
+            ld_version = LooseVersion(result.group(1))
         else:
             ld_version = None
     else:
@@ -435,7 +435,7 @@ def get_versions():
         out.close()
         result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
         if result:
-            dllwrap_version = StrictVersion(result.group(1))
+            dllwrap_version = LooseVersion(result.group(1))
         else:
             dllwrap_version = None
     else:

From ce2fde27c45c1041550de710a9dce751742ed47d Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 21 Aug 2008 01:15:08 +0000
Subject: [PATCH 2028/8469] Bump to 2.6b3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 06ec0d4bf8..74d0a47d47 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6b2"
+__version__ = "2.6b3"
 #--end constants--

From 82e68f4b495194b137f661c4ace674a857ab9a24 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 21 Aug 2008 02:39:51 +0000
Subject: [PATCH 2029/8469] Bumping to 3.0b3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 48bb00560b..9af2d9208e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0b2"
+__version__ = "3.0b3"
 #--end constants--

From 031df9f3aba5b6fac4773f05107ad5e7c6d830c4 Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Tue, 2 Sep 2008 23:19:56 +0000
Subject: [PATCH 2030/8469] Issue 2975: when compiling multiple extension
 modules with visual studio 2008 from the same python instance, some
 environment variables (LIB, INCLUDE) would grow without limit.

Tested with these statements:
    distutils.ccompiler.new_compiler().initialize()
    print os.environ['LIB']
But I don't know how to turn them into reliable unit tests.
---
 msvc9compiler.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index c8d52c4237..0b27428d05 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -193,6 +193,17 @@ def normalize_and_reduce_paths(paths):
             reduced_paths.append(np)
     return reduced_paths
 
+def removeDuplicates(variable):
+    """Remove duplicate values of an environment variable.
+    """
+    oldList = variable.split(os.pathsep)
+    newList = []
+    for i in oldList:
+        if i not in newList:
+            newList.append(i)
+    newVariable = os.pathsep.join(newList)
+    return newVariable
+
 def find_vcvarsall(version):
     """Find the vcvarsall.bat file
 
@@ -252,12 +263,12 @@ def query_vcvarsall(version, arch="x86"):
         if '=' not in line:
             continue
         line = line.strip()
-        key, value = line.split('=')
+        key, value = line.split('=', 1)
         key = key.lower()
         if key in interesting:
             if value.endswith(os.pathsep):
                 value = value[:-1]
-            result[key] = value
+            result[key] = removeDuplicates(value)
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))

From acd8349dbdd9b886e8e78d43238c32f7858c0c20 Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Tue, 2 Sep 2008 23:22:56 +0000
Subject: [PATCH 2031/8469] Merged revisions 66171 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66171 | amaury.forgeotdarc | 2008-09-03 01:19:56 +0200 (mer., 03 sept. 2008) | 9 lines

  Issue 2975: when compiling multiple extension modules with visual studio 2008
  from the same python instance, some environment variables (LIB, INCLUDE)
  would grow without limit.

  Tested with these statements:
      distutils.ccompiler.new_compiler().initialize()
      print os.environ['LIB']
  But I don't know how to turn them into reliable unit tests.
........
---
 msvc9compiler.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index fdb74aeabf..465013dc33 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -193,6 +193,17 @@ def normalize_and_reduce_paths(paths):
             reduced_paths.append(np)
     return reduced_paths
 
+def removeDuplicates(variable):
+    """Remove duplicate values of an environment variable.
+    """
+    oldList = variable.split(os.pathsep)
+    newList = []
+    for i in oldList:
+        if i not in newList:
+            newList.append(i)
+    newVariable = os.pathsep.join(newList)
+    return newVariable
+
 def find_vcvarsall(version):
     """Find the vcvarsall.bat file
 
@@ -252,12 +263,12 @@ def query_vcvarsall(version, arch="x86"):
         if '=' not in line:
             continue
         line = line.strip()
-        key, value = line.split('=')
+        key, value = line.split('=', 1)
         key = key.lower()
         if key in interesting:
             if value.endswith(os.pathsep):
                 value = value[:-1]
-            result[key] = value
+            result[key] = removeDuplicates(value)
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))

From 299925be446045f3df379da3ca13797087c43efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Wed, 3 Sep 2008 11:13:56 +0000
Subject: [PATCH 2032/8469] Issue #2562: Fix distutils PKG-INFO writing logic
 to allow having non-ascii characters and Unicode in setup.py meta-data.

---
 dist.py            | 38 +++++++++++++++++++++++++-------------
 tests/test_dist.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/dist.py b/dist.py
index 0a21380973..9ad94fbeb8 100644
--- a/dist.py
+++ b/dist.py
@@ -23,6 +23,9 @@
 from distutils import log
 from distutils.debug import DEBUG
 
+# Encoding used for the PKG-INFO files
+PKG_INFO_ENCODING = 'utf-8'
+
 # Regex to define acceptable Distutils command names.  This is not *quite*
 # the same as a Python NAME -- I don't allow leading underscores.  The fact
 # that they're very similar is no coincidence; the default naming scheme is
@@ -1084,23 +1087,23 @@ def write_pkg_file (self, file):
         if self.provides or self.requires or self.obsoletes:
             version = '1.1'
 
-        file.write('Metadata-Version: %s\n' % version)
-        file.write('Name: %s\n' % self.get_name() )
-        file.write('Version: %s\n' % self.get_version() )
-        file.write('Summary: %s\n' % self.get_description() )
-        file.write('Home-page: %s\n' % self.get_url() )
-        file.write('Author: %s\n' % self.get_contact() )
-        file.write('Author-email: %s\n' % self.get_contact_email() )
-        file.write('License: %s\n' % self.get_license() )
+        self._write_field(file, 'Metadata-Version', version)
+        self._write_field(file, 'Name', self.get_name())
+        self._write_field(file, 'Version', self.get_version())
+        self._write_field(file, 'Summary', self.get_description())
+        self._write_field(file, 'Home-page', self.get_url())
+        self._write_field(file, 'Author', self.get_contact())
+        self._write_field(file, 'Author-email', self.get_contact_email())
+        self._write_field(file, 'License', self.get_license())
         if self.download_url:
-            file.write('Download-URL: %s\n' % self.download_url)
+            self._write_field(file, 'Download-URL', self.download_url)
 
-        long_desc = rfc822_escape( self.get_long_description() )
-        file.write('Description: %s\n' % long_desc)
+        long_desc = rfc822_escape( self.get_long_description())
+        self._write_field(file, 'Description', long_desc)
 
         keywords = string.join( self.get_keywords(), ',')
         if keywords:
-            file.write('Keywords: %s\n' % keywords )
+            self._write_field(file, 'Keywords', keywords)
 
         self._write_list(file, 'Platform', self.get_platforms())
         self._write_list(file, 'Classifier', self.get_classifiers())
@@ -1110,9 +1113,18 @@ def write_pkg_file (self, file):
         self._write_list(file, 'Provides', self.get_provides())
         self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
+    def _write_field(self, file, name, value):
+
+        if isinstance(value, unicode):
+            value = value.encode(PKG_INFO_ENCODING)
+        else:
+            value = str(value)
+        file.write('%s: %s\n' % (name, value))
+
     def _write_list (self, file, name, values):
+
         for value in values:
-            file.write('%s: %s\n' % (name, value))
+            self._write_field(file, name, value)
 
     # -- Metadata query methods ----------------------------------------
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8f1288e9f6..6f5fe9c757 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,3 +1,5 @@
+# -*- coding: latin-1 -*-
+
 """Tests for distutils.dist."""
 
 import distutils.cmd
@@ -95,6 +97,39 @@ def test_command_packages_configfile(self):
         finally:
             os.unlink(TESTFN)
 
+    def test_write_pkg_file(self):
+        # Check DistributionMetadata handling of Unicode fields
+        my_file = os.path.join(os.path.dirname(__file__), 'f')
+        klass = distutils.dist.Distribution
+
+        dist = klass(attrs={'author': u'Mister Café',
+                            'name': 'my.package',
+                            'maintainer': u'Café Junior',
+                            'description': u'Café torréfié',
+                            'long_description': u'Héhéhé'})
+
+
+        # let's make sure the file can be written
+        # with Unicode fields. they are encoded with
+        # PKG_INFO_ENCODING
+        try:
+            dist.metadata.write_pkg_file(open(my_file, 'w'))
+        finally:
+            if os.path.exists(my_file):
+                os.remove(my_file)
+
+        # regular ascii is of course always usable
+        dist = klass(attrs={'author': 'Mister Cafe',
+                            'name': 'my.package',
+                            'maintainer': 'Cafe Junior',
+                            'description': 'Cafe torrefie',
+                            'long_description': 'Hehehe'})
+
+        try:
+            dist.metadata.write_pkg_file(open(my_file, 'w'))
+        finally:
+            if os.path.exists(my_file):
+                os.remove(my_file)
 
 class MetadataTestCase(unittest.TestCase):
 

From a69032e129711e6b10e786a753ba6bde427272fc Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 4 Sep 2008 21:32:09 +0000
Subject: [PATCH 2033/8469] Issue #3160: the "bdist_wininst" distutils command
 didn't work.

Reviewed by Trent Nelson.
---
 command/bdist_wininst.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index ae7d4fde2e..e997e8f094 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -260,13 +260,18 @@ def create_exe(self, arcname, fullname, bitmap=None):
             cfgdata = cfgdata.encode("mbcs")
 
         # Append the pre-install script
-        cfgdata = cfgdata + "\0"
+        cfgdata = cfgdata + b"\0"
         if self.pre_install_script:
-            script_data = open(self.pre_install_script, "r").read()
-            cfgdata = cfgdata + script_data + "\n\0"
+            # We need to normalize newlines, so we open in text mode and
+            # convert back to bytes. "latin1" simply avoids any possible
+            # failures.
+            with open(self.pre_install_script, "r",
+                encoding="latin1") as script:
+                script_data = script.read().encode("latin1")
+            cfgdata = cfgdata + script_data + b"\n\0"
         else:
             # empty pre-install script
-            cfgdata = cfgdata + "\0"
+            cfgdata = cfgdata + b"\0"
         file.write(cfgdata)
 
         # The 'magic number' 0x1234567B is used to make sure that the

From a97c6df7180f7bd58a5fe5415023ed396a1e7d58 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 12 Sep 2008 23:25:57 +0000
Subject: [PATCH 2034/8469] Bumping to 2.6rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 74d0a47d47..b622f7d217 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6b3"
+__version__ = "2.6rc1"
 #--end constants--

From d85f8e8c6760feba91c06d78299f7f3ccd06cf63 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 18 Sep 2008 03:00:28 +0000
Subject: [PATCH 2035/8469] bumping to 3.0rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9af2d9208e..2bc0ab040f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0b3"
+__version__ = "3.0rc1"
 #--end constants--

From 3c15d77130e62f3ce3799cd5e27aa1efea293169 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 18 Sep 2008 03:51:46 +0000
Subject: [PATCH 2036/8469] avoid putting unicode objects in the environment
 causing later test failures.  As discussed on #python-dev

---
 msvc9compiler.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 0b27428d05..804f1751ce 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -357,9 +357,10 @@ def initialize(self, plat_name=None):
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
 
-            self.__paths = vc_env['path'].split(os.pathsep)
-            os.environ['lib'] = vc_env['lib']
-            os.environ['include'] = vc_env['include']
+            # take care to only use strings in the environment.
+            self.__paths = vc_env['path'].encode('mbcs').split(os.pathsep)
+            os.environ['lib'] = vc_env['lib'].encode('mbcs')
+            os.environ['include'] = vc_env['include'].encode('mbcs')
 
             if len(self.__paths) == 0:
                 raise DistutilsPlatformError("Python was built with %s, "

From b4b479dd9b72baf9837af27ee2d31adf0dda6f7e Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 18 Sep 2008 04:33:43 +0000
Subject: [PATCH 2037/8469] Bumping to 2.6rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b622f7d217..fb8043c370 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6rc1"
+__version__ = "2.6rc2"
 #--end constants--

From 2bf49fbe89baac64f6d5487e888385e9797e6164 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 21 Sep 2008 20:48:41 +0000
Subject: [PATCH 2038/8469] Issue #3925: Ignores shutil.rmtree error on cygwin
 too. Reviewed by Benjamin Peterson.

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

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a658f1aa1c..31b8b48185 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -62,8 +62,8 @@ def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
         sys.path = self.sys_path
-        # XXX on Windows the test leaves a directory with xx.pyd in TEMP
-        shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+        # XXX on Windows the test leaves a directory with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
 def test_suite():
     if not sysconfig.python_build:

From 2e2fdd07fefbe699f2978e48c0ea70e51a85eb30 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 21 Sep 2008 20:52:42 +0000
Subject: [PATCH 2039/8469] Merged revisions 66542 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66542 | hirokazu.yamamoto | 2008-09-22 05:48:41 +0900 | 2 lines

  Issue #3925: Ignores shutil.rmtree error on cygwin too.
  Reviewed by Benjamin Peterson.
........
---
 tests/test_build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 20c10745cb..552a3d1440 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -62,8 +62,8 @@ def tearDown(self):
         # Get everything back to normal
         support.unload('xx')
         sys.path = self.sys_path
-        # XXX on Windows the test leaves a directory with xx.pyd in TEMP
-        shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+        # XXX on Windows the test leaves a directory with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
 def test_suite():
     if not sysconfig.python_build:

From 2ffea9b40a52bc8b1f8ee1595969d86d9d87ced7 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 1 Oct 2008 21:46:40 +0000
Subject: [PATCH 2040/8469] Bumping to 2.6 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index fb8043c370..7315a37271 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6rc2"
+__version__ = "2.6"
 #--end constants--

From 9dda0b585406f106ef19ec45b300f89677d0197e Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Sun, 5 Oct 2008 09:00:28 +0000
Subject: [PATCH 2041/8469] Fix [issue4038] py3k error in distutils file_copy
 exception handlers. r=martin.

---
 file_util.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/file_util.py b/file_util.py
index 69190601fb..b46b0da678 100644
--- a/file_util.py
+++ b/file_util.py
@@ -30,31 +30,27 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
         try:
             fsrc = open(src, 'rb')
         except os.error as e:
-            (errno, errstr) = e
-            raise DistutilsFileError("could not open '%s': %s" % (src, errstr))
+            raise DistutilsFileError("could not open '%s': %s" % (src, e.strerror))
 
         if os.path.exists(dst):
             try:
                 os.unlink(dst)
             except os.error as e:
-                (errno, errstr) = e
                 raise DistutilsFileError(
-                      "could not delete '%s': %s" % (dst, errstr))
+                      "could not delete '%s': %s" % (dst, e.strerror))
 
         try:
             fdst = open(dst, 'wb')
         except os.error as e:
-            (errno, errstr) = e
             raise DistutilsFileError(
-                  "could not create '%s': %s" % (dst, errstr))
+                  "could not create '%s': %s" % (dst, e.strerror))
 
         while True:
             try:
                 buf = fsrc.read(buffer_size)
             except os.error as e:
-                (errno, errstr) = e
                 raise DistutilsFileError(
-                      "could not read from '%s': %s" % (src, errstr))
+                      "could not read from '%s': %s" % (src, e.strerror))
 
             if not buf:
                 break
@@ -62,9 +58,8 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
             try:
                 fdst.write(buf)
             except os.error as e:
-                (errno, errstr) = e
                 raise DistutilsFileError(
-                      "could not write to '%s': %s" % (dst, errstr))
+                      "could not write to '%s': %s" % (dst, e.strerror))
     finally:
         if fdst:
             fdst.close()

From f6a06d79d04028e85bc6db7402d2cfbfd8bc0b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 15 Oct 2008 05:58:17 +0000
Subject: [PATCH 2042/8469] Issue #4072: Restore build_py_2to3. Add a distutils
 demo for build_py_2to3.

---
 command/build_py.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 09f6d2331e..77284894ec 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -384,6 +384,18 @@ def byte_compile(self, files):
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
 
+from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+class DistutilsRefactoringTool(RefactoringTool):
+    def log_error(self, msg, *args, **kw):
+        # XXX ignores kw
+        log.error(msg, *args)
+
+    def log_message(self, msg, *args):
+        log.info(msg, *args)
+
+    def log_debug(self, msg, *args):
+        log.debug(msg, *args)
+
 class build_py_2to3(build_py):
     def run(self):
         self.updated_files = []
@@ -396,18 +408,12 @@ def run(self):
             self.build_package_data()
 
         # 2to3
-        from lib2to3.refactor import RefactoringTool
-        class Options:
-            pass
-        o = Options()
-        o.doctests_only = False
-        o.fix = []
-        o.list_fixes = []
-        o.print_function = False
-        o.verbose = False
-        o.write = True
-        r = RefactoringTool(o)
-        r.refactor_args(self.updated_files)
+        fixers = get_fixers_from_package('lib2to3.fixes')
+        options = dict(fix=[], list_fixes=[],
+                       print_function=False, verbose=False,
+                       write=True)
+        r = DistutilsRefactoringTool(fixers, options)
+        r.refactor(self.updated_files, write=True)
 
         # Remaining base class code
         self.byte_compile(self.get_outputs(include_bytecode=0))

From f4beb1d3745aee6654e115b5da14424ff4933a9c Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 6 Nov 2008 03:29:32 +0000
Subject: [PATCH 2043/8469] Bumping to 3.0rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2bc0ab040f..5e4972fd2b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0rc1"
+__version__ = "3.0rc2"
 #--end constants--

From f5f5810be1fccf5d38fe34126b0422079ffd3934 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 8 Nov 2008 15:15:57 +0000
Subject: [PATCH 2044/8469] #4283: fix left-over iteritems() in distutils.

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 0a902cee89..b5c9554d61 100644
--- a/command/install.py
+++ b/command/install.py
@@ -546,7 +546,7 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for name, path in self.config_vars.iteritems():
+        for name, path in self.config_vars.items():
             if path.startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0o700)" % path)
                 os.makedirs(path, 0o700)

From 94f19788a970b7cd603e843207f06ade6f0dbd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 20 Nov 2008 16:21:55 +0000
Subject: [PATCH 2045/8469] Issue #4354: Fix distutils register command.

---
 command/register.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/command/register.py b/command/register.py
index 6d5c459924..045cbb6381 100644
--- a/command/register.py
+++ b/command/register.py
@@ -15,11 +15,6 @@
 from distutils.errors import *
 from distutils import log
 
-def raw_input(prompt):
-    sys.stdout.write(prompt)
-    sys.stdout.flush()
-    return sys.stdin.readline()
-
 class register(PyPIRCCommand):
 
     description = ("register the distribution with the Python package index")
@@ -154,7 +149,7 @@ def send_metadata(self):
  3. have the server generate a new password for you (and email it to you), or
  4. quit
 Your selection [default 1]: ''', end=' ')
-            choice = raw_input()
+            choice = input()
             if not choice:
                 choice = '1'
             elif choice not in choices:
@@ -163,7 +158,7 @@ def send_metadata(self):
         if choice == '1':
             # get the username and password
             while not username:
-                username = raw_input('Username: ')
+                username = input('Username: ')
             while not password:
                 password = getpass.getpass('Password: ')
 
@@ -182,7 +177,7 @@ def send_metadata(self):
                 print('(the login will be stored in %s)' % self._get_rc_file())
                 choice = 'X'
                 while choice.lower() not in 'yn':
-                    choice = raw_input('Save your login (y/N)?')
+                    choice = input('Save your login (y/N)?')
                     if not choice:
                         choice = 'n'
                 if choice.lower() == 'y':
@@ -193,7 +188,7 @@ def send_metadata(self):
             data['name'] = data['password'] = data['email'] = ''
             data['confirm'] = None
             while not data['name']:
-                data['name'] = raw_input('Username: ')
+                data['name'] = input('Username: ')
             while data['password'] != data['confirm']:
                 while not data['password']:
                     data['password'] = getpass.getpass('Password: ')
@@ -204,7 +199,7 @@ def send_metadata(self):
                     data['confirm'] = None
                     print("Password and confirm don't match!")
             while not data['email']:
-                data['email'] = raw_input('   EMail: ')
+                data['email'] = input('   EMail: ')
             code, result = self.post_to_server(data)
             if code != 200:
                 print('Server response (%s): %s'%(code, result))
@@ -215,7 +210,7 @@ def send_metadata(self):
             data = {':action': 'password_reset'}
             data['email'] = ''
             while not data['email']:
-                data['email'] = raw_input('Your email address: ')
+                data['email'] = input('Your email address: ')
             code, result = self.post_to_server(data)
             print('Server response (%s): %s'%(code, result))
 
@@ -262,7 +257,7 @@ def post_to_server(self, data, auth=None):
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                value = str(value).encode("utf-8")
+                value = str(value)
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")
@@ -271,7 +266,7 @@ def post_to_server(self, data, auth=None):
                     body.write('\n')  # write an extra newline (lurve Macs)
         body.write(end_boundary)
         body.write("\n")
-        body = body.getvalue()
+        body = body.getvalue().encode("utf-8")
 
         # build the Request
         headers = {

From 2dd637745910d84b0c7342622a823ed0c3a2cd62 Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Thu, 20 Nov 2008 23:53:46 +0000
Subject: [PATCH 2046/8469] #4338: Fix the distutils "setup.py upload" command.
 The code still mixed bytes and strings.

Reviewed by Martin von Loewis.
---
 command/upload.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 5049f03e93..7ba7f5888a 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -7,11 +7,11 @@
 from distutils.spawn import spawn
 from distutils import log
 from hashlib import md5
-import os
+import os, io
 import socket
 import platform
 import configparser
-import http.client
+import http.client as httpclient
 import base64
 import urllib.parse
 
@@ -113,33 +113,35 @@ def upload_file(self, command, pyversion, filename):
                                      open(filename+".asc").read())
 
         # set up the authentication
-        auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
+        user_pass = (self.username + ":" + self.password).encode('ascii')
+        # The exact encoding of the authentication string is debated.
+        # Anyway PyPI only accepts ascii for both username or password.
+        auth = "Basic " + base64.encodestring(user_pass).strip().decode('ascii')
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = '\n--' + boundary
-        end_boundary = sep_boundary + '--'
-        body = io.StringIO()
+        sep_boundary = b'\n--' + boundary.encode('ascii')
+        end_boundary = sep_boundary + b'--'
+        body = io.BytesIO()
         for key, value in data.items():
+            title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if type(value) != type([]):
                 value = [value]
             for value in value:
                 if type(value) is tuple:
-                    fn = ';filename="%s"' % value[0]
+                    title += '; filename="%s"' % value[0]
                     value = value[1]
                 else:
-                    fn = ""
-                value = str(value)
+                    value = str(value).encode('utf-8')
                 body.write(sep_boundary)
-                body.write('\nContent-Disposition: form-data; name="%s"'%key)
-                body.write(fn)
-                body.write("\n\n")
+                body.write(title.encode('utf-8'))
+                body.write(b"\n\n")
                 body.write(value)
-                if value and value[-1] == '\r':
-                    body.write('\n')  # write an extra newline (lurve Macs)
+                if value and value[-1:] == b'\r':
+                    body.write(b'\n')  # write an extra newline (lurve Macs)
         body.write(end_boundary)
-        body.write("\n")
+        body.write(b"\n")
         body = body.getvalue()
 
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
@@ -152,9 +154,9 @@ def upload_file(self, command, pyversion, filename):
             urllib.parse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
-            http = http.client.HTTPConnection(netloc)
+            http = httpclient.HTTPConnection(netloc)
         elif schema == 'https':
-            http = http.client.HTTPSConnection(netloc)
+            http = httpclient.HTTPSConnection(netloc)
         else:
             raise AssertionError("unsupported schema "+schema)
 

From a122c2880d7b97fac4345692b4d9fedd58bec7b5 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 21 Nov 2008 01:18:21 +0000
Subject: [PATCH 2047/8469] Bump to 3.0rc3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 5e4972fd2b..2cf9d4d304 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0rc2"
+__version__ = "3.0rc3"
 #--end constants--

From c6338dae14e511f967554aaceb5ade0c698327a3 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 25 Nov 2008 21:21:32 +0000
Subject: [PATCH 2048/8469] Second fix for issue #4373

---
 tests/test_build_ext.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 552a3d1440..527529777d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -11,6 +11,10 @@
 import unittest
 from test import support
 
+# http://bugs.python.org/issue4373
+# Don't load the xx module more than once.
+ALREADY_TESTED = False
+
 class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
@@ -23,6 +27,7 @@ def setUp(self):
         shutil.copy(xx_c, self.tmp_dir)
 
     def test_build_ext(self):
+        global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
@@ -45,6 +50,11 @@ def test_build_ext(self):
         finally:
             sys.stdout = old_stdout
 
+        if ALREADY_TESTED:
+            return
+        else:
+            ALREADY_TESTED = True
+
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):

From 3b615290cad279b0375edf204b8c673c0353f27a Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 28 Nov 2008 11:02:32 +0000
Subject: [PATCH 2049/8469] Fixed issue ##3741: DISTUTILS_USE_SDK set causes
 msvc9compiler.py to raise an exception

---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 804f1751ce..4f72e78096 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -316,7 +316,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         self.__version = VERSION
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
-        self.__path = []
+        self.__paths = []
         # target platform (.plat_name is consistent with 'bdist')
         self.plat_name = None
         self.__arch = None # deprecated name

From 6850072391c86bfcfd01c6b0d65762f9d9c45d40 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 28 Nov 2008 11:03:48 +0000
Subject: [PATCH 2050/8469] Merged revisions 67414 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67414 | christian.heimes | 2008-11-28 12:02:32 +0100 (Fri, 28 Nov 2008) | 1 line

  Fixed issue ##3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an exception
........
---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 804f1751ce..4f72e78096 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -316,7 +316,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         self.__version = VERSION
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
-        self.__path = []
+        self.__paths = []
         # target platform (.plat_name is consistent with 'bdist')
         self.plat_name = None
         self.__arch = None # deprecated name

From e32c222776d9dff73e9ba246c7cb654764157bb9 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 28 Nov 2008 11:05:17 +0000
Subject: [PATCH 2051/8469] Merged revisions 67414 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67414 | christian.heimes | 2008-11-28 12:02:32 +0100 (Fri, 28 Nov 2008) | 1 line

  Fixed issue ##3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an exception
........
---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 465013dc33..eced0524b8 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -316,7 +316,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         self.__version = VERSION
         self.__root = r"Software\Microsoft\VisualStudio"
         # self.__macros = MACROS
-        self.__path = []
+        self.__paths = []
         # target platform (.plat_name is consistent with 'bdist')
         self.plat_name = None
         self.__arch = None # deprecated name

From c2ce44619f5637169f3a57efbd9fc6e97f476ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 1 Dec 2008 04:38:52 +0000
Subject: [PATCH 2052/8469] Issue #4073: Add 2to3 support to build_scripts,
 refactor that support in build_py.

---
 command/build_py.py      | 23 +++----------------
 command/build_scripts.py | 15 ++++++++++++-
 util.py                  | 48 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 77284894ec..99d85be96c 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -9,7 +9,7 @@
 
 from distutils.core import Command
 from distutils.errors import *
-from distutils.util import convert_path
+from distutils.util import convert_path, Mixin2to3
 from distutils import log
 
 class build_py (Command):
@@ -384,19 +384,7 @@ def byte_compile(self, files):
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
 
-from lib2to3.refactor import RefactoringTool, get_fixers_from_package
-class DistutilsRefactoringTool(RefactoringTool):
-    def log_error(self, msg, *args, **kw):
-        # XXX ignores kw
-        log.error(msg, *args)
-
-    def log_message(self, msg, *args):
-        log.info(msg, *args)
-
-    def log_debug(self, msg, *args):
-        log.debug(msg, *args)
-
-class build_py_2to3(build_py):
+class build_py_2to3(build_py, Mixin2to3):
     def run(self):
         self.updated_files = []
 
@@ -408,12 +396,7 @@ def run(self):
             self.build_package_data()
 
         # 2to3
-        fixers = get_fixers_from_package('lib2to3.fixes')
-        options = dict(fix=[], list_fixes=[],
-                       print_function=False, verbose=False,
-                       write=True)
-        r = DistutilsRefactoringTool(fixers, options)
-        r.refactor(self.updated_files, write=True)
+        self.run_2to3(self.updated_files)
 
         # Remaining base class code
         self.byte_compile(self.get_outputs(include_bytecode=0))
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 3ac5b0c0be..dc04a9fcdb 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -9,7 +9,7 @@
 from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
-from distutils.util import convert_path
+from distutils.util import convert_path, Mixin2to3
 from distutils import log
 
 # check if Python is called on the first line with this expression
@@ -59,6 +59,7 @@ def copy_scripts(self):
         """
         self.mkpath(self.build_dir)
         outfiles = []
+        updated_files = []
         for script in self.scripts:
             adjust = False
             script = convert_path(script)
@@ -92,6 +93,7 @@ def copy_scripts(self):
             if adjust:
                 log.info("copying and adjusting %s -> %s", script,
                          self.build_dir)
+                updated_files.append(outfile)
                 if not self.dry_run:
                     outf = open(outfile, "w")
                     if not sysconfig.python_build:
@@ -112,6 +114,7 @@ def copy_scripts(self):
             else:
                 if f:
                     f.close()
+                updated_files.append(outfile)
                 self.copy_file(script, outfile)
 
         if os.name == 'posix':
@@ -125,3 +128,13 @@ def copy_scripts(self):
                         log.info("changing mode of %s from %o to %o",
                                  file, oldmode, newmode)
                         os.chmod(file, newmode)
+        # XXX should we modify self.outfiles?
+        return outfiles, updated_files
+
+class build_scripts_2to3(build_scripts, Mixin2to3):
+
+    def copy_scripts(self):
+        outfiles, updated_files = build_scripts.copy_scripts(self)
+        if not self.dry_run:
+            self.run_2to3(updated_files)
+        return outfiles, updated_files
diff --git a/util.py b/util.py
index b87dfbe065..28337fa9a0 100644
--- a/util.py
+++ b/util.py
@@ -531,3 +531,51 @@ def rfc822_escape (header):
     lines = [x.strip() for x in header.split('\n')]
     sep = '\n' + 8*' '
     return sep.join(lines)
+
+# 2to3 support
+
+def run_2to3(files, fixer_names=None, options=None, explicit=None):
+    """Invoke 2to3 on a list of Python files.
+    The files should all come from the build area, as the
+    modification is done in-place. To reduce the build time,
+    only files modified since the last invocation of this
+    function should be passed in the files argument."""
+
+    if not files:
+        return
+
+    # Make this class local, to delay import of 2to3
+    from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+    class DistutilsRefactoringTool(RefactoringTool):
+        def log_error(self, msg, *args, **kw):
+            log.error(msg, *args)
+
+        def log_message(self, msg, *args):
+            log.info(msg, *args)
+
+        def log_debug(self, msg, *args):
+            log.debug(msg, *args)
+
+    if fixer_names is None:
+        fixer_names = get_fixers_from_package('lib2to3.fixes')
+    r = DistutilsRefactoringTool(fixer_names, options=options)
+    r.refactor(files, write=True)
+
+class Mixin2to3:
+    '''Mixin class for commands that run 2to3.
+    To configure 2to3, setup scripts may either change
+    the class variables, or inherit from individual commands
+    to override how 2to3 is invoked.'''
+
+    # provide list of fixers to run;
+    # defaults to all from lib2to3.fixers
+    fixer_names = None
+
+    # options dictionary
+    options = None
+
+    # list of fixers to invoke even though they are marked as explicit
+    explicit = None
+
+    def run_2to3(self, files):
+        return run_2to3(files, self.fixer_names, self.options, self.explicit)

From e55ca00608e5c34e302a4ad0fc367fa55fd5cadb Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 3 Dec 2008 16:46:14 +0000
Subject: [PATCH 2053/8469] Prep for Python 3.1!

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2cf9d4d304..34fc008a58 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0rc3"
+__version__ = "3.1a0"
 #--end constants--

From 78ad69e50bbf4f0948621c9805a65936b5bcee2e Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 4 Dec 2008 02:59:51 +0000
Subject: [PATCH 2054/8469] Prep for 2.6.1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7315a37271..8f7eb8427d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6"
+__version__ = "2.6.1"
 #--end constants--

From 30a3850d75b9050b79a65a4da14c58401e495443 Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Thu, 11 Dec 2008 00:03:42 +0000
Subject: [PATCH 2055/8469] #1030250: correctly pass the dry_run option to the
 mkpath() function.

---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 0ed9a40a35..87d6e27396 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1041,7 +1041,7 @@ def move_file (self, src, dst):
         return move_file (src, dst, dry_run=self.dry_run)
 
     def mkpath (self, name, mode=0777):
-        mkpath (name, mode, self.dry_run)
+        mkpath (name, mode, dry_run=self.dry_run)
 
 
 # class CCompiler

From 73b7309d54071194b72b68c783eded336f96d9fb Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Dec 2008 00:06:59 +0000
Subject: [PATCH 2056/8469] Merged revisions
 67654,67676-67677,67681,67692,67725,67761,67784-67785,67787-67788,67802,67848-67850,67862-67864,67880,67882
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67654 | georg.brandl | 2008-12-07 16:42:09 -0600 (Sun, 07 Dec 2008) | 2 lines

  #4457: rewrite __import__() documentation.
........
  r67676 | benjamin.peterson | 2008-12-08 20:03:03 -0600 (Mon, 08 Dec 2008) | 1 line

  specify how things are copied
........
  r67677 | benjamin.peterson | 2008-12-08 20:05:11 -0600 (Mon, 08 Dec 2008) | 1 line

  revert unrelated change to installer script
........
  r67681 | jeremy.hylton | 2008-12-09 15:03:10 -0600 (Tue, 09 Dec 2008) | 2 lines

  Add simple unittests for Request
........
  r67692 | amaury.forgeotdarc | 2008-12-10 18:03:42 -0600 (Wed, 10 Dec 2008) | 2 lines

  #1030250: correctly pass the dry_run option to the mkpath() function.
........
  r67725 | benjamin.peterson | 2008-12-12 22:02:20 -0600 (Fri, 12 Dec 2008) | 1 line

  fix incorrect example
........
  r67761 | benjamin.peterson | 2008-12-14 11:26:04 -0600 (Sun, 14 Dec 2008) | 1 line

  fix missing bracket
........
  r67784 | georg.brandl | 2008-12-15 02:33:58 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4446: document "platforms" argument for setup().
........
  r67785 | georg.brandl | 2008-12-15 02:36:11 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4611: fix typo.
........
  r67787 | georg.brandl | 2008-12-15 02:58:59 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4578: fix has_key() usage in compiler package.
........
  r67788 | georg.brandl | 2008-12-15 03:07:39 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4568: remove limitation in varargs callback example.
........
  r67802 | amaury.forgeotdarc | 2008-12-15 16:29:14 -0600 (Mon, 15 Dec 2008) | 4 lines

  #3632: the "pyo" macro from gdbinit can now run when the GIL is released.

  Patch by haypo.
........
  r67848 | benjamin.peterson | 2008-12-18 20:28:56 -0600 (Thu, 18 Dec 2008) | 1 line

  fix typo
........
  r67849 | benjamin.peterson | 2008-12-18 20:31:35 -0600 (Thu, 18 Dec 2008) | 1 line

  _call_method -> _callmethod and _get_value to _getvalue
........
  r67850 | raymond.hettinger | 2008-12-19 03:06:07 -0600 (Fri, 19 Dec 2008) | 9 lines

  Fix-up and clean-up docs for int.bit_length().

  * Replace dramatic footnote with in-line comment about possible round-off errors in logarithms of large numbers.
  * Add comments to the pure python code equivalent.
  * replace floor() with int() in the mathematical equivalent so the type is correct (should be an int, not a float).
  * add abs() to the mathematical equivalent so that it matches the previous line that it is supposed to be equivalent to.
  * make one combined example with a negative input.
........
  r67862 | benjamin.peterson | 2008-12-19 20:48:02 -0600 (Fri, 19 Dec 2008) | 1 line

  copy sentence from docstring
........
  r67863 | benjamin.peterson | 2008-12-19 20:51:26 -0600 (Fri, 19 Dec 2008) | 1 line

  add headings
........
  r67864 | benjamin.peterson | 2008-12-19 20:57:19 -0600 (Fri, 19 Dec 2008) | 1 line

  beef up docstring
........
  r67880 | benjamin.peterson | 2008-12-20 16:49:24 -0600 (Sat, 20 Dec 2008) | 1 line

  remove redundant sentence
........
  r67882 | benjamin.peterson | 2008-12-20 16:59:49 -0600 (Sat, 20 Dec 2008) | 1 line

  add some recent releases to the list
........
---
 ccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 1e09123afc..f5d1587d72 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -984,8 +984,8 @@ def spawn(self, cmd):
     def move_file(self, src, dst):
         return move_file(src, dst, dry_run=self.dry_run)
 
-    def mkpath(self, name, mode=0o777):
-        mkpath(name, mode, self.dry_run)
+    def mkpath (self, name, mode=0o777):
+        mkpath(name, mode, dry_run=self.dry_run)
 
 
 # Map a sys.platform/os.name ('posix', 'nt') to the default compiler

From 058256f5d77a12162cd5ffd6d5249a53b7f44add Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Dec 2008 17:01:26 +0000
Subject: [PATCH 2057/8469] Merged revisions
 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

................
  r67654 | georg.brandl | 2008-12-07 16:42:09 -0600 (Sun, 07 Dec 2008) | 2 lines

  #4457: rewrite __import__() documentation.
................
  r67676 | benjamin.peterson | 2008-12-08 20:03:03 -0600 (Mon, 08 Dec 2008) | 1 line

  specify how things are copied
................
  r67677 | benjamin.peterson | 2008-12-08 20:05:11 -0600 (Mon, 08 Dec 2008) | 1 line

  revert unrelated change to installer script
................
  r67681 | jeremy.hylton | 2008-12-09 15:03:10 -0600 (Tue, 09 Dec 2008) | 2 lines

  Add simple unittests for Request
................
  r67692 | amaury.forgeotdarc | 2008-12-10 18:03:42 -0600 (Wed, 10 Dec 2008) | 2 lines

  #1030250: correctly pass the dry_run option to the mkpath() function.
................
  r67725 | benjamin.peterson | 2008-12-12 22:02:20 -0600 (Fri, 12 Dec 2008) | 1 line

  fix incorrect example
................
  r67746 | antoine.pitrou | 2008-12-13 17:12:30 -0600 (Sat, 13 Dec 2008) | 3 lines

  Issue #4163: Use unicode-friendly word splitting in the textwrap functions when given an unicode string.
................
  r67748 | benjamin.peterson | 2008-12-13 19:46:11 -0600 (Sat, 13 Dec 2008) | 1 line

  remove has_key usage
................
  r67761 | benjamin.peterson | 2008-12-14 11:26:04 -0600 (Sun, 14 Dec 2008) | 1 line

  fix missing bracket
................
  r67784 | georg.brandl | 2008-12-15 02:33:58 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4446: document "platforms" argument for setup().
................
  r67785 | georg.brandl | 2008-12-15 02:36:11 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4611: fix typo.
................
  r67787 | georg.brandl | 2008-12-15 02:58:59 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4578: fix has_key() usage in compiler package.
................
  r67788 | georg.brandl | 2008-12-15 03:07:39 -0600 (Mon, 15 Dec 2008) | 2 lines

  #4568: remove limitation in varargs callback example.
................
  r67802 | amaury.forgeotdarc | 2008-12-15 16:29:14 -0600 (Mon, 15 Dec 2008) | 4 lines

  #3632: the "pyo" macro from gdbinit can now run when the GIL is released.

  Patch by haypo.
................
  r67832 | antoine.pitrou | 2008-12-17 16:46:54 -0600 (Wed, 17 Dec 2008) | 4 lines

  Issue #2467: gc.DEBUG_STATS reports invalid elapsed times.
  Patch by Neil Schemenauer, very slightly modified.
................
  r67848 | benjamin.peterson | 2008-12-18 20:28:56 -0600 (Thu, 18 Dec 2008) | 1 line

  fix typo
................
  r67849 | benjamin.peterson | 2008-12-18 20:31:35 -0600 (Thu, 18 Dec 2008) | 1 line

  _call_method -> _callmethod and _get_value to _getvalue
................
  r67859 | amaury.forgeotdarc | 2008-12-19 16:56:48 -0600 (Fri, 19 Dec 2008) | 4 lines

  #4700: crtlicense.txt is displayed by the license() command and should be kept ascii-only.

  Will port to 3.0
................
  r67862 | benjamin.peterson | 2008-12-19 20:48:02 -0600 (Fri, 19 Dec 2008) | 1 line

  copy sentence from docstring
................
  r67863 | benjamin.peterson | 2008-12-19 20:51:26 -0600 (Fri, 19 Dec 2008) | 1 line

  add headings
................
  r67864 | benjamin.peterson | 2008-12-19 20:57:19 -0600 (Fri, 19 Dec 2008) | 1 line

  beef up docstring
................
  r67880 | benjamin.peterson | 2008-12-20 16:49:24 -0600 (Sat, 20 Dec 2008) | 1 line

  remove redundant sentence
................
  r67882 | benjamin.peterson | 2008-12-20 16:59:49 -0600 (Sat, 20 Dec 2008) | 1 line

  add some recent releases to the list
................
  r67885 | benjamin.peterson | 2008-12-20 17:48:54 -0600 (Sat, 20 Dec 2008) | 1 line

  silence annoying DeprecationWarning
................
  r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line

  sphinx.web is long gone
................
  r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line

  update readme
................
  r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line

  there are way too many places which need to have the current version added
................
  r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines

  Merged revisions 67809 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line

    fix logic error
  ........
................
  r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines

  Add Tarek for work on distutils.
................
---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 0ed9a40a35..87d6e27396 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1041,7 +1041,7 @@ def move_file (self, src, dst):
         return move_file (src, dst, dry_run=self.dry_run)
 
     def mkpath (self, name, mode=0777):
-        mkpath (name, mode, self.dry_run)
+        mkpath (name, mode, dry_run=self.dry_run)
 
 
 # class CCompiler

From 0bcdf06224e998e958d9fc01aa27eb2655cbe6b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 24 Dec 2008 19:10:05 +0000
Subject: [PATCH 2058/8469] fixed #4400 : distutils .pypirc default generated
 file was broken.

---
 command/register.py    |  16 ++++--
 config.py              |   4 +-
 tests/test_config.py   |  29 +++++++++++
 tests/test_register.py | 109 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 tests/test_register.py

diff --git a/command/register.py b/command/register.py
index a9ab361a17..bf7be96096 100644
--- a/command/register.py
+++ b/command/register.py
@@ -141,12 +141,14 @@ def send_metadata(self):
         # get the user's login info
         choices = '1 2 3 4'.split()
         while choice not in choices:
-            print '''We need to know who you are, so please choose either:
+            self.announce('''\
+We need to know who you are, so please choose either:
  1. use your existing login,
  2. register as a new user,
  3. have the server generate a new password for you (and email it to you), or
  4. quit
-Your selection [default 1]: ''',
+Your selection [default 1]: ''', log.INFO)
+
             choice = raw_input()
             if not choice:
                 choice = '1'
@@ -167,12 +169,16 @@ def send_metadata(self):
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s' % (code, result)
+            self.announce('Server response (%s): %s' % (code, result),
+                          log.INFO)
 
             # possibly save the login
             if not self.has_config and code == 200:
-                print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)' % self._get_rc_file()
+                self.announce(('I can store your PyPI login so future '
+                               'submissions will be faster.'), log.INFO)
+                self.announce('(the login will be stored in %s)' % \
+                              self._get_rc_file(), log.INFO)
+
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
diff --git a/config.py b/config.py
index e3a4c57e33..4186c9b1d8 100644
--- a/config.py
+++ b/config.py
@@ -10,8 +10,8 @@
 from distutils.cmd import Command
 
 DEFAULT_PYPIRC = """\
-[pypirc]
-servers =
+[distutils]
+index-servers =
     pypi
 
 [pypi]
diff --git a/tests/test_config.py b/tests/test_config.py
index bfce3e3e72..cae7689884 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -5,6 +5,8 @@
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
+from distutils.log import set_threshold
+from distutils.log import WARN
 
 from distutils.tests import support
 
@@ -32,6 +34,17 @@
 password:secret
 """
 
+WANTED = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+
 class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
@@ -53,6 +66,7 @@ def initialize_options(self):
             finalize_options = initialize_options
 
         self._cmd = command
+        self.old_threshold = set_threshold(WARN)
 
     def tearDown(self):
         """Removes the patch."""
@@ -62,6 +76,7 @@ def tearDown(self):
             os.environ['HOME'] = self._old_home
         if os.path.exists(self.rc):
             os.remove(self.rc)
+        set_threshold(self.old_threshold)
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
@@ -98,6 +113,20 @@ def test_server_registration(self):
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEquals(config, waited)
 
+    def test_server_empty_registration(self):
+
+        cmd = self._cmd(self.dist)
+        rc = cmd._get_rc_file()
+        self.assert_(not os.path.exists(rc))
+
+        cmd._store_pypirc('tarek', 'xxx')
+
+        self.assert_(os.path.exists(rc))
+        content = open(rc).read()
+
+        self.assertEquals(content, WANTED)
+
+
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
diff --git a/tests/test_register.py b/tests/test_register.py
new file mode 100644
index 0000000000..3a3a3b739b
--- /dev/null
+++ b/tests/test_register.py
@@ -0,0 +1,109 @@
+"""Tests for distutils.command.register."""
+import sys
+import os
+import unittest
+
+from distutils.command.register import register
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+class RawInputs(object):
+    """Fakes user inputs."""
+    def __init__(self, *answers):
+        self.answers = answers
+        self.index = 0
+
+    def __call__(self, prompt=''):
+        try:
+            return self.answers[self.index]
+        finally:
+            self.index += 1
+
+WANTED_PYPIRC = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+class registerTestCase(PyPIRCCommandTestCase):
+
+    def test_create_pypirc(self):
+        # this test makes sure a .pypirc file
+        # is created when requested.
+
+        # let's create a fake distribution
+        # and a register instance
+        dist = Distribution()
+        dist.metadata.url = 'xxx'
+        dist.metadata.author = 'xxx'
+        dist.metadata.author_email = 'xxx'
+        dist.metadata.name = 'xxx'
+        dist.metadata.version =  'xxx'
+        cmd = register(dist)
+
+        # we shouldn't have a .pypirc file yet
+        self.assert_(not os.path.exists(self.rc))
+
+        # patching raw_input and getpass.getpass
+        # so register gets happy
+        #
+        # Here's what we are faking :
+        # use your existing login (choice 1.)
+        # Username : 'tarek'
+        # Password : 'xxx'
+        # Save your login (y/N)? : 'y'
+        inputs = RawInputs('1', 'tarek', 'y')
+        from distutils.command import register as register_module
+        register_module.raw_input = inputs.__call__
+        def _getpass(prompt):
+            return 'xxx'
+        register_module.getpass.getpass = _getpass
+        class FakeServer(object):
+            def __init__(self):
+                self.calls = []
+
+            def __call__(self, *args):
+                # we want to compare them, so let's store
+                # something comparable
+                els = args[0].items()
+                els.sort()
+                self.calls.append(tuple(els))
+                return 200, 'OK'
+
+        cmd.post_to_server = pypi_server = FakeServer()
+
+        # let's run the command
+        cmd.run()
+
+        # we should have a brand new .pypirc file
+        self.assert_(os.path.exists(self.rc))
+
+        # with the content similar to WANTED_PYPIRC
+        content = open(self.rc).read()
+        self.assertEquals(content, WANTED_PYPIRC)
+
+        # now let's make sure the .pypirc file generated
+        # really works : we shouldn't be asked anything
+        # if we run the command again
+        def _no_way(prompt=''):
+            raise AssertionError(prompt)
+        register_module.raw_input = _no_way
+
+        cmd.run()
+
+        # let's see what the server received : we should
+        # have 2 similar requests
+        self.assert_(len(pypi_server.calls), 2)
+        self.assert_(pypi_server.calls[0], pypi_server.calls[1])
+
+def test_suite():
+    return unittest.makeSuite(registerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 2f485bf7a6d9627d79b9ba753a6a68d8d142eeeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 27 Dec 2008 13:28:42 +0000
Subject: [PATCH 2059/8469] Merged revisions 67926 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67926 | tarek.ziade | 2008-12-24 20:10:05 +0100 (Wed, 24 Dec 2008) | 1 line

  fixed #4400 : distutils .pypirc default generated file was broken.
........
---
 command/register.py    |  16 ++++--
 config.py              |   4 +-
 tests/test_config.py   |  29 +++++++++++
 tests/test_register.py | 109 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 tests/test_register.py

diff --git a/command/register.py b/command/register.py
index a9ab361a17..bf7be96096 100644
--- a/command/register.py
+++ b/command/register.py
@@ -141,12 +141,14 @@ def send_metadata(self):
         # get the user's login info
         choices = '1 2 3 4'.split()
         while choice not in choices:
-            print '''We need to know who you are, so please choose either:
+            self.announce('''\
+We need to know who you are, so please choose either:
  1. use your existing login,
  2. register as a new user,
  3. have the server generate a new password for you (and email it to you), or
  4. quit
-Your selection [default 1]: ''',
+Your selection [default 1]: ''', log.INFO)
+
             choice = raw_input()
             if not choice:
                 choice = '1'
@@ -167,12 +169,16 @@ def send_metadata(self):
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print 'Server response (%s): %s' % (code, result)
+            self.announce('Server response (%s): %s' % (code, result),
+                          log.INFO)
 
             # possibly save the login
             if not self.has_config and code == 200:
-                print 'I can store your PyPI login so future submissions will be faster.'
-                print '(the login will be stored in %s)' % self._get_rc_file()
+                self.announce(('I can store your PyPI login so future '
+                               'submissions will be faster.'), log.INFO)
+                self.announce('(the login will be stored in %s)' % \
+                              self._get_rc_file(), log.INFO)
+
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = raw_input('Save your login (y/N)?')
diff --git a/config.py b/config.py
index e3a4c57e33..4186c9b1d8 100644
--- a/config.py
+++ b/config.py
@@ -10,8 +10,8 @@
 from distutils.cmd import Command
 
 DEFAULT_PYPIRC = """\
-[pypirc]
-servers =
+[distutils]
+index-servers =
     pypi
 
 [pypi]
diff --git a/tests/test_config.py b/tests/test_config.py
index bfce3e3e72..cae7689884 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -5,6 +5,8 @@
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
+from distutils.log import set_threshold
+from distutils.log import WARN
 
 from distutils.tests import support
 
@@ -32,6 +34,17 @@
 password:secret
 """
 
+WANTED = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+
 class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
@@ -53,6 +66,7 @@ def initialize_options(self):
             finalize_options = initialize_options
 
         self._cmd = command
+        self.old_threshold = set_threshold(WARN)
 
     def tearDown(self):
         """Removes the patch."""
@@ -62,6 +76,7 @@ def tearDown(self):
             os.environ['HOME'] = self._old_home
         if os.path.exists(self.rc):
             os.remove(self.rc)
+        set_threshold(self.old_threshold)
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
@@ -98,6 +113,20 @@ def test_server_registration(self):
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEquals(config, waited)
 
+    def test_server_empty_registration(self):
+
+        cmd = self._cmd(self.dist)
+        rc = cmd._get_rc_file()
+        self.assert_(not os.path.exists(rc))
+
+        cmd._store_pypirc('tarek', 'xxx')
+
+        self.assert_(os.path.exists(rc))
+        content = open(rc).read()
+
+        self.assertEquals(content, WANTED)
+
+
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
diff --git a/tests/test_register.py b/tests/test_register.py
new file mode 100644
index 0000000000..3a3a3b739b
--- /dev/null
+++ b/tests/test_register.py
@@ -0,0 +1,109 @@
+"""Tests for distutils.command.register."""
+import sys
+import os
+import unittest
+
+from distutils.command.register import register
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+class RawInputs(object):
+    """Fakes user inputs."""
+    def __init__(self, *answers):
+        self.answers = answers
+        self.index = 0
+
+    def __call__(self, prompt=''):
+        try:
+            return self.answers[self.index]
+        finally:
+            self.index += 1
+
+WANTED_PYPIRC = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+class registerTestCase(PyPIRCCommandTestCase):
+
+    def test_create_pypirc(self):
+        # this test makes sure a .pypirc file
+        # is created when requested.
+
+        # let's create a fake distribution
+        # and a register instance
+        dist = Distribution()
+        dist.metadata.url = 'xxx'
+        dist.metadata.author = 'xxx'
+        dist.metadata.author_email = 'xxx'
+        dist.metadata.name = 'xxx'
+        dist.metadata.version =  'xxx'
+        cmd = register(dist)
+
+        # we shouldn't have a .pypirc file yet
+        self.assert_(not os.path.exists(self.rc))
+
+        # patching raw_input and getpass.getpass
+        # so register gets happy
+        #
+        # Here's what we are faking :
+        # use your existing login (choice 1.)
+        # Username : 'tarek'
+        # Password : 'xxx'
+        # Save your login (y/N)? : 'y'
+        inputs = RawInputs('1', 'tarek', 'y')
+        from distutils.command import register as register_module
+        register_module.raw_input = inputs.__call__
+        def _getpass(prompt):
+            return 'xxx'
+        register_module.getpass.getpass = _getpass
+        class FakeServer(object):
+            def __init__(self):
+                self.calls = []
+
+            def __call__(self, *args):
+                # we want to compare them, so let's store
+                # something comparable
+                els = args[0].items()
+                els.sort()
+                self.calls.append(tuple(els))
+                return 200, 'OK'
+
+        cmd.post_to_server = pypi_server = FakeServer()
+
+        # let's run the command
+        cmd.run()
+
+        # we should have a brand new .pypirc file
+        self.assert_(os.path.exists(self.rc))
+
+        # with the content similar to WANTED_PYPIRC
+        content = open(self.rc).read()
+        self.assertEquals(content, WANTED_PYPIRC)
+
+        # now let's make sure the .pypirc file generated
+        # really works : we shouldn't be asked anything
+        # if we run the command again
+        def _no_way(prompt=''):
+            raise AssertionError(prompt)
+        register_module.raw_input = _no_way
+
+        cmd.run()
+
+        # let's see what the server received : we should
+        # have 2 similar requests
+        self.assert_(len(pypi_server.calls), 2)
+        self.assert_(pypi_server.calls[0], pypi_server.calls[1])
+
+def test_suite():
+    return unittest.makeSuite(registerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a89c58deedd83e10acf51ce48c0a8ee9b753cc98 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Dec 2008 16:00:54 +0000
Subject: [PATCH 2060/8469] Merged revisions
 67889-67892,67895,67898,67904-67907,67912,67918,67920-67921,67923-67924,67926-67927,67930,67943
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

................
  r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line

  sphinx.web is long gone
................
  r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line

  update readme
................
  r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line

  there are way too many places which need to have the current version added
................
  r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines

  Merged revisions 67809 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line

    fix logic error
  ........
................
  r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines

  Add Tarek for work on distutils.
................
  r67898 | benjamin.peterson | 2008-12-21 15:00:53 -0600 (Sun, 21 Dec 2008) | 1 line

  compute DISTVERSION with patchlevel.py
................
  r67904 | benjamin.peterson | 2008-12-22 14:44:58 -0600 (Mon, 22 Dec 2008) | 1 line

  less attitude
................
  r67905 | benjamin.peterson | 2008-12-22 14:51:15 -0600 (Mon, 22 Dec 2008) | 1 line

  fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
................
  r67906 | benjamin.peterson | 2008-12-22 14:52:53 -0600 (Mon, 22 Dec 2008) | 1 line

  add NEWS note
................
  r67907 | benjamin.peterson | 2008-12-22 16:12:19 -0600 (Mon, 22 Dec 2008) | 1 line

  silence compiler warning
................
  r67912 | georg.brandl | 2008-12-23 06:37:21 -0600 (Tue, 23 Dec 2008) | 2 lines

  Fix missing "svn" command.
................
  r67918 | georg.brandl | 2008-12-23 09:44:25 -0600 (Tue, 23 Dec 2008) | 2 lines

  Markup fix.
................
  r67920 | benjamin.peterson | 2008-12-23 14:09:28 -0600 (Tue, 23 Dec 2008) | 1 line

  use a global variable, so the compiler doesn't optimize the assignment out
................
  r67921 | benjamin.peterson | 2008-12-23 14:12:33 -0600 (Tue, 23 Dec 2008) | 1 line

  make global static
................
  r67923 | benjamin.peterson | 2008-12-24 09:10:27 -0600 (Wed, 24 Dec 2008) | 1 line

  #4736 BufferRWPair.closed shouldn't try to call another property as a function
................
  r67924 | benjamin.peterson | 2008-12-24 10:10:05 -0600 (Wed, 24 Dec 2008) | 1 line

  pretend exceptions don't exist a while longer
................
  r67926 | tarek.ziade | 2008-12-24 13:10:05 -0600 (Wed, 24 Dec 2008) | 1 line

  fixed #4400 : distutils .pypirc default generated file was broken.
................
  r67927 | benjamin.peterson | 2008-12-26 17:26:30 -0600 (Fri, 26 Dec 2008) | 1 line

  python version is included in file name now
................
  r67930 | hirokazu.yamamoto | 2008-12-26 22:19:48 -0600 (Fri, 26 Dec 2008) | 2 lines

  Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
  (There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
................
  r67943 | alexandre.vassalotti | 2008-12-27 04:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines

  Fix bogus unicode tests in pickletester.
................
---
 command/register.py    |  17 ++++---
 config.py              |   4 +-
 tests/test_config.py   |  29 +++++++++++
 tests/test_register.py | 109 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 8 deletions(-)
 create mode 100644 tests/test_register.py

diff --git a/command/register.py b/command/register.py
index 045cbb6381..bd9b8c0143 100644
--- a/command/register.py
+++ b/command/register.py
@@ -143,13 +143,14 @@ def send_metadata(self):
         # get the user's login info
         choices = '1 2 3 4'.split()
         while choice not in choices:
-            print('''We need to know who you are, so please choose either:
+            self.announce('''\
+We need to know who you are, so please choose either:
  1. use your existing login,
  2. register as a new user,
  3. have the server generate a new password for you (and email it to you), or
  4. quit
-Your selection [default 1]: ''', end=' ')
-            choice = input()
+Your selection [default 1]: ''', log.INFO)
+            choice = raw_input()
             if not choice:
                 choice = '1'
             elif choice not in choices:
@@ -169,12 +170,16 @@ def send_metadata(self):
             # send the info to the server and report the result
             code, result = self.post_to_server(self.build_post_data('submit'),
                 auth)
-            print('Server response (%s): %s'%(code, result))
+            self.announce('Server response (%s): %s' % (code, result),
+                          log.INFO)
 
             # possibly save the login
             if not self.has_config and code == 200:
-                print('I can store your PyPI login so future submissions will be faster.')
-                print('(the login will be stored in %s)' % self._get_rc_file())
+                self.announce(('I can store your PyPI login so future '
+                               'submissions will be faster.'), log.INFO)
+                self.announce('(the login will be stored in %s)' % \
+                              self._get_rc_file(), log.INFO)
+
                 choice = 'X'
                 while choice.lower() not in 'yn':
                     choice = input('Save your login (y/N)?')
diff --git a/config.py b/config.py
index 0ecfe0cc34..73f326047a 100644
--- a/config.py
+++ b/config.py
@@ -10,8 +10,8 @@
 from distutils.cmd import Command
 
 DEFAULT_PYPIRC = """\
-[pypirc]
-servers =
+[distutils]
+index-servers =
     pypi
 
 [pypi]
diff --git a/tests/test_config.py b/tests/test_config.py
index 016ba4cc70..bdc9b2b539 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -5,6 +5,8 @@
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
+from distutils.log import set_threshold
+from distutils.log import WARN
 
 from distutils.tests import support
 
@@ -32,6 +34,17 @@
 password:secret
 """
 
+WANTED = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+
 class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
@@ -53,6 +66,7 @@ def initialize_options(self):
             finalize_options = initialize_options
 
         self._cmd = command
+        self.old_threshold = set_threshold(WARN)
 
     def tearDown(self):
         """Removes the patch."""
@@ -62,6 +76,7 @@ def tearDown(self):
             os.environ['HOME'] = self._old_home
         if os.path.exists(self.rc):
             os.remove(self.rc)
+        set_threshold(self.old_threshold)
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
@@ -96,6 +111,20 @@ def test_server_registration(self):
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEquals(config, waited)
 
+    def test_server_empty_registration(self):
+
+        cmd = self._cmd(self.dist)
+        rc = cmd._get_rc_file()
+        self.assert_(not os.path.exists(rc))
+
+        cmd._store_pypirc('tarek', 'xxx')
+
+        self.assert_(os.path.exists(rc))
+        content = open(rc).read()
+
+        self.assertEquals(content, WANTED)
+
+
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
diff --git a/tests/test_register.py b/tests/test_register.py
new file mode 100644
index 0000000000..3a3a3b739b
--- /dev/null
+++ b/tests/test_register.py
@@ -0,0 +1,109 @@
+"""Tests for distutils.command.register."""
+import sys
+import os
+import unittest
+
+from distutils.command.register import register
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+class RawInputs(object):
+    """Fakes user inputs."""
+    def __init__(self, *answers):
+        self.answers = answers
+        self.index = 0
+
+    def __call__(self, prompt=''):
+        try:
+            return self.answers[self.index]
+        finally:
+            self.index += 1
+
+WANTED_PYPIRC = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:xxx
+"""
+
+class registerTestCase(PyPIRCCommandTestCase):
+
+    def test_create_pypirc(self):
+        # this test makes sure a .pypirc file
+        # is created when requested.
+
+        # let's create a fake distribution
+        # and a register instance
+        dist = Distribution()
+        dist.metadata.url = 'xxx'
+        dist.metadata.author = 'xxx'
+        dist.metadata.author_email = 'xxx'
+        dist.metadata.name = 'xxx'
+        dist.metadata.version =  'xxx'
+        cmd = register(dist)
+
+        # we shouldn't have a .pypirc file yet
+        self.assert_(not os.path.exists(self.rc))
+
+        # patching raw_input and getpass.getpass
+        # so register gets happy
+        #
+        # Here's what we are faking :
+        # use your existing login (choice 1.)
+        # Username : 'tarek'
+        # Password : 'xxx'
+        # Save your login (y/N)? : 'y'
+        inputs = RawInputs('1', 'tarek', 'y')
+        from distutils.command import register as register_module
+        register_module.raw_input = inputs.__call__
+        def _getpass(prompt):
+            return 'xxx'
+        register_module.getpass.getpass = _getpass
+        class FakeServer(object):
+            def __init__(self):
+                self.calls = []
+
+            def __call__(self, *args):
+                # we want to compare them, so let's store
+                # something comparable
+                els = args[0].items()
+                els.sort()
+                self.calls.append(tuple(els))
+                return 200, 'OK'
+
+        cmd.post_to_server = pypi_server = FakeServer()
+
+        # let's run the command
+        cmd.run()
+
+        # we should have a brand new .pypirc file
+        self.assert_(os.path.exists(self.rc))
+
+        # with the content similar to WANTED_PYPIRC
+        content = open(self.rc).read()
+        self.assertEquals(content, WANTED_PYPIRC)
+
+        # now let's make sure the .pypirc file generated
+        # really works : we shouldn't be asked anything
+        # if we run the command again
+        def _no_way(prompt=''):
+            raise AssertionError(prompt)
+        register_module.raw_input = _no_way
+
+        cmd.run()
+
+        # let's see what the server received : we should
+        # have 2 similar requests
+        self.assert_(len(pypi_server.calls), 2)
+        self.assert_(pypi_server.calls[0], pypi_server.calls[1])
+
+def test_suite():
+    return unittest.makeSuite(registerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 326cd6e433ffd81a314773b3b24db40a0a1cd09e Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Dec 2008 17:00:44 +0000
Subject: [PATCH 2061/8469] fix 2.x isms in distutils test

---
 command/register.py    | 2 +-
 tests/test_register.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/register.py b/command/register.py
index bd9b8c0143..30e9a37e6a 100644
--- a/command/register.py
+++ b/command/register.py
@@ -150,7 +150,7 @@ def send_metadata(self):
  3. have the server generate a new password for you (and email it to you), or
  4. quit
 Your selection [default 1]: ''', log.INFO)
-            choice = raw_input()
+            choice = input()
             if not choice:
                 choice = '1'
             elif choice not in choices:
diff --git a/tests/test_register.py b/tests/test_register.py
index 3a3a3b739b..021b3ea884 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -60,7 +60,7 @@ def test_create_pypirc(self):
         # Save your login (y/N)? : 'y'
         inputs = RawInputs('1', 'tarek', 'y')
         from distutils.command import register as register_module
-        register_module.raw_input = inputs.__call__
+        register_module.input = inputs.__call__
         def _getpass(prompt):
             return 'xxx'
         register_module.getpass.getpass = _getpass
@@ -71,8 +71,7 @@ def __init__(self):
             def __call__(self, *args):
                 # we want to compare them, so let's store
                 # something comparable
-                els = args[0].items()
-                els.sort()
+                els = sorted(args[0].items())
                 self.calls.append(tuple(els))
                 return 200, 'OK'
 

From d2c6eebccda5f6a0d0b252729142548561441e0f Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 28 Dec 2008 19:40:56 +0000
Subject: [PATCH 2062/8469] Issue4064: architecture string for universal builds
 on OSX

---
 util.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/util.py b/util.py
index 262a9b8b04..48cc17f624 100644
--- a/util.py
+++ b/util.py
@@ -100,7 +100,11 @@ def get_platform ():
         if not macver:
             macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
 
-        if not macver:
+        if 1:
+            # Always calculate the release of the running machine,
+            # needed to determine if we can build fat binaries or not.
+
+            macrelease = macver
             # Get the system version. Reading this plist is a documented
             # way to get the system version (see the documentation for
             # the Gestalt Manager)
@@ -116,16 +120,18 @@ def get_platform ():
                         r'<string>(.*?)</string>', f.read())
                 f.close()
                 if m is not None:
-                    macver = '.'.join(m.group(1).split('.')[:2])
+                    macrelease = '.'.join(m.group(1).split('.')[:2])
                 # else: fall back to the default behaviour
 
+        if not macver:
+            macver = macrelease
+
         if macver:
             from distutils.sysconfig import get_config_vars
             release = macver
             osname = "macosx"
 
-
-            if (release + '.') >= '10.4.' and \
+            if (macrelease + '.') >= '10.4.' and \
                     '-arch' in get_config_vars().get('CFLAGS', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4

From be477751d0c5f8a5fb565a0e871a2ad8fb915d45 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 28 Dec 2008 19:42:55 +0000
Subject: [PATCH 2063/8469] Backport of r67988

---
 util.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/util.py b/util.py
index 262a9b8b04..48cc17f624 100644
--- a/util.py
+++ b/util.py
@@ -100,7 +100,11 @@ def get_platform ():
         if not macver:
             macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
 
-        if not macver:
+        if 1:
+            # Always calculate the release of the running machine,
+            # needed to determine if we can build fat binaries or not.
+
+            macrelease = macver
             # Get the system version. Reading this plist is a documented
             # way to get the system version (see the documentation for
             # the Gestalt Manager)
@@ -116,16 +120,18 @@ def get_platform ():
                         r'<string>(.*?)</string>', f.read())
                 f.close()
                 if m is not None:
-                    macver = '.'.join(m.group(1).split('.')[:2])
+                    macrelease = '.'.join(m.group(1).split('.')[:2])
                 # else: fall back to the default behaviour
 
+        if not macver:
+            macver = macrelease
+
         if macver:
             from distutils.sysconfig import get_config_vars
             release = macver
             osname = "macosx"
 
-
-            if (release + '.') >= '10.4.' and \
+            if (macrelease + '.') >= '10.4.' and \
                     '-arch' in get_config_vars().get('CFLAGS', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4

From 99059691e42d8d443fbb3746eb7b6695226dc166 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 28 Dec 2008 19:50:40 +0000
Subject: [PATCH 2064/8469] Update the fix for issue4064 to deal correctly with
 all three variants of universal builds that are presented by the configure
 script.

---
 util.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 48cc17f624..e9d29ff49c 100644
--- a/util.py
+++ b/util.py
@@ -140,9 +140,13 @@ def get_platform ():
                 # 'universal' instead of 'fat'.
 
                 machine = 'fat'
+                cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in get_config_vars().get('CFLAGS'):
-                    machine = 'universal'
+                if '-arch x86_64' in cflags:
+                    if '-arch i386' in cflags:
+                        machine = 'universal'
+                    else:
+                        machine = 'fat64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From 48eeeee501e34167c0245d9a9121da0af6cda5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Dec 2008 22:23:53 +0000
Subject: [PATCH 2065/8469] fixed #4646 : distutils was choking on empty
 options arg in the setup function.

---
 dist.py            |  2 +-
 tests/test_dist.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 9ad94fbeb8..c15ca9770d 100644
--- a/dist.py
+++ b/dist.py
@@ -235,7 +235,7 @@ def __init__ (self, attrs=None):
             # command options will override any supplied redundantly
             # through the general options dictionary.
             options = attrs.get('options')
-            if options:
+            if options is not None:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
                     opt_dict = self.get_option_dict(command)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 6f5fe9c757..bf59c41844 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,6 +8,7 @@
 import StringIO
 import sys
 import unittest
+import warnings
 
 from test.test_support import TESTFN
 
@@ -131,6 +132,29 @@ def test_write_pkg_file(self):
             if os.path.exists(my_file):
                 os.remove(my_file)
 
+    def test_empty_options(self):
+        # an empty options dictionary should not stay in the
+        # list of attributes
+        klass = distutils.dist.Distribution
+
+        # catching warnings
+        warns = []
+        def _warn(msg):
+            warns.append(msg)
+
+        old_warn = warnings.warn
+        warnings.warn = _warn
+        try:
+            dist = klass(attrs={'author': 'xxx',
+                                'name': 'xxx',
+                                'version': 'xxx',
+                                'url': 'xxxx',
+                                'options': {}})
+        finally:
+            warnings.warn = old_warn
+
+        self.assertEquals(len(warns), 0)
+
 class MetadataTestCase(unittest.TestCase):
 
     def test_simple_metadata(self):

From 4ebe0bf0afa6a11df205dd6091326658eb4993b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Dec 2008 22:36:22 +0000
Subject: [PATCH 2066/8469] Merged revisions 68033 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68033 | tarek.ziade | 2008-12-29 23:23:53 +0100 (Mon, 29 Dec 2008) | 1 line

  fixed #4646 : distutils was choking on empty options arg in the setup function.
........
---
 dist.py            |  2 +-
 tests/test_dist.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 9ad94fbeb8..c15ca9770d 100644
--- a/dist.py
+++ b/dist.py
@@ -235,7 +235,7 @@ def __init__ (self, attrs=None):
             # command options will override any supplied redundantly
             # through the general options dictionary.
             options = attrs.get('options')
-            if options:
+            if options is not None:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
                     opt_dict = self.get_option_dict(command)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 6f5fe9c757..bf59c41844 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,6 +8,7 @@
 import StringIO
 import sys
 import unittest
+import warnings
 
 from test.test_support import TESTFN
 
@@ -131,6 +132,29 @@ def test_write_pkg_file(self):
             if os.path.exists(my_file):
                 os.remove(my_file)
 
+    def test_empty_options(self):
+        # an empty options dictionary should not stay in the
+        # list of attributes
+        klass = distutils.dist.Distribution
+
+        # catching warnings
+        warns = []
+        def _warn(msg):
+            warns.append(msg)
+
+        old_warn = warnings.warn
+        warnings.warn = _warn
+        try:
+            dist = klass(attrs={'author': 'xxx',
+                                'name': 'xxx',
+                                'version': 'xxx',
+                                'url': 'xxxx',
+                                'options': {}})
+        finally:
+            warnings.warn = old_warn
+
+        self.assertEquals(len(warns), 0)
+
 class MetadataTestCase(unittest.TestCase):
 
     def test_simple_metadata(self):

From bf2af83b71d70127ece0c4ef573216c7570fca95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Dec 2008 22:38:38 +0000
Subject: [PATCH 2067/8469] Merged revisions 68033 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68033 | tarek.ziade | 2008-12-29 23:23:53 +0100 (Mon, 29 Dec 2008) | 1 line

  fixed #4646 : distutils was choking on empty options arg in the setup function.
........
---
 dist.py            |  2 +-
 tests/test_dist.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 8bcb88c31b..7903c2a783 100644
--- a/dist.py
+++ b/dist.py
@@ -228,7 +228,7 @@ def __init__ (self, attrs=None):
             # command options will override any supplied redundantly
             # through the general options dictionary.
             options = attrs.get('options')
-            if options:
+            if options is not None:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
                     opt_dict = self.get_option_dict(command)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index f1b11c1745..8e7ef5d33c 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -6,6 +6,7 @@
 import io
 import sys
 import unittest
+import warnings
 
 from test.support import TESTFN
 
@@ -96,6 +97,29 @@ def test_command_packages_configfile(self):
             os.unlink(TESTFN)
 
 
+    def test_empty_options(self):
+        # an empty options dictionary should not stay in the
+        # list of attributes
+        klass = distutils.dist.Distribution
+
+        # catching warnings
+        warns = []
+        def _warn(msg):
+            warns.append(msg)
+
+        old_warn = warnings.warn
+        warnings.warn = _warn
+        try:
+            dist = klass(attrs={'author': 'xxx',
+                                'name': 'xxx',
+                                'version': 'xxx',
+                                'url': 'xxxx',
+                                'options': {}})
+        finally:
+            warnings.warn = old_warn
+
+        self.assertEquals(len(warns), 0)
+
 class MetadataTestCase(unittest.TestCase):
 
     def test_simple_metadata(self):

From de38e65a4ea05f1b0924676bc9fb2ecccd182f40 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Dec 2008 17:56:45 +0000
Subject: [PATCH 2068/8469] Merged revisions 67982,67988,67990 via svnmerge
 from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67982 | benjamin.peterson | 2008-12-28 09:37:31 -0600 (Sun, 28 Dec 2008) | 1 line

  fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
  r67988 | ronald.oussoren | 2008-12-28 13:40:56 -0600 (Sun, 28 Dec 2008) | 1 line

  Issue4064: architecture string for universal builds on OSX
........
  r67990 | ronald.oussoren | 2008-12-28 13:50:40 -0600 (Sun, 28 Dec 2008) | 3 lines

  Update the fix for issue4064 to deal correctly with all three variants of
  universal builds that are presented by the configure script.
........
---
 util.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/util.py b/util.py
index 28337fa9a0..042306e913 100644
--- a/util.py
+++ b/util.py
@@ -99,7 +99,11 @@ def get_platform ():
         if not macver:
             macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
 
-        if not macver:
+        if 1:
+            # Always calculate the release of the running machine,
+            # needed to determine if we can build fat binaries or not.
+
+            macrelease = macver
             # Get the system version. Reading this plist is a documented
             # way to get the system version (see the documentation for
             # the Gestalt Manager)
@@ -115,16 +119,18 @@ def get_platform ():
                         r'<string>(.*?)</string>', f.read())
                 f.close()
                 if m is not None:
-                    macver = '.'.join(m.group(1).split('.')[:2])
+                    macrelease = '.'.join(m.group(1).split('.')[:2])
                 # else: fall back to the default behaviour
 
+        if not macver:
+            macver = macrelease
+
         if macver:
             from distutils.sysconfig import get_config_vars
             release = macver
             osname = "macosx"
 
-
-            if (release + '.') >= '10.4.' and \
+            if (macrelease + '.') >= '10.4.' and \
                     '-arch' in get_config_vars().get('CFLAGS', '').strip():
                 # The universal build will build fat binaries, but not on
                 # systems before 10.4
@@ -133,9 +139,13 @@ def get_platform ():
                 # 'universal' instead of 'fat'.
 
                 machine = 'fat'
+                cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in get_config_vars().get('CFLAGS'):
-                    machine = 'universal'
+                if '-arch x86_64' in cflags:
+                    if '-arch i386' in cflags:
+                        machine = 'universal'
+                    else:
+                        machine = 'fat64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From 5a3897bfe4addcf975b3d99bdb1c9b2ecec604bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 30 Dec 2008 23:03:41 +0000
Subject: [PATCH 2069/8469] Fixed #4702: Throwing DistutilsPlatformError
 instead of IOError under win32 if MSVC is not found

---
 msvc9compiler.py            |  4 ++--
 tests/test_msvc9compiler.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_msvc9compiler.py

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 4f72e78096..68b7775830 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -247,7 +247,7 @@ def query_vcvarsall(version, arch="x86"):
     result = {}
 
     if vcvarsall is None:
-        raise IOError("Unable to find vcvarsall.bat")
+        raise DistutilsPlatformError("Unable to find vcvarsall.bat")
     log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
@@ -255,7 +255,7 @@ def query_vcvarsall(version, arch="x86"):
 
     stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(stderr.decode("mbcs"))
+        raise DistutilsPlatformError(stderr.decode("mbcs"))
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
new file mode 100644
index 0000000000..1659cea510
--- /dev/null
+++ b/tests/test_msvc9compiler.py
@@ -0,0 +1,33 @@
+"""Tests for distutils.msvc9compiler."""
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError
+
+class msvc9compilerTestCase(unittest.TestCase):
+
+    def test_no_compiler(self):
+        # makes sure query_vcvarsall throws
+        # a DistutilsPlatformError if the compiler
+        # is not found
+        if sys.platform != 'win32':
+            # this test is only for win32
+            return
+        from distutils.msvc9compiler import query_vcvarsall
+        def _find_vcvarsall(version):
+            return None
+
+        from distutils import msvc9compiler
+        old_find_vcvarsall = msvc9compiler.find_vcvarsall
+        msvc9compiler.find_vcvarsall = _find_vcvarsall
+        try:
+            self.assertRaises(DistutilsPlatformError, query_vcvarsall,
+                             'wont find this version')
+        finally:
+            msvc9compiler.find_vcvarsall = old_find_vcvarsall
+
+def test_suite():
+    return unittest.makeSuite(msvc9compilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a2dde29acd7c619ea5af0182c429e4bdf86cfb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 30 Dec 2008 23:06:46 +0000
Subject: [PATCH 2070/8469] Merged revisions 68081 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68081 | tarek.ziade | 2008-12-31 00:03:41 +0100 (Wed, 31 Dec 2008) | 1 line

  Fixed #4702: Throwing DistutilsPlatformError instead of IOError under win32 if MSVC is not found
........
---
 msvc9compiler.py            |  4 ++--
 tests/test_msvc9compiler.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_msvc9compiler.py

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 4f72e78096..68b7775830 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -247,7 +247,7 @@ def query_vcvarsall(version, arch="x86"):
     result = {}
 
     if vcvarsall is None:
-        raise IOError("Unable to find vcvarsall.bat")
+        raise DistutilsPlatformError("Unable to find vcvarsall.bat")
     log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
@@ -255,7 +255,7 @@ def query_vcvarsall(version, arch="x86"):
 
     stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(stderr.decode("mbcs"))
+        raise DistutilsPlatformError(stderr.decode("mbcs"))
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
new file mode 100644
index 0000000000..1659cea510
--- /dev/null
+++ b/tests/test_msvc9compiler.py
@@ -0,0 +1,33 @@
+"""Tests for distutils.msvc9compiler."""
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError
+
+class msvc9compilerTestCase(unittest.TestCase):
+
+    def test_no_compiler(self):
+        # makes sure query_vcvarsall throws
+        # a DistutilsPlatformError if the compiler
+        # is not found
+        if sys.platform != 'win32':
+            # this test is only for win32
+            return
+        from distutils.msvc9compiler import query_vcvarsall
+        def _find_vcvarsall(version):
+            return None
+
+        from distutils import msvc9compiler
+        old_find_vcvarsall = msvc9compiler.find_vcvarsall
+        msvc9compiler.find_vcvarsall = _find_vcvarsall
+        try:
+            self.assertRaises(DistutilsPlatformError, query_vcvarsall,
+                             'wont find this version')
+        finally:
+            msvc9compiler.find_vcvarsall = old_find_vcvarsall
+
+def test_suite():
+    return unittest.makeSuite(msvc9compilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From fcd16e351d5e231cbf218bf33371a1bcbf7a225e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 30 Dec 2008 23:09:20 +0000
Subject: [PATCH 2071/8469] Merged revisions 68081 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68081 | tarek.ziade | 2008-12-31 00:03:41 +0100 (Wed, 31 Dec 2008) | 1 line

  Fixed #4702: Throwing DistutilsPlatformError instead of IOError under win32 if MSVC is not found
........
---
 msvc9compiler.py            |  4 ++--
 tests/test_msvc9compiler.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_msvc9compiler.py

diff --git a/msvc9compiler.py b/msvc9compiler.py
index eced0524b8..aae0637394 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -247,7 +247,7 @@ def query_vcvarsall(version, arch="x86"):
     result = {}
 
     if vcvarsall is None:
-        raise IOError("Unable to find vcvarsall.bat")
+        raise DistutilsPlatformError("Unable to find vcvarsall.bat")
     log.debug("Calling 'vcvarsall.bat %s' (version=%s)", arch, version)
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
@@ -255,7 +255,7 @@ def query_vcvarsall(version, arch="x86"):
 
     stdout, stderr = popen.communicate()
     if popen.wait() != 0:
-        raise IOError(stderr.decode("mbcs"))
+        raise DistutilsPlatformError(stderr.decode("mbcs"))
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
new file mode 100644
index 0000000000..1659cea510
--- /dev/null
+++ b/tests/test_msvc9compiler.py
@@ -0,0 +1,33 @@
+"""Tests for distutils.msvc9compiler."""
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError
+
+class msvc9compilerTestCase(unittest.TestCase):
+
+    def test_no_compiler(self):
+        # makes sure query_vcvarsall throws
+        # a DistutilsPlatformError if the compiler
+        # is not found
+        if sys.platform != 'win32':
+            # this test is only for win32
+            return
+        from distutils.msvc9compiler import query_vcvarsall
+        def _find_vcvarsall(version):
+            return None
+
+        from distutils import msvc9compiler
+        old_find_vcvarsall = msvc9compiler.find_vcvarsall
+        msvc9compiler.find_vcvarsall = _find_vcvarsall
+        try:
+            self.assertRaises(DistutilsPlatformError, query_vcvarsall,
+                             'wont find this version')
+        finally:
+            msvc9compiler.find_vcvarsall = old_find_vcvarsall
+
+def test_suite():
+    return unittest.makeSuite(msvc9compilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From b7024702a738bd1e31391b391cc073b97d94c008 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 1 Jan 2009 15:46:10 +0000
Subject: [PATCH 2072/8469] Merged revisions
 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines

  #4752: actually use custom handler in example.
........
  r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines

  Patch #4739 by David Laban: add symbols to pydoc help topics,
  so that ``help('@')`` works as expected.
........
  r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines

  Follow-up to r67746 in order to restore backwards-compatibility for
  those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
  r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines

  #4754: improve winsound documentation.
........
  r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines

  #4682: 'b' is actually unsigned char.
........
  r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines

  #4695: fix backslashery.
........
  r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines

  Use :samp: role.
........
  r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines

  #4671: document that pydoc imports modules.
........
  r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines

  Issue #4677: add two list comprehension tests to pybench.
........
  r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line

  fix markup
........
  r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines

  Fix name mangling of PyUnicode_ClearFreeList.
........
  r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines

  Sort UCS-2/UCS-4 name mangling list.
........
  r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines

  Document Py_VaBuildValue.
........
  r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line

  fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728
........
  r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line

  Issue4064: architecture string for universal builds on OSX
........
  r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines

  Update the fix for issue4064 to deal correctly with all three variants of
  universal builds that are presented by the configure script.
........
  r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line

  #4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
  r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line

  #4764 set IOError.filename when trying to open a directory on POSIX platforms
........
  r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line

  #4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms
........
  r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line

  fix French
........
  r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line

  Minor documentation change relating to NullHandler.
........
  r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines

  #4778: attributes can't be called.
........
  r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line

  #4795 inspect.isgeneratorfunction() should return False instead of None
........
  r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line

  simplfy code
........
  r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4100: note that element children are not necessarily present on "start" events.
........
  r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4156: make clear that "protocol" is to be replaced with the protocol name.
........
  r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4185: clarify escape behavior of replacement strings.
........
  r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines

  #4228: Pack negative values the same way as 2.4
  in struct's L format.
........
  r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines

  Point to types module in new module deprecation notice.
........
  r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4784: ... on three counts ...
........
  r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4782: Fix markup error that hid load() and loads().
........
  r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4776: add data_files and package_dir arguments.
........
  r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines

  Handlers are in the `logging.handlers` module.
........
  r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines

  #4767: Use correct submodules for all MIME classes.
........
  r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines

  Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
---
 util.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 48cc17f624..e9d29ff49c 100644
--- a/util.py
+++ b/util.py
@@ -140,9 +140,13 @@ def get_platform ():
                 # 'universal' instead of 'fat'.
 
                 machine = 'fat'
+                cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in get_config_vars().get('CFLAGS'):
-                    machine = 'universal'
+                if '-arch x86_64' in cflags:
+                    if '-arch i386' in cflags:
+                        machine = 'universal'
+                    else:
+                        machine = 'fat64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From 093c9524d2419914fb3d24a8d7f231c77432a3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 4 Jan 2009 00:04:49 +0000
Subject: [PATCH 2073/8469] fixed #1702551: distutils sdist was not pruning VCS
 directories under win32

---
 command/sdist.py    |   8 +++-
 tests/test_sdist.py | 110 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_sdist.py

diff --git a/command/sdist.py b/command/sdist.py
index 961256c3ac..e10e25b37d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import os, string
+import sys
 from types import *
 from glob import glob
 from distutils.core import Command
@@ -354,8 +355,13 @@ def prune_file_list (self):
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
+        # pruning out vcs directories
+        # both separators are used under win32
+        seps = sys.platform == 'win32' and r'/|\\' or '/'
+        vcs_dirs = ['RCS', 'CVS', '\.svn', '\.hg', '\.git', '\.bzr', '_darcs']
+        vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
+        self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 
     def write_manifest (self):
         """Write the file list in 'self.filelist' (presumably as filled in
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
new file mode 100644
index 0000000000..7cc04cfc0c
--- /dev/null
+++ b/tests/test_sdist.py
@@ -0,0 +1,110 @@
+"""Tests for distutils.command.sdist."""
+import os
+import unittest
+import shutil
+import zipfile
+from os.path import join
+
+from distutils.command.sdist import sdist
+from distutils.core import Distribution
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+CURDIR = os.path.dirname(__file__)
+TEMP_PKG = join(CURDIR, 'temppkg')
+
+SETUP_PY = """
+from distutils.core import setup
+import somecode
+
+setup(name='fake')
+"""
+
+MANIFEST_IN = """
+recursive-include somecode *
+"""
+
+class sdistTestCase(PyPIRCCommandTestCase):
+
+    def setUp(self):
+        PyPIRCCommandTestCase.setUp(self)
+        self.old_path = os.getcwd()
+
+    def tearDown(self):
+        os.chdir(self.old_path)
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        PyPIRCCommandTestCase.tearDown(self)
+
+    def _write(self, path, content):
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
+
+    def test_prune_file_list(self):
+        # this test creates a package with some vcs dirs in it
+        # and launch sdist to make sure they get pruned
+        # on all systems
+        if not os.path.exists(TEMP_PKG):
+            os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+
+        # creating VCS directories with some files in them
+        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
+        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
+        self._write(join(TEMP_PKG, 'somecode', '.hg',
+                         'ok'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
+        self._write(join(TEMP_PKG, 'somecode', '.git',
+                         'ok'), 'xxx')
+
+        os.chdir(TEMP_PKG)
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # zip is available universally
+        # (tar might not be installed under win32)
+        cmd.formats = ['zip']
+        cmd.run()
+
+        # now let's check what we have
+        dist_folder = join(TEMP_PKG, 'dist')
+        files = os.listdir(dist_folder)
+        self.assertEquals(files, ['fake-1.0.zip'])
+
+        zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
+        try:
+            content = zip_file.namelist()
+        finally:
+            zip_file.close()
+
+        # making sure everything has been pruned correctly
+        self.assertEquals(len(content), 4)
+
+def test_suite():
+    return unittest.makeSuite(sdistTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From dea3bab1f658e3f4e696dc1f74e5c41cb4ade04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 4 Jan 2009 00:07:14 +0000
Subject: [PATCH 2074/8469] Merged revisions 68276 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68276 | tarek.ziade | 2009-01-04 01:04:49 +0100 (Sun, 04 Jan 2009) | 1 line

  fixed #1702551: distutils sdist was not pruning VCS directories under win32
........
---
 command/sdist.py    |   8 +++-
 tests/test_sdist.py | 110 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_sdist.py

diff --git a/command/sdist.py b/command/sdist.py
index 961256c3ac..e10e25b37d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import os, string
+import sys
 from types import *
 from glob import glob
 from distutils.core import Command
@@ -354,8 +355,13 @@ def prune_file_list (self):
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
+        # pruning out vcs directories
+        # both separators are used under win32
+        seps = sys.platform == 'win32' and r'/|\\' or '/'
+        vcs_dirs = ['RCS', 'CVS', '\.svn', '\.hg', '\.git', '\.bzr', '_darcs']
+        vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
+        self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 
     def write_manifest (self):
         """Write the file list in 'self.filelist' (presumably as filled in
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
new file mode 100644
index 0000000000..7cc04cfc0c
--- /dev/null
+++ b/tests/test_sdist.py
@@ -0,0 +1,110 @@
+"""Tests for distutils.command.sdist."""
+import os
+import unittest
+import shutil
+import zipfile
+from os.path import join
+
+from distutils.command.sdist import sdist
+from distutils.core import Distribution
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+CURDIR = os.path.dirname(__file__)
+TEMP_PKG = join(CURDIR, 'temppkg')
+
+SETUP_PY = """
+from distutils.core import setup
+import somecode
+
+setup(name='fake')
+"""
+
+MANIFEST_IN = """
+recursive-include somecode *
+"""
+
+class sdistTestCase(PyPIRCCommandTestCase):
+
+    def setUp(self):
+        PyPIRCCommandTestCase.setUp(self)
+        self.old_path = os.getcwd()
+
+    def tearDown(self):
+        os.chdir(self.old_path)
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        PyPIRCCommandTestCase.tearDown(self)
+
+    def _write(self, path, content):
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
+
+    def test_prune_file_list(self):
+        # this test creates a package with some vcs dirs in it
+        # and launch sdist to make sure they get pruned
+        # on all systems
+        if not os.path.exists(TEMP_PKG):
+            os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+
+        # creating VCS directories with some files in them
+        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
+        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
+        self._write(join(TEMP_PKG, 'somecode', '.hg',
+                         'ok'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
+        self._write(join(TEMP_PKG, 'somecode', '.git',
+                         'ok'), 'xxx')
+
+        os.chdir(TEMP_PKG)
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # zip is available universally
+        # (tar might not be installed under win32)
+        cmd.formats = ['zip']
+        cmd.run()
+
+        # now let's check what we have
+        dist_folder = join(TEMP_PKG, 'dist')
+        files = os.listdir(dist_folder)
+        self.assertEquals(files, ['fake-1.0.zip'])
+
+        zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
+        try:
+            content = zip_file.namelist()
+        finally:
+            zip_file.close()
+
+        # making sure everything has been pruned correctly
+        self.assertEquals(len(content), 4)
+
+def test_suite():
+    return unittest.makeSuite(sdistTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 3fa05608d6cbcdf5d59824a1edde412e5440ae8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 4 Jan 2009 10:37:52 +0000
Subject: [PATCH 2075/8469] using clearer syntax

---
 command/sdist.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index e10e25b37d..27883fd68b 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -358,8 +358,13 @@ def prune_file_list (self):
 
         # pruning out vcs directories
         # both separators are used under win32
-        seps = sys.platform == 'win32' and r'/|\\' or '/'
-        vcs_dirs = ['RCS', 'CVS', '\.svn', '\.hg', '\.git', '\.bzr', '_darcs']
+        if sys.platform == 'win32':
+            seps = r'/|\\'
+        else:
+            seps = '/'
+
+        vcs_dirs = ['RCS', 'CVS', r'\.svn', r'\.hg', r'\.git', r'\.bzr',
+                    '_darcs']
         vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
         self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 

From 6d66c0011b6f80f3e04ed13872bddc2e48b12056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 4 Jan 2009 10:43:32 +0000
Subject: [PATCH 2076/8469] Merged revisions 68293 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68293 | tarek.ziade | 2009-01-04 11:37:52 +0100 (Sun, 04 Jan 2009) | 1 line

  using clearer syntax
........
---
 command/sdist.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index e10e25b37d..27883fd68b 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -358,8 +358,13 @@ def prune_file_list (self):
 
         # pruning out vcs directories
         # both separators are used under win32
-        seps = sys.platform == 'win32' and r'/|\\' or '/'
-        vcs_dirs = ['RCS', 'CVS', '\.svn', '\.hg', '\.git', '\.bzr', '_darcs']
+        if sys.platform == 'win32':
+            seps = r'/|\\'
+        else:
+            seps = '/'
+
+        vcs_dirs = ['RCS', 'CVS', r'\.svn', r'\.hg', r'\.git', r'\.bzr',
+                    '_darcs']
         vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
         self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 

From ecf83b1f901da44a7408bda6aba7d408b4f8155a Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 7 Jan 2009 09:42:28 +0000
Subject: [PATCH 2077/8469] Issue #4864: test_msvc9compiler failed on VC6/7.
 Reviewed by Amaury Forgeot d'Arc.

---
 tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 1659cea510..0c8bd6e042 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -13,6 +13,10 @@ def test_no_compiler(self):
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None

From 18a095cf8cedcd8e615a6dd6d71634b2fe35bb70 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 7 Jan 2009 09:53:35 +0000
Subject: [PATCH 2078/8469] Merged revisions 68373 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68373 | hirokazu.yamamoto | 2009-01-07 18:42:28 +0900 | 2 lines

  Issue #4864: test_msvc9compiler failed on VC6/7.
  Reviewed by Amaury Forgeot d'Arc.
........
---
 tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 1659cea510..0c8bd6e042 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -13,6 +13,10 @@ def test_no_compiler(self):
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None

From 7da96ed6b364ce84ab7b0f2c563fda2779f641ec Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Wed, 7 Jan 2009 10:11:17 +0000
Subject: [PATCH 2079/8469] Merged revisions 68373 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68373 | hirokazu.yamamoto | 2009-01-07 18:42:28 +0900 | 2 lines

  Issue #4864: test_msvc9compiler failed on VC6/7.
  Reviewed by Amaury Forgeot d'Arc.
........
---
 tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 1659cea510..0c8bd6e042 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -13,6 +13,10 @@ def test_no_compiler(self):
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None

From 31ca6309c1297c8539b0e6c54f6743c58f841922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 8 Jan 2009 23:56:31 +0000
Subject: [PATCH 2080/8469] fixed #4394 make the storage of the password
 optional in .pypirc

---
 command/register.py    | 30 ++++++++-------
 command/upload.py      |  5 +++
 config.py              |  4 +-
 dist.py                |  1 +
 tests/test_register.py | 86 +++++++++++++++++++++++++++++++-----------
 tests/test_upload.py   | 29 ++++++++++++++
 6 files changed, 117 insertions(+), 38 deletions(-)

diff --git a/command/register.py b/command/register.py
index bf7be96096..40661d8776 100644
--- a/command/register.py
+++ b/command/register.py
@@ -173,19 +173,23 @@ def send_metadata(self):
                           log.INFO)
 
             # possibly save the login
-            if not self.has_config and code == 200:
-                self.announce(('I can store your PyPI login so future '
-                               'submissions will be faster.'), log.INFO)
-                self.announce('(the login will be stored in %s)' % \
-                              self._get_rc_file(), log.INFO)
-
-                choice = 'X'
-                while choice.lower() not in 'yn':
-                    choice = raw_input('Save your login (y/N)?')
-                    if not choice:
-                        choice = 'n'
-                if choice.lower() == 'y':
-                    self._store_pypirc(username, password)
+            if code == 200:
+                if self.has_config:
+                    # sharing the password in the distribution instance
+                    # so the upload command can reuse it
+                    self.distribution.password = password
+                else:
+                    self.announce(('I can store your PyPI login so future '
+                                   'submissions will be faster.'), log.INFO)
+                    self.announce('(the login will be stored in %s)' % \
+                                  self._get_rc_file(), log.INFO)
+                    choice = 'X'
+                    while choice.lower() not in 'yn':
+                        choice = raw_input('Save your login (y/N)?')
+                        if not choice:
+                            choice = 'n'
+                    if choice.lower() == 'y':
+                        self._store_pypirc(username, password)
 
         elif choice == '2':
             data = {':action': 'user'}
diff --git a/command/upload.py b/command/upload.py
index 8805d41da0..e30347e507 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -50,6 +50,11 @@ def finalize_options(self):
             self.repository = config['repository']
             self.realm = config['realm']
 
+        # getting the password from the distribution
+        # if previously set by the register command
+        if not self.password and self.distribution.password:
+            self.password = self.distribution.password
+
     def run(self):
         if not self.distribution.dist_files:
             raise DistutilsOptionError("No dist file created in earlier command")
diff --git a/config.py b/config.py
index 4186c9b1d8..9166199ea9 100644
--- a/config.py
+++ b/config.py
@@ -82,12 +82,12 @@ def _read_pypirc(self):
                 for server in _servers:
                     current = {'server': server}
                     current['username'] = config.get(server, 'username')
-                    current['password'] = config.get(server, 'password')
 
                     # optional params
                     for key, default in (('repository',
                                           self.DEFAULT_REPOSITORY),
-                                         ('realm', self.DEFAULT_REALM)):
+                                         ('realm', self.DEFAULT_REALM),
+                                         ('password', None)):
                         if config.has_option(server, key):
                             current[key] = config.get(server, key)
                         else:
diff --git a/dist.py b/dist.py
index c15ca9770d..18cc910900 100644
--- a/dist.py
+++ b/dist.py
@@ -206,6 +206,7 @@ def __init__ (self, attrs=None):
         self.extra_path = None
         self.scripts = None
         self.data_files = None
+        self.password = ''
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
diff --git a/tests/test_register.py b/tests/test_register.py
index 3a3a3b739b..b3543f50f8 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import getpass
 
 from distutils.command.register import register
 from distutils.core import Distribution
@@ -9,6 +10,26 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_NOPASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+
+[server1]
+username:me
+"""
+
+WANTED_PYPIRC = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:password
+"""
+
 class RawInputs(object):
     """Fakes user inputs."""
     def __init__(self, *answers):
@@ -21,18 +42,33 @@ def __call__(self, prompt=''):
         finally:
             self.index += 1
 
-WANTED_PYPIRC = """\
-[distutils]
-index-servers =
-    pypi
+class FakeServer(object):
+    """Fakes a PyPI server"""
+    def __init__(self):
+        self.calls = []
 
-[pypi]
-username:tarek
-password:xxx
-"""
+    def __call__(self, *args):
+        # we want to compare them, so let's store
+        # something comparable
+        els = args[0].items()
+        els.sort()
+        self.calls.append(tuple(els))
+        return 200, 'OK'
 
 class registerTestCase(PyPIRCCommandTestCase):
 
+    def setUp(self):
+        PyPIRCCommandTestCase.setUp(self)
+        # patching the password prompt
+        self._old_getpass = getpass.getpass
+        def _getpass(prompt):
+            return 'password'
+        getpass.getpass = _getpass
+
+    def tearDown(self):
+        getpass.getpass = self._old_getpass
+        PyPIRCCommandTestCase.tearDown(self)
+
     def test_create_pypirc(self):
         # this test makes sure a .pypirc file
         # is created when requested.
@@ -56,25 +92,11 @@ def test_create_pypirc(self):
         # Here's what we are faking :
         # use your existing login (choice 1.)
         # Username : 'tarek'
-        # Password : 'xxx'
+        # Password : 'password'
         # Save your login (y/N)? : 'y'
         inputs = RawInputs('1', 'tarek', 'y')
         from distutils.command import register as register_module
         register_module.raw_input = inputs.__call__
-        def _getpass(prompt):
-            return 'xxx'
-        register_module.getpass.getpass = _getpass
-        class FakeServer(object):
-            def __init__(self):
-                self.calls = []
-
-            def __call__(self, *args):
-                # we want to compare them, so let's store
-                # something comparable
-                els = args[0].items()
-                els.sort()
-                self.calls.append(tuple(els))
-                return 200, 'OK'
 
         cmd.post_to_server = pypi_server = FakeServer()
 
@@ -102,6 +124,24 @@ def _no_way(prompt=''):
         self.assert_(len(pypi_server.calls), 2)
         self.assert_(pypi_server.calls[0], pypi_server.calls[1])
 
+    def test_password_not_in_file(self):
+
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_NOPASSWORD)
+        f.close()
+
+        dist = Distribution()
+        cmd = register(dist)
+        cmd.post_to_server = FakeServer()
+
+        cmd._set_config()
+        cmd.finalize_options()
+        cmd.send_metadata()
+
+        # dist.password should be set
+        # therefore used afterwards by other commands
+        self.assertEquals(dist.password, 'password')
+
 def test_suite():
     return unittest.makeSuite(registerTestCase)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index b05ab1f78b..3f8ca6d6ad 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -9,6 +9,17 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_NOPASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+
+[server1]
+username:me
+"""
+
+
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def test_finalize_options(self):
@@ -26,6 +37,24 @@ def test_finalize_options(self):
                              ('repository', 'http://pypi.python.org/pypi')):
             self.assertEquals(getattr(cmd, attr), waited)
 
+    def test_saved_password(self):
+        # file with no password
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_NOPASSWORD)
+        f.close()
+
+        # make sure it passes
+        dist = Distribution()
+        cmd = upload(dist)
+        cmd.finalize_options()
+        self.assertEquals(cmd.password, None)
+
+        # make sure we get it as well, if another command
+        # initialized it at the dist level
+        dist.password = 'xxx'
+        cmd = upload(dist)
+        cmd.finalize_options()
+        self.assertEquals(cmd.password, 'xxx')
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 5b32d845dc21e255e9b1d40c5aa7b12aa9149271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 9 Jan 2009 00:15:45 +0000
Subject: [PATCH 2081/8469] Merged revisions 68415 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68415 | tarek.ziade | 2009-01-09 00:56:31 +0100 (Fri, 09 Jan 2009) | 1 line

  fixed #4394 make the storage of the password optional in .pypirc
........
---
 command/register.py    | 30 ++++++++------
 command/upload.py      |  5 +++
 config.py              |  4 +-
 dist.py                |  1 +
 tests/test_register.py | 91 ++++++++++++++++++++++++++++++------------
 tests/test_upload.py   | 29 ++++++++++++++
 6 files changed, 120 insertions(+), 40 deletions(-)

diff --git a/command/register.py b/command/register.py
index 30e9a37e6a..c271b18c4c 100644
--- a/command/register.py
+++ b/command/register.py
@@ -174,19 +174,23 @@ def send_metadata(self):
                           log.INFO)
 
             # possibly save the login
-            if not self.has_config and code == 200:
-                self.announce(('I can store your PyPI login so future '
-                               'submissions will be faster.'), log.INFO)
-                self.announce('(the login will be stored in %s)' % \
-                              self._get_rc_file(), log.INFO)
-
-                choice = 'X'
-                while choice.lower() not in 'yn':
-                    choice = input('Save your login (y/N)?')
-                    if not choice:
-                        choice = 'n'
-                if choice.lower() == 'y':
-                    self._store_pypirc(username, password)
+            if code == 200:
+                if self.has_config:
+                    # sharing the password in the distribution instance
+                    # so the upload command can reuse it
+                    self.distribution.password = password
+                else:
+                    self.announce(('I can store your PyPI login so future '
+                                   'submissions will be faster.'), log.INFO)
+                    self.announce('(the login will be stored in %s)' % \
+                                  self._get_rc_file(), log.INFO)
+                    choice = 'X'
+                    while choice.lower() not in 'yn':
+                        choice = input('Save your login (y/N)?')
+                        if not choice:
+                            choice = 'n'
+                    if choice.lower() == 'y':
+                        self._store_pypirc(username, password)
 
         elif choice == '2':
             data = {':action': 'user'}
diff --git a/command/upload.py b/command/upload.py
index 7ba7f5888a..020e860a6d 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -48,6 +48,11 @@ def finalize_options(self):
             self.repository = config['repository']
             self.realm = config['realm']
 
+        # getting the password from the distribution
+        # if previously set by the register command
+        if not self.password and self.distribution.password:
+            self.password = self.distribution.password
+
     def run(self):
         if not self.distribution.dist_files:
             raise DistutilsOptionError("No dist file created in earlier command")
diff --git a/config.py b/config.py
index 73f326047a..5b625f3f7d 100644
--- a/config.py
+++ b/config.py
@@ -82,12 +82,12 @@ def _read_pypirc(self):
                 for server in _servers:
                     current = {'server': server}
                     current['username'] = config.get(server, 'username')
-                    current['password'] = config.get(server, 'password')
 
                     # optional params
                     for key, default in (('repository',
                                           self.DEFAULT_REPOSITORY),
-                                         ('realm', self.DEFAULT_REALM)):
+                                         ('realm', self.DEFAULT_REALM),
+                                         ('password', None)):
                         if config.has_option(server, key):
                             current[key] = config.get(server, key)
                         else:
diff --git a/dist.py b/dist.py
index 7903c2a783..6c4b4afbd1 100644
--- a/dist.py
+++ b/dist.py
@@ -199,6 +199,7 @@ def __init__ (self, attrs=None):
         self.extra_path = None
         self.scripts = None
         self.data_files = None
+        self.password = ''
 
         # And now initialize bookkeeping stuff that can't be supplied by
         # the caller at all.  'command_obj' maps command names to
diff --git a/tests/test_register.py b/tests/test_register.py
index 021b3ea884..8826e90fe0 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import getpass
 
 from distutils.command.register import register
 from distutils.core import Distribution
@@ -9,7 +10,27 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
-class RawInputs(object):
+PYPIRC_NOPASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+
+[server1]
+username:me
+"""
+
+WANTED_PYPIRC = """\
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:tarek
+password:password
+"""
+
+class Inputs(object):
     """Fakes user inputs."""
     def __init__(self, *answers):
         self.answers = answers
@@ -21,18 +42,33 @@ def __call__(self, prompt=''):
         finally:
             self.index += 1
 
-WANTED_PYPIRC = """\
-[distutils]
-index-servers =
-    pypi
+class FakeServer(object):
+    """Fakes a PyPI server"""
+    def __init__(self):
+        self.calls = []
 
-[pypi]
-username:tarek
-password:xxx
-"""
+    def __call__(self, *args):
+        # we want to compare them, so let's store
+        # something comparable
+        els = list(args[0].items())
+        els.sort()
+        self.calls.append(tuple(els))
+        return 200, 'OK'
 
 class registerTestCase(PyPIRCCommandTestCase):
 
+    def setUp(self):
+        PyPIRCCommandTestCase.setUp(self)
+        # patching the password prompt
+        self._old_getpass = getpass.getpass
+        def _getpass(prompt):
+            return 'password'
+        getpass.getpass = _getpass
+
+    def tearDown(self):
+        getpass.getpass = self._old_getpass
+        PyPIRCCommandTestCase.tearDown(self)
+
     def test_create_pypirc(self):
         # this test makes sure a .pypirc file
         # is created when requested.
@@ -50,30 +86,17 @@ def test_create_pypirc(self):
         # we shouldn't have a .pypirc file yet
         self.assert_(not os.path.exists(self.rc))
 
-        # patching raw_input and getpass.getpass
+        # patching input and getpass.getpass
         # so register gets happy
         #
         # Here's what we are faking :
         # use your existing login (choice 1.)
         # Username : 'tarek'
-        # Password : 'xxx'
+        # Password : 'password'
         # Save your login (y/N)? : 'y'
-        inputs = RawInputs('1', 'tarek', 'y')
+        inputs = Inputs('1', 'tarek', 'y')
         from distutils.command import register as register_module
         register_module.input = inputs.__call__
-        def _getpass(prompt):
-            return 'xxx'
-        register_module.getpass.getpass = _getpass
-        class FakeServer(object):
-            def __init__(self):
-                self.calls = []
-
-            def __call__(self, *args):
-                # we want to compare them, so let's store
-                # something comparable
-                els = sorted(args[0].items())
-                self.calls.append(tuple(els))
-                return 200, 'OK'
 
         cmd.post_to_server = pypi_server = FakeServer()
 
@@ -101,6 +124,24 @@ def _no_way(prompt=''):
         self.assert_(len(pypi_server.calls), 2)
         self.assert_(pypi_server.calls[0], pypi_server.calls[1])
 
+    def test_password_not_in_file(self):
+
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_NOPASSWORD)
+        f.close()
+
+        dist = Distribution()
+        cmd = register(dist)
+        cmd.post_to_server = FakeServer()
+
+        cmd._set_config()
+        cmd.finalize_options()
+        cmd.send_metadata()
+
+        # dist.password should be set
+        # therefore used afterwards by other commands
+        self.assertEquals(dist.password, 'password')
+
 def test_suite():
     return unittest.makeSuite(registerTestCase)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index b05ab1f78b..3f8ca6d6ad 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -9,6 +9,17 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_NOPASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+
+[server1]
+username:me
+"""
+
+
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def test_finalize_options(self):
@@ -26,6 +37,24 @@ def test_finalize_options(self):
                              ('repository', 'http://pypi.python.org/pypi')):
             self.assertEquals(getattr(cmd, attr), waited)
 
+    def test_saved_password(self):
+        # file with no password
+        f = open(self.rc, 'w')
+        f.write(PYPIRC_NOPASSWORD)
+        f.close()
+
+        # make sure it passes
+        dist = Distribution()
+        cmd = upload(dist)
+        cmd.finalize_options()
+        self.assertEquals(cmd.password, None)
+
+        # make sure we get it as well, if another command
+        # initialized it at the dist level
+        dist.password = 'xxx'
+        cmd = upload(dist)
+        cmd.finalize_options()
+        self.assertEquals(cmd.password, 'xxx')
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From d5b7603836bc49a68327aaa343590cb4e051cdf4 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 9 Jan 2009 04:11:44 +0000
Subject: [PATCH 2082/8469] Merged revisions 68167,68276,68292-68293,68344 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68167 | vinay.sajip | 2009-01-02 12:53:04 -0600 (Fri, 02 Jan 2009) | 1 line

  Minor documentation changes relating to NullHandler, the module used for handlers and references to ConfigParser.
........
  r68276 | tarek.ziade | 2009-01-03 18:04:49 -0600 (Sat, 03 Jan 2009) | 1 line

  fixed #1702551: distutils sdist was not pruning VCS directories under win32
........
  r68292 | skip.montanaro | 2009-01-04 04:36:58 -0600 (Sun, 04 Jan 2009) | 3 lines

  If user configures --without-gcc give preference to $CC instead of blindly
  assuming the compiler will be "cc".
........
  r68293 | tarek.ziade | 2009-01-04 04:37:52 -0600 (Sun, 04 Jan 2009) | 1 line

  using clearer syntax
........
  r68344 | marc-andre.lemburg | 2009-01-05 13:43:35 -0600 (Mon, 05 Jan 2009) | 7 lines

  Fix #4846 (Py_UNICODE_ISSPACE causes linker error) by moving the declaration
  into the extern "C" section.

  Add a few more comments and apply some minor edits to make the file contents
  fit the original structure again.
........
---
 command/sdist.py    |  18 ++++++--
 tests/test_sdist.py | 110 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_sdist.py

diff --git a/command/sdist.py b/command/sdist.py
index b29fc64eca..96fb7fa1a7 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -4,7 +4,10 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import os
+import string
+import sys
+from types import *
 from glob import glob
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
@@ -332,9 +335,18 @@ def prune_file_list(self):
 
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
-        self.filelist.exclude_pattern(r'(^|/)(RCS|CVS|\.svn|\.hg|\.git|\.bzr|_darcs)/.*', is_regex=1)
 
-    def write_manifest(self):
+        if sys.platform == 'win32':
+            seps = r'/|\\'
+        else:
+            seps = '/'
+
+        vcs_dirs = ['RCS', 'CVS', r'\.svn', r'\.hg', r'\.git', r'\.bzr',
+                    '_darcs']
+        vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
+        self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
+
+    def write_manifest (self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
new file mode 100644
index 0000000000..7cc04cfc0c
--- /dev/null
+++ b/tests/test_sdist.py
@@ -0,0 +1,110 @@
+"""Tests for distutils.command.sdist."""
+import os
+import unittest
+import shutil
+import zipfile
+from os.path import join
+
+from distutils.command.sdist import sdist
+from distutils.core import Distribution
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+CURDIR = os.path.dirname(__file__)
+TEMP_PKG = join(CURDIR, 'temppkg')
+
+SETUP_PY = """
+from distutils.core import setup
+import somecode
+
+setup(name='fake')
+"""
+
+MANIFEST_IN = """
+recursive-include somecode *
+"""
+
+class sdistTestCase(PyPIRCCommandTestCase):
+
+    def setUp(self):
+        PyPIRCCommandTestCase.setUp(self)
+        self.old_path = os.getcwd()
+
+    def tearDown(self):
+        os.chdir(self.old_path)
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        PyPIRCCommandTestCase.tearDown(self)
+
+    def _write(self, path, content):
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
+
+    def test_prune_file_list(self):
+        # this test creates a package with some vcs dirs in it
+        # and launch sdist to make sure they get pruned
+        # on all systems
+        if not os.path.exists(TEMP_PKG):
+            os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+
+        # creating VCS directories with some files in them
+        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
+        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
+        self._write(join(TEMP_PKG, 'somecode', '.hg',
+                         'ok'), 'xxx')
+
+        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
+        self._write(join(TEMP_PKG, 'somecode', '.git',
+                         'ok'), 'xxx')
+
+        os.chdir(TEMP_PKG)
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # zip is available universally
+        # (tar might not be installed under win32)
+        cmd.formats = ['zip']
+        cmd.run()
+
+        # now let's check what we have
+        dist_folder = join(TEMP_PKG, 'dist')
+        files = os.listdir(dist_folder)
+        self.assertEquals(files, ['fake-1.0.zip'])
+
+        zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
+        try:
+            content = zip_file.namelist()
+        finally:
+            zip_file.close()
+
+        # making sure everything has been pruned correctly
+        self.assertEquals(len(content), 4)
+
+def test_suite():
+    return unittest.makeSuite(sdistTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 5a672e9f309ce3c1bf808e839c00369b7e75a25d Mon Sep 17 00:00:00 2001
From: Raymond Hettinger <python@rcn.com>
Date: Tue, 20 Jan 2009 07:24:44 +0000
Subject: [PATCH 2083/8469] Issue 4998: Decimal should not subclass or register
 with numbers.Real.

---
 command/wininst-8.0.exe | Bin 61440 -> 73728 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-8.0.exe b/command/wininst-8.0.exe
index 7403bfabf5cc10c13ef2b6a2ea276b4f6d26ff37..7407032d4b12d53cb4dd8f63b8f600e95eb8f1a8 100644
GIT binary patch
delta 26694
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

delta 17844
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
Ty(jg%1=9?n*VSo;gt-3&JwIim


From 135be1455bb46863549fadf72cb99b0c30c9bece Mon Sep 17 00:00:00 2001
From: Raymond Hettinger <python@rcn.com>
Date: Tue, 20 Jan 2009 21:25:32 +0000
Subject: [PATCH 2084/8469] Revert part of r68799 which unintentionally updated
 this file.

---
 command/wininst-8.0.exe | Bin 73728 -> 61440 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-8.0.exe b/command/wininst-8.0.exe
index 7407032d4b12d53cb4dd8f63b8f600e95eb8f1a8..7403bfabf5cc10c13ef2b6a2ea276b4f6d26ff37 100644
GIT binary patch
delta 17844
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
Ty(jg%1=9?n*VSo;gt-3&JwIim

delta 26694
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


From 31b6b08aad43d5139d126dee38b1de471914423f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Jan 2009 18:19:25 +0000
Subject: [PATCH 2085/8469] Fixed #4863: removed distutils.mwerkscompiler

---
 ccompiler.py      |   3 -
 mwerkscompiler.py | 248 ----------------------------------------------
 2 files changed, 251 deletions(-)
 delete mode 100644 mwerkscompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index 87d6e27396..aa92a9f174 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1063,7 +1063,6 @@ def mkpath (self, name, mode=0777):
     # OS name mappings
     ('posix', 'unix'),
     ('nt', 'msvc'),
-    ('mac', 'mwerks'),
 
     )
 
@@ -1103,8 +1102,6 @@ def get_default_compiler(osname=None, platform=None):
                                "Mingw32 port of GNU C Compiler for Win32"),
                    'bcpp':    ('bcppcompiler', 'BCPPCompiler',
                                "Borland C++ Compiler"),
-                   'mwerks':  ('mwerkscompiler', 'MWerksCompiler',
-                               "MetroWerks CodeWarrior"),
                    'emx':     ('emxccompiler', 'EMXCCompiler',
                                "EMX port of GNU C Compiler for OS/2"),
                  }
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
deleted file mode 100644
index 343c6cecae..0000000000
--- a/mwerkscompiler.py
+++ /dev/null
@@ -1,248 +0,0 @@
-"""distutils.mwerkscompiler
-
-Contains MWerksCompiler, an implementation of the abstract CCompiler class
-for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
-Windows."""
-
-# This module should be kept compatible with Python 2.1.
-
-__revision__ = "$Id$"
-
-import sys, os, string
-from types import *
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
-import distutils.util
-import distutils.dir_util
-from distutils import log
-
-class MWerksCompiler (CCompiler) :
-    """Concrete class that implements an interface to MetroWerks CodeWarrior,
-       as defined by the CCompiler abstract class."""
-
-    compiler_type = 'mwerks'
-
-    # Just set this so CCompiler's constructor doesn't barf.  We currently
-    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
-    # as it really isn't necessary for this sort of single-compiler class.
-    # Would be nice to have a consistent interface with UnixCCompiler,
-    # though, so it's worth thinking about.
-    executables = {}
-
-    # Private class data (need to distinguish C from C++ source for compiler)
-    _c_extensions = ['.c']
-    _cpp_extensions = ['.cc', '.cpp', '.cxx']
-    _rc_extensions = ['.r']
-    _exp_extension = '.exp'
-
-    # Needed for the filename generation methods provided by the
-    # base class, CCompiler.
-    src_extensions = (_c_extensions + _cpp_extensions +
-                      _rc_extensions)
-    res_extension = '.rsrc'
-    obj_extension = '.obj' # Not used, really
-    static_lib_extension = '.lib'
-    shared_lib_extension = '.slb'
-    static_lib_format = shared_lib_format = '%s%s'
-    exe_extension = ''
-
-
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
-        CCompiler.__init__ (self, verbose, dry_run, force)
-
-
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None,
-                 depends=None):
-        (output_dir, macros, include_dirs) = \
-           self._fix_compile_args (output_dir, macros, include_dirs)
-        self.__sources = sources
-        self.__macros = macros
-        self.__include_dirs = include_dirs
-        # Don't need extra_preargs and extra_postargs for CW
-        return []
-
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-        # First fixup.
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
-
-        # First examine a couple of options for things that aren't implemented yet
-        if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
-            raise DistutilsPlatformError, 'Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac'
-        if runtime_library_dirs:
-            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
-        if extra_preargs or extra_postargs:
-            raise DistutilsPlatformError, 'Runtime library dirs not implemented yet'
-        if len(export_symbols) != 1:
-            raise DistutilsPlatformError, 'Need exactly one export symbol'
-        # Next there are various things for which we need absolute pathnames.
-        # This is because we (usually) create the project in a subdirectory of
-        # where we are now, and keeping the paths relative is too much work right
-        # now.
-        sources = map(self._filename_to_abs, self.__sources)
-        include_dirs = map(self._filename_to_abs, self.__include_dirs)
-        if objects:
-            objects = map(self._filename_to_abs, objects)
-        else:
-            objects = []
-        if build_temp:
-            build_temp = self._filename_to_abs(build_temp)
-        else:
-            build_temp = os.curdir()
-        if output_dir:
-            output_filename = os.path.join(output_dir, output_filename)
-        # The output filename needs special handling: splitting it into dir and
-        # filename part. Actually I'm not sure this is really needed, but it
-        # can't hurt.
-        output_filename = self._filename_to_abs(output_filename)
-        output_dir, output_filename = os.path.split(output_filename)
-        # Now we need the short names of a couple of things for putting them
-        # into the project.
-        if output_filename[-8:] == '.ppc.slb':
-            basename = output_filename[:-8]
-        elif output_filename[-11:] == '.carbon.slb':
-            basename = output_filename[:-11]
-        else:
-            basename = os.path.strip(output_filename)[0]
-        projectname = basename + '.mcp'
-        targetname = basename
-        xmlname = basename + '.xml'
-        exportname = basename + '.mcp.exp'
-        prefixname = 'mwerks_%s_config.h'%basename
-        # Create the directories we need
-        distutils.dir_util.mkpath(build_temp, dry_run=self.dry_run)
-        distutils.dir_util.mkpath(output_dir, dry_run=self.dry_run)
-        # And on to filling in the parameters for the project builder
-        settings = {}
-        settings['mac_exportname'] = exportname
-        settings['mac_outputdir'] = output_dir
-        settings['mac_dllname'] = output_filename
-        settings['mac_targetname'] = targetname
-        settings['sysprefix'] = sys.prefix
-        settings['mac_sysprefixtype'] = 'Absolute'
-        sourcefilenames = []
-        sourcefiledirs = []
-        for filename in sources + objects:
-            dirname, filename = os.path.split(filename)
-            sourcefilenames.append(filename)
-            if not dirname in sourcefiledirs:
-                sourcefiledirs.append(dirname)
-        settings['sources'] = sourcefilenames
-        settings['libraries'] = libraries
-        settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
-        if self.dry_run:
-            print 'CALLING LINKER IN', os.getcwd()
-            for key, value in settings.items():
-                print '%20.20s %s'%(key, value)
-            return
-        # Build the export file
-        exportfilename = os.path.join(build_temp, exportname)
-        log.debug("\tCreate export file %s", exportfilename)
-        fp = open(exportfilename, 'w')
-        fp.write('%s\n'%export_symbols[0])
-        fp.close()
-        # Generate the prefix file, if needed, and put it in the settings
-        if self.__macros:
-            prefixfilename = os.path.join(os.getcwd(), os.path.join(build_temp, prefixname))
-            fp = open(prefixfilename, 'w')
-            fp.write('#include "mwerks_shcarbon_config.h"\n')
-            for name, value in self.__macros:
-                if value is None:
-                    fp.write('#define %s\n'%name)
-                else:
-                    fp.write('#define %s %s\n'%(name, value))
-            fp.close()
-            settings['prefixname'] = prefixname
-
-        # Build the XML file. We need the full pathname (only lateron, really)
-        # because we pass this pathname to CodeWarrior in an AppleEvent, and CW
-        # doesn't have a clue about our working directory.
-        xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
-        log.debug("\tCreate XML file %s", xmlfilename)
-        import mkcwproject
-        xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
-        xmlbuilder.generate()
-        xmldata = settings['tmp_projectxmldata']
-        fp = open(xmlfilename, 'w')
-        fp.write(xmldata)
-        fp.close()
-        # Generate the project. Again a full pathname.
-        projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
-        log.debug('\tCreate project file %s', projectfilename)
-        mkcwproject.makeproject(xmlfilename, projectfilename)
-        # And build it
-        log.debug('\tBuild project')
-        mkcwproject.buildproject(projectfilename)
-
-    def _filename_to_abs(self, filename):
-        # Some filenames seem to be unix-like. Convert to Mac names.
-##        if '/' in filename and ':' in filename:
-##           raise DistutilsPlatformError, 'Filename may be Unix or Mac style: %s'%filename
-##        if '/' in filename:
-##           filename = macurl2path(filename)
-        filename = distutils.util.convert_path(filename)
-        if not os.path.isabs(filename):
-            curdir = os.getcwd()
-            filename = os.path.join(curdir, filename)
-        # Finally remove .. components
-        components = string.split(filename, ':')
-        for i in range(1, len(components)):
-            if components[i] == '..':
-                components[i] = ''
-        return string.join(components, ':')
-
-    def library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of
-        directories searched for libraries.
-        """
-        return # XXXX Not correct...
-
-    def runtime_library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of
-        directories searched for runtime libraries.
-        """
-        # Nothing needed or Mwerks/Mac.
-        return
-
-    def library_option (self, lib):
-        """Return the compiler option to add 'dir' to the list of libraries
-        linked into the shared library or executable.
-        """
-        return
-
-    def find_library_file (self, dirs, lib, debug=0):
-        """Search the specified list of directories for a static or shared
-        library file 'lib' and return the full path to that file.  If
-        'debug' true, look for a debugging version (if that makes sense on
-        the current platform).  Return None if 'lib' wasn't found in any of
-        the specified directories.
-        """
-        return 0

From 0f5cedfabbc30367ff2a5a566e959254855aabc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Jan 2009 18:27:45 +0000
Subject: [PATCH 2086/8469] Merged revisions 68929 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68929 | tarek.ziade | 2009-01-25 19:19:25 +0100 (Sun, 25 Jan 2009) | 1 line

  Fixed #4863: removed distutils.mwerkscompiler
........
---
 ccompiler.py      |   3 -
 mwerkscompiler.py | 245 ----------------------------------------------
 2 files changed, 248 deletions(-)
 delete mode 100644 mwerkscompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index f5d1587d72..cad663a348 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1004,7 +1004,6 @@ def mkpath (self, name, mode=0o777):
     # OS name mappings
     ('posix', 'unix'),
     ('nt', 'msvc'),
-    ('mac', 'mwerks'),
 
     )
 
@@ -1042,8 +1041,6 @@ def get_default_compiler(osname=None, platform=None):
                                "Mingw32 port of GNU C Compiler for Win32"),
                    'bcpp':    ('bcppcompiler', 'BCPPCompiler',
                                "Borland C++ Compiler"),
-                   'mwerks':  ('mwerkscompiler', 'MWerksCompiler',
-                               "MetroWerks CodeWarrior"),
                    'emx':     ('emxccompiler', 'EMXCCompiler',
                                "EMX port of GNU C Compiler for OS/2"),
                  }
diff --git a/mwerkscompiler.py b/mwerkscompiler.py
deleted file mode 100644
index 130cd6147b..0000000000
--- a/mwerkscompiler.py
+++ /dev/null
@@ -1,245 +0,0 @@
-"""distutils.mwerkscompiler
-
-Contains MWerksCompiler, an implementation of the abstract CCompiler class
-for MetroWerks CodeWarrior on the Macintosh. Needs work to support CW on
-Windows."""
-
-__revision__ = "$Id$"
-
-import sys, os
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
-import distutils.util
-import distutils.dir_util
-from distutils import log
-
-class MWerksCompiler (CCompiler) :
-    """Concrete class that implements an interface to MetroWerks CodeWarrior,
-       as defined by the CCompiler abstract class."""
-
-    compiler_type = 'mwerks'
-
-    # Just set this so CCompiler's constructor doesn't barf.  We currently
-    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
-    # as it really isn't necessary for this sort of single-compiler class.
-    # Would be nice to have a consistent interface with UnixCCompiler,
-    # though, so it's worth thinking about.
-    executables = {}
-
-    # Private class data (need to distinguish C from C++ source for compiler)
-    _c_extensions = ['.c']
-    _cpp_extensions = ['.cc', '.cpp', '.cxx']
-    _rc_extensions = ['.r']
-    _exp_extension = '.exp'
-
-    # Needed for the filename generation methods provided by the
-    # base class, CCompiler.
-    src_extensions = (_c_extensions + _cpp_extensions +
-                      _rc_extensions)
-    res_extension = '.rsrc'
-    obj_extension = '.obj' # Not used, really
-    static_lib_extension = '.lib'
-    shared_lib_extension = '.slb'
-    static_lib_format = shared_lib_format = '%s%s'
-    exe_extension = ''
-
-
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
-        CCompiler.__init__ (self, verbose, dry_run, force)
-
-
-    def compile (self,
-                 sources,
-                 output_dir=None,
-                 macros=None,
-                 include_dirs=None,
-                 debug=0,
-                 extra_preargs=None,
-                 extra_postargs=None,
-                 depends=None):
-        (output_dir, macros, include_dirs) = \
-           self._fix_compile_args (output_dir, macros, include_dirs)
-        self.__sources = sources
-        self.__macros = macros
-        self.__include_dirs = include_dirs
-        # Don't need extra_preargs and extra_postargs for CW
-        return []
-
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-        # First fixup.
-        (objects, output_dir) = self._fix_object_args (objects, output_dir)
-        (libraries, library_dirs, runtime_library_dirs) = \
-            self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
-
-        # First examine a couple of options for things that aren't implemented yet
-        if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
-            raise DistutilsPlatformError('Can only make SHARED_LIBRARY or SHARED_OBJECT targets on the Mac')
-        if runtime_library_dirs:
-            raise DistutilsPlatformError('Runtime library dirs not implemented yet')
-        if extra_preargs or extra_postargs:
-            raise DistutilsPlatformError('Runtime library dirs not implemented yet')
-        if len(export_symbols) != 1:
-            raise DistutilsPlatformError('Need exactly one export symbol')
-        # Next there are various things for which we need absolute pathnames.
-        # This is because we (usually) create the project in a subdirectory of
-        # where we are now, and keeping the paths relative is too much work right
-        # now.
-        sources = [self._filename_to_abs(s) for s in self.__sources]
-        include_dirs = [self._filename_to_abs(d) for d in self.__include_dirs]
-        if objects:
-            objects = [self._filename_to_abs(o) for o in objects]
-        else:
-            objects = []
-        if build_temp:
-            build_temp = self._filename_to_abs(build_temp)
-        else:
-            build_temp = os.curdir()
-        if output_dir:
-            output_filename = os.path.join(output_dir, output_filename)
-        # The output filename needs special handling: splitting it into dir and
-        # filename part. Actually I'm not sure this is really needed, but it
-        # can't hurt.
-        output_filename = self._filename_to_abs(output_filename)
-        output_dir, output_filename = os.path.split(output_filename)
-        # Now we need the short names of a couple of things for putting them
-        # into the project.
-        if output_filename[-8:] == '.ppc.slb':
-            basename = output_filename[:-8]
-        elif output_filename[-11:] == '.carbon.slb':
-            basename = output_filename[:-11]
-        else:
-            basename = os.path.strip(output_filename)[0]
-        projectname = basename + '.mcp'
-        targetname = basename
-        xmlname = basename + '.xml'
-        exportname = basename + '.mcp.exp'
-        prefixname = 'mwerks_%s_config.h'%basename
-        # Create the directories we need
-        distutils.dir_util.mkpath(build_temp, dry_run=self.dry_run)
-        distutils.dir_util.mkpath(output_dir, dry_run=self.dry_run)
-        # And on to filling in the parameters for the project builder
-        settings = {}
-        settings['mac_exportname'] = exportname
-        settings['mac_outputdir'] = output_dir
-        settings['mac_dllname'] = output_filename
-        settings['mac_targetname'] = targetname
-        settings['sysprefix'] = sys.prefix
-        settings['mac_sysprefixtype'] = 'Absolute'
-        sourcefilenames = []
-        sourcefiledirs = []
-        for filename in sources + objects:
-            dirname, filename = os.path.split(filename)
-            sourcefilenames.append(filename)
-            if not dirname in sourcefiledirs:
-                sourcefiledirs.append(dirname)
-        settings['sources'] = sourcefilenames
-        settings['libraries'] = libraries
-        settings['extrasearchdirs'] = sourcefiledirs + include_dirs + library_dirs
-        if self.dry_run:
-            print('CALLING LINKER IN', os.getcwd())
-            for key, value in settings.items():
-                print('%20.20s %s'%(key, value))
-            return
-        # Build the export file
-        exportfilename = os.path.join(build_temp, exportname)
-        log.debug("\tCreate export file %s", exportfilename)
-        fp = open(exportfilename, 'w')
-        fp.write('%s\n'%export_symbols[0])
-        fp.close()
-        # Generate the prefix file, if needed, and put it in the settings
-        if self.__macros:
-            prefixfilename = os.path.join(os.getcwd(), os.path.join(build_temp, prefixname))
-            fp = open(prefixfilename, 'w')
-            fp.write('#include "mwerks_shcarbon_config.h"\n')
-            for name, value in self.__macros:
-                if value is None:
-                    fp.write('#define %s\n'%name)
-                else:
-                    fp.write('#define %s %s\n'%(name, value))
-            fp.close()
-            settings['prefixname'] = prefixname
-
-        # Build the XML file. We need the full pathname (only lateron, really)
-        # because we pass this pathname to CodeWarrior in an AppleEvent, and CW
-        # doesn't have a clue about our working directory.
-        xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
-        log.debug("\tCreate XML file %s", xmlfilename)
-        import mkcwproject
-        xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
-        xmlbuilder.generate()
-        xmldata = settings['tmp_projectxmldata']
-        fp = open(xmlfilename, 'w')
-        fp.write(xmldata)
-        fp.close()
-        # Generate the project. Again a full pathname.
-        projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
-        log.debug('\tCreate project file %s', projectfilename)
-        mkcwproject.makeproject(xmlfilename, projectfilename)
-        # And build it
-        log.debug('\tBuild project')
-        mkcwproject.buildproject(projectfilename)
-
-    def _filename_to_abs(self, filename):
-        # Some filenames seem to be unix-like. Convert to Mac names.
-##        if '/' in filename and ':' in filename:
-##           raise DistutilsPlatformError, 'Filename may be Unix or Mac style: %s'%filename
-##        if '/' in filename:
-##           filename = macurl2path(filename)
-        filename = distutils.util.convert_path(filename)
-        if not os.path.isabs(filename):
-            curdir = os.getcwd()
-            filename = os.path.join(curdir, filename)
-        # Finally remove .. components
-        components = filename.split(':')
-        for i in range(1, len(components)):
-            if components[i] == '..':
-                components[i] = ''
-        return ':'.join(components)
-
-    def library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of
-        directories searched for libraries.
-        """
-        return # XXXX Not correct...
-
-    def runtime_library_dir_option (self, dir):
-        """Return the compiler option to add 'dir' to the list of
-        directories searched for runtime libraries.
-        """
-        # Nothing needed or Mwerks/Mac.
-        return
-
-    def library_option (self, lib):
-        """Return the compiler option to add 'dir' to the list of libraries
-        linked into the shared library or executable.
-        """
-        return
-
-    def find_library_file (self, dirs, lib, debug=0):
-        """Search the specified list of directories for a static or shared
-        library file 'lib' and return the full path to that file.  If
-        'debug' true, look for a debugging version (if that makes sense on
-        the current platform).  Return None if 'lib' wasn't found in any of
-        the specified directories.
-        """
-        return 0

From d404801cfcaaf114b9e8ac94f40cce68c293f671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Jan 2009 22:09:10 +0000
Subject: [PATCH 2087/8469] Issue #5052: removed backward compatibility
 information (out of date)

---
 __init__.py                | 2 --
 archive_util.py            | 2 --
 bcppcompiler.py            | 2 --
 ccompiler.py               | 2 --
 cmd.py                     | 2 --
 command/__init__.py        | 2 --
 command/bdist.py           | 2 --
 command/bdist_dumb.py      | 2 --
 command/bdist_rpm.py       | 2 --
 command/bdist_wininst.py   | 2 --
 command/build.py           | 2 --
 command/build_clib.py      | 2 --
 command/build_ext.py       | 2 --
 command/build_py.py        | 2 --
 command/build_scripts.py   | 2 --
 command/clean.py           | 2 --
 command/config.py          | 2 --
 command/install.py         | 2 --
 command/install_data.py    | 2 --
 command/install_headers.py | 2 --
 command/install_lib.py     | 2 --
 command/install_scripts.py | 2 --
 command/sdist.py           | 2 --
 core.py                    | 2 --
 cygwinccompiler.py         | 2 --
 debug.py                   | 2 --
 dep_util.py                | 2 --
 dir_util.py                | 2 --
 dist.py                    | 2 --
 errors.py                  | 2 --
 fancy_getopt.py            | 2 --
 file_util.py               | 2 --
 filelist.py                | 2 --
 log.py                     | 2 --
 msvccompiler.py            | 2 --
 spawn.py                   | 2 --
 36 files changed, 72 deletions(-)

diff --git a/__init__.py b/__init__.py
index 7315a37271..57fcf97602 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,8 +8,6 @@
    setup (...)
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 # Distutils version
diff --git a/archive_util.py b/archive_util.py
index 264e66faf2..b50563e317 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,8 +3,6 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/bcppcompiler.py b/bcppcompiler.py
index d4fc53366f..5a0fa727cd 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,8 +11,6 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 
diff --git a/ccompiler.py b/ccompiler.py
index aa92a9f174..a56a03880e 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,8 +3,6 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, re
diff --git a/cmd.py b/cmd.py
index 3cd5858920..267cf1802e 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,8 +4,6 @@
 in the distutils.command package.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/__init__.py b/command/__init__.py
index 0888c2712b..add83f8740 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -3,8 +3,6 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 __all__ = ['build',
diff --git a/command/bdist.py b/command/bdist.py
index ca3da74c06..3df5ef4c42 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index f740c468e7..7324c6c2fa 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,8 +4,6 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 9aa7030049..a48e0f186f 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index f18e318cb9..ad6eee8ea8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/build.py b/command/build.py
index 7462e9348f..84e050204e 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/command/build_clib.py b/command/build_clib.py
index 69d8c75166..fe921fb88b 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,8 +4,6 @@
 that is included in the module distribution and needed by an extension
 module."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 1461409f60..fbf2a0b217 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,8 +4,6 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/build_py.py b/command/build_py.py
index 3bf1267328..d9c15749d0 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_py' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import string, os
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 104be0b349..48e06aa562 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_scripts' command."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, re
diff --git a/command/clean.py b/command/clean.py
index 02189c531a..ba03d1fff6 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -4,8 +4,6 @@
 
 # contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/config.py b/command/config.py
index 520c1b0c76..6b358cf250 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,8 +9,6 @@
 this header file lives".
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/command/install.py b/command/install.py
index 44c76926ea..adc9daf11a 100644
--- a/command/install.py
+++ b/command/install.py
@@ -4,8 +4,6 @@
 
 from distutils import log
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/command/install_data.py b/command/install_data.py
index 1069830fb3..cb11371023 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -5,8 +5,6 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/install_headers.py b/command/install_headers.py
index 4895240a4c..c25b771246 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 from distutils.core import Command
diff --git a/command/install_lib.py b/command/install_lib.py
index 81107a85cb..fed7e5363d 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,5 +1,3 @@
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/install_scripts.py b/command/install_scripts.py
index fe93ef5af2..29cd9e7a0e 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -5,8 +5,6 @@
 
 # contributed by Bastian Kleineidam
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/command/sdist.py b/command/sdist.py
index 27883fd68b..6ce8c43ddc 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, string
diff --git a/core.py b/core.py
index 62a3389b53..0e85ca6f06 100644
--- a/core.py
+++ b/core.py
@@ -6,8 +6,6 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 94a7bd96ee..3ac1dceb3e 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -45,8 +45,6 @@
 # * mingw gcc 3.2/ld 2.13 works
 #   (ld supports -shared)
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os,sys,copy
diff --git a/debug.py b/debug.py
index b67139c7d4..2886744402 100644
--- a/debug.py
+++ b/debug.py
@@ -1,7 +1,5 @@
 import os
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
diff --git a/dep_util.py b/dep_util.py
index 2c6d7927f0..39eecfb248 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,8 +4,6 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/dir_util.py b/dir_util.py
index 77f253255f..54f5c68e28 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,8 +2,6 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, sys
diff --git a/dist.py b/dist.py
index 18cc910900..3dd776ccd2 100644
--- a/dist.py
+++ b/dist.py
@@ -4,8 +4,6 @@
 being built/installed/distributed.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string, re
diff --git a/errors.py b/errors.py
index e72221bdba..963d83377c 100644
--- a/errors.py
+++ b/errors.py
@@ -8,8 +8,6 @@
 This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 class DistutilsError (Exception):
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 31cf0c5c3b..e19319ae9d 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,8 +8,6 @@
   * options set attributes of a passed-in object
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, string, re
diff --git a/file_util.py b/file_util.py
index 37b152ed8a..3af6344f11 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,8 +3,6 @@
 Utility functions for operating on single files.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os
diff --git a/filelist.py b/filelist.py
index 6d27cce64f..51a1d57e13 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,8 +4,6 @@
 and building lists of files.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import os, string, re
diff --git a/log.py b/log.py
index 95d4c1c5a2..fcaa545a79 100644
--- a/log.py
+++ b/log.py
@@ -1,7 +1,5 @@
 """A simple log mechanism styled after PEP 282."""
 
-# This module should be kept compatible with Python 2.1.
-
 # The class here is styled after PEP 282 so that it could later be
 # replaced with a standard Python logging implementation.
 
diff --git a/msvccompiler.py b/msvccompiler.py
index 30a9fc6f22..d38afb7223 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -8,8 +8,6 @@
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string
diff --git a/spawn.py b/spawn.py
index e5654ff009..a6d3426390 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,8 +6,6 @@
 executable name.
 """
 
-# This module should be kept compatible with Python 2.1.
-
 __revision__ = "$Id$"
 
 import sys, os, string

From f95cd9c07c8f71e37cbe442b9e1a6df70029df63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Jan 2009 22:11:04 +0000
Subject: [PATCH 2088/8469] added missing module docstring

---
 command/install_lib.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/command/install_lib.py b/command/install_lib.py
index fed7e5363d..4c62c7133a 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,3 +1,8 @@
+"""distutils.command.install_lib
+
+Implements the Distutils 'install_lib' command
+(install all Python modules)."""
+
 __revision__ = "$Id$"
 
 import os

From e59b73327e824b92fd5ab54894b6ba1fd91e16d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Jan 2009 23:34:00 +0000
Subject: [PATCH 2089/8469] Fixed #1885: --formats=tar,gztar was not working
 properly in the sdist command

---
 command/sdist.py    |  4 +++
 tests/test_sdist.py | 77 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 6ce8c43ddc..e8b6bce9c9 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -456,6 +456,10 @@ def make_distribution (self):
 
         self.make_release_tree(base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
+        # tar archive must be created last to avoid overwrite and remove
+        if 'tar' in self.formats:
+            self.formats.append(self.formats.pop(self.formats.index('tar')))
+
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 7cc04cfc0c..96ec381ec6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -4,10 +4,13 @@
 import shutil
 import zipfile
 from os.path import join
+import sys
 
 from distutils.command.sdist import sdist
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
+from distutils.errors import DistutilsExecError
+from distutils.spawn import spawn
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -35,6 +38,19 @@ def tearDown(self):
             shutil.rmtree(TEMP_PKG)
         PyPIRCCommandTestCase.tearDown(self)
 
+    def _init_tmp_pkg(self):
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+        os.mkdir(join(TEMP_PKG, 'dist'))
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        os.chdir(TEMP_PKG)
+
     def _write(self, path, content):
         f = open(path, 'w')
         try:
@@ -46,15 +62,7 @@ def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
         # on all systems
-        if not os.path.exists(TEMP_PKG):
-            os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-
-        # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
         os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
@@ -68,8 +76,6 @@ def test_prune_file_list(self):
         self._write(join(TEMP_PKG, 'somecode', '.git',
                          'ok'), 'xxx')
 
-        os.chdir(TEMP_PKG)
-
         # now building a sdist
         dist = Distribution()
         dist.script_name = 'setup.py'
@@ -103,6 +109,55 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
+    def test_make_distribution(self):
+
+        self._init_tmp_pkg()
+
+        # check if tar is installed under win32
+        if sys.platform == 'win32':
+            try:
+                spawn('tar --help')
+            except DistutilsExecError:
+                # let's return, no need to go further
+                return
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # creating a gztar then a tar
+        cmd.formats = ['gztar', 'tar']
+        cmd.run()
+
+        # making sure we have two files
+        dist_folder = join(TEMP_PKG, 'dist')
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+
+        os.remove(join(dist_folder, 'fake-1.0.tar'))
+        os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
+
+        # now trying a tar then a gztar
+        cmd.formats = ['tar', 'gztar']
+        cmd.run()
+
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From adc20e818b17882e3ef80dcd2c4a81decb9e9888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 26 Jan 2009 17:20:15 +0000
Subject: [PATCH 2090/8469] Merged revisions 68951 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68951 | tarek.ziade | 2009-01-26 00:34:00 +0100 (Mon, 26 Jan 2009) | 1 line

  Fixed #1885: --formats=tar,gztar was not working properly in the sdist command
........
---
 command/sdist.py    |  4 +++
 tests/test_sdist.py | 77 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 27883fd68b..a366d1eaf6 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -458,6 +458,10 @@ def make_distribution (self):
 
         self.make_release_tree(base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
+        # tar archive must be created last to avoid overwrite and remove
+        if 'tar' in self.formats:
+            self.formats.append(self.formats.pop(self.formats.index('tar')))
+
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 7cc04cfc0c..96ec381ec6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -4,10 +4,13 @@
 import shutil
 import zipfile
 from os.path import join
+import sys
 
 from distutils.command.sdist import sdist
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
+from distutils.errors import DistutilsExecError
+from distutils.spawn import spawn
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -35,6 +38,19 @@ def tearDown(self):
             shutil.rmtree(TEMP_PKG)
         PyPIRCCommandTestCase.tearDown(self)
 
+    def _init_tmp_pkg(self):
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+        os.mkdir(join(TEMP_PKG, 'dist'))
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        os.chdir(TEMP_PKG)
+
     def _write(self, path, content):
         f = open(path, 'w')
         try:
@@ -46,15 +62,7 @@ def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
         # on all systems
-        if not os.path.exists(TEMP_PKG):
-            os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-
-        # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
         os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
@@ -68,8 +76,6 @@ def test_prune_file_list(self):
         self._write(join(TEMP_PKG, 'somecode', '.git',
                          'ok'), 'xxx')
 
-        os.chdir(TEMP_PKG)
-
         # now building a sdist
         dist = Distribution()
         dist.script_name = 'setup.py'
@@ -103,6 +109,55 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
+    def test_make_distribution(self):
+
+        self._init_tmp_pkg()
+
+        # check if tar is installed under win32
+        if sys.platform == 'win32':
+            try:
+                spawn('tar --help')
+            except DistutilsExecError:
+                # let's return, no need to go further
+                return
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # creating a gztar then a tar
+        cmd.formats = ['gztar', 'tar']
+        cmd.run()
+
+        # making sure we have two files
+        dist_folder = join(TEMP_PKG, 'dist')
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+
+        os.remove(join(dist_folder, 'fake-1.0.tar'))
+        os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
+
+        # now trying a tar then a gztar
+        cmd.formats = ['tar', 'gztar']
+        cmd.run()
+
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From da4be9fd4435d184850ca6f2f1e2f00429ac7f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 26 Jan 2009 17:23:20 +0000
Subject: [PATCH 2091/8469] Merged revisions 68951 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68951 | tarek.ziade | 2009-01-26 00:34:00 +0100 (Mon, 26 Jan 2009) | 1 line

  Fixed #1885: --formats=tar,gztar was not working properly in the sdist command
........
---
 command/sdist.py    |  4 +++
 tests/test_sdist.py | 77 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 96fb7fa1a7..054fe191d4 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -428,6 +428,10 @@ def make_distribution(self):
 
         self.make_release_tree(base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
+        # tar archive must be created last to avoid overwrite and remove
+        if 'tar' in self.formats:
+            self.formats.append(self.formats.pop(self.formats.index('tar')))
+
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 7cc04cfc0c..96ec381ec6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -4,10 +4,13 @@
 import shutil
 import zipfile
 from os.path import join
+import sys
 
 from distutils.command.sdist import sdist
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
+from distutils.errors import DistutilsExecError
+from distutils.spawn import spawn
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -35,6 +38,19 @@ def tearDown(self):
             shutil.rmtree(TEMP_PKG)
         PyPIRCCommandTestCase.tearDown(self)
 
+    def _init_tmp_pkg(self):
+        if os.path.exists(TEMP_PKG):
+            shutil.rmtree(TEMP_PKG)
+        os.mkdir(TEMP_PKG)
+        os.mkdir(join(TEMP_PKG, 'somecode'))
+        os.mkdir(join(TEMP_PKG, 'dist'))
+        # creating a MANIFEST, a package, and a README
+        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(TEMP_PKG, 'README'), 'xxx')
+        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
+        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        os.chdir(TEMP_PKG)
+
     def _write(self, path, content):
         f = open(path, 'w')
         try:
@@ -46,15 +62,7 @@ def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
         # on all systems
-        if not os.path.exists(TEMP_PKG):
-            os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-
-        # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
+        self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
         os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
@@ -68,8 +76,6 @@ def test_prune_file_list(self):
         self._write(join(TEMP_PKG, 'somecode', '.git',
                          'ok'), 'xxx')
 
-        os.chdir(TEMP_PKG)
-
         # now building a sdist
         dist = Distribution()
         dist.script_name = 'setup.py'
@@ -103,6 +109,55 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
+    def test_make_distribution(self):
+
+        self._init_tmp_pkg()
+
+        # check if tar is installed under win32
+        if sys.platform == 'win32':
+            try:
+                spawn('tar --help')
+            except DistutilsExecError:
+                # let's return, no need to go further
+                return
+
+        # now building a sdist
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        dist.metadata.name = 'fake'
+        dist.metadata.version = '1.0'
+        dist.metadata.url = 'http://xxx'
+        dist.metadata.author = dist.metadata.author_email = 'xxx'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+
+        # creating a gztar then a tar
+        cmd.formats = ['gztar', 'tar']
+        cmd.run()
+
+        # making sure we have two files
+        dist_folder = join(TEMP_PKG, 'dist')
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+
+        os.remove(join(dist_folder, 'fake-1.0.tar'))
+        os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
+
+        # now trying a tar then a gztar
+        cmd.formats = ['tar', 'gztar']
+        cmd.run()
+
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result,
+                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 52141aae7f073fe917c841ddbb4531a9beb04ddc Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 27 Jan 2009 18:17:45 +0000
Subject: [PATCH 2092/8469] Issue #1717: Remove cmp.  Stage 1: remove all uses
 of cmp and __cmp__ from the standard library and tests.

---
 version.py | 63 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/version.py b/version.py
index 907f71c313..77814377a5 100644
--- a/version.py
+++ b/version.py
@@ -21,7 +21,7 @@
     an equivalent string -- ie. one that will generate an equivalent
     version number instance)
   * __repr__ generates Python code to recreate the version number instance
-  * __cmp__ compares the current instance with either another instance
+  * _cmp compares the current instance with either another instance
     of the same class or a string (which will be parsed to an instance
     of the same class, thus must follow the same rules)
 """
@@ -32,7 +32,7 @@ class Version:
     """Abstract base class for version numbering classes.  Just provides
     constructor (__init__) and reproducer (__repr__), because those
     seem to be the same for all version numbering classes; and route
-    rich comparisons to __cmp__.
+    rich comparisons to _cmp.
     """
 
     def __init__ (self, vstring=None):
@@ -43,37 +43,37 @@ def __repr__ (self):
         return "%s ('%s')" % (self.__class__.__name__, str(self))
 
     def __eq__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c == 0
 
     def __ne__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c != 0
 
     def __lt__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c < 0
 
     def __le__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c <= 0
 
     def __gt__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c > 0
 
     def __ge__(self, other):
-        c = self.__cmp__(other)
+        c = self._cmp(other)
         if c is NotImplemented:
             return c
         return c >= 0
@@ -91,7 +91,7 @@ def __ge__(self, other):
 #                        (if not identical to) the string supplied to parse
 #    __repr__ (self)   - generate Python code to recreate
 #                        the instance
-#    __cmp__ (self, other) - compare two version numbers ('other' may
+#    _cmp (self, other) - compare two version numbers ('other' may
 #                        be an unparsed version string, or another
 #                        instance of your version class)
 
@@ -169,30 +169,39 @@ def __str__ (self):
         return vstring
 
 
-    def __cmp__ (self, other):
+    def _cmp (self, other):
         if isinstance(other, str):
             other = StrictVersion(other)
 
-        compare = cmp(self.version, other.version)
-        if (compare == 0):              # have to compare prerelease
-
-            # case 1: neither has prerelease; they're equal
-            # case 2: self has prerelease, other doesn't; other is greater
-            # case 3: self doesn't have prerelease, other does: self is greater
-            # case 4: both have prerelease: must compare them!
+        if self.version != other.version:
+            # numeric versions don't match
+            # prerelease stuff doesn't matter
+            if self.version < other.version:
+                return -1
+            else:
+                return 1
 
-            if (not self.prerelease and not other.prerelease):
+        # have to compare prerelease
+        # case 1: neither has prerelease; they're equal
+        # case 2: self has prerelease, other doesn't; other is greater
+        # case 3: self doesn't have prerelease, other does: self is greater
+        # case 4: both have prerelease: must compare them!
+
+        if (not self.prerelease and not other.prerelease):
+            return 0
+        elif (self.prerelease and not other.prerelease):
+            return -1
+        elif (not self.prerelease and other.prerelease):
+            return 1
+        elif (self.prerelease and other.prerelease):
+            if self.prerelease == other.prerelease:
                 return 0
-            elif (self.prerelease and not other.prerelease):
+            elif self.prerelease < other.prerelease:
                 return -1
-            elif (not self.prerelease and other.prerelease):
+            else:
                 return 1
-            elif (self.prerelease and other.prerelease):
-                return cmp(self.prerelease, other.prerelease)
-
-        else:                           # numeric versions don't match --
-            return compare              # prerelease stuff doesn't matter
-
+        else:
+            assert False, "never get here"
 
 # end class StrictVersion
 
@@ -325,7 +334,7 @@ def __repr__ (self):
         return "LooseVersion ('%s')" % str(self)
 
 
-    def __cmp__ (self, other):
+    def _cmp (self, other):
         if isinstance(other, str):
             other = LooseVersion(other)
 

From 8e32f7ad504aad7f9ed2603c282f0e9831c716ba Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2009 12:13:31 +0000
Subject: [PATCH 2093/8469] Fix issue5075: bdist_wininst should not depend on
 the vc runtime?

---
 command/wininst-9.0-amd64.exe | Bin 77824 -> 223744 bytes
 command/wininst-9.0.exe       | Bin 66048 -> 196096 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index 9dedfcdc2398df99f9540120dba9421452795948..11d8011c717c3a1c54afbe00e002fab6d37766c6 100644
GIT binary patch
literal 223744
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

delta 25108
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
IUt9dY0OTE8cmMzZ

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 9102ecdb51fb3af90b850165af47b79c7c330036..dadb31d8938b9b147830382495eee2453c171648 100644
GIT binary patch
literal 196096
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
VbiX}kC!@(|BEb>BOO|*y{|l?gcMbpm

delta 21049
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
P|H}h@WxVLsyx{)=Bb7Hx


From 4b0e22f7614b2454d2a1b0c1abc13e4cdad49707 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2009 12:31:51 +0000
Subject: [PATCH 2094/8469] Merged revisions 69094 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69094 | mark.hammond | 2009-01-29 23:13:31 +1100 (Thu, 29 Jan 2009) | 2 lines

  Fix issue5075: bdist_wininst should not depend on the vc runtime?
........
---
 command/wininst-9.0-amd64.exe | Bin 77824 -> 223744 bytes
 command/wininst-9.0.exe       | Bin 66048 -> 196096 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index 9dedfcdc2398df99f9540120dba9421452795948..11d8011c717c3a1c54afbe00e002fab6d37766c6 100644
GIT binary patch
literal 223744
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

delta 25108
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
IUt9dY0OTE8cmMzZ

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 9102ecdb51fb3af90b850165af47b79c7c330036..dadb31d8938b9b147830382495eee2453c171648 100644
GIT binary patch
literal 196096
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
VbiX}kC!@(|BEb>BOO|*y{|l?gcMbpm

delta 21049
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
P|H}h@WxVLsyx{)=Bb7Hx


From 7036aee66775cdb74a5c8342e6d08c8df75d4048 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2009 12:36:50 +0000
Subject: [PATCH 2095/8469] Merged revisions 69094 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69094 | mark.hammond | 2009-01-29 23:13:31 +1100 (Thu, 29 Jan 2009) | 2 lines

  Fix issue5075: bdist_wininst should not depend on the vc runtime?
........
---
 command/wininst-9.0-amd64.exe | Bin 77824 -> 223744 bytes
 command/wininst-9.0.exe       | Bin 66048 -> 196096 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index 9dedfcdc2398df99f9540120dba9421452795948..11d8011c717c3a1c54afbe00e002fab6d37766c6 100644
GIT binary patch
literal 223744
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

delta 25108
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
IUt9dY0OTE8cmMzZ

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index 9102ecdb51fb3af90b850165af47b79c7c330036..dadb31d8938b9b147830382495eee2453c171648 100644
GIT binary patch
literal 196096
zcmeFaeSB2awLd&>Nd_30K@tcOAxfg?phgEYae^H}W{Ap!iDM?Dkbo`H)45b>at_d2
z0*Pm0bJ&cfSM0_9Xp5Eha-aIUrT4Lj)k22QB!J3m5rwvBX+7hl8Z?Fpq@3S(?K2Y+
z)b`%z_jz9ac;@ptZ+ox3_u6Z(z4lsbzl{IOn+;}z!C=9qX$Hd{Jn84*_rHHjB6{4k
zUyn1qH0q5T_ZSzvapNPx*BkR!H9YaPhDX1V|J6qyfBXqC|0|E>H%O1?fBo_N@`b_t
zZ#=R5u{*|&9bJ&h`kveew>5mL;7Iy9a?gJrk?_6Jx&6o^{Q1ix%kiw<_rQ^F^5@bc
zO?WnZtMJG%9{+DgH2&Omq>(>=#h(v<{i_1y`9(DdcnyXHMvLLu=UN^}!<;jijbn_X
z42FA52Eze8^uw3&bl?ggjHp8Ic+J3re(9%S8K?*%4sJG6bTbDeSW3X3Lk|ixSbuLa
zY^N8G+0Z+IUOxZV`>@H7_xVvgbk_+JVRiKfJa+<tFZ$gfKDJgw<R51Ni14Di0`K9!
ze1l=x9SzGL6(0r2HpEcfe}w0KBQy2@`#W?n!;W&q_ago}JWqcHuKkXN#)hvF2-OvJ
zHe}=Z!Drw+2>t(m{|{22wOt&)(Hc1@j%gmaQ!;lNmUyI(Izmh=u(kHvBToXAYPPZ<
zyN0bRa0Hw0H;7M!mxR<-um<a`t!?cWm)3M<8nm21RhfaEmM?44En!2Amh%X{Tic}x
zt$!8mHG(ZzW(a3!zmpHx5?M82qxQSn+WroQlqXRC(sC9N^k2oXBOp67m-wVji<j29
z+CB9h)vQPEu?0glY|bn|yZT>6%Jve;DrI$ftwwx=gl5W2vW7xIO|ofkDc(Ujso7h<
zL%})4NF^uD()F5@uSpI-sM(sP0VUx1a{MxY<YYh`70}U1+*u;!+au?BmbS1-tIkJ#
z+r>NdV#218rAUPw{8u`-5I}|F+f!+?c-r`L_ymwR8bycAJS^(%3uscFCgo~5rNECh
z4N_1b01A5WT_R;mqwrpi_r#KrCS`}hmJk9e5CBS0I6JMqMRd1Q-o?mUC`RFln?s>c
z*c8-q762xwc&*x7%xiUbN|OkVsxK7itx}y28o1h*)-OJ&Q@L1fa#(|`&Kjz*w>}H3
z!^Kf=ci0e6e}g{Eyf($#&Aizj#rrz*=7x)f9mq)Wo+h9RuKs{hchaXGo(s^XJo!K#
zh-Pcm#M=VGCPHiqfms6Ts(A)OZLPagoPfx&0bwm+V?kYjOg~@(>iTLxAoWZgVA*hh
z#3WaLiR7Sm%tc*->VGap`yH_PP~#%hcq!}T^@+Y%;6W?5^mxD`&o^HH=loV_eGQdj
zt=+gQ-kq%VG=F)CwVuRF4g1YeJfaJ-K5)*pu_}jizpPGFylv+FEhT}6GBTB>t%`q(
zXmPbCCdiNNGPsVfa952EhSp6bMqSLJl)LMVrE2+dgQ4ZO?f5#_!Mu@ZUKVS-&3w@;
zwY9hd4;f90w8P%&gAi=FKk$&*Vs9k@Yu^`~D!1PewPh*(?e={S<(m&7D9?P<zR#Cu
zo_Cx1n0;U6^=33coB2qz+&Gm*Uq=aww>j$Fqf|$nv5n)~vaNF?$0bm4Pc&fMX!S%6
zN(0XQQU9I?noEsK6#pi1a<pmB!j1Ed^CRt2a_@^E?TVi=X$NcCibUuFGeAT6u@?=|
z@{B!-cQf<uOw49h7DIkY^|p-;5Aq*ydbfdnw^ymwToVz$wH<Kw$Ufksd0%Ay7o(PL
zx!53e0{80)lJZuQ5FP-=yV`VF(?%f4{F|Kn2}g0hCcR{Td7dqR+qi(%m<u>f+8hWQ
z)C)+Z^VLlRw6D^NXst23N|TxcYRTUyHn+9i9{B)>$W1R9#9Zdx<q0tF7W+QWXdtpV
zoT*j6Bp-03f;8{067MeirqC5li{FDA;XbRIWk%Pg$;T=!&MtOg<9MR%fb&hzj~!dM
zaUm#pP)f2xvAF4zpRz;pyXH@JF#mRQx8mQ%{5$OX9=P7wO?6ylOi_(BZE|)tmu4*y
zXGEnv(U5UtrVp(!;QY9`^xiwg37^|C+csvFE)gxIcS<JT169Z`6i|P$3|!3HEdC;J
zcD2XXqweuNV7vG`xItuAL0%59j}yzdkgu0D)9TvhfhE#Io{iS#fueO4%>%CWQ=11K
z7j4Z04N{4xGjpsjaTkAdW{&nPT$m^fTciHLs(||Aukm&(9W7-L)WWt*<{k7UEN$a_
zo`sO1+m>P^s6W{8{7%z6$bK;^p#BX>YBjOIq7Ljg8sx&rjnwI1Ab>QOl(DC%y3EiK
z3R~5}uY++g^srv_AmD42%;#SOXszP2D6{De!vH$8$UC%cc!zGImY%Z%Ache8)mD5-
z_X<0Zua=V!P6l?9giZ80yI}e}1XhekwzcTN8w3%-VE6)ny+9e%M7_;{eX9^!6N2Og
zAm?oH;Z*)o&gbNmnC0pR_i3{}-PT)XP~GLgo<!F@KKaV%hCd@pSi+0n1`6oKBUcDr
z7A4eOZ`7+3(V8v4-Gnbli&>v;MLuCeDC&)X<+U8b4EfpV8}i?A6XBm|r;ICx>XrB@
zktYCNXz3|}EE$q_FM?JfS3gACYxJf_n-yt`BDE>fRz=#bNZYiWtq+$O+?`F=2ZYn1
zk#qv0@gR~#y={T0cMGnqxHjY3ge!upIUu}_L^M!wautBySzyN%Jk|Dq(Ebc6W5me$
zD{7JLdQsMZuoI~g&oJ+HW{p;FdsxW-8MVcD;4vm3G$S(Jh_*&N>dCADtty~LEu*MK
z>8J>g%G0AtDQXU)N~F!=6rOZ5kDsZ>=TrO*JbsHfRg>B{$QBM#u7el|<PxY@B5h4&
zv6aUc=<#Pk@c2837c9JjI|5-%lQxCGE_vW0=H14uVPmv<$HTxl7is1|<ZKdl4YgC6
z0U&<1VF1kJnOlL#)ekLa8>ke28Kv<2kP`vukb0z0KpE<+z@pT|ONo!(tRp_!h0oM*
z4oN$RMoQx93kZX#90tsEQ)Q#6Ob0tOX;71rn$(BU6Xl{mETe~zB<K{k0cy4ZT&d-3
z0u$HruIS*rwrV)9^`PWnh|Qjf3~GdYFe(^_4G2Xw$WUo&?(#;6Y}zT}Cv}_v8FmBp
zQApz&?F7Vj>;FU_&}MH(A<@=t1UkD7?}C9c&`z=0`2h~id9RiFdO(K@2mo%@PNARN
z_&Je4QjesOdqMO!lyYbYWZvfVD0nnAVCoRg{a1y2H-tR<7-GIV%FBhY4}7viJHet<
z>816qHx{c4mk{}T@tq=n9ub42OASj3D(X<9of3}H6Pnv8VGq42-afqU)L#ejx>bKo
z;x(eb_Tp94UwiPnOn+6iQ?7o+d*1yAdxSK#5^2yLAsJF4_1Pmbe@Tk#OQc@$TP0GD
zD3(a7_=NBXQUmQ|t^0~NN2s8@wCX{@LoY9I5mh~i_6TRbK;m+*idJ6?VWd?j1KK?R
z?UN5=%bkvgqz{<4_XQG0%-iz<b$;emUm)SiyyssaHUX*4u6EB=<#It<D0v635@tYH
zxrlH$B`l$*;-xB9=&wYBQvH=^kfO{Gy*Lq5G&+y?6pe^52TS}t_J|oxQQ}Y9BbSI8
z{$6|J0)GL0RJ^#~wnxtK0M#COivnWy2>A_4{O9eFPP{P5>b_u)yoA@{arVfIcvgkf
zSf3H9cWo`H-qS)tHZW8N!x)9yJptAKbv{&v&5Pn>d<X`_3O#0G<y;U;%h`<1p;h;=
zF7-5qY~36Ib)(*w0>LhC5|9S<myb~<4s_7lSyOj(eui4V64><Bgo5hZhLpm!e!RIe
z)M*&q3H?^9?yXh4Ni<JT{gDgkd6Tt?(P2}3HHttZL?7FUc3}QN*Bk22+93wb4TfB2
zT>U{`P?7qSX=?UOCX6jXp&9)J7DNa=)X*MKysDN%mKU474E-<sDXc5)RJc#^qE#S1
z*z6^#V6+{+!)T#bJdSw=^(53a26ZUuJ}gd4RaLU8AEM$IS|E0a`*Ri{bs|StM|6CN
z$VYU{K-smmn$#Qqlrrt1Oxf&R0ELBz;$I;jhC9|cTK{Cd2@|^z^%(=|JIjz#$#Qpy
zGlD^iRqB!uWWYa2qA;Z0OBv*3Q-!jaKiQUN<N;(+X%ecMOEKQQA)^SU=hbeU=GL9W
zmz)Dr97=sR#ka(v+bEuz<P__5wYyJ??h@~ycu$G9PrR$dn-pidd&L<-z8x%4J%|q3
zr5*&aV8VhI&^v2k_?S@f>OR($Fw5PV-i@Lw3pTa%koX$vORJc79c*LQnIKHPb81!o
zh$ajh(`|V6+BQUEQ5&M?fV@}R5Zxz5ZoLg1m(Yeu_hsoe-H^su(kl$2b{Hv0(Bm_p
zn)|6m9l$ew8pvtVIW>myp%xT4r#G-Bo!47ZrIswIJ7<rORlMhQ<fL0F_Z^l7&|E#v
z{S56zEe*zl6;D>aO05k66D==B3n%OG(Oc{OM6BfL*(s&&yc5E^&1Ui-n||KzJwuIt
z9)qwNwcL*f0(rxG&!h9S<rS+Be5z?7bs<JhbQs|^V58oHAaEW)b(R3-be1^B{Ht_P
zzdQss{jJF5d`pkjGORrYUG1U0<X9{5TE#hmKs1^}!&ZgRv;n~|9>mEJP`8lwD+-Uc
z4&n}jR~H+4pq8_ox<qChk4%B+hMBXsCK}10G_V3Bv@QBk*dffU1r_zIwAsxNzWON6
zJG`sCUVRDnbP8F^2xLRhc^#mOO;0Tl;sMq0Peg4iTC_s<gH+)8G@7eIe7r)esSu}D
z*jxWXTsQ-R1le1Rx4KPO1w;~S?Js*BZ1yH_2W!fXopV5s72tAB%Rn%gtwt~n3*a7-
zG=Keus;B-0{F4yEMS?J_Zo^fSgpev-9FP2jM*tR3-~6ghk~<Kj)`F;97r&qNhAsO7
zfPmuv$<M@$DedxU4dS(sz}9_&_D)<sBDYeWTeF@Uk+B^bmZx6*r$<tRtb%>z>Q8xu
z%ptv>HB<l9MP*V(XC`%{l1m*Z$i&gyGXuly^awu=$<w#wCg@?5Adi47TqKbL2QRFb
zJUBKbmvt^)3NuTdvkc>`K`fK!6oLK*sU!s32_;8};=RvPEDMYd8=@8Cs?0|p4qL!}
zISV+~!Nz)l5@|VY0M@Oll@L5FJ=qv7(^92%Guo52k_%Yzw?!A2;1F?y;1q!!u^oZ3
zdQ)_k$#q<rq)bS=Mw;!deTZtg|J$Ki*NNjF-uEJCsGb=FapS*7gnPez(+NCTrPX~%
z9Lr8QLl);TC5Nze`Yg=f=JZ+F6~*XWZ{g~->R3#Y+#4YVBVj>i2anNmR-rOb_C!sJ
zAQbGilNwCRS*eFFakayhrmePswIgAZ`bvWP4dBW_qAG;f1k^Drh{@Z~fyh8lc}hBU
z3FCbURvh!AJ=+u`95{+u_bp*4O=PF|bYC0Q?=pB5OvR!^F|LJIJWOif7JR1FKnx#i
zLF^irmdK8JA&qj@;ZuKW##`7}Q-gkp2q>`9@2QEo&ohv24tO)0Y<BcW#k)()fiF-W
zOOcU)<Z)6}Fa$*XuT>EVc#aBuCONC<b#(1>7YBrMK$gY`{sXtZ2Avr1fS(1DflL4|
z#v44e65Kv7!7GWcy`HgPrB2-!LIN6&kU1Vo5DMGFc1rb@0PX>oB7Hd`09--tj{8mk
zI0mrMVR$_O27e6)qC!w=1s+lFYbbb^mLmdB2-fzLhLTwY+U<83xJlcqX?uzw{Z)qc
zN)x2@MLY559^AQKSVV5<jd1C8d7I532TYA06?zPcv<bE@a5QWn<JU{ZFFe#J4x+Oe
z1I$+VuaQ>qZi6lRYQdL*8=1v*J1}YiY6aS3Qb@=}xR3+|hYMFt+8On}DD>!zM?)c4
z36|hnY!1;qfL=Uadn*uj;D#;@*gz27a0%idj?8$Sg;zY5Q%IC*M6OG+Br*crkV8m{
z6C5O`dqFI8@&yDwn>Q^?sjv~F<tbJ@$hx7kIFCBLP(>eR)k$Y{uQ~ScbI$$8k^!jd
zPN<e$`WMe7fLv0Hw#P!`oe7;YO<vA#l{Ku%YL7%g&6Xyc1Jc3X`T{;`)OFzb=Shf=
zpCg-udjn#*gom8-P_4)zfM-A@d%Vk1&_0e#y1|cNITsU=b=`r@-V7k>fjlZ8sAxN~
z1)3ofgukUe+PMjc(E>5`iRth^x2&}mld?1^Y(n9yc$8iq7z;V3#=WKLYn4|yX%&}p
zRF8BuTQ{LPjN5a;sDEpfFd4cvI*H=lq{}`b$r%FuzYc7Z2S!1K$-OZLxlm8iogt+G
z=q+2j;21%E&^kDrz10RFnzZ2K;IFn*oOeqK3cAbP#Z$#QqTbSt<L<Lcx%V9w9UCi+
z_f;4ro6qMVHRdlE4D^x8-C^glSU0Va21;0uaFi1g#x#9y6L#pIaDb9|&FcdE$W0qb
z<1T$!Af(inp$<TSLSM<iCvYhtPfiFGg22;qth@qJ0SXDg7yt;I7~pGvBoq*Spnob)
z)65HXYb3BB!EkbD=w%YRR*DjlD;Ud{*7G0&g%o8`qCN5YWIyrxW_)p8uR=!|41_Ic
z*X6zFb=-94q-VXY{n98tF6x<Jnrcfsc^%0$5!wrMn&Cz9%%LRGc=Z=(Z*<=xg}W~5
zJD?_&E=G>oxM8@27$--E+6J(Tr>C@EJZ<iLfpV(vkk=JhOzSiE%)(cPWW%S`#6Oxc
z_E;!vj}3a9dg;+LD;-cG1y%&HNI^CpvRWCeW-k`x;vEwykxzip?fX$f$W9a~-VW_)
zI+z>aGXS#p3cbI%0_JC{4X-hk)UHnfAO9Ot@}361<66{EN2}J}dUZ28Mvzm8XA!D~
z&_@0Nb*ye+1-Vz`YH&ZsV$v7kT@)C|g_yUL@&eeI;&o88#j#;SML>8e71KP2@;8Xi
zU^G&Yhd?0-%B6ZP_1Q>4E<*KAi=uf~#$2I6nv+hNKa_OW=Os;K>{*9!G|WnhMjq56
z>;{q?VRNcyS8FF|xS$}yyKNZWWE_--jh_Kza|oBc<Rl9TAAzE%XGrMPU$#^5Pslm-
z6S7g`#Lu5w81abkT&g(MM(nPPB?ftg60>74IC9(aOrFRYslO^!3?~Adwv=>ZDyb)+
z&WB0>k3s7h5j~9JlvJERt}cQ5xE=usf~tEN>8}nsX_BVtj<A#qtQ^q-A*@SIzy#Ij
zAa7u`=r!VT+;yg>Q19VPV09hb_&q|n?GalxO<-JzE-1*3e$zNKozc9`HerdF9bH$D
zJ>>67JH$K|)}5NWpm=ADT^NF4<P+l_vGRiK04FcJV%6}9aVjLr!QL~$-f3YCKY1v`
z+fN{dM{84Opf<FGjR_M*L@vn@&PR@vB;Uk)(bD?5#je*~?P{U|86KeSm(mXwaW~`)
z>L=+bz8xSgYb7_R;@!f9Lzj1}wZ6>2C4&faa%*25h)uFNJHXYVsDD#cFl>Pg+got~
zTocgVg8yK)oXn8&!j7P@74RecqZk98MVUb%f*6e9MW_ncl=ycqjdd{hw!k%sJ}j&P
zL_po$2>n$LSjhw22zY_aClbAC;X|a};^or^Q!hPu2?(WtO(i2y9Z-!8>3jm(Y)Y=4
zfi21%2|^KoQ-PgipdP4z$QAOghVDXW%Dw8{rn5;%aBy@c0v-84zV7MY46&byv5=2&
zG=f0-Lr6>t3dtp;wjpSEjVYdw0diBDQOcuufygMF19S?Z*&HE<KnmrMhZp2YvG-9x
z2Gs8jRSsUpt6l-;eh>M10UZb%gZmBuwgxkKFw4<;!0Y;;@FL-*gN#5e6$b5TTVNmI
zR3mJ<iqv+DgTq>C9Y?}8goLn`2Ym0FykKqiR^U!5<LqqoC-n(F?d$=G)u-S-xS9{W
z2@81Ab|lqNz^tWiW^gUKb9jaJmI4-u{yP=ID7h^#qAn+4nY!9B`eSUR9-uoaUiH%G
zx)a|RT`@!S1*RTnz30)l_{%rbF9KcyLLRyf_(ISbu=xpsYD;rp9g5|avwWZcO@W!e
zZ!LjT((NI58}H)?q^uzzu#9VA`9Nr>zf!}>zj+b&O3dKx#Ipv|RQAYr0JZRNu6#zk
zL*L}3u($pU-!83W4oxlEBj3PR^PKHyB77{vN08k>!+>B|iW@1GA$<y>57kkc+O!j{
z_Kj^^GA_v2O7r9wqD@<eW(D@D0Q>1r_fUqIA0L_-XxjSu(*imTXbPA*3fCq{A`3^6
zO+dXj$i=!~f*C?{dSrpH*~MIFoPxTEi8Vfr-waJ|YuFTsHf>SA`~e@WDZ7BM9oeY=
z3R-jLsEY9fBe2}G#UPF)ZtFqyh=EQB0RZya@=wI6jSwVoXKm6>sh2P$EKc~iM&Z)j
zUE&1r(2z<2F-8(uC#ZCtTKyh8Q#@<L5GiYFxPJ&=G#ryHJcG5qg!W2{_(@!EBYhk&
z!=yOb$JEN)KAwRVYWeMUe3Fefa;g>+1|32X8Vmx4Ps{Ey@ySnBJI5{JMQNt-4yJSr
z?lPGxkg7t~n63nK$0VsJ-krK43|9!uuVKn06vHkUaJtwceU!V#qh%>A^co-QV6>I2
z+&~w95Ho8zYjxQ(5sBsBP`AohW0R~Utz>32nowh&qx))(5hS~cK37{v712d^1a&6H
zC;(yQWd4Sk5P0j5lTe`(BV}GfRq`M}kAvYg%+04BolD5G@&XH1Ym^sQnPH>jzVXte
z$Z=Q}0popDMrn-4GnaG#SQZ`J1;%AUJ|9At4Ie_!QvV6n=(C)Bkxam)!KT}SN=NnY
zsQ09BfRIzqtR#tWQfTL2U&R+YExd$}p!y|fC@J{8I}w8Ui<wu0giRdidJ6HLg#Dq~
z@hTti1l3uK&{4|kA?BLls_}e@cOO^#3OGQb-UH|*%>jXyuGECM>*QnrA_Mb_F9L56
zWwYKk^WcNTTlj(|b;DA&!{>!hcv*yI4i@2GIn8)z(g8M`yL(R&aLzg&hEyy{w9tj=
z;~wJNbNJRxm8u|yA*-7E6Qd!#7}F$4^=tQ`@=4bj@Sgj!J+c+Wgyx6qYSc=Kz_K~_
zC-z7SLffYL!lOg#y$D8NhiGbp)ixN=N8OtAY-`Hm%+=KlZnqCpG!l1X(7;TF0k|TI
zDNq{4i9z9Y5cOKnA*%^<F6vi&D71d5zUHecRf*v9LzVbR$rn^Yp@?fLF(;%pAedKT
z)&E8%Y$Gdi{vTE1hZtA%N`%7qL8rE<iDDf)Sc#_k4xfE*W<Y)YaX_K3Uw}L!AAUU+
zo9NKL`5fpU4TIhad{Rpf9pS~)%nT{Wn@p4DAy2ptBi&FQ_Q)<YY7nbne6Mad!a8`9
zb@1MoJFNHFuJ*o^T@Ts5Mt&@b<yM2V_@p<0wT029!7guK=`svbQm<NlK0OHJ2o8j)
z&%mR>$AI$-2pudN#7xok&0jKzIk1BUK{j;LVN6n^HkJdBonW2LQ%m(J5{z~I5L=7M
z&xj#;5xLlAIAGDvz%Z2-QLQ`Reu8+%-E~m@%`QC6!SHAdQ&<9r6;ALAW0~4wabi`K
zu;?pghALeaA>a5K8f@7rOHJ6k?-4}Rx{kx?K8}2{f(PI6H_(NIQoL!atm@qYO6aeJ
zqjxLTD2|1VP=J_F{NDi-o}rGRhQ<(yxXe&|DgvQ#MZG%&ni2}AO%fjpLCL0Q(~gCR
z7{2Ze(}KoI`(Dev0W}7>M6K5gkU(eo>>UPm>5ni|TD=8cnUcCKaQALfEZ<v~CwGiy
z9kFw!K$V&SrI--gL>}np(ZVB&Hl>S}6j}nbRowvc!PoWHY!5AGBp=8oRa(VGSGYjP
zMy-USk8*Q?>;yTPX>YB7)Gd*=bY+lXiFaBfL8Ahe=h&bAKZydS#SHE!|5i4u4UTB`
zCTFYLhOyODbBFn`F4Pl~!iIgXp$K*PpULe`YZFpa9rj2FA5?epSqU!^9*PuE4^?se
z+#S+`;p_I1T@;me@L3Ycu49E{&GE^&t92ieM@4sRg&hGQfJ{a(8#Vsg;l-3vG3tt;
zGA4x7Z_|VTn(LdIw=KROG#$ce1_v$~4xFC?F4w%<;?E8Tc5q-@8dy9rl+7TzNl5)T
zkgiuAruQ(1nOLOz?I9@_VllAzpyu74@D8O?d8*fjQdvXlA1KvLLl7r9#1Dob;EIZ<
zXUP4pdADLUVTpIEeG{#~Vpt8f+Nuj2R5Sy)CnlgYy?nOb8c=`xCnS@bwo~OrEKA-_
zZZv6|(2O#m`sky5b^@+`9=vFHup{gd$`L?_r8NL`R+8rVm)1k~rw$9hS`1Pdnm@ku
zUOofbL`%;iw9ZfuKM8`e)^oUH9RSvnMEIIJjHH`f2NM?NvCKuMOX^N5`^zz!$O~~V
z@2d&)@L+01!&~UFG?zE@4UaqHYxZazIW2-<t><wkC!2iECbxeTGDN!v%@0l#)}mLW
zYD|o&RY&030M*QzcN3O=AxyhRSTzzTY*z0A0b%Q){!-h>(gDu3;bF@y*lG&~g-tBV
zE9~8*kLKGUy<2{J8kq6XT<&qC=lO@0r2L~v{yo4;pX3*I>aSQ4fz`>p_FOZ4(ESH-
z9+u{a_hVU(SW+S-#aXl@=T3Mkomi$KS-Jjae>SFI<{t|IXynEi{UG=VN(5&9umYfy
zuK-A`N5BeD=n1q)5p$Q&vf(KQpgt^Nm<MfgptlcOA%<98UHJzIjq2HVKbugW9I(Sl
ztFsNcI{9RLq`>At7gH<A(@C!(_EJF}p7zKd(3JZ-#hTkMK&Xj#!r{3YF9A&l;VmW*
z6Q#UBA>L;AATuL@rSAG{!f+6E7luL-Fb^Q3v`=*8<U=YmfloG+7uba6uMRQS)u{%k
z#%Z7BDPbibQe~ft{}r8st+uvYxeI+ooY8WHCK>Flrw}~MLpa>9iT|3C%qCMOi0M5T
zNM!s}E4R~HpRNqDOaXvt8n8IoOaS;N0^k8OFYqe&C3Xy-fo$G04T+bC*Rji2t<lsn
z?Gb?0ZEXap4yu|KR6pv0NP%FrM+#8naNnUiGY+9Nn@G!&&oAK&V||q@V)V1?n~R}3
z2n#@mAkflgQ@r}j?@2y!%Np%@0#y)-QxL)@H+qnL0r%sOBZM#Xt5G){C61*<g=2(l
zz^Wge7@o&>k%v5I3z_HQeL@nwg^Cl-<7Ie%O)VVyA8*m36KFPeEc#wbg8;OeMNr97
zIEnM*Ih#{?b^n9B7GBNEs7@G`*V4tX(l!-X!L#*suGiJ?&VoQVK$BtQTck}Vw6G>T
z%XJ3+j$lCj_1%!H?Mhv5w5jjsKMxoEJnC%^V#~v8>UP9H8tpS!AqFvmL$YueLk`VL
zve`3m=SF@6(A&Gb+p=bOFhjW+t1Q48SVl!l7U7aW5R??eY%6tw#)#>=8uJZ3<`$10
zg9T&hG|*ZpP2=4ZgUKuCkFTLB7@DbgzGDLu#|NNaD&Dg+=i23M&qq8K%_wy}O5N!$
z?@2Hv;AaA!FErA7{p1I(?e)QG%<Rpc3AZDgvmL;{AyH5rEicFoyh>_IP&m7sW{shS
zVj?sgs6~|H*W~k4zkUpzi6=!^b~QYVCjm;+rEhQ`n(|Z2hk(LZI*i^E6uNb&RH?Ub
zL#dd)-orzGr-!~kY=yv`BLay(!lSuo01n*YxlrEl(FTRh2o)l@VIGU4#tmM9d_F-z
z9G>Ji0iYKiT^$sb>A~U5eT(qMKGk)lJhc;Zo9Iug)Z6%r^ffgTdUbp|2pi7W7Z?V6
zgZcv<wp_i!H7d!iPSr#1P8=-GprXVXNK|n(k(dkB8J|KvZX<Lq?om~bor8Pg1zP!|
zmchw`m2=!l2}oEy&r^c|w=75@vVzjmlfElJPjmtY+HuIq{?uLRj?j_v0qmuPYM~()
zfIz)Jq<(sqN_v5WfV)c?mtGf9`WR&RhM+)_L>CmV5(2M~`;;A3H<E0rT}=3>TYzh#
zu4E3yOOu~}&4j@$X<TpDX1C)tpw{uFId0l`wu$V3TKKG{dBnVMrZ5Yo1k}zj^*kE>
ztTp?rRB&d^zVo1w`jvP1a8bLoUhmD=)#M0aL1zs*{S{B_BS*_$Xxpp%v{Zn#HTK;G
zbMKxD6wupXa`u|9xRdrL--aZ0CgaEPV18TcL3`v)yvmmy_9t8L(sFrM4#vADyV1t1
z<5l`_9l!Vq3c{wVmIQt8SqwP)?(yc2?Ypat<}3VZN<Gb~rzQ2wNIf%C&#ctbntF~(
zJx8aWV^U9B>Nz&`9G809>1n<q$1tDRx(3~kb-Ir4rAl7xXI=Z~g?$W+FKT`(yJT;D
z03fYr?2-3SA7075ykarc^8acL<b)$#3EKaWaN2hpA2RpOHD75xBYpA;Z?p?&v<s{Y
zmASz7CvF}A!8$pN>o~hW_2yN+z%H>aD70fbA@AyFxefC|{~HbnR<XZ)1@LdjK6KcB
zv0tfn@YV&hynGsSwB}x?<cPjDtrujBM(*Zl46L>~2iyazP0oQ|zo!|o<_WL+-7(xr
zeIC=rOWU&uj7nuz$xT*6=;F~=kcC0a>)&q{C)s!3?dqL=A*NbgmR}KI8Cpj=56Jvr
zP1wRdUTS}m=DJz6HTFS<Qa$L(G+$&#V;?x!=~%)#{TR!BcG1_%4Ab9sW&d!|H_*Eg
zoJ;S>YkJI;-MZ+TaNbTtqW!1^dxsLmn58w9$f74gaIOpQl<1ht@+?nuwWOh9DE0r>
zN<wwsNmWQk@9)$}{)RPQry%I`f#d%I1&4^Ilk#n%8j=0;D5&`d?X3?%w=Ze3HdOE?
zH1Q_9waLocaEPvYWBy&rn$d3u*?uWTT(opCvCc%-(doxH>pV*>=OfmMUpz{V9&j7%
zo447~R}A1bl+zpgi^Gi7$+7pWu@9}&FPKlo)LipX%B<$%adBFIhgrPdzS~7?lI!XO
z81ar&W|&90zDo=lwnQ5Tm+m3%wLjTGOzF4A;u(s6(0q||81}}2!=`sLTXa!VnSrQ#
z+GYFUqHm??gZCD2*io15S<2cq4s3ahc=>IDJxaWcbVvmLr9=qkyiAF@UD;8dh<N#b
zqoko?boBmjD`}`4y>frIPMj@yy}(Ct&X#E+{v!%<`u%sx8e&S$8N``>-i{`;Blwb<
zl9P9+8FfbgyA4U4c}$A&9OX_6F%>b>{W>#sU1cWDqJOz~ob5+H`j}X<6A$9Y*g5M`
zb7$;>+<NnV_^PoO%GMt<iYAxoSX|z3X+0?QcF-I?mYiTcUB2_mVrILSJyPIMNr_Z4
zQS3uf4+JjpeoGG-V%XhmkTS5264@Pewa@MHHs{NG{_0T{v^JX$dNA>_4jOlJ2$L^3
z6GKyfh@1XOGY;z0_=E;gTT9aqDUg3gSijd{tQGC-&FHf{Srx(c9&2)lw+u@i7=p9`
zvbtHlEe$690t2(xhF%Kvt*yr;ng%1EHcjKGCkLP}Q61zS4^U?n78Y;>S?)v81(Po;
z{*&yG({F>jHLr%PwJkIsQTzv@o9@#fWEB5VRyjlQpJkOZ6@NRcEK>X`tDL3yPqWHm
zv@WYGRs1$qxd1D9{pVR_piJ?fW0jAbc#l;sdQho;-F3X|#Cv$@hWaB9*c)$<y*BGS
z`|b&V@Y{^lgZevOD1!N4pN>qc&okRb#ox=Sdt-5{efPl=-x$2rZ^Jea`|d-yw;mMd
zW8X!8%ppD4AM@z00bUaGBZcF^>D7bgV+;t{zV~;tkzSb(QPDOjemh(Oc$43?E7g4{
zLA(vvx&6t;vDe_2)GLGnfRnMh4`}@tYu3$cb`CX5Oyx+EQpj_&zwG}wjWXiD5M|U?
z{4G!fqDplSuq^T08l6=9Fq$SoN(!HV@HCw%j9^kEN&;yrkJq4wVJp!Qr~iQanEj~_
zA&0S|x;p8uZnuAD2A9XDA0QI?Rdkn|ng6WwkP)AU-2Ohh+y?Ml{e2+%+>PVsYuE`h
zN%}PLko!<$mGh9<f0iKqNvB^0bYndrH7~X4#_Q%k0LYJ-Kb<$l-;a3IX=G-E8EV>_
zn68(LjX(gM@YzC7AsxfsvP-7b3!-Iz3!7cXYoW>cdp+_u`pkr0+a$WrZJUI91&V(k
zT_KT=0uFs1gxu6;YMZnMT2r4vypB@h&Db_+b>_wgjPu*<?z)qW_qv;o+Mk?G7Rbyl
zPwu8x7!Nn#MWmPP{#d?f?aCYj8YRXebP+<kGN<4ZEfb5Ioo~n9HKQe52j?>Istw(Q
z9l|o)>BpiE85L`Ep;4&-Z=G}=mSY(T`mFz`^GHj~h(=K=9I!Z+DxqS<S4v(zwxGb`
zI*vv0el|DHy<hYxfjp%uTdA@tRk>Yri;%_;Z7a$^Qil?-C;?lSC)?1B&p^Hsn4tt_
zDuE&;P^<(>m5P;0ML?-o00|PlvWQOyhhS>WW*$0?;SLmqj_lY_$O5I&S)=7E`D?C+
z<7)ni_t_z3Rq4X%Smkx%edF5VrPww?In+}YHtco4ashi}2QX<azRTYFKk$Nek-5d_
zy?CWlL);gotnih%j8A2KZpr$5X>^w_zx4?ZK4+AyFTg$?U%~hBDHIjLCN^rTXK0~(
z7;ms0E#bk0AGkT(M-*RPQ<k#UdhzYVcnoEiEM@WlDrapnqwhqklJcdjHTIBFQJ}1y
zrS6B6t4(BMr9bj2z*Nopy!cv()$pZ7OY6A^B{7PbUlGHC3lVTGcXW9c?4s86JTeNn
zc6kE3qV%;0^wqU;=t*nx<n^<lI!iaQ$^v*DPn-)I1KOGyS`A^W_-4W4%=E;6f+Vi?
z65kAIJi(E)RD4B>Z>AEO;auuqz8UV*4Y_QgE#U0Nwu4z}<_(}5R&J~)G9>0Y0qPxe
zcdRxmb%Sg^HpC4&I|9r%%j_${w0a)s>cwVEoAb1I1EPb7q&)T`f{>^$LjEW#af8uU
z1mVs?Gu($H3*`-gk8YfSqX;Tzq9OIEUZ|UL&&(k9C)K!*ij}M(4|~w&mz3GWvJ#V&
zQBr1+O62>;NSR%kHq?ui+1P^)`LVMGR$t84mtr>-GXY;#X2Ddq;yuYS(X}yd$jQ9b
zW56ohbA&>)g4UmZ&0}CbD~NQPo>@E#4hFd?32)*<c*Eidn3NDX?8u4t%<pKZW|vjg
z91Ul8n#B8CE>FXLBIzD-sMe?|rZyB`ZrDW2kvqLT(>lF>W!mao^#~&1bwix%Ojjm#
zlKAtO?qI%rd4+@g9TvHwNbC1mjrx9A`)*9@S=nI>O6FL28W%AbZ2yUM6xd6x7{9$%
zbo8Cy#RO##`NS{<au_@($E@;47I$UA>J-Elg18G1u6CCO&H$2%FI(LT7Y^x73G2lZ
z@}Erd;ZeX$nOj6nHPv+{o<X?rBGyp`z2iU-&Cz&^PL<g_7F03lR5=HNm`@X7h$^6}
zQtxQKY!z)?Wjczxkp5za;T#M{3R^~bZbKNVkE)O6)s)|bD7xr#7%)DH`E7MQoQS|M
z&{p?XBH^Zsz!_{oEDb8Uw608m0<ZiuUO%KPy`PI$KF3Qh&#Wx6qzfv-^r>oXLo4Cw
zX!CwZ1zXU1(A`n+M^x~H&lU`S^l*X{d~v}#LG*$rvcoO!k^!PrSXpI0FIt&vOXKo+
zmHt<3R=lRt<o={2c#6WXR{8PRFRc9#5=y-X1P1}K|6ZXtU0Y~kj9vkYyv%`-g@jKE
zgVdy12-;o}`i%Q1<b$`54`s_yMW|1+*j%`nPNUe{*xYRPKrZ%7R`;2Yx{s~4IJ*;O
z=I^V*@C<ok?yge*B^QJ}Fhmk;9_pj@AZUdsb~@^9kG&(edXq-);H^H7yxxP=bvqyf
zh)OHqs?N+zVF&-VxL#-22;yA_Icr#qa~0?jmHF813GAk@sywCobn9_(JPUc;Rr!sh
zfJ~cZyyhcHK~3y~Zq{%hO|D5-5gP2{eVuvF0WHAY>Q5T|gEZ%yqoXs7YIz17x2zOy
z5G!fiR1Di+h+DyM+-CgOaa;C<xP1%7fmFkAD*(+vE8e2i_sWOy)I$XQ`8`VKDf`R5
zTx=MoUcG>Nb?0c*27OcKmuwbtK<S8G8a4eGMt%e;6-9izo4Oa?Qb-_lWop#9Me&c(
zZo~TWF=X@wC8zrG;XT|r(9JH#-glUf;PH`ldNTGdq*^Y{9I{L%kyciuOA6#>kk{KF
z((fY-X~&)V3>GcwDCm+;*PyU_EyEspn2HBSt+yD&Y<5I`H|s>gInb2}_B6!b$5<?D
z=Cs(k`HN9C>td%vK4(0Z!1*u?Z{~%vO4E$u4He>b71B(Qt{9}#6*g#fnUJp7W6nBN
z4T7gD^E&#(IEU^HId59HF#a`^&v9}NoJb6#*$*lF^II!TGuCnOSRwh6VY|3vyxnrC
z-NqrQ>x|;_kXVH@gJ|}kBhwUJExJ2;H+F;bzK#7^=~wFJ_Q)+rn(7sjsvgTG=yV75
z_8PG-`hX2RHU3L5nXHXVQ>_=DUx4hmA*xNw;7X`(SuBx3w43I^i{e{O?{>M}f^kp&
zXk5$sWwh2t@hw?%oxFbe)HTpq1P~Ox%#f%Aefyq96`fQ*AJwI6i`EA(8r7-6Dh2z?
zHh&S)P%&96l=8||noo#fX8R*E^9gR>l7`=*fqa0ocnQvRaD}qKM?ms=VM4>7qfe0n
z9Iafb7!}`w==XckuO5#29tl)+8At?#Cq#X#upmPHKOiYcE%2U&ut^QsrwQ5h0Mjcm
z9`Nx?sGg4dD~K3DwlwZAg}Lqr3%O!?2eY)$o(HmMA?Vyk*2L)3u>$&Z<3s6~#7%mh
zk5Qh(wH*8I*VBrQd!XSRe4?_{0ah^od+Dmi9|KY=<fiu=QpmphKw_GnS?;x&rE`i_
zm?$&W?M(9Ah_`V3gTelCx$kix$@_-fZq|9c71gH9$J=+Gl)jwK{8b2v&#is5%<N7g
z^Ft>R;lJ@_<2jiV_v%<Z`Navdh7t}?!VPl!m{=l9e(ao~7N+F@t6a`Pg1K@TAF@_4
zt`)t8Hqtw+eE$@C<P^2`7q+>!dRdnNoy5Q!-KhQw@?xmb=jj=4r$$$(r&S6oSoOJz
z70M%=>!6nQFyC^sZ&?ZW?a7HSA`<K>67g!C(HIylFvMt!0#M+WcNu6XWWHt5a^g0V
zS~|So6t}fe!471i3mQ->v!S-7sn>*-X$YVo*yA`4fg6auWDWWU6@(>WCI*!HVr6})
zIu;Xy1jsdSEc2^?`$T0G4rtt1-RrTyc>^Up{!1t<U{dCT2Zua0(@!wV=0uU+KJQWF
zaM1<Gv{w1~Yz>}15CIE4gF5c)wYNeG$NX_$>>GVxdU#f<Puq8Qn-8TN5vRdmQ1DRb
zi4V+2fdk4Wu*6)w{I3j^kI;8hYOQ^@{~YgLu6FYwD9=EM9YW_ip~8>yo;ilDHmskS
z4*{iLBF($hQ__7b{q9gIJvcsXOjqV4AR6BR4RU9`h);~LhWNAe=}AifvftzD5M<wt
zRY-QlSJ9O@0btBm0WneHPBs?kSicCE5gnIEMiz>DeMQ4rRGoEmLK{OK;F0Xggm6Y1
zEMmUE=d?jR<u<Yn7G2W@fsvwx+Tg!W`@l7{{|ls}UhaR3_Q+;P#(gpEuTqtKCGnf7
ztZFOk25BJ=iMo~LoWPg>O%Zqw2%NHX9vVXJ8cT;0m@=xY;Oq&y7=7iuv3)b0-d?l!
ze2K4oHR(m<tcm{zx>Hx?M3f;n^<vQc7~eR22#~C@+}*wUc4s$iX|9<TmH7Ksk1_jZ
z!1d(x_9ZfKBVO~s6-rSK=x$yW+uL{uCGq!CxEZfba%{m9cA8!)J*-;YXw|%`NAvf!
zjh1?KZJC^HiCi6zFyY}>H~KsP)BL?{MqLiX={zENy%nhbPeS^tkyXqw|9eIjua>ba
z+vv-~kuBg@C*+9g^q!a3JFu*3buK2;_hFe&B13gx71wYrkR2l!s2E7dI;81^q~gIm
zeAfXAkTKlyE``7}*1vPjF}E*Q90fA3f*?ygsB3$Z31uKJuBGh6210*2bs4c~1cRr!
z8}SY2(3<Z0JaI1aS~MiyStdLN_NR`+UXK5kjApN@z}El-%itIrR7_;|z{$WRA<i&*
z0Wdla*8_(xFD=M7B(RO|EPQudO8V8$lcn<d83sKQ$symL+jI+<1B7wUb%=TN+GJJ7
z@%0zt*se_YR1D$4_`QS==Hk33o%1aWr^+mK80TA!OS6sj@CaEU4Nu}w(lg==-5)cI
z`g5@g3)KIYKXMC3nO}rFprw&RCF_-D!q^0pBxJex&XnWwdmi&KbEs6QnTfH;g8VX}
zB3q=fa?@D@op*B<%SutRv+<okaPy-fk0DayG2|`s7@oy7zSd)S2G?C*_88v4_1I#M
zLB-`;;xVkm^(|Zz>O6)<TnBNndaMju<}rjH^%%0g>M{6n3Clf(*Ks}an8&aN*Q^yD
z!ya5QTob<L!D>F7D1t+N;bS7l;jM6Q!L+-HdEogHt=!>u46965=jpCDc|{&pXAJoa
zQ}Z%7_$Vpnz?lX|(>S)IAiKl|4~BgIXwjzoi#qTwO(VnM%YQ(P#exE?vs#E(jOE0H
zmhj&aZ?X9f^)ak&L&2ld4V8$&_l2pSTz7KyMCa*%`Hw+zjr|*G>$+3yI!tubIFFdS
zgH`Hg1S{)jqB**Jv;iK*N}>gRO$)M|qI*WO`#n|@kX%q;RVwo3M~eWXdr+}%y#(_x
ztLFx5<N-@#G3ID&8?znqfN6@>^1cyh+jqay(uFQ$aQ{&<&rR5|INO31v{_-xmz~Gh
zA&(o2pc*=sE>_0TG>(3}F0HfpcO+ro&TG}|ksskz{<g&c7T8c~ZOjT^jz<v`zF|>G
zmN-|*V)IK`H(5+yD|W_Q2bKAya?;u`apU~r*b~K8d46fKt$eI?E>HXcmWW!TYXtdb
zERdN4{LoH~76fQ6^$vXAI?rM>8|PW&`z>r9X0xzZg%f%jYs?O+PtamPoHR1esx)TT
zc4g663UZnC2CL&9Wsq&MPPXgh;<3_bd2OkImb-c|OUH>uv(1=phSwO=iS~#cG-nb#
z#CCoFAgj-F|Ir>9pz8bb$*=q&Ug09PNB)eLVgBKxWXNLZ?SgB0Fn$P;N>j4r+q2OB
z9=ht5O*@jI5djh#;^5rS{lSTY=*;19wLDAgRhDq_ocbhb)AJTYpCN++1-wE}_x^@E
zqtDDNq_;JN&JL{CNSdM%u7JYcVDkdkh6UKXm8>awZSYF0TFgmfhtq3k)u`i9Aj%=C
zuAil>%DYNVTAIDGV0%l?W>hV`F5A0=c~`RPwIr``wwL0~hRc>oB9@)hz`yk;N7y>1
zqc+-9`pM5-8hD}lXi3wm)!7hfu$?NR<=)a2nqjWnzp9~!jSkxvDVTfn8dj97^Oj1Z
zD)5RWR*k(FAmLUb=lg98EZ*tO^>lhC8?nRcdK~Sn80Ab08^<4Aq_-O4H$s)+vmMB(
zx>U+6lP}p<e^OFyYcwm>Ha1{?d5OQ&tT`{++nxgaT+A1)PPopvFRve6QYVNKN|jc*
z+QTLkF|~FDD<7M;!dyPKbS{j+u{QvGY6H#`%m&NUty+C6rvIY0Z>=bqEauu@o{YTf
z@>VFNi|j9tiZ1Zyt<a3FGxOa|s~T`Bh2T6a&V4}4ll@5zTW8j8h8^Km_uv6b1t*e)
zp>Vun!fjs?X1Q}fY3kcoj97Y8ySz!78BUCadmE}QKDkziSvh}?#xP&al{&deFe-KM
zd!LOys3}<ARecW2HlRF6j+RTiz&;IDaDSZqtjwRS_^lheZ}U6a{F5=>*k2xRe;G4w
z$)?dDvSEc%eSPBQ_1E*5QP3vL2RCMqZ>!FQ2X6(ljZb6(Y8hF-{_C-1soUvyK(lB5
za|&e)J;ZS$VXn)L+J1a%bv9<=|75}xQ&YBq)#WOarG)Evv_j(vED6)G4_c2&m*9vS
z75%a{{cZC*7=zBpUaKj(z+3uja#^e}0=ZGB+6qh%PIh~tn{=V^z^e9_Q5E8-xu`X(
zw&D1ur*4MyfFd;gFs7Z|bi!f|0{EmlSO8{BZ?yEgbPf#`N;$jB%&`;iA;-oU;9%lP
z_$9r)_Lp;=Ct8oMpD<U$IpXk#^rFqp#{t*yE=b6Zo_G(_ouF@tSCGcGGz}7U?efn!
zQYTrRg&oBikt{Rzo(ZSDvCNHrTiXJYk!4~kusb#Y=2~Ea0&zC}&#>xvD-dU+C3K1=
z9wc<diM$r5f{0#elOKbAbbp%{t>s`aW|%)$vHfeBlAMeuI2p&F^`{>;A7XD4A+h@G
zKcTPCeBe2g5l12)Rlo(zzeL|(;3410Z<ihH*h7b;cZ93;**L(y()>MeUpF(7Ftyr$
zQC?sRsMFzDsii3^s~Ur|sJ7#Et&rB^YK63XSSwtFg_~O8Bm7QB?rVkobg)7?4_+(e
zTNexI;CQW&j+564i}{_7ZPW^B5h(KEciL8~71FV*S|OcTs}<6cP_2-T#nTGum_)5`
zmtG>jFX8uP{Jxyu1%6-2@2mKo)){Msv?Eq4<U1z|`JT!`+F+>_w(<KWey5$8S|M#C
z)e32gomNN-dbL7YOso~swkTlB@3aR-E2Ks1S|P2JM?U->;rC{Kr(?8GF2B<mQd;3E
zeqYJ&0>3ZkcRFfGE2OiRKuLb5E!bLNfZrGJJ1x)$CHb8;LW7e0PTRCWZH^%=mjw*J
zd-%PS-;4Qu7QYAhJ)hq#{BGrU2fyd>doI6c^SgoHZTw!q%i6~8+xdMf?yut)Ez=fv
zM0XURBN(E~3os^c1oH&3P7HHeST=HTKjbr(@^2h1?>FK!p(FTfhblc#N{mU39HB9%
z+30=Rl`HF6j9qjcHustb<O`bItGSN2I<cw-wt&&tBIOm*Lp(tbqhxLQ3$kvO4q($L
z26$FBcwdKjPo!P^=)OORw?xj1@52p%pd199MNlS!PA0xzzf{M$><ZF#U|L^)4ASHE
z*P$ZRU{r&b-$4p@j2$y~y05IZ(z;tZzo2D+<Z{C_dCtm$d8pXLnvndyUH*&RjqD_A
z{nEPl9xpuXT~uu;2WOGU@0sNRYr}1y{8TG=wy)7+*vz_qO|f#^(qMy=*xZe&Nh>0>
zf~ZAAJf3X?my26DE&<o{V;eKuvNrmRZS##AeJ14FHs2(7n&mE@`|CrwM<2Kf%b|>N
zr%CQI5e`2ag4(R-CwCeN!!9GmwhhH1j|9p*jq50`Zd~oS_TbuuYbP#N{`7gJ{JZDz
zRPj{t?7_1K&t5!x@$AF156>i?NjwMf9E@5>fyAn2b23E^rctGBxN>pL#04>5zw}_o
zW~%Y<cfIzh5a2k1A|OW^HY(mV7+qH~m}-QAtBo-BZ=d{h5an)`P>Oc(ZBW{SSLBs$
zlL5U=oYW>;fD0f9c=HatcjM~Cwb5sueynZ2S^khy?;}pV{~VSz;g*8A+EyQ$<d1kO
zv<-vYJPZysKn+uE_91zo(JJ;QLm144r9j^0KxhH3M{q5{wH((<Tq3UT-~z4lK<hj_
zbMef@GaJurJRNvC@U-EHbzDzd@x-?Lr!9C|Mz)PkqwUCVC$2rXUZ=d%ZR0b80>j#Z
zf1|d;+5vR~j2<?k?MQH>eq^@5y0JhT__{7T;5wVwa*6k{ap_)`5nob{^EcRle96*q
z*TuJSqK{~E9&5`Y){Psbe)!<HqW}-`9~?rb10luCPkxS!N9%AO5FCWlQf@4uuhS1@
z+iGYD{mbA=SZ>yk&NV^&4GrZE*-?_>qmNkDuSrH>F)9Spe!0u??_3<IZ2lm?ZiINr
zh3%wa=9^3?O*$ffWK4`jt0yp3Z>Bi~3(VK-i=A9HjKX@$xJg=)xM|}=^g~!@bJ`~9
z^$~AP!Tec=DW(~Jvp9hRav(rwQN{n-W?x*dSE_9io{q)!OFI-~V?nIg&GBWKDU2D)
zN#T4J8N3<k7jL_`pJRL-J%RE8Whj>w$|NXy$g-`*M7iQSU4VNm9cm<*KIw=DAq1I5
z%K&LDCFV@|f5)Vcf>a+svtj!c>@yD2lO1%Oq3sSh{8*{$!}=2UC(=~)!z$R66YJ@$
zwxCj^ej5T5iCAac4b8O%o0Q3l4XH=rSYb^z*ep2rce1)?WGb(o3WtBpx41i)eM9ED
z3GTxUb~%}~ZpsF0%YgQT=b6>x)fPROQiS~9fh<>_U4WqrM=+~<7ec{-5jmD4qDE0Q
zph1V!t7k_>HKd~k1L~!bQ8juL^fxStbRTA4TK6~#*P8pxhSkfVmp$ji9;u$dltVc8
zg%+Wye?akcPJz930kA2l!@=Nl@e)!a6hTubcjFTiZO`56?V+TTt9wK0&Y@Hj5sMW~
zxEtbD+yfz%4MmbMi!8;vL+WfjJMk7wU;__x>^bPf`(b6X%;#7VZfw7my))(QR8|Q)
z4<<$O9iTkr9UOC38mv*zf_h43YkSiexxG~GI)DYOC$v<Y191#9J{BYi8_daY>4bNX
z<liZY4^9m<ou0;Lxti!qKu?6i^+dTmk;oHasSYK|mAh2MXVnwsBFmpqqVCq?>zo^~
z;&$~E=7W1Mob}w&i<+_0ri5~hl`v=d%AeNb8$MkJpvI2?gukcBdM=!$gE1dLwzh9L
z-V&o@dXPqLpQcr2D?T`69OPk0{F?J^NIit3ZRn&waRPS2hSWR2iL`OJ_Ttgn>7Df{
z_O6151Lx7_h|pHyEQGs0jQ?Y6j@>3Se}Ai?<=BmtU%7(6Er}y9EEiihZbQ}_&XXB1
z2iZ~3AFiwn%p+D=u=tMp3&d-PUFh`L4DiQ&RW+<4LSm`yN@X0Y5R^)o!tSxwzm;Jz
zAsbsTh*PI3R!Ldv$4jV<&<^g58J7_`5o?~V##`0?M|guEwBNJJBxTDLt4t`wm>A8h
z$Qjc(XhPI#zs1n}Et^5iVsowXvQ>ZUV6mZoj16}Z{)VMT4U+NYbwFj}NB5YNBCNQZ
zsZOax&!u0NVIl~r{@YyMnVQKni$T4Q^22Fmr$P6UrfhiMnzBvn4&q+0p@aE*f*YqQ
z`0J_lM){Q&k=(d`5^+A3N`<jay`lk);qQSQNI2N{x)F~En1p5WIWUZvv2oh`L|60W
z+oep|pKD5FG+%Z~W(2~dLwDNr5XywrZ;zDmmje5DOYlOA!kRA^!NKg!#^jkHF>7O1
z=~{7Y=^`EktI3eK5pfQB87(Ir(gc7@<2aP1bdhA4PeuHa(Afi;Xs+WIrEL4|!<b>N
z?2lPQt9|cbIbM{Qaxq38ck!-`hnwS%HV;fj_!_eu&zEBd-Tv&x$w1nQQ`sACku2^*
zt8c_77OG=~_;ffx7Vfl4`P^1ClO)6e9f`%PZqWXVx@_~?5T{giwil&u*lCfb>@-Sq
z<Z~u*6bx3N)x2gDYU#wj@6|V}{|s@^@69!K8E!%pJiY!wEn!Cp&MsYKf41G+NsH>d
zwCUZX6jQipzF0Rnq5&Zt68I-09j0hR6i&^hb6hzaV-3d8Df=ZEeVOy%Ocoqq+XPNc
z|2ewS)e(Yr&O2xaIqf&kR-YabDbJy_v_>-xlg<Y?t6v!bI}C_2@}?uhI1KzG_Tfcj
z@Q_5VWC`b1LzOp6^THN&awB9eku{{2ig?v$HAdl7^E&#(*`$Lo;5AywgXx{~2I*d4
zioZ0lsDJ$?;&F}(_7={_qVo{fLJEM~6II7UBs)^u5Y_evsdLt<6+oZ^*lZ?j`kzF0
zkDcfL>@Yh3Y}VX_EH{DAQ^<U{K}RNCK0L<|G3Qki&&8rX!AsW%**R3cLBcvJIK0AB
z)n7&6yrdCSZFEr`o~P=P+iNo93otZ#=)i^)*6V<E9sX}mveIAEjR~o>s4hk!>3W=1
zVD!nIuyuNe)so=T@{gywa?bvp=TTS?#~4ziJcQ1bR*ufiL+G5pdjvY;&=`<A{O>se
ziM&+#Z-d@c{>0BM|1EYJ{*F7sw)&Ec?PKP_&_sKvGf;6F$nB^`{M*!Cn;rnwi_}*B
zSjsvUV>iEQBrx@x2<tM~fHLL@h9o(iJRv1ZW{aQ|XaRp6&Et`i-2DeBUoAx<oSqyC
zrNmozDHm@9cMxzjC6Y~A6rK}Qi#Agoaje1=_{<LP)6kCYBTY*^I6kWMyF99^u_~zk
z^l7wbaz2jSR(}iw38Ia>#+~*^Bb5r^=Qr`tcnk34xzq&J%SZ$<Y-6X@Uc6!vvHOpW
z7I#;}4eGXvk@(Hf@r%<Y{OCILaTIh93L-Z<FJ}xQKsuCkFG|Abg?u|L<~ewq=e%q_
zjpC+KL>*RT;!LO{)*Y++70Li~9*+Yg>=BZDI3yzeYdlM4A2rQ`*X|X(vpM9@!MW2~
zFoeThaHu>xjq@kI2^xtLC>TZ20o5Q<U37`rh`;zye}J+Gw?PCp2KnC^;a?Q_agRlm
zZZ5p(>bf>$UOiYFo>RL*v6W%G^*B!lqn5cGp65x7L!cS7!Crl8J~j1iz$q~m$4;PE
zp8_-TDomi$Fz6Ux^&L7p1q}&bTKiHuj0l}{7j@Dqv|Tt$?SC9eNJNmVvZ}8`vJj@{
zukD&&19%7EPksaNl*v)b#D-8T(8XT`+8|_ckjWIa*N1#3E>(&-L#a*oaaO_~Y|KXL
zHY$yX#$}>f&r1Wzv(#6Rj1?);XA1ssy<YHQz2GH6FBSX@LS35DbRNDyKIehbyQEvx
zR%D|TtN(<D&dYq%Rxg%tEQq1EgI?jHnvfd!n6Jx(q9PAmflz%=Pg=y2jv}fabst%0
zb&oB^zUhW+^)@};aW(!0hWU$(sHN2d2)Oy#+wz~L#r~AZ4EDX{80O9y#e-Gq_rT1x
z82(9zHkdp5Jr<)>pdN&NuP?5V{paCP*99?o(Mb>vG@;U35svBruN7(=fGG{}&j2er
zfb0f3TW12cY2!S2azO^v?Z~b+@e&<roArtzAIN9$KW|x~RA!=v$~dKx7Bu1$XVv0v
z!DYiW8rudiX{W5uSJoF`M*-IMQy!Q@$&P;wq6P<M*#e*;M_!wii$AAAd88~($A2aG
zvg2g{q9fycnYfUnZ!|882RAGInc3BJZAeGz|AR<?#h01=-YrHkYb<r)M8??Ncpyz?
zNz+bgY)R9LgaM(H_;S>H8vDX_LJ^ImaySebN`GKUF<MS@D)d(f4I^iqafjP+x*et4
zn{+!wx9)(t4)P0!geq9i87e4g+Ad8fY1$!;qxGG>T;?mlzKC>*+lQ4{`?)2~`>&KZ
zI$dI}63Q!S+DavEOO-f-mpC(B;?`j$zK@>q**YFW=s&FERtREV#~Dg!Cc~dr`m%}M
zV-3wZiIw}6^^W*PWJMkR84^v@pB=wLw<`TMx)p{B>Q*#1=$$%Woq{1)?@xNK{<nLE
z`qLZWNlf0R1b}!_sj~*vTfxWF&->@uJkpw=TKhb{>GW%ypLYcs{L$E@44P`47JE0-
zY<rga4;a>=l^Ocy7Hp7iCD6$PnhjUTKnB)N#?ED$Em0kC4+r!VG>dsE_Nb1)Y-|cM
zbgB~Ryfi(iK8s$%V5Q<*C5WA%I{R6O2=95=U6ZzON~Jp=^?B-i>;9QKA812o($wlo
zU(}2JFKInZeGApW_>>x6N5-AGCXP-NPl>zsYodl{dElD3VafhI9kr+J0_HfL-#!cH
zLWHyHF&bp;q1muRCjJC3i*>$0G4$WBw><^KYhT!e(H=lk@t?NJY>HFIkBG<!UyrRv
zuH&yzzKM+I30|?8<XApAsRyimWrlShgs;>CVk;nOu&*?kfj!^U3ha{n{<PTpnaq+!
zjfH={6=4%gCgm<9FKZb{BEh;h`35KT-4~#(&pC%7)F5W4HK>j@o61t>(4PS51SV~Z
z*AGWS+|+VK{iMvW=6d!fO*duWY=tV-FTh=0X(KMiaoloeK296lQgu~bgZ3vUvzsQ$
z?T&z&4`7I%mI@sn4TTA)_Iz|ON|I_fq~JAo#~P;1;RWWlEVGfYrFrQLp3$FIpt!mY
zJ?++EX=&8JY_P3qLMjbMa`$J!b;n%lUWIePtxhn$-5i^8a7?T=e!Urgca{##N{3ny
zs;j>}`S3B7)H$RZ)bD=@$`k!kTG~y}e_?CT;JyL#V?;sx1=x-7LEWH+uYv7{a+-pD
znC!U?=mGBTHCTFe9wI)Q{#(Hj^`672H9hE1I2lh>@b^-q|Aq58{+a3%9H8buzZSOc
zxwhN{&U`%=2&&ipgxHMHc?&7qDC*5cH^JtIl+~jOMqX~+wf;$DjB`q{Q+~*UNL!4h
zG4LVUTU!yCxMd?Y7aP+)QPByX<eek^h>yyDA}`_)7$EMI6YwIY9ecW`Q=FL2L_aGu
z<^TLZcSeeOB$D-~U5`T!#~=S)hvQ5*9H*unj<%}~$3$)mjs^n>Cnd(=jfgoZft`mu
zSDYOUN2U!29KjoF;l5r}B6V&^%HKJhVQBsa6E{e9Q2Y2l<d_l8;*X3Qy|%yMtIJrN
z#s4PR#JUDC!*C75<g1U(8ObmgiqcFFZw6l1^2|NgfbSmyPXw>!8T>6YcmPeEVi>eI
zcm{v#a!&mnAAcNQ#5BME@wH5YTu4NwS!Ooalbg^W1oaGTw!t4q9G%|H4ip-2+K;=t
zVKj@?Zea$+QqXZb9gfs$NW{~%hh}&4lcXHh!gF(j`Y22Vt^=kz&0p_K(;zXcq{$}!
z;T7r)s0B=*6x*XuxMS!V_}4ZG{!-MEP{XNtFcutXI#X|>F@+0vVb+~<4Jz$Y2SnQH
z(jn3^UI(f9JdkuIuYL)c=(Yc%OgPAOBQwE9N;+^ylMidCai02wdt{9--@$7<rXx|-
z@3YC`y&<)68+sq?te<w^slN6co$>klegcE@qbUP9VOyv#4+`e!0N-*)dp?!*Hr9cz
zUPszO5ortK8j%D8E$QG^_{%Pmy3hrp_dw|%u70o8Q6NcW0}dY1Mwwx#9giG3Lh2>j
zeGe5m#JB4YH$O7aDv94A`;c03X=t#}|EZqVJ=sL4aSm}Bld@6yX=(#X9^TwnZs(Ox
zc~7AUyN`(P01p@3S+)|dW6c|IJlTKI<hbaw(V{h4^4-+O{)i1!*o5Ov(hA5VXECfF
z+ee+I($?}WIi|%s;gW>uGQ+;<7ZiROn@~+G2@7^myGNBF18!Y!G2Rc`*ZD_d(_mtu
zyDr(V5I#|OAwKy5`T$1DCR*CbE{mfuHPLZVN;)r5a!_F_;sa{<AR%v~@%2%5#ND;V
z#JaIl%lS5p;s9&vOWX>Vm3=S%NkRP%S`>el3CLTqiW;~-1mxiiCiH=<0W0BJ=YntG
z-ilv<-YQqx@>!P?gFomH|6@7?t9BD;-2k<25u7mGvJ-E`Kf#Mw3049RAh+`J)zL7h
zhAV{MpP8bwdOwmud&*V|v2#?n^@fcHbEu>P*jG1X=TQrT6%w74W;vzN1sV6|&^|Vs
zVwKyiSI2D7{5n~+wiN&V_wWnhEc}afC|@dG?!n(}f{1YDs;)C?gs-zx*`AXqh4%kS
zgR#GuH1YmC)d&kxn{_|Pr1rzwGI!86(5AsG3~2sjbcxl}a6CE>Zh`040YCilr<A0V
zHX&K~LBb$>XXbs{tna|1;B(>+&2o*HsW=4n84U&u?R=*emRwGReGX|BQol!qU>y!m
zCw>QuV}~XD9#2S~$DxG3zcrO`5l@)LuA#Lv)6k6lOX!K@dhR9HGxCCAZ%_w7-4yxc
zp1d?6&Vvx&#===pStmqvO)+$HaE1-F(N-6!pQ4W1Jy@BgCaAX3AQ7R@+<^%;EFULg
z0ABhXr-uSmIXwp9;MyQ}38{QiHCuD^Dmh+-B7F@xveLDB5(N#B<KC-jzQfaupu~w8
zDN0oGG#EI6RIT(hCq!?W5Is5}20u%Pf;1t{x-_-neImqJwu^HFtn#`+tnSi8SDyM2
zYNpL{Vday09<S!EG|fSbp6EKx5x!z9ro#F+q8zL1)f$V`J(P^6`VYLx-d+n)uLsHf
zeUwUiOWVB-;Och?a5uU(w!EuP@{jHKFn5s)OZ_Gf*nxoPx-6sm75=$1{Tak(Gy>Be
zqMBIN3^K9Pa9+_8*BTRCqI(b(3PxY0r)v2Fx*420QLJRI>qQ&fDq&?hO_V96GUh9^
zRam9&>@s75r$){G)@Pb&*)5#pHR>5E2TRU?5|SyUMhzQ}(+SV4C8!Z?bxS(oPmqx4
z=k0^LAH9llus=!O%ji4-p0FrU5-S0Fh?2BujdlYlrPks3f1Bq&qC0inoI<P&`RiB>
zD#g4;!w@U`EMiZm6OKYcj+J*1eAL4c!@r;Fl~P{a3Uu^F0%b0(q0&Ym;7jKd1JyVJ
z>6FyQdP^f^J5M=+G`4ig?_8U5J5Nb>q<reLDUTPXD($~EC9#XPo9;-t;Ik>Wrc+L!
zl;vo|!_ICqHbKe6S=w&8V-D}S&!()`Q~odF-UU9Y>RRBQFq33}31^T1K|!M8qm8!F
zfD#8Z7!rc=2u2bj25gIT9BoTs2JlKC>B(RwhpF~;TU%|V*n92U+bfC>Fd;MnwFu$^
zg|@M!b&o@BR0;uN&i7yY%p?JA@4dg@_x(OGbI#e%wfA0o?X}lld##3gu6#mfj>zo7
z@^L$yK7{7SB7kf+r@}>ifYMOQ7!Ke^SjEj_?Tm8UOSsqsLhn4oGOAXO3k`d4@rlz7
zI}4jf&ag*VW1_9=GtE;OYu>T4W5(>3yq1y8<7PMeOW25gu-KvgVnz$AdFX!@FZALg
zs5ryAW^h4c%I%@n$iW3&Gq1(pGNO6Ryk>7npkw6+$<G9?Ty@#Jcy$Ik6Js3^tcd^t
zRyOCJKhNy5BMBx%M)s$0j1(K$zlT{+W$b7*dup+I^rrQJasPJKPopWyuh}!(xc^1E
z%-KkonCxr%DLXY&4K<n`(Jy)76{Z>=o?Q{1WU4G9`hBJ*CzIN+$EFA$X3tpT{=0ce
zh;+eP?bm$MrduVdZ@6*)0?B}y=PkbpCdy<NxH`{CF;%C?GVcFue~R&mizJ1+!*ww`
zQQK{M^>(tqzD&s?_4QKKgCSq-iIdh&G{K`{FLA-5#4XY$HP>j`LYqQawFPZPQxmTh
z72(PJor6I`Q7Lfv--O8SVJw`c{EQD=sono$d3J`!qYs-L+aJ3r7270PxE};3X>3}<
z$8<TFru{m;UYz{xld7{HTymlh<2svm@>P;}j$bRwsYsLu%$`7^lcf!Y3qHR*clx(s
z6V_!<-!jqVTJKZq*{2lQiSeX-Ftm(D%7(&YwvM{1b(wo-a<$p>CFfAoXqq6UsaqYL
z1XE=@W_K%$rr$`j!?#t0FW1BNXMte#c&F!g@X^@kKrZQIS5Tf2awo@It9@o)hOy}$
z;mG?Y8uzad7E3sp(2!f<T&&ajY`r#NQZL<zaTFv_)pA5ULyq*kYNY@K6>kl%VhD?;
zhVQoAB<yhIr$!WamZ2e%vLc<*h)&@(Sz43akwTw!6G5E~=Q?OJH8Fzd6xyuIH2bpF
zPgIN9^$cc<-?>n#MddwlR9XtY<^Cq|x^A>a$aTMy5_i+g#Al^#YK7x{m@W(7Q4ub$
z2wzeWX;YtqxlvES+*|v^Kuf;$BK)Cs(8~Qj6h5(0$}30LTt;8Ih<<Sf$l94W#CV?B
zBiW&h#3%x55;^?#<5CG9V#WXdYj~jqRK*jU1sPU5TaHZ=B|#rpK1RO`r!^bA);EQa
zC$p??3R$Kv)qD;@(0v||RhUQf`!55Ca9;LN<BJXzwAX}3Rls=e5aO5|VeJs|N=Z8&
z;c4!8oL|;LztPku-}UH6=RAU7D3WF6JjC;vyR(tAx+`<5P(trojv2A#H}Li+-Vl#3
z{3}l{PsP)-+(PJGb`)zdH9X&AuZbY$$zM<|SK>(YuDu_217(^fk(a;)Pj`7-t_`Eq
z6Mv%vc41|Id?$LVfHxBVcVh0IprM^E;fzTQqrmsA_;<GsRw3r;lHIB<9)sr<5YG#&
zNFJ*6=5?;sW2})>)#7d*V$-_rQhNjmHvC1*q?_1e;MNiT?O&z$IG4iX)b6)zdrx~y
zHZqsLpcK#c%M7@}ZwbZ5+{}y{re=gs(FSA3Zu8_a<NmLKl19@!LE)2^8cheKH792n
zO+U~t6_}JbITw!sCqHL2H4_BBFHny$@AP5T1T&DaIxjve11s7_lTg%_vDS#@k#?3n
z-0EpTwWrx@XU(#Q3phq}6=;x{%a66QB0RPtd|pL(SViO)kKd4(M%KqapP0fUwJm!5
zONmSQl9ZVh;i1Wm>F|n#L3nW2(}+FQ4hWJ!63H|>Gn2W&Rvr3SIy4KdRW^-}uSguC
zf$mescV-w(LJ2fHO=3QY&M}(m2%2_jxQy1Z!c?lx?Vs4drzvD`15v*>1~oA9--%ob
znw1!lY9j5MSP>opvHmSJJw79`kOCh6Tta#~-JE5K627c9Qw5EtiM*N$TM-(8S*4ml
z7pULG5*TfexwRAWZ{UwSx>Aa)O$?DD?@62{9jI@v^>UMQJhN<DYL;!2S;mrXL|f#A
z)^2R%#n_QeV=L9~Q(eWu)!?CgnIxaoQhRtp=726nmZo%v{re{uBN#Kdn6oe<@>KG3
zGQi%7urKjrjy=+yQkDEnf4Cfnq{HVX$MlD<927pA$pCRdDbU)Bywt0HhnWk9|MjvP
zPt=nZiuxM7QCb+qCYF>?l{i;RP!cTbR_`-&2*wvkf!f7xXs|@LassX1l{>ZWsPJ4W
zrBzf(=OYCaHNgV)jkB^$_{1!-7DCSa&3WPr=^Z)<Z5yf_iu~4U&|4q4`TAb`Cv8L?
zhwd?&<@ZdxI6MPDK~8wWPd%H$&ht4pES}rDdJL<<RQQ{g5nMQJ9%h$$#r|Y>i<~bu
zXYh%Y$=>8=t%bRP1K~C0MXe3jT@)EoQeKIT4e^Q~^rs~&KG&<hgP9(u-)<-`uIpXX
z$PZd?W!~nz0(NAb(*E1H+-rVr#Yf31F?d(j-JFNwUnF0WpQkomCenus0X%t$<o#o6
z=#sCiuM#!5OFugA6S@@T_>{O5Ii^VP21zJp$aLM6my#!lJJd6xFFY%n0?vpZl8#4=
zvO>ftiKTEShcE+=l&s!Mha*90M@+YyosuI#(cr3E96-6Yc8_zW{h>}7e!Zx5>iN#=
zi>d+<6grL+kfZL?1>{L5yntw9>O>SdR`nMe>JwK-LD6hgH?~S2_>x-~3Y=W4V&>7A
zLYSeHBJ#LKfYnD|hp^k7k|cymQpZ<fN|RzzJp+4;VETBVk2C*Xwl<vk>$5>l-(%<M
zKIhDTQm}!Nsg)wsySi(9v1~ajqMg}l7x^qU@cqIY=di<v2=S*x4IalSPMIP?oU5l#
z_;9tpP1Yq+SSFc1ljuZd>xgr2pk8$&yB-?K$%WN@*4agMOwb#>z%(YDd5RZm)j3mu
zNu1z;G(#r7BP&ho0e|e!<Ci;i`};HJ>CA(0?8<gYkjAli*?0!#Of)jiN^xfWGj^R_
z!5KJs;aSnht^s-@O{z`H$>dmH0)KX9pr1h9!ia8vdaR|3QxV@eBf>oDm!3!O_uSWo
ztaY2)e&G@Y$1xiFL^Duoxns7#>r0+vHS8uDf+3eEFP7*Abon55b9-d6r_V4P&A15X
zYiN4*pb08B<aBa`&$`6*40C^D2B7%%YiB?)O1t~gjP{=@91#3xfPjj|zXIT#GXNlQ
zy87rRS3mlbs@L567ye20L;f$-5BVRe|Myovq4oI4@~R`VKDqUt|4a3r|DpP^XIAf^
zKm+3~5PUub!C5FE(f<mDvrs^ir=j>KDDaH~pU?@YUwYLa%Rjjjy#ES-vrzy+w1a{F
z1O?9dr0SU@UUmCFsowv8sUDq!e_8#vUOA)n&KP8;rr{sTK5-gK^uL1PtTB+}X(;~5
z8035s6g4R*7JV`l68(RGLX!UvP~3-!>W`76u_-8CnfZx*A<_Q_C?xs+07b@`P&gzh
zUl3w`3WT#sQvSaJ;B0)%Pgj2iJ~q~SWvXy)dN8#LLCG)?mHJ50@?tqrlYNbs>n=;f
zkQa7&{Ykv)D-!?DqV+Pd9+vl?m0&zs2J8PDNg-u446Y)5#%<Y%`7q};R_-EHS$4~~
z7I@Zq%_B=@pdkDH;w34)fr0d#h%bQutl@b1)aoxIV~Kl)aeKeFI_Z{sZxJqd1Wv5E
zFm;Ess@h)YH+P{IyncxF2e)Vnu1<<z1_L;FvIzV!d=V#d6OoF(tn(v_%*|*XpD_<<
zBmi&`T$18#;?$Z)mn>dt{Uxo)kOD~a`HtChZE*r!L=<>0r8O6+ci_y0eRTe%j-S6g
zQqV4!Z8Sx}LHVQhYRr=4x=;yx@{=-5cQVMvn;d4}kd?>g8NWW^{*XfmMpzEDIGV!m
zq#Wg)D8XRGn$g@0sH~~N4&Uz_jw`VmG~KU^Uw69OIiakw7v?&BLgW0_%T~Jzld$@%
zaJ*}(+a$cEKfPbl@3lJBOv2@UY~b|j@$NcN)Ezyj*uMo%uNkNNQ{w7+*7ycR9>t*t
zqu{GyXdEy${4MZ@HCIW|9pQ@@ioMuE?>3%fAQlccp7b~8W?)`vcr%rEmtacvZCK9x
ztkX%;O+kID#yjPW9w;yTw?N;@^K|{hA>s{muQmonV*mmB={;DI?kjk)peJy0T|uB@
z)o4z<VomY2tn9HT;$mW6>}>|#T2*Y(zx94PI`JKvO^8nVkdyS=14%npjo>s%lA<;o
zA}Oz&OqeQzlMbV~SVF!Xl?tpTZTeoU8*s7aEvq{bAQHdB56F(;sVZ2cIxmPcf{CiW
z0s*N_yu=U+b{!WLw#<DJ^b|oUZGR*BEk3kDtSKt%Eqsaoe<>^<+q^0@9a_V=dY9M%
z`5|Z%aP;zLS7QohqQjjbgUn=`lAKbl=2hy{N097ZYL)g@AWt7+bqJSzME$f~9HIS<
zk|~bdqcj!EE3Q8hso)4ctLS)nEaG!C>v;it2I=C9)=_6T|LigsN|`pgBOMgW^hj&u
zAz4Ji*5!&^IY?bz3aw%hOcnbmGB>LS))LL}IxmgBY6if!TlGgU`4VNngs*L_OMf}e
zCaZ};2{rl(-L1;mQWV#BMeZKB&hY*?X?Rw0spK`ut1fU7g@cY#ee$asl8*xrwIkKV
zj?(_*Y87!R3L}{9TK&6fb%%Vb*C;)$o3F;)%vMY7Bq*^Clpy~Y^#or7z%1j7yA^Ds
zUJ2y|9~abkXaNbZa8lMqPh$3?Ju<1d&KI7j{!JG>28f;Aq!`_F1iU?jA)KxA84t7Z
z48JCuOFvQp*@lKYCHGsg$l+?W`XD$3l8b&uWOcRr56*=CzfjpcPwi#TI(X-Mt53rU
z?iJS^2~V@?yX?8X@KyFa&)Q+u2)qo<h>b{Q)2UC%;FKLi%ONr>Q16Wxg08;i>{+q;
zu4%&}dzvSv5r-1>e)hjW<aSG%H%ywBI$M&HQOLEQ874;%-zRa6dD^ow62BKmzj{@n
zlUw}Q=``Cs9Btiv?SkIO+?L9Zc%OFdf{!BCv{d%-e#x~9`XU#!RNB1zuU%kAhMSx!
z7T5Q#+?l-Ic(MeeMYHW>Id6Tu^(CkA_7QI%C9mQQQ)IJyx!}nfgPDD!#ZM`@I1~4m
zV78+dxyH()qO-rJ9edTrlS2#Ik{{^xrsjF&24Z{kFF<`5348Qoyfk)7Xrq1myDrxn
zQB3*6($rF}svs!BaQqwCV^4VrwN7<vO6nGkE!KZh34@0bY&xZpe{}FAK2ezzV-`Xj
zq^f;`*n{1mEk5t5|8Y{h6!NN{UdIS=sZITAy1Zy;t8ouJ+~SU9cnEcMcmfgc%I@@z
zUsRWn1Q;*~erp6v@eq5zPUBm7G@XXsBG*>}dl3qJ8wA%vhSX}BKTKmzXw0Hy&gR4D
zmm*nsE0!^E^JP%pMQ7zbg3N;%;^aN}33>5?h>of&JT53t^|@^{iB=5LEta5K^*t~$
zxEtFM!N>VgpOOv{X6J_B!n@Gr8bkE9$B4mS@h>Dn60&1XZ<b<f!{-I%MGZ}r>w{0=
z;ur4I2`y@ct;-AUlR5v`Txhvh&6O?{%q==pT0B7ku+j8eFgG^g2=6Ur{vUVo<UGP<
zL?0&Hp0ZAgA32$9R!^+{ASRR6+Edm_U~iEGb~Ep}L4nSm`JRXOz=@SL>L5|YSuCL^
zR^Esn(<^*hJ!&V9Se7{O(}g~#LsNzQnh$VD7J$s+vaaw5DYO0{G)mWC)gMg$D0rCW
zZ+l7lKs4KHgGc1MOTOQb@ASN#2;lm5;AJu0MB4p@0I&-7Hj$9F>+6DEB5st3cC~ko
zOmVqiDvXvSY?of{M`}W~0N|JD&`^dXR1Z7f?R*lTzMlGoBUP_nC1ki--2(NfRwLWw
z_xddPJ>Dw6w{kL3trk5kzYj6S)ha58uzqWaOI<=<bJwITGRtu5pzn!KKgP&pL^9P2
z^PP$KK11r<Vf(clq$8BsHuqLejfyil{=_E#=4m_{L5vbtCA+1_#ZSwHrsc)Wc@jO=
z+!p3JV)Y1o+cqm+@odXwRxt~<DA+AH6Xueh=<)Z)%j8zUHs)ujZz-I>8TCv(yPiwW
zsApWd9&U~lKc1=w<;bL4E(jbdty1?+We9}14~<tN1^Lx`&=novSHeQos!u%u=G677
zFMUoTuoHHk`XVQBwf5*I0BXw$K}Tbk%eCbweWY$|Po?sz8Inr<h7Q-+hN?mds8Y8}
zk1@|t{5oGJDI`f#-L7yJwoNh19vW7=01wL2cWTSmVdl!Z<RSom>IKtOA3yX%a*Bn4
zBd;|S$36HU_dQ8NAXs-Obc4vDFGG^$8Oib%KPd!7e4ZS|CP`AJg0y2URdJ)N=Jhlr
zu@+1M8_lC$>Ji=?#su3dbNy|J>||E_2cWoXx$%`O{^t4lsm|wTN#Sy1LpFc&3EEIY
z(1xW1ePwwGKVPooXZ7v;tY1OI7YW<&6~Z>GA#B5j74at<C^P=N{LYSS(fn$!Y!@^b
z<2joG3<klfLxWT9$(MPHUcjfz+lD;2E?;!20Cj#t9@hThZ$xf{MX>goZ*RaJZs7g!
zsDk%}PrQ@?WnPgR**vs*4NE9CtK0{~9nMkr!2+)Ac3W8et!Lk)K73SGwW`3&ktrxG
zw_#NGNV+GE5I5KBCV<>HGAi>IlpU$Od4ZbKUqkZTbYegLNfJXaD+j!8U8peG!jd18
zCWd^$yw}0_uZe&S>bTsvtPLqJ)5VqKit$kk0rPaG6@+^_`zw41Filb;D0fu*2lj|+
zqKMRtJ(^e4D!WP;cR2K_hZb48LF{~2<--qQZ7@7>!NWzZ#*ZboPH8_w-P@!_f;3CN
z_(WMRpPujtbsJ5R#gi)K3LdMudXS(kVs8gX^ay!C6pbSIya5OP-kS8L_OA~xzJe9A
z{PL48KZWum7%)pPV3uIOtQG08-)B)$df@$1Y?=4W@rBQvCf0!Vn}6CMeh*#<pHuJx
z$31dt%BD~Tci}NKX3E@*3icFw<k*7C|HnT3nT+RWPW;jAq~LA|1`oO=nBgXu-@UtF
z-_0S{0=2$>7*pVAGT3<ZG8mLCE)SPXa(dnTj_#4)3CHAjO1Jz@Kg#d&O{4Qjw0u*J
zPd_Fo9hiAUKQ8Xlk1G!Ic<BC2KS``I*A|a{dbW6ZVwrJEu6#$kAQqjOl_bsJ-)4#2
z;^C_^vj=iB)Z=RH%<L87%xGz4fLQb(SvEJlk5Av|VP5UgyM<0wkSUa*u4;o$$RfRq
zz~C{>F17M%PL~8O2w{dAA!&kAHdofLHwFEDjwC7BHl4U-d{!w^qd}cApod`oMCx}{
zh33R{^&vE~|MO`!+ZwJ|^fG8sJX**vGcgvuoR?U%OMc^Gs5SPTgYx_EtMa>5ER4jq
z%azXMo4(VdAMvC5@$hc_i0;ylpS0@7FQ4P_(EZVF9#)wrKG)N!Ym%;uMHQj3_%Vr_
z-5ZM^;iXdpHCB3211r54iyrCkwGb+bPFKY>;Pixa7VCpZNxT^L{uBGN+MtwhMqg<i
zgT?9#&xn$N?x$*diu9Vgp+K*oR=3*zX(8FVFU7h;dn&;NBuH_db%_Td#X5T`(j$?~
zMt7avMeWO^_PWF>Ql-^(_iEJ5bt<h(JkO^tKs`Sko`8##X+>o9#MuEq9S8_r9-Jyf
zNp{I{_P0A$$GtclK_A8ubgZt6o3QKQnq<4B){>1CCk_Qv_3*Qz!jUrBA`1^JYP{@l
zrRs)V9TfF^I_hAh8gXW>N1Z5DxLXQ-DK_CHI?jCAj!o}^Cy7memET}5sH-k%rA%Sc
zc5%OF-PH5LYd7yBEdX4AGIN9U4!vbG&1PWJF)X|H(JQspsuk|2q*C1jPs2Dk866F)
z>T0!x$l8)hdy0gs-^|l2qA0R>D9hQR_JSw0F7biPy;Qw9oI6YDu?Z3o%;(1*y$_rb
zxy4QrauyxSkp^v+xVu`Xu@7EeJYhK>C?JjwOW-Th+z>7aenx`N-MpIzjT*^XUy!Mj
zNWO!~EN4LCTokPeUC-KX7uEzPkr-LTOV;$4s8`?7Hj3-^MTW`IxvP26^+}HA<&6t4
z{rOgSLUwR%DyPolmpo`mbYXx*GC^7OYaV{UWuAyAMP{EJIjp{~p9j?zJ#xM@GyHjy
z71zCLME}N1$Xy*Ok*)DH>QmdLH$}HJg(ts(527crpVn~Q6%lV|*>0(!9LqVPFmY$A
ze}rJdk(R7!1!3>B!gZsk6>k_>p8R{!AuF;ATyzzZti9p7Ya>(1R4tk4*$kBOGfA0U
zPR7Fee@J{D@mEXy*^$L{yTzc!5o1RdmMrP)i!{LY8jt!n(mUYhIs@-^z{N4fEKf74
zLr2t?y#QFqK3y%+Z|Y>pz*4O3g0Qd2K#f}@YTXtZj3;T}#VjWc_heR>yL(Gmiea-l
zL(4?d6d~cn_<f>>_29D)&=nFA&apbM3TZvw$|X}aq|V1CKDf9YzpsE~55||;&+GJd
zXxY;8P__u?+8;cDA0rU}7VNX$iqEni#2A;Gi;zRCH|~5zlmguy?)G@okc%I(ZK)jL
z>s_tc1v}j+TrAAnkQEPSolFjKcO&E#?Hb?~?;~dbJK<x%f;c{_VV8i4$_B3w@EYh|
zKhu0KJ9+)!hM!T;c^@lis5N=3ZgDm*(pq<9{9Svdx##BV-${4w5vhTD?q!?+WJGdf
zQw|D^$T{3kDUx@I?nZ3N5go4hRX>EC5-Qq%RpF|W8vhWh-q|X}Wn@aad(LUpPuFdi
zWZF5BKRIrjd=%^8b-qvOr=6*b*2HPBa-Of6ii?hOrL0$d=y7Vyac&>)?9ugM<3P)A
z7BL7`jo9KU4U87*hM0e}&^n_jkEr4)LNAOawo{xVXLiWPQ#q|XxD=kbEA`wd&*jBa
zw(*RNCgM3>swKq^iMhEdiAQSZy}J75YTkvoRH+)~EFUZRpwzp0u=|s2D<m7wFUymH
zm+_2@B_PO)E;uAH_L|(P<OqWG7e*o0<VxW}(6|?+N#vyDE#|4aLhePOA#9Y7v0kvF
z>Zu<U@+`7mBmnX+ie8M0BOF<9b5#{d)pO)V{;c~9)g`G3UD8_hs4lg_%8{|&EWIDt
zZPkpg9~0QW?!v&n4d(~;uRlMqul`)Ly)hUO*thO@VE={>0{hl`1N-Yma|0W3UMPfn
zmPdZGoly_$kK`2X31kZH7!S84hs%c`g7FZ$)8rE&Z*Y+;iU+63-n4kitI{E#4rQrT
zmovHyb1G=K+RpgenG&BSg>1fE>IfOzNxz_g^hlY4Yo)jtp#*+L3Xu(f+Cc6z^8F%}
zZ=93Q7yO>&Tj1n7E`gE{c2+eqm=MZzZkAjvMZ7Cjz(HX-(mRBdpL^L%BKAIC^?>+T
zebZXDVw*+lhKbd;;X{Z>8+|+UYZ()5^sO`eqV_U^I1|HZ5U>qn)?wGJggb((d`k4n
zDK1u+d`?Wh4cqXy#*;5!GUHoo{!&#FY$$p=gI(*FnHJolZ!3>CYWkHTcJX_lUzqU5
zLNdCzonl6e)#+PsIRyu~Db!EE;xpZUXLAsr@eIbwZmv`tTJdb!dESAL>)D0{8LldV
z?k0%soV#ZvenTN!8|Gqs%w9E%Vj4RI3UlExKxlj$Xd6&Wx+inCxu<tVBnLu_A~u9r
z4v#Z6DSld$RtcNoJ}vo@SIKT8l{uYr*uTulbvDsu7a4d+R_S9HH>gp|rLS;bIR3$4
z!>{^m;C=$$B?WY^>lq=Qk<4d=oT7^^>TEZ7>T|4vGm6KztUIL}I~)5L1)i1=7RlJ)
z`l{>|9=lNGNWs~NfomT;akA)8RZvz^YOTT2n(CHurB?5Q!S45Msr5Q)t<u$orb#OG
zJCa}xgGo}*6I+rWyKb-@scKcqlpSP-O_u+Un_;7=BL3_^{P`W4K3M#D!9O$|6cOey
zE9V$fO>86g%S{I|-gZ_-g+^~m_DRN`f1dH8voikrjEvnM%jgq>h^+qCa$|k<wY&^z
z&J#Vcz-h4ool5{Glo{cGdVxV4WFxW0DHn4|3&|PoP(M2}{+j;ytK*ZS4gY{KyINh3
zLPbe!ESob7v5TKPH&EtZof*1tQPOW;ozgj*I#ZYr9}5dIHtC`EZPMKKZ327yHYv%O
z&~!8O%JaKsLc*gklzzp^_v00RGf$3OGa{6;i0zu^cbkZ-YtNhsb;8_zfNRMYwdt#g
z>e+lP_R8AUeVhUbYgdn@gN`{tzSKrWaWhn0hb)MB)z^510awrQj1{H_PJPMAni=v@
zulkXbUWPWcX>_FKf$qpTICbET;kXa`hjX~nR}c`^4j_V>a7KBb{~ycSqb=iT(fDvx
zB+1j|)l^p%*<7#B9o|}>I}2;4{u2jJyk#DA#R!Y>N!<8!T;4$3c;fPgx1w!6XA%Zn
zC!xiU=i!6A`FS2l&fr~QZkdEx*Gc~U$^CEce|P`E;fEr}i0?kJY|?ndRx>B%o%pMJ
z|H=^o(yj5X%od*yt25?td$wbKB>Ti$Ck~o#xv=iJ)32>Lzw}ZS_oAi1G)TSyko<sz
z%~%1eew0)^5S2$1EsUH8Od1{y?aWC&V8K-V{CnmlF$t|BohJLv0(dt7=Y4~p+!VBa
zpdA6UzSZ6WT7MqB!PCdnKmVRI;7b<+x87~a?I#XK*f}~DMIVAP44N&Ug4~$eqUc91
zrcrur+3?f;wWVFw7H2J~_o+H3J8Q{HR@;L$&o@lmm<?CE@6J~my6)+5zYxzAvq`RP
zLeK-d*G<H%JdeDB-P>HzKV`^!<_&nf>?gi$vFh9hpO-b_1Pn7&71DcWtB_vzZjP-Y
zna`(5?JGAF&+^m{vku-+JpQ}uP8A)xF;)$o{jSdJkXp+Hhm8@-&@?C{q*nOtw&(Sh
zr8<v~rBK*ATZO{9cLTi+&=hrd437$q`ewDd7TKPV(ukqH0(+A_W#taq`kAhX5t^j-
zm#}!p%4fp39=6J7reyQgYKP$WfGx~*ER$yt;k4?Belji^V>BWUpoSo_Acr9GZgIgP
zGeg4mC-xuGh`a|x{!k-wo<`){enb}35JdK+5P6AU!4;3P@`NwshFN&5sdB=;3N5$X
z=3&Ke-*%4v^{`cH-!@X-Ikc#;x`X0!u*l}lCw9+P{-+2vjHl?c*m_TFJ@%A*cq1C#
z7GLlG`Okm;wCe;?t6e@47wmmrGK%7hzhr*oM0}&%lG-6Mv6fsfVe=v<xXh;!v+?M7
z)~o?>6}L*F3N0aA)p+dDud-o&Uh;|1;4~Oj)Y{yXDVD8DxUqh$CHfvoJE9Vh&&83?
z#2@}U0eCwzo^)f3WK2O@NoD-oIT9brzghkIKLpKvr7iB#rq;+o#BQs7@n|nusI8Kk
zC1IsLy?KT$G3ztogo5og{n0gKs!~6AR+fR8sRSU%K!Tu)MOr6XtrJa>UfWbA)f{ij
z2#;u(lQqHLvME!FO^!U?HY7Y+g7PJZf|@sFNp~f^9ZmYhB~9Ittaf^_GkSz_egwot
zdp@P#t?x)kylI5wa_@`Zns1&Sx5n2nX9TtEZ`hfiG|W@u)==#T>e%1#Zho^r$qhez
zjl8^aCxWr1MZa6DW;43ll-o98Wj9_4cl=){Dp)<6wcXTNE4XQ~;chG#TWf+$3U4T1
zy^qH#^qtiYN!%XFQ6J@}8Q(QQ&T|4&v~ks|QC&J0%Q}Z0Ii1niCx{Z}^!*#ZB>!ef
z6q^;abZWAZ^dL#o9JA~}l3!;_PX#}lIG9_8F{lzf;SV5Eu?Yv^?ajWv$oZX_@=8}A
z=Q%<_Q|o%eWhrgo<TSJIqsTdflXQ_JdC2VRji3kDjc8>cGPz6gBAe;a7r{HydfjJS
z^WxNB+sUa>%VgU3a7G4m(uX~+cJ&mai8jE)03+vHt;O34X{^!o4FQe|u&ssDyLnyt
zPNS`$yIk=hWuu+Y@5^{Mp6W!xsdUfbh?S6dnX2TRUgm{N32_>!CuzKNJT@C%-a>`1
z+yIKl?)Ai0`HB}RV`C3hG}OOG@p3yR9{GFAh$ifL@8rXHvYg4XC-EP=4=SdaVsIit
zF?a1L<S;k>UnMd~kt4}ZW2T&WcA4?yb$E?KMW(E)rQvcSy)y$7C@o_aj-B3xJu5G7
zxXu;X&$!uTU1kUBfL$C2A6c2OIsvV-RP0^2^toLqD^}`@m-^$e$&_>Ja_dTL$`#Hi
zDY-H7q4lA91JO?6DW+w^9QOnd7kXD8r|k7MXVR1D@ObI@Ps^pF2CuhdcI2d0>QU#A
zgCb*9UXB%4!Q*I><xr}7g;FISE1n`aVni2FF8cp62bRbrnE7bGc-TDZ54i-rzQx24
zovXE&?><NLD8Z31cid9y<tfcd2S<upnL@e2gEECmQ8hB>cG)U4R;E#`{;>KX_+Tv!
zvJk6lnEP_=qLd52H8P0#&<wTVS`b_;b{b9P1U}tN%b0K0=?{NmUL?B{G%m;}<`laa
z{%EhnM-JPogZ=XhD=We2&J3$mpZyt$V@rZn)^wRu_8Z5`S6~h4U9ug|lzGkds^9a$
z+$x!np1h@=EsEa3$JCai`sv%!%@YelplnZOy??nir__%@$+E))mn4;rnJyH+KBr|)
z-uUL`{F65jk#HhpF4jZu@`OG$H(z#2;{J-V6~o;R_9#sU`T<|foJM3TNviBO(zJjs
zawQ7^cJp~c2$C0z-cEkwX{WhWszh?BHaL4nn*)!ycXY9{>r$uL%eR};8zz-<q;gK^
zBUR1F*LG$~08q)f+2&=uw{Hu|uU?rn$7F4MPNEOhu+jL+be{|9Z_wKKIAH`VDb9=B
zYHbuT5MN{Y8da&DeGIgGQgW$iD`3`I8#%BZl;HaV2`=Q=A1_}|N_pyQ1L13Um5k(<
zj58^@#M-!vuPX%ED^)cKtc@@6{(J*J1)Y_uR0r)#eNEAYweqDt&8xY~AK&pRUsm>X
zKl>Db{hmM-F)Gz<EK<mT-6X56jjzXGmp6;3#tl7}fgv~p&jy6yfPkR>4@`#I;-$UV
z(-tH0>EKQY<`mDK>y30)t8MbBH%RG@oFeEa+qN3}b?ZK9E=-fVQa+^j`acAw{*Tsy
zkNDDlu<muh8fv*y3C(-C?=g&-pZ;#wa8R@~I8%zGq5*IO4DsD&62TZxk%j61H?UB`
z?bKRT*fD3JJdZYvMHOLGP3Y=ctA}aN39))okQIgreVc1YP*iPULp*$04Hu(+AW@RB
zT1^D+xOZC{VTmo2kz<K15^7;}Vv-L{4qvcG2-D9#1ya0r4!F?mtnKA1;0xEYwvSgk
zBzVQ$sRiEumgMeG+sQ$8H6E2fE!m2f-)&77yXxvrDjg)>(lfM;q&7sa7V4kcqOv+l
z$rUT$c0#UOjc@O~!8(N=w0X)7UyCf_^>Bc@p5aT)Q<x%Eb~if0@?T0R%i;<ayA!#o
zHO74VBOFES84{~lfoEcE)ZG?)adqvR1t5G1#B%)Ekgp1FEGJi9njd4JV>v#FZ5EV>
z<?Ln(Sj{p=V>#29(^m6t{qB<YhF|c$rG!_J2<E*(E7x2G@L~+xXo?dF1sa)`>I%nX
z6W6WM3=Ra?(@)2K#e&kWinN%l3{ZF){j*>CCnb79@bCpaPFW1@C^2<0V!AVcFx@O>
z{RLb?0o!uAfB8%-3mFjhW~FpB5#Z2B^a523jWooGy!%wW^Dc@bbqU#WGyWygn4fW@
zPrc@+MHneY>uLUEGU-FRBYL;fh%e3bZYQ}|{T9&F5#&PFth+IqKPyPp6z`V?h?EoP
z$FQ#T1Nm8}gSw^qbOVKzAI#K|*9BhP0VF_sgyLQv?LaPUUb}uzi0TGt>yQvRr_oO7
zF0YQ`78EN&$Yb<{frp`?a4K|N>g?)xm&TU)kvF-NnUZhlgC1}20qTWo#6QCKX-~w5
zrN3Q1b^@ZaDQwcT&qO9WcT%qi8I|$-8VCzv{Bh`yrH(=8W8ZY@X#Uatq)4^}E1t!G
zbF9v%;y@E<Pdq}fD9**F6}C)_V4}3dFuzS$!|BgBW)CVkdt*6I2ILqjGKK`J)-;@6
z8rFWMi8EVElIIgQByu~Z^j9rzIuyoC|K*XJv488W4*5;h0CH?jgVld<a`KP5@g&6?
zJssEtD>0F$&5_ia3<pl7whNW5t%U(1hG{iG9A(k-i&azMHRi(D(?PgQ>+jqL|ESB4
zmzQvHcT8oll7@>l37vj{uv45aZ)~8cQ}Zw<MT$9tQ+(D*ks1|KyE`cjE_5>y>$+6~
z^}*U470y<!oY%zHdOEUQu{;hZ;!FJT(h9o}sdjJ?MPl#s8LD;%7m&F|y$+TNmnIJ6
zu>sU8k-=L?mx^D*WOuNnzpM8CK|^b=T0}-fvwwPo+T|1quAv+LoIAojDBt2G&J!PB
zn68{7DX0Fz{<?3aZYsuyz;o2Pu36j(M`q(#+M3{OdcxdwJb;eEP<wTy`oSYi7OVUg
zDjEpBMK$T*vZLnmTkv*22LVWBY<&fq+VkwlQMH^{DR8<JSae8^?aBN`y3ARrGS3LU
zMHM>1!Pt^pVoT=4mf)qlLbQKV8*f<|2R7a!qZSzvGc7k3T?S%^KgsR4@e+&P&ac|+
zV>x|@O!11#V)0uDidS47UzDHuYr<l2!KGL<$gj{z(OxpQOEGLbel8!lXfT>K^VV=(
zX{4rMeTFNtAb6V$CAVO=N=kKDcxDjpxFDQf0n}x`*P|5Z3+ISY=<MaOSvU*C$*+cq
zr4ol4mIgO5i?XZLy@fDEvbNX8qLmaH=v;MqwY^o~QuYs>AvT(X1tC;mR*C-5?-OeN
zL<o;79=)3fd#dMz0*lf@^e@CZ!IkK)9ck6D3a$ztW;|8uv2>@zGE#|ZQnhY@JklyQ
zM6f9-m{tzAqEgR}Nef|zE4kC)!1AMqrBtCbBa4nZJ#fik-2>=)9WUN0!x0`C%Br&U
ztNPM6b=k#RWrV_GLLPgo42-S6)qE$`fn%VXBUhwAPj_<rAzg)~M^BW>`gcTEeYbx{
z)Od6k9Xx<AI52oq#fQN>M!cN)M1#!j%6PO=9zhv^xW1WES=HFNkBn-gGflu*A-501
zDnQDd$z`vqNF`Rc(E*N*$XZgQL;ph%qcyWK7L|KNs)h!z35u@ZgRXkqDy<Mrn&@qO
z$8p|ewq@P5Co2}cn{On|dY>2fTp7xufMt><I*niUN8gZX<%#QyHw&z|6dsGtkzBfL
zv#l5TA-Zg(mrIX{QJsGBaX-wFh)i`tD=t-$Hdb0;Jf-^}mJ!NI^#<5YtZI8ej}_<Q
z?7>dZLG-ue`iWF4r#jZGN!I*)2SlqAr_%v{_-e~<>qf`CR$PjSeP<@Wn0kp-fN=88
z;efea%E*j;M^dc&ZSq1(=K<clxTn+d<C=;LHJ<)LDm<wyks!*<t8?jSa*7lzv>~`#
zD66P2Z{^U$+?7u;#YL@8+l=D!3pSNWN)BB%to&QBk5<@I^5Hg}0xH$y*EDX4z_WyD
z$`<U49?r--;tSam+bF!4Rty;GG+x~GlyUOwtF|9#rdpxDS6X@??X5Drbf^mcKn6rM
z>$Oft$1<2b5?Ss^JPuklZkLhQ+m$OQ4onfenpS9E)6bTTW{Z<gIrgesR31<B3v)mr
zQ8P@9bY|Pzo=&|PjCroq2;~UI3co#Q27C|j2W9|ORaK+%@<B~Z(-+9^c<d$P74$`>
zd~M<Y9R?uQ%)*L9C-0q6IZENh6?-_$Ti`{bNz7g~6wfiDh4OMwMyV0KM86GLYDC58
zhIKM{J4CWZeV%Q*b&$Eil5SH*K_?S{QjDhe`DzFRj3&iPrzTuvbnTEu5HmwM6;h+C
z)%@RS3}gy&p5>f+7wg#YNLyz!JA93OvWl(WQ>vHGD)sDEszt1Yla9W~P^l)`Na5yo
zp^upx7SvQZlT=T6c8GLQidAyR*B9TAI&<x<lHSt&<jl8@rs-=5Li^)1oyE9kf#?Ld
zPd8i-rJTjDp)a)|IMWf1txTtgWQ60n)oA|=rZfxGg<5X}yCmUT<LfJM&|YL;lcpg<
z9&{*6cwChOfV$YJIO4rPcS14+Kq)&}^K|C=R;gHeIO25xz|{Cm4&nQW<7mih+Q2})
zH?z8C%_L#^!si#+vufb1{~_CkZbs~QWTg7^kpZ?^wktKkgLI?XPZ~%Wtbb%^wOao@
zx*~a?#t{c?b>hS*tRAr2iRG?<PV=Uf^|WjfR2%0QLV>ySGe#|BGSHQgaSX2^5m&21
z*!gO8F_~C{l2<Xstt`%>)s;z-O1ED`kjf;U#D}`|qxU_@^FFknp)5MiSuhiLs`Jy4
zxQ;ZMg{Vuoctzk9lzqj`2xa7esf+oYxq6~1{&QLm<0xtU7JCjL0<`~fuv1lW%pjVA
zN7NSp)SS0M?n8z$oL+gBodL5`q-NMRX*x<zu}OG{#U{O{u;$&(t<hb;D=Lp7z)W?*
z8>&(!9}+TA4t$gdxsf&@DAYkNKc4>g6dDZc)UK9frcicCs%#b=SA5CcNN>MR*)?hp
z-B&AOv&dB`ky+$ZR$!an{N7E9P@dj*nytRdU{4mBiHBNrPpdCUt3-Q*jgTvOg;jr;
zolemqs`|4R2vYl=H}rdQM2)(gifYu?FvB(AMG1zBMY2mxLlQ3;%;hWo?r?83Hhrxs
zl2w<u`UTrgALXK%DqGztM@8cIIs<&c<~#zBm4(NmJ}Hs*>-Ih(yjDXG%}-vsBMgN>
z@GiH$z#i-g|78zwkR&g-j3{=usViGz_Q2jJPVw+_DHp}neV{-}g+)|q|Myjk+QlbT
z9qO<8fqzxCJ-QocalxihQNVJVHd?oPpEzgJ?WVs{aM?OapXr@PVq^oVOn~QNPCD-~
zibVG}-N&-4VR@63=SfN~tL^kU#Y%UMp*tr@WS=Ze+(pZgj<z>TCrJDV`mKi&%^cn7
ziEklSV;BC2%$7-c5a=_z9eK@{cT*7Z6!`GY^4l)k3A1m{!gC5EG07PTYl4h~eIT|`
zhAt>wgyN@sOMk}Jujtsg8>}hq*mx7)rJdzLk&d#fUYZTo=?(j8q{V}G<JXZMw7gCd
zXa#@Vu-pwAcr|A8Zm+&uU3C=5(t=nv=y<GS7vBzej_6?oZ4<8_DpSA6`Jv-U#-1Xb
z!i_KCQ0#rW`{xC7nP+IWAGjz@A;Z@)2)g^6{uZ}qbg7_V2(DfXks&D^-7DQW&tr3=
z7IHcNTZ9%Jr=~@OFLg$)T5X^rU5_{9S2uN%Mq)zV;BGDdU_t`3Y*Kn;ew9z65@ef0
zq%f=ea_8$9w4JZX&eva^uW8QLLFcQ)`Fg?mn(2H!=X_N-U%zs`ZksMcDV01d0gT3e
z&b1sRvGqa3dgsyvXRnC#&UWP4HEM+<PWO3@GfLl+j48Q_wf=7MUR0wd2`vw3iCj3h
z(bmEvpLspDtZP(ZVo)LHQ%JSSlXBHNjG{~*EjgMGHBL*8N}YG-qM06&@J-NkSLD)<
zPw-LcK}(YrNW&7&RR<4cmn^gPKIW1V*0Fzj4CN|<JzAz5y7m{#$U08P1$RC^HL89~
zDOQh2ZkK@B))bis!B+4e;cf5<d2Y#LGV<}5{*VdI$0Pbf=CJ*`IbBkaS1R2iQ#U-u
zoGuAn;T&_iBywq|Ba=1@71<&&n`H)fW=h7Pi4s>#qo>a6P@pZT+3suu9lC<NS@wkp
z)?Ml&@Q>~wySj~YS|@>qRL#-fQmd{>P1D~3))q~3F6WyCSXZV*=?|p3BY17HMEX|>
z+(-g?c8d&>5S)tiyt+4^R%*^8Jo(IdRpn%%r1NB6eM!dVjCoar<SAR_5iTa~9ZG0o
z1D)+77SL7GCgxV17sK7tg;`!>U{%gBfP_V*Mac-xdfMu}I5JQosk&GgRrXn50=r~6
zIj03RyCKbGJ<W9|JIYRp-<6_0&2>E;WhY%TD2ctuid?u8(Gb?oLMcZ)sa?(%U2jAp
z{;6fh<V?2PF=dy;6H!?&o}<KoxmbPbHnIAYmT{yUBFfS3AhS=Tc1)aTp_LGJI3sPT
z#Az*TpC|(w-);?xoqllC#kJBc;x!Pe=-4#bB0d7Ko{@5mSi@m-@q`M(@ane~gjtV}
ze##ua%?^Li)c~<WBcRtF?WH99YMCI~3E~@OM{a3AXIyu1iLG-CL@r&NHc8+in|ZPJ
zTiCu?9<r*{6dixQkau(1KQ0FWG9u^4J^#3jx7gI+BL)mnq1l<I{(EDp?|tQF-=uY~
zFur0)d6G`a!B_Hq%dWB}_^6?JhvcrYu7j$KGVwJK&Z)5v)F>6Fi!Om)b$A>5D*BLd
z9o8wA>Py%|C1r%eoC5>#e_fKYx=hF0lYcA4+M~ZmzcAColRPwWw4Vx{8>=6+frD~9
z(Jkb8_(<4D7CjuX(WTN>JT?9~mmWM{4IjmlCn%-%NFELtyz$ApA;st88nH9^<xrkh
z+<{PF+t5&34-PQh$pxWds+P=hNv8Px$mP0|YScHQP6tKC)~G(PyH;)J&n4ynhR3c;
zLP!5BQE6g4lw!oX-4^hponrkUQHlwo#no}A$q4)9MDRk1l=U<;Qf+VL9oco-(NNm^
zque2M{7x#j?49vWk|};J9gL(*%pq6fRSv%TZ8lUX*-+|y<gOP5g|&8Fp6EgAPRmx?
zNSJ(MOFo@Hpt>jErIbIvN4(ynrHYv}P|P__A>l(-j$|LK1R5-1+V|t==ygIT1<{?U
z!G_wrxWNk@H7}Ow;M#HvzZ?YTNNYMX7x7D<xk^&ps+A+DHcJ6_?a6iT#!Cp+aVmW{
zI49l8p=N6?HoTMlii+k@zwFs(h_1A+26HR-U>Kyg?eB*5@|}A;A~D*OF%tmMf3`-<
z#`gvqH%9aT5moW=S6ZXEplDV1ib>gp+_dyzSTz!EJLS32JazqQcj)?Ct(!c7o4k=5
zgmgEUr}9^gvtBrmjL#Y3IdR~E+qTW@8;YCRx!w!LCCA5a?COtsXxlC_5GkfBFR1m%
zz1S+Rwb;X6(Tx?DTRmJ%wfMc+i(Ud?aRqg7t#v)-pEGdyZA9fjp@6%nbv<pTJ)!F{
zO>)zcz#mqNts$&d>Re<GyiUmLfw#g-WZ(ByPvEQGNMMJC`E>rOvDS+R-aGO71!3Tw
z<Mu=@5TLG1o*TcZONT$<Kr2xi-md~CrFgB`9`Tv1OSEQt@$5$@V@V&MmU6+w8+glT
zYM>G^-|yRR)sos9TjGh4e;&VHegpHok=tA7uI9N$Ut2RT(uo&0)Ek^?Suf~rJ%GI=
z@6d7jUH9(HZ8L}FB|oJT`RUd{scJoZKO+r0@NT?G!#xxeIK7;J%`D_DYPan*q8}2!
zS&&W^UD;JzIk$mO))b+(L01V<7~Er3_?{I)T(y8xXC1Gzq{<#z>D8ZBiQkDdA8nQ)
zb;>2QucFjRP~mU52bwh0yxr5ML(mMdBX@}Xm=!+zbsc1{KzSrhyJa~@p}D{anp>j<
z-wSrf=ZrkMAYPG+fbqA0&D3Nevh|DzWJ=oA9`j4yTs=GVJR-#w36D*e_Gt&gn`K6^
z*66hd!`R)C$+#K2s}(OndNt`cmh&iJ;7Ui-n%A1nJalsD*?ZUVT(?di+%<#g&8|m?
zh^?o0tlW=@oz9Ra=*oxw%EW|S&82VAx1`8(?A8AMYNWNvADHvJws-~f*qH*DRqi*v
zm@!ZD6AKoA0XWU(z~QU@nxaEVx4X5JOZg|Q_B&hkEN&{4Sq%P{_1qdO@y1H9zV5v-
zaxCPrPU}^<?H$8?k54bHDPV-ca+Z}qfb5EYSNj5A*o&F1QtO3+m)jD)_$>bnv!cf~
zn~%!k7=NIbN6gPt4m?YGyXCXe)7hYSk&jHFRI?*5;zE_9piJ3s#pnAFyT)dC<2Ul+
zjm_|w%YHahuUF6gQ1GRtytHL^Ut3cvL)AR5G~yn*)}v93Df#Y+S1zdZYL7>0snJoN
z?g+m=cH`v5XT4Fd0E#xY?Onrq;Vg=F%$nbebK%*6_v7n|d##DFxgs(#zAi^)$J-%u
zWxTlG#1hZ_0p1`zZ6`g@z#jAD^{cZ&*VpoDE%gMJdLyL{eLI=I>Rg$PJ@Gjin!r6E
z1nv?c7vqu>%{B<!K;%OYoJHg2dnqjjv77I)Hh5$AAcOK3?8TiB?m1k>*MCBH$ZhSp
zzBb!4KR)NmUene@cBxf&EI$5pjJy7eb^bbktkxU5$s-iyCNIB%T5qJLWllC!WRy^m
zY>#Q@uNvP_KT4>`%Y*2{xcJNmW?C;Nv2aJ6KR*8~;?bmmCOAFM#l8SN6Q6liZ_FE;
zlhF%(TZqzXM(l>(*vzYX64U59WK>gm81c_aKi1*v#2=rR5xc23ep?Zi0{m@#o_VYu
z1ekrgNlT7%i^RE$Ck}y#PDju=f%*LlN}nt!ds#NZS?T^BF|eS_(+i4@`B-POpwQoI
zG_hUdrBtD}5x+ZvK?n^`e}(vn@x5=|BV8$4fQ-*g{CZO>8{L|fCeB$N6M*PeO`P{W
z&ww=?_`4A2V%@EKrCW)k@m+%=@A1S_-8yejx0d;1?%2${Ud>;^fNMf11X*%AG<6Uu
z))RMu!w>(zPmL?MJrCK*SbzQhoe~EQ$W|johEu$Z!-Z)&+;~(l19l%vS(@BL;Vm52
zzuMYY6I=KaJfrdTy9l*z@QVoYi}DJ&V3svItjS^PMsNIanN2Y<;@usqJIdN0i|h`S
zu=l9zs*P{o%|=<@>{d+i4}WfK+D5I|t2Ua(OK}T(8g~l$GN17wgS6wn@$)dEe&Wn)
zdC8VUBdn96Z+y<|#*;1&*nIzAC<8lCxYfWLrKiH|xqdx7&!Tu!RI0Nvpzk*}$xYwm
zZ3c$UcxgN-gwVMEzj@~Xt$1y(5#7SO)gAa?<qwVMcO}hEp_8TNX|J*AZi-=bM%Y=L
zjn_qDi;j!TDZbQ;g|=8dch>jG#p~Y)PQb=&+A1}NH$Y|Z{qePBQe2y>0Ue4q!>pEy
zxXk6EZDyM<{tba8@Pg5FB@uz$+|C|n{<+WnqD7f6MBbB_v696rWDlArjjIjpHKLgk
zI``G$3V4N&sF^;9mA#4{C!j<lfGh+nd;ybT8?g;g;k^gc(6WO=%P=$r?#l=NAGOL}
zEne%vD*hSJ8&OV3T*dfY{3%a1StZtKV^fy&L}a(M@Ffn2$_@s~8;s~TBwv{d;KhYa
znX9p^N1EDLc376Y{daWPC@^&3+~`<7xL|C04-ps~PGCr6DP~6kH+Uj7=FVIchuL`q
z^tuYR8JoUCvXnQvP+#)uP;c_8(5d8SLOsb(hfXFh37t+}7&?(WKlG2}xuIjpF`*BW
z=Y)<YM}*!_4hwyd%nEfUhlKvV2-hDX@L_L|-akMDzXO!ct^{BApJ7RxE_V`FpR4NF
zDh%E_BzEW>Nb<!k!sd$zp-$B7IJLil+gXtt8g0qAW_XR-_Mx*GI#-Q5tBjwd%E*sR
zclHXh#U__7E=RqKh}+qyNMi>yNH%K*V=iZix$aE8<8B*kzTM3R05qrq5Av&P>W7<q
z?E~+bb9?M$4$GSP0z0S!@5(kHNA@Syo9sKPJXYYMg*_MbVXkJF*`A9e0|$I6a4@pL
znji)LlQeIV=FQ0Bq|dw;8QDP2ZgO6k$~p9mxHngJlVh|h!D_vQ^#(D_C}-kBL4zvw
z7NND)O@0nJOa10lJN%c}1Px@VpM%_my`nRhYi-gCo3-wNnHS9!m|w=lF%!*l*1L+C
zR&ly5BS3fS8%=a1rstCH2siU_&SK63GmGqt_97{93Z~Fd{!;j|J+q>F;LGM7vu-)*
zv4$0}uX;bVzCqDsiY>uQW0PqAS~q$EH+mztu~zF9y8aUDWnmzC<Ljof+Ck+mx~+L;
zjK4l3QiMY@HWn8QPhQUI>?GTyS#Brw1>^cK#&;Bh2X*ijM=!X^liG;j-tb1R^>3co
zJsv8w{!JJUM=cK^Q!C$%-WUlMNP^e`Zwjs@&dN8uuZ@Y`%qm!aQA7Q3S7f+e+L-cx
z9~!U*7Qx=3>zZfEri3Ip0}J5Ldu2}-f6f7QUYFi<9e8i(HIOhY7!8jNi_IA+Oa;7F
zq}#n;_y&Tmf^9fvjfmfq5xXwBCvt9Jg7EQlH$+fxMk3j%wT6(GH-3W$ovc0Bstq;_
znc-SyPht36-2d^%?w;h2^H<P?PMbc8zLHDrzpaejp~RU)8BX}*5(`S1IH>Mkwng%_
zvte5n%aPaGrId?3p9N_%xE9Wq(XD}@aPKYh6{;D~Lu<Z|>)84`aV6h_FDz*)A@V?d
z?*aAtDdG^I#>(m_v$?c!3_Nhf@AW%{&hxlmF7i!PM>*HU%_VN6obSW(UFOAc{c<BZ
zMpI{he4&a}^;(O4VuOF~QS)?Pcq#UG<DSLVoQ=8hnH&B1x<Hu&CzN}@|2NdO+g&ay
z&4{+HE7>6Thw)z5(-+y>P;a}!ldP;WLAWyoLbV3rT2-q-IOg<5JAg~?B=^AlG!}nh
z)t9=MPSZ=6^saDzP@d|)+4z{dIEoD$h$uoCH`}8nTr3>T^{K@Gg9cUcB479%?INMZ
zI$-TqOPpYkAy(l#8>H7)IlYnwsYAYLV}+O2y}#7udPWAaxXQ=X4_;EmzNm&$Xkxsq
zFG8^wEYNm>5eAB}*51JQk3>Qj9*P7FhI{PF_xLf)HFR>wtuB8V6o4WdO_QB~^CW<s
z6VmT}D8&+S9ubYFd+80wr&Vx8+YPQ~b0Nf4&o_g!HR@`lUvNnDL`p}i=_yV9gC4T(
z*i4%0kgFr}CqwBy1YH;`qJm3;izp{}8WLBnj&bVgl+dqEQ{t3St)Ar|wgecbt)5z~
ze#M9RUclWEazFjhaO}6-LLmja*)XqOD@Dk`SihpwM^8G75Q<X4O46a{+3@XjMJZ6<
zbkZ<S5KGRXqe!&)>_ksEiGu$83|H_nN~%#U=y(A!OY1Rv^zAgsIvDr^9@$RY;fdT6
z!Rujs@<&o0hv+BipV~_M>MDD59-Cx6k@ZlCUX?fC`>h_JVW`kBI$E;j(V!rdcB_`(
zIU^Jv%}2d_(0LP6qZ1hulz~xh5W|s!o|I#<0m<VQ>7?{QFqUgWNzi191gcx*mN0q(
z-Rd>&ZG}8Ksj7Kb`V2eC&S7plX=*Wiq;p(Gj#Sa9kTDV>GeFKo_sN@BArsMgx=w4#
zz9FoX7uQtEanJ30Q{5jKX<<yyvv#@JGd+C%ax#vC(-HA;<TWf!XG$gvpqw};3;V!#
zvfDv%Y;)6hFC&&NFU}4RWgROqi(Qcu)g|Ja{_7lE%3%ivAJDYO3k_8@KS%O8qEa<c
ze++Nl9z1;3TG`Z=ydaCQU$V4+13n%)1k*!aF2v`nrk!UpHhu>cM6S?4&sSM_HL&Uo
z{T-p{Rq8+YQFD)I#)KDQ`FjBxip6V&aBu*X+AM7fWWLI8WSE*v$8OOf9g(%0cN16~
z@r8@fU;L~ZMk!mm2~rm_8xeyblLl})X`VWUoZI1gL`_$WXB0<zjOY)TM!<U>Lwu8*
zw{DRVDeSFSVX+>82(~;_p^kED4L=_%)F44#N%&s{r}x`cvHGLh@U|dx?Yf0ly(+#Y
zJTE@&M<`2u2;r}#GVUy6l#UY@Z>%u!HTppGxcF41@oC>Hz9!P$$Wf7f{i;yNQ-yIR
zX~uV{m&rmk3zPFSyuXJs1pZJz<iw$P=@2$Wn?6IH>5|VdFXB;&;-ZsxaXPQjG>iyY
z)5m`=Hk^qQTjhyesr!(wGn&341PsmNW7>#838tY`l(SJ84$ck&eMZw<QV=gm#3`O6
zL7&5!$aHRsB6R*nQw=!m`1o0(V(Km}HK)6{gPb8OZ%;}Z-!9kgRv_F0iN-o7+h)(&
zh&MJxk|zD;++Mp_zZ+3>jkQ&Ukj-h3*nFz4#+7+2a@2l<H7w9!G&Pb!&b1D(F9TjZ
zBr7o066vlCF-wo|igItbPWpeUFxnxzO2TyZaJgjtUMlNRx_L@Et4;)j9s!44jU7IJ
zpb2G1nUu;NJszTzP9w_2Ls<%mP#Ll$)*r#?GZ`bp)!OF;_dX4%HR>;{O@a+!42U07
zZ|IfETZ`%~Uit2T21#gJe<-|cC4qYKf;h`9Z%N5=*q-ABW#0Wg6$8XV&^CF2LoB}B
zPb_k9Q0B>=Ha$F{X%L}!QwW1(7)&Tq-~T&8aR-aonS|mq|LG74-~UV~#Ow&$ewqF4
zSk73?Zbj=gr4CQt`7ez|%+lnSxt~)b1m(kURcLy(n%j?-N3mK_!quH=cwkzZk)jiN
z>Sn$~!=MvW=t^fYw?}Rl#idEb6J$<tH)lJG0XT7^>e@b-CJ37-f`RDwWI}jU0Md}6
z2kqfM#PXc{njYlqC`}LA!|ky=Yl_qzi*y6&6Zpx(Q@Hv(ON$(y)vmjlGqri~$varl
z-ubGGKHjpR1&H2-7UVg!0KG6iyJy8GZ{tX<yAkjmT7W=U3Rf0&3N2{Yv_Rne69^SJ
z4K4U%eAW<l;G3={Pl^^4@TzHn&O1My*JwJ22zD-U-?rFD5otjV#_4{NK3a>+EtG+M
zInrxFu#T?Kboq4nHcZC_Q{gr0Ug~xjkJM$6J->2hKiqm}L5I8SXmei4i8s&Nb7KER
zyB9FyQ**^I=N_}w7oQuL5U;Lqx<n>Kuj=57Ua6%|%Z?>Pt5-rF?+;}{R7uAQ!v^f&
zQFRTPqS@L98}7$)C|TR)aa85L|7!=TjwB|`Fs&Z(G>=QZW$katY94Y!IgZub^CKT}
z!0B%ur(SuMtQXdz+53L7P0IoLrx!l%9h2UT9SYPBOnDSWV6~gQuwL)e&}^3ASdRRr
zv%*cv`d!Yr(~nsAytFt|XP%fUF}_ik=mfgKdaD}+gvbldRV-byoKJHK;#>{+?u#-a
z()IuAvf9roD^=2EKhiJ>P?r~%`NIE8$l5+unm<+GxvU6j&?wRWzb$dQQ{v#w5%1XW
z@SJF)x7mZVWSDIkkg$19K;-Wb0(M7_P8#&EGM=&f`qsPmnca5LPB@#Nx-v2v!^)b`
zOU|pBj)W&6R$@mpN~BA6cu4Yh@fo(%Qqa~OpV8O<_EG;^Z|Y5tf+#ciRvRE)Loo^x
zB{KqLzLm#P<IHKQqu0@`e!;o}25Y(IWvU(np@XU0P_F93Z4bT=&pA?<L)c@*OT3Y5
z>B>rV!RMF~waFRAllza)ylR3cd~QjL|JnoL>x`%N7*D>^_O^HU3&nGNk>M4|3C2_V
zix>LBIhdV&64zaOmIq#pbn=w=5mL=q_DrJ6k<?%C8$FJ~N56Nqe$={($p&JjnnW9_
zYuFOj1~R8!RO(u_z}nq*G863l>%{o9cnLw4(e~FYa~kt@N{X$Py=>%s6Tj4caq1Wu
zRfV9;TZP2TT@^ZRkG@U#{p{FyEZ{6oj#0O76EXmk?@~ct&3u>eW@(X>Gra>ZR@bas
z9LUiyREfMb(|SKXEvf;?1{h#)cd!A@z!fzzp29STKcV2ouzz;gJNutNVfwO=_9aKF
zx7aYHp!gH7u{;e#`obICAe-Sl)gk+;e3$xpe{#~*wQC&!Y_mC?bS^f(x+Y3L`E(bx
zb!EBR1UP)iM5XXTbr+A6#80>U#LqNFP*`$^<&xclFX%sr{>Dw5rXl*XI;F`cQZ1dV
z8=kVFj9v#gb2VxcFa80H5p4{<&(-P}@p2H!wM@7oSQIz1bh{k$lUk&q3h8oj=rBPS
zZoV_I?VT*kql=EuoQnH7tyLj<8N&gh9l<Ns!H20;zo(XdMT(C%H9j*#@;d4%*vK!G
zW;CG!ZO%Pn%clBpXt=7ALI6q2{68;C?QrGO;A4`z{-9}>7;!l|vL<hrF&6DYIdZ~!
zg5}X6nJzZHfo{Y6F2Tpk>D$}P^#}}$fv{Z)$JiiUp~J=x^u@8yr}_d<Du<J9dP6G}
zUq&Hj{bB6?#g|}POgCH#4WGw{w8ZQvNq!AW`BtQh3RWDJF3=hN+CegNgk9hO+SZpv
zZ+2z6MHL$(<#yzrSqWK&LnWB_C=zWk(WQp*_*~ql8xqSfHP+-?BN6>eqjs(u+fm|i
zam3qEk~z%0-OF8_5;7%!-}X)>%(#OKFPm>qY<oLBU>!5Po{SpR@sZQ5Fsw)VZR`nx
z$taeg4BbvY|K^ZD4}vX{k$Lwh@@_`u$W@1qm-)P5cSC#ri87z71d{7+c(H-N26=(L
zqa*zQeZd*^7>8xARC}JFEU;E7ifK1{hD0(OUMxv6Tig*cdDUqk61{Z%aN`0|ts;G=
zD-Vd&y}ZVzCU+uOq3CM0iH%QfZNrNhnEvd^jQgC)-61onE6W<$eA^I@H8Ot7kVy>}
zHdsT!vPlj38&Y#1jne2~;xXok(IgkCG3|GUJR-g#Tbv)9rwbOd>4Q2hPRBLm_f@L`
z={g6k&7+g`-MymL#t!jhZuXVeum$BRBo@cnYz;xA(>I3=gK__byhHBdrMSQzZrnGD
zPwa?}HSQDPvss@PFz%BZDrWt7-u|KA{P-hJ@)q|ztgSFr^jfZhHcX>w)28)hR>#Gx
zcWJw+m=EpfH<~&szENB1v;HU+Q;q1OGDGTo=4oy~3BSsvzzN3vUzgA_tbM0S!pvaG
z2y3b^$MBz#F6?D(2hd9?>)m*Xjc+WV0PHx$=h>lUi$kuU7*Vx)#J1Dv0(qnjtj1?%
zW1sM#g)!f5tK&gam1ErtGkb4*g@f~h@Uf$G3>MB)UqyCJD6g_gJxKzrES2SA*RaOD
zJ2Y+7TU86xBdO55GeTP=6iMuOLft*1-ck!$JVipJ)<4dOF_Zd*UN=3eiD<m+Sf%>@
z*^!?~NA_X?;OxkeP9*F&bwKRdLLz<~^;U&hpO15>!+<JBT-@L++XpC+Aq+Q%&m|V;
z!Df9Aim&mqmnu~Wun9=$^B>dDa_{Uw(y!LBo#~f54Bw|^SfN{jYh?o7iAJ%OHO9*x
zf^KeOhNaM1XvUIi_0d0MV#qn4sCjP@dKjA`D`C7@=tZ({5VeS{^>&m@a&?qkJglSS
zl3}s6Q#(o~3;nQiBp;`NLSfogzO=l!elIcsjVk&K(PrvcQ{#&~aZdo1`5ii8-?|}I
zUuRht$y~|BnudKvLqi*@t+`!sXMyXdVetnvM4ui6k<hP(+b1=oK{9Wj3V04oBi*kD
zcCLKI#skE3Y0$cdxnHH<%saYVQG5NDpj(#LJZXnTTQ9tz#r;@D_@>9ak>MP63oQbU
zY0zXnv(H!@B_qPB7I$;GXMp_w<2Hx<8%=v?5!9cmOU<$)xCH82_bpbq4~3DKB3&io
zWjj1v#NJsA^E?g7l~DRdj+Qb*$HkmudxeNH%+`M}W?F*TV{-Ibicsx(HaaQTCdaPR
zI=ey`rIeE7P@#+-UcCcQEloicz6OYr!z5j2mTY=B1$G;ozQ~)c2izWgH*JPr8Ht>5
zkc$f;z+Zd^0<3ktHT0r%dS(1RJsjtn8?d%BEIv!tWzkHfZJi~~3fi;sPwYq+eu0^z
zRZ=~TeIkcnw<E1wB$t@0RdJ3e9zWgcbYFO#8u=x1wC1BAB`Q#c%Fy2>eBTaicIFf8
zR!@}sd|*yw9#+VvMIU2BWM1!jR*ttL`Bm!e4?ydfND)WH%X33RxVsq3S`;hK;~HWz
z$GTojqFonTl7~uM<2>IG(PM30TC!N~)25k2QKJuED!PkQCFO?4RjX?Z$n$caEgZ-4
zJQvL}mwR2c<T*aWR}#)L?;+D9d$wooa8{KeHqPr>u^p^^YQIex2yEDTxrb)8+gZ+f
zARdxNp^byKHIA>;R))j8&ZZ=8r)_vA4b1Ubz7m#=ZtKnPRnp;+%ONBgS;>MHH-=oS
zmsPzU(d+EUD0Me<!kqf)2zr)}U$0GFNmDkwCRQ+=eIyL0%Y$!>lHS1~UJTOC=&=@@
z5lFJ-1L+!%u7yer+^S4l)GBI~tLUP39v1`jv8_+Y@Akv;8{MXV#jijtD((nU-UOoi
z^t*T;h(*OCfqJ!0?xRPhsGt2JP0`Yp`6oX@n|9?kY?mvf`fm0wc#&-e=$Y8f(S!C}
z20=T@d+jrR1bs5aFz3)09s?iw_C%|@t&fYNS#IA}L1I|p7mm-Ev?1~hNjFZ?<)-;f
z;i)~EyC&7n<0X?&2#|?_jnFrZCZM!iM#bXV*+SfLzwjK;G=Jys{5HLU6$fA_HMdIw
zu8)eLcVp9V!diA-o<D8TnvuqioyLxaW=<>2E`vLJ9u9<BjU7#Gj}a8gM&W}C)88f=
zsulPB5*Evz6fL`KhRckL9|pSj0Uoify6d*;E_J*;Y}K8-RXQ`Vnrzf#s{HVcrgDd`
zHkCJgaYaRVG+#!vhG;V`>Ai`Y`rkc?>-*m`5=Fc>>NE`yw8W(Ts3D0w-WyJRI&wME
zdS{%i4ZVRr$KQkzKgmMil<qn4umG5NhY(8-|6Q%aj2$n)8trq?A@LGXv8~dwL>sSC
z>?LOxE3roW$GTYE2Z?{z1<L#20(B{z?NiF^@WO^u!SKw6Q+J2+8cwY-qF*4~X^&8@
z#4VC6aCc-(X)2KU>5NvQm?#H+f8vV%_x!{KytlZgT^*UwaBs%s$k@_!Ryrt^wT}~y
zX+=80RXV{>q?7Fp44B4*#P21+GNb7=dERL>{Z5`=!JU^pBSzD9d9F2@w#svn(ez86
zv8{p)@u*C$O5@3$l`%cY>T3azJ=)q570jy*UueZ;;>EWL=BW@oFV+*CYMapR64T#j
zq^KZ8VlL$iqVy~??pIJ$qv;-DFMFzt`#)gV9W`Q8&0xb_5njZfx1z#`eiQjf!_NH9
zsGuUbTn_d-omNt;hco{0F(S9QC@%K!5nf}_NBA}36@+wZpCX(fxDr3%^MrOhQb_;8
zZ4x+WoML<qL`Q}VL|J-1u!2W25rWtoz#1o^pK|)qGPYgnHk$qmrkZ=v!#Cdoallgv
zftLR5)Z|ARk=Q^QQ_<^h0TXS#r=ZO-&LVC8p+tVXig2Ov)U4i0ZAvm8l_polwO1CL
zYi=ipHW4wgGb+<nDoKuNnbq5@6L#u!66j=fph`@kA`bi0Q;SoB0LGF6d&85R<_Y>5
z&tu0!+7Qltuwdu@o<WW1hQ)UfB=HwsH&^zzw^Dik2BIYP5^VOYFz!E1-A2=&`89j)
zFg87>!@p>JeKH(^*>h+3t7gxa!<U&oUooPO5O-XUQiB6FK)Ax6ON|EIm0W0D(+{)y
zF<WX;Df}$kQYTw}*tgt@3TiIrN+6f{H37{U=$OQRNC#_zQ{q$s&2(8h;DlB+Gn#%1
zs8+UB!!e;Z@fshIkqxK57`ekiC%#?D+G34b>oF=J<e+i8{B9v;{q>f{%f^m65>~6{
z-erPlq7Atf3J$~PcZMLgRWQ{$m>lL5EZK{W%a~xgqFJJ5^~R!`cu7r4ThnCbk*%w6
zkgw9##l&@vDzv;;FcNCrE{1^HmD`0dn7hU|zSBVI;e2P(MDkK4azeLGlFxOLvwPhx
zv;2#Z@gVV_L~A9{W&Mc)S42jp#)L*P`vpg;5^@afG)0Cj7T-o_a+0Z58BI?@7C`T&
zn2fos4NsD>Q!m?>lJ<--heU!ecapM2C-5xjh`vfuh0W2|cy#JT9b9lF%1FbYk->=G
zBqeuxj<@B9F;gR4!SObjCFA*7y-ANuo(ExpW^w<cB<y|=9_*EYMCS!w-!OKa2N%5~
zvG4qf>%?0FjZ0022f&E8te(h_qC=)0YgfH*5IUS|Y6^Tp)1fm_!|EK~9?7~u10BbN
zrN$Rq6P0M|281oc+rwAjM+$&3k&pVpsi#5EwnFn{aqMA@Ao%ZHpXJuQ**s!ia(le&
z!-9_T6kzm2%01IoJyAageq~#G8;T3V)wZ6ymj3O?C@e`{H+wnZStTX-x;$2(>C*n5
z<Yk&*4NPE%U?sC>H%xVfGbQamoU~3w=5`@6^!RNIp`|D5V<q9MkW+(TL!F_zBALfN
zC-qT~9RAq<!`jz?M^zpD?`Aj20vmRb1Oo(!5ETUh4QS#fm<=RECAe!OAwmFKOyg=b
z;9WoqF|Y~E=62OuZEgE%rPOLawJIOl0tulB;1?fOQLzR^JnJF`K?oAr|8M5pyV)cg
z+V^??JP+A>&zU=C&exndbLPy%DMMsVy6ir{8dP4jCp<+}pYYUP>M_P<#epgdcL+&^
z#1iP8uEm}WI^8gfAnI0LfH*S{pphYRkS{;BAnc`lGJ7v7EAdQ`NW`gAjKQ~c7vMoQ
z6{^7SpyqojH=MR?Y)%LVsL@?;)`DGlp#Dj`6uJt<tDDg)#AUtXvpG>o4{xMQi9b+$
zN^GVgw$j&dy0<Zu=40tCjA6$;0Ay4h@hHH`HNkC_POCz+rfU#II<3Snpy>~9qzAFI
z6!@Rzv~rc#d29}ORmRBx3V9qrDv$iey}`q1kr<M!WQedSlMYV5e+zl6c+{2dG`L4Q
z4QufKWBi{m#%Z_~|5xGvACad^^sFVuVduT;Bg$X$W+1+OoEn!M@|kcq1{(?}=bj|p
zK=J#KXkkqOZ?|-|b)JF(lU>C`V37I*Rw9cn5ez{bzhI-3?X@$k@{WJCwM<+Oe@0}`
zL3<SMiZX%I2{dB2@V&SB+jy41S@?c}h41)RNkV7&`-*7!8+vW2lhftz_$>^Wmr;vj
z)yJ?4h^B0`Mj7;x6y<R&oW-3$J9mV=sn7>vJA&ZlP`4Z@D-~B@LkM20>+&GJvfA?D
zgV@;OL_~;1AX;vZ<frn)sp`!%gmT?O{A*{jwpr?tKj<*>|JZ+i^Ks-i_R6OlM|{>M
z(cj%~He)C6Inkwef6d6R(z8AGsx8#7-uKY2IQ%|>OZzEp)HiU}VOoSR$&TD-rp_>|
zE>q7mAB|i86Kuszt=Xx{Ox18Y&+1d)V06q9t?!_$JK_r`uNu!_syPAsaczUoDdDLJ
zVpR!%`3>hSvqDezZrrOu2qLVCr|CMlY+F`+s)(|&tM;%d^TXP+ao)T?kb_|*8y1JS
z&N>0N#%m^)Ap+SrOqp_*`2HlC+;n%zhVSZ{9<ce^zr$swP@->+HQo1mco9DIRhprX
zS%{D|S|5>O0b5D<9UyDW^3dc`v5JNzIB-06jG-~Kr_V#N$)(~otbZ=C_g{cJbFh45
zlcofKuatw-oR_^TRcHundkB?jp~^t5Of#q5F^wA37Vx1EZis;S#q2EH^pg!*ifU9;
z0KOcao?#BGwdIRyk@a-5Pnn!O*Ww-G5;y4+W;7Z-G&~!@t&_>sIQnC<mIajoLX)oU
z60~|3hUyU5z}v2M#EYe(k_&-pq&$3q|4yiDEk@|66cb{ais$|%dm@>{1Y!V&_ffOi
zNQDi#*Fx=-L?wkTr=#S%7El$vq&XLG>yPKYQE}!HMgn+&fT@??AV}HEZqk~RiaW5q
zKzuE9Tlw>Ay%&oE|3lN4rXF`4Htuw12Mbh^*uq(3krnzBC+=9FhCwy+yxms!W2C8b
zEWY;h{=pP8pwQ}T|H`)u8XYU$XRPS@1FL~1ibJ<!nvl{+v5LL?ObVkUn%oQj%G)F_
zymnN*OWj;(r7>5gU6F)etLcFvqkphECv`&SjgE7;Sy?lREM2VP$OImK(9MU6eY?_8
zDh;0pU`I-d!;z#o9HusdXVHC6xUz!cK;v*4<1(i!&_9(x1^v!D2E(`=Sg45MU5ZiL
zSZryqgocp^A_T4E;=GaKvR8M(dX9!T$|Dyptm|X5GRg82aP!?;sM<VnE(cCxCx~m>
z(E(EF1+^I_LV;a6$&&szuM@{+5F@dMY*2>-7LS+?|MDm9yNoRZ^_2vQp;|JF(x#Ga
z6KE6dD@Z)HZG+*2H^JBbu}>u8e)vu1l>^j)9Hf0<%dKKxHX2tB0SrGVu_}U2Oe+mh
z32br02?87mf;CxVBD#BvOQ<VBHrDRL-LrSiu`YB^x0*>UCW{`daCGg?A4tPU3j|i-
zuk^nL2ZwlWtIxn+@;Bk%IEC^yrt)9%V*x2DUEKDoo-1Q}fcYvZkfuSchh5eou)(|%
z?}IM!dz{R~)*>BjJ}0$EPxa6uT^7BH$phNHS|lZ1y#33bM9l9d;)TIb^pFb80*XZ&
zxI$xMYyJ1}f*O%W7XQW^{H2}z-2heDQyuh+E>VQeA=Wk}%x>{YO9Koq>H!WGO6yB`
z`7GNeI5in1LA@t}e}LAtF)`;-Tm98|%9;gx;t_ZNU)z|64_fQV0Vql)UvB=5?80s1
zJ)Cg|Wwh2WmOmc(LpC!=B%37sP*hF)P{~IB#_{+;@ng8Zf9{pUj#k;{UzokaL5CBV
znF@^%l@R<Vv50eXY>yCM#Ri36uT-ji=L&6g&-2@j3jBV}_A2MOjNs3Z*m#Sv_UyIr
ztS~FCHft)55$ma3IHuZ2yIKFnEc^}qu=Z@G7xzm6a*fxlc7_(zo?W7p)t<dexwZD}
zeM)id*_BFB?b&(W;UVYwda7I~+jp)Co8WWz!12hr70R&l^;Fr=*uX4fZPq=?FC-1;
zxzZu)`2f}We1Mvub}KiFt&Y47)o$gc@^3A|i+8wMPvcmf;;%R3m;4cO0#={X*L>*T
zNZtaoo+2dPRCH5`GDx;+IA?|z!-6uPTuvmO#4h+~qkfaG^ZTUA{E-45ZscB28wWT9
z1#cgsvdcl~qEO@^&Ci|$F>-Bn`v%d7qC!=sPYqCy!+bvp-sA9uZm1&=t*rZOk1T@*
z2$xB)AfZ&8_F(VsS#rB$hpp~Q(kMOrAo6{kKd31nJ;Eg*4?0v*8p&2r*$bkrt`b}P
zAbF<rKd}JC__oq?y$S&Xpc#@w%ow~H&$PGWEF3e|({yh&Tr~p+9-KJAJ1Wdx9edPp
zAuT_$hFhsJaIxcKD8y0V<j~#P5ad+MpUOr~hi_1ThuMo^gLx1l?&1|&1mZZZ86|<O
zlpWZZfxn^}>J4V3wz`K=iyj1gggi+A&(f!s@xb>ss`WI(C6iSRjfRGLno-wt+0u1s
zPrA@M7~VZluLWvJrYxY5QT!)jTh2y^J&a|z-)4|4+!&w+*P6j<x?nTh)s6Ybz}$n@
zcaay>3_m9WMezGZ-`07+k1@0eJX?0;oiyC2)B;;Q#hvZl4%0Y|yWecO^MVw;M`!D_
z!rAJ+!5Hm9(aZ=%zRs&~lp+U|*>qKJjN+%=SY7~@?g2NsCu!uDkfsUlYerA95AnHP
z^?ruj|GuriI}@qd$lf*cL=}jI;YwIFa$8GwAeV>mMrvU(m#QYa0Pdyh_F~d%a}&WT
zFyka)VRpYN*CaReS;Qe)%_eA!nei4usilwt>Ny-jL#YMnCb%6R!+;pRP^m@Qn7^an
zfSs6@p$6QGRtclJl~|Od2|jg+D7o~A*HA;8l*w6(V;Q+nXtNZNR7_YX*=Z^+->d|z
zY+~kP7UcQZ#pw5yIr8Ct?@(XofK@mgO|m^Kpp@}-rhBiEc|Wq%zl#*xwx?(cX6~nb
zYGVF@PskF@WZO17=}_kD_4}YZ22iARe#tMq(%I^2@X}D9j<0!=kI!IH6N&+y!1qq$
zXsG@Y00em6yX5q5t4~GJ4QQ9}i+{%70OJ6cp=88fd=m~_RenL6LSb517#xP8e4^S`
zSI-Y7XhQ)@s=FWQ3I8B=gwvi(EDa8gp}YaEdp<yNM5G23$4TXNM=m<SLCl$Z_7A*z
zE>zEW2f`V7E3+5GWkNJ+3QB%aE)T)l=@s4qFI5z_7JQx_s%(6MB!<w!!knwT`E~o1
z>5YSH&sHec6<)vZesg1U$lSQ2ao_cOSB$-K$N47Prf+SV_Np*6N>tlkHtzqlS(pMd
z;}2O<XWir#*X$2njL1-pdm&mMPJG#j%>AFrY=k4O@cs`8L8C#le<LlXa^VV+A3A+O
zxLhs>*ahxZ%r6^z&C40z=!3>HWnnfCJzM=sVlL6McT@x_XQeVPXP$DK95gH2cxj+9
zt&G)2=|HW(xbrP-yhy^d1ZQRdik^FLx(Wpnq;xJb7~i|dKO$GdC<nE2k?$`wjpF1o
zY+N0|k4sgC;7<H$NGO!zLU0e(^l&{%Z^7;K$kHIff#D()%FJfD&Q^C6QzSAHF5<aF
za-}wF;II~hsdg(5Z^bU%7Smk|WAG?4)OzLsDEc7YGzm{O`c+;i6-g*GcC*O~cf&tU
z>fPYmO0pW(f}7AHaD-n!2)|luD|gC=YGr}8V!4F-Zq$f)`yMoa%)ZZyz91%&WedE5
zRF%a(b!!%qY`;5WYCdWT-Rd!T28LM@40E<<xEYWg>bIfmBDf!rxRqtm7$koJ9&__i
zv-p(F3#72Xf8{FaYufuuQ^(M6^&XUhCsUwU<oHmg^%!EW0g>$J;9zuE^ia{*^k1nc
z=>A#SR<}~;LY$=f)lbE<8ld_?HNMYq=6ydW`8g^00l_dlwP$mromL`#2Q$cO<(f#H
zjZoTgd)7wa?(+`T+H>{2&7Ye>6YmZW3|$`iqC|e7+$!m8{@g6ygz^n1DbxpAdq@th
za#CPb;@*B*;T3$SwZgpEt?)dd)>}creFRyBLWp$F&O><^1N>vFqm8{by1iL)^^)vC
z8)DGL%2tB2WokMy2(j00C7B)m1mQo-ROz2CW#IF?`I;pK_R!*-OTi0C<iFG#r*>-m
z{ataU1HEt%{C1ZADXO{z$HkL-c)N4)Xt^L<68WGNAJ{h8G`x;o-dS>@%GQPjN9_%l
zdS|Nj#Mx?B8t?UHshy39;CS@|Fcv~rYJ)_s;*S6s47pQEOF}2%0lyZnr6uA4{E(ty
zD@m?Ks2Vqt%p_jF0l<1OSE{_ULlPU5#TE6^-GJJy$$&IKKM}Cwfz7&y>xpoQ&xtU*
zkRQ({ZFT0G3&p0ah<jzVk7DANZxfAdjT2ijfv}<^tC3<NaW6miRZK`VL^;eb{-YY=
zrYriWAzlNcys#R=jHm-7D)mr9(9w0jYKU~SPY*Q&?+g3^+Q+o<-ZNSmLCq?;zJDV%
zBC8~t{XMk-#jC0Iq^u7<ij%V*Dv6;21jaOM`9G>8a(WT5YgL4Zfgpla5(ZE#re1#m
zl|(C4C@cZ}y^<SJDeTG2NY>M~qh35hEioTIDi6%^@<Q9D1dLw!srQ7RlY@&{%|SyK
zt3DJJZ;+y*5Q>V8q^Q75qY11lDwqNInc?|)%j(}cm9sUKgr>DvinMM8g{Hh%CKIK)
zVyg>pAZRqt-_J=Sj^P+lR}csO|Dvv#qp2$jb#(=m3v*`PfBTtr>goytA$3K^e^6IY
z<zlESNUnprqOhmBf-2puuAnzfLf6$5+*GnFNL@kWT}|~%nUvHOlmK<bhqYU|{rpd{
zXdrbzP+BBNr3K|_N(*{~(qg*r?R5XvG`#r2q_hZ=(jwejX>kiAnBGc@i;yN43KsT1
zw_=IoQsp>O1JpS^lok^KQoEIF;&oC<1AXE9aRw0nk@p%YUaP6Bdr2j7^jg8<P1Z)P
zsB{Z|?YB^W_`*<pJOsHDx7<ka5r*O;9*PfN7zRCTmGQ8OTwnMHHTk|UsXf9_d#q&P
znrV=+9uU(6o8;gJP#AcYERqZvIu94?JZPL6gT=jd9>i7tv(Dp0MCIV)nee~Rc~Ait
z(0NdHfHip{g*F*-Ykeo_gra3;(uc?%VrK9Mx@Sb2eYM^I1kpMVnwI}7od*@GGIx~)
zH1akwrp_aZ*s5;L#1^!-CcpGm{YcH$f7E$IVIJI#d0}tW59vdqn&G!}MEZZyc~H67
zcgN6qL{YSgw)C=N-sr7`A$^EGby(-2VeG5(xV9V1I$-G*=KnjL$Gwq){y(<$Z@YCK
zU-#B|kUk`;t*>3AwRO++heR_W2u-)n<2j(xn1ii;HWVOQG!sqdK_m7;I**re9Ifd*
zZ1^}@=Rtf3f+(;vYb2cqEj31|w3qT8Vj8i$_!RMdQ4G?c^8kl}nFB3c+63;a{>blE
zf4nOYgger$*ce<)>JQ+U4K5e0_Mkl-sXeBG@!9H6;LWy;w|FsC9&fA6ok{W03eZRs
z{gtrrstN{pMU=v*ZXI$O_yC5d{a85vrA1TMg1jr{u@>Y~)GNT809p`g-nM#@i=wq4
z8F+^lgpysN66a9Rg3t?VK}<7d1V^JNwT<;4KPGx$u~hd207wtAT2FYMSd`R*B<OmO
za<Eig55mkCG1b7C<tiXov*0Xd)jj(R;c*vwErn8R)vW^=Jdub(sHi9%$TCd_;vpSK
z5p*Ckr4A&ww+>|df7XG>K7b}<lzh67KIBo-hrCaf;nh$RpB{<QhfLJe6G>Pdu}$aW
zgI-FJjnEQk9D?`JQ*8AL#&8ez{?iByR3fENiQL+)3-N_l;y_d`JGg4i>N;<NJQnfX
z7g`)+KF(vsL>uo9r(n7SO}z_D2ZV-G(grW^JryE)2`d-zxlsdIypkXi+(;@Aj_(wF
zksjsQm`i*Ltpl_nJnd|C8?byw26$1oHiVY;Y`kiF$)1{!bYygELP&?wR};ePcsKL>
zFFIgqlsbfX0w&p?csI*>Ia@us`=Lf&>I+vZ*j;k7xkSP3%<yb=pU~bte4lrcwr{ru
z_98`YB;|RI?RU+l=5~{x_m+M>;t5qsod}(fgjt&=l<UcGjkcfuCnz~IBT`m{EK7MX
z8mq1wX*MH*QZ#On-@l&3$OR1H0`x%>TSqdgTSr32XfcM-5KTwIBEB*vnzo2$gsa0f
zmivBRIEM1z=inca!9b2#H3b3>C?9VONc5vYD%;1T1-F`E4w4yyE<o4g)SJ6%26YwU
zZ);ukt9e>i{g2jFsgbT~<gTI(4LT^4BZ<U5BXo7->vs9I@;y!E@+?7{#Yfoe%ef&x
zLf|c0S9BE&Eky=tZcp(2s9?54kOXJq+Zc`fXF!k&h8r1&vcM(FJ99Aj0$#dxC??XO
zn50N9btq6!-Ug7+y{to_eF*7LI<yl2T~j_4C6Fcs`b?=w;g8^grap+q;oaD7i1W0t
zTpCfYhjD$_wrQ|df@7Dhz6roRH7X-(r(^dB+f8&E(Lq`j=>k&iXiOl@N<Q>UL9#p7
zDlU~PuL5^@d9W7gk%gSy&V)>@Cb)Kb5DS<A6d5ASO@2pVSrHkCl_eMzhLBUd_W-pJ
zZ#U&9@Z%PsNzSU(P&$GQ;-wX^DP<+0dMIskfTXNMOv6u4RSpSm!Y~O%{3lh86_5s{
zNM(xxR^{aQw%U<s^o|e(phz0i>6dKYzK4p!B^&u2v^^HU(j}W-+MZpPMYKI+Xa)1S
z%w{47b}g>;WESB&Z}bj0U0a8`8@+>k=i|I-r}JjQsK*m0ECBTw)lLy^qE>>t>a<dE
zlAd8-Hj}U2c?ZfXz&M_d%S3dmTaYX7*UB5@@-kj|>&z);T;x+=gZT7HDj$|IxWGl%
z`(X>0P9{!wy@)U6{rZuj5<ouOufG|;njI1pEf0f8IOA?xWsx`Rmt7(#*ck#gkBh*S
z(LeD56vJpAc%CCa1%Wi_qJZ2L;9{RT2**WNn|+6k%68lkrTV~LOEsMakw)@7ViB*S
zHOZC=H`;csh>#HDGIi$*nsF63i!`XAhKBLe^FC$t^A=@9c)3M%;qEssqn*JycV-jf
zlF=o%LbHBlY|D`mF#p_gJ)*df+rP|z!iEX=PGLoZP3>o>;KnTeI|YAX(aBydgAkEm
z1A4h|fIfH<xCB3%CjmAl{R@=7nto~<KoM3_^Bxe8UITFVk8k>$+8XC&#C^E;9Be;;
zzTv6M@wfI|90kTTdZ*yJ+nIgvck8`O>|ahcXeeqE9-@oNmqi6<pd7e2NJk`1grg?I
zNsFK;rkE4-=xbnxV5@rytXoYuJu}f<YpZ({FXE|RpzrhU$=sb?gqVqGpuqNcvkMW`
zrY8CW>3GH6N*->uy2XG89H%N43dHL|N;qW+^3|ufwHN_{Bh=^MOSm4ft;>hJ<*%QK
z*T#CPAMueNV7fOBQn}WdO|@qSlH;IyDojl<wfR=UYCEOTHML>xsfOZj=(egSj%=Aj
zH`}%~yF>^gHF3A=)c}<_;dN879i~}eYU`c_V!+ntAsrD-m%uA8giqFj(7l!!VJ0Lr
z(qlx7KLWyi;V75@U}&0q;$aQ#_80>Jf}za~wTt$3IE5TwQ8Xr7-2!|7XL(#(S1Hk`
z)>Bui1~i{^mPf}gR{#ux5M=~tAeox8H&O%n>uGS=ev*QG-&U$W)=eB~cH;yMQAk@0
zP9^m~ycaT+Z!4j~jrO<k60RrwVa6Nu0aK1qG3Ug2FR^XT%-mh+JCCMrhC47OCJqP5
zfR^2?0pg&7(!`9vp^+;c+(@?iDk_JO;)IRqRIczO&2#xVUkvL3>|i>mW|A6M*kyBh
zwzcHkFL*if)xnL}^$<+MZMLcEVE;^8R&X#fGI!Guz);5c+)jg4&O+`8I-%KvI%%V;
z7^90sOk7yzk)#HwA$-qLI~ykO*a*}Y;l)vGzdu`jf^s3L;BVta&f0GW(%Cz;R;wW?
zPY#R*yY{eVD<KJEf3|FgdQf7SaFBX>BGO$LJcL)ylJ0KKXL<?3$W<e^aMyDh6*_@y
z0w)8uwX=acn2sDdF)-zA^<=z~O;svJdUutG4&Sr%eV-~7s!wpP>`U9`i=56%AF4IX
z$JL7SB+ak%r{?APxXy9fPo>|Um$!z;%z3Kc#{a&4<RnDp7U-_u?VLt*MAh#Gs$U**
zxI(K4B+#cKG*64509r`hlOyYbN*Fg1r0FfL%3xUsQ>&5Zi~Nfkm|A5Go(J1owmtK7
zX=&A5D7yoJju7T+AV7F0H1mxwm)h(qtqQ_Rwl;C$8PHZoE=wZaskTgLbp`6C(Z{hS
zuwpfBq+WIW`=QrER=McPk&l!Ga$?Kc%L&bWJP>UVx&dVb=u<b&2XK~(r|=Ygz$huQ
zF@4X{jKf%<>Ch9uZ!4u4y!Sx%rw8RKPdrZI=^36p{!pzikK%85^iK)hpv~Tmcr6cI
zt<4MO_j&O0$|JBgYXn~y&k%R<_i1Pfu@sNKbaML>g5?+$I)Mk#B09UGqpNeHNSJ}Z
zkVgVT*7IOxy1;<@S}ZV(V06%h5gHC!(Mw>k0ssQT*Z1jUOM#(=ZodC_0>fQfdI}7~
zs9B{yu1TGQ1-^EVz@gD2ks`z|@aWHq<&0&^bDI3{GGUeS10pA|tOoHqP_(_!cXs#+
z6U?P;n+66R*bZeiy*8&~@i9A^l@At8Xx8P3D92No=~%2k%&xF_Cy4}<9_@DOvF~wR
zquoxS@bE)HKbno~cHskUg4la+&#xBr^A+wA7Ib9KOZFnF6;^o&F%T6)Q%lh`woQgW
zaR=PWUi}x0d;|;Yz}c%z8G{ta1+(BI&kQ^8{S)9hWTB);dZ=0i2YhVi3@Ipk+Np#Y
z2JaNIe;*^R17XqPM++3!=sK=KXe2oRJ+!bQ_!1;Icz)zyWFM1kywe)hOvnHoB54fm
zNI)3;Z~J$l_VA|aywp&OO$7O_N8mH|mZec5C7M^cg4zis@Kli^glZn(D(N1xBFToo
zVi7CvhDR_q059$VEYsdaS`SG0;k1ZrdqQ&BpL;`^3DVjVlGE1qf~-Q_nA(s3OdSxR
zR!_dQ7d&Ft0P{;dfMweF-jFQhHS~n!wDU-du2)r})?)K}07sJF>J49}!B6N3uO~m<
z8=m475ZUMc)T54i^1Z#_J?RAeRu5pAHZvM>3$;-tO!*N<>|l3)M#v6G1UNewPzjs*
zMT(4Rr$I)*IsnFQxMD#?kEh%V<I{)TGZ(@Kj<DXIG=m~*fTe&jbx}x+icW;b2pOR*
zO;^6f;olufcFr<oV$KR>jCdcyd^EGTb0N<zxLT}+Owd+fHIlSLj#&{|%NiPllmTdN
zyvJqkb`~}!lwIFqtNS;S0`7;l8}hJAK|JnBc!z5ZzN-FPG^4GKlqm3cAgw@rVvtf=
zq|EY(RAsVH41}$gFx%?a<12Q;`91*`TkUNHok%hSaXrH@V6K%fxxq12o~<7D3JD@F
zNUDRjf({0wl8{Yak?@2am9PCg-ABPimx3-|d)FZNCF%<P7<uG{a|OOn*GdR^ed0D{
zflmxp3W}7giN1?{BEeQa7>LO&Ruir>7Y<l$4b9H3IOWY*b7xn0J606wsXcTZC0;&Y
zHQdIt>-NxP`ZpJ?DYg=S2_;hs&g>O)=I&4;rQ!w6ht{j#1AdiV(IF)Sy`Ma$(kk-~
ztb6-mWRIB(nZ6!~;F8RwgVavX^;XMX^~6_M09-24H)_yuz112|<rvJ+av*H0o%0RR
z`4-NPgY#HVVpSUFx5Ge-OM^()%5>s}s$O8$Xk~<W4(1rqBPMeJkC@Qts#-J_*(4yI
z7&Bs*n8h2NWLmr6E+!rRl%$Ioa?cM}?!_Jcd1imAf1brZFU?<MmkyHbRf}o8FM5WS
zH1<)3J4{C(p;fq|3p>*8%Uy4yJtCL8QkD7SI0gG~Z_yv9&ArY*;dj1H`-+PKg?5)X
z{4g-k&ghr=SK+C+pjCD`EnxcnFTQPO#pSTSa&lqlrxZT>NT>?e@;q501MW}C)g-!~
z=Qj`LkNBS6jqKG&g~z3Im-unAobjCP9ZL7{j*Y~3{Eqv0p^=eGdyivRCyUNWKr#MB
zSc{cmYkt6E#*esAi!A;z{zYlNTkH|PZi7HRf_C5g8%PpxG>o=6h?^?qEr?{G-j-oU
zc!OlPu1uYKtIO@KTJrr!+ykj=*y*2{VOiq86i6r%!W4C$1<(^ShpW}_)pj243~tMq
z>ihOQmg%pTPYO(39$4_QT^)qp^8Ltc@V-&SF)C(Qga-rZRho7xURL2H^x~37u<xef
zlZuXPA^(|YoMuSNhAjlAWTHF^{PJh+5|<>0;l#Bnm4dxh+r!n#Vmg*tTAvsO)$qq{
z0pl^W%mo^YdPR6?T6k${c<FeNq5&f4?%dL{67`GBCXAB(<hVb)Z$3Ma{6amUHltnI
zFqS!YH}b>bqi`FGMj};3)u1J~yDLt>5)Y(Spp<(uEVsH5RWn(<BBck4QOyF0?^rt6
zDLmxj3h$rp>^b(YE9bFKBJ3OpK=99d2to*)h9QguA}zF&+)>c(g1b6U4X<^_@=+&o
zGh`Q1k`y0NJ66IeXM00xh~Y{^*)AH5kd1V42zc}>sp5xRb-T90fG(1iyhPVf&=oBs
z{bpW-F5DYT1`WWYQ30AXLR{=myB#-iK@FUub9Ir;f{(la`&f@6fke)1nd$A7seQ<I
zU(qmB$H=;=f5@3RJu>wMPR32Jn_$xu&0O9s(<>6BX-kV5Bvw0S$t7^;J4%e`1^@d9
ze8|HRB4l$%=L!=h7hJY+JEUs0r+)GZw1L(D{(@vkr&Ap*tHz>d^nMva{Z}Hkw^F~5
z8Z{nFEHs!ROdV-hFg<L0s;Q`m`Igpt$<%s!ZTXJ!#a!D|xTGgDzDSE`7onpY^h+Lk
zy&!q;*-_U?*t0~p&1<E4+l1!R1_IQ_W0<Z;5@tY31#)Og<i<4$Dy`yc%j;w@j+WJN
z4Wr>+$vaZ)hqT{j7>g$662!s??uc(Hv{zKs#A2?Me)HPRR8kK%08=!T$q`IJT=1kG
zw3KC6*x4booo3ZVkTqUI4#?L$IorhyCWjQ8!AI~%Wa1tDC+p%^ZC`$sngtb49(LJW
zBXVs3wnKH9EfN6i%NpywQ*>dg0AG^}R705r#QHDDM+ji4^9UY({Lot?#9rD~;H$}^
z6;HH4SwiE`L}O(WrHU7j9Nk2YxrB!-0;9Vhan{jLkr5#NE!#TM>(Omk#gm~EC!nC`
z!o!0h---pv4T??g8H^AsNaX#k?0oU$ZA@bD4BC)2)V8`~czhlL)DilPgQGjXIUD>J
zUVXcaxI`;2?c&<;!Czq+3&rC$tUn>VJQZqf+|}QXY2XsKN+AL&ZE{aY+elV-*5U!q
zzSeqgDHY*ufTZ~{2}cO>`Mff=RD6zS`1vf=y!eXu@QzEF<#Z)85ykP{+{Qd}#@d{<
z-b8qSGo-`iP)({K4hwn;Rl=eS{sUwh*iW?;rjit;4i3*T^G(;mp`q-ZuicL5oda+U
zxyH=hqqV*p+#jx6uy~8dYA~Rtt;8d(?_FXo-pQ#wqA;!Xp&IJHCwv^3VfJ;Jm%(qs
zBGgyy#Cy4;^ZueOWKM>MIJM2x=4e}HbCH|!U;U0a1a<?%5F!()d7N6Or7Bl9pNm6u
zlPASfs{yxxh@f4_BY5N38l|F+Gngb?<(0=Jyb6?h%y8y$d;?L4Tk8PBLdh655Hv2+
z$9q!eAsY2%SnU?l9r9X|pDa+ai|{N!Bcc_R)p;HzgCFX5(MfAU4q`I^*dqQ7NPPvc
zh|Opoj@fXqoC6J%Zdv?JzF`~vK^PJEe6dj=5G4-xirUPM^UF@K-@wu>RRl$UE(BGU
z84hfohr3B|LHO`05Qw-UXoT?iWddl(6*%)!_<-J0d^_#Ipiky&)6N`I^O`JI0XqMy
z%>A#@O@zwqqEy@CJJcN&dMu{y@3GM@$}#P-ZFVM?l-f2gO~~9|hU3=M`qRrtLhXUO
z{*JTD20#KrxX*LT2Il*k#yj3!CN%f&gh&6!^mxu!J%fgov82|c@eD5CF+^Y014wlu
zfK((}6e3BXoe8MQV8}CwE771b@DcPUma8ZYeyJ$O#W@zVrbErkXclA6?De%9wN8qT
zImIETaCiI|ya5_B_vb>`YT~L#xrC(PINedI<QI_rn`l6sc^m^`EDiL$l_+f(kBhw_
z#7v8JDk(<442Eleg2u!*7;9?YD%sJ&S3oFmwG*yC0atk1i}39zX8j1m>H_$HBm73y
zm-oQi#(EsfmT#c1S~S%cx+v)<7zw4>cIXOE+<n?=f^+C5L_Jyd<=wljree!NNAvw=
z<l^{HpT_P|@d<{FJPs+uAW%yetS2md=(VRLI~!3A58nNu74Z&DA2?oLcKq%pt7(U0
z*Zr34Y}o2H)8qoh1JU)^QfP7G&Y`b-=i;$%T5Q2Y$_swM39xDYHy+eEiz)DHvDH6k
zF+6_x&RT5sTPQuL76q%hb@X?i>8#_u)fpgMty$n(0$+7%E@zLT?0nP5AjolG)hB8N
zod2pdOLB3-3H3o+;S%CGp@q4R>hEjleNOIA_4hh@pPu_O{k@*vC*=n8_qFssIv0zj
z#J7&#2j@OU@8FY5X!{*rz67eA1LgjjC2-M!O1i@b;1RyuU$_`t5~8yv0dAqlUF5=m
zJT$mO1F;P#v?A?~@w?#_^x=jr^yeS+rwM=fXxH!o2FJsY8sYO-T(g!K&gw35n~}DS
zJ_%2wzaseoa6Mu~?Qulsh;4)^JdOT}&Xsyz3i9X>8fR%nB~iRf83{V`qFoSqcZMVu
z8bO5}s6}CL&V2;1VUp>Nl%o^HEYO0jf@CP&qs?XRJ=~6U54ZSiWb=3nPowIIB`CVQ
zMI6QO^))SN5g+lxVm`~J3P1Hz;<D`qNT(F$`@9(zKNyz2^DuyW9}k|mMUIbU3|HT|
z6#d%#FnAC|Eqvz^-~f;xY__^z^8?m6-#Ih9Oq?4e!-I+wXfiqA8-Q^8_#OF%?3xAM
z%fr(eFtmjF6g73>0@~lwNvBMPt-@nQ;yc#x@&)Pvahkf4KxP6&MHFT7l@VvFyA-dX
z5eUVMnWyH`Ou9R4HPtM@>h2?LPxd^sayUq?f;|SYfEt>32VynFqdMN{zTBN?C4+aG
z$5>T*pA&~3R_tq`9&$7zv`-RchK7r^^QZ>eNe23{9f-NbS|+q9%b)<l4P!*nDT3Zb
z8CT?eNNan6(`Q<>5b))mQn3hcJmf+Pwehm6JAZbmxPkI%9EGNbr_rbs&v)lfEEQuY
zpVC94wXxXHoe#$-VeDymaF^=?4FU!{wzM0(L)E!Q)E%LG^e|ds3HT_6+c~2$3Ep~@
zD}3jYD3F=022C=gW`tN%ri<XZ4acCHsV7KY6fZ%U(c($3%A>)v7%!~lfCGFQJ?92J
zG#ke>EuOgY3C+q_{I}r$k_pY;nIg0TZ3uzoAmVoLU6eb}h&;2_)5L<Y%L?k}!QW9+
z`&un(Lg;q2#V2e^4mIn9BDiY$ytFrEOK)PzLVw*xqkTR72@T^pxt^PH;5KTp_4G$`
zypC&rXeexOF~`t2;E@N>OxXqP-b4gkOUtKo_#+COT1=*9!r46ZZ|5wq@IN<*#*EoJ
zQoRNI^d0}K#Yp$&skbcg7w>JGwd5z%+DMrs`KrJ8kebA-HHG-736U=jtsbrxA0if8
zw!lAg2wXWI3VkSERic>#aSp;VCcI)vNqBC1d1yFV7JmG}9t;X~-?LahpfaJno`elS
zcv_7rgyh-lpS2{jNyI^Q6j`t~>_R)}OA!f_^bRMS)H7g>nWxKPr!iX8Vte2jwupD-
zIDksJk=s~p3$}r{68{u<^{R)2ZK!$$Q#qWHjv0ei;!g{De!9O%|5PRTX8;d-oD4Du
z=)_&6$sz^t@SjZy2gC2VM9XcOHo$KZPw>a7l>BETmxpdD6C>`&147u<;kUGk$j5gn
z7JLr{#sCPj;gop@*5RQO1&W}BW51X1t+b93&*4#plU{`Jh%6avjy(?2qODmdD!n%q
zz9Cjyjb;9N1ww#-BdnMZR++9ymQ>Z^Z(u9BA*{ZQlgeZmmf;y2Cl?=<VEFD##TMTq
z8HTU(L8<=4)>7MFZ6usxDp)8W{q;EK3xoVcnWqbJ+pg(J>JG^B=ak}-Fda?O6)*h7
zp%w4W<kzSF3>G9yQbtqoqXv8j{Y!u-^&4?j@RDq%OGzvfms^mB=}R~37G}OVU(5$@
z-Q5Cz`R+0lc_mClpz(lQp+!Y{xq$nv8^O^;Ai#RHjkdj;N<8N6Z=mfpid^FKAGs<(
z@T-Q=jbqrV&NKy|AZ2%B!rum-4#u@ioHA?Hn(#aLt|4L72cf^|3)==t(ncjM&<FVy
zXQzva$8<G<6y65V0a-Z3%%kl{XfjEY28svTp1C{sVn_=x)li#Bpj@-Mo!-3`$P6j-
z0Pnl=2&R7*mJl4n9udcZGBPJr!<sCP_j#pnC8DWksCmh`>G3}suB7B%LO+9Z$I?$?
zt|9N2MsK{h>l^UArV1>~RYfak!PtocGMj)8@s7gTxwY8W0PN8Ulr^nd+vIG^n453F
z@kROy3tab2f_Yg+&RFk&%-!{5KBS&y`}QAVJWzuf3kyRB0GbFLdtH<Fn?=y6wfGn@
zVZIiaOVw$|;?Vw?<l347zXYGbm_)!d<E&EgAT~wi2rzHt&%f}PXO)S&e=Y}=KbHb)
zq5Rh+hLTWzskjjzs0U|2Ctt2y4O<_P3ut+_Qkhc<!=QpEXgENR-yON&r!#njVE<z}
zSv%d}eKpJ!iLLQSzm$kG_%1iJ#Vcq5S}kEqhB=4Gk{sCU7Ys#@e1?7`G87IXNoP<n
z=qkx<Dn+cpuW`=YM%r8OX^S#|mYM>K**_Fqr*`^SFU*;;3%Xt&3$v&~B!zOqiS_#x
z3kS>c&$Tx4ox4Jjgc(EaJ2ad~e$XL97h4+>!Ufg_V<8GaadjWU5ju`jy?>}ZmriD7
z1H8WhCUa{(?gC>BqN29CAjqJugrU#?Z$e?{<ebo_oUs=f<P;qQ;;f$tw1<rd>Vi{~
zxI$;`^aaXUqV_VfQ5(Y%$E|#OZY<xyOCohIs=-0wy7mQOQh(8nTzK4qd{k&RE-<1l
z7!k@`rqKctZq6B?%&PxT$;FA43&7*VcsgT4C6gKxP(4|>FiwZ{nud}@yar+_3@0LM
zuC*|Tbv2C76LB#EF6FHBft~M;qb3XI1D(m2ZU`GSDcg6<N~d&X*`u_<zTtL+Bjw<)
z?U=izB@LsFSRoa2=-2f$2mI5hW5MGR(LY(Ki0k9+qG)aiicwM$Sba(i#N4D1Pdlx-
zAmxVpZ$jKh_(HosU+rxEJT73iAp*p;F0trm0P84+zU>O_bJO{<QbMqs<OW7iwBa8p
z%Rj9Nf5EXxaoMfqS}#Bt(T^E)3JXOU9n*kUP71$ELGKi6TRcI~Pz#OI`S(iiKu_Gf
z4U`dzml$w&uYL`HV1HnfpR%dr9we!4mDyvI!3cPmo$5U+f4)|ykrf<PfC+6S`#KSa
zvZMsTS;FrkNDEqJGD25E*oUmxg||y+o#=!P<`kg9?_v=H=j#&Rk0S_dzbd*AuAvje
zt1Y1gh|_@cju!9Qa7q^?A(Wr3ZW-DT2VMj7(A4MX&*=%Rc`lSCMxz)kE+E^AKyC)m
z6a=fs+SOTFCN6=HjULc4D7u-h%BRCwviJ1e*~t^3q-^_~qj`V-JEV0OxhhHZSbWdy
z-B1UR&|(<&f%+5$$Pt$>)7u$N5g;uS0(2MB==T`EL*oFr4kEkYRAxa(W(QP(iQ8@g
z=Fp(}lioy_=eFAib@(~N^qF`4)2M)ji$Im{(y6crHb^e+8OUmX@gk@J{Tlzk4p7h7
z!5O+nzaj{YxD3Tt5!|Og>adeBJ7OYna)yqCeNJY62z_vJ4}CD&tfHk`A3RcI!g?(#
zvR~5;%s186(7)(YbHnJ+9(AtWaeyE9ArudclD)RZfen_t{Oey=MkCN)Xn5q+a*Gll
zE>89yr;p<rQqhqreFHz11y+x%VL?K8UXX-^hSB0xNbP!Hz_q$M=nWi_ndxBa%nlO<
zt2alDyB={)2R12}U4Mtsd+9(#*J>8_>z#4l;Yb{E{T(K+9Z~6gJIn)*c=xMV`&u3y
z*|e|S*JNxtvx6pzlG+&O+hGKn&k^npA00ZggEq&??<!Sf5dOE2+DiEU3H)1q&2gay
zX8FEcS|6ZU=VgKItiE4{C2gb(Vyl#hUC^Ro2HYee>Q5_q%wiF6&LV#LC}srAxi5E#
zb@b?HTRvP(sLjdB^$sBmAD0-3uhE&baOvTO4@g^XH31RBjG<FZ20F6?f$vV@G@%X~
z3Un7A1HgcI$aKBCegIbJA5AQb4k{9<`>fu*ct<awFuRyQBZ;P#l3gZFV`r2H%^-l3
zD-m&TdAw)rywF$xvYF2*9D7Q-G=VEWhs)9QcTAL<<O#>eps51_IA~(^IA~f87Kz;$
zhR_P4$$<$N=g-PsZB_mS^kM^8DRYuGWv)y75QL~52pC%`jy}(g;WxqUX|nh=kZNM_
zqj-c^d<D1+gu!{;v`K@r-#cV^I3%Q!rVx>A+g3~R*@87B53$Ej>FYO5<S}YG0^u!$
zctfvTX!`c>LonQ;&RYb+$WWh5RFpS7iDEk>UEM+G$Kd9%^u1G2SPNj+--mos7e7NJ
zypL@?5^D$n`Kaw8-@_KiIijb<n<iewMj~no=1Owlqd2s}KL$%90&xz&xz36Kh(S1z
z4tOZ2HSH46yE~8>*DxHSx44OjA_l7<rfUiv$>;eo80^X<STHUhfc@oIR5>&b$EY}#
zu?pKyxRZfI>*R{-xgp_1SKp!QdTdfmP`!4;U<~!LS2a<+jIv(8r^=G?0M)C)0((sM
zsXRs;gx(wbG(QIjE){pme!_Vnhi3I>f+fJ&1NT_OyYe0ys<mCf2*DY-^WZ5K9j<oH
z@*o;p%kT9e(hAqAD}i4dB0t0<$=XNYDa6}e<`UPavU06@80Fe*ZIs9|v(UV~Yq|U(
zS<6px8mxQtJT|*~>qSBZow4~V-a#ArE86`P2NCqn?|sEzu_b$9vaN0ycvhg$jD<Db
zW!qdhrOFH)2Q=5OKuDeRH4{L_CT(Cph=hAJX!OKwC)*B0LwiS5(mS?v*aFPgAKQhC
zAK5s-UvN-3@#@=|fe>2R74O*URsj{xOKo-c;{g`Rb$4?@yRGhf{BY1#SB?kTdZ&^G
z`%r_~l9x*Y#Hz0Y1<;T$H-}T+!LmoXtI2@$trqdNA76?m+vWlR{U8E#)m)WTaa<W6
zDEO+;0-lfk(@Gfo?G7R8^`Ta?4fd3lS&p+cC-U;L=7qf<Vh;nsV7WP-ih(K~f5YBG
z{(>fw-QzH(d^^*rxF%#E<Q07N67+Ubf|adlUV|TZS)TUY^5hb+7lsa~GJO)DPYMn)
zb^<JO;cEs4!C?a4&<(tpfsd%G+XD@>GtS)aTfNs<=^vubJ?Jmq8F-`?i4BV$YPkKO
zhT;C=e*_vS!C$<qVR%gm)p$;z_$z<$k;Wm{A5ijbn{Gs<_dE9Zi`yT%Jn)kus#nOQ
z7QYcLXn)OsPl4I#^cTOO79X)~8jxMwUh@eaDd|X7dDy$9iikjnF^~#N&Jr9+dmchS
zDWE~z@0oZ-&5+VSDFC>JQr0!$8&n>%^kxVnhq$Mp)mgU_=~od#mk8qcNnQ5_p10TH
z&xAIYc$bq%;-|M=bUwAI32$O69<i0ic#v*#{p%=MEokzu+r<w%{ft^I_=lfSss+3J
z>j)94Y}R3mLVYQg15G*PyB~(V?})nyz4wT?gMZsaIsYCMZu~+`vC}>y^m<@h6X8fi
zJrcEg!2ITEszn=@ysHIK+PFm5E_$LO_wJ@ADibXNVL756$T@Ky>H+a0OcW6H&Uud`
z-tt{OqNA!Q8C@94?rQ8q|KdhwEqxr>OJkviciw-}LI`)ilvU9p?!FL`DngQHZV?3+
zg34zoOAC7v@0Xx7KtT%}eV7KRhplpEXV?erg4AR64#2zl%;6n&L&=%Lhy)0`o-<1_
zk`eBYo(`K1%tw~ojuu<AkO&ER*nNF-BNp2U&3f!|-?8K<##IVQP(6`7>KL{N-mDV1
z9-38FwG-Mdo}7rt*$yEWQi#Q$OCX_?sI5g?JSAbwg3lz^jAggP_8YTO6-yr0qtm|K
z7`DkM*in$Y+L#AZkM#r(x!+dzXLK9!B#Np??nLU}zyoY1vn$eZuPXr!>n})Gr=?*~
zlhsECE1<A?U=0YE|4Dt0T}Haxzu4*?K|;+8PkZM6d1uZ5|FY`>GjFiu(t-7gq2h69
zjMSYNUTJNHH{QU^gpcvd&tQ}yX+WFdqmMvB6a3<z3L$9gDOeTS>ZSuB*7{RYZ$*~F
zD2uqvrzlySMr~43A^}*p^RBuJ2UTQ*xdQ-Xb%>&sE3zxn;M)W#j^Z@iBhTSM+EYY-
z8GMxTU#}^U<ewn&vjZ~+XygwQ|H2kPJ%zQ~)0RNwL&F>z;SzUZ%hR(4aEAkDxd3$X
zrijUxnkTIf$Ci|UBColmB$S{Vc663v%a$&0OkkT;Dt=4)GJGq3i3d8V3YK%%z@oK-
zOx?M6U~FaS(N!cD)&2$>cz?k$7$ESL@)CUKC`h-}eTW)jvs|1^mm{d(#M1yJ1!4gr
z(kt(%(~fY1qP3AL8<e+~Kyx}sR;M+&zRva)S?DI&sl&wfFgRNmMAnbm61i2{xK(cX
zrcbNzrAYw3f>uGylFATo74d>z!1e=u99<$}kA*Hp<6tKU!xtA|(!<_k;>)Me?+C3*
zYRfbK9(j5kJ{Kzz&{UxjdQ$=!Nl$2sa0*pOMSGnh)$S>A$4O#}1s$lZHM<~{l=O2r
zsWotCJ2qZmUzu-;+GE7K<o4niP+7=){;jWwg^tH#*qg!BXcjrLG%+3$5mwDuw)Ady
z_e5XcfvH!*v;8bY%j;>UOIll=>)1CR)TjA00t`)!n&zZI;KX=F!t<AmKxzJxUY+N!
zzyr_URE&^Bp1-Nx^EaL5FGa~f`*hFWRDJ$pe`=`7SrhJnz21tc(R26Ucj)F`bN6m)
zxgK*@JqS(GT><kAE{~x^)CIYR%cw|{N3$0tfrkyD0ftoc4^<aKtVFzQmZLo6#YO;=
zgNeuRPRp){stLMStj8sFGOpph-Yf@taWoBTI|emkJtAK9ZUE?dZHRst2vH*fc2p^c
zXi#)wg2M6sEm)_@)waN$$0FUo=8G8J|2CF-bUb%IMq<ytABH?c@#xj}>&*t7^^3n$
zpl1Cofq%qiQLUwQJu=>Gn~U;on_V;gu)><#Nd_*^KS5t{=P6ulMbueHuP)EkZm0#J
z{eaZE@^hf*3=~>io@=oGl8N6(;vghiU7pNH;v6l}?($5HBxWPgx6?(y$u7^dNctrj
zaH`95Z6wi(#8S_7cn3U}{_Rm&P`b+lxn3*%GbCy_GhChtk@Pn;;PEcc#7N>6EpejD
zb5$g9gO)hO<(U*oe7GC!RF`LRBz?ICoaXXOi6q{kC1$xiGb4$!wZt5kry!DeT{qf1
zm!~k2K1Ktc>GI5qBo5RPi(H<fNa8o2$wrv%^4u6nY)7Kj2)N*SQzU(t27H^#b8{r|
zWi4@@%QHKY__UU|z~w29B>KD2E_Qk5MADaPz)M`7TOx@Iw8ScxCo7UTOG~`R<;jjD
zUek@X+U0?AMC-~C8nEK>I3kJhTH;EVCnu8FaYQ!4DwiiWlK3GKWh1Ps#UOWi5DHYo
z+$7=G)p7a_k@V-a^af7PLwX6R`NX4I`cF6=YpaH5Wp@#@gu6WXkt~FMr&+L$&gWd7
z8Ig3dNTzhUDdF;rkECCvrGtSWowONpkf(GP@eF5;!Lp@||4${V-*GxPgO>h@mi|1Y
zSDEZ2a%fp?S{4Z;uBrjZQY$*Cj^x7lkI3W(gYwi*mwgPn29-9pbOm}1mUC>z#1mMh
z=(>G?f32dPf9+y5|0WAB|E7u`((kpRl3&xsLjKJVrTjZy%;DdOqL6>5i0S-0Rb0!z
zX<`!pW{J!AH%E-duWx5wczK=}%1JZDApR{9CjOl*&S7Z}FL#NP{Ck@S@$WqGDgQ1I
zAM)>Fae#l9h}ZeIO0@9rJ>u{DTP<GZUq$?he^-hP{JTp08oxxsrdl+Q2vF)K8bx9)
zKhnSvEBKMdinxa#X>5o)_>qQ#DCI{Q0pezUq)r!k{P+w#PUA=FS8*jjQdf#Gc=YX@
zs9&$6dk3p6zK7Bcf485){wA+#3!q?rp98}%vZ*BgO}d~0+*%m%EzU>~%MXFqL2{`$
zfQ1Iv2ix1$!B(F)P>Ab#a!uPic;kJTHJ&o`&DeFCZtt4?SwobIOG+D!Ia5~IbFv?@
zPMp$UbY>0leu<k0IS%hBwK-62Y#iN?s<vj?q5YMoV{!n&({F+!-ioD(q#qZNpu&_j
z-maxg=al6Z$FyWlDHRhbMX#{$SSq6Ha?lfhh46ciW#6CXy*T^+RPRMlFZsQlZ3PxW
z9=smI)H4MwaSiN+=rr07h1z+qg^bHqAWwbyAJkITa*z4svtk!4d|*64(q^l75J|C{
zAU%|a_W7rv09zf-2}mEa9$)|>OMx^<O$7Ha;4rnsI)caLf#3)r_fNrOv2Fg*^it1Y
z1hEkwBdXetQ|*FNynNd9L<bTFP$E`OJFl)1cpTDwJ97pVoKj#IvlT^@``!wN9)|1)
zJ?BM@mfEvZR$WwkHv6HZ+Tavu+7bB98w_1nd)9$~eI0=sW23EMuzH3LHop#iq9#$B
zkggRbf7H_cBD0!A4NQ$zgg82#uoyySK^F!{93Fhs^XfFIO;AiOh-f}y7|0%j7wnT$
z!!J{U2nbNejVadR5p95rZ}RhkPCtJ{1^cMEc?9il`9F@J8dxGb;!{CA4WT3|R4ueS
z;?uO0bDwicvLilSO9{%9R7ZS<mhzrVNpr-H*HZo|Q_>yr6Sb6=Ic0f<W7-r>DHZD}
zrF$sa`3wb0ZrIsjPvBpDD!V4to046Vh6^Z2THX0~9*fsvZ_H!y_hdqJ5K7~Z<v{dO
zhFRQ%WFC8M-T@^dhYAU`Lm^(1YOAAbJ^;B~f^<RiJ)}eo2M7(iAq=|TpJm&;JS#8*
z(pC!2t~zMA9sY>LvKbJzlJ&GVk%o0=1_Z5PdfKa68sw~t^|WV^CRfcFkZDr&<cBrT
zbeD&GUvM!GYH5(O+<IE2mIg6v1gBwLxwRYR6)w;4QrwfLMb)8!Ug`4Orh{ItrA=^o
z=IUufwKNE62;(D{s_>x*l~=huI7F4n0?Aa#NiNT=dfGc$+GLlfL{Dqt&vOQ~DH$c=
zsqb)cLhSfVHtTEr+a+GYFO*Y3H<HyEY5mW;asA9Yu$OH-^Uj@o7Lx!>A)clIY={T=
z2jTCHX8+9yC9dYd8nDwpgP0QrlaYd4#nUYaqq>gxIZiEfm6*DYCLI#Sb?f?4!<z`J
zFcI0Ccv5yA!5HG1$OtgM{rsW->8NRlgD~+3DW;0<aU^N#u_RWH6_I-E;py;^lY@~T
z(T?$%Id)vyRgsY*bxMzOiD$=AkI=bJj>>0>W?ZiNK;4@)LNVvx;-%y1<BfwG2Idz+
zM{L5mAP)cR4XI+^WS|*a4z_b5v{74SBFBAi;O1DVX2<7pxp3MaxY5uUhx51rIJ2|;
z$(#{7frf>a3F$b#YfRv*R-<i$IphB02$iriUAL~yY(f?CaHO@Wu(S-UY&s4YOf7I5
z0jFC9mVM^~IUV8aaJMBqMI39woP-^M7e*F#7>W3^LxWZ)%)x#xWC|=aIx4I++hB>b
z8`_}9o9C;|6)kJ#Sjd6^%5vIN7N+?NQ}s=iwR;0zs-D0ZU<nwrGN<a5{d8?~0%R^K
zO3AHykrPH}3EotXh1|h-28CB(-?&%q%_j%Er%J`n!}y5x1q;P3hiJzrVfjEI3Y@p8
z?*U8IpMl#Ywtb@2>s9FVpjHe0ofQr6w*`~`N=L(!fKse*BGQ?>>=?$QZhMUDZlQ6F
z%@gm)&xv0VU)%hCXb|3<crn#BpM{?u1OR}^&fdm>b-TUqk-<-9Q{%w=+Oy78@wI1f
zud&ny@2Dm33V9)+H_NK1W+6F77;nL7>`>oZ)A~O&px5z%q-SNIpw6WhCexjWOXHy&
zh>x>FEP)MyY!Sq&Ewto?t|2gzOt0RqRWYSZi~$O2+JQdwj=v_&Uz3VUHO(T94gE=7
zOwKL_e~1RuEtP%8qUq8~r$BQ!y73s3NTugePecl*%e9jNbL+%G%s#U28O^pisp_?5
zD%{{Bu@qjto`XdLF0d?8_MuI+ZhP{BsEvM9nNp||r;2+t#sk2lj-nc?o&7h-0gPCy
zuTmP(lm8aIQPQ@_MzPhyuHB#`uydQnQJWfNn*xEdoj<x(h^<;fT4`*f`e?n-t)~ku
zao$_71_N>;j;_$?*NO*WP0#1S-r?bE(bjQjYw^-js&t{%dkKA*rj}Yx?=X6k%Y+~7
zmU?A?Z;#PmY5^=_8E!G4gmJsz)~OC!whNPJt4l@4YGpf#%*+pIvQ7q}q=`l!XD_rX
z1CvOsg#)nAtn7tW#Q{P`>oiUB7(;0Q@=m3!$r`S2{-ITQG`x7dB|=0fQEDT^z?Hp_
zY=8O;A~s3fg%QxtDB{sQ4u%v_qx<<TyhggRZ%_0b-Sag9Z_^1JkX>l^Lck4;_SM+o
zu)|klH7HkVP?L11;V!C1hF%SA8l+N-_niibS_NnloyM6hT*Y$ePmeLL%Je@@G-NU~
z#2A4X0%ot7hFJ@m^mTyZ6NVnyl;<zBi!J)sBb$7csfIiv5h8eDvJww9Vkl7^CO$ex
zXPH&DrwA{c>=0hiB!e;!`UCZ%VtzicyO<^2IANGjXzxb#m_&8>=_piDBr=1;q!Pa+
zZ5M2jJ0yR>-4h<z=++=2(i;LZ@&Ywx|7Z%yprlYJX?vMxSXKKzoMdl3OG}#-p4?Dr
zWS3C(9KMHTrN=}8ZDcqUFG|oBz8Z@`TFjPu@~RHLjqg{>@A2jL)Eme-U+oR_(Kh<X
zB}U_;(2blig)%0TiRCy*zi|5xCsIN~+t3%NfxhgdV&&oT>%Kyj)YpBX+B5Hu+&%7f
z^}M(jM34o$1xA~7dy%~+EZ`@}R=1O%$!C(Sjsy<d<~E2If{zkybvRN7<D+YcDZ6+H
zven@(47L-*0fts0JZPogf}gZXe^Feef2CQiutO31Lp7JU)vL)Cx+!MyURt#UYl|nZ
zL~OpB8xvoT)eZDbBPc03Gz9ro#EPgmm_I8MJ$dLCR~51R@bWZHONFVE9Tg)Tu5hTt
zdB`Cg89cD{5<W}fmH9W#f!PDXu&IT292~g9l)qPcrJ7LbFe=k*n})!Gb;1s1NalX5
z=)c(!xb32_x&s^~&9(`l6*k>y#K-oYNFhIAFKblp>;LOg`L){^3w1U!<7}JUaj`O~
zTocMQ#V!}Nx@u=|A=V<*=!jER+BU)8PuzqKWhib}owog^DKOJOAwlZNA-`?YQdA+|
z7$f^645yI|GV)`6{f^8AA^9eJ4HM4@a&WR%YH=#$F91`WW=FnRd4MU&H^(UJ#}ZjQ
zkj2Nyu9Dda$WDlneWT1yM0Vl@NEyqdSRDBlofJz9WE9B_)gAz317c)<B(o91HGg1?
zY;y95uLmJ}&;>~O1;A9N)sb)2NwLO2wp1cZ0<xqS*|*AU1cl8X93wkZX4{Z$y8tOx
zCdKZ^x9g<XV<0<<TaBm}rb7OZ7};$y`yymt6eIh2nLQNQLoYze8i1+JWJi9oPD*kN
zWb-Am6d+59k)0#6har1djO<Y|8^O}@FTMaNr)l~)QyuxKIw`3!knIH&T4gwp4Udsc
zekPGU0@)*CWIraeM<RRV1xUG@NlA0$r|G1m#Xwddk&ObfQ8BVFli9Eq&mSElJ5grC
zI46J11xRU!80KqE_w7jceU<JDr`vqL#QJJ_+w`6<JjV9p?Z^&iY@N5+iMBi9$UmYy
z2!ya_S$ZT!nLh(GvOWXIXECxBnSB)5M`L8qmD!&o`|}G>JPBZ`Q#kU4-gqJgGK)kO
z1hQa^>>vaVQ2GV3zlf2&M`nkR9l8K18%X$c9&_X$(@8lN1KDbc>`Nf~GDh}7nSC7D
z$75vQAhW+h_E#4mC6!6(aO8LBq;$kU_BCV&RQm*worsZrKxTi9?5|^Fzaq0wBKzb8
zNMWNa=P5`2DV>y4F_6*SNs#glkbM&)yGUlAM)v6#*;mNyGsr%30aD@sraC(v`JFl`
zoiUIdA|YtgQe11vKN};Pq(x*SR%8CRF|uj<g6wn1KG!cP-XE#XE=PWsa<^PDy8vm6
zT3;c1lmp3kK=NJREI3bJdLCKl`(}-^ZF0g6?It+Hgg8SA3SA76%e9xqq!!irsU!bW
z<%hELPy6Ee5Jg~G=hL+AMOYKE^eNpd>se&!(>b=d;9aXaKX>GR&U^z?dnrxr-eSvq
zNW{nzC_mO*&XL*u&E-)tTc69Z>9Ez)m0Z;sa^#2fu|QM1Hz|7o1yYWIlvs25Z!){T
zx%`;S*5`76q}<J<eC5dhN+*S;c5hM&Br=G4`LX8mWiq?Jxtu7o^|{<1Dec%Ss?L*+
z{F6E<G_`w^@*1GfDyKk7thxMancd%9UL~{jx!fNqbD5Mgj{Gw^DKxcvlQLN%>jWvW
z=CWO8_cxbMU>lB#=ySP0QYeV1>OAMjKc|yIQ@b}Qzmv$iKnl(0-r4msTc6Xtvnyq`
zKCk;D<pu`R=QxaV@!n&e2S*`Ab$;T=|3oMDlNi*Hhji5ZQxHqjzc)1pWwy=&dS|~X
zvvoGmAF;GISDi;4`A2!agEcITwbI`$vFR&)@4{xw?EcunRWe&=2mR5Kz_fhf$p1ob
zmRKu&JB~>~rM}YlCZ$<s_s0%?E3<WW&>ty30+{MN?#Mr`lM-vCpDU5+D}8TLu9eyS
zv4e|cw$2XvBc+410?w};`Csd##9Hb101B<5uk^i1`IF4<j~)C(X6x*rKT_^wQcgSa
zPwS+_TIp|)$n=%IH!0~dyFYedl-W8v=#P{SI;mB@b>x4mlM-vCe+5uz6@8`eP0AB8
zyFYfYTxRR+pg&S>0a&H#JYVU^KX0qM0dK)CS>iqH$Un@p>M&?H9AgTn$O1mW43EVC
zPM^6T19(qn>kObj@?Hd(>io=+|C!!Wu_XOQiA)y_dbiZwGP~dTFSGUe-ybQLGAThv
zeo!YRmZTp(&DGYWgWjaH%j|yVzs%O>e}AO>3Sg@9OGo~fIw`RveMKVErGwt2%$3>w
z&VQM$&;R~Nu`wwp9Qh}7QesK^L0k*RFw&)i-lXi2+5OIcnXS+N{z$0<nCkq-k^hZO
zN-Rl#p+u%j2fazTL1y<m|7Es5|NA55>?tDUtRw%dPD(6E{{W!SD!O#go0L~%cE9sq
zX6y66KT__MU^*Y@UC1pmTN4Xxbq37psEtC9!uR3qbM2p;hJqKIhG{Q54a2ZIAAtAQ
z{^~UR@g?lkH#rS!|L8PK#`_q&8}NSS4^G4H{^B$|{x_$=yU}U52k*o2J^=4uyy7$*
ze%@(#_|Hy5&5KUMBD|O4Jr3_*ql|Y@#-8V#h99GhAK<+R@2qAgdn7x>p@Sy*Gq?gl
z^tm_X&y(`!M)~t<GPYsG@C|G!@uc4#Tt@1TDUPd^Rklr2Y@3EpIH{y$en`5;mcW9M
zVf7>)>+fRyMKx5J<;Iu*MG^qY%<{OH0GCSus58q=02tDv2(p@|V&aIFYO`ahS*fvY
zsx|}I92497tWc<q2S9vG0P>;=3<&^8hzalu36KbY#D3{nM!de-;#g{7df@53+!7Pp
zjS?G_n&ksx0*sdcP-~VCj0un^0R{nJP`~tiLVAU2t7EB^>9GRX8WY>Atf#0>0zgts
zfF~sYberXaV*;#@0MKrh+xn&FR;I`9SZXJF%I#=zdrWLsNNiAVmJf*uV37b&aF$;b
z6X0{!F;qjvSw6I1dgw~ATAl1zn#}E!4B+IL*nTOoLC0C15))vh1b~*ad{|6?G6?`Z
zXZgkb(sK>dlj>NS%JifHI5j4=0TSDA0K}evg7q5JBLFZWCWbZ%FcJVG`=#f%08*>d
z981%bW$3Fk0H^f<hTY<7WR61Ss92eckvSTfqhn>xK;{@^j_H#r=eT#QX@_aggl`?+
z+I;J<Cor{{-e%qA2N?g*Z616R+^jYD7T#3X5r_MTvedQ-3#0qUgs=I82z*JN5Pc0g
z|Ao@93vz!JD{~7nA@jJ8#>)IPG9mG}Kkt*N^P=TYWT-Hcatj5`K_m#krr?k&ngm<@
z99DQ#V*}(4#ss)Z0zl?*e-RVFDghw%xI_JtLuO~H>zKoROeg19Ok~?x(@>2~ko(J+
z08dK*$UW}kF#%Rf07yRWulglt9+T7IaChkBbi_n9MIysS$bBLvfK38W`+gl0;5h3L
zsv-TjPxea=d+>0ba=1^?L~}zHsy-DH+cOdyc0=xOVgfuQ0U!XmPsapUC;=b>xzF@V
zPd0#5SEs|>sW(q&Ok_hOGVF-lXJZ0%u)?7lLXi90m;i4}0Ej{EbN!O@M^Z|-x*YB<
zIx(fT?gFeWYAo09_g;%egB;}ku5T8&O7(eUok!Nt9$zVD_=W?k$b+bM<Av0o^MfTx
zG^amxxIfj~<Wr#QJE6W~jY2i{K0N9B0vwV6`o!-G@OKFid-Ch^`{w{sU7tJLpX=lh
zFX)TxUWp9*pMDrXu>|O!0ZfztIs>3{?rs*Mlat8ggdFaWP7d*czT|w&nuTiYf!whf
zz%~icKLdD50_Y4NHaRN+q`JOxxWCfLAzsjz9G66feULjg1DGrU`ey)xC4kNVVv`dj
z?S$*3!+laGhj>9>a++DgP>uQT?q~i>fD6oj382sa*yP;K<eYK1&oH|IFQ_J7(3hU8
zB{pn`+_4#eT>|va0KQ^9LWBXtre_a;RM$C&`<&i9#0&b8^IM4wn<8caeF4@;0G$o=
z1z0QrbY>8n90vo@jr=^Y1nio?etK$2kMn5%#Nqx#C-{??1fO8#LpAiI?%2#?uLS6y
zS-c<tbY>BoVA7DNuA>h3QJowT8v54$dlH#0IP?W@N`U^EMY;sgnMG`J&XLx@^@YRz
zg-%Xv!QlWaA*yx3p)WZvNr3*D#ZM)G&Mab+a}Seq+~Gd1lM`ETm?@Fzf<s?&#z}zw
znMIrg(3wSSay}wOhU;sG`)i$?*n-1GRz^ewhrZ-IE&=*y7WYd4oms>tXAYBd+TlLU
zya0@&I=0|&DPwc@&n(Om0L-E~HnaGYwGnPGi)xY<V$-t?K&tCohx=Q-d14C=KWAjs
zy5P{ad2lZqGq}2cW^tPY(3wSSawY?)QguOt>V^jO6c2wqL7tfKwXN=5@PVl1uztU-
zekgPR!EMYR4m;e3xly5Htv(!cM(#byL_*E#j?F<{kO2L2kcTCJ&Ou_=;w}KGuFo9q
z&-6y6El1xrb4p~o<k1%(T>|vaLBjAvgWBpGBsMu807!KO9qyn`PVBA6OA?tbdGsac
zrxKul4pJ=vbPf`moST`PFCFeLb#h{FJ;q67y5!N9oHz;4KL<H{f?G%DAhF5$2Y^)9
z35WXx4<2xn>ezdapGj=G=+T#+WfDN&d-MfxO8}jP#HME=)ANnP{f*u{v9}&(iA)zg
z`j+-7jKxtIee2N|V21?I#f{kHJOv=tb=KiNtCJIZ>*1Bi`rmroCIR~AAn?`~%|T+5
zGgty?T*OvK#>qWdLfszX20MbU(j+X#RUYWQpots?+f8bMXq!=6{g<o<aU#EzEI<1K
zz<&ocgHC8FOUe4PF95kh001<Vb6^1~U6c2eUi_p+=}8FHEt(K-6;S9z^vS$g5-=w&
z^z?tilP>YhF$SwiA%UAr#i%|A91vWD1Twp=XnCN?X}Ei*)39Qf)9~aQPD9srr{Pcw
zA`i4dr;PU>;(a#W=i&Xq*PVuswmA)3cQ_5ZTcK~><21~{`y{+ykN5d_-@esp_)W9Z
z@TY$|4R7pr8m8dgj`uXY=i>b@|8N@Cpv(Zu{0qv|Zw&o+_l49jUlc;1HhEF#M4%7`
z$aGT(-<RR8D!EgoINr^OEYRvWj~l6-wza>5ifqkUx(Kjrj4$^da{Z?aD=YPVZu1?r
zInFO!<h3kZR1tg<mqE|8L4Aa<Db2w+-zO%-ELe8s$!EhEPbBYk8Xi^KUZY%J(7X(R
z@=T^(;f(t6Z^IdHMj(Uo@%ubpAI-v_CHUWf|Ks+-A8cY{p|N3>v9T}?cpGNLAtIfx
zjj_KG!H%<l2rNSxeXVi6wm72U_YtT^B@F6M6t)>Dw;_@X9D_heC(7->e}Vt)_<s=p
z_u~I9{8wi_e8fNVkt6sO_!am)hTmiO?Z9sbeox`|6n;DL+lk*U{B{M*0aV>!>M(U`
z&7p>=(i8DN3;$>1KZe-CMY~%br5Z;+%i3!xps`1bpgDBdfO2(LU{!XP)(IKiosjh1
z$!EJz?u+~A#Ny2RXz9gx1TMW#&dNTSKz;HGXaNKPKe`jo0{`uJX)H92+t)D5<U7u-
z_Z7F^OHrtaHVvk`ua3w0zT#eJh=P1H3Jx_u4YfWyZt{IaJ!@NAia8eb1#m9`4fo)`
zg8!@VzYhO@g8z@>|8w|{woXG^r{Omhzp405#&0ry?f6BYx`(a!wc^);UkiTC_%-+J
z8`(xpz_$zk590qZ!mamBp$RPz)ffDZ+D7#Q>IN8@)}!w<?>2}HQzjl52HSr)C-&ub
z!siV9q1)<lo5)Z#<$&&-UG1bB3s;gNdm8y(ugXAHnRLaJj8wQ?Pl2aDb4D_yZy+?`
zcU|JIGSR?^U0UKVW#SRsMJU@~K)g<ZtV3e?1`FPBcObdy4a%hSdpO;U^!4-ycOP%b
z9z|fvESK1W%<wdNgFpAJ1PNcBxZF1p_dCY3r<vh_;!d{*;ct&2xV($+E+m{rm`d+}
zHO08kkZuTNuP3^IcZy3qNGMSLrQyA}V~&Tk^+X>shq^?CmT7@k2+j{rqiTu*Egddy
z$jc3GL@)p}I&>F8b0Y-)j{AF#w^oft$cY-noiKTm*PnuW;m~;g@h9=iNHGg0anZ5t
z4uFy2S_VA8=(nEH-y8PA)j&nddiv3?^1;zH!t~kM;nNl95poeVR&>G*Q*=Bs>5@l=
z4-S$gCQb_}0`ge#RxilgWx-p}!Vd-C!)PeoMvw3UxqOsZ-wXIE2^{=2;NWeC+$H_y
z_iz}5%ko8bxFDMiqHUWEmA+2rGDL#yyj{k4-i+u(iM<lx^*V0WtT5uTZ^os;O8Cx<
zuXOBEw%IoCwQX*mup{IQSL04*2U;6Gq0r(MzO4dhe4n$Y)^s>k8Yv7QP=*1E4*ZP!
z5;kAc`RK^Y><U=kPh#Ke9D8{+`N;ej(U)I6b-qVPu>xFmM{jVWgzmykSjT(H2Wt>Q
zjr=9;vu!r@s*H_l7}qOt#*F;@?)tqg>(>&g-$k-oG>}9()Z(~WvuM8NkeK_}!Z%81
zBKQIz4o!tP0Ozc6@WEb!*-8Gdam#ls@-VT-pg(#zi5+#6E1<S%!&CQ}KbImo!B^~i
zxLRCcb$q;HwAhOKRP6Fpx^TS-M-QmF+R7Jv=yow2E#uOvKQ8o+y2rLTq0(=3ItvRc
zaW&d>v-db$pMLB;fNY@<BJFbV%iPp%#3Ga4c-hygnox!*=2COX%Unr`Ck&6?;rH0_
znBw%rxkSfxG_|E`>nXT)@AAN*3Bh2B;=)}QoFFZoLLl``t5VoYF9yLTZT?~Egy2!C
z3zi;mfxY-Sy4xRut9^A^2j(9tjT59101A??6?B#KfM1shd;ta5gHSVA0v|=d0yx31
z1SRA@z&~m)KF0ku^34=dB(BiRQZXCf!4qnwPkO?SD-)TLcoS%KmBQ_*%6&>Vw_v!7
z`_wMPOvPn!n&d6!z|<OiYVd9fGj-x`m_@!ziBN-YTr6MsM21iqiXL@e_;4gfzRBT}
zc(>yOjhBTjmDz)(OL2>IDQ@w84VT^}dFsKk5^>|TM0Pm>t0du5_6**(X#PS9t160r
zMbueCN4f7XlPfXsLy47+J<5>0JlkeVC3%*w>=C8Pcg&8vVay1A{#!7DVmq88zwR9x
zJsT1Eki2@xu<hiAE1FS#D4Qf2Ub3PF{=}-hDfyA(t>q)cMZG?LT7De50ZzfQ=UK@8
z7rDISDU~#zri49oZMfP@Y4|TW2%@pFM}$8{*oZy4^jN$@=kDY?T;u%$e$r^l_MNa!
zIbp|8OLr8OimQl0${-!uY`p|?xyNk1?-M!add*gvKAES>aJvsZPHylM;f423brkuB
zr?mqUsI)YEfPJYbw~;T37l2t#pjKrD^5hh{j-W6Ouf-H9b&0a8<rG>yB-`7ips~8d
zHNV4bK?%5iPlb5bN6#q&7(xJ{4!BWnCwIe-U5?5XTfj)(UOvgwJ}-0snG<kbjXSAe
zruV>sp7aGQIZCIj9frZb(5JQ+V2pCYk3gPhye7DIA<l5bcfNhaUB2AK5c5smn|-Yi
z^5OfBj8+`+E+nqF4xTx7Lwcb=Tf`2p%%JD)D1VE9S*<vNU`<1ije*`F2Qzrn9i@ov
zF>QPzMHyIymQxQRadvj@Gl)N+WR{9q6M%~D)-3~fhf4wq_UOW+tOEPI&kSRi0t)7m
z2+)GhlNe4(kT7bCXuT{FC#0An9ynfKK3?-L36IbBr-`!Tk#TPYt>V+e+~v5^?nH~&
zVa;;_6GUN;IPYS9m#YWSeHL-&emQy|=_EV;eLw6i;L*eMafz_W3bN~cox3BJ1Y&*K
z#24^k*JdD((G<>%1d`TOXvr-2!T*2ky?b0#Rrf!BfB}Z<prVpujS6O>hSxx}Kp4an
zMGz1b5oHh%f#4jG5*-_+7{=-Hls@*9Wq0jjmU+Jc8h9)5lJ^RW>`dd6l%%NWeBW!I
zGXto7zMtRg_51zzo7Zcfb7tQ!Yp=c5+H0>}94H<|s7!iL6mf>5D!ohxaZ6>*O;?k*
zITDd^U8QPojFUp&7zwHbgU?;S;I9fMMzn(&?>=G~E3n;+x2u#T;mizi|EE|N)U#an
zC%{P1cb}2H41k*W8NA^qmOP10HNj*SE~KUwzb^ZGMUokxCb2^LpDJEPL|B8o*HrW*
zRA;|92eI_Hml{Q!V?{{xl37FcFBwAkVg_3y<-Y0=u=$<<7<a)uSBh`m<L}7noqGc8
z30~~vkGq}z1hnDW;X_U^sp{hm3KKVW+&JI+ME~Q)?(`R=9lI*wpwoy$;jU5yb}<dE
zjlM#tmAGTF7mK@quL=GUw->`&Fx|iGOctaqdIEa(-$k#q!QMHjlf}KoD^|9k+wIbq
z{UjlmIxD(2fJnA0Z!wZBe1^ZuK;|E^VKsJ#jXol37LSIxL={T%N=-@;KlwMM^%mbi
zmi62qf|i%?Y2rGPR*d>Zs^Jm0O9zVuRC+&$Rs7qy8Wu|);;Smk*aU0U&n>!Rfn9G~
zCGMW0)?gZeLZv)$Nn3|F58>M!?>#LkH6_o9teGYm({YnFtYi}gL_&WU7*QGKP?C5h
zD9AlVCo8ON&>d0iDy0~N&?OfO=zUxDLI&Q{tdpx*vn*5bpDlJY;O({}#ib0l+i(4a
z{a&DbeS8}#b4C2(&ATv%aD|`>*9zG-5j6q43V=xvW2AH-BXECm8@o?LSKf-_=X6C$
zX3-s)Nti}?QIX!_fsbr9WCcREEkShclpK~I$sD9z*n)Qo3=jKzRSN@Qo|tYx_a?L}
z8z%k}r-b*zJh2}vP}b4g<+ybMzGuT{dJx#pAmwq(@e9X)KYrHhkkE1iwyO}!A2DKr
z{BB%!IbQ4=fq13LVpRm<F7}ubf`H!BgZxKaz?TwV-Z#$QIIBO;nGTyyn$A%<b6^1Z
zdX#r0@1`%qWi~;!iHap&rY@DvHps%Nt=_n52K0I^tTC`#r3DucxBWIZX=dUc1#36Z
z3soAWE#6z)f}zkqX+uu9Z)f>$b|&ch1n)??a=~;C*X=A<a>8JMjFX!+q{_t>uQVMK
z%aJY`359NA3lZ&MgK)pau}x2jS(G8J*jfI)<8J2_SC&BUtlbm}?3;O$t+Wx<m|--=
zX7eU!Xc)JU+K6$_MS2=OV9#duJj$LTdp5A=diFesr?~o!yF_A+67x|Hi6^nseb-_2
z1d~9wXE!3!Z9<0a_@H@!A-32&*@eQ9!kiRwV=Ve=r=N`g*v9t;I_G-;DPMZT)Le7d
zwdRtWi}x17%&;GK_<B^(a^Y2q_YlRySW3v7E*VxZ{Eb+(*CT^;Dg(^`Q0iw@73uh@
z>Si>YMGcGwI)Y?0RI}%2cvh~uif6?MEP<$1H1L)baqR(kt5$Y{XVqbyMXkFzqtr*W
zw^p@Prv}rnZ&aDgl*__uC`DE%BjJ|^<1dOiQsxnLstV9*xOyQiqDJ-N=U8_j^VxMJ
z3Ja9pOdX0^ypEUAAoZx!(^4NxeNTOC;gJxf>P0o(py<Mn45{OT;^KIJ{81TF5bCjo
zqFW~6Q*WkEh2<&7x07WAzE?1R9p<ei$Pwgh3Bb4R)*xXp*&t$rZ(81F+(R{iOvHQ>
z$NS|RZ>%Lx%Wv>88R&CiwWn(DVO+Y~U}XO-M=A1$)Gp3ajc>|#K<9iZkn(+(<xBr;
zmQ^fA`tFz`{kJ^Ja+$~{>u%-nF}hp%e1Ps&smd@9{!)WDd|8qxT139kBU<)^@WaRk
z&k}|psR4eL!H#dWMUC$&m$9RTKDy_eMhZQn?Mcx?a?(3E>OXb_i!hu;_>g+mwjARn
z<$aMNWT`61iow`iRmD+y7sA{Hy#-apZh9|KReVkF8L&o<xBf!{7`zVB%WT+$SAuG5
zZGt$s6qCSEU1cCxOym2R%<J%B-a;TNuEg#@l}of#a7DGMVkK!ib&QdR7?!6|0zpb^
zmg?o-vAU=#NX1p(nxuO98b%)0HSyHrLPI}*Pa2#uE>2~58OPamwd#5Xi?k+5^Fivi
zNc|of3eLQ?1+VR7H^sQN37<y8TX?F>8u-*3C=QGOa27hDe8WIJ6^bra8P>qF!%!LV
zw>?<!Y!5QA8G$>k1lJwZ%>W!Jq95|<0Gd=bZdb()D)>3Ccc%ku7!BlUV$XU5^(?i*
z@*LvmMRff4s1q7nMmrrKS#8wl|4`ulMew1jZ4=sX_XCoc4b<cWGs72ji2+e!bP3=i
z^=!gYA=YkH6WS_S#CjHwJf(zEtt`V(kjdRK4Ul{+E*Zw{Wuv6#5d^FDaYi$>f%k{C
zu;Z;A8ga!1^^~B+(unVO6C4dr5H}43s8|kBl-45E%YUPARmCMd^{raf%5BVlf$F8<
zw8XaN@{9DX1-QwywNPbv6JgicFzJk28mZ(=c_`3uYqIGHM}@^H*U7G@s^TFiF-b|(
zymz*Vp~!5bn^h@&;{IMouUI~$-enjkQtB3<P|n0WZq#r(s^-V2rpsN^gjQ2(o8=__
z2wily76{oAEa5+Aof*#HYMGmny;m?ud><jpB28Ne;#Sn9BVvk}gHf$wNIcDG_zVGg
zbmz98Gy=vg1gNI7R!=Ew%3uyF*=VSwkO^%@!%BR}v(dJNa5AQmjg=vRUV@F~VrD6l
z5^ST2Fbv|O9QxnZVA@0Q4inicenZnZzOOuIKzK?MJPB9RQ~Vn+Cy)4PX}Uc$%NGcN
zfZ-02mQbV<jz|$hgf8-^pqZHc1R_ZmqL_?Q-OL}r#~P#;OJGD4C;^aNVWQEdm0=qa
z)w8AiQPfHvZD}}wATb0B5wnU#P)w^coI+Nim4@%}sy8&?2}s~96A%YOh6E}@Jmp-k
zxL%{?1Eg-bUIQ{nwQoY3RYCLS4G=dI+Q`%84ane5v`6Y~II+CvQiY+qqzlNY6WopS
z?G2OX!7G4}^QKmuAHN{?U%7V&VCbc1`1b}wL7f4^RPVJPR@zvl%`i~PpvA`UiJ^MA
z8wK-2Ol*3-k(dDM{OkWlLux|xH^Yr<8E~|k&M$LwVZB-DJH@)kthp9a7b{l`{UFl}
zTi6_(2iS5qeWwc#<x_2J+M3w2&M7p~`qad1Jq$LvMbe!Z*FqRhI^Jp>$dFb0+?9}(
ze1C>3yFWvUE0v_*vmOJ0E}xAtG_iTQK9V0US+DYt#%hQ)V7(JB{|T{rt#{_TNFhMw
zG=50Rnb@iwvX-WJ$XfE1;J{nxX=4<hnayLIk`ZT7r{Fs2EfmYNhpj#=&}=5q5Hk@j
zC03^Ky`?XO&^0wFFI37zd`QYczlTsTs?G2U<crJZnOM)sOU5=go0)n&A<vD>51I|H
z;7@EqteB0>Z-!xof#J-PSKGEwpp?HkzD2wURU7>tO3kGSTdaY4Gp&y{z#SU`WX9IZ
zEr^z;-$UQrQhQx_s;gR#v4}D{;H}?7=z_zYms{uq_y2)t{gC;knb<O4<x<I(<O*1Q
zGBFCNs=;y=Erl##OEuEKBHtc*yYt<}>>ng4gG33ZSZ<({2N1v##w7EA%(B}bRg$H?
z51Vjg>gOo#G~DoCa5M_83a$Z;`;|5n!67GArTY>6UKOhxTcoOR!zk-+;{(>UxUnU?
za%>W>7;(btGUCK|-R%<ILwB1z4#DG46zLvqKs>`CmEjQHUuBJ{<>SZZ@<YZJ@{f%b
z_~5Zi_`YLj@O{Rd=O5DD&gK1ew+nfd?zX^t>TWOLapmU>VGa@nAdx>3`5}=v5-E|$
zUJBCop|k;%wi~7OrL?FC#lek}Fs2o8P?!W8f2M;Y;{AbMzzPcyBQ*Z&)xt;<?tPDd
z0>JCl)=?41apCL~Z&R}Wb|M4%A7sYH8g85;fx?aR5r-x7(>VEN#bvQ$_OmN)iS_xv
zGiV2&1c<Pk7XH6w(2|G^`kxpy@OFAm33IJct)^*hvZQ9kl?Jr8ooj=z!p^wS4$26d
z*?a&nXJpgEXt+Y(dseb%GkX&LFz%uC&B&&*cm?Z%-h2@r@S$Y`qR0{A78r?S0!s;E
z#i;KPi<mY-0*q-piVr)}_Gg!NrtM}J`tSb<)Ari`j%mw91tWe^Rb;Y?(!?^ZEutrz
z&C;B95`4qiR8&=HP$ftz4HQLhriqJ}D81yyuED=5KO@5$#yu7IXWX-iJqbZot|IJ4
z%wH20Iq>IhRm>+Amld;lZQQaO5mYOuAh@b_uzKu_QdK7=kan9)45M{m1V>x|BN#1V
zJX~R7IEU$`dooy6u^%6LR(YF{nCEF`>u*Ae*v(8mkDZfcp(f_13kwp0!&$3^?m3a5
zuFZzf8<6EBh)M&CYg|h$wE9aGmKNJ^<|oYUkn@g}5MHsh4f)5Jr#VUFlyMccOD<p_
z1i&ll7>X`DNM-mHAH+m3aEV|P6%k?7yQaUS(oBr}2S1zXL~OefHxRKz?y47kRG{5{
zk~8*}Dx|8o;fvjnwS<vXh8tK?<vvgue#alnIfUxXG#(fn9bR_Wl?F<J=4R%<4o}Ml
z#Fu&EiNq6+(u+zy7({+|M*38->?pp{vdr<VuoUClV=ehx7T{B&L39`q%M3>>XUk-K
zgLzdM_8~+9G@-kmO)`avy-bm9mgf=Jp_h{|zdHAF$Nrs6{reIqG}gals6(Q0(8o*g
zr*j|IG%Cz1U1_Yt!&McuJ#AwQe%_!Y%P_zJ!c7&fBN1+bt!5*mF;(W(ID6vY)v4Po
z6?7Vfg?8kuSx_#5jC-iREpzb6T3glL+OGGu);gv`Q**Fh{bN&A6<sih_g0ZgQkkz|
z7eF3m%WwELK2%rX8isZZl6V8-O4qUYXE}l}iG1i-aaP++2-4lUUnH;w{xV4k#Az{7
zv?n1Fh?PAtd8LVLDL{~2BrwnMt+u4#8~0X|NMIR>1Y+$;b&jMX5QT{ZmN`KrfC!8v
zWg-EFBrIJiLKa_!)ltCe_zYIZMOYnku{vrc1Y|Z4-exSnjF?A2OvM;~!b55NqbBn!
z_%JitLL7;+6D9*q)G8QUq&IQ@8n9xWqWK`2WtEqs3$UJAUcg_wFklnrn5tr(3tCRX
zfS)nas)|*3k}#lKp7R`tl%9c8hSY&?Aem6D+PGGS;w1Da^K$ZBHq;^`X@08=TPah<
znax+d_!+A%q2Eq0Y*>Uy^-dTVuJUy@;1)09D;Qx*aspvV``B6YJNS1J5D);g3kc*D
zzyQm++`ZsxnM<C;`)>p%N?cJ-&`EmHT~&d7Kqde<ju>dTR2C5zs*0CUKY6-$>y)Ev
zTV$JcvZIxCkOW9f23jfOxgf`k72J)(EZvczG-+*HXk1e)MzWD8%~~jn+#_M2B`QJ8
z7STQ?VVGrHOG~#k>7T1J*ioG)?yruj;x>dj?ZrtF3gcQTr;~Kz2qZ>w8TZfm5JwTG
z2-h&S%F$v~#h>V|4tR)v0&<OrV|=L0Hc^*4<QjfVu3=oe4i&H@pil|;EgF1w5^4O<
z6O+I)6y8jvahn0|Pk1tsMj-QtNMj-Lfk*>FHv(daH6CYT4KlpxV06Dm98>}WyB$v%
zz>t%LNZ<!Ix~R=M(b4FiAo#ea(Lz7RFsmv;P*}$?&U3MRK*AmwHHV7+xJZa3C##W>
zR4YkxQjLnqk`wwgx=EvLc@h~qq$X5*CN*J`WP>C$S&iyTHCGwPPM^tq1<_1SrfCX&
zjnc^eSt3!1PW4hw6Km|Om8wFC+E{YYk>L#gcLWDXyl0@IiT9@YhAMGZA0dcjGpHwd
z$z7K&EroQcAzKrz`Qa=DQ3@1o*Zb7XEXA^;CMIOE%WJm#le~uJ1>`kEkU_2HeY>=V
zO1Hl07=<*jT8>eW`xa%I;#!Sn9#OFr8x2eFA!AnC79IXD@eS1if*Z=vY@oO{#)jIZ
zH@VoICg}}ZTS<CzS%(_)pt&fa(8rNs6D5@-IHROAB*8fa-vvTnkkR+XWMUjIdrXPd
z*M$uc{A3seDzY)bfK(rgJ93hGo4~c638OGRoGjRJfoPXd7@<{0-Sof!OR*kBtWNNb
zWe)Iu5HYJ*HYC{Dj(-sB>|mv=#}k0VSw6srqmx?z9*$17V|G2FIlx`;s&_)MoFxLN
zyc2XOEF00F4J0Dsvt;0`nBOt?)%WKvJk}{^AS=#t3H9ofv#Vt~ayG4$NF4%lOBOuV
zt5p@WgA0ksR2dd~bVk?vK%Nop=4hY){WVZkoJ9;firmLpUcz5Fy9Z$Z5=UMK=_JU#
zxNv2MytZ*x4eAynXLdhcebkZH();t`W9$fod&9cqAM=>)$Rq6jJcLp0z3Xm#$nqjV
z90PM{HA<Q$Zn`S3HK5FKCd0zaO4y0Y5ho;|isXAooFTbgME(C#ZbvhRv*Qkw%31G`
z+ff8NhOo=+2qu}_jsk6r3+O1fqxmbz?V52bg<Wn(OPNWQ+pWa+KgjJUnvqR=RmG2}
z4`g><Om?TLpxY(ymET#|#YAj$^{pUiE;KVzMxGKCcZt5S_fk9QAfYaPDz4ADe@8-E
z^sGVkPMA5e5L~8$WO~;cH!(XrjAVup$AlJ#%y4k{9>P4x@*m}fi2t`;Zb&Vam?|g1
zN0xo5Ds&hGJ(B}Knn(sc9w1F51mTb-(jSL3k^VrMNCQNJX<AFnLkJ@yLe`S+dL~F@
z1S{K6B|+lmKM1rSNTdj+J?(*JGvz1lK)3{74-h0)Q;cV%9P~_bff}!YC*MhsNH78A
zMVpyE9D>B9_(OukK0nF8O@c)7Btas*&8(6nNE}H;?4i_lK_ZphQIN=L;)7@qB+~c&
zf<zYMoBy)b>X~4H2@+{R6TgRv3H^uk39Tl^9N;hkld*$<H@tz_NAiWY5YA(;=<TjD
zEMk?qh(At3noL+ugPf5GDVI(#t)kW5Y+#&UT-!wc;fZ|jiG09B-ghGJHIY|MoTxH9
zhCGaZ`dX#cm0pTieYIZ%6K)z=@@3!Hn2c0{5a)9D5jM+5Nb>-ZkBRk`LrghgF^MT(
zsr(a$pWuFnoA6f@H|QFSLc#q4=ks?Im*<zGCXK22*c>6*7L>EPiSY;R%2~Ae{|R6T
z>SFsH`dPii!Hx(_g-6`JiwUBv4W@%o%`%T=Tl={8^ztJ$m)%Sdz)bd4=r1|(bqV78
z&`?e@rbAQkdW@UGi62IKOg+gHw+tL$R|??LHKrf~)hfDvxd}Jc^ACwf>cPjxHyM@U
zMtn)SWBT|e+r7$GKVnB_KV^E3GL<wrrcJ{I1tf=sA|mwSQd6M7E54@!EF8n7B)CRP
zoaxBZRBt+C#TA**7;S?_W-F@Y2W=fvVXPOrNi_pr@<<RTBTbt1n5nL&)zzdhkkW(H
zVslKWLZ`lio0d$;kQ(DU9{-$3>g79k(NEvmjJV%kXq3A<Q2etFzG_Z9jknY;Q=RFw
zrGfe##FnGq`-=65VGI*LcSMxb7sGc--G5N({=m-N?}hFkM%^zA5MPio$iF9p)*UPZ
z{b8JHv(8Eo@A}dpmA9E(uA?bVJg%7SpnJ4|c9stK88sJ;$&J=t;=_*I!~raSef&k6
zKEBa0G~ly2ljfo+xlxQn53tdRK<~?=V{`o)+M_u{lZcZ%;SE(OV-#%)`sgQmE9;{I
zD9G9ce-!2@e+0pc$RbmeQlF{dj83u~mUPjs$9hMm3S}vx8|hy@P~_QKW0Uk$_H@!y
z8SuXmdGe2lkAH)U>O09{cWjrs54wa;(~X4s+cth21m^3V1Z72a+3@ww!cZWPWl90J
z{CWU!rQxoKSlpW(zDyzbM;hI1zEo|K8?VAm=|1qlyqiVm=x}W!?n8-H=o_!<4?5v)
z6x04-QiHQzf~w<O0;x~hP#dP|=#9ISp%~joeCdE)yNBseioM#ahx>26#n1GBTj)2+
zT8A|lPSVJ2x_2hMj;t|O-r^sWp#5|Qbu$nG%(CH>2k#g5u+SB-3}rXh5r=U52Q<8)
zjm#!cv)Et2tkpC_kxzI;isYWH+UkpF9W|Qi!j8kF@~qnGmLMKWrV3&B%jwic<!5NG
z{-)Ei;P80ArRotUpoFSgRhx(@J}o8BgDKmQw!Wbnu?0WqYeldm#p<v*PJC~Zj?y#5
zJuP}3cdL<_n<Wk3qIN%Z)F3GwyM!91_(wQz41(#Bd6ZO5%5TUz&#7~1Dg#Bb?sRD9
z`N{oxN}3)rOhQMpePaN6uHmB+xM+@_svlS66wTem-D>*B!Bx{Az@Om09cvJ0ElPnF
zB+dz$<CW8ZfVN9`ae;muC3Y6h+cgN62*->pL#SH2vg^T|%o-)MRJ-p+5~L(GM3WE8
z{icn7FU6ePoQQjxS`wz&x>vJYc{7wNaflPQjn5Ig6w#_t?@Glmg76nC5ITah@wWhH
z*MYXsEx6B;fm)C_x)um2R1CyR-bEvj6W4EXObA>6tQ2dUvCL_j@?6A^aXg19*P3wg
zZG003nZN=v7CLN`ARZ!E+(BIcMNi>EM<fC{7m!G!c=slt5;-k|4qF;&{H~+wy$@e_
z#!>ckevC>b9mzDD-RS_@#G|9RP2zSrmtdBQ{Wt;Ca~;DLkOXB^9M=-XjAFoWx^ge|
z2o#*Bo8m?N4uUGDW&UQ32!-Ax@%>+EbrL~IS$#|^4kA#sO)*2?=!6!kOe>C($5usv
zh1hIec?&6AYMN=M#<br;?2$<$>bFaI4l|}JYs!^SxD*r6H*CHqh&vPINzoPRh<VPH
znzqXHJ9V17T$;7J_*S(YkVhP<OmC~x+~J~-BQEMGQkaul^IQ_A(Q1}rD`FKEKZ7Q&
z{y-3kI|>2BbX)sYO)C$@xcHkjjY_W?xr*`4G+7)+$MoaqOcIAlrcs*X_UUnjTNl=4
zq$#QtF`F>9atAUvhF)qmu0a#rXh^Ku?bL(hQPNAb4KU}U0GMT)6j9mzHQsEX+N_bJ
z<On6!-vNoFy;|f?ZGi46CIcWFdaZPdVDDhygad(4V|D4PX_GZrH7(Sk$hl3mE#A9-
zja`?ORfW|98=8mqx7VUado3_pQT9~!W(M0v#k7s*NOgA9NPNgu$aBi^y91CLBh`Uv
z$x`!OsV5J3%cZ7Umg7GIEd7;G=-Xe{`01cS-)u~8tW3XKuW9hcup84)@gBzXvvnGq
zA5>m6XKB(^rrXS##su;4VNkLM{P;*j)|E|cQUSqjC;5`$pwI=Iv61ea;2N%J<Q2Mj
zn+`V|HoAoD--%qRiKo`_6XN)xar^*r<zCFx0KKnGEW{U1Q`wcT+hDXFn}`+;Y&|Y{
zw?1^eM#(FYGl!i2sMoY2n@G@M<)EDW^Ze3qlfV;jgW&qW`RT<-;ob1^R%`*|MtJMP
z^_pg4ovhvQL5sB28z0mxqUD-FeeFcXT>sh~93&JGHTwuAmPhcRSU(0svh>I}(&kcC
zyp9y(IOL=<K+7Ja#1)p=<M<%ShIIfwSUG*hQO$YPI1bV;er`mq$^g=W5>TNiuU^xl
z!<V5Rda6F#L22AL-akH|;?NRzgisu?|6Nzax8O^$A|B0k;`H&&3Q0!d;!)nRUTqIo
zTK$nP$v><gt@q>IrBr_6DmM}g68`Qb_TOXgXg7S-a{-9W#1({P$BhI&#&M(;NuS&%
zTrq1Ju)s8f(4^%9N6nfjn?+cswj*J6|AW|k4*~2r@xd#!kR98WQ*xw2+6N>YX&U`c
z^ypn_(MS+q-wh-w=HO}KEIfMCCN$Z)zk-_KtXj<fH3L&~ia3q3V98=A*)?I47yz$&
z4%<_l^?iM-v)~4JjI?^_TU`VKO&mpS!u@aqTrerzObw(5e9P73zlun(H0T4TRRMet
zIaN+}R@@hkU~`OfkWQ_ujK8DP-ifP>$G)TvMP0AasVcq%WT1zf`DgN+LC~k7m^VWR
zKX@B8B8c{f#FxRJtO(O10UwW0?Rdygu%6-0Il?Tq(ZHEv4AurD0ZQqmD{t#1_yd7L
zkb&qg4`d+#&iy#)H(GpB${hbUU)R`BflyRnAI-!aTqFRk+z$%gn#TV1f~!ZopVh@f
z1BB_<zdoXdj~Pec#XmNVi^QuR{y9tk@S=YTEDQ)!a6%v8b|-63n(ZWtU~u38KWD28
z(8mo8C}MX^lPv&XR3Z`=V5<!4@drfA4z#nne+{zZB2^XJ@S;y0Ukb%$Lj{X-1-slY
zl;IO2wb)nRs#qMVZ*^4}vf-uLtGPSE1`*}}{DJaiB3|_x(RP<!Y!<S6t@E5&XS@Z0
z7MKCATD~3_1-)Z}NB>%Q0ghD_FHtYM&{Bq=OOTkNi&+5ZLaaN^{6YW-E)7EkSCora
zckSbZG-|o!B7A`Vsh-F2iKwa<<^lXsSJjIN_>jvFw3n}{h=#9J2Y1O6)j%ECC6`PO
z4<m}h8|aR^c+lmP;w<2nG%+3Q4?AB9L!TtG97k;x0+aHb5hdZV_DYisfsH{FYw9Q|
z$odAlhpH~4Bvd=3KEWI_jy3w5IJPXXM(dE?r8T_#%JK^Ua^jWcV@xz12*{m+s+7ay
z@9His4^{qC3_6kES7Y(3zT~d^dAaA|N|4fbgua*oN|3wA_TB?h$X20Ks!in*N--T{
zz_gShmBo%pETfe?-0v+kulS8H4U|`K86%-A)Ls~A#~;(dPyAy!I43+>tRbyP%NmHn
zfla>a&`c%}Fe-da``M8k@Ws_cz5R;wc*M)!OJMd9Yqxc#ET??xpe&0S3*(muih)i~
z(UNHfWoHDE#Citq)XvXzB~U8A7;%>$D;6U^W0-XxoegW`L&AlNd>_z*#KFfm;SdAP
zFUYJsbmbK~v_@zWUnb4b{X{mdKt+k0Z=_m3jz3i6CTNtD2SnVJh~nO&FUrX4kzovz
z*snJ~k=E^cYnom~T!l<N^QXgwKoEx-|KR1A40QWyBwx!K)y{0AMG2;Q@oQ}9u|_r8
z8wJzZm>-QeZs~$tMG+eq`$t?yJ;H@1ejqijx5=G>m;_rgpfOlLtDX>d(iq9&5$UuK
z!-X9g{cbeh4g`P%aRpNZ!ba03Q#YV2$+$p(LoOixM)UbVKnL=fae$)OcL92d*#p3l
z+ZG4ii^E};G1V|v=veFkP<_%cies^00!bjQs^S2}kcd#rc6>_*bT@*#VAPAO1~mo(
z33N`!+(GieR)7IXWUB&0#U=NoQv6e@DM*z95d`>D4;+rS5qok-we|S*80S6;V|**0
zOU4ZXRa;fpW1QfV-l{TqAq`?>o32?d)4(JvtGbRkDYzogI<w{y<#i(4>#&qpHV&7@
zw`NBa`4xNP*|pRy+oj0gIvU?SibL@XC>;c!Ue+Mhw&Yf`xAXO=K7PCp@-X(1%CWkr
zwjHKCOhPNXRZ;~f$Te)^<EVxxyv;hNswdho<|O}Ddo2)qf-$}=J0gx%AdXcaj#VIz
zRUnR4AWo`4+y793He3{qe7+O<W<wm{fl^flu!6RZLjiF>2IK*_{I$_JjslwH5w-qy
zAL~r`6)T4Wh&o!5IE#J-LShHGzs&*$DsKtT=ma@Wy-9EY$iX2!+BLTG`fKq`kP{;E
zn>#}e_puB)Z4U0AL5_71$v8mPgosi1B>DEEe@GGz`VM2k*+J%@YHQ8)n6N$yK8i-;
z5r{TM9FjaTI?FyJ!w(u|6*p!-4#*#}`blF|o$Yl{h8QFUf27*l5PLml46;;HmZYB9
zv#N(QzSjuEz`JF8)y5(!vCn>Fvf_0%D049%tVa77wDBwDzOm}>8-o>WB4Z3leKjRD
zIgiWZa=z{f^DE$S;;@IA4%BV>6=O6xNO2=dL3_?LH#vSd4(j=v;@U<W6c1(Gh5Bob
zpDAHrqA4LLQS?Uy{Q+e<q9}3N&(G*g2JtyM)ekSf<b=GtIlECvmTeTgWnIbxSVV&q
zS?`k%VhuFSP{P<egi-t${nDVpIEoj+2Mu04#5{7b$$PVLa*($%&Rf59Gsvf&IZmjP
zDQ2@$oXAq+BLg4SZB*?nBhjg-PypJ3%gM7$?Ei`~1=Ruk?KE#wqIdW-rQph%wm)gw
zuIb=atzPm6GVwM}QW~Qb#)aO=(-LN+rKioprQx;)yO=D{l*}}L^X|?tYOWZQn<AQF
z48)C?Er@!p;N@fyHl$6J;3()s_BDulN3kQ&kBS!&!x$je;w9rc57bzk@&N-sl2J`V
zDn{$4n#VHXGY+n>_0^@WDh_)8xLsRZE#<P*QJghz1=NvXA|wIKSj0&v7$BGHHO?x7
z4U7N|tMX4&MFu%nH?&r2?&5G{T%ID04~!FhO|>@~puzr-{^z^KWYDvqty?TBP$elq
z=qnDA%JO4n(LrlgZ}F}7S&gkDO|{2GBcyXR#V$q-u)Uu+2R2P0cx(aN@vwOI3+fVL
zip56u31X3KNLX@EF^E_|pD4wlP`WXxj4{3gP2lz+gP!g?*ram#?s}9Wj_0c;;(B>c
zJ|7^@FQ`<SRFRk)GWS^*<Ll}fmVOr(HLI#7`vz0QXo~oxJ)*Asu9M8OB66@Nl$j~!
z0E+n##q_twL@WYc#2Vn41PKwg3H%aF?zWL`w(kC*mPoGh9AZEq6mdkgvIw6Mup;x~
z0`hZrif=Y!>*G2H&ViOdl<Taj=m8!A)71y(aCPCHf~!ucu)65fw@v9SkQBM>H>N}2
z-i+gs`UVtDG@#SiUeK7rpRqo?ccn{o6gt=P3I%GK<01~0^fX5~>B2k(&nOD1bMdqa
z=y&TPo5n8>LJg8znKib~^%gws8ytd0UoLX|Q_?;S&M)f9ZJzv&Iu{?4J6N^K$!@OJ
z;E41V@Oc!lF3%~?23sf?qpHgci8F5n;zy%C;Tk{H^AiXObvL<7t&gNOI$K?<oKSbu
z{t$5K7yz_UWuO*PA0EVeQk552b+>5C3-~jlI#RXu5G?1kDwcOc;l;i%T;~<3+mVCG
z$?;-UH`Ug|s=Y?~ixV9_qW*INDw6P8pN#@1t#CPOjdTD^P&C+z%4x1kJ*v8yRF%_x
zgW=&K*#8ZP4moS>dgJUHc~0O1(XvfY5dzSG5DZCgIS%Sx@FuDm_>r#5wsj{lG#UUF
z(m^W^L<Q3H@mC<rYJvF)-aSFg$%Gf^9_+QL3?{--nr4e$dYgK}O3HrKsu~v(rWhyp
z2({J$DtrMI+4}z(EWpwrC)g@dX6tVPGDs5@Up~Al+vpV?9T|zimp05nP}SUxs402a
zj4Qe+S08<~0-<@HOin>yRDr~Lu+%c3IGZ)C{|G3v7@#EE0cBvezP#0w|0>UCMz+y~
zfTfjyg+6ZLBiQ6#7vna-(>jQN2PT&&vVlPlXl<o9xrz0$<gb)6iFSZcZvvqJlgiBd
zDz3W`2>Ci&mDwf^MMXzrRDjhiuVMw0z&Ou!4t7L(ic7&YNa&W?YA}Xca%q)oU8FLk
z;lr4I#WEXjm=u{syLEm!+(pp$Q-2{5B-<11ElwuJ1DJc5BP+s9d(lswY*+LZ`y&EG
z;vSB85*M)QZ3zt?>a<7Ks{iegn%~?^v_}`twn+Cu`fXbdbkX}z6cG6LU>=a$F1#da
z*SaY|%zzmq+Q6ahxiD<c^=PM_mqF(NG!Vo{)*hmPrDE%bndS4K{nCxFeZqF+Hc+nA
zcr`UX5#Hcy(#e9#PsG{OV`pikqZ-o2WA$45YGh5a+eQh46_T3cRKfDLB=J`m2LXz2
zgs{ZRRMMvZ!vp-1)x{(@cAJ9Hh2iCmf?raq-3H3n*qERz#l@~vHyjv9hmFl9<XhUn
zs^~1n;N*|YysWrFSJ|}hv0Qh}!Cs0}3a`xb6xU-2)5N_~Nwp6iJw#O^SUD*QknUlW
zEuR)++VjR$XF-7)*Pfy$J6a{3uFhV$suf<@E1Aw-_R6&f**~TooV}8r63$-v`EGc=
z^)k}{GzpMdD~$3{(@+FBLGB}+1B4D-UV@~Ag5yolC(nb;x?iTlW&`_2qh}b16gWVD
zXC9QtC=&R+NT|l(%V-!3e{7Zm+n8BQ?DJIP5B5I>y?)nrRNBpm_kNc;0<1{?WN(N(
z4|*Lo`jC%IT{~De%sN~5!ARducEgLTaAecu=)mMj(I6dT_9ECun#>PQo7O%6@A|`T
zNRp`!Wl5I2MqHnONjNwqB~`NVqco1A7}m$7IjV16B6#LG&v>7Cy0X+H?Wv%-MW^z&
z(z{;h4{llTA|WbgiUhg}B;!GhX*_8<2wn(W2#kPP{)5=dG_qkE<Wn4Oj`2{AgJg{>
z?IFGeX4KRMNx=8@?njRT$JHyXy>Og69bf`h+M}NP;RpCaW3d$nMQn)p86>lGh=;gS
zvQVT>NeLGM1Vu`U)lKS~JR2G&1j>7D&8cEZ0dj+prmmg)t^rVO)?Oj%nKs+R4>9C&
z_hFMz?(%D?)a8NL3+<RVL4-LF%<F&$^?iHdtw@ZG99S!DsY>>*nC{d^cvxTV$MIdk
za+!>@oYFo=e^3E91%t-W;jRZ|33N>4KH4n40Z?ma$>e}MP9$3{9sFG!33473fCMD7
z>yQ9Ti(JAJ4+=nnM>_jE<+x*wl+!?p+%Ypp7?NQ_uXB(~d$Obd5QbzR%sVD?$srwd
zxwKXP5Qb#W-Wx<(TXM2F{}6^`(Vc^w^Jx63y9Yfe013Kw_E$K1?<R0Thi;Vukl<2h
zf2AV<p{@=IqyQw?)XAR#6?Q+H#mr<{1zP|ugH|k2d;nZ4^v!D@?lLJEgQ5VLt30${
z1}bSooi^PZY^G9t3uEWlCe&XE1KuZeb5Oj22>}WQW*|x32o{9GU=DJKxDO0OM{&=j
zf3rm=3|nW|L~WowKPW()u#k#%c)CCDtuOa?UV0GEpyjpT;}3!+Fs8RuxlhpV{R~sU
zsZwKG7GTyKgtmbOhtCtl%k?N&I0(#Z?LvO0m+VtT-w3@1;Q(maA=m)JK4yG?vy~{`
z5KxKk6X1u;uqlReg<yDx0)=S&X_whLs>&UQNqlgaguIBEvGy~@`-jK-(*}brRPbjJ
z6k}%yo)eH4GLrV#-bggHrV=r2Oui_73V8%npiFO5jg0Y)*wHX1UjYFQ=>q0*^m+xa
zRPFs!|3|1bU;{xqKdq`}aOT*DRC{Y+*-})Siw;Ey{v{E>38=g>BK}J8v{KS%h|q||
z6Ce=}ht@<lcnfrrQ`1yDqSQ4)Xk0uPu@!_ogb0%+z!u-SUMWODc&YK@-C*$<2$u*{
z@PKp<0}K%G)x}hCb_S@ZLoRjQj#FqdSeMo+&ZePWvJm;d7j8M3+S9F92#-QPW;&!o
zyia&~OX)+!Fs#$em39I7{A9S$QXF1N9=659#69ocwO!W)IMs9gkd*ht_8i2;EjDWp
z_&W0*dTldyQd_L<6krrks^1*ID@3}jMkR~V4Gl&Q;57Sj?#4N)8`!M!Q*0ZaK@f!}
zw`ADO=)o+GgQg01WtKSI*{-h@o6pe<<n6YXXkuaZk_Z}0syLuipuCk#;!-(|Am;=8
zC*Hzp4#B0o?skYo8U4^Ha2oBPr$`c7W-HA9OK`%?09hFH2?*D;@!iDL>tNmomP$o4
zKCs3Zm9T&0SYf=|S7_-dca8#kNT_w4<`#GtTAk4IB<Qtzl7fg>kc4?EEmgN*Ou&)R
z$o7nAw#Ek-HD~F>t5MTn;-Fb~5o<J-ePjGlV|k;o{1n(8RYe9s(=_T7ku2bs6KtnV
zeI%tFeh%0NCt(KLB0?{oMhhk}FO5ln2>%oka(b`^X!Th!pVTax(_$lTESt6BZZioo
zlFTuq<@Nn>aW~{nrUM{0!|GuJ98+#cDzM8%B$XuACr!;b0sx7Rg*KHE#1TMlPyp<(
z@Dt^X&F-e~@+SVQSur{R>6^ruNrZE}vCcPj$_|xXZc0B2qkes;pg__YX~GA#O-S<w
z!E>?SZ=EGsL<}!KCHNEN?1;tc!;gjWFmW}Jsxqk@f+%EaPRi;es2^XO&?pW~LKJkW
z)k|M~(MIsyU<70}iB8!>acCONS~B!2jalsE4r4}w)Ra^b1y+2IhRb5q7pC5|Nh0-G
z;7&T?*x$fIF_HQ`f>FyGNX_i@@<-TQCL_E9#lU-#ufIPz=%KloWTXhz2a^GPq!gER
z!O${+E%fLm#VjkZjS^B+Qh$Oe)r-Ivp!k|qTiqp}4ESL6BCEW-5;A8+L^J<w2zUkS
zj*do-nW7b&w&B=rfyKvX!KpAtOx`nalWHhQdmjxKy!nfE<GCm2q+958G5TMgv*K21
z^|hP)BAc;)lDrOLtG>v%gEqy+S6IhkBatM~=y4_N*WP)nQ=BSC9AdL!S1;YK@?r4&
zQQ`5*QV;PM#qI}P+IVm9>H3@fO81h!>~|!BQq{Q)F;9V*s*R?_jkBhkBTn29y!E#{
z7Q5<dQz0>`4Xx}FWz)3L61rFk>OVZWt@u24ZXz_wVnyY{)^{o&npo8nQkO0hE8QnV
z+${b}>bP2O$z%c6O;3!0;AyBXcLTlWX>}zOM_W>;k$4+jAtNjp#zI`d4GKNwPLT)%
z&cv=c(4e1qsy!M4;Azi8+}R$Yze0v6Q?SZEES`h#p6$U(Qp4<*?frNF4Mo!z|A56O
zJ)rUt@S>4eh0swSQIdYvBS1bdrL1r5SGoi3CDA0h>jon8-EN%kw!hAOh`F@A%Zx$*
z+2|vD;-8QxJ`FsIT^blOX)x{A-=u!5p?<6ht%TI2Ef%sfnBOi{7*4?If4pCD9X#pX
zqt2ZZgIEpHfM@{@7HAdN>fE>~STC#ms(dSZOsP~t>Jku9SA2yjMb`RDT}&Mp;3=rW
zHQviTmqL3-SwfUJ8Bs(RN}Fm7$)84FWyrlvq11^Tg0au&2*!q$)k898;vUJ&nM_2l
zht$N$$zh?+aAFxo!Y@%gf{Lb@8VuLzzkiCji~UD9-wP(odjRnLp<XEizpeXcSQ@PU
zA*TgbuxVB=a1JL_YpcyMoRfV*fLcT%#xo8FrZfowrew7v``PyFskp#I5ytkU;!)fQ
zz6Xj5q$1@K?Zy4oUfgxLIHD@&fasG@g}fk9!`&z9m>Czy{QmCTZ2gtN9hWPzF%Nmd
zdF;TYUj(WT9~S^tR0zv++J2yxX?P_7kFzQOcYD{nQZP+5YxfS^s^krF6M_rBWwdt*
z`>Lc!2lVY{N)CuPv+Q9A2@}Ox@G~`}8IuF7T|rCP%74bnQ;UT9TehVwCLhWjR@hY)
zH&I5!F`UxG8;}4=<!NL2+3@l}sGj<oCSuz$5Jdswoq;hdDmU3rfEM5ki-61`8dNVY
z!W*+<nIg}{YLV7baHO=}q8(LK&Bw5)Iu|$U%Kw1y_YeL|Rf1E+3BIAqYYgzhn8S;|
zjEqDl3ZivSczM9GFp6CQUEWAbS7dEZbyZ3wVza!;0|}L54y#_^(Ml=tCF^&lQM9hp
zV(6Cy?OgE1r%h*}=0;W`u;XmoN1V9f!m>z-MZZQY`bcw3Z)HS%X*aPA9IWX8svIb<
z-(3>KmqC1x8eBVb4tbJQq1QHY`tn9jRk0q~LJr%=0O%qu^eB|%$Nxf4(e@RaG)<1$
z7%uS7EgRpV{LymxJ;bF{ej6;=&g>)~@V>7Kl6(LWhY|aNIoaeWm+whlr&xt(7E9m+
zA}Li&14{_CsYWpYA12M&G|LuL5h9Wc;pI>Vhf+l(6c?1zxZ@9rIcT8_r^BtyX&{4C
z6+1y-MnG`@CSXZAOBmxKrca=lPLa;ie*Fcg&moo+ApjAYScI_@0an=qVBW|(No;%?
zm9fy-T$&5zAZ(}^QYSL>h?=j*)Cc0Y!22eNn-D)${De|Lx?$EHbdVYsqC1irG9q|v
z0)_>9D9M=EYAoI~DpUfY6>%;jZvRP~fx%?kyq9CqOUY!f`{aH0y6b5cq$`D?;yYl^
zJJK#8#($t)US~<#?RB4qz3zGUB>tn4CALl?hJald(4F+sfuk5g{v2Hh^27R+Wci=G
z;T(4Vp;U}u$?m@rIZMPw$KBrl$#%D0@6;{b@&xof2yUsf2ml}lrE+26*e@rN#Iu_r
z$`HLl4}u4%Q!^bDoG>V7X8=f2TLnR&RJtUo?IE>`sQU;Q&6NnrwiIy<5!9^??3-ds
z#u=GLm|E|BnK~lSu5Lp6a-@B&L%I7Qj7<^GQ63Us@2F?aw}H49Wd`s;yM&=V(CZQc
zBmN<<<_`oud{3Y^^?_2#6)NPNa+Skarl{+K!dRY%?O|l<6xvOBE;(pRb<SHb04gar
zy`K-MD0qSn!I3#1v<H*+{C=jP4@>=|?+9%up0)*e=t`Y_mr{4~nIrE36T-(HeL9_m
zaP)$$`&rB>c~Nc`-QC6%0yV`F+$%Vw1P_wZ>90UXJ$1wdd2>_}bBJD8-617lDtHhT
zP|ebqt{lMV>S17jgZ&R<bYPl+kAji|sEUy0-nUehb?BAlAgNU^?8etFI&zZ)v*g`#
z&|nCdm*T~4BEfdb5J=zUt=fM0G;zQLhxX@iI>t|mg^&>uCxeSxmU=E%L|iLYnD)ca
zYaK8V4xK2)<-KUQNDq)7{RWl3#BKRW!}Zc*CRq_yDTc5-5FZd=ufh^k0b~|!1d4lz
zeh+gMyu@|*lJrj5$*LCXo`~DapTQ~EYb6VTNbEDH<xoepL^8WfHF^6SfEca&09{N9
zSU1kby#eV!|60f{P(9%>G0Ks>I1!(wW{D0kx}mQ9g%*aAuLHzT)D@c`Ql`dEMWF<2
zq*&;M$vc-O@AZSoNZMHP6R#0Bpyu*CW>`pZv(t&MVDWo|;>6c3yz)He7(=Dm99Kb;
z6E|S6&gitGWIuH0IQ7Nv!s@>~5M*Y#cS(1#Ldr0YGVH-9SL>$<q7U^$hXY?d+B@!5
zCeUCzN<QKUdp&@0?5KhEmq<5Gi&n9Xq`8!tGzUP8lMXF91uAqj=G4g!iWC=vh=FGj
znY!9fJPn%Pp%h__ClZ3@KiCR(0uM_UjhWQ{vH;sVL99cnG{S4W|4H%r4q2dQs8dJ1
zzl5ZH_H8|Z_zZ08&FomVg*1jb4MbmYG9q9ghCAX(BeC~+HWJp(+j{p8!oCD?!<m2V
z<0}kD$-8#Ppff9PR-VD9G3-IRcCB@CXJ4aSrOvk79Ao`p_Lp=*oaG~l-l0`d(CbK5
zZ7owkuR}6^dAxPSZ7vcbwFJC%c#p>$^e#Vu-q1;YnBGvQ8K;}5(3w2VlZORWb<zF2
zLU$PaqxI3wzR&9pJ6lCvree9(r#(d1S7)#RLEvZ;6_LK5Kp>c_=AgEZqGe#ffI#mV
zH5f9ERb;?8R*y%-8Z-3<sgu}ERZoJ35`aIi$Bgv-2|0lvp>5rjgc|ICg}m5>0$2w1
zNZpa`S2@yJJxxB8mYr8)z_E^iV-^ng0cfSVJSo-X38^ljctJlKy4%z<{lrJxYj#0m
zTEEn>ngJLsuc5*+kokyrR@z6@`U~;pjuV|e;?M0tyQF#ifWx!w^d^52HfO#k5Rwkh
z(z(p8GI?+ZbCez7v#P{b963G+ZmMxMkWJEEl$CV9T@tiOybkg4I3Ekq&bFw{Gq<Yg
z&awfXO;zsvqn_1#f7}d*YvIQHR_r$Bmr`fv%VX;CwI5$~V;Ti7y~Rm54vT(`ya(-G
z+lrlUoHNzTqFdXJ+JbqEjV+jvw=I}f5nHg1JuBF=l08?lCmlhs1;5UoYuNKG_FTuF
zAF$_o_WX=JH?il}?75vice5vLhT4K@f7BLykUdElXA5p%PhyH}!Drd?B6~KnXA^sh
z?0JPfo7uC4JzLqcjXk+U%0a=NO7`?-Pe1nbXU_ok3}nwDmMWh;v)FSkd(LK0Z}wEO
zr-D5>_H4tNWDBMXaBRVJgN`k@nLV$tr^ud7?Agek7ul1D1zYeb_9U6EE%+#V9%N5C
zU~LPggMYSQIw5Ea-p-!1<8BKc%*rKp-xf@izb%;7MO$zV{MiN$c2ks)5cG|JybQYp
zenL-B_#p4?w7tJLVJVve5Iobwrt?lXH#x#4ZaxNZi-Zy6@9-vWZg7>asiEQ!j8ER|
zCn#bkSQQYK#8&xM91{Kuw#p5<R<%}-L~+cMNI(**{dww~YMP?kYb3R6oS|;OdBi+t
z@#Rg3LkwTKGp>sJ43rxr<v2jKB8sg!rdI6Z_R`yW;6@?(iSIqfDhZ8kW>^!-(yEGT
zOjvM9jpE0Q@<49vP=cwvao1-_<2jNLf)e)@f2RgO$ek)S;>#3&5qjc;xam|{A~Ol)
zjWb@tS;KX(YT)J}5W+$RdU-#{Vl05r@2TN^rqNIACDkKUTt%6hW5PhVovPx-&K8RD
zW~Yj7tR~@_Q<5ogP#DN&shkb%kQGU2=Oi{Efe@{kxS|p*?E>okXLJO0v#R1r%*Pbg
zge38(>?^pNZd(Q+VBh3j<2j2OUt=HV)lvbyr2;TSj!U76r2<Hc+Z)Cih$TTy{z_#H
zLOtXIYLldBDPrBX=$TfRyBL~nU!Y|SWoa&kyQ+b3OFZjcD?l=nRONm0c$fa6;o|8R
zku1Q*LYZfX=F~XUZTaHv;!cDa15(70vB-~<?$272@*t;d3aNLggN%L@Wg@P$QkDEV
z_VLy-);VGsGSGv}f&uDpP&9+V*Twnd8|K4TiD|3=J5AFEl_Ox-9f6fuXb``~o48(4
zw~z5ZXVJ9ZKZhSNWQ_!s{Sbgnk8%KlSi2D+pr+VyhKNz?Mn-ex^WI$<6wR3xn_xR+
zoQb<0>8<BS!II=$@VIGdvOt%`F)22&P*wPnK;AP!d;$`+G@GUg8H%)x7;D`C5th)%
zBHKo8N)fAA9{cT;w-aQi_M)z+P86#so4`1bNi^|@3piqlbwsRqf?yaIlL!OF)E7GQ
z(Z5JN7na^i`>ZX}KCAT^;DF}vIZ7O#!Hreob8%FCijzt^j5sZ7oswFGT~yq=(0V=Q
z3Fs>KjjHMb1@!K!t+(iGX+5N#LU(f%V7<+Xoj+VcLOw2#vqnK>em|6>+Y5x;+Hv}n
z(Sk%u4hKwNCfUhII?ACGg2Yb@0FhAf6}&nw`GHb1KrUF5Z)m)sA7v9xGCDE=XpJb(
z9ui5JAU=nrY2s8oO}Gtly`Rtz8m|vu*LXYg0pcWh*V9o$P8`BM*-^LS5bVkok=J4v
z2(+c$IGaXvE+YT`zyGNR&i?Am6~pP^M7Y=C>fpYH`v7h(9R21sI&%qd^cxAkAh-ZH
zZ@9K5XYLBzdARZTPrvVAp6Vjp6}UDyB@kjSxS?=Q!X?7ZgDZx60q#F=8{ul<PQm>S
zcNeb5FV5T_R^$bD7_J(5eTMg2a4*0uhMNbM2sajP5S%}pGh8!lr8dGf!0m+l1nw2M
z#c;FXV&DeBIm2DCpj^0($p1aK*Ws4I6~N7gOMu&sJfFln6iyANgu8`4xdL|@t`2S!
z+*@!f;SM6dt#BW~-9_5h@qQLA>oW3&tAbk%w-N3j+-11yaEjlYxj?v)aItVR;IiSK
zg?k?E6}b1{zJ@yp*97M*qOafv!^OfS!sWp|54RF-4csSi+u;ttoq)Rt_ZJ+8I{Cr{
z!i|KBftwCD7mj{P)QNsGF&0zcf-ugta9_i{4fij&=i!RsvfxtSV&I0uMIydG-p+6>
z_-=$d1$O{$6Wm*HuftWsErH91qu<jgGYD?9TsHHRAJZ!%IscuJT*UX0+^2ak`du33
z2>xXBc&>K*c+S-r>F~SvW7QigCXyeOlmORy(wS@B<IF`DYcqLmOm4AuK3`Z|rXCnv
z@)*U7&n!yG)s{}pj?K;2%Dz%u@<3=&Zoz{4{3Vavg6w=`swv1)7i)Q;xS&KGoP|7P
z|4yE=-^7Aket5@#VMB)x9f35n;TCC2N-`H{Gv*a8;j-*C&6v+>PWfh|Mjifg3$%Pj
zabY2!k+V=+hH&~{Qly=qo0*@HU6`MxEzT&)<a0PFhm4Y(!eV~Dz;n?_6JsW4#7><u
zJxTsfNSrz$F)BU@S1Yiv=&AAXQ>SFKd&~Yw)1wlnCsV(6ir4Nf`^RXKCQYB35Hm4R
z6Fq%uV%k0N?+=#KMI|J}L`|m=m-1&B$7`k}KcGD3%}vgoH@hU4*A6MloWBsASAvd|
zv*42E7v~o7<O6A2bmGJWv^P!@6{AT^;u0oDO`kk*JOyzH$%z{Jo>)-AXXax_a|;X9
z*_r6=tf3TMP^c~u=I5xTK9$B^C|FofSX!WF^_1bG1aXt%CTRI2X%J%B7$jf_qPT3K
zU_Q&YppaK*E=J~=^YXPESCXU6&mS>-XjXnc7t4xN^Mz_@#MJf?Q$HG9@~C=<T3cLP
zSga0R61;><((<W=#R~zP4wxSJSjPxd7cD<=eqq7n!uhO84+@VeULY*e7Vsta1|n^Y
zwuE&cdIO<Se+=$e1maNR9vq1BrwQ8PvWW$}wm3U;zINcm1Z{CiZV68lt5a2@3#A#y
z`oCbl_CaNpl$0!m%SE<abRkV6KzZ)74~$EZC~DHw*y*WJiJI97WqeLyf&7XtEY{8r
z&Keq=HCrBVY6Rt*kTyMT>Xf*t@tSeLG?r77G}Pf-N@l*Gl|H$QjCn$CKA&5Vk-;UD
zO)e~0kP%y4xG1GCH!FcJMjmB|m=Rl8yeN}rd6uDzGZHe3OSIF4A{udulQABdWU+kN
z|L9m5JTj(eOA$VGULNpN20$r_=Zlm0VvIATll{^0o&6^+D#F~(kY4eHSpq94Q79-N
z>?O^Ep+gCnqYH)nEHwdPVUe~#T~t_twlJ_CB8|2>xP&z9P{-KZ0@lU&Mot+?xr<Q$
z_PQjMm1IywiWe-F;<pb9{tp^7NZnpmeqm;oS{em4LRft2rvx;Nr?Lo?iVGJMXD*tO
zxrjPxs(>11s~2e(0bBRwID1?89Id*jSUW_nv@}=cnoA(+L)GV^GYcN&)g8;t#?<MM
zQY|MM7@S250rKZ_7irb<FmuB~L)Gz_Sz0xw*BH4^h8C4^!{N`Cis-_kGC9DW#t}Ak
zv9`Fh7+6V)(B2R7yymquUYS^i2&Hq&vIO9s#pvuT_5ADwS($vMdQs+r-1+JPVbMHo
zv3g*MR;!+ug}IYanu{SV;Zc>xxap{Hi8`@xQDy<nb)g9LWNmkhaj|v*5+Mg9%PK5Y
z&(F^+DUsq1)h?laX6aH{Xfz9i-}Ic^5_M|svzf(NNSL3mmOC5StAQEI3WZ|z{K7>=
z0&*Uzj?T}Wzfe6zyM$+$s}TKIAZXR-ZH&QuZ9e&Gm*gT8Lnl>J%A4WVq{3{zG!rxO
z0dutEo(U=gPzs?D)C08{m|ZAf_0287l1eQtMz5ev|ClG%hC+f1!rd}FK3ZaLo&-yL
zSrO|OzBsdBftD*`s3SNF2!l{GV3kmb+EE9>BdpIe3uscwJ;iZT3hnUT2~r*PrOvR|
znRNs*k@E)d*xOgEeMSHwkTqCcnv;tas5G;L&E5Yo8+$(JAB>|t3#?wn7y|gnE9FoO
zMn15Nz0Pv;3)Mo2b_|!yzznOQJmLEVm&{JYWL&HbE+NqArye4x$uqcQh#e;L3m5dG
zz9^l?arZ>$LPv(G6SWJ}G2_(??Tt~-Vu{m(OMq-WJK&`fEyhP%rp9~_v|LPXNl|`g
z8N&*4|1jK5pdLEhk>?~WCL?l0b{+GQ=bJ<xp-w}J%2;abZik0s=3vBFN(tvB0kG%G
zbC&Se#E$d;aAYyB%~A)aJs!O1@nC$!jR}q?Y{u|SCfa>pZ@{m8?lXMLYLZqcsIv;$
zKw@Gqq6w0dxmXJ#BRe~HelC_{b>{r}AO_XNxeIdm5>Ege8@WZ9^K)_ww3NU;C7FMT
z4Dcu~ZjvS~BRV-TQ8Q(FMskuS(e5{SYIM}(jQFVNxQSCV5`ON~zHA^C5F`KCK;)Cq
zzF63?r#;nBPYDeWSYzElPU?9A&r`+koBgE>vjFI+kBhOg$Ze4j@)$G?cm+#OJE<{4
z>gEx^y};A*de%PPvy<8hJ^R9d>T(JB+RPFyCJm4e<`3w5l*U%X4$Ge05?UQ6mL!*G
zi=zsnvKHkQAU#7?c(>DK3<%ViHj6>`XJI)hWWzKtiKsZu5-q4}n%2Y%P)}lIL5Z1!
zlykEQ36}6QXZooZ6rx)awMF1b06keilH^T*G{)hJd4&I%ZS#ndXon-j)}j;{rtkBY
zrVS_9=dZl1BP-V5?eS4FI}~+VMWyw5NHLr2?RY>QR&7>a4!}?AR*5<jxEFuyyh<*-
zq+|>w{%_)WI`RT`>X^@b#~L<|dXx|k%M|fDf&g3a$gdM>fp5E?Ji)0iv!tcF)AHQG
z-@c?%Um<SC<)6H`|2O8XV_c*e?U=b#-wx=gGyTI#=eVe1EiJyl6Y@uCCQt<+N$MZZ
zj@VtD4XU*BQvDQVBhLx21=+d9i#V>mpBa7v3TGq<2U3<BK2)7qynq%FTH1yPl%Afc
z#UOj_v<ZkbL}GMDa7pldiUUFs)Tp|sEQ6>7KuSc1@1e4vdSEeeHMCxX{+n6^>I>w2
zY<}hf{3qHH#IHo|0`@5vqGTnoLyJNG6f%N#GAK(5k=AKDjr*YZ^I2f~TowwR%`NIY
z16cN)oey*rNC^RS66Sa??a3u-GqcJ%AZF@^&XmzSP$-1QwVlgE|6z`+CuXyuZ6DFa
zkV+5{H9v>w5KOf)qK6sn)j0#Km!P;7lne%SN0iujFv51K>;V**1N(B^co5}S?29v`
z)dr(gz!w+h%PTL(6&4n;aV;n;Ad-m76!=1VgOZp}9uG*%$+$d2LgpmX;4_J!rE~=n
zY0qILB~gV;=U`h}`d=u+fc?J=D3DJQvxHS58>LH6q{-zOk0TM3K*Yp5pkpK|nvh8*
zNN5RXOlMS&JqkfHxU>BHGPQk8pI0Um$R!v@LNy)nEt?ma#aMaC-~L-2>RviH)Ax^^
z(>&gI=)fZPms|3RMtwNn^8Tu<w})3=@cm%>#j=Mj-#1pCJMr(3$y+`4Ed6qs`;hIw
zz1nBrD_MTq`uwHdlo$8Rj%z<g?X4(3b-tIi>4!zrww!9IH=NX`tjX_Iy?$ZVvp476
zxpGKbHFdU=|G9j(`SZuAZvE|}G#^wKM9lHao!k^P_xs{!7QA=7$z|+>Q;JD<3_d3o
zZt?u^*7_}@^4EMd{`8?;7b0)&{_L0hv%`hiKWUEnoW7Vg?)aylg`OKQhWl}vZrYiH
zJu(~iZE5+sZ~p_EQ{Gs$^O)+xJ=@>j?mSRg>6-D?Iq$k4i`SPgE-ie#%jBFHpZ3YD
z88;+*>nl+g7rQ-k!D+Yp#F{~V-(NKvzI^79EnD3_Y})tEh*R6e_YS!)8F`aay|mtA
zb-)_mOS^pXmJb=XNcr#ltXG|8&%fL<ZQ;UsnfZZdL$!t}+`Pa3yUH#9xeuLs*R&{~
zPd%XeyYAd3ZGvT6*Wb7AH7%{&(e_iHALdOQa=!bur6*TvC!e}KBlD~H@1|`T!*jde
z|2cHmsi+Tsdiu<&v*Q*WIR3%ymeVKmEV<Eb=L$x~RxbFwVf)<kB|{W3zxHt%kullx
zlS4~=ei-|VYr-c{&X4-}dF_2c?R_YCOHS%$L!sK^RQ8T{nliuhz4_yuHHXeU)^AP2
zrmxqZsqZ;%bJ_}@uZKp=-m~rV{GHWm{r3NE-MsHV-al`3`Ok?j`S1zf|NcekiM8Da
zTu|tHTrBD8HUF22h^*J2%v<EMerDdYUdMc!*4jK?dvqh``Q_X0<uR|Rnoqp1d@<)Q
zr-$#>y5**)&bx7BfmZj-==_I%b6Z%jxc8~MjUgwEGoL;0cl7BW78L%p<L1q)dtZv)
zyRGN<FKwDDzJL1kve%Bkd!Y7gSmIwlP5pDhuHy?*cYpMQ+m@#$js7a`e2CB4$-O<l
zxc;=u=(*1-qV`{%`&05y3)WwKsbE;y-rU%gn=_B}(r52pccL(O^v^kot4h6(x=ire
zwWEh~zsCo-Chv{d`OQGDJzxE6=GP&Lyv?&eww<XRcC2BG>Fsla`)vGi)~4F5HwXMR
z|H@nM=Lw##Epp!A=JD23qkXN01@6V&QaRV>pWe61|Jm(7Zw&eJxv<__z2AK4#J_y@
ze*f#Xs~4B{{po_&sS_t(82|IBKU+8dkW-*P|H!vJ_O6&UV8``KrJD*%Cu|G2JX2X&
zl&7*Cj&RGK?d8<P_O|xr+>P^EPudn{YL4aiSn{*yx<5|%oSCjyOsU=M5}r9=!N)gx
z%x#FDkUQ~0X~C0E=N;d8apviB*<L?I!l=g+NgH=>_~z|hKQ2G^)dY)eOK9L<d-hb-
z?mQg&+UBH>-v2ttb#%kd*WAv0`&jCa)Aubn*MI1<*_*dNoq52ycTW22A%%mU*z5K6
zyDxd~@BNeOO!HOeA%p{>hV_2v`FW#<?@t;MqWC61OVd(X{=&yIQ|eboO;uK%J2-Jy
z?eQw{>a8Q^T7L1Ky5+O@WgEA=G(`XQvA{JiPU~9xv|s;oNhgb1mi#N~YG(48jYIt}
zZ+YU(mNkK^EA*~uYkEH)uz`E?!mS~j{&QsXhV=B(%Ypg%wx6DgI`y{i%x~Wds#x_)
z_jgvRW54=1vvkAWk1mOS{?>3!4ATF&U;EWJ=Ret)o^E|7HfG?_g@w6yiWYBNI4u0?
z%t7kG9`0U?!UDTq8y)-8SMKR`&rC1+Z>V-*%Z+P;c5SU4_MY%+pmF3n_g8N3ey8V7
zbA@l&j~jx+u6{MvR(7pqZ=9G{-us)Vv4eh`;X1XfIcC{B%Zo#%*4711zu;8W{q@LQ
zzGl7H|D)P-Vf%c(Sr<0BWmn&qKVI$m-D-0;5ANvfxM62Brg^st4kukIou0mHXZQSd
z@1K6kT={R`)vqS3IrC$e4M*!w+`4q-wIjFwo_%Isai7a&3xC`)J@TE3scAF1`u2FJ
ze|OdSqOhPhqxz5gc;OxG<(Ze4274Sy%?fLn^8UtGoqm3&DxmMtk4MbCvwP4Nmx4b3
zqv5Hqhv>V$lmC^+3!etX9s0d{Qp01h%WmhCYJa|7_SECs;(|u=y*>Jj8q`(s*Y2cA
zo6T{FML%lGhFx7Y_wKdJzwN8Nb9d>h4d0JjcjV};(N+3g?yvr5$@JY{hHF1wKWU9V
z!gIr#eur*t@u)nq(Qj({)ePVKme_BfI=5)0Z!I6)b>=na{!zcz6y?|GqDs$BI5Ya+
zZkLC=^vxFT!-|UDyL(kdJu_?9%$zl1Y4o{s`7<A$I;4BXveDje4e9;p4}sj1UAZ+o
zl7{Kmy)tj3>3GtXfA#pL<%iUks|Q~Hxc2JztIu7x>~`O{-W<4X;g7@K8gzA#;lE`I
z4}TU{bh5B_dh5_Zv6n85{xN%<`!~zyPZy{6(_V}J_1ag?AJlH>z2Mb~&;je-d2IW}
zZ<=nt^W&W{N3WfJ?v8kD_reXjJ2Ss}<4KQqzFHnu@#&_Zz`=iZcONx8cF@BmrNi96
zzEl+Vcf-PIqxG@RmVT8!f6AF#M^u+DojAJX=uLCQnZ~EPuKvQSzj^DyqIGMHQM)Q)
z)BC%)=ZEz=@KpC<24CNS<JU}G;Id)*vg%u9$t#Y`oBYT(VJqge^k1{~W8cjeS9kxU
zH#hy)nZu^Gy)kdznX^e{-}Rh&X=2K<TM4U%oO$k4;L&;As?0+YcdZ`zs<`WshI8xO
zu3TF-=kr?ago0P&@*iK9B#5KCj@jVu(LZl`kTOL3RF|f*k5_*fxBKPn-miY}=%A`S
zjk}Nh^{%<WI`79j)%~wtKDX!6ZvVE1kA0rfR}EP9)vHhK2x=&5?S3RTBKGq5XG`zQ
z+Okl4v1R76Z=Uc-`eSie+>I|cdTeigr|Y{Tjy_dYd?)BNn*UGa)jAcNs&Gl$8|!>=
zy@$KC_K4e8OU(*HkEyQPr*-pvIpVnLwBg@Am#!vzXWi`Ok@VVGrRR{hJ;zO$?N#*t
zfWQfdn)*Ck`radt^_lzdXI_u@elzpGy=s5@G~n+oxep!uYgAX;nj76d8t`S8S0|VF
z`Oh5Ny?^Lk|7Ty?-Xp&0*`AHD@nL5Mza0M3zYaz0X!RO1_K%pSyeeLJGI31xSZ#vy
zxEVd?j4mvH>xt3(&yRB25HPZ0U+S>U->(Y&ec{RBKR9(6@yf3YgFb$FL-5^US06nz
zYsi4f@$>pW_vpHQ{oc5&?tU$(@4&B@40`0poguMv+a7zy^T~lNfzJ%tzj*WD{~Y{#
z=;!Y}@p!fQKSeiwoAJ!Xw1-RH7;&*UF!;67kg3xa7ysFl*Sz_?u;ij~+0?C*miJKl
zl=q!?Z0QHQuI#mk$1gd&PVwxW!*$PX8oE3G#h7J_e!LY{XnEyULH-L{7S6g-n&+H2
zEN4{MwOr-$FXlbfebM~vPeU@N)mY}9I`fhCmpxfoJ6-x^n{yi%sE?e9>-lc?iBld)
znp7sd`gGg;AEzGi2%Pe-Z8Il-_`{m`HUBvf`$e<cgzHlxH8nxc$HWZ(HmYQXDss@}
ziR1gMG({)m{5gGr^N8dpcMGW=r?;i7tZq%(^~spTpZ%96e7|h(G%@_=nLj0|XT9*>
z?6fam{9wk&SFPzTw;!85Q&Tu+(c_<I=z5R3wC$N2jei{b^5=6Omi#h%^VrJ^&)xlP
z_=4@fy81lZ6!!Fht15NVA1QCYcO|oB?thzpeq20R`Cm)b=ufSCX6OFiyuI6<`V+_7
z-p>E`-3@NZw!wbAZuNfl?CtRf-o7bpoZT8{;jS&$*ZwtNTt#!2)Yv~?kMd}FKjg^Y
zw^o^Nd~2I}eQx@abE!}4JnL(0J0JeblNWaX{mhT1cQ*fYqVL~7{5t80i)XzTp1GR6
z;q=zCS5K|@YRLDB59T$D_-@_tyrRn|(|ZM-@Vh(bn@3-N>%g)>=j$d$2Gk!-Nv*v-
zcGdp(o<CW$O6*d-{)_k{?|kzzM(WVPKf6GA(LLs9^r9EO?RB#H*pMC0-$kze;?>f&
zMXwAUAM&q<23lTw>&cH+e>y$u-+%qyZ`C)t#@AcxcfWJ&^JQ<Z?iTjeyJff51{H2u
z)6KQ?ji+}Fd$aubwf}^UGMe2pCas)v$>*h9)3KMYtkqRrxG~=JJdR@hANJlno~rNt
z8{TBhkfV&Lj>wSAl2SP4d5DORd7fvI%!CXPnhcqR$UKA;4T^(I4W>#op_B&IbM1rD
z`QD$;?{`1<^Ll>&+<U*)xz>AMYrfXnXYaMIwXRyOuGm<c3lVMfN5iKpw}<vUei~-*
zAT`puP%r8LD@zQW*I;xGeySv+30vGlW>@;vE&pn8z?%vUM*eGzW$xv>y2{H~!xoB!
z--s9b9r4Y_$<`O#=KqrOQQ<&t>5t&N%Nea#@ZPs;U$Iftv=+(LoqiZzPy6KIb?K^2
z)mEF-s*c#kS32w*Za%Kc)I{-Fzd`g;N@GpjSWCnN$BoD4CT;H|GSRJ55L^3}hWNYG
zrSGrRG8$!AC5g?C?R$FMc~_&<@Z~wan$9>Ks*^SoH{3~LNQN8QhSZ;pIDHWJAD=K}
zus)h?#HRaAq+n)CHp4g1FJ<y~+fR&_7u~T}pz`wNaqoHPajN_r6DvmWdwsra7M?YR
zcczzJKFRw^8MdqPo=Omv%r&u`V|No-Ywe{s;*pr^j#9e9w8!6OOwAid#bmrZ)E5(N
zTQhOsnTbwPuPmRqe>B63*U$Zr9;O?4C+E<n_a*m>!2Ip(4AtEtJ56+qvZg+}tDQ=v
z`gG@Hk=!6_`?9MxK6|e~J=d8|*7WS0Q@eTDRDLuCV{xQslNK44W>kw09o=&AsBAG;
zUGg^3fu-EjPQ89xHWlA5o1{F|8fkHhqTeIOyq<+)+PI-)@!&X<X4I>WzKPHfM|$Dz
z6V9ssx2|lW>%QYq<;{PG%u+L_Vf0g`yJGUMf#ncgyZ2l7JvP+hZKUUuBd_b4tIW@f
zrR89+d=hqQ*nWRXK)=A^4!6_|OFYtc$rmDGWrb7T9Zlsouu!ZKrTjuWUaYmfsdu69
z?fBWBryGQn?O84wkb3aGZC0K4923^OCldPg$&pt|)|YZ*oxk3R7+`Ubyy>+mF0gx_
z*^3I@NmIFB2HLwaXFhw!##b=U?PLBT7fyDWSEhw~$1Eo<;K=!F!xQoMD^10v>x|!-
z_q{w)8KSE)$oBS^3#YUdwQ|hkSF>Vw!xIxd9%a4btNN;!eBAIw_yN(Q2O_AGil*Jf
zcTnAorgJSkP@6v~cjIRCGPy9n8jHI2r)wYmc8aBAvf=_-1v0mdW?(h$Ed~fxsJ6G0
z{OB*R!#Q!7r!NKW->s98o^AGFf$JqXo3oZh$ndAcKC4%6>c);APNeSGH(MJts*E_a
zaJJxIi;l-88Cr{2ejVCLmgRKeM&S+0k((rKl5RES`qWfR7qq>${o?N_z(k*@_nEx2
z>ES5D+2Yo+-O3m?DK5W)P+z;Q5eAYVi=P#}UKj6q-`}~AZ={mWI#;s4{Ko@xj1t9r
zEkEni3q5Ce6raxEzS!sm3V)T@o{D>1#iQRgbm7fx*VpQVTqPPS`gt}=N6p+;y^9B*
zNb*MRJ%2V`_otB1`9=et<*}J8Mo+T@f96Sv9wEt+t7>r=rD@p>*szFZzm$pRn?IW#
z`(Zq*mML>&fs-QKMbT2`QE5+nS8vI_5GmZLAv2y^Zq=v#f`{JUzwJJ>&3I!~?&OQ@
zTRw&b7HbSUc5l8;?|;=ax1(`?R|rYy&yq_o&ogn;Najeo>2V|$G22CVcs`cdGv>ZW
zt#Kf2K8%d|+;l_L2{pRB?Lt*sRb~1W1dZLk-}?MywlKwBZ%0YxgP<N-pES!xy9EmJ
zF?9U<Q;MX&r?=d5o?5So()Bi*htp!xtaZWOESqzA^iN{N0-rYIPYlj(&*&eGrLNNy
z2&oFb@v1?PGP!MA%C>q28>dR_hmVb(s*$a@G4{ugPP#sO@n-Q+tzN`H)Sb;PnT9sb
z#qB?=z6QnF-g~=+#8k(c!e#W^rbE_esOUaPyJ7EYIx?6KTHsz>vG?>kxZy>g2H7K(
ze!8e11siLf_tqAFlfRzn@}&9RP+7}YIk6F!=St(IzE6kfdaw2!GUgc-DbpK64%{8q
z3vI(&GIQ1})*4pd=IU)acfR39!6rV^hOFb{u~c2Oqt~lwX1RskgJX_5Xku<!Zo67%
zCwR#3DK44hi6=#7KelCVkYTrHRn%#Uy4oGtZ7&LD8Xk!UP~N+;3Hd6KPF<WhNuSAj
z%89O-%Jq<7ij7Ogw6!UTv$NhJ2k1XU*@}#OutKz5D9*jxN>XqloNDprr%ktwY%52*
z80%+s<69eEFE_>pTRq!0&h%JNEny(|<M&6Jwp!OMj~=Mi>&a_Dd>%E6OsS6-;0}$P
z8_w^$?K&{D_+7zq)=9!`bh+F<R{60-1749#&|7@NwwI+FHIF}|3%;jI?s<@x6j$0x
z!@zKl78`BkP`eB39#!3F_lUa3@<q1!*jIY~(R-Pd_{^PmhKp;As}HdV)zF32-!PSK
zZ*nPr*ARid&{kcyp>B%Sr>g(L>p_+Mm;3#%kv-vI@_x!3@!Xn*G0jFglFrphCdkR8
z_yv70O)B-T%Nvmj-jkGBRr8xt6=SIK`nQvOaB!sP__<_dWEN^`-_7PC>FMT7@#^QJ
zt$wEm1SS|B2btJEQ-AQaaojzzb?z%meXD{+W#Zt_P~J>#UuuZdNXKoR@ehaln(Y?~
zTa4^wYbl<oUYFDup%Zv~ZR1u=$qnkTb!U*pxW(M9V*BwUqHc+E%8spp-Imn}Ep`#?
zyWIP84m(UqKA`nK*G!|bVJ9hb;}LQm;m#)M*6TND_ylT9&YD&`k#!9JDyqfzitZWB
zia$11vF)NwN99}V4?Mn3d6!6CQ#W3srYLzsFDdIqX&*(77;Qe+rXD`k5VYk)l|Th;
z-Bziy{fQS}4z|(-Kb@<mc{0u!J<$JX;n9@5!?WryJ03^4g|#w2{M^WM%)QcolC@sN
zKbFd5`qw5W4?7C!`xp`$(<IxhUtg>$94(!H4KTa(D&=gP3K*vAf3HmzVX%Kgbw`ms
zk0suMc}dMtMN7ub|4Bukllth8$y2#;8oPZX((@%P75Zb%S)D4^dryhf{+hjU;{(V2
zrj9uM>QoW#n!Lg$yd?R<VTx3PF(ZDiQTw)PyC9+4mg)^=4qHigy9=b%(6sKmMVpvw
zLO#A#kaX@0I{w+VisHm1t-=Ka^>5j@bdsI)UsN(QDT>y?rQf+b8b{UF(X94uZYJ*e
z;%IkStqyH%MTk~bgkWM!CP%M&2cw?;C>KM(qQ`*c9PX@8#qg1RwbNTTGHZv)BO=qo
zw`Lk&L`qmI1;0Hhk?g)O?QdrG%f*G`5l(jep$UD~xk&CS3E51~i>@nUTTA>c7iK04
zXFlRz-5QJFe%yK8*37J;R8cwmjl1&$K0l8ij{8NOE3msw=4dFX_b_ruxsEGKe(W-%
zy#CI^z;n^rR-}3N$E7Qx9d)NUQhbvsb0k=@TfWmro@v@uG8TC7`ka*a$G~4sGpen)
z&aEepj_p1;AE-k<YZao{p(7ac#DJqKjVX@g41Kd)A=gYqo78BBR8A)yXY-=w#`L13
z&1cekOdlZBO2eY6Zr`lp{U`PBH#M6X<mI?9#h#HJN=c{B7#q&iz4M?1^LFxE|EF)=
zsa{sYrp|%W+vE&t$BcC%vzh4`k8Wb(V&j(bczlQpchUBTb5Sr%02p;s@6yIg*^s1E
z<gvzOPl*>j;N0Ev!=jvf@>-27{(UxMgkUuFb(edp+*k4XOs~I(DDzL*`a1~A27Z?0
zR;}Mgz14?|ara&g{gw}hRnJrh+Kzcxgv^P)n*R9n=Z}uIL3~Q^gYKL|5pj~=E~HR4
zSG5=f6c^d<myXEP*qK?fk-GNVJ%)<z*yD3%I?9VK^sb|_4}Ci56F!<SD!j&Vk=}Ii
zxH;mF3(b%mR!J0`rYJyaJ6pC!Mtb7n*d0uok16=iWSY2)jxq`AY^RkBInKLP@RAI|
z@vJcuVa$mT)sL^RN<Lew-}h{>llk`CqS0JOQQGIx^uY?smf3oaGsTxg$DE^J0^q)L
z;JX12)v_;UTiqv>cMI8#Nlu>Xq|AZWe`~FewmV6$e|)*Mq$6J>GR2-hJBQ~*XGO!0
zvFxuyA0Hg(o%wMhw8XjP{B@Hb*R!c*u0~3o+QY$JxtEe@Vf$`nF-lQ?Z&i=U8a-$H
zry%7BNo%v~{@ve(wfiThH+_W(fQjMAGuP4?)$7i1(Ok~)xEtAwJH3I+OqpHEg;JDB
z_BJ0qeU!aUrhJG&$%Z3=-`X{;y2HYxI(KApEt*%;7hNu8N`Ly&0NJ{%BWf~iWp%zM
zP=7>iQinzNTZrL_VZn1&4>%qPo{8Hmk=}fGNApYyMb0SRJmlkB72A$-7u6IuU;P~6
z1B{Y0T-1~$RNMwm7+G6^^rFBQNiC`c`6*lNZp7{8{m|Vq@dke;xBbVM)#&sb*Or#a
z8+1kZWuCYQS=p59As%?{M#pZZFY?pM(#L-I2R*fQuI&slS$wZgy>CfX%CCXCqAHg$
zdp=I~fp{wS5A@R*Lek;1Z$soGH&W$RV@m4crxe{CZ^+IBUnkdLj-ubJ*RZKiI*BeL
zYKZp8+$1&oR~xF4RQ-)vf*WZ}RSt3R<aum+aZhE(760wqEw=G*6{aa;e`k4-_3C&B
zn`7-K#=RfzZeGg#g{k5xWboEZVLE8CWy?<yF6M^BAeNvPT2fld6Z@0)3`^fTn|Ofc
zOQWpf`-3vkku(R}4;(&3s%tB0&T@3$rIYS^AK#LcU@ajLHEN3#IX74>HsJhP97FPq
z+xcbku9Bo8-Z{~qJc7sWaan0;?#$smft^0Tlau=+)9!#8K7ppO9sJ7{%6u{#Jq0~E
z7WY*9-4gnA_k!@gE9D*+&a`_TeYNDh-MGT*srY&S)Lk5YdO89=EDK(~gBO)TPCpGe
zrBSDIl8%ZwxYvp^Fw`eMKz@5_5LwRs6J7UzxU>jWx`rsmxJ!K-bNiM&>s%Y{;^hDK
zn1kqHQpb-{d#$dWqOx{nlC>1LYG*NfQ_r?=_>qmxjpuedH#FH#IG#}*?#8My<+5n#
z@6c9H@eR}&vtHKbpzhW*sXwcg`K&<s_JvFpiur3wa@wC2!?|zb9*QZ-Z93{LuQt6~
zAwFT7!GeSC5phy`Bi|Mo!}=j={V(kahYyrC>jrO`(rXPFG@05za}29LZfy51`e=Sk
zmD!sV2~+;>8_eC6OpcceyH4)i8alD$SwB_P`~JCi!RYkCYSULgN1b0b*o(agq9dQ<
zQI~rE0=wz$l`O+|7K@fM!c#A1-^C8Rxhfg=+R^mJkIfD9%YFTKerC92{W?NX@{OHg
z&-am_tzWZl%YQMg@coF)s($E*I5i)6h-X3B2(w6yOZ(I<khgT^+_%p<zaEYTm|2W8
z?K673e474=%=7(Yo}XIAtFz;ued6qYx=-Wfuruw*P>J2#qq&i~LBZ=`c&mJ}zMLNM
zfoTt?er|TNPV=7(w=bpfc0Jx5a)(t;t;5Lh!L4%#zuz1PztWDGIoGXqt@wUYXZGED
zC%W#@U=|)IQu;iMc2($YA7JkxZ4^womM)j<y6k^eKwc<ymX9sHQ07vGjltD(J70fD
zn+Wa9Zn^U%E2O;llGNt(%ijWXGi%+s&-;^az9`zPe&J)^$up<-iX><pr%a@qG*9Y{
zcZ>_Y{5D>G>B(s_weZ+3uG)wTHnHJH>DxlLS5AjLecTtB`oJJcuh2S%h4n!6pch@q
z6h5aI+mumiN7i#S-|cI~n}FbJ{EQmq?q!T+<z2gq7Q$Ey#oq|$`yTNtsF%g%eBr;H
zdqCl1Uht37E3FxqYj1nwYbe-W)yWmL)`velef{AR+UiYJ(p74ktSaMek2DYObZBBy
zJ>H=InW8b}l4#3VT+I!RiHJ56^T(~367SIQ-_T-jTS|R5p0W1Y`y{IjqkUuZV!ND=
zKfOFG)!13XH+PasC(ixGgv~Ha0H_bOHGFUyc{VZbFMiaT!BCgYD0`+r<l8rf>@D(T
zUp&W8wBNPAQ&jHjMWyht$DQX~`6&-U3@ejte*O0tR(uwF?+ou1?<D!kE^HZ9kjlLr
zv1>A{iFc1}l(w(E9)sY8b)_6L-X5ooGM=A0^fDvHHae#7*@20g-Xt9pe{nw9*Dn~N
z4<Ge^F86MP?u%ZV!@R(kT-A*1+a^0jc28v)>6}t?|9s~YRqCKz(Mi|kcGkVwc<nP>
z^#a-Htew2OPvtcIP+=p*VS^bKlg<{a&MaNra`X^avFuUNZOL_~bC(9T`1LxK-7ntM
zdWv$A;+93Ed5%Z_GzUxlVo8IsCe!%AzK&N>jv=8FC%T2{Z~3b_chhaU;$7u%$CB(0
z|7b&wrlNc1r{#fP$?xrSLku79+e+Wat5ruX$CqC@*Tq2_n-}(^l6}AZ@F{`*fRt3X
z9gEUDOB*6CB-^D3%f|Aj9(`A%XkkG6g;I38R`Gb@LT}U0v*T}-g&Iy9Tx79-%j-ev
zIj`D$Pg8j8$=6U3Yo%95oMm$^4Mg1edQ;MYB`|K2*9)_K-KLYe71{>B<UY@2?y887
z^=95T$4nM3_oYRK_cG_~4({_u0&wvY!`H-3EAPKEu9H6Uvd>&aH>C2{Ted+fX-=2N
zG0N0;#b#f5BqoOQy~}!(toOAl{DtB114l&<6eUqd>=1XGri;EwRePY&^@iMJKKXL=
zO%^qN;cK6?)x~!DeT>V(q-P4W24FKrw*@TT(`Z+%5bFOy((Z(_D_BZ5=g`@`KhP{Y
zJ>w<U!Urv9Hu6uyAr`N!`Vx<i)xGJUPCOh`JG;*TQ69y^1VHS#=xY&c!=#-<Uo9^<
zWsy<B1V9_f&5`mNH%TTcYW;0q+7}9X_<z-(h{kNXGwE}dVf5kdvesfLHjHv;fgjgM
zmz}Rg5D9}<Z^h61-uEsV<uB}<V@+52QNF)K31j}iPwPEJ&%$Zzr;0phY`)-Tz6uBG
z;ZnCt=<`%Pesf`{t@>-%ER9lb0^2;jRj#HZ<-v=3t&zNvPtwnx-zy~aQ<uk}@qE_I
z*m8oIC!@q9vww-CP!A?f?dk^EX{F|fFzoY*6u)DppEs+`8vj^0B9rM7PQm#|#!|5>
zzNa)~UrF!KDV&tsEgrLAzth#X@4p{1-ZtbunOn8-<Cg6&G>QYmHg`J?U-hTI-q?|A
zN)pnw|5C}%P;RF4FC}v%X%ac~+@kH6i)0>qcI<H<+mklXs76f|Heb~+eJ+nq?Znn9
zq3sI&GOFL*j0I<(e7>b;pHldsvSf!3ZBLM0qh;C{ImN=7mVpas_<C8o2)o$2+50$v
zO0117=qIdbAfU>+sQT;5Ra9?*=(>-)JLtK4VXZ)21MVm2VL=H$RIs{&iUHX|<&7{>
z?f}0BI1vP)Zbuj>K|_qn0vr}_4p20FC^$L56Tqhc|50#Y<%c>M*-R-7{s3@Nfbj^1
z61D`S0#$b^KERbgApxpbaH@dkAwC)S4Zv+dn5dpZd;#!-@)?x`@b5x=I`D%U78N((
zVxVaFNN|dPXCOYB9xS(@;sBh9Y@yT#e=xX%fJdM{EZ_$vTB<#O8-UV+O8}<{_zT2`
zHMvxvu}H-T`R76YT;PYtEh;hK--i5Yzz@o$RG?-`oez{0TsSy+z%L*^G$54;ICj8k
zkiP=>gTNgC{0Q>j41OnYy8+h#McXqDoI2n|h))iFLvYN998_g9r8xLOyPZlB_zxie
zP2jf!#{;+wDB9l9;FJNsh4|FqHwU*J@FmC})S;+Cz{vo93i)pZKWG+Gf$}4D3s8D+
ziQu#WFR#j94=@JmAF(QbPr#zU?|}5t@`5T26)410Uja%2E({zF@D%XT^1xynDmK7p
zSLGiFct7C&Rrxyt2CXaV>p;=+o(87|_yfd8<#_}g6T(16O0pt<Q23(S3;g@5@&_dt
zs$GCffuijd1x^X@Ylx4^-wYhA@TI=6D*uy!4*`C>Dt}kNf`FTVqW$R%I4!{6AU-O8
zw9jmY`rlfWzc*lz19jJ`{Lwb$0$d0b4Icqc0q``$N9BJE9JDia`l|d-0G0+kv?_lX
zZB)>&sq28E{V5)t2H?*SAFYoOIF@zt2Q5sheZcQomA^e;UcePV(fne-sQ`Wt@zM4K
zLpW40ZmF|Y<$nsWEa0(K`GXP@l`!B|plE+e0;dD`=YKK&Z$kR0{4Ky?A$%@S1Y9UM
zIlz;^N9BJM94p|IRrv=1mIB<jDt`ySe1NNfqVkFbrwVuh;-m8ar}2MpRsJ>*h8x0{
z07b(`f>Q)M3-QtPOu=ygKEEpeV890fkFLt!1@IogjX-I^C4kce{1xJ(^8Baq-?=J(
zD+sd_!WRG~1s4uZ9`H+ukIKUY96R81tMU&5d;sv^s{EY*?*?286m8EqaO!|RL3~vH
z|1|y|uFBsI!tg-&a-e8?M}t!a{0`!y@;3*!9q{E<`G)|O0sL%L{%(MU0N(&g4=xd$
zHsBxs#rVGk>7(Vf1jh;C^MI0o3j>D({2cgbd5poa0Zt_v{{yS?cLY8^@T-BM<vk5f
z4e&>ZkIM6(#((#!{B0r3E(m`WDB508;FJKrf%vHW&A@E~d~sF&CjlP<{A5-Bu7Cvr
zHv^>ucLtmm;O`J0mH$7D|2wPlw}voW5WWZ~8a@J?0^nB=AC><xa9aUqtjhlcU}?a^
ztMYdSEC9G3C=IxHa2kM@AU;~3e;WV2tMa#pFuV}{8c;O97;q|p=O8}Xo@?VjdsY5x
z<9~cr{_YS)7{a#!-2^TPoDSe$2m?6@!a`0$vY8x%Y$YdQz>t$8Y~&<lOyoFZ8###_
z1NjDom7Iih3pppkK~92YB&SB$$w{b~$-@viC^`c<DZ~$h_-tr=Rtz~M8lQrR+!Bp%
z!9Y%i#^11oTojEj!bnbs#;0W_zqt}0!61z2Ed`99QiH+Yjj$k}26pA41xvwnu%eb8
zwv~Vq!?TRFyBE5U7Q6Q3<6w(E#QeEVSi)qza`iu-eY~-tvr0&3<(cU3=cpC#+VheX
z=<cuP;ziJxUl$L3;96y_C5fPqRj?i^a4ix+t$g)S%sbH4%H75L_p_KctOT~T!CJYv
zgWBv$Ch%wTr@SkSl?6c#px<i?+PGfUSXW1HSlnmr06O+7Yd}|duo&3>cRBvF#ahg@
zHd?8(|H^_aZ_s)Eoerw->IKU_(8W!lH|yYTgO&zCu&axQv4q9KSX51&urLHGx_|#(
zL0EOR7j)IVoUu3?7bqeE(jo)NQGgVwK#m(hhIAk|46+$vLAD}05H3Uj5l5uKjFUcM
zjd&vwNFH(vd5)06?F2m-h)xW|MNh`nb2Frbo?BK=CS>JgK<**8AwCK8m6bA}{fG`?
zvLT#^D1t*Qkuc;YLP8QoLPAQifrN~Nf`p2MmV|+Xl>|#7LLx_Eu|EH`JlFC<b76*)
z1x{8t+2CY{b1R%2aBhQB4o<Y~U18<3BdoB+{?;-^^@#24pn+@&i#j1A&{h7k;$~%~
zAwuZ6t07=LnJp+4{|=9;hp(YEo*T%>%@%r*jU!=wFD&Xq98%;FQ*hizU~@m9a^NJu
zVZkwg`;xrE3$>e2p4aHZM7&3G?$O;<OWtkJz8<$56dA0?6FPY8>jRDqS4OB10TGeQ
zq52##Ir4yCuVA_P<2GTsTN$#ckWxhWoHiEwmXi?v*=qPJygLbaYy~$Z(JAdJ$73>!
zsSwGnm<`$*WXLpTPNSluiRonMXA8R{G04;M2-PcXR?Yn)<CJBEi^!{~!^-tVZ*Oo3
z2e2k@Aw|W7v=e?2<rE@(mI$X3;WQ$gLxgjQFrEna5#fF!JV1meiSQH=eolm65aE|Z
zc$x^$5aC%O{F(^AA;NEo@OvUWM}+5z@B$J3K!iUM;YA|+i3oot!b?Q>3laWGgufBt
z??iZ+2>&F)2-DyFD|bgvJSX*5hN@r4GZNYds-aoWV*~c~Vk#V=KMOHh<$Sg%8{LG*
zobN{3b%qo(t{8r%zJ{Y!ja_1XK*y}il&|%|T+H>ka&!x&0o^<N#JtV%Oom6K+O0bu
zQ+}xJob2oQwvlh950es8E4DCeWY!@pv76@v9+OZ4<5RG0Cdjs5g?AnHh;ul(xeM~U
zh~{@>5|MYIJ>3cT!U|?SC(e+@*N;iw4><9S4EDJSw&X((rowimykR?PtsU+{_)9C{
zCCq6Sq@NYZm!1^X?$oHfXm>VG8{?HNSGV)?p&QJd;t80$s@#ozn9M;4Ul;Q@XJWa9
z<t-j_h5^dAiI*+(C!;GSuorU<Uf0`?RnRb;npYR?$734hfxm%qlBYuJ7-a*DcP5BG
z%I0;KcIK2y2k;N9@N??vJ>MzeF=y2g?6o^(S`&C9#Cu))wj;?@>+wXv4*K;N@ekR&
z9>3hRU^{t&LAB{}zvo?rJ<pS`zlp~m#$)OiA^%~Dx7>wuiL-sj6w~T`zV`^_vImdd
zQsW=MW3GAw|CUT>)s(=9jS(JG;)aGNzal67;rsmatqhT|aDS6A{1QrpbLg7y8$IsD
zocDq94`*1(sqZ`ZqNx|tb`runD!)f6+IkCF{`3z^-e$z#36Ck*i>8masuaof|B(h*
zaRuk#NK~Tr`Z3LQh(*Q;Wlc`kb18mj`!HwO0goShWK9&`h6pc6wr_~e#bd(NA^&3v
z5x7D_d(SaECSvOfwj~Om`ed);4Ce#Q*2e7TcY^qX4ogXW8CdSa6gIBpM;6@j#$2=?
zQzyKF<yzA<O;e!01CXBj%s#o7DV5J7dND<tSL%<%kooSI19`_n__4CD$eZLvIY#I|
zt9U|4_i!lmpVL>Nz8x8YQwF@(eU$$2aTXmueI9+7dK2g$<TgK(3tVo?9_+`oPQ$(`
z<oAt!NO<Iwx)`XH$!1*fV*VOOrb{{_&jI{B5We_OE~(A}H^&M1e}hNdFJzXzx-o^R
z?C1J0Y3?h37$RgI-}kJ;p^kyuJ1_NNie;fZ_byvDNF=d@U+Kq0cLGj)eSW0&#h#>f
zIOooT-ta4ZnB;K8f{Hvf{P3)i$JQHtnA2=%eeOyoeEyKSb=v?Yj~;N~)xJU}YraG0
z`Z2XbfJa&JA`83f=Tz7k3KmE$60+Wu<!)=(vX?|uD}B_Z?VdgRdHVQ=A(A&Qs;6PJ
zZ`gT1xFxQ^a`Bg3KjumZ#J@%5$r*n}jNgA*<D6!)fY@cjN(mx<r~&VX@TC;_8)*xY
zsd@+A3hm1?ywuZ=$)*Q+bVYxD!B$pLahgi0vA#JvsCDYyUZVKP9FA%%A?yq#9O(Vx
zVaX(o2Yub;K1^;8<Uee-`M7Pvug0(*orX&noQqsHzl!5EQr?Q|$3&p_AE;mRM_rNH
z%w9}$IP{MjJv7xsxP}NboS7tv*XqYanGxF49;uyFlT;qSWGq2?O89EC)C;lOGZ-}*
zX}QPmO}?DDvT5O``Cba`)Ub=(!%Gihc~tM{pT8=uRhBQx@@d<?SR~JJ^w%pGztYej
z;Qqut6}I2_(*P#%0Ho)zZ*Uh8<{`qoMEGj;8xDrx3u^f+XYVuL?vCIi;y=&lR34i5
zR*Ac${OSaYs$8z}^FjS3F}0cvN<N|V+?n~4ksG*}E-B>Sy_&*s_*3*oTcH!!M0K6Y
zEZdB0cZ4h1$Ump)@^Pz`n)I1RMu+atzR}*m{mxV=VtQ~tt<KDCmbsGFg>Va<vynPy
z>P@9*17h$}MxT<Ev)Y;rJe)?B<d)07`PVyYl!p0lFrS~EnIIpE!F2XwPNV-H<T!rL
zHdFfJeK7t>R>prN(fuv-mxQ9`+@Jr4_RadPRtbHW>krZKo`Au&UwYR_1>=(ol`osu
z+eF@kt1^9<gvu3pzq$6RPYCX32>}FLv)E+Ltmg{-p?rmJQ+Uwl4IRXX4Pw#wH6b?(
zZ3Tg!w8Hl}YOvqR(_FbeVs~zg&RkgZ4Gm_xZ4+7-q({BdRXQ3NH)fk=ox@}D@}WLd
zJdzB>scBMh|7cN$`nXJeVz6tJ+gaO(sjdO+_TyFB1t((}l0M8Ci52<3Sd^Lk0RKms
z%q#helYR^xukXj?Nw3_`W}2BEYn>a=sa)Jq+epKr@lDgp!au)CB`)!RI$I_yuVe3a
znFPaht;@#Bia4LCA!(kMI$<d{l`HcvzkBrL<m=n-Y5I#z$<->P+jecwxu_o;(Z2CZ
z^KPXmx<GuQU2u_4K(-dGHkn%b3AxICS{aQu>P6u-6{gBLTksk0C0wlqwU_<MhuD+~
zt@qt9qzH@p5^txVee=3n#yubZ$l=I(DIDjffvRNn<`UlS_D-n_O5cBKoRpxDD`+jF
ztu*vJt8n20pJJ<#T>jRhL4L!pzADS<*LTaXYPM?IJk+coDiau`b<Ys$Q;Pjn*%#d~
z_N+c(=MPN9bM<IV=8q{G8-5;m&{nhOiKcud|EbvvF<rQ3?8!!_#SG0R26IU&1u6r7
zvr|O^LbntPuUsu8Ay?PCrGLyy_3BOSrX9I+IOS!wuy);w{x@+7(MRH_g(NbATsB0U
zZs*mIOQK>BWO(|+2Y+GUM-taH<?<SrDAf&)cPy9uS;`&av|?_E)Ej>jf2QAdwe!>@
zC+;*7ZROr^&-=^`pR;|vw{X?wRkBBljxNrmiWO?xJyFdG9QVy4r(W9ox*+`FXs1d#
z|D>6)r?#8+qx~d5oj#~VCm*_YfBIJgn-L~oXlR>SY49tJ_~(`ObP}bvH+`^Hy*BqH
z<im8+u5h!fRyTj#(kgjINw-bSEaTNa`NlFM6@?VN$^;j&zNKs2s_$MrEmjJfS`M_O
zl9YH7RVVY+_OoWrf#-9!UfGADc&ith+<SE{A32eDipe7-KNnjN%JNy~1}n3-LgzK+
znK16Xt>Sv}O;Hw<_uutiHuKvgFx&2lOHQOJ#5Cx9mX3Qm8d)!-P!wi@5h*gZ_Se42
z{)*I0yIxVKszNWbzEbq?(86^i)%>2~S6#19@{%pae^l7^K|Yn-evF21nJX#E#e65d
zh02AWuf<vFJiSH2ro^{v`zc45WbQYWzSTS@XA=B9XIUdgz5T;P<F`a^t&Fj*Q5mha
zltm>yY$J<*YN+eHlZN7Hqdb3EQY?MZpsh9Crk6@FpXmymopestS(_)f-PBgQe#y38
zY@nZ={N2KmYxWhD(hB|omacg_j|FWn!TdR$Y@Ry$NcSe4liE`FTTK}%Nn5(F@K>L$
z^&A}0U~?T%ZOxG1iKU`f*mg0Kwf6imrAUse!9FjZEk}QUQ%C7|5O-lor{n5;aA)ne
zEn-F)nexq+XG_LP6@MLIMYy9ZzpGstQQyDYLLg6+wlD6<?sWO$r57HIV)wkv_aVDA
zcaEtw^eNIU%^iA*pK7`}&LE-C`Yh-Q&Ca093|9|l(R~?LD{D{?`Q#9A#H-(ma${$u
zMqaq%$%kGSL+{)?J9a9<Q75lCdRi2#&Q<MrpXt5GO|`N~XY*TL*J>TQbg!TMG^t&9
zke~ilU+E4x^5olrT)vu-8aC74zIZyPm1jjo36-lBu~R#C8x}rH?(KIJU#{1=K>Mb0
ze!1r06~FQE-FL0ElAR0{%apvM%Iv(xea_meo;e~tWH}Zic)o``kN1;+T0DD*-?z-6
z7oMY*V=d;SI(a27;it__$&#nE_Q^8ZDy7)$zkSwR`NTy{n?nsdM074HefHow9@tKH
zVB5*&F(%x(USa;n{Mg5w^ZAE;Pn4);J8Q&TVQ5J*Pz^Bb?h;TAbBukiTh<URBxzQ(
ztXr>Bwx_tYR8%q5z-|AD&MZWsbt8B9n+kTGa<zTOvTJUtMZ96!x9Nszxa6+3vEoT%
z&AKZ%rDzqW*OnDJ<Re-!Dxr1Mq}bc_$S*Nd&CAV|3bi$YUN5yv^V#=w-al0PRQv3(
zvryd4GzpT4s2f6<?FyOFCz#5pe=V@mzs=0VDr!Y5+GV6NT?tcuA@=^hXp?%FPQjc0
zAFk#TgN<z^U7B*&uUEL%T~l)i-qiDvMD2lkwCdm^4YIkUzI_|m?l*Aa3irFJ2r_5v
zE^U|G!+11CqYbZ#AFsN&zm`wO)bUHCcA~|?w#H!7JDCBYMmh;rip|!ZWL%+D)I7s#
zCpiz2>zptB(Q!{j+3+a6W3}b1w0vERlv~?~*#4mnm##IQWKvJF+1!?0cVYK;dmoyn
z$O`qGi%j(l8P~G#m8a_l{F*gmmX4ay(@uC;Q0R;?d`r^EPos#(Ugx6xn6{5rskT%h
zkN=jBNavZ|U9BhfDBj(up7O2d^QTKca>*t}hhiQIC|)))-}pwy-D~T9pP|vil-d#6
z_V=P0K3)!&;SBxJqN5qh(#&hYXkYTyLtt#_VygO$L)@|fVUNx_ESGDP-DXzF$<Z<^
zb>1W+!2MuX@C7}c(1{>^zMrk~7rQn+obr6BoSuB_VYX3e^{uEDS4uN4%_9F(Zv!az
zP&7)+X+#(K$~DE(3S2&2lC&5WHhh}vg-VHqMN7xKRGP@zZljvn3YA>!?Q!wFV^hyR
zcD=(zQsc@$x^U#wkEzg%gpZWIdZ!j$KRvm$<>Alpj=7u(3wq^LpVzT^2bV+Vm%7Q`
z9Glc?NluPXx*htt)aH0I*?g^bq85)Yo1KJahPca8^|fK8f@~ADS#pJtn>RM>Two8E
zOAz7PpN*5!-03XZy|k-AK91Uejw}D5u)|TG(c}01)KeaQ%H{uF>4&h)c)fjYq1?uO
zQ2K;TEQR2$CC<|K7ZsZI_BFZ>l_<o2y{gb~T2Q62XZm6||2$it^}*A3l~}Y|*>+05
z+WOp9XRO7RQioS3qKJJtfBfXL_$RY9O%nSxYacM@-q?fVfZ2S)(Y`{IdspWp*YL`0
zz@Pah_{u;y*7)$%>n{vnLH@$n|G@D51&(&YFQUx3LVshzF3RipE1~~{Uz;yoi_b$;
zUIwD{Xo>jLL>Qf0M~`;GFQVM;oc)1Qw+B<o1ap-n{IVoO;YAL3({k+Y!IZy*=PgD5
zL+~|?aI~)wW%#;6INDc;GR+G8ojwgwdK-x`QTPo+eE3{JINDc;GWzWRJ=zJsi1H>P
zzAh2oMTGT;Fg+1wAi~Tm`TWk$!uivnv@ttFEjk}0*cOBr)iGu}g~wE-!Sg5G-L|@H
z(gKNteV9w<;rX*MvlKC`+QmeI$F$Kw`!$UBvqj|`z018<ttMP{giHK@j)c?S=`9ms
zyyM^eoZD0koBet*7Z%|C+s$k75K(z$h_D<HRwTm5h%m$a{qyFyUQFy3C~vLfr<|k1
zB`nG?-?I$ZfvzT5%avZrz88~@&i?`qdh}65#ikFFco40xlxxLjnwEfAcpsky+|l(&
z;x5~nz;$>hQF|&A<$snaeb7oF9PKMa8MG7#NBas<7F(ge<s(jncM)NJBD|XjLx1O3
z-`~}U$~V(U`zAfG9}^=4^9@u~#sWm~d5EwQQG695tV)FM9}s>LEe!2RM(95mx{2@u
zBK(jD_YmP;B20DXa=M=>ye~zg^Cgu=W66POd=L6DIZH_B@u;M#n?&VlC&FDsc#sGa
zti3`Tw6C;-at{&z2%VIdz?nRSsLcXyAGb)%!Zae`XkQ`9x2_yMDq`D*smp`%`JVXt
zxZ;BDenY^yD|kMc@#l@+UQC_{^uL>KwjzT{bQ*qmOz!;^yfHA7xn>HFsjPzb8+lr|
zz4vPHr+|J;IxXNl_UQKF8g?3|eoVRA3dT?9Wo>c;KFJCedB2=+V?Q3#(1+x3UlnX_
z*dod<REWnEcEb3kxTe%@-V(9f9rC-ql3)9n?$vGUFg7?L<Z>_`lOnsqm%T$<xIBT!
zWazHMH=pK;>kx(cFpib<CuQG9jKch5qu2_bBElZ?{<Tvff6_zj5$5t3z;Y|;FLYPm
zbc+3hKM>*PMCpZ`NYFQj_u~w7z82~eINur^S*oGf;^FXuG2(R#t42@SKy@Fcu?B6w
z!OE=jUhQh%`Y<`yR@w(S6A(q|0PVv780J?&;nHP2o*%u%ZpzY!IoAsB+ZnHQ#&za<
zyne!XDS+?}`+Aql0vT@b!~6^#0T0SEvEdB@snl91u1nIiDmBG^+yD03mrh(Hr&Mcy
zlCpQ@u2&E5Jz!Hx2@x~%`c~6ppZ}3vhci<?Igz4LhGzfQlbHz>88HLetzNrTo~53t
zEcoiord&O*UAo=uVZFUWl|ygpwEZX}F2?#i%kKB)Cb_%H@1}{p$A#H?vS{ErjGB4h
zj!4VO%T;Yu?;YiSr2k2;usyy8=I`FE%%4T`bzDk(+K;KiLwR9-{cOaO1yOI9|2Plr
z2lMr%I(!bQ>*hnE+L;__^d2gvUE>=saQP~LjrZz~Uh2V|EeClOY2vrLhAXhXdN1E{
zBzMa4)`_13mDwTLDU=FVg)XvMh|;D8#@}pVZW2}uy&Y$Ki&j}$JlV>_`Z=F^fjwP)
zD8=;f2tIAF=*$VF>Y5(2rZSq?4VC4{?2Rs^M1FjBs{SO^^Bp6C2a8Lz@<dd)FH0QD
zZA~@&HL*uktF}`v>?HfcMzLq*ss#tRaaW($7VQ$fPHAgL^Yi{hqgrl&fN9N{vjvZT
zIK(~Ofz?cSgR@hpEd)L1O0wj%7RB^Q`Sd)-!&9zBGIdcq+?8@KsWN4Ki;9<R^*$B&
z{h(Umosdaw?xVQulR>^0Qdn{4ho4-hy8FP6TJ`e<o1;9MMcA852~=*+Pb*dB`J@!9
zozA1ktq{0a6i+mt7`=3CEJy|Bi!MWZ!~7!M$%%;LwAQ#bc8lvi<lE&cYNnKKRl#@>
zhW3Z=4H5i<rfO+0e$n~9!18%7%rCX4uU!?-Mlspw7b<Yzy}#c)@b-#EEn~uyl$g4{
z?9d0jX8beq*~{`8;<sa_y=Ug0WjH!$xAN?-6EAON946s;nnk`WpL2Ql56-&5C2yki
zOvx#|)vr6NX76H_F%IG@X~JYQr5=q@DVoIbdg>jaNegFS!;$?`58eE2qc;uB>j#^S
zIo}vv)wyc&^4p2myImHB=eOBk=hKR3V4M;oEx66s@+&9Yz)qo+S0?OLB1K2ArBE}L
zx({=K2I|u>bn|_c^tqZ;m`}?C4BumfG>$!gjNH`7-YnIE`Sge-sxH4es*YUs{HWRM
z{unVy?5H5g`tM0zlbhZgV2ArnHMG~p<g(>mFZ{oDQz|q$H5>8z7+St??F)Q=l~eA_
z<rK&3mP1DJAAcCS{=j3-#X<kSmy>)>P0->%)kXP2H@3YmbQD+~U+B{;*d?Z3T`zIs
z{julH#)aO8@Gs@HuC?oNHp!cwIkqW1R#^UocIakroPOA?Tj_;D?GK{2t6k*s*{@Ef
zSZpWjOy8H;u6kwX_c5QT@14z=DWz{82&%NcW6S^SEgM9dRIuG-a2u{NE6cWw)8g2j
z8(SscPjA+4J$iJCn>K7yZQZ~)?af(@sLzFtj*Fz9J5%z`J<8(Kj3l|5Md6u+ajkfn
zKIz1vkxbjAN?#hwCltc5hhETFE@Jz3_i%AjA-#rd+IuhGDCBv}+n?ARqiO20tCsca
zv|4k0UWY+@_IOxZ<)_+&tr}@+>`Ym--Up9g4N5cJxLLDiNMk9&{oWToAF9IV(%xFt
zRKa8ga&7Ei&hd|$_xh=~8NVLLy3!aTpmrxH@m8Ed%o7Li0L5P(MI${%>au$jQguZ>
zC`K&lEaLhOI>GmimQu8T^FOI1`=pr;-)rJ!K|Yw7mqyG_YKA?`RTE|0yG=}4N$)@P
z+_~(tMKP(q)0w<%YPhumLlr|~pqb@mknmZJ#94`M!tz&=h4xu(+kJJ+jL#%L#3#IE
zKdzRUmNFQ8(7~P8tG1u(&^e9Nb~S-V2Dc0!lEoShcmJ6mJ-4G>C2DdHuC`N$cRbzX
z^-i|KC5%*xT3NSF4J3HEAKJ`xTvx{Vtm+jn<1eunv}C-A`V;Yd@O*c!4f_F0#gwD_
z9336^>po%Fn{n!-fYNDSpW>r@0|t_MU*tocTvCWyctHtY7w&RBY>6B@{zS7P|C&w1
zp@6HgUcrOqj~rB5NiV0L6C1T)@Bc9^%j~OmDWNcXYo3RMyd6ez^Kgd7#R#9s5<Hps
zMjCx>%(TB|URkmzekb2n$6UW1X<y6alI~I)&%~%Ogf@+o3m|w*(k5tc`2KcRVVt2A
zzSqP{tjq^TYPR%y$sSfOBs<alF>_Bdj`4|i)b=o?M4jU8+cqT_<sx~SXD;?(;&-C*
zV#V+C+wop%5}t1ZSMbD*7t0PBp&E&oe0W4nykkSI6&;YgNGo6beCedJPkyY|$W(l3
zw2D@}pV)(ZS`XGZ#fLS~m+TbJk_cHb9E+(4Re9;>Q~q4F@SJo>&b0-)py`7}RdEZ7
zXB7IE+nhP@_hpk$ejQ>^jSx$7A@QG5@$uZqtv|F)y>Q@B+QIKX4-KCC;O{QTrrl5>
zCM@H{UTgaJ9eG|Ri%Q&+&R37mZ?DQQ{?X-}9jh9%A#H{}VN7;wKulcG{vGP2)p-{$
zNfeFx))@0NysuYHqO1-G+oal?#~4n^TQ{o`Yj{)M_K3DlRN!#xNOh!Q1grg?XE~%j
zL$+OCKXkBZwuwjV9NsIeH^%tU^PNI6F4BKi-#L6Q&Cw!h!S~{W^35lXONfrR1awuM
zi``Mfp;=%>XDF{5;eIXX?$57#gA~i_v0RENa_q`8_O6$XHE3OGc{V95Z?F(-O4*qB
zNLKFZ`Jp>O43TAT89XLfTG|yeDwXftJC^lSWR_ZDzX`PeHyAIV&vLSF3|Bp5DS!TC
zY!|)8wxjqL2|2sIT~(|NzEgFJYohTBPi(O}Ym8dy*lXIkq_!D7mUNrFRP72$KL`Dy
z_33TgMC24N4C7T}r}KHv@?QL2@x6bDc_Be5L1KeprvH`xu*^+v#qzK(!k4(k37%0w
zs}c6TF}p>rHkTcSoadbud^Q&qcZ5!;#ga#Hzqx&k(((qE@&-d4#c=h~H$CrCzn!J~
zOvmalq+ES;$kOB43%lc#y$7Cnep3&dm%aVtLqS8;Y?1EVy6>L|k$ysshUCXa+a63w
z6Ffh__g9NOXIAuchT;7a^m9mv!aK0+5HBHrrq$r~__@~8^Ktqo_NMXQ573CHnEB~L
zy;-OCV{xUp!c~n}Z;oz`^8ENze~a2O?mLR%QxPmYr7rbJm>TIH&qTEHRI_V`+Sq>{
zZWun&_xXc-sc#Hl?)83~E(4x}Uf#|+)eJ|57?afcF~Q-9uf%U^T$fK6&F!cryW>$G
z#6=&Z6?cWLtz0FOzxNB{X!-^wwOH-%@@8Ub()6bpkkc^-apf(lpK3AH*U01Ee1G36
zuNbN=ciBaWX;zWw|HsUr<Vr_QjeG`G&h@5e{&&?Dc<<gk!l#vLZuBC!V$}QloZExX
z3Z2U7Y<h#9>8DN}WEOWW@N>~<<5U{EG`JzR*lD1g-8WF_irtX=VbTZ9T-{Yz2ggS3
z`bUMX2tN3Il=WB7p=SfCIX5dPW-5<-=b#pM`_eC`Qfn@R=~D^XlY`&*dGckqQZ4)B
zvFvz$iGAFP(+)0&b<&>g`Ppwj*O>ln7w*8s23(TIgz?Ex=}Wh~#bZym^<i4~g1%D~
z`-aKy_byzS7*el!KgCEQQ^GP~`NqpDdV@lW?}ry%@j}7ANAL%XVs%x|`ePc7JxQd#
zWWw<@Ze~oYAlKr{ZfwQU$Elij&L(e_Gfm>=_mtnni`<#lx;*||Jw?CNIea$IWTR9@
zU*N{OS~=qHV)qE=YD{{5R5MMu1mDvP3d2w79ki-+GVZTolF#;;Ww^L8O#e<9r3a~4
zAEvY)-uG_u(lg4FSM1#@q8RaRkfhWubb5o}%d&?ru^QpOUTwv+R%}ZS<Q;O-?8Tgk
zf&ORlsqGFmqwxv9>+;!6itm+~KHPC-aA2$b*sFM&9^>Af)w4iKPqO7k^E@v0`MW$%
zPTR;RK`RPF2MfhBlf`VDH5?jCr;3m*1u|;&oDaWrZ#rg7$G&HtvsG6iw$j^vIeqTn
z)dbG7rEm8tgo%fq>X+zvUuG#cZ_F&KUSi;HQgEt0qJlvx<NUc;jVvv<*@Sb4AEU30
z=qn~VZ->t9fp#&Xs(QfH^#E)_4~GpLd$3w?U{OyX9Eg^du#Jr{c;L_lwO|}LMO$lI
zbRT^5nl|jtx#rgaQ!eObeOnLMQGX=>&ez`8+XrmS__`3%Q1@NgyA<c)<>&(OK~WMk
zH(^g_TPrVLR9O!WbxSvb7xF>VM<87^O$5?H(*frO@d6P@1C5WyMdKj)max&Y4KUF3
zyc`KW0|#F(@6~HYwl;3ItH8i_#i!-&M&RnhzV&EKNCS-vd+z%p5FUYW2!ug^k5~$O
zAeOGe9<Go+SglZkP4vM?0=nZg?5hfTo7RXs?9*!trx0R;xWEbT;iL+P?gj<Kzy#9v
zb%UfJMMxOZhiuT?2=#?3Kuw@RP%o$+)DkKSb%v@#3!n`Fho-`D12rurlxiQ*QaY@r
zK)42$VU)lQj4^s$!N6EoX*H~ZjwTpY0R-1^nxN7j&?JwtkoS+}5Et<CErXTg^Ekv}
z)qgJ>hZwB-Z>8f9)m6V#8V-?L^{b@f5E9Z2WaJc-RMZ=3XzA!TF<=-sZ((9)VP#|A
z%CT+x4lL(RF791CynOt-1@;IE35$q|iA(I2+$XjFfb_vbGO}_wc?Cr!WffI5bq!4|
zZ5>^`!}<nC42_N&n;bJWGe2%&X=QC=YiIA^=;Z9;>gMj@>E-R?>*pU37<3}|WXLJx
zxX>PGVFUrqZqS-V5YT1^-C3Xjlt9<i##YyzuxUA5(?FDv!-zKgYJ!ff7{pTqA2bFW
z(5!!jRd(@K_Oi7_fWkJmhJ^j@!4DfB|MuftKsgzW3%hj_>{AewQLzYuTDdUL)X~>p
zQAi~iz0g<FR#^uTMI9}in)aV7hb2YCCFnNd+^}HQ2=)qI+4kE3YznxdmM$#ex({la
zg0QDF!E^??Td@MVYdRrs7e_0C(Td-?%`SmL8~<!5?PCcV;b@F?se^R|Z(k3>cF;bk
zE-h+=04#c-dmw`s)Tlw%S!l&#2iV|%@`=-J6vTpYleJ>N9>Z8IeKk$OI=YojtqI#)
zgB=SP^00@mjW22(1?vV$!4~=im2lX9e#JTrA^DAj?SDbt8m%zwP;Lo3)5E6Lt9C5b
zl@&H&24e`&7_iMf*2U4;7E(v611j0RE(B{N*05_Zni;edS|&kM%@}loZLoa8)-GOP
zBWKOX4`K6d%RhwzLjqpDsNpGeM`r?4(Zxl}(s8BkXuZYIdZXKH+q${?+B;yq!Ab)d
zw}If$0W3l9cwK|7Z!b}z_WE6Suo8d@@36s2d;7pP(qO#9+E(bl-yUc_XxT*2JkXR@
zEL^Oa-mzKbi%Fq;*ykQqw}!pB*A)SD-#u1J3+agM`<FWUJFbgJklUYllK&Xb+sEc#
z;_XG_d7zu6`#E~~_<}`&-vUA<Nyq>#7mSI2X#3-^^EKRcg`wjRESR8G{9P{5{b;;D
z^(Jf-4SQ&NyF)wJ*!nqIuM4}{Mz#T98VWTXfVRw^kx6K0Q9}E`|J7O;SLk+*J`SLS
zZiDs$XX5bx+%Bt;P-S)~F5QaA*L8KUH?d+F#1^c>*bsUOY;aB(<RCy;)d~g>pw3uW
zd;tRmdXBG~uQ%F&{+9nA4tZ#M5kedOFZ;c%8%WLF4Yf`MbwI-s+VFoF7B&!HF=MqR
zQxU>=vV)r#x;HwQIfDE1?>iBi1bTb3CG=o;CUCU&az}UK#~L~kYN;R~fLa+Kv<Da%
zLvMQMJ$NIG2Xrs^gKOK3qZ^t-(-2mHz!I;uC`#x81I~>b;m;b~mHYtQt`R=O4e=%X
zN3VS4;B)hJaasM~L4hC?=z|givVj7jAY~v^Qc@yEkG&!U8+HgER!a9MEUwxoB4VTq
zYmTs3SZD?7bSxY!;DA3`j{rER(B)UK=7X@R50-wQ5V5xQMvfRL3&ILO0u`0iB>Z0=
z(N<H?Q6zX_tq9V-_H7WpskWofY3Px@&VL5{giPUj;yOR5cK*Jeyw0Dp&VP2DKXsiS
zcKL_<{F>=25phXK8>eW9(^Uh5Xo~0)#Q#0e7Qp_;$p`&u<@`_He_l}~TF*ngz9$m-
z&-3pvVX$sz?Ic0|d*}KT!jV5G*o*vcoon&2|F;wThy1aK!~fqs0M=}+oh1LwV@-l6
z4JY|?lEUJz|IWD<|37>5|L&FlY6PG;p{v=}azxP|KLe~-``<Z;!~b{cx;_j8ti=2K
zT+#dp4GWKmjEatlJslUHa3(P+Ipu6>+PU<M%<~s6Ub>u>os)YdFTbF$sJNu`YFT;3
zwaTjN)it$s^$m?p%`G=t+uCn-+`8S_b?5HA``r&7_VnWW`Uf5j4h@ftK7R7_+1U8R
z<ka&QFQ;G4%)Wl}_TBrr`GpT37e9So`ttSL_vIfyfBhf7i2d`6)_?0o?0>rc|I_*Z
zAGiO1^&<Swe8P+H|8)Jqb`m_T3c_k$c#ngBg;k6iLA7y*NfOjdCd|UvV0qv*#LChh
zU1s9#?(5?q=nSu%maBeCJ1=+>ME_I>JnT9ib{)^f-Oth)K|H{QsgJuLL~%zvyaZAE
zYlOHSuoigD?*>~8xY_y(2H9G=fJrO_3<TOkmZ-^2@Pk2FxMmLp@WEPvQAl{}gX^$m
z4B@(Ukgc@?;I+ioLco(Hp_snjmSATG>I!A?_ID&qoO%1(!uB!_f?#}&kOsUfq88T#
z{cPQAgM4jW&;qVq^YwxWF_>st!z=Xx!*Woc-`8xtd?CsoZ0Ti5i1gPrc-V!6*W$QA
z8xlgT3*!p28(vVkwJ@&m(qs+uWNR4O1>V*P=Fom$gM8o_5ZY~BI$#dX+tS6)(gtj=
zuEhn@YJXu6I0ze3hu3otUn`i+_>-?Syue$cRa{qIYj+oSS1U&}o8M_dn-gpZt>poW
z!yWw~$Qnk?62VIVLEz{V2DGHDx2+(&4+McZDySG7U`xm!3_Dr63AzP>-y6iV?wXam
zGt}*`Z~&kWpwR`_<mu>zN)PQ3K!I-$?_cZKYuLp%0H!>^Mj_g-R>MHO9eiwIdchWY
z)#^1%m;m)ci)ZI$>t^lnJDWB9S30X<pdrDI)}J_5wk~L;R{AMgI<z0ImJs~wu0w^_
zuKyl?s3EM?@wdiX8Eb#W*V=V-?5z2npogJCTf<=a^0yy)o1>MLEuqoZ_-Nl+^Fx8r
zrS!isG{PVM%2*=E%f=U0?hF2|9%0;}LIrc5HZZZ_4t58BU-O0=izNsil3jNVtl&D@
zIii-O&@qd~MaTQ<a9_KIQgC2<d#zz1jkR0}0wQz)u&K3LwsqqFeGR)>If(lE8tQ-0
zE03Tyu^U!t{wmERP#lsBR9jOXi6meJBowHLswxspplXN@Pz6<e#A5Zj<|>w2<#Q9T
z0kQ=snhpXK&2O;>r8wjTfodWn1ge1CCQx~#fk4%eVggl1E)l2+5=o%?hy#HdAf^PW
zg6I<H5kzs7N&r<p3~S>FQ~_ZiP<Ra_P<>?np**6fghQSZr~-1AKsAvD0@X)~fhuXM
zA(=qc4D^u%pxQczk$_cdL!jD-CQw}ic|;1RlD<B|N1*ZuD}ibvWCW^%%s)W+3dkb@
zRYYzRs4`MXpi0Ok0#!j`2~-scAW$vDfk3qp0|He;6bTfEh!Cg=f+f(y2rYpgL6*DG
ze2kG90yRWNfa)76BY2=-Djj)%Ue{JZ?h@z`<n}6U0eVCqhtvR7kw1)-0aZ}dM)FZ=
z0_9u1p0G+Ifof|iA^|{EHB=B66q{%w4y)7@C>mdPl_~<&J*<Wt1gdYSf$RZlf>TDY
zKsBIU8CEgbDxSYDj~E!}5Xy^|X96%v@j%gXqUA>^EiF4OC4(dxEtMeI1~OU(2C8l7
z4rhptf-Zssr~Uh$s{Q+(3X|fi-#&~8J7?&_Lja6c1g@h-J69|Ps{NT%#zA_()3o&V
z!NJB1elSJv;p;)Twt`oZLA2m&3fPI0cMrfp*^~~ipLw7N4UG;B3x$c94bh>|;h|f|
z$zf(DDhf8aMnptHbwguemW7X3O4le9=3QWNMpri$vc>X+#)d*H1g2*k92}^qC<8n^
z{5?GWnwL?~(N@#uhVKYE+B!!JxDf*_T|^b){J%Xy7eH2z<O$!|4(luG_mYf#zsR*q
zp-?!aHQhdsjRq2SKVa(ZWo^1*DpAne&&?EO^i9#7>U@11UA#?UIvf6XY)t*(pB4U6
z1osPx2zl68{Vq}{D7@QPlOQcD=oh{JJbwQA^$WfFXqB$vx)3=+;5AIlmpJwB{NC_?
z=c`8i&5tC?KP&ogK5_m{G5^k2N&0vGo|J#**IxOXk0&ah^R>VEcZv8>RsYV{t^J!H
zyDt7<y&N(M4sH93K(DR(5jfVj!>L9&<RUoqSd&xDx^&R%S?zKt`OP08;veq(cYYiZ
ze|`RFy50W;|1<vY^dAuAPdfNFpE&*ek-z!G<!6EKlxub8TIVNDr*9qa**ZUQdA_|`
z$q#{}VV(cps(&pn;`EbV|0ze-IzMrF_1^voXSU8yoL=g}-}NTu3v5R3mVe|*-2WD~
ztnkq=g5dwBazAJKJDr4e@@ZhlAuZt0<DcRe^Z(5!9w+1ifAfjkJ891fAI;+!`2Q&%
zP^m+M{N@wqBXjuQ`5`9%&cAE*H=nq@8J+*;ua|4H3l8Z8x4wMq`E;&01Ox7$_-4Sf
zB;pg-uh;$W_{98!UVro3*U1sh_k;J}{Pppv{c#8u-1_pZ=cCt2!~W(Ix6flDK5_i^
z@PCi5_T=CBZ=U|m|9{#$AK<F0{EnaZ5?9(`ZP*QLbe;9dpo7)|ak2i{z~=n{i6-z!
zB4A{!A$ftwBQMQMfY>Pw$T)6?&g`_{?l`WC2q|@~vK^$%t`@YeLmkHAu3F1jq+3_$
z>O{I_qee>l`JQv{d-uKYkh%^#yY*zg_jk|l{P~?fzu&p%o_pR&asErf%z1IX{uJxk
za9Lq^arw7hP#9jE{|!2?Fpz(7`gKL&#q#^VP?)|reEt^;!;9tLf7#i?r$o*kzUR8L
zhrfK|*~4dl?d;*JXBCDQ>))POVR&)<mc?DT+W30z5B*zMx7MvY8a7jt_>bgy*ZxP?
zEP?mRn|a<#Z-vb@jbZafAnl@`h0RRj?F{fn;2C%a18J+?4x1^YtwomaTHt*f-kIF%
z<k15Lz;Un{ya0BC?cgpTw~YLfUY;}IO#xM4JUB&p-vx(348Pn<|4#YAyWkWU_tUVs
z1WW_7K_gfOdcb|)LGT244!i<>4o-tfw9n8x<ON;?`^oEZ=tJN>uo^4_ji3fx4Jttx
zocMXz90iBK55QyKn_x9q3KHOI5C-r5Cvw3P<i8DU2J1i<SPGJ0FL};}&HxcG4vf$y
z?}FFB3t$&`2y6le$ZroA1gA;68F~+Br$5$#KL-zhC%^&lHW&uw$HL}PFcZuLOF##>
z2W$Y}1lz!FZ~(jo!pCVVa1EFX8o}LQ1K0$<4ITq~!Smq9;0^E#U?|f?;8HLXBtSE`
z3&@S5OmZ#s#e6V@etr(@1`mV31RFpPXa|cx0$dAfiC+l~gOl7J1+ReT!7lI+*bMFm
zYe5H)y9Jq3z#n?D?=`%Fb+aDY-?So?>SYieXX0AdOcn5xyiXApU(gV5uIGKKJ<ST(
z$uhP$>21t@9M}FemomX3k2c2ilj6k?Z)|f}lVkr6t37?J^1}VSvWC{~Mf^AP1sw`A
z_joDgA*7o{8e%2*Z|j+CY98+|#Cb>36rs6uRm!|<5}9m*V#?Q?$?=a#UZ70<ft;h}
z*7DoBRuxFzSDt2Nje{bQH#tmNy^%)S+jVB6F~ec~FM4mg05L8rYta6USU++zi#yv>
z@fGYHe3o5c=~Qn@g@~H2vPL#{=-!xPewlNd$zJu_qe)9!4Iyn7^S2{>uACY+^|pHz
zHnUZpfInPTuYE&yf7!gyT)WrGd)K9GOBK7BJysGupEW3Wclx|!YwrsD?@M|^roAui
zwJN-O6lYPYM@Ll7;f;9<<<GM7qS<az;fbj_BzrnDtaJCr(`?c*<}u|H@8iJGF8>wY
z{B3~er=6%8Igg)%*^<{UZF{5yzs#2^Q1*K%hyHJSP@Ae$R&rYH^s|GS)^(w@Um449
z(#oZ@=+-%n^XKGr_JdGxbzq7l&&{-H_4C5AHCZ;4cJ+2d&FV1aPNbLDv5wuGT8o4`
z;dHg<Tf08oNT0W6Q;E2_M7cnBnnWk-%q&Lc<GmVg?rH7HrYW$;H0I0vKbO?XKpb`)
zwkP?9z(&rD@^YIf8d6k&tsb1w8e=)S%ZsrEZR>C=9adL0%-q(^wxE=^{9*Qnn^t7j
z_`c;{dpo~+_^XtCIV%LI9^0L?(T_vYb2>DeVV-zFxPf-})8DTWIZq>IO<N~fi_e$-
zHiai!r3&VD+e%);<)U0>+sCygUtiR=PL#hoV@H#jUO5wWvCdwM)R;q_UAcuIWBx)Z
z)g5sb{@FSF-LO0h`ZQ{FC@i)T-A>uQN>fxn-A(=&kddx5dcG#U47A63`m{WMb3)rw
zRE!R_%|bp9_1pcL<b1U_b|AVn)o+#;hO0TvJn`mq^{pa;7%lQI=uUNc{x$MbJe#9U
zajiIUJIs1<t{2A*BXFW7n)iDJ$?c-CtyLLfyiTX*tmPw0FQ(o!Z%)0h<SW@(d>hL>
z{-!?dLW*acxH=Yr^gj%=<29bC3&dfEo7V<SvL>g48eOAVS*0Cy2gCE&<7NjSv(4VS
z&8!nbew5}+J|S`gd^dLaIlU~MP@=&4Uaa3A`Ql}=5DjAO$<FSSdEJlQ+>h@t_9EqF
zK;qLvx{0pVvY|N{u1~eDPL1KGRUeh#4Vm=VlU5@!nH=YDY;77-u0A6Q4~~-@ApQI0
zP3aUn$S(*5H*I$-X51~Z)${2fYHDoj^|tbDsautcn(ND({oQx6So>s|$CHTdn>^Us
z=d5jGvpY4QIj9y-8I77HgI^2RWfLj(yYgu$$zw`(x3S!R7&T{dPbib|>)pbZ$3Q#t
ztgxj{if4WlW(ZC7XftA}y{@aRC#CIq#ylJ3v(4G(Hz}=_bouEFcMIk;=>90BLQy;0
z<Ju0*Y{ASfZw~Bxu943*uKBv|eS0vo<g+UEge{eOs<?+n9baU&+n#aSYs?PoOR&eW
zC)00Q%NMy_pf>$JZ@eg0fbpTZY?@3*ySvqMjOBhRuRPx>UyLf*$G3T1PrEt!ZHkNd
zMx`C1QS+}QLKd473UR6%&#=YNn2k;=?6y(0&I19z9iq&GWsSY*+q%}U@NJ${`ncO<
z8fP-%vg$F<1$zK3L0@RsAHel3yQrqouJ$J8POcEQ+POubD(;EM19!hlGd94~mq@YL
zJa^_4SjFvScCbvQdf3;@N^@JvN=J?FcG}mr(rc6N*)}McGtj+nhwJ0a_;OF{<3T_9
z*E(y`vs|{1?Zyi^#OV=7UkrFKwlY7fkJlx5DoUOmbgb@^@<YarzEy5~asirs{M6T6
z$1<_d+%yjbjZHCoxHM1TO-@6+K8l(LZCzZC@%-uT>$SaH5Nomdp4C-5(KGK9mWEO<
zV*KSq>z<UWJDjFM4rP1Q>0G-vO*U7mrrsE$k=Rb@KfC-tY5|t*MyGNHxy~WK)T5Oi
z9S=3&1HOYQ+;@uq7Cgll{kZr|Y@1$#VlK^XqF(Cef7zwpoZow0SgKhD^9klnI=AN_
zdFz|h)6h$xk3%npZh}@od!bd(rO*qZ_0TUtXF~OMIt5w@t%8mNhrU#6LipuQG{wyK
zC*}P|@lU&?*8cuX;fL@)_4R!C)A)x1{$2Rryf`2JN$My$^WU!h;rB1zm)JTbE-#0O
z#Mwz`Z{0-|Epn<`FiKIdt-IoU=00nI|7#08%|YOM!EUe%JPvk(?cgD>8EgUrpckaU
zU0^9#0-8Y*)Ps2-0ct@FxB<)rGr&}EDX0YFf#R2gQ+s3PBsdO^f>*!+@I2TLc7v^8
zGx(kIyd6}WjG1*$)mq)xnC90zcrV@n&p6r6iT`qOl1<Hi)K5f{iC-<f`6cZGR3?pi
zvRk3dqg2t3aTh>85BMDj|1U$o;V}Hq6|Js0DxUoO{KST7-1NhguhNR@{5a*WVMV+N
z;0qqazZ{5v9gsij`87Jpp9D(N2o$f$qf9q!{<lLVo8>$kz6u%vG&}!&gSiz@Syc~}
zX8@?o>pi*ws_=V(!Z!lR;kP2@D)6x9e*~)XYzLC}*Ff?99;kdT0fqkyP<Ry$ruOmM
zjN9|zDoQ#hJW|q~hr*o)5v4bCJK?1_6Q75|ohK0`RX`?)E2#nz8~odH`At`a_Zg$Z
z<>R(9FyFPIf5YWozYM<VZXVg;==$#-J*B(abpw{}B>uCH9)2|9g2!CfpLVQTk3Myd
z@uOb+J;eX#ZEtP6#QbdA@ojgM&VSt_HpN07BnuDUc{pPJ=<wZ#uN@ozC$Aql`k^t^
z>s-kW{wQX@amT%wp)n~w9fp4QA9TN}U*#+=>v;Q%d?)3=KQd1_z&pV|@h-vKVFvOQ
zU)0donm5RKMrsrJ`T5l4l$Y~y{8Hhi@+lSH=lj%8|LdfB)_$;`_bli^sGi|lp?bED
zgQ^|h*cY?U=EtF$bKDR8B6KNK?{QP0dcQmM5AJ>MdFYq%Z-Q#>&<_0yGy%N~di0r?
zi9mNkFNf}WI%XzAE1+wk2HFof@xvHj1c?uoQN97y1o0rWxDD0k11j_<bPqkt{1{vp
zIX7UwcD|<aO049oj$Z>UK>Tlkr@$-Vzrh3wJp;@KtAL;8Cc-rTS_2*cyTMPuFF*zH
zrh^8M2ELOWyoilYgTa?tb8`I0<Ig-Nds0?P>t`uFh+Obj>c-zH_i?}N3m3UE&-sm@
ze%4+gf4`8=SG)Ob=ktCYRPPyj>rnqqWm>NHjasPelDYc;#5xx*#4pvc-!c4hvl9MR
z_?rLkg=+qP2&(wU$HdpKgmIy<`HNi@Xc%9v-ub4M;NMV!@1N1DJcIcxDG`4K{I$_C
z`>$W$atX}9tz~8_eBU2w;J+8rSiXPCf-=6-<^2N-%S>e;{^mx)1Af}rw&69<kXNd$
z8Z?U>Dr1fvJ7$g?IbvRW?KShvGtZcf8#kI*EM{)J@kUc!U2U$q>MB!JRb`lIx?lDm
z88tiFTt-8m%$ZM?Z0I*F-Fu^>swsq<z*XKtzV+woNBC*NmCTy7e;v!W@%(g>KsqZ(
zNrSGKul)UVqkHx#-RPdd!F{86@Vfg#{-A<`={{<_Ln1~Rqp=pQw>Rn<jol&s>7n=R
zy*RK6(hWzhRJt8JwI@EgqoT4xS7WYx0siSB%fHfIjr{p?j?~^lvX2&4N2Ap(3(-wo
zqtTWCzr}`D+)|KkxMCtjAC62M+)*(RaR{uaO!eJ2STTwGh9maghE6I-H&Q!+nkn~@
z+M8?V@^>?wXl#isheF-`hxmi#9Hug6qH;&F_a}Sd{z)2Eq1;cRieu$PtChRt&1+oZ
z<W(TGWdtAcxW8p&;h6eWrrIm6pq8rNq`^U3zjm%>;uiP{MfR2ob0&GV4LzyzY}+EK
z+P1K3=V*1Yyof4b`)uMMeMW!Uz8s8HBGK`6tt_hFM^Xi+BQ4SqV0GssRLAF|FR{f%
z?I~p(+;`g7NpAM}_j|0yI=!Xdh4sS_PGJ$gJq*d`L$~%Gq8<+RpG?7Nx}&=Kur}iP
zrN@QooaPS=IqKChP)}QD`3voR$j`}9T|Id1>im?!iu3JuXvk^)sH67kwAJrNX_9Ql
ziOZ)OrloMFEwxwOS#5PXl-JFG{pI9&xjI=+TfJ*uHw)4^3zW%Y0m!kkJV}x|iF$f{
zSCGzG;OGd(-s1YnTAi%G+Q`idbGliO&RHNjsIkS9=UbiRX$&YO&uaed3#;$2wJel3
zp*p9VMe>~ON%`rkG4*q!f$KaH=AL6CwRNXH#L8Vijcrft-q+1D%2PW|Qaf7R&-dTN
zCsl?s$zu%hZM`vCF~N>yBejM4GB(|?wRmUi6LoK{P(5>Y@APwQI%o0D4qC8&%)h|y
zojs^(*5%s8S-kWe$odEOxqIL4#m|Y$x2JFF-qTh(?mv0+_rA11Kjc~GbeAjVImOOL
zI`8R1yuGQn<Z8|Sd2YJ-C!xQyoF>j~?Bz_TZhYg!2{o|d9s#Y)9<%l?#hQAj>9Fy0
zm*k)FHu*kZKaca`F*>@zG;<nEr%kaKdJpM)I1e(yyJDw3aVi2;j=hBFl*ov=!p6?P
zjqnzop%gvb={(6*l&6oFk~|GwocR2bnYn+&%!j*{un5R_@w>QJ?tO$s?0J+*qZ+iq
zkt`QiDLcKiD{S0+{Uat=ZoP5lUHQ0O)b}##d$0K)Ti^BhK<4BZu`T>_wBHK;hk1ww
zR(p(&>Ww7m!sPKNdC<;Y9EBG5kL?BXY4y+eT>q%1Y0zft-%X46QeM~kg+0?sNT(O#
z+O3bCN*TTV=iR`#^~rs_p*_WJ&-aSk#70wnzhSPYzRvJA@NFk3HGveJ9I6uO4AK4~
z3A`<a9wCn^+U#z2^{QR(%@^Pt+ufD(JGPuBN|y6sqm?DUoOK178f=e`FEc$_8w*{?
zshby>u<hpoGuLXTtRZ7tU3wisv-KxetOK8>jSi!?zKx#Ej+W6A%WXMjEzUYh>4j{v
zjuFAPTUoiREpL_T*VW{fBE+}IHgZ+0<!~eRuHS~`^HHmmk{Pi&*ozFsSdQ-+Vz&iG
zh8THjj3^#4&TS+pZT;$@0rc=YW|%&G2OV<f-u5Cp%XzHb^k#+<sm@vcbmFSMV-|9&
zl}*5fjI)nn^zL1&mm6r);0PJiyJ8suTRf{BB%{T;g(%#oHNKo#w|xC^datL#3i@i9
z9n)p&8u8C%MAoyzf07i8$Y-r{zLDLyJ=Koeu8r5*z?$5_t!r1MyRx$;_w{t$lx<tV
z88F#DSmhtYsFPK1YR#^iwz_&Uhtqa-cCd-l+ekEPa`m(slV^YacO#J+PF2nJYG-QX
z+;aP>OGnBqd!h9s1)GmP)7A8({+Q!kIABP>8DK--@>Dh#7z}pXsM&&BpIXgHHECUE
zO>WKBb*;{<O!Z8T^mRttv~hRV<c`*KHZ^&6&GcN}g^6?d2V#toUNgO*tToefl_q)3
VbiX}kC!@(|BEb>BOO|*y{|l?gcMbpm

delta 21049
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
P|H}h@WxVLsyx{)=Bb7Hx


From f7bf90fda5ccf81484f5bb114cd0115c62eb1c18 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2009 13:08:01 +0000
Subject: [PATCH 2096/8469] Fix issue5076: bdist_wininst fails on py3k

---
 command/wininst-9.0-amd64.exe | Bin 223744 -> 224256 bytes
 command/wininst-9.0.exe       | Bin 196096 -> 196096 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-9.0-amd64.exe b/command/wininst-9.0-amd64.exe
index 11d8011c717c3a1c54afbe00e002fab6d37766c6..94fbd4341b2a140fb0aa38ed1e10ff69600d4911 100644
GIT binary patch
delta 39360
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
U=2140JLb<lR=#Y$vAO?$152f%8~^|S

delta 38651
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%0DeT#&=r|OeDow%75!M&C
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

diff --git a/command/wininst-9.0.exe b/command/wininst-9.0.exe
index dadb31d8938b9b147830382495eee2453c171648..2ec261f9fdcd034cff9602af0c81fb7953ce2e2b 100644
GIT binary patch
delta 19656
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
CK|Y@V

delta 19301
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


From 5f79419c30c7b3eb2ae476e03c05509265926f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 29 Jan 2009 23:49:17 +0000
Subject: [PATCH 2097/8469] fixed test_make_distribution so it runs on any
 platform, as long as tar an gzip are available

---
 tests/test_sdist.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 96ec381ec6..0d839b5c6e 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -10,7 +10,7 @@
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
-from distutils.spawn import spawn
+from distutils.spawn import find_executable
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -111,15 +111,12 @@ def test_prune_file_list(self):
 
     def test_make_distribution(self):
 
-        self._init_tmp_pkg()
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
 
-        # check if tar is installed under win32
-        if sys.platform == 'win32':
-            try:
-                spawn('tar --help')
-            except DistutilsExecError:
-                # let's return, no need to go further
-                return
+        self._init_tmp_pkg()
 
         # now building a sdist
         dist = Distribution()

From 2185915ff974a216f44b4ddaedab793f7c01c611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 29 Jan 2009 23:51:53 +0000
Subject: [PATCH 2098/8469] Merged revisions 69106 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69106 | tarek.ziade | 2009-01-30 00:49:17 +0100 (Fri, 30 Jan 2009) | 1 line

  fixed test_make_distribution so it runs on any platform, as long as tar an gzip are available
........
---
 tests/test_sdist.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 96ec381ec6..0d839b5c6e 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -10,7 +10,7 @@
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
-from distutils.spawn import spawn
+from distutils.spawn import find_executable
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -111,15 +111,12 @@ def test_prune_file_list(self):
 
     def test_make_distribution(self):
 
-        self._init_tmp_pkg()
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
 
-        # check if tar is installed under win32
-        if sys.platform == 'win32':
-            try:
-                spawn('tar --help')
-            except DistutilsExecError:
-                # let's return, no need to go further
-                return
+        self._init_tmp_pkg()
 
         # now building a sdist
         dist = Distribution()

From f11ca53664d739a8c8e8194de7afdc0437ac7994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 29 Jan 2009 23:54:06 +0000
Subject: [PATCH 2099/8469] Merged revisions 69106 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69106 | tarek.ziade | 2009-01-30 00:49:17 +0100 (Fri, 30 Jan 2009) | 1 line

  fixed test_make_distribution so it runs on any platform, as long as tar an gzip are available
........
---
 tests/test_sdist.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 96ec381ec6..0d839b5c6e 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -10,7 +10,7 @@
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
-from distutils.spawn import spawn
+from distutils.spawn import find_executable
 
 CURDIR = os.path.dirname(__file__)
 TEMP_PKG = join(CURDIR, 'temppkg')
@@ -111,15 +111,12 @@ def test_prune_file_list(self):
 
     def test_make_distribution(self):
 
-        self._init_tmp_pkg()
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
 
-        # check if tar is installed under win32
-        if sys.platform == 'win32':
-            try:
-                spawn('tar --help')
-            except DistutilsExecError:
-                # let's return, no need to go further
-                return
+        self._init_tmp_pkg()
 
         # now building a sdist
         dist = Distribution()

From 77931446b65e84f947756a3a32eecf0cf3a05fde Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 30 Jan 2009 04:00:29 +0000
Subject: [PATCH 2100/8469] Merged revisions 68840,68881,68943,68945 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68840 | andrew.kuchling | 2009-01-20 20:15:43 -0600 (Tue, 20 Jan 2009) | 1 line

  Add some items
........
  r68881 | andrew.kuchling | 2009-01-23 21:28:18 -0600 (Fri, 23 Jan 2009) | 1 line

  Add various items
........
  r68943 | tarek.ziade | 2009-01-25 16:09:10 -0600 (Sun, 25 Jan 2009) | 1 line

  Issue #5052: removed backward compatibility information (out of date)
........
  r68945 | tarek.ziade | 2009-01-25 16:11:04 -0600 (Sun, 25 Jan 2009) | 1 line

  added missing module docstring
........
---
 command/install_lib.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/command/install_lib.py b/command/install_lib.py
index ac620fccb9..94895f4269 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,3 +1,8 @@
+"""distutils.command.install_lib
+
+Implements the Distutils 'install_lib' command
+(install all Python modules)."""
+
 __revision__ = "$Id$"
 
 import sys, os

From ec8ccd9e3fd60d7ffac44b54fef21c18efbd14ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 5 Feb 2009 09:06:23 +0000
Subject: [PATCH 2101/8469] Fix comment for #1835

---
 __init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/__init__.py b/__init__.py
index 57fcf97602..e418214c48 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,13 +12,8 @@
 
 # Distutils version
 #
-# Please coordinate with Marc-Andre Lemburg <mal@egenix.com> when adding
-# new features to distutils that would warrant bumping the version number.
+# Updated automatically by the Python release process.
 #
-# In general, major and minor version should loosely follow the Python
-# version number the distutils code was shipped with.
-#
-
 #--start constants--
 __version__ = "2.6"
 #--end constants--

From 7126baf0a432aac54faee9bffcb78e93e67bced8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 5 Feb 2009 09:08:59 +0000
Subject: [PATCH 2102/8469] Merged revisions 69285 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69285 | tarek.ziade | 2009-02-05 10:06:23 +0100 (Thu, 05 Feb 2009) | 1 line

  Fix comment for #1835
........
---
 __init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/__init__.py b/__init__.py
index 34fc008a58..1cf8a6ea56 100644
--- a/__init__.py
+++ b/__init__.py
@@ -12,13 +12,8 @@
 
 # Distutils version
 #
-# Please coordinate with Marc-Andre Lemburg <mal@egenix.com> when adding
-# new features to distutils that would warrant bumping the version number.
+# Updated automatically by the Python release process.
 #
-# In general, major and minor version should loosely follow the Python
-# version number the distutils code was shipped with.
-#
-
 #--start constants--
 __version__ = "3.1a0"
 #--end constants--

From a1f7b98d85ddc39f6473eec042ddb6e85e39433f Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Thu, 5 Feb 2009 16:14:39 +0000
Subject: [PATCH 2103/8469] Fix get_python_inc() to work when building in a
 directory separate from the source.  Also, define 'srcdir' on non-posix
 platforms.

---
 sysconfig.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9993fba1ab..ec2f8a9c33 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -73,14 +73,17 @@ def get_python_inc(plat_specific=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
+            # Assume the executable is in the build directory.  The
+            # pyconfig.h file should be in the same directory.  Since
+            # the build directory may not be the source directory, we
+            # must use "srcdir" from the makefile to find the "Include"
+            # directory.
             base = os.path.dirname(os.path.abspath(sys.executable))
             if plat_specific:
-                inc_dir = base
+                return base
             else:
-                inc_dir = os.path.join(base, "Include")
-                if not os.path.exists(inc_dir):
-                    inc_dir = os.path.join(os.path.dirname(base), "Include")
-            return inc_dir
+                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                return os.path.normpath(incdir)
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
@@ -521,6 +524,9 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        if 'srcdir' not in _config_vars:
+            _config_vars['srcdir'] = project_base
+
         if sys.platform == 'darwin':
             kernel_version = os.uname()[2] # Kernel version (8.4.3)
             major_version = int(kernel_version.split('.')[0])

From d1ea619952d81916af8fcfdb82e1961ae114e4e1 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Thu, 5 Feb 2009 16:19:05 +0000
Subject: [PATCH 2104/8469] Since sysconfig.get_python_inc() now works when
 building in a directory other than the source directory, simplify the test
 code in test_sysconfig.py.

---
 tests/test_sysconfig.py | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index aa1187e77b..397bb12cfc 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -19,27 +19,10 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
 
     def test_get_python_inc(self):
-        # The check for srcdir is copied from Python's setup.py,
-        # and is necessary to make this test pass when building
-        # Python in a directory other than the source directory.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            inc_dir = sysconfig.get_python_inc()
-        else:
-            # This test is not really a proper test: when building
-            # Python from source, even in the same directory,
-            # we won't be testing the same thing as when running
-            # distutils' tests on an installed Python. Nevertheless,
-            # let's try to do our best: if we are running Python's
-            # unittests from a build directory that is not the source
-            # directory, the normal inc_dir will exist, it will just not
-            # contain anything of interest.
-            inc_dir = sysconfig.get_python_inc()
-            self.assert_(os.path.isdir(inc_dir))
-            # Now test the source location, to make sure Python.h does
-            # exist.
-            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
-            inc_dir = os.path.normpath(inc_dir)
+        inc_dir = sysconfig.get_python_inc()
+        # This is not much of a test.  We make sure Python.h exists
+        # in the directory returned by get_python_inc() but we don't know
+        # it is the correct file.
         self.assert_(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
         self.assert_(os.path.isfile(python_h), python_h)

From bf94d914167a979fe2bc878bb594335fe3aaeb9b Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Thu, 5 Feb 2009 16:25:16 +0000
Subject: [PATCH 2105/8469] Fix test_build_ext.py to work when building in a
 separate directory. Since "srcdir" should now be defined on all platforms,
 use it to find the module source.

---
 tests/test_build_ext.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 31b8b48185..b268820fa2 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -11,6 +11,10 @@
 import unittest
 from test import test_support
 
+def _get_source_filename():
+    srcdir = sysconfig.get_config_var('srcdir')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+
 class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
@@ -18,9 +22,7 @@ def setUp(self):
         self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
-
-        xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
-        shutil.copy(xx_c, self.tmp_dir)
+        shutil.copy(_get_source_filename(), self.tmp_dir)
 
     def test_build_ext(self):
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -66,9 +68,11 @@ def tearDown(self):
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
 def test_suite():
-    if not sysconfig.python_build:
+    src = _get_source_filename()
+    if not os.path.exists(src):
         if test_support.verbose:
-            print 'test_build_ext: The test must be run in a python build dir'
+            print ('test_build_ext: Cannot find source code (test'
+                   ' must run in python build dir)')
         return unittest.TestSuite()
     else: return unittest.makeSuite(BuildExtTestCase)
 

From 092c2c911cf324eb35fe10416fe35d2fdb8d9e1c Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Thu, 5 Feb 2009 16:33:41 +0000
Subject: [PATCH 2106/8469] Fix get_python_inc() to work when building in a
 directory separate from the source.  Also, define 'srcdir' on non-posix
 platforms.

---
 sysconfig.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index b17743a865..de8c5fccd6 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -72,14 +72,17 @@ def get_python_inc(plat_specific=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
+            # Assume the executable is in the build directory.  The
+            # pyconfig.h file should be in the same directory.  Since
+            # the build directory may not be the source directory, we
+            # must use "srcdir" from the makefile to find the "Include"
+            # directory.
             base = os.path.dirname(os.path.abspath(sys.executable))
             if plat_specific:
-                inc_dir = base
+                return base
             else:
-                inc_dir = os.path.join(base, "Include")
-                if not os.path.exists(inc_dir):
-                    inc_dir = os.path.join(os.path.dirname(base), "Include")
-            return inc_dir
+                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                return os.path.normpath(incdir)
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")

From 79a5c6b29982615cff8c78b6ee045cdd3a26ac55 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Thu, 5 Feb 2009 16:35:04 +0000
Subject: [PATCH 2107/8469] Since sysconfig.get_python_inc() now works when
 building in a directory other than the source directory, simplify the test
 code in test_sysconfig.py.

---
 tests/test_sysconfig.py | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index c6ab9aa5d5..490410e126 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -19,27 +19,10 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
 
     def test_get_python_inc(self):
-        # The check for srcdir is copied from Python's setup.py,
-        # and is necessary to make this test pass when building
-        # Python in a directory other than the source directory.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            inc_dir = sysconfig.get_python_inc()
-        else:
-            # This test is not really a proper test: when building
-            # Python from source, even in the same directory,
-            # we won't be testing the same thing as when running
-            # distutils' tests on an installed Python. Nevertheless,
-            # let's try to do our best: if we are running Python's
-            # unittests from a build directory that is not the source
-            # directory, the normal inc_dir will exist, it will just not
-            # contain anything of interest.
-            inc_dir = sysconfig.get_python_inc()
-            self.assert_(os.path.isdir(inc_dir))
-            # Now test the source location, to make sure Python.h does
-            # exist.
-            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
-            inc_dir = os.path.normpath(inc_dir)
+        inc_dir = sysconfig.get_python_inc()
+        # This is not much of a test.  We make sure Python.h exists
+        # in the directory returned by get_python_inc() but we don't know
+        # it is the correct file.
         self.assert_(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
         self.assert_(os.path.isfile(python_h), python_h)

From efc1ec81a7cc219b13f025b3bc75a8e1a1cdb4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 5 Feb 2009 22:52:52 +0000
Subject: [PATCH 2108/8469] Fixed #5132: enable extensions to link on Solaris

---
 command/build_ext.py    |  8 +++++---
 tests/test_build_ext.py | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index fbf2a0b217..2ed3ef65cc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -231,10 +231,12 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
-        # for extensions under Linux with a shared Python library,
+        # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
-                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        sysconfig.get_config_var('Py_ENABLE_SHARED')
+        if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
+             or sys.platform.startswith('sunos'))
+            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b268820fa2..780660da85 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -67,6 +67,27 @@ def tearDown(self):
         # XXX on Windows the test leaves a directory with xx module in TEMP
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
+    def test_solaris_enable_shared(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+        old = sys.platform
+
+        sys.platform = 'sunos' # fooling finalize_options
+        from distutils.sysconfig import  _config_vars
+        old_var = _config_vars.get('Py_ENABLE_SHARED')
+        _config_vars['Py_ENABLE_SHARED'] = 1
+        try:
+            cmd.ensure_finalized()
+        finally:
+            sys.platform = old
+            if old_var is None:
+                del _config_vars['Py_ENABLE_SHARED']
+            else:
+                _config_vars['Py_ENABLE_SHARED'] = old_var
+
+        # make sur we get some lobrary dirs under solaris
+        self.assert_(len(cmd.library_dirs) > 0)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From f148277fd0221d779fe64e6d0715f7c713d24c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 5 Feb 2009 22:55:00 +0000
Subject: [PATCH 2109/8469] Merged revisions 69316 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69316 | tarek.ziade | 2009-02-05 23:52:52 +0100 (Thu, 05 Feb 2009) | 1 line

  Fixed #5132: enable extensions to link on Solaris
........
---
 command/build_ext.py    |  8 +++++---
 tests/test_build_ext.py | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1461409f60..936ea8d099 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -233,10 +233,12 @@ def finalize_options (self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
-        # for extensions under Linux with a shared Python library,
+        # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
-                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        sysconfig.get_config_var('Py_ENABLE_SHARED')
+        if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
+             or sys.platform.startswith('sunos'))
+            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 31b8b48185..d0cce9ba1a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -65,6 +65,27 @@ def tearDown(self):
         # XXX on Windows the test leaves a directory with xx module in TEMP
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
+    def test_solaris_enable_shared(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+        old = sys.platform
+
+        sys.platform = 'sunos' # fooling finalize_options
+        from distutils.sysconfig import  _config_vars
+        old_var = _config_vars.get('Py_ENABLE_SHARED')
+        _config_vars['Py_ENABLE_SHARED'] = 1
+        try:
+            cmd.ensure_finalized()
+        finally:
+            sys.platform = old
+            if old_var is None:
+                del _config_vars['Py_ENABLE_SHARED']
+            else:
+                _config_vars['Py_ENABLE_SHARED'] = old_var
+
+        # make sur we get some lobrary dirs under solaris
+        self.assert_(len(cmd.library_dirs) > 0)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 1ccb3b08c1c773ad4eaff4d253d7cddecb8a4b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 5 Feb 2009 22:56:14 +0000
Subject: [PATCH 2110/8469] Merged revisions 69316 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69316 | tarek.ziade | 2009-02-05 23:52:52 +0100 (Thu, 05 Feb 2009) | 1 line

  Fixed #5132: enable extensions to link on Solaris
........
---
 command/build_ext.py    |  8 +++++---
 tests/test_build_ext.py | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7ef5becc6f..b12da63f84 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -229,10 +229,12 @@ def finalize_options(self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
-        # for extensions under Linux with a shared Python library,
+        # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        if (sys.platform.startswith('linux') or sys.platform.startswith('gnu')) \
-                and sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        sysconfig.get_config_var('Py_ENABLE_SHARED')
+        if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
+             or sys.platform.startswith('sunos'))
+            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 527529777d..4c5723255a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -75,6 +75,27 @@ def tearDown(self):
         # XXX on Windows the test leaves a directory with xx module in TEMP
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
+    def test_solaris_enable_shared(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+        old = sys.platform
+
+        sys.platform = 'sunos' # fooling finalize_options
+        from distutils.sysconfig import  _config_vars
+        old_var = _config_vars.get('Py_ENABLE_SHARED')
+        _config_vars['Py_ENABLE_SHARED'] = 1
+        try:
+            cmd.ensure_finalized()
+        finally:
+            sys.platform = old
+            if old_var is None:
+                del _config_vars['Py_ENABLE_SHARED']
+            else:
+                _config_vars['Py_ENABLE_SHARED'] = old_var
+
+        # make sur we get some lobrary dirs under solaris
+        self.assert_(len(cmd.library_dirs) > 0)
+
 def test_suite():
     if not sysconfig.python_build:
         if support.verbose:

From fed87c12d428957f2341abafa44669549b649c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:31:59 +0000
Subject: [PATCH 2111/8469] Fixed #1276768: verbose option was not used in the
 code.

---
 dir_util.py             | 30 +++++++-------
 file_util.py            | 22 ++++++----
 tests/test_dir_util.py  | 91 +++++++++++++++++++++++++++++++++++++++++
 tests/test_file_util.py | 66 ++++++++++++++++++++++++++++++
 4 files changed, 185 insertions(+), 24 deletions(-)
 create mode 100644 tests/test_dir_util.py
 create mode 100644 tests/test_file_util.py

diff --git a/dir_util.py b/dir_util.py
index 54f5c68e28..6d896ee408 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -16,7 +16,7 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0777, verbose=0, dry_run=0):
+def mkpath (name, mode=0777, verbose=1, dry_run=0):
     """Create a directory and any missing ancestor directories.  If the
        directory already exists (or if 'name' is the empty string, which
        means the current directory, which of course exists), then do
@@ -49,13 +49,9 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
     tails = [tail]                      # stack of lone dirs to create
 
     while head and tail and not os.path.isdir(head):
-        #print "splitting '%s': " % head,
         (head, tail) = os.path.split(head)
-        #print "to ('%s','%s')" % (head, tail)
         tails.insert(0, tail)          # push next higher dir onto stack
 
-    #print "stack of tails:", tails
-
     # now 'head' contains the deepest directory that already exists
     # (that is, the child of 'head' in 'name' is the highest directory
     # that does *not* exist)
@@ -67,7 +63,8 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
         if _path_created.get(abs_head):
             continue
 
-        log.info("creating %s", head)
+        if verbose == 1:
+            log.info("creating %s", head)
 
         if not dry_run:
             try:
@@ -83,7 +80,7 @@ def mkpath (name, mode=0777, verbose=0, dry_run=0):
 # mkpath ()
 
 
-def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
+def create_tree (base_dir, files, mode=0777, verbose=1, dry_run=0):
 
     """Create all the empty directories under 'base_dir' needed to
        put 'files' there.  'base_dir' is just the a name of a directory
@@ -102,7 +99,7 @@ def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
 
     # Now create them
     for dir in need_dirs:
-        mkpath(dir, mode, dry_run=dry_run)
+        mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
 
 # create_tree ()
 
@@ -112,7 +109,7 @@ def copy_tree (src, dst,
                preserve_times=1,
                preserve_symlinks=0,
                update=0,
-               verbose=0,
+               verbose=1,
                dry_run=0):
 
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
@@ -148,7 +145,7 @@ def copy_tree (src, dst,
                   "error listing files in '%s': %s" % (src, errstr)
 
     if not dry_run:
-        mkpath(dst)
+        mkpath(dst, verbose=verbose)
 
     outputs = []
 
@@ -158,7 +155,8 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
-            log.info("linking %s -> %s", dst_name, link_dest)
+            if verbose == 1:
+                log.info("linking %s -> %s", dst_name, link_dest)
             if not dry_run:
                 os.symlink(link_dest, dst_name)
             outputs.append(dst_name)
@@ -167,10 +165,11 @@ def copy_tree (src, dst,
             outputs.extend(
                 copy_tree(src_name, dst_name, preserve_mode,
                           preserve_times, preserve_symlinks, update,
-                          dry_run=dry_run))
+                          verbose=verbose, dry_run=dry_run))
         else:
             copy_file(src_name, dst_name, preserve_mode,
-                      preserve_times, update, dry_run=dry_run)
+                      preserve_times, update, verbose=verbose,
+                      dry_run=dry_run)
             outputs.append(dst_name)
 
     return outputs
@@ -188,14 +187,15 @@ def _build_cmdtuple(path, cmdtuples):
     cmdtuples.append((os.rmdir, path))
 
 
-def remove_tree (directory, verbose=0, dry_run=0):
+def remove_tree (directory, verbose=1, dry_run=0):
     """Recursively remove an entire directory tree.  Any errors are ignored
     (apart from being reported to stdout if 'verbose' is true).
     """
     from distutils.util import grok_environment_error
     global _path_created
 
-    log.info("removing '%s' (and everything under it)", directory)
+    if verbose == 1:
+        log.info("removing '%s' (and everything under it)", directory)
     if dry_run:
         return
     cmdtuples = []
diff --git a/file_util.py b/file_util.py
index 3af6344f11..82a8b0ad19 100644
--- a/file_util.py
+++ b/file_util.py
@@ -76,7 +76,7 @@ def copy_file (src, dst,
                preserve_times=1,
                update=0,
                link=None,
-               verbose=0,
+               verbose=1,
                dry_run=0):
 
     """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
@@ -123,7 +123,8 @@ def copy_file (src, dst,
         dir = os.path.dirname(dst)
 
     if update and not newer(src, dst):
-        log.debug("not copying %s (output up-to-date)", src)
+        if verbose == 1:
+            log.debug("not copying %s (output up-to-date)", src)
         return dst, 0
 
     try:
@@ -131,10 +132,12 @@ def copy_file (src, dst,
     except KeyError:
         raise ValueError, \
               "invalid value '%s' for 'link' argument" % link
-    if os.path.basename(dst) == os.path.basename(src):
-        log.info("%s %s -> %s", action, src, dir)
-    else:
-        log.info("%s %s -> %s", action, src, dst)
+
+    if verbose == 1:
+        if os.path.basename(dst) == os.path.basename(src):
+            log.info("%s %s -> %s", action, src, dir)
+        else:
+            log.info("%s %s -> %s", action, src, dst)
 
     if dry_run:
         return (dst, 1)
@@ -178,7 +181,7 @@ def copy_file (src, dst,
 
 # XXX I suspect this is Unix-specific -- need porting help!
 def move_file (src, dst,
-               verbose=0,
+               verbose=1,
                dry_run=0):
 
     """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
@@ -191,7 +194,8 @@ def move_file (src, dst,
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
 
-    log.info("moving %s -> %s", src, dst)
+    if verbose == 1:
+        log.info("moving %s -> %s", src, dst)
 
     if dry_run:
         return dst
@@ -223,7 +227,7 @@ def move_file (src, dst,
                   "couldn't move '%s' to '%s': %s" % (src, dst, msg)
 
     if copy_it:
-        copy_file(src, dst)
+        copy_file(src, dst, verbose=verbose)
         try:
             os.unlink(src)
         except os.error, (num, msg):
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
new file mode 100644
index 0000000000..edf93c40c5
--- /dev/null
+++ b/tests/test_dir_util.py
@@ -0,0 +1,91 @@
+"""Tests for distutils.dir_util."""
+import unittest
+import os
+import shutil
+
+from distutils.dir_util import mkpath
+from distutils.dir_util import remove_tree
+from distutils.dir_util import create_tree
+from distutils.dir_util import copy_tree
+
+from distutils import log
+
+class DirUtilTestCase(unittest.TestCase):
+
+    def _log(self, msg, *args):
+        if len(args) > 0:
+            self._logs.append(msg % args)
+        else:
+            self._logs.append(msg)
+
+    def setUp(self):
+        self._logs = []
+        self.root_target = os.path.join(os.path.dirname(__file__), 'deep')
+        self.target = os.path.join(self.root_target, 'here')
+        self.target2 = os.path.join(os.path.dirname(__file__), 'deep2')
+        self.old_log = log.info
+        log.info = self._log
+
+    def tearDown(self):
+        for target in (self.target, self.target2):
+            if os.path.exists(target):
+                shutil.rmtree(target)
+        log.info = self.old_log
+
+    def test_mkpath_remove_tree_verbosity(self):
+
+        mkpath(self.target, verbose=0)
+        wanted = []
+        self.assertEquals(self._logs, wanted)
+        remove_tree(self.root_target, verbose=0)
+
+        mkpath(self.target, verbose=1)
+        wanted = ['creating %s' % self.root_target,
+                  'creating %s' % self.target]
+        self.assertEquals(self._logs, wanted)
+        self._logs = []
+
+        remove_tree(self.root_target, verbose=1)
+        wanted = ["removing '%s' (and everything under it)" % self.root_target]
+        self.assertEquals(self._logs, wanted)
+
+    def test_create_tree_verbosity(self):
+
+        create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)
+        self.assertEquals(self._logs, [])
+        remove_tree(self.root_target, verbose=0)
+
+        wanted = ['creating %s' % self.root_target]
+        create_tree(self.root_target, ['one', 'two', 'three'], verbose=1)
+        self.assertEquals(self._logs, wanted)
+
+        remove_tree(self.root_target, verbose=0)
+
+
+    def test_copy_tree_verbosity(self):
+
+        mkpath(self.target, verbose=0)
+
+        copy_tree(self.target, self.target2, verbose=0)
+        self.assertEquals(self._logs, [])
+
+        remove_tree(self.root_target, verbose=0)
+
+        mkpath(self.target, verbose=0)
+        a_file = os.path.join(self.target, 'ok.txt')
+        f = open(a_file, 'w')
+        f.write('some content')
+        f.close()
+
+        wanted = ['copying %s -> %s' % (a_file, self.target2)]
+        copy_tree(self.target, self.target2, verbose=1)
+        self.assertEquals(self._logs, wanted)
+
+        remove_tree(self.root_target, verbose=0)
+        remove_tree(self.target2, verbose=0)
+
+def test_suite():
+    return unittest.makeSuite(DirUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
new file mode 100644
index 0000000000..523f1aef17
--- /dev/null
+++ b/tests/test_file_util.py
@@ -0,0 +1,66 @@
+"""Tests for distutils.file_util."""
+import unittest
+import os
+import shutil
+
+from distutils.file_util import move_file
+from distutils import log
+
+class FileUtilTestCase(unittest.TestCase):
+
+    def _log(self, msg, *args):
+        if len(args) > 0:
+            self._logs.append(msg % args)
+        else:
+            self._logs.append(msg)
+
+    def setUp(self):
+        self._logs = []
+        self.old_log = log.info
+        log.info = self._log
+        self.source = os.path.join(os.path.dirname(__file__), 'f1')
+        self.target = os.path.join(os.path.dirname(__file__), 'f2')
+        self.target_dir = os.path.join(os.path.dirname(__file__), 'd1')
+
+    def tearDown(self):
+        log.info = self.old_log
+        for f in (self.source, self.target, self.target_dir):
+            if os.path.exists(f):
+                if os.path.isfile(f):
+                    os.remove(f)
+                else:
+                    shutil.rmtree(f)
+
+    def test_move_file_verbosity(self):
+
+        f = open(self.source, 'w')
+        f.write('some content')
+        f.close()
+
+        move_file(self.source, self.target, verbose=0)
+        wanted = []
+        self.assertEquals(self._logs, wanted)
+
+        # back to original state
+        move_file(self.target, self.source, verbose=0)
+
+        move_file(self.source, self.target, verbose=1)
+        wanted = ['moving %s -> %s' % (self.source, self.target)]
+        self.assertEquals(self._logs, wanted)
+
+        # back to original state
+        move_file(self.target, self.source, verbose=0)
+
+        self._logs = []
+        # now the target is a dir
+        os.mkdir(self.target_dir)
+        move_file(self.source, self.target_dir, verbose=1)
+        wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
+        self.assertEquals(self._logs, wanted)
+
+
+def test_suite():
+    return unittest.makeSuite(FileUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 96983b36bdea4053cc97656f1a6c10194a7f4fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:38:35 +0000
Subject: [PATCH 2112/8469] Merged revisions 69324 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69324 | tarek.ziade | 2009-02-06 01:31:59 +0100 (Fri, 06 Feb 2009) | 1 line

  Fixed #1276768: verbose option was not used in the code.
........
---
 dir_util.py             | 30 +++++++-------
 file_util.py            | 22 ++++++----
 tests/test_dir_util.py  | 91 +++++++++++++++++++++++++++++++++++++++++
 tests/test_file_util.py | 66 ++++++++++++++++++++++++++++++
 4 files changed, 185 insertions(+), 24 deletions(-)
 create mode 100644 tests/test_dir_util.py
 create mode 100644 tests/test_file_util.py

diff --git a/dir_util.py b/dir_util.py
index 1f0d49c25f..db754e5cec 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -15,7 +15,7 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0o777, verbose=0, dry_run=0):
+def mkpath (name, mode=0o777, verbose=1, dry_run=0):
     """Create a directory and any missing ancestor directories.  If the
        directory already exists (or if 'name' is the empty string, which
        means the current directory, which of course exists), then do
@@ -48,13 +48,9 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
     tails = [tail]                      # stack of lone dirs to create
 
     while head and tail and not os.path.isdir(head):
-        #print "splitting '%s': " % head,
         (head, tail) = os.path.split(head)
-        #print "to ('%s','%s')" % (head, tail)
         tails.insert(0, tail)          # push next higher dir onto stack
 
-    #print "stack of tails:", tails
-
     # now 'head' contains the deepest directory that already exists
     # (that is, the child of 'head' in 'name' is the highest directory
     # that does *not* exist)
@@ -66,7 +62,8 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
         if _path_created.get(abs_head):
             continue
 
-        log.info("creating %s", head)
+        if verbose == 1:
+            log.info("creating %s", head)
 
         if not dry_run:
             try:
@@ -82,7 +79,7 @@ def mkpath (name, mode=0o777, verbose=0, dry_run=0):
 # mkpath ()
 
 
-def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
+def create_tree (base_dir, files, mode=0o777, verbose=1, dry_run=0):
 
     """Create all the empty directories under 'base_dir' needed to
        put 'files' there.  'base_dir' is just the a name of a directory
@@ -99,7 +96,7 @@ def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
 
     # Now create them
     for dir in sorted(need_dir):
-        mkpath(dir, mode, dry_run=dry_run)
+        mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
 
 # create_tree ()
 
@@ -109,7 +106,7 @@ def copy_tree (src, dst,
                preserve_times=1,
                preserve_symlinks=0,
                update=0,
-               verbose=0,
+               verbose=1,
                dry_run=0):
 
     """Copy an entire directory tree 'src' to a new location 'dst'.  Both
@@ -146,7 +143,7 @@ def copy_tree (src, dst,
                   "error listing files in '%s': %s" % (src, errstr))
 
     if not dry_run:
-        mkpath(dst)
+        mkpath(dst, verbose=verbose)
 
     outputs = []
 
@@ -156,7 +153,8 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
-            log.info("linking %s -> %s", dst_name, link_dest)
+            if verbose == 1:
+                log.info("linking %s -> %s", dst_name, link_dest)
             if not dry_run:
                 os.symlink(link_dest, dst_name)
             outputs.append(dst_name)
@@ -165,10 +163,11 @@ def copy_tree (src, dst,
             outputs.extend(
                 copy_tree(src_name, dst_name, preserve_mode,
                           preserve_times, preserve_symlinks, update,
-                          dry_run=dry_run))
+                          verbose=verbose, dry_run=dry_run))
         else:
             copy_file(src_name, dst_name, preserve_mode,
-                      preserve_times, update, dry_run=dry_run)
+                      preserve_times, update, verbose=verbose,
+                      dry_run=dry_run)
             outputs.append(dst_name)
 
     return outputs
@@ -184,14 +183,15 @@ def _build_cmdtuple(path, cmdtuples):
     cmdtuples.append((os.rmdir, path))
 
 
-def remove_tree (directory, verbose=0, dry_run=0):
+def remove_tree (directory, verbose=1, dry_run=0):
     """Recursively remove an entire directory tree.  Any errors are ignored
     (apart from being reported to stdout if 'verbose' is true).
     """
     from distutils.util import grok_environment_error
     global _path_created
 
-    log.info("removing '%s' (and everything under it)", directory)
+    if verbose == 1:
+        log.info("removing '%s' (and everything under it)", directory)
     if dry_run:
         return
     cmdtuples = []
diff --git a/file_util.py b/file_util.py
index b46b0da678..00c5bc5b8e 100644
--- a/file_util.py
+++ b/file_util.py
@@ -67,7 +67,7 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
             fsrc.close()
 
 def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
-              link=None, verbose=0, dry_run=0):
+              link=None, verbose=1, dry_run=0):
     """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
     copied there with the same name; otherwise, it must be a filename.  (If
     the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
@@ -112,17 +112,20 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
         dir = os.path.dirname(dst)
 
     if update and not newer(src, dst):
-        log.debug("not copying %s (output up-to-date)", src)
+        if verbose == 1:
+            log.debug("not copying %s (output up-to-date)", src)
         return (dst, 0)
 
     try:
         action = _copy_action[link]
     except KeyError:
         raise ValueError("invalid value '%s' for 'link' argument" % link)
-    if os.path.basename(dst) == os.path.basename(src):
-        log.info("%s %s -> %s", action, src, dir)
-    else:
-        log.info("%s %s -> %s", action, src, dst)
+
+    if verbose == 1:
+        if os.path.basename(dst) == os.path.basename(src):
+            log.info("%s %s -> %s", action, src, dir)
+        else:
+            log.info("%s %s -> %s", action, src, dst)
 
     if dry_run:
         return (dst, 1)
@@ -164,7 +167,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
 
 # XXX I suspect this is Unix-specific -- need porting help!
 def move_file (src, dst,
-               verbose=0,
+               verbose=1,
                dry_run=0):
 
     """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
@@ -177,7 +180,8 @@ def move_file (src, dst,
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
 
-    log.info("moving %s -> %s", src, dst)
+    if verbose == 1:
+        log.info("moving %s -> %s", src, dst)
 
     if dry_run:
         return dst
@@ -209,7 +213,7 @@ def move_file (src, dst,
                   "couldn't move '%s' to '%s': %s" % (src, dst, msg))
 
     if copy_it:
-        copy_file(src, dst)
+        copy_file(src, dst, verbose=verbose)
         try:
             os.unlink(src)
         except os.error as e:
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
new file mode 100644
index 0000000000..edf93c40c5
--- /dev/null
+++ b/tests/test_dir_util.py
@@ -0,0 +1,91 @@
+"""Tests for distutils.dir_util."""
+import unittest
+import os
+import shutil
+
+from distutils.dir_util import mkpath
+from distutils.dir_util import remove_tree
+from distutils.dir_util import create_tree
+from distutils.dir_util import copy_tree
+
+from distutils import log
+
+class DirUtilTestCase(unittest.TestCase):
+
+    def _log(self, msg, *args):
+        if len(args) > 0:
+            self._logs.append(msg % args)
+        else:
+            self._logs.append(msg)
+
+    def setUp(self):
+        self._logs = []
+        self.root_target = os.path.join(os.path.dirname(__file__), 'deep')
+        self.target = os.path.join(self.root_target, 'here')
+        self.target2 = os.path.join(os.path.dirname(__file__), 'deep2')
+        self.old_log = log.info
+        log.info = self._log
+
+    def tearDown(self):
+        for target in (self.target, self.target2):
+            if os.path.exists(target):
+                shutil.rmtree(target)
+        log.info = self.old_log
+
+    def test_mkpath_remove_tree_verbosity(self):
+
+        mkpath(self.target, verbose=0)
+        wanted = []
+        self.assertEquals(self._logs, wanted)
+        remove_tree(self.root_target, verbose=0)
+
+        mkpath(self.target, verbose=1)
+        wanted = ['creating %s' % self.root_target,
+                  'creating %s' % self.target]
+        self.assertEquals(self._logs, wanted)
+        self._logs = []
+
+        remove_tree(self.root_target, verbose=1)
+        wanted = ["removing '%s' (and everything under it)" % self.root_target]
+        self.assertEquals(self._logs, wanted)
+
+    def test_create_tree_verbosity(self):
+
+        create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)
+        self.assertEquals(self._logs, [])
+        remove_tree(self.root_target, verbose=0)
+
+        wanted = ['creating %s' % self.root_target]
+        create_tree(self.root_target, ['one', 'two', 'three'], verbose=1)
+        self.assertEquals(self._logs, wanted)
+
+        remove_tree(self.root_target, verbose=0)
+
+
+    def test_copy_tree_verbosity(self):
+
+        mkpath(self.target, verbose=0)
+
+        copy_tree(self.target, self.target2, verbose=0)
+        self.assertEquals(self._logs, [])
+
+        remove_tree(self.root_target, verbose=0)
+
+        mkpath(self.target, verbose=0)
+        a_file = os.path.join(self.target, 'ok.txt')
+        f = open(a_file, 'w')
+        f.write('some content')
+        f.close()
+
+        wanted = ['copying %s -> %s' % (a_file, self.target2)]
+        copy_tree(self.target, self.target2, verbose=1)
+        self.assertEquals(self._logs, wanted)
+
+        remove_tree(self.root_target, verbose=0)
+        remove_tree(self.target2, verbose=0)
+
+def test_suite():
+    return unittest.makeSuite(DirUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
new file mode 100644
index 0000000000..523f1aef17
--- /dev/null
+++ b/tests/test_file_util.py
@@ -0,0 +1,66 @@
+"""Tests for distutils.file_util."""
+import unittest
+import os
+import shutil
+
+from distutils.file_util import move_file
+from distutils import log
+
+class FileUtilTestCase(unittest.TestCase):
+
+    def _log(self, msg, *args):
+        if len(args) > 0:
+            self._logs.append(msg % args)
+        else:
+            self._logs.append(msg)
+
+    def setUp(self):
+        self._logs = []
+        self.old_log = log.info
+        log.info = self._log
+        self.source = os.path.join(os.path.dirname(__file__), 'f1')
+        self.target = os.path.join(os.path.dirname(__file__), 'f2')
+        self.target_dir = os.path.join(os.path.dirname(__file__), 'd1')
+
+    def tearDown(self):
+        log.info = self.old_log
+        for f in (self.source, self.target, self.target_dir):
+            if os.path.exists(f):
+                if os.path.isfile(f):
+                    os.remove(f)
+                else:
+                    shutil.rmtree(f)
+
+    def test_move_file_verbosity(self):
+
+        f = open(self.source, 'w')
+        f.write('some content')
+        f.close()
+
+        move_file(self.source, self.target, verbose=0)
+        wanted = []
+        self.assertEquals(self._logs, wanted)
+
+        # back to original state
+        move_file(self.target, self.source, verbose=0)
+
+        move_file(self.source, self.target, verbose=1)
+        wanted = ['moving %s -> %s' % (self.source, self.target)]
+        self.assertEquals(self._logs, wanted)
+
+        # back to original state
+        move_file(self.target, self.source, verbose=0)
+
+        self._logs = []
+        # now the target is a dir
+        os.mkdir(self.target_dir)
+        move_file(self.source, self.target_dir, verbose=1)
+        wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
+        self.assertEquals(self._logs, wanted)
+
+
+def test_suite():
+    return unittest.makeSuite(FileUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From f5de94cd2bf6253c15fdea5a9963847476c7233d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:46:57 +0000
Subject: [PATCH 2113/8469] README now reflects the current state

---
 README | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 45c7ca8ca9..23f488506f 100644
--- a/README
+++ b/README
@@ -1,22 +1,11 @@
-This directory contains only a subset of the Distutils, specifically
-the Python modules in the 'distutils' and 'distutils.command'
-packages.  This is all you need to distribute and install Python
-modules using the Distutils.  There is also a separately packaged
-standalone version of the Distutils available for people who want to
-upgrade the Distutils without upgrading Python, available from the
-Distutils web page:
+This directory contains the Distutils package.
 
-    http://www.python.org/sigs/distutils-sig/
+There's a full documentation available at:
 
-The standalone version includes all of the code in this directory,
-plus documentation, test scripts, examples, etc.
+    http://docs.python.org/distutils/
 
-The Distutils documentation is divided into two documents, "Installing
-Python Modules", which explains how to install Python packages, and
-"Distributing Python Modules", which explains how to write setup.py
-files.  Both documents are part of the standard Python documentation
-set, and are available from http://www.python.org/doc/current/ .
+The Distutils-SIG web page is also a good starting point:
 
-        Greg Ward (gward@python.net)
+    http://www.python.org/sigs/distutils-sig/
 
 $Id$

From cbed4405dbe59d12aa1dbaea1437beff6709235a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:49:45 +0000
Subject: [PATCH 2114/8469] using >= so setting verbose to 2 will work as well

---
 dir_util.py  | 6 +++---
 file_util.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 6d896ee408..5a134408fd 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -63,7 +63,7 @@ def mkpath (name, mode=0777, verbose=1, dry_run=0):
         if _path_created.get(abs_head):
             continue
 
-        if verbose == 1:
+        if verbose >= 1:
             log.info("creating %s", head)
 
         if not dry_run:
@@ -155,7 +155,7 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
-            if verbose == 1:
+            if verbose >= 1:
                 log.info("linking %s -> %s", dst_name, link_dest)
             if not dry_run:
                 os.symlink(link_dest, dst_name)
@@ -194,7 +194,7 @@ def remove_tree (directory, verbose=1, dry_run=0):
     from distutils.util import grok_environment_error
     global _path_created
 
-    if verbose == 1:
+    if verbose >= 1:
         log.info("removing '%s' (and everything under it)", directory)
     if dry_run:
         return
diff --git a/file_util.py b/file_util.py
index 82a8b0ad19..0c890559ee 100644
--- a/file_util.py
+++ b/file_util.py
@@ -123,7 +123,7 @@ def copy_file (src, dst,
         dir = os.path.dirname(dst)
 
     if update and not newer(src, dst):
-        if verbose == 1:
+        if verbose >= 1:
             log.debug("not copying %s (output up-to-date)", src)
         return dst, 0
 
@@ -133,7 +133,7 @@ def copy_file (src, dst,
         raise ValueError, \
               "invalid value '%s' for 'link' argument" % link
 
-    if verbose == 1:
+    if verbose >= 1:
         if os.path.basename(dst) == os.path.basename(src):
             log.info("%s %s -> %s", action, src, dir)
         else:
@@ -194,7 +194,7 @@ def move_file (src, dst,
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
 
-    if verbose == 1:
+    if verbose >= 1:
         log.info("moving %s -> %s", src, dst)
 
     if dry_run:

From 24ce784984a61381cdc39cb0ed3f3d9cfe38439b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:52:52 +0000
Subject: [PATCH 2115/8469] Merged revisions 69330 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69330 | tarek.ziade | 2009-02-06 01:46:57 +0100 (Fri, 06 Feb 2009) | 1 line

  README now reflects the current state
........
---
 README | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 45c7ca8ca9..23f488506f 100644
--- a/README
+++ b/README
@@ -1,22 +1,11 @@
-This directory contains only a subset of the Distutils, specifically
-the Python modules in the 'distutils' and 'distutils.command'
-packages.  This is all you need to distribute and install Python
-modules using the Distutils.  There is also a separately packaged
-standalone version of the Distutils available for people who want to
-upgrade the Distutils without upgrading Python, available from the
-Distutils web page:
+This directory contains the Distutils package.
 
-    http://www.python.org/sigs/distutils-sig/
+There's a full documentation available at:
 
-The standalone version includes all of the code in this directory,
-plus documentation, test scripts, examples, etc.
+    http://docs.python.org/distutils/
 
-The Distutils documentation is divided into two documents, "Installing
-Python Modules", which explains how to install Python packages, and
-"Distributing Python Modules", which explains how to write setup.py
-files.  Both documents are part of the standard Python documentation
-set, and are available from http://www.python.org/doc/current/ .
+The Distutils-SIG web page is also a good starting point:
 
-        Greg Ward (gward@python.net)
+    http://www.python.org/sigs/distutils-sig/
 
 $Id$

From b01bd4697af5320818653fc06a17fde9a7770a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 00:53:43 +0000
Subject: [PATCH 2116/8469] Merged revisions 69332 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69332 | tarek.ziade | 2009-02-06 01:49:45 +0100 (Fri, 06 Feb 2009) | 1 line

  using >= so setting verbose to 2 will work as well
........
---
 dir_util.py  | 6 +++---
 file_util.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index db754e5cec..ed54ccefd4 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -62,7 +62,7 @@ def mkpath (name, mode=0o777, verbose=1, dry_run=0):
         if _path_created.get(abs_head):
             continue
 
-        if verbose == 1:
+        if verbose >= 1:
             log.info("creating %s", head)
 
         if not dry_run:
@@ -153,7 +153,7 @@ def copy_tree (src, dst,
 
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
-            if verbose == 1:
+            if verbose >= 1:
                 log.info("linking %s -> %s", dst_name, link_dest)
             if not dry_run:
                 os.symlink(link_dest, dst_name)
@@ -190,7 +190,7 @@ def remove_tree (directory, verbose=1, dry_run=0):
     from distutils.util import grok_environment_error
     global _path_created
 
-    if verbose == 1:
+    if verbose >= 1:
         log.info("removing '%s' (and everything under it)", directory)
     if dry_run:
         return
diff --git a/file_util.py b/file_util.py
index 00c5bc5b8e..65aa7e0fdd 100644
--- a/file_util.py
+++ b/file_util.py
@@ -112,7 +112,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
         dir = os.path.dirname(dst)
 
     if update and not newer(src, dst):
-        if verbose == 1:
+        if verbose >= 1:
             log.debug("not copying %s (output up-to-date)", src)
         return (dst, 0)
 
@@ -121,7 +121,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     except KeyError:
         raise ValueError("invalid value '%s' for 'link' argument" % link)
 
-    if verbose == 1:
+    if verbose >= 1:
         if os.path.basename(dst) == os.path.basename(src):
             log.info("%s %s -> %s", action, src, dir)
         else:
@@ -180,7 +180,7 @@ def move_file (src, dst,
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
 
-    if verbose == 1:
+    if verbose >= 1:
         log.info("moving %s -> %s", src, dst)
 
     if dry_run:

From 4ca827a930005d5a11aa21c4ee89374398c1baa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 01:15:51 +0000
Subject: [PATCH 2117/8469] fixed #1520877: now distutils reads Read  from the
 environment/Makefile

---
 sysconfig.py            |  9 ++++++---
 tests/test_sysconfig.py | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index ec2f8a9c33..deb51a1c1a 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -165,9 +165,9 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO')
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR')
 
         if 'CC' in os.environ:
             cc = os.environ['CC']
@@ -188,6 +188,8 @@ def customize_compiler(compiler):
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
             cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
 
         cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
@@ -196,7 +198,8 @@ def customize_compiler(compiler):
             compiler_so=cc_cmd + ' ' + ccshared,
             compiler_cxx=cxx,
             linker_so=ldshared,
-            linker_exe=cc)
+            linker_exe=cc,
+            archiver=ar)
 
         compiler.shared_lib_extension = so_ext
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 397bb12cfc..7f0bce63c9 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -8,6 +8,13 @@
 
 class SysconfigTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.old_AR = os.environ.get('AR')
+
+    def tearDown(self):
+        if self.old_AR is not None:
+            os.environ['AR'] = self.old_AR
+
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
         self.assert_(os.path.isfile(config_h), config_h)
@@ -32,6 +39,21 @@ def test_get_config_vars(self):
         self.assert_(isinstance(cvars, dict))
         self.assert_(cvars)
 
+    def test_customize_compiler(self):
+
+        os.environ['AR'] = 'xxx'
+
+        # make sure AR gets caught
+        class compiler:
+            compiler_type = 'unix'
+
+            def set_executables(self, **kw):
+                self.exes = kw
+
+        comp = compiler()
+        sysconfig.customize_compiler(comp)
+        self.assertEquals(comp.exes['archiver'], 'xxx')
+
 
 def test_suite():
     suite = unittest.TestSuite()

From 6512d9fd3c7bf335a66ba8338956f3f545a9999c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 01:18:36 +0000
Subject: [PATCH 2118/8469] Merged revisions 69342 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69342 | tarek.ziade | 2009-02-06 02:15:51 +0100 (Fri, 06 Feb 2009) | 1 line

  fixed #1520877: now distutils reads Read  from the environment/Makefile
........
---
 sysconfig.py            |  9 ++++++---
 tests/test_sysconfig.py | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index de8c5fccd6..386ae89b83 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -160,9 +160,9 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO')
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR')
 
         if 'CC' in os.environ:
             cc = os.environ['CC']
@@ -183,6 +183,8 @@ def customize_compiler(compiler):
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
             cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
 
         cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
@@ -191,7 +193,8 @@ def customize_compiler(compiler):
             compiler_so=cc_cmd + ' ' + ccshared,
             compiler_cxx=cxx,
             linker_so=ldshared,
-            linker_exe=cc)
+            linker_exe=cc,
+            archiver=ar)
 
         compiler.shared_lib_extension = so_ext
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 490410e126..cb802c62db 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -8,6 +8,13 @@
 
 class SysconfigTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.old_AR = os.environ.get('AR')
+
+    def tearDown(self):
+        if self.old_AR is not None:
+            os.environ['AR'] = self.old_AR
+
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
         self.assert_(os.path.isfile(config_h), config_h)
@@ -32,6 +39,21 @@ def test_get_config_vars(self):
         self.assert_(isinstance(cvars, dict))
         self.assert_(cvars)
 
+    def test_customize_compiler(self):
+
+        os.environ['AR'] = 'xxx'
+
+        # make sure AR gets caught
+        class compiler:
+            compiler_type = 'unix'
+
+            def set_executables(self, **kw):
+                self.exes = kw
+
+        comp = compiler()
+        sysconfig.customize_compiler(comp)
+        self.assertEquals(comp.exes['archiver'], 'xxx')
+
 
 def test_suite():
     suite = unittest.TestSuite()

From bd73f62c8e0bd56c41e540072a6ed1a0fff7cbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 08:20:15 +0000
Subject: [PATCH 2119/8469] Fixed #3987 : removed unused import

---
 core.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core.py b/core.py
index 0e85ca6f06..0fb6f81efb 100644
--- a/core.py
+++ b/core.py
@@ -9,7 +9,6 @@
 __revision__ = "$Id$"
 
 import sys, os
-from types import *
 
 from distutils.debug import DEBUG
 from distutils.errors import *

From 7f0b8ac04611f305e08185605d5be2825a7ee897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 08:55:23 +0000
Subject: [PATCH 2120/8469] removed types usage and added test coverage (work
 for #3986)

---
 cmd.py            | 22 +++++++++++++---------
 tests/test_cmd.py | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 tests/test_cmd.py

diff --git a/cmd.py b/cmd.py
index 267cf1802e..2d6cfb187b 100644
--- a/cmd.py
+++ b/cmd.py
@@ -7,8 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
-from types import *
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 from distutils import util, dir_util, file_util, archive_util, dep_util
 from distutils import log
 
@@ -220,7 +219,7 @@ def _ensure_stringlike (self, option, what, default=None):
         if val is None:
             setattr(self, option, default)
             return default
-        elif type(val) is not StringType:
+        elif not isinstance(val, str):
             raise DistutilsOptionError, \
                   "'%s' must be a %s (got `%s`)" % (option, what, val)
         return val
@@ -240,19 +239,24 @@ def ensure_string_list (self, option):
         val = getattr(self, option)
         if val is None:
             return
-        elif type(val) is StringType:
+        elif isinstance(val, str):
             setattr(self, option, re.split(r',\s*|\s+', val))
         else:
-            if type(val) is ListType:
-                types = map(type, val)
-                ok = (types == [StringType] * len(val))
+            if isinstance(val, list):
+                # checks if all elements are str
+                ok = 1
+                for element in val:
+                    if not isinstance(element, str):
+                        ok = 0
+                        break
             else:
                 ok = 0
 
             if not ok:
                 raise DistutilsOptionError, \
-                      "'%s' must be a list of strings (got %r)" % \
-                      (option, val)
+                    "'%s' must be a list of strings (got %r)" % \
+                        (option, val)
+
 
     def _ensure_tested_string (self, option, tester,
                                what, error_fmt, default=None):
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
new file mode 100644
index 0000000000..19079c033f
--- /dev/null
+++ b/tests/test_cmd.py
@@ -0,0 +1,38 @@
+"""Tests for distutils.cmd."""
+import unittest
+
+from distutils.cmd import Command
+from distutils.dist import Distribution
+from distutils.errors import DistutilsOptionError
+
+class CommandTestCase(unittest.TestCase):
+
+    def test_ensure_string_list(self):
+
+        class MyCmd(Command):
+
+            def initialize_options(self):
+                pass
+
+        dist = Distribution()
+        cmd = MyCmd(dist)
+
+        cmd.not_string_list = ['one', 2, 'three']
+        cmd.yes_string_list = ['one', 'two', 'three']
+        cmd.not_string_list2 = object()
+        cmd.yes_string_list2 = 'ok'
+
+        cmd.ensure_string_list('yes_string_list')
+        cmd.ensure_string_list('yes_string_list2')
+
+        self.assertRaises(DistutilsOptionError,
+                          cmd.ensure_string_list, 'not_string_list')
+
+        self.assertRaises(DistutilsOptionError,
+                          cmd.ensure_string_list, 'not_string_list2')
+
+def test_suite():
+    return unittest.makeSuite(CommandTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 296683d31be7741dbd12ab7ffcc2b8575564b540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 09:03:10 +0000
Subject: [PATCH 2121/8469] Merged revisions 69360 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69360 | tarek.ziade | 2009-02-06 09:55:23 +0100 (Fri, 06 Feb 2009) | 1 line

  removed types usage and added test coverage (work for #3986)
........
---
 cmd.py            |  2 +-
 tests/test_cmd.py | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_cmd.py

diff --git a/cmd.py b/cmd.py
index c6572caa5f..4669dc2d97 100644
--- a/cmd.py
+++ b/cmd.py
@@ -7,7 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 from distutils import util, dir_util, file_util, archive_util, dep_util
 from distutils import log
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
new file mode 100644
index 0000000000..19079c033f
--- /dev/null
+++ b/tests/test_cmd.py
@@ -0,0 +1,38 @@
+"""Tests for distutils.cmd."""
+import unittest
+
+from distutils.cmd import Command
+from distutils.dist import Distribution
+from distutils.errors import DistutilsOptionError
+
+class CommandTestCase(unittest.TestCase):
+
+    def test_ensure_string_list(self):
+
+        class MyCmd(Command):
+
+            def initialize_options(self):
+                pass
+
+        dist = Distribution()
+        cmd = MyCmd(dist)
+
+        cmd.not_string_list = ['one', 2, 'three']
+        cmd.yes_string_list = ['one', 'two', 'three']
+        cmd.not_string_list2 = object()
+        cmd.yes_string_list2 = 'ok'
+
+        cmd.ensure_string_list('yes_string_list')
+        cmd.ensure_string_list('yes_string_list2')
+
+        self.assertRaises(DistutilsOptionError,
+                          cmd.ensure_string_list, 'not_string_list')
+
+        self.assertRaises(DistutilsOptionError,
+                          cmd.ensure_string_list, 'not_string_list2')
+
+def test_suite():
+    return unittest.makeSuite(CommandTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 1db73ee62c96d75e13a8740fe35642ea7a8ac9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 13:27:38 +0000
Subject: [PATCH 2122/8469] Fixed #5167: test_customize_compiler does not apply
 under non unix compilers

---
 tests/test_sysconfig.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 7f0bce63c9..4636c0c127 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,6 +1,8 @@
 """Tests for distutils.dist."""
 
 from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
+
 import os
 import unittest
 
@@ -41,6 +43,10 @@ def test_get_config_vars(self):
 
     def test_customize_compiler(self):
 
+        # not testing if default compiler is not unix
+        if get_default_compiler() != 'unix':
+            return
+
         os.environ['AR'] = 'xxx'
 
         # make sure AR gets caught

From 04e222bc312426aa74df95a63623691e07324ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 6 Feb 2009 13:33:47 +0000
Subject: [PATCH 2123/8469] Merged revisions 69366 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69366 | tarek.ziade | 2009-02-06 14:27:38 +0100 (Fri, 06 Feb 2009) | 1 line

  Fixed #5167: test_customize_compiler does not apply under non unix compilers
........
---
 tests/test_sysconfig.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index cb802c62db..af6f183097 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,6 +1,8 @@
 """Tests for distutils.dist."""
 
 from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
+
 import os
 import unittest
 
@@ -41,6 +43,10 @@ def test_get_config_vars(self):
 
     def test_customize_compiler(self):
 
+        # not testing if default compiler is not unix
+        if get_default_compiler() != 'unix':
+            return
+
         os.environ['AR'] = 'xxx'
 
         # make sure AR gets caught

From ecaef925f14658bfbfc9d7ad6df97ec35a7b0591 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Fri, 6 Feb 2009 21:33:45 +0000
Subject: [PATCH 2124/8469] Convert "srcdir" into an absolute path if that
 seems prudent.  Currrently the only user of this is
 Lib/distutils/tests/test_build_ext.py (in order to find the source for
 xxmodule.c).  I'm not sure if other platforms need similar tweaks, I'm not
 brave enough to attempt it without being able to test.

---
 sysconfig.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index deb51a1c1a..4e06546acd 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -530,6 +530,20 @@ def get_config_vars(*args):
         if 'srcdir' not in _config_vars:
             _config_vars['srcdir'] = project_base
 
+        # Convert srcdir into an absolute path if it appears necessary.
+        # Normally it is relative to the build directory.  However, during
+        # testing, for example, we might be running a non-installed python
+        # from a different directory.
+        if python_build and os.name == "posix":
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if (not os.path.isabs(_config_vars['srcdir']) and
+                base != os.getcwd()):
+                # srcdir is relative and we are not in the same directory
+                # as the executable. Assume executable is in the build
+                # directory and make srcdir absolute.
+                srcdir = os.path.join(base, _config_vars['srcdir'])
+                _config_vars['srcdir'] = os.path.normpath(srcdir)
+
         if sys.platform == 'darwin':
             kernel_version = os.uname()[2] # Kernel version (8.4.3)
             major_version = int(kernel_version.split('.')[0])

From a719c0dc5cddc1cab0881c42889ad3df0b0dfcbd Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Fri, 6 Feb 2009 21:42:05 +0000
Subject: [PATCH 2125/8469] Make test_build_ext.py use sysconfig "srcdir" to
 find the source for xxmodule.c.  Have sysconfig make the srcdir path absolute
 if that seems necessary (running non-installed Python outside the build
 directory).

---
 sysconfig.py            | 14 ++++++++++++++
 tests/test_build_ext.py | 14 +++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 386ae89b83..a3ef3f6d88 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -504,6 +504,20 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        # Convert srcdir into an absolute path if it appears necessary.
+        # Normally it is relative to the build directory.  However, during
+        # testing, for example, we might be running a non-installed python
+        # from a different directory.
+        if python_build and os.name == "posix":
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if (not os.path.isabs(_config_vars['srcdir']) and
+                base != os.getcwd()):
+                # srcdir is relative and we are not in the same directory
+                # as the executable. Assume executable is in the build
+                # directory and make srcdir absolute.
+                srcdir = os.path.join(base, _config_vars['srcdir'])
+                _config_vars['srcdir'] = os.path.normpath(srcdir)
+
         if sys.platform == 'darwin':
             kernel_version = os.uname()[2] # Kernel version (8.4.3)
             major_version = int(kernel_version.split('.')[0])
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4c5723255a..5e42943c38 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -15,6 +15,10 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
+def _get_source_filename():
+    srcdir = sysconfig.get_config_var('srcdir')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+
 class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
@@ -22,9 +26,7 @@ def setUp(self):
         self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
-
-        xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
-        shutil.copy(xx_c, self.tmp_dir)
+        shutil.copy(_get_source_filename(), self.tmp_dir)
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -97,9 +99,11 @@ def test_solaris_enable_shared(self):
         self.assert_(len(cmd.library_dirs) > 0)
 
 def test_suite():
-    if not sysconfig.python_build:
+    src = _get_source_filename()
+    if not os.path.exists(src):
         if support.verbose:
-            print('test_build_ext: The test must be run in a python build dir')
+            print('test_build_ext: Cannot find source code (test'
+                  ' must run in python build dir)')
         return unittest.TestSuite()
     else: return unittest.makeSuite(BuildExtTestCase)
 

From d3802bd0332d6e460e0db6a66a230c261529bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 7 Feb 2009 00:05:39 +0000
Subject: [PATCH 2126/8469] #3986 replacing string and types call (like in the
 Py3k branch), and put exec_msg call at the right place

---
 cmd.py            | 30 ++++++++++++++---------------
 tests/test_cmd.py | 49 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/cmd.py b/cmd.py
index 2d6cfb187b..1351f445c3 100644
--- a/cmd.py
+++ b/cmd.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 from distutils.errors import DistutilsOptionError
 from distutils import util, dir_util, file_util, archive_util, dep_util
 from distutils import log
@@ -156,19 +156,19 @@ def finalize_options (self):
               "abstract method -- subclass %s must override" % self.__class__
 
 
-    def dump_options (self, header=None, indent=""):
+    def dump_options(self, header=None, indent=""):
         from distutils.fancy_getopt import longopt_xlate
         if header is None:
             header = "command options for '%s':" % self.get_command_name()
-        print indent + header
+        self.announce(indent + header, level=log.INFO)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = string.translate(option, longopt_xlate)
+            option = option.translate(longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
-            print indent + "%s = %s" % (option, value)
-
+            self.announce(indent + "%s = %s" % (option, value),
+                          level=log.INFO)
 
     def run (self):
         """A command's raison d'etre: carry out the action it exists to
@@ -405,8 +405,8 @@ def make_archive (self, base_name, format,
             base_name, format, root_dir, base_dir, dry_run=self.dry_run)
 
 
-    def make_file (self, infiles, outfile, func, args,
-                   exec_msg=None, skip_msg=None, level=1):
+    def make_file(self, infiles, outfile, func, args,
+                  exec_msg=None, skip_msg=None, level=1):
         """Special case of 'execute()' for operations that process one or
         more input files and generate one output file.  Works just like
         'execute()', except the operation is skipped and a different
@@ -415,24 +415,24 @@ def make_file (self, infiles, outfile, func, args,
         and it is true, then the command is unconditionally run -- does no
         timestamp checks.
         """
-        if exec_msg is None:
-            exec_msg = "generating %s from %s" % \
-                       (outfile, string.join(infiles, ', '))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
 
-
         # Allow 'infiles' to be a single string
-        if type(infiles) is StringType:
+        if isinstance(infiles, str):
             infiles = (infiles,)
-        elif type(infiles) not in (ListType, TupleType):
+        elif not isinstance(infiles, (list, tuple)):
             raise TypeError, \
                   "'infiles' must be a string, or a list or tuple of strings"
 
+        if exec_msg is None:
+            exec_msg = "generating %s from %s" % \
+                       (outfile, ', '.join(infiles))
+
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or dep_util.newer_group (infiles, outfile):
+        if self.force or dep_util.newer_group(infiles, outfile):
             self.execute(func, args, exec_msg, level)
 
         # Otherwise, print the "skip" message
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 19079c033f..a252c355e7 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -5,23 +5,23 @@
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
 
-class CommandTestCase(unittest.TestCase):
-
-    def test_ensure_string_list(self):
-
-        class MyCmd(Command):
+class MyCmd(Command):
+    def initialize_options(self):
+        pass
 
-            def initialize_options(self):
-                pass
+class CommandTestCase(unittest.TestCase):
 
+    def setUp(self):
         dist = Distribution()
-        cmd = MyCmd(dist)
+        self.cmd = MyCmd(dist)
+
+    def test_ensure_string_list(self):
 
+        cmd = self.cmd
         cmd.not_string_list = ['one', 2, 'three']
         cmd.yes_string_list = ['one', 'two', 'three']
         cmd.not_string_list2 = object()
         cmd.yes_string_list2 = 'ok'
-
         cmd.ensure_string_list('yes_string_list')
         cmd.ensure_string_list('yes_string_list2')
 
@@ -31,6 +31,37 @@ def initialize_options(self):
         self.assertRaises(DistutilsOptionError,
                           cmd.ensure_string_list, 'not_string_list2')
 
+    def test_make_file(self):
+
+        cmd = self.cmd
+
+        # making sure it raises when infiles is not a string or a list/tuple
+        self.assertRaises(TypeError, cmd.make_file,
+                          infiles=1, outfile='', func='func', args=())
+
+        # making sure execute gets called properly
+        def _execute(func, args, exec_msg, level):
+            self.assertEquals(exec_msg, 'generating out from in')
+        cmd.force = True
+        cmd.execute = _execute
+        cmd.make_file(infiles='in', outfile='out', func='func', args=())
+
+    def test_dump_options(self):
+
+        msgs = []
+        def _announce(msg, level):
+            msgs.append(msg)
+        cmd = self.cmd
+        cmd.announce = _announce
+        cmd.option1 = 1
+        cmd.option2 = 1
+        cmd.user_options = [('option1', '', ''), ('option2', '', '')]
+        cmd.dump_options()
+
+        wanted = ["command options for 'MyCmd':", '  option1 = 1',
+                  '  option2 = 1']
+        self.assertEquals(msgs, wanted)
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 

From 27713a8ca68d6cd642e8fbf239d763fbf9571a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 7 Feb 2009 00:10:48 +0000
Subject: [PATCH 2127/8469] Merged revisions 69385 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69385 | tarek.ziade | 2009-02-07 01:05:39 +0100 (Sat, 07 Feb 2009) | 1 line

  #3986 replacing string and types call (like in the Py3k branch), and put exec_msg call at the right place
........
---
 cmd.py            | 14 +++++++-------
 tests/test_cmd.py | 49 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/cmd.py b/cmd.py
index 4669dc2d97..295c914032 100644
--- a/cmd.py
+++ b/cmd.py
@@ -155,15 +155,15 @@ def dump_options(self, header=None, indent=""):
         from distutils.fancy_getopt import longopt_xlate
         if header is None:
             header = "command options for '%s':" % self.get_command_name()
-        print(indent + header)
+        self.announce(indent + header, level=log.INFO)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
             option = longopt_xlate(option)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
-            print(indent + "%s = %s" % (option, value))
-
+            self.announce(indent + "%s = %s" % (option, value),
+                          level=log.INFO)
 
     def run(self):
         """A command's raison d'etre: carry out the action it exists to
@@ -383,12 +383,9 @@ def make_file(self, infiles, outfile, func, args,
         and it is true, then the command is unconditionally run -- does no
         timestamp checks.
         """
-        if exec_msg is None:
-            exec_msg = "generating %s from %s" % (outfile, ', '.join(infiles))
         if skip_msg is None:
             skip_msg = "skipping %s (inputs unchanged)" % outfile
 
-
         # Allow 'infiles' to be a single string
         if isinstance(infiles, str):
             infiles = (infiles,)
@@ -396,10 +393,13 @@ def make_file(self, infiles, outfile, func, args,
             raise TypeError(
                   "'infiles' must be a string, or a list or tuple of strings")
 
+        if exec_msg is None:
+            exec_msg = "generating %s from %s" % (outfile, ', '.join(infiles))
+
         # If 'outfile' must be regenerated (either because it doesn't
         # exist, is out-of-date, or the 'force' flag is true) then
         # perform the action that presumably regenerates it
-        if self.force or dep_util.newer_group (infiles, outfile):
+        if self.force or dep_util.newer_group(infiles, outfile):
             self.execute(func, args, exec_msg, level)
         # Otherwise, print the "skip" message
         else:
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 19079c033f..a252c355e7 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -5,23 +5,23 @@
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
 
-class CommandTestCase(unittest.TestCase):
-
-    def test_ensure_string_list(self):
-
-        class MyCmd(Command):
+class MyCmd(Command):
+    def initialize_options(self):
+        pass
 
-            def initialize_options(self):
-                pass
+class CommandTestCase(unittest.TestCase):
 
+    def setUp(self):
         dist = Distribution()
-        cmd = MyCmd(dist)
+        self.cmd = MyCmd(dist)
+
+    def test_ensure_string_list(self):
 
+        cmd = self.cmd
         cmd.not_string_list = ['one', 2, 'three']
         cmd.yes_string_list = ['one', 'two', 'three']
         cmd.not_string_list2 = object()
         cmd.yes_string_list2 = 'ok'
-
         cmd.ensure_string_list('yes_string_list')
         cmd.ensure_string_list('yes_string_list2')
 
@@ -31,6 +31,37 @@ def initialize_options(self):
         self.assertRaises(DistutilsOptionError,
                           cmd.ensure_string_list, 'not_string_list2')
 
+    def test_make_file(self):
+
+        cmd = self.cmd
+
+        # making sure it raises when infiles is not a string or a list/tuple
+        self.assertRaises(TypeError, cmd.make_file,
+                          infiles=1, outfile='', func='func', args=())
+
+        # making sure execute gets called properly
+        def _execute(func, args, exec_msg, level):
+            self.assertEquals(exec_msg, 'generating out from in')
+        cmd.force = True
+        cmd.execute = _execute
+        cmd.make_file(infiles='in', outfile='out', func='func', args=())
+
+    def test_dump_options(self):
+
+        msgs = []
+        def _announce(msg, level):
+            msgs.append(msg)
+        cmd = self.cmd
+        cmd.announce = _announce
+        cmd.option1 = 1
+        cmd.option2 = 1
+        cmd.user_options = [('option1', '', ''), ('option2', '', '')]
+        cmd.dump_options()
+
+        wanted = ["command options for 'MyCmd':", '  option1 = 1',
+                  '  option2 = 1']
+        self.assertEquals(msgs, wanted)
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 

From 9ab19ddedbd4daab9af83c485e616857950ab225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 10 Feb 2009 12:31:09 +0000
Subject: [PATCH 2128/8469] Fixed #3386: the optional prefix argument was
 ignored under OS2 and NT in distutils.sysconfig.get_python_lib

---
 sysconfig.py            | 6 +++---
 tests/test_sysconfig.py | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 4e06546acd..56cb861a6c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -132,7 +132,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             if get_python_version() < "2.2":
                 return prefix
             else:
-                return os.path.join(PREFIX, "Lib", "site-packages")
+                return os.path.join(prefix, "Lib", "site-packages")
 
     elif os.name == "mac":
         if plat_specific:
@@ -148,9 +148,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 
     elif os.name == "os2":
         if standard_lib:
-            return os.path.join(PREFIX, "Lib")
+            return os.path.join(prefix, "Lib")
         else:
-            return os.path.join(PREFIX, "Lib", "site-packages")
+            return os.path.join(prefix, "Lib", "site-packages")
 
     else:
         raise DistutilsPlatformError(
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 4636c0c127..dd17eb347f 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -26,6 +26,8 @@ def test_get_python_lib(self):
         # XXX doesn't work on Linux when Python was never installed before
         #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
+        self.assertNotEqual(sysconfig.get_python_lib(),
+                            sysconfig.get_python_lib(prefix=TESTFN))
 
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()

From e21451406ffc2771198edca9bce2e5d5f570847d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 10 Feb 2009 12:33:42 +0000
Subject: [PATCH 2129/8469] Merged revisions 69485 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69485 | tarek.ziade | 2009-02-10 13:31:09 +0100 (Tue, 10 Feb 2009) | 1 line

  Fixed #3386: the optional prefix argument was ignored under OS2 and NT in distutils.sysconfig.get_python_lib
........
---
 sysconfig.py            | 6 +++---
 tests/test_sysconfig.py | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9993fba1ab..615da07e99 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -129,7 +129,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             if get_python_version() < "2.2":
                 return prefix
             else:
-                return os.path.join(PREFIX, "Lib", "site-packages")
+                return os.path.join(prefix, "Lib", "site-packages")
 
     elif os.name == "mac":
         if plat_specific:
@@ -145,9 +145,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 
     elif os.name == "os2":
         if standard_lib:
-            return os.path.join(PREFIX, "Lib")
+            return os.path.join(prefix, "Lib")
         else:
-            return os.path.join(PREFIX, "Lib", "site-packages")
+            return os.path.join(prefix, "Lib", "site-packages")
 
     else:
         raise DistutilsPlatformError(
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index aa1187e77b..9f820575ab 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -17,6 +17,8 @@ def test_get_python_lib(self):
         # XXX doesn't work on Linux when Python was never installed before
         #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
+        self.assertNotEqual(sysconfig.get_python_lib(),
+                            sysconfig.get_python_lib(prefix=TESTFN))
 
     def test_get_python_inc(self):
         # The check for srcdir is copied from Python's setup.py,

From a80b2645dfdc8e78856c0328942a46828e0d7de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 10 Feb 2009 12:36:33 +0000
Subject: [PATCH 2130/8469] Merged revisions 69485 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69485 | tarek.ziade | 2009-02-10 13:31:09 +0100 (Tue, 10 Feb 2009) | 1 line

  Fixed #3386: the optional prefix argument was ignored under OS2 and NT in distutils.sysconfig.get_python_lib
........
---
 sysconfig.py            | 6 +++---
 tests/test_sysconfig.py | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index a3ef3f6d88..fbeb45f8cc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -130,7 +130,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             if get_python_version() < "2.2":
                 return prefix
             else:
-                return os.path.join(PREFIX, "Lib", "site-packages")
+                return os.path.join(prefix, "Lib", "site-packages")
     elif os.name == "mac":
         if plat_specific:
             if standard_lib:
@@ -144,9 +144,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return os.path.join(prefix, "Lib", "site-packages")
     elif os.name == "os2":
         if standard_lib:
-            return os.path.join(PREFIX, "Lib")
+            return os.path.join(prefix, "Lib")
         else:
-            return os.path.join(PREFIX, "Lib", "site-packages")
+            return os.path.join(prefix, "Lib", "site-packages")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index af6f183097..1e9dbd542f 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -26,6 +26,8 @@ def test_get_python_lib(self):
         # XXX doesn't work on Linux when Python was never installed before
         #self.assert_(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
+        self.assertNotEqual(sysconfig.get_python_lib(),
+                            sysconfig.get_python_lib(prefix=TESTFN))
 
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()

From 99ce57fa1abba2aa6aa7dc3f49d08ff11338e624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 12 Feb 2009 20:56:21 +0000
Subject: [PATCH 2131/8469] fixing the leak introduced in r69304

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

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 780660da85..1891e682bc 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,6 +1,5 @@
 import sys
 import os
-import tempfile
 import shutil
 from StringIO import StringIO
 
@@ -19,7 +18,8 @@ class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
+        os.mkdir(self.tmp_dir)
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)

From 87c31b7e90c7799d4215ba2e59c503419e4052ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 12 Feb 2009 21:00:18 +0000
Subject: [PATCH 2132/8469] Merged revisions 69551 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69551 | tarek.ziade | 2009-02-12 21:56:21 +0100 (Thu, 12 Feb 2009) | 1 line

  fixing the leak introduced in r69304
........
---
 tests/test_build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d0cce9ba1a..00630ab908 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,6 +1,5 @@
 import sys
 import os
-import tempfile
 import shutil
 from StringIO import StringIO
 
@@ -15,7 +14,8 @@ class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
+        os.mkdir(self.tmp_dir)
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
 

From f2c97b50ebcf21d37019bf8c1121d2e5e05597b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 12 Feb 2009 21:02:07 +0000
Subject: [PATCH 2133/8469] Merged revisions 69551 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69551 | tarek.ziade | 2009-02-12 21:56:21 +0100 (Thu, 12 Feb 2009) | 1 line

  fixing the leak introduced in r69304
........
---
 tests/test_build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5e42943c38..aa5378c41a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,6 +1,5 @@
 import sys
 import os
-import tempfile
 import shutil
 from io import StringIO
 
@@ -23,7 +22,8 @@ class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
+        os.mkdir(self.tmp_dir)
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)

From 456ea0886e7494aec1cf4f9ef765c2be6f8a5151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 16:13:16 +0000
Subject: [PATCH 2134/8469] reverted leak fix, to use the one done in py3k
 branch (r67382)

---
 tests/test_build_ext.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 1891e682bc..3c7d228da7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,5 +1,6 @@
 import sys
 import os
+import tempfile
 import shutil
 from StringIO import StringIO
 
@@ -10,6 +11,10 @@
 import unittest
 from test import test_support
 
+# http://bugs.python.org/issue4373
+# Don't load the xx module more than once.
+ALREADY_TESTED = False
+
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
@@ -18,13 +23,13 @@ class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
-        os.mkdir(self.tmp_dir)
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
 
     def test_build_ext(self):
+        global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
@@ -47,6 +52,11 @@ def test_build_ext(self):
         finally:
             sys.stdout = old_stdout
 
+        if ALREADY_TESTED:
+            return
+        else:
+            ALREADY_TESTED = True
+
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):

From afc614eb0d2c7cb40779d00c168eb420b43e088a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 16:20:24 +0000
Subject: [PATCH 2135/8469] Merged revisions 69585 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69585 | tarek.ziade | 2009-02-13 17:13:16 +0100 (Fri, 13 Feb 2009) | 1 line

  reverted leak fix, to use the one done in py3k branch (r67382)
........
---
 tests/test_build_ext.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 00630ab908..dbec65e8d1 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,5 +1,6 @@
 import sys
 import os
+import tempfile
 import shutil
 from StringIO import StringIO
 
@@ -10,12 +11,15 @@
 import unittest
 from test import test_support
 
+# http://bugs.python.org/issue4373
+# Don't load the xx module more than once.
+ALREADY_TESTED = False
+
 class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
-        os.mkdir(self.tmp_dir)
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
 
@@ -23,6 +27,7 @@ def setUp(self):
         shutil.copy(xx_c, self.tmp_dir)
 
     def test_build_ext(self):
+        global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
@@ -45,6 +50,11 @@ def test_build_ext(self):
         finally:
             sys.stdout = old_stdout
 
+        if ALREADY_TESTED:
+            return
+        else:
+            ALREADY_TESTED = True
+
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):

From 0f3bc82cb894b6fb67b3006b6b749a9171710062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 16:23:57 +0000
Subject: [PATCH 2136/8469] Merged revisions 69585 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69585 | tarek.ziade | 2009-02-13 17:13:16 +0100 (Fri, 13 Feb 2009) | 1 line

  reverted leak fix, to use the one done in py3k branch (r67382)
........
---
 tests/test_build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index aa5378c41a..5e42943c38 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,5 +1,6 @@
 import sys
 import os
+import tempfile
 import shutil
 from io import StringIO
 
@@ -22,8 +23,7 @@ class BuildExtTestCase(unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = os.path.join(os.path.dirname(__file__), 'xx')
-        os.mkdir(self.tmp_dir)
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)

From fcbbe9c25a4ae1020ea705adbbb2b13269b8c6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 22:22:03 +0000
Subject: [PATCH 2137/8469] Issue #2461: added tests for distutils.util

---
 tests/test_util.py | 213 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)
 create mode 100644 tests/test_util.py

diff --git a/tests/test_util.py b/tests/test_util.py
new file mode 100644
index 0000000000..3505fe26e7
--- /dev/null
+++ b/tests/test_util.py
@@ -0,0 +1,213 @@
+"""Tests for distutils.util."""
+# not covered yet:
+#    - byte_compile
+#
+import os
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError
+
+from distutils.util import get_platform
+from distutils.util import convert_path
+from distutils.util import change_root
+from distutils.util import check_environ
+from distutils.util import split_quoted
+from distutils.util import strtobool
+from distutils.util import rfc822_escape
+
+from distutils import util # used to patch _environ_checked
+
+class utilTestCase(unittest.TestCase):
+
+    def setUp(self):
+        # saving the environment
+        self.name = os.name
+        self.platform = sys.platform
+        self.version = sys.version
+        self.sep = os.sep
+        self.environ = os.environ
+        self.join = os.path.join
+        self.isabs = os.path.isabs
+        self.splitdrive = os.path.splitdrive
+
+        # patching os.uname
+        if hasattr(os, 'uname'):
+            self.uname = os.uname
+            self._uname = os.uname()
+            os.uname = self._get_uname
+        else:
+            self.uname = None
+            self._uname = None
+
+    def tearDown(self):
+        # getting back tne environment
+        os.name = self.name
+        sys.platform = self.platform
+        sys.version = self.version
+        os.sep = self.sep
+        os.environ = self.environ
+        os.path.join = self.join
+        os.path.isabs = self.isabs
+        os.path.splitdrive = self.splitdrive
+        if self.uname is not None:
+            os.uname = self.uname
+
+    def _set_uname(self, uname):
+        self._uname = uname
+
+    def _get_uname(self):
+        return self._uname
+
+    def test_get_platform(self):
+
+        # windows XP, 32bits
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Intel)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win32')
+
+        # windows XP, amd64
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Amd64)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-amd64')
+
+        # windows XP, itanium
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Itanium)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-ia64')
+
+        # macbook
+        os.name = 'posix'
+        sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
+                       '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
+        sys.platform = 'darwin'
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+
+        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+
+        # linux debian sarge
+        os.name = 'posix'
+        sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
+                       '\n[GCC 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)]')
+        sys.platform = 'linux2'
+        self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
+                    '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
+
+        self.assertEquals(get_platform(), 'linux-i686')
+
+        # XXX more platforms to tests here
+
+    def test_convert_path(self):
+        # linux/mac
+        os.sep = '/'
+        def _join(path):
+            return '/'.join(path)
+        os.path.join = _join
+
+        self.assertEquals(convert_path('/home/to/my/stuff'),
+                          '/home/to/my/stuff')
+
+        # win
+        os.sep = '\\'
+        def _join(*path):
+            return '\\'.join(path)
+        os.path.join = _join
+
+        self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
+        self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
+
+        self.assertEquals(convert_path('home/to/my/stuff'),
+                          'home\\to\\my\\stuff')
+        self.assertEquals(convert_path('.'),
+                          os.curdir)
+
+    def test_change_root(self):
+        # linux/mac
+        os.name = 'posix'
+        def _isabs(path):
+            return path[0] == '/'
+        os.path.isabs = _isabs
+
+        self.assertEquals(change_root('/root', '/old/its/here'),
+                          '/root/old/its/here')
+        self.assertEquals(change_root('/root', 'its/here'),
+                          '/root/its/here')
+
+        # windows
+        os.name = 'nt'
+        def _isabs(path):
+            return path.startswith('c:\\')
+        os.path.isabs = _isabs
+        def _splitdrive(path):
+            if path.startswith('c:'):
+                return ('', path.replace('c:', ''))
+            return ('', path)
+        os.path.splitdrive = _splitdrive
+        def _join(*path):
+            return '\\'.join(path)
+        os.path.join = _join
+
+        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
+                          'c:\\root\\old\\its\\here')
+        self.assertEquals(change_root('c:\\root', 'its\\here'),
+                          'c:\\root\\its\\here')
+
+        # BugsBunny os (it's a great os)
+        os.name = 'BugsBunny'
+        self.assertRaises(DistutilsPlatformError,
+                          change_root, 'c:\\root', 'its\\here')
+
+        # XXX platforms to be covered: os2, mac
+
+    def test_check_environ(self):
+        util._environ_checked = 0
+
+        # posix without HOME
+        if os.name == 'posix':  # this test won't run on windows
+            os.environ = {}
+            check_environ()
+
+            import pwd
+            self.assertEquals(os.environ['HOME'],
+                              pwd.getpwuid(os.getuid())[5])
+        else:
+            check_environ()
+
+        self.assertEquals(os.environ['PLAT'], get_platform())
+        self.assertEquals(util._environ_checked, 1)
+
+    def test_split_quoted(self):
+        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
+                          ['one', 'two', 'three', 'four'])
+
+    def test_strtobool(self):
+        yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
+        no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
+
+        for y in yes:
+            self.assert_(strtobool(y))
+
+        for n in no:
+            self.assert_(not strtobool(n))
+
+    def test_rfc822_escape(self):
+        header = 'I am a\npoor\nlonesome\nheader\n'
+        res = rfc822_escape(header)
+        wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
+                  'header%(8s)s') % {'8s': '\n'+8*' '}
+        self.assertEquals(res, wanted)
+
+def test_suite():
+    return unittest.makeSuite(utilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 0bfae040eb480b3ac952d9ce384311f62af50825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 22:26:15 +0000
Subject: [PATCH 2138/8469] Merged revisions 69594 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69594 | tarek.ziade | 2009-02-13 23:22:03 +0100 (Fri, 13 Feb 2009) | 1 line

  Issue #2461: added tests for distutils.util
........
---
 tests/test_util.py | 213 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)
 create mode 100644 tests/test_util.py

diff --git a/tests/test_util.py b/tests/test_util.py
new file mode 100644
index 0000000000..3505fe26e7
--- /dev/null
+++ b/tests/test_util.py
@@ -0,0 +1,213 @@
+"""Tests for distutils.util."""
+# not covered yet:
+#    - byte_compile
+#
+import os
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError
+
+from distutils.util import get_platform
+from distutils.util import convert_path
+from distutils.util import change_root
+from distutils.util import check_environ
+from distutils.util import split_quoted
+from distutils.util import strtobool
+from distutils.util import rfc822_escape
+
+from distutils import util # used to patch _environ_checked
+
+class utilTestCase(unittest.TestCase):
+
+    def setUp(self):
+        # saving the environment
+        self.name = os.name
+        self.platform = sys.platform
+        self.version = sys.version
+        self.sep = os.sep
+        self.environ = os.environ
+        self.join = os.path.join
+        self.isabs = os.path.isabs
+        self.splitdrive = os.path.splitdrive
+
+        # patching os.uname
+        if hasattr(os, 'uname'):
+            self.uname = os.uname
+            self._uname = os.uname()
+            os.uname = self._get_uname
+        else:
+            self.uname = None
+            self._uname = None
+
+    def tearDown(self):
+        # getting back tne environment
+        os.name = self.name
+        sys.platform = self.platform
+        sys.version = self.version
+        os.sep = self.sep
+        os.environ = self.environ
+        os.path.join = self.join
+        os.path.isabs = self.isabs
+        os.path.splitdrive = self.splitdrive
+        if self.uname is not None:
+            os.uname = self.uname
+
+    def _set_uname(self, uname):
+        self._uname = uname
+
+    def _get_uname(self):
+        return self._uname
+
+    def test_get_platform(self):
+
+        # windows XP, 32bits
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Intel)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win32')
+
+        # windows XP, amd64
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Amd64)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-amd64')
+
+        # windows XP, itanium
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Itanium)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-ia64')
+
+        # macbook
+        os.name = 'posix'
+        sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
+                       '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
+        sys.platform = 'darwin'
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+
+        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+
+        # linux debian sarge
+        os.name = 'posix'
+        sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
+                       '\n[GCC 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)]')
+        sys.platform = 'linux2'
+        self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
+                    '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
+
+        self.assertEquals(get_platform(), 'linux-i686')
+
+        # XXX more platforms to tests here
+
+    def test_convert_path(self):
+        # linux/mac
+        os.sep = '/'
+        def _join(path):
+            return '/'.join(path)
+        os.path.join = _join
+
+        self.assertEquals(convert_path('/home/to/my/stuff'),
+                          '/home/to/my/stuff')
+
+        # win
+        os.sep = '\\'
+        def _join(*path):
+            return '\\'.join(path)
+        os.path.join = _join
+
+        self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
+        self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
+
+        self.assertEquals(convert_path('home/to/my/stuff'),
+                          'home\\to\\my\\stuff')
+        self.assertEquals(convert_path('.'),
+                          os.curdir)
+
+    def test_change_root(self):
+        # linux/mac
+        os.name = 'posix'
+        def _isabs(path):
+            return path[0] == '/'
+        os.path.isabs = _isabs
+
+        self.assertEquals(change_root('/root', '/old/its/here'),
+                          '/root/old/its/here')
+        self.assertEquals(change_root('/root', 'its/here'),
+                          '/root/its/here')
+
+        # windows
+        os.name = 'nt'
+        def _isabs(path):
+            return path.startswith('c:\\')
+        os.path.isabs = _isabs
+        def _splitdrive(path):
+            if path.startswith('c:'):
+                return ('', path.replace('c:', ''))
+            return ('', path)
+        os.path.splitdrive = _splitdrive
+        def _join(*path):
+            return '\\'.join(path)
+        os.path.join = _join
+
+        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
+                          'c:\\root\\old\\its\\here')
+        self.assertEquals(change_root('c:\\root', 'its\\here'),
+                          'c:\\root\\its\\here')
+
+        # BugsBunny os (it's a great os)
+        os.name = 'BugsBunny'
+        self.assertRaises(DistutilsPlatformError,
+                          change_root, 'c:\\root', 'its\\here')
+
+        # XXX platforms to be covered: os2, mac
+
+    def test_check_environ(self):
+        util._environ_checked = 0
+
+        # posix without HOME
+        if os.name == 'posix':  # this test won't run on windows
+            os.environ = {}
+            check_environ()
+
+            import pwd
+            self.assertEquals(os.environ['HOME'],
+                              pwd.getpwuid(os.getuid())[5])
+        else:
+            check_environ()
+
+        self.assertEquals(os.environ['PLAT'], get_platform())
+        self.assertEquals(util._environ_checked, 1)
+
+    def test_split_quoted(self):
+        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
+                          ['one', 'two', 'three', 'four'])
+
+    def test_strtobool(self):
+        yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
+        no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
+
+        for y in yes:
+            self.assert_(strtobool(y))
+
+        for n in no:
+            self.assert_(not strtobool(n))
+
+    def test_rfc822_escape(self):
+        header = 'I am a\npoor\nlonesome\nheader\n'
+        res = rfc822_escape(header)
+        wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
+                  'header%(8s)s') % {'8s': '\n'+8*' '}
+        self.assertEquals(res, wanted)
+
+def test_suite():
+    return unittest.makeSuite(utilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From c2f4d1be776acb70494ee8444cdf884c1a6cc32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 23:00:43 +0000
Subject: [PATCH 2139/8469] Fixed #4524: distutils build_script command failed
 with --with-suffix=3

---
 command/build_scripts.py    |  4 ++--
 tests/test_build_scripts.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 48e06aa562..2ad4c7beb9 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -102,8 +102,8 @@ def copy_scripts (self):
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
-                            "python" + sysconfig.get_config_var("VERSION")
-                                     + sysconfig.get_config_var("EXE")),
+                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
+                                           sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 666ca44c1d..2acfab828e 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,6 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
+from distutils import sysconfig
 
 from distutils.tests import support
 
@@ -73,6 +74,33 @@ def write_script(self, dir, name, text):
         f.write(text)
         f.close()
 
+    def test_version_int(self):
+        source = self.mkdtemp()
+        target = self.mkdtemp()
+        expected = self.write_sample_scripts(source)
+
+
+        cmd = self.get_build_scripts_cmd(target,
+                                         [os.path.join(source, fn)
+                                          for fn in expected])
+        cmd.finalize_options()
+
+        # http://bugs.python.org/issue4524
+        #
+        # On linux-g++-32 with command line `./configure --enable-ipv6
+        # --with-suffix=3`, python is compiled okay but the build scripts
+        # failed when writing the name of the executable
+        old = sysconfig._config_vars.get('VERSION')
+        sysconfig._config_vars['VERSION'] = 4
+        try:
+            cmd.run()
+        finally:
+            if old is not None:
+                sysconfig._config_vars['VERSION'] = old
+
+        built = os.listdir(target)
+        for name in expected:
+            self.assert_(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)

From adfa78507b8da0b97fc02a533eef0d015b9cae0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 23:02:44 +0000
Subject: [PATCH 2140/8469] Merged revisions 69598 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69598 | tarek.ziade | 2009-02-14 00:00:43 +0100 (Sat, 14 Feb 2009) | 1 line

  Fixed #4524: distutils build_script command failed with --with-suffix=3
........
---
 command/build_scripts.py    |  4 ++--
 tests/test_build_scripts.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 104be0b349..453330fea8 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -104,8 +104,8 @@ def copy_scripts (self):
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
-                            "python" + sysconfig.get_config_var("VERSION")
-                                     + sysconfig.get_config_var("EXE")),
+                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
+                                           sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 666ca44c1d..2acfab828e 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,6 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
+from distutils import sysconfig
 
 from distutils.tests import support
 
@@ -73,6 +74,33 @@ def write_script(self, dir, name, text):
         f.write(text)
         f.close()
 
+    def test_version_int(self):
+        source = self.mkdtemp()
+        target = self.mkdtemp()
+        expected = self.write_sample_scripts(source)
+
+
+        cmd = self.get_build_scripts_cmd(target,
+                                         [os.path.join(source, fn)
+                                          for fn in expected])
+        cmd.finalize_options()
+
+        # http://bugs.python.org/issue4524
+        #
+        # On linux-g++-32 with command line `./configure --enable-ipv6
+        # --with-suffix=3`, python is compiled okay but the build scripts
+        # failed when writing the name of the executable
+        old = sysconfig._config_vars.get('VERSION')
+        sysconfig._config_vars['VERSION'] = 4
+        try:
+            cmd.run()
+        finally:
+            if old is not None:
+                sysconfig._config_vars['VERSION'] = old
+
+        built = os.listdir(target)
+        for name in expected:
+            self.assert_(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)

From e63773a4f880dbec08188c94df28cbf90bc70881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 23:04:17 +0000
Subject: [PATCH 2141/8469] Merged revisions 69598 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69598 | tarek.ziade | 2009-02-14 00:00:43 +0100 (Sat, 14 Feb 2009) | 1 line

  Fixed #4524: distutils build_script command failed with --with-suffix=3
........
---
 command/build_scripts.py    |  4 ++--
 tests/test_build_scripts.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index dc04a9fcdb..8b08bfeaf0 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -104,8 +104,8 @@ def copy_scripts(self):
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
                             sysconfig.get_config_var("BINDIR"),
-                            "python" + sysconfig.get_config_var("VERSION")
-                                     + sysconfig.get_config_var("EXE")),
+                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
+                                           sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 666ca44c1d..2acfab828e 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,6 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
+from distutils import sysconfig
 
 from distutils.tests import support
 
@@ -73,6 +74,33 @@ def write_script(self, dir, name, text):
         f.write(text)
         f.close()
 
+    def test_version_int(self):
+        source = self.mkdtemp()
+        target = self.mkdtemp()
+        expected = self.write_sample_scripts(source)
+
+
+        cmd = self.get_build_scripts_cmd(target,
+                                         [os.path.join(source, fn)
+                                          for fn in expected])
+        cmd.finalize_options()
+
+        # http://bugs.python.org/issue4524
+        #
+        # On linux-g++-32 with command line `./configure --enable-ipv6
+        # --with-suffix=3`, python is compiled okay but the build scripts
+        # failed when writing the name of the executable
+        old = sysconfig._config_vars.get('VERSION')
+        sysconfig._config_vars['VERSION'] = 4
+        try:
+            cmd.run()
+        finally:
+            if old is not None:
+                sysconfig._config_vars['VERSION'] = old
+
+        built = os.listdir(target)
+        for name in expected:
+            self.assert_(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)

From a587bd4900a222cd112f56d03a88d3c8990c401c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 23:41:57 +0000
Subject: [PATCH 2142/8469] fix the environ for distutils test_util

---
 tests/test_util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 3505fe26e7..ca586268a3 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -35,11 +35,12 @@ def setUp(self):
         if hasattr(os, 'uname'):
             self.uname = os.uname
             self._uname = os.uname()
-            os.uname = self._get_uname
         else:
             self.uname = None
             self._uname = None
 
+        os.uname = self._get_uname
+
     def tearDown(self):
         # getting back tne environment
         os.name = self.name
@@ -91,6 +92,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
@@ -136,6 +138,9 @@ def test_change_root(self):
         def _isabs(path):
             return path[0] == '/'
         os.path.isabs = _isabs
+        def _join(*path):
+            return '/'.join(path)
+        os.path.join = _join
 
         self.assertEquals(change_root('/root', '/old/its/here'),
                           '/root/old/its/here')

From e1e318222b20681c360d5743872aedc2b5dc1c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 13 Feb 2009 23:48:11 +0000
Subject: [PATCH 2143/8469] Merged revisions 69602 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69602 | tarek.ziade | 2009-02-14 00:41:57 +0100 (Sat, 14 Feb 2009) | 1 line

  fix the environ for distutils test_util
........
---
 tests/test_util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 3505fe26e7..ca586268a3 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -35,11 +35,12 @@ def setUp(self):
         if hasattr(os, 'uname'):
             self.uname = os.uname
             self._uname = os.uname()
-            os.uname = self._get_uname
         else:
             self.uname = None
             self._uname = None
 
+        os.uname = self._get_uname
+
     def tearDown(self):
         # getting back tne environment
         os.name = self.name
@@ -91,6 +92,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
@@ -136,6 +138,9 @@ def test_change_root(self):
         def _isabs(path):
             return path[0] == '/'
         os.path.isabs = _isabs
+        def _join(*path):
+            return '/'.join(path)
+        os.path.join = _join
 
         self.assertEquals(change_root('/root', '/old/its/here'),
                           '/root/old/its/here')

From 7c81709c02b41f3d673fbf9e12c9ee4f6f853e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 14 Feb 2009 14:10:23 +0000
Subject: [PATCH 2144/8469] Fix for #5257: refactored all tests in distutils,
 so they use a temporary directory.

---
 tests/support.py        |  4 ++--
 tests/test_build_ext.py |  9 ++++----
 tests/test_config.py    | 13 ++++++-----
 tests/test_dir_util.py  | 13 ++++++-----
 tests/test_dist.py      | 30 +++++++++++--------------
 tests/test_file_util.py | 19 +++++++---------
 tests/test_sdist.py     | 50 +++++++++++++++++------------------------
 7 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 475ceee598..6dfc82cd5e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,5 +1,5 @@
 """Support code for distutils test cases."""
-
+import os
 import shutil
 import tempfile
 
@@ -31,7 +31,7 @@ def tearDown(self):
         super(TempdirManager, self).tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
-            shutil.rmtree(d)
+            shutil.rmtree(d, os.name in ('nt', 'cygwin'))
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 3c7d228da7..a38558b007 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -7,6 +7,7 @@
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
+from distutils.tests import support
 
 import unittest
 from test import test_support
@@ -19,11 +20,12 @@ def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-class BuildExtTestCase(unittest.TestCase):
+class BuildExtTestCase(support.TempdirManager, unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        support.TempdirManager.setUp(self)
+        self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
@@ -74,8 +76,7 @@ def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
         sys.path = self.sys_path
-        # XXX on Windows the test leaves a directory with xx module in TEMP
-        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
+        support.TempdirManager.tearDown(self)
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
diff --git a/tests/test_config.py b/tests/test_config.py
index cae7689884..d81276928a 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -2,6 +2,8 @@
 import sys
 import os
 import unittest
+import tempfile
+import shutil
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
@@ -49,13 +51,15 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
+        support.TempdirManager.setUp(self)
+
         if os.environ.has_key('HOME'):
             self._old_home = os.environ['HOME']
         else:
             self._old_home = None
-        curdir = os.path.dirname(__file__)
-        os.environ['HOME'] = curdir
-        self.rc = os.path.join(curdir, '.pypirc')
+        self.tmp_dir = self.mkdtemp()
+        os.environ['HOME'] = self.tmp_dir
+        self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
         class command(PyPIRCCommand):
@@ -74,9 +78,8 @@ def tearDown(self):
             del os.environ['HOME']
         else:
             os.environ['HOME'] = self._old_home
-        if os.path.exists(self.rc):
-            os.remove(self.rc)
         set_threshold(self.old_threshold)
+        support.TempdirManager.tearDown(self)
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index edf93c40c5..bf416b6d79 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -9,8 +9,9 @@
 from distutils.dir_util import copy_tree
 
 from distutils import log
+from distutils.tests import support
 
-class DirUtilTestCase(unittest.TestCase):
+class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
         if len(args) > 0:
@@ -19,18 +20,18 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
+        support.TempdirManager.setUp(self)
         self._logs = []
-        self.root_target = os.path.join(os.path.dirname(__file__), 'deep')
+        tmp_dir = self.mkdtemp()
+        self.root_target = os.path.join(tmp_dir, 'deep')
         self.target = os.path.join(self.root_target, 'here')
-        self.target2 = os.path.join(os.path.dirname(__file__), 'deep2')
+        self.target2 = os.path.join(tmp_dir, 'deep2')
         self.old_log = log.info
         log.info = self._log
 
     def tearDown(self):
-        for target in (self.target, self.target2):
-            if os.path.exists(target):
-                shutil.rmtree(target)
         log.info = self.old_log
+        support.TempdirManager.tearDown(self)
 
     def test_mkpath_remove_tree_verbosity(self):
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index bf59c41844..0e9868ae67 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -11,7 +11,7 @@
 import warnings
 
 from test.test_support import TESTFN
-
+from distutils.tests import support
 
 class test_dist(distutils.cmd.Command):
     """Sample distutils extension command."""
@@ -36,14 +36,16 @@ def find_config_files(self):
         return self._config_files
 
 
-class DistributionTestCase(unittest.TestCase):
+class DistributionTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
+        support.TempdirManager.setUp(self)
         self.argv = sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
         sys.argv[:] = self.argv
+        support.TempdirManager.tearDown(self)
 
     def create_distribution(self, configfiles=()):
         d = TestDistribution()
@@ -100,7 +102,8 @@ def test_command_packages_configfile(self):
 
     def test_write_pkg_file(self):
         # Check DistributionMetadata handling of Unicode fields
-        my_file = os.path.join(os.path.dirname(__file__), 'f')
+        tmp_dir = self.mkdtemp()
+        my_file = os.path.join(tmp_dir, 'f')
         klass = distutils.dist.Distribution
 
         dist = klass(attrs={'author': u'Mister Café',
@@ -113,11 +116,7 @@ def test_write_pkg_file(self):
         # let's make sure the file can be written
         # with Unicode fields. they are encoded with
         # PKG_INFO_ENCODING
-        try:
-            dist.metadata.write_pkg_file(open(my_file, 'w'))
-        finally:
-            if os.path.exists(my_file):
-                os.remove(my_file)
+        dist.metadata.write_pkg_file(open(my_file, 'w'))
 
         # regular ascii is of course always usable
         dist = klass(attrs={'author': 'Mister Cafe',
@@ -126,11 +125,8 @@ def test_write_pkg_file(self):
                             'description': 'Cafe torrefie',
                             'long_description': 'Hehehe'})
 
-        try:
-            dist.metadata.write_pkg_file(open(my_file, 'w'))
-        finally:
-            if os.path.exists(my_file):
-                os.remove(my_file)
+        my_file2 = os.path.join(tmp_dir, 'f2')
+        dist.metadata.write_pkg_file(open(my_file, 'w'))
 
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
@@ -155,7 +151,7 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
-class MetadataTestCase(unittest.TestCase):
+class MetadataTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_simple_metadata(self):
         attrs = {"name": "package",
@@ -254,8 +250,8 @@ def test_custom_pydistutils(self):
         else:
             user_filename = "pydistutils.cfg"
 
-        curdir = os.path.dirname(__file__)
-        user_filename = os.path.join(curdir, user_filename)
+        temp_dir = self.mkdtemp()
+        user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
         f.write('.')
         f.close()
@@ -265,7 +261,7 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = curdir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files)
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 523f1aef17..9373af8503 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -5,8 +5,9 @@
 
 from distutils.file_util import move_file
 from distutils import log
+from distutils.tests import support
 
-class FileUtilTestCase(unittest.TestCase):
+class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
         if len(args) > 0:
@@ -15,24 +16,20 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
+        support.TempdirManager.setUp(self)
         self._logs = []
         self.old_log = log.info
         log.info = self._log
-        self.source = os.path.join(os.path.dirname(__file__), 'f1')
-        self.target = os.path.join(os.path.dirname(__file__), 'f2')
-        self.target_dir = os.path.join(os.path.dirname(__file__), 'd1')
+        tmp_dir = self.mkdtemp()
+        self.source = os.path.join(tmp_dir, 'f1')
+        self.target = os.path.join(tmp_dir, 'f2')
+        self.target_dir = os.path.join(tmp_dir, 'd1')
 
     def tearDown(self):
         log.info = self.old_log
-        for f in (self.source, self.target, self.target_dir):
-            if os.path.exists(f):
-                if os.path.isfile(f):
-                    os.remove(f)
-                else:
-                    shutil.rmtree(f)
+        support.TempdirManager.tearDown(self)
 
     def test_move_file_verbosity(self):
-
         f = open(self.source, 'w')
         f.write('some content')
         f.close()
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 0d839b5c6e..b2e9800888 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -5,6 +5,7 @@
 import zipfile
 from os.path import join
 import sys
+import tempfile
 
 from distutils.command.sdist import sdist
 from distutils.core import Distribution
@@ -12,9 +13,6 @@
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
 
-CURDIR = os.path.dirname(__file__)
-TEMP_PKG = join(CURDIR, 'temppkg')
-
 SETUP_PY = """
 from distutils.core import setup
 import somecode
@@ -29,28 +27,25 @@
 class sdistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
+        # PyPIRCCommandTestCase creates a temp dir already
+        # and put it in self.tmp_dir
         PyPIRCCommandTestCase.setUp(self)
+        # setting up an environment
         self.old_path = os.getcwd()
+        os.mkdir(join(self.tmp_dir, 'somecode'))
+        os.mkdir(join(self.tmp_dir, 'dist'))
+        # creating a MANIFEST, a package, and a README
+        self._write(join(self.tmp_dir, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(self.tmp_dir, 'README'), 'xxx')
+        self._write(join(self.tmp_dir, 'somecode', '__init__.py'), '#')
+        self._write(join(self.tmp_dir, 'setup.py'), SETUP_PY)
+        os.chdir(self.tmp_dir)
 
     def tearDown(self):
+        # back to normal
         os.chdir(self.old_path)
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
         PyPIRCCommandTestCase.tearDown(self)
 
-    def _init_tmp_pkg(self):
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
-        os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-        os.mkdir(join(TEMP_PKG, 'dist'))
-        # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
-        os.chdir(TEMP_PKG)
-
     def _write(self, path, content):
         f = open(path, 'w')
         try:
@@ -62,18 +57,17 @@ def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
         # on all systems
-        self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
-        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
-        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+        os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
+        self._write(join(self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
-        self._write(join(TEMP_PKG, 'somecode', '.hg',
+        os.mkdir(join(self.tmp_dir, 'somecode', '.hg'))
+        self._write(join(self.tmp_dir, 'somecode', '.hg',
                          'ok'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
-        self._write(join(TEMP_PKG, 'somecode', '.git',
+        os.mkdir(join(self.tmp_dir, 'somecode', '.git'))
+        self._write(join(self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
         # now building a sdist
@@ -96,7 +90,7 @@ def test_prune_file_list(self):
         cmd.run()
 
         # now let's check what we have
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
         self.assertEquals(files, ['fake-1.0.zip'])
 
@@ -116,8 +110,6 @@ def test_make_distribution(self):
             find_executable('gzip') is None):
             return
 
-        self._init_tmp_pkg()
-
         # now building a sdist
         dist = Distribution()
         dist.script_name = 'setup.py'
@@ -137,7 +129,7 @@ def test_make_distribution(self):
         cmd.run()
 
         # making sure we have two files
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
         self.assertEquals(result,

From 9fa930f80d7a407b6a22441c9c2f04548f74eb87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 14 Feb 2009 14:12:30 +0000
Subject: [PATCH 2145/8469] Replace variable

---
 tests/test_dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 0e9868ae67..847df7bb60 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -268,7 +268,7 @@ def test_custom_pydistutils(self):
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOME'] = curdir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files,
                              '%r not found in %r' % (user_filename, files))

From 181cd140aa9a1b02ba4e592755cabe67fb034d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 14 Feb 2009 14:35:51 +0000
Subject: [PATCH 2146/8469] Merged revisions 69609 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69609 | tarek.ziade | 2009-02-14 15:10:23 +0100 (Sat, 14 Feb 2009) | 1 line

  Fix for #5257: refactored all tests in distutils, so they use a temporary directory.
........
---
 tests/support.py        |  4 ++--
 tests/test_build_ext.py |  9 ++++----
 tests/test_config.py    | 12 +++++-----
 tests/test_dir_util.py  | 13 ++++++-----
 tests/test_dist.py      | 11 ++++-----
 tests/test_file_util.py | 19 +++++++---------
 tests/test_sdist.py     | 50 +++++++++++++++++------------------------
 7 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 91e704cfcc..48bcbccfc5 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,5 +1,5 @@
 """Support code for distutils test cases."""
-
+import os
 import shutil
 import tempfile
 
@@ -31,7 +31,7 @@ def tearDown(self):
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
-            shutil.rmtree(d)
+            shutil.rmtree(d, os.name in ('nt', 'cygwin'))
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5e42943c38..91b3de85d2 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -7,6 +7,7 @@
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
+from distutils.tests.support import TempdirManager
 
 import unittest
 from test import support
@@ -19,11 +20,12 @@ def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-class BuildExtTestCase(unittest.TestCase):
+class BuildExtTestCase(TempdirManager, unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        TempdirManager.setUp(self)
+        self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
@@ -74,8 +76,7 @@ def tearDown(self):
         # Get everything back to normal
         support.unload('xx')
         sys.path = self.sys_path
-        # XXX on Windows the test leaves a directory with xx module in TEMP
-        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
+        TempdirManager.tearDown(self)
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
diff --git a/tests/test_config.py b/tests/test_config.py
index bdc9b2b539..0df6af8412 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import tempfile
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
@@ -49,13 +50,15 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
+        support.TempdirManager.setUp(self)
+
         if 'HOME' in os.environ:
             self._old_home = os.environ['HOME']
         else:
             self._old_home = None
-        curdir = os.path.dirname(__file__)
-        os.environ['HOME'] = curdir
-        self.rc = os.path.join(curdir, '.pypirc')
+        self.tmp_dir = self.mkdtemp()
+        os.environ['HOME'] = self.tmp_dir
+        self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
         class command(PyPIRCCommand):
@@ -74,9 +77,8 @@ def tearDown(self):
             del os.environ['HOME']
         else:
             os.environ['HOME'] = self._old_home
-        if os.path.exists(self.rc):
-            os.remove(self.rc)
         set_threshold(self.old_threshold)
+        support.TempdirManager.tearDown(self)
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index edf93c40c5..bf416b6d79 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -9,8 +9,9 @@
 from distutils.dir_util import copy_tree
 
 from distutils import log
+from distutils.tests import support
 
-class DirUtilTestCase(unittest.TestCase):
+class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
         if len(args) > 0:
@@ -19,18 +20,18 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
+        support.TempdirManager.setUp(self)
         self._logs = []
-        self.root_target = os.path.join(os.path.dirname(__file__), 'deep')
+        tmp_dir = self.mkdtemp()
+        self.root_target = os.path.join(tmp_dir, 'deep')
         self.target = os.path.join(self.root_target, 'here')
-        self.target2 = os.path.join(os.path.dirname(__file__), 'deep2')
+        self.target2 = os.path.join(tmp_dir, 'deep2')
         self.old_log = log.info
         log.info = self._log
 
     def tearDown(self):
-        for target in (self.target, self.target2):
-            if os.path.exists(target):
-                shutil.rmtree(target)
         log.info = self.old_log
+        support.TempdirManager.tearDown(self)
 
     def test_mkpath_remove_tree_verbosity(self):
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8e7ef5d33c..3ac0fdd1e1 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -9,6 +9,7 @@
 import warnings
 
 from test.support import TESTFN
+from distutils.tests import support
 
 
 class test_dist(distutils.cmd.Command):
@@ -120,7 +121,7 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
-class MetadataTestCase(unittest.TestCase):
+class MetadataTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_simple_metadata(self):
         attrs = {"name": "package",
@@ -219,8 +220,8 @@ def test_custom_pydistutils(self):
         else:
             user_filename = "pydistutils.cfg"
 
-        curdir = os.path.dirname(__file__)
-        user_filename = os.path.join(curdir, user_filename)
+        temp_dir = self.mkdtemp()
+        user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
         f.write('.')
         f.close()
@@ -230,14 +231,14 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = curdir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOME'] = curdir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 523f1aef17..9373af8503 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -5,8 +5,9 @@
 
 from distutils.file_util import move_file
 from distutils import log
+from distutils.tests import support
 
-class FileUtilTestCase(unittest.TestCase):
+class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
         if len(args) > 0:
@@ -15,24 +16,20 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
+        support.TempdirManager.setUp(self)
         self._logs = []
         self.old_log = log.info
         log.info = self._log
-        self.source = os.path.join(os.path.dirname(__file__), 'f1')
-        self.target = os.path.join(os.path.dirname(__file__), 'f2')
-        self.target_dir = os.path.join(os.path.dirname(__file__), 'd1')
+        tmp_dir = self.mkdtemp()
+        self.source = os.path.join(tmp_dir, 'f1')
+        self.target = os.path.join(tmp_dir, 'f2')
+        self.target_dir = os.path.join(tmp_dir, 'd1')
 
     def tearDown(self):
         log.info = self.old_log
-        for f in (self.source, self.target, self.target_dir):
-            if os.path.exists(f):
-                if os.path.isfile(f):
-                    os.remove(f)
-                else:
-                    shutil.rmtree(f)
+        support.TempdirManager.tearDown(self)
 
     def test_move_file_verbosity(self):
-
         f = open(self.source, 'w')
         f.write('some content')
         f.close()
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 0d839b5c6e..b2e9800888 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -5,6 +5,7 @@
 import zipfile
 from os.path import join
 import sys
+import tempfile
 
 from distutils.command.sdist import sdist
 from distutils.core import Distribution
@@ -12,9 +13,6 @@
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
 
-CURDIR = os.path.dirname(__file__)
-TEMP_PKG = join(CURDIR, 'temppkg')
-
 SETUP_PY = """
 from distutils.core import setup
 import somecode
@@ -29,28 +27,25 @@
 class sdistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
+        # PyPIRCCommandTestCase creates a temp dir already
+        # and put it in self.tmp_dir
         PyPIRCCommandTestCase.setUp(self)
+        # setting up an environment
         self.old_path = os.getcwd()
+        os.mkdir(join(self.tmp_dir, 'somecode'))
+        os.mkdir(join(self.tmp_dir, 'dist'))
+        # creating a MANIFEST, a package, and a README
+        self._write(join(self.tmp_dir, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(self.tmp_dir, 'README'), 'xxx')
+        self._write(join(self.tmp_dir, 'somecode', '__init__.py'), '#')
+        self._write(join(self.tmp_dir, 'setup.py'), SETUP_PY)
+        os.chdir(self.tmp_dir)
 
     def tearDown(self):
+        # back to normal
         os.chdir(self.old_path)
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
         PyPIRCCommandTestCase.tearDown(self)
 
-    def _init_tmp_pkg(self):
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
-        os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-        os.mkdir(join(TEMP_PKG, 'dist'))
-        # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
-        os.chdir(TEMP_PKG)
-
     def _write(self, path, content):
         f = open(path, 'w')
         try:
@@ -62,18 +57,17 @@ def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
         # on all systems
-        self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
-        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
-        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+        os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
+        self._write(join(self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
-        self._write(join(TEMP_PKG, 'somecode', '.hg',
+        os.mkdir(join(self.tmp_dir, 'somecode', '.hg'))
+        self._write(join(self.tmp_dir, 'somecode', '.hg',
                          'ok'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
-        self._write(join(TEMP_PKG, 'somecode', '.git',
+        os.mkdir(join(self.tmp_dir, 'somecode', '.git'))
+        self._write(join(self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
         # now building a sdist
@@ -96,7 +90,7 @@ def test_prune_file_list(self):
         cmd.run()
 
         # now let's check what we have
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
         self.assertEquals(files, ['fake-1.0.zip'])
 
@@ -116,8 +110,6 @@ def test_make_distribution(self):
             find_executable('gzip') is None):
             return
 
-        self._init_tmp_pkg()
-
         # now building a sdist
         dist = Distribution()
         dist.script_name = 'setup.py'
@@ -137,7 +129,7 @@ def test_make_distribution(self):
         cmd.run()
 
         # making sure we have two files
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
         self.assertEquals(result,

From 348e5075053db429b26d72a22fa7e671dd4935d0 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Feb 2009 18:22:15 +0000
Subject: [PATCH 2147/8469] remove another use of cmp()

---
 version.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/version.py b/version.py
index 77814377a5..79d458d847 100644
--- a/version.py
+++ b/version.py
@@ -338,7 +338,12 @@ def _cmp (self, other):
         if isinstance(other, str):
             other = LooseVersion(other)
 
-        return cmp(self.version, other.version)
+        if self.version == other.version:
+            return 0
+        if self.version < other.version:
+            return -1
+        if self.version > other.version:
+            return 1
 
 
 # end class LooseVersion

From 31babd18fd9e32d764982b2585265c50d90faf0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 16 Feb 2009 21:38:01 +0000
Subject: [PATCH 2148/8469] Fixed #2279: distutils.sdist.add_defaults now add
 files listed in package_data and data_files

---
 command/sdist.py    |  22 ++++++-
 tests/support.py    |  13 +++++
 tests/test_sdist.py | 137 ++++++++++++++++++++++++++++++--------------
 3 files changed, 129 insertions(+), 43 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index e8b6bce9c9..291e8123b8 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -259,6 +259,9 @@ def add_defaults (self):
           - setup.py
           - test/test*.py
           - all pure Python modules mentioned in setup script
+          - all files pointed by package_data (build_py)
+          - all files defined in data_files.
+          - all files defined as scripts.
           - all C sources listed as part of extensions or C libraries
             in the setup script (doesn't catch C headers!)
         Warns if (README or README.txt) or setup.py are missing; everything
@@ -291,10 +294,27 @@ def add_defaults (self):
             if files:
                 self.filelist.extend(files)
 
+        # build_py is used to get:
+        #  - python modules
+        #  - files defined in package_data
+        build_py = self.get_finalized_command('build_py')
+
+        # getting python files
         if self.distribution.has_pure_modules():
-            build_py = self.get_finalized_command('build_py')
             self.filelist.extend(build_py.get_source_files())
 
+        # getting package_data files
+        # (computed in build_py.data_files by build_py.finalize_options)
+        for pkg, src_dir, build_dir, filenames in build_py.data_files:
+            for filename in filenames:
+                self.filelist.append(os.path.join(src_dir, filename))
+
+        # getting distribution.data_files
+        if self.distribution.has_data_files():
+            for dirname, filenames in self.distribution.data_files:
+                for filename in filenames:
+                    self.filelist.append(os.path.join(dirname, filename))
+
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')
             self.filelist.extend(build_ext.get_source_files())
diff --git a/tests/support.py b/tests/support.py
index 6dfc82cd5e..fbbf35d8ea 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -42,6 +42,19 @@ def mkdtemp(self):
         self.tempdirs.append(d)
         return d
 
+    def write_file(self, path, content):
+        """Writes a file in the given path.
+
+
+        path can be a string or a sequence.
+        """
+        if isinstance(path, (list, tuple)):
+            path = os.path.join(*path)
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
 
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b2e9800888..de588112fd 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -12,6 +12,7 @@
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
+from distutils.tests import support
 
 SETUP_PY = """
 from distutils.core import setup
@@ -20,13 +21,20 @@
 setup(name='fake')
 """
 
-MANIFEST_IN = """
-recursive-include somecode *
+MANIFEST = """\
+README
+setup.py
+data/data.dt
+scripts/script.py
+somecode/__init__.py
+somecode/doc.dat
+somecode/doc.txt
 """
 
-class sdistTestCase(PyPIRCCommandTestCase):
+class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
     def setUp(self):
+        support.LoggingSilencer.setUp(self)
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
         PyPIRCCommandTestCase.setUp(self)
@@ -34,24 +42,34 @@ def setUp(self):
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
         os.mkdir(join(self.tmp_dir, 'dist'))
-        # creating a MANIFEST, a package, and a README
-        self._write(join(self.tmp_dir, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(self.tmp_dir, 'README'), 'xxx')
-        self._write(join(self.tmp_dir, 'somecode', '__init__.py'), '#')
-        self._write(join(self.tmp_dir, 'setup.py'), SETUP_PY)
+        # a package, and a README
+        self.write_file((self.tmp_dir, 'README'), 'xxx')
+        self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#')
+        self.write_file((self.tmp_dir, 'setup.py'), SETUP_PY)
         os.chdir(self.tmp_dir)
 
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
         PyPIRCCommandTestCase.tearDown(self)
-
-    def _write(self, path, content):
-        f = open(path, 'w')
-        try:
-            f.write(content)
-        finally:
-            f.close()
+        support.LoggingSilencer.tearDown(self)
+
+    def get_cmd(self, metadata=None):
+        """Returns a cmd"""
+        if metadata is None:
+            metadata = {'name': 'fake', 'version': '1.0',
+                        'url': 'xxx', 'author': 'xxx',
+                        'author_email': 'xxx'}
+        dist = Distribution(metadata)
+        dist.script_name = 'setup.py'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.dist_dir = 'dist'
+        def _warn(*args):
+            pass
+        cmd.warn = _warn
+        return dist, cmd
 
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
@@ -60,33 +78,24 @@ def test_prune_file_list(self):
 
         # creating VCS directories with some files in them
         os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
-        self._write(join(self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
+        self.write_file((self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
 
         os.mkdir(join(self.tmp_dir, 'somecode', '.hg'))
-        self._write(join(self.tmp_dir, 'somecode', '.hg',
+        self.write_file((self.tmp_dir, 'somecode', '.hg',
                          'ok'), 'xxx')
 
         os.mkdir(join(self.tmp_dir, 'somecode', '.git'))
-        self._write(join(self.tmp_dir, 'somecode', '.git',
+        self.write_file((self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
         # now building a sdist
-        dist = Distribution()
-        dist.script_name = 'setup.py'
-        dist.metadata.name = 'fake'
-        dist.metadata.version = '1.0'
-        dist.metadata.url = 'http://xxx'
-        dist.metadata.author = dist.metadata.author_email = 'xxx'
-        dist.packages = ['somecode']
-        dist.include_package_data = True
-        cmd = sdist(dist)
-        cmd.manifest = 'MANIFEST'
-        cmd.template = 'MANIFEST.in'
-        cmd.dist_dir = 'dist'
+        dist, cmd = self.get_cmd()
 
         # zip is available universally
         # (tar might not be installed under win32)
         cmd.formats = ['zip']
+
+        cmd.ensure_finalized()
         cmd.run()
 
         # now let's check what we have
@@ -111,21 +120,11 @@ def test_make_distribution(self):
             return
 
         # now building a sdist
-        dist = Distribution()
-        dist.script_name = 'setup.py'
-        dist.metadata.name = 'fake'
-        dist.metadata.version = '1.0'
-        dist.metadata.url = 'http://xxx'
-        dist.metadata.author = dist.metadata.author_email = 'xxx'
-        dist.packages = ['somecode']
-        dist.include_package_data = True
-        cmd = sdist(dist)
-        cmd.manifest = 'MANIFEST'
-        cmd.template = 'MANIFEST.in'
-        cmd.dist_dir = 'dist'
+        dist, cmd = self.get_cmd()
 
         # creating a gztar then a tar
         cmd.formats = ['gztar', 'tar']
+        cmd.ensure_finalized()
         cmd.run()
 
         # making sure we have two files
@@ -140,6 +139,8 @@ def test_make_distribution(self):
 
         # now trying a tar then a gztar
         cmd.formats = ['tar', 'gztar']
+
+        cmd.ensure_finalized()
         cmd.run()
 
         result = os.listdir(dist_folder)
@@ -147,6 +148,58 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    def test_add_defaults(self):
+
+        # http://bugs.python.org/issue2279
+
+        # add_default should also include
+        # data_files and package_data
+        dist, cmd = self.get_cmd()
+
+        # filling data_files by pointing files
+        # in package_data
+        dist.package_data = {'': ['*.cfg', '*.dat'],
+                             'somecode': ['*.txt']}
+        self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        self.write_file((self.tmp_dir, 'somecode', 'doc.dat'), '#')
+
+        # adding some data in data_files
+        data_dir = join(self.tmp_dir, 'data')
+        os.mkdir(data_dir)
+        self.write_file((data_dir, 'data.dt'), '#')
+        dist.data_files = [('data', ['data.dt'])]
+
+        # adding a script
+        script_dir = join(self.tmp_dir, 'scripts')
+        os.mkdir(script_dir)
+        self.write_file((script_dir, 'script.py'), '#')
+        dist.scripts = [join('scripts', 'script.py')]
+
+
+        cmd.formats = ['zip']
+        cmd.use_defaults = True
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # now let's check what we have
+        dist_folder = join(self.tmp_dir, 'dist')
+        files = os.listdir(dist_folder)
+        self.assertEquals(files, ['fake-1.0.zip'])
+
+        zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
+        try:
+            content = zip_file.namelist()
+        finally:
+            zip_file.close()
+
+        # making sure everything was added
+        self.assertEquals(len(content), 8)
+
+        # checking the MANIFEST
+        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
+        self.assertEquals(manifest, MANIFEST)
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 25e6f089801d3a41b308953ae1adcbd842968ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 16 Feb 2009 21:41:54 +0000
Subject: [PATCH 2149/8469] #2279: use os.sep so the MANIFEST file test work on
 win32

---
 tests/test_sdist.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index de588112fd..b4e922f90c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -24,11 +24,11 @@
 MANIFEST = """\
 README
 setup.py
-data/data.dt
-scripts/script.py
-somecode/__init__.py
-somecode/doc.dat
-somecode/doc.txt
+data%(sep)sdata.dt
+scripts%(sep)sscript.py
+somecode%(sep)s__init__.py
+somecode%(sep)sdoc.dat
+somecode%(sep)sdoc.txt
 """
 
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
@@ -198,7 +198,7 @@ def test_add_defaults(self):
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST)
+        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
 def test_suite():
     return unittest.makeSuite(sdistTestCase)

From edd4bb62c85ac3b9164bcf80930e849a78ae17e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 16 Feb 2009 21:49:12 +0000
Subject: [PATCH 2150/8469] Merged revisions 69692 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69692 | tarek.ziade | 2009-02-16 22:38:01 +0100 (Mon, 16 Feb 2009) | 1 line

  Fixed #2279: distutils.sdist.add_defaults now add files listed in package_data and data_files
........
---
 command/sdist.py    |  22 ++++++-
 tests/support.py    |  13 +++++
 tests/test_sdist.py | 137 ++++++++++++++++++++++++++++++--------------
 3 files changed, 129 insertions(+), 43 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 054fe191d4..c057b667e8 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -252,6 +252,9 @@ def add_defaults(self):
           - setup.py
           - test/test*.py
           - all pure Python modules mentioned in setup script
+          - all files pointed by package_data (build_py)
+          - all files defined in data_files.
+          - all files defined as scripts.
           - all C sources listed as part of extensions or C libraries
             in the setup script (doesn't catch C headers!)
         Warns if (README or README.txt) or setup.py are missing; everything
@@ -283,10 +286,27 @@ def add_defaults(self):
             if files:
                 self.filelist.extend(files)
 
+        # build_py is used to get:
+        #  - python modules
+        #  - files defined in package_data
+        build_py = self.get_finalized_command('build_py')
+
+        # getting python files
         if self.distribution.has_pure_modules():
-            build_py = self.get_finalized_command('build_py')
             self.filelist.extend(build_py.get_source_files())
 
+        # getting package_data files
+        # (computed in build_py.data_files by build_py.finalize_options)
+        for pkg, src_dir, build_dir, filenames in build_py.data_files:
+            for filename in filenames:
+                self.filelist.append(os.path.join(src_dir, filename))
+
+        # getting distribution.data_files
+        if self.distribution.has_data_files():
+            for dirname, filenames in self.distribution.data_files:
+                for filename in filenames:
+                    self.filelist.append(os.path.join(dirname, filename))
+
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')
             self.filelist.extend(build_ext.get_source_files())
diff --git a/tests/support.py b/tests/support.py
index 48bcbccfc5..ecc8da174e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -42,6 +42,19 @@ def mkdtemp(self):
         self.tempdirs.append(d)
         return d
 
+    def write_file(self, path, content):
+        """Writes a file in the given path.
+
+
+        path can be a string or a sequence.
+        """
+        if isinstance(path, (list, tuple)):
+            path = os.path.join(*path)
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
 
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b2e9800888..de588112fd 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -12,6 +12,7 @@
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
+from distutils.tests import support
 
 SETUP_PY = """
 from distutils.core import setup
@@ -20,13 +21,20 @@
 setup(name='fake')
 """
 
-MANIFEST_IN = """
-recursive-include somecode *
+MANIFEST = """\
+README
+setup.py
+data/data.dt
+scripts/script.py
+somecode/__init__.py
+somecode/doc.dat
+somecode/doc.txt
 """
 
-class sdistTestCase(PyPIRCCommandTestCase):
+class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
     def setUp(self):
+        support.LoggingSilencer.setUp(self)
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
         PyPIRCCommandTestCase.setUp(self)
@@ -34,24 +42,34 @@ def setUp(self):
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
         os.mkdir(join(self.tmp_dir, 'dist'))
-        # creating a MANIFEST, a package, and a README
-        self._write(join(self.tmp_dir, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(self.tmp_dir, 'README'), 'xxx')
-        self._write(join(self.tmp_dir, 'somecode', '__init__.py'), '#')
-        self._write(join(self.tmp_dir, 'setup.py'), SETUP_PY)
+        # a package, and a README
+        self.write_file((self.tmp_dir, 'README'), 'xxx')
+        self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#')
+        self.write_file((self.tmp_dir, 'setup.py'), SETUP_PY)
         os.chdir(self.tmp_dir)
 
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
         PyPIRCCommandTestCase.tearDown(self)
-
-    def _write(self, path, content):
-        f = open(path, 'w')
-        try:
-            f.write(content)
-        finally:
-            f.close()
+        support.LoggingSilencer.tearDown(self)
+
+    def get_cmd(self, metadata=None):
+        """Returns a cmd"""
+        if metadata is None:
+            metadata = {'name': 'fake', 'version': '1.0',
+                        'url': 'xxx', 'author': 'xxx',
+                        'author_email': 'xxx'}
+        dist = Distribution(metadata)
+        dist.script_name = 'setup.py'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.dist_dir = 'dist'
+        def _warn(*args):
+            pass
+        cmd.warn = _warn
+        return dist, cmd
 
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
@@ -60,33 +78,24 @@ def test_prune_file_list(self):
 
         # creating VCS directories with some files in them
         os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
-        self._write(join(self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
+        self.write_file((self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx')
 
         os.mkdir(join(self.tmp_dir, 'somecode', '.hg'))
-        self._write(join(self.tmp_dir, 'somecode', '.hg',
+        self.write_file((self.tmp_dir, 'somecode', '.hg',
                          'ok'), 'xxx')
 
         os.mkdir(join(self.tmp_dir, 'somecode', '.git'))
-        self._write(join(self.tmp_dir, 'somecode', '.git',
+        self.write_file((self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
         # now building a sdist
-        dist = Distribution()
-        dist.script_name = 'setup.py'
-        dist.metadata.name = 'fake'
-        dist.metadata.version = '1.0'
-        dist.metadata.url = 'http://xxx'
-        dist.metadata.author = dist.metadata.author_email = 'xxx'
-        dist.packages = ['somecode']
-        dist.include_package_data = True
-        cmd = sdist(dist)
-        cmd.manifest = 'MANIFEST'
-        cmd.template = 'MANIFEST.in'
-        cmd.dist_dir = 'dist'
+        dist, cmd = self.get_cmd()
 
         # zip is available universally
         # (tar might not be installed under win32)
         cmd.formats = ['zip']
+
+        cmd.ensure_finalized()
         cmd.run()
 
         # now let's check what we have
@@ -111,21 +120,11 @@ def test_make_distribution(self):
             return
 
         # now building a sdist
-        dist = Distribution()
-        dist.script_name = 'setup.py'
-        dist.metadata.name = 'fake'
-        dist.metadata.version = '1.0'
-        dist.metadata.url = 'http://xxx'
-        dist.metadata.author = dist.metadata.author_email = 'xxx'
-        dist.packages = ['somecode']
-        dist.include_package_data = True
-        cmd = sdist(dist)
-        cmd.manifest = 'MANIFEST'
-        cmd.template = 'MANIFEST.in'
-        cmd.dist_dir = 'dist'
+        dist, cmd = self.get_cmd()
 
         # creating a gztar then a tar
         cmd.formats = ['gztar', 'tar']
+        cmd.ensure_finalized()
         cmd.run()
 
         # making sure we have two files
@@ -140,6 +139,8 @@ def test_make_distribution(self):
 
         # now trying a tar then a gztar
         cmd.formats = ['tar', 'gztar']
+
+        cmd.ensure_finalized()
         cmd.run()
 
         result = os.listdir(dist_folder)
@@ -147,6 +148,58 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    def test_add_defaults(self):
+
+        # http://bugs.python.org/issue2279
+
+        # add_default should also include
+        # data_files and package_data
+        dist, cmd = self.get_cmd()
+
+        # filling data_files by pointing files
+        # in package_data
+        dist.package_data = {'': ['*.cfg', '*.dat'],
+                             'somecode': ['*.txt']}
+        self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        self.write_file((self.tmp_dir, 'somecode', 'doc.dat'), '#')
+
+        # adding some data in data_files
+        data_dir = join(self.tmp_dir, 'data')
+        os.mkdir(data_dir)
+        self.write_file((data_dir, 'data.dt'), '#')
+        dist.data_files = [('data', ['data.dt'])]
+
+        # adding a script
+        script_dir = join(self.tmp_dir, 'scripts')
+        os.mkdir(script_dir)
+        self.write_file((script_dir, 'script.py'), '#')
+        dist.scripts = [join('scripts', 'script.py')]
+
+
+        cmd.formats = ['zip']
+        cmd.use_defaults = True
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # now let's check what we have
+        dist_folder = join(self.tmp_dir, 'dist')
+        files = os.listdir(dist_folder)
+        self.assertEquals(files, ['fake-1.0.zip'])
+
+        zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
+        try:
+            content = zip_file.namelist()
+        finally:
+            zip_file.close()
+
+        # making sure everything was added
+        self.assertEquals(len(content), 8)
+
+        # checking the MANIFEST
+        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
+        self.assertEquals(manifest, MANIFEST)
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 431e410a6959dcad8b91db6b35d04ab9b956e787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 16 Feb 2009 21:51:13 +0000
Subject: [PATCH 2151/8469] Merged revisions 69693 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69693 | tarek.ziade | 2009-02-16 22:41:54 +0100 (Mon, 16 Feb 2009) | 1 line

  #2279: use os.sep so the MANIFEST file test work on win32
........
---
 tests/test_sdist.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index de588112fd..b4e922f90c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -24,11 +24,11 @@
 MANIFEST = """\
 README
 setup.py
-data/data.dt
-scripts/script.py
-somecode/__init__.py
-somecode/doc.dat
-somecode/doc.txt
+data%(sep)sdata.dt
+scripts%(sep)sscript.py
+somecode%(sep)s__init__.py
+somecode%(sep)sdoc.dat
+somecode%(sep)sdoc.txt
 """
 
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
@@ -198,7 +198,7 @@ def test_add_defaults(self):
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST)
+        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
 def test_suite():
     return unittest.makeSuite(sdistTestCase)

From 681c04f6333588b00ded56b7725cddc3ab2629d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 17 Feb 2009 09:42:44 +0000
Subject: [PATCH 2152/8469] #2279 added the plain path case for data_files

---
 command/sdist.py    | 16 ++++++++++++----
 tests/test_sdist.py | 14 +++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 291e8123b8..a1a0fb799d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -14,7 +14,7 @@
 from distutils.errors import *
 from distutils.filelist import FileList
 from distutils import log
-
+from distutils.util import convert_path
 
 def show_formats ():
     """Print all possible values for the 'formats' option (used by
@@ -311,9 +311,17 @@ def add_defaults (self):
 
         # getting distribution.data_files
         if self.distribution.has_data_files():
-            for dirname, filenames in self.distribution.data_files:
-                for filename in filenames:
-                    self.filelist.append(os.path.join(dirname, filename))
+            for item in self.distribution.data_files:
+                if isinstance(item, str): # plain file
+                    item = convert_path(item)
+                    if os.path.isfile(item):
+                        self.filelist.append(item)
+                else:    # a (dirname, filenames) tuple
+                    dirname, filenames = item
+                    for f in filenames:
+                        f = convert_path(os.path.join(dirname, f))
+                        if os.path.isfile(f):
+                            self.filelist.append(f)
 
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b4e922f90c..82e5dc6db6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -26,6 +26,8 @@
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
+some%(sep)sfile.txt
+some%(sep)sother_file.txt
 somecode%(sep)s__init__.py
 somecode%(sep)sdoc.dat
 somecode%(sep)sdoc.txt
@@ -167,7 +169,14 @@ def test_add_defaults(self):
         data_dir = join(self.tmp_dir, 'data')
         os.mkdir(data_dir)
         self.write_file((data_dir, 'data.dt'), '#')
-        dist.data_files = [('data', ['data.dt'])]
+        some_dir = join(self.tmp_dir, 'some')
+        os.mkdir(some_dir)
+        self.write_file((some_dir, 'file.txt'), '#')
+        self.write_file((some_dir, 'other_file.txt'), '#')
+
+        dist.data_files = [('data', ['data.dt', 'notexisting']),
+                           'some/file.txt',
+                           'some/other_file.txt']
 
         # adding a script
         script_dir = join(self.tmp_dir, 'scripts')
@@ -175,7 +184,6 @@ def test_add_defaults(self):
         self.write_file((script_dir, 'script.py'), '#')
         dist.scripts = [join('scripts', 'script.py')]
 
-
         cmd.formats = ['zip']
         cmd.use_defaults = True
 
@@ -194,7 +202,7 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 8)
+        self.assertEquals(len(content), 10)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

From 0040fcb0a57bed6b39e790e05fd542f37a43c2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 17 Feb 2009 09:47:25 +0000
Subject: [PATCH 2153/8469] Merged revisions 69710 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69710 | tarek.ziade | 2009-02-17 10:42:44 +0100 (Tue, 17 Feb 2009) | 1 line

  #2279 added the plain path case for data_files
........
---
 command/sdist.py    | 16 ++++++++++++----
 tests/test_sdist.py | 14 +++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index c057b667e8..9bb2ae04e0 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -15,7 +15,7 @@
 from distutils.errors import *
 from distutils.filelist import FileList
 from distutils import log
-
+from distutils.util import convert_path
 
 def show_formats ():
     """Print all possible values for the 'formats' option (used by
@@ -303,9 +303,17 @@ def add_defaults(self):
 
         # getting distribution.data_files
         if self.distribution.has_data_files():
-            for dirname, filenames in self.distribution.data_files:
-                for filename in filenames:
-                    self.filelist.append(os.path.join(dirname, filename))
+            for item in self.distribution.data_files:
+                if isinstance(item, str): # plain file
+                    item = convert_path(item)
+                    if os.path.isfile(item):
+                        self.filelist.append(item)
+                else:    # a (dirname, filenames) tuple
+                    dirname, filenames = item
+                    for f in filenames:
+                        f = convert_path(os.path.join(dirname, f))
+                        if os.path.isfile(f):
+                            self.filelist.append(f)
 
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b4e922f90c..82e5dc6db6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -26,6 +26,8 @@
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
+some%(sep)sfile.txt
+some%(sep)sother_file.txt
 somecode%(sep)s__init__.py
 somecode%(sep)sdoc.dat
 somecode%(sep)sdoc.txt
@@ -167,7 +169,14 @@ def test_add_defaults(self):
         data_dir = join(self.tmp_dir, 'data')
         os.mkdir(data_dir)
         self.write_file((data_dir, 'data.dt'), '#')
-        dist.data_files = [('data', ['data.dt'])]
+        some_dir = join(self.tmp_dir, 'some')
+        os.mkdir(some_dir)
+        self.write_file((some_dir, 'file.txt'), '#')
+        self.write_file((some_dir, 'other_file.txt'), '#')
+
+        dist.data_files = [('data', ['data.dt', 'notexisting']),
+                           'some/file.txt',
+                           'some/other_file.txt']
 
         # adding a script
         script_dir = join(self.tmp_dir, 'scripts')
@@ -175,7 +184,6 @@ def test_add_defaults(self):
         self.write_file((script_dir, 'script.py'), '#')
         dist.scripts = [join('scripts', 'script.py')]
 
-
         cmd.formats = ['zip']
         cmd.use_defaults = True
 
@@ -194,7 +202,7 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 8)
+        self.assertEquals(len(content), 10)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

From 2a11a83c076445fd2992eba94358bb0a3add5e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 17 Feb 2009 23:06:51 +0000
Subject: [PATCH 2154/8469] fixed the data_files inclusion behavior

---
 command/sdist.py    | 2 +-
 tests/test_sdist.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index a1a0fb799d..a9ce28a7eb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -319,7 +319,7 @@ def add_defaults (self):
                 else:    # a (dirname, filenames) tuple
                     dirname, filenames = item
                     for f in filenames:
-                        f = convert_path(os.path.join(dirname, f))
+                        f = convert_path(f)
                         if os.path.isfile(f):
                             self.filelist.append(f)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 82e5dc6db6..9c579b40cb 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -23,6 +23,7 @@
 
 MANIFEST = """\
 README
+inroot.txt
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
@@ -171,10 +172,13 @@ def test_add_defaults(self):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
-        dist.data_files = [('data', ['data.dt', 'notexisting']),
+        dist.data_files = [('data', ['data/data.dt',
+                                     'inroot.txt',
+                                     'notexisting']),
                            'some/file.txt',
                            'some/other_file.txt']
 
@@ -202,7 +206,7 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 10)
+        self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

From b235b6fad51c8f78e05ccc88e5eddf43f7e2aaba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 17 Feb 2009 23:10:18 +0000
Subject: [PATCH 2155/8469] Merged revisions 69724 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69724 | tarek.ziade | 2009-02-18 00:06:51 +0100 (Wed, 18 Feb 2009) | 1 line

  fixed the data_files inclusion behavior
........
---
 command/sdist.py    | 2 +-
 tests/test_sdist.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 9bb2ae04e0..1a64d0e3c1 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -311,7 +311,7 @@ def add_defaults(self):
                 else:    # a (dirname, filenames) tuple
                     dirname, filenames = item
                     for f in filenames:
-                        f = convert_path(os.path.join(dirname, f))
+                        f = convert_path(f)
                         if os.path.isfile(f):
                             self.filelist.append(f)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 82e5dc6db6..9c579b40cb 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -23,6 +23,7 @@
 
 MANIFEST = """\
 README
+inroot.txt
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
@@ -171,10 +172,13 @@ def test_add_defaults(self):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
-        dist.data_files = [('data', ['data.dt', 'notexisting']),
+        dist.data_files = [('data', ['data/data.dt',
+                                     'inroot.txt',
+                                     'notexisting']),
                            'some/file.txt',
                            'some/other_file.txt']
 
@@ -202,7 +206,7 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 10)
+        self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

From 9f19d45baca8e8371e5706a41dfe3d6352f7a2dc Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 21 Feb 2009 20:27:01 +0000
Subject: [PATCH 2156/8469] Issue #5341: Fix a variety of spelling errors.

---
 tests/test_core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 55d2d5df7e..e481e8de39 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -57,7 +57,7 @@ def test_run_setup_provides_file(self):
 
     def test_run_setup_uses_current_dir(self):
         # This tests that the setup script is run with the current directory
-        # as it's own current directory; this was temporarily broken by a
+        # as its own current directory; this was temporarily broken by a
         # previous patch when TESTFN did not use the current directory.
         sys.stdout = StringIO.StringIO()
         cwd = os.getcwd()

From 763718d5ed62b5076d9c022846e703eafa932a2f Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 21 Feb 2009 20:59:32 +0000
Subject: [PATCH 2157/8469] Merged revisions 69846 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines

  Issue #5341: Fix a variety of spelling errors.
........
---
 tests/test_core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 170d76751e..7f021dcb3b 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -57,7 +57,7 @@ def test_run_setup_provides_file(self):
 
     def test_run_setup_uses_current_dir(self):
         # This tests that the setup script is run with the current directory
-        # as it's own current directory; this was temporarily broken by a
+        # as its own current directory; this was temporarily broken by a
         # previous patch when TESTFN did not use the current directory.
         sys.stdout = io.StringIO()
         cwd = os.getcwd()

From c0250c3b53f9dc239e467e52403e1dd464b59130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 22 Feb 2009 19:58:12 +0000
Subject: [PATCH 2158/8469] moved distutils.text_file tests into a real
 unittest class

---
 tests/test_text_file.py | 87 +++++++++++++++++++++++++++++++++++++++++
 text_file.py            | 77 ------------------------------------
 2 files changed, 87 insertions(+), 77 deletions(-)
 create mode 100644 tests/test_text_file.py

diff --git a/tests/test_text_file.py b/tests/test_text_file.py
new file mode 100644
index 0000000000..8f4f7e83c0
--- /dev/null
+++ b/tests/test_text_file.py
@@ -0,0 +1,87 @@
+"""Tests for distutils.text_file."""
+import os
+import unittest
+from distutils.text_file import TextFile
+from distutils.tests import support
+
+TEST_DATA = """# test file
+
+line 3 \\
+# intervening comment
+  continues on next line
+"""
+
+class TextFileTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_class(self):
+        # old tests moved from text_file.__main__
+        # so they are really called by the buildbots
+
+        # result 1: no fancy options
+        result1 = map(lambda x: x + "\n",
+                      TEST_DATA.split("\n")[0:-1])
+
+        # result 2: just strip comments
+        result2 = ["\n",
+                   "line 3 \\\n",
+                   "  continues on next line\n"]
+
+        # result 3: just strip blank lines
+        result3 = ["# test file\n",
+                   "line 3 \\\n",
+                   "# intervening comment\n",
+                   "  continues on next line\n"]
+
+        # result 4: default, strip comments, blank lines,
+        # and trailing whitespace
+        result4 = ["line 3 \\",
+                   "  continues on next line"]
+
+        # result 5: strip comments and blanks, plus join lines (but don't
+        # "collapse" joined lines
+        result5 = ["line 3   continues on next line"]
+
+        # result 6: strip comments and blanks, plus join lines (and
+        # "collapse" joined lines
+        result6 = ["line 3 continues on next line"]
+
+        def test_input(count, description, file, expected_result):
+            result = file.readlines()
+            self.assertEquals(result, expected_result)
+
+        tmpdir = self.mkdtemp()
+        filename = os.path.join(tmpdir, "test.txt")
+        out_file = open(filename, "w")
+        try:
+            out_file.write(TEST_DATA)
+        finally:
+            out_file.close()
+
+        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (1, "no processing", in_file, result1)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (2, "strip comments", in_file, result2)
+
+        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (3, "strip blanks", in_file, result3)
+
+        in_file = TextFile (filename)
+        test_input (4, "default processing", in_file, result4)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                            join_lines=1, rstrip_ws=1)
+        test_input (5, "join lines without collapsing", in_file, result5)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                            join_lines=1, rstrip_ws=1, collapse_join=1)
+        test_input (6, "join lines with collapsing", in_file, result6)
+
+def test_suite():
+    return unittest.makeSuite(TextFileTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/text_file.py b/text_file.py
index ff2878de1b..931f0bac19 100644
--- a/text_file.py
+++ b/text_file.py
@@ -303,80 +303,3 @@ def unreadline (self, line):
            a parser with line-at-a-time lookahead."""
 
         self.linebuf.append (line)
-
-
-if __name__ == "__main__":
-    test_data = """# test file
-
-line 3 \\
-# intervening comment
-  continues on next line
-"""
-    # result 1: no fancy options
-    result1 = map (lambda x: x + "\n", string.split (test_data, "\n")[0:-1])
-
-    # result 2: just strip comments
-    result2 = ["\n",
-               "line 3 \\\n",
-               "  continues on next line\n"]
-
-    # result 3: just strip blank lines
-    result3 = ["# test file\n",
-               "line 3 \\\n",
-               "# intervening comment\n",
-               "  continues on next line\n"]
-
-    # result 4: default, strip comments, blank lines, and trailing whitespace
-    result4 = ["line 3 \\",
-               "  continues on next line"]
-
-    # result 5: strip comments and blanks, plus join lines (but don't
-    # "collapse" joined lines
-    result5 = ["line 3   continues on next line"]
-
-    # result 6: strip comments and blanks, plus join lines (and
-    # "collapse" joined lines
-    result6 = ["line 3 continues on next line"]
-
-    def test_input (count, description, file, expected_result):
-        result = file.readlines ()
-        # result = string.join (result, '')
-        if result == expected_result:
-            print "ok %d (%s)" % (count, description)
-        else:
-            print "not ok %d (%s):" % (count, description)
-            print "** expected:"
-            print expected_result
-            print "** received:"
-            print result
-
-
-    filename = "test.txt"
-    out_file = open (filename, "w")
-    out_file.write (test_data)
-    out_file.close ()
-
-    in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (1, "no processing", in_file, result1)
-
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (2, "strip comments", in_file, result2)
-
-    in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                        lstrip_ws=0, rstrip_ws=0)
-    test_input (3, "strip blanks", in_file, result3)
-
-    in_file = TextFile (filename)
-    test_input (4, "default processing", in_file, result4)
-
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                        join_lines=1, rstrip_ws=1)
-    test_input (5, "join lines without collapsing", in_file, result5)
-
-    in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                        join_lines=1, rstrip_ws=1, collapse_join=1)
-    test_input (6, "join lines with collapsing", in_file, result6)
-
-    os.remove (filename)

From 91c68e1501720ba1fb7c6533c469a0972be2ebed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 22 Feb 2009 20:05:16 +0000
Subject: [PATCH 2159/8469] Merged revisions 69874 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69874 | tarek.ziade | 2009-02-22 20:58:12 +0100 (Sun, 22 Feb 2009) | 1 line

  moved distutils.text_file tests into a real unittest class
........
---
 tests/test_text_file.py | 88 +++++++++++++++++++++++++++++++++++++++++
 text_file.py            | 77 ------------------------------------
 2 files changed, 88 insertions(+), 77 deletions(-)
 create mode 100644 tests/test_text_file.py

diff --git a/tests/test_text_file.py b/tests/test_text_file.py
new file mode 100644
index 0000000000..00f083a130
--- /dev/null
+++ b/tests/test_text_file.py
@@ -0,0 +1,88 @@
+"""Tests for distutils.text_file."""
+import os
+import unittest
+from distutils.text_file import TextFile
+from distutils.tests import support
+
+TEST_DATA = """# test file
+
+line 3 \\
+# intervening comment
+  continues on next line
+"""
+
+class TextFileTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_class(self):
+        # old tests moved from text_file.__main__
+        # so they are really called by the buildbots
+
+        # result 1: no fancy options
+        result1 = ['# test file\n', '\n', 'line 3 \\\n',
+                   '# intervening comment\n',
+                   '  continues on next line\n']
+
+        # result 2: just strip comments
+        result2 = ["\n",
+                   "line 3 \\\n",
+                   "  continues on next line\n"]
+
+        # result 3: just strip blank lines
+        result3 = ["# test file\n",
+                   "line 3 \\\n",
+                   "# intervening comment\n",
+                   "  continues on next line\n"]
+
+        # result 4: default, strip comments, blank lines,
+        # and trailing whitespace
+        result4 = ["line 3 \\",
+                   "  continues on next line"]
+
+        # result 5: strip comments and blanks, plus join lines (but don't
+        # "collapse" joined lines
+        result5 = ["line 3   continues on next line"]
+
+        # result 6: strip comments and blanks, plus join lines (and
+        # "collapse" joined lines
+        result6 = ["line 3 continues on next line"]
+
+        def test_input(count, description, file, expected_result):
+            result = file.readlines()
+            self.assertEquals(result, expected_result)
+
+        tmpdir = self.mkdtemp()
+        filename = os.path.join(tmpdir, "test.txt")
+        out_file = open(filename, "w")
+        try:
+            out_file.write(TEST_DATA)
+        finally:
+            out_file.close()
+
+        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (1, "no processing", in_file, result1)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (2, "strip comments", in_file, result2)
+
+        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
+                            lstrip_ws=0, rstrip_ws=0)
+        test_input (3, "strip blanks", in_file, result3)
+
+        in_file = TextFile (filename)
+        test_input (4, "default processing", in_file, result4)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                            join_lines=1, rstrip_ws=1)
+        test_input (5, "join lines without collapsing", in_file, result5)
+
+        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+                            join_lines=1, rstrip_ws=1, collapse_join=1)
+        test_input (6, "join lines with collapsing", in_file, result6)
+
+def test_suite():
+    return unittest.makeSuite(TextFileTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/text_file.py b/text_file.py
index 266466c1eb..97459fbf73 100644
--- a/text_file.py
+++ b/text_file.py
@@ -282,80 +282,3 @@ def unreadline(self, line):
            checked by future 'readline()' calls.  Handy for implementing
            a parser with line-at-a-time lookahead."""
         self.linebuf.append(line)
-
-
-if __name__ == "__main__":
-    test_data = """# test file
-
-line 3 \\
-# intervening comment
-  continues on next line
-"""
-    # result 1: no fancy options
-    result1 = [x + "\n" for x in test_data.split("\n")[:-1]]
-
-    # result 2: just strip comments
-    result2 = ["\n",
-               "line 3 \\\n",
-               "  continues on next line\n"]
-
-    # result 3: just strip blank lines
-    result3 = ["# test file\n",
-               "line 3 \\\n",
-               "# intervening comment\n",
-               "  continues on next line\n"]
-
-    # result 4: default, strip comments, blank lines, and trailing whitespace
-    result4 = ["line 3 \\",
-               "  continues on next line"]
-
-    # result 5: strip comments and blanks, plus join lines (but don't
-    # "collapse" joined lines
-    result5 = ["line 3   continues on next line"]
-
-    # result 6: strip comments and blanks, plus join lines (and
-    # "collapse" joined lines
-    result6 = ["line 3 continues on next line"]
-
-    def test_input(count, description, file, expected_result):
-        result = file.readlines()
-        if result == expected_result:
-            print("ok %d (%s)" % (count, description))
-        else:
-            print("not ok %d (%s):" % (count, description))
-            print("** expected:")
-            print(expected_result)
-            print("** received:")
-            print(result)
-
-
-    filename = "test.txt"
-    out_file = open(filename, "w")
-    out_file.write(test_data)
-    out_file.close()
-
-    in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
-                       lstrip_ws=0, rstrip_ws=0)
-    test_input(1, "no processing", in_file, result1)
-
-    in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
-                       lstrip_ws=0, rstrip_ws=0)
-    test_input(2, "strip comments", in_file, result2)
-
-    in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
-                       lstrip_ws=0, rstrip_ws=0)
-    test_input(3, "strip blanks", in_file, result3)
-
-    in_file = TextFile(filename)
-    test_input(4, "default processing", in_file, result4)
-
-    in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
-                       join_lines=1, rstrip_ws=1)
-    test_input(5, "join lines without collapsing", in_file, result5)
-
-    in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
-                       join_lines=1, rstrip_ws=1, collapse_join=1)
-    test_input(6, "join lines with collapsing", in_file, result6)
-
-    del in_file
-    os.remove(filename)

From df1fb3abf4e8b2bcaaedd4057dd3a4ff2d4231fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 22 Feb 2009 20:11:46 +0000
Subject: [PATCH 2160/8469] removing map and lambda usage, so the test is
 similar to py3k's branch one

---
 tests/test_text_file.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 8f4f7e83c0..00f083a130 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -18,8 +18,9 @@ def test_class(self):
         # so they are really called by the buildbots
 
         # result 1: no fancy options
-        result1 = map(lambda x: x + "\n",
-                      TEST_DATA.split("\n")[0:-1])
+        result1 = ['# test file\n', '\n', 'line 3 \\\n',
+                   '# intervening comment\n',
+                   '  continues on next line\n']
 
         # result 2: just strip comments
         result2 = ["\n",

From 305462a33f5cb3a50f50fb3c913b59e8e34eb4e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 22 Feb 2009 20:15:41 +0000
Subject: [PATCH 2161/8469] Removing unused __main__ sections

---
 cmd.py  | 4 ----
 dist.py | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/cmd.py b/cmd.py
index 1351f445c3..012fca15b5 100644
--- a/cmd.py
+++ b/cmd.py
@@ -474,7 +474,3 @@ def _copy_files (self, filelist):
 
     def get_outputs (self):
         return self.outfiles
-
-
-if __name__ == "__main__":
-    print "ok"
diff --git a/dist.py b/dist.py
index 3dd776ccd2..2d57ad09e9 100644
--- a/dist.py
+++ b/dist.py
@@ -1224,8 +1224,3 @@ def fix_help_options (options):
     for help_tuple in options:
         new_options.append(help_tuple[0:3])
     return new_options
-
-
-if __name__ == "__main__":
-    dist = Distribution()
-    print "ok"

From ead790166c33119b238f8d4b9356390dd8c2a9bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 22 Feb 2009 20:20:59 +0000
Subject: [PATCH 2162/8469] Merged revisions 69881 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69881 | tarek.ziade | 2009-02-22 21:15:41 +0100 (Sun, 22 Feb 2009) | 1 line

  Removing unused __main__ sections
........
---
 cmd.py  | 4 ----
 dist.py | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/cmd.py b/cmd.py
index 295c914032..800425d4a9 100644
--- a/cmd.py
+++ b/cmd.py
@@ -436,7 +436,3 @@ def _copy_files (self, filelist):
 
     def get_outputs (self):
         return self.outfiles
-
-
-if __name__ == "__main__":
-    print("ok")
diff --git a/dist.py b/dist.py
index 6c4b4afbd1..7c30e8856f 100644
--- a/dist.py
+++ b/dist.py
@@ -1180,8 +1180,3 @@ def fix_help_options (options):
     for help_tuple in options:
         new_options.append(help_tuple[0:3])
     return new_options
-
-
-if __name__ == "__main__":
-    dist = Distribution()
-    print("ok")

From e092af3741d37b82a06bcefab24e76dd23baab8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 23 Feb 2009 12:41:29 +0000
Subject: [PATCH 2163/8469] more test coverage

---
 tests/test_bdist_dumb.py | 80 ++++++++++++++++++++++++++++++++++++++++
 tests/test_version.py    | 70 +++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)
 create mode 100644 tests/test_bdist_dumb.py
 create mode 100644 tests/test_version.py

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
new file mode 100644
index 0000000000..2863b620db
--- /dev/null
+++ b/tests/test_bdist_dumb.py
@@ -0,0 +1,80 @@
+"""Tests for distutils.command.bdist_dumb."""
+
+import unittest
+import sys
+import os
+
+from distutils.core import Distribution
+from distutils.command.bdist_dumb import bdist_dumb
+from distutils.tests import support
+
+SETUP_PY = """\
+from distutils.core import setup
+import foo
+
+setup(name='foo', version='0.1', py_modules=['foo'],
+      url='xxx', author='xxx', author_email='xxx')
+
+"""
+
+class BuildDumbTestCase(support.TempdirManager,
+                        support.LoggingSilencer,
+                        unittest.TestCase):
+
+    def setUp(self):
+        support.TempdirManager.setUp(self)
+        support.LoggingSilencer.setUp(self)
+        self.old_location = os.getcwd()
+        self.old_sys_argv = sys.argv[:]
+
+    def tearDown(self):
+        os.chdir(self.old_location)
+        sys.argv = self.old_sys_argv[:]
+        support.LoggingSilencer.tearDown(self)
+        support.TempdirManager.tearDown(self)
+
+    def test_simple_built(self):
+
+        # let's create a simple package
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_dumb(dist)
+
+        # so the output is the same no matter
+        # what is the platform
+        cmd.format = 'zip'
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # see what we have
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        base = "%s.%s" % (dist.get_fullname(), cmd.plat_name)
+        if os.name == 'os2':
+            base = base.replace(':', '-')
+
+        wanted = ['%s.zip' % base]
+        self.assertEquals(dist_created, wanted)
+
+        # now let's check what we have in the zip file
+        # XXX to be done
+
+def test_suite():
+    return unittest.makeSuite(BuildDumbTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_version.py b/tests/test_version.py
new file mode 100644
index 0000000000..747db94804
--- /dev/null
+++ b/tests/test_version.py
@@ -0,0 +1,70 @@
+"""Tests for distutils.version."""
+import unittest
+from distutils.version import LooseVersion
+from distutils.version import StrictVersion
+
+class VersionTestCase(unittest.TestCase):
+
+    def test_prerelease(self):
+        version = StrictVersion('1.2.3a1')
+        self.assertEquals(version.version, (1, 2, 3))
+        self.assertEquals(version.prerelease, ('a', 1))
+        self.assertEquals(str(version), '1.2.3a1')
+
+        version = StrictVersion('1.2.0')
+        self.assertEquals(str(version), '1.2')
+
+    def test_cmp_strict(self):
+        versions = (('1.5.1', '1.5.2b2', -1),
+                    ('161', '3.10a', ValueError),
+                    ('8.02', '8.02', 0),
+                    ('3.4j', '1996.07.12', ValueError),
+                    ('3.2.pl0', '3.1.1.6', ValueError),
+                    ('2g6', '11g', ValueError),
+                    ('0.9', '2.2', -1),
+                    ('1.2.1', '1.2', 1),
+                    ('1.1', '1.2.2', -1),
+                    ('1.2', '1.1', 1),
+                    ('1.2.1', '1.2.2', -1),
+                    ('1.2.2', '1.2', 1),
+                    ('1.2', '1.2.2', -1),
+                    ('0.4.0', '0.4', 0),
+                    ('1.13++', '5.5.kw', ValueError))
+
+        for v1, v2, wanted in versions:
+            try:
+                res = StrictVersion(v1).__cmp__(StrictVersion(v2))
+            except ValueError:
+                if wanted is ValueError:
+                    continue
+                else:
+                    raise AssertionError(("cmp(%s, %s) "
+                                          "shouldn't raise ValueError")
+                                            % (v1, v2))
+            self.assertEquals(res, wanted,
+                              'cmp(%s, %s) should be %s, got %s' %
+                              (v1, v2, wanted, res))
+
+
+    def test_cmp(self):
+        versions = (('1.5.1', '1.5.2b2', -1),
+                    ('161', '3.10a', 1),
+                    ('8.02', '8.02', 0),
+                    ('3.4j', '1996.07.12', -1),
+                    ('3.2.pl0', '3.1.1.6', 1),
+                    ('2g6', '11g', -1),
+                    ('0.960923', '2.2beta29', -1),
+                    ('1.13++', '5.5.kw', -1))
+
+
+        for v1, v2, wanted in versions:
+            res = LooseVersion(v1).__cmp__(LooseVersion(v2))
+            self.assertEquals(res, wanted,
+                              'cmp(%s, %s) should be %s, got %s' %
+                              (v1, v2, wanted, res))
+
+def test_suite():
+    return unittest.makeSuite(VersionTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 3fa4cb44a2c238a7fe8569e149332937dc3e39ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 23 Feb 2009 12:47:55 +0000
Subject: [PATCH 2164/8469] Merged revisions 69902 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69902 | tarek.ziade | 2009-02-23 13:41:29 +0100 (Mon, 23 Feb 2009) | 1 line

  more test coverage
........
---
 tests/test_bdist_dumb.py | 80 ++++++++++++++++++++++++++++++++++++++++
 tests/test_version.py    | 70 +++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)
 create mode 100644 tests/test_bdist_dumb.py
 create mode 100644 tests/test_version.py

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
new file mode 100644
index 0000000000..2863b620db
--- /dev/null
+++ b/tests/test_bdist_dumb.py
@@ -0,0 +1,80 @@
+"""Tests for distutils.command.bdist_dumb."""
+
+import unittest
+import sys
+import os
+
+from distutils.core import Distribution
+from distutils.command.bdist_dumb import bdist_dumb
+from distutils.tests import support
+
+SETUP_PY = """\
+from distutils.core import setup
+import foo
+
+setup(name='foo', version='0.1', py_modules=['foo'],
+      url='xxx', author='xxx', author_email='xxx')
+
+"""
+
+class BuildDumbTestCase(support.TempdirManager,
+                        support.LoggingSilencer,
+                        unittest.TestCase):
+
+    def setUp(self):
+        support.TempdirManager.setUp(self)
+        support.LoggingSilencer.setUp(self)
+        self.old_location = os.getcwd()
+        self.old_sys_argv = sys.argv[:]
+
+    def tearDown(self):
+        os.chdir(self.old_location)
+        sys.argv = self.old_sys_argv[:]
+        support.LoggingSilencer.tearDown(self)
+        support.TempdirManager.tearDown(self)
+
+    def test_simple_built(self):
+
+        # let's create a simple package
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_dumb(dist)
+
+        # so the output is the same no matter
+        # what is the platform
+        cmd.format = 'zip'
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # see what we have
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        base = "%s.%s" % (dist.get_fullname(), cmd.plat_name)
+        if os.name == 'os2':
+            base = base.replace(':', '-')
+
+        wanted = ['%s.zip' % base]
+        self.assertEquals(dist_created, wanted)
+
+        # now let's check what we have in the zip file
+        # XXX to be done
+
+def test_suite():
+    return unittest.makeSuite(BuildDumbTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_version.py b/tests/test_version.py
new file mode 100644
index 0000000000..fa21433046
--- /dev/null
+++ b/tests/test_version.py
@@ -0,0 +1,70 @@
+"""Tests for distutils.version."""
+import unittest
+from distutils.version import LooseVersion
+from distutils.version import StrictVersion
+
+class VersionTestCase(unittest.TestCase):
+
+    def test_prerelease(self):
+        version = StrictVersion('1.2.3a1')
+        self.assertEquals(version.version, (1, 2, 3))
+        self.assertEquals(version.prerelease, ('a', 1))
+        self.assertEquals(str(version), '1.2.3a1')
+
+        version = StrictVersion('1.2.0')
+        self.assertEquals(str(version), '1.2')
+
+    def test_cmp_strict(self):
+        versions = (('1.5.1', '1.5.2b2', -1),
+                    ('161', '3.10a', ValueError),
+                    ('8.02', '8.02', 0),
+                    ('3.4j', '1996.07.12', ValueError),
+                    ('3.2.pl0', '3.1.1.6', ValueError),
+                    ('2g6', '11g', ValueError),
+                    ('0.9', '2.2', -1),
+                    ('1.2.1', '1.2', 1),
+                    ('1.1', '1.2.2', -1),
+                    ('1.2', '1.1', 1),
+                    ('1.2.1', '1.2.2', -1),
+                    ('1.2.2', '1.2', 1),
+                    ('1.2', '1.2.2', -1),
+                    ('0.4.0', '0.4', 0),
+                    ('1.13++', '5.5.kw', ValueError))
+
+        for v1, v2, wanted in versions:
+            try:
+                res = StrictVersion(v1)._cmp(StrictVersion(v2))
+            except ValueError:
+                if wanted is ValueError:
+                    continue
+                else:
+                    raise AssertionError(("cmp(%s, %s) "
+                                          "shouldn't raise ValueError")
+                                            % (v1, v2))
+            self.assertEquals(res, wanted,
+                              'cmp(%s, %s) should be %s, got %s' %
+                              (v1, v2, wanted, res))
+
+
+    def test_cmp(self):
+        versions = (('1.5.1', '1.5.2b2', -1),
+                    ('161', '3.10a', 1),
+                    ('8.02', '8.02', 0),
+                    ('3.4j', '1996.07.12', -1),
+                    ('3.2.pl0', '3.1.1.6', 1),
+                    ('2g6', '11g', -1),
+                    ('0.960923', '2.2beta29', -1),
+                    ('1.13++', '5.5.kw', -1))
+
+
+        for v1, v2, wanted in versions:
+            res = LooseVersion(v1)._cmp(LooseVersion(v2))
+            self.assertEquals(res, wanted,
+                              'cmp(%s, %s) should be %s, got %s' %
+                              (v1, v2, wanted, res))
+
+def test_suite():
+    return unittest.makeSuite(VersionTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 9841cdd9d6e09f214265adaefc1b5b43c25ade1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 25 Feb 2009 22:29:27 +0000
Subject: [PATCH 2165/8469] Fixed #5316 : test failure in test_site

---
 tests/test_config.py | 4 ++--
 tests/test_sdist.py  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index d81276928a..a18f45359a 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -51,7 +51,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
-        support.TempdirManager.setUp(self)
+        super(PyPIRCCommandTestCase, self).setUp()
 
         if os.environ.has_key('HOME'):
             self._old_home = os.environ['HOME']
@@ -79,7 +79,7 @@ def tearDown(self):
         else:
             os.environ['HOME'] = self._old_home
         set_threshold(self.old_threshold)
-        support.TempdirManager.tearDown(self)
+        super(PyPIRCCommandTestCase, self).tearDown()
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 9c579b40cb..15a8c8087c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -37,10 +37,9 @@
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
     def setUp(self):
-        support.LoggingSilencer.setUp(self)
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
-        PyPIRCCommandTestCase.setUp(self)
+        super(sdistTestCase, self).setUp()
         # setting up an environment
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
@@ -54,8 +53,7 @@ def setUp(self):
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
-        PyPIRCCommandTestCase.tearDown(self)
-        support.LoggingSilencer.tearDown(self)
+        super(sdistTestCase, self).tearDown()
 
     def get_cmd(self, metadata=None):
         """Returns a cmd"""

From 706b92c2ebd63afe86a4d0e31d86011dcaf017f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 25 Feb 2009 22:31:38 +0000
Subject: [PATCH 2166/8469] Merged revisions 69976 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69976 | tarek.ziade | 2009-02-25 23:29:27 +0100 (Wed, 25 Feb 2009) | 1 line

  Fixed #5316 : test failure in test_site
........
---
 tests/test_config.py | 4 ++--
 tests/test_sdist.py  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 0df6af8412..09abfcd8ba 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -50,7 +50,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
-        support.TempdirManager.setUp(self)
+        super(PyPIRCCommandTestCase, self).setUp()
 
         if 'HOME' in os.environ:
             self._old_home = os.environ['HOME']
@@ -78,7 +78,7 @@ def tearDown(self):
         else:
             os.environ['HOME'] = self._old_home
         set_threshold(self.old_threshold)
-        support.TempdirManager.tearDown(self)
+        super(PyPIRCCommandTestCase, self).tearDown()
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 9c579b40cb..15a8c8087c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -37,10 +37,9 @@
 class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
 
     def setUp(self):
-        support.LoggingSilencer.setUp(self)
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
-        PyPIRCCommandTestCase.setUp(self)
+        super(sdistTestCase, self).setUp()
         # setting up an environment
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
@@ -54,8 +53,7 @@ def setUp(self):
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
-        PyPIRCCommandTestCase.tearDown(self)
-        support.LoggingSilencer.tearDown(self)
+        super(sdistTestCase, self).tearDown()
 
     def get_cmd(self, metadata=None):
         """Returns a cmd"""

From 9daeb929f037438cec1b32dd526a5de62581b769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 26 Feb 2009 23:44:00 +0000
Subject: [PATCH 2167/8469] removed unused import

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2ed3ef65cc..ac0a0670a1 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -8,7 +8,7 @@
 
 import sys, os, string, re
 from types import *
-from site import USER_BASE, USER_SITE
+from site import USER_BASE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version

From 73ac2e14e27f78bd054a1192099437777bc87c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 26 Feb 2009 23:47:00 +0000
Subject: [PATCH 2168/8469] Merged revisions 70003 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70003 | tarek.ziade | 2009-02-27 00:44:00 +0100 (Fri, 27 Feb 2009) | 1 line

  removed unused import
........
---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index b12da63f84..1d5a75d2c5 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -7,7 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from site import USER_BASE, USER_SITE
+from site import USER_BASE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version

From 8ac6d0fd24f52432843766fc24fbe20fb618ebb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 27 Feb 2009 12:53:34 +0000
Subject: [PATCH 2169/8469] Issue #5052: make Distutils compatible with 2.3
 again.

---
 README                  |  2 +
 command/build_ext.py    | 18 +++++++--
 command/install.py      | 83 ++++++++++++++++++++++++++---------------
 command/upload.py       |  7 +++-
 tests/test_build_ext.py | 47 ++++++++++++++++++++++-
 tests/test_install.py   | 64 +++++++++++++++++++++++++++++++
 6 files changed, 183 insertions(+), 38 deletions(-)

diff --git a/README b/README
index 23f488506f..408a203b85 100644
--- a/README
+++ b/README
@@ -8,4 +8,6 @@ The Distutils-SIG web page is also a good starting point:
 
     http://www.python.org/sigs/distutils-sig/
 
+WARNING : Distutils must remain compatible with 2.3
+
 $Id$
diff --git a/command/build_ext.py b/command/build_ext.py
index ac0a0670a1..125fa7f52d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -8,7 +8,6 @@
 
 import sys, os, string, re
 from types import *
-from site import USER_BASE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -17,6 +16,14 @@
 from distutils.util import get_platform
 from distutils import log
 
+# this keeps compatibility from 2.3 to 2.5
+if sys.version < "2.6":
+    USER_BASE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    HAS_USER_SITE = True
+
 if os.name == 'nt':
     from distutils.msvccompiler import get_build_version
     MSVC_VERSION = int(get_build_version())
@@ -92,11 +99,14 @@ class build_ext (Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
-        ('user', None,
-         "add user include, library and rpath"),
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
+
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "add user include, library and rpath"))
+        boolean_options.append('user')
 
     help_options = [
         ('help-compiler', None,
diff --git a/command/install.py b/command/install.py
index adc9daf11a..4fd66cbf60 100644
--- a/command/install.py
+++ b/command/install.py
@@ -16,9 +16,16 @@
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
-from site import USER_BASE
-from site import USER_SITE
 
+# this keeps compatibility from 2.3 to 2.5
+if sys.version < "2.6":
+    USER_BASE = None
+    USER_SITE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    from site import USER_SITE
+    HAS_USER_SITE = True
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
@@ -52,21 +59,7 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
-    'unix_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
     'nt': WINDOWS_SCHEME,
-    'nt_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
-        'data'   : '$userbase',
-        },
     'mac': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -74,13 +67,7 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
-    'mac_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
+
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -88,14 +75,41 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
-    'os2_home': {
+    }
+
+# user site schemes
+if HAS_USER_SITE:
+    INSTALL_SCHEMES['nt_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        }
+
+    INSTALL_SCHEMES['unix_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
         'headers': '$userbase/include/python$py_version_short/$dist_name',
         'scripts': '$userbase/bin',
         'data'   : '$userbase',
-        },
-    }
+        }
+
+    INSTALL_SCHEMES['mac_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
+
+    INSTALL_SCHEMES['os2_home'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
 
 # The keys to an installation scheme; if any new types of files are to be
 # installed, be sure to add an entry to every installation scheme above,
@@ -115,8 +129,6 @@ class install (Command):
          "(Unix only) prefix for platform-specific files"),
         ('home=', None,
          "(Unix only) home directory to install under"),
-        ('user', None,
-         "install in user site-package '%s'" % USER_SITE),
 
         # Or, just set the base director(y|ies)
         ('install-base=', None,
@@ -168,7 +180,13 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['compile', 'force', 'skip-build', 'user']
+    boolean_options = ['compile', 'force', 'skip-build']
+
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "install in user site-package '%s'" % USER_SITE))
+        boolean_options.append('user')
+
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -320,9 +338,12 @@ def finalize_options (self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
-                            'userbase': self.install_userbase,
-                            'usersite': self.install_usersite,
                            }
+
+        if HAS_USER_SITE:
+            self.config_vars['userbase'] = self.install_userbase
+            self.config_vars['usersite'] = self.install_usersite
+
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
diff --git a/command/upload.py b/command/upload.py
index e30347e507..df82e4ca56 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
-from hashlib import md5
+import sys
 import os
 import socket
 import platform
@@ -16,6 +16,11 @@
 import cStringIO as StringIO
 from ConfigParser import ConfigParser
 
+# this keeps compatibility for 2.3 and 2.4
+if sys.version < "2.5":
+    from md5 import md5
+else:
+    from hashlib import md5
 
 class upload(PyPIRCCommand):
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a38558b007..ff60c12b1a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -24,11 +24,17 @@ class BuildExtTestCase(support.TempdirManager, unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        support.TempdirManager.setUp(self)
+        super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
+        if sys.version > "2.6":
+            import site
+            self.old_user_base = site.USER_BASE
+            site.USER_BASE = self.mkdtemp()
+            from distutils.command import build_ext
+            build_ext.USER_BASE = site.USER_BASE
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -76,7 +82,13 @@ def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
         sys.path = self.sys_path
-        support.TempdirManager.tearDown(self)
+        if sys.version > "2.6":
+            import site
+            site.USER_BASE = self.old_user_base
+            from distutils.command import build_ext
+            build_ext.USER_BASE = self.old_user_base
+
+        super(BuildExtTestCase, self).tearDown()
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
@@ -99,6 +111,37 @@ def test_solaris_enable_shared(self):
         # make sur we get some lobrary dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        import site
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+
+        # making sure the suer option is there
+        options = [name for name, short, lable in
+                   cmd.user_options]
+        self.assert_('user' in options)
+
+        # setting a value
+        cmd.user = 1
+
+        # setting user based lib and include
+        lib = os.path.join(site.USER_BASE, 'lib')
+        incl = os.path.join(site.USER_BASE, 'include')
+        os.mkdir(lib)
+        os.mkdir(incl)
+
+        # let's run finalize
+        cmd.ensure_finalized()
+
+        # see if include_dirs and library_dirs
+        # were set
+        self.assert_(lib in cmd.library_dirs)
+        self.assert_(incl in cmd.include_dirs)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):
diff --git a/tests/test_install.py b/tests/test_install.py
index c834b91b38..9ceccf68cf 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,9 +1,14 @@
 """Tests for distutils.command.install."""
 
 import os
+import os.path
+import sys
 import unittest
+import site
 
 from distutils.command.install import install
+from distutils.command import install as install_module
+from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 
 from distutils.tests import support
@@ -47,6 +52,65 @@ def check_path(got, expected):
         check_path(cmd.install_scripts, os.path.join(destination, "bin"))
         check_path(cmd.install_data, destination)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        # preparing the environement for the test
+        self.old_user_base = site.USER_BASE
+        self.old_user_site = site.USER_SITE
+        self.tmpdir = self.mkdtemp()
+        self.user_base = os.path.join(self.tmpdir, 'B')
+        self.user_site = os.path.join(self.tmpdir, 'S')
+        site.USER_BASE = self.user_base
+        site.USER_SITE = self.user_site
+        install_module.USER_BASE = self.user_base
+        install_module.USER_SITE = self.user_site
+
+        def _expanduser(path):
+            return self.tmpdir
+        self.old_expand = os.path.expanduser
+        os.path.expanduser = _expanduser
+
+        try:
+            # this is the actual test
+            self._test_user_site()
+        finally:
+            site.USER_BASE = self.old_user_base
+            site.USER_SITE = self.old_user_site
+            install_module.USER_BASE = self.old_user_base
+            install_module.USER_SITE = self.old_user_site
+            os.path.expanduser = self.old_expand
+
+    def _test_user_site(self):
+        for key in ('nt_user', 'unix_user', 'os2_home'):
+            self.assert_(key in INSTALL_SCHEMES)
+
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # making sure the user option is there
+        options = [name for name, short, lable in
+                   cmd.user_options]
+        self.assert_('user' in options)
+
+        # setting a value
+        cmd.user = 1
+
+        # user base and site shouldn't be created yet
+        self.assert_(not os.path.exists(self.user_base))
+        self.assert_(not os.path.exists(self.user_site))
+
+        # let's run finalize
+        cmd.ensure_finalized()
+
+        # now they should
+        self.assert_(os.path.exists(self.user_base))
+        self.assert_(os.path.exists(self.user_site))
+
+        self.assert_('userbase' in cmd.config_vars)
+        self.assert_('usersite' in cmd.config_vars)
 
 def test_suite():
     return unittest.makeSuite(InstallTestCase)

From 42e1c973f8cb4baba16a761b1aa6263ee5f47278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 27 Feb 2009 12:58:56 +0000
Subject: [PATCH 2170/8469] Merged revisions 70017 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70017 | tarek.ziade | 2009-02-27 13:53:34 +0100 (Fri, 27 Feb 2009) | 1 line

  Issue #5052: make Distutils compatible with 2.3 again.
........
---
 README                  |  2 +
 command/build_ext.py    | 18 +++++++--
 command/install.py      | 83 ++++++++++++++++++++++++++---------------
 command/upload.py       |  8 +++-
 tests/test_build_ext.py | 46 ++++++++++++++++++++++-
 tests/test_install.py   | 64 +++++++++++++++++++++++++++++++
 6 files changed, 183 insertions(+), 38 deletions(-)

diff --git a/README b/README
index 23f488506f..408a203b85 100644
--- a/README
+++ b/README
@@ -8,4 +8,6 @@ The Distutils-SIG web page is also a good starting point:
 
     http://www.python.org/sigs/distutils-sig/
 
+WARNING : Distutils must remain compatible with 2.3
+
 $Id$
diff --git a/command/build_ext.py b/command/build_ext.py
index 1d5a75d2c5..1ed69f33c0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -7,7 +7,6 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from site import USER_BASE
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -16,6 +15,14 @@
 from distutils.util import get_platform
 from distutils import log
 
+# this keeps compatibility from 2.3 to 2.5
+if sys.version < "2.6":
+    USER_BASE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    HAS_USER_SITE = True
+
 if os.name == 'nt':
     from distutils.msvccompiler import get_build_version
     MSVC_VERSION = int(get_build_version())
@@ -91,11 +98,14 @@ class build_ext(Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
-        ('user', None,
-         "add user include, library and rpath"),
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
+
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "add user include, library and rpath"))
+        boolean_options.append('user')
 
     help_options = [
         ('help-compiler', None,
diff --git a/command/install.py b/command/install.py
index b5c9554d61..de81173387 100644
--- a/command/install.py
+++ b/command/install.py
@@ -15,9 +15,16 @@
 from distutils.util import convert_path, subst_vars, change_root
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
-from site import USER_BASE
-from site import USER_SITE
 
+# this keeps compatibility from 2.3 to 2.5
+if sys.version < "2.6":
+    USER_BASE = None
+    USER_SITE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    from site import USER_SITE
+    HAS_USER_SITE = True
 
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
@@ -51,21 +58,7 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
-    'unix_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
     'nt': WINDOWS_SCHEME,
-    'nt_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
-        'data'   : '$userbase',
-        },
     'mac': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -73,13 +66,7 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
-    'mac_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
+
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -87,14 +74,41 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
-    'os2_home': {
+    }
+
+# user site schemes
+if HAS_USER_SITE:
+    INSTALL_SCHEMES['nt_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        }
+
+    INSTALL_SCHEMES['unix_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
         'headers': '$userbase/include/python$py_version_short/$dist_name',
         'scripts': '$userbase/bin',
         'data'   : '$userbase',
-        },
-    }
+        }
+
+    INSTALL_SCHEMES['mac_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
+
+    INSTALL_SCHEMES['os2_home'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
 
 # The keys to an installation scheme; if any new types of files are to be
 # installed, be sure to add an entry to every installation scheme above,
@@ -114,8 +128,6 @@ class install (Command):
          "(Unix only) prefix for platform-specific files"),
         ('home=', None,
          "(Unix only) home directory to install under"),
-        ('user', None,
-         "install in user site-package '%s'" % USER_SITE),
 
         # Or, just set the base director(y|ies)
         ('install-base=', None,
@@ -167,7 +179,13 @@ class install (Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['compile', 'force', 'skip-build', 'user']
+    boolean_options = ['compile', 'force', 'skip-build']
+
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "install in user site-package '%s'" % USER_SITE))
+        boolean_options.append('user')
+
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -319,9 +337,12 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
-                            'userbase': self.install_userbase,
-                            'usersite': self.install_usersite,
                            }
+
+        if HAS_USER_SITE:
+            self.config_vars['userbase'] = self.install_userbase
+            self.config_vars['usersite'] = self.install_usersite
+
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
diff --git a/command/upload.py b/command/upload.py
index 020e860a6d..eb2f51678a 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
-from hashlib import md5
+import sys
 import os, io
 import socket
 import platform
@@ -15,6 +15,12 @@
 import base64
 import urllib.parse
 
+# this keeps compatibility for 2.3 and 2.4
+if sys.version < "2.5":
+    from md5 import md5
+else:
+    from hashlib import md5
+
 class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 91b3de85d2..2e47953ee3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -24,11 +24,17 @@ class BuildExtTestCase(TempdirManager, unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
-        TempdirManager.setUp(self)
+        super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
+        if sys.version > "2.6":
+            import site
+            self.old_user_base = site.USER_BASE
+            site.USER_BASE = self.mkdtemp()
+            from distutils.command import build_ext
+            build_ext.USER_BASE = site.USER_BASE
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -76,7 +82,12 @@ def tearDown(self):
         # Get everything back to normal
         support.unload('xx')
         sys.path = self.sys_path
-        TempdirManager.tearDown(self)
+        if sys.version > "2.6":
+            import site
+            site.USER_BASE = self.old_user_base
+            from distutils.command import build_ext
+            build_ext.USER_BASE = self.old_user_base
+        super(BuildExtTestCase, self).tearDown()
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
@@ -99,6 +110,37 @@ def test_solaris_enable_shared(self):
         # make sur we get some lobrary dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        import site
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+
+        # making sure the suer option is there
+        options = [name for name, short, lable in
+                   cmd.user_options]
+        self.assert_('user' in options)
+
+        # setting a value
+        cmd.user = 1
+
+        # setting user based lib and include
+        lib = os.path.join(site.USER_BASE, 'lib')
+        incl = os.path.join(site.USER_BASE, 'include')
+        os.mkdir(lib)
+        os.mkdir(incl)
+
+        # let's run finalize
+        cmd.ensure_finalized()
+
+        # see if include_dirs and library_dirs
+        # were set
+        self.assert_(lib in cmd.library_dirs)
+        self.assert_(incl in cmd.include_dirs)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):
diff --git a/tests/test_install.py b/tests/test_install.py
index c834b91b38..9ceccf68cf 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,9 +1,14 @@
 """Tests for distutils.command.install."""
 
 import os
+import os.path
+import sys
 import unittest
+import site
 
 from distutils.command.install import install
+from distutils.command import install as install_module
+from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 
 from distutils.tests import support
@@ -47,6 +52,65 @@ def check_path(got, expected):
         check_path(cmd.install_scripts, os.path.join(destination, "bin"))
         check_path(cmd.install_data, destination)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        # preparing the environement for the test
+        self.old_user_base = site.USER_BASE
+        self.old_user_site = site.USER_SITE
+        self.tmpdir = self.mkdtemp()
+        self.user_base = os.path.join(self.tmpdir, 'B')
+        self.user_site = os.path.join(self.tmpdir, 'S')
+        site.USER_BASE = self.user_base
+        site.USER_SITE = self.user_site
+        install_module.USER_BASE = self.user_base
+        install_module.USER_SITE = self.user_site
+
+        def _expanduser(path):
+            return self.tmpdir
+        self.old_expand = os.path.expanduser
+        os.path.expanduser = _expanduser
+
+        try:
+            # this is the actual test
+            self._test_user_site()
+        finally:
+            site.USER_BASE = self.old_user_base
+            site.USER_SITE = self.old_user_site
+            install_module.USER_BASE = self.old_user_base
+            install_module.USER_SITE = self.old_user_site
+            os.path.expanduser = self.old_expand
+
+    def _test_user_site(self):
+        for key in ('nt_user', 'unix_user', 'os2_home'):
+            self.assert_(key in INSTALL_SCHEMES)
+
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # making sure the user option is there
+        options = [name for name, short, lable in
+                   cmd.user_options]
+        self.assert_('user' in options)
+
+        # setting a value
+        cmd.user = 1
+
+        # user base and site shouldn't be created yet
+        self.assert_(not os.path.exists(self.user_base))
+        self.assert_(not os.path.exists(self.user_site))
+
+        # let's run finalize
+        cmd.ensure_finalized()
+
+        # now they should
+        self.assert_(os.path.exists(self.user_base))
+        self.assert_(os.path.exists(self.user_site))
+
+        self.assert_('userbase' in cmd.config_vars)
+        self.assert_('usersite' in cmd.config_vars)
 
 def test_suite():
     return unittest.makeSuite(InstallTestCase)

From 314bb85f3930ff28db2d3ba0e2802486c0738780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 28 Feb 2009 10:08:02 +0000
Subject: [PATCH 2171/8469] Issues #1533164 and #5378: Added quiet and
 force-optimize options to Distutils bdist_rpm command

---
 command/bdist_rpm.py    |  36 ++++++++--
 tests/test_bdist_rpm.py | 149 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_bdist_rpm.py

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index a48e0f186f..34822ec70a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -123,10 +123,21 @@ class bdist_rpm (Command):
         # Allow a packager to explicitly force an architecture
         ('force-arch=', None,
          "Force an architecture onto the RPM build process"),
-       ]
+
+        ('quiet', 'q',
+         "Run the INSTALL phase of RPM building in quiet mode"),
+
+        # Forces the -O1 option when calling the install command,
+        # so the rpm contains all files needed for proper operation under
+        # SELinux. Some systems checks for this on build-time and will
+        # fail without this.
+        ('force-optimize', None,
+         "Forces the -O1 option when calling the install command"),
+
+        ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode',
-                       'no-autoreq']
+                       'no-autoreq', 'quiet', 'force-optimize']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
@@ -176,6 +187,8 @@ def initialize_options (self):
         self.no_autoreq = 0
 
         self.force_arch = None
+        self.quiet = 0
+        self.force_optimize = 1
 
     # initialize_options()
 
@@ -322,6 +335,7 @@ def run (self):
         if os.path.exists('/usr/bin/rpmbuild') or \
            os.path.exists('/bin/rpmbuild'):
             rpm_cmd = ['rpmbuild']
+
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
         elif self.binary_only:
@@ -333,6 +347,10 @@ def run (self):
                              '_topdir %s' % os.path.abspath(self.rpm_base)])
         if not self.keep_temp:
             rpm_cmd.append('--clean')
+
+        if self.quiet:
+            rpm_cmd.append('--quiet')
+
         rpm_cmd.append(spec_path)
         # Determine the binary rpm names that should be built out of this spec
         # file
@@ -486,13 +504,19 @@ def _make_spec_file(self):
         # that we open and interpolate into the spec file, but the defaults
         # are just text that we drop in as-is.  Hmmm.
 
+        # forcing -O1 if force-optimize
+        if self.force_optimize:
+            optimize = ' -O1'
+        else:
+            optimize = ''
+
+        install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT '
+                       '--record=INSTALLED_FILES') % (def_setup_call, optimize)
+
         script_options = [
             ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
             ('build', 'build_script', def_build),
-            ('install', 'install_script',
-             ("%s install "
-              "--root=$RPM_BUILD_ROOT "
-              "--record=INSTALLED_FILES") % def_setup_call),
+            ('install', 'install_script', install_cmd),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
new file mode 100644
index 0000000000..ff40628f42
--- /dev/null
+++ b/tests/test_bdist_rpm.py
@@ -0,0 +1,149 @@
+"""Tests for distutils.command.bdist_rpm."""
+
+import unittest
+import sys
+import os
+import tempfile
+import shutil
+
+from distutils.core import Distribution
+from distutils.command.bdist_rpm import bdist_rpm
+from distutils.tests import support
+from distutils.spawn import find_executable
+from distutils import spawn
+from distutils.errors import DistutilsExecError
+
+SETUP_PY = """\
+from distutils.core import setup
+import foo
+
+setup(name='foo', version='0.1', py_modules=['foo'],
+      url='xxx', author='xxx', author_email='xxx')
+
+"""
+
+class BuildRpmTestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
+
+    def setUp(self):
+        super(BuildRpmTestCase, self).setUp()
+        self.old_location = os.getcwd()
+        self.old_sys_argv = sys.argv[:]
+
+    def tearDown(self):
+        os.chdir(self.old_location)
+        sys.argv = self.old_sys_argv[:]
+        super(BuildRpmTestCase, self).tearDown()
+
+    def test_quiet(self):
+
+        # XXX I am unable yet to make this test work without
+        # spurious sdtout/stderr output under Mac OS X
+        if sys.platform != 'linux2':
+            return
+
+        # this test will run only if the rpm commands are found
+        if (find_executable('rpm') is None or
+            find_executable('rpmbuild') is None):
+            return
+
+        # let's create a package
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_rpm(dist)
+        cmd.fix_python = True
+
+        # running in quiet mode
+        cmd.quiet = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+
+    def test_no_optimize_flag(self):
+
+        # XXX I am unable yet to make this test work without
+        # spurious sdtout/stderr output under Mac OS X
+        if sys.platform != 'linux2':
+            return
+
+        # http://bugs.python.org/issue1533164
+        # this test will run only if the rpm command is found
+        if (find_executable('rpm') is None or
+            find_executable('rpmbuild') is None):
+            return
+
+        # let's create a package that brakes bdist_rpm
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_rpm(dist)
+        cmd.fix_python = True
+
+        # running with force-optimize = 1
+        # and quiet = 1
+        cmd.quiet = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
+
+        # XXX I am unable yet to make this test work without
+        # spurious stderr output
+        # so returning until distutils.spawn acts better
+        return
+
+        # running with force-optimize = 0
+        cmd.force_optimize = 0
+        try:
+            # XXX How to prevent the spawned
+            # rpmbuild command to display errors ?
+            # this can be a problem for buildbots
+            cmd.ensure_finalized()
+            cmd.run()
+        except DistutilsExecError:
+            # happens only under Fedora/RedHat
+            # and some flavors of Linux
+            # otherwise it's a bug
+            if sys.platform == 'linux2':
+                return
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+
+def test_suite():
+    return unittest.makeSuite(BuildRpmTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 476e03885b439b139121edd039dc77bcb1c00305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 28 Feb 2009 10:16:43 +0000
Subject: [PATCH 2172/8469] Merged revisions 70049 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70049 | tarek.ziade | 2009-02-28 11:08:02 +0100 (Sat, 28 Feb 2009) | 1 line

  Issues #1533164 and #5378: Added quiet and force-optimize options to Distutils bdist_rpm command
........
---
 command/bdist_rpm.py    |  36 ++++++++--
 tests/test_bdist_rpm.py | 149 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_bdist_rpm.py

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 83efb8e043..3afdafefda 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -122,10 +122,21 @@ class bdist_rpm(Command):
         # Allow a packager to explicitly force an architecture
         ('force-arch=', None,
          "Force an architecture onto the RPM build process"),
-       ]
+
+        ('quiet', 'q',
+         "Run the INSTALL phase of RPM building in quiet mode"),
+
+        # Forces the -O1 option when calling the install command,
+        # so the rpm contains all files needed for proper operation under
+        # SELinux. Some systems checks for this on build-time and will
+        # fail without this.
+        ('force-optimize', None,
+         "Forces the -O1 option when calling the install command"),
+
+        ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode',
-                       'no-autoreq']
+                       'no-autoreq', 'quiet', 'force-optimize']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
@@ -175,6 +186,8 @@ def initialize_options(self):
         self.no_autoreq = 0
 
         self.force_arch = None
+        self.quiet = 0
+        self.force_optimize = 1
 
     def finalize_options(self):
         self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
@@ -311,6 +324,7 @@ def run(self):
         if os.path.exists('/usr/bin/rpmbuild') or \
            os.path.exists('/bin/rpmbuild'):
             rpm_cmd = ['rpmbuild']
+
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
         elif self.binary_only:
@@ -322,6 +336,10 @@ def run(self):
                              '_topdir %s' % os.path.abspath(self.rpm_base)])
         if not self.keep_temp:
             rpm_cmd.append('--clean')
+
+        if self.quiet:
+            rpm_cmd.append('--quiet')
+
         rpm_cmd.append(spec_path)
         # Determine the binary rpm names that should be built out of this spec
         # file
@@ -474,13 +492,19 @@ def _make_spec_file(self):
         # that we open and interpolate into the spec file, but the defaults
         # are just text that we drop in as-is.  Hmmm.
 
+        # forcing -O1 if force-optimize
+        if self.force_optimize:
+            optimize = ' -O1'
+        else:
+            optimize = ''
+
+        install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT '
+                       '--record=INSTALLED_FILES') % (def_setup_call, optimize)
+
         script_options = [
             ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
             ('build', 'build_script', def_build),
-            ('install', 'install_script',
-             ("%s install "
-              "--root=$RPM_BUILD_ROOT "
-              "--record=INSTALLED_FILES") % def_setup_call),
+            ('install', 'install_script', install_cmd),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
             ('verifyscript', 'verify_script', None),
             ('pre', 'pre_install', None),
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
new file mode 100644
index 0000000000..ff40628f42
--- /dev/null
+++ b/tests/test_bdist_rpm.py
@@ -0,0 +1,149 @@
+"""Tests for distutils.command.bdist_rpm."""
+
+import unittest
+import sys
+import os
+import tempfile
+import shutil
+
+from distutils.core import Distribution
+from distutils.command.bdist_rpm import bdist_rpm
+from distutils.tests import support
+from distutils.spawn import find_executable
+from distutils import spawn
+from distutils.errors import DistutilsExecError
+
+SETUP_PY = """\
+from distutils.core import setup
+import foo
+
+setup(name='foo', version='0.1', py_modules=['foo'],
+      url='xxx', author='xxx', author_email='xxx')
+
+"""
+
+class BuildRpmTestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
+
+    def setUp(self):
+        super(BuildRpmTestCase, self).setUp()
+        self.old_location = os.getcwd()
+        self.old_sys_argv = sys.argv[:]
+
+    def tearDown(self):
+        os.chdir(self.old_location)
+        sys.argv = self.old_sys_argv[:]
+        super(BuildRpmTestCase, self).tearDown()
+
+    def test_quiet(self):
+
+        # XXX I am unable yet to make this test work without
+        # spurious sdtout/stderr output under Mac OS X
+        if sys.platform != 'linux2':
+            return
+
+        # this test will run only if the rpm commands are found
+        if (find_executable('rpm') is None or
+            find_executable('rpmbuild') is None):
+            return
+
+        # let's create a package
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_rpm(dist)
+        cmd.fix_python = True
+
+        # running in quiet mode
+        cmd.quiet = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+
+    def test_no_optimize_flag(self):
+
+        # XXX I am unable yet to make this test work without
+        # spurious sdtout/stderr output under Mac OS X
+        if sys.platform != 'linux2':
+            return
+
+        # http://bugs.python.org/issue1533164
+        # this test will run only if the rpm command is found
+        if (find_executable('rpm') is None or
+            find_executable('rpmbuild') is None):
+            return
+
+        # let's create a package that brakes bdist_rpm
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
+        self.write_file((pkg_dir, 'foo.py'), '#')
+        self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py')
+        self.write_file((pkg_dir, 'README'), '')
+
+        dist = Distribution({'name': 'foo', 'version': '0.1',
+                             'py_modules': ['foo'],
+                             'url': 'xxx', 'author': 'xxx',
+                             'author_email': 'xxx'})
+        dist.script_name = 'setup.py'
+        os.chdir(pkg_dir)
+
+        sys.argv = ['setup.py']
+        cmd = bdist_rpm(dist)
+        cmd.fix_python = True
+
+        # running with force-optimize = 1
+        # and quiet = 1
+        cmd.quiet = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
+
+        # XXX I am unable yet to make this test work without
+        # spurious stderr output
+        # so returning until distutils.spawn acts better
+        return
+
+        # running with force-optimize = 0
+        cmd.force_optimize = 0
+        try:
+            # XXX How to prevent the spawned
+            # rpmbuild command to display errors ?
+            # this can be a problem for buildbots
+            cmd.ensure_finalized()
+            cmd.run()
+        except DistutilsExecError:
+            # happens only under Fedora/RedHat
+            # and some flavors of Linux
+            # otherwise it's a bug
+            if sys.platform == 'linux2':
+                return
+
+        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
+        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+
+def test_suite():
+    return unittest.makeSuite(BuildRpmTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 23fb0d98b0e7696ae54a1c1562117a8035aa6607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 2 Mar 2009 05:38:44 +0000
Subject: [PATCH 2173/8469] removing the force-optimized option as discussed in
 #1533164

---
 command/bdist_rpm.py    | 21 +++------------------
 tests/test_bdist_rpm.py | 25 -------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 34822ec70a..1eccc6a48a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -126,18 +126,10 @@ class bdist_rpm (Command):
 
         ('quiet', 'q',
          "Run the INSTALL phase of RPM building in quiet mode"),
-
-        # Forces the -O1 option when calling the install command,
-        # so the rpm contains all files needed for proper operation under
-        # SELinux. Some systems checks for this on build-time and will
-        # fail without this.
-        ('force-optimize', None,
-         "Forces the -O1 option when calling the install command"),
-
         ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode',
-                       'no-autoreq', 'quiet', 'force-optimize']
+                       'no-autoreq', 'quiet']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
@@ -188,7 +180,6 @@ def initialize_options (self):
 
         self.force_arch = None
         self.quiet = 0
-        self.force_optimize = 1
 
     # initialize_options()
 
@@ -504,14 +495,8 @@ def _make_spec_file(self):
         # that we open and interpolate into the spec file, but the defaults
         # are just text that we drop in as-is.  Hmmm.
 
-        # forcing -O1 if force-optimize
-        if self.force_optimize:
-            optimize = ' -O1'
-        else:
-            optimize = ''
-
-        install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT '
-                       '--record=INSTALLED_FILES') % (def_setup_call, optimize)
+        install_cmd = ('%s install -O1 --root=$RPM_BUILD_ROOT '
+                       '--record=INSTALLED_FILES') % def_setup_call
 
         script_options = [
             ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index ff40628f42..2d84007f87 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -109,8 +109,6 @@ def test_no_optimize_flag(self):
         cmd = bdist_rpm(dist)
         cmd.fix_python = True
 
-        # running with force-optimize = 1
-        # and quiet = 1
         cmd.quiet = 1
         cmd.ensure_finalized()
         cmd.run()
@@ -119,29 +117,6 @@ def test_no_optimize_flag(self):
         self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
-        # XXX I am unable yet to make this test work without
-        # spurious stderr output
-        # so returning until distutils.spawn acts better
-        return
-
-        # running with force-optimize = 0
-        cmd.force_optimize = 0
-        try:
-            # XXX How to prevent the spawned
-            # rpmbuild command to display errors ?
-            # this can be a problem for buildbots
-            cmd.ensure_finalized()
-            cmd.run()
-        except DistutilsExecError:
-            # happens only under Fedora/RedHat
-            # and some flavors of Linux
-            # otherwise it's a bug
-            if sys.platform == 'linux2':
-                return
-
-        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
-
 def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 

From d3c376f3f1359f37e486775bb1b3009148e794c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 2 Mar 2009 05:41:25 +0000
Subject: [PATCH 2174/8469] Merged revisions 70094 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70094 | tarek.ziade | 2009-03-02 06:38:44 +0100 (Mon, 02 Mar 2009) | 1 line

  removing the force-optimized option as discussed in #1533164
........
---
 command/bdist_rpm.py    | 21 +++------------------
 tests/test_bdist_rpm.py | 25 -------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 3afdafefda..452f9502ad 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -125,18 +125,10 @@ class bdist_rpm(Command):
 
         ('quiet', 'q',
          "Run the INSTALL phase of RPM building in quiet mode"),
-
-        # Forces the -O1 option when calling the install command,
-        # so the rpm contains all files needed for proper operation under
-        # SELinux. Some systems checks for this on build-time and will
-        # fail without this.
-        ('force-optimize', None,
-         "Forces the -O1 option when calling the install command"),
-
         ]
 
     boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode',
-                       'no-autoreq', 'quiet', 'force-optimize']
+                       'no-autoreq', 'quiet']
 
     negative_opt = {'no-keep-temp': 'keep-temp',
                     'no-rpm-opt-flags': 'use-rpm-opt-flags',
@@ -187,7 +179,6 @@ def initialize_options(self):
 
         self.force_arch = None
         self.quiet = 0
-        self.force_optimize = 1
 
     def finalize_options(self):
         self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
@@ -492,14 +483,8 @@ def _make_spec_file(self):
         # that we open and interpolate into the spec file, but the defaults
         # are just text that we drop in as-is.  Hmmm.
 
-        # forcing -O1 if force-optimize
-        if self.force_optimize:
-            optimize = ' -O1'
-        else:
-            optimize = ''
-
-        install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT '
-                       '--record=INSTALLED_FILES') % (def_setup_call, optimize)
+        install_cmd = ('%s install -O1 --root=$RPM_BUILD_ROOT '
+                       '--record=INSTALLED_FILES') % def_setup_call
 
         script_options = [
             ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index ff40628f42..2d84007f87 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -109,8 +109,6 @@ def test_no_optimize_flag(self):
         cmd = bdist_rpm(dist)
         cmd.fix_python = True
 
-        # running with force-optimize = 1
-        # and quiet = 1
         cmd.quiet = 1
         cmd.ensure_finalized()
         cmd.run()
@@ -119,29 +117,6 @@ def test_no_optimize_flag(self):
         self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
-        # XXX I am unable yet to make this test work without
-        # spurious stderr output
-        # so returning until distutils.spawn acts better
-        return
-
-        # running with force-optimize = 0
-        cmd.force_optimize = 0
-        try:
-            # XXX How to prevent the spawned
-            # rpmbuild command to display errors ?
-            # this can be a problem for buildbots
-            cmd.ensure_finalized()
-            cmd.run()
-        except DistutilsExecError:
-            # happens only under Fedora/RedHat
-            # and some flavors of Linux
-            # otherwise it's a bug
-            if sys.platform == 'linux2':
-                return
-
-        dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
-
 def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 

From aee35e095b854dd8969b6e33a6a82a0b635fec39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 7 Mar 2009 00:32:45 +0000
Subject: [PATCH 2175/8469] Issue #5394: removed > 2.3 syntax from
 distutils.msvc9compiler

---
 msvc9compiler.py            | 36 ++++++++++++++++++++----------------
 tests/test_msvc9compiler.py | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 68b7775830..00d76d4bea 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,10 +17,11 @@
 import os
 import subprocess
 import sys
-from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
-    CompileError, LibError, LinkError)
-from distutils.ccompiler import (CCompiler, gen_preprocess_options,
-    gen_lib_options)
+
+from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
+                             CompileError, LibError, LinkError
+from distutils.ccompiler import CCompiler, gen_preprocess_options, \
+                                gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
@@ -53,15 +54,14 @@ class Reg:
     """Helper class to read values from the registry
     """
 
-    @classmethod
     def get_value(cls, path, key):
         for base in HKEYS:
             d = cls.read_values(base, path)
             if d and key in d:
                 return d[key]
         raise KeyError(key)
+    get_value = classmethod(get_value)
 
-    @classmethod
     def read_keys(cls, base, key):
         """Return list of registry keys."""
         try:
@@ -78,8 +78,8 @@ def read_keys(cls, base, key):
             L.append(k)
             i += 1
         return L
+    read_keys = classmethod(read_keys)
 
-    @classmethod
     def read_values(cls, base, key):
         """Return dict of registry keys and values.
 
@@ -100,8 +100,8 @@ def read_values(cls, base, key):
             d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
             i += 1
         return d
+    read_values = classmethod(read_values)
 
-    @staticmethod
     def convert_mbcs(s):
         dec = getattr(s, "decode", None)
         if dec is not None:
@@ -110,6 +110,7 @@ def convert_mbcs(s):
             except UnicodeError:
                 pass
         return s
+    convert_mbcs = staticmethod(convert_mbcs)
 
 class MacroExpander:
 
@@ -131,7 +132,7 @@ def load_macros(self, version):
                                "sdkinstallrootv2.0")
             else:
                 raise KeyError("sdkinstallrootv2.0")
-        except KeyError as exc: #
+        except KeyError:
             raise DistutilsPlatformError(
             """Python was built with Visual Studio 2008;
 extensions must be built with a compiler than can generate compatible binaries.
@@ -479,7 +480,7 @@ def compile(self, sources,
                 try:
                     self.spawn([self.rc] + pp_opts +
                                [output_opt] + [input_opt])
-                except DistutilsExecError as msg:
+                except DistutilsExecError, msg:
                     raise CompileError(msg)
                 continue
             elif ext in self._mc_extensions:
@@ -506,7 +507,7 @@ def compile(self, sources,
                     self.spawn([self.rc] +
                                ["/fo" + obj] + [rc_file])
 
-                except DistutilsExecError as msg:
+                except DistutilsExecError, msg:
                     raise CompileError(msg)
                 continue
             else:
@@ -519,7 +520,7 @@ def compile(self, sources,
                 self.spawn([self.cc] + compile_opts + pp_opts +
                            [input_opt, output_opt] +
                            extra_postargs)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise CompileError(msg)
 
         return objects
@@ -544,7 +545,7 @@ def create_static_lib(self,
                 pass # XXX what goes here?
             try:
                 self.spawn([self.lib] + lib_args)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -633,7 +634,7 @@ def link(self,
             self.mkpath(os.path.dirname(output_filename))
             try:
                 self.spawn([self.linker] + ld_args)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LinkError(msg)
 
             # embed the manifest
@@ -641,12 +642,15 @@ def link(self,
             # will still consider the DLL up-to-date, but it will not have a
             # manifest.  Maybe we should link to a temp file?  OTOH, that
             # implies a build environment error that shouldn't go undetected.
-            mfid = 1 if target_desc == CCompiler.EXECUTABLE else 2
+            if target_desc == CCompiler.EXECUTABLE:
+                mfid = 1
+            else:
+                mfid = 2
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
                             temp_manifest, out_arg])
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 0c8bd6e042..bde614e9a4 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -30,6 +30,28 @@ def _find_vcvarsall(version):
         finally:
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
+    def test_reg_class(self):
+        if sys.platform != 'win32':
+            # this test is only for win32
+            return
+
+        from distutils.msvc9compiler import Reg
+        self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
+
+        # looking for values that should exist on all
+        # windows registeries versions.
+        path = r'Software\Microsoft\Notepad'
+        v = Reg.get_value(path, u"lfitalic")
+        self.assert_(v in (0, 1))
+
+        import _winreg
+        HKCU = _winreg.HKEY_CURRENT_USER
+        keys = Reg.read_keys(HKCU, 'xxxx')
+        self.assertEquals(keys, None)
+
+        keys = Reg.read_keys(HKCU, r'Software\Microsoft')
+        self.assert_('Notepad' in keys)
+
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 

From efe5ba3afc4aa141d408bac712301a121b2f4ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 7 Mar 2009 00:51:53 +0000
Subject: [PATCH 2176/8469] Merged revisions 70212 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70212 | tarek.ziade | 2009-03-07 01:32:45 +0100 (Sat, 07 Mar 2009) | 1 line

  Issue #5394: removed > 2.3 syntax from distutils.msvc9compiler
........
---
 msvc9compiler.py            | 36 ++++++++++++++++++++----------------
 tests/test_msvc9compiler.py | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index aae0637394..48551ddf51 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,10 +17,11 @@
 import os
 import subprocess
 import sys
-from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
-    CompileError, LibError, LinkError)
-from distutils.ccompiler import (CCompiler, gen_preprocess_options,
-    gen_lib_options)
+
+from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
+                             CompileError, LibError, LinkError
+from distutils.ccompiler import CCompiler, gen_preprocess_options, \
+                                gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
@@ -53,15 +54,14 @@ class Reg:
     """Helper class to read values from the registry
     """
 
-    @classmethod
     def get_value(cls, path, key):
         for base in HKEYS:
             d = cls.read_values(base, path)
             if d and key in d:
                 return d[key]
         raise KeyError(key)
+    get_value = classmethod(get_value)
 
-    @classmethod
     def read_keys(cls, base, key):
         """Return list of registry keys."""
         try:
@@ -78,8 +78,8 @@ def read_keys(cls, base, key):
             L.append(k)
             i += 1
         return L
+    read_keys = classmethod(read_keys)
 
-    @classmethod
     def read_values(cls, base, key):
         """Return dict of registry keys and values.
 
@@ -100,8 +100,8 @@ def read_values(cls, base, key):
             d[cls.convert_mbcs(name)] = cls.convert_mbcs(value)
             i += 1
         return d
+    read_values = classmethod(read_values)
 
-    @staticmethod
     def convert_mbcs(s):
         dec = getattr(s, "decode", None)
         if dec is not None:
@@ -110,6 +110,7 @@ def convert_mbcs(s):
             except UnicodeError:
                 pass
         return s
+    convert_mbcs = staticmethod(convert_mbcs)
 
 class MacroExpander:
 
@@ -131,7 +132,7 @@ def load_macros(self, version):
                                "sdkinstallrootv2.0")
             else:
                 raise KeyError("sdkinstallrootv2.0")
-        except KeyError as exc: #
+        except KeyError:
             raise DistutilsPlatformError(
             """Python was built with Visual Studio 2008;
 extensions must be built with a compiler than can generate compatible binaries.
@@ -478,7 +479,7 @@ def compile(self, sources,
                 try:
                     self.spawn([self.rc] + pp_opts +
                                [output_opt] + [input_opt])
-                except DistutilsExecError as msg:
+                except DistutilsExecError, msg:
                     raise CompileError(msg)
                 continue
             elif ext in self._mc_extensions:
@@ -505,7 +506,7 @@ def compile(self, sources,
                     self.spawn([self.rc] +
                                ["/fo" + obj] + [rc_file])
 
-                except DistutilsExecError as msg:
+                except DistutilsExecError, msg:
                     raise CompileError(msg)
                 continue
             else:
@@ -518,7 +519,7 @@ def compile(self, sources,
                 self.spawn([self.cc] + compile_opts + pp_opts +
                            [input_opt, output_opt] +
                            extra_postargs)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise CompileError(msg)
 
         return objects
@@ -543,7 +544,7 @@ def create_static_lib(self,
                 pass # XXX what goes here?
             try:
                 self.spawn([self.lib] + lib_args)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -632,7 +633,7 @@ def link(self,
             self.mkpath(os.path.dirname(output_filename))
             try:
                 self.spawn([self.linker] + ld_args)
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LinkError(msg)
 
             # embed the manifest
@@ -640,12 +641,15 @@ def link(self,
             # will still consider the DLL up-to-date, but it will not have a
             # manifest.  Maybe we should link to a temp file?  OTOH, that
             # implies a build environment error that shouldn't go undetected.
-            mfid = 1 if target_desc == CCompiler.EXECUTABLE else 2
+            if target_desc == CCompiler.EXECUTABLE:
+                mfid = 1
+            else:
+                mfid = 2
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
                             temp_manifest, out_arg])
-            except DistutilsExecError as msg:
+            except DistutilsExecError, msg:
                 raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 0c8bd6e042..e7d1620fdd 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -30,6 +30,28 @@ def _find_vcvarsall(version):
         finally:
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
+    def test_reg_class(self):
+        if sys.platform != 'win32':
+            # this test is only for win32
+            return
+
+        from distutils.msvc9compiler import Reg
+        self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
+
+        # looking for values that should exist on all
+        # windows registeries versions.
+        path = r'Software\Microsoft\Notepad'
+        v = Reg.get_value(path, "lfitalic")
+        self.assert_(v in (0, 1))
+
+        import _winreg
+        HKCU = _winreg.HKEY_CURRENT_USER
+        keys = Reg.read_keys(HKCU, 'xxxx')
+        self.assertEquals(keys, None)
+
+        keys = Reg.read_keys(HKCU, r'Software\Microsoft')
+        self.assert_('Notepad' in keys)
+
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 

From 57eb312a5abee5c02035c01b23853d7f8c9122cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 7 Mar 2009 01:12:09 +0000
Subject: [PATCH 2177/8469] fixed except syntax for py3

---
 msvc9compiler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 48551ddf51..ef895422c6 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -479,7 +479,7 @@ def compile(self, sources,
                 try:
                     self.spawn([self.rc] + pp_opts +
                                [output_opt] + [input_opt])
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise CompileError(msg)
                 continue
             elif ext in self._mc_extensions:
@@ -506,7 +506,7 @@ def compile(self, sources,
                     self.spawn([self.rc] +
                                ["/fo" + obj] + [rc_file])
 
-                except DistutilsExecError, msg:
+                except DistutilsExecError as msg:
                     raise CompileError(msg)
                 continue
             else:
@@ -519,7 +519,7 @@ def compile(self, sources,
                 self.spawn([self.cc] + compile_opts + pp_opts +
                            [input_opt, output_opt] +
                            extra_postargs)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise CompileError(msg)
 
         return objects
@@ -544,7 +544,7 @@ def create_static_lib(self,
                 pass # XXX what goes here?
             try:
                 self.spawn([self.lib] + lib_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LibError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
@@ -633,7 +633,7 @@ def link(self,
             self.mkpath(os.path.dirname(output_filename))
             try:
                 self.spawn([self.linker] + ld_args)
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LinkError(msg)
 
             # embed the manifest
@@ -649,7 +649,7 @@ def link(self,
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
                             temp_manifest, out_arg])
-            except DistutilsExecError, msg:
+            except DistutilsExecError as msg:
                 raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)

From 2d5c28e86921686607c1f6d9e67a2eaddbefb447 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Mar 2009 16:34:40 +0000
Subject: [PATCH 2178/8469] bump version to 3.1a1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 1cf8a6ea56..12a430ecdd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1a0"
+__version__ = "3.1a1"
 #--end constants--

From 9a76eb65587528397be4a18d14f3feb69871eb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 11 Mar 2009 12:48:04 +0000
Subject: [PATCH 2179/8469] Issue #5472: Fixed distutils.test_util tear down

---
 tests/test_util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_util.py b/tests/test_util.py
index ca586268a3..67474025d3 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -53,6 +53,8 @@ def tearDown(self):
         os.path.splitdrive = self.splitdrive
         if self.uname is not None:
             os.uname = self.uname
+        else:
+            del os.uname
 
     def _set_uname(self, uname):
         self._uname = uname

From a5f88c28d9f7fdda89cb5e7528e3c27eae9403d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 11 Mar 2009 12:52:00 +0000
Subject: [PATCH 2180/8469] Merged revisions 70308 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70308 | tarek.ziade | 2009-03-11 13:48:04 +0100 (Wed, 11 Mar 2009) | 1 line

  Issue #5472: Fixed distutils.test_util tear down
........
---
 tests/test_util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_util.py b/tests/test_util.py
index ca586268a3..67474025d3 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -53,6 +53,8 @@ def tearDown(self):
         os.path.splitdrive = self.splitdrive
         if self.uname is not None:
             os.uname = self.uname
+        else:
+            del os.uname
 
     def _set_uname(self, uname):
         self._uname = uname

From 08c27fd41a67693d49c78ecbb512d3db78445a51 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 15 Mar 2009 22:43:14 +0000
Subject: [PATCH 2181/8469] Added skip for old MSVC.

---
 tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index bde614e9a4..78ce3b7a84 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -34,6 +34,10 @@ def test_reg_class(self):
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
 
         from distutils.msvc9compiler import Reg
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')

From 1f49eec84ddf546ae1b2c4ec7d28e611cc4c9d80 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 21 Mar 2009 17:31:58 +0000
Subject: [PATCH 2182/8469] Merged revisions
 70342,70385-70387,70389-70390,70392-70393,70395,70400,70405-70406,70418,70438,70464,70468
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70342 | georg.brandl | 2009-03-13 14:03:58 -0500 (Fri, 13 Mar 2009) | 1 line

  #5486: typos.
........
  r70385 | benjamin.peterson | 2009-03-15 09:38:55 -0500 (Sun, 15 Mar 2009) | 1 line

  fix tuple.index() error message #5495
........
  r70386 | georg.brandl | 2009-03-15 16:32:06 -0500 (Sun, 15 Mar 2009) | 1 line

  #5496: fix docstring of lookup().
........
  r70387 | georg.brandl | 2009-03-15 16:37:16 -0500 (Sun, 15 Mar 2009) | 1 line

  #5493: clarify __nonzero__ docs.
........
  r70389 | georg.brandl | 2009-03-15 16:43:38 -0500 (Sun, 15 Mar 2009) | 1 line

  Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
........
  r70390 | georg.brandl | 2009-03-15 16:44:43 -0500 (Sun, 15 Mar 2009) | 1 line

  #5491: clarify nested() semantics.
........
  r70392 | georg.brandl | 2009-03-15 16:46:00 -0500 (Sun, 15 Mar 2009) | 1 line

  #5488: add missing struct member.
........
  r70393 | georg.brandl | 2009-03-15 16:47:42 -0500 (Sun, 15 Mar 2009) | 1 line

  #5478: fix copy-paste oversight in function signature.
........
  r70395 | georg.brandl | 2009-03-15 16:51:48 -0500 (Sun, 15 Mar 2009) | 1 line

  #5276: document IDLESTARTUP and .Idle.py.
........
  r70400 | georg.brandl | 2009-03-15 16:59:37 -0500 (Sun, 15 Mar 2009) | 3 lines

  Fix markup in re docs and give a mail address in regex howto, so that
  the recommendation to send suggestions to the author can be followed.
........
  r70405 | georg.brandl | 2009-03-15 17:11:07 -0500 (Sun, 15 Mar 2009) | 7 lines

  Move the previously local import of threading to module level.

  This is cleaner and avoids lockups in obscure cases where a Queue
  is instantiated while the import lock is already held by another thread.

  OKed by Tim Peters.
........
  r70406 | hirokazu.yamamoto | 2009-03-15 17:43:14 -0500 (Sun, 15 Mar 2009) | 1 line

  Added skip for old MSVC.
........
  r70418 | georg.brandl | 2009-03-16 14:42:03 -0500 (Mon, 16 Mar 2009) | 1 line

  Add token markup.
........
  r70438 | benjamin.peterson | 2009-03-17 15:29:51 -0500 (Tue, 17 Mar 2009) | 1 line

  I thought this was begging for an example
........
  r70464 | benjamin.peterson | 2009-03-18 15:58:09 -0500 (Wed, 18 Mar 2009) | 1 line

  a much better example
........
  r70468 | benjamin.peterson | 2009-03-18 22:04:31 -0500 (Wed, 18 Mar 2009) | 1 line

  close files after comparing them
........
---
 tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index e7d1620fdd..aefadd6dc3 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -34,6 +34,10 @@ def test_reg_class(self):
         if sys.platform != 'win32':
             # this test is only for win32
             return
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
 
         from distutils.msvc9compiler import Reg
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')

From 48a187444772146188fbfb1ffb5483fc03a84e87 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 28 Mar 2009 00:48:48 +0000
Subject: [PATCH 2183/8469] Fix typo.

---
 version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.py b/version.py
index 71a5614719..0fb5b6e204 100644
--- a/version.py
+++ b/version.py
@@ -162,7 +162,7 @@ def __cmp__ (self, other):
 
 
 # The rules according to Greg Stein:
-# 1) a version number has 1 or more numbers separate by a period or by
+# 1) a version number has 1 or more numbers separated by a period or by
 #    sequences of letters. If only periods, then these are compared
 #    left-to-right to determine an ordering.
 # 2) sequences of letters are part of the tuple for comparison and are

From faad81c0beb9849650bd8673266556b2438bb73d Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 30 Mar 2009 14:51:56 +0000
Subject: [PATCH 2184/8469] Merged revisions
 70578,70599,70641-70642,70650,70660-70661,70674,70691,70697-70698,70700,70704
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70578 | benjamin.peterson | 2009-03-23 22:24:56 -0500 (Mon, 23 Mar 2009) | 1 line

  this is better written using assertRaises
........
  r70599 | benjamin.peterson | 2009-03-25 16:42:51 -0500 (Wed, 25 Mar 2009) | 1 line

  this can be slightly less ugly
........
  r70641 | guilherme.polo | 2009-03-27 16:43:08 -0500 (Fri, 27 Mar 2009) | 3 lines

  Adjusted _tkinter to compile without warnings when WITH_THREAD is not
  defined (part of issue #5035)
........
  r70642 | georg.brandl | 2009-03-27 19:48:48 -0500 (Fri, 27 Mar 2009) | 1 line

  Fix typo.
........
  r70650 | benjamin.peterson | 2009-03-28 14:16:10 -0500 (Sat, 28 Mar 2009) | 1 line

  give os.symlink and os.link() better parameter names #5564
........
  r70660 | georg.brandl | 2009-03-28 14:52:58 -0500 (Sat, 28 Mar 2009) | 1 line

  Switch to fixed Sphinx version.
........
  r70661 | georg.brandl | 2009-03-28 14:57:36 -0500 (Sat, 28 Mar 2009) | 2 lines

  Add section numbering to some of the larger subdocuments.
........
  r70674 | guilherme.polo | 2009-03-29 05:19:05 -0500 (Sun, 29 Mar 2009) | 1 line

  Typo fix.
........
  r70691 | raymond.hettinger | 2009-03-29 13:51:11 -0500 (Sun, 29 Mar 2009) | 1 line

  Make life easier for non-CPython implementations.
........
  r70697 | benjamin.peterson | 2009-03-29 16:22:35 -0500 (Sun, 29 Mar 2009) | 1 line

  this has been fixed since 2.6 (I love removing these)
........
  r70698 | benjamin.peterson | 2009-03-29 16:31:05 -0500 (Sun, 29 Mar 2009) | 1 line

  thanks to guido's bytecode verifier, this is fixed
........
  r70700 | benjamin.peterson | 2009-03-29 16:50:14 -0500 (Sun, 29 Mar 2009) | 1 line

  use the awesome new status iterator
........
  r70704 | benjamin.peterson | 2009-03-29 21:49:32 -0500 (Sun, 29 Mar 2009) | 1 line

  there's actually three methods here #5600
........
---
 version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.py b/version.py
index 79d458d847..ebcab84e4e 100644
--- a/version.py
+++ b/version.py
@@ -207,7 +207,7 @@ def _cmp (self, other):
 
 
 # The rules according to Greg Stein:
-# 1) a version number has 1 or more numbers separate by a period or by
+# 1) a version number has 1 or more numbers separated by a period or by
 #    sequences of letters. If only periods, then these are compared
 #    left-to-right to determine an ordering.
 # 2) sequences of letters are part of the tuple for comparison and are

From 31b701a80d234c9782272d4ce02f38b8c365e119 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 31 Mar 2009 00:34:54 +0000
Subject: [PATCH 2185/8469] Add new copydir_run_2to3() function, for use e.g.
 in test runners to transparently convert and run tests written for Python 2.

---
 util.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/util.py b/util.py
index 042306e913..4c1956a2b8 100644
--- a/util.py
+++ b/util.py
@@ -571,6 +571,39 @@ def log_debug(self, msg, *args):
     r = DistutilsRefactoringTool(fixer_names, options=options)
     r.refactor(files, write=True)
 
+def copydir_run_2to3(src, dest, template=None, fixer_names=None,
+                     options=None, explicit=None):
+    """Recursively copy a directory, only copying new and changed files,
+    running run_2to3 over all newly copied Python modules afterward.
+
+    If you give a template string, it's parsed like a MANIFEST.in.
+    """
+    from distutils.dir_util import mkpath
+    from distutils.file_util import copy_file
+    from distutils.filelist import FileList
+    filelist = FileList()
+    curdir = os.getcwd()
+    os.chdir(src)
+    try:
+        filelist.findall()
+    finally:
+        os.chdir(curdir)
+    filelist.files[:] = filelist.allfiles
+    if template:
+        for line in template.splitlines():
+            line = line.strip()
+            if not line: continue
+            filelist.process_template_line(line)
+    copied = []
+    for filename in filelist.files:
+        outname = os.path.join(dest, filename)
+        mkpath(os.path.dirname(outname))
+        res = copy_file(os.path.join(src, filename), outname, update=1)
+        if res[1]: copied.append(outname)
+    run_2to3([fn for fn in copied if fn.lower().endswith('.py')],
+             fixer_names=fixer_names, options=options, explicit=explicit)
+    return copied
+
 class Mixin2to3:
     '''Mixin class for commands that run 2to3.
     To configure 2to3, setup scripts may either change

From 405478c9f8d1613cbc225ff13ea972b5039aa316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:48:31 +0000
Subject: [PATCH 2186/8469] using log.warn for sys.stderr

---
 cmd.py |  5 ++---
 log.py | 13 +++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd.py b/cmd.py
index 012fca15b5..dfcbe23537 100644
--- a/cmd.py
+++ b/cmd.py
@@ -352,9 +352,8 @@ def get_sub_commands (self):
     # -- External world manipulation -----------------------------------
 
     def warn (self, msg):
-        sys.stderr.write("warning: %s: %s\n" %
-                         (self.get_command_name(), msg))
-
+        log.warn("warning: %s: %s\n" %
+                (self.get_command_name(), msg))
 
     def execute (self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
diff --git a/log.py b/log.py
index fcaa545a79..6f949d5179 100644
--- a/log.py
+++ b/log.py
@@ -18,13 +18,14 @@ def __init__(self, threshold=WARN):
 
     def _log(self, level, msg, args):
         if level >= self.threshold:
-            if not args:
-                # msg may contain a '%'. If args is empty,
-                # don't even try to string-format
-                print msg
+            if args:
+                msg = msg % args
+            if level in (WARN, ERROR, FATAL):
+                stream = sys.stderr
             else:
-                print msg % args
-            sys.stdout.flush()
+                stream = sys.stdout
+            stream.write('%s\n' % msg)
+            stream.flush()
 
     def log(self, level, msg, *args):
         self._log(level, msg, args)

From aca2cc988727dfa93fab949125562b1714f5ab69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:50:59 +0000
Subject: [PATCH 2187/8469] added tests for the clean command

---
 command/clean.py    |  2 +-
 tests/support.py    | 21 +++++++++++++++++--
 tests/test_clean.py | 49 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100755 tests/test_clean.py

diff --git a/command/clean.py b/command/clean.py
index ba03d1fff6..90ef35f1ca 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -11,7 +11,7 @@
 from distutils.dir_util import remove_tree
 from distutils import log
 
-class clean (Command):
+class clean(Command):
 
     description = "clean up temporary files from 'build' command"
     user_options = [
diff --git a/tests/support.py b/tests/support.py
index fbbf35d8ea..578cf40c09 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,7 +4,7 @@
 import tempfile
 
 from distutils import log
-
+from distutils.core import Distribution
 
 class LoggingSilencer(object):
 
@@ -42,7 +42,7 @@ def mkdtemp(self):
         self.tempdirs.append(d)
         return d
 
-    def write_file(self, path, content):
+    def write_file(self, path, content='xxx'):
         """Writes a file in the given path.
 
 
@@ -56,6 +56,23 @@ def write_file(self, path, content):
         finally:
             f.close()
 
+    def create_dist(self, pkg_name='foo', **kw):
+        """Will generate a test environment.
+
+        This function creates:
+         - a Distribution instance using keywords
+         - a temporary directory with a package structure
+
+        It returns the package directory and the distribution
+        instance.
+        """
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, pkg_name)
+        os.mkdir(pkg_dir)
+        dist = Distribution(attrs=kw)
+
+        return pkg_dir, dist
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
diff --git a/tests/test_clean.py b/tests/test_clean.py
new file mode 100755
index 0000000000..a94a812b1f
--- /dev/null
+++ b/tests/test_clean.py
@@ -0,0 +1,49 @@
+"""Tests for distutils.command.clean."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.clean import clean
+from distutils.tests import support
+
+class cleanTestCase(support.TempdirManager,
+                    unittest.TestCase):
+
+    def test_simple_run(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = clean(dist)
+
+        # let's add some elements clean should remove
+        dirs = [(d, os.path.join(pkg_dir, d))
+                for d in ('build_temp', 'build_lib', 'bdist_base',
+                'build_scripts', 'build_base')]
+
+        for name, path in dirs:
+            os.mkdir(path)
+            setattr(cmd, name, path)
+            if name == 'build_base':
+                continue
+            for f in ('one', 'two', 'three'):
+                self.write_file(os.path.join(path, f))
+
+        # let's run the command
+        cmd.all = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # make sure the files where removed
+        for name, path in dirs:
+            self.assert_(not os.path.exists(path),
+                         '%s was not removed' % path)
+
+        # let's run the command again (should spit warnings but suceed)
+        cmd.all = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+def test_suite():
+    return unittest.makeSuite(cleanTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From ec2b5a008569d749c58f1ac688a165c12af051cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:53:13 +0000
Subject: [PATCH 2188/8469] more tests for the register command

---
 command/register.py    |  23 +++++----
 tests/test_register.py | 108 ++++++++++++++++++++++++++++-------------
 2 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/command/register.py b/command/register.py
index 40661d8776..f3463dc289 100644
--- a/command/register.py
+++ b/command/register.py
@@ -90,14 +90,14 @@ def classifiers(self):
         ''' Fetch the list of classifiers from the server.
         '''
         response = urllib2.urlopen(self.repository+'?:action=list_classifiers')
-        print response.read()
+        log.info(response.read())
 
     def verify_metadata(self):
         ''' Send the metadata to the package index server to be checked.
         '''
         # send the info to the server and report the result
         (code, result) = self.post_to_server(self.build_post_data('verify'))
-        print 'Server response (%s): %s'%(code, result)
+        log.info('Server response (%s): %s' % (code, result))
 
 
     def send_metadata(self):
@@ -210,17 +210,18 @@ def send_metadata(self):
                 data['email'] = raw_input('   EMail: ')
             code, result = self.post_to_server(data)
             if code != 200:
-                print 'Server response (%s): %s'%(code, result)
+                log.info('Server response (%s): %s' % (code, result))
             else:
-                print 'You will receive an email shortly.'
-                print 'Follow the instructions in it to complete registration.'
+                log.info('You will receive an email shortly.')
+                log.info(('Follow the instructions in it to '
+                          'complete registration.'))
         elif choice == '3':
             data = {':action': 'password_reset'}
             data['email'] = ''
             while not data['email']:
                 data['email'] = raw_input('Your email address: ')
             code, result = self.post_to_server(data)
-            print 'Server response (%s): %s'%(code, result)
+            log.info('Server response (%s): %s' % (code, result))
 
     def build_post_data(self, action):
         # figure the data to send - the metadata plus some additional
@@ -253,8 +254,10 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-        self.announce('Registering %s to %s' % (data['name'],
-                                                self.repository), log.INFO)
+        if 'name' in data:
+            self.announce('Registering %s to %s' % (data['name'],
+                                                   self.repository),
+                                                   log.INFO)
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
@@ -301,5 +304,7 @@ def post_to_server(self, data, auth=None):
                 data = result.read()
             result = 200, 'OK'
         if self.show_response:
-            print '-'*75, data, '-'*75
+            dashes = '-' * 75
+            self.announce('%s%s%s' % (dashes, data, dashes))
+
         return result
diff --git a/tests/test_register.py b/tests/test_register.py
index b3543f50f8..7da8edb5d7 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -3,7 +3,9 @@
 import os
 import unittest
 import getpass
+import urllib2
 
+from distutils.command import register as register_module
 from distutils.command.register import register
 from distutils.core import Distribution
 
@@ -42,18 +44,20 @@ def __call__(self, prompt=''):
         finally:
             self.index += 1
 
-class FakeServer(object):
+class FakeOpener(object):
     """Fakes a PyPI server"""
     def __init__(self):
-        self.calls = []
+        self.reqs = []
 
     def __call__(self, *args):
-        # we want to compare them, so let's store
-        # something comparable
-        els = args[0].items()
-        els.sort()
-        self.calls.append(tuple(els))
-        return 200, 'OK'
+        return self
+
+    def open(self, req):
+        self.reqs.append(req)
+        return self
+
+    def read(self):
+        return 'xxx'
 
 class registerTestCase(PyPIRCCommandTestCase):
 
@@ -64,24 +68,27 @@ def setUp(self):
         def _getpass(prompt):
             return 'password'
         getpass.getpass = _getpass
+        self.old_opener = urllib2.build_opener
+        self.conn = urllib2.build_opener = FakeOpener()
 
     def tearDown(self):
         getpass.getpass = self._old_getpass
+        urllib2.build_opener = self.old_opener
         PyPIRCCommandTestCase.tearDown(self)
 
+    def _get_cmd(self):
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx'}
+        pkg_info, dist = self.create_dist(**metadata)
+        return register(dist)
+
     def test_create_pypirc(self):
         # this test makes sure a .pypirc file
         # is created when requested.
 
-        # let's create a fake distribution
-        # and a register instance
-        dist = Distribution()
-        dist.metadata.url = 'xxx'
-        dist.metadata.author = 'xxx'
-        dist.metadata.author_email = 'xxx'
-        dist.metadata.name = 'xxx'
-        dist.metadata.version =  'xxx'
-        cmd = register(dist)
+        # let's create a register instance
+        cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
         self.assert_(not os.path.exists(self.rc))
@@ -95,13 +102,12 @@ def test_create_pypirc(self):
         # Password : 'password'
         # Save your login (y/N)? : 'y'
         inputs = RawInputs('1', 'tarek', 'y')
-        from distutils.command import register as register_module
         register_module.raw_input = inputs.__call__
-
-        cmd.post_to_server = pypi_server = FakeServer()
-
         # let's run the command
-        cmd.run()
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
 
         # we should have a brand new .pypirc file
         self.assert_(os.path.exists(self.rc))
@@ -117,30 +123,66 @@ def _no_way(prompt=''):
             raise AssertionError(prompt)
         register_module.raw_input = _no_way
 
+        cmd.show_response = 1
         cmd.run()
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assert_(len(pypi_server.calls), 2)
-        self.assert_(pypi_server.calls[0], pypi_server.calls[1])
-
-    def test_password_not_in_file(self):
+        self.assert_(self.conn.reqs, 2)
+        req1 = dict(self.conn.reqs[0].headers)
+        req2 = dict(self.conn.reqs[1].headers)
 
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_NOPASSWORD)
-        f.close()
+        self.assertEquals(req1['Content-length'], '1374')
+        self.assertEquals(req2['Content-length'], '1374')
+        self.assert_('xxx' in self.conn.reqs[1].data)
 
-        dist = Distribution()
-        cmd = register(dist)
-        cmd.post_to_server = FakeServer()
+    def test_password_not_in_file(self):
 
+        self.write_file(self.rc, PYPIRC_NOPASSWORD)
+        cmd = self._get_cmd()
         cmd._set_config()
         cmd.finalize_options()
         cmd.send_metadata()
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(dist.password, 'password')
+        self.assertEquals(cmd.distribution.password, 'password')
+
+    def test_registering(self):
+        # this test runs choice 2
+        cmd = self._get_cmd()
+        inputs = RawInputs('2', 'tarek', 'tarek@ziade.org')
+        register_module.raw_input = inputs.__call__
+        try:
+            # let's run the command
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+        # we should have send a request
+        self.assert_(self.conn.reqs, 1)
+        req = self.conn.reqs[0]
+        headers = dict(req.headers)
+        self.assertEquals(headers['Content-length'], '608')
+        self.assert_('tarek' in req.data)
+
+    def test_password_reset(self):
+        # this test runs choice 3
+        cmd = self._get_cmd()
+        inputs = RawInputs('3', 'tarek@ziade.org')
+        register_module.raw_input = inputs.__call__
+        try:
+            # let's run the command
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+        # we should have send a request
+        self.assert_(self.conn.reqs, 1)
+        req = self.conn.reqs[0]
+        headers = dict(req.headers)
+        self.assertEquals(headers['Content-length'], '290')
+        self.assert_('tarek' in req.data)
 
 def test_suite():
     return unittest.makeSuite(registerTestCase)

From 34a3369b79dad443a930c06247b9195fcd024837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:53:55 +0000
Subject: [PATCH 2189/8469] more tests for the upload command

---
 command/upload.py    |  2 +-
 tests/test_upload.py | 70 +++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index df82e4ca56..74b06283f5 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -192,4 +192,4 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print '-'*75, r.read(), '-'*75
+            self.announce('-'*75, r.read(), '-'*75)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 3f8ca6d6ad..f57a4a3f33 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import httplib
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
@@ -18,17 +19,52 @@
 [server1]
 username:me
 """
+class Response(object):
+    def __init__(self, status=200, reason='OK'):
+        self.status = status
+        self.reason = reason
 
+class FakeConnection(object):
+
+    def __init__(self):
+        self.requests = []
+        self.headers = []
+        self.body = ''
+
+    def __call__(self, netloc):
+        return self
+
+    def connect(self):
+        pass
+    endheaders = connect
+
+    def putrequest(self, method, url):
+        self.requests.append((method, url))
+
+    def putheader(self, name, value):
+        self.headers.append((name, value))
+
+    def send(self, body):
+        self.body = body
+
+    def getresponse(self):
+        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
+    def setUp(self):
+        super(uploadTestCase, self).setUp()
+        self.old_class = httplib.HTTPConnection
+        self.conn = httplib.HTTPConnection = FakeConnection()
+
+    def tearDown(self):
+        httplib.HTTPConnection = self.old_class
+        super(uploadTestCase, self).tearDown()
+
     def test_finalize_options(self):
 
         # new format
-        f = open(self.rc, 'w')
-        f.write(PYPIRC)
-        f.close()
-
+        self.write_file(self.rc, PYPIRC)
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
@@ -39,9 +75,7 @@ def test_finalize_options(self):
 
     def test_saved_password(self):
         # file with no password
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_NOPASSWORD)
-        f.close()
+        self.write_file(self.rc, PYPIRC_NOPASSWORD)
 
         # make sure it passes
         dist = Distribution()
@@ -56,6 +90,28 @@ def test_saved_password(self):
         cmd.finalize_options()
         self.assertEquals(cmd.password, 'xxx')
 
+    def test_upload(self):
+        tmp = self.mkdtemp()
+        path = os.path.join(tmp, 'xxx')
+        self.write_file(path)
+        command, pyversion, filename = 'xxx', '2.6', path
+        dist_files = [(command, pyversion, filename)]
+        self.write_file(self.rc, PYPIRC)
+
+        # lets run it
+        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        cmd = upload(dist)
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # what did we send ?
+        headers = dict(self.conn.headers)
+        self.assertEquals(headers['Content-length'], '2086')
+        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+
+        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
+        self.assert_('xxx' in self.conn.body)
+
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
 

From 50dee054d28f60fc285f609e47e422dee1fcb161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:54:38 +0000
Subject: [PATCH 2190/8469] added test to the install_data command

---
 command/install_data.py    | 11 +++---
 tests/test_install_data.py | 75 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_install_data.py

diff --git a/command/install_data.py b/command/install_data.py
index cb11371023..ec78ce3431 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -12,7 +12,7 @@
 from distutils.core import Command
 from distutils.util import change_root, convert_path
 
-class install_data (Command):
+class install_data(Command):
 
     description = "install data files"
 
@@ -27,12 +27,11 @@ class install_data (Command):
 
     boolean_options = ['force']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.install_dir = None
         self.outfiles = []
         self.root = None
         self.force = 0
-
         self.data_files = self.distribution.data_files
         self.warn_dir = 1
 
@@ -43,7 +42,7 @@ def finalize_options (self):
                                    ('force', 'force'),
                                   )
 
-    def run (self):
+    def run(self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
             if type(f) is StringType:
@@ -76,8 +75,8 @@ def run (self):
                         (out, _) = self.copy_file(data, dir)
                         self.outfiles.append(out)
 
-    def get_inputs (self):
+    def get_inputs(self):
         return self.data_files or []
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
new file mode 100644
index 0000000000..73c40371d6
--- /dev/null
+++ b/tests/test_install_data.py
@@ -0,0 +1,75 @@
+"""Tests for distutils.command.install_data."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.install_data import install_data
+from distutils.tests import support
+
+class InstallDataTestCase(support.TempdirManager,
+                          support.LoggingSilencer,
+                          unittest.TestCase):
+
+    def test_simple_run(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_data(dist)
+        cmd.install_dir = inst = os.path.join(pkg_dir, 'inst')
+
+        # data_files can contain
+        #  - simple files
+        #  - a tuple with a path, and a list of file
+        one = os.path.join(pkg_dir, 'one')
+        self.write_file(one, 'xxx')
+        inst2 = os.path.join(pkg_dir, 'inst2')
+        two = os.path.join(pkg_dir, 'two')
+        self.write_file(two, 'xxx')
+
+        cmd.data_files = [one, (inst2, [two])]
+        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+
+        # let's run the command
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 2)
+        rtwo = os.path.split(two)[-1]
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        rone = os.path.split(one)[-1]
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        cmd.outfiles = []
+
+        # let's try with warn_dir one
+        cmd.warn_dir = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        cmd.outfiles = []
+
+        # now using root and empty dir
+        cmd.root = os.path.join(pkg_dir, 'root')
+        inst3 = os.path.join(cmd.install_dir, 'inst3')
+        inst4 = os.path.join(pkg_dir, 'inst4')
+        three = os.path.join(cmd.install_dir, 'three')
+        self.write_file(three, 'xx')
+        cmd.data_files = [one, (inst2, [two]),
+                          ('inst3', [three]),
+                          (inst4, [])]
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+
+def test_suite():
+    return unittest.makeSuite(InstallDataTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 8d75f8d30fef8621e6d3c585e7b2e93c15d1cf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:55:21 +0000
Subject: [PATCH 2191/8469] added tests to the install_headers command

---
 command/install_headers.py    | 13 ++++++------
 tests/test_install_headers.py | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_install_headers.py

diff --git a/command/install_headers.py b/command/install_headers.py
index c25b771246..d892416a8c 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -8,7 +8,8 @@
 from distutils.core import Command
 
 
-class install_headers (Command):
+# XXX force is never used
+class install_headers(Command):
 
     description = "install C/C++ header files"
 
@@ -20,18 +21,18 @@ class install_headers (Command):
 
     boolean_options = ['force']
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.install_dir = None
         self.force = 0
         self.outfiles = []
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('install',
                                    ('install_headers', 'install_dir'),
                                    ('force', 'force'))
 
 
-    def run (self):
+    def run(self):
         headers = self.distribution.headers
         if not headers:
             return
@@ -41,10 +42,10 @@ def run (self):
             (out, _) = self.copy_file(header, self.install_dir)
             self.outfiles.append(out)
 
-    def get_inputs (self):
+    def get_inputs(self):
         return self.distribution.headers or []
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles
 
 # class install_headers
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
new file mode 100644
index 0000000000..2564563faf
--- /dev/null
+++ b/tests/test_install_headers.py
@@ -0,0 +1,39 @@
+"""Tests for distutils.command.install_headers."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.install_headers import install_headers
+from distutils.tests import support
+
+class InstallHeadersTestCase(support.TempdirManager,
+                             support.LoggingSilencer,
+                             unittest.TestCase):
+
+    def test_simple_run(self):
+        # we have two headers
+        header_list = self.mkdtemp()
+        header1 = os.path.join(header_list, 'header1')
+        header2 = os.path.join(header_list, 'header2')
+        self.write_file(header1)
+        self.write_file(header2)
+        headers = [header1, header2]
+
+        pkg_dir, dist = self.create_dist(headers=headers)
+        cmd = install_headers(dist)
+        self.assertEquals(cmd.get_inputs(), headers)
+
+        # let's run the command
+        cmd.install_dir = os.path.join(pkg_dir, 'inst')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the results
+        self.assertEquals(len(cmd.get_outputs()), 2)
+
+def test_suite():
+    return unittest.makeSuite(InstallHeadersTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From e96f0dd0d6fbf5f13d206aa20d10dc5e3047770c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 20:56:11 +0000
Subject: [PATCH 2192/8469] making sdist and config test silents

---
 tests/test_config.py | 4 +++-
 tests/test_sdist.py  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index a18f45359a..7737538bf8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -47,7 +47,9 @@
 """
 
 
-class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
+class PyPIRCCommandTestCase(support.TempdirManager,
+                            support.LoggingSilencer,
+                            unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 15a8c8087c..8af080f950 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -34,7 +34,7 @@
 somecode%(sep)sdoc.txt
 """
 
-class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
+class sdistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         # PyPIRCCommandTestCase creates a temp dir already

From f2378909df4f8e5552bae53353a305b4775e9699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 21:37:16 +0000
Subject: [PATCH 2193/8469] Merged revisions 70886,70888-70892 via svnmerge
 from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70886 | tarek.ziade | 2009-03-31 15:50:59 -0500 (Tue, 31 Mar 2009) | 1 line

  added tests for the clean command
........
  r70888 | tarek.ziade | 2009-03-31 15:53:13 -0500 (Tue, 31 Mar 2009) | 1 line

  more tests for the register command
........
  r70889 | tarek.ziade | 2009-03-31 15:53:55 -0500 (Tue, 31 Mar 2009) | 1 line

  more tests for the upload command
........
  r70890 | tarek.ziade | 2009-03-31 15:54:38 -0500 (Tue, 31 Mar 2009) | 1 line

  added test to the install_data command
........
  r70891 | tarek.ziade | 2009-03-31 15:55:21 -0500 (Tue, 31 Mar 2009) | 1 line

  added tests to the install_headers command
........
  r70892 | tarek.ziade | 2009-03-31 15:56:11 -0500 (Tue, 31 Mar 2009) | 1 line

  making sdist and config test silents
........
---
 cmd.py                        |   2 +-
 command/install_data.py       |   1 -
 command/install_headers.py    |   1 +
 command/register.py           |  23 +++----
 command/upload.py             |   2 +-
 tests/support.py              |  21 ++++++-
 tests/test_clean.py           |  49 +++++++++++++++
 tests/test_config.py          |   4 +-
 tests/test_install_data.py    |  75 +++++++++++++++++++++++
 tests/test_install_headers.py |  39 ++++++++++++
 tests/test_register.py        | 110 +++++++++++++++++++++++-----------
 tests/test_sdist.py           |   2 +-
 tests/test_upload.py          |  70 +++++++++++++++++++---
 13 files changed, 341 insertions(+), 58 deletions(-)
 create mode 100755 tests/test_clean.py
 create mode 100644 tests/test_install_data.py
 create mode 100644 tests/test_install_headers.py

diff --git a/cmd.py b/cmd.py
index 800425d4a9..46055b4b2c 100644
--- a/cmd.py
+++ b/cmd.py
@@ -333,7 +333,7 @@ def get_sub_commands(self):
     # -- External world manipulation -----------------------------------
 
     def warn(self, msg):
-        sys.stderr.write("warning: %s: %s\n" % (self.get_command_name(), msg))
+        log.warn("warning: %s: %s\n" % (self.get_command_name(), msg))
 
     def execute(self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
diff --git a/command/install_data.py b/command/install_data.py
index 06a70b4ad4..ab40797b98 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -31,7 +31,6 @@ def initialize_options(self):
         self.outfiles = []
         self.root = None
         self.force = 0
-
         self.data_files = self.distribution.data_files
         self.warn_dir = 1
 
diff --git a/command/install_headers.py b/command/install_headers.py
index 346daaad02..38125b5513 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -8,6 +8,7 @@
 from distutils.core import Command
 
 
+# XXX force is never used
 class install_headers(Command):
 
     description = "install C/C++ header files"
diff --git a/command/register.py b/command/register.py
index c271b18c4c..7dd3099912 100644
--- a/command/register.py
+++ b/command/register.py
@@ -92,15 +92,14 @@ def classifiers(self):
         '''
         url = self.repository+'?:action=list_classifiers'
         response = urllib.request.urlopen(url)
-        print(response.read())
+        log.info(response.read())
 
     def verify_metadata(self):
         ''' Send the metadata to the package index server to be checked.
         '''
         # send the info to the server and report the result
         (code, result) = self.post_to_server(self.build_post_data('verify'))
-        print('Server response (%s): %s'%(code, result))
-
+        log.info('Server response (%s): %s' % (code, result))
 
     def send_metadata(self):
         ''' Send the metadata to the package index server.
@@ -211,17 +210,18 @@ def send_metadata(self):
                 data['email'] = input('   EMail: ')
             code, result = self.post_to_server(data)
             if code != 200:
-                print('Server response (%s): %s'%(code, result))
+                log.info('Server response (%s): %s' % (code, result))
             else:
-                print('You will receive an email shortly.')
-                print('Follow the instructions in it to complete registration.')
+                log.info('You will receive an email shortly.')
+                log.info(('Follow the instructions in it to '
+                          'complete registration.'))
         elif choice == '3':
             data = {':action': 'password_reset'}
             data['email'] = ''
             while not data['email']:
                 data['email'] = input('Your email address: ')
             code, result = self.post_to_server(data)
-            print('Server response (%s): %s'%(code, result))
+            log.info('Server response (%s): %s' % (code, result))
 
     def build_post_data(self, action):
         # figure the data to send - the metadata plus some additional
@@ -254,8 +254,10 @@ def build_post_data(self, action):
     def post_to_server(self, data, auth=None):
         ''' Post a query to the server, and return a string response.
         '''
-        self.announce('Registering %s to %s' % (data['name'],
-                                                self.repository), log.INFO)
+        if 'name' in data:
+            self.announce('Registering %s to %s' % (data['name'],
+                                                    self.repository),
+                                                    log.INFO)
         # Build up the MIME payload for the urllib2 POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
@@ -302,5 +304,6 @@ def post_to_server(self, data, auth=None):
                 data = result.read()
             result = 200, 'OK'
         if self.show_response:
-            print('-'*75, data, '-'*75)
+            dashes = '-' * 75
+            self.announce('%s%s%s' % (dashes, data, dashes))
         return result
diff --git a/command/upload.py b/command/upload.py
index eb2f51678a..9249427a43 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -194,4 +194,4 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print('-'*75, r.read(), '-'*75)
+            self.announce('-'*75, r.read(), '-'*75)
diff --git a/tests/support.py b/tests/support.py
index ecc8da174e..ab2af9a6aa 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,7 +4,7 @@
 import tempfile
 
 from distutils import log
-
+from distutils.core import Distribution
 
 class LoggingSilencer(object):
 
@@ -42,7 +42,7 @@ def mkdtemp(self):
         self.tempdirs.append(d)
         return d
 
-    def write_file(self, path, content):
+    def write_file(self, path, content='xxx'):
         """Writes a file in the given path.
 
 
@@ -56,6 +56,23 @@ def write_file(self, path, content):
         finally:
             f.close()
 
+    def create_dist(self, pkg_name='foo', **kw):
+        """Will generate a test environment.
+
+        This function creates:
+         - a Distribution instance using keywords
+         - a temporary directory with a package structure
+
+        It returns the package directory and the distribution
+        instance.
+        """
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, pkg_name)
+        os.mkdir(pkg_dir)
+        dist = Distribution(attrs=kw)
+
+        return pkg_dir, dist
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
diff --git a/tests/test_clean.py b/tests/test_clean.py
new file mode 100755
index 0000000000..a94a812b1f
--- /dev/null
+++ b/tests/test_clean.py
@@ -0,0 +1,49 @@
+"""Tests for distutils.command.clean."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.clean import clean
+from distutils.tests import support
+
+class cleanTestCase(support.TempdirManager,
+                    unittest.TestCase):
+
+    def test_simple_run(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = clean(dist)
+
+        # let's add some elements clean should remove
+        dirs = [(d, os.path.join(pkg_dir, d))
+                for d in ('build_temp', 'build_lib', 'bdist_base',
+                'build_scripts', 'build_base')]
+
+        for name, path in dirs:
+            os.mkdir(path)
+            setattr(cmd, name, path)
+            if name == 'build_base':
+                continue
+            for f in ('one', 'two', 'three'):
+                self.write_file(os.path.join(path, f))
+
+        # let's run the command
+        cmd.all = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # make sure the files where removed
+        for name, path in dirs:
+            self.assert_(not os.path.exists(path),
+                         '%s was not removed' % path)
+
+        # let's run the command again (should spit warnings but suceed)
+        cmd.all = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+def test_suite():
+    return unittest.makeSuite(cleanTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_config.py b/tests/test_config.py
index 09abfcd8ba..7506f93227 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -46,7 +46,9 @@
 """
 
 
-class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
+class PyPIRCCommandTestCase(support.TempdirManager,
+                            support.LoggingSilencer,
+                            unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
new file mode 100644
index 0000000000..73c40371d6
--- /dev/null
+++ b/tests/test_install_data.py
@@ -0,0 +1,75 @@
+"""Tests for distutils.command.install_data."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.install_data import install_data
+from distutils.tests import support
+
+class InstallDataTestCase(support.TempdirManager,
+                          support.LoggingSilencer,
+                          unittest.TestCase):
+
+    def test_simple_run(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_data(dist)
+        cmd.install_dir = inst = os.path.join(pkg_dir, 'inst')
+
+        # data_files can contain
+        #  - simple files
+        #  - a tuple with a path, and a list of file
+        one = os.path.join(pkg_dir, 'one')
+        self.write_file(one, 'xxx')
+        inst2 = os.path.join(pkg_dir, 'inst2')
+        two = os.path.join(pkg_dir, 'two')
+        self.write_file(two, 'xxx')
+
+        cmd.data_files = [one, (inst2, [two])]
+        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+
+        # let's run the command
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 2)
+        rtwo = os.path.split(two)[-1]
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        rone = os.path.split(one)[-1]
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        cmd.outfiles = []
+
+        # let's try with warn_dir one
+        cmd.warn_dir = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        cmd.outfiles = []
+
+        # now using root and empty dir
+        cmd.root = os.path.join(pkg_dir, 'root')
+        inst3 = os.path.join(cmd.install_dir, 'inst3')
+        inst4 = os.path.join(pkg_dir, 'inst4')
+        three = os.path.join(cmd.install_dir, 'three')
+        self.write_file(three, 'xx')
+        cmd.data_files = [one, (inst2, [two]),
+                          ('inst3', [three]),
+                          (inst4, [])]
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the result
+        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assert_(os.path.exists(os.path.join(inst, rone)))
+
+def test_suite():
+    return unittest.makeSuite(InstallDataTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
new file mode 100644
index 0000000000..2564563faf
--- /dev/null
+++ b/tests/test_install_headers.py
@@ -0,0 +1,39 @@
+"""Tests for distutils.command.install_headers."""
+import sys
+import os
+import unittest
+import getpass
+
+from distutils.command.install_headers import install_headers
+from distutils.tests import support
+
+class InstallHeadersTestCase(support.TempdirManager,
+                             support.LoggingSilencer,
+                             unittest.TestCase):
+
+    def test_simple_run(self):
+        # we have two headers
+        header_list = self.mkdtemp()
+        header1 = os.path.join(header_list, 'header1')
+        header2 = os.path.join(header_list, 'header2')
+        self.write_file(header1)
+        self.write_file(header2)
+        headers = [header1, header2]
+
+        pkg_dir, dist = self.create_dist(headers=headers)
+        cmd = install_headers(dist)
+        self.assertEquals(cmd.get_inputs(), headers)
+
+        # let's run the command
+        cmd.install_dir = os.path.join(pkg_dir, 'inst')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # let's check the results
+        self.assertEquals(len(cmd.get_outputs()), 2)
+
+def test_suite():
+    return unittest.makeSuite(InstallHeadersTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_register.py b/tests/test_register.py
index 8826e90fe0..46f7761d80 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -3,7 +3,9 @@
 import os
 import unittest
 import getpass
+import urllib
 
+from distutils.command import register as register_module
 from distutils.command.register import register
 from distutils.core import Distribution
 
@@ -42,18 +44,20 @@ def __call__(self, prompt=''):
         finally:
             self.index += 1
 
-class FakeServer(object):
+class FakeOpener(object):
     """Fakes a PyPI server"""
     def __init__(self):
-        self.calls = []
+        self.reqs = []
 
     def __call__(self, *args):
-        # we want to compare them, so let's store
-        # something comparable
-        els = list(args[0].items())
-        els.sort()
-        self.calls.append(tuple(els))
-        return 200, 'OK'
+        return self
+
+    def open(self, req):
+        self.reqs.append(req)
+        return self
+
+    def read(self):
+        return 'xxx'
 
 class registerTestCase(PyPIRCCommandTestCase):
 
@@ -64,24 +68,27 @@ def setUp(self):
         def _getpass(prompt):
             return 'password'
         getpass.getpass = _getpass
+        self.old_opener = urllib.request.build_opener
+        self.conn = urllib.request.build_opener = FakeOpener()
 
     def tearDown(self):
         getpass.getpass = self._old_getpass
+        urllib.request.build_opener = self.old_opener
         PyPIRCCommandTestCase.tearDown(self)
 
+    def _get_cmd(self):
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx'}
+        pkg_info, dist = self.create_dist(**metadata)
+        return register(dist)
+
     def test_create_pypirc(self):
         # this test makes sure a .pypirc file
         # is created when requested.
 
-        # let's create a fake distribution
-        # and a register instance
-        dist = Distribution()
-        dist.metadata.url = 'xxx'
-        dist.metadata.author = 'xxx'
-        dist.metadata.author_email = 'xxx'
-        dist.metadata.name = 'xxx'
-        dist.metadata.version =  'xxx'
-        cmd = register(dist)
+        # let's create a register instance
+        cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
         self.assert_(not os.path.exists(self.rc))
@@ -95,13 +102,12 @@ def test_create_pypirc(self):
         # Password : 'password'
         # Save your login (y/N)? : 'y'
         inputs = Inputs('1', 'tarek', 'y')
-        from distutils.command import register as register_module
         register_module.input = inputs.__call__
-
-        cmd.post_to_server = pypi_server = FakeServer()
-
         # let's run the command
-        cmd.run()
+        try:
+            cmd.run()
+        finally:
+            del register_module.input
 
         # we should have a brand new .pypirc file
         self.assert_(os.path.exists(self.rc))
@@ -115,32 +121,68 @@ def test_create_pypirc(self):
         # if we run the command again
         def _no_way(prompt=''):
             raise AssertionError(prompt)
-        register_module.raw_input = _no_way
+        register_module.input = _no_way
 
+        cmd.show_response = 1
         cmd.run()
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assert_(len(pypi_server.calls), 2)
-        self.assert_(pypi_server.calls[0], pypi_server.calls[1])
-
-    def test_password_not_in_file(self):
+        self.assert_(self.conn.reqs, 2)
+        req1 = dict(self.conn.reqs[0].headers)
+        req2 = dict(self.conn.reqs[1].headers)
 
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_NOPASSWORD)
-        f.close()
+        self.assertEquals(req1['Content-length'], '1374')
+        self.assertEquals(req2['Content-length'], '1374')
+        self.assert_((b'xxx') in self.conn.reqs[1].data)
 
-        dist = Distribution()
-        cmd = register(dist)
-        cmd.post_to_server = FakeServer()
+    def test_password_not_in_file(self):
 
+        self.write_file(self.rc, PYPIRC_NOPASSWORD)
+        cmd = self._get_cmd()
         cmd._set_config()
         cmd.finalize_options()
         cmd.send_metadata()
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(dist.password, 'password')
+        self.assertEquals(cmd.distribution.password, 'password')
+
+    def test_registering(self):
+        # this test runs choice 2
+        cmd = self._get_cmd()
+        inputs = Inputs('2', 'tarek', 'tarek@ziade.org')
+        register_module.input = inputs.__call__
+        try:
+            # let's run the command
+            cmd.run()
+        finally:
+            del register_module.input
+
+        # we should have send a request
+        self.assert_(self.conn.reqs, 1)
+        req = self.conn.reqs[0]
+        headers = dict(req.headers)
+        self.assertEquals(headers['Content-length'], '608')
+        self.assert_((b'tarek') in req.data)
+
+    def test_password_reset(self):
+        # this test runs choice 3
+        cmd = self._get_cmd()
+        inputs = Inputs('3', 'tarek@ziade.org')
+        register_module.input = inputs.__call__
+        try:
+            # let's run the command
+            cmd.run()
+        finally:
+            del register_module.input
+
+        # we should have send a request
+        self.assert_(self.conn.reqs, 1)
+        req = self.conn.reqs[0]
+        headers = dict(req.headers)
+        self.assertEquals(headers['Content-length'], '290')
+        self.assert_((b'tarek') in req.data)
 
 def test_suite():
     return unittest.makeSuite(registerTestCase)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 15a8c8087c..8af080f950 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -34,7 +34,7 @@
 somecode%(sep)sdoc.txt
 """
 
-class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
+class sdistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         # PyPIRCCommandTestCase creates a temp dir already
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 3f8ca6d6ad..95e4ac3315 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import http.client as httpclient
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
@@ -18,17 +19,52 @@
 [server1]
 username:me
 """
+class Response(object):
+    def __init__(self, status=200, reason='OK'):
+        self.status = status
+        self.reason = reason
 
+class FakeConnection(object):
+
+    def __init__(self):
+        self.requests = []
+        self.headers = []
+        self.body = ''
+
+    def __call__(self, netloc):
+        return self
+
+    def connect(self):
+        pass
+    endheaders = connect
+
+    def putrequest(self, method, url):
+        self.requests.append((method, url))
+
+    def putheader(self, name, value):
+        self.headers.append((name, value))
+
+    def send(self, body):
+        self.body = body
+
+    def getresponse(self):
+        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
+    def setUp(self):
+        super(uploadTestCase, self).setUp()
+        self.old_class = httpclient.HTTPConnection
+        self.conn = httpclient.HTTPConnection = FakeConnection()
+
+    def tearDown(self):
+        httpclient.HTTPConnection = self.old_class
+        super(uploadTestCase, self).tearDown()
+
     def test_finalize_options(self):
 
         # new format
-        f = open(self.rc, 'w')
-        f.write(PYPIRC)
-        f.close()
-
+        self.write_file(self.rc, PYPIRC)
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
@@ -39,9 +75,7 @@ def test_finalize_options(self):
 
     def test_saved_password(self):
         # file with no password
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_NOPASSWORD)
-        f.close()
+        self.write_file(self.rc, PYPIRC_NOPASSWORD)
 
         # make sure it passes
         dist = Distribution()
@@ -56,6 +90,28 @@ def test_saved_password(self):
         cmd.finalize_options()
         self.assertEquals(cmd.password, 'xxx')
 
+    def test_upload(self):
+        tmp = self.mkdtemp()
+        path = os.path.join(tmp, 'xxx')
+        self.write_file(path)
+        command, pyversion, filename = 'xxx', '2.6', path
+        dist_files = [(command, pyversion, filename)]
+        self.write_file(self.rc, PYPIRC)
+
+        # lets run it
+        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        cmd = upload(dist)
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # what did we send ?
+        headers = dict(self.conn.headers)
+        self.assertEquals(headers['Content-length'], '2087')
+        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+
+        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
+        self.assert_((b'xxx') in self.conn.body)
+
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
 

From d2f43a0e5bd8df91da76da9aa45b34f218914336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:27:23 +0000
Subject: [PATCH 2194/8469] #5583 Added optional Extensions in Distutils

---
 command/build_ext.py    |  8 +++++++-
 extension.py            |  5 +++++
 tests/test_build_ext.py | 22 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 125fa7f52d..905fa1ff7d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -476,7 +476,13 @@ def build_extensions(self):
         self.check_extensions_list(self.extensions)
 
         for ext in self.extensions:
-            self.build_extension(ext)
+            try:
+                self.build_extension(ext)
+            except (CCompilerError, DistutilsError), e:
+                if not ext.optional:
+                    raise
+                self.warn('building extension "%s" failed: %s' %
+                          (ext.name, e))
 
     def build_extension(self, ext):
         sources = ext.sources
diff --git a/extension.py b/extension.py
index 440d128cdc..c80c61e35b 100644
--- a/extension.py
+++ b/extension.py
@@ -83,6 +83,9 @@ class Extension:
       language : string
         extension language (i.e. "c", "c++", "objc"). Will be detected
         from the source extensions if not provided.
+      optional : boolean
+        specifies that a build failure in the extension should not abort the
+        build process, but simply not install the failing extension.
     """
 
     # When adding arguments to this constructor, be sure to update
@@ -101,6 +104,7 @@ def __init__ (self, name, sources,
                   swig_opts = None,
                   depends=None,
                   language=None,
+                  optional=None,
                   **kw                      # To catch unknown keywords
                  ):
         assert type(name) is StringType, "'name' must be a string"
@@ -123,6 +127,7 @@ def __init__ (self, name, sources,
         self.swig_opts = swig_opts or []
         self.depends = depends or []
         self.language = language
+        self.optional = optional
 
         # If there are unknown keyword options, warn about them
         if len(kw):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index ff60c12b1a..a27696d8cb 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -8,6 +8,8 @@
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests import support
+from distutils.extension import Extension
+from distutils.errors import UnknownFileError
 
 import unittest
 from test import test_support
@@ -20,7 +22,9 @@ def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-class BuildExtTestCase(support.TempdirManager, unittest.TestCase):
+class BuildExtTestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
@@ -142,6 +146,22 @@ def test_user_site(self):
         self.assert_(lib in cmd.library_dirs)
         self.assert_(incl in cmd.include_dirs)
 
+    def test_optional_extension(self):
+
+        # this extension will fail, but let's ignore this failure
+        # with the optional argument.
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertRaises(UnknownFileError, cmd.run)  # should raise an error
+
+        modules = [Extension('foo', ['xxx'], optional=True)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        cmd.run()  # should pass
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 0aee51d142b182b216825edf7272e0d913064b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:37:55 +0000
Subject: [PATCH 2195/8469] Merged revisions 70910 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70910 | tarek.ziade | 2009-03-31 17:27:23 -0500 (Tue, 31 Mar 2009) | 1 line

  #5583 Added optional Extensions in Distutils
........
---
 command/build_ext.py    |  8 +++++++-
 extension.py            |  5 +++++
 tests/test_build_ext.py | 23 ++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1ed69f33c0..229590664c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -455,7 +455,13 @@ def build_extensions(self):
         self.check_extensions_list(self.extensions)
 
         for ext in self.extensions:
-            self.build_extension(ext)
+            try:
+                self.build_extension(ext)
+            except (CCompilerError, DistutilsError) as e:
+                if not ext.optional:
+                    raise
+                self.warn('building extension "%s" failed: %s' %
+                          (ext.name, e))
 
     def build_extension(self, ext):
         sources = ext.sources
diff --git a/extension.py b/extension.py
index b271816844..f7e7b4edc9 100644
--- a/extension.py
+++ b/extension.py
@@ -82,6 +82,9 @@ class Extension:
       language : string
         extension language (i.e. "c", "c++", "objc"). Will be detected
         from the source extensions if not provided.
+      optional : boolean
+        specifies that a build failure in the extension should not abort the
+        build process, but simply not install the failing extension.
     """
 
     # When adding arguments to this constructor, be sure to update
@@ -100,6 +103,7 @@ def __init__(self, name, sources,
                   swig_opts = None,
                   depends=None,
                   language=None,
+                  optional=None,
                   **kw                      # To catch unknown keywords
                  ):
         assert isinstance(name, str), "'name' must be a string"
@@ -122,6 +126,7 @@ def __init__(self, name, sources,
         self.swig_opts = swig_opts or []
         self.depends = depends or []
         self.language = language
+        self.optional = optional
 
         # If there are unknown keyword options, warn about them
         if len(kw):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 2e47953ee3..094f4b6644 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -8,6 +8,9 @@
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests.support import TempdirManager
+from distutils.tests.support import LoggingSilencer
+from distutils.extension import Extension
+from distutils.errors import UnknownFileError
 
 import unittest
 from test import support
@@ -20,7 +23,9 @@ def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-class BuildExtTestCase(TempdirManager, unittest.TestCase):
+class BuildExtTestCase(TempdirManager,
+                       LoggingSilencer,
+                       unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
@@ -141,6 +146,22 @@ def test_user_site(self):
         self.assert_(lib in cmd.library_dirs)
         self.assert_(incl in cmd.include_dirs)
 
+    def test_optional_extension(self):
+
+        # this extension will fail, but let's ignore this failure
+        # with the optional argument.
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertRaises(UnknownFileError, cmd.run)  # should raise an error
+
+        modules = [Extension('foo', ['xxx'], optional=True)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        cmd.run()  # should pass
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 0396d17ef15568fc9260ec230ee523cf8649014b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:44:10 +0000
Subject: [PATCH 2196/8469] catching msvc9compiler error as well

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 905fa1ff7d..2c6df1d2cd 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -478,7 +478,7 @@ def build_extensions(self):
         for ext in self.extensions:
             try:
                 self.build_extension(ext)
-            except (CCompilerError, DistutilsError), e:
+            except (CCompilerError, DistutilsError, CompileError), e:
                 if not ext.optional:
                     raise
                 self.warn('building extension "%s" failed: %s' %

From 8d3a9ec909afa64b86fc44749e9e8e70960b5eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:47:01 +0000
Subject: [PATCH 2197/8469] fixed the test for win32 CompileError

---
 tests/test_build_ext.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a27696d8cb..9097bee2e4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -10,6 +10,7 @@
 from distutils.tests import support
 from distutils.extension import Extension
 from distutils.errors import UnknownFileError
+from distutils.errors import CompileError
 
 import unittest
 from test import test_support
@@ -154,7 +155,8 @@ def test_optional_extension(self):
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertRaises(UnknownFileError, cmd.run)  # should raise an error
+        self.assertRaises((UnknownFileError, CompileError),
+                          cmd.run)  # should raise an error
 
         modules = [Extension('foo', ['xxx'], optional=True)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})

From e7ed75cadeb3cc8d852182dbb771c3894921c88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:50:54 +0000
Subject: [PATCH 2198/8469] Merged revisions 70920,70922 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70920 | tarek.ziade | 2009-03-31 17:44:10 -0500 (Tue, 31 Mar 2009) | 1 line

  catching msvc9compiler error as well
........
  r70922 | tarek.ziade | 2009-03-31 17:47:01 -0500 (Tue, 31 Mar 2009) | 1 line

  fixed the test for win32 CompileError
........
---
 command/build_ext.py    | 2 +-
 tests/test_build_ext.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 229590664c..ade95be229 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -457,7 +457,7 @@ def build_extensions(self):
         for ext in self.extensions:
             try:
                 self.build_extension(ext)
-            except (CCompilerError, DistutilsError) as e:
+            except (CCompilerError, DistutilsError, CompileError) as e:
                 if not ext.optional:
                     raise
                 self.warn('building extension "%s" failed: %s' %
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 094f4b6644..5ea67bedb7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -11,6 +11,7 @@
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
 from distutils.errors import UnknownFileError
+from distutils.errors import CompileError
 
 import unittest
 from test import support
@@ -154,7 +155,8 @@ def test_optional_extension(self):
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertRaises(UnknownFileError, cmd.run)  # should raise an error
+        self.assertRaises((UnknownFileError, CompileError),
+                          cmd.run)  # should raise an error
 
         modules = [Extension('foo', ['xxx'], optional=True)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})

From 0c34a6afb92b1530da9c19f1b96b2371aa6ff606 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 1 Apr 2009 04:28:33 +0000
Subject: [PATCH 2199/8469] #5624: _winreg is winreg in Python 3.

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

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index aefadd6dc3..11e5a47630 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -48,8 +48,8 @@ def test_reg_class(self):
         v = Reg.get_value(path, "lfitalic")
         self.assert_(v in (0, 1))
 
-        import _winreg
-        HKCU = _winreg.HKEY_CURRENT_USER
+        import winreg
+        HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
         self.assertEquals(keys, None)
 

From 865250689f39b67167b128293e9fb3ef3d0aad3e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 1 Apr 2009 04:32:39 +0000
Subject: [PATCH 2200/8469] #5631: add upload to list of possible commands,
 which is presented in --help-commands.

---
 command/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/__init__.py b/command/__init__.py
index add83f8740..274cb010b8 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -22,6 +22,8 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
+           'upload',
+
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',

From 1b3f5a086d20cde5ddb2e399336974aac4291c8d Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Apr 2009 21:06:52 +0000
Subject: [PATCH 2201/8469] bump version to 3.1a2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 12a430ecdd..c66806361a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1a1"
+__version__ = "3.1a2"
 #--end constants--

From 528d035a1887b9cd0488a3e53b138b58a48842aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 18:31:24 +0000
Subject: [PATCH 2202/8469] Fixed 5694: removed spurious test output in
 Distutils

---
 tests/test_clean.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_clean.py b/tests/test_clean.py
index a94a812b1f..3026032712 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -8,6 +8,7 @@
 from distutils.tests import support
 
 class cleanTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
                     unittest.TestCase):
 
     def test_simple_run(self):

From 9b5d00d842645f4226911f1f835a5bb90557e8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 18:33:34 +0000
Subject: [PATCH 2203/8469] Merged revisions 71253 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71253 | tarek.ziade | 2009-04-05 20:31:24 +0200 (Sun, 05 Apr 2009) | 1 line

  Fixed 5694: removed spurious test output in Distutils
........
---
 tests/test_clean.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_clean.py b/tests/test_clean.py
index a94a812b1f..3026032712 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -8,6 +8,7 @@
 from distutils.tests import support
 
 class cleanTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
                     unittest.TestCase):
 
     def test_simple_run(self):

From 7a3178f5a9438241874c2cbee10b89c43831e2d8 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Apr 2009 19:13:16 +0000
Subject: [PATCH 2204/8469] Merged revisions
 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70712 | benjamin.peterson | 2009-03-30 10:15:38 -0500 (Mon, 30 Mar 2009) | 1 line

  don't rely on the order dict repr #5605
........
  r70714 | brett.cannon | 2009-03-30 10:20:53 -0500 (Mon, 30 Mar 2009) | 1 line

  Add an entry to developers.txt.
........
  r70764 | martin.v.loewis | 2009-03-30 17:06:33 -0500 (Mon, 30 Mar 2009) | 2 lines

  Add several VM developers.
........
  r70765 | georg.brandl | 2009-03-30 17:09:34 -0500 (Mon, 30 Mar 2009) | 1 line

  #5199: make warning about vars() assignment more visible.
........
  r70769 | andrew.kuchling | 2009-03-30 17:29:53 -0500 (Mon, 30 Mar 2009) | 1 line

  Remove comment
........
  r70770 | andrew.kuchling | 2009-03-30 17:30:20 -0500 (Mon, 30 Mar 2009) | 1 line

  Add several items and placeholders
........
  r70771 | andrew.kuchling | 2009-03-30 17:31:11 -0500 (Mon, 30 Mar 2009) | 1 line

  Many edits
........
  r70773 | georg.brandl | 2009-03-30 17:43:00 -0500 (Mon, 30 Mar 2009) | 1 line

  #5039: make it clear that the impl. note refers to CPython.
........
  r70776 | andrew.kuchling | 2009-03-30 18:08:24 -0500 (Mon, 30 Mar 2009) | 1 line

  typo fix
........
  r70777 | andrew.kuchling | 2009-03-30 18:09:46 -0500 (Mon, 30 Mar 2009) | 1 line

  Add more items
........
  r70788 | andrew.kuchling | 2009-03-30 20:21:01 -0500 (Mon, 30 Mar 2009) | 1 line

  Add various items
........
  r70789 | georg.brandl | 2009-03-30 20:25:15 -0500 (Mon, 30 Mar 2009) | 1 line

  Fix a wrong struct field assignment (docstring as closure).
........
  r70824 | georg.brandl | 2009-03-31 10:43:20 -0500 (Tue, 31 Mar 2009) | 1 line

  #5519: remove reference to Kodos, which seems dead.
........
  r70828 | georg.brandl | 2009-03-31 10:50:16 -0500 (Tue, 31 Mar 2009) | 1 line

  #5581: fget argument of abstractproperty is optional as well.
........
  r70832 | georg.brandl | 2009-03-31 11:31:11 -0500 (Tue, 31 Mar 2009) | 1 line

  #1386675: specify WindowsError as the exception, because it has a winerror attribute that EnvironmentError doesnt have.
........
  r70836 | georg.brandl | 2009-03-31 11:50:25 -0500 (Tue, 31 Mar 2009) | 1 line

  #5417: replace references to undocumented functions by ones to documented functions.
........
  r70842 | georg.brandl | 2009-03-31 12:13:06 -0500 (Tue, 31 Mar 2009) | 1 line

  #970783: document PyObject_Generic[GS]etAttr.
........
  r70851 | georg.brandl | 2009-03-31 13:26:55 -0500 (Tue, 31 Mar 2009) | 1 line

  #837577: note cryptic return value of spawn*e on invalid env dicts.
........
  r70855 | georg.brandl | 2009-03-31 13:30:37 -0500 (Tue, 31 Mar 2009) | 1 line

  #5245: note that PyRun_SimpleString doesnt return on SystemExit.
........
  r70857 | georg.brandl | 2009-03-31 13:33:10 -0500 (Tue, 31 Mar 2009) | 1 line

  #5227: note that Py_Main doesnt return on SystemExit.
........
  r70866 | georg.brandl | 2009-03-31 14:06:57 -0500 (Tue, 31 Mar 2009) | 1 line

  #4882: document named group behavior a bit better.
........
  r70867 | georg.brandl | 2009-03-31 14:10:35 -0500 (Tue, 31 Mar 2009) | 1 line

  #1096310: document usage of sys.__std*__ a bit better.
........
  r70868 | georg.brandl | 2009-03-31 14:12:17 -0500 (Tue, 31 Mar 2009) | 1 line

  #5190: export make_option in __all__.
........
  r70869 | georg.brandl | 2009-03-31 14:14:42 -0500 (Tue, 31 Mar 2009) | 1 line

  Fix-up unwanted change.
........
  r70870 | georg.brandl | 2009-03-31 14:26:24 -0500 (Tue, 31 Mar 2009) | 1 line

  #4411: document mro() and __mro__. (I hope I got it right.)
........
  r70871 | georg.brandl | 2009-03-31 14:30:56 -0500 (Tue, 31 Mar 2009) | 1 line

  #5618: fix typo.
........
  r70872 | r.david.murray | 2009-03-31 14:31:17 -0500 (Tue, 31 Mar 2009) | 3 lines

  Delete out-of-date and little-known README from the test
  directory by consensus of devs at pycon sprint.
........
  r70883 | georg.brandl | 2009-03-31 15:41:08 -0500 (Tue, 31 Mar 2009) | 1 line

  #1674032: return value of flag from Event.wait(). OKed by Guido.
........
  r70885 | tarek.ziade | 2009-03-31 15:48:31 -0500 (Tue, 31 Mar 2009) | 1 line

  using log.warn for sys.stderr
........
  r70893 | georg.brandl | 2009-03-31 15:56:32 -0500 (Tue, 31 Mar 2009) | 1 line

  #1530012: move TQS section before raw strings.
........
  r70894 | benjamin.peterson | 2009-03-31 16:06:30 -0500 (Tue, 31 Mar 2009) | 1 line

  take the usual lock precautions around _active_limbo_lock
........
  r70896 | georg.brandl | 2009-03-31 16:15:33 -0500 (Tue, 31 Mar 2009) | 1 line

  #5598: document DocFileSuite *args argument.
........
  r70897 | benjamin.peterson | 2009-03-31 16:34:42 -0500 (Tue, 31 Mar 2009) | 1 line

  fix Thread.ident when it is the main thread or a dummy thread #5632
........
  r70903 | georg.brandl | 2009-03-31 16:45:18 -0500 (Tue, 31 Mar 2009) | 1 line

  #1676135: remove trailing slashes from --prefix argument.
........
  r70905 | georg.brandl | 2009-03-31 17:03:40 -0500 (Tue, 31 Mar 2009) | 1 line

  #5563: more documentation for bdist_msi.
........
  r70906 | georg.brandl | 2009-03-31 17:11:53 -0500 (Tue, 31 Mar 2009) | 1 line

  #1651995: fix _convert_ref for non-ASCII characters.
........
  r70907 | georg.brandl | 2009-03-31 17:18:19 -0500 (Tue, 31 Mar 2009) | 1 line

  #3427: document correct return type for urlopen().info().
........
  r70915 | georg.brandl | 2009-03-31 17:40:16 -0500 (Tue, 31 Mar 2009) | 1 line

  #5018: remove confusing paragraph.
........
  r70927 | georg.brandl | 2009-03-31 18:01:27 -0500 (Tue, 31 Mar 2009) | 1 line

  Dont shout to users.
........
  r70933 | georg.brandl | 2009-03-31 19:04:33 -0500 (Tue, 31 Mar 2009) | 2 lines

  Issue #5635: Fix running test_sys with tracing enabled.
........
  r70951 | georg.brandl | 2009-04-01 09:02:27 -0500 (Wed, 01 Apr 2009) | 1 line

  Add Maksim, who worked on several issues at the sprint.
........
  r70960 | jesse.noller | 2009-04-01 11:42:19 -0500 (Wed, 01 Apr 2009) | 1 line

  Issue 3270: document Listener address restrictions on windows
........
  r70962 | brett.cannon | 2009-04-01 12:07:16 -0500 (Wed, 01 Apr 2009) | 2 lines

  Ron DuPlain was given commit privileges at PyCon 2009 to work on 3to2.
........
  r70963 | georg.brandl | 2009-04-01 12:46:01 -0500 (Wed, 01 Apr 2009) | 1 line

  #5655: fix docstring oversight.
........
  r70964 | brett.cannon | 2009-04-01 12:52:13 -0500 (Wed, 01 Apr 2009) | 2 lines

  Paul Kippes was given commit privileges to work on 3to2.
........
  r70998 | georg.brandl | 2009-04-01 16:54:21 -0500 (Wed, 01 Apr 2009) | 1 line

  In Pdb, stop assigning values to __builtin__._ which interferes with the one commonly installed by gettext.
........
  r71001 | brett.cannon | 2009-04-01 18:01:12 -0500 (Wed, 01 Apr 2009) | 3 lines

  Add my initials to Misc/developers.txt. Names are now sorted by number of
  characters in the person's name.
........
  r71006 | georg.brandl | 2009-04-01 18:32:17 -0500 (Wed, 01 Apr 2009) | 1 line

  Cache the f_locals dict of the current frame, since every access to frame.f_locals overrides its contents with the real locals which undoes modifications made by the debugging user.
........
  r71008 | andrew.kuchling | 2009-04-01 19:02:14 -0500 (Wed, 01 Apr 2009) | 1 line

  Typo fix
........
  r71010 | benjamin.peterson | 2009-04-01 19:11:52 -0500 (Wed, 01 Apr 2009) | 1 line

  fix markup
........
  r71011 | benjamin.peterson | 2009-04-01 19:12:47 -0500 (Wed, 01 Apr 2009) | 1 line

  this should be :noindex:
........
  r71019 | georg.brandl | 2009-04-01 21:00:01 -0500 (Wed, 01 Apr 2009) | 1 line

  Fix test_doctest, missed two assignments to curframe.
........
  r71037 | r.david.murray | 2009-04-01 23:34:04 -0500 (Wed, 01 Apr 2009) | 6 lines

  Clarify that datetime strftime does not produce leap seconds and datetime
  strptime does not accept it in the strftime behavior section of the
  datetime docs.

  Closes issue 2568.
........
  r71056 | georg.brandl | 2009-04-02 12:43:07 -0500 (Thu, 02 Apr 2009) | 2 lines

  Actually the displayhook should print the repr.
........
  r71094 | vinay.sajip | 2009-04-03 05:23:18 -0500 (Fri, 03 Apr 2009) | 1 line

  Added warning about logging use from asynchronous signal handlers.
........
  r71101 | andrew.kuchling | 2009-04-03 16:43:00 -0500 (Fri, 03 Apr 2009) | 1 line

  Add some items
........
  r71102 | andrew.kuchling | 2009-04-03 16:44:49 -0500 (Fri, 03 Apr 2009) | 1 line

  Fix 'the the'; grammar fix
........
  r71103 | andrew.kuchling | 2009-04-03 16:45:29 -0500 (Fri, 03 Apr 2009) | 1 line

  Fix 'the the' duplication
........
  r71106 | vinay.sajip | 2009-04-03 16:58:16 -0500 (Fri, 03 Apr 2009) | 1 line

  Clarified warning about logging use from asynchronous signal handlers.
........
  r71119 | raymond.hettinger | 2009-04-04 00:37:47 -0500 (Sat, 04 Apr 2009) | 1 line

  Add helpful link.
........
  r71123 | r.david.murray | 2009-04-04 01:39:56 -0500 (Sat, 04 Apr 2009) | 2 lines

  Fix error in description of 'oct' (issue 5678).
........
  r71149 | georg.brandl | 2009-04-04 08:42:39 -0500 (Sat, 04 Apr 2009) | 1 line

  #5642: clarify map() compatibility to the builtin.
........
  r71150 | georg.brandl | 2009-04-04 08:45:49 -0500 (Sat, 04 Apr 2009) | 1 line

  #5601: clarify that webbrowser is not meant for file names.
........
  r71203 | benjamin.peterson | 2009-04-04 18:46:34 -0500 (Sat, 04 Apr 2009) | 1 line

  note how using iter* are unsafe while mutating and document iter(dict)
........
  r71212 | georg.brandl | 2009-04-05 05:24:20 -0500 (Sun, 05 Apr 2009) | 1 line

  #1742837: expand HTTP server docs, and fix SocketServer ones to document methods as methods, not functions.
........
  r71214 | georg.brandl | 2009-04-05 05:29:57 -0500 (Sun, 05 Apr 2009) | 1 line

  Normalize spelling of Mac OS X.
........
  r71215 | georg.brandl | 2009-04-05 05:32:26 -0500 (Sun, 05 Apr 2009) | 1 line

  Avoid sure signs of a diseased mind.
........
  r71216 | georg.brandl | 2009-04-05 05:41:02 -0500 (Sun, 05 Apr 2009) | 1 line

  #1718017: document the relation of os.path and the posixpath, ntpath etc. modules better.
........
  r71217 | georg.brandl | 2009-04-05 05:48:47 -0500 (Sun, 05 Apr 2009) | 1 line

  #1726172: dont raise an unexpected IndexError if a voidresp() call has an empty response.
........
  r71221 | vinay.sajip | 2009-04-05 06:06:24 -0500 (Sun, 05 Apr 2009) | 1 line

  Issue #5695: Moved logging.captureWarnings() call inside with statement in WarningsTest.test_warnings.
........
  r71240 | georg.brandl | 2009-04-05 09:40:06 -0500 (Sun, 05 Apr 2009) | 1 line

  #5370: doc update about unpickling objects with custom __getattr__ etc. methods.
........
---
 cmd.py |  3 ++-
 log.py | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd.py b/cmd.py
index 46055b4b2c..5829a56639 100644
--- a/cmd.py
+++ b/cmd.py
@@ -333,7 +333,8 @@ def get_sub_commands(self):
     # -- External world manipulation -----------------------------------
 
     def warn(self, msg):
-        log.warn("warning: %s: %s\n" % (self.get_command_name(), msg))
+        log.warn("warning: %s: %s\n" %
+                (self.get_command_name(), msg))
 
     def execute(self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
diff --git a/log.py b/log.py
index 97319a07aa..6f949d5179 100644
--- a/log.py
+++ b/log.py
@@ -18,13 +18,14 @@ def __init__(self, threshold=WARN):
 
     def _log(self, level, msg, args):
         if level >= self.threshold:
-            if not args:
-                # msg may contain a '%'. If args is empty,
-                # don't even try to string-format
-                print(msg)
+            if args:
+                msg = msg % args
+            if level in (WARN, ERROR, FATAL):
+                stream = sys.stderr
             else:
-                print(msg % args)
-            sys.stdout.flush()
+                stream = sys.stdout
+            stream.write('%s\n' % msg)
+            stream.flush()
 
     def log(self, level, msg, *args):
         self._log(level, msg, args)

From ba7be325ab789b28c9670887397c6924d42a8cf9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 5 Apr 2009 21:11:43 +0000
Subject: [PATCH 2205/8469] Merged revisions
 70642,70648,70656,70661,70765,70773,70789,70824-70825,70828,70830,70832,70836,70838,70842,70851,70855,70857-70858
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r70642 | georg.brandl | 2009-03-28 01:48:48 +0100 (Sa, 28 Mär 2009) | 1 line

  Fix typo.
........
  r70648 | georg.brandl | 2009-03-28 20:10:37 +0100 (Sa, 28 Mär 2009) | 1 line

  #5324: document __subclasses__().
........
  r70656 | georg.brandl | 2009-03-28 20:33:33 +0100 (Sa, 28 Mär 2009) | 2 lines

  Add a script to fixup rst files if the pre-commit hook rejects them.
........
  r70661 | georg.brandl | 2009-03-28 20:57:36 +0100 (Sa, 28 Mär 2009) | 2 lines

  Add section numbering to some of the larger subdocuments.
........
  r70765 | georg.brandl | 2009-03-31 00:09:34 +0200 (Di, 31 Mär 2009) | 1 line

  #5199: make warning about vars() assignment more visible.
........
  r70773 | georg.brandl | 2009-03-31 00:43:00 +0200 (Di, 31 Mär 2009) | 1 line

  #5039: make it clear that the impl. note refers to CPython.
........
  r70789 | georg.brandl | 2009-03-31 03:25:15 +0200 (Di, 31 Mär 2009) | 1 line

  Fix a wrong struct field assignment (docstring as closure).
........
  r70824 | georg.brandl | 2009-03-31 17:43:20 +0200 (Di, 31 Mär 2009) | 1 line

  #5519: remove reference to Kodos, which seems dead.
........
  r70825 | georg.brandl | 2009-03-31 17:46:30 +0200 (Di, 31 Mär 2009) | 1 line

  #5566: fix versionadded from PyLong ssize_t functions.
........
  r70828 | georg.brandl | 2009-03-31 17:50:16 +0200 (Di, 31 Mär 2009) | 1 line

  #5581: fget argument of abstractproperty is optional as well.
........
  r70830 | georg.brandl | 2009-03-31 18:11:45 +0200 (Di, 31 Mär 2009) | 1 line

  #5529: backport new docs of import semantics written by Brett to 2.x.
........
  r70832 | georg.brandl | 2009-03-31 18:31:11 +0200 (Di, 31 Mär 2009) | 1 line

  #1386675: specify WindowsError as the exception, because it has a winerror attribute that EnvironmentError doesnt have.
........
  r70836 | georg.brandl | 2009-03-31 18:50:25 +0200 (Di, 31 Mär 2009) | 1 line

  #5417: replace references to undocumented functions by ones to documented functions.
........
  r70838 | georg.brandl | 2009-03-31 18:54:38 +0200 (Di, 31 Mär 2009) | 1 line

  #992207: document that the parser only accepts \\n newlines.
........
  r70842 | georg.brandl | 2009-03-31 19:13:06 +0200 (Di, 31 Mär 2009) | 1 line

  #970783: document PyObject_Generic[GS]etAttr.
........
  r70851 | georg.brandl | 2009-03-31 20:26:55 +0200 (Di, 31 Mär 2009) | 1 line

  #837577: note cryptic return value of spawn*e on invalid env dicts.
........
  r70855 | georg.brandl | 2009-03-31 20:30:37 +0200 (Di, 31 Mär 2009) | 1 line

  #5245: note that PyRun_SimpleString doesnt return on SystemExit.
........
  r70857 | georg.brandl | 2009-03-31 20:33:10 +0200 (Di, 31 Mär 2009) | 1 line

  #5227: note that Py_Main doesnt return on SystemExit.
........
  r70858 | georg.brandl | 2009-03-31 20:38:56 +0200 (Di, 31 Mär 2009) | 1 line

  #5241: document missing U in regex howto.
........
---
 version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.py b/version.py
index 71a5614719..0fb5b6e204 100644
--- a/version.py
+++ b/version.py
@@ -162,7 +162,7 @@ def __cmp__ (self, other):
 
 
 # The rules according to Greg Stein:
-# 1) a version number has 1 or more numbers separate by a period or by
+# 1) a version number has 1 or more numbers separated by a period or by
 #    sequences of letters. If only periods, then these are compared
 #    left-to-right to determine an ordering.
 # 2) sequences of letters are part of the tuple for comparison and are

From 443bc8fdb3ffe7aded9326275131e10a7bc6286b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 5 Apr 2009 21:21:05 +0000
Subject: [PATCH 2206/8469] Merged revisions
 70866-70868,70870-70871,70893,70896,70902,70905,70907,70912,70915,70927,70933,70940,70944,70954,70963,70998,71056
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r70866 | georg.brandl | 2009-03-31 21:06:57 +0200 (Di, 31 Mär 2009) | 1 line

  #4882: document named group behavior a bit better.
........
  r70867 | georg.brandl | 2009-03-31 21:10:35 +0200 (Di, 31 Mär 2009) | 1 line

  #1096310: document usage of sys.__std*__ a bit better.
........
  r70868 | georg.brandl | 2009-03-31 21:12:17 +0200 (Di, 31 Mär 2009) | 1 line

  #5190: export make_option in __all__.
........
  r70870 | georg.brandl | 2009-03-31 21:26:24 +0200 (Di, 31 Mär 2009) | 1 line

  #4411: document mro() and __mro__. (I hope I got it right.)
........
  r70871 | georg.brandl | 2009-03-31 21:30:56 +0200 (Di, 31 Mär 2009) | 1 line

  #5618: fix typo.
........
  r70893 | georg.brandl | 2009-03-31 22:56:32 +0200 (Di, 31 Mär 2009) | 1 line

  #1530012: move TQS section before raw strings.
........
  r70896 | georg.brandl | 2009-03-31 23:15:33 +0200 (Di, 31 Mär 2009) | 1 line

  #5598: document DocFileSuite *args argument.
........
  r70902 | georg.brandl | 2009-03-31 23:43:03 +0200 (Di, 31 Mär 2009) | 1 line

  #1675026: add a note about a strange Windows problem, and remove notes about AtheOS.
........
  r70905 | georg.brandl | 2009-04-01 00:03:40 +0200 (Mi, 01 Apr 2009) | 1 line

  #5563: more documentation for bdist_msi.
........
  r70907 | georg.brandl | 2009-04-01 00:18:19 +0200 (Mi, 01 Apr 2009) | 1 line

  #3427: document correct return type for urlopen().info().
........
  r70912 | georg.brandl | 2009-04-01 00:35:46 +0200 (Mi, 01 Apr 2009) | 1 line

  #5617: add a handy function to print a unicode string to gdbinit.
........
  r70915 | georg.brandl | 2009-04-01 00:40:16 +0200 (Mi, 01 Apr 2009) | 1 line

  #5018: remove confusing paragraph.
........
  r70927 | georg.brandl | 2009-04-01 01:01:27 +0200 (Mi, 01 Apr 2009) | 1 line

  Dont shout to users.
........
  r70933 | georg.brandl | 2009-04-01 02:04:33 +0200 (Mi, 01 Apr 2009) | 2 lines

  Issue #5635: Fix running test_sys with tracing enabled.
........
  r70940 | georg.brandl | 2009-04-01 06:21:14 +0200 (Mi, 01 Apr 2009) | 2 lines

  The SimpleXMLRPCServer's CGI handler now runs like a pony.
........
  r70944 | georg.brandl | 2009-04-01 06:32:39 +0200 (Mi, 01 Apr 2009) | 1 line

  #5631: add upload to list of possible commands, which is presented in --help-commands.
........
  r70954 | georg.brandl | 2009-04-01 17:23:43 +0200 (Mi, 01 Apr 2009) | 1 line

  Fix test_xmlrpc and make the CGI handler work with no CONTENT_LENGTH.
........
  r70963 | georg.brandl | 2009-04-01 19:46:01 +0200 (Mi, 01 Apr 2009) | 1 line

  #5655: fix docstring oversight.
........
  r70998 | georg.brandl | 2009-04-01 23:54:21 +0200 (Mi, 01 Apr 2009) | 1 line

  In Pdb, stop assigning values to __builtin__._ which interferes with the one commonly installed by gettext.
........
  r71056 | georg.brandl | 2009-04-02 19:43:07 +0200 (Do, 02 Apr 2009) | 2 lines

  Actually the displayhook should print the repr.
........
---
 command/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/__init__.py b/command/__init__.py
index 0888c2712b..05c758a2aa 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -24,6 +24,8 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
+           'upload',
+
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',

From a8e0178ca10ed3610546d48949baef25dde94222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 21:44:08 +0000
Subject: [PATCH 2207/8469] Fixed #1491431: distutils.filelist.glob_to_re was
 broken for some edge cases (detailed in the test

---
 filelist.py            |  5 +++--
 tests/test_filelist.py | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_filelist.py

diff --git a/filelist.py b/filelist.py
index 51a1d57e13..3ba5720ca9 100644
--- a/filelist.py
+++ b/filelist.py
@@ -302,7 +302,7 @@ def findall (dir = os.curdir):
     return list
 
 
-def glob_to_re (pattern):
+def glob_to_re(pattern):
     """Translate a shell-like glob pattern to a regular expression; return
     a string containing the regex.  Differs from 'fnmatch.translate()' in
     that '*' does not match "special characters" (which are
@@ -317,7 +317,8 @@ def glob_to_re (pattern):
     # character except the special characters.
     # XXX currently the "special characters" are just slash -- i.e. this is
     # Unix-only.
-    pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
+
     return pattern_re
 
 # glob_to_re ()
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
new file mode 100644
index 0000000000..86db557441
--- /dev/null
+++ b/tests/test_filelist.py
@@ -0,0 +1,23 @@
+"""Tests for distutils.filelist."""
+import unittest
+from distutils.filelist import glob_to_re
+
+class FileListTestCase(unittest.TestCase):
+
+    def test_glob_to_re(self):
+        # simple cases
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+
+        # special cases
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+
+def test_suite():
+    return unittest.makeSuite(FileListTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 337d9c1951a53cddb94c9ffc4a8e54d97fae649c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 21:47:02 +0000
Subject: [PATCH 2208/8469] Merged revisions 71280 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71280 | tarek.ziade | 2009-04-05 23:44:08 +0200 (Sun, 05 Apr 2009) | 1 line

  Fixed #1491431: distutils.filelist.glob_to_re was broken for some edge cases (detailed in the test
........
---
 filelist.py            |  5 +++--
 tests/test_filelist.py | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_filelist.py

diff --git a/filelist.py b/filelist.py
index 6d27cce64f..3ce5635047 100644
--- a/filelist.py
+++ b/filelist.py
@@ -304,7 +304,7 @@ def findall (dir = os.curdir):
     return list
 
 
-def glob_to_re (pattern):
+def glob_to_re(pattern):
     """Translate a shell-like glob pattern to a regular expression; return
     a string containing the regex.  Differs from 'fnmatch.translate()' in
     that '*' does not match "special characters" (which are
@@ -319,7 +319,8 @@ def glob_to_re (pattern):
     # character except the special characters.
     # XXX currently the "special characters" are just slash -- i.e. this is
     # Unix-only.
-    pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
+
     return pattern_re
 
 # glob_to_re ()
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
new file mode 100644
index 0000000000..86db557441
--- /dev/null
+++ b/tests/test_filelist.py
@@ -0,0 +1,23 @@
+"""Tests for distutils.filelist."""
+import unittest
+from distutils.filelist import glob_to_re
+
+class FileListTestCase(unittest.TestCase):
+
+    def test_glob_to_re(self):
+        # simple cases
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+
+        # special cases
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+
+def test_suite():
+    return unittest.makeSuite(FileListTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From aacf5ee80df9ec6f22ca5ff4ec403dd7d5abe8a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 21:49:36 +0000
Subject: [PATCH 2209/8469] Merged revisions 71280 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71280 | tarek.ziade | 2009-04-05 23:44:08 +0200 (Sun, 05 Apr 2009) | 1 line

  Fixed #1491431: distutils.filelist.glob_to_re was broken for some edge cases (detailed in the test
........
---
 filelist.py            |  3 ++-
 tests/test_filelist.py | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_filelist.py

diff --git a/filelist.py b/filelist.py
index a80c71e8c7..58a2bfb108 100644
--- a/filelist.py
+++ b/filelist.py
@@ -289,7 +289,8 @@ def glob_to_re(pattern):
     # character except the special characters.
     # XXX currently the "special characters" are just slash -- i.e. this is
     # Unix-only.
-    pattern_re = re.sub(r'(^|[^\\])\.', r'\1[^/]', pattern_re)
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
+
     return pattern_re
 
 
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
new file mode 100644
index 0000000000..86db557441
--- /dev/null
+++ b/tests/test_filelist.py
@@ -0,0 +1,23 @@
+"""Tests for distutils.filelist."""
+import unittest
+from distutils.filelist import glob_to_re
+
+class FileListTestCase(unittest.TestCase):
+
+    def test_glob_to_re(self):
+        # simple cases
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+
+        # special cases
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+
+def test_suite():
+    return unittest.makeSuite(FileListTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From ea4a61b3cca332851436422a11d42f020b604cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 22:04:38 +0000
Subject: [PATCH 2210/8469] added a simplest test to
 distutils.spawn._nt_quote_args

---
 tests/test_spawn.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tests/test_spawn.py

diff --git a/tests/test_spawn.py b/tests/test_spawn.py
new file mode 100644
index 0000000000..33e8bcf6e9
--- /dev/null
+++ b/tests/test_spawn.py
@@ -0,0 +1,20 @@
+"""Tests for distutils.spawn."""
+import unittest
+from distutils.spawn import _nt_quote_args
+
+class SpawnTestCase(unittest.TestCase):
+
+    def test_nt_quote_args(self):
+
+        for (args, wanted) in ((['with space', 'nospace'],
+                                ['"with space"', 'nospace']),
+                               (['nochange', 'nospace'],
+                                ['nochange', 'nospace'])):
+            res = _nt_quote_args(args)
+            self.assertEquals(res, wanted)
+
+def test_suite():
+    return unittest.makeSuite(SpawnTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 9dd99efbbbffa381dd119b49bfe43dc5a64484be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 22:51:09 +0000
Subject: [PATCH 2211/8469] Fixed #5095: msi missing from Distutils bdist
 formats

---
 command/bdist.py    | 49 +++++++++++++++------------------------------
 tests/test_bdist.py | 43 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 33 deletions(-)
 create mode 100644 tests/test_bdist.py

diff --git a/command/bdist.py b/command/bdist.py
index 3df5ef4c42..cb7598df70 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -12,7 +12,7 @@
 from distutils.util import get_platform
 
 
-def show_formats ():
+def show_formats():
     """Print list of available formats (arguments to "--format" option).
     """
     from distutils.fancy_getopt import FancyGetopt
@@ -24,7 +24,7 @@ def show_formats ():
     pretty_printer.print_help("List of available distribution formats:")
 
 
-class bdist (Command):
+class bdist(Command):
 
     description = "create a built (binary) distribution"
 
@@ -50,35 +50,28 @@ class bdist (Command):
         ]
 
     # The following commands do not take a format option from bdist
-    no_format_option = ('bdist_rpm',
-                        #'bdist_sdux', 'bdist_pkgtool'
-                        )
+    no_format_option = ('bdist_rpm',)
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
-    default_format = { 'posix': 'gztar',
-                       'nt': 'zip',
-                       'os2': 'zip', }
+    default_format = {'posix': 'gztar',
+                      'nt': 'zip',
+                      'os2': 'zip'}
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
-                       'wininst', 'zip',
-                       #'pkgtool', 'sdux'
-                       ]
+                       'wininst', 'zip', 'msi']
 
     # And the real information.
-    format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
-                       'zip':   ('bdist_dumb', "ZIP file"),
-                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
-                       'bztar': ('bdist_dumb', "bzip2'ed tar file"),
-                       'ztar':  ('bdist_dumb', "compressed tar file"),
-                       'tar':   ('bdist_dumb', "tar file"),
-                       'wininst': ('bdist_wininst',
-                                   "Windows executable installer"),
-                       'zip':   ('bdist_dumb', "ZIP file"),
-                       #'pkgtool': ('bdist_pkgtool',
-                       #            "Solaris pkgtool distribution"),
-                       #'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
+    format_command = {'rpm':   ('bdist_rpm',  "RPM distribution"),
+                      'gztar': ('bdist_dumb', "gzip'ed tar file"),
+                      'bztar': ('bdist_dumb', "bzip2'ed tar file"),
+                      'ztar':  ('bdist_dumb', "compressed tar file"),
+                      'tar':   ('bdist_dumb', "tar file"),
+                      'wininst': ('bdist_wininst',
+                                  "Windows executable installer"),
+                      'zip':   ('bdist_dumb', "ZIP file"),
+                      'msi':   ('bdist_msi',  "Microsoft Installer")
                       }
 
 
@@ -89,9 +82,6 @@ def initialize_options (self):
         self.dist_dir = None
         self.skip_build = 0
 
-    # initialize_options()
-
-
     def finalize_options (self):
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
@@ -120,10 +110,7 @@ def finalize_options (self):
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
-    # finalize_options()
-
     def run (self):
-
         # Figure out which sub-commands we need to run.
         commands = []
         for format in self.formats:
@@ -144,7 +131,3 @@ def run (self):
             if cmd_name in commands[i+1:]:
                 sub_cmd.keep_temp = 1
             self.run_command(cmd_name)
-
-    # run()
-
-# class bdist
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
new file mode 100644
index 0000000000..be3ec74976
--- /dev/null
+++ b/tests/test_bdist.py
@@ -0,0 +1,43 @@
+"""Tests for distutils.command.bdist."""
+import unittest
+import sys
+import os
+import tempfile
+import shutil
+
+from distutils.core import Distribution
+from distutils.command.bdist import bdist
+from distutils.tests import support
+from distutils.spawn import find_executable
+from distutils import spawn
+from distutils.errors import DistutilsExecError
+
+class BuildTestCase(support.TempdirManager,
+                    unittest.TestCase):
+
+    def test_formats(self):
+
+        # let's create a command and make sure
+        # we can fix the format
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist(dist)
+        cmd.formats = ['msi']
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.formats, ['msi'])
+
+        # what format bdist offers ?
+        # XXX an explicit list in bdist is
+        # not the best way to  bdist_* commands
+        # we should add a registry
+        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
+                   'tar', 'wininst', 'msi']
+        formats.sort()
+        founded = cmd.format_command.keys()
+        founded.sort()
+        self.assertEquals(founded, formats)
+
+def test_suite():
+    return unittest.makeSuite(BuildTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From ae1a2a43aeb89b3afbe475cdd5715a9985cf7976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 22:57:21 +0000
Subject: [PATCH 2212/8469] Merged revisions 71291 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71291 | tarek.ziade | 2009-04-06 00:51:09 +0200 (Mon, 06 Apr 2009) | 1 line

  Fixed #5095: msi missing from Distutils bdist formats
........
---
 command/bdist.py    | 35 ++++++++++++++---------------------
 tests/test_bdist.py | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 21 deletions(-)
 create mode 100644 tests/test_bdist.py

diff --git a/command/bdist.py b/command/bdist.py
index e3b047c66f..1a360b59e3 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -49,35 +49,28 @@ class bdist(Command):
         ]
 
     # The following commands do not take a format option from bdist
-    no_format_option = ('bdist_rpm',
-                        #'bdist_sdux', 'bdist_pkgtool'
-                        )
+    no_format_option = ('bdist_rpm',)
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
-    default_format = { 'posix': 'gztar',
-                       'nt': 'zip',
-                       'os2': 'zip', }
+    default_format = {'posix': 'gztar',
+                      'nt': 'zip',
+                      'os2': 'zip'}
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
-                       'wininst', 'zip',
-                       #'pkgtool', 'sdux'
-                       ]
+                       'wininst', 'zip', 'msi']
 
     # And the real information.
-    format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
-                       'zip':   ('bdist_dumb', "ZIP file"),
-                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
-                       'bztar': ('bdist_dumb', "bzip2'ed tar file"),
-                       'ztar':  ('bdist_dumb', "compressed tar file"),
-                       'tar':   ('bdist_dumb', "tar file"),
-                       'wininst': ('bdist_wininst',
-                                   "Windows executable installer"),
-                       'zip':   ('bdist_dumb', "ZIP file"),
-                       #'pkgtool': ('bdist_pkgtool',
-                       #            "Solaris pkgtool distribution"),
-                       #'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
+    format_command = {'rpm':   ('bdist_rpm',  "RPM distribution"),
+                      'gztar': ('bdist_dumb', "gzip'ed tar file"),
+                      'bztar': ('bdist_dumb', "bzip2'ed tar file"),
+                      'ztar':  ('bdist_dumb', "compressed tar file"),
+                      'tar':   ('bdist_dumb', "tar file"),
+                      'wininst': ('bdist_wininst',
+                                  "Windows executable installer"),
+                      'zip':   ('bdist_dumb', "ZIP file"),
+                      'msi':   ('bdist_msi',  "Microsoft Installer")
                       }
 
 
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
new file mode 100644
index 0000000000..f2849a9756
--- /dev/null
+++ b/tests/test_bdist.py
@@ -0,0 +1,43 @@
+"""Tests for distutils.command.bdist."""
+import unittest
+import sys
+import os
+import tempfile
+import shutil
+
+from distutils.core import Distribution
+from distutils.command.bdist import bdist
+from distutils.tests import support
+from distutils.spawn import find_executable
+from distutils import spawn
+from distutils.errors import DistutilsExecError
+
+class BuildTestCase(support.TempdirManager,
+                    unittest.TestCase):
+
+    def test_formats(self):
+
+        # let's create a command and make sure
+        # we can fix the format
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist(dist)
+        cmd.formats = ['msi']
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.formats, ['msi'])
+
+        # what format bdist offers ?
+        # XXX an explicit list in bdist is
+        # not the best way to  bdist_* commands
+        # we should add a registry
+        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
+                   'tar', 'wininst', 'msi']
+        formats.sort()
+        founded = list(cmd.format_command.keys())
+        founded.sort()
+        self.assertEquals(founded, formats)
+
+def test_suite():
+    return unittest.makeSuite(BuildTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 511f865b473f07c3d77f1507fd628f6d0a662a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 5 Apr 2009 23:03:10 +0000
Subject: [PATCH 2213/8469] pep8-fied method names

---
 command/bdist.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index cb7598df70..ec3375e5c4 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -75,14 +75,14 @@ class bdist(Command):
                       }
 
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_base = None
         self.plat_name = None
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
 
-    def finalize_options (self):
+    def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
         if self.plat_name is None:
             if self.skip_build:
@@ -110,7 +110,7 @@ def finalize_options (self):
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
-    def run (self):
+    def run(self):
         # Figure out which sub-commands we need to run.
         commands = []
         for format in self.formats:

From 67406893c1b9b727f313a374affe9868ec986fa6 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 7 Apr 2009 01:54:02 +0000
Subject: [PATCH 2214/8469] Bump to 2.6.2c1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8f7eb8427d..e8f55cf087 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.1"
+__version__ = "2.6.2c1"
 #--end constants--

From 24cf99bffe579c9be03c0d69ea1298e83825d202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 9 Apr 2009 21:36:44 +0000
Subject: [PATCH 2215/8469] Fixed #5731: Distutils bdist_wininst no longer
 worked on non-Windows platforms

---
 command/bdist_wininst.py    | 11 ++++++++---
 tests/test_bdist_wininst.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_bdist_wininst.py

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index ad6eee8ea8..8a6eca59d8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -342,10 +342,15 @@ def get_exe_bytes (self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        if self.plat_name == 'win32':
-            sfix = ''
+
+        # if plat_name starts with "win" but is not "win32"
+        # we want to strip "win" and leave the rest (e.g. -amd64)
+        # for all other cases, we don't want any suffix
+        if self.plat_name != 'win32' and self.plat_name[:3] == 'win':
+            sfix = self.plat_name[3:]
         else:
-            sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+            sfix = ''
+
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
         return open(filename, "rb").read()
 # class bdist_wininst
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
new file mode 100644
index 0000000000..d851d6c799
--- /dev/null
+++ b/tests/test_bdist_wininst.py
@@ -0,0 +1,29 @@
+"""Tests for distutils.command.bdist_wininst."""
+import unittest
+
+from distutils.command.bdist_wininst import bdist_wininst
+from distutils.tests import support
+
+class BuildWinInstTestCase(support.TempdirManager,
+                           unittest.TestCase):
+
+    def test_get_exe_bytes(self):
+
+        # issue5731: command was broken on non-windows platforms
+        # this test makes sure it works now for every platform
+        # let's create a command
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist_wininst(dist)
+        cmd.ensure_finalized()
+
+        # let's run the code that finds the right wininst*.exe file
+        # and make sure it finds it and returns its content
+        # no matter what platform we have
+        exe_file = cmd.get_exe_bytes()
+        self.assert_(len(exe_file) > 10)
+
+def test_suite():
+    return unittest.makeSuite(BuildWinInstTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 8723e53f8dcb017b1c6e0d84ced060fdcb336cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 9 Apr 2009 22:02:39 +0000
Subject: [PATCH 2216/8469] Merged revisions 71413 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71413 | tarek.ziade | 2009-04-09 23:36:44 +0200 (Thu, 09 Apr 2009) | 1 line

  Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms
........
---
 command/bdist_wininst.py    | 11 ++++++++---
 tests/test_bdist_wininst.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_bdist_wininst.py

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index e997e8f094..d6d01c630d 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -330,9 +330,14 @@ def get_exe_bytes(self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        if self.plat_name == 'win32':
-            sfix = ''
+
+        # if plat_name starts with "win" but is not "win32"
+        # we want to strip "win" and leave the rest (e.g. -amd64)
+        # for all other cases, we don't want any suffix
+        if self.plat_name != 'win32' and self.plat_name[:3] == 'win':
+            sfix = self.plat_name[3:]
         else:
-            sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+            sfix = ''
+
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
         return open(filename, "rb").read()
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
new file mode 100644
index 0000000000..d851d6c799
--- /dev/null
+++ b/tests/test_bdist_wininst.py
@@ -0,0 +1,29 @@
+"""Tests for distutils.command.bdist_wininst."""
+import unittest
+
+from distutils.command.bdist_wininst import bdist_wininst
+from distutils.tests import support
+
+class BuildWinInstTestCase(support.TempdirManager,
+                           unittest.TestCase):
+
+    def test_get_exe_bytes(self):
+
+        # issue5731: command was broken on non-windows platforms
+        # this test makes sure it works now for every platform
+        # let's create a command
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist_wininst(dist)
+        cmd.ensure_finalized()
+
+        # let's run the code that finds the right wininst*.exe file
+        # and make sure it finds it and returns its content
+        # no matter what platform we have
+        exe_file = cmd.get_exe_bytes()
+        self.assert_(len(exe_file) > 10)
+
+def test_suite():
+    return unittest.makeSuite(BuildWinInstTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 2c03b265b9bbd461c0275c3d9dac16a57714ec8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 9 Apr 2009 22:48:19 +0000
Subject: [PATCH 2217/8469] Merged revisions 71413 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71413 | tarek.ziade | 2009-04-09 23:36:44 +0200 (Thu, 09 Apr 2009) | 1 line

  Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms
........
---
 command/bdist_wininst.py    | 11 ++++++++---
 tests/test_bdist_wininst.py | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_bdist_wininst.py

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index f18e318cb9..d153e2bc38 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -344,10 +344,15 @@ def get_exe_bytes (self):
         directory = os.path.dirname(__file__)
         # we must use a wininst-x.y.exe built with the same C compiler
         # used for python.  XXX What about mingw, borland, and so on?
-        if self.plat_name == 'win32':
-            sfix = ''
+
+        # if plat_name starts with "win" but is not "win32"
+        # we want to strip "win" and leave the rest (e.g. -amd64)
+        # for all other cases, we don't want any suffix
+        if self.plat_name != 'win32' and self.plat_name[:3] == 'win':
+            sfix = self.plat_name[3:]
         else:
-            sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
+            sfix = ''
+
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
         return open(filename, "rb").read()
 # class bdist_wininst
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
new file mode 100644
index 0000000000..de6601fbb7
--- /dev/null
+++ b/tests/test_bdist_wininst.py
@@ -0,0 +1,34 @@
+"""Tests for distutils.command.bdist_wininst."""
+import unittest
+import os
+
+from distutils.dist import Distribution
+from distutils.command.bdist_wininst import bdist_wininst
+from distutils.tests import support
+
+class BuildWinInstTestCase(support.TempdirManager,
+                           unittest.TestCase):
+
+    def test_get_exe_bytes(self):
+
+        # issue5731: command was broken on non-windows platforms
+        # this test makes sure it works now for every platform
+        # let's create a command
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, 'foo')
+        os.mkdir(pkg_dir)
+        dist = Distribution()
+        cmd = bdist_wininst(dist)
+        cmd.ensure_finalized()
+
+        # let's run the code that finds the right wininst*.exe file
+        # and make sure it finds it and returns its content
+        # no matter what platform we have
+        exe_file = cmd.get_exe_bytes()
+        self.assert_(len(exe_file) > 10)
+
+def test_suite():
+    return unittest.makeSuite(BuildWinInstTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 5ac71381e3864771cbe4d32dcad1630b98b660a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Apr 2009 14:55:07 +0000
Subject: [PATCH 2218/8469] #5732: added the check command into Distutils

---
 command/__init__.py |   2 +-
 command/check.py    | 143 ++++++++++++++++++++++++++++++++++++++++++++
 tests/test_check.py |  92 ++++++++++++++++++++++++++++
 3 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 command/check.py
 create mode 100644 tests/test_check.py

diff --git a/command/__init__.py b/command/__init__.py
index 274cb010b8..20b159f74e 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -23,7 +23,7 @@
            'bdist_rpm',
            'bdist_wininst',
            'upload',
-
+           'check',
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',
diff --git a/command/check.py b/command/check.py
new file mode 100644
index 0000000000..c72914952e
--- /dev/null
+++ b/command/check.py
@@ -0,0 +1,143 @@
+"""distutils.command.check
+
+Implements the Distutils 'check' command.
+"""
+__revision__ = "$Id$"
+
+from distutils.core import Command
+from distutils.errors import DistutilsSetupError
+
+try:
+    # docutils is installed
+    from docutils.utils import Reporter
+    from docutils.parsers.rst import Parser
+    from docutils import frontend
+    from docutils import nodes
+    from StringIO import StringIO
+
+    class SilentReporter(Reporter):
+
+        def __init__(self, source, report_level, halt_level, stream=None,
+                     debug=0, encoding='ascii', error_handler='replace'):
+            self.messages = []
+            Reporter.__init__(self, source, report_level, halt_level, stream,
+                              debug, encoding, error_handler)
+
+        def system_message(self, level, message, *children, **kwargs):
+            self.messages.append((level, message, children, kwargs))
+
+    HAS_DOCUTILS = True
+except ImportError:
+    # docutils is not installed
+    HAS_DOCUTILS = False
+
+class check(Command):
+    """This command checks the meta-data of the package.
+    """
+    description = ("perform some checks on the package")
+    user_options = [('metadata', 'm', 'Verify meta-data'),
+                    ('restructuredtext', 'r',
+                     ('Checks if long string meta-data syntax '
+                      'are reStructuredText-compliant')),
+                    ('strict', 's',
+                     'Will exit with an error if a check fails')]
+
+    boolean_options = ['metadata', 'restructuredtext', 'strict']
+
+    def initialize_options(self):
+        """Sets default values for options."""
+        self.restructuredtext = 0
+        self.metadata = 1
+        self.strict = 0
+        self._warnings = 0
+
+    def finalize_options(self):
+        pass
+
+    def warn(self, msg):
+        """Counts the number of warnings that occurs."""
+        self._warnings += 1
+        return Command.warn(self, msg)
+
+    def run(self):
+        """Runs the command."""
+        # perform the various tests
+        if self.metadata:
+            self.check_metadata()
+        if self.restructuredtext:
+            if docutils:
+                self.check_restructuredtext()
+            elif self.strict:
+                raise DistutilsSetupError('The docutils package is needed.')
+
+        # let's raise an error in strict mode, if we have at least
+        # one warning
+        if self.strict and self._warnings > 1:
+            raise DistutilsSetupError('Please correct your package.')
+
+    def check_metadata(self):
+        """Ensures that all required elements of meta-data are supplied.
+
+        name, version, URL, (author and author_email) or
+        (maintainer and maintainer_email)).
+
+        Warns if any are missing.
+        """
+        metadata = self.distribution.metadata
+
+        missing = []
+        for attr in ('name', 'version', 'url'):
+            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
+                missing.append(attr)
+
+        if missing:
+            self.warn("missing required meta-data: %s"  % ' ,'.join(missing))
+        if metadata.author:
+            if not metadata.author_email:
+                self.warn("missing meta-data: if 'author' supplied, " +
+                          "'author_email' must be supplied too")
+        elif metadata.maintainer:
+            if not metadata.maintainer_email:
+                self.warn("missing meta-data: if 'maintainer' supplied, " +
+                          "'maintainer_email' must be supplied too")
+        else:
+            self.warn("missing meta-data: either (author and author_email) " +
+                      "or (maintainer and maintainer_email) " +
+                      "must be supplied")
+
+    def check_restructuredtext(self):
+        """Checks if the long string fields are reST-compliant."""
+        data = self.distribution.get_long_description()
+        for warning in self._check_rst_data(data):
+            line = warning[-1].get('line')
+            if line is None:
+                warning = warning[1]
+            else:
+                warning = '%s (line %s)' % (warning[1], line)
+            self.warn(warning)
+
+    def _check_rst_data(self, data):
+        """Returns warnings when the provided data doesn't compile."""
+        source_path = StringIO()
+        parser = Parser()
+        settings = frontend.OptionParser().get_default_values()
+        settings.tab_width = 4
+        settings.pep_references = None
+        settings.rfc_references = None
+        reporter = SilentReporter(source_path,
+                          settings.report_level,
+                          settings.halt_level,
+                          stream=settings.warning_stream,
+                          debug=settings.debug,
+                          encoding=settings.error_encoding,
+                          error_handler=settings.error_encoding_error_handler)
+
+        document = nodes.document(settings, reporter, source=source_path)
+        document.note_source(source_path, -1)
+        try:
+            parser.parse(data, document)
+        except AttributeError:
+            reporter.messages.append((-1, 'Could not finish the parsing.',
+                                      '', {}))
+
+        return reporter.messages
diff --git a/tests/test_check.py b/tests/test_check.py
new file mode 100644
index 0000000000..443fa35baf
--- /dev/null
+++ b/tests/test_check.py
@@ -0,0 +1,92 @@
+"""Tests for distutils.command.check."""
+import unittest
+
+from distutils.command.check import check, HAS_DOCUTILS
+from distutils.tests import support
+from distutils.errors import DistutilsSetupError
+
+class CheckTestCase(support.LoggingSilencer,
+                    support.TempdirManager,
+                    unittest.TestCase):
+
+    def _run(self, metadata=None, **options):
+        if metadata is None:
+            metadata = {}
+        pkg_info, dist = self.create_dist(**metadata)
+        cmd = check(dist)
+        cmd.initialize_options()
+        for name, value in options.items():
+            setattr(cmd, name, value)
+        cmd.ensure_finalized()
+        cmd.run()
+        return cmd
+
+    def test_check_metadata(self):
+        # let's run the command with no metadata at all
+        # by default, check is checking the metadata
+        # should have some warnings
+        cmd = self._run()
+        self.assertEquals(cmd._warnings, 2)
+
+        # now let's add the required fields
+        # and run it again, to make sure we don't get
+        # any warning anymore
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx'}
+        cmd = self._run(metadata)
+        self.assertEquals(cmd._warnings, 0)
+
+        # now with the strict mode, we should
+        # get an error if there are missing metadata
+        self.assertRaises(DistutilsSetupError, self._run, {}, **{'strict': 1})
+
+        # and of course, no error when all metadata are present
+        cmd = self._run(metadata, strict=1)
+        self.assertEquals(cmd._warnings, 0)
+
+    def test_check_document(self):
+        if not HAS_DOCUTILS: # won't test without docutils
+            return
+        pkg_info, dist = self.create_dist()
+        cmd = check(dist)
+
+        # let's see if it detects broken rest
+        broken_rest = 'title\n===\n\ntest'
+        msgs = cmd._check_rst_data(broken_rest)
+        self.assertEquals(len(msgs), 1)
+
+        # and non-broken rest
+        rest = 'title\n=====\n\ntest'
+        msgs = cmd._check_rst_data(rest)
+        self.assertEquals(len(msgs), 0)
+
+    def test_check_restructuredtext(self):
+        if not HAS_DOCUTILS: # won't test without docutils
+            return
+        # let's see if it detects broken rest in long_description
+        broken_rest = 'title\n===\n\ntest'
+        pkg_info, dist = self.create_dist(long_description=broken_rest)
+        cmd = check(dist)
+        cmd.check_restructuredtext()
+        self.assertEquals(cmd._warnings, 1)
+
+        # let's see if we have an error with strict=1
+        cmd = check(dist)
+        cmd.initialize_options()
+        cmd.strict = 1
+        cmd.ensure_finalized()
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # and non-broken rest
+        rest = 'title\n=====\n\ntest'
+        pkg_info, dist = self.create_dist(long_description=rest)
+        cmd = check(dist)
+        cmd.check_restructuredtext()
+        self.assertEquals(cmd._warnings, 0)
+
+def test_suite():
+    return unittest.makeSuite(CheckTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 416e5b55de1ffbdb2ced47b9655e3f8facdc299d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Apr 2009 15:00:43 +0000
Subject: [PATCH 2219/8469] Merged revisions 71473 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71473 | tarek.ziade | 2009-04-11 16:55:07 +0200 (Sat, 11 Apr 2009) | 1 line

  #5732: added the check command into Distutils
........
---
 command/__init__.py |   1 +
 command/check.py    | 143 ++++++++++++++++++++++++++++++++++++++++++++
 tests/test_check.py |  92 ++++++++++++++++++++++++++++
 3 files changed, 236 insertions(+)
 create mode 100644 command/check.py
 create mode 100644 tests/test_check.py

diff --git a/command/__init__.py b/command/__init__.py
index add83f8740..f7dcde48ed 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -22,6 +22,7 @@
            'bdist_dumb',
            'bdist_rpm',
            'bdist_wininst',
+           'check',
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',
diff --git a/command/check.py b/command/check.py
new file mode 100644
index 0000000000..c72914952e
--- /dev/null
+++ b/command/check.py
@@ -0,0 +1,143 @@
+"""distutils.command.check
+
+Implements the Distutils 'check' command.
+"""
+__revision__ = "$Id$"
+
+from distutils.core import Command
+from distutils.errors import DistutilsSetupError
+
+try:
+    # docutils is installed
+    from docutils.utils import Reporter
+    from docutils.parsers.rst import Parser
+    from docutils import frontend
+    from docutils import nodes
+    from StringIO import StringIO
+
+    class SilentReporter(Reporter):
+
+        def __init__(self, source, report_level, halt_level, stream=None,
+                     debug=0, encoding='ascii', error_handler='replace'):
+            self.messages = []
+            Reporter.__init__(self, source, report_level, halt_level, stream,
+                              debug, encoding, error_handler)
+
+        def system_message(self, level, message, *children, **kwargs):
+            self.messages.append((level, message, children, kwargs))
+
+    HAS_DOCUTILS = True
+except ImportError:
+    # docutils is not installed
+    HAS_DOCUTILS = False
+
+class check(Command):
+    """This command checks the meta-data of the package.
+    """
+    description = ("perform some checks on the package")
+    user_options = [('metadata', 'm', 'Verify meta-data'),
+                    ('restructuredtext', 'r',
+                     ('Checks if long string meta-data syntax '
+                      'are reStructuredText-compliant')),
+                    ('strict', 's',
+                     'Will exit with an error if a check fails')]
+
+    boolean_options = ['metadata', 'restructuredtext', 'strict']
+
+    def initialize_options(self):
+        """Sets default values for options."""
+        self.restructuredtext = 0
+        self.metadata = 1
+        self.strict = 0
+        self._warnings = 0
+
+    def finalize_options(self):
+        pass
+
+    def warn(self, msg):
+        """Counts the number of warnings that occurs."""
+        self._warnings += 1
+        return Command.warn(self, msg)
+
+    def run(self):
+        """Runs the command."""
+        # perform the various tests
+        if self.metadata:
+            self.check_metadata()
+        if self.restructuredtext:
+            if docutils:
+                self.check_restructuredtext()
+            elif self.strict:
+                raise DistutilsSetupError('The docutils package is needed.')
+
+        # let's raise an error in strict mode, if we have at least
+        # one warning
+        if self.strict and self._warnings > 1:
+            raise DistutilsSetupError('Please correct your package.')
+
+    def check_metadata(self):
+        """Ensures that all required elements of meta-data are supplied.
+
+        name, version, URL, (author and author_email) or
+        (maintainer and maintainer_email)).
+
+        Warns if any are missing.
+        """
+        metadata = self.distribution.metadata
+
+        missing = []
+        for attr in ('name', 'version', 'url'):
+            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
+                missing.append(attr)
+
+        if missing:
+            self.warn("missing required meta-data: %s"  % ' ,'.join(missing))
+        if metadata.author:
+            if not metadata.author_email:
+                self.warn("missing meta-data: if 'author' supplied, " +
+                          "'author_email' must be supplied too")
+        elif metadata.maintainer:
+            if not metadata.maintainer_email:
+                self.warn("missing meta-data: if 'maintainer' supplied, " +
+                          "'maintainer_email' must be supplied too")
+        else:
+            self.warn("missing meta-data: either (author and author_email) " +
+                      "or (maintainer and maintainer_email) " +
+                      "must be supplied")
+
+    def check_restructuredtext(self):
+        """Checks if the long string fields are reST-compliant."""
+        data = self.distribution.get_long_description()
+        for warning in self._check_rst_data(data):
+            line = warning[-1].get('line')
+            if line is None:
+                warning = warning[1]
+            else:
+                warning = '%s (line %s)' % (warning[1], line)
+            self.warn(warning)
+
+    def _check_rst_data(self, data):
+        """Returns warnings when the provided data doesn't compile."""
+        source_path = StringIO()
+        parser = Parser()
+        settings = frontend.OptionParser().get_default_values()
+        settings.tab_width = 4
+        settings.pep_references = None
+        settings.rfc_references = None
+        reporter = SilentReporter(source_path,
+                          settings.report_level,
+                          settings.halt_level,
+                          stream=settings.warning_stream,
+                          debug=settings.debug,
+                          encoding=settings.error_encoding,
+                          error_handler=settings.error_encoding_error_handler)
+
+        document = nodes.document(settings, reporter, source=source_path)
+        document.note_source(source_path, -1)
+        try:
+            parser.parse(data, document)
+        except AttributeError:
+            reporter.messages.append((-1, 'Could not finish the parsing.',
+                                      '', {}))
+
+        return reporter.messages
diff --git a/tests/test_check.py b/tests/test_check.py
new file mode 100644
index 0000000000..443fa35baf
--- /dev/null
+++ b/tests/test_check.py
@@ -0,0 +1,92 @@
+"""Tests for distutils.command.check."""
+import unittest
+
+from distutils.command.check import check, HAS_DOCUTILS
+from distutils.tests import support
+from distutils.errors import DistutilsSetupError
+
+class CheckTestCase(support.LoggingSilencer,
+                    support.TempdirManager,
+                    unittest.TestCase):
+
+    def _run(self, metadata=None, **options):
+        if metadata is None:
+            metadata = {}
+        pkg_info, dist = self.create_dist(**metadata)
+        cmd = check(dist)
+        cmd.initialize_options()
+        for name, value in options.items():
+            setattr(cmd, name, value)
+        cmd.ensure_finalized()
+        cmd.run()
+        return cmd
+
+    def test_check_metadata(self):
+        # let's run the command with no metadata at all
+        # by default, check is checking the metadata
+        # should have some warnings
+        cmd = self._run()
+        self.assertEquals(cmd._warnings, 2)
+
+        # now let's add the required fields
+        # and run it again, to make sure we don't get
+        # any warning anymore
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx'}
+        cmd = self._run(metadata)
+        self.assertEquals(cmd._warnings, 0)
+
+        # now with the strict mode, we should
+        # get an error if there are missing metadata
+        self.assertRaises(DistutilsSetupError, self._run, {}, **{'strict': 1})
+
+        # and of course, no error when all metadata are present
+        cmd = self._run(metadata, strict=1)
+        self.assertEquals(cmd._warnings, 0)
+
+    def test_check_document(self):
+        if not HAS_DOCUTILS: # won't test without docutils
+            return
+        pkg_info, dist = self.create_dist()
+        cmd = check(dist)
+
+        # let's see if it detects broken rest
+        broken_rest = 'title\n===\n\ntest'
+        msgs = cmd._check_rst_data(broken_rest)
+        self.assertEquals(len(msgs), 1)
+
+        # and non-broken rest
+        rest = 'title\n=====\n\ntest'
+        msgs = cmd._check_rst_data(rest)
+        self.assertEquals(len(msgs), 0)
+
+    def test_check_restructuredtext(self):
+        if not HAS_DOCUTILS: # won't test without docutils
+            return
+        # let's see if it detects broken rest in long_description
+        broken_rest = 'title\n===\n\ntest'
+        pkg_info, dist = self.create_dist(long_description=broken_rest)
+        cmd = check(dist)
+        cmd.check_restructuredtext()
+        self.assertEquals(cmd._warnings, 1)
+
+        # let's see if we have an error with strict=1
+        cmd = check(dist)
+        cmd.initialize_options()
+        cmd.strict = 1
+        cmd.ensure_finalized()
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # and non-broken rest
+        rest = 'title\n=====\n\ntest'
+        pkg_info, dist = self.create_dist(long_description=rest)
+        cmd = check(dist)
+        cmd.check_restructuredtext()
+        self.assertEquals(cmd._warnings, 0)
+
+def test_suite():
+    return unittest.makeSuite(CheckTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 2311950320c0ddea8f2d8fa834d052eaedf144f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Apr 2009 15:14:17 +0000
Subject: [PATCH 2220/8469] testing a full check case

---
 command/check.py    | 2 +-
 tests/test_check.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/command/check.py b/command/check.py
index c72914952e..d164f3f527 100644
--- a/command/check.py
+++ b/command/check.py
@@ -65,7 +65,7 @@ def run(self):
         if self.metadata:
             self.check_metadata()
         if self.restructuredtext:
-            if docutils:
+            if HAS_DOCUTILS:
                 self.check_restructuredtext()
             elif self.strict:
                 raise DistutilsSetupError('The docutils package is needed.')
diff --git a/tests/test_check.py b/tests/test_check.py
index 443fa35baf..5e0c453140 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -85,6 +85,13 @@ def test_check_restructuredtext(self):
         cmd.check_restructuredtext()
         self.assertEquals(cmd._warnings, 0)
 
+    def test_check_all(self):
+
+        metadata = {'url': 'xxx', 'author': 'xxx'}
+        self.assertRaises(DistutilsSetupError, self._run,
+                          {}, **{'strict': 1,
+                                 'restructuredtext': 1})
+
 def test_suite():
     return unittest.makeSuite(CheckTestCase)
 

From ca1e9a291e3e1662fdfda0143c50aa654fa8b02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Apr 2009 15:17:04 +0000
Subject: [PATCH 2221/8469] Merged revisions 71478 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71478 | tarek.ziade | 2009-04-11 17:14:17 +0200 (Sat, 11 Apr 2009) | 1 line

  testing a full check case
........
---
 command/check.py    | 2 +-
 tests/test_check.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/command/check.py b/command/check.py
index c72914952e..d164f3f527 100644
--- a/command/check.py
+++ b/command/check.py
@@ -65,7 +65,7 @@ def run(self):
         if self.metadata:
             self.check_metadata()
         if self.restructuredtext:
-            if docutils:
+            if HAS_DOCUTILS:
                 self.check_restructuredtext()
             elif self.strict:
                 raise DistutilsSetupError('The docutils package is needed.')
diff --git a/tests/test_check.py b/tests/test_check.py
index 443fa35baf..5e0c453140 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -85,6 +85,13 @@ def test_check_restructuredtext(self):
         cmd.check_restructuredtext()
         self.assertEquals(cmd._warnings, 0)
 
+    def test_check_all(self):
+
+        metadata = {'url': 'xxx', 'author': 'xxx'}
+        self.assertRaises(DistutilsSetupError, self._run,
+                          {}, **{'strict': 1,
+                                 'restructuredtext': 1})
+
 def test_suite():
     return unittest.makeSuite(CheckTestCase)
 

From c22d66c04f50a075bb19cae0a0ebcc3f8ade5a14 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Apr 2009 20:45:40 +0000
Subject: [PATCH 2222/8469] Merged revisions
 70912,70944,70968,71033,71041,71208,71263,71286,71395-71396,71405-71406,71485,71492,71494
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70912 | georg.brandl | 2009-03-31 17:35:46 -0500 (Tue, 31 Mar 2009) | 1 line

  #5617: add a handy function to print a unicode string to gdbinit.
........
  r70944 | georg.brandl | 2009-03-31 23:32:39 -0500 (Tue, 31 Mar 2009) | 1 line

  #5631: add upload to list of possible commands, which is presented in --help-commands.
........
  r70968 | michael.foord | 2009-04-01 13:25:38 -0500 (Wed, 01 Apr 2009) | 1 line

  Adding Wing project file
........
  r71033 | brett.cannon | 2009-04-01 22:34:53 -0500 (Wed, 01 Apr 2009) | 3 lines

  Fix two issues introduced by issue #71031 by changing the signature of
  PyImport_AppendInittab() to take a const char *.
........
  r71041 | jesse.noller | 2009-04-02 00:17:26 -0500 (Thu, 02 Apr 2009) | 1 line

  Add custom initializer argument to multiprocess.Manager*, courtesy of lekma
........
  r71208 | michael.foord | 2009-04-04 20:15:01 -0500 (Sat, 04 Apr 2009) | 4 lines

  Change the way unittest.TestSuite use their tests to always access them through iteration. Non behavior changing, this allows you to create custom subclasses that override __iter__.

  Issue #5693
........
  r71263 | michael.foord | 2009-04-05 14:19:28 -0500 (Sun, 05 Apr 2009) | 4 lines

  Adding assertIs and assertIsNot methods to unittest.TestCase

  Issue #2578
........
  r71286 | tarek.ziade | 2009-04-05 17:04:38 -0500 (Sun, 05 Apr 2009) | 1 line

  added a simplest test to distutils.spawn._nt_quote_args
........
  r71395 | benjamin.peterson | 2009-04-08 08:27:29 -0500 (Wed, 08 Apr 2009) | 1 line

  these must be installed to correctly run tests
........
  r71396 | benjamin.peterson | 2009-04-08 08:29:41 -0500 (Wed, 08 Apr 2009) | 1 line

  fix syntax
........
  r71405 | andrew.kuchling | 2009-04-09 06:22:47 -0500 (Thu, 09 Apr 2009) | 1 line

  Add items
........
  r71406 | andrew.kuchling | 2009-04-09 06:23:36 -0500 (Thu, 09 Apr 2009) | 1 line

  Typo fixes
........
  r71485 | andrew.kuchling | 2009-04-11 11:12:23 -0500 (Sat, 11 Apr 2009) | 1 line

  Add various items
........
  r71492 | georg.brandl | 2009-04-11 13:19:27 -0500 (Sat, 11 Apr 2009) | 1 line

  Take credit for a patch of mine.
........
  r71494 | benjamin.peterson | 2009-04-11 14:31:00 -0500 (Sat, 11 Apr 2009) | 1 line

  ignore py3_test_grammar when compiling the library
........
---
 command/__init__.py |  1 +
 command/check.py    |  5 +++--
 tests/test_spawn.py | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_spawn.py

diff --git a/command/__init__.py b/command/__init__.py
index f7dcde48ed..c379edbed0 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -23,6 +23,7 @@
            'bdist_rpm',
            'bdist_wininst',
            'check',
+           'upload',
            # These two are reserved for future use:
            #'bdist_sdux',
            #'bdist_pkgtool',
diff --git a/command/check.py b/command/check.py
index d164f3f527..5dd73b07af 100644
--- a/command/check.py
+++ b/command/check.py
@@ -27,8 +27,9 @@ def system_message(self, level, message, *children, **kwargs):
             self.messages.append((level, message, children, kwargs))
 
     HAS_DOCUTILS = True
-except ImportError:
-    # docutils is not installed
+except Exception:
+    # Catch all exceptions because exceptions besides ImportError probably
+    # indicate that docutils is not ported to Py3k.
     HAS_DOCUTILS = False
 
 class check(Command):
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
new file mode 100644
index 0000000000..33e8bcf6e9
--- /dev/null
+++ b/tests/test_spawn.py
@@ -0,0 +1,20 @@
+"""Tests for distutils.spawn."""
+import unittest
+from distutils.spawn import _nt_quote_args
+
+class SpawnTestCase(unittest.TestCase):
+
+    def test_nt_quote_args(self):
+
+        for (args, wanted) in ((['with space', 'nospace'],
+                                ['"with space"', 'nospace']),
+                               (['nochange', 'nospace'],
+                                ['nochange', 'nospace'])):
+            res = _nt_quote_args(args)
+            self.assertEquals(res, wanted)
+
+def test_suite():
+    return unittest.makeSuite(SpawnTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 4589130e9c66f7d818ac17f854c48643b7bba95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 14:53:51 +0000
Subject: [PATCH 2223/8469] removed the print statements and added a test

---
 command/config.py        | 16 +++++++++------
 tests/test_config_cmd.py | 42 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_config_cmd.py

diff --git a/command/config.py b/command/config.py
index 6b358cf250..c36456ad6a 100644
--- a/command/config.py
+++ b/command/config.py
@@ -354,13 +354,17 @@ def check_header (self, header, include_dirs=None,
 
 # class config
 
+def dump_file(filename, head=None):
+    """Dumps a file content into log.info.
 
-def dump_file (filename, head=None):
+    If head is not None, will be dumped before the file content.
+    """
     if head is None:
-        print filename + ":"
+        log.info('%s' % filename)
     else:
-        print head
-
+        log.info(head)
     file = open(filename)
-    sys.stdout.write(file.read())
-    file.close()
+    try:
+        log.info(file.read())
+    finally:
+        file.close()
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
new file mode 100644
index 0000000000..6fd1776668
--- /dev/null
+++ b/tests/test_config_cmd.py
@@ -0,0 +1,42 @@
+"""Tests for distutils.command.config."""
+import unittest
+import os
+
+from distutils.command.config import dump_file
+from distutils.tests import support
+from distutils import log
+
+class ConfigTestCase(support.LoggingSilencer,
+                     support.TempdirManager,
+                     unittest.TestCase):
+
+    def _info(self, msg):
+        for line in msg.splitlines():
+            self._logs.append(line)
+
+    def setUp(self):
+        super(ConfigTestCase, self).setUp()
+        self._logs = []
+        self.old_log = log.info
+        log.info = self._info
+
+    def tearDown(self):
+        log.info = self.old_log
+        super(ConfigTestCase, self).tearDown()
+
+    def test_dump_file(self):
+        this_file = os.path.splitext(__file__)[0] + '.py'
+        f = open(this_file)
+        try:
+            numlines = len(f.readlines())
+        finally:
+            f.close()
+
+        dump_file(this_file, 'I am the header')
+        self.assertEquals(len(self._logs), numlines+1)
+
+def test_suite():
+    return unittest.makeSuite(ConfigTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 46a2116c217f63b2a3059dafad7123f509fa46f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 14:57:46 +0000
Subject: [PATCH 2224/8469] Merged revisions 71509 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71509 | tarek.ziade | 2009-04-12 16:53:51 +0200 (Sun, 12 Apr 2009) | 1 line

  removed the print statements and added a test
........
---
 command/config.py        | 15 +++++++++-----
 tests/test_config_cmd.py | 42 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 tests/test_config_cmd.py

diff --git a/command/config.py b/command/config.py
index 34f91884d8..144c5132b3 100644
--- a/command/config.py
+++ b/command/config.py
@@ -336,11 +336,16 @@ def check_header(self, header, include_dirs=None, library_dirs=None,
 
 
 def dump_file(filename, head=None):
+    """Dumps a file content into log.info.
+
+    If head is not None, will be dumped before the file content.
+    """
     if head is None:
-        print(filename + ":")
+        log.info('%s' % filename)
     else:
-        print(head)
-
+        log.info(head)
     file = open(filename)
-    sys.stdout.write(file.read())
-    file.close()
+    try:
+        log.info(file.read())
+    finally:
+        file.close()
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
new file mode 100644
index 0000000000..6fd1776668
--- /dev/null
+++ b/tests/test_config_cmd.py
@@ -0,0 +1,42 @@
+"""Tests for distutils.command.config."""
+import unittest
+import os
+
+from distutils.command.config import dump_file
+from distutils.tests import support
+from distutils import log
+
+class ConfigTestCase(support.LoggingSilencer,
+                     support.TempdirManager,
+                     unittest.TestCase):
+
+    def _info(self, msg):
+        for line in msg.splitlines():
+            self._logs.append(line)
+
+    def setUp(self):
+        super(ConfigTestCase, self).setUp()
+        self._logs = []
+        self.old_log = log.info
+        log.info = self._info
+
+    def tearDown(self):
+        log.info = self.old_log
+        super(ConfigTestCase, self).tearDown()
+
+    def test_dump_file(self):
+        this_file = os.path.splitext(__file__)[0] + '.py'
+        f = open(this_file)
+        try:
+            numlines = len(f.readlines())
+        finally:
+            f.close()
+
+        dump_file(this_file, 'I am the header')
+        self.assertEquals(len(self._logs), numlines+1)
+
+def test_suite():
+    return unittest.makeSuite(ConfigTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a3a55acac57195c9b2dab89f5086e30d6bebdf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 15:03:50 +0000
Subject: [PATCH 2225/8469] pep8-fied the module before adding tests

---
 command/config.py | 62 +++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/command/config.py b/command/config.py
index c36456ad6a..74eed78391 100644
--- a/command/config.py
+++ b/command/config.py
@@ -18,10 +18,9 @@
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
-LANG_EXT = {'c': '.c',
-            'c++': '.cxx'}
+LANG_EXT = {'c': '.c', 'c++': '.cxx'}
 
-class config (Command):
+class config(Command):
 
     description = "prepare to build"
 
@@ -51,12 +50,10 @@ class config (Command):
     # The three standard command methods: since the "config" command
     # does nothing by default, these are empty.
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.compiler = None
         self.cc = None
         self.include_dirs = None
-        #self.define = None
-        #self.undef = None
         self.libraries = None
         self.library_dirs = None
 
@@ -68,7 +65,7 @@ def initialize_options (self):
         # to clean at some point
         self.temp_files = []
 
-    def finalize_options (self):
+    def finalize_options(self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         elif type(self.include_dirs) is StringType:
@@ -93,7 +90,7 @@ def run (self):
     # loosely based on Autoconf macros of similar names.  Sub-classes
     # may use these freely.
 
-    def _check_compiler (self):
+    def _check_compiler(self):
         """Check that 'self.compiler' really is a CCompiler object;
         if not, make it one.
         """
@@ -112,7 +109,7 @@ def _check_compiler (self):
                 self.compiler.set_library_dirs(self.library_dirs)
 
 
-    def _gen_temp_sourcefile (self, body, headers, lang):
+    def _gen_temp_sourcefile(self, body, headers, lang):
         filename = "_configtest" + LANG_EXT[lang]
         file = open(filename, "w")
         if headers:
@@ -125,14 +122,14 @@ def _gen_temp_sourcefile (self, body, headers, lang):
         file.close()
         return filename
 
-    def _preprocess (self, body, headers, include_dirs, lang):
+    def _preprocess(self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         out = "_configtest.i"
         self.temp_files.extend([src, out])
         self.compiler.preprocess(src, out, include_dirs=include_dirs)
         return (src, out)
 
-    def _compile (self, body, headers, include_dirs, lang):
+    def _compile(self, body, headers, include_dirs, lang):
         src = self._gen_temp_sourcefile(body, headers, lang)
         if self.dump_source:
             dump_file(src, "compiling '%s':" % src)
@@ -141,9 +138,8 @@ def _compile (self, body, headers, include_dirs, lang):
         self.compiler.compile([src], include_dirs=include_dirs)
         return (src, obj)
 
-    def _link (self, body,
-               headers, include_dirs,
-               libraries, library_dirs, lang):
+    def _link(self, body, headers, include_dirs, libraries, library_dirs,
+              lang):
         (src, obj) = self._compile(body, headers, include_dirs, lang)
         prog = os.path.splitext(os.path.basename(src))[0]
         self.compiler.link_executable([obj], prog,
@@ -157,7 +153,7 @@ def _link (self, body,
 
         return (src, obj, prog)
 
-    def _clean (self, *filenames):
+    def _clean(self, *filenames):
         if not filenames:
             filenames = self.temp_files
             self.temp_files = []
@@ -179,7 +175,7 @@ def _clean (self, *filenames):
 
     # XXX need access to the header search path and maybe default macros.
 
-    def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
+    def try_cpp(self, body=None, headers=None, include_dirs=None, lang="c"):
         """Construct a source file from 'body' (a string containing lines
         of C/C++ code) and 'headers' (a list of header files to include)
         and run it through the preprocessor.  Return true if the
@@ -197,8 +193,8 @@ def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
         self._clean()
         return ok
 
-    def search_cpp (self, pattern, body=None,
-                    headers=None, include_dirs=None, lang="c"):
+    def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
+                   lang="c"):
         """Construct a source file (just like 'try_cpp()'), run it through
         the preprocessor, and return true if any line of the output matches
         'pattern'.  'pattern' should either be a compiled regex object or a
@@ -227,7 +223,7 @@ def search_cpp (self, pattern, body=None,
         self._clean()
         return match
 
-    def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
+    def try_compile(self, body, headers=None, include_dirs=None, lang="c"):
         """Try to compile a source file built from 'body' and 'headers'.
         Return true on success, false otherwise.
         """
@@ -243,10 +239,8 @@ def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
         self._clean()
         return ok
 
-    def try_link (self, body,
-                  headers=None, include_dirs=None,
-                  libraries=None, library_dirs=None,
-                  lang="c"):
+    def try_link(self, body, headers=None, include_dirs=None, libraries=None,
+                 library_dirs=None, lang="c"):
         """Try to compile and link a source file, built from 'body' and
         'headers', to executable form.  Return true on success, false
         otherwise.
@@ -264,10 +258,8 @@ def try_link (self, body,
         self._clean()
         return ok
 
-    def try_run (self, body,
-                 headers=None, include_dirs=None,
-                 libraries=None, library_dirs=None,
-                 lang="c"):
+    def try_run(self, body, headers=None, include_dirs=None, libraries=None,
+                library_dirs=None, lang="c"):
         """Try to compile, link to an executable, and run a program
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.
@@ -291,10 +283,8 @@ def try_run (self, body,
     # (these are the ones that are actually likely to be useful
     # when implementing a real-world config command!)
 
-    def check_func (self, func,
-                    headers=None, include_dirs=None,
-                    libraries=None, library_dirs=None,
-                    decl=0, call=0):
+    def check_func(self, func, headers=None, include_dirs=None,
+                   libraries=None, library_dirs=None, decl=0, call=0):
 
         """Determine if function 'func' is available by constructing a
         source file that refers to 'func', and compiles and links it.
@@ -327,8 +317,8 @@ def check_func (self, func,
 
     # check_func ()
 
-    def check_lib (self, library, library_dirs=None,
-                   headers=None, include_dirs=None, other_libraries=[]):
+    def check_lib(self, library, library_dirs=None, headers=None,
+                  include_dirs=None, other_libraries=[]):
         """Determine if 'library' is available to be linked against,
         without actually checking that any particular symbols are provided
         by it.  'headers' will be used in constructing the source file to
@@ -342,8 +332,8 @@ def check_lib (self, library, library_dirs=None,
                              headers, include_dirs,
                              [library]+other_libraries, library_dirs)
 
-    def check_header (self, header, include_dirs=None,
-                      library_dirs=None, lang="c"):
+    def check_header(self, header, include_dirs=None, library_dirs=None,
+                     lang="c"):
         """Determine if the system header file named by 'header_file'
         exists and can be found by the preprocessor; return true if so,
         false otherwise.
@@ -352,8 +342,6 @@ def check_header (self, header, include_dirs=None,
                             include_dirs=include_dirs)
 
 
-# class config
-
 def dump_file(filename, head=None):
     """Dumps a file content into log.info.
 

From 6a0952de72b896a4a74338f867d14205a0fe6394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 15:07:31 +0000
Subject: [PATCH 2226/8469] Merged revisions 71513 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71513 | tarek.ziade | 2009-04-12 17:03:50 +0200 (Sun, 12 Apr 2009) | 1 line

  pep8-fied the module before adding tests
........
---
 command/config.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/command/config.py b/command/config.py
index 144c5132b3..385a47a726 100644
--- a/command/config.py
+++ b/command/config.py
@@ -53,8 +53,6 @@ def initialize_options(self):
         self.compiler = None
         self.cc = None
         self.include_dirs = None
-        #self.define = None
-        #self.undef = None
         self.libraries = None
         self.library_dirs = None
 
@@ -136,8 +134,8 @@ def _compile(self, body, headers, include_dirs, lang):
         self.compiler.compile([src], include_dirs=include_dirs)
         return (src, obj)
 
-    def _link(self, body, headers, include_dirs, libraries,
-              library_dirs, lang):
+    def _link(self, body, headers, include_dirs, libraries, library_dirs,
+              lang):
         (src, obj) = self._compile(body, headers, include_dirs, lang)
         prog = os.path.splitext(os.path.basename(src))[0]
         self.compiler.link_executable([obj], prog,
@@ -191,8 +189,8 @@ def try_cpp(self, body=None, headers=None, include_dirs=None, lang="c"):
         self._clean()
         return ok
 
-    def search_cpp(self, pattern, body=None, headers=None,
-                   include_dirs=None, lang="c"):
+    def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
+                   lang="c"):
         """Construct a source file (just like 'try_cpp()'), run it through
         the preprocessor, and return true if any line of the output matches
         'pattern'.  'pattern' should either be a compiled regex object or a
@@ -237,8 +235,8 @@ def try_compile(self, body, headers=None, include_dirs=None, lang="c"):
         self._clean()
         return ok
 
-    def try_link(self, body, headers=None, include_dirs=None,
-                 libraries=None, library_dirs=None, lang="c"):
+    def try_link(self, body, headers=None, include_dirs=None, libraries=None,
+                 library_dirs=None, lang="c"):
         """Try to compile and link a source file, built from 'body' and
         'headers', to executable form.  Return true on success, false
         otherwise.
@@ -256,8 +254,8 @@ def try_link(self, body, headers=None, include_dirs=None,
         self._clean()
         return ok
 
-    def try_run(self, body, headers=None, include_dirs=None,
-                libraries=None, library_dirs=None, lang="c"):
+    def try_run(self, body, headers=None, include_dirs=None, libraries=None,
+                library_dirs=None, lang="c"):
         """Try to compile, link to an executable, and run a program
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.

From 343e5f79fa09f634bc1b7273b1096ee370aa988f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 16:31:24 +0000
Subject: [PATCH 2227/8469] added a simple test for search_cpp

---
 command/config.py        |  5 ++---
 tests/test_config_cmd.py | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/command/config.py b/command/config.py
index 74eed78391..43a8dc8439 100644
--- a/command/config.py
+++ b/command/config.py
@@ -202,11 +202,10 @@ def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
         preprocesses an empty file -- which can be useful to determine the
         symbols the preprocessor and compiler set by default.
         """
-
         self._check_compiler()
-        (src, out) = self._preprocess(body, headers, include_dirs, lang)
+        src, out = self._preprocess(body, headers, include_dirs, lang)
 
-        if type(pattern) is StringType:
+        if isinstance(pattern, str):
             pattern = re.compile(pattern)
 
         file = open(out)
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 6fd1776668..af16d4c821 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 
-from distutils.command.config import dump_file
+from distutils.command.config import dump_file, config
 from distutils.tests import support
 from distutils import log
 
@@ -10,7 +10,7 @@ class ConfigTestCase(support.LoggingSilencer,
                      support.TempdirManager,
                      unittest.TestCase):
 
-    def _info(self, msg):
+    def _info(self, msg, *args):
         for line in msg.splitlines():
             self._logs.append(line)
 
@@ -35,6 +35,17 @@ def test_dump_file(self):
         dump_file(this_file, 'I am the header')
         self.assertEquals(len(self._logs), numlines+1)
 
+    def test_search_cpp(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+
+        # simple pattern searches
+        match = cmd.search_cpp(pattern='xxx', body='// xxx')
+        self.assertEquals(match, 0)
+
+        match = cmd.search_cpp(pattern='command', body='// xxx')
+        self.assertEquals(match, 1)
+
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 

From ea43ebbadd370b5247b600b4b46053f358541259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 16:34:34 +0000
Subject: [PATCH 2228/8469] Merged revisions 71523 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71523 | tarek.ziade | 2009-04-12 18:31:24 +0200 (Sun, 12 Apr 2009) | 1 line

  added a simple test for search_cpp
........
---
 command/config.py        |  3 +--
 tests/test_config_cmd.py | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/command/config.py b/command/config.py
index 385a47a726..c31220553c 100644
--- a/command/config.py
+++ b/command/config.py
@@ -198,9 +198,8 @@ def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
         preprocesses an empty file -- which can be useful to determine the
         symbols the preprocessor and compiler set by default.
         """
-
         self._check_compiler()
-        (src, out) = self._preprocess(body, headers, include_dirs, lang)
+        src, out = self._preprocess(body, headers, include_dirs, lang)
 
         if isinstance(pattern, str):
             pattern = re.compile(pattern)
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 6fd1776668..af16d4c821 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 
-from distutils.command.config import dump_file
+from distutils.command.config import dump_file, config
 from distutils.tests import support
 from distutils import log
 
@@ -10,7 +10,7 @@ class ConfigTestCase(support.LoggingSilencer,
                      support.TempdirManager,
                      unittest.TestCase):
 
-    def _info(self, msg):
+    def _info(self, msg, *args):
         for line in msg.splitlines():
             self._logs.append(line)
 
@@ -35,6 +35,17 @@ def test_dump_file(self):
         dump_file(this_file, 'I am the header')
         self.assertEquals(len(self._logs), numlines+1)
 
+    def test_search_cpp(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+
+        # simple pattern searches
+        match = cmd.search_cpp(pattern='xxx', body='// xxx')
+        self.assertEquals(match, 0)
+
+        match = cmd.search_cpp(pattern='command', body='// xxx')
+        self.assertEquals(match, 1)
+
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 

From b4b74e3688d8bebe6d1dd2a7121a2032510412a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 16:45:32 +0000
Subject: [PATCH 2229/8469] added a test for finalize_options

---
 command/config.py        | 13 ++++++-------
 tests/test_config_cmd.py | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/command/config.py b/command/config.py
index 43a8dc8439..f2ebe37dc9 100644
--- a/command/config.py
+++ b/command/config.py
@@ -12,7 +12,7 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
-from types import *
+
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 from distutils.sysconfig import customize_compiler
@@ -68,19 +68,18 @@ def initialize_options(self):
     def finalize_options(self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        elif type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+        elif isinstance(self.include_dirs, str):
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         if self.libraries is None:
             self.libraries = []
-        elif type(self.libraries) is StringType:
+        elif isinstance(self.libraries, str):
             self.libraries = [self.libraries]
 
         if self.library_dirs is None:
             self.library_dirs = []
-        elif type(self.library_dirs) is StringType:
-            self.library_dirs = string.split(self.library_dirs, os.pathsep)
-
+        elif isinstance(self.library_dirs, str):
+            self.library_dirs = self.library_dirs.split(os.pathsep)
 
     def run (self):
         pass
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index af16d4c821..45d480ba5a 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -46,6 +46,21 @@ def test_search_cpp(self):
         match = cmd.search_cpp(pattern='command', body='// xxx')
         self.assertEquals(match, 1)
 
+    def test_finalize_options(self):
+        # finalize_options does a bit of transformation
+        # on options
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+        cmd.include_dirs = 'one%stwo' % os.pathsep
+        cmd.libraries = 'one'
+        cmd.library_dirs = 'three%sfour' % os.pathsep
+        cmd.ensure_finalized()
+
+        self.assertEquals(cmd.include_dirs, ['one', 'two'])
+        self.assertEquals(cmd.libraries, ['one'])
+        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+
+
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 

From fe17289ba8c6ef976d19c69ac49cadce27ae1611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 16:49:20 +0000
Subject: [PATCH 2230/8469] Merged revisions 71528 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71528 | tarek.ziade | 2009-04-12 18:45:32 +0200 (Sun, 12 Apr 2009) | 1 line

  added a test for finalize_options
........
---
 command/config.py        |  1 +
 tests/test_config_cmd.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/command/config.py b/command/config.py
index c31220553c..ac80a54eb1 100644
--- a/command/config.py
+++ b/command/config.py
@@ -12,6 +12,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 from distutils.sysconfig import customize_compiler
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index af16d4c821..45d480ba5a 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -46,6 +46,21 @@ def test_search_cpp(self):
         match = cmd.search_cpp(pattern='command', body='// xxx')
         self.assertEquals(match, 1)
 
+    def test_finalize_options(self):
+        # finalize_options does a bit of transformation
+        # on options
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+        cmd.include_dirs = 'one%stwo' % os.pathsep
+        cmd.libraries = 'one'
+        cmd.library_dirs = 'three%sfour' % os.pathsep
+        cmd.ensure_finalized()
+
+        self.assertEquals(cmd.include_dirs, ['one', 'two'])
+        self.assertEquals(cmd.libraries, ['one'])
+        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+
+
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 

From 44c22c6f2b8bbf6c929777a17a2fadfec2afbd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 17:02:08 +0000
Subject: [PATCH 2231/8469] removed string usage and added a test for _clean

---
 command/config.py        |  8 ++++----
 tests/test_config_cmd.py | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/command/config.py b/command/config.py
index f2ebe37dc9..134fa3892d 100644
--- a/command/config.py
+++ b/command/config.py
@@ -11,7 +11,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, re
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
@@ -81,7 +81,7 @@ def finalize_options(self):
         elif isinstance(self.library_dirs, str):
             self.library_dirs = self.library_dirs.split(os.pathsep)
 
-    def run (self):
+    def run(self):
         pass
 
 
@@ -156,7 +156,7 @@ def _clean(self, *filenames):
         if not filenames:
             filenames = self.temp_files
             self.temp_files = []
-        log.info("removing: %s", string.join(filenames))
+        log.info("removing: %s", ' '.join(filenames))
         for filename in filenames:
             try:
                 os.remove(filename)
@@ -308,7 +308,7 @@ def check_func(self, func, headers=None, include_dirs=None,
         else:
             body.append("  %s;" % func)
         body.append("}")
-        body = string.join(body, "\n") + "\n"
+        body = "\n".join(body) + "\n"
 
         return self.try_link(body, headers, include_dirs,
                              libraries, library_dirs)
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 45d480ba5a..f5c09e4f44 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -60,6 +60,24 @@ def test_finalize_options(self):
         self.assertEquals(cmd.libraries, ['one'])
         self.assertEquals(cmd.library_dirs, ['three', 'four'])
 
+    def test_clean(self):
+        # _clean removes files
+        tmp_dir = self.mkdtemp()
+        f1 = os.path.join(tmp_dir, 'one')
+        f2 = os.path.join(tmp_dir, 'two')
+
+        self.write_file(f1, 'xxx')
+        self.write_file(f2, 'xxx')
+
+        for f in (f1, f2):
+            self.assert_(os.path.exists(f))
+
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+        cmd._clean(f1, f2)
+
+        for f in (f1, f2):
+            self.assert_(not os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)

From 3032240dde2e76b4bfe1c11c05eeaa7252e1b14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Apr 2009 17:04:39 +0000
Subject: [PATCH 2232/8469] Merged revisions 71533 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71533 | tarek.ziade | 2009-04-12 19:02:08 +0200 (Sun, 12 Apr 2009) | 1 line

  removed string usage and added a test for _clean
........
---
 tests/test_config_cmd.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 45d480ba5a..f5c09e4f44 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -60,6 +60,24 @@ def test_finalize_options(self):
         self.assertEquals(cmd.libraries, ['one'])
         self.assertEquals(cmd.library_dirs, ['three', 'four'])
 
+    def test_clean(self):
+        # _clean removes files
+        tmp_dir = self.mkdtemp()
+        f1 = os.path.join(tmp_dir, 'one')
+        f2 = os.path.join(tmp_dir, 'two')
+
+        self.write_file(f1, 'xxx')
+        self.write_file(f2, 'xxx')
+
+        for f in (f1, f2):
+            self.assert_(os.path.exists(f))
+
+        pkg_dir, dist = self.create_dist()
+        cmd = config(dist)
+        cmd._clean(f1, f2)
+
+        for f in (f1, f2):
+            self.assert_(not os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)

From db733eec63b1e1cb294a2c83699c9ee095a22d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 12:34:01 +0000
Subject: [PATCH 2233/8469] Fixed #5607: Distutils test_get_platform was
 failing fo Mac OS X fat binaries.

---
 tests/test_util.py | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 67474025d3..f27c452404 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -5,6 +5,7 @@
 import os
 import sys
 import unittest
+from copy import copy
 
 from distutils.errors import DistutilsPlatformError
 
@@ -17,6 +18,7 @@
 from distutils.util import rfc822_escape
 
 from distutils import util # used to patch _environ_checked
+from distutils.sysconfig import get_config_vars, _config_vars
 
 class utilTestCase(unittest.TestCase):
 
@@ -30,6 +32,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
+        self._config_vars = copy(_config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -42,7 +45,7 @@ def setUp(self):
         os.uname = self._get_uname
 
     def tearDown(self):
-        # getting back tne environment
+        # getting back the environment
         os.name = self.name
         sys.platform = self.platform
         sys.version = self.version
@@ -55,6 +58,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
+        _config_vars = copy(self._config_vars)
 
     def _set_uname(self, uname):
         self._uname = uname
@@ -96,8 +100,34 @@ def test_get_platform(self):
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
+        # macbook with fat binaries (fat, universal or fat64)
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From b37e2b50392d2a4d5bff20f774f5cd10cbf094fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 12:37:57 +0000
Subject: [PATCH 2234/8469] Merged revisions 71560 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71560 | tarek.ziade | 2009-04-13 14:34:01 +0200 (Mon, 13 Apr 2009) | 1 line

  Fixed #5607: Distutils test_get_platform was failing fo Mac OS X fat binaries.
........
---
 tests/test_util.py | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 67474025d3..f27c452404 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -5,6 +5,7 @@
 import os
 import sys
 import unittest
+from copy import copy
 
 from distutils.errors import DistutilsPlatformError
 
@@ -17,6 +18,7 @@
 from distutils.util import rfc822_escape
 
 from distutils import util # used to patch _environ_checked
+from distutils.sysconfig import get_config_vars, _config_vars
 
 class utilTestCase(unittest.TestCase):
 
@@ -30,6 +32,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
+        self._config_vars = copy(_config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -42,7 +45,7 @@ def setUp(self):
         os.uname = self._get_uname
 
     def tearDown(self):
-        # getting back tne environment
+        # getting back the environment
         os.name = self.name
         sys.platform = self.platform
         sys.version = self.version
@@ -55,6 +58,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
+        _config_vars = copy(self._config_vars)
 
     def _set_uname(self, uname):
         self._uname = uname
@@ -96,8 +100,34 @@ def test_get_platform(self):
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
+        # macbook with fat binaries (fat, universal or fat64)
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From f6f67fef03ad922f8e974cf41e0ed88a8a0931a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 12:42:26 +0000
Subject: [PATCH 2235/8469] deactivate test_search_cpp under win32

---
 tests/test_config_cmd.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index f5c09e4f44..1e6ebfacf5 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -1,6 +1,7 @@
 """Tests for distutils.command.config."""
 import unittest
 import os
+import sys
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -36,6 +37,8 @@ def test_dump_file(self):
         self.assertEquals(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
+        if sys.platform == 'win32':
+            return
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
 

From c5ab35d770e11483e3c05ade821a28dafaa5c5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 12:59:03 +0000
Subject: [PATCH 2236/8469] Merged revisions 71569 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71569 | tarek.ziade | 2009-04-13 14:42:26 +0200 (Mon, 13 Apr 2009) | 1 line

  deactivate test_search_cpp under win32
........
---
 tests/test_config_cmd.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index f5c09e4f44..1e6ebfacf5 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -1,6 +1,7 @@
 """Tests for distutils.command.config."""
 import unittest
 import os
+import sys
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -36,6 +37,8 @@ def test_dump_file(self):
         self.assertEquals(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
+        if sys.platform == 'win32':
+            return
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
 

From f27b9ed76fd3444675d28d9d9632503466882551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 20:03:44 +0000
Subject: [PATCH 2237/8469] improved test coverage for distutils.cmd

---
 cmd.py            | 14 +++++++-------
 tests/test_cmd.py | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/cmd.py b/cmd.py
index dfcbe23537..0e56460036 100644
--- a/cmd.py
+++ b/cmd.py
@@ -214,7 +214,7 @@ def debug_print (self, msg):
     # and they can be guaranteed that thereafter, self.foo will be
     # a list of strings.
 
-    def _ensure_stringlike (self, option, what, default=None):
+    def _ensure_stringlike(self, option, what, default=None):
         val = getattr(self, option)
         if val is None:
             setattr(self, option, default)
@@ -224,13 +224,13 @@ def _ensure_stringlike (self, option, what, default=None):
                   "'%s' must be a %s (got `%s`)" % (option, what, val)
         return val
 
-    def ensure_string (self, option, default=None):
+    def ensure_string(self, option, default=None):
         """Ensure that 'option' is a string; if not defined, set it to
         'default'.
         """
         self._ensure_stringlike(option, "string", default)
 
-    def ensure_string_list (self, option):
+    def ensure_string_list(self, option):
         """Ensure that 'option' is a list of strings.  If 'option' is
         currently a string, we split it either on /,\s*/ or /\s+/, so
         "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
@@ -258,20 +258,20 @@ def ensure_string_list (self, option):
                         (option, val)
 
 
-    def _ensure_tested_string (self, option, tester,
-                               what, error_fmt, default=None):
+    def _ensure_tested_string(self, option, tester,
+                              what, error_fmt, default=None):
         val = self._ensure_stringlike(option, what, default)
         if val is not None and not tester(val):
             raise DistutilsOptionError, \
                   ("error in '%s' option: " + error_fmt) % (option, val)
 
-    def ensure_filename (self, option):
+    def ensure_filename(self, option):
         """Ensure that 'option' is the name of an existing file."""
         self._ensure_tested_string(option, os.path.isfile,
                                    "filename",
                                    "'%s' does not exist or is not a file")
 
-    def ensure_dirname (self, option):
+    def ensure_dirname(self, option):
         self._ensure_tested_string(option, os.path.isdir,
                                    "directory name",
                                    "'%s' does not exist or is not a directory")
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index a252c355e7..8f2b36fb1f 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,5 +1,6 @@
 """Tests for distutils.cmd."""
 import unittest
+import os
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -62,6 +63,45 @@ def _announce(msg, level):
                   '  option2 = 1']
         self.assertEquals(msgs, wanted)
 
+    def test_ensure_string(self):
+        cmd = self.cmd
+        cmd.option1 = 'ok'
+        cmd.ensure_string('option1')
+
+        cmd.option2 = None
+        cmd.ensure_string('option2', 'xxx')
+        self.assert_(hasattr(cmd, 'option2'))
+
+        cmd.option3 = 1
+        self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
+
+    def test_ensure_string_list(self):
+        cmd = self.cmd
+        cmd.option1 = 'ok,dok'
+        cmd.ensure_string_list('option1')
+        self.assertEquals(cmd.option1, ['ok', 'dok'])
+
+        cmd.option2 = ['xxx', 'www']
+        cmd.ensure_string_list('option2')
+
+        cmd.option3 = ['ok', 2]
+        self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
+                          'option3')
+
+    def test_ensure_filename(self):
+        cmd = self.cmd
+        cmd.option1 = __file__
+        cmd.ensure_filename('option1')
+        cmd.option2 = 'xxx'
+        self.assertRaises(DistutilsOptionError, cmd.ensure_filename, 'option2')
+
+    def test_ensure_dirname(self):
+        cmd = self.cmd
+        cmd.option1 = os.path.dirname(__file__)
+        cmd.ensure_dirname('option1')
+        cmd.option2 = 'xxx'
+        self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 

From 21748d58c6bac04eb31504bf976b216ee5e8d3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 20:07:23 +0000
Subject: [PATCH 2238/8469] Merged revisions 71585 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71585 | tarek.ziade | 2009-04-13 22:03:44 +0200 (Mon, 13 Apr 2009) | 1 line

  improved test coverage for distutils.cmd
........
---
 tests/test_cmd.py | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index a252c355e7..8f2b36fb1f 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,5 +1,6 @@
 """Tests for distutils.cmd."""
 import unittest
+import os
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -62,6 +63,45 @@ def _announce(msg, level):
                   '  option2 = 1']
         self.assertEquals(msgs, wanted)
 
+    def test_ensure_string(self):
+        cmd = self.cmd
+        cmd.option1 = 'ok'
+        cmd.ensure_string('option1')
+
+        cmd.option2 = None
+        cmd.ensure_string('option2', 'xxx')
+        self.assert_(hasattr(cmd, 'option2'))
+
+        cmd.option3 = 1
+        self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
+
+    def test_ensure_string_list(self):
+        cmd = self.cmd
+        cmd.option1 = 'ok,dok'
+        cmd.ensure_string_list('option1')
+        self.assertEquals(cmd.option1, ['ok', 'dok'])
+
+        cmd.option2 = ['xxx', 'www']
+        cmd.ensure_string_list('option2')
+
+        cmd.option3 = ['ok', 2]
+        self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
+                          'option3')
+
+    def test_ensure_filename(self):
+        cmd = self.cmd
+        cmd.option1 = __file__
+        cmd.ensure_filename('option1')
+        cmd.option2 = 'xxx'
+        self.assertRaises(DistutilsOptionError, cmd.ensure_filename, 'option2')
+
+    def test_ensure_dirname(self):
+        cmd = self.cmd
+        cmd.option1 = os.path.dirname(__file__)
+        cmd.ensure_dirname('option1')
+        cmd.option2 = 'xxx'
+        self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 

From 1b8d985f66013fe20bbfd4181afc29248d19f35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 20:14:54 +0000
Subject: [PATCH 2239/8469] pep8-fied

---
 cmd.py | 65 +++++++++++++++++++++-------------------------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/cmd.py b/cmd.py
index 0e56460036..869258babb 100644
--- a/cmd.py
+++ b/cmd.py
@@ -46,7 +46,7 @@ class Command:
 
     # -- Creation/initialization methods -------------------------------
 
-    def __init__ (self, dist):
+    def __init__(self, dist):
         """Create and initialize a new Command object.  Most importantly,
         invokes the 'initialize_options()' method, which is the real
         initializer and depends on the actual command being
@@ -93,12 +93,8 @@ def __init__ (self, dist):
         # always calls 'finalize_options()', to respect/update it.
         self.finalized = 0
 
-    # __init__ ()
-
-
     # XXX A more explicit way to customize dry_run would be better.
-
-    def __getattr__ (self, attr):
+    def __getattr__(self, attr):
         if attr == 'dry_run':
             myval = getattr(self, "_" + attr)
             if myval is None:
@@ -108,13 +104,11 @@ def __getattr__ (self, attr):
         else:
             raise AttributeError, attr
 
-
-    def ensure_finalized (self):
+    def ensure_finalized(self):
         if not self.finalized:
             self.finalize_options()
         self.finalized = 1
 
-
     # Subclasses must define:
     #   initialize_options()
     #     provide default values for all options; may be customized by
@@ -128,7 +122,7 @@ def ensure_finalized (self):
     #     run the command: do whatever it is we're here to do,
     #     controlled by the command's various option values
 
-    def initialize_options (self):
+    def initialize_options(self):
         """Set default values for all the options that this command
         supports.  Note that these defaults may be overridden by other
         commands, by the setup script, by config files, or by the
@@ -141,7 +135,7 @@ def initialize_options (self):
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
 
-    def finalize_options (self):
+    def finalize_options(self):
         """Set final values for all the options that this command supports.
         This is always called as late as possible, ie.  after any option
         assignments from the command-line or from other commands have been
@@ -170,7 +164,7 @@ def dump_options(self, header=None, indent=""):
             self.announce(indent + "%s = %s" % (option, value),
                           level=log.INFO)
 
-    def run (self):
+    def run(self):
         """A command's raison d'etre: carry out the action it exists to
         perform, controlled by the options initialized in
         'initialize_options()', customized by other commands, the setup
@@ -180,17 +174,16 @@ def run (self):
 
         This method must be implemented by all command classes.
         """
-
         raise RuntimeError, \
               "abstract method -- subclass %s must override" % self.__class__
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         """If the current verbosity level is of greater than or equal to
         'level' print 'msg' to stdout.
         """
         log.log(level, msg)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
@@ -200,7 +193,6 @@ def debug_print (self, msg):
             sys.stdout.flush()
 
 
-
     # -- Option validation methods -------------------------------------
     # (these are very handy in writing the 'finalize_options()' method)
     #
@@ -279,14 +271,13 @@ def ensure_dirname(self, option):
 
     # -- Convenience methods for commands ------------------------------
 
-    def get_command_name (self):
+    def get_command_name(self):
         if hasattr(self, 'command_name'):
             return self.command_name
         else:
             return self.__class__.__name__
 
-
-    def set_undefined_options (self, src_cmd, *option_pairs):
+    def set_undefined_options(self, src_cmd, *option_pairs):
         """Set the values of any "undefined" options from corresponding
         option values in some other command object.  "Undefined" here means
         "is None", which is the convention used to indicate that an option
@@ -311,7 +302,7 @@ def set_undefined_options (self, src_cmd, *option_pairs):
                         getattr(src_cmd_obj, src_option))
 
 
-    def get_finalized_command (self, command, create=1):
+    def get_finalized_command(self, command, create=1):
         """Wrapper around Distribution's 'get_command_obj()' method: find
         (create if necessary and 'create' is true) the command object for
         'command', call its 'ensure_finalized()' method, and return the
@@ -323,19 +314,18 @@ def get_finalized_command (self, command, create=1):
 
     # XXX rename to 'get_reinitialized_command()'? (should do the
     # same in dist.py, if so)
-    def reinitialize_command (self, command, reinit_subcommands=0):
+    def reinitialize_command(self, command, reinit_subcommands=0):
         return self.distribution.reinitialize_command(
             command, reinit_subcommands)
 
-    def run_command (self, command):
+    def run_command(self, command):
         """Run some other command: uses the 'run_command()' method of
         Distribution, which creates and finalizes the command object if
         necessary and then invokes its 'run()' method.
         """
         self.distribution.run_command(command)
 
-
-    def get_sub_commands (self):
+    def get_sub_commands(self):
         """Determine the sub-commands that are relevant in the current
         distribution (ie., that need to be run).  This is based on the
         'sub_commands' class attribute: each tuple in that list may include
@@ -351,19 +341,17 @@ def get_sub_commands (self):
 
     # -- External world manipulation -----------------------------------
 
-    def warn (self, msg):
+    def warn(self, msg):
         log.warn("warning: %s: %s\n" %
                 (self.get_command_name(), msg))
 
-    def execute (self, func, args, msg=None, level=1):
+    def execute(self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
 
-
-    def mkpath (self, name, mode=0777):
+    def mkpath(self, name, mode=0777):
         dir_util.mkpath(name, mode, dry_run=self.dry_run)
 
-
-    def copy_file (self, infile, outfile,
+    def copy_file(self, infile, outfile,
                    preserve_mode=1, preserve_times=1, link=None, level=1):
         """Copy a file respecting verbose, dry-run and force flags.  (The
         former two default to whatever is in the Distribution object, and
@@ -376,8 +364,7 @@ def copy_file (self, infile, outfile,
             link,
             dry_run=self.dry_run)
 
-
-    def copy_tree (self, infile, outfile,
+    def copy_tree(self, infile, outfile,
                    preserve_mode=1, preserve_times=1, preserve_symlinks=0,
                    level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
@@ -403,7 +390,6 @@ def make_archive (self, base_name, format,
         return archive_util.make_archive(
             base_name, format, root_dir, base_dir, dry_run=self.dry_run)
 
-
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
         """Special case of 'execute()' for operations that process one or
@@ -438,17 +424,12 @@ def make_file(self, infiles, outfile, func, args,
         else:
             log.debug(skip_msg)
 
-    # make_file ()
-
-# class Command
-
-
 # XXX 'install_misc' class not currently used -- it was the base class for
 # both 'install_scripts' and 'install_data', but they outgrew it.  It might
 # still be useful for 'install_headers', though, so I'm keeping it around
 # for the time being.
 
-class install_misc (Command):
+class install_misc(Command):
     """Common base class for installing some files in a subdirectory.
     Currently used by install_data and install_scripts.
     """
@@ -459,10 +440,10 @@ def initialize_options (self):
         self.install_dir = None
         self.outfiles = []
 
-    def _install_dir_from (self, dirname):
+    def _install_dir_from(self, dirname):
         self.set_undefined_options('install', (dirname, 'install_dir'))
 
-    def _copy_files (self, filelist):
+    def _copy_files(self, filelist):
         self.outfiles = []
         if not filelist:
             return
@@ -471,5 +452,5 @@ def _copy_files (self, filelist):
             self.copy_file(f, self.install_dir)
             self.outfiles.append(os.path.join(self.install_dir, f))
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles

From 5ff3e0818920cd90da7e957d901ed9d42a9a21e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 13 Apr 2009 20:19:58 +0000
Subject: [PATCH 2240/8469] Merged revisions 71589 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71589 | tarek.ziade | 2009-04-13 22:14:54 +0200 (Mon, 13 Apr 2009) | 1 line

  pep8-fied
........
---
 cmd.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/cmd.py b/cmd.py
index 5829a56639..aff7d68e3c 100644
--- a/cmd.py
+++ b/cmd.py
@@ -93,9 +93,8 @@ def __init__(self, dist):
         # always calls 'finalize_options()', to respect/update it.
         self.finalized = 0
 
-
     # XXX A more explicit way to customize dry_run would be better.
-    def __getattr__ (self, attr):
+    def __getattr__(self, attr):
         if attr == 'dry_run':
             myval = getattr(self, "_" + attr)
             if myval is None:
@@ -105,7 +104,7 @@ def __getattr__ (self, attr):
         else:
             raise AttributeError(attr)
 
-    def ensure_finalized (self):
+    def ensure_finalized(self):
         if not self.finalized:
             self.finalize_options()
         self.finalized = 1
@@ -175,7 +174,6 @@ def run(self):
 
         This method must be implemented by all command classes.
         """
-
         raise RuntimeError("abstract method -- subclass %s must override"
                            % self.__class__)
 
@@ -351,7 +349,7 @@ def copy_file(self, infile, outfile, preserve_mode=1, preserve_times=1,
                                    preserve_times, not self.force, link,
                                    dry_run=self.dry_run)
 
-    def copy_tree (self, infile, outfile, preserve_mode=1, preserve_times=1,
+    def copy_tree(self, infile, outfile, preserve_mode=1, preserve_times=1,
                    preserve_symlinks=0, level=1):
         """Copy an entire directory tree respecting verbose, dry-run,
         and force flags.
@@ -373,7 +371,6 @@ def make_archive(self, base_name, format, root_dir=None, base_dir=None):
         return archive_util.make_archive(base_name, format, root_dir, base_dir,
                                          dry_run=self.dry_run)
 
-
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
         """Special case of 'execute()' for operations that process one or
@@ -406,7 +403,6 @@ def make_file(self, infiles, outfile, func, args,
         else:
             log.debug(skip_msg)
 
-
 # XXX 'install_misc' class not currently used -- it was the base class for
 # both 'install_scripts' and 'install_data', but they outgrew it.  It might
 # still be useful for 'install_headers', though, so I'm keeping it around
@@ -423,10 +419,10 @@ def initialize_options (self):
         self.install_dir = None
         self.outfiles = []
 
-    def _install_dir_from (self, dirname):
+    def _install_dir_from(self, dirname):
         self.set_undefined_options('install', (dirname, 'install_dir'))
 
-    def _copy_files (self, filelist):
+    def _copy_files(self, filelist):
         self.outfiles = []
         if not filelist:
             return
@@ -435,5 +431,5 @@ def _copy_files (self, filelist):
             self.copy_file(f, self.install_dir)
             self.outfiles.append(os.path.join(self.install_dir, f))
 
-    def get_outputs (self):
+    def get_outputs(self):
         return self.outfiles

From 9c62b7799426d02dc52636b95a34f12988a19305 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 14 Apr 2009 13:16:19 +0000
Subject: [PATCH 2241/8469] Bumping to 2.6.2 (final).

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e8f55cf087..ba926063e1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.2c1"
+__version__ = "2.6.2"
 #--end constants--

From 452e5137d5612d5e68d72c5748b14a2fed3dbc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 17 Apr 2009 14:29:56 +0000
Subject: [PATCH 2242/8469] DistutilsSetupError was not raised when one single
 warning occured

---
 command/check.py    |  2 +-
 tests/test_check.py | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/command/check.py b/command/check.py
index d164f3f527..7d56dfcf40 100644
--- a/command/check.py
+++ b/command/check.py
@@ -72,7 +72,7 @@ def run(self):
 
         # let's raise an error in strict mode, if we have at least
         # one warning
-        if self.strict and self._warnings > 1:
+        if self.strict and self._warnings > 0:
             raise DistutilsSetupError('Please correct your package.')
 
     def check_metadata(self):
diff --git a/tests/test_check.py b/tests/test_check.py
index 5e0c453140..372bae367b 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -72,17 +72,16 @@ def test_check_restructuredtext(self):
         self.assertEquals(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
-        cmd = check(dist)
-        cmd.initialize_options()
-        cmd.strict = 1
-        cmd.ensure_finalized()
-        self.assertRaises(DistutilsSetupError, cmd.run)
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': broken_rest}
+        self.assertRaises(DistutilsSetupError, self._run, metadata,
+                          **{'strict': 1, 'restructuredtext': 1})
 
         # and non-broken rest
-        rest = 'title\n=====\n\ntest'
-        pkg_info, dist = self.create_dist(long_description=rest)
-        cmd = check(dist)
-        cmd.check_restructuredtext()
+        metadata['long_description'] = 'title\n=====\n\ntest'
+        cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEquals(cmd._warnings, 0)
 
     def test_check_all(self):

From a97cd0dee2cd722b7036319ce0aab8d03951f3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 17 Apr 2009 14:34:49 +0000
Subject: [PATCH 2243/8469] Merged revisions 71674 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71674 | tarek.ziade | 2009-04-17 16:29:56 +0200 (Fri, 17 Apr 2009) | 1 line

  DistutilsSetupError was not raised when one single warning occured
........
---
 command/check.py    |  2 +-
 tests/test_check.py | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/command/check.py b/command/check.py
index 5dd73b07af..9a8fca1d5f 100644
--- a/command/check.py
+++ b/command/check.py
@@ -73,7 +73,7 @@ def run(self):
 
         # let's raise an error in strict mode, if we have at least
         # one warning
-        if self.strict and self._warnings > 1:
+        if self.strict and self._warnings > 0:
             raise DistutilsSetupError('Please correct your package.')
 
     def check_metadata(self):
diff --git a/tests/test_check.py b/tests/test_check.py
index 5e0c453140..372bae367b 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -72,17 +72,16 @@ def test_check_restructuredtext(self):
         self.assertEquals(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
-        cmd = check(dist)
-        cmd.initialize_options()
-        cmd.strict = 1
-        cmd.ensure_finalized()
-        self.assertRaises(DistutilsSetupError, cmd.run)
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': broken_rest}
+        self.assertRaises(DistutilsSetupError, self._run, metadata,
+                          **{'strict': 1, 'restructuredtext': 1})
 
         # and non-broken rest
-        rest = 'title\n=====\n\ntest'
-        pkg_info, dist = self.create_dist(long_description=rest)
-        cmd = check(dist)
-        cmd.check_restructuredtext()
+        metadata['long_description'] = 'title\n=====\n\ntest'
+        cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEquals(cmd._warnings, 0)
 
     def test_check_all(self):

From 9e39129c58b8b48972a4b776ba7b10ed80107a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 20 Apr 2009 07:53:55 +0000
Subject: [PATCH 2244/8469] #5795 sysconfig._config_vars was shadowed in
 tearDown

---
 tests/test_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index f27c452404..29be0cfd2d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -18,7 +18,8 @@
 from distutils.util import rfc822_escape
 
 from distutils import util # used to patch _environ_checked
-from distutils.sysconfig import get_config_vars, _config_vars
+from distutils.sysconfig import get_config_vars
+from distutils import sysconfig
 
 class utilTestCase(unittest.TestCase):
 
@@ -32,7 +33,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        self._config_vars = copy(_config_vars)
+        self._config_vars = copy(sysconfig._config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -58,7 +59,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
-        _config_vars = copy(self._config_vars)
+        sysconfig._config_vars = copy(self._config_vars)
 
     def _set_uname(self, uname):
         self._uname = uname

From e5374224727a94148777aeea1ff7d35d540e7e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 20 Apr 2009 10:33:47 +0000
Subject: [PATCH 2245/8469] making BuildWinInstTestCase silent in case
 bdist_wininst is not run under win32

---
 tests/test_bdist_wininst.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index d851d6c799..f2cb4fdeba 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -5,6 +5,7 @@
 from distutils.tests import support
 
 class BuildWinInstTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
                            unittest.TestCase):
 
     def test_get_exe_bytes(self):

From 39d9889757fcefa8fda44500a0ee02a72f9d5cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 20 Apr 2009 12:18:08 +0000
Subject: [PATCH 2246/8469] Merged revisions 71758 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71758 | tarek.ziade | 2009-04-20 09:53:55 +0200 (Mon, 20 Apr 2009) | 1 line

  #5795 sysconfig._config_vars was shadowed in tearDown
........
---
 tests/test_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index f27c452404..29be0cfd2d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -18,7 +18,8 @@
 from distutils.util import rfc822_escape
 
 from distutils import util # used to patch _environ_checked
-from distutils.sysconfig import get_config_vars, _config_vars
+from distutils.sysconfig import get_config_vars
+from distutils import sysconfig
 
 class utilTestCase(unittest.TestCase):
 
@@ -32,7 +33,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        self._config_vars = copy(_config_vars)
+        self._config_vars = copy(sysconfig._config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -58,7 +59,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
-        _config_vars = copy(self._config_vars)
+        sysconfig._config_vars = copy(self._config_vars)
 
     def _set_uname(self, uname):
         self._uname = uname

From a7d4678492b113544483d4e93a6e6cdca002f56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 20 Apr 2009 12:37:58 +0000
Subject: [PATCH 2247/8469] Merged revisions 71759 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71759 | tarek.ziade | 2009-04-20 12:33:47 +0200 (Mon, 20 Apr 2009) | 1 line

  making BuildWinInstTestCase silent in case bdist_wininst is not run under win32
........
---
 tests/test_bdist_wininst.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index d851d6c799..f2cb4fdeba 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -5,6 +5,7 @@
 from distutils.tests import support
 
 class BuildWinInstTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
                            unittest.TestCase):
 
     def test_get_exe_bytes(self):

From 5717e2c0f80872e578d6292da94e0540063bc312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 20 Apr 2009 12:48:47 +0000
Subject: [PATCH 2248/8469] Merged revisions 71759 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71759 | tarek.ziade | 2009-04-20 12:33:47 +0200 (Mon, 20 Apr 2009) | 1 line

  making BuildWinInstTestCase silent in case bdist_wininst is not run under win32
........
---
 tests/test_bdist_wininst.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index de6601fbb7..85aa02a286 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -7,6 +7,7 @@
 from distutils.tests import support
 
 class BuildWinInstTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
                            unittest.TestCase):
 
     def test_get_exe_bytes(self):

From 23ac9a3f5d25ac86966a339921a3fd032b1eb02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 25 Apr 2009 12:38:08 +0000
Subject: [PATCH 2249/8469] Issue #4951: Fixed failure in test_httpservers

---
 tests/test_util.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 29be0cfd2d..348933e901 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -29,7 +29,7 @@ def setUp(self):
         self.platform = sys.platform
         self.version = sys.version
         self.sep = os.sep
-        self.environ = os.environ
+        self.environ = dict(os.environ)
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
@@ -51,7 +51,10 @@ def tearDown(self):
         sys.platform = self.platform
         sys.version = self.version
         os.sep = self.sep
-        os.environ = self.environ
+        for k, v in self.environ.items():
+            os.environ[k] = v
+        for k in set(os.environ) - set(self.environ):
+            del os.environ[k]
         os.path.join = self.join
         os.path.isabs = self.isabs
         os.path.splitdrive = self.splitdrive

From 53d92cb18d49ee06a6c23a299d97c06c2442566d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 25 Apr 2009 12:39:56 +0000
Subject: [PATCH 2250/8469] Merged revisions 71878 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71878 | tarek.ziade | 2009-04-25 14:38:08 +0200 (Sat, 25 Apr 2009) | 1 line

  Issue #4951: Fixed failure in test_httpservers
........
---
 tests/test_util.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 29be0cfd2d..348933e901 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -29,7 +29,7 @@ def setUp(self):
         self.platform = sys.platform
         self.version = sys.version
         self.sep = os.sep
-        self.environ = os.environ
+        self.environ = dict(os.environ)
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
@@ -51,7 +51,10 @@ def tearDown(self):
         sys.platform = self.platform
         sys.version = self.version
         os.sep = self.sep
-        os.environ = self.environ
+        for k, v in self.environ.items():
+            os.environ[k] = v
+        for k in set(os.environ) - set(self.environ):
+            del os.environ[k]
         os.path.join = self.join
         os.path.isabs = self.isabs
         os.path.splitdrive = self.splitdrive

From 5b4daec209610504336618f33489cec401a6850f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 25 Apr 2009 12:51:59 +0000
Subject: [PATCH 2251/8469] #5810: Fixed Distutils test_build_scripts

---
 tests/test_build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 2acfab828e..b55eb5857b 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -90,7 +90,7 @@ def test_version_int(self):
         # On linux-g++-32 with command line `./configure --enable-ipv6
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
-        old = sysconfig._config_vars.get('VERSION')
+        old = sysconfig.get_config_vars().get('VERSION')
         sysconfig._config_vars['VERSION'] = 4
         try:
             cmd.run()

From e557c16ec08bb6927410f65cf813ad20293859d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 25 Apr 2009 12:53:56 +0000
Subject: [PATCH 2252/8469] Merged revisions 71884 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71884 | tarek.ziade | 2009-04-25 14:51:59 +0200 (Sat, 25 Apr 2009) | 1 line

  #5810: Fixed Distutils test_build_scripts
........
---
 tests/test_build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 2acfab828e..b55eb5857b 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -90,7 +90,7 @@ def test_version_int(self):
         # On linux-g++-32 with command line `./configure --enable-ipv6
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
-        old = sysconfig._config_vars.get('VERSION')
+        old = sysconfig.get_config_vars().get('VERSION')
         sysconfig._config_vars['VERSION'] = 4
         try:
             cmd.run()

From 3967ecc4455a2662822d000fc243a5bc56ca105a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 25 Apr 2009 12:55:56 +0000
Subject: [PATCH 2253/8469] Merged revisions 71884 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71884 | tarek.ziade | 2009-04-25 14:51:59 +0200 (Sat, 25 Apr 2009) | 1 line

  #5810: Fixed Distutils test_build_scripts
........
---
 tests/test_build_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 2acfab828e..b55eb5857b 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -90,7 +90,7 @@ def test_version_int(self):
         # On linux-g++-32 with command line `./configure --enable-ipv6
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
-        old = sysconfig._config_vars.get('VERSION')
+        old = sysconfig.get_config_vars().get('VERSION')
         sysconfig._config_vars['VERSION'] = 4
         try:
             cmd.run()

From 9bb7e34ba2331d21bbad5abe79c3ebac63946e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 29 Apr 2009 08:03:46 +0000
Subject: [PATCH 2254/8469] Fixed #5874 : distutils.tests.test_config_cmd is
 not locale-sensitive anymore

---
 tests/test_config_cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 1e6ebfacf5..bacf13a291 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -46,7 +46,7 @@ def test_search_cpp(self):
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
         self.assertEquals(match, 0)
 
-        match = cmd.search_cpp(pattern='command', body='// xxx')
+        match = cmd.search_cpp(pattern='_configtest', body='// xxx')
         self.assertEquals(match, 1)
 
     def test_finalize_options(self):

From 85120c6b47d6f8ccd1eb1e64a4308f08f1b4e517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 29 Apr 2009 08:07:44 +0000
Subject: [PATCH 2255/8469] Merged revisions 72094 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72094 | tarek.ziade | 2009-04-29 10:03:46 +0200 (Wed, 29 Apr 2009) | 1 line

  Fixed #5874 : distutils.tests.test_config_cmd is not locale-sensitive anymore
........
---
 tests/test_config_cmd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 1e6ebfacf5..bacf13a291 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -46,7 +46,7 @@ def test_search_cpp(self):
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
         self.assertEquals(match, 0)
 
-        match = cmd.search_cpp(pattern='command', body='// xxx')
+        match = cmd.search_cpp(pattern='_configtest', body='// xxx')
         self.assertEquals(match, 1)
 
     def test_finalize_options(self):

From 534e308892506dae6bf5aedd724dcbe975ed1149 Mon Sep 17 00:00:00 2001
From: Steven Bethard <steven.bethard@gmail.com>
Date: Tue, 5 May 2009 01:31:22 +0000
Subject: [PATCH 2256/8469] Update bdist_msi so that the generated MSIs for
 pure Python modules can install to any version of Python, like the generated
 EXEs from bdist_wininst. (Previously, you had to create a new MSI for each
 version of Python.)

---
 command/bdist_msi.py | 237 +++++++++++++++++++++++++++++--------------
 1 file changed, 162 insertions(+), 75 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f94d9579d2..18bddeb483 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -117,6 +117,12 @@ class bdist_msi (Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    all_versions = ['2.0', '2.1', '2.2', '2.3', '2.4',
+                    '2.5', '2.6', '2.7', '2.8', '2.9',
+                    '3.0', '3.1', '3.2', '3.3', '3.4',
+                    '3.5', '3.6', '3.7', '3.8', '3.9']
+    other_version = 'X'
+
     def initialize_options (self):
         self.bdist_dir = None
         self.plat_name = None
@@ -128,6 +134,7 @@ def initialize_options (self):
         self.skip_build = 0
         self.install_script = None
         self.pre_install_script = None
+        self.versions = None
 
     def finalize_options (self):
         if self.bdist_dir is None:
@@ -135,13 +142,14 @@ def finalize_options (self):
             self.bdist_dir = os.path.join(bdist_base, 'msi')
         short_version = get_python_version()
         if self.target_version:
+            self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError, \
                       "target version can only be %s, or the '--skip_build'" \
                       " option must be specified" % (short_version,)
         else:
-            self.target_version = short_version
+            self.versions = list(self.all_versions)
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
@@ -223,8 +231,11 @@ def run (self):
         # Prefix ProductName with Python x.y, so that
         # it sorts together with the other Python packages
         # in Add-Remove-Programs (APR)
-        product_name = "Python %s %s" % (self.target_version,
-                       self.distribution.get_fullname())
+        fullname = self.distribution.get_fullname()
+        if self.target_version:
+            product_name = "Python %s %s" % (self.target_version, fullname)
+        else:
+            product_name = "Python %s" % (fullname)
         self.db = msilib.init_database(installer_name, schema,
                 product_name, msilib.gen_uuid(),
                 sversion, author)
@@ -245,7 +256,8 @@ def run (self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            self.distribution.dist_files.append(('bdist_msi', self.target_version, fullname))
+            tup = 'bdist_msi', self.target_version or 'any', fullname
+            self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
@@ -253,65 +265,121 @@ def run (self):
     def add_files(self):
         db = self.db
         cab = msilib.CAB("distfiles")
-        f = Feature(db, "default", "Default Feature", "Everything", 1, directory="TARGETDIR")
-        f.set_current()
         rootdir = os.path.abspath(self.bdist_dir)
+
         root = Directory(db, cab, None, rootdir, "TARGETDIR", "SourceDir")
+        f = Feature(db, "Python", "Python", "Everything",
+                    0, 1, directory="TARGETDIR")
+
+        items = [(f, root, '')]
+        for version in self.versions + [self.other_version]:
+            target = "TARGETDIR" + version
+            name = default = "Python" + version
+            desc = "Everything"
+            if version is self.other_version:
+                title = "Python from another location"
+                level = 2
+            else:
+                title = "Python %s from registry" % version
+                level = 1
+            f = Feature(db, name, title, desc, 1, level, directory=target)
+            dir = Directory(db, cab, root, rootdir, target, default)
+            items.append((f, dir, version))
         db.Commit()
-        todo = [root]
-        while todo:
-            dir = todo.pop()
-            for file in os.listdir(dir.absolute):
-                afile = os.path.join(dir.absolute, file)
-                if os.path.isdir(afile):
-                    newdir = Directory(db, cab, dir, file, file, "%s|%s" % (dir.make_short(file), file))
-                    todo.append(newdir)
-                else:
-                    key = dir.add_file(file)
-                    if file==self.install_script:
-                        if self.install_script_key:
-                            raise DistutilsOptionError, "Multiple files with name %s" % file
-                        self.install_script_key = '[#%s]' % key
+
+        seen = {}
+        for feature, dir, version in items:
+            todo = [dir]
+            while todo:
+                dir = todo.pop()
+                for file in os.listdir(dir.absolute):
+                    afile = os.path.join(dir.absolute, file)
+                    if os.path.isdir(afile):
+                        short = "%s|%s" % (dir.make_short(file), file)
+                        default = file + version
+                        newdir = Directory(db, cab, dir, file, default, short)
+                        todo.append(newdir)
+                    else:
+                        if not dir.component:
+                            dir.start_component(dir.logical, feature, 0)
+                        if afile not in seen:
+                            key = seen[afile] = dir.add_file(file)
+                            if file==self.install_script:
+                                if self.install_script_key:
+                                    raise DistutilsOptionError(
+                                          "Multiple files with name %s" % file)
+                                self.install_script_key = '[#%s]' % key
+                        else:
+                            key = seen[afile]
+                            add_data(self.db, "DuplicateFile",
+                                [(key + version, dir.component, key, None, dir.logical)])
+
 
         cab.commit(db)
 
     def add_find_python(self):
         """Adds code to the installer to compute the location of Python.
-        Properties PYTHON.MACHINE, PYTHON.USER, PYTHONDIR and PYTHON will be set
-        in both the execute and UI sequences; PYTHONDIR will be set from
-        PYTHON.USER if defined, else from PYTHON.MACHINE.
-        PYTHON is PYTHONDIR\python.exe"""
-        install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version
-        add_data(self.db, "RegLocator",
-                [("python.machine", 2, install_path, None, 2),
-                 ("python.user", 1, install_path, None, 2)])
-        add_data(self.db, "AppSearch",
-                [("PYTHON.MACHINE", "python.machine"),
-                 ("PYTHON.USER", "python.user")])
-        add_data(self.db, "CustomAction",
-                [("PythonFromMachine", 51+256, "PYTHONDIR", "[PYTHON.MACHINE]"),
-                 ("PythonFromUser", 51+256, "PYTHONDIR", "[PYTHON.USER]"),
-                 ("PythonExe", 51+256, "PYTHON", "[PYTHONDIR]\\python.exe"),
-                 ("InitialTargetDir", 51+256, "TARGETDIR", "[PYTHONDIR]")])
-        add_data(self.db, "InstallExecuteSequence",
-                [("PythonFromMachine", "PYTHON.MACHINE", 401),
-                 ("PythonFromUser", "PYTHON.USER", 402),
-                 ("PythonExe", None, 403),
-                 ("InitialTargetDir", 'TARGETDIR=""', 404),
-                ])
-        add_data(self.db, "InstallUISequence",
-                [("PythonFromMachine", "PYTHON.MACHINE", 401),
-                 ("PythonFromUser", "PYTHON.USER", 402),
-                 ("PythonExe", None, 403),
-                 ("InitialTargetDir", 'TARGETDIR=""', 404),
-                ])
 
-    def add_scripts(self):
-        if self.install_script:
+        Properties PYTHON.MACHINE.X.Y and PYTHON.USER.X.Y will be set from the
+        registry for each version of Python.
+
+        Properties TARGETDIRX.Y will be set from PYTHON.USER.X.Y if defined,
+        else from PYTHON.MACHINE.X.Y.
+
+        Properties PYTHONX.Y will be set to TARGETDIRX.Y\\python.exe"""
+
+        start = 402
+        for ver in self.versions:
+            install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % ver
+            machine_reg = "python.machine." + ver
+            user_reg = "python.user." + ver
+            machine_prop = "PYTHON.MACHINE." + ver
+            user_prop = "PYTHON.USER." + ver
+            machine_action = "PythonFromMachine" + ver
+            user_action = "PythonFromUser" + ver
+            exe_action = "PythonExe" + ver
+            target_dir_prop = "TARGETDIR" + ver
+            exe_prop = "PYTHON" + ver
+            add_data(self.db, "RegLocator",
+                    [(machine_reg, 2, install_path, None, 2),
+                     (user_reg, 1, install_path, None, 2)])
+            add_data(self.db, "AppSearch",
+                    [(machine_prop, machine_reg),
+                     (user_prop, user_reg)])
             add_data(self.db, "CustomAction",
-                    [("install_script", 50, "PYTHON", self.install_script_key)])
+                    [(machine_action, 51+256, target_dir_prop, "[" + machine_prop + "]"),
+                     (user_action, 51+256, target_dir_prop, "[" + user_prop + "]"),
+                     (exe_action, 51+256, exe_prop, "[" + target_dir_prop + "]\\python.exe"),
+                    ])
             add_data(self.db, "InstallExecuteSequence",
-                    [("install_script", "NOT Installed", 6800)])
+                    [(machine_action, machine_prop, start),
+                     (user_action, user_prop, start + 1),
+                     (exe_action, None, start + 2),
+                    ])
+            add_data(self.db, "InstallUISequence",
+                    [(machine_action, machine_prop, start),
+                     (user_action, user_prop, start + 1),
+                     (exe_action, None, start + 2),
+                    ])
+            add_data(self.db, "Condition",
+                    [("Python" + ver, 0, "NOT TARGETDIR" + ver)])
+            start += 4
+            assert start < 500
+
+    def add_scripts(self):
+        if self.install_script:
+            start = 6800
+            for ver in self.versions + [self.other_version]:
+                install_action = "install_script." + ver
+                exe_prop = "PYTHON" + ver
+                add_data(self.db, "CustomAction",
+                        [(install_action, 50, exe_prop, self.install_script_key)])
+                add_data(self.db, "InstallExecuteSequence",
+                        [(install_action, "&Python%s=3" % ver, start)])
+                start += 1
+        # XXX pre-install scripts are currently refused in finalize_options()
+        #     but if this feature is completed, it will also need to add
+        #     entries for each version as the above code does
         if self.pre_install_script:
             scriptfn = os.path.join(self.bdist_dir, "preinstall.bat")
             f = open(scriptfn, "w")
@@ -375,7 +443,7 @@ def add_ui(self):
                  [("PrepareDlg", "Not Privileged or Windows9x or Installed", 140),
                   ("WhichUsersDlg", "Privileged and not Windows9x and not Installed", 141),
                   # In the user interface, assume all-users installation if privileged.
-                  ("SelectDirectoryDlg", "Not Installed", 1230),
+                  ("SelectFeaturesDlg", "Not Installed", 1230),
                   # XXX no support for resume installations yet
                   #("ResumeDlg", "Installed AND (RESUME OR Preselected)", 1240),
                   ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
@@ -498,33 +566,49 @@ def add_ui(self):
         c.event("SpawnDialog", "CancelDlg")
 
         #####################################################################
-        # Target directory selection
-        seldlg = PyDialog(db, "SelectDirectoryDlg", x, y, w, h, modal, title,
+        # Feature (Python directory) selection
+        seldlg = PyDialog(db, "SelectFeaturesDlg", x, y, w, h, modal, title,
                         "Next", "Next", "Cancel")
-        seldlg.title("Select Destination Directory")
+        seldlg.title("Select Python Installations")
 
-        version = sys.version[:3]+" "
-        seldlg.text("Hint", 15, 30, 300, 40, 3,
-                "The destination directory should contain a Python %sinstallation" % version)
+        seldlg.text("Hint", 15, 30, 300, 20, 3,
+                    "Select the Python locations where %s should be installed."
+                    % self.distribution.get_fullname())
 
         seldlg.back("< Back", None, active=0)
         c = seldlg.next("Next >", "Cancel")
-        c.event("SetTargetPath", "TARGETDIR", ordering=1)
-        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
-        c.event("EndDialog", "Return", ordering=3)
-
-        c = seldlg.cancel("Cancel", "DirectoryCombo")
+        order = 1
+        c.event("[TARGETDIR]", "[SourceDir]", ordering=order)
+        for version in self.versions + [self.other_version]:
+            order += 1
+            c.event("[TARGETDIR]", "[TARGETDIR%s]" % version,
+                    "FEATURE_SELECTED AND &Python%s=3" % version,
+                    ordering=order)
+        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=order + 1)
+        c.event("EndDialog", "Return", ordering=order + 2)
+        c = seldlg.cancel("Cancel", "Features")
         c.event("SpawnDialog", "CancelDlg")
 
-        seldlg.control("DirectoryCombo", "DirectoryCombo", 15, 70, 272, 80, 393219,
-                       "TARGETDIR", None, "DirectoryList", None)
-        seldlg.control("DirectoryList", "DirectoryList", 15, 90, 308, 136, 3, "TARGETDIR",
-                       None, "PathEdit", None)
-        seldlg.control("PathEdit", "PathEdit", 15, 230, 306, 16, 3, "TARGETDIR", None, "Next", None)
-        c = seldlg.pushbutton("Up", 306, 70, 18, 18, 3, "Up", None)
-        c.event("DirectoryListUp", "0")
-        c = seldlg.pushbutton("NewDir", 324, 70, 30, 18, 3, "New", None)
-        c.event("DirectoryListNew", "0")
+        c = seldlg.control("Features", "SelectionTree", 15, 60, 300, 120, 3,
+                           "FEATURE", None, "PathEdit", None)
+        c.event("[FEATURE_SELECTED]", "1")
+        ver = self.other_version
+        install_other_cond = "FEATURE_SELECTED AND &Python%s=3" % ver
+        dont_install_other_cond = "FEATURE_SELECTED AND &Python%s<>3" % ver
+
+        c = seldlg.text("Other", 15, 200, 300, 15, 3,
+                        "Provide an alternate Python location")
+        c.condition("Enable", install_other_cond)
+        c.condition("Show", install_other_cond)
+        c.condition("Disable", dont_install_other_cond)
+        c.condition("Hide", dont_install_other_cond)
+
+        c = seldlg.control("PathEdit", "PathEdit", 15, 215, 300, 16, 1,
+                           "TARGETDIR" + ver, None, "Next", None)
+        c.condition("Enable", install_other_cond)
+        c.condition("Show", install_other_cond)
+        c.condition("Disable", dont_install_other_cond)
+        c.condition("Hide", dont_install_other_cond)
 
         #####################################################################
         # Disk cost
@@ -640,7 +724,10 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
-        base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
-                                        self.target_version)
+        if self.target_version:
+            base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
+                                            self.target_version)
+        else:
+            base_name = "%s.%s.msi" % (fullname, self.plat_name)
         installer_name = os.path.join(self.dist_dir, base_name)
         return installer_name

From f70dabd395a2452cafc0e2a526070ed71b8ea7bd Mon Sep 17 00:00:00 2001
From: Steven Bethard <steven.bethard@gmail.com>
Date: Tue, 5 May 2009 02:22:38 +0000
Subject: [PATCH 2257/8469] Merged revisions 72306 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72306 | steven.bethard | 2009-05-04 18:31:22 -0700 (Mon, 04 May 2009) | 1 line

  Update bdist_msi so that the generated MSIs for pure Python modules can install to any version of Python, like the generated EXEs from bdist_wininst. (Previously, you had to create a new MSI for each version of Python.)
........
---
 command/bdist_msi.py | 240 +++++++++++++++++++++++++++++--------------
 1 file changed, 163 insertions(+), 77 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index aab89cd609..ffd668eb0e 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2005, 2006 Martin v. Löwis
+# Copyright (C) 2005, 2006 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst
@@ -117,6 +117,12 @@ class bdist_msi(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    all_versions = ['2.0', '2.1', '2.2', '2.3', '2.4',
+                    '2.5', '2.6', '2.7', '2.8', '2.9',
+                    '3.0', '3.1', '3.2', '3.3', '3.4',
+                    '3.5', '3.6', '3.7', '3.8', '3.9']
+    other_version = 'X'
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
@@ -128,6 +134,7 @@ def initialize_options(self):
         self.skip_build = 0
         self.install_script = None
         self.pre_install_script = None
+        self.versions = None
 
     def finalize_options(self):
         if self.bdist_dir is None:
@@ -135,13 +142,14 @@ def finalize_options(self):
             self.bdist_dir = os.path.join(bdist_base, 'msi')
         short_version = get_python_version()
         if self.target_version:
+            self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError(
                       "target version can only be %s, or the '--skip_build'"
                       " option must be specified" % (short_version,))
         else:
-            self.target_version = short_version
+            self.versions = list(self.all_versions)
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
@@ -222,8 +230,11 @@ def run(self):
         # Prefix ProductName with Python x.y, so that
         # it sorts together with the other Python packages
         # in Add-Remove-Programs (APR)
-        product_name = "Python %s %s" % (self.target_version,
-                       self.distribution.get_fullname())
+        fullname = self.distribution.get_fullname()
+        if self.target_version:
+            product_name = "Python %s %s" % (self.target_version, fullname)
+        else:
+            product_name = "Python %s" % (fullname)
         self.db = msilib.init_database(installer_name, schema,
                 product_name, msilib.gen_uuid(),
                 sversion, author)
@@ -244,7 +255,8 @@ def run(self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            self.distribution.dist_files.append(('bdist_msi', self.target_version, fullname))
+            tup = 'bdist_msi', self.target_version or 'any', fullname
+            self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
@@ -252,66 +264,121 @@ def run(self):
     def add_files(self):
         db = self.db
         cab = msilib.CAB("distfiles")
-        f = Feature(db, "default", "Default Feature", "Everything", 1, directory="TARGETDIR")
-        f.set_current()
         rootdir = os.path.abspath(self.bdist_dir)
+
         root = Directory(db, cab, None, rootdir, "TARGETDIR", "SourceDir")
+        f = Feature(db, "Python", "Python", "Everything",
+                    0, 1, directory="TARGETDIR")
+
+        items = [(f, root, '')]
+        for version in self.versions + [self.other_version]:
+            target = "TARGETDIR" + version
+            name = default = "Python" + version
+            desc = "Everything"
+            if version is self.other_version:
+                title = "Python from another location"
+                level = 2
+            else:
+                title = "Python %s from registry" % version
+                level = 1
+            f = Feature(db, name, title, desc, 1, level, directory=target)
+            dir = Directory(db, cab, root, rootdir, target, default)
+            items.append((f, dir, version))
         db.Commit()
-        todo = [root]
-        while todo:
-            dir = todo.pop()
-            for file in os.listdir(dir.absolute):
-                afile = os.path.join(dir.absolute, file)
-                if os.path.isdir(afile):
-                    newdir = Directory(db, cab, dir, file, file, "%s|%s" % (dir.make_short(file), file))
-                    todo.append(newdir)
-                else:
-                    key = dir.add_file(file)
-                    if file==self.install_script:
-                        if self.install_script_key:
-                            raise DistutilsOptionError(
-                                  "Multiple files with name %s" % file)
-                        self.install_script_key = '[#%s]' % key
+
+        seen = {}
+        for feature, dir, version in items:
+            todo = [dir]
+            while todo:
+                dir = todo.pop()
+                for file in os.listdir(dir.absolute):
+                    afile = os.path.join(dir.absolute, file)
+                    if os.path.isdir(afile):
+                        short = "%s|%s" % (dir.make_short(file), file)
+                        default = file + version
+                        newdir = Directory(db, cab, dir, file, default, short)
+                        todo.append(newdir)
+                    else:
+                        if not dir.component:
+                            dir.start_component(dir.logical, feature, 0)
+                        if afile not in seen:
+                            key = seen[afile] = dir.add_file(file)
+                            if file==self.install_script:
+                                if self.install_script_key:
+                                    raise DistutilsOptionError(
+                                          "Multiple files with name %s" % file)
+                                self.install_script_key = '[#%s]' % key
+                        else:
+                            key = seen[afile]
+                            add_data(self.db, "DuplicateFile",
+                                [(key + version, dir.component, key, None, dir.logical)])
+
 
         cab.commit(db)
 
     def add_find_python(self):
         """Adds code to the installer to compute the location of Python.
-        Properties PYTHON.MACHINE, PYTHON.USER, PYTHONDIR and PYTHON will be set
-        in both the execute and UI sequences; PYTHONDIR will be set from
-        PYTHON.USER if defined, else from PYTHON.MACHINE.
-        PYTHON is PYTHONDIR\python.exe"""
-        install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version
-        add_data(self.db, "RegLocator",
-                [("python.machine", 2, install_path, None, 2),
-                 ("python.user", 1, install_path, None, 2)])
-        add_data(self.db, "AppSearch",
-                [("PYTHON.MACHINE", "python.machine"),
-                 ("PYTHON.USER", "python.user")])
-        add_data(self.db, "CustomAction",
-                [("PythonFromMachine", 51+256, "PYTHONDIR", "[PYTHON.MACHINE]"),
-                 ("PythonFromUser", 51+256, "PYTHONDIR", "[PYTHON.USER]"),
-                 ("PythonExe", 51+256, "PYTHON", "[PYTHONDIR]\\python.exe"),
-                 ("InitialTargetDir", 51+256, "TARGETDIR", "[PYTHONDIR]")])
-        add_data(self.db, "InstallExecuteSequence",
-                [("PythonFromMachine", "PYTHON.MACHINE", 401),
-                 ("PythonFromUser", "PYTHON.USER", 402),
-                 ("PythonExe", None, 403),
-                 ("InitialTargetDir", 'TARGETDIR=""', 404),
-                ])
-        add_data(self.db, "InstallUISequence",
-                [("PythonFromMachine", "PYTHON.MACHINE", 401),
-                 ("PythonFromUser", "PYTHON.USER", 402),
-                 ("PythonExe", None, 403),
-                 ("InitialTargetDir", 'TARGETDIR=""', 404),
-                ])
 
-    def add_scripts(self):
-        if self.install_script:
+        Properties PYTHON.MACHINE.X.Y and PYTHON.USER.X.Y will be set from the
+        registry for each version of Python.
+
+        Properties TARGETDIRX.Y will be set from PYTHON.USER.X.Y if defined,
+        else from PYTHON.MACHINE.X.Y.
+
+        Properties PYTHONX.Y will be set to TARGETDIRX.Y\\python.exe"""
+
+        start = 402
+        for ver in self.versions:
+            install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % ver
+            machine_reg = "python.machine." + ver
+            user_reg = "python.user." + ver
+            machine_prop = "PYTHON.MACHINE." + ver
+            user_prop = "PYTHON.USER." + ver
+            machine_action = "PythonFromMachine" + ver
+            user_action = "PythonFromUser" + ver
+            exe_action = "PythonExe" + ver
+            target_dir_prop = "TARGETDIR" + ver
+            exe_prop = "PYTHON" + ver
+            add_data(self.db, "RegLocator",
+                    [(machine_reg, 2, install_path, None, 2),
+                     (user_reg, 1, install_path, None, 2)])
+            add_data(self.db, "AppSearch",
+                    [(machine_prop, machine_reg),
+                     (user_prop, user_reg)])
             add_data(self.db, "CustomAction",
-                    [("install_script", 50, "PYTHON", self.install_script_key)])
+                    [(machine_action, 51+256, target_dir_prop, "[" + machine_prop + "]"),
+                     (user_action, 51+256, target_dir_prop, "[" + user_prop + "]"),
+                     (exe_action, 51+256, exe_prop, "[" + target_dir_prop + "]\\python.exe"),
+                    ])
             add_data(self.db, "InstallExecuteSequence",
-                    [("install_script", "NOT Installed", 6800)])
+                    [(machine_action, machine_prop, start),
+                     (user_action, user_prop, start + 1),
+                     (exe_action, None, start + 2),
+                    ])
+            add_data(self.db, "InstallUISequence",
+                    [(machine_action, machine_prop, start),
+                     (user_action, user_prop, start + 1),
+                     (exe_action, None, start + 2),
+                    ])
+            add_data(self.db, "Condition",
+                    [("Python" + ver, 0, "NOT TARGETDIR" + ver)])
+            start += 4
+            assert start < 500
+
+    def add_scripts(self):
+        if self.install_script:
+            start = 6800
+            for ver in self.versions + [self.other_version]:
+                install_action = "install_script." + ver
+                exe_prop = "PYTHON" + ver
+                add_data(self.db, "CustomAction",
+                        [(install_action, 50, exe_prop, self.install_script_key)])
+                add_data(self.db, "InstallExecuteSequence",
+                        [(install_action, "&Python%s=3" % ver, start)])
+                start += 1
+        # XXX pre-install scripts are currently refused in finalize_options()
+        #     but if this feature is completed, it will also need to add
+        #     entries for each version as the above code does
         if self.pre_install_script:
             scriptfn = os.path.join(self.bdist_dir, "preinstall.bat")
             f = open(scriptfn, "w")
@@ -375,7 +442,7 @@ def add_ui(self):
                  [("PrepareDlg", "Not Privileged or Windows9x or Installed", 140),
                   ("WhichUsersDlg", "Privileged and not Windows9x and not Installed", 141),
                   # In the user interface, assume all-users installation if privileged.
-                  ("SelectDirectoryDlg", "Not Installed", 1230),
+                  ("SelectFeaturesDlg", "Not Installed", 1230),
                   # XXX no support for resume installations yet
                   #("ResumeDlg", "Installed AND (RESUME OR Preselected)", 1240),
                   ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
@@ -498,33 +565,49 @@ def add_ui(self):
         c.event("SpawnDialog", "CancelDlg")
 
         #####################################################################
-        # Target directory selection
-        seldlg = PyDialog(db, "SelectDirectoryDlg", x, y, w, h, modal, title,
+        # Feature (Python directory) selection
+        seldlg = PyDialog(db, "SelectFeaturesDlg", x, y, w, h, modal, title,
                         "Next", "Next", "Cancel")
-        seldlg.title("Select Destination Directory")
+        seldlg.title("Select Python Installations")
 
-        version = sys.version[:3]+" "
-        seldlg.text("Hint", 15, 30, 300, 40, 3,
-                "The destination directory should contain a Python %sinstallation" % version)
+        seldlg.text("Hint", 15, 30, 300, 20, 3,
+                    "Select the Python locations where %s should be installed."
+                    % self.distribution.get_fullname())
 
         seldlg.back("< Back", None, active=0)
         c = seldlg.next("Next >", "Cancel")
-        c.event("SetTargetPath", "TARGETDIR", ordering=1)
-        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
-        c.event("EndDialog", "Return", ordering=3)
-
-        c = seldlg.cancel("Cancel", "DirectoryCombo")
+        order = 1
+        c.event("[TARGETDIR]", "[SourceDir]", ordering=order)
+        for version in self.versions + [self.other_version]:
+            order += 1
+            c.event("[TARGETDIR]", "[TARGETDIR%s]" % version,
+                    "FEATURE_SELECTED AND &Python%s=3" % version,
+                    ordering=order)
+        c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=order + 1)
+        c.event("EndDialog", "Return", ordering=order + 2)
+        c = seldlg.cancel("Cancel", "Features")
         c.event("SpawnDialog", "CancelDlg")
 
-        seldlg.control("DirectoryCombo", "DirectoryCombo", 15, 70, 272, 80, 393219,
-                       "TARGETDIR", None, "DirectoryList", None)
-        seldlg.control("DirectoryList", "DirectoryList", 15, 90, 308, 136, 3, "TARGETDIR",
-                       None, "PathEdit", None)
-        seldlg.control("PathEdit", "PathEdit", 15, 230, 306, 16, 3, "TARGETDIR", None, "Next", None)
-        c = seldlg.pushbutton("Up", 306, 70, 18, 18, 3, "Up", None)
-        c.event("DirectoryListUp", "0")
-        c = seldlg.pushbutton("NewDir", 324, 70, 30, 18, 3, "New", None)
-        c.event("DirectoryListNew", "0")
+        c = seldlg.control("Features", "SelectionTree", 15, 60, 300, 120, 3,
+                           "FEATURE", None, "PathEdit", None)
+        c.event("[FEATURE_SELECTED]", "1")
+        ver = self.other_version
+        install_other_cond = "FEATURE_SELECTED AND &Python%s=3" % ver
+        dont_install_other_cond = "FEATURE_SELECTED AND &Python%s<>3" % ver
+
+        c = seldlg.text("Other", 15, 200, 300, 15, 3,
+                        "Provide an alternate Python location")
+        c.condition("Enable", install_other_cond)
+        c.condition("Show", install_other_cond)
+        c.condition("Disable", dont_install_other_cond)
+        c.condition("Hide", dont_install_other_cond)
+
+        c = seldlg.control("PathEdit", "PathEdit", 15, 215, 300, 16, 1,
+                           "TARGETDIR" + ver, None, "Next", None)
+        c.condition("Enable", install_other_cond)
+        c.condition("Show", install_other_cond)
+        c.condition("Disable", dont_install_other_cond)
+        c.condition("Hide", dont_install_other_cond)
 
         #####################################################################
         # Disk cost
@@ -640,7 +723,10 @@ def add_ui(self):
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
-        base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
-                                        self.target_version)
+        if self.target_version:
+            base_name = "%s.%s-py%s.msi" % (fullname, self.plat_name,
+                                            self.target_version)
+        else:
+            base_name = "%s.%s.msi" % (fullname, self.plat_name)
         installer_name = os.path.join(self.dist_dir, base_name)
         return installer_name

From 1cd9b19ad7991f6709ed553b2e752fd2d0b6d47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 07:17:52 +0000
Subject: [PATCH 2258/8469] Added a test and cleaned check_library_list to be
 ready to fix #5940

---
 command/build_clib.py    | 32 +++++++++++++--------------
 tests/test_build_clib.py | 47 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 tests/test_build_clib.py

diff --git a/command/build_clib.py b/command/build_clib.py
index fe921fb88b..1d8cd8c3fa 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -127,43 +127,41 @@ def run (self):
     # run()
 
 
-    def check_library_list (self, libraries):
-        """Ensure that the list of libraries (presumably provided as a
-           command option 'libraries') is valid, i.e. it is a list of
-           2-tuples, where the tuples are (library_name, build_info_dict).
-           Raise DistutilsSetupError if the structure is invalid anywhere;
-           just returns otherwise."""
+    def check_library_list(self, libraries):
+        """Ensure that the list of libraries is valid.
 
-        # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
-        # with only names changed to protect the innocent!
+        `library` is presumably provided as a command option 'libraries'.
+        This method checks that it is a list of 2-tuples, where the tuples
+        are (library_name, build_info_dict).
 
-        if type(libraries) is not ListType:
+        Raise DistutilsSetupError if the structure is invalid anywhere;
+        just returns otherwise.
+        """
+        if not isinstance(libraries, list):
             raise DistutilsSetupError, \
                   "'libraries' option must be a list of tuples"
 
         for lib in libraries:
-            if type(lib) is not TupleType and len(lib) != 2:
+            if not isinstance(lib, tuple) and len(lib) != 2:
                 raise DistutilsSetupError, \
                       "each element of 'libraries' must a 2-tuple"
 
-            if type(lib[0]) is not StringType:
+            name, build_info = lib
+
+            if not isinstance(name, str):
                 raise DistutilsSetupError, \
                       "first element of each tuple in 'libraries' " + \
                       "must be a string (the library name)"
-            if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
+            if '/' in name or (os.sep != '/' and os.sep in name):
                 raise DistutilsSetupError, \
                       ("bad library name '%s': " +
                        "may not contain directory separators") % \
                       lib[0]
 
-            if type(lib[1]) is not DictionaryType:
+            if not isinstance(build_info, dict):
                 raise DistutilsSetupError, \
                       "second element of each tuple in 'libraries' " + \
                       "must be a dictionary (build info)"
-        # for lib
-
-    # check_library_list ()
-
 
     def get_library_names (self):
         # Assume the library list is valid -- 'check_library_list()' is
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
new file mode 100644
index 0000000000..36c07b7953
--- /dev/null
+++ b/tests/test_build_clib.py
@@ -0,0 +1,47 @@
+"""Tests for distutils.command.build_clib."""
+import unittest
+
+from distutils.command.build_clib import build_clib
+from distutils.errors import DistutilsSetupError
+from distutils.tests import support
+
+class BuildCLibTestCase(support.TempdirManager,
+                        support.LoggingSilencer,
+                        unittest.TestCase):
+
+    def test_check_library_dist(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        # 'libraries' option must be a list
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list, 'foo')
+
+        # each element of 'libraries' must a 2-tuple
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          ['foo1', 'foo2'])
+
+        # first element of each tuple in 'libraries'
+        # must be a string (the library name)
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [(1, 'foo1'), ('name', 'foo2')])
+
+        # library name may not contain directory separators
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [('name', 'foo1'),
+                           ('another/name', 'foo2')])
+
+        # second element of each tuple must be a dictionary (build info)
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [('name', {}),
+                           ('another', 'foo2')])
+
+        # those work
+        libs = [('name', {}), ('name', {'ok': 'good'})]
+        cmd.check_library_list(libs)
+
+
+def test_suite():
+    return unittest.makeSuite(BuildCLibTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 0a4c48c5ff377d4d8e7e5ee1c151dace8b57ef83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 07:26:24 +0000
Subject: [PATCH 2259/8469] Fixed #5940:
 distutils.command.build_clib.check_library_list is doing the right checkings
 again

---
 command/build_clib.py    | 25 ++++++++++++---------
 tests/test_build_clib.py | 47 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 tests/test_build_clib.py

diff --git a/command/build_clib.py b/command/build_clib.py
index 34f4983689..258d7c10be 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -118,13 +118,15 @@ def run(self):
 
 
     def check_library_list(self, libraries):
-        """Ensure that the list of libraries (presumably provided as a
-           command option 'libraries') is valid, i.e. it is a list of
-           2-tuples, where the tuples are (library_name, build_info_dict).
-           Raise DistutilsSetupError if the structure is invalid anywhere;
-           just returns otherwise."""
-        # Yechh, blecch, ackk: this is ripped straight out of build_ext.py,
-        # with only names changed to protect the innocent!
+        """Ensure that the list of libraries is valid.
+
+        `library` is presumably provided as a command option 'libraries'.
+        This method checks that it is a list of 2-tuples, where the tuples
+        are (library_name, build_info_dict).
+
+        Raise DistutilsSetupError if the structure is invalid anywhere;
+        just returns otherwise.
+        """
         if not isinstance(libraries, list):
             raise DistutilsSetupError(
                   "'libraries' option must be a list of tuples")
@@ -134,15 +136,18 @@ def check_library_list(self, libraries):
                 raise DistutilsSetupError(
                       "each element of 'libraries' must a 2-tuple")
 
-            if isinstance(lib[0], str):
+            name, build_info = lib
+
+            if not isinstance(name, str):
                 raise DistutilsSetupError(
                       "first element of each tuple in 'libraries' "
                       "must be a string (the library name)")
-            if '/' in lib[0] or (os.sep != '/' and os.sep in lib[0]):
+
+            if '/' in name or (os.sep != '/' and os.sep in name):
                 raise DistutilsSetupError("bad library name '%s': "
                        "may not contain directory separators" % lib[0])
 
-            if not isinstance(lib[1], dict):
+            if not isinstance(build_info, dict):
                 raise DistutilsSetupError(
                       "second element of each tuple in 'libraries' "
                       "must be a dictionary (build info)")
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
new file mode 100644
index 0000000000..36c07b7953
--- /dev/null
+++ b/tests/test_build_clib.py
@@ -0,0 +1,47 @@
+"""Tests for distutils.command.build_clib."""
+import unittest
+
+from distutils.command.build_clib import build_clib
+from distutils.errors import DistutilsSetupError
+from distutils.tests import support
+
+class BuildCLibTestCase(support.TempdirManager,
+                        support.LoggingSilencer,
+                        unittest.TestCase):
+
+    def test_check_library_dist(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        # 'libraries' option must be a list
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list, 'foo')
+
+        # each element of 'libraries' must a 2-tuple
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          ['foo1', 'foo2'])
+
+        # first element of each tuple in 'libraries'
+        # must be a string (the library name)
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [(1, 'foo1'), ('name', 'foo2')])
+
+        # library name may not contain directory separators
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [('name', 'foo1'),
+                           ('another/name', 'foo2')])
+
+        # second element of each tuple must be a dictionary (build info)
+        self.assertRaises(DistutilsSetupError, cmd.check_library_list,
+                          [('name', {}),
+                           ('another', 'foo2')])
+
+        # those work
+        libs = [('name', {}), ('name', {'ok': 'good'})]
+        cmd.check_library_list(libs)
+
+
+def test_suite():
+    return unittest.makeSuite(BuildCLibTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 5c0bfa1ffda99f8f88c4f31360812dd8aa9633ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 07:41:53 +0000
Subject: [PATCH 2260/8469] pep8-fied build_clib module : it is now similar to
 the one in 3.x

---
 command/build_clib.py | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 1d8cd8c3fa..18415cfcf3 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -17,7 +17,6 @@
 # cut 'n paste.  Sigh.
 
 import os, string
-from types import *
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler
@@ -52,7 +51,7 @@ class build_clib (Command):
          "list available compilers", show_compilers),
         ]
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_clib = None
         self.build_temp = None
 
@@ -67,11 +66,8 @@ def initialize_options (self):
         self.force = 0
         self.compiler = None
 
-    # initialize_options()
-
-
-    def finalize_options (self):
 
+    def finalize_options(self):
         # This might be confusing: both build-clib and build-temp default
         # to build-temp as defined by the "build" command.  This is because
         # I think that C libraries are really just temporary build
@@ -97,11 +93,7 @@ def finalize_options (self):
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?
 
-    # finalize_options()
-
-
-    def run (self):
-
+    def run(self):
         if not self.libraries:
             return
 
@@ -124,8 +116,6 @@ def run (self):
 
         self.build_libraries(self.libraries)
 
-    # run()
-
 
     def check_library_list(self, libraries):
         """Ensure that the list of libraries is valid.
@@ -163,10 +153,9 @@ def check_library_list(self, libraries):
                       "second element of each tuple in 'libraries' " + \
                       "must be a dictionary (build info)"
 
-    def get_library_names (self):
+    def get_library_names(self):
         # Assume the library list is valid -- 'check_library_list()' is
         # called from 'finalize_options()', so it should be!
-
         if not self.libraries:
             return None
 
@@ -175,10 +164,8 @@ def get_library_names (self):
             lib_names.append(lib_name)
         return lib_names
 
-    # get_library_names ()
 
-
-    def get_source_files (self):
+    def get_source_files(self):
         self.check_library_list(self.libraries)
         filenames = []
         for (lib_name, build_info) in self.libraries:
@@ -191,13 +178,9 @@ def get_source_files (self):
                        "a list of source filenames") % lib_name
 
             filenames.extend(sources)
-
         return filenames
-    # get_source_files ()
-
 
     def build_libraries (self, libraries):
-
         for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')
             if sources is None or type(sources) not in (ListType, TupleType):
@@ -226,9 +209,3 @@ def build_libraries (self, libraries):
             self.compiler.create_static_lib(objects, lib_name,
                                             output_dir=self.build_clib,
                                             debug=self.debug)
-
-        # for libraries
-
-    # build_libraries ()
-
-# class build_lib

From d337edee8fe4fa9c4d9dbefa65c1829c97b231c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 08:05:47 +0000
Subject: [PATCH 2261/8469] more build_clib cleanup + test coverage

---
 command/build_clib.py    |  7 +++--
 tests/test_build_clib.py | 57 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 18415cfcf3..447ea94989 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -86,7 +86,7 @@ def finalize_options(self):
 
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type(self.include_dirs) is StringType:
+        if isinstance(self.include_dirs, str):
             self.include_dirs = string.split(self.include_dirs,
                                              os.pathsep)
 
@@ -170,8 +170,7 @@ def get_source_files(self):
         filenames = []
         for (lib_name, build_info) in self.libraries:
             sources = build_info.get('sources')
-            if (sources is None or
-                type(sources) not in (ListType, TupleType) ):
+            if sources is None or not isinstance(sources, (list, tuple)):
                 raise DistutilsSetupError, \
                       ("in 'libraries' option (library '%s'), "
                        "'sources' must be present and must be "
@@ -183,7 +182,7 @@ def get_source_files(self):
     def build_libraries (self, libraries):
         for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')
-            if sources is None or type(sources) not in (ListType, TupleType):
+            if sources is None or not isinstance(sources, (list, tuple)):
                 raise DistutilsSetupError, \
                       ("in 'libraries' option (library '%s'), " +
                        "'sources' must be present and must be " +
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 36c07b7953..7374c4956a 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -39,6 +39,63 @@ def test_check_library_dist(self):
         libs = [('name', {}), ('name', {'ok': 'good'})]
         cmd.check_library_list(libs)
 
+    def test_get_source_files(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        # "in 'libraries' option 'sources' must be present and must be
+        # a list of source filenames
+        cmd.libraries = [('name', {})]
+        self.assertRaises(DistutilsSetupError, cmd.get_source_files)
+
+        cmd.libraries = [('name', {'sources': 1})]
+        self.assertRaises(DistutilsSetupError, cmd.get_source_files)
+
+        cmd.libraries = [('name', {'sources': ['a', 'b']})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+
+        cmd.libraries = [('name', {'sources': ('a', 'b')})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+
+        cmd.libraries = [('name', {'sources': ('a', 'b')}),
+                         ('name2', {'sources': ['c', 'd']})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+
+    def test_build_libraries(self):
+
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+        class FakeCompiler:
+            def compile(*args, **kw):
+                pass
+            create_static_lib = compile
+
+        cmd.compiler = FakeCompiler()
+
+        # build_libraries is also doing a bit of typoe checking
+        lib = [('name', {'sources': 'notvalid'})]
+        self.assertRaises(DistutilsSetupError, cmd.build_libraries, lib)
+
+        lib = [('name', {'sources': list()})]
+        cmd.build_libraries(lib)
+
+        lib = [('name', {'sources': tuple()})]
+        cmd.build_libraries(lib)
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        cmd.include_dirs = 'one-dir'
+        cmd.finalize_options()
+        self.assertEquals(cmd.include_dirs, ['one-dir'])
+
+        cmd.include_dirs = None
+        cmd.finalize_options()
+        self.assertEquals(cmd.include_dirs, [])
+
+        cmd.distribution.libraries = 'WONTWORK'
+        self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)

From 822b9626452ce994033db5ae7af1139eaeb5ff68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 08:08:26 +0000
Subject: [PATCH 2262/8469] Merged revisions 72388 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72388 | tarek.ziade | 2009-05-06 10:05:47 +0200 (Wed, 06 May 2009) | 1 line

  more build_clib cleanup + test coverage
........
---
 tests/test_build_clib.py | 57 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 36c07b7953..7374c4956a 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -39,6 +39,63 @@ def test_check_library_dist(self):
         libs = [('name', {}), ('name', {'ok': 'good'})]
         cmd.check_library_list(libs)
 
+    def test_get_source_files(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        # "in 'libraries' option 'sources' must be present and must be
+        # a list of source filenames
+        cmd.libraries = [('name', {})]
+        self.assertRaises(DistutilsSetupError, cmd.get_source_files)
+
+        cmd.libraries = [('name', {'sources': 1})]
+        self.assertRaises(DistutilsSetupError, cmd.get_source_files)
+
+        cmd.libraries = [('name', {'sources': ['a', 'b']})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+
+        cmd.libraries = [('name', {'sources': ('a', 'b')})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+
+        cmd.libraries = [('name', {'sources': ('a', 'b')}),
+                         ('name2', {'sources': ['c', 'd']})]
+        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+
+    def test_build_libraries(self):
+
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+        class FakeCompiler:
+            def compile(*args, **kw):
+                pass
+            create_static_lib = compile
+
+        cmd.compiler = FakeCompiler()
+
+        # build_libraries is also doing a bit of typoe checking
+        lib = [('name', {'sources': 'notvalid'})]
+        self.assertRaises(DistutilsSetupError, cmd.build_libraries, lib)
+
+        lib = [('name', {'sources': list()})]
+        cmd.build_libraries(lib)
+
+        lib = [('name', {'sources': tuple()})]
+        cmd.build_libraries(lib)
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        cmd.include_dirs = 'one-dir'
+        cmd.finalize_options()
+        self.assertEquals(cmd.include_dirs, ['one-dir'])
+
+        cmd.include_dirs = None
+        cmd.finalize_options()
+        self.assertEquals(cmd.include_dirs, [])
+
+        cmd.distribution.libraries = 'WONTWORK'
+        self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)

From a990c6a1f3084b141a9be5772685e1a8b7498515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 6 May 2009 08:11:00 +0000
Subject: [PATCH 2263/8469] removed string.split usage

---
 command/build_clib.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 447ea94989..d475232bc3 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -16,7 +16,7 @@
 # two modules, mainly because a number of subtle details changed in the
 # cut 'n paste.  Sigh.
 
-import os, string
+import os
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler
@@ -87,8 +87,7 @@ def finalize_options(self):
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if isinstance(self.include_dirs, str):
-            self.include_dirs = string.split(self.include_dirs,
-                                             os.pathsep)
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # XXX same as for build_ext -- what about 'self.define' and
         # 'self.undef' ?

From 14c20a579282de3d0fc983b150630d1f2f5d7f99 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 May 2009 20:43:28 +0000
Subject: [PATCH 2264/8469] bump version to 3.1b1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c66806361a..80ccf6113d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1a2"
+__version__ = "3.1b1"
 #--end constants--

From 8bbedf87070ecfa92b99ef0a704eab780c15e3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 7 May 2009 21:13:02 +0000
Subject: [PATCH 2265/8469] removed remaining spaces

---
 command/build_clib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index d475232bc3..9545b27ad0 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -22,12 +22,12 @@
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
-def show_compilers ():
+def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
 
-class build_clib (Command):
+class build_clib(Command):
 
     description = "build C/C++ libraries used by Python extensions"
 
@@ -178,7 +178,7 @@ def get_source_files(self):
             filenames.extend(sources)
         return filenames
 
-    def build_libraries (self, libraries):
+    def build_libraries(self, libraries):
         for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')
             if sources is None or not isinstance(sources, (list, tuple)):

From afc36e0fa764d77b641b477a92f769fb225a4c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 7 May 2009 21:20:34 +0000
Subject: [PATCH 2266/8469] Fixed #5941: added ARFLAGS for the archiver
 command.

---
 sysconfig.py             | 10 +++++++---
 tests/test_build_clib.py | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/test_sysconfig.py  |  5 +++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 56cb861a6c..099e0586fd 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -165,9 +165,9 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO', 'AR')
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
 
         if 'CC' in os.environ:
             cc = os.environ['CC']
@@ -190,6 +190,10 @@ def customize_compiler(compiler):
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
         if 'AR' in os.environ:
             ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
+        else:
+            archiver = ar + ' ' + ar_flags
 
         cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
@@ -199,7 +203,7 @@ def customize_compiler(compiler):
             compiler_cxx=cxx,
             linker_so=ldshared,
             linker_exe=cc,
-            archiver=ar)
+            archiver=archiver)
 
         compiler.shared_lib_extension = so_ext
 
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 7374c4956a..3c6643f354 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -1,9 +1,12 @@
 """Tests for distutils.command.build_clib."""
 import unittest
+import os
+import sys
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
+from distutils.spawn import find_executable
 
 class BuildCLibTestCase(support.TempdirManager,
                         support.LoggingSilencer,
@@ -97,6 +100,43 @@ def test_finalize_options(self):
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
+    def test_run(self):
+        # can't test on windows
+        if sys.platform == 'win32':
+            return
+
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        foo_c = os.path.join(pkg_dir, 'foo.c')
+        self.write_file(foo_c, 'int main(void) { return 1;}')
+        cmd.libraries = [('foo', {'sources': [foo_c]})]
+
+        build_temp = os.path.join(pkg_dir, 'build')
+        os.mkdir(build_temp)
+        cmd.build_temp = build_temp
+        cmd.build_clib = build_temp
+
+        # before we run the command, we want to make sure
+        # all commands are present on the system
+        # by creating a compiler and checking its executables
+        from distutils.ccompiler import new_compiler
+        from distutils.sysconfig import customize_compiler
+
+        compiler = new_compiler()
+        customize_compiler(compiler)
+        for ccmd in compiler.executables.values():
+            if ccmd is None:
+                continue
+            if find_executable(ccmd[0]) is None:
+                return # can't test
+
+        # this should work
+        cmd.run()
+
+        # let's check the result
+        self.assert_('libfoo.a' in os.listdir(build_temp))
+
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index dd17eb347f..040dfcb6ad 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -49,7 +49,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        os.environ['AR'] = 'xxx'
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:
@@ -60,7 +61,7 @@ def set_executables(self, **kw):
 
         comp = compiler()
         sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'xxx')
+        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
 
 
 def test_suite():

From 40f8502c0bede251d25993361779f82b1ffe44db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 7 May 2009 21:24:43 +0000
Subject: [PATCH 2267/8469] Merged revisions 72445 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72445 | tarek.ziade | 2009-05-07 23:20:34 +0200 (Thu, 07 May 2009) | 1 line

  Fixed #5941: added ARFLAGS for the archiver command.
........
---
 sysconfig.py             | 10 +++++++---
 tests/test_build_clib.py | 40 ++++++++++++++++++++++++++++++++++++++++
 tests/test_sysconfig.py  |  5 +++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index fbeb45f8cc..223ff672b9 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -160,9 +160,9 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO', 'AR')
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
 
         if 'CC' in os.environ:
             cc = os.environ['CC']
@@ -185,6 +185,10 @@ def customize_compiler(compiler):
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
         if 'AR' in os.environ:
             ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
+        else:
+            archiver = ar + ' ' + ar_flags
 
         cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
@@ -194,7 +198,7 @@ def customize_compiler(compiler):
             compiler_cxx=cxx,
             linker_so=ldshared,
             linker_exe=cc,
-            archiver=ar)
+            archiver=archiver)
 
         compiler.shared_lib_extension = so_ext
 
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 7374c4956a..3c6643f354 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -1,9 +1,12 @@
 """Tests for distutils.command.build_clib."""
 import unittest
+import os
+import sys
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
+from distutils.spawn import find_executable
 
 class BuildCLibTestCase(support.TempdirManager,
                         support.LoggingSilencer,
@@ -97,6 +100,43 @@ def test_finalize_options(self):
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
+    def test_run(self):
+        # can't test on windows
+        if sys.platform == 'win32':
+            return
+
+        pkg_dir, dist = self.create_dist()
+        cmd = build_clib(dist)
+
+        foo_c = os.path.join(pkg_dir, 'foo.c')
+        self.write_file(foo_c, 'int main(void) { return 1;}')
+        cmd.libraries = [('foo', {'sources': [foo_c]})]
+
+        build_temp = os.path.join(pkg_dir, 'build')
+        os.mkdir(build_temp)
+        cmd.build_temp = build_temp
+        cmd.build_clib = build_temp
+
+        # before we run the command, we want to make sure
+        # all commands are present on the system
+        # by creating a compiler and checking its executables
+        from distutils.ccompiler import new_compiler
+        from distutils.sysconfig import customize_compiler
+
+        compiler = new_compiler()
+        customize_compiler(compiler)
+        for ccmd in compiler.executables.values():
+            if ccmd is None:
+                continue
+            if find_executable(ccmd[0]) is None:
+                return # can't test
+
+        # this should work
+        cmd.run()
+
+        # let's check the result
+        self.assert_('libfoo.a' in os.listdir(build_temp))
+
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 1e9dbd542f..971aac6daf 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -49,7 +49,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        os.environ['AR'] = 'xxx'
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:
@@ -60,7 +61,7 @@ def set_executables(self, **kw):
 
         comp = compiler()
         sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'xxx')
+        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
 
 
 def test_suite():

From 217fe3228dd9a092a05ddf8d777ef5eca22bf600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 7 May 2009 23:01:56 +0000
Subject: [PATCH 2268/8469] fixed AR/ARFLAGS values in test_sysconfig

---
 tests/test_sysconfig.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 040dfcb6ad..bf0043aa05 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -11,11 +11,15 @@
 class SysconfigTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.old_AR = os.environ.get('AR')
+        self.old_flags = [('AR', os.environ.get('AR')),
+                          ('ARFLAGS', os.environ.get('ARFLAGS'))]
 
     def tearDown(self):
-        if self.old_AR is not None:
-            os.environ['AR'] = self.old_AR
+        for name, value in self.old_flags:
+            if value is not None:
+                os.environ[name] = value
+            elif name in os.environ:
+                del os.environ[name]
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()

From 6218b5aeb11b942cdb54f15043086f55ac1927d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 7 May 2009 23:11:34 +0000
Subject: [PATCH 2269/8469] Merged revisions 72454 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72454 | tarek.ziade | 2009-05-08 01:01:56 +0200 (Fri, 08 May 2009) | 1 line

  fixed AR/ARFLAGS values in test_sysconfig
........
---
 tests/test_sysconfig.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 971aac6daf..f65bc725c6 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -11,11 +11,15 @@
 class SysconfigTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.old_AR = os.environ.get('AR')
+        self.old_flags = [('AR', os.environ.get('AR')),
+                          ('ARFLAGS', os.environ.get('ARFLAGS'))]
 
     def tearDown(self):
-        if self.old_AR is not None:
-            os.environ['AR'] = self.old_AR
+        for name, value in self.old_flags:
+            if value is not None:
+                os.environ[name] = value
+            elif name in os.environ:
+                del os.environ[name]
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()

From 9e299d5f4ef5f92ed722d5176e07d7d98c4292bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 9 May 2009 07:12:44 +0000
Subject: [PATCH 2270/8469] Revert encoding error from r72309.

---
 command/bdist_msi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index ffd668eb0e..9645158637 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2005, 2006 Martin v. Löwis
+# Copyright (C) 2005, 2006 Martin von Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst

From f2cc5e5fffe3aeb72a2d20bc2feffe5faa587c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 9 May 2009 08:28:53 +0000
Subject: [PATCH 2271/8469] Fixed Issue 5900: distutils.command.build_ext -
 Ensure RUNPATH is added to extension modules with RPATH if GNU ld is used

---
 tests/test_build_ext.py     |  3 +-
 tests/test_unixccompiler.py | 93 +++++++++++++++++++++++++++++++++++++
 unixccompiler.py            | 24 ++++++++--
 3 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_unixccompiler.py

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 9097bee2e4..141c2869b5 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -125,7 +125,7 @@ def test_user_site(self):
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)
 
-        # making sure the suer option is there
+        # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
         self.assert_('user' in options)
@@ -145,6 +145,7 @@ def test_user_site(self):
         # see if include_dirs and library_dirs
         # were set
         self.assert_(lib in cmd.library_dirs)
+        self.assert_(lib in cmd.rpath)
         self.assert_(incl in cmd.include_dirs)
 
     def test_optional_extension(self):
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
new file mode 100644
index 0000000000..94e9edfc09
--- /dev/null
+++ b/tests/test_unixccompiler.py
@@ -0,0 +1,93 @@
+"""Tests for distutils.unixccompiler."""
+import sys
+import unittest
+
+from distutils import sysconfig
+from distutils.unixccompiler import UnixCCompiler
+
+class UnixCCompilerTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self._backup_platform = sys.platform
+        self._backup_get_config_var = sysconfig.get_config_var
+        class CompilerWrapper(UnixCCompiler):
+            def rpath_foo(self):
+                return self.runtime_library_dir_option('/foo')
+        self.cc = CompilerWrapper()
+
+    def tearDown(self):
+        sys.platform = self._backup_platform
+        sysconfig.get_config_var = self._backup_get_config_var
+
+    def test_runtime_libdir_option(self):
+
+        # not tested under windows
+        if sys.platform == 'win32':
+            return
+
+        # Issue#5900
+        #
+        # Ensure RUNPATH is added to extension modules with RPATH if
+        # GNU ld is used
+
+        # darwin
+        sys.platform = 'darwin'
+        self.assertEqual(self.cc.rpath_foo(), '-L/foo')
+
+        # hp-ux
+        sys.platform = 'hp-ux'
+        self.assertEqual(self.cc.rpath_foo(), '+s -L/foo')
+
+        # irix646
+        sys.platform = 'irix646'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # osf1V5
+        sys.platform = 'osf1V5'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+
+        # GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
+
+        # non-GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+        # non-GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+def test_suite():
+    return unittest.makeSuite(UnixCCompilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/unixccompiler.py b/unixccompiler.py
index 045368a925..0b1dc4af7d 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -273,8 +273,9 @@ def runtime_library_dir_option(self, dir):
         # Linkers on different platforms need different options to
         # specify that directories need to be added to the list of
         # directories searched for dependencies when a dynamic library
-        # is sought.  GCC has to be told to pass the -R option through
-        # to the linker, whereas other compilers just know this.
+        # is sought.  GCC on GNU systems (Linux, FreeBSD, ...) has to
+        # be told to pass the -R option through to the linker, whereas
+        # other compilers and gcc on other systems just know this.
         # Other compilers may need something slightly different.  At
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
@@ -287,10 +288,23 @@ def runtime_library_dir_option(self, dir):
             return "+s -L" + dir
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
-            return "-Wl,-R" + dir
         else:
-            return "-R" + dir
+            if compiler[:3] == "gcc" or compiler[:3] == "g++":
+                # gcc on non-GNU systems does not need -Wl, but can
+                # use it anyway.  Since distutils has always passed in
+                # -Wl whenever gcc was used in the past it is probably
+                # safest to keep doing so.
+                if sysconfig.get_config_var("GNULD") == "yes":
+                    # GNU ld needs an extra option to get a RUNPATH
+                    # instead of just an RPATH.
+                    return "-Wl,--enable-new-dtags,-R" + dir
+                else:
+                    return "-Wl,-R" + dir
+            else:
+                # No idea how --enable-new-dtags would be passed on to
+                # ld if this system was using GNU ld.  Don't know if a
+                # system like this even exists.
+                return "-R" + dir
 
     def library_option(self, lib):
         return "-l" + lib

From fbc4ab332c9be99d822e2cbd8728cb34560f5ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 9 May 2009 10:06:00 +0000
Subject: [PATCH 2272/8469] #5976: fixed distutils test_check_environ

---
 tests/test_util.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 348933e901..ea7c5925b7 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -214,12 +214,17 @@ def test_check_environ(self):
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
-            os.environ = {}
-            check_environ()
-
-            import pwd
-            self.assertEquals(os.environ['HOME'],
-                              pwd.getpwuid(os.getuid())[5])
+            old_home = os.environ.get('HOME')
+            try:
+                check_environ()
+                import pwd
+                self.assertEquals(os.environ['HOME'],
+                                  pwd.getpwuid(os.getuid())[5])
+            finally:
+                if old_home is not None:
+                    os.environ['HOME'] = old_home
+                else:
+                    del os.environ['HOME']
         else:
             check_environ()
 

From 8faf60dd1c9f552ad552a6267ec8bcb894bd8792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 9 May 2009 10:09:11 +0000
Subject: [PATCH 2273/8469] Merged revisions 72500 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72500 | tarek.ziade | 2009-05-09 12:06:00 +0200 (Sat, 09 May 2009) | 1 line

  #5976: fixed distutils test_check_environ
........
---
 tests/test_util.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 348933e901..ea7c5925b7 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -214,12 +214,17 @@ def test_check_environ(self):
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
-            os.environ = {}
-            check_environ()
-
-            import pwd
-            self.assertEquals(os.environ['HOME'],
-                              pwd.getpwuid(os.getuid())[5])
+            old_home = os.environ.get('HOME')
+            try:
+                check_environ()
+                import pwd
+                self.assertEquals(os.environ['HOME'],
+                                  pwd.getpwuid(os.getuid())[5])
+            finally:
+                if old_home is not None:
+                    os.environ['HOME'] = old_home
+                else:
+                    del os.environ['HOME']
         else:
             check_environ()
 

From 6625a07e76fff84d1f3ed50ded7d1861744ffce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 9 May 2009 11:55:12 +0000
Subject: [PATCH 2274/8469] Merged revisions 72497 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72497 | tarek.ziade | 2009-05-09 10:28:53 +0200 (Sat, 09 May 2009) | 1 line

  Fixed Issue 5900: distutils.command.build_ext - Ensure RUNPATH is added to extension modules with RPATH if GNU ld is used
........
---
 tests/test_build_ext.py     |  3 +-
 tests/test_unixccompiler.py | 93 +++++++++++++++++++++++++++++++++++++
 unixccompiler.py            | 24 ++++++++--
 3 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_unixccompiler.py

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5ea67bedb7..e4a02391af 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -125,7 +125,7 @@ def test_user_site(self):
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)
 
-        # making sure the suer option is there
+        # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
         self.assert_('user' in options)
@@ -145,6 +145,7 @@ def test_user_site(self):
         # see if include_dirs and library_dirs
         # were set
         self.assert_(lib in cmd.library_dirs)
+        self.assert_(lib in cmd.rpath)
         self.assert_(incl in cmd.include_dirs)
 
     def test_optional_extension(self):
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
new file mode 100644
index 0000000000..94e9edfc09
--- /dev/null
+++ b/tests/test_unixccompiler.py
@@ -0,0 +1,93 @@
+"""Tests for distutils.unixccompiler."""
+import sys
+import unittest
+
+from distutils import sysconfig
+from distutils.unixccompiler import UnixCCompiler
+
+class UnixCCompilerTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self._backup_platform = sys.platform
+        self._backup_get_config_var = sysconfig.get_config_var
+        class CompilerWrapper(UnixCCompiler):
+            def rpath_foo(self):
+                return self.runtime_library_dir_option('/foo')
+        self.cc = CompilerWrapper()
+
+    def tearDown(self):
+        sys.platform = self._backup_platform
+        sysconfig.get_config_var = self._backup_get_config_var
+
+    def test_runtime_libdir_option(self):
+
+        # not tested under windows
+        if sys.platform == 'win32':
+            return
+
+        # Issue#5900
+        #
+        # Ensure RUNPATH is added to extension modules with RPATH if
+        # GNU ld is used
+
+        # darwin
+        sys.platform = 'darwin'
+        self.assertEqual(self.cc.rpath_foo(), '-L/foo')
+
+        # hp-ux
+        sys.platform = 'hp-ux'
+        self.assertEqual(self.cc.rpath_foo(), '+s -L/foo')
+
+        # irix646
+        sys.platform = 'irix646'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # osf1V5
+        sys.platform = 'osf1V5'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+
+        # GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
+
+        # non-GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+        # non-GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+def test_suite():
+    return unittest.makeSuite(UnixCCompilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/unixccompiler.py b/unixccompiler.py
index d65ab321b6..c11544d828 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -271,8 +271,9 @@ def runtime_library_dir_option(self, dir):
         # Linkers on different platforms need different options to
         # specify that directories need to be added to the list of
         # directories searched for dependencies when a dynamic library
-        # is sought.  GCC has to be told to pass the -R option through
-        # to the linker, whereas other compilers just know this.
+        # is sought.  GCC on GNU systems (Linux, FreeBSD, ...) has to
+        # be told to pass the -R option through to the linker, whereas
+        # other compilers and gcc on other systems just know this.
         # Other compilers may need something slightly different.  At
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
@@ -285,10 +286,23 @@ def runtime_library_dir_option(self, dir):
             return "+s -L" + dir
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
-            return "-Wl,-R" + dir
         else:
-            return "-R" + dir
+            if compiler[:3] == "gcc" or compiler[:3] == "g++":
+                # gcc on non-GNU systems does not need -Wl, but can
+                # use it anyway.  Since distutils has always passed in
+                # -Wl whenever gcc was used in the past it is probably
+                # safest to keep doing so.
+                if sysconfig.get_config_var("GNULD") == "yes":
+                    # GNU ld needs an extra option to get a RUNPATH
+                    # instead of just an RPATH.
+                    return "-Wl,--enable-new-dtags,-R" + dir
+                else:
+                    return "-Wl,-R" + dir
+            else:
+                # No idea how --enable-new-dtags would be passed on to
+                # ld if this system was using GNU ld.  Don't know if a
+                # system like this even exists.
+                return "-R" + dir
 
     def library_option(self, lib):
         return "-l" + lib

From c2b1e652ad5c124b958955a646efa51a17810609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 10:12:08 +0000
Subject: [PATCH 2275/8469] fixed #5984 and improved test coverage

---
 command/build_ext.py    |  70 ++++++++--------------
 tests/test_build_ext.py | 128 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 151 insertions(+), 47 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2c6df1d2cd..dfabf91091 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -136,7 +136,7 @@ def initialize_options (self):
         self.swig_opts = None
         self.user = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         from distutils import sysconfig
 
         self.set_undefined_options('build',
@@ -153,15 +153,14 @@ def finalize_options (self):
 
         self.extensions = self.distribution.ext_modules
 
-
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
         py_include = sysconfig.get_python_inc()
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+        if isinstance(self.include_dirs, str):
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
@@ -169,7 +168,7 @@ def finalize_options (self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if type(self.libraries) is StringType:
+        if isinstance(self.libraries, str):
             self.libraries = [self.libraries]
 
         # Life is easier if we're not forever checking for None, so
@@ -260,14 +259,14 @@ def finalize_options (self):
         # symbols can be separated with commas.
 
         if self.define:
-            defines = string.split(self.define, ',')
+            defines = self.define.split(',')
             self.define = map(lambda symbol: (symbol, '1'), defines)
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
         # be separated with commas here.
         if self.undef:
-            self.undef = string.split(self.undef, ',')
+            self.undef = self.undef.split(',')
 
         if self.swig_opts is None:
             self.swig_opts = []
@@ -284,11 +283,7 @@ def finalize_options (self):
                 self.library_dirs.append(user_lib)
                 self.rpath.append(user_lib)
 
-    # finalize_options ()
-
-
-    def run (self):
-
+    def run(self):
         from distutils.ccompiler import new_compiler
 
         # 'self.extensions', as supplied by setup.py, is a list of
@@ -335,7 +330,7 @@ def run (self):
             self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
-            for (name,value) in self.define:
+            for (name, value) in self.define:
                 self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
@@ -352,10 +347,7 @@ def run (self):
         # Now actually compile and link everything.
         self.build_extensions()
 
-    # run ()
-
-
-    def check_extensions_list (self, extensions):
+    def check_extensions_list(self, extensions):
         """Ensure that the list of extensions (presumably provided as a
         command option 'extensions') is valid, i.e. it is a list of
         Extension objects.  We also support the old-style list of 2-tuples,
@@ -365,32 +357,33 @@ def check_extensions_list (self, extensions):
         Raise DistutilsSetupError if the structure is invalid anywhere;
         just returns otherwise.
         """
-        if type(extensions) is not ListType:
+        if not isinstance(extensions, list):
             raise DistutilsSetupError, \
                   "'ext_modules' option must be a list of Extension instances"
 
-        for i in range(len(extensions)):
-            ext = extensions[i]
+        for i, ext in enumerate(extensions):
             if isinstance(ext, Extension):
                 continue                # OK! (assume type-checking done
                                         # by Extension constructor)
 
-            (ext_name, build_info) = ext
-            log.warn(("old-style (ext_name, build_info) tuple found in "
-                      "ext_modules for extension '%s'"
-                      "-- please convert to Extension instance" % ext_name))
-            if type(ext) is not TupleType and len(ext) != 2:
+            if not isinstance(ext, tuple) or len(ext) != 2:
                 raise DistutilsSetupError, \
                       ("each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
-            if not (type(ext_name) is StringType and
+            ext_name, build_info = ext
+
+            log.warn(("old-style (ext_name, build_info) tuple found in "
+                      "ext_modules for extension '%s'"
+                      "-- please convert to Extension instance" % ext_name))
+
+            if not (isinstance(ext_name, str) and
                     extension_name_re.match(ext_name)):
                 raise DistutilsSetupError, \
                       ("first element of each tuple in 'ext_modules' "
                        "must be the extension name (a string)")
 
-            if type(build_info) is not DictionaryType:
+            if not isinstance(build_info, dict):
                 raise DistutilsSetupError, \
                       ("second element of each tuple in 'ext_modules' "
                        "must be a dictionary (build info)")
@@ -401,11 +394,8 @@ def check_extensions_list (self, extensions):
 
             # Easy stuff: one-to-one mapping from dict elements to
             # instance attributes.
-            for key in ('include_dirs',
-                        'library_dirs',
-                        'libraries',
-                        'extra_objects',
-                        'extra_compile_args',
+            for key in ('include_dirs', 'library_dirs', 'libraries',
+                        'extra_objects', 'extra_compile_args',
                         'extra_link_args'):
                 val = build_info.get(key)
                 if val is not None:
@@ -424,8 +414,7 @@ def check_extensions_list (self, extensions):
                 ext.define_macros = []
                 ext.undef_macros = []
                 for macro in macros:
-                    if not (type(macro) is TupleType and
-                            1 <= len(macro) <= 2):
+                    if not (isinstance(macro, tuple) and len(macro) in (1, 2)):
                         raise DistutilsSetupError, \
                               ("'macros' element of build info dict "
                                "must be 1- or 2-tuple")
@@ -436,12 +425,7 @@ def check_extensions_list (self, extensions):
 
             extensions[i] = ext
 
-        # for extensions
-
-    # check_extensions_list ()
-
-
-    def get_source_files (self):
+    def get_source_files(self):
         self.check_extensions_list(self.extensions)
         filenames = []
 
@@ -451,9 +435,7 @@ def get_source_files (self):
 
         return filenames
 
-
-    def get_outputs (self):
-
+    def get_outputs(self):
         # Sanity check the 'extensions' list -- can't assume this is being
         # done in the same run as a 'build_extensions()' call (in fact, we
         # can probably assume that it *isn't*!).
@@ -469,8 +451,6 @@ def get_outputs (self):
                                         self.get_ext_filename(fullname)))
         return outputs
 
-    # get_outputs ()
-
     def build_extensions(self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 141c2869b5..dab9712a56 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -9,8 +9,8 @@
 from distutils import sysconfig
 from distutils.tests import support
 from distutils.extension import Extension
-from distutils.errors import UnknownFileError
-from distutils.errors import CompileError
+from distutils.errors import (UnknownFileError, DistutilsSetupError,
+                              CompileError)
 
 import unittest
 from test import test_support
@@ -165,6 +165,130 @@ def test_optional_extension(self):
         cmd.ensure_finalized()
         cmd.run()  # should pass
 
+    def test_finalize_options(self):
+        # Make sure Python's include directories (for Python.h, pyconfig.h,
+        # etc.) are in the include search path.
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        from distutils import sysconfig
+        py_include = sysconfig.get_python_inc()
+        self.assert_(py_include in cmd.include_dirs)
+
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        self.assert_(plat_py_include in cmd.include_dirs)
+
+        # make sure cmd.libraries is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.libraries = 'my_lib'
+        cmd.finalize_options()
+        self.assertEquals(cmd.libraries, ['my_lib'])
+
+        # make sure cmd.library_dirs is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.library_dirs = 'my_lib_dir'
+        cmd.finalize_options()
+        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+
+        # make sure rpath is turned into a list
+        # if it's a list of os.pathsep's paths
+        cmd = build_ext(dist)
+        cmd.rpath = os.pathsep.join(['one', 'two'])
+        cmd.finalize_options()
+        self.assertEquals(cmd.rpath, ['one', 'two'])
+
+        # XXX more tests to perform for win32
+
+        # make sure define is turned into 2-tuples
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.define = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+
+        # make sure undef is turned into a list of
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.undef = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.undef, ['one', 'two'])
+
+        # make sure swig_opts is turned into a list
+        cmd = build_ext(dist)
+        cmd.swig_opts = None
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, [])
+
+        cmd = build_ext(dist)
+        cmd.swig_opts = '1 2'
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, ['1', '2'])
+
+    def test_check_extensions_list(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        #'extensions' option must be a list of Extension instances
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, 'foo')
+
+        # each element of 'ext_modules' option must be an
+        # Extension instance or 2-tuple
+        exts = [('bar', 'foo', 'bar'), 'foo']
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # first element of each tuple in 'ext_modules'
+        # must be the extension name (a string) and match
+        # a python dotted-separated name
+        exts = [('foo-bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # second element of each tuple in 'ext_modules'
+        # must be a ary (build info)
+        exts = [('foo.bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # ok this one should pass
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                             'some': 'bar'})]
+        cmd.check_extensions_list(exts)
+        ext = exts[0]
+        self.assert_(isinstance(ext, Extension))
+
+        # check_extensions_list adds in ext the values passed
+        # when they are in ('include_dirs', 'library_dirs', 'libraries'
+        # 'extra_objects', 'extra_compile_args', 'extra_link_args')
+        self.assertEquals(ext.libraries, 'foo')
+        self.assert_(not hasattr(ext, 'some'))
+
+        # 'macros' element of build info dict must be 1- or 2-tuple
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                'some': 'bar', 'macros': [('1', '2', '3'), 'foo']})]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        exts[0][1]['macros'] = [('1', '2'), ('3',)]
+        cmd.check_extensions_list(exts)
+        self.assertEquals(exts[0].undef_macros, ['3'])
+        self.assertEquals(exts[0].define_macros, [('1', '2')])
+
+    def test_get_source_files(self):
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.get_source_files(), ['xxx'])
+
+    def test_get_outputs(self):
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(len(cmd.get_outputs()), 1)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From dc71622b4ce6db30451eb3393ad04c13623076dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 10:24:16 +0000
Subject: [PATCH 2276/8469] Merged revisions 72531 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72531 | tarek.ziade | 2009-05-10 12:12:08 +0200 (Sun, 10 May 2009) | 1 line

  fixed #5984 and improved test coverage
........
---
 command/build_ext.py    |  70 ++++++++-------------
 tests/test_build_ext.py | 132 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 156 insertions(+), 46 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 936ea8d099..c03951cb12 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -128,7 +128,7 @@ def initialize_options (self):
         self.swig_opts = None
         self.user = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         from distutils import sysconfig
 
         self.set_undefined_options('build',
@@ -145,15 +145,14 @@ def finalize_options (self):
 
         self.extensions = self.distribution.ext_modules
 
-
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
         py_include = sysconfig.get_python_inc()
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
-        if type(self.include_dirs) is StringType:
-            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+        if isinstance(self.include_dirs, str):
+            self.include_dirs = self.include_dirs.split(os.pathsep)
 
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
@@ -161,7 +160,7 @@ def finalize_options (self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if type(self.libraries) is StringType:
+        if isinstance(self.libraries, str):
             self.libraries = [self.libraries]
 
         # Life is easier if we're not forever checking for None, so
@@ -252,14 +251,14 @@ def finalize_options (self):
         # symbols can be separated with commas.
 
         if self.define:
-            defines = string.split(self.define, ',')
+            defines = self.define.split(',')
             self.define = map(lambda symbol: (symbol, '1'), defines)
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
         # be separated with commas here.
         if self.undef:
-            self.undef = string.split(self.undef, ',')
+            self.undef = self.undef.split(',')
 
         if self.swig_opts is None:
             self.swig_opts = []
@@ -276,11 +275,7 @@ def finalize_options (self):
                 self.library_dirs.append(user_lib)
                 self.rpath.append(user_lib)
 
-    # finalize_options ()
-
-
-    def run (self):
-
+    def run(self):
         from distutils.ccompiler import new_compiler
 
         # 'self.extensions', as supplied by setup.py, is a list of
@@ -327,7 +322,7 @@ def run (self):
             self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
-            for (name,value) in self.define:
+            for (name, value) in self.define:
                 self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
@@ -344,10 +339,7 @@ def run (self):
         # Now actually compile and link everything.
         self.build_extensions()
 
-    # run ()
-
-
-    def check_extensions_list (self, extensions):
+    def check_extensions_list(self, extensions):
         """Ensure that the list of extensions (presumably provided as a
         command option 'extensions') is valid, i.e. it is a list of
         Extension objects.  We also support the old-style list of 2-tuples,
@@ -357,32 +349,33 @@ def check_extensions_list (self, extensions):
         Raise DistutilsSetupError if the structure is invalid anywhere;
         just returns otherwise.
         """
-        if type(extensions) is not ListType:
+        if not isinstance(extensions, list):
             raise DistutilsSetupError, \
                   "'ext_modules' option must be a list of Extension instances"
 
-        for i in range(len(extensions)):
-            ext = extensions[i]
+        for i, ext in enumerate(extensions):
             if isinstance(ext, Extension):
                 continue                # OK! (assume type-checking done
                                         # by Extension constructor)
 
-            (ext_name, build_info) = ext
-            log.warn(("old-style (ext_name, build_info) tuple found in "
-                      "ext_modules for extension '%s'"
-                      "-- please convert to Extension instance" % ext_name))
-            if type(ext) is not TupleType and len(ext) != 2:
+            if not isinstance(ext, tuple) or len(ext) != 2:
                 raise DistutilsSetupError, \
                       ("each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
-            if not (type(ext_name) is StringType and
+            ext_name, build_info = ext
+
+            log.warn(("old-style (ext_name, build_info) tuple found in "
+                      "ext_modules for extension '%s'"
+                      "-- please convert to Extension instance" % ext_name))
+
+            if not (isinstance(ext_name, str) and
                     extension_name_re.match(ext_name)):
                 raise DistutilsSetupError, \
                       ("first element of each tuple in 'ext_modules' "
                        "must be the extension name (a string)")
 
-            if type(build_info) is not DictionaryType:
+            if not isinstance(build_info, dict):
                 raise DistutilsSetupError, \
                       ("second element of each tuple in 'ext_modules' "
                        "must be a dictionary (build info)")
@@ -393,11 +386,8 @@ def check_extensions_list (self, extensions):
 
             # Easy stuff: one-to-one mapping from dict elements to
             # instance attributes.
-            for key in ('include_dirs',
-                        'library_dirs',
-                        'libraries',
-                        'extra_objects',
-                        'extra_compile_args',
+            for key in ('include_dirs', 'library_dirs', 'libraries',
+                        'extra_objects', 'extra_compile_args',
                         'extra_link_args'):
                 val = build_info.get(key)
                 if val is not None:
@@ -416,8 +406,7 @@ def check_extensions_list (self, extensions):
                 ext.define_macros = []
                 ext.undef_macros = []
                 for macro in macros:
-                    if not (type(macro) is TupleType and
-                            1 <= len(macro) <= 2):
+                    if not (isinstance(macro, tuple) and len(macro) in (1, 2)):
                         raise DistutilsSetupError, \
                               ("'macros' element of build info dict "
                                "must be 1- or 2-tuple")
@@ -428,12 +417,7 @@ def check_extensions_list (self, extensions):
 
             extensions[i] = ext
 
-        # for extensions
-
-    # check_extensions_list ()
-
-
-    def get_source_files (self):
+    def get_source_files(self):
         self.check_extensions_list(self.extensions)
         filenames = []
 
@@ -443,9 +427,7 @@ def get_source_files (self):
 
         return filenames
 
-
-    def get_outputs (self):
-
+    def get_outputs(self):
         # Sanity check the 'extensions' list -- can't assume this is being
         # done in the same run as a 'build_extensions()' call (in fact, we
         # can probably assume that it *isn't*!).
@@ -461,8 +443,6 @@ def get_outputs (self):
                                         self.get_ext_filename(fullname)))
         return outputs
 
-    # get_outputs ()
-
     def build_extensions(self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index dbec65e8d1..98ae8cf3b4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -7,6 +7,8 @@
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
+from distutils.tests import support
+from distutils.errors import DistutilsSetupError
 
 import unittest
 from test import test_support
@@ -15,10 +17,13 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-class BuildExtTestCase(unittest.TestCase):
+class BuildExtTestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
+        super(BuildExtTestCase, self).setUp()
         self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
@@ -74,6 +79,7 @@ def tearDown(self):
         sys.path = self.sys_path
         # XXX on Windows the test leaves a directory with xx module in TEMP
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
+        super(BuildExtTestCase, self).tearDown()
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
@@ -96,6 +102,130 @@ def test_solaris_enable_shared(self):
         # make sur we get some lobrary dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
+    def test_finalize_options(self):
+        # Make sure Python's include directories (for Python.h, pyconfig.h,
+        # etc.) are in the include search path.
+        modules = [Extension('foo', ['xxx'])]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        from distutils import sysconfig
+        py_include = sysconfig.get_python_inc()
+        self.assert_(py_include in cmd.include_dirs)
+
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        self.assert_(plat_py_include in cmd.include_dirs)
+
+        # make sure cmd.libraries is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.libraries = 'my_lib'
+        cmd.finalize_options()
+        self.assertEquals(cmd.libraries, ['my_lib'])
+
+        # make sure cmd.library_dirs is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.library_dirs = 'my_lib_dir'
+        cmd.finalize_options()
+        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+
+        # make sure rpath is turned into a list
+        # if it's a list of os.pathsep's paths
+        cmd = build_ext(dist)
+        cmd.rpath = os.pathsep.join(['one', 'two'])
+        cmd.finalize_options()
+        self.assertEquals(cmd.rpath, ['one', 'two'])
+
+        # XXX more tests to perform for win32
+
+        # make sure define is turned into 2-tuples
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.define = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+
+        # make sure undef is turned into a list of
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.undef = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.undef, ['one', 'two'])
+
+        # make sure swig_opts is turned into a list
+        cmd = build_ext(dist)
+        cmd.swig_opts = None
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, [])
+
+        cmd = build_ext(dist)
+        cmd.swig_opts = '1 2'
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, ['1', '2'])
+
+    def test_check_extensions_list(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        #'extensions' option must be a list of Extension instances
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, 'foo')
+
+        # each element of 'ext_modules' option must be an
+        # Extension instance or 2-tuple
+        exts = [('bar', 'foo', 'bar'), 'foo']
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # first element of each tuple in 'ext_modules'
+        # must be the extension name (a string) and match
+        # a python dotted-separated name
+        exts = [('foo-bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # second element of each tuple in 'ext_modules'
+        # must be a ary (build info)
+        exts = [('foo.bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # ok this one should pass
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                             'some': 'bar'})]
+        cmd.check_extensions_list(exts)
+        ext = exts[0]
+        self.assert_(isinstance(ext, Extension))
+
+        # check_extensions_list adds in ext the values passed
+        # when they are in ('include_dirs', 'library_dirs', 'libraries'
+        # 'extra_objects', 'extra_compile_args', 'extra_link_args')
+        self.assertEquals(ext.libraries, 'foo')
+        self.assert_(not hasattr(ext, 'some'))
+
+        # 'macros' element of build info dict must be 1- or 2-tuple
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                'some': 'bar', 'macros': [('1', '2', '3'), 'foo']})]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        exts[0][1]['macros'] = [('1', '2'), ('3',)]
+        cmd.check_extensions_list(exts)
+        self.assertEquals(exts[0].undef_macros, ['3'])
+        self.assertEquals(exts[0].define_macros, [('1', '2')])
+
+    def test_get_source_files(self):
+        modules = [Extension('foo', ['xxx'])]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.get_source_files(), ['xxx'])
+
+    def test_get_outputs(self):
+        modules = [Extension('foo', ['xxx'])]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(len(cmd.get_outputs()), 1)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 7edd653b77f93b3d5fabdf7f419d90b86d1db93b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 10:34:01 +0000
Subject: [PATCH 2277/8469] Merged revisions 72531 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72531 | tarek.ziade | 2009-05-10 12:12:08 +0200 (Sun, 10 May 2009) | 1 line

  fixed #5984 and improved test coverage
........
---
 command/build_ext.py    |  23 ++++----
 tests/test_build_ext.py | 128 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ade95be229..d3668e9f4c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -329,7 +329,7 @@ def run(self):
             self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
-            for (name,value) in self.define:
+            for (name, value) in self.define:
                 self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
@@ -365,22 +365,24 @@ def check_extensions_list(self, extensions):
                 continue                # OK! (assume type-checking done
                                         # by Extension constructor)
 
-            (ext_name, build_info) = ext
-            log.warn("old-style (ext_name, build_info) tuple found in "
-                     "ext_modules for extension '%s'"
-                     "-- please convert to Extension instance" % ext_name)
-            if not isinstance(ext, tuple) and len(ext) != 2:
+            if not isinstance(ext, tuple) or len(ext) != 2:
                 raise DistutilsSetupError(
                        "each element of 'ext_modules' option must be an "
                        "Extension instance or 2-tuple")
 
+            ext_name, build_info = ext
+
+            log.warn(("old-style (ext_name, build_info) tuple found in "
+                      "ext_modules for extension '%s'"
+                      "-- please convert to Extension instance" % ext_name))
+
             if not (isinstance(ext_name, str) and
                     extension_name_re.match(ext_name)):
                 raise DistutilsSetupError(
                        "first element of each tuple in 'ext_modules' "
                        "must be the extension name (a string)")
 
-            if not instance(build_info, DictionaryType):
+            if not isinstance(build_info, dict):
                 raise DistutilsSetupError(
                        "second element of each tuple in 'ext_modules' "
                        "must be a dictionary (build info)")
@@ -391,11 +393,8 @@ def check_extensions_list(self, extensions):
 
             # Easy stuff: one-to-one mapping from dict elements to
             # instance attributes.
-            for key in ('include_dirs',
-                        'library_dirs',
-                        'libraries',
-                        'extra_objects',
-                        'extra_compile_args',
+            for key in ('include_dirs', 'library_dirs', 'libraries',
+                        'extra_objects', 'extra_compile_args',
                         'extra_link_args'):
                 val = build_info.get(key)
                 if val is not None:
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e4a02391af..c22be2ac09 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -10,8 +10,8 @@
 from distutils.tests.support import TempdirManager
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
-from distutils.errors import UnknownFileError
-from distutils.errors import CompileError
+from distutils.errors import (UnknownFileError, DistutilsSetupError,
+                              CompileError)
 
 import unittest
 from test import support
@@ -165,6 +165,130 @@ def test_optional_extension(self):
         cmd.ensure_finalized()
         cmd.run()  # should pass
 
+    def test_finalize_options(self):
+        # Make sure Python's include directories (for Python.h, pyconfig.h,
+        # etc.) are in the include search path.
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        from distutils import sysconfig
+        py_include = sysconfig.get_python_inc()
+        self.assert_(py_include in cmd.include_dirs)
+
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        self.assert_(plat_py_include in cmd.include_dirs)
+
+        # make sure cmd.libraries is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.libraries = 'my_lib'
+        cmd.finalize_options()
+        self.assertEquals(cmd.libraries, ['my_lib'])
+
+        # make sure cmd.library_dirs is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.library_dirs = 'my_lib_dir'
+        cmd.finalize_options()
+        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+
+        # make sure rpath is turned into a list
+        # if it's a list of os.pathsep's paths
+        cmd = build_ext(dist)
+        cmd.rpath = os.pathsep.join(['one', 'two'])
+        cmd.finalize_options()
+        self.assertEquals(cmd.rpath, ['one', 'two'])
+
+        # XXX more tests to perform for win32
+
+        # make sure define is turned into 2-tuples
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.define = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+
+        # make sure undef is turned into a list of
+        # strings if they are ','-separated strings
+        cmd = build_ext(dist)
+        cmd.undef = 'one,two'
+        cmd.finalize_options()
+        self.assertEquals(cmd.undef, ['one', 'two'])
+
+        # make sure swig_opts is turned into a list
+        cmd = build_ext(dist)
+        cmd.swig_opts = None
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, [])
+
+        cmd = build_ext(dist)
+        cmd.swig_opts = '1 2'
+        cmd.finalize_options()
+        self.assertEquals(cmd.swig_opts, ['1', '2'])
+
+    def test_check_extensions_list(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.finalize_options()
+
+        #'extensions' option must be a list of Extension instances
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, 'foo')
+
+        # each element of 'ext_modules' option must be an
+        # Extension instance or 2-tuple
+        exts = [('bar', 'foo', 'bar'), 'foo']
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # first element of each tuple in 'ext_modules'
+        # must be the extension name (a string) and match
+        # a python dotted-separated name
+        exts = [('foo-bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # second element of each tuple in 'ext_modules'
+        # must be a ary (build info)
+        exts = [('foo.bar', '')]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        # ok this one should pass
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                             'some': 'bar'})]
+        cmd.check_extensions_list(exts)
+        ext = exts[0]
+        self.assert_(isinstance(ext, Extension))
+
+        # check_extensions_list adds in ext the values passed
+        # when they are in ('include_dirs', 'library_dirs', 'libraries'
+        # 'extra_objects', 'extra_compile_args', 'extra_link_args')
+        self.assertEquals(ext.libraries, 'foo')
+        self.assert_(not hasattr(ext, 'some'))
+
+        # 'macros' element of build info dict must be 1- or 2-tuple
+        exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
+                'some': 'bar', 'macros': [('1', '2', '3'), 'foo']})]
+        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
+
+        exts[0][1]['macros'] = [('1', '2'), ('3',)]
+        cmd.check_extensions_list(exts)
+        self.assertEquals(exts[0].undef_macros, ['3'])
+        self.assertEquals(exts[0].define_macros, [('1', '2')])
+
+    def test_get_source_files(self):
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.get_source_files(), ['xxx'])
+
+    def test_get_outputs(self):
+        modules = [Extension('foo', ['xxx'], optional=False)]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertEquals(len(cmd.get_outputs()), 1)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From a7de6ba0a764ace7b5430be8a3d709204850df39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 11:42:46 +0000
Subject: [PATCH 2278/8469] Added tests form install_lib and pep8-fied the
 module

---
 command/install_lib.py    | 40 ++++++-------------
 tests/test_install_lib.py | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 27 deletions(-)
 create mode 100644 tests/test_install_lib.py

diff --git a/command/install_lib.py b/command/install_lib.py
index 4c62c7133a..87e3c7aa04 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import os
-from types import IntType
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -17,7 +16,7 @@
 else:
     PYTHON_SOURCE_EXTENSION = ".py"
 
-class install_lib (Command):
+class install_lib(Command):
 
     description = "install all Python modules (extensions and pure Python)"
 
@@ -51,8 +50,7 @@ class install_lib (Command):
     boolean_options = ['force', 'compile', 'skip-build']
     negative_opt = {'no-compile' : 'compile'}
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         # let the 'install' command dictate our installation directory
         self.install_dir = None
         self.build_dir = None
@@ -61,8 +59,7 @@ def initialize_options (self):
         self.optimize = None
         self.skip_build = None
 
-    def finalize_options (self):
-
+    def finalize_options(self):
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
@@ -80,15 +77,14 @@ def finalize_options (self):
         if self.optimize is None:
             self.optimize = 0
 
-        if type(self.optimize) is not IntType:
+        if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert 0 <= self.optimize <= 2
+                assert self.optimize in (0, 1, 2)
             except (ValueError, AssertionError):
                 raise DistutilsOptionError, "optimize must be 0, 1, or 2"
 
-    def run (self):
-
+    def run(self):
         # Make sure we have built everything we need first
         self.build()
 
@@ -101,20 +97,17 @@ def run (self):
         if outfiles is not None and self.distribution.has_pure_modules():
             self.byte_compile(outfiles)
 
-    # run ()
-
-
     # -- Top-level worker functions ------------------------------------
     # (called from 'run()')
 
-    def build (self):
+    def build(self):
         if not self.skip_build:
             if self.distribution.has_pure_modules():
                 self.run_command('build_py')
             if self.distribution.has_ext_modules():
                 self.run_command('build_ext')
 
-    def install (self):
+    def install(self):
         if os.path.isdir(self.build_dir):
             outfiles = self.copy_tree(self.build_dir, self.install_dir)
         else:
@@ -123,7 +116,7 @@ def install (self):
             return
         return outfiles
 
-    def byte_compile (self, files):
+    def byte_compile(self, files):
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
@@ -144,8 +137,7 @@ def byte_compile (self, files):
 
     # -- Utility methods -----------------------------------------------
 
-    def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
-
+    def _mutate_outputs(self, has_any, build_cmd, cmd_option, output_dir):
         if not has_any:
             return []
 
@@ -160,9 +152,7 @@ def _mutate_outputs (self, has_any, build_cmd, cmd_option, output_dir):
 
         return outputs
 
-    # _mutate_outputs ()
-
-    def _bytecode_filenames (self, py_filenames):
+    def _bytecode_filenames(self, py_filenames):
         bytecode_files = []
         for py_file in py_filenames:
             # Since build_py handles package data installation, the
@@ -182,7 +172,7 @@ def _bytecode_filenames (self, py_filenames):
     # -- External interface --------------------------------------------
     # (called by outsiders)
 
-    def get_outputs (self):
+    def get_outputs(self):
         """Return the list of files that would be installed if this command
         were actually run.  Not affected by the "dry-run" flag or whether
         modules have actually been built yet.
@@ -203,9 +193,7 @@ def get_outputs (self):
 
         return pure_outputs + bytecode_outputs + ext_outputs
 
-    # get_outputs ()
-
-    def get_inputs (self):
+    def get_inputs(self):
         """Get the list of files that are input to this command, ie. the
         files that get installed as they are named in the build tree.
         The files in this list correspond one-to-one to the output
@@ -222,5 +210,3 @@ def get_inputs (self):
             inputs.extend(build_ext.get_outputs())
 
         return inputs
-
-# class install_lib
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
new file mode 100644
index 0000000000..69a24faf71
--- /dev/null
+++ b/tests/test_install_lib.py
@@ -0,0 +1,84 @@
+"""Tests for distutils.command.install_data."""
+import sys
+import os
+import unittest
+
+from distutils.command.install_lib import install_lib
+from distutils.extension import Extension
+from distutils.tests import support
+from distutils.errors import DistutilsOptionError
+
+class InstallLibTestCase(support.TempdirManager,
+                         support.LoggingSilencer,
+                         unittest.TestCase):
+
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        cmd.finalize_options()
+        self.assertEquals(cmd.compile, 1)
+        self.assertEquals(cmd.optimize, 0)
+
+        # optimize must be 0, 1, or 2
+        cmd.optimize = 'foo'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+        cmd.optimize = '4'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        cmd.optimize = '2'
+        cmd.finalize_options()
+        self.assertEquals(cmd.optimize, 2)
+
+    def test_byte_compile(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = cmd.optimize = 1
+
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.byte_compile([f])
+        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+
+    def test_get_outputs(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        # setting up a dist environment
+        cmd.compile = cmd.optimize = 1
+        cmd.install_dir = pkg_dir
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.distribution.py_modules = [pkg_dir]
+        cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
+        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.script_name = 'setup.py'
+
+        # get_output should return 4 elements
+        self.assertEquals(len(cmd.get_outputs()), 4)
+
+    def test_get_inputs(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        # setting up a dist environment
+        cmd.compile = cmd.optimize = 1
+        cmd.install_dir = pkg_dir
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.distribution.py_modules = [pkg_dir]
+        cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
+        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.script_name = 'setup.py'
+
+        # get_input should return 2 elements
+        self.assertEquals(len(cmd.get_inputs()), 2)
+
+
+def test_suite():
+    return unittest.makeSuite(InstallLibTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From df1988a14be1c71891e64a2705f71691d1a8dfe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 11:45:41 +0000
Subject: [PATCH 2279/8469] Merged revisions 72535 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72535 | tarek.ziade | 2009-05-10 13:42:46 +0200 (Sun, 10 May 2009) | 1 line

  Added tests form install_lib and pep8-fied the module
........
---
 command/install_lib.py    |  6 +--
 tests/test_install_lib.py | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_install_lib.py

diff --git a/command/install_lib.py b/command/install_lib.py
index 94895f4269..022efa48fc 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -5,7 +5,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import os
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -57,7 +57,6 @@ def initialize_options(self):
         self.skip_build = None
 
     def finalize_options(self):
-
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
@@ -78,7 +77,7 @@ def finalize_options(self):
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert 0 <= self.optimize <= 2
+                assert self.optimize in (0, 1, 2)
             except (ValueError, AssertionError):
                 raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
@@ -95,7 +94,6 @@ def run(self):
         if outfiles is not None and self.distribution.has_pure_modules():
             self.byte_compile(outfiles)
 
-
     # -- Top-level worker functions ------------------------------------
     # (called from 'run()')
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
new file mode 100644
index 0000000000..69a24faf71
--- /dev/null
+++ b/tests/test_install_lib.py
@@ -0,0 +1,84 @@
+"""Tests for distutils.command.install_data."""
+import sys
+import os
+import unittest
+
+from distutils.command.install_lib import install_lib
+from distutils.extension import Extension
+from distutils.tests import support
+from distutils.errors import DistutilsOptionError
+
+class InstallLibTestCase(support.TempdirManager,
+                         support.LoggingSilencer,
+                         unittest.TestCase):
+
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        cmd.finalize_options()
+        self.assertEquals(cmd.compile, 1)
+        self.assertEquals(cmd.optimize, 0)
+
+        # optimize must be 0, 1, or 2
+        cmd.optimize = 'foo'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+        cmd.optimize = '4'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        cmd.optimize = '2'
+        cmd.finalize_options()
+        self.assertEquals(cmd.optimize, 2)
+
+    def test_byte_compile(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = cmd.optimize = 1
+
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.byte_compile([f])
+        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+
+    def test_get_outputs(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        # setting up a dist environment
+        cmd.compile = cmd.optimize = 1
+        cmd.install_dir = pkg_dir
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.distribution.py_modules = [pkg_dir]
+        cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
+        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.script_name = 'setup.py'
+
+        # get_output should return 4 elements
+        self.assertEquals(len(cmd.get_outputs()), 4)
+
+    def test_get_inputs(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+
+        # setting up a dist environment
+        cmd.compile = cmd.optimize = 1
+        cmd.install_dir = pkg_dir
+        f = os.path.join(pkg_dir, 'foo.py')
+        self.write_file(f, '# python file')
+        cmd.distribution.py_modules = [pkg_dir]
+        cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
+        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.script_name = 'setup.py'
+
+        # get_input should return 2 elements
+        self.assertEquals(len(cmd.get_inputs()), 2)
+
+
+def test_suite():
+    return unittest.makeSuite(InstallLibTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From a440b1ce0ae7a9e9ca14015c4d69b8e08b35c9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 11:59:30 +0000
Subject: [PATCH 2280/8469] refactored test_sysconfig so it uses
 test.test_support.EnvironmentVarGuard

---
 tests/support.py        | 11 +++++++++++
 tests/test_sysconfig.py | 27 ++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 578cf40c09..668edf9f5a 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -5,6 +5,7 @@
 
 from distutils import log
 from distutils.core import Distribution
+from test.test_support import EnvironmentVarGuard
 
 class LoggingSilencer(object):
 
@@ -82,3 +83,13 @@ def __init__(self, **kwargs):
 
     def ensure_finalized(self):
         pass
+
+class EnvironGuard(object):
+
+    def setUp(self):
+        super(EnvironGuard, self).setUp()
+        self.environ = EnvironmentVarGuard()
+
+    def tearDown(self):
+        self.environ.__exit__()
+        super(EnvironGuard, self).tearDown()
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index bf0043aa05..0a5ac2944a 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,25 +1,14 @@
-"""Tests for distutils.dist."""
-
-from distutils import sysconfig
-from distutils.ccompiler import get_default_compiler
-
+"""Tests for distutils.sysconfig."""
 import os
 import unittest
 
+from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
+from distutils.tests import support
 from test.test_support import TESTFN
 
-class SysconfigTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.old_flags = [('AR', os.environ.get('AR')),
-                          ('ARFLAGS', os.environ.get('ARFLAGS'))]
-
-    def tearDown(self):
-        for name, value in self.old_flags:
-            if value is not None:
-                os.environ[name] = value
-            elif name in os.environ:
-                del os.environ[name]
+class SysconfigTestCase(support.EnvironGuard,
+                        unittest.TestCase):
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
@@ -53,8 +42,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
+        self.environ['AR'] = 'my_ar'
+        self.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:

From a1969cc045a19e41674d2c929e6f802c02b2e8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 12:02:35 +0000
Subject: [PATCH 2281/8469] Merged revisions 72539 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72539 | tarek.ziade | 2009-05-10 13:59:30 +0200 (Sun, 10 May 2009) | 1 line

  refactored test_sysconfig so it uses test.test_support.EnvironmentVarGuard
........
---
 tests/support.py        | 11 +++++++++++
 tests/test_sysconfig.py | 27 ++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index ab2af9a6aa..cdcbc37862 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -5,6 +5,7 @@
 
 from distutils import log
 from distutils.core import Distribution
+from test.support import EnvironmentVarGuard
 
 class LoggingSilencer(object):
 
@@ -82,3 +83,13 @@ def __init__(self, **kwargs):
 
     def ensure_finalized(self):
         pass
+
+class EnvironGuard(object):
+
+    def setUp(self):
+        super(EnvironGuard, self).setUp()
+        self.environ = EnvironmentVarGuard()
+
+    def tearDown(self):
+        self.environ.__exit__()
+        super(EnvironGuard, self).tearDown()
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index f65bc725c6..322df39cf5 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,25 +1,14 @@
-"""Tests for distutils.dist."""
-
-from distutils import sysconfig
-from distutils.ccompiler import get_default_compiler
-
+"""Tests for distutils.sysconfig."""
 import os
 import unittest
 
+from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
+from distutils.tests import support
 from test.support import TESTFN
 
-class SysconfigTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.old_flags = [('AR', os.environ.get('AR')),
-                          ('ARFLAGS', os.environ.get('ARFLAGS'))]
-
-    def tearDown(self):
-        for name, value in self.old_flags:
-            if value is not None:
-                os.environ[name] = value
-            elif name in os.environ:
-                del os.environ[name]
+class SysconfigTestCase(support.EnvironGuard,
+                        unittest.TestCase):
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
@@ -53,8 +42,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
+        self.environ['AR'] = 'my_ar'
+        self.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:

From 5bc0f864c12dd6129366d7cc44ed23d942a2818f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 12:17:30 +0000
Subject: [PATCH 2282/8469] now using EnvironGuard everywhere

---
 tests/test_config.py | 29 ++++------------------------
 tests/test_dist.py   | 22 ++++++----------------
 tests/test_util.py   | 45 +++++++++++++++-----------------------------
 3 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 7737538bf8..fd778d1ba5 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -49,18 +49,14 @@
 
 class PyPIRCCommandTestCase(support.TempdirManager,
                             support.LoggingSilencer,
+                            support.EnvironGuard,
                             unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
         super(PyPIRCCommandTestCase, self).setUp()
-
-        if os.environ.has_key('HOME'):
-            self._old_home = os.environ['HOME']
-        else:
-            self._old_home = None
         self.tmp_dir = self.mkdtemp()
-        os.environ['HOME'] = self.tmp_dir
+        self.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
@@ -76,10 +72,6 @@ def initialize_options(self):
 
     def tearDown(self):
         """Removes the patch."""
-        if self._old_home is None:
-            del os.environ['HOME']
-        else:
-            os.environ['HOME'] = self._old_home
         set_threshold(self.old_threshold)
         super(PyPIRCCommandTestCase, self).tearDown()
 
@@ -89,12 +81,7 @@ def test_server_registration(self):
         # 2. handle the old format
 
         # new format
-        f = open(self.rc, 'w')
-        try:
-            f.write(PYPIRC)
-        finally:
-            f.close()
-
+        self.write_file(self.rc, PYPIRC)
         cmd = self._cmd(self.dist)
         config = cmd._read_pypirc()
 
@@ -106,10 +93,7 @@ def test_server_registration(self):
         self.assertEquals(config, waited)
 
         # old format
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_OLD)
-        f.close()
-
+        self.write_file(self.rc, PYPIRC_OLD)
         config = cmd._read_pypirc()
         config = config.items()
         config.sort()
@@ -119,19 +103,14 @@ def test_server_registration(self):
         self.assertEquals(config, waited)
 
     def test_server_empty_registration(self):
-
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
         self.assert_(not os.path.exists(rc))
-
         cmd._store_pypirc('tarek', 'xxx')
-
         self.assert_(os.path.exists(rc))
         content = open(rc).read()
-
         self.assertEquals(content, WANTED)
 
-
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 847df7bb60..3304790b51 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -39,13 +39,13 @@ def find_config_files(self):
 class DistributionTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
+        super(DistributionTestCase, self).setUp()
         self.argv = sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
         sys.argv[:] = self.argv
-        support.TempdirManager.tearDown(self)
+        super(DistributionTestCase, self).tearDown()
 
     def create_distribution(self, configfiles=()):
         d = TestDistribution()
@@ -151,7 +151,8 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
-class MetadataTestCase(support.TempdirManager, unittest.TestCase):
+class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
+                       unittest.TestCase):
 
     def test_simple_metadata(self):
         attrs = {"name": "package",
@@ -238,13 +239,6 @@ def format_metadata(self, dist):
     def test_custom_pydistutils(self):
         # fixes #2166
         # make sure pydistutils.cfg is found
-        old = {}
-        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
-            value = os.environ.get(env)
-            old[env] = value
-            if value is not None:
-                del os.environ[env]
-
         if os.name == 'posix':
             user_filename = ".pydistutils.cfg"
         else:
@@ -261,22 +255,18 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = temp_dir
+                self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOME'] = temp_dir
+                self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
         finally:
-            for key, value in old.items():
-                if value is None:
-                    continue
-                os.environ[key] = value
             os.remove(user_filename)
 
 def test_suite():
diff --git a/tests/test_util.py b/tests/test_util.py
index ea7c5925b7..cee7d5263b 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -8,28 +8,23 @@
 from copy import copy
 
 from distutils.errors import DistutilsPlatformError
-
-from distutils.util import get_platform
-from distutils.util import convert_path
-from distutils.util import change_root
-from distutils.util import check_environ
-from distutils.util import split_quoted
-from distutils.util import strtobool
-from distutils.util import rfc822_escape
-
+from distutils.util import (get_platform, convert_path, change_root,
+                            check_environ, split_quoted, strtobool,
+                            rfc822_escape)
 from distutils import util # used to patch _environ_checked
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
+from distutils.tests import support
 
-class utilTestCase(unittest.TestCase):
+class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
     def setUp(self):
+        super(UtilTestCase, self).setUp()
         # saving the environment
         self.name = os.name
         self.platform = sys.platform
         self.version = sys.version
         self.sep = os.sep
-        self.environ = dict(os.environ)
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
@@ -51,10 +46,6 @@ def tearDown(self):
         sys.platform = self.platform
         sys.version = self.version
         os.sep = self.sep
-        for k, v in self.environ.items():
-            os.environ[k] = v
-        for k in set(os.environ) - set(self.environ):
-            del os.environ[k]
         os.path.join = self.join
         os.path.isabs = self.isabs
         os.path.splitdrive = self.splitdrive
@@ -63,6 +54,7 @@ def tearDown(self):
         else:
             del os.uname
         sysconfig._config_vars = copy(self._config_vars)
+        super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):
         self._uname = uname
@@ -102,7 +94,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -110,7 +102,7 @@ def test_get_platform(self):
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -214,21 +206,14 @@ def test_check_environ(self):
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
-            old_home = os.environ.get('HOME')
-            try:
-                check_environ()
-                import pwd
-                self.assertEquals(os.environ['HOME'],
-                                  pwd.getpwuid(os.getuid())[5])
-            finally:
-                if old_home is not None:
-                    os.environ['HOME'] = old_home
-                else:
-                    del os.environ['HOME']
+            check_environ()
+            import pwd
+            self.assertEquals(self.environ['HOME'],
+                            pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(os.environ['PLAT'], get_platform())
+        self.assertEquals(self.environ['PLAT'], get_platform())
         self.assertEquals(util._environ_checked, 1)
 
     def test_split_quoted(self):
@@ -253,7 +238,7 @@ def test_rfc822_escape(self):
         self.assertEquals(res, wanted)
 
 def test_suite():
-    return unittest.makeSuite(utilTestCase)
+    return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")

From 08fd7deaae5c8a866f5f5efe67efd104e632ec96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 12:20:44 +0000
Subject: [PATCH 2283/8469] Merged revisions 72543 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72543 | tarek.ziade | 2009-05-10 14:17:30 +0200 (Sun, 10 May 2009) | 1 line

  now using EnvironGuard everywhere
........
---
 tests/test_config.py | 29 ++++------------------------
 tests/test_dist.py   | 20 ++++++--------------
 tests/test_util.py   | 45 +++++++++++++++-----------------------------
 3 files changed, 25 insertions(+), 69 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 7506f93227..0f97cf7a5e 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -48,18 +48,14 @@
 
 class PyPIRCCommandTestCase(support.TempdirManager,
                             support.LoggingSilencer,
+                            support.EnvironGuard,
                             unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
         super(PyPIRCCommandTestCase, self).setUp()
-
-        if 'HOME' in os.environ:
-            self._old_home = os.environ['HOME']
-        else:
-            self._old_home = None
         self.tmp_dir = self.mkdtemp()
-        os.environ['HOME'] = self.tmp_dir
+        self.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
@@ -75,10 +71,6 @@ def initialize_options(self):
 
     def tearDown(self):
         """Removes the patch."""
-        if self._old_home is None:
-            del os.environ['HOME']
-        else:
-            os.environ['HOME'] = self._old_home
         set_threshold(self.old_threshold)
         super(PyPIRCCommandTestCase, self).tearDown()
 
@@ -88,12 +80,7 @@ def test_server_registration(self):
         # 2. handle the old format
 
         # new format
-        f = open(self.rc, 'w')
-        try:
-            f.write(PYPIRC)
-        finally:
-            f.close()
-
+        self.write_file(self.rc, PYPIRC)
         cmd = self._cmd(self.dist)
         config = cmd._read_pypirc()
 
@@ -104,10 +91,7 @@ def test_server_registration(self):
         self.assertEquals(config, waited)
 
         # old format
-        f = open(self.rc, 'w')
-        f.write(PYPIRC_OLD)
-        f.close()
-
+        self.write_file(self.rc, PYPIRC_OLD)
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
@@ -116,19 +100,14 @@ def test_server_registration(self):
         self.assertEquals(config, waited)
 
     def test_server_empty_registration(self):
-
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
         self.assert_(not os.path.exists(rc))
-
         cmd._store_pypirc('tarek', 'xxx')
-
         self.assert_(os.path.exists(rc))
         content = open(rc).read()
-
         self.assertEquals(content, WANTED)
 
-
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 3ac0fdd1e1..092bd14f93 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -38,11 +38,13 @@ def find_config_files(self):
 class DistributionTestCase(unittest.TestCase):
 
     def setUp(self):
+        super(DistributionTestCase, self).setUp()
         self.argv = sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
         sys.argv[:] = self.argv
+        super(DistributionTestCase, self).tearDown()
 
     def create_distribution(self, configfiles=()):
         d = TestDistribution()
@@ -121,7 +123,8 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
-class MetadataTestCase(support.TempdirManager, unittest.TestCase):
+class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
+                       unittest.TestCase):
 
     def test_simple_metadata(self):
         attrs = {"name": "package",
@@ -208,13 +211,6 @@ def format_metadata(self, dist):
     def test_custom_pydistutils(self):
         # fixes #2166
         # make sure pydistutils.cfg is found
-        old = {}
-        for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
-            value = os.environ.get(env)
-            old[env] = value
-            if value is not None:
-                del os.environ[env]
-
         if os.name == 'posix':
             user_filename = ".pydistutils.cfg"
         else:
@@ -231,22 +227,18 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                os.environ['HOME'] = temp_dir
+                self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOME'] = temp_dir
+                self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assert_(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
         finally:
-            for key, value in old.items():
-                if value is None:
-                    continue
-                os.environ[key] = value
             os.remove(user_filename)
 
 def test_suite():
diff --git a/tests/test_util.py b/tests/test_util.py
index ea7c5925b7..cee7d5263b 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -8,28 +8,23 @@
 from copy import copy
 
 from distutils.errors import DistutilsPlatformError
-
-from distutils.util import get_platform
-from distutils.util import convert_path
-from distutils.util import change_root
-from distutils.util import check_environ
-from distutils.util import split_quoted
-from distutils.util import strtobool
-from distutils.util import rfc822_escape
-
+from distutils.util import (get_platform, convert_path, change_root,
+                            check_environ, split_quoted, strtobool,
+                            rfc822_escape)
 from distutils import util # used to patch _environ_checked
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
+from distutils.tests import support
 
-class utilTestCase(unittest.TestCase):
+class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
     def setUp(self):
+        super(UtilTestCase, self).setUp()
         # saving the environment
         self.name = os.name
         self.platform = sys.platform
         self.version = sys.version
         self.sep = os.sep
-        self.environ = dict(os.environ)
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
@@ -51,10 +46,6 @@ def tearDown(self):
         sys.platform = self.platform
         sys.version = self.version
         os.sep = self.sep
-        for k, v in self.environ.items():
-            os.environ[k] = v
-        for k in set(os.environ) - set(self.environ):
-            del os.environ[k]
         os.path.join = self.join
         os.path.isabs = self.isabs
         os.path.splitdrive = self.splitdrive
@@ -63,6 +54,7 @@ def tearDown(self):
         else:
             del os.uname
         sysconfig._config_vars = copy(self._config_vars)
+        super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):
         self._uname = uname
@@ -102,7 +94,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -110,7 +102,7 @@ def test_get_platform(self):
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -214,21 +206,14 @@ def test_check_environ(self):
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
-            old_home = os.environ.get('HOME')
-            try:
-                check_environ()
-                import pwd
-                self.assertEquals(os.environ['HOME'],
-                                  pwd.getpwuid(os.getuid())[5])
-            finally:
-                if old_home is not None:
-                    os.environ['HOME'] = old_home
-                else:
-                    del os.environ['HOME']
+            check_environ()
+            import pwd
+            self.assertEquals(self.environ['HOME'],
+                            pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(os.environ['PLAT'], get_platform())
+        self.assertEquals(self.environ['PLAT'], get_platform())
         self.assertEquals(util._environ_checked, 1)
 
     def test_split_quoted(self):
@@ -253,7 +238,7 @@ def test_rfc822_escape(self):
         self.assertEquals(res, wanted)
 
 def test_suite():
-    return unittest.makeSuite(utilTestCase)
+    return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")

From f07c0de2be03f3de0a085d813069b42b71650cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 12:36:48 +0000
Subject: [PATCH 2284/8469] fixed test for all platforms

---
 tests/test_install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 69a24faf71..d768166829 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -57,7 +57,7 @@ def test_get_outputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_output should return 4 elements
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assert_(len(cmd.get_outputs()) >= 2)
 
     def test_get_inputs(self):
         pkg_dir, dist = self.create_dist()

From 61608597d3a2eb12e119267100a479ba2657bd51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 12:38:16 +0000
Subject: [PATCH 2285/8469] Merged revisions 72547 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72547 | tarek.ziade | 2009-05-10 14:36:48 +0200 (Sun, 10 May 2009) | 1 line

  fixed test for all platforms
........
---
 tests/test_install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 69a24faf71..d768166829 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -57,7 +57,7 @@ def test_get_outputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_output should return 4 elements
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assert_(len(cmd.get_outputs()) >= 2)
 
     def test_get_inputs(self):
         pkg_dir, dist = self.create_dist()

From faf53a7e22608dcd7399ef71fb5b6bcc3e126e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 21:27:55 +0000
Subject: [PATCH 2286/8469] fixed test_build_ext for win32

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index dab9712a56..54d6b96d34 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -192,7 +192,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+        self.assert_('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths

From f2e737ac9bcefdd21eaf377af03fb370b23c1997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 21:31:23 +0000
Subject: [PATCH 2287/8469] Merged revisions 72552 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72552 | tarek.ziade | 2009-05-10 23:27:55 +0200 (Sun, 10 May 2009) | 1 line

  fixed test_build_ext for win32
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index c22be2ac09..6f71a4ab12 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -192,7 +192,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+        self.assert_('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths

From fb904cc2f4a3dc797b02f2d0fb8ad5684d35cd73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 10 May 2009 21:33:09 +0000
Subject: [PATCH 2288/8469] Merged revisions 72552 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72552 | tarek.ziade | 2009-05-10 23:27:55 +0200 (Sun, 10 May 2009) | 1 line

  fixed test_build_ext for win32
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 98ae8cf3b4..dc40d13fc7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -129,7 +129,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.library_dirs, ['my_lib_dir'])
+        self.assert_('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths

From 364368f687f823446e11af8b83a322ebba528f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 May 2009 08:45:17 +0000
Subject: [PATCH 2289/8469] distutils.test_build_clib added a new line at the
 end of the file, to avoid a warning with some compilers

---
 tests/test_build_clib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 3c6643f354..47d85cd8b4 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -109,7 +109,7 @@ def test_run(self):
         cmd = build_clib(dist)
 
         foo_c = os.path.join(pkg_dir, 'foo.c')
-        self.write_file(foo_c, 'int main(void) { return 1;}')
+        self.write_file(foo_c, 'int main(void) { return 1;}\n')
         cmd.libraries = [('foo', {'sources': [foo_c]})]
 
         build_temp = os.path.join(pkg_dir, 'build')

From 34a3ad72ee75c89f2510ecf11c65a62a759944f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 May 2009 08:49:17 +0000
Subject: [PATCH 2290/8469] Merged revisions 72560 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72560 | tarek.ziade | 2009-05-11 10:45:17 +0200 (Mon, 11 May 2009) | 1 line

  distutils.test_build_clib added a new line at the end of the file, to avoid a warning with some compilers
........
---
 tests/test_build_clib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 3c6643f354..47d85cd8b4 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -109,7 +109,7 @@ def test_run(self):
         cmd = build_clib(dist)
 
         foo_c = os.path.join(pkg_dir, 'foo.c')
-        self.write_file(foo_c, 'int main(void) { return 1;}')
+        self.write_file(foo_c, 'int main(void) { return 1;}\n')
         cmd.libraries = [('foo', {'sources': [foo_c]})]
 
         build_temp = os.path.join(pkg_dir, 'build')

From cb0eb9b3590a42eae1cd86e70345fd86d5b923dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 07:01:29 +0000
Subject: [PATCH 2291/8469] removing the assert statement so the code works
 when Python is run with -O

---
 command/install_lib.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 87e3c7aa04..411db79cc2 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -80,7 +80,8 @@ def finalize_options(self):
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert self.optimize in (0, 1, 2)
+                if self.optimize not in (0, 1, 2):
+                    raise AssertionError
             except (ValueError, AssertionError):
                 raise DistutilsOptionError, "optimize must be 0, 1, or 2"
 

From 57df14c3ab3980b1245a959940e5a6d20e61dfde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 07:04:51 +0000
Subject: [PATCH 2292/8469] Merged revisions 72577 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72577 | tarek.ziade | 2009-05-12 09:01:29 +0200 (Tue, 12 May 2009) | 1 line

  removing the assert statement so the code works when Python is run with -O
........
---
 command/install_lib.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 81107a85cb..4ea61d78dc 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -80,7 +80,8 @@ def finalize_options (self):
         if type(self.optimize) is not IntType:
             try:
                 self.optimize = int(self.optimize)
-                assert 0 <= self.optimize <= 2
+                if self.optimize not in (0, 1, 2):
+                    raise AssertionError
             except (ValueError, AssertionError):
                 raise DistutilsOptionError, "optimize must be 0, 1, or 2"
 

From 5c2bbef86612775eb376d2dd50d50242c87793ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 07:06:42 +0000
Subject: [PATCH 2293/8469] Merged revisions 72577 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72577 | tarek.ziade | 2009-05-12 09:01:29 +0200 (Tue, 12 May 2009) | 1 line

  removing the assert statement so the code works when Python is run with -O
........
---
 command/install_lib.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/install_lib.py b/command/install_lib.py
index 022efa48fc..85fb3acd4e 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -77,7 +77,8 @@ def finalize_options(self):
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert self.optimize in (0, 1, 2)
+                if self.optimize not in (0, 1, 2):
+                    raise AssertionError
             except (ValueError, AssertionError):
                 raise DistutilsOptionError("optimize must be 0, 1, or 2")
 

From 870adffdf536f9ce4762af9f1501dc4733a529f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 17:07:14 +0000
Subject: [PATCH 2294/8469] fixed #5977: distutils build_ext.get_outputs was
 not using the inplace option

---
 command/build_ext.py    | 87 +++++++++++++++++++++--------------------
 tests/test_build_ext.py | 43 ++++++++++++++++++--
 2 files changed, 85 insertions(+), 45 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index dfabf91091..73fd768026 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -311,38 +311,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=self.compiler,
+        self._compiler = new_compiler(compiler=self.compiler,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self.compiler)
+        customize_compiler(self._compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler.initialize(self.plat_name)
+            self._compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs(self.include_dirs)
+            self._compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler.define_macro(name, value)
+                self._compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro(macro)
+                self._compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries(self.libraries)
+            self._compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs(self.library_dirs)
+            self._compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs(self.rpath)
+            self._compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects(self.link_objects)
+            self._compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -446,9 +446,7 @@ def get_outputs(self):
         # "build" tree.
         outputs = []
         for ext in self.extensions:
-            fullname = self.get_ext_fullname(ext.name)
-            outputs.append(os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname)))
+            outputs.append(self.get_ext_fullpath(ext.name))
         return outputs
 
     def build_extensions(self):
@@ -473,24 +471,9 @@ def build_extension(self, ext):
                    "a list of source filenames") % ext.name
         sources = list(sources)
 
-        fullname = self.get_ext_fullname(ext.name)
-        if self.inplace:
-            # ignore build-lib -- put the compiled extension into
-            # the source tree along with pure Python modules
-
-            modpath = string.split(fullname, '.')
-            package = string.join(modpath[0:-1], '.')
-            base = modpath[-1]
-
-            build_py = self.get_finalized_command('build_py')
-            package_dir = build_py.get_package_dir(package)
-            ext_filename = os.path.join(package_dir,
-                                        self.get_ext_filename(base))
-        else:
-            ext_filename = os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname))
+        ext_path = self.get_ext_fullpath(ext.name)
         depends = sources + ext.depends
-        if not (self.force or newer_group(depends, ext_filename, 'newer')):
+        if not (self.force or newer_group(depends, ext_path, 'newer')):
             log.debug("skipping '%s' extension (up-to-date)", ext.name)
             return
         else:
@@ -521,13 +504,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler.compile(sources,
-                                        output_dir=self.build_temp,
-                                        macros=macros,
-                                        include_dirs=ext.include_dirs,
-                                        debug=self.debug,
-                                        extra_postargs=extra_args,
-                                        depends=ext.depends)
+        objects = self._compiler.compile(sources,
+                                         output_dir=self.build_temp,
+                                         macros=macros,
+                                         include_dirs=ext.include_dirs,
+                                         debug=self.debug,
+                                         extra_postargs=extra_args,
+                                         depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -548,10 +531,10 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler.detect_language(sources)
+        language = ext.language or self._compiler.detect_language(sources)
 
-        self.compiler.link_shared_object(
-            objects, ext_filename,
+        self._compiler.link_shared_object(
+            objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
@@ -653,8 +636,28 @@ def find_swig (self):
 
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
+    def get_ext_fullpath(self, ext_name):
+        """Returns the path of the filename for a given extension.
+
+        The file is located in `build_lib` or directly in the package
+        (inplace option).
+        """
+        if self.inplace:
+            fullname = self.get_ext_fullname(ext_name)
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[0:-1])
+            base = modpath[-1]
+            build_py = self.get_finalized_command('build_py')
+            package_dir = os.path.abspath(build_py.get_package_dir(package))
+            return os.path.join(package_dir, base)
+        else:
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(self.build_lib, filename)
+
+    def get_ext_fullname(self, ext_name):
+        """Returns the fullname of a given extension name.
 
-    def get_ext_fullname (self, ext_name):
+        Adds the `package.` prefix"""
         if self.package is None:
             return ext_name
         else:
@@ -701,7 +704,7 @@ def get_libraries (self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler, MSVCCompiler):
+            if not isinstance(self._compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 54d6b96d34..5cdfc2a9eb 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -113,7 +113,7 @@ def test_solaris_enable_shared(self):
             else:
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
-        # make sur we get some lobrary dirs under solaris
+        # make sure we get some library dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
     def test_user_site(self):
@@ -282,13 +282,50 @@ def test_get_source_files(self):
         cmd.ensure_finalized()
         self.assertEquals(cmd.get_source_files(), ['xxx'])
 
+    def test_compiler_option(self):
+        # cmd.compiler is an option and
+        # should not be overriden by a compiler instance
+        # when the command is run
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.compiler = 'unix'
+        cmd.ensure_finalized()
+        cmd.run()
+        self.assertEquals(cmd.compiler, 'unix')
+
     def test_get_outputs(self):
-        modules = [Extension('foo', ['xxx'], optional=False)]
-        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        tmp_dir = self.mkdtemp()
+        c_file = os.path.join(tmp_dir, 'foo.c')
+        self.write_file(c_file, '')
+        ext = Extension('foo', [c_file], optional=False)
+        dist = Distribution({'name': 'xx',
+                             'ext_modules': [ext]})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 
+        if os.name == "nt":
+            cmd.debug = sys.executable.endswith("_d.exe")
+
+        cmd.build_lib = os.path.join(self.tmp_dir, 'build')
+        cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
+
+        # issue #5977 : distutils build_ext.get_outputs
+        # returns wrong result with --inplace
+        cmd.inplace = 1
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, os.getcwd())
+
+        cmd.inplace = 0
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, cmd.build_lib)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 22a803701f441d9cc088ceb95c6c9559180158dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 17:11:54 +0000
Subject: [PATCH 2295/8469] Merged revisions 72585 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72585 | tarek.ziade | 2009-05-12 19:07:14 +0200 (Tue, 12 May 2009) | 1 line

  fixed #5977: distutils build_ext.get_outputs was not using the inplace option
........
---
 command/build_ext.py    | 87 +++++++++++++++++++++--------------------
 tests/support.py        | 12 ++++++
 tests/test_build_ext.py | 43 ++++++++++++++++++--
 3 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c03951cb12..c611ad48c0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -303,38 +303,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=self.compiler,
+        self._compiler = new_compiler(compiler=self.compiler,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self.compiler)
+        customize_compiler(self._compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler.initialize(self.plat_name)
+            self._compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs(self.include_dirs)
+            self._compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler.define_macro(name, value)
+                self._compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro(macro)
+                self._compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries(self.libraries)
+            self._compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs(self.library_dirs)
+            self._compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs(self.rpath)
+            self._compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects(self.link_objects)
+            self._compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -438,9 +438,7 @@ def get_outputs(self):
         # "build" tree.
         outputs = []
         for ext in self.extensions:
-            fullname = self.get_ext_fullname(ext.name)
-            outputs.append(os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname)))
+            outputs.append(self.get_ext_fullpath(ext.name))
         return outputs
 
     def build_extensions(self):
@@ -459,24 +457,9 @@ def build_extension(self, ext):
                    "a list of source filenames") % ext.name
         sources = list(sources)
 
-        fullname = self.get_ext_fullname(ext.name)
-        if self.inplace:
-            # ignore build-lib -- put the compiled extension into
-            # the source tree along with pure Python modules
-
-            modpath = string.split(fullname, '.')
-            package = string.join(modpath[0:-1], '.')
-            base = modpath[-1]
-
-            build_py = self.get_finalized_command('build_py')
-            package_dir = build_py.get_package_dir(package)
-            ext_filename = os.path.join(package_dir,
-                                        self.get_ext_filename(base))
-        else:
-            ext_filename = os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname))
+        ext_path = self.get_ext_fullpath(ext.name)
         depends = sources + ext.depends
-        if not (self.force or newer_group(depends, ext_filename, 'newer')):
+        if not (self.force or newer_group(depends, ext_path, 'newer')):
             log.debug("skipping '%s' extension (up-to-date)", ext.name)
             return
         else:
@@ -507,13 +490,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler.compile(sources,
-                                        output_dir=self.build_temp,
-                                        macros=macros,
-                                        include_dirs=ext.include_dirs,
-                                        debug=self.debug,
-                                        extra_postargs=extra_args,
-                                        depends=ext.depends)
+        objects = self._compiler.compile(sources,
+                                         output_dir=self.build_temp,
+                                         macros=macros,
+                                         include_dirs=ext.include_dirs,
+                                         debug=self.debug,
+                                         extra_postargs=extra_args,
+                                         depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -534,10 +517,10 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler.detect_language(sources)
+        language = ext.language or self._compiler.detect_language(sources)
 
-        self.compiler.link_shared_object(
-            objects, ext_filename,
+        self._compiler.link_shared_object(
+            objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
@@ -639,8 +622,28 @@ def find_swig (self):
 
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
+    def get_ext_fullpath(self, ext_name):
+        """Returns the path of the filename for a given extension.
+
+        The file is located in `build_lib` or directly in the package
+        (inplace option).
+        """
+        if self.inplace:
+            fullname = self.get_ext_fullname(ext_name)
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[0:-1])
+            base = modpath[-1]
+            build_py = self.get_finalized_command('build_py')
+            package_dir = os.path.abspath(build_py.get_package_dir(package))
+            return os.path.join(package_dir, base)
+        else:
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(self.build_lib, filename)
+
+    def get_ext_fullname(self, ext_name):
+        """Returns the fullname of a given extension name.
 
-    def get_ext_fullname (self, ext_name):
+        Adds the `package.` prefix"""
         if self.package is None:
             return ext_name
         else:
@@ -687,7 +690,7 @@ def get_libraries (self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler, MSVCCompiler):
+            if not isinstance(self._compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
diff --git a/tests/support.py b/tests/support.py
index 475ceee598..d24a18ea0e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -42,6 +42,18 @@ def mkdtemp(self):
         self.tempdirs.append(d)
         return d
 
+    def write_file(self, path, content='xxx'):
+        """Writes a file in the given path.
+
+        path can be a string or a sequence.
+        """
+        if isinstance(path, (list, tuple)):
+            path = os.path.join(*path)
+        f = open(path, 'w')
+        try:
+            f.write(content)
+        finally:
+            f.close()
 
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index dc40d13fc7..8889798c88 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -99,7 +99,7 @@ def test_solaris_enable_shared(self):
             else:
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
-        # make sur we get some lobrary dirs under solaris
+        # make sure we get some library dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
     def test_finalize_options(self):
@@ -219,13 +219,50 @@ def test_get_source_files(self):
         cmd.ensure_finalized()
         self.assertEquals(cmd.get_source_files(), ['xxx'])
 
+    def test_compiler_option(self):
+        # cmd.compiler is an option and
+        # should not be overriden by a compiler instance
+        # when the command is run
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.compiler = 'unix'
+        cmd.ensure_finalized()
+        cmd.run()
+        self.assertEquals(cmd.compiler, 'unix')
+
     def test_get_outputs(self):
-        modules = [Extension('foo', ['xxx'])]
-        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        tmp_dir = self.mkdtemp()
+        c_file = os.path.join(tmp_dir, 'foo.c')
+        self.write_file(c_file, '')
+        ext = Extension('foo', [c_file])
+        dist = Distribution({'name': 'xx',
+                             'ext_modules': [ext]})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 
+        if os.name == "nt":
+            cmd.debug = sys.executable.endswith("_d.exe")
+
+        cmd.build_lib = os.path.join(self.tmp_dir, 'build')
+        cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
+
+        # issue #5977 : distutils build_ext.get_outputs
+        # returns wrong result with --inplace
+        cmd.inplace = 1
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, os.getcwd())
+
+        cmd.inplace = 0
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, cmd.build_lib)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 8120d37484b292b246b7d0673a9faa0262a7696d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 12 May 2009 17:14:01 +0000
Subject: [PATCH 2296/8469] Merged revisions 72585 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72585 | tarek.ziade | 2009-05-12 19:07:14 +0200 (Tue, 12 May 2009) | 1 line

  fixed #5977: distutils build_ext.get_outputs was not using the inplace option
........
---
 command/build_ext.py    | 85 +++++++++++++++++++++--------------------
 tests/test_build_ext.py | 43 +++++++++++++++++++--
 2 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index d3668e9f4c..e305bde913 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -310,38 +310,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=self.compiler,
+        self._compiler = new_compiler(compiler=self.compiler,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self.compiler)
+        customize_compiler(self._compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler.initialize(self.plat_name)
+            self._compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs(self.include_dirs)
+            self._compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler.define_macro(name, value)
+                self._compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro(macro)
+                self._compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries(self.libraries)
+            self._compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs(self.library_dirs)
+            self._compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs(self.rpath)
+            self._compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects(self.link_objects)
+            self._compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -444,9 +444,7 @@ def get_outputs(self):
         # "build" tree.
         outputs = []
         for ext in self.extensions:
-            fullname = self.get_ext_fullname(ext.name)
-            outputs.append(os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname)))
+            outputs.append(self.get_ext_fullpath(ext.name))
         return outputs
 
     def build_extensions(self):
@@ -471,24 +469,9 @@ def build_extension(self, ext):
                   "a list of source filenames" % ext.name)
         sources = list(sources)
 
-        fullname = self.get_ext_fullname(ext.name)
-        if self.inplace:
-            # ignore build-lib -- put the compiled extension into
-            # the source tree along with pure Python modules
-
-            modpath = fullname.split('.')
-            package = '.'.join(modpath[0:-1])
-            base = modpath[-1]
-
-            build_py = self.get_finalized_command('build_py')
-            package_dir = build_py.get_package_dir(package)
-            ext_filename = os.path.join(package_dir,
-                                        self.get_ext_filename(base))
-        else:
-            ext_filename = os.path.join(self.build_lib,
-                                        self.get_ext_filename(fullname))
+        ext_path = self.get_ext_fullpath(ext.name)
         depends = sources + ext.depends
-        if not (self.force or newer_group(depends, ext_filename, 'newer')):
+        if not (self.force or newer_group(depends, ext_path, 'newer')):
             log.debug("skipping '%s' extension (up-to-date)", ext.name)
             return
         else:
@@ -519,13 +502,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler.compile(sources,
-                                        output_dir=self.build_temp,
-                                        macros=macros,
-                                        include_dirs=ext.include_dirs,
-                                        debug=self.debug,
-                                        extra_postargs=extra_args,
-                                        depends=ext.depends)
+        objects = self._compiler.compile(sources,
+                                         output_dir=self.build_temp,
+                                         macros=macros,
+                                         include_dirs=ext.include_dirs,
+                                         debug=self.debug,
+                                         extra_postargs=extra_args,
+                                         depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -546,10 +529,10 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler.detect_language(sources)
+        language = ext.language or self._compiler.detect_language(sources)
 
-        self.compiler.link_shared_object(
-            objects, ext_filename,
+        self._compiler.link_shared_object(
+            objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
@@ -640,8 +623,28 @@ def find_swig(self):
 
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
+    def get_ext_fullpath(self, ext_name):
+        """Returns the path of the filename for a given extension.
+
+        The file is located in `build_lib` or directly in the package
+        (inplace option).
+        """
+        if self.inplace:
+            fullname = self.get_ext_fullname(ext_name)
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[0:-1])
+            base = modpath[-1]
+            build_py = self.get_finalized_command('build_py')
+            package_dir = os.path.abspath(build_py.get_package_dir(package))
+            return os.path.join(package_dir, base)
+        else:
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(self.build_lib, filename)
 
     def get_ext_fullname(self, ext_name):
+        """Returns the fullname of a given extension name.
+
+        Adds the `package.` prefix"""
         if self.package is None:
             return ext_name
         else:
@@ -686,7 +689,7 @@ def get_libraries(self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler, MSVCCompiler):
+            if not isinstance(self._compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6f71a4ab12..86064fccc1 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -113,7 +113,7 @@ def test_solaris_enable_shared(self):
             else:
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
-        # make sur we get some lobrary dirs under solaris
+        # make sure we get some library dirs under solaris
         self.assert_(len(cmd.library_dirs) > 0)
 
     def test_user_site(self):
@@ -282,13 +282,50 @@ def test_get_source_files(self):
         cmd.ensure_finalized()
         self.assertEquals(cmd.get_source_files(), ['xxx'])
 
+    def test_compiler_option(self):
+        # cmd.compiler is an option and
+        # should not be overriden by a compiler instance
+        # when the command is run
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.compiler = 'unix'
+        cmd.ensure_finalized()
+        cmd.run()
+        self.assertEquals(cmd.compiler, 'unix')
+
     def test_get_outputs(self):
-        modules = [Extension('foo', ['xxx'], optional=False)]
-        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        tmp_dir = self.mkdtemp()
+        c_file = os.path.join(tmp_dir, 'foo.c')
+        self.write_file(c_file, '')
+        ext = Extension('foo', [c_file], optional=False)
+        dist = Distribution({'name': 'xx',
+                             'ext_modules': [ext]})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 
+        if os.name == "nt":
+            cmd.debug = sys.executable.endswith("_d.exe")
+
+        cmd.build_lib = os.path.join(self.tmp_dir, 'build')
+        cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
+
+        # issue #5977 : distutils build_ext.get_outputs
+        # returns wrong result with --inplace
+        cmd.inplace = 1
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, os.getcwd())
+
+        cmd.inplace = 0
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
+        self.assert_(os.path.exists(so_file))
+        so_dir = os.path.dirname(so_file)
+        self.assertEquals(so_dir, cmd.build_lib)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 5042c7cc1026361bd2ce98f951a19ad2f3ece578 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 12 May 2009 21:06:05 +0000
Subject: [PATCH 2297/8469] the compiler attribute is used in setup.py; can't
 rename

---
 command/build_ext.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 73fd768026..10d50fade7 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -311,38 +311,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self._compiler = new_compiler(compiler=self.compiler,
+        self.compiler = new_compiler(compiler=None,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self._compiler)
+        customize_compiler(self.compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self._compiler.initialize(self.plat_name)
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self._compiler.set_include_dirs(self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self._compiler.define_macro(name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self._compiler.undefine_macro(macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self._compiler.set_libraries(self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self._compiler.set_library_dirs(self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self._compiler.set_runtime_library_dirs(self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self._compiler.set_link_objects(self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -504,7 +504,7 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self._compiler.compile(sources,
+        objects = self.compiler.compile(sources,
                                          output_dir=self.build_temp,
                                          macros=macros,
                                          include_dirs=ext.include_dirs,
@@ -531,9 +531,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self._compiler.detect_language(sources)
+        language = ext.language or self.compiler.detect_language(sources)
 
-        self._compiler.link_shared_object(
+        self.compiler.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -704,7 +704,7 @@ def get_libraries (self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self._compiler, MSVCCompiler):
+            if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'

From 431ef0a9555d0ccdd974e61a4cad5159dbdbc22a Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 12 May 2009 21:20:41 +0000
Subject: [PATCH 2298/8469] Merged revisions 72593 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72593 | benjamin.peterson | 2009-05-12 16:06:05 -0500 (Tue, 12 May 2009) | 1 line

  the compiler attribute is used in setup.py; can't rename
........
---
 command/build_ext.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c611ad48c0..01bab3664f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -303,38 +303,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self._compiler = new_compiler(compiler=self.compiler,
+        self.compiler = new_compiler(compiler=None,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self._compiler)
+        customize_compiler(self.compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self._compiler.initialize(self.plat_name)
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self._compiler.set_include_dirs(self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self._compiler.define_macro(name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self._compiler.undefine_macro(macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self._compiler.set_libraries(self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self._compiler.set_library_dirs(self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self._compiler.set_runtime_library_dirs(self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self._compiler.set_link_objects(self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -490,7 +490,7 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self._compiler.compile(sources,
+        objects = self.compiler.compile(sources,
                                          output_dir=self.build_temp,
                                          macros=macros,
                                          include_dirs=ext.include_dirs,
@@ -517,9 +517,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self._compiler.detect_language(sources)
+        language = ext.language or self.compiler.detect_language(sources)
 
-        self._compiler.link_shared_object(
+        self.compiler.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -690,7 +690,7 @@ def get_libraries (self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self._compiler, MSVCCompiler):
+            if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'

From d39a44c5da79381e4ae7dd7502e8a398814072d1 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 12 May 2009 21:21:26 +0000
Subject: [PATCH 2299/8469] Merged revisions 72593 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72593 | benjamin.peterson | 2009-05-12 16:06:05 -0500 (Tue, 12 May 2009) | 1 line

  the compiler attribute is used in setup.py; can't rename
........
---
 command/build_ext.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index e305bde913..c39bd72d62 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -310,38 +310,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self._compiler = new_compiler(compiler=self.compiler,
+        self.compiler = new_compiler(compiler=None,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
-        customize_compiler(self._compiler)
+        customize_compiler(self.compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self._compiler.initialize(self.plat_name)
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self._compiler.set_include_dirs(self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self._compiler.define_macro(name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self._compiler.undefine_macro(macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self._compiler.set_libraries(self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self._compiler.set_library_dirs(self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self._compiler.set_runtime_library_dirs(self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self._compiler.set_link_objects(self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -502,7 +502,7 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self._compiler.compile(sources,
+        objects = self.compiler.compile(sources,
                                          output_dir=self.build_temp,
                                          macros=macros,
                                          include_dirs=ext.include_dirs,
@@ -529,9 +529,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self._compiler.detect_language(sources)
+        language = ext.language or self.compiler.detect_language(sources)
 
-        self._compiler.link_shared_object(
+        self.compiler.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -689,7 +689,7 @@ def get_libraries(self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self._compiler, MSVCCompiler):
+            if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'

From f3af1e26187c79c6ff1e0a3ea442d354015654f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 13 May 2009 21:30:06 +0000
Subject: [PATCH 2300/8469] added an inifoo in the C file, to avoid a warning
 by the MSVC9 linker

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5cdfc2a9eb..6d3852cc4c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -296,7 +296,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, '')
+        self.write_file(c_file, 'void initfoo() {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 300d6e9a8f330cae08065bf5612f4c03eec5207b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 13 May 2009 22:08:54 +0000
Subject: [PATCH 2301/8469] Merged revisions 72610 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72610 | tarek.ziade | 2009-05-13 23:30:06 +0200 (Wed, 13 May 2009) | 1 line

  added an inifoo in the C file, to avoid a warning by the MSVC9 linker
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 8889798c88..20f0553985 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -233,7 +233,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, '')
+        self.write_file(c_file, 'void initfoo() {};\n')
         ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 6378315ebc64b957142fb142058415a4210784e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 13 May 2009 22:16:03 +0000
Subject: [PATCH 2302/8469] adding void to the c function

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6d3852cc4c..45c5b39e0f 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -296,7 +296,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo() {};\n')
+        self.write_file(c_file, 'void initfoo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From fcca9f694a425f7e4c647977e32a48eda9033c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 13 May 2009 22:18:01 +0000
Subject: [PATCH 2303/8469] Merged revisions 72612 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72612 | tarek.ziade | 2009-05-14 00:16:03 +0200 (Thu, 14 May 2009) | 1 line

  adding void to the c function
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 20f0553985..cf254ac1c4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -233,7 +233,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo() {};\n')
+        self.write_file(c_file, 'void initfoo(void) {};\n')
         ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 9cc675e40154417eefcd9ccc24d5284d37969387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 13 May 2009 22:20:49 +0000
Subject: [PATCH 2304/8469] Merged revisions 72610,72612 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72610 | tarek.ziade | 2009-05-13 23:30:06 +0200 (Wed, 13 May 2009) | 1 line

  added an inifoo in the C file, to avoid a warning by the MSVC9 linker
........
  r72612 | tarek.ziade | 2009-05-14 00:16:03 +0200 (Thu, 14 May 2009) | 1 line

  adding void to the c function
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 86064fccc1..64ca6505c1 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -296,7 +296,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, '')
+        self.write_file(c_file, 'void initfoo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 1a7f413db150145be8fe3964d491c9ae9946be8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 12:40:59 +0000
Subject: [PATCH 2305/8469] more test coverage for distutils sdist command

---
 command/sdist.py    |  7 +++----
 tests/test_sdist.py | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index a9ce28a7eb..f77f52c174 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -16,19 +16,18 @@
 from distutils import log
 from distutils.util import convert_path
 
-def show_formats ():
+def show_formats():
     """Print all possible values for the 'formats' option (used by
     the "--help-formats" command-line option).
     """
     from distutils.fancy_getopt import FancyGetopt
     from distutils.archive_util import ARCHIVE_FORMATS
-    formats=[]
+    formats = []
     for format in ARCHIVE_FORMATS.keys():
         formats.append(("formats=" + format, None,
                         ARCHIVE_FORMATS[format][2]))
     formats.sort()
-    pretty_printer = FancyGetopt(formats)
-    pretty_printer.print_help(
+    FancyGetopt(formats).print_help(
         "List of available source distribution formats:")
 
 class sdist (Command):
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 8af080f950..551357edc7 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -7,12 +7,16 @@
 import sys
 import tempfile
 
+from test.test_support import captured_stdout
+
 from distutils.command.sdist import sdist
+from distutils.command.sdist import show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
 from distutils.tests import support
+from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
 from distutils.core import setup
@@ -210,6 +214,16 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    def test_show_formats(self):
+        with captured_stdout() as stdout:
+            show_formats()
+
+        # the output should be a header line + one line per format
+        num_formats = len(ARCHIVE_FORMATS.keys())
+        output = [line for line in stdout.getvalue().split('\n')
+                  if line.strip().startswith('--formats=')]
+        self.assertEquals(len(output), num_formats)
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 8b08ff04c6c2e891754498db8908825b6c79444c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 12:45:48 +0000
Subject: [PATCH 2306/8469] Merged revisions 72618 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72618 | tarek.ziade | 2009-05-14 14:40:59 +0200 (Thu, 14 May 2009) | 1 line

  more test coverage for distutils sdist command
........
---
 command/sdist.py    |  7 +++----
 tests/test_sdist.py | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 1a64d0e3c1..836b962059 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -17,19 +17,18 @@
 from distutils import log
 from distutils.util import convert_path
 
-def show_formats ():
+def show_formats():
     """Print all possible values for the 'formats' option (used by
     the "--help-formats" command-line option).
     """
     from distutils.fancy_getopt import FancyGetopt
     from distutils.archive_util import ARCHIVE_FORMATS
-    formats=[]
+    formats = []
     for format in ARCHIVE_FORMATS.keys():
         formats.append(("formats=" + format, None,
                         ARCHIVE_FORMATS[format][2]))
     formats.sort()
-    pretty_printer = FancyGetopt(formats)
-    pretty_printer.print_help(
+    FancyGetopt(formats).print_help(
         "List of available source distribution formats:")
 
 class sdist (Command):
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 8af080f950..ec95ffb3aa 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -7,12 +7,16 @@
 import sys
 import tempfile
 
+from test.support import captured_stdout
+
 from distutils.command.sdist import sdist
+from distutils.command.sdist import show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
 from distutils.tests import support
+from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
 from distutils.core import setup
@@ -210,6 +214,16 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    def test_show_formats(self):
+        with captured_stdout() as stdout:
+            show_formats()
+
+        # the output should be a header line + one line per format
+        num_formats = len(ARCHIVE_FORMATS.keys())
+        output = [line for line in stdout.getvalue().split('\n')
+                  if line.strip().startswith('--formats=')]
+        self.assertEquals(len(output), num_formats)
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 6d9fe7ee5fca5acd065e820fb6ccb5ce3f665852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 14:56:14 +0000
Subject: [PATCH 2307/8469] pep8-fied distutils.command.sdist + more tests

---
 command/sdist.py    | 59 ++++++++++++---------------------------------
 tests/test_sdist.py | 24 +++++++++++++++++-
 2 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f77f52c174..ab0ada1f45 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -30,7 +30,7 @@ def show_formats():
     FancyGetopt(formats).print_help(
         "List of available source distribution formats:")
 
-class sdist (Command):
+class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
@@ -77,10 +77,10 @@ class sdist (Command):
     negative_opt = {'no-defaults': 'use-defaults',
                     'no-prune': 'prune' }
 
-    default_format = { 'posix': 'gztar',
-                       'nt': 'zip' }
+    default_format = {'posix': 'gztar',
+                      'nt': 'zip' }
 
-    def initialize_options (self):
+    def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
         self.template = None
@@ -100,8 +100,7 @@ def initialize_options (self):
 
         self.archive_files = None
 
-
-    def finalize_options (self):
+    def finalize_options(self):
         if self.manifest is None:
             self.manifest = "MANIFEST"
         if self.template is None:
@@ -124,9 +123,7 @@ def finalize_options (self):
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
-
-    def run (self):
-
+    def run(self):
         # 'filelist' contains the list of files that will make up the
         # manifest
         self.filelist = FileList()
@@ -148,8 +145,7 @@ def run (self):
         # or zipfile, or whatever.
         self.make_distribution()
 
-
-    def check_metadata (self):
+    def check_metadata(self):
         """Ensure that all required elements of meta-data (name, version,
         URL, (author and author_email) or (maintainer and
         maintainer_email)) are supplied by the Distribution object; warn if
@@ -179,17 +175,13 @@ def check_metadata (self):
                       "or (maintainer and maintainer_email) " +
                       "must be supplied")
 
-    # check_metadata ()
-
-
-    def get_file_list (self):
+    def get_file_list(self):
         """Figure out the list of files to include in the source
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
         depends on the user's options and the state of the filesystem.
         """
-
         # If we have a manifest template, see if it's newer than the
         # manifest; if so, we'll regenerate the manifest.
         template_exists = os.path.isfile(self.template)
@@ -249,10 +241,7 @@ def get_file_list (self):
         else:
             self.read_manifest()
 
-    # get_file_list ()
-
-
-    def add_defaults (self):
+    def add_defaults(self):
         """Add all the default files to self.filelist:
           - README or README.txt
           - setup.py
@@ -334,10 +323,7 @@ def add_defaults (self):
             build_scripts = self.get_finalized_command('build_scripts')
             self.filelist.extend(build_scripts.get_source_files())
 
-    # add_defaults ()
-
-
-    def read_template (self):
+    def read_template(self):
         """Read and parse manifest template file named by self.template.
 
         (usually "MANIFEST.in") The parsing and processing is done by
@@ -364,10 +350,7 @@ def read_template (self):
                                                template.current_line,
                                                msg))
 
-    # read_template ()
-
-
-    def prune_file_list (self):
+    def prune_file_list(self):
         """Prune off branches that might slip into the file list as created
         by 'read_template()', but really don't belong there:
           * the build tree (typically "build")
@@ -393,7 +376,7 @@ def prune_file_list (self):
         vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
         self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 
-    def write_manifest (self):
+    def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
@@ -402,10 +385,7 @@ def write_manifest (self):
                      (self.manifest, self.filelist.files),
                      "writing manifest file '%s'" % self.manifest)
 
-    # write_manifest ()
-
-
-    def read_manifest (self):
+    def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
         fill in 'self.filelist', the list of files to include in the source
         distribution.
@@ -421,10 +401,7 @@ def read_manifest (self):
             self.filelist.append(line)
         manifest.close()
 
-    # read_manifest ()
-
-
-    def make_release_tree (self, base_dir, files):
+    def make_release_tree(self, base_dir, files):
         """Create the directory tree that will become the source
         distribution archive.  All directories implied by the filenames in
         'files' are created under 'base_dir', and then we hard link or copy
@@ -466,9 +443,7 @@ def make_release_tree (self, base_dir, files):
 
         self.distribution.metadata.write_pkg_info(base_dir)
 
-    # make_release_tree ()
-
-    def make_distribution (self):
+    def make_distribution(self):
         """Create the source distribution(s).  First, we create the release
         tree with 'make_release_tree()'; then, we create all required
         archive files (according to 'self.formats') from the release tree.
@@ -497,10 +472,8 @@ def make_distribution (self):
         if not self.keep_temp:
             dir_util.remove_tree(base_dir, dry_run=self.dry_run)
 
-    def get_archive_files (self):
+    def get_archive_files(self):
         """Return the list of archive files created when the command
         was run, or None if the command hasn't run yet.
         """
         return self.archive_files
-
-# class sdist
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 551357edc7..4f3d4bb91d 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -13,7 +13,7 @@
 from distutils.command.sdist import show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
-from distutils.errors import DistutilsExecError
+from distutils.errors import DistutilsExecError, DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.tests import support
 from distutils.archive_util import ARCHIVE_FORMATS
@@ -224,6 +224,28 @@ def test_show_formats(self):
                   if line.strip().startswith('--formats=')]
         self.assertEquals(len(output), num_formats)
 
+    def test_finalize_options(self):
+
+        dist, cmd = self.get_cmd()
+        cmd.finalize_options()
+
+        # default options set by finalize
+        self.assertEquals(cmd.manifest, 'MANIFEST')
+        self.assertEquals(cmd.template, 'MANIFEST.in')
+        self.assertEquals(cmd.dist_dir, 'dist')
+
+        # formats has to be a string splitable on (' ', ',') or
+        # a stringlist
+        cmd.formats = 1
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+        cmd.formats = ['zip']
+        cmd.finalize_options()
+
+        # formats has to be known
+        cmd.formats = 'supazipa'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 31ada7d3a3d7f87bec35033113c5a8fda4c93fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 15:21:26 +0000
Subject: [PATCH 2308/8469] Merged revisions 72624 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72624 | tarek.ziade | 2009-05-14 16:56:14 +0200 (Thu, 14 May 2009) | 1 line

  pep8-fied distutils.command.sdist + more tests
........
---
 command/sdist.py    | 11 ++++-------
 tests/test_sdist.py | 24 +++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 836b962059..cbb77c212e 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -31,7 +31,7 @@ def show_formats():
     FancyGetopt(formats).print_help(
         "List of available source distribution formats:")
 
-class sdist (Command):
+class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
@@ -78,8 +78,8 @@ class sdist (Command):
     negative_opt = {'no-defaults': 'use-defaults',
                     'no-prune': 'prune' }
 
-    default_format = { 'posix': 'gztar',
-                       'nt': 'zip' }
+    default_format = {'posix': 'gztar',
+                      'nt': 'zip' }
 
     def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
@@ -101,7 +101,6 @@ def initialize_options(self):
 
         self.archive_files = None
 
-
     def finalize_options(self):
         if self.manifest is None:
             self.manifest = "MANIFEST"
@@ -125,7 +124,6 @@ def finalize_options(self):
         if self.dist_dir is None:
             self.dist_dir = "dist"
 
-
     def run(self):
         # 'filelist' contains the list of files that will make up the
         # manifest
@@ -244,7 +242,6 @@ def get_file_list(self):
         else:
             self.read_manifest()
 
-
     def add_defaults(self):
         """Add all the default files to self.filelist:
           - README or README.txt
@@ -373,7 +370,7 @@ def prune_file_list(self):
         vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps)
         self.filelist.exclude_pattern(vcs_ptrn, is_regex=1)
 
-    def write_manifest (self):
+    def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index ec95ffb3aa..9e27933773 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -13,7 +13,7 @@
 from distutils.command.sdist import show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
-from distutils.errors import DistutilsExecError
+from distutils.errors import DistutilsExecError, DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.tests import support
 from distutils.archive_util import ARCHIVE_FORMATS
@@ -224,6 +224,28 @@ def test_show_formats(self):
                   if line.strip().startswith('--formats=')]
         self.assertEquals(len(output), num_formats)
 
+    def test_finalize_options(self):
+
+        dist, cmd = self.get_cmd()
+        cmd.finalize_options()
+
+        # default options set by finalize
+        self.assertEquals(cmd.manifest, 'MANIFEST')
+        self.assertEquals(cmd.template, 'MANIFEST.in')
+        self.assertEquals(cmd.dist_dir, 'dist')
+
+        # formats has to be a string splitable on (' ', ',') or
+        # a stringlist
+        cmd.formats = 1
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+        cmd.formats = ['zip']
+        cmd.finalize_options()
+
+        # formats has to be known
+        cmd.formats = 'supazipa'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From 904218f8a1f5be2a86fefee8fa68d19a640ba166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 20:14:13 +0000
Subject: [PATCH 2309/8469] #6022 fixed test_get_outputs so it doesn't leaves a
 test file in the cwd

---
 tests/test_build_ext.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 45c5b39e0f..c6533ca9f7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -312,12 +312,18 @@ def test_get_outputs(self):
 
         # issue #5977 : distutils build_ext.get_outputs
         # returns wrong result with --inplace
-        cmd.inplace = 1
-        cmd.run()
-        so_file = cmd.get_outputs()[0]
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            cmd.inplace = 1
+            cmd.run()
+            so_file = cmd.get_outputs()[0]
+        finally:
+            os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, os.getcwd())
+        self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.run()

From edb14dc6af62abfb53b444fab52b38a1e5366acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 20:17:32 +0000
Subject: [PATCH 2310/8469] Merged revisions 72636 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72636 | tarek.ziade | 2009-05-14 22:14:13 +0200 (Thu, 14 May 2009) | 1 line

  #6022 fixed test_get_outputs so it doesn't leaves a test file in the cwd
........
---
 tests/test_build_ext.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index cf254ac1c4..2bd2292e8c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -249,12 +249,18 @@ def test_get_outputs(self):
 
         # issue #5977 : distutils build_ext.get_outputs
         # returns wrong result with --inplace
-        cmd.inplace = 1
-        cmd.run()
-        so_file = cmd.get_outputs()[0]
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            cmd.inplace = 1
+            cmd.run()
+            so_file = cmd.get_outputs()[0]
+        finally:
+            os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, os.getcwd())
+        self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.run()

From 15604e839e578d0b409d98f280e763621d33edb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 14 May 2009 20:20:47 +0000
Subject: [PATCH 2311/8469] Merged revisions 72636 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72636 | tarek.ziade | 2009-05-14 22:14:13 +0200 (Thu, 14 May 2009) | 1 line

  #6022 fixed test_get_outputs so it doesn't leaves a test file in the cwd
........
---
 tests/test_build_ext.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 64ca6505c1..6a463c0117 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -312,12 +312,18 @@ def test_get_outputs(self):
 
         # issue #5977 : distutils build_ext.get_outputs
         # returns wrong result with --inplace
-        cmd.inplace = 1
-        cmd.run()
-        so_file = cmd.get_outputs()[0]
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            cmd.inplace = 1
+            cmd.run()
+            so_file = cmd.get_outputs()[0]
+        finally:
+            os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, os.getcwd())
+        self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.run()

From 6f1556e53cd1edc7db121e1c0bafa91e061ca989 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 May 2009 17:27:30 +0000
Subject: [PATCH 2312/8469] Fix bootstrapping by removing uses of the copy
 module in distutils

---
 ccompiler.py | 11 +++++------
 dist.py      |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index a56a03880e..5a9ff76d67 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -7,7 +7,6 @@
 
 import sys, os, re
 from types import *
-from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
 from distutils.file_util import move_file
@@ -253,7 +252,7 @@ def set_include_dirs (self, dirs):
         any list of standard include directories that the compiler may
         search by default.
         """
-        self.include_dirs = copy (dirs)
+        self.include_dirs = dirs[:]
 
 
     def add_library (self, libname):
@@ -278,7 +277,7 @@ def set_libraries (self, libnames):
         not affect any standard system libraries that the linker may
         include by default.
         """
-        self.libraries = copy (libnames)
+        self.libraries = libnames[:]
 
 
     def add_library_dir (self, dir):
@@ -294,7 +293,7 @@ def set_library_dirs (self, dirs):
         strings).  This does not affect any standard library search path
         that the linker may search by default.
         """
-        self.library_dirs = copy (dirs)
+        self.library_dirs = dirs[:]
 
 
     def add_runtime_library_dir (self, dir):
@@ -309,7 +308,7 @@ def set_runtime_library_dirs (self, dirs):
         standard search path that the runtime linker may search by
         default.
         """
-        self.runtime_library_dirs = copy (dirs)
+        self.runtime_library_dirs = dirs[:]
 
 
     def add_link_object (self, object):
@@ -326,7 +325,7 @@ def set_link_objects (self, objects):
         files that the linker may include by default (such as system
         libraries).
         """
-        self.objects = copy (objects)
+        self.objects = objects[:]
 
 
     # -- Private utility methods --------------------------------------
diff --git a/dist.py b/dist.py
index 2d57ad09e9..5fe262b112 100644
--- a/dist.py
+++ b/dist.py
@@ -8,7 +8,6 @@
 
 import sys, os, string, re
 from types import *
-from copy import copy
 
 try:
     import warnings
@@ -537,7 +536,7 @@ def _parse_command_opts (self, parser, args):
         # merge it in with the global negative aliases.
         negative_opt = self.negative_opt
         if hasattr(cmd_class, 'negative_opt'):
-            negative_opt = copy(negative_opt)
+            negative_opt = negative_opt.copy()
             negative_opt.update(cmd_class.negative_opt)
 
         # Check for help_options in command class.  They have a different

From fb1d44bd30704af391fa97fa93b7350a28b16826 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 May 2009 17:34:21 +0000
Subject: [PATCH 2313/8469] Merged revisions 72671 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72671 | antoine.pitrou | 2009-05-15 19:27:30 +0200 (ven., 15 mai 2009) | 3 lines

  Fix bootstrapping by removing uses of the copy module in distutils
........
---
 ccompiler.py | 11 +++++------
 dist.py      |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index cad663a348..875f96fac3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from copy import copy
 from distutils.errors import *
 from distutils.spawn import spawn
 from distutils.file_util import move_file
@@ -233,7 +232,7 @@ def set_include_dirs(self, dirs):
         any list of standard include directories that the compiler may
         search by default.
         """
-        self.include_dirs = copy(dirs)
+        self.include_dirs = dirs[:]
 
     def add_library(self, libname):
         """Add 'libname' to the list of libraries that will be included in
@@ -257,7 +256,7 @@ def set_libraries(self, libnames):
         not affect any standard system libraries that the linker may
         include by default.
         """
-        self.libraries = copy(libnames)
+        self.libraries = libnames[:]
 
     def add_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
@@ -272,7 +271,7 @@ def set_library_dirs(self, dirs):
         strings).  This does not affect any standard library search path
         that the linker may search by default.
         """
-        self.library_dirs = copy(dirs)
+        self.library_dirs = dirs[:]
 
     def add_runtime_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
@@ -286,7 +285,7 @@ def set_runtime_library_dirs(self, dirs):
         standard search path that the runtime linker may search by
         default.
         """
-        self.runtime_library_dirs = copy(dirs)
+        self.runtime_library_dirs = dirs[:]
 
     def add_link_object(self, object):
         """Add 'object' to the list of object files (or analogues, such as
@@ -302,7 +301,7 @@ def set_link_objects(self, objects):
         files that the linker may include by default (such as system
         libraries).
         """
-        self.objects = copy(objects)
+        self.objects = objects[:]
 
 
     # -- Private utility methods --------------------------------------
diff --git a/dist.py b/dist.py
index 7c30e8856f..91adc4d37f 100644
--- a/dist.py
+++ b/dist.py
@@ -7,7 +7,6 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from copy import copy
 
 try:
     import warnings
@@ -521,7 +520,7 @@ def _parse_command_opts (self, parser, args):
         # merge it in with the global negative aliases.
         negative_opt = self.negative_opt
         if hasattr(cmd_class, 'negative_opt'):
-            negative_opt = copy(negative_opt)
+            negative_opt = negative_opt.copy()
             negative_opt.update(cmd_class.negative_opt)
 
         # Check for help_options in command class.  They have a different

From ae85790799ba86885d7aa8ae623b2584c218dddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 16 May 2009 16:37:06 +0000
Subject: [PATCH 2314/8469] #6041: sdist and register now use the check
 command. No more duplicate code for metadata checking

---
 command/register.py    | 57 +++++++++++++++---------------
 command/sdist.py       | 56 +++++++++++++-----------------
 tests/support.py       | 20 +++++++++++
 tests/test_register.py | 79 ++++++++++++++++++++++++++++++++++++++----
 tests/test_sdist.py    | 39 ++++++++++++++++++---
 5 files changed, 179 insertions(+), 72 deletions(-)

diff --git a/command/register.py b/command/register.py
index f3463dc289..3b5b2080ec 100644
--- a/command/register.py
+++ b/command/register.py
@@ -9,6 +9,7 @@
 
 import os, string, urllib2, getpass, urlparse
 import StringIO
+from warnings import warn
 
 from distutils.core import PyPIRCCommand
 from distutils.errors import *
@@ -20,18 +21,34 @@ class register(PyPIRCCommand):
     user_options = PyPIRCCommand.user_options + [
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
+        ('strict', None ,
+         'Will stop the registering if the meta-data are not fully compliant')
         ]
     boolean_options = PyPIRCCommand.boolean_options + [
-        'verify', 'list-classifiers']
+        'verify', 'list-classifiers', 'strict']
+
+    sub_commands = [('check', lambda self: True)]
 
     def initialize_options(self):
         PyPIRCCommand.initialize_options(self)
         self.list_classifiers = 0
+        self.strict = 0
+
+    def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
+        # setting options for the `check` subcommand
+        check_options = {'strict': ('register', self.strict),
+                         'restructuredtext': ('register', 1)}
+        self.distribution.command_options['check'] = check_options
 
     def run(self):
         self.finalize_options()
         self._set_config()
-        self.check_metadata()
+
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
         if self.dry_run:
             self.verify_metadata()
         elif self.list_classifiers:
@@ -40,34 +57,14 @@ def run(self):
             self.send_metadata()
 
     def check_metadata(self):
-        """Ensure that all required elements of meta-data (name, version,
-           URL, (author and author_email) or (maintainer and
-           maintainer_email)) are supplied by the Distribution object; warn if
-           any are missing.
-        """
-        metadata = self.distribution.metadata
-
-        missing = []
-        for attr in ('name', 'version', 'url'):
-            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
-                missing.append(attr)
-
-        if missing:
-            self.warn("missing required meta-data: " +
-                      string.join(missing, ", "))
-
-        if metadata.author:
-            if not metadata.author_email:
-                self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' must be supplied too")
-        elif metadata.maintainer:
-            if not metadata.maintainer_email:
-                self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' must be supplied too")
-        else:
-            self.warn("missing meta-data: either (author and author_email) " +
-                      "or (maintainer and maintainer_email) " +
-                      "must be supplied")
+        """Deprecated API."""
+        warn("distutils.command.register.check_metadata is deprecated, \
+              use the check command instead", PendingDeprecationWarning)
+        check = self.distribution.get_command_obj('check')
+        check.ensure_finalized()
+        check.strict = self.strict
+        check.restructuredtext = 1
+        check.run()
 
     def _set_config(self):
         ''' Reads the configuration file and set attributes.
diff --git a/command/sdist.py b/command/sdist.py
index ab0ada1f45..c21f3917b6 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -8,6 +8,8 @@
 import sys
 from types import *
 from glob import glob
+from warnings import warn
+
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
@@ -34,6 +36,12 @@ class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
+    def checking_metadata(self):
+        """Callable used for the check sub-command.
+
+        Placed here so user_options can view it"""
+        return self.metadata_check
+
     user_options = [
         ('template=', 't',
          "name of manifest template file [default: MANIFEST.in]"),
@@ -63,11 +71,14 @@ class sdist(Command):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
+        ('medata-check', None,
+         "Ensure that all required elements of meta-data "
+         "are supplied. Warn if any missing. [default]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
                        'manifest-only', 'force-manifest',
-                       'keep-temp']
+                       'keep-temp', 'metadata-check']
 
     help_options = [
         ('help-formats', None,
@@ -80,6 +91,8 @@ class sdist(Command):
     default_format = {'posix': 'gztar',
                       'nt': 'zip' }
 
+    sub_commands = [('check', checking_metadata)]
+
     def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
@@ -99,6 +112,7 @@ def initialize_options(self):
         self.dist_dir = None
 
         self.archive_files = None
+        self.metadata_check = 1
 
     def finalize_options(self):
         if self.manifest is None:
@@ -128,9 +142,9 @@ def run(self):
         # manifest
         self.filelist = FileList()
 
-        # Ensure that all required meta-data is given; warn if not (but
-        # don't die, it's not *that* serious!)
-        self.check_metadata()
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
 
         # Do whatever it takes to get the list of files to process
         # (process the manifest template, read an existing manifest,
@@ -146,34 +160,12 @@ def run(self):
         self.make_distribution()
 
     def check_metadata(self):
-        """Ensure that all required elements of meta-data (name, version,
-        URL, (author and author_email) or (maintainer and
-        maintainer_email)) are supplied by the Distribution object; warn if
-        any are missing.
-        """
-        metadata = self.distribution.metadata
-
-        missing = []
-        for attr in ('name', 'version', 'url'):
-            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
-                missing.append(attr)
-
-        if missing:
-            self.warn("missing required meta-data: " +
-                      string.join(missing, ", "))
-
-        if metadata.author:
-            if not metadata.author_email:
-                self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' must be supplied too")
-        elif metadata.maintainer:
-            if not metadata.maintainer_email:
-                self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' must be supplied too")
-        else:
-            self.warn("missing meta-data: either (author and author_email) " +
-                      "or (maintainer and maintainer_email) " +
-                      "must be supplied")
+        """Deprecated API."""
+        warn("distutils.command.sdist.check_metadata is deprecated, \
+              use the check command instead", PendingDeprecationWarning)
+        check = self.distribution.get_command_obj('check')
+        check.ensure_finalized()
+        check.run()
 
     def get_file_list(self):
         """Figure out the list of files to include in the source
diff --git a/tests/support.py b/tests/support.py
index 668edf9f5a..bce034949e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -12,11 +12,31 @@ class LoggingSilencer(object):
     def setUp(self):
         super(LoggingSilencer, self).setUp()
         self.threshold = log.set_threshold(log.FATAL)
+        # catching warnings
+        # when log will be replaced by logging
+        # we won't need such monkey-patch anymore
+        self._old_log = log.Log._log
+        log.Log._log = self._log
+        self.logs = []
 
     def tearDown(self):
         log.set_threshold(self.threshold)
+        log.Log._log = self._old_log
         super(LoggingSilencer, self).tearDown()
 
+    def _log(self, level, msg, args):
+        self.logs.append((level, msg, args))
+
+    def get_logs(self, *levels):
+        def _format(msg, args):
+            if len(args) == 0:
+                return msg
+            return msg % args
+        return [_format(msg, args) for level, msg, args
+                in self.logs if level in levels]
+
+    def clear_logs(self):
+        self.logs = []
 
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
diff --git a/tests/test_register.py b/tests/test_register.py
index 7da8edb5d7..91d3581373 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -4,10 +4,14 @@
 import unittest
 import getpass
 import urllib2
+import warnings
+
+from test.test_support import check_warnings
 
 from distutils.command import register as register_module
 from distutils.command.register import register
 from distutils.core import Distribution
+from distutils.errors import DistutilsSetupError
 
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
@@ -59,7 +63,7 @@ def open(self, req):
     def read(self):
         return 'xxx'
 
-class registerTestCase(PyPIRCCommandTestCase):
+class RegisterTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         PyPIRCCommandTestCase.setUp(self)
@@ -76,10 +80,11 @@ def tearDown(self):
         urllib2.build_opener = self.old_opener
         PyPIRCCommandTestCase.tearDown(self)
 
-    def _get_cmd(self):
-        metadata = {'url': 'xxx', 'author': 'xxx',
-                    'author_email': 'xxx',
-                    'name': 'xxx', 'version': 'xxx'}
+    def _get_cmd(self, metadata=None):
+        if metadata is None:
+            metadata = {'url': 'xxx', 'author': 'xxx',
+                        'author_email': 'xxx',
+                        'name': 'xxx', 'version': 'xxx'}
         pkg_info, dist = self.create_dist(**metadata)
         return register(dist)
 
@@ -184,8 +189,70 @@ def test_password_reset(self):
         self.assertEquals(headers['Content-length'], '290')
         self.assert_('tarek' in req.data)
 
+    def test_strict(self):
+        # testing the script option
+        # when on, the register command stops if
+        # the metadata is incomplete or if
+        # long_description is not reSt compliant
+
+        # empty metadata
+        cmd = self._get_cmd({})
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # we don't test the reSt feature if docutils
+        # is not installed
+        try:
+            import docutils
+        except ImportError:
+            return
+
+        # metadata are OK but long_description is broken
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': 'title\n==\n\ntext'}
+
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # now something that works
+        metadata['long_description'] = 'title\n=====\n\ntext'
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        inputs = RawInputs('1', 'tarek', 'y')
+        register_module.raw_input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+        # strict is not by default
+        cmd = self._get_cmd()
+        cmd.ensure_finalized()
+        inputs = RawInputs('1', 'tarek', 'y')
+        register_module.raw_input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+    def test_check_metadata_deprecated(self):
+        # makes sure make_metadata is deprecated
+        cmd = self._get_cmd()
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.check_metadata()
+            self.assertEquals(len(w.warnings), 1)
+
 def test_suite():
-    return unittest.makeSuite(registerTestCase)
+    return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 4f3d4bb91d..5808ca16eb 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -6,7 +6,9 @@
 from os.path import join
 import sys
 import tempfile
+import warnings
 
+from test.test_support import check_warnings
 from test.test_support import captured_stdout
 
 from distutils.command.sdist import sdist
@@ -16,6 +18,7 @@
 from distutils.errors import DistutilsExecError, DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.tests import support
+from distutils.log import WARN
 from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
@@ -38,12 +41,12 @@
 somecode%(sep)sdoc.txt
 """
 
-class sdistTestCase(PyPIRCCommandTestCase):
+class SDistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
-        super(sdistTestCase, self).setUp()
+        super(SDistTestCase, self).setUp()
         # setting up an environment
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
@@ -57,7 +60,7 @@ def setUp(self):
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
-        super(sdistTestCase, self).tearDown()
+        super(SDistTestCase, self).tearDown()
 
     def get_cmd(self, metadata=None):
         """Returns a cmd"""
@@ -214,6 +217,34 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    def test_metadata_check_option(self):
+        # testing the `medata-check` option
+        dist, cmd = self.get_cmd(metadata={})
+
+        # this should raise some warnings !
+        # with the `check` subcommand
+        cmd.ensure_finalized()
+        cmd.run()
+        warnings = self.get_logs(WARN)
+        self.assertEquals(len(warnings), 2)
+
+        # trying with a complete set of metadata
+        self.clear_logs()
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        cmd.metadata_check = 0
+        cmd.run()
+        warnings = self.get_logs(WARN)
+        self.assertEquals(len(warnings), 0)
+
+    def test_check_metadata_deprecated(self):
+        # makes sure make_metadata is deprecated
+        dist, cmd = self.get_cmd()
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.check_metadata()
+            self.assertEquals(len(w.warnings), 1)
+
     def test_show_formats(self):
         with captured_stdout() as stdout:
             show_formats()
@@ -247,7 +278,7 @@ def test_finalize_options(self):
 
 
 def test_suite():
-    return unittest.makeSuite(sdistTestCase)
+    return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")

From 86a2297c6222d8f368ac05f7693aa32b526aae5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 16 May 2009 16:52:13 +0000
Subject: [PATCH 2315/8469] Merged revisions 72681 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72681 | tarek.ziade | 2009-05-16 18:37:06 +0200 (Sat, 16 May 2009) | 1 line

  #6041: sdist and register now use the check command. No more duplicate code for metadata checking
........
---
 command/register.py    | 57 +++++++++++++++---------------
 command/sdist.py       | 56 +++++++++++++-----------------
 tests/support.py       | 20 +++++++++++
 tests/test_register.py | 79 ++++++++++++++++++++++++++++++++++++++----
 tests/test_sdist.py    | 39 ++++++++++++++++++---
 5 files changed, 179 insertions(+), 72 deletions(-)

diff --git a/command/register.py b/command/register.py
index 7dd3099912..bdf5f8f09c 100644
--- a/command/register.py
+++ b/command/register.py
@@ -10,6 +10,7 @@
 import os, string, getpass
 import io
 import urllib.parse, urllib.request
+from warnings import warn
 
 from distutils.core import PyPIRCCommand
 from distutils.errors import *
@@ -21,18 +22,34 @@ class register(PyPIRCCommand):
     user_options = PyPIRCCommand.user_options + [
         ('list-classifiers', None,
          'list the valid Trove classifiers'),
+        ('strict', None ,
+         'Will stop the registering if the meta-data are not fully compliant')
         ]
     boolean_options = PyPIRCCommand.boolean_options + [
-        'verify', 'list-classifiers']
+        'verify', 'list-classifiers', 'strict']
+
+    sub_commands = [('check', lambda self: True)]
 
     def initialize_options(self):
         PyPIRCCommand.initialize_options(self)
         self.list_classifiers = 0
+        self.strict = 0
+
+    def finalize_options(self):
+        PyPIRCCommand.finalize_options(self)
+        # setting options for the `check` subcommand
+        check_options = {'strict': ('register', self.strict),
+                         'restructuredtext': ('register', 1)}
+        self.distribution.command_options['check'] = check_options
 
     def run(self):
         self.finalize_options()
         self._set_config()
-        self.check_metadata()
+
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
         if self.dry_run:
             self.verify_metadata()
         elif self.list_classifiers:
@@ -41,34 +58,14 @@ def run(self):
             self.send_metadata()
 
     def check_metadata(self):
-        """Ensure that all required elements of meta-data (name, version,
-           URL, (author and author_email) or (maintainer and
-           maintainer_email)) are supplied by the Distribution object; warn if
-           any are missing.
-        """
-        metadata = self.distribution.metadata
-
-        missing = []
-        for attr in ('name', 'version', 'url'):
-            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
-                missing.append(attr)
-
-        if missing:
-            self.warn("missing required meta-data: " +
-                      ", ".join(missing))
-
-        if metadata.author:
-            if not metadata.author_email:
-                self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' must be supplied too")
-        elif metadata.maintainer:
-            if not metadata.maintainer_email:
-                self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' must be supplied too")
-        else:
-            self.warn("missing meta-data: either (author and author_email) " +
-                      "or (maintainer and maintainer_email) " +
-                      "must be supplied")
+        """Deprecated API."""
+        warn("distutils.command.register.check_metadata is deprecated, \
+              use the check command instead", PendingDeprecationWarning)
+        check = self.distribution.get_command_obj('check')
+        check.ensure_finalized()
+        check.strict = self.strict
+        check.restructuredtext = 1
+        check.run()
 
     def _set_config(self):
         ''' Reads the configuration file and set attributes.
diff --git a/command/sdist.py b/command/sdist.py
index cbb77c212e..ace9eeeb61 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -9,6 +9,8 @@
 import sys
 from types import *
 from glob import glob
+from warnings import warn
+
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
@@ -35,6 +37,12 @@ class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
 
+    def checking_metadata(self):
+        """Callable used for the check sub-command.
+
+        Placed here so user_options can view it"""
+        return self.metadata_check
+
     user_options = [
         ('template=', 't',
          "name of manifest template file [default: MANIFEST.in]"),
@@ -64,11 +72,14 @@ class sdist(Command):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
+        ('medata-check', None,
+         "Ensure that all required elements of meta-data "
+         "are supplied. Warn if any missing. [default]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
                        'manifest-only', 'force-manifest',
-                       'keep-temp']
+                       'keep-temp', 'metadata-check']
 
     help_options = [
         ('help-formats', None,
@@ -81,6 +92,8 @@ class sdist(Command):
     default_format = {'posix': 'gztar',
                       'nt': 'zip' }
 
+    sub_commands = [('check', checking_metadata)]
+
     def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
@@ -100,6 +113,7 @@ def initialize_options(self):
         self.dist_dir = None
 
         self.archive_files = None
+        self.metadata_check = 1
 
     def finalize_options(self):
         if self.manifest is None:
@@ -129,9 +143,9 @@ def run(self):
         # manifest
         self.filelist = FileList()
 
-        # Ensure that all required meta-data is given; warn if not (but
-        # don't die, it's not *that* serious!)
-        self.check_metadata()
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
 
         # Do whatever it takes to get the list of files to process
         # (process the manifest template, read an existing manifest,
@@ -147,34 +161,12 @@ def run(self):
         self.make_distribution()
 
     def check_metadata(self):
-        """Ensure that all required elements of meta-data (name, version,
-        URL, (author and author_email) or (maintainer and
-        maintainer_email)) are supplied by the Distribution object; warn if
-        any are missing.
-        """
-        metadata = self.distribution.metadata
-
-        missing = []
-        for attr in ('name', 'version', 'url'):
-            if not (hasattr(metadata, attr) and getattr(metadata, attr)):
-                missing.append(attr)
-
-        if missing:
-            self.warn("missing required meta-data: " +
-                      ", ".join(missing))
-
-        if metadata.author:
-            if not metadata.author_email:
-                self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' must be supplied too")
-        elif metadata.maintainer:
-            if not metadata.maintainer_email:
-                self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' must be supplied too")
-        else:
-            self.warn("missing meta-data: either (author and author_email) " +
-                      "or (maintainer and maintainer_email) " +
-                      "must be supplied")
+        """Deprecated API."""
+        warn("distutils.command.sdist.check_metadata is deprecated, \
+              use the check command instead", PendingDeprecationWarning)
+        check = self.distribution.get_command_obj('check')
+        check.ensure_finalized()
+        check.run()
 
     def get_file_list(self):
         """Figure out the list of files to include in the source
diff --git a/tests/support.py b/tests/support.py
index cdcbc37862..1255413989 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -12,11 +12,31 @@ class LoggingSilencer(object):
     def setUp(self):
         super().setUp()
         self.threshold = log.set_threshold(log.FATAL)
+        # catching warnings
+        # when log will be replaced by logging
+        # we won't need such monkey-patch anymore
+        self._old_log = log.Log._log
+        log.Log._log = self._log
+        self.logs = []
 
     def tearDown(self):
         log.set_threshold(self.threshold)
+        log.Log._log = self._old_log
         super().tearDown()
 
+    def _log(self, level, msg, args):
+        self.logs.append((level, msg, args))
+
+    def get_logs(self, *levels):
+        def _format(msg, args):
+            if len(args) == 0:
+                return msg
+            return msg % args
+        return [_format(msg, args) for level, msg, args
+                in self.logs if level in levels]
+
+    def clear_logs(self):
+        self.logs = []
 
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
diff --git a/tests/test_register.py b/tests/test_register.py
index 46f7761d80..f486cf797e 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -4,10 +4,14 @@
 import unittest
 import getpass
 import urllib
+import warnings
+
+from test.support import check_warnings
 
 from distutils.command import register as register_module
 from distutils.command.register import register
 from distutils.core import Distribution
+from distutils.errors import DistutilsSetupError
 
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
@@ -59,7 +63,7 @@ def open(self, req):
     def read(self):
         return 'xxx'
 
-class registerTestCase(PyPIRCCommandTestCase):
+class RegisterTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         PyPIRCCommandTestCase.setUp(self)
@@ -76,10 +80,11 @@ def tearDown(self):
         urllib.request.build_opener = self.old_opener
         PyPIRCCommandTestCase.tearDown(self)
 
-    def _get_cmd(self):
-        metadata = {'url': 'xxx', 'author': 'xxx',
-                    'author_email': 'xxx',
-                    'name': 'xxx', 'version': 'xxx'}
+    def _get_cmd(self, metadata=None):
+        if metadata is None:
+            metadata = {'url': 'xxx', 'author': 'xxx',
+                        'author_email': 'xxx',
+                        'name': 'xxx', 'version': 'xxx'}
         pkg_info, dist = self.create_dist(**metadata)
         return register(dist)
 
@@ -184,8 +189,70 @@ def test_password_reset(self):
         self.assertEquals(headers['Content-length'], '290')
         self.assert_((b'tarek') in req.data)
 
+    def test_strict(self):
+        # testing the script option
+        # when on, the register command stops if
+        # the metadata is incomplete or if
+        # long_description is not reSt compliant
+
+        # empty metadata
+        cmd = self._get_cmd({})
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # we don't test the reSt feature if docutils
+        # is not installed
+        try:
+            import docutils
+        except ImportError:
+            return
+
+        # metadata are OK but long_description is broken
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': 'title\n==\n\ntext'}
+
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
+        # now something that works
+        metadata['long_description'] = 'title\n=====\n\ntext'
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        inputs = RawInputs('1', 'tarek', 'y')
+        register_module.raw_input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+        # strict is not by default
+        cmd = self._get_cmd()
+        cmd.ensure_finalized()
+        inputs = RawInputs('1', 'tarek', 'y')
+        register_module.raw_input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
+    def test_check_metadata_deprecated(self):
+        # makes sure make_metadata is deprecated
+        cmd = self._get_cmd()
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.check_metadata()
+            self.assertEquals(len(w.warnings), 1)
+
 def test_suite():
-    return unittest.makeSuite(registerTestCase)
+    return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 9e27933773..b7e5859cb9 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -6,7 +6,9 @@
 from os.path import join
 import sys
 import tempfile
+import warnings
 
+from test.support import check_warnings
 from test.support import captured_stdout
 
 from distutils.command.sdist import sdist
@@ -16,6 +18,7 @@
 from distutils.errors import DistutilsExecError, DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.tests import support
+from distutils.log import WARN
 from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
@@ -38,12 +41,12 @@
 somecode%(sep)sdoc.txt
 """
 
-class sdistTestCase(PyPIRCCommandTestCase):
+class SDistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         # PyPIRCCommandTestCase creates a temp dir already
         # and put it in self.tmp_dir
-        super(sdistTestCase, self).setUp()
+        super(SDistTestCase, self).setUp()
         # setting up an environment
         self.old_path = os.getcwd()
         os.mkdir(join(self.tmp_dir, 'somecode'))
@@ -57,7 +60,7 @@ def setUp(self):
     def tearDown(self):
         # back to normal
         os.chdir(self.old_path)
-        super(sdistTestCase, self).tearDown()
+        super(SDistTestCase, self).tearDown()
 
     def get_cmd(self, metadata=None):
         """Returns a cmd"""
@@ -214,6 +217,34 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    def test_metadata_check_option(self):
+        # testing the `medata-check` option
+        dist, cmd = self.get_cmd(metadata={})
+
+        # this should raise some warnings !
+        # with the `check` subcommand
+        cmd.ensure_finalized()
+        cmd.run()
+        warnings = self.get_logs(WARN)
+        self.assertEquals(len(warnings), 2)
+
+        # trying with a complete set of metadata
+        self.clear_logs()
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        cmd.metadata_check = 0
+        cmd.run()
+        warnings = self.get_logs(WARN)
+        self.assertEquals(len(warnings), 0)
+
+    def test_check_metadata_deprecated(self):
+        # makes sure make_metadata is deprecated
+        dist, cmd = self.get_cmd()
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.check_metadata()
+            self.assertEquals(len(w.warnings), 1)
+
     def test_show_formats(self):
         with captured_stdout() as stdout:
             show_formats()
@@ -247,7 +278,7 @@ def test_finalize_options(self):
 
 
 def test_suite():
-    return unittest.makeSuite(sdistTestCase)
+    return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
     unittest.main(defaultTest="test_suite")

From 2bd69bbfb8b44521f1fda9b56567b1a3400b8cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 16 May 2009 18:29:40 +0000
Subject: [PATCH 2316/8469] pep8-fied distutils.dist module

---
 dist.py | 130 ++++++++++++++++----------------------------------------
 1 file changed, 37 insertions(+), 93 deletions(-)

diff --git a/dist.py b/dist.py
index 5fe262b112..0c77f85e7b 100644
--- a/dist.py
+++ b/dist.py
@@ -267,23 +267,18 @@ def __init__ (self, attrs=None):
 
         self.finalize_options()
 
-    # __init__ ()
-
-
-    def get_option_dict (self, command):
+    def get_option_dict(self, command):
         """Get the option dictionary for a given command.  If that
         command's option dictionary hasn't been created yet, then create it
         and return the new dictionary; otherwise, return the existing
         option dictionary.
         """
-
         dict = self.command_options.get(command)
         if dict is None:
             dict = self.command_options[command] = {}
         return dict
 
-
-    def dump_option_dicts (self, header=None, commands=None, indent=""):
+    def dump_option_dicts(self, header=None, commands=None, indent=""):
         from pprint import pformat
 
         if commands is None:             # dump all command option dicts
@@ -308,13 +303,9 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
                 for line in string.split(out, "\n"):
                     print indent + "  " + line
 
-    # dump_option_dicts ()
-
-
-
     # -- Config file finding/parsing methods ---------------------------
 
-    def find_config_files (self):
+    def find_config_files(self):
         """Find as many configuration files as should be processed for this
         platform, and return a list of filenames in the order in which they
         should be parsed.  The filenames returned are guaranteed to exist
@@ -355,10 +346,7 @@ def find_config_files (self):
 
         return files
 
-    # find_config_files ()
-
-
-    def parse_config_files (self, filenames=None):
+    def parse_config_files(self, filenames=None):
         from ConfigParser import ConfigParser
 
         if filenames is None:
@@ -400,12 +388,9 @@ def parse_config_files (self, filenames=None):
                 except ValueError, msg:
                     raise DistutilsOptionError, msg
 
-    # parse_config_files ()
-
-
     # -- Command-line parsing methods ----------------------------------
 
-    def parse_command_line (self):
+    def parse_command_line(self):
         """Parse the setup script's command line, taken from the
         'script_args' instance attribute (which defaults to 'sys.argv[1:]'
         -- see 'setup()' in core.py).  This list is first processed for
@@ -478,9 +463,7 @@ def parse_command_line (self):
         # All is well: return true
         return 1
 
-    # parse_command_line()
-
-    def _get_toplevel_options (self):
+    def _get_toplevel_options(self):
         """Return the non-display options recognized at the top level.
 
         This includes options that are recognized *only* at the top
@@ -491,7 +474,7 @@ def _get_toplevel_options (self):
              "list of packages that provide distutils commands"),
             ]
 
-    def _parse_command_opts (self, parser, args):
+    def _parse_command_opts(self, parser, args):
         """Parse the command-line options for a single command.
         'parser' must be a FancyGetopt instance; 'args' must be the list
         of arguments, starting with the current command (whose options
@@ -587,14 +570,11 @@ def _parse_command_opts (self, parser, args):
 
         return args
 
-    # _parse_command_opts ()
-
-    def finalize_options (self):
+    def finalize_options(self):
         """Set final values for all the options on the Distribution
         instance, analogous to the .finalize_options() method of Command
         objects.
         """
-
         keywords = self.metadata.keywords
         if keywords is not None:
             if type(keywords) is StringType:
@@ -607,11 +587,8 @@ def finalize_options (self):
                 platformlist = string.split(platforms, ',')
                 self.metadata.platforms = map(string.strip, platformlist)
 
-    def _show_help (self,
-                    parser,
-                    global_options=1,
-                    display_options=1,
-                    commands=[]):
+    def _show_help(self, parser, global_options=1, display_options=1,
+                   commands=[]):
         """Show help for the setup script command-line in the form of
         several lists of command-line options.  'parser' should be a
         FancyGetopt instance; do not expect it to be returned in the
@@ -661,10 +638,7 @@ def _show_help (self,
         print gen_usage(self.script_name)
         return
 
-    # _show_help ()
-
-
-    def handle_display_options (self, option_order):
+    def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
         (--help-commands or the metadata display options) on the command
         line, display the requested info and return true; else return
@@ -704,13 +678,10 @@ def handle_display_options (self, option_order):
 
         return any_display_options
 
-    # handle_display_options()
-
-    def print_command_list (self, commands, header, max_length):
+    def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-
         print header + ":"
 
         for cmd in commands:
@@ -724,10 +695,7 @@ def print_command_list (self, commands, header, max_length):
 
             print "  %-*s  %s" % (max_length, cmd, description)
 
-    # print_command_list ()
-
-
-    def print_commands (self):
+    def print_commands(self):
         """Print out a help message listing all available commands with a
         description of each.  The list is divided into "standard commands"
         (listed in distutils.command.__all__) and "extra commands"
@@ -735,7 +703,6 @@ def print_commands (self):
         descriptions come from the command class attribute
         'description'.
         """
-
         import distutils.command
         std_commands = distutils.command.__all__
         is_std = {}
@@ -761,9 +728,7 @@ def print_commands (self):
                                     "Extra commands",
                                     max_length)
 
-    # print_commands ()
-
-    def get_command_list (self):
+    def get_command_list(self):
         """Get a list of (command, description) tuples.
         The list is divided into "standard commands" (listed in
         distutils.command.__all__) and "extra commands" (mentioned in
@@ -798,7 +763,7 @@ def get_command_list (self):
 
     # -- Command class/object methods ----------------------------------
 
-    def get_command_packages (self):
+    def get_command_packages(self):
         """Return a list of packages from which commands are loaded."""
         pkgs = self.command_packages
         if not isinstance(pkgs, type([])):
@@ -811,7 +776,7 @@ def get_command_packages (self):
             self.command_packages = pkgs
         return pkgs
 
-    def get_command_class (self, command):
+    def get_command_class(self, command):
         """Return the class that implements the Distutils command named by
         'command'.  First we check the 'cmdclass' dictionary; if the
         command is mentioned there, we fetch the class object from the
@@ -850,9 +815,7 @@ def get_command_class (self, command):
         raise DistutilsModuleError("invalid command '%s'" % command)
 
 
-    # get_command_class ()
-
-    def get_command_obj (self, command, create=1):
+    def get_command_obj(self, command, create=1):
         """Return the command object for 'command'.  Normally this object
         is cached on a previous call to 'get_command_obj()'; if no command
         object for 'command' is in the cache, then we either create and
@@ -879,7 +842,7 @@ def get_command_obj (self, command, create=1):
 
         return cmd_obj
 
-    def _set_command_options (self, command_obj, option_dict=None):
+    def _set_command_options(self, command_obj, option_dict=None):
         """Set the options for 'command_obj' from 'option_dict'.  Basically
         this means copying elements of a dictionary ('option_dict') to
         attributes of an instance ('command').
@@ -919,7 +882,7 @@ def _set_command_options (self, command_obj, option_dict=None):
             except ValueError, msg:
                 raise DistutilsOptionError, msg
 
-    def reinitialize_command (self, command, reinit_subcommands=0):
+    def reinitialize_command(self, command, reinit_subcommands=0):
         """Reinitializes a command to the state it was in when first
         returned by 'get_command_obj()': ie., initialized but not yet
         finalized.  This provides the opportunity to sneak option
@@ -958,13 +921,12 @@ def reinitialize_command (self, command, reinit_subcommands=0):
 
         return command
 
-
     # -- Methods that operate on the Distribution ----------------------
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         log.debug(msg)
 
-    def run_commands (self):
+    def run_commands(self):
         """Run each command that was seen on the setup script command line.
         Uses the list of commands found and cache of command objects
         created by 'get_command_obj()'.
@@ -972,10 +934,9 @@ def run_commands (self):
         for cmd in self.commands:
             self.run_command(cmd)
 
-
     # -- Methods that operate on its Commands --------------------------
 
-    def run_command (self, command):
+    def run_command(self, command):
         """Do whatever it takes to run a command (including nothing at all,
         if the command has already been run).  Specifically: if we have
         already created and run the command named by 'command', return
@@ -996,28 +957,28 @@ def run_command (self, command):
 
     # -- Distribution query methods ------------------------------------
 
-    def has_pure_modules (self):
+    def has_pure_modules(self):
         return len(self.packages or self.py_modules or []) > 0
 
-    def has_ext_modules (self):
+    def has_ext_modules(self):
         return self.ext_modules and len(self.ext_modules) > 0
 
-    def has_c_libraries (self):
+    def has_c_libraries(self):
         return self.libraries and len(self.libraries) > 0
 
-    def has_modules (self):
+    def has_modules(self):
         return self.has_pure_modules() or self.has_ext_modules()
 
-    def has_headers (self):
+    def has_headers(self):
         return self.headers and len(self.headers) > 0
 
-    def has_scripts (self):
+    def has_scripts(self):
         return self.scripts and len(self.scripts) > 0
 
-    def has_data_files (self):
+    def has_data_files(self):
         return self.data_files and len(self.data_files) > 0
 
-    def is_pure (self):
+    def is_pure(self):
         return (self.has_pure_modules() and
                 not self.has_ext_modules() and
                 not self.has_c_libraries())
@@ -1029,9 +990,6 @@ def is_pure (self):
     # to self.metadata.get_XXX.  The actual code is in the
     # DistributionMetadata class, below.
 
-# class Distribution
-
-
 class DistributionMetadata:
     """Dummy class to hold the distribution meta-data: name, version,
     author, and so forth.
@@ -1067,18 +1025,14 @@ def __init__ (self):
         self.requires = None
         self.obsoletes = None
 
-    def write_pkg_info (self, base_dir):
+    def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
         pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
-
         self.write_pkg_file(pkg_info)
-
         pkg_info.close()
 
-    # write_pkg_info ()
-
-    def write_pkg_file (self, file):
+    def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
         version = '1.0'
@@ -1112,7 +1066,6 @@ def write_pkg_file (self, file):
         self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
     def _write_field(self, file, name, value):
-
         if isinstance(value, unicode):
             value = value.encode(PKG_INFO_ENCODING)
         else:
@@ -1120,19 +1073,18 @@ def _write_field(self, file, name, value):
         file.write('%s: %s\n' % (name, value))
 
     def _write_list (self, file, name, values):
-
         for value in values:
             self._write_field(file, name, value)
 
     # -- Metadata query methods ----------------------------------------
 
-    def get_name (self):
+    def get_name(self):
         return self.name or "UNKNOWN"
 
     def get_version(self):
         return self.version or "0.0.0"
 
-    def get_fullname (self):
+    def get_fullname(self):
         return "%s-%s" % (self.get_name(), self.get_version())
 
     def get_author(self):
@@ -1148,14 +1100,10 @@ def get_maintainer_email(self):
         return self.maintainer_email or "UNKNOWN"
 
     def get_contact(self):
-        return (self.maintainer or
-                self.author or
-                "UNKNOWN")
+        return self.maintainer or self.author or "UNKNOWN"
 
     def get_contact_email(self):
-        return (self.maintainer_email or
-                self.author_email or
-                "UNKNOWN")
+        return self.maintainer_email or self.author_email or "UNKNOWN"
 
     def get_url(self):
         return self.url or "UNKNOWN"
@@ -1183,7 +1131,6 @@ def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
     # PEP 314
-
     def get_requires(self):
         return self.requires or []
 
@@ -1212,10 +1159,7 @@ def set_obsoletes(self, value):
             distutils.versionpredicate.VersionPredicate(v)
         self.obsoletes = value
 
-# class DistributionMetadata
-
-
-def fix_help_options (options):
+def fix_help_options(options):
     """Convert a 4-tuple 'help_options' list as found in various command
     classes to the 3-tuple form required by FancyGetopt.
     """

From a65846f388968a08b4187534689bc9cf4f8ecd63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 16 May 2009 18:37:32 +0000
Subject: [PATCH 2317/8469] Merged revisions 72686 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72686 | tarek.ziade | 2009-05-16 20:29:40 +0200 (Sat, 16 May 2009) | 1 line

  pep8-fied distutils.dist module
........
---
 dist.py | 103 +++++++++++++++++++++-----------------------------------
 1 file changed, 38 insertions(+), 65 deletions(-)

diff --git a/dist.py b/dist.py
index 91adc4d37f..7969503507 100644
--- a/dist.py
+++ b/dist.py
@@ -262,21 +262,18 @@ def __init__ (self, attrs=None):
 
         self.finalize_options()
 
-
-    def get_option_dict (self, command):
+    def get_option_dict(self, command):
         """Get the option dictionary for a given command.  If that
         command's option dictionary hasn't been created yet, then create it
         and return the new dictionary; otherwise, return the existing
         option dictionary.
         """
-
         dict = self.command_options.get(command)
         if dict is None:
             dict = self.command_options[command] = {}
         return dict
 
-
-    def dump_option_dicts (self, header=None, commands=None, indent=""):
+    def dump_option_dicts(self, header=None, commands=None, indent=""):
         from pprint import pformat
 
         if commands is None:             # dump all command option dicts
@@ -300,11 +297,9 @@ def dump_option_dicts (self, header=None, commands=None, indent=""):
                 for line in out.split("\n"):
                     print(indent + "  " + line)
 
-
-
     # -- Config file finding/parsing methods ---------------------------
 
-    def find_config_files (self):
+    def find_config_files(self):
         """Find as many configuration files as should be processed for this
         platform, and return a list of filenames in the order in which they
         should be parsed.  The filenames returned are guaranteed to exist
@@ -345,9 +340,7 @@ def find_config_files (self):
 
         return files
 
-
-    def parse_config_files (self, filenames=None):
-
+    def parse_config_files(self, filenames=None):
         from configparser import ConfigParser
 
         if filenames is None:
@@ -389,10 +382,9 @@ def parse_config_files (self, filenames=None):
                 except ValueError as msg:
                     raise DistutilsOptionError(msg)
 
-
     # -- Command-line parsing methods ----------------------------------
 
-    def parse_command_line (self):
+    def parse_command_line(self):
         """Parse the setup script's command line, taken from the
         'script_args' instance attribute (which defaults to 'sys.argv[1:]'
         -- see 'setup()' in core.py).  This list is first processed for
@@ -465,7 +457,7 @@ def parse_command_line (self):
         # All is well: return true
         return True
 
-    def _get_toplevel_options (self):
+    def _get_toplevel_options(self):
         """Return the non-display options recognized at the top level.
 
         This includes options that are recognized *only* at the top
@@ -476,7 +468,7 @@ def _get_toplevel_options (self):
              "list of packages that provide distutils commands"),
             ]
 
-    def _parse_command_opts (self, parser, args):
+    def _parse_command_opts(self, parser, args):
         """Parse the command-line options for a single command.
         'parser' must be a FancyGetopt instance; 'args' must be the list
         of arguments, starting with the current command (whose options
@@ -571,12 +563,11 @@ def _parse_command_opts (self, parser, args):
 
         return args
 
-    def finalize_options (self):
+    def finalize_options(self):
         """Set final values for all the options on the Distribution
         instance, analogous to the .finalize_options() method of Command
         objects.
         """
-
         keywords = self.metadata.keywords
         if keywords is not None:
             if isinstance(keywords, str):
@@ -589,11 +580,8 @@ def finalize_options (self):
                 platformlist = platforms.split(',')
                 self.metadata.platforms = [x.strip() for x in platformlist]
 
-    def _show_help (self,
-                    parser,
-                    global_options=1,
-                    display_options=1,
-                    commands=[]):
+    def _show_help(self, parser, global_options=1, display_options=1,
+                   commands=[]):
         """Show help for the setup script command-line in the form of
         several lists of command-line options.  'parser' should be a
         FancyGetopt instance; do not expect it to be returned in the
@@ -643,8 +631,7 @@ def _show_help (self,
         print(gen_usage(self.script_name))
         return
 
-
-    def handle_display_options (self, option_order):
+    def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
         (--help-commands or the metadata display options) on the command
         line, display the requested info and return true; else return
@@ -684,7 +671,7 @@ def handle_display_options (self, option_order):
 
         return any_display_options
 
-    def print_command_list (self, commands, header, max_length):
+    def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
@@ -701,8 +688,7 @@ def print_command_list (self, commands, header, max_length):
 
             print("  %-*s  %s" % (max_length, cmd, description))
 
-
-    def print_commands (self):
+    def print_commands(self):
         """Print out a help message listing all available commands with a
         description of each.  The list is divided into "standard commands"
         (listed in distutils.command.__all__) and "extra commands"
@@ -735,7 +721,7 @@ def print_commands (self):
                                     "Extra commands",
                                     max_length)
 
-    def get_command_list (self):
+    def get_command_list(self):
         """Get a list of (command, description) tuples.
         The list is divided into "standard commands" (listed in
         distutils.command.__all__) and "extra commands" (mentioned in
@@ -769,7 +755,7 @@ def get_command_list (self):
 
     # -- Command class/object methods ----------------------------------
 
-    def get_command_packages (self):
+    def get_command_packages(self):
         """Return a list of packages from which commands are loaded."""
         pkgs = self.command_packages
         if not isinstance(pkgs, type([])):
@@ -782,7 +768,7 @@ def get_command_packages (self):
             self.command_packages = pkgs
         return pkgs
 
-    def get_command_class (self, command):
+    def get_command_class(self, command):
         """Return the class that implements the Distutils command named by
         'command'.  First we check the 'cmdclass' dictionary; if the
         command is mentioned there, we fetch the class object from the
@@ -820,7 +806,7 @@ def get_command_class (self, command):
 
         raise DistutilsModuleError("invalid command '%s'" % command)
 
-    def get_command_obj (self, command, create=1):
+    def get_command_obj(self, command, create=1):
         """Return the command object for 'command'.  Normally this object
         is cached on a previous call to 'get_command_obj()'; if no command
         object for 'command' is in the cache, then we either create and
@@ -847,7 +833,7 @@ def get_command_obj (self, command, create=1):
 
         return cmd_obj
 
-    def _set_command_options (self, command_obj, option_dict=None):
+    def _set_command_options(self, command_obj, option_dict=None):
         """Set the options for 'command_obj' from 'option_dict'.  Basically
         this means copying elements of a dictionary ('option_dict') to
         attributes of an instance ('command').
@@ -888,7 +874,7 @@ def _set_command_options (self, command_obj, option_dict=None):
             except ValueError as msg:
                 raise DistutilsOptionError(msg)
 
-    def reinitialize_command (self, command, reinit_subcommands=0):
+    def reinitialize_command(self, command, reinit_subcommands=0):
         """Reinitializes a command to the state it was in when first
         returned by 'get_command_obj()': ie., initialized but not yet
         finalized.  This provides the opportunity to sneak option
@@ -927,13 +913,12 @@ def reinitialize_command (self, command, reinit_subcommands=0):
 
         return command
 
-
     # -- Methods that operate on the Distribution ----------------------
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         log.debug(msg)
 
-    def run_commands (self):
+    def run_commands(self):
         """Run each command that was seen on the setup script command line.
         Uses the list of commands found and cache of command objects
         created by 'get_command_obj()'.
@@ -941,10 +926,9 @@ def run_commands (self):
         for cmd in self.commands:
             self.run_command(cmd)
 
-
     # -- Methods that operate on its Commands --------------------------
 
-    def run_command (self, command):
+    def run_command(self, command):
         """Do whatever it takes to run a command (including nothing at all,
         if the command has already been run).  Specifically: if we have
         already created and run the command named by 'command', return
@@ -965,28 +949,28 @@ def run_command (self, command):
 
     # -- Distribution query methods ------------------------------------
 
-    def has_pure_modules (self):
+    def has_pure_modules(self):
         return len(self.packages or self.py_modules or []) > 0
 
-    def has_ext_modules (self):
+    def has_ext_modules(self):
         return self.ext_modules and len(self.ext_modules) > 0
 
-    def has_c_libraries (self):
+    def has_c_libraries(self):
         return self.libraries and len(self.libraries) > 0
 
-    def has_modules (self):
+    def has_modules(self):
         return self.has_pure_modules() or self.has_ext_modules()
 
-    def has_headers (self):
+    def has_headers(self):
         return self.headers and len(self.headers) > 0
 
-    def has_scripts (self):
+    def has_scripts(self):
         return self.scripts and len(self.scripts) > 0
 
-    def has_data_files (self):
+    def has_data_files(self):
         return self.data_files and len(self.data_files) > 0
 
-    def is_pure (self):
+    def is_pure(self):
         return (self.has_pure_modules() and
                 not self.has_ext_modules() and
                 not self.has_c_libraries())
@@ -998,9 +982,6 @@ def is_pure (self):
     # to self.metadata.get_XXX.  The actual code is in the
     # DistributionMetadata class, below.
 
-# class Distribution
-
-
 class DistributionMetadata:
     """Dummy class to hold the distribution meta-data: name, version,
     author, and so forth.
@@ -1036,16 +1017,14 @@ def __init__ (self):
         self.requires = None
         self.obsoletes = None
 
-    def write_pkg_info (self, base_dir):
+    def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
         pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
-
         self.write_pkg_file(pkg_info)
-
         pkg_info.close()
 
-    def write_pkg_file (self, file):
+    def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
         version = '1.0'
@@ -1078,19 +1057,19 @@ def write_pkg_file (self, file):
         self._write_list(file, 'Provides', self.get_provides())
         self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
-    def _write_list (self, file, name, values):
+    def _write_list(self, file, name, values):
         for value in values:
             file.write('%s: %s\n' % (name, value))
 
     # -- Metadata query methods ----------------------------------------
 
-    def get_name (self):
+    def get_name(self):
         return self.name or "UNKNOWN"
 
     def get_version(self):
         return self.version or "0.0.0"
 
-    def get_fullname (self):
+    def get_fullname(self):
         return "%s-%s" % (self.get_name(), self.get_version())
 
     def get_author(self):
@@ -1106,14 +1085,10 @@ def get_maintainer_email(self):
         return self.maintainer_email or "UNKNOWN"
 
     def get_contact(self):
-        return (self.maintainer or
-                self.author or
-                "UNKNOWN")
+        return self.maintainer or self.author or "UNKNOWN"
 
     def get_contact_email(self):
-        return (self.maintainer_email or
-                self.author_email or
-                "UNKNOWN")
+        return self.maintainer_email or self.author_email or "UNKNOWN"
 
     def get_url(self):
         return self.url or "UNKNOWN"
@@ -1141,7 +1116,6 @@ def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
     # PEP 314
-
     def get_requires(self):
         return self.requires or []
 
@@ -1170,8 +1144,7 @@ def set_obsoletes(self, value):
             distutils.versionpredicate.VersionPredicate(v)
         self.obsoletes = value
 
-
-def fix_help_options (options):
+def fix_help_options(options):
     """Convert a 4-tuple 'help_options' list as found in various command
     classes to the 3-tuple form required by FancyGetopt.
     """

From 4b18d769629e294345acd8d714ec854d20bbc5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 10:07:48 +0000
Subject: [PATCH 2318/8469] not running this test with MSVC6

---
 tests/test_build_ext.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index c6533ca9f7..7e3f716500 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,6 +19,12 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
+if sys.platform != 'win32':
+    UNDER_MSVC8 = False
+else:
+    from distutils.msvccompiler import get_build_version
+    UNDER_MSVC8 = get_build_version() < 8.0
+
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
@@ -293,6 +299,7 @@ def test_compiler_option(self):
         cmd.run()
         self.assertEquals(cmd.compiler, 'unix')
 
+    @unittest.skipIf(UNDER_MSVC8, 'not running this test for MSVC < 8')
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')

From c822bf11bbd7e21e4cccd81bbcaf4a7fce16edde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 10:10:51 +0000
Subject: [PATCH 2319/8469] Merged revisions 72713 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72713 | tarek.ziade | 2009-05-17 12:07:48 +0200 (Sun, 17 May 2009) | 1 line

  not running this test with MSVC6
........
---
 tests/test_build_ext.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 2bd2292e8c..21020d3927 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -17,6 +17,12 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
+if sys.platform != 'win32':
+    UNDER_MSVC8 = False
+else:
+    from distutils.msvccompiler import get_build_version
+    UNDER_MSVC8 = get_build_version() < 8.0
+
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
@@ -231,6 +237,8 @@ def test_compiler_option(self):
         self.assertEquals(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
+        if UNDER_MSVC8:
+            return # not running this test for MSVC < 8
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
         self.write_file(c_file, 'void initfoo(void) {};\n')

From dc4754eb50a3b88a4e302dc27b474be6ba18eaab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 10:12:02 +0000
Subject: [PATCH 2320/8469] Merged revisions 72713 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72713 | tarek.ziade | 2009-05-17 12:07:48 +0200 (Sun, 17 May 2009) | 1 line

  not running this test with MSVC6
........
---
 tests/test_build_ext.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6a463c0117..764aa727d1 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -20,6 +20,12 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
+if sys.platform != 'win32':
+    UNDER_MSVC8 = False
+else:
+    from distutils.msvccompiler import get_build_version
+    UNDER_MSVC8 = get_build_version() < 8.0
+
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
@@ -293,6 +299,7 @@ def test_compiler_option(self):
         cmd.run()
         self.assertEquals(cmd.compiler, 'unix')
 
+    @unittest.skipIf(UNDER_MSVC8, 'not running this test for MSVC < 8')
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')

From f05e22fcc970ca8879603dee6842e310027ee256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 10:44:12 +0000
Subject: [PATCH 2321/8469] removed sys.platform == 'mac' support in
 distutils.dist.parse_command_line and improved test coverage

---
 dist.py            |  6 -----
 tests/test_dist.py | 58 +++++++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/dist.py b/dist.py
index 0c77f85e7b..93325b9720 100644
--- a/dist.py
+++ b/dist.py
@@ -414,11 +414,6 @@ def parse_command_line(self):
         # that allows the user to interactively specify the "command line".
         #
         toplevel_options = self._get_toplevel_options()
-        if sys.platform == 'mac':
-            import EasyDialogs
-            cmdlist = self.get_command_list()
-            self.script_args = EasyDialogs.GetArgv(
-                toplevel_options + self.display_options, cmdlist)
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -438,7 +433,6 @@ def parse_command_line(self):
         # for display options we return immediately
         if self.handle_display_options(option_order):
             return
-
         while args:
             args = self._parse_command_opts(parser, args)
             if args is None:            # user asked for help (and got it)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 3304790b51..49230c54c0 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,19 +1,19 @@
 # -*- coding: latin-1 -*-
 
 """Tests for distutils.dist."""
-
-import distutils.cmd
-import distutils.dist
 import os
 import StringIO
 import sys
 import unittest
 import warnings
 
-from test.test_support import TESTFN
+from distutils.dist import Distribution, fix_help_options
+from distutils.cmd import Command
+
+from test.test_support import TESTFN, captured_stdout
 from distutils.tests import support
 
-class test_dist(distutils.cmd.Command):
+class test_dist(Command):
     """Sample distutils extension command."""
 
     user_options = [
@@ -24,7 +24,7 @@ def initialize_options(self):
         self.sample_option = None
 
 
-class TestDistribution(distutils.dist.Distribution):
+class TestDistribution(Distribution):
     """Distribution subclasses that avoids the default search for
     configuration files.
 
@@ -104,7 +104,7 @@ def test_write_pkg_file(self):
         # Check DistributionMetadata handling of Unicode fields
         tmp_dir = self.mkdtemp()
         my_file = os.path.join(tmp_dir, 'f')
-        klass = distutils.dist.Distribution
+        klass = Distribution
 
         dist = klass(attrs={'author': u'Mister Café',
                             'name': 'my.package',
@@ -131,7 +131,7 @@ def test_write_pkg_file(self):
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
         # list of attributes
-        klass = distutils.dist.Distribution
+        klass = Distribution
 
         # catching warnings
         warns = []
@@ -157,7 +157,7 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         meta = self.format_metadata(dist)
         self.assert_("Metadata-Version: 1.0" in meta)
         self.assert_("provides:" not in meta.lower())
@@ -168,7 +168,7 @@ def test_provides(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "provides": ["package", "package.sub"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_provides(),
                          ["package", "package.sub"])
         self.assertEqual(dist.get_provides(),
@@ -179,8 +179,7 @@ def test_provides(self):
         self.assert_("obsoletes:" not in meta.lower())
 
     def test_provides_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "provides": ["my.pkg (splat)"]})
@@ -189,7 +188,7 @@ def test_requires(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "requires": ["other", "another (==1.0)"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_requires(),
                          ["other", "another (==1.0)"])
         self.assertEqual(dist.get_requires(),
@@ -202,8 +201,7 @@ def test_requires(self):
         self.assert_("obsoletes:" not in meta.lower())
 
     def test_requires_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "requires": ["my.pkg (splat)"]})
@@ -212,7 +210,7 @@ def test_obsoletes(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "obsoletes": ["other", "another (<1.0)"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_obsoletes(),
                          ["other", "another (<1.0)"])
         self.assertEqual(dist.get_obsoletes(),
@@ -225,8 +223,7 @@ def test_obsoletes(self):
         self.assert_("Obsoletes: another (<1.0)" in meta)
 
     def test_obsoletes_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
@@ -251,7 +248,7 @@ def test_custom_pydistutils(self):
         f.close()
 
         try:
-            dist = distutils.dist.Distribution()
+            dist = Distribution()
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
@@ -269,6 +266,29 @@ def test_custom_pydistutils(self):
         finally:
             os.remove(user_filename)
 
+    def test_fix_help_options(self):
+        help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
+        fancy_options = fix_help_options(help_tuples)
+        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEquals(fancy_options[1], (1, 2, 3))
+
+    def test_show_help(self):
+        # smoke test, just makes sure some help is displayed
+        dist = Distribution()
+        old_argv = sys.argv
+        sys.argv = []
+        try:
+            dist.help = 1
+            dist.script_name = 'setup.py'
+            with captured_stdout() as s:
+                dist.parse_command_line()
+        finally:
+            sys.argv = old_argv
+
+        output = [line for line in s.getvalue().split('\n')
+                  if line.strip() != '']
+        self.assert_(len(output) > 0)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From d3f1bdd3baedab6204777740c026f481305cbea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 10:50:24 +0000
Subject: [PATCH 2322/8469] Merged revisions 72721 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72721 | tarek.ziade | 2009-05-17 12:44:12 +0200 (Sun, 17 May 2009) | 1 line

  removed sys.platform == 'mac' support in distutils.dist.parse_command_line and improved test coverage
........
---
 dist.py            |  6 -----
 tests/test_dist.py | 57 ++++++++++++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/dist.py b/dist.py
index 7969503507..65c1ce912e 100644
--- a/dist.py
+++ b/dist.py
@@ -408,11 +408,6 @@ def parse_command_line(self):
         # that allows the user to interactively specify the "command line".
         #
         toplevel_options = self._get_toplevel_options()
-        if sys.platform == 'mac':
-            import EasyDialogs
-            cmdlist = self.get_command_list()
-            self.script_args = EasyDialogs.GetArgv(
-                toplevel_options + self.display_options, cmdlist)
 
         # We have to parse the command line a bit at a time -- global
         # options, then the first command, then its options, and so on --
@@ -432,7 +427,6 @@ def parse_command_line(self):
         # for display options we return immediately
         if self.handle_display_options(option_order):
             return
-
         while args:
             args = self._parse_command_opts(parser, args)
             if args is None:            # user asked for help (and got it)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 092bd14f93..54b63f7ddf 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,18 +1,18 @@
 """Tests for distutils.dist."""
-
-import distutils.cmd
-import distutils.dist
 import os
 import io
 import sys
 import unittest
 import warnings
 
-from test.support import TESTFN
+from distutils.dist import Distribution, fix_help_options
+from distutils.cmd import Command
+
+from test.support import TESTFN, captured_stdout
 from distutils.tests import support
 
 
-class test_dist(distutils.cmd.Command):
+class test_dist(Command):
     """Sample distutils extension command."""
 
     user_options = [
@@ -23,7 +23,7 @@ def initialize_options(self):
         self.sample_option = None
 
 
-class TestDistribution(distutils.dist.Distribution):
+class TestDistribution(Distribution):
     """Distribution subclasses that avoids the default search for
     configuration files.
 
@@ -99,11 +99,10 @@ def test_command_packages_configfile(self):
         finally:
             os.unlink(TESTFN)
 
-
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
         # list of attributes
-        klass = distutils.dist.Distribution
+        klass = Distribution
 
         # catching warnings
         warns = []
@@ -129,7 +128,7 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         meta = self.format_metadata(dist)
         self.assert_("Metadata-Version: 1.0" in meta)
         self.assert_("provides:" not in meta.lower())
@@ -140,7 +139,7 @@ def test_provides(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "provides": ["package", "package.sub"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_provides(),
                          ["package", "package.sub"])
         self.assertEqual(dist.get_provides(),
@@ -151,8 +150,7 @@ def test_provides(self):
         self.assert_("obsoletes:" not in meta.lower())
 
     def test_provides_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "provides": ["my.pkg (splat)"]})
@@ -161,7 +159,7 @@ def test_requires(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "requires": ["other", "another (==1.0)"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_requires(),
                          ["other", "another (==1.0)"])
         self.assertEqual(dist.get_requires(),
@@ -174,8 +172,7 @@ def test_requires(self):
         self.assert_("obsoletes:" not in meta.lower())
 
     def test_requires_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "requires": ["my.pkg (splat)"]})
@@ -184,7 +181,7 @@ def test_obsoletes(self):
         attrs = {"name": "package",
                  "version": "1.0",
                  "obsoletes": ["other", "another (<1.0)"]}
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         self.assertEqual(dist.metadata.get_obsoletes(),
                          ["other", "another (<1.0)"])
         self.assertEqual(dist.get_obsoletes(),
@@ -197,8 +194,7 @@ def test_obsoletes(self):
         self.assert_("Obsoletes: another (<1.0)" in meta)
 
     def test_obsoletes_illegal(self):
-        self.assertRaises(ValueError,
-                          distutils.dist.Distribution,
+        self.assertRaises(ValueError, Distribution,
                           {"name": "package",
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
@@ -223,7 +219,7 @@ def test_custom_pydistutils(self):
         f.close()
 
         try:
-            dist = distutils.dist.Distribution()
+            dist = Distribution()
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
@@ -241,6 +237,29 @@ def test_custom_pydistutils(self):
         finally:
             os.remove(user_filename)
 
+    def test_fix_help_options(self):
+        help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
+        fancy_options = fix_help_options(help_tuples)
+        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEquals(fancy_options[1], (1, 2, 3))
+
+    def test_show_help(self):
+        # smoke test, just makes sure some help is displayed
+        dist = Distribution()
+        old_argv = sys.argv
+        sys.argv = []
+        try:
+            dist.help = 1
+            dist.script_name = 'setup.py'
+            with captured_stdout() as s:
+                dist.parse_command_line()
+        finally:
+            sys.argv = old_argv
+
+        output = [line for line in s.getvalue().split('\n')
+                  if line.strip() != '']
+        self.assert_(len(output) > 0)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From 9342187befd026978a753e2e41127ad0abddc35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 11:11:57 +0000
Subject: [PATCH 2323/8469] removed sys.platform == 'mac' usage in
 distutils.dir_util

---
 dir_util.py            | 11 ++++-------
 tests/test_dir_util.py | 14 ++++++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 5a134408fd..9604c6d249 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -212,14 +212,11 @@ def remove_tree (directory, verbose=1, dry_run=0):
                     exc, "error removing %s: " % directory))
 
 
-def ensure_relative (path):
+def ensure_relative(path):
     """Take the full path 'path', and make it a relative path so
     it can be the second argument to os.path.join().
     """
     drive, path = os.path.splitdrive(path)
-    if sys.platform == 'mac':
-        return os.sep + path
-    else:
-        if path[0:1] == os.sep:
-            path = drive + path[1:]
-        return path
+    if path[0:1] == os.sep:
+        path = drive + path[1:]
+    return path
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index bf416b6d79..9bd6530c14 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,10 +3,8 @@
 import os
 import shutil
 
-from distutils.dir_util import mkpath
-from distutils.dir_util import remove_tree
-from distutils.dir_util import create_tree
-from distutils.dir_util import copy_tree
+from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
+                                ensure_relative)
 
 from distutils import log
 from distutils.tests import support
@@ -85,6 +83,14 @@ def test_copy_tree_verbosity(self):
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
+    def test_ensure_relative(self):
+        if os.sep == '/':
+            self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
+            self.assertEquals(ensure_relative('some/path'), 'some/path')
+        else:   # \\
+            self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+            self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 

From 67db2917c102fce286384cbbe3bd90c4d2d2642f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 11:14:15 +0000
Subject: [PATCH 2324/8469] Merged revisions 72727 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72727 | tarek.ziade | 2009-05-17 13:11:57 +0200 (Sun, 17 May 2009) | 1 line

  removed sys.platform == 'mac' usage in distutils.dir_util
........
---
 dir_util.py            | 11 ++++-------
 tests/test_dir_util.py | 14 ++++++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index ed54ccefd4..82608d2c87 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -208,14 +208,11 @@ def remove_tree (directory, verbose=1, dry_run=0):
                     exc, "error removing %s: " % directory))
 
 
-def ensure_relative (path):
+def ensure_relative(path):
     """Take the full path 'path', and make it a relative path so
     it can be the second argument to os.path.join().
     """
     drive, path = os.path.splitdrive(path)
-    if sys.platform == 'mac':
-        return os.sep + path
-    else:
-        if path[0:1] == os.sep:
-            path = drive + path[1:]
-        return path
+    if path[0:1] == os.sep:
+        path = drive + path[1:]
+    return path
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index bf416b6d79..9bd6530c14 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,10 +3,8 @@
 import os
 import shutil
 
-from distutils.dir_util import mkpath
-from distutils.dir_util import remove_tree
-from distutils.dir_util import create_tree
-from distutils.dir_util import copy_tree
+from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
+                                ensure_relative)
 
 from distutils import log
 from distutils.tests import support
@@ -85,6 +83,14 @@ def test_copy_tree_verbosity(self):
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
+    def test_ensure_relative(self):
+        if os.sep == '/':
+            self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
+            self.assertEquals(ensure_relative('some/path'), 'some/path')
+        else:   # \\
+            self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+            self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 

From 7d5ed40f17e1b7f49b5af117c149730860c5560f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 11:22:36 +0000
Subject: [PATCH 2325/8469] pep8-fied distutils.dir_util

---
 dir_util.py | 110 +++++++++++++++++++++++-----------------------------
 1 file changed, 49 insertions(+), 61 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 9604c6d249..55607e5b53 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -5,7 +5,6 @@
 __revision__ = "$Id$"
 
 import os, sys
-from types import *
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
@@ -16,20 +15,21 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0777, verbose=1, dry_run=0):
-    """Create a directory and any missing ancestor directories.  If the
-       directory already exists (or if 'name' is the empty string, which
-       means the current directory, which of course exists), then do
-       nothing.  Raise DistutilsFileError if unable to create some
-       directory along the way (eg. some sub-path exists, but is a file
-       rather than a directory).  If 'verbose' is true, print a one-line
-       summary of each mkdir to stdout.  Return the list of directories
-       actually created."""
+def mkpath(name, mode=0777, verbose=1, dry_run=0):
+    """Create a directory and any missing ancestor directories.
+
+    If the directory already exists (or if 'name' is the empty string, which
+    means the current directory, which of course exists), then do nothing.
+    Raise DistutilsFileError if unable to create some directory along the way
+    (eg. some sub-path exists, but is a file rather than a directory).
+    If 'verbose' is true, print a one-line summary of each mkdir to stdout.
+    Return the list of directories actually created.
+    """
 
     global _path_created
 
     # Detect a common bug -- name is None
-    if not isinstance(name, StringTypes):
+    if not isinstance(name, basestring):
         raise DistutilsInternalError, \
               "mkpath: 'name' must be a string (got %r)" % (name,)
 
@@ -77,19 +77,16 @@ def mkpath (name, mode=0777, verbose=1, dry_run=0):
         _path_created[abs_head] = 1
     return created_dirs
 
-# mkpath ()
-
-
-def create_tree (base_dir, files, mode=0777, verbose=1, dry_run=0):
-
-    """Create all the empty directories under 'base_dir' needed to
-       put 'files' there.  'base_dir' is just the a name of a directory
-       which doesn't necessarily exist yet; 'files' is a list of filenames
-       to be interpreted relative to 'base_dir'.  'base_dir' + the
-       directory portion of every file in 'files' will be created if it
-       doesn't already exist.  'mode', 'verbose' and 'dry_run' flags are as
-       for 'mkpath()'."""
+def create_tree(base_dir, files, mode=0777, verbose=1, dry_run=0):
+    """Create all the empty directories under 'base_dir' needed to put 'files'
+    there.
 
+    'base_dir' is just the a name of a directory which doesn't necessarily
+    exist yet; 'files' is a list of filenames to be interpreted relative to
+    'base_dir'.  'base_dir' + the directory portion of every file in 'files'
+    will be created if it doesn't already exist.  'mode', 'verbose' and
+    'dry_run' flags are as for 'mkpath()'.
+    """
     # First get the list of directories to create
     need_dir = {}
     for file in files:
@@ -101,35 +98,27 @@ def create_tree (base_dir, files, mode=0777, verbose=1, dry_run=0):
     for dir in need_dirs:
         mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
 
-# create_tree ()
-
-
-def copy_tree (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               preserve_symlinks=0,
-               update=0,
-               verbose=1,
-               dry_run=0):
-
-    """Copy an entire directory tree 'src' to a new location 'dst'.  Both
-       'src' and 'dst' must be directory names.  If 'src' is not a
-       directory, raise DistutilsFileError.  If 'dst' does not exist, it is
-       created with 'mkpath()'.  The end result of the copy is that every
-       file in 'src' is copied to 'dst', and directories under 'src' are
-       recursively copied to 'dst'.  Return the list of files that were
-       copied or might have been copied, using their output name.  The
-       return value is unaffected by 'update' or 'dry_run': it is simply
-       the list of all files under 'src', with the names changed to be
-       under 'dst'.
-
-       'preserve_mode' and 'preserve_times' are the same as for
-       'copy_file'; note that they only apply to regular files, not to
-       directories.  If 'preserve_symlinks' is true, symlinks will be
-       copied as symlinks (on platforms that support them!); otherwise
-       (the default), the destination of the symlink will be copied.
-       'update' and 'verbose' are the same as for 'copy_file'."""
-
+def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
+              preserve_symlinks=0, update=0, verbose=1, dry_run=0):
+    """Copy an entire directory tree 'src' to a new location 'dst'.
+
+    Both 'src' and 'dst' must be directory names.  If 'src' is not a
+    directory, raise DistutilsFileError.  If 'dst' does not exist, it is
+    created with 'mkpath()'.  The end result of the copy is that every
+    file in 'src' is copied to 'dst', and directories under 'src' are
+    recursively copied to 'dst'.  Return the list of files that were
+    copied or might have been copied, using their output name.  The
+    return value is unaffected by 'update' or 'dry_run': it is simply
+    the list of all files under 'src', with the names changed to be
+    under 'dst'.
+
+    'preserve_mode' and 'preserve_times' are the same as for
+    'copy_file'; note that they only apply to regular files, not to
+    directories.  If 'preserve_symlinks' is true, symlinks will be
+    copied as symlinks (on platforms that support them!); otherwise
+    (the default), the destination of the symlink will be copied.
+    'update' and 'verbose' are the same as for 'copy_file'.
+    """
     from distutils.file_util import copy_file
 
     if not dry_run and not os.path.isdir(src):
@@ -174,10 +163,8 @@ def copy_tree (src, dst,
 
     return outputs
 
-# copy_tree ()
-
-# Helper for remove_tree()
 def _build_cmdtuple(path, cmdtuples):
+    """Helper for remove_tree()."""
     for f in os.listdir(path):
         real_f = os.path.join(path,f)
         if os.path.isdir(real_f) and not os.path.islink(real_f):
@@ -186,10 +173,11 @@ def _build_cmdtuple(path, cmdtuples):
             cmdtuples.append((os.remove, real_f))
     cmdtuples.append((os.rmdir, path))
 
+def remove_tree(directory, verbose=1, dry_run=0):
+    """Recursively remove an entire directory tree.
 
-def remove_tree (directory, verbose=1, dry_run=0):
-    """Recursively remove an entire directory tree.  Any errors are ignored
-    (apart from being reported to stdout if 'verbose' is true).
+    Any errors are ignored (apart from being reported to stdout if 'verbose'
+    is true).
     """
     from distutils.util import grok_environment_error
     global _path_created
@@ -211,10 +199,10 @@ def remove_tree (directory, verbose=1, dry_run=0):
             log.warn(grok_environment_error(
                     exc, "error removing %s: " % directory))
 
-
 def ensure_relative(path):
-    """Take the full path 'path', and make it a relative path so
-    it can be the second argument to os.path.join().
+    """Take the full path 'path', and make it a relative path.
+
+    This is useful to make 'path' the second argument to os.path.join().
     """
     drive, path = os.path.splitdrive(path)
     if path[0:1] == os.sep:

From 26aaaedf5db9750530cb20f8b71f1826a8ec8fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 11:25:57 +0000
Subject: [PATCH 2326/8469] Merged revisions 72730 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72730 | tarek.ziade | 2009-05-17 13:22:36 +0200 (Sun, 17 May 2009) | 1 line

  pep8-fied distutils.dir_util
........
---
 dir_util.py | 105 ++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 57 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 82608d2c87..98e6252c6c 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -15,15 +15,16 @@
 # I don't use os.makedirs because a) it's new to Python 1.5.2, and
 # b) it blows up if the directory already exists (I want to silently
 # succeed in that case).
-def mkpath (name, mode=0o777, verbose=1, dry_run=0):
-    """Create a directory and any missing ancestor directories.  If the
-       directory already exists (or if 'name' is the empty string, which
-       means the current directory, which of course exists), then do
-       nothing.  Raise DistutilsFileError if unable to create some
-       directory along the way (eg. some sub-path exists, but is a file
-       rather than a directory).  If 'verbose' is true, print a one-line
-       summary of each mkdir to stdout.  Return the list of directories
-       actually created."""
+def mkpath(name, mode=0o777, verbose=1, dry_run=0):
+    """Create a directory and any missing ancestor directories.
+
+    If the directory already exists (or if 'name' is the empty string, which
+    means the current directory, which of course exists), then do nothing.
+    Raise DistutilsFileError if unable to create some directory along the way
+    (eg. some sub-path exists, but is a file rather than a directory).
+    If 'verbose' is true, print a one-line summary of each mkdir to stdout.
+    Return the list of directories actually created.
+    """
 
     global _path_created
 
@@ -76,19 +77,16 @@ def mkpath (name, mode=0o777, verbose=1, dry_run=0):
         _path_created[abs_head] = 1
     return created_dirs
 
-# mkpath ()
-
-
-def create_tree (base_dir, files, mode=0o777, verbose=1, dry_run=0):
-
-    """Create all the empty directories under 'base_dir' needed to
-       put 'files' there.  'base_dir' is just the a name of a directory
-       which doesn't necessarily exist yet; 'files' is a list of filenames
-       to be interpreted relative to 'base_dir'.  'base_dir' + the
-       directory portion of every file in 'files' will be created if it
-       doesn't already exist.  'mode', 'verbose' and 'dry_run' flags are as
-       for 'mkpath()'."""
+def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0):
+    """Create all the empty directories under 'base_dir' needed to put 'files'
+    there.
 
+    'base_dir' is just the a name of a directory which doesn't necessarily
+    exist yet; 'files' is a list of filenames to be interpreted relative to
+    'base_dir'.  'base_dir' + the directory portion of every file in 'files'
+    will be created if it doesn't already exist.  'mode', 'verbose' and
+    'dry_run' flags are as for 'mkpath()'.
+    """
     # First get the list of directories to create
     need_dir = set()
     for file in files:
@@ -98,35 +96,27 @@ def create_tree (base_dir, files, mode=0o777, verbose=1, dry_run=0):
     for dir in sorted(need_dir):
         mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
 
-# create_tree ()
-
-
-def copy_tree (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               preserve_symlinks=0,
-               update=0,
-               verbose=1,
-               dry_run=0):
-
-    """Copy an entire directory tree 'src' to a new location 'dst'.  Both
-       'src' and 'dst' must be directory names.  If 'src' is not a
-       directory, raise DistutilsFileError.  If 'dst' does not exist, it is
-       created with 'mkpath()'.  The end result of the copy is that every
-       file in 'src' is copied to 'dst', and directories under 'src' are
-       recursively copied to 'dst'.  Return the list of files that were
-       copied or might have been copied, using their output name.  The
-       return value is unaffected by 'update' or 'dry_run': it is simply
-       the list of all files under 'src', with the names changed to be
-       under 'dst'.
-
-       'preserve_mode' and 'preserve_times' are the same as for
-       'copy_file'; note that they only apply to regular files, not to
-       directories.  If 'preserve_symlinks' is true, symlinks will be
-       copied as symlinks (on platforms that support them!); otherwise
-       (the default), the destination of the symlink will be copied.
-       'update' and 'verbose' are the same as for 'copy_file'."""
-
+def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
+              preserve_symlinks=0, update=0, verbose=1, dry_run=0):
+    """Copy an entire directory tree 'src' to a new location 'dst'.
+
+    Both 'src' and 'dst' must be directory names.  If 'src' is not a
+    directory, raise DistutilsFileError.  If 'dst' does not exist, it is
+    created with 'mkpath()'.  The end result of the copy is that every
+    file in 'src' is copied to 'dst', and directories under 'src' are
+    recursively copied to 'dst'.  Return the list of files that were
+    copied or might have been copied, using their output name.  The
+    return value is unaffected by 'update' or 'dry_run': it is simply
+    the list of all files under 'src', with the names changed to be
+    under 'dst'.
+
+    'preserve_mode' and 'preserve_times' are the same as for
+    'copy_file'; note that they only apply to regular files, not to
+    directories.  If 'preserve_symlinks' is true, symlinks will be
+    copied as symlinks (on platforms that support them!); otherwise
+    (the default), the destination of the symlink will be copied.
+    'update' and 'verbose' are the same as for 'copy_file'.
+    """
     from distutils.file_util import copy_file
 
     if not dry_run and not os.path.isdir(src):
@@ -172,8 +162,8 @@ def copy_tree (src, dst,
 
     return outputs
 
-# Helper for remove_tree()
 def _build_cmdtuple(path, cmdtuples):
+    """Helper for remove_tree()."""
     for f in os.listdir(path):
         real_f = os.path.join(path,f)
         if os.path.isdir(real_f) and not os.path.islink(real_f):
@@ -182,10 +172,11 @@ def _build_cmdtuple(path, cmdtuples):
             cmdtuples.append((os.remove, real_f))
     cmdtuples.append((os.rmdir, path))
 
+def remove_tree(directory, verbose=1, dry_run=0):
+    """Recursively remove an entire directory tree.
 
-def remove_tree (directory, verbose=1, dry_run=0):
-    """Recursively remove an entire directory tree.  Any errors are ignored
-    (apart from being reported to stdout if 'verbose' is true).
+    Any errors are ignored (apart from being reported to stdout if 'verbose'
+    is true).
     """
     from distutils.util import grok_environment_error
     global _path_created
@@ -207,10 +198,10 @@ def remove_tree (directory, verbose=1, dry_run=0):
             log.warn(grok_environment_error(
                     exc, "error removing %s: " % directory))
 
-
 def ensure_relative(path):
-    """Take the full path 'path', and make it a relative path so
-    it can be the second argument to os.path.join().
+    """Take the full path 'path', and make it a relative path.
+
+    This is useful to make 'path' the second argument to os.path.join().
     """
     drive, path = os.path.splitdrive(path)
     if path[0:1] == os.sep:

From 0f9f597d4519708a7866861403174320a81f2baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 12:04:57 +0000
Subject: [PATCH 2327/8469] pep8-fied distutils.archive_util + added minimum
 test coverage

---
 archive_util.py            | 80 +++++++++++++++++++-------------------
 tests/test_archive_util.py | 70 +++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 40 deletions(-)
 create mode 100644 tests/test_archive_util.py

diff --git a/archive_util.py b/archive_util.py
index b50563e317..f5959f5e64 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -11,15 +11,16 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-def make_tarball (base_name, base_dir, compress="gzip",
-                  verbose=0, dry_run=0):
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
-    'base_dir'.  'compress' must be "gzip" (the default), "compress",
-    "bzip2", or None.  Both "tar" and the compression utility named by
-    'compress' must be on the default program search path, so this is
-    probably Unix-specific.  The output tar file will be named 'base_dir' +
-    ".tar", possibly plus the appropriate compression extension (".gz",
-    ".bz2" or ".Z").  Return the output filename.
+    'base_dir'.
+
+    'compress' must be "gzip" (the default), "compress", "bzip2", or None.
+    Both "tar" and the compression utility named by 'compress' must be on
+    the default program search path, so this is probably Unix-specific.
+    The output tar file will be named 'base_dir' +  ".tar", possibly plus
+    the appropriate compression extension (".gz", ".bz2" or ".Z").
+    Returns the output filename.
     """
     # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
     # It's pretty new, though, so we certainly can't require it --
@@ -27,9 +28,9 @@ def make_tarball (base_name, base_dir, compress="gzip",
     # "create a tree of hardlinks" step!  (Would also be nice to
     # detect GNU tar to use its 'z' option and save a step.)
 
-    compress_ext = { 'gzip': ".gz",
-                     'bzip2': '.bz2',
-                     'compress': ".Z" }
+    compress_ext = {'gzip': ".gz",
+                    'bzip2': '.bz2',
+                    'compress': ".Z" }
 
     # flags for compression program, each element of list will be an argument
     compress_flags = {'gzip': ["-f9"],
@@ -52,15 +53,14 @@ def make_tarball (base_name, base_dir, compress="gzip",
     else:
         return archive_name
 
-# make_tarball ()
+def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
+    """Create a zip file from all the files under 'base_dir'.
 
-
-def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
-    """Create a zip file from all the files under 'base_dir'.  The output
-    zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
-    Python module (if available) or the InfoZIP "zip" utility (if installed
-    and found on the default search path).  If neither tool is available,
-    raises DistutilsExecError.  Returns the name of the output zip file.
+    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    "zipfile" Python module (if available) or the InfoZIP "zip" utility
+    (if installed and found on the default search path).  If neither tool is
+    available, raises DistutilsExecError.  Returns the name of the output zip
+    file.
     """
     try:
         import zipfile
@@ -94,22 +94,19 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
                  zip_filename, base_dir)
 
         if not dry_run:
-            z = zipfile.ZipFile(zip_filename, "w",
-                                compression=zipfile.ZIP_DEFLATED)
+            zip = zipfile.ZipFile(zip_filename, "w",
+                                  compression=zipfile.ZIP_DEFLATED)
 
             for dirpath, dirnames, filenames in os.walk(base_dir):
                 for name in filenames:
                     path = os.path.normpath(os.path.join(dirpath, name))
                     if os.path.isfile(path):
-                        z.write(path, path)
+                        zip.write(path, path)
                         log.info("adding '%s'" % path)
-            z.close()
+            zip.close()
 
     return zip_filename
 
-# make_zipfile ()
-
-
 ARCHIVE_FORMATS = {
     'gztar': (make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),
     'bztar': (make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
@@ -118,19 +115,24 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     'zip':   (make_zipfile, [],"ZIP file")
     }
 
-def check_archive_formats (formats):
+def check_archive_formats(formats):
+    """Returns the first format from the 'format' list that is unknown.
+
+    If all formats are known, returns None
+    """
     for format in formats:
         if format not in ARCHIVE_FORMATS:
             return format
-    else:
-        return None
-
-def make_archive (base_name, format,
-                  root_dir=None, base_dir=None,
-                  verbose=0, dry_run=0):
-    """Create an archive file (eg. zip or tar).  'base_name' is the name
-    of the file to create, minus any format-specific extension; 'format'
-    is the archive format: one of "zip", "tar", "ztar", or "gztar".
+    return None
+
+def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
+                 dry_run=0):
+    """Create an archive file (eg. zip or tar).
+
+    'base_name' is the name of the file to create, minus any format-specific
+    extension; 'format' is the archive format: one of "zip", "tar", "ztar",
+    or "gztar".
+
     'root_dir' is a directory that will be the root directory of the
     archive; ie. we typically chdir into 'root_dir' before creating the
     archive.  'base_dir' is the directory where we start archiving from;
@@ -148,7 +150,7 @@ def make_archive (base_name, format,
     if base_dir is None:
         base_dir = os.curdir
 
-    kwargs = { 'dry_run': dry_run }
+    kwargs = {'dry_run': dry_run}
 
     try:
         format_info = ARCHIVE_FORMATS[format]
@@ -156,7 +158,7 @@ def make_archive (base_name, format,
         raise ValueError, "unknown archive format '%s'" % format
 
     func = format_info[0]
-    for (arg,val) in format_info[1]:
+    for arg, val in format_info[1]:
         kwargs[arg] = val
     filename = apply(func, (base_name, base_dir), kwargs)
 
@@ -165,5 +167,3 @@ def make_archive (base_name, format,
         os.chdir(save_cwd)
 
     return filename
-
-# make_archive ()
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
new file mode 100644
index 0000000000..f5fd9eabe4
--- /dev/null
+++ b/tests/test_archive_util.py
@@ -0,0 +1,70 @@
+"""Tests for distutils.archive_util."""
+__revision__ = "$Id:$"
+
+import unittest
+import os
+
+from distutils.archive_util import (check_archive_formats, make_tarball,
+                                    make_zipfile, make_archive)
+from distutils.spawn import find_executable
+from distutils.tests import support
+
+try:
+    import zipfile
+    ZIP_SUPPORT = True
+except ImportError:
+    ZIP_SUPPORT = find_executable('zip')
+
+class ArchiveUtilTestCase(support.TempdirManager,
+                          unittest.TestCase):
+
+    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    def test_make_tarball(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        self.write_file([tmpdir, 'file1'], 'xxx')
+        self.write_file([tmpdir, 'file2'], 'xxx')
+
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_tarball(base_name, tmpdir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.tar.gz'
+        self.assert_(os.path.exists(tarball))
+
+        # trying an uncompressed one
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_tarball(base_name, tmpdir, compress=None)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+    @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
+    def test_make_tarball(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        self.write_file([tmpdir, 'file1'], 'xxx')
+        self.write_file([tmpdir, 'file2'], 'xxx')
+
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_zipfile(base_name, tmpdir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.zip'
+
+    def test_check_archive_formats(self):
+        self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
+                          'xxx')
+        self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
+
+    def test_make_archive(self):
+        tmpdir = self.mkdtemp()
+        base_name = os.path.join(tmpdir, 'archive')
+        self.assertRaises(ValueError, make_archive, base_name, 'xxx')
+
+def test_suite():
+    return unittest.makeSuite(ArchiveUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 4a9bfc806815434110760ba83b05c58bc2fe3014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 12:12:02 +0000
Subject: [PATCH 2328/8469] Merged revisions 72736 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72736 | tarek.ziade | 2009-05-17 14:04:57 +0200 (Sun, 17 May 2009) | 1 line

  pep8-fied distutils.archive_util + added minimum test coverage
........
---
 archive_util.py            | 80 +++++++++++++++++++-------------------
 tests/test_archive_util.py | 70 +++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 40 deletions(-)
 create mode 100644 tests/test_archive_util.py

diff --git a/archive_util.py b/archive_util.py
index 9444ff012f..08a9e56901 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -11,15 +11,16 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-def make_tarball (base_name, base_dir, compress="gzip",
-                  verbose=0, dry_run=0):
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
-    'base_dir'.  'compress' must be "gzip" (the default), "compress",
-    "bzip2", or None.  Both "tar" and the compression utility named by
-    'compress' must be on the default program search path, so this is
-    probably Unix-specific.  The output tar file will be named 'base_dir' +
-    ".tar", possibly plus the appropriate compression extension (".gz",
-    ".bz2" or ".Z").  Return the output filename.
+    'base_dir'.
+
+    'compress' must be "gzip" (the default), "compress", "bzip2", or None.
+    Both "tar" and the compression utility named by 'compress' must be on
+    the default program search path, so this is probably Unix-specific.
+    The output tar file will be named 'base_dir' +  ".tar", possibly plus
+    the appropriate compression extension (".gz", ".bz2" or ".Z").
+    Returns the output filename.
     """
     # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
     # It's pretty new, though, so we certainly can't require it --
@@ -27,9 +28,9 @@ def make_tarball (base_name, base_dir, compress="gzip",
     # "create a tree of hardlinks" step!  (Would also be nice to
     # detect GNU tar to use its 'z' option and save a step.)
 
-    compress_ext = { 'gzip': ".gz",
-                     'bzip2': '.bz2',
-                     'compress': ".Z" }
+    compress_ext = {'gzip': ".gz",
+                    'bzip2': '.bz2',
+                    'compress': ".Z" }
 
     # flags for compression program, each element of list will be an argument
     compress_flags = {'gzip': ["-f9"],
@@ -52,15 +53,14 @@ def make_tarball (base_name, base_dir, compress="gzip",
     else:
         return archive_name
 
-# make_tarball ()
+def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
+    """Create a zip file from all the files under 'base_dir'.
 
-
-def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
-    """Create a zip file from all the files under 'base_dir'.  The output
-    zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
-    Python module (if available) or the InfoZIP "zip" utility (if installed
-    and found on the default search path).  If neither tool is available,
-    raises DistutilsExecError.  Returns the name of the output zip file.
+    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    "zipfile" Python module (if available) or the InfoZIP "zip" utility
+    (if installed and found on the default search path).  If neither tool is
+    available, raises DistutilsExecError.  Returns the name of the output zip
+    file.
     """
     try:
         import zipfile
@@ -93,22 +93,19 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
                  zip_filename, base_dir)
 
         if not dry_run:
-            z = zipfile.ZipFile(zip_filename, "w",
-                                compression=zipfile.ZIP_DEFLATED)
+            zip = zipfile.ZipFile(zip_filename, "w",
+                                  compression=zipfile.ZIP_DEFLATED)
 
             for dirpath, dirnames, filenames in os.walk(base_dir):
                 for name in filenames:
                     path = os.path.normpath(os.path.join(dirpath, name))
                     if os.path.isfile(path):
-                        z.write(path, path)
+                        zip.write(path, path)
                         log.info("adding '%s'" % path)
-            z.close()
+            zip.close()
 
     return zip_filename
 
-# make_zipfile ()
-
-
 ARCHIVE_FORMATS = {
     'gztar': (make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),
     'bztar': (make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
@@ -117,19 +114,24 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
     'zip':   (make_zipfile, [],"ZIP file")
     }
 
-def check_archive_formats (formats):
+def check_archive_formats(formats):
+    """Returns the first format from the 'format' list that is unknown.
+
+    If all formats are known, returns None
+    """
     for format in formats:
         if format not in ARCHIVE_FORMATS:
             return format
-    else:
-        return None
-
-def make_archive (base_name, format,
-                  root_dir=None, base_dir=None,
-                  verbose=0, dry_run=0):
-    """Create an archive file (eg. zip or tar).  'base_name' is the name
-    of the file to create, minus any format-specific extension; 'format'
-    is the archive format: one of "zip", "tar", "ztar", or "gztar".
+    return None
+
+def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
+                 dry_run=0):
+    """Create an archive file (eg. zip or tar).
+
+    'base_name' is the name of the file to create, minus any format-specific
+    extension; 'format' is the archive format: one of "zip", "tar", "ztar",
+    or "gztar".
+
     'root_dir' is a directory that will be the root directory of the
     archive; ie. we typically chdir into 'root_dir' before creating the
     archive.  'base_dir' is the directory where we start archiving from;
@@ -147,7 +149,7 @@ def make_archive (base_name, format,
     if base_dir is None:
         base_dir = os.curdir
 
-    kwargs = { 'dry_run': dry_run }
+    kwargs = {'dry_run': dry_run}
 
     try:
         format_info = ARCHIVE_FORMATS[format]
@@ -155,7 +157,7 @@ def make_archive (base_name, format,
         raise ValueError("unknown archive format '%s'" % format)
 
     func = format_info[0]
-    for (arg,val) in format_info[1]:
+    for arg, val in format_info[1]:
         kwargs[arg] = val
     filename = func(base_name, base_dir, **kwargs)
 
@@ -164,5 +166,3 @@ def make_archive (base_name, format,
         os.chdir(save_cwd)
 
     return filename
-
-# make_archive ()
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
new file mode 100644
index 0000000000..f5fd9eabe4
--- /dev/null
+++ b/tests/test_archive_util.py
@@ -0,0 +1,70 @@
+"""Tests for distutils.archive_util."""
+__revision__ = "$Id:$"
+
+import unittest
+import os
+
+from distutils.archive_util import (check_archive_formats, make_tarball,
+                                    make_zipfile, make_archive)
+from distutils.spawn import find_executable
+from distutils.tests import support
+
+try:
+    import zipfile
+    ZIP_SUPPORT = True
+except ImportError:
+    ZIP_SUPPORT = find_executable('zip')
+
+class ArchiveUtilTestCase(support.TempdirManager,
+                          unittest.TestCase):
+
+    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    def test_make_tarball(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        self.write_file([tmpdir, 'file1'], 'xxx')
+        self.write_file([tmpdir, 'file2'], 'xxx')
+
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_tarball(base_name, tmpdir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.tar.gz'
+        self.assert_(os.path.exists(tarball))
+
+        # trying an uncompressed one
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_tarball(base_name, tmpdir, compress=None)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+    @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
+    def test_make_tarball(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        self.write_file([tmpdir, 'file1'], 'xxx')
+        self.write_file([tmpdir, 'file2'], 'xxx')
+
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        make_zipfile(base_name, tmpdir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.zip'
+
+    def test_check_archive_formats(self):
+        self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
+                          'xxx')
+        self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
+
+    def test_make_archive(self):
+        tmpdir = self.mkdtemp()
+        base_name = os.path.join(tmpdir, 'archive')
+        self.assertRaises(ValueError, make_archive, base_name, 'xxx')
+
+def test_suite():
+    return unittest.makeSuite(ArchiveUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 535f0f46a86e0b1625dc4bb7ebd6e1c9d89bb2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 14:59:05 +0000
Subject: [PATCH 2329/8469] fixed the test name

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

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index f5fd9eabe4..3e1e04a75f 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -1,5 +1,5 @@
 """Tests for distutils.archive_util."""
-__revision__ = "$Id:$"
+__revision__ = "$Id$"
 
 import unittest
 import os
@@ -40,7 +40,7 @@ def test_make_tarball(self):
         self.assert_(os.path.exists(tarball))
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
-    def test_make_tarball(self):
+    def test_make_zipfile(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')

From 445d69ec9e89b0008380697c8337e0b8850d8bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 17 May 2009 15:03:23 +0000
Subject: [PATCH 2330/8469] Merged revisions 72746 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72746 | tarek.ziade | 2009-05-17 16:59:05 +0200 (Sun, 17 May 2009) | 1 line

  fixed the test name
........
---
 tests/test_archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index f5fd9eabe4..3e1e04a75f 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -1,5 +1,5 @@
 """Tests for distutils.archive_util."""
-__revision__ = "$Id:$"
+__revision__ = "$Id$"
 
 import unittest
 import os
@@ -40,7 +40,7 @@ def test_make_tarball(self):
         self.assert_(os.path.exists(tarball))
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
-    def test_make_tarball(self):
+    def test_make_zipfile(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')

From fba15990838934c09b76999ff14350ac8105feef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:03:37 +0000
Subject: [PATCH 2331/8469] Fixed the library extension when distutils
 build_ext is used inplace

---
 command/build_ext.py    |  6 +++---
 tests/test_build_ext.py | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 10d50fade7..0c77aaa665 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -649,7 +649,8 @@ def get_ext_fullpath(self, ext_name):
             base = modpath[-1]
             build_py = self.get_finalized_command('build_py')
             package_dir = os.path.abspath(build_py.get_package_dir(package))
-            return os.path.join(package_dir, base)
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(package_dir, filename)
         else:
             filename = self.get_ext_filename(ext_name)
             return os.path.join(self.build_lib, filename)
@@ -663,12 +664,11 @@ def get_ext_fullname(self, ext_name):
         else:
             return self.package + '.' + ext_name
 
-    def get_ext_filename (self, ext_name):
+    def get_ext_filename(self, ext_name):
         r"""Convert the name of an extension (eg. "foo.bar") into the name
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-
         from distutils.sysconfig import get_config_var
         ext_path = string.split(ext_name, '.')
         # OS/2 has an 8 character module (extension) limit :-(
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 7e3f716500..f1f80bea5d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,12 +19,6 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-if sys.platform != 'win32':
-    UNDER_MSVC8 = False
-else:
-    from distutils.msvccompiler import get_build_version
-    UNDER_MSVC8 = get_build_version() < 8.0
-
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
@@ -299,7 +293,6 @@ def test_compiler_option(self):
         cmd.run()
         self.assertEquals(cmd.compiler, 'unix')
 
-    @unittest.skipIf(UNDER_MSVC8, 'not running this test for MSVC < 8')
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
@@ -329,6 +322,8 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
 
@@ -336,6 +331,8 @@ def test_get_outputs(self):
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 

From 86915f4a6cb7244864725cc0c07daceee33fe8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:05:17 +0000
Subject: [PATCH 2332/8469] Merged revisions 72758 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72758 | tarek.ziade | 2009-05-18 10:03:37 +0200 (Mon, 18 May 2009) | 1 line

  Fixed the library extension when distutils build_ext is used inplace
........
---
 command/build_ext.py    |  6 +++---
 tests/test_build_ext.py | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 01bab3664f..85935d37bf 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -635,7 +635,8 @@ def get_ext_fullpath(self, ext_name):
             base = modpath[-1]
             build_py = self.get_finalized_command('build_py')
             package_dir = os.path.abspath(build_py.get_package_dir(package))
-            return os.path.join(package_dir, base)
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(package_dir, filename)
         else:
             filename = self.get_ext_filename(ext_name)
             return os.path.join(self.build_lib, filename)
@@ -649,12 +650,11 @@ def get_ext_fullname(self, ext_name):
         else:
             return self.package + '.' + ext_name
 
-    def get_ext_filename (self, ext_name):
+    def get_ext_filename(self, ext_name):
         r"""Convert the name of an extension (eg. "foo.bar") into the name
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-
         from distutils.sysconfig import get_config_var
         ext_path = string.split(ext_name, '.')
         # OS/2 has an 8 character module (extension) limit :-(
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 21020d3927..bd906e35e5 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -17,12 +17,6 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-if sys.platform != 'win32':
-    UNDER_MSVC8 = False
-else:
-    from distutils.msvccompiler import get_build_version
-    UNDER_MSVC8 = get_build_version() < 8.0
-
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
@@ -267,6 +261,8 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
 
@@ -274,6 +270,8 @@ def test_get_outputs(self):
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 

From 2a6e4aeb17aaaa1618b9fbf66241e91fcd38d755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:07:46 +0000
Subject: [PATCH 2333/8469] Merged revisions 72758 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72758 | tarek.ziade | 2009-05-18 10:03:37 +0200 (Mon, 18 May 2009) | 1 line

  Fixed the library extension when distutils build_ext is used inplace
........
---
 command/build_ext.py    |  3 ++-
 tests/test_build_ext.py | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c39bd72d62..eb4cb051c4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -636,7 +636,8 @@ def get_ext_fullpath(self, ext_name):
             base = modpath[-1]
             build_py = self.get_finalized_command('build_py')
             package_dir = os.path.abspath(build_py.get_package_dir(package))
-            return os.path.join(package_dir, base)
+            filename = self.get_ext_filename(ext_name)
+            return os.path.join(package_dir, filename)
         else:
             filename = self.get_ext_filename(ext_name)
             return os.path.join(self.build_lib, filename)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 764aa727d1..add2923b87 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -20,12 +20,6 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-if sys.platform != 'win32':
-    UNDER_MSVC8 = False
-else:
-    from distutils.msvccompiler import get_build_version
-    UNDER_MSVC8 = get_build_version() < 8.0
-
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
@@ -299,7 +293,6 @@ def test_compiler_option(self):
         cmd.run()
         self.assertEquals(cmd.compiler, 'unix')
 
-    @unittest.skipIf(UNDER_MSVC8, 'not running this test for MSVC < 8')
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
@@ -329,6 +322,8 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
 
@@ -336,6 +331,8 @@ def test_get_outputs(self):
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assert_(os.path.exists(so_file))
+        self.assertEquals(os.path.splitext(so_file)[-1],
+                          sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 

From 081b45d279495030ace791b068945064d38565e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:08:31 +0000
Subject: [PATCH 2334/8469] removed badly merged section

---
 tests/test_build_ext.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index bd906e35e5..fcca2f0d96 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -231,8 +231,6 @@ def test_compiler_option(self):
         self.assertEquals(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
-        if UNDER_MSVC8:
-            return # not running this test for MSVC < 8
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
         self.write_file(c_file, 'void initfoo(void) {};\n')

From 339ad8b282de40378695f6858187fe1d78792e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:20:55 +0000
Subject: [PATCH 2335/8469] working with relative paths to avoid tar warnings
 on absolute paths

---
 tests/test_archive_util.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 3e1e04a75f..1c88457d01 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -27,7 +27,14 @@ def test_make_tarball(self):
 
         tmpdir2 = self.mkdtemp()
         base_name = os.path.join(tmpdir2, 'archive')
-        make_tarball(base_name, tmpdir)
+
+        # working with relative paths to avoid tar warnings
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, '.')
+        finally:
+            os.chdir(old_dir)
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
@@ -35,7 +42,12 @@ def test_make_tarball(self):
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
-        make_tarball(base_name, tmpdir, compress=None)
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, '.', compress=None)
+        finally:
+            os.chdir(old_dir)
         tarball = base_name + '.tar'
         self.assert_(os.path.exists(tarball))
 

From 20cee3dea3f35f7c7b293828339f1b32f138a439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:22:38 +0000
Subject: [PATCH 2336/8469] Merged revisions 72764 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72764 | tarek.ziade | 2009-05-18 10:20:55 +0200 (Mon, 18 May 2009) | 1 line

  working with relative paths to avoid tar warnings on absolute paths
........
---
 tests/test_archive_util.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 3e1e04a75f..1c88457d01 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -27,7 +27,14 @@ def test_make_tarball(self):
 
         tmpdir2 = self.mkdtemp()
         base_name = os.path.join(tmpdir2, 'archive')
-        make_tarball(base_name, tmpdir)
+
+        # working with relative paths to avoid tar warnings
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, '.')
+        finally:
+            os.chdir(old_dir)
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
@@ -35,7 +42,12 @@ def test_make_tarball(self):
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
-        make_tarball(base_name, tmpdir, compress=None)
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, '.', compress=None)
+        finally:
+            os.chdir(old_dir)
         tarball = base_name + '.tar'
         self.assert_(os.path.exists(tarball))
 

From 74ddca391d68fdf88f9c8cd920c90b0b00e29952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 12:21:26 +0000
Subject: [PATCH 2337/8469] Fixed #6053 - win32 fixes for distutils tests

---
 tests/test_archive_util.py | 8 ++++++--
 tests/test_dir_util.py     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 1c88457d01..cabb55bc15 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -3,6 +3,7 @@
 
 import unittest
 import os
+from os.path import splitdrive
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
                                     make_zipfile, make_archive)
@@ -26,13 +27,16 @@ def test_make_tarball(self):
         self.write_file([tmpdir, 'file2'], 'xxx')
 
         tmpdir2 = self.mkdtemp()
+        unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
+                            "Source and target should be on same drive")
+
         base_name = os.path.join(tmpdir2, 'archive')
 
         # working with relative paths to avoid tar warnings
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            make_tarball(base_name, '.')
+            make_tarball(splitdrive(base_name)[1], '.')
         finally:
             os.chdir(old_dir)
 
@@ -45,7 +49,7 @@ def test_make_tarball(self):
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            make_tarball(base_name, '.', compress=None)
+            make_tarball(splitdrive(base_name)[1], '.', compress=None)
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 9bd6530c14..6b22f05ff0 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -88,7 +88,7 @@ def test_ensure_relative(self):
             self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
             self.assertEquals(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():

From a1f34fda85afa9ae18b3171d03dd258169d3f52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 12:29:06 +0000
Subject: [PATCH 2338/8469] Merged revisions 72768 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72768 | tarek.ziade | 2009-05-18 14:21:26 +0200 (Mon, 18 May 2009) | 1 line

  Fixed #6053 - win32 fixes for distutils tests
........
---
 tests/test_archive_util.py | 8 ++++++--
 tests/test_dir_util.py     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 1c88457d01..cabb55bc15 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -3,6 +3,7 @@
 
 import unittest
 import os
+from os.path import splitdrive
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
                                     make_zipfile, make_archive)
@@ -26,13 +27,16 @@ def test_make_tarball(self):
         self.write_file([tmpdir, 'file2'], 'xxx')
 
         tmpdir2 = self.mkdtemp()
+        unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
+                            "Source and target should be on same drive")
+
         base_name = os.path.join(tmpdir2, 'archive')
 
         # working with relative paths to avoid tar warnings
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            make_tarball(base_name, '.')
+            make_tarball(splitdrive(base_name)[1], '.')
         finally:
             os.chdir(old_dir)
 
@@ -45,7 +49,7 @@ def test_make_tarball(self):
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            make_tarball(base_name, '.', compress=None)
+            make_tarball(splitdrive(base_name)[1], '.', compress=None)
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 9bd6530c14..6b22f05ff0 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -88,7 +88,7 @@ def test_ensure_relative(self):
             self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
             self.assertEquals(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():

From f8d02d79647a15807b50a43f1a4614f0fdf288ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 19 May 2009 16:17:21 +0000
Subject: [PATCH 2339/8469] fixed the 'package' option of build_ext

---
 command/build_ext.py    | 24 +++++++++++++-----------
 tests/test_build_ext.py | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0c77aaa665..293c214de7 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -642,19 +642,21 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
-        if self.inplace:
-            fullname = self.get_ext_fullname(ext_name)
-            modpath = fullname.split('.')
-            package = '.'.join(modpath[0:-1])
-            base = modpath[-1]
-            build_py = self.get_finalized_command('build_py')
-            package_dir = os.path.abspath(build_py.get_package_dir(package))
-            filename = self.get_ext_filename(ext_name)
-            return os.path.join(package_dir, filename)
-        else:
-            filename = self.get_ext_filename(ext_name)
+        fullname = self.get_ext_fullname(ext_name)
+        filename = self.get_ext_filename(fullname)
+        if not self.inplace:
+            # no further work needed
             return os.path.join(self.build_lib, filename)
 
+        # the inplace option requires to find the package directory
+        # using the build_py command
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        build_py = self.get_finalized_command('build_py')
+        package_dir = os.path.abspath(build_py.get_package_dir(package))
+        return os.path.join(package_dir, filename)
+
     def get_ext_fullname(self, ext_name):
         """Returns the fullname of a given extension name.
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index f1f80bea5d..12b8581c97 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -336,6 +336,28 @@ def test_get_outputs(self):
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 
+        # inplace = 0, cmd.package = 'bar'
+        cmd.package = 'bar'
+        path = cmd.get_ext_fullpath('foo')
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
+        # inplace = 1, cmd.package = 'bar'
+        cmd.inplace = 1
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            path = cmd.get_ext_fullpath('foo')
+        finally:
+            os.chdir(old_wd)
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 7a61abeaf1519c93e89032e34b44b0a311015ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 19 May 2009 16:19:15 +0000
Subject: [PATCH 2340/8469] Merged revisions 72781 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72781 | tarek.ziade | 2009-05-19 18:17:21 +0200 (Tue, 19 May 2009) | 1 line

  fixed the 'package' option of build_ext
........
---
 command/build_ext.py    | 24 +++++++++++++-----------
 tests/test_build_ext.py | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 85935d37bf..e6e33ab95c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -628,19 +628,21 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
-        if self.inplace:
-            fullname = self.get_ext_fullname(ext_name)
-            modpath = fullname.split('.')
-            package = '.'.join(modpath[0:-1])
-            base = modpath[-1]
-            build_py = self.get_finalized_command('build_py')
-            package_dir = os.path.abspath(build_py.get_package_dir(package))
-            filename = self.get_ext_filename(ext_name)
-            return os.path.join(package_dir, filename)
-        else:
-            filename = self.get_ext_filename(ext_name)
+        fullname = self.get_ext_fullname(ext_name)
+        filename = self.get_ext_filename(fullname)
+        if not self.inplace:
+            # no further work needed
             return os.path.join(self.build_lib, filename)
 
+        # the inplace option requires to find the package directory
+        # using the build_py command
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        build_py = self.get_finalized_command('build_py')
+        package_dir = os.path.abspath(build_py.get_package_dir(package))
+        return os.path.join(package_dir, filename)
+
     def get_ext_fullname(self, ext_name):
         """Returns the fullname of a given extension name.
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index fcca2f0d96..dc8df98fd7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -273,6 +273,28 @@ def test_get_outputs(self):
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 
+        # inplace = 0, cmd.package = 'bar'
+        cmd.package = 'bar'
+        path = cmd.get_ext_fullpath('foo')
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
+        # inplace = 1, cmd.package = 'bar'
+        cmd.inplace = 1
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            path = cmd.get_ext_fullpath('foo')
+        finally:
+            os.chdir(old_wd)
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 92ad4a19caeac451803ca1737b0d5514497e5be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 19 May 2009 16:22:57 +0000
Subject: [PATCH 2341/8469] Merged revisions 72781 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72781 | tarek.ziade | 2009-05-19 18:17:21 +0200 (Tue, 19 May 2009) | 1 line

  fixed the 'package' option of build_ext
........
---
 command/build_ext.py    | 24 +++++++++++++-----------
 tests/test_build_ext.py | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index eb4cb051c4..31e036bceb 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -629,19 +629,21 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
-        if self.inplace:
-            fullname = self.get_ext_fullname(ext_name)
-            modpath = fullname.split('.')
-            package = '.'.join(modpath[0:-1])
-            base = modpath[-1]
-            build_py = self.get_finalized_command('build_py')
-            package_dir = os.path.abspath(build_py.get_package_dir(package))
-            filename = self.get_ext_filename(ext_name)
-            return os.path.join(package_dir, filename)
-        else:
-            filename = self.get_ext_filename(ext_name)
+        fullname = self.get_ext_fullname(ext_name)
+        filename = self.get_ext_filename(fullname)
+        if not self.inplace:
+            # no further work needed
             return os.path.join(self.build_lib, filename)
 
+        # the inplace option requires to find the package directory
+        # using the build_py command
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        build_py = self.get_finalized_command('build_py')
+        package_dir = os.path.abspath(build_py.get_package_dir(package))
+        return os.path.join(package_dir, filename)
+
     def get_ext_fullname(self, ext_name):
         """Returns the fullname of a given extension name.
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index add2923b87..4ea11a159d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -336,6 +336,28 @@ def test_get_outputs(self):
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 
+        # inplace = 0, cmd.package = 'bar'
+        cmd.package = 'bar'
+        path = cmd.get_ext_fullpath('foo')
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
+        # inplace = 1, cmd.package = 'bar'
+        cmd.inplace = 1
+        other_tmp_dir = os.path.realpath(self.mkdtemp())
+        old_wd = os.getcwd()
+        os.chdir(other_tmp_dir)
+        try:
+            path = cmd.get_ext_fullpath('foo')
+        finally:
+            os.chdir(old_wd)
+        # checking that the last directory is bar
+        path = os.path.split(path)[0]
+        lastdir = os.path.split(path)[-1]
+        self.assertEquals(lastdir, cmd.package)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 0b15216368f28f9178947b1f2df283b73f4a5633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 22 May 2009 09:42:43 +0000
Subject: [PATCH 2342/8469] fixed encoding

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

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 18bddeb483..4272b818bd 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2005, 2006 Martin v. Löwis
+# -*- coding: utf-8 -*-
+# Copyright (C) 2005, 2006 Martin von Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst

From a81606b89db3da71c18ace79793438e7abb4aa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 24 May 2009 19:10:52 +0000
Subject: [PATCH 2343/8469] Issue #6065: Do not try to build a
 version-independent installer if the package has extension modules.

Also add NEWS entry for #5311.
---
 command/bdist_msi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 4272b818bd..b42e41b373 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -141,6 +141,8 @@ def finalize_options (self):
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
         short_version = get_python_version()
+        if (not self.target_version) and self.distribution.has_ext_modules():
+            self.target_version = short_version
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\

From 0c3b40e164295dbd4282d6ad7675934758d6e36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 24 May 2009 19:19:17 +0000
Subject: [PATCH 2344/8469] Merged revisions 72891 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72891 | martin.v.loewis | 2009-05-24 21:10:52 +0200 (So, 24 Mai 2009) | 5 lines

  Issue #6065: Do not try to build a version-independent
  installer if the package has extension modules.

  Also add NEWS entry for #5311.
........
---
 command/bdist_msi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 9645158637..bca98cc23e 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -141,6 +141,8 @@ def finalize_options(self):
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
         short_version = get_python_version()
+        if (not self.target_version) and self.distribution.has_ext_modules():
+            self.target_version = short_version
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\

From 8488006f14d1c8008e2019f673a002e18062ff1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 28 May 2009 12:53:54 +0000
Subject: [PATCH 2345/8469] Fixed #6048: Distutils uses the tarfile module
 instead of the tar command now

---
 archive_util.py            |  58 +++++++++++--------
 tests/test_archive_util.py | 113 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 146 insertions(+), 25 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index f5959f5e64..62150b0ddd 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -6,6 +6,9 @@
 __revision__ = "$Id$"
 
 import os
+from warnings import warn
+import sys
+
 from distutils.errors import DistutilsExecError
 from distutils.spawn import spawn
 from distutils.dir_util import mkpath
@@ -22,36 +25,45 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     the appropriate compression extension (".gz", ".bz2" or ".Z").
     Returns the output filename.
     """
-    # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-    # It's pretty new, though, so we certainly can't require it --
-    # but it would be nice to take advantage of it to skip the
-    # "create a tree of hardlinks" step!  (Would also be nice to
-    # detect GNU tar to use its 'z' option and save a step.)
-
-    compress_ext = {'gzip': ".gz",
-                    'bzip2': '.bz2',
-                    'compress': ".Z" }
+    tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
+    compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'compress': '.Z'}
 
     # flags for compression program, each element of list will be an argument
-    compress_flags = {'gzip': ["-f9"],
-                      'compress': ["-f"],
-                      'bzip2': ['-f9']}
-
     if compress is not None and compress not in compress_ext.keys():
         raise ValueError, \
-              "bad value for 'compress': must be None, 'gzip', or 'compress'"
+              ("bad value for 'compress': must be None, 'gzip', 'bzip2' "
+               "or 'compress'")
+
+    archive_name = base_name + '.tar'
+    if compress != 'compress':
+        archive_name += compress_ext.get(compress, '')
 
-    archive_name = base_name + ".tar"
     mkpath(os.path.dirname(archive_name), dry_run=dry_run)
-    cmd = ["tar", "-cf", archive_name, base_dir]
-    spawn(cmd, dry_run=dry_run)
 
-    if compress:
-        spawn([compress] + compress_flags[compress] + [archive_name],
-              dry_run=dry_run)
-        return archive_name + compress_ext[compress]
-    else:
-        return archive_name
+    # creating the tarball
+    import tarfile  # late import so Python build itself doesn't break
+
+    log.info('Creating tar archive')
+    if not dry_run:
+        tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
+        try:
+            tar.add(base_dir)
+        finally:
+            tar.close()
+
+    # compression using `compress`
+    if compress == 'compress':
+        warn("'compress' will be deprecated.", PendingDeprecationWarning)
+        # the option varies depending on the platform
+        compressed_name = archive_name + compress_ext[compress]
+        if sys.platform == 'win32':
+            cmd = [compress, archive_name, compressed_name]
+        else:
+            cmd = [compress, '-f', archive_name]
+        spawn(cmd, dry_run=dry_run)
+        return compressed_name
+
+    return archive_name
 
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index cabb55bc15..2b24152632 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -3,12 +3,15 @@
 
 import unittest
 import os
+import tarfile
 from os.path import splitdrive
+import warnings
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
                                     make_zipfile, make_archive)
-from distutils.spawn import find_executable
+from distutils.spawn import find_executable, spawn
 from distutils.tests import support
+from test.test_support import check_warnings
 
 try:
     import zipfile
@@ -19,12 +22,13 @@
 class ArchiveUtilTestCase(support.TempdirManager,
                           unittest.TestCase):
 
-    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')
         self.write_file([tmpdir, 'file2'], 'xxx')
+        os.mkdir(os.path.join(tmpdir, 'sub'))
+        self.write_file([tmpdir, 'sub', 'file3'], 'xxx')
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
@@ -55,6 +59,111 @@ def test_make_tarball(self):
         tarball = base_name + '.tar'
         self.assert_(os.path.exists(tarball))
 
+    def _tarinfo(self, path):
+        tar = tarfile.open(path)
+        try:
+            names = tar.getnames()
+            names.sort()
+            return tuple(names)
+        finally:
+            tar.close()
+
+    def _create_files(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        dist = os.path.join(tmpdir, 'dist')
+        os.mkdir(dist)
+        self.write_file([dist, 'file1'], 'xxx')
+        self.write_file([dist, 'file2'], 'xxx')
+        os.mkdir(os.path.join(dist, 'sub'))
+        self.write_file([dist, 'sub', 'file3'], 'xxx')
+        os.mkdir(os.path.join(dist, 'sub2'))
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        return tmpdir, tmpdir2, base_name
+
+    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    def test_tarfile_vs_tar(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist')
+        finally:
+            os.chdir(old_dir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.tar.gz'
+        self.assert_(os.path.exists(tarball))
+
+        # now create another tarball using `tar`
+        tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
+        cmd = ['tar', '-czf', 'archive2.tar.gz', 'dist']
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            spawn(cmd)
+        finally:
+            os.chdir(old_dir)
+
+        self.assert_(os.path.exists(tarball2))
+        # let's compare both tarballs
+        self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
+
+        # trying an uncompressed one
+        base_name = os.path.join(tmpdir2, 'archive')
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist', compress=None)
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+        # now for a dry_run
+        base_name = os.path.join(tmpdir2, 'archive')
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist', compress=None, dry_run=True)
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+    @unittest.skipUnless(find_executable('compress'),
+                         'The compress program is required')
+    def test_compress_deprecated(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+
+        # using compress and testing the PendingDeprecationWarning
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            with check_warnings() as w:
+                warnings.simplefilter("always")
+                make_tarball(base_name, 'dist', compress='compress')
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar.Z'
+        self.assert_(os.path.exists(tarball))
+        self.assertEquals(len(w.warnings), 1)
+
+        # same test with dry_run
+        os.remove(tarball)
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            with check_warnings() as w:
+                warnings.simplefilter("always")
+                make_tarball(base_name, 'dist', compress='compress',
+                             dry_run=True)
+        finally:
+            os.chdir(old_dir)
+        self.assert_(not os.path.exists(tarball))
+        self.assertEquals(len(w.warnings), 1)
+
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
         # creating something to tar

From f8af27c626419e60e9f6df824d2fb96f9ee8d2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 28 May 2009 13:01:13 +0000
Subject: [PATCH 2346/8469] Merged revisions 72981 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72981 | tarek.ziade | 2009-05-28 14:53:54 +0200 (Thu, 28 May 2009) | 1 line

  Fixed #6048: Distutils uses the tarfile module instead of the tar command now
........
---
 archive_util.py            |  58 +++++++++++--------
 tests/test_archive_util.py | 113 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 146 insertions(+), 25 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 08a9e56901..a568854e4e 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -6,6 +6,9 @@
 __revision__ = "$Id$"
 
 import os
+from warnings import warn
+import sys
+
 from distutils.errors import DistutilsExecError
 from distutils.spawn import spawn
 from distutils.dir_util import mkpath
@@ -22,36 +25,45 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     the appropriate compression extension (".gz", ".bz2" or ".Z").
     Returns the output filename.
     """
-    # XXX GNU tar 1.13 has a nifty option to add a prefix directory.
-    # It's pretty new, though, so we certainly can't require it --
-    # but it would be nice to take advantage of it to skip the
-    # "create a tree of hardlinks" step!  (Would also be nice to
-    # detect GNU tar to use its 'z' option and save a step.)
-
-    compress_ext = {'gzip': ".gz",
-                    'bzip2': '.bz2',
-                    'compress': ".Z" }
+    tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
+    compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'compress': '.Z'}
 
     # flags for compression program, each element of list will be an argument
-    compress_flags = {'gzip': ["-f9"],
-                      'compress': ["-f"],
-                      'bzip2': ['-f9']}
-
     if compress is not None and compress not in compress_ext.keys():
         raise ValueError(
-              "bad value for 'compress': must be None, 'gzip', or 'compress'")
+              "bad value for 'compress': must be None, 'gzip', 'bzip2' "
+              "or 'compress'")
+
+    archive_name = base_name + '.tar'
+    if compress != 'compress':
+        archive_name += compress_ext.get(compress, '')
 
-    archive_name = base_name + ".tar"
     mkpath(os.path.dirname(archive_name), dry_run=dry_run)
-    cmd = ["tar", "-cf", archive_name, base_dir]
-    spawn(cmd, dry_run=dry_run)
 
-    if compress:
-        spawn([compress] + compress_flags[compress] + [archive_name],
-              dry_run=dry_run)
-        return archive_name + compress_ext[compress]
-    else:
-        return archive_name
+    # creating the tarball
+    import tarfile  # late import so Python build itself doesn't break
+
+    log.info('Creating tar archive')
+    if not dry_run:
+        tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
+        try:
+            tar.add(base_dir)
+        finally:
+            tar.close()
+
+    # compression using `compress`
+    if compress == 'compress':
+        warn("'compress' will be deprecated.", PendingDeprecationWarning)
+        # the option varies depending on the platform
+        compressed_name = archive_name + compress_ext[compress]
+        if sys.platform == 'win32':
+            cmd = [compress, archive_name, compressed_name]
+        else:
+            cmd = [compress, '-f', archive_name]
+        spawn(cmd, dry_run=dry_run)
+        return compressed_name
+
+    return archive_name
 
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index cabb55bc15..5db9a5d096 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -3,12 +3,15 @@
 
 import unittest
 import os
+import tarfile
 from os.path import splitdrive
+import warnings
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
                                     make_zipfile, make_archive)
-from distutils.spawn import find_executable
+from distutils.spawn import find_executable, spawn
 from distutils.tests import support
+from test.support import check_warnings
 
 try:
     import zipfile
@@ -19,12 +22,13 @@
 class ArchiveUtilTestCase(support.TempdirManager,
                           unittest.TestCase):
 
-    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')
         self.write_file([tmpdir, 'file2'], 'xxx')
+        os.mkdir(os.path.join(tmpdir, 'sub'))
+        self.write_file([tmpdir, 'sub', 'file3'], 'xxx')
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
@@ -55,6 +59,111 @@ def test_make_tarball(self):
         tarball = base_name + '.tar'
         self.assert_(os.path.exists(tarball))
 
+    def _tarinfo(self, path):
+        tar = tarfile.open(path)
+        try:
+            names = tar.getnames()
+            names.sort()
+            return tuple(names)
+        finally:
+            tar.close()
+
+    def _create_files(self):
+        # creating something to tar
+        tmpdir = self.mkdtemp()
+        dist = os.path.join(tmpdir, 'dist')
+        os.mkdir(dist)
+        self.write_file([dist, 'file1'], 'xxx')
+        self.write_file([dist, 'file2'], 'xxx')
+        os.mkdir(os.path.join(dist, 'sub'))
+        self.write_file([dist, 'sub', 'file3'], 'xxx')
+        os.mkdir(os.path.join(dist, 'sub2'))
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
+        return tmpdir, tmpdir2, base_name
+
+    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    def test_tarfile_vs_tar(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist')
+        finally:
+            os.chdir(old_dir)
+
+        # check if the compressed tarball was created
+        tarball = base_name + '.tar.gz'
+        self.assert_(os.path.exists(tarball))
+
+        # now create another tarball using `tar`
+        tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
+        cmd = ['tar', '-czf', 'archive2.tar.gz', 'dist']
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            spawn(cmd)
+        finally:
+            os.chdir(old_dir)
+
+        self.assert_(os.path.exists(tarball2))
+        # let's compare both tarballs
+        self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
+
+        # trying an uncompressed one
+        base_name = os.path.join(tmpdir2, 'archive')
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist', compress=None)
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+        # now for a dry_run
+        base_name = os.path.join(tmpdir2, 'archive')
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            make_tarball(base_name, 'dist', compress=None, dry_run=True)
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar'
+        self.assert_(os.path.exists(tarball))
+
+    @unittest.skipUnless(find_executable('compress'),
+                         'The compress program is required')
+    def test_compress_deprecated(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+
+        # using compress and testing the PendingDeprecationWarning
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            with check_warnings() as w:
+                warnings.simplefilter("always")
+                make_tarball(base_name, 'dist', compress='compress')
+        finally:
+            os.chdir(old_dir)
+        tarball = base_name + '.tar.Z'
+        self.assert_(os.path.exists(tarball))
+        self.assertEquals(len(w.warnings), 1)
+
+        # same test with dry_run
+        os.remove(tarball)
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        try:
+            with check_warnings() as w:
+                warnings.simplefilter("always")
+                make_tarball(base_name, 'dist', compress='compress',
+                             dry_run=True)
+        finally:
+            os.chdir(old_dir)
+        self.assert_(not os.path.exists(tarball))
+        self.assertEquals(len(w.warnings), 1)
+
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
         # creating something to tar

From 3917b17a0342869c54a033eb234c298b4e19a688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 28 May 2009 13:55:51 +0000
Subject: [PATCH 2347/8469] using 'tar' then 'gzip' in the test, because 'tar
 -czf' is not supported under some platforms

---
 tests/test_archive_util.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 2b24152632..29cd271faf 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -20,6 +20,7 @@
     ZIP_SUPPORT = find_executable('zip')
 
 class ArchiveUtilTestCase(support.TempdirManager,
+                          support.LoggingSilencer,
                           unittest.TestCase):
 
     def test_make_tarball(self):
@@ -82,7 +83,8 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
-    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
+                         'Need the tar command to run')
     def test_tarfile_vs_tar(self):
         tmpdir, tmpdir2, base_name =  self._create_files()
         old_dir = os.getcwd()
@@ -98,11 +100,13 @@ def test_tarfile_vs_tar(self):
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
-        cmd = ['tar', '-czf', 'archive2.tar.gz', 'dist']
+        tar_cmd = ['tar', '-cf', 'archive2.tar', 'dist']
+        gzip_cmd = ['gzip', '-f9', 'archive2.tar']
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            spawn(cmd)
+            spawn(tar_cmd)
+            spawn(gzip_cmd)
         finally:
             os.chdir(old_dir)
 

From 3418332f7bce309b6d404bd8e1a9775ea180e93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 28 May 2009 14:02:58 +0000
Subject: [PATCH 2348/8469] Merged revisions 72986 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72986 | tarek.ziade | 2009-05-28 15:55:51 +0200 (Thu, 28 May 2009) | 1 line

  using 'tar' then 'gzip' in the test, because 'tar -czf' is not supported under some platforms
........
---
 tests/test_archive_util.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 5db9a5d096..663b33532a 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -20,6 +20,7 @@
     ZIP_SUPPORT = find_executable('zip')
 
 class ArchiveUtilTestCase(support.TempdirManager,
+                          support.LoggingSilencer,
                           unittest.TestCase):
 
     def test_make_tarball(self):
@@ -82,7 +83,8 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
-    @unittest.skipUnless(find_executable('tar'), 'Need the tar command to run')
+    @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
+                         'Need the tar command to run')
     def test_tarfile_vs_tar(self):
         tmpdir, tmpdir2, base_name =  self._create_files()
         old_dir = os.getcwd()
@@ -98,11 +100,13 @@ def test_tarfile_vs_tar(self):
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
-        cmd = ['tar', '-czf', 'archive2.tar.gz', 'dist']
+        tar_cmd = ['tar', '-cf', 'archive2.tar', 'dist']
+        gzip_cmd = ['gzip', '-f9', 'archive2.tar']
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
-            spawn(cmd)
+            spawn(tar_cmd)
+            spawn(gzip_cmd)
         finally:
             os.chdir(old_dir)
 

From c9712ebc8749a8217c58091b11cf21f707a1a42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 29 May 2009 08:08:07 +0000
Subject: [PATCH 2349/8469] Fixed #6131: test_modulefinder leaked when run
 after test_distutils

---
 tests/test_bdist_dumb.py | 6 ++----
 tests/test_dir_util.py   | 4 ++--
 tests/test_file_util.py  | 4 ++--
 tests/test_register.py   | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 2863b620db..d2ea201bd4 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -22,16 +22,14 @@ class BuildDumbTestCase(support.TempdirManager,
                         unittest.TestCase):
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
-        support.LoggingSilencer.setUp(self)
+        super(BuildDumbTestCase, self).setUp()
         self.old_location = os.getcwd()
         self.old_sys_argv = sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
         sys.argv = self.old_sys_argv[:]
-        support.LoggingSilencer.tearDown(self)
-        support.TempdirManager.tearDown(self)
+        super(BuildDumbTestCase, self).tearDown()
 
     def test_simple_built(self):
 
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 6b22f05ff0..0f694aa020 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -18,7 +18,7 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
+        super(DirUtilTestCase, self).setUp()
         self._logs = []
         tmp_dir = self.mkdtemp()
         self.root_target = os.path.join(tmp_dir, 'deep')
@@ -29,7 +29,7 @@ def setUp(self):
 
     def tearDown(self):
         log.info = self.old_log
-        support.TempdirManager.tearDown(self)
+        super(DirUtilTestCase, self).tearDown()
 
     def test_mkpath_remove_tree_verbosity(self):
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 9373af8503..fac4a5d1a9 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -16,7 +16,7 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
+        super(FileUtilTestCase, self).setUp()
         self._logs = []
         self.old_log = log.info
         log.info = self._log
@@ -27,7 +27,7 @@ def setUp(self):
 
     def tearDown(self):
         log.info = self.old_log
-        support.TempdirManager.tearDown(self)
+        super(FileUtilTestCase, self).tearDown()
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
diff --git a/tests/test_register.py b/tests/test_register.py
index 91d3581373..0c6bf66989 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -66,7 +66,7 @@ def read(self):
 class RegisterTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
-        PyPIRCCommandTestCase.setUp(self)
+        super(RegisterTestCase, self).setUp()
         # patching the password prompt
         self._old_getpass = getpass.getpass
         def _getpass(prompt):
@@ -78,7 +78,7 @@ def _getpass(prompt):
     def tearDown(self):
         getpass.getpass = self._old_getpass
         urllib2.build_opener = self.old_opener
-        PyPIRCCommandTestCase.tearDown(self)
+        super(RegisterTestCase, self).tearDown()
 
     def _get_cmd(self, metadata=None):
         if metadata is None:

From f9b04c5e43bf858c654b1557447ed19051bd85a4 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Fri, 29 May 2009 09:14:04 +0000
Subject: [PATCH 2350/8469] Merged revisions 73008 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73008 | tarek.ziade | 2009-05-29 17:08:07 +0900 | 1 line

  Fixed #6131: test_modulefinder leaked when run after test_distutils
........
---
 tests/test_bdist_dumb.py | 6 ++----
 tests/test_dir_util.py   | 4 ++--
 tests/test_file_util.py  | 4 ++--
 tests/test_register.py   | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 2863b620db..d2ea201bd4 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -22,16 +22,14 @@ class BuildDumbTestCase(support.TempdirManager,
                         unittest.TestCase):
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
-        support.LoggingSilencer.setUp(self)
+        super(BuildDumbTestCase, self).setUp()
         self.old_location = os.getcwd()
         self.old_sys_argv = sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
         sys.argv = self.old_sys_argv[:]
-        support.LoggingSilencer.tearDown(self)
-        support.TempdirManager.tearDown(self)
+        super(BuildDumbTestCase, self).tearDown()
 
     def test_simple_built(self):
 
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 6b22f05ff0..0f694aa020 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -18,7 +18,7 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
+        super(DirUtilTestCase, self).setUp()
         self._logs = []
         tmp_dir = self.mkdtemp()
         self.root_target = os.path.join(tmp_dir, 'deep')
@@ -29,7 +29,7 @@ def setUp(self):
 
     def tearDown(self):
         log.info = self.old_log
-        support.TempdirManager.tearDown(self)
+        super(DirUtilTestCase, self).tearDown()
 
     def test_mkpath_remove_tree_verbosity(self):
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 9373af8503..fac4a5d1a9 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -16,7 +16,7 @@ def _log(self, msg, *args):
             self._logs.append(msg)
 
     def setUp(self):
-        support.TempdirManager.setUp(self)
+        super(FileUtilTestCase, self).setUp()
         self._logs = []
         self.old_log = log.info
         log.info = self._log
@@ -27,7 +27,7 @@ def setUp(self):
 
     def tearDown(self):
         log.info = self.old_log
-        support.TempdirManager.tearDown(self)
+        super(FileUtilTestCase, self).tearDown()
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
diff --git a/tests/test_register.py b/tests/test_register.py
index f486cf797e..d9ff3ec441 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -66,7 +66,7 @@ def read(self):
 class RegisterTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
-        PyPIRCCommandTestCase.setUp(self)
+        super(RegisterTestCase, self).setUp()
         # patching the password prompt
         self._old_getpass = getpass.getpass
         def _getpass(prompt):
@@ -78,7 +78,7 @@ def _getpass(prompt):
     def tearDown(self):
         getpass.getpass = self._old_getpass
         urllib.request.build_opener = self.old_opener
-        PyPIRCCommandTestCase.tearDown(self)
+        super(RegisterTestCase, self).tearDown()
 
     def _get_cmd(self, metadata=None):
         if metadata is None:

From 8e668444d71672740d52dfac4d6d87a89f43ab7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 29 May 2009 10:04:06 +0000
Subject: [PATCH 2351/8469] using super in distutils' sdistTestCase

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

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 0d839b5c6e..59c24fd433 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,14 +29,14 @@
 class sdistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
-        PyPIRCCommandTestCase.setUp(self)
+        super(sdistTestCase, self).setUp()
         self.old_path = os.getcwd()
 
     def tearDown(self):
         os.chdir(self.old_path)
         if os.path.exists(TEMP_PKG):
             shutil.rmtree(TEMP_PKG)
-        PyPIRCCommandTestCase.tearDown(self)
+        super(sdistTestCase, self).tearDown()
 
     def _init_tmp_pkg(self):
         if os.path.exists(TEMP_PKG):

From 13e74436fe53eb88f4f20555c16df795b16987fc Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 May 2009 15:30:16 +0000
Subject: [PATCH 2352/8469] bump to 3.1rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 80ccf6113d..5a5db53272 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1b1"
+__version__ = "3.1rc1"
 #--end constants--

From 49443195f5ba2fb76c120d5218b962cb32b2fc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 1 Jun 2009 22:22:13 +0000
Subject: [PATCH 2353/8469] improved distutils.dist test coverage, pep-8
 compliancy

---
 dist.py            | 107 ++++++++++++++++++++++-----------------------
 tests/test_dist.py |  57 +++++++++++++++++++++---
 2 files changed, 103 insertions(+), 61 deletions(-)

diff --git a/dist.py b/dist.py
index 93325b9720..f4aecb419e 100644
--- a/dist.py
+++ b/dist.py
@@ -6,8 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
-from types import *
+import sys, os, re
 
 try:
     import warnings
@@ -251,7 +250,7 @@ def __init__ (self, attrs=None):
 
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
-            for (key,val) in attrs.items():
+            for (key, val) in attrs.items():
                 if hasattr(self.metadata, "set_" + key):
                     getattr(self.metadata, "set_" + key)(val)
                 elif hasattr(self.metadata, key):
@@ -286,22 +285,24 @@ def dump_option_dicts(self, header=None, commands=None, indent=""):
             commands.sort()
 
         if header is not None:
-            print indent + header
+            self.announce(indent + header)
             indent = indent + "  "
 
         if not commands:
-            print indent + "no commands known yet"
+            self.announce(indent + "no commands known yet")
             return
 
         for cmd_name in commands:
             opt_dict = self.command_options.get(cmd_name)
             if opt_dict is None:
-                print indent + "no option dict for '%s' command" % cmd_name
+                self.announce(indent +
+                              "no option dict for '%s' command" % cmd_name)
             else:
-                print indent + "option dict for '%s' command:" % cmd_name
+                self.announce(indent +
+                              "option dict for '%s' command:" % cmd_name)
                 out = pformat(opt_dict)
-                for line in string.split(out, "\n"):
-                    print indent + "  " + line
+                for line in out.split('\n'):
+                    self.announce(indent + "  " + line)
 
     # -- Config file finding/parsing methods ---------------------------
 
@@ -352,11 +353,13 @@ def parse_config_files(self, filenames=None):
         if filenames is None:
             filenames = self.find_config_files()
 
-        if DEBUG: print "Distribution.parse_config_files():"
+        if DEBUG:
+            self.announce("Distribution.parse_config_files():")
 
         parser = ConfigParser()
         for filename in filenames:
-            if DEBUG: print "  reading", filename
+            if DEBUG:
+                self.announce("  reading", filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
@@ -365,7 +368,7 @@ def parse_config_files(self, filenames=None):
                 for opt in options:
                     if opt != '__name__':
                         val = parser.get(section,opt)
-                        opt = string.replace(opt, '-', '_')
+                        opt = opt.replace('-', '_')
                         opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -503,7 +506,7 @@ def _parse_command_opts(self, parser, args):
         # Also make sure that the command object provides a list of its
         # known options.
         if not (hasattr(cmd_class, 'user_options') and
-                type(cmd_class.user_options) is ListType):
+                isinstance(cmd_class.user_options, list)):
             raise DistutilsClassError, \
                   ("command class %s must provide " +
                    "'user_options' attribute (a list of tuples)") % \
@@ -519,7 +522,7 @@ def _parse_command_opts(self, parser, args):
         # Check for help_options in command class.  They have a different
         # format (tuple of four) so we need to preprocess them here.
         if (hasattr(cmd_class, 'help_options') and
-            type(cmd_class.help_options) is ListType):
+            isinstance(cmd_class.help_options, list)):
             help_options = fix_help_options(cmd_class.help_options)
         else:
             help_options = []
@@ -537,14 +540,11 @@ def _parse_command_opts(self, parser, args):
             return
 
         if (hasattr(cmd_class, 'help_options') and
-            type(cmd_class.help_options) is ListType):
+            isinstance(cmd_class.help_options, list)):
             help_option_found=0
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
                     help_option_found=1
-                    #print "showing help for option %s of command %s" % \
-                    #      (help_option[0],cmd_class)
-
                     if callable(func):
                         func()
                     else:
@@ -569,17 +569,13 @@ def finalize_options(self):
         instance, analogous to the .finalize_options() method of Command
         objects.
         """
-        keywords = self.metadata.keywords
-        if keywords is not None:
-            if type(keywords) is StringType:
-                keywordlist = string.split(keywords, ',')
-                self.metadata.keywords = map(string.strip, keywordlist)
-
-        platforms = self.metadata.platforms
-        if platforms is not None:
-            if type(platforms) is StringType:
-                platformlist = string.split(platforms, ',')
-                self.metadata.platforms = map(string.strip, platformlist)
+        for attr in ('keywords', 'platforms'):
+            value = getattr(self.metadata, attr)
+            if value is None:
+                continue
+            if isinstance(value, str):
+                value = [elm.strip() for elm in value.split(',')]
+                setattr(self.metadata, attr, value)
 
     def _show_help(self, parser, global_options=1, display_options=1,
                    commands=[]):
@@ -606,31 +602,30 @@ def _show_help(self, parser, global_options=1, display_options=1,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            print
+            self.announce('')
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            print
+            self.announce('')
 
         for command in self.commands:
-            if type(command) is ClassType and issubclass(command, Command):
+            if isinstance(command, type) and issubclass(command, Command):
                 klass = command
             else:
                 klass = self.get_command_class(command)
             if (hasattr(klass, 'help_options') and
-                type(klass.help_options) is ListType):
+                isinstance(klass.help_options, list)):
                 parser.set_option_table(klass.user_options +
                                         fix_help_options(klass.help_options))
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            print
+            self.announce('')
 
-        print gen_usage(self.script_name)
-        return
+        self.announce(gen_usage(self.script_name))
 
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
@@ -645,8 +640,8 @@ def handle_display_options(self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            print
-            print gen_usage(self.script_name)
+            self.announce('')
+            self.announce(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -662,12 +657,12 @@ def handle_display_options(self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    print string.join(value, ',')
+                    self.announce(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    print string.join(value, '\n')
+                    self.announce('\n'.join(value))
                 else:
-                    print value
+                    self.announce(value)
                 any_display_options = 1
 
         return any_display_options
@@ -676,7 +671,7 @@ def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-        print header + ":"
+        self.announce(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -687,7 +682,7 @@ def print_command_list(self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            print "  %-*s  %s" % (max_length, cmd, description)
+            self.announce("  %-*s  %s" % (max_length, cmd, description))
 
     def print_commands(self):
         """Print out a help message listing all available commands with a
@@ -760,11 +755,10 @@ def get_command_list(self):
     def get_command_packages(self):
         """Return a list of packages from which commands are loaded."""
         pkgs = self.command_packages
-        if not isinstance(pkgs, type([])):
-            pkgs = string.split(pkgs or "", ",")
-            for i in range(len(pkgs)):
-                pkgs[i] = string.strip(pkgs[i])
-            pkgs = filter(None, pkgs)
+        if not isinstance(pkgs, list):
+            if pkgs is None:
+                pkgs = ''
+            pkgs = [pkg.strip() for pkg in pkgs.split(',') if pkg != '']
             if "distutils.command" not in pkgs:
                 pkgs.insert(0, "distutils.command")
             self.command_packages = pkgs
@@ -818,8 +812,8 @@ def get_command_obj(self, command, create=1):
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
             if DEBUG:
-                print "Distribution.get_command_obj(): " \
-                      "creating '%s' command object" % command
+                self.announce("Distribution.get_command_obj(): " \
+                              "creating '%s' command object" % command)
 
             klass = self.get_command_class(command)
             cmd_obj = self.command_obj[command] = klass(self)
@@ -849,9 +843,12 @@ def _set_command_options(self, command_obj, option_dict=None):
         if option_dict is None:
             option_dict = self.get_option_dict(command_name)
 
-        if DEBUG: print "  setting options for '%s' command:" % command_name
+        if DEBUG:
+            self.announce("  setting options for '%s' command:" % command_name)
         for (option, (source, value)) in option_dict.items():
-            if DEBUG: print "    %s = %s (from %s)" % (option, value, source)
+            if DEBUG:
+                self.announce("    %s = %s (from %s)" % (option, value,
+                                                         source))
             try:
                 bool_opts = map(translate_longopt, command_obj.boolean_options)
             except AttributeError:
@@ -862,7 +859,7 @@ def _set_command_options(self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                is_string = type(value) is StringType
+                is_string = isinstance(value, str)
                 if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
@@ -1044,10 +1041,10 @@ def write_pkg_file(self, file):
         if self.download_url:
             self._write_field(file, 'Download-URL', self.download_url)
 
-        long_desc = rfc822_escape( self.get_long_description())
+        long_desc = rfc822_escape(self.get_long_description())
         self._write_field(file, 'Description', long_desc)
 
-        keywords = string.join( self.get_keywords(), ',')
+        keywords = ','.join(self.get_keywords())
         if keywords:
             self._write_field(file, 'Keywords', keywords)
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 49230c54c0..7ccdd53b79 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,4 +1,4 @@
-# -*- coding: latin-1 -*-
+# -*- coding: utf8 -*-
 
 """Tests for distutils.dist."""
 import os
@@ -36,7 +36,9 @@ def find_config_files(self):
         return self._config_files
 
 
-class DistributionTestCase(support.TempdirManager, unittest.TestCase):
+class DistributionTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
+                           unittest.TestCase):
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()
@@ -106,11 +108,11 @@ def test_write_pkg_file(self):
         my_file = os.path.join(tmp_dir, 'f')
         klass = Distribution
 
-        dist = klass(attrs={'author': u'Mister Café',
+        dist = klass(attrs={'author': u'Mister Café',
                             'name': 'my.package',
-                            'maintainer': u'Café Junior',
-                            'description': u'Café torréfié',
-                            'long_description': u'Héhéhé'})
+                            'maintainer': u'Café Junior',
+                            'description': u'Café torréfié',
+                            'long_description': u'Héhéhé'})
 
 
         # let's make sure the file can be written
@@ -151,6 +153,49 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
+    def test_finalize_options(self):
+
+        attrs = {'keywords': 'one,two',
+                 'platforms': 'one,two'}
+
+        dist = Distribution(attrs=attrs)
+        dist.finalize_options()
+
+        # finalize_option splits platforms and keywords
+        self.assertEquals(dist.metadata.platforms, ['one', 'two'])
+        self.assertEquals(dist.metadata.keywords, ['one', 'two'])
+
+    def test_show_help(self):
+        class FancyGetopt(object):
+            def __init__(self):
+                self.count = 0
+
+            def set_option_table(self, *args):
+                pass
+
+            def print_help(self, *args):
+                self.count += 1
+
+        parser = FancyGetopt()
+        dist = Distribution()
+        dist.commands = ['sdist']
+        dist.script_name = 'setup.py'
+        dist._show_help(parser)
+        self.assertEquals(parser.count, 3)
+
+    def test_get_command_packages(self):
+        dist = Distribution()
+        self.assertEquals(dist.command_packages, None)
+        cmds = dist.get_command_packages()
+        self.assertEquals(cmds, ['distutils.command'])
+        self.assertEquals(dist.command_packages,
+                          ['distutils.command'])
+
+        dist.command_packages = 'one,two'
+        cmds = dist.get_command_packages()
+        self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
+
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From 4178fcef5d4b1fc1a9bc415c47c94ad6d33e3491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 1 Jun 2009 22:36:26 +0000
Subject: [PATCH 2354/8469] Merged revisions 73121 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73121 | tarek.ziade | 2009-06-02 00:22:13 +0200 (Tue, 02 Jun 2009) | 1 line

  improved distutils.dist test coverage, pep-8 compliancy
........
---
 dist.py            | 88 ++++++++++++++++++++++------------------------
 tests/test_dist.py | 47 ++++++++++++++++++++++++-
 2 files changed, 89 insertions(+), 46 deletions(-)

diff --git a/dist.py b/dist.py
index 65c1ce912e..915d336431 100644
--- a/dist.py
+++ b/dist.py
@@ -246,7 +246,7 @@ def __init__ (self, attrs=None):
 
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
-            for (key,val) in attrs.items():
+            for (key, val) in attrs.items():
                 if hasattr(self.metadata, "set_" + key):
                     getattr(self.metadata, "set_" + key)(val)
                 elif hasattr(self.metadata, key):
@@ -280,22 +280,24 @@ def dump_option_dicts(self, header=None, commands=None, indent=""):
             commands = sorted(self.command_options.keys())
 
         if header is not None:
-            print(indent + header)
+            self.announce(indent + header)
             indent = indent + "  "
 
         if not commands:
-            print(indent + "no commands known yet")
+            self.announce(indent + "no commands known yet")
             return
 
         for cmd_name in commands:
             opt_dict = self.command_options.get(cmd_name)
             if opt_dict is None:
-                print(indent + "no option dict for '%s' command" % cmd_name)
+                self.announce(indent +
+                              "no option dict for '%s' command" % cmd_name)
             else:
-                print(indent + "option dict for '%s' command:" % cmd_name)
+                self.announce(indent +
+                              "option dict for '%s' command:" % cmd_name)
                 out = pformat(opt_dict)
-                for line in out.split("\n"):
-                    print(indent + "  " + line)
+                for line in out.split('\n'):
+                    self.announce(indent + "  " + line)
 
     # -- Config file finding/parsing methods ---------------------------
 
@@ -346,11 +348,13 @@ def parse_config_files(self, filenames=None):
         if filenames is None:
             filenames = self.find_config_files()
 
-        if DEBUG: print("Distribution.parse_config_files():")
+        if DEBUG:
+            self.announce("Distribution.parse_config_files():")
 
         parser = ConfigParser()
         for filename in filenames:
-            if DEBUG: print("  reading", filename)
+            if DEBUG:
+                self.announce("  reading", filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
@@ -535,9 +539,6 @@ def _parse_command_opts(self, parser, args):
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
                     help_option_found=1
-                    #print "showing help for option %s of command %s" % \
-                    #      (help_option[0],cmd_class)
-
                     if hasattr(func, '__call__'):
                         func()
                     else:
@@ -562,17 +563,13 @@ def finalize_options(self):
         instance, analogous to the .finalize_options() method of Command
         objects.
         """
-        keywords = self.metadata.keywords
-        if keywords is not None:
-            if isinstance(keywords, str):
-                keywordlist = keywords.split(',')
-                self.metadata.keywords = [x.strip() for x in keywordlist]
-
-        platforms = self.metadata.platforms
-        if platforms is not None:
-            if isinstance(platforms, str):
-                platformlist = platforms.split(',')
-                self.metadata.platforms = [x.strip() for x in platformlist]
+        for attr in ('keywords', 'platforms'):
+            value = getattr(self.metadata, attr)
+            if value is None:
+                continue
+            if isinstance(value, str):
+                value = [elm.strip() for elm in value.split(',')]
+                setattr(self.metadata, attr, value)
 
     def _show_help(self, parser, global_options=1, display_options=1,
                    commands=[]):
@@ -599,14 +596,14 @@ def _show_help(self, parser, global_options=1, display_options=1,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            print()
+            self.announce('')
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            print()
+            self.announce('')
 
         for command in self.commands:
             if isinstance(command, type) and issubclass(command, Command):
@@ -620,10 +617,9 @@ def _show_help(self, parser, global_options=1, display_options=1,
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            print()
+            self.announce('')
 
-        print(gen_usage(self.script_name))
-        return
+        self.announce(gen_usage(self.script_name))
 
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
@@ -638,8 +634,8 @@ def handle_display_options(self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            print()
-            print(gen_usage(self.script_name))
+            self.announce('')
+            self.announce(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -655,12 +651,12 @@ def handle_display_options(self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    print(','.join(value))
+                    self.announce(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    print('\n'.join(value))
+                    self.announce('\n'.join(value))
                 else:
-                    print(value)
+                    self.announce(value)
                 any_display_options = 1
 
         return any_display_options
@@ -669,7 +665,7 @@ def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-        print(header + ":")
+        self.announce(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -680,7 +676,7 @@ def print_command_list(self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            print("  %-*s  %s" % (max_length, cmd, description))
+            self.announce("  %-*s  %s" % (max_length, cmd, description))
 
     def print_commands(self):
         """Print out a help message listing all available commands with a
@@ -752,11 +748,10 @@ def get_command_list(self):
     def get_command_packages(self):
         """Return a list of packages from which commands are loaded."""
         pkgs = self.command_packages
-        if not isinstance(pkgs, type([])):
-            pkgs = (pkgs or "").split(",")
-            for i in range(len(pkgs)):
-                pkgs[i] = pkgs[i].strip()
-            pkgs = [p for p in pkgs if p]
+        if not isinstance(pkgs, list):
+            if pkgs is None:
+                pkgs = ''
+            pkgs = [pkg.strip() for pkg in pkgs.split(',') if pkg != '']
             if "distutils.command" not in pkgs:
                 pkgs.insert(0, "distutils.command")
             self.command_packages = pkgs
@@ -809,8 +804,8 @@ def get_command_obj(self, command, create=1):
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
             if DEBUG:
-                print("Distribution.get_command_obj(): " \
-                      "creating '%s' command object" % command)
+                self.announce("Distribution.get_command_obj(): " \
+                              "creating '%s' command object" % command)
 
             klass = self.get_command_class(command)
             cmd_obj = self.command_obj[command] = klass(self)
@@ -840,9 +835,12 @@ def _set_command_options(self, command_obj, option_dict=None):
         if option_dict is None:
             option_dict = self.get_option_dict(command_name)
 
-        if DEBUG: print("  setting options for '%s' command:" % command_name)
+        if DEBUG:
+            self.announce("  setting options for '%s' command:" % command_name)
         for (option, (source, value)) in option_dict.items():
-            if DEBUG: print("    %s = %s (from %s)" % (option, value, source))
+            if DEBUG:
+                self.announce("    %s = %s (from %s)" % (option, value,
+                                                         source))
             try:
                 bool_opts = [translate_longopt(o)
                              for o in command_obj.boolean_options]
@@ -1036,7 +1034,7 @@ def write_pkg_file(self, file):
         if self.download_url:
             file.write('Download-URL: %s\n' % self.download_url)
 
-        long_desc = rfc822_escape( self.get_long_description() )
+        long_desc = rfc822_escape(self.get_long_description())
         file.write('Description: %s\n' % long_desc)
 
         keywords = ','.join(self.get_keywords())
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 54b63f7ddf..16ef68e962 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,3 +1,4 @@
+# -*- coding: utf8 -*-
 """Tests for distutils.dist."""
 import os
 import io
@@ -35,7 +36,8 @@ def find_config_files(self):
         return self._config_files
 
 
-class DistributionTestCase(unittest.TestCase):
+class DistributionTestCase(support.LoggingSilencer,
+                           unittest.TestCase):
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()
@@ -122,6 +124,49 @@ def _warn(msg):
 
         self.assertEquals(len(warns), 0)
 
+    def test_finalize_options(self):
+
+        attrs = {'keywords': 'one,two',
+                 'platforms': 'one,two'}
+
+        dist = Distribution(attrs=attrs)
+        dist.finalize_options()
+
+        # finalize_option splits platforms and keywords
+        self.assertEquals(dist.metadata.platforms, ['one', 'two'])
+        self.assertEquals(dist.metadata.keywords, ['one', 'two'])
+
+    def test_show_help(self):
+        class FancyGetopt(object):
+            def __init__(self):
+                self.count = 0
+
+            def set_option_table(self, *args):
+                pass
+
+            def print_help(self, *args):
+                self.count += 1
+
+        parser = FancyGetopt()
+        dist = Distribution()
+        dist.commands = ['sdist']
+        dist.script_name = 'setup.py'
+        dist._show_help(parser)
+        self.assertEquals(parser.count, 3)
+
+    def test_get_command_packages(self):
+        dist = Distribution()
+        self.assertEquals(dist.command_packages, None)
+        cmds = dist.get_command_packages()
+        self.assertEquals(cmds, ['distutils.command'])
+        self.assertEquals(dist.command_packages,
+                          ['distutils.command'])
+
+        dist.command_packages = 'one,two'
+        cmds = dist.get_command_packages()
+        self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
+
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From c5920a8b3ab690885fe822a5178b1e29f5eddd4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 2 Jun 2009 15:58:43 +0000
Subject: [PATCH 2355/8469] improved distutils.spawn test coverage + cleaned it
 up

---
 spawn.py            | 90 ++++++++++++++++-----------------------------
 tests/test_spawn.py | 42 ++++++++++++++++++++-
 2 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/spawn.py b/spawn.py
index a6d3426390..5c014c4be2 100644
--- a/spawn.py
+++ b/spawn.py
@@ -8,17 +8,16 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
-from distutils.errors import *
+import sys
+import os
+
+from distutils.errors import DistutilsPlatformError, DistutilsExecError
 from distutils import log
 
-def spawn (cmd,
-           search_path=1,
-           verbose=0,
-           dry_run=0):
+def spawn(cmd, search_path=1, verbose=0, dry_run=0):
+    """Run another program, specified as a command list 'cmd', in a new process.
 
-    """Run another program, specified as a command list 'cmd', in a new
-    process.  'cmd' is just the argument list for the new process, ie.
+    'cmd' is just the argument list for the new process, ie.
     cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
     There is no way to run a program with a name different from that of its
     executable.
@@ -41,37 +40,29 @@ def spawn (cmd,
         raise DistutilsPlatformError, \
               "don't know how to spawn programs on platform '%s'" % os.name
 
-# spawn ()
-
+def _nt_quote_args(args):
+    """Quote command-line arguments for DOS/Windows conventions.
 
-def _nt_quote_args (args):
-    """Quote command-line arguments for DOS/Windows conventions: just
-    wraps every argument which contains blanks in double quotes, and
+    Just wraps every argument which contains blanks in double quotes, and
     returns a new argument list.
     """
-
     # XXX this doesn't seem very robust to me -- but if the Windows guys
     # say it'll work, I guess I'll have to accept it.  (What if an arg
     # contains quotes?  What other magic characters, other than spaces,
     # have to be escaped?  Is there an escaping mechanism other than
     # quoting?)
-
-    for i in range(len(args)):
-        if string.find(args[i], ' ') != -1:
-            args[i] = '"%s"' % args[i]
+    for i, arg in enumerate(args):
+        if ' ' in arg:
+            args[i] = '"%s"' % arg
     return args
 
-def _spawn_nt (cmd,
-               search_path=1,
-               verbose=0,
-               dry_run=0):
-
+def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
     cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
-    log.info(string.join([executable] + cmd[1:], ' '))
+    log.info(' '.join([executable] + cmd[1:]))
     if not dry_run:
         # spawn for NT requires a full path to the .exe
         try:
@@ -85,18 +76,12 @@ def _spawn_nt (cmd,
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
-
-def _spawn_os2 (cmd,
-                search_path=1,
-                verbose=0,
-                dry_run=0):
-
+def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
-    #cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
-    log.info(string.join([executable] + cmd[1:], ' '))
+    log.info(' '.join([executable] + cmd[1:]))
     if not dry_run:
         # spawnv for OS/2 EMX requires a full path to the .exe
         try:
@@ -107,27 +92,20 @@ def _spawn_os2 (cmd,
                   "command '%s' failed: %s" % (cmd[0], exc[-1])
         if rc != 0:
             # and this reflects the command running but failing
-            print "command '%s' failed with exit status %d" % (cmd[0], rc)
+            log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
 
-def _spawn_posix (cmd,
-                  search_path=1,
-                  verbose=0,
-                  dry_run=0):
-
-    log.info(string.join(cmd, ' '))
+def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
+    log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
-
     pid = os.fork()
 
-    if pid == 0:                        # in the child
+    if pid == 0:  # in the child
         try:
-            #print "cmd[0] =", cmd[0]
-            #print "cmd =", cmd
             exec_fn(cmd[0], cmd)
         except OSError, e:
             sys.stderr.write("unable to execute %s: %s\n" %
@@ -136,14 +114,12 @@ def _spawn_posix (cmd,
 
         sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
         os._exit(1)
-
-
-    else:                               # in the parent
+    else:   # in the parent
         # Loop until the child either exits or is terminated by a signal
         # (ie. keep waiting if it's merely stopped)
         while 1:
             try:
-                (pid, status) = os.waitpid(pid, 0)
+                pid, status = os.waitpid(pid, 0)
             except OSError, exc:
                 import errno
                 if exc.errno == errno.EINTR:
@@ -158,7 +134,7 @@ def _spawn_posix (cmd,
             elif os.WIFEXITED(status):
                 exit_status = os.WEXITSTATUS(status)
                 if exit_status == 0:
-                    return              # hey, it succeeded!
+                    return   # hey, it succeeded!
                 else:
                     raise DistutilsExecError, \
                           "command '%s' failed with exit status %d" % \
@@ -171,21 +147,21 @@ def _spawn_posix (cmd,
                 raise DistutilsExecError, \
                       "unknown error executing '%s': termination status %d" % \
                       (cmd[0], status)
-# _spawn_posix ()
-
 
 def find_executable(executable, path=None):
-    """Try to find 'executable' in the directories listed in 'path' (a
-    string listing directories separated by 'os.pathsep'; defaults to
-    os.environ['PATH']).  Returns the complete filename or None if not
-    found.
+    """Tries to find 'executable' in the directories listed in 'path'.
+
+    A string listing directories separated by 'os.pathsep'; defaults to
+    os.environ['PATH'].  Returns the complete filename or None if not found.
     """
     if path is None:
         path = os.environ['PATH']
-    paths = string.split(path, os.pathsep)
-    (base, ext) = os.path.splitext(executable)
+    paths = path.split(os.pathsep)
+    base, ext = os.path.splitext(executable)
+
     if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
         executable = executable + '.exe'
+
     if not os.path.isfile(executable):
         for p in paths:
             f = os.path.join(p, executable)
@@ -195,5 +171,3 @@ def find_executable(executable, path=None):
         return None
     else:
         return executable
-
-# find_executable()
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 33e8bcf6e9..b9fd610e2f 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -1,8 +1,17 @@
 """Tests for distutils.spawn."""
 import unittest
+import os
+import time
+from test.test_support import captured_stdout
+
 from distutils.spawn import _nt_quote_args
+from distutils.spawn import spawn, find_executable
+from distutils.errors import DistutilsExecError
+from distutils.tests import support
 
-class SpawnTestCase(unittest.TestCase):
+class SpawnTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
+                    unittest.TestCase):
 
     def test_nt_quote_args(self):
 
@@ -13,6 +22,37 @@ def test_nt_quote_args(self):
             res = _nt_quote_args(args)
             self.assertEquals(res, wanted)
 
+
+    @unittest.skipUnless(os.name in ('nt', 'posix'),
+                         'Runs only under posix or nt')
+    def test_spawn(self):
+        tmpdir = self.mkdtemp()
+
+        # creating something executable
+        # through the shell that returns 1
+        if os.name == 'posix':
+            exe = os.path.join(tmpdir, 'foo.sh')
+            self.write_file(exe, '#!/bin/sh\nexit 1')
+            os.chmod(exe, 0777)
+        else:
+            exe = os.path.join(tmpdir, 'foo.bat')
+            self.write_file(exe, 'exit 1')
+
+        os.chmod(exe, 0777)
+        self.assertRaises(DistutilsExecError, spawn, [exe])
+
+        # now something that works
+        if os.name == 'posix':
+            exe = os.path.join(tmpdir, 'foo.sh')
+            self.write_file(exe, '#!/bin/sh\nexit 0')
+            os.chmod(exe, 0777)
+        else:
+            exe = os.path.join(tmpdir, 'foo.bat')
+            self.write_file(exe, 'exit 0')
+
+        os.chmod(exe, 0777)
+        spawn([exe])  # should work without any error
+
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 

From 38fc75e0ef9b8b57879ea2d405fab4818f7b7aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 2 Jun 2009 16:18:55 +0000
Subject: [PATCH 2356/8469] Merged revisions 73147 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73147 | tarek.ziade | 2009-06-02 17:58:43 +0200 (Tue, 02 Jun 2009) | 1 line

  improved distutils.spawn test coverage + cleaned it up
........
---
 spawn.py            | 47 +++++++++++++++++++++++----------------------
 tests/test_spawn.py | 40 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/spawn.py b/spawn.py
index 4c536d28af..8c476dc23f 100644
--- a/spawn.py
+++ b/spawn.py
@@ -8,13 +8,16 @@
 
 __revision__ = "$Id$"
 
-import sys, os
-from distutils.errors import *
+import sys
+import os
+
+from distutils.errors import DistutilsPlatformError, DistutilsExecError
 from distutils import log
 
 def spawn(cmd, search_path=1, verbose=0, dry_run=0):
-    """Run another program, specified as a command list 'cmd', in a new
-    process.  'cmd' is just the argument list for the new process, ie.
+    """Run another program, specified as a command list 'cmd', in a new process.
+
+    'cmd' is just the argument list for the new process, ie.
     cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
     There is no way to run a program with a name different from that of its
     executable.
@@ -37,10 +40,10 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
         raise DistutilsPlatformError(
               "don't know how to spawn programs on platform '%s'" % os.name)
 
-
 def _nt_quote_args(args):
-    """Quote command-line arguments for DOS/Windows conventions: just
-    wraps every argument which contains blanks in double quotes, and
+    """Quote command-line arguments for DOS/Windows conventions.
+
+    Just wraps every argument which contains blanks in double quotes, and
     returns a new argument list.
     """
     # XXX this doesn't seem very robust to me -- but if the Windows guys
@@ -48,9 +51,9 @@ def _nt_quote_args(args):
     # contains quotes?  What other magic characters, other than spaces,
     # have to be escaped?  Is there an escaping mechanism other than
     # quoting?)
-    for i in range(len(args)):
-        if args[i].find(' ') != -1:
-            args[i] = '"%s"' % args[i]
+    for i, arg in enumerate(args):
+        if ' ' in arg:
+            args[i] = '"%s"' % arg
     return args
 
 def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
@@ -73,10 +76,8 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
             raise DistutilsExecError(
                   "command '%s' failed with exit status %d" % (cmd[0], rc))
 
-
 def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
-    #cmd = _nt_quote_args(cmd)
     if search_path:
         # either we find one or it stays the same
         executable = find_executable(executable) or executable
@@ -91,17 +92,15 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
                   "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
-            print("command '%s' failed with exit status %d" % (cmd[0], rc))
+            log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
             raise DistutilsExecError(
                   "command '%s' failed with exit status %d" % (cmd[0], rc))
 
-
 def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
-
     pid = os.fork()
     if pid == 0: # in the child
         try:
@@ -118,7 +117,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
         # (ie. keep waiting if it's merely stopped)
         while True:
             try:
-                (pid, status) = os.waitpid(pid, 0)
+                pid, status = os.waitpid(pid, 0)
             except OSError as exc:
                 import errno
                 if exc.errno == errno.EINTR:
@@ -132,7 +131,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
             elif os.WIFEXITED(status):
                 exit_status = os.WEXITSTATUS(status)
                 if exit_status == 0:
-                    return              # hey, it succeeded!
+                    return   # hey, it succeeded!
                 else:
                     raise DistutilsExecError(
                           "command '%s' failed with exit status %d"
@@ -144,19 +143,21 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
                       "unknown error executing '%s': termination status %d"
                       % (cmd[0], status))
 
-
 def find_executable(executable, path=None):
-    """Try to find 'executable' in the directories listed in 'path' (a
-    string listing directories separated by 'os.pathsep'; defaults to
-    os.environ['PATH']).  Returns the complete filename or None if not
-    found.
+    """Tries to find 'executable' in the directories listed in 'path'.
+
+    A string listing directories separated by 'os.pathsep'; defaults to
+    os.environ['PATH'].  Returns the complete filename or None if not found.
     """
     if path is None:
         path = os.environ['PATH']
+
     paths = path.split(os.pathsep)
-    (base, ext) = os.path.splitext(executable)
+    base, ext = os.path.splitext(executable)
+
     if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
         executable = executable + '.exe'
+
     if not os.path.isfile(executable):
         for p in paths:
             f = os.path.join(p, executable)
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 33e8bcf6e9..950e5789b5 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -1,8 +1,17 @@
 """Tests for distutils.spawn."""
 import unittest
+import os
+import time
+from test.support import captured_stdout
+
 from distutils.spawn import _nt_quote_args
+from distutils.spawn import spawn, find_executable
+from distutils.errors import DistutilsExecError
+from distutils.tests import support
 
-class SpawnTestCase(unittest.TestCase):
+class SpawnTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
+                    unittest.TestCase):
 
     def test_nt_quote_args(self):
 
@@ -13,6 +22,35 @@ def test_nt_quote_args(self):
             res = _nt_quote_args(args)
             self.assertEquals(res, wanted)
 
+
+    @unittest.skipUnless(os.name in ('nt', 'posix'),
+                         'Runs only under posix or nt')
+    def test_spawn(self):
+        tmpdir = self.mkdtemp()
+
+        # creating something executable
+        # through the shell that returns 1
+        if os.name == 'posix':
+            exe = os.path.join(tmpdir, 'foo.sh')
+            self.write_file(exe, '#!/bin/sh\nexit 1')
+        else:
+            exe = os.path.join(tmpdir, 'foo.bat')
+            self.write_file(exe, 'exit 1')
+
+        os.chmod(exe, 0o777)
+        self.assertRaises(DistutilsExecError, spawn, [exe])
+
+        # now something that works
+        if os.name == 'posix':
+            exe = os.path.join(tmpdir, 'foo.sh')
+            self.write_file(exe, '#!/bin/sh\nexit 0')
+        else:
+            exe = os.path.join(tmpdir, 'foo.bat')
+            self.write_file(exe, 'exit 0')
+
+        os.chmod(exe, 0o777)
+        spawn([exe])  # should work without any error
+
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 

From d05c768b5e48a25bc6008de7cde7d1db2e8488de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Jun 2009 10:26:26 +0000
Subject: [PATCH 2357/8469] added some tests for distutils.extension + code
 cleanup

---
 extension.py            | 21 +++----------
 tests/Setup.sample      | 67 +++++++++++++++++++++++++++++++++++++++++
 tests/test_extension.py | 36 ++++++++++++++++++++++
 3 files changed, 108 insertions(+), 16 deletions(-)
 create mode 100755 tests/Setup.sample
 create mode 100755 tests/test_extension.py

diff --git a/extension.py b/extension.py
index c80c61e35b..4d72c402ce 100644
--- a/extension.py
+++ b/extension.py
@@ -141,9 +141,11 @@ def __init__ (self, name, sources,
 # class Extension
 
 
-def read_setup_file (filename):
-    from distutils.sysconfig import \
-         parse_makefile, expand_makefile_vars, _variable_rx
+def read_setup_file(filename):
+    """Reads a Setup file and returns Extension instances."""
+    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+                                     _variable_rx)
+
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
@@ -168,10 +170,8 @@ def read_setup_file (filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        #print "original line: " + line
         line = expand_makefile_vars(line, vars)
         words = split_quoted(line)
-        #print "expanded line: " + line
 
         # NB. this parses a slightly different syntax than the old
         # makesetup script: here, there must be exactly one extension per
@@ -237,15 +237,4 @@ def read_setup_file (filename):
 
         extensions.append(ext)
 
-        #print "module:", module
-        #print "source files:", source_files
-        #print "cpp args:", cpp_args
-        #print "lib args:", library_args
-
-        #extensions[module] = { 'sources': source_files,
-        #                       'cpp_args': cpp_args,
-        #                       'lib_args': library_args }
-
     return extensions
-
-# read_setup_file ()
diff --git a/tests/Setup.sample b/tests/Setup.sample
new file mode 100755
index 0000000000..36c4290d8f
--- /dev/null
+++ b/tests/Setup.sample
@@ -0,0 +1,67 @@
+# Setup file from the pygame project
+
+#--StartConfig
+SDL = -I/usr/include/SDL -D_REENTRANT -lSDL
+FONT = -lSDL_ttf
+IMAGE = -lSDL_image
+MIXER = -lSDL_mixer
+SMPEG = -lsmpeg
+PNG = -lpng
+JPEG = -ljpeg
+SCRAP = -lX11
+PORTMIDI = -lportmidi
+PORTTIME = -lporttime
+#--EndConfig
+
+#DEBUG = -C-W -C-Wall
+DEBUG = 
+
+#the following modules are optional. you will want to compile
+#everything you can, but you can ignore ones you don't have
+#dependencies for, just comment them out
+
+imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
+_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c 
+gfxdraw src/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
+
+
+
+#these modules are required for pygame to run. they only require
+#SDL as a dependency. these should not be altered
+
+base src/base.c $(SDL) $(DEBUG)
+cdrom src/cdrom.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+overlay src/overlay.c $(SDL) $(DEBUG)
+transform src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG)
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+_arraysurfarray src/_arraysurfarray.c $(SDL) $(DEBUG)
+
+
diff --git a/tests/test_extension.py b/tests/test_extension.py
new file mode 100755
index 0000000000..1fcf0f5ecf
--- /dev/null
+++ b/tests/test_extension.py
@@ -0,0 +1,36 @@
+"""Tests for distutils.extension."""
+import unittest
+import os
+
+from distutils.extension import read_setup_file
+
+class ExtensionTestCase(unittest.TestCase):
+
+    def test_read_setup_file(self):
+        # trying to read a Setup file
+        # (sample extracted from the PyGame project)
+        setup = os.path.join(os.path.dirname(__file__), 'Setup.sample')
+
+        exts = read_setup_file(setup)
+        names = [ext.name for ext in exts]
+        names.sort()
+
+        # here are the extensions read_setup_file should have created
+        # out of the file
+        wanted = ['_arraysurfarray', '_camera', '_numericsndarray',
+                  '_numericsurfarray', 'base', 'bufferproxy', 'cdrom',
+                  'color', 'constants', 'display', 'draw', 'event',
+                  'fastevent', 'font', 'gfxdraw', 'image', 'imageext',
+                  'joystick', 'key', 'mask', 'mixer', 'mixer_music',
+                  'mouse', 'movie', 'overlay', 'pixelarray', 'pypm',
+                  'rect', 'rwobject', 'scrap', 'surface', 'surflock',
+                  'time', 'transform']
+
+        self.assertEquals(names, wanted)
+
+
+def test_suite():
+    return unittest.makeSuite(ExtensionTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From e179c582f459d632335552576808d13177b1757f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Jun 2009 10:31:15 +0000
Subject: [PATCH 2358/8469] Merged revisions 73166 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73166 | tarek.ziade | 2009-06-03 12:26:26 +0200 (Wed, 03 Jun 2009) | 1 line

  added some tests for distutils.extension + code cleanup
........
---
 extension.py            | 17 +++--------
 tests/Setup.sample      | 67 +++++++++++++++++++++++++++++++++++++++++
 tests/test_extension.py | 36 ++++++++++++++++++++++
 3 files changed, 107 insertions(+), 13 deletions(-)
 create mode 100755 tests/Setup.sample
 create mode 100755 tests/test_extension.py

diff --git a/extension.py b/extension.py
index f7e7b4edc9..a4054ff454 100644
--- a/extension.py
+++ b/extension.py
@@ -139,8 +139,10 @@ def __init__(self, name, sources,
 
 
 def read_setup_file(filename):
-    from distutils.sysconfig import \
-         parse_makefile, expand_makefile_vars, _variable_rx
+    """Reads a Setup file and returns Extension instances."""
+    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+                                     _variable_rx)
+
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
@@ -165,10 +167,8 @@ def read_setup_file(filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        #print "original line: " + line
         line = expand_makefile_vars(line, vars)
         words = split_quoted(line)
-        #print "expanded line: " + line
 
         # NB. this parses a slightly different syntax than the old
         # makesetup script: here, there must be exactly one extension per
@@ -234,13 +234,4 @@ def read_setup_file(filename):
 
         extensions.append(ext)
 
-        #print "module:", module
-        #print "source files:", source_files
-        #print "cpp args:", cpp_args
-        #print "lib args:", library_args
-
-        #extensions[module] = { 'sources': source_files,
-        #                       'cpp_args': cpp_args,
-        #                       'lib_args': library_args }
-
     return extensions
diff --git a/tests/Setup.sample b/tests/Setup.sample
new file mode 100755
index 0000000000..36c4290d8f
--- /dev/null
+++ b/tests/Setup.sample
@@ -0,0 +1,67 @@
+# Setup file from the pygame project
+
+#--StartConfig
+SDL = -I/usr/include/SDL -D_REENTRANT -lSDL
+FONT = -lSDL_ttf
+IMAGE = -lSDL_image
+MIXER = -lSDL_mixer
+SMPEG = -lsmpeg
+PNG = -lpng
+JPEG = -ljpeg
+SCRAP = -lX11
+PORTMIDI = -lportmidi
+PORTTIME = -lporttime
+#--EndConfig
+
+#DEBUG = -C-W -C-Wall
+DEBUG = 
+
+#the following modules are optional. you will want to compile
+#everything you can, but you can ignore ones you don't have
+#dependencies for, just comment them out
+
+imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
+_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c 
+gfxdraw src/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
+
+
+
+#these modules are required for pygame to run. they only require
+#SDL as a dependency. these should not be altered
+
+base src/base.c $(SDL) $(DEBUG)
+cdrom src/cdrom.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+overlay src/overlay.c $(SDL) $(DEBUG)
+transform src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG)
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+_arraysurfarray src/_arraysurfarray.c $(SDL) $(DEBUG)
+
+
diff --git a/tests/test_extension.py b/tests/test_extension.py
new file mode 100755
index 0000000000..1fcf0f5ecf
--- /dev/null
+++ b/tests/test_extension.py
@@ -0,0 +1,36 @@
+"""Tests for distutils.extension."""
+import unittest
+import os
+
+from distutils.extension import read_setup_file
+
+class ExtensionTestCase(unittest.TestCase):
+
+    def test_read_setup_file(self):
+        # trying to read a Setup file
+        # (sample extracted from the PyGame project)
+        setup = os.path.join(os.path.dirname(__file__), 'Setup.sample')
+
+        exts = read_setup_file(setup)
+        names = [ext.name for ext in exts]
+        names.sort()
+
+        # here are the extensions read_setup_file should have created
+        # out of the file
+        wanted = ['_arraysurfarray', '_camera', '_numericsndarray',
+                  '_numericsurfarray', 'base', 'bufferproxy', 'cdrom',
+                  'color', 'constants', 'display', 'draw', 'event',
+                  'fastevent', 'font', 'gfxdraw', 'image', 'imageext',
+                  'joystick', 'key', 'mask', 'mixer', 'mixer_music',
+                  'mouse', 'movie', 'overlay', 'pixelarray', 'pypm',
+                  'rect', 'rwobject', 'scrap', 'surface', 'surflock',
+                  'time', 'transform']
+
+        self.assertEquals(names, wanted)
+
+
+def test_suite():
+    return unittest.makeSuite(ExtensionTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 131565299608d6a50c3b9be8d87b7de94983f71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Jun 2009 11:12:08 +0000
Subject: [PATCH 2359/8469] more cleanup and test coverage for
 distutils.extension

---
 extension.py            | 33 ++++++++++++---------------------
 tests/test_extension.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/extension.py b/extension.py
index 4d72c402ce..98b841face 100644
--- a/extension.py
+++ b/extension.py
@@ -5,13 +5,9 @@
 
 __revision__ = "$Id$"
 
-import os, string, sys
-from types import *
-
-try:
-    import warnings
-except ImportError:
-    warnings = None
+import os
+import sys
+import warnings
 
 # This class is really only used by the "build_ext" command, so it might
 # make sense to put it in distutils.command.build_ext.  However, that
@@ -107,9 +103,9 @@ def __init__ (self, name, sources,
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert type(name) is StringType, "'name' must be a string"
-        assert (type(sources) is ListType and
-                map(type, sources) == [StringType]*len(sources)), \
+        assert isinstance(name, str)
+        assert (isinstance(sources, list) and
+                all(isinstance(v, str) for v in sources)), \
                 "'sources' must be a list of strings"
 
         self.name = name
@@ -130,16 +126,11 @@ def __init__ (self, name, sources,
         self.optional = optional
 
         # If there are unknown keyword options, warn about them
-        if len(kw):
-            L = kw.keys() ; L.sort()
-            L = map(repr, L)
-            msg = "Unknown Extension options: " + string.join(L, ', ')
-            if warnings is not None:
-                warnings.warn(msg)
-            else:
-                sys.stderr.write(msg + '\n')
-# class Extension
-
+        if len(kw) > 0:
+            options = [repr(option) for option in kw]
+            options = ', '.join(sorted(options))
+            msg = "Unknown Extension options: %s" % options
+            warnings.warn(msg)
 
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
@@ -200,7 +191,7 @@ def read_setup_file(filename):
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = string.find(value, "=")
+                equals = value.find("=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 1fcf0f5ecf..159ac2b76e 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -1,8 +1,10 @@
 """Tests for distutils.extension."""
 import unittest
 import os
+import warnings
 
-from distutils.extension import read_setup_file
+from test.test_support import check_warnings
+from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
 
@@ -28,6 +30,37 @@ def test_read_setup_file(self):
 
         self.assertEquals(names, wanted)
 
+    def test_extension_init(self):
+        # the first argument, which is the name, must be a string
+        self.assertRaises(AssertionError, Extension, 1, [])
+        ext = Extension('name', [])
+        self.assertEquals(ext.name, 'name')
+
+        # the second argument, which is the list of files, must
+        # be a list of strings
+        self.assertRaises(AssertionError, Extension, 'name', 'file')
+        self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
+        ext = Extension('name', ['file1', 'file2'])
+        self.assertEquals(ext.sources, ['file1', 'file2'])
+
+        # others arguments have defaults
+        for attr in ('include_dirs', 'define_macros', 'undef_macros',
+                     'library_dirs', 'libraries', 'runtime_library_dirs',
+                     'extra_objects', 'extra_compile_args', 'extra_link_args',
+                     'export_symbols', 'swig_opts', 'depends'):
+            self.assertEquals(getattr(ext, attr), [])
+
+        self.assertEquals(ext.language, None)
+        self.assertEquals(ext.optional, None)
+
+        # if there are unknown keyword options, warn about them
+        with check_warnings() as w:
+            warnings.simplefilter('always')
+            ext = Extension('name', ['file1', 'file2'], chic=True)
+
+        self.assertEquals(len(w.warnings), 1)
+        self.assertEquals(str(w.warnings[0].message),
+                          "Unknown Extension options: 'chic'")
 
 def test_suite():
     return unittest.makeSuite(ExtensionTestCase)

From 1352d8a66b13e181d7ac00831c16a4de63a1e018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Jun 2009 11:17:15 +0000
Subject: [PATCH 2360/8469] Merged revisions 73170 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73170 | tarek.ziade | 2009-06-03 13:12:08 +0200 (Wed, 03 Jun 2009) | 1 line

  more cleanup and test coverage for distutils.extension
........
---
 extension.py            | 22 ++++++++--------------
 tests/test_extension.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/extension.py b/extension.py
index a4054ff454..16d2bef6f4 100644
--- a/extension.py
+++ b/extension.py
@@ -5,12 +5,9 @@
 
 __revision__ = "$Id$"
 
-import os, sys
-
-try:
-    import warnings
-except ImportError:
-    warnings = None
+import os
+import sys
+import warnings
 
 # This class is really only used by the "build_ext" command, so it might
 # make sense to put it in distutils.command.build_ext.  However, that
@@ -129,14 +126,11 @@ def __init__(self, name, sources,
         self.optional = optional
 
         # If there are unknown keyword options, warn about them
-        if len(kw):
-            L = map(repr, sorted(kw))
-            msg = "Unknown Extension options: " + ', '.join(L)
-            if warnings is not None:
-                warnings.warn(msg)
-            else:
-                sys.stderr.write(msg + '\n')
-
+        if len(kw) > 0:
+            options = [repr(option) for option in kw]
+            options = ', '.join(sorted(options))
+            msg = "Unknown Extension options: %s" % options
+            warnings.warn(msg)
 
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 1fcf0f5ecf..1ee30585fa 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -1,8 +1,10 @@
 """Tests for distutils.extension."""
 import unittest
 import os
+import warnings
 
-from distutils.extension import read_setup_file
+from test.support import check_warnings
+from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
 
@@ -28,6 +30,37 @@ def test_read_setup_file(self):
 
         self.assertEquals(names, wanted)
 
+    def test_extension_init(self):
+        # the first argument, which is the name, must be a string
+        self.assertRaises(AssertionError, Extension, 1, [])
+        ext = Extension('name', [])
+        self.assertEquals(ext.name, 'name')
+
+        # the second argument, which is the list of files, must
+        # be a list of strings
+        self.assertRaises(AssertionError, Extension, 'name', 'file')
+        self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
+        ext = Extension('name', ['file1', 'file2'])
+        self.assertEquals(ext.sources, ['file1', 'file2'])
+
+        # others arguments have defaults
+        for attr in ('include_dirs', 'define_macros', 'undef_macros',
+                     'library_dirs', 'libraries', 'runtime_library_dirs',
+                     'extra_objects', 'extra_compile_args', 'extra_link_args',
+                     'export_symbols', 'swig_opts', 'depends'):
+            self.assertEquals(getattr(ext, attr), [])
+
+        self.assertEquals(ext.language, None)
+        self.assertEquals(ext.optional, None)
+
+        # if there are unknown keyword options, warn about them
+        with check_warnings() as w:
+            warnings.simplefilter('always')
+            ext = Extension('name', ['file1', 'file2'], chic=True)
+
+        self.assertEquals(len(w.warnings), 1)
+        self.assertEquals(str(w.warnings[0].message),
+                          "Unknown Extension options: 'chic'")
 
 def test_suite():
     return unittest.makeSuite(ExtensionTestCase)

From 086f2ea6187e05525d389c6b07be3e1b6396458f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Jun 2009 11:20:44 +0000
Subject: [PATCH 2361/8469] assertion message was dropped

---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index 98b841face..53ca8fd0c5 100644
--- a/extension.py
+++ b/extension.py
@@ -103,7 +103,7 @@ def __init__ (self, name, sources,
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, str)
+        assert isinstance(name, str), "'name' must be a string"
         assert (isinstance(sources, list) and
                 all(isinstance(v, str) for v in sources)), \
                 "'sources' must be a list of strings"

From 753a89c004584f096f307ade17484509e4782b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 4 Jun 2009 07:31:52 +0000
Subject: [PATCH 2362/8469] improved test coverage for
 distutils.command.install and cleaned it up

---
 command/install.py    | 160 +++++++++++++++++++-----------------------
 tests/test_install.py |  73 ++++++++++++++++++-
 2 files changed, 145 insertions(+), 88 deletions(-)

diff --git a/command/install.py b/command/install.py
index 4fd66cbf60..8f089c3172 100644
--- a/command/install.py
+++ b/command/install.py
@@ -2,12 +2,12 @@
 
 Implements the Distutils 'install' command."""
 
-from distutils import log
-
 __revision__ = "$Id$"
 
-import sys, os, string
-from types import *
+import sys
+import os
+
+from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.sysconfig import get_config_vars
@@ -117,7 +117,7 @@
 SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
 
 
-class install (Command):
+class install(Command):
 
     description = "install everything from build directory"
 
@@ -190,8 +190,8 @@ class install (Command):
     negative_opt = {'no-compile' : 'compile'}
 
 
-    def initialize_options (self):
-
+    def initialize_options(self):
+        """Initializes options."""
         # High-level options: these select both an installation base
         # and scheme.
         self.prefix = None
@@ -267,8 +267,8 @@ def initialize_options (self):
     # party Python modules on various platforms given a wide
     # array of user input is decided.  Yes, it's quite complex!)
 
-    def finalize_options (self):
-
+    def finalize_options(self):
+        """Finalizes options."""
         # This method (and its pliant slaves, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
@@ -326,7 +326,7 @@ def finalize_options (self):
         # $platbase in the other installation directories and not worry
         # about needing recursive variable expansion (shudder).
 
-        py_version = (string.split(sys.version))[0]
+        py_version = sys.version.split()[0]
         (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
@@ -409,29 +409,27 @@ def finalize_options (self):
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
 
-    # finalize_options ()
-
-
-    def dump_dirs (self, msg):
-        if DEBUG:
-            from distutils.fancy_getopt import longopt_xlate
-            print msg + ":"
-            for opt in self.user_options:
-                opt_name = opt[0]
-                if opt_name[-1] == "=":
-                    opt_name = opt_name[0:-1]
-                if opt_name in self.negative_opt:
-                    opt_name = string.translate(self.negative_opt[opt_name],
-                                                longopt_xlate)
-                    val = not getattr(self, opt_name)
-                else:
-                    opt_name = string.translate(opt_name, longopt_xlate)
-                    val = getattr(self, opt_name)
-                print "  %s: %s" % (opt_name, val)
-
-
-    def finalize_unix (self):
+    def dump_dirs(self, msg):
+        """Dumps the list of user options."""
+        if not DEBUG:
+            return
+        from distutils.fancy_getopt import longopt_xlate
+        log.debug(msg + ":")
+        for opt in self.user_options:
+            opt_name = opt[0]
+            if opt_name[-1] == "=":
+                opt_name = opt_name[0:-1]
+            if opt_name in self.negative_opt:
+                opt_name = self.negative_opt[opt_name]
+                opt_name = opt_name.translate(longopt_xlate)
+                val = not getattr(self, opt_name)
+            else:
+                opt_name = opt_name.translate(longopt_xlate)
+                val = getattr(self, opt_name)
+            log.debug("  %s: %s" % (opt_name, val))
 
+    def finalize_unix(self):
+        """Finalizes options for posix platforms."""
         if self.install_base is not None or self.install_platbase is not None:
             if ((self.install_lib is None and
                  self.install_purelib is None and
@@ -470,11 +468,8 @@ def finalize_unix (self):
             self.install_platbase = self.exec_prefix
             self.select_scheme("unix_prefix")
 
-    # finalize_unix ()
-
-
-    def finalize_other (self):          # Windows and Mac OS for now
-
+    def finalize_other(self):
+        """Finalizes options for non-posix platforms"""
         if self.user:
             if self.install_userbase is None:
                 raise DistutilsPlatformError(
@@ -495,10 +490,8 @@ def finalize_other (self):          # Windows and Mac OS for now
                 raise DistutilsPlatformError, \
                       "I don't know how to install stuff on '%s'" % os.name
 
-    # finalize_other ()
-
-
-    def select_scheme (self, name):
+    def select_scheme(self, name):
+        """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
         for key in SCHEME_KEYS:
@@ -506,8 +499,7 @@ def select_scheme (self, name):
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
 
-
-    def _expand_attrs (self, attrs):
+    def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
@@ -516,40 +508,36 @@ def _expand_attrs (self, attrs):
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
+    def expand_basedirs(self):
+        """Calls `os.path.expanduser` on install_base, install_platbase and
+        root."""
+        self._expand_attrs(['install_base', 'install_platbase', 'root'])
 
-    def expand_basedirs (self):
-        self._expand_attrs(['install_base',
-                            'install_platbase',
-                            'root'])
-
-    def expand_dirs (self):
-        self._expand_attrs(['install_purelib',
-                            'install_platlib',
-                            'install_lib',
-                            'install_headers',
-                            'install_scripts',
-                            'install_data',])
-
+    def expand_dirs(self):
+        """Calls `os.path.expanduser` on install dirs."""
+        self._expand_attrs(['install_purelib', 'install_platlib',
+                            'install_lib', 'install_headers',
+                            'install_scripts', 'install_data',])
 
-    def convert_paths (self, *names):
+    def convert_paths(self, *names):
+        """Call `convert_path` over `names`."""
         for name in names:
             attr = "install_" + name
             setattr(self, attr, convert_path(getattr(self, attr)))
 
-
-    def handle_extra_path (self):
-
+    def handle_extra_path(self):
+        """Set `path_file` and `extra_dirs` using `extra_path`."""
         if self.extra_path is None:
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
-            if type(self.extra_path) is StringType:
-                self.extra_path = string.split(self.extra_path, ',')
+            if isinstance(self.extra_path, str):
+                self.extra_path = self.extra_path.split(',')
 
             if len(self.extra_path) == 1:
                 path_file = extra_dirs = self.extra_path[0]
             elif len(self.extra_path) == 2:
-                (path_file, extra_dirs) = self.extra_path
+                path_file, extra_dirs = self.extra_path
             else:
                 raise DistutilsOptionError, \
                       ("'extra_path' option must be a list, tuple, or "
@@ -558,7 +546,6 @@ def handle_extra_path (self):
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
             extra_dirs = convert_path(extra_dirs)
-
         else:
             path_file = None
             extra_dirs = ''
@@ -568,17 +555,14 @@ def handle_extra_path (self):
         self.path_file = path_file
         self.extra_dirs = extra_dirs
 
-    # handle_extra_path ()
-
-
-    def change_roots (self, *names):
+    def change_roots(self, *names):
+        """Change the install direcories pointed by name using root."""
         for name in names:
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
     def create_home_path(self):
-        """Create directories under ~
-        """
+        """Create directories under ~."""
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
@@ -589,8 +573,8 @@ def create_home_path(self):
 
     # -- Command execution methods -------------------------------------
 
-    def run (self):
-
+    def run(self):
+        """Runs the command."""
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
@@ -633,9 +617,8 @@ def run (self):
                        "you'll have to change the search path yourself"),
                        self.install_lib)
 
-    # run ()
-
-    def create_path_file (self):
+    def create_path_file(self):
+        """Creates the .pth file"""
         filename = os.path.join(self.install_libbase,
                                 self.path_file + ".pth")
         if self.install_path_file:
@@ -648,8 +631,8 @@ def create_path_file (self):
 
     # -- Reporting methods ---------------------------------------------
 
-    def get_outputs (self):
-        # Assemble the outputs of all the sub-commands.
+    def get_outputs(self):
+        """Assembles the outputs of all the sub-commands."""
         outputs = []
         for cmd_name in self.get_sub_commands():
             cmd = self.get_finalized_command(cmd_name)
@@ -665,7 +648,8 @@ def get_outputs (self):
 
         return outputs
 
-    def get_inputs (self):
+    def get_inputs(self):
+        """Returns the inputs of all the sub-commands"""
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
@@ -674,25 +658,29 @@ def get_inputs (self):
 
         return inputs
 
-
     # -- Predicates for sub-command list -------------------------------
 
-    def has_lib (self):
-        """Return true if the current distribution has any Python
+    def has_lib(self):
+        """Returns true if the current distribution has any Python
         modules to install."""
         return (self.distribution.has_pure_modules() or
                 self.distribution.has_ext_modules())
 
-    def has_headers (self):
+    def has_headers(self):
+        """Returns true if the current distribution has any headers to
+        install."""
         return self.distribution.has_headers()
 
-    def has_scripts (self):
+    def has_scripts(self):
+        """Returns true if the current distribution has any scripts to.
+        install."""
         return self.distribution.has_scripts()
 
-    def has_data (self):
+    def has_data(self):
+        """Returns true if the current distribution has any data to.
+        install."""
         return self.distribution.has_data_files()
 
-
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.
     sub_commands = [('install_lib',     has_lib),
@@ -701,5 +689,3 @@ def has_data (self):
                     ('install_data',    has_data),
                     ('install_egg_info', lambda self:True),
                    ]
-
-# class install
diff --git a/tests/test_install.py b/tests/test_install.py
index 9ceccf68cf..8d7e97227c 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -10,11 +10,14 @@
 from distutils.command import install as install_module
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
+from distutils.errors import DistutilsOptionError
 
 from distutils.tests import support
 
 
-class InstallTestCase(support.TempdirManager, unittest.TestCase):
+class InstallTestCase(support.TempdirManager,
+                      support.LoggingSilencer,
+                      unittest.TestCase):
 
     def test_home_installation_scheme(self):
         # This ensure two things:
@@ -112,6 +115,74 @@ def _test_user_site(self):
         self.assert_('userbase' in cmd.config_vars)
         self.assert_('usersite' in cmd.config_vars)
 
+    def test_handle_extra_path(self):
+        dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
+        cmd = install(dist)
+
+        # two elements
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
+        self.assertEquals(cmd.extra_dirs, 'dirs')
+        self.assertEquals(cmd.path_file, 'path')
+
+        # one element
+        cmd.extra_path = ['path']
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, ['path'])
+        self.assertEquals(cmd.extra_dirs, 'path')
+        self.assertEquals(cmd.path_file, 'path')
+
+        # none
+        dist.extra_path = cmd.extra_path = None
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, None)
+        self.assertEquals(cmd.extra_dirs, '')
+        self.assertEquals(cmd.path_file, None)
+
+        # three elements (no way !)
+        cmd.extra_path = 'path,dirs,again'
+        self.assertRaises(DistutilsOptionError, cmd.handle_extra_path)
+
+    def test_finalize_options(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # must supply either prefix/exec-prefix/home or
+        # install-base/install-platbase -- not both
+        cmd.prefix = 'prefix'
+        cmd.install_base = 'base'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # must supply either home or prefix/exec-prefix -- not both
+        cmd.install_base = None
+        cmd.home = 'home'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # can't combine user with with prefix/exec_prefix/home or
+        # install_(plat)base
+        cmd.prefix = None
+        cmd.user = 'user'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+    def test_record(self):
+
+        install_dir = self.mkdtemp()
+        pkgdir, dist = self.create_dist()
+
+        dist = Distribution()
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(pkgdir, 'RECORD')
+        cmd.ensure_finalized()
+
+        cmd.run()
+
+        # let's check the RECORD file was created with one
+        # line (the egg info file)
+        with open(cmd.record) as f:
+            self.assertEquals(len(f.readlines()), 1)
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 

From 74ad50e5f25005d305d4ff74c7cd2de62a42b76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 4 Jun 2009 07:39:50 +0000
Subject: [PATCH 2363/8469] Merged revisions 73197 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73197 | tarek.ziade | 2009-06-04 09:31:52 +0200 (Thu, 04 Jun 2009) | 1 line

  improved test coverage for distutils.command.install and cleaned it up
........
---
 command/install.py    | 96 +++++++++++++++++++++++--------------------
 tests/test_install.py | 73 +++++++++++++++++++++++++++++++-
 2 files changed, 123 insertions(+), 46 deletions(-)

diff --git a/command/install.py b/command/install.py
index de81173387..2a905d92f8 100644
--- a/command/install.py
+++ b/command/install.py
@@ -2,11 +2,12 @@
 
 Implements the Distutils 'install' command."""
 
-from distutils import log
-
 __revision__ = "$Id$"
 
-import sys, os
+import sys
+import os
+
+from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.sysconfig import get_config_vars
@@ -116,7 +117,7 @@
 SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
 
 
-class install (Command):
+class install(Command):
 
     description = "install everything from build directory"
 
@@ -190,7 +191,7 @@ class install (Command):
 
 
     def initialize_options(self):
-
+        """Initializes options."""
         # High-level options: these select both an installation base
         # and scheme.
         self.prefix = None
@@ -267,7 +268,7 @@ def initialize_options(self):
     # array of user input is decided.  Yes, it's quite complex!)
 
     def finalize_options(self):
-
+        """Finalizes options."""
         # This method (and its pliant slaves, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
@@ -408,25 +409,27 @@ def finalize_options(self):
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
 
-
     def dump_dirs(self, msg):
-        if DEBUG:
-            from distutils.fancy_getopt import longopt_xlate
-            print(msg + ":")
-            for opt in self.user_options:
-                opt_name = opt[0]
-                if opt_name[-1] == "=":
-                    opt_name = opt_name[0:-1]
-                if opt_name in self.negative_opt:
-                    opt_name = longopt_xlate(self.negative_opt[opt_name])
-                    val = not getattr(self, opt_name)
-                else:
-                    opt_name = longopt_xlate(opt_name)
-                    val = getattr(self, opt_name)
-                print("  %s: %s" % (opt_name, val))
-
+        """Dumps the list of user options."""
+        if not DEBUG:
+            return
+        from distutils.fancy_getopt import longopt_xlate
+        log.debug(msg + ":")
+        for opt in self.user_options:
+            opt_name = opt[0]
+            if opt_name[-1] == "=":
+                opt_name = opt_name[0:-1]
+            if opt_name in self.negative_opt:
+                opt_name = self.negative_opt[opt_name]
+                opt_name = opt_name.translate(longopt_xlate)
+                val = not getattr(self, opt_name)
+            else:
+                opt_name = opt_name.translate(longopt_xlate)
+                val = getattr(self, opt_name)
+            log.debug("  %s: %s" % (opt_name, val))
 
     def finalize_unix(self):
+        """Finalizes options for posix platforms."""
         if self.install_base is not None or self.install_platbase is not None:
             if ((self.install_lib is None and
                  self.install_purelib is None and
@@ -465,8 +468,8 @@ def finalize_unix(self):
             self.install_platbase = self.exec_prefix
             self.select_scheme("unix_prefix")
 
-
-    def finalize_other(self):          # Windows and Mac OS for now
+    def finalize_other(self):
+        """Finalizes options for non-posix platforms"""
         if self.user:
             if self.install_userbase is None:
                 raise DistutilsPlatformError(
@@ -487,8 +490,8 @@ def finalize_other(self):          # Windows and Mac OS for now
                 raise DistutilsPlatformError(
                       "I don't know how to install stuff on '%s'" % os.name)
 
-
     def select_scheme(self, name):
+        """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
         scheme = INSTALL_SCHEMES[name]
         for key in SCHEME_KEYS:
@@ -496,7 +499,6 @@ def select_scheme(self, name):
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
 
-
     def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
@@ -506,27 +508,25 @@ def _expand_attrs(self, attrs):
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
-
     def expand_basedirs(self):
-        self._expand_attrs(['install_base',
-                            'install_platbase',
-                            'root'])
+        """Calls `os.path.expanduser` on install_base, install_platbase and
+        root."""
+        self._expand_attrs(['install_base', 'install_platbase', 'root'])
 
     def expand_dirs(self):
-        self._expand_attrs(['install_purelib',
-                            'install_platlib',
-                            'install_lib',
-                            'install_headers',
-                            'install_scripts',
-                            'install_data',])
-
+        """Calls `os.path.expanduser` on install dirs."""
+        self._expand_attrs(['install_purelib', 'install_platlib',
+                            'install_lib', 'install_headers',
+                            'install_scripts', 'install_data',])
 
     def convert_paths(self, *names):
+        """Call `convert_path` over `names`."""
         for name in names:
             attr = "install_" + name
             setattr(self, attr, convert_path(getattr(self, attr)))
 
     def handle_extra_path(self):
+        """Set `path_file` and `extra_dirs` using `extra_path`."""
         if self.extra_path is None:
             self.extra_path = self.distribution.extra_path
 
@@ -537,7 +537,7 @@ def handle_extra_path(self):
             if len(self.extra_path) == 1:
                 path_file = extra_dirs = self.extra_path[0]
             elif len(self.extra_path) == 2:
-                (path_file, extra_dirs) = self.extra_path
+                path_file, extra_dirs = self.extra_path
             else:
                 raise DistutilsOptionError(
                       "'extra_path' option must be a list, tuple, or "
@@ -546,7 +546,6 @@ def handle_extra_path(self):
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
             extra_dirs = convert_path(extra_dirs)
-
         else:
             path_file = None
             extra_dirs = ''
@@ -557,13 +556,13 @@ def handle_extra_path(self):
         self.extra_dirs = extra_dirs
 
     def change_roots(self, *names):
+        """Change the install direcories pointed by name using root."""
         for name in names:
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
     def create_home_path(self):
-        """Create directories under ~
-        """
+        """Create directories under ~."""
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
@@ -575,6 +574,7 @@ def create_home_path(self):
     # -- Command execution methods -------------------------------------
 
     def run(self):
+        """Runs the command."""
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
@@ -618,6 +618,7 @@ def run(self):
                        self.install_lib)
 
     def create_path_file(self):
+        """Creates the .pth file"""
         filename = os.path.join(self.install_libbase,
                                 self.path_file + ".pth")
         if self.install_path_file:
@@ -631,7 +632,7 @@ def create_path_file(self):
     # -- Reporting methods ---------------------------------------------
 
     def get_outputs(self):
-        # Assemble the outputs of all the sub-commands.
+        """Assembles the outputs of all the sub-commands."""
         outputs = []
         for cmd_name in self.get_sub_commands():
             cmd = self.get_finalized_command(cmd_name)
@@ -648,6 +649,7 @@ def get_outputs(self):
         return outputs
 
     def get_inputs(self):
+        """Returns the inputs of all the sub-commands"""
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
@@ -656,25 +658,29 @@ def get_inputs(self):
 
         return inputs
 
-
     # -- Predicates for sub-command list -------------------------------
 
     def has_lib(self):
-        """Return true if the current distribution has any Python
+        """Returns true if the current distribution has any Python
         modules to install."""
         return (self.distribution.has_pure_modules() or
                 self.distribution.has_ext_modules())
 
     def has_headers(self):
+        """Returns true if the current distribution has any headers to
+        install."""
         return self.distribution.has_headers()
 
     def has_scripts(self):
+        """Returns true if the current distribution has any scripts to.
+        install."""
         return self.distribution.has_scripts()
 
     def has_data(self):
+        """Returns true if the current distribution has any data to.
+        install."""
         return self.distribution.has_data_files()
 
-
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.
     sub_commands = [('install_lib',     has_lib),
diff --git a/tests/test_install.py b/tests/test_install.py
index 9ceccf68cf..8d7e97227c 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -10,11 +10,14 @@
 from distutils.command import install as install_module
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
+from distutils.errors import DistutilsOptionError
 
 from distutils.tests import support
 
 
-class InstallTestCase(support.TempdirManager, unittest.TestCase):
+class InstallTestCase(support.TempdirManager,
+                      support.LoggingSilencer,
+                      unittest.TestCase):
 
     def test_home_installation_scheme(self):
         # This ensure two things:
@@ -112,6 +115,74 @@ def _test_user_site(self):
         self.assert_('userbase' in cmd.config_vars)
         self.assert_('usersite' in cmd.config_vars)
 
+    def test_handle_extra_path(self):
+        dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
+        cmd = install(dist)
+
+        # two elements
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
+        self.assertEquals(cmd.extra_dirs, 'dirs')
+        self.assertEquals(cmd.path_file, 'path')
+
+        # one element
+        cmd.extra_path = ['path']
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, ['path'])
+        self.assertEquals(cmd.extra_dirs, 'path')
+        self.assertEquals(cmd.path_file, 'path')
+
+        # none
+        dist.extra_path = cmd.extra_path = None
+        cmd.handle_extra_path()
+        self.assertEquals(cmd.extra_path, None)
+        self.assertEquals(cmd.extra_dirs, '')
+        self.assertEquals(cmd.path_file, None)
+
+        # three elements (no way !)
+        cmd.extra_path = 'path,dirs,again'
+        self.assertRaises(DistutilsOptionError, cmd.handle_extra_path)
+
+    def test_finalize_options(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # must supply either prefix/exec-prefix/home or
+        # install-base/install-platbase -- not both
+        cmd.prefix = 'prefix'
+        cmd.install_base = 'base'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # must supply either home or prefix/exec-prefix -- not both
+        cmd.install_base = None
+        cmd.home = 'home'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # can't combine user with with prefix/exec_prefix/home or
+        # install_(plat)base
+        cmd.prefix = None
+        cmd.user = 'user'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+    def test_record(self):
+
+        install_dir = self.mkdtemp()
+        pkgdir, dist = self.create_dist()
+
+        dist = Distribution()
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(pkgdir, 'RECORD')
+        cmd.ensure_finalized()
+
+        cmd.run()
+
+        # let's check the RECORD file was created with one
+        # line (the egg info file)
+        with open(cmd.record) as f:
+            self.assertEquals(len(f.readlines()), 1)
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 

From 22e57debf56bf09cdf3e1bd12f6b6da4663037b7 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 4 Jun 2009 09:42:55 +0000
Subject: [PATCH 2364/8469] More codestring -> codebytes.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 9249427a43..3b4a036718 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -127,7 +127,7 @@ def upload_file(self, command, pyversion, filename):
         user_pass = (self.username + ":" + self.password).encode('ascii')
         # The exact encoding of the authentication string is debated.
         # Anyway PyPI only accepts ascii for both username or password.
-        auth = "Basic " + base64.encodestring(user_pass).strip().decode('ascii')
+        auth = "Basic " + base64.encodebytes(user_pass).strip().decode('ascii')
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'

From 0368c370af04800297fc18864d39885cb90f4cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 5 Jun 2009 13:37:29 +0000
Subject: [PATCH 2365/8469] reverting r72823 : Python trunk has to use latin-1
 encoding

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

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index b42e41b373..52e193eb51 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2005, 2006 Martin von Löwis
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2005, 2006 Martin von Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
 # based on bdist_wininst

From 831813f0d1e42703be6794b49e4ea144995fb9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 10 Jun 2009 18:49:50 +0000
Subject: [PATCH 2366/8469] Distutils: started code cleanup and test coverage
 for cygwinccompiler

---
 cygwinccompiler.py            | 121 ++++++++++++++--------------------
 tests/test_cygwinccompiler.py | 120 +++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+), 71 deletions(-)
 create mode 100644 tests/test_cygwinccompiler.py

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 3ac1dceb3e..df5ebaf9a6 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -47,12 +47,19 @@
 
 __revision__ = "$Id$"
 
-import os,sys,copy
+import os
+import sys
+import copy
+from subprocess import Popen, PIPE
+import re
+
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
+from distutils.version import LooseVersion
+from distutils.spawn import find_executable
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -348,16 +355,16 @@ def __init__ (self,
 CONFIG_H_UNCERTAIN = "uncertain"
 
 def check_config_h():
+    """Check if the current Python installation appears amenable to building
+    extensions with GCC.
+
+    Returns a tuple (status, details), where 'status' is one of the following
+    constants:
+
+    - CONFIG_H_OK: all is well, go ahead and compile
+    - CONFIG_H_NOTOK: doesn't look good
+    - CONFIG_H_UNCERTAIN: not sure -- unable to read pyconfig.h
 
-    """Check if the current Python installation (specifically, pyconfig.h)
-    appears amenable to building extensions with GCC.  Returns a tuple
-    (status, details), where 'status' is one of the following constants:
-      CONFIG_H_OK
-        all is well, go ahead and compile
-      CONFIG_H_NOTOK
-        doesn't look good
-      CONFIG_H_UNCERTAIN
-        not sure -- unable to read pyconfig.h
     'details' is a human-readable string explaining the situation.
 
     Note there are two ways to conclude "OK": either 'sys.version' contains
@@ -369,77 +376,49 @@ def check_config_h():
     # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string
-    # if sys.version contains GCC then python was compiled with
-    # GCC, and the pyconfig.h file should be OK
-    if string.find(sys.version,"GCC") >= 0:
-        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
 
+    # if sys.version contains GCC then python was compiled with GCC, and the
+    # pyconfig.h file should be OK
+    if "GCC" in sys.version:
+        return CONFIG_H_OK, "sys.version mentions 'GCC'"
+
+    # let's see if __GNUC__ is mentioned in python.h
     fn = sysconfig.get_config_h_filename()
     try:
-        # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough
-        f = open(fn)
-        s = f.read()
-        f.close()
-
+        with open(fn) as config_h:
+            if "__GNUC__" in config_h.read():
+                return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn
+            else:
+                return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
     except IOError, exc:
-        # if we can't read this file, we cannot say it is wrong
-        # the compiler will complain later about this file as missing
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-    else:
-        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
-        if string.find(s,"__GNUC__") >= 0:
-            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
-        else:
-            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
+RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
 
+def _find_exe_version(cmd):
+    """Find the version of an executable by running `cmd` in the shell.
 
+    If the command is not found, or the output does not match
+    `RE_VERSION`, returns None.
+    """
+    executable = cmd.split()[0]
+    if find_executable(executable) is None:
+        return None
+    out = Popen(cmd, shell=True, stdout=PIPE).stdout
+    try:
+        out_string = out.read()
+    finally:
+        out.close()
+    result = RE_VERSION.search(out_string)
+    if result is None:
+        return None
+    return LooseVersion(result.group(1))
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
-        If not possible it returns None for it.
-    """
-    from distutils.version import LooseVersion
-    from distutils.spawn import find_executable
-    import re
 
-    gcc_exe = find_executable('gcc')
-    if gcc_exe:
-        out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
-        if result:
-            gcc_version = LooseVersion(result.group(1))
-        else:
-            gcc_version = None
-    else:
-        gcc_version = None
-    ld_exe = find_executable('ld')
-    if ld_exe:
-        out = os.popen(ld_exe + ' -v','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
-        if result:
-            ld_version = LooseVersion(result.group(1))
-        else:
-            ld_version = None
-    else:
-        ld_version = None
-    dllwrap_exe = find_executable('dllwrap')
-    if dllwrap_exe:
-        out = os.popen(dllwrap_exe + ' --version','r')
-        out_string = out.read()
-        out.close()
-        result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
-        if result:
-            dllwrap_version = LooseVersion(result.group(1))
-        else:
-            dllwrap_version = None
-    else:
-        dllwrap_version = None
-    return (gcc_version, ld_version, dllwrap_version)
+    If not possible it returns None for it.
+    """
+    commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
+    return tuple([_find_exe_version(cmd) for cmd in commands])
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
new file mode 100644
index 0000000000..1d46580640
--- /dev/null
+++ b/tests/test_cygwinccompiler.py
@@ -0,0 +1,120 @@
+"""Tests for distutils.cygwinccompiler."""
+import unittest
+import sys
+import os
+from StringIO import StringIO
+import subprocess
+
+from distutils import cygwinccompiler
+from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
+                                       CONFIG_H_OK, CONFIG_H_NOTOK,
+                                       CONFIG_H_UNCERTAIN, get_versions)
+from distutils.tests import support
+
+class FakePopen(object):
+    test_class = None
+
+    def __init__(self, cmd, shell, stdout):
+        self.cmd = cmd.split()[0]
+        exes = self.test_class._exes
+        if self.cmd in exes:
+            self.stdout = StringIO(exes[self.cmd])
+        else:
+            self.stdout = os.popen(cmd, 'r')
+
+
+class CygwinCCompilerTestCase(support.TempdirManager,
+                              unittest.TestCase):
+
+    def setUp(self):
+        super(CygwinCCompilerTestCase, self).setUp()
+        self.version = sys.version
+        self.python_h = os.path.join(self.mkdtemp(), 'python.h')
+        from distutils import sysconfig
+        self.old_get_config_h_filename = sysconfig.get_config_h_filename
+        sysconfig.get_config_h_filename = self._get_config_h_filename
+        self.old_find_executable = cygwinccompiler.find_executable
+        cygwinccompiler.find_executable = self._find_executable
+        self._exes = {}
+        self.old_popen = cygwinccompiler.Popen
+        FakePopen.test_class = self
+        cygwinccompiler.Popen = FakePopen
+
+    def tearDown(self):
+        sys.version = self.version
+        from distutils import sysconfig
+        sysconfig.get_config_h_filename = self.old_get_config_h_filename
+        cygwinccompiler.find_executable = self.old_find_executable
+        cygwinccompiler.Popen = self.old_popen
+        super(CygwinCCompilerTestCase, self).tearDown()
+
+    def _get_config_h_filename(self):
+        return self.python_h
+
+    def _find_executable(self, name):
+        if name in self._exes:
+            return name
+        return None
+
+    def test_check_config_h(self):
+
+        # check_config_h looks for "GCC" in sys.version first
+        # returns CONFIG_H_OK if found
+        sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
+                       '4.0.1 (Apple Computer, Inc. build 5370)]')
+
+        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+
+        # then it tries to see if it can find "__GNUC__" in pyconfig.h
+        sys.version = 'something without the *CC word'
+
+        # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
+        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
+
+        # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
+        self.write_file(self.python_h, 'xxx')
+        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
+
+        # and CONFIG_H_OK if __GNUC__ is found
+        self.write_file(self.python_h, 'xxx __GNUC__ xxx')
+        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+
+    def test_get_versions(self):
+
+        # get_versions calls distutils.spawn.find_executable on
+        # 'gcc', 'ld' and 'dllwrap'
+        self.assertEquals(get_versions(), (None, None, None))
+
+        # Let's fake we have 'gcc' and it returns '3.4.5'
+        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[0]), '3.4.5')
+
+        # and let's see what happens when the version
+        # doesn't match the regular expression
+        # (\d+\.\d+(\.\d+)*)
+        self._exes['gcc'] = 'very strange output'
+        res = get_versions()
+        self.assertEquals(res[0], None)
+
+        # same thing for ld
+        self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+        res = get_versions()
+        self.assertEquals(str(res[1]), '2.17.50')
+        self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+        res = get_versions()
+        self.assertEquals(res[1], None)
+
+        # and dllwrap
+        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[2]), '2.17.50')
+        self._exes['dllwrap'] = 'Cheese Wrap'
+        res = get_versions()
+        self.assertEquals(res[2], None)
+
+def test_suite():
+    return unittest.makeSuite(CygwinCCompilerTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 41510f823530aa882a2c08e1c807b3e8d3d5ebf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 10 Jun 2009 18:56:35 +0000
Subject: [PATCH 2367/8469] Merged revisions 73336 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73336 | tarek.ziade | 2009-06-10 20:49:50 +0200 (Wed, 10 Jun 2009) | 1 line

  Distutils: started code cleanup and test coverage for cygwinccompiler
........
---
 cygwinccompiler.py            | 120 ++++++++++++++--------------------
 tests/test_cygwinccompiler.py | 120 ++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+), 70 deletions(-)
 create mode 100644 tests/test_cygwinccompiler.py

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index ea4c7971fd..f541489190 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -47,12 +47,19 @@
 
 __revision__ = "$Id$"
 
-import os,sys,copy
+import os
+import sys
+import copy
+from subprocess import Popen, PIPE
+import re
+
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
+from distutils.version import LooseVersion
+from distutils.spawn import find_executable
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -347,16 +354,16 @@ def __init__ (self,
 CONFIG_H_UNCERTAIN = "uncertain"
 
 def check_config_h():
+    """Check if the current Python installation appears amenable to building
+    extensions with GCC.
+
+    Returns a tuple (status, details), where 'status' is one of the following
+    constants:
+
+    - CONFIG_H_OK: all is well, go ahead and compile
+    - CONFIG_H_NOTOK: doesn't look good
+    - CONFIG_H_UNCERTAIN: not sure -- unable to read pyconfig.h
 
-    """Check if the current Python installation (specifically, pyconfig.h)
-    appears amenable to building extensions with GCC.  Returns a tuple
-    (status, details), where 'status' is one of the following constants:
-      CONFIG_H_OK
-        all is well, go ahead and compile
-      CONFIG_H_NOTOK
-        doesn't look good
-      CONFIG_H_UNCERTAIN
-        not sure -- unable to read pyconfig.h
     'details' is a human-readable string explaining the situation.
 
     Note there are two ways to conclude "OK": either 'sys.version' contains
@@ -368,76 +375,49 @@ def check_config_h():
     # "pyconfig.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    # if sys.version contains GCC then python was compiled with
-    # GCC, and the pyconfig.h file should be OK
-    if sys.version.find("GCC") >= 0:
-        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
 
+    # if sys.version contains GCC then python was compiled with GCC, and the
+    # pyconfig.h file should be OK
+    if "GCC" in sys.version:
+        return CONFIG_H_OK, "sys.version mentions 'GCC'"
+
+    # let's see if __GNUC__ is mentioned in python.h
     fn = sysconfig.get_config_h_filename()
     try:
-        # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough
-        f = open(fn)
-        s = f.read()
-        f.close()
-
+        with open(fn) as config_h:
+            if "__GNUC__" in config_h.read():
+                return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn
+            else:
+                return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
     except IOError as exc:
-        # if we can't read this file, we cannot say it is wrong
-        # the compiler will complain later about this file as missing
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-    else:
-        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
-        if s.find("__GNUC__") >= 0:
-            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
-        else:
-            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
+RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
 
+def _find_exe_version(cmd):
+    """Find the version of an executable by running `cmd` in the shell.
 
+    If the command is not found, or the output does not match
+    `RE_VERSION`, returns None.
+    """
+    executable = cmd.split()[0]
+    if find_executable(executable) is None:
+        return None
+    out = Popen(cmd, shell=True, stdout=PIPE).stdout
+    try:
+        out_string = out.read()
+    finally:
+        out.close()
+    result = RE_VERSION.search(out_string)
+    if result is None:
+        return None
+    return LooseVersion(result.group(1))
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
-        If not possible it returns None for it.
-    """
-    from distutils.version import LooseVersion
-    from distutils.spawn import find_executable
-    import re
 
-    gcc_exe = find_executable('gcc')
-    if gcc_exe:
-        out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
-        if result:
-            gcc_version = LooseVersion(result.group(1))
-        else:
-            gcc_version = None
-    else:
-        gcc_version = None
-    ld_exe = find_executable('ld')
-    if ld_exe:
-        out = os.popen(ld_exe + ' -v','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
-        if result:
-            ld_version = LooseVersion(result.group(1))
-        else:
-            ld_version = None
-    else:
-        ld_version = None
-    dllwrap_exe = find_executable('dllwrap')
-    if dllwrap_exe:
-        out = os.popen(dllwrap_exe + ' --version','r')
-        out_string = out.read()
-        out.close()
-        result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
-        if result:
-            dllwrap_version = LooseVersion(result.group(1))
-        else:
-            dllwrap_version = None
-    else:
-        dllwrap_version = None
-    return (gcc_version, ld_version, dllwrap_version)
+    If not possible it returns None for it.
+    """
+    commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
+    return tuple([_find_exe_version(cmd) for cmd in commands])
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
new file mode 100644
index 0000000000..42c5ea40a6
--- /dev/null
+++ b/tests/test_cygwinccompiler.py
@@ -0,0 +1,120 @@
+"""Tests for distutils.cygwinccompiler."""
+import unittest
+import sys
+import os
+from io import StringIO
+import subprocess
+
+from distutils import cygwinccompiler
+from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
+                                       CONFIG_H_OK, CONFIG_H_NOTOK,
+                                       CONFIG_H_UNCERTAIN, get_versions)
+from distutils.tests import support
+
+class FakePopen(object):
+    test_class = None
+
+    def __init__(self, cmd, shell, stdout):
+        self.cmd = cmd.split()[0]
+        exes = self.test_class._exes
+        if self.cmd in exes:
+            self.stdout = StringIO(exes[self.cmd])
+        else:
+            self.stdout = os.popen(cmd, 'r')
+
+
+class CygwinCCompilerTestCase(support.TempdirManager,
+                              unittest.TestCase):
+
+    def setUp(self):
+        super(CygwinCCompilerTestCase, self).setUp()
+        self.version = sys.version
+        self.python_h = os.path.join(self.mkdtemp(), 'python.h')
+        from distutils import sysconfig
+        self.old_get_config_h_filename = sysconfig.get_config_h_filename
+        sysconfig.get_config_h_filename = self._get_config_h_filename
+        self.old_find_executable = cygwinccompiler.find_executable
+        cygwinccompiler.find_executable = self._find_executable
+        self._exes = {}
+        self.old_popen = cygwinccompiler.Popen
+        FakePopen.test_class = self
+        cygwinccompiler.Popen = FakePopen
+
+    def tearDown(self):
+        sys.version = self.version
+        from distutils import sysconfig
+        sysconfig.get_config_h_filename = self.old_get_config_h_filename
+        cygwinccompiler.find_executable = self.old_find_executable
+        cygwinccompiler.Popen = self.old_popen
+        super(CygwinCCompilerTestCase, self).tearDown()
+
+    def _get_config_h_filename(self):
+        return self.python_h
+
+    def _find_executable(self, name):
+        if name in self._exes:
+            return name
+        return None
+
+    def test_check_config_h(self):
+
+        # check_config_h looks for "GCC" in sys.version first
+        # returns CONFIG_H_OK if found
+        sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
+                       '4.0.1 (Apple Computer, Inc. build 5370)]')
+
+        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+
+        # then it tries to see if it can find "__GNUC__" in pyconfig.h
+        sys.version = 'something without the *CC word'
+
+        # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
+        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
+
+        # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
+        self.write_file(self.python_h, 'xxx')
+        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
+
+        # and CONFIG_H_OK if __GNUC__ is found
+        self.write_file(self.python_h, 'xxx __GNUC__ xxx')
+        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+
+    def test_get_versions(self):
+
+        # get_versions calls distutils.spawn.find_executable on
+        # 'gcc', 'ld' and 'dllwrap'
+        self.assertEquals(get_versions(), (None, None, None))
+
+        # Let's fake we have 'gcc' and it returns '3.4.5'
+        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[0]), '3.4.5')
+
+        # and let's see what happens when the version
+        # doesn't match the regular expression
+        # (\d+\.\d+(\.\d+)*)
+        self._exes['gcc'] = 'very strange output'
+        res = get_versions()
+        self.assertEquals(res[0], None)
+
+        # same thing for ld
+        self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+        res = get_versions()
+        self.assertEquals(str(res[1]), '2.17.50')
+        self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+        res = get_versions()
+        self.assertEquals(res[1], None)
+
+        # and dllwrap
+        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[2]), '2.17.50')
+        self._exes['dllwrap'] = 'Cheese Wrap'
+        res = get_versions()
+        self.assertEquals(res[2], None)
+
+def test_suite():
+    return unittest.makeSuite(CygwinCCompilerTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 0ba4f63285bbba4b9fedf8a46c16fe362fd8201a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 08:12:20 +0000
Subject: [PATCH 2368/8469] Fixed #5201: now
 distutils.sysconfig.parse_makefile() understands '53264' in Makefiles

---
 sysconfig.py            | 21 ++++++++++++++-------
 tests/test_sysconfig.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 099e0586fd..4a4fadde92 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -285,18 +285,25 @@ def parse_makefile(fn, g=None):
 
     while 1:
         line = fp.readline()
-        if line is None:                # eof
+        if line is None:  # eof
             break
         m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            v = string.strip(v)
-            if "$" in v:
+            v = v.strip()
+            # `$$' is a literal `$' in make
+            tmpv = v.replace('$$', '')
+
+            if "$" in tmpv:
                 notdone[n] = v
             else:
-                try: v = int(v)
-                except ValueError: pass
-                done[n] = v
+                try:
+                    v = int(v)
+                except ValueError:
+                    # insert literal `$'
+                    done[n] = v.replace('$$', '$')
+                else:
+                    done[n] = v
 
     # do variable interpolation here
     while notdone:
@@ -324,7 +331,7 @@ def parse_makefile(fn, g=None):
                     else:
                         try: value = int(value)
                         except ValueError:
-                            done[name] = string.strip(value)
+                            done[name] = value.strip()
                         else:
                             done[name] = value
                         del notdone[name]
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 0a5ac2944a..8534881c32 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,5 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
+import test
 import unittest
 
 from distutils import sysconfig
@@ -9,6 +10,14 @@
 
 class SysconfigTestCase(support.EnvironGuard,
                         unittest.TestCase):
+    def setUp(self):
+        super(SysconfigTestCase, self).setUp()
+        self.makefile = None
+
+    def tearDown(self):
+        if self.makefile is not None:
+            os.unlink(self.makefile)
+        super(SysconfigTestCase, self).tearDown()
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
@@ -56,8 +65,32 @@ def set_executables(self, **kw):
         sysconfig.customize_compiler(comp)
         self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
 
+    def test_parse_makefile_base(self):
+        self.makefile = test.test_support.TESTFN
+        fd = open(self.makefile, 'w')
+        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
+        fd.write('VAR=$OTHER\nOTHER=foo')
+        fd.close()
+        d = sysconfig.parse_makefile(self.makefile)
+        self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
+                              'OTHER': 'foo'})
+
+    def test_parse_makefile_literal_dollar(self):
+        self.makefile = test.test_support.TESTFN
+        fd = open(self.makefile, 'w')
+        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+        fd.write('VAR=$OTHER\nOTHER=foo')
+        fd.close()
+        d = sysconfig.parse_makefile(self.makefile)
+        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                              'OTHER': 'foo'})
+
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SysconfigTestCase))
     return suite
+
+
+if __name__ == '__main__':
+    test.test_support.run_unittest(test_suite())

From c242531d00417d756b1f0a83b70d29d818ececb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 08:26:40 +0000
Subject: [PATCH 2369/8469] Merged revisions 73341 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73341 | tarek.ziade | 2009-06-11 10:12:20 +0200 (Thu, 11 Jun 2009) | 1 line

  Fixed #5201: now distutils.sysconfig.parse_makefile() understands '53264' in Makefiles
........
---
 sysconfig.py            | 21 ++++++++++++++-------
 tests/test_sysconfig.py | 23 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 615da07e99..6f99de28e3 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -275,18 +275,25 @@ def parse_makefile(fn, g=None):
 
     while 1:
         line = fp.readline()
-        if line is None:                # eof
+        if line is None:  # eof
             break
         m = _variable_rx.match(line)
         if m:
             n, v = m.group(1, 2)
-            v = string.strip(v)
-            if "$" in v:
+            v = v.strip()
+            # `$$' is a literal `$' in make
+            tmpv = v.replace('$$', '')
+
+            if "$" in tmpv:
                 notdone[n] = v
             else:
-                try: v = int(v)
-                except ValueError: pass
-                done[n] = v
+                try:
+                    v = int(v)
+                except ValueError:
+                    # insert literal `$'
+                    done[n] = v.replace('$$', '$')
+                else:
+                    done[n] = v
 
     # do variable interpolation here
     while notdone:
@@ -314,7 +321,7 @@ def parse_makefile(fn, g=None):
                     else:
                         try: value = int(value)
                         except ValueError:
-                            done[name] = string.strip(value)
+                            done[name] = value.strip()
                         else:
                             done[name] = value
                         del notdone[name]
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 9f820575ab..9f13952133 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,11 +2,20 @@
 
 from distutils import sysconfig
 import os
+import test
 import unittest
 
 from test.test_support import TESTFN
 
 class SysconfigTestCase(unittest.TestCase):
+    def setUp(self):
+        super(SysconfigTestCase, self).setUp()
+        self.makefile = None
+
+    def tearDown(self):
+        if self.makefile is not None:
+            os.unlink(self.makefile)
+        super(SysconfigTestCase, self).tearDown()
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
@@ -51,8 +60,22 @@ def test_get_config_vars(self):
         self.assert_(isinstance(cvars, dict))
         self.assert_(cvars)
 
+    def test_parse_makefile_literal_dollar(self):
+        self.makefile = test.test_support.TESTFN
+        fd = open(self.makefile, 'w')
+        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+        fd.write('VAR=$OTHER\nOTHER=foo')
+        fd.close()
+        d = sysconfig.parse_makefile(self.makefile)
+        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                              'OTHER': 'foo'})
+
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SysconfigTestCase))
     return suite
+
+
+if __name__ == '__main__':
+    test.test_support.run_unittest(test_suite())

From 0f2d78ce11da94cffa073fd8090b7c27933cc7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 08:31:17 +0000
Subject: [PATCH 2370/8469] Merged revisions 73341 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73341 | tarek.ziade | 2009-06-11 10:12:20 +0200 (Thu, 11 Jun 2009) | 1 line

  Fixed #5201: now distutils.sysconfig.parse_makefile() understands '53264' in Makefiles
........
---
 sysconfig.py            | 15 +++++++++++----
 tests/test_sysconfig.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 223ff672b9..0fbd5412bc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -286,12 +286,19 @@ def parse_makefile(fn, g=None):
         if m:
             n, v = m.group(1, 2)
             v = v.strip()
-            if "$" in v:
+            # `$$' is a literal `$' in make
+            tmpv = v.replace('$$', '')
+
+            if "$" in tmpv:
                 notdone[n] = v
             else:
-                try: v = int(v)
-                except ValueError: pass
-                done[n] = v
+                try:
+                    v = int(v)
+                except ValueError:
+                    # insert literal `$'
+                    done[n] = v.replace('$$', '$')
+                else:
+                    done[n] = v
 
     # do variable interpolation here
     while notdone:
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 322df39cf5..2d8fa2710e 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,14 +1,23 @@
 """Tests for distutils.sysconfig."""
 import os
+import test
 import unittest
 
 from distutils import sysconfig
 from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
-from test.support import TESTFN
+from test.support import TESTFN, run_unittest
 
 class SysconfigTestCase(support.EnvironGuard,
                         unittest.TestCase):
+    def setUp(self):
+        super(SysconfigTestCase, self).setUp()
+        self.makefile = None
+
+    def tearDown(self):
+        if self.makefile is not None:
+            os.unlink(self.makefile)
+        super(SysconfigTestCase, self).tearDown()
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
@@ -56,8 +65,32 @@ def set_executables(self, **kw):
         sysconfig.customize_compiler(comp)
         self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
 
+    def test_parse_makefile_base(self):
+        self.makefile = TESTFN
+        fd = open(self.makefile, 'w')
+        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
+        fd.write('VAR=$OTHER\nOTHER=foo')
+        fd.close()
+        d = sysconfig.parse_makefile(self.makefile)
+        self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
+                              'OTHER': 'foo'})
+
+    def test_parse_makefile_literal_dollar(self):
+        self.makefile = TESTFN
+        fd = open(self.makefile, 'w')
+        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+        fd.write('VAR=$OTHER\nOTHER=foo')
+        fd.close()
+        d = sysconfig.parse_makefile(self.makefile)
+        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                              'OTHER': 'foo'})
+
 
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SysconfigTestCase))
     return suite
+
+
+if __name__ == '__main__':
+    run_unittest(test_suite())

From d2dbee56d652758ae690ddd7272237c414d7d9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 08:43:26 +0000
Subject: [PATCH 2371/8469] removed the last string.split() call

---
 sysconfig.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 4a4fadde92..dcc7231ac5 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -13,7 +13,6 @@
 
 import os
 import re
-import string
 import sys
 
 from distutils.errors import DistutilsPlatformError
@@ -435,7 +434,7 @@ def _init_posix():
             # relative to the srcdir, which after installation no longer makes
             # sense.
             python_lib = get_python_lib(standard_lib=1)
-            linkerscript_path = string.split(g['LDSHARED'])[0]
+            linkerscript_path = g['LDSHARED'].split()[0]
             linkerscript_name = os.path.basename(linkerscript_path)
             linkerscript = os.path.join(python_lib, 'config',
                                         linkerscript_name)

From ea7ef1006672c0a59e837376234e4b70e44936a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 09:13:36 +0000
Subject: [PATCH 2372/8469] #6263 fixed syntax error in
 distutils.cygwinccompiler

---
 cygwinccompiler.py            |  2 +-
 tests/test_cygwinccompiler.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index df5ebaf9a6..fd5296c358 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -81,7 +81,7 @@ def get_msvcr():
             # VS2008 / MSVC 9.0
             return ['msvcr90']
         else:
-            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
 class CygwinCCompiler (UnixCCompiler):
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 1d46580640..fb823e4d80 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -8,7 +8,8 @@
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
-                                       CONFIG_H_UNCERTAIN, get_versions)
+                                       CONFIG_H_UNCERTAIN, get_versions,
+                                       get_msvcr)
 from distutils.tests import support
 
 class FakePopen(object):
@@ -113,6 +114,38 @@ def test_get_versions(self):
         res = get_versions()
         self.assertEquals(res[2], None)
 
+    def test_get_msvcr(self):
+
+        # none
+        sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
+                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
+        self.assertEquals(get_msvcr(), None)
+
+        # MSVC 7.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1300 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr70'])
+
+        # MSVC 7.1
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1310 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr71'])
+
+        # VS2005 / MSVC 8.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1400 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr80'])
+
+        # VS2008 / MSVC 9.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1500 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr90'])
+
+        # unknown
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1999 32 bits (Intel)]')
+        self.assertRaises(ValueError, get_msvcr)
+
 def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 

From 27e7780a17e1afcfb81b3bded04ff2f673ca2e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 09:17:19 +0000
Subject: [PATCH 2373/8469] Merged revisions 73348 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73348 | tarek.ziade | 2009-06-11 11:13:36 +0200 (Thu, 11 Jun 2009) | 1 line

  #6263 fixed syntax error in distutils.cygwinccompiler
........
---
 cygwinccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 94a7bd96ee..2dabc0f0fe 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -76,7 +76,7 @@ def get_msvcr():
             # VS2008 / MSVC 9.0
             return ['msvcr90']
         else:
-            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
 class CygwinCCompiler (UnixCCompiler):

From e5ed970b227477740df0c7fea99a4326ad43bea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 09:25:41 +0000
Subject: [PATCH 2374/8469] Merged revisions 73348 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73348 | tarek.ziade | 2009-06-11 11:13:36 +0200 (Thu, 11 Jun 2009) | 1 line

  #6263 fixed syntax error in distutils.cygwinccompiler
........
---
 cygwinccompiler.py            |  2 +-
 tests/test_cygwinccompiler.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index f541489190..a552ffd934 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -81,7 +81,7 @@ def get_msvcr():
             # VS2008 / MSVC 9.0
             return ['msvcr90']
         else:
-            raise ValueError("Unknown MS Compiler version %i " % msc_Ver)
+            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
 class CygwinCCompiler (UnixCCompiler):
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 42c5ea40a6..c5a6495da5 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -8,7 +8,8 @@
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
-                                       CONFIG_H_UNCERTAIN, get_versions)
+                                       CONFIG_H_UNCERTAIN, get_versions,
+                                       get_msvcr)
 from distutils.tests import support
 
 class FakePopen(object):
@@ -113,6 +114,38 @@ def test_get_versions(self):
         res = get_versions()
         self.assertEquals(res[2], None)
 
+    def test_get_msvcr(self):
+
+        # none
+        sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
+                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
+        self.assertEquals(get_msvcr(), None)
+
+        # MSVC 7.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1300 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr70'])
+
+        # MSVC 7.1
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1310 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr71'])
+
+        # VS2005 / MSVC 8.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1400 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr80'])
+
+        # VS2008 / MSVC 9.0
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1500 32 bits (Intel)]')
+        self.assertEquals(get_msvcr(), ['msvcr90'])
+
+        # unknown
+        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
+                       '[MSC v.1999 32 bits (Intel)]')
+        self.assertRaises(ValueError, get_msvcr)
+
 def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 

From 36287e0beaf534918cae7634a9e9a2b7a89540f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 09:55:09 +0000
Subject: [PATCH 2375/8469] pep8-fied cygwinccompiler module

---
 cygwinccompiler.py | 95 +++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 65 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index fd5296c358..c35e49d713 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -84,8 +84,9 @@ def get_msvcr():
             raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
-class CygwinCCompiler (UnixCCompiler):
-
+class CygwinCCompiler(UnixCCompiler):
+    """ Handles the Cygwin port of the GNU C compiler to Windows.
+    """
     compiler_type = 'cygwin'
     obj_extension = ".o"
     static_lib_extension = ".a"
@@ -94,11 +95,11 @@ class CygwinCCompiler (UnixCCompiler):
     shared_lib_format = "%s%s"
     exe_extension = ".exe"
 
-    def __init__ (self, verbose=0, dry_run=0, force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0):
 
-        UnixCCompiler.__init__ (self, verbose, dry_run, force)
+        UnixCCompiler.__init__(self, verbose, dry_run, force)
 
-        (status, details) = check_config_h()
+        status, details = check_config_h()
         self.debug_print("Python's GCC status: %s (details: %s)" %
                          (status, details))
         if status is not CONFIG_H_OK:
@@ -153,10 +154,8 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
             # with MSVC 7.0 or later.
             self.dll_libraries = get_msvcr()
 
-    # __init__ ()
-
-
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        """Compiles the source by spawing GCC and windres if needed."""
         if ext == '.rc' or ext == '.res':
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
@@ -170,21 +169,11 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-
+    def link(self, target_desc, objects, output_filename, output_dir=None,
+             libraries=None, library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
+        """Link the objects."""
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
@@ -249,64 +238,44 @@ def link (self,
         if not debug:
             extra_preargs.append("-s")
 
-        UnixCCompiler.link(self,
-                           target_desc,
-                           objects,
-                           output_filename,
-                           output_dir,
-                           libraries,
-                           library_dirs,
+        UnixCCompiler.link(self, target_desc, objects, output_filename,
+                           output_dir, libraries, library_dirs,
                            runtime_library_dirs,
                            None, # export_symbols, we do this in our def-file
-                           debug,
-                           extra_preargs,
-                           extra_postargs,
-                           build_temp,
+                           debug, extra_preargs, extra_postargs, build_temp,
                            target_lang)
 
-    # link ()
-
     # -- Miscellaneous methods -----------------------------------------
 
-    # overwrite the one from CCompiler to support rc and res-files
-    def object_filenames (self,
-                          source_filenames,
-                          strip_dir=0,
-                          output_dir=''):
-        if output_dir is None: output_dir = ''
+    def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
+        """Adds supports for rc and res files."""
+        if output_dir is None:
+            output_dir = ''
         obj_names = []
         for src_name in source_filenames:
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
-            (base, ext) = os.path.splitext (os.path.normcase(src_name))
+            base, ext = os.path.splitext(os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc','.res']):
                 raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % \
-                      (ext, src_name)
+                      "unknown file type '%s' (from '%s')" % (ext, src_name)
             if strip_dir:
                 base = os.path.basename (base)
-            if ext == '.res' or ext == '.rc':
+            if ext in ('.res', '.rc'):
                 # these need to be compiled to object files
-                obj_names.append (os.path.join (output_dir,
-                                            base + ext + self.obj_extension))
+                obj_names.append (os.path.join(output_dir,
+                                              base + ext + self.obj_extension))
             else:
-                obj_names.append (os.path.join (output_dir,
-                                            base + self.obj_extension))
+                obj_names.append (os.path.join(output_dir,
+                                               base + self.obj_extension))
         return obj_names
 
-    # object_filenames ()
-
-# class CygwinCCompiler
-
-
 # the same as cygwin plus some additional parameters
-class Mingw32CCompiler (CygwinCCompiler):
-
+class Mingw32CCompiler(CygwinCCompiler):
+    """ Handles the Mingw32 port of the GNU C compiler to Windows.
+    """
     compiler_type = 'mingw32'
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0):
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
 
@@ -342,10 +311,6 @@ def __init__ (self,
         # with MSVC 7.0 or later.
         self.dll_libraries = get_msvcr()
 
-    # __init__ ()
-
-# class Mingw32CCompiler
-
 # Because these compilers aren't configured in Python's pyconfig.h file by
 # default, we should at least warn the user if he is using a unmodified
 # version.

From 781da5cf0f6777bd12a55daef6ecceddb42b302f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 11 Jun 2009 10:00:56 +0000
Subject: [PATCH 2376/8469] Merged revisions 73354 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73354 | tarek.ziade | 2009-06-11 11:55:09 +0200 (Thu, 11 Jun 2009) | 1 line

  pep8-fied cygwinccompiler module
........
---
 cygwinccompiler.py | 92 +++++++++++++++-------------------------------
 1 file changed, 29 insertions(+), 63 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index a552ffd934..5f3a389e29 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -84,8 +84,9 @@ def get_msvcr():
             raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
-class CygwinCCompiler (UnixCCompiler):
-
+class CygwinCCompiler(UnixCCompiler):
+    """ Handles the Cygwin port of the GNU C compiler to Windows.
+    """
     compiler_type = 'cygwin'
     obj_extension = ".o"
     static_lib_extension = ".a"
@@ -94,11 +95,11 @@ class CygwinCCompiler (UnixCCompiler):
     shared_lib_format = "%s%s"
     exe_extension = ".exe"
 
-    def __init__ (self, verbose=0, dry_run=0, force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0):
 
-        UnixCCompiler.__init__ (self, verbose, dry_run, force)
+        UnixCCompiler.__init__(self, verbose, dry_run, force)
 
-        (status, details) = check_config_h()
+        status, details = check_config_h()
         self.debug_print("Python's GCC status: %s (details: %s)" %
                          (status, details))
         if status is not CONFIG_H_OK:
@@ -153,10 +154,8 @@ def __init__ (self, verbose=0, dry_run=0, force=0):
             # with MSVC 7.0 or later.
             self.dll_libraries = get_msvcr()
 
-    # __init__ ()
-
-
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+        """Compiles the source by spawing GCC and windres if needed."""
         if ext == '.rc' or ext == '.res':
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
@@ -170,21 +169,11 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             except DistutilsExecError as msg:
                 raise CompileError(msg)
 
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-
+    def link(self, target_desc, objects, output_filename, output_dir=None,
+             libraries=None, library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
+        """Link the objects."""
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
@@ -249,63 +238,44 @@ def link (self,
         if not debug:
             extra_preargs.append("-s")
 
-        UnixCCompiler.link(self,
-                           target_desc,
-                           objects,
-                           output_filename,
-                           output_dir,
-                           libraries,
-                           library_dirs,
+        UnixCCompiler.link(self, target_desc, objects, output_filename,
+                           output_dir, libraries, library_dirs,
                            runtime_library_dirs,
                            None, # export_symbols, we do this in our def-file
-                           debug,
-                           extra_preargs,
-                           extra_postargs,
-                           build_temp,
+                           debug, extra_preargs, extra_postargs, build_temp,
                            target_lang)
 
-    # link ()
-
     # -- Miscellaneous methods -----------------------------------------
 
-    # overwrite the one from CCompiler to support rc and res-files
-    def object_filenames (self,
-                          source_filenames,
-                          strip_dir=0,
-                          output_dir=''):
-        if output_dir is None: output_dir = ''
+    def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
+        """Adds supports for rc and res files."""
+        if output_dir is None:
+            output_dir = ''
         obj_names = []
         for src_name in source_filenames:
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
-            (base, ext) = os.path.splitext (os.path.normcase(src_name))
+            base, ext = os.path.splitext(os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc','.res']):
                 raise UnknownFileError("unknown file type '%s' (from '%s')" % \
                       (ext, src_name))
             if strip_dir:
                 base = os.path.basename (base)
-            if ext == '.res' or ext == '.rc':
+            if ext in ('.res', '.rc'):
                 # these need to be compiled to object files
-                obj_names.append (os.path.join (output_dir,
-                                            base + ext + self.obj_extension))
+                obj_names.append (os.path.join(output_dir,
+                                              base + ext + self.obj_extension))
             else:
-                obj_names.append (os.path.join (output_dir,
-                                            base + self.obj_extension))
+                obj_names.append (os.path.join(output_dir,
+                                               base + self.obj_extension))
         return obj_names
 
-    # object_filenames ()
-
-# class CygwinCCompiler
-
-
 # the same as cygwin plus some additional parameters
-class Mingw32CCompiler (CygwinCCompiler):
-
+class Mingw32CCompiler(CygwinCCompiler):
+    """ Handles the Mingw32 port of the GNU C compiler to Windows.
+    """
     compiler_type = 'mingw32'
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0):
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
 
@@ -341,10 +311,6 @@ def __init__ (self,
         # with MSVC 7.0 or later.
         self.dll_libraries = get_msvcr()
 
-    # __init__ ()
-
-# class Mingw32CCompiler
-
 # Because these compilers aren't configured in Python's pyconfig.h file by
 # default, we should at least warn the user if he is using a unmodified
 # version.

From f7d0cca6103fa1de330212ce723836a63d95597f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 12 Jun 2009 17:28:31 +0000
Subject: [PATCH 2377/8469] Support AMD64 in msilib. Set Win64 on reglocator.
 Fixes #6258.

---
 command/bdist_msi.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 52e193eb51..d69c4b690c 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -342,9 +342,14 @@ def add_find_python(self):
             exe_action = "PythonExe" + ver
             target_dir_prop = "TARGETDIR" + ver
             exe_prop = "PYTHON" + ver
+            if msilib.Win64:
+                # type: msidbLocatorTypeRawValue + msidbLocatorType64bit
+                Type = 2+16
+            else:
+                Type = 2
             add_data(self.db, "RegLocator",
-                    [(machine_reg, 2, install_path, None, 2),
-                     (user_reg, 1, install_path, None, 2)])
+                    [(machine_reg, 2, install_path, None, Type),
+                     (user_reg, 1, install_path, None, Type)])
             add_data(self.db, "AppSearch",
                     [(machine_prop, machine_reg),
                      (user_prop, user_reg)])

From 7d083e9637d1f453b3a9226250e0bc44f93ed349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 12 Jun 2009 17:31:41 +0000
Subject: [PATCH 2378/8469] Merged revisions 73390 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73390 | martin.v.loewis | 2009-06-12 19:28:31 +0200 (Fr, 12 Jun 2009) | 3 lines

  Support AMD64 in msilib. Set Win64 on reglocator.
  Fixes #6258.
........
---
 command/bdist_msi.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index bca98cc23e..2e5685f5c4 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -341,9 +341,14 @@ def add_find_python(self):
             exe_action = "PythonExe" + ver
             target_dir_prop = "TARGETDIR" + ver
             exe_prop = "PYTHON" + ver
+            if msilib.Win64:
+                # type: msidbLocatorTypeRawValue + msidbLocatorType64bit
+                Type = 2+16
+            else:
+                Type = 2
             add_data(self.db, "RegLocator",
-                    [(machine_reg, 2, install_path, None, 2),
-                     (user_reg, 1, install_path, None, 2)])
+                    [(machine_reg, 2, install_path, None, Type),
+                     (user_reg, 1, install_path, None, Type)])
             add_data(self.db, "AppSearch",
                     [(machine_prop, machine_reg),
                      (user_prop, user_reg)])

From 8da8bbb79ee7dea376212ba2b74319045dd9c929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 13 Jun 2009 09:07:01 +0000
Subject: [PATCH 2379/8469] Merged revisions 73390 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73390 | martin.v.loewis | 2009-06-12 19:28:31 +0200 (Fr, 12 Jun 2009) | 3 lines

  Support AMD64 in msilib. Set Win64 on reglocator.
  Fixes #6258.
........
---
 command/bdist_msi.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f94d9579d2..da0b30d864 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -282,9 +282,14 @@ def add_find_python(self):
         PYTHON.USER if defined, else from PYTHON.MACHINE.
         PYTHON is PYTHONDIR\python.exe"""
         install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version
+        if msilib.Win64:
+            # type: msidbLocatorTypeRawValue + msidbLocatorType64bit
+            Type = 2+16
+        else:
+            Type = 2
         add_data(self.db, "RegLocator",
-                [("python.machine", 2, install_path, None, 2),
-                 ("python.user", 1, install_path, None, 2)])
+                [("python.machine", 2, install_path, None, Type),
+                 ("python.user", 1, install_path, None, Type)])
         add_data(self.db, "AppSearch",
                 [("PYTHON.MACHINE", "python.machine"),
                  ("PYTHON.USER", "python.user")])

From 3dae7e94d2ac0d05e9cb68e114ee0babb6cc015e Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Jun 2009 13:15:04 +0000
Subject: [PATCH 2380/8469] bump version to 3.1rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 5a5db53272..374ccf50e9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1rc1"
+__version__ = "3.1rc2"
 #--end constants--

From 130d9fa567ab96fcbe027b3fed83b757da8bca7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 15 Jun 2009 23:04:29 +0000
Subject: [PATCH 2381/8469] code cleanup

---
 command/upload.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 74b06283f5..d3066816b4 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,11 +1,6 @@
 """distutils.command.upload
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-
-from distutils.errors import *
-from distutils.core import PyPIRCCommand
-from distutils.spawn import spawn
-from distutils import log
 import sys
 import os
 import socket
@@ -15,12 +10,12 @@
 import urlparse
 import cStringIO as StringIO
 from ConfigParser import ConfigParser
+from hashlib import md5
 
-# this keeps compatibility for 2.3 and 2.4
-if sys.version < "2.5":
-    from md5 import md5
-else:
-    from hashlib import md5
+from distutils.errors import *
+from distutils.core import PyPIRCCommand
+from distutils.spawn import spawn
+from distutils import log
 
 class upload(PyPIRCCommand):
 
@@ -125,7 +120,8 @@ def upload_file(self, command, pyversion, filename):
                                      open(filename+".asc").read())
 
         # set up the authentication
-        auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
+        auth = "Basic " + base64.encodestring(self.username + ":" +
+                                              self.password).strip()
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
@@ -134,10 +130,10 @@ def upload_file(self, command, pyversion, filename):
         body = StringIO.StringIO()
         for key, value in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if not isinstance(value, list):
                 value = [value]
             for value in value:
-                if type(value) is tuple:
+                if isinstance(value, tuple):
                     fn = ';filename="%s"' % value[0]
                     value = value[1]
                 else:

From 8fdd3d8d2ce340eee2ceda407bb9ca8f22e5c58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 15 Jun 2009 23:30:13 +0000
Subject: [PATCH 2382/8469] Issue #6286: distutils upload command now uses
 urllib2

---
 command/upload.py    | 56 +++++++++++++++++++++---------------------
 tests/test_upload.py | 58 ++++++++++++++++++--------------------------
 2 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index d3066816b4..8114feb8f2 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -5,7 +5,7 @@
 import os
 import socket
 import platform
-import httplib
+from urllib2 import urlopen, Request, HTTPError
 import base64
 import urlparse
 import cStringIO as StringIO
@@ -62,6 +62,15 @@ def run(self):
             self.upload_file(command, pyversion, filename)
 
     def upload_file(self, command, pyversion, filename):
+        # Makes sure the repository URL is compliant
+        schema, netloc, url, params, query, fragments = \
+            urlparse.urlparse(self.repository)
+        if params or query or fragments:
+            raise AssertionError("Incompatible url %s" % self.repository)
+
+        if schema not in ('http', 'https'):
+            raise AssertionError("unsupported schema " + schema)
+
         # Sign if requested
         if self.sign:
             gpg_args = ["gpg", "--detach-sign", "-a", filename]
@@ -153,39 +162,30 @@ def upload_file(self, command, pyversion, filename):
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
 
         # build the Request
-        # We can't use urllib2 since we need to send the Basic
-        # auth right with the first request
-        schema, netloc, url, params, query, fragments = \
-            urlparse.urlparse(self.repository)
-        assert not params and not query and not fragments
-        if schema == 'http':
-            http = httplib.HTTPConnection(netloc)
-        elif schema == 'https':
-            http = httplib.HTTPSConnection(netloc)
-        else:
-            raise AssertionError, "unsupported schema "+schema
-
-        data = ''
-        loglevel = log.INFO
+        headers = {'Content-type':
+                        'multipart/form-data; boundary=%s' % boundary,
+                   'Content-length': str(len(body)),
+                   'Authorization': auth}
+
+        request = Request(self.repository, data=body,
+                          headers=headers)
+        # send the data
         try:
-            http.connect()
-            http.putrequest("POST", url)
-            http.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
-            http.putheader('Content-length', str(len(body)))
-            http.putheader('Authorization', auth)
-            http.endheaders()
-            http.send(body)
+            result = urlopen(request)
+            status = result.getcode()
+            reason = result.msg
         except socket.error, e:
             self.announce(str(e), log.ERROR)
             return
+        except HTTPError, e:
+            status = e.code
+            reason = e.msg
 
-        r = http.getresponse()
-        if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
+        if status == 200:
+            self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+            self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, r.read(), '-'*75)
+            self.announce('-'*75, result.read(), '-'*75)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index f57a4a3f33..bbcd80db56 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,8 +2,8 @@
 import sys
 import os
 import unittest
-import httplib
 
+from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
@@ -19,48 +19,37 @@
 [server1]
 username:me
 """
-class Response(object):
-    def __init__(self, status=200, reason='OK'):
-        self.status = status
-        self.reason = reason
 
-class FakeConnection(object):
+class FakeOpen(object):
 
-    def __init__(self):
-        self.requests = []
-        self.headers = []
-        self.body = ''
+    def __init__(self, url):
+        self.url = url
+        if not isinstance(url, str):
+            self.req = url
+        else:
+            self.req = None
+        self.msg = 'OK'
 
-    def __call__(self, netloc):
-        return self
+    def getcode(self):
+        return 200
 
-    def connect(self):
-        pass
-    endheaders = connect
-
-    def putrequest(self, method, url):
-        self.requests.append((method, url))
-
-    def putheader(self, name, value):
-        self.headers.append((name, value))
-
-    def send(self, body):
-        self.body = body
-
-    def getresponse(self):
-        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httplib.HTTPConnection
-        self.conn = httplib.HTTPConnection = FakeConnection()
+        self.old_open = upload_mod.urlopen
+        upload_mod.urlopen = self._urlopen
+        self.last_open = None
 
     def tearDown(self):
-        httplib.HTTPConnection = self.old_class
+        upload_mod.urlopen = self.old_open
         super(uploadTestCase, self).tearDown()
 
+    def _urlopen(self, url):
+        self.last_open = FakeOpen(url)
+        return self.last_open
+
     def test_finalize_options(self):
 
         # new format
@@ -105,12 +94,13 @@ def test_upload(self):
         cmd.run()
 
         # what did we send ?
-        headers = dict(self.conn.headers)
+        headers = dict(self.last_open.req.headers)
         self.assertEquals(headers['Content-length'], '2086')
         self.assert_(headers['Content-type'].startswith('multipart/form-data'))
-
-        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
-        self.assert_('xxx' in self.conn.body)
+        self.assertEquals(self.last_open.req.get_method(), 'POST')
+        self.assertEquals(self.last_open.req.get_full_url(),
+                          'http://pypi.python.org/pypi')
+        self.assert_('xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 5cb388ee6a901dba9802d428eafe4f0a9b5e612a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 16 Jun 2009 08:31:01 +0000
Subject: [PATCH 2383/8469] starting distutils.ccompiler test coverage and
 cleanup

---
 ccompiler.py            | 42 ++++++++++++++++++++---------------------
 tests/test_ccompiler.py | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 tests/test_ccompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index 5a9ff76d67..e093eef2e8 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1217,27 +1217,27 @@ def gen_preprocess_options (macros, include_dirs):
 
     return pp_opts
 
-# gen_preprocess_options ()
 
-
-def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
+def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
-    linking with specific libraries.  'libraries' and 'library_dirs' are,
-    respectively, lists of library names (not filenames!) and search
-    directories.  Returns a list of command-line options suitable for use
-    with some compiler (depending on the two format strings passed in).
+    linking with specific libraries.
+
+    'libraries' and 'library_dirs' are, respectively, lists of library names
+    (not filenames!) and search directories.  Returns a list of command-line
+    options suitable for use with some compiler (depending on the two format
+    strings passed in).
     """
     lib_opts = []
 
     for dir in library_dirs:
-        lib_opts.append (compiler.library_dir_option (dir))
+        lib_opts.append(compiler.library_dir_option(dir))
 
     for dir in runtime_library_dirs:
-        opt = compiler.runtime_library_dir_option (dir)
-        if type(opt) is ListType:
-            lib_opts = lib_opts + opt
+        opt = compiler.runtime_library_dir_option(dir)
+        if isinstance(opt, list):
+            lib_opts.extend(opt)
         else:
-            lib_opts.append (opt)
+            lib_opts.append(opt)
 
     # XXX it's important that we *not* remove redundant library mentions!
     # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to
@@ -1246,17 +1246,15 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     # pretty nasty way to arrange your C code.
 
     for lib in libraries:
-        (lib_dir, lib_name) = os.path.split (lib)
-        if lib_dir:
-            lib_file = compiler.find_library_file ([lib_dir], lib_name)
-            if lib_file:
-                lib_opts.append (lib_file)
+        lib_dir, lib_name = os.path.split(lib)
+        if lib_dir != '':
+            lib_file = compiler.find_library_file([lib_dir], lib_name)
+            if lib_file is not None:
+                lib_opts.append(lib_file)
             else:
-                compiler.warn ("no library file corresponding to "
-                               "'%s' found (skipping)" % lib)
+                compiler.warn("no library file corresponding to "
+                              "'%s' found (skipping)" % lib)
         else:
-            lib_opts.append (compiler.library_option (lib))
+            lib_opts.append(compiler.library_option(lib))
 
     return lib_opts
-
-# gen_lib_options ()
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
new file mode 100644
index 0000000000..58c8c5da40
--- /dev/null
+++ b/tests/test_ccompiler.py
@@ -0,0 +1,37 @@
+"""Tests for distutils.ccompiler."""
+import os
+import unittest
+
+from distutils.ccompiler import gen_lib_options
+
+class FakeCompiler(object):
+    def library_dir_option(self, dir):
+        return "-L" + dir
+
+    def runtime_library_dir_option(self, dir):
+        return ["-cool", "-R" + dir]
+
+    def find_library_file(self, dirs, lib, debug=0):
+        return 'found'
+
+    def library_option(self, lib):
+        return "-l" + lib
+
+class CCompilerTestCase(unittest.TestCase):
+
+    def test_gen_lib_options(self):
+        compiler = FakeCompiler()
+        libdirs = ['lib1', 'lib2']
+        runlibdirs = ['runlib1']
+        libs = [os.path.join('dir', 'name'), 'name2']
+
+        opts = gen_lib_options(compiler, libdirs, runlibdirs, libs)
+        wanted = ['-Llib1', '-Llib2', '-cool', '-Rrunlib1', 'found',
+                  '-lname2']
+        self.assertEquals(opts, wanted)
+
+def test_suite():
+    return unittest.makeSuite(CCompilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 1b8ce2c6b9877396b49639ffed0feca4f18989a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 20 Jun 2009 13:57:20 +0000
Subject: [PATCH 2384/8469] Fixed #6164 AIX specific linker argument in
 Distutils unixcompiler

---
 tests/test_unixccompiler.py |  8 ++++++++
 unixccompiler.py            | 33 +++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 94e9edfc09..96f5454e3e 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -86,6 +86,14 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-R/foo')
 
+        # AIX C/C++ linker
+        sys.platform = 'aix'
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
+
+
 def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
diff --git a/unixccompiler.py b/unixccompiler.py
index 0b1dc4af7d..129ac8cf11 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -288,23 +288,24 @@ def runtime_library_dir_option(self, dir):
             return "+s -L" + dir
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        else:
-            if compiler[:3] == "gcc" or compiler[:3] == "g++":
-                # gcc on non-GNU systems does not need -Wl, but can
-                # use it anyway.  Since distutils has always passed in
-                # -Wl whenever gcc was used in the past it is probably
-                # safest to keep doing so.
-                if sysconfig.get_config_var("GNULD") == "yes":
-                    # GNU ld needs an extra option to get a RUNPATH
-                    # instead of just an RPATH.
-                    return "-Wl,--enable-new-dtags,-R" + dir
-                else:
-                    return "-Wl,-R" + dir
+        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+            # gcc on non-GNU systems does not need -Wl, but can
+            # use it anyway.  Since distutils has always passed in
+            # -Wl whenever gcc was used in the past it is probably
+            # safest to keep doing so.
+            if sysconfig.get_config_var("GNULD") == "yes":
+                # GNU ld needs an extra option to get a RUNPATH
+                # instead of just an RPATH.
+                return "-Wl,--enable-new-dtags,-R" + dir
             else:
-                # No idea how --enable-new-dtags would be passed on to
-                # ld if this system was using GNU ld.  Don't know if a
-                # system like this even exists.
-                return "-R" + dir
+                return "-Wl,-R" + dir
+        elif sys.platform[:3] == "aix":
+            return "-blibpath:" + dir
+        else:
+            # No idea how --enable-new-dtags would be passed on to
+            # ld if this system was using GNU ld.  Don't know if a
+            # system like this even exists.
+            return "-R" + dir
 
     def library_option(self, lib):
         return "-l" + lib

From b7c54cd287ae36a0e91930dd390fbae077b91d85 Mon Sep 17 00:00:00 2001
From: Steven Bethard <steven.bethard@gmail.com>
Date: Sun, 21 Jun 2009 21:03:41 +0000
Subject: [PATCH 2385/8469] Fix memory bug in bdist_msi. (Commit okayed in
 issue6319.)

---
 command/bdist_msi.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index d69c4b690c..7a5ca807a6 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -315,8 +315,7 @@ def add_files(self):
                             key = seen[afile]
                             add_data(self.db, "DuplicateFile",
                                 [(key + version, dir.component, key, None, dir.logical)])
-
-
+            db.Commit()
         cab.commit(db)
 
     def add_find_python(self):

From 358676725f152706531025f7951588a1026f35b6 Mon Sep 17 00:00:00 2001
From: Steven Bethard <steven.bethard@gmail.com>
Date: Sun, 21 Jun 2009 21:07:41 +0000
Subject: [PATCH 2386/8469] Merged revisions 73499 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73499 | steven.bethard | 2009-06-21 17:03:41 -0400 (Sun, 21 Jun 2009) | 1 line

  Fix memory bug in bdist_msi. (Commit okayed in issue6319.)
........
---
 command/bdist_msi.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 2e5685f5c4..c4be47b579 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -314,8 +314,7 @@ def add_files(self):
                             key = seen[afile]
                             add_data(self.db, "DuplicateFile",
                                 [(key + version, dir.component, key, None, dir.logical)])
-
-
+            db.Commit()
         cab.commit(db)
 
     def add_find_python(self):

From 32cbe82d88579474ca58b8e7d099a9b13b876e8c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 26 Jun 2009 13:11:28 +0000
Subject: [PATCH 2387/8469] bump version to 3.1 final :)

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 374ccf50e9..73c77f1fa6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1rc2"
+__version__ = "3.1"
 #--end constants--

From 66e12f773def859e16ea917cd0c03f90f00a43f5 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jun 2009 21:40:27 +0000
Subject: [PATCH 2388/8469] bump to 3.2a0

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 73c77f1fa6..18b02fc629 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1"
+__version__ = "3.2a0"
 #--end constants--

From 94800550afc7760fb7c596a29c7f5f7bc8fa56cb Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Jun 2009 22:03:18 +0000
Subject: [PATCH 2389/8469] version to 3.1.1a0

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 73c77f1fa6..994e91fa29 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1"
+__version__ = "3.1.1a0"
 #--end constants--

From a538be9a7a15f703914e4ca8365d8756f07aa155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 28 Jun 2009 21:10:49 +0000
Subject: [PATCH 2390/8469] Merged revisions 73435 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73435 | tarek.ziade | 2009-06-16 01:04:29 +0200 (Tue, 16 Jun 2009) | 1 line

  code cleanup
........
---
 command/upload.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 3b4a036718..2692377558 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,11 +1,6 @@
 """distutils.command.upload
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-
-from distutils.errors import *
-from distutils.core import PyPIRCCommand
-from distutils.spawn import spawn
-from distutils import log
 import sys
 import os, io
 import socket
@@ -14,12 +9,12 @@
 import http.client as httpclient
 import base64
 import urllib.parse
+from hashlib import md5
 
-# this keeps compatibility for 2.3 and 2.4
-if sys.version < "2.5":
-    from md5 import md5
-else:
-    from hashlib import md5
+from distutils.errors import *
+from distutils.core import PyPIRCCommand
+from distutils.spawn import spawn
+from distutils import log
 
 class upload(PyPIRCCommand):
 
@@ -137,10 +132,10 @@ def upload_file(self, command, pyversion, filename):
         for key, value in data.items():
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if not isinstance(value, list):
                 value = [value]
             for value in value:
-                if type(value) is tuple:
+                if isinstance(value, tuple):
                     title += '; filename="%s"' % value[0]
                     value = value[1]
                 else:

From c25f31bc19447133aaa2eb575b15e3b428eea569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 28 Jun 2009 21:26:27 +0000
Subject: [PATCH 2391/8469] Merged revisions 73436 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73436 | tarek.ziade | 2009-06-16 01:30:13 +0200 (Tue, 16 Jun 2009) | 1 line

  Issue #6286: distutils upload command now uses urllib2
........
---
 command/upload.py    | 60 +++++++++++++++++++++-----------------------
 tests/test_upload.py | 58 ++++++++++++++++++------------------------
 2 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 2692377558..defdda642b 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -5,10 +5,9 @@
 import os, io
 import socket
 import platform
-import configparser
-import http.client as httpclient
+from urllib.request import urlopen, Request, HTTPError
 import base64
-import urllib.parse
+from urllib.parse import urlparse
 from hashlib import md5
 
 from distutils.errors import *
@@ -61,6 +60,15 @@ def run(self):
             self.upload_file(command, pyversion, filename)
 
     def upload_file(self, command, pyversion, filename):
+        # Makes sure the repository URL is compliant
+        schema, netloc, url, params, query, fragments = \
+            urlparse(self.repository)
+        if params or query or fragments:
+            raise AssertionError("Incompatible url %s" % self.repository)
+
+        if schema not in ('http', 'https'):
+            raise AssertionError("unsupported schema " + schema)
+
         # Sign if requested
         if self.sign:
             gpg_args = ["gpg", "--detach-sign", "-a", filename]
@@ -153,40 +161,30 @@ def upload_file(self, command, pyversion, filename):
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
 
         # build the Request
-        # We can't use urllib since we need to send the Basic
-        # auth right with the first request
-        # TODO(jhylton): Can we fix urllib?
-        schema, netloc, url, params, query, fragments = \
-            urllib.parse.urlparse(self.repository)
-        assert not params and not query and not fragments
-        if schema == 'http':
-            http = httpclient.HTTPConnection(netloc)
-        elif schema == 'https':
-            http = httpclient.HTTPSConnection(netloc)
-        else:
-            raise AssertionError("unsupported schema "+schema)
-
-        data = ''
-        loglevel = log.INFO
+        headers = {'Content-type':
+                        'multipart/form-data; boundary=%s' % boundary,
+                   'Content-length': str(len(body)),
+                   'Authorization': auth}
+
+        request = Request(self.repository, data=body,
+                          headers=headers)
+        # send the data
         try:
-            http.connect()
-            http.putrequest("POST", url)
-            http.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
-            http.putheader('Content-length', str(len(body)))
-            http.putheader('Authorization', auth)
-            http.endheaders()
-            http.send(body)
+            result = urlopen(request)
+            status = result.getcode()
+            reason = result.msg
         except socket.error as e:
             self.announce(str(e), log.ERROR)
             return
+        except HTTPError as e:
+            status = e.code
+            reason = e.msg
 
-        r = http.getresponse()
-        if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
+        if status == 200:
+            self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+            self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, r.read(), '-'*75)
+            self.announce('-'*75, result.read(), '-'*75)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 95e4ac3315..aaeaffde1c 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,8 +2,8 @@
 import sys
 import os
 import unittest
-import http.client as httpclient
 
+from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
@@ -19,48 +19,37 @@
 [server1]
 username:me
 """
-class Response(object):
-    def __init__(self, status=200, reason='OK'):
-        self.status = status
-        self.reason = reason
 
-class FakeConnection(object):
+class FakeOpen(object):
 
-    def __init__(self):
-        self.requests = []
-        self.headers = []
-        self.body = ''
+    def __init__(self, url):
+        self.url = url
+        if not isinstance(url, str):
+            self.req = url
+        else:
+            self.req = None
+        self.msg = 'OK'
 
-    def __call__(self, netloc):
-        return self
+    def getcode(self):
+        return 200
 
-    def connect(self):
-        pass
-    endheaders = connect
-
-    def putrequest(self, method, url):
-        self.requests.append((method, url))
-
-    def putheader(self, name, value):
-        self.headers.append((name, value))
-
-    def send(self, body):
-        self.body = body
-
-    def getresponse(self):
-        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httpclient.HTTPConnection
-        self.conn = httpclient.HTTPConnection = FakeConnection()
+        self.old_open = upload_mod.urlopen
+        upload_mod.urlopen = self._urlopen
+        self.last_open = None
 
     def tearDown(self):
-        httpclient.HTTPConnection = self.old_class
+        upload_mod.urlopen = self.old_open
         super(uploadTestCase, self).tearDown()
 
+    def _urlopen(self, url):
+        self.last_open = FakeOpen(url)
+        return self.last_open
+
     def test_finalize_options(self):
 
         # new format
@@ -105,12 +94,13 @@ def test_upload(self):
         cmd.run()
 
         # what did we send ?
-        headers = dict(self.conn.headers)
+        headers = dict(self.last_open.req.headers)
         self.assertEquals(headers['Content-length'], '2087')
         self.assert_(headers['Content-type'].startswith('multipart/form-data'))
-
-        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
-        self.assert_((b'xxx') in self.conn.body)
+        self.assertEquals(self.last_open.req.get_method(), 'POST')
+        self.assertEquals(self.last_open.req.get_full_url(),
+                          'http://pypi.python.org/pypi')
+        self.assert_(b'xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 05df8a008c0f8fdf36a253a815390886eed089e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 28 Jun 2009 21:29:24 +0000
Subject: [PATCH 2392/8469] Merged revisions 73445 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73445 | tarek.ziade | 2009-06-16 10:31:01 +0200 (Tue, 16 Jun 2009) | 1 line

  starting distutils.ccompiler test coverage and cleanup
........
---
 ccompiler.py            | 22 ++++++++++++----------
 tests/test_ccompiler.py | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 tests/test_ccompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index 875f96fac3..ff7f9df1c3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -1151,12 +1151,14 @@ def gen_preprocess_options(macros, include_dirs):
     return pp_opts
 
 
-def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
+def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
-    linking with specific libraries.  'libraries' and 'library_dirs' are,
-    respectively, lists of library names (not filenames!) and search
-    directories.  Returns a list of command-line options suitable for use
-    with some compiler (depending on the two format strings passed in).
+    linking with specific libraries.
+
+    'libraries' and 'library_dirs' are, respectively, lists of library names
+    (not filenames!) and search directories.  Returns a list of command-line
+    options suitable for use with some compiler (depending on the two format
+    strings passed in).
     """
     lib_opts = []
 
@@ -1166,7 +1168,7 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     for dir in runtime_library_dirs:
         opt = compiler.runtime_library_dir_option(dir)
         if isinstance(opt, list):
-            lib_opts = lib_opts + opt
+            lib_opts.extend(opt)
         else:
             lib_opts.append(opt)
 
@@ -1177,14 +1179,14 @@ def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     # pretty nasty way to arrange your C code.
 
     for lib in libraries:
-        (lib_dir, lib_name) = os.path.split(lib)
-        if lib_dir:
+        lib_dir, lib_name = os.path.split(lib)
+        if lib_dir != '':
             lib_file = compiler.find_library_file([lib_dir], lib_name)
-            if lib_file:
+            if lib_file is not None:
                 lib_opts.append(lib_file)
             else:
                 compiler.warn("no library file corresponding to "
                               "'%s' found (skipping)" % lib)
         else:
-            lib_opts.append(compiler.library_option (lib))
+            lib_opts.append(compiler.library_option(lib))
     return lib_opts
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
new file mode 100644
index 0000000000..58c8c5da40
--- /dev/null
+++ b/tests/test_ccompiler.py
@@ -0,0 +1,37 @@
+"""Tests for distutils.ccompiler."""
+import os
+import unittest
+
+from distutils.ccompiler import gen_lib_options
+
+class FakeCompiler(object):
+    def library_dir_option(self, dir):
+        return "-L" + dir
+
+    def runtime_library_dir_option(self, dir):
+        return ["-cool", "-R" + dir]
+
+    def find_library_file(self, dirs, lib, debug=0):
+        return 'found'
+
+    def library_option(self, lib):
+        return "-l" + lib
+
+class CCompilerTestCase(unittest.TestCase):
+
+    def test_gen_lib_options(self):
+        compiler = FakeCompiler()
+        libdirs = ['lib1', 'lib2']
+        runlibdirs = ['runlib1']
+        libs = [os.path.join('dir', 'name'), 'name2']
+
+        opts = gen_lib_options(compiler, libdirs, runlibdirs, libs)
+        wanted = ['-Llib1', '-Llib2', '-cool', '-Rrunlib1', 'found',
+                  '-lname2']
+        self.assertEquals(opts, wanted)
+
+def test_suite():
+    return unittest.makeSuite(CCompilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From d500c02486a30fad1e49244afd7cca46009d0c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 28 Jun 2009 21:30:52 +0000
Subject: [PATCH 2393/8469] Merged revisions 73490 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73490 | tarek.ziade | 2009-06-20 15:57:20 +0200 (Sat, 20 Jun 2009) | 1 line

  Fixed #6164 AIX specific linker argument in Distutils unixcompiler
........
---
 tests/test_unixccompiler.py |  8 ++++++++
 unixccompiler.py            | 33 +++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 94e9edfc09..96f5454e3e 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -86,6 +86,14 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-R/foo')
 
+        # AIX C/C++ linker
+        sys.platform = 'aix'
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
+
+
 def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
diff --git a/unixccompiler.py b/unixccompiler.py
index c11544d828..26d2856ad4 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -286,23 +286,24 @@ def runtime_library_dir_option(self, dir):
             return "+s -L" + dir
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        else:
-            if compiler[:3] == "gcc" or compiler[:3] == "g++":
-                # gcc on non-GNU systems does not need -Wl, but can
-                # use it anyway.  Since distutils has always passed in
-                # -Wl whenever gcc was used in the past it is probably
-                # safest to keep doing so.
-                if sysconfig.get_config_var("GNULD") == "yes":
-                    # GNU ld needs an extra option to get a RUNPATH
-                    # instead of just an RPATH.
-                    return "-Wl,--enable-new-dtags,-R" + dir
-                else:
-                    return "-Wl,-R" + dir
+        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+            # gcc on non-GNU systems does not need -Wl, but can
+            # use it anyway.  Since distutils has always passed in
+            # -Wl whenever gcc was used in the past it is probably
+            # safest to keep doing so.
+            if sysconfig.get_config_var("GNULD") == "yes":
+                # GNU ld needs an extra option to get a RUNPATH
+                # instead of just an RPATH.
+                return "-Wl,--enable-new-dtags,-R" + dir
             else:
-                # No idea how --enable-new-dtags would be passed on to
-                # ld if this system was using GNU ld.  Don't know if a
-                # system like this even exists.
-                return "-R" + dir
+                return "-Wl,-R" + dir
+        elif sys.platform[:3] == "aix":
+            return "-blibpath:" + dir
+        else:
+            # No idea how --enable-new-dtags would be passed on to
+            # ld if this system was using GNU ld.  Don't know if a
+            # system like this even exists.
+            return "-R" + dir
 
     def library_option(self, lib):
         return "-l" + lib

From ae2382ced6b44c8d41fdb6eb3763aa64ac708dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Jun 2009 16:13:39 +0000
Subject: [PATCH 2394/8469] Fixed 6365: wrong inplace location for build_ext if
 the extension had dots

---
 command/build_ext.py    |  8 ++++----
 tests/test_build_ext.py | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 293c214de7..c2c1bf13a3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -643,16 +643,16 @@ def get_ext_fullpath(self, ext_name):
         (inplace option).
         """
         fullname = self.get_ext_fullname(ext_name)
-        filename = self.get_ext_filename(fullname)
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        filename = self.get_ext_filename(base)
         if not self.inplace:
             # no further work needed
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
         # using the build_py command
-        modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
         return os.path.join(package_dir, filename)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 12b8581c97..5f28b799a0 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -339,10 +339,9 @@ def test_get_outputs(self):
         # inplace = 0, cmd.package = 'bar'
         cmd.package = 'bar'
         path = cmd.get_ext_fullpath('foo')
-        # checking that the last directory is bar
+        # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -358,6 +357,19 @@ def test_get_outputs(self):
         lastdir = os.path.split(path)[-1]
         self.assertEquals(lastdir, cmd.package)
 
+    def test_build_ext_inplace(self):
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = build_ext(dist)
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 836436ecd7283a03864110e8aa71505605eb346b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Jun 2009 16:19:22 +0000
Subject: [PATCH 2395/8469] Merged revisions 73688 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73688 | tarek.ziade | 2009-06-29 18:13:39 +0200 (Mon, 29 Jun 2009) | 1 line

  Fixed 6365: wrong inplace location for build_ext if the extension had dots
........
---
 command/build_ext.py    |  8 ++++----
 tests/test_build_ext.py | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 31e036bceb..57a110b0d9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -630,16 +630,16 @@ def get_ext_fullpath(self, ext_name):
         (inplace option).
         """
         fullname = self.get_ext_fullname(ext_name)
-        filename = self.get_ext_filename(fullname)
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        filename = self.get_ext_filename(base)
         if not self.inplace:
             # no further work needed
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
         # using the build_py command
-        modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
         return os.path.join(package_dir, filename)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4ea11a159d..fe6009b617 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -339,10 +339,9 @@ def test_get_outputs(self):
         # inplace = 0, cmd.package = 'bar'
         cmd.package = 'bar'
         path = cmd.get_ext_fullpath('foo')
-        # checking that the last directory is bar
+        # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -358,6 +357,19 @@ def test_get_outputs(self):
         lastdir = os.path.split(path)[-1]
         self.assertEquals(lastdir, cmd.package)
 
+    def test_build_ext_inplace(self):
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = build_ext(dist)
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From fde1516d324741118bd201f845b1b1affc13d757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 29 Jun 2009 16:46:14 +0000
Subject: [PATCH 2396/8469] Merged revisions 73689 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73689 | tarek.ziade | 2009-06-29 18:19:22 +0200 (Mon, 29 Jun 2009) | 9 lines

  Merged revisions 73688 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73688 | tarek.ziade | 2009-06-29 18:13:39 +0200 (Mon, 29 Jun 2009) | 1 line

    Fixed 6365: wrong inplace location for build_ext if the extension had dots
  ........
................
---
 command/build_ext.py    |  8 ++++----
 tests/test_build_ext.py | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 31e036bceb..57a110b0d9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -630,16 +630,16 @@ def get_ext_fullpath(self, ext_name):
         (inplace option).
         """
         fullname = self.get_ext_fullname(ext_name)
-        filename = self.get_ext_filename(fullname)
+        modpath = fullname.split('.')
+        package = '.'.join(modpath[0:-1])
+        base = modpath[-1]
+        filename = self.get_ext_filename(base)
         if not self.inplace:
             # no further work needed
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
         # using the build_py command
-        modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
         return os.path.join(package_dir, filename)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4ea11a159d..fe6009b617 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -339,10 +339,9 @@ def test_get_outputs(self):
         # inplace = 0, cmd.package = 'bar'
         cmd.package = 'bar'
         path = cmd.get_ext_fullpath('foo')
-        # checking that the last directory is bar
+        # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -358,6 +357,19 @@ def test_get_outputs(self):
         lastdir = os.path.split(path)[-1]
         self.assertEquals(lastdir, cmd.package)
 
+    def test_build_ext_inplace(self):
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = build_ext(dist)
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 0b41ce09e9dbf51c0c44d2211982691097de4a0b Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Jun 2009 22:57:08 +0000
Subject: [PATCH 2397/8469] convert usage of fail* to assert*

---
 tests/test_archive_util.py    | 16 ++++++-------
 tests/test_bdist_rpm.py       |  4 ++--
 tests/test_bdist_wininst.py   |  2 +-
 tests/test_build_clib.py      |  2 +-
 tests/test_build_ext.py       | 30 ++++++++++++-------------
 tests/test_build_py.py        |  6 ++---
 tests/test_build_scripts.py   | 10 ++++-----
 tests/test_clean.py           |  2 +-
 tests/test_cmd.py             |  2 +-
 tests/test_config.py          |  4 ++--
 tests/test_config_cmd.py      |  4 ++--
 tests/test_dist.py            | 42 +++++++++++++++++------------------
 tests/test_install.py         | 16 ++++++-------
 tests/test_install_data.py    | 12 +++++-----
 tests/test_install_lib.py     |  6 ++---
 tests/test_install_scripts.py | 14 ++++++------
 tests/test_msvc9compiler.py   |  4 ++--
 tests/test_register.py        | 16 ++++++-------
 tests/test_sysconfig.py       | 12 +++++-----
 tests/test_upload.py          |  4 ++--
 tests/test_util.py            |  4 ++--
 21 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 29cd271faf..91bc4e3d7c 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -47,7 +47,7 @@ def test_make_tarball(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -58,7 +58,7 @@ def test_make_tarball(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     def _tarinfo(self, path):
         tar = tarfile.open(path)
@@ -96,7 +96,7 @@ def test_tarfile_vs_tar(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
@@ -110,7 +110,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
 
-        self.assert_(os.path.exists(tarball2))
+        self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
         self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
 
@@ -123,7 +123,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now for a dry_run
         base_name = os.path.join(tmpdir2, 'archive')
@@ -134,7 +134,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     @unittest.skipUnless(find_executable('compress'),
                          'The compress program is required')
@@ -151,7 +151,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
         # same test with dry_run
@@ -165,7 +165,7 @@ def test_compress_deprecated(self):
                              dry_run=True)
         finally:
             os.chdir(old_dir)
-        self.assert_(not os.path.exists(tarball))
+        self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2d84007f87..c271567542 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -74,7 +74,7 @@ def test_quiet(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
     def test_no_optimize_flag(self):
 
@@ -114,7 +114,7 @@ def test_no_optimize_flag(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index f2cb4fdeba..9b1ba6d107 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -21,7 +21,7 @@ def test_get_exe_bytes(self):
         # and make sure it finds it and returns its content
         # no matter what platform we have
         exe_file = cmd.get_exe_bytes()
-        self.assert_(len(exe_file) > 10)
+        self.assertTrue(len(exe_file) > 10)
 
 def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 47d85cd8b4..536cd67319 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -135,7 +135,7 @@ def test_run(self):
         cmd.run()
 
         # let's check the result
-        self.assert_('libfoo.a' in os.listdir(build_temp))
+        self.assertTrue('libfoo.a' in os.listdir(build_temp))
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5f28b799a0..467e90d94b 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -73,15 +73,15 @@ def test_build_ext(self):
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):
-            self.assert_(hasattr(xx, attr))
+            self.assertTrue(hasattr(xx, attr))
 
         self.assertEquals(xx.foo(2, 5), 7)
         self.assertEquals(xx.foo(13,15), 28)
         self.assertEquals(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
         self.assertEquals(xx.__doc__, doc)
-        self.assert_(isinstance(xx.Null(), xx.Null))
-        self.assert_(isinstance(xx.Str(), xx.Str))
+        self.assertTrue(isinstance(xx.Null(), xx.Null))
+        self.assertTrue(isinstance(xx.Str(), xx.Str))
 
     def tearDown(self):
         # Get everything back to normal
@@ -114,7 +114,7 @@ def test_solaris_enable_shared(self):
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assert_(len(cmd.library_dirs) > 0)
+        self.assertTrue(len(cmd.library_dirs) > 0)
 
     def test_user_site(self):
         # site.USER_SITE was introduced in 2.6
@@ -128,7 +128,7 @@ def test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
@@ -144,9 +144,9 @@ def test_user_site(self):
 
         # see if include_dirs and library_dirs
         # were set
-        self.assert_(lib in cmd.library_dirs)
-        self.assert_(lib in cmd.rpath)
-        self.assert_(incl in cmd.include_dirs)
+        self.assertTrue(lib in cmd.library_dirs)
+        self.assertTrue(lib in cmd.rpath)
+        self.assertTrue(incl in cmd.include_dirs)
 
     def test_optional_extension(self):
 
@@ -175,10 +175,10 @@ def test_finalize_options(self):
 
         from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
-        self.assert_(py_include in cmd.include_dirs)
+        self.assertTrue(py_include in cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assert_(plat_py_include in cmd.include_dirs)
+        self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
@@ -192,7 +192,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assert_('my_lib_dir' in cmd.library_dirs)
+        self.assertTrue('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths
@@ -257,13 +257,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assert_(isinstance(ext, Extension))
+        self.assertTrue(isinstance(ext, Extension))
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
         self.assertEquals(ext.libraries, 'foo')
-        self.assert_(not hasattr(ext, 'some'))
+        self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
@@ -321,7 +321,7 @@ def test_get_outputs(self):
             so_file = cmd.get_outputs()[0]
         finally:
             os.chdir(old_wd)
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
@@ -330,7 +330,7 @@ def test_get_outputs(self):
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 54a4ed80fd..c815d8185e 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -52,9 +52,9 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        self.assert_("__init__.py" in files)
-        self.assert_("__init__.pyc" in files)
-        self.assert_("README.txt" in files)
+        self.assertTrue("__init__.py" in files)
+        self.assertTrue("__init__.pyc" in files)
+        self.assertTrue("README.txt" in files)
 
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b55eb5857b..b1d2d079bd 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -16,12 +16,12 @@ class BuildScriptsTestCase(support.TempdirManager,
 
     def test_default_settings(self):
         cmd = self.get_build_scripts_cmd("/foo/bar", [])
-        self.assert_(not cmd.force)
-        self.assert_(cmd.build_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(cmd.build_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
+        self.assertTrue(cmd.force)
         self.assertEqual(cmd.build_dir, "/foo/bar")
 
     def test_build(self):
@@ -37,7 +37,7 @@ def test_build(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
     def get_build_scripts_cmd(self, target, scripts):
         import sys
@@ -100,7 +100,7 @@ def test_version_int(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
diff --git a/tests/test_clean.py b/tests/test_clean.py
index 3026032712..dbc4ee2a18 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -35,7 +35,7 @@ def test_simple_run(self):
 
         # make sure the files where removed
         for name, path in dirs:
-            self.assert_(not os.path.exists(path),
+            self.assertTrue(not os.path.exists(path),
                          '%s was not removed' % path)
 
         # let's run the command again (should spit warnings but suceed)
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 8f2b36fb1f..d6438b5ea1 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -70,7 +70,7 @@ def test_ensure_string(self):
 
         cmd.option2 = None
         cmd.ensure_string('option2', 'xxx')
-        self.assert_(hasattr(cmd, 'option2'))
+        self.assertTrue(hasattr(cmd, 'option2'))
 
         cmd.option3 = 1
         self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
diff --git a/tests/test_config.py b/tests/test_config.py
index fd778d1ba5..6947275569 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -105,9 +105,9 @@ def test_server_registration(self):
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
-        self.assert_(not os.path.exists(rc))
+        self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
-        self.assert_(os.path.exists(rc))
+        self.assertTrue(os.path.exists(rc))
         content = open(rc).read()
         self.assertEquals(content, WANTED)
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index bacf13a291..ef2e7bc317 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -73,14 +73,14 @@ def test_clean(self):
         self.write_file(f2, 'xxx')
 
         for f in (f1, f2):
-            self.assert_(os.path.exists(f))
+            self.assertTrue(os.path.exists(f))
 
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
         cmd._clean(f1, f2)
 
         for f in (f1, f2):
-            self.assert_(not os.path.exists(f))
+            self.assertTrue(not os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 7ccdd53b79..07f392c4ee 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -73,7 +73,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        self.assert_(isinstance(cmd, test_dist))
+        self.assertTrue(isinstance(cmd, test_dist))
         self.assertEqual(cmd.sample_option, "sometext")
 
     def test_command_packages_configfile(self):
@@ -204,10 +204,10 @@ def test_simple_metadata(self):
                  "version": "1.0"}
         dist = Distribution(attrs)
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.0" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.0" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides(self):
         attrs = {"name": "package",
@@ -219,9 +219,9 @@ def test_provides(self):
         self.assertEqual(dist.get_provides(),
                          ["package", "package.sub"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -239,11 +239,11 @@ def test_requires(self):
         self.assertEqual(dist.get_requires(),
                          ["other", "another (==1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("Requires: other" in meta)
-        self.assert_("Requires: another (==1.0)" in meta)
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("Requires: other" in meta)
+        self.assertTrue("Requires: another (==1.0)" in meta)
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_requires_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -261,11 +261,11 @@ def test_obsoletes(self):
         self.assertEqual(dist.get_obsoletes(),
                          ["other", "another (<1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("Obsoletes: other" in meta)
-        self.assert_("Obsoletes: another (<1.0)" in meta)
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("Obsoletes: other" in meta)
+        self.assertTrue("Obsoletes: another (<1.0)" in meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -299,14 +299,14 @@ def test_custom_pydistutils(self):
             if sys.platform in ('linux', 'darwin'):
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files)
+                self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files,
+                self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
@@ -332,7 +332,7 @@ def test_show_help(self):
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
-        self.assert_(len(output) > 0)
+        self.assertTrue(len(output) > 0)
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/tests/test_install.py b/tests/test_install.py
index 8d7e97227c..d0ad5ce159 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -88,7 +88,7 @@ def _expanduser(path):
 
     def _test_user_site(self):
         for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assert_(key in INSTALL_SCHEMES)
+            self.assertTrue(key in INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
@@ -96,24 +96,24 @@ def _test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
 
         # user base and site shouldn't be created yet
-        self.assert_(not os.path.exists(self.user_base))
-        self.assert_(not os.path.exists(self.user_site))
+        self.assertTrue(not os.path.exists(self.user_base))
+        self.assertTrue(not os.path.exists(self.user_site))
 
         # let's run finalize
         cmd.ensure_finalized()
 
         # now they should
-        self.assert_(os.path.exists(self.user_base))
-        self.assert_(os.path.exists(self.user_site))
+        self.assertTrue(os.path.exists(self.user_base))
+        self.assertTrue(os.path.exists(self.user_site))
 
-        self.assert_('userbase' in cmd.config_vars)
-        self.assert_('usersite' in cmd.config_vars)
+        self.assertTrue('userbase' in cmd.config_vars)
+        self.assertTrue('usersite' in cmd.config_vars)
 
     def test_handle_extra_path(self):
         dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 73c40371d6..7072136792 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -35,9 +35,9 @@ def test_simple_run(self):
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # let's try with warn_dir one
@@ -47,8 +47,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # now using root and empty dir
@@ -65,8 +65,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 4)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
 def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index d768166829..793b95cad6 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -39,8 +39,8 @@ def test_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
@@ -57,7 +57,7 @@ def test_get_outputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_output should return 4 elements
-        self.assert_(len(cmd.get_outputs()) >= 2)
+        self.assertTrue(len(cmd.get_outputs()) >= 2)
 
     def test_get_inputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index fffa6ef2c3..b7eb625ac5 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -23,15 +23,15 @@ def test_default_settings(self):
             skip_build=1,
             )
         cmd = install_scripts(dist)
-        self.assert_(not cmd.force)
-        self.assert_(not cmd.skip_build)
-        self.assert_(cmd.build_dir is None)
-        self.assert_(cmd.install_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(not cmd.skip_build)
+        self.assertTrue(cmd.build_dir is None)
+        self.assertTrue(cmd.install_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
-        self.assert_(cmd.skip_build)
+        self.assertTrue(cmd.force)
+        self.assertTrue(cmd.skip_build)
         self.assertEqual(cmd.build_dir, "/foo/bar")
         self.assertEqual(cmd.install_dir, "/splat/funk")
 
@@ -69,7 +69,7 @@ def write_script(name, text):
 
         installed = os.listdir(target)
         for name in expected:
-            self.assert_(name in installed)
+            self.assertTrue(name in installed)
 
 
 def test_suite():
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 78ce3b7a84..21242a8eb9 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Software\Microsoft\Notepad'
         v = Reg.get_value(path, u"lfitalic")
-        self.assert_(v in (0, 1))
+        self.assertTrue(v in (0, 1))
 
         import _winreg
         HKCU = _winreg.HKEY_CURRENT_USER
@@ -54,7 +54,7 @@ def test_reg_class(self):
         self.assertEquals(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assert_('Notepad' in keys)
+        self.assertTrue('Notepad' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
diff --git a/tests/test_register.py b/tests/test_register.py
index 0c6bf66989..ada77a015a 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -96,7 +96,7 @@ def test_create_pypirc(self):
         cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
-        self.assert_(not os.path.exists(self.rc))
+        self.assertTrue(not os.path.exists(self.rc))
 
         # patching raw_input and getpass.getpass
         # so register gets happy
@@ -115,7 +115,7 @@ def test_create_pypirc(self):
             del register_module.raw_input
 
         # we should have a brand new .pypirc file
-        self.assert_(os.path.exists(self.rc))
+        self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
         content = open(self.rc).read()
@@ -133,13 +133,13 @@ def _no_way(prompt=''):
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assert_(self.conn.reqs, 2)
+        self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
         self.assertEquals(req1['Content-length'], '1374')
         self.assertEquals(req2['Content-length'], '1374')
-        self.assert_('xxx' in self.conn.reqs[1].data)
+        self.assertTrue('xxx' in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
 
@@ -165,11 +165,11 @@ def test_registering(self):
             del register_module.raw_input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '608')
-        self.assert_('tarek' in req.data)
+        self.assertTrue('tarek' in req.data)
 
     def test_password_reset(self):
         # this test runs choice 3
@@ -183,11 +183,11 @@ def test_password_reset(self):
             del register_module.raw_input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '290')
-        self.assert_('tarek' in req.data)
+        self.assertTrue('tarek' in req.data)
 
     def test_strict(self):
         # testing the script option
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 8534881c32..edc8fd8d60 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -21,12 +21,12 @@ def tearDown(self):
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
-        self.assert_(os.path.isfile(config_h), config_h)
+        self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
-        #self.assert_(os.path.isdir(lib_dir), lib_dir)
+        #self.assertTrue(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
@@ -36,14 +36,14 @@ def test_get_python_inc(self):
         # This is not much of a test.  We make sure Python.h exists
         # in the directory returned by get_python_inc() but we don't know
         # it is the correct file.
-        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
-        self.assert_(os.path.isfile(python_h), python_h)
+        self.assertTrue(os.path.isfile(python_h), python_h)
 
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()
-        self.assert_(isinstance(cvars, dict))
-        self.assert_(cvars)
+        self.assertTrue(isinstance(cvars, dict))
+        self.assertTrue(cvars)
 
     def test_customize_compiler(self):
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index bbcd80db56..0d95a0917e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -96,11 +96,11 @@ def test_upload(self):
         # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEquals(headers['Content-length'], '2086')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEquals(self.last_open.req.get_method(), 'POST')
         self.assertEquals(self.last_open.req.get_full_url(),
                           'http://pypi.python.org/pypi')
-        self.assert_('xxx' in self.last_open.req.data)
+        self.assertTrue('xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index cee7d5263b..c0acf5f481 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -225,10 +225,10 @@ def test_strtobool(self):
         no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
 
         for y in yes:
-            self.assert_(strtobool(y))
+            self.assertTrue(strtobool(y))
 
         for n in no:
-            self.assert_(not strtobool(n))
+            self.assertTrue(not strtobool(n))
 
     def test_rfc822_escape(self):
         header = 'I am a\npoor\nlonesome\nheader\n'

From d42774082d0532c78405d5b46f7d9896efcfb7a6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Jun 2009 23:06:06 +0000
Subject: [PATCH 2398/8469] convert old fail* assertions to assert*

---
 tests/test_archive_util.py    | 16 ++++++-------
 tests/test_bdist_rpm.py       |  4 ++--
 tests/test_bdist_wininst.py   |  2 +-
 tests/test_build_clib.py      |  2 +-
 tests/test_build_ext.py       | 30 ++++++++++++-------------
 tests/test_build_py.py        |  6 ++---
 tests/test_build_scripts.py   | 10 ++++-----
 tests/test_clean.py           |  2 +-
 tests/test_cmd.py             |  2 +-
 tests/test_config.py          |  4 ++--
 tests/test_config_cmd.py      |  4 ++--
 tests/test_dist.py            | 42 +++++++++++++++++------------------
 tests/test_install.py         | 16 ++++++-------
 tests/test_install_data.py    | 12 +++++-----
 tests/test_install_lib.py     |  6 ++---
 tests/test_install_scripts.py | 14 ++++++------
 tests/test_msvc9compiler.py   |  4 ++--
 tests/test_register.py        | 16 ++++++-------
 tests/test_sysconfig.py       | 12 +++++-----
 tests/test_upload.py          |  4 ++--
 tests/test_util.py            |  4 ++--
 21 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 663b33532a..d88e0b350d 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -47,7 +47,7 @@ def test_make_tarball(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -58,7 +58,7 @@ def test_make_tarball(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     def _tarinfo(self, path):
         tar = tarfile.open(path)
@@ -96,7 +96,7 @@ def test_tarfile_vs_tar(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
@@ -110,7 +110,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
 
-        self.assert_(os.path.exists(tarball2))
+        self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
         self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
 
@@ -123,7 +123,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now for a dry_run
         base_name = os.path.join(tmpdir2, 'archive')
@@ -134,7 +134,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     @unittest.skipUnless(find_executable('compress'),
                          'The compress program is required')
@@ -151,7 +151,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
         # same test with dry_run
@@ -165,7 +165,7 @@ def test_compress_deprecated(self):
                              dry_run=True)
         finally:
             os.chdir(old_dir)
-        self.assert_(not os.path.exists(tarball))
+        self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2d84007f87..c271567542 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -74,7 +74,7 @@ def test_quiet(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
     def test_no_optimize_flag(self):
 
@@ -114,7 +114,7 @@ def test_no_optimize_flag(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index f2cb4fdeba..9b1ba6d107 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -21,7 +21,7 @@ def test_get_exe_bytes(self):
         # and make sure it finds it and returns its content
         # no matter what platform we have
         exe_file = cmd.get_exe_bytes()
-        self.assert_(len(exe_file) > 10)
+        self.assertTrue(len(exe_file) > 10)
 
 def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 47d85cd8b4..536cd67319 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -135,7 +135,7 @@ def test_run(self):
         cmd.run()
 
         # let's check the result
-        self.assert_('libfoo.a' in os.listdir(build_temp))
+        self.assertTrue('libfoo.a' in os.listdir(build_temp))
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index fe6009b617..08e3e1ff1c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -74,15 +74,15 @@ def test_build_ext(self):
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):
-            self.assert_(hasattr(xx, attr))
+            self.assertTrue(hasattr(xx, attr))
 
         self.assertEquals(xx.foo(2, 5), 7)
         self.assertEquals(xx.foo(13,15), 28)
         self.assertEquals(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
         self.assertEquals(xx.__doc__, doc)
-        self.assert_(isinstance(xx.Null(), xx.Null))
-        self.assert_(isinstance(xx.Str(), xx.Str))
+        self.assertTrue(isinstance(xx.Null(), xx.Null))
+        self.assertTrue(isinstance(xx.Str(), xx.Str))
 
     def tearDown(self):
         # Get everything back to normal
@@ -114,7 +114,7 @@ def test_solaris_enable_shared(self):
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assert_(len(cmd.library_dirs) > 0)
+        self.assertTrue(len(cmd.library_dirs) > 0)
 
     def test_user_site(self):
         # site.USER_SITE was introduced in 2.6
@@ -128,7 +128,7 @@ def test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
@@ -144,9 +144,9 @@ def test_user_site(self):
 
         # see if include_dirs and library_dirs
         # were set
-        self.assert_(lib in cmd.library_dirs)
-        self.assert_(lib in cmd.rpath)
-        self.assert_(incl in cmd.include_dirs)
+        self.assertTrue(lib in cmd.library_dirs)
+        self.assertTrue(lib in cmd.rpath)
+        self.assertTrue(incl in cmd.include_dirs)
 
     def test_optional_extension(self):
 
@@ -175,10 +175,10 @@ def test_finalize_options(self):
 
         from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
-        self.assert_(py_include in cmd.include_dirs)
+        self.assertTrue(py_include in cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assert_(plat_py_include in cmd.include_dirs)
+        self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
@@ -192,7 +192,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assert_('my_lib_dir' in cmd.library_dirs)
+        self.assertTrue('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths
@@ -257,13 +257,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assert_(isinstance(ext, Extension))
+        self.assertTrue(isinstance(ext, Extension))
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
         self.assertEquals(ext.libraries, 'foo')
-        self.assert_(not hasattr(ext, 'some'))
+        self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
@@ -321,7 +321,7 @@ def test_get_outputs(self):
             so_file = cmd.get_outputs()[0]
         finally:
             os.chdir(old_wd)
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
@@ -330,7 +330,7 @@ def test_get_outputs(self):
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 75b6624f5a..8ad3bbc452 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -52,9 +52,9 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        self.assert_("__init__.py" in files)
-        self.assert_("__init__.pyc" in files)
-        self.assert_("README.txt" in files)
+        self.assertTrue("__init__.py" in files)
+        self.assertTrue("__init__.pyc" in files)
+        self.assertTrue("README.txt" in files)
 
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b55eb5857b..b1d2d079bd 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -16,12 +16,12 @@ class BuildScriptsTestCase(support.TempdirManager,
 
     def test_default_settings(self):
         cmd = self.get_build_scripts_cmd("/foo/bar", [])
-        self.assert_(not cmd.force)
-        self.assert_(cmd.build_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(cmd.build_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
+        self.assertTrue(cmd.force)
         self.assertEqual(cmd.build_dir, "/foo/bar")
 
     def test_build(self):
@@ -37,7 +37,7 @@ def test_build(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
     def get_build_scripts_cmd(self, target, scripts):
         import sys
@@ -100,7 +100,7 @@ def test_version_int(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
diff --git a/tests/test_clean.py b/tests/test_clean.py
index 3026032712..dbc4ee2a18 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -35,7 +35,7 @@ def test_simple_run(self):
 
         # make sure the files where removed
         for name, path in dirs:
-            self.assert_(not os.path.exists(path),
+            self.assertTrue(not os.path.exists(path),
                          '%s was not removed' % path)
 
         # let's run the command again (should spit warnings but suceed)
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 8f2b36fb1f..d6438b5ea1 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -70,7 +70,7 @@ def test_ensure_string(self):
 
         cmd.option2 = None
         cmd.ensure_string('option2', 'xxx')
-        self.assert_(hasattr(cmd, 'option2'))
+        self.assertTrue(hasattr(cmd, 'option2'))
 
         cmd.option3 = 1
         self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
diff --git a/tests/test_config.py b/tests/test_config.py
index 0f97cf7a5e..879689d2bb 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -102,9 +102,9 @@ def test_server_registration(self):
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
-        self.assert_(not os.path.exists(rc))
+        self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
-        self.assert_(os.path.exists(rc))
+        self.assertTrue(os.path.exists(rc))
         content = open(rc).read()
         self.assertEquals(content, WANTED)
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index bacf13a291..ef2e7bc317 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -73,14 +73,14 @@ def test_clean(self):
         self.write_file(f2, 'xxx')
 
         for f in (f1, f2):
-            self.assert_(os.path.exists(f))
+            self.assertTrue(os.path.exists(f))
 
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
         cmd._clean(f1, f2)
 
         for f in (f1, f2):
-            self.assert_(not os.path.exists(f))
+            self.assertTrue(not os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 16ef68e962..c031cb85ac 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -72,7 +72,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        self.assert_(isinstance(cmd, test_dist))
+        self.assertTrue(isinstance(cmd, test_dist))
         self.assertEqual(cmd.sample_option, "sometext")
 
     def test_command_packages_configfile(self):
@@ -175,10 +175,10 @@ def test_simple_metadata(self):
                  "version": "1.0"}
         dist = Distribution(attrs)
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.0" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.0" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides(self):
         attrs = {"name": "package",
@@ -190,9 +190,9 @@ def test_provides(self):
         self.assertEqual(dist.get_provides(),
                          ["package", "package.sub"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -210,11 +210,11 @@ def test_requires(self):
         self.assertEqual(dist.get_requires(),
                          ["other", "another (==1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("Requires: other" in meta)
-        self.assert_("Requires: another (==1.0)" in meta)
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("Requires: other" in meta)
+        self.assertTrue("Requires: another (==1.0)" in meta)
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_requires_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -232,11 +232,11 @@ def test_obsoletes(self):
         self.assertEqual(dist.get_obsoletes(),
                          ["other", "another (<1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("Obsoletes: other" in meta)
-        self.assert_("Obsoletes: another (<1.0)" in meta)
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("Obsoletes: other" in meta)
+        self.assertTrue("Obsoletes: another (<1.0)" in meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -270,14 +270,14 @@ def test_custom_pydistutils(self):
             if sys.platform in ('linux', 'darwin'):
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files)
+                self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files,
+                self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
@@ -303,7 +303,7 @@ def test_show_help(self):
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
-        self.assert_(len(output) > 0)
+        self.assertTrue(len(output) > 0)
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/tests/test_install.py b/tests/test_install.py
index 8d7e97227c..d0ad5ce159 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -88,7 +88,7 @@ def _expanduser(path):
 
     def _test_user_site(self):
         for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assert_(key in INSTALL_SCHEMES)
+            self.assertTrue(key in INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
@@ -96,24 +96,24 @@ def _test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
 
         # user base and site shouldn't be created yet
-        self.assert_(not os.path.exists(self.user_base))
-        self.assert_(not os.path.exists(self.user_site))
+        self.assertTrue(not os.path.exists(self.user_base))
+        self.assertTrue(not os.path.exists(self.user_site))
 
         # let's run finalize
         cmd.ensure_finalized()
 
         # now they should
-        self.assert_(os.path.exists(self.user_base))
-        self.assert_(os.path.exists(self.user_site))
+        self.assertTrue(os.path.exists(self.user_base))
+        self.assertTrue(os.path.exists(self.user_site))
 
-        self.assert_('userbase' in cmd.config_vars)
-        self.assert_('usersite' in cmd.config_vars)
+        self.assertTrue('userbase' in cmd.config_vars)
+        self.assertTrue('usersite' in cmd.config_vars)
 
     def test_handle_extra_path(self):
         dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 73c40371d6..7072136792 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -35,9 +35,9 @@ def test_simple_run(self):
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # let's try with warn_dir one
@@ -47,8 +47,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # now using root and empty dir
@@ -65,8 +65,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 4)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
 def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index d768166829..793b95cad6 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -39,8 +39,8 @@ def test_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
@@ -57,7 +57,7 @@ def test_get_outputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_output should return 4 elements
-        self.assert_(len(cmd.get_outputs()) >= 2)
+        self.assertTrue(len(cmd.get_outputs()) >= 2)
 
     def test_get_inputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index fffa6ef2c3..b7eb625ac5 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -23,15 +23,15 @@ def test_default_settings(self):
             skip_build=1,
             )
         cmd = install_scripts(dist)
-        self.assert_(not cmd.force)
-        self.assert_(not cmd.skip_build)
-        self.assert_(cmd.build_dir is None)
-        self.assert_(cmd.install_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(not cmd.skip_build)
+        self.assertTrue(cmd.build_dir is None)
+        self.assertTrue(cmd.install_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
-        self.assert_(cmd.skip_build)
+        self.assertTrue(cmd.force)
+        self.assertTrue(cmd.skip_build)
         self.assertEqual(cmd.build_dir, "/foo/bar")
         self.assertEqual(cmd.install_dir, "/splat/funk")
 
@@ -69,7 +69,7 @@ def write_script(name, text):
 
         installed = os.listdir(target)
         for name in expected:
-            self.assert_(name in installed)
+            self.assertTrue(name in installed)
 
 
 def test_suite():
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 11e5a47630..73827988bb 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Software\Microsoft\Notepad'
         v = Reg.get_value(path, "lfitalic")
-        self.assert_(v in (0, 1))
+        self.assertTrue(v in (0, 1))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
@@ -54,7 +54,7 @@ def test_reg_class(self):
         self.assertEquals(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assert_('Notepad' in keys)
+        self.assertTrue('Notepad' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
diff --git a/tests/test_register.py b/tests/test_register.py
index d9ff3ec441..c03ad10147 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -96,7 +96,7 @@ def test_create_pypirc(self):
         cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
-        self.assert_(not os.path.exists(self.rc))
+        self.assertTrue(not os.path.exists(self.rc))
 
         # patching input and getpass.getpass
         # so register gets happy
@@ -115,7 +115,7 @@ def test_create_pypirc(self):
             del register_module.input
 
         # we should have a brand new .pypirc file
-        self.assert_(os.path.exists(self.rc))
+        self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
         content = open(self.rc).read()
@@ -133,13 +133,13 @@ def _no_way(prompt=''):
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assert_(self.conn.reqs, 2)
+        self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
         self.assertEquals(req1['Content-length'], '1374')
         self.assertEquals(req2['Content-length'], '1374')
-        self.assert_((b'xxx') in self.conn.reqs[1].data)
+        self.assertTrue((b'xxx') in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
 
@@ -165,11 +165,11 @@ def test_registering(self):
             del register_module.input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '608')
-        self.assert_((b'tarek') in req.data)
+        self.assertTrue((b'tarek') in req.data)
 
     def test_password_reset(self):
         # this test runs choice 3
@@ -183,11 +183,11 @@ def test_password_reset(self):
             del register_module.input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '290')
-        self.assert_((b'tarek') in req.data)
+        self.assertTrue((b'tarek') in req.data)
 
     def test_strict(self):
         # testing the script option
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 2d8fa2710e..eb36204439 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -21,12 +21,12 @@ def tearDown(self):
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
-        self.assert_(os.path.isfile(config_h), config_h)
+        self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
-        #self.assert_(os.path.isdir(lib_dir), lib_dir)
+        #self.assertTrue(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
@@ -36,14 +36,14 @@ def test_get_python_inc(self):
         # This is not much of a test.  We make sure Python.h exists
         # in the directory returned by get_python_inc() but we don't know
         # it is the correct file.
-        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
-        self.assert_(os.path.isfile(python_h), python_h)
+        self.assertTrue(os.path.isfile(python_h), python_h)
 
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()
-        self.assert_(isinstance(cvars, dict))
-        self.assert_(cvars)
+        self.assertTrue(isinstance(cvars, dict))
+        self.assertTrue(cvars)
 
     def test_customize_compiler(self):
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index aaeaffde1c..9281885876 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -96,11 +96,11 @@ def test_upload(self):
         # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEquals(headers['Content-length'], '2087')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEquals(self.last_open.req.get_method(), 'POST')
         self.assertEquals(self.last_open.req.get_full_url(),
                           'http://pypi.python.org/pypi')
-        self.assert_(b'xxx' in self.last_open.req.data)
+        self.assertTrue(b'xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index cee7d5263b..c0acf5f481 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -225,10 +225,10 @@ def test_strtobool(self):
         no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
 
         for y in yes:
-            self.assert_(strtobool(y))
+            self.assertTrue(strtobool(y))
 
         for n in no:
-            self.assert_(not strtobool(n))
+            self.assertTrue(not strtobool(n))
 
     def test_rfc822_escape(self):
         header = 'I am a\npoor\nlonesome\nheader\n'

From b9706d78715b6195bb26fdf1e7f24715b9bcd56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 2 Jul 2009 12:47:54 +0000
Subject: [PATCH 2399/8469] raising bdist_dumb test coverage

---
 tests/test_bdist_dumb.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index d2ea201bd4..b28f89f5a5 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -71,6 +71,21 @@ def test_simple_built(self):
         # now let's check what we have in the zip file
         # XXX to be done
 
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        os.chdir(pkg_dir)
+        cmd = bdist_dumb(dist)
+        self.assertEquals(cmd.bdist_dir, None)
+        cmd.finalize_options()
+
+        # bdist_dir is initialized to bdist_base/dumb if not set
+        base = cmd.get_finalized_command('bdist').bdist_base
+        self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb'))
+
+        # the format is set to a default value depending on the os.name
+        default = cmd.default_format[os.name]
+        self.assertEquals(cmd.format, default)
+
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 

From 3eb63e2496e541c94db37e4d73a75cbd372be657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 2 Jul 2009 12:51:56 +0000
Subject: [PATCH 2400/8469] cleaned up the bdist_dumb module

---
 command/bdist_dumb.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 7324c6c2fa..3ab0330f83 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -7,16 +7,17 @@
 __revision__ = "$Id$"
 
 import os
+
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError
 from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb (Command):
 
-    description = "create a \"dumb\" built distribution"
+    description = 'create a "dumb" built distribution'
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
@@ -53,11 +54,7 @@ def initialize_options (self):
         self.skip_build = 0
         self.relative = 0
 
-    # initialize_options()
-
-
-    def finalize_options (self):
-
+    def finalize_options(self):
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'dumb')
@@ -74,11 +71,7 @@ def finalize_options (self):
                                    ('dist_dir', 'dist_dir'),
                                    ('plat_name', 'plat_name'))
 
-    # finalize_options()
-
-
     def run (self):
-
         if not self.skip_build:
             self.run_command('build')
 
@@ -127,7 +120,3 @@ def run (self):
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
-
-    # run()
-
-# class bdist_dumb

From edea35d83e5b65b14a035dd01253f502a29c62d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 2 Jul 2009 13:02:21 +0000
Subject: [PATCH 2401/8469] Merged revisions 73756-73757 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73756 | tarek.ziade | 2009-07-02 14:47:54 +0200 (Thu, 02 Jul 2009) | 1 line

  raising bdist_dumb test coverage
........
  r73757 | tarek.ziade | 2009-07-02 14:51:56 +0200 (Thu, 02 Jul 2009) | 1 line

  cleaned up the bdist_dumb module
........
---
 command/bdist_dumb.py    |  5 +++--
 tests/test_bdist_dumb.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 2d39922672..63c0a47537 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -7,16 +7,17 @@
 __revision__ = "$Id$"
 
 import os
+
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError
 from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb(Command):
 
-    description = "create a \"dumb\" built distribution"
+    description = 'create a "dumb" built distribution'
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index d2ea201bd4..b28f89f5a5 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -71,6 +71,21 @@ def test_simple_built(self):
         # now let's check what we have in the zip file
         # XXX to be done
 
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        os.chdir(pkg_dir)
+        cmd = bdist_dumb(dist)
+        self.assertEquals(cmd.bdist_dir, None)
+        cmd.finalize_options()
+
+        # bdist_dir is initialized to bdist_base/dumb if not set
+        base = cmd.get_finalized_command('bdist').bdist_base
+        self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb'))
+
+        # the format is set to a default value depending on the os.name
+        default = cmd.default_format[os.name]
+        self.assertEquals(cmd.format, default)
+
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 

From d25aae0db2d96401cf8e3471d594dccf1a3b025c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 2 Jul 2009 14:20:47 +0000
Subject: [PATCH 2402/8469] pep8-fied and cleaned up distutils.util

---
 util.py | 142 ++++++++++++++++++++++++++------------------------------
 1 file changed, 67 insertions(+), 75 deletions(-)

diff --git a/util.py b/util.py
index e9d29ff49c..5bbbf22560 100644
--- a/util.py
+++ b/util.py
@@ -12,9 +12,10 @@
 from distutils.spawn import spawn
 from distutils import log
 
-def get_platform ():
-    """Return a string that identifies the current platform.  This is used
-    mainly to distinguish platform-specific build directories and
+def get_platform():
+    """Return a string that identifies the current platform.
+
+    This is used mainly to distinguish platform-specific build directories and
     platform-specific built distributions.  Typically includes the OS name
     and version and the architecture (as supplied by 'os.uname()'),
     although the exact information included depends on the OS; eg. for IRIX
@@ -39,14 +40,14 @@ def get_platform ():
     if os.name == 'nt':
         # sniff sys.version for architecture.
         prefix = " bit ("
-        i = string.find(sys.version, prefix)
+        i = sys.version.find(prefix)
         if i == -1:
             return sys.platform
-        j = string.find(sys.version, ")", i)
+        j = sys.version.find(")", i)
         look = sys.version[i+len(prefix):j].lower()
-        if look=='amd64':
+        if look == 'amd64':
             return 'win-amd64'
-        if look=='itanium':
+        if look == 'itanium':
             return 'win-ia64'
         return sys.platform
 
@@ -61,10 +62,9 @@ def get_platform ():
 
     # Convert the OS name to lowercase, remove '/' characters
     # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
-    osname = string.lower(osname)
-    osname = string.replace(osname, '/', '')
-    machine = string.replace(machine, ' ', '_')
-    machine = string.replace(machine, '/', '-')
+    osname = osname.lower().replace('/', '')
+    machine = machine.replace(' ', '_')
+    machine = machine.replace('/', '-')
 
     if osname[:5] == "linux":
         # At least on Linux/Intel, 'machine' is the processor --
@@ -154,11 +154,10 @@ def get_platform ():
 
     return "%s-%s-%s" % (osname, release, machine)
 
-# get_platform ()
 
+def convert_path(pathname):
+    """Return 'pathname' as a name that will work on the native filesystem.
 
-def convert_path (pathname):
-    """Return 'pathname' as a name that will work on the native filesystem,
     i.e. split it on '/' and put it back together again using the current
     directory separator.  Needed because filenames in the setup script are
     always supplied in Unix style, and have to be converted to the local
@@ -171,23 +170,23 @@ def convert_path (pathname):
     if not pathname:
         return pathname
     if pathname[0] == '/':
-        raise ValueError, "path '%s' cannot be absolute" % pathname
+        raise ValueError("path '%s' cannot be absolute" % pathname)
     if pathname[-1] == '/':
-        raise ValueError, "path '%s' cannot end with '/'" % pathname
+        raise ValueError("path '%s' cannot end with '/'" % pathname)
 
-    paths = string.split(pathname, '/')
+    paths = pathname.split('/')
     while '.' in paths:
         paths.remove('.')
     if not paths:
         return os.curdir
-    return apply(os.path.join, paths)
+    return os.path.join(*paths)
 
-# convert_path ()
 
+def change_root(new_root, pathname):
+    """Return 'pathname' with 'new_root' prepended.
 
-def change_root (new_root, pathname):
-    """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
-    relative, this is equivalent to "os.path.join(new_root,pathname)".
+    If 'pathname' is relative, this is equivalent to
+    "os.path.join(new_root,pathname)".
     Otherwise, it requires making 'pathname' relative and then joining the
     two, which is tricky on DOS/Windows and Mac OS.
     """
@@ -214,19 +213,20 @@ def change_root (new_root, pathname):
             return os.path.join(new_root, pathname)
         else:
             # Chop off volume name from start of path
-            elements = string.split(pathname, ":", 1)
+            elements = pathname.split(":", 1)
             pathname = ":" + elements[1]
             return os.path.join(new_root, pathname)
 
     else:
-        raise DistutilsPlatformError, \
-              "nothing known about platform '%s'" % os.name
-
+        raise DistutilsPlatformError("nothing known about "
+                                     "platform '%s'" % os.name)
 
 _environ_checked = 0
-def check_environ ():
-    """Ensure that 'os.environ' has all the environment variables we
-    guarantee that users can use in config files, command-line options,
+
+def check_environ():
+    """Ensure that 'os.environ' has all the environment variables needed.
+
+    We guarantee that users can use in config files, command-line options,
     etc.  Currently this includes:
       HOME - user's home directory (Unix only)
       PLAT - description of the current platform, including hardware
@@ -245,10 +245,10 @@ def check_environ ():
 
     _environ_checked = 1
 
+def subst_vars(s, local_vars):
+    """Perform shell/Perl-style variable substitution on 'string'.
 
-def subst_vars (s, local_vars):
-    """Perform shell/Perl-style variable substitution on 'string'.  Every
-    occurrence of '$' followed by a name is considered a variable, and
+    Every occurrence of '$' followed by a name is considered a variable, and
     variable is substituted by the value found in the 'local_vars'
     dictionary, or in 'os.environ' if it's not in 'local_vars'.
     'os.environ' is first checked/augmented to guarantee that it contains
@@ -266,14 +266,13 @@ def _subst (match, local_vars=local_vars):
     try:
         return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
     except KeyError, var:
-        raise ValueError, "invalid variable '$%s'" % var
-
-# subst_vars ()
+        raise ValueError("invalid variable '$%s'" % var)
 
+def grok_environment_error(exc, prefix="error: "):
+    """Generate a useful error message from an EnvironmentError.
 
-def grok_environment_error (exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError (IOError or
-    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
+    This will generate an IOError or an OSError exception object.
+    Handles Python 1.5.1 and 1.5.2 styles, and
     does what it can to deal with exception objects that don't have a
     filename (which happens when the error is due to a two-file operation,
     such as 'rename()' or 'link()'.  Returns the error message as a string
@@ -292,18 +291,20 @@ def grok_environment_error (exc, prefix="error: "):
 
     return error
 
-
 # Needed by 'split_quoted()'
 _wordchars_re = _squote_re = _dquote_re = None
+
 def _init_regex():
     global _wordchars_re, _squote_re, _dquote_re
     _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
     _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
     _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
-def split_quoted (s):
+def split_quoted(s):
     """Split a string up according to Unix shell-like rules for quotes and
-    backslashes.  In short: words are delimited by spaces, as long as those
+    backslashes.
+
+    In short: words are delimited by spaces, as long as those
     spaces are not escaped by a backslash, or inside a quoted string.
     Single and double quotes are equivalent, and the quote characters can
     be backslash-escaped.  The backslash is stripped from any two-character
@@ -311,13 +312,12 @@ def split_quoted (s):
     characters are stripped from any quoted string.  Returns a list of
     words.
     """
-
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
     if _wordchars_re is None: _init_regex()
 
-    s = string.strip(s)
+    s = s.strip()
     words = []
     pos = 0
 
@@ -330,7 +330,7 @@ def split_quoted (s):
 
         if s[end] in string.whitespace: # unescaped, unquoted whitespace: now
             words.append(s[:end])       # we definitely have a word delimiter
-            s = string.lstrip(s[end:])
+            s = s[end:].lstrip()
             pos = 0
 
         elif s[end] == '\\':            # preserve whatever is being escaped;
@@ -344,12 +344,11 @@ def split_quoted (s):
             elif s[end] == '"':         # slurp doubly-quoted string
                 m = _dquote_re.match(s, end)
             else:
-                raise RuntimeError, \
-                      "this can't happen (bad char '%c')" % s[end]
+                raise RuntimeError("this can't happen "
+                                   "(bad char '%c')" % s[end])
 
             if m is None:
-                raise ValueError, \
-                      "bad string (mismatched %s quotes?)" % s[end]
+                raise ValueError("bad string (mismatched %s quotes?)" % s[end])
 
             (beg, end) = m.span()
             s = s[:beg] + s[beg+1:end-1] + s[end:]
@@ -361,13 +360,12 @@ def split_quoted (s):
 
     return words
 
-# split_quoted ()
 
+def execute(func, args, msg=None, verbose=0, dry_run=0):
+    """Perform some action that affects the outside world.
 
-def execute (func, args, msg=None, verbose=0, dry_run=0):
-    """Perform some action that affects the outside world (eg.  by
-    writing to the filesystem).  Such actions are special because they
-    are disabled by the 'dry_run' flag.  This method takes care of all
+    eg. by writing to the filesystem).  Such actions are special because
+    they are disabled by the 'dry_run' flag.  This method takes care of all
     that bureaucracy for you; all you have to do is supply the
     function to call and an argument tuple for it (to embody the
     "external action" being performed), and an optional message to
@@ -380,17 +378,17 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
 
     log.info(msg)
     if not dry_run:
-        apply(func, args)
+        func(*args)
 
 
-def strtobool (val):
+def strtobool(val):
     """Convert a string representation of truth to true (1) or false (0).
 
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
     are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
     'val' is anything else.
     """
-    val = string.lower(val)
+    val = val.lower()
     if val in ('y', 'yes', 't', 'true', 'on', '1'):
         return 1
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
@@ -399,15 +397,13 @@ def strtobool (val):
         raise ValueError, "invalid truth value %r" % (val,)
 
 
-def byte_compile (py_files,
-                  optimize=0, force=0,
-                  prefix=None, base_dir=None,
-                  verbose=1, dry_run=0,
-                  direct=None):
+def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
+                  verbose=1, dry_run=0, direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.  'py_files' is a list of files
-    to compile; any files that don't end in ".py" are silently skipped.
-    'optimize' must be one of the following:
+    or .pyo files in the same directory.
+
+    'py_files' is a list of files to compile; any files that don't end in
+    ".py" are silently skipped. 'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
@@ -432,7 +428,6 @@ def byte_compile (py_files,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
-
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative
     # approach: choose direct mode *only* if the current interpreter is
@@ -481,7 +476,7 @@ def byte_compile (py_files,
             #if prefix:
             #    prefix = os.path.abspath(prefix)
 
-            script.write(string.join(map(repr, py_files), ",\n") + "]\n")
+            script.write(",\n".join(map(repr, py_files)) + "]\n")
             script.write("""
 byte_compile(files, optimize=%r, force=%r,
              prefix=%r, base_dir=%r,
@@ -520,9 +515,8 @@ def byte_compile (py_files,
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:
-                    raise ValueError, \
-                          ("invalid prefix: filename %r doesn't start with %r"
-                           % (file, prefix))
+                    raise ValueError("invalid prefix: filename %r doesn't "
+                                     "start with %r" % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
                 dfile = os.path.join(base_dir, dfile)
@@ -537,13 +531,11 @@ def byte_compile (py_files,
                     log.debug("skipping byte-compilation of %s to %s",
                               file, cfile_base)
 
-# byte_compile ()
 
-def rfc822_escape (header):
+def rfc822_escape(header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = string.split(header, '\n')
-    lines = map(string.strip, lines)
-    header = string.join(lines, '\n' + 8*' ')
-    return header
+    lines = [x.strip() for x in header.split('\n')]
+    sep = '\n' + 8*' '
+    return sep.join(lines)

From 21d1447442999782252d6c7942348cea9ca4240e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 2 Jul 2009 14:25:23 +0000
Subject: [PATCH 2403/8469] Merged revisions 73762 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73762 | tarek.ziade | 2009-07-02 16:20:47 +0200 (Thu, 02 Jul 2009) | 1 line

  pep8-fied and cleaned up distutils.util
........
---
 util.py | 89 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/util.py b/util.py
index 4c1956a2b8..ad7ae08d76 100644
--- a/util.py
+++ b/util.py
@@ -12,9 +12,10 @@
 from distutils.spawn import spawn
 from distutils import log
 
-def get_platform ():
-    """Return a string that identifies the current platform.  This is used
-    mainly to distinguish platform-specific build directories and
+def get_platform():
+    """Return a string that identifies the current platform.
+
+    This is used mainly to distinguish platform-specific build directories and
     platform-specific built distributions.  Typically includes the OS name
     and version and the architecture (as supplied by 'os.uname()'),
     although the exact information included depends on the OS; eg. for IRIX
@@ -153,11 +154,10 @@ def get_platform ():
 
     return "%s-%s-%s" % (osname, release, machine)
 
-# get_platform ()
 
+def convert_path(pathname):
+    """Return 'pathname' as a name that will work on the native filesystem.
 
-def convert_path (pathname):
-    """Return 'pathname' as a name that will work on the native filesystem,
     i.e. split it on '/' and put it back together again using the current
     directory separator.  Needed because filenames in the setup script are
     always supplied in Unix style, and have to be converted to the local
@@ -181,12 +181,12 @@ def convert_path (pathname):
         return os.curdir
     return os.path.join(*paths)
 
-# convert_path ()
 
+def change_root(new_root, pathname):
+    """Return 'pathname' with 'new_root' prepended.
 
-def change_root (new_root, pathname):
-    """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
-    relative, this is equivalent to "os.path.join(new_root,pathname)".
+    If 'pathname' is relative, this is equivalent to
+    "os.path.join(new_root,pathname)".
     Otherwise, it requires making 'pathname' relative and then joining the
     two, which is tricky on DOS/Windows and Mac OS.
     """
@@ -218,13 +218,15 @@ def change_root (new_root, pathname):
             return os.path.join(new_root, pathname)
 
     else:
-        raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
-
+        raise DistutilsPlatformError("nothing known about "
+                                     "platform '%s'" % os.name)
 
 _environ_checked = 0
-def check_environ ():
-    """Ensure that 'os.environ' has all the environment variables we
-    guarantee that users can use in config files, command-line options,
+
+def check_environ():
+    """Ensure that 'os.environ' has all the environment variables needed.
+
+    We guarantee that users can use in config files, command-line options,
     etc.  Currently this includes:
       HOME - user's home directory (Unix only)
       PLAT - description of the current platform, including hardware
@@ -243,10 +245,10 @@ def check_environ ():
 
     _environ_checked = 1
 
+def subst_vars(s, local_vars):
+    """Perform shell/Perl-style variable substitution on 'string'.
 
-def subst_vars (s, local_vars):
-    """Perform shell/Perl-style variable substitution on 'string'.  Every
-    occurrence of '$' followed by a name is considered a variable, and
+    Every occurrence of '$' followed by a name is considered a variable, and
     variable is substituted by the value found in the 'local_vars'
     dictionary, or in 'os.environ' if it's not in 'local_vars'.
     'os.environ' is first checked/augmented to guarantee that it contains
@@ -266,12 +268,11 @@ def _subst (match, local_vars=local_vars):
     except KeyError as var:
         raise ValueError("invalid variable '$%s'" % var)
 
-# subst_vars ()
-
+def grok_environment_error(exc, prefix="error: "):
+    """Generate a useful error message from an EnvironmentError.
 
-def grok_environment_error (exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError (IOError or
-    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
+    This will generate an IOError or an OSError exception object.
+    Handles Python 1.5.1 and 1.5.2 styles, and
     does what it can to deal with exception objects that don't have a
     filename (which happens when the error is due to a two-file operation,
     such as 'rename()' or 'link()'.  Returns the error message as a string
@@ -290,18 +291,20 @@ def grok_environment_error (exc, prefix="error: "):
 
     return error
 
-
 # Needed by 'split_quoted()'
 _wordchars_re = _squote_re = _dquote_re = None
+
 def _init_regex():
     global _wordchars_re, _squote_re, _dquote_re
     _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
     _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
     _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
-def split_quoted (s):
+def split_quoted(s):
     """Split a string up according to Unix shell-like rules for quotes and
-    backslashes.  In short: words are delimited by spaces, as long as those
+    backslashes.
+
+    In short: words are delimited by spaces, as long as those
     spaces are not escaped by a backslash, or inside a quoted string.
     Single and double quotes are equivalent, and the quote characters can
     be backslash-escaped.  The backslash is stripped from any two-character
@@ -309,7 +312,6 @@ def split_quoted (s):
     characters are stripped from any quoted string.  Returns a list of
     words.
     """
-
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
@@ -357,13 +359,12 @@ def split_quoted (s):
 
     return words
 
-# split_quoted ()
 
+def execute(func, args, msg=None, verbose=0, dry_run=0):
+    """Perform some action that affects the outside world.
 
-def execute (func, args, msg=None, verbose=0, dry_run=0):
-    """Perform some action that affects the outside world (eg.  by
-    writing to the filesystem).  Such actions are special because they
-    are disabled by the 'dry_run' flag.  This method takes care of all
+    eg. by writing to the filesystem).  Such actions are special because
+    they are disabled by the 'dry_run' flag.  This method takes care of all
     that bureaucracy for you; all you have to do is supply the
     function to call and an argument tuple for it (to embody the
     "external action" being performed), and an optional message to
@@ -379,7 +380,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
         func(*args)
 
 
-def strtobool (val):
+def strtobool(val):
     """Convert a string representation of truth to true (1) or false (0).
 
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
@@ -395,15 +396,13 @@ def strtobool (val):
         raise ValueError("invalid truth value %r" % (val,))
 
 
-def byte_compile (py_files,
-                  optimize=0, force=0,
-                  prefix=None, base_dir=None,
-                  verbose=1, dry_run=0,
-                  direct=None):
+def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
+                  verbose=1, dry_run=0, direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.  'py_files' is a list of files
-    to compile; any files that don't end in ".py" are silently skipped.
-    'optimize' must be one of the following:
+    or .pyo files in the same directory.
+
+    'py_files' is a list of files to compile; any files that don't end in
+    ".py" are silently skipped. 'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
@@ -428,7 +427,6 @@ def byte_compile (py_files,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
-
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative
     # approach: choose direct mode *only* if the current interpreter is
@@ -516,8 +514,8 @@ def byte_compile (py_files,
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:
-                    raise ValueError("invalid prefix: filename %r doesn't start with %r"
-                           % (file, prefix))
+                    raise ValueError("invalid prefix: filename %r doesn't "
+                                     "start with %r" % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
                 dfile = os.path.join(base_dir, dfile)
@@ -532,9 +530,8 @@ def byte_compile (py_files,
                     log.debug("skipping byte-compilation of %s to %s",
                               file, cfile_base)
 
-# byte_compile ()
 
-def rfc822_escape (header):
+def rfc822_escape(header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """

From 414e03b9816532270f3f29a4f1777c9e8e67804c Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Thu, 2 Jul 2009 15:37:21 +0000
Subject: [PATCH 2404/8469] Merged revisions 69846 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69846 | mark.dickinson | 2009-02-21 21:27:01 +0100 (Sat, 21 Feb 2009) | 2 lines

  Issue #5341: Fix a variety of spelling errors.
........
---
 tests/test_core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 55d2d5df7e..e481e8de39 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -57,7 +57,7 @@ def test_run_setup_provides_file(self):
 
     def test_run_setup_uses_current_dir(self):
         # This tests that the setup script is run with the current directory
-        # as it's own current directory; this was temporarily broken by a
+        # as its own current directory; this was temporarily broken by a
         # previous patch when TESTFN did not use the current directory.
         sys.stdout = StringIO.StringIO()
         cwd = os.getcwd()

From 0884202338406bd0e3978c9ec4de6e9cd872ad2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 08:22:56 +0000
Subject: [PATCH 2405/8469] Fixed #6403 : package path usage for build_ext

---
 command/build_ext.py    | 14 ++++++++++----
 tests/test_build_ext.py | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c2c1bf13a3..96bd68be4c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -644,17 +644,23 @@ def get_ext_fullpath(self, ext_name):
         """
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
-        filename = self.get_ext_filename(base)
+        filename = self.get_ext_filename(modpath[-1])
+
         if not self.inplace:
             # no further work needed
+            # returning :
+            #   build_dir/package/path/filename
+            filename = os.path.join(*modpath[:-1]+[filename])
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
-        # using the build_py command
+        # using the build_py command for that
+        package = '.'.join(modpath[0:-1])
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
+
+        # returning
+        #   package_dir/filename
         return os.path.join(package_dir, filename)
 
     def get_ext_fullname(self, ext_name):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 467e90d94b..2ecead3c0d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -337,7 +337,8 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
-        cmd.package = 'bar'
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {'': 'bar'}
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
@@ -355,12 +356,14 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(lastdir, 'bar')
 
-    def test_build_ext_inplace(self):
-        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
-        etree_ext = Extension('lxml.etree', [etree_c])
-        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+    def test_ext_fullpath(self):
+        # building lxml.etree inplace
+        #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        #etree_ext = Extension('lxml.etree', [etree_c])
+        #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        dist = Distribution()
         cmd = build_ext(dist)
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
@@ -370,6 +373,28 @@ def test_build_ext_inplace(self):
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
+        # building lxml.etree not inplace
+        cmd.inplace = 0
+        cmd.build_lib = os.path.join(curdir, 'tmpdir')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap not inplace
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {}
+        cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
+                              'portmap.so')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap inplace
+        cmd.inplace = 1
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 8fde737bb947b2fe9b75f686d606b5cee236b317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 08:31:31 +0000
Subject: [PATCH 2406/8469] Merged revisions 73790 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73790 | tarek.ziade | 2009-07-03 10:22:56 +0200 (Fri, 03 Jul 2009) | 1 line

  Fixed #6403 : package path usage for build_ext
........
---
 command/build_ext.py    | 13 +++++++++++--
 tests/test_build_ext.py | 43 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index e6e33ab95c..8cb1efe67e 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -629,18 +629,27 @@ def get_ext_fullpath(self, ext_name):
         (inplace option).
         """
         fullname = self.get_ext_fullname(ext_name)
-        filename = self.get_ext_filename(fullname)
+        modpath = fullname.split('.')
+        filename = self.get_ext_filename(modpath[-1])
+
         if not self.inplace:
             # no further work needed
+            # returning :
+            #   build_dir/package/path/filename
+            filename = os.path.join(*modpath[:-1]+[filename])
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
-        # using the build_py command
+        # using the build_py command for that
+        package = '.'.join(modpath[0:-1])
         modpath = fullname.split('.')
         package = '.'.join(modpath[0:-1])
         base = modpath[-1]
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
+
+        # returning
+        #   package_dir/filename
         return os.path.join(package_dir, filename)
 
     def get_ext_fullname(self, ext_name):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index dc8df98fd7..e01c882069 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -274,12 +274,12 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
-        cmd.package = 'bar'
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {'': 'bar'}
         path = cmd.get_ext_fullpath('foo')
-        # checking that the last directory is bar
+        # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -293,7 +293,40 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(lastdir, 'bar')
+
+    def test_ext_fullpath(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+        # building lxml.etree not inplace
+        cmd.inplace = 0
+        cmd.build_lib = os.path.join(curdir, 'tmpdir')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap not inplace
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {}
+        cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
+                              'portmap.so')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap inplace
+        cmd.inplace = 1
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        self.assertEquals(wanted, path)
 
 def test_suite():
     if not sysconfig.python_build:

From 354b6e7100a54b04521cd57453c702386e4eae30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 08:33:28 +0000
Subject: [PATCH 2407/8469] Merged revisions 73790 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73790 | tarek.ziade | 2009-07-03 10:22:56 +0200 (Fri, 03 Jul 2009) | 1 line

  Fixed #6403 : package path usage for build_ext
........
---
 command/build_ext.py    | 14 ++++++++++----
 tests/test_build_ext.py | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 57a110b0d9..30457026d4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -631,17 +631,23 @@ def get_ext_fullpath(self, ext_name):
         """
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
-        filename = self.get_ext_filename(base)
+        filename = self.get_ext_filename(modpath[-1])
+
         if not self.inplace:
             # no further work needed
+            # returning :
+            #   build_dir/package/path/filename
+            filename = os.path.join(*modpath[:-1]+[filename])
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
-        # using the build_py command
+        # using the build_py command for that
+        package = '.'.join(modpath[0:-1])
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
+
+        # returning
+        #   package_dir/filename
         return os.path.join(package_dir, filename)
 
     def get_ext_fullname(self, ext_name):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 08e3e1ff1c..6f0e2309d5 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -337,7 +337,8 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
-        cmd.package = 'bar'
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {'': 'bar'}
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
@@ -355,12 +356,14 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(lastdir, 'bar')
 
-    def test_build_ext_inplace(self):
-        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
-        etree_ext = Extension('lxml.etree', [etree_c])
-        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+    def test_ext_fullpath(self):
+        # building lxml.etree inplace
+        #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        #etree_ext = Extension('lxml.etree', [etree_c])
+        #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        dist = Distribution()
         cmd = build_ext(dist)
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
@@ -370,6 +373,28 @@ def test_build_ext_inplace(self):
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
+        # building lxml.etree not inplace
+        cmd.inplace = 0
+        cmd.build_lib = os.path.join(curdir, 'tmpdir')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap not inplace
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {}
+        cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
+                              'portmap.so')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap inplace
+        cmd.inplace = 1
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From f781d05ce0ced0e9e34201c464c5a1de6eee334e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 08:37:27 +0000
Subject: [PATCH 2408/8469] Merged revisions 73792 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73792 | tarek.ziade | 2009-07-03 10:33:28 +0200 (Fri, 03 Jul 2009) | 9 lines

  Merged revisions 73790 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73790 | tarek.ziade | 2009-07-03 10:22:56 +0200 (Fri, 03 Jul 2009) | 1 line

    Fixed #6403 : package path usage for build_ext
  ........
................
---
 command/build_ext.py    | 14 ++++++++++----
 tests/test_build_ext.py | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 57a110b0d9..30457026d4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -631,17 +631,23 @@ def get_ext_fullpath(self, ext_name):
         """
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
-        filename = self.get_ext_filename(base)
+        filename = self.get_ext_filename(modpath[-1])
+
         if not self.inplace:
             # no further work needed
+            # returning :
+            #   build_dir/package/path/filename
+            filename = os.path.join(*modpath[:-1]+[filename])
             return os.path.join(self.build_lib, filename)
 
         # the inplace option requires to find the package directory
-        # using the build_py command
+        # using the build_py command for that
+        package = '.'.join(modpath[0:-1])
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
+
+        # returning
+        #   package_dir/filename
         return os.path.join(package_dir, filename)
 
     def get_ext_fullname(self, ext_name):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index fe6009b617..f0580c1f0f 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -337,7 +337,8 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
-        cmd.package = 'bar'
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {'': 'bar'}
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
@@ -355,12 +356,14 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, cmd.package)
+        self.assertEquals(lastdir, 'bar')
 
-    def test_build_ext_inplace(self):
-        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
-        etree_ext = Extension('lxml.etree', [etree_c])
-        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+    def test_ext_fullpath(self):
+        # building lxml.etree inplace
+        #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        #etree_ext = Extension('lxml.etree', [etree_c])
+        #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        dist = Distribution()
         cmd = build_ext(dist)
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
@@ -370,6 +373,28 @@ def test_build_ext_inplace(self):
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
+        # building lxml.etree not inplace
+        cmd.inplace = 0
+        cmd.build_lib = os.path.join(curdir, 'tmpdir')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap not inplace
+        build_py = cmd.get_finalized_command('build_py')
+        build_py.package_dir = {}
+        cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
+                              'portmap.so')
+        self.assertEquals(wanted, path)
+
+        # building twisted.runner.portmap inplace
+        cmd.inplace = 1
+        path = cmd.get_ext_fullpath('twisted.runner.portmap')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From a09e1355e93bba0d5872beb36c2afe34760e17d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 09:01:07 +0000
Subject: [PATCH 2409/8469] cleaned up distutils.command.build_py

---
 command/build_py.py | 134 +++++++++++++++-----------------------------
 1 file changed, 44 insertions(+), 90 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index d9c15749d0..5d249f3ddc 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -4,16 +4,15 @@
 
 __revision__ = "$Id$"
 
-import string, os
-from types import *
+import os
 from glob import glob
 
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError, DistutilsFileError
 from distutils.util import convert_path
 from distutils import log
 
-class build_py (Command):
+class build_py(Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
@@ -30,8 +29,7 @@ class build_py (Command):
     boolean_options = ['compile', 'force']
     negative_opt = {'no-compile' : 'compile'}
 
-
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_lib = None
         self.py_modules = None
         self.package = None
@@ -41,7 +39,7 @@ def initialize_options (self):
         self.optimize = 0
         self.force = None
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('force', 'force'))
@@ -59,15 +57,14 @@ def finalize_options (self):
 
         # Ick, copied straight from install_lib.py (fancy_getopt needs a
         # type system!  Hell, *everything* needs a type system!!!)
-        if type(self.optimize) is not IntType:
+        if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
                 assert 0 <= self.optimize <= 2
             except (ValueError, AssertionError):
-                raise DistutilsOptionError, "optimize must be 0, 1, or 2"
-
-    def run (self):
+                raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
+    def run(self):
         # XXX copy_file by default preserves atime and mtime.  IMHO this is
         # the right thing to do, but perhaps it should be an option -- in
         # particular, a site administrator might want installed files to
@@ -97,9 +94,7 @@ def run (self):
 
         self.byte_compile(self.get_outputs(include_bytecode=0))
 
-    # run ()
-
-    def get_data_files (self):
+    def get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         data = []
         if not self.packages:
@@ -123,7 +118,7 @@ def get_data_files (self):
             data.append((package, src_dir, build_dir, filenames))
         return data
 
-    def find_data_files (self, package, src_dir):
+    def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""
         globs = (self.package_data.get('', [])
                  + self.package_data.get(package, []))
@@ -135,7 +130,7 @@ def find_data_files (self, package, src_dir):
             files.extend([fn for fn in filelist if fn not in files])
         return files
 
-    def build_package_data (self):
+    def build_package_data(self):
         """Copy data files into build directory"""
         lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
@@ -145,23 +140,23 @@ def build_package_data (self):
                 self.copy_file(os.path.join(src_dir, filename), target,
                                preserve_mode=False)
 
-    def get_package_dir (self, package):
+    def get_package_dir(self, package):
         """Return the directory, relative to the top of the source
            distribution, where package 'package' should be found
            (at least according to the 'package_dir' option, if any)."""
 
-        path = string.split(package, '.')
+        path = package.split('.')
 
         if not self.package_dir:
             if path:
-                return apply(os.path.join, path)
+                return os.path.join(*path)
             else:
                 return ''
         else:
             tail = []
             while path:
                 try:
-                    pdir = self.package_dir[string.join(path, '.')]
+                    pdir = self.package_dir['.'.join(path)]
                 except KeyError:
                     tail.insert(0, path[-1])
                     del path[-1]
@@ -181,27 +176,23 @@ def get_package_dir (self, package):
                     tail.insert(0, pdir)
 
                 if tail:
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
                 else:
                     return ''
 
-    # get_package_dir ()
-
-
-    def check_package (self, package, package_dir):
-
+    def check_package(self, package, package_dir):
         # Empty dir name means current directory, which we can probably
         # assume exists.  Also, os.path.exists and isdir don't know about
         # my "empty string means current dir" convention, so we have to
         # circumvent them.
         if package_dir != "":
             if not os.path.exists(package_dir):
-                raise DistutilsFileError, \
-                      "package directory '%s' does not exist" % package_dir
+                raise DistutilsFileError(
+                      "package directory '%s' does not exist" % package_dir)
             if not os.path.isdir(package_dir):
-                raise DistutilsFileError, \
-                      ("supposed package directory '%s' exists, " +
-                       "but is not a directory") % package_dir
+                raise DistutilsFileError(
+                       "supposed package directory '%s' exists, "
+                       "but is not a directory" % package_dir)
 
         # Require __init__.py for all but the "root package"
         if package:
@@ -216,20 +207,14 @@ def check_package (self, package, package_dir):
         # __init__.py doesn't exist -- so don't return the filename.
         return None
 
-    # check_package ()
-
-
-    def check_module (self, module, module_file):
+    def check_module(self, module, module_file):
         if not os.path.isfile(module_file):
             log.warn("file %s (for module %s) not found", module_file, module)
-            return 0
+            return False
         else:
-            return 1
+            return True
 
-    # check_module ()
-
-
-    def find_package_modules (self, package, package_dir):
+    def find_package_modules(self, package, package_dir):
         self.check_package(package, package_dir)
         module_files = glob(os.path.join(package_dir, "*.py"))
         modules = []
@@ -244,8 +229,7 @@ def find_package_modules (self, package, package_dir):
                 self.debug_print("excluding %s" % setup_script)
         return modules
 
-
-    def find_modules (self):
+    def find_modules(self):
         """Finds individually-specified Python modules, ie. those listed by
         module name in 'self.py_modules'.  Returns a list of tuples (package,
         module_base, filename): 'package' is a tuple of the path through
@@ -254,7 +238,6 @@ def find_modules (self):
         ".py" file (relative to the distribution root) that implements the
         module.
         """
-
         # Map package names to tuples of useful info about the package:
         #    (package_dir, checked)
         # package_dir - the directory where we'll find source files for
@@ -270,10 +253,9 @@ def find_modules (self):
         # just the "package" for a toplevel is empty (either an empty
         # string or empty list, depending on context).  Differences:
         #   - don't check for __init__.py in directory for empty package
-
         for module in self.py_modules:
-            path = string.split(module, '.')
-            package = string.join(path[0:-1], '.')
+            path = module.split('.')
+            package = '.'.join(path[0:-1])
             module_base = path[-1]
 
             try:
@@ -299,16 +281,12 @@ def find_modules (self):
 
         return modules
 
-    # find_modules ()
-
-
-    def find_all_modules (self):
+    def find_all_modules(self):
         """Compute the list of all modules that will be built, whether
         they are specified one-module-at-a-time ('self.py_modules') or
         by whole packages ('self.packages').  Return a list of tuples
         (package, module, module_file), just like 'find_modules()' and
         'find_package_modules()' do."""
-
         modules = []
         if self.py_modules:
             modules.extend(self.find_modules())
@@ -317,32 +295,20 @@ def find_all_modules (self):
                 package_dir = self.get_package_dir(package)
                 m = self.find_package_modules(package, package_dir)
                 modules.extend(m)
-
         return modules
 
-    # find_all_modules ()
-
-
-    def get_source_files (self):
-
-        modules = self.find_all_modules()
-        filenames = []
-        for module in modules:
-            filenames.append(module[-1])
+    def get_source_files(self):
+        return [module[-1] for module in self.find_all_modules()]
 
-        return filenames
-
-
-    def get_module_outfile (self, build_dir, package, module):
+    def get_module_outfile(self, build_dir, package, module):
         outfile_path = [build_dir] + list(package) + [module + ".py"]
         return os.path.join(*outfile_path)
 
-
-    def get_outputs (self, include_bytecode=1):
+    def get_outputs(self, include_bytecode=1):
         modules = self.find_all_modules()
         outputs = []
         for (package, module, module_file) in modules:
-            package = string.split(package, '.')
+            package = package.split('.')
             filename = self.get_module_outfile(self.build_lib, package, module)
             outputs.append(filename)
             if include_bytecode:
@@ -359,13 +325,12 @@ def get_outputs (self, include_bytecode=1):
 
         return outputs
 
-
-    def build_module (self, module, module_file, package):
-        if type(package) is StringType:
-            package = string.split(package, '.')
-        elif type(package) not in (ListType, TupleType):
-            raise TypeError, \
-                  "'package' must be a string (dot-separated), list, or tuple"
+    def build_module(self, module, module_file, package):
+        if isinstance(package, str):
+            package = package.split('.')
+        elif not isinstance(package, (list, tuple)):
+            raise TypeError(
+                  "'package' must be a string (dot-separated), list, or tuple")
 
         # Now put the module source file into the "build" area -- this is
         # easy, we just copy it somewhere under self.build_lib (the build
@@ -375,9 +340,7 @@ def build_module (self, module, module_file, package):
         self.mkpath(dir)
         return self.copy_file(module_file, outfile, preserve_mode=0)
 
-
-    def build_modules (self):
-
+    def build_modules(self):
         modules = self.find_modules()
         for (package, module, module_file) in modules:
 
@@ -387,11 +350,7 @@ def build_modules (self):
             # under self.build_lib.)
             self.build_module(module, module_file, package)
 
-    # build_modules ()
-
-
-    def build_packages (self):
-
+    def build_packages(self):
         for package in self.packages:
 
             # Get list of (package, module, module_file) tuples based on
@@ -412,10 +371,7 @@ def build_packages (self):
                 assert package == package_
                 self.build_module(module, module_file, package)
 
-    # build_packages ()
-
-
-    def byte_compile (self, files):
+    def byte_compile(self, files):
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
@@ -431,5 +387,3 @@ def byte_compile (self, files):
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
-
-# class build_py

From 9357a7c74f276c20dd408a3394241c226d841b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 09:05:30 +0000
Subject: [PATCH 2410/8469] Merged revisions 73801 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73801 | tarek.ziade | 2009-07-03 11:01:07 +0200 (Fri, 03 Jul 2009) | 1 line

  cleaned up distutils.command.build_py
........
---
 command/build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 99d85be96c..4cc80f7b4a 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -4,15 +4,15 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import os
 from glob import glob
 
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError, DistutilsFileError
 from distutils.util import convert_path, Mixin2to3
 from distutils import log
 
-class build_py (Command):
+class build_py(Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 

From 7c0126426802cc8186b46e808179d7c7a870514c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 19:01:12 +0000
Subject: [PATCH 2411/8469] basic tests to raise distutils.file_util coverage

---
 tests/test_file_util.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index fac4a5d1a9..99b421f73f 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -3,7 +3,7 @@
 import os
 import shutil
 
-from distutils.file_util import move_file
+from distutils.file_util import move_file, write_file, copy_file
 from distutils import log
 from distutils.tests import support
 
@@ -55,6 +55,21 @@ def test_move_file_verbosity(self):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEquals(self._logs, wanted)
 
+    def test_write_file(self):
+        lines = ['a', 'b', 'c']
+        dir = self.mkdtemp()
+        foo = os.path.join(dir, 'foo')
+        write_file(foo, lines)
+        content = [line.strip() for line in open(foo).readlines()]
+        self.assertEquals(content, lines)
+
+    def test_copy_file(self):
+        src_dir = self.mkdtemp()
+        foo = os.path.join(src_dir, 'foo')
+        write_file(foo, 'content')
+        dst_dir = self.mkdtemp()
+        copy_file(foo, dst_dir)
+        self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo')))
 
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)

From 570969b419d41a25ce8ed52e36fa756a01c751ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 19:14:49 +0000
Subject: [PATCH 2412/8469] cleaned distutils.file_util

---
 file_util.py | 121 ++++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 69 deletions(-)

diff --git a/file_util.py b/file_util.py
index 0c890559ee..d8e8fd5f8d 100644
--- a/file_util.py
+++ b/file_util.py
@@ -10,49 +10,48 @@
 from distutils import log
 
 # for generating verbose output in 'copy_file()'
-_copy_action = { None:   'copying',
-                 'hard': 'hard linking',
-                 'sym':  'symbolically linking' }
+_copy_action = {None: 'copying',
+                'hard': 'hard linking',
+                'sym': 'symbolically linking'}
 
 
-def _copy_file_contents (src, dst, buffer_size=16*1024):
-    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
-    opening either file, reading from 'src', or writing to 'dst', raises
-    DistutilsFileError.  Data is read/written in chunks of 'buffer_size'
-    bytes (default 16k).  No attempt is made to handle anything apart from
-    regular files.
+def _copy_file_contents(src, dst, buffer_size=16*1024):
+    """Copy the file 'src' to 'dst'.
+
+    Both must be filenames. Any error opening either file, reading from
+    'src', or writing to 'dst', raises DistutilsFileError.  Data is
+    read/written in chunks of 'buffer_size' bytes (default 16k).  No attempt
+    is made to handle anything apart from regular files.
     """
     # Stolen from shutil module in the standard library, but with
     # custom error-handling added.
-
     fsrc = None
     fdst = None
     try:
         try:
             fsrc = open(src, 'rb')
         except os.error, (errno, errstr):
-            raise DistutilsFileError, \
-                  "could not open '%s': %s" % (src, errstr)
+            raise DistutilsFileError("could not open '%s': %s" % (src, errstr))
 
         if os.path.exists(dst):
             try:
                 os.unlink(dst)
             except os.error, (errno, errstr):
-                raise DistutilsFileError, \
-                      "could not delete '%s': %s" % (dst, errstr)
+                raise DistutilsFileError(
+                      "could not delete '%s': %s" % (dst, errstr))
 
         try:
             fdst = open(dst, 'wb')
         except os.error, (errno, errstr):
-            raise DistutilsFileError, \
-                  "could not create '%s': %s" % (dst, errstr)
+            raise DistutilsFileError(
+                  "could not create '%s': %s" % (dst, errstr))
 
         while 1:
             try:
                 buf = fsrc.read(buffer_size)
             except os.error, (errno, errstr):
-                raise DistutilsFileError, \
-                      "could not read from '%s': %s" % (src, errstr)
+                raise DistutilsFileError(
+                      "could not read from '%s': %s" % (src, errstr))
 
             if not buf:
                 break
@@ -60,8 +59,8 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             try:
                 fdst.write(buf)
             except os.error, (errno, errstr):
-                raise DistutilsFileError, \
-                      "could not write to '%s': %s" % (dst, errstr)
+                raise DistutilsFileError(
+                      "could not write to '%s': %s" % (dst, errstr))
 
     finally:
         if fdst:
@@ -69,25 +68,18 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
         if fsrc:
             fsrc.close()
 
-# _copy_file_contents()
-
-def copy_file (src, dst,
-               preserve_mode=1,
-               preserve_times=1,
-               update=0,
-               link=None,
-               verbose=1,
-               dry_run=0):
-
-    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
-    copied there with the same name; otherwise, it must be a filename.  (If
-    the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
-    is true (the default), the file's mode (type and permission bits, or
-    whatever is analogous on the current platform) is copied.  If
-    'preserve_times' is true (the default), the last-modified and
-    last-access times are copied as well.  If 'update' is true, 'src' will
-    only be copied if 'dst' does not exist, or if 'dst' does exist but is
-    older than 'src'.
+def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
+              link=None, verbose=1, dry_run=0):
+    """Copy a file 'src' to 'dst'.
+
+    If 'dst' is a directory, then 'src' is copied there with the same name;
+    otherwise, it must be a filename.  (If the file exists, it will be
+    ruthlessly clobbered.)  If 'preserve_mode' is true (the default),
+    the file's mode (type and permission bits, or whatever is analogous on
+    the current platform) is copied.  If 'preserve_times' is true (the
+    default), the last-modified and last-access times are copied as well.
+    If 'update' is true, 'src' will only be copied if 'dst' does not exist,
+    or if 'dst' does exist but is older than 'src'.
 
     'link' allows you to make hard links (os.link) or symbolic links
     (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
@@ -113,8 +105,8 @@ def copy_file (src, dst,
     from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE
 
     if not os.path.isfile(src):
-        raise DistutilsFileError, \
-              "can't copy '%s': doesn't exist or not a regular file" % src
+        raise DistutilsFileError(
+              "can't copy '%s': doesn't exist or not a regular file" % src)
 
     if os.path.isdir(dst):
         dir = dst
@@ -130,8 +122,7 @@ def copy_file (src, dst,
     try:
         action = _copy_action[link]
     except KeyError:
-        raise ValueError, \
-              "invalid value '%s' for 'link' argument" % link
+        raise ValueError("invalid value '%s' for 'link' argument" % link)
 
     if verbose >= 1:
         if os.path.basename(dst) == os.path.basename(src):
@@ -148,8 +139,8 @@ def copy_file (src, dst,
         try:
             macostools.copy(src, dst, 0, preserve_times)
         except os.error, exc:
-            raise DistutilsFileError, \
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])
+            raise DistutilsFileError(
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]))
 
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
@@ -176,17 +167,13 @@ def copy_file (src, dst,
 
     return (dst, 1)
 
-# copy_file ()
-
-
 # XXX I suspect this is Unix-specific -- need porting help!
-def move_file (src, dst,
-               verbose=1,
-               dry_run=0):
+def move_file (src, dst, verbose=1, dry_run=0):
+    """Move a file 'src' to 'dst'.
 
-    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
-    be moved into it with the same name; otherwise, 'src' is just renamed
-    to 'dst'.  Return the new full name of the file.
+    If 'dst' is a directory, the file will be moved into it with the same
+    name; otherwise, 'src' is just renamed to 'dst'.  Return the new
+    full name of the file.
 
     Handles cross-device moves on Unix using 'copy_file()'.  What about
     other systems???
@@ -201,20 +188,19 @@ def move_file (src, dst,
         return dst
 
     if not isfile(src):
-        raise DistutilsFileError, \
-              "can't move '%s': not a regular file" % src
+        raise DistutilsFileError("can't move '%s': not a regular file" % src)
 
     if isdir(dst):
         dst = os.path.join(dst, basename(src))
     elif exists(dst):
-        raise DistutilsFileError, \
-              "can't move '%s': destination '%s' already exists" % \
-              (src, dst)
+        raise DistutilsFileError(
+              "can't move '%s': destination '%s' already exists" %
+              (src, dst))
 
     if not isdir(dirname(dst)):
-        raise DistutilsFileError, \
+        raise DistutilsFileError(
               "can't move '%s': destination '%s' not a valid path" % \
-              (src, dst)
+              (src, dst))
 
     copy_it = 0
     try:
@@ -223,8 +209,8 @@ def move_file (src, dst,
         if num == errno.EXDEV:
             copy_it = 1
         else:
-            raise DistutilsFileError, \
-                  "couldn't move '%s' to '%s': %s" % (src, dst, msg)
+            raise DistutilsFileError(
+                  "couldn't move '%s' to '%s': %s" % (src, dst, msg))
 
     if copy_it:
         copy_file(src, dst, verbose=verbose)
@@ -235,15 +221,12 @@ def move_file (src, dst,
                 os.unlink(dst)
             except os.error:
                 pass
-            raise DistutilsFileError, \
+            raise DistutilsFileError(
                   ("couldn't move '%s' to '%s' by copy/delete: " +
-                   "delete '%s' failed: %s") % \
-                  (src, dst, src, msg)
-
+                   "delete '%s' failed: %s") %
+                  (src, dst, src, msg))
     return dst
 
-# move_file ()
-
 
 def write_file (filename, contents):
     """Create a file with the specified name and write 'contents' (a

From 3f8ca0456b7e12be4eabd74bde600ec3b1fac405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 3 Jul 2009 19:22:23 +0000
Subject: [PATCH 2413/8469] Merged revisions 73814-73815 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73814 | tarek.ziade | 2009-07-03 21:01:12 +0200 (Fri, 03 Jul 2009) | 1 line

  basic tests to raise distutils.file_util coverage
........
  r73815 | tarek.ziade | 2009-07-03 21:14:49 +0200 (Fri, 03 Jul 2009) | 1 line

  cleaned distutils.file_util
........
---
 file_util.py            | 49 +++++++++++++++++++++--------------------
 tests/test_file_util.py | 17 +++++++++++++-
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/file_util.py b/file_util.py
index 65aa7e0fdd..758bde38bf 100644
--- a/file_util.py
+++ b/file_util.py
@@ -10,17 +10,18 @@
 from distutils import log
 
 # for generating verbose output in 'copy_file()'
-_copy_action = { None:   'copying',
-                 'hard': 'hard linking',
-                 'sym':  'symbolically linking' }
+_copy_action = {None: 'copying',
+                'hard': 'hard linking',
+                'sym': 'symbolically linking'}
 
 
 def _copy_file_contents(src, dst, buffer_size=16*1024):
-    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
-    opening either file, reading from 'src', or writing to 'dst', raises
-    DistutilsFileError.  Data is read/written in chunks of 'buffer_size'
-    bytes (default 16k).  No attempt is made to handle anything apart from
-    regular files.
+    """Copy the file 'src' to 'dst'.
+
+    Both must be filenames. Any error opening either file, reading from
+    'src', or writing to 'dst', raises DistutilsFileError.  Data is
+    read/written in chunks of 'buffer_size' bytes (default 16k).  No attempt
+    is made to handle anything apart from regular files.
     """
     # Stolen from shutil module in the standard library, but with
     # custom error-handling added.
@@ -68,15 +69,16 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
 
 def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
               link=None, verbose=1, dry_run=0):
-    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
-    copied there with the same name; otherwise, it must be a filename.  (If
-    the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
-    is true (the default), the file's mode (type and permission bits, or
-    whatever is analogous on the current platform) is copied.  If
-    'preserve_times' is true (the default), the last-modified and
-    last-access times are copied as well.  If 'update' is true, 'src' will
-    only be copied if 'dst' does not exist, or if 'dst' does exist but is
-    older than 'src'.
+    """Copy a file 'src' to 'dst'.
+
+    If 'dst' is a directory, then 'src' is copied there with the same name;
+    otherwise, it must be a filename.  (If the file exists, it will be
+    ruthlessly clobbered.)  If 'preserve_mode' is true (the default),
+    the file's mode (type and permission bits, or whatever is analogous on
+    the current platform) is copied.  If 'preserve_times' is true (the
+    default), the last-modified and last-access times are copied as well.
+    If 'update' is true, 'src' will only be copied if 'dst' does not exist,
+    or if 'dst' does exist but is older than 'src'.
 
     'link' allows you to make hard links (os.link) or symbolic links
     (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
@@ -166,13 +168,12 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
 
 
 # XXX I suspect this is Unix-specific -- need porting help!
-def move_file (src, dst,
-               verbose=1,
-               dry_run=0):
+def move_file(src, dst, verbose=1, dry_run=0):
+    """Move a file 'src' to 'dst'.
 
-    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
-    be moved into it with the same name; otherwise, 'src' is just renamed
-    to 'dst'.  Return the new full name of the file.
+    If 'dst' is a directory, the file will be moved into it with the same
+    name; otherwise, 'src' is just renamed to 'dst'.  Return the new
+    full name of the file.
 
     Handles cross-device moves on Unix using 'copy_file()'.  What about
     other systems???
@@ -229,7 +230,7 @@ def move_file (src, dst,
     return dst
 
 
-def write_file (filename, contents):
+def write_file(filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index fac4a5d1a9..99b421f73f 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -3,7 +3,7 @@
 import os
 import shutil
 
-from distutils.file_util import move_file
+from distutils.file_util import move_file, write_file, copy_file
 from distutils import log
 from distutils.tests import support
 
@@ -55,6 +55,21 @@ def test_move_file_verbosity(self):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEquals(self._logs, wanted)
 
+    def test_write_file(self):
+        lines = ['a', 'b', 'c']
+        dir = self.mkdtemp()
+        foo = os.path.join(dir, 'foo')
+        write_file(foo, lines)
+        content = [line.strip() for line in open(foo).readlines()]
+        self.assertEquals(content, lines)
+
+    def test_copy_file(self):
+        src_dir = self.mkdtemp()
+        foo = os.path.join(src_dir, 'foo')
+        write_file(foo, 'content')
+        dst_dir = self.mkdtemp()
+        copy_file(foo, dst_dir)
+        self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo')))
 
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)

From a45e8e791dab0f958ec7df15b417023dcb3a4c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 02:02:41 +0000
Subject: [PATCH 2414/8469] Fixed #6413: fixed log level in
 distutils.dist.announce

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

diff --git a/dist.py b/dist.py
index f4aecb419e..7c29bf6ca7 100644
--- a/dist.py
+++ b/dist.py
@@ -914,8 +914,8 @@ def reinitialize_command(self, command, reinit_subcommands=0):
 
     # -- Methods that operate on the Distribution ----------------------
 
-    def announce(self, msg, level=1):
-        log.debug(msg)
+    def announce(self, msg, level=log.INFO):
+        log.log(level, msg)
 
     def run_commands(self):
         """Run each command that was seen on the setup script command line.

From 59dac0c53f0d28ea9cff2ea6bc497a8107ce5f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 02:04:21 +0000
Subject: [PATCH 2415/8469] Merged revisions 73827 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73827 | tarek.ziade | 2009-07-04 04:02:41 +0200 (Sat, 04 Jul 2009) | 1 line

  Fixed #6413: fixed log level in distutils.dist.announce
........
---
 dist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 915d336431..092ec0d220 100644
--- a/dist.py
+++ b/dist.py
@@ -907,8 +907,8 @@ def reinitialize_command(self, command, reinit_subcommands=0):
 
     # -- Methods that operate on the Distribution ----------------------
 
-    def announce(self, msg, level=1):
-        log.debug(msg)
+    def announce(self, msg, level=log.INFO):
+        log.log(level, msg)
 
     def run_commands(self):
         """Run each command that was seen on the setup script command line.

From cc8b5fb33d9dabdd7256e5da5582f8e6380927ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 02:05:51 +0000
Subject: [PATCH 2416/8469] Merged revisions 73828 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73828 | tarek.ziade | 2009-07-04 04:04:21 +0200 (Sat, 04 Jul 2009) | 9 lines

  Merged revisions 73827 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73827 | tarek.ziade | 2009-07-04 04:02:41 +0200 (Sat, 04 Jul 2009) | 1 line

    Fixed #6413: fixed log level in distutils.dist.announce
  ........
................
---
 dist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index 915d336431..092ec0d220 100644
--- a/dist.py
+++ b/dist.py
@@ -907,8 +907,8 @@ def reinitialize_command(self, command, reinit_subcommands=0):
 
     # -- Methods that operate on the Distribution ----------------------
 
-    def announce(self, msg, level=1):
-        log.debug(msg)
+    def announce(self, msg, level=log.INFO):
+        log.log(level, msg)
 
     def run_commands(self):
         """Run each command that was seen on the setup script command line.

From 6770846ebeb6751e80a877222f12b83dfe03fc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 02:59:19 +0000
Subject: [PATCH 2417/8469] using print statements when used for user
 interaction

---
 dist.py            | 22 +++++++++++-----------
 tests/test_dist.py | 18 ------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/dist.py b/dist.py
index 7c29bf6ca7..afed545d92 100644
--- a/dist.py
+++ b/dist.py
@@ -602,14 +602,14 @@ def _show_help(self, parser, global_options=1, display_options=1,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            self.announce('')
+            print('')
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            self.announce('')
+            print('')
 
         for command in self.commands:
             if isinstance(command, type) and issubclass(command, Command):
@@ -623,9 +623,9 @@ def _show_help(self, parser, global_options=1, display_options=1,
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            self.announce('')
+            print('')
 
-        self.announce(gen_usage(self.script_name))
+        print(gen_usage(self.script_name))
 
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
@@ -640,8 +640,8 @@ def handle_display_options(self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            self.announce('')
-            self.announce(gen_usage(self.script_name))
+            print('')
+            print(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -657,12 +657,12 @@ def handle_display_options(self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    self.announce(','.join(value))
+                    print(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    self.announce('\n'.join(value))
+                    print('\n'.join(value))
                 else:
-                    self.announce(value)
+                    print(value)
                 any_display_options = 1
 
         return any_display_options
@@ -671,7 +671,7 @@ def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-        self.announce(header + ":")
+        print(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -682,7 +682,7 @@ def print_command_list(self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            self.announce("  %-*s  %s" % (max_length, cmd, description))
+            print("  %-*s  %s" % (max_length, cmd, description))
 
     def print_commands(self):
         """Print out a help message listing all available commands with a
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 07f392c4ee..75b74a2c28 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -165,24 +165,6 @@ def test_finalize_options(self):
         self.assertEquals(dist.metadata.platforms, ['one', 'two'])
         self.assertEquals(dist.metadata.keywords, ['one', 'two'])
 
-    def test_show_help(self):
-        class FancyGetopt(object):
-            def __init__(self):
-                self.count = 0
-
-            def set_option_table(self, *args):
-                pass
-
-            def print_help(self, *args):
-                self.count += 1
-
-        parser = FancyGetopt()
-        dist = Distribution()
-        dist.commands = ['sdist']
-        dist.script_name = 'setup.py'
-        dist._show_help(parser)
-        self.assertEquals(parser.count, 3)
-
     def test_get_command_packages(self):
         dist = Distribution()
         self.assertEquals(dist.command_packages, None)

From 78e341ad759a608301a0e5a1f330bed09dc975b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 03:00:50 +0000
Subject: [PATCH 2418/8469] Merged revisions 73834 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73834 | tarek.ziade | 2009-07-04 04:59:19 +0200 (Sat, 04 Jul 2009) | 1 line

  using print statements when used for user interaction
........
---
 dist.py            | 22 +++++++++++-----------
 tests/test_dist.py | 18 ------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/dist.py b/dist.py
index 092ec0d220..ac5a0ca012 100644
--- a/dist.py
+++ b/dist.py
@@ -596,14 +596,14 @@ def _show_help(self, parser, global_options=1, display_options=1,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            self.announce('')
+            print('')
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            self.announce('')
+            print('')
 
         for command in self.commands:
             if isinstance(command, type) and issubclass(command, Command):
@@ -617,9 +617,9 @@ def _show_help(self, parser, global_options=1, display_options=1,
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            self.announce('')
+            print('')
 
-        self.announce(gen_usage(self.script_name))
+        print(gen_usage(self.script_name))
 
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
@@ -634,8 +634,8 @@ def handle_display_options(self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            self.announce('')
-            self.announce(gen_usage(self.script_name))
+            print('')
+            print(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -651,12 +651,12 @@ def handle_display_options(self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    self.announce(','.join(value))
+                    print(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    self.announce('\n'.join(value))
+                    print('\n'.join(value))
                 else:
-                    self.announce(value)
+                    print(value)
                 any_display_options = 1
 
         return any_display_options
@@ -665,7 +665,7 @@ def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-        self.announce(header + ":")
+        print(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -676,7 +676,7 @@ def print_command_list(self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            self.announce("  %-*s  %s" % (max_length, cmd, description))
+            print("  %-*s  %s" % (max_length, cmd, description))
 
     def print_commands(self):
         """Print out a help message listing all available commands with a
diff --git a/tests/test_dist.py b/tests/test_dist.py
index c031cb85ac..9f795f4314 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -136,24 +136,6 @@ def test_finalize_options(self):
         self.assertEquals(dist.metadata.platforms, ['one', 'two'])
         self.assertEquals(dist.metadata.keywords, ['one', 'two'])
 
-    def test_show_help(self):
-        class FancyGetopt(object):
-            def __init__(self):
-                self.count = 0
-
-            def set_option_table(self, *args):
-                pass
-
-            def print_help(self, *args):
-                self.count += 1
-
-        parser = FancyGetopt()
-        dist = Distribution()
-        dist.commands = ['sdist']
-        dist.script_name = 'setup.py'
-        dist._show_help(parser)
-        self.assertEquals(parser.count, 3)
-
     def test_get_command_packages(self):
         dist = Distribution()
         self.assertEquals(dist.command_packages, None)

From 876d6d4fad84a5abfd40bb09cc9f9164121f8594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 4 Jul 2009 03:01:33 +0000
Subject: [PATCH 2419/8469] Merged revisions 73835 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73835 | tarek.ziade | 2009-07-04 05:00:50 +0200 (Sat, 04 Jul 2009) | 9 lines

  Merged revisions 73834 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73834 | tarek.ziade | 2009-07-04 04:59:19 +0200 (Sat, 04 Jul 2009) | 1 line

    using print statements when used for user interaction
  ........
................
---
 dist.py            | 22 +++++++++++-----------
 tests/test_dist.py | 18 ------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/dist.py b/dist.py
index 092ec0d220..ac5a0ca012 100644
--- a/dist.py
+++ b/dist.py
@@ -596,14 +596,14 @@ def _show_help(self, parser, global_options=1, display_options=1,
                 options = self.global_options
             parser.set_option_table(options)
             parser.print_help(self.common_usage + "\nGlobal options:")
-            self.announce('')
+            print('')
 
         if display_options:
             parser.set_option_table(self.display_options)
             parser.print_help(
                 "Information display options (just display " +
                 "information, ignore any commands)")
-            self.announce('')
+            print('')
 
         for command in self.commands:
             if isinstance(command, type) and issubclass(command, Command):
@@ -617,9 +617,9 @@ def _show_help(self, parser, global_options=1, display_options=1,
             else:
                 parser.set_option_table(klass.user_options)
             parser.print_help("Options for '%s' command:" % klass.__name__)
-            self.announce('')
+            print('')
 
-        self.announce(gen_usage(self.script_name))
+        print(gen_usage(self.script_name))
 
     def handle_display_options(self, option_order):
         """If there were any non-global "display-only" options
@@ -634,8 +634,8 @@ def handle_display_options(self, option_order):
         # we ignore "foo bar").
         if self.help_commands:
             self.print_commands()
-            self.announce('')
-            self.announce(gen_usage(self.script_name))
+            print('')
+            print(gen_usage(self.script_name))
             return 1
 
         # If user supplied any of the "display metadata" options, then
@@ -651,12 +651,12 @@ def handle_display_options(self, option_order):
                 opt = translate_longopt(opt)
                 value = getattr(self.metadata, "get_"+opt)()
                 if opt in ['keywords', 'platforms']:
-                    self.announce(','.join(value))
+                    print(','.join(value))
                 elif opt in ('classifiers', 'provides', 'requires',
                              'obsoletes'):
-                    self.announce('\n'.join(value))
+                    print('\n'.join(value))
                 else:
-                    self.announce(value)
+                    print(value)
                 any_display_options = 1
 
         return any_display_options
@@ -665,7 +665,7 @@ def print_command_list(self, commands, header, max_length):
         """Print a subset of the list of all commands -- used by
         'print_commands()'.
         """
-        self.announce(header + ":")
+        print(header + ":")
 
         for cmd in commands:
             klass = self.cmdclass.get(cmd)
@@ -676,7 +676,7 @@ def print_command_list(self, commands, header, max_length):
             except AttributeError:
                 description = "(no description available)"
 
-            self.announce("  %-*s  %s" % (max_length, cmd, description))
+            print("  %-*s  %s" % (max_length, cmd, description))
 
     def print_commands(self):
         """Print out a help message listing all available commands with a
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 16ef68e962..40760390c8 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -136,24 +136,6 @@ def test_finalize_options(self):
         self.assertEquals(dist.metadata.platforms, ['one', 'two'])
         self.assertEquals(dist.metadata.keywords, ['one', 'two'])
 
-    def test_show_help(self):
-        class FancyGetopt(object):
-            def __init__(self):
-                self.count = 0
-
-            def set_option_table(self, *args):
-                pass
-
-            def print_help(self, *args):
-                self.count += 1
-
-        parser = FancyGetopt()
-        dist = Distribution()
-        dist.commands = ['sdist']
-        dist.script_name = 'setup.py'
-        dist._show_help(parser)
-        self.assertEquals(parser.count, 3)
-
     def test_get_command_packages(self):
         dist = Distribution()
         self.assertEquals(dist.command_packages, None)

From 54b37808bf90eb50889ee8761aa22e07969d6a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 6 Jul 2009 12:50:46 +0000
Subject: [PATCH 2420/8469] Fixed #6377: distutils compiler switch ignored (and
 added a deprecation warning if compiler is not used as supposed = a string
 option)

---
 command/build_ext.py    | 78 +++++++++++++++++++++++++++++------------
 tests/test_build_ext.py | 14 ++++++++
 2 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 96bd68be4c..be37313abc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -8,6 +8,8 @@
 
 import sys, os, string, re
 from types import *
+from warnings import warn
+
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -113,6 +115,36 @@ class build_ext (Command):
          "list available compilers", show_compilers),
         ]
 
+
+    # making 'compiler' a property to deprecate
+    # its usage as something else than a compiler type
+    # e.g. like a compiler instance
+    def __init__(self, dist):
+        self._compiler = None
+        Command.__init__(self, dist)
+
+    def __setattr__(self, name, value):
+        # need this to make sure setattr() (used in distutils)
+        # doesn't kill our property
+        if name == 'compiler':
+            self._set_compiler(value)
+        else:
+            self.__dict__[name] = value
+
+    def _set_compiler(self, compiler):
+        if not isinstance(compiler, str) and compiler is not None:
+            # we don't want to allow that anymore in the future
+            warn("'compiler' specify the compiler type in build_ext. "
+                 "If you want to get the compiler object itself, "
+                 "use 'compiler_obj'", PendingDeprecationWarning)
+
+        self._compiler = compiler
+
+    def _get_compiler(self):
+        return self._compiler
+
+    compiler = property(_get_compiler, _set_compiler)
+
     def initialize_options (self):
         self.extensions = None
         self.build_lib = None
@@ -311,38 +343,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=None,
-                                     verbose=self.verbose,
-                                     dry_run=self.dry_run,
-                                     force=self.force)
-        customize_compiler(self.compiler)
+        self.compiler_obj = new_compiler(compiler=self.compiler,
+                                         verbose=self.verbose,
+                                         dry_run=self.dry_run,
+                                         force=self.force)
+        customize_compiler(self.compiler_obj)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler.initialize(self.plat_name)
+            self.compiler_obj.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs(self.include_dirs)
+            self.compiler_obj.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler.define_macro(name, value)
+                self.compiler_obj.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro(macro)
+                self.compiler_obj.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries(self.libraries)
+            self.compiler_obj.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs(self.library_dirs)
+            self.compiler_obj.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs(self.rpath)
+            self.compiler_obj.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects(self.link_objects)
+            self.compiler_obj.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -504,13 +536,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler.compile(sources,
-                                         output_dir=self.build_temp,
-                                         macros=macros,
-                                         include_dirs=ext.include_dirs,
-                                         debug=self.debug,
-                                         extra_postargs=extra_args,
-                                         depends=ext.depends)
+        objects = self.compiler_obj.compile(sources,
+                                            output_dir=self.build_temp,
+                                            macros=macros,
+                                            include_dirs=ext.include_dirs,
+                                            debug=self.debug,
+                                            extra_postargs=extra_args,
+                                            depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -531,9 +563,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler.detect_language(sources)
+        language = ext.language or self.compiler_obj.detect_language(sources)
 
-        self.compiler.link_shared_object(
+        self.compiler_obj.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -712,7 +744,7 @@ def get_libraries (self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler, MSVCCompiler):
+            if not isinstance(self.compiler_obj, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 2ecead3c0d..afd0df32dc 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -3,6 +3,9 @@
 import tempfile
 import shutil
 from StringIO import StringIO
+import warnings
+from test.test_support import check_warnings
+from test.test_support import captured_stdout
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
@@ -395,6 +398,17 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
         self.assertEquals(wanted, path)
 
+    def test_compiler_deprecation_warning(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.compiler = object()
+            self.assertEquals(len(w.warnings), 1)
+            cmd.compile = 'unix'
+            self.assertEquals(len(w.warnings), 1)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 40f8dab3e0797b8cf84031702a7ba3a6802bf2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 6 Jul 2009 13:52:17 +0000
Subject: [PATCH 2421/8469] Merged revisions 73864 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73864 | tarek.ziade | 2009-07-06 14:50:46 +0200 (Mon, 06 Jul 2009) | 1 line

  Fixed #6377: distutils compiler switch ignored (and added a deprecation warning if compiler is not used as supposed = a string option)
........
---
 command/build_ext.py    | 77 +++++++++++++++++++++++++++++------------
 tests/test_build_ext.py | 14 ++++++++
 2 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 30457026d4..4a3aec2a65 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -7,6 +7,8 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+from warnings import warn
+
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -112,6 +114,35 @@ class build_ext(Command):
          "list available compilers", show_compilers),
         ]
 
+    # making 'compiler' a property to deprecate
+    # its usage as something else than a compiler type
+    # e.g. like a compiler instance
+    def __init__(self, dist):
+        self._compiler = None
+        Command.__init__(self, dist)
+
+    def __setattr__(self, name, value):
+        # need this to make sure setattr() (used in distutils)
+        # doesn't kill our property
+        if name == 'compiler':
+            self._set_compiler(value)
+        else:
+            self.__dict__[name] = value
+
+    def _set_compiler(self, compiler):
+        if not isinstance(compiler, str) and compiler is not None:
+            # we don't want to allow that anymore in the future
+            warn("'compiler' specify the compiler type in build_ext. "
+                 "If you want to get the compiler object itself, "
+                 "use 'compiler_obj'", PendingDeprecationWarning)
+
+        self._compiler = compiler
+
+    def _get_compiler(self):
+        return self._compiler
+
+    compiler = property(_get_compiler, _set_compiler)
+
     def initialize_options(self):
         self.extensions = None
         self.build_lib = None
@@ -310,38 +341,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=None,
-                                     verbose=self.verbose,
-                                     dry_run=self.dry_run,
-                                     force=self.force)
-        customize_compiler(self.compiler)
+        self.compiler_obj = new_compiler(compiler=self.compiler,
+                                         verbose=self.verbose,
+                                         dry_run=self.dry_run,
+                                         force=self.force)
+        customize_compiler(self.compiler_obj)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler.initialize(self.plat_name)
+            self.compiler_obj.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler.set_include_dirs(self.include_dirs)
+            self.compiler_obj.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler.define_macro(name, value)
+                self.compiler_obj.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler.undefine_macro(macro)
+                self.compiler_obj.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler.set_libraries(self.libraries)
+            self.compiler_obj.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler.set_library_dirs(self.library_dirs)
+            self.compiler_obj.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler.set_runtime_library_dirs(self.rpath)
+            self.compiler_obj.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler.set_link_objects(self.link_objects)
+            self.compiler_obj.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -502,13 +533,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler.compile(sources,
-                                         output_dir=self.build_temp,
-                                         macros=macros,
-                                         include_dirs=ext.include_dirs,
-                                         debug=self.debug,
-                                         extra_postargs=extra_args,
-                                         depends=ext.depends)
+        objects = self.compiler_obj.compile(sources,
+                                            output_dir=self.build_temp,
+                                            macros=macros,
+                                            include_dirs=ext.include_dirs,
+                                            debug=self.debug,
+                                            extra_postargs=extra_args,
+                                            depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -529,9 +560,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler.detect_language(sources)
+        language = ext.language or self.compiler_obj.detect_language(sources)
 
-        self.compiler.link_shared_object(
+        self.compiler_obj.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -698,7 +729,7 @@ def get_libraries(self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler, MSVCCompiler):
+            if not isinstance(self.compiler_obj, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6f0e2309d5..d531293015 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -3,6 +3,9 @@
 import tempfile
 import shutil
 from io import StringIO
+import warnings
+from test.support import check_warnings
+from test.support import captured_stdout
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
@@ -395,6 +398,17 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
         self.assertEquals(wanted, path)
 
+    def test_compiler_deprecation_warning(self):
+        dist = Distribution()
+        cmd = build_ext(dist)
+
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            cmd.compiler = object()
+            self.assertEquals(len(w.warnings), 1)
+            cmd.compile = 'unix'
+            self.assertEquals(len(w.warnings), 1)
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):

From 3d1571717a0bc82b7d050bc447e0714135aa0dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 8 Jul 2009 22:40:51 +0000
Subject: [PATCH 2422/8469] Sets the compiler attribute to keep the old
 behavior for third-party packages.

---
 command/build_ext.py    | 22 +++++++++++++++++++---
 tests/test_build_ext.py | 11 ++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index be37313abc..fadd6337f7 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -134,13 +134,17 @@ def __setattr__(self, name, value):
     def _set_compiler(self, compiler):
         if not isinstance(compiler, str) and compiler is not None:
             # we don't want to allow that anymore in the future
-            warn("'compiler' specify the compiler type in build_ext. "
+            warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
                  "use 'compiler_obj'", PendingDeprecationWarning)
-
         self._compiler = compiler
 
     def _get_compiler(self):
+        if not isinstance(self._compiler, str) and self._compiler is not None:
+            # we don't want to allow that anymore in the future
+            warn("'compiler' specifies the compiler type in build_ext. "
+                 "If you want to get the compiler object itself, "
+                 "use 'compiler_obj'", PendingDeprecationWarning)
         return self._compiler
 
     compiler = property(_get_compiler, _set_compiler)
@@ -343,10 +347,22 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler_obj = new_compiler(compiler=self.compiler,
+
+        # used to prevent the usage of an existing compiler for the
+        # compiler option when calling new_compiler()
+        # this will be removed in 3.3 and 2.8
+        if not isinstance(self._compiler, str):
+            self._compiler = None
+
+        self.compiler_obj = new_compiler(compiler=self._compiler,
                                          verbose=self.verbose,
                                          dry_run=self.dry_run,
                                          force=self.force)
+
+        # used to keep the compiler object reachable with
+        # "self.compiler". this will be removed in 3.3 and 2.8
+        self._compiler = self.compiler_obj
+
         customize_compiler(self.compiler_obj)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index afd0df32dc..9356ff806e 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -402,12 +402,21 @@ def test_compiler_deprecation_warning(self):
         dist = Distribution()
         cmd = build_ext(dist)
 
+        class MyCompiler(object):
+            def do_something(self):
+                pass
+
         with check_warnings() as w:
             warnings.simplefilter("always")
-            cmd.compiler = object()
+            cmd.compiler = MyCompiler()
             self.assertEquals(len(w.warnings), 1)
             cmd.compile = 'unix'
             self.assertEquals(len(w.warnings), 1)
+            cmd.compiler = MyCompiler()
+            cmd.compiler.do_something()
+            # two more warnings genereated by the get
+            # and the set
+            self.assertEquals(len(w.warnings), 3)
 
 def test_suite():
     src = _get_source_filename()

From ea0bff08c9afaa3f0996dade7f847f8e397efa60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 8 Jul 2009 22:42:43 +0000
Subject: [PATCH 2423/8469] Merged revisions 73895 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73895 | tarek.ziade | 2009-07-09 00:40:51 +0200 (Thu, 09 Jul 2009) | 1 line

  Sets the compiler attribute to keep the old behavior for third-party packages.
........
---
 command/build_ext.py    | 22 +++++++++++++++++++---
 tests/test_build_ext.py | 11 ++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4a3aec2a65..d8bb251294 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -132,13 +132,17 @@ def __setattr__(self, name, value):
     def _set_compiler(self, compiler):
         if not isinstance(compiler, str) and compiler is not None:
             # we don't want to allow that anymore in the future
-            warn("'compiler' specify the compiler type in build_ext. "
+            warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
                  "use 'compiler_obj'", PendingDeprecationWarning)
-
         self._compiler = compiler
 
     def _get_compiler(self):
+        if not isinstance(self._compiler, str) and self._compiler is not None:
+            # we don't want to allow that anymore in the future
+            warn("'compiler' specifies the compiler type in build_ext. "
+                 "If you want to get the compiler object itself, "
+                 "use 'compiler_obj'", PendingDeprecationWarning)
         return self._compiler
 
     compiler = property(_get_compiler, _set_compiler)
@@ -341,10 +345,22 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler_obj = new_compiler(compiler=self.compiler,
+
+        # used to prevent the usage of an existing compiler for the
+        # compiler option when calling new_compiler()
+        # this will be removed in 3.3 and 2.8
+        if not isinstance(self._compiler, str):
+            self._compiler = None
+
+        self.compiler_obj = new_compiler(compiler=self._compiler,
                                          verbose=self.verbose,
                                          dry_run=self.dry_run,
                                          force=self.force)
+
+        # used to keep the compiler object reachable with
+        # "self.compiler". this will be removed in 3.3 and 2.8
+        self._compiler = self.compiler_obj
+
         customize_compiler(self.compiler_obj)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d531293015..6829583746 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -402,12 +402,21 @@ def test_compiler_deprecation_warning(self):
         dist = Distribution()
         cmd = build_ext(dist)
 
+        class MyCompiler(object):
+            def do_something(self):
+                pass
+
         with check_warnings() as w:
             warnings.simplefilter("always")
-            cmd.compiler = object()
+            cmd.compiler = MyCompiler()
             self.assertEquals(len(w.warnings), 1)
             cmd.compile = 'unix'
             self.assertEquals(len(w.warnings), 1)
+            cmd.compiler = MyCompiler()
+            cmd.compiler.do_something()
+            # two more warnings genereated by the get
+            # and the set
+            self.assertEquals(len(w.warnings), 3)
 
 def test_suite():
     src = _get_source_filename()

From 29efe3a5fa50723fc6ca62dd6670889e69732f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 9 Jul 2009 07:42:42 +0000
Subject: [PATCH 2424/8469] PendingDeprecationWarning -> DeprecationWarning in
 build_ext

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

diff --git a/command/build_ext.py b/command/build_ext.py
index fadd6337f7..86513ea9e9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -136,7 +136,7 @@ def _set_compiler(self, compiler):
             # we don't want to allow that anymore in the future
             warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", PendingDeprecationWarning)
+                 "use 'compiler_obj'", DeprecationWarning)
         self._compiler = compiler
 
     def _get_compiler(self):
@@ -144,7 +144,7 @@ def _get_compiler(self):
             # we don't want to allow that anymore in the future
             warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", PendingDeprecationWarning)
+                 "use 'compiler_obj'", DeprecationWarning)
         return self._compiler
 
     compiler = property(_get_compiler, _set_compiler)

From 83f285d2a77f1d46292e759dbb90b1e025555fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 9 Jul 2009 07:46:10 +0000
Subject: [PATCH 2425/8469] Merged revisions 73901 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73901 | tarek.ziade | 2009-07-09 09:42:42 +0200 (Thu, 09 Jul 2009) | 1 line

  PendingDeprecationWarning -> DeprecationWarning in build_ext
........
---
 command/build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index d8bb251294..6f90499229 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -134,7 +134,7 @@ def _set_compiler(self, compiler):
             # we don't want to allow that anymore in the future
             warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", PendingDeprecationWarning)
+                 "use 'compiler_obj'", DeprecationWarning)
         self._compiler = compiler
 
     def _get_compiler(self):
@@ -142,7 +142,7 @@ def _get_compiler(self):
             # we don't want to allow that anymore in the future
             warn("'compiler' specifies the compiler type in build_ext. "
                  "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", PendingDeprecationWarning)
+                 "use 'compiler_obj'", DeprecationWarning)
         return self._compiler
 
     compiler = property(_get_compiler, _set_compiler)

From 2e8960b7459d92bcb1eac2bb9e3eeeac97aea91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:10:33 +0000
Subject: [PATCH 2426/8469] Fixed #6455 (the test shall use pyd files under
 win32, rather than so files)

---
 tests/test_build_ext.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 9356ff806e..4c09dd80a3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -362,6 +362,7 @@ def test_get_outputs(self):
         self.assertEquals(lastdir, 'bar')
 
     def test_ext_fullpath(self):
+        ext = sysconfig.get_config_vars()['SO']
         # building lxml.etree inplace
         #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
         #etree_ext = Extension('lxml.etree', [etree_c])
@@ -372,14 +373,14 @@ def test_ext_fullpath(self):
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
-        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
@@ -389,13 +390,13 @@ def test_ext_fullpath(self):
         cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
-                              'portmap.so')
+                              'portmap' + ext)
         self.assertEquals(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
-        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
     def test_compiler_deprecation_warning(self):

From de551ca3893c39b20819e3da991b39f5892a4bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:13:17 +0000
Subject: [PATCH 2427/8469] Merged revisions 73921 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73921 | tarek.ziade | 2009-07-10 11:10:33 +0200 (Fri, 10 Jul 2009) | 1 line

  Fixed #6455 (the test shall use pyd files under win32, rather than so files)
........
---
 tests/test_build_ext.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e01c882069..153c875644 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -296,20 +296,21 @@ def test_get_outputs(self):
         self.assertEquals(lastdir, 'bar')
 
     def test_ext_fullpath(self):
+        ext = sysconfig.get_config_vars()['SO']
         dist = Distribution()
         cmd = build_ext(dist)
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
-        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
@@ -319,13 +320,13 @@ def test_ext_fullpath(self):
         cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
-                              'portmap.so')
+                              'portmap' + ext)
         self.assertEquals(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
-        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
 def test_suite():

From 6aecd94fef0f521cf3839365e53e7272d23327f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:14:31 +0000
Subject: [PATCH 2428/8469] Merged revisions 73921 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73921 | tarek.ziade | 2009-07-10 11:10:33 +0200 (Fri, 10 Jul 2009) | 1 line

  Fixed #6455 (the test shall use pyd files under win32, rather than so files)
........
---
 tests/test_build_ext.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6829583746..d97a97eba0 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -362,6 +362,7 @@ def test_get_outputs(self):
         self.assertEquals(lastdir, 'bar')
 
     def test_ext_fullpath(self):
+        ext = sysconfig.get_config_vars()['SO']
         # building lxml.etree inplace
         #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
         #etree_ext = Extension('lxml.etree', [etree_c])
@@ -372,14 +373,14 @@ def test_ext_fullpath(self):
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
-        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
@@ -389,13 +390,13 @@ def test_ext_fullpath(self):
         cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
-                              'portmap.so')
+                              'portmap' + ext)
         self.assertEquals(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
-        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
     def test_compiler_deprecation_warning(self):

From 0c03a8176da33be31b41552fb2f36ec985e35277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:16:07 +0000
Subject: [PATCH 2429/8469] Merged revisions 73923 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73923 | tarek.ziade | 2009-07-10 11:14:31 +0200 (Fri, 10 Jul 2009) | 9 lines

  Merged revisions 73921 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73921 | tarek.ziade | 2009-07-10 11:10:33 +0200 (Fri, 10 Jul 2009) | 1 line

    Fixed #6455 (the test shall use pyd files under win32, rather than so files)
  ........
................
---
 tests/test_build_ext.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index f0580c1f0f..c671483622 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -359,6 +359,7 @@ def test_get_outputs(self):
         self.assertEquals(lastdir, 'bar')
 
     def test_ext_fullpath(self):
+        ext = sysconfig.get_config_vars()['SO']
         # building lxml.etree inplace
         #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
         #etree_ext = Extension('lxml.etree', [etree_c])
@@ -369,14 +370,14 @@ def test_ext_fullpath(self):
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
-        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree.so')
+        wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
@@ -386,13 +387,13 @@ def test_ext_fullpath(self):
         cmd.distribution.packages = ['twisted', 'twisted.runner.portmap']
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
-                              'portmap.so')
+                              'portmap' + ext)
         self.assertEquals(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
-        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap.so')
+        wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
 def test_suite():

From 015479841be6a07ee482f02cbd2aa6954a36729d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 09:57:15 +0000
Subject: [PATCH 2430/8469] Added test coverage for distutils.command.build

---
 tests/test_build.py | 54 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 tests/test_build.py

diff --git a/tests/test_build.py b/tests/test_build.py
new file mode 100644
index 0000000000..6bca27ee06
--- /dev/null
+++ b/tests/test_build.py
@@ -0,0 +1,54 @@
+"""Tests for distutils.command.build."""
+import unittest
+import os
+import sys
+
+from distutils.command.build import build
+from distutils.tests import support
+from distutils.util import get_platform
+
+class BuildTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
+                    unittest.TestCase):
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build(dist)
+        cmd.finalize_options()
+
+        # if not specified, plat_name gets the current platform
+        self.assertEquals(cmd.plat_name, get_platform())
+
+        # build_purelib is build + lib
+        wanted = os.path.join(cmd.build_base, 'lib')
+        self.assertEquals(cmd.build_purelib, wanted)
+
+        # build_platlib is 'build/lib.platform-x.x[-pydebug]'
+        # examples:
+        #   build/lib.macosx-10.3-i386-2.7
+        plat_spec = '.%s-%s' % (cmd.plat_name, sys.version[0:3])
+        if hasattr(sys, 'gettotalrefcount'):
+            self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
+            plat_spec += '-pydebug'
+        wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
+        self.assertEquals(cmd.build_platlib, wanted)
+
+        # by default, build_lib = build_purelib
+        self.assertEquals(cmd.build_lib, cmd.build_purelib)
+
+        # build_temp is build/temp.<plat>
+        wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
+        self.assertEquals(cmd.build_temp, wanted)
+
+        # build_scripts is build/scripts-x.x
+        wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
+        self.assertEquals(cmd.build_scripts, wanted)
+
+        # executable is os.path.normpath(sys.executable)
+        self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
+
+def test_suite():
+    return unittest.makeSuite(BuildTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 56d544027577bfa402454b464e128f149c2929f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 10:00:21 +0000
Subject: [PATCH 2431/8469] cleaned up distutils.command.build

---
 command/build.py | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/command/build.py b/command/build.py
index 84e050204e..d394e4b1da 100644
--- a/command/build.py
+++ b/command/build.py
@@ -9,13 +9,11 @@
 from distutils.errors import DistutilsOptionError
 from distutils.util import get_platform
 
-
-def show_compilers ():
+def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
-
-class build (Command):
+class build(Command):
 
     description = "build everything needed to install"
 
@@ -53,7 +51,7 @@ class build (Command):
          "list available compilers", show_compilers),
         ]
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.build_base = 'build'
         # these are decided only after 'build_base' has its final value
         # (unless overridden by the user or client)
@@ -68,8 +66,7 @@ def initialize_options (self):
         self.force = 0
         self.executable = None
 
-    def finalize_options (self):
-
+    def finalize_options(self):
         if self.plat_name is None:
             self.plat_name = get_platform()
         else:
@@ -118,11 +115,8 @@ def finalize_options (self):
 
         if self.executable is None:
             self.executable = os.path.normpath(sys.executable)
-    # finalize_options ()
-
-
-    def run (self):
 
+    def run(self):
         # Run all relevant sub-commands.  This will be some subset of:
         #  - build_py      - pure Python modules
         #  - build_clib    - standalone C libraries
@@ -131,7 +125,6 @@ def run (self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
 
-
     # -- Predicates for the sub-command list ---------------------------
 
     def has_pure_modules (self):
@@ -146,11 +139,8 @@ def has_ext_modules (self):
     def has_scripts (self):
         return self.distribution.has_scripts()
 
-
     sub_commands = [('build_py',      has_pure_modules),
                     ('build_clib',    has_c_libraries),
                     ('build_ext',     has_ext_modules),
                     ('build_scripts', has_scripts),
                    ]
-
-# class build

From 6375e0821736229bf071350a185e6a984f16d368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 10 Jul 2009 10:03:20 +0000
Subject: [PATCH 2432/8469] Merged revisions 73925-73926 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73925 | tarek.ziade | 2009-07-10 11:57:15 +0200 (Fri, 10 Jul 2009) | 1 line

  Added test coverage for distutils.command.build
........
  r73926 | tarek.ziade | 2009-07-10 12:00:21 +0200 (Fri, 10 Jul 2009) | 1 line

  cleaned up distutils.command.build
........
---
 command/build.py    |  4 ----
 tests/test_build.py | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_build.py

diff --git a/command/build.py b/command/build.py
index 9c2667cfd2..715621e1d7 100644
--- a/command/build.py
+++ b/command/build.py
@@ -9,12 +9,10 @@
 from distutils.errors import DistutilsOptionError
 from distutils.util import get_platform
 
-
 def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
-
 class build(Command):
 
     description = "build everything needed to install"
@@ -127,7 +125,6 @@ def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
 
-
     # -- Predicates for the sub-command list ---------------------------
 
     def has_pure_modules(self):
@@ -142,7 +139,6 @@ def has_ext_modules(self):
     def has_scripts(self):
         return self.distribution.has_scripts()
 
-
     sub_commands = [('build_py',      has_pure_modules),
                     ('build_clib',    has_c_libraries),
                     ('build_ext',     has_ext_modules),
diff --git a/tests/test_build.py b/tests/test_build.py
new file mode 100644
index 0000000000..6bca27ee06
--- /dev/null
+++ b/tests/test_build.py
@@ -0,0 +1,54 @@
+"""Tests for distutils.command.build."""
+import unittest
+import os
+import sys
+
+from distutils.command.build import build
+from distutils.tests import support
+from distutils.util import get_platform
+
+class BuildTestCase(support.TempdirManager,
+                    support.LoggingSilencer,
+                    unittest.TestCase):
+
+    def test_finalize_options(self):
+        pkg_dir, dist = self.create_dist()
+        cmd = build(dist)
+        cmd.finalize_options()
+
+        # if not specified, plat_name gets the current platform
+        self.assertEquals(cmd.plat_name, get_platform())
+
+        # build_purelib is build + lib
+        wanted = os.path.join(cmd.build_base, 'lib')
+        self.assertEquals(cmd.build_purelib, wanted)
+
+        # build_platlib is 'build/lib.platform-x.x[-pydebug]'
+        # examples:
+        #   build/lib.macosx-10.3-i386-2.7
+        plat_spec = '.%s-%s' % (cmd.plat_name, sys.version[0:3])
+        if hasattr(sys, 'gettotalrefcount'):
+            self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
+            plat_spec += '-pydebug'
+        wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
+        self.assertEquals(cmd.build_platlib, wanted)
+
+        # by default, build_lib = build_purelib
+        self.assertEquals(cmd.build_lib, cmd.build_purelib)
+
+        # build_temp is build/temp.<plat>
+        wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
+        self.assertEquals(cmd.build_temp, wanted)
+
+        # build_scripts is build/scripts-x.x
+        wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
+        self.assertEquals(cmd.build_scripts, wanted)
+
+        # executable is os.path.normpath(sys.executable)
+        self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
+
+def test_suite():
+    return unittest.makeSuite(BuildTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From c7cb2d865ed19c68df148b0cd0018914c2a68b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 10:48:31 +0000
Subject: [PATCH 2433/8469] cleaned up distutils.build_ext module

---
 command/build_ext.py | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 86513ea9e9..0c79476bac 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -6,8 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
-from types import *
+import sys, os, re
 from warnings import warn
 
 from distutils.core import Command
@@ -41,7 +40,7 @@ def show_compilers ():
     show_compilers()
 
 
-class build_ext (Command):
+class build_ext(Command):
 
     description = "build C/C++ extensions (compile/link to build directory)"
 
@@ -149,7 +148,7 @@ def _get_compiler(self):
 
     compiler = property(_get_compiler, _set_compiler)
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.extensions = None
         self.build_lib = None
         self.plat_name = None
@@ -213,13 +212,13 @@ def finalize_options(self):
             self.libraries = []
         if self.library_dirs is None:
             self.library_dirs = []
-        elif type(self.library_dirs) is StringType:
-            self.library_dirs = string.split(self.library_dirs, os.pathsep)
+        elif isinstance(self.library_dirs, str):
+            self.library_dirs = self.library_dirs.split(os.pathsep)
 
         if self.rpath is None:
             self.rpath = []
-        elif type(self.rpath) is StringType:
-            self.rpath = string.split(self.rpath, os.pathsep)
+        elif isinstance(self.rpath, str):
+            self.rpath = self.rpath.split(os.pathsep)
 
         # for extensions under windows use different directories
         # for Release and Debug builds.
@@ -296,7 +295,7 @@ def finalize_options(self):
 
         if self.define:
             defines = self.define.split(',')
-            self.define = map(lambda symbol: (symbol, '1'), defines)
+            self.define = [(symbol, '1') for symbol in defines]
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
@@ -512,7 +511,7 @@ def build_extensions(self):
 
     def build_extension(self, ext):
         sources = ext.sources
-        if sources is None or type(sources) not in (ListType, TupleType):
+        if sources is None or not isinstance(sources, (list, tuple)):
             raise DistutilsSetupError, \
                   ("in 'ext_modules' option (extension '%s'), " +
                    "'sources' must be present and must be " +
@@ -593,14 +592,12 @@ def build_extension(self, ext):
             target_lang=language)
 
 
-    def swig_sources (self, sources, extension):
-
+    def swig_sources(self, sources, extension):
         """Walk the list of source files in 'sources', looking for SWIG
         interface (.i) files.  Run SWIG on all that are found, and
         return a modified 'sources' list with SWIG source files replaced
         by the generated C (or C++) files.
         """
-
         new_sources = []
         swig_sources = []
         swig_targets = {}
@@ -649,9 +646,7 @@ def swig_sources (self, sources, extension):
 
         return new_sources
 
-    # swig_sources ()
-
-    def find_swig (self):
+    def find_swig(self):
         """Return the name of the SWIG executable.  On Unix, this is
         just "swig" -- it should be in the PATH.  Tries a bit harder on
         Windows.
@@ -680,8 +675,6 @@ def find_swig (self):
                   ("I don't know how to find (much less run) SWIG "
                    "on platform '%s'") % os.name
 
-    # find_swig ()
-
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
     def get_ext_fullpath(self, ext_name):
@@ -726,29 +719,28 @@ def get_ext_filename(self, ext_name):
         "foo\bar.pyd").
         """
         from distutils.sysconfig import get_config_var
-        ext_path = string.split(ext_name, '.')
+        ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply(os.path.join, ext_path) + '_d' + so_ext
+            return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
 
-    def get_export_symbols (self, ext):
+    def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
         provided, "init" + module_name.  Only relevant on Windows, where
         the .pyd file (DLL) must export the module "init" function.
         """
-
-        initfunc_name = "init" + string.split(ext.name,'.')[-1]
+        initfunc_name = "init" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
 
-    def get_libraries (self, ext):
+    def get_libraries(self, ext):
         """Return the list of libraries to link against when building a
         shared extension.  On most platforms, this is just 'ext.libraries';
         on Windows and OS/2, we add the Python library (eg. python20.dll).
@@ -821,5 +813,3 @@ def get_libraries (self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-
-# class build_ext

From 2bd17a600378485e8740d04c6715f2ce381254a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 10:55:27 +0000
Subject: [PATCH 2434/8469] fixed #6459:
 distutils.command.build_ext.get_export_symbols now uses 'PyInit'

---
 command/build_ext.py    | 6 +++---
 tests/test_build_ext.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0c79476bac..17cb26b526 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -732,10 +732,10 @@ def get_ext_filename(self, ext_name):
     def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
-        provided, "init" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "init" function.
+        provided, "PyInit_" + module_name.  Only relevant on Windows, where
+        the .pyd file (DLL) must export the module "PyInit_" function.
         """
-        initfunc_name = "init" + ext.name.split('.')[-1]
+        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4c09dd80a3..7886c792bd 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -299,7 +299,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From d7048753d100a97e2251f20a7756c15499492d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 10:57:49 +0000
Subject: [PATCH 2435/8469] Merged revisions 73946 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73946 | tarek.ziade | 2009-07-11 12:55:27 +0200 (Sat, 11 Jul 2009) | 1 line

  fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit'
........
---
 command/build_ext.py    | 7 +++----
 tests/test_build_ext.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8cb1efe67e..ccc3fe564c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -680,11 +680,10 @@ def get_ext_filename(self, ext_name):
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
-        provided, "init" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "init" function.
+        provided, "PyInit_" + module_name.  Only relevant on Windows, where
+        the .pyd file (DLL) must export the module "PyInit_" function.
         """
-
-        initfunc_name = "init" + string.split(ext.name,'.')[-1]
+        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 153c875644..d992548059 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -233,7 +233,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
         ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 72a548f960200f1057295b791828ec1698a5c639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 10:59:56 +0000
Subject: [PATCH 2436/8469] Merged revisions 73946 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73946 | tarek.ziade | 2009-07-11 12:55:27 +0200 (Sat, 11 Jul 2009) | 1 line

  fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit'
........
---
 command/build_ext.py    | 2 +-
 tests/test_build_ext.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 6f90499229..14c529ac5b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -726,7 +726,7 @@ def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
         provided, "PyInit_" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "init" function.
+        the .pyd file (DLL) must export the module "PyInit_" function.
         """
         initfunc_name = "PyInit_" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d97a97eba0..7a27f343a7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -299,7 +299,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 3b8fc3f7befd6da629a7875863c6d1eadda34b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 11:01:14 +0000
Subject: [PATCH 2437/8469] Merged revisions 73948 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73948 | tarek.ziade | 2009-07-11 12:59:56 +0200 (Sat, 11 Jul 2009) | 9 lines

  Merged revisions 73946 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73946 | tarek.ziade | 2009-07-11 12:55:27 +0200 (Sat, 11 Jul 2009) | 1 line

    fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit'
  ........
................
---
 command/build_ext.py    | 2 +-
 tests/test_build_ext.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 30457026d4..1596586499 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -679,7 +679,7 @@ def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
         provided, "PyInit_" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "init" function.
+        the .pyd file (DLL) must export the module "PyInit_" function.
         """
         initfunc_name = "PyInit_" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index c671483622..9861ee2993 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -296,7 +296,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void initfoo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From d901b9150542ff215c1a621991c10f3e5ec342c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 17:21:00 +0000
Subject: [PATCH 2438/8469] reverted changes for #6459 (doesn't apply on 2.x)

---
 command/build_ext.py    | 6 +++---
 tests/test_build_ext.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 17cb26b526..0c79476bac 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -732,10 +732,10 @@ def get_ext_filename(self, ext_name):
     def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
-        provided, "PyInit_" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "PyInit_" function.
+        provided, "init" + module_name.  Only relevant on Windows, where
+        the .pyd file (DLL) must export the module "init" function.
         """
-        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
+        initfunc_name = "init" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 7886c792bd..51a21a68b4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -299,7 +299,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
+        self.write_file(c_file, 'void init_foo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 2ee6163d4df9600975467bbc57a6f6e9a3008ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 11 Jul 2009 17:22:14 +0000
Subject: [PATCH 2439/8469] Merged revisions 73954 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73954 | tarek.ziade | 2009-07-11 19:21:00 +0200 (Sat, 11 Jul 2009) | 1 line

  reverted changes for #6459 (doesn't apply on 2.x)
........
---
 command/build_ext.py    | 6 +++---
 tests/test_build_ext.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ccc3fe564c..db82f1d0d6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -680,10 +680,10 @@ def get_ext_filename(self, ext_name):
     def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
-        provided, "PyInit_" + module_name.  Only relevant on Windows, where
-        the .pyd file (DLL) must export the module "PyInit_" function.
+        provided, "init" + module_name.  Only relevant on Windows, where
+        the .pyd file (DLL) must export the module "init" function.
         """
-        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
+        initfunc_name = "init" + ext.name.split('.')[-1]
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d992548059..d0716485dc 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -233,7 +233,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
+        self.write_file(c_file, 'void init_foo(void) {};\n')
         ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 0e0874b3e717156832ea24bb06f46147af1103dd Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 12 Jul 2009 02:04:47 +0000
Subject: [PATCH 2440/8469] Fixed distutils test.

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 51a21a68b4..4c09dd80a3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -299,7 +299,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void init_foo(void) {};\n')
+        self.write_file(c_file, 'void initfoo(void) {};\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From da220af37e1ec7552ff8f8724d03136f6aa96b4d Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 12 Jul 2009 02:09:25 +0000
Subject: [PATCH 2441/8469] Merged revisions 73970 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73970 | hirokazu.yamamoto | 2009-07-12 11:04:47 +0900 | 1 line

  Fixed distutils test.
........
---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d0716485dc..153c875644 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -233,7 +233,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void init_foo(void) {};\n')
+        self.write_file(c_file, 'void initfoo(void) {};\n')
         ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From d28cb5fd8236e1d5949e62723a7688dcaa12f447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Jul 2009 08:27:26 +0000
Subject: [PATCH 2442/8469] Fixed #6438: distutils.cygwinccompiler.get_versions
 was trying to use a re string pattern on a bytes

---
 cygwinccompiler.py            |  6 ++++--
 tests/test_cygwinccompiler.py | 17 +++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 5f3a389e29..8504371810 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -359,7 +359,7 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
+RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
 
 def _find_exe_version(cmd):
     """Find the version of an executable by running `cmd` in the shell.
@@ -378,7 +378,9 @@ def _find_exe_version(cmd):
     result = RE_VERSION.search(out_string)
     if result is None:
         return None
-    return LooseVersion(result.group(1))
+    # LooseVersion works with strings
+    # so we need to decode our bytes
+    return LooseVersion(result.group(1).decode())
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index c5a6495da5..a57694d48e 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -2,7 +2,7 @@
 import unittest
 import sys
 import os
-from io import StringIO
+from io import BytesIO
 import subprocess
 
 from distutils import cygwinccompiler
@@ -19,7 +19,8 @@ def __init__(self, cmd, shell, stdout):
         self.cmd = cmd.split()[0]
         exes = self.test_class._exes
         if self.cmd in exes:
-            self.stdout = StringIO(exes[self.cmd])
+            # issue #6438 in Python 3.x, Popen returns bytes
+            self.stdout = BytesIO(exes[self.cmd])
         else:
             self.stdout = os.popen(cmd, 'r')
 
@@ -87,30 +88,30 @@ def test_get_versions(self):
         self.assertEquals(get_versions(), (None, None, None))
 
         # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
         res = get_versions()
         self.assertEquals(str(res[0]), '3.4.5')
 
         # and let's see what happens when the version
         # doesn't match the regular expression
         # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = 'very strange output'
+        self._exes['gcc'] = b'very strange output'
         res = get_versions()
         self.assertEquals(res[0], None)
 
         # same thing for ld
-        self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+        self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
         res = get_versions()
         self.assertEquals(str(res[1]), '2.17.50')
-        self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+        self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
         res = get_versions()
         self.assertEquals(res[1], None)
 
         # and dllwrap
-        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
+        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
         res = get_versions()
         self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = 'Cheese Wrap'
+        self._exes['dllwrap'] = b'Cheese Wrap'
         res = get_versions()
         self.assertEquals(res[2], None)
 

From 716024cb88a39f8550ed10b312b3f8cec75a1e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 12 Jul 2009 08:39:08 +0000
Subject: [PATCH 2443/8469] Merged revisions 73975 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73975 | tarek.ziade | 2009-07-12 10:27:26 +0200 (Sun, 12 Jul 2009) | 1 line

  Fixed #6438: distutils.cygwinccompiler.get_versions was trying to use a re string pattern on a bytes
........
---
 cygwinccompiler.py            |  6 ++++--
 tests/test_cygwinccompiler.py | 17 +++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 5f3a389e29..8504371810 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -359,7 +359,7 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
+RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
 
 def _find_exe_version(cmd):
     """Find the version of an executable by running `cmd` in the shell.
@@ -378,7 +378,9 @@ def _find_exe_version(cmd):
     result = RE_VERSION.search(out_string)
     if result is None:
         return None
-    return LooseVersion(result.group(1))
+    # LooseVersion works with strings
+    # so we need to decode our bytes
+    return LooseVersion(result.group(1).decode())
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index c5a6495da5..a57694d48e 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -2,7 +2,7 @@
 import unittest
 import sys
 import os
-from io import StringIO
+from io import BytesIO
 import subprocess
 
 from distutils import cygwinccompiler
@@ -19,7 +19,8 @@ def __init__(self, cmd, shell, stdout):
         self.cmd = cmd.split()[0]
         exes = self.test_class._exes
         if self.cmd in exes:
-            self.stdout = StringIO(exes[self.cmd])
+            # issue #6438 in Python 3.x, Popen returns bytes
+            self.stdout = BytesIO(exes[self.cmd])
         else:
             self.stdout = os.popen(cmd, 'r')
 
@@ -87,30 +88,30 @@ def test_get_versions(self):
         self.assertEquals(get_versions(), (None, None, None))
 
         # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
         res = get_versions()
         self.assertEquals(str(res[0]), '3.4.5')
 
         # and let's see what happens when the version
         # doesn't match the regular expression
         # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = 'very strange output'
+        self._exes['gcc'] = b'very strange output'
         res = get_versions()
         self.assertEquals(res[0], None)
 
         # same thing for ld
-        self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+        self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
         res = get_versions()
         self.assertEquals(str(res[1]), '2.17.50')
-        self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+        self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
         res = get_versions()
         self.assertEquals(res[1], None)
 
         # and dllwrap
-        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
+        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
         res = get_versions()
         self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = 'Cheese Wrap'
+        self._exes['dllwrap'] = b'Cheese Wrap'
         res = get_versions()
         self.assertEquals(res[2], None)
 

From 01a07bef9a2a900b2ae961c1cd8b98f4c43d5b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 16 Jul 2009 15:35:45 +0000
Subject: [PATCH 2444/8469] #6466 refactored distutils duplicate get_versions()
 functions (used to get gcc/ld/dllwrap versions)

---
 cygwinccompiler.py            | 42 +++++++--------
 emxccompiler.py               | 33 +++++-------
 tests/test_cygwinccompiler.py | 83 ++++++++----------------------
 tests/test_emxccompiler.py    | 33 ++++++++++++
 tests/test_util.py            | 97 +++++++++++++++++++++++++++++++++--
 util.py                       | 54 ++++++++++++++++++-
 6 files changed, 231 insertions(+), 111 deletions(-)
 create mode 100644 tests/test_emxccompiler.py

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index c35e49d713..a8476e6579 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -50,16 +50,15 @@
 import os
 import sys
 import copy
-from subprocess import Popen, PIPE
 import re
+from warnings import warn
 
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
-from distutils.version import LooseVersion
-from distutils.spawn import find_executable
+from distutils.util import get_compiler_versions
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -110,7 +109,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
                 % details)
 
         self.gcc_version, self.ld_version, self.dllwrap_version = \
-            get_versions()
+            get_compiler_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version,
                           self.ld_version,
@@ -359,31 +358,26 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
+class _Deprecated_SRE_Pattern(object):
+    def __init__(self, pattern):
+        self.pattern = pattern
 
-def _find_exe_version(cmd):
-    """Find the version of an executable by running `cmd` in the shell.
+    def __getattr__(self, name):
+        if name in ('findall', 'finditer', 'match', 'scanner', 'search',
+                    'split', 'sub', 'subn'):
+            warn("'distutils.cygwinccompiler.RE_VERSION' is deprecated "
+                 "and will be removed in the next version", DeprecationWarning)
+        return getattr(self.pattern, name)
 
-    If the command is not found, or the output does not match
-    `RE_VERSION`, returns None.
-    """
-    executable = cmd.split()[0]
-    if find_executable(executable) is None:
-        return None
-    out = Popen(cmd, shell=True, stdout=PIPE).stdout
-    try:
-        out_string = out.read()
-    finally:
-        out.close()
-    result = RE_VERSION.search(out_string)
-    if result is None:
-        return None
-    return LooseVersion(result.group(1))
+RE_VERSION = _Deprecated_SRE_Pattern(re.compile('(\d+\.\d+(\.\d+)*)'))
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
 
     If not possible it returns None for it.
     """
-    commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
-    return tuple([_find_exe_version(cmd) for cmd in commands])
+    warn("'distutils.cygwinccompiler.get_versions' is deprecated "
+         "use 'distutils.util.get_compiler_versions' instead",
+         DeprecationWarning)
+
+    return get_compiler_versions()
diff --git a/emxccompiler.py b/emxccompiler.py
index f52e63232d..a5a2ef88fe 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -21,12 +21,15 @@
 
 __revision__ = "$Id$"
 
-import os,sys,copy
+import os, sys, copy
+from warnings import warn
+
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
+from distutils.util import get_compiler_versions
 
 class EMXCCompiler (UnixCCompiler):
 
@@ -55,8 +58,8 @@ def __init__ (self,
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
 
-        (self.gcc_version, self.ld_version) = \
-            get_versions()
+        gcc_version, ld_version, dllwrap_version = get_compiler_versions()
+        self.gcc_version, self.ld_version = gcc_version, ld_version
         self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
                          (self.gcc_version,
                           self.ld_version) )
@@ -293,23 +296,11 @@ def get_versions():
     """ Try to find out the versions of gcc and ld.
         If not possible it returns None for it.
     """
-    from distutils.version import StrictVersion
-    from distutils.spawn import find_executable
-    import re
-
-    gcc_exe = find_executable('gcc')
-    if gcc_exe:
-        out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+\.\d+)',out_string)
-        if result:
-            gcc_version = StrictVersion(result.group(1))
-        else:
-            gcc_version = None
-    else:
-        gcc_version = None
+    warn("'distutils.emxccompiler.get_versions' is deprecated "
+         "use 'distutils.util.get_compiler_versions' instead",
+         DeprecationWarning)
+
     # EMX ld has no way of reporting version number, and we use GCC
     # anyway - so we can link OMF DLLs
-    ld_version = None
-    return (gcc_version, ld_version)
+    gcc_version, ld_version, dllwrap_version = get_compiler_versions()
+    return gcc_version, None
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index fb823e4d80..b54ffff361 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -2,28 +2,19 @@
 import unittest
 import sys
 import os
-from StringIO import StringIO
-import subprocess
+import warnings
+
+from test.test_support import check_warnings
+from test.test_support import captured_stdout
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
                                        CONFIG_H_UNCERTAIN, get_versions,
-                                       get_msvcr)
+                                       get_msvcr, RE_VERSION)
+from distutils.util import get_compiler_versions
 from distutils.tests import support
 
-class FakePopen(object):
-    test_class = None
-
-    def __init__(self, cmd, shell, stdout):
-        self.cmd = cmd.split()[0]
-        exes = self.test_class._exes
-        if self.cmd in exes:
-            self.stdout = StringIO(exes[self.cmd])
-        else:
-            self.stdout = os.popen(cmd, 'r')
-
-
 class CygwinCCompilerTestCase(support.TempdirManager,
                               unittest.TestCase):
 
@@ -34,29 +25,16 @@ def setUp(self):
         from distutils import sysconfig
         self.old_get_config_h_filename = sysconfig.get_config_h_filename
         sysconfig.get_config_h_filename = self._get_config_h_filename
-        self.old_find_executable = cygwinccompiler.find_executable
-        cygwinccompiler.find_executable = self._find_executable
-        self._exes = {}
-        self.old_popen = cygwinccompiler.Popen
-        FakePopen.test_class = self
-        cygwinccompiler.Popen = FakePopen
 
     def tearDown(self):
         sys.version = self.version
         from distutils import sysconfig
         sysconfig.get_config_h_filename = self.old_get_config_h_filename
-        cygwinccompiler.find_executable = self.old_find_executable
-        cygwinccompiler.Popen = self.old_popen
         super(CygwinCCompilerTestCase, self).tearDown()
 
     def _get_config_h_filename(self):
         return self.python_h
 
-    def _find_executable(self, name):
-        if name in self._exes:
-            return name
-        return None
-
     def test_check_config_h(self):
 
         # check_config_h looks for "GCC" in sys.version first
@@ -80,40 +58,6 @@ def test_check_config_h(self):
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
         self.assertEquals(check_config_h()[0], CONFIG_H_OK)
 
-    def test_get_versions(self):
-
-        # get_versions calls distutils.spawn.find_executable on
-        # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_versions(), (None, None, None))
-
-        # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
-        res = get_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
-
-        # and let's see what happens when the version
-        # doesn't match the regular expression
-        # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = 'very strange output'
-        res = get_versions()
-        self.assertEquals(res[0], None)
-
-        # same thing for ld
-        self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
-        res = get_versions()
-        self.assertEquals(str(res[1]), '2.17.50')
-        self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
-        res = get_versions()
-        self.assertEquals(res[1], None)
-
-        # and dllwrap
-        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
-        res = get_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = 'Cheese Wrap'
-        res = get_versions()
-        self.assertEquals(res[2], None)
-
     def test_get_msvcr(self):
 
         # none
@@ -146,6 +90,21 @@ def test_get_msvcr(self):
                        '[MSC v.1999 32 bits (Intel)]')
         self.assertRaises(ValueError, get_msvcr)
 
+
+    def test_get_version_deprecated(self):
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            # make sure get_compiler_versions and get_versions
+            # returns the same thing
+            self.assertEquals(get_compiler_versions(), get_versions())
+            # make sure using get_version() generated a warning
+            self.assertEquals(len(w.warnings), 1)
+            # make sure any usage of RE_VERSION will also
+            # generate a warning, but till works
+            version = RE_VERSION.search('1.2').group(1)
+            self.assertEquals(version, '1.2')
+            self.assertEquals(len(w.warnings), 2)
+
 def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
new file mode 100644
index 0000000000..6e1deced35
--- /dev/null
+++ b/tests/test_emxccompiler.py
@@ -0,0 +1,33 @@
+"""Tests for distutils.emxccompiler."""
+import unittest
+import sys
+import os
+import warnings
+
+from test.test_support import check_warnings
+from test.test_support import captured_stdout
+
+from distutils.emxccompiler import get_versions
+from distutils.util import get_compiler_versions
+from distutils.tests import support
+
+class EmxCCompilerTestCase(support.TempdirManager,
+                           unittest.TestCase):
+
+    def test_get_version_deprecated(self):
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            # make sure get_compiler_versions and get_versions
+            # returns the same gcc
+            gcc, ld, dllwrap = get_compiler_versions()
+            emx_gcc, emx_ld = get_versions()
+            self.assertEquals(gcc, emx_gcc)
+
+            # make sure using get_version() generated a warning
+            self.assertEquals(len(w.warnings), 1)
+
+def test_suite():
+    return unittest.makeSuite(EmxCCompilerTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_util.py b/tests/test_util.py
index c0acf5f481..ffa92bd07e 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -6,15 +6,33 @@
 import sys
 import unittest
 from copy import copy
+from StringIO import StringIO
+import subprocess
 
 from distutils.errors import DistutilsPlatformError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
-                            rfc822_escape)
-from distutils import util # used to patch _environ_checked
+                            rfc822_escape, get_compiler_versions,
+                            _find_exe_version, _MAC_OS_X_LD_VERSION)
+from distutils import util
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
 from distutils.tests import support
+from distutils.version import LooseVersion
+
+class FakePopen(object):
+    test_class = None
+    def __init__(self, cmd, shell, stdout, stderr):
+        self.cmd = cmd.split()[0]
+        exes = self.test_class._exes
+        if self.cmd not in exes:
+            # we don't want to call the system, returning an empty
+            # output so it doesn't match
+            self.stdout = StringIO()
+            self.stderr = StringIO()
+        else:
+            self.stdout = StringIO(exes[self.cmd])
+            self.stderr = StringIO()
 
 class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -37,9 +55,16 @@ def setUp(self):
         else:
             self.uname = None
             self._uname = None
-
         os.uname = self._get_uname
 
+        # patching POpen
+        self.old_find_executable = util.find_executable
+        util.find_executable = self._find_executable
+        self._exes = {}
+        self.old_popen = subprocess.Popen
+        FakePopen.test_class = self
+        subprocess.Popen = FakePopen
+
     def tearDown(self):
         # getting back the environment
         os.name = self.name
@@ -54,6 +79,8 @@ def tearDown(self):
         else:
             del os.uname
         sysconfig._config_vars = copy(self._config_vars)
+        util.find_executable = self.old_find_executable
+        subprocess.Popen = self.old_popen
         super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):
@@ -237,6 +264,70 @@ def test_rfc822_escape(self):
                   'header%(8s)s') % {'8s': '\n'+8*' '}
         self.assertEquals(res, wanted)
 
+    def test_find_exe_version(self):
+        # the ld version scheme under MAC OS is:
+        #   ^@(#)PROGRAM:ld  PROJECT:ld64-VERSION
+        #
+        # where VERSION is a 2-digit number for major
+        # revisions. For instance under Leopard, it's
+        # currently 77
+        #
+        # Dots are used when branching is done.
+        #
+        # The SnowLeopard ld64 is currently 95.2.12
+
+        for output, version in (('@(#)PROGRAM:ld  PROJECT:ld64-77', '77'),
+                                ('@(#)PROGRAM:ld  PROJECT:ld64-95.2.12',
+                                 '95.2.12')):
+            result = _MAC_OS_X_LD_VERSION.search(output)
+            self.assertEquals(result.group(1), version)
+
+    def _find_executable(self, name):
+        if name in self._exes:
+            return name
+        return None
+
+    def test_get_compiler_versions(self):
+        # get_versions calls distutils.spawn.find_executable on
+        # 'gcc', 'ld' and 'dllwrap'
+        self.assertEquals(get_compiler_versions(), (None, None, None))
+
+        # Let's fake we have 'gcc' and it returns '3.4.5'
+        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        res = get_compiler_versions()
+        self.assertEquals(str(res[0]), '3.4.5')
+
+        # and let's see what happens when the version
+        # doesn't match the regular expression
+        # (\d+\.\d+(\.\d+)*)
+        self._exes['gcc'] = 'very strange output'
+        res = get_compiler_versions()
+        self.assertEquals(res[0], None)
+
+        # same thing for ld
+        if sys.platform != 'darwin':
+            self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+            res = get_compiler_versions()
+            self.assertEquals(str(res[1]), '2.17.50')
+            self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+            res = get_compiler_versions()
+            self.assertEquals(res[1], None)
+        else:
+            self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
+            res = get_compiler_versions()
+            self.assertEquals(res[1], None)
+            self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
+            res = get_compiler_versions()
+            self.assertEquals(str(res[1]), '77')
+
+        # and dllwrap
+        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
+        res = get_compiler_versions()
+        self.assertEquals(str(res[2]), '2.17.50')
+        self._exes['dllwrap'] = 'Cheese Wrap'
+        res = get_compiler_versions()
+        self.assertEquals(res[2], None)
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index 5bbbf22560..459c36462d 100644
--- a/util.py
+++ b/util.py
@@ -7,10 +7,12 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
+
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
-from distutils.spawn import spawn
+from distutils.spawn import spawn, find_executable
 from distutils import log
+from distutils.version import LooseVersion
 
 def get_platform():
     """Return a string that identifies the current platform.
@@ -539,3 +541,53 @@ def rfc822_escape(header):
     lines = [x.strip() for x in header.split('\n')]
     sep = '\n' + 8*' '
     return sep.join(lines)
+
+_RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
+_MAC_OS_X_LD_VERSION = re.compile('^@\(#\)PROGRAM:ld  PROJECT:ld64-((\d+)(\.\d+)*)')
+
+def _find_ld_version():
+    """Finds the ld version. The version scheme differs under Mac OSX."""
+    if sys.platform == 'darwin':
+        return _find_exe_version('ld -v', _MAC_OS_X_LD_VERSION)
+    else:
+        return _find_exe_version('ld -v')
+
+def _find_exe_version(cmd, pattern=_RE_VERSION):
+    """Find the version of an executable by running `cmd` in the shell.
+
+    `pattern` is a compiled regular expression. If not provided, default
+    to _RE_VERSION. If the command is not found, or the output does not
+    match the mattern, returns None.
+    """
+    from subprocess import Popen, PIPE
+    executable = cmd.split()[0]
+    if find_executable(executable) is None:
+        return None
+    pipe = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+    try:
+        stdout, stderr = pipe.stdout.read(), pipe.stderr.read()
+    finally:
+        pipe.stdout.close()
+        pipe.stderr.close()
+    # some commands like ld under MacOS X, will give the
+    # output in the stderr, rather than stdout.
+    if stdout != '':
+        out_string = stdout
+    else:
+        out_string = stderr
+
+    result = pattern.search(out_string)
+    if result is None:
+        return None
+    return LooseVersion(result.group(1))
+
+def get_compiler_versions():
+    """Returns a tuple providing the versions of gcc, ld and dllwrap
+
+    For each command, if a command is not found, None is returned.
+    Otherwise a LooseVersion instance is returned.
+    """
+    gcc = _find_exe_version('gcc -dumpversion')
+    ld = _find_ld_version()
+    dllwrap = _find_exe_version('dllwrap --version')
+    return gcc, ld, dllwrap

From 36b50be6bf1f352ecd22b76b1d8f976cb2a8d1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 16 Jul 2009 16:18:19 +0000
Subject: [PATCH 2445/8469] Merged revisions 74024 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74024 | tarek.ziade | 2009-07-16 17:35:45 +0200 (Thu, 16 Jul 2009) | 1 line

  #6466 refactored distutils duplicate get_versions() functions (used to get gcc/ld/dllwrap versions)
........
---
 cygwinccompiler.py            | 45 +++++++---------
 emxccompiler.py               | 33 +++++-------
 tests/test_cygwinccompiler.py | 83 ++++++++----------------------
 tests/test_emxccompiler.py    | 33 ++++++++++++
 tests/test_util.py            | 97 +++++++++++++++++++++++++++++++++--
 util.py                       | 54 ++++++++++++++++++-
 6 files changed, 232 insertions(+), 113 deletions(-)
 create mode 100644 tests/test_emxccompiler.py

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 8504371810..d9f4a43df7 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -50,16 +50,15 @@
 import os
 import sys
 import copy
-from subprocess import Popen, PIPE
 import re
+from warnings import warn
 
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
-from distutils.version import LooseVersion
-from distutils.spawn import find_executable
+from distutils.util import get_compiler_versions
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -110,7 +109,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
                 % details)
 
         self.gcc_version, self.ld_version, self.dllwrap_version = \
-            get_versions()
+            get_compiler_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version,
                           self.ld_version,
@@ -359,33 +358,27 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
+class _Deprecated_SRE_Pattern(object):
+    def __init__(self, pattern):
+        self.pattern = pattern
 
-def _find_exe_version(cmd):
-    """Find the version of an executable by running `cmd` in the shell.
+    def __getattr__(self, name):
+        if name in ('findall', 'finditer', 'match', 'scanner', 'search',
+                    'split', 'sub', 'subn'):
+            warn("'distutils.cygwinccompiler.RE_VERSION' is deprecated "
+                 "and will be removed in the next version", DeprecationWarning)
+        return getattr(self.pattern, name)
 
-    If the command is not found, or the output does not match
-    `RE_VERSION`, returns None.
-    """
-    executable = cmd.split()[0]
-    if find_executable(executable) is None:
-        return None
-    out = Popen(cmd, shell=True, stdout=PIPE).stdout
-    try:
-        out_string = out.read()
-    finally:
-        out.close()
-    result = RE_VERSION.search(out_string)
-    if result is None:
-        return None
-    # LooseVersion works with strings
-    # so we need to decode our bytes
-    return LooseVersion(result.group(1).decode())
+
+RE_VERSION = _Deprecated_SRE_Pattern(re.compile('(\d+\.\d+(\.\d+)*)'))
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
 
     If not possible it returns None for it.
     """
-    commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
-    return tuple([_find_exe_version(cmd) for cmd in commands])
+    warn("'distutils.cygwinccompiler.get_versions' is deprecated "
+         "use 'distutils.util.get_compiler_versions' instead",
+         DeprecationWarning)
+
+    return get_compiler_versions()
diff --git a/emxccompiler.py b/emxccompiler.py
index 62a4c5b4e8..50634d6c06 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -21,12 +21,15 @@
 
 __revision__ = "$Id$"
 
-import os,sys,copy
+import os, sys, copy
+from warnings import warn
+
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
 from distutils import log
+from distutils.util import get_compiler_versions
 
 class EMXCCompiler (UnixCCompiler):
 
@@ -55,8 +58,8 @@ def __init__ (self,
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
 
-        (self.gcc_version, self.ld_version) = \
-            get_versions()
+        gcc_version, ld_version, dllwrap_version = get_compiler_versions()
+        self.gcc_version, self.ld_version = gcc_version, ld_version
         self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
                          (self.gcc_version,
                           self.ld_version) )
@@ -291,23 +294,11 @@ def get_versions():
     """ Try to find out the versions of gcc and ld.
         If not possible it returns None for it.
     """
-    from distutils.version import StrictVersion
-    from distutils.spawn import find_executable
-    import re
-
-    gcc_exe = find_executable('gcc')
-    if gcc_exe:
-        out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
-        result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
-        if result:
-            gcc_version = StrictVersion(result.group(1))
-        else:
-            gcc_version = None
-    else:
-        gcc_version = None
+    warn("'distutils.emxccompiler.get_versions' is deprecated "
+         "use 'distutils.util.get_compiler_versions' instead",
+         DeprecationWarning)
+
     # EMX ld has no way of reporting version number, and we use GCC
     # anyway - so we can link OMF DLLs
-    ld_version = None
-    return (gcc_version, ld_version)
+    gcc_version, ld_version, dllwrap_version = get_compiler_versions()
+    return gcc_version, None
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index a57694d48e..98f0f08ef1 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -2,29 +2,20 @@
 import unittest
 import sys
 import os
-from io import BytesIO
 import subprocess
+import warnings
+
+from test.support import check_warnings
+from test.support import captured_stdout
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
                                        CONFIG_H_UNCERTAIN, get_versions,
-                                       get_msvcr)
+                                       get_msvcr, RE_VERSION)
+from distutils.util import get_compiler_versions
 from distutils.tests import support
 
-class FakePopen(object):
-    test_class = None
-
-    def __init__(self, cmd, shell, stdout):
-        self.cmd = cmd.split()[0]
-        exes = self.test_class._exes
-        if self.cmd in exes:
-            # issue #6438 in Python 3.x, Popen returns bytes
-            self.stdout = BytesIO(exes[self.cmd])
-        else:
-            self.stdout = os.popen(cmd, 'r')
-
-
 class CygwinCCompilerTestCase(support.TempdirManager,
                               unittest.TestCase):
 
@@ -35,29 +26,16 @@ def setUp(self):
         from distutils import sysconfig
         self.old_get_config_h_filename = sysconfig.get_config_h_filename
         sysconfig.get_config_h_filename = self._get_config_h_filename
-        self.old_find_executable = cygwinccompiler.find_executable
-        cygwinccompiler.find_executable = self._find_executable
-        self._exes = {}
-        self.old_popen = cygwinccompiler.Popen
-        FakePopen.test_class = self
-        cygwinccompiler.Popen = FakePopen
 
     def tearDown(self):
         sys.version = self.version
         from distutils import sysconfig
         sysconfig.get_config_h_filename = self.old_get_config_h_filename
-        cygwinccompiler.find_executable = self.old_find_executable
-        cygwinccompiler.Popen = self.old_popen
         super(CygwinCCompilerTestCase, self).tearDown()
 
     def _get_config_h_filename(self):
         return self.python_h
 
-    def _find_executable(self, name):
-        if name in self._exes:
-            return name
-        return None
-
     def test_check_config_h(self):
 
         # check_config_h looks for "GCC" in sys.version first
@@ -81,40 +59,6 @@ def test_check_config_h(self):
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
         self.assertEquals(check_config_h()[0], CONFIG_H_OK)
 
-    def test_get_versions(self):
-
-        # get_versions calls distutils.spawn.find_executable on
-        # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_versions(), (None, None, None))
-
-        # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
-        res = get_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
-
-        # and let's see what happens when the version
-        # doesn't match the regular expression
-        # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = b'very strange output'
-        res = get_versions()
-        self.assertEquals(res[0], None)
-
-        # same thing for ld
-        self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
-        res = get_versions()
-        self.assertEquals(str(res[1]), '2.17.50')
-        self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
-        res = get_versions()
-        self.assertEquals(res[1], None)
-
-        # and dllwrap
-        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
-        res = get_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = b'Cheese Wrap'
-        res = get_versions()
-        self.assertEquals(res[2], None)
-
     def test_get_msvcr(self):
 
         # none
@@ -147,6 +91,21 @@ def test_get_msvcr(self):
                        '[MSC v.1999 32 bits (Intel)]')
         self.assertRaises(ValueError, get_msvcr)
 
+
+    def test_get_version_deprecated(self):
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            # make sure get_compiler_versions and get_versions
+            # returns the same thing
+            self.assertEquals(get_compiler_versions(), get_versions())
+            # make sure using get_version() generated a warning
+            self.assertEquals(len(w.warnings), 1)
+            # make sure any usage of RE_VERSION will also
+            # generate a warning, but till works
+            version = RE_VERSION.search('1.2').group(1)
+            self.assertEquals(version, '1.2')
+            self.assertEquals(len(w.warnings), 2)
+
 def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
new file mode 100644
index 0000000000..2176d641d0
--- /dev/null
+++ b/tests/test_emxccompiler.py
@@ -0,0 +1,33 @@
+"""Tests for distutils.emxccompiler."""
+import unittest
+import sys
+import os
+import warnings
+
+from test.support import check_warnings
+from test.support import captured_stdout
+
+from distutils.emxccompiler import get_versions
+from distutils.util import get_compiler_versions
+from distutils.tests import support
+
+class EmxCCompilerTestCase(support.TempdirManager,
+                           unittest.TestCase):
+
+    def test_get_version_deprecated(self):
+        with check_warnings() as w:
+            warnings.simplefilter("always")
+            # make sure get_compiler_versions and get_versions
+            # returns the same gcc
+            gcc, ld, dllwrap = get_compiler_versions()
+            emx_gcc, emx_ld = get_versions()
+            self.assertEquals(gcc, emx_gcc)
+
+            # make sure using get_version() generated a warning
+            self.assertEquals(len(w.warnings), 1)
+
+def test_suite():
+    return unittest.makeSuite(EmxCCompilerTestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_util.py b/tests/test_util.py
index c0acf5f481..e9065ff59c 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -6,15 +6,33 @@
 import sys
 import unittest
 from copy import copy
+from io import BytesIO
+import subprocess
 
 from distutils.errors import DistutilsPlatformError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
-                            rfc822_escape)
-from distutils import util # used to patch _environ_checked
+                            rfc822_escape, get_compiler_versions,
+                            _find_exe_version, _MAC_OS_X_LD_VERSION)
+from distutils import util
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
 from distutils.tests import support
+from distutils.version import LooseVersion
+
+class FakePopen(object):
+    test_class = None
+    def __init__(self, cmd, shell, stdout, stderr):
+        self.cmd = cmd.split()[0]
+        exes = self.test_class._exes
+        if self.cmd not in exes:
+            # we don't want to call the system, returning an empty
+            # output so it doesn't match
+            self.stdout = BytesIO()
+            self.stderr = BytesIO()
+        else:
+            self.stdout = BytesIO(exes[self.cmd])
+            self.stderr = BytesIO()
 
 class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -37,9 +55,16 @@ def setUp(self):
         else:
             self.uname = None
             self._uname = None
-
         os.uname = self._get_uname
 
+        # patching POpen
+        self.old_find_executable = util.find_executable
+        util.find_executable = self._find_executable
+        self._exes = {}
+        self.old_popen = subprocess.Popen
+        FakePopen.test_class = self
+        subprocess.Popen = FakePopen
+
     def tearDown(self):
         # getting back the environment
         os.name = self.name
@@ -54,6 +79,8 @@ def tearDown(self):
         else:
             del os.uname
         sysconfig._config_vars = copy(self._config_vars)
+        util.find_executable = self.old_find_executable
+        subprocess.Popen = self.old_popen
         super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):
@@ -237,6 +264,70 @@ def test_rfc822_escape(self):
                   'header%(8s)s') % {'8s': '\n'+8*' '}
         self.assertEquals(res, wanted)
 
+    def test_find_exe_version(self):
+        # the ld version scheme under MAC OS is:
+        #   ^@(#)PROGRAM:ld  PROJECT:ld64-VERSION
+        #
+        # where VERSION is a 2-digit number for major
+        # revisions. For instance under Leopard, it's
+        # currently 77
+        #
+        # Dots are used when branching is done.
+        #
+        # The SnowLeopard ld64 is currently 95.2.12
+
+        for output, version in ((b'@(#)PROGRAM:ld  PROJECT:ld64-77', '77'),
+                                (b'@(#)PROGRAM:ld  PROJECT:ld64-95.2.12',
+                                 '95.2.12')):
+            result = _MAC_OS_X_LD_VERSION.search(output)
+            self.assertEquals(result.group(1).decode(), version)
+
+    def _find_executable(self, name):
+        if name in self._exes:
+            return name
+        return None
+
+    def test_get_compiler_versions(self):
+        # get_versions calls distutils.spawn.find_executable on
+        # 'gcc', 'ld' and 'dllwrap'
+        self.assertEquals(get_compiler_versions(), (None, None, None))
+
+        # Let's fake we have 'gcc' and it returns '3.4.5'
+        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        res = get_compiler_versions()
+        self.assertEquals(str(res[0]), '3.4.5')
+
+        # and let's see what happens when the version
+        # doesn't match the regular expression
+        # (\d+\.\d+(\.\d+)*)
+        self._exes['gcc'] = b'very strange output'
+        res = get_compiler_versions()
+        self.assertEquals(res[0], None)
+
+        # same thing for ld
+        if sys.platform != 'darwin':
+            self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
+            res = get_compiler_versions()
+            self.assertEquals(str(res[1]), '2.17.50')
+            self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
+            res = get_compiler_versions()
+            self.assertEquals(res[1], None)
+        else:
+            self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
+            res = get_compiler_versions()
+            self.assertEquals(res[1], None)
+            self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
+            res = get_compiler_versions()
+            self.assertEquals(str(res[1]), '77')
+
+        # and dllwrap
+        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
+        res = get_compiler_versions()
+        self.assertEquals(str(res[2]), '2.17.50')
+        self._exes['dllwrap'] = b'Cheese Wrap'
+        res = get_compiler_versions()
+        self.assertEquals(res[2], None)
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index ad7ae08d76..0c88b8197d 100644
--- a/util.py
+++ b/util.py
@@ -7,10 +7,12 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
+
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
-from distutils.spawn import spawn
+from distutils.spawn import spawn, find_executable
 from distutils import log
+from distutils.version import LooseVersion
 
 def get_platform():
     """Return a string that identifies the current platform.
@@ -539,6 +541,56 @@ def rfc822_escape(header):
     sep = '\n' + 8*' '
     return sep.join(lines)
 
+_RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
+_MAC_OS_X_LD_VERSION = re.compile(b'^@\(#\)PROGRAM:ld  PROJECT:ld64-((\d+)(\.\d+)*)')
+
+def _find_ld_version():
+    """Finds the ld version. The version scheme differs under Mac OSX."""
+    if sys.platform == 'darwin':
+        return _find_exe_version('ld -v', _MAC_OS_X_LD_VERSION)
+    else:
+        return _find_exe_version('ld -v')
+
+def _find_exe_version(cmd, pattern=_RE_VERSION):
+    """Find the version of an executable by running `cmd` in the shell.
+
+    `pattern` is a compiled regular expression. If not provided, default
+    to _RE_VERSION. If the command is not found, or the output does not
+    match the mattern, returns None.
+    """
+    from subprocess import Popen, PIPE
+    executable = cmd.split()[0]
+    if find_executable(executable) is None:
+        return None
+    pipe = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+    try:
+        stdout, stderr = pipe.stdout.read(), pipe.stderr.read()
+    finally:
+        pipe.stdout.close()
+        pipe.stderr.close()
+    # some commands like ld under MacOS X, will give the
+    # output in the stderr, rather than stdout.
+    if stdout != b'':
+        out_string = stdout
+    else:
+        out_string = stderr
+
+    result = pattern.search(out_string)
+    if result is None:
+        return None
+    return LooseVersion(result.group(1).decode())
+
+def get_compiler_versions():
+    """Returns a tuple providing the versions of gcc, ld and dllwrap
+
+    For each command, if a command is not found, None is returned.
+    Otherwise a LooseVersion instance is returned.
+    """
+    gcc = _find_exe_version('gcc -dumpversion')
+    ld = _find_ld_version()
+    dllwrap = _find_exe_version('dllwrap --version')
+    return gcc, ld, dllwrap
+
 # 2to3 support
 
 def run_2to3(files, fixer_names=None, options=None, explicit=None):

From fcfd0cb5014a3b4f0bda28a8210a1286e8e63f71 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Jul 2009 21:52:02 +0000
Subject: [PATCH 2446/8469] skip test when distutils is not made for py3k

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

diff --git a/tests/test_register.py b/tests/test_register.py
index c03ad10147..acda1b1ac1 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -202,10 +202,10 @@ def test_strict(self):
         self.assertRaises(DistutilsSetupError, cmd.run)
 
         # we don't test the reSt feature if docutils
-        # is not installed
+        # is not installed or we our on py3k
         try:
             import docutils
-        except ImportError:
+        except Exception:
             return
 
         # metadata are OK but long_description is broken

From 1d3e8e21722d7354f77ebd0c8b19855e7a8045c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 22 Jul 2009 08:55:19 +0000
Subject: [PATCH 2447/8469] Issue #6545: Removed assert statements in
 distutils.Extension, so the behavior is similar when used with -O

---
 extension.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension.py b/extension.py
index 53ca8fd0c5..6af1810801 100644
--- a/extension.py
+++ b/extension.py
@@ -103,10 +103,11 @@ def __init__ (self, name, sources,
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, str), "'name' must be a string"
-        assert (isinstance(sources, list) and
-                all(isinstance(v, str) for v in sources)), \
-                "'sources' must be a list of strings"
+        if not isinstance(name, str):
+            raise AssertionError("'name' must be a string")
+        if not (isinstance(sources, list) and
+                all(isinstance(v, str) for v in sources)):
+            raise AssertionError("'sources' must be a list of strings")
 
         self.name = name
         self.sources = sources

From 7d70ca7551824bdf4950932bd5d68e8a982cf1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 22 Jul 2009 08:57:28 +0000
Subject: [PATCH 2448/8469] Merged revisions 74163 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74163 | tarek.ziade | 2009-07-22 10:55:19 +0200 (Wed, 22 Jul 2009) | 1 line

  Issue #6545: Removed assert statements in distutils.Extension, so the behavior is similar when used with -O
........
---
 extension.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension.py b/extension.py
index 16d2bef6f4..5c07bdae82 100644
--- a/extension.py
+++ b/extension.py
@@ -103,10 +103,11 @@ def __init__(self, name, sources,
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, str), "'name' must be a string"
-        assert (isinstance(sources, list) and
-                all(isinstance(v, str) for v in sources)), \
-                "'sources' must be a list of strings"
+        if not isinstance(name, str):
+            raise AssertionError("'name' must be a string")
+        if not (isinstance(sources, list) and
+                all(isinstance(v, str) for v in sources)):
+            raise AssertionError("'sources' must be a list of strings")
 
         self.name = name
         self.sources = sources

From 576fc43ebe6bd3b6f7707d8c8e9ba92cc9ed112b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 22 Jul 2009 09:03:01 +0000
Subject: [PATCH 2449/8469] Merged revisions 74164 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74164 | tarek.ziade | 2009-07-22 10:57:28 +0200 (Wed, 22 Jul 2009) | 9 lines

  Merged revisions 74163 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74163 | tarek.ziade | 2009-07-22 10:55:19 +0200 (Wed, 22 Jul 2009) | 1 line

    Issue #6545: Removed assert statements in distutils.Extension, so the behavior is similar when used with -O
  ........
................
---
 extension.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extension.py b/extension.py
index 16d2bef6f4..5c07bdae82 100644
--- a/extension.py
+++ b/extension.py
@@ -103,10 +103,11 @@ def __init__(self, name, sources,
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, str), "'name' must be a string"
-        assert (isinstance(sources, list) and
-                all(isinstance(v, str) for v in sources)), \
-                "'sources' must be a list of strings"
+        if not isinstance(name, str):
+            raise AssertionError("'name' must be a string")
+        if not (isinstance(sources, list) and
+                all(isinstance(v, str) for v in sources)):
+            raise AssertionError("'sources' must be a list of strings")
 
         self.name = name
         self.sources = sources

From f2f22a0bbb568a277a34b248d6532350463c43d9 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 9 Aug 2009 02:04:10 +0200
Subject: [PATCH 2450/8469] Added tag 0.6 for changeset 1010d08fd8df

--HG--
branch : distribute
extra : rebase_source : 2b085195f037843390e2665ee3a31d1d8c4f8bd0
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .hgtags

diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000000..62272cce6b
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1 @@
+1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6

From eb16649b8cca504ecde46bd3182333671e47250b Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 9 Aug 2009 02:08:34 +0200
Subject: [PATCH 2451/8469] strip line

--HG--
branch : distribute
extra : rebase_source : f711b4b4d47500006bf4abe8d11a56dbf081ec63
---
 README.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.txt b/README.txt
index ce8d641385..2a6e75dea5 100755
--- a/README.txt
+++ b/README.txt
@@ -199,4 +199,5 @@ Credits
 * Hanno Schlichting
 * Many other people that helped on Distutils-SIG (please add your name here)
 * Phillip Eby for the Setuptools project. 
+
  

From c9029603df0ca944e958c6d753cf1257e02bd365 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Sun, 9 Aug 2009 16:40:17 -0700
Subject: [PATCH 2452/8469] remove duplicate -v arg (transplanted from
 0131f4eddc7df6042e98e02799064f2f836802db)

--HG--
branch : distribute
extra : rebase_source : 7d55bb261fca44726f81331beaa03cce3742aa53
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 645098d72d..e50956fd22 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -311,7 +311,7 @@ def _easy_install(argv, egg=None):
     from setuptools.dist import Distribution
     import distutils.core
     if egg is not None:
-        setup_args = list(argv) + ['-v'] + [egg]
+        setup_args = list(argv) + [egg]
     else:
         setup_args = list(argv)
     try:

From a95877cd71522f5a2f5af90e2e2bfaa5d33ab3e2 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Sun, 9 Aug 2009 19:39:18 -0700
Subject: [PATCH 2453/8469] add --version to easy_install fixes #4
 (transplanted from 29b03bd8ae436ac26767f42bc77b0bfefa8a6e7a)

--HG--
branch : distribute
extra : rebase_source : e97203ec652e0fea0744ad60819cd52e686bf449
---
 setuptools/command/easy_install.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 228a9a696c..3f8a6877b7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -71,11 +71,12 @@ class easy_install(Command):
         ('no-deps', 'N', "don't install dependencies"),
         ('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
         ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"),
+        ('version', None, "print version information and exit"),
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
         'delete-conflicting', 'ignore-conflicts-at-my-risk', 'editable',
-        'no-deps', 'local-snapshots-ok',
+        'no-deps', 'local-snapshots-ok', 'version'
     ]
     negative_opt = {'always-unzip': 'zip-ok'}
     create_index = PackageIndex
@@ -91,6 +92,7 @@ def initialize_options(self):
         self.upgrade = self.always_copy = self.multi_version = None
         self.editable = self.no_deps = self.allow_hosts = None
         self.root = self.prefix = self.no_report = None
+        self.version = None
 
         # Options not specifiable via command line
         self.package_index = None
@@ -122,6 +124,10 @@ def delete_blockers(self, blockers):
                         os.unlink(filename)
 
     def finalize_options(self):
+        if self.version:
+            print 'distribute %s' % get_distribution('distribute').version
+            sys.exit()
+
         self._expand('install_dir','script_dir','build_directory','site_dirs')
         # If a non-default installation directory was specified, default the
         # script directory to match it.

From 8c7f12ea567dc59e1031dbffdda12247dfce0b9e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 13 Aug 2009 08:51:18 +0000
Subject: [PATCH 2454/8469] Merged revisions 73715 via svnmerge from
 svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
---
 tests/test_archive_util.py    | 16 ++++++-------
 tests/test_bdist_rpm.py       |  4 ++--
 tests/test_bdist_wininst.py   |  2 +-
 tests/test_build_clib.py      |  2 +-
 tests/test_build_ext.py       | 30 ++++++++++++-------------
 tests/test_build_py.py        |  6 ++---
 tests/test_build_scripts.py   | 10 ++++-----
 tests/test_clean.py           |  2 +-
 tests/test_cmd.py             |  2 +-
 tests/test_config.py          |  4 ++--
 tests/test_config_cmd.py      |  4 ++--
 tests/test_dist.py            | 42 +++++++++++++++++------------------
 tests/test_install.py         | 16 ++++++-------
 tests/test_install_data.py    | 12 +++++-----
 tests/test_install_lib.py     |  6 ++---
 tests/test_install_scripts.py | 14 ++++++------
 tests/test_msvc9compiler.py   |  4 ++--
 tests/test_register.py        | 16 ++++++-------
 tests/test_sysconfig.py       | 12 +++++-----
 tests/test_upload.py          |  2 +-
 tests/test_util.py            |  4 ++--
 21 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 663b33532a..d88e0b350d 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -47,7 +47,7 @@ def test_make_tarball(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -58,7 +58,7 @@ def test_make_tarball(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     def _tarinfo(self, path):
         tar = tarfile.open(path)
@@ -96,7 +96,7 @@ def test_tarfile_vs_tar(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.tar.gz'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
@@ -110,7 +110,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
 
-        self.assert_(os.path.exists(tarball2))
+        self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
         self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
 
@@ -123,7 +123,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
         # now for a dry_run
         base_name = os.path.join(tmpdir2, 'archive')
@@ -134,7 +134,7 @@ def test_tarfile_vs_tar(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
 
     @unittest.skipUnless(find_executable('compress'),
                          'The compress program is required')
@@ -151,7 +151,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
-        self.assert_(os.path.exists(tarball))
+        self.assertTrue(os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
         # same test with dry_run
@@ -165,7 +165,7 @@ def test_compress_deprecated(self):
                              dry_run=True)
         finally:
             os.chdir(old_dir)
-        self.assert_(not os.path.exists(tarball))
+        self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2d84007f87..c271567542 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -74,7 +74,7 @@ def test_quiet(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
     def test_no_optimize_flag(self):
 
@@ -114,7 +114,7 @@ def test_no_optimize_flag(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assert_('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index f2cb4fdeba..9b1ba6d107 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -21,7 +21,7 @@ def test_get_exe_bytes(self):
         # and make sure it finds it and returns its content
         # no matter what platform we have
         exe_file = cmd.get_exe_bytes()
-        self.assert_(len(exe_file) > 10)
+        self.assertTrue(len(exe_file) > 10)
 
 def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 47d85cd8b4..536cd67319 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -135,7 +135,7 @@ def test_run(self):
         cmd.run()
 
         # let's check the result
-        self.assert_('libfoo.a' in os.listdir(build_temp))
+        self.assertTrue('libfoo.a' in os.listdir(build_temp))
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 9861ee2993..1221fd43af 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -74,15 +74,15 @@ def test_build_ext(self):
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):
-            self.assert_(hasattr(xx, attr))
+            self.assertTrue(hasattr(xx, attr))
 
         self.assertEquals(xx.foo(2, 5), 7)
         self.assertEquals(xx.foo(13,15), 28)
         self.assertEquals(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
         self.assertEquals(xx.__doc__, doc)
-        self.assert_(isinstance(xx.Null(), xx.Null))
-        self.assert_(isinstance(xx.Str(), xx.Str))
+        self.assertTrue(isinstance(xx.Null(), xx.Null))
+        self.assertTrue(isinstance(xx.Str(), xx.Str))
 
     def tearDown(self):
         # Get everything back to normal
@@ -114,7 +114,7 @@ def test_solaris_enable_shared(self):
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assert_(len(cmd.library_dirs) > 0)
+        self.assertTrue(len(cmd.library_dirs) > 0)
 
     def test_user_site(self):
         # site.USER_SITE was introduced in 2.6
@@ -128,7 +128,7 @@ def test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
@@ -144,9 +144,9 @@ def test_user_site(self):
 
         # see if include_dirs and library_dirs
         # were set
-        self.assert_(lib in cmd.library_dirs)
-        self.assert_(lib in cmd.rpath)
-        self.assert_(incl in cmd.include_dirs)
+        self.assertTrue(lib in cmd.library_dirs)
+        self.assertTrue(lib in cmd.rpath)
+        self.assertTrue(incl in cmd.include_dirs)
 
     def test_optional_extension(self):
 
@@ -175,10 +175,10 @@ def test_finalize_options(self):
 
         from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
-        self.assert_(py_include in cmd.include_dirs)
+        self.assertTrue(py_include in cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assert_(plat_py_include in cmd.include_dirs)
+        self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
@@ -192,7 +192,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assert_('my_lib_dir' in cmd.library_dirs)
+        self.assertTrue('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths
@@ -257,13 +257,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assert_(isinstance(ext, Extension))
+        self.assertTrue(isinstance(ext, Extension))
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
         self.assertEquals(ext.libraries, 'foo')
-        self.assert_(not hasattr(ext, 'some'))
+        self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
@@ -321,7 +321,7 @@ def test_get_outputs(self):
             so_file = cmd.get_outputs()[0]
         finally:
             os.chdir(old_wd)
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
@@ -330,7 +330,7 @@ def test_get_outputs(self):
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
-        self.assert_(os.path.exists(so_file))
+        self.assertTrue(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 75b6624f5a..8ad3bbc452 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -52,9 +52,9 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        self.assert_("__init__.py" in files)
-        self.assert_("__init__.pyc" in files)
-        self.assert_("README.txt" in files)
+        self.assertTrue("__init__.py" in files)
+        self.assertTrue("__init__.pyc" in files)
+        self.assertTrue("README.txt" in files)
 
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b55eb5857b..b1d2d079bd 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -16,12 +16,12 @@ class BuildScriptsTestCase(support.TempdirManager,
 
     def test_default_settings(self):
         cmd = self.get_build_scripts_cmd("/foo/bar", [])
-        self.assert_(not cmd.force)
-        self.assert_(cmd.build_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(cmd.build_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
+        self.assertTrue(cmd.force)
         self.assertEqual(cmd.build_dir, "/foo/bar")
 
     def test_build(self):
@@ -37,7 +37,7 @@ def test_build(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
     def get_build_scripts_cmd(self, target, scripts):
         import sys
@@ -100,7 +100,7 @@ def test_version_int(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assert_(name in built)
+            self.assertTrue(name in built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
diff --git a/tests/test_clean.py b/tests/test_clean.py
index 3026032712..dbc4ee2a18 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -35,7 +35,7 @@ def test_simple_run(self):
 
         # make sure the files where removed
         for name, path in dirs:
-            self.assert_(not os.path.exists(path),
+            self.assertTrue(not os.path.exists(path),
                          '%s was not removed' % path)
 
         # let's run the command again (should spit warnings but suceed)
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 8f2b36fb1f..d6438b5ea1 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -70,7 +70,7 @@ def test_ensure_string(self):
 
         cmd.option2 = None
         cmd.ensure_string('option2', 'xxx')
-        self.assert_(hasattr(cmd, 'option2'))
+        self.assertTrue(hasattr(cmd, 'option2'))
 
         cmd.option3 = 1
         self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
diff --git a/tests/test_config.py b/tests/test_config.py
index 0f97cf7a5e..879689d2bb 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -102,9 +102,9 @@ def test_server_registration(self):
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
-        self.assert_(not os.path.exists(rc))
+        self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
-        self.assert_(os.path.exists(rc))
+        self.assertTrue(os.path.exists(rc))
         content = open(rc).read()
         self.assertEquals(content, WANTED)
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index bacf13a291..ef2e7bc317 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -73,14 +73,14 @@ def test_clean(self):
         self.write_file(f2, 'xxx')
 
         for f in (f1, f2):
-            self.assert_(os.path.exists(f))
+            self.assertTrue(os.path.exists(f))
 
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
         cmd._clean(f1, f2)
 
         for f in (f1, f2):
-            self.assert_(not os.path.exists(f))
+            self.assertTrue(not os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 40760390c8..9f795f4314 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -72,7 +72,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        self.assert_(isinstance(cmd, test_dist))
+        self.assertTrue(isinstance(cmd, test_dist))
         self.assertEqual(cmd.sample_option, "sometext")
 
     def test_command_packages_configfile(self):
@@ -157,10 +157,10 @@ def test_simple_metadata(self):
                  "version": "1.0"}
         dist = Distribution(attrs)
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.0" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.0" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides(self):
         attrs = {"name": "package",
@@ -172,9 +172,9 @@ def test_provides(self):
         self.assertEqual(dist.get_provides(),
                          ["package", "package.sub"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_provides_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -192,11 +192,11 @@ def test_requires(self):
         self.assertEqual(dist.get_requires(),
                          ["other", "another (==1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("Requires: other" in meta)
-        self.assert_("Requires: another (==1.0)" in meta)
-        self.assert_("obsoletes:" not in meta.lower())
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("Requires: other" in meta)
+        self.assertTrue("Requires: another (==1.0)" in meta)
+        self.assertTrue("obsoletes:" not in meta.lower())
 
     def test_requires_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -214,11 +214,11 @@ def test_obsoletes(self):
         self.assertEqual(dist.get_obsoletes(),
                          ["other", "another (<1.0)"])
         meta = self.format_metadata(dist)
-        self.assert_("Metadata-Version: 1.1" in meta)
-        self.assert_("provides:" not in meta.lower())
-        self.assert_("requires:" not in meta.lower())
-        self.assert_("Obsoletes: other" in meta)
-        self.assert_("Obsoletes: another (<1.0)" in meta)
+        self.assertTrue("Metadata-Version: 1.1" in meta)
+        self.assertTrue("provides:" not in meta.lower())
+        self.assertTrue("requires:" not in meta.lower())
+        self.assertTrue("Obsoletes: other" in meta)
+        self.assertTrue("Obsoletes: another (<1.0)" in meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -252,14 +252,14 @@ def test_custom_pydistutils(self):
             if sys.platform in ('linux', 'darwin'):
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files)
+                self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
                 self.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assert_(user_filename in files,
+                self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
@@ -285,7 +285,7 @@ def test_show_help(self):
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
-        self.assert_(len(output) > 0)
+        self.assertTrue(len(output) > 0)
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/tests/test_install.py b/tests/test_install.py
index 8d7e97227c..d0ad5ce159 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -88,7 +88,7 @@ def _expanduser(path):
 
     def _test_user_site(self):
         for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assert_(key in INSTALL_SCHEMES)
+            self.assertTrue(key in INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
@@ -96,24 +96,24 @@ def _test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assert_('user' in options)
+        self.assertTrue('user' in options)
 
         # setting a value
         cmd.user = 1
 
         # user base and site shouldn't be created yet
-        self.assert_(not os.path.exists(self.user_base))
-        self.assert_(not os.path.exists(self.user_site))
+        self.assertTrue(not os.path.exists(self.user_base))
+        self.assertTrue(not os.path.exists(self.user_site))
 
         # let's run finalize
         cmd.ensure_finalized()
 
         # now they should
-        self.assert_(os.path.exists(self.user_base))
-        self.assert_(os.path.exists(self.user_site))
+        self.assertTrue(os.path.exists(self.user_base))
+        self.assertTrue(os.path.exists(self.user_site))
 
-        self.assert_('userbase' in cmd.config_vars)
-        self.assert_('usersite' in cmd.config_vars)
+        self.assertTrue('userbase' in cmd.config_vars)
+        self.assertTrue('usersite' in cmd.config_vars)
 
     def test_handle_extra_path(self):
         dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 73c40371d6..7072136792 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -35,9 +35,9 @@ def test_simple_run(self):
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # let's try with warn_dir one
@@ -47,8 +47,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 2)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
 
         # now using root and empty dir
@@ -65,8 +65,8 @@ def test_simple_run(self):
 
         # let's check the result
         self.assertEquals(len(cmd.get_outputs()), 4)
-        self.assert_(os.path.exists(os.path.join(inst2, rtwo)))
-        self.assert_(os.path.exists(os.path.join(inst, rone)))
+        self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
+        self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
 def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index d768166829..793b95cad6 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -39,8 +39,8 @@ def test_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assert_(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
@@ -57,7 +57,7 @@ def test_get_outputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_output should return 4 elements
-        self.assert_(len(cmd.get_outputs()) >= 2)
+        self.assertTrue(len(cmd.get_outputs()) >= 2)
 
     def test_get_inputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index fffa6ef2c3..b7eb625ac5 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -23,15 +23,15 @@ def test_default_settings(self):
             skip_build=1,
             )
         cmd = install_scripts(dist)
-        self.assert_(not cmd.force)
-        self.assert_(not cmd.skip_build)
-        self.assert_(cmd.build_dir is None)
-        self.assert_(cmd.install_dir is None)
+        self.assertTrue(not cmd.force)
+        self.assertTrue(not cmd.skip_build)
+        self.assertTrue(cmd.build_dir is None)
+        self.assertTrue(cmd.install_dir is None)
 
         cmd.finalize_options()
 
-        self.assert_(cmd.force)
-        self.assert_(cmd.skip_build)
+        self.assertTrue(cmd.force)
+        self.assertTrue(cmd.skip_build)
         self.assertEqual(cmd.build_dir, "/foo/bar")
         self.assertEqual(cmd.install_dir, "/splat/funk")
 
@@ -69,7 +69,7 @@ def write_script(name, text):
 
         installed = os.listdir(target)
         for name in expected:
-            self.assert_(name in installed)
+            self.assertTrue(name in installed)
 
 
 def test_suite():
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 11e5a47630..73827988bb 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Software\Microsoft\Notepad'
         v = Reg.get_value(path, "lfitalic")
-        self.assert_(v in (0, 1))
+        self.assertTrue(v in (0, 1))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
@@ -54,7 +54,7 @@ def test_reg_class(self):
         self.assertEquals(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assert_('Notepad' in keys)
+        self.assertTrue('Notepad' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
diff --git a/tests/test_register.py b/tests/test_register.py
index d9ff3ec441..c03ad10147 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -96,7 +96,7 @@ def test_create_pypirc(self):
         cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
-        self.assert_(not os.path.exists(self.rc))
+        self.assertTrue(not os.path.exists(self.rc))
 
         # patching input and getpass.getpass
         # so register gets happy
@@ -115,7 +115,7 @@ def test_create_pypirc(self):
             del register_module.input
 
         # we should have a brand new .pypirc file
-        self.assert_(os.path.exists(self.rc))
+        self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
         content = open(self.rc).read()
@@ -133,13 +133,13 @@ def _no_way(prompt=''):
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assert_(self.conn.reqs, 2)
+        self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
         self.assertEquals(req1['Content-length'], '1374')
         self.assertEquals(req2['Content-length'], '1374')
-        self.assert_((b'xxx') in self.conn.reqs[1].data)
+        self.assertTrue((b'xxx') in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
 
@@ -165,11 +165,11 @@ def test_registering(self):
             del register_module.input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '608')
-        self.assert_((b'tarek') in req.data)
+        self.assertTrue((b'tarek') in req.data)
 
     def test_password_reset(self):
         # this test runs choice 3
@@ -183,11 +183,11 @@ def test_password_reset(self):
             del register_module.input
 
         # we should have send a request
-        self.assert_(self.conn.reqs, 1)
+        self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEquals(headers['Content-length'], '290')
-        self.assert_((b'tarek') in req.data)
+        self.assertTrue((b'tarek') in req.data)
 
     def test_strict(self):
         # testing the script option
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 2d8fa2710e..eb36204439 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -21,12 +21,12 @@ def tearDown(self):
 
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
-        self.assert_(os.path.isfile(config_h), config_h)
+        self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
-        #self.assert_(os.path.isdir(lib_dir), lib_dir)
+        #self.assertTrue(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
@@ -36,14 +36,14 @@ def test_get_python_inc(self):
         # This is not much of a test.  We make sure Python.h exists
         # in the directory returned by get_python_inc() but we don't know
         # it is the correct file.
-        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
-        self.assert_(os.path.isfile(python_h), python_h)
+        self.assertTrue(os.path.isfile(python_h), python_h)
 
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()
-        self.assert_(isinstance(cvars, dict))
-        self.assert_(cvars)
+        self.assertTrue(isinstance(cvars, dict))
+        self.assertTrue(cvars)
 
     def test_customize_compiler(self):
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 95e4ac3315..828f20c539 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -107,7 +107,7 @@ def test_upload(self):
         # what did we send ?
         headers = dict(self.conn.headers)
         self.assertEquals(headers['Content-length'], '2087')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
 
         self.assertEquals(self.conn.requests, [('POST', '/pypi')])
         self.assert_((b'xxx') in self.conn.body)
diff --git a/tests/test_util.py b/tests/test_util.py
index cee7d5263b..c0acf5f481 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -225,10 +225,10 @@ def test_strtobool(self):
         no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
 
         for y in yes:
-            self.assert_(strtobool(y))
+            self.assertTrue(strtobool(y))
 
         for n in no:
-            self.assert_(not strtobool(n))
+            self.assertTrue(not strtobool(n))
 
     def test_rfc822_escape(self):
         header = 'I am a\npoor\nlonesome\nheader\n'

From 7329a6d2504982f7ad4261bf7a1f24e4063ee2d2 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 13 Aug 2009 15:47:36 +0000
Subject: [PATCH 2455/8469] bump version to 3.1.1rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 994e91fa29..e7f21232fd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.1a0"
+__version__ = "3.1.1rc1"
 #--end constants--

From e5d9d64f150067264eedc7738da02f46d06e7827 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 16 Aug 2009 21:59:05 +0000
Subject: [PATCH 2456/8469] bump to 3.1.1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e7f21232fd..8c0e5a3cba 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.1rc1"
+__version__ = "3.1.1"
 #--end constants--

From e5e2bce7407fa39872996bbadb033ff1def2eec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 Aug 2009 21:28:34 +0000
Subject: [PATCH 2457/8469] fixed how fnmatch.translate is used (since it has
 changed in r74475 for #6665). Now the code is not harcoding the usage of $
 anymore

---
 filelist.py            |  5 +++--
 tests/test_filelist.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/filelist.py b/filelist.py
index 3ba5720ca9..5a88fd4e21 100644
--- a/filelist.py
+++ b/filelist.py
@@ -342,12 +342,13 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
         pattern_re = ''
 
     if prefix is not None:
-        prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+        # ditch end of pattern character
+        empty_pattern = glob_to_re('')
+        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
 
     return re.compile(pattern_re)
-
 # translate_pattern ()
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 86db557441..1faccfae7e 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -6,15 +6,15 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
 def test_suite():
     return unittest.makeSuite(FileListTestCase)

From cc6230244cd7ff8d13b3cc9c0c493682b5560ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 Aug 2009 21:35:46 +0000
Subject: [PATCH 2458/8469] Merged revisions 74493 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74493 | tarek.ziade | 2009-08-17 23:28:34 +0200 (Mon, 17 Aug 2009) | 1 line

  fixed how fnmatch.translate is used (since it has changed in r74475 for #6665). Now the code is not harcoding the usage of $ anymore
........
---
 filelist.py            |  4 +++-
 tests/test_filelist.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/filelist.py b/filelist.py
index 58a2bfb108..06a8da9a07 100644
--- a/filelist.py
+++ b/filelist.py
@@ -312,7 +312,9 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         pattern_re = ''
 
     if prefix is not None:
-        prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+        # ditch end of pattern character
+        empty_pattern = glob_to_re('')
+        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 86db557441..1faccfae7e 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -6,15 +6,15 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
 def test_suite():
     return unittest.makeSuite(FileListTestCase)

From 2adb920d5dce513c2743a1b1559559709c38caf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 Aug 2009 21:48:22 +0000
Subject: [PATCH 2459/8469] module cleanup

---
 filelist.py | 99 +++++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 57 deletions(-)

diff --git a/filelist.py b/filelist.py
index 5a88fd4e21..de665e7a8c 100644
--- a/filelist.py
+++ b/filelist.py
@@ -6,15 +6,13 @@
 
 __revision__ = "$Id$"
 
-import os, string, re
+import os, re
 import fnmatch
-from types import *
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
 
 class FileList:
-
     """A list of files built by on exploring the filesystem and filtered by
     applying various patterns to what we find there.
 
@@ -29,22 +27,19 @@ class FileList:
         filtering applied)
     """
 
-    def __init__(self,
-                 warn=None,
-                 debug_print=None):
+    def __init__(self, warn=None, debug_print=None):
         # ignore argument to FileList, but keep them for backwards
         # compatibility
-
         self.allfiles = None
         self.files = []
 
-    def set_allfiles (self, allfiles):
+    def set_allfiles(self, allfiles):
         self.allfiles = allfiles
 
-    def findall (self, dir=os.curdir):
+    def findall(self, dir=os.curdir):
         self.allfiles = findall(dir)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         """Print 'msg' to stdout if the global DEBUG (taken from the
         DISTUTILS_DEBUG environment variable) flag is true.
         """
@@ -54,13 +49,13 @@ def debug_print (self, msg):
 
     # -- List-like methods ---------------------------------------------
 
-    def append (self, item):
+    def append(self, item):
         self.files.append(item)
 
-    def extend (self, items):
+    def extend(self, items):
         self.files.extend(items)
 
-    def sort (self):
+    def sort(self):
         # Not a strict lexical sort!
         sortable_files = map(os.path.split, self.files)
         sortable_files.sort()
@@ -71,7 +66,7 @@ def sort (self):
 
     # -- Other miscellaneous utility methods ---------------------------
 
-    def remove_duplicates (self):
+    def remove_duplicates(self):
         # Assumes list has been sorted!
         for i in range(len(self.files) - 1, 0, -1):
             if self.files[i] == self.files[i - 1]:
@@ -80,8 +75,8 @@ def remove_duplicates (self):
 
     # -- "File template" methods ---------------------------------------
 
-    def _parse_template_line (self, line):
-        words = string.split(line)
+    def _parse_template_line(self, line):
+        words = line.split()
         action = words[0]
 
         patterns = dir = dir_pattern = None
@@ -114,11 +109,7 @@ def _parse_template_line (self, line):
 
         return (action, patterns, dir, dir_pattern)
 
-    # _parse_template_line ()
-
-
-    def process_template_line (self, line):
-
+    def process_template_line(self, line):
         # Parse the line: split it up, make sure the right number of words
         # is there, and return the relevant words.  'action' is always
         # defined: it's the first word of the line.  Which of the other
@@ -130,28 +121,28 @@ def process_template_line (self, line):
         # right number of words on the line for that action -- so we
         # can proceed with minimal error-checking.
         if action == 'include':
-            self.debug_print("include " + string.join(patterns))
+            self.debug_print("include " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=1):
                     log.warn("warning: no files found matching '%s'",
                              pattern)
 
         elif action == 'exclude':
-            self.debug_print("exclude " + string.join(patterns))
+            self.debug_print("exclude " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=1):
                     log.warn(("warning: no previously-included files "
                               "found matching '%s'"), pattern)
 
         elif action == 'global-include':
-            self.debug_print("global-include " + string.join(patterns))
+            self.debug_print("global-include " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.include_pattern(pattern, anchor=0):
                     log.warn(("warning: no files found matching '%s' " +
                               "anywhere in distribution"), pattern)
 
         elif action == 'global-exclude':
-            self.debug_print("global-exclude " + string.join(patterns))
+            self.debug_print("global-exclude " + ' '.join(patterns))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, anchor=0):
                     log.warn(("warning: no previously-included files matching "
@@ -160,7 +151,7 @@ def process_template_line (self, line):
 
         elif action == 'recursive-include':
             self.debug_print("recursive-include %s %s" %
-                             (dir, string.join(patterns)))
+                             (dir, ' '.join(patterns)))
             for pattern in patterns:
                 if not self.include_pattern(pattern, prefix=dir):
                     log.warn(("warning: no files found matching '%s' " +
@@ -169,7 +160,7 @@ def process_template_line (self, line):
 
         elif action == 'recursive-exclude':
             self.debug_print("recursive-exclude %s %s" %
-                             (dir, string.join(patterns)))
+                             (dir, ' '.join(patterns)))
             for pattern in patterns:
                 if not self.exclude_pattern(pattern, prefix=dir):
                     log.warn(("warning: no previously-included files matching "
@@ -196,13 +187,13 @@ def process_template_line (self, line):
 
     # -- Filtering/selection methods -----------------------------------
 
-    def include_pattern (self, pattern,
-                         anchor=1, prefix=None, is_regex=0):
+    def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'self.files' that
-        match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
-        are not quite the same as implemented by the 'fnmatch' module: '*'
-        and '?'  match non-special characters, where "special" is platform-
-        dependent: slash on Unix; colon, slash, and backslash on
+        match 'pattern', a Unix-style wildcard (glob) pattern.
+
+        Patterns are not quite the same as implemented by the 'fnmatch'
+        module: '*' and '?'  match non-special characters, where "special"
+        is platform-dependent: slash on Unix; colon, slash, and backslash on
         DOS/Windows; and colon on Mac OS.
 
         If 'anchor' is true (the default), then the pattern match is more
@@ -239,16 +230,14 @@ def include_pattern (self, pattern,
 
         return files_found
 
-    # include_pattern ()
-
 
-    def exclude_pattern (self, pattern,
-                         anchor=1, prefix=None, is_regex=0):
+    def exclude_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
-        'pattern'.  Other parameters are the same as for
-        'include_pattern()', above.
-        The list 'self.files' is modified in place.
-        Return 1 if files are found.
+        'pattern'.
+
+        Other parameters are the same as for 'include_pattern()', above.
+        The list 'self.files' is modified in place. Return 1 if files are
+        found.
         """
         files_found = 0
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
@@ -262,15 +251,11 @@ def exclude_pattern (self, pattern,
 
         return files_found
 
-    # exclude_pattern ()
-
-# class FileList
-
 
 # ----------------------------------------------------------------------
 # Utility functions
 
-def findall (dir = os.curdir):
+def findall(dir = os.curdir):
     """Find all files under 'dir' and return the list of full filenames
     (relative to 'dir').
     """
@@ -303,10 +288,11 @@ def findall (dir = os.curdir):
 
 
 def glob_to_re(pattern):
-    """Translate a shell-like glob pattern to a regular expression; return
-    a string containing the regex.  Differs from 'fnmatch.translate()' in
-    that '*' does not match "special characters" (which are
-    platform-specific).
+    """Translate a shell-like glob pattern to a regular expression.
+
+    Return a string containing the regex.  Differs from
+    'fnmatch.translate()' in that '*' does not match "special characters"
+    (which are platform-specific).
     """
     pattern_re = fnmatch.translate(pattern)
 
@@ -321,17 +307,17 @@ def glob_to_re(pattern):
 
     return pattern_re
 
-# glob_to_re ()
-
 
-def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
+def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     """Translate a shell-like wildcard pattern to a compiled regular
-    expression.  Return the compiled regex.  If 'is_regex' true,
+    expression.
+
+    Return the compiled regex.  If 'is_regex' true,
     then 'pattern' is directly compiled to a regex (if it's a string)
     or just returned as-is (assumes it's a regex object).
     """
     if is_regex:
-        if type(pattern) is StringType:
+        if isinstance(pattern, str):
             return re.compile(pattern)
         else:
             return pattern
@@ -344,11 +330,10 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
     if prefix is not None:
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
-        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
+        prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
 
     return re.compile(pattern_re)
-# translate_pattern ()

From 15409e57d2abff9f61fa6cd3b7e676da610a4514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 Aug 2009 21:50:37 +0000
Subject: [PATCH 2460/8469] Merged revisions 74495 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74495 | tarek.ziade | 2009-08-17 23:48:22 +0200 (Mon, 17 Aug 2009) | 1 line

  module cleanup
........
---
 filelist.py | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/filelist.py b/filelist.py
index 06a8da9a07..b6a1dfeebf 100644
--- a/filelist.py
+++ b/filelist.py
@@ -180,10 +180,11 @@ def process_template_line(self, line):
 
     def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'self.files' that
-        match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
-        are not quite the same as implemented by the 'fnmatch' module: '*'
-        and '?'  match non-special characters, where "special" is platform-
-        dependent: slash on Unix; colon, slash, and backslash on
+        match 'pattern', a Unix-style wildcard (glob) pattern.
+
+        Patterns are not quite the same as implemented by the 'fnmatch'
+        module: '*' and '?'  match non-special characters, where "special"
+        is platform-dependent: slash on Unix; colon, slash, and backslash on
         DOS/Windows; and colon on Mac OS.
 
         If 'anchor' is true (the default), then the pattern match is more
@@ -220,13 +221,13 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         return files_found
 
 
-    def exclude_pattern (self, pattern,
-                         anchor=1, prefix=None, is_regex=0):
+    def exclude_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
-        'pattern'.  Other parameters are the same as for
-        'include_pattern()', above.
-        The list 'self.files' is modified in place.
-        Return True if files are found, False otherwise.
+        'pattern'.
+
+        Other parameters are the same as for 'include_pattern()', above.
+        The list 'self.files' is modified in place. Return 1 if files are
+        found.
         """
         files_found = False
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
@@ -275,10 +276,11 @@ def findall(dir=os.curdir):
 
 
 def glob_to_re(pattern):
-    """Translate a shell-like glob pattern to a regular expression; return
-    a string containing the regex.  Differs from 'fnmatch.translate()' in
-    that '*' does not match "special characters" (which are
-    platform-specific).
+    """Translate a shell-like glob pattern to a regular expression.
+
+    Return a string containing the regex.  Differs from
+    'fnmatch.translate()' in that '*' does not match "special characters"
+    (which are platform-specific).
     """
     pattern_re = fnmatch.translate(pattern)
 
@@ -296,7 +298,9 @@ def glob_to_re(pattern):
 
 def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     """Translate a shell-like wildcard pattern to a compiled regular
-    expression.  Return the compiled regex.  If 'is_regex' true,
+    expression.
+
+    Return the compiled regex.  If 'is_regex' true,
     then 'pattern' is directly compiled to a regex (if it's a string)
     or just returned as-is (assumes it's a regex object).
     """
@@ -314,7 +318,7 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     if prefix is not None:
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
-        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
+        prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:

From b3720fd2d9d4207a120738aacfdc3e99d7317dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 18 Aug 2009 08:16:33 +0000
Subject: [PATCH 2461/8469] added more test coverage for distutils.filelist to
 prevent regressions when fnmatch or re are changed

---
 filelist.py            |  5 +----
 tests/test_filelist.py | 45 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/filelist.py b/filelist.py
index de665e7a8c..7cf05098ed 100644
--- a/filelist.py
+++ b/filelist.py
@@ -115,7 +115,7 @@ def process_template_line(self, line):
         # defined: it's the first word of the line.  Which of the other
         # three are defined depends on the action; it'll be either
         # patterns, (dir and patterns), or (dir_pattern).
-        (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
+        action, patterns, dir, dir_pattern = self._parse_template_line(line)
 
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
@@ -182,9 +182,6 @@ def process_template_line(self, line):
             raise DistutilsInternalError, \
                   "this cannot happen: invalid action '%s'" % action
 
-    # process_template_line ()
-
-
     # -- Filtering/selection methods -----------------------------------
 
     def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 1faccfae7e..181a58d815 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,6 +1,21 @@
 """Tests for distutils.filelist."""
+from os.path import join
 import unittest
-from distutils.filelist import glob_to_re
+from distutils.filelist import glob_to_re, FileList
+
+MANIFEST_IN = """\
+include ok
+include xo
+exclude xo
+include foo.tmp
+global-include *.x
+global-include *.txt
+global-exclude *.tmp
+recursive-include f *.oo
+recursive-exclude global *.x
+graft dir
+prune dir3
+"""
 
 class FileListTestCase(unittest.TestCase):
 
@@ -16,6 +31,34 @@ def test_glob_to_re(self):
         self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
         self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
+    def test_process_template_line(self):
+        # testing  all MANIFEST.in template patterns
+        file_list = FileList()
+
+        # simulated file list
+        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt'
+                              join('global', 'one.txt'),
+                              join('global', 'two.txt'),
+                              join('global', 'files.x'),
+                              join('global', 'here.tmp'),
+                              join('f', 'o', 'f.oo'),
+                              join('dir', 'graft-one'),
+                              join('dir', 'dir2', 'graft2'),
+                              join('dir3', 'ok'),
+                              join('dir3', 'sub', 'ok.txt')
+                              ]
+
+        for line in MANIFEST_IN.split('\n'):
+            if line.strip() == '':
+                continue
+            file_list.process_template_line(line)
+
+        wanted = ['ok', join('global', 'one.txt'), join('global', 'two.txt'),
+                  'four.txt', join('f', 'o', 'f.oo'), join('dir', 'graft-one'),
+                  join('dir', 'dir2', 'graft2')]
+
+        self.assertEquals(file_list.files, wanted)
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 

From fa9880b2ce1357d28b14880d2d7398e32dccdf31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 18 Aug 2009 08:21:49 +0000
Subject: [PATCH 2462/8469] fixed typo

---
 tests/test_filelist.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 181a58d815..cf64c744d2 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -36,7 +36,7 @@ def test_process_template_line(self):
         file_list = FileList()
 
         # simulated file list
-        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt'
+        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
                               join('global', 'one.txt'),
                               join('global', 'two.txt'),
                               join('global', 'files.x'),
@@ -53,9 +53,9 @@ def test_process_template_line(self):
                 continue
             file_list.process_template_line(line)
 
-        wanted = ['ok', join('global', 'one.txt'), join('global', 'two.txt'),
-                  'four.txt', join('f', 'o', 'f.oo'), join('dir', 'graft-one'),
-                  join('dir', 'dir2', 'graft2')]
+        wanted = ['ok', 'four.txt', join('global', 'one.txt'),
+                  join('global', 'two.txt'), join('f', 'o', 'f.oo'),
+                  join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
 
         self.assertEquals(file_list.files, wanted)
 

From 8f6778cb615909aff25a6b77a78d07e195be85af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 18 Aug 2009 08:23:10 +0000
Subject: [PATCH 2463/8469] Merged revisions 74501 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74501 | tarek.ziade | 2009-08-18 10:16:33 +0200 (Tue, 18 Aug 2009) | 1 line

  added more test coverage for distutils.filelist to prevent regressions when fnmatch or re are changed
........
---
 filelist.py            |  3 +--
 tests/test_filelist.py | 45 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/filelist.py b/filelist.py
index b6a1dfeebf..bfc6df694a 100644
--- a/filelist.py
+++ b/filelist.py
@@ -108,7 +108,7 @@ def process_template_line(self, line):
         # defined: it's the first word of the line.  Which of the other
         # three are defined depends on the action; it'll be either
         # patterns, (dir and patterns), or (dir_pattern).
-        (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
+        action, patterns, dir, dir_pattern = self._parse_template_line(line)
 
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
@@ -175,7 +175,6 @@ def process_template_line(self, line):
             raise DistutilsInternalError(
                   "this cannot happen: invalid action '%s'" % action)
 
-
     # -- Filtering/selection methods -----------------------------------
 
     def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 1faccfae7e..cf64c744d2 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,6 +1,21 @@
 """Tests for distutils.filelist."""
+from os.path import join
 import unittest
-from distutils.filelist import glob_to_re
+from distutils.filelist import glob_to_re, FileList
+
+MANIFEST_IN = """\
+include ok
+include xo
+exclude xo
+include foo.tmp
+global-include *.x
+global-include *.txt
+global-exclude *.tmp
+recursive-include f *.oo
+recursive-exclude global *.x
+graft dir
+prune dir3
+"""
 
 class FileListTestCase(unittest.TestCase):
 
@@ -16,6 +31,34 @@ def test_glob_to_re(self):
         self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
         self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
+    def test_process_template_line(self):
+        # testing  all MANIFEST.in template patterns
+        file_list = FileList()
+
+        # simulated file list
+        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
+                              join('global', 'one.txt'),
+                              join('global', 'two.txt'),
+                              join('global', 'files.x'),
+                              join('global', 'here.tmp'),
+                              join('f', 'o', 'f.oo'),
+                              join('dir', 'graft-one'),
+                              join('dir', 'dir2', 'graft2'),
+                              join('dir3', 'ok'),
+                              join('dir3', 'sub', 'ok.txt')
+                              ]
+
+        for line in MANIFEST_IN.split('\n'):
+            if line.strip() == '':
+                continue
+            file_list.process_template_line(line)
+
+        wanted = ['ok', 'four.txt', join('global', 'one.txt'),
+                  join('global', 'two.txt'), join('f', 'o', 'f.oo'),
+                  join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
+
+        self.assertEquals(file_list.files, wanted)
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 

From 81b3818500aef5efe1151c60a4ffb8d6ad28331e Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 25 Aug 2009 19:44:53 +0200
Subject: [PATCH 2464/8469] not removing a setuptools instance that is not part
 of the same root/prefix

--HG--
branch : distribute
extra : rebase_source : 2193299f01f96c29fb447c024b2051c91ae6bb7b
---
 distribute_setup.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/distribute_setup.py b/distribute_setup.py
index e50956fd22..c2ef008f69 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -259,6 +259,20 @@ def before_install():
     log.warn('Before install bootstrap.')
     fake_setuptools()
 
+def _under_prefix(location):
+    args = sys.argv[sys.argv.index('install')+1:]
+
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index+1]
+                    return location.startswith(top_dir)
+    return True
+
 def fake_setuptools():
     log.warn('Scanning installed packages')
     try:
@@ -276,6 +290,13 @@ def fake_setuptools():
     setuptools_location = setuptools_dist.location
     log.warn('Setuptools installation detected at %s' % setuptools_location)
 
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
     # let's see if its an egg
     if not setuptools_location.endswith('.egg'):
         log.warn('Non-egg installation')

From 6c31d16ce512c164e211aec0fa1d44437dfe5c61 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 25 Aug 2009 19:48:02 +0200
Subject: [PATCH 2465/8469] added change note + raise version

--HG--
branch : distribute
extra : rebase_source : dbba2f1fa3d5292746b9605a906e67c9373c7910
---
 CHANGES.txt  | 11 +++++++++++
 docs/conf.py |  4 ++--
 setup.py     |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index dfc41bc12b..14920b3e7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,17 @@
 CHANGES
 =======
 
+-----
+0.6.1
+-----
+
+bootstraping
+============
+
+* The boostrap process leave setuptools alone if detected in the system
+  and --root or --prefix is provided, but is not in the same location.
+  This closes http://bitbucket.org/tarek/distribute/issue/10.
+
 ---
 0.6
 ---
diff --git a/docs/conf.py b/docs/conf.py
index 74bc7a6c46..d4ff4a1542 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6'
+version = '0.6.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.6'
+release = '0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 4deaa1f628..10502748ba 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6"
+VERSION = "0.6.1"
 
 from setuptools import setup, find_packages
 import sys

From 0ae5113b9bc5824a09b0e2c4e317084a4402cc0c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 26 Aug 2009 08:42:44 +0200
Subject: [PATCH 2466/8469] fixed #16 and #18: BadStatusLine and ValueError in
 package_index.urlopen

--HG--
branch : distribute
extra : rebase_source : 6159cf23c0dc4effd40b525066266eefd292b96e
---
 CHANGES.txt                           |  7 ++++++
 setuptools/package_index.py           | 17 +++++++++++++-
 setuptools/tests/test_packageindex.py | 33 +++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 14920b3e7f..dd2bfe3639 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,13 @@ CHANGES
 0.6.1
 -----
 
+setuptools
+==========
+
+* package_index.urlopen now catches BadStatusLine and malformed url errors.
+  This closes http://bitbucket.org/tarek/distribute/issue/16 and
+  http://bitbucket.org/tarek/distribute/issue/18.
+
 bootstraping
 ============
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e601cc1548..fef6294215 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
+import httplib
 from pkg_resources import *
 from distutils import log
 from distutils.errors import DistutilsError
@@ -577,13 +578,27 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url)
+        except ValueError, v:
+            msg = ' '.join([str(arg) for arg in v.args])
+            if warning:
+                self.warn(warning, msg)
+            else:
+                raise DistutilsError('%s %s' % (url, msg))
         except urllib2.HTTPError, v:
             return v
         except urllib2.URLError, v:
-            if warning: self.warn(warning, v.reason)
+            if warning:
+                self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason))
+        except httplib.BadStatusLine, v:
+            if warning:
+                self.warn(warning, v.line)
+            else:
+                raise DistutilsError('%s returned a bad status line. '
+                                     'The server might be down, %s' % \
+                                             (url, v.line))
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 0231eda87a..d7efe1bc18 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -18,6 +18,39 @@ def test_bad_urls(self):
         else:
             self.assert_(isinstance(v,urllib2.HTTPError))
 
+        # issue 16
+        # easy_install inquant.contentmirror.plone breaks because of a typo
+        # in its home URL
+        index = setuptools.package_index.PackageIndex(
+            hosts=('www.example.com',)
+        )
+
+        url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk'
+        try:
+            v = index.open_url(url)
+        except Exception, v:
+            self.assert_(url in str(v))
+        else:
+            self.assert_(isinstance(v, urllib2.HTTPError))
+
+        def _urlopen(*args):
+            import httplib
+            raise httplib.BadStatusLine('line')
+
+        old_urlopen = urllib2.urlopen
+        urllib2.urlopen = _urlopen
+        url = 'http://example.com'
+        try:
+            try:
+                v = index.open_url(url)
+            except Exception, v:
+                self.assert_('line' in str(v))
+            else:
+                raise AssertionError('Should have raise here!')
+        finally:
+            urllib2.urlopen = old_urlopen
+
+
     def test_url_ok(self):
         index = setuptools.package_index.PackageIndex(
             hosts=('www.example.com',)

From dd606e831affd2ace8bd5a276d3bcc1aa1433c11 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 28 Aug 2009 10:40:12 +0200
Subject: [PATCH 2467/8469] made zip_ok False by default #33

--HG--
branch : distribute
extra : rebase_source : 593924801e8dd947c8e741f9d94e919dd0bdd2dd
---
 CHANGES.txt                        | 3 +++
 setuptools/command/easy_install.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index dd2bfe3639..203618598a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,9 @@ setuptools
   This closes http://bitbucket.org/tarek/distribute/issue/16 and
   http://bitbucket.org/tarek/distribute/issue/18.
 
+* zip_ok is now True by default. This closes 
+  http://bugs.python.org/setuptools/issue33.
+
 bootstraping
 ============
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3f8a6877b7..0fa07845de 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -547,7 +547,7 @@ def should_unzip(self, dist):
             return True
         if not dist.has_metadata('zip-safe'):
             return True
-        return False
+        return True
 
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)

From ae8f6226eacfce9c5519f562c750b9db7aa98bdf Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 28 Aug 2009 11:01:48 +0200
Subject: [PATCH 2468/8469] fixed #20 - catching invalid URL error from httplib

--HG--
branch : distribute
extra : rebase_source : 6c6a92f65f6ac2d6d071ce525d0ef3e41167d59e
---
 CHANGES.txt                           | 2 ++
 setuptools/package_index.py           | 2 +-
 setuptools/tests/test_packageindex.py | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 203618598a..b4645e0607 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,8 @@ setuptools
 * zip_ok is now True by default. This closes 
   http://bugs.python.org/setuptools/issue33.
 
+* Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
+
 bootstraping
 ============
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index fef6294215..220cdec7bb 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -578,7 +578,7 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url)
-        except ValueError, v:
+        except (ValueError, httplib.InvalidURL), v:
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d7efe1bc18..18a06de558 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -50,6 +50,12 @@ def _urlopen(*args):
         finally:
             urllib2.urlopen = old_urlopen
 
+        # issue 20
+        url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
+        try:
+            index.open_url(url)
+        except Exception, v:
+            self.assert_('nonnumeric port' in str(v))
 
     def test_url_ok(self):
         index = setuptools.package_index.PackageIndex(

From 89e9dfcd6d1d97f8439844a80e66c7c5a9dfaae3 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 13:12:44 +0200
Subject: [PATCH 2469/8469] easy_install Distribute now calls the setuptools
 fake machinery fixes #40

--HG--
branch : distribute
extra : rebase_source : abcd8e82c2de583da133b160ba9e31248d5ae264
---
 distribute_setup.py | 16 ++++++++++++++--
 setup.py            | 12 ++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index c2ef008f69..923a1e986a 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -13,6 +13,7 @@
 
 This file can also be run as a script to install or upgrade setuptools.
 """
+from site import USER_SITE
 import sys
 import os
 import shutil
@@ -162,7 +163,7 @@ def _patch_file(path, content):
         log.warn('Already patched.')
         return False
     log.warn('Patching...')
-    os.rename(path, path +'.OLD.%s' % time.time())
+    _rename_path(path)
     f = open(path, 'w')
     try:
         f.write(content)
@@ -176,6 +177,14 @@ def _same_content(path, content):
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s' % (path, new_name))
+    try:
+        from setuptools.sandbox import DirectorySandbox
+        def _violation(*args):
+            pass
+        DirectorySandbox._violation = _violation
+    except ImportError:
+        pass
+
     os.rename(path, new_name)
     return new_name
 
@@ -260,8 +269,9 @@ def before_install():
     fake_setuptools()
 
 def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
     args = sys.argv[sys.argv.index('install')+1:]
-
     for index, arg in enumerate(args):
         for option in ('--root', '--prefix'):
             if arg.startswith('%s=' % option):
@@ -271,6 +281,8 @@ def _under_prefix(location):
                 if len(args) > index:
                     top_dir = args[index+1]
                     return location.startswith(top_dir)
+            elif option == '--user':
+                return location.startswith(USER_SITE)
     return True
 
 def fake_setuptools():
diff --git a/setup.py b/setup.py
index 10502748ba..59a3bfa297 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,14 @@
 
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
-if 'install' in sys.argv[1:]:
+def _being_installed():
+    # easy_install marker
+    if (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
+            sys.argv[3] == '--dist-dir'):
+        return True
+    return 'install' in sys.argv[1:]
+
+if _being_installed():
     from distribute_setup import before_install
     before_install()
 
@@ -100,7 +107,8 @@
     Topic :: Utilities""".splitlines() if f.strip()],
     scripts = scripts,
 )
-if 'install' in sys.argv[1:]:
+
+if _being_installed():
     from distribute_setup import after_install
     after_install(dist)
 

From 10983835f0ad4d7df3a5bd0d6e3e7a6422cca877 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 13:17:47 +0200
Subject: [PATCH 2470/8469] added a note about #40

--HG--
branch : distribute
extra : rebase_source : b7a645e678aece7467458cadeb296ff039e39020
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b4645e0607..d97bb77c1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,9 @@ setuptools
 
 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
 
+* Fixed invalid bootstraping with easy_install installation
+  http://bitbucket.org/tarek/distribute/issue/40.
+
 bootstraping
 ============
 

From af8e09cef0af66a824c0b675ab36522e72b0b388 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 15:35:39 +0200
Subject: [PATCH 2471/8469] 0.6.1

--HG--
branch : distribute
extra : rebase_source : 30c5e5bb24e22d7e83ace71144562706ad1ae58c
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index 344114aef8..fd4eb07961 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export VERSION="0.6"
+export VERSION="0.6.1"
 
 # creating the releases
 rm -rf dist

From 55c87e48495b5e05c4f3e985354159ea55b8d73f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 15:37:41 +0200
Subject: [PATCH 2472/8469] the md5 hashes are made before the eggs are built

--HG--
branch : distribute
extra : rebase_source : e4c1f1420cf24aa2a8b12304b86f1b3d8c6a1aaf
---
 release.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/release.sh b/release.sh
index fd4eb07961..7cbaa0a2a5 100755
--- a/release.sh
+++ b/release.sh
@@ -5,18 +5,18 @@ export VERSION="0.6.1"
 # creating the releases
 rm -rf dist
 
-# eggs
-python2.3 setup.py -q egg_info -RDb '' bdist_egg # manual upload
-python2.4 setup.py -q egg_info -RDb '' bdist_egg # manual upload
-python2.5 setup.py -q egg_info -RDb '' bdist_egg register upload
-python2.6 setup.py -q egg_info -RDb '' bdist_egg register upload
-
 # updating the md5 hashes
 python distribute_setup.py --md5update dist/distribute-$VERSION-py2.3.egg
 python distribute_setup.py --md5update dist/distribute-$VERSION-py2.4.egg
 python distribute_setup.py --md5update dist/distribute-$VERSION-py2.5.egg
 python distribute_setup.py --md5update dist/distribute-$VERSION-py2.6.egg
 
+# eggs
+python2.3 setup.py -q egg_info -RDb '' bdist_egg # manual upload
+python2.4 setup.py -q egg_info -RDb '' bdist_egg # manual upload
+python2.5 setup.py -q egg_info -RDb '' bdist_egg register upload
+python2.6 setup.py -q egg_info -RDb '' bdist_egg register upload
+
 # now preparing the source release
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 

From fab8f93ea32135cb746ae6e87922e1c9e69f57ea Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 18:08:57 +0200
Subject: [PATCH 2473/8469] no more bdist_egg release

--HG--
branch : distribute
extra : rebase_source : dc5bb933d711a32efee224b6d632cceb73efbdcf
---
 README.txt          | 56 +++-------------------------------------
 distribute_setup.py | 62 +++------------------------------------------
 release.sh          | 16 ------------
 3 files changed, 7 insertions(+), 127 deletions(-)

diff --git a/README.txt b/README.txt
index 2a6e75dea5..0aa2746553 100755
--- a/README.txt
+++ b/README.txt
@@ -35,8 +35,7 @@ you start the installation of `Distribute`.
 Installation Instructions
 -------------------------
 
-Distribute comes in two flavors: in eggs or as a source distribution. Archives
-are available at the PyPI page.
+Distribute is only released as a source distribution.
 
 It can be installed using easy_install or pip, with the source tarball, with the
 eggs distribution, or using the ``distribute_setup.py`` script provided online.
@@ -67,58 +66,11 @@ Source installation
 
 Download the source tarball, and uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.tar.gz
-    $ tar -xzvf distribute-0.6.tar.gz
+    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.1.tar.gz
+    $ tar -xzvf distribute-0.6.1.tar.gz
     $ cd distribute-0.6
     $ python setup.py install
 
-Egg installation
-================
-
-An Egg is a zip file with a `sh` script inserted in its head so it can be 
-`executed` in the shell.
-
-Cygwin, Linux anc Mac OS/X
---------------------------
-
-1. Download the appropriate egg for your version of Python (e.g.
-   ``distribute-0.6-py2.4.egg``).  Do NOT rename it.
-
-2. Run it as if it were a shell script, e.g. ``sh distribute-0.6-py2.4.egg``.
-   Distutils will install itself using the matching version of Python (e.g.
-   ``python2.4``), and will place the ``easy_install`` executable in the
-   default location for installing Python scripts (as determined by the
-   standard distutils configuration files, or by the Python installation).
-
-If you want to install distribute to somewhere other than ``site-packages`` or
-your default distutils installation locations for libraries and scripts, you
-may include EasyInstall command-line options such as ``--prefix``,
-``--install-dir``, and so on, following the ``.egg`` filename on the same
-command line.  For example::
-
-    sh distribute-0.6-py2.4.egg --prefix=~
-
-Cygwin Note
------------
-
-If you are trying to install Distribute for the **Windows** version of Python
-(as opposed to the Cygwin version that lives in ``/usr/bin``), you must make
-sure that an appropriate executable (``python2.3``, ``python2.4``, or
-``python2.5``) is on your **Cygwin** ``PATH`` when invoking the egg.  For
-example, doing the following at a Cygwin bash prompt will install Distribute
-for the **Windows** Python found at ``C:\\Python24``::
-
-    ln -s /cygdrive/c/Python24/python.exe python2.4
-    PATH=.:$PATH sh distribute-0.6-py2.4.egg
-    rm python2.4
-
-Windows
--------
-
-Don't install Distribute trying to execute the egg, because it's aimed to 
-sh-based shells. Instead, use the ``distribute_setup.py`` method, that will 
-download the egg for you, then install the egg.
-
 ---------------------------
 Uninstallation Instructions
 ---------------------------
@@ -179,7 +131,7 @@ Install FAQ
   You need in this case to build a virtualenv with the --no-site-packages option
   or to install `Distribute` globally.
 
-- **How does in interacts with zc.buildout ?**
+- **How does Distribute interacts with zc.buildout ?**
 
   Like virtualenv, Distribute has to be installed after setuptools. The simplest
   way is to add it in a `zc.recipe.egg` section so the job is done when you 
diff --git a/distribute_setup.py b/distribute_setup.py
index 923a1e986a..85a12d8459 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -26,32 +26,9 @@
 if is_jython:
     import subprocess
 
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
-
-DEFAULT_VERSION = "0.6"
+DEFAULT_VERSION = "0.6.1"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/d/distribute/" % sys.version[:3]
 
-md5_data = {
-    'distribute-0.6-py2.3.egg': '66d06db7fc91227585f81b0b27b07bab',
-    'distribute-0.6-py2.4.egg': '8fc3eb887ee98c506c38838955f9eee2',
-    'distribute-0.6-py2.5.egg': 'd87f6492c53d192c62e0334859d18b59',
-    'distribute-0.6-py2.6.egg': '89c46c2ed0c756dd278acc1482aa12f1',
-}
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
 def use_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
     download_delay=15
@@ -135,7 +112,7 @@ def download_setuptools(
             src = urllib2.urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
+            data = src.read()
             dst = open(saveto,"wb"); dst.write(data)
         finally:
             if src: src.close()
@@ -425,39 +402,6 @@ def main(argv, version=DEFAULT_VERSION):
             print "distribute version",version,"or greater has been installed."
             print '(Run "distribute_setup.py -U distribute" to reinstall or upgrade.)'
 
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
 if __name__ == '__main__':
-    if len(sys.argv) > 2 and sys.argv[1] == '--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
+    main(sys.argv[1:])
 
diff --git a/release.sh b/release.sh
index 7cbaa0a2a5..992d4e268b 100755
--- a/release.sh
+++ b/release.sh
@@ -1,25 +1,9 @@
 #!/bin/sh
-
 export VERSION="0.6.1"
 
 # creating the releases
 rm -rf dist
 
-# updating the md5 hashes
-python distribute_setup.py --md5update dist/distribute-$VERSION-py2.3.egg
-python distribute_setup.py --md5update dist/distribute-$VERSION-py2.4.egg
-python distribute_setup.py --md5update dist/distribute-$VERSION-py2.5.egg
-python distribute_setup.py --md5update dist/distribute-$VERSION-py2.6.egg
-
-# eggs
-python2.3 setup.py -q egg_info -RDb '' bdist_egg # manual upload
-python2.4 setup.py -q egg_info -RDb '' bdist_egg # manual upload
-python2.5 setup.py -q egg_info -RDb '' bdist_egg register upload
-python2.6 setup.py -q egg_info -RDb '' bdist_egg register upload
-
 # now preparing the source release
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 
-echo You need to commit the md5 changes
-
-

From 81c979b40ca015e87bdad337106d0ee6a6f50083 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 18:59:02 +0200
Subject: [PATCH 2474/8469] simplifying the bootstrap process

--HG--
branch : distribute
extra : rebase_source : bf37715d8a5bc2c0be0867da88dbd717f716bb95
---
 distribute_setup.py | 185 +++++++++-----------------------------------
 1 file changed, 36 insertions(+), 149 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 85a12d8459..9b388b5717 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -26,55 +26,13 @@
 if is_jython:
     import subprocess
 
-DEFAULT_VERSION = "0.6.1"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/d/distribute/" % sys.version[:3]
 
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
-    def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-    try:
-        import pkg_resources
-        if not hasattr(pkg_resources, '_distribute'):
-            raise ImportError
-    except ImportError:
-        return do_download()
-    try:
-        pkg_resources.require("distribute>="+version); return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of distribute (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U distribute'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
-            sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return do_download()
-    except pkg_resources.DistributionNotFound:
-        return do_download()
+DEFAULT_VERSION = "0.6.1"
+#DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
+DEFAULT_URL = "http://nightly.ziade.org/"
 
 def download_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
 ):
     """Download distribute from a specified location and return its filename
 
@@ -84,39 +42,25 @@ def download_setuptools(
     `delay` is the number of seconds to pause before an actual download attempt.
     """
     import urllib2, shutil
-    egg_name = "distribute-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
     src = dst = None
     if not os.path.exists(saveto):  # Avoid repeated downloads
         try:
             from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires distribute version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
             log.warn("Downloading %s", url)
             src = urllib2.urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.
             data = src.read()
-            dst = open(saveto,"wb"); dst.write(data)
+            dst = open(saveto, "wb")
+            dst.write(data)
         finally:
-            if src: src.close()
-            if dst: dst.close()
+            if src:
+                src.close()
+            if dst:
+                dst.close()
     return os.path.realpath(saveto)
 
 
@@ -316,91 +260,34 @@ def _relaunch():
     else:
         sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))
 
-def _easy_install(argv, egg=None):
-    from setuptools import setup
-    from setuptools.dist import Distribution
-    import distutils.core
-    if egg is not None:
-        setup_args = list(argv) + [egg]
-    else:
-        setup_args = list(argv)
+import tempfile
+import tarfile
+
+def _install(tarball):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s' % tmpdir)
+    old_wd = os.getcwd()
     try:
-        return setup(script_args = ['-q','easy_install',
-                                    '-v'] + setup_args,
-                    script_name = sys.argv[0] or 'easy_install',
-                    distclass=Distribution)
-    except DistutilsError:
-        return sys.exit(2)
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        tar.extractall()
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s' % subdir)
+
+        # installing distribute
+        os.system('%s setup.py install' % sys.executable)
+    finally:
+        os.chdir(old_wd)
 
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
-    # let's deactivate any existing setuptools installation first
-    fake_setuptools()
-    try:
-        import setuptools
-        # we need to check if the installed setuptools
-        # is from Distribute or from setuptools
-        if not hasattr(setuptools, '_distribute'):
-            # now we are ready to install distribute
-            raise ImportError
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0, egg)
-            import setuptools
-            if not hasattr(setuptools, '_distribute'):
-                placeholder = os.path.split(os.path.dirname(setuptools.__file__))[0]
-                if not placeholder.endswith('.egg'):
-                    res = _remove_flat_installation(placeholder)
-                    if res:
-                        _relaunch()
-                print >> sys.stderr, (
-                "The patch didn't work, Setuptools is still active.\n"
-                "Possible reason: your have a system-wide setuptools installed "
-                "and you are in a virtualenv.\n"
-                "If you are inside a virtualenv, make sure you used the --no-site-packages option"
-                )
-                sys.exit(2)
-            dist = _easy_install(argv, egg)
-            after_install(dist)
-            return
-            #from setuptools.command import easy_install
-            #try:
-            #    return easy_install.main(list(argv)+['-v']+[egg])
-            #except DistutilsError:
-            #    return sys.exit(2)
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-
-    req = "distribute>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            _easy_install(argv, [download_setuptools(delay=0)])
-            #from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-            main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            _easy_install(argv)
-            #from setuptools.command.easy_install import main
-            #main(argv)
-        else:
-            print "distribute version",version,"or greater has been installed."
-            print '(Run "distribute_setup.py -U distribute" to reinstall or upgrade.)'
+    tarball = download_setuptools()
+    _install(tarball)
 
 if __name__ == '__main__':
     main(sys.argv[1:])

From 321880f989c67fe471e2736f7be5517a098120c5 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 22:41:46 +0200
Subject: [PATCH 2475/8469] removed buildout

--HG--
branch : distribute
extra : rebase_source : 750c19c71792d672e51c503ca0b6654bfd1624ff
---
 CHANGES.txt           |   5 +
 MANIFEST.in           |   1 -
 buildout/bootstrap.py | 228 ------------------------------------------
 3 files changed, 5 insertions(+), 229 deletions(-)
 delete mode 100644 buildout/bootstrap.py

diff --git a/CHANGES.txt b/CHANGES.txt
index d97bb77c1d..3465828cb7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,11 @@ setuptools
 
 * Fixed invalid bootstraping with easy_install installation
   http://bitbucket.org/tarek/distribute/issue/40.
+  Thanks to Florian Shchulze for the help.
+
+* Removed buildout/bootstrap.py. A new repository will create a specific
+  bootstrap.py script.
+
 
 bootstraping
 ============
diff --git a/MANIFEST.in b/MANIFEST.in
index a2439ccd0c..c546d1ea98 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx
 recursive-include docs *.py *.txt Makefile
-recursive-include buildout *.py 
 include *.py
 include *.txt
 include MANIFEST.in
diff --git a/buildout/bootstrap.py b/buildout/bootstrap.py
deleted file mode 100644
index d1e6938107..0000000000
--- a/buildout/bootstrap.py
+++ /dev/null
@@ -1,228 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-
-$Id$
-"""
-
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-is_jython = sys.platform.startswith('java')
-
-to_reload = False
-try:
-    import pkg_resources
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
-except ImportError:
-    ez = {}
-    exec urllib2.urlopen('http://nightly.ziade.org/distribute_setup.py'
-                         ).read() in ez
-    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        import pkg_resources
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    def quote (c):
-        return c
-
-cmd = 'from setuptools.command.easy_install import main; main()'
-ws  = pkg_resources.working_set
-
-if len(sys.argv) > 2 and sys.argv[1] == '--version':
-    VERSION = '==%s' % sys.argv[2]
-    args = sys.argv[3:] + ['bootstrap']
-else:
-    VERSION = ''
-    args = sys.argv[1:] + ['bootstrap']
-
-if is_jython:
-    import subprocess
-
-    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
-           quote(tmpeggs), 'zc.buildout' + VERSION],
-           env=dict(os.environ,
-               PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('setuptools')).location
-               ),
-           ).wait() == 0
-    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
-           quote(tmpeggs), 'zc.buildout' + VERSION],
-           env=dict(os.environ,
-               PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('distribute')).location
-               ),
-           ).wait() == 0
-
-else:
-    assert os.spawnle(
-        os.P_WAIT, sys.executable, quote (sys.executable),
-        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
-        dict(os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('setuptools')).location
-            ),
-        ) == 0
-    assert os.spawnle(
-        os.P_WAIT, sys.executable, quote (sys.executable),
-        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
-        dict(os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('distribute')).location
-            ),
-        ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout' + VERSION)
-
-# patching zc.buildout.buildout so it uses distribute
-from zc.buildout import buildout as zc_buildout
-import zc.buildout
-import pkg_resources
-
-def _bootstrap(self, args):
-    import pkg_resources
-    __doing__ = 'Bootstraping.'
-    self._setup_directories()
-    # Now copy buildout, distribute and setuptools eggs, and record destination eggs:
-    entries = []
-    for name in 'setuptools', 'distribute', 'zc.buildout':
-        r = pkg_resources.Requirement.parse(name)
-        dist = pkg_resources.working_set.find(r)
-        if dist.precedence == pkg_resources.DEVELOP_DIST:
-            dest = os.path.join(self['buildout']['develop-eggs-directory'],
-                                name+'.egg-link')
-            open(dest, 'w').write(dist.location)
-            entries.append(dist.location)
-        else:
-            dest = os.path.join(self['buildout']['eggs-directory'],
-                                os.path.basename(dist.location))
-            entries.append(dest)
-            if not os.path.exists(dest):
-                if os.path.isdir(dist.location):
-                    shutil.copytree(dist.location, dest)
-                else:
-                    shutil.copy2(dist.location, dest)
-
-    # Create buildout script
-    ws = pkg_resources.WorkingSet(entries)
-    ws.require('zc.buildout')
-    zc.buildout.easy_install.scripts(
-        ['zc.buildout'], ws, sys.executable,
-        self['buildout']['bin-directory'])
-
-zc_buildout.Buildout.bootstrap = _bootstrap
-
-zc_buildout.pkg_resources_loc = pkg_resources.working_set.find(
-    pkg_resources.Requirement.parse('setuptools')).location
-
-realpath = zc.buildout.easy_install.realpath
-
-def _maybe_upgrade(self):
-        __doing__ = 'Checking for upgrades.'
-        if not self.newest:
-            return
-        ws = zc.buildout.easy_install.install(
-            [
-            (spec + ' ' + self['buildout'].get(spec+'-version', '')).strip()
-            for spec in ('zc.buildout', 'setuptools')
-            ],
-            self['buildout']['eggs-directory'],
-            links = self['buildout'].get('find-links', '').split(),
-            index = self['buildout'].get('index'),
-            path = [self['buildout']['develop-eggs-directory']],
-            allow_hosts = self._allow_hosts
-            )
-
-        upgraded = []
-        for project in 'zc.buildout', 'distribute':
-            req = pkg_resources.Requirement.parse(project)
-            if ws.find(req) != pkg_resources.working_set.find(req):
-                upgraded.append(ws.find(req))
-
-        if not upgraded:
-            return
-
-        __doing__ = 'Upgrading.'
-
-        should_run = realpath(
-            os.path.join(os.path.abspath(self['buildout']['bin-directory']),
-                         'buildout')
-            )
-        if sys.platform == 'win32':
-            should_run += '-script.py'
-
-        if (realpath(os.path.abspath(sys.argv[0])) != should_run):
-            self._logger.debug("Running %r.", realpath(sys.argv[0]))
-            self._logger.debug("Local buildout is %r.", should_run)
-            self._logger.warn("Not upgrading because not running a local "
-                              "buildout command.")
-            return
-
-        if sys.platform == 'win32' and not self.__windows_restart:
-            args = map(zc.buildout.easy_install._safe_arg, sys.argv)
-            args.insert(1, '-W')
-            if not __debug__:
-                args.insert(0, '-O')
-            args.insert(0, zc.buildout.easy_install._safe_arg (sys.executable))
-            os.execv(sys.executable, args)
-
-        self._logger.info("Upgraded:\n  %s;\nrestarting.",
-                          ",\n  ".join([("%s version %s"
-                                       % (dist.project_name, dist.version)
-                                       )
-                                      for dist in upgraded
-                                      ]
-                                     ),
-                          )
-
-        # the new dist is different, so we've upgraded.
-        # Update the scripts and return True
-        zc.buildout.easy_install.scripts(
-            ['zc.buildout'], ws, sys.executable,
-            self['buildout']['bin-directory'],
-            )
-
-        # Restart
-        args = map(zc.buildout.easy_install._safe_arg, sys.argv)
-        if not __debug__:
-            args.insert(0, '-O')
-        args.insert(0, zc.buildout.easy_install._safe_arg (sys.executable))
-
-        if is_jython:
-            sys.exit(subprocess.Popen([sys.executable] + list(args)).wait())
-        else:
-            sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))
-
-zc_buildout.Buildout._maybe_upgrade = _maybe_upgrade
-
-# now calling the bootstrap process as usual
-zc_buildout.main(args)
-shutil.rmtree(tmpeggs)
-

From e1b49ceae4787252de524b4c5210331be526c2cb Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 22:44:01 +0200
Subject: [PATCH 2476/8469] now with 2.4 support for tarfile

--HG--
branch : distribute
extra : rebase_source : 0c0159d0868dc3b1f7b68b3d748ef33551075627
---
 distribute_setup.py | 49 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 9b388b5717..8f67829e2f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -16,11 +16,9 @@
 from site import USER_SITE
 import sys
 import os
-import shutil
 import time
 import fnmatch
 from distutils import log
-from distutils.errors import DistutilsError
 
 is_jython = sys.platform.startswith('java')
 if is_jython:
@@ -28,8 +26,7 @@
 
 
 DEFAULT_VERSION = "0.6.1"
-#DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
-DEFAULT_URL = "http://nightly.ziade.org/"
+DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
 
 def download_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
@@ -41,7 +38,7 @@ def download_setuptools(
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download attempt.
     """
-    import urllib2, shutil
+    import urllib2
     tgz_name = "distribute-%s.tar.gz" % version
     url = download_base + tgz_name
     saveto = os.path.join(to_dir, tgz_name)
@@ -263,6 +260,46 @@ def _relaunch():
 import tempfile
 import tarfile
 
+def extractall(self, path=".", members=None):
+        """Extract all members from the archive to the current working
+           directory and set owner, modification time and permissions on
+           directories afterwards. `path' specifies a different directory
+           to extract to. `members' is optional and must be a subset of the
+           list returned by getmembers().
+        """
+        import copy
+        import operator
+        from tarfile import ExtractError
+        directories = []
+
+        if members is None:
+            members = self
+
+        for tarinfo in members:
+            if tarinfo.isdir():
+                # Extract directories with a safe mode.
+                directories.append(tarinfo)
+                tarinfo = copy.copy(tarinfo)
+                tarinfo.mode = 0700
+            self.extract(tarinfo, path)
+
+        # Reverse sort directories.
+        directories.sort(key=operator.attrgetter('name'))
+        directories.reverse()
+
+        # Set correct owner, mtime and filemode on directories.
+        for tarinfo in directories:
+            dirpath = os.path.join(path, tarinfo.name)
+            try:
+                self.chown(tarinfo, dirpath)
+                self.utime(tarinfo, dirpath)
+                self.chmod(tarinfo, dirpath)
+            except ExtractError, e:
+                if self.errorlevel > 1:
+                    raise
+                else:
+                    self._dbg(1, "tarfile: %s" % e)
+
 def _install(tarball):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
@@ -271,7 +308,7 @@ def _install(tarball):
     try:
         os.chdir(tmpdir)
         tar = tarfile.open(tarball)
-        tar.extractall()
+        extractall(tar)
         tar.close()
 
         # going in the directory

From cc278c1c8c13c02cb4d1675980160116656ed729 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 22:47:57 +0200
Subject: [PATCH 2477/8469] Added tag 0.6.1 for changeset 4d114c5f2a3e

--HG--
branch : distribute
extra : rebase_source : a5db5cf43c2fc780b7c44d40da20d9928f751df0
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 62272cce6b..ff5a2353b8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1 +1,2 @@
 1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6
+4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1

From d84216b635ebdf215e3dfc5b8a6df2861a151f25 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 22:50:40 +0200
Subject: [PATCH 2478/8469] starting 0.6.2

--HG--
branch : distribute
extra : rebase_source : de67d8e28de624925d10501b025f046075d84114
---
 CHANGES.txt | 5 +++++
 README.txt  | 6 +++---
 release.sh  | 2 +-
 setup.py    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3465828cb7..cff23b9c81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+-----
+0.6.2
+-----
+
+
 -----
 0.6.1
 -----
diff --git a/README.txt b/README.txt
index 0aa2746553..7adc47d888 100755
--- a/README.txt
+++ b/README.txt
@@ -66,9 +66,9 @@ Source installation
 
 Download the source tarball, and uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.1.tar.gz
-    $ tar -xzvf distribute-0.6.1.tar.gz
-    $ cd distribute-0.6
+    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.2.tar.gz
+    $ tar -xzvf distribute-0.6.2.tar.gz
+    $ cd distribute-0.6.2
     $ python setup.py install
 
 ---------------------------
diff --git a/release.sh b/release.sh
index 992d4e268b..0bd65efef9 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.1"
+export VERSION="0.6.2"
 
 # creating the releases
 rm -rf dist
diff --git a/setup.py b/setup.py
index 59a3bfa297..9ef640de7d 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.1"
+VERSION = "0.6.2"
 
 from setuptools import setup, find_packages
 import sys

From 7a5b40fd7a6ffc4edff0d3aafacab5dad57384e7 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 22:53:10 +0200
Subject: [PATCH 2479/8469] added the scp to the release process

--HG--
branch : distribute
extra : rebase_source : b2c00661e65ae5afb94832143b2b27cdd7b20949
---
 release.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release.sh b/release.sh
index 0bd65efef9..6af72616b8 100755
--- a/release.sh
+++ b/release.sh
@@ -7,3 +7,6 @@ rm -rf dist
 # now preparing the source release
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 
+# pushin the bootstrap script
+scp distribute_setup.py ziade.org:nightly/build/
+

From 03f3942553e39b62ae308784542eaf0b1427c0dd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 8 Sep 2009 23:30:09 +0200
Subject: [PATCH 2480/8469] typo

--HG--
branch : distribute
extra : rebase_source : e532131d277db59590063100d2fed06f87248bc3
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cff23b9c81..a82857b303 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,7 +25,7 @@ setuptools
 
 * Fixed invalid bootstraping with easy_install installation
   http://bitbucket.org/tarek/distribute/issue/40.
-  Thanks to Florian Shchulze for the help.
+  Thanks to Florian Schulze for the help.
 
 * Removed buildout/bootstrap.py. A new repository will create a specific
   bootstrap.py script.

From efd119a512592c664043e9d66c2b311690bbe55b Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 9 Sep 2009 01:34:00 +0200
Subject: [PATCH 2481/8469] don't user USER_SITE on py < 2.6

--HG--
branch : distribute
extra : rebase_source : caefe0a6171f53554178be6599aac67c4569e730
---
 distribute_setup.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 8f67829e2f..a57fd2a8d1 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -13,7 +13,11 @@
 
 This file can also be run as a script to install or upgrade setuptools.
 """
-from site import USER_SITE
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
 import sys
 import os
 import time
@@ -199,7 +203,7 @@ def _under_prefix(location):
                 if len(args) > index:
                     top_dir = args[index+1]
                     return location.startswith(top_dir)
-            elif option == '--user':
+            elif option == '--user' and USER_SITE is not None:
                 return location.startswith(USER_SITE)
     return True
 

From 0310beaafd54123056a2af0ae52c1aad81e9cf4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 9 Sep 2009 08:14:20 +0000
Subject: [PATCH 2482/8469] Issue #6163: Fixed HP-UX runtime library dir
 options in distutils.unixcompiler

---
 tests/test_unixccompiler.py | 18 +++++++++++++++++-
 unixccompiler.py            |  4 +++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 96f5454e3e..1b7dd4cd64 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -36,7 +36,23 @@ def test_runtime_libdir_option(self):
 
         # hp-ux
         sys.platform = 'hp-ux'
-        self.assertEqual(self.cc.rpath_foo(), '+s -L/foo')
+        old_gcv = sysconfig.get_config_var
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['+s', '-L/foo'])
+
+        def gcv(v):
+            return 'gcc'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        def gcv(v):
+            return 'g++'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        sysconfig.get_config_var = old_gcv
 
         # irix646
         sys.platform = 'irix646'
diff --git a/unixccompiler.py b/unixccompiler.py
index 129ac8cf11..2083f82982 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -285,7 +285,9 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            return "+s -L" + dir
+            if "gcc" in compiler or "g++" in compiler:
+                return ["-Wl,+s", "-L" + dir]
+            return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         elif compiler[:3] == "gcc" or compiler[:3] == "g++":

From 8137c6cfbb6449e5d89705b91f44f6d31e99b39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 9 Sep 2009 08:34:06 +0000
Subject: [PATCH 2483/8469] Merged revisions 74728 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74728 | tarek.ziade | 2009-09-09 10:14:20 +0200 (Wed, 09 Sep 2009) | 1 line

  Issue #6163: Fixed HP-UX runtime library dir options in distutils.unixcompiler
........
---
 unixccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 045368a925..7556cbdbf5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -284,7 +284,9 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            return "+s -L" + dir
+            if "gcc" in compiler or "g++" in compiler:
+                return ["-Wl,+s", "-L" + dir]
+            return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         elif compiler[:3] == "gcc" or compiler[:3] == "g++":

From 031ebb0fc2345b84cefb440c6cc83264cc9bd79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 9 Sep 2009 08:48:07 +0000
Subject: [PATCH 2484/8469] Merged revisions 74728 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74728 | tarek.ziade | 2009-09-09 10:14:20 +0200 (Wed, 09 Sep 2009) | 1 line

  Issue #6163: Fixed HP-UX runtime library dir options in distutils.unixcompiler
........
---
 tests/test_unixccompiler.py | 18 +++++++++++++++++-
 unixccompiler.py            |  4 +++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 96f5454e3e..1b7dd4cd64 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -36,7 +36,23 @@ def test_runtime_libdir_option(self):
 
         # hp-ux
         sys.platform = 'hp-ux'
-        self.assertEqual(self.cc.rpath_foo(), '+s -L/foo')
+        old_gcv = sysconfig.get_config_var
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['+s', '-L/foo'])
+
+        def gcv(v):
+            return 'gcc'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        def gcv(v):
+            return 'g++'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        sysconfig.get_config_var = old_gcv
 
         # irix646
         sys.platform = 'irix646'
diff --git a/unixccompiler.py b/unixccompiler.py
index 26d2856ad4..da85c89696 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -283,7 +283,9 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            return "+s -L" + dir
+            if "gcc" in compiler or "g++" in compiler:
+                return ["-Wl,+s", "-L" + dir]
+            return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         elif compiler[:3] == "gcc" or compiler[:3] == "g++":

From 2bf23a8289d1d71e4ab874a28812cecab3dd8604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 9 Sep 2009 09:07:13 +0000
Subject: [PATCH 2485/8469] Merged revisions 74730 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74730 | tarek.ziade | 2009-09-09 10:48:07 +0200 (Wed, 09 Sep 2009) | 9 lines

  Merged revisions 74728 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74728 | tarek.ziade | 2009-09-09 10:14:20 +0200 (Wed, 09 Sep 2009) | 1 line

    Issue #6163: Fixed HP-UX runtime library dir options in distutils.unixcompiler
  ........
................
---
 tests/test_unixccompiler.py | 18 +++++++++++++++++-
 unixccompiler.py            |  4 +++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 94e9edfc09..be2df5c6e3 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -36,7 +36,23 @@ def test_runtime_libdir_option(self):
 
         # hp-ux
         sys.platform = 'hp-ux'
-        self.assertEqual(self.cc.rpath_foo(), '+s -L/foo')
+        old_gcv = sysconfig.get_config_var
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['+s', '-L/foo'])
+
+        def gcv(v):
+            return 'gcc'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        def gcv(v):
+            return 'g++'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        sysconfig.get_config_var = old_gcv
 
         # irix646
         sys.platform = 'irix646'
diff --git a/unixccompiler.py b/unixccompiler.py
index c11544d828..8bbdb4b329 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -283,7 +283,9 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            return "+s -L" + dir
+            if "gcc" in compiler or "g++" in compiler:
+                return ["-Wl,+s", "-L" + dir]
+            return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         else:

From bf6e05c74f29186165399ec4cd7939345c01154c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 9 Sep 2009 11:39:41 +0000
Subject: [PATCH 2486/8469] removed unecessary lines for clarity and added a
 the same test than in trunk for the inplace

---
 command/build_ext.py    |  3 ---
 tests/test_build_ext.py | 13 +++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index db82f1d0d6..a3e3982f6d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -642,9 +642,6 @@ def get_ext_fullpath(self, ext_name):
         # the inplace option requires to find the package directory
         # using the build_py command for that
         package = '.'.join(modpath[0:-1])
-        modpath = fullname.split('.')
-        package = '.'.join(modpath[0:-1])
-        base = modpath[-1]
         build_py = self.get_finalized_command('build_py')
         package_dir = os.path.abspath(build_py.get_package_dir(package))
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 153c875644..d8d3667751 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -329,6 +329,19 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
+    def test_build_ext_inplace(self):
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = build_ext(dist)
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From b863dd62d8defc800fcbff6fa07eb73d4351acb9 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 10 Sep 2009 05:44:09 +0200
Subject: [PATCH 2487/8469] including txt files as well in tests

--HG--
branch : distribute
extra : rebase_source : 2d089514496c2b2b0d5246a7d1635560ffe5925f
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index c546d1ea98..b678dac4c9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 recursive-include setuptools *.py *.txt *.exe
-recursive-include tests *.py *.c *.pyx
+recursive-include tests *.py *.c *.pyx *.txt
 recursive-include docs *.py *.txt Makefile
 include *.py
 include *.txt

From 364308e9ce78818d74e88987459e3c08f8e80d11 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 10 Sep 2009 20:57:46 +0200
Subject: [PATCH 2488/8469] reintroduced use_setuptools in distribute_setup.py

--HG--
branch : distribute
extra : rebase_source : 3f0d0f085964feffdb07e97f25d508b7aaa88ffb
---
 distribute_setup.py            | 129 ++++++++++++++++++++++++++-------
 tests/test_distribute_setup.py |  61 ++++++++++++++++
 2 files changed, 164 insertions(+), 26 deletions(-)
 create mode 100644 tests/test_distribute_setup.py

diff --git a/distribute_setup.py b/distribute_setup.py
index a57fd2a8d1..83b56d4d23 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -23,17 +23,115 @@
 import time
 import fnmatch
 from distutils import log
+import subprocess
 
-is_jython = sys.platform.startswith('java')
-if is_jython:
-    import subprocess
+IS_JYTHON = sys.platform.startswith('java')
+DEFAULT_VERSION = "0.6.2"
+DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
 
+def quote(c):
+    if sys.platform == 'win32':
+        if ' ' in c:
+            return '"%s"' % c
+    return c
 
-DEFAULT_VERSION = "0.6.1"
-DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
+def python_cmd(cmd):
+    python = quote(sys.executable)
+    cmd = quote(cmd)
+    if IS_JYTHON:
+        return subprocess.Popen([python, cmd]).wait() == 0
+    args = [os.P_WAIT, python, python] + cmd.split() + [os.environ]
+    return os.spawnle(*args) == 0
+
+def _install(tarball):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s' % tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s' % subdir)
+
+        # installing
+        assert python_cmd('setup.py -q install')
+    finally:
+        os.chdir(old_wd)
+
+def _build_egg(tarball, to_dir=os.curdir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s' % tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s' % subdir)
+
+        # building an egg
+        python_cmd('setup.py -v -q bdist_egg --dist-dir %s' % to_dir)
+
+        # returning the result
+        for file in os.listdir(to_dir):
+            if fnmatch.fnmatch(file, 'distribute-%s*.egg' % DEFAULT_VERSION):
+                return os.path.join(to_dir, file)
+
+        raise IOError('Could not build the egg.')
+    finally:
+        os.chdir(old_wd)
+
+def _do_download(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                 to_dir=os.curdir, download_delay=15):
+    tarball = download_setuptools(version, download_base,
+                                  to_dir, download_delay)
+    egg = _build_egg(tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+def use_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    download_delay=15
+):
+    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+    try:
+        import pkg_resources
+        if not hasattr(pkg_resources, '_distribute'):
+            raise ImportError
+    except ImportError:
+        return _do_download(version, download_base, to_dir, download_delay)
+    try:
+        pkg_resources.require("distribute>="+version); return
+    except pkg_resources.VersionConflict, e:
+        if was_imported:
+            print >>sys.stderr, (
+            "The required version of distribute (>=%s) is not available, and\n"
+            "can't be installed while this script is running. Please install\n"
+            " a more recent version first, using 'easy_install -U distribute'."
+            "\n\n(Currently using %r)"
+            ) % (version, e.args[0])
+            sys.exit(2)
+        else:
+            del pkg_resources, sys.modules['pkg_resources']    # reload ok
+            return _do_download(version, download_base, to_dir, download_delay)
+    except pkg_resources.DistributionNotFound:
+        return _do_download(version, download_base, to_dir, download_delay)
 
 def download_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    delay=15,
 ):
     """Download distribute from a specified location and return its filename
 
@@ -304,27 +402,6 @@ def extractall(self, path=".", members=None):
                 else:
                     self._dbg(1, "tarfile: %s" % e)
 
-def _install(tarball):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s' % tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s' % subdir)
-
-        # installing distribute
-        os.system('%s setup.py install' % sys.executable)
-    finally:
-        os.chdir(old_wd)
-
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     tarball = download_setuptools()
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
new file mode 100644
index 0000000000..6c004bd7b7
--- /dev/null
+++ b/tests/test_distribute_setup.py
@@ -0,0 +1,61 @@
+import sys
+import os
+import tempfile
+import unittest
+import shutil
+import copy
+
+CURDIR = os.path.abspath(os.path.dirname(__file__))
+TOPDIR = os.path.split(CURDIR)[0]
+sys.path.insert(0, TOPDIR)
+
+from distribute_setup import (use_setuptools, _build_egg, python_cmd,
+                              _do_download, _install)
+import distribute_setup
+
+class TestSetup(unittest.TestCase):
+
+    def urlopen(self, url):
+        return open(self.tarball)
+
+    def setUp(self):
+        self.old_sys_path = copy.copy(sys.path)
+        self.cwd = os.getcwd()
+        self.tmpdir = tempfile.mkdtemp()
+        os.chdir(TOPDIR)
+        python_cmd("setup.py -q egg_info -RDb '' sdist --dist-dir %s" % \
+                self.tmpdir)
+        tarball = os.listdir(self.tmpdir)[0]
+        self.tarball = os.path.join(self.tmpdir, tarball)
+        import urllib2
+        urllib2.urlopen = self.urlopen
+
+    def tearDown(self):
+        shutil.rmtree(self.tmpdir)
+        os.chdir(self.cwd)
+        sys.path = copy.copy(self.old_sys_path)
+
+    def test_build_egg(self):
+        # making it an egg
+        egg = _build_egg(self.tarball, self.tmpdir)
+
+        # now trying to import it
+        sys.path[0] = egg
+        import setuptools
+        self.assert_(setuptools.__file__.startswith(egg))
+
+    def test_do_download(self):
+
+        tmpdir = tempfile.mkdtemp()
+        _do_download(to_dir=tmpdir)
+        import setuptools
+        self.assert_(setuptools.bootstrap_install_from.startswith(tmpdir))
+
+    def test_install(self):
+        def _faked(*args):
+            return True
+        distribute_setup.python_cmd = _faked
+        _install(self.tarball)
+
+if __name__ == '__main__':
+    unittest.main()

From 299a9d2f356de19fc6df0952655c79817aa2c1b1 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 11 Sep 2009 18:29:31 +0200
Subject: [PATCH 2489/8469] better marker for easy_install detection

--HG--
branch : distribute
extra : rebase_source : 2119ce08a6104dd1269137a28044684db358d402
---
 distribute_setup.py | 8 +++++---
 setup.py            | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 83b56d4d23..060795eec7 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -26,7 +26,7 @@
 import subprocess
 
 IS_JYTHON = sys.platform.startswith('java')
-DEFAULT_VERSION = "0.6.2"
+DEFAULT_VERSION = "0.6.1"
 DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
 
 def quote(c):
@@ -60,7 +60,8 @@ def _install(tarball):
         log.warn('Now working in %s' % subdir)
 
         # installing
-        assert python_cmd('setup.py -q install')
+        log.warn('Installing Distribute')
+        assert python_cmd('setup.py install')
     finally:
         os.chdir(old_wd)
 
@@ -81,7 +82,8 @@ def _build_egg(tarball, to_dir=os.curdir):
         log.warn('Now working in %s' % subdir)
 
         # building an egg
-        python_cmd('setup.py -v -q bdist_egg --dist-dir %s' % to_dir)
+        log.warn('Building a Distribute egg in %s' % to_dir)
+        python_cmd('setup.py -q bdist_egg --dist-dir %s' % to_dir)
 
         # returning the result
         for file in os.listdir(to_dir):
diff --git a/setup.py b/setup.py
index 9ef640de7d..da9b519a17 100755
--- a/setup.py
+++ b/setup.py
@@ -16,12 +16,13 @@
 
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
+def _easy_install_marker():
+    return (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
+            sys.argv[3] == '--dist-dir' and 'egg-dist-tmp-' in sys.argv[-1])
+
 def _being_installed():
     # easy_install marker
-    if (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
-            sys.argv[3] == '--dist-dir'):
-        return True
-    return 'install' in sys.argv[1:]
+    return 'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
     from distribute_setup import before_install

From 6badc540234386ca7a27d3c90b22c565472475f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 22:46:00 +0200
Subject: [PATCH 2490/8469] Add sdist3 command.

--HG--
branch : distribute
extra : rebase_source : 47f2fee9a8361cabc8160df8dd30dacc67f0f42b
---
 distribute.egg-info/entry_points.txt |  5 ++--
 setuptools/command/__init__.py       |  2 +-
 setuptools/command/sdist3.py         | 34 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 setuptools/command/sdist3.py

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index d69118d9ae..49763a6394 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,5 +1,6 @@
 [distutils.commands]
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_scripts = setuptools.command.install_scripts:install_scripts
 rotate = setuptools.command.rotate:rotate
 develop = setuptools.command.develop:develop
 setopt = setuptools.command.setopt:setopt
@@ -10,11 +11,11 @@ register = setuptools.command.register:register
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
+test = setuptools.command.test:test
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install = setuptools.command.install:install
-test = setuptools.command.test:test
+sdist3 = setuptools.command.sdist3:sdist3
 install_lib = setuptools.command.install_lib:install_lib
 build_ext = setuptools.command.build_ext:build_ext
 sdist = setuptools.command.sdist:sdist
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index f898822bb1..8f5ba21cd4 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -1,7 +1,7 @@
 __all__ = [
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
-    'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
+    'sdist', 'sdist3', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
     'register', 'bdist_wininst',
 ]
 
diff --git a/setuptools/command/sdist3.py b/setuptools/command/sdist3.py
new file mode 100644
index 0000000000..4fbfa8dba7
--- /dev/null
+++ b/setuptools/command/sdist3.py
@@ -0,0 +1,34 @@
+from distutils import log
+from sdist import sdist
+from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+
+
+class _RefactoringTool(RefactoringTool):
+    def log_error(self, msg, *args, **kw):
+        log.error(msg, *args)
+        
+    def log_message(self, msg, *args):
+        log.info(msg, *args)
+
+    def log_debug(self, msg, *args):
+        log.debug(msg, *args)
+
+
+class sdist3(sdist):
+    description = "sdist version that runs 2to3 on all sources before packaging"
+    fixer_names = None
+
+    def copy_file(self, file, dest, link=None):
+        # We ignore the link parameter, always demanding a copy, so that
+        # 2to3 won't overwrite the original file.
+        sdist.copy_file(self, file, dest)
+
+    def make_release_tree(self, base_dir, files):
+        sdist.make_release_tree(self, base_dir, files)
+
+        # run 2to3 on all files
+        fixer_names = self.fixer_names
+        if fixer_names is None:
+            fixer_names = get_fixers_from_package('lib2to3.fixes')
+        r = _RefactoringTool(fixer_names)
+        r.refactor([f for f in files if f.endswith(".py")], write=True)

From 7ee68f0c5fe9122442c3f44aa94ebd1dfcc7b47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:23:25 +0200
Subject: [PATCH 2491/8469] Use types.ModuleType instead of new.module.

--HG--
branch : distribute
extra : rebase_source : 3327441a867ad2878553ed1d42418a7e68ee3067
---
 pkg_resources.py                       | 4 ++--
 setuptools/command/install_egg_info.py | 4 ++--
 setuptools/tests/doctest.py            | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index c636903c96..5a46487015 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -13,7 +13,7 @@
 method.
 """
 
-import sys, os, zipimport, time, re, imp, new
+import sys, os, zipimport, time, re, imp, types
 
 try:
     frozenset
@@ -1707,7 +1707,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = new.module(packageName)
+        module = sys.modules[packageName] = types.ModuleType(packageName)
         module.__path__ = []; _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 939340c503..00c8122114 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -97,12 +97,12 @@ def install_namespaces(self):
                         % ('.'.join(pth[:-1]), pth[-1])
                     )
                 f.write(
-                    "import sys,new,os; "
+                    "import sys,types,os; "
                     "p = os.path.join(sys._getframe(1).f_locals['sitedir'], "
                         "*%(pth)r); "
                     "ie = os.path.exists(os.path.join(p,'__init__.py')); "
                     "m = not ie and "
-                        "sys.modules.setdefault(%(pkg)r,new.module(%(pkg)r)); "
+                        "sys.modules.setdefault(%(pkg)r,types.ModuleType(%(pkg)r)); "
                     "mp = (m or []) and m.__dict__.setdefault('__path__',[]); "
                     "(p not in mp) and mp.append(p)%(trailer)s"
                     % locals()
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index bffce58f4c..be399a9d22 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -2053,16 +2053,16 @@ def rundoc(self, object, name=None, module=None):
         return (f,t)
 
     def rundict(self, d, name, module=None):
-        import new
-        m = new.module(name)
+        import types
+        m = types.ModuleType(name)
         m.__dict__.update(d)
         if module is None:
             module = False
         return self.rundoc(m, name, module)
 
     def run__test__(self, d, name):
-        import new
-        m = new.module(name)
+        import types
+        m = types.ModuleType(name)
         m.__test__ = d
         return self.rundoc(m, name)
 

From a6ab02d1e5737b09f2f3ea5df184a2bf33e8dba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:46:51 +0200
Subject: [PATCH 2492/8469] Open _get streams in binary mode.

--HG--
branch : distribute
extra : rebase_source : 81baa71c46d64e1d3431bae843a04f163976bf8f
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5a46487015..91af57defc 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1239,7 +1239,7 @@ def get_resource_stream(self, manager, resource_name):
         return open(self._fn(self.module_path, resource_name), 'rb')
 
     def _get(self, path):
-        stream = open(path, 'rb')
+        stream = open(path, 'rU')
         try:
             return stream.read()
         finally:

From c4ea358c7cdcd76dc9bf35b54e22cc9be05dc62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:47:38 +0200
Subject: [PATCH 2493/8469] Correct path names for fixed files.

--HG--
branch : distribute
extra : rebase_source : d5bd9c6fdb8cf2208eca9e0e5f37cb7fea1d14a5
---
 setuptools/command/sdist3.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/sdist3.py b/setuptools/command/sdist3.py
index 4fbfa8dba7..fc7ebb9788 100644
--- a/setuptools/command/sdist3.py
+++ b/setuptools/command/sdist3.py
@@ -1,3 +1,4 @@
+import os
 from distutils import log
 from sdist import sdist
 from lib2to3.refactor import RefactoringTool, get_fixers_from_package
@@ -31,4 +32,4 @@ def make_release_tree(self, base_dir, files):
         if fixer_names is None:
             fixer_names = get_fixers_from_package('lib2to3.fixes')
         r = _RefactoringTool(fixer_names)
-        r.refactor([f for f in files if f.endswith(".py")], write=True)
+        r.refactor([os.path.join(base_dir, f) for f in files if f.endswith(".py")], write=True)

From c8fafe39c39a6814741b3f2825320c565c02058c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:48:25 +0200
Subject: [PATCH 2494/8469] Work around apparent 3.x limitation wrt. variables
 in list comprehensions.

--HG--
branch : distribute
extra : rebase_source : 214eb64288ef1955fd06ba1cf594b6a780cccde8
---
 setuptools/command/install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index a150c43505..247c4f259c 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -18,9 +18,6 @@ class install(_install):
         ('install_scripts',  lambda self: True),
     ]
     _nc = dict(new_commands)
-    sub_commands = [
-        cmd for cmd in _install.sub_commands if cmd[0] not in _nc
-    ] + new_commands
 
     def initialize_options(self):
         _install.initialize_options(self)
@@ -104,6 +101,10 @@ def do_egg_install(self):
         cmd.run()
         setuptools.bootstrap_install_from = None
 
+# XXX Python 3.1 doesn't see _nc if this is inside the class
+install.sub_commands = [
+        cmd for cmd in _install.sub_commands if cmd[0] not in install._nc
+    ] + install.new_commands
 
 
 

From 6f3378c098a481588f5ec5813060376351e5a576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:49:34 +0200
Subject: [PATCH 2495/8469] Shortcut User-agent computation, as 2to3 won't
 update urllib2.__version__ correctly.

--HG--
branch : distribute
extra : rebase_source : 9035aa6fb13225181f7ce22429efa91c771247a6
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 220cdec7bb..48494aff21 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -143,7 +143,7 @@ def find_external_links(url, page):
                 yield urlparse.urljoin(url, htmldecode(match.group(1)))
 
 user_agent = "Python-urllib/%s distribute/%s" % (
-    urllib2.__version__, require('distribute')[0].version
+    sys.version[:3], require('distribute')[0].version
 )
 
 

From 96c97c7b38ffe815a6f1cc6e76fea1d627610d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 11 Sep 2009 23:50:28 +0200
Subject: [PATCH 2496/8469] Conditionalize _file processing.

--HG--
branch : distribute
extra : rebase_source : fd07ce0e0541a269a88596e985884f688c86185e
---
 setuptools/sandbox.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 11c14938c6..67cedde6f0 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,6 +1,9 @@
 import os, sys, __builtin__, tempfile, operator
 _os = sys.modules[os.name]
-_file = file
+try:
+    _file = file
+except NameError:
+    _file = None
 _open = open
 from distutils.errors import DistutilsError
 __all__ = [
@@ -60,13 +63,15 @@ def run(self, func):
         """Run 'func' under os sandboxing"""
         try:
             self._copy(self)
-            __builtin__.file = self._file
+            if _file:
+                __builtin__.file = self._file
             __builtin__.open = self._open
             self._active = True
             return func()
         finally:
             self._active = False
-            __builtin__.file = _file
+            if _file:
+                __builtin__.file = _file
             __builtin__.open = _open
             self._copy(_os)
 
@@ -92,7 +97,8 @@ def wrap(self,path,*args,**kw):
             return original(path,*args,**kw)
         return wrap
 
-    _file = _mk_single_path_wrapper('file', _file)
+    if _file:
+        _file = _mk_single_path_wrapper('file', _file)
     _open = _mk_single_path_wrapper('open', _open)
     for name in [
         "stat", "listdir", "chdir", "open", "chmod", "chown", "mkdir",

From 4fba5767d7d1d844ba0c27d0e3bb0931b621d8bd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Sep 2009 09:06:05 +0200
Subject: [PATCH 2497/8469] next version is 0.6.2

--HG--
branch : distribute
extra : rebase_source : 211d56770b60fcb1f69b75b25472440e814106c3
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 060795eec7..e554c9cbb3 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -26,7 +26,7 @@
 import subprocess
 
 IS_JYTHON = sys.platform.startswith('java')
-DEFAULT_VERSION = "0.6.1"
+DEFAULT_VERSION = "0.6.2"
 DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
 
 def quote(c):

From 41854a0e9535b9142811e7815937d15c1a7c5b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 12:36:46 +0200
Subject: [PATCH 2498/8469] Add src_root attribute to support installing from a
 copy.

--HG--
branch : distribute
extra : rebase_source : 95242b20ab228862aeef205f399869f79e342f0e
---
 setuptools/command/build_py.py | 8 +++++---
 setuptools/dist.py             | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 79570bc2e4..3fce7693e2 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -157,9 +157,11 @@ def initialize_options(self):
         _build_py.initialize_options(self)
 
 
-
-
-
+    def get_package_dir(self, package):
+        res = _build_py.get_package_dir(self, package)
+        if self.distribution.src_root is not None:
+            return os.path.join(self.distribution.src_root, res)
+        return res
 
 
     def exclude_data_files(self, package, src_dir, files):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 30ff35e320..7e9ab5c9f9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -210,6 +210,7 @@ def __init__ (self, attrs=None):
         self.require_features = []
         self.features = {}
         self.dist_files = []
+        self.src_root = attrs.pop("src_root")
         self.patch_missing_pkg_info(attrs)
         # Make sure we have any eggs needed to interpret 'attrs'
         if attrs is not None:

From 120542187d770d1698dcd01e10a2a6d47b89850d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 12:37:52 +0200
Subject: [PATCH 2499/8469] Support 3.x by copying all source files first and
 applying 2to3 to it.

--HG--
branch : distribute
extra : rebase_source : 410751a3a22e1b7f8830e360f39115c45c8d92eb
---
 setup.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/setup.py b/setup.py
index 9ef640de7d..1582f6321c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,27 @@
 #!/usr/bin/env python
 """Distutils setup file, used to install or test 'setuptools'"""
 
+import sys, os
+
+src_root = None
+if sys.version_info >= (3,):
+    tmp_src = os.path.join("build", "src")
+    from distutils.filelist import FileList
+    from distutils import dir_util, file_util, util, log
+    log.set_verbosity(1)
+    fl = FileList()
+    for line in open("MANIFEST.in"):
+        fl.process_template_line(line)
+    dir_util.create_tree(tmp_src, fl.files)
+    outfiles_2to3 = []
+    for f in fl.files:
+        outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
+        if copied and outf.endswith(".py"):
+            outfiles_2to3.append(outf)
+    util.run_2to3(outfiles_2to3)
+    sys.path.insert(0, tmp_src)
+    src_root = tmp_src
+
 from distutils.util import convert_path
 
 d = {}
@@ -39,6 +60,7 @@ def _being_installed():
     keywords = "CPAN PyPI distutils eggs package management",
     url = "http://pypi.python.org/pypi/distribute",
     test_suite = 'setuptools.tests',
+    src_root = src_root,
     packages = find_packages(),
     package_data = {'setuptools':['*.exe']},
 

From 0fb87f9bdf3dd85bc4a0e2f17f2a7c98d0d0cf53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 12:38:35 +0200
Subject: [PATCH 2500/8469] Explicitly encode data as UTF-8 before writing to a
 binary file.

--HG--
branch : distribute
extra : rebase_source : c9de4f92e3e50dd88fd1d29e2a9b2f3288fd4b88
---
 setuptools/command/egg_info.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a8315d23ba..46cdf4e097 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -3,7 +3,7 @@
 Create a distribution's .egg-info directory and contents"""
 
 # This module should be kept compatible with Python 2.3
-import os, re
+import os, re, sys
 from setuptools import Command
 from distutils.errors import *
 from distutils import log
@@ -148,6 +148,8 @@ def write_file(self, what, filename, data):
         to the file.
         """
         log.info("writing %s to %s", what, filename)
+        if sys.version_info >= (3,):
+            data = data.encode("utf-8")
         if not self.dry_run:
             f = open(filename, 'wb')
             f.write(data)
@@ -351,8 +353,11 @@ def write_file (filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
+    contents = "\n".join(contents)
+    if sys.version_info >= (3,):
+        contents = contents.encode("utf-8")
     f = open(filename, "wb")        # always write POSIX-style manifest
-    f.write("\n".join(contents))
+    f.write(contents)
     f.close()
 
 

From 1319d728ada3b4bd18a5e6c430439331c1ac7ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 12:56:22 +0200
Subject: [PATCH 2501/8469] Revert previous change: _get gives bytes in 3.x.
 Instead, have get_metadata decode from utf-8.

--HG--
branch : distribute
extra : rebase_source : 6050e699017705a297d45334e985978535fd245f
---
 pkg_resources.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 91af57defc..f34adfdac7 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1126,10 +1126,16 @@ def has_resource(self, resource_name):
     def has_metadata(self, name):
         return self.egg_info and self._has(self._fn(self.egg_info,name))
 
-    def get_metadata(self, name):
-        if not self.egg_info:
-            return ""
-        return self._get(self._fn(self.egg_info,name))
+    if sys.version_info <= (3,):
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info,name))
+    else:
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info,name)).decode("utf-8")
 
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
@@ -1239,7 +1245,7 @@ def get_resource_stream(self, manager, resource_name):
         return open(self._fn(self.module_path, resource_name), 'rb')
 
     def _get(self, path):
-        stream = open(path, 'rU')
+        stream = open(path, 'rb')
         try:
             return stream.read()
         finally:

From 7bb74b86b24f8f300907200e02d5319db044736f Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 12 Sep 2009 14:43:43 +0000
Subject: [PATCH 2502/8469] #6026 - fix tests that failed without zlib

---
 tests/test_archive_util.py | 10 ++++++++++
 tests/test_bdist_dumb.py   |  8 ++++++++
 tests/test_sdist.py        | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 91bc4e3d7c..d6fb676920 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -19,10 +19,18 @@
 except ImportError:
     ZIP_SUPPORT = find_executable('zip')
 
+# some tests will fail if zlib is not available
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
+
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -83,6 +91,7 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
                          'Need the tar command to run')
     def test_tarfile_vs_tar(self):
@@ -168,6 +177,7 @@ def test_compress_deprecated(self):
         self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
         # creating something to tar
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index b28f89f5a5..a838f73476 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -4,6 +4,13 @@
 import sys
 import os
 
+# zlib is not used here, but if it's not available
+# test_simple_built will fail
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -31,6 +38,7 @@ def tearDown(self):
         sys.argv = self.old_sys_argv[:]
         super(BuildDumbTestCase, self).tearDown()
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_simple_built(self):
 
         # let's create a simple package
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 5808ca16eb..c2feccb3ce 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -3,6 +3,14 @@
 import unittest
 import shutil
 import zipfile
+
+# zlib is not used here, but if it's not available
+# the tests that use zipfile may fail
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
 from os.path import join
 import sys
 import tempfile
@@ -79,6 +87,7 @@ def _warn(*args):
         cmd.warn = _warn
         return dist, cmd
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
@@ -120,6 +129,7 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_distribution(self):
 
         # check if tar and gzip are installed
@@ -156,6 +166,7 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_add_defaults(self):
 
         # http://bugs.python.org/issue2279
@@ -217,6 +228,7 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):
         # testing the `medata-check` option
         dist, cmd = self.get_cmd(metadata={})

From c1098e903f4eab3c673089fb60d3540e28fe0778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 16:58:06 +0200
Subject: [PATCH 2503/8469] Replace os.path.walk with os.walk.

--HG--
branch : distribute
extra : rebase_source : 9bc223da3173d759f3c59eb72138e7405b4384ed
---
 setuptools/command/bdist_egg.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9e852a3f15..32cebe9d5d 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -525,9 +525,11 @@ def visit(z, dirname, names):
     compression = [zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED][bool(compress)]
     if not dry_run:
         z = zipfile.ZipFile(zip_filename, mode, compression=compression)
-        os.path.walk(base_dir, visit, z)
+        for dirname, dirs, files in os.walk(base_dir):
+            visit(z, dirname, files)
         z.close()
     else:
-        os.path.walk(base_dir, visit, None)
+        for dirname, dirs, files in os.walk(base_dir):
+            visit(None, dirname, file)
     return zip_filename
 #

From a3efc4cae6bfa2e8a03a7b75380f29c660b876cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 17:05:03 +0200
Subject: [PATCH 2504/8469] Port writing text files to 3.x.

--HG--
branch : distribute
extra : rebase_source : 767d047dae23d5123bf412b5838d150091eea078
---
 setuptools/command/easy_install.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0fa07845de..7ed467f0e5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -39,6 +39,13 @@ def samefile(p1,p2):
         os.path.normpath(os.path.normcase(p2))
     )
 
+if sys.version_info <= (3,):
+    def _to_ascii(s):
+        return s
+else:
+    def _to_ascii(s):
+        return s.encode('ascii')
+
 class easy_install(Command):
     """Manage a download/build/install process"""
     description = "Find/get/install Python packages"
@@ -599,7 +606,7 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
                 "import pkg_resources\n"
                 "pkg_resources.run_script(%(spec)r, %(script_name)r)\n"
             ) % locals()
-        self.write_script(script_name, script_text, 'b')
+        self.write_script(script_name, _to_ascii(script_text), 'b')
 
     def write_script(self, script_name, contents, mode="t", blockers=()):
         """Write an executable file to the scripts directory"""
@@ -1381,7 +1388,7 @@ def save(self):
 
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
-            f = open(self.filename,'wb')
+            f = open(self.filename,'wt')
             f.write(data); f.close()
 
         elif os.path.exists(self.filename):

From 63ad9ff720754e36a2b0299f2c857228f32b0c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 17:16:22 +0200
Subject: [PATCH 2505/8469] Implement isascii.

--HG--
branch : distribute
extra : rebase_source : 6805617a1673859320ae278cfbb6f7136d20a0a8
---
 distribute.egg-info/entry_points.txt |  2 +-
 setuptools/command/easy_install.py   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 49763a6394..c625317eba 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7ed467f0e5..9e1f871119 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -42,9 +42,21 @@ def samefile(p1,p2):
 if sys.version_info <= (3,):
     def _to_ascii(s):
         return s
+    def isascii(s):
+        try:
+            unicode(s, 'ascii')
+            return True
+        except UnicodeError:
+            return False
 else:
     def _to_ascii(s):
         return s.encode('ascii')
+    def isascii(s):
+        try:
+            s.encode('ascii')
+            return True
+        except UnicodeError:
+            return False
 
 class easy_install(Command):
     """Manage a download/build/install process"""
@@ -1439,7 +1451,7 @@ def get_script_header(script_text, executable=sys_executable, wininst=False):
     else:
         executable = nt_quote_arg(executable)
     hdr = "#!%(executable)s%(options)s\n" % locals()
-    if unicode(hdr,'ascii','ignore').encode('ascii') != hdr:
+    if not isascii(hdr):
         # Non-ascii path to sys.executable, use -x to prevent warnings
         if options:
             if options.strip().startswith('-'):

From f6747b162905d4fe48701a8655c857d8ef363b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 17:33:49 +0200
Subject: [PATCH 2506/8469] Add rich comparison to distribution object.

--HG--
branch : distribute
extra : rebase_source : 858ac6c7ad2389ba70d443480d955d3ec1e39d76
---
 pkg_resources.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index f34adfdac7..910c30891c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2050,8 +2050,20 @@ def from_location(cls,location,basename,metadata=None,**kw):
             self.platform
         )
     )
-    def __cmp__(self, other): return cmp(self.hashcmp, other)
     def __hash__(self): return hash(self.hashcmp)
+    def __lt__(self, other):
+        return self.hashcmp < other.hashcmp
+    def __le__(self, other):
+        return self.hashcmp <= other.hashcmp
+    def __gt__(self, other):
+        return self.hashcmp > other.hashcmp
+    def __ge__(self, other):
+        return self.hashcmp >= other.hashcmp
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            # It's not a Distribution, so they are not equal
+            return False
+        return self.hashcmp == other.hashcmp
 
     # These properties have to be lazy so that we don't have to load any
     # metadata until/unless it's actually needed.  (i.e., some distributions

From 401070a618a036ed6295e5e1c1b925a66471f86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 17:52:23 +0200
Subject: [PATCH 2507/8469] Replace cmp.

--HG--
branch : distribute
extra : rebase_source : 3d8d4d289d13bbb9fb9c946e31282c578264f626
---
 pkg_resources.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 910c30891c..7c3d58fbe9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2466,8 +2466,9 @@ def __contains__(self,item):
         elif isinstance(item,basestring):
             item = parse_version(item)
         last = None
+        compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1
         for parsed,trans,op,ver in self.index:
-            action = trans[cmp(item,parsed)]
+            action = trans[compare(item,parsed)] # Indexing: 0, 1, -1
             if action=='F':     return False
             elif action=='T':   return True
             elif action=='+':   last = True

From 43bce73e470e6b73a8558b8bb362832a6a342820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 17:56:15 +0200
Subject: [PATCH 2508/8469] Revert unintended change.

--HG--
branch : distribute
extra : rebase_source : 1b5bc7b6ebd2bbee11dc05cc96670441f4af3f8b
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index c625317eba..49763a6394 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From ea27f15b0cfa0908704fc73611d42f6efae8e14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 18:02:40 +0200
Subject: [PATCH 2509/8469] Remove sdist3 command again.

--HG--
branch : distribute
extra : rebase_source : b2ae4e75c758eafa83057002ece9fb5dbc7aba92
---
 distribute.egg-info/entry_points.txt |  1 -
 setuptools/command/__init__.py       |  2 +-
 setuptools/command/sdist3.py         | 35 ----------------------------
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 setuptools/command/sdist3.py

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 49763a6394..2c002f4c09 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -15,7 +15,6 @@ test = setuptools.command.test:test
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install = setuptools.command.install:install
-sdist3 = setuptools.command.sdist3:sdist3
 install_lib = setuptools.command.install_lib:install_lib
 build_ext = setuptools.command.build_ext:build_ext
 sdist = setuptools.command.sdist:sdist
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 8f5ba21cd4..f898822bb1 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -1,7 +1,7 @@
 __all__ = [
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
-    'sdist', 'sdist3', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
+    'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
     'register', 'bdist_wininst',
 ]
 
diff --git a/setuptools/command/sdist3.py b/setuptools/command/sdist3.py
deleted file mode 100644
index fc7ebb9788..0000000000
--- a/setuptools/command/sdist3.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import os
-from distutils import log
-from sdist import sdist
-from lib2to3.refactor import RefactoringTool, get_fixers_from_package
-
-
-class _RefactoringTool(RefactoringTool):
-    def log_error(self, msg, *args, **kw):
-        log.error(msg, *args)
-        
-    def log_message(self, msg, *args):
-        log.info(msg, *args)
-
-    def log_debug(self, msg, *args):
-        log.debug(msg, *args)
-
-
-class sdist3(sdist):
-    description = "sdist version that runs 2to3 on all sources before packaging"
-    fixer_names = None
-
-    def copy_file(self, file, dest, link=None):
-        # We ignore the link parameter, always demanding a copy, so that
-        # 2to3 won't overwrite the original file.
-        sdist.copy_file(self, file, dest)
-
-    def make_release_tree(self, base_dir, files):
-        sdist.make_release_tree(self, base_dir, files)
-
-        # run 2to3 on all files
-        fixer_names = self.fixer_names
-        if fixer_names is None:
-            fixer_names = get_fixers_from_package('lib2to3.fixes')
-        r = _RefactoringTool(fixer_names)
-        r.refactor([os.path.join(base_dir, f) for f in files if f.endswith(".py")], write=True)

From 42b976684874ad63f962946a67d03eae51884a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 18:06:05 +0200
Subject: [PATCH 2510/8469] Add default for pop.

--HG--
branch : distribute
extra : rebase_source : a4655cb42947b8ea089e72b3d4c2ff2482a31e6a
---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7e9ab5c9f9..c2e57f4b0b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -210,7 +210,7 @@ def __init__ (self, attrs=None):
         self.require_features = []
         self.features = {}
         self.dist_files = []
-        self.src_root = attrs.pop("src_root")
+        self.src_root = attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
         # Make sure we have any eggs needed to interpret 'attrs'
         if attrs is not None:

From 54ea65f8a9d2aff50c19fb311975d885635496bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 18:43:03 +0200
Subject: [PATCH 2511/8469] Redirect stderr as well.

--HG--
branch : distribute
extra : rebase_source : 9f4ab6d69461acfd64cb4519ff18533c6666adcd
---
 setuptools/tests/test_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 03e5d0f83b..8f100419c0 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -517,12 +517,12 @@ def test_get_script_header_jython_workaround(self):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
             self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
-            sys.stdout = StringIO.StringIO()
+            sys.stdout = sys.stderr = StringIO.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)

From 9290e81f1018c0c80e315958cb4b2977c38a4afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 19:05:10 +0200
Subject: [PATCH 2512/8469] Run 2to3 for api_tests.txt.

--HG--
branch : distribute
extra : rebase_source : 6249f2963461f6ada86facedbdd89b8fe2eb9e1a
---
 setup.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup.py b/setup.py
index 1582f6321c..3a47a09cb8 100755
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,12 @@
         if copied and outf.endswith(".py"):
             outfiles_2to3.append(outf)
     util.run_2to3(outfiles_2to3)
+
+    # XXX support this in distutils as well
+    from lib2to3.main import main
+    main('lib2to3.fixes', ['-wd', os.path.join(tmp_src, 'tests', 'api_tests.txt')])
+
+    # arrange setup to use the copy
     sys.path.insert(0, tmp_src)
     src_root = tmp_src
 

From 62b9ce70f7cab7d9b1be27c5ec47c8d06377c3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 19:27:15 +0200
Subject: [PATCH 2513/8469] Fix tests to support 3.x.

--HG--
branch : distribute
extra : rebase_source : e3cf4ce257e2a7969753e386c2b4bd9f654cb7fc
---
 tests/api_tests.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 823d815f0c..6cf6e66f27 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -119,7 +119,7 @@ editing are also a Distribution.  (And, with a little attention to the
 directory names used,  and including some additional metadata, such a
 "development distribution" can be made pluggable as well.)
 
-    >>> from pkg_resources import WorkingSet
+    >>> from pkg_resources import WorkingSet, VersionConflict
 
 A working set's entries are the sys.path entries that correspond to the active
 distributions.  By default, the working set's entries are the items on
@@ -208,11 +208,11 @@ You can ask a WorkingSet to ``find()`` a distribution matching a requirement::
 Note that asking for a conflicting version of a distribution already in a
 working set triggers a ``pkg_resources.VersionConflict`` error:
 
-    >>> ws.find(Requirement.parse("Bar==1.0")) # doctest: +NORMALIZE_WHITESPACE
-    Traceback (most recent call last):
-      ...
-    VersionConflict: (Bar 0.9 (http://example.com/something),
-                      Requirement.parse('Bar==1.0'))
+    >>> try:
+    ...     ws.find(Requirement.parse("Bar==1.0"))
+    ... except VersionConflict:
+    ...     print 'ok'
+    ok
 
 You can subscribe a callback function to receive notifications whenever a new
 distribution is added to a working set.  The callback is immediately invoked

From a706937e76582c6005306a391d08feecc68e0966 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 12 Sep 2009 18:41:20 +0000
Subject: [PATCH 2514/8469] Merged revisions 74754 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74754 | ezio.melotti | 2009-09-12 17:43:43 +0300 (Sat, 12 Sep 2009) | 1 line

  #6026 - fix tests that failed without zlib
........
---
 tests/test_archive_util.py | 10 ++++++++++
 tests/test_bdist_dumb.py   |  8 ++++++++
 tests/test_sdist.py        | 12 ++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index d88e0b350d..d33b7e15b1 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -19,10 +19,18 @@
 except ImportError:
     ZIP_SUPPORT = find_executable('zip')
 
+# some tests will fail if zlib is not available
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
+
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -83,6 +91,7 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
                          'Need the tar command to run')
     def test_tarfile_vs_tar(self):
@@ -168,6 +177,7 @@ def test_compress_deprecated(self):
         self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
         # creating something to tar
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index b28f89f5a5..a838f73476 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -4,6 +4,13 @@
 import sys
 import os
 
+# zlib is not used here, but if it's not available
+# test_simple_built will fail
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -31,6 +38,7 @@ def tearDown(self):
         sys.argv = self.old_sys_argv[:]
         super(BuildDumbTestCase, self).tearDown()
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_simple_built(self):
 
         # let's create a simple package
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b7e5859cb9..986288e593 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -3,6 +3,14 @@
 import unittest
 import shutil
 import zipfile
+
+# zlib is not used here, but if it's not available
+# the tests that use zipfile may fail
+try:
+    import zlib
+except ImportError:
+    zlib = None
+
 from os.path import join
 import sys
 import tempfile
@@ -79,6 +87,7 @@ def _warn(*args):
         cmd.warn = _warn
         return dist, cmd
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
@@ -120,6 +129,7 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_distribution(self):
 
         # check if tar and gzip are installed
@@ -156,6 +166,7 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_add_defaults(self):
 
         # http://bugs.python.org/issue2279
@@ -217,6 +228,7 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):
         # testing the `medata-check` option
         dist, cmd = self.get_cmd(metadata={})

From ee89ffb19c6fa2aab91d95d1866e3c08866bc842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 23:12:36 +0200
Subject: [PATCH 2515/8469] Run 2to3 on doctest source.

--HG--
branch : distribute
extra : rebase_source : 6aeab2a32858c08883afcfd1f84ef8186083513f
---
 setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 3a47a09cb8..d91ea0693f 100755
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,12 @@
         outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
         if copied and outf.endswith(".py"):
             outfiles_2to3.append(outf)
-    util.run_2to3(outfiles_2to3)
+        if copied and outf.endswith('api_tests.txt'):
+            # XXX support this in distutils as well
+            from lib2to3.main import main
+            main('lib2to3.fixes', ['-wd', os.path.join(tmp_src, 'tests', 'api_tests.txt')])
 
-    # XXX support this in distutils as well
-    from lib2to3.main import main
-    main('lib2to3.fixes', ['-wd', os.path.join(tmp_src, 'tests', 'api_tests.txt')])
+    util.run_2to3(outfiles_2to3)
 
     # arrange setup to use the copy
     sys.path.insert(0, tmp_src)

From 709275f058fc9062b7a10db5123bd1ef91500832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Sep 2009 23:22:28 +0200
Subject: [PATCH 2516/8469] Open zipsafe file in text mode.

--HG--
branch : distribute
extra : rebase_source : 3215e6d146816dc96a2cb23b6a6fb16fd63e1648
---
 setuptools/command/bdist_egg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 32cebe9d5d..43589c239f 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -401,7 +401,7 @@ def write_safety_flag(egg_dir, safe):
             if safe is None or bool(safe)<>flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe)==flag:
-            f=open(fn,'wb'); f.write('\n'); f.close()
+            f=open(fn,'wt'); f.write('\n'); f.close()
 
 safety_flags = {
     True: 'zip-safe',

From 99ab2076b4e84718f9b034ab4e1394fd06d468f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 00:08:20 +0200
Subject: [PATCH 2517/8469] Open svn externals file in text mode.

--HG--
branch : distribute
extra : rebase_source : 0eec0f04099a978136350d3546c579bbd61ea6ec
---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 50c4c00906..3442fe4be6 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -60,7 +60,7 @@ def _default_revctrl(dirname=''):
 def externals_finder(dirname, filename):
     """Find any 'svn:externals' directories"""
     found = False
-    f = open(filename,'rb')
+    f = open(filename,'rt')
     for line in iter(f.readline, ''):    # can't use direct iter!
         parts = line.split()
         if len(parts)==2:

From 5bf298f0e8b30f236b76997c66eee38de798f710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 00:15:41 +0200
Subject: [PATCH 2518/8469] Work around distutils 3.1 breaking ext_map.

--HG--
branch : distribute
extra : rebase_source : 47da1d81d1923e23aa70949c2a69000c01f8f81f
---
 setuptools/command/build_ext.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c0aaa8e80c..b837375b8f 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -111,6 +111,11 @@ def finalize_options(self):
         for ext in self.extensions:
             fullname = ext._full_name
             self.ext_map[fullname] = ext
+
+            # distutils 3.1 will also ask for module names
+            # XXX what to do with conflicts?
+            self.ext_map[fullname.split('.')[-1]] = ext
+
             ltd = ext._links_to_dynamic = \
                 self.shlibs and self.links_to_dynamic(ext) or False
             ext._needs_stub = ltd and use_stubs and not isinstance(ext,Library)

From 5b568886e649fad8811f81484dc88fa5111faa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 00:17:03 +0200
Subject: [PATCH 2519/8469] Support running 2to3 on build_py.

--HG--
branch : distribute
extra : rebase_source : 7b3f06bc7b7745a7292e729c04053821340b6f49
---
 setuptools/__init__.py         |  8 ++++++
 setuptools/command/build_py.py | 45 +++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index aaf634dae6..05b65e4d06 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -24,6 +24,14 @@
 
 bootstrap_install_from = None
 
+# Should we run 2to3 on all Python files, in Python 3.x?
+# Default: no; assume that a distribution installed for 3.x is already
+# written in 3.x
+run_2to3 = False
+# If we run 2to3 on .py files, should we also convert docstrings?
+# Default: yes; assume that we can detect doctests reliably
+run_2to3_on_doctests = True
+
 def find_packages(where='.', exclude=()):
     """Return a list all Python packages found within directory 'where'
 
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 3fce7693e2..b27574a42a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -3,7 +3,41 @@
 from distutils.util import convert_path
 from glob import glob
 
-class build_py(_build_py):
+try:
+    from distutils.util import Mixin2to3 as _Mixin2to3
+    # add support for converting doctests that is missing in 3.1 distutils
+    from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+    import setuptools
+    class DistutilsRefactoringTool(RefactoringTool):
+        def log_error(self, msg, *args, **kw):
+            log.error(msg, *args)
+
+        def log_message(self, msg, *args):
+            log.info(msg, *args)
+
+        def log_debug(self, msg, *args):
+            log.debug(msg, *args)
+
+    class Mixin2to3(_Mixin2to3):
+        def run_2to3(self, files):
+            if not setuptools.run_2to3:
+                return files
+            files = _Mixin2to3.run_2to3(files)
+            if setuptools.run_2to3_on_doctests:
+                fixer_names = self.fixer_names
+                if fixer_names is None:
+                    fixer_names = get_fixers_from_package('lib2to3.fixes')
+                r = DistutilsRefactoringTool(fixer_names)
+                r.refactor(files, write=True, doctests_only=True)
+            return files
+
+except ImportError:
+    class Mixin2to3:
+        def run_2to3(self, files):
+            # Nothing done in 2.x
+            pass
+
+class build_py(_build_py, Mixin2to3):
     """Enhanced 'build_py' command that includes data files with packages
 
     The data files are specified via a 'package_data' argument to 'setup()'.
@@ -23,6 +57,7 @@ def run(self):
         if not self.py_modules and not self.packages:
             return
 
+        self.__updated_files = []
         if self.py_modules:
             self.build_modules()
 
@@ -30,6 +65,8 @@ def run(self):
             self.build_packages()
             self.build_package_data()
 
+        self.run_2to3(self.__updated_files)
+
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
         self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
@@ -39,6 +76,12 @@ def __getattr__(self,attr):
             self.data_files = files = self._get_data_files(); return files
         return _build_py.__getattr__(self,attr)
 
+    def build_module(self, module, module_file, package):
+        outfile, copied = _build_py.build_module(self, module, module_file, package)
+        if copied:
+            self.__updated_files.append(outfile)
+        return outfile, copied
+
     def _get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         self.analyze_manifest()

From b712de5a1170ddb843b1f8a5bff111286dc0fc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 00:30:44 +0200
Subject: [PATCH 2520/8469] Move initialization of updated_files into
 finalize_options

--HG--
branch : distribute
extra : rebase_source : 9961dacb889d0707d3d0fa67168f71eb6b577373
---
 setuptools/command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b27574a42a..a80572fd4c 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -51,13 +51,13 @@ def finalize_options(self):
         self.package_data = self.distribution.package_data
         self.exclude_package_data = self.distribution.exclude_package_data or {}
         if 'data_files' in self.__dict__: del self.__dict__['data_files']
+        self.__updated_files = []
 
     def run(self):
         """Build modules, packages, and copy data files to build directory"""
         if not self.py_modules and not self.packages:
             return
 
-        self.__updated_files = []
         if self.py_modules:
             self.build_modules()
 

From f5adca61c9cb6797eaf9da2029c9132ec486b552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 00:36:04 +0200
Subject: [PATCH 2521/8469] Fix running 2to3.

--HG--
branch : distribute
extra : rebase_source : 2594ae17c6468d98288339c89cecd745f4dc181f
---
 setuptools/command/build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index a80572fd4c..d5890afe25 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -6,6 +6,7 @@
 try:
     from distutils.util import Mixin2to3 as _Mixin2to3
     # add support for converting doctests that is missing in 3.1 distutils
+    from distutils import log
     from lib2to3.refactor import RefactoringTool, get_fixers_from_package
     import setuptools
     class DistutilsRefactoringTool(RefactoringTool):
@@ -21,15 +22,14 @@ def log_debug(self, msg, *args):
     class Mixin2to3(_Mixin2to3):
         def run_2to3(self, files):
             if not setuptools.run_2to3:
-                return files
-            files = _Mixin2to3.run_2to3(files)
+                return
+            _Mixin2to3.run_2to3(self, files)
             if setuptools.run_2to3_on_doctests:
                 fixer_names = self.fixer_names
                 if fixer_names is None:
                     fixer_names = get_fixers_from_package('lib2to3.fixes')
                 r = DistutilsRefactoringTool(fixer_names)
                 r.refactor(files, write=True, doctests_only=True)
-            return files
 
 except ImportError:
     class Mixin2to3:

From 745ef1b0e338b5160274f83900a10a99de46dcdb Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 13 Sep 2009 01:37:33 +0200
Subject: [PATCH 2522/8469] Now install_site works properly with distribute
 distribution. fixes #44

--HG--
branch : distribute
extra : rebase_source : 5dacd496be767ed406f7f8c76a598e7f186acdbc
---
 CHANGES.txt                           |  8 +++++++-
 setuptools/command/easy_install.py    |  2 +-
 setuptools/tests/test_easy_install.py | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/tests/test_easy_install.py

diff --git a/CHANGES.txt b/CHANGES.txt
index a82857b303..2574300aa1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,12 @@ CHANGES
 0.6.2
 -----
 
+setuptools
+==========
+
+* Fixed invalid usage of requirement.parse, that broke develop -d.
+  closed http://bugs.python.org/setuptools/issue44.
+
 
 -----
 0.6.1
@@ -18,7 +24,7 @@ setuptools
   This closes http://bitbucket.org/tarek/distribute/issue/16 and
   http://bitbucket.org/tarek/distribute/issue/18.
 
-* zip_ok is now True by default. This closes 
+* zip_ok is now False by default. This closes 
   http://bugs.python.org/setuptools/issue33.
 
 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0fa07845de..67cf949fcf 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1078,7 +1078,7 @@ def install_site_py(self):
             return  # already did it, or don't need to
 
         sitepy = os.path.join(self.install_dir, "site.py")
-        source = resource_string(Requirement.parse("setuptools"), "site.py")
+        source = resource_string(Requirement.parse("distribute"), "site.py")
         current = ""
 
         if os.path.exists(sitepy):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
new file mode 100644
index 0000000000..583c072b20
--- /dev/null
+++ b/setuptools/tests/test_easy_install.py
@@ -0,0 +1,20 @@
+"""Easy install Tests
+"""
+import os, shutil, tempfile, unittest
+from setuptools.command.easy_install import easy_install
+from setuptools.dist import Distribution
+
+class TestEasyInstallTest(unittest.TestCase):
+
+    def test_install_site_py(self):
+        dist = Distribution()
+        cmd = easy_install(dist)
+        cmd.sitepy_installed = False
+        cmd.install_dir = tempfile.mkdtemp()
+        try:
+            cmd.install_site_py()
+            sitepy = os.path.join(cmd.install_dir, 'site.py')
+            self.assert_(os.path.exists(sitepy))
+        finally:
+            shutil.rmtree(cmd.install_dir)
+

From 28c9b94a4da7a469bb726309bce461dd0843e744 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 13 Sep 2009 01:38:00 +0200
Subject: [PATCH 2523/8469] fixed typo

--HG--
branch : distribute
extra : rebase_source : d9b3c2bcaa5bdc3367650f4571eefd33ef45e43e
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e554c9cbb3..fb27451851 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -356,7 +356,7 @@ def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
     args = [sys.executable]  + sys.argv
-    if is_jython:
+    if IS_JYTHON:
         sys.exit(subprocess.call(args))
     else:
         sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))

From 536c9838f3bd703c97b3816bb8b723e41cec7d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 10:19:07 +0200
Subject: [PATCH 2524/8469] Provide registry for fixer packages.

--HG--
branch : distribute
extra : rebase_source : 6a1259914751bdc18a32b98bd87680fb5fe94e70
---
 setuptools/__init__.py         | 2 ++
 setuptools/command/build_py.py | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 05b65e4d06..8c3eeb6d77 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -31,6 +31,8 @@
 # If we run 2to3 on .py files, should we also convert docstrings?
 # Default: yes; assume that we can detect doctests reliably
 run_2to3_on_doctests = True
+# Package names for fixer packages
+lib2to3_fixer_packages = ['lib2to3.fixes']
 
 def find_packages(where='.', exclude=()):
     """Return a list all Python packages found within directory 'where'
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index d5890afe25..b570ddb596 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -23,12 +23,13 @@ class Mixin2to3(_Mixin2to3):
         def run_2to3(self, files):
             if not setuptools.run_2to3:
                 return
+            if not self.fixer_names:
+                self.fixer_names = []
+                for p in setuptools.lib2to3_fixer_packages:
+                    self.fixer_names.extend(get_fixers_from_package(p))
             _Mixin2to3.run_2to3(self, files)
             if setuptools.run_2to3_on_doctests:
-                fixer_names = self.fixer_names
-                if fixer_names is None:
-                    fixer_names = get_fixers_from_package('lib2to3.fixes')
-                r = DistutilsRefactoringTool(fixer_names)
+                r = DistutilsRefactoringTool(self.fixer_names)
                 r.refactor(files, write=True, doctests_only=True)
 
 except ImportError:

From ff05819d89b83b7d1cb1915ef6d0eb738714ea12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 12:52:37 +0200
Subject: [PATCH 2525/8469] Document 2to3 features.

--HG--
branch : distribute
extra : rebase_source : 83d21c2b058553bf4c1cadf7aaa71bcf34ebfcdd
---
 docs/setuptools.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7de0ab086a..1c73d4a99a 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -404,6 +404,10 @@ unless you need the associated ``setuptools`` feature.
     mess with it.  For more details on how this argument works, see the section
     below on `Automatic Resource Extraction`_.
 
+``convert_doctests_2to3``
+    List of doctest source files that need to be converted with 2to3. See
+    `Converting with 2to3`_ below for more details.
+
 
 Using ``find_packages()``
 -------------------------
@@ -446,6 +450,26 @@ argument in your setup script.  Especially since it frees you from having to
 remember to modify your setup script whenever your project grows additional
 top-level packages or subpackages.
 
+Converting with 2to3
+--------------------
+
+When run under Python 3.x, setuptools will automatically run 2to3 on
+all Python source files, if ``setuptools.run_2to3`` is set to True; by
+default, this variable is False. It will also convert doctests inside
+all Python source files, unless ``setuptools.run_2to3_on_doctests`` is
+False; by default, this setting is True. If additional files
+containing doctests need to be converted, the
+``convert_doctests_2to3``setup option should provide a list of all
+such files.
+
+By default, this conversion uses all fixers in the ``lib2to3.fixes``
+package. To use additional fixes, the list
+``setuptools.lib2to3_fixer_packages`` must be extended with names
+of packages containing fixes. If certain fixes are to be suppressed,
+this again can be overridden with the list 
+``setuptools.commands.build_py.build_py.fixers``, which then contains
+the list of all fixer class names.
+
 
 Automatic Script Creation
 =========================

From 26f4380b49c0e50f3782a2edbb9ba5ddd340a1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 12:53:58 +0200
Subject: [PATCH 2526/8469] Add convert_doctests_2to3.

--HG--
branch : distribute
extra : rebase_source : 38832a69542ff3b96c403b32ec5b3663b08a61d0
---
 setup.py                       |  1 +
 setuptools/command/build_py.py | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index d91ea0693f..20ea611367 100755
--- a/setup.py
+++ b/setup.py
@@ -96,6 +96,7 @@ def _being_installed():
             "include_package_data = setuptools.dist:assert_bool",
             "dependency_links     = setuptools.dist:assert_string_list",
             "test_loader          = setuptools.dist:check_importable",
+            "convert_doctests_2to3= setuptools.dist:convert_doctests_2to3"
         ],
 
         "egg_info.writers": [
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b570ddb596..dd99b9d62c 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -20,21 +20,23 @@ def log_debug(self, msg, *args):
             log.debug(msg, *args)
 
     class Mixin2to3(_Mixin2to3):
-        def run_2to3(self, files):
+        def run_2to3(self, files, doctests = False):
             if not setuptools.run_2to3:
                 return
             if not self.fixer_names:
                 self.fixer_names = []
                 for p in setuptools.lib2to3_fixer_packages:
                     self.fixer_names.extend(get_fixers_from_package(p))
-            _Mixin2to3.run_2to3(self, files)
-            if setuptools.run_2to3_on_doctests:
-                r = DistutilsRefactoringTool(self.fixer_names)
-                r.refactor(files, write=True, doctests_only=True)
+            if doctests:
+                if setuptools.run_2to3_on_doctests:
+                    r = DistutilsRefactoringTool(self.fixer_names)
+                    r.refactor(files, write=True, doctests_only=True)
+            else:
+                _Mixin2to3.run_2to3(self, files)
 
 except ImportError:
     class Mixin2to3:
-        def run_2to3(self, files):
+        def run_2to3(self, files, doctests=True):
             # Nothing done in 2.x
             pass
 
@@ -53,6 +55,7 @@ def finalize_options(self):
         self.exclude_package_data = self.distribution.exclude_package_data or {}
         if 'data_files' in self.__dict__: del self.__dict__['data_files']
         self.__updated_files = []
+        self.__doctests_2to3 = []
 
     def run(self):
         """Build modules, packages, and copy data files to build directory"""
@@ -66,7 +69,9 @@ def run(self):
             self.build_packages()
             self.build_package_data()
 
-        self.run_2to3(self.__updated_files)
+        self.run_2to3(self.__updated_files, False)
+        self.run_2to3(self.__updated_files, True)
+        self.run_2to3(self.__doctests_2to3, True)
 
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
@@ -121,7 +126,9 @@ def build_package_data(self):
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
-                self.copy_file(os.path.join(src_dir, filename), target)
+                outf, copied = self.copy_file(os.path.join(src_dir, filename), target)
+                if copied and filename in setuptools.convert_doctests_2to3:
+                    self.__doctests_2to3.append(outf)
 
 
     def analyze_manifest(self):

From de9db4b432928776ed32c56c0338344abab9f4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 13:45:07 +0200
Subject: [PATCH 2527/8469] Fix processing of command line option.

--HG--
branch : distribute
extra : rebase_source : 43939b482ba840e06b03bf7a9888d8aed3805cec
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 20ea611367..6cca53f32c 100755
--- a/setup.py
+++ b/setup.py
@@ -96,7 +96,7 @@ def _being_installed():
             "include_package_data = setuptools.dist:assert_bool",
             "dependency_links     = setuptools.dist:assert_string_list",
             "test_loader          = setuptools.dist:check_importable",
-            "convert_doctests_2to3= setuptools.dist:convert_doctests_2to3"
+            "convert_doctests_2to3= setuptools.dist:assert_string_list"
         ],
 
         "egg_info.writers": [

From 1a8b650faf34b6205a8a26168ab7ef886833f85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 13:50:29 +0200
Subject: [PATCH 2528/8469] Fix processing of convert_doctests_2to3.

--HG--
branch : distribute
extra : rebase_source : 101f51e5f7c364407e27b742aec5e02336936d8c
---
 setuptools/command/build_py.py | 9 +++++++--
 setuptools/dist.py             | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index dd99b9d62c..2413b420a2 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -23,6 +23,9 @@ class Mixin2to3(_Mixin2to3):
         def run_2to3(self, files, doctests = False):
             if not setuptools.run_2to3:
                 return
+            if not files:
+                return
+            log.info("Fixing "+" ".join(files))
             if not self.fixer_names:
                 self.fixer_names = []
                 for p in setuptools.lib2to3_fixer_packages:
@@ -126,8 +129,10 @@ def build_package_data(self):
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
-                outf, copied = self.copy_file(os.path.join(src_dir, filename), target)
-                if copied and filename in setuptools.convert_doctests_2to3:
+                srcfile = os.path.join(src_dir, filename)
+                outf, copied = self.copy_file(srcfile, target)
+                srcfile = os.path.abspath(srcfile)
+                if copied and srcfile in self.distribution.convert_doctests_2to3:
                     self.__doctests_2to3.append(outf)
 
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index c2e57f4b0b..f295ca4e9b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -255,6 +255,11 @@ def finalize_options(self):
             if value is not None:
                 ep.require(installer=self.fetch_build_egg)
                 ep.load()(self, ep.name, value)
+        if self.convert_doctests_2to3:
+            # XXX may convert to set here when we can rely on set being builtin
+            self.convert_doctests_2to3 = [os.path.abspath(p) for p in self.convert_doctests_2to3]
+        else:
+            self.convert_doctests_2to3 = []
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""

From 15a0f215d79be0bd7cbf521395377fd7c3168dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 14:40:15 +0200
Subject: [PATCH 2529/8469] Deal with convert_doctests_2to3 not being set.

--HG--
branch : distribute
extra : rebase_source : c1952763f89af6f9c5e25e67982b96756d7336e3
---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index f295ca4e9b..fd23d9babb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -255,7 +255,7 @@ def finalize_options(self):
             if value is not None:
                 ep.require(installer=self.fetch_build_egg)
                 ep.load()(self, ep.name, value)
-        if self.convert_doctests_2to3:
+        if getattr(self, 'convert_doctests_2to3', None):
             # XXX may convert to set here when we can rely on set being builtin
             self.convert_doctests_2to3 = [os.path.abspath(p) for p in self.convert_doctests_2to3]
         else:

From bd900046b3457bfd98ac36dfbdaac63d7acf0a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 15:33:43 +0200
Subject: [PATCH 2530/8469] Convert HTML pages to text.

--HG--
branch : distribute
extra : rebase_source : 9ab9cc8b84da2be50c520cd6f23efb15b8744bd9
---
 setuptools/package_index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 48494aff21..b6283dbc2c 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -197,6 +197,8 @@ def process_url(self, url, retrieve=False):
 
         base = f.url     # handle redirects
         page = f.read()
+        charset = f.headers.get_param('charset') or 'latin-1'
+        page = page.decode(charset, "ignore")
         f.close()
         if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
             page = self.process_index(url, page)

From cfa83c08e6c6248f0085dfaab5c4f7edad6f8ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 16:20:45 +0200
Subject: [PATCH 2531/8469] Support attrs is None.

--HG--
branch : distribute
extra : rebase_source : 7ab3d57b13cb2ec2d7d1b9aafc99f4ec0ea49b5a
---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index fd23d9babb..531c94f440 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -210,7 +210,7 @@ def __init__ (self, attrs=None):
         self.require_features = []
         self.features = {}
         self.dist_files = []
-        self.src_root = attrs.pop("src_root", None)
+        self.src_root = attrs and attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
         # Make sure we have any eggs needed to interpret 'attrs'
         if attrs is not None:

From 55413ad562eddc5ffc235bde5471fdf010421f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 13 Sep 2009 21:30:44 +0200
Subject: [PATCH 2532/8469] Only decode HTML pages in 3.x.

--HG--
branch : distribute
extra : rebase_source : 58a286fe297947272398fc9ddd8f50594f54d4ae
---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b6283dbc2c..084370d530 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -197,8 +197,9 @@ def process_url(self, url, retrieve=False):
 
         base = f.url     # handle redirects
         page = f.read()
-        charset = f.headers.get_param('charset') or 'latin-1'
-        page = page.decode(charset, "ignore")
+        if sys.version_info >= (3,):
+            charset = f.headers.get_param('charset') or 'latin-1'
+            page = page.decode(charset, "ignore")
         f.close()
         if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
             page = self.process_index(url, page)

From 5132893c6fa2799cfb9d23b35ff1828f8c621421 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 19:13:15 +0000
Subject: [PATCH 2533/8469] Finish support for --with-universal-archs=intel and
 --with-universal-archs=3-way (issue6245)

---
 util.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index 459c36462d..fe6851cb87 100644
--- a/util.py
+++ b/util.py
@@ -144,11 +144,26 @@ def get_platform():
                 machine = 'fat'
                 cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in cflags:
-                    if '-arch i386' in cflags:
-                        machine = 'universal'
-                    else:
-                        machine = 'fat64'
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs.sort()
+                archs = tuple(archs)
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
+
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From d057f0f1b7dbf7446e4b979ccf8da90ce89995de Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 19:14:37 +0000
Subject: [PATCH 2534/8469] Merged revisions 74806 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74806 | ronald.oussoren | 2009-09-15 21:13:15 +0200 (Tue, 15 Sep 2009) | 3 lines

  Finish support for --with-universal-archs=intel
  and --with-universal-archs=3-way (issue6245)
........
---
 util.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index e9d29ff49c..ee5829b077 100644
--- a/util.py
+++ b/util.py
@@ -142,11 +142,26 @@ def get_platform ():
                 machine = 'fat'
                 cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in cflags:
-                    if '-arch i386' in cflags:
-                        machine = 'universal'
-                    else:
-                        machine = 'fat64'
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs.sort()
+                archs = tuple(archs)
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
+
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From 589e2a746f2e3812fe1e7840391a61b20b3fdaf4 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 19:16:02 +0000
Subject: [PATCH 2535/8469] Merged revisions 74806 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74806 | ronald.oussoren | 2009-09-15 21:13:15 +0200 (Tue, 15 Sep 2009) | 3 lines

  Finish support for --with-universal-archs=intel
  and --with-universal-archs=3-way (issue6245)
........
---
 util.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index 0c88b8197d..6709bbfe42 100644
--- a/util.py
+++ b/util.py
@@ -144,11 +144,26 @@ def get_platform():
                 machine = 'fat'
                 cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in cflags:
-                    if '-arch i386' in cflags:
-                        machine = 'universal'
-                    else:
-                        machine = 'fat64'
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs.sort()
+                archs = tuple(archs)
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
+
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From b2dfd2fe8b6c80780cfa28e5ca013124fb1f45b6 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 19:16:40 +0000
Subject: [PATCH 2536/8469] Merged revisions 74808 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74808 | ronald.oussoren | 2009-09-15 21:16:02 +0200 (Tue, 15 Sep 2009) | 10 lines

  Merged revisions 74806 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74806 | ronald.oussoren | 2009-09-15 21:13:15 +0200 (Tue, 15 Sep 2009) | 3 lines

    Finish support for --with-universal-archs=intel
    and --with-universal-archs=3-way (issue6245)
  ........
................
---
 util.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index 4c1956a2b8..5054d0c867 100644
--- a/util.py
+++ b/util.py
@@ -141,11 +141,26 @@ def get_platform ():
                 machine = 'fat'
                 cflags = get_config_vars().get('CFLAGS')
 
-                if '-arch x86_64' in cflags:
-                    if '-arch i386' in cflags:
-                        machine = 'universal'
-                    else:
-                        machine = 'fat64'
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs.sort()
+                archs = tuple(archs)
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
+
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.

From 56e40eafce0c788acacca65aef4f0fc93640aedd Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 21:24:07 +0000
Subject: [PATCH 2537/8469] Update distutils.util tests after my changes to
 --with-universal-archs

---
 tests/test_util.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index ffa92bd07e..7190b2c9c6 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -142,15 +142,35 @@ def test_get_platform(self):
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
+        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+
+        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
         self.assertEquals(get_platform(), 'macosx-10.4-universal')
 
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
         self.assertEquals(get_platform(), 'macosx-10.4-fat64')
 
+        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
+                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                           '-fno-strict-aliasing -fno-common '
+                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
+
+            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From 3736fee0faddbbc93fa6b7a1b233d4c2dcf11d76 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Fri, 18 Sep 2009 17:22:17 +0200
Subject: [PATCH 2538/8469] Works with zope.interface now.

--HG--
branch : distribute
extra : rebase_source : c8cd9fd837bbac96c8949f0015d84051bd8ab5c7
---
 distribute.egg-info/entry_points.txt |  9 ++++++---
 setup.py                             | 30 +++++++++++++++-------------
 setuptools/__init__.py               |  2 +-
 setuptools/command/build_py.py       |  6 +++++-
 setuptools/command/test.py           | 28 ++++++++++++++++++++------
 5 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2c002f4c09..e588745480 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,6 +1,5 @@
 [distutils.commands]
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_scripts = setuptools.command.install_scripts:install_scripts
 rotate = setuptools.command.rotate:rotate
 develop = setuptools.command.develop:develop
 setopt = setuptools.command.setopt:setopt
@@ -11,10 +10,11 @@ register = setuptools.command.register:register
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
-test = setuptools.command.test:test
+install_scripts = setuptools.command.install_scripts:install_scripts
 bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 bdist_egg = setuptools.command.bdist_egg:bdist_egg
 install = setuptools.command.install:install
+test = setuptools.command.test:test
 install_lib = setuptools.command.install_lib:install_lib
 build_ext = setuptools.command.build_ext:build_ext
 sdist = setuptools.command.sdist:sdist
@@ -31,15 +31,17 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
+additional_2to3_fixers = setuptools.dist:assert_string_list
 dependency_links = setuptools.dist:assert_string_list
 entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
+run_2to3 = setuptools.dist:assert_bool
 package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
 include_package_data = setuptools.dist:assert_bool
@@ -49,6 +51,7 @@ test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
 zip_safe = setuptools.dist:assert_bool
 test_loader = setuptools.dist:check_importable
+convert_doctests_2to3 = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
 
 [setuptools.installation]
diff --git a/setup.py b/setup.py
index 0bc261a957..a9a66918a0 100755
--- a/setup.py
+++ b/setup.py
@@ -84,20 +84,22 @@ def _being_installed():
         ],
 
         "distutils.setup_keywords": [
-            "eager_resources      = setuptools.dist:assert_string_list",
-            "namespace_packages   = setuptools.dist:check_nsp",
-            "extras_require       = setuptools.dist:check_extras",
-            "install_requires     = setuptools.dist:check_requirements",
-            "tests_require        = setuptools.dist:check_requirements",
-            "entry_points         = setuptools.dist:check_entry_points",
-            "test_suite           = setuptools.dist:check_test_suite",
-            "zip_safe             = setuptools.dist:assert_bool",
-            "package_data         = setuptools.dist:check_package_data",
-            "exclude_package_data = setuptools.dist:check_package_data",
-            "include_package_data = setuptools.dist:assert_bool",
-            "dependency_links     = setuptools.dist:assert_string_list",
-            "test_loader          = setuptools.dist:check_importable",
-            "convert_doctests_2to3= setuptools.dist:assert_string_list"
+            "eager_resources        = setuptools.dist:assert_string_list",
+            "namespace_packages     = setuptools.dist:check_nsp",
+            "extras_require         = setuptools.dist:check_extras",
+            "install_requires       = setuptools.dist:check_requirements",
+            "tests_require          = setuptools.dist:check_requirements",
+            "entry_points           = setuptools.dist:check_entry_points",
+            "test_suite             = setuptools.dist:check_test_suite",
+            "zip_safe               = setuptools.dist:assert_bool",
+            "package_data           = setuptools.dist:check_package_data",
+            "exclude_package_data   = setuptools.dist:check_package_data",
+            "include_package_data   = setuptools.dist:assert_bool",
+            "dependency_links       = setuptools.dist:assert_string_list",
+            "test_loader            = setuptools.dist:check_importable",
+            "run_2to3               = setuptools.dist:assert_bool",
+            "convert_doctests_2to3  = setuptools.dist:assert_string_list",
+            "additional_2to3_fixers = setuptools.dist:assert_string_list",
         ],
 
         "egg_info.writers": [
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8c3eeb6d77..ac5e6e5e3b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -27,7 +27,7 @@
 # Should we run 2to3 on all Python files, in Python 3.x?
 # Default: no; assume that a distribution installed for 3.x is already
 # written in 3.x
-run_2to3 = False
+run_2to3 = False # Default value if run_2to3 argument not given.
 # If we run 2to3 on .py files, should we also convert docstrings?
 # Default: yes; assume that we can detect doctests reliably
 run_2to3_on_doctests = True
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 2413b420a2..94f6674140 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -21,7 +21,9 @@ def log_debug(self, msg, *args):
 
     class Mixin2to3(_Mixin2to3):
         def run_2to3(self, files, doctests = False):
-            if not setuptools.run_2to3:
+            # See of the distribution option has been set, otherwise check the
+            # setuptools default.
+            if self.distribution.run_2to3 is not True and setuptools.run_2to3 is False:
                 return
             if not files:
                 return
@@ -30,6 +32,8 @@ def run_2to3(self, files, doctests = False):
                 self.fixer_names = []
                 for p in setuptools.lib2to3_fixer_packages:
                     self.fixer_names.extend(get_fixers_from_package(p))
+                for p in self.distribution.additional_2to3_fixers:
+                    self.fixer_names.extend(get_fixers_from_package(p))
             if doctests:
                 if setuptools.run_2to3_on_doctests:
                     r = DistutilsRefactoringTool(self.fixer_names)
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index db918dae06..0f96e83ac1 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,4 +1,4 @@
-from setuptools import Command
+from setuptools import Command, run_2to3
 from distutils.errors import DistutilsOptionError
 import sys
 from pkg_resources import *
@@ -81,12 +81,28 @@ def finalize_options(self):
 
 
     def with_project_on_sys_path(self, func):
-        # Ensure metadata is up-to-date
-        self.run_command('egg_info')
+        if getattr(self.distribution, 'run_2to3', run_2to3):
+            # If we run 2to3 we can not do this inplace:
 
-        # Build extensions in-place
-        self.reinitialize_command('build_ext', inplace=1)
-        self.run_command('build_ext')
+            # Ensure metadata is up-to-date
+            self.reinitialize_command('build_py', inplace=0)
+            self.run_command('build_py')
+            bpy_cmd = self.get_finalized_command("build_py")
+            build_path = normalize_path(bpy_cmd.build_lib)
+
+            # Build extensions
+            self.reinitialize_command('egg_info', egg_base=build_path)
+            self.run_command('egg_info')
+
+            self.reinitialize_command('build_ext', inplace=0)
+            self.run_command('build_ext')
+        else:
+            # Without 2to3 inplace works fine:
+            self.run_command('egg_info')
+
+            # Build extensions in-place
+            self.reinitialize_command('build_ext', inplace=1)
+            self.run_command('build_ext')
 
         ei_cmd = self.get_finalized_command("egg_info")
 

From d2f24d4c853603500381f1a4b34ae1d04d920ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 19 Sep 2009 09:58:51 +0000
Subject: [PATCH 2539/8469] Fixed #6947 - SO extension varies under windows

---
 tests/test_build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d8d3667751..94000a57d9 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -338,7 +338,8 @@ def test_build_ext_inplace(self):
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
         curdir = os.getcwd()
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree.so')
+        ext = sysconfig.get_config_var("SO")
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 

From 95159c09e5bb2d1dc1f0ccf89ccbe90ecc6871a0 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Sat, 19 Sep 2009 22:39:32 +0200
Subject: [PATCH 2540/8469] Fixed a daft bug (my fault).

--HG--
branch : distribute
extra : rebase_source : 82e1e503282ced638da32690291923613a74e930
---
 setuptools/command/build_py.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 94f6674140..910d67c8cb 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -32,8 +32,9 @@ def run_2to3(self, files, doctests = False):
                 self.fixer_names = []
                 for p in setuptools.lib2to3_fixer_packages:
                     self.fixer_names.extend(get_fixers_from_package(p))
-                for p in self.distribution.additional_2to3_fixers:
-                    self.fixer_names.extend(get_fixers_from_package(p))
+                if self.distribution.additional_2to3_fixers is not None:
+                    for p in self.distribution.additional_2to3_fixers:
+                        self.fixer_names.extend(get_fixers_from_package(p))
             if doctests:
                 if setuptools.run_2to3_on_doctests:
                     r = DistutilsRefactoringTool(self.fixer_names)

From 19af16b0ec4149f3b00d4e05dfce8ad4f61310e1 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 20 Sep 2009 14:45:46 +0200
Subject: [PATCH 2541/8469] make sure setuptools does like distutils in
 get_ext_filename fixes #41

--HG--
branch : distribute
extra : rebase_source : 4401307be98ca2fb74e715a258b7af74eaa62db2
---
 setuptools/command/build_ext.py    |  2 ++
 setuptools/tests/test_build_ext.py | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 setuptools/tests/test_build_ext.py

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c0aaa8e80c..a60ede0c3c 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -82,6 +82,8 @@ def swig_sources(self, sources, *otherargs):
 
     def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self,fullname)
+        if fullname not in self.ext_map:
+            return filename
         ext = self.ext_map[fullname]
         if isinstance(ext,Library):
             fn, ext = os.path.splitext(filename)
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
new file mode 100644
index 0000000000..a520ced9d6
--- /dev/null
+++ b/setuptools/tests/test_build_ext.py
@@ -0,0 +1,20 @@
+"""build_ext tests
+"""
+import os, shutil, tempfile, unittest
+from distutils.command.build_ext import build_ext as distutils_build_ext
+from setuptools.command.build_ext import build_ext
+from setuptools.dist import Distribution
+
+class TestBuildExtTest(unittest.TestCase):
+
+    def test_get_ext_filename(self):
+        # setuptools needs to give back the same
+        # result than distutils, even if the fullname
+        # is not in ext_map
+        dist = Distribution()
+        cmd = build_ext(dist)
+        cmd.ext_map['foo/bar'] = ''
+        res = cmd.get_ext_filename('foo')
+        wanted = distutils_build_ext.get_ext_filename(cmd, 'foo')
+        assert res == wanted
+

From 1219c326683905695fbdf60c22367129075d2f8d Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 20 Sep 2009 14:47:00 +0200
Subject: [PATCH 2542/8469] merged + removed trailing spaces

--HG--
branch : distribute
extra : rebase_source : 343481c01063bac16767023dd7a24bb0b063b967
---
 distribute.egg-info/entry_points.txt | 2 +-
 setuptools/command/develop.py        | 6 +++---
 tests/test_distribute_setup.py       | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index d69118d9ae..3532a1fe11 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -31,7 +31,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index f128b8030b..3288805647 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -46,7 +46,7 @@ def finalize_options(self):
             "Please rename %r to %r before using 'develop'"
             % (ei.egg_info, ei.broken_egg_info)
             )
-        self.args = [ei.egg_name]       
+        self.args = [ei.egg_name]
         easy_install.finalize_options(self)
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
@@ -62,7 +62,7 @@ def finalize_options(self):
                 "--egg-path must be a relative path from the install"
                 " directory to "+target
         )
-        
+
         # Make a distribution for the package's source
         self.dist = Distribution(
             target,
@@ -129,7 +129,7 @@ def install_egg_scripts(self, dist):
         # create wrapper scripts in the script dir, pointing to dist.scripts
 
         # new-style...
-        self.install_wrapper_scripts(dist)  
+        self.install_wrapper_scripts(dist)
 
         # ...and old-style
         for script_name in self.distribution.scripts or []:
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 6c004bd7b7..76f8f8fa17 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -45,7 +45,6 @@ def test_build_egg(self):
         self.assert_(setuptools.__file__.startswith(egg))
 
     def test_do_download(self):
-
         tmpdir = tempfile.mkdtemp()
         _do_download(to_dir=tmpdir)
         import setuptools

From e31bfe83544e77494aea179e9340a04c41baf4f9 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 21 Sep 2009 00:31:41 +0200
Subject: [PATCH 2543/8469] More docs for python 3 support.

--HG--
branch : distribute
extra : rebase_source : 5a012fd490441b1e72729d659b596a19dbbe0cb8
---
 docs/index.txt      |   1 +
 docs/python3.txt    | 120 ++++++++++++++++++++++++++++++++++++++++++++
 docs/setuptools.txt |  32 ++++--------
 3 files changed, 131 insertions(+), 22 deletions(-)
 create mode 100644 docs/python3.txt

diff --git a/docs/index.txt b/docs/index.txt
index 6f04ffb94c..f814ff9be5 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -9,6 +9,7 @@ Contents:
    setuptools
    easy_install
    pkg_resources
+   python3
 
 
 Indices and tables
diff --git a/docs/python3.txt b/docs/python3.txt
new file mode 100644
index 0000000000..19a2b26853
--- /dev/null
+++ b/docs/python3.txt
@@ -0,0 +1,120 @@
+=====================================================
+Supporting both Python 2 and Python 3 with Distribute
+=====================================================
+
+Starting with version 0.6.2, Distribute supports Python 3. Installing and
+using distribute for Python 3 code works exactly the same as for Python 2
+code, but Distribute also helps you to support Python 2 and Python 3 from
+the same source code by letting you run 2to3 on the code as a part of the
+build process. by setting the keyword parameter ``run_2to3`` to True.
+
+
+Distrubute as help during porting
+=================================
+
+Distribute can make the porting process much easier by automatically running
+2to3 as a part of the test running. To do this you need to configure the
+setup.py so that you can run the unit tests with ``python setup.py test``.
+
+See :ref:`test` for more information on this.
+
+Once you have the tests running under Python 2, you can add the run_2to3
+keyword parameters to setup(), and start running the tests under Python 3.
+The test command will now first run the build command during which the code
+will be converted with 2to3, and the tests will then be run from the build
+directory, as opposed from the source directory as is normally done.
+
+Distribute will convert all Python files, and also all doctests in Python
+files. However, if you have doctests located in separate text files, these
+will not automatically be converted. By adding them to the 
+``convert_doctests_2to3`` keyword parameter Distrubute will convert them as 
+well. 
+
+By default, the conversion uses all fixers in the ``lib2to3.fixers`` package.
+To use additional fixes, the parameter ``additional_2to3_fixers`` can be set
+to a list of names of packages containing fixers.
+
+A typical setup.py can look something like this::
+
+      from setuptools import setup
+      
+      setup(name='your.module',
+            version = '1.0',
+            description='This is your awesome module',
+            author='You',
+            author_email='your@email',
+            package_dir = {'': 'src'},
+            packages = ['your', 'you.module'],
+            test_suite = 'your.module.tests',
+            run_2to3 = True,
+            convert_doctests_2to3 = ['src/your/module/README.txt'],
+            additional_2to3_fixers = ['your.fixers']
+            )
+
+Differential conversion
+-----------------------
+
+Note that a file will only be copied and converted during the build process
+if the source file has been changed. If you add a file to the doctests
+that should be converted, it will not be converted the next time you run
+the tests, since it hasn't been modified. You need to remove it from the 
+build directory. Also if you run the build, install or test commands before
+adding the run_2to3 parameter, you will have to remove the build directory
+before you run the test command, as the files otherwise will seem updated, 
+and no conversion will happen.
+
+In general, if code doesn't seem to be converted, deleting the build directory
+and trying again is a good saferguard against the build directory getting
+"out of sync" with teh source directory.
+
+Distributing Python 3 modules
+=============================
+
+You can distribute your modules with Python 3 support in different ways. A
+normal source distribution will work, but can be slow in installing, as the
+2to3 process will be run during the install. But you can also distribute
+the module in binary format, such as a binary egg. That egg will contain the
+already converted code, and hence no 2to3 conversion is needed during install.
+
+Advanced features
+=================
+
+If certain fixers are to be suppressed, this again can be overridden with the
+list ``setuptools.commands.build_py.build_py.fixers``, which then contains the
+list of all fixer class names.
+
+If you don't want to run the 2to3 conversion on the doctests in Python files,
+you can turn that off by setting ``setuptools.run_2to3_on_doctests = False``.
+
+Note on compatibility with setuptools
+=====================================
+
+Setuptools do not know about the new keyword parameters to support Python 3.
+As a result it will warn about the unknown keyword parameters if you use
+setuptools instead of Distribute under Python 2. This is not an error, and
+install process will continue as normal, but if you want to get rid of that
+error this is easy. Simply conditionally add the new parameters into an extra 
+dict and pass that dict into setup()::
+
+      from setuptools import setup
+      import sys
+      
+      extra = {}
+      if sys.version_info >= (3,):
+          extra['run_2to3'] = True
+          extra['convert_doctests_2to3'] = ['src/your/module/README.txt']
+          extra['additional_2to3_fixers'] = ['your.fixers']
+      
+      setup(name='your.module',
+            version = '1.0',
+            description='This is your awesome module',
+            author='You',
+            author_email='your@email',
+            package_dir = {'': 'src'},
+            packages = ['your', 'you.module'],
+            test_suite = 'your.module.tests',
+            **extra
+            )
+
+This way the parameters will only be used under Python 3, where you have to
+use Distribute.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 1c73d4a99a..e462e61ab5 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -404,9 +404,17 @@ unless you need the associated ``setuptools`` feature.
     mess with it.  For more details on how this argument works, see the section
     below on `Automatic Resource Extraction`_.
 
+``run_2to3``
+    Convert the source code from Python 2 to Python 3 with 2to3 during the 
+    build process. 
+
 ``convert_doctests_2to3``
-    List of doctest source files that need to be converted with 2to3. See
-    `Converting with 2to3`_ below for more details.
+    List of doctest source files that need to be converted with 2to3. 
+    See :doc:`python3` for more details.
+    
+``additional_2to3_fixers``
+    A list of modules to serach for additional fixers to be used during
+    the 2to3 conversion. See :doc:`python3` for more details.
 
 
 Using ``find_packages()``
@@ -450,26 +458,6 @@ argument in your setup script.  Especially since it frees you from having to
 remember to modify your setup script whenever your project grows additional
 top-level packages or subpackages.
 
-Converting with 2to3
---------------------
-
-When run under Python 3.x, setuptools will automatically run 2to3 on
-all Python source files, if ``setuptools.run_2to3`` is set to True; by
-default, this variable is False. It will also convert doctests inside
-all Python source files, unless ``setuptools.run_2to3_on_doctests`` is
-False; by default, this setting is True. If additional files
-containing doctests need to be converted, the
-``convert_doctests_2to3``setup option should provide a list of all
-such files.
-
-By default, this conversion uses all fixers in the ``lib2to3.fixes``
-package. To use additional fixes, the list
-``setuptools.lib2to3_fixer_packages`` must be extended with names
-of packages containing fixes. If certain fixes are to be suppressed,
-this again can be overridden with the list 
-``setuptools.commands.build_py.build_py.fixers``, which then contains
-the list of all fixer class names.
-
 
 Automatic Script Creation
 =========================

From bec82b20d18cb0e81d305015307584abaa2b69bf Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 21 Sep 2009 11:53:47 +0200
Subject: [PATCH 2544/8469] Cut and paste error.

--HG--
branch : distribute
extra : rebase_source : 2dd0749f676a281b4a09fd050686ea0821dd64f8
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e462e61ab5..d4c11a0f61 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -406,7 +406,7 @@ unless you need the associated ``setuptools`` feature.
 
 ``run_2to3``
     Convert the source code from Python 2 to Python 3 with 2to3 during the 
-    build process. 
+    build process. See :doc:`python3` for more details.
 
 ``convert_doctests_2to3``
     List of doctest source files that need to be converted with 2to3. 

From e16bbeaf5a2c38ea024beb32eaee3f413acd7e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 12:19:07 +0000
Subject: [PATCH 2545/8469] improved distutils test coverage: now the DEBUG
 mode is covered too (will help fix the issue #6954 in py3k branch)

---
 tests/test_ccompiler.py | 24 +++++++++++++++++++++++-
 tests/test_cmd.py       | 18 ++++++++++++++++++
 tests/test_core.py      | 20 ++++++++++++++++++++
 tests/test_filelist.py  | 19 +++++++++++++++++++
 tests/test_install.py   | 14 +++++++++++++-
 5 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index 58c8c5da40..2c219b7b17 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -1,8 +1,10 @@
 """Tests for distutils.ccompiler."""
 import os
 import unittest
+from test.test_support import captured_stdout
 
-from distutils.ccompiler import gen_lib_options
+from distutils.ccompiler import gen_lib_options, CCompiler
+from distutils import debug
 
 class FakeCompiler(object):
     def library_dir_option(self, dir):
@@ -30,6 +32,26 @@ def test_gen_lib_options(self):
                   '-lname2']
         self.assertEquals(opts, wanted)
 
+    def test_debug_print(self):
+
+        class MyCCompiler(CCompiler):
+            executables = {}
+
+        compiler = MyCCompiler()
+        with captured_stdout() as stdout:
+            compiler.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                compiler.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index d6438b5ea1..2174efbf64 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,10 +1,12 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
+from test.test_support import captured_stdout
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils import debug
 
 class MyCmd(Command):
     def initialize_options(self):
@@ -102,6 +104,22 @@ def test_ensure_dirname(self):
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
 
+    def test_debug_print(self):
+        cmd = self.cmd
+        with captured_stdout() as stdout:
+            cmd.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                cmd.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
diff --git a/tests/test_core.py b/tests/test_core.py
index e481e8de39..3c26fddbc6 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,6 +6,7 @@
 import shutil
 import sys
 import test.test_support
+from test.test_support import captured_stdout
 import unittest
 
 
@@ -33,10 +34,12 @@ class CoreTestCase(unittest.TestCase):
     def setUp(self):
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
+        self.old_argv = sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
+        sys.argv = self.old_argv[:]
 
     def cleanup_testfn(self):
         path = test.test_support.TESTFN
@@ -73,6 +76,23 @@ def test_run_setup_uses_current_dir(self):
             output = output[:-1]
         self.assertEqual(cwd, output)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        sys.argv = ['setup.py', '--name']
+        with captured_stdout() as stdout:
+            distutils.core.setup(name='bar')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), 'bar\n')
+
+        distutils.core.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                distutils.core.setup(name='bar')
+        finally:
+            distutils.core.DEBUG = False
+        stdout.seek(0)
+        wanted = "options (after parsing config files):\n"
+        self.assertEquals(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index cf64c744d2..0cbb48bcc6 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,7 +1,10 @@
 """Tests for distutils.filelist."""
 from os.path import join
 import unittest
+from test.test_support import captured_stdout
+
 from distutils.filelist import glob_to_re, FileList
+from distutils import debug
 
 MANIFEST_IN = """\
 include ok
@@ -59,6 +62,22 @@ def test_process_template_line(self):
 
         self.assertEquals(file_list.files, wanted)
 
+    def test_debug_print(self):
+        file_list = FileList()
+        with captured_stdout() as stdout:
+            file_list.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                file_list.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
diff --git a/tests/test_install.py b/tests/test_install.py
index d0ad5ce159..d2b8c8e9b6 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -6,6 +6,8 @@
 import unittest
 import site
 
+from test.test_support import captured_stdout
+
 from distutils.command.install import install
 from distutils.command import install as install_module
 from distutils.command.install import INSTALL_SCHEMES
@@ -14,7 +16,6 @@
 
 from distutils.tests import support
 
-
 class InstallTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
@@ -183,6 +184,17 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        old_logs_len = len(self.logs)
+        install_module.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                self.test_record()
+        finally:
+            install_module.DEBUG = False
+        self.assertTrue(len(self.logs) > old_logs_len)
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 

From f0f1b0325d3f06a06ab03c6912ea9743e9c30ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:01:54 +0000
Subject: [PATCH 2546/8469] Merged revisions 74988 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74988 | tarek.ziade | 2009-09-21 14:19:07 +0200 (Mon, 21 Sep 2009) | 1 line

  improved distutils test coverage: now the DEBUG mode is covered too (will help fix the issue #6954 in py3k branch)
........
---
 cmd.py                  |  2 +-
 fancy_getopt.py         |  6 +++---
 tests/test_ccompiler.py | 24 +++++++++++++++++++++++-
 tests/test_cmd.py       | 18 ++++++++++++++++++
 tests/test_core.py      | 20 ++++++++++++++++++++
 tests/test_filelist.py  | 19 +++++++++++++++++++
 tests/test_install.py   | 14 +++++++++++++-
 7 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/cmd.py b/cmd.py
index aff7d68e3c..ae4efc7efc 100644
--- a/cmd.py
+++ b/cmd.py
@@ -157,7 +157,7 @@ def dump_options(self, header=None, indent=""):
         self.announce(indent + header, level=log.INFO)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = longopt_xlate(option)
+            option = option.translate(longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 72441fb43d..879d4d25bf 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -26,7 +26,7 @@
 
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
-longopt_xlate = lambda s: s.replace('-', '_')
+longopt_xlate = str.maketrans('-', '_')
 
 class FancyGetopt:
     """Wrapper around the standard 'getopt()' module that provides some
@@ -107,7 +107,7 @@ def get_attr_name(self, long_option):
         """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
-        return longopt_xlate(long_option)
+        return long_option.translate(longopt_xlate)
 
     def _check_alias_dict(self, aliases, what):
         assert isinstance(aliases, dict)
@@ -432,7 +432,7 @@ def translate_longopt(opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
-    return longopt_xlate(opt)
+    return opt.translate(longopt_xlate)
 
 
 class OptionDummy:
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index 58c8c5da40..9db8d24617 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -1,8 +1,10 @@
 """Tests for distutils.ccompiler."""
 import os
 import unittest
+from test.support import captured_stdout
 
-from distutils.ccompiler import gen_lib_options
+from distutils.ccompiler import gen_lib_options, CCompiler
+from distutils import debug
 
 class FakeCompiler(object):
     def library_dir_option(self, dir):
@@ -30,6 +32,26 @@ def test_gen_lib_options(self):
                   '-lname2']
         self.assertEquals(opts, wanted)
 
+    def test_debug_print(self):
+
+        class MyCCompiler(CCompiler):
+            executables = {}
+
+        compiler = MyCCompiler()
+        with captured_stdout() as stdout:
+            compiler.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                compiler.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index d6438b5ea1..55ae421d46 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,10 +1,12 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
+from test.support import captured_stdout
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils import debug
 
 class MyCmd(Command):
     def initialize_options(self):
@@ -102,6 +104,22 @@ def test_ensure_dirname(self):
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
 
+    def test_debug_print(self):
+        cmd = self.cmd
+        with captured_stdout() as stdout:
+            cmd.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                cmd.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 7f021dcb3b..b5f391f57a 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,6 +6,7 @@
 import shutil
 import sys
 import test.support
+from test.support import captured_stdout
 import unittest
 
 
@@ -33,10 +34,12 @@ class CoreTestCase(unittest.TestCase):
     def setUp(self):
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
+        self.old_argv = sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
+        sys.argv = self.old_argv[:]
 
     def cleanup_testfn(self):
         path = test.support.TESTFN
@@ -73,6 +76,23 @@ def test_run_setup_uses_current_dir(self):
             output = output[:-1]
         self.assertEqual(cwd, output)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        sys.argv = ['setup.py', '--name']
+        with captured_stdout() as stdout:
+            distutils.core.setup(name='bar')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), 'bar\n')
+
+        distutils.core.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                distutils.core.setup(name='bar')
+        finally:
+            distutils.core.DEBUG = False
+        stdout.seek(0)
+        wanted = "options (after parsing config files):\n"
+        self.assertEquals(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index cf64c744d2..d98325ae54 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,7 +1,10 @@
 """Tests for distutils.filelist."""
 from os.path import join
 import unittest
+from test.support import captured_stdout
+
 from distutils.filelist import glob_to_re, FileList
+from distutils import debug
 
 MANIFEST_IN = """\
 include ok
@@ -59,6 +62,22 @@ def test_process_template_line(self):
 
         self.assertEquals(file_list.files, wanted)
 
+    def test_debug_print(self):
+        file_list = FileList()
+        with captured_stdout() as stdout:
+            file_list.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                file_list.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
diff --git a/tests/test_install.py b/tests/test_install.py
index d0ad5ce159..2087a0eba0 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -6,6 +6,8 @@
 import unittest
 import site
 
+from test.support import captured_stdout
+
 from distutils.command.install import install
 from distutils.command import install as install_module
 from distutils.command.install import INSTALL_SCHEMES
@@ -14,7 +16,6 @@
 
 from distutils.tests import support
 
-
 class InstallTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
@@ -183,6 +184,17 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        old_logs_len = len(self.logs)
+        install_module.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                self.test_record()
+        finally:
+            install_module.DEBUG = False
+        self.assertTrue(len(self.logs) > old_logs_len)
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 

From ab2e256fe307738d2c0b4e9d4fa411b23f9be8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:10:05 +0000
Subject: [PATCH 2547/8469] Merged revisions 74990 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74990 | tarek.ziade | 2009-09-21 15:01:54 +0200 (Mon, 21 Sep 2009) | 9 lines

  Merged revisions 74988 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74988 | tarek.ziade | 2009-09-21 14:19:07 +0200 (Mon, 21 Sep 2009) | 1 line

    improved distutils test coverage: now the DEBUG mode is covered too (will help fix the issue #6954 in py3k branch)
  ........
................
---
 cmd.py                 |  2 +-
 fancy_getopt.py        |  6 +++---
 tests/test_cmd.py      | 18 ++++++++++++++++++
 tests/test_core.py     | 20 ++++++++++++++++++++
 tests/test_filelist.py | 21 ++++++++++++++++++++-
 tests/test_install.py  | 14 +++++++++++++-
 6 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/cmd.py b/cmd.py
index aff7d68e3c..ae4efc7efc 100644
--- a/cmd.py
+++ b/cmd.py
@@ -157,7 +157,7 @@ def dump_options(self, header=None, indent=""):
         self.announce(indent + header, level=log.INFO)
         indent = indent + "  "
         for (option, _, _) in self.user_options:
-            option = longopt_xlate(option)
+            option = option.translate(longopt_xlate)
             if option[-1] == "=":
                 option = option[:-1]
             value = getattr(self, option)
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 72441fb43d..879d4d25bf 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -26,7 +26,7 @@
 
 # This is used to translate long options to legitimate Python identifiers
 # (for use as attributes of some object).
-longopt_xlate = lambda s: s.replace('-', '_')
+longopt_xlate = str.maketrans('-', '_')
 
 class FancyGetopt:
     """Wrapper around the standard 'getopt()' module that provides some
@@ -107,7 +107,7 @@ def get_attr_name(self, long_option):
         """Translate long option name 'long_option' to the form it
         has as an attribute of some object: ie., translate hyphens
         to underscores."""
-        return longopt_xlate(long_option)
+        return long_option.translate(longopt_xlate)
 
     def _check_alias_dict(self, aliases, what):
         assert isinstance(aliases, dict)
@@ -432,7 +432,7 @@ def translate_longopt(opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
-    return longopt_xlate(opt)
+    return opt.translate(longopt_xlate)
 
 
 class OptionDummy:
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index d6438b5ea1..55ae421d46 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,10 +1,12 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
+from test.support import captured_stdout
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils import debug
 
 class MyCmd(Command):
     def initialize_options(self):
@@ -102,6 +104,22 @@ def test_ensure_dirname(self):
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
 
+    def test_debug_print(self):
+        cmd = self.cmd
+        with captured_stdout() as stdout:
+            cmd.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                cmd.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 7f021dcb3b..b5f391f57a 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,6 +6,7 @@
 import shutil
 import sys
 import test.support
+from test.support import captured_stdout
 import unittest
 
 
@@ -33,10 +34,12 @@ class CoreTestCase(unittest.TestCase):
     def setUp(self):
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
+        self.old_argv = sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
+        sys.argv = self.old_argv[:]
 
     def cleanup_testfn(self):
         path = test.support.TESTFN
@@ -73,6 +76,23 @@ def test_run_setup_uses_current_dir(self):
             output = output[:-1]
         self.assertEqual(cwd, output)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        sys.argv = ['setup.py', '--name']
+        with captured_stdout() as stdout:
+            distutils.core.setup(name='bar')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), 'bar\n')
+
+        distutils.core.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                distutils.core.setup(name='bar')
+        finally:
+            distutils.core.DEBUG = False
+        stdout.seek(0)
+        wanted = "options (after parsing config files):\n"
+        self.assertEquals(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 86db557441..b9db8f61fe 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,6 +1,9 @@
 """Tests for distutils.filelist."""
 import unittest
-from distutils.filelist import glob_to_re
+
+from distutils.filelist import glob_to_re, FileList
+from test.support import captured_stdout
+from distutils import debug
 
 class FileListTestCase(unittest.TestCase):
 
@@ -16,6 +19,22 @@ def test_glob_to_re(self):
         self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
         self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
 
+    def test_debug_print(self):
+        file_list = FileList()
+        with captured_stdout() as stdout:
+            file_list.debug_print('xxx')
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+
+        debug.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                file_list.debug_print('xxx')
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), 'xxx\n')
+        finally:
+            debug.DEBUG = False
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
diff --git a/tests/test_install.py b/tests/test_install.py
index d0ad5ce159..2087a0eba0 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -6,6 +6,8 @@
 import unittest
 import site
 
+from test.support import captured_stdout
+
 from distutils.command.install import install
 from distutils.command import install as install_module
 from distutils.command.install import INSTALL_SCHEMES
@@ -14,7 +16,6 @@
 
 from distutils.tests import support
 
-
 class InstallTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
@@ -183,6 +184,17 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        old_logs_len = len(self.logs)
+        install_module.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                self.test_record()
+        finally:
+            install_module.DEBUG = False
+        self.assertTrue(len(self.logs) > old_logs_len)
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 

From 0610698781fd21cdc3dd80eb45640e6da374a1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:23:35 +0000
Subject: [PATCH 2548/8469] improving distutils coverage

---
 tests/test_dist.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 75b74a2c28..553f30c748 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -9,6 +9,7 @@
 
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
+import distutils.dist
 
 from test.test_support import TESTFN, captured_stdout
 from distutils.tests import support
@@ -56,6 +57,27 @@ def create_distribution(self, configfiles=()):
         d.parse_command_line()
         return d
 
+    def test_debug_mode(self):
+        with open(TESTFN, "w") as f:
+            f.write("[global]")
+            f.write("command_packages = foo.bar, splat")
+
+        files = [TESTFN]
+        sys.argv.append("build")
+
+        with captured_stdout() as stdout:
+            self.create_distribution(files)
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+        distutils.dist.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                self.create_distribution(files)
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), '')
+        finally:
+            distutils.dist.DEBUG = False
+
     def test_command_packages_unspecified(self):
         sys.argv.append("build")
         d = self.create_distribution()

From 142d88152055c80f02ee268f73aca04424c8e676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:41:08 +0000
Subject: [PATCH 2549/8469] #6954: Fixed crash when using DISTUTILS_DEBUG flag
 in Distutils.

---
 dist.py            | 2 +-
 log.py             | 3 +++
 tests/test_dist.py | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index afed545d92..f49afcce13 100644
--- a/dist.py
+++ b/dist.py
@@ -359,7 +359,7 @@ def parse_config_files(self, filenames=None):
         parser = ConfigParser()
         for filename in filenames:
             if DEBUG:
-                self.announce("  reading", filename)
+                self.announce("  reading %s" % filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
diff --git a/log.py b/log.py
index 6f949d5179..758857081c 100644
--- a/log.py
+++ b/log.py
@@ -17,6 +17,9 @@ def __init__(self, threshold=WARN):
         self.threshold = threshold
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
+
         if level >= self.threshold:
             if args:
                 msg = msg % args
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 553f30c748..3d4b25f0fc 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -200,6 +200,13 @@ def test_get_command_packages(self):
         self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
 
 
+    def test_announce(self):
+        # make sure the level is known
+        dist = Distribution()
+        args = ('ok',)
+        kwargs = {'level': 'ok2'}
+        self.assertRaises(ValueError, dist.announce, args, kwargs)
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From 5b7317782101927604eb838784b8aab23c611b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:43:09 +0000
Subject: [PATCH 2550/8469] Merged revisions 74992 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74992 | tarek.ziade | 2009-09-21 15:23:35 +0200 (Mon, 21 Sep 2009) | 1 line

  improving distutils coverage
........
---
 tests/test_dist.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 9f795f4314..91297f0e15 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,6 +8,7 @@
 
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
+import distutils.dist
 
 from test.support import TESTFN, captured_stdout
 from distutils.tests import support
@@ -55,6 +56,27 @@ def create_distribution(self, configfiles=()):
         d.parse_command_line()
         return d
 
+    def test_debug_mode(self):
+        with open(TESTFN, "w") as f:
+            f.write("[global]")
+            f.write("command_packages = foo.bar, splat")
+
+        files = [TESTFN]
+        sys.argv.append("build")
+
+        with captured_stdout() as stdout:
+            self.create_distribution(files)
+        stdout.seek(0)
+        self.assertEquals(stdout.read(), '')
+        distutils.dist.DEBUG = True
+        try:
+            with captured_stdout() as stdout:
+                self.create_distribution(files)
+            stdout.seek(0)
+            self.assertEquals(stdout.read(), '')
+        finally:
+            distutils.dist.DEBUG = False
+
     def test_command_packages_unspecified(self):
         sys.argv.append("build")
         d = self.create_distribution()

From b620521f2e5b41994c054ca0ab7a361a41dab8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:49:57 +0000
Subject: [PATCH 2551/8469] forgot to commit a file in previous commit (r74994,
 issue #6954)

---
 tests/support.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index bce034949e..3c328cc9a6 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,6 +4,7 @@
 import tempfile
 
 from distutils import log
+from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 from test.test_support import EnvironmentVarGuard
 
@@ -25,6 +26,8 @@ def tearDown(self):
         super(LoggingSilencer, self).tearDown()
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):

From 6d4d4281a733ee9b1c6d622be50b14879947a3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:55:19 +0000
Subject: [PATCH 2552/8469] Merged revisions 74994,74997 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74994 | tarek.ziade | 2009-09-21 15:41:08 +0200 (Mon, 21 Sep 2009) | 1 line

  #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
........
  r74997 | tarek.ziade | 2009-09-21 15:49:57 +0200 (Mon, 21 Sep 2009) | 1 line

  forgot to commit a file in previous commit (r74994, issue #6954)
........
---
 dist.py            | 2 +-
 log.py             | 3 +++
 tests/support.py   | 3 +++
 tests/test_dist.py | 7 +++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index ac5a0ca012..1c1ea477db 100644
--- a/dist.py
+++ b/dist.py
@@ -354,7 +354,7 @@ def parse_config_files(self, filenames=None):
         parser = ConfigParser()
         for filename in filenames:
             if DEBUG:
-                self.announce("  reading", filename)
+                self.announce("  reading %s" % filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
diff --git a/log.py b/log.py
index 6f949d5179..758857081c 100644
--- a/log.py
+++ b/log.py
@@ -17,6 +17,9 @@ def __init__(self, threshold=WARN):
         self.threshold = threshold
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
+
         if level >= self.threshold:
             if args:
                 msg = msg % args
diff --git a/tests/support.py b/tests/support.py
index 1255413989..ea122111ca 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,6 +4,7 @@
 import tempfile
 
 from distutils import log
+from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 from test.support import EnvironmentVarGuard
 
@@ -25,6 +26,8 @@ def tearDown(self):
         super().tearDown()
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 91297f0e15..799b0c0603 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -171,6 +171,13 @@ def test_get_command_packages(self):
         self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
 
 
+    def test_announce(self):
+        # make sure the level is known
+        dist = Distribution()
+        args = ('ok',)
+        kwargs = {'level': 'ok2'}
+        self.assertRaises(ValueError, dist.announce, args, kwargs)
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From b55f637193312bf8e9c13b1b5a2c421147db1281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Sep 2009 13:59:07 +0000
Subject: [PATCH 2553/8469] Merged revisions 74999 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74999 | tarek.ziade | 2009-09-21 15:55:19 +0200 (Mon, 21 Sep 2009) | 13 lines

  Merged revisions 74994,74997 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74994 | tarek.ziade | 2009-09-21 15:41:08 +0200 (Mon, 21 Sep 2009) | 1 line

    #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
  ........
    r74997 | tarek.ziade | 2009-09-21 15:49:57 +0200 (Mon, 21 Sep 2009) | 1 line

    forgot to commit a file in previous commit (r74994, issue #6954)
  ........
................
---
 dist.py            | 2 +-
 log.py             | 3 +++
 tests/support.py   | 3 +++
 tests/test_dist.py | 7 +++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index ac5a0ca012..1c1ea477db 100644
--- a/dist.py
+++ b/dist.py
@@ -354,7 +354,7 @@ def parse_config_files(self, filenames=None):
         parser = ConfigParser()
         for filename in filenames:
             if DEBUG:
-                self.announce("  reading", filename)
+                self.announce("  reading %s" % filename)
             parser.read(filename)
             for section in parser.sections():
                 options = parser.options(section)
diff --git a/log.py b/log.py
index 6f949d5179..758857081c 100644
--- a/log.py
+++ b/log.py
@@ -17,6 +17,9 @@ def __init__(self, threshold=WARN):
         self.threshold = threshold
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
+
         if level >= self.threshold:
             if args:
                 msg = msg % args
diff --git a/tests/support.py b/tests/support.py
index 1255413989..ea122111ca 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -4,6 +4,7 @@
 import tempfile
 
 from distutils import log
+from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 from test.support import EnvironmentVarGuard
 
@@ -25,6 +26,8 @@ def tearDown(self):
         super().tearDown()
 
     def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 9f795f4314..70c9ec50e2 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -149,6 +149,13 @@ def test_get_command_packages(self):
         self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
 
 
+    def test_announce(self):
+        # make sure the level is known
+        dist = Distribution()
+        args = ('ok',)
+        kwargs = {'level': 'ok2'}
+        self.assertRaises(ValueError, dist.announce, args, kwargs)
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From b9c31d02ce197add682c4bb6ab7614f6bc9abf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 22 Sep 2009 10:08:13 +0000
Subject: [PATCH 2554/8469] Merged revisions 74812 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74812 | ronald.oussoren | 2009-09-15 23:24:07 +0200 (Tue, 15 Sep 2009) | 3 lines

  Update distutils.util tests after my changes
  to --with-universal-archs
........
---
 tests/test_util.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index e9065ff59c..84caea5cac 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -142,15 +142,35 @@ def test_get_platform(self):
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
+        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+
+        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
         self.assertEquals(get_platform(), 'macosx-10.4-universal')
 
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
         self.assertEquals(get_platform(), 'macosx-10.4-fat64')
 
+        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
+                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                           '-fno-strict-aliasing -fno-common '
+                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
+
+            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From 99db2f54d353469fd4b48398994461efbbf61dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 22 Sep 2009 10:14:51 +0000
Subject: [PATCH 2555/8469] Merged revisions 75013 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75013 | tarek.ziade | 2009-09-22 12:08:13 +0200 (Tue, 22 Sep 2009) | 10 lines

  Merged revisions 74812 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74812 | ronald.oussoren | 2009-09-15 23:24:07 +0200 (Tue, 15 Sep 2009) | 3 lines

    Update distutils.util tests after my changes
    to --with-universal-archs
  ........
................
---
 tests/test_util.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index c0acf5f481..795edb8cdc 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -115,15 +115,35 @@ def test_get_platform(self):
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
+        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+
+        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
         self.assertEquals(get_platform(), 'macosx-10.4-universal')
 
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
         self.assertEquals(get_platform(), 'macosx-10.4-fat64')
 
+        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
+                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                           '-fno-strict-aliasing -fno-common '
+                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
+
+            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From 7596dc0cf93965df85e36dcbca683270f5e9ded2 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 22 Sep 2009 17:25:53 +0200
Subject: [PATCH 2556/8469] Name changes of the parameters.

--HG--
branch : distribute
extra : rebase_source : fc921b526cda13b02a4bb0215f91ee04d03dca57
---
 distribute.egg-info/entry_points.txt |  8 ++++----
 docs/python3.txt                     | 24 ++++++++++++------------
 docs/setuptools.txt                  |  8 ++++----
 setup.py                             |  6 +++---
 setuptools/__init__.py               |  6 +-----
 setuptools/command/build_py.py       |  8 ++++----
 setuptools/command/test.py           |  4 ++--
 setuptools/dist.py                   |  6 +++---
 8 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 7d44c6be0a..a1ea4ecedd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -31,19 +31,19 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-additional_2to3_fixers = setuptools.dist:assert_string_list
 dependency_links = setuptools.dist:assert_string_list
 entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
-run_2to3 = setuptools.dist:assert_bool
 package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
 include_package_data = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
 namespace_packages = setuptools.dist:check_nsp
@@ -51,7 +51,7 @@ test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
 zip_safe = setuptools.dist:assert_bool
 test_loader = setuptools.dist:check_importable
-convert_doctests_2to3 = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
 
 [setuptools.installation]
diff --git a/docs/python3.txt b/docs/python3.txt
index 19a2b26853..9ae9573506 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -6,7 +6,7 @@ Starting with version 0.6.2, Distribute supports Python 3. Installing and
 using distribute for Python 3 code works exactly the same as for Python 2
 code, but Distribute also helps you to support Python 2 and Python 3 from
 the same source code by letting you run 2to3 on the code as a part of the
-build process. by setting the keyword parameter ``run_2to3`` to True.
+build process. by setting the keyword parameter ``use_2to3`` to True.
 
 
 Distrubute as help during porting
@@ -18,7 +18,7 @@ setup.py so that you can run the unit tests with ``python setup.py test``.
 
 See :ref:`test` for more information on this.
 
-Once you have the tests running under Python 2, you can add the run_2to3
+Once you have the tests running under Python 2, you can add the use_2to3
 keyword parameters to setup(), and start running the tests under Python 3.
 The test command will now first run the build command during which the code
 will be converted with 2to3, and the tests will then be run from the build
@@ -27,11 +27,11 @@ directory, as opposed from the source directory as is normally done.
 Distribute will convert all Python files, and also all doctests in Python
 files. However, if you have doctests located in separate text files, these
 will not automatically be converted. By adding them to the 
-``convert_doctests_2to3`` keyword parameter Distrubute will convert them as 
+``convert_2to3_doctests`` keyword parameter Distrubute will convert them as 
 well. 
 
 By default, the conversion uses all fixers in the ``lib2to3.fixers`` package.
-To use additional fixes, the parameter ``additional_2to3_fixers`` can be set
+To use additional fixes, the parameter ``use_2to3_fixers`` can be set
 to a list of names of packages containing fixers.
 
 A typical setup.py can look something like this::
@@ -46,9 +46,9 @@ A typical setup.py can look something like this::
             package_dir = {'': 'src'},
             packages = ['your', 'you.module'],
             test_suite = 'your.module.tests',
-            run_2to3 = True,
-            convert_doctests_2to3 = ['src/your/module/README.txt'],
-            additional_2to3_fixers = ['your.fixers']
+            use_2to3 = True,
+            convert_2to3_doctests = ['src/your/module/README.txt'],
+            use_2to3_fixers = ['your.fixers']
             )
 
 Differential conversion
@@ -59,7 +59,7 @@ if the source file has been changed. If you add a file to the doctests
 that should be converted, it will not be converted the next time you run
 the tests, since it hasn't been modified. You need to remove it from the 
 build directory. Also if you run the build, install or test commands before
-adding the run_2to3 parameter, you will have to remove the build directory
+adding the use_2to3 parameter, you will have to remove the build directory
 before you run the test command, as the files otherwise will seem updated, 
 and no conversion will happen.
 
@@ -84,7 +84,7 @@ list ``setuptools.commands.build_py.build_py.fixers``, which then contains the
 list of all fixer class names.
 
 If you don't want to run the 2to3 conversion on the doctests in Python files,
-you can turn that off by setting ``setuptools.run_2to3_on_doctests = False``.
+you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.
 
 Note on compatibility with setuptools
 =====================================
@@ -101,9 +101,9 @@ dict and pass that dict into setup()::
       
       extra = {}
       if sys.version_info >= (3,):
-          extra['run_2to3'] = True
-          extra['convert_doctests_2to3'] = ['src/your/module/README.txt']
-          extra['additional_2to3_fixers'] = ['your.fixers']
+          extra['use_2to3'] = True
+          extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
+          extra['use_2to3_fixers'] = ['your.fixers']
       
       setup(name='your.module',
             version = '1.0',
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d4c11a0f61..06f632ecc7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -404,16 +404,16 @@ unless you need the associated ``setuptools`` feature.
     mess with it.  For more details on how this argument works, see the section
     below on `Automatic Resource Extraction`_.
 
-``run_2to3``
+``use_2to3``
     Convert the source code from Python 2 to Python 3 with 2to3 during the 
     build process. See :doc:`python3` for more details.
 
-``convert_doctests_2to3``
+``convert_2to3_doctests``
     List of doctest source files that need to be converted with 2to3. 
     See :doc:`python3` for more details.
     
-``additional_2to3_fixers``
-    A list of modules to serach for additional fixers to be used during
+``use_2to3_fixers``
+    A list of modules to search for additional fixers to be used during
     the 2to3 conversion. See :doc:`python3` for more details.
 
 
diff --git a/setup.py b/setup.py
index a9a66918a0..65376bf93f 100755
--- a/setup.py
+++ b/setup.py
@@ -97,9 +97,9 @@ def _being_installed():
             "include_package_data   = setuptools.dist:assert_bool",
             "dependency_links       = setuptools.dist:assert_string_list",
             "test_loader            = setuptools.dist:check_importable",
-            "run_2to3               = setuptools.dist:assert_bool",
-            "convert_doctests_2to3  = setuptools.dist:assert_string_list",
-            "additional_2to3_fixers = setuptools.dist:assert_string_list",
+            "use_2to3               = setuptools.dist:assert_bool",
+            "convert_2to3_doctests  = setuptools.dist:assert_string_list",
+            "use_2to3_fixers = setuptools.dist:assert_string_list",
         ],
 
         "egg_info.writers": [
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ac5e6e5e3b..d03d0bf08b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -24,14 +24,10 @@
 
 bootstrap_install_from = None
 
-# Should we run 2to3 on all Python files, in Python 3.x?
-# Default: no; assume that a distribution installed for 3.x is already
-# written in 3.x
-run_2to3 = False # Default value if run_2to3 argument not given.
 # If we run 2to3 on .py files, should we also convert docstrings?
 # Default: yes; assume that we can detect doctests reliably
 run_2to3_on_doctests = True
-# Package names for fixer packages
+# Standard package names for fixer packages
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
 def find_packages(where='.', exclude=()):
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 910d67c8cb..a01e28430a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -23,7 +23,7 @@ class Mixin2to3(_Mixin2to3):
         def run_2to3(self, files, doctests = False):
             # See of the distribution option has been set, otherwise check the
             # setuptools default.
-            if self.distribution.run_2to3 is not True and setuptools.run_2to3 is False:
+            if self.distribution.use_2to3 is not True:
                 return
             if not files:
                 return
@@ -32,8 +32,8 @@ def run_2to3(self, files, doctests = False):
                 self.fixer_names = []
                 for p in setuptools.lib2to3_fixer_packages:
                     self.fixer_names.extend(get_fixers_from_package(p))
-                if self.distribution.additional_2to3_fixers is not None:
-                    for p in self.distribution.additional_2to3_fixers:
+                if self.distribution.use_2to3_fixers is not None:
+                    for p in self.distribution.use_2to3_fixers:
                         self.fixer_names.extend(get_fixers_from_package(p))
             if doctests:
                 if setuptools.run_2to3_on_doctests:
@@ -137,7 +137,7 @@ def build_package_data(self):
                 srcfile = os.path.join(src_dir, filename)
                 outf, copied = self.copy_file(srcfile, target)
                 srcfile = os.path.abspath(srcfile)
-                if copied and srcfile in self.distribution.convert_doctests_2to3:
+                if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 0f96e83ac1..b7aef9697a 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,4 +1,4 @@
-from setuptools import Command, run_2to3
+from setuptools import Command
 from distutils.errors import DistutilsOptionError
 import sys
 from pkg_resources import *
@@ -81,7 +81,7 @@ def finalize_options(self):
 
 
     def with_project_on_sys_path(self, func):
-        if getattr(self.distribution, 'run_2to3', run_2to3):
+        if getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 531c94f440..2246ab96dd 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -255,11 +255,11 @@ def finalize_options(self):
             if value is not None:
                 ep.require(installer=self.fetch_build_egg)
                 ep.load()(self, ep.name, value)
-        if getattr(self, 'convert_doctests_2to3', None):
+        if getattr(self, 'convert_2to3_doctests', None):
             # XXX may convert to set here when we can rely on set being builtin
-            self.convert_doctests_2to3 = [os.path.abspath(p) for p in self.convert_doctests_2to3]
+            self.convert_2to3_doctests = [os.path.abspath(p) for p in self.convert_2to3_doctests]
         else:
-            self.convert_doctests_2to3 = []
+            self.convert_2to3_doctests = []
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""

From 1502d7426ed56d8235426db13e6cda4f4609f8a4 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 22 Sep 2009 17:33:49 +0200
Subject: [PATCH 2557/8469] Fixed a bug that gave a traceback when doing
 install --help under Python 3.

--HG--
branch : distribute
extra : rebase_source : 9fcc8ddc5a2f8f57660d940375e1356c9a600ac3
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index fb27451851..69e62190d9 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -245,7 +245,7 @@ def _remove_flat_installation(placeholder):
 def after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
-    if not os.path.exists(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
         return
     pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])

From 4d3db0dfec6a8abe6a78b20fb311dda6228fd43f Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 22 Sep 2009 17:42:15 +0200
Subject: [PATCH 2558/8469] Wrong file mode when creating bdists under Python
 3.1.

--HG--
branch : distribute
extra : rebase_source : 3af8cc2ab10edeeeb75b03e1a63e8de008142176
---
 setuptools/command/install_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 00c8122114..dd95552e0b 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -87,7 +87,7 @@ def install_namespaces(self):
         filename += '-nspkg.pth'; self.outputs.append(filename)
         log.info("Installing %s",filename)
         if not self.dry_run:
-            f = open(filename,'wb')
+            f = open(filename,'wt')
             for pkg in nsp:
                 pth = tuple(pkg.split('.'))
                 trailer = '\n'

From 4c66627839fa1384e17f427eebf17adbc807376d Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 22 Sep 2009 19:27:44 +0000
Subject: [PATCH 2559/8469] Half of the fix for issue 6957: ensure that
 distutils ignores the '-isysroot' option on OSX when the corresponding SDK is
 not installed.

This ensures that the user can compile extensions
on OSX 10.6 using the Python.org installer and a
default installation of Xcode.
---
 sysconfig.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index dcc7231ac5..6ca6720adb 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -592,6 +592,29 @@ def get_config_vars(*args):
                         flags = flags + ' ' + arch
                         _config_vars[key] = flags
 
+                # If we're on OSX 10.5 or later and the user tries to
+                # compiles an extension using an SDK that is not present
+                # on the current machine it is better to not use an SDK
+                # than to fail.
+                #
+                # The major usecase for this is users using a Python.org
+                # binary installer  on OSX 10.6: that installer uses
+                # the 10.4u SDK, but that SDK is not installed by default
+                # when you install Xcode.
+                #
+                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
+                if m is not None:
+                    sdk = m.group(1)
+                    if not os.path.exists(sdk):
+                        for key in ('LDFLAGS', 'BASECFLAGS',
+                             # a number of derived variables. These need to be
+                             # patched up as well.
+                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                            flags = _config_vars[key]
+                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
+                            _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:

From f7a196298b22da695467cb9494743ce15683fca2 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 22 Sep 2009 19:31:34 +0000
Subject: [PATCH 2560/8469] Merged revisions 75022 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75022 | ronald.oussoren | 2009-09-22 21:27:44 +0200 (Tue, 22 Sep 2009) | 8 lines

  Half of the fix for issue 6957: ensure that distutils
  ignores the '-isysroot' option on OSX when the
  corresponding SDK is not installed.

  This ensures that the user can compile extensions
  on OSX 10.6 using the Python.org installer and a
  default installation of Xcode.
........
---
 sysconfig.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 6f99de28e3..8306202fb3 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -566,6 +566,29 @@ def get_config_vars(*args):
                         flags = flags + ' ' + arch
                         _config_vars[key] = flags
 
+                # If we're on OSX 10.5 or later and the user tries to
+                # compiles an extension using an SDK that is not present
+                # on the current machine it is better to not use an SDK
+                # than to fail.
+                #
+                # The major usecase for this is users using a Python.org
+                # binary installer  on OSX 10.6: that installer uses
+                # the 10.4u SDK, but that SDK is not installed by default
+                # when you install Xcode.
+                #
+                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
+                if m is not None:
+                    sdk = m.group(1)
+                    if not os.path.exists(sdk):
+                        for key in ('LDFLAGS', 'BASECFLAGS',
+                             # a number of derived variables. These need to be
+                             # patched up as well.
+                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                            flags = _config_vars[key]
+                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
+                            _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:

From e7932397a19380975ae6401d2f13f2f5d6ddb716 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Wed, 23 Sep 2009 01:57:24 +0300
Subject: [PATCH 2561/8469] PEP8 fixes

--HG--
branch : distribute
extra : rebase_source : ff3b0f50ec60054fd05b809edf77740ff7b506ec
---
 distribute_setup.py | 154 ++++++++++++++++++++++++--------------------
 1 file changed, 84 insertions(+), 70 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index fb27451851..e7630695f9 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -22,12 +22,27 @@
 import os
 import time
 import fnmatch
-from distutils import log
+import tempfile
+import tarfile
 import subprocess
+from distutils import log
+
 
 IS_JYTHON = sys.platform.startswith('java')
 DEFAULT_VERSION = "0.6.2"
-DEFAULT_URL     = "http://pypi.python.org/packages/source/d/distribute/"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: 0.6c9
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+"""
+
 
 def quote(c):
     if sys.platform == 'win32':
@@ -35,6 +50,7 @@ def quote(c):
             return '"%s"' % c
     return c
 
+
 def python_cmd(cmd):
     python = quote(sys.executable)
     cmd = quote(cmd)
@@ -43,6 +59,7 @@ def python_cmd(cmd):
     args = [os.P_WAIT, python, python] + cmd.split() + [os.environ]
     return os.spawnle(*args) == 0
 
+
 def _install(tarball):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
@@ -65,6 +82,7 @@ def _install(tarball):
     finally:
         os.chdir(old_wd)
 
+
 def _build_egg(tarball, to_dir=os.curdir):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
@@ -94,6 +112,7 @@ def _build_egg(tarball, to_dir=os.curdir):
     finally:
         os.chdir(old_wd)
 
+
 def _do_download(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                  to_dir=os.curdir, download_delay=15):
     tarball = download_setuptools(version, download_base,
@@ -103,11 +122,11 @@ def _do_download(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     import setuptools
     setuptools.bootstrap_install_from = egg
 
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15
-):
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15):
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
     try:
         import pkg_resources
         if not hasattr(pkg_resources, '_distribute'):
@@ -115,15 +134,15 @@ def use_setuptools(
     except ImportError:
         return _do_download(version, download_base, to_dir, download_delay)
     try:
-        pkg_resources.require("distribute>="+version); return
+        pkg_resources.require("distribute>="+version)
+        return
     except pkg_resources.VersionConflict, e:
         if was_imported:
             print >>sys.stderr, (
             "The required version of distribute (>=%s) is not available, and\n"
             "can't be installed while this script is running. Please install\n"
             " a more recent version first, using 'easy_install -U distribute'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
+            "\n\n(Currently using %r)") % (version, e.args[0])
             sys.exit(2)
         else:
             del pkg_resources, sys.modules['pkg_resources']    # reload ok
@@ -131,16 +150,16 @@ def use_setuptools(
     except pkg_resources.DistributionNotFound:
         return _do_download(version, download_base, to_dir, download_delay)
 
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay=15,
-):
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
     """Download distribute from a specified location and return its filename
 
     `version` should be a valid distribute version number that is available
     as an egg for download under the `download_base` URL (which should end
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
     """
     import urllib2
     tgz_name = "distribute-%s.tar.gz" % version
@@ -149,7 +168,6 @@ def download_setuptools(
     src = dst = None
     if not os.path.exists(saveto):  # Avoid repeated downloads
         try:
-            from distutils import log
             log.warn("Downloading %s", url)
             src = urllib2.urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
@@ -165,18 +183,6 @@ def download_setuptools(
     return os.path.realpath(saveto)
 
 
-SETUPTOOLS_PKG_INFO  = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: 0.6c9
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-"""
-
 def _patch_file(path, content):
     """Will backup the file then patch it"""
     existing_content = open(path).read()
@@ -193,9 +199,11 @@ def _patch_file(path, content):
         f.close()
     return True
 
+
 def _same_content(path, content):
     return open(path).read() == content
 
+
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s' % (path, new_name))
@@ -210,6 +218,7 @@ def _violation(*args):
     os.rename(path, new_name)
     return new_name
 
+
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s' % placeholder)
@@ -242,6 +251,7 @@ def _remove_flat_installation(placeholder):
                      'Setuptools distribution' % element)
     return True
 
+
 def after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
@@ -268,6 +278,7 @@ def after_install(dist):
     finally:
         f.close()
 
+
 def _patch_egg_dir(path):
     # let's check if it's already patched
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
@@ -286,10 +297,12 @@ def _patch_egg_dir(path):
         f.close()
     return True
 
+
 def before_install():
     log.warn('Before install bootstrap.')
     fake_setuptools()
 
+
 def _under_prefix(location):
     if 'install' not in sys.argv:
         return True
@@ -307,6 +320,7 @@ def _under_prefix(location):
                 return location.startswith(USER_SITE)
     return True
 
+
 def fake_setuptools():
     log.warn('Scanning installed packages')
     try:
@@ -352,63 +366,63 @@ def fake_setuptools():
     log.warn('Patched done.')
     _relaunch()
 
+
 def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
-    args = [sys.executable]  + sys.argv
+    args = [sys.executable] + sys.argv
     if IS_JYTHON:
         sys.exit(subprocess.call(args))
     else:
         sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))
 
-import tempfile
-import tarfile
 
 def extractall(self, path=".", members=None):
-        """Extract all members from the archive to the current working
-           directory and set owner, modification time and permissions on
-           directories afterwards. `path' specifies a different directory
-           to extract to. `members' is optional and must be a subset of the
-           list returned by getmembers().
-        """
-        import copy
-        import operator
-        from tarfile import ExtractError
-        directories = []
-
-        if members is None:
-            members = self
-
-        for tarinfo in members:
-            if tarinfo.isdir():
-                # Extract directories with a safe mode.
-                directories.append(tarinfo)
-                tarinfo = copy.copy(tarinfo)
-                tarinfo.mode = 0700
-            self.extract(tarinfo, path)
-
-        # Reverse sort directories.
-        directories.sort(key=operator.attrgetter('name'))
-        directories.reverse()
-
-        # Set correct owner, mtime and filemode on directories.
-        for tarinfo in directories:
-            dirpath = os.path.join(path, tarinfo.name)
-            try:
-                self.chown(tarinfo, dirpath)
-                self.utime(tarinfo, dirpath)
-                self.chmod(tarinfo, dirpath)
-            except ExtractError, e:
-                if self.errorlevel > 1:
-                    raise
-                else:
-                    self._dbg(1, "tarfile: %s" % e)
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    directories.sort(key=operator.attrgetter('name'))
+    directories.reverse()
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError, e:
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
 
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     tarball = download_setuptools()
     _install(tarball)
 
+
 if __name__ == '__main__':
     main(sys.argv[1:])
-

From f6611f2dd63baa7d7dad127d23cdcc4a6487802e Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Wed, 23 Sep 2009 02:02:24 +0300
Subject: [PATCH 2562/8469] Convert string template arguments in logger calls
 to logger arguments

--HG--
branch : distribute
extra : rebase_source : 1b7daa92fb9bd814a4028ec9d51774bfbeff41f3
---
 distribute_setup.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e7630695f9..e8a1f2913b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -63,7 +63,7 @@ def python_cmd(cmd):
 def _install(tarball):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s' % tmpdir)
+    log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
@@ -74,7 +74,7 @@ def _install(tarball):
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
         os.chdir(subdir)
-        log.warn('Now working in %s' % subdir)
+        log.warn('Now working in %s', subdir)
 
         # installing
         log.warn('Installing Distribute')
@@ -86,7 +86,7 @@ def _install(tarball):
 def _build_egg(tarball, to_dir=os.curdir):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s' % tmpdir)
+    log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
@@ -97,10 +97,10 @@ def _build_egg(tarball, to_dir=os.curdir):
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
         os.chdir(subdir)
-        log.warn('Now working in %s' % subdir)
+        log.warn('Now working in %s', subdir)
 
         # building an egg
-        log.warn('Building a Distribute egg in %s' % to_dir)
+        log.warn('Building a Distribute egg in %s', to_dir)
         python_cmd('setup.py -q bdist_egg --dist-dir %s' % to_dir)
 
         # returning the result
@@ -206,7 +206,7 @@ def _same_content(path, content):
 
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s into %s' % (path, new_name))
+    log.warn('Renaming %s into %s', path, new_name)
     try:
         from setuptools.sandbox import DirectorySandbox
         def _violation(*args):
@@ -221,7 +221,7 @@ def _violation(*args):
 
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
-        log.warn('Unkown installation at %s' % placeholder)
+        log.warn('Unkown installation at %s', placeholder)
         return False
     found = False
     for file in os.listdir(placeholder):
@@ -239,7 +239,7 @@ def _remove_flat_installation(placeholder):
             patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
 
     if not patched:
-        log.warn('%s already patched.' % pkg_info)
+        log.warn('%s already patched.', pkg_info)
         return False
     # now let's move the files out of the way
     for element in ('setuptools', 'pkg_resources.py', 'site.py'):
@@ -248,7 +248,7 @@ def _remove_flat_installation(placeholder):
             _rename_path(element)
         else:
             log.warn('Could not find the %s element of the '
-                     'Setuptools distribution' % element)
+                     'Setuptools distribution', element)
     return True
 
 
@@ -262,16 +262,16 @@ def after_install(dist):
     setuptools_file = 'setuptools-0.6c9-py%s.egg-info' % pyver
     pkg_info = os.path.join(placeholder, setuptools_file)
     if os.path.exists(pkg_info):
-        log.warn('%s already exists' % pkg_info)
+        log.warn('%s already exists', pkg_info)
         return
-    log.warn('Creating %s' % pkg_info)
+    log.warn('Creating %s', pkg_info)
     f = open(pkg_info, 'w')
     try:
         f.write(SETUPTOOLS_PKG_INFO)
     finally:
         f.close()
     pth_file = os.path.join(placeholder, 'setuptools.pth')
-    log.warn('Creating %s' % pth_file)
+    log.warn('Creating %s', pth_file)
     f = open(pth_file, 'w')
     try:
         f.write(os.path.join(os.curdir, setuptools_file))
@@ -284,7 +284,7 @@ def _patch_egg_dir(path):
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
     if os.path.exists(pkg_info):
         if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
-            log.warn('%s already patched.' % pkg_info)
+            log.warn('%s already patched.', pkg_info)
             return False
     _rename_path(path)
     os.mkdir(path)
@@ -336,7 +336,7 @@ def fake_setuptools():
         return
     # detecting if it was already faked
     setuptools_location = setuptools_dist.location
-    log.warn('Setuptools installation detected at %s' % setuptools_location)
+    log.warn('Setuptools installation detected at %s', setuptools_location)
 
     # if --root or --preix was provided, and if
     # setuptools is not located in them, we don't patch it

From 2e5e7b750801a07eed519303d95799f0760b576b Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Wed, 23 Sep 2009 02:35:15 +0300
Subject: [PATCH 2563/8469] Get rid of the ugly Jython hack since the
 subprocess module is now always available

--HG--
branch : distribute
extra : rebase_source : 029d8b3ffa7c7ed71ae2fcae0cfb969624cc67d0
---
 distribute_setup.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e8a1f2913b..836869320b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -28,7 +28,6 @@
 from distutils import log
 
 
-IS_JYTHON = sys.platform.startswith('java')
 DEFAULT_VERSION = "0.6.2"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
@@ -54,10 +53,7 @@ def quote(c):
 def python_cmd(cmd):
     python = quote(sys.executable)
     cmd = quote(cmd)
-    if IS_JYTHON:
-        return subprocess.Popen([python, cmd]).wait() == 0
-    args = [os.P_WAIT, python, python] + cmd.split() + [os.environ]
-    return os.spawnle(*args) == 0
+    return subprocess.call([python, cmd])
 
 
 def _install(tarball):
@@ -371,10 +367,7 @@ def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
     args = [sys.executable] + sys.argv
-    if IS_JYTHON:
-        sys.exit(subprocess.call(args))
-    else:
-        sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))
+    sys.exit(subprocess.call(args))
 
 
 def extractall(self, path=".", members=None):

From 269f12efa9ac5640bb9ad4a79c26e77c66f1a950 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Wed, 23 Sep 2009 03:10:40 +0300
Subject: [PATCH 2564/8469] Fix python_cmd return value

--HG--
branch : distribute
extra : rebase_source : 09f20b70ead91373507168c66a1f709a4eaba4f5
---
 distribute_setup.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 836869320b..e099b37b86 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -43,17 +43,9 @@
 """
 
 
-def quote(c):
-    if sys.platform == 'win32':
-        if ' ' in c:
-            return '"%s"' % c
-    return c
-
-
-def python_cmd(cmd):
-    python = quote(sys.executable)
-    cmd = quote(cmd)
-    return subprocess.call([python, cmd])
+def python_cmd(*args):
+    args = (sys.executable,) + args
+    return subprocess.call(args) == 0
 
 
 def _install(tarball):
@@ -74,7 +66,7 @@ def _install(tarball):
 
         # installing
         log.warn('Installing Distribute')
-        assert python_cmd('setup.py install')
+        assert python_cmd('setup.py', 'install')
     finally:
         os.chdir(old_wd)
 

From dea50c23d3d3f68f0dcd7bcf8a81b163a2c4e1c0 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 23 Sep 2009 09:50:14 +0200
Subject: [PATCH 2565/8469] Merging.

--HG--
branch : distribute
extra : rebase_source : 47f74854f8677234b45cf13c5ce6517c0eeb8358
---
 distribute.egg-info/entry_points.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index a1ea4ecedd..4bbb6848df 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -7,6 +7,7 @@ build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -31,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.4 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 758eba50d92348b0f1ba43a2e6ee3a842f49ffed Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Thu, 24 Sep 2009 12:59:56 +0200
Subject: [PATCH 2566/8469] Apparently a __ne__ method is necessary, at least
 under Python 2.4, or you risk having both Distr1 == Distr2 be True, while
 Distr1 != Distr2 is also True.

--HG--
branch : distribute
extra : rebase_source : 3128c7105c4fdabd1bfceb105ca57cfb371eacec
---
 pkg_resources.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 7c3d58fbe9..4babb48e49 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2064,6 +2064,8 @@ def __eq__(self, other):
             # It's not a Distribution, so they are not equal
             return False
         return self.hashcmp == other.hashcmp
+    def __ne__(self, other):
+        return not self == other
 
     # These properties have to be lazy so that we don't have to load any
     # metadata until/unless it's actually needed.  (i.e., some distributions

From efa78ba0a0e1f89b92da4fa0fa6e5e029efecf3f Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Fri, 25 Sep 2009 22:01:27 +0300
Subject: [PATCH 2567/8469] Fix script launcher creation on 64-bit Windows,
 patch by Jason R. Coombs (http://bugs.python.org/setuptools/issue2)

--HG--
branch : distribute
extra : rebase_source : 60c07b0639b77a3e8ff13eb12161ebe03ab47430
---
 launcher.c                         |  14 +++++++++++---
 msvc-build-launcher.cmd            |  15 +++++++++++++++
 setuptools/cli-32.exe              | Bin 0 -> 65536 bytes
 setuptools/cli-64.exe              | Bin 0 -> 74240 bytes
 setuptools/cli.exe                 | Bin 6656 -> 0 bytes
 setuptools/command/easy_install.py |   5 +++--
 setuptools/gui-32.exe              | Bin 0 -> 65536 bytes
 setuptools/gui-64.exe              | Bin 0 -> 74240 bytes
 setuptools/gui.exe                 | Bin 7168 -> 0 bytes
 9 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 msvc-build-launcher.cmd
 create mode 100644 setuptools/cli-32.exe
 create mode 100644 setuptools/cli-64.exe
 delete mode 100755 setuptools/cli.exe
 create mode 100644 setuptools/gui-32.exe
 create mode 100644 setuptools/gui-64.exe
 delete mode 100755 setuptools/gui.exe

diff --git a/launcher.c b/launcher.c
index c8022505f4..0dca2e168b 100755
--- a/launcher.c
+++ b/launcher.c
@@ -25,8 +25,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <process.h>
 #include <fcntl.h>
+#include "tchar.h"
 #include "windows.h"
 
 int fail(char *format, char *data) {
@@ -236,11 +237,18 @@ int run(int argc, char **argv, int is_gui) {
     }
 
     /* We *do* need to wait for a CLI to finish, so use spawn */
-    return spawnv(P_WAIT, ptr, (const char * const *)(newargs));
+    return _spawnv(_P_WAIT, ptr, (const char * const *)(newargs));
 }
 
-
+/*
 int WINAPI WinMain(HINSTANCE hI, HINSTANCE hP, LPSTR lpCmd, int nShow) {
     return run(__argc, __argv, GUI);
 }
 
+*/
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	return run(argc, argv, GUI);
+}
+
diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
new file mode 100644
index 0000000000..3666d723a8
--- /dev/null
+++ b/msvc-build-launcher.cmd
@@ -0,0 +1,15 @@
+@echo off
+
+REM VCVARSALL may be in Program Files or Program Files (x86)
+PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC;%PATH%
+PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC;%PATH%
+
+REM set up the environment to compile to x86
+call VCVARSALL x86
+cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/cli-32.exe
+cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /out:setuptools/gui-32.exe
+
+REM now for 64-bit
+call VCVARSALL x86_amd64
+cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/cli-64.exe
+cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /out:setuptools/gui-64.exe
\ No newline at end of file
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..dd63bbfcd647ae38f6670df57937fcffacd2bd06
GIT binary patch
literal 65536
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
H=z;$OkJaYk

literal 0
HcmV?d00001

diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..cc7ced507f4bddb38dad3093514e3b58b469dbc3
GIT binary patch
literal 74240
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
a&jN~0tN05PolXfau!X1D<xu}8zyAl_3HsUq

literal 0
HcmV?d00001

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
deleted file mode 100755
index 3173b2b21dd54f1008d0a1046418eefb5f9c2989..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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
UXq{){dQbD+cNwb_z<<B}1906e#{d8T

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 195139c711..4b03e18529 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1603,13 +1603,14 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                 ")\n"
             ) % locals()
             if sys.platform=='win32' or wininst:
+                word_size = [32, 64]['amd64' in sys.version.lower()]
                 # On Windows/wininst, add a .py extension and an .exe launcher
                 if group=='gui_scripts':
-                    ext, launcher = '-script.pyw', 'gui.exe'
+                    ext, launcher = '-script.pyw', 'gui-%d.exe' % word_size
                     old = ['.pyw']
                     new_header = re.sub('(?i)python.exe','pythonw.exe',header)
                 else:
-                    ext, launcher = '-script.py', 'cli.exe'
+                    ext, launcher = '-script.py', 'cli-%d.exe' % word_size
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
 
diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..718382079bd3eb24ebec9f10a12ccdc279c13ac6
GIT binary patch
literal 65536
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
IzoQ5K59B51SpWb4

literal 0
HcmV?d00001

diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..7fbfb88973f21f7e2314e0634bd006b4cc39689f
GIT binary patch
literal 74240
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

literal 0
HcmV?d00001

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
deleted file mode 100755
index 53d4ff81af0e50b1996de048db0726d561613809..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7168
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
Kq7%UXy!{J*@{wZz


From 5c6e640a15aacaaa551f2e2ce0b8b94ebb42ef2a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 25 Sep 2009 23:34:18 +0200
Subject: [PATCH 2568/8469] make the bootstrap file py2.3+win32 compatible

--HG--
branch : distribute
extra : rebase_source : d75b734c889c3d23ad4df95066745d0d76588813
---
 distribute_setup.py | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 3ed5bfb89b..4fe048753b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -13,20 +13,38 @@
 
 This file can also be run as a script to install or upgrade setuptools.
 """
-try:
-    from site import USER_SITE
-except ImportError:
-    USER_SITE = None
-
-import sys
 import os
+import sys
 import time
 import fnmatch
 import tempfile
 import tarfile
-import subprocess
 from distutils import log
 
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
 DEFAULT_VERSION = "0.6.2"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
@@ -43,11 +61,6 @@
 """
 
 
-def python_cmd(*args):
-    args = (sys.executable,) + args
-    return subprocess.call(args) == 0
-
-
 def _install(tarball):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
@@ -386,7 +399,9 @@ def extractall(self, path=".", members=None):
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
-    directories.sort(key=operator.attrgetter('name'))
+    def sorter(dir1, dir2):
+        return cmp(dir1.name, dir2.name)
+    directories.sort(sorter)
     directories.reverse()
 
     # Set correct owner, mtime and filemode on directories.

From 65c13cb2b3bcadd2e69f8032a32ef9fbbac6b3df Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 00:00:21 +0200
Subject: [PATCH 2569/8469] reorganized texts

--HG--
branch : distribute
extra : rebase_source : 82617065dd28e25a4f293e83d9c81a6cb1b56720
---
 CONTRIBUTORS.txt | 13 ++++++++
 README.txt       | 86 ++++++++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 36 deletions(-)
 create mode 100644 CONTRIBUTORS.txt

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
new file mode 100644
index 0000000000..c4a84b702a
--- /dev/null
+++ b/CONTRIBUTORS.txt
@@ -0,0 +1,13 @@
+============
+Contributors
+============
+
+* Alex Grönholm
+* Hanno Schlichting
+* Lennart Regebro
+* Martin von Loewis
+* Philip Envey
+* Tarek Ziadé
+
+If you think you name is missing, please add it (alpha order by first name)
+
diff --git a/README.txt b/README.txt
index 7adc47d888..30fb7ee200 100755
--- a/README.txt
+++ b/README.txt
@@ -11,10 +11,24 @@ Disclaimers
 About the fork
 ==============
 
-`Distribute` is a friendly fork of the `Setuptools` project. The `Setuptools`
-maintainer, Phillip J. Eby is not responsible of any aspect of this fork.
+`Distribute` is a fork of the `Setuptools` project.
 
-If you install `Distribute` and want to switch back for any reason to 
+Distribute is intended to replace Setuptools as the standard method
+for working with Python module distributions.
+
+The fork has two goals:
+
+- Provides a backward compatible version to replace Setuptools 
+  and make all distributions that depend on Setuptools work as
+  before, but with less bugs and behavior issues.
+  This version is also compatible with Python 3.
+
+  This work is done in the 0.6.x series
+
+- Refactor the code, and release it in several distributions.
+  This work is done in the 0.7.x series but not yet released.
+
+If you install `Distribute` and want to switch back for any reason to
 `Setuptools`, get to the `Uninstallation instructions`_ section.
 
 About the installation process
@@ -37,8 +51,9 @@ Installation Instructions
 
 Distribute is only released as a source distribution.
 
-It can be installed using easy_install or pip, with the source tarball, with the
-eggs distribution, or using the ``distribute_setup.py`` script provided online.
+It can be installed using easy_install or pip, and can be done so with the source
+tarball, the eggs distribution, or by using the ``distribute_setup.py`` script
+provided online.
 
 ``distribute_setup.py`` is the simplest and preferred way on all systems.
 
@@ -48,7 +63,7 @@ distribute_setup.py
 Download ``distribute_setup.py`` and execute it, using the Python interpreter of
 your choice.
 
-If your shell has the `wget` program you can do::
+If your shell has the ``wget`` program you can do::
 
     $ wget http://nightly.ziade.org/distribute_setup.py
     $ python distribute_setup.py
@@ -64,11 +79,11 @@ Run easy_install or pip::
 Source installation
 ===================
 
-Download the source tarball, and uncompress it, then run the install command::
+Download the source tarball, uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.2.tar.gz
-    $ tar -xzvf distribute-0.6.2.tar.gz
-    $ cd distribute-0.6.2
+    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.1.tar.gz
+    $ tar -xzvf distribute-0.6.1.tar.gz
+    $ cd distribute-0.6
     $ python setup.py install
 
 ---------------------------
@@ -76,29 +91,29 @@ Uninstallation Instructions
 ---------------------------
 
 Like other distutils-based distributions, Distribute doesn't provide an 
-uninstaller yet. It's all manual !
+uninstaller yet. It's all done manually!
 
 Distribute is installed in three steps:
 
-1- it gets out of the way an existing installation of Setuptools
-2- it installs a `fake` setuptools installation 
-3- it installs distribute
+1. it gets out of the way an existing installation of Setuptools
+2. it installs a `fake` setuptools installation 
+3. it installs distribute
 
 Distribute can be removed like this:
 
-- run `easy_install -m Distribute`. This will remove the Distribute reference
-  from `easy-install.pth` *or* edit the file and remove it yourself.
-- remove the distribute*.egg file located in your site-packages directory
-- remove the setuptools.pth file located in you site-packages directory
-- remove the easy_install script located in you sys.prefix/bin directory
-- remove the setuptools*.egg directory located in your site-packages directory
+- run ``easy_install -m Distribute``. This will remove the Distribute reference
+  from ``easy-install.pth``. Otherwise, edit the file and remove it yourself.
+- remove the ``distribute*.egg`` file located in your site-packages directory
+- remove the ``setuptools.pth`` file located in you site-packages directory
+- remove the easy_install script located in you ``sys.prefix/bin`` directory
+- remove the ``setuptools*.egg`` directory located in your site-packages directory,
   if any.
 
 If you want to get back to setuptools:
 
 - reinstall setuptools using its instruction.
 
-Last:
+Lastly:
 
 - remove the *.OLD.* directory located in your site-packages directory if any,
   **once you have checked everything was working correctly again**.
@@ -107,7 +122,7 @@ Last:
 Install FAQ
 -----------
 
-- **Why Distribute turn my Setuptools installation into an fake one ?**
+- **Why Distribute turn my Setuptools installation into an fake one?**
 
    Since Distribute is a fork, and since it provides the same package and modules,
    it fakes that the Setuptools installation is still present, so all the programs
@@ -116,7 +131,7 @@ Install FAQ
    If it wasn't doing it, a program that would try to install Setuptools 
    would overwrite in turn Distribute.
 
-- **How does Distribute interacts with virtualenv ?**
+- **How does Distribute interacts with virtualenv?**
 
   Everytime you create a virtualenv it will install setuptools, so you need to
   re-install Distribute in it right after. The Distribute project will not
@@ -131,25 +146,24 @@ Install FAQ
   You need in this case to build a virtualenv with the --no-site-packages option
   or to install `Distribute` globally.
 
-- **How does Distribute interacts with zc.buildout ?**
+- **How does Distribute interact with zc.buildout?**
+
+  Some work is being done on zc.buildout side to make its bootstrap
+  work with Distribute. Until then, using Distribute in zc.buildout is a bit 
+  tricky.
 
   Like virtualenv, Distribute has to be installed after setuptools. The simplest
-  way is to add it in a `zc.recipe.egg` section so the job is done when you 
+  way is to add it in a ``zc.recipe.egg`` section so the job is done when you 
   build your buildout.
 
   If you are combining zc.buildout and virtualenv, you might fail in the 
   problem described in the previous FAQ entry.
 
-  Last, you will need to use the provided special `bootstrap.py` file,
-  located in the buildout directory.
-
--------
-Credits
--------
+-----------------------------
+Feedback and getting involved
+-----------------------------
 
-* Tarek Ziadé
-* Hanno Schlichting
-* Many other people that helped on Distutils-SIG (please add your name here)
-* Phillip Eby for the Setuptools project. 
+- Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig
+- Issue tracker: http://bitbucket.org/tarek/distribute/issues/
+- Code Repository: http://bitbucket.org/tarek/distribute
 
- 

From 5730c613a0e6c6581145d508203446f11a0cb4a9 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 00:07:45 +0200
Subject: [PATCH 2570/8469] removed the salesy description

--HG--
branch : distribute
extra : rebase_source : 3382727121c2d8c2c07d464556803077e2b257e8
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 65376bf93f..fc4a9c6ad1 100755
--- a/setup.py
+++ b/setup.py
@@ -59,8 +59,8 @@ def _being_installed():
 dist = setup(
     name="distribute",
     version=VERSION,
-    description="Download, build, install, upgrade, and uninstall Python "
-        "packages -- easily!",
+    description="Easily download, build, install, upgrade, and uninstall "
+                "Python packages",
     author="The fellowship of the packaging",
     author_email="distutils-sig@python.org",
     license="PSF or ZPL",

From c7799d0af7ea2926821097e27baa730d5582c26c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 00:46:43 +0200
Subject: [PATCH 2571/8469] started a dev guide for contributors

--HG--
branch : distribute
extra : rebase_source : 9592be3b368bdc8765c15f5030fff4e69de46e6b
---
 DEVGUIDE.txt | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 DEVGUIDE.txt

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
new file mode 100644
index 0000000000..df25947343
--- /dev/null
+++ b/DEVGUIDE.txt
@@ -0,0 +1,28 @@
+============================
+Quick notes for contributors
+============================
+
+Distribute is using Mercurial. 
+
+Grab the code at bitbucket::
+
+
+    $ hg clone https://tarek@bitbucket.org/tarek/distribute distribute
+    
+If you want to work in the 0.6 branch, you have to switch to it::
+
+    $ hg branch 0.6-maintenance
+    marked working directory as branch 0.6-maintenance
+    
+    $ hg branch
+    0.6-maintenance
+
+If you make some changes, don't forget to:
+
+- backport it to the 0.7 branch
+- add a note in CHANGES.txt
+
+And remember that 0.6 is only bug fixes, and the APIs should
+be fully backward compatible with Setuptools.
+
+

From f00b7464e93706770fba6b891dd9f7e979acb623 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sat, 26 Sep 2009 19:46:11 +0300
Subject: [PATCH 2572/8469] Documented major changes in 0.6.2

--HG--
branch : distribute
extra : rebase_source : 4e4c362c3d59494907c4abc025af02cbe98546fb
---
 CHANGES.txt | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2574300aa1..9dfa80cfb1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,9 +9,24 @@ CHANGES
 setuptools
 ==========
 
+* Added Python 3 support.
+  This closes http://bugs.python.org/setuptools/issue39.
+
+* Added option to run 2to3 automatically when installing on Python 3.
+  This closes http://bitbucket.org/tarek/distribute/issue/31.
+
 * Fixed invalid usage of requirement.parse, that broke develop -d.
-  closed http://bugs.python.org/setuptools/issue44.
+  This closes http://bugs.python.org/setuptools/issue44.
+
+* Fixed script launcher for 64-bit Windows.
+  This closes http://bugs.python.org/setuptools/issue2.
+
+
+bootstraping
+============
 
+* Fixed bootstrap not working on Windows.
+  This closes http://bitbucket.org/tarek/distribute/issue/49.
 
 -----
 0.6.1

From ca17b4f5b4022392bb7013ea493b77fdc576509e Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sat, 26 Sep 2009 19:48:40 +0300
Subject: [PATCH 2573/8469] Fixed a spelling error

--HG--
branch : distribute
extra : rebase_source : 61228c1424382a1ab8305bacd6ed26fce300a8da
---
 CHANGES.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9dfa80cfb1..63a422fd12 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,8 +22,8 @@ setuptools
   This closes http://bugs.python.org/setuptools/issue2.
 
 
-bootstraping
-============
+bootstrapping
+=============
 
 * Fixed bootstrap not working on Windows.
   This closes http://bitbucket.org/tarek/distribute/issue/49.
@@ -52,8 +52,8 @@ setuptools
   bootstrap.py script.
 
 
-bootstraping
-============
+bootstrapping
+=============
 
 * The boostrap process leave setuptools alone if detected in the system
   and --root or --prefix is provided, but is not in the same location.

From 7b5cc0aaf4e8ca3dc6374f697f10be6288281950 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 19:58:09 +0200
Subject: [PATCH 2574/8469] more doc

--HG--
branch : distribute
extra : rebase_source : c8b0a440a80186f80a27d798b5bc4f5f536c88ee
---
 CHANGES.txt      |  2 +-
 README.txt       | 23 ++++++++++++++++++-----
 docs/python3.txt |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 63a422fd12..acb45439cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,7 @@ CHANGES
 setuptools
 ==========
 
-* Added Python 3 support.
+* Added Python 3 support. see docs/python3.txt
   This closes http://bugs.python.org/setuptools/issue39.
 
 * Added option to run 2to3 automatically when installing on Python 3.
diff --git a/README.txt b/README.txt
index 30fb7ee200..204ff092a6 100755
--- a/README.txt
+++ b/README.txt
@@ -18,19 +18,32 @@ for working with Python module distributions.
 
 The fork has two goals:
 
-- Provides a backward compatible version to replace Setuptools 
+- Providing a backward compatible version to replace Setuptools 
   and make all distributions that depend on Setuptools work as
-  before, but with less bugs and behavior issues.
-  This version is also compatible with Python 3.
+  before, but with less bugs and behaviorial issues.
 
   This work is done in the 0.6.x series
 
-- Refactor the code, and release it in several distributions.
-  This work is done in the 0.7.x series but not yet released.
+  Starting with version 0.6.2, Distribute supports Python 3. 
+  Installing and using distribute for Python 3 code works exactly 
+  the same as for Python 2 code, but Distribute also helps you to support 
+  Python 2 and Python 3 from the same source code by letting you run 2to3 
+  on the code as a part of the build process, by setting the keyword parameter 
+  ``use_2to3`` to True. See docs/python3.txt for more information.
+
+- Refactoring the code, and releasing it in several distributions.
+  This work is being done in the 0.7.x series but not yet released.
 
 If you install `Distribute` and want to switch back for any reason to
 `Setuptools`, get to the `Uninstallation instructions`_ section.
 
+More documentation
+==================
+
+You can get more information in the Sphinx-based documentation, located
+in the archive in `docs`. This documentation includes the old Setuptools
+documentation that is slowly replaced, and brand new content.
+
 About the installation process
 ==============================
 
diff --git a/docs/python3.txt b/docs/python3.txt
index 9ae9573506..9b5fa7972c 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -6,10 +6,10 @@ Starting with version 0.6.2, Distribute supports Python 3. Installing and
 using distribute for Python 3 code works exactly the same as for Python 2
 code, but Distribute also helps you to support Python 2 and Python 3 from
 the same source code by letting you run 2to3 on the code as a part of the
-build process. by setting the keyword parameter ``use_2to3`` to True.
+build process, by setting the keyword parameter ``use_2to3`` to True.
 
 
-Distrubute as help during porting
+Distribute as help during porting
 =================================
 
 Distribute can make the porting process much easier by automatically running

From 2f2ef4a897642dda08a95e4544d05b4012850dcd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:04:11 +0200
Subject: [PATCH 2575/8469] more changes

--HG--
branch : distribute
extra : rebase_source : 3c3037afbc1b3467650b99bcf56c1598464fb45e
---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index acb45439cf..15adb6a47d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,8 @@ setuptools
 * Fixed script launcher for 64-bit Windows.
   This closes http://bugs.python.org/setuptools/issue2.
 
+* KeyError when compiling extensions.
+  This closes http://bugs.python.org/setuptools/issue41.
 
 bootstrapping
 =============
@@ -28,6 +30,12 @@ bootstrapping
 * Fixed bootstrap not working on Windows.
   This closes http://bitbucket.org/tarek/distribute/issue/49.
 
+* Fixed 2.6 dependencies.
+  This closes http://bitbucket.org/tarek/distribute/issue/50.
+
+* Make sure setuptools is patched when running through easy_install
+  This closes http://bugs.python.org/setuptools/issue40.
+
 -----
 0.6.1
 -----

From 775967de5b20d48a50f2ca050a87d8fa4890170d Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:12:50 +0200
Subject: [PATCH 2576/8469] this is not finished yet. lets make a clean work
 for 0.6.3 for zc.buildout support

--HG--
branch : distribute
extra : rebase_source : 39abb9d72dc676082ce0337453efe20884936dd5
---
 README.txt | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 204ff092a6..3ee5b58cfa 100755
--- a/README.txt
+++ b/README.txt
@@ -162,15 +162,12 @@ Install FAQ
 - **How does Distribute interact with zc.buildout?**
 
   Some work is being done on zc.buildout side to make its bootstrap
-  work with Distribute. Until then, using Distribute in zc.buildout is a bit 
-  tricky.
+  work with Distribute. Until then, using Distribute in zc.buildout is a bit
+  tricky because the bootstrap process of zc.buildout hardcodes the 
+  installation of Setuptools.
 
-  Like virtualenv, Distribute has to be installed after setuptools. The simplest
-  way is to add it in a ``zc.recipe.egg`` section so the job is done when you 
-  build your buildout.
-
-  If you are combining zc.buildout and virtualenv, you might fail in the 
-  problem described in the previous FAQ entry.
+  The plan is to come with a working bootstrap.py for zc.buildout for the
+  0.6.3 release.
 
 -----------------------------
 Feedback and getting involved

From 0906b2d312d39b4b957cc3196b0b2935873f55a7 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:14:03 +0200
Subject: [PATCH 2577/8469] typo

--HG--
branch : distribute
extra : rebase_source : 46cfa8ad9c0fba6bfdce61960ce97d85b473eae4
---
 README.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index 3ee5b58cfa..bd3e081f6d 100755
--- a/README.txt
+++ b/README.txt
@@ -159,15 +159,16 @@ Install FAQ
   You need in this case to build a virtualenv with the --no-site-packages option
   or to install `Distribute` globally.
 
-- **How does Distribute interact with zc.buildout?**
+- **How does Distribute interacts with zc.buildout?**
 
   Some work is being done on zc.buildout side to make its bootstrap
   work with Distribute. Until then, using Distribute in zc.buildout is a bit
-  tricky because the bootstrap process of zc.buildout hardcodes the 
+  tricky because the bootstrap process of zc.buildout hardcodes the
   installation of Setuptools.
 
-  The plan is to come with a working bootstrap.py for zc.buildout for the
-  0.6.3 release.
+  The plan is to come with a custom bootstrap.py for zc.buildout for the
+  0.6.3 release, together with some small changes on zc.buildout side.
+
 
 -----------------------------
 Feedback and getting involved

From 610e31a405f1129651ef5df3bcf0721ceec3076c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:15:07 +0200
Subject: [PATCH 2578/8469] Added tag 0.6.2 for changeset 41415244ee90

--HG--
branch : distribute
extra : rebase_source : 8fb22bb7a961241842e6460b18bef7a3d137eb86
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ff5a2353b8..113ea91cd6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,2 +1,3 @@
 1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6
 4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1
+41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2

From 7cdf5f6c30168ddc2a0bfbc321e75ef254e719b6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:20:03 +0200
Subject: [PATCH 2579/8469] starting 0.6.3 development

--HG--
branch : distribute
extra : rebase_source : 2854b62a13986569c1ad9773c54c73eb62025f70
---
 CHANGES.txt                          | 6 ++++++
 distribute.egg-info/entry_points.txt | 3 +--
 distribute_setup.py                  | 2 +-
 release.sh                           | 4 ++--
 setup.py                             | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 15adb6a47d..c236c98e28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.6.3
+-----
+
+
+
 -----
 0.6.2
 -----
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 4bbb6848df..d18df33807 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -7,7 +7,6 @@ build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
-upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -32,7 +31,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.4 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 4fe048753b..d88e0ebb92 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.2"
+DEFAULT_VERSION = "0.6.3"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/release.sh b/release.sh
index 6af72616b8..467a1c2418 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.2"
+export VERSION="0.6.3"
 
 # creating the releases
 rm -rf dist
@@ -7,6 +7,6 @@ rm -rf dist
 # now preparing the source release
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 
-# pushin the bootstrap script
+# pushing the bootstrap script
 scp distribute_setup.py ziade.org:nightly/build/
 
diff --git a/setup.py b/setup.py
index fc4a9c6ad1..04f81ca8d8 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.2"
+VERSION = "0.6.3"
 
 from setuptools import setup, find_packages
 import sys

From c6026b93269fa497df2c55a3d8e05b431cd5b974 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 26 Sep 2009 20:43:52 +0200
Subject: [PATCH 2580/8469] fixed the version in README

--HG--
branch : distribute
extra : rebase_source : 042246c75eb4b39525d7861123661c2d39685f9e
---
 README.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index bd3e081f6d..a8d1a85ee4 100755
--- a/README.txt
+++ b/README.txt
@@ -94,8 +94,8 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.1.tar.gz
-    $ tar -xzvf distribute-0.6.1.tar.gz
+    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.3.tar.gz
+    $ tar -xzvf distribute-0.6.3.tar.gz
     $ cd distribute-0.6
     $ python setup.py install
 

From ceb63ce0341593a12ed0064ea616e6418ccffd21 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 27 Sep 2009 01:08:46 +0300
Subject: [PATCH 2581/8469] Fixed Python 3 compatibility issue introduced in
 #435

--HG--
branch : distribute
extra : rebase_source : 6b45a12ed6d990d6a6b2bf25e9bb2bca53fbd5c6
---
 distribute_setup.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index d88e0ebb92..b5cce268fc 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -399,10 +399,13 @@ def extractall(self, path=".", members=None):
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
-    def sorter(dir1, dir2):
-        return cmp(dir1.name, dir2.name)
-    directories.sort(sorter)
-    directories.reverse()
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
 
     # Set correct owner, mtime and filemode on directories.
     for tarinfo in directories:

From 3f06b14ae21d70149f4f404f2d9d82f3842c23dc Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 27 Sep 2009 01:12:15 +0300
Subject: [PATCH 2582/8469] Changed file() calls to open() calls

--HG--
branch : distribute
extra : rebase_source : a2567f3f28d896dd0abbbed8a2626cc4ecb3e44e
---
 pkg_resources.py              | 2 +-
 setuptools/command/develop.py | 2 +-
 setuptools/package_index.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4babb48e49..d0e840b867 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1676,7 +1676,7 @@ def find_on_path(importer, path_item, only=False):
                     for dist in find_distributions(os.path.join(path_item, entry)):
                         yield dist
                 elif not only and lower.endswith('.egg-link'):
-                    for line in file(os.path.join(path_item, entry)):
+                    for line in open(os.path.join(path_item, entry)):
                         if not line.strip(): continue
                         for item in find_distributions(os.path.join(path_item,line.rstrip())):
                             yield item
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 3288805647..5643c77341 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -105,7 +105,7 @@ def install_for_development(self):
     def uninstall_link(self):
         if os.path.exists(self.egg_link):
             log.info("Removing %s (link to %s)", self.egg_link, self.egg_base)
-            contents = [line.rstrip() for line in file(self.egg_link)]
+            contents = [line.rstrip() for line in open(self.egg_link)]
             if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
                 log.warn("Link points to %s: uninstall aborted", contents)
                 return
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 084370d530..98799de535 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -241,7 +241,7 @@ def scan_egg_links(self, search_path):
                         self.scan_egg_link(item, entry)
 
     def scan_egg_link(self, path, entry):
-        lines = filter(None, map(str.strip, file(os.path.join(path, entry))))
+        lines = filter(None, map(str.strip, open(os.path.join(path, entry))))
         if len(lines)==2:
             for dist in find_distributions(os.path.join(path, lines[0])):
                 dist.location = os.path.join(path, *lines)

From 652fa7853d69e6f8ea043657603b09f660758924 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 27 Sep 2009 05:07:16 +0300
Subject: [PATCH 2583/8469] Added 0.6.3 changes

--HG--
branch : distribute
extra : rebase_source : f543e9cd782a3dee79a92756853efac5eb15551a
---
 CHANGES.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c236c98e28..9244400299 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,15 @@ CHANGES
 0.6.3
 -----
 
+setuptools
+==========
+
+* Fixed a bunch of calls to file() that caused crashes on Python 3.
+
+bootstrapping
+=============
 
+* Fixed a bug in sorting that caused bootstrap to fail on Python 3.
 
 -----
 0.6.2
@@ -15,7 +23,7 @@ CHANGES
 setuptools
 ==========
 
-* Added Python 3 support. see docs/python3.txt
+* Added Python 3 support; see docs/python3.txt.
   This closes http://bugs.python.org/setuptools/issue39.
 
 * Added option to run 2to3 automatically when installing on Python 3.

From ca0acdd53dbcb49e0f2c2f6c78c0312a2e304bce Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 27 Sep 2009 04:17:58 +0200
Subject: [PATCH 2584/8469] Added tag 0.6.3 for changeset e033bf2d3d05

--HG--
branch : distribute
extra : rebase_source : 125bc1d7d1a7e3ff8b1b8f78c7d5d7023379e7a6
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 113ea91cd6..dc3dfd6b69 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +1,4 @@
 1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6
 4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1
 41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2
+e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3

From 893c3f0078debd2585eb847a547b1748133417ab Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 27 Sep 2009 04:22:10 +0200
Subject: [PATCH 2585/8469] starting 0.6.4

--HG--
branch : distribute
extra : rebase_source : c36bab6b9c5d0134caef0a0cbf7cdbe79ec781d7
---
 CHANGES.txt         | 6 ++++++
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9244400299..d59d26ef20 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.6.4
+-----
+
+
+
 -----
 0.6.3
 -----
diff --git a/README.txt b/README.txt
index a8d1a85ee4..ef089646c0 100755
--- a/README.txt
+++ b/README.txt
@@ -94,8 +94,8 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.3.tar.gz
-    $ tar -xzvf distribute-0.6.3.tar.gz
+    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.4.tar.gz
+    $ tar -xzvf distribute-0.6.4.tar.gz
     $ cd distribute-0.6
     $ python setup.py install
 
@@ -167,7 +167,7 @@ Install FAQ
   installation of Setuptools.
 
   The plan is to come with a custom bootstrap.py for zc.buildout for the
-  0.6.3 release, together with some small changes on zc.buildout side.
+  0.6.4 release, together with some small changes on zc.buildout side.
 
 
 -----------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index b5cce268fc..e54b0ca0db 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.3"
+DEFAULT_VERSION = "0.6.4"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/release.sh b/release.sh
index 467a1c2418..555499ef1b 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.3"
+export VERSION="0.6.4"
 
 # creating the releases
 rm -rf dist
diff --git a/setup.py b/setup.py
index 04f81ca8d8..7f6cbdf6bf 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.3"
+VERSION = "0.6.4"
 
 from setuptools import setup, find_packages
 import sys

From 5668686f465e2c5c5a8facdb2ef444f93c56fd39 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 27 Sep 2009 04:37:35 +0200
Subject: [PATCH 2586/8469] added a note on distribute_setup_3k.py

--HG--
branch : distribute
extra : rebase_source : d1bfb9649c4d1b70eafbde5c5ea507232e13b899
---
 README.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.txt b/README.txt
index ef089646c0..d130cf90cc 100755
--- a/README.txt
+++ b/README.txt
@@ -81,6 +81,11 @@ If your shell has the ``wget`` program you can do::
     $ wget http://nightly.ziade.org/distribute_setup.py
     $ python distribute_setup.py
 
+If you are under Python 3, use ``distribute_setup_3k.py``::
+
+    $ wget http://nightly.ziade.org/distribute_setup_3k.py
+    $ python distribute_setup_3k.py
+
 easy_install or pip
 ===================
 

From 7964e7bcb02c1ad2e5c92be71db53a1f9a66cf6d Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 27 Sep 2009 07:48:26 +0300
Subject: [PATCH 2587/8469] Fixed two bugs in the bootstrapper that prevented
 use_setuptools() from working

--HG--
branch : distribute
extra : rebase_source : 63a606c73788fce5a09a8a423efd25a9804422d7
---
 distribute_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e54b0ca0db..44fe35a43d 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -102,12 +102,12 @@ def _build_egg(tarball, to_dir=os.curdir):
 
         # building an egg
         log.warn('Building a Distribute egg in %s', to_dir)
-        python_cmd('setup.py -q bdist_egg --dist-dir %s' % to_dir)
+        python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
 
         # returning the result
         for file in os.listdir(to_dir):
             if fnmatch.fnmatch(file, 'distribute-%s*.egg' % DEFAULT_VERSION):
-                return os.path.join(to_dir, file)
+                return os.path.join(subdir, file)
 
         raise IOError('Could not build the egg.')
     finally:

From 93663d98ca27e93e6ed76eb85d4753b630623834 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 27 Sep 2009 20:38:59 +0200
Subject: [PATCH 2588/8469] some function don't need public exposition + fixed
 the os.curdir bug that was breaking use_setuptools

--HG--
branch : distribute
extra : rebase_source : 20788bf4396fabb49e7292611f1125bf2bdc2b29
---
 distribute_setup.py | 29 ++++++++++++++++-------------
 setup.py            |  8 ++++----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 44fe35a43d..dcea856ecc 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -29,13 +29,13 @@
 try:
     import subprocess
 
-    def python_cmd(*args):
+    def _python_cmd(*args):
         args = (sys.executable,) + args
         return subprocess.call(args) == 0
 
 except ImportError:
     # will be used for python 2.3
-    def python_cmd(*args):
+    def _python_cmd(*args):
         args = (sys.executable,) + args
         # quoting arguments if windows
         if sys.platform == 'win32':
@@ -69,7 +69,7 @@ def _install(tarball):
     try:
         os.chdir(tmpdir)
         tar = tarfile.open(tarball)
-        extractall(tar)
+        _extractall(tar)
         tar.close()
 
         # going in the directory
@@ -79,12 +79,12 @@ def _install(tarball):
 
         # installing
         log.warn('Installing Distribute')
-        assert python_cmd('setup.py', 'install')
+        assert _python_cmd('setup.py', 'install')
     finally:
         os.chdir(old_wd)
 
 
-def _build_egg(tarball, to_dir=os.curdir):
+def _build_egg(tarball, to_dir):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
@@ -92,7 +92,7 @@ def _build_egg(tarball, to_dir=os.curdir):
     try:
         os.chdir(tmpdir)
         tar = tarfile.open(tarball)
-        extractall(tar)
+        _extractall(tar)
         tar.close()
 
         # going in the directory
@@ -102,20 +102,19 @@ def _build_egg(tarball, to_dir=os.curdir):
 
         # building an egg
         log.warn('Building a Distribute egg in %s', to_dir)
-        python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
 
         # returning the result
         for file in os.listdir(to_dir):
             if fnmatch.fnmatch(file, 'distribute-%s*.egg' % DEFAULT_VERSION):
-                return os.path.join(subdir, file)
+                return os.path.join(to_dir, file)
 
         raise IOError('Could not build the egg.')
     finally:
         os.chdir(old_wd)
 
 
-def _do_download(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                 to_dir=os.curdir, download_delay=15):
+def _do_download(version, download_base, to_dir, download_delay):
     tarball = download_setuptools(version, download_base,
                                   to_dir, download_delay)
     egg = _build_egg(tarball, to_dir)
@@ -126,6 +125,8 @@ def _do_download(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                    to_dir=os.curdir, download_delay=15):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
         'setuptools' in sys.modules
     try:
@@ -162,6 +163,8 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     `delay` is the number of seconds to pause before an actual download
     attempt.
     """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
     import urllib2
     tgz_name = "distribute-%s.tar.gz" % version
     url = download_base + tgz_name
@@ -253,7 +256,7 @@ def _remove_flat_installation(placeholder):
     return True
 
 
-def after_install(dist):
+def _after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
     if not placeholder or not os.path.exists(placeholder):
@@ -299,7 +302,7 @@ def _patch_egg_dir(path):
     return True
 
 
-def before_install():
+def _before_install():
     log.warn('Before install bootstrap.')
     fake_setuptools()
 
@@ -375,7 +378,7 @@ def _relaunch():
     sys.exit(subprocess.call(args))
 
 
-def extractall(self, path=".", members=None):
+def _extractall(self, path=".", members=None):
     """Extract all members from the archive to the current working
        directory and set owner, modification time and permissions on
        directories afterwards. `path' specifies a different directory
diff --git a/setup.py b/setup.py
index 7f6cbdf6bf..fcd85eb2bc 100755
--- a/setup.py
+++ b/setup.py
@@ -53,8 +53,8 @@ def _being_installed():
     return 'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
-    from distribute_setup import before_install
-    before_install()
+    from distribute_setup import _before_install
+    _before_install()
 
 dist = setup(
     name="distribute",
@@ -142,7 +142,7 @@ def _being_installed():
 )
 
 if _being_installed():
-    from distribute_setup import after_install
-    after_install(dist)
+    from distribute_setup import _after_install
+    _after_install(dist)
 
 

From 93ec26e2fde1f0a28c5ada2ee9a5323dd92de5c7 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 27 Sep 2009 20:45:58 +0200
Subject: [PATCH 2589/8469] fixed the test

--HG--
branch : distribute
extra : rebase_source : baa02e55e21c112f8ebef178ec7c54fd998f93ea
---
 tests/test_distribute_setup.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 76f8f8fa17..4c9079a79d 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -9,8 +9,9 @@
 TOPDIR = os.path.split(CURDIR)[0]
 sys.path.insert(0, TOPDIR)
 
-from distribute_setup import (use_setuptools, _build_egg, python_cmd,
-                              _do_download, _install)
+from distribute_setup import (use_setuptools, _build_egg, _python_cmd,
+                              _do_download, _install, DEFAULT_URL,
+                              DEFAULT_VERSION)
 import distribute_setup
 
 class TestSetup(unittest.TestCase):
@@ -23,8 +24,8 @@ def setUp(self):
         self.cwd = os.getcwd()
         self.tmpdir = tempfile.mkdtemp()
         os.chdir(TOPDIR)
-        python_cmd("setup.py -q egg_info -RDb '' sdist --dist-dir %s" % \
-                self.tmpdir)
+        _python_cmd("setup.py", "-q", "egg_info", "-RDb", "''", "sdist",
+                    "--dist-dir", "%s" % self.tmpdir)
         tarball = os.listdir(self.tmpdir)[0]
         self.tarball = os.path.join(self.tmpdir, tarball)
         import urllib2
@@ -46,7 +47,7 @@ def test_build_egg(self):
 
     def test_do_download(self):
         tmpdir = tempfile.mkdtemp()
-        _do_download(to_dir=tmpdir)
+        _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1)
         import setuptools
         self.assert_(setuptools.bootstrap_install_from.startswith(tmpdir))
 

From 9c216a69630f8d8dfdf3365e5d26fe47b313b7ee Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 29 Sep 2009 22:41:09 +0000
Subject: [PATCH 2590/8469] Bumping for 2.6.3rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index ba926063e1..c8787040e2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.2"
+__version__ = "2.6.3rc1"
 #--end constants--

From 4d101962a4b4069c967df29bdea6e0be5e8071fd Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 1 Oct 2009 23:39:49 +0000
Subject: [PATCH 2591/8469] Bump to 2.6.3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c8787040e2..fd52b8d7c5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.3rc1"
+__version__ = "2.6.3"
 #--end constants--

From e63325c644493b2d2a9cb352ea8a254d96e9dacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 2 Oct 2009 22:37:51 +0000
Subject: [PATCH 2592/8469] fixed the distutils tests that were not writing in
 temp

---
 tests/test_config.py | 10 +++++-----
 tests/test_sdist.py  | 42 +++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index cae7689884..23291da819 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -49,13 +49,14 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
+        super(PyPIRCCommandTestCase, self).setUp()
         if os.environ.has_key('HOME'):
             self._old_home = os.environ['HOME']
         else:
             self._old_home = None
-        curdir = os.path.dirname(__file__)
-        os.environ['HOME'] = curdir
-        self.rc = os.path.join(curdir, '.pypirc')
+        tempdir = self.mkdtemp()
+        os.environ['HOME'] = tempdir
+        self.rc = os.path.join(tempdir, '.pypirc')
         self.dist = Distribution()
 
         class command(PyPIRCCommand):
@@ -74,9 +75,8 @@ def tearDown(self):
             del os.environ['HOME']
         else:
             os.environ['HOME'] = self._old_home
-        if os.path.exists(self.rc):
-            os.remove(self.rc)
         set_threshold(self.old_threshold)
+        super(PyPIRCCommandTestCase, self).tearDown()
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 59c24fd433..e322c1385c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -12,9 +12,6 @@
 from distutils.errors import DistutilsExecError
 from distutils.spawn import find_executable
 
-CURDIR = os.path.dirname(__file__)
-TEMP_PKG = join(CURDIR, 'temppkg')
-
 SETUP_PY = """
 from distutils.core import setup
 import somecode
@@ -31,25 +28,24 @@ class sdistTestCase(PyPIRCCommandTestCase):
     def setUp(self):
         super(sdistTestCase, self).setUp()
         self.old_path = os.getcwd()
+        self.temp_pkg = os.path.join(self.mkdtemp(), 'temppkg')
 
     def tearDown(self):
         os.chdir(self.old_path)
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
         super(sdistTestCase, self).tearDown()
 
     def _init_tmp_pkg(self):
-        if os.path.exists(TEMP_PKG):
-            shutil.rmtree(TEMP_PKG)
-        os.mkdir(TEMP_PKG)
-        os.mkdir(join(TEMP_PKG, 'somecode'))
-        os.mkdir(join(TEMP_PKG, 'dist'))
+        if os.path.exists(self.temp_pkg):
+            shutil.rmtree(self.temp_pkg)
+        os.mkdir(self.temp_pkg)
+        os.mkdir(join(self.temp_pkg, 'somecode'))
+        os.mkdir(join(self.temp_pkg, 'dist'))
         # creating a MANIFEST, a package, and a README
-        self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN)
-        self._write(join(TEMP_PKG, 'README'), 'xxx')
-        self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#')
-        self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY)
-        os.chdir(TEMP_PKG)
+        self._write(join(self.temp_pkg, 'MANIFEST.in'), MANIFEST_IN)
+        self._write(join(self.temp_pkg, 'README'), 'xxx')
+        self._write(join(self.temp_pkg, 'somecode', '__init__.py'), '#')
+        self._write(join(self.temp_pkg, 'setup.py'), SETUP_PY)
+        os.chdir(self.temp_pkg)
 
     def _write(self, path, content):
         f = open(path, 'w')
@@ -65,15 +61,15 @@ def test_prune_file_list(self):
         self._init_tmp_pkg()
 
         # creating VCS directories with some files in them
-        os.mkdir(join(TEMP_PKG, 'somecode', '.svn'))
-        self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx')
+        os.mkdir(join(self.temp_pkg, 'somecode', '.svn'))
+        self._write(join(self.temp_pkg, 'somecode', '.svn', 'ok.py'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.hg'))
-        self._write(join(TEMP_PKG, 'somecode', '.hg',
+        os.mkdir(join(self.temp_pkg, 'somecode', '.hg'))
+        self._write(join(self.temp_pkg, 'somecode', '.hg',
                          'ok'), 'xxx')
 
-        os.mkdir(join(TEMP_PKG, 'somecode', '.git'))
-        self._write(join(TEMP_PKG, 'somecode', '.git',
+        os.mkdir(join(self.temp_pkg, 'somecode', '.git'))
+        self._write(join(self.temp_pkg, 'somecode', '.git',
                          'ok'), 'xxx')
 
         # now building a sdist
@@ -96,7 +92,7 @@ def test_prune_file_list(self):
         cmd.run()
 
         # now let's check what we have
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.temp_pkg, 'dist')
         files = os.listdir(dist_folder)
         self.assertEquals(files, ['fake-1.0.zip'])
 
@@ -137,7 +133,7 @@ def test_make_distribution(self):
         cmd.run()
 
         # making sure we have two files
-        dist_folder = join(TEMP_PKG, 'dist')
+        dist_folder = join(self.temp_pkg, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
         self.assertEquals(result,

From 55b356b15ea7b45da30f7147e7825e6c3bdd7e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 2 Oct 2009 23:49:48 +0000
Subject: [PATCH 2593/8469] #6516 added owner/group support for tarfiles in
 Distutils

---
 archive_util.py            | 72 ++++++++++++++++++++++++++++++++++----
 cmd.py                     |  9 ++---
 command/bdist.py           | 13 +++++++
 command/bdist_dumb.py      | 13 +++++--
 command/sdist.py           |  9 ++++-
 tests/test_archive_util.py | 63 +++++++++++++++++++++++++++++++--
 tests/test_sdist.py        | 54 ++++++++++++++++++++++++++++
 7 files changed, 218 insertions(+), 15 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 62150b0ddd..75318eba61 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -14,15 +14,55 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
+try:
+    from pwd import getpwnam
+except AttributeError:
+    getpwnam = None
+
+try:
+    from grp import getgrnam
+except AttributeError:
+    getgrnam = None
+
+def _get_gid(name):
+    """Returns a gid, given a group name."""
+    if getgrnam is None or name is None:
+        return None
+    try:
+        result = getgrnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def _get_uid(name):
+    """Returns an uid, given a user name."""
+    if getpwnam is None or name is None:
+        return None
+    try:
+        result = getpwnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
+                 owner=None, group=None):
     """Create a (possibly compressed) tar file from all the files under
     'base_dir'.
 
     'compress' must be "gzip" (the default), "compress", "bzip2", or None.
-    Both "tar" and the compression utility named by 'compress' must be on
-    the default program search path, so this is probably Unix-specific.
+    (compress will be deprecated in Python 3.2)
+
+    'owner' and 'group' can be used to define an owner and a group for the
+    archive that is being built. If not provided, the current owner and group
+    will be used.
+
     The output tar file will be named 'base_dir' +  ".tar", possibly plus
     the appropriate compression extension (".gz", ".bz2" or ".Z").
+
     Returns the output filename.
     """
     tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
@@ -44,10 +84,23 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     import tarfile  # late import so Python build itself doesn't break
 
     log.info('Creating tar archive')
+
+    uid = _get_uid(owner)
+    gid = _get_gid(group)
+
+    def _set_uid_gid(tarinfo):
+        if gid is not None:
+            tarinfo.gid = gid
+            tarinfo.gname = group
+        if uid is not None:
+            tarinfo.uid = uid
+            tarinfo.uname = owner
+        return tarinfo
+
     if not dry_run:
         tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
         try:
-            tar.add(base_dir)
+            tar.add(base_dir, filter=_set_uid_gid)
         finally:
             tar.close()
 
@@ -138,7 +191,7 @@ def check_archive_formats(formats):
     return None
 
 def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
-                 dry_run=0):
+                 dry_run=0, owner=None, group=None):
     """Create an archive file (eg. zip or tar).
 
     'base_name' is the name of the file to create, minus any format-specific
@@ -151,6 +204,9 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     ie. 'base_dir' will be the common prefix of all files and
     directories in the archive.  'root_dir' and 'base_dir' both default
     to the current directory.  Returns the name of the archive file.
+
+    'owner' and 'group' are used when creating a tar archive. By default,
+    uses the current owner and group.
     """
     save_cwd = os.getcwd()
     if root_dir is not None:
@@ -172,8 +228,12 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
-    filename = apply(func, (base_name, base_dir), kwargs)
 
+    if format != 'zip':
+        kwargs['owner'] = owner
+        kwargs['group'] = group
+
+    filename = apply(func, (base_name, base_dir), kwargs)
     if root_dir is not None:
         log.debug("changing back to '%s'", save_cwd)
         os.chdir(save_cwd)
diff --git a/cmd.py b/cmd.py
index 869258babb..dc40c14d61 100644
--- a/cmd.py
+++ b/cmd.py
@@ -385,10 +385,11 @@ def spawn (self, cmd, search_path=1, level=1):
         from distutils.spawn import spawn
         spawn(cmd, search_path, dry_run= self.dry_run)
 
-    def make_archive (self, base_name, format,
-                      root_dir=None, base_dir=None):
-        return archive_util.make_archive(
-            base_name, format, root_dir, base_dir, dry_run=self.dry_run)
+    def make_archive(self, base_name, format, root_dir=None, base_dir=None,
+                     owner=None, group=None):
+        return archive_util.make_archive(base_name, format, root_dir,
+                                         base_dir, dry_run=self.dry_run,
+                                         owner=owner, group=group)
 
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
diff --git a/command/bdist.py b/command/bdist.py
index ec3375e5c4..8e0ad080b9 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -40,6 +40,12 @@ class bdist(Command):
                      "[default: dist]"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['skip-build']
@@ -81,6 +87,8 @@ def initialize_options(self):
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
+        self.group = None
+        self.owner = None
 
     def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
@@ -126,6 +134,11 @@ def run(self):
             if cmd_name not in self.no_format_option:
                 sub_cmd.format = self.formats[i]
 
+            # passing the owner and group names for tar archiving
+            if cmd_name == 'bdist_dumb':
+                sub_cmd.owner = self.owner
+                sub_cmd.group = self.group
+
             # If we're going to need to run this command again, tell it to
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 3ab0330f83..358a70eacf 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -36,6 +36,12 @@ class bdist_dumb (Command):
                     ('relative', None,
                      "build the archive using relative paths"
                      "(default: false)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['keep-temp', 'skip-build', 'relative']
@@ -53,6 +59,8 @@ def initialize_options (self):
         self.dist_dir = None
         self.skip_build = 0
         self.relative = 0
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.bdist_dir is None:
@@ -71,7 +79,7 @@ def finalize_options(self):
                                    ('dist_dir', 'dist_dir'),
                                    ('plat_name', 'plat_name'))
 
-    def run (self):
+    def run(self):
         if not self.skip_build:
             self.run_command('build')
 
@@ -110,7 +118,8 @@ def run (self):
 
         # Make the archive
         filename = self.make_archive(pseudoinstall_root,
-                                     self.format, root_dir=archive_root)
+                                     self.format, root_dir=archive_root,
+                                     owner=self.owner, group=self.group)
         if self.distribution.has_ext_modules():
             pyversion = get_python_version()
         else:
diff --git a/command/sdist.py b/command/sdist.py
index c21f3917b6..5c74e5329f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -74,6 +74,10 @@ def checking_metadata(self):
         ('medata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
+        ('owner=', 'u',
+         "Owner name used when creating a tar file [default: current user]"),
+        ('group=', 'g',
+         "Group name used when creating a tar file [default: current group]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
@@ -113,6 +117,8 @@ def initialize_options(self):
 
         self.archive_files = None
         self.metadata_check = 1
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.manifest is None:
@@ -455,7 +461,8 @@ def make_distribution(self):
             self.formats.append(self.formats.pop(self.formats.index('tar')))
 
         for fmt in self.formats:
-            file = self.make_archive(base_name, fmt, base_dir=base_dir)
+            file = self.make_archive(base_name, fmt, base_dir=base_dir,
+                                     owner=self.owner, group=self.group)
             archive_files.append(file)
             self.distribution.dist_files.append(('sdist', '', file))
 
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index d6fb676920..3faf5e0d3b 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -13,6 +13,13 @@
 from distutils.tests import support
 from test.test_support import check_warnings
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
+
 try:
     import zipfile
     ZIP_SUPPORT = True
@@ -30,7 +37,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
-    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -41,7 +48,7 @@ def test_make_tarball(self):
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
-                            "Source and target should be on same drive")
+                            "source and target should be on same drive")
 
         base_name = os.path.join(tmpdir2, 'archive')
 
@@ -202,6 +209,58 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
+    def test_make_archive_owner_group(self):
+        # testing make_archive with owner and group, with various combinations
+        # this works even if there's not gid/uid support
+        if UID_GID_SUPPORT:
+            group = grp.getgrgid(0)[0]
+            owner = pwd.getpwuid(0)[0]
+        else:
+            group = owner = 'root'
+
+        base_dir, root_dir, base_name =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'zip', root_dir, base_dir, owner=owner,
+                           group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'zip', root_dir, base_dir)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner=owner, group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner='kjhkjhkjg', group='oihohoh')
+        self.assertTrue(os.path.exists(res))
+
+    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_tarfile_root_owner(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        group = grp.getgrgid(0)[0]
+        owner = pwd.getpwuid(0)[0]
+        try:
+            archive_name = make_tarball(base_name, 'dist', compress=None,
+                                        owner=owner, group=group)
+        finally:
+            os.chdir(old_dir)
+
+        # check if the compressed tarball was created
+        self.assertTrue(os.path.exists(archive_name))
+
+        # now checks the rights
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index c2feccb3ce..b8e3dca560 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -3,6 +3,7 @@
 import unittest
 import shutil
 import zipfile
+import tarfile
 
 # zlib is not used here, but if it's not available
 # the tests that use zipfile may fail
@@ -11,6 +12,13 @@
 except ImportError:
     zlib = None
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
+
 from os.path import join
 import sys
 import tempfile
@@ -288,6 +296,52 @@ def test_finalize_options(self):
         cmd.formats = 'supazipa'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
+    @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_make_distribution_owner_group(self):
+
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
+
+        # now building a sdist
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar and specifying the owner+group
+        cmd.formats = ['gztar']
+        cmd.owner = pwd.getpwuid(0)[0]
+        cmd.group = grp.getgrgid(0)[0]
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
+        # building a sdist again
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar
+        cmd.formats = ['gztar']
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, os.getuid())
+                self.assertEquals(member.gid, os.getgid())
+        finally:
+            archive.close()
 
 def test_suite():
     return unittest.makeSuite(SDistTestCase)

From 68a24d4967c877b3127b41f5f18b49f1b135429a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 2 Oct 2009 23:56:02 +0000
Subject: [PATCH 2594/8469] Merged revisions 75192 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75192 | tarek.ziade | 2009-10-03 01:49:48 +0200 (Sat, 03 Oct 2009) | 1 line

  #6516 added owner/group support for tarfiles in Distutils
........
---
 archive_util.py            | 71 +++++++++++++++++++++++++++++++++++---
 cmd.py                     |  8 +++--
 command/bdist.py           | 13 +++++++
 command/bdist_dumb.py      | 11 +++++-
 command/sdist.py           |  9 ++++-
 tests/test_archive_util.py | 63 +++++++++++++++++++++++++++++++--
 tests/test_sdist.py        | 54 +++++++++++++++++++++++++++++
 7 files changed, 217 insertions(+), 12 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index a568854e4e..d4525998fd 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -14,15 +14,55 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
+try:
+    from pwd import getpwnam
+except AttributeError:
+    getpwnam = None
+
+try:
+    from grp import getgrnam
+except AttributeError:
+    getgrnam = None
+
+def _get_gid(name):
+    """Returns a gid, given a group name."""
+    if getgrnam is None or name is None:
+        return None
+    try:
+        result = getgrnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def _get_uid(name):
+    """Returns an uid, given a user name."""
+    if getpwnam is None or name is None:
+        return None
+    try:
+        result = getpwnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
+                 owner=None, group=None):
     """Create a (possibly compressed) tar file from all the files under
     'base_dir'.
 
     'compress' must be "gzip" (the default), "compress", "bzip2", or None.
-    Both "tar" and the compression utility named by 'compress' must be on
-    the default program search path, so this is probably Unix-specific.
+    (compress will be deprecated in Python 3.2)
+
+    'owner' and 'group' can be used to define an owner and a group for the
+    archive that is being built. If not provided, the current owner and group
+    will be used.
+
     The output tar file will be named 'base_dir' +  ".tar", possibly plus
     the appropriate compression extension (".gz", ".bz2" or ".Z").
+
     Returns the output filename.
     """
     tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
@@ -44,10 +84,23 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     import tarfile  # late import so Python build itself doesn't break
 
     log.info('Creating tar archive')
+
+    uid = _get_uid(owner)
+    gid = _get_gid(group)
+
+    def _set_uid_gid(tarinfo):
+        if gid is not None:
+            tarinfo.gid = gid
+            tarinfo.gname = group
+        if uid is not None:
+            tarinfo.uid = uid
+            tarinfo.uname = owner
+        return tarinfo
+
     if not dry_run:
         tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
         try:
-            tar.add(base_dir)
+            tar.add(base_dir, filter=_set_uid_gid)
         finally:
             tar.close()
 
@@ -137,7 +190,7 @@ def check_archive_formats(formats):
     return None
 
 def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
-                 dry_run=0):
+                 dry_run=0, owner=None, group=None):
     """Create an archive file (eg. zip or tar).
 
     'base_name' is the name of the file to create, minus any format-specific
@@ -150,6 +203,9 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     ie. 'base_dir' will be the common prefix of all files and
     directories in the archive.  'root_dir' and 'base_dir' both default
     to the current directory.  Returns the name of the archive file.
+
+    'owner' and 'group' are used when creating a tar archive. By default,
+    uses the current owner and group.
     """
     save_cwd = os.getcwd()
     if root_dir is not None:
@@ -171,6 +227,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
+
+    if format != 'zip':
+        kwargs['owner'] = owner
+        kwargs['group'] = group
+
     filename = func(base_name, base_dir, **kwargs)
 
     if root_dir is not None:
diff --git a/cmd.py b/cmd.py
index ae4efc7efc..08632099aa 100644
--- a/cmd.py
+++ b/cmd.py
@@ -367,9 +367,11 @@ def spawn(self, cmd, search_path=1, level=1):
         from distutils.spawn import spawn
         spawn(cmd, search_path, dry_run=self.dry_run)
 
-    def make_archive(self, base_name, format, root_dir=None, base_dir=None):
-        return archive_util.make_archive(base_name, format, root_dir, base_dir,
-                                         dry_run=self.dry_run)
+    def make_archive(self, base_name, format, root_dir=None, base_dir=None,
+                     owner=None, group=None):
+        return archive_util.make_archive(base_name, format, root_dir,
+                                         base_dir, dry_run=self.dry_run,
+                                         owner=owner, group=group)
 
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
diff --git a/command/bdist.py b/command/bdist.py
index 1a360b59e3..2c81f3a9c0 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -39,6 +39,12 @@ class bdist(Command):
                      "[default: dist]"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['skip-build']
@@ -80,6 +86,8 @@ def initialize_options(self):
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
+        self.group = None
+        self.owner = None
 
     def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
@@ -125,6 +133,11 @@ def run(self):
             if cmd_name not in self.no_format_option:
                 sub_cmd.format = self.formats[i]
 
+            # passing the owner and group names for tar archiving
+            if cmd_name == 'bdist_dumb':
+                sub_cmd.owner = self.owner
+                sub_cmd.group = self.group
+
             # If we're going to need to run this command again, tell it to
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 63c0a47537..49fd653a19 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -36,6 +36,12 @@ class bdist_dumb(Command):
                     ('relative', None,
                      "build the archive using relative paths"
                      "(default: false)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['keep-temp', 'skip-build', 'relative']
@@ -52,6 +58,8 @@ def initialize_options(self):
         self.dist_dir = None
         self.skip_build = 0
         self.relative = 0
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.bdist_dir is None:
@@ -109,7 +117,8 @@ def run(self):
 
         # Make the archive
         filename = self.make_archive(pseudoinstall_root,
-                                     self.format, root_dir=archive_root)
+                                     self.format, root_dir=archive_root,
+                                     owner=self.owner, group=self.group)
         if self.distribution.has_ext_modules():
             pyversion = get_python_version()
         else:
diff --git a/command/sdist.py b/command/sdist.py
index ace9eeeb61..76e1de8100 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -75,6 +75,10 @@ def checking_metadata(self):
         ('medata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
+        ('owner=', 'u',
+         "Owner name used when creating a tar file [default: current user]"),
+        ('group=', 'g',
+         "Group name used when creating a tar file [default: current group]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
@@ -114,6 +118,8 @@ def initialize_options(self):
 
         self.archive_files = None
         self.metadata_check = 1
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.manifest is None:
@@ -449,7 +455,8 @@ def make_distribution(self):
             self.formats.append(self.formats.pop(self.formats.index('tar')))
 
         for fmt in self.formats:
-            file = self.make_archive(base_name, fmt, base_dir=base_dir)
+            file = self.make_archive(base_name, fmt, base_dir=base_dir,
+                                     owner=self.owner, group=self.group)
             archive_files.append(file)
             self.distribution.dist_files.append(('sdist', '', file))
 
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index d33b7e15b1..9990df36c3 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -13,6 +13,13 @@
 from distutils.tests import support
 from test.support import check_warnings
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
+
 try:
     import zipfile
     ZIP_SUPPORT = True
@@ -30,7 +37,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
-    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -41,7 +48,7 @@ def test_make_tarball(self):
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
-                            "Source and target should be on same drive")
+                            "source and target should be on same drive")
 
         base_name = os.path.join(tmpdir2, 'archive')
 
@@ -202,6 +209,58 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
+    def test_make_archive_owner_group(self):
+        # testing make_archive with owner and group, with various combinations
+        # this works even if there's not gid/uid support
+        if UID_GID_SUPPORT:
+            group = grp.getgrgid(0)[0]
+            owner = pwd.getpwuid(0)[0]
+        else:
+            group = owner = 'root'
+
+        base_dir, root_dir, base_name =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'zip', root_dir, base_dir, owner=owner,
+                           group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'zip', root_dir, base_dir)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner=owner, group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner='kjhkjhkjg', group='oihohoh')
+        self.assertTrue(os.path.exists(res))
+
+    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_tarfile_root_owner(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        group = grp.getgrgid(0)[0]
+        owner = pwd.getpwuid(0)[0]
+        try:
+            archive_name = make_tarball(base_name, 'dist', compress=None,
+                                        owner=owner, group=group)
+        finally:
+            os.chdir(old_dir)
+
+        # check if the compressed tarball was created
+        self.assertTrue(os.path.exists(archive_name))
+
+        # now checks the rights
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 986288e593..c10e973ed7 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -3,6 +3,7 @@
 import unittest
 import shutil
 import zipfile
+import tarfile
 
 # zlib is not used here, but if it's not available
 # the tests that use zipfile may fail
@@ -11,6 +12,13 @@
 except ImportError:
     zlib = None
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
+
 from os.path import join
 import sys
 import tempfile
@@ -288,6 +296,52 @@ def test_finalize_options(self):
         cmd.formats = 'supazipa'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
+    @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_make_distribution_owner_group(self):
+
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
+
+        # now building a sdist
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar and specifying the owner+group
+        cmd.formats = ['gztar']
+        cmd.owner = pwd.getpwuid(0)[0]
+        cmd.group = grp.getgrgid(0)[0]
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
+        # building a sdist again
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar
+        cmd.formats = ['gztar']
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, os.getuid())
+                self.assertEquals(member.gid, os.getgid())
+        finally:
+            archive.close()
 
 def test_suite():
     return unittest.makeSuite(SDistTestCase)

From f6e2f956fb81947c730c6417d1d492210f2f2c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 3 Oct 2009 00:07:35 +0000
Subject: [PATCH 2595/8469] removing the last remaning apply() calls

---
 archive_util.py | 2 +-
 dir_util.py     | 2 +-
 filelist.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 75318eba61..4ace7bdbf0 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -233,7 +233,7 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
         kwargs['owner'] = owner
         kwargs['group'] = group
 
-    filename = apply(func, (base_name, base_dir), kwargs)
+    filename = func(base_name, base_dir, **kwargs)
     if root_dir is not None:
         log.debug("changing back to '%s'", save_cwd)
         os.chdir(save_cwd)
diff --git a/dir_util.py b/dir_util.py
index 55607e5b53..3e2cd35385 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -190,7 +190,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
     _build_cmdtuple(directory, cmdtuples)
     for cmd in cmdtuples:
         try:
-            apply(cmd[0], (cmd[1],))
+            cmd[0](cmd[1])
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
             if abspath in _path_created:
diff --git a/filelist.py b/filelist.py
index 7cf05098ed..4aac6d397a 100644
--- a/filelist.py
+++ b/filelist.py
@@ -61,7 +61,7 @@ def sort(self):
         sortable_files.sort()
         self.files = []
         for sort_tuple in sortable_files:
-            self.files.append(apply(os.path.join, sort_tuple))
+            self.files.append(os.path.join(*sort_tuple))
 
 
     # -- Other miscellaneous utility methods ---------------------------

From 8a0d79621f41405e1315f39118fdb713809dbb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 3 Oct 2009 01:21:38 +0000
Subject: [PATCH 2596/8469] Issue #7039: Fixed test_distutils when running
 tests on an installation with no build

---
 tests/test_sysconfig.py | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 9f13952133..88f9ed865d 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -30,30 +30,13 @@ def test_get_python_lib(self):
                             sysconfig.get_python_lib(prefix=TESTFN))
 
     def test_get_python_inc(self):
-        # The check for srcdir is copied from Python's setup.py,
-        # and is necessary to make this test pass when building
-        # Python in a directory other than the source directory.
-        (srcdir,) = sysconfig.get_config_vars('srcdir')
-        if not srcdir:
-            inc_dir = sysconfig.get_python_inc()
-        else:
-            # This test is not really a proper test: when building
-            # Python from source, even in the same directory,
-            # we won't be testing the same thing as when running
-            # distutils' tests on an installed Python. Nevertheless,
-            # let's try to do our best: if we are running Python's
-            # unittests from a build directory that is not the source
-            # directory, the normal inc_dir will exist, it will just not
-            # contain anything of interest.
-            inc_dir = sysconfig.get_python_inc()
-            self.assert_(os.path.isdir(inc_dir))
-            # Now test the source location, to make sure Python.h does
-            # exist.
-            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
-            inc_dir = os.path.normpath(inc_dir)
-        self.assert_(os.path.isdir(inc_dir), inc_dir)
+        inc_dir = sysconfig.get_python_inc()
+        # This is not much of a test.  We make sure Python.h exists
+        # in the directory returned by get_python_inc() but we don't know
+        # it is the correct file.
+        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
         python_h = os.path.join(inc_dir, "Python.h")
-        self.assert_(os.path.isfile(python_h), python_h)
+        self.assertTrue(os.path.isfile(python_h), python_h)
 
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()

From c4b6ae4685dc181db793d5fff29b7cea8b7f3d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 3 Oct 2009 14:52:33 +0000
Subject: [PATCH 2597/8469] now uses the right exception type

---
 archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 4ace7bdbf0..bc5edfd864 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -16,12 +16,12 @@
 
 try:
     from pwd import getpwnam
-except AttributeError:
+except ImportError:
     getpwnam = None
 
 try:
     from grp import getgrnam
-except AttributeError:
+except ImportError:
     getgrnam = None
 
 def _get_gid(name):

From 50c7d916840891606674311b0643cd4a188b63c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 3 Oct 2009 14:54:15 +0000
Subject: [PATCH 2598/8469] Merged revisions 75209 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75209 | tarek.ziade | 2009-10-03 16:52:33 +0200 (Sat, 03 Oct 2009) | 1 line

  now uses the right exception type
........
---
 archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index d4525998fd..d051f917bb 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -16,12 +16,12 @@
 
 try:
     from pwd import getpwnam
-except AttributeError:
+except ImportError:
     getpwnam = None
 
 try:
     from grp import getgrnam
-except AttributeError:
+except ImportError:
     getgrnam = None
 
 def _get_gid(name):

From 77aaa5d7d3d3183687745120cc24c88bd4eb8f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 5 Oct 2009 17:35:51 +0000
Subject: [PATCH 2599/8469] Fixed #7064: making sure get_ext_filename is called
 as Setuptools is assuming so it doesn't break it

---
 command/build_ext.py          |   3 +-
 tests/setuptools_build_ext.py | 287 ++++++++++++++++++++++++++++++++++
 tests/setuptools_extension.py |  51 ++++++
 tests/test_build_ext.py       |  20 +++
 4 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 tests/setuptools_build_ext.py
 create mode 100644 tests/setuptools_extension.py

diff --git a/command/build_ext.py b/command/build_ext.py
index a3e3982f6d..1b7d310142 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -630,7 +630,8 @@ def get_ext_fullpath(self, ext_name):
         """
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
-        filename = self.get_ext_filename(modpath[-1])
+        filename = self.get_ext_filename(ext_name)
+        filename = os.path.split(filename)[-1]
 
         if not self.inplace:
             # no further work needed
diff --git a/tests/setuptools_build_ext.py b/tests/setuptools_build_ext.py
new file mode 100644
index 0000000000..21fa9e8f43
--- /dev/null
+++ b/tests/setuptools_build_ext.py
@@ -0,0 +1,287 @@
+from distutils.command.build_ext import build_ext as _du_build_ext
+try:
+    # Attempt to use Pyrex for building extensions, if available
+    from Pyrex.Distutils.build_ext import build_ext as _build_ext
+except ImportError:
+    _build_ext = _du_build_ext
+
+import os, sys
+from distutils.file_util import copy_file
+
+from distutils.tests.setuptools_extension import Library
+
+from distutils.ccompiler import new_compiler
+from distutils.sysconfig import customize_compiler, get_config_var
+get_config_var("LDSHARED")  # make sure _config_vars is initialized
+from distutils.sysconfig import _config_vars
+from distutils import log
+from distutils.errors import *
+
+have_rtld = False
+use_stubs = False
+libtype = 'shared'
+
+if sys.platform == "darwin":
+    use_stubs = True
+elif os.name != 'nt':
+    try:
+        from dl import RTLD_NOW
+        have_rtld = True
+        use_stubs = True
+    except ImportError:
+        pass
+
+def if_dl(s):
+    if have_rtld:
+        return s
+    return ''
+
+
+
+
+
+
+class build_ext(_build_ext):
+    def run(self):
+        """Build extensions in build directory, then copy if --inplace"""
+        old_inplace, self.inplace = self.inplace, 0
+        _build_ext.run(self)
+        self.inplace = old_inplace
+        if old_inplace:
+            self.copy_extensions_to_source()
+
+    def copy_extensions_to_source(self):
+        build_py = self.get_finalized_command('build_py')
+        for ext in self.extensions:
+            fullname = self.get_ext_fullname(ext.name)
+            filename = self.get_ext_filename(fullname)
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[:-1])
+            package_dir = build_py.get_package_dir(package)
+            dest_filename = os.path.join(package_dir,os.path.basename(filename))
+            src_filename = os.path.join(self.build_lib,filename)
+
+            # Always copy, even if source is older than destination, to ensure
+            # that the right extensions for the current Python/platform are
+            # used.
+            copy_file(
+                src_filename, dest_filename, verbose=self.verbose,
+                dry_run=self.dry_run
+            )
+            if ext._needs_stub:
+                self.write_stub(package_dir or os.curdir, ext, True)
+
+
+    if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
+        # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
+        def swig_sources(self, sources, *otherargs):
+            # first do any Pyrex processing
+            sources = _build_ext.swig_sources(self, sources) or sources
+            # Then do any actual SWIG stuff on the remainder
+            return _du_build_ext.swig_sources(self, sources, *otherargs)
+
+
+
+    def get_ext_filename(self, fullname):
+        filename = _build_ext.get_ext_filename(self,fullname)
+        ext = self.ext_map[fullname]
+        if isinstance(ext,Library):
+            fn, ext = os.path.splitext(filename)
+            return self.shlib_compiler.library_filename(fn,libtype)
+        elif use_stubs and ext._links_to_dynamic:
+            d,fn = os.path.split(filename)
+            return os.path.join(d,'dl-'+fn)
+        else:
+            return filename
+
+    def initialize_options(self):
+        _build_ext.initialize_options(self)
+        self.shlib_compiler = None
+        self.shlibs = []
+        self.ext_map = {}
+
+    def finalize_options(self):
+        _build_ext.finalize_options(self)
+        self.extensions = self.extensions or []
+        self.check_extensions_list(self.extensions)
+        self.shlibs = [ext for ext in self.extensions
+                        if isinstance(ext,Library)]
+        if self.shlibs:
+            self.setup_shlib_compiler()
+        for ext in self.extensions:
+            ext._full_name = self.get_ext_fullname(ext.name)
+        for ext in self.extensions:
+            fullname = ext._full_name
+            self.ext_map[fullname] = ext
+            ltd = ext._links_to_dynamic = \
+                self.shlibs and self.links_to_dynamic(ext) or False
+            ext._needs_stub = ltd and use_stubs and not isinstance(ext,Library)
+            filename = ext._file_name = self.get_ext_filename(fullname)
+            libdir = os.path.dirname(os.path.join(self.build_lib,filename))
+            if ltd and libdir not in ext.library_dirs:
+                ext.library_dirs.append(libdir)
+            if ltd and use_stubs and os.curdir not in ext.runtime_library_dirs:
+                ext.runtime_library_dirs.append(os.curdir)
+
+    def setup_shlib_compiler(self):
+        compiler = self.shlib_compiler = new_compiler(
+            compiler=self.compiler, dry_run=self.dry_run, force=self.force
+        )
+        if sys.platform == "darwin":
+            tmp = _config_vars.copy()
+            try:
+                # XXX Help!  I don't have any idea whether these are right...
+                _config_vars['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
+                _config_vars['CCSHARED'] = " -dynamiclib"
+                _config_vars['SO'] = ".dylib"
+                customize_compiler(compiler)
+            finally:
+                _config_vars.clear()
+                _config_vars.update(tmp)
+        else:
+            customize_compiler(compiler)
+
+        if self.include_dirs is not None:
+            compiler.set_include_dirs(self.include_dirs)
+        if self.define is not None:
+            # 'define' option is a list of (name,value) tuples
+            for (name,value) in self.define:
+                compiler.define_macro(name, value)
+        if self.undef is not None:
+            for macro in self.undef:
+                compiler.undefine_macro(macro)
+        if self.libraries is not None:
+            compiler.set_libraries(self.libraries)
+        if self.library_dirs is not None:
+            compiler.set_library_dirs(self.library_dirs)
+        if self.rpath is not None:
+            compiler.set_runtime_library_dirs(self.rpath)
+        if self.link_objects is not None:
+            compiler.set_link_objects(self.link_objects)
+
+        # hack so distutils' build_extension() builds a library instead
+        compiler.link_shared_object = link_shared_object.__get__(compiler)
+
+
+
+    def get_export_symbols(self, ext):
+        if isinstance(ext,Library):
+            return ext.export_symbols
+        return _build_ext.get_export_symbols(self,ext)
+
+    def build_extension(self, ext):
+        _compiler = self.compiler
+        try:
+            if isinstance(ext,Library):
+                self.compiler = self.shlib_compiler
+            _build_ext.build_extension(self,ext)
+            if ext._needs_stub:
+                self.write_stub(
+                    self.get_finalized_command('build_py').build_lib, ext
+                )
+        finally:
+            self.compiler = _compiler
+
+    def links_to_dynamic(self, ext):
+        """Return true if 'ext' links to a dynamic lib in the same package"""
+        # XXX this should check to ensure the lib is actually being built
+        # XXX as dynamic, and not just using a locally-found version or a
+        # XXX static-compiled version
+        libnames = dict.fromkeys([lib._full_name for lib in self.shlibs])
+        pkg = '.'.join(ext._full_name.split('.')[:-1]+[''])
+        for libname in ext.libraries:
+            if pkg+libname in libnames: return True
+        return False
+
+    def get_outputs(self):
+        outputs = _build_ext.get_outputs(self)
+        optimize = self.get_finalized_command('build_py').optimize
+        for ext in self.extensions:
+            if ext._needs_stub:
+                base = os.path.join(self.build_lib, *ext._full_name.split('.'))
+                outputs.append(base+'.py')
+                outputs.append(base+'.pyc')
+                if optimize:
+                    outputs.append(base+'.pyo')
+        return outputs
+
+    def write_stub(self, output_dir, ext, compile=False):
+        log.info("writing stub loader for %s to %s",ext._full_name, output_dir)
+        stub_file = os.path.join(output_dir, *ext._full_name.split('.'))+'.py'
+        if compile and os.path.exists(stub_file):
+            raise DistutilsError(stub_file+" already exists! Please delete.")
+        if not self.dry_run:
+            f = open(stub_file,'w')
+            f.write('\n'.join([
+                "def __bootstrap__():",
+                "   global __bootstrap__, __file__, __loader__",
+                "   import sys, os, pkg_resources, imp"+if_dl(", dl"),
+                "   __file__ = pkg_resources.resource_filename(__name__,%r)"
+                   % os.path.basename(ext._file_name),
+                "   del __bootstrap__",
+                "   if '__loader__' in globals():",
+                "       del __loader__",
+                if_dl("   old_flags = sys.getdlopenflags()"),
+                "   old_dir = os.getcwd()",
+                "   try:",
+                "     os.chdir(os.path.dirname(__file__))",
+                if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
+                "     imp.load_dynamic(__name__,__file__)",
+                "   finally:",
+                if_dl("     sys.setdlopenflags(old_flags)"),
+                "     os.chdir(old_dir)",
+                "__bootstrap__()",
+                "" # terminal \n
+            ]))
+            f.close()
+        if compile:
+            from distutils.util import byte_compile
+            byte_compile([stub_file], optimize=0,
+                         force=True, dry_run=self.dry_run)
+            optimize = self.get_finalized_command('install_lib').optimize
+            if optimize > 0:
+                byte_compile([stub_file], optimize=optimize,
+                             force=True, dry_run=self.dry_run)
+            if os.path.exists(stub_file) and not self.dry_run:
+                os.unlink(stub_file)
+
+
+if use_stubs or os.name=='nt':
+    # Build shared libraries
+    #
+    def link_shared_object(self, objects, output_libname, output_dir=None,
+        libraries=None, library_dirs=None, runtime_library_dirs=None,
+        export_symbols=None, debug=0, extra_preargs=None,
+        extra_postargs=None, build_temp=None, target_lang=None
+    ):  self.link(
+            self.SHARED_LIBRARY, objects, output_libname,
+            output_dir, libraries, library_dirs, runtime_library_dirs,
+            export_symbols, debug, extra_preargs, extra_postargs,
+            build_temp, target_lang
+        )
+else:
+    # Build static libraries everywhere else
+    libtype = 'static'
+
+    def link_shared_object(self, objects, output_libname, output_dir=None,
+        libraries=None, library_dirs=None, runtime_library_dirs=None,
+        export_symbols=None, debug=0, extra_preargs=None,
+        extra_postargs=None, build_temp=None, target_lang=None
+    ):
+        # XXX we need to either disallow these attrs on Library instances,
+        #     or warn/abort here if set, or something...
+        #libraries=None, library_dirs=None, runtime_library_dirs=None,
+        #export_symbols=None, extra_preargs=None, extra_postargs=None,
+        #build_temp=None
+
+        assert output_dir is None   # distutils build_ext doesn't pass this
+        output_dir,filename = os.path.split(output_libname)
+        basename, ext = os.path.splitext(filename)
+        if self.library_filename("x").startswith('lib'):
+            # strip 'lib' prefix; this is kludgy if some platform uses
+            # a different prefix
+            basename = basename[3:]
+
+        self.create_static_lib(
+            objects, basename, output_dir, debug, target_lang
+        )
diff --git a/tests/setuptools_extension.py b/tests/setuptools_extension.py
new file mode 100644
index 0000000000..ec6b690cdb
--- /dev/null
+++ b/tests/setuptools_extension.py
@@ -0,0 +1,51 @@
+from distutils.core import Extension as _Extension
+from distutils.core import Distribution as _Distribution
+
+def _get_unpatched(cls):
+    """Protect against re-patching the distutils if reloaded
+
+    Also ensures that no other distutils extension monkeypatched the distutils
+    first.
+    """
+    while cls.__module__.startswith('setuptools'):
+        cls, = cls.__bases__
+    if not cls.__module__.startswith('distutils'):
+        raise AssertionError(
+            "distutils has already been patched by %r" % cls
+        )
+    return cls
+
+_Distribution = _get_unpatched(_Distribution)
+_Extension = _get_unpatched(_Extension)
+
+try:
+    from Pyrex.Distutils.build_ext import build_ext
+except ImportError:
+    have_pyrex = False
+else:
+    have_pyrex = True
+
+
+class Extension(_Extension):
+    """Extension that uses '.c' files in place of '.pyx' files"""
+
+    if not have_pyrex:
+        # convert .pyx extensions to .c
+        def __init__(self,*args,**kw):
+            _Extension.__init__(self,*args,**kw)
+            sources = []
+            for s in self.sources:
+                if s.endswith('.pyx'):
+                    sources.append(s[:-3]+'c')
+                else:
+                    sources.append(s)
+            self.sources = sources
+
+class Library(Extension):
+    """Just like a regular Extension, but built as a library instead"""
+
+import sys, distutils.core, distutils.extension
+distutils.core.Extension = Extension
+distutils.extension.Extension = Extension
+if 'distutils.command.build_ext' in sys.modules:
+    sys.modules['distutils.command.build_ext'].Extension = Extension
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 94000a57d9..36e0bb84dd 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -13,6 +13,7 @@
 import unittest
 from test import test_support
 
+
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
@@ -334,6 +335,25 @@ def test_build_ext_inplace(self):
         etree_ext = Extension('lxml.etree', [etree_c])
         dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
         cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        ext = sysconfig.get_config_var("SO")
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+    def test_setuptools_compat(self):
+        from setuptools_build_ext import build_ext as setuptools_build_ext
+        from setuptools_extension import Extension
+
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = setuptools_build_ext(dist)
+        cmd.ensure_finalized()
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']

From 68342e4b2ffdf4ebf5334a2dd73e71f4d7dbe7c8 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Mon, 5 Oct 2009 21:56:24 +0300
Subject: [PATCH 2600/8469] Add the Python 3 classifier to make distribute
 visible on the Python 3 packages list on PyPI

--HG--
branch : distribute
extra : rebase_source : c4d4ddf6dce9ae7938bd4c017aa261bf5ceef364
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index fcd85eb2bc..c4116559a8 100755
--- a/setup.py
+++ b/setup.py
@@ -134,6 +134,7 @@ def _being_installed():
     License :: OSI Approved :: Zope Public License
     Operating System :: OS Independent
     Programming Language :: Python
+    Programming Language :: Python :: 3
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: System :: Archiving :: Packaging
     Topic :: System :: Systems Administration

From f08d60462aba52ea189fe6b20741ee1c6fe58684 Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Mon, 5 Oct 2009 22:32:48 +0000
Subject: [PATCH 2601/8469] Use standard comma punctuation; reword some
 sentences in the docs

---
 command/check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/check.py b/command/check.py
index 7d56dfcf40..bc29baaba4 100644
--- a/command/check.py
+++ b/command/check.py
@@ -91,7 +91,7 @@ def check_metadata(self):
                 missing.append(attr)
 
         if missing:
-            self.warn("missing required meta-data: %s"  % ' ,'.join(missing))
+            self.warn("missing required meta-data: %s"  % ', '.join(missing))
         if metadata.author:
             if not metadata.author_email:
                 self.warn("missing meta-data: if 'author' supplied, " +

From 847659f5b6c3f71dcd6db1ba1fe76bbc89739732 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Tue, 6 Oct 2009 11:59:00 +0300
Subject: [PATCH 2602/8469] Changed wget references to use curl instead

--HG--
branch : distribute
extra : rebase_source : 03f4c91b3b2171f05df6d619681e7f2ae3b9fbd3
---
 README.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index d130cf90cc..7e0c5eade4 100755
--- a/README.txt
+++ b/README.txt
@@ -76,14 +76,14 @@ distribute_setup.py
 Download ``distribute_setup.py`` and execute it, using the Python interpreter of
 your choice.
 
-If your shell has the ``wget`` program you can do::
+If your shell has the ``curl`` program you can do::
 
-    $ wget http://nightly.ziade.org/distribute_setup.py
+    $ curl -O http://nightly.ziade.org/distribute_setup.py
     $ python distribute_setup.py
 
 If you are under Python 3, use ``distribute_setup_3k.py``::
 
-    $ wget http://nightly.ziade.org/distribute_setup_3k.py
+    $ curl -O http://nightly.ziade.org/distribute_setup_3k.py
     $ python distribute_setup_3k.py
 
 easy_install or pip
@@ -99,7 +99,7 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.4.tar.gz
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.4.tar.gz
     $ tar -xzvf distribute-0.6.4.tar.gz
     $ cd distribute-0.6
     $ python setup.py install

From 82c7e63d170ca25fb083b729a1ebec9835010691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 6 Oct 2009 12:35:46 +0000
Subject: [PATCH 2603/8469] #7068: Fixed the partial renaming that occured in
 r72594

---
 command/build_ext.py    | 2 +-
 tests/test_build_ext.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1b7d310142..da9cbfd574 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -303,7 +303,7 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=None,
+        self.compiler = new_compiler(compiler=self.compiler,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 36e0bb84dd..00733a46a7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -264,7 +264,7 @@ def test_get_outputs(self):
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
-
+        cmd.compiler = None
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]

From 7bbdd446ed91b60cfb54abb7e2a38b5657253759 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 6 Oct 2009 13:21:07 +0000
Subject: [PATCH 2604/8469] Bumping to 2.6.4rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index fd52b8d7c5..83c576f802 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.3"
+__version__ = "2.6.4rc1"
 #--end constants--

From 45a293a430e41d37c583df639f4dcc9880565438 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 7 Oct 2009 18:50:17 +0200
Subject: [PATCH 2605/8469] Added a upload_docs command to upload project
 documentation to PyPI's packages.python.org

--HG--
branch : distribute
extra : rebase_source : e8d62df101ab017b71ec9c923f64bc3494ba8979
---
 distribute.egg-info/entry_points.txt |   1 +
 docs/setuptools.txt                  |  55 ++++++++++
 setup.cfg                            |   3 +
 setuptools/command/__init__.py       |   2 +-
 setuptools/command/upload_docs.py    | 153 +++++++++++++++++++++++++++
 5 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/command/upload_docs.py

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index d18df33807..f4b74da0fd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -7,6 +7,7 @@ build_py = setuptools.command.build_py:build_py
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 06f632ecc7..7c679fd08f 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2369,6 +2369,61 @@ The ``upload`` command has a few options worth noting:
     The URL of the repository to upload to.  Defaults to
     http://pypi.python.org/pypi (i.e., the main PyPI installation).
 
+.. _upload_docs:
+
+``upload_docs`` - Upload package documentation to PyPI
+======================================================
+
+PyPI now supports uploading project documentation to the dedicated URL
+http://packages.python.org/<project>/.
+
+The ``upload_docs`` command will create the necessary zip file out of a
+documentation directory and will post to the repository.
+
+Note that to upload the documentation of a project, the corresponding version
+must already be registered with PyPI, using the distutils ``register``
+command -- just like the ``upload`` command.
+
+Assuming there is an ``Example`` project with documentation in the
+subdirectory ``docs``, e.g.::
+
+  Example/
+  |-- example.py
+  |-- setup.cfg
+  |-- setup.py
+  |-- docs
+  |   |-- build
+  |   |   `-- html
+  |   |   |   |-- index.html
+  |   |   |   `-- tips_tricks.html
+  |   |-- conf.py
+  |   |-- index.txt
+  |   `-- tips_tricks.txt
+
+You can simply pass the documentation directory path to the ``upload_docs``
+command::
+
+    python setup.py upload_docs --upload-dir=docs/build/html
+
+As with any other ``setuptools`` based command, you can define useful
+defaults in the ``setup.cfg`` of your Python project, e.g.::
+
+    [upload_docs]
+    upload-dir = docs/build/html
+
+The ``upload_docs`` command has the following options:
+
+``--upload-dir``
+    The directory to be uploaded to the repository.
+
+``--show-response``
+    Display the full response text from server; this is useful for debugging
+    PyPI problems.
+
+``--repository=URL, -r URL``
+    The URL of the repository to upload to.  Defaults to
+    http://pypi.python.org/pypi (i.e., the main PyPI installation).
+
 
 ------------------------------------
 Extending and Reusing ``setuptools``
diff --git a/setup.cfg b/setup.cfg
index f7811000a3..f16664cb75 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,3 +6,6 @@ tag_svn_revision = 1
 release = egg_info -RDb ''
 source = register sdist binary
 binary = bdist_egg upload --show-response
+
+[upload_docs]
+upload-dir = docs/build/html
\ No newline at end of file
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index f898822bb1..ea544b504e 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst',
+    'register', 'bdist_wininst', 'upload_docs',
 ]
 
 import sys
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
new file mode 100644
index 0000000000..5bbdc7f2ff
--- /dev/null
+++ b/setuptools/command/upload_docs.py
@@ -0,0 +1,153 @@
+# -*- coding: utf-8 -*-
+"""upload_docs
+
+Implements a Distutils 'upload_docs' subcommand (upload documentation to
+PyPI's packages.python.org).
+"""
+
+import os
+import socket
+import zipfile
+import httplib
+import base64
+import urlparse
+import tempfile
+import cStringIO as StringIO
+
+from distutils import log
+from distutils.errors import DistutilsOptionError
+from distutils.command.upload import upload
+
+class upload_docs(upload):
+
+    description = 'Upload documentation to PyPI'
+
+    user_options = [
+        ('repository=', 'r',
+         "url of repository [default: %s]" % upload.DEFAULT_REPOSITORY),
+        ('show-response', None,
+         'display full response text from server'),
+        ('upload-dir=', None, 'directory to upload'),
+        ]
+    boolean_options = upload.boolean_options
+
+    def initialize_options(self):
+        upload.initialize_options(self)
+        self.upload_dir = None
+
+    def finalize_options(self):
+        upload.finalize_options(self)
+        if self.upload_dir is None:
+            build = self.get_finalized_command('build')
+            self.upload_dir = os.path.join(build.build_base, 'docs')
+            self.mkpath(self.upload_dir)
+        self.ensure_dirname('upload_dir')
+        self.announce('Using upload directory %s' % self.upload_dir)
+
+    def create_zipfile(self):
+        name = self.distribution.metadata.get_name()
+        tmp_dir = tempfile.mkdtemp()
+        tmp_file = os.path.join(tmp_dir, "%s.zip" % name)
+        zip_file = zipfile.ZipFile(tmp_file, "w")
+        for root, dirs, files in os.walk(self.upload_dir):
+            if not files:
+                raise DistutilsOptionError(
+                    "no files found in upload directory '%s'"
+                    % self.upload_dir)
+            for name in files:
+                full = os.path.join(root, name)
+                relative = root[len(self.upload_dir):].lstrip(os.path.sep)
+                dest = os.path.join(relative, name)
+                zip_file.write(full, dest)
+        zip_file.close()
+        return tmp_file
+
+    def run(self):
+        zip_file = self.create_zipfile()
+        self.upload_file(zip_file)
+
+    def upload_file(self, filename):
+        content = open(filename, 'rb').read()
+        meta = self.distribution.metadata
+        data = {
+            ':action': 'doc_upload',
+            'name': meta.get_name(),
+            'content': (os.path.basename(filename), content),
+        }
+        # set up the authentication
+        auth = "Basic " + base64.encodestring(
+            self.username + ":" + self.password).strip()
+
+        # Build up the MIME payload for the POST data
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = '\n--' + boundary
+        end_boundary = sep_boundary + '--'
+        body = StringIO.StringIO()
+        for key, value in data.items():
+            # handle multiple entries for the same name
+            if type(value) != type([]):
+                value = [value]
+            for value in value:
+                if type(value) is tuple:
+                    fn = ';filename="%s"' % value[0]
+                    value = value[1]
+                else:
+                    fn = ""
+                value = str(value)
+                body.write(sep_boundary)
+                body.write('\nContent-Disposition: form-data; name="%s"'%key)
+                body.write(fn)
+                body.write("\n\n")
+                body.write(value)
+                if value and value[-1] == '\r':
+                    body.write('\n')  # write an extra newline (lurve Macs)
+        body.write(end_boundary)
+        body.write("\n")
+        body = body.getvalue()
+
+        self.announce("Submitting documentation to %s" % (self.repository),
+                      log.INFO)
+
+        # build the Request
+        # We can't use urllib2 since we need to send the Basic
+        # auth right with the first request
+        schema, netloc, url, params, query, fragments = \
+            urlparse.urlparse(self.repository)
+        assert not params and not query and not fragments
+        if schema == 'http':
+            http = httplib.HTTPConnection(netloc)
+        elif schema == 'https':
+            http = httplib.HTTPSConnection(netloc)
+        else:
+            raise AssertionError("unsupported schema "+schema)
+
+        data = ''
+        loglevel = log.INFO
+        try:
+            http.connect()
+            http.putrequest("POST", url)
+            http.putheader('Content-type',
+                           'multipart/form-data; boundary=%s'%boundary)
+            http.putheader('Content-length', str(len(body)))
+            http.putheader('Authorization', auth)
+            http.endheaders()
+            http.send(body)
+        except socket.error, e:
+            self.announce(str(e), log.ERROR)
+            return
+
+        r = http.getresponse()
+        if r.status == 200:
+            self.announce('Server response (%s): %s' % (r.status, r.reason),
+                          log.INFO)
+        elif r.status == 301:
+            location = r.getheader('Location')
+            if location is None:
+                location = 'http://packages.python.org/%s/' % meta.get_name()
+            self.announce('Upload successful. Visit %s' % location,
+                          log.INFO)
+        else:
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+                          log.ERROR)
+        if self.show_response:
+            print '-'*75, r.read(), '-'*75

From e950cf009dc1ee0b4bbd9ac62a12bd434f6f37a1 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 8 Oct 2009 02:25:19 +0200
Subject: [PATCH 2606/8469] Added item to changelog and myself to the
 contributor list

--HG--
branch : distribute
extra : rebase_source : 19a1883a5c97362f14e7713948147f61c7ab55cb
---
 CHANGES.txt      | 3 ++-
 CONTRIBUTORS.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d59d26ef20..690367df7c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ CHANGES
 0.6.4
 -----
 
-
+* Added an upload_docs command to easily upload project documentation to
+  PyPI's http://packages.python.org.
 
 -----
 0.6.3
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c4a84b702a..5dcc3675e2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -4,6 +4,7 @@ Contributors
 
 * Alex Grönholm
 * Hanno Schlichting
+* Jannis Leidel
 * Lennart Regebro
 * Martin von Loewis
 * Philip Envey

From 14bee6d350bf2bd306757ae7305c584374aec287 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 8 Oct 2009 15:07:36 +0200
Subject: [PATCH 2607/8469] Added configuration for build_sphinx command to
 simplify building

--HG--
branch : distribute
extra : rebase_source : 69ea754fdb336feb1016db3f5ab018e648f38097
---
 setup.cfg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index f16664cb75..dc4cfd970e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,5 +7,10 @@ release = egg_info -RDb ''
 source = register sdist binary
 binary = bdist_egg upload --show-response
 
+[build_sphinx]
+source-dir = docs/
+build-dir = docs/build
+all_files = 1
+
 [upload_docs]
 upload-dir = docs/build/html
\ No newline at end of file

From 0867ba6e43bc687947b24d77efdbe416fcc38780 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 8 Oct 2009 15:09:35 +0200
Subject: [PATCH 2608/8469] Added nature Sphinx theme

--HG--
branch : distribute
extra : rebase_source : 76cc928d3a7080328c5c7d1bca3b4661a8fe7650
---
 docs/_theme/nature/static/nature.css_t | 230 +++++++++++++++++++++++++
 docs/_theme/nature/static/pygments.css |  54 ++++++
 docs/_theme/nature/theme.conf          |   4 +
 3 files changed, 288 insertions(+)
 create mode 100644 docs/_theme/nature/static/nature.css_t
 create mode 100644 docs/_theme/nature/static/pygments.css
 create mode 100644 docs/_theme/nature/theme.conf

diff --git a/docs/_theme/nature/static/nature.css_t b/docs/_theme/nature/static/nature.css_t
new file mode 100644
index 0000000000..a29848e157
--- /dev/null
+++ b/docs/_theme/nature/static/nature.css_t
@@ -0,0 +1,230 @@
+/**
+ * Sphinx stylesheet -- default theme
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+ 
+@import url("basic.css");
+ 
+/* -- page layout ----------------------------------------------------------- */
+ 
+body {
+    font-family: Arial, sans-serif;
+    font-size: 100%;
+    background-color: #111;
+    color: #555;
+    margin: 0;
+    padding: 0;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 300px;
+}
+
+hr{
+    border: 1px solid #B1B4B6;
+}
+ 
+div.document {
+    background-color: #eee;
+}
+ 
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 30px 30px;
+    font-size: 0.8em;
+}
+ 
+div.footer {
+    color: #555;
+    width: 100%;
+    padding: 13px 0;
+    text-align: center;
+    font-size: 75%;
+}
+ 
+div.footer a {
+    color: #444;
+    text-decoration: underline;
+}
+ 
+div.related {
+    background-color: #6BA81E;
+    line-height: 32px;
+    color: #fff;
+    text-shadow: 0px 1px 0 #444;
+    font-size: 0.80em;
+}
+ 
+div.related a {
+    color: #E2F3CC;
+}
+ 
+div.sphinxsidebar {
+    font-size: 0.75em;
+    line-height: 1.5em;
+    width: 300px
+}
+
+div.sphinxsidebarwrapper{
+    padding: 20px 0;
+}
+ 
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: Arial, sans-serif;
+    color: #222;
+    font-size: 1.2em;
+    font-weight: normal;
+    margin: 0;
+    padding: 5px 10px;
+    background-color: #ddd;
+    text-shadow: 1px 1px 0 white
+}
+
+div.sphinxsidebar h4{
+    font-size: 1.1em;
+}
+ 
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+ 
+ 
+div.sphinxsidebar p {
+    color: #888;
+    padding: 5px 20px;
+}
+ 
+div.sphinxsidebar p.topless {
+}
+ 
+div.sphinxsidebar ul {
+    margin: 10px 10px 10px 20px;
+    padding: 0;
+    color: #000;
+}
+ 
+div.sphinxsidebar a {
+    color: #444;
+}
+ 
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar input[type=text]{
+    margin-left: 20px;
+}
+ 
+/* -- body styles ----------------------------------------------------------- */
+ 
+a {
+    color: #005B81;
+    text-decoration: none;
+}
+ 
+a:hover {
+    color: #E32E00;
+    text-decoration: underline;
+}
+ 
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: Arial, sans-serif;
+    background-color: #BED4EB;
+    font-weight: normal;
+    color: #212224;
+    margin: 30px 0px 10px 0px;
+    padding: 5px 0 5px 10px;
+    text-shadow: 0px 1px 0 white
+}
+ 
+div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 150%; background-color: #C8D5E3; }
+div.body h3 { font-size: 120%; background-color: #D8DEE3; }
+div.body h4 { font-size: 110%; background-color: #D8DEE3; }
+div.body h5 { font-size: 100%; background-color: #D8DEE3; }
+div.body h6 { font-size: 100%; background-color: #D8DEE3; }
+ 
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+ 
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+ 
+div.body p, div.body dd, div.body li {
+    line-height: 1.5em;
+}
+ 
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.highlight{
+    background-color: white;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+ 
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+ 
+div.topic {
+    background-color: #eee;
+}
+ 
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+ 
+p.admonition-title {
+    display: inline;
+}
+ 
+p.admonition-title:after {
+    content: ":";
+}
+ 
+pre {
+    padding: 10px;
+    background-color: White;
+    color: #222;
+    line-height: 1.2em;
+    border: 1px solid #C6C9CB;
+    font-size: 1.2em;
+    margin: 1.5em 0 1.5em 0;
+    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
+    -moz-box-shadow: 1px 1px 1px #d8d8d8;
+}
+ 
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    padding: 1px 2px;
+    font-size: 1.2em;
+    font-family: monospace;
+}
diff --git a/docs/_theme/nature/static/pygments.css b/docs/_theme/nature/static/pygments.css
new file mode 100644
index 0000000000..652b76128b
--- /dev/null
+++ b/docs/_theme/nature/static/pygments.css
@@ -0,0 +1,54 @@
+.c { color: #999988; font-style: italic } /* Comment */
+.k { font-weight: bold } /* Keyword */
+.o { font-weight: bold } /* Operator */
+.cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.cp { color: #999999; font-weight: bold } /* Comment.preproc */
+.c1 { color: #999988; font-style: italic } /* Comment.Single */
+.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.ge { font-style: italic } /* Generic.Emph */
+.gr { color: #aa0000 } /* Generic.Error */
+.gh { color: #999999 } /* Generic.Heading */
+.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.go { color: #111 } /* Generic.Output */
+.gp { color: #555555 } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #aaaaaa } /* Generic.Subheading */
+.gt { color: #aa0000 } /* Generic.Traceback */
+.kc { font-weight: bold } /* Keyword.Constant */
+.kd { font-weight: bold } /* Keyword.Declaration */
+.kp { font-weight: bold } /* Keyword.Pseudo */
+.kr { font-weight: bold } /* Keyword.Reserved */
+.kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.m { color: #009999 } /* Literal.Number */
+.s { color: #bb8844 } /* Literal.String */
+.na { color: #008080 } /* Name.Attribute */
+.nb { color: #999999 } /* Name.Builtin */
+.nc { color: #445588; font-weight: bold } /* Name.Class */
+.no { color: #ff99ff } /* Name.Constant */
+.ni { color: #800080 } /* Name.Entity */
+.ne { color: #990000; font-weight: bold } /* Name.Exception */
+.nf { color: #990000; font-weight: bold } /* Name.Function */
+.nn { color: #555555 } /* Name.Namespace */
+.nt { color: #000080 } /* Name.Tag */
+.nv { color: purple } /* Name.Variable */
+.ow { font-weight: bold } /* Operator.Word */
+.mf { color: #009999 } /* Literal.Number.Float */
+.mh { color: #009999 } /* Literal.Number.Hex */
+.mi { color: #009999 } /* Literal.Number.Integer */
+.mo { color: #009999 } /* Literal.Number.Oct */
+.sb { color: #bb8844 } /* Literal.String.Backtick */
+.sc { color: #bb8844 } /* Literal.String.Char */
+.sd { color: #bb8844 } /* Literal.String.Doc */
+.s2 { color: #bb8844 } /* Literal.String.Double */
+.se { color: #bb8844 } /* Literal.String.Escape */
+.sh { color: #bb8844 } /* Literal.String.Heredoc */
+.si { color: #bb8844 } /* Literal.String.Interpol */
+.sx { color: #bb8844 } /* Literal.String.Other */
+.sr { color: #808000 } /* Literal.String.Regex */
+.s1 { color: #bb8844 } /* Literal.String.Single */
+.ss { color: #bb8844 } /* Literal.String.Symbol */
+.bp { color: #999999 } /* Name.Builtin.Pseudo */
+.vc { color: #ff99ff } /* Name.Variable.Class */
+.vg { color: #ff99ff } /* Name.Variable.Global */
+.vi { color: #ff99ff } /* Name.Variable.Instance */
+.il { color: #009999 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/docs/_theme/nature/theme.conf b/docs/_theme/nature/theme.conf
new file mode 100644
index 0000000000..1cc4004464
--- /dev/null
+++ b/docs/_theme/nature/theme.conf
@@ -0,0 +1,4 @@
+[theme]
+inherit = basic
+stylesheet = nature.css
+pygments_style = tango

From 079951a1532a2c9e3295253c65e06091758f9150 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 8 Oct 2009 15:10:08 +0200
Subject: [PATCH 2609/8469] Updated Sphinx config, e.g. to add theme support

--HG--
branch : distribute
extra : rebase_source : b23e8bc5fa516fc6d0a2b232127c9d8b43cdb067
---
 docs/conf.py | 51 +++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index d4ff4a1542..bad1a578a3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,20 +16,19 @@
 
 import sys, os
 
-# If your extensions are in another directory, add it here. If the directory
-# is relative to the documentation root, use os.path.abspath to make it
-# absolute, like shown here.
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.append(os.path.abspath('.'))
 
-# General configuration
-# ---------------------
+# -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['.templates']
+templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.txt'
@@ -49,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.1'
+version = '0.6.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.1'
+release = '0.6.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -87,21 +86,30 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
 
-# Options for HTML output
-# -----------------------
 
-# The style sheet to use for HTML and HTML Help pages. A file of that name
-# must exist either in Sphinx' static/ path, or in one of the custom paths
-# given in html_static_path.
-html_style = 'default.css'
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'nature'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = ['_theme']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+html_title = "Distribute documentation"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+html_short_title = "Distribute"
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -115,7 +123,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['.static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -141,8 +149,8 @@
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False
 
-# If true, the reST sources are included in the HTML build as _sources/<name>.
-#html_copy_source = True
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
@@ -156,8 +164,7 @@
 htmlhelp_basename = 'Distributedoc'
 
 
-# Options for LaTeX output
-# ------------------------
+# -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -166,7 +173,7 @@
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, document class [howto/manual]).
+# (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Distribute.tex', ur'Distribute Documentation',
    ur'The fellowship of the packaging', 'manual'),

From dcc66e813d10098aa88eaa3be169cbc2e8b301b6 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 8 Oct 2009 15:11:48 +0200
Subject: [PATCH 2610/8469] Added a bunch of code-block directives for better
 highlighting with Pygments, fixed typo

--HG--
branch : distribute
extra : rebase_source : e000e29a4c561a0397b134d2e451080b34f84b5d
---
 docs/easy_install.txt | 28 +++++++++++++-----
 docs/python3.txt      | 68 ++++++++++++++++++++++---------------------
 docs/setuptools.txt   | 22 ++++++++++----
 3 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index ff0ad3d892..b821e5ca45 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -330,7 +330,9 @@ to restrict downloading to hosts in your own intranet.  See the section below
 on `Command-Line Options`_ for more details on the ``--allow-hosts`` option.
 
 By default, there are no host restrictions in effect, but you can change this
-default by editing the appropriate `configuration files`_ and adding::
+default by editing the appropriate `configuration files`_ and adding:
+
+.. code-block:: ini
 
     [easy_install]
     allow_hosts = *.myintranet.example.com,*.python.org
@@ -411,7 +413,9 @@ generated directory listing (such as the Apache web server provides).
 
 If you are setting up an intranet site for package downloads, you may want to
 configure the target machines to use your download site by default, adding
-something like this to their `configuration files`_::
+something like this to their `configuration files`_:
+
+.. code-block:: ini
 
     [easy_install]
     find_links = http://mypackages.example.com/somedir/
@@ -445,7 +449,9 @@ Controlling Build Options
 EasyInstall respects standard distutils `Configuration Files`_, so you can use
 them to configure build options for packages that it installs from source.  For
 example, if you are on Windows using the MinGW compiler, you can configure the
-default compiler by putting something like this::
+default compiler by putting something like this:
+
+.. code-block:: ini
 
     [build]
     compiler = mingw32
@@ -593,7 +599,9 @@ distutils configuration files, under the command heading ``easy_install``.
 EasyInstall will look first for a ``setup.cfg`` file in the current directory,
 then a ``~/.pydistutils.cfg`` or ``$HOME\\pydistutils.cfg`` (on Unix-like OSes
 and Windows, respectively), and finally a ``distutils.cfg`` file in the
-``distutils`` package directory.  Here's a simple example::
+``distutils`` package directory.  Here's a simple example:
+
+.. code-block:: ini
 
     [easy_install]
 
@@ -986,7 +994,9 @@ The next step is to create or modify ``distutils.cfg`` in the ``distutils``
 directory of your Python library.  The correct directory will be something like
 ``/usr/lib/python2.X/distutils`` on most Posix systems and something like
 ``C:\\Python2X\Lib\distutils`` on Windows machines.  Add the following lines
-to the file, substituting the correct Python version if necessary::
+to the file, substituting the correct Python version if necessary:
+
+.. code-block:: ini
 
     [install]
     install_lib = ~/lib/python2.3
@@ -1031,7 +1041,9 @@ location, because it is already configured to process ``.pth`` files, and
 EasyInstall already knows this.
 
 Before installing EasyInstall/setuptools, just create a ``~/.pydistutils.cfg``
-file with the following contents (or add this to the existing contents)::
+file with the following contents (or add this to the existing contents):
+
+.. code-block:: ini
 
     [install]
     install_lib = ~/Library/Python/$py_version_short/site-packages
@@ -1105,7 +1117,9 @@ Assuming that you want to install packages in a directory called ``~/py-lib``,
 and scripts in ``~/bin``, here's what you need to do:
 
 First, edit ``~/.pydistutils.cfg`` to include these settings, if you don't
-already have them::
+already have them:
+
+.. code-block:: ini
 
     [install]
     install_lib = ~/py-lib
diff --git a/docs/python3.txt b/docs/python3.txt
index 9b5fa7972c..d5c3da67f0 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -36,20 +36,21 @@ to a list of names of packages containing fixers.
 
 A typical setup.py can look something like this::
 
-      from setuptools import setup
-      
-      setup(name='your.module',
-            version = '1.0',
-            description='This is your awesome module',
-            author='You',
-            author_email='your@email',
-            package_dir = {'': 'src'},
-            packages = ['your', 'you.module'],
-            test_suite = 'your.module.tests',
-            use_2to3 = True,
-            convert_2to3_doctests = ['src/your/module/README.txt'],
-            use_2to3_fixers = ['your.fixers']
-            )
+    from setuptools import setup
+    
+    setup(
+        name='your.module',
+        version = '1.0',
+        description='This is your awesome module',
+        author='You',
+        author_email='your@email',
+        package_dir = {'': 'src'},
+        packages = ['your', 'you.module'],
+        test_suite = 'your.module.tests',
+        use_2to3 = True,
+        convert_2to3_doctests = ['src/your/module/README.txt'],
+        use_2to3_fixers = ['your.fixers']
+    )
 
 Differential conversion
 -----------------------
@@ -96,25 +97,26 @@ install process will continue as normal, but if you want to get rid of that
 error this is easy. Simply conditionally add the new parameters into an extra 
 dict and pass that dict into setup()::
 
-      from setuptools import setup
-      import sys
-      
-      extra = {}
-      if sys.version_info >= (3,):
-          extra['use_2to3'] = True
-          extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
-          extra['use_2to3_fixers'] = ['your.fixers']
-      
-      setup(name='your.module',
-            version = '1.0',
-            description='This is your awesome module',
-            author='You',
-            author_email='your@email',
-            package_dir = {'': 'src'},
-            packages = ['your', 'you.module'],
-            test_suite = 'your.module.tests',
-            **extra
-            )
+    from setuptools import setup
+    import sys
+    
+    extra = {}
+    if sys.version_info >= (3,):
+        extra['use_2to3'] = True
+        extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
+        extra['use_2to3_fixers'] = ['your.fixers']
+    
+    setup(
+        name='your.module',
+        version = '1.0',
+        description='This is your awesome module',
+        author='You',
+        author_email='your@email',
+        package_dir = {'': 'src'},
+        packages = ['your', 'you.module'],
+        test_suite = 'your.module.tests',
+        **extra
+    )
 
 This way the parameters will only be used under Python 3, where you have to
 use Distribute.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7c679fd08f..d5bd98b559 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -141,7 +141,7 @@ dependencies, and perhaps some data files and scripts::
             '': ['*.txt', '*.rst'],
             # And include any *.msg files found in the 'hello' package, too:
             'hello': ['*.msg'],
-        }
+        },
 
         # metadata for upload to PyPI
         author = "Me",
@@ -1117,7 +1117,9 @@ if they do, it might not be the right version.  Fixing this is easy; just
 download `distribute_setup.py`_, and put it in the same directory as your ``setup.py``
 script.  (Be sure to add it to your revision control system, too.)  Then add
 these two lines to the very top of your setup script, before the script imports
-anything from setuptools::
+anything from setuptools:
+
+.. code-block:: python
 
     import distribute_setup
     distribute_setup.use_setuptools()
@@ -1573,7 +1575,9 @@ Managing "Continuous Releases" Using Subversion
 If you expect your users to track in-development versions of your project via
 Subversion, there are a few additional steps you should take to ensure that
 things work smoothly with EasyInstall.  First, you should add the following
-to your project's ``setup.cfg`` file::
+to your project's ``setup.cfg`` file:
+
+.. code-block:: ini
 
     [egg_info]
     tag_build = .dev
@@ -1603,7 +1607,9 @@ their checkout URL (as described in the previous section) with an
 to download ``projectname==dev`` in order to get the latest in-development
 code.  Note that if your project depends on such in-progress code, you may wish
 to specify your ``install_requires`` (or other requirements) to include
-``==dev``, e.g.::
+``==dev``, e.g.:
+
+.. code-block:: python
 
     install_requires = ["OtherProject>=0.2a1.dev-r143,==dev"]
 
@@ -2406,7 +2412,9 @@ command::
     python setup.py upload_docs --upload-dir=docs/build/html
 
 As with any other ``setuptools`` based command, you can define useful
-defaults in the ``setup.cfg`` of your Python project, e.g.::
+defaults in the ``setup.cfg`` of your Python project, e.g.:
+
+.. code-block:: ini
 
     [upload_docs]
     upload-dir = docs/build/html
@@ -2594,7 +2602,9 @@ all the filenames within that directory (and any subdirectories thereof) that
 are under revision control.
 
 For example, if you were going to create a plugin for a revision control system
-called "foobar", you would write a function something like this::
+called "foobar", you would write a function something like this:
+
+.. code-block:: python
 
     def find_files_for_foobar(dirname):
         # loop to yield paths that start with `dirname`

From 48655c2b41138dd4efe483e78931f53d3d6f928d Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 8 Oct 2009 19:54:27 +0200
Subject: [PATCH 2611/8469] added distribute_setup_3k.py generation

--HG--
branch : distribute
extra : rebase_source : ce029e2f6fd53b2f279698637acb4a7de52be76d
---
 CHANGES.txt | 1 +
 README.txt  | 4 +++-
 release.sh  | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d59d26ef20..af02055210 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.4
 -----
 
+* Added the generation of distribute_setup_3k.py during the release.
 
 
 -----
diff --git a/README.txt b/README.txt
index d130cf90cc..d3dcf5fed7 100755
--- a/README.txt
+++ b/README.txt
@@ -74,7 +74,7 @@ distribute_setup.py
 ===================
 
 Download ``distribute_setup.py`` and execute it, using the Python interpreter of
-your choice.
+your choice. 
 
 If your shell has the ``wget`` program you can do::
 
@@ -86,6 +86,8 @@ If you are under Python 3, use ``distribute_setup_3k.py``::
     $ wget http://nightly.ziade.org/distribute_setup_3k.py
     $ python distribute_setup_3k.py
 
+Notice that both files are provided in the source release.
+
 easy_install or pip
 ===================
 
diff --git a/release.sh b/release.sh
index 555499ef1b..e0550535c6 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 export VERSION="0.6.4"
 
+# creating the 3k script
+cp distribute_setup.py distribute_setup.py.back 
+2to3 -w distribute_setup.py > /dev/null 
+mv distribute_setup.py distribute_setup_3k.py 
+mv distribute_setup.py.back distribute_setup.py
+
 # creating the releases
 rm -rf dist
 

From 5109e586c2ec65ba97803ebc171609e4c2243974 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 8 Oct 2009 20:14:32 +0200
Subject: [PATCH 2612/8469] more details on doc+anchor for pypi doc

--HG--
branch : distribute
extra : rebase_source : ec795fb88a6fa30141f7ecf3929e39ed16a84eea
---
 README.txt | 57 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/README.txt b/README.txt
index d3dcf5fed7..1f81342215 100755
--- a/README.txt
+++ b/README.txt
@@ -18,22 +18,26 @@ for working with Python module distributions.
 
 The fork has two goals:
 
-- Providing a backward compatible version to replace Setuptools 
+- Providing a backward compatible version to replace Setuptools
   and make all distributions that depend on Setuptools work as
   before, but with less bugs and behaviorial issues.
 
   This work is done in the 0.6.x series
 
-  Starting with version 0.6.2, Distribute supports Python 3. 
-  Installing and using distribute for Python 3 code works exactly 
-  the same as for Python 2 code, but Distribute also helps you to support 
-  Python 2 and Python 3 from the same source code by letting you run 2to3 
-  on the code as a part of the build process, by setting the keyword parameter 
-  ``use_2to3`` to True. See docs/python3.txt for more information.
+  Starting with version 0.6.2, Distribute supports Python 3.
+  Installing and using distribute for Python 3 code works exactly
+  the same as for Python 2 code, but Distribute also helps you to support
+  Python 2 and Python 3 from the same source code by letting you run 2to3
+  on the code as a part of the build process, by setting the keyword parameter
+  ``use_2to3`` to True. See XXX REPLACE WITH PYPI DOC XXXX
+  for more information.
 
 - Refactoring the code, and releasing it in several distributions.
   This work is being done in the 0.7.x series but not yet released.
 
+The roadmap is still evolving, and the page that is up-to-date is
+located at : `http://bitbucket.org/tarek/distribute/wiki/roadmap`.
+
 If you install `Distribute` and want to switch back for any reason to
 `Setuptools`, get to the `Uninstallation instructions`_ section.
 
@@ -41,21 +45,21 @@ More documentation
 ==================
 
 You can get more information in the Sphinx-based documentation, located
-in the archive in `docs`. This documentation includes the old Setuptools
+at XXX REPLACE WITH PYPI DOC XXXX. This documentation includes the old Setuptools
 documentation that is slowly replaced, and brand new content.
 
 About the installation process
 ==============================
 
 The `Distribute` installer modifies your installation by de-activating an
-existing installation of `Setuptools` in a bootstrap process. This process 
-has been tested in various installation schemes and contexts but in case of a 
+existing installation of `Setuptools` in a bootstrap process. This process
+has been tested in various installation schemes and contexts but in case of a
 bug during this process your Python installation might be left in a broken
-state. Since all modified files and directories are copied before the 
-installation, you will be able to get back to a normal state by reading
+state. Since all modified files and directories are copied before the
+installation starts, you will be able to get back to a normal state by reading
 the instructions in the `Uninstallation instructions`_ section.
 
-In any case, it is recommended to save you `site-packages` directory before 
+In any case, it is recommended to save you `site-packages` directory before
 you start the installation of `Distribute`.
 
 -------------------------
@@ -74,7 +78,7 @@ distribute_setup.py
 ===================
 
 Download ``distribute_setup.py`` and execute it, using the Python interpreter of
-your choice. 
+your choice.
 
 If your shell has the ``wget`` program you can do::
 
@@ -110,13 +114,14 @@ Download the source tarball, uncompress it, then run the install command::
 Uninstallation Instructions
 ---------------------------
 
-Like other distutils-based distributions, Distribute doesn't provide an 
-uninstaller yet. It's all done manually!
+Like other distutils-based distributions, Distribute doesn't provide an
+uninstaller yet. It's all done manually! We are all waiting for PEP 376 
+support in Python.
 
 Distribute is installed in three steps:
 
 1. it gets out of the way an existing installation of Setuptools
-2. it installs a `fake` setuptools installation 
+2. it installs a `fake` setuptools installation
 3. it installs distribute
 
 Distribute can be removed like this:
@@ -148,7 +153,7 @@ Install FAQ
    it fakes that the Setuptools installation is still present, so all the programs
    that where using Setuptools still work.
 
-   If it wasn't doing it, a program that would try to install Setuptools 
+   If it wasn't doing it, a program that would try to install Setuptools
    would overwrite in turn Distribute.
 
 - **How does Distribute interacts with virtualenv?**
@@ -156,6 +161,7 @@ Install FAQ
   Everytime you create a virtualenv it will install setuptools, so you need to
   re-install Distribute in it right after. The Distribute project will not
   attempt to patch virtualenv so it uses it when globally installed.
+  We will just wait for virtualenv to eventually switch to Distribute.
 
   Once installed, your virtualenv will use Distribute transparently.
 
@@ -163,18 +169,15 @@ Install FAQ
   and if the virtualenv you are in was generated without the `--no-site-packages`
   option, the Distribute installation will stop.
 
-  You need in this case to build a virtualenv with the --no-site-packages option
-  or to install `Distribute` globally.
+  You need in this case to build a virtualenv with the `--no-site-packages` 
+  option or to install `Distribute` globally.
 
 - **How does Distribute interacts with zc.buildout?**
 
-  Some work is being done on zc.buildout side to make its bootstrap
-  work with Distribute. Until then, using Distribute in zc.buildout is a bit
-  tricky because the bootstrap process of zc.buildout hardcodes the
-  installation of Setuptools.
-
-  The plan is to come with a custom bootstrap.py for zc.buildout for the
-  0.6.4 release, together with some small changes on zc.buildout side.
+  Starting at zc.buildout 1.4.0, you can use Distribute in your buildouts.
+  Although you have to run a specific `bootstrap.py` file that is available
+  at `http://nightly.ziade.org/bootstrap.py`. The code is located at
+  `http://bitbucket.org/tarek/buildout-distribute`.
 
 
 -----------------------------

From 31fa507de5ad50356bca8157340aec218a7573da Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 12:48:45 +0200
Subject: [PATCH 2613/8469] using the real URL

--HG--
branch : distribute
extra : rebase_source : 4dc1a0fb203789ce775b271a28ebb3817afadb06
---
 README.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index 49859c213e..a3f53d41b1 100755
--- a/README.txt
+++ b/README.txt
@@ -29,8 +29,8 @@ The fork has two goals:
   the same as for Python 2 code, but Distribute also helps you to support
   Python 2 and Python 3 from the same source code by letting you run 2to3
   on the code as a part of the build process, by setting the keyword parameter
-  ``use_2to3`` to True. See XXX REPLACE WITH PYPI DOC XXXX
-  for more information.
+  ``use_2to3`` to True. See http://packages.python.org/distribute for more 
+  information.
 
 - Refactoring the code, and releasing it in several distributions.
   This work is being done in the 0.7.x series but not yet released.
@@ -45,8 +45,8 @@ More documentation
 ==================
 
 You can get more information in the Sphinx-based documentation, located
-at XXX REPLACE WITH PYPI DOC XXXX. This documentation includes the old Setuptools
-documentation that is slowly replaced, and brand new content.
+at http://packages.python.org/distribute. This documentation includes the old 
+Setuptools documentation that is slowly replaced, and brand new content.
 
 About the installation process
 ==============================

From bd51d25890b72b3beda8b5c7e919a77cfb18ed25 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 12:50:40 +0200
Subject: [PATCH 2614/8469] added issue references

--HG--
branch : distribute
extra : rebase_source : 852102dad24de79aa20c4b17a83cceb691772e7b
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6685a0e4ad..f07d4cb838 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,9 +7,11 @@ CHANGES
 -----
 
 * Added the generation of `distribute_setup_3k.py` during the release.
+  This close http://bitbucket.org/tarek/distribute/issue/52.
 
 * Added an upload_docs command to easily upload project documentation to
   PyPI's http://packages.python.org.
+  This close http://bitbucket.org/tarek/distribute/issue/56.
 
 -----
 0.6.3

From 79f61d0c5d40e0d1e100d6f6754c9b1b4c003829 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 12:54:49 +0200
Subject: [PATCH 2615/8469] using a temp dir to avoid using the site.py that is
 in the current dir when 2to3 runs

--HG--
branch : distribute
extra : rebase_source : 18f1e97291dc5745849df981627630295acd601e
---
 release.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/release.sh b/release.sh
index e0550535c6..772bba971c 100755
--- a/release.sh
+++ b/release.sh
@@ -2,17 +2,21 @@
 export VERSION="0.6.4"
 
 # creating the 3k script
-cp distribute_setup.py distribute_setup.py.back 
-2to3 -w distribute_setup.py > /dev/null 
-mv distribute_setup.py distribute_setup_3k.py 
-mv distribute_setup.py.back distribute_setup.py
+mkdir ./temp
+cp distribute_setup.py ./temp/distribute_setup.py
+cd ./temp
+2to3 -w distribute_setup.py > /dev/null
+mv distribute_setup.py ../distribute_setup_3k.py
+cd ..
+rm -rf ./temp
 
 # creating the releases
-rm -rf dist
+rm -rf ./dist
 
 # now preparing the source release
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 
-# pushing the bootstrap script
+# pushing the bootstrap scripts
 scp distribute_setup.py ziade.org:nightly/build/
+scp distribute_setup_3k.py ziade.org:nightly/build/
 

From 45f3bc86a0829f76bc49d0167269987d97846bcd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 13:13:31 +0200
Subject: [PATCH 2616/8469] included roadmap and a few typo fixes. fixes #47

--HG--
branch : distribute
extra : rebase_source : a6677457030f92ff8da952fe47b4449f17b6f431
---
 docs/index.txt      |  4 +--
 docs/roadmap.txt    | 86 +++++++++++++++++++++++++++++++++++++++++++++
 docs/setuptools.txt | 14 ++++----
 3 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 docs/roadmap.txt

diff --git a/docs/index.txt b/docs/index.txt
index f814ff9be5..d733870219 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -6,11 +6,11 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
+   roadmap
+   python3
    setuptools
    easy_install
    pkg_resources
-   python3
-
 
 Indices and tables
 ==================
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
new file mode 100644
index 0000000000..e97ab57dc5
--- /dev/null
+++ b/docs/roadmap.txt
@@ -0,0 +1,86 @@
+=======
+Roadmap
+=======
+
+Distribute has two branches:
+
+- 0.6.x : provides a Setuptools-0.6c9 compatible version
+- 0.7.x : will provide a refactoring
+
+0.6.x
+=====
+
+Not "much" is going to happen here, we want this branch to be helpful
+to the community *today* by addressing the 40-or-so bugs
+that were found in Setuptools and never fixed. This is eventually
+happen soon because its development is
+fast : there are up to 5 commiters that are working on it very often
+(and the number grows weekly.)
+
+The biggest issue with this branch is that it is providing the same
+packages and modules setuptools does, and this
+requires some bootstrapping work where we make sure once Distribute is
+installed, all Distribution that requires Setuptools
+will continue to work. This is done by faking the metadata of
+Setuptools 0.6c9. That's the only way we found to do this.
+
+There's one major thing though: thanks to the work of Lennart, Alex,
+Martin, this branch supports Python 3,
+which is great to have to speed up Py3 adoption.
+
+The goal of the 0.6.x is to remove as much bugs as we can, and try if
+possible to remove the patches done
+on Distutils. We will support 0.6.x maintenance for years and we will
+promote its usage everywhere instead of
+Setuptools.
+
+Some new commands are added there, when they are helpful and don't
+interact with the rest. I am thinking
+about "upload_docs" that let you upload documentation to PyPI. The
+goal is to move it to Distutils
+at some point, if the documentation feature of PyPI stays and starts to be used.
+
+0.7.x
+=====
+
+We've started to refactor Distribute with this roadmap in mind (and
+no, as someone said, it's not vaporware,
+we've done a lot already)
+
+- 0.7.x can be installed and used with 0.6.x
+
+- easy_install is going to be deprecated ! use Pip !
+
+- the version system will be deprecated, in favor of the one in Distutils
+
+- no more Distutils monkey-patch that happens once you use the code
+ (things like 'from distutils import cmd; cmd.Command = CustomCommand')
+
+- no more custom site.py (that is: if something misses in Python's
+  site.py we'll add it there instead of patching it)
+
+- no more namespaced packages system, if PEP 381 (namespaces package
+  support) makes it to 2.7
+
+- The code is splitted in many packages and might be distributed under
+  several distributions.
+
+ - distribute.resources: that's the old pkg_resources, but
+   reorganized in clean, pep-8 modules. This package will
+   only contain the query APIs and will focus on being PEP 376
+   compatible. We will promote its usage and see if Pip wants
+   to use it as a basis. 
+   It will probably shrink a lot though, once the stdlib provides PEP 376 support.
+
+ - distribute.entrypoints: that's the old pkg_resources entry points
+   system, but on its own. it uses distribute.resources
+
+ - distribute.index: that's package_index and a few other things.
+   everything required to interact with PyPI. We will promote
+   its usage and see if Pip wants to use it as a basis.
+
+ - distribute.core (might be renamed to main): that's everything
+   else, and uses the other packages.
+
+Goal: A first release before (or when) Python 2.7 / 3.2 is out.
+
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d5bd98b559..2e2366f639 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1,8 +1,8 @@
-======================================================
-Building and Distributing Packages with ``setuptools``
-======================================================
+==================================================
+Building and Distributing Packages with Distribute
+==================================================
 
-``setuptools`` is a collection of enhancements to the Python ``distutils``
+``Distribute`` is a collection of enhancements to the Python ``distutils``
 (for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum
 of Python 2.4) that allow you to more easily build and distribute Python
 packages, especially ones that have dependencies on other packages.
@@ -2433,9 +2433,9 @@ The ``upload_docs`` command has the following options:
     http://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 
-------------------------------------
-Extending and Reusing ``setuptools``
-------------------------------------
+--------------------------------
+Extending and Reusing Distribute
+--------------------------------
 
 Creating ``distutils`` Extensions
 =================================

From fc30a740e46df3e3baed16112fc141ff1625d4a6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 13:14:24 +0200
Subject: [PATCH 2617/8469] updated the link to the roadmap

--HG--
branch : distribute
extra : rebase_source : e9d7a33b2dd618c95ff02d4ffe82f295d2e69826
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index a3f53d41b1..c480aef10a 100755
--- a/README.txt
+++ b/README.txt
@@ -36,7 +36,7 @@ The fork has two goals:
   This work is being done in the 0.7.x series but not yet released.
 
 The roadmap is still evolving, and the page that is up-to-date is
-located at : `http://bitbucket.org/tarek/distribute/wiki/roadmap`.
+located at : `http://packages.python.org/distribute/roadmap`.
 
 If you install `Distribute` and want to switch back for any reason to
 `Setuptools`, get to the `Uninstallation instructions`_ section.

From a5633e5ddf0063b1b58e2f0950ec50e1718cbdc7 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 13:51:09 +0200
Subject: [PATCH 2618/8469] pushing the doc as well

--HG--
branch : distribute
extra : rebase_source : 8b45c37dc3d3e4f2d3f91beb2f5867523f45f974
---
 release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 772bba971c..2b4d23387b 100755
--- a/release.sh
+++ b/release.sh
@@ -13,8 +13,8 @@ rm -rf ./temp
 # creating the releases
 rm -rf ./dist
 
-# now preparing the source release
-python2.6 setup.py -q egg_info -RDb '' sdist register upload
+# now preparing the source release, pushing it and its doc
+python2.6 setup.py -q egg_info -RDb '' sdist register upload sphinx_build upload_doc
 
 # pushing the bootstrap scripts
 scp distribute_setup.py ziade.org:nightly/build/

From 739f071eff009685fc70d6caa464c3eb799c9365 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 14:38:15 +0200
Subject: [PATCH 2619/8469] fixed use_setuptools

--HG--
branch : distribute
extra : rebase_source : ef32212ac795e851f32e63d1ec9fd7e3765caf92
---
 CHANGES.txt         |  2 ++
 README.txt          | 20 ++++++++++++++++++++
 distribute_setup.py |  1 +
 3 files changed, 23 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index f07d4cb838..6761b98ed2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,8 @@ CHANGES
   PyPI's http://packages.python.org.
   This close http://bitbucket.org/tarek/distribute/issue/56.
 
+* Fixed a bootstrap bug on the use_setuptools() API.
+
 -----
 0.6.3
 -----
diff --git a/README.txt b/README.txt
index c480aef10a..629a677fd1 100755
--- a/README.txt
+++ b/README.txt
@@ -143,6 +143,26 @@ Lastly:
 - remove the *.OLD.* directory located in your site-packages directory if any,
   **once you have checked everything was working correctly again**.
 
+-------------------------
+Quick help for developers
+-------------------------
+
+To use Distribute in your package, the recommended way is to ship
+`distribute_setup.py` alongside your `setup.py` script and call 
+it at the very begining of `setup.py` like this::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+
+Another way is to add ``Distribute`` in the ``install_requires`` option::
+
+    from setuptools import setup
+
+    setup(...
+          install_requires=['distribute']
+    )
+
 -----------
 Install FAQ
 -----------
diff --git a/distribute_setup.py b/distribute_setup.py
index dcea856ecc..bde6c762e6 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -132,6 +132,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         import pkg_resources
         if not hasattr(pkg_resources, '_distribute'):
+            fake_setuptools()
             raise ImportError
     except ImportError:
         return _do_download(version, download_base, to_dir, download_delay)

From a4cbd95effcc0a57603bac0feffc44e6d5905e4c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 14:58:40 +0200
Subject: [PATCH 2620/8469] starting more docs

--HG--
branch : distribute
extra : rebase_source : 9826d4158ddc98c84e56d2c54445ad9efba77be4
---
 docs/index.txt |  1 +
 docs/using.txt | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 docs/using.txt

diff --git a/docs/index.txt b/docs/index.txt
index d733870219..e64b8c8820 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -8,6 +8,7 @@ Contents:
 
    roadmap
    python3
+   using
    setuptools
    easy_install
    pkg_resources
diff --git a/docs/using.txt b/docs/using.txt
new file mode 100644
index 0000000000..192f1dc234
--- /dev/null
+++ b/docs/using.txt
@@ -0,0 +1,21 @@
+================================
+Using Distribute in your project
+================================
+
+To use Distribute in your project, the recommended way is to ship
+`distribute_setup.py` alongside your `setup.py` script and call 
+it at the very begining of `setup.py` like this::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+Another way is to add ``Distribute`` in the ``install_requires`` option::
+
+    from setuptools import setup
+
+    setup(...
+          install_requires=['distribute']
+    )
+
+
+XXX to be finished

From 4c9daf7b5983e6aecd04a35e51d1820b3702d4ba Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 9 Oct 2009 15:05:26 +0200
Subject: [PATCH 2621/8469] fixed zc.buildout rev

--HG--
branch : distribute
extra : rebase_source : 562654e69e7ff018b81d96bcb1e031cfa659273b
---
 README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 629a677fd1..219c65d9a6 100755
--- a/README.txt
+++ b/README.txt
@@ -194,7 +194,7 @@ Install FAQ
 
 - **How does Distribute interacts with zc.buildout?**
 
-  Starting at zc.buildout 1.4.0, you can use Distribute in your buildouts.
+  Starting at zc.buildout 1.4.2, you can use Distribute in your buildouts.
   Although you have to run a specific `bootstrap.py` file that is available
   at `http://nightly.ziade.org/bootstrap.py`. The code is located at
   `http://bitbucket.org/tarek/buildout-distribute`.

From c048eb0e670dc6081c319ff83357d7a676dde723 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 9 Oct 2009 22:05:45 +0000
Subject: [PATCH 2622/8469] replace callable()

---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index f49afcce13..eb7d01c0e4 100644
--- a/dist.py
+++ b/dist.py
@@ -545,7 +545,7 @@ def _parse_command_opts(self, parser, args):
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
                     help_option_found=1
-                    if callable(func):
+                    if hasattr(func, '__call__'):
                         func()
                     else:
                         raise DistutilsClassError(

From b76a5bf6c2386785eef7f3f3123878c22fba8145 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 10 Oct 2009 17:14:04 +0200
Subject: [PATCH 2623/8469] the parse API needs to return distribute when
 setuptools is asked

--HG--
branch : distribute
extra : rebase_source : 485e5999425fb57f1f0fce496ffc209a9bfe54e8
---
 distribute_setup.py | 52 ++++++++++++++++++++++++++-------------------
 pkg_resources.py    | 13 ++++++++++++
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index bde6c762e6..b40a9499a5 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -130,29 +130,34 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     was_imported = 'pkg_resources' in sys.modules or \
         'setuptools' in sys.modules
     try:
-        import pkg_resources
-        if not hasattr(pkg_resources, '_distribute'):
-            fake_setuptools()
-            raise ImportError
-    except ImportError:
-        return _do_download(version, download_base, to_dir, download_delay)
-    try:
-        pkg_resources.require("distribute>="+version)
-        return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of distribute (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U distribute'."
-            "\n\n(Currently using %r)") % (version, e.args[0])
-            sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                fake_setuptools()
+                raise ImportError
+        except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)
-    except pkg_resources.DistributionNotFound:
-        return _do_download(version, download_base, to_dir, download_delay)
-
+        try:
+            pkg_resources.require("distribute>="+version)
+            return
+        except pkg_resources.VersionConflict, e:
+            if was_imported:
+                print >>sys.stderr, (
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)") % (version, e.args[0])
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        _create_fake_setuptools_pkg_info(to_dir)
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
@@ -260,6 +265,9 @@ def _remove_flat_installation(placeholder):
 def _after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+def _create_fake_setuptools_pkg_info(placeholder):
     if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
         return
diff --git a/pkg_resources.py b/pkg_resources.py
index d0e840b867..20815ffe3b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2486,6 +2486,19 @@ def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
     #@staticmethod
     def parse(s):
+        # if asked for setuptools distribution
+        # and if distribute is installed, we want to give
+        # distribute instead
+        stripped_s = s.replace(' ', '')
+        stripped_s = stripped_s.strip()
+        if stripped_s in ('setuptools', 'setuptools==0.6c9',
+                          'setuptools>0.6c9', 'setuptools>=0.6c9'):
+            reqs = list(parse_requirements('distribute'))
+            if reqs:
+                if len(reqs)==1:
+                    # ok we can replace the requirement
+                    return reqs[0]
+
         reqs = list(parse_requirements(s))
         if reqs:
             if len(reqs)==1:

From 9a46d20ebd044b88c3d3c426f56c4b36372b2403 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 10 Oct 2009 17:19:20 +0200
Subject: [PATCH 2624/8469] added a note on shared eggs folder

--HG--
branch : distribute
extra : rebase_source : 09545a175010b1105b8223c90638e9180feeb1c2
---
 README.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.txt b/README.txt
index 219c65d9a6..ec167c2401 100755
--- a/README.txt
+++ b/README.txt
@@ -199,6 +199,10 @@ Install FAQ
   at `http://nightly.ziade.org/bootstrap.py`. The code is located at
   `http://bitbucket.org/tarek/buildout-distribute`.
 
+  Beware that if you use a shared eggs folder with buildout, you need to 
+  switch all buildouts that use it to distribute. This is due to the fact
+  that the setuptools eggs located in the shared folder will be replaced
+  by a fake one, alongside distribute.
 
 -----------------------------
 Feedback and getting involved

From ac54adff1c0ba86a9f98adf791a92a493f8c1e7d Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 10 Oct 2009 17:24:03 +0200
Subject: [PATCH 2625/8469] works with < 1.4.2 now :)

--HG--
branch : distribute
extra : rebase_source : dcc9176ae8bf7273ace82220b64a89c14830971e
---
 README.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index ec167c2401..66e84fc2a5 100755
--- a/README.txt
+++ b/README.txt
@@ -194,7 +194,8 @@ Install FAQ
 
 - **How does Distribute interacts with zc.buildout?**
 
-  Starting at zc.buildout 1.4.2, you can use Distribute in your buildouts.
+  You can use Distribute in your zc.buildout.
+
   Although you have to run a specific `bootstrap.py` file that is available
   at `http://nightly.ziade.org/bootstrap.py`. The code is located at
   `http://bitbucket.org/tarek/buildout-distribute`.

From 71127d47493fdde7862410afce593b6a0607863b Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 10 Oct 2009 18:11:26 +0200
Subject: [PATCH 2626/8469] returning if setuptools is not found

--HG--
branch : distribute
extra : rebase_source : e39726368ef61d71c6bf4b023ba050083584a941
---
 distribute_setup.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index b40a9499a5..59424ccc3f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -240,13 +240,14 @@ def _remove_flat_installation(placeholder):
             break
     if not found:
         log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Removing elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
     else:
-        log.warn('Removing elements out of the way...')
-        pkg_info = os.path.join(placeholder, file)
-        if os.path.isdir(pkg_info):
-            patched = _patch_egg_dir(pkg_info)
-        else:
-            patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
 
     if not patched:
         log.warn('%s already patched.', pkg_info)

From 5d7a14a28bc7d65a0b35af16a51e5d75e8459f27 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 11 Oct 2009 11:12:48 +0200
Subject: [PATCH 2627/8469] Added tag 0.6.4 for changeset e06c416e911c

--HG--
branch : distribute
extra : rebase_source : 8c16be7562d8dbf3143c9920182871e16f0025f9
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dc3dfd6b69..3ca10b19b7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2,3 +2,4 @@
 4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1
 41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2
 e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
+e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4

From 009a483d58c57a15f469232daa0de302a877d186 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 11 Oct 2009 11:22:25 +0200
Subject: [PATCH 2628/8469] starting 0.6.5

--HG--
branch : distribute
extra : rebase_source : 6925947fb2b7beef652eef8a2683cae710f46e58
---
 CHANGES.txt                          | 5 +++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 2 +-
 distribute_setup.py                  | 2 +-
 docs/conf.py                         | 2 +-
 release.sh                           | 5 +++--
 setup.py                             | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6761b98ed2..21624f3268 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+-----
+0.6.5
+-----
+
+
 -----
 0.6.4
 -----
diff --git a/README.txt b/README.txt
index 66e84fc2a5..0d94730306 100755
--- a/README.txt
+++ b/README.txt
@@ -105,9 +105,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.4.tar.gz
-    $ tar -xzvf distribute-0.6.4.tar.gz
-    $ cd distribute-0.6
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.5.tar.gz
+    $ tar -xzvf distribute-0.6.5.tar.gz
+    $ cd distribute-0.6.5
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index f4b74da0fd..3728f74f78 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 59424ccc3f..c8c319bd9e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.4"
+DEFAULT_VERSION = "0.6.5"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/docs/conf.py b/docs/conf.py
index bad1a578a3..f7e762eb3d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.4'
+version = '0.6.5'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 2b4d23387b..01c5daff83 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.4"
+export VERSION="0.6.5"
 
 # creating the 3k script
 mkdir ./temp
@@ -14,7 +14,8 @@ rm -rf ./temp
 rm -rf ./dist
 
 # now preparing the source release, pushing it and its doc
-python2.6 setup.py -q egg_info -RDb '' sdist register upload sphinx_build upload_doc
+python2.6 setup.py -q egg_info -RDb '' sdist register upload
+python2.6 setup.py build_sphinx upload_docs
 
 # pushing the bootstrap scripts
 scp distribute_setup.py ziade.org:nightly/build/
diff --git a/setup.py b/setup.py
index c4116559a8..13cbca7c5c 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.4"
+VERSION = "0.6.5"
 
 from setuptools import setup, find_packages
 import sys

From 2bb038c8b8d826f476b6f74867380c9a3a49810a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 11 Oct 2009 11:30:06 +0200
Subject: [PATCH 2629/8469] added tagging

--HG--
branch : distribute
extra : rebase_source : a757058ecff1e3fbce98b32276a5075dc84b2157
---
 release.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release.sh b/release.sh
index 01c5daff83..74be096561 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 export VERSION="0.6.5"
 
+# tagging
+hg tag $VERSION
+hg ci -m "bumped revision"
+
 # creating the 3k script
 mkdir ./temp
 cp distribute_setup.py ./temp/distribute_setup.py
@@ -21,3 +25,5 @@ python2.6 setup.py build_sphinx upload_docs
 scp distribute_setup.py ziade.org:nightly/build/
 scp distribute_setup_3k.py ziade.org:nightly/build/
 
+# starting the new dev
+

From 944ae98b10d38936e9493064ecc1d38a056307ed Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 11 Oct 2009 23:53:10 +0200
Subject: [PATCH 2630/8469] Make sure the Sphinx theme nature is included in
 the sdist

--HG--
branch : distribute
extra : rebase_source : 5dfd01f1594ebc0732bd6abe2ed93c8337adbd1e
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index b678dac4c9..1db36bfe99 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
-recursive-include docs *.py *.txt Makefile
+recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile
 include *.py
 include *.txt
 include MANIFEST.in

From 7ed4be906cc7195c4d15bdd7a8b2bfa8474cc6be Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 12 Oct 2009 14:47:40 -0700
Subject: [PATCH 2631/8469] fix a hole in sandboxing allowing builtin file to
 write outside of the sandbox

--HG--
branch : distribute
extra : rebase_source : 5ff181b30f41080ec0e0628c96abf270ffe1a730
---
 CHANGES.txt           | 2 ++
 setuptools/sandbox.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 21624f3268..4c16f37aed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.5
 -----
 
+* Fixed a hole in sandboxing allowing builtin file to write outside of
+  the sandbox.
 
 -----
 0.6.4
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 67cedde6f0..7b48783344 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -168,6 +168,12 @@ def __init__(self,sandbox):
     def _violation(self, operation, *args, **kw):
         raise SandboxViolation(operation, args, kw)
 
+    if _file:
+        def _file(self, path, mode='r', *args, **kw):
+            if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
+                self._violation("file", path, mode, *args, **kw)
+            return _file(path,mode,*args,**kw)
+
     def _open(self, path, mode='r', *args, **kw):
         if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
             self._violation("open", path, mode, *args, **kw)

From c22811e5e0f706060027a9fb4bc66a11926c4b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 12 Oct 2009 22:38:34 +0000
Subject: [PATCH 2632/8469] Fixed #7115: using paths instead of dotted name for
 extensions works too in distutils.command.build_ext

---
 command/build_ext.py    |  2 ++
 tests/test_build_ext.py | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index da9cbfd574..abc1584180 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -628,6 +628,8 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
+        if os.sep in ext_name:
+            ext_name = ext_name.replace(os.sep, '.')
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
         filename = self.get_ext_filename(ext_name)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 00733a46a7..5dffe2ca03 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -363,6 +363,16 @@ def test_setuptools_compat(self):
         path = cmd.get_ext_fullpath('lxml.etree')
         self.assertEquals(wanted, path)
 
+    def test_build_ext_path_with_os_sep(self):
+        dist = Distribution({'name': 'UpdateManager'})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        ext = sysconfig.get_config_var("SO")
+        ext_name = os.path.join('UpdateManager', 'fdsend')
+        ext_path = cmd.get_ext_fullpath(ext_name)
+        wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
+        self.assertEquals(ext_path, wanted)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 38407ff8a415196852c57b79531397e0799484ec Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Tue, 13 Oct 2009 12:03:21 +0300
Subject: [PATCH 2633/8469] Updated bootstrap URLs to point to
 python-distribute.org, and added links for them

--HG--
branch : distribute
extra : rebase_source : 2756800a880c7a6c2c8bdc1afa3a22a4f08c047b
---
 README.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 0d94730306..5ce8a728e6 100755
--- a/README.txt
+++ b/README.txt
@@ -22,7 +22,7 @@ The fork has two goals:
   and make all distributions that depend on Setuptools work as
   before, but with less bugs and behaviorial issues.
 
-  This work is done in the 0.6.x series
+  This work is done in the 0.6.x series.
 
   Starting with version 0.6.2, Distribute supports Python 3.
   Installing and using distribute for Python 3 code works exactly
@@ -77,17 +77,19 @@ provided online.
 distribute_setup.py
 ===================
 
-Download ``distribute_setup.py`` and execute it, using the Python interpreter of
-your choice.
+Download
+`distribute_setup.py <http://python-distribute.org/distribute_setup.py>`_
+and execute it, using the Python interpreter of your choice.
 
 If your shell has the ``curl`` program you can do::
 
-    $ curl -O http://nightly.ziade.org/distribute_setup.py
+    $ curl -O http://python-distribute.org/distribute_setup.py
     $ python distribute_setup.py
 
-If you are under Python 3, use ``distribute_setup_3k.py``::
+If you are under Python 3, use
+`distribute_setup_3k.py <http://python-distribute.org/distribute_setup_3k.py>`_::
 
-    $ curl -O http://nightly.ziade.org/distribute_setup_3k.py
+    $ curl -O http://python-distribute.org/distribute_setup_3k.py
     $ python distribute_setup_3k.py
 
 Notice that both files are provided in the source release.
@@ -197,7 +199,7 @@ Install FAQ
   You can use Distribute in your zc.buildout.
 
   Although you have to run a specific `bootstrap.py` file that is available
-  at `http://nightly.ziade.org/bootstrap.py`. The code is located at
+  at `http://python-distribute.org/bootstrap.py`. The code is located at
   `http://bitbucket.org/tarek/buildout-distribute`.
 
   Beware that if you use a shared eggs folder with buildout, you need to 

From 3bd277147c3c3a8342dbc3b3d51214d430049a6b Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Tue, 13 Oct 2009 13:28:17 +0200
Subject: [PATCH 2634/8469] Detecting buildout by looking in os.environ['_'] to
 see if it is a buildout command.  If that is the case: do not fake
 setuptools, just let yourself be installed as a buildout-managed egg.

--HG--
branch : distribute
extra : rebase_source : 03ae13a4b93098ba76b971f26a01070ad47e361a
---
 setup.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setup.py b/setup.py
index 13cbca7c5c..090d67032f 100755
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,7 @@
 VERSION = "0.6.5"
 
 from setuptools import setup, find_packages
+import os
 import sys
 scripts = []
 
@@ -48,7 +49,15 @@ def _easy_install_marker():
     return (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
             sys.argv[3] == '--dist-dir' and 'egg-dist-tmp-' in sys.argv[-1])
 
+def _buildout_marker():
+    command = os.environ.get('_')
+    if command:
+        return 'buildout' in os.path.basename(command)
+
 def _being_installed():
+    if _buildout_marker():
+        # Installed by buildout, don't mess with a global setuptools.
+        return False
     # easy_install marker
     return 'install' in sys.argv[1:] or _easy_install_marker()
 

From 9ab857e33e35a1ad3901d2aae622dbedcea95ac2 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Tue, 13 Oct 2009 13:29:58 +0200
Subject: [PATCH 2635/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : 2fda957d09f002072e1eea759be2e8fd98ebca5b
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4c16f37aed..e92f9cbf3a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ CHANGES
 0.6.5
 -----
 
+* When run from within buildout, no attempt is made to modify an existing
+  setuptools egg, whether in a shared egg directory or a system setuptools.
+
 * Fixed a hole in sandboxing allowing builtin file to write outside of
   the sandbox.
 

From 0bb327642ab9d78f421eabb92ead2820e915ffaa Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 13 Oct 2009 16:16:33 +0200
Subject: [PATCH 2636/8469] making sure a setuptools requirement is turned into
 a distribute one

--HG--
branch : distribute
extra : rebase_source : 444d838a772b878838d54c9dfc78afee4dbe83f2
---
 pkg_resources.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 20815ffe3b..30da98ed60 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -504,6 +504,12 @@ def resolve(self, requirements, env=None, installer=None):
 
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
+            project_name = req.project_name.strip()
+            project_name = project_name.replace(' ', '')
+            if project_name in ('setuptools', 'setuptools>=0.6c9',
+                                'setuptools==0.6c9'):
+                req = Requirement.parse('distribute')
+
             if req in processed:
                 # Ignore cyclic or redundant dependencies
                 continue

From 7b7e4db5d14e58233ca22cd64e18e842e319cffe Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 13 Oct 2009 16:17:18 +0200
Subject: [PATCH 2637/8469] added a new option to drive the fakery when
 use_setuptools is called

--HG--
branch : distribute
extra : rebase_source : db0801762e31ee9414bbf6bca078681ce2b9b955
---
 distribute_setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index c8c319bd9e..cf56fb28ea 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -124,7 +124,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15):
+                   to_dir=os.curdir, download_delay=15, no_fake=False):
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
@@ -133,7 +133,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         try:
             import pkg_resources
             if not hasattr(pkg_resources, '_distribute'):
-                fake_setuptools()
+                if not no_fake:
+                    fake_setuptools()
                 raise ImportError
         except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)

From 6045d1576b41c9ac28064f2751ec07e1034cc182 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 13 Oct 2009 16:49:51 +0200
Subject: [PATCH 2638/8469] using project_name instead so we don't bother with
 the version

--HG--
branch : distribute
extra : rebase_source : c878e223405487eb8b58c69ba7d0b62b02c7d4cd
---
 distribute.egg-info/entry_points.txt |  2 +-
 pkg_resources.py                     | 30 ++++++++++------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 3728f74f78..f4b74da0fd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/pkg_resources.py b/pkg_resources.py
index 30da98ed60..cb0b8cf014 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -504,10 +504,7 @@ def resolve(self, requirements, env=None, installer=None):
 
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
-            project_name = req.project_name.strip()
-            project_name = project_name.replace(' ', '')
-            if project_name in ('setuptools', 'setuptools>=0.6c9',
-                                'setuptools==0.6c9'):
+            if req.project_name == 'setuptools':
                 req = Requirement.parse('distribute')
 
             if req in processed:
@@ -2492,23 +2489,18 @@ def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
     #@staticmethod
     def parse(s):
-        # if asked for setuptools distribution
-        # and if distribute is installed, we want to give
-        # distribute instead
-        stripped_s = s.replace(' ', '')
-        stripped_s = stripped_s.strip()
-        if stripped_s in ('setuptools', 'setuptools==0.6c9',
-                          'setuptools>0.6c9', 'setuptools>=0.6c9'):
-            reqs = list(parse_requirements('distribute'))
-            if reqs:
-                if len(reqs)==1:
-                    # ok we can replace the requirement
-                    return reqs[0]
-
         reqs = list(parse_requirements(s))
         if reqs:
-            if len(reqs)==1:
-                return reqs[0]
+            if len(reqs) == 1:
+                founded_req = reqs[0]
+                # if asked for setuptools distribution
+                # and if distribute is installed, we want to give
+                # distribute instead
+                if founded_req.project_name == 'setuptools':
+                    try:
+                        return self.parse('distribute')
+                    except ValueError:
+                        return founded_req
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
 

From 18ab43df7b80c452bdfd3c574f2f6aaf9d0056f8 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 13 Oct 2009 16:51:00 +0200
Subject: [PATCH 2639/8469] no setuptools req are returned

--HG--
branch : distribute
extra : rebase_source : 9f1046762c344f8646742365d4beca34ae51c228
---
 pkg_resources.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index cb0b8cf014..baee6fc7e4 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2501,6 +2501,8 @@ def parse(s):
                         return self.parse('distribute')
                     except ValueError:
                         return founded_req
+                return founded_req
+
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
 

From 4390fda55407b0fec9cedecc119381a51df09534 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 13 Oct 2009 17:25:42 +0200
Subject: [PATCH 2640/8469] fixed the parsed api when dealing with setuptools
 name

--HG--
branch : distribute
extra : rebase_source : 9490c98e075e2473c7a7310822103f375d5f3832
---
 pkg_resources.py                   | 11 ++++++-----
 setuptools/tests/test_resources.py | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index baee6fc7e4..2712e9f13a 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2497,11 +2497,12 @@ def parse(s):
                 # and if distribute is installed, we want to give
                 # distribute instead
                 if founded_req.project_name == 'setuptools':
-                    try:
-                        return self.parse('distribute')
-                    except ValueError:
-                        return founded_req
-                return founded_req
+                    distribute = list(parse_requirements('distribute'))
+                    if len(distribute) == 1:
+                        return distribute[0]
+                    return founded_req
+                else:
+                    return founded_req
 
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 8f100419c0..d53aef5640 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -143,7 +143,7 @@ def testResolve(self):
         self.assertRaises(VersionConflict, ws.resolve,
             parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
-        
+
         # Request an extra that causes an unresolved dependency for "Baz"
         self.assertRaises(
             DistributionNotFound, ws.resolve,parse_requirements("Foo[bar]"), ad
@@ -161,7 +161,7 @@ def testResolve(self):
         self.assertRaises( VersionConflict,
             ws.resolve, parse_requirements("Foo==1.2\nFoo!=1.2"), ad
         )
-        
+
     def testDistroDependsOptions(self):
         d = self.distRequires("""
             Twisted>=1.5
@@ -341,18 +341,18 @@ def testOptionsAndHashing(self):
         )
 
     def testVersionEquality(self):
-        r1 = Requirement.parse("setuptools==0.3a2")
-        r2 = Requirement.parse("setuptools!=0.3a4")
+        r1 = Requirement.parse("foo==0.3a2")
+        r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.failIf(d("setuptools-0.3a4.egg") in r1)
-        self.failIf(d("setuptools-0.3a1.egg") in r1)
-        self.failIf(d("setuptools-0.3a4.egg") in r2)
+        self.failIf(d("foo-0.3a4.egg") in r1)
+        self.failIf(d("foo-0.3a1.egg") in r1)
+        self.failIf(d("foo-0.3a4.egg") in r2)
 
-        self.failUnless(d("setuptools-0.3a2.egg") in r1)
-        self.failUnless(d("setuptools-0.3a2.egg") in r2)
-        self.failUnless(d("setuptools-0.3a3.egg") in r2)
-        self.failUnless(d("setuptools-0.3a5.egg") in r2)
+        self.failUnless(d("foo-0.3a2.egg") in r1)
+        self.failUnless(d("foo-0.3a2.egg") in r2)
+        self.failUnless(d("foo-0.3a3.egg") in r2)
+        self.failUnless(d("foo-0.3a5.egg") in r2)
 
 
 

From 6d9f15b9f35719b016c34d96f2c23e05e1a0e1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 13 Oct 2009 21:17:34 +0000
Subject: [PATCH 2641/8469] complementary fix for #7115

---
 command/build_ext.py    |  6 ++++--
 tests/test_build_ext.py | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index abc1584180..8248089fec 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -628,8 +628,10 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
-        if os.sep in ext_name:
-            ext_name = ext_name.replace(os.sep, '.')
+        # makes sure the extension name is only using dots
+        all_dots = string.maketrans('/'+os.sep, '..')
+        ext_name = ext_name.translate(all_dots)
+
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
         filename = self.get_ext_filename(ext_name)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5dffe2ca03..93d18814bc 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -373,6 +373,19 @@ def test_build_ext_path_with_os_sep(self):
         wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
         self.assertEquals(ext_path, wanted)
 
+    def test_build_ext_path_cross_platform(self):
+        if sys.platform != 'win32':
+            return
+        dist = Distribution({'name': 'UpdateManager'})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        ext = sysconfig.get_config_var("SO")
+        # this needs to work even under win32
+        ext_name = 'UpdateManager/fdsend'
+        ext_path = cmd.get_ext_fullpath(ext_name)
+        wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
+        self.assertEquals(ext_path, wanted)
+
 def test_suite():
     if not sysconfig.python_build:
         if test_support.verbose:

From 774fb7a0387f33b8dbcd0cbb46e7ea0c15049260 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Wed, 14 Oct 2009 12:20:53 +0200
Subject: [PATCH 2642/8469] tiny tweak in docstring to not throw off emacs'
 syntax highligting

--HG--
branch : distribute
extra : rebase_source : b5719cdd1428dc109af18925312b773cbaa0e22b
---
 distribute.egg-info/entry_points.txt | 2 +-
 pkg_resources.py                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index f4b74da0fd..0aaa28c086 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.5 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/pkg_resources.py b/pkg_resources.py
index 2712e9f13a..fec60626d5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -540,7 +540,7 @@ def find_plugins(self,
                 Environment(plugin_dirlist)
             )
             map(working_set.add, distributions)  # add plugins+libs to sys.path
-            print "Couldn't load", errors        # display errors
+            print 'Could not load', errors        # display errors
 
         The `plugin_env` should be an ``Environment`` instance that contains
         only distributions that are in the project's "plugin directory" or

From 2bc44120a777de52ae38f4c932db074bc300f4c9 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Wed, 14 Oct 2009 12:25:10 +0200
Subject: [PATCH 2643/8469] marked the two spots where a setuptools < 0.7 check
 needs to happen

--HG--
branch : distribute
extra : rebase_source : 1bca77205a947da3227c069e237951258fc72ffb
---
 pkg_resources.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index fec60626d5..2fbf415dcd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -505,6 +505,7 @@ def resolve(self, requirements, env=None, installer=None):
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
             if req.project_name == 'setuptools':
+                # TODO: only return distribute if setuptools < 0.7
                 req = Requirement.parse('distribute')
 
             if req in processed:
@@ -2497,6 +2498,7 @@ def parse(s):
                 # and if distribute is installed, we want to give
                 # distribute instead
                 if founded_req.project_name == 'setuptools':
+                    # TODO: only return distribute if setuptools < 0.7
                     distribute = list(parse_requirements('distribute'))
                     if len(distribute) == 1:
                         return distribute[0]

From f0daab74fc160d92ff534af1097c892140f6a46b Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Wed, 14 Oct 2009 12:35:31 +0200
Subject: [PATCH 2644/8469] Indicated spot where extra setuptools >= 0.7 check
 needs to happen

--HG--
branch : distribute
extra : rebase_source : 6b80caf47a8c7642e629af9f271f33e25a7c890f
---
 pkg_resources.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2fbf415dcd..1d5d864329 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2239,6 +2239,10 @@ def insert_on(self, path, loc = None):
         """Insert self.location in path before its nearest parent directory"""
 
         loc = loc or self.location
+
+        # TODO: raise error if we're adding setuptools >= 0.7 as that is
+        # guaranteed to be incompatible with distribute.
+
         if not loc:
             return
 

From dd2b4ffb2f582bf8270c0ceed490bf035a9e553b Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Wed, 14 Oct 2009 14:39:55 +0200
Subject: [PATCH 2645/8469] Distribute no longer shadows setuptools if we
 require a 0.7-series   setuptools. Added _override_setuptools() checker
 method and calling it in two places that checks whether we request a
 setuptools from the 0.7 series. Including test.

--HG--
branch : distribute
extra : rebase_source : 51c89e02721de2e31c9392d1ead76ac1e828810c
---
 CHANGES.txt                        |  3 +++
 pkg_resources.py                   | 26 ++++++++++++++++++++++----
 setuptools/tests/test_resources.py | 24 ++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e92f9cbf3a..73a10b36a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ CHANGES
 0.6.5
 -----
 
+* Distribute no longer shadows setuptools if we require a 0.7-series
+  setuptools. 
+
 * When run from within buildout, no attempt is made to modify an existing
   setuptools egg, whether in a shared egg directory or a system setuptools.
 
diff --git a/pkg_resources.py b/pkg_resources.py
index 1d5d864329..510be536fa 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -504,8 +504,7 @@ def resolve(self, requirements, env=None, installer=None):
 
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
-            if req.project_name == 'setuptools':
-                # TODO: only return distribute if setuptools < 0.7
+            if _override_setuptools(req):
                 req = Requirement.parse('distribute')
 
             if req in processed:
@@ -2501,8 +2500,7 @@ def parse(s):
                 # if asked for setuptools distribution
                 # and if distribute is installed, we want to give
                 # distribute instead
-                if founded_req.project_name == 'setuptools':
-                    # TODO: only return distribute if setuptools < 0.7
+                if _override_setuptools(founded_req):
                     distribute = list(parse_requirements('distribute'))
                     if len(distribute) == 1:
                         return distribute[0]
@@ -2526,6 +2524,26 @@ def parse(s):
 }
 
 
+def _override_setuptools(req):
+    """Return True when distribute wants to override a setuptools dependency.
+
+    We want to override when the requirement is setuptools and the version is
+    a variant of 0.6.
+
+    """
+    if req.project_name == 'setuptools':
+        if not len(req.specs):
+            # Just setuptools: ok
+            return True
+        for comparator, version in req.specs:
+            if comparator in ['==', '>=', '>']:
+                if '0.7' in version:
+                    # We want some setuptools not from the 0.6 series.
+                    return False
+        return True
+    return False
+
+
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
     if not isinstance(cls,type):
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index d53aef5640..c9236e88f6 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -354,8 +354,28 @@ def testVersionEquality(self):
         self.failUnless(d("foo-0.3a3.egg") in r2)
         self.failUnless(d("foo-0.3a5.egg") in r2)
 
-
-
+    def testDistributeSetuptoolsOverride(self):
+        # Plain setuptools or distribute mean we return distribute.
+        self.assertEqual(
+            Requirement.parse('setuptools').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('distribute').project_name, 'distribute')
+        # setuptools lower than 0.7 means distribute
+        self.assertEqual(
+            Requirement.parse('setuptools==0.6c9').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools==0.6c10').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools>=0.6').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools < 0.7').project_name, 'distribute')
+        # setuptools 0.7 and higher means setuptools.
+        self.assertEqual(
+            Requirement.parse('setuptools == 0.7').project_name, 'setuptools')
+        self.assertEqual(
+            Requirement.parse('setuptools == 0.7a1').project_name, 'setuptools')
+        self.assertEqual(
+            Requirement.parse('setuptools >= 0.7').project_name, 'setuptools')
 
 
 

From 03a95e191c1e128a04911ae415a36cbcb6ab1901 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Wed, 14 Oct 2009 15:22:44 +0200
Subject: [PATCH 2646/8469] an error is raised when installing a 0.7 setuptools
 with distribute

--HG--
branch : distribute
extra : rebase_source : f68fe9818972a09d858f2bb59ef47682353f600d
---
 CHANGES.txt                        |  3 ++-
 pkg_resources.py                   |  7 +++++--
 setuptools/tests/test_resources.py | 19 +++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 73a10b36a8..3229a83151 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,8 @@ CHANGES
 -----
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
-  setuptools. 
+  setuptools.  And an error is raised when installing a 0.7 setuptools with
+  distribute.
 
 * When run from within buildout, no attempt is made to modify an existing
   setuptools egg, whether in a shared egg directory or a system setuptools.
diff --git a/pkg_resources.py b/pkg_resources.py
index 510be536fa..c03718649b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2239,8 +2239,11 @@ def insert_on(self, path, loc = None):
 
         loc = loc or self.location
 
-        # TODO: raise error if we're adding setuptools >= 0.7 as that is
-        # guaranteed to be incompatible with distribute.
+        if self.project_name == 'setuptools':
+            if '0.7' in self.version:
+                raise ValueError(
+                    "A 0.7-series setuptools cannot be installed "
+                    "with distribute")
 
         if not loc:
             return
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c9236e88f6..6a89e8a834 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -187,10 +187,21 @@ def testDistroDependsOptions(self):
         )
         self.assertRaises(UnknownExtra, d.requires, ["foo"])
 
-
-
-
-
+    def testSetuptoolsDistributeCombination(self):
+        # Ensure that installing a 0.7-series setuptools fails.  PJE says that
+        # it will not co-exist.
+        ws = WorkingSet([])
+        d = Distribution(
+            "/some/path",
+            project_name="setuptools",
+            version="0.7a1")
+        self.assertRaises(ValueError, ws.add, d)
+        # A 0.6-series is no problem
+        d2 = Distribution(
+            "/some/path",
+            project_name="setuptools",
+            version="0.6c9")
+        ws.add(d2)
 
 
 

From 898ac3ef244465848be4748fc68a6ae4083fc394 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 14 Oct 2009 16:05:29 +0200
Subject: [PATCH 2647/8469] doc typo. fixes 67

--HG--
branch : distribute
extra : rebase_source : 2f89aa2f065390966c0dad309e91ac8e30de5dfc
---
 CHANGES.txt      | 2 ++
 docs/roadmap.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3229a83151..88dd59b1e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.5
 -----
 
+* Issue 67: Fixed doc typo (PEP 381/382) 
+
 * Distribute no longer shadows setuptools if we require a 0.7-series
   setuptools.  And an error is raised when installing a 0.7 setuptools with
   distribute.
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index e97ab57dc5..6182ed3bf6 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -59,7 +59,7 @@ we've done a lot already)
 - no more custom site.py (that is: if something misses in Python's
   site.py we'll add it there instead of patching it)
 
-- no more namespaced packages system, if PEP 381 (namespaces package
+- no more namespaced packages system, if PEP 382 (namespaces package
   support) makes it to 2.7
 
 - The code is splitted in many packages and might be distributed under

From f35ccfd8afd630d3b3445fa74ee6fde4edd5ee3e Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 14 Oct 2009 19:49:51 +0200
Subject: [PATCH 2648/8469] removing windows EOL lines

--HG--
branch : distribute
extra : rebase_source : e5792b2f337a38b603dc6a920d3bfe418e3f2722
---
 setuptools/tests/win_script_wrapper.txt | 274 ++++++++++++------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 2d95502e35..2e1bff7434 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -1,137 +1,137 @@
-Python Script Wrapper for Windows
-=================================
-
-setuptools includes wrappers for Python scripts that allows them to be
-executed like regular windows programs.  There are 2 wrappers, once
-for command-line programs, cli.exe, and one for graphica programs,
-gui.exe.  These programs are almost identical, function pretty much
-the same way, and are generated from the same source file.  The
-wrapper programs are used by copying them to the directory containing
-the script they are to wrap and with the same name as the script they
-are to wrap.  In the rest of this document, we'll give an example that
-will illustrate this.
-
-Let's create a simple script, foo-script.py:
-
-    >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
-    >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
-    ... """#!%(python_exe)s
-    ... import sys
-    ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
-    ... if __debug__:
-    ...     print 'non-optimized'
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-
-Note that the script starts with a Unix-style '#!' line saying which
-Python executable to run.  The wrapper will use this to find the
-correct Python executable.
-
-We'll also copy cli.exe to the sample-directory with the name foo.exe:
-
-    >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'foo.exe'), 'wb').write(
-    ...     pkg_resources.resource_string('setuptools', 'cli.exe')
-    ...     )
-
-When the copy of cli.exe, foo.exe in this example, runs, it examines
-the path name it was run with and computes a Python script path name
-by removing the '.exe' suffic and adding the '-script.py' suffix. (For
-GUI programs, the suffix '-script-pyw' is added.)  This is why we
-named out script the way we did.  Now we can run out script by running
-the wrapper:
-
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))
-    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
-    >>> input.write('hello\nworld\n')
-    >>> input.close()
-    >>> print output.read(),
-    \foo-script.py
-    ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
-    'hello\nworld\n'
-    non-optimized
-
-This example was a little pathological in that it exercised windows
-(MS C runtime) quoting rules:
-
-- Strings containing spaces are surrounded by double quotes.
-
-- Double quotes in strings need to be escaped by preceding them with
-  back slashes.
-
-- One or more backslashes preceding double quotes quotes need to be
-  escaped by preceding each of them them with back slashes.
-
-
-Specifying Python Command-line Options
---------------------------------------
-
-You can specify a single argument on the '#!' line.  This can be used
-to specify Python options like -O, to run in optimized mode or -i
-to start the interactive interpreter.  You can combine multiple
-options as usual. For example, to run in optimized mode and
-enter the interpreter after running the script, you could use -Oi:
-
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
-    ... """#!%(python_exe)s  -Oi  
-    ... import sys
-    ... input = repr(sys.stdin.read())
-    ... print sys.argv[0][-14:]
-    ... print sys.argv[1:]
-    ... print input
-    ... if __debug__:
-    ...     print 'non-optimized'
-    ... sys.ps1 = '---'
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-
-    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
-    >>> input.close()
-    >>> print output.read(),
-    \foo-script.py
-    []
-    ''
-    ---
-
-Testing the GUI Version
------------------------
-
-Now let's test the GUI version with the simple scipt, bar-script.py:
-
-    >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
-    >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'bar-script.pyw'), 'w').write(
-    ... """#!%(python_exe)s
-    ... import sys
-    ... open(sys.argv[1], 'wb').write(repr(sys.argv[2]))
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-
-We'll also copy gui.exe to the sample-directory with the name bar.exe:
-
-    >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'bar.exe'), 'wb').write(
-    ...     pkg_resources.resource_string('setuptools', 'gui.exe')
-    ...     )
-
-Finally, we'll run the script and check the result:
-
-    >>> import os
-    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
-    ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
-    >>> input.close()
-    >>> print output.read()
-    <BLANKLINE>
-    >>> print open(os.path.join(sample_directory, 'test_output.txt'), 'rb').read()
-    'Test Argument'
-
-
-We're done with the sample_directory:
-
-    >>> import shutil
-    >>> shutil.rmtree(sample_directory)
-
+Python Script Wrapper for Windows
+=================================
+
+setuptools includes wrappers for Python scripts that allows them to be
+executed like regular windows programs.  There are 2 wrappers, once
+for command-line programs, cli.exe, and one for graphica programs,
+gui.exe.  These programs are almost identical, function pretty much
+the same way, and are generated from the same source file.  The
+wrapper programs are used by copying them to the directory containing
+the script they are to wrap and with the same name as the script they
+are to wrap.  In the rest of this document, we'll give an example that
+will illustrate this.
+
+Let's create a simple script, foo-script.py:
+
+    >>> import os, sys, tempfile
+    >>> from setuptools.command.easy_install import nt_quote_arg
+    >>> sample_directory = tempfile.mkdtemp()
+    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
+    ... """#!%(python_exe)s
+    ... import sys
+    ... input = repr(sys.stdin.read())
+    ... print sys.argv[0][-14:]
+    ... print sys.argv[1:]
+    ... print input
+    ... if __debug__:
+    ...     print 'non-optimized'
+    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+
+Note that the script starts with a Unix-style '#!' line saying which
+Python executable to run.  The wrapper will use this to find the
+correct Python executable.
+
+We'll also copy cli.exe to the sample-directory with the name foo.exe:
+
+    >>> import pkg_resources
+    >>> open(os.path.join(sample_directory, 'foo.exe'), 'wb').write(
+    ...     pkg_resources.resource_string('setuptools', 'cli.exe')
+    ...     )
+
+When the copy of cli.exe, foo.exe in this example, runs, it examines
+the path name it was run with and computes a Python script path name
+by removing the '.exe' suffic and adding the '-script.py' suffix. (For
+GUI programs, the suffix '-script-pyw' is added.)  This is why we
+named out script the way we did.  Now we can run out script by running
+the wrapper:
+
+    >>> import os
+    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'foo.exe'))
+    ...               + r' arg1 "arg 2" "arg \"2\\\"" "arg 4\\" "arg5 a\\b"')
+    >>> input.write('hello\nworld\n')
+    >>> input.close()
+    >>> print output.read(),
+    \foo-script.py
+    ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
+    'hello\nworld\n'
+    non-optimized
+
+This example was a little pathological in that it exercised windows
+(MS C runtime) quoting rules:
+
+- Strings containing spaces are surrounded by double quotes.
+
+- Double quotes in strings need to be escaped by preceding them with
+  back slashes.
+
+- One or more backslashes preceding double quotes quotes need to be
+  escaped by preceding each of them them with back slashes.
+
+
+Specifying Python Command-line Options
+--------------------------------------
+
+You can specify a single argument on the '#!' line.  This can be used
+to specify Python options like -O, to run in optimized mode or -i
+to start the interactive interpreter.  You can combine multiple
+options as usual. For example, to run in optimized mode and
+enter the interpreter after running the script, you could use -Oi:
+
+    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
+    ... """#!%(python_exe)s  -Oi  
+    ... import sys
+    ... input = repr(sys.stdin.read())
+    ... print sys.argv[0][-14:]
+    ... print sys.argv[1:]
+    ... print input
+    ... if __debug__:
+    ...     print 'non-optimized'
+    ... sys.ps1 = '---'
+    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+
+    >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
+    >>> input.close()
+    >>> print output.read(),
+    \foo-script.py
+    []
+    ''
+    ---
+
+Testing the GUI Version
+-----------------------
+
+Now let's test the GUI version with the simple scipt, bar-script.py:
+
+    >>> import os, sys, tempfile
+    >>> from setuptools.command.easy_install import nt_quote_arg
+    >>> sample_directory = tempfile.mkdtemp()
+    >>> open(os.path.join(sample_directory, 'bar-script.pyw'), 'w').write(
+    ... """#!%(python_exe)s
+    ... import sys
+    ... open(sys.argv[1], 'wb').write(repr(sys.argv[2]))
+    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+
+We'll also copy gui.exe to the sample-directory with the name bar.exe:
+
+    >>> import pkg_resources
+    >>> open(os.path.join(sample_directory, 'bar.exe'), 'wb').write(
+    ...     pkg_resources.resource_string('setuptools', 'gui.exe')
+    ...     )
+
+Finally, we'll run the script and check the result:
+
+    >>> import os
+    >>> input, output = os.popen4('"'+nt_quote_arg(os.path.join(sample_directory, 'bar.exe'))
+    ...               + r' "%s" "Test Argument"' % os.path.join(sample_directory, 'test_output.txt'))
+    >>> input.close()
+    >>> print output.read()
+    <BLANKLINE>
+    >>> print open(os.path.join(sample_directory, 'test_output.txt'), 'rb').read()
+    'Test Argument'
+
+
+We're done with the sample_directory:
+
+    >>> import shutil
+    >>> shutil.rmtree(sample_directory)
+

From 87213900312e662b805b2956d179a81521029487 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 14 Oct 2009 19:53:59 +0200
Subject: [PATCH 2649/8469] Now cli.exe and gui.exe are generated at build time
 - win_script_wrapper.txt covers this case - refs #65

--HG--
branch : distribute
extra : rebase_source : 940bcb596a59153bc62056328b75cb670fa44273
---
 CHANGES.txt                          |  3 +++
 distribute.egg-info/entry_points.txt |  2 +-
 setup.py                             | 36 ++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 88dd59b1e9..c9f1713e22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ CHANGES
 0.6.5
 -----
 
+* Issue 65: cli.exe and gui.exe are not generated at build time,
+  depending on the platform in use.
+
 * Issue 67: Fixed doc typo (PEP 381/382) 
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 0aaa28c086..f4b74da0fd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.5 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setup.py b/setup.py
index 090d67032f..1459ffe945 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 """Distutils setup file, used to install or test 'setuptools'"""
-
-import sys, os
+import sys
+import os
+import platform
 
 src_root = None
 if sys.version_info >= (3,):
@@ -39,10 +40,36 @@
 VERSION = "0.6.5"
 
 from setuptools import setup, find_packages
-import os
-import sys
+from setuptools.command.build_py import build_py as _build_py
 scripts = []
 
+# specific command that is used to generate windows .exe files
+class build_py(_build_py):
+    def build_package_data(self):
+        """Copy data files into build directory"""
+        lastdir = None
+        is_64 =  platform.architecture()[0] == '64bit'
+
+        for package, src_dir, build_dir, filenames in self.data_files:
+            for filename in filenames:
+                target = os.path.join(build_dir, filename)
+                self.mkpath(os.path.dirname(target))
+                srcfile = os.path.join(src_dir, filename)
+                outf, copied = self.copy_file(srcfile, target)
+
+                # creating cli.exe and gui.exe
+                if filename in ('gui-32.exe', 'cli-32.exe') and not is_64:
+                    exe_target = os.path.join(build_dir, filename.replace('-32.exe', '.exe'))
+                    self.copy_file(srcfile, exe_target)
+
+                if filename in ('gui-64.exe', 'cli-64.exe') and is_64:
+                    exe_target = os.path.join(build_dir, filename.replace('-64.exe', '.exe'))
+                    self.copy_file(srcfile, exe_target)
+
+                srcfile = os.path.abspath(srcfile)
+                if copied and srcfile in self.distribution.convert_2to3_doctests:
+                    self.__doctests_2to3.append(outf)
+
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
 def _easy_install_marker():
@@ -149,6 +176,7 @@ def _being_installed():
     Topic :: System :: Systems Administration
     Topic :: Utilities""".splitlines() if f.strip()],
     scripts = scripts,
+    cmdclass = {'build_py': build_py}
 )
 
 if _being_installed():

From c4ba04373c08da643c5f1b9a0012857acc8e7262 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 14 Oct 2009 19:54:44 +0200
Subject: [PATCH 2650/8469] typo

--HG--
branch : distribute
extra : rebase_source : 61f2b4f32f0317b02463282d5dc41cb3f245e744
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c9f1713e22..5ccd32be82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.5
 -----
 
-* Issue 65: cli.exe and gui.exe are not generated at build time,
+* Issue 65: cli.exe and gui.exe are now generated at build time,
   depending on the platform in use.
 
 * Issue 67: Fixed doc typo (PEP 381/382) 

From 10fa5646440cf7e8d341108fa7b85216a18a7828 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Thu, 15 Oct 2009 15:03:51 +0200
Subject: [PATCH 2651/8469] Fixed command to switch to the branch (the old
 instructions were for *making* a branch, not for switching to it).

--HG--
branch : distribute
extra : rebase_source : c073e3144648eb79ca6f24de23dfa80c6cc4dc67
---
 DEVGUIDE.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index df25947343..a7968ce88d 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -11,8 +11,7 @@ Grab the code at bitbucket::
     
 If you want to work in the 0.6 branch, you have to switch to it::
 
-    $ hg branch 0.6-maintenance
-    marked working directory as branch 0.6-maintenance
+    $ hg update 0.6-maintenance
     
     $ hg branch
     0.6-maintenance

From 771be6089a83bb03edf8dc87cdce60d3a4d4e595 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 16:16:55 +0200
Subject: [PATCH 2652/8469] we need to be able to use these API to detect the
 real setuptools at bootstrap time

--HG--
branch : distribute
extra : rebase_source : befcf5fc39937e17b8f830b8393fcc6b1bafa17a
---
 distribute_setup.py | 3 ++-
 pkg_resources.py    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index cf56fb28ea..0843b3c475 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -345,7 +345,8 @@ def fake_setuptools():
         log.warn('Setuptools or Distribute does not seem to be installed.')
         return
     ws = pkg_resources.working_set
-    setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+    setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+                              replacement=False))
     if setuptools_dist is None:
         log.warn('No setuptools distribution found')
         return
diff --git a/pkg_resources.py b/pkg_resources.py
index c03718649b..49c2662006 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -485,7 +485,7 @@ def add(self, dist, entry=None, insert=True):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None):
+    def resolve(self, requirements, env=None, installer=None, replacement=True):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -504,7 +504,7 @@ def resolve(self, requirements, env=None, installer=None):
 
         while requirements:
             req = requirements.pop(0)   # process dependencies breadth-first
-            if _override_setuptools(req):
+            if _override_setuptools(req) and replacement:
                 req = Requirement.parse('distribute')
 
             if req in processed:
@@ -2495,7 +2495,7 @@ def __hash__(self):
     def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
     #@staticmethod
-    def parse(s):
+    def parse(s, replacement=True):
         reqs = list(parse_requirements(s))
         if reqs:
             if len(reqs) == 1:
@@ -2503,7 +2503,7 @@ def parse(s):
                 # if asked for setuptools distribution
                 # and if distribute is installed, we want to give
                 # distribute instead
-                if _override_setuptools(founded_req):
+                if _override_setuptools(founded_req) and replacement:
                     distribute = list(parse_requirements('distribute'))
                     if len(distribute) == 1:
                         return distribute[0]

From d7f3fac74d074474ef490535f3e8b366969bac7e Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 22:15:10 +0200
Subject: [PATCH 2653/8469] Added tag 0.6.5 for changeset 2df182df8a02

--HG--
branch : distribute
extra : rebase_source : c355452db035caf2643bc621bef528200de600bc
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3ca10b19b7..4163b624c7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -3,3 +3,4 @@
 41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2
 e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
 e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
+2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5

From 5cbce15dc90730c38c1697b8011cecb0618ae89c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 22:19:59 +0200
Subject: [PATCH 2654/8469] fixed reSt

--HG--
branch : distribute
extra : rebase_source : fd6a217d7357be4ee3957f683f55b3b2edf318bd
---
 docs/roadmap.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 6182ed3bf6..fcd5518578 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -54,7 +54,7 @@ we've done a lot already)
 - the version system will be deprecated, in favor of the one in Distutils
 
 - no more Distutils monkey-patch that happens once you use the code
- (things like 'from distutils import cmd; cmd.Command = CustomCommand')
+  (things like 'from distutils import cmd; cmd.Command = CustomCommand')
 
 - no more custom site.py (that is: if something misses in Python's
   site.py we'll add it there instead of patching it)

From 23229041ce73c90615ecefa80a720da785cd54cd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 22:23:24 +0200
Subject: [PATCH 2655/8469] starting 0.6.6

--HG--
branch : distribute
extra : rebase_source : 15b88555dec253c490ee91a6e71ec1c945fdf6b0
---
 CHANGES.txt         | 6 ++++++
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5ccd32be82..ed37e1d811 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+0.6.6
+-----
+
+
+
 -----
 0.6.5
 -----
diff --git a/README.txt b/README.txt
index 5ce8a728e6..2f7ddcc3a8 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.5.tar.gz
-    $ tar -xzvf distribute-0.6.5.tar.gz
-    $ cd distribute-0.6.5
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.6.tar.gz
+    $ tar -xzvf distribute-0.6.6.tar.gz
+    $ cd distribute-0.6.6
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 0843b3c475..1ab07f0d98 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.5"
+DEFAULT_VERSION = "0.6.6"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/docs/conf.py b/docs/conf.py
index f7e762eb3d..a050632257 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.5'
+version = '0.6.6'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 74be096561..571b80f1e2 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.5"
+export VERSION="0.6.6"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 1459ffe945..da59d365b5 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.5"
+VERSION = "0.6.6"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 7785ccade4b92867c492f573e9b548c1ba612cd7 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Fri, 16 Oct 2009 00:02:35 +0300
Subject: [PATCH 2656/8469] Unified the bootstrap file so it works on both
 py2.x and py3k without 2to3 (patch by Holger Krekel)

--HG--
branch : distribute
extra : rebase_source : 7b8e41446e9b442adf35369b972e725f83b45d43
---
 README.txt          |  2 +-
 distribute_setup.py | 19 ++++++++++++-------
 release.sh          | 12 +-----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/README.txt b/README.txt
index 2f7ddcc3a8..90eff94358 100755
--- a/README.txt
+++ b/README.txt
@@ -92,7 +92,7 @@ If you are under Python 3, use
     $ curl -O http://python-distribute.org/distribute_setup_3k.py
     $ python distribute_setup_3k.py
 
-Notice that both files are provided in the source release.
+Notice this file is also provided in the source release.
 
 easy_install or pip
 ===================
diff --git a/distribute_setup.py b/distribute_setup.py
index 1ab07f0d98..7023b596aa 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -141,14 +141,15 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         try:
             pkg_resources.require("distribute>="+version)
             return
-        except pkg_resources.VersionConflict, e:
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
             if was_imported:
-                print >>sys.stderr, (
+                sys.stderr.write(
                 "The required version of distribute (>=%s) is not available,\n"
                 "and can't be installed while this script is running. Please\n"
                 "install a more recent version first, using\n"
                 "'easy_install -U distribute'."
-                "\n\n(Currently using %r)") % (version, e.args[0])
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
                 sys.exit(2)
             else:
                 del pkg_resources, sys.modules['pkg_resources']    # reload ok
@@ -172,7 +173,10 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     """
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
-    import urllib2
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
     tgz_name = "distribute-%s.tar.gz" % version
     url = download_base + tgz_name
     saveto = os.path.join(to_dir, tgz_name)
@@ -180,7 +184,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     if not os.path.exists(saveto):  # Avoid repeated downloads
         try:
             log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
+            src = urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.
             data = src.read()
@@ -410,7 +414,7 @@ def _extractall(self, path=".", members=None):
             # Extract directories with a safe mode.
             directories.append(tarinfo)
             tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 0700
+            tarinfo.mode = 448 # decimal for oct 0700
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
@@ -429,7 +433,8 @@ def sorter(dir1, dir2):
             self.chown(tarinfo, dirpath)
             self.utime(tarinfo, dirpath)
             self.chmod(tarinfo, dirpath)
-        except ExtractError, e:
+        except ExtractError:
+            e = sys.exc_info()[1]
             if self.errorlevel > 1:
                 raise
             else:
diff --git a/release.sh b/release.sh
index 571b80f1e2..4f6b3b8609 100755
--- a/release.sh
+++ b/release.sh
@@ -5,15 +5,6 @@ export VERSION="0.6.6"
 hg tag $VERSION
 hg ci -m "bumped revision"
 
-# creating the 3k script
-mkdir ./temp
-cp distribute_setup.py ./temp/distribute_setup.py
-cd ./temp
-2to3 -w distribute_setup.py > /dev/null
-mv distribute_setup.py ../distribute_setup_3k.py
-cd ..
-rm -rf ./temp
-
 # creating the releases
 rm -rf ./dist
 
@@ -21,9 +12,8 @@ rm -rf ./dist
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 python2.6 setup.py build_sphinx upload_docs
 
-# pushing the bootstrap scripts
+# pushing the bootstrap script
 scp distribute_setup.py ziade.org:nightly/build/
-scp distribute_setup_3k.py ziade.org:nightly/build/
 
 # starting the new dev
 

From 0f267465f3a0584dafc96a414dfe3338b9bbda73 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 23:30:55 +0200
Subject: [PATCH 2657/8469] make sure the old api can be called in case of an
 old version

--HG--
branch : distribute
extra : rebase_source : 60119a660b567b7ba04f6ceae08900e7b7abbf60
---
 distribute_setup.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 1ab07f0d98..4b2d78543b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -345,8 +345,13 @@ def fake_setuptools():
         log.warn('Setuptools or Distribute does not seem to be installed.')
         return
     ws = pkg_resources.working_set
-    setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
-                              replacement=False))
+    try:
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+                                  replacement=False))
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+
     if setuptools_dist is None:
         log.warn('No setuptools distribution found')
         return

From d82690a2cc74d8ac0dcee5484a08c6346af68883 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Thu, 15 Oct 2009 23:35:24 +0200
Subject: [PATCH 2658/8469] updated changelog

--HG--
branch : distribute
extra : rebase_source : 6eb0ef4d64f43fd28095837abbdd53bf7c3e9a24
---
 CHANGES.txt                          | 3 ++-
 distribute.egg-info/entry_points.txt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ed37e1d811..c3a5299ac8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ CHANGES
 0.6.6
 -----
 
-
+* Unified the bootstrap file so it works on both py2.x and py3k without 2to3
+  (patch by Holger Krekel)
 
 -----
 0.6.5
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index f4b74da0fd..0aaa28c086 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.5 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 748696a763c3b57aff3b4f39c4461c5a6b7ef4ee Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 15 Oct 2009 23:41:14 +0200
Subject: [PATCH 2659/8469] Added tag 0.6.6 for changeset f1fb564d6d67

--HG--
branch : distribute
extra : rebase_source : 959930710c8dc66187d990c6eadec8b35320d382
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4163b624c7..b410ccb7ab 100644
--- a/.hgtags
+++ b/.hgtags
@@ -4,3 +4,4 @@
 e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
 e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
 2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5
+f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6

From 497a63db5fccb487bdd6212d8aae605dcb4fdae4 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 16 Oct 2009 12:08:48 +0200
Subject: [PATCH 2660/8469] change home url

--HG--
branch : distribute
extra : rebase_source : f27d75ac7caf74c1a2cb18bb27fdc1eff50413f5
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index da59d365b5..5bf166403f 100755
--- a/setup.py
+++ b/setup.py
@@ -102,7 +102,7 @@ def _being_installed():
     license="PSF or ZPL",
     long_description = open('README.txt').read() + open('CHANGES.txt').read(),
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://pypi.python.org/pypi/distribute",
+    url = "http://packages.python.org/distribute",
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),

From fa9206561cd5483846b86c89206ced48d502018b Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 16 Oct 2009 12:11:24 +0200
Subject: [PATCH 2661/8469] starting 0.6.7

--HG--
branch : distribute
extra : rebase_source : c4445b08d41ce91b2a7c03793110b07113edd9ea
---
 CHANGES.txt                          | 5 +++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 2 +-
 distribute_setup.py                  | 2 +-
 docs/conf.py                         | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c3a5299ac8..e6816cfea5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+-----
+0.6.7
+-----
+
+
 -----
 0.6.6
 -----
diff --git a/README.txt b/README.txt
index 90eff94358..271b397e7c 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.6.tar.gz
-    $ tar -xzvf distribute-0.6.6.tar.gz
-    $ cd distribute-0.6.6
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.7.tar.gz
+    $ tar -xzvf distribute-0.6.7.tar.gz
+    $ cd distribute-0.6.7
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 0aaa28c086..f4b74da0fd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.5 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 7285335606..d99120102b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.6"
+DEFAULT_VERSION = "0.6.7"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/docs/conf.py b/docs/conf.py
index a050632257..794e728cfb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.6'
+version = '0.6.7'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 4f6b3b8609..294bc5781f 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.6"
+export VERSION="0.6.7"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 5bf166403f..aaa7f3e312 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.6"
+VERSION = "0.6.7"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 6529a376d21b45fbc8f8ca33bd797c21f4589f35 Mon Sep 17 00:00:00 2001
From: Reinout van Rees <reinout@vanrees.org>
Date: Fri, 16 Oct 2009 13:45:19 +0200
Subject: [PATCH 2662/8469] Removed "shared eggs dir gets hosed" warning from
 the readme and replaced it with a "everything works great now" message.  Tnx
 to Vincent Fretin for warning me about it.

--HG--
branch : distribute
extra : rebase_source : 7c8bca372a67bc3741ba376becc5a8337619bbd0
---
 README.txt | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 271b397e7c..fbdf32798d 100755
--- a/README.txt
+++ b/README.txt
@@ -196,16 +196,21 @@ Install FAQ
 
 - **How does Distribute interacts with zc.buildout?**
 
-  You can use Distribute in your zc.buildout.
-
-  Although you have to run a specific `bootstrap.py` file that is available
-  at `http://python-distribute.org/bootstrap.py`. The code is located at
+  You can use Distribute in your zc.buildout.  *The only thing* you need to do
+  is use the bootstrap at `http://python-distribute.org/bootstrap.py`.  Run
+  that bootstrap and ``bin/buildout`` (and all other buildout-generated
+  scripts) will transparently use distribute instead of setuptools.  You do
+  not need a specific buildout release.
+
+  A shared eggs directory is no problem (since 0.6.6): the setuptools egg is
+  left in place unmodified.  So other buildouts that do not yet use the new
+  bootstrap continue to work just fine.  And there is no need to list
+  ``distribute`` somewhere in your eggs: using the bootstrap is enough.
+
+  The source code for the bootstrap script is located at
   `http://bitbucket.org/tarek/buildout-distribute`.
 
-  Beware that if you use a shared eggs folder with buildout, you need to 
-  switch all buildouts that use it to distribute. This is due to the fact
-  that the setuptools eggs located in the shared folder will be replaced
-  by a fake one, alongside distribute.
+
 
 -----------------------------
 Feedback and getting involved

From e9ef9f712767530e054cdea670a744ee96f25695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 16 Oct 2009 23:04:16 +0000
Subject: [PATCH 2663/8469] this test requires zlib support

---
 tests/test_archive_util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 3faf5e0d3b..b91986ba95 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -209,6 +209,7 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     def test_make_archive_owner_group(self):
         # testing make_archive with owner and group, with various combinations
         # this works even if there's not gid/uid support

From f11e9a88c284209f037ae002fa00133833d48921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 16 Oct 2009 23:07:19 +0000
Subject: [PATCH 2664/8469] Merged revisions 75450 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75450 | tarek.ziade | 2009-10-17 01:04:16 +0200 (Sat, 17 Oct 2009) | 1 line

  this test requires zlib support
........
---
 tests/test_archive_util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 9990df36c3..71d32dce19 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -209,6 +209,7 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
+    @unittest.skipUnless(zlib, "Requires zlib")
     def test_make_archive_owner_group(self):
         # testing make_archive with owner and group, with various combinations
         # this works even if there's not gid/uid support

From 032f6e8080b511c1f700e5d6133e7f68dbdbcf7d Mon Sep 17 00:00:00 2001
From: Daniel Stutzbach <daniel@stutzbachenterprises.com>
Date: Sat, 17 Oct 2009 22:01:07 -0500
Subject: [PATCH 2665/8469] Fix for Issue 64: setup.py rebuilds the distribute
 egg every.single.time.

--HG--
branch : distribute
extra : rebase_source : 2fe261e4ebf0fef8bb38e0d8fc9965b24cc02002
---
 distribute_setup.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index d99120102b..0460619e29 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.7"
+DEFAULT_VERSION = "0.6.6"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
@@ -115,9 +115,12 @@ def _build_egg(tarball, to_dir):
 
 
 def _do_download(version, download_base, to_dir, download_delay):
-    tarball = download_setuptools(version, download_base,
-                                  to_dir, download_delay)
-    egg = _build_egg(tarball, to_dir)
+    egg = 'distribute-%s-py%d.%d.egg' % (version, sys.version_info[0], 
+                                         sys.version_info[1])
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        egg = _build_egg(tarball, to_dir)
     sys.path.insert(0, egg)
     import setuptools
     setuptools.bootstrap_install_from = egg

From b1bd773feed63e4037a9dab96f40c3b147f9414e Mon Sep 17 00:00:00 2001
From: Daniel Stutzbach <daniel@stutzbachenterprises.com>
Date: Sat, 17 Oct 2009 22:03:24 -0500
Subject: [PATCH 2666/8469] Fixed build_egg to test for the existence of the
 correct egg filename.

--HG--
branch : distribute
extra : rebase_source : c944237f4b1aff19e3f6838b83945b7e4bff48de
---
 distribute_setup.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 0460619e29..c91410cbb0 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -84,7 +84,7 @@ def _install(tarball):
         os.chdir(old_wd)
 
 
-def _build_egg(tarball, to_dir):
+def _build_egg(egg, tarball, to_dir):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
@@ -105,11 +105,8 @@ def _build_egg(tarball, to_dir):
         _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
 
         # returning the result
-        for file in os.listdir(to_dir):
-            if fnmatch.fnmatch(file, 'distribute-%s*.egg' % DEFAULT_VERSION):
-                return os.path.join(to_dir, file)
-
-        raise IOError('Could not build the egg.')
+        if not os.path.exists(egg):
+            raise IOError('Could not build the egg.')
     finally:
         os.chdir(old_wd)
 
@@ -120,7 +117,7 @@ def _do_download(version, download_base, to_dir, download_delay):
     if not os.path.exists(egg):
         tarball = download_setuptools(version, download_base,
                                       to_dir, download_delay)
-        egg = _build_egg(tarball, to_dir)
+        _build_egg(egg, tarball, to_dir)
     sys.path.insert(0, egg)
     import setuptools
     setuptools.bootstrap_install_from = egg

From 286608d122dcfc718e4a52d011b8b77efe0fbe5f Mon Sep 17 00:00:00 2001
From: Daniel Stutzbach <daniel@stutzbachenterprises.com>
Date: Sat, 17 Oct 2009 22:23:22 -0500
Subject: [PATCH 2667/8469] Fixed bug in previous patch (oops)

--HG--
branch : distribute
extra : rebase_source : 0e0d70648070a33cbdb759de87415a90984da7cd
---
 distribute_setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index c91410cbb0..026c7d3ced 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -104,11 +104,12 @@ def _build_egg(egg, tarball, to_dir):
         log.warn('Building a Distribute egg in %s', to_dir)
         _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
 
-        # returning the result
-        if not os.path.exists(egg):
-            raise IOError('Could not build the egg.')
     finally:
         os.chdir(old_wd)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
 
 
 def _do_download(version, download_base, to_dir, download_delay):

From 7d43c924940cb749650db28fcdc9858517e4a4e5 Mon Sep 17 00:00:00 2001
From: Daniel Stutzbach <daniel@stutzbachenterprises.com>
Date: Sat, 17 Oct 2009 22:57:21 -0500
Subject: [PATCH 2668/8469] Fixed egg filename computation to respect to_dir

--HG--
branch : distribute
extra : rebase_source : 7fa5025839278ad3a0fe1971bf8e050e9f910c43
---
 distribute_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 026c7d3ced..db75a3c656 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -113,8 +113,8 @@ def _build_egg(egg, tarball, to_dir):
 
 
 def _do_download(version, download_base, to_dir, download_delay):
-    egg = 'distribute-%s-py%d.%d.egg' % (version, sys.version_info[0], 
-                                         sys.version_info[1])
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg' 
+                       % (version, sys.version_info[0], sys.version_info[1]))
     if not os.path.exists(egg):
         tarball = download_setuptools(version, download_base,
                                       to_dir, download_delay)

From 8a3f574e110a28ee9b3feab1bec433bdcaf5368f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 18 Oct 2009 09:28:26 +0000
Subject: [PATCH 2669/8469] Changed distutils tests to avoid environment
 alteration

---
 tests/support.py              | 13 ++++++++++---
 tests/test_bdist_dumb.py      |  6 ++++--
 tests/test_bdist_rpm.py       |  5 +++--
 tests/test_build_ext.py       |  5 +++--
 tests/test_config.py          |  2 +-
 tests/test_core.py            | 11 +++++++----
 tests/test_dist.py            | 31 +++++++++++++++++++------------
 tests/test_install.py         |  1 +
 tests/test_install_data.py    |  1 +
 tests/test_install_headers.py |  1 +
 tests/test_install_lib.py     |  2 +-
 tests/test_sysconfig.py       | 12 ++++++++++--
 tests/test_util.py            | 11 ++++++-----
 13 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 3c328cc9a6..41d3cd3c66 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,11 +2,11 @@
 import os
 import shutil
 import tempfile
+from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
-from test.test_support import EnvironmentVarGuard
 
 class LoggingSilencer(object):
 
@@ -111,8 +111,15 @@ class EnvironGuard(object):
 
     def setUp(self):
         super(EnvironGuard, self).setUp()
-        self.environ = EnvironmentVarGuard()
+        self.old_environ = deepcopy(os.environ)
 
     def tearDown(self):
-        self.environ.__exit__()
+        for key, value in self.old_environ.items():
+            if os.environ.get(key) != value:
+                os.environ[key] = value
+
+        for key in os.environ.keys():
+            if key not in self.old_environ:
+                del os.environ[key]
+
         super(EnvironGuard, self).tearDown()
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index a838f73476..5eaef2a9d7 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -26,16 +26,18 @@
 
 class BuildDumbTestCase(support.TempdirManager,
                         support.LoggingSilencer,
+                        support.EnvironGuard,
                         unittest.TestCase):
 
     def setUp(self):
         super(BuildDumbTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildDumbTestCase, self).tearDown()
 
     @unittest.skipUnless(zlib, "requires zlib")
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index c271567542..2aa257f7e6 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -29,11 +29,12 @@ class BuildRpmTestCase(support.TempdirManager,
     def setUp(self):
         super(BuildRpmTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildRpmTestCase, self).tearDown()
 
     def test_quiet(self):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4c09dd80a3..317ce2bca0 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -34,7 +34,7 @@ def setUp(self):
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path[:]
+        self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
         if sys.version > "2.6":
@@ -89,7 +89,8 @@ def test_build_ext(self):
     def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
-        sys.path = self.sys_path
+        sys.path = self.sys_path[0]
+        sys.path[:] = self.sys_path[1]
         if sys.version > "2.6":
             import site
             site.USER_BASE = self.old_user_base
diff --git a/tests/test_config.py b/tests/test_config.py
index 6947275569..0a1bb961ff 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -56,7 +56,7 @@ def setUp(self):
         """Patches the environment."""
         super(PyPIRCCommandTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.environ['HOME'] = self.tmp_dir
+        os.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 3c26fddbc6..48ec1b436e 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -8,7 +8,7 @@
 import test.test_support
 from test.test_support import captured_stdout
 import unittest
-
+from distutils.tests import support
 
 # setup script that uses __file__
 setup_using___file__ = """\
@@ -29,17 +29,20 @@
 """
 
 
-class CoreTestCase(unittest.TestCase):
+class CoreTestCase(support.EnvironGuard, unittest.TestCase):
 
     def setUp(self):
+        super(CoreTestCase, self).setUp()
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
-        self.old_argv = sys.argv[:]
+        self.old_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
-        sys.argv = self.old_argv[:]
+        sys.argv = self.old_argv[0]
+        sys.argv[:] = self.old_argv[1]
+        super(CoreTestCase, self).tearDown()
 
     def cleanup_testfn(self):
         path = test.test_support.TESTFN
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 3d4b25f0fc..5f032ca60f 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -39,15 +39,17 @@ def find_config_files(self):
 
 class DistributionTestCase(support.TempdirManager,
                            support.LoggingSilencer,
+                           support.EnvironGuard,
                            unittest.TestCase):
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()
-        self.argv = sys.argv[:]
+        self.argv = sys.argv, sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
-        sys.argv[:] = self.argv
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
         super(DistributionTestCase, self).tearDown()
 
     def create_distribution(self, configfiles=()):
@@ -210,6 +212,15 @@ def test_announce(self):
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
+    def setUp(self):
+        super(MetadataTestCase, self).setUp()
+        self.argv = sys.argv, sys.argv[:]
+
+    def tearDown(self):
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
+        super(MetadataTestCase, self).tearDown()
+
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
@@ -308,14 +319,14 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
@@ -331,15 +342,11 @@ def test_fix_help_options(self):
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
         dist = Distribution()
-        old_argv = sys.argv
         sys.argv = []
-        try:
-            dist.help = 1
-            dist.script_name = 'setup.py'
-            with captured_stdout() as s:
-                dist.parse_command_line()
-        finally:
-            sys.argv = old_argv
+        dist.help = 1
+        dist.script_name = 'setup.py'
+        with captured_stdout() as s:
+            dist.parse_command_line()
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
diff --git a/tests/test_install.py b/tests/test_install.py
index d2b8c8e9b6..d44156dd45 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -17,6 +17,7 @@
 from distutils.tests import support
 
 class InstallTestCase(support.TempdirManager,
+                      support.EnvironGuard,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 7072136792..377ae86e2f 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -9,6 +9,7 @@
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
+                          support.EnvironGuard,
                           unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 2564563faf..5b32b13ee4 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -9,6 +9,7 @@
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
+                             support.EnvironGuard,
                              unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 793b95cad6..b2185b8442 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -10,9 +10,9 @@
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
+                         support.EnvironGuard,
                          unittest.TestCase):
 
-
     def test_finalize_options(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index edc8fd8d60..498714de81 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -17,8 +17,16 @@ def setUp(self):
     def tearDown(self):
         if self.makefile is not None:
             os.unlink(self.makefile)
+        self.cleanup_testfn()
         super(SysconfigTestCase, self).tearDown()
 
+    def cleanup_testfn(self):
+        path = test.test_support.TESTFN
+        if os.path.isfile(path):
+            os.remove(path)
+        elif os.path.isdir(path):
+            shutil.rmtree(path)
+
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
         self.assertTrue(os.path.isfile(config_h), config_h)
@@ -51,8 +59,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        self.environ['AR'] = 'my_ar'
-        self.environ['ARFLAGS'] = '-arflags'
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:
diff --git a/tests/test_util.py b/tests/test_util.py
index 7190b2c9c6..4099c950ad 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -121,7 +121,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -129,7 +129,7 @@ def test_get_platform(self):
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -250,17 +250,18 @@ def _join(*path):
 
     def test_check_environ(self):
         util._environ_checked = 0
+        if 'HOME' in os.environ:
+            del os.environ['HOME']
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
             check_environ()
             import pwd
-            self.assertEquals(self.environ['HOME'],
-                            pwd.getpwuid(os.getuid())[5])
+            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(self.environ['PLAT'], get_platform())
+        self.assertEquals(os.environ['PLAT'], get_platform())
         self.assertEquals(util._environ_checked, 1)
 
     def test_split_quoted(self):

From b4af667a099c424589142dea0a2ed4e7c2cd71ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 18 Oct 2009 11:34:51 +0000
Subject: [PATCH 2670/8469] Merged revisions 75485 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75485 | tarek.ziade | 2009-10-18 11:28:26 +0200 (Sun, 18 Oct 2009) | 1 line

  Changed distutils tests to avoid environment alteration
........
---
 tests/support.py              | 13 ++++++++++---
 tests/test_bdist_dumb.py      |  6 ++++--
 tests/test_bdist_rpm.py       |  5 +++--
 tests/test_build_ext.py       |  5 +++--
 tests/test_config.py          |  2 +-
 tests/test_core.py            | 11 +++++++----
 tests/test_dist.py            | 31 +++++++++++++++++++------------
 tests/test_install.py         |  1 +
 tests/test_install_data.py    |  1 +
 tests/test_install_headers.py |  1 +
 tests/test_install_lib.py     |  2 +-
 tests/test_sysconfig.py       | 11 +++++++++--
 tests/test_util.py            | 11 ++++++-----
 13 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index ea122111ca..e258d2e58d 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,11 +2,11 @@
 import os
 import shutil
 import tempfile
+from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
-from test.support import EnvironmentVarGuard
 
 class LoggingSilencer(object):
 
@@ -111,8 +111,15 @@ class EnvironGuard(object):
 
     def setUp(self):
         super(EnvironGuard, self).setUp()
-        self.environ = EnvironmentVarGuard()
+        self.old_environ = deepcopy(os.environ)
 
     def tearDown(self):
-        self.environ.__exit__()
+        for key, value in self.old_environ.items():
+            if os.environ.get(key) != value:
+                os.environ[key] = value
+
+        for key in tuple(os.environ.keys()):
+            if key not in self.old_environ:
+                del os.environ[key]
+
         super(EnvironGuard, self).tearDown()
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index a838f73476..5eaef2a9d7 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -26,16 +26,18 @@
 
 class BuildDumbTestCase(support.TempdirManager,
                         support.LoggingSilencer,
+                        support.EnvironGuard,
                         unittest.TestCase):
 
     def setUp(self):
         super(BuildDumbTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildDumbTestCase, self).tearDown()
 
     @unittest.skipUnless(zlib, "requires zlib")
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index c271567542..2aa257f7e6 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -29,11 +29,12 @@ class BuildRpmTestCase(support.TempdirManager,
     def setUp(self):
         super(BuildRpmTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildRpmTestCase, self).tearDown()
 
     def test_quiet(self):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 7a27f343a7..ebbb39979c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -35,7 +35,7 @@ def setUp(self):
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path[:]
+        self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
         if sys.version > "2.6":
@@ -90,7 +90,8 @@ def test_build_ext(self):
     def tearDown(self):
         # Get everything back to normal
         support.unload('xx')
-        sys.path = self.sys_path
+        sys.path = self.sys_path[0]
+        sys.path[:] = self.sys_path[1]
         if sys.version > "2.6":
             import site
             site.USER_BASE = self.old_user_base
diff --git a/tests/test_config.py b/tests/test_config.py
index 879689d2bb..71c63678f8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -55,7 +55,7 @@ def setUp(self):
         """Patches the environment."""
         super(PyPIRCCommandTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.environ['HOME'] = self.tmp_dir
+        os.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
diff --git a/tests/test_core.py b/tests/test_core.py
index b5f391f57a..b478fa6291 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -8,7 +8,7 @@
 import test.support
 from test.support import captured_stdout
 import unittest
-
+from distutils.tests import support
 
 # setup script that uses __file__
 setup_using___file__ = """\
@@ -29,17 +29,20 @@
 """
 
 
-class CoreTestCase(unittest.TestCase):
+class CoreTestCase(support.EnvironGuard, unittest.TestCase):
 
     def setUp(self):
+        super(CoreTestCase, self).setUp()
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
-        self.old_argv = sys.argv[:]
+        self.old_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
-        sys.argv = self.old_argv[:]
+        sys.argv = self.old_argv[0]
+        sys.argv[:] = self.old_argv[1]
+        super(CoreTestCase, self).tearDown()
 
     def cleanup_testfn(self):
         path = test.support.TESTFN
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 799b0c0603..be1010c611 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -38,15 +38,17 @@ def find_config_files(self):
 
 
 class DistributionTestCase(support.LoggingSilencer,
+                           support.EnvironGuard,
                            unittest.TestCase):
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()
-        self.argv = sys.argv[:]
+        self.argv = sys.argv, sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
-        sys.argv[:] = self.argv
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
         super(DistributionTestCase, self).tearDown()
 
     def create_distribution(self, configfiles=()):
@@ -181,6 +183,15 @@ def test_announce(self):
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
+    def setUp(self):
+        super(MetadataTestCase, self).setUp()
+        self.argv = sys.argv, sys.argv[:]
+
+    def tearDown(self):
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
+        super(MetadataTestCase, self).tearDown()
+
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
@@ -279,14 +290,14 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
@@ -302,15 +313,11 @@ def test_fix_help_options(self):
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
         dist = Distribution()
-        old_argv = sys.argv
         sys.argv = []
-        try:
-            dist.help = 1
-            dist.script_name = 'setup.py'
-            with captured_stdout() as s:
-                dist.parse_command_line()
-        finally:
-            sys.argv = old_argv
+        dist.help = 1
+        dist.script_name = 'setup.py'
+        with captured_stdout() as s:
+            dist.parse_command_line()
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
diff --git a/tests/test_install.py b/tests/test_install.py
index 2087a0eba0..76fa02acda 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -17,6 +17,7 @@
 from distutils.tests import support
 
 class InstallTestCase(support.TempdirManager,
+                      support.EnvironGuard,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 7072136792..377ae86e2f 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -9,6 +9,7 @@
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
+                          support.EnvironGuard,
                           unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 2564563faf..5b32b13ee4 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -9,6 +9,7 @@
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
+                             support.EnvironGuard,
                              unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 793b95cad6..b2185b8442 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -10,9 +10,9 @@
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
+                         support.EnvironGuard,
                          unittest.TestCase):
 
-
     def test_finalize_options(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index eb36204439..edc755ed15 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -17,8 +17,15 @@ def setUp(self):
     def tearDown(self):
         if self.makefile is not None:
             os.unlink(self.makefile)
+        self.cleanup_testfn()
         super(SysconfigTestCase, self).tearDown()
 
+    def cleanup_testfn(self):
+        if os.path.isfile(TESTFN):
+            os.remove(TESTFN)
+        elif os.path.isdir(TESTFN):
+            shutil.rmtree(TESTFN)
+
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
         self.assertTrue(os.path.isfile(config_h), config_h)
@@ -51,8 +58,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        self.environ['AR'] = 'my_ar'
-        self.environ['ARFLAGS'] = '-arflags'
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:
diff --git a/tests/test_util.py b/tests/test_util.py
index 84caea5cac..8068726df1 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -121,7 +121,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -129,7 +129,7 @@ def test_get_platform(self):
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -250,17 +250,18 @@ def _join(*path):
 
     def test_check_environ(self):
         util._environ_checked = 0
+        if 'HOME' in os.environ:
+            del os.environ['HOME']
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
             check_environ()
             import pwd
-            self.assertEquals(self.environ['HOME'],
-                            pwd.getpwuid(os.getuid())[5])
+            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(self.environ['PLAT'], get_platform())
+        self.assertEquals(os.environ['PLAT'], get_platform())
         self.assertEquals(util._environ_checked, 1)
 
     def test_split_quoted(self):

From 33e3ec5eadb59ece949d4cad1231ff23780e4c02 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 18 Oct 2009 14:32:54 +0200
Subject: [PATCH 2671/8469] make sure pkg_resources can be imported in GAE -
 refs #73

--HG--
branch : distribute
extra : rebase_source : fa1f9aca1bb3b231b7e709de9fc78973cce053ed
---
 pkg_resources.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 49c2662006..31d83554e6 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -21,7 +21,14 @@
     from sets import ImmutableSet as frozenset
 
 # capture these to bypass sandboxing
-from os import utime, rename, unlink, mkdir
+from os import utime
+try:
+    from os import mkdir, rename, unlink
+    WRITE_SUPPORT = True
+except ImportError:
+    # no write support, probably under GAE
+    WRITE_SUPPORT = False
+
 from os import open as os_open
 from os.path import isdir, split
 
@@ -36,6 +43,8 @@
 
 def _bypass_ensure_directory(name, mode=0777):
     # Sandbox-bypassing version of ensure_directory()
+    if not WRITE_SUPPORT:
+        raise IOError('"os.mkdir" not supported on this platform.')
     dirname, filename = split(name)
     if dirname and filename and not isdir(dirname):
         _bypass_ensure_directory(dirname)
@@ -1332,6 +1341,10 @@ def _extract_resource(self, manager, zip_path):
         timestamp = time.mktime(date_time)
 
         try:
+            if not WRITE_SUPPORT:
+                raise IOError('"os.rename" and "os.unlink" are not supported '
+                              'on this platform')
+
             real_path = manager.get_cache_path(
                 self.egg_name, self._parts(zip_path)
             )

From 32a6241687d12965291bd1f62fb9c5eb85b9eab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 18 Oct 2009 12:41:30 +0000
Subject: [PATCH 2672/8469] Merged revisions 75491 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75491 | tarek.ziade | 2009-10-18 13:34:51 +0200 (Sun, 18 Oct 2009) | 9 lines

  Merged revisions 75485 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75485 | tarek.ziade | 2009-10-18 11:28:26 +0200 (Sun, 18 Oct 2009) | 1 line

    Changed distutils tests to avoid environment alteration
  ........
................
---
 tests/support.py              | 13 ++++++++++---
 tests/test_bdist_dumb.py      |  6 ++++--
 tests/test_bdist_rpm.py       |  5 +++--
 tests/test_build_ext.py       |  5 +++--
 tests/test_config.py          |  2 +-
 tests/test_core.py            | 11 +++++++----
 tests/test_dist.py            | 31 +++++++++++++++++++------------
 tests/test_install.py         |  1 +
 tests/test_install_data.py    |  1 +
 tests/test_install_headers.py |  1 +
 tests/test_install_lib.py     |  2 +-
 tests/test_sysconfig.py       | 11 +++++++++--
 tests/test_util.py            | 11 ++++++-----
 13 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index ea122111ca..e258d2e58d 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,11 +2,11 @@
 import os
 import shutil
 import tempfile
+from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
-from test.support import EnvironmentVarGuard
 
 class LoggingSilencer(object):
 
@@ -111,8 +111,15 @@ class EnvironGuard(object):
 
     def setUp(self):
         super(EnvironGuard, self).setUp()
-        self.environ = EnvironmentVarGuard()
+        self.old_environ = deepcopy(os.environ)
 
     def tearDown(self):
-        self.environ.__exit__()
+        for key, value in self.old_environ.items():
+            if os.environ.get(key) != value:
+                os.environ[key] = value
+
+        for key in tuple(os.environ.keys()):
+            if key not in self.old_environ:
+                del os.environ[key]
+
         super(EnvironGuard, self).tearDown()
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index d2ea201bd4..5e76809f23 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -19,16 +19,18 @@
 
 class BuildDumbTestCase(support.TempdirManager,
                         support.LoggingSilencer,
+                        support.EnvironGuard,
                         unittest.TestCase):
 
     def setUp(self):
         super(BuildDumbTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildDumbTestCase, self).tearDown()
 
     def test_simple_built(self):
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index c271567542..2aa257f7e6 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -29,11 +29,12 @@ class BuildRpmTestCase(support.TempdirManager,
     def setUp(self):
         super(BuildRpmTestCase, self).setUp()
         self.old_location = os.getcwd()
-        self.old_sys_argv = sys.argv[:]
+        self.old_sys_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         os.chdir(self.old_location)
-        sys.argv = self.old_sys_argv[:]
+        sys.argv = self.old_sys_argv[0]
+        sys.argv[:] = self.old_sys_argv[1]
         super(BuildRpmTestCase, self).tearDown()
 
     def test_quiet(self):
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 1221fd43af..f992928d0a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -32,7 +32,7 @@ def setUp(self):
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path[:]
+        self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
         if sys.version > "2.6":
@@ -87,7 +87,8 @@ def test_build_ext(self):
     def tearDown(self):
         # Get everything back to normal
         support.unload('xx')
-        sys.path = self.sys_path
+        sys.path = self.sys_path[0]
+        sys.path[:] = self.sys_path[1]
         if sys.version > "2.6":
             import site
             site.USER_BASE = self.old_user_base
diff --git a/tests/test_config.py b/tests/test_config.py
index 879689d2bb..71c63678f8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -55,7 +55,7 @@ def setUp(self):
         """Patches the environment."""
         super(PyPIRCCommandTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.environ['HOME'] = self.tmp_dir
+        os.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
diff --git a/tests/test_core.py b/tests/test_core.py
index b5f391f57a..b478fa6291 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -8,7 +8,7 @@
 import test.support
 from test.support import captured_stdout
 import unittest
-
+from distutils.tests import support
 
 # setup script that uses __file__
 setup_using___file__ = """\
@@ -29,17 +29,20 @@
 """
 
 
-class CoreTestCase(unittest.TestCase):
+class CoreTestCase(support.EnvironGuard, unittest.TestCase):
 
     def setUp(self):
+        super(CoreTestCase, self).setUp()
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
-        self.old_argv = sys.argv[:]
+        self.old_argv = sys.argv, sys.argv[:]
 
     def tearDown(self):
         sys.stdout = self.old_stdout
         self.cleanup_testfn()
-        sys.argv = self.old_argv[:]
+        sys.argv = self.old_argv[0]
+        sys.argv[:] = self.old_argv[1]
+        super(CoreTestCase, self).tearDown()
 
     def cleanup_testfn(self):
         path = test.support.TESTFN
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 70c9ec50e2..5f96b97f9e 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -37,15 +37,17 @@ def find_config_files(self):
 
 
 class DistributionTestCase(support.LoggingSilencer,
+                           support.EnvironGuard,
                            unittest.TestCase):
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()
-        self.argv = sys.argv[:]
+        self.argv = sys.argv, sys.argv[:]
         del sys.argv[1:]
 
     def tearDown(self):
-        sys.argv[:] = self.argv
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
         super(DistributionTestCase, self).tearDown()
 
     def create_distribution(self, configfiles=()):
@@ -159,6 +161,15 @@ def test_announce(self):
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
+    def setUp(self):
+        super(MetadataTestCase, self).setUp()
+        self.argv = sys.argv, sys.argv[:]
+
+    def tearDown(self):
+        sys.argv = self.argv[0]
+        sys.argv[:] = self.argv[1]
+        super(MetadataTestCase, self).tearDown()
+
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
@@ -257,14 +268,14 @@ def test_custom_pydistutils(self):
 
             # linux-style
             if sys.platform in ('linux', 'darwin'):
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                self.environ['HOME'] = temp_dir
+                os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertTrue(user_filename in files,
                              '%r not found in %r' % (user_filename, files))
@@ -280,15 +291,11 @@ def test_fix_help_options(self):
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
         dist = Distribution()
-        old_argv = sys.argv
         sys.argv = []
-        try:
-            dist.help = 1
-            dist.script_name = 'setup.py'
-            with captured_stdout() as s:
-                dist.parse_command_line()
-        finally:
-            sys.argv = old_argv
+        dist.help = 1
+        dist.script_name = 'setup.py'
+        with captured_stdout() as s:
+            dist.parse_command_line()
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
diff --git a/tests/test_install.py b/tests/test_install.py
index 2087a0eba0..76fa02acda 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -17,6 +17,7 @@
 from distutils.tests import support
 
 class InstallTestCase(support.TempdirManager,
+                      support.EnvironGuard,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 7072136792..377ae86e2f 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -9,6 +9,7 @@
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
+                          support.EnvironGuard,
                           unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 2564563faf..5b32b13ee4 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -9,6 +9,7 @@
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
+                             support.EnvironGuard,
                              unittest.TestCase):
 
     def test_simple_run(self):
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 793b95cad6..b2185b8442 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -10,9 +10,9 @@
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
+                         support.EnvironGuard,
                          unittest.TestCase):
 
-
     def test_finalize_options(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index eb36204439..edc755ed15 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -17,8 +17,15 @@ def setUp(self):
     def tearDown(self):
         if self.makefile is not None:
             os.unlink(self.makefile)
+        self.cleanup_testfn()
         super(SysconfigTestCase, self).tearDown()
 
+    def cleanup_testfn(self):
+        if os.path.isfile(TESTFN):
+            os.remove(TESTFN)
+        elif os.path.isdir(TESTFN):
+            shutil.rmtree(TESTFN)
+
     def test_get_config_h_filename(self):
         config_h = sysconfig.get_config_h_filename()
         self.assertTrue(os.path.isfile(config_h), config_h)
@@ -51,8 +58,8 @@ def test_customize_compiler(self):
         if get_default_compiler() != 'unix':
             return
 
-        self.environ['AR'] = 'my_ar'
-        self.environ['ARFLAGS'] = '-arflags'
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
 
         # make sure AR gets caught
         class compiler:
diff --git a/tests/test_util.py b/tests/test_util.py
index 795edb8cdc..35f81a6b37 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -94,7 +94,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -102,7 +102,7 @@ def test_get_platform(self):
         self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
-        self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -223,17 +223,18 @@ def _join(*path):
 
     def test_check_environ(self):
         util._environ_checked = 0
+        if 'HOME' in os.environ:
+            del os.environ['HOME']
 
         # posix without HOME
         if os.name == 'posix':  # this test won't run on windows
             check_environ()
             import pwd
-            self.assertEquals(self.environ['HOME'],
-                            pwd.getpwuid(os.getuid())[5])
+            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(self.environ['PLAT'], get_platform())
+        self.assertEquals(os.environ['PLAT'], get_platform())
         self.assertEquals(util._environ_checked, 1)
 
     def test_split_quoted(self):

From 07f1a31c3eb453aab91646834087f3258254990f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 18 Oct 2009 14:46:54 +0200
Subject: [PATCH 2673/8469] no_fake needs to be True by default fixes #74

--HG--
branch : distribute
extra : rebase_source : 158f5abb9528d7ea6cd436996d5022cb6bcda89e
---
 CHANGES.txt                    |  1 +
 distribute_setup.py            | 11 ++++++-----
 tests/test_distribute_setup.py | 12 ++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e6816cfea5..44c62fa3fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.7
 -----
 
+* Issue 74: no_fake should be True by default.
 
 -----
 0.6.6
diff --git a/distribute_setup.py b/distribute_setup.py
index d99120102b..e7aafbb1e8 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -124,7 +124,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15, no_fake=False):
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     was_imported = 'pkg_resources' in sys.modules or \
@@ -134,7 +134,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
             import pkg_resources
             if not hasattr(pkg_resources, '_distribute'):
                 if not no_fake:
-                    fake_setuptools()
+                    _fake_setuptools()
                 raise ImportError
         except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)
@@ -159,7 +159,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
             return _do_download(version, download_base, to_dir,
                                 download_delay)
     finally:
-        _create_fake_setuptools_pkg_info(to_dir)
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
@@ -319,7 +320,7 @@ def _patch_egg_dir(path):
 
 def _before_install():
     log.warn('Before install bootstrap.')
-    fake_setuptools()
+    _fake_setuptools()
 
 
 def _under_prefix(location):
@@ -340,7 +341,7 @@ def _under_prefix(location):
     return True
 
 
-def fake_setuptools():
+def _fake_setuptools():
     log.warn('Scanning installed packages')
     try:
         import pkg_resources
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 4c9079a79d..4151587fcc 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -57,5 +57,17 @@ def _faked(*args):
         distribute_setup.python_cmd = _faked
         _install(self.tarball)
 
+    def test_use_setuptools(self):
+        self.assertEquals(use_setuptools(), None)
+
+        # make sure fake_setuptools is not called by default
+        import pkg_resources
+        del pkg_resources._distribute
+        def fake_setuptools(*args):
+            raise AssertionError
+
+        pkg_resources._fake_setuptools = fake_setuptools
+        use_setuptools()
+
 if __name__ == '__main__':
     unittest.main()

From fe015037cc3ff5c0061bd2f427775ad665bda61c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 18 Oct 2009 15:12:43 +0200
Subject: [PATCH 2674/8469] avoid a bootstrapping issue with easy_install -U.
 Fixes #72

--HG--
branch : distribute
extra : rebase_source : 52cd3211f5233e5c08cc34c59838f0fb3b9955f1
---
 CHANGES.txt | 1 +
 setup.py    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 44c62fa3fb..866ba7d8b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 -----
 
 * Issue 74: no_fake should be True by default.
+* Issue 72: avoid a bootstrapping issue with easy_install -U
 
 -----
 0.6.6
diff --git a/setup.py b/setup.py
index aaa7f3e312..cdc28e6547 100755
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,12 @@ def build_package_data(self):
                     self.copy_file(srcfile, exe_target)
 
                 srcfile = os.path.abspath(srcfile)
+
+                # avoid a bootstrapping issue with easy_install -U (when the
+                # previous version doesn't have convert_2to3_doctests)
+                if not hasattr(self.distribution, 'convert_2to3_doctests'):
+                    return
+
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 

From 39be786e197fd135dac23a9102d257877985ebf0 Mon Sep 17 00:00:00 2001
From: Daniel Stutzbach <daniel@stutzbachenterprises.com>
Date: Sun, 18 Oct 2009 09:31:33 -0500
Subject: [PATCH 2675/8469] Added information to CHANGES

--HG--
branch : distribute
extra : rebase_source : 7e92252bb4c8f96e6262e068606c8e10c11c8589
---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e6816cfea5..3aed457b13 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,11 @@ CHANGES
 0.6.7
 -----
 
+* Issue 64: use_setuptools no longer rebuilds the distribute egg every
+  time it is run
+* use_setuptools now properly respects the requested version
+* use_setuptools will no longer try to import a distribute egg for the
+  wrong Python version
 
 -----
 0.6.6

From 0b33d63b2cf8fae5959e157a8798007bbc7049c4 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Sun, 18 Oct 2009 16:50:06 +0000
Subject: [PATCH 2676/8469] Bump to 2.6.4rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 83c576f802..4c8cf042fd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.4rc1"
+__version__ = "2.6.4rc2"
 #--end constants--

From e6e0e5add9321df50c5da9ee2f1650740024c8ed Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Tue, 20 Oct 2009 01:37:01 +0300
Subject: [PATCH 2677/8469] Reversing patch for 64-bit Windows script launcher,
 applied PJE's simpler solution instead

--HG--
branch : distribute
extra : rebase_source : 320927dbc962a262853cae7d8b3734794bb9f21d
---
 launcher.c                         |  25 +++++++++---------------
 setup.py                           |  30 -----------------------------
 setuptools/cli-32.exe              | Bin 65536 -> 0 bytes
 setuptools/cli-64.exe              | Bin 74240 -> 0 bytes
 setuptools/cli.exe                 | Bin 0 -> 7168 bytes
 setuptools/command/easy_install.py |   5 ++---
 setuptools/gui-32.exe              | Bin 65536 -> 0 bytes
 setuptools/gui-64.exe              | Bin 74240 -> 0 bytes
 setuptools/gui.exe                 | Bin 0 -> 7168 bytes
 9 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 setuptools/cli-32.exe
 delete mode 100644 setuptools/cli-64.exe
 create mode 100644 setuptools/cli.exe
 delete mode 100644 setuptools/gui-32.exe
 delete mode 100644 setuptools/gui-64.exe
 create mode 100644 setuptools/gui.exe

diff --git a/launcher.c b/launcher.c
index 0dca2e168b..201219cc46 100755
--- a/launcher.c
+++ b/launcher.c
@@ -25,9 +25,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <process.h>
+#include <unistd.h>
 #include <fcntl.h>
-#include "tchar.h"
 #include "windows.h"
 
 int fail(char *format, char *data) {
@@ -82,17 +81,18 @@ char *quoted(char *data) {
 
 
 char *loadable_exe(char *exename) {
-    HINSTANCE hPython;  /* DLL handle for python executable */
+    /* HINSTANCE hPython;  DLL handle for python executable */
     char *result;
 
-    hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    if (!hPython) return NULL;
+    /* hPython = LoadLibraryEx(exename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    if (!hPython) return NULL; */
 
     /* Return the absolute filename for spawnv */
     result = calloc(MAX_PATH, sizeof(char));
-    if (result) GetModuleFileName(hPython, result, MAX_PATH);
+    strncpy(result, exename, MAX_PATH);
+    /*if (result) GetModuleFileName(hPython, result, MAX_PATH);
 
-    FreeLibrary(hPython);
+    FreeLibrary(hPython); */
     return result;
 }
 
@@ -237,18 +237,11 @@ int run(int argc, char **argv, int is_gui) {
     }
 
     /* We *do* need to wait for a CLI to finish, so use spawn */
-    return _spawnv(_P_WAIT, ptr, (const char * const *)(newargs));
+    return spawnv(P_WAIT, ptr, (const char * const *)(newargs));
 }
 
-/*
+
 int WINAPI WinMain(HINSTANCE hI, HINSTANCE hP, LPSTR lpCmd, int nShow) {
     return run(__argc, __argv, GUI);
 }
 
-*/
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	return run(argc, argv, GUI);
-}
-
diff --git a/setup.py b/setup.py
index da59d365b5..8065235af4 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,6 @@
 """Distutils setup file, used to install or test 'setuptools'"""
 import sys
 import os
-import platform
 
 src_root = None
 if sys.version_info >= (3,):
@@ -40,36 +39,8 @@
 VERSION = "0.6.6"
 
 from setuptools import setup, find_packages
-from setuptools.command.build_py import build_py as _build_py
 scripts = []
 
-# specific command that is used to generate windows .exe files
-class build_py(_build_py):
-    def build_package_data(self):
-        """Copy data files into build directory"""
-        lastdir = None
-        is_64 =  platform.architecture()[0] == '64bit'
-
-        for package, src_dir, build_dir, filenames in self.data_files:
-            for filename in filenames:
-                target = os.path.join(build_dir, filename)
-                self.mkpath(os.path.dirname(target))
-                srcfile = os.path.join(src_dir, filename)
-                outf, copied = self.copy_file(srcfile, target)
-
-                # creating cli.exe and gui.exe
-                if filename in ('gui-32.exe', 'cli-32.exe') and not is_64:
-                    exe_target = os.path.join(build_dir, filename.replace('-32.exe', '.exe'))
-                    self.copy_file(srcfile, exe_target)
-
-                if filename in ('gui-64.exe', 'cli-64.exe') and is_64:
-                    exe_target = os.path.join(build_dir, filename.replace('-64.exe', '.exe'))
-                    self.copy_file(srcfile, exe_target)
-
-                srcfile = os.path.abspath(srcfile)
-                if copied and srcfile in self.distribution.convert_2to3_doctests:
-                    self.__doctests_2to3.append(outf)
-
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
 def _easy_install_marker():
@@ -176,7 +147,6 @@ def _being_installed():
     Topic :: System :: Systems Administration
     Topic :: Utilities""".splitlines() if f.strip()],
     scripts = scripts,
-    cmdclass = {'build_py': build_py}
 )
 
 if _being_installed():
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
deleted file mode 100644
index dd63bbfcd647ae38f6670df57937fcffacd2bd06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65536
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
H=z;$OkJaYk

diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
deleted file mode 100644
index cc7ced507f4bddb38dad3093514e3b58b469dbc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74240
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
a&jN~0tN05PolXfau!X1D<xu}8zyAl_3HsUq

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
new file mode 100644
index 0000000000000000000000000000000000000000..8906ff77a26d30d63766158b2cebe1284188e637
GIT binary patch
literal 7168
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

literal 0
HcmV?d00001

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4b03e18529..195139c711 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1603,14 +1603,13 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                 ")\n"
             ) % locals()
             if sys.platform=='win32' or wininst:
-                word_size = [32, 64]['amd64' in sys.version.lower()]
                 # On Windows/wininst, add a .py extension and an .exe launcher
                 if group=='gui_scripts':
-                    ext, launcher = '-script.pyw', 'gui-%d.exe' % word_size
+                    ext, launcher = '-script.pyw', 'gui.exe'
                     old = ['.pyw']
                     new_header = re.sub('(?i)python.exe','pythonw.exe',header)
                 else:
-                    ext, launcher = '-script.py', 'cli-%d.exe' % word_size
+                    ext, launcher = '-script.py', 'cli.exe'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
 
diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
deleted file mode 100644
index 718382079bd3eb24ebec9f10a12ccdc279c13ac6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65536
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
IzoQ5K59B51SpWb4

diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
deleted file mode 100644
index 7fbfb88973f21f7e2314e0634bd006b4cc39689f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74240
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

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
new file mode 100644
index 0000000000000000000000000000000000000000..474838d5220133fc3bd4898bce43e12ffd0be09f
GIT binary patch
literal 7168
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

literal 0
HcmV?d00001


From a858356a4e28396a0828573d9a5074da67f6dc62 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Tue, 20 Oct 2009 02:55:01 +0300
Subject: [PATCH 2678/8469] Readded the custom build_py command for safely
 upgrading from older distribute versions

--HG--
branch : distribute
extra : rebase_source : 74f1706957dbe79303581f21947d17b06b74ef61
---
 setup.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/setup.py b/setup.py
index e57cf5cf34..07cfcd5ed9 100755
--- a/setup.py
+++ b/setup.py
@@ -39,8 +39,30 @@
 VERSION = "0.6.7"
 
 from setuptools import setup, find_packages
+from setuptools.command.build_py import build_py as _build_py
 scripts = []
 
+# specific command that is used to generate windows .exe files
+class build_py(_build_py):
+    def build_package_data(self):
+        """Copy data files into build directory"""
+        lastdir = None
+        for package, src_dir, build_dir, filenames in self.data_files:
+            for filename in filenames:
+                target = os.path.join(build_dir, filename)
+                self.mkpath(os.path.dirname(target))
+                srcfile = os.path.join(src_dir, filename)
+                outf, copied = self.copy_file(srcfile, target)
+                srcfile = os.path.abspath(srcfile)
+
+                # avoid a bootstrapping issue with easy_install -U (when the
+                # previous version doesn't have convert_2to3_doctests)
+                if not hasattr(self.distribution, 'convert_2to3_doctests'):
+                    continue
+
+                if copied and srcfile in self.distribution.convert_2to3_doctests:
+                    self.__doctests_2to3.append(outf)
+
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
 def _easy_install_marker():

From 43d34734c801d2d9a72d5fa6e7fc74d80bdc11c1 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 01:11:48 +0200
Subject: [PATCH 2679/8469] Removed virtual-python.py from this distribution
 and updated documentation to point to the actively maintained virtualenv
 instead.

--HG--
branch : distribute
extra : rebase_source : accfddb40177f981dbf0e5886039fcb27c1be573
---
 CHANGES.txt           |   2 +
 docs/easy_install.txt |  32 ++---------
 virtual-python.py     | 123 ------------------------------------------
 3 files changed, 6 insertions(+), 151 deletions(-)
 delete mode 100755 virtual-python.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 3aceb5ac5d..445934eea8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.7
 -----
 
+* Removed virtual-python.py from this distribution and updated documentation
+  to point to the actively maintained virtualenv instead.
 * Issue 64: use_setuptools no longer rebuilds the distribute egg every
   time it is run
 * use_setuptools now properly respects the requested version
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index b821e5ca45..5fa8354240 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -1073,34 +1073,10 @@ system, but don't have root access, you can create your own "virtual"
 Python installation, which uses its own library directories and some symlinks
 to the site-wide Python.
 
-In the simplest case, your virtual Python installation will live under the
-``~/lib/python2.x``, ``~/include/python2.x``, and ``~/bin`` directories.  Just
-download `virtual-python.py`_ and run it using the site-wide Python.  If you
-want to customize the location, you can use the ``--prefix`` option to specify
-an installation base directory in place of ``~``.  (Use ``--help`` to get the
-complete list of options.)
-
-.. _virtual-python.py: http://peak.telecommunity.com/dist/virtual-python.py
-
-When you're done, you'll have a ``~/bin/python`` executable that's linked to
-the local Python installation and inherits all its current libraries, but which
-allows you to add as many new libraries as you want.  Simply use this new
-Python in place of your system-defined one, and you can modify it as you like
-without breaking anything that relies on the system Python.  You'll also still
-need to follow the standard `installation instructions`_ to install setuptools
-and EasyInstall, using your new ``~/bin/python`` executable in place of the
-system Python.
-
-Note that if you were previously setting a ``PYTHONPATH`` and/or had other
-special configuration options in your ``~/.pydistutils.cfg``, you may need to
-remove these settings *before* running ``virtual-python.py``.  This is because
-your new Python executable will not need *any* custom configuration for the
-distutils or EasyInstall; everything will go to the correct ``~/lib`` and
-``~/bin`` directories automatically.
-
-You should, however, also make sure that the ``bin`` subdirectory of your
-installation prefix (e.g. ``~/bin``) is on your ``PATH``, because that is where
-EasyInstall and the distutils will install new Python scripts.
+Please refer to the `virtualenv`_ documentation for creating such an
+environment.
+
+.. _virtualenv: http://pypi.python.org/pypi/virtualenv
 
 
 "Traditional" ``PYTHONPATH``-based Installation
diff --git a/virtual-python.py b/virtual-python.py
deleted file mode 100755
index 73ef41224c..0000000000
--- a/virtual-python.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""Create a "virtual" Python installation
-
-Based on a script created by Ian Bicking."""
-
-import sys, os, optparse, shutil
-join = os.path.join
-py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1])
-
-def mkdir(path):
-    if not os.path.exists(path):
-        print 'Creating %s' % path
-        os.makedirs(path)
-    else:
-        if verbose:
-            print 'Directory %s already exists'
-
-def symlink(src, dest):
-    if not os.path.exists(dest):
-        if verbose:
-            print 'Creating symlink %s' % dest
-        os.symlink(src, dest)
-    else:
-        print 'Symlink %s already exists' % dest
-
-
-def rmtree(dir):
-    if os.path.exists(dir):
-        print 'Deleting tree %s' % dir
-        shutil.rmtree(dir)
-    else:
-        if verbose:
-            print 'Do not need to delete %s; already gone' % dir
-
-def make_exe(fn):
-    if os.name == 'posix':
-        oldmode = os.stat(fn).st_mode & 07777
-        newmode = (oldmode | 0555) & 07777
-        os.chmod(fn, newmode)
-        if verbose:
-            print 'Changed mode of %s to %s' % (fn, oct(newmode))
-
-def main():
-    if os.name != 'posix':
-        print "This script only works on Unix-like platforms, sorry."
-        return
-
-    parser = optparse.OptionParser()
-
-    parser.add_option('-v', '--verbose', action='count', dest='verbose',
-        default=0, help="Increase verbosity")
-
-    parser.add_option('--prefix', dest="prefix", default='~',
-        help="The base directory to install to (default ~)")
-
-    parser.add_option('--clear', dest='clear', action='store_true',
-        help="Clear out the non-root install and start from scratch")
-
-    parser.add_option('--no-site-packages', dest='no_site_packages',
-        action='store_true',
-        help="Don't copy the contents of the global site-packages dir to the "
-             "non-root site-packages")
-
-    options, args = parser.parse_args()
-    global verbose
-
-    home_dir = os.path.expanduser(options.prefix)
-    lib_dir = join(home_dir, 'lib', py_version)
-    inc_dir = join(home_dir, 'include', py_version)
-    bin_dir = join(home_dir, 'bin')
-
-    if sys.executable.startswith(bin_dir):
-        print 'Please use the *system* python to run this script'
-        return
-
-    verbose = options.verbose
-    assert not args, "No arguments allowed"
-
-    if options.clear:
-        rmtree(lib_dir)
-        rmtree(inc_dir)
-        print 'Not deleting', bin_dir
-
-    prefix = sys.prefix
-    mkdir(lib_dir)
-    stdlib_dir = join(prefix, 'lib', py_version)
-    for fn in os.listdir(stdlib_dir):
-        if fn != 'site-packages':
-            symlink(join(stdlib_dir, fn), join(lib_dir, fn))
-
-    mkdir(join(lib_dir, 'site-packages'))
-    if not options.no_site_packages:
-        for fn in os.listdir(join(stdlib_dir, 'site-packages')):
-            symlink(join(stdlib_dir, 'site-packages', fn),
-                    join(lib_dir, 'site-packages', fn))
-
-    mkdir(inc_dir)
-    stdinc_dir = join(prefix, 'include', py_version)
-    for fn in os.listdir(stdinc_dir):
-        symlink(join(stdinc_dir, fn), join(inc_dir, fn))
-
-    if sys.exec_prefix != sys.prefix:
-        exec_dir = join(sys.exec_prefix, 'lib', py_version)
-        for fn in os.listdir(exec_dir):
-            symlink(join(exec_dir, fn), join(lib_dir, fn))
-
-    mkdir(bin_dir)
-    print 'Copying %s to %s' % (sys.executable, bin_dir)
-    py_executable = join(bin_dir, 'python')
-    if sys.executable != py_executable:
-        shutil.copyfile(sys.executable, py_executable)
-        make_exe(py_executable)
-
-    pydistutils = os.path.expanduser('~/.pydistutils.cfg')
-    if os.path.exists(pydistutils):
-        print 'Please make sure you remove any previous custom paths from'
-        print "your", pydistutils, "file."
-
-    print "You're now ready to download distribute_setup.py, and run"
-    print py_executable, "distribute_setup.py"
-
-if __name__ == '__main__':
-    main()
-

From 9b02ba04ef7690724330d3d8ff35cd38284d3b07 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 01:24:05 +0200
Subject: [PATCH 2680/8469] Issue 21: Allow PackageIndex.open_url to gracefully
 handle all cases of a httplib.HTTPException instead of just InvalidURL and
 BadStatusLine.

--HG--
branch : distribute
extra : rebase_source : 24986ae1074b564fbd8c34a227265afd3b90ebce
---
 CHANGES.txt                 | 2 ++
 setuptools/package_index.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 445934eea8..7ef29cbe9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.7
 -----
 
+* Issue 21: Allow PackageIndex.open_url to gracefully handle all cases of a
+  httplib.HTTPException instead of just InvalidURL and BadStatusLine.
 * Removed virtual-python.py from this distribution and updated documentation
   to point to the actively maintained virtualenv instead.
 * Issue 64: use_setuptools no longer rebuilds the distribute egg every
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 98799de535..ee980214cf 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -602,6 +602,12 @@ def open_url(self, url, warning=None):
                 raise DistutilsError('%s returned a bad status line. '
                                      'The server might be down, %s' % \
                                              (url, v.line))
+        except httplib.HTTPException, v:
+            if warning:
+                self.warn(warning, v)
+            else:
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v))
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename

From b58dc072b50e4a7c8115b45e637393a321f0cc8c Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 01:39:50 +0200
Subject: [PATCH 2681/8469] Updated and fixed contributers

--HG--
branch : distribute
extra : rebase_source : 18217e823ba7b14c0b17f09575a8cd642bc8856c
---
 CONTRIBUTORS.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5dcc3675e2..cf46bb95a1 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -3,11 +3,13 @@ Contributors
 ============
 
 * Alex Grönholm
+* Daniel Stutzbach
 * Hanno Schlichting
 * Jannis Leidel
 * Lennart Regebro
-* Martin von Loewis
-* Philip Envey
+* Martin von Löwis
+* Philip Jenvey
+* Reinout van Rees
 * Tarek Ziadé
 
 If you think you name is missing, please add it (alpha order by first name)

From 8a6435e3be9e93d3f3e2b2bb98b9c4051c2a0262 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 01:51:35 +0200
Subject: [PATCH 2682/8469] Removed outdated note about the special setup
 module for Python 3.

--HG--
branch : distribute
extra : rebase_source : 2c8190effa006ad4d7929abd756d5303c84be166
---
 README.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.txt b/README.txt
index fbdf32798d..09c547b405 100755
--- a/README.txt
+++ b/README.txt
@@ -86,12 +86,6 @@ If your shell has the ``curl`` program you can do::
     $ curl -O http://python-distribute.org/distribute_setup.py
     $ python distribute_setup.py
 
-If you are under Python 3, use
-`distribute_setup_3k.py <http://python-distribute.org/distribute_setup_3k.py>`_::
-
-    $ curl -O http://python-distribute.org/distribute_setup_3k.py
-    $ python distribute_setup_3k.py
-
 Notice this file is also provided in the source release.
 
 easy_install or pip

From 2ddbb439c45e3ea3a7103cd6cfd6308a07158078 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 01:56:08 +0200
Subject: [PATCH 2683/8469] Whitespace and added a note how to run the tests

--HG--
branch : distribute
extra : rebase_source : ce8146ff9d4e46e3e3b5e3a49e79debe7d260fab
---
 DEVGUIDE.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index a7968ce88d..54b7f71c4d 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -2,17 +2,16 @@
 Quick notes for contributors
 ============================
 
-Distribute is using Mercurial. 
+Distribute is using Mercurial.
 
 Grab the code at bitbucket::
 
-
     $ hg clone https://tarek@bitbucket.org/tarek/distribute distribute
-    
+
 If you want to work in the 0.6 branch, you have to switch to it::
 
     $ hg update 0.6-maintenance
-    
+
     $ hg branch
     0.6-maintenance
 
@@ -24,4 +23,6 @@ If you make some changes, don't forget to:
 And remember that 0.6 is only bug fixes, and the APIs should
 be fully backward compatible with Setuptools.
 
+You can run the tests via::
 
+    $ python setup.py test

From 064e10630f9b8c7df65f62a2f2d0d48d63f0f825 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sat, 24 Oct 2009 02:13:56 +0200
Subject: [PATCH 2684/8469] Reviewed unladen-swallow specific change from
 http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719 and
 determined that it no longer applies. Distribute should work fine with
 Unladen Swallow 2009Q3.

--HG--
branch : distribute
extra : rebase_source : 74d09eb0390667122b445860aea8ecc25a0d85d7
---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7ef29cbe9a..a0276a328d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,10 @@ CHANGES
 0.6.7
 -----
 
+* Reviewed unladen-swallow specific change from
+  http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719
+  and determined that it no longer applies. Distribute should work fine with
+  Unladen Swallow 2009Q3.
 * Issue 21: Allow PackageIndex.open_url to gracefully handle all cases of a
   httplib.HTTPException instead of just InvalidURL and BadStatusLine.
 * Removed virtual-python.py from this distribution and updated documentation

From cef81109d0ce7c62311b88479f37f02a73f3e917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 13:29:44 +0000
Subject: [PATCH 2685/8469] #7066 - Fixed distutils.archive_util.make_archive
 behavior so it restores the cwd

---
 archive_util.py            | 10 ++++++----
 tests/test_archive_util.py | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index bc5edfd864..c741cc0174 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -233,9 +233,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
         kwargs['owner'] = owner
         kwargs['group'] = group
 
-    filename = func(base_name, base_dir, **kwargs)
-    if root_dir is not None:
-        log.debug("changing back to '%s'", save_cwd)
-        os.chdir(save_cwd)
+    try:
+        filename = func(base_name, base_dir, **kwargs)
+    finally:
+        if root_dir is not None:
+            log.debug("changing back to '%s'", save_cwd)
+            os.chdir(save_cwd)
 
     return filename
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index b91986ba95..a9b46d8e22 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -8,7 +8,8 @@
 import warnings
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
-                                    make_zipfile, make_archive)
+                                    make_zipfile, make_archive,
+                                    ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
 from test.test_support import check_warnings
@@ -262,6 +263,20 @@ def test_tarfile_root_owner(self):
         finally:
             archive.close()
 
+    def test_make_archive_cwd(self):
+        current_dir = os.getcwd()
+        def _breaks(*args, **kw):
+            raise RuntimeError()
+        ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file')
+        try:
+            try:
+                make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
+            except:
+                pass
+            self.assertEquals(os.getcwd(), current_dir)
+        finally:
+            del ARCHIVE_FORMATS['xxx']
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 

From 0d4e4028bd9f2f05037cda612970b0ed16870e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 13:38:27 +0000
Subject: [PATCH 2686/8469] Merged revisions 75659 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75659 | tarek.ziade | 2009-10-24 15:29:44 +0200 (Sat, 24 Oct 2009) | 1 line

  #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
........
---
 archive_util.py            | 11 ++++++-----
 tests/test_archive_util.py | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index d051f917bb..28e93fed78 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -232,10 +232,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
         kwargs['owner'] = owner
         kwargs['group'] = group
 
-    filename = func(base_name, base_dir, **kwargs)
-
-    if root_dir is not None:
-        log.debug("changing back to '%s'", save_cwd)
-        os.chdir(save_cwd)
+    try:
+        filename = func(base_name, base_dir, **kwargs)
+    finally:
+        if root_dir is not None:
+            log.debug("changing back to '%s'", save_cwd)
+            os.chdir(save_cwd)
 
     return filename
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 71d32dce19..682f19a2b3 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -8,7 +8,8 @@
 import warnings
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
-                                    make_zipfile, make_archive)
+                                    make_zipfile, make_archive,
+                                    ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
 from test.support import check_warnings
@@ -262,6 +263,20 @@ def test_tarfile_root_owner(self):
         finally:
             archive.close()
 
+    def test_make_archive_cwd(self):
+        current_dir = os.getcwd()
+        def _breaks(*args, **kw):
+            raise RuntimeError()
+        ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file')
+        try:
+            try:
+                make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
+            except:
+                pass
+            self.assertEquals(os.getcwd(), current_dir)
+        finally:
+            del ARCHIVE_FORMATS['xxx']
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 

From 57a2a657c29720facb1cd04f28751608323f9c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 13:42:10 +0000
Subject: [PATCH 2687/8469] Merged revisions 75662 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75662 | tarek.ziade | 2009-10-24 15:38:27 +0200 (Sat, 24 Oct 2009) | 9 lines

  Merged revisions 75659 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75659 | tarek.ziade | 2009-10-24 15:29:44 +0200 (Sat, 24 Oct 2009) | 1 line

    #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
  ........
................
---
 archive_util.py            | 11 ++++++-----
 tests/test_archive_util.py | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index a568854e4e..16164c7f1f 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -171,10 +171,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
-    filename = func(base_name, base_dir, **kwargs)
-
-    if root_dir is not None:
-        log.debug("changing back to '%s'", save_cwd)
-        os.chdir(save_cwd)
+    try:
+        filename = func(base_name, base_dir, **kwargs)
+    finally:
+        if root_dir is not None:
+            log.debug("changing back to '%s'", save_cwd)
+            os.chdir(save_cwd)
 
     return filename
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index d88e0b350d..c6e08cbc2b 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -8,7 +8,8 @@
 import warnings
 
 from distutils.archive_util import (check_archive_formats, make_tarball,
-                                    make_zipfile, make_archive)
+                                    make_zipfile, make_archive,
+                                    ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
 from test.support import check_warnings
@@ -192,6 +193,20 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
+    def test_make_archive_cwd(self):
+        current_dir = os.getcwd()
+        def _breaks(*args, **kw):
+            raise RuntimeError()
+        ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file')
+        try:
+            try:
+                make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
+            except:
+                pass
+            self.assertEquals(os.getcwd(), current_dir)
+        finally:
+            del ARCHIVE_FORMATS['xxx']
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 

From 9e0e2af955949e3f06652856f6812ab291e47b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 15:10:37 +0000
Subject: [PATCH 2688/8469] Issue #7071: byte-compilation in Distutils now
 looks at sys.dont_write_bytecode

---
 command/build_py.py       |  5 +++++
 command/install_lib.py    |  6 ++++++
 errors.py                 |  2 ++
 tests/test_build_py.py    | 16 ++++++++++++++++
 tests/test_install_lib.py | 17 +++++++++++++++++
 tests/test_util.py        | 18 +++++++++++++-----
 util.py                   |  5 +++++
 7 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 5d249f3ddc..9b9f551830 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os
+import sys
 from glob import glob
 
 from distutils.core import Command
@@ -372,6 +373,10 @@ def build_packages(self):
                 self.build_module(module, module_file, package)
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compile not supported on this platform, skipping.')
+            return
+
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
diff --git a/command/install_lib.py b/command/install_lib.py
index 411db79cc2..7b4b45be79 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,6 +6,8 @@
 __revision__ = "$Id$"
 
 import os
+import sys
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -118,6 +120,10 @@ def install(self):
         return outfiles
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compile not supported on this platform, skipping.')
+            return
+
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
diff --git a/errors.py b/errors.py
index 963d83377c..acecacccb5 100644
--- a/errors.py
+++ b/errors.py
@@ -74,6 +74,8 @@ class DistutilsInternalError (DistutilsError):
 class DistutilsTemplateError (DistutilsError):
     """Syntax error in a file list template."""
 
+class DistutilsByteCompileError(DistutilsError):
+    """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
 class CCompilerError (Exception):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index c815d8185e..e8c7ca921c 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -89,6 +89,22 @@ def test_empty_package_dir (self):
             os.chdir(cwd)
             sys.stdout = sys.__stdout__
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = build_py(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
+
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index b2185b8442..fab66d15ae 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -31,6 +31,8 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
+    @unittest.skipUnless(not sys.dont_write_bytecode,
+                         'byte-compile not supported')
     def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
@@ -76,6 +78,21 @@ def test_get_inputs(self):
         # get_input should return 2 elements
         self.assertEquals(len(cmd.get_inputs()), 2)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 4099c950ad..4da1e651ed 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,7 +1,4 @@
 """Tests for distutils.util."""
-# not covered yet:
-#    - byte_compile
-#
 import os
 import sys
 import unittest
@@ -9,11 +6,12 @@
 from StringIO import StringIO
 import subprocess
 
-from distutils.errors import DistutilsPlatformError
+from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
-                            _find_exe_version, _MAC_OS_X_LD_VERSION)
+                            _find_exe_version, _MAC_OS_X_LD_VERSION,
+                            byte_compile)
 from distutils import util
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
@@ -349,6 +347,16 @@ def test_get_compiler_versions(self):
         res = get_compiler_versions()
         self.assertEquals(res[2], None)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile raise a DistutilsError
+        # if sys.dont_write_bytecode is True
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            self.assertRaises(DistutilsByteCompileError, byte_compile, [])
+        finally:
+            sys.dont_write_bytecode = False
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index fe6851cb87..a87ef44a27 100644
--- a/util.py
+++ b/util.py
@@ -13,6 +13,7 @@
 from distutils.spawn import spawn, find_executable
 from distutils import log
 from distutils.version import LooseVersion
+from distutils.errors import DistutilsByteCompileError
 
 def get_platform():
     """Return a string that identifies the current platform.
@@ -445,6 +446,10 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
+    # nothing is done if sys.dont_write_bytecode is True
+    if sys.dont_write_bytecode:
+        raise DistutilsByteCompileError('byte-compiling not supported.')
+
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative
     # approach: choose direct mode *only* if the current interpreter is

From 32bc943918b21381298fc43df3f6d40b252a6937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 15:19:03 +0000
Subject: [PATCH 2689/8469] fixed finally state in distutils.test_util

---
 tests/test_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 4da1e651ed..55ef160f37 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -355,7 +355,7 @@ def test_dont_write_bytecode(self):
         try:
             self.assertRaises(DistutilsByteCompileError, byte_compile, [])
         finally:
-            sys.dont_write_bytecode = False
+            sys.dont_write_bytecode = old_dont_write_bytecode
 
 def test_suite():
     return unittest.makeSuite(UtilTestCase)

From ecff8b73e4ab2da659b208b66c3d72a104ba7d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 24 Oct 2009 15:51:30 +0000
Subject: [PATCH 2690/8469] fixed warning and error message

---
 command/build_py.py       | 2 +-
 command/install_lib.py    | 2 +-
 tests/test_build_py.py    | 2 +-
 tests/test_install_lib.py | 2 +-
 util.py                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 9b9f551830..5c7b473b04 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -374,7 +374,7 @@ def build_packages(self):
 
     def byte_compile(self, files):
         if sys.dont_write_bytecode:
-            self.warn('byte-compile not supported on this platform, skipping.')
+            self.warn('byte-compiling is disabled, skipping.')
             return
 
         from distutils.util import byte_compile
diff --git a/command/install_lib.py b/command/install_lib.py
index 7b4b45be79..043e8b6e27 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -121,7 +121,7 @@ def install(self):
 
     def byte_compile(self, files):
         if sys.dont_write_bytecode:
-            self.warn('byte-compile not supported on this platform, skipping.')
+            self.warn('byte-compiling is disabled, skipping.')
             return
 
         from distutils.util import byte_compile
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index e8c7ca921c..bfe6154273 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -103,7 +103,7 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index fab66d15ae..99a6d90627 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -92,7 +92,7 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
diff --git a/util.py b/util.py
index a87ef44a27..6bff44f786 100644
--- a/util.py
+++ b/util.py
@@ -448,7 +448,7 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
     """
     # nothing is done if sys.dont_write_bytecode is True
     if sys.dont_write_bytecode:
-        raise DistutilsByteCompileError('byte-compiling not supported.')
+        raise DistutilsByteCompileError('byte-compiling is disabled.')
 
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative

From 283c3eac2d9e113f876c649e5ddb1dcbf9a6e096 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 24 Oct 2009 20:11:21 +0000
Subject: [PATCH 2691/8469] Remove AtheOS support, as per PEP 11 (which claims
 that all code was removed in Python 3.0).

---
 command/build_ext.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 14c529ac5b..70dd81f10d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -262,9 +262,9 @@ def finalize_options(self):
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
 
-        # for extensions under Cygwin and AtheOS Python's library directory must be
+        # for extensions under Cygwin Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin':
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -776,22 +776,6 @@ def get_libraries(self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
-        elif sys.platform[:6] == "atheos":
-            from distutils import sysconfig
-
-            template = "python%d.%d"
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # Get SHLIBS from Makefile
-            extra = []
-            for lib in sysconfig.get_config_var('SHLIBS').split():
-                if lib.startswith('-l'):
-                    extra.append(lib[2:])
-                else:
-                    extra.append(lib)
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib, "m"] + extra
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries

From 389e4ff03d3ae338adf08fc8dc35693b07b332e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Oct 2009 23:08:47 +0000
Subject: [PATCH 2692/8469] Merged revisions 75669-75671 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75669 | tarek.ziade | 2009-10-24 17:10:37 +0200 (Sat, 24 Oct 2009) | 1 line

  Issue #7071: byte-compilation in Distutils now looks at sys.dont_write_bytecode
........
  r75670 | tarek.ziade | 2009-10-24 17:19:03 +0200 (Sat, 24 Oct 2009) | 1 line

  fixed finally state in distutils.test_util
........
  r75671 | tarek.ziade | 2009-10-24 17:51:30 +0200 (Sat, 24 Oct 2009) | 1 line

  fixed warning and error message
........
---
 command/build_py.py       |  5 +++++
 command/install_lib.py    |  6 ++++++
 errors.py                 |  2 ++
 tests/test_build_py.py    | 16 ++++++++++++++++
 tests/test_install_lib.py | 17 +++++++++++++++++
 tests/test_util.py        | 18 +++++++++++++-----
 util.py                   |  5 +++++
 7 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 4cc80f7b4a..fa08579652 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os
+import sys
 from glob import glob
 
 from distutils.core import Command
@@ -369,6 +370,10 @@ def build_packages(self):
                 self.build_module(module, module_file, package)
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
diff --git a/command/install_lib.py b/command/install_lib.py
index 85fb3acd4e..6022d30f27 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,6 +6,8 @@
 __revision__ = "$Id$"
 
 import os
+import sys
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -115,6 +117,10 @@ def install(self):
         return outfiles
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
diff --git a/errors.py b/errors.py
index 963d83377c..acecacccb5 100644
--- a/errors.py
+++ b/errors.py
@@ -74,6 +74,8 @@ class DistutilsInternalError (DistutilsError):
 class DistutilsTemplateError (DistutilsError):
     """Syntax error in a file list template."""
 
+class DistutilsByteCompileError(DistutilsError):
+    """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
 class CCompilerError (Exception):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 8ad3bbc452..582f24634a 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -89,6 +89,22 @@ def test_empty_package_dir (self):
             os.chdir(cwd)
             sys.stdout = sys.__stdout__
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = build_py(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index b2185b8442..99a6d90627 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -31,6 +31,8 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
+    @unittest.skipUnless(not sys.dont_write_bytecode,
+                         'byte-compile not supported')
     def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
@@ -76,6 +78,21 @@ def test_get_inputs(self):
         # get_input should return 2 elements
         self.assertEquals(len(cmd.get_inputs()), 2)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 8068726df1..a2f8ed2b59 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,7 +1,4 @@
 """Tests for distutils.util."""
-# not covered yet:
-#    - byte_compile
-#
 import os
 import sys
 import unittest
@@ -9,11 +6,12 @@
 from io import BytesIO
 import subprocess
 
-from distutils.errors import DistutilsPlatformError
+from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
-                            _find_exe_version, _MAC_OS_X_LD_VERSION)
+                            _find_exe_version, _MAC_OS_X_LD_VERSION,
+                            byte_compile)
 from distutils import util
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
@@ -349,6 +347,16 @@ def test_get_compiler_versions(self):
         res = get_compiler_versions()
         self.assertEquals(res[2], None)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile raise a DistutilsError
+        # if sys.dont_write_bytecode is True
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            self.assertRaises(DistutilsByteCompileError, byte_compile, [])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index 6709bbfe42..a50621e3f4 100644
--- a/util.py
+++ b/util.py
@@ -13,6 +13,7 @@
 from distutils.spawn import spawn, find_executable
 from distutils import log
 from distutils.version import LooseVersion
+from distutils.errors import DistutilsByteCompileError
 
 def get_platform():
     """Return a string that identifies the current platform.
@@ -444,6 +445,10 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
+    # nothing is done if sys.dont_write_bytecode is True
+    if sys.dont_write_bytecode:
+        raise DistutilsByteCompileError('byte-compiling is disabled.')
+
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative
     # approach: choose direct mode *only* if the current interpreter is

From 4d70c7aa04be70bf8fdf486d70c3c383271d7a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 25 Oct 2009 23:16:51 +0000
Subject: [PATCH 2693/8469] Merged revisions 75704 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75704 | tarek.ziade | 2009-10-26 00:08:47 +0100 (Mon, 26 Oct 2009) | 17 lines

  Merged revisions 75669-75671 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75669 | tarek.ziade | 2009-10-24 17:10:37 +0200 (Sat, 24 Oct 2009) | 1 line

    Issue #7071: byte-compilation in Distutils now looks at sys.dont_write_bytecode
  ........
    r75670 | tarek.ziade | 2009-10-24 17:19:03 +0200 (Sat, 24 Oct 2009) | 1 line

    fixed finally state in distutils.test_util
  ........
    r75671 | tarek.ziade | 2009-10-24 17:51:30 +0200 (Sat, 24 Oct 2009) | 1 line

    fixed warning and error message
  ........
................
---
 command/build_py.py       |  5 +++++
 command/install_lib.py    |  6 ++++++
 errors.py                 |  2 ++
 tests/test_build_py.py    | 16 ++++++++++++++++
 tests/test_install_lib.py | 17 +++++++++++++++++
 tests/test_util.py        | 17 ++++++++++++-----
 util.py                   |  4 ++++
 7 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 99d85be96c..26002e4b3f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import sys, os
+import sys
 from glob import glob
 
 from distutils.core import Command
@@ -369,6 +370,10 @@ def build_packages(self):
                 self.build_module(module, module_file, package)
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
diff --git a/command/install_lib.py b/command/install_lib.py
index 85fb3acd4e..6022d30f27 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -6,6 +6,8 @@
 __revision__ = "$Id$"
 
 import os
+import sys
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -115,6 +117,10 @@ def install(self):
         return outfiles
 
     def byte_compile(self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
diff --git a/errors.py b/errors.py
index 963d83377c..acecacccb5 100644
--- a/errors.py
+++ b/errors.py
@@ -74,6 +74,8 @@ class DistutilsInternalError (DistutilsError):
 class DistutilsTemplateError (DistutilsError):
     """Syntax error in a file list template."""
 
+class DistutilsByteCompileError(DistutilsError):
+    """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
 class CCompilerError (Exception):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 8ad3bbc452..582f24634a 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -89,6 +89,22 @@ def test_empty_package_dir (self):
             os.chdir(cwd)
             sys.stdout = sys.__stdout__
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = build_py(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index b2185b8442..99a6d90627 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -31,6 +31,8 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
+    @unittest.skipUnless(not sys.dont_write_bytecode,
+                         'byte-compile not supported')
     def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
@@ -76,6 +78,21 @@ def test_get_inputs(self):
         # get_input should return 2 elements
         self.assertEquals(len(cmd.get_inputs()), 2)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 35f81a6b37..dcc1a2069b 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,16 +1,13 @@
 """Tests for distutils.util."""
-# not covered yet:
-#    - byte_compile
-#
 import os
 import sys
 import unittest
 from copy import copy
 
-from distutils.errors import DistutilsPlatformError
+from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
-                            rfc822_escape)
+                            rfc822_escape, byte_compile)
 from distutils import util # used to patch _environ_checked
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
@@ -258,6 +255,16 @@ def test_rfc822_escape(self):
                   'header%(8s)s') % {'8s': '\n'+8*' '}
         self.assertEquals(res, wanted)
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile raise a DistutilsError
+        # if sys.dont_write_bytecode is True
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            self.assertRaises(DistutilsByteCompileError, byte_compile, [])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index 5054d0c867..4bc4c98413 100644
--- a/util.py
+++ b/util.py
@@ -11,6 +11,7 @@
 from distutils.dep_util import newer
 from distutils.spawn import spawn
 from distutils import log
+from distutils.errors import DistutilsByteCompileError
 
 def get_platform ():
     """Return a string that identifies the current platform.  This is used
@@ -443,6 +444,9 @@ def byte_compile (py_files,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
+    # nothing is done if sys.dont_write_bytecode is True
+    if sys.dont_write_bytecode:
+        raise DistutilsByteCompileError('byte-compiling is disabled.')
 
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative

From 34ac4d6b68ea3f6955282afdbc7f113a084d3f31 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 26 Oct 2009 01:48:07 +0000
Subject: [PATCH 2694/8469] bumping to 2.6.4

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 4c8cf042fd..b37308c578 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.4rc2"
+__version__ = "2.6.4"
 #--end constants--

From 6f9e39534c8b0aca810553e5ebc34f789c67ca05 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 09:15:46 +0100
Subject: [PATCH 2695/8469] added DONT_PATCH_SETUPTOOLS environment marker

--HG--
branch : distribute
extra : rebase_source : 4fe53262211c90f2a90027014970f7e666de88f0
---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index 07cfcd5ed9..69c23d4428 100755
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,8 @@ def _buildout_marker():
         return 'buildout' in os.path.basename(command)
 
 def _being_installed():
+    if os.environ.get('DONT_PATCH_SETUPTOOLS') is not None:
+        return True
     if _buildout_marker():
         # Installed by buildout, don't mess with a global setuptools.
         return False

From 5c93394f676cc340e8b2606a4fc6aa183f65b108 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 09:26:40 +0100
Subject: [PATCH 2696/8469] added a CHANGES note

--HG--
branch : distribute
extra : rebase_source : 27593bcdf57d0465696f959c0db2c196e0a485e6
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a0276a328d..f74ea93be1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.7
 -----
 
+* Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv
+  can drive an installation that doesn't patch a global setuptools.
 * Reviewed unladen-swallow specific change from
   http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719
   and determined that it no longer applies. Distribute should work fine with

From 9d29ae853126d08c8779e7e158905ae263d6f52a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 09:30:16 +0100
Subject: [PATCH 2697/8469] removed PJE-style white lines

--HG--
branch : distribute
extra : rebase_source : b6f2b1983aa0e5994df5a29688348929fcd20628
---
 setuptools/command/install_scripts.py | 38 +++------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index c2dc2d5919..b1186dbac7 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -11,7 +11,7 @@ class install_scripts(_install_scripts):
     def initialize_options(self):
         _install_scripts.initialize_options(self)
         self.no_ep = False
-   
+
     def run(self):
         self.run_command("egg_info")
         if self.distribution.scripts:
@@ -20,9 +20,9 @@ def run(self):
             self.outfiles = []
         if self.no_ep:
             # don't install entry point scripts into .egg file!
-            return  
+            return
 
-        ei_cmd = self.get_finalized_command("egg_info")       
+        ei_cmd = self.get_finalized_command("egg_info")
         dist = Distribution(
             ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info),
             ei_cmd.egg_name, ei_cmd.egg_version,
@@ -35,10 +35,6 @@ def run(self):
         for args in get_script_args(dist, executable, is_wininst):
             self.write_script(*args)
 
-
-
-
-
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
         log.info("Installing %s script to %s", script_name, self.install_dir)
@@ -52,31 +48,3 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f.close()
             chmod(target,0755)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 6ef67c96970c10cc7cb5d4c4093abc40817fa2ba Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 09:44:07 +0100
Subject: [PATCH 2698/8469] Generated scripts now wraps their call in a
 __main__ section. Fixes #11

--HG--
branch : distribute
extra : rebase_source : d69b879d01ca2690826cdf9b7541e541ae8e0f5a
---
 CHANGES.txt                           |  6 +++--
 setuptools/command/easy_install.py    | 10 +++++---
 setuptools/tests/test_easy_install.py | 36 ++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f74ea93be1..935d4db8e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.7
 -----
 
+* Issue 11: Generated scripts now wrap their call to the script entry point
+  in the standard "if name == 'main'"
 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv
   can drive an installation that doesn't patch a global setuptools.
 * Reviewed unladen-swallow specific change from
@@ -38,7 +40,7 @@ CHANGES
 * Issue 65: cli.exe and gui.exe are now generated at build time,
   depending on the platform in use.
 
-* Issue 67: Fixed doc typo (PEP 381/382) 
+* Issue 67: Fixed doc typo (PEP 381/382)
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
   setuptools.  And an error is raised when installing a 0.7 setuptools with
@@ -122,7 +124,7 @@ setuptools
   This closes http://bitbucket.org/tarek/distribute/issue/16 and
   http://bitbucket.org/tarek/distribute/issue/18.
 
-* zip_ok is now False by default. This closes 
+* zip_ok is now False by default. This closes
   http://bugs.python.org/setuptools/issue33.
 
 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 195139c711..c83e4283a7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1591,16 +1591,18 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
     spec = str(dist.as_requirement())
     header = get_script_header("", executable, wininst)
     for group in 'console_scripts', 'gui_scripts':
-        for name,ep in dist.get_entry_map(group).items():
+        for name, ep in dist.get_entry_map(group).items():
             script_text = (
                 "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
                 "__requires__ = %(spec)r\n"
                 "import sys\n"
                 "from pkg_resources import load_entry_point\n"
                 "\n"
-                "sys.exit(\n"
-                "   load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
-                ")\n"
+                "if __name__ == '__main__':"
+                "\n"
+                "    sys.exit(\n"
+                "        load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
+                "    )\n"
             ) % locals()
             if sys.platform=='win32' or wininst:
                 # On Windows/wininst, add a .py extension and an .exe launcher
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 583c072b20..6ce20e42f8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,9 +1,32 @@
 """Easy install Tests
 """
+import sys
 import os, shutil, tempfile, unittest
-from setuptools.command.easy_install import easy_install
+from setuptools.command.easy_install import easy_install, get_script_args
 from setuptools.dist import Distribution
 
+class FakeDist(object):
+    def get_entry_map(self, group):
+        if group != 'console_scripts':
+            return {}
+        return {'name': 'ep'}
+
+    def as_requirement(self):
+        return 'spec'
+
+WANTED = """\
+#!%s
+# EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
+__requires__ = 'spec'
+import sys
+from pkg_resources import load_entry_point
+
+if __name__ == '__main__':
+    sys.exit(
+        load_entry_point('spec', 'console_scripts', 'name')()
+    )
+""" % sys.executable
+
 class TestEasyInstallTest(unittest.TestCase):
 
     def test_install_site_py(self):
@@ -18,3 +41,14 @@ def test_install_site_py(self):
         finally:
             shutil.rmtree(cmd.install_dir)
 
+    def test_get_script_args(self):
+        dist = FakeDist()
+
+        old_platform = sys.platform
+        try:
+            name, script = get_script_args(dist).next()
+        finally:
+            sys.platform = old_platform
+
+        self.assertEquals(script, WANTED)
+

From e95226aa273fff543d1eccfaaabf7d58d52f5e95 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 09:54:46 +0100
Subject: [PATCH 2699/8469] removed empty lines

--HG--
branch : distribute
extra : rebase_source : a13127278ab77a12def12cfabc24f436f4700f1c
---
 setuptools/command/develop.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 5643c77341..88394c4870 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -34,11 +34,6 @@ def initialize_options(self):
         self.setup_path = None
         self.always_copy_from = '.'   # always copy eggs installed in curdir
 
-
-
-
-
-
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
         if ei.broken_egg_info:
@@ -117,10 +112,6 @@ def uninstall_link(self):
             # XXX should also check for entry point scripts!
             log.warn("Note: you must uninstall or replace scripts manually!")
 
-
-
-
-
     def install_egg_scripts(self, dist):
         if dist is not self.dist:
             # Installing a dependency, so fall back to normal behavior
@@ -140,25 +131,3 @@ def install_egg_scripts(self, dist):
             f.close()
             self.install_script(dist, script_name, script_text, script_path)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 05ddf95fbac925bed8a75497e48a72e1d0ff6fdb Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 10:42:38 +0100
Subject: [PATCH 2700/8469] now develop supports the --user option fixes #58

--HG--
branch : distribute
extra : rebase_source : 1f25aaecb7ff9c7b273430e68dc2bc2d2e23db7d
---
 CHANGES.txt                      |   1 +
 setuptools/command/develop.py    | 106 ++++++++++++++++++++++++++++++-
 setuptools/tests/test_develop.py |  63 ++++++++++++++++++
 3 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/tests/test_develop.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 935d4db8e3..b2f0e27474 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.7
 -----
 
+* Issue 58: Added --user support to the deveop command
 * Issue 11: Generated scripts now wrap their call to the script entry point
   in the standard "if name == 'main'"
 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 88394c4870..2be8bb1432 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -1,9 +1,20 @@
 from setuptools.command.easy_install import easy_install
-from distutils.util import convert_path
+from distutils.util import convert_path, subst_vars
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from distutils import log
 from distutils.errors import *
 import sys, os, setuptools, glob
+from distutils.sysconfig import get_config_vars
+from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
+
+if sys.version < "2.6":
+    USER_BASE = None
+    USER_SITE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    from site import USER_SITE
+    HAS_USER_SITE = True
 
 class develop(easy_install):
     """Set up package for development"""
@@ -17,6 +28,11 @@ class develop(easy_install):
 
     boolean_options = easy_install.boolean_options + ['uninstall']
 
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "install in user site-package '%s'" % USER_SITE))
+        boolean_options.append('user')
+
     command_consumes_arguments = False  # override base
 
     def run(self):
@@ -33,6 +49,56 @@ def initialize_options(self):
         easy_install.initialize_options(self)
         self.setup_path = None
         self.always_copy_from = '.'   # always copy eggs installed in curdir
+        self.user = 0
+        self.install_purelib = None     # for pure module distributions
+        self.install_platlib = None     # non-pure (dists w/ extensions)
+        self.install_headers = None     # for C/C++ headers
+        self.install_lib = None         # set to either purelib or platlib
+        self.install_scripts = None
+        self.install_data = None
+        self.install_base = None
+        self.install_platbase = None
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
+
+    def select_scheme(self, name):
+        """Sets the install directories by applying the install schemes."""
+        # it's the caller's problem if they supply a bad name!
+        scheme = INSTALL_SCHEMES[name]
+        for key in SCHEME_KEYS:
+            attrname = 'install_' + key
+            if getattr(self, attrname) is None:
+                setattr(self, attrname, scheme[key])
+
+    def create_home_path(self):
+        """Create directories under ~."""
+        if not self.user:
+            return
+        home = convert_path(os.path.expanduser("~"))
+        for name, path in self.config_vars.iteritems():
+            if path.startswith(home) and not os.path.isdir(path):
+                self.debug_print("os.makedirs('%s', 0700)" % path)
+                os.makedirs(path, 0700)
+
+    def _expand_attrs(self, attrs):
+        for attr in attrs:
+            val = getattr(self, attr)
+            if val is not None:
+                if os.name == 'posix' or os.name == 'nt':
+                    val = os.path.expanduser(val)
+                val = subst_vars(val, self.config_vars)
+                setattr(self, attr, val)
+
+    def expand_basedirs(self):
+        """Calls `os.path.expanduser` on install_base, install_platbase and
+        root."""
+        self._expand_attrs(['install_base', 'install_platbase', 'root'])
+
+    def expand_dirs(self):
+        """Calls `os.path.expanduser` on install dirs."""
+        self._expand_attrs(['install_purelib', 'install_platlib',
+                            'install_lib', 'install_headers',
+                            'install_scripts', 'install_data',])
 
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
@@ -43,6 +109,44 @@ def finalize_options(self):
             )
         self.args = [ei.egg_name]
         easy_install.finalize_options(self)
+
+        py_version = sys.version.split()[0]
+        prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
+        self.config_vars = {'dist_name': self.distribution.get_name(),
+                            'dist_version': self.distribution.get_version(),
+                            'dist_fullname': self.distribution.get_fullname(),
+                            'py_version': py_version,
+                            'py_version_short': py_version[0:3],
+                            'py_version_nodot': py_version[0] + py_version[2],
+                            'sys_prefix': prefix,
+                            'prefix': prefix,
+                            'sys_exec_prefix': exec_prefix,
+                            'exec_prefix': exec_prefix,
+                           }
+
+        if HAS_USER_SITE:
+            self.config_vars['userbase'] = self.install_userbase
+            self.config_vars['usersite'] = self.install_usersite
+
+        # fix the install_dir if "--user" was used
+        if self.user:
+            self.create_home_path()
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            if os.name == 'posix':
+                self.select_scheme("unix_user")
+            else:
+                self.select_scheme(os.name + "_user")
+
+        self.expand_basedirs()
+        self.expand_dirs()
+
+        if self.user and self.install_purelib:
+            self.install_dir = self.install_purelib
+            self.script_dir = self.install_scripts
+
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
new file mode 100644
index 0000000000..ff12d34537
--- /dev/null
+++ b/setuptools/tests/test_develop.py
@@ -0,0 +1,63 @@
+"""develop tests
+"""
+import sys
+import os, shutil, tempfile, unittest
+import tempfile
+import site
+from StringIO import StringIO
+
+from setuptools.command.develop import develop
+from setuptools.command import develop as develop_pkg
+from setuptools.dist import Distribution
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(name='foo')
+"""
+
+class TestDevelopTest(unittest.TestCase):
+
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        setup = os.path.join(self.dir, SETUP_PY)
+        f = open(setup, 'w')
+        f.write(SETUP_PY)
+        f.close()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.dir)
+        if sys.version >= "2.6":
+            self.old_base = site.USER_BASE
+            site.USER_BASE = develop_pkg.USER_BASE = tempfile.mkdtemp()
+            self.old_site = site.USER_SITE
+            site.USER_SITE = develop_pkg.USER_SITE = tempfile.mkdtemp()
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        if sys.version >= "2.6":
+            shutil.rmtree(site.USER_BASE)
+            shutil.rmtree(site.USER_SITE)
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
+
+    def test_develop(self):
+        if sys.version < "2.6":
+            return
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        cmd = develop(dist)
+        cmd.user = 1
+        cmd.ensure_finalized()
+        cmd.user = 1
+        old_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+
+        # let's see if we got our egg link at the right place
+        content = os.listdir(site.USER_SITE)
+        self.assertEquals(content, ['UNKNOWN.egg-link'])
+

From d22b358d445d2634e6f502092a2b7ea3dcbcb8d6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 10:44:46 +0100
Subject: [PATCH 2701/8469] typo

--HG--
branch : distribute
extra : rebase_source : d596c9394c22c7d9609e63ab7093a47714658ae3
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b2f0e27474..6a8455d043 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.7
 -----
 
-* Issue 58: Added --user support to the deveop command
+* Issue 58: Added --user support to the develop command
 * Issue 11: Generated scripts now wrap their call to the script entry point
   in the standard "if name == 'main'"
 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv

From a5c7e0b5256ce53c49dabfe709b37f9644630b96 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 27 Oct 2009 16:23:23 +0100
Subject: [PATCH 2702/8469] make sure USER_SITE is listed as a sitedir in
 easy_install

--HG--
branch : distribute
extra : rebase_source : f632d56d77b31a6b4f2183728e770d00005b0060
---
 setuptools/command/develop.py      | 3 ++-
 setuptools/command/easy_install.py | 5 +++++
 setuptools/tests/test_develop.py   | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 2be8bb1432..330ba1680e 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -108,7 +108,7 @@ def finalize_options(self):
             % (ei.egg_info, ei.broken_egg_info)
             )
         self.args = [ei.egg_name]
-        easy_install.finalize_options(self)
+
 
         py_version = sys.version.split()[0]
         prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
@@ -147,6 +147,7 @@ def finalize_options(self):
             self.install_dir = self.install_purelib
             self.script_dir = self.install_scripts
 
+        easy_install.finalize_options(self)
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c83e4283a7..de6ea9459c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1211,7 +1211,12 @@ def get_site_dirs():
         site_lib = get_python_lib(plat_specific)
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
+    if sys.version >= "2.6":
+        import site
+        sitedirs.append(site.USER_SITE)
+
     sitedirs = map(normalize_path, sitedirs)
+
     return sitedirs
 
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ff12d34537..85a6c337bc 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -59,5 +59,6 @@ def test_develop(self):
 
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
-        self.assertEquals(content, ['UNKNOWN.egg-link'])
+        content.sort()
+        self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
 

From 145e091da579f3d1e2cd591ca3d0eaac70b5aeb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 27 Oct 2009 23:06:10 +0000
Subject: [PATCH 2703/8469] Fixed #1180: Option to ignore ~/.pydistutils.cfg in
 Distutils

---
 core.py            |  5 +++--
 dist.py            | 35 ++++++++++++++++++++++++++++++-----
 tests/test_dist.py | 29 +++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/core.py b/core.py
index 0fb6f81efb..8073a6bc2a 100644
--- a/core.py
+++ b/core.py
@@ -129,8 +129,9 @@ class found in 'cmdclass' is used in place of the default, which is
     if _setup_stop_after == "config":
         return dist
 
-    # Parse the command line; any command-line errors are the end user's
-    # fault, so turn them into SystemExit to suppress tracebacks.
+    # Parse the command line and override config files; any
+    # command-line errors are the end user's fault, so turn them into
+    # SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError, msg:
diff --git a/dist.py b/dist.py
index eb7d01c0e4..8dc64d43da 100644
--- a/dist.py
+++ b/dist.py
@@ -56,7 +56,9 @@ class Distribution:
                       ('quiet', 'q', "run quietly (turns verbosity off)"),
                       ('dry-run', 'n', "don't actually do anything"),
                       ('help', 'h', "show detailed help message"),
-                     ]
+                      ('no-user-cfg', None,
+                       'ignore pydistutils.cfg in your home directory'),
+    ]
 
     # 'common_usage' is a short (2-3 line) string describing the common
     # usage of the setup script.
@@ -264,6 +266,22 @@ def __init__ (self, attrs=None):
                     else:
                         sys.stderr.write(msg + "\n")
 
+        # no-user-cfg is handled before other command line args
+        # because other args override the config files, and this
+        # one is needed before we can load the config files.
+        # If attrs['script_args'] wasn't passed, assume false.
+        #
+        # This also make sure we just look at the global options
+        self.want_user_cfg = True
+
+        if self.script_args is not None:
+            for arg in self.script_args:
+                if not arg.startswith('-'):
+                    break
+                if arg == '--no-user-cfg':
+                    self.want_user_cfg = False
+                    break
+
         self.finalize_options()
 
     def get_option_dict(self, command):
@@ -316,7 +334,10 @@ def find_config_files(self):
         Distutils installation directory (ie. where the top-level
         Distutils __inst__.py file lives), a file in the user's home
         directory named .pydistutils.cfg on Unix and pydistutils.cfg
-        on Windows/Mac, and setup.cfg in the current directory.
+        on Windows/Mac; and setup.cfg in the current directory.
+
+        The file in the user's home directory can be disabled with the
+        --no-user-cfg option.
         """
         files = []
         check_environ()
@@ -336,15 +357,19 @@ def find_config_files(self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        user_file = os.path.join(os.path.expanduser('~'), user_filename)
-        if os.path.isfile(user_file):
-            files.append(user_file)
+        if self.want_user_cfg:
+            user_file = os.path.join(os.path.expanduser('~'), user_filename)
+            if os.path.isfile(user_file):
+                files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):
             files.append(local_file)
 
+        if DEBUG:
+            self.announce("using config files: %s" % ', '.join(files))
+
         return files
 
     def parse_config_files(self, filenames=None):
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 5f032ca60f..573d0b9b4f 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -209,6 +209,35 @@ def test_announce(self):
         kwargs = {'level': 'ok2'}
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
+    def test_find_config_files_disable(self):
+        # Ticket #1180: Allow user to disable their home config file.
+        temp_home = self.mkdtemp()
+        if os.name == 'posix':
+            user_filename = os.path.join(temp_home, ".pydistutils.cfg")
+        else:
+            user_filename = os.path.join(temp_home, "pydistutils.cfg")
+
+        with open(user_filename, 'w') as f:
+            f.write('[distutils]\n')
+
+        def _expander(path):
+            return temp_home
+
+        old_expander = os.path.expanduser
+        os.path.expanduser = _expander
+        try:
+            d = distutils.dist.Distribution()
+            all_files = d.find_config_files()
+
+            d = distutils.dist.Distribution(attrs={'script_args':
+                                            ['--no-user-cfg']})
+            files = d.find_config_files()
+        finally:
+            os.path.expanduser = old_expander
+
+        # make sure --no-user-cfg disables the user cfg file
+        self.assertEquals(len(all_files)-1, len(files))
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From 76c1f4ad5d4d7ae75abcc44d2e1345648a137a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 27 Oct 2009 23:12:01 +0000
Subject: [PATCH 2704/8469] Merged revisions 75893 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75893 | tarek.ziade | 2009-10-28 00:06:10 +0100 (Wed, 28 Oct 2009) | 1 line

  Fixed #1180: Option to ignore ~/.pydistutils.cfg in Distutils
........
---
 core.py            |  5 +++--
 dist.py            | 35 ++++++++++++++++++++++++++++++-----
 tests/test_dist.py | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/core.py b/core.py
index 6e4892039e..95c035742e 100644
--- a/core.py
+++ b/core.py
@@ -129,8 +129,9 @@ class found in 'cmdclass' is used in place of the default, which is
     if _setup_stop_after == "config":
         return dist
 
-    # Parse the command line; any command-line errors are the end user's
-    # fault, so turn them into SystemExit to suppress tracebacks.
+    # Parse the command line and override config files; any
+    # command-line errors are the end user's fault, so turn them into
+    # SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError as msg:
diff --git a/dist.py b/dist.py
index 1c1ea477db..90af6e2d3b 100644
--- a/dist.py
+++ b/dist.py
@@ -53,7 +53,9 @@ class Distribution:
                       ('quiet', 'q', "run quietly (turns verbosity off)"),
                       ('dry-run', 'n', "don't actually do anything"),
                       ('help', 'h', "show detailed help message"),
-                     ]
+                      ('no-user-cfg', None,
+                       'ignore pydistutils.cfg in your home directory'),
+    ]
 
     # 'common_usage' is a short (2-3 line) string describing the common
     # usage of the setup script.
@@ -260,6 +262,22 @@ def __init__ (self, attrs=None):
                     else:
                         sys.stderr.write(msg + "\n")
 
+        # no-user-cfg is handled before other command line args
+        # because other args override the config files, and this
+        # one is needed before we can load the config files.
+        # If attrs['script_args'] wasn't passed, assume false.
+        #
+        # This also make sure we just look at the global options
+        self.want_user_cfg = True
+
+        if self.script_args is not None:
+            for arg in self.script_args:
+                if not arg.startswith('-'):
+                    break
+                if arg == '--no-user-cfg':
+                    self.want_user_cfg = False
+                    break
+
         self.finalize_options()
 
     def get_option_dict(self, command):
@@ -311,7 +329,10 @@ def find_config_files(self):
         Distutils installation directory (ie. where the top-level
         Distutils __inst__.py file lives), a file in the user's home
         directory named .pydistutils.cfg on Unix and pydistutils.cfg
-        on Windows/Mac, and setup.cfg in the current directory.
+        on Windows/Mac; and setup.cfg in the current directory.
+
+        The file in the user's home directory can be disabled with the
+        --no-user-cfg option.
         """
         files = []
         check_environ()
@@ -331,15 +352,19 @@ def find_config_files(self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        user_file = os.path.join(os.path.expanduser('~'), user_filename)
-        if os.path.isfile(user_file):
-            files.append(user_file)
+        if self.want_user_cfg:
+            user_file = os.path.join(os.path.expanduser('~'), user_filename)
+            if os.path.isfile(user_file):
+                files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):
             files.append(local_file)
 
+        if DEBUG:
+            self.announce("using config files: %s" % ', '.join(files))
+
         return files
 
     def parse_config_files(self, filenames=None):
diff --git a/tests/test_dist.py b/tests/test_dist.py
index be1010c611..b1b184ea18 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -37,7 +37,8 @@ def find_config_files(self):
         return self._config_files
 
 
-class DistributionTestCase(support.LoggingSilencer,
+class DistributionTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
                            support.EnvironGuard,
                            unittest.TestCase):
 
@@ -180,6 +181,35 @@ def test_announce(self):
         kwargs = {'level': 'ok2'}
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
+    def test_find_config_files_disable(self):
+        # Ticket #1180: Allow user to disable their home config file.
+        temp_home = self.mkdtemp()
+        if os.name == 'posix':
+            user_filename = os.path.join(temp_home, ".pydistutils.cfg")
+        else:
+            user_filename = os.path.join(temp_home, "pydistutils.cfg")
+
+        with open(user_filename, 'w') as f:
+            f.write('[distutils]\n')
+
+        def _expander(path):
+            return temp_home
+
+        old_expander = os.path.expanduser
+        os.path.expanduser = _expander
+        try:
+            d = distutils.dist.Distribution()
+            all_files = d.find_config_files()
+
+            d = distutils.dist.Distribution(attrs={'script_args':
+                                            ['--no-user-cfg']})
+            files = d.find_config_files()
+        finally:
+            os.path.expanduser = old_expander
+
+        # make sure --no-user-cfg disables the user cfg file
+        self.assertEquals(len(all_files)-1, len(files))
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From cd4dc3e1269f9c6da842c6565ece1408979b42f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 28 Oct 2009 06:45:18 +0000
Subject: [PATCH 2705/8469] removed spurious spaces

---
 errors.py | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/errors.py b/errors.py
index acecacccb5..d9c47c761c 100644
--- a/errors.py
+++ b/errors.py
@@ -10,90 +10,79 @@
 
 __revision__ = "$Id$"
 
-class DistutilsError (Exception):
+class DistutilsError(Exception):
     """The root of all Distutils evil."""
-    pass
 
-class DistutilsModuleError (DistutilsError):
+class DistutilsModuleError(DistutilsError):
     """Unable to load an expected module, or to find an expected class
     within some module (in particular, command modules and classes)."""
-    pass
 
-class DistutilsClassError (DistutilsError):
+class DistutilsClassError(DistutilsError):
     """Some command class (or possibly distribution class, if anyone
     feels a need to subclass Distribution) is found not to be holding
     up its end of the bargain, ie. implementing some part of the
     "command "interface."""
-    pass
 
-class DistutilsGetoptError (DistutilsError):
+class DistutilsGetoptError(DistutilsError):
     """The option table provided to 'fancy_getopt()' is bogus."""
-    pass
 
-class DistutilsArgError (DistutilsError):
+class DistutilsArgError(DistutilsError):
     """Raised by fancy_getopt in response to getopt.error -- ie. an
     error in the command line usage."""
-    pass
 
-class DistutilsFileError (DistutilsError):
+class DistutilsFileError(DistutilsError):
     """Any problems in the filesystem: expected file not found, etc.
     Typically this is for problems that we detect before IOError or
     OSError could be raised."""
-    pass
 
-class DistutilsOptionError (DistutilsError):
+class DistutilsOptionError(DistutilsError):
     """Syntactic/semantic errors in command options, such as use of
     mutually conflicting options, or inconsistent options,
     badly-spelled values, etc.  No distinction is made between option
     values originating in the setup script, the command line, config
     files, or what-have-you -- but if we *know* something originated in
     the setup script, we'll raise DistutilsSetupError instead."""
-    pass
 
-class DistutilsSetupError (DistutilsError):
+class DistutilsSetupError(DistutilsError):
     """For errors that can be definitely blamed on the setup script,
     such as invalid keyword arguments to 'setup()'."""
-    pass
 
-class DistutilsPlatformError (DistutilsError):
+class DistutilsPlatformError(DistutilsError):
     """We don't know how to do something on the current platform (but
     we do know how to do it on some platform) -- eg. trying to compile
     C files on a platform not supported by a CCompiler subclass."""
-    pass
 
-class DistutilsExecError (DistutilsError):
+class DistutilsExecError(DistutilsError):
     """Any problems executing an external program (such as the C
     compiler, when compiling C files)."""
-    pass
 
-class DistutilsInternalError (DistutilsError):
+class DistutilsInternalError(DistutilsError):
     """Internal inconsistencies or impossibilities (obviously, this
     should never be seen if the code is working!)."""
-    pass
 
-class DistutilsTemplateError (DistutilsError):
+class DistutilsTemplateError(DistutilsError):
     """Syntax error in a file list template."""
 
 class DistutilsByteCompileError(DistutilsError):
     """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
-class CCompilerError (Exception):
+class CCompilerError(Exception):
     """Some compile/link operation failed."""
 
-class PreprocessError (CCompilerError):
+class PreprocessError(CCompilerError):
     """Failure to preprocess one or more C/C++ files."""
 
-class CompileError (CCompilerError):
+class CompileError(CCompilerError):
     """Failure to compile one or more C/C++ source files."""
 
-class LibError (CCompilerError):
+class LibError(CCompilerError):
     """Failure to create a static library from one or more C/C++ object
     files."""
 
-class LinkError (CCompilerError):
+class LinkError(CCompilerError):
     """Failure to link one or more C/C++ object files into an executable
     or shared library file."""
 
-class UnknownFileError (CCompilerError):
+class UnknownFileError(CCompilerError):
     """Attempt to process an unknown file type."""

From 3700b7dba0832dd3123775e0c74b8d6fb4ff25ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 28 Oct 2009 06:48:27 +0000
Subject: [PATCH 2706/8469] Merged revisions 75901 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75901 | tarek.ziade | 2009-10-28 07:45:18 +0100 (Wed, 28 Oct 2009) | 1 line

  removed spurious spaces
........
---
 errors.py | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/errors.py b/errors.py
index acecacccb5..d9c47c761c 100644
--- a/errors.py
+++ b/errors.py
@@ -10,90 +10,79 @@
 
 __revision__ = "$Id$"
 
-class DistutilsError (Exception):
+class DistutilsError(Exception):
     """The root of all Distutils evil."""
-    pass
 
-class DistutilsModuleError (DistutilsError):
+class DistutilsModuleError(DistutilsError):
     """Unable to load an expected module, or to find an expected class
     within some module (in particular, command modules and classes)."""
-    pass
 
-class DistutilsClassError (DistutilsError):
+class DistutilsClassError(DistutilsError):
     """Some command class (or possibly distribution class, if anyone
     feels a need to subclass Distribution) is found not to be holding
     up its end of the bargain, ie. implementing some part of the
     "command "interface."""
-    pass
 
-class DistutilsGetoptError (DistutilsError):
+class DistutilsGetoptError(DistutilsError):
     """The option table provided to 'fancy_getopt()' is bogus."""
-    pass
 
-class DistutilsArgError (DistutilsError):
+class DistutilsArgError(DistutilsError):
     """Raised by fancy_getopt in response to getopt.error -- ie. an
     error in the command line usage."""
-    pass
 
-class DistutilsFileError (DistutilsError):
+class DistutilsFileError(DistutilsError):
     """Any problems in the filesystem: expected file not found, etc.
     Typically this is for problems that we detect before IOError or
     OSError could be raised."""
-    pass
 
-class DistutilsOptionError (DistutilsError):
+class DistutilsOptionError(DistutilsError):
     """Syntactic/semantic errors in command options, such as use of
     mutually conflicting options, or inconsistent options,
     badly-spelled values, etc.  No distinction is made between option
     values originating in the setup script, the command line, config
     files, or what-have-you -- but if we *know* something originated in
     the setup script, we'll raise DistutilsSetupError instead."""
-    pass
 
-class DistutilsSetupError (DistutilsError):
+class DistutilsSetupError(DistutilsError):
     """For errors that can be definitely blamed on the setup script,
     such as invalid keyword arguments to 'setup()'."""
-    pass
 
-class DistutilsPlatformError (DistutilsError):
+class DistutilsPlatformError(DistutilsError):
     """We don't know how to do something on the current platform (but
     we do know how to do it on some platform) -- eg. trying to compile
     C files on a platform not supported by a CCompiler subclass."""
-    pass
 
-class DistutilsExecError (DistutilsError):
+class DistutilsExecError(DistutilsError):
     """Any problems executing an external program (such as the C
     compiler, when compiling C files)."""
-    pass
 
-class DistutilsInternalError (DistutilsError):
+class DistutilsInternalError(DistutilsError):
     """Internal inconsistencies or impossibilities (obviously, this
     should never be seen if the code is working!)."""
-    pass
 
-class DistutilsTemplateError (DistutilsError):
+class DistutilsTemplateError(DistutilsError):
     """Syntax error in a file list template."""
 
 class DistutilsByteCompileError(DistutilsError):
     """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
-class CCompilerError (Exception):
+class CCompilerError(Exception):
     """Some compile/link operation failed."""
 
-class PreprocessError (CCompilerError):
+class PreprocessError(CCompilerError):
     """Failure to preprocess one or more C/C++ files."""
 
-class CompileError (CCompilerError):
+class CompileError(CCompilerError):
     """Failure to compile one or more C/C++ source files."""
 
-class LibError (CCompilerError):
+class LibError(CCompilerError):
     """Failure to create a static library from one or more C/C++ object
     files."""
 
-class LinkError (CCompilerError):
+class LinkError(CCompilerError):
     """Failure to link one or more C/C++ object files into an executable
     or shared library file."""
 
-class UnknownFileError (CCompilerError):
+class UnknownFileError(CCompilerError):
     """Attempt to process an unknown file type."""

From 8f0323993c18365d2ca04e1f05aa39b829fb1267 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 13:59:13 +0100
Subject: [PATCH 2707/8469] added the dev link with the #egg fragment

--HG--
branch : distribute
extra : rebase_source : 2d2044baa9ec0083be1eadd1c664dde576e72447
---
 README.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 09c547b405..b40929574c 100755
--- a/README.txt
+++ b/README.txt
@@ -93,8 +93,14 @@ easy_install or pip
 
 Run easy_install or pip::
 
-    $ easy_install Distribute
-    $ pip install Distribute
+    $ easy_install -U distribute
+    $ pip install distribute
+
+If you want to install the latest dev version, you can also run::
+
+    $ easy_install -U distribute==dev
+
+This will get the latest development version at: http://bitbucket.org/tarek/distribute/get/0.6-maintenance.zip#egg=distribute-dev
 
 Source installation
 ===================

From 04d0bff4b0a71390c6e9fba1191461dd29f6e191 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 14:01:27 +0100
Subject: [PATCH 2708/8469] Added tag 0.6.7 for changeset 71f08668d050

--HG--
branch : distribute
extra : rebase_source : 4fc584629f33a7051bf107da930bd69b09172424
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b410ccb7ab..242513bd09 100644
--- a/.hgtags
+++ b/.hgtags
@@ -5,3 +5,4 @@ e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
 e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
 2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5
 f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
+71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7

From f0464d99bbc4d5e5b7d0a244d5f96befdabd1273 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 15:01:40 +0100
Subject: [PATCH 2709/8469] backporting the API Eby added in 0.6c11

--HG--
branch : distribute
extra : rebase_source : 7e34c308ad98259f9344e10117750aeae3e8d2ea
---
 setuptools/dist.py | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2246ab96dd..fd4ca66b93 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,5 +1,6 @@
 __all__ = ['Distribution']
 
+import re
 from distutils.core import Distribution as _Distribution
 from setuptools.depends import Require
 from setuptools.command.install import install
@@ -421,19 +422,19 @@ def exclude_package(self,package):
         if self.packages:
             self.packages = [
                 p for p in self.packages
-                    if p<>package and not p.startswith(pfx)
+                    if p != package and not p.startswith(pfx)
             ]
 
         if self.py_modules:
             self.py_modules = [
                 p for p in self.py_modules
-                    if p<>package and not p.startswith(pfx)
+                    if p != package and not p.startswith(pfx)
             ]
 
         if self.ext_modules:
             self.ext_modules = [
                 p for p in self.ext_modules
-                    if p.name<>package and not p.name.startswith(pfx)
+                    if p.name != package and not p.name.startswith(pfx)
             ]
 
 
@@ -805,22 +806,11 @@ def validate(self,dist):
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+def check_packages(dist, attr, value):
+    for pkgname in value:
+        if not re.match(r'\w+(\.\w+)*', pkgname):
+            distutils.log.warn(
+                "WARNING: %r not a valid package name; please use only"
+                ".-separated package names in setup.py", pkgname
+            )
 

From 1b6bf2620558a3a4f793827393017ddf5ba6a323 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 15:06:06 +0100
Subject: [PATCH 2710/8469] started 0.6.8

--HG--
branch : distribute
extra : rebase_source : 744dff4dd47fbc1c7fd8d482faa55f20f43e5843
---
 CHANGES.txt  | 4 ++++
 README.txt   | 6 +++---
 docs/conf.py | 2 +-
 release.sh   | 2 +-
 setup.py     | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6a8455d043..a70f035ee5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,10 @@
 CHANGES
 =======
 
+-----
+0.6.8
+-----
+
 -----
 0.6.7
 -----
diff --git a/README.txt b/README.txt
index b40929574c..d39915aab7 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.7.tar.gz
-    $ tar -xzvf distribute-0.6.7.tar.gz
-    $ cd distribute-0.6.7
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.8.tar.gz
+    $ tar -xzvf distribute-0.6.8.tar.gz
+    $ cd distribute-0.6.8
     $ python setup.py install
 
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 794e728cfb..4c44b25d42 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.7'
+version = '0.6.8'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 294bc5781f..2a52b20ae2 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.7"
+export VERSION="0.6.8"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 69c23d4428..48c77b0ce4 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.7"
+VERSION = "0.6.8"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 4a3eabd1c6c8827f7cddc9818c0e86cbd38cbe75 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 15:07:23 +0100
Subject: [PATCH 2711/8469] added a CHANGE not about check_packages

--HG--
branch : distribute
extra : rebase_source : 503f2dd0c2ed7dc2fc4fa2c6a4a2bdb70b1e044c
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a70f035ee5..31b8f3118e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ CHANGES
 0.6.8
 -----
 
+* Added "check_packages" in dist. (added in Setuptools 0.6c11)
+*
+
 -----
 0.6.7
 -----

From 7405419fb048f82ef142afd32d83dcb29bab59d4 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 15:15:49 +0100
Subject: [PATCH 2712/8469] raised version in distribute_setup as well

--HG--
branch : distribute
extra : rebase_source : 660ea268a383973b586ca0889c2ca8f9c87d36e8
---
 distribute_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index de7b1f6d14..cfb3bbefb5 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.6"
+DEFAULT_VERSION = "0.6.8"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
@@ -113,7 +113,7 @@ def _build_egg(egg, tarball, to_dir):
 
 
 def _do_download(version, download_base, to_dir, download_delay):
-    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg' 
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
                        % (version, sys.version_info[0], sys.version_info[1]))
     if not os.path.exists(egg):
         tarball = download_setuptools(version, download_base,

From aaa33ec7239dd9f1929ce4925ef9cc6e3fb5a6e6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 16:00:56 +0100
Subject: [PATCH 2713/8469] --distribute was added in zc.buildout 1.4.2

--HG--
branch : distribute
extra : rebase_source : 754f8883e6b103a3d8487072e386eb7bad2ddb6b
---
 README.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index d39915aab7..4930872a90 100755
--- a/README.txt
+++ b/README.txt
@@ -196,7 +196,12 @@ Install FAQ
 
 - **How does Distribute interacts with zc.buildout?**
 
-  You can use Distribute in your zc.buildout.  *The only thing* you need to do
+  You can use Distribute in your zc.buildout, with the --distribute option,
+  starting at zc.buildout 1.4.2::
+
+  $ python bootstrap.py --distribute
+
+  For previous zc.buildout versions, *the only thing* you need to do
   is use the bootstrap at `http://python-distribute.org/bootstrap.py`.  Run
   that bootstrap and ``bin/buildout`` (and all other buildout-generated
   scripts) will transparently use distribute instead of setuptools.  You do

From cc0aa57244be3c8aea598862db3ef867dc108ec6 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 1 Nov 2009 19:02:35 +0100
Subject: [PATCH 2714/8469] Fixed typo in code for DONT_PATCH_SETUPTOOLS
 environment marker

--HG--
branch : distribute
extra : rebase_source : 86ce375ee0f39fed222626a77fa897eefc5f4e01
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 48c77b0ce4..f9a2bcb2d0 100755
--- a/setup.py
+++ b/setup.py
@@ -76,7 +76,7 @@ def _buildout_marker():
 
 def _being_installed():
     if os.environ.get('DONT_PATCH_SETUPTOOLS') is not None:
-        return True
+        return False
     if _buildout_marker():
         # Installed by buildout, don't mess with a global setuptools.
         return False

From 42f4dfbbdfee2d95ca23f13f869b12da5eb170ce Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 1 Nov 2009 19:29:09 +0100
Subject: [PATCH 2715/8469] Minor README update for virtualenv support

--HG--
branch : distribute
extra : rebase_source : e8b42712bacf676aff921689119761724358b764
---
 README.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index 4930872a90..b6340b0497 100755
--- a/README.txt
+++ b/README.txt
@@ -178,12 +178,11 @@ Install FAQ
    If it wasn't doing it, a program that would try to install Setuptools
    would overwrite in turn Distribute.
 
-- **How does Distribute interacts with virtualenv?**
+- **How does Distribute interact with virtualenv?**
 
-  Everytime you create a virtualenv it will install setuptools, so you need to
-  re-install Distribute in it right after. The Distribute project will not
-  attempt to patch virtualenv so it uses it when globally installed.
-  We will just wait for virtualenv to eventually switch to Distribute.
+  Everytime you create a virtualenv it will install setuptools by default.
+  You either need to re-install Distribute in it right after or pass the
+  ``--distribute`` option when creating it.
 
   Once installed, your virtualenv will use Distribute transparently.
 

From 4c4a3a0a44120223d14e1fd49d50f89a40322174 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 20:16:23 +0100
Subject: [PATCH 2716/8469] fixed CHANGES

--HG--
branch : distribute
extra : rebase_source : 4a959e9365eb894b4f71b66401f8caad748788ca
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 31b8f3118e..0963b1d8f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 -----
 
 * Added "check_packages" in dist. (added in Setuptools 0.6c11)
-*
+* Fixed the DONT_PATCH_SETUPTOOLS state.
 
 -----
 0.6.7

From ac52a1f3984ce1c198a1ba4118611be3083ea5e3 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 20:18:32 +0100
Subject: [PATCH 2717/8469] Added tag 0.6.8 for changeset 445547a5729e

--HG--
branch : distribute
extra : rebase_source : f896ab6e3c5ce4e63f7e254d2089520898aaa552
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 242513bd09..a02ce84ca1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -6,3 +6,4 @@ e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
 2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5
 f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
 71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7
+445547a5729ed5517cf1a9baad595420a8831ef8 0.6.8

From f7a2000adabf8cca6bc691b6c946ccdbb0c81749 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 20:21:40 +0100
Subject: [PATCH 2718/8469] started 0.6.9

--HG--
branch : distribute
extra : rebase_source : 2064f9b14f740b9dbd4bcfa61584d3667471d8d2
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index b6340b0497..602fae896b 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.8.tar.gz
-    $ tar -xzvf distribute-0.6.8.tar.gz
-    $ cd distribute-0.6.8
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.9.tar.gz
+    $ tar -xzvf distribute-0.6.9.tar.gz
+    $ cd distribute-0.6.9
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index cfb3bbefb5..797a8d5cc1 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.8"
+DEFAULT_VERSION = "0.6.9"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
diff --git a/docs/conf.py b/docs/conf.py
index 4c44b25d42..4f13d857ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.8'
+version = '0.6.9'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 2a52b20ae2..7be03cd2c9 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.8"
+export VERSION="0.6.9"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index f9a2bcb2d0..8dad58c193 100755
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.8"
+VERSION = "0.6.9"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 717152f553567f458d69d78cb321daa2809b06ba Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 1 Nov 2009 20:22:03 +0100
Subject: [PATCH 2719/8469] make sure the tag is pushed

--HG--
branch : distribute
extra : rebase_source : e31a868a8725713493b55a0d31d8a7992edcc6b9
---
 release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.sh b/release.sh
index 7be03cd2c9..91d7ccb635 100755
--- a/release.sh
+++ b/release.sh
@@ -16,4 +16,5 @@ python2.6 setup.py build_sphinx upload_docs
 scp distribute_setup.py ziade.org:nightly/build/
 
 # starting the new dev
+hg push
 

From 1c2453667055bf68b5ca93f65db3efac9fc4c1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 22:33:45 +0000
Subject: [PATCH 2720/8469] fixed stdout alteration in test_distutils

---
 tests/test_build_py.py | 3 ++-
 tests/test_util.py     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index bfe6154273..472591dc09 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -69,6 +69,7 @@ def test_empty_package_dir (self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
+        old_stdout = sys.stdout
         sys.stdout = StringIO.StringIO()
 
         try:
@@ -87,7 +88,7 @@ def test_empty_package_dir (self):
         finally:
             # Restore state.
             os.chdir(cwd)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_util.py b/tests/test_util.py
index 55ef160f37..6722997f58 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -60,6 +60,8 @@ def setUp(self):
         util.find_executable = self._find_executable
         self._exes = {}
         self.old_popen = subprocess.Popen
+        self.old_stdout  = sys.stdout
+        self.old_stderr = sys.stderr
         FakePopen.test_class = self
         subprocess.Popen = FakePopen
 
@@ -79,6 +81,8 @@ def tearDown(self):
         sysconfig._config_vars = copy(self._config_vars)
         util.find_executable = self.old_find_executable
         subprocess.Popen = self.old_popen
+        sys.old_stdout  = self.old_stdout
+        sys.old_stderr = self.old_stderr
         super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):

From 77f13813e91f896c9e368bf4b979f85530e05f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 22:38:44 +0000
Subject: [PATCH 2721/8469] Merged revisions 76042 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76042 | tarek.ziade | 2009-11-01 23:33:45 +0100 (Sun, 01 Nov 2009) | 1 line

  fixed stdout alteration in test_distutils
........
---
 tests/test_build_py.py | 3 ++-
 tests/test_util.py     | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 582f24634a..3e45f6e89e 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -69,6 +69,7 @@ def test_empty_package_dir (self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
+        old_stdout = sys.stdout
         sys.stdout = io.StringIO()
 
         try:
@@ -87,7 +88,7 @@ def test_empty_package_dir (self):
         finally:
             # Restore state.
             os.chdir(cwd)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_util.py b/tests/test_util.py
index a2f8ed2b59..4172472658 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -60,6 +60,8 @@ def setUp(self):
         util.find_executable = self._find_executable
         self._exes = {}
         self.old_popen = subprocess.Popen
+        self.old_stdout  = sys.stdout
+        self.old_stderr = sys.stderr
         FakePopen.test_class = self
         subprocess.Popen = FakePopen
 
@@ -79,6 +81,8 @@ def tearDown(self):
         sysconfig._config_vars = copy(self._config_vars)
         util.find_executable = self.old_find_executable
         subprocess.Popen = self.old_popen
+        sys.old_stdout  = self.old_stdout
+        sys.old_stderr = self.old_stderr
         super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):

From 5f34bac6360a547a0797683883da85233e10a070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 23:04:26 +0000
Subject: [PATCH 2722/8469] reapplied r74493 (after #6665 fix has been
 backported)

---
 filelist.py            |  4 +++-
 tests/test_filelist.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/filelist.py b/filelist.py
index 3ce5635047..88b33c7c94 100644
--- a/filelist.py
+++ b/filelist.py
@@ -344,7 +344,9 @@ def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
         pattern_re = ''
 
     if prefix is not None:
-        prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+        # ditch end of pattern character
+        empty_pattern = glob_to_re('')
+        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 86db557441..1faccfae7e 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -6,15 +6,15 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
 def test_suite():
     return unittest.makeSuite(FileListTestCase)

From 5ff2e55da5d92f0b33021ba205f787d6cb80358c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 23:11:55 +0000
Subject: [PATCH 2723/8469] reapplied r74493 (after #6665 fix has been
 backported)

---
 filelist.py            |  4 +++-
 tests/test_build_py.py |  3 ++-
 tests/test_filelist.py | 14 +++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/filelist.py b/filelist.py
index 58a2bfb108..06a8da9a07 100644
--- a/filelist.py
+++ b/filelist.py
@@ -312,7 +312,9 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         pattern_re = ''
 
     if prefix is not None:
-        prefix_re = (glob_to_re(prefix))[0:-1] # ditch trailing $
+        # ditch end of pattern character
+        empty_pattern = glob_to_re('')
+        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 582f24634a..3e45f6e89e 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -69,6 +69,7 @@ def test_empty_package_dir (self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
+        old_stdout = sys.stdout
         sys.stdout = io.StringIO()
 
         try:
@@ -87,7 +88,7 @@ def test_empty_package_dir (self):
         finally:
             # Restore state.
             os.chdir(cwd)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index b9db8f61fe..331180d235 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -9,15 +9,15 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*$')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]$')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]$')
+        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*$')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*$')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]$')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]$')
+        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
     def test_debug_print(self):
         file_list = FileList()

From bf2f5e7e511577261c9d9d41af73c090c9293a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 23:17:51 +0000
Subject: [PATCH 2724/8469] Merged revisions 76042 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76042 | tarek.ziade | 2009-11-01 23:33:45 +0100 (Sun, 01 Nov 2009) | 1 line

  fixed stdout alteration in test_distutils
........
---
 tests/test_build_py.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 54a4ed80fd..4b045474f1 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -69,6 +69,7 @@ def test_empty_package_dir (self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
+        old_stdout = sys.stdout
         sys.stdout = StringIO.StringIO()
 
         try:
@@ -87,7 +88,7 @@ def test_empty_package_dir (self):
         finally:
             # Restore state.
             os.chdir(cwd)
-            sys.stdout = sys.__stdout__
+            sys.stdout = old_stdout
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From a2cf9c8a40e4e8d416ba976eb7a361d433586989 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 3 Nov 2009 16:18:47 +0100
Subject: [PATCH 2725/8469] added missing entry point that was added in
 setuptools 0.6c11

--HG--
branch : distribute
extra : rebase_source : d238f3b7a316d271428f061cd2f40132d2a8b485
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 8dad58c193..9a845c1cc9 100755
--- a/setup.py
+++ b/setup.py
@@ -126,6 +126,7 @@ def _being_installed():
             "package_data           = setuptools.dist:check_package_data",
             "exclude_package_data   = setuptools.dist:check_package_data",
             "include_package_data   = setuptools.dist:assert_bool",
+            "packages               = setuptools.dist:check_packages",
             "dependency_links       = setuptools.dist:assert_string_list",
             "test_loader            = setuptools.dist:check_importable",
             "use_2to3               = setuptools.dist:assert_bool",

From 0118a1febd0bde436f3f0e392d016b8e7e7656c9 Mon Sep 17 00:00:00 2001
From: "mborch@valga.local" <mborch@valga.local>
Date: Wed, 4 Nov 2009 15:19:47 +0100
Subject: [PATCH 2726/8469] Copy change.

--HG--
branch : distribute
extra : rebase_source : b4f1e4c6288fe607310aabaf14ac508ad01c69a3
---
 README.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.txt b/README.txt
index 602fae896b..fad5145f83 100755
--- a/README.txt
+++ b/README.txt
@@ -169,14 +169,16 @@ Another way is to add ``Distribute`` in the ``install_requires`` option::
 Install FAQ
 -----------
 
-- **Why Distribute turn my Setuptools installation into an fake one?**
+- **Why is Distribute wrapping my Setuptools installation?**
 
-   Since Distribute is a fork, and since it provides the same package and modules,
-   it fakes that the Setuptools installation is still present, so all the programs
-   that where using Setuptools still work.
+   Since Distribute is a fork, and since it provides the same package
+   and modules, it renames the existing Setuptools egg and inserts a
+   new one which merely wraps the Distribute code. This way, full
+   backwards compatibility is kept for packages which rely on the
+   Setuptools modules.
 
-   If it wasn't doing it, a program that would try to install Setuptools
-   would overwrite in turn Distribute.
+   At the same time, packages can meet their dependency on Setuptools
+   without actually installing it (which would disable Distribute).
 
 - **How does Distribute interact with virtualenv?**
 

From 529f165dfbd7b654b646b1b42b1ba6419e5ce832 Mon Sep 17 00:00:00 2001
From: "mborch@valga.local" <mborch@valga.local>
Date: Wed, 4 Nov 2009 17:26:28 +0100
Subject: [PATCH 2727/8469] Added instructions from Florian Schultze.

--HG--
branch : distribute
extra : rebase_source : bd41be5da388ce505e146bdb445342a585e732fd
---
 README.txt | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index fad5145f83..8ec73116d8 100755
--- a/README.txt
+++ b/README.txt
@@ -149,21 +149,37 @@ Lastly:
 Quick help for developers
 -------------------------
 
-To use Distribute in your package, the recommended way is to ship
-`distribute_setup.py` alongside your `setup.py` script and call 
-it at the very begining of `setup.py` like this::
+To create an egg which is compatible with Distribute, use the same
+practice as with Setuptools, e.g.:
 
-    from distribute_setup import use_setuptools
-    use_setuptools()
+{{{
+from setuptools import setup
 
+setup(...
+)
+}}}
 
-Another way is to add ``Distribute`` in the ``install_requires`` option::
+To use `pkg_resources` to access data files in the egg, you should
+require the Setuptools distribution explicitly:
 
-    from setuptools import setup
+{{{
+from setuptools import setup
 
-    setup(...
-          install_requires=['distribute']
-    )
+setup(...
+     install_requires=['setuptools']
+)
+}}}
+
+Only if you need Distribute-specific functionality should you depend
+on it explicitly. In this case, replace the Setuptools dependency:
+
+{{{
+from setuptools import setup
+
+setup(...
+     install_requires=['distribute']
+)
+}}}
 
 -----------
 Install FAQ

From a0ca582da7e9322a6abc5d4ce028ee631ddbde70 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 7 Nov 2009 03:08:06 +0100
Subject: [PATCH 2728/8469] now faking Setuptools 0.6c11

--HG--
branch : distribute
extra : rebase_source : 48be66266a279d893236d90bd77cf1d0c654a7cf
---
 distribute_setup.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 797a8d5cc1..94789e7e27 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -48,17 +48,19 @@ def quote(arg):
 
 DEFAULT_VERSION = "0.6.9"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
 Name: setuptools
-Version: 0.6c9
+Version: %s
 Summary: xxxx
 Home-page: xxx
 Author: xxx
 Author-email: xxx
 License: xxx
 Description: xxx
-"""
+""" % SETUPTOOLS_FAKED_VERSION
 
 
 def _install(tarball):
@@ -280,7 +282,8 @@ def _create_fake_setuptools_pkg_info(placeholder):
         log.warn('Could not find the install location')
         return
     pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    setuptools_file = 'setuptools-0.6c9-py%s.egg-info' % pyver
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
     pkg_info = os.path.join(placeholder, setuptools_file)
     if os.path.exists(pkg_info):
         log.warn('%s already exists', pkg_info)

From 4072145aebca513ceaa0d25a64cb60d29842b300 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 11 Nov 2009 19:39:04 +0100
Subject: [PATCH 2729/8469] unknown setuptools version can be added in the
 working set, refs #90

--HG--
branch : distribute
extra : rebase_source : c0aabd45025465b61ffd23a2196994f4afece233
---
 CHANGES.txt                          |  7 +++++++
 distribute.egg-info/entry_points.txt |  1 +
 pkg_resources.py                     |  6 +++++-
 setuptools/tests/test_resources.py   | 15 ++++++---------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0963b1d8f9..aa22f5f452 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+0.6.9
+-----
+
+* Issue 90: unknown setuptools version can be added in the working set
+*
+
 -----
 0.6.8
 -----
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index f4b74da0fd..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -52,6 +52,7 @@ test_suite = setuptools.dist:check_test_suite
 eager_resources = setuptools.dist:assert_string_list
 zip_safe = setuptools.dist:assert_bool
 test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
 convert_2to3_doctests = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
 
diff --git a/pkg_resources.py b/pkg_resources.py
index 31d83554e6..963819326a 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2253,7 +2253,11 @@ def insert_on(self, path, loc = None):
         loc = loc or self.location
 
         if self.project_name == 'setuptools':
-            if '0.7' in self.version:
+            try:
+                version = self.version
+            except ValueError:
+                version = ''
+            if '0.7' in version:
                 raise ValueError(
                     "A 0.7-series setuptools cannot be installed "
                     "with distribute")
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 6a89e8a834..d805d02a75 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -203,15 +203,12 @@ def testSetuptoolsDistributeCombination(self):
             version="0.6c9")
         ws.add(d2)
 
-
-
-
-
-
-
-
-
-
+        # a unexisting version needs to work
+        ws = WorkingSet([])
+        d3 = Distribution(
+            "/some/path",
+            project_name="setuptools")
+        ws.add(d3)
 
 
 class EntryPointTests(TestCase):

From e589e51c764bda35f353bb32d107364dab97d8ae Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 11 Nov 2009 20:40:14 +0100
Subject: [PATCH 2730/8469] setup.py doesn't try to convert distribute_setup.py
 anymore. fixes #87

--HG--
branch : distribute
extra : rebase_source : 4378f7defabaadaaa258eb69f07caf17569dd57a
---
 CHANGES.txt | 3 ++-
 setup.py    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa22f5f452..5a02a4fe4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,8 @@ CHANGES
 -----
 
 * Issue 90: unknown setuptools version can be added in the working set
-*
+* Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore
+  Initial Patch by arfrever.
 
 -----
 0.6.8
diff --git a/setup.py b/setup.py
index 9a845c1cc9..f0457b466c 100755
--- a/setup.py
+++ b/setup.py
@@ -14,9 +14,10 @@
         fl.process_template_line(line)
     dir_util.create_tree(tmp_src, fl.files)
     outfiles_2to3 = []
+    dist_script = os.path.join("build", "src", "distribute_setup.py")
     for f in fl.files:
         outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
-        if copied and outf.endswith(".py"):
+        if copied and outf.endswith(".py") and outf != dist_script:
             outfiles_2to3.append(outf)
         if copied and outf.endswith('api_tests.txt'):
             # XXX support this in distutils as well

From 6b23a07b6263fe86a7e1cdd790e850508e8d1530 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 11 Nov 2009 22:11:02 +0100
Subject: [PATCH 2731/8469] added a side bar with a download link to the doc.
 fixes #89

--HG--
branch : distribute
extra : rebase_source : 30b018e5e29225e00ffcb311af2cd0d4ad6eed6c
---
 CHANGES.txt                       | 1 +
 docs/_templates/indexsidebar.html | 8 ++++++++
 docs/conf.py                      | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 docs/_templates/indexsidebar.html

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a02a4fe4c..4c194987f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES
 * Issue 90: unknown setuptools version can be added in the working set
 * Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore
   Initial Patch by arfrever.
+* Issue 89: added a side bar with a download link to the doc.
 
 -----
 0.6.8
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
new file mode 100644
index 0000000000..932909f3e1
--- /dev/null
+++ b/docs/_templates/indexsidebar.html
@@ -0,0 +1,8 @@
+<h3>Download</h3> 
+
+<p>Current version: <b>{{ version }}</b></p> 
+<p>Get Distribute from the <a href="http://pypi.python.org/pypi/distribute"> Python Package Index</a>
+
+<h3>Questions? Suggestions? Contributions?</h3>
+
+<p>Visit the <a href="http://bitbucket.org/tarek/distribute">Distribute project page</a> </p>
diff --git a/docs/conf.py b/docs/conf.py
index 4f13d857ba..74435672b5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -134,7 +134,8 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {'index': 'indexsidebar.html'}
+
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

From 5e506639b211f4c30b3f77b060bd394262201c1a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 11 Nov 2009 22:22:00 +0100
Subject: [PATCH 2732/8469] fixed doc - fixes #86

--HG--
branch : distribute
extra : rebase_source : b7578a6884f1f24f52f16ec22b5d57d1aecb2a82
---
 docs/pkg_resources.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 049082c849..480f9547ce 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1594,8 +1594,9 @@ Parsing Utilities
     ``Requirement`` string, as a distribution name, or a PyPI project name.
     All non-alphanumeric runs are condensed to single "-" characters, such that
     a name like "The $$$ Tree" becomes "The-Tree".  Note that if you are
-    generating a filename from this value you should replace the "-" characters
-    with underscores ("_") because setuptools and the distutils
+    generating a filename from this value you should combine it with a call to
+    ``to_filename()`` so all dashes ("-") are replaced by underscores ("_").
+    See ``to_filename()``.
 
 ``safe_version(version)``
     Similar to ``safe_name()`` except that spaces in the input become dots, and
@@ -1708,7 +1709,7 @@ History
 
  * Fix cache dir defaults on Windows when multiple environment vars are needed
    to construct a path.
- 
+
 0.6c4
  * Fix "dev" versions being considered newer than release candidates.
 

From a5319bc62245b80ed702f73519ac2c27805c3acf Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 11 Nov 2009 22:22:51 +0100
Subject: [PATCH 2733/8469] added a changes note for #86

--HG--
branch : distribute
extra : rebase_source : 8eda7604342905bf2478907187a57973728b4aa3
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4c194987f3..4e7ce3e3c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ CHANGES
 * Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore
   Initial Patch by arfrever.
 * Issue 89: added a side bar with a download link to the doc.
+* Issue 86: fixed missing sentence in pkg_resources doc.
 
 -----
 0.6.8

From 868b46b50b94efc30bfdde021844d1020aafa4b6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Nov 2009 02:25:08 +0000
Subject: [PATCH 2734/8469] Merged revisions
 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223
 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75149 | gregory.p.smith | 2009-09-29 16:56:31 -0500 (Tue, 29 Sep 2009) | 3 lines

  Mention issue6972 in extractall docs about overwriting things outside of
  the supplied path.
........
  r75260 | andrew.kuchling | 2009-10-05 16:24:20 -0500 (Mon, 05 Oct 2009) | 1 line

  Wording fix
........
  r75261 | andrew.kuchling | 2009-10-05 16:24:35 -0500 (Mon, 05 Oct 2009) | 1 line

  Fix narkup
........
  r75262 | andrew.kuchling | 2009-10-05 16:25:03 -0500 (Mon, 05 Oct 2009) | 1 line

  Document 'skip' parameter to constructor
........
  r75263 | andrew.kuchling | 2009-10-05 16:25:35 -0500 (Mon, 05 Oct 2009) | 1 line

  Note side benefit of socket.create_connection()
........
  r75265 | andrew.kuchling | 2009-10-05 17:31:11 -0500 (Mon, 05 Oct 2009) | 1 line

  Reword sentence
........
  r75266 | andrew.kuchling | 2009-10-05 17:32:48 -0500 (Mon, 05 Oct 2009) | 1 line

  Use standard comma punctuation; reword some sentences in the docs
........
  r75267 | andrew.kuchling | 2009-10-05 17:42:56 -0500 (Mon, 05 Oct 2009) | 1 line

  Backport r73983: Document the thousands separator.
........
  r75292 | benjamin.peterson | 2009-10-08 22:11:36 -0500 (Thu, 08 Oct 2009) | 1 line

  death to old CVS keyword
........
  r75300 | benjamin.peterson | 2009-10-09 16:48:14 -0500 (Fri, 09 Oct 2009) | 1 line

  fix some coding style
........
  r75376 | benjamin.peterson | 2009-10-11 20:26:07 -0500 (Sun, 11 Oct 2009) | 1 line

  platform we don't care about
........
  r75405 | neil.schemenauer | 2009-10-14 12:17:14 -0500 (Wed, 14 Oct 2009) | 4 lines

  Issue #1754094: Improve the stack depth calculation in the compiler.
  There should be no other effect than a small decrease in memory use.
  Patch by Christopher Tur Lesniewski-Laas.
........
  r75429 | benjamin.peterson | 2009-10-14 20:47:28 -0500 (Wed, 14 Oct 2009) | 1 line

  pep8ify if blocks
........
  r75430 | benjamin.peterson | 2009-10-14 20:49:37 -0500 (Wed, 14 Oct 2009) | 1 line

  use floor division and add a test that exercises the tabsize codepath
........
  r75431 | benjamin.peterson | 2009-10-14 20:56:25 -0500 (Wed, 14 Oct 2009) | 1 line

  change test to what I intended
........
  r75432 | benjamin.peterson | 2009-10-14 22:05:39 -0500 (Wed, 14 Oct 2009) | 1 line

  some cleanups
........
  r75433 | benjamin.peterson | 2009-10-14 22:06:55 -0500 (Wed, 14 Oct 2009) | 1 line

  make inspect.isabstract() always return a boolean; add a test for it, too #7069
........
  r75437 | benjamin.peterson | 2009-10-15 10:44:46 -0500 (Thu, 15 Oct 2009) | 1 line

  only clear a module's __dict__ if the module is the only one with a reference to it #7140
........
  r75445 | vinay.sajip | 2009-10-16 09:06:44 -0500 (Fri, 16 Oct 2009) | 1 line

  Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.
........
  r75501 | antoine.pitrou | 2009-10-18 13:37:11 -0500 (Sun, 18 Oct 2009) | 3 lines

  Add a comment about unreachable code, and fix a typo
........
  r75551 | benjamin.peterson | 2009-10-19 22:14:10 -0500 (Mon, 19 Oct 2009) | 1 line

  use property api
........
  r75572 | benjamin.peterson | 2009-10-20 16:55:17 -0500 (Tue, 20 Oct 2009) | 1 line

  clarify buffer arg #7178
........
  r75589 | benjamin.peterson | 2009-10-21 21:26:47 -0500 (Wed, 21 Oct 2009) | 1 line

  whitespace
........
  r75590 | benjamin.peterson | 2009-10-21 21:36:47 -0500 (Wed, 21 Oct 2009) | 1 line

  rewrite to be nice to other implementations
........
  r75591 | benjamin.peterson | 2009-10-21 21:50:38 -0500 (Wed, 21 Oct 2009) | 4 lines

  rewrite for style, clarify, and comments

  Also, use the hasattr() like scheme of allowing BaseException exceptions through.
........
  r75657 | antoine.pitrou | 2009-10-24 07:41:27 -0500 (Sat, 24 Oct 2009) | 3 lines

  Fix compilation error in debug mode.
........
  r75742 | benjamin.peterson | 2009-10-26 17:51:16 -0500 (Mon, 26 Oct 2009) | 1 line

  use 'is' instead of id()
........
  r75868 | benjamin.peterson | 2009-10-27 15:59:18 -0500 (Tue, 27 Oct 2009) | 1 line

  test expect base classes
........
  r75952 | georg.brandl | 2009-10-29 15:38:32 -0500 (Thu, 29 Oct 2009) | 1 line

  Use the correct function name in docstring.
........
  r75953 | georg.brandl | 2009-10-29 15:39:50 -0500 (Thu, 29 Oct 2009) | 1 line

  Remove mention of the old -X command line switch.
........
  r75954 | georg.brandl | 2009-10-29 15:53:00 -0500 (Thu, 29 Oct 2009) | 1 line

  Use constants instead of magic integers for test result.  Do not re-run with --verbose3 for environment changing tests.
........
  r75955 | georg.brandl | 2009-10-29 15:54:03 -0500 (Thu, 29 Oct 2009) | 1 line

  Use a single style for all the docstrings in the math module.
........
  r75956 | georg.brandl | 2009-10-29 16:16:34 -0500 (Thu, 29 Oct 2009) | 1 line

  I do not think the "railroad" program mentioned is still available.
........
  r75957 | georg.brandl | 2009-10-29 16:44:56 -0500 (Thu, 29 Oct 2009) | 1 line

  Fix constant name.
........
  r76057 | benjamin.peterson | 2009-11-02 09:06:45 -0600 (Mon, 02 Nov 2009) | 1 line

  prevent a rather unlikely segfault
........
  r76105 | georg.brandl | 2009-11-04 01:38:12 -0600 (Wed, 04 Nov 2009) | 1 line

  #7259: show correct equivalent for operator.i* operations in docstring; fix minor issues in operator docs.
........
  r76139 | benjamin.peterson | 2009-11-06 19:04:38 -0600 (Fri, 06 Nov 2009) | 1 line

  spelling
........
  r76143 | georg.brandl | 2009-11-07 02:26:07 -0600 (Sat, 07 Nov 2009) | 1 line

  #7271: fix typo.
........
  r76162 | benjamin.peterson | 2009-11-08 22:10:53 -0600 (Sun, 08 Nov 2009) | 1 line

  discuss how to use -p
........
  r76223 | georg.brandl | 2009-11-12 02:29:46 -0600 (Thu, 12 Nov 2009) | 1 line

  Give the profile module a module directive.
........
---
 command/check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/check.py b/command/check.py
index 9a8fca1d5f..12844cbf9f 100644
--- a/command/check.py
+++ b/command/check.py
@@ -92,7 +92,7 @@ def check_metadata(self):
                 missing.append(attr)
 
         if missing:
-            self.warn("missing required meta-data: %s"  % ' ,'.join(missing))
+            self.warn("missing required meta-data: %s"  % ', '.join(missing))
         if metadata.author:
             if not metadata.author_email:
                 self.warn("missing meta-data: if 'author' supplied, " +

From 83b75ba535abc50e9f0c9ac860903e0f97b28703 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Nov 2009 02:29:35 +0000
Subject: [PATCH 2735/8469] Merged revisions 76235 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76235 | benjamin.peterson | 2009-11-12 20:25:08 -0600 (Thu, 12 Nov 2009) | 170 lines

  Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75149 | gregory.p.smith | 2009-09-29 16:56:31 -0500 (Tue, 29 Sep 2009) | 3 lines

    Mention issue6972 in extractall docs about overwriting things outside of
    the supplied path.
  ........
    r75260 | andrew.kuchling | 2009-10-05 16:24:20 -0500 (Mon, 05 Oct 2009) | 1 line

    Wording fix
  ........
    r75261 | andrew.kuchling | 2009-10-05 16:24:35 -0500 (Mon, 05 Oct 2009) | 1 line

    Fix narkup
  ........
    r75262 | andrew.kuchling | 2009-10-05 16:25:03 -0500 (Mon, 05 Oct 2009) | 1 line

    Document 'skip' parameter to constructor
  ........
    r75263 | andrew.kuchling | 2009-10-05 16:25:35 -0500 (Mon, 05 Oct 2009) | 1 line

    Note side benefit of socket.create_connection()
  ........
    r75265 | andrew.kuchling | 2009-10-05 17:31:11 -0500 (Mon, 05 Oct 2009) | 1 line

    Reword sentence
  ........
    r75266 | andrew.kuchling | 2009-10-05 17:32:48 -0500 (Mon, 05 Oct 2009) | 1 line

    Use standard comma punctuation; reword some sentences in the docs
  ........
    r75267 | andrew.kuchling | 2009-10-05 17:42:56 -0500 (Mon, 05 Oct 2009) | 1 line

    Backport r73983: Document the thousands separator.
  ........
    r75292 | benjamin.peterson | 2009-10-08 22:11:36 -0500 (Thu, 08 Oct 2009) | 1 line

    death to old CVS keyword
  ........
    r75300 | benjamin.peterson | 2009-10-09 16:48:14 -0500 (Fri, 09 Oct 2009) | 1 line

    fix some coding style
  ........
    r75376 | benjamin.peterson | 2009-10-11 20:26:07 -0500 (Sun, 11 Oct 2009) | 1 line

    platform we don't care about
  ........
    r75405 | neil.schemenauer | 2009-10-14 12:17:14 -0500 (Wed, 14 Oct 2009) | 4 lines

    Issue #1754094: Improve the stack depth calculation in the compiler.
    There should be no other effect than a small decrease in memory use.
    Patch by Christopher Tur Lesniewski-Laas.
  ........
    r75429 | benjamin.peterson | 2009-10-14 20:47:28 -0500 (Wed, 14 Oct 2009) | 1 line

    pep8ify if blocks
  ........
    r75430 | benjamin.peterson | 2009-10-14 20:49:37 -0500 (Wed, 14 Oct 2009) | 1 line

    use floor division and add a test that exercises the tabsize codepath
  ........
    r75431 | benjamin.peterson | 2009-10-14 20:56:25 -0500 (Wed, 14 Oct 2009) | 1 line

    change test to what I intended
  ........
    r75432 | benjamin.peterson | 2009-10-14 22:05:39 -0500 (Wed, 14 Oct 2009) | 1 line

    some cleanups
  ........
    r75433 | benjamin.peterson | 2009-10-14 22:06:55 -0500 (Wed, 14 Oct 2009) | 1 line

    make inspect.isabstract() always return a boolean; add a test for it, too #7069
  ........
    r75437 | benjamin.peterson | 2009-10-15 10:44:46 -0500 (Thu, 15 Oct 2009) | 1 line

    only clear a module's __dict__ if the module is the only one with a reference to it #7140
  ........
    r75445 | vinay.sajip | 2009-10-16 09:06:44 -0500 (Fri, 16 Oct 2009) | 1 line

    Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.
  ........
    r75501 | antoine.pitrou | 2009-10-18 13:37:11 -0500 (Sun, 18 Oct 2009) | 3 lines

    Add a comment about unreachable code, and fix a typo
  ........
    r75551 | benjamin.peterson | 2009-10-19 22:14:10 -0500 (Mon, 19 Oct 2009) | 1 line

    use property api
  ........
    r75572 | benjamin.peterson | 2009-10-20 16:55:17 -0500 (Tue, 20 Oct 2009) | 1 line

    clarify buffer arg #7178
  ........
    r75589 | benjamin.peterson | 2009-10-21 21:26:47 -0500 (Wed, 21 Oct 2009) | 1 line

    whitespace
  ........
    r75590 | benjamin.peterson | 2009-10-21 21:36:47 -0500 (Wed, 21 Oct 2009) | 1 line

    rewrite to be nice to other implementations
  ........
    r75591 | benjamin.peterson | 2009-10-21 21:50:38 -0500 (Wed, 21 Oct 2009) | 4 lines

    rewrite for style, clarify, and comments

    Also, use the hasattr() like scheme of allowing BaseException exceptions through.
  ........
    r75657 | antoine.pitrou | 2009-10-24 07:41:27 -0500 (Sat, 24 Oct 2009) | 3 lines

    Fix compilation error in debug mode.
  ........
    r75742 | benjamin.peterson | 2009-10-26 17:51:16 -0500 (Mon, 26 Oct 2009) | 1 line

    use 'is' instead of id()
  ........
    r75868 | benjamin.peterson | 2009-10-27 15:59:18 -0500 (Tue, 27 Oct 2009) | 1 line

    test expect base classes
  ........
    r75952 | georg.brandl | 2009-10-29 15:38:32 -0500 (Thu, 29 Oct 2009) | 1 line

    Use the correct function name in docstring.
  ........
    r75953 | georg.brandl | 2009-10-29 15:39:50 -0500 (Thu, 29 Oct 2009) | 1 line

    Remove mention of the old -X command line switch.
  ........
    r75954 | georg.brandl | 2009-10-29 15:53:00 -0500 (Thu, 29 Oct 2009) | 1 line

    Use constants instead of magic integers for test result.  Do not re-run with --verbose3 for environment changing tests.
  ........
    r75955 | georg.brandl | 2009-10-29 15:54:03 -0500 (Thu, 29 Oct 2009) | 1 line

    Use a single style for all the docstrings in the math module.
  ........
    r75956 | georg.brandl | 2009-10-29 16:16:34 -0500 (Thu, 29 Oct 2009) | 1 line

    I do not think the "railroad" program mentioned is still available.
  ........
    r75957 | georg.brandl | 2009-10-29 16:44:56 -0500 (Thu, 29 Oct 2009) | 1 line

    Fix constant name.
  ........
    r76057 | benjamin.peterson | 2009-11-02 09:06:45 -0600 (Mon, 02 Nov 2009) | 1 line

    prevent a rather unlikely segfault
  ........
    r76105 | georg.brandl | 2009-11-04 01:38:12 -0600 (Wed, 04 Nov 2009) | 1 line

    #7259: show correct equivalent for operator.i* operations in docstring; fix minor issues in operator docs.
  ........
    r76139 | benjamin.peterson | 2009-11-06 19:04:38 -0600 (Fri, 06 Nov 2009) | 1 line

    spelling
  ........
    r76143 | georg.brandl | 2009-11-07 02:26:07 -0600 (Sat, 07 Nov 2009) | 1 line

    #7271: fix typo.
  ........
    r76162 | benjamin.peterson | 2009-11-08 22:10:53 -0600 (Sun, 08 Nov 2009) | 1 line

    discuss how to use -p
  ........
    r76223 | georg.brandl | 2009-11-12 02:29:46 -0600 (Thu, 12 Nov 2009) | 1 line

    Give the profile module a module directive.
  ........
................
---
 command/check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/check.py b/command/check.py
index 9a8fca1d5f..12844cbf9f 100644
--- a/command/check.py
+++ b/command/check.py
@@ -92,7 +92,7 @@ def check_metadata(self):
                 missing.append(attr)
 
         if missing:
-            self.warn("missing required meta-data: %s"  % ' ,'.join(missing))
+            self.warn("missing required meta-data: %s"  % ', '.join(missing))
         if metadata.author:
             if not metadata.author_email:
                 self.warn("missing meta-data: if 'author' supplied, " +

From 4f06b3cc70d5a1457c0a158b3a2f1be1c4ea851c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 14 Nov 2009 20:01:49 +0100
Subject: [PATCH 2736/8469] nicer message when DistributionNotFound is raised

--HG--
branch : distribute
extra : rebase_source : b25209fbcd33b497cb92ed7d8f442403c4eaf152
---
 CHANGES.txt      | 1 +
 pkg_resources.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e7ce3e3c6..f3072470f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ CHANGES
   Initial Patch by arfrever.
 * Issue 89: added a side bar with a download link to the doc.
 * Issue 86: fixed missing sentence in pkg_resources doc.
+* Added a nicer error message when a DistributionNotFound is raised.
 
 -----
 0.6.8
diff --git a/pkg_resources.py b/pkg_resources.py
index 963819326a..4975680d16 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -528,7 +528,9 @@ def resolve(self, requirements, env=None, installer=None, replacement=True):
                         env = Environment(self.entries)
                     dist = best[req.key] = env.best_match(req, self, installer)
                     if dist is None:
-                        raise DistributionNotFound(req)  # XXX put more info here
+                        msg = ("The '%s' distribution was not found on this "
+                               "system, and is required by this application.")
+                        raise DistributionNotFound(msg % req)
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency

From 9fc8282b30e40eb2c02c3e7bd28be5156e109a5c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 15 Nov 2009 00:16:38 +0100
Subject: [PATCH 2737/8469] Fixed #80: test_develop fails with Python 3.1. I
 don't understand why the module is shadowed at this stage, but importing it
 fixes the problem.

--HG--
branch : distribute
extra : rebase_source : 9cbb38022787d08f0c8399e25829b10286fb655d
---
 CHANGES.txt                           | 1 +
 setuptools/command/__init__.py        | 3 +++
 setuptools/command/install_scripts.py | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f3072470f3..d9d75c8642 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ CHANGES
 * Issue 89: added a side bar with a download link to the doc.
 * Issue 86: fixed missing sentence in pkg_resources doc.
 * Added a nicer error message when a DistributionNotFound is raised.
+* Issue 80: test_develop now works with Python 3.1
 
 -----
 0.6.8
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index ea544b504e..d608871e08 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -5,13 +5,16 @@
     'register', 'bdist_wininst', 'upload_docs',
 ]
 
+from setuptools.command.install_scripts import install_scripts
 import sys
+
 if sys.version>='2.5':
     # In Python 2.5 and above, distutils includes its own upload command
     __all__.remove('upload')
 
 from distutils.command.bdist import bdist
 
+
 if 'egg' not in bdist.format_commands:
     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
     bdist.format_commands.append('egg')
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index b1186dbac7..ac797883c7 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,6 +1,5 @@
 from distutils.command.install_scripts import install_scripts \
      as _install_scripts
-from easy_install import get_script_args, sys_executable, chmod
 from pkg_resources import Distribution, PathMetadata, ensure_directory
 import os
 from distutils import log
@@ -13,6 +12,9 @@ def initialize_options(self):
         self.no_ep = False
 
     def run(self):
+        from setuptools.command.easy_install import (get_script_args,
+                                                     sys_executable)
+
         self.run_command("egg_info")
         if self.distribution.scripts:
             _install_scripts.run(self)  # run first to set up self.outfiles
@@ -37,6 +39,7 @@ def run(self):
 
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
+        from setuptools.command.easy_install import chmod
         log.info("Installing %s script to %s", script_name, self.install_dir)
         target = os.path.join(self.install_dir, script_name)
         self.outfiles.append(target)

From bd0d051d1484be495e22d4ed0576951f339a1222 Mon Sep 17 00:00:00 2001
From: Alice Bevan-McGregor <alice@gothcandy.com>
Date: Sun, 15 Nov 2009 01:34:29 -0800
Subject: [PATCH 2738/8469] Fixed empty folder issue during upload_docs.

--HG--
branch : distribute
extra : rebase_source : b1e08e29f75d14970b7d4d57692c2e0013449637
---
 setuptools/command/upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 5bbdc7f2ff..29c62f2a05 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -50,7 +50,7 @@ def create_zipfile(self):
         tmp_file = os.path.join(tmp_dir, "%s.zip" % name)
         zip_file = zipfile.ZipFile(tmp_file, "w")
         for root, dirs, files in os.walk(self.upload_dir):
-            if not files:
+            if root == self.upload_dir and not files:
                 raise DistutilsOptionError(
                     "no files found in upload directory '%s'"
                     % self.upload_dir)

From 33886a7ecce2ec6269eade7a31baf055bd673802 Mon Sep 17 00:00:00 2001
From: Alice Bevan-McGregor <alice@gothcandy.com>
Date: Sun, 15 Nov 2009 05:41:43 -0800
Subject: [PATCH 2739/8469] Added upload_docs unit test and fixed a bug in
 test_develop.

--HG--
branch : distribute
extra : rebase_source : 0ce56dee9fbf2976d41f403fb86d8a2f714820c2
---
 setuptools/tests/test_develop.py     |  2 +-
 setuptools/tests/test_upload_docs.py | 65 ++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/tests/test_upload_docs.py

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 85a6c337bc..1d5fa14175 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -20,7 +20,7 @@ class TestDevelopTest(unittest.TestCase):
 
     def setUp(self):
         self.dir = tempfile.mkdtemp()
-        setup = os.path.join(self.dir, SETUP_PY)
+        setup = os.path.join(self.dir, 'setup.py')
         f = open(setup, 'w')
         f.write(SETUP_PY)
         f.close()
diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
new file mode 100644
index 0000000000..15db899f4f
--- /dev/null
+++ b/setuptools/tests/test_upload_docs.py
@@ -0,0 +1,65 @@
+"""build_ext tests
+"""
+import sys, os, shutil, tempfile, unittest, site, zipfile
+from setuptools.command.upload_docs import upload_docs
+from setuptools.dist import Distribution
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(name='foo')
+"""
+
+class TestUploadDocsTest(unittest.TestCase):
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        setup = os.path.join(self.dir, 'setup.py')
+        f = open(setup, 'w')
+        f.write(SETUP_PY)
+        f.close()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.dir)
+        
+        self.upload_dir = os.path.join(self.dir, 'build')
+        os.mkdir(self.upload_dir)
+        
+        # A test document.
+        f = open(os.path.join(self.upload_dir, 'index.html'), 'w')
+        f.write("Hello world.")
+        f.close()
+        
+        # An empty folder.
+        os.mkdir(os.path.join(self.upload_dir, 'empty'))
+        
+        if sys.version >= "2.6":
+            self.old_base = site.USER_BASE
+            site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp()
+            self.old_site = site.USER_SITE
+            site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
+    
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        if sys.version >= "2.6":
+            shutil.rmtree(site.USER_BASE)
+            shutil.rmtree(site.USER_SITE)
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
+
+    def test_create_zipfile(self):
+        # Test to make sure zipfile creation handles common cases.
+        # This explicitly includes a folder containing an empty folder.
+        
+        dist = Distribution()
+        
+        cmd = upload_docs(dist)
+        cmd.upload_dir = self.upload_dir
+        zip_file = cmd.create_zipfile()
+        
+        assert zipfile.is_zipfile(zip_file)
+        
+        zip_f = zipfile.ZipFile(zip_file) # woh...
+        
+        assert zip_f.namelist() == ['index.html']
+        
+

From 392651beb17ce276eb440a9c248eb80fadfcada7 Mon Sep 17 00:00:00 2001
From: Alice Bevan-McGregor <alice@gothcandy.com>
Date: Sun, 15 Nov 2009 05:46:35 -0800
Subject: [PATCH 2740/8469] Added reference to issue 93 and name to
 contributors.  I fixed two bugs and made a unit test.  ;)

--HG--
branch : distribute
extra : rebase_source : e165924bba03d13593eec1f24b12f1a6b450d743
---
 CHANGES.txt      | 1 +
 CONTRIBUTORS.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d9d75c8642..537238c017 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@ CHANGES
 * Issue 86: fixed missing sentence in pkg_resources doc.
 * Added a nicer error message when a DistributionNotFound is raised.
 * Issue 80: test_develop now works with Python 3.1
+* Issue 93: upload_docs now works if there is an empty sub-directory.
 
 -----
 0.6.8
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index cf46bb95a1..8eb0aebc90 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -3,6 +3,7 @@ Contributors
 ============
 
 * Alex Grönholm
+* Alice Bevan-McGregor
 * Daniel Stutzbach
 * Hanno Schlichting
 * Jannis Leidel

From 7d4d795a364e5f4aa3e883c88d355aa14c7501de Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 15 Nov 2009 14:48:32 +0100
Subject: [PATCH 2741/8469] merge dance

--HG--
branch : distribute
extra : rebase_source : 24b845b422ec56666a604338178598b9e1029465
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..e1f704d8cb 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 571304664849464344561f3a1f25453b50135759 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 15 Nov 2009 15:02:08 +0100
Subject: [PATCH 2742/8469] fixed 70

--HG--
branch : distribute
extra : rebase_source : 00a83b36c485d99b934d0bfb39fc07e932ee77a5
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 537238c017..b27b9b138f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ CHANGES
 * Added a nicer error message when a DistributionNotFound is raised.
 * Issue 80: test_develop now works with Python 3.1
 * Issue 93: upload_docs now works if there is an empty sub-directory.
+* Issue 70: exec bit on non-exec files
 
 -----
 0.6.8

From bc0d08d5773c2fcfae1ded350a6ad378508a59cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 18 Nov 2009 08:46:56 +0000
Subject: [PATCH 2743/8469] #7293: distutils.test_msvc9compiler now uses a key
 that exists on any fresh windows install

---
 tests/test_msvc9compiler.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 21242a8eb9..69a393caf8 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -44,17 +44,17 @@ def test_reg_class(self):
 
         # looking for values that should exist on all
         # windows registeries versions.
-        path = r'Software\Microsoft\Notepad'
-        v = Reg.get_value(path, u"lfitalic")
-        self.assertTrue(v in (0, 1))
+        path = r'Control Panel\Desktop'
+        v = Reg.get_value(path, u'dragfullwindows')
+        self.assertTrue(v in (u'0', u'1'))
 
         import _winreg
         HKCU = _winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
         self.assertEquals(keys, None)
 
-        keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assertTrue('Notepad' in keys)
+        keys = Reg.read_keys(HKCU, r'Control Panel')
+        self.assertTrue('Desktop' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)

From 4927915841d4a7a3bcfd0b2f9d824e9e06fee118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 18 Nov 2009 09:32:34 +0000
Subject: [PATCH 2744/8469] Merged revisions 76358 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76358 | tarek.ziade | 2009-11-18 09:46:56 +0100 (Wed, 18 Nov 2009) | 1 line

  #7293: distutils.test_msvc9compiler now uses a key that exists on any fresh windows install
........
---
 tests/test_msvc9compiler.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 73827988bb..7cf1a12ec7 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -44,17 +44,17 @@ def test_reg_class(self):
 
         # looking for values that should exist on all
         # windows registeries versions.
-        path = r'Software\Microsoft\Notepad'
-        v = Reg.get_value(path, "lfitalic")
-        self.assertTrue(v in (0, 1))
+        path = r'Control Panel\Desktop'
+        v = Reg.get_value(path, 'dragfullwindows')
+        self.assertTrue(v in ('0', '1'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
         self.assertEquals(keys, None)
 
-        keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assertTrue('Notepad' in keys)
+        keys = Reg.read_keys(HKCU, r'Control Panel')
+        self.assertTrue('Desktop' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)

From 6485ce9b0c624eb39ffb08c0bb264fedb8835be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 18 Nov 2009 10:19:38 +0000
Subject: [PATCH 2745/8469] Merged revisions 76360 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76360 | tarek.ziade | 2009-11-18 10:32:34 +0100 (Wed, 18 Nov 2009) | 9 lines

  Merged revisions 76358 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76358 | tarek.ziade | 2009-11-18 09:46:56 +0100 (Wed, 18 Nov 2009) | 1 line

    #7293: distutils.test_msvc9compiler now uses a key that exists on any fresh windows install
  ........
................
---
 tests/test_msvc9compiler.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 73827988bb..7cf1a12ec7 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -44,17 +44,17 @@ def test_reg_class(self):
 
         # looking for values that should exist on all
         # windows registeries versions.
-        path = r'Software\Microsoft\Notepad'
-        v = Reg.get_value(path, "lfitalic")
-        self.assertTrue(v in (0, 1))
+        path = r'Control Panel\Desktop'
+        v = Reg.get_value(path, 'dragfullwindows')
+        self.assertTrue(v in ('0', '1'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
         self.assertEquals(keys, None)
 
-        keys = Reg.read_keys(HKCU, r'Software\Microsoft')
-        self.assertTrue('Notepad' in keys)
+        keys = Reg.read_keys(HKCU, r'Control Panel')
+        self.assertTrue('Desktop' in keys)
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)

From fc29160b3da4e5c53e03a50bf167ea8147cdab11 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 18 Nov 2009 14:48:57 +0100
Subject: [PATCH 2746/8469] added image and headlines

--HG--
branch : distribute
extra : rebase_source : b528a1d8ad82a3df588ba124b442ad8ada530e2a
---
 docs/index.txt | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/index.txt b/docs/index.txt
index e64b8c8820..1d3cb25e29 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,7 +1,21 @@
 Welcome to Distribute's documentation!
 ======================================
 
-Contents:
+`Distribute` is a fork of the `Setuptools` project.
+
+Distribute is intended to replace Setuptools as the standard method for 
+working with Python module distributions.
+
+For those who may wonder why they should switch to Distribute over Setuptools, it’s quite simple: 
+
+- Distribute is a drop-in replacement for Setuptools
+- The code is actively maintained, and has over 10 commiters
+- Distribute offers Python 3 support !
+
+.. image:: http://python-distribute.org/pip_distribute.png
+
+
+Documentation content:
 
 .. toctree::
    :maxdepth: 2

From 3608b265680a9a04e19dc7e014ab8a3333dbd6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 19 Nov 2009 05:33:16 +0000
Subject: [PATCH 2747/8469] dragfullwindows can have value 2

---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 69a393caf8..1264854d0d 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, u'dragfullwindows')
-        self.assertTrue(v in (u'0', u'1'))
+        self.assertTrue(v in (u'0', u'1', u'2'))
 
         import _winreg
         HKCU = _winreg.HKEY_CURRENT_USER

From 83bf5a149567b658f71d0b78a622752019c03608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 19 Nov 2009 05:39:00 +0000
Subject: [PATCH 2748/8469] Merged revisions 76399 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76399 | tarek.ziade | 2009-11-19 06:33:16 +0100 (Thu, 19 Nov 2009) | 1 line

  dragfullwindows can have value 2
........
---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 7cf1a12ec7..05d34e604c 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
-        self.assertTrue(v in ('0', '1'))
+        self.assertTrue(v in ('0', '1', '2'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER

From 2ed389d59093022bf097e0ee48edd6c7ff5520b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 19 Nov 2009 05:41:34 +0000
Subject: [PATCH 2749/8469] Merged revisions 76401 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76401 | tarek.ziade | 2009-11-19 06:39:00 +0100 (Thu, 19 Nov 2009) | 9 lines

  Merged revisions 76399 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76399 | tarek.ziade | 2009-11-19 06:33:16 +0100 (Thu, 19 Nov 2009) | 1 line

    dragfullwindows can have value 2
  ........
................
---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 7cf1a12ec7..05d34e604c 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -46,7 +46,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
-        self.assertTrue(v in ('0', '1'))
+        self.assertTrue(v in ('0', '1', '2'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER

From 6acee8f5f4c9fe09ebfc6a042b2684b8be769802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 29 Nov 2009 22:20:30 +0000
Subject: [PATCH 2750/8469] Fixed #7408: dropped group ownership checking
 because it relies on os-specific rules

---
 tests/test_sdist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b8e3dca560..20b20aae0b 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -336,10 +336,13 @@ def test_make_distribution_owner_group(self):
         # making sure we have the good rights
         archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
         archive = tarfile.open(archive_name)
+
+        # note that we are not testing the group ownership here
+        # because, depending on the platforms and the container
+        # rights (see #7408)
         try:
             for member in archive.getmembers():
                 self.assertEquals(member.uid, os.getuid())
-                self.assertEquals(member.gid, os.getgid())
         finally:
             archive.close()
 

From 8e0598f5a5773af651590ef4905b9eb624fe8ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 29 Nov 2009 22:24:57 +0000
Subject: [PATCH 2751/8469] Merged revisions 76588 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76588 | tarek.ziade | 2009-11-29 23:20:30 +0100 (Sun, 29 Nov 2009) | 1 line

  Fixed #7408: dropped group ownership checking because it relies on os-specific rules
........
---
 tests/test_sdist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index c10e973ed7..e0f1e93768 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -336,10 +336,13 @@ def test_make_distribution_owner_group(self):
         # making sure we have the good rights
         archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
         archive = tarfile.open(archive_name)
+
+        # note that we are not testing the group ownership here
+        # because, depending on the platforms and the container
+        # rights (see #7408)
         try:
             for member in archive.getmembers():
                 self.assertEquals(member.uid, os.getuid())
-                self.assertEquals(member.gid, os.getgid())
         finally:
             archive.close()
 

From 8159dbb1f94821a8ec481662a87914826fb8c7c4 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 30 Nov 2009 15:22:16 +0100
Subject: [PATCH 2752/8469] displaying the package location

--HG--
branch : distribute
extra : rebase_source : bdc220d0997e6a50027bdaa96bf69e2bccd3415b
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4975680d16..70a3271093 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2262,7 +2262,7 @@ def insert_on(self, path, loc = None):
             if '0.7' in version:
                 raise ValueError(
                     "A 0.7-series setuptools cannot be installed "
-                    "with distribute")
+                    "with distribute. Found one at %s" % str(self.location))
 
         if not loc:
             return

From 67b9811dc7c6b59e5815e5b27620ef3e416488ac Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 2 Dec 2009 16:47:26 +0100
Subject: [PATCH 2753/8469] easy_install doesn't use a setup.cfg located in the
 working dir - fixes #99

--HG--
branch : distribute
extra : rebase_source : 0ddcfcf2eb8ef650c248a1d5d86fe1b95100df10
---
 CHANGES.txt                           |  2 ++
 setuptools/command/easy_install.py    |  8 +++++-
 setuptools/tests/test_easy_install.py | 40 ++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b27b9b138f..e6d2a6783e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,8 @@ CHANGES
 * Issue 80: test_develop now works with Python 3.1
 * Issue 93: upload_docs now works if there is an empty sub-directory.
 * Issue 70: exec bit on non-exec files
+* Issue 99: now easy_install doesn't usesa  "setup.cfg" if any exists in
+  the working directory.
 
 -----
 0.6.8
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index de6ea9459c..fb8cd74f7f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1674,7 +1674,6 @@ def bootstrap():
     import setuptools; argv0 = os.path.dirname(setuptools.__path__[0])
     sys.argv[0] = argv0; sys.argv.append(argv0); main()
 
-
 def main(argv=None, **kw):
     from setuptools import setup
     from setuptools.dist import Distribution
@@ -1699,9 +1698,16 @@ def with_ei_usage(f):
 
     class DistributionWithoutHelpCommands(Distribution):
         common_usage = ""
+
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
 
+        def find_config_files(self):
+            files = Distribution.find_config_files(self)
+            if 'setup.cfg' in files:
+                files.remove('setup.cfg')
+            return files
+
     if argv is None:
         argv = sys.argv[1:]
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6ce20e42f8..95909ca766 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -2,7 +2,7 @@
 """
 import sys
 import os, shutil, tempfile, unittest
-from setuptools.command.easy_install import easy_install, get_script_args
+from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.dist import Distribution
 
 class FakeDist(object):
@@ -27,6 +27,12 @@ def as_requirement(self):
     )
 """ % sys.executable
 
+SETUP_PY = """\
+from setuptools import setup
+
+setup(name='foo')
+"""
+
 class TestEasyInstallTest(unittest.TestCase):
 
     def test_install_site_py(self):
@@ -52,3 +58,35 @@ def test_get_script_args(self):
 
         self.assertEquals(script, WANTED)
 
+    def test_no_setup_cfg(self):
+        # makes sure easy_install as a command (main)
+        # doesn't use a setup.cfg file that is located
+        # in the current working directory
+        dir = tempfile.mkdtemp()
+        setup_cfg = open(os.path.join(dir, 'setup.cfg'), 'w')
+        setup_cfg.write('[easy_install]\nfind_links = http://example.com')
+        setup_cfg.close()
+        setup_py = open(os.path.join(dir, 'setup.py'), 'w')
+        setup_py.write(SETUP_PY)
+        setup_py.close()
+
+        from setuptools.dist import Distribution
+
+        def _parse_command_line(self):
+            msg = 'Error: a local setup.cfg was used'
+            opts = self.command_options
+            if 'easy_install' in opts:
+                assert 'find_links' not in opts['easy_install'], msg
+            return self._old_parse_command_line
+
+        Distribution._old_parse_command_line = Distribution.parse_command_line
+        Distribution.parse_command_line = _parse_command_line
+
+        old_wd = os.getcwd()
+        try:
+            os.chdir(dir)
+            main([])
+        finally:
+            os.chdir(old_wd)
+            shutil.rmtree(dir)
+

From ca0105cf105e6d8a6c3e552c82650de93dbe13b1 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 2 Dec 2009 17:07:26 +0100
Subject: [PATCH 2754/8469] more info about easy_install and setup.cfg refs #99

--HG--
branch : distribute
extra : rebase_source : 390f6492ac8aee653132791ac32f90bc1434433a
---
 CHANGES.txt           | 6 ++++--
 docs/easy_install.txt | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e6d2a6783e..608a278ed6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,8 +15,10 @@ CHANGES
 * Issue 80: test_develop now works with Python 3.1
 * Issue 93: upload_docs now works if there is an empty sub-directory.
 * Issue 70: exec bit on non-exec files
-* Issue 99: now easy_install doesn't usesa  "setup.cfg" if any exists in
-  the working directory.
+* Issue 99: now the standalone easy_install command doesn't uses a
+  "setup.cfg" if any exists in the working directory. It will use it
+  only if triggered by ``install_requires`` from a setup.py call
+  (install, develop, etc).
 
 -----
 0.6.8
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 5fa8354240..3e39b8111b 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -628,6 +628,9 @@ until and unless you override them explicitly in an ``[easy_install]`` section.
 For more information, see also the current Python documentation on the `use and
 location of distutils configuration files <http://docs.python.org/inst/config-syntax.html>`_.
 
+Notice that ``easy_install`` will use the ``setup.cfg`` from the current
+working directory only if it was triggered from ``setup.py`` through the
+``install_requires`` option. The standalone command will not use that file.
 
 Command-Line Options
 --------------------
@@ -904,7 +907,7 @@ Command-Line Options
     projects, not in-development ones, because such projects may not
     have a currently-valid version number.  So, it usually only installs them
     when their ``setup.py`` directory is explicitly passed on the command line.
-    
+
     However, if this option is used, then any in-development projects that were
     installed using the ``setup.py develop`` command, will be used to build
     eggs, effectively upgrading the "in-development" project to a snapshot
@@ -1257,7 +1260,7 @@ History
    installed using ``setup.py develop``.
 
  * Fixed not HTML-decoding URLs scraped from web pages
-  
+
 0.6c5
  * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
    is installed unzipped.

From 97ba6f9c79ad12e0fbefc6aa947e0351f9cca9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Dec 2009 20:53:51 +0000
Subject: [PATCH 2755/8469] Issue #4120: Drop reference to CRT from manifest
 when building extensions with msvc9compiler.

---
 msvc9compiler.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 00d76d4bea..c2287d9291 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,6 +17,7 @@
 import os
 import subprocess
 import sys
+import re
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -646,6 +647,28 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
+                try:
+                    # Remove references to the Visual C runtime, so they will
+                    # fall through to the Visual C dependency of Python.exe.
+                    # This way, when installed for a restricted user (e.g.
+                    # runtimes are not in WinSxS folder, but in Python's own
+                    # folder), the runtimes do not need to be in every folder
+                    # with .pyd's.
+                    manifest_f = open(temp_manifest, "rb")
+                    manifest_buf = manifest_f.read()
+                    manifest_f.close()
+                    pattern = re.compile(
+                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                        re.DOTALL)
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    manifest_f = open(temp_manifest, "wb")
+                    manifest_f.write(manifest_buf)
+                    manifest_f.close()
+                except IOError:
+                    pass
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',

From 0222ecd7eaa7541d1515387342da5bb8ee3d4a4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Dec 2009 20:56:15 +0000
Subject: [PATCH 2756/8469] Merged revisions 76651 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76651 | martin.v.loewis | 2009-12-03 21:53:51 +0100 (Do, 03 Dez 2009) | 3 lines

  Issue #4120: Drop reference to CRT from manifest when building
  extensions with msvc9compiler.
........
---
 msvc9compiler.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 68b7775830..9bf54c102d 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,6 +17,7 @@
 import os
 import subprocess
 import sys
+import re
 from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
     CompileError, LibError, LinkError)
 from distutils.ccompiler import (CCompiler, gen_preprocess_options,
@@ -641,7 +642,32 @@ def link(self,
             # will still consider the DLL up-to-date, but it will not have a
             # manifest.  Maybe we should link to a temp file?  OTOH, that
             # implies a build environment error that shouldn't go undetected.
-            mfid = 1 if target_desc == CCompiler.EXECUTABLE else 2
+            if target_desc == CCompiler.EXECUTABLE:
+                mfid = 1
+            else:
+                mfid = 2
+                try:
+                    # Remove references to the Visual C runtime, so they will
+                    # fall through to the Visual C dependency of Python.exe.
+                    # This way, when installed for a restricted user (e.g.
+                    # runtimes are not in WinSxS folder, but in Python's own
+                    # folder), the runtimes do not need to be in every folder
+                    # with .pyd's.
+                    manifest_f = open(temp_manifest, "rb")
+                    manifest_buf = manifest_f.read()
+                    manifest_f.close()
+                    pattern = re.compile(
+                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                        re.DOTALL)
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    manifest_f = open(temp_manifest, "wb")
+                    manifest_f.write(manifest_buf)
+                    manifest_f.close()
+                except IOError:
+                    pass
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',

From 14820811451bddfe8c54b9bf234bb18953575046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Dec 2009 20:57:49 +0000
Subject: [PATCH 2757/8469] Merged revisions 76651 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76651 | martin.v.loewis | 2009-12-03 21:53:51 +0100 (Do, 03 Dez 2009) | 3 lines

  Issue #4120: Drop reference to CRT from manifest when building
  extensions with msvc9compiler.
........
---
 msvc9compiler.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index ef895422c6..c84fb0b4a6 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,6 +17,7 @@
 import os
 import subprocess
 import sys
+import re
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -645,6 +646,28 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
+                try:
+                    # Remove references to the Visual C runtime, so they will
+                    # fall through to the Visual C dependency of Python.exe.
+                    # This way, when installed for a restricted user (e.g.
+                    # runtimes are not in WinSxS folder, but in Python's own
+                    # folder), the runtimes do not need to be in every folder
+                    # with .pyd's.
+                    manifest_f = open(temp_manifest, "rb")
+                    manifest_buf = manifest_f.read()
+                    manifest_f.close()
+                    pattern = re.compile(
+                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                        re.DOTALL)
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    manifest_f = open(temp_manifest, "wb")
+                    manifest_f.write(manifest_buf)
+                    manifest_f.close()
+                except IOError:
+                    pass
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',

From 625012af0113a6500c0a95a81ba0fdda5a2f0b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 3 Dec 2009 21:14:10 +0000
Subject: [PATCH 2758/8469] Merged revisions 76653 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76653 | martin.v.loewis | 2009-12-03 21:57:49 +0100 (Do, 03 Dez 2009) | 10 lines

  Merged revisions 76651 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76651 | martin.v.loewis | 2009-12-03 21:53:51 +0100 (Do, 03 Dez 2009) | 3 lines

    Issue #4120: Drop reference to CRT from manifest when building
    extensions with msvc9compiler.
  ........
................
---
 msvc9compiler.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index ef895422c6..c84fb0b4a6 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -17,6 +17,7 @@
 import os
 import subprocess
 import sys
+import re
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -645,6 +646,28 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
+                try:
+                    # Remove references to the Visual C runtime, so they will
+                    # fall through to the Visual C dependency of Python.exe.
+                    # This way, when installed for a restricted user (e.g.
+                    # runtimes are not in WinSxS folder, but in Python's own
+                    # folder), the runtimes do not need to be in every folder
+                    # with .pyd's.
+                    manifest_f = open(temp_manifest, "rb")
+                    manifest_buf = manifest_f.read()
+                    manifest_f.close()
+                    pattern = re.compile(
+                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                        re.DOTALL)
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
+                    manifest_buf = re.sub(pattern, "", manifest_buf)
+                    manifest_f = open(temp_manifest, "wb")
+                    manifest_f.write(manifest_buf)
+                    manifest_f.close()
+                except IOError:
+                    pass
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',

From f7279ede282b895e789b05ababb65ba4f6436160 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 4 Dec 2009 11:20:36 +0100
Subject: [PATCH 2759/8469] Allowing 'os.devnull' in Sandbox, fixes #101

--HG--
branch : distribute
extra : rebase_source : d6f63794621874eb637139f353314256e02e02df
---
 CHANGES.txt                      |  1 +
 setuptools/sandbox.py            |  8 ++++++--
 setuptools/tests/test_sandbox.py | 28 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/tests/test_sandbox.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 608a278ed6..422685a916 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,7 @@ CHANGES
   "setup.cfg" if any exists in the working directory. It will use it
   only if triggered by ``install_requires`` from a setup.py call
   (install, develop, etc).
+* Issue 101: Allowing ``os.devnull`` in Sandbox
 
 -----
 0.6.8
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 7b48783344..502598ca4d 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -152,6 +152,8 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
         )
 
 
+_EXCEPTIONS = [os.devnull,]
+
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
 
@@ -160,9 +162,10 @@ class DirectorySandbox(AbstractSandbox):
         "utime", "lchown", "chroot", "mkfifo", "mknod", "tempnam",
     ])
 
-    def __init__(self,sandbox):
+    def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
         self._prefix = os.path.join(self._sandbox,'')
+        self._exceptions = exceptions
         AbstractSandbox.__init__(self)
 
     def _violation(self, operation, *args, **kw):
@@ -187,7 +190,8 @@ def _ok(self,path):
         try:
             self._active = False
             realpath = os.path.normcase(os.path.realpath(path))
-            if realpath==self._sandbox or realpath.startswith(self._prefix):
+            if (realpath in self._exceptions or realpath == self._sandbox
+                or realpath.startswith(self._prefix)):
                 return True
         finally:
             self._active = active
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
new file mode 100644
index 0000000000..1b0dc4eaba
--- /dev/null
+++ b/setuptools/tests/test_sandbox.py
@@ -0,0 +1,28 @@
+"""develop tests
+"""
+import sys
+import os
+import shutil
+import unittest
+import tempfile
+
+from setuptools.sandbox import DirectorySandbox
+
+class TestSandbox(unittest.TestCase):
+
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.dir)
+
+    def test_devnull(self):
+        sandbox = DirectorySandbox(self.dir)
+
+        def _write():
+            f = open(os.devnull, 'w')
+            f.write('xxx')
+            f.close()
+
+        sandbox.run(_write)
+

From 7ed6e18a1d4705bf067be40df44b831d9bab21e6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2009 17:47:56 +0000
Subject: [PATCH 2760/8469] bump version to 2.7a1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e418214c48..e8c213e4c7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.6"
+__version__ = "2.7a1"
 #--end constants--

From c9eb6ca234ce508e2232b761158c9439e59139f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 6 Dec 2009 09:22:40 +0000
Subject: [PATCH 2761/8469] Fixed #1923: make sure we don't strip meaningful
 whitespace in PKG-INFO Description field

---
 tests/test_dist.py | 16 ++++++++++++++++
 util.py            |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 573d0b9b4f..8b141ca675 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -6,6 +6,7 @@
 import sys
 import unittest
 import warnings
+import textwrap
 
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
@@ -381,6 +382,21 @@ def test_show_help(self):
                   if line.strip() != '']
         self.assertTrue(len(output) > 0)
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = distutils.dist.Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertTrue(long_desc in meta)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
diff --git a/util.py b/util.py
index 6bff44f786..b8e4952fee 100644
--- a/util.py
+++ b/util.py
@@ -558,8 +558,8 @@ def rfc822_escape(header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = [x.strip() for x in header.split('\n')]
-    sep = '\n' + 8*' '
+    lines = header.split('\n')
+    sep = '\n' + 8 * ' '
     return sep.join(lines)
 
 _RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')

From 22b0f60962726ce1e614393de0af8061572adff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 6 Dec 2009 09:26:45 +0000
Subject: [PATCH 2762/8469] Merged revisions 76684 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76684 | tarek.ziade | 2009-12-06 10:22:40 +0100 (Sun, 06 Dec 2009) | 1 line

  Fixed #1923: make sure we don't strip meaningful whitespace in PKG-INFO Description field
........
---
 tests/test_dist.py | 16 ++++++++++++++++
 util.py            |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index bf59c41844..af40186315 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -9,6 +9,7 @@
 import sys
 import unittest
 import warnings
+import textwrap
 
 from test.test_support import TESTFN
 
@@ -283,6 +284,21 @@ def test_custom_pydistutils(self):
                 os.environ[key] = value
             os.remove(user_filename)
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = distutils.dist.Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertTrue(long_desc in meta)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
diff --git a/util.py b/util.py
index ee5829b077..7bc52f195b 100644
--- a/util.py
+++ b/util.py
@@ -559,6 +559,5 @@ def rfc822_escape (header):
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
     lines = string.split(header, '\n')
-    lines = map(string.strip, lines)
     header = string.join(lines, '\n' + 8*' ')
     return header

From 927dabee9d54b17bad408b8188ed533ffa38c694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 6 Dec 2009 09:28:17 +0000
Subject: [PATCH 2763/8469] Merged revisions 76684 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76684 | tarek.ziade | 2009-12-06 10:22:40 +0100 (Sun, 06 Dec 2009) | 1 line

  Fixed #1923: make sure we don't strip meaningful whitespace in PKG-INFO Description field
........
---
 tests/test_dist.py | 16 ++++++++++++++++
 util.py            |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index b1b184ea18..0e7d532df0 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -5,6 +5,7 @@
 import sys
 import unittest
 import warnings
+import textwrap
 
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
@@ -353,6 +354,21 @@ def test_show_help(self):
                   if line.strip() != '']
         self.assertTrue(len(output) > 0)
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = distutils.dist.Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertTrue(long_desc in meta)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
diff --git a/util.py b/util.py
index a50621e3f4..cca7b49f5e 100644
--- a/util.py
+++ b/util.py
@@ -557,8 +557,8 @@ def rfc822_escape(header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = [x.strip() for x in header.split('\n')]
-    sep = '\n' + 8*' '
+    lines = header.split('\n')
+    sep = '\n' + 8 * ' '
     return sep.join(lines)
 
 _RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')

From b42ca30f8ba473876220a2b63848c63bf22cbfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 6 Dec 2009 09:30:47 +0000
Subject: [PATCH 2764/8469] Merged revisions 76686 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76686 | tarek.ziade | 2009-12-06 10:28:17 +0100 (Sun, 06 Dec 2009) | 9 lines

  Merged revisions 76684 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76684 | tarek.ziade | 2009-12-06 10:22:40 +0100 (Sun, 06 Dec 2009) | 1 line

    Fixed #1923: make sure we don't strip meaningful whitespace in PKG-INFO Description field
  ........
................
---
 tests/test_dist.py | 16 ++++++++++++++++
 util.py            |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 5f96b97f9e..3b7637f3af 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -5,6 +5,7 @@
 import sys
 import unittest
 import warnings
+import textwrap
 
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
@@ -301,6 +302,21 @@ def test_show_help(self):
                   if line.strip() != '']
         self.assertTrue(len(output) > 0)
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertTrue(long_desc in meta)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
diff --git a/util.py b/util.py
index 4bc4c98413..50ad8fef98 100644
--- a/util.py
+++ b/util.py
@@ -557,8 +557,8 @@ def rfc822_escape (header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = [x.strip() for x in header.split('\n')]
-    sep = '\n' + 8*' '
+    lines = header.split('\n')
+    sep = '\n' + 8 * ' '
     return sep.join(lines)
 
 # 2to3 support

From 3eb783e76d5bcac42d64a560aefceff662b5f8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 8 Dec 2009 08:56:49 +0000
Subject: [PATCH 2765/8469] Issue #7457: added a read_pkg_file method to
 distutils.dist.DistributionMetadata so we can read back PKG-INFO files

---
 dist.py            | 91 +++++++++++++++++++++++++++++++++++++---------
 tests/test_dist.py | 31 +++++++++++++++-
 2 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/dist.py b/dist.py
index 8dc64d43da..a1fc7b36fc 100644
--- a/dist.py
+++ b/dist.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+import rfc822
 
 try:
     import warnings
@@ -1006,6 +1007,20 @@ def is_pure(self):
     # to self.metadata.get_XXX.  The actual code is in the
     # DistributionMetadata class, below.
 
+class _MetadataMessage(rfc822.Message):
+
+    def read_field(self, name):
+        value = self[name]
+        if value == 'UNKNOWN':
+            return None
+        return value
+
+    def getheaders(self, name, default):
+        values = rfc822.Message.getheaders(self, name)
+        if values == []:
+            return None
+        return values
+
 class DistributionMetadata:
     """Dummy class to hold the distribution meta-data: name, version,
     author, and so forth.
@@ -1021,25 +1036,67 @@ class DistributionMetadata:
                          "provides", "requires", "obsoletes",
                          )
 
-    def __init__ (self):
-        self.name = None
-        self.version = None
-        self.author = None
-        self.author_email = None
+    def __init__(self, path=None):
+        if path is not None:
+            self.read_pkg_file(open(path))
+        else:
+            self.name = None
+            self.version = None
+            self.author = None
+            self.author_email = None
+            self.maintainer = None
+            self.maintainer_email = None
+            self.url = None
+            self.license = None
+            self.description = None
+            self.long_description = None
+            self.keywords = None
+            self.platforms = None
+            self.classifiers = None
+            self.download_url = None
+            # PEP 314
+            self.provides = None
+            self.requires = None
+            self.obsoletes = None
+
+    def read_pkg_file(self, file):
+        """Reads the metadata values from a file object."""
+        msg = _MetadataMessage(file)
+        metadata_version = msg['metadata-version']
+        self.name = msg.read_field('name')
+        self.version = msg.read_field('version')
+        self.description = msg.read_field('summary')
+        # we are filling author only.
+        self.author = msg.read_field('author')
         self.maintainer = None
+        self.author_email = msg.read_field('author-email')
         self.maintainer_email = None
-        self.url = None
-        self.license = None
-        self.description = None
-        self.long_description = None
-        self.keywords = None
-        self.platforms = None
-        self.classifiers = None
-        self.download_url = None
-        # PEP 314
-        self.provides = None
-        self.requires = None
-        self.obsoletes = None
+        self.url = msg.read_field('home-page')
+        self.license = msg.read_field('license')
+
+        if 'download-url' in msg:
+            self.download_url = msg.read_field('download-url')
+        else:
+            self.download_url = None
+
+        self.long_description = msg.read_field('description')
+        self.description = msg.read_field('summary')
+
+        if 'keywords' in msg:
+            self.keywords = msg.read_field('keywords').split(',')
+
+        self.platforms = msg.getheaders('platform', None)
+        self.classifiers = msg.getheaders('classifier', None)
+
+        # PEP 314 - these fields only exist in 1.1
+        if metadata_version == '1.1':
+            self.requires = msg.getheaders('requires', None)
+            self.provides = msg.getheaders('provides', None)
+            self.obsoletes = msg.getheaders('obsoletes', None)
+        else:
+            self.requires = None
+            self.provides = None
+            self.obsoletes = None
 
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8b141ca675..1eddf6d25c 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,10 +8,9 @@
 import warnings
 import textwrap
 
-from distutils.dist import Distribution, fix_help_options
+from distutils.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils.cmd import Command
 import distutils.dist
-
 from test.test_support import TESTFN, captured_stdout
 from distutils.tests import support
 
@@ -239,6 +238,7 @@ def _expander(path):
         # make sure --no-user-cfg disables the user cfg file
         self.assertEquals(len(all_files)-1, len(files))
 
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
@@ -397,6 +397,33 @@ def test_long_description(self):
         meta = meta.replace('\n' + 8 * ' ', '\n')
         self.assertTrue(long_desc in meta)
 
+    def test_read_metadata(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": "desc",
+                 "description": "xxx",
+                 "download_url": "http://example.com",
+                 "keywords": ['one', 'two'],
+                 "requires": ['foo']}
+
+        dist = Distribution(attrs)
+        metadata = dist.metadata
+
+        # write it then reloads it
+        PKG_INFO = StringIO.StringIO()
+        metadata.write_pkg_file(PKG_INFO)
+        PKG_INFO.seek(0)
+        metadata.read_pkg_file(PKG_INFO)
+
+        self.assertEquals(metadata.name, "package")
+        self.assertEquals(metadata.version, "1.0")
+        self.assertEquals(metadata.description, "xxx")
+        self.assertEquals(metadata.download_url, 'http://example.com')
+        self.assertEquals(metadata.keywords, ['one', 'two'])
+        self.assertEquals(metadata.platforms, ['UNKNOWN'])
+        self.assertEquals(metadata.obsoletes, None)
+        self.assertEquals(metadata.requires, ['foo'])
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From b1a6b3c4c91509df552929a26e5bc1cc31ce6b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 8 Dec 2009 09:39:51 +0000
Subject: [PATCH 2766/8469] removed the usage of rfc822 in favor of
 email.message.Message

---
 dist.py | 63 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/dist.py b/dist.py
index a1fc7b36fc..ee2cec9088 100644
--- a/dist.py
+++ b/dist.py
@@ -7,7 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-import rfc822
+from email import message_from_file
 
 try:
     import warnings
@@ -1007,20 +1007,6 @@ def is_pure(self):
     # to self.metadata.get_XXX.  The actual code is in the
     # DistributionMetadata class, below.
 
-class _MetadataMessage(rfc822.Message):
-
-    def read_field(self, name):
-        value = self[name]
-        if value == 'UNKNOWN':
-            return None
-        return value
-
-    def getheaders(self, name, default):
-        values = rfc822.Message.getheaders(self, name)
-        if values == []:
-            return None
-        return values
-
 class DistributionMetadata:
     """Dummy class to hold the distribution meta-data: name, version,
     author, and so forth.
@@ -1061,38 +1047,51 @@ def __init__(self, path=None):
 
     def read_pkg_file(self, file):
         """Reads the metadata values from a file object."""
-        msg = _MetadataMessage(file)
+        msg = message_from_file(file)
+
+        def _read_field(name):
+            value = msg[name]
+            if value == 'UNKNOWN':
+                return None
+            return value
+
+        def _read_list(name):
+            values = msg.get_all(name, None)
+            if values == []:
+                return None
+            return values
+
         metadata_version = msg['metadata-version']
-        self.name = msg.read_field('name')
-        self.version = msg.read_field('version')
-        self.description = msg.read_field('summary')
+        self.name = _read_field('name')
+        self.version = _read_field('version')
+        self.description = _read_field('summary')
         # we are filling author only.
-        self.author = msg.read_field('author')
+        self.author = _read_field('author')
         self.maintainer = None
-        self.author_email = msg.read_field('author-email')
+        self.author_email = _read_field('author-email')
         self.maintainer_email = None
-        self.url = msg.read_field('home-page')
-        self.license = msg.read_field('license')
+        self.url = _read_field('home-page')
+        self.license = _read_field('license')
 
         if 'download-url' in msg:
-            self.download_url = msg.read_field('download-url')
+            self.download_url = _read_field('download-url')
         else:
             self.download_url = None
 
-        self.long_description = msg.read_field('description')
-        self.description = msg.read_field('summary')
+        self.long_description = _read_field('description')
+        self.description = _read_field('summary')
 
         if 'keywords' in msg:
-            self.keywords = msg.read_field('keywords').split(',')
+            self.keywords = _read_field('keywords').split(',')
 
-        self.platforms = msg.getheaders('platform', None)
-        self.classifiers = msg.getheaders('classifier', None)
+        self.platforms = _read_list('platform')
+        self.classifiers = _read_list('classifier')
 
         # PEP 314 - these fields only exist in 1.1
         if metadata_version == '1.1':
-            self.requires = msg.getheaders('requires', None)
-            self.provides = msg.getheaders('provides', None)
-            self.obsoletes = msg.getheaders('obsoletes', None)
+            self.requires = _read_list('requires')
+            self.provides = _read_list('provides')
+            self.obsoletes = _read_list('obsoletes')
         else:
             self.requires = None
             self.provides = None

From 6b16b3a1e6c1519906b509b8f906e1605557b5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 8 Dec 2009 09:45:25 +0000
Subject: [PATCH 2767/8469] Merged revisions 76702,76704 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76702 | tarek.ziade | 2009-12-08 09:56:49 +0100 (Tue, 08 Dec 2009) | 1 line

  Issue #7457: added a read_pkg_file method to distutils.dist.DistributionMetadata so we can read back PKG-INFO files
........
  r76704 | tarek.ziade | 2009-12-08 10:39:51 +0100 (Tue, 08 Dec 2009) | 1 line

  removed the usage of rfc822 in favor of email.message.Message
........
---
 dist.py            | 90 +++++++++++++++++++++++++++++++++++++---------
 tests/test_dist.py | 29 ++++++++++++++-
 2 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/dist.py b/dist.py
index 90af6e2d3b..353525e17d 100644
--- a/dist.py
+++ b/dist.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import sys, os, re
+from email import message_from_file
 
 try:
     import warnings
@@ -1014,25 +1015,80 @@ class DistributionMetadata:
                          "provides", "requires", "obsoletes",
                          )
 
-    def __init__ (self):
-        self.name = None
-        self.version = None
-        self.author = None
-        self.author_email = None
+    def __init__(self, path=None):
+        if path is not None:
+            self.read_pkg_file(open(path))
+        else:
+            self.name = None
+            self.version = None
+            self.author = None
+            self.author_email = None
+            self.maintainer = None
+            self.maintainer_email = None
+            self.url = None
+            self.license = None
+            self.description = None
+            self.long_description = None
+            self.keywords = None
+            self.platforms = None
+            self.classifiers = None
+            self.download_url = None
+            # PEP 314
+            self.provides = None
+            self.requires = None
+            self.obsoletes = None
+
+    def read_pkg_file(self, file):
+        """Reads the metadata values from a file object."""
+        msg = message_from_file(file)
+
+        def _read_field(name):
+            value = msg[name]
+            if value == 'UNKNOWN':
+                return None
+            return value
+
+        def _read_list(name):
+            values = msg.get_all(name, None)
+            if values == []:
+                return None
+            return values
+
+        metadata_version = msg['metadata-version']
+        self.name = _read_field('name')
+        self.version = _read_field('version')
+        self.description = _read_field('summary')
+        # we are filling author only.
+        self.author = _read_field('author')
         self.maintainer = None
+        self.author_email = _read_field('author-email')
         self.maintainer_email = None
-        self.url = None
-        self.license = None
-        self.description = None
-        self.long_description = None
-        self.keywords = None
-        self.platforms = None
-        self.classifiers = None
-        self.download_url = None
-        # PEP 314
-        self.provides = None
-        self.requires = None
-        self.obsoletes = None
+        self.url = _read_field('home-page')
+        self.license = _read_field('license')
+
+        if 'download-url' in msg:
+            self.download_url = _read_field('download-url')
+        else:
+            self.download_url = None
+
+        self.long_description = _read_field('description')
+        self.description = _read_field('summary')
+
+        if 'keywords' in msg:
+            self.keywords = _read_field('keywords').split(',')
+
+        self.platforms = _read_list('platform')
+        self.classifiers = _read_list('classifier')
+
+        # PEP 314 - these fields only exist in 1.1
+        if metadata_version == '1.1':
+            self.requires = _read_list('requires')
+            self.provides = _read_list('provides')
+            self.obsoletes = _read_list('obsoletes')
+        else:
+            self.requires = None
+            self.provides = None
+            self.obsoletes = None
 
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 0e7d532df0..4f51c16e51 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -7,7 +7,7 @@
 import warnings
 import textwrap
 
-from distutils.dist import Distribution, fix_help_options
+from distutils.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils.cmd import Command
 import distutils.dist
 
@@ -369,6 +369,33 @@ def test_long_description(self):
         meta = meta.replace('\n' + 8 * ' ', '\n')
         self.assertTrue(long_desc in meta)
 
+    def test_read_metadata(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": "desc",
+                 "description": "xxx",
+                 "download_url": "http://example.com",
+                 "keywords": ['one', 'two'],
+                 "requires": ['foo']}
+
+        dist = Distribution(attrs)
+        metadata = dist.metadata
+
+        # write it then reloads it
+        PKG_INFO = io.StringIO()
+        metadata.write_pkg_file(PKG_INFO)
+        PKG_INFO.seek(0)
+        metadata.read_pkg_file(PKG_INFO)
+
+        self.assertEquals(metadata.name, "package")
+        self.assertEquals(metadata.version, "1.0")
+        self.assertEquals(metadata.description, "xxx")
+        self.assertEquals(metadata.download_url, 'http://example.com')
+        self.assertEquals(metadata.keywords, ['one', 'two'])
+        self.assertEquals(metadata.platforms, ['UNKNOWN'])
+        self.assertEquals(metadata.obsoletes, None)
+        self.assertEquals(metadata.requires, ['foo'])
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From 769868e0309a3e8b454d1638cd50d5883ef5b2f2 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 10 Dec 2009 10:27:09 +0000
Subject: [PATCH 2768/8469] Fix an issue with the detection of a non-existing
 SDK on OSX. Without this patch it wasn't possible after all to compile
 extensions on OSX 10.6 with the binary installer unless the user had
 installed the (non-default) 10.4u SDK.

---
 sysconfig.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 6ca6720adb..f3b2aca613 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -563,7 +563,7 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
+                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -582,7 +582,7 @@ def get_config_vars(*args):
 
                 if 'ARCHFLAGS' in os.environ:
                     arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
+                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -606,7 +606,7 @@ def get_config_vars(*args):
                 if m is not None:
                     sdk = m.group(1)
                     if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS',
+                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                              # a number of derived variables. These need to be
                              # patched up as well.
                             'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):

From dde1c67ea48a115d96ccddc0f0e4ff44dfd0d286 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 10 Dec 2009 10:29:05 +0000
Subject: [PATCH 2769/8469] Merged revisions 76738 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76738 | ronald.oussoren | 2009-12-10 11:27:09 +0100 (Thu, 10 Dec 2009) | 6 lines

  Fix an issue with the detection of a non-existing SDK
  on OSX. Without this patch it wasn't possible after all
  to compile extensions on OSX 10.6 with the binary
  installer unless the user had installed the (non-default)
  10.4u SDK.
........
---
 sysconfig.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8306202fb3..54ccec4953 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -537,7 +537,7 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
+                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -556,7 +556,7 @@ def get_config_vars(*args):
 
                 if 'ARCHFLAGS' in os.environ:
                     arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
+                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -580,7 +580,7 @@ def get_config_vars(*args):
                 if m is not None:
                     sdk = m.group(1)
                     if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS',
+                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                              # a number of derived variables. These need to be
                              # patched up as well.
                             'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):

From b74e204f60de97245539398db20bc1ab8e2152de Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 10 Dec 2009 13:30:30 +0100
Subject: [PATCH 2770/8469] fixed the MacPorts failure when platform.mac_ver()
 fails - fixes #92

--HG--
branch : distribute
extra : rebase_source : b8bf9830479ce1433cf6c0b0c97c628a2876675c
---
 CHANGES.txt      |  2 ++
 pkg_resources.py | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 422685a916..34fb5d488a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,8 @@ CHANGES
   only if triggered by ``install_requires`` from a setup.py call
   (install, develop, etc).
 * Issue 101: Allowing ``os.devnull`` in Sandbox
+* Issue 92: Fixed the "no eggs" found error with MacPort
+  (platform.mac_ver() fails)
 
 -----
 0.6.8
diff --git a/pkg_resources.py b/pkg_resources.py
index 70a3271093..4684163149 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -186,6 +186,16 @@ def _macosx_vers(_cache=[]):
     if not _cache:
         import platform
         version = platform.mac_ver()[0]
+        # fallback for MacPorts
+        if version == '':
+            import re
+            version_file = '/System/Library/CoreServices/SystemVersion.plist'
+            version_regexp = r'<key>ProductVersion</key>\n\t<string>(.*?)</string>'
+            if os.path.exists(version_file):
+                osx_version = open(version_file).read()
+                osx_version = re.findall(version_regexp, osx_version, re.M)
+                if len(osx_version) > 0:
+                    version = osx_version[0]
         _cache.append(version.split('.'))
     return _cache[0]
 

From b9554b5bc4ca05034d3b9dce876b684fd0482c4a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Thu, 10 Dec 2009 16:20:18 +0100
Subject: [PATCH 2771/8469] Uses plistlib instead of re. Thanks Florian refs
 #92

--HG--
branch : distribute
extra : rebase_source : f3e61a21dc640a621364736b2a60fa9eb337ae1b
---
 pkg_resources.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4684163149..9f1baca404 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -188,14 +188,13 @@ def _macosx_vers(_cache=[]):
         version = platform.mac_ver()[0]
         # fallback for MacPorts
         if version == '':
-            import re
-            version_file = '/System/Library/CoreServices/SystemVersion.plist'
-            version_regexp = r'<key>ProductVersion</key>\n\t<string>(.*?)</string>'
-            if os.path.exists(version_file):
-                osx_version = open(version_file).read()
-                osx_version = re.findall(version_regexp, osx_version, re.M)
-                if len(osx_version) > 0:
-                    version = osx_version[0]
+            import plistlib
+            plist = '/System/Library/CoreServices/SystemVersion.plist'
+            if os.path.exists(plist):
+                plist_content = plistlib.readPlist(plist)
+                if 'ProductVersion' in plist_content:
+                    version = plist_content['ProductVersion']
+
         _cache.append(version.split('.'))
     return _cache[0]
 

From c96d565a9308ae6781dacdcc8d016445bbca75a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 10 Dec 2009 15:29:03 +0000
Subject: [PATCH 2772/8469] added test coverage for distutils.dep_util, and
 cleaned up the module

---
 dep_util.py            |  68 +++++++++++++--------------
 tests/test_dep_util.py | 101 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 37 deletions(-)
 create mode 100644 tests/test_dep_util.py

diff --git a/dep_util.py b/dep_util.py
index 39eecfb248..4e40df6899 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -9,29 +9,27 @@
 import os
 from distutils.errors import DistutilsFileError
 
+def newer(source, target):
+    """Tells if the target is newer than the source.
 
-def newer (source, target):
-    """Return true if 'source' exists and is more recently modified than
-    'target', or if 'source' exists and 'target' doesn't.  Return false if
-    both exist and 'target' is the same age or younger than 'source'.
-    Raise DistutilsFileError if 'source' does not exist.
+    Return true if 'source' exists and is more recently modified than
+    'target', or if 'source' exists and 'target' doesn't.
+
+    Return false if both exist and 'target' is the same age or younger
+    than 'source'. Raise DistutilsFileError if 'source' does not exist.
+
+    Note that this test is not very accurate: files created in the same second
+    will have the same "age".
     """
     if not os.path.exists(source):
-        raise DistutilsFileError, ("file '%s' does not exist" %
-                                   os.path.abspath(source))
+        raise DistutilsFileError("file '%s' does not exist" %
+                                 os.path.abspath(source))
     if not os.path.exists(target):
-        return 1
-
-    from stat import ST_MTIME
-    mtime1 = os.stat(source)[ST_MTIME]
-    mtime2 = os.stat(target)[ST_MTIME]
-
-    return mtime1 > mtime2
-
-# newer ()
+        return True
 
+    return os.stat(source).st_mtime > os.stat(target).st_mtime
 
-def newer_pairwise (sources, targets):
+def newer_pairwise(sources, targets):
     """Walk two filename lists in parallel, testing if each source is newer
     than its corresponding target.  Return a pair of lists (sources,
     targets) where source is newer than target, according to the semantics
@@ -43,19 +41,18 @@ def newer_pairwise (sources, targets):
     # build a pair of lists (sources, targets) where  source is newer
     n_sources = []
     n_targets = []
-    for i in range(len(sources)):
-        if newer(sources[i], targets[i]):
-            n_sources.append(sources[i])
-            n_targets.append(targets[i])
+    for source, target in zip(sources, targets):
+        if newer(source, target):
+            n_sources.append(source)
+            n_targets.append(target)
 
-    return (n_sources, n_targets)
+    return n_sources, n_targets
 
-# newer_pairwise ()
-
-
-def newer_group (sources, target, missing='error'):
+def newer_group(sources, target, missing='error'):
     """Return true if 'target' is out-of-date with respect to any file
-    listed in 'sources'.  In other words, if 'target' exists and is newer
+    listed in 'sources'.
+
+    In other words, if 'target' exists and is newer
     than every file in 'sources', return false; otherwise return true.
     'missing' controls what we do when a source file is missing; the
     default ("error") is to blow up with an OSError from inside 'stat()';
@@ -68,14 +65,14 @@ def newer_group (sources, target, missing='error'):
     """
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists(target):
-        return 1
+        return True
 
     # Otherwise we have to find out the hard way: if *any* source file
     # is more recent than 'target', then 'target' is out-of-date and
     # we can immediately return true.  If we fall through to the end
     # of the loop, then 'target' is up-to-date and we return false.
-    from stat import ST_MTIME
-    target_mtime = os.stat(target)[ST_MTIME]
+    target_mtime = os.stat(target).st_mtime
+
     for source in sources:
         if not os.path.exists(source):
             if missing == 'error':      # blow up when we stat() the file
@@ -83,12 +80,9 @@ def newer_group (sources, target, missing='error'):
             elif missing == 'ignore':   # missing source dropped from
                 continue                #  target's dependency list
             elif missing == 'newer':    # missing source means target is
-                return 1                #  out-of-date
+                return True             #  out-of-date
 
-        source_mtime = os.stat(source)[ST_MTIME]
-        if source_mtime > target_mtime:
-            return 1
-    else:
-        return 0
+        if os.stat(source).st_mtime > target_mtime:
+            return True
 
-# newer_group ()
+    return False
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
new file mode 100644
index 0000000000..21fc7bc0b9
--- /dev/null
+++ b/tests/test_dep_util.py
@@ -0,0 +1,101 @@
+"""Tests for distutils.dep_util."""
+import unittest
+import os
+import time
+
+from distutils.dep_util import newer, newer_pairwise, newer_group
+from distutils.errors import DistutilsFileError
+from distutils.tests import support
+
+# XXX needs to be tuned for the various platforms
+_ST_MIME_TIMER = 1
+
+class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_newer(self):
+        tmpdir = self.mkdtemp()
+        target = os.path.join(tmpdir, 'target')
+        source = os.path.join(tmpdir, 'source')
+
+        # Raise DistutilsFileError if 'source' does not exist.
+        self.assertRaises(DistutilsFileError, newer, target, source)
+
+        # Return true if 'source' exists and is more recently modified than
+        # 'target', or if 'source' exists and 'target' doesn't.
+        self.write_file(target)
+        self.assertTrue(newer(target, source))
+        self.write_file(source, 'xox')
+        time.sleep(_ST_MIME_TIMER)  # ensures ST_MTIME differs
+        self.write_file(target, 'xhx')
+        self.assertTrue(newer(target, source))
+
+        # Return false if both exist and 'target' is the same age or younger
+        # than 'source'.
+        self.write_file(source, 'xox'); self.write_file(target, 'xhx')
+        self.assertFalse(newer(target, source))
+        self.write_file(target, 'xox')
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(source, 'xhx')
+        self.assertFalse(newer(target, source))
+
+    def test_newer_pairwise(self):
+        tmpdir = self.mkdtemp()
+        sources = os.path.join(tmpdir, 'sources')
+        targets = os.path.join(tmpdir, 'targets')
+        os.mkdir(sources)
+        os.mkdir(targets)
+        one = os.path.join(sources, 'one')
+        two = os.path.join(sources, 'two')
+        three = os.path.join(targets, 'three')
+        four = os.path.join(targets, 'four')
+
+        self.write_file(one)
+        self.write_file(three)
+        self.write_file(four)
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(two)
+
+        self.assertEquals(newer_pairwise([one, two], [three, four]),
+                          ([two],[four]))
+
+    def test_newer_group(self):
+        tmpdir = self.mkdtemp()
+        sources = os.path.join(tmpdir, 'sources')
+        os.mkdir(sources)
+        one = os.path.join(sources, 'one')
+        two = os.path.join(sources, 'two')
+        three = os.path.join(sources, 'three')
+        target = os.path.join(tmpdir, 'target')
+
+        # return true if 'target' is out-of-date with respect to any file
+        # listed in 'sources'.
+        self.write_file(target)
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(one)
+        self.write_file(two)
+        self.write_file(three)
+        self.assertTrue(newer_group([one, two, three], target))
+
+        self.write_file(one)
+        self.write_file(three)
+        self.write_file(two)
+        time.sleep(0.1)
+        self.write_file(target)
+        self.assertFalse(newer_group([one, two, three], target))
+
+        # missing handling
+        os.remove(one)
+        self.assertRaises(OSError, newer_group, [one, two, three], target)
+
+        self.assertFalse(newer_group([one, two, three], target,
+                                     missing='ignore'))
+
+        self.assertTrue(newer_group([one, two, three], target,
+                                    missing='newer'))
+
+
+def test_suite():
+    return unittest.makeSuite(DepUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From e7ff58b757d214c4565d89b58b3efd77620d7a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 10 Dec 2009 15:35:35 +0000
Subject: [PATCH 2773/8469] Merged revisions 76746 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76746 | tarek.ziade | 2009-12-10 16:29:03 +0100 (Thu, 10 Dec 2009) | 1 line

  added test coverage for distutils.dep_util, and cleaned up the module
........
---
 dep_util.py            |  64 ++++++++++++--------------
 tests/test_dep_util.py | 101 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 35 deletions(-)
 create mode 100644 tests/test_dep_util.py

diff --git a/dep_util.py b/dep_util.py
index 07b3549c6f..b91a62eb56 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -9,29 +9,27 @@
 import os
 from distutils.errors import DistutilsFileError
 
+def newer(source, target):
+    """Tells if the target is newer than the source.
 
-def newer (source, target):
-    """Return true if 'source' exists and is more recently modified than
-    'target', or if 'source' exists and 'target' doesn't.  Return false if
-    both exist and 'target' is the same age or younger than 'source'.
-    Raise DistutilsFileError if 'source' does not exist.
+    Return true if 'source' exists and is more recently modified than
+    'target', or if 'source' exists and 'target' doesn't.
+
+    Return false if both exist and 'target' is the same age or younger
+    than 'source'. Raise DistutilsFileError if 'source' does not exist.
+
+    Note that this test is not very accurate: files created in the same second
+    will have the same "age".
     """
     if not os.path.exists(source):
         raise DistutilsFileError("file '%s' does not exist" %
                                  os.path.abspath(source))
     if not os.path.exists(target):
-        return 1
-
-    from stat import ST_MTIME
-    mtime1 = os.stat(source)[ST_MTIME]
-    mtime2 = os.stat(target)[ST_MTIME]
-
-    return mtime1 > mtime2
-
-# newer ()
+        return True
 
+    return os.stat(source).st_mtime > os.stat(target).st_mtime
 
-def newer_pairwise (sources, targets):
+def newer_pairwise(sources, targets):
     """Walk two filename lists in parallel, testing if each source is newer
     than its corresponding target.  Return a pair of lists (sources,
     targets) where source is newer than target, according to the semantics
@@ -43,19 +41,18 @@ def newer_pairwise (sources, targets):
     # build a pair of lists (sources, targets) where  source is newer
     n_sources = []
     n_targets = []
-    for i in range(len(sources)):
-        if newer(sources[i], targets[i]):
-            n_sources.append(sources[i])
-            n_targets.append(targets[i])
+    for source, target in zip(sources, targets):
+        if newer(source, target):
+            n_sources.append(source)
+            n_targets.append(target)
 
-    return (n_sources, n_targets)
+    return n_sources, n_targets
 
-# newer_pairwise ()
-
-
-def newer_group (sources, target, missing='error'):
+def newer_group(sources, target, missing='error'):
     """Return true if 'target' is out-of-date with respect to any file
-    listed in 'sources'.  In other words, if 'target' exists and is newer
+    listed in 'sources'.
+
+    In other words, if 'target' exists and is newer
     than every file in 'sources', return false; otherwise return true.
     'missing' controls what we do when a source file is missing; the
     default ("error") is to blow up with an OSError from inside 'stat()';
@@ -68,14 +65,14 @@ def newer_group (sources, target, missing='error'):
     """
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists(target):
-        return 1
+        return True
 
     # Otherwise we have to find out the hard way: if *any* source file
     # is more recent than 'target', then 'target' is out-of-date and
     # we can immediately return true.  If we fall through to the end
     # of the loop, then 'target' is up-to-date and we return false.
-    from stat import ST_MTIME
-    target_mtime = os.stat(target)[ST_MTIME]
+    target_mtime = os.stat(target).st_mtime
+
     for source in sources:
         if not os.path.exists(source):
             if missing == 'error':      # blow up when we stat() the file
@@ -83,12 +80,9 @@ def newer_group (sources, target, missing='error'):
             elif missing == 'ignore':   # missing source dropped from
                 continue                #  target's dependency list
             elif missing == 'newer':    # missing source means target is
-                return 1                #  out-of-date
+                return True             #  out-of-date
 
-        source_mtime = os.stat(source)[ST_MTIME]
-        if source_mtime > target_mtime:
-            return 1
-    else:
-        return 0
+        if os.stat(source).st_mtime > target_mtime:
+            return True
 
-# newer_group ()
+    return False
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
new file mode 100644
index 0000000000..21fc7bc0b9
--- /dev/null
+++ b/tests/test_dep_util.py
@@ -0,0 +1,101 @@
+"""Tests for distutils.dep_util."""
+import unittest
+import os
+import time
+
+from distutils.dep_util import newer, newer_pairwise, newer_group
+from distutils.errors import DistutilsFileError
+from distutils.tests import support
+
+# XXX needs to be tuned for the various platforms
+_ST_MIME_TIMER = 1
+
+class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
+
+    def test_newer(self):
+        tmpdir = self.mkdtemp()
+        target = os.path.join(tmpdir, 'target')
+        source = os.path.join(tmpdir, 'source')
+
+        # Raise DistutilsFileError if 'source' does not exist.
+        self.assertRaises(DistutilsFileError, newer, target, source)
+
+        # Return true if 'source' exists and is more recently modified than
+        # 'target', or if 'source' exists and 'target' doesn't.
+        self.write_file(target)
+        self.assertTrue(newer(target, source))
+        self.write_file(source, 'xox')
+        time.sleep(_ST_MIME_TIMER)  # ensures ST_MTIME differs
+        self.write_file(target, 'xhx')
+        self.assertTrue(newer(target, source))
+
+        # Return false if both exist and 'target' is the same age or younger
+        # than 'source'.
+        self.write_file(source, 'xox'); self.write_file(target, 'xhx')
+        self.assertFalse(newer(target, source))
+        self.write_file(target, 'xox')
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(source, 'xhx')
+        self.assertFalse(newer(target, source))
+
+    def test_newer_pairwise(self):
+        tmpdir = self.mkdtemp()
+        sources = os.path.join(tmpdir, 'sources')
+        targets = os.path.join(tmpdir, 'targets')
+        os.mkdir(sources)
+        os.mkdir(targets)
+        one = os.path.join(sources, 'one')
+        two = os.path.join(sources, 'two')
+        three = os.path.join(targets, 'three')
+        four = os.path.join(targets, 'four')
+
+        self.write_file(one)
+        self.write_file(three)
+        self.write_file(four)
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(two)
+
+        self.assertEquals(newer_pairwise([one, two], [three, four]),
+                          ([two],[four]))
+
+    def test_newer_group(self):
+        tmpdir = self.mkdtemp()
+        sources = os.path.join(tmpdir, 'sources')
+        os.mkdir(sources)
+        one = os.path.join(sources, 'one')
+        two = os.path.join(sources, 'two')
+        three = os.path.join(sources, 'three')
+        target = os.path.join(tmpdir, 'target')
+
+        # return true if 'target' is out-of-date with respect to any file
+        # listed in 'sources'.
+        self.write_file(target)
+        time.sleep(_ST_MIME_TIMER)
+        self.write_file(one)
+        self.write_file(two)
+        self.write_file(three)
+        self.assertTrue(newer_group([one, two, three], target))
+
+        self.write_file(one)
+        self.write_file(three)
+        self.write_file(two)
+        time.sleep(0.1)
+        self.write_file(target)
+        self.assertFalse(newer_group([one, two, three], target))
+
+        # missing handling
+        os.remove(one)
+        self.assertRaises(OSError, newer_group, [one, two, three], target)
+
+        self.assertFalse(newer_group([one, two, three], target,
+                                     missing='ignore'))
+
+        self.assertTrue(newer_group([one, two, three], target,
+                                    missing='newer'))
+
+
+def test_suite():
+    return unittest.makeSuite(DepUtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From fa1b455a97e292e8a338fb07b72c8db7ca52658a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 10 Dec 2009 19:29:53 +0000
Subject: [PATCH 2774/8469] using an existing file to avoid dealing with a
 sleep to test file ages

---
 tests/test_dep_util.py | 73 +++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index 21fc7bc0b9..d81d9143b4 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -7,36 +7,26 @@
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
 
-# XXX needs to be tuned for the various platforms
-_ST_MIME_TIMER = 1
-
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_newer(self):
+
         tmpdir = self.mkdtemp()
-        target = os.path.join(tmpdir, 'target')
-        source = os.path.join(tmpdir, 'source')
-
-        # Raise DistutilsFileError if 'source' does not exist.
-        self.assertRaises(DistutilsFileError, newer, target, source)
-
-        # Return true if 'source' exists and is more recently modified than
-        # 'target', or if 'source' exists and 'target' doesn't.
-        self.write_file(target)
-        self.assertTrue(newer(target, source))
-        self.write_file(source, 'xox')
-        time.sleep(_ST_MIME_TIMER)  # ensures ST_MTIME differs
-        self.write_file(target, 'xhx')
-        self.assertTrue(newer(target, source))
-
-        # Return false if both exist and 'target' is the same age or younger
-        # than 'source'.
-        self.write_file(source, 'xox'); self.write_file(target, 'xhx')
-        self.assertFalse(newer(target, source))
-        self.write_file(target, 'xox')
-        time.sleep(_ST_MIME_TIMER)
-        self.write_file(source, 'xhx')
-        self.assertFalse(newer(target, source))
+        new_file = os.path.join(tmpdir, 'new')
+        old_file = os.path.abspath(__file__)
+
+        # Raise DistutilsFileError if 'new_file' does not exist.
+        self.assertRaises(DistutilsFileError, newer, new_file, old_file)
+
+        # Return true if 'new_file' exists and is more recently modified than
+        # 'old_file', or if 'new_file' exists and 'old_file' doesn't.
+        self.write_file(new_file)
+        self.assertTrue(newer(new_file, 'I_dont_exist'))
+        self.assertTrue(newer(new_file, old_file))
+
+        # Return false if both exist and 'old_file' is the same age or younger
+        # than 'new_file'.
+        self.assertFalse(newer(old_file, new_file))
 
     def test_newer_pairwise(self):
         tmpdir = self.mkdtemp()
@@ -46,17 +36,14 @@ def test_newer_pairwise(self):
         os.mkdir(targets)
         one = os.path.join(sources, 'one')
         two = os.path.join(sources, 'two')
-        three = os.path.join(targets, 'three')
+        three = os.path.abspath(__file__)    # I am the old file
         four = os.path.join(targets, 'four')
-
         self.write_file(one)
-        self.write_file(three)
-        self.write_file(four)
-        time.sleep(_ST_MIME_TIMER)
         self.write_file(two)
+        self.write_file(four)
 
         self.assertEquals(newer_pairwise([one, two], [three, four]),
-                          ([two],[four]))
+                          ([one],[three]))
 
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
@@ -65,32 +52,24 @@ def test_newer_group(self):
         one = os.path.join(sources, 'one')
         two = os.path.join(sources, 'two')
         three = os.path.join(sources, 'three')
-        target = os.path.join(tmpdir, 'target')
+        old_file = os.path.abspath(__file__)
 
-        # return true if 'target' is out-of-date with respect to any file
+        # return true if 'old_file' is out-of-date with respect to any file
         # listed in 'sources'.
-        self.write_file(target)
-        time.sleep(_ST_MIME_TIMER)
         self.write_file(one)
         self.write_file(two)
         self.write_file(three)
-        self.assertTrue(newer_group([one, two, three], target))
-
-        self.write_file(one)
-        self.write_file(three)
-        self.write_file(two)
-        time.sleep(0.1)
-        self.write_file(target)
-        self.assertFalse(newer_group([one, two, three], target))
+        self.assertTrue(newer_group([one, two, three], old_file))
+        self.assertFalse(newer_group([one, two, old_file], three))
 
         # missing handling
         os.remove(one)
-        self.assertRaises(OSError, newer_group, [one, two, three], target)
+        self.assertRaises(OSError, newer_group, [one, two, old_file], three)
 
-        self.assertFalse(newer_group([one, two, three], target,
+        self.assertFalse(newer_group([one, two, old_file], three,
                                      missing='ignore'))
 
-        self.assertTrue(newer_group([one, two, three], target,
+        self.assertTrue(newer_group([one, two, old_file], three,
                                     missing='newer'))
 
 

From 53e5b86d24ea8f12522a35ff9bf5767724d16938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 10 Dec 2009 19:37:05 +0000
Subject: [PATCH 2775/8469] Merged revisions 76750 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76750 | tarek.ziade | 2009-12-10 20:29:53 +0100 (Thu, 10 Dec 2009) | 1 line

  using an existing file to avoid dealing with a sleep to test file ages
........
---
 tests/test_dep_util.py | 73 +++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index 21fc7bc0b9..d81d9143b4 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -7,36 +7,26 @@
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
 
-# XXX needs to be tuned for the various platforms
-_ST_MIME_TIMER = 1
-
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_newer(self):
+
         tmpdir = self.mkdtemp()
-        target = os.path.join(tmpdir, 'target')
-        source = os.path.join(tmpdir, 'source')
-
-        # Raise DistutilsFileError if 'source' does not exist.
-        self.assertRaises(DistutilsFileError, newer, target, source)
-
-        # Return true if 'source' exists and is more recently modified than
-        # 'target', or if 'source' exists and 'target' doesn't.
-        self.write_file(target)
-        self.assertTrue(newer(target, source))
-        self.write_file(source, 'xox')
-        time.sleep(_ST_MIME_TIMER)  # ensures ST_MTIME differs
-        self.write_file(target, 'xhx')
-        self.assertTrue(newer(target, source))
-
-        # Return false if both exist and 'target' is the same age or younger
-        # than 'source'.
-        self.write_file(source, 'xox'); self.write_file(target, 'xhx')
-        self.assertFalse(newer(target, source))
-        self.write_file(target, 'xox')
-        time.sleep(_ST_MIME_TIMER)
-        self.write_file(source, 'xhx')
-        self.assertFalse(newer(target, source))
+        new_file = os.path.join(tmpdir, 'new')
+        old_file = os.path.abspath(__file__)
+
+        # Raise DistutilsFileError if 'new_file' does not exist.
+        self.assertRaises(DistutilsFileError, newer, new_file, old_file)
+
+        # Return true if 'new_file' exists and is more recently modified than
+        # 'old_file', or if 'new_file' exists and 'old_file' doesn't.
+        self.write_file(new_file)
+        self.assertTrue(newer(new_file, 'I_dont_exist'))
+        self.assertTrue(newer(new_file, old_file))
+
+        # Return false if both exist and 'old_file' is the same age or younger
+        # than 'new_file'.
+        self.assertFalse(newer(old_file, new_file))
 
     def test_newer_pairwise(self):
         tmpdir = self.mkdtemp()
@@ -46,17 +36,14 @@ def test_newer_pairwise(self):
         os.mkdir(targets)
         one = os.path.join(sources, 'one')
         two = os.path.join(sources, 'two')
-        three = os.path.join(targets, 'three')
+        three = os.path.abspath(__file__)    # I am the old file
         four = os.path.join(targets, 'four')
-
         self.write_file(one)
-        self.write_file(three)
-        self.write_file(four)
-        time.sleep(_ST_MIME_TIMER)
         self.write_file(two)
+        self.write_file(four)
 
         self.assertEquals(newer_pairwise([one, two], [three, four]),
-                          ([two],[four]))
+                          ([one],[three]))
 
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
@@ -65,32 +52,24 @@ def test_newer_group(self):
         one = os.path.join(sources, 'one')
         two = os.path.join(sources, 'two')
         three = os.path.join(sources, 'three')
-        target = os.path.join(tmpdir, 'target')
+        old_file = os.path.abspath(__file__)
 
-        # return true if 'target' is out-of-date with respect to any file
+        # return true if 'old_file' is out-of-date with respect to any file
         # listed in 'sources'.
-        self.write_file(target)
-        time.sleep(_ST_MIME_TIMER)
         self.write_file(one)
         self.write_file(two)
         self.write_file(three)
-        self.assertTrue(newer_group([one, two, three], target))
-
-        self.write_file(one)
-        self.write_file(three)
-        self.write_file(two)
-        time.sleep(0.1)
-        self.write_file(target)
-        self.assertFalse(newer_group([one, two, three], target))
+        self.assertTrue(newer_group([one, two, three], old_file))
+        self.assertFalse(newer_group([one, two, old_file], three))
 
         # missing handling
         os.remove(one)
-        self.assertRaises(OSError, newer_group, [one, two, three], target)
+        self.assertRaises(OSError, newer_group, [one, two, old_file], three)
 
-        self.assertFalse(newer_group([one, two, three], target,
+        self.assertFalse(newer_group([one, two, old_file], three,
                                      missing='ignore'))
 
-        self.assertTrue(newer_group([one, two, three], target,
+        self.assertTrue(newer_group([one, two, old_file], three,
                                     missing='newer'))
 
 

From 7177009424e0afa0dffb1d6de5dc46dab24165c6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 11 Dec 2009 00:26:33 +0100
Subject: [PATCH 2776/8469] avoid running
 test_get_script_header_jython_workaround undr some py3 environments fixes
 #103

--HG--
branch : distribute
extra : rebase_source : a1a3381e889db52b3c81301dbd521f7266e254b8
---
 CHANGES.txt                        | 2 ++
 setuptools/tests/test_resources.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 34fb5d488a..5592fd6a5d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,8 @@ CHANGES
 * Issue 101: Allowing ``os.devnull`` in Sandbox
 * Issue 92: Fixed the "no eggs" found error with MacPort
   (platform.mac_ver() fails)
+* Issue 103: test_get_script_header_jython_workaround not run
+  anymore under py3 with C or POSIX local. Contributed by Arfrever.
 
 -----
 0.6.8
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index d805d02a75..5cb1baf004 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -533,6 +533,10 @@ def test_get_script_header(self):
                              '#!%s -x\n' % self.non_ascii_exe)
 
     def test_get_script_header_jython_workaround(self):
+        # This test doesn't work with Python 3 in some locales
+        if (sys.version_info >= (3,) and os.environ.get("LC_CTYPE")
+            in (None, "C", "POSIX")):
+            return
         platform = sys.platform
         sys.platform = 'java1.5.0_13'
         stdout = sys.stdout

From ce6ac29bfa586e8646853b3f58e0c8c8e6891629 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 11 Dec 2009 00:32:55 +0100
Subject: [PATCH 2777/8469] Remove an unecessary assertion fixes #104

--HG--
branch : distribute
extra : rebase_source : e0a1a2a18085d418b039852b57b5adf6cc19017f
---
 CHANGES.txt         | 2 ++
 distribute_setup.py | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5592fd6a5d..13baf75ed6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,8 @@ CHANGES
   (platform.mac_ver() fails)
 * Issue 103: test_get_script_header_jython_workaround not run
   anymore under py3 with C or POSIX local. Contributed by Arfrever.
+* Issue 104: remvoved the assertion when the installation fails,
+  with a nicer message for the end user.
 
 -----
 0.6.8
diff --git a/distribute_setup.py b/distribute_setup.py
index 94789e7e27..7fd3b4d87f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -81,7 +81,9 @@ def _install(tarball):
 
         # installing
         log.warn('Installing Distribute')
-        assert _python_cmd('setup.py', 'install')
+        if not _python_cmd('setup.py', 'install'):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
     finally:
         os.chdir(old_wd)
 

From fa3779fa3ec3d90437043321477c34d496dde38a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Fri, 11 Dec 2009 01:10:45 +0100
Subject: [PATCH 2778/8469] avoid sandbox violations on installation fixes #100

--HG--
branch : distribute
extra : rebase_source : 30a4c67f59ad25edf59133af2986191265811635
---
 CHANGES.txt         |  2 ++
 distribute_setup.py | 34 ++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 13baf75ed6..e317e90955 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,8 @@ CHANGES
   anymore under py3 with C or POSIX local. Contributed by Arfrever.
 * Issue 104: remvoved the assertion when the installation fails,
   with a nicer message for the end user.
+* Issue 100: making sure there's no SandboxViolation when
+  the setup script patches setuptools.
 
 -----
 0.6.8
diff --git a/distribute_setup.py b/distribute_setup.py
index 7fd3b4d87f..fac916e60b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -224,22 +224,34 @@ def _patch_file(path, content):
 def _same_content(path, content):
     return open(path).read() == content
 
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            def violation(*args):
+                pass
+            DirectorySandbox._old = DirectorySandbox._violation
+            DirectorySandbox._violation = violation
+            patched = True
+        except ImportError:
+            patched = False
 
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+@_no_sandbox
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s', path, new_name)
-    try:
-        from setuptools.sandbox import DirectorySandbox
-        def _violation(*args):
-            pass
-        DirectorySandbox._violation = _violation
-    except ImportError:
-        pass
-
     os.rename(path, new_name)
     return new_name
 
-
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s', placeholder)
@@ -279,6 +291,7 @@ def _after_install(dist):
     placeholder = dist.get_command_obj('install').install_purelib
     _create_fake_setuptools_pkg_info(placeholder)
 
+@_no_sandbox
 def _create_fake_setuptools_pkg_info(placeholder):
     if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
@@ -290,12 +303,14 @@ def _create_fake_setuptools_pkg_info(placeholder):
     if os.path.exists(pkg_info):
         log.warn('%s already exists', pkg_info)
         return
+
     log.warn('Creating %s', pkg_info)
     f = open(pkg_info, 'w')
     try:
         f.write(SETUPTOOLS_PKG_INFO)
     finally:
         f.close()
+
     pth_file = os.path.join(placeholder, 'setuptools.pth')
     log.warn('Creating %s', pth_file)
     f = open(pth_file, 'w')
@@ -304,7 +319,6 @@ def _create_fake_setuptools_pkg_info(placeholder):
     finally:
         f.close()
 
-
 def _patch_egg_dir(path):
     # let's check if it's already patched
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')

From 6b4b0719df27f67524124ea1ef1b30d16131c8e2 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:04:11 +0100
Subject: [PATCH 2779/8469] Avoid shadowing the package fixes #80

--HG--
branch : distribute
extra : rebase_source : 1cdd34df8c993d532101e25f6c1d3f5fb164817c
---
 setuptools/command/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index d608871e08..152406b332 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -5,7 +5,7 @@
     'register', 'bdist_wininst', 'upload_docs',
 ]
 
-from setuptools.command.install_scripts import install_scripts
+from setuptools.command import install_scripts
 import sys
 
 if sys.version>='2.5':

From 3a805e9752277f2e27f1c4c4fbcdc0909d979216 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:06:05 +0100
Subject: [PATCH 2780/8469] removed trailing space

--HG--
branch : distribute
extra : rebase_source : 756e9dee7562e288a3fb6f69cd221ad47e70f25d
---
 docs/index.txt   | 4 ++--
 docs/roadmap.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 1d3cb25e29..3dc0b0d696 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -3,10 +3,10 @@ Welcome to Distribute's documentation!
 
 `Distribute` is a fork of the `Setuptools` project.
 
-Distribute is intended to replace Setuptools as the standard method for 
+Distribute is intended to replace Setuptools as the standard method for
 working with Python module distributions.
 
-For those who may wonder why they should switch to Distribute over Setuptools, it’s quite simple: 
+For those who may wonder why they should switch to Distribute over Setuptools, it’s quite simple:
 
 - Distribute is a drop-in replacement for Setuptools
 - The code is actively maintained, and has over 10 commiters
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index fcd5518578..ea5070eaaf 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -4,7 +4,7 @@ Roadmap
 
 Distribute has two branches:
 
-- 0.6.x : provides a Setuptools-0.6c9 compatible version
+- 0.6.x : provides a Setuptools-0.6cX compatible version
 - 0.7.x : will provide a refactoring
 
 0.6.x
@@ -69,7 +69,7 @@ we've done a lot already)
    reorganized in clean, pep-8 modules. This package will
    only contain the query APIs and will focus on being PEP 376
    compatible. We will promote its usage and see if Pip wants
-   to use it as a basis. 
+   to use it as a basis.
    It will probably shrink a lot though, once the stdlib provides PEP 376 support.
 
  - distribute.entrypoints: that's the old pkg_resources entry points

From 9a36d7f1895e6ad1cd6ae055bdf64165d0b94e17 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:09:11 +0100
Subject: [PATCH 2781/8469] added Arfrever to contributors (bug fixes)

--HG--
branch : distribute
extra : rebase_source : 20c9b929a78c99f4fb1304a6fff9d70e17d76d56
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8eb0aebc90..bc2b3fe73a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -4,6 +4,7 @@ Contributors
 
 * Alex Grönholm
 * Alice Bevan-McGregor
+* Arfrever Frehtes Taifersar Arahesis
 * Daniel Stutzbach
 * Hanno Schlichting
 * Jannis Leidel

From 4eb8f94b29a2ac19c422c755466fe56fbaf073a6 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:12:10 +0100
Subject: [PATCH 2782/8469] changed the way the html is created

--HG--
branch : distribute
extra : rebase_source : 01c8d422fcecde15adbbdebfe15d336c83dcc599
---
 distribute.egg-info/entry_points.txt | 2 +-
 release.sh                           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index e1f704d8cb..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/release.sh b/release.sh
index 91d7ccb635..9ee85e6f24 100755
--- a/release.sh
+++ b/release.sh
@@ -10,7 +10,10 @@ rm -rf ./dist
 
 # now preparing the source release, pushing it and its doc
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
-python2.6 setup.py build_sphinx upload_docs
+cd docs/
+make html
+cd ..
+python2.6 setup.py upload_docs
 
 # pushing the bootstrap script
 scp distribute_setup.py ziade.org:nightly/build/

From c0e0ad5b6e1df8a56d994d1033fd196ce2bfabac Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:12:38 +0100
Subject: [PATCH 2783/8469] Added tag 0.6.9 for changeset 669ed9388b17

--HG--
branch : distribute
extra : rebase_source : 27ee72911516a50b2b57c72d9dae929135e69ee6
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a02ce84ca1..0f2f7d3dfe 100644
--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@ e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
 f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
 71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7
 445547a5729ed5517cf1a9baad595420a8831ef8 0.6.8
+669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9

From 4881ed310bd6d0c5fc361e882325c47dec7b8b3a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:16:12 +0100
Subject: [PATCH 2784/8469] fixed Rest :/

--HG--
branch : distribute
extra : rebase_source : 63f5b734530917bd660799cbc567b3bec48bb5be
---
 README.txt | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/README.txt b/README.txt
index 8ec73116d8..cbca70f0c5 100755
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ The fork has two goals:
   the same as for Python 2 code, but Distribute also helps you to support
   Python 2 and Python 3 from the same source code by letting you run 2to3
   on the code as a part of the build process, by setting the keyword parameter
-  ``use_2to3`` to True. See http://packages.python.org/distribute for more 
+  ``use_2to3`` to True. See http://packages.python.org/distribute for more
   information.
 
 - Refactoring the code, and releasing it in several distributions.
@@ -45,7 +45,7 @@ More documentation
 ==================
 
 You can get more information in the Sphinx-based documentation, located
-at http://packages.python.org/distribute. This documentation includes the old 
+at http://packages.python.org/distribute. This documentation includes the old
 Setuptools documentation that is slowly replaced, and brand new content.
 
 About the installation process
@@ -117,7 +117,7 @@ Uninstallation Instructions
 ---------------------------
 
 Like other distutils-based distributions, Distribute doesn't provide an
-uninstaller yet. It's all done manually! We are all waiting for PEP 376 
+uninstaller yet. It's all done manually! We are all waiting for PEP 376
 support in Python.
 
 Distribute is installed in three steps:
@@ -150,36 +150,30 @@ Quick help for developers
 -------------------------
 
 To create an egg which is compatible with Distribute, use the same
-practice as with Setuptools, e.g.:
+practice as with Setuptools, e.g.::
 
-{{{
-from setuptools import setup
+    from setuptools import setup
 
-setup(...
-)
-}}}
+    setup(...
+    )
 
 To use `pkg_resources` to access data files in the egg, you should
-require the Setuptools distribution explicitly:
+require the Setuptools distribution explicitly::
 
-{{{
-from setuptools import setup
+    from setuptools import setup
 
-setup(...
-     install_requires=['setuptools']
-)
-}}}
+    setup(...
+        install_requires=['setuptools']
+    )
 
 Only if you need Distribute-specific functionality should you depend
-on it explicitly. In this case, replace the Setuptools dependency:
+on it explicitly. In this case, replace the Setuptools dependency::
 
-{{{
-from setuptools import setup
+    from setuptools import setup
 
-setup(...
-     install_requires=['distribute']
-)
-}}}
+    setup(...
+        install_requires=['distribute']
+    )
 
 -----------
 Install FAQ
@@ -208,7 +202,7 @@ Install FAQ
   and if the virtualenv you are in was generated without the `--no-site-packages`
   option, the Distribute installation will stop.
 
-  You need in this case to build a virtualenv with the `--no-site-packages` 
+  You need in this case to build a virtualenv with the `--no-site-packages`
   option or to install `Distribute` globally.
 
 - **How does Distribute interacts with zc.buildout?**

From 09456cafdbed30c72b00ed5e32e61cc710bf2c5d Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:16:24 +0100
Subject: [PATCH 2785/8469] Added tag 0.6.9 for changeset ac7d9b14ac43

--HG--
branch : distribute
extra : rebase_source : b2c4d297d367d8230b54e0067e7e8c6cdda8c68e
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 0f2f7d3dfe..4b085ed85b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -8,3 +8,5 @@ f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
 71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7
 445547a5729ed5517cf1a9baad595420a8831ef8 0.6.8
 669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
+669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
+ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9

From e651ea7e2583bf40f129a4d1b82a93d0de60c291 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:19:56 +0100
Subject: [PATCH 2786/8469] starting 0.6.10 development

--HG--
branch : distribute
extra : rebase_source : 47ee1886e326219ded82d6d9fc8412bdec62e03d
---
 README.txt   | 6 +++---
 docs/conf.py | 2 +-
 release.sh   | 2 +-
 setup.py     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.txt b/README.txt
index cbca70f0c5..7cebd96211 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.9.tar.gz
-    $ tar -xzvf distribute-0.6.9.tar.gz
-    $ cd distribute-0.6.9
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.10.tar.gz
+    $ tar -xzvf distribute-0.6.10.tar.gz
+    $ cd distribute-0.6.10
     $ python setup.py install
 
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 74435672b5..79ada8cb37 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.9'
+version = '0.6.10'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index 9ee85e6f24..cebdc2216e 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.9"
+export VERSION="0.6.10"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index f0457b466c..b917abfdb0 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.9"
+VERSION = "0.6.10"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 14a94e3f8ca9cee5d74253689baf0cefc03b767f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 13:41:36 +0100
Subject: [PATCH 2787/8469] added Idan credits

--HG--
branch : distribute
extra : rebase_source : ec3f6e58099421a08d4ebbbc1719386e5d28a9ce
---
 docs/index.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.txt b/docs/index.txt
index 3dc0b0d696..b3cbcb5e66 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -14,6 +14,8 @@ For those who may wonder why they should switch to Distribute over Setuptools, i
 
 .. image:: http://python-distribute.org/pip_distribute.png
 
+Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0
+
 
 Documentation content:
 

From e07754742050fe498d758fca8578da9babbc483a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:02:19 +0100
Subject: [PATCH 2788/8469] fixed the error message used in
 DistributionNotFound, otherwise it breaks zc.buildout

--HG--
branch : distribute
extra : rebase_source : fbcd6099522983770243735997694c3da40cd59f
---
 pkg_resources.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9f1baca404..3660a2a5bb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -537,9 +537,13 @@ def resolve(self, requirements, env=None, installer=None, replacement=True):
                         env = Environment(self.entries)
                     dist = best[req.key] = env.best_match(req, self, installer)
                     if dist is None:
-                        msg = ("The '%s' distribution was not found on this "
-                               "system, and is required by this application.")
-                        raise DistributionNotFound(msg % req)
+                        #msg = ("The '%s' distribution was not found on this "
+                        #       "system, and is required by this application.")
+                        #raise DistributionNotFound(msg % req)
+
+                        # unfortunately, zc.buildout uses a str(err)
+                        # to get the name of the distribution here..
+                        raise DistributionNotFound(req)
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency

From 99c9080351231b678f3daff856ebf5604da82bcd Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:13:39 +0100
Subject: [PATCH 2789/8469] added a not about the fix

--HG--
branch : distribute
extra : rebase_source : 168554aaf8761e070e453562665cd02a09dd3a54
---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e317e90955..b452dccce7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+------
+0.6.10
+------
+
+* Reverted change made for the DistributionNotFound exception because
+  zc.buildout uses the exception message to get the name of the
+  distribution.
+
 -----
 0.6.9
 -----

From a9694bf0462f460f4b7c59cebc7d7b23fae28487 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:14:03 +0100
Subject: [PATCH 2790/8469] Added tag 0.6.10 for changeset 0fd5c5060378

--HG--
branch : distribute
extra : rebase_source : a71db1ff8133fab6555b328b7ccf5122fa8a3ca3
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4b085ed85b..1c81efc040 100644
--- a/.hgtags
+++ b/.hgtags
@@ -10,3 +10,4 @@ f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
 669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
 669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
 ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
+0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10

From a5b407d7b04286168ffceb4c9f9d21bf0dffa41f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:17:59 +0100
Subject: [PATCH 2791/8469] fixed version in distribute_setup

--HG--
branch : distribute
extra : rebase_source : ae8e8ec713df64d370cfc30468775a287d641d50
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index fac916e60b..002133624d 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.9"
+DEFAULT_VERSION = "0.6.10"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 

From d11b2c01fbba4e2b51bf78ac11beace7dcab7103 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:19:56 +0100
Subject: [PATCH 2792/8469] Added tag 0.6.10 for changeset f18396c6e187

--HG--
branch : distribute
extra : rebase_source : f46b380e30f9edf170dccc5a2cdaebe0fad2ae8a
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 1c81efc040..c904a24ae2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -11,3 +11,5 @@ f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
 669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
 ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
 0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
+0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
+f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10

From 93b983e6f2302007cedbf44bcf0b944415c05361 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 12 Dec 2009 15:22:47 +0100
Subject: [PATCH 2793/8469] starting 0.6.11

--HG--
branch : distribute
extra : rebase_source : e69bd36f08c0407a0e818e67e5a5b7d633182a57
---
 CHANGES.txt         | 6 ++++++
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b452dccce7..6623b44db0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.11
+------
+
+
+
 ------
 0.6.10
 ------
diff --git a/README.txt b/README.txt
index 7cebd96211..8e78bc885c 100755
--- a/README.txt
+++ b/README.txt
@@ -107,9 +107,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.10.tar.gz
-    $ tar -xzvf distribute-0.6.10.tar.gz
-    $ cd distribute-0.6.10
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.11.tar.gz
+    $ tar -xzvf distribute-0.6.11.tar.gz
+    $ cd distribute-0.6.11
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 002133624d..844fd80f34 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.10"
+DEFAULT_VERSION = "0.6.11"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 79ada8cb37..c9f8fef734 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.10'
+version = '0.6.11'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index cebdc2216e..cdcba01f81 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.10"
+export VERSION="0.6.11"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index b917abfdb0..b8612b5cd9 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.10"
+VERSION = "0.6.11"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 4570438396d4ee5fe1255b39e2e6070b2e69a424 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 13 Dec 2009 12:50:37 +0100
Subject: [PATCH 2794/8469] Updated docs theme for higher readability

--HG--
branch : distribute
extra : rebase_source : ae453d7b4b32d8823d57ebe411eaf53e050ad9dd
---
 docs/_theme/nature/static/nature.css_t | 119 +++++++++++++------------
 docs/conf.py                           |   7 +-
 docs/index.txt                         |   8 --
 3 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/docs/_theme/nature/static/nature.css_t b/docs/_theme/nature/static/nature.css_t
index a29848e157..1a654264d1 100644
--- a/docs/_theme/nature/static/nature.css_t
+++ b/docs/_theme/nature/static/nature.css_t
@@ -10,8 +10,8 @@
 body {
     font-family: Arial, sans-serif;
     font-size: 100%;
-    background-color: #111;
-    color: #555;
+    background-color: #111111;
+    color: #555555;
     margin: 0;
     padding: 0;
 }
@@ -30,14 +30,14 @@ hr{
 }
  
 div.document {
-    background-color: #eee;
+    background-color: #fafafa;
 }
  
 div.body {
     background-color: #ffffff;
     color: #3E4349;
-    padding: 0 30px 30px 30px;
-    font-size: 0.8em;
+    padding: 1em 30px 30px 30px;
+    font-size: 0.9em;
 }
  
 div.footer {
@@ -49,26 +49,29 @@ div.footer {
 }
  
 div.footer a {
-    color: #444;
-    text-decoration: underline;
+    color: #444444;
 }
  
 div.related {
     background-color: #6BA81E;
-    line-height: 32px;
-    color: #fff;
-    text-shadow: 0px 1px 0 #444;
-    font-size: 0.80em;
+    line-height: 36px;
+    color: #ffffff;
+    text-shadow: 0px 1px 0 #444444;
+    font-size: 1.1em;
 }
  
 div.related a {
     color: #E2F3CC;
 }
- 
+
+div.related .right {
+    font-size: 0.9em;
+}
+
 div.sphinxsidebar {
-    font-size: 0.75em;
+    font-size: 0.9em;
     line-height: 1.5em;
-    width: 300px
+    width: 300px;
 }
 
 div.sphinxsidebarwrapper{
@@ -78,27 +81,22 @@ div.sphinxsidebarwrapper{
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     font-family: Arial, sans-serif;
-    color: #222;
+    color: #222222;
     font-size: 1.2em;
-    font-weight: normal;
+    font-weight: bold;
     margin: 0;
     padding: 5px 10px;
-    background-color: #ddd;
     text-shadow: 1px 1px 0 white
 }
 
-div.sphinxsidebar h4{
-    font-size: 1.1em;
-}
- 
 div.sphinxsidebar h3 a {
-    color: #444;
+    color: #444444;
 }
- 
- 
+
 div.sphinxsidebar p {
-    color: #888;
+    color: #888888;
     padding: 5px 20px;
+    margin: 0.5em 0px;
 }
  
 div.sphinxsidebar p.topless {
@@ -107,17 +105,22 @@ div.sphinxsidebar p.topless {
 div.sphinxsidebar ul {
     margin: 10px 10px 10px 20px;
     padding: 0;
-    color: #000;
+    color: #000000;
 }
  
 div.sphinxsidebar a {
-    color: #444;
+    color: #444444;
 }
- 
+
+div.sphinxsidebar a:hover {
+    color: #E32E00;
+}
+
 div.sphinxsidebar input {
-    border: 1px solid #ccc;
+    border: 1px solid #cccccc;
     font-family: sans-serif;
-    font-size: 1em;
+    font-size: 1.1em;
+    padding: 0.15em 0.3em;
 }
 
 div.sphinxsidebar input[type=text]{
@@ -133,7 +136,6 @@ a {
  
 a:hover {
     color: #E32E00;
-    text-decoration: underline;
 }
  
 div.body h1,
@@ -143,20 +145,20 @@ div.body h4,
 div.body h5,
 div.body h6 {
     font-family: Arial, sans-serif;
-    background-color: #BED4EB;
     font-weight: normal;
     color: #212224;
     margin: 30px 0px 10px 0px;
-    padding: 5px 0 5px 10px;
-    text-shadow: 0px 1px 0 white
+    padding: 5px 0 5px 0px;
+    text-shadow: 0px 1px 0 white;
+    border-bottom: 1px solid #C8D5E3;
 }
  
-div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 150%; background-color: #C8D5E3; }
-div.body h3 { font-size: 120%; background-color: #D8DEE3; }
-div.body h4 { font-size: 110%; background-color: #D8DEE3; }
-div.body h5 { font-size: 100%; background-color: #D8DEE3; }
-div.body h6 { font-size: 100%; background-color: #D8DEE3; }
+div.body h1 { margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 150%; }
+div.body h3 { font-size: 120%; }
+div.body h4 { font-size: 110%; }
+div.body h5 { font-size: 100%; }
+div.body h6 { font-size: 100%; }
  
 a.headerlink {
     color: #c60f0f;
@@ -171,7 +173,7 @@ a.headerlink:hover {
 }
  
 div.body p, div.body dd, div.body li {
-    line-height: 1.5em;
+    line-height: 1.8em;
 }
  
 div.admonition p.admonition-title + p {
@@ -183,22 +185,23 @@ div.highlight{
 }
 
 div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
+    background-color: #eeeeee;
+    border: 1px solid #cccccc;
 }
  
 div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
+    background-color: #ffffcc;
+    border: 1px solid #ffff66;
 }
  
 div.topic {
-    background-color: #eee;
+    background-color: #fafafa;
+    border-width: 0;
 }
  
 div.warning {
     background-color: #ffe4e4;
-    border: 1px solid #f66;
+    border: 1px solid #ff6666;
 }
  
 p.admonition-title {
@@ -211,20 +214,24 @@ p.admonition-title:after {
  
 pre {
     padding: 10px;
-    background-color: White;
-    color: #222;
-    line-height: 1.2em;
-    border: 1px solid #C6C9CB;
-    font-size: 1.2em;
+    background-color: #fafafa;
+    color: #222222;
+    line-height: 1.5em;
+    font-size: 1.1em;
     margin: 1.5em 0 1.5em 0;
-    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
-    -moz-box-shadow: 1px 1px 1px #d8d8d8;
+    -webkit-box-shadow: 0px 0px 4px #d8d8d8;
+    -moz-box-shadow: 0px 0px 4px #d8d8d8;
+    box-shadow: 0px 0px 4px #d8d8d8;
 }
  
 tt {
-    background-color: #ecf0f3;
-    color: #222;
+    color: #222222;
     padding: 1px 2px;
     font-size: 1.2em;
     font-family: monospace;
 }
+
+#table-of-contents ul {
+    padding-left: 2em;
+}
+
diff --git a/docs/conf.py b/docs/conf.py
index c9f8fef734..3991c73c5e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -131,21 +131,20 @@
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {'index': 'indexsidebar.html'}
 
-
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 #html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_use_modindex = True
+html_use_modindex = False
 
 # If false, no index is generated.
-#html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False
diff --git a/docs/index.txt b/docs/index.txt
index b3cbcb5e66..2bfe85c372 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -28,11 +28,3 @@ Documentation content:
    setuptools
    easy_install
    pkg_resources
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-

From 0b112ddd5ee08e11850e4a00a4a691865f5dc438 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 13 Dec 2009 16:58:53 +0100
Subject: [PATCH 2795/8469] Moved documentation toc on index page above the
 propaganda

--HG--
branch : distribute
extra : rebase_source : 2afb4de1e6fef8d488aa6c476795b1878fac744d
---
 docs/index.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 2bfe85c372..fa87ac36b1 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -12,11 +12,6 @@ For those who may wonder why they should switch to Distribute over Setuptools, i
 - The code is actively maintained, and has over 10 commiters
 - Distribute offers Python 3 support !
 
-.. image:: http://python-distribute.org/pip_distribute.png
-
-Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0
-
-
 Documentation content:
 
 .. toctree::
@@ -28,3 +23,8 @@ Documentation content:
    setuptools
    easy_install
    pkg_resources
+
+
+.. image:: http://python-distribute.org/pip_distribute.png
+
+Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0

From 6f9d7dc8cb5b3bd62bfc305d43342b9f8c82b7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 15 Dec 2009 06:29:19 +0000
Subject: [PATCH 2796/8469] cleaned up the module (PEP 8 + old fashion test
 removal)

---
 command/install_data.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/command/install_data.py b/command/install_data.py
index ec78ce3431..ab40797b98 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -8,7 +8,6 @@
 __revision__ = "$Id$"
 
 import os
-from types import StringType
 from distutils.core import Command
 from distutils.util import change_root, convert_path
 
@@ -35,7 +34,7 @@ def initialize_options(self):
         self.data_files = self.distribution.data_files
         self.warn_dir = 1
 
-    def finalize_options (self):
+    def finalize_options(self):
         self.set_undefined_options('install',
                                    ('install_data', 'install_dir'),
                                    ('root', 'root'),
@@ -45,7 +44,7 @@ def finalize_options (self):
     def run(self):
         self.mkpath(self.install_dir)
         for f in self.data_files:
-            if type(f) is StringType:
+            if isinstance(f, str):
                 # it's a simple file, so copy it
                 f = convert_path(f)
                 if self.warn_dir:

From a229fc6986028f2d830cdd3223bb2c459dfe8b7f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 19 Dec 2009 21:51:03 +0100
Subject: [PATCH 2797/8469] fixed another sandbox viloation issue

--HG--
branch : distribute
extra : rebase_source : 9f4bc3640cd4f76834682b567ce4c7e7a14e59f7
---
 CHANGES.txt         |  1 +
 distribute_setup.py | 48 ++++++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6623b44db0..11498ab42a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.11
 ------
 
+* Found another case of SandboxViolation - fixed
 
 
 ------
diff --git a/distribute_setup.py b/distribute_setup.py
index 844fd80f34..3c23affa59 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -203,7 +203,31 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                 dst.close()
     return os.path.realpath(saveto)
 
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
 
+    return __no_sandbox
+
+@_no_sandbox
 def _patch_file(path, content):
     """Will backup the file then patch it"""
     existing_content = open(path).read()
@@ -224,34 +248,13 @@ def _patch_file(path, content):
 def _same_content(path, content):
     return open(path).read() == content
 
-def _no_sandbox(function):
-    def __no_sandbox(*args, **kw):
-        try:
-            from setuptools.sandbox import DirectorySandbox
-            def violation(*args):
-                pass
-            DirectorySandbox._old = DirectorySandbox._violation
-            DirectorySandbox._violation = violation
-            patched = True
-        except ImportError:
-            patched = False
-
-        try:
-            return function(*args, **kw)
-        finally:
-            if patched:
-                DirectorySandbox._violation = DirectorySandbox._old
-                del DirectorySandbox._old
-
-    return __no_sandbox
-
-@_no_sandbox
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s', path, new_name)
     os.rename(path, new_name)
     return new_name
 
+@_no_sandbox
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s', placeholder)
@@ -319,6 +322,7 @@ def _create_fake_setuptools_pkg_info(placeholder):
     finally:
         f.close()
 
+@_no_sandbox
 def _patch_egg_dir(path):
     # let's check if it's already patched
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')

From b3423443dc7a7b2d524c76959d6dd67013e2165c Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 19 Dec 2009 22:30:13 +0100
Subject: [PATCH 2798/8469] Introduced a socket timeout of 15 seconds on url
 openings fixes #48

--HG--
branch : distribute
extra : rebase_source : d4e3831771aa049e71d64f22e315352fa8906dd1
---
 CHANGES.txt                 |  2 +-
 setuptools/package_index.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 11498ab42a..14ce673427 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ------
 
 * Found another case of SandboxViolation - fixed
-
+* Issue 48: Introduced a socket timeout of 15 seconds on url openings
 
 ------
 0.6.10
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ee980214cf..924c15e174 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -25,6 +25,8 @@
     'interpret_distro_name',
 ]
 
+_SOCKET_TIMEOUT = 15
+
 def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
@@ -717,6 +719,17 @@ def htmldecode(text):
 
 
 
+def socket_timeout(timeout=15):
+    def _socket_timeout(func):
+        def _socket_timeout(*args, **kwargs):
+            old_timeout = socket.getdefaulttimeout()
+            socket.setdefaulttimeout(timeout)
+            try:
+                return func(*args, **kwargs)
+            finally:
+                socket.setdefaulttimeout(old_timeout)
+        return _socket_timeout
+    return _socket_timeout
 
 
 def open_with_auth(url):
@@ -749,6 +762,8 @@ def open_with_auth(url):
 
     return fp
 
+# adding a timeout to avoid freezing package_index
+open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
 
 
 

From 807501891521f68f9e3f273afd2a0c896c4bc0ec Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sat, 19 Dec 2009 22:39:38 +0100
Subject: [PATCH 2799/8469] this also fixes #15

--HG--
branch : distribute
extra : rebase_source : 3153bd3b76d9d2a40f6f1d0cfcef97924b646721
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 14ce673427..fc7e019749 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ------
 
 * Found another case of SandboxViolation - fixed
-* Issue 48: Introduced a socket timeout of 15 seconds on url openings
+* Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
 
 ------
 0.6.10

From deb90e5287e5aedc705d9dd0aea8e7f163b9d484 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 20 Dec 2009 12:39:48 +0100
Subject: [PATCH 2800/8469] added manual functional tests for checking a
 release

--HG--
branch : distribute
extra : rebase_source : d7bc6ba1843217a020be419a8f3ed562e5ff4a3f
---
 tests/manual_test.py | 79 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 tests/manual_test.py

diff --git a/tests/manual_test.py b/tests/manual_test.py
new file mode 100644
index 0000000000..1bafb0d9da
--- /dev/null
+++ b/tests/manual_test.py
@@ -0,0 +1,79 @@
+#!/bin/python
+import os
+import shutil
+import tempfile
+import urllib2
+import subprocess
+import sys
+
+def tempdir(func):
+    def _tempdir(*args, **kwargs):
+        test_dir = tempfile.mkdtemp()
+        old_dir = os.getcwd()
+        os.chdir(test_dir)
+        try:
+            return func(*args, **kwargs)
+        finally:
+            os.chdir(old_dir)
+            shutil.rmtree(test_dir)
+    return _tempdir
+
+SIMPLE_BUILDOUT = """\
+[buildout]
+
+parts = eggs
+
+[eggs]
+recipe = zc.recipe.egg
+
+eggs =
+    extensions
+"""
+
+BOOTSTRAP = 'http://python-distribute.org/bootstrap.py'
+PYVER = sys.version.split()[0][:3]
+
+@tempdir
+def test_virtualenv():
+    """virtualenv with distribute"""
+    os.system('virtualenv --no-site-packages . --distribute')
+    os.system('bin/easy_install -q distribute==dev')
+    # linux specific
+    site_pkg = os.listdir(os.path.join('.', 'lib', 'python'+PYVER, 'site-packages'))
+    site_pkg.sort()
+    assert 'distribute' in site_pkg[0]
+    easy_install = os.path.join('.', 'lib', 'python'+PYVER, 'site-packages',
+                                'easy-install.pth')
+    with open(easy_install) as f:
+        res = f.read()
+    assert 'distribute' in res
+    assert 'setuptools' not in res
+
+@tempdir
+def test_full():
+    """virtualenv + pip + buildout"""
+    os.system('virtualenv --no-site-packages .')
+    os.system('bin/easy_install -q distribute==dev')
+    os.system('bin/easy_install -qU distribute==dev')
+    os.system('bin/easy_install -q pip')
+    os.system('bin/pip install -q zc.buildout')
+    with open('buildout.cfg', 'w') as f:
+        f.write(SIMPLE_BUILDOUT)
+
+    with open('bootstrap.py', 'w') as f:
+        f.write(urllib2.urlopen(BOOTSTRAP).read())
+
+    os.system('bin/python bootstrap.py --distribute')
+    os.system('bin/buildout -q')
+    eggs = os.listdir('eggs')
+    eggs.sort()
+    assert len(eggs) == 3
+    assert eggs[0].startswith('distribute')
+    assert eggs[1:] == ['extensions-0.3-py2.6.egg',
+                    'zc.recipe.egg-1.2.2-py2.6.egg']
+
+
+if __name__ == '__main__':
+    test_virtualenv()
+
+

From 460a146b382827dd77f77a86d1daa524ab5e0345 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 20 Dec 2009 13:58:23 +0100
Subject: [PATCH 2801/8469] added test_full to main

--HG--
branch : distribute
extra : rebase_source : d343619c60e76ece8c5e95d6aed1d8b48a4ea208
---
 tests/manual_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 1bafb0d9da..1d2edc2a0e 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -75,5 +75,5 @@ def test_full():
 
 if __name__ == '__main__':
     test_virtualenv()
-
+    test_full()
 

From 4dae8e432648fc0d4dcfcaa117b4e60031504596 Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 20 Dec 2009 15:05:15 +0200
Subject: [PATCH 2802/8469] Changed interpreter line to the recommended form

--HG--
branch : distribute
extra : rebase_source : bdef264a6d5109ec5433a8080cd03f3589992984
---
 tests/manual_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 1d2edc2a0e..ad6b2b9be6 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/env python
 import os
 import shutil
 import tempfile

From e197e57da318f00d84b559ccfa16fd0d1581441d Mon Sep 17 00:00:00 2001
From: agronholm <none@none>
Date: Sun, 20 Dec 2009 15:09:32 +0200
Subject: [PATCH 2803/8469] Modified test script to be py3k compatible

--HG--
branch : distribute
extra : rebase_source : d29c168646125155f3664cec0b88686ac14fbb22
---
 tests/manual_test.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index ad6b2b9be6..ce8d10f2a0 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -2,10 +2,14 @@
 import os
 import shutil
 import tempfile
-import urllib2
 import subprocess
 import sys
 
+if sys.version_info[0] < 3:
+    from urllib2 import urlopen
+else:
+    from urllib.request import urlopen
+
 def tempdir(func):
     def _tempdir(*args, **kwargs):
         test_dir = tempfile.mkdtemp()
@@ -61,7 +65,7 @@ def test_full():
         f.write(SIMPLE_BUILDOUT)
 
     with open('bootstrap.py', 'w') as f:
-        f.write(urllib2.urlopen(BOOTSTRAP).read())
+        f.write(urlopen(BOOTSTRAP).read())
 
     os.system('bin/python bootstrap.py --distribute')
     os.system('bin/buildout -q')

From 6d2d1caa21a5224fec7eee1678857c354f8f4e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 20 Dec 2009 23:23:34 +0000
Subject: [PATCH 2804/8469] Fixed #7552: fixed distutils.command.upload failure
 on very long passwords

---
 command/upload.py    |  6 +++---
 tests/test_upload.py | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 8114feb8f2..5d6ebcfa4c 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 import socket
 import platform
 from urllib2 import urlopen, Request, HTTPError
-import base64
+from base64 import standard_b64encode
 import urlparse
 import cStringIO as StringIO
 from ConfigParser import ConfigParser
@@ -129,8 +129,8 @@ def upload_file(self, command, pyversion, filename):
                                      open(filename+".asc").read())
 
         # set up the authentication
-        auth = "Basic " + base64.encodestring(self.username + ":" +
-                                              self.password).strip()
+        auth = "Basic " + standard_b64encode(self.username + ":" +
+                                             self.password)
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 0d95a0917e..8f6701cc9b 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -10,6 +10,25 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_LONG_PASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+
 PYPIRC_NOPASSWORD = """\
 [distutils]
 
@@ -85,7 +104,7 @@ def test_upload(self):
         self.write_file(path)
         command, pyversion, filename = 'xxx', '2.6', path
         dist_files = [(command, pyversion, filename)]
-        self.write_file(self.rc, PYPIRC)
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
         pkg_dir, dist = self.create_dist(dist_files=dist_files)
@@ -101,6 +120,8 @@ def test_upload(self):
         self.assertEquals(self.last_open.req.get_full_url(),
                           'http://pypi.python.org/pypi')
         self.assertTrue('xxx' in self.last_open.req.data)
+        auth = self.last_open.req.headers['Authorization']
+        self.assertFalse('\n' in auth)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 4de5e96120f3e583fc5d841220e6f9290c820014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 20 Dec 2009 23:54:52 +0000
Subject: [PATCH 2805/8469] Merged revisions 76952 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76952 | tarek.ziade | 2009-12-21 00:23:34 +0100 (Mon, 21 Dec 2009) | 1 line

  Fixed #7552: fixed distutils.command.upload failure on very long passwords
........
---
 command/upload.py    |  5 +--
 tests/support.py     | 21 +++++++++--
 tests/test_upload.py | 86 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 8805d41da0..9f1aae6aa4 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -11,7 +11,7 @@
 import socket
 import platform
 import httplib
-import base64
+from base64 import standard_b64encode
 import urlparse
 import cStringIO as StringIO
 from ConfigParser import ConfigParser
@@ -115,7 +115,8 @@ def upload_file(self, command, pyversion, filename):
                                      open(filename+".asc").read())
 
         # set up the authentication
-        auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
+        auth = "Basic " + standard_b64encode(self.username + ":" +
+                                             self.password)
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
diff --git a/tests/support.py b/tests/support.py
index d24a18ea0e..9d373e94e4 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,10 +1,10 @@
 """Support code for distutils test cases."""
-
+import os
 import shutil
 import tempfile
 
 from distutils import log
-
+from distutils.dist import Distribution
 
 class LoggingSilencer(object):
 
@@ -55,6 +55,23 @@ def write_file(self, path, content='xxx'):
         finally:
             f.close()
 
+    def create_dist(self, pkg_name='foo', **kw):
+        """Will generate a test environment.
+
+        This function creates:
+         - a Distribution instance using keywords
+         - a temporary directory with a package structure
+
+        It returns the package directory and the distribution
+        instance.
+        """
+        tmp_dir = self.mkdtemp()
+        pkg_dir = os.path.join(tmp_dir, pkg_name)
+        os.mkdir(pkg_dir)
+        dist = Distribution(attrs=kw)
+
+        return pkg_dir, dist
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index b05ab1f78b..322beb778c 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,6 +2,7 @@
 import sys
 import os
 import unittest
+import httplib
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
@@ -9,8 +10,66 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_LONG_PASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+class _Resp(object):
+    def __init__(self, status):
+        self.status = status
+        self.reason = 'OK'
+
+_CONNECTIONS = []
+
+class _FakeHTTPConnection(object):
+    def __init__(self, netloc):
+        self.requests = []
+        self.headers = {}
+        self.body = None
+        self.netloc = netloc
+        _CONNECTIONS.append(self)
+
+    def connect(self):
+        pass
+    endheaders = connect
+
+    def send(self, body):
+        self.body = body
+
+    def putrequest(self, type_, data):
+        self.requests.append((type_, data))
+
+    def putheader(self, name, value):
+        self.headers[name] = value
+
+    def getresponse(self):
+        return _Resp(200)
+
 class uploadTestCase(PyPIRCCommandTestCase):
 
+    def setUp(self):
+        super(uploadTestCase, self).setUp()
+        self.old_klass = httplib.HTTPConnection
+        httplib.HTTPConnection = _FakeHTTPConnection
+
+    def tearDown(self):
+        httplib.HTTPConnection = self.old_klass
+        super(uploadTestCase, self).tearDown()
+
     def test_finalize_options(self):
 
         # new format
@@ -27,6 +86,33 @@ def test_finalize_options(self):
             self.assertEquals(getattr(cmd, attr), waited)
 
 
+    def test_upload(self):
+        tmp = self.mkdtemp()
+        path = os.path.join(tmp, 'xxx')
+        self.write_file(path)
+        command, pyversion, filename = 'xxx', '2.6', path
+        dist_files = [(command, pyversion, filename)]
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
+
+        # lets run it
+        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        cmd = upload(dist)
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # what did we send ?
+        res = _CONNECTIONS[-1]
+
+        headers = res.headers
+        self.assertEquals(headers['Content-length'], '2086')
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
+
+        method, request = res.requests[-1]
+        self.assertEquals(method, 'POST')
+        self.assertEquals(res.netloc, 'pypi.python.org')
+        self.assertTrue('xxx' in res.body)
+        self.assertFalse('\n' in headers['Authorization'])
+
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
 

From 7553531b1974c77b2c51f9e22aaaa36eab115b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 00:02:20 +0000
Subject: [PATCH 2806/8469] Merged revisions 76952 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76952 | tarek.ziade | 2009-12-21 00:23:34 +0100 (Mon, 21 Dec 2009) | 1 line

  Fixed #7552: fixed distutils.command.upload failure on very long passwords
........
---
 command/upload.py    |  4 ++--
 tests/test_upload.py | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index defdda642b..674edd47c3 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -6,7 +6,7 @@
 import socket
 import platform
 from urllib.request import urlopen, Request, HTTPError
-import base64
+from base64 import standard_b64encode
 from urllib.parse import urlparse
 from hashlib import md5
 
@@ -130,7 +130,7 @@ def upload_file(self, command, pyversion, filename):
         user_pass = (self.username + ":" + self.password).encode('ascii')
         # The exact encoding of the authentication string is debated.
         # Anyway PyPI only accepts ascii for both username or password.
-        auth = "Basic " + base64.encodebytes(user_pass).strip().decode('ascii')
+        auth = "Basic " + standard_b64encode(user_pass).decode('ascii')
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 9281885876..979ab228dd 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -10,6 +10,25 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_LONG_PASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+
 PYPIRC_NOPASSWORD = """\
 [distutils]
 
@@ -85,7 +104,7 @@ def test_upload(self):
         self.write_file(path)
         command, pyversion, filename = 'xxx', '2.6', path
         dist_files = [(command, pyversion, filename)]
-        self.write_file(self.rc, PYPIRC)
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
         pkg_dir, dist = self.create_dist(dist_files=dist_files)
@@ -101,6 +120,8 @@ def test_upload(self):
         self.assertEquals(self.last_open.req.get_full_url(),
                           'http://pypi.python.org/pypi')
         self.assertTrue(b'xxx' in self.last_open.req.data)
+        auth = self.last_open.req.headers['Authorization']
+        self.assertFalse('\n' in auth)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 4a22e2d83c34290cda083fba276d73242d5a6983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 00:08:17 +0000
Subject: [PATCH 2807/8469] Merged revisions 76954 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76954 | tarek.ziade | 2009-12-21 01:02:20 +0100 (Mon, 21 Dec 2009) | 9 lines

  Merged revisions 76952 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76952 | tarek.ziade | 2009-12-21 00:23:34 +0100 (Mon, 21 Dec 2009) | 1 line

    Fixed #7552: fixed distutils.command.upload failure on very long passwords
  ........
................
---
 command/upload.py    |  4 ++--
 tests/test_upload.py | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 3b4a036718..f602fbeb68 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -12,7 +12,7 @@
 import platform
 import configparser
 import http.client as httpclient
-import base64
+from base64 import standard_b64encode
 import urllib.parse
 
 # this keeps compatibility for 2.3 and 2.4
@@ -127,7 +127,7 @@ def upload_file(self, command, pyversion, filename):
         user_pass = (self.username + ":" + self.password).encode('ascii')
         # The exact encoding of the authentication string is debated.
         # Anyway PyPI only accepts ascii for both username or password.
-        auth = "Basic " + base64.encodebytes(user_pass).strip().decode('ascii')
+        auth = "Basic " + standard_b64encode(user_pass).decode('ascii')
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 828f20c539..35e970051e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -10,6 +10,25 @@
 from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
+PYPIRC_LONG_PASSWORD = """\
+[distutils]
+
+index-servers =
+    server1
+    server2
+
+[server1]
+username:me
+password:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+[server2]
+username:meagain
+password: secret
+realm:acme
+repository:http://another.pypi/
+"""
+
+
 PYPIRC_NOPASSWORD = """\
 [distutils]
 
@@ -96,7 +115,7 @@ def test_upload(self):
         self.write_file(path)
         command, pyversion, filename = 'xxx', '2.6', path
         dist_files = [(command, pyversion, filename)]
-        self.write_file(self.rc, PYPIRC)
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
         pkg_dir, dist = self.create_dist(dist_files=dist_files)
@@ -108,6 +127,7 @@ def test_upload(self):
         headers = dict(self.conn.headers)
         self.assertEquals(headers['Content-length'], '2087')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertFalse('\n' in headers['Authorization'])
 
         self.assertEquals(self.conn.requests, [('POST', '/pypi')])
         self.assert_((b'xxx') in self.conn.body)

From 3bd7aa023d339ea64ec5b381f2bf4f832dd50232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 01:22:46 +0000
Subject: [PATCH 2808/8469] massive import cleaning in Distutils

---
 bcppcompiler.py          | 10 ++++------
 ccompiler.py             | 40 +++++++++++++++++++++-------------------
 command/bdist.py         |  6 +++---
 command/bdist_msi.py     |  2 --
 command/bdist_rpm.py     | 15 ++++++++-------
 command/bdist_wininst.py |  9 ++++++---
 command/build_clib.py    |  2 +-
 command/build_ext.py     |  3 ++-
 command/build_py.py      |  1 -
 command/config.py        |  3 ++-
 command/register.py      |  5 +++--
 command/sdist.py         |  9 +++++----
 command/upload.py        |  4 +---
 config.py                |  3 ---
 core.py                  | 17 +++++++----------
 cygwinccompiler.py       |  2 --
 dir_util.py              |  2 +-
 dist.py                  |  3 ++-
 emxccompiler.py          |  2 --
 extension.py             |  1 -
 fancy_getopt.py          | 32 ++++++++------------------------
 msvc9compiler.py         |  7 +++----
 msvccompiler.py          | 15 ++++++++-------
 text_file.py             | 25 ++++++++++++-------------
 24 files changed, 97 insertions(+), 121 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index 5a0fa727cd..f26e7ae467 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -13,13 +13,11 @@
 
 __revision__ = "$Id$"
 
-
 import os
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError, UnknownFileError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+
+from distutils.errors import (DistutilsExecError, CompileError, LibError,
+                              LinkError, UnknownFileError)
+from distutils.ccompiler import CCompiler, gen_preprocess_options
 from distutils.file_util import write_file
 from distutils.dep_util import newer
 from distutils import log
diff --git a/ccompiler.py b/ccompiler.py
index e093eef2e8..c046915153 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -5,9 +5,11 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
-from types import *
-from distutils.errors import *
+import sys
+import os
+import re
+
+from distutils.errors import CompileError, LinkError, UnknownFileError
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
@@ -165,7 +167,7 @@ class (via the 'executables' class attribute), but most will have:
     # set_executables ()
 
     def set_executable(self, key, value):
-        if type(value) is StringType:
+        if isinstance(value, str):
             setattr(self, key, split_quoted(value))
         else:
             setattr(self, key, value)
@@ -187,11 +189,11 @@ def _check_macro_definitions (self, definitions):
         nothing if all definitions are OK, raise TypeError otherwise.
         """
         for defn in definitions:
-            if not (type (defn) is TupleType and
+            if not (isinstance(defn, tuple) and
                     (len (defn) == 1 or
                      (len (defn) == 2 and
-                      (type (defn[1]) is StringType or defn[1] is None))) and
-                    type (defn[0]) is StringType):
+                      (isinstance(defn[1], str) or defn[1] is None))) and
+                    isinstance(defn[0], str)):
                 raise TypeError, \
                       ("invalid macro definition '%s': " % defn) + \
                       "must be tuple (string,), (string, string), or " + \
@@ -341,19 +343,19 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
         """
         if outdir is None:
             outdir = self.output_dir
-        elif type(outdir) is not StringType:
+        elif not isinstance(outdir, str):
             raise TypeError, "'output_dir' must be a string or None"
 
         if macros is None:
             macros = self.macros
-        elif type(macros) is ListType:
+        elif isinstance(macros, list):
             macros = macros + (self.macros or [])
         else:
             raise TypeError, "'macros' (if supplied) must be a list of tuples"
 
         if incdirs is None:
             incdirs = self.include_dirs
-        elif type(incdirs) in (ListType, TupleType):
+        elif isinstance(incdirs, (list, tuple)):
             incdirs = list(incdirs) + (self.include_dirs or [])
         else:
             raise TypeError, \
@@ -444,14 +446,14 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
 
         if macros is None:
             macros = self.macros
-        elif type (macros) is ListType:
+        elif isinstance(macros, list):
             macros = macros + (self.macros or [])
         else:
             raise TypeError, "'macros' (if supplied) must be a list of tuples"
 
         if include_dirs is None:
             include_dirs = self.include_dirs
-        elif type (include_dirs) in (ListType, TupleType):
+        elif isinstance(include_dirs, (list, tuple)):
             include_dirs = list (include_dirs) + (self.include_dirs or [])
         else:
             raise TypeError, \
@@ -517,14 +519,14 @@ def _fix_object_args (self, objects, output_dir):
         None, replace with self.output_dir.  Return fixed versions of
         'objects' and 'output_dir'.
         """
-        if type (objects) not in (ListType, TupleType):
+        if not isinstance(objects, (list, tuple)):
             raise TypeError, \
                   "'objects' must be a list or tuple of strings"
         objects = list (objects)
 
         if output_dir is None:
             output_dir = self.output_dir
-        elif type (output_dir) is not StringType:
+        elif not isinstance(output_dir, str):
             raise TypeError, "'output_dir' must be a string or None"
 
         return (objects, output_dir)
@@ -539,7 +541,7 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
         """
         if libraries is None:
             libraries = self.libraries
-        elif type (libraries) in (ListType, TupleType):
+        elif isinstance(libraries, (list, tuple)):
             libraries = list (libraries) + (self.libraries or [])
         else:
             raise TypeError, \
@@ -547,7 +549,7 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
 
         if library_dirs is None:
             library_dirs = self.library_dirs
-        elif type (library_dirs) in (ListType, TupleType):
+        elif isinstance(library_dirs, (list, tuple)):
             library_dirs = list (library_dirs) + (self.library_dirs or [])
         else:
             raise TypeError, \
@@ -555,7 +557,7 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
 
         if runtime_library_dirs is None:
             runtime_library_dirs = self.runtime_library_dirs
-        elif type (runtime_library_dirs) in (ListType, TupleType):
+        elif isinstance(runtime_library_dirs, (list, tuple)):
             runtime_library_dirs = (list (runtime_library_dirs) +
                                     (self.runtime_library_dirs or []))
         else:
@@ -587,7 +589,7 @@ def detect_language (self, sources):
         """Detect the language of a given file, or list of files. Uses
         language_map, and language_order to do the job.
         """
-        if type(sources) is not ListType:
+        if not isinstance(sources, list):
             sources = [sources]
         lang = None
         index = len(self.language_order)
@@ -1194,7 +1196,7 @@ def gen_preprocess_options (macros, include_dirs):
     pp_opts = []
     for macro in macros:
 
-        if not (type (macro) is TupleType and
+        if not (isinstance(macro, tuple) and
                 1 <= len (macro) <= 2):
             raise TypeError, \
                   ("bad macro definition '%s': " +
diff --git a/command/bdist.py b/command/bdist.py
index 8e0ad080b9..8cd69701cf 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,9 +6,9 @@
 __revision__ = "$Id$"
 
 import os
-from types import *
+
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError, DistutilsOptionError
 from distutils.util import get_platform
 
 
@@ -16,7 +16,7 @@ def show_formats():
     """Print list of available formats (arguments to "--format" option).
     """
     from distutils.fancy_getopt import FancyGetopt
-    formats=[]
+    formats = []
     for format in bdist.format_commands:
         formats.append(("formats=" + format, None,
                         bdist.format_command[format][1]))
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 7a5ca807a6..f3791bedfe 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -28,7 +28,6 @@ def __init__(self, *args, **kw):
         default, cancel, bitmap=true)"""
         Dialog.__init__(self, *args)
         ruler = self.h - 36
-        bmwidth = 152*ruler/328
         #if kw.get("bitmap", True):
         #    self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
         self.line("BottomLine", 0, ruler, self.w, 0)
@@ -420,7 +419,6 @@ def add_ui(self):
         # see "Dialog Style Bits"
         modal = 3      # visible | modal
         modeless = 1   # visible
-        track_disk_space = 32
 
         # UI customization properties
         add_data(db, "Property",
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 1eccc6a48a..6d9d47d2eb 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -5,14 +5,15 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
-from types import *
+import sys
+import os
+import string
+
 from distutils.core import Command
 from distutils.debug import DEBUG
-from distutils.util import get_platform
 from distutils.file_util import write_file
-from distutils.errors import *
-from distutils.sysconfig import get_python_version
+from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
+                              DistutilsFileError, DistutilsExecError)
 from distutils import log
 
 class bdist_rpm (Command):
@@ -225,7 +226,7 @@ def finalize_package_data (self):
                                         self.distribution.get_contact_email()))
         self.ensure_string('packager')
         self.ensure_string_list('doc_files')
-        if type(self.doc_files) is ListType:
+        if isinstance(self.doc_files, list):
             for readme in ('README', 'README.txt'):
                 if os.path.exists(readme) and readme not in self.doc_files:
                     self.doc_files.append(readme)
@@ -444,7 +445,7 @@ def _make_spec_file(self):
                       'Obsoletes',
                       ):
             val = getattr(self, string.lower(field))
-            if type(val) is ListType:
+            if isinstance(val, list):
                 spec_file.append('%s: %s' % (field, string.join(val)))
             elif val is not None:
                 spec_file.append('%s: %s' % (field, val))
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 8a6eca59d8..cf4282d83f 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -5,11 +5,14 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
+import sys
+import os
+import string
+
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
-from distutils.errors import *
+from distutils.dir_util import remove_tree
+from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.sysconfig import get_python_version
 from distutils import log
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 9545b27ad0..50b64dba25 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -18,7 +18,7 @@
 
 import os
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsSetupError
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 0c79476bac..ff1a4be315 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -10,7 +10,8 @@
 from warnings import warn
 
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import (CCompilerError, DistutilsError, CompileError,
+                              DistutilsSetupError, DistutilsPlatformError)
 from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
diff --git a/command/build_py.py b/command/build_py.py
index 5c7b473b04..04c455f0eb 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -133,7 +133,6 @@ def find_data_files(self, package, src_dir):
 
     def build_package_data(self):
         """Copy data files into build directory"""
-        lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
diff --git a/command/config.py b/command/config.py
index 134fa3892d..b084913563 100644
--- a/command/config.py
+++ b/command/config.py
@@ -11,7 +11,8 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os
+import re
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
diff --git a/command/register.py b/command/register.py
index 3b5b2080ec..fb547c93a8 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,12 +7,13 @@
 
 __revision__ = "$Id$"
 
-import os, string, urllib2, getpass, urlparse
+import urllib2
+import getpass
+import urlparse
 import StringIO
 from warnings import warn
 
 from distutils.core import PyPIRCCommand
-from distutils.errors import *
 from distutils import log
 
 class register(PyPIRCCommand):
diff --git a/command/sdist.py b/command/sdist.py
index 5c74e5329f..f1335e6a36 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -4,16 +4,17 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
+import string
 import sys
-from types import *
 from glob import glob
 from warnings import warn
 
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
-from distutils.errors import *
+from distutils.errors import (DistutilsPlatformError, DistutilsOptionError,
+                              DistutilsTemplateError)
 from distutils.filelist import FileList
 from distutils import log
 from distutils.util import convert_path
@@ -256,7 +257,7 @@ def add_defaults(self):
 
         standards = [('README', 'README.txt'), self.distribution.script_name]
         for fn in standards:
-            if type(fn) is TupleType:
+            if isinstance(fn, tuple):
                 alts = fn
                 got_it = 0
                 for fn in alts:
diff --git a/command/upload.py b/command/upload.py
index 5d6ebcfa4c..3e18aeaad6 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,7 +1,6 @@
 """distutils.command.upload
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-import sys
 import os
 import socket
 import platform
@@ -9,10 +8,9 @@
 from base64 import standard_b64encode
 import urlparse
 import cStringIO as StringIO
-from ConfigParser import ConfigParser
 from hashlib import md5
 
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
diff --git a/config.py b/config.py
index 9166199ea9..afa403f2da 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,6 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
-import sys
 from ConfigParser import ConfigParser
 
 from distutils.cmd import Command
@@ -60,8 +59,6 @@ def _read_pypirc(self):
         if os.path.exists(rc):
             self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
-            realm = self.realm or self.DEFAULT_REALM
-
             config = ConfigParser()
             config.read(rc)
             sections = config.sections()
diff --git a/core.py b/core.py
index 8073a6bc2a..0b725ff09d 100644
--- a/core.py
+++ b/core.py
@@ -8,10 +8,12 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import sys
+import os
 
 from distutils.debug import DEBUG
-from distutils.errors import *
+from distutils.errors import (DistutilsSetupError, DistutilsArgError,
+                              DistutilsError, CCompilerError)
 from distutils.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils.core import" them.
@@ -31,7 +33,7 @@
    or: %(script)s cmd --help
 """
 
-def gen_usage (script_name):
+def gen_usage(script_name):
     script = os.path.basename(script_name)
     return USAGE % vars()
 
@@ -56,7 +58,7 @@ def gen_usage (script_name):
                       'extra_objects', 'extra_compile_args', 'extra_link_args',
                       'swig_opts', 'export_symbols', 'depends', 'language')
 
-def setup (**attrs):
+def setup(**attrs):
     """The gateway to the Distutils: do everything your setup script needs
     to do, in a highly flexible and user-driven way.  Briefly: create a
     Distribution instance; find and parse config files; parse the command
@@ -168,10 +170,8 @@ class found in 'cmdclass' is used in place of the default, which is
 
     return dist
 
-# setup ()
 
-
-def run_setup (script_name, script_args=None, stop_after="run"):
+def run_setup(script_name, script_args=None, stop_after="run"):
     """Run a setup script in a somewhat controlled environment, and
     return the Distribution instance that drives things.  This is useful
     if you need to find out the distribution meta-data (passed as
@@ -235,7 +235,4 @@ def run_setup (script_name, script_args=None, stop_after="run"):
 
     # I wonder if the setup script's namespace -- g and l -- would be of
     # any interest to callers?
-    #print "_setup_distribution:", _setup_distribution
     return _setup_distribution
-
-# run_setup ()
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index a8476e6579..eed9c321af 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -53,11 +53,9 @@
 import re
 from warnings import warn
 
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils import log
 from distutils.util import get_compiler_versions
 
 def get_msvcr():
diff --git a/dir_util.py b/dir_util.py
index 3e2cd35385..9b4d2adb5c 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -4,7 +4,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/dist.py b/dist.py
index ee2cec9088..f20a92a21d 100644
--- a/dist.py
+++ b/dist.py
@@ -14,7 +14,8 @@
 except ImportError:
     warnings = None
 
-from distutils.errors import *
+from distutils.errors import (DistutilsOptionError, DistutilsArgError,
+                              DistutilsModuleError, DistutilsClassError)
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 from distutils import log
diff --git a/emxccompiler.py b/emxccompiler.py
index a5a2ef88fe..f2f77e52d1 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -24,11 +24,9 @@
 import os, sys, copy
 from warnings import warn
 
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils import log
 from distutils.util import get_compiler_versions
 
 class EMXCCompiler (UnixCCompiler):
diff --git a/extension.py b/extension.py
index 6af1810801..9988ec0c2c 100644
--- a/extension.py
+++ b/extension.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import os
-import sys
 import warnings
 
 # This class is really only used by the "build_ext" command, so it might
diff --git a/fancy_getopt.py b/fancy_getopt.py
index e19319ae9d..2dea948025 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -10,10 +10,11 @@
 
 __revision__ = "$Id$"
 
-import sys, string, re
-from types import *
+import sys
+import string
+import re
 import getopt
-from distutils.errors import *
+from distutils.errors import DistutilsGetoptError, DistutilsArgError
 
 # Much like command_re in distutils.core, this is close to but not quite
 # the same as a Python NAME -- except, in the spirit of most GNU
@@ -117,7 +118,7 @@ def get_attr_name (self, long_option):
 
 
     def _check_alias_dict (self, aliases, what):
-        assert type(aliases) is DictionaryType
+        assert isinstance(aliases, dict)
         for (alias, opt) in aliases.items():
             if alias not in self.option_index:
                 raise DistutilsGetoptError, \
@@ -164,13 +165,13 @@ def _grok_option_table (self):
                 raise ValueError, "invalid option tuple: %r" % (option,)
 
             # Type- and value-check the option names
-            if type(long) is not StringType or len(long) < 2:
+            if not isinstance(long, str) or len(long) < 2:
                 raise DistutilsGetoptError, \
                       ("invalid long option '%s': "
                        "must be a string of length >= 2") % long
 
             if (not ((short is None) or
-                     (type(short) is StringType and len(short) == 1))):
+                     (isinstance(short, str) and len(short) == 1))):
                 raise DistutilsGetoptError, \
                       ("invalid short option '%s': "
                        "must a single character or None") % short
@@ -464,10 +465,8 @@ def wrap_text (text, width):
 
     return lines
 
-# wrap_text ()
 
-
-def translate_longopt (opt):
+def translate_longopt(opt):
     """Convert a long option name to a valid Python identifier by
     changing "-" to "_".
     """
@@ -483,18 +482,3 @@ def __init__ (self, options=[]):
         'options' will be initialized to None."""
         for opt in options:
             setattr(self, opt, None)
-
-# class OptionDummy
-
-
-if __name__ == "__main__":
-    text = """\
-Tra-la-la, supercalifragilisticexpialidocious.
-How *do* you spell that odd word, anyways?
-(Someone ask Mary -- she'll know [or she'll
-say, "How should I know?"].)"""
-
-    for w in (10, 20, 30, 40):
-        print "width: %d" % w
-        print string.join(wrap_text(text, w), "\n")
-        print
diff --git a/msvc9compiler.py b/msvc9compiler.py
index c2287d9291..2309d89488 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -19,10 +19,9 @@
 import sys
 import re
 
-from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
-                             CompileError, LibError, LinkError
-from distutils.ccompiler import CCompiler, gen_preprocess_options, \
-                                gen_lib_options
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+                              CompileError, LibError, LinkError)
+from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
diff --git a/msvccompiler.py b/msvccompiler.py
index d38afb7223..0e69fd368c 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -10,12 +10,13 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+import sys
+import os
+import string
+
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+                              CompileError, LibError, LinkError)
+from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
 
 _can_read_reg = 0
@@ -127,7 +128,7 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
             else:
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
-        except KeyError, exc: #
+        except KeyError:
             raise DistutilsPlatformError, \
                   ("""Python was built with Visual Studio 2003;
 extensions must be built with a compiler than can generate compatible binaries.
diff --git a/text_file.py b/text_file.py
index 931f0bac19..09a798b190 100644
--- a/text_file.py
+++ b/text_file.py
@@ -6,8 +6,7 @@
 
 __revision__ = "$Id$"
 
-from types import *
-import sys, os, string
+import sys
 
 
 class TextFile:
@@ -137,12 +136,12 @@ def gen_error (self, msg, line=None):
         if line is None:
             line = self.current_line
         outmsg.append(self.filename + ", ")
-        if type (line) in (ListType, TupleType):
+        if isinstance(line, (list, tuple)):
             outmsg.append("lines %d-%d: " % tuple (line))
         else:
             outmsg.append("line %d: " % line)
         outmsg.append(str(msg))
-        return string.join(outmsg, "")
+        return ''.join(outmsg)
 
 
     def error (self, msg, line=None):
@@ -196,7 +195,7 @@ def readline (self):
                 # unescape it (and any other escaped "#"'s that might be
                 # lurking in there) and otherwise leave the line alone.
 
-                pos = string.find (line, "#")
+                pos = line.find("#")
                 if pos == -1:           # no "#" -- no comments
                     pass
 
@@ -219,11 +218,11 @@ def readline (self):
                     #   # comment that should be ignored
                     #   there
                     # result in "hello there".
-                    if string.strip(line) == "":
+                    if line.strip() == "":
                         continue
 
                 else:                   # it's an escaped "#"
-                    line = string.replace (line, "\\#", "#")
+                    line = line.replace("\\#", "#")
 
 
             # did previous line end with a backslash? then accumulate
@@ -235,11 +234,11 @@ def readline (self):
                     return buildup_line
 
                 if self.collapse_join:
-                    line = string.lstrip (line)
+                    line = line.lstrip()
                 line = buildup_line + line
 
                 # careful: pay attention to line number when incrementing it
-                if type (self.current_line) is ListType:
+                if isinstance(self.current_line, list):
                     self.current_line[1] = self.current_line[1] + 1
                 else:
                     self.current_line = [self.current_line,
@@ -250,7 +249,7 @@ def readline (self):
                     return None
 
                 # still have to be careful about incrementing the line number!
-                if type (self.current_line) is ListType:
+                if isinstance(self.current_line, list):
                     self.current_line = self.current_line[1] + 1
                 else:
                     self.current_line = self.current_line + 1
@@ -259,11 +258,11 @@ def readline (self):
             # strip whitespace however the client wants (leading and
             # trailing, or one or the other, or neither)
             if self.lstrip_ws and self.rstrip_ws:
-                line = string.strip (line)
+                line = line.strip()
             elif self.lstrip_ws:
-                line = string.lstrip (line)
+                line = line.lstrip()
             elif self.rstrip_ws:
-                line = string.rstrip (line)
+                line = line.rstrip()
 
             # blank line (whether we rstrip'ed or not)? skip to next line
             # if appropriate

From 9414e0ddcaa3c08782325904d0d1d890dc8fa332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 01:49:00 +0000
Subject: [PATCH 2809/8469] Merged revisions 76956 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76956 | tarek.ziade | 2009-12-21 02:22:46 +0100 (Mon, 21 Dec 2009) | 1 line

  massive import cleaning in Distutils
........
---
 bcppcompiler.py          | 10 ++++------
 ccompiler.py             |  7 +++++--
 command/bdist.py         |  3 ++-
 command/bdist_msi.py     |  2 --
 command/bdist_rpm.py     |  9 +++++----
 command/bdist_wininst.py |  8 +++++---
 command/build_clib.py    |  2 +-
 command/build_ext.py     |  3 ++-
 command/build_py.py      |  1 -
 command/config.py        |  3 ++-
 command/register.py      |  8 +++++---
 command/sdist.py         |  4 ++--
 command/upload.py        |  6 +++---
 config.py                |  3 ---
 core.py                  | 17 +++++++----------
 cygwinccompiler.py       |  2 --
 dir_util.py              |  2 +-
 dist.py                  |  3 ++-
 emxccompiler.py          |  2 --
 extension.py             |  1 -
 fancy_getopt.py          | 19 ++++---------------
 msvc9compiler.py         |  7 +++----
 msvccompiler.py          | 14 +++++++-------
 text_file.py             |  4 ++--
 24 files changed, 62 insertions(+), 78 deletions(-)

diff --git a/bcppcompiler.py b/bcppcompiler.py
index c5e5cd2571..77d94a59a2 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -13,13 +13,11 @@
 
 __revision__ = "$Id$"
 
-
 import os
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError, UnknownFileError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+
+from distutils.errors import (DistutilsExecError, CompileError, LibError,
+                              LinkError, UnknownFileError)
+from distutils.ccompiler import CCompiler, gen_preprocess_options
 from distutils.file_util import write_file
 from distutils.dep_util import newer
 from distutils import log
diff --git a/ccompiler.py b/ccompiler.py
index ff7f9df1c3..407cabda46 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -5,8 +5,11 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
-from distutils.errors import *
+import sys
+import os
+import re
+
+from distutils.errors import CompileError, LinkError, UnknownFileError
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
diff --git a/command/bdist.py b/command/bdist.py
index 2c81f3a9c0..dd202ff449 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,8 +6,9 @@
 __revision__ = "$Id$"
 
 import os
+
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError, DistutilsOptionError
 from distutils.util import get_platform
 
 
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index c4be47b579..f9205483d7 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -28,7 +28,6 @@ def __init__(self, *args, **kw):
         default, cancel, bitmap=true)"""
         Dialog.__init__(self, *args)
         ruler = self.h - 36
-        bmwidth = 152*ruler/328
         #if kw.get("bitmap", True):
         #    self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
         self.line("BottomLine", 0, ruler, self.w, 0)
@@ -419,7 +418,6 @@ def add_ui(self):
         # see "Dialog Style Bits"
         modal = 3      # visible | modal
         modeless = 1   # visible
-        track_disk_space = 32
 
         # UI customization properties
         add_data(db, "Property",
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 452f9502ad..0a579dbb93 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -5,13 +5,14 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import sys
+import os
+
 from distutils.core import Command
 from distutils.debug import DEBUG
-from distutils.util import get_platform
 from distutils.file_util import write_file
-from distutils.errors import *
-from distutils.sysconfig import get_python_version
+from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
+                              DistutilsFileError, DistutilsExecError)
 from distutils import log
 
 class bdist_rpm(Command):
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d6d01c630d..0b7044a00e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -5,11 +5,13 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import sys
+import os
+
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
-from distutils.errors import *
+from distutils.dir_util import remove_tree
+from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.sysconfig import get_python_version
 from distutils import log
 
diff --git a/command/build_clib.py b/command/build_clib.py
index 258d7c10be..12bf1d2fe3 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -18,7 +18,7 @@
 
 import os
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsSetupError
 from distutils.sysconfig import customize_compiler
 from distutils import log
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 70dd81f10d..de980bd841 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -10,7 +10,8 @@
 from warnings import warn
 
 from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import (CCompilerError, DistutilsError, CompileError,
+                              DistutilsSetupError, DistutilsPlatformError)
 from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
diff --git a/command/build_py.py b/command/build_py.py
index fa08579652..7cc935390f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -133,7 +133,6 @@ def find_data_files(self, package, src_dir):
 
     def build_package_data(self):
         """Copy data files into build directory"""
-        lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
diff --git a/command/config.py b/command/config.py
index ac80a54eb1..830552cdc4 100644
--- a/command/config.py
+++ b/command/config.py
@@ -11,7 +11,8 @@
 
 __revision__ = "$Id$"
 
-import sys, os, re
+import os
+import re
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
diff --git a/command/register.py b/command/register.py
index bdf5f8f09c..7d3dc53afe 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,13 +7,15 @@
 
 __revision__ = "$Id$"
 
-import os, string, getpass
+import os
+import string
+import getpass
 import io
-import urllib.parse, urllib.request
+import urllib.parse
+import urllib.request
 from warnings import warn
 
 from distutils.core import PyPIRCCommand
-from distutils.errors import *
 from distutils import log
 
 class register(PyPIRCCommand):
diff --git a/command/sdist.py b/command/sdist.py
index 76e1de8100..f33406cd59 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -7,14 +7,14 @@
 import os
 import string
 import sys
-from types import *
 from glob import glob
 from warnings import warn
 
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
-from distutils.errors import *
+from distutils.errors import (DistutilsPlatformError, DistutilsOptionError,
+                              DistutilsTemplateError)
 from distutils.filelist import FileList
 from distutils import log
 from distutils.util import convert_path
diff --git a/command/upload.py b/command/upload.py
index 674edd47c3..bb1b7fc4fe 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,8 +1,8 @@
 """distutils.command.upload
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-import sys
-import os, io
+import os
+import io
 import socket
 import platform
 from urllib.request import urlopen, Request, HTTPError
@@ -10,7 +10,7 @@
 from urllib.parse import urlparse
 from hashlib import md5
 
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
diff --git a/config.py b/config.py
index 5b625f3f7d..fe41ce977e 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,6 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
-import sys
 from configparser import ConfigParser
 
 from distutils.cmd import Command
@@ -60,8 +59,6 @@ def _read_pypirc(self):
         if os.path.exists(rc):
             self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
-            realm = self.realm or self.DEFAULT_REALM
-
             config = ConfigParser()
             config.read(rc)
             sections = config.sections()
diff --git a/core.py b/core.py
index 95c035742e..c820a420b9 100644
--- a/core.py
+++ b/core.py
@@ -8,10 +8,12 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import sys
+import os
 
 from distutils.debug import DEBUG
-from distutils.errors import *
+from distutils.errors import (DistutilsSetupError, DistutilsArgError,
+                              DistutilsError, CCompilerError)
 from distutils.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils.core import" them.
@@ -31,7 +33,7 @@
    or: %(script)s cmd --help
 """
 
-def gen_usage (script_name):
+def gen_usage(script_name):
     script = os.path.basename(script_name)
     return USAGE % vars()
 
@@ -56,7 +58,7 @@ def gen_usage (script_name):
                       'extra_objects', 'extra_compile_args', 'extra_link_args',
                       'swig_opts', 'export_symbols', 'depends', 'language')
 
-def setup (**attrs):
+def setup(**attrs):
     """The gateway to the Distutils: do everything your setup script needs
     to do, in a highly flexible and user-driven way.  Briefly: create a
     Distribution instance; find and parse config files; parse the command
@@ -168,10 +170,8 @@ class found in 'cmdclass' is used in place of the default, which is
 
     return dist
 
-# setup ()
 
-
-def run_setup (script_name, script_args=None, stop_after="run"):
+def run_setup(script_name, script_args=None, stop_after="run"):
     """Run a setup script in a somewhat controlled environment, and
     return the Distribution instance that drives things.  This is useful
     if you need to find out the distribution meta-data (passed as
@@ -234,7 +234,4 @@ def run_setup (script_name, script_args=None, stop_after="run"):
 
     # I wonder if the setup script's namespace -- g and l -- would be of
     # any interest to callers?
-    #print "_setup_distribution:", _setup_distribution
     return _setup_distribution
-
-# run_setup ()
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index d9f4a43df7..3e2a634f7e 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -53,11 +53,9 @@
 import re
 from warnings import warn
 
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils import log
 from distutils.util import get_compiler_versions
 
 def get_msvcr():
diff --git a/dir_util.py b/dir_util.py
index 98e6252c6c..370025b734 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -4,7 +4,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/dist.py b/dist.py
index 353525e17d..5a107e7d83 100644
--- a/dist.py
+++ b/dist.py
@@ -14,7 +14,8 @@
 except ImportError:
     warnings = None
 
-from distutils.errors import *
+from distutils.errors import (DistutilsOptionError, DistutilsArgError,
+                              DistutilsModuleError, DistutilsClassError)
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 from distutils import log
diff --git a/emxccompiler.py b/emxccompiler.py
index 50634d6c06..fd79aec2cf 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -24,11 +24,9 @@
 import os, sys, copy
 from warnings import warn
 
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils import log
 from distutils.util import get_compiler_versions
 
 class EMXCCompiler (UnixCCompiler):
diff --git a/extension.py b/extension.py
index 5c07bdae82..10aaf7c504 100644
--- a/extension.py
+++ b/extension.py
@@ -6,7 +6,6 @@
 __revision__ = "$Id$"
 
 import os
-import sys
 import warnings
 
 # This class is really only used by the "build_ext" command, so it might
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 879d4d25bf..73343ad5af 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -10,9 +10,11 @@
 
 __revision__ = "$Id$"
 
-import sys, string, re
+import sys
+import string
+import re
 import getopt
-from distutils.errors import *
+from distutils.errors import DistutilsGetoptError, DistutilsArgError
 
 # Much like command_re in distutils.core, this is close to but not quite
 # the same as a Python NAME -- except, in the spirit of most GNU
@@ -444,16 +446,3 @@ def __init__(self, options=[]):
         'options' will be initialized to None."""
         for opt in options:
             setattr(self, opt, None)
-
-
-if __name__ == "__main__":
-    text = """\
-Tra-la-la, supercalifragilisticexpialidocious.
-How *do* you spell that odd word, anyways?
-(Someone ask Mary -- she'll know [or she'll
-say, "How should I know?"].)"""
-
-    for w in (10, 20, 30, 40):
-        print("width: %d" % w)
-        print("\n".join(wrap_text(text, w)))
-        print()
diff --git a/msvc9compiler.py b/msvc9compiler.py
index c84fb0b4a6..4d05a44522 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -19,10 +19,9 @@
 import sys
 import re
 
-from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
-                             CompileError, LibError, LinkError
-from distutils.ccompiler import CCompiler, gen_preprocess_options, \
-                                gen_lib_options
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+                              CompileError, LibError, LinkError)
+from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
diff --git a/msvccompiler.py b/msvccompiler.py
index 1cd0f91d5f..dc3bd8de47 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -10,12 +10,12 @@
 
 __revision__ = "$Id$"
 
-import sys, os
-from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
-     CompileError, LibError, LinkError
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+import sys
+import os
+
+from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
+                              CompileError, LibError, LinkError)
+from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
 
 _can_read_reg = False
@@ -124,7 +124,7 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
             else:
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
-        except KeyError as exc: #
+        except KeyError:
             raise DistutilsPlatformError(
             """Python was built with Visual Studio 2003;
 extensions must be built with a compiler than can generate compatible binaries.
diff --git a/text_file.py b/text_file.py
index 97459fbf73..53c8561a3e 100644
--- a/text_file.py
+++ b/text_file.py
@@ -6,8 +6,8 @@
 
 __revision__ = "$Id$"
 
-import sys, os, io
-
+import sys
+import io
 
 class TextFile:
     """Provides a file-like object that takes care of all the things you

From 6f01576b084ee29da8fd89ee34bda163be2ddf61 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 21 Dec 2009 14:36:07 +0100
Subject: [PATCH 2810/8469] uses distutils install schemes now

--HG--
branch : distribute
extra : rebase_source : fe92fa9e0949f11f27bbc94197fc812ed841dccf
---
 tests/manual_test.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index ce8d10f2a0..6cbf62a868 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -4,6 +4,8 @@
 import tempfile
 import subprocess
 import sys
+from distutils.command.install import INSTALL_SCHEMES
+from string import Template
 
 if sys.version_info[0] < 3:
     from urllib2 import urlopen
@@ -37,17 +39,27 @@ def _tempdir(*args, **kwargs):
 BOOTSTRAP = 'http://python-distribute.org/bootstrap.py'
 PYVER = sys.version.split()[0][:3]
 
+
+_VARS = {'base': '.',
+         'py_version_short': PYVER}
+
+if sys.platform == 'win32':
+    PURELIB = INSTALL_SCHEMES['nt']['purelib']
+else:
+    PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
+
+
 @tempdir
 def test_virtualenv():
     """virtualenv with distribute"""
+    purelib = os.path.abspath(Template(PURELIB).substitute(**_VARS))
     os.system('virtualenv --no-site-packages . --distribute')
     os.system('bin/easy_install -q distribute==dev')
     # linux specific
-    site_pkg = os.listdir(os.path.join('.', 'lib', 'python'+PYVER, 'site-packages'))
+    site_pkg = os.listdir(purelib)
     site_pkg.sort()
     assert 'distribute' in site_pkg[0]
-    easy_install = os.path.join('.', 'lib', 'python'+PYVER, 'site-packages',
-                                'easy-install.pth')
+    easy_install = os.path.join(purelib, 'easy-install.pth')
     with open(easy_install) as f:
         res = f.read()
     assert 'distribute' in res
@@ -74,7 +86,7 @@ def test_full():
     assert len(eggs) == 3
     assert eggs[0].startswith('distribute')
     assert eggs[1:] == ['extensions-0.3-py2.6.egg',
-                    'zc.recipe.egg-1.2.2-py2.6.egg']
+                        'zc.recipe.egg-1.2.2-py2.6.egg']
 
 
 if __name__ == '__main__':

From 8b91eb9ff7f2fa30d8c405b737d85e0165b4b99f Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 21 Dec 2009 14:48:33 +0100
Subject: [PATCH 2811/8469] disable Py3

--HG--
branch : distribute
extra : rebase_source : 05a91504dccded377676a993266f9b619b721aaa
---
 tests/manual_test.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 6cbf62a868..d987883292 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
+import sys
+
+if sys.version_info[0] >= 3:
+    raise NotImplementedError('Py3 not supported in this test yet')
+
 import os
 import shutil
 import tempfile
 import subprocess
-import sys
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
-
-if sys.version_info[0] < 3:
-    from urllib2 import urlopen
-else:
-    from urllib.request import urlopen
+from urllib2 import urlopen
 
 def tempdir(func):
     def _tempdir(*args, **kwargs):
@@ -38,7 +38,7 @@ def _tempdir(*args, **kwargs):
 
 BOOTSTRAP = 'http://python-distribute.org/bootstrap.py'
 PYVER = sys.version.split()[0][:3]
-
+DEV_URL = 'http://bitbucket.org/tarek/distribute/get/0.6-maintenance.zip#egg=distribute-dev'
 
 _VARS = {'base': '.',
          'py_version_short': PYVER}
@@ -54,7 +54,7 @@ def test_virtualenv():
     """virtualenv with distribute"""
     purelib = os.path.abspath(Template(PURELIB).substitute(**_VARS))
     os.system('virtualenv --no-site-packages . --distribute')
-    os.system('bin/easy_install -q distribute==dev')
+    os.system('bin/easy_install distribute==dev')
     # linux specific
     site_pkg = os.listdir(purelib)
     site_pkg.sort()
@@ -88,7 +88,6 @@ def test_full():
     assert eggs[1:] == ['extensions-0.3-py2.6.egg',
                         'zc.recipe.egg-1.2.2-py2.6.egg']
 
-
 if __name__ == '__main__':
     test_virtualenv()
     test_full()

From 04ae5e1755822db9f2c7545e7925cc5a1576121a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 21 Dec 2009 14:58:30 +0100
Subject: [PATCH 2812/8469] now using subprocess.call

--HG--
branch : distribute
extra : rebase_source : 62f83395c4d3d949b9e259c6d193a214e63aef41
---
 tests/manual_test.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index d987883292..63464bc537 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -11,6 +11,7 @@
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
 from urllib2 import urlopen
+import subprocess
 
 def tempdir(func):
     def _tempdir(*args, **kwargs):
@@ -48,13 +49,15 @@ def _tempdir(*args, **kwargs):
 else:
     PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
 
+def _system_call(*args):
+    assert subprocess.call(args) == 0
 
 @tempdir
 def test_virtualenv():
     """virtualenv with distribute"""
     purelib = os.path.abspath(Template(PURELIB).substitute(**_VARS))
-    os.system('virtualenv --no-site-packages . --distribute')
-    os.system('bin/easy_install distribute==dev')
+    _system_call('virtualenv', '--no-site-packages', '.', '--distribute')
+    _system_call('bin/easy_install', 'distribute==dev')
     # linux specific
     site_pkg = os.listdir(purelib)
     site_pkg.sort()
@@ -68,19 +71,20 @@ def test_virtualenv():
 @tempdir
 def test_full():
     """virtualenv + pip + buildout"""
-    os.system('virtualenv --no-site-packages .')
-    os.system('bin/easy_install -q distribute==dev')
-    os.system('bin/easy_install -qU distribute==dev')
-    os.system('bin/easy_install -q pip')
-    os.system('bin/pip install -q zc.buildout')
+    _system_call('virtualenv', '--no-site-packages', '.')
+    _system_call('bin/easy_install', '-q', 'distribute==dev')
+    _system_call('bin/easy_install', '-qU', 'distribute==dev')
+    _system_call('bin/easy_install', '-q', 'pip')
+    _system_call('bin/pip', 'install', '-q', 'zc.buildout')
+
     with open('buildout.cfg', 'w') as f:
         f.write(SIMPLE_BUILDOUT)
 
     with open('bootstrap.py', 'w') as f:
         f.write(urlopen(BOOTSTRAP).read())
 
-    os.system('bin/python bootstrap.py --distribute')
-    os.system('bin/buildout -q')
+    _system_call('bin/python', 'bootstrap.py', '--distribute')
+    _system_call('bin/buildout', '-q')
     eggs = os.listdir('eggs')
     eggs.sort()
     assert len(eggs) == 3

From 64110315b99e2f3a3d900cdaa4edd593a47373ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 23:12:41 +0000
Subject: [PATCH 2813/8469] Fixed #7556: editing the MSVC manifest file with a
 regexp was throwing an error

---
 msvc9compiler.py            | 51 ++++++++++++----------
 tests/test_msvc9compiler.py | 87 ++++++++++++++++++++++++++++++++++---
 2 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 4d05a44522..6455fffa1f 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -645,28 +645,8 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
-                try:
-                    # Remove references to the Visual C runtime, so they will
-                    # fall through to the Visual C dependency of Python.exe.
-                    # This way, when installed for a restricted user (e.g.
-                    # runtimes are not in WinSxS folder, but in Python's own
-                    # folder), the runtimes do not need to be in every folder
-                    # with .pyd's.
-                    manifest_f = open(temp_manifest, "rb")
-                    manifest_buf = manifest_f.read()
-                    manifest_f.close()
-                    pattern = re.compile(
-                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
-                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
-                        re.DOTALL)
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    manifest_f = open(temp_manifest, "wb")
-                    manifest_f.write(manifest_buf)
-                    manifest_f.close()
-                except IOError:
-                    pass
+                # Remove references to the Visual C runtime
+                self._remove_visual_c_ref(temp_manifest)
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
@@ -676,6 +656,33 @@ def link(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def _remove_visual_c_ref(self, manifest_file):
+        try:
+            # Remove references to the Visual C runtime, so they will
+            # fall through to the Visual C dependency of Python.exe.
+            # This way, when installed for a restricted user (e.g.
+            # runtimes are not in WinSxS folder, but in Python's own
+            # folder), the runtimes do not need to be in every folder
+            # with .pyd's.
+            manifest_f = open(manifest_file)
+            try:
+                manifest_buf = manifest_f.read()
+            finally:
+                manifest_f.close()
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                re.DOTALL)
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            pattern = "<dependentAssembly>\s*</dependentAssembly>"
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            manifest_f = open(manifest_file, 'w')
+            try:
+                manifest_f.write(manifest_buf)
+            finally:
+                manifest_f.close()
+        except IOError:
+            pass
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 05d34e604c..e1f08d8ad8 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -1,18 +1,73 @@
 """Tests for distutils.msvc9compiler."""
 import sys
 import unittest
+import os
 
 from distutils.errors import DistutilsPlatformError
+from distutils.tests import support
 
-class msvc9compilerTestCase(unittest.TestCase):
+_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+_CLEANED_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>"""
+
+@unittest.skip("These tests are only for win32")
+class msvc9compilerTestCase(support.TempdirManager,
+                            unittest.TestCase):
 
     def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -31,9 +86,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -56,6 +108,27 @@ def test_reg_class(self):
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
 
+    def test_remove_visual_c_ref(self):
+        from distutils.msvc9compiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        f.write(_MANIFEST)
+        f.close()
+
+        compiler = MSVCCompiler()
+        compiler._remove_visual_c_ref(manifest)
+
+        # see what we got
+        f = open(manifest)
+        # removing trailing spaces
+        content = '\n'.join([line.rstrip() for line in f.readlines()])
+        f.close()
+
+        # makes sure the manifest was properly cleaned
+        self.assertEquals(content, _CLEANED_MANIFEST)
+
+
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 

From 8ea52f665aeeacfecc93f73974760b0c45a89c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 23:16:09 +0000
Subject: [PATCH 2814/8469] forgot to add the win32 test in the unittest skip
 call

---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index e1f08d8ad8..8a908d9954 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -60,7 +60,7 @@
   </dependency>
 </assembly>"""
 
-@unittest.skip("These tests are only for win32")
+@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 

From 0c509da5a253d37dbb5a3890b5effe1948acd62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 23:18:02 +0000
Subject: [PATCH 2815/8469] Merged revisions 76993-76994 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76993 | tarek.ziade | 2009-12-22 00:12:41 +0100 (Tue, 22 Dec 2009) | 1 line

  Fixed #7556: editing the MSVC manifest file with a regexp was throwing an error
........
  r76994 | tarek.ziade | 2009-12-22 00:16:09 +0100 (Tue, 22 Dec 2009) | 1 line

  forgot to add the win32 test in the unittest skip call
........
---
 msvc9compiler.py            | 51 ++++++++++++----------
 tests/test_msvc9compiler.py | 87 ++++++++++++++++++++++++++++++++++---
 2 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index c84fb0b4a6..ad021b5754 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -646,28 +646,8 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
-                try:
-                    # Remove references to the Visual C runtime, so they will
-                    # fall through to the Visual C dependency of Python.exe.
-                    # This way, when installed for a restricted user (e.g.
-                    # runtimes are not in WinSxS folder, but in Python's own
-                    # folder), the runtimes do not need to be in every folder
-                    # with .pyd's.
-                    manifest_f = open(temp_manifest, "rb")
-                    manifest_buf = manifest_f.read()
-                    manifest_f.close()
-                    pattern = re.compile(
-                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
-                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
-                        re.DOTALL)
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    manifest_f = open(temp_manifest, "wb")
-                    manifest_f.write(manifest_buf)
-                    manifest_f.close()
-                except IOError:
-                    pass
+                # Remove references to the Visual C runtime
+                self._remove_visual_c_ref(temp_manifest)
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
@@ -677,6 +657,33 @@ def link(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def _remove_visual_c_ref(self, manifest_file):
+        try:
+            # Remove references to the Visual C runtime, so they will
+            # fall through to the Visual C dependency of Python.exe.
+            # This way, when installed for a restricted user (e.g.
+            # runtimes are not in WinSxS folder, but in Python's own
+            # folder), the runtimes do not need to be in every folder
+            # with .pyd's.
+            manifest_f = open(manifest_file)
+            try:
+                manifest_buf = manifest_f.read()
+            finally:
+                manifest_f.close()
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                re.DOTALL)
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            pattern = "<dependentAssembly>\s*</dependentAssembly>"
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            manifest_f = open(manifest_file, 'w')
+            try:
+                manifest_f.write(manifest_buf)
+            finally:
+                manifest_f.close()
+        except IOError:
+            pass
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 05d34e604c..8a908d9954 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -1,18 +1,73 @@
 """Tests for distutils.msvc9compiler."""
 import sys
 import unittest
+import os
 
 from distutils.errors import DistutilsPlatformError
+from distutils.tests import support
 
-class msvc9compilerTestCase(unittest.TestCase):
+_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+_CLEANED_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>"""
+
+@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+class msvc9compilerTestCase(support.TempdirManager,
+                            unittest.TestCase):
 
     def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -31,9 +86,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -56,6 +108,27 @@ def test_reg_class(self):
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
 
+    def test_remove_visual_c_ref(self):
+        from distutils.msvc9compiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        f.write(_MANIFEST)
+        f.close()
+
+        compiler = MSVCCompiler()
+        compiler._remove_visual_c_ref(manifest)
+
+        # see what we got
+        f = open(manifest)
+        # removing trailing spaces
+        content = '\n'.join([line.rstrip() for line in f.readlines()])
+        f.close()
+
+        # makes sure the manifest was properly cleaned
+        self.assertEquals(content, _CLEANED_MANIFEST)
+
+
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 

From 9c871d1c7a99fb62f5682ec265fa354f3ff9af10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 21 Dec 2009 23:31:55 +0000
Subject: [PATCH 2816/8469] backported r76993 and r76994 so the trunk behaves
 the same way with MSVC Manifest files editing

---
 msvc9compiler.py            | 50 +++++++++++----------
 tests/test_msvc9compiler.py | 87 ++++++++++++++++++++++++++++++++++---
 2 files changed, 108 insertions(+), 29 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 2309d89488..41d67faf59 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -646,28 +646,7 @@ def link(self,
                 mfid = 1
             else:
                 mfid = 2
-                try:
-                    # Remove references to the Visual C runtime, so they will
-                    # fall through to the Visual C dependency of Python.exe.
-                    # This way, when installed for a restricted user (e.g.
-                    # runtimes are not in WinSxS folder, but in Python's own
-                    # folder), the runtimes do not need to be in every folder
-                    # with .pyd's.
-                    manifest_f = open(temp_manifest, "rb")
-                    manifest_buf = manifest_f.read()
-                    manifest_f.close()
-                    pattern = re.compile(
-                        r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
-                        r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
-                        re.DOTALL)
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    pattern = "<dependentAssembly>\s*</dependentAssembly>"
-                    manifest_buf = re.sub(pattern, "", manifest_buf)
-                    manifest_f = open(temp_manifest, "wb")
-                    manifest_f.write(manifest_buf)
-                    manifest_f.close()
-                except IOError:
-                    pass
+                self._remove_visual_c_ref(temp_manifest)
             out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
             try:
                 self.spawn(['mt.exe', '-nologo', '-manifest',
@@ -677,6 +656,33 @@ def link(self,
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def _remove_visual_c_ref(self, manifest_file):
+        try:
+            # Remove references to the Visual C runtime, so they will
+            # fall through to the Visual C dependency of Python.exe.
+            # This way, when installed for a restricted user (e.g.
+            # runtimes are not in WinSxS folder, but in Python's own
+            # folder), the runtimes do not need to be in every folder
+            # with .pyd's.
+            manifest_f = open(manifest_file)
+            try:
+                manifest_buf = manifest_f.read()
+            finally:
+                manifest_f.close()
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                re.DOTALL)
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            pattern = "<dependentAssembly>\s*</dependentAssembly>"
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            manifest_f = open(manifest_file, 'w')
+            try:
+                manifest_f.write(manifest_buf)
+            finally:
+                manifest_f.close()
+        except IOError:
+            pass
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 1264854d0d..503a5a8056 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -1,18 +1,73 @@
 """Tests for distutils.msvc9compiler."""
 import sys
 import unittest
+import os
 
 from distutils.errors import DistutilsPlatformError
+from distutils.tests import support
 
-class msvc9compilerTestCase(unittest.TestCase):
+_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+_CLEANED_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>"""
+
+@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+class msvc9compilerTestCase(support.TempdirManager,
+                            unittest.TestCase):
 
     def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -31,9 +86,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        if sys.platform != 'win32':
-            # this test is only for win32
-            return
         from distutils.msvccompiler import get_build_version
         if get_build_version() < 8.0:
             # this test is only for MSVC8.0 or above
@@ -56,6 +108,27 @@ def test_reg_class(self):
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
 
+    def test_remove_visual_c_ref(self):
+        from distutils.msvc9compiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        f.write(_MANIFEST)
+        f.close()
+
+        compiler = MSVCCompiler()
+        compiler._remove_visual_c_ref(manifest)
+
+        # see what we got
+        f = open(manifest)
+        # removing trailing spaces
+        content = '\n'.join([line.rstrip() for line in f.readlines()])
+        f.close()
+
+        # makes sure the manifest was properly cleaned
+        self.assertEquals(content, _CLEANED_MANIFEST)
+
+
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 

From 518952766c40646198629634cbf5fc5df9ba7ae6 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 24 Dec 2009 13:06:39 +0000
Subject: [PATCH 2817/8469] On OSX the output of "uname -m" always reflects the
 32-bit architecture for the machine ("i386" or "ppc"), even if the executable
 is 64-bit.

This patchs ensures that the distutils platform architecture
represents the architecture for the executable when running a
64-bit only executable on OSX.
---
 util.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util.py b/util.py
index b8e4952fee..f4bb0633c5 100644
--- a/util.py
+++ b/util.py
@@ -165,11 +165,21 @@ def get_platform():
                     raise ValueError(
                        "Don't know machine value for archs=%r"%(archs,))
 
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxint >= 2**32:
+                    machine = 'x86_64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'
 
+                # See 'i386' case
+                if sys.maxint >= 2**32:
+                    machine = 'ppc64'
+
     return "%s-%s-%s" % (osname, release, machine)
 
 

From 40baf32676d4421839d651e3a3e561e4c045c639 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 24 Dec 2009 13:07:53 +0000
Subject: [PATCH 2818/8469] Merged revisions 77026 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77026 | ronald.oussoren | 2009-12-24 14:06:39 +0100 (Thu, 24 Dec 2009) | 8 lines

  On OSX the output of "uname -m" always reflects the 32-bit architecture
  for the machine ("i386" or "ppc"), even if the executable is
  64-bit.

  This patchs ensures that the distutils platform architecture
  represents the architecture for the executable when running a
  64-bit only executable on OSX.
........
---
 util.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util.py b/util.py
index 7bc52f195b..d314961bf7 100644
--- a/util.py
+++ b/util.py
@@ -162,11 +162,21 @@ def get_platform ():
                     raise ValueError(
                        "Don't know machine value for archs=%r"%(archs,))
 
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxint >= 2**32:
+                    machine = 'x86_64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'
 
+                # See 'i386' case
+                if sys.maxint >= 2**32:
+                    machine = 'ppc64'
+
     return "%s-%s-%s" % (osname, release, machine)
 
 # get_platform ()

From 576fd8c16b2727a04bf59e08db0a6a166d5dd66e Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 24 Dec 2009 13:14:21 +0000
Subject: [PATCH 2819/8469] Merged revisions 77026 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77026 | ronald.oussoren | 2009-12-24 14:06:39 +0100 (Thu, 24 Dec 2009) | 8 lines

  On OSX the output of "uname -m" always reflects the 32-bit architecture
  for the machine ("i386" or "ppc"), even if the executable is
  64-bit.

  This patchs ensures that the distutils platform architecture
  represents the architecture for the executable when running a
  64-bit only executable on OSX.
........
---
 util.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util.py b/util.py
index cca7b49f5e..8adf6e0d29 100644
--- a/util.py
+++ b/util.py
@@ -165,11 +165,21 @@ def get_platform():
                     raise ValueError(
                        "Don't know machine value for archs=%r"%(archs,))
 
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxsize >= 2**32:
+                    machine = 'x86_64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'
 
+                # See 'i386' case
+                if sys.maxsize >= 2**32:
+                    machine = 'ppc64'
+
     return "%s-%s-%s" % (osname, release, machine)
 
 

From 152d8eb8e580c3e346e8a30688a55cd28efd6a06 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 24 Dec 2009 13:16:53 +0000
Subject: [PATCH 2820/8469] Merged revisions 77028 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77028 | ronald.oussoren | 2009-12-24 14:14:21 +0100 (Thu, 24 Dec 2009) | 15 lines

  Merged revisions 77026 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77026 | ronald.oussoren | 2009-12-24 14:06:39 +0100 (Thu, 24 Dec 2009) | 8 lines

    On OSX the output of "uname -m" always reflects the 32-bit architecture
    for the machine ("i386" or "ppc"), even if the executable is
    64-bit.

    This patchs ensures that the distutils platform architecture
    represents the architecture for the executable when running a
    64-bit only executable on OSX.
  ........
................
---
 util.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/util.py b/util.py
index 50ad8fef98..9a77561fff 100644
--- a/util.py
+++ b/util.py
@@ -162,11 +162,21 @@ def get_platform ():
                     raise ValueError(
                        "Don't know machine value for archs=%r"%(archs,))
 
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxsize >= 2**32:
+                    machine = 'x86_64'
 
             elif machine in ('PowerPC', 'Power_Macintosh'):
                 # Pick a sane name for the PPC architecture.
                 machine = 'ppc'
 
+                # See 'i386' case
+                if sys.maxsize >= 2**32:
+                    machine = 'ppc64'
+
     return "%s-%s-%s" % (osname, release, machine)
 
 # get_platform ()

From 1be9d3f60881534ffd6251d3f76b098ef7a63f2f Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 24 Dec 2009 14:50:35 +0000
Subject: [PATCH 2821/8469] Unittests and news items for the patch in r77026.

---
 tests/test_util.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 6722997f58..80c5800961 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -119,6 +119,26 @@ def test_get_platform(self):
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
         sys.platform = 'darwin'
+
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
+        maxint = sys.maxint
+        try:
+            sys.maxint = 2147483647
+            self.assertEquals(get_platform(), 'macosx-10.3-ppc')
+            sys.maxint = 9223372036854775807
+            self.assertEquals(get_platform(), 'macosx-10.3-ppc64')
+        finally:
+            sys.maxint = maxint
+
+
         self._set_uname(('Darwin', 'macziade', '8.11.1',
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
@@ -128,7 +148,15 @@ def test_get_platform(self):
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
 
-        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        maxint = sys.maxint
+        try:
+            sys.maxint = 2147483647
+            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+            sys.maxint = 9223372036854775807
+            self.assertEquals(get_platform(), 'macosx-10.3-x86_64')
+        finally:
+            sys.maxint = maxint
+
 
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
@@ -173,6 +201,7 @@ def test_get_platform(self):
 
             self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
 
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From 864559503a880c593e0333777b34f5e694d65fb5 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sat, 26 Dec 2009 13:16:15 +0000
Subject: [PATCH 2822/8469] Fix merge issue where I forgot to replace
 sys.maxint by sys.maxsize.

---
 tests/test_util.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index 4172472658..8f8d4a10c2 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -119,6 +119,26 @@ def test_get_platform(self):
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
         sys.platform = 'darwin'
+
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
+        maxsize = sys.maxsize
+        try:
+            sys.maxsize = 2147483647
+            self.assertEquals(get_platform(), 'macosx-10.3-ppc')
+            sys.maxsize = 9223372036854775807
+            self.assertEquals(get_platform(), 'macosx-10.3-ppc64')
+        finally:
+            sys.maxsize = maxsize
+
+
         self._set_uname(('Darwin', 'macziade', '8.11.1',
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
@@ -128,7 +148,15 @@ def test_get_platform(self):
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
 
-        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        maxsize = sys.maxsize
+        try:
+            sys.maxsize = 2147483647
+            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+            sys.maxsize = 9223372036854775807
+            self.assertEquals(get_platform(), 'macosx-10.3-x86_64')
+        finally:
+            sys.maxsize = maxsize
+
 
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
@@ -173,6 +201,7 @@ def test_get_platform(self):
 
             self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
 
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '

From 74a48f7df99973566897e0e907bea2b412861879 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 28 Dec 2009 19:46:23 +0100
Subject: [PATCH 2823/8469] added indexsidebar.html into the MANIFEST.in

--HG--
branch : distribute
extra : rebase_source : c5110ba36fda356153e3147e05261acbd5bd6799
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 1db36bfe99..97fef03aa1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
-recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile
+recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 include *.py
 include *.txt
 include MANIFEST.in

From b957465761ed97329b3ca94c9814ca37355b20db Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Mon, 28 Dec 2009 19:47:05 +0100
Subject: [PATCH 2824/8469] added an entry in CHANGES

--HG--
branch : distribute
extra : rebase_source : 6dd438df44c5f019f4a6c853d5ceef4678b88957
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fc7e019749..068d1a41ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Found another case of SandboxViolation - fixed
 * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
+* Added indexsidebar.html into MANIFEST.in
 
 ------
 0.6.10

From 58aef4573a45d88e82348d8e2978311de3bdd5ae Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 30 Dec 2009 08:37:38 +0100
Subject: [PATCH 2825/8469] make sure manual_test can be used under 2.3

--HG--
branch : distribute
extra : rebase_source : 0186c52fe9d753201828f54f5e6b348829eb4821
---
 tests/manual_test.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 63464bc537..0d5051f165 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -7,11 +7,25 @@
 import os
 import shutil
 import tempfile
-import subprocess
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
 from urllib2 import urlopen
-import subprocess
+
+try:
+    import subprocess
+    def _system_call(*args):
+        assert subprocess.call(args) == 0
+except ImportError:
+    # Python 2.3
+    def _system_call(*args):
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        assert os.system(' '.join(args)) == 0
 
 def tempdir(func):
     def _tempdir(*args, **kwargs):
@@ -49,8 +63,6 @@ def _tempdir(*args, **kwargs):
 else:
     PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
 
-def _system_call(*args):
-    assert subprocess.call(args) == 0
 
 @tempdir
 def test_virtualenv():

From fc7a598edb4c87b12fd17ebb274cfddf731ad8c8 Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Wed, 6 Jan 2010 23:39:15 +0100
Subject: [PATCH 2826/8469] makes sure install_site_pyFixes #108

--HG--
branch : distribute
extra : rebase_source : 1b1ddea2ccca03a0e67b35f2be573ef9a776a334
---
 CHANGES.txt                        | 1 +
 setuptools/command/easy_install.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 068d1a41ad..b16ad40f63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES
 * Found another case of SandboxViolation - fixed
 * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
 * Added indexsidebar.html into MANIFEST.in
+* Issue 108: Fixed TypeError with Python3.1
 
 ------
 0.6.10
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fb8cd74f7f..421d0c09cc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1104,6 +1104,10 @@ def install_site_py(self):
             log.debug("Checking existing site.py in %s", self.install_dir)
             f = open(sitepy,'rb')
             current = f.read()
+            # we want str, not bytes
+            if sys.version_info >= (3,):
+                current = current.decode()
+
             f.close()
             if not current.startswith('def __boot():'):
                 raise DistutilsError(

From bbe3a4b6dfc6833ea2e3520691d0415c28f83979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 8 Jan 2010 23:27:23 +0000
Subject: [PATCH 2827/8469] Merged revisions 75669-75671 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75669 | tarek.ziade | 2009-10-24 17:10:37 +0200 (Sat, 24 Oct 2009) | 1 line

  Issue #7071: byte-compilation in Distutils now looks at sys.dont_write_bytecode
........
  r75670 | tarek.ziade | 2009-10-24 17:19:03 +0200 (Sat, 24 Oct 2009) | 1 line

  fixed finally state in distutils.test_util
........
  r75671 | tarek.ziade | 2009-10-24 17:51:30 +0200 (Sat, 24 Oct 2009) | 1 line

  fixed warning and error message
........
---
 command/build_py.py    |  5 +++++
 command/install_lib.py |  6 ++++++
 errors.py              |  2 ++
 tests/support.py       | 31 +++++++++++++++++++++++++++++++
 tests/test_build_py.py | 16 ++++++++++++++++
 util.py                |  4 ++++
 6 files changed, 64 insertions(+)

diff --git a/command/build_py.py b/command/build_py.py
index 3bf1267328..708ef0f38f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -8,6 +8,7 @@
 
 import string, os
 from types import *
+import sys
 from glob import glob
 
 from distutils.core import Command
@@ -418,6 +419,10 @@ def build_packages (self):
 
 
     def byte_compile (self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
         prefix = self.build_lib
         if prefix[-1] != os.sep:
diff --git a/command/install_lib.py b/command/install_lib.py
index 4ea61d78dc..7e0c708888 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -4,6 +4,8 @@
 
 import os
 from types import IntType
+import sys
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -122,6 +124,10 @@ def install (self):
         return outfiles
 
     def byte_compile (self, files):
+        if sys.dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
 
         # Get the "--root" directory supplied to the "install" command,
diff --git a/errors.py b/errors.py
index e72221bdba..9d1756b20c 100644
--- a/errors.py
+++ b/errors.py
@@ -76,6 +76,8 @@ class DistutilsInternalError (DistutilsError):
 class DistutilsTemplateError (DistutilsError):
     """Syntax error in a file list template."""
 
+class DistutilsByteCompileError(DistutilsError):
+    """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
 class CCompilerError (Exception):
diff --git a/tests/support.py b/tests/support.py
index 9d373e94e4..2a03765293 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,19 +3,50 @@
 import shutil
 import tempfile
 
+from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils import log
 from distutils.dist import Distribution
+from distutils.cmd import Command
 
 class LoggingSilencer(object):
 
     def setUp(self):
         super(LoggingSilencer, self).setUp()
         self.threshold = log.set_threshold(log.FATAL)
+        # catching warnings
+        # when log will be replaced by logging
+        # we won't need such monkey-patch anymore
+        self._old_log = log.Log._log
+        log.Log._log = self._log
+        self.logs = []
+        self._old_warn = Command.warn
+        Command.warn = self._warn
 
     def tearDown(self):
         log.set_threshold(self.threshold)
+        log.Log._log = self._old_log
+        Command.warn = self._old_warn
         super(LoggingSilencer, self).tearDown()
 
+    def _warn(self, msg):
+        self.logs.append(('', msg, ''))
+
+    def _log(self, level, msg, args):
+        if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
+            raise ValueError('%s wrong log level' % str(level))
+        self.logs.append((level, msg, args))
+
+    def get_logs(self, *levels):
+        def _format(msg, args):
+            if len(args) == 0:
+                return msg
+            return msg % args
+        return [_format(msg, args) for level, msg, args
+                in self.logs if level in levels]
+
+    def clear_logs(self):
+        self.logs = []
+
 
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 4b045474f1..4a054f2a58 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -90,6 +90,22 @@ def test_empty_package_dir (self):
             os.chdir(cwd)
             sys.stdout = old_stdout
 
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = build_py(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
diff --git a/util.py b/util.py
index d314961bf7..36ac721386 100644
--- a/util.py
+++ b/util.py
@@ -11,6 +11,7 @@
 from distutils.dep_util import newer
 from distutils.spawn import spawn
 from distutils import log
+from distutils.errors import DistutilsByteCompileError
 
 def get_platform ():
     """Return a string that identifies the current platform.  This is used
@@ -457,6 +458,9 @@ def byte_compile (py_files,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
+    # nothing is done if sys.dont_write_bytecode is True
+    if sys.dont_write_bytecode:
+        raise DistutilsByteCompileError('byte-compiling is disabled.')
 
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative

From eb7e9954b37373447c9c923374af56c8a8ac81e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 8 Jan 2010 23:42:23 +0000
Subject: [PATCH 2828/8469] Fixed #7617: all flavors of gcc should be
 recognized now

---
 tests/test_unixccompiler.py | 12 ++++++++++++
 unixccompiler.py            |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 1b7dd4cd64..008ae5d03a 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -82,6 +82,18 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
 
+        # GCC GNULD with fully qualified configuration prefix
+        # see #7617
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'x86_64-pc-linux-gnu-gcc-4.4.2'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+
+
         # non-GCC GNULD
         sys.platform = 'bar'
         def gcv(v):
diff --git a/unixccompiler.py b/unixccompiler.py
index 2083f82982..67adcfcf97 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -266,6 +266,9 @@ def link(self, target_desc, objects,
     def library_dir_option(self, dir):
         return "-L" + dir
 
+    def _is_gcc(self, compiler_name):
+        return "gcc" in compiler_name or "g++" in compiler_name
+
     def runtime_library_dir_option(self, dir):
         # XXX Hackish, at the very least.  See Python bug #445902:
         # http://sourceforge.net/tracker/index.php
@@ -285,12 +288,12 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            if "gcc" in compiler or "g++" in compiler:
+            if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]
             return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+        elif self._is_gcc(compiler):
             # gcc on non-GNU systems does not need -Wl, but can
             # use it anyway.  Since distutils has always passed in
             # -Wl whenever gcc was used in the past it is probably

From 3028d15921718f24deeedb8a57960e6885e279b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 8 Jan 2010 23:48:37 +0000
Subject: [PATCH 2829/8469] Merged revisions 77377 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77377 | tarek.ziade | 2010-01-09 00:42:23 +0100 (Sat, 09 Jan 2010) | 1 line

  Fixed #7617: all flavors of gcc should be recognized now
........
---
 tests/test_unixccompiler.py | 129 ++++++++++++++++++++++++++++++++++++
 unixccompiler.py            |   7 +-
 2 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_unixccompiler.py

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
new file mode 100644
index 0000000000..3f233e2823
--- /dev/null
+++ b/tests/test_unixccompiler.py
@@ -0,0 +1,129 @@
+"""Tests for distutils.unixccompiler."""
+import sys
+import unittest
+
+from distutils import sysconfig
+from distutils.unixccompiler import UnixCCompiler
+
+class UnixCCompilerTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self._backup_platform = sys.platform
+        self._backup_get_config_var = sysconfig.get_config_var
+        class CompilerWrapper(UnixCCompiler):
+            def rpath_foo(self):
+                return self.runtime_library_dir_option('/foo')
+        self.cc = CompilerWrapper()
+
+    def tearDown(self):
+        sys.platform = self._backup_platform
+        sysconfig.get_config_var = self._backup_get_config_var
+
+    def test_runtime_libdir_option(self):
+
+        # not tested under windows
+        if sys.platform == 'win32':
+            return
+
+        # Issue#5900
+        #
+        # Ensure RUNPATH is added to extension modules with RPATH if
+        # GNU ld is used
+
+        # darwin
+        sys.platform = 'darwin'
+        self.assertEqual(self.cc.rpath_foo(), '-L/foo')
+
+        # hp-ux
+        sys.platform = 'hp-ux'
+        old_gcv = sysconfig.get_config_var
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['+s', '-L/foo'])
+
+        def gcv(v):
+            return 'gcc'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        def gcv(v):
+            return 'g++'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), ['-Wl,+s', '-L/foo'])
+
+        sysconfig.get_config_var = old_gcv
+
+        # irix646
+        sys.platform = 'irix646'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # osf1V5
+        sys.platform = 'osf1V5'
+        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
+
+        # GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
+
+        # GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'gcc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
+
+        # GCC GNULD with fully qualified configuration prefix
+        # see #7617
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'x86_64-pc-linux-gnu-gcc-4.4.2'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
+
+
+        # non-GCC GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+        # non-GCC non-GNULD
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'cc'
+            elif v == 'GNULD':
+                return 'no'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+        # AIX C/C++ linker
+        sys.platform = 'aix'
+        def gcv(v):
+            return 'xxx'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
+
+
+def test_suite():
+    return unittest.makeSuite(UnixCCompilerTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/unixccompiler.py b/unixccompiler.py
index 7556cbdbf5..783d4dca84 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -266,6 +266,9 @@ def link(self, target_desc, objects,
     def library_dir_option(self, dir):
         return "-L" + dir
 
+    def _is_gcc(self, compiler_name):
+        return "gcc" in compiler_name or "g++" in compiler_name
+
     def runtime_library_dir_option(self, dir):
         # XXX Hackish, at the very least.  See Python bug #445902:
         # http://sourceforge.net/tracker/index.php
@@ -284,12 +287,12 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            if "gcc" in compiler or "g++" in compiler:
+            if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]
             return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+        elif self._is_gcc(compiler):
             return "-Wl,-R" + dir
         else:
             return "-R" + dir

From 3cdc8c99c134ff274895533fc30536215fd3dca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 8 Jan 2010 23:54:15 +0000
Subject: [PATCH 2830/8469] added more test coverage from trunk for #7617

---
 tests/test_install_lib.py | 35 +++++++++++++++++++++++++++++++++++
 tests/test_util.py        | 24 ++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 tests/test_install_lib.py
 create mode 100644 tests/test_util.py

diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
new file mode 100644
index 0000000000..78922f4702
--- /dev/null
+++ b/tests/test_install_lib.py
@@ -0,0 +1,35 @@
+"""Tests for distutils.command.install_data."""
+import sys
+import os
+import unittest
+
+from distutils.command.install_lib import install_lib
+from distutils.extension import Extension
+from distutils.tests import support
+from distutils.errors import DistutilsOptionError
+
+class InstallLibTestCase(support.TempdirManager,
+                         support.LoggingSilencer,
+                         unittest.TestCase):
+
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile is not used
+        pkg_dir, dist = self.create_dist()
+        cmd = install_lib(dist)
+        cmd.compile = 1
+        cmd.optimize = 1
+
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            cmd.byte_compile([])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+
+def test_suite():
+    return unittest.makeSuite(InstallLibTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_util.py b/tests/test_util.py
new file mode 100644
index 0000000000..981ad000da
--- /dev/null
+++ b/tests/test_util.py
@@ -0,0 +1,24 @@
+"""Tests for distutils.util."""
+import sys
+import unittest
+
+from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
+from distutils.util import byte_compile
+
+class UtilTestCase(unittest.TestCase):
+
+    def test_dont_write_bytecode(self):
+        # makes sure byte_compile raise a DistutilsError
+        # if sys.dont_write_bytecode is True
+        old_dont_write_bytecode = sys.dont_write_bytecode
+        sys.dont_write_bytecode = True
+        try:
+            self.assertRaises(DistutilsByteCompileError, byte_compile, [])
+        finally:
+            sys.dont_write_bytecode = old_dont_write_bytecode
+
+def test_suite():
+    return unittest.makeSuite(UtilTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 2c8ac6208548ee8f8306964077359e0057e16d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 8 Jan 2010 23:57:53 +0000
Subject: [PATCH 2831/8469] Merged revisions 77377 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77377 | tarek.ziade | 2010-01-09 00:42:23 +0100 (Sat, 09 Jan 2010) | 1 line

  Fixed #7617: all flavors of gcc should be recognized now
........
---
 tests/test_unixccompiler.py | 12 ++++++++++++
 unixccompiler.py            |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 1b7dd4cd64..008ae5d03a 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -82,6 +82,18 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
 
+        # GCC GNULD with fully qualified configuration prefix
+        # see #7617
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'x86_64-pc-linux-gnu-gcc-4.4.2'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+
+
         # non-GCC GNULD
         sys.platform = 'bar'
         def gcv(v):
diff --git a/unixccompiler.py b/unixccompiler.py
index da85c89696..51f6349a9e 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -264,6 +264,9 @@ def link(self, target_desc, objects,
     def library_dir_option(self, dir):
         return "-L" + dir
 
+    def _is_gcc(self, compiler_name):
+        return "gcc" in compiler_name or "g++" in compiler_name
+
     def runtime_library_dir_option(self, dir):
         # XXX Hackish, at the very least.  See Python bug #445902:
         # http://sourceforge.net/tracker/index.php
@@ -283,12 +286,12 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            if "gcc" in compiler or "g++" in compiler:
+            if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]
             return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif compiler[:3] == "gcc" or compiler[:3] == "g++":
+        elif self._is_gcc(compiler):
             # gcc on non-GNU systems does not need -Wl, but can
             # use it anyway.  Since distutils has always passed in
             # -Wl whenever gcc was used in the past it is probably

From ddece8fad41398b0ae313a9a554eaecb219ec36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 9 Jan 2010 00:03:39 +0000
Subject: [PATCH 2832/8469] Merged revisions 77380 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77380 | tarek.ziade | 2010-01-09 00:57:53 +0100 (Sat, 09 Jan 2010) | 9 lines

  Merged revisions 77377 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77377 | tarek.ziade | 2010-01-09 00:42:23 +0100 (Sat, 09 Jan 2010) | 1 line

    Fixed #7617: all flavors of gcc should be recognized now
  ........
................
---
 tests/test_unixccompiler.py | 12 ++++++++++++
 unixccompiler.py            |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index be2df5c6e3..3a41e6fcaa 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -82,6 +82,18 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
 
+        # GCC GNULD with fully qualified configuration prefix
+        # see #7617
+        sys.platform = 'bar'
+        def gcv(v):
+            if v == 'CC':
+                return 'x86_64-pc-linux-gnu-gcc-4.4.2'
+            elif v == 'GNULD':
+                return 'yes'
+        sysconfig.get_config_var = gcv
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+
+
         # non-GCC GNULD
         sys.platform = 'bar'
         def gcv(v):
diff --git a/unixccompiler.py b/unixccompiler.py
index 8bbdb4b329..a33fdf0f7c 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -264,6 +264,9 @@ def link(self, target_desc, objects,
     def library_dir_option(self, dir):
         return "-L" + dir
 
+    def _is_gcc(self, compiler_name):
+        return "gcc" in compiler_name or "g++" in compiler_name
+
     def runtime_library_dir_option(self, dir):
         # XXX Hackish, at the very least.  See Python bug #445902:
         # http://sourceforge.net/tracker/index.php
@@ -283,13 +286,13 @@ def runtime_library_dir_option(self, dir):
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
         elif sys.platform[:5] == "hp-ux":
-            if "gcc" in compiler or "g++" in compiler:
+            if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]
             return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         else:
-            if compiler[:3] == "gcc" or compiler[:3] == "g++":
+            if self._is_gcc(compiler):
                 # gcc on non-GNU systems does not need -Wl, but can
                 # use it anyway.  Since distutils has always passed in
                 # -Wl whenever gcc was used in the past it is probably

From 9692427a1f35e2911ad27ec342f939655d5fc337 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 9 Jan 2010 16:34:06 +0000
Subject: [PATCH 2833/8469] bump version to 2.7a2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e8c213e4c7..55aaf81a3d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7a1"
+__version__ = "2.7a2"
 #--end constants--

From 51c0c7aa736d410dae0179ad4f7304359240c397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 22:50:29 +0000
Subject: [PATCH 2834/8469] Fixed #5372: .o files are now always rebuilt
 because file age test don't work in some case

---
 ccompiler.py | 96 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 94 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index c046915153..83ba83a02b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -337,10 +337,7 @@ def set_link_objects (self, objects):
 
     def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                        extra):
-        """Process arguments and decide which source files to compile.
-
-        Merges _fix_compile_args() and _prep_compile().
-        """
+        """Process arguments and decide which source files to compile."""
         if outdir is None:
             outdir = self.output_dir
         elif not isinstance(outdir, str):
@@ -370,41 +367,6 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
-        # XXX should redo this code to eliminate skip_source entirely.
-        # XXX instead create build and issue skip messages inline
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
         pp_opts = gen_preprocess_options(macros, incdirs)
 
         build = {}
@@ -413,10 +375,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             obj = objects[i]
             ext = os.path.splitext(src)[1]
             self.mkpath(os.path.dirname(obj))
-            if skip_source[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                build[obj] = src, ext
+            build[obj] = (src, ext)
 
         return macros, objects, extra, pp_opts, build
 
@@ -463,56 +422,6 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
 
     # _fix_compile_args ()
 
-
-    def _prep_compile(self, sources, output_dir, depends=None):
-        """Decide which souce files must be recompiled.
-
-        Determine the list of object files corresponding to 'sources',
-        and figure out which ones really need to be recompiled.
-        Return a list of all object files and a dictionary telling
-        which source files can be skipped.
-        """
-        # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, output_dir=output_dir)
-        assert len(objects) == len(sources)
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
-        return objects, skip_source
-
-    # _prep_compile ()
-
-
     def _fix_object_args (self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
         Specifically: ensure that 'objects' is a list; if output_dir is
@@ -679,7 +588,6 @@ def compile(self, sources, output_dir=None, macros=None,
 
         Raises CompileError on failure.
         """
-
         # A concrete compiler class can either override this method
         # entirely or implement _compile().
 

From 06cbacd4c16b16c8bc604418be4a796f9277d271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 22:54:57 +0000
Subject: [PATCH 2835/8469] Merged revisions 77424 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77424 | tarek.ziade | 2010-01-11 23:50:29 +0100 (Mon, 11 Jan 2010) | 1 line

  Fixed #5372: .o files are now always rebuilt because file age test don't work in some case
........
---
 ccompiler.py | 86 +++-------------------------------------------------
 1 file changed, 5 insertions(+), 81 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 87d6e27396..bf92d78026 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -338,10 +338,7 @@ def set_link_objects (self, objects):
 
     def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                        extra):
-        """Process arguments and decide which source files to compile.
-
-        Merges _fix_compile_args() and _prep_compile().
-        """
+        """Process arguments and decide which source files to compile."""
         if outdir is None:
             outdir = self.output_dir
         elif type(outdir) is not StringType:
@@ -371,41 +368,6 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
-        # XXX should redo this code to eliminate skip_source entirely.
-        # XXX instead create build and issue skip messages inline
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
         pp_opts = gen_preprocess_options(macros, incdirs)
 
         build = {}
@@ -414,10 +376,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             obj = objects[i]
             ext = os.path.splitext(src)[1]
             self.mkpath(os.path.dirname(obj))
-            if skip_source[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                build[obj] = src, ext
+            build[obj] = (src, ext)
 
         return macros, objects, extra, pp_opts, build
 
@@ -464,7 +423,6 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
 
     # _fix_compile_args ()
 
-
     def _prep_compile(self, sources, output_dir, depends=None):
         """Decide which souce files must be recompiled.
 
@@ -477,42 +435,9 @@ def _prep_compile(self, sources, output_dir, depends=None):
         objects = self.object_filenames(sources, output_dir=output_dir)
         assert len(objects) == len(sources)
 
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
-        return objects, skip_source
-
-    # _prep_compile ()
-
+        # Return an empty dict for the "which source files can be skipped"
+        # return value to preserve API compatibility.
+        return objects, {}
 
     def _fix_object_args (self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
@@ -680,7 +605,6 @@ def compile(self, sources, output_dir=None, macros=None,
 
         Raises CompileError on failure.
         """
-
         # A concrete compiler class can either override this method
         # entirely or implement _compile().
 

From bab7bc91d6a99514935bcc12923920ede33f01c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 23:15:52 +0000
Subject: [PATCH 2836/8469] Merged revisions 77424 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77424 | tarek.ziade | 2010-01-11 23:50:29 +0100 (Mon, 11 Jan 2010) | 1 line

  Fixed #5372: .o files are now always rebuilt because file age test don't work in some case
........
---
 ccompiler.py | 92 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 90 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 407cabda46..38c4ae8ec5 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -314,10 +314,7 @@ def set_link_objects(self, objects):
 
     def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                        extra):
-        """Process arguments and decide which source files to compile.
-
-        Merges _fix_compile_args() and _prep_compile().
-        """
+        """Process arguments and decide which source files to compile."""
         if outdir is None:
             outdir = self.output_dir
         elif not isinstance(outdir, str):
@@ -346,41 +343,6 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
-        # XXX should redo this code to eliminate skip_source entirely.
-        # XXX instead create build and issue skip messages inline
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
         pp_opts = gen_preprocess_options(macros, incdirs)
 
         build = {}
@@ -389,10 +351,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             obj = objects[i]
             ext = os.path.splitext(src)[1]
             self.mkpath(os.path.dirname(obj))
-            if skip_source[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                build[obj] = src, ext
+            build[obj] = (src, ext)
 
         return macros, objects, extra, pp_opts, build
 
@@ -437,53 +396,6 @@ def _fix_compile_args(self, output_dir, macros, include_dirs):
 
         return output_dir, macros, include_dirs
 
-    def _prep_compile(self, sources, output_dir, depends=None):
-        """Decide which souce files must be recompiled.
-
-        Determine the list of object files corresponding to 'sources',
-        and figure out which ones really need to be recompiled.
-        Return a list of all object files and a dictionary telling
-        which source files can be skipped.
-        """
-        # Get the list of expected output (object) files
-        objects = self.object_filenames(sources, output_dir=output_dir)
-        assert len(objects) == len(sources)
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
-        return objects, skip_source
-
-
     def _fix_object_args(self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
         Specifically: ensure that 'objects' is a list; if output_dir is

From 3b516635a07e4b381d313a4bf912c295849127b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 23:23:44 +0000
Subject: [PATCH 2837/8469] Merged revisions 77427 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77427 | tarek.ziade | 2010-01-12 00:15:52 +0100 (Tue, 12 Jan 2010) | 9 lines

  Merged revisions 77424 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77424 | tarek.ziade | 2010-01-11 23:50:29 +0100 (Mon, 11 Jan 2010) | 1 line

    Fixed #5372: .o files are now always rebuilt because file age test don't work in some case
  ........
................
---
 ccompiler.py | 82 ++++------------------------------------------------
 1 file changed, 5 insertions(+), 77 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 875f96fac3..34c77a37a3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -311,10 +311,7 @@ def set_link_objects(self, objects):
 
     def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                        extra):
-        """Process arguments and decide which source files to compile.
-
-        Merges _fix_compile_args() and _prep_compile().
-        """
+        """Process arguments and decide which source files to compile."""
         if outdir is None:
             outdir = self.output_dir
         elif not isinstance(outdir, str):
@@ -343,41 +340,6 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
                                         output_dir=outdir)
         assert len(objects) == len(sources)
 
-        # XXX should redo this code to eliminate skip_source entirely.
-        # XXX instead create build and issue skip messages inline
-
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
         pp_opts = gen_preprocess_options(macros, incdirs)
 
         build = {}
@@ -386,10 +348,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
             obj = objects[i]
             ext = os.path.splitext(src)[1]
             self.mkpath(os.path.dirname(obj))
-            if skip_source[src]:
-                log.debug("skipping %s (%s up-to-date)", src, obj)
-            else:
-                build[obj] = src, ext
+            build[obj] = (src, ext)
 
         return macros, objects, extra, pp_opts, build
 
@@ -446,40 +405,9 @@ def _prep_compile(self, sources, output_dir, depends=None):
         objects = self.object_filenames(sources, output_dir=output_dir)
         assert len(objects) == len(sources)
 
-        if self.force:
-            skip_source = {}            # rebuild everything
-            for source in sources:
-                skip_source[source] = 0
-        elif depends is None:
-            # If depends is None, figure out which source files we
-            # have to recompile according to a simplistic check. We
-            # just compare the source and object file, no deep
-            # dependency checking involving header files.
-            skip_source = {}            # rebuild everything
-            for source in sources:      # no wait, rebuild nothing
-                skip_source[source] = 1
-
-            n_sources, n_objects = newer_pairwise(sources, objects)
-            for source in n_sources:    # no really, only rebuild what's
-                skip_source[source] = 0 # out-of-date
-        else:
-            # If depends is a list of files, then do a different
-            # simplistic check.  Assume that each object depends on
-            # its source and all files in the depends list.
-            skip_source = {}
-            # L contains all the depends plus a spot at the end for a
-            # particular source file
-            L = depends[:] + [None]
-            for i in range(len(objects)):
-                source = sources[i]
-                L[-1] = source
-                if newer_group(L, objects[i]):
-                    skip_source[source] = 0
-                else:
-                    skip_source[source] = 1
-
-        return objects, skip_source
-
+        # Return an empty dict for the "which source files can be skipped"
+        # return value to preserve API compatibility.
+        return objects, {}
 
     def _fix_object_args(self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.

From aa70d631f51b21abea4f917d841e982f866f0f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 23:41:32 +0000
Subject: [PATCH 2838/8469] module cleanup

---
 ccompiler.py | 217 ++++++++++++++++-----------------------------------
 1 file changed, 69 insertions(+), 148 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 83ba83a02b..97c61dd46f 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -9,11 +9,12 @@
 import os
 import re
 
-from distutils.errors import CompileError, LinkError, UnknownFileError
+from distutils.errors import (CompileError, LinkError, UnknownFileError,
+                              DistutilsPlatformError, DistutilsModuleError)
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
-from distutils.dep_util import newer_pairwise, newer_group
+from distutils.dep_util import newer_group
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -87,11 +88,7 @@ class CCompiler:
                    }
     language_order = ["c++", "objc", "c"]
 
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
+    def __init__ (self, verbose=0, dry_run=0, force=0):
         self.dry_run = dry_run
         self.force = force
         self.verbose = verbose
@@ -127,11 +124,7 @@ def __init__ (self,
         for key in self.executables.keys():
             self.set_executable(key, self.executables[key])
 
-    # __init__ ()
-
-
-    def set_executables (self, **args):
-
+    def set_executables(self, **args):
         """Define the executables (and options for them) that will be run
         to perform the various stages of compilation.  The exact set of
         executables that may be specified here depends on the compiler
@@ -164,26 +157,21 @@ class (via the 'executables' class attribute), but most will have:
                       (key, self.__class__.__name__)
             self.set_executable(key, args[key])
 
-    # set_executables ()
-
     def set_executable(self, key, value):
         if isinstance(value, str):
             setattr(self, key, split_quoted(value))
         else:
             setattr(self, key, value)
 
-
-    def _find_macro (self, name):
+    def _find_macro(self, name):
         i = 0
         for defn in self.macros:
             if defn[0] == name:
                 return i
             i = i + 1
-
         return None
 
-
-    def _check_macro_definitions (self, definitions):
+    def _check_macro_definitions(self, definitions):
         """Ensures that every element of 'definitions' is a valid macro
         definition, ie. either (name,value) 2-tuple or a (name,) tuple.  Do
         nothing if all definitions are OK, raise TypeError otherwise.
@@ -202,7 +190,7 @@ def _check_macro_definitions (self, definitions):
 
     # -- Bookkeeping methods -------------------------------------------
 
-    def define_macro (self, name, value=None):
+    def define_macro(self, name, value=None):
         """Define a preprocessor macro for all compilations driven by this
         compiler object.  The optional parameter 'value' should be a
         string; if it is not supplied, then the macro will be defined
@@ -218,8 +206,7 @@ def define_macro (self, name, value=None):
         defn = (name, value)
         self.macros.append (defn)
 
-
-    def undefine_macro (self, name):
+    def undefine_macro(self, name):
         """Undefine a preprocessor macro for all compilations driven by
         this compiler object.  If the same macro is defined by
         'define_macro()' and undefined by 'undefine_macro()' the last call
@@ -237,8 +224,7 @@ def undefine_macro (self, name):
         undefn = (name,)
         self.macros.append (undefn)
 
-
-    def add_include_dir (self, dir):
+    def add_include_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         header files.  The compiler is instructed to search directories in
         the order in which they are supplied by successive calls to
@@ -246,7 +232,7 @@ def add_include_dir (self, dir):
         """
         self.include_dirs.append (dir)
 
-    def set_include_dirs (self, dirs):
+    def set_include_dirs(self, dirs):
         """Set the list of directories that will be searched to 'dirs' (a
         list of strings).  Overrides any preceding calls to
         'add_include_dir()'; subsequence calls to 'add_include_dir()' add
@@ -256,8 +242,7 @@ def set_include_dirs (self, dirs):
         """
         self.include_dirs = dirs[:]
 
-
-    def add_library (self, libname):
+    def add_library(self, libname):
         """Add 'libname' to the list of libraries that will be included in
         all links driven by this compiler object.  Note that 'libname'
         should *not* be the name of a file containing a library, but the
@@ -273,7 +258,7 @@ def add_library (self, libname):
         """
         self.libraries.append (libname)
 
-    def set_libraries (self, libnames):
+    def set_libraries(self, libnames):
         """Set the list of libraries to be included in all links driven by
         this compiler object to 'libnames' (a list of strings).  This does
         not affect any standard system libraries that the linker may
@@ -282,29 +267,28 @@ def set_libraries (self, libnames):
         self.libraries = libnames[:]
 
 
-    def add_library_dir (self, dir):
+    def add_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         libraries specified to 'add_library()' and 'set_libraries()'.  The
         linker will be instructed to search for libraries in the order they
         are supplied to 'add_library_dir()' and/or 'set_library_dirs()'.
         """
-        self.library_dirs.append (dir)
+        self.library_dirs.append(dir)
 
-    def set_library_dirs (self, dirs):
+    def set_library_dirs(self, dirs):
         """Set the list of library search directories to 'dirs' (a list of
         strings).  This does not affect any standard library search path
         that the linker may search by default.
         """
         self.library_dirs = dirs[:]
 
-
-    def add_runtime_library_dir (self, dir):
+    def add_runtime_library_dir(self, dir):
         """Add 'dir' to the list of directories that will be searched for
         shared libraries at runtime.
         """
-        self.runtime_library_dirs.append (dir)
+        self.runtime_library_dirs.append(dir)
 
-    def set_runtime_library_dirs (self, dirs):
+    def set_runtime_library_dirs(self, dirs):
         """Set the list of directories to search for shared libraries at
         runtime to 'dirs' (a list of strings).  This does not affect any
         standard search path that the runtime linker may search by
@@ -312,16 +296,15 @@ def set_runtime_library_dirs (self, dirs):
         """
         self.runtime_library_dirs = dirs[:]
 
-
-    def add_link_object (self, object):
+    def add_link_object(self, object):
         """Add 'object' to the list of object files (or analogues, such as
         explicitly named library files or the output of "resource
         compilers") to be included in every link driven by this compiler
         object.
         """
-        self.objects.append (object)
+        self.objects.append(object)
 
-    def set_link_objects (self, objects):
+    def set_link_objects(self, objects):
         """Set the list of object files (or analogues) to be included in
         every link to 'objects'.  This does not affect any standard object
         files that the linker may include by default (such as system
@@ -388,7 +371,7 @@ def _get_cc_args(self, pp_opts, debug, before):
             cc_args[:0] = before
         return cc_args
 
-    def _fix_compile_args (self, output_dir, macros, include_dirs):
+    def _fix_compile_args(self, output_dir, macros, include_dirs):
         """Typecheck and fix-up some of the arguments to the 'compile()'
         method, and return fixed-up values.  Specifically: if 'output_dir'
         is None, replaces it with 'self.output_dir'; ensures that 'macros'
@@ -400,7 +383,7 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
         """
         if output_dir is None:
             output_dir = self.output_dir
-        elif type (output_dir) is not StringType:
+        elif not isinstance(output_dir, str):
             raise TypeError, "'output_dir' must be a string or None"
 
         if macros is None:
@@ -420,9 +403,7 @@ def _fix_compile_args (self, output_dir, macros, include_dirs):
 
         return output_dir, macros, include_dirs
 
-    # _fix_compile_args ()
-
-    def _fix_object_args (self, objects, output_dir):
+    def _fix_object_args(self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
         Specifically: ensure that 'objects' is a list; if output_dir is
         None, replace with self.output_dir.  Return fixed versions of
@@ -440,8 +421,7 @@ def _fix_object_args (self, objects, output_dir):
 
         return (objects, output_dir)
 
-
-    def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
         """Typecheck and fix up some of the arguments supplied to the
         'link_*' methods.  Specifically: ensure that all arguments are
         lists, and augment them with their permanent versions
@@ -476,10 +456,7 @@ def _fix_lib_args (self, libraries, library_dirs, runtime_library_dirs):
 
         return (libraries, library_dirs, runtime_library_dirs)
 
-    # _fix_lib_args ()
-
-
-    def _need_link (self, objects, output_file):
+    def _need_link(self, objects, output_file):
         """Return true if we need to relink the files listed in 'objects'
         to recreate 'output_file'.
         """
@@ -492,9 +469,7 @@ def _need_link (self, objects, output_file):
                 newer = newer_group (objects, output_file)
             return newer
 
-    # _need_link ()
-
-    def detect_language (self, sources):
+    def detect_language(self, sources):
         """Detect the language of a given file, or list of files. Uses
         language_map, and language_order to do the job.
         """
@@ -514,18 +489,11 @@ def detect_language (self, sources):
                 pass
         return lang
 
-    # detect_language ()
-
     # -- Worker methods ------------------------------------------------
     # (must be implemented by subclasses)
 
-    def preprocess (self,
-                    source,
-                    output_file=None,
-                    macros=None,
-                    include_dirs=None,
-                    extra_preargs=None,
-                    extra_postargs=None):
+    def preprocess(self, source, output_file=None, macros=None,
+                   include_dirs=None, extra_preargs=None, extra_postargs=None):
         """Preprocess a single C/C++ source file, named in 'source'.
         Output will be written to file named 'output_file', or stdout if
         'output_file' not supplied.  'macros' is a list of macro
@@ -613,12 +581,8 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         # should implement _compile().
         pass
 
-    def create_static_lib (self,
-                           objects,
-                           output_libname,
-                           output_dir=None,
-                           debug=0,
-                           target_lang=None):
+    def create_static_lib(self, objects, output_libname, output_dir=None,
+                          debug=0, target_lang=None):
         """Link a bunch of stuff together to create a static library file.
         The "bunch of stuff" consists of the list of object files supplied
         as 'objects', the extra object files supplied to
@@ -643,26 +607,15 @@ def create_static_lib (self,
         """
         pass
 
-
     # values for target_desc parameter in link()
     SHARED_OBJECT = "shared_object"
     SHARED_LIBRARY = "shared_library"
     EXECUTABLE = "executable"
 
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
+    def link(self, target_desc, objects, output_filename, output_dir=None,
+             libraries=None, library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
         """Link a bunch of stuff together to create an executable or
         shared library file.
 
@@ -711,19 +664,11 @@ def link (self,
 
     # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
-    def link_shared_lib (self,
-                         objects,
-                         output_libname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         export_symbols=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         build_temp=None,
-                         target_lang=None):
+    def link_shared_lib(self, objects, output_libname, output_dir=None,
+                        libraries=None, library_dirs=None,
+                        runtime_library_dirs=None, export_symbols=None,
+                        debug=0, extra_preargs=None, extra_postargs=None,
+                        build_temp=None, target_lang=None):
         self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
@@ -732,37 +677,21 @@ def link_shared_lib (self,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_shared_object (self,
-                            objects,
-                            output_filename,
-                            output_dir=None,
-                            libraries=None,
-                            library_dirs=None,
-                            runtime_library_dirs=None,
-                            export_symbols=None,
-                            debug=0,
-                            extra_preargs=None,
-                            extra_postargs=None,
-                            build_temp=None,
-                            target_lang=None):
+    def link_shared_object(self, objects, output_filename, output_dir=None,
+                           libraries=None, library_dirs=None,
+                           runtime_library_dirs=None, export_symbols=None,
+                           debug=0, extra_preargs=None, extra_postargs=None,
+                           build_temp=None, target_lang=None):
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
                   export_symbols, debug,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
-
-    def link_executable (self,
-                         objects,
-                         output_progname,
-                         output_dir=None,
-                         libraries=None,
-                         library_dirs=None,
-                         runtime_library_dirs=None,
-                         debug=0,
-                         extra_preargs=None,
-                         extra_postargs=None,
-                         target_lang=None):
+    def link_executable(self, objects, output_progname, output_dir=None,
+                        libraries=None, library_dirs=None,
+                        runtime_library_dirs=None, debug=0, extra_preargs=None,
+                        extra_postargs=None, target_lang=None):
         self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
                   libraries, library_dirs, runtime_library_dirs, None,
@@ -774,29 +703,26 @@ def link_executable (self,
     # no appropriate default implementation so subclasses should
     # implement all of these.
 
-    def library_dir_option (self, dir):
+    def library_dir_option(self, dir):
         """Return the compiler option to add 'dir' to the list of
         directories searched for libraries.
         """
         raise NotImplementedError
 
-    def runtime_library_dir_option (self, dir):
+    def runtime_library_dir_option(self, dir):
         """Return the compiler option to add 'dir' to the list of
         directories searched for runtime libraries.
         """
         raise NotImplementedError
 
-    def library_option (self, lib):
+    def library_option(self, lib):
         """Return the compiler option to add 'dir' to the list of libraries
         linked into the shared library or executable.
         """
         raise NotImplementedError
 
-    def has_function(self, funcname,
-                     includes=None,
-                     include_dirs=None,
-                     libraries=None,
-                     library_dirs=None):
+    def has_function(self, funcname, includes=None, include_dirs=None,
+                     libraries=None, library_dirs=None):
         """Return a boolean indicating whether funcname is supported on
         the current platform.  The optional arguments can be used to
         augment the compilation environment.
@@ -927,28 +853,28 @@ def library_filename(self, libname, lib_type='static',     # or 'shared'
 
     # -- Utility methods -----------------------------------------------
 
-    def announce (self, msg, level=1):
+    def announce(self, msg, level=1):
         log.debug(msg)
 
-    def debug_print (self, msg):
+    def debug_print(self, msg):
         from distutils.debug import DEBUG
         if DEBUG:
             print msg
 
-    def warn (self, msg):
-        sys.stderr.write ("warning: %s\n" % msg)
+    def warn(self, msg):
+        sys.stderr.write("warning: %s\n" % msg)
 
-    def execute (self, func, args, msg=None, level=1):
+    def execute(self, func, args, msg=None, level=1):
         execute(func, args, msg, self.dry_run)
 
-    def spawn (self, cmd):
-        spawn (cmd, dry_run=self.dry_run)
+    def spawn(self, cmd):
+        spawn(cmd, dry_run=self.dry_run)
 
-    def move_file (self, src, dst):
-        return move_file (src, dst, dry_run=self.dry_run)
+    def move_file(self, src, dst):
+        return move_file(src, dst, dry_run=self.dry_run)
 
-    def mkpath (self, name, mode=0777):
-        mkpath (name, mode, dry_run=self.dry_run)
+    def mkpath(self, name, mode=0777):
+        mkpath(name, mode, dry_run=self.dry_run)
 
 
 # class CCompiler
@@ -974,7 +900,6 @@ def mkpath (self, name, mode=0777):
     )
 
 def get_default_compiler(osname=None, platform=None):
-
     """ Determine the default compiler to use for the given platform.
 
         osname should be one of the standard Python OS names (i.e. the
@@ -1030,11 +955,7 @@ def show_compilers():
     pretty_printer.print_help("List of available compilers:")
 
 
-def new_compiler (plat=None,
-                  compiler=None,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
+def new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0):
     """Generate an instance of some CCompiler subclass for the supplied
     platform/compiler combination.  'plat' defaults to 'os.name'
     (eg. 'posix', 'nt'), and 'compiler' defaults to the default compiler
@@ -1076,10 +997,10 @@ def new_compiler (plat=None,
     # XXX The None is necessary to preserve backwards compatibility
     # with classes that expect verbose to be the first positional
     # argument.
-    return klass (None, dry_run, force)
+    return klass(None, dry_run, force)
 
 
-def gen_preprocess_options (macros, include_dirs):
+def gen_preprocess_options(macros, include_dirs):
     """Generate C pre-processor options (-D, -U, -I) as used by at least
     two types of compilers: the typical Unix compiler and Visual C++.
     'macros' is the usual thing, a list of 1- or 2-tuples, where (name,)

From 039104435cf43e73cc6d460637b95aac8ed4ef23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 11 Jan 2010 23:47:51 +0000
Subject: [PATCH 2839/8469] Merged revisions 77431 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77431 | tarek.ziade | 2010-01-12 00:41:32 +0100 (Tue, 12 Jan 2010) | 1 line

  module cleanup
........
---
 ccompiler.py | 77 +++++++++++++++-------------------------------------
 1 file changed, 22 insertions(+), 55 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 38c4ae8ec5..5a6bef447d 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -9,11 +9,12 @@
 import os
 import re
 
-from distutils.errors import CompileError, LinkError, UnknownFileError
+from distutils.errors import (CompileError, LinkError, UnknownFileError,
+                              DistutilsPlatformError, DistutilsModuleError)
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
-from distutils.dep_util import newer_pairwise, newer_group
+from distutils.dep_util import newer_group
 from distutils.util import split_quoted, execute
 from distutils import log
 
@@ -597,26 +598,15 @@ def create_static_lib(self, objects, output_libname, output_dir=None,
         """
         pass
 
-
     # values for target_desc parameter in link()
     SHARED_OBJECT = "shared_object"
     SHARED_LIBRARY = "shared_library"
     EXECUTABLE = "executable"
 
-    def link(self,
-             target_desc,
-             objects,
-             output_filename,
-             output_dir=None,
-             libraries=None,
-             library_dirs=None,
-             runtime_library_dirs=None,
-             export_symbols=None,
-             debug=0,
-             extra_preargs=None,
-             extra_postargs=None,
-             build_temp=None,
-             target_lang=None):
+    def link(self, target_desc, objects, output_filename, output_dir=None,
+             libraries=None, library_dirs=None, runtime_library_dirs=None,
+             export_symbols=None, debug=0, extra_preargs=None,
+             extra_postargs=None, build_temp=None, target_lang=None):
         """Link a bunch of stuff together to create an executable or
         shared library file.
 
@@ -665,19 +655,11 @@ def link(self,
 
     # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
-    def link_shared_lib(self,
-                        objects,
-                        output_libname,
-                        output_dir=None,
-                        libraries=None,
-                        library_dirs=None,
-                        runtime_library_dirs=None,
-                        export_symbols=None,
-                        debug=0,
-                        extra_preargs=None,
-                        extra_postargs=None,
-                        build_temp=None,
-                        target_lang=None):
+    def link_shared_lib(self, objects, output_libname, output_dir=None,
+                        libraries=None, library_dirs=None,
+                        runtime_library_dirs=None, export_symbols=None,
+                        debug=0, extra_preargs=None, extra_postargs=None,
+                        build_temp=None, target_lang=None):
         self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
@@ -686,19 +668,11 @@ def link_shared_lib(self,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_shared_object(self,
-                           objects,
-                           output_filename,
-                           output_dir=None,
-                           libraries=None,
-                           library_dirs=None,
-                           runtime_library_dirs=None,
-                           export_symbols=None,
-                           debug=0,
-                           extra_preargs=None,
-                           extra_postargs=None,
-                           build_temp=None,
-                           target_lang=None):
+    def link_shared_object(self, objects, output_filename, output_dir=None,
+                           libraries=None, library_dirs=None,
+                           runtime_library_dirs=None, export_symbols=None,
+                           debug=0, extra_preargs=None, extra_postargs=None,
+                           build_temp=None, target_lang=None):
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
@@ -706,17 +680,10 @@ def link_shared_object(self,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_executable(self,
-                        objects,
-                        output_progname,
-                        output_dir=None,
-                        libraries=None,
-                        library_dirs=None,
-                        runtime_library_dirs=None,
-                        debug=0,
-                        extra_preargs=None,
-                        extra_postargs=None,
-                        target_lang=None):
+    def link_executable(self, objects, output_progname, output_dir=None,
+                        libraries=None, library_dirs=None,
+                        runtime_library_dirs=None, debug=0, extra_preargs=None,
+                        extra_postargs=None, target_lang=None):
         self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
                   libraries, library_dirs, runtime_library_dirs, None,
@@ -898,7 +865,7 @@ def spawn(self, cmd):
     def move_file(self, src, dst):
         return move_file(src, dst, dry_run=self.dry_run)
 
-    def mkpath (self, name, mode=0o777):
+    def mkpath(self, name, mode=0o777):
         mkpath(name, mode, dry_run=self.dry_run)
 
 

From 2cb71ea99a87e5897c8d9fbfd4921f7470957c2f Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 17 Jan 2010 18:52:29 +0000
Subject: [PATCH 2840/8469] Ensure that distutils.tests.test_util will pass in
 64-bit builds.

Fixes #7591
---
 tests/test_util.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index dcc1a2069b..0c732f8244 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -96,7 +96,12 @@ def test_get_platform(self):
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
 
-        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        cursize = sys.maxsize
+        sys.maxsize = (2 ** 31)-1
+        try:
+            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        finally:
+            sys.maxsize = cursize
 
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'

From 3b04385b26f5921cc23593497b2c5a2dc596c417 Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 12:29:18 -0800
Subject: [PATCH 2841/8469] Ignore Vim swap files.

--HG--
branch : distribute
extra : rebase_source : 16e56c90065cf1325aadc76ef5f781ed66f2664e
---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index bcd2437b02..3ccf2a3af4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 *.pyc
 *~
+*.swp
 .coverage
 distribute.egg-info
 build

From eca7db803f7c10ebce0a16e982351fbdd60c3321 Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 12:44:31 -0800
Subject: [PATCH 2842/8469] Change upload_docs so that its use of base64 does
 not fail under Python 3.

While base64 accepts a string in Python 2, the module in Python 3 only
works with bytes. Changed the code so that base64.encodebytes() is
used, else catch the AttributeError and use base64.encodestring(). Not
fully tested yet as there is another failure farther down under under
Python 3.

--HG--
branch : distribute
extra : rebase_source : 37078c416d98ee7f6dff1715731ab3f0c186b6cf
---
 setuptools/command/upload_docs.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 29c62f2a05..566a726827 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -75,8 +75,14 @@ def upload_file(self, filename):
             'content': (os.path.basename(filename), content),
         }
         # set up the authentication
-        auth = "Basic " + base64.encodestring(
-            self.username + ":" + self.password).strip()
+        credentials = self.username + ':' + self.password
+        try:  # base64 only works with bytes in Python 3.
+            encoded_creds = base64.encodebytes(credentials.encode('utf8'))
+            auth = b"Basic"
+        except AttributeError:
+            encoded_creds = base64.encodestring(credentials)
+            auth = "Basic"
+        auth += encoded_creds.strip()
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'

From 8b1e0905135c56a9f66d5d6043ba33ac4ffab435 Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 12:55:33 -0800
Subject: [PATCH 2843/8469] Add back in a missing space between "Basic" and the
 base64-encoded credentials for uploading docs.

--HG--
branch : distribute
extra : rebase_source : 0de13aa44d415d7afef4218190ef0742999630ff
---
 setuptools/command/upload_docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 566a726827..46e06bc6fa 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -78,10 +78,10 @@ def upload_file(self, filename):
         credentials = self.username + ':' + self.password
         try:  # base64 only works with bytes in Python 3.
             encoded_creds = base64.encodebytes(credentials.encode('utf8'))
-            auth = b"Basic"
+            auth = b"Basic "
         except AttributeError:
             encoded_creds = base64.encodestring(credentials)
-            auth = "Basic"
+            auth = "Basic "
         auth += encoded_creds.strip()
 
         # Build up the MIME payload for the POST data

From 07f219c589799bcb539ac79382f63cb5f1aafe2f Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 12:57:41 -0800
Subject: [PATCH 2844/8469] Rename variable 'http' to 'conn' as httplib is
 renamed http in Python 3.

--HG--
branch : distribute
extra : rebase_source : 50d0da5b2e099c4bfe55ad81dce0f73edb4f994c
---
 setuptools/command/upload_docs.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 46e06bc6fa..4548635cbe 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -121,28 +121,28 @@ def upload_file(self, filename):
             urlparse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
-            http = httplib.HTTPConnection(netloc)
+            conn = httplib.HTTPConnection(netloc)
         elif schema == 'https':
-            http = httplib.HTTPSConnection(netloc)
+            conn = httplib.HTTPSConnection(netloc)
         else:
             raise AssertionError("unsupported schema "+schema)
 
         data = ''
         loglevel = log.INFO
         try:
-            http.connect()
-            http.putrequest("POST", url)
-            http.putheader('Content-type',
+            conn.connect()
+            conn.putrequest("POST", url)
+            conn.putheader('Content-type',
                            'multipart/form-data; boundary=%s'%boundary)
-            http.putheader('Content-length', str(len(body)))
-            http.putheader('Authorization', auth)
-            http.endheaders()
-            http.send(body)
+            conn.putheader('Content-length', str(len(body)))
+            conn.putheader('Authorization', auth)
+            conn.endheaders()
+            conn.send(body)
         except socket.error, e:
             self.announce(str(e), log.ERROR)
             return
 
-        r = http.getresponse()
+        r = conn.getresponse()
         if r.status == 200:
             self.announce('Server response (%s): %s' % (r.status, r.reason),
                           log.INFO)

From 56d8bf130caec9061d304dbedf0a1b7e8f5ff396 Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 13:17:10 -0800
Subject: [PATCH 2845/8469] Use more reasonable variable names.

--HG--
branch : distribute
extra : rebase_source : f05e05486f624a3234e19af2d5b108e80b82df10
---
 setuptools/command/upload_docs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 4548635cbe..d8c864e411 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -89,11 +89,11 @@ def upload_file(self, filename):
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
         body = StringIO.StringIO()
-        for key, value in data.items():
+        for key, values in data.items():
             # handle multiple entries for the same name
-            if type(value) != type([]):
-                value = [value]
-            for value in value:
+            if type(values) != type([]):
+                values = [values]
+            for value in values:
                 if type(value) is tuple:
                     fn = ';filename="%s"' % value[0]
                     value = value[1]

From 72d79d0466d0bfb566939075d651a9f111189137 Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 14:32:16 -0800
Subject: [PATCH 2846/8469] Add some compatibility code for upload_docs so it
 will work in both Python 2 and Python 3.

At this point in manual testing, Python 2.6 still works fine, but
Python 3 is getting a 200 from the upload which is not what is wanted;
a 301 is what is expected for a successful upload. But at least Python
3 is not throwing any more exceptions.

--HG--
branch : distribute
extra : rebase_source : 00020ec37fec743077e9614f8b0141aab41cc932
---
 distribute.egg-info/entry_points.txt |  2 +-
 setuptools/command/upload_docs.py    | 48 +++++++++++++++++-----------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..e1f704d8cb 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index d8c864e411..e961a0df18 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -12,12 +12,25 @@
 import base64
 import urlparse
 import tempfile
-import cStringIO as StringIO
 
 from distutils import log
 from distutils.errors import DistutilsOptionError
 from distutils.command.upload import upload
 
+try:
+    bytes
+except NameError:
+    bytes = str
+
+def b(str_or_bytes):
+    """Return bytes by either encoding the argument as ASCII or simply return
+    the argument as-is."""
+    if not isinstance(str_or_bytes, bytes):
+        return str_or_bytes.encode('ascii')
+    else:
+        return str_or_bytes
+
+
 class upload_docs(upload):
 
     description = 'Upload documentation to PyPI'
@@ -85,31 +98,30 @@ def upload_file(self, filename):
         auth += encoded_creds.strip()
 
         # Build up the MIME payload for the POST data
-        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = '\n--' + boundary
-        end_boundary = sep_boundary + '--'
-        body = StringIO.StringIO()
+        boundary = b('--------------GHSKFJDLGDS7543FJKLFHRE75642756743254')
+        sep_boundary = b('\n--') + boundary
+        end_boundary = sep_boundary + b('--')
+        body = []
         for key, values in data.items():
             # handle multiple entries for the same name
             if type(values) != type([]):
                 values = [values]
             for value in values:
                 if type(value) is tuple:
-                    fn = ';filename="%s"' % value[0]
+                    fn = b(';filename="%s"' % value[0])
                     value = value[1]
                 else:
-                    fn = ""
-                value = str(value)
-                body.write(sep_boundary)
-                body.write('\nContent-Disposition: form-data; name="%s"'%key)
-                body.write(fn)
-                body.write("\n\n")
-                body.write(value)
-                if value and value[-1] == '\r':
-                    body.write('\n')  # write an extra newline (lurve Macs)
-        body.write(end_boundary)
-        body.write("\n")
-        body = body.getvalue()
+                    fn = b("")
+                body.append(sep_boundary)
+                body.append(b('\nContent-Disposition: form-data; name="%s"'%key))
+                body.append(fn)
+                body.append(b("\n\n"))
+                body.append(b(value))
+                if value and value[-1] == b('\r'):
+                    body.append(b('\n'))  # write an extra newline (lurve Macs)
+        body.append(end_boundary)
+        body.append(b("\n"))
+        body = b('').join(body)
 
         self.announce("Submitting documentation to %s" % (self.repository),
                       log.INFO)

From 8b3effb4f5fc0ee84fdf1e36d8bb7d8a17f1258d Mon Sep 17 00:00:00 2001
From: "\"Brett Cannon ext:(%22)" <brett@python.org>
Date: Sun, 17 Jan 2010 14:33:03 -0800
Subject: [PATCH 2847/8469] Revert Python 3 change to entry_points.txt.

--HG--
branch : distribute
extra : rebase_source : a2dccb8f52e60f1e746ecfd72ff77b9a94080e23
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index e1f704d8cb..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From efc2ae7c3f74eaf033d45215d6911fe030face88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 23 Jan 2010 09:23:15 +0000
Subject: [PATCH 2848/8469] taking sysconfig out of distutils

---
 ccompiler.py                  |  52 +++
 command/bdist.py              |   2 +-
 command/bdist_dumb.py         |   4 +-
 command/bdist_wininst.py      |   4 +-
 command/build.py              |   3 +-
 command/build_clib.py         |   2 +-
 command/build_ext.py          |  37 +--
 command/build_scripts.py      |  10 +-
 command/config.py             |   2 +-
 command/install.py            | 163 +++------
 core.py                       |   2 +-
 cygwinccompiler.py            |   4 +-
 extension.py                  |  12 +-
 msvc9compiler.py              |  10 +-
 sysconfig.py                  | 608 ++++------------------------------
 tests/support.py              |   8 +
 tests/test_build.py           |   2 +-
 tests/test_build_clib.py      |   3 +-
 tests/test_build_ext.py       |  17 +-
 tests/test_build_scripts.py   |   6 +-
 tests/test_ccompiler.py       |  26 +-
 tests/test_cygwinccompiler.py |   3 +-
 tests/test_extension.py       |   2 +
 tests/test_install.py         |  53 +--
 tests/test_sysconfig.py       |  33 +-
 tests/test_unixccompiler.py   |   2 +-
 tests/test_util.py            |  42 +--
 unixccompiler.py              |  10 +-
 util.py                       | 170 +---------
 29 files changed, 307 insertions(+), 985 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 97c61dd46f..a34177e71f 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -18,6 +18,58 @@
 from distutils.util import split_quoted, execute
 from distutils import log
 
+_sysconfig = __import__('sysconfig')
+
+def customize_compiler(compiler):
+    """Do any platform-specific customization of a CCompiler instance.
+
+    Mainly needed on Unix, so we can plug in the information that
+    varies across Unices and is stored in Python's Makefile.
+    """
+    if compiler.compiler_type == "unix":
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+            _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+                                       'CCSHARED', 'LDSHARED', 'SO', 'AR',
+                                       'ARFLAGS')
+
+        if 'CC' in os.environ:
+            cc = os.environ['CC']
+        if 'CXX' in os.environ:
+            cxx = os.environ['CXX']
+        if 'LDSHARED' in os.environ:
+            ldshared = os.environ['LDSHARED']
+        if 'CPP' in os.environ:
+            cpp = os.environ['CPP']
+        else:
+            cpp = cc + " -E"           # not always
+        if 'LDFLAGS' in os.environ:
+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if 'CFLAGS' in os.environ:
+            cflags = opt + ' ' + os.environ['CFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
+        if 'CPPFLAGS' in os.environ:
+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
+        else:
+            archiver = ar + ' ' + ar_flags
+
+        cc_cmd = cc + ' ' + cflags
+        compiler.set_executables(
+            preprocessor=cpp,
+            compiler=cc_cmd,
+            compiler_so=cc_cmd + ' ' + ccshared,
+            compiler_cxx=cxx,
+            linker_so=ldshared,
+            linker_exe=cc,
+            archiver=archiver)
+
+        compiler.shared_lib_extension = so_ext
+
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
     by real compiler classes.  Also has some utility methods used by
diff --git a/command/bdist.py b/command/bdist.py
index 8cd69701cf..764024a008 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,10 +6,10 @@
 __revision__ = "$Id$"
 
 import os
+from sysconfig import get_platform
 
 from distutils.core import Command
 from distutils.errors import DistutilsPlatformError, DistutilsOptionError
-from distutils.util import get_platform
 
 
 def show_formats():
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 358a70eacf..f7331d59b9 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -8,11 +8,11 @@
 
 import os
 
+from sysconfig import get_python_version, get_platform
+
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import DistutilsPlatformError
-from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb (Command):
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index cf4282d83f..0ece0306bc 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -9,11 +9,11 @@
 import os
 import string
 
+from sysconfig import get_python_version, get_platform
+
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
-from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_wininst (Command):
diff --git a/command/build.py b/command/build.py
index d394e4b1da..b84e40d6c9 100644
--- a/command/build.py
+++ b/command/build.py
@@ -5,9 +5,10 @@
 __revision__ = "$Id$"
 
 import sys, os
+from sysconfig import get_platform
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
-from distutils.util import get_platform
 
 def show_compilers():
     from distutils.ccompiler import show_compilers
diff --git a/command/build_clib.py b/command/build_clib.py
index 50b64dba25..8d49de75e1 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -19,7 +19,7 @@
 import os
 from distutils.core import Command
 from distutils.errors import DistutilsSetupError
-from distutils.sysconfig import customize_compiler
+from distutils.ccompiler import customize_compiler
 from distutils import log
 
 def show_compilers():
diff --git a/command/build_ext.py b/command/build_ext.py
index ff1a4be315..13bd030eb6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -9,13 +9,14 @@
 import sys, os, re
 from warnings import warn
 
+from sysconfig import get_platform
+
 from distutils.core import Command
-from distutils.errors import (CCompilerError, DistutilsError, CompileError,
-                              DistutilsSetupError, DistutilsPlatformError)
-from distutils.sysconfig import customize_compiler, get_python_version
+from distutils.errors import *
+from distutils.ccompiler import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
-from distutils.util import get_platform
+
 from distutils import log
 
 # this keeps compatibility from 2.3 to 2.5
@@ -173,8 +174,7 @@ def initialize_options(self):
         self.user = None
 
     def finalize_options(self):
-        from distutils import sysconfig
-
+        _sysconfig = __import__('sysconfig')
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('build_temp', 'build_temp'),
@@ -191,8 +191,8 @@ def finalize_options(self):
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        py_include = sysconfig.get_python_inc()
-        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        py_include = _sysconfig.get_path('include')
+        plat_py_include = _sysconfig.get_path('platinclude')
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if isinstance(self.include_dirs, str):
@@ -270,7 +270,7 @@ def finalize_options(self):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                                      "python" + get_python_version(),
+                                  "python" + _sysconfig.get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions
@@ -278,13 +278,13 @@ def finalize_options(self):
 
         # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        sysconfig.get_config_var('Py_ENABLE_SHARED')
+        _sysconfig.get_config_var('Py_ENABLE_SHARED')
         if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
              or sys.platform.startswith('sunos'))
-            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
+            and _sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
-                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+                self.library_dirs.append(_sysconfig.get_config_var('LIBDIR'))
             else:
                 # building python standard extensions
                 self.library_dirs.append('.')
@@ -719,13 +719,13 @@ def get_ext_filename(self, ext_name):
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-        from distutils.sysconfig import get_config_var
+        _sysconfig = __import__('sysconfig')
         ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
-        so_ext = get_config_var('SO')
+        so_ext = _sysconfig.get_config_var('SO')
         if os.name == 'nt' and self.debug:
             return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
@@ -785,14 +785,13 @@ def get_libraries(self, ext):
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "atheos":
-            from distutils import sysconfig
-
+            _sysconfig = __import__('sysconfig')
             template = "python%d.%d"
             pythonlib = (template %
                    (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
             # Get SHLIBS from Makefile
             extra = []
-            for lib in sysconfig.get_config_var('SHLIBS').split():
+            for lib in _sysconfig.get_config_var('SHLIBS').split():
                 if lib.startswith('-l'):
                     extra.append(lib[2:])
                 else:
@@ -806,8 +805,8 @@ def get_libraries(self, ext):
             return ext.libraries
 
         else:
-            from distutils import sysconfig
-            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            _sysconfig = __import__('sysconfig')
+            if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 template = "python%d.%d"
                 pythonlib = (template %
                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 2ad4c7beb9..567df6587e 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -6,7 +6,6 @@
 
 import os, re
 from stat import ST_MODE
-from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
 from distutils.util import convert_path
@@ -57,6 +56,7 @@ def copy_scripts (self):
         ie. starts with "\#!" and contains "python"), then adjust the first
         line to refer to the current Python interpreter as we copy.
         """
+        _sysconfig = __import__('sysconfig')
         self.mkpath(self.build_dir)
         outfiles = []
         for script in self.scripts:
@@ -94,16 +94,16 @@ def copy_scripts (self):
                          self.build_dir)
                 if not self.dry_run:
                     outf = open(outfile, "w")
-                    if not sysconfig.python_build:
+                    if not _sysconfig.is_python_build():
                         outf.write("#!%s%s\n" %
                                    (self.executable,
                                     post_interp))
                     else:
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
-                            sysconfig.get_config_var("BINDIR"),
-                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
-                                           sysconfig.get_config_var("EXE"))),
+                            _sysconfig.get_config_var("BINDIR"),
+                           "python%s%s" % (_sysconfig.get_config_var("VERSION"),
+                                           _sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/command/config.py b/command/config.py
index b084913563..da8da59538 100644
--- a/command/config.py
+++ b/command/config.py
@@ -16,7 +16,7 @@
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
-from distutils.sysconfig import customize_compiler
+from distutils.ccompiler import customize_compiler
 from distutils import log
 
 LANG_EXT = {'c': '.c', 'c++': '.cxx'}
diff --git a/command/install.py b/command/install.py
index 8f089c3172..68d6227ada 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,115 +7,25 @@
 import sys
 import os
 
+from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
+                       get_config_var)
+
 from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
-from distutils.sysconfig import get_config_vars
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, subst_vars, change_root
-from distutils.util import get_platform
+from distutils.util import convert_path, change_root
 from distutils.errors import DistutilsOptionError
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
-
-if sys.version < "2.2":
-    WINDOWS_SCHEME = {
-        'purelib': '$base',
-        'platlib': '$base',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-else:
-    WINDOWS_SCHEME = {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-
-INSTALL_SCHEMES = {
-    'unix_prefix': {
-        'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-        'headers': '$base/include/python$py_version_short/$dist_name',
-        'scripts': '$base/bin',
-        'data'   : '$base',
-        },
-    'unix_home': {
-        'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
-        'headers': '$base/include/python/$dist_name',
-        'scripts': '$base/bin',
-        'data'   : '$base',
-        },
-    'nt': WINDOWS_SCHEME,
-    'mac': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-
-    'os2': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-    }
-
-# user site schemes
-if HAS_USER_SITE:
-    INSTALL_SCHEMES['nt_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['unix_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['mac_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['os2_home'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-# The keys to an installation scheme; if any new types of files are to be
-# installed, be sure to add an entry to every installation scheme above,
-# and to SCHEME_KEYS here.
-SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
-
+def _subst_vars(s, local_vars):
+    try:
+        return s.format(**local_vars)
+    except KeyError:
+        try:
+            return s.format(**os.environ)
+        except KeyError, var:
+            raise AttributeError('{%s}' % var)
 
 class install(Command):
 
@@ -182,11 +92,10 @@ class install(Command):
 
     boolean_options = ['compile', 'force', 'skip-build']
 
-    if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "install in user site-package '%s'" % USER_SITE))
-        boolean_options.append('user')
-
+    user_options.append(('user', None,
+                        "install in user site-package '%s'" % \
+                            get_path('purelib', '%s_user' % os.name)))
+    boolean_options.append('user')
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -216,8 +125,8 @@ def initialize_options(self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
-        self.install_userbase = USER_BASE
-        self.install_usersite = USER_SITE
+        self.install_userbase = get_config_var('userbase')
+        self.install_usersite = get_path('purelib', '%s_user' % os.name)
 
         self.compile = None
         self.optimize = None
@@ -327,7 +236,9 @@ def finalize_options(self):
         # about needing recursive variable expansion (shudder).
 
         py_version = sys.version.split()[0]
-        (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
+        prefix, exec_prefix, srcdir = get_config_vars('prefix', 'exec_prefix',
+                                                      'srcdir')
+
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
@@ -338,12 +249,11 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            'srcdir': srcdir,
                            }
 
-        if HAS_USER_SITE:
-            self.config_vars['userbase'] = self.install_userbase
-            self.config_vars['usersite'] = self.install_usersite
-
+        self.config_vars['userbase'] = self.install_userbase
+        self.config_vars['usersite'] = self.install_usersite
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
@@ -447,10 +357,10 @@ def finalize_unix(self):
                 raise DistutilsPlatformError(
                     "User base directory is not specified")
             self.install_base = self.install_platbase = self.install_userbase
-            self.select_scheme("unix_user")
+            self.select_scheme("posix_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("unix_home")
+            self.select_scheme("posix_home")
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
@@ -466,7 +376,7 @@ def finalize_unix(self):
 
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
-            self.select_scheme("unix_prefix")
+            self.select_scheme("posix_prefix")
 
     def finalize_other(self):
         """Finalizes options for non-posix platforms"""
@@ -478,7 +388,7 @@ def finalize_other(self):
             self.select_scheme(os.name + "_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("unix_home")
+            self.select_scheme("posix_home")
         else:
             if self.prefix is None:
                 self.prefix = os.path.normpath(sys.prefix)
@@ -493,11 +403,15 @@ def finalize_other(self):
     def select_scheme(self, name):
         """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
-        scheme = INSTALL_SCHEMES[name]
-        for key in SCHEME_KEYS:
+        scheme = get_paths(name, expand=False)
+        for key, value in scheme.items():
+            if key == 'platinclude':
+                key = 'headers'
+                value = os.path.join(value, self.distribution.get_name())
             attrname = 'install_' + key
-            if getattr(self, attrname) is None:
-                setattr(self, attrname, scheme[key])
+            if hasattr(self, attrname):
+                if getattr(self, attrname) is None:
+                    setattr(self, attrname, value)
 
     def _expand_attrs(self, attrs):
         for attr in attrs:
@@ -505,7 +419,10 @@ def _expand_attrs(self, attrs):
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                val = subst_vars(val, self.config_vars)
+                try:
+                    val = _subst_vars(val, self.config_vars)
+                except:
+                    import pdb; pdb.set_trace()
                 setattr(self, attr, val)
 
     def expand_basedirs(self):
diff --git a/core.py b/core.py
index 0b725ff09d..99ccf44fad 100644
--- a/core.py
+++ b/core.py
@@ -35,7 +35,7 @@
 
 def gen_usage(script_name):
     script = os.path.basename(script_name)
-    return USAGE % vars()
+    return USAGE % {'script': script}
 
 
 # Some mild magic to control the behaviour of 'setup()' from 'run_setup()'.
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index eed9c321af..2a61bd5ad7 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -337,7 +337,7 @@ def check_config_h():
     # XXX since this function also checks sys.version, it's not strictly a
     # "pyconfig.h" check -- should probably be renamed...
 
-    from distutils import sysconfig
+    _sysconfig = __import__('sysconfig')
 
     # if sys.version contains GCC then python was compiled with GCC, and the
     # pyconfig.h file should be OK
@@ -345,7 +345,7 @@ def check_config_h():
         return CONFIG_H_OK, "sys.version mentions 'GCC'"
 
     # let's see if __GNUC__ is mentioned in python.h
-    fn = sysconfig.get_config_h_filename()
+    fn = _sysconfig.get_config_h_filename()
     try:
         with open(fn) as config_h:
             if "__GNUC__" in config_h.read():
diff --git a/extension.py b/extension.py
index 9988ec0c2c..244b1e78ec 100644
--- a/extension.py
+++ b/extension.py
@@ -134,14 +134,17 @@ def __init__ (self, name, sources,
 
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
-    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+    warnings.warn('distutils.extensions.read_setup_file is deprecated. '
+                  'It will be removed in the next Python release.')
+    _sysconfig = __import__('sysconfig')
+    from distutils.sysconfig import (expand_makefile_vars,
                                      _variable_rx)
 
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
     # First pass over the file to gather "VAR = VALUE" assignments.
-    vars = parse_makefile(filename)
+    vars = _sysconfig._parse_makefile(filename)
 
     # Second pass to gobble up the real content: lines of the form
     #   <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -161,7 +164,10 @@ def read_setup_file(filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        line = expand_makefile_vars(line, vars)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            line = expand_makefile_vars(line, vars)
+
         words = split_quoted(line)
 
         # NB. this parses a slightly different syntax than the old
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 41d67faf59..6ac24f83dc 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -23,10 +23,10 @@
                               CompileError, LibError, LinkError)
 from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
-from distutils.util import get_platform
-
 import _winreg
 
+_sysconfig = __import__('sysconfig')
+
 RegOpenKeyEx = _winreg.OpenKeyEx
 RegEnumKey = _winreg.EnumKey
 RegEnumValue = _winreg.EnumValue
@@ -327,7 +327,7 @@ def initialize(self, plat_name=None):
         # multi-init means we would need to check platform same each time...
         assert not self.initialized, "don't init multiple times"
         if plat_name is None:
-            plat_name = get_platform()
+            plat_name = _sysconfig.get_platform()
         # sanity check for platforms to prevent obscure errors later.
         ok_plats = 'win32', 'win-amd64', 'win-ia64'
         if plat_name not in ok_plats:
@@ -348,12 +348,12 @@ def initialize(self, plat_name=None):
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
             # No idea how itanium handles this, if at all.
-            if plat_name == get_platform() or plat_name == 'win32':
+            if plat_name == _sysconfig.get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
             else:
                 # cross compile from win32 -> some 64bit
-                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
+                plat_spec = PLAT_TO_VCVARS[_sysconfig.get_platform()] + '_' + \
                             PLAT_TO_VCVARS[plat_name]
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
diff --git a/sysconfig.py b/sysconfig.py
index f3b2aca613..bb8b5125e4 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -7,58 +7,42 @@
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
+
+**This module has been moved out of Distutils and will be removed from
+Python in the next version (3.2)**
 """
 
 __revision__ = "$Id$"
 
-import os
 import re
-import sys
-
-from distutils.errors import DistutilsPlatformError
-
-# These are needed in a couple of spots, so just compute them once.
-PREFIX = os.path.normpath(sys.prefix)
-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-
-# Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-# it'll live in project/PCbuild/amd64.
-project_base = os.path.dirname(os.path.abspath(sys.executable))
-if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
-# PC/VS7.1
-if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
-# PC/AMD64
-if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
-
-# python_build: (Boolean) if true, we're either building Python or
-# building an extension with an un-installed Python, so we use
-# different (hard-wired) directories.
-# Setup.local is available for Makefile builds including VPATH builds,
-# Setup.dist is available on Windows
-def _python_build():
-    for fn in ("Setup.dist", "Setup.local"):
-        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
-            return True
-    return False
-python_build = _python_build()
+from warnings import warn
 
+# importing sysconfig from Lib
+# to avoid this module to shadow it
+_sysconfig = __import__('sysconfig')
 
-def get_python_version():
-    """Return a string containing the major and minor Python version,
-    leaving off the patchlevel.  Sample return values could be '1.5'
-    or '2.2'.
-    """
-    return sys.version[:3]
+_DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
+                    "Use the APIs provided by the sysconfig module instead")
+
+def _get_project_base():
+    return _sysconfig._PROJECT_BASE
 
+project_base = _get_project_base()
+
+class _DeprecatedBool(int):
+    def __nonzero__(self):
+        warn(_DEPRECATION_MSG % 'get_python_version', DeprecationWarning)
+        return super(_DeprecatedBool, self).__nonzero__()
+
+def _python_build():
+    return _DeprecatedBool(_sysconfig.is_python_build())
+
+python_build = _python_build()
 
 def get_python_inc(plat_specific=0, prefix=None):
-    """Return the directory containing installed Python header files.
+    """This function is deprecated.
+
+    Return the directory containing installed Python header files.
 
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
@@ -68,39 +52,22 @@ def get_python_inc(plat_specific=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
-    if os.name == "posix":
-        if python_build:
-            # Assume the executable is in the build directory.  The
-            # pyconfig.h file should be in the same directory.  Since
-            # the build directory may not be the source directory, we
-            # must use "srcdir" from the makefile to find the "Include"
-            # directory.
-            base = os.path.dirname(os.path.abspath(sys.executable))
-            if plat_specific:
-                return base
-            else:
-                incdir = os.path.join(get_config_var('srcdir'), 'Include')
-                return os.path.normpath(incdir)
-        return os.path.join(prefix, "include", "python" + get_python_version())
-    elif os.name == "nt":
-        return os.path.join(prefix, "include")
-    elif os.name == "mac":
-        if plat_specific:
-            return os.path.join(prefix, "Mac", "Include")
-        else:
-            return os.path.join(prefix, "Include")
-    elif os.name == "os2":
-        return os.path.join(prefix, "Include")
+    warn(_DEPRECATION_MSG % 'get_python_inc', DeprecationWarning)
+    get_path = _sysconfig.get_path
+
+    if prefix is not None:
+        vars = {'base': prefix}
+        return get_path('include', vars=vars)
+
+    if not plat_specific:
+        return get_path('include')
     else:
-        raise DistutilsPlatformError(
-            "I don't know where Python installs its C header files "
-            "on platform '%s'" % os.name)
+        return get_path('platinclude')
 
+def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
+    """This function is deprecated.
 
-def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-    """Return the directory containing the Python library (standard or
+    Return the directory containing the Python library (standard or
     site additions).
 
     If 'plat_specific' is true, return the directory containing
@@ -113,153 +80,33 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
-
-    if os.name == "posix":
-        libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
-        if standard_lib:
-            return libpython
-        else:
-            return os.path.join(libpython, "site-packages")
-
-    elif os.name == "nt":
-        if standard_lib:
-            return os.path.join(prefix, "Lib")
+    warn(_DEPRECATION_MSG % 'get_python_lib', DeprecationWarning)
+    vars = {}
+    get_path = _sysconfig.get_path
+    if prefix is not None:
+        if plat_specific:
+            vars['platbase'] = prefix
         else:
-            if get_python_version() < "2.2":
-                return prefix
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
+            vars['base'] = prefix
 
-    elif os.name == "mac":
+    if standard_lib:
         if plat_specific:
-            if standard_lib:
-                return os.path.join(prefix, "Lib", "lib-dynload")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-        else:
-            if standard_lib:
-                return os.path.join(prefix, "Lib")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-
-    elif os.name == "os2":
-        if standard_lib:
-            return os.path.join(prefix, "Lib")
+            return get_path('platstdlib', vars=vars)
         else:
-            return os.path.join(prefix, "Lib", "site-packages")
-
+            return get_path('stdlib', vars=vars)
     else:
-        raise DistutilsPlatformError(
-            "I don't know where Python installs its library "
-            "on platform '%s'" % os.name)
-
-
-def customize_compiler(compiler):
-    """Do any platform-specific customization of a CCompiler instance.
-
-    Mainly needed on Unix, so we can plug in the information that
-    varies across Unices and is stored in Python's Makefile.
-    """
-    if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
-
-        if 'CC' in os.environ:
-            cc = os.environ['CC']
-        if 'CXX' in os.environ:
-            cxx = os.environ['CXX']
-        if 'LDSHARED' in os.environ:
-            ldshared = os.environ['LDSHARED']
-        if 'CPP' in os.environ:
-            cpp = os.environ['CPP']
-        else:
-            cpp = cc + " -E"           # not always
-        if 'LDFLAGS' in os.environ:
-            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if 'CFLAGS' in os.environ:
-            cflags = opt + ' ' + os.environ['CFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if 'CPPFLAGS' in os.environ:
-            cpp = cpp + ' ' + os.environ['CPPFLAGS']
-            cflags = cflags + ' ' + os.environ['CPPFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-        if 'AR' in os.environ:
-            ar = os.environ['AR']
-        if 'ARFLAGS' in os.environ:
-            archiver = ar + ' ' + os.environ['ARFLAGS']
-        else:
-            archiver = ar + ' ' + ar_flags
-
-        cc_cmd = cc + ' ' + cflags
-        compiler.set_executables(
-            preprocessor=cpp,
-            compiler=cc_cmd,
-            compiler_so=cc_cmd + ' ' + ccshared,
-            compiler_cxx=cxx,
-            linker_so=ldshared,
-            linker_exe=cc,
-            archiver=archiver)
-
-        compiler.shared_lib_extension = so_ext
-
-
-def get_config_h_filename():
-    """Return full pathname of installed pyconfig.h file."""
-    if python_build:
-        if os.name == "nt":
-            inc_dir = os.path.join(project_base, "PC")
+        if plat_specific:
+            return get_path('platlib', vars=vars)
         else:
-            inc_dir = project_base
-    else:
-        inc_dir = get_python_inc(plat_specific=1)
-    if get_python_version() < '2.2':
-        config_h = 'config.h'
-    else:
-        # The name of the config.h file changed in 2.2
-        config_h = 'pyconfig.h'
-    return os.path.join(inc_dir, config_h)
-
+            return get_path('purelib', vars=vars)
 
 def get_makefile_filename():
-    """Return full pathname of installed Makefile from the Python build."""
-    if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
-    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
-    return os.path.join(lib_dir, "config", "Makefile")
-
+    """This function is deprecated.
 
-def parse_config_h(fp, g=None):
-    """Parse a config.h-style file.
-
-    A dictionary containing name/value pairs is returned.  If an
-    optional dictionary is passed in as the second argument, it is
-    used instead of a new dictionary.
+    Return full pathname of installed Makefile from the Python build.
     """
-    if g is None:
-        g = {}
-    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
-    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
-    #
-    while 1:
-        line = fp.readline()
-        if not line:
-            break
-        m = define_rx.match(line)
-        if m:
-            n, v = m.group(1, 2)
-            try: v = int(v)
-            except ValueError: pass
-            g[n] = v
-        else:
-            m = undef_rx.match(line)
-            if m:
-                g[m.group(1)] = 0
-    return g
-
+    warn(_DEPRECATION_MSG % 'get_makefile_filename', DeprecationWarning)
+    return _sysconfig._get_makefile_filename()
 
 # Regexes needed for parsing Makefile (and similar syntaxes,
 # like old-style Setup files).
@@ -268,91 +115,29 @@ def parse_config_h(fp, g=None):
 _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
 
 def parse_makefile(fn, g=None):
-    """Parse a Makefile-style file.
+    """This function is deprecated.
+
+    Parse a Makefile-style file.
 
     A dictionary containing name/value pairs is returned.  If an
     optional dictionary is passed in as the second argument, it is
     used instead of a new dictionary.
     """
-    from distutils.text_file import TextFile
-    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
-
-    if g is None:
-        g = {}
-    done = {}
-    notdone = {}
-
-    while 1:
-        line = fp.readline()
-        if line is None:  # eof
-            break
-        m = _variable_rx.match(line)
-        if m:
-            n, v = m.group(1, 2)
-            v = v.strip()
-            # `$$' is a literal `$' in make
-            tmpv = v.replace('$$', '')
-
-            if "$" in tmpv:
-                notdone[n] = v
-            else:
-                try:
-                    v = int(v)
-                except ValueError:
-                    # insert literal `$'
-                    done[n] = v.replace('$$', '$')
-                else:
-                    done[n] = v
-
-    # do variable interpolation here
-    while notdone:
-        for name in notdone.keys():
-            value = notdone[name]
-            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
-            if m:
-                n = m.group(1)
-                found = True
-                if n in done:
-                    item = str(done[n])
-                elif n in notdone:
-                    # get it on a subsequent round
-                    found = False
-                elif n in os.environ:
-                    # do it like make: fall back to environment
-                    item = os.environ[n]
-                else:
-                    done[n] = item = ""
-                if found:
-                    after = value[m.end():]
-                    value = value[:m.start()] + item + after
-                    if "$" in after:
-                        notdone[name] = value
-                    else:
-                        try: value = int(value)
-                        except ValueError:
-                            done[name] = value.strip()
-                        else:
-                            done[name] = value
-                        del notdone[name]
-            else:
-                # bogus variable reference; just drop it since we can't deal
-                del notdone[name]
-
-    fp.close()
-
-    # save the results in the global dictionary
-    g.update(done)
-    return g
-
+    warn(_DEPRECATION_MSG % 'parse_makefile', DeprecationWarning)
+    return _sysconfig._parse_makefile(fn, g)
 
 def expand_makefile_vars(s, vars):
-    """Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
+    """This function is deprecated.
+
+    Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
     'string' according to 'vars' (a dictionary mapping variable names to
     values).  Variables not present in 'vars' are silently expanded to the
     empty string.  The variable values in 'vars' should not contain further
     variable expansions; if 'vars' is the output of 'parse_makefile()',
     you're fine.  Returns a variable-expanded version of 's'.
     """
+    warn('this function will be removed in then next version of Python',
+         DeprecationWarning)
 
     # This algorithm does multiple expansion, so if vars['foo'] contains
     # "${bar}", it will expand ${foo} to ${bar}, and then expand
@@ -368,264 +153,3 @@ def expand_makefile_vars(s, vars):
         else:
             break
     return s
-
-
-_config_vars = None
-
-def _init_posix():
-    """Initialize the module as appropriate for POSIX systems."""
-    g = {}
-    # load the installed Makefile:
-    try:
-        filename = get_makefile_filename()
-        parse_makefile(filename, g)
-    except IOError, msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # load the installed pyconfig.h:
-    try:
-        filename = get_config_h_filename()
-        parse_config_h(file(filename), g)
-    except IOError, msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # On MacOSX we need to check the setting of the environment variable
-    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
-    # it needs to be compatible.
-    # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
-        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
-        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
-        if cur_target == '':
-            cur_target = cfg_target
-            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
-        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
-            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
-                % (cur_target, cfg_target))
-            raise DistutilsPlatformError(my_msg)
-
-    # On AIX, there are wrong paths to the linker scripts in the Makefile
-    # -- these paths are relative to the Python source, but when installed
-    # the scripts are in another directory.
-    if python_build:
-        g['LDSHARED'] = g['BLDSHARED']
-
-    elif get_python_version() < '2.1':
-        # The following two branches are for 1.5.2 compatibility.
-        if sys.platform == 'aix4':          # what about AIX 3.x ?
-            # Linker script is in the config directory, not in Modules as the
-            # Makefile says.
-            python_lib = get_python_lib(standard_lib=1)
-            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-            python_exp = os.path.join(python_lib, 'config', 'python.exp')
-
-            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
-
-        elif sys.platform == 'beos':
-            # Linker script is in the config directory.  In the Makefile it is
-            # relative to the srcdir, which after installation no longer makes
-            # sense.
-            python_lib = get_python_lib(standard_lib=1)
-            linkerscript_path = g['LDSHARED'].split()[0]
-            linkerscript_name = os.path.basename(linkerscript_path)
-            linkerscript = os.path.join(python_lib, 'config',
-                                        linkerscript_name)
-
-            # XXX this isn't the right place to do this: adding the Python
-            # library to the link, if needed, should be in the "build_ext"
-            # command.  (It's also needed for non-MS compilers on Windows, and
-            # it's taken care of for them by the 'build_ext.get_libraries()'
-            # method.)
-            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                             (linkerscript, PREFIX, get_python_version()))
-
-    global _config_vars
-    _config_vars = g
-
-
-def _init_nt():
-    """Initialize the module as appropriate for NT"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-    g['VERSION'] = get_python_version().replace(".", "")
-    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
-
-    global _config_vars
-    _config_vars = g
-
-
-def _init_mac():
-    """Initialize the module as appropriate for Macintosh systems"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    import MacOS
-    if not hasattr(MacOS, 'runtimemodel'):
-        g['SO'] = '.ppc.slb'
-    else:
-        g['SO'] = '.%s.slb' % MacOS.runtimemodel
-
-    # XXX are these used anywhere?
-    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
-    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
-
-    # These are used by the extension module build
-    g['srcdir'] = ':'
-    global _config_vars
-    _config_vars = g
-
-
-def _init_os2():
-    """Initialize the module as appropriate for OS/2"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-
-    global _config_vars
-    _config_vars = g
-
-
-def get_config_vars(*args):
-    """With no arguments, return a dictionary of all configuration
-    variables relevant for the current platform.  Generally this includes
-    everything needed to build extensions and install both pure modules and
-    extensions.  On Unix, this means every variable defined in Python's
-    installed Makefile; on Windows and Mac OS it's a much smaller set.
-
-    With arguments, return a list of values that result from looking up
-    each argument in the configuration variable dictionary.
-    """
-    global _config_vars
-    if _config_vars is None:
-        func = globals().get("_init_" + os.name)
-        if func:
-            func()
-        else:
-            _config_vars = {}
-
-        # Normalized versions of prefix and exec_prefix are handy to have;
-        # in fact, these are the standard versions used most places in the
-        # Distutils.
-        _config_vars['prefix'] = PREFIX
-        _config_vars['exec_prefix'] = EXEC_PREFIX
-
-        if 'srcdir' not in _config_vars:
-            _config_vars['srcdir'] = project_base
-
-        # Convert srcdir into an absolute path if it appears necessary.
-        # Normally it is relative to the build directory.  However, during
-        # testing, for example, we might be running a non-installed python
-        # from a different directory.
-        if python_build and os.name == "posix":
-            base = os.path.dirname(os.path.abspath(sys.executable))
-            if (not os.path.isabs(_config_vars['srcdir']) and
-                base != os.getcwd()):
-                # srcdir is relative and we are not in the same directory
-                # as the executable. Assume executable is in the build
-                # directory and make srcdir absolute.
-                srcdir = os.path.join(base, _config_vars['srcdir'])
-                _config_vars['srcdir'] = os.path.normpath(srcdir)
-
-        if sys.platform == 'darwin':
-            kernel_version = os.uname()[2] # Kernel version (8.4.3)
-            major_version = int(kernel_version.split('.')[0])
-
-            if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
-                # are in CFLAGS or LDFLAGS and remove them if they are.
-                # This is needed when building extensions on a 10.3 system
-                # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                    flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-                    _config_vars[key] = flags
-
-            else:
-
-                # Allow the user to override the architecture flags using
-                # an environment variable.
-                # NOTE: This name was introduced by Apple in OSX 10.5 and
-                # is used by several scripting languages distributed with
-                # that OS release.
-
-                if 'ARCHFLAGS' in os.environ:
-                    arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                        flags = _config_vars[key]
-                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                        flags = flags + ' ' + arch
-                        _config_vars[key] = flags
-
-                # If we're on OSX 10.5 or later and the user tries to
-                # compiles an extension using an SDK that is not present
-                # on the current machine it is better to not use an SDK
-                # than to fail.
-                #
-                # The major usecase for this is users using a Python.org
-                # binary installer  on OSX 10.6: that installer uses
-                # the 10.4u SDK, but that SDK is not installed by default
-                # when you install Xcode.
-                #
-                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
-                if m is not None:
-                    sdk = m.group(1)
-                    if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                             # a number of derived variables. These need to be
-                             # patched up as well.
-                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                            flags = _config_vars[key]
-                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
-                            _config_vars[key] = flags
-
-    if args:
-        vals = []
-        for name in args:
-            vals.append(_config_vars.get(name))
-        return vals
-    else:
-        return _config_vars
-
-def get_config_var(name):
-    """Return the value of a single variable using the dictionary
-    returned by 'get_config_vars()'.  Equivalent to
-    get_config_vars().get(name)
-    """
-    return get_config_vars().get(name)
diff --git a/tests/support.py b/tests/support.py
index 41d3cd3c66..783318e8d3 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,11 +3,19 @@
 import shutil
 import tempfile
 from copy import deepcopy
+import warnings
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+def capture_warnings(func):
+    def _capture_warnings(*args, **kw):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            return func(*args, **kw)
+    return _capture_warnings
+
 class LoggingSilencer(object):
 
     def setUp(self):
diff --git a/tests/test_build.py b/tests/test_build.py
index 6bca27ee06..2418e1656d 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -5,7 +5,7 @@
 
 from distutils.command.build import build
 from distutils.tests import support
-from distutils.util import get_platform
+from sysconfig import get_platform
 
 class BuildTestCase(support.TempdirManager,
                     support.LoggingSilencer,
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 536cd67319..145eff5453 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -120,8 +120,7 @@ def test_run(self):
         # before we run the command, we want to make sure
         # all commands are present on the system
         # by creating a compiler and checking its executables
-        from distutils.ccompiler import new_compiler
-        from distutils.sysconfig import customize_compiler
+        from distutils.ccompiler import new_compiler, customize_compiler
 
         compiler = new_compiler()
         customize_compiler(compiler)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 317ce2bca0..0e3f33e437 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -9,7 +9,7 @@
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
-from distutils import sysconfig
+import sysconfig
 from distutils.tests import support
 from distutils.extension import Extension
 from distutils.errors import (UnknownFileError, DistutilsSetupError,
@@ -105,17 +105,17 @@ def test_solaris_enable_shared(self):
         old = sys.platform
 
         sys.platform = 'sunos' # fooling finalize_options
-        from distutils.sysconfig import  _config_vars
-        old_var = _config_vars.get('Py_ENABLE_SHARED')
-        _config_vars['Py_ENABLE_SHARED'] = 1
+        from sysconfig import _CONFIG_VARS
+        old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED')
+        _CONFIG_VARS['Py_ENABLE_SHARED'] = 1
         try:
             cmd.ensure_finalized()
         finally:
             sys.platform = old
             if old_var is None:
-                del _config_vars['Py_ENABLE_SHARED']
+                del _CONFIG_VARS['Py_ENABLE_SHARED']
             else:
-                _config_vars['Py_ENABLE_SHARED'] = old_var
+                _CONFIG_VARS['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
         self.assertTrue(len(cmd.library_dirs) > 0)
@@ -177,11 +177,10 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.finalize_options()
 
-        from distutils import sysconfig
-        py_include = sysconfig.get_python_inc()
+        py_include = sysconfig.get_path('include')
         self.assertTrue(py_include in cmd.include_dirs)
 
-        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        plat_py_include = sysconfig.get_path('platinclude')
         self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b1d2d079bd..72e8915c00 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,7 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
-from distutils import sysconfig
+import sysconfig
 
 from distutils.tests import support
 
@@ -91,12 +91,12 @@ def test_version_int(self):
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
         old = sysconfig.get_config_vars().get('VERSION')
-        sysconfig._config_vars['VERSION'] = 4
+        sysconfig._CONFIG_VARS['VERSION'] = 4
         try:
             cmd.run()
         finally:
             if old is not None:
-                sysconfig._config_vars['VERSION'] = old
+                sysconfig._CONFIG_VARS['VERSION'] = old
 
         built = os.listdir(target)
         for name in expected:
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index 2c219b7b17..317e77fded 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -3,8 +3,10 @@
 import unittest
 from test.test_support import captured_stdout
 
-from distutils.ccompiler import gen_lib_options, CCompiler
+from distutils.ccompiler import (gen_lib_options, CCompiler,
+                                 get_default_compiler, customize_compiler)
 from distutils import debug
+from distutils.tests import support
 
 class FakeCompiler(object):
     def library_dir_option(self, dir):
@@ -19,7 +21,7 @@ def find_library_file(self, dirs, lib, debug=0):
     def library_option(self, lib):
         return "-l" + lib
 
-class CCompilerTestCase(unittest.TestCase):
+class CCompilerTestCase(support.EnvironGuard, unittest.TestCase):
 
     def test_gen_lib_options(self):
         compiler = FakeCompiler()
@@ -52,6 +54,26 @@ class MyCCompiler(CCompiler):
         finally:
             debug.DEBUG = False
 
+    def test_customize_compiler(self):
+
+        # not testing if default compiler is not unix
+        if get_default_compiler() != 'unix':
+            return
+
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
+
+        # make sure AR gets caught
+        class compiler:
+            compiler_type = 'unix'
+
+            def set_executables(self, **kw):
+                self.exes = kw
+
+        comp = compiler()
+        customize_compiler(comp)
+        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
 
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index b54ffff361..b67f987e6b 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -3,6 +3,7 @@
 import sys
 import os
 import warnings
+import sysconfig
 
 from test.test_support import check_warnings
 from test.test_support import captured_stdout
@@ -22,13 +23,11 @@ def setUp(self):
         super(CygwinCCompilerTestCase, self).setUp()
         self.version = sys.version
         self.python_h = os.path.join(self.mkdtemp(), 'python.h')
-        from distutils import sysconfig
         self.old_get_config_h_filename = sysconfig.get_config_h_filename
         sysconfig.get_config_h_filename = self._get_config_h_filename
 
     def tearDown(self):
         sys.version = self.version
-        from distutils import sysconfig
         sysconfig.get_config_h_filename = self.old_get_config_h_filename
         super(CygwinCCompilerTestCase, self).tearDown()
 
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 159ac2b76e..cffa9a0915 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -5,9 +5,11 @@
 
 from test.test_support import check_warnings
 from distutils.extension import read_setup_file, Extension
+from distutils.tests.support import capture_warnings
 
 class ExtensionTestCase(unittest.TestCase):
 
+    @capture_warnings
     def test_read_setup_file(self):
         # trying to read a Setup file
         # (sample extracted from the PyGame project)
diff --git a/tests/test_install.py b/tests/test_install.py
index d44156dd45..8e3e942f02 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -5,12 +5,14 @@
 import sys
 import unittest
 import site
+import sysconfig
+from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES,
+                       get_config_var, get_path)
 
 from test.test_support import captured_stdout
 
 from distutils.command.install import install
 from distutils.command import install as install_module
-from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
 
@@ -36,9 +38,23 @@ def test_home_installation_scheme(self):
             build_lib=os.path.join(builddir, "lib"),
             )
 
-        cmd = install(dist)
-        cmd.home = destination
-        cmd.ensure_finalized()
+
+
+        posix_prefix = _INSTALL_SCHEMES['posix_prefix']
+        old_posix_prefix = posix_prefix['platinclude']
+        posix_prefix['platinclude'] = \
+                '{platbase}/include/python{py_version_short}'
+
+        posix_home = _INSTALL_SCHEMES['posix_home']
+        old_posix_home = posix_home['platinclude']
+        posix_home['platinclude'] = '{base}/include/python'
+        try:
+            cmd = install(dist)
+            cmd.home = destination
+            cmd.ensure_finalized()
+        finally:
+            posix_home['platinclude'] = old_posix_home
+            posix_prefix['platinclude'] = old_posix_prefix
 
         self.assertEqual(cmd.install_base, destination)
         self.assertEqual(cmd.install_platbase, destination)
@@ -63,18 +79,19 @@ def test_user_site(self):
             return
 
         # preparing the environement for the test
-        self.old_user_base = site.USER_BASE
-        self.old_user_site = site.USER_SITE
+        self.old_user_base = get_config_var('userbase')
+        self.old_user_site = get_path('purelib', '%s_user' % os.name)
         self.tmpdir = self.mkdtemp()
         self.user_base = os.path.join(self.tmpdir, 'B')
         self.user_site = os.path.join(self.tmpdir, 'S')
-        site.USER_BASE = self.user_base
-        site.USER_SITE = self.user_site
-        install_module.USER_BASE = self.user_base
-        install_module.USER_SITE = self.user_site
+        _CONFIG_VARS['userbase'] = self.user_base
+        scheme = _INSTALL_SCHEMES['%s_user' % os.name]
+        scheme['purelib'] = self.user_site
 
         def _expanduser(path):
-            return self.tmpdir
+            if path[0] == '~':
+                path = os.path.normpath(self.tmpdir) + path[1:]
+            return path
         self.old_expand = os.path.expanduser
         os.path.expanduser = _expanduser
 
@@ -82,19 +99,17 @@ def _expanduser(path):
             # this is the actual test
             self._test_user_site()
         finally:
-            site.USER_BASE = self.old_user_base
-            site.USER_SITE = self.old_user_site
-            install_module.USER_BASE = self.old_user_base
-            install_module.USER_SITE = self.old_user_site
+            _CONFIG_VARS['userbase'] = self.old_user_base
+            scheme['purelib'] = self.old_user_site
             os.path.expanduser = self.old_expand
 
     def _test_user_site(self):
-        for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assertTrue(key in INSTALL_SCHEMES)
+        schemes = get_scheme_names()
+        for key in ('nt_user', 'posix_user', 'os2_home'):
+            self.assertTrue(key in schemes)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
-
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
@@ -185,7 +200,7 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
-    def test_debug_mode(self):
+    def _test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)
         install_module.DEBUG = True
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 498714de81..9013220ffb 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -4,7 +4,6 @@
 import unittest
 
 from distutils import sysconfig
-from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
 from test.test_support import TESTFN
 
@@ -27,10 +26,6 @@ def cleanup_testfn(self):
         elif os.path.isdir(path):
             shutil.rmtree(path)
 
-    def test_get_config_h_filename(self):
-        config_h = sysconfig.get_config_h_filename()
-        self.assertTrue(os.path.isfile(config_h), config_h)
-
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
@@ -38,6 +33,9 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
+        _sysconfig = __import__('sysconfig')
+        res = sysconfig.get_python_lib(True, True)
+        self.assertEquals(_sysconfig.get_path('platstdlib'), res)
 
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()
@@ -48,31 +46,6 @@ def test_get_python_inc(self):
         python_h = os.path.join(inc_dir, "Python.h")
         self.assertTrue(os.path.isfile(python_h), python_h)
 
-    def test_get_config_vars(self):
-        cvars = sysconfig.get_config_vars()
-        self.assertTrue(isinstance(cvars, dict))
-        self.assertTrue(cvars)
-
-    def test_customize_compiler(self):
-
-        # not testing if default compiler is not unix
-        if get_default_compiler() != 'unix':
-            return
-
-        os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
-
-        # make sure AR gets caught
-        class compiler:
-            compiler_type = 'unix'
-
-            def set_executables(self, **kw):
-                self.exes = kw
-
-        comp = compiler()
-        sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
-
     def test_parse_makefile_base(self):
         self.makefile = test.test_support.TESTFN
         fd = open(self.makefile, 'w')
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 008ae5d03a..6976dd55f8 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,8 +1,8 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+import sysconfig
 
-from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
 
 class UnixCCompilerTestCase(unittest.TestCase):
diff --git a/tests/test_util.py b/tests/test_util.py
index 80c5800961..50f9ac173f 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -6,15 +6,14 @@
 from StringIO import StringIO
 import subprocess
 
+from sysconfig import get_config_vars, get_platform
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
-from distutils.util import (get_platform, convert_path, change_root,
+from distutils.util import (convert_path, change_root,
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
                             _find_exe_version, _MAC_OS_X_LD_VERSION,
                             byte_compile)
 from distutils import util
-from distutils.sysconfig import get_config_vars
-from distutils import sysconfig
 from distutils.tests import support
 from distutils.version import LooseVersion
 
@@ -44,7 +43,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        self._config_vars = copy(sysconfig._config_vars)
+        #self._config_vars = copy(sysconfig._config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -78,7 +77,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
-        sysconfig._config_vars = copy(self._config_vars)
+        #sysconfig._config_vars = copy(self._config_vars)
         util.find_executable = self.old_find_executable
         subprocess.Popen = self.old_popen
         sys.old_stdout  = self.old_stdout
@@ -91,7 +90,7 @@ def _set_uname(self, uname):
     def _get_uname(self):
         return self._uname
 
-    def test_get_platform(self):
+    def _test_get_platform(self):
 
         # windows XP, 32bits
         os.name = 'nt'
@@ -119,26 +118,6 @@ def test_get_platform(self):
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
         sys.platform = 'darwin'
-
-        self._set_uname(('Darwin', 'macziade', '8.11.1',
-                   ('Darwin Kernel Version 8.11.1: '
-                    'Wed Oct 10 18:23:28 PDT 2007; '
-                    'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
-
-        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
-                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
-
-        maxint = sys.maxint
-        try:
-            sys.maxint = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc')
-            sys.maxint = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc64')
-        finally:
-            sys.maxint = maxint
-
-
         self._set_uname(('Darwin', 'macziade', '8.11.1',
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
@@ -148,15 +127,7 @@ def test_get_platform(self):
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
 
-        maxint = sys.maxint
-        try:
-            sys.maxint = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-i386')
-            sys.maxint = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-x86_64')
-        finally:
-            sys.maxint = maxint
-
+        self.assertEquals(get_platform(), 'macosx-10.3-i386')
 
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
@@ -201,7 +172,6 @@ def test_get_platform(self):
 
             self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
 
-
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
diff --git a/unixccompiler.py b/unixccompiler.py
index 67adcfcf97..8fe1a6a13a 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -18,7 +18,6 @@
 import os, sys
 from types import StringType, NoneType
 
-from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -26,6 +25,7 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
+
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -75,7 +75,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
 
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
-        # see also distutils.sysconfig
+        # see also the sysconfig
         compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
@@ -283,7 +283,9 @@ def runtime_library_dir_option(self, dir):
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
         # we use this hack.
-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
+        _sysconfig = __import__('sysconfig')
+
+        compiler = os.path.basename(_sysconfig.get_config_var("CC"))
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
@@ -298,7 +300,7 @@ def runtime_library_dir_option(self, dir):
             # use it anyway.  Since distutils has always passed in
             # -Wl whenever gcc was used in the past it is probably
             # safest to keep doing so.
-            if sysconfig.get_config_var("GNULD") == "yes":
+            if _sysconfig.get_config_var("GNULD") == "yes":
                 # GNU ld needs an extra option to get a RUNPATH
                 # instead of just an RPATH.
                 return "-Wl,--enable-new-dtags,-R" + dir
diff --git a/util.py b/util.py
index f4bb0633c5..18d0d2ef4c 100644
--- a/util.py
+++ b/util.py
@@ -15,173 +15,7 @@
 from distutils.version import LooseVersion
 from distutils.errors import DistutilsByteCompileError
 
-def get_platform():
-    """Return a string that identifies the current platform.
-
-    This is used mainly to distinguish platform-specific build directories and
-    platform-specific built distributions.  Typically includes the OS name
-    and version and the architecture (as supplied by 'os.uname()'),
-    although the exact information included depends on the OS; eg. for IRIX
-    the architecture isn't particularly important (IRIX only runs on SGI
-    hardware), but for Linux the kernel version isn't particularly
-    important.
-
-    Examples of returned values:
-       linux-i586
-       linux-alpha (?)
-       solaris-2.6-sun4u
-       irix-5.3
-       irix64-6.2
-
-    Windows will return one of:
-       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-ia64 (64bit Windows on Itanium)
-       win32 (all others - specifically, sys.platform is returned)
-
-    For other non-POSIX platforms, currently just returns 'sys.platform'.
-    """
-    if os.name == 'nt':
-        # sniff sys.version for architecture.
-        prefix = " bit ("
-        i = sys.version.find(prefix)
-        if i == -1:
-            return sys.platform
-        j = sys.version.find(")", i)
-        look = sys.version[i+len(prefix):j].lower()
-        if look == 'amd64':
-            return 'win-amd64'
-        if look == 'itanium':
-            return 'win-ia64'
-        return sys.platform
-
-    if os.name != "posix" or not hasattr(os, 'uname'):
-        # XXX what about the architecture? NT is Intel or Alpha,
-        # Mac OS is M68k or PPC, etc.
-        return sys.platform
-
-    # Try to distinguish various flavours of Unix
-
-    (osname, host, release, version, machine) = os.uname()
-
-    # Convert the OS name to lowercase, remove '/' characters
-    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
-    osname = osname.lower().replace('/', '')
-    machine = machine.replace(' ', '_')
-    machine = machine.replace('/', '-')
-
-    if osname[:5] == "linux":
-        # At least on Linux/Intel, 'machine' is the processor --
-        # i386, etc.
-        # XXX what about Alpha, SPARC, etc?
-        return  "%s-%s" % (osname, machine)
-    elif osname[:5] == "sunos":
-        if release[0] >= "5":           # SunOS 5 == Solaris 2
-            osname = "solaris"
-            release = "%d.%s" % (int(release[0]) - 3, release[2:])
-        # fall through to standard osname-release-machine representation
-    elif osname[:4] == "irix":              # could be "irix64"!
-        return "%s-%s" % (osname, release)
-    elif osname[:3] == "aix":
-        return "%s-%s.%s" % (osname, version, release)
-    elif osname[:6] == "cygwin":
-        osname = "cygwin"
-        rel_re = re.compile (r'[\d.]+')
-        m = rel_re.match(release)
-        if m:
-            release = m.group()
-    elif osname[:6] == "darwin":
-        #
-        # For our purposes, we'll assume that the system version from
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
-        # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were
-        # MACOSX_DEPLOYMENT_TARGET.
-        from distutils.sysconfig import get_config_vars
-        cfgvars = get_config_vars()
-
-        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
-        if not macver:
-            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
-
-        if 1:
-            # Always calculate the release of the running machine,
-            # needed to determine if we can build fat binaries or not.
-
-            macrelease = macver
-            # Get the system version. Reading this plist is a documented
-            # way to get the system version (see the documentation for
-            # the Gestalt Manager)
-            try:
-                f = open('/System/Library/CoreServices/SystemVersion.plist')
-            except IOError:
-                # We're on a plain darwin box, fall back to the default
-                # behaviour.
-                pass
-            else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
-                if m is not None:
-                    macrelease = '.'.join(m.group(1).split('.')[:2])
-                # else: fall back to the default behaviour
-
-        if not macver:
-            macver = macrelease
-
-        if macver:
-            from distutils.sysconfig import get_config_vars
-            release = macver
-            osname = "macosx"
-
-            if (macrelease + '.') >= '10.4.' and \
-                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
-                # The universal build will build fat binaries, but not on
-                # systems before 10.4
-                #
-                # Try to detect 4-way universal builds, those have machine-type
-                # 'universal' instead of 'fat'.
-
-                machine = 'fat'
-                cflags = get_config_vars().get('CFLAGS')
-
-                archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
-
-                if len(archs) == 1:
-                    machine = archs[0]
-                elif archs == ('i386', 'ppc'):
-                    machine = 'fat'
-                elif archs == ('i386', 'x86_64'):
-                    machine = 'intel'
-                elif archs == ('i386', 'ppc', 'x86_64'):
-                    machine = 'fat3'
-                elif archs == ('ppc64', 'x86_64'):
-                    machine = 'fat64'
-                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
-                    machine = 'universal'
-                else:
-                    raise ValueError(
-                       "Don't know machine value for archs=%r"%(archs,))
-
-            elif machine == 'i386':
-                # On OSX the machine type returned by uname is always the
-                # 32-bit variant, even if the executable architecture is
-                # the 64-bit variant
-                if sys.maxint >= 2**32:
-                    machine = 'x86_64'
-
-            elif machine in ('PowerPC', 'Power_Macintosh'):
-                # Pick a sane name for the PPC architecture.
-                machine = 'ppc'
-
-                # See 'i386' case
-                if sys.maxint >= 2**32:
-                    machine = 'ppc64'
-
-    return "%s-%s-%s" % (osname, release, machine)
-
+_sysconfig = __import__('sysconfig')
 
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.
@@ -269,7 +103,7 @@ def check_environ():
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
     if 'PLAT' not in os.environ:
-        os.environ['PLAT'] = get_platform()
+        os.environ['PLAT'] = _sysconfig.get_platform()
 
     _environ_checked = 1
 

From 36c50d5202caff909797ff127a7b830c90eac84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 24 Jan 2010 00:33:32 +0000
Subject: [PATCH 2849/8469] Fixed #7748: now upload and register commands don't
 need to force the encoding anymore : DistributionMetada returns utf8 strings

---
 command/register.py    |  1 -
 command/upload.py      |  2 +-
 dist.py                | 24 ++++++++++++++----------
 tests/test_register.py |  7 +++----
 tests/test_upload.py   |  6 ++++--
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/command/register.py b/command/register.py
index fb547c93a8..dc089902f1 100644
--- a/command/register.py
+++ b/command/register.py
@@ -266,7 +266,6 @@ def post_to_server(self, data, auth=None):
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                value = unicode(value).encode("utf-8")
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")
diff --git a/command/upload.py b/command/upload.py
index 3e18aeaad6..18a10a0b7f 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -145,7 +145,7 @@ def upload_file(self, command, pyversion, filename):
                     value = value[1]
                 else:
                     fn = ""
-                value = str(value)
+
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write(fn)
diff --git a/dist.py b/dist.py
index f20a92a21d..5dbdaef19c 100644
--- a/dist.py
+++ b/dist.py
@@ -1139,16 +1139,19 @@ def write_pkg_file(self, file):
         self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
     def _write_field(self, file, name, value):
-        if isinstance(value, unicode):
-            value = value.encode(PKG_INFO_ENCODING)
-        else:
-            value = str(value)
-        file.write('%s: %s\n' % (name, value))
+        file.write('%s: %s\n' % (name, self._encode_field(value)))
 
     def _write_list (self, file, name, values):
         for value in values:
             self._write_field(file, name, value)
 
+    def _encode_field(self, value):
+        if value is None:
+            return None
+        if isinstance(value, unicode):
+            return value.encode(PKG_INFO_ENCODING)
+        return str(value)
+
     # -- Metadata query methods ----------------------------------------
 
     def get_name(self):
@@ -1161,19 +1164,20 @@ def get_fullname(self):
         return "%s-%s" % (self.get_name(), self.get_version())
 
     def get_author(self):
-        return self.author or "UNKNOWN"
+        return self._encode_field(self.author) or "UNKNOWN"
 
     def get_author_email(self):
         return self.author_email or "UNKNOWN"
 
     def get_maintainer(self):
-        return self.maintainer or "UNKNOWN"
+        return self._encode_field(self.maintainer) or "UNKNOWN"
 
     def get_maintainer_email(self):
         return self.maintainer_email or "UNKNOWN"
 
     def get_contact(self):
-        return self.maintainer or self.author or "UNKNOWN"
+        return (self._encode_field(self.maintainer) or
+                self._encode_field(self.author) or "UNKNOWN")
 
     def get_contact_email(self):
         return self.maintainer_email or self.author_email or "UNKNOWN"
@@ -1186,10 +1190,10 @@ def get_license(self):
     get_licence = get_license
 
     def get_description(self):
-        return self.description or "UNKNOWN"
+        return self._encode_field(self.description) or "UNKNOWN"
 
     def get_long_description(self):
-        return self.long_description or "UNKNOWN"
+        return self._encode_field(self.long_description) or "UNKNOWN"
 
     def get_keywords(self):
         return self.keywords or []
diff --git a/tests/test_register.py b/tests/test_register.py
index ada77a015a..370d659893 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.register."""
+# -*- encoding: utf8 -*-
 import sys
 import os
 import unittest
@@ -136,9 +137,7 @@ def _no_way(prompt=''):
         self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
-
-        self.assertEquals(req1['Content-length'], '1374')
-        self.assertEquals(req2['Content-length'], '1374')
+        self.assertEquals(req2['Content-length'], req1['Content-length'])
         self.assertTrue('xxx' in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
@@ -210,7 +209,7 @@ def test_strict(self):
 
         # metadata are OK but long_description is broken
         metadata = {'url': 'xxx', 'author': 'xxx',
-                    'author_email': 'xxx',
+                    'author_email': u'éxéxé',
                     'name': 'xxx', 'version': 'xxx',
                     'long_description': 'title\n==\n\ntext'}
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 8f6701cc9b..3ae89498a1 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.upload."""
+# -*- encoding: utf8 -*-
 import sys
 import os
 import unittest
@@ -107,14 +108,15 @@ def test_upload(self):
         self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
-        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        pkg_dir, dist = self.create_dist(dist_files=dist_files, author=u'dédé')
         cmd = upload(dist)
         cmd.ensure_finalized()
         cmd.run()
 
         # what did we send ?
+        self.assertIn('dédé', self.last_open.req.data)
         headers = dict(self.last_open.req.headers)
-        self.assertEquals(headers['Content-length'], '2086')
+        self.assertEquals(headers['Content-length'], '2085')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEquals(self.last_open.req.get_method(), 'POST')
         self.assertEquals(self.last_open.req.get_full_url(),

From a147462878fb6e26ffb40ff3d1b89d03803a7f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 24 Jan 2010 00:57:20 +0000
Subject: [PATCH 2850/8469] Merged revisions 77717 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77717 | tarek.ziade | 2010-01-24 01:33:32 +0100 (Sun, 24 Jan 2010) | 1 line

  Fixed #7748: now upload and register commands don't need to force the encoding anymore : DistributionMetada returns utf8 strings
........
---
 command/register.py  |  1 -
 command/upload.py    |  2 +-
 dist.py              | 27 ++++++++++++++-------------
 tests/test_upload.py |  6 ++++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/command/register.py b/command/register.py
index bf7be96096..f531d0fc79 100644
--- a/command/register.py
+++ b/command/register.py
@@ -261,7 +261,6 @@ def post_to_server(self, data, auth=None):
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                value = unicode(value).encode("utf-8")
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write("\n\n")
diff --git a/command/upload.py b/command/upload.py
index 9f1aae6aa4..93727aed62 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -133,7 +133,7 @@ def upload_file(self, command, pyversion, filename):
                     value = value[1]
                 else:
                     fn = ""
-                value = str(value)
+
                 body.write(sep_boundary)
                 body.write('\nContent-Disposition: form-data; name="%s"'%key)
                 body.write(fn)
diff --git a/dist.py b/dist.py
index c15ca9770d..30260f393b 100644
--- a/dist.py
+++ b/dist.py
@@ -1114,18 +1114,20 @@ def write_pkg_file (self, file):
         self._write_list(file, 'Obsoletes', self.get_obsoletes())
 
     def _write_field(self, file, name, value):
-
-        if isinstance(value, unicode):
-            value = value.encode(PKG_INFO_ENCODING)
-        else:
-            value = str(value)
-        file.write('%s: %s\n' % (name, value))
+        file.write('%s: %s\n' % (name, self._encode_field(value)))
 
     def _write_list (self, file, name, values):
 
         for value in values:
             self._write_field(file, name, value)
 
+    def _encode_field(self, value):
+        if value is None:
+            return None
+        if isinstance(value, unicode):
+            return value.encode(PKG_INFO_ENCODING)
+        return str(value)
+
     # -- Metadata query methods ----------------------------------------
 
     def get_name (self):
@@ -1138,21 +1140,20 @@ def get_fullname (self):
         return "%s-%s" % (self.get_name(), self.get_version())
 
     def get_author(self):
-        return self.author or "UNKNOWN"
+        return self._encode_field(self.author) or "UNKNOWN"
 
     def get_author_email(self):
         return self.author_email or "UNKNOWN"
 
     def get_maintainer(self):
-        return self.maintainer or "UNKNOWN"
+        return self._encode_field(self.maintainer) or "UNKNOWN"
 
     def get_maintainer_email(self):
         return self.maintainer_email or "UNKNOWN"
 
     def get_contact(self):
-        return (self.maintainer or
-                self.author or
-                "UNKNOWN")
+        return (self._encode_field(self.maintainer) or
+                self._encode_field(self.author) or "UNKNOWN")
 
     def get_contact_email(self):
         return (self.maintainer_email or
@@ -1167,10 +1168,10 @@ def get_license(self):
     get_licence = get_license
 
     def get_description(self):
-        return self.description or "UNKNOWN"
+        return self._encode_field(self.description) or "UNKNOWN"
 
     def get_long_description(self):
-        return self.long_description or "UNKNOWN"
+        return self._encode_field(self.long_description) or "UNKNOWN"
 
     def get_keywords(self):
         return self.keywords or []
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 322beb778c..382697fb74 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.upload."""
+# -*- encoding: utf8 -*-
 import sys
 import os
 import unittest
@@ -95,7 +96,7 @@ def test_upload(self):
         self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
 
         # lets run it
-        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        pkg_dir, dist = self.create_dist(dist_files=dist_files, author=u'dédé')
         cmd = upload(dist)
         cmd.ensure_finalized()
         cmd.run()
@@ -104,7 +105,8 @@ def test_upload(self):
         res = _CONNECTIONS[-1]
 
         headers = res.headers
-        self.assertEquals(headers['Content-length'], '2086')
+        self.assert_('dédé' in res.body)
+        self.assertEquals(headers['Content-length'], '2085')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
 
         method, request = res.requests[-1]

From 5c528f51ae4ce4dd5359c350af9f0b3cacee36ba Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Sun, 24 Jan 2010 23:17:23 +0100
Subject: [PATCH 2851/8469] Python 2.7 compat

--HG--
branch : distribute
extra : rebase_source : f60f3110e0dd27c406f8fc48c4ed49da4dec8cac
---
 docs/setuptools.txt             | 10 +++++-----
 pkg_resources.py                |  6 +++++-
 setuptools/command/bdist_egg.py |  7 ++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2e2366f639..da159bfe54 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -405,13 +405,13 @@ unless you need the associated ``setuptools`` feature.
     below on `Automatic Resource Extraction`_.
 
 ``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the 
+    Convert the source code from Python 2 to Python 3 with 2to3 during the
     build process. See :doc:`python3` for more details.
 
 ``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3. 
+    List of doctest source files that need to be converted with 2to3.
     See :doc:`python3` for more details.
-    
+
 ``use_2to3_fixers``
     A list of modules to search for additional fixers to be used during
     the 2to3 conversion. See :doc:`python3` for more details.
@@ -2726,7 +2726,7 @@ History
    C-based module, instead of getting a ``NameError``).
 
 0.6c7
- * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and 
+ * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and
    ``egg_info`` command failing on new, uncommitted SVN directories.
 
  * Fix import problems with nested namespace packages installed via
@@ -2753,7 +2753,7 @@ History
 
  * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
    their names as packages.
- 
+
 0.6c5
  * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg``
    packages under Python versions less than 2.5.
diff --git a/pkg_resources.py b/pkg_resources.py
index 3660a2a5bb..f31789e9e9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -207,7 +207,11 @@ def get_build_platform():
     XXX Currently this is the same as ``distutils.util.get_platform()``, but it
     needs some hacks for Linux and Mac OS X.
     """
-    from distutils.util import get_platform
+    try:
+        from distutils.util import get_platform
+    except ImportError:
+        from sysconfig import get_platform
+
     plat = get_platform()
     if sys.platform == "darwin" and not plat.startswith('macosx-'):
         try:
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 43589c239f..90e1f52568 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -6,7 +6,12 @@
 import sys, os, marshal
 from setuptools import Command
 from distutils.dir_util import remove_tree, mkpath
-from distutils.sysconfig import get_python_version, get_python_lib
+try:
+    from distutils.sysconfig import get_python_version, get_python_lib
+except ImportError:
+    from sysconfig import get_python_version
+    from distutils.sysconfig import get_python_lib
+
 from distutils import log
 from distutils.errors import DistutilsSetupError
 from pkg_resources import get_build_platform, Distribution, ensure_directory

From b9018c0a933cdae3367543a28191514a8856d950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 26 Jan 2010 17:20:37 +0000
Subject: [PATCH 2852/8469] fixed bdist_msi imports and added a test module for
 distutils.command.bdist_msi

---
 command/bdist_msi.py    |  6 +++---
 tests/test_bdist_msi.py | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_bdist_msi.py

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f3791bedfe..5ecf73b9e5 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -6,15 +6,15 @@
 """
 Implements the bdist_msi command.
 """
-
 import sys, os
+from sysconfig import get_python_version, get_platform
+
 from distutils.core import Command
 from distutils.dir_util import remove_tree
-from distutils.sysconfig import get_python_version
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
-from distutils.util import get_platform
 from distutils import log
+
 import msilib
 from msilib import schema, sequence, text
 from msilib import Directory, Feature, Dialog, add_data
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
new file mode 100644
index 0000000000..ba2d3e19c2
--- /dev/null
+++ b/tests/test_bdist_msi.py
@@ -0,0 +1,23 @@
+"""Tests for distutils.command.bdist_msi."""
+import unittest
+import sys
+
+from distutils.tests import support
+
+@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+class BDistMSITestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
+
+    def test_minial(self):
+        # minimal test XXX need more tests
+        from distutils.command.bdist_msi import bdist_msi
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist_msi(dist)
+        cmd.ensure_finalized()
+
+def test_suite():
+    return unittest.makeSuite(BDistMSITestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From be0a428e7d61e0dc61e859e1819f207490b7d5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 26 Jan 2010 21:21:54 +0000
Subject: [PATCH 2853/8469] reintroduced the names in Distutils for APIs that
 were relocated

---
 sysconfig.py | 9 +++++++++
 util.py      | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index bb8b5125e4..2d92dabf7b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -21,6 +21,15 @@
 # to avoid this module to shadow it
 _sysconfig = __import__('sysconfig')
 
+# names defined here to keep backward compatibility
+# for APIs that were relocated
+get_python_version = _sysconfig.get_python_version
+get_config_h_filename = _sysconfig.get_config_h_filename
+parse_config_h = _sysconfig.parse_config_h
+get_config_vars = _sysconfig.get_config_vars
+get_config_var = _sysconfig.get_config_var
+from distutils.ccompiler import customize_compiler
+
 _DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
                     "Use the APIs provided by the sysconfig module instead")
 
diff --git a/util.py b/util.py
index 18d0d2ef4c..8650d450c3 100644
--- a/util.py
+++ b/util.py
@@ -17,6 +17,10 @@
 
 _sysconfig = __import__('sysconfig')
 
+# kept for backward compatibility
+# since this API was relocated
+get_platform = _sysconfig.get_platform
+
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.
 

From 389afeb0a49561ac5df341c508571b65349e3035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 26 Jan 2010 22:46:15 +0000
Subject: [PATCH 2854/8469] added local get_platform/set_platform APIs in
 distutils.sysconfig

---
 command/bdist.py         |  2 +-
 command/bdist_dumb.py    |  3 +-
 command/bdist_msi.py     |  3 +-
 command/bdist_wininst.py |  3 +-
 command/build.py         |  2 +-
 command/build_ext.py     |  4 +-
 command/install.py       |  5 +-
 msvc9compiler.py         | 10 ++--
 tests/test_util.py       | 99 +++-------------------------------------
 util.py                  | 23 ++++++++--
 10 files changed, 42 insertions(+), 112 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index 764024a008..d7910b14d6 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,8 +6,8 @@
 __revision__ = "$Id$"
 
 import os
-from sysconfig import get_platform
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import DistutilsPlatformError, DistutilsOptionError
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index f7331d59b9..7c60d39be9 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -8,8 +8,9 @@
 
 import os
 
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import DistutilsPlatformError
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 5ecf73b9e5..72578498f7 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -7,13 +7,14 @@
 Implements the bdist_msi command.
 """
 import sys, os
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
 
 from distutils.core import Command
 from distutils.dir_util import remove_tree
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
 from distutils import log
+from distutils.util import get_platform
 
 import msilib
 from msilib import schema, sequence, text
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0ece0306bc..88c0532f81 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -9,12 +9,13 @@
 import os
 import string
 
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
 
 from distutils.core import Command
 from distutils.dir_util import remove_tree
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils import log
+from distutils.util import get_platform
 
 class bdist_wininst (Command):
 
diff --git a/command/build.py b/command/build.py
index b84e40d6c9..f84bf359dc 100644
--- a/command/build.py
+++ b/command/build.py
@@ -5,8 +5,8 @@
 __revision__ = "$Id$"
 
 import sys, os
-from sysconfig import get_platform
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 13bd030eb6..420d7f171d 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -9,14 +9,12 @@
 import sys, os, re
 from warnings import warn
 
-from sysconfig import get_platform
-
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import *
 from distutils.ccompiler import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
-
 from distutils import log
 
 # this keeps compatibility from 2.3 to 2.5
diff --git a/command/install.py b/command/install.py
index 68d6227ada..b5336fefd6 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,15 +7,14 @@
 import sys
 import os
 
-from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
-                       get_config_var)
+from sysconfig import get_config_vars, get_paths, get_path, get_config_var
 
 from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, change_root
+from distutils.util import convert_path, change_root, get_platform
 from distutils.errors import DistutilsOptionError
 
 def _subst_vars(s, local_vars):
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 6ac24f83dc..41d67faf59 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -23,9 +23,9 @@
                               CompileError, LibError, LinkError)
 from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
-import _winreg
+from distutils.util import get_platform
 
-_sysconfig = __import__('sysconfig')
+import _winreg
 
 RegOpenKeyEx = _winreg.OpenKeyEx
 RegEnumKey = _winreg.EnumKey
@@ -327,7 +327,7 @@ def initialize(self, plat_name=None):
         # multi-init means we would need to check platform same each time...
         assert not self.initialized, "don't init multiple times"
         if plat_name is None:
-            plat_name = _sysconfig.get_platform()
+            plat_name = get_platform()
         # sanity check for platforms to prevent obscure errors later.
         ok_plats = 'win32', 'win-amd64', 'win-ia64'
         if plat_name not in ok_plats:
@@ -348,12 +348,12 @@ def initialize(self, plat_name=None):
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
             # No idea how itanium handles this, if at all.
-            if plat_name == _sysconfig.get_platform() or plat_name == 'win32':
+            if plat_name == get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
             else:
                 # cross compile from win32 -> some 64bit
-                plat_spec = PLAT_TO_VCVARS[_sysconfig.get_platform()] + '_' + \
+                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
                             PLAT_TO_VCVARS[plat_name]
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
diff --git a/tests/test_util.py b/tests/test_util.py
index 50f9ac173f..348b42be03 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -90,99 +90,12 @@ def _set_uname(self, uname):
     def _get_uname(self):
         return self._uname
 
-    def _test_get_platform(self):
-
-        # windows XP, 32bits
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Intel)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win32')
-
-        # windows XP, amd64
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Amd64)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-amd64')
-
-        # windows XP, itanium
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Itanium)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-ia64')
-
-        # macbook
-        os.name = 'posix'
-        sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
-                       '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
-        sys.platform = 'darwin'
-        self._set_uname(('Darwin', 'macziade', '8.11.1',
-                   ('Darwin Kernel Version 8.11.1: '
-                    'Wed Oct 10 18:23:28 PDT 2007; '
-                    'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
-
-        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
-                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
-
-        self.assertEquals(get_platform(), 'macosx-10.3-i386')
-
-        # macbook with fat binaries (fat, universal or fat64)
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
-        get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-fat')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-intel')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
-
-        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-universal')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
-
-        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
-            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
-                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                           '-fno-strict-aliasing -fno-common '
-                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
-
-            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
-
-        # linux debian sarge
-        os.name = 'posix'
-        sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
-                       '\n[GCC 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)]')
-        sys.platform = 'linux2'
-        self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
-                    '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
-
-        self.assertEquals(get_platform(), 'linux-i686')
-
-        # XXX more platforms to tests here
+    def test_get_platform(self):
+        platform = util.get_platform()
+        self.assertEquals(platform, get_platform())
+        util.set_platform('MyOwnPlatform')
+        self.assertEquals('MyOwnPlatform', util.get_platform())
+        util.set_platform(platform)
 
     def test_convert_path(self):
         # linux/mac
diff --git a/util.py b/util.py
index 8650d450c3..fbd3a67243 100644
--- a/util.py
+++ b/util.py
@@ -16,10 +16,27 @@
 from distutils.errors import DistutilsByteCompileError
 
 _sysconfig = __import__('sysconfig')
+_PLATFORM = None
 
-# kept for backward compatibility
-# since this API was relocated
-get_platform = _sysconfig.get_platform
+def get_platform():
+    """Return a string that identifies the current platform.
+
+    By default, will return the value returned by sysconfig.get_platform(),
+    but it can be changed by calling set_platform().
+    """
+    global _PLATFORM
+    if _PLATFORM is None:
+        _PLATFORM = _sysconfig.get_platform()
+    return _PLATFORM
+
+def set_platform(identifier):
+    """Sets the platform string identifier returned by get_platform().
+
+    Note that this change doesn't impact the value returned by
+    sysconfig.get_platform() and is local to Distutils
+    """
+    global _PLATFORM
+    _PLATFORM = identifier
 
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.

From 43788cbefa5bf8f9c6fde80b8a25a4c5a35505ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 29 Jan 2010 11:41:03 +0000
Subject: [PATCH 2855/8469] Merged revisions 77704,77752 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77704 | tarek.ziade | 2010-01-23 10:23:15 +0100 (Sat, 23 Jan 2010) | 1 line

  taking sysconfig out of distutils
........
  r77752 | tarek.ziade | 2010-01-26 00:19:56 +0100 (Tue, 26 Jan 2010) | 1 line

  switched the call order so this call works without suffering from issue #7774
........
---
 ccompiler.py                  |  52 ++++
 command/bdist.py              |   2 +-
 command/bdist_dumb.py         |   4 +-
 command/bdist_wininst.py      |   4 +-
 command/build.py              |   3 +-
 command/build_clib.py         |   2 +-
 command/build_ext.py          |  32 +-
 command/build_scripts.py      |  10 +-
 command/config.py             |   2 +-
 command/install.py            | 163 +++-------
 core.py                       |   2 +-
 cygwinccompiler.py            |   4 +-
 extension.py                  |  12 +-
 msvc9compiler.py              |  10 +-
 sysconfig.py                  | 562 +++++-----------------------------
 tests/support.py              |   8 +
 tests/test_build.py           |   2 +-
 tests/test_build_clib.py      |   3 +-
 tests/test_build_ext.py       |  17 +-
 tests/test_build_scripts.py   |   6 +-
 tests/test_ccompiler.py       |  26 +-
 tests/test_cygwinccompiler.py |   3 +-
 tests/test_extension.py       |   2 +
 tests/test_install.py         |  53 ++--
 tests/test_sysconfig.py       |  36 +--
 tests/test_unixccompiler.py   |   2 +-
 tests/test_util.py            |  14 +-
 unixccompiler.py              |  10 +-
 util.py                       | 170 +---------
 29 files changed, 310 insertions(+), 906 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 5a6bef447d..1a4e8fb2af 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -18,6 +18,58 @@
 from distutils.util import split_quoted, execute
 from distutils import log
 
+_sysconfig = __import__('sysconfig')
+
+def customize_compiler(compiler):
+    """Do any platform-specific customization of a CCompiler instance.
+
+    Mainly needed on Unix, so we can plug in the information that
+    varies across Unices and is stored in Python's Makefile.
+    """
+    if compiler.compiler_type == "unix":
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+            _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+                                       'CCSHARED', 'LDSHARED', 'SO', 'AR',
+                                       'ARFLAGS')
+
+        if 'CC' in os.environ:
+            cc = os.environ['CC']
+        if 'CXX' in os.environ:
+            cxx = os.environ['CXX']
+        if 'LDSHARED' in os.environ:
+            ldshared = os.environ['LDSHARED']
+        if 'CPP' in os.environ:
+            cpp = os.environ['CPP']
+        else:
+            cpp = cc + " -E"           # not always
+        if 'LDFLAGS' in os.environ:
+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if 'CFLAGS' in os.environ:
+            cflags = opt + ' ' + os.environ['CFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
+        if 'CPPFLAGS' in os.environ:
+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
+        else:
+            archiver = ar + ' ' + ar_flags
+
+        cc_cmd = cc + ' ' + cflags
+        compiler.set_executables(
+            preprocessor=cpp,
+            compiler=cc_cmd,
+            compiler_so=cc_cmd + ' ' + ccshared,
+            compiler_cxx=cxx,
+            linker_so=ldshared,
+            linker_exe=cc,
+            archiver=archiver)
+
+        compiler.shared_lib_extension = so_ext
+
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
     by real compiler classes.  Also has some utility methods used by
diff --git a/command/bdist.py b/command/bdist.py
index dd202ff449..a79982b645 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,10 +6,10 @@
 __revision__ = "$Id$"
 
 import os
+from sysconfig import get_platform
 
 from distutils.core import Command
 from distutils.errors import DistutilsPlatformError, DistutilsOptionError
-from distutils.util import get_platform
 
 
 def show_formats():
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 49fd653a19..c16125f229 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -8,11 +8,11 @@
 
 import os
 
+from sysconfig import get_python_version, get_platform
+
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import DistutilsPlatformError
-from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb(Command):
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0b7044a00e..2cf28234ec 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -8,11 +8,11 @@
 import sys
 import os
 
+from sysconfig import get_python_version, get_platform
+
 from distutils.core import Command
-from distutils.util import get_platform
 from distutils.dir_util import remove_tree
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
-from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_wininst(Command):
diff --git a/command/build.py b/command/build.py
index 715621e1d7..d7b0e3c5f9 100644
--- a/command/build.py
+++ b/command/build.py
@@ -5,9 +5,10 @@
 __revision__ = "$Id$"
 
 import sys, os
+from sysconfig import get_platform
+
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
-from distutils.util import get_platform
 
 def show_compilers():
     from distutils.ccompiler import show_compilers
diff --git a/command/build_clib.py b/command/build_clib.py
index 12bf1d2fe3..4c6443ca6e 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -19,7 +19,7 @@
 import os
 from distutils.core import Command
 from distutils.errors import DistutilsSetupError
-from distutils.sysconfig import customize_compiler
+from distutils.ccompiler import customize_compiler
 from distutils import log
 
 def show_compilers():
diff --git a/command/build_ext.py b/command/build_ext.py
index de980bd841..39d37dab84 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -9,13 +9,14 @@
 import sys, os, re
 from warnings import warn
 
+from sysconfig import get_platform
+
 from distutils.core import Command
-from distutils.errors import (CCompilerError, DistutilsError, CompileError,
-                              DistutilsSetupError, DistutilsPlatformError)
-from distutils.sysconfig import customize_compiler, get_python_version
+from distutils.errors import *
+from distutils.ccompiler import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
-from distutils.util import get_platform
+
 from distutils import log
 
 # this keeps compatibility from 2.3 to 2.5
@@ -172,8 +173,7 @@ def initialize_options(self):
         self.user = None
 
     def finalize_options(self):
-        from distutils import sysconfig
-
+        _sysconfig = __import__('sysconfig')
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('build_temp', 'build_temp'),
@@ -190,8 +190,8 @@ def finalize_options(self):
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        py_include = sysconfig.get_python_inc()
-        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        py_include = _sysconfig.get_path('include')
+        plat_py_include = _sysconfig.get_path('platinclude')
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if isinstance(self.include_dirs, str):
@@ -269,7 +269,7 @@ def finalize_options(self):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                                      "python" + get_python_version(),
+                                  "python" + _sysconfig.get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions
@@ -277,13 +277,13 @@ def finalize_options(self):
 
         # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        sysconfig.get_config_var('Py_ENABLE_SHARED')
+        _sysconfig.get_config_var('Py_ENABLE_SHARED')
         if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
              or sys.platform.startswith('sunos'))
-            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
+            and _sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
-                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+                self.library_dirs.append(_sysconfig.get_config_var('LIBDIR'))
             else:
                 # building python standard extensions
                 self.library_dirs.append('.')
@@ -712,13 +712,13 @@ def get_ext_filename(self, ext_name):
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-        from distutils.sysconfig import get_config_var
+        _sysconfig = __import__('sysconfig')
         ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
-        so_ext = get_config_var('SO')
+        so_ext = _sysconfig.get_config_var('SO')
         if os.name == 'nt' and self.debug:
             return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
@@ -781,8 +781,8 @@ def get_libraries(self, ext):
             # Don't use the default code below
             return ext.libraries
         else:
-            from distutils import sysconfig
-            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            _sysconfig = __import__('sysconfig')
+            if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 template = "python%d.%d"
                 pythonlib = (template %
                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 8b08bfeaf0..a54d6ed742 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -6,7 +6,6 @@
 
 import os, re
 from stat import ST_MODE
-from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
 from distutils.util import convert_path, Mixin2to3
@@ -57,6 +56,7 @@ def copy_scripts(self):
         ie. starts with "\#!" and contains "python"), then adjust the first
         line to refer to the current Python interpreter as we copy.
         """
+        _sysconfig = __import__('sysconfig')
         self.mkpath(self.build_dir)
         outfiles = []
         updated_files = []
@@ -96,16 +96,16 @@ def copy_scripts(self):
                 updated_files.append(outfile)
                 if not self.dry_run:
                     outf = open(outfile, "w")
-                    if not sysconfig.python_build:
+                    if not _sysconfig.is_python_build():
                         outf.write("#!%s%s\n" %
                                    (self.executable,
                                     post_interp))
                     else:
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
-                            sysconfig.get_config_var("BINDIR"),
-                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
-                                           sysconfig.get_config_var("EXE"))),
+                            _sysconfig.get_config_var("BINDIR"),
+                           "python%s%s" % (_sysconfig.get_config_var("VERSION"),
+                                           _sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/command/config.py b/command/config.py
index 830552cdc4..56f643c88b 100644
--- a/command/config.py
+++ b/command/config.py
@@ -16,7 +16,7 @@
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
-from distutils.sysconfig import customize_compiler
+from distutils.ccompiler import customize_compiler
 from distutils import log
 
 LANG_EXT = {"c": ".c", "c++": ".cxx"}
diff --git a/command/install.py b/command/install.py
index 2a905d92f8..1f8d238a2d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,115 +7,25 @@
 import sys
 import os
 
+from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
+                       get_config_var)
+
 from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
-from distutils.sysconfig import get_config_vars
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, subst_vars, change_root
-from distutils.util import get_platform
+from distutils.util import convert_path, change_root
 from distutils.errors import DistutilsOptionError
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
-
-if sys.version < "2.2":
-    WINDOWS_SCHEME = {
-        'purelib': '$base',
-        'platlib': '$base',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-else:
-    WINDOWS_SCHEME = {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-
-INSTALL_SCHEMES = {
-    'unix_prefix': {
-        'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-        'headers': '$base/include/python$py_version_short/$dist_name',
-        'scripts': '$base/bin',
-        'data'   : '$base',
-        },
-    'unix_home': {
-        'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
-        'headers': '$base/include/python/$dist_name',
-        'scripts': '$base/bin',
-        'data'   : '$base',
-        },
-    'nt': WINDOWS_SCHEME,
-    'mac': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-
-    'os2': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-    }
-
-# user site schemes
-if HAS_USER_SITE:
-    INSTALL_SCHEMES['nt_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['unix_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['mac_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-    INSTALL_SCHEMES['os2_home'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
-# The keys to an installation scheme; if any new types of files are to be
-# installed, be sure to add an entry to every installation scheme above,
-# and to SCHEME_KEYS here.
-SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
-
+def _subst_vars(s, local_vars):
+    try:
+        return s.format(**local_vars)
+    except KeyError:
+        try:
+            return s.format(**os.environ)
+        except KeyError as var:
+            raise AttributeError('{%s}' % var)
 
 class install(Command):
 
@@ -182,11 +92,10 @@ class install(Command):
 
     boolean_options = ['compile', 'force', 'skip-build']
 
-    if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "install in user site-package '%s'" % USER_SITE))
-        boolean_options.append('user')
-
+    user_options.append(('user', None,
+                        "install in user site-package '%s'" % \
+                            get_path('purelib', '%s_user' % os.name)))
+    boolean_options.append('user')
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -216,8 +125,8 @@ def initialize_options(self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
-        self.install_userbase = USER_BASE
-        self.install_usersite = USER_SITE
+        self.install_userbase = get_config_var('userbase')
+        self.install_usersite = get_path('purelib', '%s_user' % os.name)
 
         self.compile = None
         self.optimize = None
@@ -327,7 +236,9 @@ def finalize_options(self):
         # about needing recursive variable expansion (shudder).
 
         py_version = sys.version.split()[0]
-        (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
+        prefix, exec_prefix, srcdir = get_config_vars('prefix', 'exec_prefix',
+                                                      'srcdir')
+
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
@@ -338,12 +249,11 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            'srcdir': srcdir,
                            }
 
-        if HAS_USER_SITE:
-            self.config_vars['userbase'] = self.install_userbase
-            self.config_vars['usersite'] = self.install_usersite
-
+        self.config_vars['userbase'] = self.install_userbase
+        self.config_vars['usersite'] = self.install_usersite
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
@@ -447,10 +357,10 @@ def finalize_unix(self):
                 raise DistutilsPlatformError(
                     "User base directory is not specified")
             self.install_base = self.install_platbase = self.install_userbase
-            self.select_scheme("unix_user")
+            self.select_scheme("posix_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("unix_home")
+            self.select_scheme("posix_home")
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
@@ -466,7 +376,7 @@ def finalize_unix(self):
 
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
-            self.select_scheme("unix_prefix")
+            self.select_scheme("posix_prefix")
 
     def finalize_other(self):
         """Finalizes options for non-posix platforms"""
@@ -478,7 +388,7 @@ def finalize_other(self):
             self.select_scheme(os.name + "_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("unix_home")
+            self.select_scheme("posix_home")
         else:
             if self.prefix is None:
                 self.prefix = os.path.normpath(sys.prefix)
@@ -493,11 +403,15 @@ def finalize_other(self):
     def select_scheme(self, name):
         """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
-        scheme = INSTALL_SCHEMES[name]
-        for key in SCHEME_KEYS:
+        scheme = get_paths(name, expand=False)
+        for key, value in scheme.items():
+            if key == 'platinclude':
+                key = 'headers'
+                value = os.path.join(value, self.distribution.get_name())
             attrname = 'install_' + key
-            if getattr(self, attrname) is None:
-                setattr(self, attrname, scheme[key])
+            if hasattr(self, attrname):
+                if getattr(self, attrname) is None:
+                    setattr(self, attrname, value)
 
     def _expand_attrs(self, attrs):
         for attr in attrs:
@@ -505,7 +419,10 @@ def _expand_attrs(self, attrs):
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                val = subst_vars(val, self.config_vars)
+                try:
+                    val = _subst_vars(val, self.config_vars)
+                except:
+                    import pdb; pdb.set_trace()
                 setattr(self, attr, val)
 
     def expand_basedirs(self):
diff --git a/core.py b/core.py
index c820a420b9..6ed3e8fa97 100644
--- a/core.py
+++ b/core.py
@@ -35,7 +35,7 @@
 
 def gen_usage(script_name):
     script = os.path.basename(script_name)
-    return USAGE % vars()
+    return USAGE % {'script': script}
 
 
 # Some mild magic to control the behaviour of 'setup()' from 'run_setup()'.
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 3e2a634f7e..f381f60875 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -337,7 +337,7 @@ def check_config_h():
     # XXX since this function also checks sys.version, it's not strictly a
     # "pyconfig.h" check -- should probably be renamed...
 
-    from distutils import sysconfig
+    _sysconfig = __import__('sysconfig')
 
     # if sys.version contains GCC then python was compiled with GCC, and the
     # pyconfig.h file should be OK
@@ -345,7 +345,7 @@ def check_config_h():
         return CONFIG_H_OK, "sys.version mentions 'GCC'"
 
     # let's see if __GNUC__ is mentioned in python.h
-    fn = sysconfig.get_config_h_filename()
+    fn = _sysconfig.get_config_h_filename()
     try:
         with open(fn) as config_h:
             if "__GNUC__" in config_h.read():
diff --git a/extension.py b/extension.py
index 10aaf7c504..ebe5437c22 100644
--- a/extension.py
+++ b/extension.py
@@ -134,14 +134,17 @@ def __init__(self, name, sources,
 
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
-    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+    warnings.warn('distutils.extensions.read_setup_file is deprecated. '
+                  'It will be removed in the next Python release.')
+    _sysconfig = __import__('sysconfig')
+    from distutils.sysconfig import (expand_makefile_vars,
                                      _variable_rx)
 
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
     # First pass over the file to gather "VAR = VALUE" assignments.
-    vars = parse_makefile(filename)
+    vars = _sysconfig._parse_makefile(filename)
 
     # Second pass to gobble up the real content: lines of the form
     #   <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -161,7 +164,10 @@ def read_setup_file(filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        line = expand_makefile_vars(line, vars)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            line = expand_makefile_vars(line, vars)
+
         words = split_quoted(line)
 
         # NB. this parses a slightly different syntax than the old
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 6455fffa1f..38fc96f867 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -23,10 +23,10 @@
                               CompileError, LibError, LinkError)
 from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
-from distutils.util import get_platform
-
 import winreg
 
+_sysconfig = __import__('sysconfig')
+
 RegOpenKeyEx = winreg.OpenKeyEx
 RegEnumKey = winreg.EnumKey
 RegEnumValue = winreg.EnumValue
@@ -327,7 +327,7 @@ def initialize(self, plat_name=None):
         # multi-init means we would need to check platform same each time...
         assert not self.initialized, "don't init multiple times"
         if plat_name is None:
-            plat_name = get_platform()
+            plat_name = _sysconfig.get_platform()
         # sanity check for platforms to prevent obscure errors later.
         ok_plats = 'win32', 'win-amd64', 'win-ia64'
         if plat_name not in ok_plats:
@@ -348,12 +348,12 @@ def initialize(self, plat_name=None):
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
             # No idea how itanium handles this, if at all.
-            if plat_name == get_platform() or plat_name == 'win32':
+            if plat_name == _sysconfig.get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
             else:
                 # cross compile from win32 -> some 64bit
-                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
+                plat_spec = PLAT_TO_VCVARS[_sysconfig.get_platform()] + '_' + \
                             PLAT_TO_VCVARS[plat_name]
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
diff --git a/sysconfig.py b/sysconfig.py
index 0fbd5412bc..48f22ad734 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -7,6 +7,9 @@
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
+
+**This module has been moved out of Distutils and will be removed from
+Python in the next version (3.2)**
 """
 
 __revision__ = "$Id$"
@@ -14,51 +17,36 @@
 import io
 import os
 import re
-import sys
-
-from .errors import DistutilsPlatformError
-
-# These are needed in a couple of spots, so just compute them once.
-PREFIX = os.path.normpath(sys.prefix)
-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-
-# Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-# it'll live in project/PCbuild/amd64.
-project_base = os.path.dirname(os.path.abspath(sys.executable))
-if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
-# PC/VS7.1
-if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
-# PC/AMD64
-if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
-
-# python_build: (Boolean) if true, we're either building Python or
-# building an extension with an un-installed Python, so we use
-# different (hard-wired) directories.
-# Setup.local is available for Makefile builds including VPATH builds,
-# Setup.dist is available on Windows
-def _python_build():
-    for fn in ("Setup.dist", "Setup.local"):
-        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
-            return True
-    return False
-python_build = _python_build()
+from warnings import warn
 
-def get_python_version():
-    """Return a string containing the major and minor Python version,
-    leaving off the patchlevel.  Sample return values could be '1.5'
-    or '2.2'.
-    """
-    return sys.version[:3]
+from distutils.errors import DistutilsPlatformError
+
+# importing sysconfig from Lib
+# to avoid this module to shadow it
+_sysconfig = __import__('sysconfig')
 
+_DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
+                    "Use the APIs provided by the sysconfig module instead")
+
+def _get_project_base():
+    return _sysconfig._PROJECT_BASE
+
+project_base = _get_project_base()
+
+class _DeprecatedBool(int):
+    def __nonzero__(self):
+        warn(_DEPRECATION_MSG % 'get_python_version', DeprecationWarning)
+        return super(_DeprecatedBool, self).__nonzero__()
+
+def _python_build():
+    return _DeprecatedBool(_sysconfig.is_python_build())
+
+python_build = _python_build()
 
 def get_python_inc(plat_specific=0, prefix=None):
-    """Return the directory containing installed Python header files.
+    """This function is deprecated.
+
+    Return the directory containing installed Python header files.
 
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
@@ -68,39 +56,22 @@ def get_python_inc(plat_specific=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
-    if os.name == "posix":
-        if python_build:
-            # Assume the executable is in the build directory.  The
-            # pyconfig.h file should be in the same directory.  Since
-            # the build directory may not be the source directory, we
-            # must use "srcdir" from the makefile to find the "Include"
-            # directory.
-            base = os.path.dirname(os.path.abspath(sys.executable))
-            if plat_specific:
-                return base
-            else:
-                incdir = os.path.join(get_config_var('srcdir'), 'Include')
-                return os.path.normpath(incdir)
-        return os.path.join(prefix, "include", "python" + get_python_version())
-    elif os.name == "nt":
-        return os.path.join(prefix, "include")
-    elif os.name == "mac":
-        if plat_specific:
-            return os.path.join(prefix, "Mac", "Include")
-        else:
-            return os.path.join(prefix, "Include")
-    elif os.name == "os2":
-        return os.path.join(prefix, "Include")
+    warn(_DEPRECATION_MSG % 'get_python_inc', DeprecationWarning)
+    get_path = _sysconfig.get_path
+
+    if prefix is not None:
+        vars = {'base': prefix}
+        return get_path('include', vars=vars)
+
+    if not plat_specific:
+        return get_path('include')
     else:
-        raise DistutilsPlatformError(
-            "I don't know where Python installs its C header files "
-            "on platform '%s'" % os.name)
+        return get_path('platinclude')
 
+def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
+    """This function is deprecated.
 
-def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
-    """Return the directory containing the Python library (standard or
+    Return the directory containing the Python library (standard or
     site additions).
 
     If 'plat_specific' is true, return the directory containing
@@ -113,149 +84,33 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
-
-    if os.name == "posix":
-        libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
-        if standard_lib:
-            return libpython
-        else:
-            return os.path.join(libpython, "site-packages")
-    elif os.name == "nt":
-        if standard_lib:
-            return os.path.join(prefix, "Lib")
-        else:
-            if get_python_version() < "2.2":
-                return prefix
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-    elif os.name == "mac":
+    warn(_DEPRECATION_MSG % 'get_python_lib', DeprecationWarning)
+    vars = {}
+    get_path = _sysconfig.get_path
+    if prefix is not None:
         if plat_specific:
-            if standard_lib:
-                return os.path.join(prefix, "Lib", "lib-dynload")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
+            vars['platbase'] = prefix
         else:
-            if standard_lib:
-                return os.path.join(prefix, "Lib")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-    elif os.name == "os2":
-        if standard_lib:
-            return os.path.join(prefix, "Lib")
+            vars['base'] = prefix
+    if standard_lib:
+        if plat_specific:
+            return get_path('platstdlib', vars=vars)
         else:
-            return os.path.join(prefix, "Lib", "site-packages")
+            return get_path('stdlib', vars=vars)
     else:
-        raise DistutilsPlatformError(
-            "I don't know where Python installs its library "
-            "on platform '%s'" % os.name)
-
-
-def customize_compiler(compiler):
-    """Do any platform-specific customization of a CCompiler instance.
-
-    Mainly needed on Unix, so we can plug in the information that
-    varies across Unices and is stored in Python's Makefile.
-    """
-    if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
-
-        if 'CC' in os.environ:
-            cc = os.environ['CC']
-        if 'CXX' in os.environ:
-            cxx = os.environ['CXX']
-        if 'LDSHARED' in os.environ:
-            ldshared = os.environ['LDSHARED']
-        if 'CPP' in os.environ:
-            cpp = os.environ['CPP']
-        else:
-            cpp = cc + " -E"           # not always
-        if 'LDFLAGS' in os.environ:
-            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if 'CFLAGS' in os.environ:
-            cflags = opt + ' ' + os.environ['CFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if 'CPPFLAGS' in os.environ:
-            cpp = cpp + ' ' + os.environ['CPPFLAGS']
-            cflags = cflags + ' ' + os.environ['CPPFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-        if 'AR' in os.environ:
-            ar = os.environ['AR']
-        if 'ARFLAGS' in os.environ:
-            archiver = ar + ' ' + os.environ['ARFLAGS']
-        else:
-            archiver = ar + ' ' + ar_flags
-
-        cc_cmd = cc + ' ' + cflags
-        compiler.set_executables(
-            preprocessor=cpp,
-            compiler=cc_cmd,
-            compiler_so=cc_cmd + ' ' + ccshared,
-            compiler_cxx=cxx,
-            linker_so=ldshared,
-            linker_exe=cc,
-            archiver=archiver)
-
-        compiler.shared_lib_extension = so_ext
-
-
-def get_config_h_filename():
-    """Return full pathname of installed pyconfig.h file."""
-    if python_build:
-        if os.name == "nt":
-            inc_dir = os.path.join(project_base, "PC")
+        if plat_specific:
+            return get_path('platlib', vars=vars)
         else:
-            inc_dir = project_base
-    else:
-        inc_dir = get_python_inc(plat_specific=1)
-    if get_python_version() < '2.2':
-        config_h = 'config.h'
-    else:
-        # The name of the config.h file changed in 2.2
-        config_h = 'pyconfig.h'
-    return os.path.join(inc_dir, config_h)
-
+            return get_path('purelib', vars=vars)
 
 def get_makefile_filename():
-    """Return full pathname of installed Makefile from the Python build."""
-    if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
-    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
-    return os.path.join(lib_dir, "config", "Makefile")
-
+    """This function is deprecated.
 
-def parse_config_h(fp, g=None):
-    """Parse a config.h-style file.
-
-    A dictionary containing name/value pairs is returned.  If an
-    optional dictionary is passed in as the second argument, it is
-    used instead of a new dictionary.
+    Return full pathname of installed Makefile from the Python build.
     """
-    if g is None:
-        g = {}
-    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
-    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
-    #
-    while True:
-        line = fp.readline()
-        if not line:
-            break
-        m = define_rx.match(line)
-        if m:
-            n, v = m.group(1, 2)
-            try: v = int(v)
-            except ValueError: pass
-            g[n] = v
-        else:
-            m = undef_rx.match(line)
-            if m:
-                g[m.group(1)] = 0
-    return g
 
+    warn(_DEPRECATION_MSG % 'get_makefile_filename', DeprecationWarning)
+    return _sysconfig._get_makefile_filename()
 
 # Regexes needed for parsing Makefile (and similar syntaxes,
 # like old-style Setup files).
@@ -264,91 +119,29 @@ def parse_config_h(fp, g=None):
 _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
 
 def parse_makefile(fn, g=None):
-    """Parse a Makefile-style file.
+    """This function is deprecated.
+
+    Parse a Makefile-style file.
 
     A dictionary containing name/value pairs is returned.  If an
     optional dictionary is passed in as the second argument, it is
     used instead of a new dictionary.
     """
-    from distutils.text_file import TextFile
-    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
-
-    if g is None:
-        g = {}
-    done = {}
-    notdone = {}
-
-    while True:
-        line = fp.readline()
-        if line is None: # eof
-            break
-        m = _variable_rx.match(line)
-        if m:
-            n, v = m.group(1, 2)
-            v = v.strip()
-            # `$$' is a literal `$' in make
-            tmpv = v.replace('$$', '')
-
-            if "$" in tmpv:
-                notdone[n] = v
-            else:
-                try:
-                    v = int(v)
-                except ValueError:
-                    # insert literal `$'
-                    done[n] = v.replace('$$', '$')
-                else:
-                    done[n] = v
-
-    # do variable interpolation here
-    while notdone:
-        for name in list(notdone):
-            value = notdone[name]
-            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
-            if m:
-                n = m.group(1)
-                found = True
-                if n in done:
-                    item = str(done[n])
-                elif n in notdone:
-                    # get it on a subsequent round
-                    found = False
-                elif n in os.environ:
-                    # do it like make: fall back to environment
-                    item = os.environ[n]
-                else:
-                    done[n] = item = ""
-                if found:
-                    after = value[m.end():]
-                    value = value[:m.start()] + item + after
-                    if "$" in after:
-                        notdone[name] = value
-                    else:
-                        try: value = int(value)
-                        except ValueError:
-                            done[name] = value.strip()
-                        else:
-                            done[name] = value
-                        del notdone[name]
-            else:
-                # bogus variable reference; just drop it since we can't deal
-                del notdone[name]
-
-    fp.close()
-
-    # save the results in the global dictionary
-    g.update(done)
-    return g
-
+    warn(_DEPRECATION_MSG % 'parse_makefile', DeprecationWarning)
+    return _sysconfig._parse_makefile(fn, g)
 
 def expand_makefile_vars(s, vars):
-    """Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
+    """This function is deprecated.
+
+    Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
     'string' according to 'vars' (a dictionary mapping variable names to
     values).  Variables not present in 'vars' are silently expanded to the
     empty string.  The variable values in 'vars' should not contain further
     variable expansions; if 'vars' is the output of 'parse_makefile()',
     you're fine.  Returns a variable-expanded version of 's'.
     """
+    warn('this function will be removed in then next version of Python',
+         DeprecationWarning)
 
     # This algorithm does multiple expansion, so if vars['foo'] contains
     # "${bar}", it will expand ${foo} to ${bar}, and then expand
@@ -364,220 +157,3 @@ def expand_makefile_vars(s, vars):
         else:
             break
     return s
-
-
-_config_vars = None
-
-def _init_posix():
-    """Initialize the module as appropriate for POSIX systems."""
-    g = {}
-    # load the installed Makefile:
-    try:
-        filename = get_makefile_filename()
-        parse_makefile(filename, g)
-    except IOError as msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # load the installed pyconfig.h:
-    try:
-        filename = get_config_h_filename()
-        parse_config_h(io.open(filename), g)
-    except IOError as msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # On MacOSX we need to check the setting of the environment variable
-    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
-    # it needs to be compatible.
-    # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
-        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
-        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
-        if cur_target == '':
-            cur_target = cfg_target
-            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
-        elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]:
-            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
-                % (cur_target, cfg_target))
-            raise DistutilsPlatformError(my_msg)
-
-    # On AIX, there are wrong paths to the linker scripts in the Makefile
-    # -- these paths are relative to the Python source, but when installed
-    # the scripts are in another directory.
-    if python_build:
-        g['LDSHARED'] = g['BLDSHARED']
-
-    elif get_python_version() < '2.1':
-        # The following two branches are for 1.5.2 compatibility.
-        if sys.platform == 'aix4':          # what about AIX 3.x ?
-            # Linker script is in the config directory, not in Modules as the
-            # Makefile says.
-            python_lib = get_python_lib(standard_lib=1)
-            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-            python_exp = os.path.join(python_lib, 'config', 'python.exp')
-
-            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
-
-    global _config_vars
-    _config_vars = g
-
-
-def _init_nt():
-    """Initialize the module as appropriate for NT"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-    g['VERSION'] = get_python_version().replace(".", "")
-    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
-
-    global _config_vars
-    _config_vars = g
-
-
-def _init_mac():
-    """Initialize the module as appropriate for Macintosh systems"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    import MacOS
-    if not hasattr(MacOS, 'runtimemodel'):
-        g['SO'] = '.ppc.slb'
-    else:
-        g['SO'] = '.%s.slb' % MacOS.runtimemodel
-
-    # XXX are these used anywhere?
-    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
-    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
-
-    # These are used by the extension module build
-    g['srcdir'] = ':'
-    global _config_vars
-    _config_vars = g
-
-
-def _init_os2():
-    """Initialize the module as appropriate for OS/2"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-
-    global _config_vars
-    _config_vars = g
-
-
-def get_config_vars(*args):
-    """With no arguments, return a dictionary of all configuration
-    variables relevant for the current platform.  Generally this includes
-    everything needed to build extensions and install both pure modules and
-    extensions.  On Unix, this means every variable defined in Python's
-    installed Makefile; on Windows and Mac OS it's a much smaller set.
-
-    With arguments, return a list of values that result from looking up
-    each argument in the configuration variable dictionary.
-    """
-    global _config_vars
-    if _config_vars is None:
-        func = globals().get("_init_" + os.name)
-        if func:
-            func()
-        else:
-            _config_vars = {}
-
-        # Normalized versions of prefix and exec_prefix are handy to have;
-        # in fact, these are the standard versions used most places in the
-        # Distutils.
-        _config_vars['prefix'] = PREFIX
-        _config_vars['exec_prefix'] = EXEC_PREFIX
-
-        # Convert srcdir into an absolute path if it appears necessary.
-        # Normally it is relative to the build directory.  However, during
-        # testing, for example, we might be running a non-installed python
-        # from a different directory.
-        if python_build and os.name == "posix":
-            base = os.path.dirname(os.path.abspath(sys.executable))
-            if (not os.path.isabs(_config_vars['srcdir']) and
-                base != os.getcwd()):
-                # srcdir is relative and we are not in the same directory
-                # as the executable. Assume executable is in the build
-                # directory and make srcdir absolute.
-                srcdir = os.path.join(base, _config_vars['srcdir'])
-                _config_vars['srcdir'] = os.path.normpath(srcdir)
-
-        if sys.platform == 'darwin':
-            kernel_version = os.uname()[2] # Kernel version (8.4.3)
-            major_version = int(kernel_version.split('.')[0])
-
-            if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
-                # are in CFLAGS or LDFLAGS and remove them if they are.
-                # This is needed when building extensions on a 10.3 system
-                # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                    flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
-                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-                    _config_vars[key] = flags
-
-            else:
-
-                # Allow the user to override the architecture flags using
-                # an environment variable.
-                # NOTE: This name was introduced by Apple in OSX 10.5 and
-                # is used by several scripting languages distributed with
-                # that OS release.
-
-                if 'ARCHFLAGS' in os.environ:
-                    arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                        flags = _config_vars[key]
-                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                        flags = flags + ' ' + arch
-                        _config_vars[key] = flags
-
-    if args:
-        vals = []
-        for name in args:
-            vals.append(_config_vars.get(name))
-        return vals
-    else:
-        return _config_vars
-
-def get_config_var(name):
-    """Return the value of a single variable using the dictionary
-    returned by 'get_config_vars()'.  Equivalent to
-    get_config_vars().get(name)
-    """
-    return get_config_vars().get(name)
diff --git a/tests/support.py b/tests/support.py
index e258d2e58d..d60da854be 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,11 +3,19 @@
 import shutil
 import tempfile
 from copy import deepcopy
+import warnings
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+def capture_warnings(func):
+    def _capture_warnings(*args, **kw):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            return func(*args, **kw)
+    return _capture_warnings
+
 class LoggingSilencer(object):
 
     def setUp(self):
diff --git a/tests/test_build.py b/tests/test_build.py
index 6bca27ee06..2418e1656d 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -5,7 +5,7 @@
 
 from distutils.command.build import build
 from distutils.tests import support
-from distutils.util import get_platform
+from sysconfig import get_platform
 
 class BuildTestCase(support.TempdirManager,
                     support.LoggingSilencer,
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 536cd67319..145eff5453 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -120,8 +120,7 @@ def test_run(self):
         # before we run the command, we want to make sure
         # all commands are present on the system
         # by creating a compiler and checking its executables
-        from distutils.ccompiler import new_compiler
-        from distutils.sysconfig import customize_compiler
+        from distutils.ccompiler import new_compiler, customize_compiler
 
         compiler = new_compiler()
         customize_compiler(compiler)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index ebbb39979c..d09718366d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -9,7 +9,7 @@
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
-from distutils import sysconfig
+import sysconfig
 from distutils.tests.support import TempdirManager
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
@@ -105,17 +105,17 @@ def test_solaris_enable_shared(self):
         old = sys.platform
 
         sys.platform = 'sunos' # fooling finalize_options
-        from distutils.sysconfig import  _config_vars
-        old_var = _config_vars.get('Py_ENABLE_SHARED')
-        _config_vars['Py_ENABLE_SHARED'] = 1
+        from sysconfig import _CONFIG_VARS
+        old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED')
+        _CONFIG_VARS['Py_ENABLE_SHARED'] = 1
         try:
             cmd.ensure_finalized()
         finally:
             sys.platform = old
             if old_var is None:
-                del _config_vars['Py_ENABLE_SHARED']
+                del _CONFIG_VARS['Py_ENABLE_SHARED']
             else:
-                _config_vars['Py_ENABLE_SHARED'] = old_var
+                _CONFIG_VARS['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
         self.assertTrue(len(cmd.library_dirs) > 0)
@@ -177,11 +177,10 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.finalize_options()
 
-        from distutils import sysconfig
-        py_include = sysconfig.get_python_inc()
+        py_include = sysconfig.get_path('include')
         self.assertTrue(py_include in cmd.include_dirs)
 
-        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        plat_py_include = sysconfig.get_path('platinclude')
         self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b1d2d079bd..72e8915c00 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,7 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
-from distutils import sysconfig
+import sysconfig
 
 from distutils.tests import support
 
@@ -91,12 +91,12 @@ def test_version_int(self):
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
         old = sysconfig.get_config_vars().get('VERSION')
-        sysconfig._config_vars['VERSION'] = 4
+        sysconfig._CONFIG_VARS['VERSION'] = 4
         try:
             cmd.run()
         finally:
             if old is not None:
-                sysconfig._config_vars['VERSION'] = old
+                sysconfig._CONFIG_VARS['VERSION'] = old
 
         built = os.listdir(target)
         for name in expected:
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index 9db8d24617..27b51a0645 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -3,8 +3,10 @@
 import unittest
 from test.support import captured_stdout
 
-from distutils.ccompiler import gen_lib_options, CCompiler
+from distutils.ccompiler import (gen_lib_options, CCompiler,
+                                 get_default_compiler, customize_compiler)
 from distutils import debug
+from distutils.tests import support
 
 class FakeCompiler(object):
     def library_dir_option(self, dir):
@@ -19,7 +21,7 @@ def find_library_file(self, dirs, lib, debug=0):
     def library_option(self, lib):
         return "-l" + lib
 
-class CCompilerTestCase(unittest.TestCase):
+class CCompilerTestCase(support.EnvironGuard, unittest.TestCase):
 
     def test_gen_lib_options(self):
         compiler = FakeCompiler()
@@ -52,6 +54,26 @@ class MyCCompiler(CCompiler):
         finally:
             debug.DEBUG = False
 
+    def test_customize_compiler(self):
+
+        # not testing if default compiler is not unix
+        if get_default_compiler() != 'unix':
+            return
+
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
+
+        # make sure AR gets caught
+        class compiler:
+            compiler_type = 'unix'
+
+            def set_executables(self, **kw):
+                self.exes = kw
+
+        comp = compiler()
+        customize_compiler(comp)
+        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
 
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 98f0f08ef1..4b95dfa3aa 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -4,6 +4,7 @@
 import os
 import subprocess
 import warnings
+import sysconfig
 
 from test.support import check_warnings
 from test.support import captured_stdout
@@ -23,13 +24,11 @@ def setUp(self):
         super(CygwinCCompilerTestCase, self).setUp()
         self.version = sys.version
         self.python_h = os.path.join(self.mkdtemp(), 'python.h')
-        from distutils import sysconfig
         self.old_get_config_h_filename = sysconfig.get_config_h_filename
         sysconfig.get_config_h_filename = self._get_config_h_filename
 
     def tearDown(self):
         sys.version = self.version
-        from distutils import sysconfig
         sysconfig.get_config_h_filename = self.old_get_config_h_filename
         super(CygwinCCompilerTestCase, self).tearDown()
 
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 1ee30585fa..9d3cfe6f18 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -5,9 +5,11 @@
 
 from test.support import check_warnings
 from distutils.extension import read_setup_file, Extension
+from distutils.tests.support import capture_warnings
 
 class ExtensionTestCase(unittest.TestCase):
 
+    @capture_warnings
     def test_read_setup_file(self):
         # trying to read a Setup file
         # (sample extracted from the PyGame project)
diff --git a/tests/test_install.py b/tests/test_install.py
index 76fa02acda..59e90801f2 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -5,12 +5,14 @@
 import sys
 import unittest
 import site
+import sysconfig
+from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES,
+                       get_config_var, get_path)
 
 from test.support import captured_stdout
 
 from distutils.command.install import install
 from distutils.command import install as install_module
-from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
 
@@ -36,9 +38,23 @@ def test_home_installation_scheme(self):
             build_lib=os.path.join(builddir, "lib"),
             )
 
-        cmd = install(dist)
-        cmd.home = destination
-        cmd.ensure_finalized()
+
+
+        posix_prefix = _INSTALL_SCHEMES['posix_prefix']
+        old_posix_prefix = posix_prefix['platinclude']
+        posix_prefix['platinclude'] = \
+                '{platbase}/include/python{py_version_short}'
+
+        posix_home = _INSTALL_SCHEMES['posix_home']
+        old_posix_home = posix_home['platinclude']
+        posix_home['platinclude'] = '{base}/include/python'
+        try:
+            cmd = install(dist)
+            cmd.home = destination
+            cmd.ensure_finalized()
+        finally:
+            posix_home['platinclude'] = old_posix_home
+            posix_prefix['platinclude'] = old_posix_prefix
 
         self.assertEqual(cmd.install_base, destination)
         self.assertEqual(cmd.install_platbase, destination)
@@ -63,18 +79,19 @@ def test_user_site(self):
             return
 
         # preparing the environement for the test
-        self.old_user_base = site.USER_BASE
-        self.old_user_site = site.USER_SITE
+        self.old_user_base = get_config_var('userbase')
+        self.old_user_site = get_path('purelib', '%s_user' % os.name)
         self.tmpdir = self.mkdtemp()
         self.user_base = os.path.join(self.tmpdir, 'B')
         self.user_site = os.path.join(self.tmpdir, 'S')
-        site.USER_BASE = self.user_base
-        site.USER_SITE = self.user_site
-        install_module.USER_BASE = self.user_base
-        install_module.USER_SITE = self.user_site
+        _CONFIG_VARS['userbase'] = self.user_base
+        scheme = _INSTALL_SCHEMES['%s_user' % os.name]
+        scheme['purelib'] = self.user_site
 
         def _expanduser(path):
-            return self.tmpdir
+            if path[0] == '~':
+                path = os.path.normpath(self.tmpdir) + path[1:]
+            return path
         self.old_expand = os.path.expanduser
         os.path.expanduser = _expanduser
 
@@ -82,19 +99,17 @@ def _expanduser(path):
             # this is the actual test
             self._test_user_site()
         finally:
-            site.USER_BASE = self.old_user_base
-            site.USER_SITE = self.old_user_site
-            install_module.USER_BASE = self.old_user_base
-            install_module.USER_SITE = self.old_user_site
+            _CONFIG_VARS['userbase'] = self.old_user_base
+            scheme['purelib'] = self.old_user_site
             os.path.expanduser = self.old_expand
 
     def _test_user_site(self):
-        for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assertTrue(key in INSTALL_SCHEMES)
+        schemes = get_scheme_names()
+        for key in ('nt_user', 'posix_user', 'os2_home'):
+            self.assertTrue(key in schemes)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
-
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
@@ -185,7 +200,7 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
-    def test_debug_mode(self):
+    def _test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)
         install_module.DEBUG = True
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index edc755ed15..e7df803168 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -4,7 +4,6 @@
 import unittest
 
 from distutils import sysconfig
-from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
 from test.support import TESTFN, run_unittest
 
@@ -26,10 +25,7 @@ def cleanup_testfn(self):
         elif os.path.isdir(TESTFN):
             shutil.rmtree(TESTFN)
 
-    def test_get_config_h_filename(self):
-        config_h = sysconfig.get_config_h_filename()
-        self.assertTrue(os.path.isfile(config_h), config_h)
-
+    @support.capture_warnings
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
@@ -37,7 +33,11 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
+        _sysconfig = __import__('sysconfig')
+        res = sysconfig.get_python_lib(True, True)
+        self.assertEquals(_sysconfig.get_path('platstdlib'), res)
 
+    @support.capture_warnings
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()
         # This is not much of a test.  We make sure Python.h exists
@@ -47,31 +47,7 @@ def test_get_python_inc(self):
         python_h = os.path.join(inc_dir, "Python.h")
         self.assertTrue(os.path.isfile(python_h), python_h)
 
-    def test_get_config_vars(self):
-        cvars = sysconfig.get_config_vars()
-        self.assertTrue(isinstance(cvars, dict))
-        self.assertTrue(cvars)
-
-    def test_customize_compiler(self):
-
-        # not testing if default compiler is not unix
-        if get_default_compiler() != 'unix':
-            return
-
-        os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
-
-        # make sure AR gets caught
-        class compiler:
-            compiler_type = 'unix'
-
-            def set_executables(self, **kw):
-                self.exes = kw
-
-        comp = compiler()
-        sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
-
+    @support.capture_warnings
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 008ae5d03a..6976dd55f8 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,8 +1,8 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+import sysconfig
 
-from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
 
 class UnixCCompilerTestCase(unittest.TestCase):
diff --git a/tests/test_util.py b/tests/test_util.py
index 8f8d4a10c2..ae6671de4f 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -6,15 +6,14 @@
 from io import BytesIO
 import subprocess
 
+from sysconfig import get_config_vars, get_platform
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
-from distutils.util import (get_platform, convert_path, change_root,
+from distutils.util import (convert_path, change_root,
                             check_environ, split_quoted, strtobool,
                             rfc822_escape, get_compiler_versions,
                             _find_exe_version, _MAC_OS_X_LD_VERSION,
                             byte_compile)
 from distutils import util
-from distutils.sysconfig import get_config_vars
-from distutils import sysconfig
 from distutils.tests import support
 from distutils.version import LooseVersion
 
@@ -44,7 +43,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        self._config_vars = copy(sysconfig._config_vars)
+        #self._config_vars = copy(sysconfig._config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -78,7 +77,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
-        sysconfig._config_vars = copy(self._config_vars)
+        #sysconfig._config_vars = copy(self._config_vars)
         util.find_executable = self.old_find_executable
         subprocess.Popen = self.old_popen
         sys.old_stdout  = self.old_stdout
@@ -91,7 +90,7 @@ def _set_uname(self, uname):
     def _get_uname(self):
         return self._uname
 
-    def test_get_platform(self):
+    def _test_get_platform(self):
 
         # windows XP, 32bits
         os.name = 'nt'
@@ -119,7 +118,6 @@ def test_get_platform(self):
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
         sys.platform = 'darwin'
-
         self._set_uname(('Darwin', 'macziade', '8.11.1',
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
@@ -157,7 +155,6 @@ def test_get_platform(self):
         finally:
             sys.maxsize = maxsize
 
-
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
@@ -201,7 +198,6 @@ def test_get_platform(self):
 
             self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
 
-
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
diff --git a/unixccompiler.py b/unixccompiler.py
index 51f6349a9e..c14a5d3fc6 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,7 +17,6 @@
 
 import os, sys
 
-from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -25,6 +24,7 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
+
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -74,7 +74,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
 
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
-        # see also distutils.sysconfig
+        # see also the sysconfig
         compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
@@ -281,7 +281,9 @@ def runtime_library_dir_option(self, dir):
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
         # we use this hack.
-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
+        _sysconfig = __import__('sysconfig')
+
+        compiler = os.path.basename(_sysconfig.get_config_var("CC"))
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
@@ -296,7 +298,7 @@ def runtime_library_dir_option(self, dir):
             # use it anyway.  Since distutils has always passed in
             # -Wl whenever gcc was used in the past it is probably
             # safest to keep doing so.
-            if sysconfig.get_config_var("GNULD") == "yes":
+            if _sysconfig.get_config_var("GNULD") == "yes":
                 # GNU ld needs an extra option to get a RUNPATH
                 # instead of just an RPATH.
                 return "-Wl,--enable-new-dtags,-R" + dir
diff --git a/util.py b/util.py
index 8adf6e0d29..0515fefd2f 100644
--- a/util.py
+++ b/util.py
@@ -15,173 +15,7 @@
 from distutils.version import LooseVersion
 from distutils.errors import DistutilsByteCompileError
 
-def get_platform():
-    """Return a string that identifies the current platform.
-
-    This is used mainly to distinguish platform-specific build directories and
-    platform-specific built distributions.  Typically includes the OS name
-    and version and the architecture (as supplied by 'os.uname()'),
-    although the exact information included depends on the OS; eg. for IRIX
-    the architecture isn't particularly important (IRIX only runs on SGI
-    hardware), but for Linux the kernel version isn't particularly
-    important.
-
-    Examples of returned values:
-       linux-i586
-       linux-alpha (?)
-       solaris-2.6-sun4u
-       irix-5.3
-       irix64-6.2
-
-    Windows will return one of:
-       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-ia64 (64bit Windows on Itanium)
-       win32 (all others - specifically, sys.platform is returned)
-
-    For other non-POSIX platforms, currently just returns 'sys.platform'.
-    """
-    if os.name == 'nt':
-        # sniff sys.version for architecture.
-        prefix = " bit ("
-        i = sys.version.find(prefix)
-        if i == -1:
-            return sys.platform
-        j = sys.version.find(")", i)
-        look = sys.version[i+len(prefix):j].lower()
-        if look == 'amd64':
-            return 'win-amd64'
-        if look == 'itanium':
-            return 'win-ia64'
-        return sys.platform
-
-    if os.name != "posix" or not hasattr(os, 'uname'):
-        # XXX what about the architecture? NT is Intel or Alpha,
-        # Mac OS is M68k or PPC, etc.
-        return sys.platform
-
-    # Try to distinguish various flavours of Unix
-
-    (osname, host, release, version, machine) = os.uname()
-
-    # Convert the OS name to lowercase, remove '/' characters
-    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
-    osname = osname.lower().replace('/', '')
-    machine = machine.replace(' ', '_')
-    machine = machine.replace('/', '-')
-
-    if osname[:5] == "linux":
-        # At least on Linux/Intel, 'machine' is the processor --
-        # i386, etc.
-        # XXX what about Alpha, SPARC, etc?
-        return  "%s-%s" % (osname, machine)
-    elif osname[:5] == "sunos":
-        if release[0] >= "5":           # SunOS 5 == Solaris 2
-            osname = "solaris"
-            release = "%d.%s" % (int(release[0]) - 3, release[2:])
-        # fall through to standard osname-release-machine representation
-    elif osname[:4] == "irix":              # could be "irix64"!
-        return "%s-%s" % (osname, release)
-    elif osname[:3] == "aix":
-        return "%s-%s.%s" % (osname, version, release)
-    elif osname[:6] == "cygwin":
-        osname = "cygwin"
-        rel_re = re.compile (r'[\d.]+', re.ASCII)
-        m = rel_re.match(release)
-        if m:
-            release = m.group()
-    elif osname[:6] == "darwin":
-        #
-        # For our purposes, we'll assume that the system version from
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
-        # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were
-        # MACOSX_DEPLOYMENT_TARGET.
-        from distutils.sysconfig import get_config_vars
-        cfgvars = get_config_vars()
-
-        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
-        if not macver:
-            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
-
-        if 1:
-            # Always calculate the release of the running machine,
-            # needed to determine if we can build fat binaries or not.
-
-            macrelease = macver
-            # Get the system version. Reading this plist is a documented
-            # way to get the system version (see the documentation for
-            # the Gestalt Manager)
-            try:
-                f = open('/System/Library/CoreServices/SystemVersion.plist')
-            except IOError:
-                # We're on a plain darwin box, fall back to the default
-                # behaviour.
-                pass
-            else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
-                if m is not None:
-                    macrelease = '.'.join(m.group(1).split('.')[:2])
-                # else: fall back to the default behaviour
-
-        if not macver:
-            macver = macrelease
-
-        if macver:
-            from distutils.sysconfig import get_config_vars
-            release = macver
-            osname = "macosx"
-
-            if (macrelease + '.') >= '10.4.' and \
-                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
-                # The universal build will build fat binaries, but not on
-                # systems before 10.4
-                #
-                # Try to detect 4-way universal builds, those have machine-type
-                # 'universal' instead of 'fat'.
-
-                machine = 'fat'
-                cflags = get_config_vars().get('CFLAGS')
-
-                archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
-
-                if len(archs) == 1:
-                    machine = archs[0]
-                elif archs == ('i386', 'ppc'):
-                    machine = 'fat'
-                elif archs == ('i386', 'x86_64'):
-                    machine = 'intel'
-                elif archs == ('i386', 'ppc', 'x86_64'):
-                    machine = 'fat3'
-                elif archs == ('ppc64', 'x86_64'):
-                    machine = 'fat64'
-                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
-                    machine = 'universal'
-                else:
-                    raise ValueError(
-                       "Don't know machine value for archs=%r"%(archs,))
-
-            elif machine == 'i386':
-                # On OSX the machine type returned by uname is always the
-                # 32-bit variant, even if the executable architecture is
-                # the 64-bit variant
-                if sys.maxsize >= 2**32:
-                    machine = 'x86_64'
-
-            elif machine in ('PowerPC', 'Power_Macintosh'):
-                # Pick a sane name for the PPC architecture.
-                machine = 'ppc'
-
-                # See 'i386' case
-                if sys.maxsize >= 2**32:
-                    machine = 'ppc64'
-
-    return "%s-%s-%s" % (osname, release, machine)
-
+_sysconfig = __import__('sysconfig')
 
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.
@@ -269,7 +103,7 @@ def check_environ():
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
     if 'PLAT' not in os.environ:
-        os.environ['PLAT'] = get_platform()
+        os.environ['PLAT'] = _sysconfig.get_platform()
 
     _environ_checked = 1
 

From 70ef6e5c8e5729c1f14e57d4423be5d6c72e35e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 29 Jan 2010 11:46:31 +0000
Subject: [PATCH 2856/8469] Merged revisions 77759,77761 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77759 | tarek.ziade | 2010-01-26 22:21:54 +0100 (Tue, 26 Jan 2010) | 1 line

  reintroduced the names in Distutils for APIs that were relocated
........
  r77761 | tarek.ziade | 2010-01-26 23:46:15 +0100 (Tue, 26 Jan 2010) | 1 line

  added local get_platform/set_platform APIs in distutils.sysconfig
........
---
 command/bdist.py         |   2 +-
 command/bdist_dumb.py    |   3 +-
 command/bdist_msi.py     |   3 +
 command/bdist_wininst.py |   3 +-
 command/build.py         |   2 +-
 command/build_ext.py     |   4 +-
 command/install.py       |   5 +-
 msvc9compiler.py         |  10 ++--
 sysconfig.py             |   9 +++
 tests/test_util.py       | 125 ++-------------------------------------
 util.py                  |  21 +++++++
 11 files changed, 53 insertions(+), 134 deletions(-)

diff --git a/command/bdist.py b/command/bdist.py
index a79982b645..72b0cefe42 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,8 +6,8 @@
 __revision__ = "$Id$"
 
 import os
-from sysconfig import get_platform
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import DistutilsPlatformError, DistutilsOptionError
 
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index c16125f229..c2af95f13a 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -8,8 +8,9 @@
 
 import os
 
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.dir_util import remove_tree, ensure_relative
 from distutils.errors import DistutilsPlatformError
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f9205483d7..404f215f9b 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -6,6 +6,8 @@
 """
 Implements the bdist_msi command.
 """
+import sys, os
+from sysconfig import get_python_version
 
 import sys, os
 from distutils.core import Command
@@ -15,6 +17,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils.util import get_platform
 from distutils import log
+
 import msilib
 from msilib import schema, sequence, text
 from msilib import Directory, Feature, Dialog, add_data
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 2cf28234ec..71cc79881a 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -8,12 +8,13 @@
 import sys
 import os
 
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
 
 from distutils.core import Command
 from distutils.dir_util import remove_tree
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils import log
+from distutils.util import get_platform
 
 class bdist_wininst(Command):
 
diff --git a/command/build.py b/command/build.py
index d7b0e3c5f9..4d30f8ff2b 100644
--- a/command/build.py
+++ b/command/build.py
@@ -5,8 +5,8 @@
 __revision__ = "$Id$"
 
 import sys, os
-from sysconfig import get_platform
 
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
diff --git a/command/build_ext.py b/command/build_ext.py
index 39d37dab84..8f41facd4a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -9,14 +9,12 @@
 import sys, os, re
 from warnings import warn
 
-from sysconfig import get_platform
-
+from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import *
 from distutils.ccompiler import customize_compiler
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
-
 from distutils import log
 
 # this keeps compatibility from 2.3 to 2.5
diff --git a/command/install.py b/command/install.py
index 1f8d238a2d..2a6d4dd127 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,15 +7,14 @@
 import sys
 import os
 
-from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
-                       get_config_var)
+from sysconfig import get_config_vars, get_paths, get_path, get_config_var
 
 from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, change_root
+from distutils.util import convert_path, change_root, get_platform
 from distutils.errors import DistutilsOptionError
 
 def _subst_vars(s, local_vars):
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 38fc96f867..6455fffa1f 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -23,9 +23,9 @@
                               CompileError, LibError, LinkError)
 from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
-import winreg
+from distutils.util import get_platform
 
-_sysconfig = __import__('sysconfig')
+import winreg
 
 RegOpenKeyEx = winreg.OpenKeyEx
 RegEnumKey = winreg.EnumKey
@@ -327,7 +327,7 @@ def initialize(self, plat_name=None):
         # multi-init means we would need to check platform same each time...
         assert not self.initialized, "don't init multiple times"
         if plat_name is None:
-            plat_name = _sysconfig.get_platform()
+            plat_name = get_platform()
         # sanity check for platforms to prevent obscure errors later.
         ok_plats = 'win32', 'win-amd64', 'win-ia64'
         if plat_name not in ok_plats:
@@ -348,12 +348,12 @@ def initialize(self, plat_name=None):
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
             # No idea how itanium handles this, if at all.
-            if plat_name == _sysconfig.get_platform() or plat_name == 'win32':
+            if plat_name == get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
             else:
                 # cross compile from win32 -> some 64bit
-                plat_spec = PLAT_TO_VCVARS[_sysconfig.get_platform()] + '_' + \
+                plat_spec = PLAT_TO_VCVARS[get_platform()] + '_' + \
                             PLAT_TO_VCVARS[plat_name]
 
             vc_env = query_vcvarsall(VERSION, plat_spec)
diff --git a/sysconfig.py b/sysconfig.py
index 48f22ad734..2561f573ea 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -25,6 +25,15 @@
 # to avoid this module to shadow it
 _sysconfig = __import__('sysconfig')
 
+# names defined here to keep backward compatibility
+# for APIs that were relocated
+get_python_version = _sysconfig.get_python_version
+get_config_h_filename = _sysconfig.get_config_h_filename
+parse_config_h = _sysconfig.parse_config_h
+get_config_vars = _sysconfig.get_config_vars
+get_config_var = _sysconfig.get_config_var
+from distutils.ccompiler import customize_compiler
+
 _DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
                     "Use the APIs provided by the sysconfig module instead")
 
diff --git a/tests/test_util.py b/tests/test_util.py
index ae6671de4f..896e1e07df 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -90,125 +90,12 @@ def _set_uname(self, uname):
     def _get_uname(self):
         return self._uname
 
-    def _test_get_platform(self):
-
-        # windows XP, 32bits
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Intel)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win32')
-
-        # windows XP, amd64
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Amd64)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-amd64')
-
-        # windows XP, itanium
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Itanium)]')
-        sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-ia64')
-
-        # macbook
-        os.name = 'posix'
-        sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
-                       '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
-        sys.platform = 'darwin'
-        self._set_uname(('Darwin', 'macziade', '8.11.1',
-                   ('Darwin Kernel Version 8.11.1: '
-                    'Wed Oct 10 18:23:28 PDT 2007; '
-                    'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
-
-        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
-                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
-
-        maxsize = sys.maxsize
-        try:
-            sys.maxsize = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc')
-            sys.maxsize = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-ppc64')
-        finally:
-            sys.maxsize = maxsize
-
-
-        self._set_uname(('Darwin', 'macziade', '8.11.1',
-                   ('Darwin Kernel Version 8.11.1: '
-                    'Wed Oct 10 18:23:28 PDT 2007; '
-                    'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
-
-        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
-                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
-
-        maxsize = sys.maxsize
-        try:
-            sys.maxsize = 2147483647
-            self.assertEquals(get_platform(), 'macosx-10.3-i386')
-            sys.maxsize = 9223372036854775807
-            self.assertEquals(get_platform(), 'macosx-10.3-x86_64')
-        finally:
-            sys.maxsize = maxsize
-
-        # macbook with fat binaries (fat, universal or fat64)
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
-        get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-fat')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-intel')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
-
-        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-universal')
-
-        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
-                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                       '-fno-strict-aliasing -fno-common '
-                                       '-dynamic -DNDEBUG -g -O3')
-
-        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
-
-        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
-            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
-                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
-                                           '-fno-strict-aliasing -fno-common '
-                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
-
-            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
-
-        # linux debian sarge
-        os.name = 'posix'
-        sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
-                       '\n[GCC 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)]')
-        sys.platform = 'linux2'
-        self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
-                    '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
-
-        self.assertEquals(get_platform(), 'linux-i686')
-
-        # XXX more platforms to tests here
+    def test_get_platform(self):
+        platform = util.get_platform()
+        self.assertEquals(platform, get_platform())
+        util.set_platform('MyOwnPlatform')
+        self.assertEquals('MyOwnPlatform', util.get_platform())
+        util.set_platform(platform)
 
     def test_convert_path(self):
         # linux/mac
diff --git a/util.py b/util.py
index 0515fefd2f..8fd2ca077f 100644
--- a/util.py
+++ b/util.py
@@ -16,6 +16,27 @@
 from distutils.errors import DistutilsByteCompileError
 
 _sysconfig = __import__('sysconfig')
+_PLATFORM = None
+
+def get_platform():
+    """Return a string that identifies the current platform.
+
+    By default, will return the value returned by sysconfig.get_platform(),
+    but it can be changed by calling set_platform().
+    """
+    global _PLATFORM
+    if _PLATFORM is None:
+        _PLATFORM = _sysconfig.get_platform()
+    return _PLATFORM
+
+def set_platform(identifier):
+    """Sets the platform string identifier returned by get_platform().
+
+    Note that this change doesn't impact the value returned by
+    sysconfig.get_platform() and is local to Distutils
+    """
+    global _PLATFORM
+    _PLATFORM = identifier
 
 def convert_path(pathname):
     """Return 'pathname' as a name that will work on the native filesystem.

From f3b8f0e0dce15c006ebc11503282679119b7eb71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 2 Feb 2010 22:55:00 +0000
Subject: [PATCH 2857/8469] fixed a typo on distutils.sysconfig. thanks arfever

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2d92dabf7b..a247bc2cd7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -9,7 +9,7 @@
 Email:        <fdrake@acm.org>
 
 **This module has been moved out of Distutils and will be removed from
-Python in the next version (3.2)**
+Python in the next version (3.3)**
 """
 
 __revision__ = "$Id$"

From 8f51dc176a1854fbf1f7c8612d67c63ca1c3d92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 2 Feb 2010 23:16:13 +0000
Subject: [PATCH 2858/8469] Merged revisions 77919,77921-77922 via svnmerge
 from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77919 | tarek.ziade | 2010-02-02 23:50:23 +0100 (Tue, 02 Feb 2010) | 1 line

  module reorganization + missing doctests
........
  r77921 | tarek.ziade | 2010-02-02 23:54:28 +0100 (Tue, 02 Feb 2010) | 1 line

  sysconfig.get_scheme_names now returns a sorted tuple
........
  r77922 | tarek.ziade | 2010-02-02 23:55:00 +0100 (Tue, 02 Feb 2010) | 1 line

  fixed a typo on distutils.sysconfig. thanks arfever
........
---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2561f573ea..4a8629e6bd 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -9,7 +9,7 @@
 Email:        <fdrake@acm.org>
 
 **This module has been moved out of Distutils and will be removed from
-Python in the next version (3.2)**
+Python in the next version (3.3)**
 """
 
 __revision__ = "$Id$"

From efbb3664dba73095ae8d7ff40222b0dad5a13b75 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 3 Feb 2010 02:59:43 +0000
Subject: [PATCH 2859/8469] Merged revisions
 77712,77740-77741,77756,77886,77902,77936 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77712 | tarek.ziade | 2010-01-23 11:52:57 -0600 (Sat, 23 Jan 2010) | 1 line

  fixed the 64bits tests for get_platform() - mac osx
........
  r77740 | benjamin.peterson | 2010-01-24 21:58:21 -0600 (Sun, 24 Jan 2010) | 1 line

  compare types with is not ==
........
  r77741 | facundo.batista | 2010-01-25 00:15:01 -0600 (Mon, 25 Jan 2010) | 3 lines

  Added a note about Event.is_set() syntax being new to 2.6
........
  r77756 | tarek.ziade | 2010-01-26 11:20:37 -0600 (Tue, 26 Jan 2010) | 1 line

  fixed bdist_msi imports and added a test module for distutils.command.bdist_msi
........
  r77886 | benjamin.peterson | 2010-01-31 12:09:34 -0600 (Sun, 31 Jan 2010) | 1 line

  move distutils.rst to different toc
........
  r77902 | andrew.kuchling | 2010-01-31 20:04:26 -0600 (Sun, 31 Jan 2010) | 1 line

  Add various items
........
  r77936 | andrew.kuchling | 2010-02-02 20:19:14 -0600 (Tue, 02 Feb 2010) | 1 line

  Add various items
........
---
 command/bdist_msi.py    |  5 +----
 tests/test_bdist_msi.py | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 tests/test_bdist_msi.py

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 404f215f9b..f13c73b36d 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -7,15 +7,12 @@
 Implements the bdist_msi command.
 """
 import sys, os
-from sysconfig import get_python_version
+from sysconfig import get_python_version, get_platform
 
-import sys, os
 from distutils.core import Command
 from distutils.dir_util import remove_tree
-from distutils.sysconfig import get_python_version
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
-from distutils.util import get_platform
 from distutils import log
 
 import msilib
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
new file mode 100644
index 0000000000..ba2d3e19c2
--- /dev/null
+++ b/tests/test_bdist_msi.py
@@ -0,0 +1,23 @@
+"""Tests for distutils.command.bdist_msi."""
+import unittest
+import sys
+
+from distutils.tests import support
+
+@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+class BDistMSITestCase(support.TempdirManager,
+                       support.LoggingSilencer,
+                       unittest.TestCase):
+
+    def test_minial(self):
+        # minimal test XXX need more tests
+        from distutils.command.bdist_msi import bdist_msi
+        pkg_pth, dist = self.create_dist()
+        cmd = bdist_msi(dist)
+        cmd.ensure_finalized()
+
+def test_suite():
+    return unittest.makeSuite(BDistMSITestCase)
+
+if __name__ == '__main__':
+    test_support.run_unittest(test_suite())

From 375a738b125ed236d79369866fba47a360ddb6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Feb 2010 15:38:12 +0000
Subject: [PATCH 2860/8469] leaving global attributes for backward compat

---
 command/install.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/command/install.py b/command/install.py
index b5336fefd6..60e4df0fea 100644
--- a/command/install.py
+++ b/command/install.py
@@ -17,6 +17,87 @@
 from distutils.util import convert_path, change_root, get_platform
 from distutils.errors import DistutilsOptionError
 
+# kept for backward compat, will be removed in 3.2
+if sys.version < "2.2":
+    WINDOWS_SCHEME = {
+        'purelib': '$base',
+        'platlib': '$base',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+else:
+    WINDOWS_SCHEME = {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+
+INSTALL_SCHEMES = {
+    'unix_prefix': {
+        'purelib': '$base/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'headers': '$base/include/python$py_version_short/$dist_name',
+        'scripts': '$base/bin',
+        'data'   : '$base',
+        },
+    'unix_home': {
+        'purelib': '$base/lib/python',
+        'platlib': '$base/lib/python',
+        'headers': '$base/include/python/$dist_name',
+        'scripts': '$base/bin',
+        'data'   : '$base',
+        },
+    'unix_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    'nt': WINDOWS_SCHEME,
+    'nt_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        },
+    'mac': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
+    'mac_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    'os2': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
+    'os2_home': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    }
+
+SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+# end of backward compat
+
 def _subst_vars(s, local_vars):
     try:
         return s.format(**local_vars)

From a72113165de6217370d77b04b5abba938230953e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Wed, 3 Feb 2010 16:10:34 +0000
Subject: [PATCH 2861/8469] Merged revisions 77949 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77949 | tarek.ziade | 2010-02-03 16:38:12 +0100 (Wed, 03 Feb 2010) | 1 line

  leaving global attributes for backward compat
........
---
 command/install.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/command/install.py b/command/install.py
index 2a6d4dd127..cfebeeabd7 100644
--- a/command/install.py
+++ b/command/install.py
@@ -17,6 +17,87 @@
 from distutils.util import convert_path, change_root, get_platform
 from distutils.errors import DistutilsOptionError
 
+# kept for backward compat, will be removed in 3.2
+if sys.version < "2.2":
+    WINDOWS_SCHEME = {
+        'purelib': '$base',
+        'platlib': '$base',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+else:
+    WINDOWS_SCHEME = {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+    }
+
+INSTALL_SCHEMES = {
+    'unix_prefix': {
+        'purelib': '$base/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'headers': '$base/include/python$py_version_short/$dist_name',
+        'scripts': '$base/bin',
+        'data'   : '$base',
+        },
+    'unix_home': {
+        'purelib': '$base/lib/python',
+        'platlib': '$base/lib/python',
+        'headers': '$base/include/python/$dist_name',
+        'scripts': '$base/bin',
+        'data'   : '$base',
+        },
+    'unix_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    'nt': WINDOWS_SCHEME,
+    'nt_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        },
+    'mac': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
+    'mac_user': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    'os2': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
+    'os2_home': {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        },
+    }
+
+SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+# end of backward compat
+
 def _subst_vars(s, local_vars):
     try:
         return s.format(**local_vars)

From e04f6e5ca792f5ac3df0dac51226396914f83789 Mon Sep 17 00:00:00 2001
From: Collin Winter <collinw@gmail.com>
Date: Wed, 3 Feb 2010 22:06:03 +0000
Subject: [PATCH 2862/8469] Merged revisions 69304 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69304 | neil.schemenauer | 2009-02-05 08:25:16 -0800 (Thu, 05 Feb 2009) | 4 lines

  Fix test_build_ext.py to work when building in a separate directory.
  Since "srcdir" should now be defined on all platforms, use it to
  find the module source.
........
---
 tests/test_build_ext.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 93d18814bc..a1c236aa15 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -13,11 +13,14 @@
 import unittest
 from test import test_support
 
-
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
+def _get_source_filename():
+    srcdir = sysconfig.get_config_var('srcdir')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
@@ -28,9 +31,7 @@ def setUp(self):
         self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
         self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
-
-        xx_c = os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
-        shutil.copy(xx_c, self.tmp_dir)
+        shutil.copy(_get_source_filename(), self.tmp_dir)
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -387,9 +388,11 @@ def test_build_ext_path_cross_platform(self):
         self.assertEquals(ext_path, wanted)
 
 def test_suite():
-    if not sysconfig.python_build:
+    src = _get_source_filename()
+    if not os.path.exists(src):
         if test_support.verbose:
-            print 'test_build_ext: The test must be run in a python build dir'
+            print ('test_build_ext: Cannot find source code (test'
+                   ' must run in python build dir)')
         return unittest.TestSuite()
     else: return unittest.makeSuite(BuildExtTestCase)
 

From 6093446e3b99ec64d7b2207d36a9d9522114bd0e Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Feb 2010 16:37:32 +0000
Subject: [PATCH 2863/8469] bump version to 2.7a3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 55aaf81a3d..977643bf34 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7a2"
+__version__ = "2.7a3"
 #--end constants--

From eea5ca2f97e7bc3ff5477d01b0add5c0800b98a3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 6 Feb 2010 23:53:52 +0000
Subject: [PATCH 2864/8469] Add missing import when running these tests
 standalone.

---
 tests/test_bdist.py           | 4 +++-
 tests/test_bdist_dumb.py      | 4 +++-
 tests/test_bdist_msi.py       | 4 +++-
 tests/test_bdist_rpm.py       | 4 +++-
 tests/test_bdist_wininst.py   | 4 +++-
 tests/test_cmd.py             | 4 ++--
 tests/test_cygwinccompiler.py | 4 ++--
 tests/test_emxccompiler.py    | 4 ++--
 tests/test_sysconfig.py       | 1 +
 9 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index be3ec74976..a37f4a9b09 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -5,6 +5,8 @@
 import tempfile
 import shutil
 
+from test.test_support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
@@ -40,4 +42,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 5eaef2a9d7..f2220f474d 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -11,6 +11,8 @@
 except ImportError:
     zlib = None
 
+from test.test_support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -100,4 +102,4 @@ def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index ba2d3e19c2..7554e9f170 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -2,6 +2,8 @@
 import unittest
 import sys
 
+from test.test_support import run_unittest
+
 from distutils.tests import support
 
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
@@ -20,4 +22,4 @@ def test_suite():
     return unittest.makeSuite(BDistMSITestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2aa257f7e6..25a5763a72 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -6,6 +6,8 @@
 import tempfile
 import shutil
 
+from test.test_support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
 from distutils.tests import support
@@ -122,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 9b1ba6d107..c2b13b314d 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,6 +1,8 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
 
+from test.test_support import run_unittest
+
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
@@ -27,4 +29,4 @@ def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 2174efbf64..cfd6485113 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -124,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index b67f987e6b..e97ac666a6 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -5,7 +5,7 @@
 import warnings
 import sysconfig
 
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
 from test.test_support import captured_stdout
 
 from distutils import cygwinccompiler
@@ -108,4 +108,4 @@ def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
index 6e1deced35..d5e07dcede 100644
--- a/tests/test_emxccompiler.py
+++ b/tests/test_emxccompiler.py
@@ -4,7 +4,7 @@
 import os
 import warnings
 
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
 from test.test_support import captured_stdout
 
 from distutils.emxccompiler import get_versions
@@ -30,4 +30,4 @@ def test_suite():
     return unittest.makeSuite(EmxCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 9013220ffb..3066486066 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,6 +2,7 @@
 import os
 import test
 import unittest
+import shutil
 
 from distutils import sysconfig
 from distutils.tests import support

From dcd1dd3857242fe3463d68cb19abfe431f520f92 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 11 Feb 2010 14:47:04 +0100
Subject: [PATCH 2865/8469] fix develop --user for having '.' in PYTHON_PATH

the pth file update wouldn't work
if the distribution location is in the side dirs

so we special-case for the location being the cwd

--HG--
branch : distribute
extra : rebase_source : 4c80082825c25f7f4692fcdd3580da5d1948ef89
---
 setuptools/command/easy_install.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 421d0c09cc..4b42a537ce 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1420,8 +1420,12 @@ def save(self):
 
     def add(self,dist):
         """Add `dist` to the distribution map"""
-        if dist.location not in self.paths and dist.location not in self.sitedirs:
-            self.paths.append(dist.location); self.dirty = True
+        if (dist.location not in self.paths and (
+                dist.location not in self.sitedirs or
+                dist.location == os.getcwd() #account for '.' being in PYTHONPATH
+                )):
+            self.paths.append(dist.location)
+            self.dirty = True
         Environment.add(self,dist)
 
     def remove(self,dist):

From 2de12a23118f5eff414f232e0fdb50dd74362fa9 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 11 Feb 2010 17:04:22 +0100
Subject: [PATCH 2866/8469] add some tests for the pth writer/manager

--HG--
branch : distribute
extra : rebase_source : b7e6abf35a947b39b6290b076f618ce75211757e
---
 setuptools/tests/test_easy_install.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 95909ca766..ff9fa31def 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -3,7 +3,9 @@
 import sys
 import os, shutil, tempfile, unittest
 from setuptools.command.easy_install import easy_install, get_script_args, main
+from setuptools.command.easy_install import  PthDistributions
 from setuptools.dist import Distribution
+from pkg_resources import Distribution as PRDistribution
 
 class FakeDist(object):
     def get_entry_map(self, group):
@@ -90,3 +92,19 @@ def _parse_command_line(self):
             os.chdir(old_wd)
             shutil.rmtree(dir)
 
+class TestPTHFileWriter(unittest.TestCase):
+    def test_add_from_cwd_site_sets_dirty(self):
+        '''a pth file manager should set dirty 
+        if a distribution is in site but also the cwd
+        '''
+        pth = PthDistributions('does-not_exist', [os.getcwd()])
+        self.assertFalse(pth.dirty)
+        pth.add(PRDistribution(os.getcwd()))
+        self.assertTrue(pth.dirty)
+
+    def test_add_from_site_is_ignored(self):
+        pth = PthDistributions('does-not_exist', ['/test/location/does-not-have-to-exist'])
+        self.assertFalse(pth.dirty)
+        pth.add(PRDistribution('/test/location/does-not-have-to-exist'))
+        self.assertFalse(pth.dirty)
+

From c14e1a1398cf7ece7a4bcb15317868163789d879 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 11 Feb 2010 21:32:14 +0100
Subject: [PATCH 2867/8469] enable easy_install --user, *warning breaks tests*

the test-isolation got borked and operates on the users home instead of the test-tempdirs

--HG--
branch : distribute
extra : rebase_source : 1e9bf310b6ba92629d7ba494af17f519cfe17dc5
---
 setuptools/command/develop.py         | 88 ++-------------------------
 setuptools/command/easy_install.py    | 87 +++++++++++++++++++++++++-
 setuptools/tests/test_develop.py      | 14 ++---
 setuptools/tests/test_easy_install.py | 50 +++++++++++++++
 4 files changed, 147 insertions(+), 92 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 330ba1680e..d88d0990ce 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -2,19 +2,8 @@
 from distutils.util import convert_path, subst_vars
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from distutils import log
-from distutils.errors import *
-import sys, os, setuptools, glob
-from distutils.sysconfig import get_config_vars
-from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
-
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
+from distutils.errors import DistutilsError, DistutilsOptionError
+import os, setuptools, glob
 
 class develop(easy_install):
     """Set up package for development"""
@@ -28,11 +17,6 @@ class develop(easy_install):
 
     boolean_options = easy_install.boolean_options + ['uninstall']
 
-    if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "install in user site-package '%s'" % USER_SITE))
-        boolean_options.append('user')
-
     command_consumes_arguments = False  # override base
 
     def run(self):
@@ -49,36 +33,7 @@ def initialize_options(self):
         easy_install.initialize_options(self)
         self.setup_path = None
         self.always_copy_from = '.'   # always copy eggs installed in curdir
-        self.user = 0
-        self.install_purelib = None     # for pure module distributions
-        self.install_platlib = None     # non-pure (dists w/ extensions)
-        self.install_headers = None     # for C/C++ headers
-        self.install_lib = None         # set to either purelib or platlib
-        self.install_scripts = None
-        self.install_data = None
-        self.install_base = None
-        self.install_platbase = None
-        self.install_userbase = USER_BASE
-        self.install_usersite = USER_SITE
-
-    def select_scheme(self, name):
-        """Sets the install directories by applying the install schemes."""
-        # it's the caller's problem if they supply a bad name!
-        scheme = INSTALL_SCHEMES[name]
-        for key in SCHEME_KEYS:
-            attrname = 'install_' + key
-            if getattr(self, attrname) is None:
-                setattr(self, attrname, scheme[key])
-
-    def create_home_path(self):
-        """Create directories under ~."""
-        if not self.user:
-            return
-        home = convert_path(os.path.expanduser("~"))
-        for name, path in self.config_vars.iteritems():
-            if path.startswith(home) and not os.path.isdir(path):
-                self.debug_print("os.makedirs('%s', 0700)" % path)
-                os.makedirs(path, 0700)
+
 
     def _expand_attrs(self, attrs):
         for attr in attrs:
@@ -110,44 +65,11 @@ def finalize_options(self):
         self.args = [ei.egg_name]
 
 
-        py_version = sys.version.split()[0]
-        prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
-        self.config_vars = {'dist_name': self.distribution.get_name(),
-                            'dist_version': self.distribution.get_version(),
-                            'dist_fullname': self.distribution.get_fullname(),
-                            'py_version': py_version,
-                            'py_version_short': py_version[0:3],
-                            'py_version_nodot': py_version[0] + py_version[2],
-                            'sys_prefix': prefix,
-                            'prefix': prefix,
-                            'sys_exec_prefix': exec_prefix,
-                            'exec_prefix': exec_prefix,
-                           }
-
-        if HAS_USER_SITE:
-            self.config_vars['userbase'] = self.install_userbase
-            self.config_vars['usersite'] = self.install_usersite
-
-        # fix the install_dir if "--user" was used
-        if self.user:
-            self.create_home_path()
-            if self.install_userbase is None:
-                raise DistutilsPlatformError(
-                    "User base directory is not specified")
-            self.install_base = self.install_platbase = self.install_userbase
-            if os.name == 'posix':
-                self.select_scheme("unix_user")
-            else:
-                self.select_scheme(os.name + "_user")
 
-        self.expand_basedirs()
-        self.expand_dirs()
-
-        if self.user and self.install_purelib:
-            self.install_dir = self.install_purelib
-            self.script_dir = self.install_scripts
 
         easy_install.finalize_options(self)
+        self.expand_basedirs()
+        self.expand_dirs()
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4b42a537ce..d709806030 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -14,9 +14,11 @@
 from setuptools import Command
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
-from distutils.sysconfig import get_python_lib
+from distutils.util import convert_path, subst_vars
+from distutils.sysconfig import get_python_lib, get_config_vars
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
     DistutilsError
+from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
 from setuptools.archive_util import unpack_archive
 from setuptools.package_index import PackageIndex, parse_bdist_wininst
 from setuptools.package_index import URL_SCHEME
@@ -29,6 +31,16 @@
     'main', 'get_exe_prefixes',
 ]
 
+
+if sys.version < "2.6":
+    USER_BASE = None
+    USER_SITE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    from site import USER_SITE
+    HAS_USER_SITE = True
+
 def samefile(p1,p2):
     if hasattr(os.path,'samefile') and (
         os.path.exists(p1) and os.path.exists(p2)
@@ -97,10 +109,18 @@ class easy_install(Command):
         'delete-conflicting', 'ignore-conflicts-at-my-risk', 'editable',
         'no-deps', 'local-snapshots-ok', 'version'
     ]
+
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "install in user site-package '%s'" % USER_SITE))
+        boolean_options.append('user')
+
+
     negative_opt = {'always-unzip': 'zip-ok'}
     create_index = PackageIndex
 
     def initialize_options(self):
+        self.user = 0
         self.zip_ok = self.local_snapshots_ok = None
         self.install_dir = self.script_dir = self.exclude_scripts = None
         self.index_url = None
@@ -112,6 +132,16 @@ def initialize_options(self):
         self.editable = self.no_deps = self.allow_hosts = None
         self.root = self.prefix = self.no_report = None
         self.version = None
+        self.install_purelib = None     # for pure module distributions
+        self.install_platlib = None     # non-pure (dists w/ extensions)
+        self.install_headers = None     # for C/C++ headers
+        self.install_lib = None         # set to either purelib or platlib
+        self.install_scripts = None
+        self.install_data = None
+        self.install_base = None
+        self.install_platbase = None
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
 
         # Options not specifiable via command line
         self.package_index = None
@@ -147,6 +177,42 @@ def finalize_options(self):
             print 'distribute %s' % get_distribution('distribute').version
             sys.exit()
 
+        py_version = sys.version.split()[0]
+        prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
+
+        self.config_vars = {'dist_name': self.distribution.get_name(),
+                            'dist_version': self.distribution.get_version(),
+                            'dist_fullname': self.distribution.get_fullname(),
+                            'py_version': py_version,
+                            'py_version_short': py_version[0:3],
+                            'py_version_nodot': py_version[0] + py_version[2],
+                            'sys_prefix': prefix,
+                            'prefix': prefix,
+                            'sys_exec_prefix': exec_prefix,
+                            'exec_prefix': exec_prefix,
+                           }
+
+        if HAS_USER_SITE:
+            self.config_vars['userbase'] = self.install_userbase
+            self.config_vars['usersite'] = self.install_usersite
+
+        # fix the install_dir if "--user" was used
+        #XXX: duplicate of the code in the setup command
+        if self.user:
+            self.create_home_path()
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            if os.name == 'posix':
+                self.select_scheme("unix_user")
+            else:
+                self.select_scheme(os.name + "_user")
+
+        if self.user and self.install_purelib:
+            self.install_dir = self.install_purelib
+            self.script_dir = self.install_scripts
+
         self._expand('install_dir','script_dir','build_directory','site_dirs')
         # If a non-default installation directory was specified, default the
         # script directory to match it.
@@ -512,6 +578,15 @@ def install_item(self, spec, download, tmpdir, deps, install_needed=False):
 
 
 
+    def select_scheme(self, name):
+        """Sets the install directories by applying the install schemes."""
+        # it's the caller's problem if they supply a bad name!
+        scheme = INSTALL_SCHEMES[name]
+        for key in SCHEME_KEYS:
+            attrname = 'install_' + key
+            if getattr(self, attrname) is None:
+                setattr(self, attrname, scheme[key])
+
 
 
 
@@ -1129,7 +1204,15 @@ def install_site_py(self):
 
 
 
-
+    def create_home_path(self):
+        """Create directories under ~."""
+        if not self.user:
+            return
+        home = convert_path(os.path.expanduser("~"))
+        for name, path in self.config_vars.iteritems():
+            if path.startswith(home) and not os.path.isdir(path):
+                self.debug_print("os.makedirs('%s', 0700)" % path)
+                os.makedirs(path, 0700)
 
 
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 1d5fa14175..315c1ac802 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -7,7 +7,7 @@
 from StringIO import StringIO
 
 from setuptools.command.develop import develop
-from setuptools.command import develop as develop_pkg
+from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 
 SETUP_PY = """\
@@ -18,7 +18,7 @@
 
 class TestDevelopTest(unittest.TestCase):
 
-    def setUp(self):
+    def setUp(self): 
         self.dir = tempfile.mkdtemp()
         setup = os.path.join(self.dir, 'setup.py')
         f = open(setup, 'w')
@@ -28,18 +28,18 @@ def setUp(self):
         os.chdir(self.dir)
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
-            site.USER_BASE = develop_pkg.USER_BASE = tempfile.mkdtemp()
+            site.USER_BASE = easy_install_pkg.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
-            site.USER_SITE = develop_pkg.USER_SITE = tempfile.mkdtemp()
+            site.USER_SITE = easy_install_pkg.USER_SITE = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def tearDown(self): 
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         if sys.version >= "2.6":
             shutil.rmtree(site.USER_BASE)
             shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
+            easy_install_pkg.USER_BASE = site.USER_BASE = self.old_base
+            easy_install_pkg.USER_SITE = site.USER_SITE = self.old_site
 
     def test_develop(self):
         if sys.version < "2.6":
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ff9fa31def..be1513cc98 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -2,8 +2,10 @@
 """
 import sys
 import os, shutil, tempfile, unittest
+import site
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
+from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 from pkg_resources import Distribution as PRDistribution
 
@@ -108,3 +110,51 @@ def test_add_from_site_is_ignored(self):
         pth.add(PRDistribution('/test/location/does-not-have-to-exist'))
         self.assertFalse(pth.dirty)
 
+
+
+class TestUserInstallTest(unittest.TestCase):
+
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        setup = os.path.join(self.dir, 'setup.py')
+        f = open(setup, 'w')
+        f.write(SETUP_PY)
+        f.close()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.dir)
+        if sys.version >= "2.6":
+            self.old_base = site.USER_BASE
+            site.USER_BASE = easy_install_pkg.USER_BASE = tempfile.mkdtemp()
+            self.old_site = site.USER_SITE
+            site.USER_SITE = easy_install_pkg.USER_SITE = tempfile.mkdtemp()
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        if sys.version >=  "2.6":
+            shutil.rmtree(site.USER_BASE)
+            shutil.rmtree(site.USER_SITE)
+            easy_install_pkg.USER_BASE = site.USER_BASE = self.old_base
+            easy_install_pkg.USER_SITE = site.USER_SITE = self.old_site
+
+    def test_install(self):
+        if sys.version < "2.6":
+            return
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        cmd = easy_install(dist)
+        cmd.user = 1
+        cmd.ensure_finalized()
+        cmd.user = 1
+        old_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+
+        # let's see if we got our egg link at the right place
+        content = os.listdir(site.USER_SITE)
+        content.sort()
+        self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
+

From 0b3d2302b8b209c7bed8bdad6e1a6cff34889779 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 11 Feb 2010 23:57:28 +0100
Subject: [PATCH 2868/8469] move the rest of the path handling code from
 develop to easy_install

also resuffle the path handlers a bit, hopefully everything works now

--HG--
branch : distribute
extra : rebase_source : dc8e4217f5832b15e8f7287c95732bc68d1e1cf5
---
 setuptools/command/develop.py         | 19 --------
 setuptools/command/easy_install.py    | 62 +++++++++++++++++++--------
 setuptools/tests/test_develop.py      |  9 ++--
 setuptools/tests/test_easy_install.py | 12 ++++--
 4 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index d88d0990ce..93b7773ccc 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -35,25 +35,6 @@ def initialize_options(self):
         self.always_copy_from = '.'   # always copy eggs installed in curdir
 
 
-    def _expand_attrs(self, attrs):
-        for attr in attrs:
-            val = getattr(self, attr)
-            if val is not None:
-                if os.name == 'posix' or os.name == 'nt':
-                    val = os.path.expanduser(val)
-                val = subst_vars(val, self.config_vars)
-                setattr(self, attr, val)
-
-    def expand_basedirs(self):
-        """Calls `os.path.expanduser` on install_base, install_platbase and
-        root."""
-        self._expand_attrs(['install_base', 'install_platbase', 'root'])
-
-    def expand_dirs(self):
-        """Calls `os.path.expanduser` on install dirs."""
-        self._expand_attrs(['install_purelib', 'install_platlib',
-                            'install_lib', 'install_headers',
-                            'install_scripts', 'install_data',])
 
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d709806030..134f1b8066 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -17,13 +17,19 @@
 from distutils.util import convert_path, subst_vars
 from distutils.sysconfig import get_python_lib, get_config_vars
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
-    DistutilsError
+    DistutilsError, DistutilsPlatformError
 from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
 from setuptools.archive_util import unpack_archive
-from setuptools.package_index import PackageIndex, parse_bdist_wininst
+from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
-from pkg_resources import *
+from pkg_resources import yield_lines, normalize_path, resource_string, \
+        ensure_directory, get_distribution, find_distributions, \
+        Environment, Requirement, Distribution, \
+        PathMetadata, EggMetadata, WorkingSet, \
+         DistributionNotFound, VersionConflict, \
+        DEVELOP_DIST
+
 sys_executable = os.path.normpath(sys.executable)
 
 __all__ = [
@@ -31,15 +37,8 @@
     'main', 'get_exe_prefixes',
 ]
 
-
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
+import site
+HAS_USER_SITE = not sys.version < "2.6"
 
 def samefile(p1,p2):
     if hasattr(os.path,'samefile') and (
@@ -112,7 +111,7 @@ class easy_install(Command):
 
     if HAS_USER_SITE:
         user_options.append(('user', None,
-                             "install in user site-package '%s'" % USER_SITE))
+                             "install in user site-package '%s'" % site.USER_SITE))
         boolean_options.append('user')
 
 
@@ -140,8 +139,8 @@ def initialize_options(self):
         self.install_data = None
         self.install_base = None
         self.install_platbase = None
-        self.install_userbase = USER_BASE
-        self.install_usersite = USER_SITE
+        self.install_userbase = site.USER_BASE
+        self.install_usersite = site.USER_SITE
 
         # Options not specifiable via command line
         self.package_index = None
@@ -209,10 +208,9 @@ def finalize_options(self):
             else:
                 self.select_scheme(os.name + "_user")
 
-        if self.user and self.install_purelib:
-            self.install_dir = self.install_purelib
-            self.script_dir = self.install_scripts
-
+        self.expand_basedirs()
+        self.expand_dirs()
+        
         self._expand('install_dir','script_dir','build_directory','site_dirs')
         # If a non-default installation directory was specified, default the
         # script directory to match it.
@@ -229,6 +227,10 @@ def finalize_options(self):
         self.set_undefined_options('install_scripts',
             ('install_dir', 'script_dir')
         )
+
+        if self.user and self.install_purelib:
+            self.install_dir = self.install_purelib
+            self.script_dir = self.install_scripts
         # default --record from the install command
         self.set_undefined_options('install', ('record', 'record'))
         normpath = map(normalize_path, sys.path)
@@ -294,6 +296,27 @@ def finalize_options(self):
 
         self.outputs = []
 
+
+    def _expand_attrs(self, attrs):
+        for attr in attrs:
+            val = getattr(self, attr)
+            if val is not None:
+                if os.name == 'posix' or os.name == 'nt':
+                    val = os.path.expanduser(val)
+                val = subst_vars(val, self.config_vars)
+                setattr(self, attr, val)
+
+    def expand_basedirs(self):
+        """Calls `os.path.expanduser` on install_base, install_platbase and
+        root."""
+        self._expand_attrs(['install_base', 'install_platbase', 'root'])
+
+    def expand_dirs(self):
+        """Calls `os.path.expanduser` on install dirs."""
+        self._expand_attrs(['install_purelib', 'install_platlib',
+                            'install_lib', 'install_headers',
+                            'install_scripts', 'install_data',])
+
     def run(self):
         if self.verbose<>self.distribution.verbose:
             log.set_verbosity(self.verbose)
@@ -337,6 +360,7 @@ def warn_deprecated_options(self):
 
     def check_site_dir(self):
         """Verify that self.install_dir is .pth-capable dir, if needed"""
+        print 'install_dir', self.install_dir
         instdir = normalize_path(self.install_dir)
         pth_file = os.path.join(instdir,'easy-install.pth')
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 315c1ac802..10b2be9e73 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -28,9 +28,9 @@ def setUp(self):
         os.chdir(self.dir)
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
-            site.USER_BASE = easy_install_pkg.USER_BASE = tempfile.mkdtemp()
+            site.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
-            site.USER_SITE = easy_install_pkg.USER_SITE = tempfile.mkdtemp()
+            site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self): 
         os.chdir(self.old_cwd)
@@ -38,8 +38,8 @@ def tearDown(self):
         if sys.version >= "2.6":
             shutil.rmtree(site.USER_BASE)
             shutil.rmtree(site.USER_SITE)
-            easy_install_pkg.USER_BASE = site.USER_BASE = self.old_base
-            easy_install_pkg.USER_SITE = site.USER_SITE = self.old_site
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
 
     def test_develop(self):
         if sys.version < "2.6":
@@ -49,6 +49,7 @@ def test_develop(self):
         cmd = develop(dist)
         cmd.user = 1
         cmd.ensure_finalized()
+        cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
         sys.stdout = StringIO()
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index be1513cc98..071ba51368 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -3,6 +3,7 @@
 import sys
 import os, shutil, tempfile, unittest
 import site
+from StringIO import StringIO
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -124,9 +125,9 @@ def setUp(self):
         os.chdir(self.dir)
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
-            site.USER_BASE = easy_install_pkg.USER_BASE = tempfile.mkdtemp()
+            site.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
-            site.USER_SITE = easy_install_pkg.USER_SITE = tempfile.mkdtemp()
+            site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self):
         os.chdir(self.old_cwd)
@@ -134,16 +135,19 @@ def tearDown(self):
         if sys.version >=  "2.6":
             shutil.rmtree(site.USER_BASE)
             shutil.rmtree(site.USER_SITE)
-            easy_install_pkg.USER_BASE = site.USER_BASE = self.old_base
-            easy_install_pkg.USER_SITE = site.USER_SITE = self.old_site
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
 
     def test_install(self):
+        #XXX: replace with something meaningfull
+        return
         if sys.version < "2.6":
             return
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = easy_install(dist)
         cmd.user = 1
+        cmd.args = ['py']
         cmd.ensure_finalized()
         cmd.user = 1
         old_stdout = sys.stdout

From 16a89c229e8b67af66d6951bcd4146ea4bf091da Mon Sep 17 00:00:00 2001
From: nibrahim <none@none>
Date: Mon, 22 Feb 2010 16:21:06 -0500
Subject: [PATCH 2869/8469] --help install command no longer tries to install
 fixes #121

--HG--
branch : distribute
extra : rebase_source : 11dab4d1ff0d41ef9b7e808ce7e41592b18a7270
---
 CHANGES.txt      | 1 +
 CONTRIBUTORS.txt | 1 +
 setup.py         | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b16ad40f63..7d1ff00320 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ CHANGES
 * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
 * Added indexsidebar.html into MANIFEST.in
 * Issue 108: Fixed TypeError with Python3.1
+* Issue 121: Fixed --help install command trying to actually install.
 
 ------
 0.6.10
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index bc2b3fe73a..da9e021974 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -10,6 +10,7 @@ Contributors
 * Jannis Leidel
 * Lennart Regebro
 * Martin von Löwis
+* Noufal Ibrahim
 * Philip Jenvey
 * Reinout van Rees
 * Tarek Ziadé
diff --git a/setup.py b/setup.py
index b8612b5cd9..064c2afd7a 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,9 @@ def _being_installed():
         # Installed by buildout, don't mess with a global setuptools.
         return False
     # easy_install marker
-    return 'install' in sys.argv[1:] or _easy_install_marker()
+    if "--help" in sys.argv[1:] or "-h" in sys.argv[1:]: # Don't bother doing anything if they're just asking for help
+        return False
+    return  'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
     from distribute_setup import _before_install

From 2762c22f7a4dd3a288c04bb10af98605114bb08e Mon Sep 17 00:00:00 2001
From: nibrahim <none@none>
Date: Mon, 22 Feb 2010 18:17:37 -0500
Subject: [PATCH 2870/8469] Added an os.makedirs so that Tarek's solution will
 work

--HG--
branch : distribute
extra : rebase_source : 91e7070818115d6ff2bcbf6db1912788e70b8d59
---
 CHANGES.txt                        | 1 +
 setuptools/command/easy_install.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d1ff00320..eeab73c642 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ CHANGES
 * Added indexsidebar.html into MANIFEST.in
 * Issue 108: Fixed TypeError with Python3.1
 * Issue 121: Fixed --help install command trying to actually install.
+* Issue 112: Added an os.makedirs so that Tarek's solution will work. 
 
 ------
 0.6.10
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 421d0c09cc..366ac7bcf8 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -9,7 +9,7 @@
 
 __ http://peak.telecommunity.com/DevCenter/EasyInstall
 """
-import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
+import sys, os, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -360,6 +360,7 @@ def check_pth_processing(self):
         ok_exists = os.path.exists(ok_file)
         try:
             if ok_exists: os.unlink(ok_file)
+            os.makedirs(os.path.dirname(ok_file))
             f = open(pth_file,'w')
         except (OSError,IOError):
             self.cant_write_to_target()

From 98075501e10ea81e40f9f0e5aff17083d0ff96aa Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Tue, 23 Feb 2010 00:24:49 +0000
Subject: [PATCH 2871/8469] Issue 6292: for the moment at least, the test suite
 passes if run with -OO.  Tests requiring docstrings are skipped.  Patch by
 Brian Curtin, thanks to Matias Torchinsky for helping review and improve the
 patch.

---
 tests/test_build_py.py    | 13 +++++++++++--
 tests/test_extension.py   | 17 ++++++++++++-----
 tests/test_install_lib.py | 17 +++++++++++------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 472591dc09..3c8bc41bae 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -16,7 +16,7 @@ class BuildPyTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
-    def test_package_data(self):
+    def _setup_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
         f.write("# Pretend this is a package.")
@@ -52,10 +52,19 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
+        return files
+
+    def test_package_data(self):
+        files = self._setup_package_data()
         self.assertTrue("__init__.py" in files)
-        self.assertTrue("__init__.pyc" in files)
         self.assertTrue("README.txt" in files)
 
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "pyc files are not written with -O2 and above")
+    def test_package_data_pyc(self):
+        files = self._setup_package_data()
+        self.assertTrue("__init__.pyc" in files)
+
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
         cwd = os.getcwd()
diff --git a/tests/test_extension.py b/tests/test_extension.py
index cffa9a0915..0b5dfb826f 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -1,6 +1,7 @@
 """Tests for distutils.extension."""
-import unittest
 import os
+import sys
+import unittest
 import warnings
 
 from test.test_support import check_warnings
@@ -32,16 +33,22 @@ def test_read_setup_file(self):
 
         self.assertEquals(names, wanted)
 
-    def test_extension_init(self):
-        # the first argument, which is the name, must be a string
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Assertions are omitted with -O2 and above")
+    def test_extension_init_assertions(self):
+        # The first argument, which is the name, must be a string.
         self.assertRaises(AssertionError, Extension, 1, [])
-        ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
 
         # the second argument, which is the list of files, must
         # be a list of strings
         self.assertRaises(AssertionError, Extension, 'name', 'file')
         self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
+
+    def test_extension_init(self):
+        ext = Extension('name', [])
+        self.assertEquals(ext.name, 'name')
+
+
         ext = Extension('name', ['file1', 'file2'])
         self.assertEquals(ext.sources, ['file1', 'file2'])
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 99a6d90627..13d27abac0 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -1,6 +1,6 @@
 """Tests for distutils.command.install_data."""
-import sys
 import os
+import sys
 import unittest
 
 from distutils.command.install_lib import install_lib
@@ -31,9 +31,7 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
-    @unittest.skipUnless(not sys.dont_write_bytecode,
-                         'byte-compile not supported')
-    def test_byte_compile(self):
+    def _setup_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
         cmd.compile = cmd.optimize = 1
@@ -41,8 +39,15 @@ def test_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        return pkg_dir
+
+    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile not enabled')
+    def test_byte_compile(self):
+        pkg_dir = self._setup_byte_compile()
+        if sys.flags.optimize < 1:
+            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        else:
+            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()

From b9da3bd8418678235816f840f4cd86c68527097a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Feb 2010 20:03:59 -0500
Subject: [PATCH 2872/8469] Added test to capture issue #118

--HG--
branch : distribute
extra : rebase_source : 5c247cafcbecb311469147a46f7f82df47ea5341
---
 setuptools/tests/test_sandbox.py | 47 ++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 1b0dc4eaba..8b9e08e65d 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -6,7 +6,20 @@
 import unittest
 import tempfile
 
-from setuptools.sandbox import DirectorySandbox
+from setuptools.sandbox import DirectorySandbox, SandboxViolation
+
+def has_win32com():
+    """
+    Run this to determine if the local machine has win32com, and if it
+    does, include additional tests.
+    """
+    if not sys.platform.startswith('win32'):
+        return False
+    try:
+        mod = __import__('win32com')
+    except ImportError:
+        return False
+    return True
 
 class TestSandbox(unittest.TestCase):
 
@@ -18,11 +31,33 @@ def tearDown(self):
 
     def test_devnull(self):
         sandbox = DirectorySandbox(self.dir)
+        sandbox.run(self._file_writer(os.devnull))
 
-        def _write():
-            f = open(os.devnull, 'w')
+    @staticmethod
+    def _file_writer(path):
+        def do_write():
+            f = open(path, 'w')
             f.write('xxx')
             f.close()
-
-        sandbox.run(_write)
-
+        return do_write
+
+
+    if has_win32com():
+        def test_win32com(self):
+            """
+            win32com should not be prevented from caching COM interfaces
+            in gen_py.
+            """
+            import win32com
+            gen_py = win32com.__gen_path__
+            target = os.path.join(gen_py, 'test_write')
+            sandbox = DirectorySandbox(self.dir)
+            try:
+                sandbox.run(self._file_writer(target))
+            except SandboxViolation:
+                self.fail("Could not create gen_py file due to SandboxViolation")
+            finally:
+                if os.path.exists(target): os.remove(target)
+
+if __name__ == '__main__':
+    unittest.main()

From aac05903b0f3f790dbdd01e413a497ecf00cc1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 23 Feb 2010 04:57:05 +0000
Subject: [PATCH 2873/8469] removed debugging code

---
 command/install.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index 60e4df0fea..fb17b4f6ea 100644
--- a/command/install.py
+++ b/command/install.py
@@ -499,10 +499,7 @@ def _expand_attrs(self, attrs):
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                try:
-                    val = _subst_vars(val, self.config_vars)
-                except:
-                    import pdb; pdb.set_trace()
+                val = _subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
     def expand_basedirs(self):

From 8943dd0fe879512f88742a42893da24553cca38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Tue, 23 Feb 2010 05:03:26 +0000
Subject: [PATCH 2874/8469] Merged revisions 78354 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78354 | tarek.ziade | 2010-02-22 23:57:05 -0500 (Mon, 22 Feb 2010) | 1 line

  removed debugging code
........
---
 command/install.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/install.py b/command/install.py
index cfebeeabd7..31d0387195 100644
--- a/command/install.py
+++ b/command/install.py
@@ -499,10 +499,7 @@ def _expand_attrs(self, attrs):
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                try:
-                    val = _subst_vars(val, self.config_vars)
-                except:
-                    import pdb; pdb.set_trace()
+                val = _subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
     def expand_basedirs(self):

From 0d43be6127018ead86b1a3f2d20a9f97a85c92f3 Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Wed, 24 Feb 2010 01:46:21 +0000
Subject: [PATCH 2875/8469] Merged revisions 78351 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78351 | r.david.murray | 2010-02-22 19:24:49 -0500 (Mon, 22 Feb 2010) | 5 lines

  Issue 6292: for the moment at least, the test suite passes if run
  with -OO.  Tests requiring docstrings are skipped.  Patch by
  Brian Curtin, thanks to Matias Torchinsky for helping review and
  improve the patch.
........
---
 tests/test_build_py.py    | 13 +++++++++++--
 tests/test_extension.py   | 17 ++++++++++++-----
 tests/test_install_lib.py | 17 +++++++++++------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 3e45f6e89e..61e213a586 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -16,7 +16,7 @@ class BuildPyTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
-    def test_package_data(self):
+    def _setup_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
         f.write("# Pretend this is a package.")
@@ -52,10 +52,19 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
+        return files
+
+    def test_package_data(self):
+        files = self._setup_package_data()
         self.assertTrue("__init__.py" in files)
-        self.assertTrue("__init__.pyc" in files)
         self.assertTrue("README.txt" in files)
 
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "pyc files are not written with -O2 and above")
+    def test_package_data_pyc(self):
+        files = self._setup_package_data()
+        self.assertTrue("__init__.pyc" in files)
+
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
         cwd = os.getcwd()
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 9d3cfe6f18..857284dd55 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -1,6 +1,7 @@
 """Tests for distutils.extension."""
-import unittest
 import os
+import sys
+import unittest
 import warnings
 
 from test.support import check_warnings
@@ -32,16 +33,22 @@ def test_read_setup_file(self):
 
         self.assertEquals(names, wanted)
 
-    def test_extension_init(self):
-        # the first argument, which is the name, must be a string
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Assertions are omitted with -O2 and above")
+    def test_extension_init_assertions(self):
+        # The first argument, which is the name, must be a string.
         self.assertRaises(AssertionError, Extension, 1, [])
-        ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
 
         # the second argument, which is the list of files, must
         # be a list of strings
         self.assertRaises(AssertionError, Extension, 'name', 'file')
         self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
+
+    def test_extension_init(self):
+        ext = Extension('name', [])
+        self.assertEquals(ext.name, 'name')
+
+
         ext = Extension('name', ['file1', 'file2'])
         self.assertEquals(ext.sources, ['file1', 'file2'])
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 99a6d90627..13d27abac0 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -1,6 +1,6 @@
 """Tests for distutils.command.install_data."""
-import sys
 import os
+import sys
 import unittest
 
 from distutils.command.install_lib import install_lib
@@ -31,9 +31,7 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
-    @unittest.skipUnless(not sys.dont_write_bytecode,
-                         'byte-compile not supported')
-    def test_byte_compile(self):
+    def _setup_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
         cmd.compile = cmd.optimize = 1
@@ -41,8 +39,15 @@ def test_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        return pkg_dir
+
+    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile not enabled')
+    def test_byte_compile(self):
+        pkg_dir = self._setup_byte_compile()
+        if sys.flags.optimize < 1:
+            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        else:
+            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()

From fa53c90a8e494240036abe332b3a0d4c1376ddd7 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 1 Mar 2010 22:10:45 +0000
Subject: [PATCH 2876/8469] Bump to 2.6.5 rc 1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b37308c578..8c2ab8f3e5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.4"
+__version__ = "2.6.5rc1"
 #--end constants--

From 2cb36ad98366b3cad72f2be6b7a55fb51b43677c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Mar 2010 18:02:00 -0500
Subject: [PATCH 2877/8469] Worked out a fix for failing sandbox errors in
 Windows. Fixes #118.

--HG--
branch : distribute
extra : rebase_source : 69c8e59604f9d711cd29bb55e9edd3caab2b36a0
---
 setuptools/sandbox.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 502598ca4d..630d5792b5 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -154,6 +154,12 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
 
 _EXCEPTIONS = [os.devnull,]
 
+try:
+	gen_py = os.path.dirname(__import__('win32com.gen_py', fromlist=['__name__']).__file__)
+	_EXCEPTIONS.append(gen_py)
+except ImportError:
+	pass
+
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
 
@@ -165,7 +171,7 @@ class DirectorySandbox(AbstractSandbox):
     def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
         self._prefix = os.path.join(self._sandbox,'')
-        self._exceptions = exceptions
+        self._exceptions = [os.path.normcase(os.path.realpath(path)) for path in exceptions]
         AbstractSandbox.__init__(self)
 
     def _violation(self, operation, *args, **kw):
@@ -190,12 +196,16 @@ def _ok(self,path):
         try:
             self._active = False
             realpath = os.path.normcase(os.path.realpath(path))
-            if (realpath in self._exceptions or realpath == self._sandbox
+            if (self._exempted(realpath) or realpath == self._sandbox
                 or realpath.startswith(self._prefix)):
                 return True
         finally:
             self._active = active
 
+    def _exempted(self, filepath):
+        exception_matches = map(filepath.startswith, self._exceptions)
+        return any(exception_matches)
+
     def _remap_input(self,operation,path,*args,**kw):
         """Called for path inputs"""
         if operation in self.write_ops and not self._ok(path):

From 687b1f10c00ef4970614a1450a74b8a9e3f5b9a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 5 Mar 2010 00:16:02 +0000
Subject: [PATCH 2878/8469] reverting partially distutils to its 2.6.x state so
 2.7a4 looks more like the 2.7b1 in this. the whole revert will occur after a4
 is tagged

---
 command/build_ext.py          | 200 +++++-------
 command/install.py            | 227 ++++++-------
 cygwinccompiler.py            | 220 ++++++++-----
 emxccompiler.py               |  35 +-
 extension.py                  |  71 ++--
 sysconfig.py                  | 591 +++++++++++++++++++++++++++++-----
 tests/test_cygwinccompiler.py | 111 -------
 tests/test_emxccompiler.py    |  33 --
 tests/test_extension.py       |  78 -----
 tests/test_install.py         | 173 +---------
 tests/test_unixccompiler.py   |   8 +-
 tests/test_util.py            | 260 +--------------
 unixccompiler.py              |  29 +-
 util.py                       | 355 ++++++++++++--------
 14 files changed, 1157 insertions(+), 1234 deletions(-)
 delete mode 100644 tests/test_cygwinccompiler.py
 delete mode 100644 tests/test_emxccompiler.py
 delete mode 100755 tests/test_extension.py

diff --git a/command/build_ext.py b/command/build_ext.py
index 420d7f171d..8248089fec 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,27 +4,21 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-__revision__ = "$Id$"
+# This module should be kept compatible with Python 2.1.
 
-import sys, os, re
-from warnings import warn
+__revision__ = "$Id$"
 
-from distutils.util import get_platform
+import sys, os, string, re
+from types import *
+from site import USER_BASE, USER_SITE
 from distutils.core import Command
 from distutils.errors import *
-from distutils.ccompiler import customize_compiler
+from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils.util import get_platform
 from distutils import log
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    HAS_USER_SITE = True
-
 if os.name == 'nt':
     from distutils.msvccompiler import get_build_version
     MSVC_VERSION = int(get_build_version())
@@ -40,7 +34,7 @@ def show_compilers ():
     show_compilers()
 
 
-class build_ext(Command):
+class build_ext (Command):
 
     description = "build C/C++ extensions (compile/link to build directory)"
 
@@ -100,55 +94,18 @@ class build_ext(Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
+        ('user', None,
+         "add user include, library and rpath"),
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
-
-    if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "add user include, library and rpath"))
-        boolean_options.append('user')
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
 
     help_options = [
         ('help-compiler', None,
          "list available compilers", show_compilers),
         ]
 
-
-    # making 'compiler' a property to deprecate
-    # its usage as something else than a compiler type
-    # e.g. like a compiler instance
-    def __init__(self, dist):
-        self._compiler = None
-        Command.__init__(self, dist)
-
-    def __setattr__(self, name, value):
-        # need this to make sure setattr() (used in distutils)
-        # doesn't kill our property
-        if name == 'compiler':
-            self._set_compiler(value)
-        else:
-            self.__dict__[name] = value
-
-    def _set_compiler(self, compiler):
-        if not isinstance(compiler, str) and compiler is not None:
-            # we don't want to allow that anymore in the future
-            warn("'compiler' specifies the compiler type in build_ext. "
-                 "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", DeprecationWarning)
-        self._compiler = compiler
-
-    def _get_compiler(self):
-        if not isinstance(self._compiler, str) and self._compiler is not None:
-            # we don't want to allow that anymore in the future
-            warn("'compiler' specifies the compiler type in build_ext. "
-                 "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", DeprecationWarning)
-        return self._compiler
-
-    compiler = property(_get_compiler, _set_compiler)
-
-    def initialize_options(self):
+    def initialize_options (self):
         self.extensions = None
         self.build_lib = None
         self.plat_name = None
@@ -172,7 +129,8 @@ def initialize_options(self):
         self.user = None
 
     def finalize_options(self):
-        _sysconfig = __import__('sysconfig')
+        from distutils import sysconfig
+
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('build_temp', 'build_temp'),
@@ -189,8 +147,8 @@ def finalize_options(self):
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        py_include = _sysconfig.get_path('include')
-        plat_py_include = _sysconfig.get_path('platinclude')
+        py_include = sysconfig.get_python_inc()
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if isinstance(self.include_dirs, str):
@@ -211,13 +169,13 @@ def finalize_options(self):
             self.libraries = []
         if self.library_dirs is None:
             self.library_dirs = []
-        elif isinstance(self.library_dirs, str):
-            self.library_dirs = self.library_dirs.split(os.pathsep)
+        elif type(self.library_dirs) is StringType:
+            self.library_dirs = string.split(self.library_dirs, os.pathsep)
 
         if self.rpath is None:
             self.rpath = []
-        elif isinstance(self.rpath, str):
-            self.rpath = self.rpath.split(os.pathsep)
+        elif type(self.rpath) is StringType:
+            self.rpath = string.split(self.rpath, os.pathsep)
 
         # for extensions under windows use different directories
         # for Release and Debug builds.
@@ -268,7 +226,7 @@ def finalize_options(self):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                  "python" + _sysconfig.get_python_version(),
+                                                      "python" + get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions
@@ -276,13 +234,13 @@ def finalize_options(self):
 
         # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        _sysconfig.get_config_var('Py_ENABLE_SHARED')
+        sysconfig.get_config_var('Py_ENABLE_SHARED')
         if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
              or sys.platform.startswith('sunos'))
-            and _sysconfig.get_config_var('Py_ENABLE_SHARED')):
+            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
-                self.library_dirs.append(_sysconfig.get_config_var('LIBDIR'))
+                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:
                 # building python standard extensions
                 self.library_dirs.append('.')
@@ -294,7 +252,7 @@ def finalize_options(self):
 
         if self.define:
             defines = self.define.split(',')
-            self.define = [(symbol, '1') for symbol in defines]
+            self.define = map(lambda symbol: (symbol, '1'), defines)
 
         # The option for macros to undefine is also a string from the
         # option parsing, but has to be a list.  Multiple symbols can also
@@ -345,50 +303,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-
-        # used to prevent the usage of an existing compiler for the
-        # compiler option when calling new_compiler()
-        # this will be removed in 3.3 and 2.8
-        if not isinstance(self._compiler, str):
-            self._compiler = None
-
-        self.compiler_obj = new_compiler(compiler=self._compiler,
-                                         verbose=self.verbose,
-                                         dry_run=self.dry_run,
-                                         force=self.force)
-
-        # used to keep the compiler object reachable with
-        # "self.compiler". this will be removed in 3.3 and 2.8
-        self._compiler = self.compiler_obj
-
-        customize_compiler(self.compiler_obj)
+        self.compiler = new_compiler(compiler=self.compiler,
+                                     verbose=self.verbose,
+                                     dry_run=self.dry_run,
+                                     force=self.force)
+        customize_compiler(self.compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler_obj.initialize(self.plat_name)
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler_obj.set_include_dirs(self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler_obj.define_macro(name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler_obj.undefine_macro(macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler_obj.set_libraries(self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler_obj.set_library_dirs(self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler_obj.set_runtime_library_dirs(self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler_obj.set_link_objects(self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -500,17 +446,11 @@ def build_extensions(self):
         self.check_extensions_list(self.extensions)
 
         for ext in self.extensions:
-            try:
-                self.build_extension(ext)
-            except (CCompilerError, DistutilsError, CompileError), e:
-                if not ext.optional:
-                    raise
-                self.warn('building extension "%s" failed: %s' %
-                          (ext.name, e))
+            self.build_extension(ext)
 
     def build_extension(self, ext):
         sources = ext.sources
-        if sources is None or not isinstance(sources, (list, tuple)):
+        if sources is None or type(sources) not in (ListType, TupleType):
             raise DistutilsSetupError, \
                   ("in 'ext_modules' option (extension '%s'), " +
                    "'sources' must be present and must be " +
@@ -550,13 +490,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler_obj.compile(sources,
-                                            output_dir=self.build_temp,
-                                            macros=macros,
-                                            include_dirs=ext.include_dirs,
-                                            debug=self.debug,
-                                            extra_postargs=extra_args,
-                                            depends=ext.depends)
+        objects = self.compiler.compile(sources,
+                                         output_dir=self.build_temp,
+                                         macros=macros,
+                                         include_dirs=ext.include_dirs,
+                                         debug=self.debug,
+                                         extra_postargs=extra_args,
+                                         depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -577,9 +517,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler_obj.detect_language(sources)
+        language = ext.language or self.compiler.detect_language(sources)
 
-        self.compiler_obj.link_shared_object(
+        self.compiler.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -591,12 +531,14 @@ def build_extension(self, ext):
             target_lang=language)
 
 
-    def swig_sources(self, sources, extension):
+    def swig_sources (self, sources, extension):
+
         """Walk the list of source files in 'sources', looking for SWIG
         interface (.i) files.  Run SWIG on all that are found, and
         return a modified 'sources' list with SWIG source files replaced
         by the generated C (or C++) files.
         """
+
         new_sources = []
         swig_sources = []
         swig_targets = {}
@@ -645,7 +587,9 @@ def swig_sources(self, sources, extension):
 
         return new_sources
 
-    def find_swig(self):
+    # swig_sources ()
+
+    def find_swig (self):
         """Return the name of the SWIG executable.  On Unix, this is
         just "swig" -- it should be in the PATH.  Tries a bit harder on
         Windows.
@@ -674,6 +618,8 @@ def find_swig(self):
                   ("I don't know how to find (much less run) SWIG "
                    "on platform '%s'") % os.name
 
+    # find_swig ()
+
     # -- Name generators -----------------------------------------------
     # (extension names, filenames, whatever)
     def get_ext_fullpath(self, ext_name):
@@ -682,9 +628,14 @@ def get_ext_fullpath(self, ext_name):
         The file is located in `build_lib` or directly in the package
         (inplace option).
         """
+        # makes sure the extension name is only using dots
+        all_dots = string.maketrans('/'+os.sep, '..')
+        ext_name = ext_name.translate(all_dots)
+
         fullname = self.get_ext_fullname(ext_name)
         modpath = fullname.split('.')
-        filename = self.get_ext_filename(modpath[-1])
+        filename = self.get_ext_filename(ext_name)
+        filename = os.path.split(filename)[-1]
 
         if not self.inplace:
             # no further work needed
@@ -717,18 +668,18 @@ def get_ext_filename(self, ext_name):
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-        _sysconfig = __import__('sysconfig')
-        ext_path = ext_name.split('.')
+        from distutils.sysconfig import get_config_var
+        ext_path = string.split(ext_name, '.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
-        so_ext = _sysconfig.get_config_var('SO')
+        so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return os.path.join(*ext_path) + '_d' + so_ext
+            return apply(os.path.join, ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
 
-    def get_export_symbols(self, ext):
+    def get_export_symbols (self, ext):
         """Return the list of symbols that a shared extension has to
         export.  This either uses 'ext.export_symbols' or, if it's not
         provided, "init" + module_name.  Only relevant on Windows, where
@@ -739,7 +690,7 @@ def get_export_symbols(self, ext):
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
 
-    def get_libraries(self, ext):
+    def get_libraries (self, ext):
         """Return the list of libraries to link against when building a
         shared extension.  On most platforms, this is just 'ext.libraries';
         on Windows and OS/2, we add the Python library (eg. python20.dll).
@@ -751,7 +702,7 @@ def get_libraries(self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler_obj, MSVCCompiler):
+            if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
@@ -783,13 +734,14 @@ def get_libraries(self, ext):
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "atheos":
-            _sysconfig = __import__('sysconfig')
+            from distutils import sysconfig
+
             template = "python%d.%d"
             pythonlib = (template %
                    (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
             # Get SHLIBS from Makefile
             extra = []
-            for lib in _sysconfig.get_config_var('SHLIBS').split():
+            for lib in sysconfig.get_config_var('SHLIBS').split():
                 if lib.startswith('-l'):
                     extra.append(lib[2:])
                 else:
@@ -803,11 +755,13 @@ def get_libraries(self, ext):
             return ext.libraries
 
         else:
-            _sysconfig = __import__('sysconfig')
-            if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            from distutils import sysconfig
+            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 template = "python%d.%d"
                 pythonlib = (template %
                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
+
+# class build_ext
diff --git a/command/install.py b/command/install.py
index fb17b4f6ea..44c76926ea 100644
--- a/command/install.py
+++ b/command/install.py
@@ -2,22 +2,26 @@
 
 Implements the Distutils 'install' command."""
 
-__revision__ = "$Id$"
+from distutils import log
 
-import sys
-import os
+# This module should be kept compatible with Python 2.1.
 
-from sysconfig import get_config_vars, get_paths, get_path, get_config_var
+__revision__ = "$Id$"
 
-from distutils import log
+import sys, os, string
+from types import *
 from distutils.core import Command
 from distutils.debug import DEBUG
+from distutils.sysconfig import get_config_vars
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, change_root, get_platform
+from distutils.util import convert_path, subst_vars, change_root
+from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
+from site import USER_BASE
+from site import USER_SITE
+
 
-# kept for backward compat, will be removed in 3.2
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
         'purelib': '$base',
@@ -95,19 +99,13 @@
         },
     }
 
+# The keys to an installation scheme; if any new types of files are to be
+# installed, be sure to add an entry to every installation scheme above,
+# and to SCHEME_KEYS here.
 SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
-# end of backward compat
 
-def _subst_vars(s, local_vars):
-    try:
-        return s.format(**local_vars)
-    except KeyError:
-        try:
-            return s.format(**os.environ)
-        except KeyError, var:
-            raise AttributeError('{%s}' % var)
 
-class install(Command):
+class install (Command):
 
     description = "install everything from build directory"
 
@@ -119,6 +117,8 @@ class install(Command):
          "(Unix only) prefix for platform-specific files"),
         ('home=', None,
          "(Unix only) home directory to install under"),
+        ('user', None,
+         "install in user site-package '%s'" % USER_SITE),
 
         # Or, just set the base director(y|ies)
         ('install-base=', None,
@@ -170,17 +170,12 @@ class install(Command):
          "filename in which to record list of installed files"),
         ]
 
-    boolean_options = ['compile', 'force', 'skip-build']
-
-    user_options.append(('user', None,
-                        "install in user site-package '%s'" % \
-                            get_path('purelib', '%s_user' % os.name)))
-    boolean_options.append('user')
+    boolean_options = ['compile', 'force', 'skip-build', 'user']
     negative_opt = {'no-compile' : 'compile'}
 
 
-    def initialize_options(self):
-        """Initializes options."""
+    def initialize_options (self):
+
         # High-level options: these select both an installation base
         # and scheme.
         self.prefix = None
@@ -205,8 +200,8 @@ def initialize_options(self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
-        self.install_userbase = get_config_var('userbase')
-        self.install_usersite = get_path('purelib', '%s_user' % os.name)
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
 
         self.compile = None
         self.optimize = None
@@ -256,8 +251,8 @@ def initialize_options(self):
     # party Python modules on various platforms given a wide
     # array of user input is decided.  Yes, it's quite complex!)
 
-    def finalize_options(self):
-        """Finalizes options."""
+    def finalize_options (self):
+
         # This method (and its pliant slaves, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
@@ -315,10 +310,8 @@ def finalize_options(self):
         # $platbase in the other installation directories and not worry
         # about needing recursive variable expansion (shudder).
 
-        py_version = sys.version.split()[0]
-        prefix, exec_prefix, srcdir = get_config_vars('prefix', 'exec_prefix',
-                                                      'srcdir')
-
+        py_version = (string.split(sys.version))[0]
+        (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
@@ -329,11 +322,9 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
-                            'srcdir': srcdir,
+                            'userbase': self.install_userbase,
+                            'usersite': self.install_usersite,
                            }
-
-        self.config_vars['userbase'] = self.install_userbase
-        self.config_vars['usersite'] = self.install_usersite
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
@@ -399,27 +390,29 @@ def finalize_options(self):
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!
 
-    def dump_dirs(self, msg):
-        """Dumps the list of user options."""
-        if not DEBUG:
-            return
-        from distutils.fancy_getopt import longopt_xlate
-        log.debug(msg + ":")
-        for opt in self.user_options:
-            opt_name = opt[0]
-            if opt_name[-1] == "=":
-                opt_name = opt_name[0:-1]
-            if opt_name in self.negative_opt:
-                opt_name = self.negative_opt[opt_name]
-                opt_name = opt_name.translate(longopt_xlate)
-                val = not getattr(self, opt_name)
-            else:
-                opt_name = opt_name.translate(longopt_xlate)
-                val = getattr(self, opt_name)
-            log.debug("  %s: %s" % (opt_name, val))
+    # finalize_options ()
+
+
+    def dump_dirs (self, msg):
+        if DEBUG:
+            from distutils.fancy_getopt import longopt_xlate
+            print msg + ":"
+            for opt in self.user_options:
+                opt_name = opt[0]
+                if opt_name[-1] == "=":
+                    opt_name = opt_name[0:-1]
+                if opt_name in self.negative_opt:
+                    opt_name = string.translate(self.negative_opt[opt_name],
+                                                longopt_xlate)
+                    val = not getattr(self, opt_name)
+                else:
+                    opt_name = string.translate(opt_name, longopt_xlate)
+                    val = getattr(self, opt_name)
+                print "  %s: %s" % (opt_name, val)
+
+
+    def finalize_unix (self):
 
-    def finalize_unix(self):
-        """Finalizes options for posix platforms."""
         if self.install_base is not None or self.install_platbase is not None:
             if ((self.install_lib is None and
                  self.install_purelib is None and
@@ -437,10 +430,10 @@ def finalize_unix(self):
                 raise DistutilsPlatformError(
                     "User base directory is not specified")
             self.install_base = self.install_platbase = self.install_userbase
-            self.select_scheme("posix_user")
+            self.select_scheme("unix_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("posix_home")
+            self.select_scheme("unix_home")
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
@@ -456,10 +449,13 @@ def finalize_unix(self):
 
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
-            self.select_scheme("posix_prefix")
+            self.select_scheme("unix_prefix")
+
+    # finalize_unix ()
+
+
+    def finalize_other (self):          # Windows and Mac OS for now
 
-    def finalize_other(self):
-        """Finalizes options for non-posix platforms"""
         if self.user:
             if self.install_userbase is None:
                 raise DistutilsPlatformError(
@@ -468,7 +464,7 @@ def finalize_other(self):
             self.select_scheme(os.name + "_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("posix_home")
+            self.select_scheme("unix_home")
         else:
             if self.prefix is None:
                 self.prefix = os.path.normpath(sys.prefix)
@@ -480,58 +476,61 @@ def finalize_other(self):
                 raise DistutilsPlatformError, \
                       "I don't know how to install stuff on '%s'" % os.name
 
-    def select_scheme(self, name):
-        """Sets the install directories by applying the install schemes."""
+    # finalize_other ()
+
+
+    def select_scheme (self, name):
         # it's the caller's problem if they supply a bad name!
-        scheme = get_paths(name, expand=False)
-        for key, value in scheme.items():
-            if key == 'platinclude':
-                key = 'headers'
-                value = os.path.join(value, self.distribution.get_name())
+        scheme = INSTALL_SCHEMES[name]
+        for key in SCHEME_KEYS:
             attrname = 'install_' + key
-            if hasattr(self, attrname):
-                if getattr(self, attrname) is None:
-                    setattr(self, attrname, value)
+            if getattr(self, attrname) is None:
+                setattr(self, attrname, scheme[key])
+
 
-    def _expand_attrs(self, attrs):
+    def _expand_attrs (self, attrs):
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                val = _subst_vars(val, self.config_vars)
+                val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
-    def expand_basedirs(self):
-        """Calls `os.path.expanduser` on install_base, install_platbase and
-        root."""
-        self._expand_attrs(['install_base', 'install_platbase', 'root'])
 
-    def expand_dirs(self):
-        """Calls `os.path.expanduser` on install dirs."""
-        self._expand_attrs(['install_purelib', 'install_platlib',
-                            'install_lib', 'install_headers',
-                            'install_scripts', 'install_data',])
+    def expand_basedirs (self):
+        self._expand_attrs(['install_base',
+                            'install_platbase',
+                            'root'])
 
-    def convert_paths(self, *names):
-        """Call `convert_path` over `names`."""
+    def expand_dirs (self):
+        self._expand_attrs(['install_purelib',
+                            'install_platlib',
+                            'install_lib',
+                            'install_headers',
+                            'install_scripts',
+                            'install_data',])
+
+
+    def convert_paths (self, *names):
         for name in names:
             attr = "install_" + name
             setattr(self, attr, convert_path(getattr(self, attr)))
 
-    def handle_extra_path(self):
-        """Set `path_file` and `extra_dirs` using `extra_path`."""
+
+    def handle_extra_path (self):
+
         if self.extra_path is None:
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
-            if isinstance(self.extra_path, str):
-                self.extra_path = self.extra_path.split(',')
+            if type(self.extra_path) is StringType:
+                self.extra_path = string.split(self.extra_path, ',')
 
             if len(self.extra_path) == 1:
                 path_file = extra_dirs = self.extra_path[0]
             elif len(self.extra_path) == 2:
-                path_file, extra_dirs = self.extra_path
+                (path_file, extra_dirs) = self.extra_path
             else:
                 raise DistutilsOptionError, \
                       ("'extra_path' option must be a list, tuple, or "
@@ -540,6 +539,7 @@ def handle_extra_path(self):
             # convert to local form in case Unix notation used (as it
             # should be in setup scripts)
             extra_dirs = convert_path(extra_dirs)
+
         else:
             path_file = None
             extra_dirs = ''
@@ -549,14 +549,17 @@ def handle_extra_path(self):
         self.path_file = path_file
         self.extra_dirs = extra_dirs
 
-    def change_roots(self, *names):
-        """Change the install direcories pointed by name using root."""
+    # handle_extra_path ()
+
+
+    def change_roots (self, *names):
         for name in names:
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
 
     def create_home_path(self):
-        """Create directories under ~."""
+        """Create directories under ~
+        """
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
@@ -567,8 +570,8 @@ def create_home_path(self):
 
     # -- Command execution methods -------------------------------------
 
-    def run(self):
-        """Runs the command."""
+    def run (self):
+
         # Obviously have to build before we can install
         if not self.skip_build:
             self.run_command('build')
@@ -611,8 +614,9 @@ def run(self):
                        "you'll have to change the search path yourself"),
                        self.install_lib)
 
-    def create_path_file(self):
-        """Creates the .pth file"""
+    # run ()
+
+    def create_path_file (self):
         filename = os.path.join(self.install_libbase,
                                 self.path_file + ".pth")
         if self.install_path_file:
@@ -625,8 +629,8 @@ def create_path_file(self):
 
     # -- Reporting methods ---------------------------------------------
 
-    def get_outputs(self):
-        """Assembles the outputs of all the sub-commands."""
+    def get_outputs (self):
+        # Assemble the outputs of all the sub-commands.
         outputs = []
         for cmd_name in self.get_sub_commands():
             cmd = self.get_finalized_command(cmd_name)
@@ -642,8 +646,7 @@ def get_outputs(self):
 
         return outputs
 
-    def get_inputs(self):
-        """Returns the inputs of all the sub-commands"""
+    def get_inputs (self):
         # XXX gee, this looks familiar ;-(
         inputs = []
         for cmd_name in self.get_sub_commands():
@@ -652,29 +655,25 @@ def get_inputs(self):
 
         return inputs
 
+
     # -- Predicates for sub-command list -------------------------------
 
-    def has_lib(self):
-        """Returns true if the current distribution has any Python
+    def has_lib (self):
+        """Return true if the current distribution has any Python
         modules to install."""
         return (self.distribution.has_pure_modules() or
                 self.distribution.has_ext_modules())
 
-    def has_headers(self):
-        """Returns true if the current distribution has any headers to
-        install."""
+    def has_headers (self):
         return self.distribution.has_headers()
 
-    def has_scripts(self):
-        """Returns true if the current distribution has any scripts to.
-        install."""
+    def has_scripts (self):
         return self.distribution.has_scripts()
 
-    def has_data(self):
-        """Returns true if the current distribution has any data to.
-        install."""
+    def has_data (self):
         return self.distribution.has_data_files()
 
+
     # 'sub_commands': a list of commands this command might have to run to
     # get its work done.  See cmd.py for more info.
     sub_commands = [('install_lib',     has_lib),
@@ -683,3 +682,5 @@ def has_data(self):
                     ('install_data',    has_data),
                     ('install_egg_info', lambda self:True),
                    ]
+
+# class install
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 2a61bd5ad7..2dabc0f0fe 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -45,18 +45,16 @@
 # * mingw gcc 3.2/ld 2.13 works
 #   (ld supports -shared)
 
-__revision__ = "$Id$"
+# This module should be kept compatible with Python 2.1.
 
-import os
-import sys
-import copy
-import re
-from warnings import warn
+__revision__ = "$Id$"
 
+import os,sys,copy
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils.util import get_compiler_versions
+from distutils import log
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -81,9 +79,8 @@ def get_msvcr():
             raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
-class CygwinCCompiler(UnixCCompiler):
-    """ Handles the Cygwin port of the GNU C compiler to Windows.
-    """
+class CygwinCCompiler (UnixCCompiler):
+
     compiler_type = 'cygwin'
     obj_extension = ".o"
     static_lib_extension = ".a"
@@ -92,11 +89,11 @@ class CygwinCCompiler(UnixCCompiler):
     shared_lib_format = "%s%s"
     exe_extension = ".exe"
 
-    def __init__(self, verbose=0, dry_run=0, force=0):
+    def __init__ (self, verbose=0, dry_run=0, force=0):
 
-        UnixCCompiler.__init__(self, verbose, dry_run, force)
+        UnixCCompiler.__init__ (self, verbose, dry_run, force)
 
-        status, details = check_config_h()
+        (status, details) = check_config_h()
         self.debug_print("Python's GCC status: %s (details: %s)" %
                          (status, details))
         if status is not CONFIG_H_OK:
@@ -107,7 +104,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
                 % details)
 
         self.gcc_version, self.ld_version, self.dllwrap_version = \
-            get_compiler_versions()
+            get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version,
                           self.ld_version,
@@ -151,8 +148,10 @@ def __init__(self, verbose=0, dry_run=0, force=0):
             # with MSVC 7.0 or later.
             self.dll_libraries = get_msvcr()
 
+    # __init__ ()
+
+
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-        """Compiles the source by spawing GCC and windres if needed."""
         if ext == '.rc' or ext == '.res':
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
@@ -166,11 +165,21 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
             except DistutilsExecError, msg:
                 raise CompileError, msg
 
-    def link(self, target_desc, objects, output_filename, output_dir=None,
-             libraries=None, library_dirs=None, runtime_library_dirs=None,
-             export_symbols=None, debug=0, extra_preargs=None,
-             extra_postargs=None, build_temp=None, target_lang=None):
-        """Link the objects."""
+    def link (self,
+              target_desc,
+              objects,
+              output_filename,
+              output_dir=None,
+              libraries=None,
+              library_dirs=None,
+              runtime_library_dirs=None,
+              export_symbols=None,
+              debug=0,
+              extra_preargs=None,
+              extra_postargs=None,
+              build_temp=None,
+              target_lang=None):
+
         # use separate copies, so we can modify the lists
         extra_preargs = copy.copy(extra_preargs or [])
         libraries = copy.copy(libraries or [])
@@ -235,44 +244,64 @@ def link(self, target_desc, objects, output_filename, output_dir=None,
         if not debug:
             extra_preargs.append("-s")
 
-        UnixCCompiler.link(self, target_desc, objects, output_filename,
-                           output_dir, libraries, library_dirs,
+        UnixCCompiler.link(self,
+                           target_desc,
+                           objects,
+                           output_filename,
+                           output_dir,
+                           libraries,
+                           library_dirs,
                            runtime_library_dirs,
                            None, # export_symbols, we do this in our def-file
-                           debug, extra_preargs, extra_postargs, build_temp,
+                           debug,
+                           extra_preargs,
+                           extra_postargs,
+                           build_temp,
                            target_lang)
 
+    # link ()
+
     # -- Miscellaneous methods -----------------------------------------
 
-    def object_filenames(self, source_filenames, strip_dir=0, output_dir=''):
-        """Adds supports for rc and res files."""
-        if output_dir is None:
-            output_dir = ''
+    # overwrite the one from CCompiler to support rc and res-files
+    def object_filenames (self,
+                          source_filenames,
+                          strip_dir=0,
+                          output_dir=''):
+        if output_dir is None: output_dir = ''
         obj_names = []
         for src_name in source_filenames:
             # use normcase to make sure '.rc' is really '.rc' and not '.RC'
-            base, ext = os.path.splitext(os.path.normcase(src_name))
+            (base, ext) = os.path.splitext (os.path.normcase(src_name))
             if ext not in (self.src_extensions + ['.rc','.res']):
                 raise UnknownFileError, \
-                      "unknown file type '%s' (from '%s')" % (ext, src_name)
+                      "unknown file type '%s' (from '%s')" % \
+                      (ext, src_name)
             if strip_dir:
                 base = os.path.basename (base)
-            if ext in ('.res', '.rc'):
+            if ext == '.res' or ext == '.rc':
                 # these need to be compiled to object files
-                obj_names.append (os.path.join(output_dir,
-                                              base + ext + self.obj_extension))
+                obj_names.append (os.path.join (output_dir,
+                                            base + ext + self.obj_extension))
             else:
-                obj_names.append (os.path.join(output_dir,
-                                               base + self.obj_extension))
+                obj_names.append (os.path.join (output_dir,
+                                            base + self.obj_extension))
         return obj_names
 
+    # object_filenames ()
+
+# class CygwinCCompiler
+
+
 # the same as cygwin plus some additional parameters
-class Mingw32CCompiler(CygwinCCompiler):
-    """ Handles the Mingw32 port of the GNU C compiler to Windows.
-    """
+class Mingw32CCompiler (CygwinCCompiler):
+
     compiler_type = 'mingw32'
 
-    def __init__(self, verbose=0, dry_run=0, force=0):
+    def __init__ (self,
+                  verbose=0,
+                  dry_run=0,
+                  force=0):
 
         CygwinCCompiler.__init__ (self, verbose, dry_run, force)
 
@@ -308,6 +337,10 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         # with MSVC 7.0 or later.
         self.dll_libraries = get_msvcr()
 
+    # __init__ ()
+
+# class Mingw32CCompiler
+
 # Because these compilers aren't configured in Python's pyconfig.h file by
 # default, we should at least warn the user if he is using a unmodified
 # version.
@@ -317,16 +350,16 @@ def __init__(self, verbose=0, dry_run=0, force=0):
 CONFIG_H_UNCERTAIN = "uncertain"
 
 def check_config_h():
-    """Check if the current Python installation appears amenable to building
-    extensions with GCC.
-
-    Returns a tuple (status, details), where 'status' is one of the following
-    constants:
-
-    - CONFIG_H_OK: all is well, go ahead and compile
-    - CONFIG_H_NOTOK: doesn't look good
-    - CONFIG_H_UNCERTAIN: not sure -- unable to read pyconfig.h
 
+    """Check if the current Python installation (specifically, pyconfig.h)
+    appears amenable to building extensions with GCC.  Returns a tuple
+    (status, details), where 'status' is one of the following constants:
+      CONFIG_H_OK
+        all is well, go ahead and compile
+      CONFIG_H_NOTOK
+        doesn't look good
+      CONFIG_H_UNCERTAIN
+        not sure -- unable to read pyconfig.h
     'details' is a human-readable string explaining the situation.
 
     Note there are two ways to conclude "OK": either 'sys.version' contains
@@ -337,45 +370,78 @@ def check_config_h():
     # XXX since this function also checks sys.version, it's not strictly a
     # "pyconfig.h" check -- should probably be renamed...
 
-    _sysconfig = __import__('sysconfig')
+    from distutils import sysconfig
+    import string
+    # if sys.version contains GCC then python was compiled with
+    # GCC, and the pyconfig.h file should be OK
+    if string.find(sys.version,"GCC") >= 0:
+        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
 
-    # if sys.version contains GCC then python was compiled with GCC, and the
-    # pyconfig.h file should be OK
-    if "GCC" in sys.version:
-        return CONFIG_H_OK, "sys.version mentions 'GCC'"
-
-    # let's see if __GNUC__ is mentioned in python.h
-    fn = _sysconfig.get_config_h_filename()
+    fn = sysconfig.get_config_h_filename()
     try:
-        with open(fn) as config_h:
-            if "__GNUC__" in config_h.read():
-                return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn
-            else:
-                return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
+        # It would probably better to read single lines to search.
+        # But we do this only once, and it is fast enough
+        f = open(fn)
+        s = f.read()
+        f.close()
+
     except IOError, exc:
+        # if we can't read this file, we cannot say it is wrong
+        # the compiler will complain later about this file as missing
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-class _Deprecated_SRE_Pattern(object):
-    def __init__(self, pattern):
-        self.pattern = pattern
+    else:
+        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
+        if string.find(s,"__GNUC__") >= 0:
+            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
+        else:
+            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
 
-    def __getattr__(self, name):
-        if name in ('findall', 'finditer', 'match', 'scanner', 'search',
-                    'split', 'sub', 'subn'):
-            warn("'distutils.cygwinccompiler.RE_VERSION' is deprecated "
-                 "and will be removed in the next version", DeprecationWarning)
-        return getattr(self.pattern, name)
 
-RE_VERSION = _Deprecated_SRE_Pattern(re.compile('(\d+\.\d+(\.\d+)*)'))
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
-
-    If not possible it returns None for it.
+        If not possible it returns None for it.
     """
-    warn("'distutils.cygwinccompiler.get_versions' is deprecated "
-         "use 'distutils.util.get_compiler_versions' instead",
-         DeprecationWarning)
-
-    return get_compiler_versions()
+    from distutils.version import LooseVersion
+    from distutils.spawn import find_executable
+    import re
+
+    gcc_exe = find_executable('gcc')
+    if gcc_exe:
+        out = os.popen(gcc_exe + ' -dumpversion','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
+        if result:
+            gcc_version = LooseVersion(result.group(1))
+        else:
+            gcc_version = None
+    else:
+        gcc_version = None
+    ld_exe = find_executable('ld')
+    if ld_exe:
+        out = os.popen(ld_exe + ' -v','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+(\.\d+)*)',out_string)
+        if result:
+            ld_version = LooseVersion(result.group(1))
+        else:
+            ld_version = None
+    else:
+        ld_version = None
+    dllwrap_exe = find_executable('dllwrap')
+    if dllwrap_exe:
+        out = os.popen(dllwrap_exe + ' --version','r')
+        out_string = out.read()
+        out.close()
+        result = re.search(' (\d+\.\d+(\.\d+)*)',out_string)
+        if result:
+            dllwrap_version = LooseVersion(result.group(1))
+        else:
+            dllwrap_version = None
+    else:
+        dllwrap_version = None
+    return (gcc_version, ld_version, dllwrap_version)
diff --git a/emxccompiler.py b/emxccompiler.py
index f2f77e52d1..f52e63232d 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -21,13 +21,12 @@
 
 __revision__ = "$Id$"
 
-import os, sys, copy
-from warnings import warn
-
+import os,sys,copy
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils.util import get_compiler_versions
+from distutils import log
 
 class EMXCCompiler (UnixCCompiler):
 
@@ -56,8 +55,8 @@ def __init__ (self,
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
 
-        gcc_version, ld_version, dllwrap_version = get_compiler_versions()
-        self.gcc_version, self.ld_version = gcc_version, ld_version
+        (self.gcc_version, self.ld_version) = \
+            get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
                          (self.gcc_version,
                           self.ld_version) )
@@ -294,11 +293,23 @@ def get_versions():
     """ Try to find out the versions of gcc and ld.
         If not possible it returns None for it.
     """
-    warn("'distutils.emxccompiler.get_versions' is deprecated "
-         "use 'distutils.util.get_compiler_versions' instead",
-         DeprecationWarning)
-
+    from distutils.version import StrictVersion
+    from distutils.spawn import find_executable
+    import re
+
+    gcc_exe = find_executable('gcc')
+    if gcc_exe:
+        out = os.popen(gcc_exe + ' -dumpversion','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+\.\d+)',out_string)
+        if result:
+            gcc_version = StrictVersion(result.group(1))
+        else:
+            gcc_version = None
+    else:
+        gcc_version = None
     # EMX ld has no way of reporting version number, and we use GCC
     # anyway - so we can link OMF DLLs
-    gcc_version, ld_version, dllwrap_version = get_compiler_versions()
-    return gcc_version, None
+    ld_version = None
+    return (gcc_version, ld_version)
diff --git a/extension.py b/extension.py
index 244b1e78ec..440d128cdc 100644
--- a/extension.py
+++ b/extension.py
@@ -5,8 +5,13 @@
 
 __revision__ = "$Id$"
 
-import os
-import warnings
+import os, string, sys
+from types import *
+
+try:
+    import warnings
+except ImportError:
+    warnings = None
 
 # This class is really only used by the "build_ext" command, so it might
 # make sense to put it in distutils.command.build_ext.  However, that
@@ -78,9 +83,6 @@ class Extension:
       language : string
         extension language (i.e. "c", "c++", "objc"). Will be detected
         from the source extensions if not provided.
-      optional : boolean
-        specifies that a build failure in the extension should not abort the
-        build process, but simply not install the failing extension.
     """
 
     # When adding arguments to this constructor, be sure to update
@@ -99,14 +101,12 @@ def __init__ (self, name, sources,
                   swig_opts = None,
                   depends=None,
                   language=None,
-                  optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        if not isinstance(name, str):
-            raise AssertionError("'name' must be a string")
-        if not (isinstance(sources, list) and
-                all(isinstance(v, str) for v in sources)):
-            raise AssertionError("'sources' must be a list of strings")
+        assert type(name) is StringType, "'name' must be a string"
+        assert (type(sources) is ListType and
+                map(type, sources) == [StringType]*len(sources)), \
+                "'sources' must be a list of strings"
 
         self.name = name
         self.sources = sources
@@ -123,28 +123,27 @@ def __init__ (self, name, sources,
         self.swig_opts = swig_opts or []
         self.depends = depends or []
         self.language = language
-        self.optional = optional
 
         # If there are unknown keyword options, warn about them
-        if len(kw) > 0:
-            options = [repr(option) for option in kw]
-            options = ', '.join(sorted(options))
-            msg = "Unknown Extension options: %s" % options
-            warnings.warn(msg)
-
-def read_setup_file(filename):
-    """Reads a Setup file and returns Extension instances."""
-    warnings.warn('distutils.extensions.read_setup_file is deprecated. '
-                  'It will be removed in the next Python release.')
-    _sysconfig = __import__('sysconfig')
-    from distutils.sysconfig import (expand_makefile_vars,
-                                     _variable_rx)
+        if len(kw):
+            L = kw.keys() ; L.sort()
+            L = map(repr, L)
+            msg = "Unknown Extension options: " + string.join(L, ', ')
+            if warnings is not None:
+                warnings.warn(msg)
+            else:
+                sys.stderr.write(msg + '\n')
+# class Extension
 
+
+def read_setup_file (filename):
+    from distutils.sysconfig import \
+         parse_makefile, expand_makefile_vars, _variable_rx
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
     # First pass over the file to gather "VAR = VALUE" assignments.
-    vars = _sysconfig._parse_makefile(filename)
+    vars = parse_makefile(filename)
 
     # Second pass to gobble up the real content: lines of the form
     #   <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -164,11 +163,10 @@ def read_setup_file(filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            line = expand_makefile_vars(line, vars)
-
+        #print "original line: " + line
+        line = expand_makefile_vars(line, vars)
         words = split_quoted(line)
+        #print "expanded line: " + line
 
         # NB. this parses a slightly different syntax than the old
         # makesetup script: here, there must be exactly one extension per
@@ -197,7 +195,7 @@ def read_setup_file(filename):
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = value.find("=")
+                equals = string.find(value, "=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"
@@ -234,4 +232,15 @@ def read_setup_file(filename):
 
         extensions.append(ext)
 
+        #print "module:", module
+        #print "source files:", source_files
+        #print "cpp args:", cpp_args
+        #print "lib args:", library_args
+
+        #extensions[module] = { 'sources': source_files,
+        #                       'cpp_args': cpp_args,
+        #                       'lib_args': library_args }
+
     return extensions
+
+# read_setup_file ()
diff --git a/sysconfig.py b/sysconfig.py
index a247bc2cd7..54ccec4953 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -7,51 +7,59 @@
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
-
-**This module has been moved out of Distutils and will be removed from
-Python in the next version (3.3)**
 """
 
 __revision__ = "$Id$"
 
+import os
 import re
-from warnings import warn
-
-# importing sysconfig from Lib
-# to avoid this module to shadow it
-_sysconfig = __import__('sysconfig')
-
-# names defined here to keep backward compatibility
-# for APIs that were relocated
-get_python_version = _sysconfig.get_python_version
-get_config_h_filename = _sysconfig.get_config_h_filename
-parse_config_h = _sysconfig.parse_config_h
-get_config_vars = _sysconfig.get_config_vars
-get_config_var = _sysconfig.get_config_var
-from distutils.ccompiler import customize_compiler
-
-_DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
-                    "Use the APIs provided by the sysconfig module instead")
-
-def _get_project_base():
-    return _sysconfig._PROJECT_BASE
-
-project_base = _get_project_base()
+import string
+import sys
+
+from distutils.errors import DistutilsPlatformError
+
+# These are needed in a couple of spots, so just compute them once.
+PREFIX = os.path.normpath(sys.prefix)
+EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+
+# Path to the base directory of the project. On Windows the binary may
+# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+# it'll live in project/PCbuild/amd64.
+project_base = os.path.dirname(os.path.abspath(sys.executable))
+if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+# PC/VS7.1
+if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
+# PC/AMD64
+if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
+
+# python_build: (Boolean) if true, we're either building Python or
+# building an extension with an un-installed Python, so we use
+# different (hard-wired) directories.
+# Setup.local is available for Makefile builds including VPATH builds,
+# Setup.dist is available on Windows
+def _python_build():
+    for fn in ("Setup.dist", "Setup.local"):
+        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
+            return True
+    return False
+python_build = _python_build()
 
-class _DeprecatedBool(int):
-    def __nonzero__(self):
-        warn(_DEPRECATION_MSG % 'get_python_version', DeprecationWarning)
-        return super(_DeprecatedBool, self).__nonzero__()
 
-def _python_build():
-    return _DeprecatedBool(_sysconfig.is_python_build())
+def get_python_version():
+    """Return a string containing the major and minor Python version,
+    leaving off the patchlevel.  Sample return values could be '1.5'
+    or '2.2'.
+    """
+    return sys.version[:3]
 
-python_build = _python_build()
 
 def get_python_inc(plat_specific=0, prefix=None):
-    """This function is deprecated.
-
-    Return the directory containing installed Python header files.
+    """Return the directory containing installed Python header files.
 
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
@@ -61,22 +69,36 @@ def get_python_inc(plat_specific=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    warn(_DEPRECATION_MSG % 'get_python_inc', DeprecationWarning)
-    get_path = _sysconfig.get_path
-
-    if prefix is not None:
-        vars = {'base': prefix}
-        return get_path('include', vars=vars)
-
-    if not plat_specific:
-        return get_path('include')
+    if prefix is None:
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
+    if os.name == "posix":
+        if python_build:
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if plat_specific:
+                inc_dir = base
+            else:
+                inc_dir = os.path.join(base, "Include")
+                if not os.path.exists(inc_dir):
+                    inc_dir = os.path.join(os.path.dirname(base), "Include")
+            return inc_dir
+        return os.path.join(prefix, "include", "python" + get_python_version())
+    elif os.name == "nt":
+        return os.path.join(prefix, "include")
+    elif os.name == "mac":
+        if plat_specific:
+            return os.path.join(prefix, "Mac", "Include")
+        else:
+            return os.path.join(prefix, "Include")
+    elif os.name == "os2":
+        return os.path.join(prefix, "Include")
     else:
-        return get_path('platinclude')
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its C header files "
+            "on platform '%s'" % os.name)
 
-def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
-    """This function is deprecated.
 
-    Return the directory containing the Python library (standard or
+def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+    """Return the directory containing the Python library (standard or
     site additions).
 
     If 'plat_specific' is true, return the directory containing
@@ -89,33 +111,146 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    warn(_DEPRECATION_MSG % 'get_python_lib', DeprecationWarning)
-    vars = {}
-    get_path = _sysconfig.get_path
-    if prefix is not None:
-        if plat_specific:
-            vars['platbase'] = prefix
+    if prefix is None:
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+    if os.name == "posix":
+        libpython = os.path.join(prefix,
+                                 "lib", "python" + get_python_version())
+        if standard_lib:
+            return libpython
         else:
-            vars['base'] = prefix
+            return os.path.join(libpython, "site-packages")
 
-    if standard_lib:
+    elif os.name == "nt":
+        if standard_lib:
+            return os.path.join(prefix, "Lib")
+        else:
+            if get_python_version() < "2.2":
+                return prefix
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
+
+    elif os.name == "mac":
         if plat_specific:
-            return get_path('platstdlib', vars=vars)
+            if standard_lib:
+                return os.path.join(prefix, "Lib", "lib-dynload")
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
         else:
-            return get_path('stdlib', vars=vars)
+            if standard_lib:
+                return os.path.join(prefix, "Lib")
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
+
+    elif os.name == "os2":
+        if standard_lib:
+            return os.path.join(prefix, "Lib")
+        else:
+            return os.path.join(prefix, "Lib", "site-packages")
+
     else:
-        if plat_specific:
-            return get_path('platlib', vars=vars)
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its library "
+            "on platform '%s'" % os.name)
+
+
+def customize_compiler(compiler):
+    """Do any platform-specific customization of a CCompiler instance.
+
+    Mainly needed on Unix, so we can plug in the information that
+    varies across Unices and is stored in Python's Makefile.
+    """
+    if compiler.compiler_type == "unix":
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+                            'CCSHARED', 'LDSHARED', 'SO')
+
+        if 'CC' in os.environ:
+            cc = os.environ['CC']
+        if 'CXX' in os.environ:
+            cxx = os.environ['CXX']
+        if 'LDSHARED' in os.environ:
+            ldshared = os.environ['LDSHARED']
+        if 'CPP' in os.environ:
+            cpp = os.environ['CPP']
+        else:
+            cpp = cc + " -E"           # not always
+        if 'LDFLAGS' in os.environ:
+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if 'CFLAGS' in os.environ:
+            cflags = opt + ' ' + os.environ['CFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
+        if 'CPPFLAGS' in os.environ:
+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+
+        cc_cmd = cc + ' ' + cflags
+        compiler.set_executables(
+            preprocessor=cpp,
+            compiler=cc_cmd,
+            compiler_so=cc_cmd + ' ' + ccshared,
+            compiler_cxx=cxx,
+            linker_so=ldshared,
+            linker_exe=cc)
+
+        compiler.shared_lib_extension = so_ext
+
+
+def get_config_h_filename():
+    """Return full pathname of installed pyconfig.h file."""
+    if python_build:
+        if os.name == "nt":
+            inc_dir = os.path.join(project_base, "PC")
         else:
-            return get_path('purelib', vars=vars)
+            inc_dir = project_base
+    else:
+        inc_dir = get_python_inc(plat_specific=1)
+    if get_python_version() < '2.2':
+        config_h = 'config.h'
+    else:
+        # The name of the config.h file changed in 2.2
+        config_h = 'pyconfig.h'
+    return os.path.join(inc_dir, config_h)
+
 
 def get_makefile_filename():
-    """This function is deprecated.
+    """Return full pathname of installed Makefile from the Python build."""
+    if python_build:
+        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+    return os.path.join(lib_dir, "config", "Makefile")
+
 
-    Return full pathname of installed Makefile from the Python build.
+def parse_config_h(fp, g=None):
+    """Parse a config.h-style file.
+
+    A dictionary containing name/value pairs is returned.  If an
+    optional dictionary is passed in as the second argument, it is
+    used instead of a new dictionary.
     """
-    warn(_DEPRECATION_MSG % 'get_makefile_filename', DeprecationWarning)
-    return _sysconfig._get_makefile_filename()
+    if g is None:
+        g = {}
+    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
+    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
+    #
+    while 1:
+        line = fp.readline()
+        if not line:
+            break
+        m = define_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            try: v = int(v)
+            except ValueError: pass
+            g[n] = v
+        else:
+            m = undef_rx.match(line)
+            if m:
+                g[m.group(1)] = 0
+    return g
+
 
 # Regexes needed for parsing Makefile (and similar syntaxes,
 # like old-style Setup files).
@@ -124,29 +259,91 @@ def get_makefile_filename():
 _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
 
 def parse_makefile(fn, g=None):
-    """This function is deprecated.
-
-    Parse a Makefile-style file.
+    """Parse a Makefile-style file.
 
     A dictionary containing name/value pairs is returned.  If an
     optional dictionary is passed in as the second argument, it is
     used instead of a new dictionary.
     """
-    warn(_DEPRECATION_MSG % 'parse_makefile', DeprecationWarning)
-    return _sysconfig._parse_makefile(fn, g)
+    from distutils.text_file import TextFile
+    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
 
-def expand_makefile_vars(s, vars):
-    """This function is deprecated.
+    if g is None:
+        g = {}
+    done = {}
+    notdone = {}
 
-    Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
+    while 1:
+        line = fp.readline()
+        if line is None:  # eof
+            break
+        m = _variable_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            v = v.strip()
+            # `$$' is a literal `$' in make
+            tmpv = v.replace('$$', '')
+
+            if "$" in tmpv:
+                notdone[n] = v
+            else:
+                try:
+                    v = int(v)
+                except ValueError:
+                    # insert literal `$'
+                    done[n] = v.replace('$$', '$')
+                else:
+                    done[n] = v
+
+    # do variable interpolation here
+    while notdone:
+        for name in notdone.keys():
+            value = notdone[name]
+            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+            if m:
+                n = m.group(1)
+                found = True
+                if n in done:
+                    item = str(done[n])
+                elif n in notdone:
+                    # get it on a subsequent round
+                    found = False
+                elif n in os.environ:
+                    # do it like make: fall back to environment
+                    item = os.environ[n]
+                else:
+                    done[n] = item = ""
+                if found:
+                    after = value[m.end():]
+                    value = value[:m.start()] + item + after
+                    if "$" in after:
+                        notdone[name] = value
+                    else:
+                        try: value = int(value)
+                        except ValueError:
+                            done[name] = value.strip()
+                        else:
+                            done[name] = value
+                        del notdone[name]
+            else:
+                # bogus variable reference; just drop it since we can't deal
+                del notdone[name]
+
+    fp.close()
+
+    # save the results in the global dictionary
+    g.update(done)
+    return g
+
+
+def expand_makefile_vars(s, vars):
+    """Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
     'string' according to 'vars' (a dictionary mapping variable names to
     values).  Variables not present in 'vars' are silently expanded to the
     empty string.  The variable values in 'vars' should not contain further
     variable expansions; if 'vars' is the output of 'parse_makefile()',
     you're fine.  Returns a variable-expanded version of 's'.
     """
-    warn('this function will be removed in then next version of Python',
-         DeprecationWarning)
 
     # This algorithm does multiple expansion, so if vars['foo'] contains
     # "${bar}", it will expand ${foo} to ${bar}, and then expand
@@ -162,3 +359,247 @@ def expand_makefile_vars(s, vars):
         else:
             break
     return s
+
+
+_config_vars = None
+
+def _init_posix():
+    """Initialize the module as appropriate for POSIX systems."""
+    g = {}
+    # load the installed Makefile:
+    try:
+        filename = get_makefile_filename()
+        parse_makefile(filename, g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(file(filename), g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # On MacOSX we need to check the setting of the environment variable
+    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
+    # it needs to be compatible.
+    # If it isn't set we set it to the configure-time value
+    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
+        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
+        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
+        if cur_target == '':
+            cur_target = cfg_target
+            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
+        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
+            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
+                % (cur_target, cfg_target))
+            raise DistutilsPlatformError(my_msg)
+
+    # On AIX, there are wrong paths to the linker scripts in the Makefile
+    # -- these paths are relative to the Python source, but when installed
+    # the scripts are in another directory.
+    if python_build:
+        g['LDSHARED'] = g['BLDSHARED']
+
+    elif get_python_version() < '2.1':
+        # The following two branches are for 1.5.2 compatibility.
+        if sys.platform == 'aix4':          # what about AIX 3.x ?
+            # Linker script is in the config directory, not in Modules as the
+            # Makefile says.
+            python_lib = get_python_lib(standard_lib=1)
+            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
+            python_exp = os.path.join(python_lib, 'config', 'python.exp')
+
+            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
+
+        elif sys.platform == 'beos':
+            # Linker script is in the config directory.  In the Makefile it is
+            # relative to the srcdir, which after installation no longer makes
+            # sense.
+            python_lib = get_python_lib(standard_lib=1)
+            linkerscript_path = string.split(g['LDSHARED'])[0]
+            linkerscript_name = os.path.basename(linkerscript_path)
+            linkerscript = os.path.join(python_lib, 'config',
+                                        linkerscript_name)
+
+            # XXX this isn't the right place to do this: adding the Python
+            # library to the link, if needed, should be in the "build_ext"
+            # command.  (It's also needed for non-MS compilers on Windows, and
+            # it's taken care of for them by the 'build_ext.get_libraries()'
+            # method.)
+            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
+                             (linkerscript, PREFIX, get_python_version()))
+
+    global _config_vars
+    _config_vars = g
+
+
+def _init_nt():
+    """Initialize the module as appropriate for NT"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    g['SO'] = '.pyd'
+    g['EXE'] = ".exe"
+    g['VERSION'] = get_python_version().replace(".", "")
+    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
+
+    global _config_vars
+    _config_vars = g
+
+
+def _init_mac():
+    """Initialize the module as appropriate for Macintosh systems"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    import MacOS
+    if not hasattr(MacOS, 'runtimemodel'):
+        g['SO'] = '.ppc.slb'
+    else:
+        g['SO'] = '.%s.slb' % MacOS.runtimemodel
+
+    # XXX are these used anywhere?
+    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
+    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
+
+    # These are used by the extension module build
+    g['srcdir'] = ':'
+    global _config_vars
+    _config_vars = g
+
+
+def _init_os2():
+    """Initialize the module as appropriate for OS/2"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    g['SO'] = '.pyd'
+    g['EXE'] = ".exe"
+
+    global _config_vars
+    _config_vars = g
+
+
+def get_config_vars(*args):
+    """With no arguments, return a dictionary of all configuration
+    variables relevant for the current platform.  Generally this includes
+    everything needed to build extensions and install both pure modules and
+    extensions.  On Unix, this means every variable defined in Python's
+    installed Makefile; on Windows and Mac OS it's a much smaller set.
+
+    With arguments, return a list of values that result from looking up
+    each argument in the configuration variable dictionary.
+    """
+    global _config_vars
+    if _config_vars is None:
+        func = globals().get("_init_" + os.name)
+        if func:
+            func()
+        else:
+            _config_vars = {}
+
+        # Normalized versions of prefix and exec_prefix are handy to have;
+        # in fact, these are the standard versions used most places in the
+        # Distutils.
+        _config_vars['prefix'] = PREFIX
+        _config_vars['exec_prefix'] = EXEC_PREFIX
+
+        if sys.platform == 'darwin':
+            kernel_version = os.uname()[2] # Kernel version (8.4.3)
+            major_version = int(kernel_version.split('.')[0])
+
+            if major_version < 8:
+                # On Mac OS X before 10.4, check if -arch and -isysroot
+                # are in CFLAGS or LDFLAGS and remove them if they are.
+                # This is needed when building extensions on a 10.3 system
+                # using a universal build of python.
+                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+                    flags = _config_vars[key]
+                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
+                    _config_vars[key] = flags
+
+            else:
+
+                # Allow the user to override the architecture flags using
+                # an environment variable.
+                # NOTE: This name was introduced by Apple in OSX 10.5 and
+                # is used by several scripting languages distributed with
+                # that OS release.
+
+                if 'ARCHFLAGS' in os.environ:
+                    arch = os.environ['ARCHFLAGS']
+                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                        flags = _config_vars[key]
+                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                        flags = flags + ' ' + arch
+                        _config_vars[key] = flags
+
+                # If we're on OSX 10.5 or later and the user tries to
+                # compiles an extension using an SDK that is not present
+                # on the current machine it is better to not use an SDK
+                # than to fail.
+                #
+                # The major usecase for this is users using a Python.org
+                # binary installer  on OSX 10.6: that installer uses
+                # the 10.4u SDK, but that SDK is not installed by default
+                # when you install Xcode.
+                #
+                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
+                if m is not None:
+                    sdk = m.group(1)
+                    if not os.path.exists(sdk):
+                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
+                             # a number of derived variables. These need to be
+                             # patched up as well.
+                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                            flags = _config_vars[key]
+                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
+                            _config_vars[key] = flags
+
+    if args:
+        vals = []
+        for name in args:
+            vals.append(_config_vars.get(name))
+        return vals
+    else:
+        return _config_vars
+
+def get_config_var(name):
+    """Return the value of a single variable using the dictionary
+    returned by 'get_config_vars()'.  Equivalent to
+    get_config_vars().get(name)
+    """
+    return get_config_vars().get(name)
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
deleted file mode 100644
index e97ac666a6..0000000000
--- a/tests/test_cygwinccompiler.py
+++ /dev/null
@@ -1,111 +0,0 @@
-"""Tests for distutils.cygwinccompiler."""
-import unittest
-import sys
-import os
-import warnings
-import sysconfig
-
-from test.test_support import check_warnings, run_unittest
-from test.test_support import captured_stdout
-
-from distutils import cygwinccompiler
-from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
-                                       CONFIG_H_OK, CONFIG_H_NOTOK,
-                                       CONFIG_H_UNCERTAIN, get_versions,
-                                       get_msvcr, RE_VERSION)
-from distutils.util import get_compiler_versions
-from distutils.tests import support
-
-class CygwinCCompilerTestCase(support.TempdirManager,
-                              unittest.TestCase):
-
-    def setUp(self):
-        super(CygwinCCompilerTestCase, self).setUp()
-        self.version = sys.version
-        self.python_h = os.path.join(self.mkdtemp(), 'python.h')
-        self.old_get_config_h_filename = sysconfig.get_config_h_filename
-        sysconfig.get_config_h_filename = self._get_config_h_filename
-
-    def tearDown(self):
-        sys.version = self.version
-        sysconfig.get_config_h_filename = self.old_get_config_h_filename
-        super(CygwinCCompilerTestCase, self).tearDown()
-
-    def _get_config_h_filename(self):
-        return self.python_h
-
-    def test_check_config_h(self):
-
-        # check_config_h looks for "GCC" in sys.version first
-        # returns CONFIG_H_OK if found
-        sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
-                       '4.0.1 (Apple Computer, Inc. build 5370)]')
-
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
-
-        # then it tries to see if it can find "__GNUC__" in pyconfig.h
-        sys.version = 'something without the *CC word'
-
-        # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
-        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
-
-        # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
-        self.write_file(self.python_h, 'xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
-
-        # and CONFIG_H_OK if __GNUC__ is found
-        self.write_file(self.python_h, 'xxx __GNUC__ xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
-
-    def test_get_msvcr(self):
-
-        # none
-        sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
-                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
-        self.assertEquals(get_msvcr(), None)
-
-        # MSVC 7.0
-        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
-                       '[MSC v.1300 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr70'])
-
-        # MSVC 7.1
-        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
-                       '[MSC v.1310 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr71'])
-
-        # VS2005 / MSVC 8.0
-        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
-                       '[MSC v.1400 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr80'])
-
-        # VS2008 / MSVC 9.0
-        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
-                       '[MSC v.1500 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr90'])
-
-        # unknown
-        sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
-                       '[MSC v.1999 32 bits (Intel)]')
-        self.assertRaises(ValueError, get_msvcr)
-
-
-    def test_get_version_deprecated(self):
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            # make sure get_compiler_versions and get_versions
-            # returns the same thing
-            self.assertEquals(get_compiler_versions(), get_versions())
-            # make sure using get_version() generated a warning
-            self.assertEquals(len(w.warnings), 1)
-            # make sure any usage of RE_VERSION will also
-            # generate a warning, but till works
-            version = RE_VERSION.search('1.2').group(1)
-            self.assertEquals(version, '1.2')
-            self.assertEquals(len(w.warnings), 2)
-
-def test_suite():
-    return unittest.makeSuite(CygwinCCompilerTestCase)
-
-if __name__ == '__main__':
-    run_unittest(test_suite())
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
deleted file mode 100644
index d5e07dcede..0000000000
--- a/tests/test_emxccompiler.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""Tests for distutils.emxccompiler."""
-import unittest
-import sys
-import os
-import warnings
-
-from test.test_support import check_warnings, run_unittest
-from test.test_support import captured_stdout
-
-from distutils.emxccompiler import get_versions
-from distutils.util import get_compiler_versions
-from distutils.tests import support
-
-class EmxCCompilerTestCase(support.TempdirManager,
-                           unittest.TestCase):
-
-    def test_get_version_deprecated(self):
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            # make sure get_compiler_versions and get_versions
-            # returns the same gcc
-            gcc, ld, dllwrap = get_compiler_versions()
-            emx_gcc, emx_ld = get_versions()
-            self.assertEquals(gcc, emx_gcc)
-
-            # make sure using get_version() generated a warning
-            self.assertEquals(len(w.warnings), 1)
-
-def test_suite():
-    return unittest.makeSuite(EmxCCompilerTestCase)
-
-if __name__ == '__main__':
-    run_unittest(test_suite())
diff --git a/tests/test_extension.py b/tests/test_extension.py
deleted file mode 100755
index 0b5dfb826f..0000000000
--- a/tests/test_extension.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""Tests for distutils.extension."""
-import os
-import sys
-import unittest
-import warnings
-
-from test.test_support import check_warnings
-from distutils.extension import read_setup_file, Extension
-from distutils.tests.support import capture_warnings
-
-class ExtensionTestCase(unittest.TestCase):
-
-    @capture_warnings
-    def test_read_setup_file(self):
-        # trying to read a Setup file
-        # (sample extracted from the PyGame project)
-        setup = os.path.join(os.path.dirname(__file__), 'Setup.sample')
-
-        exts = read_setup_file(setup)
-        names = [ext.name for ext in exts]
-        names.sort()
-
-        # here are the extensions read_setup_file should have created
-        # out of the file
-        wanted = ['_arraysurfarray', '_camera', '_numericsndarray',
-                  '_numericsurfarray', 'base', 'bufferproxy', 'cdrom',
-                  'color', 'constants', 'display', 'draw', 'event',
-                  'fastevent', 'font', 'gfxdraw', 'image', 'imageext',
-                  'joystick', 'key', 'mask', 'mixer', 'mixer_music',
-                  'mouse', 'movie', 'overlay', 'pixelarray', 'pypm',
-                  'rect', 'rwobject', 'scrap', 'surface', 'surflock',
-                  'time', 'transform']
-
-        self.assertEquals(names, wanted)
-
-    @unittest.skipIf(sys.flags.optimize >= 2,
-                     "Assertions are omitted with -O2 and above")
-    def test_extension_init_assertions(self):
-        # The first argument, which is the name, must be a string.
-        self.assertRaises(AssertionError, Extension, 1, [])
-
-        # the second argument, which is the list of files, must
-        # be a list of strings
-        self.assertRaises(AssertionError, Extension, 'name', 'file')
-        self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
-
-    def test_extension_init(self):
-        ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
-
-
-        ext = Extension('name', ['file1', 'file2'])
-        self.assertEquals(ext.sources, ['file1', 'file2'])
-
-        # others arguments have defaults
-        for attr in ('include_dirs', 'define_macros', 'undef_macros',
-                     'library_dirs', 'libraries', 'runtime_library_dirs',
-                     'extra_objects', 'extra_compile_args', 'extra_link_args',
-                     'export_symbols', 'swig_opts', 'depends'):
-            self.assertEquals(getattr(ext, attr), [])
-
-        self.assertEquals(ext.language, None)
-        self.assertEquals(ext.optional, None)
-
-        # if there are unknown keyword options, warn about them
-        with check_warnings() as w:
-            warnings.simplefilter('always')
-            ext = Extension('name', ['file1', 'file2'], chic=True)
-
-        self.assertEquals(len(w.warnings), 1)
-        self.assertEquals(str(w.warnings[0].message),
-                          "Unknown Extension options: 'chic'")
-
-def test_suite():
-    return unittest.makeSuite(ExtensionTestCase)
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_install.py b/tests/test_install.py
index 8e3e942f02..c834b91b38 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,27 +1,15 @@
 """Tests for distutils.command.install."""
 
 import os
-import os.path
-import sys
 import unittest
-import site
-import sysconfig
-from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES,
-                       get_config_var, get_path)
-
-from test.test_support import captured_stdout
 
 from distutils.command.install import install
-from distutils.command import install as install_module
 from distutils.core import Distribution
-from distutils.errors import DistutilsOptionError
 
 from distutils.tests import support
 
-class InstallTestCase(support.TempdirManager,
-                      support.EnvironGuard,
-                      support.LoggingSilencer,
-                      unittest.TestCase):
+
+class InstallTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_home_installation_scheme(self):
         # This ensure two things:
@@ -38,23 +26,9 @@ def test_home_installation_scheme(self):
             build_lib=os.path.join(builddir, "lib"),
             )
 
-
-
-        posix_prefix = _INSTALL_SCHEMES['posix_prefix']
-        old_posix_prefix = posix_prefix['platinclude']
-        posix_prefix['platinclude'] = \
-                '{platbase}/include/python{py_version_short}'
-
-        posix_home = _INSTALL_SCHEMES['posix_home']
-        old_posix_home = posix_home['platinclude']
-        posix_home['platinclude'] = '{base}/include/python'
-        try:
-            cmd = install(dist)
-            cmd.home = destination
-            cmd.ensure_finalized()
-        finally:
-            posix_home['platinclude'] = old_posix_home
-            posix_prefix['platinclude'] = old_posix_prefix
+        cmd = install(dist)
+        cmd.home = destination
+        cmd.ensure_finalized()
 
         self.assertEqual(cmd.install_base, destination)
         self.assertEqual(cmd.install_platbase, destination)
@@ -73,143 +47,6 @@ def check_path(got, expected):
         check_path(cmd.install_scripts, os.path.join(destination, "bin"))
         check_path(cmd.install_data, destination)
 
-    def test_user_site(self):
-        # site.USER_SITE was introduced in 2.6
-        if sys.version < '2.6':
-            return
-
-        # preparing the environement for the test
-        self.old_user_base = get_config_var('userbase')
-        self.old_user_site = get_path('purelib', '%s_user' % os.name)
-        self.tmpdir = self.mkdtemp()
-        self.user_base = os.path.join(self.tmpdir, 'B')
-        self.user_site = os.path.join(self.tmpdir, 'S')
-        _CONFIG_VARS['userbase'] = self.user_base
-        scheme = _INSTALL_SCHEMES['%s_user' % os.name]
-        scheme['purelib'] = self.user_site
-
-        def _expanduser(path):
-            if path[0] == '~':
-                path = os.path.normpath(self.tmpdir) + path[1:]
-            return path
-        self.old_expand = os.path.expanduser
-        os.path.expanduser = _expanduser
-
-        try:
-            # this is the actual test
-            self._test_user_site()
-        finally:
-            _CONFIG_VARS['userbase'] = self.old_user_base
-            scheme['purelib'] = self.old_user_site
-            os.path.expanduser = self.old_expand
-
-    def _test_user_site(self):
-        schemes = get_scheme_names()
-        for key in ('nt_user', 'posix_user', 'os2_home'):
-            self.assertTrue(key in schemes)
-
-        dist = Distribution({'name': 'xx'})
-        cmd = install(dist)
-        # making sure the user option is there
-        options = [name for name, short, lable in
-                   cmd.user_options]
-        self.assertTrue('user' in options)
-
-        # setting a value
-        cmd.user = 1
-
-        # user base and site shouldn't be created yet
-        self.assertTrue(not os.path.exists(self.user_base))
-        self.assertTrue(not os.path.exists(self.user_site))
-
-        # let's run finalize
-        cmd.ensure_finalized()
-
-        # now they should
-        self.assertTrue(os.path.exists(self.user_base))
-        self.assertTrue(os.path.exists(self.user_site))
-
-        self.assertTrue('userbase' in cmd.config_vars)
-        self.assertTrue('usersite' in cmd.config_vars)
-
-    def test_handle_extra_path(self):
-        dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
-        cmd = install(dist)
-
-        # two elements
-        cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
-        self.assertEquals(cmd.extra_dirs, 'dirs')
-        self.assertEquals(cmd.path_file, 'path')
-
-        # one element
-        cmd.extra_path = ['path']
-        cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path'])
-        self.assertEquals(cmd.extra_dirs, 'path')
-        self.assertEquals(cmd.path_file, 'path')
-
-        # none
-        dist.extra_path = cmd.extra_path = None
-        cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, None)
-        self.assertEquals(cmd.extra_dirs, '')
-        self.assertEquals(cmd.path_file, None)
-
-        # three elements (no way !)
-        cmd.extra_path = 'path,dirs,again'
-        self.assertRaises(DistutilsOptionError, cmd.handle_extra_path)
-
-    def test_finalize_options(self):
-        dist = Distribution({'name': 'xx'})
-        cmd = install(dist)
-
-        # must supply either prefix/exec-prefix/home or
-        # install-base/install-platbase -- not both
-        cmd.prefix = 'prefix'
-        cmd.install_base = 'base'
-        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
-
-        # must supply either home or prefix/exec-prefix -- not both
-        cmd.install_base = None
-        cmd.home = 'home'
-        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
-
-        # can't combine user with with prefix/exec_prefix/home or
-        # install_(plat)base
-        cmd.prefix = None
-        cmd.user = 'user'
-        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
-
-    def test_record(self):
-
-        install_dir = self.mkdtemp()
-        pkgdir, dist = self.create_dist()
-
-        dist = Distribution()
-        cmd = install(dist)
-        dist.command_obj['install'] = cmd
-        cmd.root = install_dir
-        cmd.record = os.path.join(pkgdir, 'RECORD')
-        cmd.ensure_finalized()
-
-        cmd.run()
-
-        # let's check the RECORD file was created with one
-        # line (the egg info file)
-        with open(cmd.record) as f:
-            self.assertEquals(len(f.readlines()), 1)
-
-    def _test_debug_mode(self):
-        # this covers the code called when DEBUG is set
-        old_logs_len = len(self.logs)
-        install_module.DEBUG = True
-        try:
-            with captured_stdout() as stdout:
-                self.test_record()
-        finally:
-            install_module.DEBUG = False
-        self.assertTrue(len(self.logs) > old_logs_len)
 
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 6976dd55f8..3f233e2823 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,8 +1,8 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
-import sysconfig
 
+from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
 
 class UnixCCompilerTestCase(unittest.TestCase):
@@ -70,7 +70,7 @@ def gcv(v):
             elif v == 'GNULD':
                 return 'yes'
         sysconfig.get_config_var = gcv
-        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
 
         # GCC non-GNULD
         sys.platform = 'bar'
@@ -91,7 +91,7 @@ def gcv(v):
             elif v == 'GNULD':
                 return 'yes'
         sysconfig.get_config_var = gcv
-        self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
+        self.assertEqual(self.cc.rpath_foo(), '-Wl,-R/foo')
 
 
         # non-GCC GNULD
@@ -119,7 +119,7 @@ def gcv(v):
         def gcv(v):
             return 'xxx'
         sysconfig.get_config_var = gcv
-        self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
+        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
 
 
 def test_suite():
diff --git a/tests/test_util.py b/tests/test_util.py
index 348b42be03..981ad000da 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,267 +1,11 @@
 """Tests for distutils.util."""
-import os
 import sys
 import unittest
-from copy import copy
-from StringIO import StringIO
-import subprocess
 
-from sysconfig import get_config_vars, get_platform
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
-from distutils.util import (convert_path, change_root,
-                            check_environ, split_quoted, strtobool,
-                            rfc822_escape, get_compiler_versions,
-                            _find_exe_version, _MAC_OS_X_LD_VERSION,
-                            byte_compile)
-from distutils import util
-from distutils.tests import support
-from distutils.version import LooseVersion
+from distutils.util import byte_compile
 
-class FakePopen(object):
-    test_class = None
-    def __init__(self, cmd, shell, stdout, stderr):
-        self.cmd = cmd.split()[0]
-        exes = self.test_class._exes
-        if self.cmd not in exes:
-            # we don't want to call the system, returning an empty
-            # output so it doesn't match
-            self.stdout = StringIO()
-            self.stderr = StringIO()
-        else:
-            self.stdout = StringIO(exes[self.cmd])
-            self.stderr = StringIO()
-
-class UtilTestCase(support.EnvironGuard, unittest.TestCase):
-
-    def setUp(self):
-        super(UtilTestCase, self).setUp()
-        # saving the environment
-        self.name = os.name
-        self.platform = sys.platform
-        self.version = sys.version
-        self.sep = os.sep
-        self.join = os.path.join
-        self.isabs = os.path.isabs
-        self.splitdrive = os.path.splitdrive
-        #self._config_vars = copy(sysconfig._config_vars)
-
-        # patching os.uname
-        if hasattr(os, 'uname'):
-            self.uname = os.uname
-            self._uname = os.uname()
-        else:
-            self.uname = None
-            self._uname = None
-        os.uname = self._get_uname
-
-        # patching POpen
-        self.old_find_executable = util.find_executable
-        util.find_executable = self._find_executable
-        self._exes = {}
-        self.old_popen = subprocess.Popen
-        self.old_stdout  = sys.stdout
-        self.old_stderr = sys.stderr
-        FakePopen.test_class = self
-        subprocess.Popen = FakePopen
-
-    def tearDown(self):
-        # getting back the environment
-        os.name = self.name
-        sys.platform = self.platform
-        sys.version = self.version
-        os.sep = self.sep
-        os.path.join = self.join
-        os.path.isabs = self.isabs
-        os.path.splitdrive = self.splitdrive
-        if self.uname is not None:
-            os.uname = self.uname
-        else:
-            del os.uname
-        #sysconfig._config_vars = copy(self._config_vars)
-        util.find_executable = self.old_find_executable
-        subprocess.Popen = self.old_popen
-        sys.old_stdout  = self.old_stdout
-        sys.old_stderr = self.old_stderr
-        super(UtilTestCase, self).tearDown()
-
-    def _set_uname(self, uname):
-        self._uname = uname
-
-    def _get_uname(self):
-        return self._uname
-
-    def test_get_platform(self):
-        platform = util.get_platform()
-        self.assertEquals(platform, get_platform())
-        util.set_platform('MyOwnPlatform')
-        self.assertEquals('MyOwnPlatform', util.get_platform())
-        util.set_platform(platform)
-
-    def test_convert_path(self):
-        # linux/mac
-        os.sep = '/'
-        def _join(path):
-            return '/'.join(path)
-        os.path.join = _join
-
-        self.assertEquals(convert_path('/home/to/my/stuff'),
-                          '/home/to/my/stuff')
-
-        # win
-        os.sep = '\\'
-        def _join(*path):
-            return '\\'.join(path)
-        os.path.join = _join
-
-        self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
-        self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
-
-        self.assertEquals(convert_path('home/to/my/stuff'),
-                          'home\\to\\my\\stuff')
-        self.assertEquals(convert_path('.'),
-                          os.curdir)
-
-    def test_change_root(self):
-        # linux/mac
-        os.name = 'posix'
-        def _isabs(path):
-            return path[0] == '/'
-        os.path.isabs = _isabs
-        def _join(*path):
-            return '/'.join(path)
-        os.path.join = _join
-
-        self.assertEquals(change_root('/root', '/old/its/here'),
-                          '/root/old/its/here')
-        self.assertEquals(change_root('/root', 'its/here'),
-                          '/root/its/here')
-
-        # windows
-        os.name = 'nt'
-        def _isabs(path):
-            return path.startswith('c:\\')
-        os.path.isabs = _isabs
-        def _splitdrive(path):
-            if path.startswith('c:'):
-                return ('', path.replace('c:', ''))
-            return ('', path)
-        os.path.splitdrive = _splitdrive
-        def _join(*path):
-            return '\\'.join(path)
-        os.path.join = _join
-
-        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
-                          'c:\\root\\old\\its\\here')
-        self.assertEquals(change_root('c:\\root', 'its\\here'),
-                          'c:\\root\\its\\here')
-
-        # BugsBunny os (it's a great os)
-        os.name = 'BugsBunny'
-        self.assertRaises(DistutilsPlatformError,
-                          change_root, 'c:\\root', 'its\\here')
-
-        # XXX platforms to be covered: os2, mac
-
-    def test_check_environ(self):
-        util._environ_checked = 0
-        if 'HOME' in os.environ:
-            del os.environ['HOME']
-
-        # posix without HOME
-        if os.name == 'posix':  # this test won't run on windows
-            check_environ()
-            import pwd
-            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
-        else:
-            check_environ()
-
-        self.assertEquals(os.environ['PLAT'], get_platform())
-        self.assertEquals(util._environ_checked, 1)
-
-    def test_split_quoted(self):
-        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
-                          ['one', 'two', 'three', 'four'])
-
-    def test_strtobool(self):
-        yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
-        no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N')
-
-        for y in yes:
-            self.assertTrue(strtobool(y))
-
-        for n in no:
-            self.assertTrue(not strtobool(n))
-
-    def test_rfc822_escape(self):
-        header = 'I am a\npoor\nlonesome\nheader\n'
-        res = rfc822_escape(header)
-        wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
-                  'header%(8s)s') % {'8s': '\n'+8*' '}
-        self.assertEquals(res, wanted)
-
-    def test_find_exe_version(self):
-        # the ld version scheme under MAC OS is:
-        #   ^@(#)PROGRAM:ld  PROJECT:ld64-VERSION
-        #
-        # where VERSION is a 2-digit number for major
-        # revisions. For instance under Leopard, it's
-        # currently 77
-        #
-        # Dots are used when branching is done.
-        #
-        # The SnowLeopard ld64 is currently 95.2.12
-
-        for output, version in (('@(#)PROGRAM:ld  PROJECT:ld64-77', '77'),
-                                ('@(#)PROGRAM:ld  PROJECT:ld64-95.2.12',
-                                 '95.2.12')):
-            result = _MAC_OS_X_LD_VERSION.search(output)
-            self.assertEquals(result.group(1), version)
-
-    def _find_executable(self, name):
-        if name in self._exes:
-            return name
-        return None
-
-    def test_get_compiler_versions(self):
-        # get_versions calls distutils.spawn.find_executable on
-        # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_compiler_versions(), (None, None, None))
-
-        # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = 'gcc (GCC) 3.4.5 (mingw special)\nFSF'
-        res = get_compiler_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
-
-        # and let's see what happens when the version
-        # doesn't match the regular expression
-        # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = 'very strange output'
-        res = get_compiler_versions()
-        self.assertEquals(res[0], None)
-
-        # same thing for ld
-        if sys.platform != 'darwin':
-            self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
-            res = get_compiler_versions()
-            self.assertEquals(str(res[1]), '2.17.50')
-            self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
-            res = get_compiler_versions()
-            self.assertEquals(res[1], None)
-        else:
-            self._exes['ld'] = 'GNU ld version 2.17.50 20060824'
-            res = get_compiler_versions()
-            self.assertEquals(res[1], None)
-            self._exes['ld'] = '@(#)PROGRAM:ld  PROJECT:ld64-77'
-            res = get_compiler_versions()
-            self.assertEquals(str(res[1]), '77')
-
-        # and dllwrap
-        self._exes['dllwrap'] = 'GNU dllwrap 2.17.50 20060824\nFSF'
-        res = get_compiler_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = 'Cheese Wrap'
-        res = get_compiler_versions()
-        self.assertEquals(res[2], None)
+class UtilTestCase(unittest.TestCase):
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile raise a DistutilsError
diff --git a/unixccompiler.py b/unixccompiler.py
index 8fe1a6a13a..783d4dca84 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -18,6 +18,7 @@
 import os, sys
 from types import StringType, NoneType
 
+from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -25,7 +26,6 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
-
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -75,7 +75,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
 
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
-        # see also the sysconfig
+        # see also distutils.sysconfig
         compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
@@ -276,16 +276,13 @@ def runtime_library_dir_option(self, dir):
         # Linkers on different platforms need different options to
         # specify that directories need to be added to the list of
         # directories searched for dependencies when a dynamic library
-        # is sought.  GCC on GNU systems (Linux, FreeBSD, ...) has to
-        # be told to pass the -R option through to the linker, whereas
-        # other compilers and gcc on other systems just know this.
+        # is sought.  GCC has to be told to pass the -R option through
+        # to the linker, whereas other compilers just know this.
         # Other compilers may need something slightly different.  At
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
         # we use this hack.
-        _sysconfig = __import__('sysconfig')
-
-        compiler = os.path.basename(_sysconfig.get_config_var("CC"))
+        compiler = os.path.basename(sysconfig.get_config_var("CC"))
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
@@ -296,22 +293,8 @@ def runtime_library_dir_option(self, dir):
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
         elif self._is_gcc(compiler):
-            # gcc on non-GNU systems does not need -Wl, but can
-            # use it anyway.  Since distutils has always passed in
-            # -Wl whenever gcc was used in the past it is probably
-            # safest to keep doing so.
-            if _sysconfig.get_config_var("GNULD") == "yes":
-                # GNU ld needs an extra option to get a RUNPATH
-                # instead of just an RPATH.
-                return "-Wl,--enable-new-dtags,-R" + dir
-            else:
-                return "-Wl,-R" + dir
-        elif sys.platform[:3] == "aix":
-            return "-blibpath:" + dir
+            return "-Wl,-R" + dir
         else:
-            # No idea how --enable-new-dtags would be passed on to
-            # ld if this system was using GNU ld.  Don't know if a
-            # system like this even exists.
             return "-R" + dir
 
     def library_option(self, lib):
diff --git a/util.py b/util.py
index fbd3a67243..36ac721386 100644
--- a/util.py
+++ b/util.py
@@ -7,40 +7,184 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
-
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
-from distutils.spawn import spawn, find_executable
+from distutils.spawn import spawn
 from distutils import log
-from distutils.version import LooseVersion
 from distutils.errors import DistutilsByteCompileError
 
-_sysconfig = __import__('sysconfig')
-_PLATFORM = None
+def get_platform ():
+    """Return a string that identifies the current platform.  This is used
+    mainly to distinguish platform-specific build directories and
+    platform-specific built distributions.  Typically includes the OS name
+    and version and the architecture (as supplied by 'os.uname()'),
+    although the exact information included depends on the OS; eg. for IRIX
+    the architecture isn't particularly important (IRIX only runs on SGI
+    hardware), but for Linux the kernel version isn't particularly
+    important.
+
+    Examples of returned values:
+       linux-i586
+       linux-alpha (?)
+       solaris-2.6-sun4u
+       irix-5.3
+       irix64-6.2
+
+    Windows will return one of:
+       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
+       win-ia64 (64bit Windows on Itanium)
+       win32 (all others - specifically, sys.platform is returned)
+
+    For other non-POSIX platforms, currently just returns 'sys.platform'.
+    """
+    if os.name == 'nt':
+        # sniff sys.version for architecture.
+        prefix = " bit ("
+        i = string.find(sys.version, prefix)
+        if i == -1:
+            return sys.platform
+        j = string.find(sys.version, ")", i)
+        look = sys.version[i+len(prefix):j].lower()
+        if look=='amd64':
+            return 'win-amd64'
+        if look=='itanium':
+            return 'win-ia64'
+        return sys.platform
+
+    if os.name != "posix" or not hasattr(os, 'uname'):
+        # XXX what about the architecture? NT is Intel or Alpha,
+        # Mac OS is M68k or PPC, etc.
+        return sys.platform
+
+    # Try to distinguish various flavours of Unix
+
+    (osname, host, release, version, machine) = os.uname()
+
+    # Convert the OS name to lowercase, remove '/' characters
+    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
+    osname = string.lower(osname)
+    osname = string.replace(osname, '/', '')
+    machine = string.replace(machine, ' ', '_')
+    machine = string.replace(machine, '/', '-')
+
+    if osname[:5] == "linux":
+        # At least on Linux/Intel, 'machine' is the processor --
+        # i386, etc.
+        # XXX what about Alpha, SPARC, etc?
+        return  "%s-%s" % (osname, machine)
+    elif osname[:5] == "sunos":
+        if release[0] >= "5":           # SunOS 5 == Solaris 2
+            osname = "solaris"
+            release = "%d.%s" % (int(release[0]) - 3, release[2:])
+        # fall through to standard osname-release-machine representation
+    elif osname[:4] == "irix":              # could be "irix64"!
+        return "%s-%s" % (osname, release)
+    elif osname[:3] == "aix":
+        return "%s-%s.%s" % (osname, version, release)
+    elif osname[:6] == "cygwin":
+        osname = "cygwin"
+        rel_re = re.compile (r'[\d.]+')
+        m = rel_re.match(release)
+        if m:
+            release = m.group()
+    elif osname[:6] == "darwin":
+        #
+        # For our purposes, we'll assume that the system version from
+        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
+        # to. This makes the compatibility story a bit more sane because the
+        # machine is going to compile and link as if it were
+        # MACOSX_DEPLOYMENT_TARGET.
+        from distutils.sysconfig import get_config_vars
+        cfgvars = get_config_vars()
+
+        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
+        if not macver:
+            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+
+        if 1:
+            # Always calculate the release of the running machine,
+            # needed to determine if we can build fat binaries or not.
+
+            macrelease = macver
+            # Get the system version. Reading this plist is a documented
+            # way to get the system version (see the documentation for
+            # the Gestalt Manager)
+            try:
+                f = open('/System/Library/CoreServices/SystemVersion.plist')
+            except IOError:
+                # We're on a plain darwin box, fall back to the default
+                # behaviour.
+                pass
+            else:
+                m = re.search(
+                        r'<key>ProductUserVisibleVersion</key>\s*' +
+                        r'<string>(.*?)</string>', f.read())
+                f.close()
+                if m is not None:
+                    macrelease = '.'.join(m.group(1).split('.')[:2])
+                # else: fall back to the default behaviour
+
+        if not macver:
+            macver = macrelease
+
+        if macver:
+            from distutils.sysconfig import get_config_vars
+            release = macver
+            osname = "macosx"
+
+            if (macrelease + '.') >= '10.4.' and \
+                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
+                # The universal build will build fat binaries, but not on
+                # systems before 10.4
+                #
+                # Try to detect 4-way universal builds, those have machine-type
+                # 'universal' instead of 'fat'.
+
+                machine = 'fat'
+                cflags = get_config_vars().get('CFLAGS')
+
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs.sort()
+                archs = tuple(archs)
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
 
-def get_platform():
-    """Return a string that identifies the current platform.
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxint >= 2**32:
+                    machine = 'x86_64'
 
-    By default, will return the value returned by sysconfig.get_platform(),
-    but it can be changed by calling set_platform().
-    """
-    global _PLATFORM
-    if _PLATFORM is None:
-        _PLATFORM = _sysconfig.get_platform()
-    return _PLATFORM
+            elif machine in ('PowerPC', 'Power_Macintosh'):
+                # Pick a sane name for the PPC architecture.
+                machine = 'ppc'
 
-def set_platform(identifier):
-    """Sets the platform string identifier returned by get_platform().
+                # See 'i386' case
+                if sys.maxint >= 2**32:
+                    machine = 'ppc64'
 
-    Note that this change doesn't impact the value returned by
-    sysconfig.get_platform() and is local to Distutils
-    """
-    global _PLATFORM
-    _PLATFORM = identifier
+    return "%s-%s-%s" % (osname, release, machine)
+
+# get_platform ()
 
-def convert_path(pathname):
-    """Return 'pathname' as a name that will work on the native filesystem.
 
+def convert_path (pathname):
+    """Return 'pathname' as a name that will work on the native filesystem,
     i.e. split it on '/' and put it back together again using the current
     directory separator.  Needed because filenames in the setup script are
     always supplied in Unix style, and have to be converted to the local
@@ -53,23 +197,23 @@ def convert_path(pathname):
     if not pathname:
         return pathname
     if pathname[0] == '/':
-        raise ValueError("path '%s' cannot be absolute" % pathname)
+        raise ValueError, "path '%s' cannot be absolute" % pathname
     if pathname[-1] == '/':
-        raise ValueError("path '%s' cannot end with '/'" % pathname)
+        raise ValueError, "path '%s' cannot end with '/'" % pathname
 
-    paths = pathname.split('/')
+    paths = string.split(pathname, '/')
     while '.' in paths:
         paths.remove('.')
     if not paths:
         return os.curdir
-    return os.path.join(*paths)
+    return apply(os.path.join, paths)
 
+# convert_path ()
 
-def change_root(new_root, pathname):
-    """Return 'pathname' with 'new_root' prepended.
 
-    If 'pathname' is relative, this is equivalent to
-    "os.path.join(new_root,pathname)".
+def change_root (new_root, pathname):
+    """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
+    relative, this is equivalent to "os.path.join(new_root,pathname)".
     Otherwise, it requires making 'pathname' relative and then joining the
     two, which is tricky on DOS/Windows and Mac OS.
     """
@@ -96,20 +240,19 @@ def change_root(new_root, pathname):
             return os.path.join(new_root, pathname)
         else:
             # Chop off volume name from start of path
-            elements = pathname.split(":", 1)
+            elements = string.split(pathname, ":", 1)
             pathname = ":" + elements[1]
             return os.path.join(new_root, pathname)
 
     else:
-        raise DistutilsPlatformError("nothing known about "
-                                     "platform '%s'" % os.name)
+        raise DistutilsPlatformError, \
+              "nothing known about platform '%s'" % os.name
 
-_environ_checked = 0
-
-def check_environ():
-    """Ensure that 'os.environ' has all the environment variables needed.
 
-    We guarantee that users can use in config files, command-line options,
+_environ_checked = 0
+def check_environ ():
+    """Ensure that 'os.environ' has all the environment variables we
+    guarantee that users can use in config files, command-line options,
     etc.  Currently this includes:
       HOME - user's home directory (Unix only)
       PLAT - description of the current platform, including hardware
@@ -124,14 +267,14 @@ def check_environ():
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
     if 'PLAT' not in os.environ:
-        os.environ['PLAT'] = _sysconfig.get_platform()
+        os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
 
-def subst_vars(s, local_vars):
-    """Perform shell/Perl-style variable substitution on 'string'.
 
-    Every occurrence of '$' followed by a name is considered a variable, and
+def subst_vars (s, local_vars):
+    """Perform shell/Perl-style variable substitution on 'string'.  Every
+    occurrence of '$' followed by a name is considered a variable, and
     variable is substituted by the value found in the 'local_vars'
     dictionary, or in 'os.environ' if it's not in 'local_vars'.
     'os.environ' is first checked/augmented to guarantee that it contains
@@ -149,13 +292,14 @@ def _subst (match, local_vars=local_vars):
     try:
         return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, s)
     except KeyError, var:
-        raise ValueError("invalid variable '$%s'" % var)
+        raise ValueError, "invalid variable '$%s'" % var
+
+# subst_vars ()
 
-def grok_environment_error(exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError.
 
-    This will generate an IOError or an OSError exception object.
-    Handles Python 1.5.1 and 1.5.2 styles, and
+def grok_environment_error (exc, prefix="error: "):
+    """Generate a useful error message from an EnvironmentError (IOError or
+    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
     does what it can to deal with exception objects that don't have a
     filename (which happens when the error is due to a two-file operation,
     such as 'rename()' or 'link()'.  Returns the error message as a string
@@ -174,20 +318,18 @@ def grok_environment_error(exc, prefix="error: "):
 
     return error
 
+
 # Needed by 'split_quoted()'
 _wordchars_re = _squote_re = _dquote_re = None
-
 def _init_regex():
     global _wordchars_re, _squote_re, _dquote_re
     _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
     _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
     _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
-def split_quoted(s):
+def split_quoted (s):
     """Split a string up according to Unix shell-like rules for quotes and
-    backslashes.
-
-    In short: words are delimited by spaces, as long as those
+    backslashes.  In short: words are delimited by spaces, as long as those
     spaces are not escaped by a backslash, or inside a quoted string.
     Single and double quotes are equivalent, and the quote characters can
     be backslash-escaped.  The backslash is stripped from any two-character
@@ -195,12 +337,13 @@ def split_quoted(s):
     characters are stripped from any quoted string.  Returns a list of
     words.
     """
+
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
     if _wordchars_re is None: _init_regex()
 
-    s = s.strip()
+    s = string.strip(s)
     words = []
     pos = 0
 
@@ -213,7 +356,7 @@ def split_quoted(s):
 
         if s[end] in string.whitespace: # unescaped, unquoted whitespace: now
             words.append(s[:end])       # we definitely have a word delimiter
-            s = s[end:].lstrip()
+            s = string.lstrip(s[end:])
             pos = 0
 
         elif s[end] == '\\':            # preserve whatever is being escaped;
@@ -227,11 +370,12 @@ def split_quoted(s):
             elif s[end] == '"':         # slurp doubly-quoted string
                 m = _dquote_re.match(s, end)
             else:
-                raise RuntimeError("this can't happen "
-                                   "(bad char '%c')" % s[end])
+                raise RuntimeError, \
+                      "this can't happen (bad char '%c')" % s[end]
 
             if m is None:
-                raise ValueError("bad string (mismatched %s quotes?)" % s[end])
+                raise ValueError, \
+                      "bad string (mismatched %s quotes?)" % s[end]
 
             (beg, end) = m.span()
             s = s[:beg] + s[beg+1:end-1] + s[end:]
@@ -243,12 +387,13 @@ def split_quoted(s):
 
     return words
 
+# split_quoted ()
 
-def execute(func, args, msg=None, verbose=0, dry_run=0):
-    """Perform some action that affects the outside world.
 
-    eg. by writing to the filesystem).  Such actions are special because
-    they are disabled by the 'dry_run' flag.  This method takes care of all
+def execute (func, args, msg=None, verbose=0, dry_run=0):
+    """Perform some action that affects the outside world (eg.  by
+    writing to the filesystem).  Such actions are special because they
+    are disabled by the 'dry_run' flag.  This method takes care of all
     that bureaucracy for you; all you have to do is supply the
     function to call and an argument tuple for it (to embody the
     "external action" being performed), and an optional message to
@@ -261,17 +406,17 @@ def execute(func, args, msg=None, verbose=0, dry_run=0):
 
     log.info(msg)
     if not dry_run:
-        func(*args)
+        apply(func, args)
 
 
-def strtobool(val):
+def strtobool (val):
     """Convert a string representation of truth to true (1) or false (0).
 
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
     are 'n', 'no', 'f', 'false', 'off', and '0'.  Raises ValueError if
     'val' is anything else.
     """
-    val = val.lower()
+    val = string.lower(val)
     if val in ('y', 'yes', 't', 'true', 'on', '1'):
         return 1
     elif val in ('n', 'no', 'f', 'false', 'off', '0'):
@@ -280,13 +425,15 @@ def strtobool(val):
         raise ValueError, "invalid truth value %r" % (val,)
 
 
-def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
-                  verbose=1, dry_run=0, direct=None):
+def byte_compile (py_files,
+                  optimize=0, force=0,
+                  prefix=None, base_dir=None,
+                  verbose=1, dry_run=0,
+                  direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.
-
-    'py_files' is a list of files to compile; any files that don't end in
-    ".py" are silently skipped. 'optimize' must be one of the following:
+    or .pyo files in the same directory.  'py_files' is a list of files
+    to compile; any files that don't end in ".py" are silently skipped.
+    'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
@@ -363,7 +510,7 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
             #if prefix:
             #    prefix = os.path.abspath(prefix)
 
-            script.write(",\n".join(map(repr, py_files)) + "]\n")
+            script.write(string.join(map(repr, py_files), ",\n") + "]\n")
             script.write("""
 byte_compile(files, optimize=%r, force=%r,
              prefix=%r, base_dir=%r,
@@ -402,8 +549,9 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:
-                    raise ValueError("invalid prefix: filename %r doesn't "
-                                     "start with %r" % (file, prefix))
+                    raise ValueError, \
+                          ("invalid prefix: filename %r doesn't start with %r"
+                           % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
                 dfile = os.path.join(base_dir, dfile)
@@ -418,61 +566,12 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
                     log.debug("skipping byte-compilation of %s to %s",
                               file, cfile_base)
 
+# byte_compile ()
 
-def rfc822_escape(header):
+def rfc822_escape (header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
-    lines = header.split('\n')
-    sep = '\n' + 8 * ' '
-    return sep.join(lines)
-
-_RE_VERSION = re.compile('(\d+\.\d+(\.\d+)*)')
-_MAC_OS_X_LD_VERSION = re.compile('^@\(#\)PROGRAM:ld  PROJECT:ld64-((\d+)(\.\d+)*)')
-
-def _find_ld_version():
-    """Finds the ld version. The version scheme differs under Mac OSX."""
-    if sys.platform == 'darwin':
-        return _find_exe_version('ld -v', _MAC_OS_X_LD_VERSION)
-    else:
-        return _find_exe_version('ld -v')
-
-def _find_exe_version(cmd, pattern=_RE_VERSION):
-    """Find the version of an executable by running `cmd` in the shell.
-
-    `pattern` is a compiled regular expression. If not provided, default
-    to _RE_VERSION. If the command is not found, or the output does not
-    match the mattern, returns None.
-    """
-    from subprocess import Popen, PIPE
-    executable = cmd.split()[0]
-    if find_executable(executable) is None:
-        return None
-    pipe = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
-    try:
-        stdout, stderr = pipe.stdout.read(), pipe.stderr.read()
-    finally:
-        pipe.stdout.close()
-        pipe.stderr.close()
-    # some commands like ld under MacOS X, will give the
-    # output in the stderr, rather than stdout.
-    if stdout != '':
-        out_string = stdout
-    else:
-        out_string = stderr
-
-    result = pattern.search(out_string)
-    if result is None:
-        return None
-    return LooseVersion(result.group(1))
-
-def get_compiler_versions():
-    """Returns a tuple providing the versions of gcc, ld and dllwrap
-
-    For each command, if a command is not found, None is returned.
-    Otherwise a LooseVersion instance is returned.
-    """
-    gcc = _find_exe_version('gcc -dumpversion')
-    ld = _find_ld_version()
-    dllwrap = _find_exe_version('dllwrap --version')
-    return gcc, ld, dllwrap
+    lines = string.split(header, '\n')
+    header = string.join(lines, '\n' + 8*' ')
+    return header

From 17e4614fa2e3b907900dc2e4587a63c281db5425 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 5 Mar 2010 03:20:06 +0000
Subject: [PATCH 2879/8469] remove the svn:executable property from files that
 don't have shebang lines

---
 tests/test_clean.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tests/test_clean.py

diff --git a/tests/test_clean.py b/tests/test_clean.py
old mode 100755
new mode 100644

From a5dade0cc3debdff89c52fbbfc9d23c0a6d21062 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 5 Mar 2010 03:33:11 +0000
Subject: [PATCH 2880/8469] Merged revisions 78678,78680,78682 via svnmerge
 from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78678 | benjamin.peterson | 2010-03-04 21:07:59 -0600 (Thu, 04 Mar 2010) | 1 line

  set svn:eol-style
........
  r78680 | benjamin.peterson | 2010-03-04 21:15:07 -0600 (Thu, 04 Mar 2010) | 1 line

  set svn:eol-style on Lib files
........
  r78682 | benjamin.peterson | 2010-03-04 21:20:06 -0600 (Thu, 04 Mar 2010) | 1 line

  remove the svn:executable property from files that don't have shebang lines
........
---
 tests/test_clean.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tests/test_clean.py

diff --git a/tests/test_clean.py b/tests/test_clean.py
old mode 100755
new mode 100644

From 95ca0fbb62d6de3643c66af34ebfb842fabd0bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 01:04:14 +0000
Subject: [PATCH 2881/8469] copied back the build_ext tests from 2.6

---
 tests/test_build_ext.py | 198 +++++++++++++++++-----------------------
 1 file changed, 83 insertions(+), 115 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 0e3f33e437..a1c236aa15 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -3,17 +3,12 @@
 import tempfile
 import shutil
 from StringIO import StringIO
-import warnings
-from test.test_support import check_warnings
-from test.test_support import captured_stdout
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
-import sysconfig
+from distutils import sysconfig
 from distutils.tests import support
-from distutils.extension import Extension
-from distutils.errors import (UnknownFileError, DistutilsSetupError,
-                              CompileError)
+from distutils.errors import DistutilsSetupError
 
 import unittest
 from test import test_support
@@ -33,16 +28,10 @@ def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
-        self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path, sys.path[:]
+        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
+        self.sys_path = sys.path[:]
         sys.path.append(self.tmp_dir)
         shutil.copy(_get_source_filename(), self.tmp_dir)
-        if sys.version > "2.6":
-            import site
-            self.old_user_base = site.USER_BASE
-            site.USER_BASE = self.mkdtemp()
-            from distutils.command import build_ext
-            build_ext.USER_BASE = site.USER_BASE
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -76,27 +65,22 @@ def test_build_ext(self):
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):
-            self.assertTrue(hasattr(xx, attr))
+            self.assert_(hasattr(xx, attr))
 
         self.assertEquals(xx.foo(2, 5), 7)
         self.assertEquals(xx.foo(13,15), 28)
         self.assertEquals(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
         self.assertEquals(xx.__doc__, doc)
-        self.assertTrue(isinstance(xx.Null(), xx.Null))
-        self.assertTrue(isinstance(xx.Str(), xx.Str))
+        self.assert_(isinstance(xx.Null(), xx.Null))
+        self.assert_(isinstance(xx.Str(), xx.Str))
 
     def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
-        if sys.version > "2.6":
-            import site
-            site.USER_BASE = self.old_user_base
-            from distutils.command import build_ext
-            build_ext.USER_BASE = self.old_user_base
-
+        sys.path = self.sys_path
+        # XXX on Windows the test leaves a directory with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
         super(BuildExtTestCase, self).tearDown()
 
     def test_solaris_enable_shared(self):
@@ -105,83 +89,35 @@ def test_solaris_enable_shared(self):
         old = sys.platform
 
         sys.platform = 'sunos' # fooling finalize_options
-        from sysconfig import _CONFIG_VARS
-        old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED')
-        _CONFIG_VARS['Py_ENABLE_SHARED'] = 1
+        from distutils.sysconfig import  _config_vars
+        old_var = _config_vars.get('Py_ENABLE_SHARED')
+        _config_vars['Py_ENABLE_SHARED'] = 1
         try:
             cmd.ensure_finalized()
         finally:
             sys.platform = old
             if old_var is None:
-                del _CONFIG_VARS['Py_ENABLE_SHARED']
+                del _config_vars['Py_ENABLE_SHARED']
             else:
-                _CONFIG_VARS['Py_ENABLE_SHARED'] = old_var
+                _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assertTrue(len(cmd.library_dirs) > 0)
-
-    def test_user_site(self):
-        # site.USER_SITE was introduced in 2.6
-        if sys.version < '2.6':
-            return
-
-        import site
-        dist = Distribution({'name': 'xx'})
-        cmd = build_ext(dist)
-
-        # making sure the user option is there
-        options = [name for name, short, lable in
-                   cmd.user_options]
-        self.assertTrue('user' in options)
-
-        # setting a value
-        cmd.user = 1
-
-        # setting user based lib and include
-        lib = os.path.join(site.USER_BASE, 'lib')
-        incl = os.path.join(site.USER_BASE, 'include')
-        os.mkdir(lib)
-        os.mkdir(incl)
-
-        # let's run finalize
-        cmd.ensure_finalized()
-
-        # see if include_dirs and library_dirs
-        # were set
-        self.assertTrue(lib in cmd.library_dirs)
-        self.assertTrue(lib in cmd.rpath)
-        self.assertTrue(incl in cmd.include_dirs)
-
-    def test_optional_extension(self):
-
-        # this extension will fail, but let's ignore this failure
-        # with the optional argument.
-        modules = [Extension('foo', ['xxx'], optional=False)]
-        dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
-        cmd.ensure_finalized()
-        self.assertRaises((UnknownFileError, CompileError),
-                          cmd.run)  # should raise an error
-
-        modules = [Extension('foo', ['xxx'], optional=True)]
-        dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
-        cmd.ensure_finalized()
-        cmd.run()  # should pass
+        self.assert_(len(cmd.library_dirs) > 0)
 
     def test_finalize_options(self):
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        modules = [Extension('foo', ['xxx'], optional=False)]
+        modules = [Extension('foo', ['xxx'])]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.finalize_options()
 
-        py_include = sysconfig.get_path('include')
-        self.assertTrue(py_include in cmd.include_dirs)
+        from distutils import sysconfig
+        py_include = sysconfig.get_python_inc()
+        self.assert_(py_include in cmd.include_dirs)
 
-        plat_py_include = sysconfig.get_path('platinclude')
-        self.assertTrue(plat_py_include in cmd.include_dirs)
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+        self.assert_(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
@@ -195,7 +131,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assertTrue('my_lib_dir' in cmd.library_dirs)
+        self.assert_('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths
@@ -260,13 +196,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assertTrue(isinstance(ext, Extension))
+        self.assert_(isinstance(ext, Extension))
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
         self.assertEquals(ext.libraries, 'foo')
-        self.assertTrue(not hasattr(ext, 'some'))
+        self.assert_(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
@@ -279,7 +215,7 @@ def test_check_extensions_list(self):
         self.assertEquals(exts[0].define_macros, [('1', '2')])
 
     def test_get_source_files(self):
-        modules = [Extension('foo', ['xxx'], optional=False)]
+        modules = [Extension('foo', ['xxx'])]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
@@ -300,7 +236,7 @@ def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
         self.write_file(c_file, 'void initfoo(void) {};\n')
-        ext = Extension('foo', [c_file], optional=False)
+        ext = Extension('foo', [c_file])
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
@@ -324,16 +260,16 @@ def test_get_outputs(self):
             so_file = cmd.get_outputs()[0]
         finally:
             os.chdir(old_wd)
-        self.assertTrue(os.path.exists(so_file))
+        self.assert_(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
-
+        cmd.compiler = None
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
-        self.assertTrue(os.path.exists(so_file))
+        self.assert_(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
@@ -363,10 +299,6 @@ def test_get_outputs(self):
 
     def test_ext_fullpath(self):
         ext = sysconfig.get_config_vars()['SO']
-        # building lxml.etree inplace
-        #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
-        #etree_ext = Extension('lxml.etree', [etree_c])
-        #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
         dist = Distribution()
         cmd = build_ext(dist)
         cmd.inplace = 1
@@ -399,25 +331,61 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
-    def test_compiler_deprecation_warning(self):
-        dist = Distribution()
+    def test_build_ext_inplace(self):
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
         cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        ext = sysconfig.get_config_var("SO")
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+    def test_setuptools_compat(self):
+        from setuptools_build_ext import build_ext as setuptools_build_ext
+        from setuptools_extension import Extension
 
-        class MyCompiler(object):
-            def do_something(self):
-                pass
-
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            cmd.compiler = MyCompiler()
-            self.assertEquals(len(w.warnings), 1)
-            cmd.compile = 'unix'
-            self.assertEquals(len(w.warnings), 1)
-            cmd.compiler = MyCompiler()
-            cmd.compiler.do_something()
-            # two more warnings genereated by the get
-            # and the set
-            self.assertEquals(len(w.warnings), 3)
+        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+        etree_ext = Extension('lxml.etree', [etree_c])
+        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+        cmd = setuptools_build_ext(dist)
+        cmd.ensure_finalized()
+        cmd.inplace = 1
+        cmd.distribution.package_dir = {'': 'src'}
+        cmd.distribution.packages = ['lxml', 'lxml.html']
+        curdir = os.getcwd()
+        ext = sysconfig.get_config_var("SO")
+        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
+        path = cmd.get_ext_fullpath('lxml.etree')
+        self.assertEquals(wanted, path)
+
+    def test_build_ext_path_with_os_sep(self):
+        dist = Distribution({'name': 'UpdateManager'})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        ext = sysconfig.get_config_var("SO")
+        ext_name = os.path.join('UpdateManager', 'fdsend')
+        ext_path = cmd.get_ext_fullpath(ext_name)
+        wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
+        self.assertEquals(ext_path, wanted)
+
+    def test_build_ext_path_cross_platform(self):
+        if sys.platform != 'win32':
+            return
+        dist = Distribution({'name': 'UpdateManager'})
+        cmd = build_ext(dist)
+        cmd.ensure_finalized()
+        ext = sysconfig.get_config_var("SO")
+        # this needs to work even under win32
+        ext_name = 'UpdateManager/fdsend'
+        ext_path = cmd.get_ext_fullpath(ext_name)
+        wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
+        self.assertEquals(ext_path, wanted)
 
 def test_suite():
     src = _get_source_filename()

From 5ca1f667648aa5161dff9c0725fbd30edb336e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 01:18:27 +0000
Subject: [PATCH 2882/8469] provide a fallback for xxmodule.c in case the
 buildir is not present

---
 tests/test_build_ext.py |   6 +-
 tests/xxmodule.c        | 379 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 384 insertions(+), 1 deletion(-)
 create mode 100644 tests/xxmodule.c

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a1c236aa15..5dea4dde7b 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,7 +19,11 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+    xxmodule = os.path.join(srcdir, 'Modules', 'xxmodule.c')
+    if not os.path.exists(xxmodule):
+        # local fallback
+        xxmodule = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
+    return xxmodule
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
diff --git a/tests/xxmodule.c b/tests/xxmodule.c
new file mode 100644
index 0000000000..6b498dd6ca
--- /dev/null
+++ b/tests/xxmodule.c
@@ -0,0 +1,379 @@
+
+/* Use this file as a template to start implementing a module that
+   also declares object types. All occurrences of 'Xxo' should be changed
+   to something reasonable for your objects. After that, all other
+   occurrences of 'xx' should be changed to something reasonable for your
+   module. If your module is named foo your sourcefile should be named
+   foomodule.c.
+
+   You will probably want to delete all references to 'x_attr' and add
+   your own types of attributes instead.  Maybe you want to name your
+   local variables other than 'self'.  If your object type is needed in
+   other files, you'll have to create a file "foobarobject.h"; see
+   intobject.h for an example. */
+
+/* Xxo objects */
+
+#include "Python.h"
+
+static PyObject *ErrorObject;
+
+typedef struct {
+	PyObject_HEAD
+	PyObject	*x_attr;	/* Attributes dictionary */
+} XxoObject;
+
+static PyTypeObject Xxo_Type;
+
+#define XxoObject_Check(v)	(Py_TYPE(v) == &Xxo_Type)
+
+static XxoObject *
+newXxoObject(PyObject *arg)
+{
+	XxoObject *self;
+	self = PyObject_New(XxoObject, &Xxo_Type);
+	if (self == NULL)
+		return NULL;
+	self->x_attr = NULL;
+	return self;
+}
+
+/* Xxo methods */
+
+static void
+Xxo_dealloc(XxoObject *self)
+{
+	Py_XDECREF(self->x_attr);
+	PyObject_Del(self);
+}
+
+static PyObject *
+Xxo_demo(XxoObject *self, PyObject *args)
+{
+	if (!PyArg_ParseTuple(args, ":demo"))
+		return NULL;
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyMethodDef Xxo_methods[] = {
+	{"demo",	(PyCFunction)Xxo_demo,	METH_VARARGS,
+		PyDoc_STR("demo() -> None")},
+	{NULL,		NULL}		/* sentinel */
+};
+
+static PyObject *
+Xxo_getattr(XxoObject *self, char *name)
+{
+	if (self->x_attr != NULL) {
+		PyObject *v = PyDict_GetItemString(self->x_attr, name);
+		if (v != NULL) {
+			Py_INCREF(v);
+			return v;
+		}
+	}
+	return Py_FindMethod(Xxo_methods, (PyObject *)self, name);
+}
+
+static int
+Xxo_setattr(XxoObject *self, char *name, PyObject *v)
+{
+	if (self->x_attr == NULL) {
+		self->x_attr = PyDict_New();
+		if (self->x_attr == NULL)
+			return -1;
+	}
+	if (v == NULL) {
+		int rv = PyDict_DelItemString(self->x_attr, name);
+		if (rv < 0)
+			PyErr_SetString(PyExc_AttributeError,
+			        "delete non-existing Xxo attribute");
+		return rv;
+	}
+	else
+		return PyDict_SetItemString(self->x_attr, name, v);
+}
+
+static PyTypeObject Xxo_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Xxo",		/*tp_name*/
+	sizeof(XxoObject),	/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	(destructor)Xxo_dealloc, /*tp_dealloc*/
+	0,			/*tp_print*/
+	(getattrfunc)Xxo_getattr, /*tp_getattr*/
+	(setattrfunc)Xxo_setattr, /*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+        0,                      /*tp_call*/
+        0,                      /*tp_str*/
+        0,                      /*tp_getattro*/
+        0,                      /*tp_setattro*/
+        0,                      /*tp_as_buffer*/
+        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
+        0,                      /*tp_doc*/
+        0,                      /*tp_traverse*/
+        0,                      /*tp_clear*/
+        0,                      /*tp_richcompare*/
+        0,                      /*tp_weaklistoffset*/
+        0,                      /*tp_iter*/
+        0,                      /*tp_iternext*/
+        0,                      /*tp_methods*/
+        0,                      /*tp_members*/
+        0,                      /*tp_getset*/
+        0,                      /*tp_base*/
+        0,                      /*tp_dict*/
+        0,                      /*tp_descr_get*/
+        0,                      /*tp_descr_set*/
+        0,                      /*tp_dictoffset*/
+        0,                      /*tp_init*/
+        0,                      /*tp_alloc*/
+        0,                      /*tp_new*/
+        0,                      /*tp_free*/
+        0,                      /*tp_is_gc*/
+};
+/* --------------------------------------------------------------------- */
+
+/* Function of two integers returning integer */
+
+PyDoc_STRVAR(xx_foo_doc,
+"foo(i,j)\n\
+\n\
+Return the sum of i and j.");
+
+static PyObject *
+xx_foo(PyObject *self, PyObject *args)
+{
+	long i, j;
+	long res;
+	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
+		return NULL;
+	res = i+j; /* XXX Do something here */
+	return PyInt_FromLong(res);
+}
+
+
+/* Function of no arguments returning new Xxo object */
+
+static PyObject *
+xx_new(PyObject *self, PyObject *args)
+{
+	XxoObject *rv;
+
+	if (!PyArg_ParseTuple(args, ":new"))
+		return NULL;
+	rv = newXxoObject(args);
+	if (rv == NULL)
+		return NULL;
+	return (PyObject *)rv;
+}
+
+/* Example with subtle bug from extensions manual ("Thin Ice"). */
+
+static PyObject *
+xx_bug(PyObject *self, PyObject *args)
+{
+	PyObject *list, *item;
+
+	if (!PyArg_ParseTuple(args, "O:bug", &list))
+		return NULL;
+
+	item = PyList_GetItem(list, 0);
+	/* Py_INCREF(item); */
+	PyList_SetItem(list, 1, PyInt_FromLong(0L));
+	PyObject_Print(item, stdout, 0);
+	printf("\n");
+	/* Py_DECREF(item); */
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/* Test bad format character */
+
+static PyObject *
+xx_roj(PyObject *self, PyObject *args)
+{
+	PyObject *a;
+	long b;
+	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
+		return NULL;
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+
+/* ---------- */
+
+static PyTypeObject Str_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Str",		/*tp_name*/
+	0,			/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	0,			/*tp_dealloc*/
+	0,			/*tp_print*/
+	0,			/*tp_getattr*/
+	0,			/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+	0,			/*tp_call*/
+	0,			/*tp_str*/
+	0,			/*tp_getattro*/
+	0,			/*tp_setattro*/
+	0,			/*tp_as_buffer*/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	0,			/*tp_doc*/
+	0,			/*tp_traverse*/
+	0,			/*tp_clear*/
+	0,			/*tp_richcompare*/
+	0,			/*tp_weaklistoffset*/
+	0,			/*tp_iter*/
+	0,			/*tp_iternext*/
+	0,			/*tp_methods*/
+	0,			/*tp_members*/
+	0,			/*tp_getset*/
+	0, /* see initxx */	/*tp_base*/
+	0,			/*tp_dict*/
+	0,			/*tp_descr_get*/
+	0,			/*tp_descr_set*/
+	0,			/*tp_dictoffset*/
+	0,			/*tp_init*/
+	0,			/*tp_alloc*/
+	0,			/*tp_new*/
+	0,			/*tp_free*/
+	0,			/*tp_is_gc*/
+};
+
+/* ---------- */
+
+static PyObject *
+null_richcompare(PyObject *self, PyObject *other, int op)
+{
+	Py_INCREF(Py_NotImplemented);
+	return Py_NotImplemented;
+}
+
+static PyTypeObject Null_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Null",	/*tp_name*/
+	0,			/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	0,			/*tp_dealloc*/
+	0,			/*tp_print*/
+	0,			/*tp_getattr*/
+	0,			/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+	0,			/*tp_call*/
+	0,			/*tp_str*/
+	0,			/*tp_getattro*/
+	0,			/*tp_setattro*/
+	0,			/*tp_as_buffer*/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	0,			/*tp_doc*/
+	0,			/*tp_traverse*/
+	0,			/*tp_clear*/
+	null_richcompare,	/*tp_richcompare*/
+	0,			/*tp_weaklistoffset*/
+	0,			/*tp_iter*/
+	0,			/*tp_iternext*/
+	0,			/*tp_methods*/
+	0,			/*tp_members*/
+	0,			/*tp_getset*/
+	0, /* see initxx */	/*tp_base*/
+	0,			/*tp_dict*/
+	0,			/*tp_descr_get*/
+	0,			/*tp_descr_set*/
+	0,			/*tp_dictoffset*/
+	0,			/*tp_init*/
+	0,			/*tp_alloc*/
+	0, /* see initxx */	/*tp_new*/
+	0,			/*tp_free*/
+	0,			/*tp_is_gc*/
+};
+
+
+/* ---------- */
+
+
+/* List of functions defined in the module */
+
+static PyMethodDef xx_methods[] = {
+	{"roj",		xx_roj,		METH_VARARGS,
+		PyDoc_STR("roj(a,b) -> None")},
+	{"foo",		xx_foo,		METH_VARARGS,
+	 	xx_foo_doc},
+	{"new",		xx_new,		METH_VARARGS,
+		PyDoc_STR("new() -> new Xx object")},
+	{"bug",		xx_bug,		METH_VARARGS,
+		PyDoc_STR("bug(o) -> None")},
+	{NULL,		NULL}		/* sentinel */
+};
+
+PyDoc_STRVAR(module_doc,
+"This is a template module just for instruction.");
+
+/* Initialization function for the module (*must* be called initxx) */
+
+PyMODINIT_FUNC
+initxx(void)
+{
+	PyObject *m;
+
+	/* Due to cross platform compiler issues the slots must be filled
+	 * here. It's required for portability to Windows without requiring
+	 * C++. */
+	Null_Type.tp_base = &PyBaseObject_Type;
+	Null_Type.tp_new = PyType_GenericNew;
+	Str_Type.tp_base = &PyUnicode_Type;
+
+	/* Finalize the type object including setting type of the new type
+	 * object; doing it here is required for portability, too. */
+	if (PyType_Ready(&Xxo_Type) < 0)
+		return;
+
+	/* Create the module and add the functions */
+	m = Py_InitModule3("xx", xx_methods, module_doc);
+	if (m == NULL)
+		return;
+
+	/* Add some symbolic constants to the module */
+	if (ErrorObject == NULL) {
+		ErrorObject = PyErr_NewException("xx.error", NULL, NULL);
+		if (ErrorObject == NULL)
+			return;
+	}
+	Py_INCREF(ErrorObject);
+	PyModule_AddObject(m, "error", ErrorObject);
+
+	/* Add Str */
+	if (PyType_Ready(&Str_Type) < 0)
+		return;
+	PyModule_AddObject(m, "Str", (PyObject *)&Str_Type);
+
+	/* Add Null */
+	if (PyType_Ready(&Null_Type) < 0)
+		return;
+	PyModule_AddObject(m, "Null", (PyObject *)&Null_Type);
+}

From 205a0969d915976d9bd420ec5fa78a7e97e7a51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 01:23:21 +0000
Subject: [PATCH 2883/8469] simplified the fallback case

---
 tests/test_build_ext.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5dea4dde7b..867ba96ec4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,11 +19,10 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
-    xxmodule = os.path.join(srcdir, 'Modules', 'xxmodule.c')
-    if not os.path.exists(xxmodule):
+    if srcdir is None:
         # local fallback
-        xxmodule = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
-    return xxmodule
+        return os.path.join(os.path.dirname(__file__), 'xxmodule.c')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,

From 0d642959fe4e67e111f4306a187228ab2fcec179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 01:27:09 +0000
Subject: [PATCH 2884/8469] files used by win32 tests

---
 tests/setuptools_build_ext.py | 287 ++++++++++++++++++++++++++++++++++
 tests/setuptools_extension.py |  51 ++++++
 2 files changed, 338 insertions(+)
 create mode 100644 tests/setuptools_build_ext.py
 create mode 100644 tests/setuptools_extension.py

diff --git a/tests/setuptools_build_ext.py b/tests/setuptools_build_ext.py
new file mode 100644
index 0000000000..21fa9e8f43
--- /dev/null
+++ b/tests/setuptools_build_ext.py
@@ -0,0 +1,287 @@
+from distutils.command.build_ext import build_ext as _du_build_ext
+try:
+    # Attempt to use Pyrex for building extensions, if available
+    from Pyrex.Distutils.build_ext import build_ext as _build_ext
+except ImportError:
+    _build_ext = _du_build_ext
+
+import os, sys
+from distutils.file_util import copy_file
+
+from distutils.tests.setuptools_extension import Library
+
+from distutils.ccompiler import new_compiler
+from distutils.sysconfig import customize_compiler, get_config_var
+get_config_var("LDSHARED")  # make sure _config_vars is initialized
+from distutils.sysconfig import _config_vars
+from distutils import log
+from distutils.errors import *
+
+have_rtld = False
+use_stubs = False
+libtype = 'shared'
+
+if sys.platform == "darwin":
+    use_stubs = True
+elif os.name != 'nt':
+    try:
+        from dl import RTLD_NOW
+        have_rtld = True
+        use_stubs = True
+    except ImportError:
+        pass
+
+def if_dl(s):
+    if have_rtld:
+        return s
+    return ''
+
+
+
+
+
+
+class build_ext(_build_ext):
+    def run(self):
+        """Build extensions in build directory, then copy if --inplace"""
+        old_inplace, self.inplace = self.inplace, 0
+        _build_ext.run(self)
+        self.inplace = old_inplace
+        if old_inplace:
+            self.copy_extensions_to_source()
+
+    def copy_extensions_to_source(self):
+        build_py = self.get_finalized_command('build_py')
+        for ext in self.extensions:
+            fullname = self.get_ext_fullname(ext.name)
+            filename = self.get_ext_filename(fullname)
+            modpath = fullname.split('.')
+            package = '.'.join(modpath[:-1])
+            package_dir = build_py.get_package_dir(package)
+            dest_filename = os.path.join(package_dir,os.path.basename(filename))
+            src_filename = os.path.join(self.build_lib,filename)
+
+            # Always copy, even if source is older than destination, to ensure
+            # that the right extensions for the current Python/platform are
+            # used.
+            copy_file(
+                src_filename, dest_filename, verbose=self.verbose,
+                dry_run=self.dry_run
+            )
+            if ext._needs_stub:
+                self.write_stub(package_dir or os.curdir, ext, True)
+
+
+    if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
+        # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
+        def swig_sources(self, sources, *otherargs):
+            # first do any Pyrex processing
+            sources = _build_ext.swig_sources(self, sources) or sources
+            # Then do any actual SWIG stuff on the remainder
+            return _du_build_ext.swig_sources(self, sources, *otherargs)
+
+
+
+    def get_ext_filename(self, fullname):
+        filename = _build_ext.get_ext_filename(self,fullname)
+        ext = self.ext_map[fullname]
+        if isinstance(ext,Library):
+            fn, ext = os.path.splitext(filename)
+            return self.shlib_compiler.library_filename(fn,libtype)
+        elif use_stubs and ext._links_to_dynamic:
+            d,fn = os.path.split(filename)
+            return os.path.join(d,'dl-'+fn)
+        else:
+            return filename
+
+    def initialize_options(self):
+        _build_ext.initialize_options(self)
+        self.shlib_compiler = None
+        self.shlibs = []
+        self.ext_map = {}
+
+    def finalize_options(self):
+        _build_ext.finalize_options(self)
+        self.extensions = self.extensions or []
+        self.check_extensions_list(self.extensions)
+        self.shlibs = [ext for ext in self.extensions
+                        if isinstance(ext,Library)]
+        if self.shlibs:
+            self.setup_shlib_compiler()
+        for ext in self.extensions:
+            ext._full_name = self.get_ext_fullname(ext.name)
+        for ext in self.extensions:
+            fullname = ext._full_name
+            self.ext_map[fullname] = ext
+            ltd = ext._links_to_dynamic = \
+                self.shlibs and self.links_to_dynamic(ext) or False
+            ext._needs_stub = ltd and use_stubs and not isinstance(ext,Library)
+            filename = ext._file_name = self.get_ext_filename(fullname)
+            libdir = os.path.dirname(os.path.join(self.build_lib,filename))
+            if ltd and libdir not in ext.library_dirs:
+                ext.library_dirs.append(libdir)
+            if ltd and use_stubs and os.curdir not in ext.runtime_library_dirs:
+                ext.runtime_library_dirs.append(os.curdir)
+
+    def setup_shlib_compiler(self):
+        compiler = self.shlib_compiler = new_compiler(
+            compiler=self.compiler, dry_run=self.dry_run, force=self.force
+        )
+        if sys.platform == "darwin":
+            tmp = _config_vars.copy()
+            try:
+                # XXX Help!  I don't have any idea whether these are right...
+                _config_vars['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
+                _config_vars['CCSHARED'] = " -dynamiclib"
+                _config_vars['SO'] = ".dylib"
+                customize_compiler(compiler)
+            finally:
+                _config_vars.clear()
+                _config_vars.update(tmp)
+        else:
+            customize_compiler(compiler)
+
+        if self.include_dirs is not None:
+            compiler.set_include_dirs(self.include_dirs)
+        if self.define is not None:
+            # 'define' option is a list of (name,value) tuples
+            for (name,value) in self.define:
+                compiler.define_macro(name, value)
+        if self.undef is not None:
+            for macro in self.undef:
+                compiler.undefine_macro(macro)
+        if self.libraries is not None:
+            compiler.set_libraries(self.libraries)
+        if self.library_dirs is not None:
+            compiler.set_library_dirs(self.library_dirs)
+        if self.rpath is not None:
+            compiler.set_runtime_library_dirs(self.rpath)
+        if self.link_objects is not None:
+            compiler.set_link_objects(self.link_objects)
+
+        # hack so distutils' build_extension() builds a library instead
+        compiler.link_shared_object = link_shared_object.__get__(compiler)
+
+
+
+    def get_export_symbols(self, ext):
+        if isinstance(ext,Library):
+            return ext.export_symbols
+        return _build_ext.get_export_symbols(self,ext)
+
+    def build_extension(self, ext):
+        _compiler = self.compiler
+        try:
+            if isinstance(ext,Library):
+                self.compiler = self.shlib_compiler
+            _build_ext.build_extension(self,ext)
+            if ext._needs_stub:
+                self.write_stub(
+                    self.get_finalized_command('build_py').build_lib, ext
+                )
+        finally:
+            self.compiler = _compiler
+
+    def links_to_dynamic(self, ext):
+        """Return true if 'ext' links to a dynamic lib in the same package"""
+        # XXX this should check to ensure the lib is actually being built
+        # XXX as dynamic, and not just using a locally-found version or a
+        # XXX static-compiled version
+        libnames = dict.fromkeys([lib._full_name for lib in self.shlibs])
+        pkg = '.'.join(ext._full_name.split('.')[:-1]+[''])
+        for libname in ext.libraries:
+            if pkg+libname in libnames: return True
+        return False
+
+    def get_outputs(self):
+        outputs = _build_ext.get_outputs(self)
+        optimize = self.get_finalized_command('build_py').optimize
+        for ext in self.extensions:
+            if ext._needs_stub:
+                base = os.path.join(self.build_lib, *ext._full_name.split('.'))
+                outputs.append(base+'.py')
+                outputs.append(base+'.pyc')
+                if optimize:
+                    outputs.append(base+'.pyo')
+        return outputs
+
+    def write_stub(self, output_dir, ext, compile=False):
+        log.info("writing stub loader for %s to %s",ext._full_name, output_dir)
+        stub_file = os.path.join(output_dir, *ext._full_name.split('.'))+'.py'
+        if compile and os.path.exists(stub_file):
+            raise DistutilsError(stub_file+" already exists! Please delete.")
+        if not self.dry_run:
+            f = open(stub_file,'w')
+            f.write('\n'.join([
+                "def __bootstrap__():",
+                "   global __bootstrap__, __file__, __loader__",
+                "   import sys, os, pkg_resources, imp"+if_dl(", dl"),
+                "   __file__ = pkg_resources.resource_filename(__name__,%r)"
+                   % os.path.basename(ext._file_name),
+                "   del __bootstrap__",
+                "   if '__loader__' in globals():",
+                "       del __loader__",
+                if_dl("   old_flags = sys.getdlopenflags()"),
+                "   old_dir = os.getcwd()",
+                "   try:",
+                "     os.chdir(os.path.dirname(__file__))",
+                if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
+                "     imp.load_dynamic(__name__,__file__)",
+                "   finally:",
+                if_dl("     sys.setdlopenflags(old_flags)"),
+                "     os.chdir(old_dir)",
+                "__bootstrap__()",
+                "" # terminal \n
+            ]))
+            f.close()
+        if compile:
+            from distutils.util import byte_compile
+            byte_compile([stub_file], optimize=0,
+                         force=True, dry_run=self.dry_run)
+            optimize = self.get_finalized_command('install_lib').optimize
+            if optimize > 0:
+                byte_compile([stub_file], optimize=optimize,
+                             force=True, dry_run=self.dry_run)
+            if os.path.exists(stub_file) and not self.dry_run:
+                os.unlink(stub_file)
+
+
+if use_stubs or os.name=='nt':
+    # Build shared libraries
+    #
+    def link_shared_object(self, objects, output_libname, output_dir=None,
+        libraries=None, library_dirs=None, runtime_library_dirs=None,
+        export_symbols=None, debug=0, extra_preargs=None,
+        extra_postargs=None, build_temp=None, target_lang=None
+    ):  self.link(
+            self.SHARED_LIBRARY, objects, output_libname,
+            output_dir, libraries, library_dirs, runtime_library_dirs,
+            export_symbols, debug, extra_preargs, extra_postargs,
+            build_temp, target_lang
+        )
+else:
+    # Build static libraries everywhere else
+    libtype = 'static'
+
+    def link_shared_object(self, objects, output_libname, output_dir=None,
+        libraries=None, library_dirs=None, runtime_library_dirs=None,
+        export_symbols=None, debug=0, extra_preargs=None,
+        extra_postargs=None, build_temp=None, target_lang=None
+    ):
+        # XXX we need to either disallow these attrs on Library instances,
+        #     or warn/abort here if set, or something...
+        #libraries=None, library_dirs=None, runtime_library_dirs=None,
+        #export_symbols=None, extra_preargs=None, extra_postargs=None,
+        #build_temp=None
+
+        assert output_dir is None   # distutils build_ext doesn't pass this
+        output_dir,filename = os.path.split(output_libname)
+        basename, ext = os.path.splitext(filename)
+        if self.library_filename("x").startswith('lib'):
+            # strip 'lib' prefix; this is kludgy if some platform uses
+            # a different prefix
+            basename = basename[3:]
+
+        self.create_static_lib(
+            objects, basename, output_dir, debug, target_lang
+        )
diff --git a/tests/setuptools_extension.py b/tests/setuptools_extension.py
new file mode 100644
index 0000000000..ec6b690cdb
--- /dev/null
+++ b/tests/setuptools_extension.py
@@ -0,0 +1,51 @@
+from distutils.core import Extension as _Extension
+from distutils.core import Distribution as _Distribution
+
+def _get_unpatched(cls):
+    """Protect against re-patching the distutils if reloaded
+
+    Also ensures that no other distutils extension monkeypatched the distutils
+    first.
+    """
+    while cls.__module__.startswith('setuptools'):
+        cls, = cls.__bases__
+    if not cls.__module__.startswith('distutils'):
+        raise AssertionError(
+            "distutils has already been patched by %r" % cls
+        )
+    return cls
+
+_Distribution = _get_unpatched(_Distribution)
+_Extension = _get_unpatched(_Extension)
+
+try:
+    from Pyrex.Distutils.build_ext import build_ext
+except ImportError:
+    have_pyrex = False
+else:
+    have_pyrex = True
+
+
+class Extension(_Extension):
+    """Extension that uses '.c' files in place of '.pyx' files"""
+
+    if not have_pyrex:
+        # convert .pyx extensions to .c
+        def __init__(self,*args,**kw):
+            _Extension.__init__(self,*args,**kw)
+            sources = []
+            for s in self.sources:
+                if s.endswith('.pyx'):
+                    sources.append(s[:-3]+'c')
+                else:
+                    sources.append(s)
+            self.sources = sources
+
+class Library(Extension):
+    """Just like a regular Extension, but built as a library instead"""
+
+import sys, distutils.core, distutils.extension
+distutils.core.Extension = Extension
+distutils.extension.Extension = Extension
+if 'distutils.command.build_ext' in sys.modules:
+    sys.modules['distutils.command.build_ext'].Extension = Extension

From e8fce7b386235ac8943372a062330694090a7533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 02:11:14 +0000
Subject: [PATCH 2885/8469] fixed various failures and environment alterations
 in distutils.test_build_ext

---
 tests/test_build_ext.py | 62 +++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 867ba96ec4..4860c9bf24 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,10 +19,15 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
+    fallback_path = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
     if srcdir is None:
-        # local fallback
-        return os.path.join(os.path.dirname(__file__), 'xxmodule.c')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+        return fallback_path
+    locations = (srcdir, os.path.dirname(sys.executable))
+    for location in locations:
+        path = os.path.join(location, 'Modules', 'xxmodule.c')
+        if os.path.exists(path):
+            return path
+    return fallback_path
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
@@ -81,7 +86,7 @@ def test_build_ext(self):
     def tearDown(self):
         # Get everything back to normal
         test_support.unload('xx')
-        sys.path = self.sys_path
+        sys.path[:] = self.sys_path
         # XXX on Windows the test leaves a directory with xx module in TEMP
         shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
         super(BuildExtTestCase, self).tearDown()
@@ -350,22 +355,31 @@ def test_build_ext_inplace(self):
         self.assertEquals(wanted, path)
 
     def test_setuptools_compat(self):
-        from setuptools_build_ext import build_ext as setuptools_build_ext
-        from setuptools_extension import Extension
-
-        etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
-        etree_ext = Extension('lxml.etree', [etree_c])
-        dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
-        cmd = setuptools_build_ext(dist)
-        cmd.ensure_finalized()
-        cmd.inplace = 1
-        cmd.distribution.package_dir = {'': 'src'}
-        cmd.distribution.packages = ['lxml', 'lxml.html']
-        curdir = os.getcwd()
-        ext = sysconfig.get_config_var("SO")
-        wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
-        path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        import distutils.core, distutils.extension, distutils.command.build_ext
+        saved_ext = distutils.extension.Extension
+        try:
+            # theses import patch Distutils' Extension class
+            from setuptools_build_ext import build_ext as setuptools_build_ext
+            from setuptools_extension import Extension
+
+            etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
+            etree_ext = Extension('lxml.etree', [etree_c])
+            dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
+            cmd = setuptools_build_ext(dist)
+            cmd.ensure_finalized()
+            cmd.inplace = 1
+            cmd.distribution.package_dir = {'': 'src'}
+            cmd.distribution.packages = ['lxml', 'lxml.html']
+            curdir = os.getcwd()
+            ext = sysconfig.get_config_var("SO")
+            wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
+            path = cmd.get_ext_fullpath('lxml.etree')
+            self.assertEquals(wanted, path)
+        finally:
+            # restoring Distutils' Extension class otherwise its broken
+            distutils.extension.Extension = saved_ext
+            distutils.core.Extension = saved_ext
+            distutils.command.build_ext.Extension = saved_ext
 
     def test_build_ext_path_with_os_sep(self):
         dist = Distribution({'name': 'UpdateManager'})
@@ -391,13 +405,7 @@ def test_build_ext_path_cross_platform(self):
         self.assertEquals(ext_path, wanted)
 
 def test_suite():
-    src = _get_source_filename()
-    if not os.path.exists(src):
-        if test_support.verbose:
-            print ('test_build_ext: Cannot find source code (test'
-                   ' must run in python build dir)')
-        return unittest.TestSuite()
-    else: return unittest.makeSuite(BuildExtTestCase)
+    return unittest.makeSuite(BuildExtTestCase)
 
 if __name__ == '__main__':
     test_support.run_unittest(test_suite())

From 77d34a843c3d00ae2dc37cd7b071a47a2b460aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 6 Mar 2010 02:17:28 +0000
Subject: [PATCH 2886/8469] search in the alternative location for VCExpress

---
 msvc9compiler.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 41d67faf59..932b6ea2d9 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -38,6 +38,7 @@
          _winreg.HKEY_CLASSES_ROOT)
 
 VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+VSEXPRESS_BASE = r"Software\Microsoft\VCExpress\%0.1f"
 WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
 NET_BASE = r"Software\Microsoft\.NETFramework"
 
@@ -216,9 +217,18 @@ def find_vcvarsall(version):
         productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
                                    "productdir")
     except KeyError:
-        log.debug("Unable to find productdir in registry")
         productdir = None
 
+    # trying Express edition
+    if productdir is None:
+        vsbase = VSEXPRESS_BASE % version
+        try:
+            productdir = Reg.get_value(r"%s\Setup\VC" % vsbase,
+                                       "productdir")
+        except KeyError:
+            productdir = None
+            log.debug("Unable to find productdir in registry")
+
     if not productdir or not os.path.isdir(productdir):
         toolskey = "VS%0.f0COMNTOOLS" % version
         toolsdir = os.environ.get(toolskey, None)

From 1e6721ca45da49df064748cdd8161fc717140487 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Mar 2010 20:28:33 +0000
Subject: [PATCH 2887/8469] bump to 3.1.2rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8c0e5a3cba..2e6a6fb634 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.1"
+__version__ = "3.1.2rc1"
 #--end constants--

From d9daa5ddcc3f32e2acd377eb210a3a061976c0ce Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Mar 2010 20:34:14 +0000
Subject: [PATCH 2888/8469] bump version to 2.7a4

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 977643bf34..0158996441 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7a3"
+__version__ = "2.7a4"
 #--end constants--

From 32c211ba3c57c6d0405a86f29291c56f105a86f4 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 7 Mar 2010 12:14:25 +0000
Subject: [PATCH 2889/8469] Fix some py3k warnings in the standard library.

---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 36ac721386..1a55f70894 100644
--- a/util.py
+++ b/util.py
@@ -406,7 +406,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
 
     log.info(msg)
     if not dry_run:
-        apply(func, args)
+        func(*args)
 
 
 def strtobool (val):

From c0dac00e8b014f7b9180438f8e056f411f10a2c0 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 9 Mar 2010 22:31:52 +0000
Subject: [PATCH 2890/8469] Bumping to 2.6.5rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8c2ab8f3e5..888dd54a6b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.5rc1"
+__version__ = "2.6.5rc2"
 #--end constants--

From e14cbce6b42677bd762a5b2d351451e14ee3e3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 12 Mar 2010 18:27:13 +0000
Subject: [PATCH 2891/8469] Merged revisions 78707,78709 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78707 | tarek.ziade | 2010-03-05 20:18:27 -0500 (Fri, 05 Mar 2010) | 1 line

  provide a fallback for xxmodule.c in case the buildir is not present
........
  r78709 | tarek.ziade | 2010-03-05 20:23:21 -0500 (Fri, 05 Mar 2010) | 1 line

  simplified the fallback case
........
---
 tests/test_build_ext.py |   3 +-
 tests/xxmodule.c        | 379 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 380 insertions(+), 2 deletions(-)
 create mode 100644 tests/xxmodule.c

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a1c236aa15..b6c521bf76 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -18,8 +18,7 @@
 ALREADY_TESTED = False
 
 def _get_source_filename():
-    srcdir = sysconfig.get_config_var('srcdir')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+    return os.path.join(os.path.dirname(__file__), 'xxmodule.c')
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
diff --git a/tests/xxmodule.c b/tests/xxmodule.c
new file mode 100644
index 0000000000..6b498dd6ca
--- /dev/null
+++ b/tests/xxmodule.c
@@ -0,0 +1,379 @@
+
+/* Use this file as a template to start implementing a module that
+   also declares object types. All occurrences of 'Xxo' should be changed
+   to something reasonable for your objects. After that, all other
+   occurrences of 'xx' should be changed to something reasonable for your
+   module. If your module is named foo your sourcefile should be named
+   foomodule.c.
+
+   You will probably want to delete all references to 'x_attr' and add
+   your own types of attributes instead.  Maybe you want to name your
+   local variables other than 'self'.  If your object type is needed in
+   other files, you'll have to create a file "foobarobject.h"; see
+   intobject.h for an example. */
+
+/* Xxo objects */
+
+#include "Python.h"
+
+static PyObject *ErrorObject;
+
+typedef struct {
+	PyObject_HEAD
+	PyObject	*x_attr;	/* Attributes dictionary */
+} XxoObject;
+
+static PyTypeObject Xxo_Type;
+
+#define XxoObject_Check(v)	(Py_TYPE(v) == &Xxo_Type)
+
+static XxoObject *
+newXxoObject(PyObject *arg)
+{
+	XxoObject *self;
+	self = PyObject_New(XxoObject, &Xxo_Type);
+	if (self == NULL)
+		return NULL;
+	self->x_attr = NULL;
+	return self;
+}
+
+/* Xxo methods */
+
+static void
+Xxo_dealloc(XxoObject *self)
+{
+	Py_XDECREF(self->x_attr);
+	PyObject_Del(self);
+}
+
+static PyObject *
+Xxo_demo(XxoObject *self, PyObject *args)
+{
+	if (!PyArg_ParseTuple(args, ":demo"))
+		return NULL;
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyMethodDef Xxo_methods[] = {
+	{"demo",	(PyCFunction)Xxo_demo,	METH_VARARGS,
+		PyDoc_STR("demo() -> None")},
+	{NULL,		NULL}		/* sentinel */
+};
+
+static PyObject *
+Xxo_getattr(XxoObject *self, char *name)
+{
+	if (self->x_attr != NULL) {
+		PyObject *v = PyDict_GetItemString(self->x_attr, name);
+		if (v != NULL) {
+			Py_INCREF(v);
+			return v;
+		}
+	}
+	return Py_FindMethod(Xxo_methods, (PyObject *)self, name);
+}
+
+static int
+Xxo_setattr(XxoObject *self, char *name, PyObject *v)
+{
+	if (self->x_attr == NULL) {
+		self->x_attr = PyDict_New();
+		if (self->x_attr == NULL)
+			return -1;
+	}
+	if (v == NULL) {
+		int rv = PyDict_DelItemString(self->x_attr, name);
+		if (rv < 0)
+			PyErr_SetString(PyExc_AttributeError,
+			        "delete non-existing Xxo attribute");
+		return rv;
+	}
+	else
+		return PyDict_SetItemString(self->x_attr, name, v);
+}
+
+static PyTypeObject Xxo_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Xxo",		/*tp_name*/
+	sizeof(XxoObject),	/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	(destructor)Xxo_dealloc, /*tp_dealloc*/
+	0,			/*tp_print*/
+	(getattrfunc)Xxo_getattr, /*tp_getattr*/
+	(setattrfunc)Xxo_setattr, /*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+        0,                      /*tp_call*/
+        0,                      /*tp_str*/
+        0,                      /*tp_getattro*/
+        0,                      /*tp_setattro*/
+        0,                      /*tp_as_buffer*/
+        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
+        0,                      /*tp_doc*/
+        0,                      /*tp_traverse*/
+        0,                      /*tp_clear*/
+        0,                      /*tp_richcompare*/
+        0,                      /*tp_weaklistoffset*/
+        0,                      /*tp_iter*/
+        0,                      /*tp_iternext*/
+        0,                      /*tp_methods*/
+        0,                      /*tp_members*/
+        0,                      /*tp_getset*/
+        0,                      /*tp_base*/
+        0,                      /*tp_dict*/
+        0,                      /*tp_descr_get*/
+        0,                      /*tp_descr_set*/
+        0,                      /*tp_dictoffset*/
+        0,                      /*tp_init*/
+        0,                      /*tp_alloc*/
+        0,                      /*tp_new*/
+        0,                      /*tp_free*/
+        0,                      /*tp_is_gc*/
+};
+/* --------------------------------------------------------------------- */
+
+/* Function of two integers returning integer */
+
+PyDoc_STRVAR(xx_foo_doc,
+"foo(i,j)\n\
+\n\
+Return the sum of i and j.");
+
+static PyObject *
+xx_foo(PyObject *self, PyObject *args)
+{
+	long i, j;
+	long res;
+	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
+		return NULL;
+	res = i+j; /* XXX Do something here */
+	return PyInt_FromLong(res);
+}
+
+
+/* Function of no arguments returning new Xxo object */
+
+static PyObject *
+xx_new(PyObject *self, PyObject *args)
+{
+	XxoObject *rv;
+
+	if (!PyArg_ParseTuple(args, ":new"))
+		return NULL;
+	rv = newXxoObject(args);
+	if (rv == NULL)
+		return NULL;
+	return (PyObject *)rv;
+}
+
+/* Example with subtle bug from extensions manual ("Thin Ice"). */
+
+static PyObject *
+xx_bug(PyObject *self, PyObject *args)
+{
+	PyObject *list, *item;
+
+	if (!PyArg_ParseTuple(args, "O:bug", &list))
+		return NULL;
+
+	item = PyList_GetItem(list, 0);
+	/* Py_INCREF(item); */
+	PyList_SetItem(list, 1, PyInt_FromLong(0L));
+	PyObject_Print(item, stdout, 0);
+	printf("\n");
+	/* Py_DECREF(item); */
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/* Test bad format character */
+
+static PyObject *
+xx_roj(PyObject *self, PyObject *args)
+{
+	PyObject *a;
+	long b;
+	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
+		return NULL;
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+
+/* ---------- */
+
+static PyTypeObject Str_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Str",		/*tp_name*/
+	0,			/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	0,			/*tp_dealloc*/
+	0,			/*tp_print*/
+	0,			/*tp_getattr*/
+	0,			/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+	0,			/*tp_call*/
+	0,			/*tp_str*/
+	0,			/*tp_getattro*/
+	0,			/*tp_setattro*/
+	0,			/*tp_as_buffer*/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	0,			/*tp_doc*/
+	0,			/*tp_traverse*/
+	0,			/*tp_clear*/
+	0,			/*tp_richcompare*/
+	0,			/*tp_weaklistoffset*/
+	0,			/*tp_iter*/
+	0,			/*tp_iternext*/
+	0,			/*tp_methods*/
+	0,			/*tp_members*/
+	0,			/*tp_getset*/
+	0, /* see initxx */	/*tp_base*/
+	0,			/*tp_dict*/
+	0,			/*tp_descr_get*/
+	0,			/*tp_descr_set*/
+	0,			/*tp_dictoffset*/
+	0,			/*tp_init*/
+	0,			/*tp_alloc*/
+	0,			/*tp_new*/
+	0,			/*tp_free*/
+	0,			/*tp_is_gc*/
+};
+
+/* ---------- */
+
+static PyObject *
+null_richcompare(PyObject *self, PyObject *other, int op)
+{
+	Py_INCREF(Py_NotImplemented);
+	return Py_NotImplemented;
+}
+
+static PyTypeObject Null_Type = {
+	/* The ob_type field must be initialized in the module init function
+	 * to be portable to Windows without using C++. */
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"xxmodule.Null",	/*tp_name*/
+	0,			/*tp_basicsize*/
+	0,			/*tp_itemsize*/
+	/* methods */
+	0,			/*tp_dealloc*/
+	0,			/*tp_print*/
+	0,			/*tp_getattr*/
+	0,			/*tp_setattr*/
+	0,			/*tp_compare*/
+	0,			/*tp_repr*/
+	0,			/*tp_as_number*/
+	0,			/*tp_as_sequence*/
+	0,			/*tp_as_mapping*/
+	0,			/*tp_hash*/
+	0,			/*tp_call*/
+	0,			/*tp_str*/
+	0,			/*tp_getattro*/
+	0,			/*tp_setattro*/
+	0,			/*tp_as_buffer*/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+	0,			/*tp_doc*/
+	0,			/*tp_traverse*/
+	0,			/*tp_clear*/
+	null_richcompare,	/*tp_richcompare*/
+	0,			/*tp_weaklistoffset*/
+	0,			/*tp_iter*/
+	0,			/*tp_iternext*/
+	0,			/*tp_methods*/
+	0,			/*tp_members*/
+	0,			/*tp_getset*/
+	0, /* see initxx */	/*tp_base*/
+	0,			/*tp_dict*/
+	0,			/*tp_descr_get*/
+	0,			/*tp_descr_set*/
+	0,			/*tp_dictoffset*/
+	0,			/*tp_init*/
+	0,			/*tp_alloc*/
+	0, /* see initxx */	/*tp_new*/
+	0,			/*tp_free*/
+	0,			/*tp_is_gc*/
+};
+
+
+/* ---------- */
+
+
+/* List of functions defined in the module */
+
+static PyMethodDef xx_methods[] = {
+	{"roj",		xx_roj,		METH_VARARGS,
+		PyDoc_STR("roj(a,b) -> None")},
+	{"foo",		xx_foo,		METH_VARARGS,
+	 	xx_foo_doc},
+	{"new",		xx_new,		METH_VARARGS,
+		PyDoc_STR("new() -> new Xx object")},
+	{"bug",		xx_bug,		METH_VARARGS,
+		PyDoc_STR("bug(o) -> None")},
+	{NULL,		NULL}		/* sentinel */
+};
+
+PyDoc_STRVAR(module_doc,
+"This is a template module just for instruction.");
+
+/* Initialization function for the module (*must* be called initxx) */
+
+PyMODINIT_FUNC
+initxx(void)
+{
+	PyObject *m;
+
+	/* Due to cross platform compiler issues the slots must be filled
+	 * here. It's required for portability to Windows without requiring
+	 * C++. */
+	Null_Type.tp_base = &PyBaseObject_Type;
+	Null_Type.tp_new = PyType_GenericNew;
+	Str_Type.tp_base = &PyUnicode_Type;
+
+	/* Finalize the type object including setting type of the new type
+	 * object; doing it here is required for portability, too. */
+	if (PyType_Ready(&Xxo_Type) < 0)
+		return;
+
+	/* Create the module and add the functions */
+	m = Py_InitModule3("xx", xx_methods, module_doc);
+	if (m == NULL)
+		return;
+
+	/* Add some symbolic constants to the module */
+	if (ErrorObject == NULL) {
+		ErrorObject = PyErr_NewException("xx.error", NULL, NULL);
+		if (ErrorObject == NULL)
+			return;
+	}
+	Py_INCREF(ErrorObject);
+	PyModule_AddObject(m, "error", ErrorObject);
+
+	/* Add Str */
+	if (PyType_Ready(&Str_Type) < 0)
+		return;
+	PyModule_AddObject(m, "Str", (PyObject *)&Str_Type);
+
+	/* Add Null */
+	if (PyType_Ready(&Null_Type) < 0)
+		return;
+	PyModule_AddObject(m, "Null", (PyObject *)&Null_Type);
+}

From 9b4f204172ebab821cb677c978625c2e2479de5e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 13 Mar 2010 13:10:52 -0500
Subject: [PATCH 2892/8469] removing the easy_install installation process --
 too much problem with sandboxing violations through easy_install

--HG--
branch : distribute
extra : rebase_source : e1528eb57170fd7dc5edf318eb56f0e7683c3332
---
 README.txt | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/README.txt b/README.txt
index 8e78bc885c..bd08477091 100755
--- a/README.txt
+++ b/README.txt
@@ -68,9 +68,8 @@ Installation Instructions
 
 Distribute is only released as a source distribution.
 
-It can be installed using easy_install or pip, and can be done so with the source
-tarball, the eggs distribution, or by using the ``distribute_setup.py`` script
-provided online.
+It can be installed using pip, and can be done so with the source tarball,
+or by using the ``distribute_setup.py`` script provided online.
 
 ``distribute_setup.py`` is the simplest and preferred way on all systems.
 
@@ -88,20 +87,13 @@ If your shell has the ``curl`` program you can do::
 
 Notice this file is also provided in the source release.
 
-easy_install or pip
-===================
+pip
+===
 
 Run easy_install or pip::
 
-    $ easy_install -U distribute
     $ pip install distribute
 
-If you want to install the latest dev version, you can also run::
-
-    $ easy_install -U distribute==dev
-
-This will get the latest development version at: http://bitbucket.org/tarek/distribute/get/0.6-maintenance.zip#egg=distribute-dev
-
 Source installation
 ===================
 
@@ -128,8 +120,6 @@ Distribute is installed in three steps:
 
 Distribute can be removed like this:
 
-- run ``easy_install -m Distribute``. This will remove the Distribute reference
-  from ``easy-install.pth``. Otherwise, edit the file and remove it yourself.
 - remove the ``distribute*.egg`` file located in your site-packages directory
 - remove the ``setuptools.pth`` file located in you site-packages directory
 - remove the easy_install script located in you ``sys.prefix/bin`` directory

From 90552b30f6c3938cb7a5953734a536fb0950ed9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sat, 13 Mar 2010 18:37:30 +0000
Subject: [PATCH 2893/8469] following Barry suggestion for test_build_ext (see
 #8107)

---
 tests/test_build_ext.py |   5 +-
 tests/xxmodule.c        | 379 ----------------------------------------
 2 files changed, 4 insertions(+), 380 deletions(-)
 delete mode 100644 tests/xxmodule.c

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b6c521bf76..5ecfe15bff 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -18,7 +18,10 @@
 ALREADY_TESTED = False
 
 def _get_source_filename():
-    return os.path.join(os.path.dirname(__file__), 'xxmodule.c')
+    srcdir = sysconfig.get_config_var('srcdir')
+    if srcdir is None:
+        return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
diff --git a/tests/xxmodule.c b/tests/xxmodule.c
deleted file mode 100644
index 6b498dd6ca..0000000000
--- a/tests/xxmodule.c
+++ /dev/null
@@ -1,379 +0,0 @@
-
-/* Use this file as a template to start implementing a module that
-   also declares object types. All occurrences of 'Xxo' should be changed
-   to something reasonable for your objects. After that, all other
-   occurrences of 'xx' should be changed to something reasonable for your
-   module. If your module is named foo your sourcefile should be named
-   foomodule.c.
-
-   You will probably want to delete all references to 'x_attr' and add
-   your own types of attributes instead.  Maybe you want to name your
-   local variables other than 'self'.  If your object type is needed in
-   other files, you'll have to create a file "foobarobject.h"; see
-   intobject.h for an example. */
-
-/* Xxo objects */
-
-#include "Python.h"
-
-static PyObject *ErrorObject;
-
-typedef struct {
-	PyObject_HEAD
-	PyObject	*x_attr;	/* Attributes dictionary */
-} XxoObject;
-
-static PyTypeObject Xxo_Type;
-
-#define XxoObject_Check(v)	(Py_TYPE(v) == &Xxo_Type)
-
-static XxoObject *
-newXxoObject(PyObject *arg)
-{
-	XxoObject *self;
-	self = PyObject_New(XxoObject, &Xxo_Type);
-	if (self == NULL)
-		return NULL;
-	self->x_attr = NULL;
-	return self;
-}
-
-/* Xxo methods */
-
-static void
-Xxo_dealloc(XxoObject *self)
-{
-	Py_XDECREF(self->x_attr);
-	PyObject_Del(self);
-}
-
-static PyObject *
-Xxo_demo(XxoObject *self, PyObject *args)
-{
-	if (!PyArg_ParseTuple(args, ":demo"))
-		return NULL;
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-static PyMethodDef Xxo_methods[] = {
-	{"demo",	(PyCFunction)Xxo_demo,	METH_VARARGS,
-		PyDoc_STR("demo() -> None")},
-	{NULL,		NULL}		/* sentinel */
-};
-
-static PyObject *
-Xxo_getattr(XxoObject *self, char *name)
-{
-	if (self->x_attr != NULL) {
-		PyObject *v = PyDict_GetItemString(self->x_attr, name);
-		if (v != NULL) {
-			Py_INCREF(v);
-			return v;
-		}
-	}
-	return Py_FindMethod(Xxo_methods, (PyObject *)self, name);
-}
-
-static int
-Xxo_setattr(XxoObject *self, char *name, PyObject *v)
-{
-	if (self->x_attr == NULL) {
-		self->x_attr = PyDict_New();
-		if (self->x_attr == NULL)
-			return -1;
-	}
-	if (v == NULL) {
-		int rv = PyDict_DelItemString(self->x_attr, name);
-		if (rv < 0)
-			PyErr_SetString(PyExc_AttributeError,
-			        "delete non-existing Xxo attribute");
-		return rv;
-	}
-	else
-		return PyDict_SetItemString(self->x_attr, name, v);
-}
-
-static PyTypeObject Xxo_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Xxo",		/*tp_name*/
-	sizeof(XxoObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	(destructor)Xxo_dealloc, /*tp_dealloc*/
-	0,			/*tp_print*/
-	(getattrfunc)Xxo_getattr, /*tp_getattr*/
-	(setattrfunc)Xxo_setattr, /*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        0,                      /*tp_getattro*/
-        0,                      /*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        0,                      /*tp_methods*/
-        0,                      /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,                      /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        0,                      /*tp_alloc*/
-        0,                      /*tp_new*/
-        0,                      /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-/* --------------------------------------------------------------------- */
-
-/* Function of two integers returning integer */
-
-PyDoc_STRVAR(xx_foo_doc,
-"foo(i,j)\n\
-\n\
-Return the sum of i and j.");
-
-static PyObject *
-xx_foo(PyObject *self, PyObject *args)
-{
-	long i, j;
-	long res;
-	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
-		return NULL;
-	res = i+j; /* XXX Do something here */
-	return PyInt_FromLong(res);
-}
-
-
-/* Function of no arguments returning new Xxo object */
-
-static PyObject *
-xx_new(PyObject *self, PyObject *args)
-{
-	XxoObject *rv;
-
-	if (!PyArg_ParseTuple(args, ":new"))
-		return NULL;
-	rv = newXxoObject(args);
-	if (rv == NULL)
-		return NULL;
-	return (PyObject *)rv;
-}
-
-/* Example with subtle bug from extensions manual ("Thin Ice"). */
-
-static PyObject *
-xx_bug(PyObject *self, PyObject *args)
-{
-	PyObject *list, *item;
-
-	if (!PyArg_ParseTuple(args, "O:bug", &list))
-		return NULL;
-
-	item = PyList_GetItem(list, 0);
-	/* Py_INCREF(item); */
-	PyList_SetItem(list, 1, PyInt_FromLong(0L));
-	PyObject_Print(item, stdout, 0);
-	printf("\n");
-	/* Py_DECREF(item); */
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-/* Test bad format character */
-
-static PyObject *
-xx_roj(PyObject *self, PyObject *args)
-{
-	PyObject *a;
-	long b;
-	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
-		return NULL;
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-
-/* ---------- */
-
-static PyTypeObject Str_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Str",		/*tp_name*/
-	0,			/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	0,			/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-	0,			/*tp_call*/
-	0,			/*tp_str*/
-	0,			/*tp_getattro*/
-	0,			/*tp_setattro*/
-	0,			/*tp_as_buffer*/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-	0,			/*tp_doc*/
-	0,			/*tp_traverse*/
-	0,			/*tp_clear*/
-	0,			/*tp_richcompare*/
-	0,			/*tp_weaklistoffset*/
-	0,			/*tp_iter*/
-	0,			/*tp_iternext*/
-	0,			/*tp_methods*/
-	0,			/*tp_members*/
-	0,			/*tp_getset*/
-	0, /* see initxx */	/*tp_base*/
-	0,			/*tp_dict*/
-	0,			/*tp_descr_get*/
-	0,			/*tp_descr_set*/
-	0,			/*tp_dictoffset*/
-	0,			/*tp_init*/
-	0,			/*tp_alloc*/
-	0,			/*tp_new*/
-	0,			/*tp_free*/
-	0,			/*tp_is_gc*/
-};
-
-/* ---------- */
-
-static PyObject *
-null_richcompare(PyObject *self, PyObject *other, int op)
-{
-	Py_INCREF(Py_NotImplemented);
-	return Py_NotImplemented;
-}
-
-static PyTypeObject Null_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Null",	/*tp_name*/
-	0,			/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	0,			/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-	0,			/*tp_call*/
-	0,			/*tp_str*/
-	0,			/*tp_getattro*/
-	0,			/*tp_setattro*/
-	0,			/*tp_as_buffer*/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-	0,			/*tp_doc*/
-	0,			/*tp_traverse*/
-	0,			/*tp_clear*/
-	null_richcompare,	/*tp_richcompare*/
-	0,			/*tp_weaklistoffset*/
-	0,			/*tp_iter*/
-	0,			/*tp_iternext*/
-	0,			/*tp_methods*/
-	0,			/*tp_members*/
-	0,			/*tp_getset*/
-	0, /* see initxx */	/*tp_base*/
-	0,			/*tp_dict*/
-	0,			/*tp_descr_get*/
-	0,			/*tp_descr_set*/
-	0,			/*tp_dictoffset*/
-	0,			/*tp_init*/
-	0,			/*tp_alloc*/
-	0, /* see initxx */	/*tp_new*/
-	0,			/*tp_free*/
-	0,			/*tp_is_gc*/
-};
-
-
-/* ---------- */
-
-
-/* List of functions defined in the module */
-
-static PyMethodDef xx_methods[] = {
-	{"roj",		xx_roj,		METH_VARARGS,
-		PyDoc_STR("roj(a,b) -> None")},
-	{"foo",		xx_foo,		METH_VARARGS,
-	 	xx_foo_doc},
-	{"new",		xx_new,		METH_VARARGS,
-		PyDoc_STR("new() -> new Xx object")},
-	{"bug",		xx_bug,		METH_VARARGS,
-		PyDoc_STR("bug(o) -> None")},
-	{NULL,		NULL}		/* sentinel */
-};
-
-PyDoc_STRVAR(module_doc,
-"This is a template module just for instruction.");
-
-/* Initialization function for the module (*must* be called initxx) */
-
-PyMODINIT_FUNC
-initxx(void)
-{
-	PyObject *m;
-
-	/* Due to cross platform compiler issues the slots must be filled
-	 * here. It's required for portability to Windows without requiring
-	 * C++. */
-	Null_Type.tp_base = &PyBaseObject_Type;
-	Null_Type.tp_new = PyType_GenericNew;
-	Str_Type.tp_base = &PyUnicode_Type;
-
-	/* Finalize the type object including setting type of the new type
-	 * object; doing it here is required for portability, too. */
-	if (PyType_Ready(&Xxo_Type) < 0)
-		return;
-
-	/* Create the module and add the functions */
-	m = Py_InitModule3("xx", xx_methods, module_doc);
-	if (m == NULL)
-		return;
-
-	/* Add some symbolic constants to the module */
-	if (ErrorObject == NULL) {
-		ErrorObject = PyErr_NewException("xx.error", NULL, NULL);
-		if (ErrorObject == NULL)
-			return;
-	}
-	Py_INCREF(ErrorObject);
-	PyModule_AddObject(m, "error", ErrorObject);
-
-	/* Add Str */
-	if (PyType_Ready(&Str_Type) < 0)
-		return;
-	PyModule_AddObject(m, "Str", (PyObject *)&Str_Type);
-
-	/* Add Null */
-	if (PyType_Ready(&Null_Type) < 0)
-		return;
-	PyModule_AddObject(m, "Null", (PyObject *)&Null_Type);
-}

From 38ae8ecbdc6a9f285a56add8c695b10b2786c679 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 13 Mar 2010 16:53:19 -0500
Subject: [PATCH 2894/8469] added the --no-find-links option

--HG--
branch : distribute
extra : rebase_source : fc2cbd4d369f7d5c77cae03e39354245b185cc60
---
 CHANGES.txt                           |  3 ++-
 docs/easy_install.txt                 |  5 +++++
 setuptools/command/easy_install.py    | 14 +++++++++++---
 setuptools/tests/test_easy_install.py | 25 +++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index eeab73c642..803045b6a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,7 +11,8 @@ CHANGES
 * Added indexsidebar.html into MANIFEST.in
 * Issue 108: Fixed TypeError with Python3.1
 * Issue 121: Fixed --help install command trying to actually install.
-* Issue 112: Added an os.makedirs so that Tarek's solution will work. 
+* Issue 112: Added an os.makedirs so that Tarek's solution will work.
+* Issue 133: Added --no-find-links to easy_install
 
 ------
 0.6.10
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 3e39b8111b..a469bb55a3 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -768,6 +768,11 @@ Command-Line Options
     package not being available locally, or due to the use of the ``--update``
     or ``-U`` option.
 
+``--no-find-links`` Blocks the addition of any link. (New in Distribute 0.6.11)
+    This is useful if you want to avoid adding links defined in a project
+    easy_install is installing (wether it's a requested project or a
+    dependency.). When used, ``--find-links`` is ignored.
+
 ``--delete-conflicting, -D`` (Removed in 0.6a11)
     (As of 0.6a11, this option is no longer necessary; please do not use it!)
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 366ac7bcf8..33b14bf7a1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -91,6 +91,8 @@ class easy_install(Command):
         ('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
         ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"),
         ('version', None, "print version information and exit"),
+        ('no-find-links', None,
+         "Don't load find-links defined in packages being installed")
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
@@ -112,6 +114,7 @@ def initialize_options(self):
         self.editable = self.no_deps = self.allow_hosts = None
         self.root = self.prefix = self.no_report = None
         self.version = None
+        self.no_find_links = None
 
         # Options not specifiable via command line
         self.package_index = None
@@ -153,6 +156,9 @@ def finalize_options(self):
         if self.script_dir is None:
             self.script_dir = self.install_dir
 
+        if self.no_find_links is None:
+            self.no_find_links = False
+
         # Let install_dir get set by install_lib command, which in turn
         # gets its info from the install command, and takes into account
         # --prefix and --home and all that other crud.
@@ -204,7 +210,8 @@ def finalize_options(self):
             self.find_links = []
         if self.local_snapshots_ok:
             self.package_index.scan_egg_links(self.shadow_path+sys.path)
-        self.package_index.add_find_links(self.find_links)
+        if not self.no_find_links:
+            self.package_index.add_find_links(self.find_links)
         self.set_undefined_options('install_lib', ('optimize','optimize'))
         if not isinstance(self.optimize,int):
             try:
@@ -229,7 +236,7 @@ def finalize_options(self):
         self.outputs = []
 
     def run(self):
-        if self.verbose<>self.distribution.verbose:
+        if self.verbose != self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
             for spec in self.args:
@@ -523,7 +530,8 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
-        if dist.has_metadata('dependency_links.txt'):
+        if (dist.has_metadata('dependency_links.txt') and
+            not self.no_find_links):
             self.package_index.add_find_links(
                 dist.get_metadata_lines('dependency_links.txt')
             )
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 95909ca766..6f660a1e11 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -90,3 +90,28 @@ def _parse_command_line(self):
             os.chdir(old_wd)
             shutil.rmtree(dir)
 
+    def test_no_find_links(self):
+        # new option '--no-find-links', that blocks find-links added at
+        # the project level
+        dist = Distribution()
+        cmd = easy_install(dist)
+        cmd.check_pth_processing = lambda : True
+        cmd.no_find_links = True
+        cmd.find_links = ['link1', 'link2']
+        cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
+        cmd.args = ['ok']
+        cmd.ensure_finalized()
+        self.assertEquals(cmd.package_index.scanned_urls, {})
+
+        # let's try without it (default behavior)
+        cmd = easy_install(dist)
+        cmd.check_pth_processing = lambda : True
+        cmd.find_links = ['link1', 'link2']
+        cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
+        cmd.args = ['ok']
+        cmd.ensure_finalized()
+        keys = cmd.package_index.scanned_urls.keys()
+        keys.sort()
+        self.assertEquals(keys, ['link1', 'link2'])
+
+

From 892006c7928c6f51cc81fa3238429b758f0cf719 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 14 Mar 2010 10:23:39 +0000
Subject: [PATCH 2895/8469] Merged revisions
 78018,78035-78040,78042-78043,78046,78048-78052,78054,78059,78075-78080 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78018 | georg.brandl | 2010-02-06 11:08:21 +0100 (Sa, 06 Feb 2010) | 1 line

  #7864: make deprecation notices a bit clearer.
........
  r78035 | georg.brandl | 2010-02-06 23:44:17 +0100 (Sa, 06 Feb 2010) | 1 line

  Fix duplicate import.
........
  r78036 | georg.brandl | 2010-02-06 23:49:47 +0100 (Sa, 06 Feb 2010) | 1 line

  Remove unused import.
........
  r78037 | georg.brandl | 2010-02-06 23:59:15 +0100 (Sa, 06 Feb 2010) | 1 line

  No need to assign the results of expressions used only for side effects.
........
  r78038 | georg.brandl | 2010-02-07 00:02:29 +0100 (So, 07 Feb 2010) | 1 line

  Add a missing import.
........
  r78039 | georg.brandl | 2010-02-07 00:06:24 +0100 (So, 07 Feb 2010) | 1 line

  Add missing imports.
........
  r78040 | georg.brandl | 2010-02-07 00:08:00 +0100 (So, 07 Feb 2010) | 1 line

  Fix a few UnboundLocalErrors in test_long.
........
  r78042 | georg.brandl | 2010-02-07 00:12:12 +0100 (So, 07 Feb 2010) | 1 line

  Add missing import.
........
  r78043 | georg.brandl | 2010-02-07 00:12:19 +0100 (So, 07 Feb 2010) | 1 line

  Remove duplicate test method.
........
  r78046 | georg.brandl | 2010-02-07 00:18:00 +0100 (So, 07 Feb 2010) | 1 line

  Fix various missing import/unbound name errors.
........
  r78048 | georg.brandl | 2010-02-07 00:23:45 +0100 (So, 07 Feb 2010) | 1 line

  We heard you like test failures so we put unbound locals in your test so that you can fail while you fail.
........
  r78049 | georg.brandl | 2010-02-07 00:33:33 +0100 (So, 07 Feb 2010) | 1 line

  Fix import/access for some identifiers.  _TestSharedCTypes does not seem to be executed?
........
  r78050 | georg.brandl | 2010-02-07 00:34:10 +0100 (So, 07 Feb 2010) | 1 line

  Fix more unbound locals in code paths that do not seem to be used.
........
  r78051 | georg.brandl | 2010-02-07 00:53:52 +0100 (So, 07 Feb 2010) | 1 line

  Add missing import when running these tests standalone.
........
  r78052 | georg.brandl | 2010-02-07 00:54:04 +0100 (So, 07 Feb 2010) | 1 line

  Add missing import when running these tests standalone.
........
  r78054 | georg.brandl | 2010-02-07 00:58:25 +0100 (So, 07 Feb 2010) | 1 line

  Add missing import.
........
  r78059 | georg.brandl | 2010-02-07 12:34:15 +0100 (So, 07 Feb 2010) | 1 line

  Use "regexp" consistently.
........
  r78075 | georg.brandl | 2010-02-07 13:16:12 +0100 (So, 07 Feb 2010) | 1 line

  Fix another duplicated test method.
........
  r78076 | georg.brandl | 2010-02-07 13:19:43 +0100 (So, 07 Feb 2010) | 1 line

  Fix wrong usage of "except X, Y:".
........
  r78077 | georg.brandl | 2010-02-07 13:25:50 +0100 (So, 07 Feb 2010) | 1 line

  Fix two redefined test methods.
........
  r78078 | georg.brandl | 2010-02-07 13:27:06 +0100 (So, 07 Feb 2010) | 1 line

  Fix a redefined test method.
........
  r78079 | georg.brandl | 2010-02-07 13:34:26 +0100 (So, 07 Feb 2010) | 1 line

  Add a minimal test for fnmatchcase().
........
  r78080 | georg.brandl | 2010-02-07 13:55:12 +0100 (So, 07 Feb 2010) | 1 line

  Remove duplicate test method.
........
---
 tests/test_bdist.py           | 4 +++-
 tests/test_bdist_dumb.py      | 4 +++-
 tests/test_bdist_msi.py       | 4 +++-
 tests/test_bdist_rpm.py       | 4 +++-
 tests/test_bdist_wininst.py   | 4 +++-
 tests/test_cmd.py             | 4 ++--
 tests/test_cygwinccompiler.py | 4 ++--
 tests/test_emxccompiler.py    | 4 ++--
 tests/test_sysconfig.py       | 1 +
 9 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index f2849a9756..29dcc7c8ba 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -5,6 +5,8 @@
 import tempfile
 import shutil
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
@@ -40,4 +42,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 5eaef2a9d7..746144bf5b 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -11,6 +11,8 @@
 except ImportError:
     zlib = None
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -100,4 +102,4 @@ def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index ba2d3e19c2..2b2d8542ee 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -2,6 +2,8 @@
 import unittest
 import sys
 
+from test.support import run_unittest
+
 from distutils.tests import support
 
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
@@ -20,4 +22,4 @@ def test_suite():
     return unittest.makeSuite(BDistMSITestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2aa257f7e6..1014e549af 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -6,6 +6,8 @@
 import tempfile
 import shutil
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
 from distutils.tests import support
@@ -122,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 9b1ba6d107..ffe413536c 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,6 +1,8 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
 
+from test.support import run_unittest
+
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
@@ -27,4 +29,4 @@ def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 55ae421d46..728652e2ca 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -124,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 4b95dfa3aa..374f392d61 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -6,7 +6,7 @@
 import warnings
 import sysconfig
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from test.support import captured_stdout
 
 from distutils import cygwinccompiler
@@ -109,4 +109,4 @@ def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
index 2176d641d0..1360f8297a 100644
--- a/tests/test_emxccompiler.py
+++ b/tests/test_emxccompiler.py
@@ -4,7 +4,7 @@
 import os
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from test.support import captured_stdout
 
 from distutils.emxccompiler import get_versions
@@ -30,4 +30,4 @@ def test_suite():
     return unittest.makeSuite(EmxCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index e7df803168..9496950f70 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,6 +2,7 @@
 import os
 import test
 import unittest
+import shutil
 
 from distutils import sysconfig
 from distutils.tests import support

From b99d0e8aefe94a718630cb6be3369e290a6ec060 Mon Sep 17 00:00:00 2001
From: Yannick Gingras <ygingras@ygingras.net>
Date: Mon, 15 Mar 2010 22:13:19 -0400
Subject: [PATCH 2896/8469] removed unsused imports

--HG--
branch : distribute
extra : rebase_source : 6c1870024a04c1b5393c85a5782809ef409c66a6
---
 setuptools/command/easy_install.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 33b14bf7a1..c96a43fd1e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -9,7 +9,7 @@
 
 __ http://peak.telecommunity.com/DevCenter/EasyInstall
 """
-import sys, os, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
+import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -18,7 +18,7 @@
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
     DistutilsError
 from setuptools.archive_util import unpack_archive
-from setuptools.package_index import PackageIndex, parse_bdist_wininst
+from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
 from pkg_resources import *

From dee0ec5d40f2be83be1596fd12dbdb9b5eb159d0 Mon Sep 17 00:00:00 2001
From: Yannick Gingras <ygingras@ygingras.net>
Date: Mon, 15 Mar 2010 22:24:45 -0400
Subject: [PATCH 2897/8469] updated links to the new location of the
 easy_install docs

--HG--
branch : distribute
extra : rebase_source : 9d757c4d6c0d0c0b14b381961af69907e079d0ce
---
 setuptools/command/easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c96a43fd1e..843c261c38 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -7,7 +7,8 @@
 packages.  For detailed documentation, see the accompanying EasyInstall.txt
 file, or visit the `EasyInstall home page`__.
 
-__ http://peak.telecommunity.com/DevCenter/EasyInstall
+__ http://packages.python.org/distribute/easy_install.html
+
 """
 import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
@@ -349,7 +350,7 @@ def cant_write_to_target(self):
 For information on other options, you may wish to consult the
 documentation at:
 
-  http://peak.telecommunity.com/EasyInstall.html
+  http://packages.python.org/distribute/easy_install.html
 
 Please make the appropriate changes for your system and try again.
 """
@@ -1084,7 +1085,7 @@ def no_default_version_msg(self):
 * You can set up the installation directory to support ".pth" files by
   using one of the approaches described here:
 
-  http://peak.telecommunity.com/EasyInstall.html#custom-installation-locations
+  http://packages.python.org/distribute/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again.""" % (
         self.install_dir, os.environ.get('PYTHONPATH','')

From ff3ee4aa6c6800d813162c09a58c6265c4675701 Mon Sep 17 00:00:00 2001
From: Yannick Gingras <ygingras@ygingras.net>
Date: Mon, 15 Mar 2010 22:41:40 -0400
Subject: [PATCH 2898/8469] fixed spelling typo

--HG--
branch : distribute
extra : rebase_source : 5ae197eeead6eae5f689f01ced730be068e8c64a
---
 setuptools/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d03d0bf08b..c8a631a04c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -19,7 +19,8 @@
 # a distribution with the same version.
 #
 # The distribute_setup script for instance, will check if this
-# attribute is present to decide wether to reinstall the package
+# attribute is present to decide whether to reinstall the package
+# or not.
 _distribute = True
 
 bootstrap_install_from = None

From 4b756caf706ee500a8b2fc334dd4d382188d57fa Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Tue, 16 Mar 2010 20:33:24 +0100
Subject: [PATCH 2899/8469] document the --user cli flag

--HG--
branch : distribute
extra : rebase_source : 5d5028ddde7b61624792d6670cd00f57d7ed8646
---
 CHANGES.txt           | 2 ++
 docs/easy_install.txt | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 803045b6a7..86ed052152 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,8 @@ CHANGES
 * Issue 121: Fixed --help install command trying to actually install.
 * Issue 112: Added an os.makedirs so that Tarek's solution will work.
 * Issue 133: Added --no-find-links to easy_install
+* Added easy_install --user
+* Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
 
 ------
 0.6.10
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index a469bb55a3..ab008a1d90 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -144,6 +144,10 @@ and Viewing Source Packages`_ below for more info.)::
 
     easy_install --editable --build-directory ~/projects SQLObject
 
+**Example 7**. (New in 0.6.11) Install a distribution within your home dir::
+
+    easy_install --user SQLAlchemy
+
 Easy Install accepts URLs, filenames, PyPI package names (i.e., ``distutils``
 "distribution" names), and package+version specifiers.  In each case, it will
 attempt to locate the latest available version that meets your criteria.
@@ -716,6 +720,10 @@ Command-Line Options
     versions of a package, but do not want to reset the version that will be
     run by scripts that are already installed.
 
+``--user`` (New in 0.6.11)
+    Use the the user-site-packages as specified in :pep:`370`
+    instead of the global site-packages.
+
 ``--always-copy, -a``   (New in 0.5a4)
     Copy all needed distributions to the installation directory, even if they
     are already present in a directory on sys.path.  In older versions of

From 1e0efd73526d8014b1eeb4e238f5a288fa0d75a7 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 18 Mar 2010 22:14:36 +0000
Subject: [PATCH 2900/8469] Bumping to 2.6.5 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 888dd54a6b..9e7ab903d2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.5rc2"
+__version__ = "2.6.5"
 #--end constants--

From ad8054f8a9cc39437ae2280e4b04e9a38eb8ed65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 19 Mar 2010 21:56:34 +0000
Subject: [PATCH 2901/8469] Fixed #2698 - now reads the compiler option when
 creating the compiler

---
 command/build_ext.py    | 2 +-
 tests/test_build_ext.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1596586499..bd61bc56f3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -310,7 +310,7 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-        self.compiler = new_compiler(compiler=None,
+        self.compiler = new_compiler(compiler=self.compiler,
                                      verbose=self.verbose,
                                      dry_run=self.dry_run,
                                      force=self.force)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index f992928d0a..b7cdc20aa4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -329,6 +329,7 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
+        cmd.compiler = None
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))

From 2fd59dc3b01d05c832ac667d16b3355315c35608 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 20 Mar 2010 20:47:27 +0000
Subject: [PATCH 2902/8469] version becomes 3.1.2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2e6a6fb634..6dca599fd6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.2rc1"
+__version__ = "3.1.2"
 #--end constants--

From 5db75ca65fe87f9aa02424394ac2c0dcc3ec1c7b Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 21 Mar 2010 11:50:17 +0000
Subject: [PATCH 2903/8469] No more deprecation warnings for
 distutils.sysconfig, following r78666. But when the "dl" module is available,
 it gives a py3k deprecation warning.

---
 tests/test_build_ext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4860c9bf24..f97ae1a7be 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -358,6 +358,9 @@ def test_setuptools_compat(self):
         import distutils.core, distutils.extension, distutils.command.build_ext
         saved_ext = distutils.extension.Extension
         try:
+            # on some platforms, it loads the deprecated "dl" module
+            test_support.import_module('setuptools_build_ext', deprecated=True)
+
             # theses import patch Distutils' Extension class
             from setuptools_build_ext import build_ext as setuptools_build_ext
             from setuptools_extension import Extension

From 0ad92a85f3a3c1fc73154c6e95c2d39d6e189ae2 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 1 Apr 2010 18:17:09 +0000
Subject: [PATCH 2904/8469] #7092: Fix some -3 warnings, and fix
 Lib/platform.py when the path contains a double-quote.

---
 command/build_ext.py | 2 +-
 util.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8248089fec..aeb6b744dc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -676,7 +676,7 @@ def get_ext_filename(self, ext_name):
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply(os.path.join, ext_path) + '_d' + so_ext
+            return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
 
     def get_export_symbols (self, ext):
diff --git a/util.py b/util.py
index 1a55f70894..994dd211be 100644
--- a/util.py
+++ b/util.py
@@ -206,7 +206,7 @@ def convert_path (pathname):
         paths.remove('.')
     if not paths:
         return os.curdir
-    return apply(os.path.join, paths)
+    return os.path.join(*paths)
 
 # convert_path ()
 

From fbd4a04bd57b59a25516e4d66f93b29219f3f51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 2 Apr 2010 21:14:04 +0000
Subject: [PATCH 2905/8469] removed the local copy of xxmodule, and skip only
 test_build_ext when xxmodule is not found, not the whole unittest

---
 tests/test_build_ext.py |  40 +++--
 tests/xxmodule.c        | 379 ----------------------------------------
 2 files changed, 21 insertions(+), 398 deletions(-)
 delete mode 100644 tests/xxmodule.c

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index f97ae1a7be..beb6d96c8b 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,15 +19,11 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
-    fallback_path = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
     if srcdir is None:
-        return fallback_path
-    locations = (srcdir, os.path.dirname(sys.executable))
-    for location in locations:
-        path = os.path.join(location, 'Modules', 'xxmodule.c')
-        if os.path.exists(path):
-            return path
-    return fallback_path
+        return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
+    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
+
+_XX_MODULE_PATH = _get_source_filename()
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
@@ -37,10 +33,24 @@ def setUp(self):
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
-        self.sys_path = sys.path[:]
-        sys.path.append(self.tmp_dir)
-        shutil.copy(_get_source_filename(), self.tmp_dir)
+        if os.path.exists(_XX_MODULE_PATH):
+            self.sys_path = sys.path[:]
+            sys.path.append(self.tmp_dir)
+            shutil.copy(_XX_MODULE_PATH, self.tmp_dir)
+
+    def tearDown(self):
+        # Get everything back to normal
+        if os.path.exists(_XX_MODULE_PATH):
+            test_support.unload('xx')
+            sys.path[:] = self.sys_path
+            # XXX on Windows the test leaves a directory
+            # with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or
+                                    sys.platform == 'cygwin')
+        super(BuildExtTestCase, self).tearDown()
 
+    @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
+                     'xxmodule.c not found')
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -83,14 +93,6 @@ def test_build_ext(self):
         self.assert_(isinstance(xx.Null(), xx.Null))
         self.assert_(isinstance(xx.Str(), xx.Str))
 
-    def tearDown(self):
-        # Get everything back to normal
-        test_support.unload('xx')
-        sys.path[:] = self.sys_path
-        # XXX on Windows the test leaves a directory with xx module in TEMP
-        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
-        super(BuildExtTestCase, self).tearDown()
-
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)
diff --git a/tests/xxmodule.c b/tests/xxmodule.c
deleted file mode 100644
index 6b498dd6ca..0000000000
--- a/tests/xxmodule.c
+++ /dev/null
@@ -1,379 +0,0 @@
-
-/* Use this file as a template to start implementing a module that
-   also declares object types. All occurrences of 'Xxo' should be changed
-   to something reasonable for your objects. After that, all other
-   occurrences of 'xx' should be changed to something reasonable for your
-   module. If your module is named foo your sourcefile should be named
-   foomodule.c.
-
-   You will probably want to delete all references to 'x_attr' and add
-   your own types of attributes instead.  Maybe you want to name your
-   local variables other than 'self'.  If your object type is needed in
-   other files, you'll have to create a file "foobarobject.h"; see
-   intobject.h for an example. */
-
-/* Xxo objects */
-
-#include "Python.h"
-
-static PyObject *ErrorObject;
-
-typedef struct {
-	PyObject_HEAD
-	PyObject	*x_attr;	/* Attributes dictionary */
-} XxoObject;
-
-static PyTypeObject Xxo_Type;
-
-#define XxoObject_Check(v)	(Py_TYPE(v) == &Xxo_Type)
-
-static XxoObject *
-newXxoObject(PyObject *arg)
-{
-	XxoObject *self;
-	self = PyObject_New(XxoObject, &Xxo_Type);
-	if (self == NULL)
-		return NULL;
-	self->x_attr = NULL;
-	return self;
-}
-
-/* Xxo methods */
-
-static void
-Xxo_dealloc(XxoObject *self)
-{
-	Py_XDECREF(self->x_attr);
-	PyObject_Del(self);
-}
-
-static PyObject *
-Xxo_demo(XxoObject *self, PyObject *args)
-{
-	if (!PyArg_ParseTuple(args, ":demo"))
-		return NULL;
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-static PyMethodDef Xxo_methods[] = {
-	{"demo",	(PyCFunction)Xxo_demo,	METH_VARARGS,
-		PyDoc_STR("demo() -> None")},
-	{NULL,		NULL}		/* sentinel */
-};
-
-static PyObject *
-Xxo_getattr(XxoObject *self, char *name)
-{
-	if (self->x_attr != NULL) {
-		PyObject *v = PyDict_GetItemString(self->x_attr, name);
-		if (v != NULL) {
-			Py_INCREF(v);
-			return v;
-		}
-	}
-	return Py_FindMethod(Xxo_methods, (PyObject *)self, name);
-}
-
-static int
-Xxo_setattr(XxoObject *self, char *name, PyObject *v)
-{
-	if (self->x_attr == NULL) {
-		self->x_attr = PyDict_New();
-		if (self->x_attr == NULL)
-			return -1;
-	}
-	if (v == NULL) {
-		int rv = PyDict_DelItemString(self->x_attr, name);
-		if (rv < 0)
-			PyErr_SetString(PyExc_AttributeError,
-			        "delete non-existing Xxo attribute");
-		return rv;
-	}
-	else
-		return PyDict_SetItemString(self->x_attr, name, v);
-}
-
-static PyTypeObject Xxo_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Xxo",		/*tp_name*/
-	sizeof(XxoObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	(destructor)Xxo_dealloc, /*tp_dealloc*/
-	0,			/*tp_print*/
-	(getattrfunc)Xxo_getattr, /*tp_getattr*/
-	(setattrfunc)Xxo_setattr, /*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        0,                      /*tp_getattro*/
-        0,                      /*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        0,                      /*tp_methods*/
-        0,                      /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,                      /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        0,                      /*tp_alloc*/
-        0,                      /*tp_new*/
-        0,                      /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-/* --------------------------------------------------------------------- */
-
-/* Function of two integers returning integer */
-
-PyDoc_STRVAR(xx_foo_doc,
-"foo(i,j)\n\
-\n\
-Return the sum of i and j.");
-
-static PyObject *
-xx_foo(PyObject *self, PyObject *args)
-{
-	long i, j;
-	long res;
-	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
-		return NULL;
-	res = i+j; /* XXX Do something here */
-	return PyInt_FromLong(res);
-}
-
-
-/* Function of no arguments returning new Xxo object */
-
-static PyObject *
-xx_new(PyObject *self, PyObject *args)
-{
-	XxoObject *rv;
-
-	if (!PyArg_ParseTuple(args, ":new"))
-		return NULL;
-	rv = newXxoObject(args);
-	if (rv == NULL)
-		return NULL;
-	return (PyObject *)rv;
-}
-
-/* Example with subtle bug from extensions manual ("Thin Ice"). */
-
-static PyObject *
-xx_bug(PyObject *self, PyObject *args)
-{
-	PyObject *list, *item;
-
-	if (!PyArg_ParseTuple(args, "O:bug", &list))
-		return NULL;
-
-	item = PyList_GetItem(list, 0);
-	/* Py_INCREF(item); */
-	PyList_SetItem(list, 1, PyInt_FromLong(0L));
-	PyObject_Print(item, stdout, 0);
-	printf("\n");
-	/* Py_DECREF(item); */
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-/* Test bad format character */
-
-static PyObject *
-xx_roj(PyObject *self, PyObject *args)
-{
-	PyObject *a;
-	long b;
-	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
-		return NULL;
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
-
-/* ---------- */
-
-static PyTypeObject Str_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Str",		/*tp_name*/
-	0,			/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	0,			/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-	0,			/*tp_call*/
-	0,			/*tp_str*/
-	0,			/*tp_getattro*/
-	0,			/*tp_setattro*/
-	0,			/*tp_as_buffer*/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-	0,			/*tp_doc*/
-	0,			/*tp_traverse*/
-	0,			/*tp_clear*/
-	0,			/*tp_richcompare*/
-	0,			/*tp_weaklistoffset*/
-	0,			/*tp_iter*/
-	0,			/*tp_iternext*/
-	0,			/*tp_methods*/
-	0,			/*tp_members*/
-	0,			/*tp_getset*/
-	0, /* see initxx */	/*tp_base*/
-	0,			/*tp_dict*/
-	0,			/*tp_descr_get*/
-	0,			/*tp_descr_set*/
-	0,			/*tp_dictoffset*/
-	0,			/*tp_init*/
-	0,			/*tp_alloc*/
-	0,			/*tp_new*/
-	0,			/*tp_free*/
-	0,			/*tp_is_gc*/
-};
-
-/* ---------- */
-
-static PyObject *
-null_richcompare(PyObject *self, PyObject *other, int op)
-{
-	Py_INCREF(Py_NotImplemented);
-	return Py_NotImplemented;
-}
-
-static PyTypeObject Null_Type = {
-	/* The ob_type field must be initialized in the module init function
-	 * to be portable to Windows without using C++. */
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"xxmodule.Null",	/*tp_name*/
-	0,			/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	0,			/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-	0,			/*tp_call*/
-	0,			/*tp_str*/
-	0,			/*tp_getattro*/
-	0,			/*tp_setattro*/
-	0,			/*tp_as_buffer*/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-	0,			/*tp_doc*/
-	0,			/*tp_traverse*/
-	0,			/*tp_clear*/
-	null_richcompare,	/*tp_richcompare*/
-	0,			/*tp_weaklistoffset*/
-	0,			/*tp_iter*/
-	0,			/*tp_iternext*/
-	0,			/*tp_methods*/
-	0,			/*tp_members*/
-	0,			/*tp_getset*/
-	0, /* see initxx */	/*tp_base*/
-	0,			/*tp_dict*/
-	0,			/*tp_descr_get*/
-	0,			/*tp_descr_set*/
-	0,			/*tp_dictoffset*/
-	0,			/*tp_init*/
-	0,			/*tp_alloc*/
-	0, /* see initxx */	/*tp_new*/
-	0,			/*tp_free*/
-	0,			/*tp_is_gc*/
-};
-
-
-/* ---------- */
-
-
-/* List of functions defined in the module */
-
-static PyMethodDef xx_methods[] = {
-	{"roj",		xx_roj,		METH_VARARGS,
-		PyDoc_STR("roj(a,b) -> None")},
-	{"foo",		xx_foo,		METH_VARARGS,
-	 	xx_foo_doc},
-	{"new",		xx_new,		METH_VARARGS,
-		PyDoc_STR("new() -> new Xx object")},
-	{"bug",		xx_bug,		METH_VARARGS,
-		PyDoc_STR("bug(o) -> None")},
-	{NULL,		NULL}		/* sentinel */
-};
-
-PyDoc_STRVAR(module_doc,
-"This is a template module just for instruction.");
-
-/* Initialization function for the module (*must* be called initxx) */
-
-PyMODINIT_FUNC
-initxx(void)
-{
-	PyObject *m;
-
-	/* Due to cross platform compiler issues the slots must be filled
-	 * here. It's required for portability to Windows without requiring
-	 * C++. */
-	Null_Type.tp_base = &PyBaseObject_Type;
-	Null_Type.tp_new = PyType_GenericNew;
-	Str_Type.tp_base = &PyUnicode_Type;
-
-	/* Finalize the type object including setting type of the new type
-	 * object; doing it here is required for portability, too. */
-	if (PyType_Ready(&Xxo_Type) < 0)
-		return;
-
-	/* Create the module and add the functions */
-	m = Py_InitModule3("xx", xx_methods, module_doc);
-	if (m == NULL)
-		return;
-
-	/* Add some symbolic constants to the module */
-	if (ErrorObject == NULL) {
-		ErrorObject = PyErr_NewException("xx.error", NULL, NULL);
-		if (ErrorObject == NULL)
-			return;
-	}
-	Py_INCREF(ErrorObject);
-	PyModule_AddObject(m, "error", ErrorObject);
-
-	/* Add Str */
-	if (PyType_Ready(&Str_Type) < 0)
-		return;
-	PyModule_AddObject(m, "Str", (PyObject *)&Str_Type);
-
-	/* Add Null */
-	if (PyType_Ready(&Null_Type) < 0)
-		return;
-	PyModule_AddObject(m, "Null", (PyObject *)&Null_Type);
-}

From 147849f8190ccae1b36126562b12e04fe4d58a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 2 Apr 2010 21:24:55 +0000
Subject: [PATCH 2906/8469] Merged revisions 79618 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79618 | tarek.ziade | 2010-04-02 23:14:04 +0200 (Fri, 02 Apr 2010) | 1 line

  removed the local copy of xxmodule, and skip only test_build_ext when xxmodule is not found, not the whole unittest
........
---
 tests/test_build_ext.py | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d09718366d..aca2be2180 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -25,19 +25,23 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
+    if srcdir is None:
+        return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-class BuildExtTestCase(TempdirManager,
-                       LoggingSilencer,
-                       unittest.TestCase):
+_XX_MODULE_PATH = _get_source_filename()
+
+class BuildExtTestCase(TempdirManager, LoggingSilencer, unittest.TestCase):
+
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path, sys.path[:]
-        sys.path.append(self.tmp_dir)
-        shutil.copy(_get_source_filename(), self.tmp_dir)
+        if os.path.exists(_XX_MODULE_PATH):
+            self.sys_path = sys.path[:]
+            sys.path.append(self.tmp_dir)
+            shutil.copy(_XX_MODULE_PATH, self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -45,6 +49,19 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
+    def tearDown(self):
+        # Get everything back to normal
+        if os.path.exists(_XX_MODULE_PATH):
+            test_support.unload('xx')
+            sys.path[:] = self.sys_path
+            # XXX on Windows the test leaves a directory
+            # with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or
+                                    sys.platform == 'cygwin')
+        super(BuildExtTestCase, self).tearDown()
+
+    @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
+                     'xxmodule.c not found')
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -87,18 +104,6 @@ def test_build_ext(self):
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 
-    def tearDown(self):
-        # Get everything back to normal
-        support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
-        if sys.version > "2.6":
-            import site
-            site.USER_BASE = self.old_user_base
-            from distutils.command import build_ext
-            build_ext.USER_BASE = self.old_user_base
-        super(BuildExtTestCase, self).tearDown()
-
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)

From 7b1cf0becdb877baafa3aa1ce8af17ac4c1ad0f7 Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian.curtin@gmail.com>
Date: Fri, 2 Apr 2010 22:38:52 +0000
Subject: [PATCH 2907/8469] Change test_support to support. Fixes a failing
 test on Windows.

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index aca2be2180..e41a824fde 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -52,7 +52,7 @@ def setUp(self):
     def tearDown(self):
         # Get everything back to normal
         if os.path.exists(_XX_MODULE_PATH):
-            test_support.unload('xx')
+            support.unload('xx')
             sys.path[:] = self.sys_path
             # XXX on Windows the test leaves a directory
             # with xx module in TEMP

From 53b099f959636719525be988ee6e4a653f2d748f Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Apr 2010 21:54:35 +0200
Subject: [PATCH 2908/8469]  auth=b'Basic ' will throw a SyntaxError on 2.5

--HG--
branch : distribute
extra : rebase_source : cbac0260bc300fc00ce3517ecd96d5bedc5cd896
---
 setuptools/command/upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index e961a0df18..381ba1df4a 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -92,7 +92,7 @@ def upload_file(self, filename):
         try:  # base64 only works with bytes in Python 3.
             encoded_creds = base64.encodebytes(credentials.encode('utf8'))
             auth = b"Basic "
-        except AttributeError:
+        except (AttributeError, SyntaxError):
             encoded_creds = base64.encodestring(credentials)
             auth = "Basic "
         auth += encoded_creds.strip()

From 4c4b93069581da0279ef1b037367592040a25532 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Apr 2010 22:18:39 +0200
Subject: [PATCH 2909/8469] proper fix to avoid a syntax error on 2.5

--HG--
branch : distribute
extra : rebase_source : 320da069dcb5d4c3ffb94e6e4f0e78a1bef8a305
---
 setuptools/command/upload_docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 381ba1df4a..176862651e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -91,8 +91,8 @@ def upload_file(self, filename):
         credentials = self.username + ':' + self.password
         try:  # base64 only works with bytes in Python 3.
             encoded_creds = base64.encodebytes(credentials.encode('utf8'))
-            auth = b"Basic "
-        except (AttributeError, SyntaxError):
+            auth = bytes("Basic ")
+        except AttributeError:
             encoded_creds = base64.encodestring(credentials)
             auth = "Basic "
         auth += encoded_creds.strip()

From 58ec0860c3fef3a4c1a3da60b8340a21420724bd Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Apr 2010 22:26:07 +0200
Subject: [PATCH 2910/8469] using a py3 marker instead of a try..except

--HG--
branch : distribute
extra : rebase_source : e3ccffb120f1fdaddfa0746c0a592d6fbaf0dcd1
---
 setuptools/command/upload_docs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 176862651e..ea2bad7e26 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -12,11 +12,14 @@
 import base64
 import urlparse
 import tempfile
+import sys
 
 from distutils import log
 from distutils.errors import DistutilsOptionError
 from distutils.command.upload import upload
 
+_IS_PYTHON3 = sys.version > '3'
+
 try:
     bytes
 except NameError:
@@ -89,10 +92,10 @@ def upload_file(self, filename):
         }
         # set up the authentication
         credentials = self.username + ':' + self.password
-        try:  # base64 only works with bytes in Python 3.
+        if _IS_PYTHON3:  # base64 only works with bytes in Python 3.
             encoded_creds = base64.encodebytes(credentials.encode('utf8'))
             auth = bytes("Basic ")
-        except AttributeError:
+        else:
             encoded_creds = base64.encodestring(credentials)
             auth = "Basic "
         auth += encoded_creds.strip()

From c8f35c14f32aa8c074530413600386bf0bd8b55e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Apr 2010 22:36:37 +0200
Subject: [PATCH 2911/8469] make sure site.USER_BASE is used only if python is
 >=2.6

--HG--
branch : distribute
extra : rebase_source : aece7b87a7f0b48949f2859fa2174bfa93b04048
---
 setuptools/command/easy_install.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5d29550d3c..975f70e4c6 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -142,8 +142,12 @@ def initialize_options(self):
         self.install_data = None
         self.install_base = None
         self.install_platbase = None
-        self.install_userbase = site.USER_BASE
-        self.install_usersite = site.USER_SITE
+        if HAS_USER_SITE:
+            self.install_userbase = site.USER_BASE
+            self.install_usersite = site.USER_SITE
+        else:
+            self.install_userbase = None
+            self.install_usersite = None
         self.no_find_links = None
 
         # Options not specifiable via command line
@@ -201,7 +205,7 @@ def finalize_options(self):
 
         # fix the install_dir if "--user" was used
         #XXX: duplicate of the code in the setup command
-        if self.user:
+        if self.user and HAS_USER_SITE:
             self.create_home_path()
             if self.install_userbase is None:
                 raise DistutilsPlatformError(
@@ -214,7 +218,7 @@ def finalize_options(self):
 
         self.expand_basedirs()
         self.expand_dirs()
-        
+
         self._expand('install_dir','script_dir','build_directory','site_dirs')
         # If a non-default installation directory was specified, default the
         # script directory to match it.

From 4da7cdd3ea61af90e56e0cbe63811b8ef13cd484 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 5 Apr 2010 22:59:48 +0200
Subject: [PATCH 2912/8469] Removed spurious UserWarnings. Fixes #134

--HG--
branch : distribute
extra : rebase_source : be9d958a083e556228597d044267d7e15a826649
---
 CHANGES.txt      | 1 +
 pkg_resources.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 86ed052152..8907fa2277 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@ CHANGES
 * Issue 133: Added --no-find-links to easy_install
 * Added easy_install --user
 * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
+* Issue 134: removed spurious UserWarnings. Patch by VanLindberg
 
 ------
 0.6.10
diff --git a/pkg_resources.py b/pkg_resources.py
index f31789e9e9..6d96f5c22b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2332,7 +2332,8 @@ def check_version_conflict(self):
             if modname in ('pkg_resources', 'setuptools', 'site'):
                 continue
             fn = getattr(sys.modules[modname], '__file__', None)
-            if fn and normalize_path(fn).startswith(loc):
+            if fn and (normalize_path(fn).startswith(loc) or
+                       fn.startswith(self.location)):
                 continue
             issue_warning(
                 "Module %s was already imported from %s, but %s is being added"

From 4331740bfbdc6e148808375c406dab795ae43d9b Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 7 Apr 2010 10:00:46 +0200
Subject: [PATCH 2913/8469] make sure we test that the directory exists before
 we install stuff asked by setup_requires fixes #138

--HG--
branch : distribute
extra : rebase_source : 1078501b886e4f0864b4ce84517b2fbc5399da35
---
 CHANGES.txt                        |  1 +
 setuptools/command/easy_install.py |  4 +++-
 setuptools/tests/test_develop.py   | 21 +++++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8907fa2277..e74f1714ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@ CHANGES
 * Added easy_install --user
 * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
 * Issue 134: removed spurious UserWarnings. Patch by VanLindberg
+* Issue 138: cant_write_to_target error when setup_requires is used.
 
 ------
 0.6.10
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 975f70e4c6..2d85475513 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -462,7 +462,9 @@ def check_pth_processing(self):
         ok_exists = os.path.exists(ok_file)
         try:
             if ok_exists: os.unlink(ok_file)
-            os.makedirs(os.path.dirname(ok_file))
+            dirname = os.path.dirname(ok_file)
+            if not os.path.exists(dirname):
+                os.makedirs(dirname)
             f = open(pth_file,'w')
         except (OSError,IOError):
             self.cant_write_to_target()
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 10b2be9e73..a567dd5a74 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -6,6 +6,7 @@
 import site
 from StringIO import StringIO
 
+from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -18,7 +19,7 @@
 
 class TestDevelopTest(unittest.TestCase):
 
-    def setUp(self): 
+    def setUp(self):
         self.dir = tempfile.mkdtemp()
         setup = os.path.join(self.dir, 'setup.py')
         f = open(setup, 'w')
@@ -32,7 +33,7 @@ def setUp(self):
             self.old_site = site.USER_SITE
             site.USER_SITE = tempfile.mkdtemp()
 
-    def tearDown(self): 
+    def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         if sys.version >= "2.6":
@@ -63,3 +64,19 @@ def test_develop(self):
         content.sort()
         self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
 
+    def test_develop_with_setup_requires(self):
+
+        wanted = ("Could not find suitable distribution for "
+                  "Requirement.parse('I-DONT-EXIST')")
+        old_dir = os.getcwd()
+        os.chdir(self.dir)
+        try:
+            try:
+                dist = Distribution({'setup_requires': ['I_DONT_EXIST']})
+            except DistutilsError, e:
+                error = str(e)
+                if error ==  wanted:
+                    pass
+        finally:
+            os.chdir(old_dir)
+

From 4a4731eda22170a77bb24dd3c7fc8ff4cafecf9d Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 10 Apr 2010 16:22:05 +0000
Subject: [PATCH 2914/8469] bump version to 2.7b1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 0158996441..aa55cccb77 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7a4"
+__version__ = "2.7b1"
 #--end constants--

From ecfcbac59e57961b85a43bc7216ad4acd1797822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 12 Apr 2010 08:23:49 +0000
Subject: [PATCH 2915/8469] Fixed #8375 - test_distutils now checks what
 remains to be cleaned up during tearDown

---
 tests/support.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index d60da854be..45c94411ee 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -63,6 +63,8 @@ def tearDown(self):
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
+            if not os.path.exists(d):
+                continue
             shutil.rmtree(d, os.name in ('nt', 'cygwin'))
 
     def mkdtemp(self):

From b53fad8a9e4e807564d11db3ed5a75187e3e1f6c Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Thu, 29 Apr 2010 09:39:43 +0200
Subject: [PATCH 2916/8469] imply --user for install commands if installed in
 user-site

--HG--
branch : distribute
extra : rebase_source : 26878b87685bbd1b65c12763039a059937ca2228
---
 setuptools/command/easy_install.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2d85475513..7af42c6546 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -122,7 +122,13 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        self.user = 0
+        if HAS_USER_SITE:
+            whereami = os.path.abspath(__file__)
+            self.user = (whereami.startswith(site.USER_SITE)
+                         or whereami.startswith(site.USER_BASE))
+        else:
+            self.user = 0
+
         self.zip_ok = self.local_snapshots_ok = None
         self.install_dir = self.script_dir = self.exclude_scripts = None
         self.index_url = None

From 48467da45e5b9e8a9c91eccfba55a9f0d483debd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 30 Apr 2010 12:15:12 +0000
Subject: [PATCH 2917/8469] Fixed #8577. distutils.sysconfig.get_python_inc()
 now differenciates buildir and srcdir

---
 sysconfig.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 54ccec4953..bb53315bca 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -71,15 +71,19 @@ def get_python_inc(plat_specific=0, prefix=None):
     """
     if prefix is None:
         prefix = plat_specific and EXEC_PREFIX or PREFIX
+
     if os.name == "posix":
         if python_build:
-            base = os.path.dirname(os.path.abspath(sys.executable))
+            buildir = os.path.dirname(sys.executable)
             if plat_specific:
-                inc_dir = base
+                # python.h is located in the buildir
+                inc_dir = buildir
             else:
-                inc_dir = os.path.join(base, "Include")
-                if not os.path.exists(inc_dir):
-                    inc_dir = os.path.join(os.path.dirname(base), "Include")
+                # the source dir is relative to the buildir
+                srcdir = os.path.abspath(os.path.join(buildir,
+                                         get_config_var('srcdir')))
+                # Include is located in the srcdir
+                inc_dir = os.path.join(srcdir, "Include")
             return inc_dir
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":

From 8a6ec7a027bb2594b0e3c4f2499893a215cf2021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Fri, 30 Apr 2010 12:18:51 +0000
Subject: [PATCH 2918/8469] Merged revisions 80649 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80649 | tarek.ziade | 2010-04-30 14:15:12 +0200 (Fri, 30 Apr 2010) | 1 line

  Fixed #8577. distutils.sysconfig.get_python_inc() now differenciates buildir and srcdir
........
---
 sysconfig.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 54ccec4953..bb53315bca 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -71,15 +71,19 @@ def get_python_inc(plat_specific=0, prefix=None):
     """
     if prefix is None:
         prefix = plat_specific and EXEC_PREFIX or PREFIX
+
     if os.name == "posix":
         if python_build:
-            base = os.path.dirname(os.path.abspath(sys.executable))
+            buildir = os.path.dirname(sys.executable)
             if plat_specific:
-                inc_dir = base
+                # python.h is located in the buildir
+                inc_dir = buildir
             else:
-                inc_dir = os.path.join(base, "Include")
-                if not os.path.exists(inc_dir):
-                    inc_dir = os.path.join(os.path.dirname(base), "Include")
+                # the source dir is relative to the buildir
+                srcdir = os.path.abspath(os.path.join(buildir,
+                                         get_config_var('srcdir')))
+                # Include is located in the srcdir
+                inc_dir = os.path.join(srcdir, "Include")
             return inc_dir
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":

From f17c61c16afd4fd00634424511127c1086b39ef0 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Sun, 2 May 2010 22:46:54 +0200
Subject: [PATCH 2919/8469] add a partial test for user install umplication if
 installed in user-site

--HG--
branch : distribute
extra : rebase_source : 395e549d507def44d1b7a4454076bb84a47cc1eb
---
 setuptools/tests/test_easy_install.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f2655d750d..af2e94628a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -148,10 +148,12 @@ def setUp(self):
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
         if sys.version >= "2.6":
+            self.old_file = easy_install_pkg.__file__
             self.old_base = site.USER_BASE
             site.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
             site.USER_SITE = tempfile.mkdtemp()
+            easy_install_pkg.__file__ = site.USER_SITE
 
     def tearDown(self):
         os.chdir(self.old_cwd)
@@ -161,19 +163,21 @@ def tearDown(self):
             shutil.rmtree(site.USER_SITE)
             site.USER_BASE = self.old_base
             site.USER_SITE = self.old_site
+            easy_install_pkg.__file__ = self.old_file
 
     def test_install(self):
         #XXX: replace with something meaningfull
-        return
         if sys.version < "2.6":
-            return
+            return #SKIP
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = easy_install(dist)
-        cmd.user = 1
         cmd.args = ['py']
         cmd.ensure_finalized()
-        cmd.user = 1
+        self.assertTrue(cmd.user, 'user should be implied')
+
+        return
+        # this part is disabled it currently fails
         old_stdout = sys.stdout
         sys.stdout = StringIO()
         try:

From dd745deff5b10a162a986ed9e8c886b70a2f9d32 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 5 May 2010 19:09:31 +0000
Subject: [PATCH 2920/8469] In a number of places code still revers to
 "sys.platform == 'mac'" and that is dead code because it refers to a platform
 that is no longer supported (and hasn't been supported for several releases).

Fixes issue #7908 for the trunk.
---
 command/install.py | 14 --------------
 file_util.py       | 11 +----------
 sysconfig.py       | 17 -----------------
 util.py            |  9 ---------
 4 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/command/install.py b/command/install.py
index 44c76926ea..f1f3bd5c6f 100644
--- a/command/install.py
+++ b/command/install.py
@@ -69,20 +69,6 @@
         'scripts': '$userbase/Scripts',
         'data'   : '$userbase',
         },
-    'mac': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-    'mac_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
diff --git a/file_util.py b/file_util.py
index d8e8fd5f8d..b3d9d54ec0 100644
--- a/file_util.py
+++ b/file_util.py
@@ -133,18 +133,9 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     if dry_run:
         return (dst, 1)
 
-    # On Mac OS, use the native file copy routine
-    if os.name == 'mac':
-        import macostools
-        try:
-            macostools.copy(src, dst, 0, preserve_times)
-        except os.error, exc:
-            raise DistutilsFileError(
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc[-1]))
-
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
-    elif link == 'hard':
+    if link == 'hard':
         if not (os.path.exists(dst) and os.path.samefile(src, dst)):
             os.link(src, dst)
     elif link == 'sym':
diff --git a/sysconfig.py b/sysconfig.py
index bb53315bca..4d16b2674c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -88,11 +88,6 @@ def get_python_inc(plat_specific=0, prefix=None):
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
-    elif os.name == "mac":
-        if plat_specific:
-            return os.path.join(prefix, "Mac", "Include")
-        else:
-            return os.path.join(prefix, "Include")
     elif os.name == "os2":
         return os.path.join(prefix, "Include")
     else:
@@ -135,18 +130,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
 
-    elif os.name == "mac":
-        if plat_specific:
-            if standard_lib:
-                return os.path.join(prefix, "Lib", "lib-dynload")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-        else:
-            if standard_lib:
-                return os.path.join(prefix, "Lib")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-
     elif os.name == "os2":
         if standard_lib:
             return os.path.join(prefix, "Lib")
diff --git a/util.py b/util.py
index 994dd211be..b3ec6e9606 100644
--- a/util.py
+++ b/util.py
@@ -235,15 +235,6 @@ def change_root (new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
-    elif os.name == 'mac':
-        if not os.path.isabs(pathname):
-            return os.path.join(new_root, pathname)
-        else:
-            # Chop off volume name from start of path
-            elements = string.split(pathname, ":", 1)
-            pathname = ":" + elements[1]
-            return os.path.join(new_root, pathname)
-
     else:
         raise DistutilsPlatformError, \
               "nothing known about platform '%s'" % os.name

From fde15c22137823177d21001b7d4e302d4986791d Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 5 May 2010 19:11:21 +0000
Subject: [PATCH 2921/8469] Remove traces of MacOS9 support.

Fix for issue #7908
---
 command/install.py | 14 --------------
 file_util.py       |  9 ---------
 util.py            |  9 ---------
 3 files changed, 32 deletions(-)

diff --git a/command/install.py b/command/install.py
index 31d0387195..3c28c660ec 100644
--- a/command/install.py
+++ b/command/install.py
@@ -65,20 +65,6 @@
         'scripts': '$userbase/Scripts',
         'data'   : '$userbase',
         },
-    'mac': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-    'mac_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
diff --git a/file_util.py b/file_util.py
index 758bde38bf..3a71bfd1ac 100644
--- a/file_util.py
+++ b/file_util.py
@@ -132,15 +132,6 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     if dry_run:
         return (dst, 1)
 
-    # On Mac OS, use the native file copy routine
-    if os.name == 'mac':
-        import macostools
-        try:
-            macostools.copy(src, dst, 0, preserve_times)
-        except os.error as exc:
-            raise DistutilsFileError(
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
-
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
diff --git a/util.py b/util.py
index 8fd2ca077f..c8bf0064cd 100644
--- a/util.py
+++ b/util.py
@@ -91,15 +91,6 @@ def change_root(new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
-    elif os.name == 'mac':
-        if not os.path.isabs(pathname):
-            return os.path.join(new_root, pathname)
-        else:
-            # Chop off volume name from start of path
-            elements = pathname.split(":", 1)
-            pathname = ":" + elements[1]
-            return os.path.join(new_root, pathname)
-
     else:
         raise DistutilsPlatformError("nothing known about "
                                      "platform '%s'" % os.name)

From 3a9c591f47b69048b513e5654e5d98efe3f2365a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 16:50:18 +0200
Subject: [PATCH 2922/8469] respect the sys.dont_write_bytecode flag. Fixes
 #147

--HG--
branch : distribute
extra : rebase_source : 889c1badc92b1de14352a141865172b0a39384fa
---
 CHANGES.txt                        |  1 +
 setuptools/__init__.py             | 10 ++++++++--
 setuptools/command/easy_install.py |  6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e74f1714ae..9824beff46 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@ CHANGES
 * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
 * Issue 134: removed spurious UserWarnings. Patch by VanLindberg
 * Issue 138: cant_write_to_target error when setup_requires is used.
+* Issue 147: respect the sys.dont_write_bytecode flag
 
 ------
 0.6.10
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index c8a631a04c..9de373f98e 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -5,7 +5,8 @@
 from setuptools.depends import Require
 from distutils.core import Command as _Command
 from distutils.util import convert_path
-import os.path
+import os
+import sys
 
 __version__ = '0.6'
 __all__ = [
@@ -95,4 +96,9 @@ def findall(dir = os.curdir):
 import distutils.filelist
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
-
+# sys.dont_write_bytecode was introduced in Python 2.6.
+if ((hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode) or
+    (not hasattr(sys, "dont_write_bytecode") and os.environ.get("PYTHONDONTWRITEBYTECODE"))):
+    _dont_write_bytecode = True
+else:
+    _dont_write_bytecode = False
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7af42c6546..8aab6f1e4e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -12,7 +12,7 @@
 """
 import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
-from setuptools import Command
+from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
 from distutils.util import convert_path, subst_vars
@@ -1149,6 +1149,10 @@ def pf(src,dst):
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
+        if _dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
+
         from distutils.util import byte_compile
         try:
             # try to make the byte compile messages quieter

From 27acee722f7ef9dac177675866cd2f03361407a1 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 17:16:54 +0200
Subject: [PATCH 2923/8469] Added tag 0.6.11 for changeset e00987890c0b

--HG--
branch : distribute
extra : rebase_source : 1ddbe2d35b888a6f6d4ab05c55c5584536151d35
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c904a24ae2..f670ee9b4a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
 0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
 0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
 f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
+e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11

From 2f739b228bd633ac7281e8a2cc91eaf35212fe7a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 17:39:52 +0200
Subject: [PATCH 2924/8469] fixed the scp path

--HG--
branch : distribute
extra : rebase_source : ae8298b2d46787fcd9cf30dd987fdcd0a0a4cc43
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index cdcba01f81..fa1151c850 100755
--- a/release.sh
+++ b/release.sh
@@ -16,7 +16,7 @@ cd ..
 python2.6 setup.py upload_docs
 
 # pushing the bootstrap script
-scp distribute_setup.py ziade.org:nightly/build/
+scp distribute_setup.py ziade.org:websites/python-distribute.org/
 
 # starting the new dev
 hg push

From 43329058964f3021d997b8e2b35d3fec913e7692 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 17:47:03 +0200
Subject: [PATCH 2925/8469] starting 0.6.12

--HG--
branch : distribute
extra : rebase_source : 206e8a982bbd49a697579b98d6728a0a61bfd31c
---
 CHANGES.txt                          | 6 ++++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 3 ++-
 distribute_setup.py                  | 2 +-
 docs/conf.py                         | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9824beff46..b347ae9435 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.12
+------
+
+*
+
 ------
 0.6.11
 ------
diff --git a/README.txt b/README.txt
index bd08477091..dba817db2d 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.11.tar.gz
-    $ tar -xzvf distribute-0.6.11.tar.gz
-    $ cd distribute-0.6.11
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.12.tar.gz
+    $ tar -xzvf distribute-0.6.12.tar.gz
+    $ cd distribute-0.6.12
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..7ff3d25395 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,6 +8,7 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -32,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.4 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 3c23affa59..4f7bd08c01 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.11"
+DEFAULT_VERSION = "0.6.12"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 3991c73c5e..42a072fece 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.11'
+version = '0.6.12'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/release.sh b/release.sh
index fa1151c850..8388e9937e 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.11"
+export VERSION="0.6.12"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 064c2afd7a..43aa1540b1 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.11"
+VERSION = "0.6.12"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 3cd5038930832fce95fb41d20150e173eb9894b5 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 17:49:43 +0200
Subject: [PATCH 2926/8469] making sure all supported Python version are called
 when running tests refs #149

--HG--
branch : distribute
extra : rebase_source : eda59671622f85a9c2596572a959ea6b8fe75ed1
---
 distribute.egg-info/entry_points.txt | 3 +--
 test.sh                              | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 test.sh

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 7ff3d25395..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,7 +8,6 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
-upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -33,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.4 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000000..ac309dec7e
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,6 @@
+python2.3 setup.py test
+python2.4 setup.py test
+python2.5 setup.py test
+python2.6 setup.py test
+python3.1 setup.py test
+

From 6a6a261fa50522d77fba6d6345fb71ba9f00c311 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 18:10:32 +0200
Subject: [PATCH 2927/8469] make sure all tests passes on all python versions
 fixes #149

--HG--
branch : distribute
extra : rebase_source : 6288f4fcf65083b9d4ffb0ea8b35af44e699b4d5
---
 CHANGES.txt                           |  2 +-
 distribute.egg-info/entry_points.txt  |  3 ++-
 pkg_resources.py                      |  7 ++++---
 setuptools/command/install_scripts.py |  4 ++--
 setuptools/command/test.py            |  6 +++++-
 setuptools/command/upload_docs.py     |  6 +++++-
 setuptools/sandbox.py                 | 19 ++++++++++++-------
 setuptools/tests/test_easy_install.py | 10 +++++-----
 setuptools/tests/test_sandbox.py      | 11 +++++++----
 setuptools/tests/test_upload_docs.py  | 22 +++++++++++-----------
 10 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b347ae9435..eec6a3da2a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.12
 ------
 
-*
+* Issue 149: Fixed various failures on 2.3/2.4
 
 ------
 0.6.11
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..3b205225af 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,6 +8,7 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -32,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.3 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/pkg_resources.py b/pkg_resources.py
index 6d96f5c22b..6ec51fa06c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -191,9 +191,10 @@ def _macosx_vers(_cache=[]):
             import plistlib
             plist = '/System/Library/CoreServices/SystemVersion.plist'
             if os.path.exists(plist):
-                plist_content = plistlib.readPlist(plist)
-                if 'ProductVersion' in plist_content:
-                    version = plist_content['ProductVersion']
+                if hasattr(plistlib, 'readPlist'):
+                    plist_content = plistlib.readPlist(plist)
+                    if 'ProductVersion' in plist_content:
+                        version = plist_content['ProductVersion']
 
         _cache.append(version.split('.'))
     return _cache[0]
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index ac797883c7..6ce1b99319 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -12,8 +12,8 @@ def initialize_options(self):
         self.no_ep = False
 
     def run(self):
-        from setuptools.command.easy_install import (get_script_args,
-                                                     sys_executable)
+        from setuptools.command.easy_install import get_script_args
+        from setuptools.command.easy_install import sys_executable
 
         self.run_command("egg_info")
         if self.distribution.scripts:
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index b7aef9697a..0399f5bfe3 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -31,7 +31,11 @@ def loadTestsFromModule(self, module):
                         submodule = module.__name__+'.'+file
                     else:
                         continue
-                tests.append(self.loadTestsFromName(submodule))
+                try:
+                    tests.append(self.loadTestsFromName(submodule))
+                except Exception, e:
+                    import pdb; pdb.set_trace()
+                    self.loadTestsFromName(submodule)
 
         if len(tests)!=1:
             return self.suiteClass(tests)
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ea2bad7e26..213f7b588e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,7 +16,11 @@
 
 from distutils import log
 from distutils.errors import DistutilsOptionError
-from distutils.command.upload import upload
+
+try:
+    from distutils.command.upload import upload
+except ImportError:
+    from setuptools.command.upload import upload
 
 _IS_PYTHON3 = sys.version > '3'
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 630d5792b5..13cbe10978 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -152,13 +152,18 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
         )
 
 
-_EXCEPTIONS = [os.devnull,]
+if hasattr(os, 'devnull'):
+    _EXCEPTIONS = [os.devnull,]
+else:
+    _EXCEPTIONS = []
 
-try:
-	gen_py = os.path.dirname(__import__('win32com.gen_py', fromlist=['__name__']).__file__)
-	_EXCEPTIONS.append(gen_py)
-except ImportError:
-	pass
+if not sys.version < '2.5':
+    try:
+        gen_py = os.path.dirname(__import__('win32com.gen_py',
+                                            fromlist=['__name__']).__file__)
+        _EXCEPTIONS.append(gen_py)
+    except ImportError:
+        pass
 
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
@@ -204,7 +209,7 @@ def _ok(self,path):
 
     def _exempted(self, filepath):
         exception_matches = map(filepath.startswith, self._exceptions)
-        return any(exception_matches)
+        return False not in exception_matches
 
     def _remap_input(self,operation,path,*args,**kw):
         """Called for path inputs"""
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f2655d750d..e02798c628 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -122,19 +122,19 @@ def test_no_find_links(self):
 
 class TestPTHFileWriter(unittest.TestCase):
     def test_add_from_cwd_site_sets_dirty(self):
-        '''a pth file manager should set dirty 
+        '''a pth file manager should set dirty
         if a distribution is in site but also the cwd
         '''
         pth = PthDistributions('does-not_exist', [os.getcwd()])
-        self.assertFalse(pth.dirty)
+        self.assert_(not pth.dirty)
         pth.add(PRDistribution(os.getcwd()))
-        self.assertTrue(pth.dirty)
+        self.assert_(pth.dirty)
 
     def test_add_from_site_is_ignored(self):
         pth = PthDistributions('does-not_exist', ['/test/location/does-not-have-to-exist'])
-        self.assertFalse(pth.dirty)
+        self.assert_(not pth.dirty)
         pth.add(PRDistribution('/test/location/does-not-have-to-exist'))
-        self.assertFalse(pth.dirty)
+        self.assert_(not pth.dirty)
 
 
 class TestUserInstallTest(unittest.TestCase):
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 8b9e08e65d..1609ee861b 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -30,10 +30,11 @@ def tearDown(self):
         shutil.rmtree(self.dir)
 
     def test_devnull(self):
+        if sys.version < '2.4':
+            return
         sandbox = DirectorySandbox(self.dir)
         sandbox.run(self._file_writer(os.devnull))
 
-    @staticmethod
     def _file_writer(path):
         def do_write():
             f = open(path, 'w')
@@ -41,6 +42,7 @@ def do_write():
             f.close()
         return do_write
 
+    _file_writer = staticmethod(_file_writer)
 
     if has_win32com():
         def test_win32com(self):
@@ -53,9 +55,10 @@ def test_win32com(self):
             target = os.path.join(gen_py, 'test_write')
             sandbox = DirectorySandbox(self.dir)
             try:
-                sandbox.run(self._file_writer(target))
-            except SandboxViolation:
-                self.fail("Could not create gen_py file due to SandboxViolation")
+                try:
+                    sandbox.run(self._file_writer(target))
+                except SandboxViolation:
+                    self.fail("Could not create gen_py file due to SandboxViolation")
             finally:
                 if os.path.exists(target): os.remove(target)
 
diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 15db899f4f..8b2dc89220 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -19,24 +19,24 @@ def setUp(self):
         f.close()
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
-        
+
         self.upload_dir = os.path.join(self.dir, 'build')
         os.mkdir(self.upload_dir)
-        
+
         # A test document.
         f = open(os.path.join(self.upload_dir, 'index.html'), 'w')
         f.write("Hello world.")
         f.close()
-        
+
         # An empty folder.
         os.mkdir(os.path.join(self.upload_dir, 'empty'))
-        
+
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
             site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp()
             self.old_site = site.USER_SITE
             site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
-    
+
     def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
@@ -49,17 +49,17 @@ def tearDown(self):
     def test_create_zipfile(self):
         # Test to make sure zipfile creation handles common cases.
         # This explicitly includes a folder containing an empty folder.
-        
+
         dist = Distribution()
-        
+
         cmd = upload_docs(dist)
         cmd.upload_dir = self.upload_dir
         zip_file = cmd.create_zipfile()
-        
+
         assert zipfile.is_zipfile(zip_file)
-        
+
         zip_f = zipfile.ZipFile(zip_file) # woh...
-        
+
         assert zip_f.namelist() == ['index.html']
-        
+
 

From ec003ad49247813ba1fbbaed4a541c99cf0ac4f3 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 18:13:28 +0200
Subject: [PATCH 2928/8469] removed pdb

--HG--
branch : distribute
extra : rebase_source : 2f4a32416a6ac72579ecc6fc65e513f3d28e6b62
---
 setuptools/command/test.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 0399f5bfe3..b7aef9697a 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -31,11 +31,7 @@ def loadTestsFromModule(self, module):
                         submodule = module.__name__+'.'+file
                     else:
                         continue
-                try:
-                    tests.append(self.loadTestsFromName(submodule))
-                except Exception, e:
-                    import pdb; pdb.set_trace()
-                    self.loadTestsFromName(submodule)
+                tests.append(self.loadTestsFromName(submodule))
 
         if len(tests)!=1:
             return self.suiteClass(tests)

From 6695e537c69743d1ef1b0e2c62b7bc7734e66446 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 18:14:53 +0200
Subject: [PATCH 2929/8469] we want any(), not all()

--HG--
branch : distribute
extra : rebase_source : c740917424bbc5efdfb91360399f1f17a09ea3a1
---
 setuptools/sandbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 13cbe10978..c2f14e7fb3 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -209,7 +209,7 @@ def _ok(self,path):
 
     def _exempted(self, filepath):
         exception_matches = map(filepath.startswith, self._exceptions)
-        return False not in exception_matches
+        return True in exception_matches
 
     def _remap_input(self,operation,path,*args,**kw):
         """Called for path inputs"""

From 9b57c33a36e8350fb8ec0ebc619774e46d9f2292 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <none@none>
Date: Thu, 6 May 2010 20:25:31 +0200
Subject: [PATCH 2930/8469] Use assertTrue and assertFalse instead of
 deprecated failUnless and failIf.

--HG--
branch : distribute
extra : rebase_source : 51c527a19483fc1b11084e4d2770d88015588822
---
 setuptools/tests/__init__.py       | 64 +++++++++++++++---------------
 setuptools/tests/test_resources.py | 38 +++++++++---------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index f540103ec2..4fb382ca7b 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -94,21 +94,21 @@ def testRequire(self):
 
         from email import __version__
         self.assertEqual(req.get_version(), __version__)
-        self.failUnless(req.version_ok('1.0.9'))
-        self.failIf(req.version_ok('0.9.1'))
-        self.failIf(req.version_ok('unknown'))
+        self.assertTrue(req.version_ok('1.0.9'))
+        self.assertFalse(req.version_ok('0.9.1'))
+        self.assertFalse(req.version_ok('unknown'))
 
-        self.failUnless(req.is_present())
-        self.failUnless(req.is_current())
+        self.assertTrue(req.is_present())
+        self.assertTrue(req.is_current())
 
         req = Require('Email 3000','03000','email',format=LooseVersion)
-        self.failUnless(req.is_present())
-        self.failIf(req.is_current())
-        self.failIf(req.version_ok('unknown'))
+        self.assertTrue(req.is_present())
+        self.assertFalse(req.is_current())
+        self.assertFalse(req.version_ok('unknown'))
 
         req = Require('Do-what-I-mean','1.0','d-w-i-m')
-        self.failIf(req.is_present())
-        self.failIf(req.is_current())
+        self.assertFalse(req.is_present())
+        self.assertFalse(req.is_current())
 
         req = Require('Tests', None, 'tests', homepage="http://example.com")
         self.assertEqual(req.format, None)
@@ -118,8 +118,8 @@ def testRequire(self):
         self.assertEqual(req.homepage, 'http://example.com')
 
         paths = [os.path.dirname(p) for p in __path__]
-        self.failUnless(req.is_present(paths))
-        self.failUnless(req.is_current(paths))
+        self.assertTrue(req.is_present(paths))
+        self.assertTrue(req.is_current(paths))
 
 
 class DistroTests(TestCase):
@@ -137,7 +137,7 @@ def setUp(self):
 
 
     def testDistroType(self):
-        self.failUnless(isinstance(self.dist,setuptools.dist.Distribution))
+        self.assertTrue(isinstance(self.dist,setuptools.dist.Distribution))
 
 
     def testExcludePackage(self):
@@ -189,17 +189,17 @@ def testEmpty(self):
         dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
 
     def testContents(self):
-        self.failUnless(self.dist.has_contents_for('a'))
+        self.assertTrue(self.dist.has_contents_for('a'))
         self.dist.exclude_package('a')
-        self.failIf(self.dist.has_contents_for('a'))
+        self.assertFalse(self.dist.has_contents_for('a'))
 
-        self.failUnless(self.dist.has_contents_for('b'))
+        self.assertTrue(self.dist.has_contents_for('b'))
         self.dist.exclude_package('b')
-        self.failIf(self.dist.has_contents_for('b'))
+        self.assertFalse(self.dist.has_contents_for('b'))
 
-        self.failUnless(self.dist.has_contents_for('c'))
+        self.assertTrue(self.dist.has_contents_for('c'))
         self.dist.exclude_package('c')
-        self.failIf(self.dist.has_contents_for('c'))
+        self.assertFalse(self.dist.has_contents_for('c'))
 
 
 
@@ -269,12 +269,12 @@ def setUp(self):
         )
 
     def testDefaults(self):
-        self.failIf(
+        self.assertFalse(
             Feature(
                 "test",standard=True,remove='x',available=False
             ).include_by_default()
         )
-        self.failUnless(
+        self.assertTrue(
             Feature("test",standard=True,remove='x').include_by_default()
         )
         # Feature must have either kwargs, removes, or require_features
@@ -288,33 +288,33 @@ def testAvailability(self):
 
     def testFeatureOptions(self):
         dist = self.dist
-        self.failUnless(
+        self.assertTrue(
             ('with-dwim',None,'include DWIM') in dist.feature_options
         )
-        self.failUnless(
+        self.assertTrue(
             ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
         )
-        self.failUnless(
+        self.assertTrue(
             ('with-bar',None,'include bar (default)') in dist.feature_options
         )
-        self.failUnless(
+        self.assertTrue(
             ('without-bar',None,'exclude bar') in dist.feature_options
         )
         self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
         self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
         self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
-        self.failIf('without-baz' in dist.feature_negopt)
+        self.assertFalse('without-baz' in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist
         self.assertEqual(dist.with_foo,1)
         self.assertEqual(dist.with_bar,0)
         self.assertEqual(dist.with_baz,1)
-        self.failIf('bar_et' in dist.py_modules)
-        self.failIf('pkg.bar' in dist.packages)
-        self.failUnless('pkg.baz' in dist.packages)
-        self.failUnless('scripts/baz_it' in dist.scripts)
-        self.failUnless(('libfoo','foo/foofoo.c') in dist.libraries)
+        self.assertFalse('bar_et' in dist.py_modules)
+        self.assertFalse('pkg.bar' in dist.packages)
+        self.assertTrue('pkg.baz' in dist.packages)
+        self.assertTrue('scripts/baz_it' in dist.scripts)
+        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
         self.assertEqual(dist.ext_modules,[])
         self.assertEqual(dist.require_features, [self.req])
 
@@ -331,7 +331,7 @@ class TestCommandTests(TestCase):
 
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')
-        self.failUnless(isinstance(test_cmd, distutils.cmd.Command))
+        self.assertTrue(isinstance(test_cmd, distutils.cmd.Command))
 
     def testLongOptSuiteWNoDefault(self):
         ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite'])
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 5cb1baf004..c1dc488712 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -35,7 +35,7 @@ def testCollection(self):
         ad.add(Distribution.from_filename("FooPkg-1.2-py2.4.egg"))
 
         # Name is in there now
-        self.failUnless(ad['FooPkg'])
+        self.assertTrue(ad['FooPkg'])
         # But only 1 package
         self.assertEqual(list(ad), ['foopkg'])
 
@@ -218,7 +218,7 @@ def assertfields(self, ep):
         self.assertEqual(ep.module_name,"setuptools.tests.test_resources")
         self.assertEqual(ep.attrs, ("EntryPointTests",))
         self.assertEqual(ep.extras, ("x",))
-        self.failUnless(ep.load() is EntryPointTests)
+        self.assertTrue(ep.load() is EntryPointTests)
         self.assertEqual(
             str(ep),
             "foo = setuptools.tests.test_resources:EntryPointTests [x]"
@@ -318,20 +318,20 @@ def testBasicContains(self):
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11  = Distribution.from_filename("Twisted-1.1.egg")
         twist12  = Distribution.from_filename("Twisted-1.2.egg")
-        self.failUnless(parse_version('1.2') in r)
-        self.failUnless(parse_version('1.1') not in r)
-        self.failUnless('1.2' in r)
-        self.failUnless('1.1' not in r)
-        self.failUnless(foo_dist not in r)
-        self.failUnless(twist11 not in r)
-        self.failUnless(twist12 in r)
+        self.assertTrue(parse_version('1.2') in r)
+        self.assertTrue(parse_version('1.1') not in r)
+        self.assertTrue('1.2' in r)
+        self.assertTrue('1.1' not in r)
+        self.assertTrue(foo_dist not in r)
+        self.assertTrue(twist11 not in r)
+        self.assertTrue(twist12 in r)
 
     def testAdvancedContains(self):
         r, = parse_requirements("Foo>=1.2,<=1.3,==1.9,>2.0,!=2.5,<3.0,==4.5")
         for v in ('1.2','1.2.2','1.3','1.9','2.0.1','2.3','2.6','3.0c1','4.5'):
-            self.failUnless(v in r, (v,r))
+            self.assertTrue(v in r, (v,r))
         for v in ('1.2c1','1.3.1','1.5','1.9.1','2.0','2.5','3.0','4.0'):
-            self.failUnless(v not in r, (v,r))
+            self.assertTrue(v not in r, (v,r))
 
 
     def testOptionsAndHashing(self):
@@ -353,14 +353,14 @@ def testVersionEquality(self):
         r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.failIf(d("foo-0.3a4.egg") in r1)
-        self.failIf(d("foo-0.3a1.egg") in r1)
-        self.failIf(d("foo-0.3a4.egg") in r2)
+        self.assertFalse(d("foo-0.3a4.egg") in r1)
+        self.assertFalse(d("foo-0.3a1.egg") in r1)
+        self.assertFalse(d("foo-0.3a4.egg") in r2)
 
-        self.failUnless(d("foo-0.3a2.egg") in r1)
-        self.failUnless(d("foo-0.3a2.egg") in r2)
-        self.failUnless(d("foo-0.3a3.egg") in r2)
-        self.failUnless(d("foo-0.3a5.egg") in r2)
+        self.assertTrue(d("foo-0.3a2.egg") in r1)
+        self.assertTrue(d("foo-0.3a2.egg") in r2)
+        self.assertTrue(d("foo-0.3a3.egg") in r2)
+        self.assertTrue(d("foo-0.3a5.egg") in r2)
 
     def testDistributeSetuptoolsOverride(self):
         # Plain setuptools or distribute mean we return distribute.
@@ -480,7 +480,7 @@ def c(s1,s2):
     def testVersionOrdering(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            self.failUnless(p1<p2, (s1,s2,p1,p2))
+            self.assertTrue(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
         c('2a1','2b0')

From f87d68ef3b1c349dc40b4b3de9e3a2956bce934d Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 22:12:26 +0200
Subject: [PATCH 2931/8469] Added tag 0.6.12 for changeset 48a97bc89e2f

--HG--
branch : distribute
extra : rebase_source : bc9f626b135f1283d1860af008742d4fc9592cc0
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f670ee9b4a..eb90dab58c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -14,3 +14,4 @@ ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
 0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
 f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
 e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
+48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12

From de6e3bcc3c77bff17a6609b31bc1b6a9212bbd88 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 6 May 2010 23:14:00 +0200
Subject: [PATCH 2932/8469] raised the revision

--HG--
branch : distribute
extra : rebase_source : 294117170d32ada89385db57b12e25ab2fbb8523
---
 CHANGES.txt                          | 6 ++++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 3 +--
 distribute_setup.py                  | 2 +-
 docs/conf.py                         | 2 +-
 setup.py                             | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index eec6a3da2a..ad743ae7c7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.13
+------
+
+*
+
 ------
 0.6.12
 ------
diff --git a/README.txt b/README.txt
index dba817db2d..72d897e713 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.12.tar.gz
-    $ tar -xzvf distribute-0.6.12.tar.gz
-    $ cd distribute-0.6.12
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.13.tar.gz
+    $ tar -xzvf distribute-0.6.13.tar.gz
+    $ cd distribute-0.6.13
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 3b205225af..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,7 +8,6 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
-upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -33,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.3 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 4f7bd08c01..3cb043e24e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.12"
+DEFAULT_VERSION = "0.6.13"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 42a072fece..53614ed586 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.12'
+version = '0.6.13'
 # The full version, including alpha/beta/rc tags.
 release = '0.6.4'
 
diff --git a/setup.py b/setup.py
index 43aa1540b1..3ae40817ee 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.12"
+VERSION = "0.6.13"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 152c6fa220df3ce8c3f211d490bfe547b155b0e2 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 7 May 2010 00:03:18 +0200
Subject: [PATCH 2933/8469] account for the possibility that
 site.ENABLE_USER_SITE may be False

--HG--
branch : distribute
extra : rebase_source : 4f763cb0a4dd4cddef1df333a4ded2a2728fedcd
---
 setuptools/command/easy_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8aab6f1e4e..d68943faf3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -122,10 +122,9 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        if HAS_USER_SITE:
+        if HAS_USER_SITE and site.ENABLE_USER_SITE:
             whereami = os.path.abspath(__file__)
-            self.user = (whereami.startswith(site.USER_SITE)
-                         or whereami.startswith(site.USER_BASE))
+            self.user = whereami.startswith(site.USER_SITE)
         else:
             self.user = 0
 

From 7337895492390e5fc7b8573ebfa9f3b43d5af94b Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sat, 8 May 2010 08:44:37 +0000
Subject: [PATCH 2934/8469] Fix for issue #7724: make it possible to build
 using the OSX 10.4u SDK on MacOSX 10.6 by honoring the specified SDK when
 looking for files.

---
 unixccompiler.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 783d4dca84..ba831f7b57 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os, sys, re
 from types import StringType, NoneType
 
 from distutils import sysconfig
@@ -305,10 +305,29 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
+        if sys.platform == 'darwin':
+            # On OSX users can specify an alternate SDK using
+            # '-isysroot', calculate the SDK root if it is specified
+            # (and use it further on)
+            cflags = sysconfig.get_config_var('CFLAGS')
+            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            if m is None:
+                sysroot = '/'
+            else:
+                sysroot = m.group(1)
+
+
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+
+            if sys.platform == 'darwin' and (dir.startswith('/System/') or dir.startswith('/usr/')):
+                shared = os.path.join(sysroot, dir[1:], shared_f)
+                dylib = os.path.join(sysroot, dir[1:], dylib_f)
+                static = os.path.join(sysroot, dir[1:], static_f)
+
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From edfa9c8bc18c53f3fd81697b251f5f84726182a3 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 8 May 2010 15:23:57 +0000
Subject: [PATCH 2935/8469] Revert r80963 - it broke compilation everywhere

---
 unixccompiler.py | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index ba831f7b57..783d4dca84 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys, re
+import os, sys
 from types import StringType, NoneType
 
 from distutils import sysconfig
@@ -305,29 +305,10 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
-        if sys.platform == 'darwin':
-            # On OSX users can specify an alternate SDK using
-            # '-isysroot', calculate the SDK root if it is specified
-            # (and use it further on)
-            cflags = sysconfig.get_config_var('CFLAGS')
-            m = re.search(r'-isysroot\s+(\S+)', cflags)
-            if m is None:
-                sysroot = '/'
-            else:
-                sysroot = m.group(1)
-
-
-
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
-
-            if sys.platform == 'darwin' and (dir.startswith('/System/') or dir.startswith('/usr/')):
-                shared = os.path.join(sysroot, dir[1:], shared_f)
-                dylib = os.path.join(sysroot, dir[1:], dylib_f)
-                static = os.path.join(sysroot, dir[1:], static_f)
-
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From 5b183062b39a966eeac553886793c3eef3c706e7 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 8 May 2010 17:08:17 +0000
Subject: [PATCH 2936/8469] bump version to 2.7 beta 2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index aa55cccb77..5f401709cf 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7b1"
+__version__ = "2.7b2"
 #--end constants--

From 4353f3f6eaabc04859bcbd592c58df985bd2ad3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 May 2010 07:24:02 -1000
Subject: [PATCH 2937/8469] Fix for #151 - attribute error when gen_py doesn't
 have __init__ module

--HG--
branch : distribute
extra : rebase_source : 6d42ed6e7f4d1ab4500aa8a695ee64af6a3f63f8
---
 distribute.egg-info/entry_points.txt | 2 +-
 setuptools/sandbox.py                | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..9fd4175819 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 630d5792b5..b2ae991f17 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -155,9 +155,14 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
 _EXCEPTIONS = [os.devnull,]
 
 try:
-	gen_py = os.path.dirname(__import__('win32com.gen_py', fromlist=['__name__']).__file__)
-	_EXCEPTIONS.append(gen_py)
+	win32com_pkg = os.path.dirname(__import__('win32com').__file__)
+	gen_py_pkg = os.path.join(win32com_pkg, 'gen_py')
+	_EXCEPTIONS.append(gen_py_pkg)
 except ImportError:
+	# it appears pywin32 is not installed, so no need to exclude.
+	pass
+except AttributeError:
+	# unexpected error getting __file__ from win32com
 	pass
 
 class DirectorySandbox(AbstractSandbox):

From 50900e7b3129467091d7fb03a716755fcf0b0c52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 May 2010 11:01:24 -1000
Subject: [PATCH 2938/8469] Updated gen_py exception to use attribute of
 win32com rather than infer the location of gen_py

--HG--
branch : distribute
extra : rebase_source : 55f1f3c23dc20edf9c91ea223fc5762fda22f5b2
---
 setuptools/sandbox.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 37fc60af06..0d6724d177 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -158,14 +158,13 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
     _EXCEPTIONS = []
 
 try:
-	win32com_pkg = os.path.dirname(__import__('win32com').__file__)
-	gen_py_pkg = os.path.join(win32com_pkg, 'gen_py')
-	_EXCEPTIONS.append(gen_py_pkg)
+	import win32com
+	_EXCEPTIONS.append(win32com.__gen_path__)
 except ImportError:
 	# it appears pywin32 is not installed, so no need to exclude.
 	pass
 except AttributeError:
-	# unexpected error getting __file__ from win32com
+	# it appears __gen_path__ is not available, so fail silently
 	pass
 
 class DirectorySandbox(AbstractSandbox):

From 1569d2e22e7e7aa897eaa3ff1c9f2d7a2d5f581a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 May 2010 11:23:22 -1000
Subject: [PATCH 2939/8469] Found a public API method which is preferable to
 using the private attribute for ascertaining the location of the gen_py cache

--HG--
branch : distribute
extra : rebase_source : 6feed4430505ad2d2680b141d41dccb95d9e80af
---
 setuptools/sandbox.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 0d6724d177..a06d44837c 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -158,14 +158,12 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
     _EXCEPTIONS = []
 
 try:
-	import win32com
-	_EXCEPTIONS.append(win32com.__gen_path__)
+	from win32com.client.gencache import GetGeneratePath
+	_EXCEPTIONS.append(GetGeneratePath())
+	del GetGeneratePath
 except ImportError:
 	# it appears pywin32 is not installed, so no need to exclude.
 	pass
-except AttributeError:
-	# it appears __gen_path__ is not available, so fail silently
-	pass
 
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""

From f23648b7d06b99e8eadfc45a75a703927dd038e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 10:06:20 +0000
Subject: [PATCH 2940/8469] Fixed #8688: Distutils now recalculates MANIFEST
 everytime.

---
 command/sdist.py    | 82 ++++++++++++++-------------------------------
 tests/test_sdist.py | 41 +++++++++++++++++++++++
 2 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f1335e6a36..4cede72988 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -179,66 +179,34 @@ def get_file_list(self):
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
-        depends on the user's options and the state of the filesystem.
+        depends on the user's options.
         """
-        # If we have a manifest template, see if it's newer than the
-        # manifest; if so, we'll regenerate the manifest.
+        # new behavior:
+        # the file list is recalculated everytime because
+        # even if MANIFEST.in or setup.py are not changed
+        # the user might have added some files in the tree that
+        # need to be included.
+        #
+        #  This makes --force the default and only behavior.
         template_exists = os.path.isfile(self.template)
+        if not template_exists:
+            self.warn(("manifest template '%s' does not exist " +
+                        "(using default file list)") %
+                        self.template)
+        self.filelist.findall()
+
+        if self.use_defaults:
+            self.add_defaults()
+
         if template_exists:
-            template_newer = dep_util.newer(self.template, self.manifest)
-
-        # The contents of the manifest file almost certainly depend on the
-        # setup script as well as the manifest template -- so if the setup
-        # script is newer than the manifest, we'll regenerate the manifest
-        # from the template.  (Well, not quite: if we already have a
-        # manifest, but there's no template -- which will happen if the
-        # developer elects to generate a manifest some other way -- then we
-        # can't regenerate the manifest, so we don't.)
-        self.debug_print("checking if %s newer than %s" %
-                         (self.distribution.script_name, self.manifest))
-        setup_newer = dep_util.newer(self.distribution.script_name,
-                                     self.manifest)
-
-        # cases:
-        #   1) no manifest, template exists: generate manifest
-        #      (covered by 2a: no manifest == template newer)
-        #   2) manifest & template exist:
-        #      2a) template or setup script newer than manifest:
-        #          regenerate manifest
-        #      2b) manifest newer than both:
-        #          do nothing (unless --force or --manifest-only)
-        #   3) manifest exists, no template:
-        #      do nothing (unless --force or --manifest-only)
-        #   4) no manifest, no template: generate w/ warning ("defaults only")
-
-        manifest_outofdate = (template_exists and
-                              (template_newer or setup_newer))
-        force_regen = self.force_manifest or self.manifest_only
-        manifest_exists = os.path.isfile(self.manifest)
-        neither_exists = (not template_exists and not manifest_exists)
-
-        # Regenerate the manifest if necessary (or if explicitly told to)
-        if manifest_outofdate or neither_exists or force_regen:
-            if not template_exists:
-                self.warn(("manifest template '%s' does not exist " +
-                           "(using default file list)") %
-                          self.template)
-            self.filelist.findall()
-
-            if self.use_defaults:
-                self.add_defaults()
-            if template_exists:
-                self.read_template()
-            if self.prune:
-                self.prune_file_list()
-
-            self.filelist.sort()
-            self.filelist.remove_duplicates()
-            self.write_manifest()
-
-        # Don't regenerate the manifest, just read it in.
-        else:
-            self.read_manifest()
+            self.read_template()
+
+        if self.prune:
+            self.prune_file_list()
+
+        self.filelist.sort()
+        self.filelist.remove_duplicates()
+        self.write_manifest()
 
     def add_defaults(self):
         """Add all the default files to self.filelist:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 20b20aae0b..76f5b77471 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -346,6 +346,47 @@ def test_make_distribution_owner_group(self):
         finally:
             archive.close()
 
+    def test_get_file_list(self):
+        # make sure MANIFEST is recalculated
+        dist, cmd = self.get_cmd()
+
+        # filling data_files by pointing files in package_data
+        dist.package_data = {'somecode': ['*.txt']}
+        self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEquals(len(manifest), 4)
+
+        # adding a file
+        self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
+
+        # make sure build_py is reinitinialized, like a fresh run
+        build_py = dist.get_command_obj('build_py')
+        build_py.finalized = False
+        build_py.ensure_finalized()
+
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest2 = [line.strip() for line in f.read().split('\n')
+                         if line.strip() != '']
+        finally:
+            f.close()
+
+        # do we have the new file in MANIFEST ?
+        self.assertEquals(len(manifest2), 5)
+        self.assertIn('doc2.txt', manifest2[-1])
+
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From d27e915abdcc0ffa04c26e6eb7a9ea297fabffd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 10:26:15 +0000
Subject: [PATCH 2941/8469] Merged revisions 81255 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81255 | tarek.ziade | 2010-05-17 12:06:20 +0200 (Mon, 17 May 2010) | 1 line

  Fixed #8688: Distutils now recalculates MANIFEST everytime.
........
---
 command/sdist.py    | 83 ++++++++++++++-------------------------------
 tests/test_sdist.py | 62 +++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index a366d1eaf6..b93994d07f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -190,67 +190,34 @@ def get_file_list (self):
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
-        depends on the user's options and the state of the filesystem.
+        depends on the user's options.
         """
-
-        # If we have a manifest template, see if it's newer than the
-        # manifest; if so, we'll regenerate the manifest.
+        # new behavior:
+        # the file list is recalculated everytime because
+        # even if MANIFEST.in or setup.py are not changed
+        # the user might have added some files in the tree that
+        # need to be included.
+        #
+        #  This makes --force the default and only behavior.
         template_exists = os.path.isfile(self.template)
+        if not template_exists:
+            self.warn(("manifest template '%s' does not exist " +
+                        "(using default file list)") %
+                        self.template)
+        self.filelist.findall()
+
+        if self.use_defaults:
+            self.add_defaults()
+
         if template_exists:
-            template_newer = dep_util.newer(self.template, self.manifest)
-
-        # The contents of the manifest file almost certainly depend on the
-        # setup script as well as the manifest template -- so if the setup
-        # script is newer than the manifest, we'll regenerate the manifest
-        # from the template.  (Well, not quite: if we already have a
-        # manifest, but there's no template -- which will happen if the
-        # developer elects to generate a manifest some other way -- then we
-        # can't regenerate the manifest, so we don't.)
-        self.debug_print("checking if %s newer than %s" %
-                         (self.distribution.script_name, self.manifest))
-        setup_newer = dep_util.newer(self.distribution.script_name,
-                                     self.manifest)
-
-        # cases:
-        #   1) no manifest, template exists: generate manifest
-        #      (covered by 2a: no manifest == template newer)
-        #   2) manifest & template exist:
-        #      2a) template or setup script newer than manifest:
-        #          regenerate manifest
-        #      2b) manifest newer than both:
-        #          do nothing (unless --force or --manifest-only)
-        #   3) manifest exists, no template:
-        #      do nothing (unless --force or --manifest-only)
-        #   4) no manifest, no template: generate w/ warning ("defaults only")
-
-        manifest_outofdate = (template_exists and
-                              (template_newer or setup_newer))
-        force_regen = self.force_manifest or self.manifest_only
-        manifest_exists = os.path.isfile(self.manifest)
-        neither_exists = (not template_exists and not manifest_exists)
-
-        # Regenerate the manifest if necessary (or if explicitly told to)
-        if manifest_outofdate or neither_exists or force_regen:
-            if not template_exists:
-                self.warn(("manifest template '%s' does not exist " +
-                           "(using default file list)") %
-                          self.template)
-            self.filelist.findall()
-
-            if self.use_defaults:
-                self.add_defaults()
-            if template_exists:
-                self.read_template()
-            if self.prune:
-                self.prune_file_list()
-
-            self.filelist.sort()
-            self.filelist.remove_duplicates()
-            self.write_manifest()
-
-        # Don't regenerate the manifest, just read it in.
-        else:
-            self.read_manifest()
+            self.read_template()
+
+        if self.prune:
+            self.prune_file_list()
+
+        self.filelist.sort()
+        self.filelist.remove_duplicates()
+        self.write_manifest()
 
     # get_file_list ()
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index e322c1385c..6b8784ac3d 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,6 +29,7 @@ def setUp(self):
         super(sdistTestCase, self).setUp()
         self.old_path = os.getcwd()
         self.temp_pkg = os.path.join(self.mkdtemp(), 'temppkg')
+        self.tmp_dir = self.mkdtemp()
 
     def tearDown(self):
         os.chdir(self.old_path)
@@ -151,6 +152,67 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    def get_cmd(self, metadata=None):
+        """Returns a cmd"""
+        if metadata is None:
+            metadata = {'name': 'fake', 'version': '1.0',
+                        'url': 'xxx', 'author': 'xxx',
+                        'author_email': 'xxx'}
+        dist = Distribution(metadata)
+        dist.script_name = 'setup.py'
+        dist.packages = ['somecode']
+        dist.include_package_data = True
+        cmd = sdist(dist)
+        cmd.dist_dir = 'dist'
+        def _warn(*args):
+            pass
+        cmd.warn = _warn
+        return dist, cmd
+
+    def test_get_file_list(self):
+        # make sure MANIFEST is recalculated
+        dist, cmd = self.get_cmd()
+
+        os.chdir(self.tmp_dir)
+
+        # filling data_files by pointing files in package_data
+        os.mkdir(os.path.join(self.tmp_dir, 'somecode'))
+        self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#')
+        self.write_file((self.tmp_dir, 'somecode', 'one.py'), '#')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEquals(len(manifest), 2)
+
+        # adding a file
+        self.write_file((self.tmp_dir, 'somecode', 'two.py'), '#')
+
+        # make sure build_py is reinitinialized, like a fresh run
+        build_py = dist.get_command_obj('build_py')
+        build_py.finalized = False
+        build_py.ensure_finalized()
+
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest2 = [line.strip() for line in f.read().split('\n')
+                         if line.strip() != '']
+        finally:
+            f.close()
+
+        # do we have the new file in MANIFEST ?
+        self.assertEquals(len(manifest2), 3)
+        self.assert_('two.py' in manifest2[-1])
+
+
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From f842b86d7f34fade4059ab3e9fd224534f3fc664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 10:38:53 +0000
Subject: [PATCH 2942/8469] Merged revisions 81255 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81255 | tarek.ziade | 2010-05-17 12:06:20 +0200 (Mon, 17 May 2010) | 1 line

  Fixed #8688: Distutils now recalculates MANIFEST everytime.
........
---
 command/sdist.py    | 82 ++++++++++++++-------------------------------
 tests/test_sdist.py | 41 +++++++++++++++++++++++
 2 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f33406cd59..b2088f98d1 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -179,66 +179,34 @@ def get_file_list(self):
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
-        depends on the user's options and the state of the filesystem.
+        depends on the user's options.
         """
-        # If we have a manifest template, see if it's newer than the
-        # manifest; if so, we'll regenerate the manifest.
+        # new behavior:
+        # the file list is recalculated everytime because
+        # even if MANIFEST.in or setup.py are not changed
+        # the user might have added some files in the tree that
+        # need to be included.
+        #
+        #  This makes --force the default and only behavior.
         template_exists = os.path.isfile(self.template)
+        if not template_exists:
+            self.warn(("manifest template '%s' does not exist " +
+                        "(using default file list)") %
+                        self.template)
+        self.filelist.findall()
+
+        if self.use_defaults:
+            self.add_defaults()
+
         if template_exists:
-            template_newer = dep_util.newer(self.template, self.manifest)
-
-        # The contents of the manifest file almost certainly depend on the
-        # setup script as well as the manifest template -- so if the setup
-        # script is newer than the manifest, we'll regenerate the manifest
-        # from the template.  (Well, not quite: if we already have a
-        # manifest, but there's no template -- which will happen if the
-        # developer elects to generate a manifest some other way -- then we
-        # can't regenerate the manifest, so we don't.)
-        self.debug_print("checking if %s newer than %s" %
-                         (self.distribution.script_name, self.manifest))
-        setup_newer = dep_util.newer(self.distribution.script_name,
-                                     self.manifest)
-
-        # cases:
-        #   1) no manifest, template exists: generate manifest
-        #      (covered by 2a: no manifest == template newer)
-        #   2) manifest & template exist:
-        #      2a) template or setup script newer than manifest:
-        #          regenerate manifest
-        #      2b) manifest newer than both:
-        #          do nothing (unless --force or --manifest-only)
-        #   3) manifest exists, no template:
-        #      do nothing (unless --force or --manifest-only)
-        #   4) no manifest, no template: generate w/ warning ("defaults only")
-
-        manifest_outofdate = (template_exists and
-                              (template_newer or setup_newer))
-        force_regen = self.force_manifest or self.manifest_only
-        manifest_exists = os.path.isfile(self.manifest)
-        neither_exists = (not template_exists and not manifest_exists)
-
-        # Regenerate the manifest if necessary (or if explicitly told to)
-        if manifest_outofdate or neither_exists or force_regen:
-            if not template_exists:
-                self.warn("manifest template '%s' does not exist "
-                          "(using default file list)"
-                          % self.template)
-            self.filelist.findall()
-
-            if self.use_defaults:
-                self.add_defaults()
-            if template_exists:
-                self.read_template()
-            if self.prune:
-                self.prune_file_list()
-
-            self.filelist.sort()
-            self.filelist.remove_duplicates()
-            self.write_manifest()
-
-        # Don't regenerate the manifest, just read it in.
-        else:
-            self.read_manifest()
+            self.read_template()
+
+        if self.prune:
+            self.prune_file_list()
+
+        self.filelist.sort()
+        self.filelist.remove_duplicates()
+        self.write_manifest()
 
     def add_defaults(self):
         """Add all the default files to self.filelist:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index e0f1e93768..1bc36c5c8f 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -346,6 +346,47 @@ def test_make_distribution_owner_group(self):
         finally:
             archive.close()
 
+    def test_get_file_list(self):
+        # make sure MANIFEST is recalculated
+        dist, cmd = self.get_cmd()
+
+        # filling data_files by pointing files in package_data
+        dist.package_data = {'somecode': ['*.txt']}
+        self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEquals(len(manifest), 4)
+
+        # adding a file
+        self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
+
+        # make sure build_py is reinitinialized, like a fresh run
+        build_py = dist.get_command_obj('build_py')
+        build_py.finalized = False
+        build_py.ensure_finalized()
+
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest2 = [line.strip() for line in f.read().split('\n')
+                         if line.strip() != '']
+        finally:
+            f.close()
+
+        # do we have the new file in MANIFEST ?
+        self.assertEquals(len(manifest2), 5)
+        self.assertIn('doc2.txt', manifest2[-1])
+
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From 32b6f83c0cdc4ec43cda11decb3c4bade7a8880d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 10:48:29 +0000
Subject: [PATCH 2943/8469] Merged revisions 81258 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81258 | tarek.ziade | 2010-05-17 12:38:53 +0200 (Mon, 17 May 2010) | 9 lines

  Merged revisions 81255 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81255 | tarek.ziade | 2010-05-17 12:06:20 +0200 (Mon, 17 May 2010) | 1 line

    Fixed #8688: Distutils now recalculates MANIFEST everytime.
  ........
................
---
 command/sdist.py    | 82 ++++++++++++++-------------------------------
 tests/test_sdist.py | 41 +++++++++++++++++++++++
 2 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index ace9eeeb61..88fde46c30 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -173,66 +173,34 @@ def get_file_list(self):
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
-        depends on the user's options and the state of the filesystem.
+        depends on the user's options.
         """
-        # If we have a manifest template, see if it's newer than the
-        # manifest; if so, we'll regenerate the manifest.
+        # new behavior:
+        # the file list is recalculated everytime because
+        # even if MANIFEST.in or setup.py are not changed
+        # the user might have added some files in the tree that
+        # need to be included.
+        #
+        #  This makes --force the default and only behavior.
         template_exists = os.path.isfile(self.template)
+        if not template_exists:
+            self.warn(("manifest template '%s' does not exist " +
+                        "(using default file list)") %
+                        self.template)
+        self.filelist.findall()
+
+        if self.use_defaults:
+            self.add_defaults()
+
         if template_exists:
-            template_newer = dep_util.newer(self.template, self.manifest)
-
-        # The contents of the manifest file almost certainly depend on the
-        # setup script as well as the manifest template -- so if the setup
-        # script is newer than the manifest, we'll regenerate the manifest
-        # from the template.  (Well, not quite: if we already have a
-        # manifest, but there's no template -- which will happen if the
-        # developer elects to generate a manifest some other way -- then we
-        # can't regenerate the manifest, so we don't.)
-        self.debug_print("checking if %s newer than %s" %
-                         (self.distribution.script_name, self.manifest))
-        setup_newer = dep_util.newer(self.distribution.script_name,
-                                     self.manifest)
-
-        # cases:
-        #   1) no manifest, template exists: generate manifest
-        #      (covered by 2a: no manifest == template newer)
-        #   2) manifest & template exist:
-        #      2a) template or setup script newer than manifest:
-        #          regenerate manifest
-        #      2b) manifest newer than both:
-        #          do nothing (unless --force or --manifest-only)
-        #   3) manifest exists, no template:
-        #      do nothing (unless --force or --manifest-only)
-        #   4) no manifest, no template: generate w/ warning ("defaults only")
-
-        manifest_outofdate = (template_exists and
-                              (template_newer or setup_newer))
-        force_regen = self.force_manifest or self.manifest_only
-        manifest_exists = os.path.isfile(self.manifest)
-        neither_exists = (not template_exists and not manifest_exists)
-
-        # Regenerate the manifest if necessary (or if explicitly told to)
-        if manifest_outofdate or neither_exists or force_regen:
-            if not template_exists:
-                self.warn("manifest template '%s' does not exist "
-                          "(using default file list)"
-                          % self.template)
-            self.filelist.findall()
-
-            if self.use_defaults:
-                self.add_defaults()
-            if template_exists:
-                self.read_template()
-            if self.prune:
-                self.prune_file_list()
-
-            self.filelist.sort()
-            self.filelist.remove_duplicates()
-            self.write_manifest()
-
-        # Don't regenerate the manifest, just read it in.
-        else:
-            self.read_manifest()
+            self.read_template()
+
+        if self.prune:
+            self.prune_file_list()
+
+        self.filelist.sort()
+        self.filelist.remove_duplicates()
+        self.write_manifest()
 
     def add_defaults(self):
         """Add all the default files to self.filelist:
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b7e5859cb9..f95035dfb0 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -277,6 +277,47 @@ def test_finalize_options(self):
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
 
+    def test_get_file_list(self):
+        # make sure MANIFEST is recalculated
+        dist, cmd = self.get_cmd()
+
+        # filling data_files by pointing files in package_data
+        dist.package_data = {'somecode': ['*.txt']}
+        self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEquals(len(manifest), 4)
+
+        # adding a file
+        self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
+
+        # make sure build_py is reinitinialized, like a fresh run
+        build_py = dist.get_command_obj('build_py')
+        build_py.finalized = False
+        build_py.ensure_finalized()
+
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest2 = [line.strip() for line in f.read().split('\n')
+                         if line.strip() != '']
+        finally:
+            f.close()
+
+        # do we have the new file in MANIFEST ?
+        self.assertEquals(len(manifest2), 5)
+        self.assertIn('doc2.txt', manifest2[-1])
+
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From 170b952ecd0098e93237cbb1da234a8f2680035e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 10:54:43 +0000
Subject: [PATCH 2944/8469] upgraded distutils docs w.r.t. the manifest
 regeneration

---
 command/sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 4cede72988..087ae9dcc6 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -63,7 +63,8 @@ def checking_metadata(self):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual"),
+         "forcibly regenerate the manifest and carry on as usual. "
+         "Deprecated: now the manifest is always regenerated."),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',

From 457ae770b4bc93dc866776384ab4dd9f6958ab5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 11:00:17 +0000
Subject: [PATCH 2945/8469] Merged revisions 81261 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line

  upgraded distutils docs w.r.t. the manifest regeneration
........
---
 command/sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index b93994d07f..535b8d2aea 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -57,7 +57,8 @@ class sdist (Command):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual"),
+         "forcibly regenerate the manifest and carry on as usual. "
+         "Deprecated: now the manifest is always regenerated."),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',

From a99ff5b39025ea4dc8a72f9e7f1d51a17f1aacdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 11:01:57 +0000
Subject: [PATCH 2946/8469] Merged revisions 81261 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line

  upgraded distutils docs w.r.t. the manifest regeneration
........
---
 command/sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index b2088f98d1..f6e099b89f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -63,7 +63,8 @@ def checking_metadata(self):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual"),
+         "forcibly regenerate the manifest and carry on as usual. "
+         "Deprecated: now the manifest is always regenerated."),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',

From 86bffc2288f78b16f66e94e52c39c6e6fdf1c09a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Mon, 17 May 2010 11:04:41 +0000
Subject: [PATCH 2947/8469] Merged revisions 81263 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81263 | tarek.ziade | 2010-05-17 13:01:57 +0200 (Mon, 17 May 2010) | 9 lines

  Merged revisions 81261 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line

    upgraded distutils docs w.r.t. the manifest regeneration
  ........
................
---
 command/sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 88fde46c30..bb2106120a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -63,7 +63,8 @@ def checking_metadata(self):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual"),
+         "forcibly regenerate the manifest and carry on as usual. "
+         "Deprecated: now the manifest is always regenerated."),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',

From 8ea633f81832fc7cc959fa57b3ee97d886f1bd7d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 18 May 2010 23:37:50 +0000
Subject: [PATCH 2948/8469] Merged revisions 68750,68811,68945,69157 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68750 | benjamin.peterson | 2009-01-18 22:47:04 +0000 (So, 18 Jan 2009) | 1 line

  fix encoding cookie case
........
  r68811 | benjamin.peterson | 2009-01-20 18:58:27 +0000 (Di, 20 Jan 2009) | 1 line

  fix url
........
  r68945 | tarek.ziade | 2009-01-25 22:11:04 +0000 (So, 25 Jan 2009) | 1 line

  added missing module docstring
........
  r69157 | benjamin.peterson | 2009-01-31 23:43:25 +0000 (Sa, 31 Jan 2009) | 1 line

  add explanatory comment
........
---
 command/install_lib.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/command/install_lib.py b/command/install_lib.py
index 7e0c708888..fb15530ead 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -1,4 +1,8 @@
 # This module should be kept compatible with Python 2.1.
+"""distutils.command.install_lib
+
+Implements the Distutils 'install_lib' command
+(install all Python modules)."""
 
 __revision__ = "$Id$"
 

From 74a3de058c276bc12ed9a7d9d63487b80fe73c5a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 19 May 2010 11:48:28 +0200
Subject: [PATCH 2949/8469] removed assertTrue/assertFalse occurrences

--HG--
branch : distribute
extra : rebase_source : b7e5bbfa9d90078fd763f728a5d57fb6bd3e3657
---
 setuptools/tests/__init__.py          | 64 +++++++++++++--------------
 setuptools/tests/test_packageindex.py |  2 +-
 setuptools/tests/test_resources.py    | 38 ++++++++--------
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 4fb382ca7b..9af44a88bb 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -94,21 +94,21 @@ def testRequire(self):
 
         from email import __version__
         self.assertEqual(req.get_version(), __version__)
-        self.assertTrue(req.version_ok('1.0.9'))
-        self.assertFalse(req.version_ok('0.9.1'))
-        self.assertFalse(req.version_ok('unknown'))
+        self.assert_(req.version_ok('1.0.9'))
+        self.assert_(not req.version_ok('0.9.1'))
+        self.assert_(not req.version_ok('unknown'))
 
-        self.assertTrue(req.is_present())
-        self.assertTrue(req.is_current())
+        self.assert_(req.is_present())
+        self.assert_(req.is_current())
 
         req = Require('Email 3000','03000','email',format=LooseVersion)
-        self.assertTrue(req.is_present())
-        self.assertFalse(req.is_current())
-        self.assertFalse(req.version_ok('unknown'))
+        self.assert_(req.is_present())
+        self.assert_(not req.is_current())
+        self.assert_(not req.version_ok('unknown'))
 
         req = Require('Do-what-I-mean','1.0','d-w-i-m')
-        self.assertFalse(req.is_present())
-        self.assertFalse(req.is_current())
+        self.assert_(not req.is_present())
+        self.assert_(not req.is_current())
 
         req = Require('Tests', None, 'tests', homepage="http://example.com")
         self.assertEqual(req.format, None)
@@ -118,8 +118,8 @@ def testRequire(self):
         self.assertEqual(req.homepage, 'http://example.com')
 
         paths = [os.path.dirname(p) for p in __path__]
-        self.assertTrue(req.is_present(paths))
-        self.assertTrue(req.is_current(paths))
+        self.assert_(req.is_present(paths))
+        self.assert_(req.is_current(paths))
 
 
 class DistroTests(TestCase):
@@ -137,7 +137,7 @@ def setUp(self):
 
 
     def testDistroType(self):
-        self.assertTrue(isinstance(self.dist,setuptools.dist.Distribution))
+        self.assert_(isinstance(self.dist,setuptools.dist.Distribution))
 
 
     def testExcludePackage(self):
@@ -189,17 +189,17 @@ def testEmpty(self):
         dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
 
     def testContents(self):
-        self.assertTrue(self.dist.has_contents_for('a'))
+        self.assert_(self.dist.has_contents_for('a'))
         self.dist.exclude_package('a')
-        self.assertFalse(self.dist.has_contents_for('a'))
+        self.assert_(not self.dist.has_contents_for('a'))
 
-        self.assertTrue(self.dist.has_contents_for('b'))
+        self.assert_(self.dist.has_contents_for('b'))
         self.dist.exclude_package('b')
-        self.assertFalse(self.dist.has_contents_for('b'))
+        self.assert_(not self.dist.has_contents_for('b'))
 
-        self.assertTrue(self.dist.has_contents_for('c'))
+        self.assert_(self.dist.has_contents_for('c'))
         self.dist.exclude_package('c')
-        self.assertFalse(self.dist.has_contents_for('c'))
+        self.assert_(not self.dist.has_contents_for('c'))
 
 
 
@@ -269,12 +269,12 @@ def setUp(self):
         )
 
     def testDefaults(self):
-        self.assertFalse(
+        self.assert_(not
             Feature(
                 "test",standard=True,remove='x',available=False
             ).include_by_default()
         )
-        self.assertTrue(
+        self.assert_(
             Feature("test",standard=True,remove='x').include_by_default()
         )
         # Feature must have either kwargs, removes, or require_features
@@ -288,33 +288,33 @@ def testAvailability(self):
 
     def testFeatureOptions(self):
         dist = self.dist
-        self.assertTrue(
+        self.assert_(
             ('with-dwim',None,'include DWIM') in dist.feature_options
         )
-        self.assertTrue(
+        self.assert_(
             ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
         )
-        self.assertTrue(
+        self.assert_(
             ('with-bar',None,'include bar (default)') in dist.feature_options
         )
-        self.assertTrue(
+        self.assert_(
             ('without-bar',None,'exclude bar') in dist.feature_options
         )
         self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
         self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
         self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
-        self.assertFalse('without-baz' in dist.feature_negopt)
+        self.assert_(not 'without-baz' in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist
         self.assertEqual(dist.with_foo,1)
         self.assertEqual(dist.with_bar,0)
         self.assertEqual(dist.with_baz,1)
-        self.assertFalse('bar_et' in dist.py_modules)
-        self.assertFalse('pkg.bar' in dist.packages)
-        self.assertTrue('pkg.baz' in dist.packages)
-        self.assertTrue('scripts/baz_it' in dist.scripts)
-        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
+        self.assert_(not 'bar_et' in dist.py_modules)
+        self.assert_(not 'pkg.bar' in dist.packages)
+        self.assert_('pkg.baz' in dist.packages)
+        self.assert_('scripts/baz_it' in dist.scripts)
+        self.assert_(('libfoo','foo/foofoo.c') in dist.libraries)
         self.assertEqual(dist.ext_modules,[])
         self.assertEqual(dist.require_features, [self.req])
 
@@ -331,7 +331,7 @@ class TestCommandTests(TestCase):
 
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')
-        self.assertTrue(isinstance(test_cmd, distutils.cmd.Command))
+        self.assert_(isinstance(test_cmd, distutils.cmd.Command))
 
     def testLongOptSuiteWNoDefault(self):
         ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite'])
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 18a06de558..29359a9cf4 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -10,7 +10,7 @@ class TestPackageIndex(unittest.TestCase):
 
     def test_bad_urls(self):
         index = setuptools.package_index.PackageIndex()
-        url = 'http://127.0.0.1/nonesuch/test_package_index'
+        url = 'http://127.0.0.1:0/nonesuch/test_package_index'
         try:
             v = index.open_url(url)
         except Exception, v:
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c1dc488712..883cfad19f 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -35,7 +35,7 @@ def testCollection(self):
         ad.add(Distribution.from_filename("FooPkg-1.2-py2.4.egg"))
 
         # Name is in there now
-        self.assertTrue(ad['FooPkg'])
+        self.assert_(ad['FooPkg'])
         # But only 1 package
         self.assertEqual(list(ad), ['foopkg'])
 
@@ -218,7 +218,7 @@ def assertfields(self, ep):
         self.assertEqual(ep.module_name,"setuptools.tests.test_resources")
         self.assertEqual(ep.attrs, ("EntryPointTests",))
         self.assertEqual(ep.extras, ("x",))
-        self.assertTrue(ep.load() is EntryPointTests)
+        self.assert_(ep.load() is EntryPointTests)
         self.assertEqual(
             str(ep),
             "foo = setuptools.tests.test_resources:EntryPointTests [x]"
@@ -318,20 +318,20 @@ def testBasicContains(self):
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11  = Distribution.from_filename("Twisted-1.1.egg")
         twist12  = Distribution.from_filename("Twisted-1.2.egg")
-        self.assertTrue(parse_version('1.2') in r)
-        self.assertTrue(parse_version('1.1') not in r)
-        self.assertTrue('1.2' in r)
-        self.assertTrue('1.1' not in r)
-        self.assertTrue(foo_dist not in r)
-        self.assertTrue(twist11 not in r)
-        self.assertTrue(twist12 in r)
+        self.assert_(parse_version('1.2') in r)
+        self.assert_(parse_version('1.1') not in r)
+        self.assert_('1.2' in r)
+        self.assert_('1.1' not in r)
+        self.assert_(foo_dist not in r)
+        self.assert_(twist11 not in r)
+        self.assert_(twist12 in r)
 
     def testAdvancedContains(self):
         r, = parse_requirements("Foo>=1.2,<=1.3,==1.9,>2.0,!=2.5,<3.0,==4.5")
         for v in ('1.2','1.2.2','1.3','1.9','2.0.1','2.3','2.6','3.0c1','4.5'):
-            self.assertTrue(v in r, (v,r))
+            self.assert_(v in r, (v,r))
         for v in ('1.2c1','1.3.1','1.5','1.9.1','2.0','2.5','3.0','4.0'):
-            self.assertTrue(v not in r, (v,r))
+            self.assert_(v not in r, (v,r))
 
 
     def testOptionsAndHashing(self):
@@ -353,14 +353,14 @@ def testVersionEquality(self):
         r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.assertFalse(d("foo-0.3a4.egg") in r1)
-        self.assertFalse(d("foo-0.3a1.egg") in r1)
-        self.assertFalse(d("foo-0.3a4.egg") in r2)
+        self.assert_(d("foo-0.3a4.egg") not in r1)
+        self.assert_(d("foo-0.3a1.egg") not in r1)
+        self.assert_(d("foo-0.3a4.egg") not in r2)
 
-        self.assertTrue(d("foo-0.3a2.egg") in r1)
-        self.assertTrue(d("foo-0.3a2.egg") in r2)
-        self.assertTrue(d("foo-0.3a3.egg") in r2)
-        self.assertTrue(d("foo-0.3a5.egg") in r2)
+        self.assert_(d("foo-0.3a2.egg") in r1)
+        self.assert_(d("foo-0.3a2.egg") in r2)
+        self.assert_(d("foo-0.3a3.egg") in r2)
+        self.assert_(d("foo-0.3a5.egg") in r2)
 
     def testDistributeSetuptoolsOverride(self):
         # Plain setuptools or distribute mean we return distribute.
@@ -480,7 +480,7 @@ def c(s1,s2):
     def testVersionOrdering(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            self.assertTrue(p1<p2, (s1,s2,p1,p2))
+            self.assert_(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
         c('2a1','2b0')

From 24773fa31a13fc0058aed577d566cb528a769061 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 19 May 2010 11:49:00 +0200
Subject: [PATCH 2950/8469] added the -q flag and make sure the build folder is
 removed when python 3 tests are run

--HG--
branch : distribute
extra : rebase_source : 5ebb6fedf532a2a517cbcf522cc9ec3a9066ea0a
---
 test.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test.sh b/test.sh
index ac309dec7e..cc637f6863 100644
--- a/test.sh
+++ b/test.sh
@@ -1,6 +1,7 @@
-python2.3 setup.py test
-python2.4 setup.py test
-python2.5 setup.py test
-python2.6 setup.py test
-python3.1 setup.py test
+python2.3 setup.py -q test
+python2.4 setup.py -q test
+python2.5 setup.py -q test
+python2.6 setup.py -q test
+rm -rf build
+python3.1 setup.py -q test
 

From a33917aed3c98e2537386bd904658f0b4f963d1c Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 19 May 2010 12:09:56 +0200
Subject: [PATCH 2951/8469] malformed urls in 2.7 are catched now - fixes #160

--HG--
branch : distribute
extra : rebase_source : de334e49e876c8ea88f738e03995a461ea669879
---
 CHANGES.txt                           |  1 +
 setuptools/package_index.py           |  5 ++++-
 setuptools/tests/test_packageindex.py | 12 +++++++++++-
 test.sh                               |  2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ad743ae7c7..89760759a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.13
 ------
 
+* Issue 160: 2.7 gives ValueError("Invalid IPv6 URL")
 *
 
 ------
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 924c15e174..1c50d86f47 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -268,7 +268,10 @@ def scan(link):
 
         # process an index page into the package-page index
         for match in HREF.finditer(page):
-            scan( urlparse.urljoin(url, htmldecode(match.group(1))) )
+            try:
+                scan( urlparse.urljoin(url, htmldecode(match.group(1))) )
+            except ValueError:
+                pass
 
         pkg, ver = scan(url)   # ensure this page is in the page index
         if pkg:
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 29359a9cf4..8ae7a5b921 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,7 +1,7 @@
 """Package Index Tests
 """
 # More would be better!
-
+import sys
 import os, shutil, tempfile, unittest, urllib2
 import pkg_resources
 import setuptools.package_index
@@ -57,6 +57,16 @@ def _urlopen(*args):
         except Exception, v:
             self.assert_('nonnumeric port' in str(v))
 
+
+        # issue #160
+        if sys.version_info[0] == 2 and sys.version_info[1] == 7:
+            # this should not fail
+            url = 'http://example.com'
+            page = ('<a href="http://www.famfamfam.com]('
+                    'http://www.famfamfam.com/">')
+            index.process_index(url, page)
+
+
     def test_url_ok(self):
         index = setuptools.package_index.PackageIndex(
             hosts=('www.example.com',)
diff --git a/test.sh b/test.sh
index cc637f6863..61599adb55 100644
--- a/test.sh
+++ b/test.sh
@@ -2,6 +2,8 @@ python2.3 setup.py -q test
 python2.4 setup.py -q test
 python2.5 setup.py -q test
 python2.6 setup.py -q test
+python2.7 setup.py -q test
+
 rm -rf build
 python3.1 setup.py -q test
 

From 92f39994d2c6c711fbd73a5589d4de7b0ed1b72a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 19 May 2010 13:38:09 +0200
Subject: [PATCH 2952/8469] added a test that is supposely breaking - refs #152

--HG--
branch : distribute
extra : rebase_source : 2fa447a630d946a3adf5886115d89065a675ece2
---
 distribute.egg-info/entry_points.txt  |  2 +-
 setuptools/tests/test_easy_install.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9fd4175819..0ee586463a 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-2.5 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e02798c628..692982b36f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -10,6 +10,16 @@
 from setuptools.dist import Distribution
 from pkg_resources import Distribution as PRDistribution
 
+try:
+    import multiprocessing
+    import logging
+    _LOG = logging.getLogger('test_easy_install')
+    logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+    _MULTIPROC = True
+except ImportError:
+    _MULTIPROC = False
+    _LOG = None
+
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -186,3 +196,8 @@ def test_install(self):
         content.sort()
         self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
 
+    def test_multiproc_atexit(self):
+        if not _MULTIPROC:
+            return
+        _LOG.info('this should not break')
+

From b78e3623ca34400e29297da0409211a7d83728c6 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 19 May 2010 17:00:07 +0000
Subject: [PATCH 2953/8469] Issue #8663: distutils.log emulates
 backslashreplace error handler. Fix compilation in a non-ASCII directory if
 stdout encoding is ASCII (eg. if stdout is not a TTY).

---
 log.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/log.py b/log.py
index 758857081c..b301a8338c 100644
--- a/log.py
+++ b/log.py
@@ -27,6 +27,10 @@ def _log(self, level, msg, args):
                 stream = sys.stderr
             else:
                 stream = sys.stdout
+            if stream.errors == 'strict':
+                # emulate backslashreplace error handler
+                encoding = stream.encoding
+                msg = msg.encode(encoding, "backslashreplace").decode(encoding)
             stream.write('%s\n' % msg)
             stream.flush()
 

From 727851619e008c1f44e79a60ddff41bb4ebf02b7 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 19 May 2010 17:15:50 +0000
Subject: [PATCH 2954/8469] Oops, add the new test_log.py for distutils test
 suite (missing part of r81359)

---
 tests/test_log.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 tests/test_log.py

diff --git a/tests/test_log.py b/tests/test_log.py
new file mode 100644
index 0000000000..d35de3456c
--- /dev/null
+++ b/tests/test_log.py
@@ -0,0 +1,36 @@
+"""Tests for distutils.log"""
+
+import sys
+import unittest
+from tempfile import NamedTemporaryFile
+
+from distutils import log
+
+class TestLog(unittest.TestCase):
+    def test_non_ascii(self):
+        # Issue #8663: test that non-ASCII text is escaped with
+        # backslashreplace error handler (stream use ASCII encoding and strict
+        # error handler)
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        try:
+            log.set_threshold(log.DEBUG)
+            with NamedTemporaryFile(mode="w+", encoding='ascii') as stdout, \
+                 NamedTemporaryFile(mode="w+", encoding='ascii') as stderr:
+                sys.stdout = stdout
+                sys.stderr = stderr
+                log.debug("debug:\xe9")
+                log.fatal("fatal:\xe9")
+                stdout.seek(0)
+                self.assertEquals(stdout.read().rstrip(), "debug:\\xe9")
+                stderr.seek(0)
+                self.assertEquals(stderr.read().rstrip(), "fatal:\\xe9")
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+def test_suite():
+    return unittest.makeSuite(TestLog)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From 17502a06524accaf75c09baa817592bd0d38e75b Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Tue, 25 May 2010 10:52:23 +0200
Subject: [PATCH 2955/8469] changed test locally so
 distribute.egg-info/entry_points.txt is not changed when running tests

--HG--
branch : distribute
extra : rebase_source : ae42d5a7c843fb5dd3bede9ba44ece9742075cbf
---
 setup.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/setup.py b/setup.py
index 3ae40817ee..41e0ce4035 100755
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,8 @@
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py
+from setuptools.command.test import test as _test
+
 scripts = []
 
 # specific command that is used to generate windows .exe files
@@ -64,6 +66,36 @@ def build_package_data(self):
                 if copied and srcfile in self.distribution.convert_2to3_doctests:
                     self.__doctests_2to3.append(outf)
 
+class test(_test):
+    """Specific test class to avoid rewriting the entry_points.txt"""
+    def run(self):
+        entry_points = os.path.join('distribute.egg-info', 'entry_points.txt')
+
+        if not os.path.exists(entry_points):
+            try:
+                _test.run(self)
+            finally:
+                return
+
+        f = open(entry_points)
+
+        # running the test
+        try:
+            ep_content = f.read()
+        finally:
+            f.close()
+
+        try:
+            _test.run(self)
+        finally:
+            # restoring the file
+            f = open(entry_points, 'w')
+            try:
+                f.write(ep_content)
+            finally:
+                f.close()
+
+
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
 def _easy_install_marker():
@@ -90,6 +122,7 @@ def _being_installed():
     from distribute_setup import _before_install
     _before_install()
 
+
 dist = setup(
     name="distribute",
     version=VERSION,
@@ -110,6 +143,7 @@ def _being_installed():
 
     zip_safe = (sys.version>="2.5"),   # <2.5 needs unzipped for -m to work
 
+    cmdclass = {'test': test},
     entry_points = {
 
         "distutils.commands" : [

From 29ffeae7d36c6e6c2a10dd230f8472226f51d955 Mon Sep 17 00:00:00 2001
From: Christophe Combelles <ccomb@free.fr>
Date: Wed, 19 May 2010 21:54:20 +0200
Subject: [PATCH 2956/8469] set-up infrastructure to write tests with a real
 http server, and reproduced issue 163.

--HG--
branch : distribute
extra : rebase_source : dc3a9fb1663500c66febacbc2ede43eaa96c190e
---
 .hgignore                                     |  1 +
 .../indexes/test_links_priority/external.html |  3 ++
 .../simple/foobar/index.html                  |  4 ++
 setuptools/tests/server.py                    | 39 +++++++++++++++++++
 setuptools/tests/test_packageindex.py         | 38 ++++++++++++++++++
 5 files changed, 85 insertions(+)
 create mode 100644 setuptools/tests/indexes/test_links_priority/external.html
 create mode 100644 setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
 create mode 100644 setuptools/tests/server.py

diff --git a/.hgignore b/.hgignore
index 3ccf2a3af4..21ec620a54 100644
--- a/.hgignore
+++ b/.hgignore
@@ -10,3 +10,4 @@ lib
 bin
 include
 \.Python
+*.swp
diff --git a/setuptools/tests/indexes/test_links_priority/external.html b/setuptools/tests/indexes/test_links_priority/external.html
new file mode 100644
index 0000000000..883e979063
--- /dev/null
+++ b/setuptools/tests/indexes/test_links_priority/external.html
@@ -0,0 +1,3 @@
+<html><body>
+<a href="foobar-0.1.tar.gz#md5=bad_md5">bad old link</a>
+</body></html>
diff --git a/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html b/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
new file mode 100644
index 0000000000..dc6273d1f7
--- /dev/null
+++ b/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
@@ -0,0 +1,4 @@
+<html><body>
+<a href="foobar-0.1.tar.gz#md5=correct_md5">foobar-0.1.tar.gz</a><br/>
+<a href="../../external.html" rel="homepage">external homepage</a><br/>
+</body></html>
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
new file mode 100644
index 0000000000..00f4e07c3c
--- /dev/null
+++ b/setuptools/tests/server.py
@@ -0,0 +1,39 @@
+"""Basic http server for tests to simulate PyPI or custom indexes
+"""
+import urllib2
+from threading import Thread
+from BaseHTTPServer import HTTPServer
+from SimpleHTTPServer import SimpleHTTPRequestHandler
+
+class IndexServer(HTTPServer):
+    """Basic single-threaded http server simulating a package index
+
+    You can use this server in unittest like this::
+        s = IndexServer()
+        s.start()
+        index_url = s.base_url() + 'mytestindex'
+        # do some test requests to the index
+        s.stop()
+    """
+    def __init__(self):
+        HTTPServer.__init__(self, ('', 0), SimpleHTTPRequestHandler)
+        self._run = True
+
+    def serve(self):
+        while True:
+            self.handle_request()
+            if not self._run: break
+
+    def start(self):
+        self.thread = Thread(target=self.serve)
+        self.thread.start()
+
+    def stop(self):
+        """self.shutdown is not supported on python < 2.6"""
+        self._run = False
+        urllib2.urlopen('http://127.0.0.1:%s/' % self.server_address[1])
+        self.thread.join()
+
+    def base_url(self):
+        port = self.server_address[1]
+        return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 8ae7a5b921..5c1c6970ef 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -5,6 +5,7 @@
 import os, shutil, tempfile, unittest, urllib2
 import pkg_resources
 import setuptools.package_index
+from server import IndexServer
 
 class TestPackageIndex(unittest.TestCase):
 
@@ -74,3 +75,40 @@ def test_url_ok(self):
         url = 'file:///tmp/test_package_index'
         self.assert_(index.url_ok(url, True))
 
+    def test_links_priority(self):
+        """
+        Download links from the pypi simple index should be used before
+        external download links.
+        http://bitbucket.org/tarek/distribute/issue/163/md5-validation-error
+
+        Usecase :
+        - someone uploads a package on pypi, a md5 is generated
+        - someone manually copies this link (with the md5 in the url) onto an
+          external page accessible from the package page.
+        - someone reuploads the package (with a different md5)
+        - while easy_installing, an MD5 error occurs because the external link
+          is used
+        -> Distribute should use the link from pypi, not the external one.
+        """
+        # start an index server
+        server = IndexServer()
+        server.start()
+        index_url = server.base_url() + 'test_links_priority/simple/'
+
+        # scan a test index
+        pi = setuptools.package_index.PackageIndex(index_url)
+        requirement = pkg_resources.Requirement.parse('foobar')
+        pi.find_packages(requirement)
+        server.stop()
+
+        # the distribution has been found
+        self.assert_('foobar' in pi)
+        # we have two links
+        self.assert_(len(pi['foobar'])==2)
+        # the first link should be from the index
+        self.assert_('correct_md5' in pi['foobar'][0].location)
+        # the second link should be the external one
+        self.assert_('bad_md5' in pi['foobar'][1].location)
+
+
+

From 6cf4f07323aac001c1c1a0e3aafbe55a84cec391 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 19 May 2010 20:30:19 +0000
Subject: [PATCH 2957/8469] Merged revisions 81359-81361 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81359 | victor.stinner | 2010-05-19 19:00:07 +0200 (mer., 19 mai 2010) | 4 lines

  Issue #8663: distutils.log emulates backslashreplace error handler. Fix
  compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if stdout
  is not a TTY).
........
  r81360 | victor.stinner | 2010-05-19 19:11:19 +0200 (mer., 19 mai 2010) | 5 lines

  regrtest.py: call replace_stdout() before the first call to print()

  print("==  ", os.getcwd()) fails if the current working directory is not ASCII
  whereas sys.stdout encoding is ASCII.
........
  r81361 | victor.stinner | 2010-05-19 19:15:50 +0200 (mer., 19 mai 2010) | 2 lines

  Oops, add the new test_log.py for distutils test suite (missing part of r81359)
........
---
 log.py            |  4 ++++
 tests/test_log.py | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 tests/test_log.py

diff --git a/log.py b/log.py
index 758857081c..b301a8338c 100644
--- a/log.py
+++ b/log.py
@@ -27,6 +27,10 @@ def _log(self, level, msg, args):
                 stream = sys.stderr
             else:
                 stream = sys.stdout
+            if stream.errors == 'strict':
+                # emulate backslashreplace error handler
+                encoding = stream.encoding
+                msg = msg.encode(encoding, "backslashreplace").decode(encoding)
             stream.write('%s\n' % msg)
             stream.flush()
 
diff --git a/tests/test_log.py b/tests/test_log.py
new file mode 100644
index 0000000000..d35de3456c
--- /dev/null
+++ b/tests/test_log.py
@@ -0,0 +1,36 @@
+"""Tests for distutils.log"""
+
+import sys
+import unittest
+from tempfile import NamedTemporaryFile
+
+from distutils import log
+
+class TestLog(unittest.TestCase):
+    def test_non_ascii(self):
+        # Issue #8663: test that non-ASCII text is escaped with
+        # backslashreplace error handler (stream use ASCII encoding and strict
+        # error handler)
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        try:
+            log.set_threshold(log.DEBUG)
+            with NamedTemporaryFile(mode="w+", encoding='ascii') as stdout, \
+                 NamedTemporaryFile(mode="w+", encoding='ascii') as stderr:
+                sys.stdout = stdout
+                sys.stderr = stderr
+                log.debug("debug:\xe9")
+                log.fatal("fatal:\xe9")
+                stdout.seek(0)
+                self.assertEquals(stdout.read().rstrip(), "debug:\\xe9")
+                stderr.seek(0)
+                self.assertEquals(stderr.read().rstrip(), "fatal:\\xe9")
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+def test_suite():
+    return unittest.makeSuite(TestLog)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

From aa64b99eff47ac0aaf0e2b37c3973a2c8504e260 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 19 May 2010 22:33:33 +0200
Subject: [PATCH 2958/8469] removing decorators from the bootstrap file

--HG--
branch : distribute
extra : rebase_source : c8ab8493df6d120014ca8d8d39406e0c791272bd
---
 distribute_setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 3cb043e24e..194861b51b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -227,7 +227,6 @@ def violation(*args):
 
     return __no_sandbox
 
-@_no_sandbox
 def _patch_file(path, content):
     """Will backup the file then patch it"""
     existing_content = open(path).read()
@@ -244,6 +243,7 @@ def _patch_file(path, content):
         f.close()
     return True
 
+_patch_file = _no_sandbox(_patch_file)
 
 def _same_content(path, content):
     return open(path).read() == content
@@ -254,7 +254,6 @@ def _rename_path(path):
     os.rename(path, new_name)
     return new_name
 
-@_no_sandbox
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s', placeholder)
@@ -288,13 +287,13 @@ def _remove_flat_installation(placeholder):
                      'Setuptools distribution', element)
     return True
 
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
 
 def _after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
     _create_fake_setuptools_pkg_info(placeholder)
 
-@_no_sandbox
 def _create_fake_setuptools_pkg_info(placeholder):
     if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
@@ -322,7 +321,8 @@ def _create_fake_setuptools_pkg_info(placeholder):
     finally:
         f.close()
 
-@_no_sandbox
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+
 def _patch_egg_dir(path):
     # let's check if it's already patched
     pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
@@ -341,6 +341,7 @@ def _patch_egg_dir(path):
         f.close()
     return True
 
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
 
 def _before_install():
     log.warn('Before install bootstrap.')

From 0c8f3ad99a9b8d4a11e32ecf841df428a1cc7fa2 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Wed, 19 May 2010 22:43:52 +0200
Subject: [PATCH 2959/8469] update CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : c5abfc00189b1fdc01f3d14e075df5bca4770252
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 89760759a8..f7119ada50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ------
 
 * Issue 160: 2.7 gives ValueError("Invalid IPv6 URL")
-*
+* Issue 150: Fixed using ~/.local even in a --no-site-packages virtualenv
 
 ------
 0.6.12

From f3411291c4ec89df2f9fe18263a5509fb4caaddf Mon Sep 17 00:00:00 2001
From: Christophe Combelles <ccomb@free.fr>
Date: Wed, 19 May 2010 23:11:22 +0200
Subject: [PATCH 2960/8469] fixed issue 163 : don't include md5 when comparing
 two distributions, and scan index links before external page links.

--HG--
branch : distribute
extra : rebase_source : d190057280e7cb27317eb4aa40e75f1c851ed6e5
---
 pkg_resources.py                                          | 7 +++++--
 setuptools/package_index.py                               | 4 ++--
 .../tests/indexes/test_links_priority/external.html       | 2 +-
 .../indexes/test_links_priority/simple/foobar/index.html  | 2 +-
 setuptools/tests/test_packageindex.py                     | 8 +++-----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 6ec51fa06c..bd31852201 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2081,8 +2081,11 @@ def from_location(cls,location,basename,metadata=None,**kw):
 
     hashcmp = property(
         lambda self: (
-            getattr(self,'parsed_version',()), self.precedence, self.key,
-            -len(self.location or ''), self.location, self.py_version,
+            getattr(self,'parsed_version',()),
+            self.precedence,
+            self.key,
+            (self.location or '').split('#md5=')[0],
+            self.py_version,
             self.platform
         )
     )
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1c50d86f47..ba43cfbf74 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -203,11 +203,11 @@ def process_url(self, url, retrieve=False):
             charset = f.headers.get_param('charset') or 'latin-1'
             page = page.decode(charset, "ignore")
         f.close()
-        if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
-            page = self.process_index(url, page)
         for match in HREF.finditer(page):
             link = urlparse.urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
+        if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
+            page = self.process_index(url, page)
 
     def process_filename(self, fn, nested=False):
         # process filenames or directories
diff --git a/setuptools/tests/indexes/test_links_priority/external.html b/setuptools/tests/indexes/test_links_priority/external.html
index 883e979063..92e4702f63 100644
--- a/setuptools/tests/indexes/test_links_priority/external.html
+++ b/setuptools/tests/indexes/test_links_priority/external.html
@@ -1,3 +1,3 @@
 <html><body>
-<a href="foobar-0.1.tar.gz#md5=bad_md5">bad old link</a>
+<a href="/foobar-0.1.tar.gz#md5=1__bad_md5___">bad old link</a>
 </body></html>
diff --git a/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html b/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
index dc6273d1f7..fefb028bd3 100644
--- a/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
+++ b/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
@@ -1,4 +1,4 @@
 <html><body>
-<a href="foobar-0.1.tar.gz#md5=correct_md5">foobar-0.1.tar.gz</a><br/>
+<a href="/foobar-0.1.tar.gz#md5=0_correct_md5">foobar-0.1.tar.gz</a><br/>
 <a href="../../external.html" rel="homepage">external homepage</a><br/>
 </body></html>
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 5c1c6970ef..42cb8c1e5e 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -103,12 +103,10 @@ def test_links_priority(self):
 
         # the distribution has been found
         self.assert_('foobar' in pi)
-        # we have two links
-        self.assert_(len(pi['foobar'])==2)
-        # the first link should be from the index
+        # we have only one link, because links are compared without md5
+        self.assert_(len(pi['foobar'])==1)
+        # the link should be from the index
         self.assert_('correct_md5' in pi['foobar'][0].location)
-        # the second link should be the external one
-        self.assert_('bad_md5' in pi['foobar'][1].location)
 
 
 

From d7dc0ff754d8f3b3f2bf56087644a0a6d80c7061 Mon Sep 17 00:00:00 2001
From: Christophe Combelles <ccomb@free.fr>
Date: Tue, 25 May 2010 11:16:27 +0200
Subject: [PATCH 2961/8469] fixed issue 163 : don't include md5 when comparing
 two distributions, and scan index links before external page links.

--HG--
branch : distribute
extra : rebase_source : 21315f22104e090324f7fe243a4f16516c0a49fa
---
 CHANGES.txt                | 2 ++
 setuptools/tests/server.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index f7119ada50..d35422b90d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 
 * Issue 160: 2.7 gives ValueError("Invalid IPv6 URL")
 * Issue 150: Fixed using ~/.local even in a --no-site-packages virtualenv
+* Issue 163: scan index links before external links, and don't use the md5 when
+  comparing two distributions
 
 ------
 0.6.12
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 00f4e07c3c..2f455e4161 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -13,6 +13,7 @@ class IndexServer(HTTPServer):
         s.start()
         index_url = s.base_url() + 'mytestindex'
         # do some test requests to the index
+        # The index files should be located in setuptools/tests/indexes
         s.stop()
     """
     def __init__(self):

From 641afae67627f4c6fb3c52a318a6c86b50a33ee2 Mon Sep 17 00:00:00 2001
From: Christophe Combelles <ccomb@free.fr>
Date: Thu, 20 May 2010 00:02:46 +0200
Subject: [PATCH 2962/8469] Fix for python2.4

--HG--
branch : distribute
extra : rebase_source : b4c2fb5521783c03bebcdb52e17c8e0063ab86aa
---
 setuptools/tests/server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 2f455e4161..5e5e3e6104 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -32,9 +32,9 @@ def start(self):
     def stop(self):
         """self.shutdown is not supported on python < 2.6"""
         self._run = False
-        urllib2.urlopen('http://127.0.0.1:%s/' % self.server_address[1])
+        urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port)
         self.thread.join()
 
     def base_url(self):
-        port = self.server_address[1]
+        port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port

From c68c5c96f49efec1ad6768a7679e18afe6e0a45b Mon Sep 17 00:00:00 2001
From: Christophe Combelles <ccomb@free.fr>
Date: Thu, 20 May 2010 00:06:10 +0200
Subject: [PATCH 2963/8469] updated contributors

--HG--
branch : distribute
extra : rebase_source : 7be4047ee158e00789764ef0cbf59daaa26b81d5
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index da9e021974..8f6c4aa0e3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -5,6 +5,7 @@ Contributors
 * Alex Grönholm
 * Alice Bevan-McGregor
 * Arfrever Frehtes Taifersar Arahesis
+* Christophe Combelles
 * Daniel Stutzbach
 * Hanno Schlichting
 * Jannis Leidel

From 72c44b3258e02b56ac106f878a64eca726a6f01f Mon Sep 17 00:00:00 2001
From: David Cournapeau <david@silveregg.co.jp>
Date: Thu, 20 May 2010 19:31:44 +0900
Subject: [PATCH 2964/8469] BUG: Fix #142 - easy_install ignore locally
 installed packages.

Backport from setuptools 0.6c10.

--HG--
branch : distribute
extra : rebase_source : d06cbdae906a725410d4993d9e1a631e2acac345
---
 setuptools/command/easy_install.py |  3 ++-
 setuptools/package_index.py        | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d68943faf3..e13f676a95 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -565,7 +565,8 @@ def easy_install(self, spec, deps=False):
 
             self.check_editable(spec)
             dist = self.package_index.fetch_distribution(
-                spec, tmpdir, self.upgrade, self.editable, not self.always_copy
+                spec, tmpdir, self.upgrade, self.editable, not self.always_copy,
+                self.local_index
             )
 
             if dist is None:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1c50d86f47..67e9f6ae09 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -418,7 +418,8 @@ def download(self, spec, tmpdir):
 
 
     def fetch_distribution(self,
-        requirement, tmpdir, force_scan=False, source=False, develop_ok=False
+        requirement, tmpdir, force_scan=False, source=False, develop_ok=False,
+        local_index=None
     ):
         """Obtain a distribution suitable for fulfilling `requirement`
 
@@ -440,11 +441,14 @@ def fetch_distribution(self,
         # process a Requirement
         self.info("Searching for %s", requirement)
         skipped = {}
+        dist = None
 
-        def find(req):
+        def find(req, env=None):
+            if env is None:
+                env = self
             # Find a matching distribution; may be called more than once
 
-            for dist in self[req.key]:
+            for dist in env[req.key]:
 
                 if dist.precedence==DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
@@ -461,8 +465,11 @@ def find(req):
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
+            dist = find(requirement)
+
+        if local_index is not None:
+            dist = dist or find(requirement, local_index)
 
-        dist = find(requirement)
         if dist is None and self.to_scan is not None:
             self.prescan()
             dist = find(requirement)

From 9456da484efba996b190310fa39dca7db2c8ea81 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 21 May 2010 19:22:43 +0200
Subject: [PATCH 2965/8469] make HAS_USER_SITE depend on site.ENABLE_USER_SITE

--HG--
branch : distribute
extra : rebase_source : e7fb6337b41ea732acd41bab92a57471f3632777
---
 setuptools/command/easy_install.py    | 7 +++----
 setuptools/tests/test_easy_install.py | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d68943faf3..a41841b319 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -39,7 +39,7 @@
 ]
 
 import site
-HAS_USER_SITE = not sys.version < "2.6"
+HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE
 
 def samefile(p1,p2):
     if hasattr(os.path,'samefile') and (
@@ -122,7 +122,7 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        if HAS_USER_SITE and site.ENABLE_USER_SITE:
+        if HAS_USER_SITE:
             whereami = os.path.abspath(__file__)
             self.user = whereami.startswith(site.USER_SITE)
         else:
@@ -1347,8 +1347,7 @@ def get_site_dirs():
         site_lib = get_python_lib(plat_specific)
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
-    if sys.version >= "2.6":
-        import site
+    if HAS_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
     sitedirs = map(normalize_path, sitedirs)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4791e03cce..8caaeb87c6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -158,7 +158,7 @@ def setUp(self):
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
         if sys.version >= "2.6":
-            self.old_enable = site.ENABLE_USER_SITE
+            self.old_has_site = easy_install_pkg.HAS_USER_SITE
             self.old_file = easy_install_pkg.__file__
             self.old_base = site.USER_BASE
             site.USER_BASE = tempfile.mkdtemp()
@@ -174,11 +174,11 @@ def tearDown(self):
             shutil.rmtree(site.USER_SITE)
             site.USER_BASE = self.old_base
             site.USER_SITE = self.old_site
-            site.ENABLE_USER_SITE = self.old_enable
+            easy_install_pkg.HAS_USER_SITE = self.old_has_site
             easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
-        site.ENABLE_USER_SITE = True # disabled sometimes
+        easy_install_pkg.HAS_USER_SITE = True # disabled sometimes
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP
@@ -195,7 +195,7 @@ def test_multiproc_atexit(self):
         _LOG.info('this should not break')
 
     def test_user_install_not_implied_without_usersite_enabled(self):
-        site.ENABLE_USER_SITE = False # disabled sometimes
+        easy_install_pkg.HAS_USER_SITE = False # usually enabled
         #XXX: replace with something meaningfull
         if sys.version < "2.6":
             return #SKIP

From dd45c0df44049d27db2b16ba5170cd00825dc960 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Tue, 25 May 2010 12:13:44 +0200
Subject: [PATCH 2966/8469] using urlparse to extract the fragment

--HG--
branch : distribute
extra : rebase_source : a377df45aa49dd8eb33c52875b590401c5ddbef8
---
 pkg_resources.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index bd31852201..6ef0629643 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -14,6 +14,7 @@
 """
 
 import sys, os, zipimport, time, re, imp, types
+from urlparse import urlparse, urlunparse
 
 try:
     frozenset
@@ -2044,8 +2045,13 @@ def parse_map(cls, data, dist=None):
     parse_map = classmethod(parse_map)
 
 
-
-
+def _remove_md5_fragment(location):
+    if not location:
+        return ''
+    parsed = urlparse(location)
+    if 'md5' in parsed[-1]:
+        return urlunparse(parsed[:-1] + ('',))
+    return location
 
 
 class Distribution(object):
@@ -2079,12 +2085,13 @@ def from_location(cls,location,basename,metadata=None,**kw):
         )
     from_location = classmethod(from_location)
 
+
     hashcmp = property(
         lambda self: (
             getattr(self,'parsed_version',()),
             self.precedence,
             self.key,
-            (self.location or '').split('#md5=')[0],
+            _remove_md5_fragment(self.location),
             self.py_version,
             self.platform
         )

From 0756b06fcfc6bb9c045c6927605d1165cd7000cb Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Tue, 25 May 2010 12:22:42 +0200
Subject: [PATCH 2967/8469] avoiding name collisions when looking for md5 in
 fragment

--HG--
branch : distribute
extra : rebase_source : 8b9469b9b9b4d8769ee5e6655aa1b75c207905b8
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 6ef0629643..30dbc18812 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2049,7 +2049,7 @@ def _remove_md5_fragment(location):
     if not location:
         return ''
     parsed = urlparse(location)
-    if 'md5' in parsed[-1]:
+    if parsed[-1].startswith('md5='):
         return urlunparse(parsed[:-1] + ('',))
     return location
 

From e1ad7a3ac2ee213f7ce9397fa68b85962b38f29c Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Tue, 25 May 2010 22:36:37 +0200
Subject: [PATCH 2968/8469] make sure tests.sh return the exit code, and nicer
 outputs

--HG--
branch : distribute
extra : rebase_source : 6e614dc25657d2b5ccabbf4ac48c778e712cff30
---
 test.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/test.sh b/test.sh
index 61599adb55..883271a4de 100644
--- a/test.sh
+++ b/test.sh
@@ -1,9 +1,47 @@
-python2.3 setup.py -q test
-python2.4 setup.py -q test
-python2.5 setup.py -q test
-python2.6 setup.py -q test
-python2.7 setup.py -q test
+#!/bin/sh
+echo -n "Running tests for Python 2.3..."
+python2.3 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+
+echo -n "Running tests for Python 2.4..."
+python2.4 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+
+echo -n "Running tests for Python 2.5..."
+python2.5 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+
+echo -n "Running tests for Python 2.6..."
+python2.6 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
 
 rm -rf build
-python3.1 setup.py -q test
+echo -n "Running tests for Python 3.1..."
+python3.1 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
 

From db5c0b3692c021fbe92c34e367e05cf341946a67 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Fri, 28 May 2010 00:15:21 +0200
Subject: [PATCH 2969/8469] make self setup correctly consider --user when
 checking for setuptools, fixes #156

--HG--
branch : distribute
extra : rebase_source : f0000d114975e2b952e1153f4a1a53167bb37b20
---
 distribute_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 194861b51b..002e3a8579 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -361,8 +361,8 @@ def _under_prefix(location):
                 if len(args) > index:
                     top_dir = args[index+1]
                     return location.startswith(top_dir)
-            elif option == '--user' and USER_SITE is not None:
-                return location.startswith(USER_SITE)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
     return True
 
 

From 9e5db3812358c2dba88a56da07b39b18f3ce27ad Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 31 May 2010 18:46:25 +0200
Subject: [PATCH 2970/8469] pip uses python -c "... execfile(setup.py)" magic
 to run a package. This was breaking with the way we relaunch the script

--HG--
branch : distribute
extra : rebase_source : bb6d85b61b4c2c98b931ea456bd631da9291fb19
---
 distribute_setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/distribute_setup.py b/distribute_setup.py
index 002e3a8579..37117b34eb 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -421,6 +421,9 @@ def _fake_setuptools():
 def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+        sys.argv[0] = 'setup.py'
     args = [sys.executable] + sys.argv
     sys.exit(subprocess.call(args))
 

From b5ea11d2401a8f3768ba5bd9d4aed22f6a72d5b3 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 31 May 2010 19:12:00 +0200
Subject: [PATCH 2971/8469] updated version

--HG--
branch : distribute
extra : rebase_source : fd7343f221ea6588f92b4f24fdbc723aaf1efabc
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index 8388e9937e..08ef0ee274 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.12"
+export VERSION="0.6.13"
 
 # tagging
 hg tag $VERSION

From 0fcf811dc7e0f7be7ebd624c84f5c371b15eba1e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 31 May 2010 19:13:34 +0200
Subject: [PATCH 2972/8469] Added tag 0.6.13 for changeset dae247400d0c

--HG--
branch : distribute
extra : rebase_source : fac3bb8ade7ea948c89e2f6d1e1756705f361e03
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index eb90dab58c..d55e3fd1e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -15,3 +15,4 @@ ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
 f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
 e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
 48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12
+dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13

From c4318e2572b0158aa05fa241b85552073bb8400b Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 31 May 2010 19:39:15 +0200
Subject: [PATCH 2973/8469] starting 0.6.14

--HG--
branch : distribute
extra : rebase_source : b9e623ce0a5b70680f18c48e1c5f64753b70d38c
---
 README.txt   | 6 +++---
 docs/conf.py | 4 ++--
 release.sh   | 2 +-
 setup.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 72d897e713..b004960e16 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.13.tar.gz
-    $ tar -xzvf distribute-0.6.13.tar.gz
-    $ cd distribute-0.6.13
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz
+    $ tar -xzvf distribute-0.6.14.tar.gz
+    $ cd distribute-0.6.14
     $ python setup.py install
 
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 53614ed586..59443dd117 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.13'
+version = '0.6.14'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.4'
+release = '0.6.14'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.sh b/release.sh
index 08ef0ee274..37bdac5c70 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.13"
+export VERSION="0.6.14"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 41e0ce4035..ce7cf1d058 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.13"
+VERSION = "0.6.14"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From cdb97f5f0ebcf2aa7abf44d4e08696e01310b7c3 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 3 Jun 2010 09:47:21 +0000
Subject: [PATCH 2974/8469] Fix for issue #7724: ensure that distutils and
 python's own setup.py honor the MacOSX SDK when one is specified.

This is needed to be able to build using the 10.4u SDK while running
on OSX 10.6.

This is a fixed version of the patch in r80963, I've tested this patch
on OSX and Linux.
---
 unixccompiler.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 783d4dca84..b76f0d41cf 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os, sys, re
 from types import StringType, NoneType
 
 from distutils import sysconfig
@@ -305,10 +305,30 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
+        if sys.platform == 'darwin':
+            # On OSX users can specify an alternate SDK using
+            # '-isysroot', calculate the SDK root if it is specified
+            # (and use it further on)
+            cflags = sysconfig.get_config_var('CFLAGS')
+            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            if m is None:
+                sysroot = '/'
+            else:
+                sysroot = m.group(1)
+
+
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+
+            if sys.platform == 'darwin' and (
+                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                shared = os.path.join(sysroot, dir[1:], shared_f)
+                dylib = os.path.join(sysroot, dir[1:], dylib_f)
+                static = os.path.join(sysroot, dir[1:], static_f)
+
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From 0ca04fb2c44992cbbfbee30960d10ffafeb3f286 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 3 Jun 2010 14:42:25 +0000
Subject: [PATCH 2975/8469] Merged revisions 81662 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81662 | ronald.oussoren | 2010-06-03 11:47:21 +0200 (Thu, 03 Jun 2010) | 9 lines

  Fix for issue #7724: ensure that distutils and python's own setup.py
  honor the MacOSX SDK when one is specified.

  This is needed to be able to build using the 10.4u SDK while running
  on OSX 10.6.

  This is a fixed version of the patch in r80963, I've tested this patch
  on OSX and Linux.
........
---
 unixccompiler.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index c14a5d3fc6..81a7de6191 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os, sys, re
 
 from distutils.dep_util import newer
 from distutils.ccompiler import \
@@ -320,10 +320,31 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
+        if sys.platform == 'darwin':
+            # On OSX users can specify an alternate SDK using
+            # '-isysroot', calculate the SDK root if it is specified
+            # (and use it further on)
+            _sysconfig = __import__('sysconfig')
+            cflags = _sysconfig.get_config_var('CFLAGS')
+            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            if m is None:
+                sysroot = '/'
+            else:
+                sysroot = m.group(1)
+
+
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+
+            if sys.platform == 'darwin' and (
+                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                shared = os.path.join(sysroot, dir[1:], shared_f)
+                dylib = os.path.join(sysroot, dir[1:], dylib_f)
+                static = os.path.join(sysroot, dir[1:], static_f)
+
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From cd778292f149a5d71319f00c1bb22943d766683d Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 3 Jun 2010 14:59:56 +0000
Subject: [PATCH 2976/8469] Merged revisions 81662 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81662 | ronald.oussoren | 2010-06-03 11:47:21 +0200 (Thu, 03 Jun 2010) | 9 lines

  Fix for issue #7724: ensure that distutils and python's own setup.py
  honor the MacOSX SDK when one is specified.

  This is needed to be able to build using the 10.4u SDK while running
  on OSX 10.6.

  This is a fixed version of the patch in r80963, I've tested this patch
  on OSX and Linux.
........
---
 unixccompiler.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 783d4dca84..b76f0d41cf 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os, sys, re
 from types import StringType, NoneType
 
 from distutils import sysconfig
@@ -305,10 +305,30 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
+        if sys.platform == 'darwin':
+            # On OSX users can specify an alternate SDK using
+            # '-isysroot', calculate the SDK root if it is specified
+            # (and use it further on)
+            cflags = sysconfig.get_config_var('CFLAGS')
+            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            if m is None:
+                sysroot = '/'
+            else:
+                sysroot = m.group(1)
+
+
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+
+            if sys.platform == 'darwin' and (
+                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                shared = os.path.join(sysroot, dir[1:], shared_f)
+                dylib = os.path.join(sysroot, dir[1:], dylib_f)
+                static = os.path.join(sysroot, dir[1:], static_f)
+
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From 9c55a255899d88a40630c4ec8396638d17ebd89b Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Thu, 3 Jun 2010 16:21:03 +0000
Subject: [PATCH 2977/8469] Merged revisions 81673 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81673 | ronald.oussoren | 2010-06-03 16:42:25 +0200 (Thu, 03 Jun 2010) | 16 lines

  Merged revisions 81662 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81662 | ronald.oussoren | 2010-06-03 11:47:21 +0200 (Thu, 03 Jun 2010) | 9 lines

    Fix for issue #7724: ensure that distutils and python's own setup.py
    honor the MacOSX SDK when one is specified.

    This is needed to be able to build using the 10.4u SDK while running
    on OSX 10.6.

    This is a fixed version of the patch in r80963, I've tested this patch
    on OSX and Linux.
  ........
................
---
 unixccompiler.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index a33fdf0f7c..f4605f3044 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -15,7 +15,7 @@
 
 __revision__ = "$Id$"
 
-import os, sys
+import os, sys, re
 
 from distutils import sysconfig
 from distutils.dep_util import newer
@@ -317,10 +317,30 @@ def find_library_file(self, dirs, lib, debug=0):
         dylib_f = self.library_filename(lib, lib_type='dylib')
         static_f = self.library_filename(lib, lib_type='static')
 
+        if sys.platform == 'darwin':
+            # On OSX users can specify an alternate SDK using
+            # '-isysroot', calculate the SDK root if it is specified
+            # (and use it further on)
+            cflags = sysconfig.get_config_var('CFLAGS')
+            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            if m is None:
+                sysroot = '/'
+            else:
+                sysroot = m.group(1)
+
+
+
         for dir in dirs:
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+
+            if sys.platform == 'darwin' and (
+                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                shared = os.path.join(sysroot, dir[1:], shared_f)
+                dylib = os.path.join(sysroot, dir[1:], dylib_f)
+                static = os.path.join(sysroot, dir[1:], static_f)
+
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
             # assuming that *all* Unix C compilers do.  And of course I'm

From da66d6ba5d1d62159f678e9091f3946e9b096241 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 6 Jun 2010 00:22:09 +0000
Subject: [PATCH 2978/8469] bump version to 2.7 rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 5f401709cf..7f3021010b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7b2"
+__version__ = "2.7rc1"
 #--end constants--

From 7210ba8400fb48800ed4df24e25c2500423b70fa Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 3 Jul 2010 13:45:58 +0200
Subject: [PATCH 2979/8469] added missing files in the sdist fixes #170

--HG--
branch : distribute
extra : rebase_source : 3d8f2228ca300091e8b7c50bbbf5bc2707372cb6
---
 CHANGES.txt      | 6 ++++++
 CONTRIBUTORS.txt | 1 +
 MANIFEST.in      | 1 +
 3 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d35422b90d..cdea81352b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.14
+------
+
+* Issue 170: fixed unittest failure. Thanks to Toshio.
+
 ------
 0.6.13
 ------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8f6c4aa0e3..f0ec2ba490 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -15,6 +15,7 @@ Contributors
 * Philip Jenvey
 * Reinout van Rees
 * Tarek Ziadé
+* Toshio Kuratomi
 
 If you think you name is missing, please add it (alpha order by first name)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 97fef03aa1..461cfd4f13 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
+recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 include *.py
 include *.txt

From e7a6afa8537161befb62ca5cd638f2bbc35a5842 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Thu, 10 Jun 2010 23:45:50 -0400
Subject: [PATCH 2980/8469] Fix race condition with the http server used in
 unittests

--HG--
branch : distribute
extra : rebase_source : e7093c7a63fe91ede0bdd52735e33ac780e95ec6
---
 setuptools/tests/server.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 5e5e3e6104..f116a3fdb9 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -32,7 +32,10 @@ def start(self):
     def stop(self):
         """self.shutdown is not supported on python < 2.6"""
         self._run = False
-        urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port)
+        try:
+            urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5)
+        except urllib2.URLError:
+            pass
         self.thread.join()
 
     def base_url(self):

From 59d7c14ff6725c5dba040f899f9c145cca169185 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Jun 2010 16:05:20 +0000
Subject: [PATCH 2981/8469] Fix for issue #8577: without this patch
 test_distutils will fail when builddir != srcdir (that is, when you run
 configure in a directory that is not the top of the source tree).

---
 command/install.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/install.py b/command/install.py
index 3c28c660ec..e3e387ab5d 100644
--- a/command/install.py
+++ b/command/install.py
@@ -302,8 +302,8 @@ def finalize_options(self):
         # about needing recursive variable expansion (shudder).
 
         py_version = sys.version.split()[0]
-        prefix, exec_prefix, srcdir = get_config_vars('prefix', 'exec_prefix',
-                                                      'srcdir')
+        prefix, exec_prefix, srcdir, projectbase = get_config_vars('prefix', 'exec_prefix',
+                                                      'srcdir', 'projectbase')
 
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
@@ -316,6 +316,7 @@ def finalize_options(self):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                             'srcdir': srcdir,
+                            'projectbase': projectbase,
                            }
 
         self.config_vars['userbase'] = self.install_userbase

From d42efce4a037530f77c8cc91e7f1735e3c14b96c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 21 Jun 2010 15:27:46 +0000
Subject: [PATCH 2982/8469] fix finding visual studio 2008 on 64 bit #8854

---
 msvc9compiler.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 932b6ea2d9..d5d7f66528 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -37,10 +37,20 @@
          _winreg.HKEY_LOCAL_MACHINE,
          _winreg.HKEY_CLASSES_ROOT)
 
-VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
-VSEXPRESS_BASE = r"Software\Microsoft\VCExpress\%0.1f"
-WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
-NET_BASE = r"Software\Microsoft\.NETFramework"
+NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32)
+if NATIVE_WIN64:
+    # Visual C++ is a 32-bit application, so we need to look in
+    # the corresponding registry branch, if we're running a
+    # 64-bit Python on Win64
+    VS_BASE = r"Software\Wow6432Node\Microsoft\VisualStudio\%0.1f"
+    VSEXPRESS_BASE = r"Software\Wow6432Node\Microsoft\VCExpress\%0.1f"
+    WINSDK_BASE = r"Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Wow6432Node\Microsoft\.NETFramework"
+else:
+    VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+    VSEXPRESS_BASE = r"Software\Microsoft\VCExpress\%0.1f"
+    WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Microsoft\.NETFramework"
 
 # A map keyed by get_platform() return values to values accepted by
 # 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is

From 898a004e6eee52a5ab4f92e2e40acbcaf0bdfd05 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 21 Jun 2010 15:37:16 +0000
Subject: [PATCH 2983/8469] Merged revisions 82130 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

  fix finding visual studio 2008 on 64 bit #8854
........
---
 msvc9compiler.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 6455fffa1f..15425d7194 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -37,9 +37,18 @@
          winreg.HKEY_LOCAL_MACHINE,
          winreg.HKEY_CLASSES_ROOT)
 
-VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
-WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
-NET_BASE = r"Software\Microsoft\.NETFramework"
+NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32)
+if NATIVE_WIN64:
+    # Visual C++ is a 32-bit application, so we need to look in
+    # the corresponding registry branch, if we're running a
+    # 64-bit Python on Win64
+    VS_BASE = r"Software\Wow6432Node\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Wow6432Node\Microsoft\.NETFramework"
+else:
+    VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Microsoft\.NETFramework"
 
 # A map keyed by get_platform() return values to values accepted by
 # 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is

From 39ba1bd353bca4a92a427e8e8ff3e9a870d47432 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 21 Jun 2010 15:39:28 +0000
Subject: [PATCH 2984/8469] Merged revisions 82130 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

  fix finding visual studio 2008 on 64 bit #8854
........
---
 msvc9compiler.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 9bf54c102d..9fe8c744cb 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -37,9 +37,18 @@
          _winreg.HKEY_LOCAL_MACHINE,
          _winreg.HKEY_CLASSES_ROOT)
 
-VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
-WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
-NET_BASE = r"Software\Microsoft\.NETFramework"
+NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32)
+if NATIVE_WIN64:
+    # Visual C++ is a 32-bit application, so we need to look in
+    # the corresponding registry branch, if we're running a
+    # 64-bit Python on Win64
+    VS_BASE = r"Software\Wow6432Node\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Wow6432Node\Microsoft\.NETFramework"
+else:
+    VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Microsoft\.NETFramework"
 
 # A map keyed by get_platform() return values to values accepted by
 # 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is

From 7bed757e02f1ccf941a3b6210b46c0edda5ea9e8 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 21 Jun 2010 15:42:48 +0000
Subject: [PATCH 2985/8469] Merged revisions 82131 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82131 | benjamin.peterson | 2010-06-21 10:37:16 -0500 (Mon, 21 Jun 2010) | 9 lines

  Merged revisions 82130 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

    fix finding visual studio 2008 on 64 bit #8854
  ........
................
---
 msvc9compiler.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index ad021b5754..761b9ca236 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -38,9 +38,18 @@
          winreg.HKEY_LOCAL_MACHINE,
          winreg.HKEY_CLASSES_ROOT)
 
-VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
-WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
-NET_BASE = r"Software\Microsoft\.NETFramework"
+NATIVE_WIN64 = (sys.platform == 'win32' and sys.maxsize > 2**32)
+if NATIVE_WIN64:
+    # Visual C++ is a 32-bit application, so we need to look in
+    # the corresponding registry branch, if we're running a
+    # 64-bit Python on Win64
+    VS_BASE = r"Software\Wow6432Node\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Wow6432Node\Microsoft\.NETFramework"
+else:
+    VS_BASE = r"Software\Microsoft\VisualStudio\%0.1f"
+    WINSDK_BASE = r"Software\Microsoft\Microsoft SDKs\Windows"
+    NET_BASE = r"Software\Microsoft\.NETFramework"
 
 # A map keyed by get_platform() return values to values accepted by
 # 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is

From c54c55e5b4eeb636a400eff44da8f327ba383b93 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 21 Jun 2010 15:57:57 +0000
Subject: [PATCH 2986/8469] bump verson to 2.7rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7f3021010b..bdbf2b2d65 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7rc1"
+__version__ = "2.7rc2"
 #--end constants--

From 0f327d043dda9cbd1d528ff9e4e4051a803bd41a Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 27 Jun 2010 12:36:16 +0000
Subject: [PATCH 2987/8469] Two small fixes for the support for SDKs on MacOSX:

1) The code that checks if an path should be located in the SDK
   explicitly excludes /usr/local. This fixes issue9046

2) The SDK variant for filtering "db_dirs_to_check" in setup.py
   was not doing anything because of a missing assignment.
---
 unixccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index b76f0d41cf..c49ac9ba91 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -324,7 +324,9 @@ def find_library_file(self, dirs, lib, debug=0):
             static = os.path.join(dir, static_f)
 
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
+
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)

From 177cb25982dd05cc40f8612a8ae14cf334509226 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 27 Jun 2010 12:37:46 +0000
Subject: [PATCH 2988/8469] Merged revisions 82272 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

  Two small fixes for the support for SDKs on MacOSX:

  1) The code that checks if an path should be located in the SDK
     explicitly excludes /usr/local. This fixes issue9046

  2) The SDK variant for filtering "db_dirs_to_check" in setup.py
     was not doing anything because of a missing assignment.
........
---
 unixccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index 81a7de6191..081790827d 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -340,7 +340,9 @@ def find_library_file(self, dirs, lib, debug=0):
             static = os.path.join(dir, static_f)
 
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
+
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)

From 5d756882f69f443b18cf373e4a61b1e803905f99 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 27 Jun 2010 12:39:22 +0000
Subject: [PATCH 2989/8469] Merged revisions 82272 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

  Two small fixes for the support for SDKs on MacOSX:

  1) The code that checks if an path should be located in the SDK
     explicitly excludes /usr/local. This fixes issue9046

  2) The SDK variant for filtering "db_dirs_to_check" in setup.py
     was not doing anything because of a missing assignment.
........
---
 unixccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index b76f0d41cf..c49ac9ba91 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -324,7 +324,9 @@ def find_library_file(self, dirs, lib, debug=0):
             static = os.path.join(dir, static_f)
 
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
+
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)

From 1d311c0e512b4684b36e4a29a393a84d0452e8f5 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 27 Jun 2010 12:40:35 +0000
Subject: [PATCH 2990/8469] Merged revisions 82273 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines

  Merged revisions 82272 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

    Two small fixes for the support for SDKs on MacOSX:

    1) The code that checks if an path should be located in the SDK
       explicitly excludes /usr/local. This fixes issue9046

    2) The SDK variant for filtering "db_dirs_to_check" in setup.py
       was not doing anything because of a missing assignment.
  ........
................
---
 unixccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index f4605f3044..bf73416154 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -336,7 +336,9 @@ def find_library_file(self, dirs, lib, debug=0):
             static = os.path.join(dir, static_f)
 
             if sys.platform == 'darwin' and (
-                    dir.startswith('/System/') or dir.startswith('/usr/')):
+                dir.startswith('/System/') or (
+                dir.startswith('/usr/') and not dir.startswith('/usr/local/'))):
+
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)

From 79a00a3182447a66a2106761dfabda0e16d0ba19 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 3 Jul 2010 13:50:15 +0200
Subject: [PATCH 2991/8469] added a note on Toshio change. Fixes #171 (with
 r734)

--HG--
branch : distribute
extra : rebase_source : 10d46a506636fd2fbf1ec9bbbdf55ec9909e5e8e
---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cdea81352b..f62356e793 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ CHANGES
 0.6.14
 ------
 
-* Issue 170: fixed unittest failure. Thanks to Toshio.
+* Issue 170: Fixed unittest failure. Thanks to Toshio.
+* Issue 171: Fixed race condition in unittests cause deadlocks in test suite.
 
 ------
 0.6.13

From 0342126c2eb6d6cecd585a296be6b111a63eaebd Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 3 Jul 2010 13:56:13 +0000
Subject: [PATCH 2992/8469] update to 2.7 final

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index bdbf2b2d65..665fd768d2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7rc2"
+__version__ = "2.7"
 #--end constants--

From 6586ed42561965fc19b2c6c94f751b85b79b2f1c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 3 Jul 2010 14:51:25 +0000
Subject: [PATCH 2993/8469] prepare for 2.7.1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 665fd768d2..2c69a1836a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7"
+__version__ = "2.7.1a0"
 #--end constants--

From 91cb8c7f93b69929938ceb8913ec4bc7bc7dd016 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 3 Jul 2010 19:16:38 +0200
Subject: [PATCH 2994/8469] added a test for #143 now that I understand it.
 fixes #143

--HG--
branch : distribute
extra : rebase_source : e81153c1b0c81fe7783507553caa66c217e38ed5
---
 setuptools/tests/test_easy_install.py | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 8caaeb87c6..85616605c2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -205,3 +205,39 @@ def test_user_install_not_implied_without_usersite_enabled(self):
         cmd.args = ['py']
         cmd.initialize_options()
         self.assertFalse(cmd.user, 'NOT user should be implied')
+
+    def test_local_index(self):
+        # make sure the local index is used
+        # when easy_install looks for installed
+        # packages
+        new_location = tempfile.mkdtemp()
+        target = tempfile.mkdtemp()
+        egg_file = os.path.join(new_location, 'foo-1.0.egg-info')
+        f = open(egg_file, 'w')
+        try:
+            f.write('Name: foo\n')
+        except:
+            f.close()
+
+        sys.path.append(target)
+        old_ppath = os.environ.get('PYTHONPATH')
+        os.environ['PYTHONPATH'] = ':'.join(sys.path)
+        try:
+            dist = Distribution()
+            dist.script_name = 'setup.py'
+            cmd = easy_install(dist)
+            cmd.install_dir = target
+            cmd.args = ['foo']
+            cmd.ensure_finalized()
+            cmd.local_index.scan([new_location])
+            res = cmd.easy_install('foo')
+            self.assertEquals(res.location, new_location)
+        finally:
+            sys.path.remove(target)
+            shutil.rmtree(new_location)
+            shutil.rmtree(target)
+            if old_ppath is not None:
+                os.environ['PYTHONPATH'] = old_ppath
+            else:
+                del os.environ['PYTHONPATH']
+

From 9a1b14784687365ce119d0cc229765a4e50016a0 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 11 Jul 2010 08:52:52 +0000
Subject: [PATCH 2995/8469] Fix for issue #9164: with this patch sysconfig and
 distuls don't break when duplicate '-arch foo' flags end up in CFLAGS (which
 may happen when building a universal build using macports)

---
 util.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util.py b/util.py
index b3ec6e9606..4dcfeb5505 100644
--- a/util.py
+++ b/util.py
@@ -144,8 +144,7 @@ def get_platform ():
                 cflags = get_config_vars().get('CFLAGS')
 
                 archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
+                archs = tuple(sorted(set(archs)))
 
                 if len(archs) == 1:
                     machine = archs[0]

From 611bf70820557ab8c49303983449064d99360242 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 11 Jul 2010 09:08:11 +0000
Subject: [PATCH 2996/8469] Merged revisions 82791 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82791 | ronald.oussoren | 2010-07-11 10:52:52 +0200 (Sun, 11 Jul 2010) | 4 lines

  Fix for issue #9164: with this patch sysconfig and distuls don't break
  when duplicate '-arch foo' flags end up in CFLAGS (which may happen when
  building a universal build using macports)
........
---
 util.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 36ac721386..c4a8711d08 100644
--- a/util.py
+++ b/util.py
@@ -144,8 +144,7 @@ def get_platform ():
                 cflags = get_config_vars().get('CFLAGS')
 
                 archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
+                archs = tuple(sorted(set(archs)))
 
                 if len(archs) == 1:
                     machine = archs[0]

From a74d1cd994eb527a565d5686fa315dcdafac6d31 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 11 Jul 2010 09:29:09 +0000
Subject: [PATCH 2997/8469] Fix for issue 9164

---
 util.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 9a77561fff..8175434586 100644
--- a/util.py
+++ b/util.py
@@ -143,8 +143,7 @@ def get_platform ():
                 cflags = get_config_vars().get('CFLAGS')
 
                 archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
+                archs = tuple(sorted(set(archs)))
 
                 if len(archs) == 1:
                     machine = archs[0]

From b97dbcf42d529ab4dfb2896cef8c0d53960595d7 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 19:49:41 +0000
Subject: [PATCH 2998/8469] #6026: skip test_get_file_list when zlib is not
 available.

---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 1bc36c5c8f..9a76eacb65 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -346,6 +346,7 @@ def test_make_distribution_owner_group(self):
         finally:
             archive.close()
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()

From 0c1ee9af184f3d93215a250b609f2607c2edfd62 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 19:52:15 +0000
Subject: [PATCH 2999/8469] Merged revisions 82839 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82839 | ezio.melotti | 2010-07-12 22:49:41 +0300 (Mon, 12 Jul 2010) | 1 line

  #6026: skip test_get_file_list when zlib is not available.
........
---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 76f5b77471..f83b9f29b6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -346,6 +346,7 @@ def test_make_distribution_owner_group(self):
         finally:
             archive.close()
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()

From 9562a276832b4f27e2b7666e6157fa95937a22e1 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 20:00:39 +0000
Subject: [PATCH 3000/8469] Merged revisions 82839 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82839 | ezio.melotti | 2010-07-12 22:49:41 +0300 (Mon, 12 Jul 2010) | 1 line

  #6026: skip test_get_file_list when zlib is not available.
........
---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f95035dfb0..aa3a99fa3f 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -277,6 +277,7 @@ def test_finalize_options(self):
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()

From 6cdb93646957b4c0ef41fd23bc05278c6f949d73 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Jul 2010 21:23:20 +0000
Subject: [PATCH 3001/8469] Revert r82841.

---
 tests/test_sdist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index aa3a99fa3f..f95035dfb0 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -277,7 +277,6 @@ def test_finalize_options(self):
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()

From 17826cc55c5fe3435767cea1e7cbb8ca9873e21d Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 15 Jul 2010 02:01:09 +0200
Subject: [PATCH 3002/8469] fixed the edit mode when its used by setuptools
 fixes #174

--HG--
branch : distribute
extra : rebase_source : be43431f85dd946fc44128bb4967844e43885ea9
---
 CHANGES.txt                        | 1 +
 setuptools/command/easy_install.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 93381aaddc..342ad4bbcb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ CHANGES
 * Issue 171: Fixed race condition in unittests cause deadlocks in test suite.
 * Issue 143: Fixed a lookup issue with easy_install.
   Thanks to David and Zooko.
+* Issue 174: Fixed the edit mode when its used with setuptools itself
 
 ------
 0.6.13
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2a227196d6..27fd00c7c0 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -639,7 +639,8 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         self.update_pth(dist)
         self.package_index.add(dist)
         self.local_index.add(dist)
-        self.install_egg_scripts(dist)
+        if not self.editable:
+            self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
         if (dist.has_metadata('dependency_links.txt') and

From a19f0d463aaf53adc1f45deda60d33c0e9886556 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 15 Jul 2010 02:14:07 +0200
Subject: [PATCH 3003/8469] Added tag 0.6.14 for changeset 2b9d9977ea75

--HG--
branch : distribute
extra : rebase_source : 337d2380513095b9b7f11a17bdc69de889a987d6
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d55e3fd1e6..cefd3429e7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -16,3 +16,4 @@ f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
 e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
 48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12
 dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
+2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14

From 1e31cb66948b5306364b453bccada467408870ec Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 15 Jul 2010 02:47:08 +0200
Subject: [PATCH 3004/8469] 0.6.15 is starting

--HG--
branch : distribute
extra : rebase_source : 900799106c9cd4ce9c0dc4db4c3b137147a35776
---
 README.txt   | 6 +++---
 docs/conf.py | 4 ++--
 release.sh   | 2 +-
 setup.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index b004960e16..6daeab03c9 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz
-    $ tar -xzvf distribute-0.6.14.tar.gz
-    $ cd distribute-0.6.14
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.15.tar.gz
+    $ tar -xzvf distribute-0.6.15.tar.gz
+    $ cd distribute-0.6.15
     $ python setup.py install
 
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 59443dd117..2bf4d37ee9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.14'
+version = '0.6.15'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.14'
+release = '0.6.15'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.sh b/release.sh
index 37bdac5c70..0281e3528d 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.14"
+export VERSION="0.6.15"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index ce7cf1d058..a78588239b 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.14"
+VERSION = "0.6.15"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 72f0285dcb95a9026424b5bd06a284fde4daa677 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 22 Jul 2010 10:24:57 +0100
Subject: [PATCH 3005/8469] Updated bootstrapper to 0.6.14.

--HG--
branch : distribute
extra : rebase_source : 2d0c527df431d597a265a5e3311c64560099ef38
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 37117b34eb..3ea2e667f1 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.13"
+DEFAULT_VERSION = "0.6.14"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 

From 0853c24ca247b6e7abf19adf3c605b241c8d9e88 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 22 Jul 2010 11:35:17 +0200
Subject: [PATCH 3006/8469] raised to the current dev version

--HG--
branch : distribute
extra : rebase_source : ec71cd404a48f2e8d22b59c8048aa66c28c9a684
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 3ea2e667f1..e8f0ed06b0 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.14"
+DEFAULT_VERSION = "0.6.15"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 

From 07be936471d1459a64a755dc90a53121a8ca41e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Thu, 22 Jul 2010 12:50:05 +0000
Subject: [PATCH 3007/8469] reverted distutils its 3.1 state. All new work is
 now happening in disutils2, and distutils is now feature-frozen.

---
 archive_util.py               |  71 +----
 bcppcompiler.py               |  10 +-
 ccompiler.py                  | 172 +++++-----
 cmd.py                        |   8 +-
 command/bdist.py              |  18 +-
 command/bdist_dumb.py         |  21 +-
 command/bdist_msi.py          |   8 +-
 command/bdist_rpm.py          |   9 +-
 command/bdist_wininst.py      |  13 +-
 command/build.py              |   7 +-
 command/build_clib.py         |   4 +-
 command/build_ext.py          | 140 ++++-----
 command/build_py.py           |   7 +-
 command/build_scripts.py      |  10 +-
 command/config.py             |   5 +-
 command/install.py            | 129 ++++----
 command/register.py           |   8 +-
 command/sdist.py              |  13 +-
 command/upload.py             |  83 ++---
 config.py                     |   3 +
 core.py                       |  24 +-
 cygwinccompiler.py            |  51 +--
 dep_util.py                   |  64 ++--
 dir_util.py                   |   2 +-
 dist.py                       | 128 ++------
 emxccompiler.py               |  35 ++-
 errors.py                     |  47 +--
 extension.py                  |  13 +-
 fancy_getopt.py               |  19 +-
 file_util.py                  |  58 ++--
 filelist.py                   |  39 ++-
 msvc9compiler.py              |   7 +-
 msvccompiler.py               |  14 +-
 sysconfig.py                  | 571 +++++++++++++++++++++++++++++-----
 tests/support.py              |  10 -
 tests/test_archive_util.py    |  72 +----
 tests/test_bdist.py           |   4 +-
 tests/test_bdist_dumb.py      |  27 +-
 tests/test_bdist_rpm.py       |   4 +-
 tests/test_bdist_wininst.py   |   4 +-
 tests/test_build_clib.py      |   3 +-
 tests/test_build_ext.py       |  82 ++---
 tests/test_build_py.py        |  13 +-
 tests/test_build_scripts.py   |   6 +-
 tests/test_ccompiler.py       |  81 -----
 tests/test_cmd.py             |   4 +-
 tests/test_cygwinccompiler.py |  88 ++++--
 tests/test_dist.py            |  85 +----
 tests/test_emxccompiler.py    |  33 --
 tests/test_extension.py       |  19 +-
 tests/test_file_util.py       |  17 +-
 tests/test_filelist.py        |  45 +--
 tests/test_install.py         |  53 ++--
 tests/test_install_lib.py     |  17 +-
 tests/test_register.py        |   4 +-
 tests/test_sdist.py           |  70 -----
 tests/test_sysconfig.py       |  37 ++-
 tests/test_unixccompiler.py   |  10 +-
 tests/test_upload.py          |  61 ++--
 tests/test_util.py            | 213 +++++++------
 text_file.py                  |   4 +-
 unixccompiler.py              |  44 ++-
 util.py                       | 325 ++++++++++++-------
 63 files changed, 1597 insertions(+), 1649 deletions(-)
 delete mode 100644 tests/test_ccompiler.py
 delete mode 100644 tests/test_emxccompiler.py

diff --git a/archive_util.py b/archive_util.py
index 28e93fed78..16164c7f1f 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -14,55 +14,15 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-try:
-    from pwd import getpwnam
-except ImportError:
-    getpwnam = None
-
-try:
-    from grp import getgrnam
-except ImportError:
-    getgrnam = None
-
-def _get_gid(name):
-    """Returns a gid, given a group name."""
-    if getgrnam is None or name is None:
-        return None
-    try:
-        result = getgrnam(name)
-    except KeyError:
-        result = None
-    if result is not None:
-        return result[2]
-    return None
-
-def _get_uid(name):
-    """Returns an uid, given a user name."""
-    if getpwnam is None or name is None:
-        return None
-    try:
-        result = getpwnam(name)
-    except KeyError:
-        result = None
-    if result is not None:
-        return result[2]
-    return None
-
-def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
-                 owner=None, group=None):
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     """Create a (possibly compressed) tar file from all the files under
     'base_dir'.
 
     'compress' must be "gzip" (the default), "compress", "bzip2", or None.
-    (compress will be deprecated in Python 3.2)
-
-    'owner' and 'group' can be used to define an owner and a group for the
-    archive that is being built. If not provided, the current owner and group
-    will be used.
-
+    Both "tar" and the compression utility named by 'compress' must be on
+    the default program search path, so this is probably Unix-specific.
     The output tar file will be named 'base_dir' +  ".tar", possibly plus
     the appropriate compression extension (".gz", ".bz2" or ".Z").
-
     Returns the output filename.
     """
     tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
@@ -84,23 +44,10 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
     import tarfile  # late import so Python build itself doesn't break
 
     log.info('Creating tar archive')
-
-    uid = _get_uid(owner)
-    gid = _get_gid(group)
-
-    def _set_uid_gid(tarinfo):
-        if gid is not None:
-            tarinfo.gid = gid
-            tarinfo.gname = group
-        if uid is not None:
-            tarinfo.uid = uid
-            tarinfo.uname = owner
-        return tarinfo
-
     if not dry_run:
         tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
         try:
-            tar.add(base_dir, filter=_set_uid_gid)
+            tar.add(base_dir)
         finally:
             tar.close()
 
@@ -190,7 +137,7 @@ def check_archive_formats(formats):
     return None
 
 def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
-                 dry_run=0, owner=None, group=None):
+                 dry_run=0):
     """Create an archive file (eg. zip or tar).
 
     'base_name' is the name of the file to create, minus any format-specific
@@ -203,9 +150,6 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     ie. 'base_dir' will be the common prefix of all files and
     directories in the archive.  'root_dir' and 'base_dir' both default
     to the current directory.  Returns the name of the archive file.
-
-    'owner' and 'group' are used when creating a tar archive. By default,
-    uses the current owner and group.
     """
     save_cwd = os.getcwd()
     if root_dir is not None:
@@ -227,11 +171,6 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
-
-    if format != 'zip':
-        kwargs['owner'] = owner
-        kwargs['group'] = group
-
     try:
         filename = func(base_name, base_dir, **kwargs)
     finally:
diff --git a/bcppcompiler.py b/bcppcompiler.py
index 77d94a59a2..c5e5cd2571 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -13,11 +13,13 @@
 
 __revision__ = "$Id$"
 
-import os
 
-from distutils.errors import (DistutilsExecError, CompileError, LibError,
-                              LinkError, UnknownFileError)
-from distutils.ccompiler import CCompiler, gen_preprocess_options
+import os
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
+     CompileError, LibError, LinkError, UnknownFileError
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
 from distutils.file_util import write_file
 from distutils.dep_util import newer
 from distutils import log
diff --git a/ccompiler.py b/ccompiler.py
index 1a4e8fb2af..34c77a37a3 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -5,71 +5,15 @@
 
 __revision__ = "$Id$"
 
-import sys
-import os
-import re
-
-from distutils.errors import (CompileError, LinkError, UnknownFileError,
-                              DistutilsPlatformError, DistutilsModuleError)
+import sys, os, re
+from distutils.errors import *
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
-from distutils.dep_util import newer_group
+from distutils.dep_util import newer_pairwise, newer_group
 from distutils.util import split_quoted, execute
 from distutils import log
 
-_sysconfig = __import__('sysconfig')
-
-def customize_compiler(compiler):
-    """Do any platform-specific customization of a CCompiler instance.
-
-    Mainly needed on Unix, so we can plug in the information that
-    varies across Unices and is stored in Python's Makefile.
-    """
-    if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-            _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                                       'CCSHARED', 'LDSHARED', 'SO', 'AR',
-                                       'ARFLAGS')
-
-        if 'CC' in os.environ:
-            cc = os.environ['CC']
-        if 'CXX' in os.environ:
-            cxx = os.environ['CXX']
-        if 'LDSHARED' in os.environ:
-            ldshared = os.environ['LDSHARED']
-        if 'CPP' in os.environ:
-            cpp = os.environ['CPP']
-        else:
-            cpp = cc + " -E"           # not always
-        if 'LDFLAGS' in os.environ:
-            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if 'CFLAGS' in os.environ:
-            cflags = opt + ' ' + os.environ['CFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if 'CPPFLAGS' in os.environ:
-            cpp = cpp + ' ' + os.environ['CPPFLAGS']
-            cflags = cflags + ' ' + os.environ['CPPFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-        if 'AR' in os.environ:
-            ar = os.environ['AR']
-        if 'ARFLAGS' in os.environ:
-            archiver = ar + ' ' + os.environ['ARFLAGS']
-        else:
-            archiver = ar + ' ' + ar_flags
-
-        cc_cmd = cc + ' ' + cflags
-        compiler.set_executables(
-            preprocessor=cpp,
-            compiler=cc_cmd,
-            compiler_so=cc_cmd + ' ' + ccshared,
-            compiler_cxx=cxx,
-            linker_so=ldshared,
-            linker_exe=cc,
-            archiver=archiver)
-
-        compiler.shared_lib_extension = so_ext
-
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
     by real compiler classes.  Also has some utility methods used by
@@ -449,6 +393,22 @@ def _fix_compile_args(self, output_dir, macros, include_dirs):
 
         return output_dir, macros, include_dirs
 
+    def _prep_compile(self, sources, output_dir, depends=None):
+        """Decide which souce files must be recompiled.
+
+        Determine the list of object files corresponding to 'sources',
+        and figure out which ones really need to be recompiled.
+        Return a list of all object files and a dictionary telling
+        which source files can be skipped.
+        """
+        # Get the list of expected output (object) files
+        objects = self.object_filenames(sources, output_dir=output_dir)
+        assert len(objects) == len(sources)
+
+        # Return an empty dict for the "which source files can be skipped"
+        # return value to preserve API compatibility.
+        return objects, {}
+
     def _fix_object_args(self, objects, output_dir):
         """Typecheck and fix up some arguments supplied to various methods.
         Specifically: ensure that 'objects' is a list; if output_dir is
@@ -650,15 +610,26 @@ def create_static_lib(self, objects, output_libname, output_dir=None,
         """
         pass
 
+
     # values for target_desc parameter in link()
     SHARED_OBJECT = "shared_object"
     SHARED_LIBRARY = "shared_library"
     EXECUTABLE = "executable"
 
-    def link(self, target_desc, objects, output_filename, output_dir=None,
-             libraries=None, library_dirs=None, runtime_library_dirs=None,
-             export_symbols=None, debug=0, extra_preargs=None,
-             extra_postargs=None, build_temp=None, target_lang=None):
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
         """Link a bunch of stuff together to create an executable or
         shared library file.
 
@@ -707,11 +678,19 @@ def link(self, target_desc, objects, output_filename, output_dir=None,
 
     # Old 'link_*()' methods, rewritten to use the new 'link()' method.
 
-    def link_shared_lib(self, objects, output_libname, output_dir=None,
-                        libraries=None, library_dirs=None,
-                        runtime_library_dirs=None, export_symbols=None,
-                        debug=0, extra_preargs=None, extra_postargs=None,
-                        build_temp=None, target_lang=None):
+    def link_shared_lib(self,
+                        objects,
+                        output_libname,
+                        output_dir=None,
+                        libraries=None,
+                        library_dirs=None,
+                        runtime_library_dirs=None,
+                        export_symbols=None,
+                        debug=0,
+                        extra_preargs=None,
+                        extra_postargs=None,
+                        build_temp=None,
+                        target_lang=None):
         self.link(CCompiler.SHARED_LIBRARY, objects,
                   self.library_filename(output_libname, lib_type='shared'),
                   output_dir,
@@ -720,11 +699,19 @@ def link_shared_lib(self, objects, output_libname, output_dir=None,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_shared_object(self, objects, output_filename, output_dir=None,
-                           libraries=None, library_dirs=None,
-                           runtime_library_dirs=None, export_symbols=None,
-                           debug=0, extra_preargs=None, extra_postargs=None,
-                           build_temp=None, target_lang=None):
+    def link_shared_object(self,
+                           objects,
+                           output_filename,
+                           output_dir=None,
+                           libraries=None,
+                           library_dirs=None,
+                           runtime_library_dirs=None,
+                           export_symbols=None,
+                           debug=0,
+                           extra_preargs=None,
+                           extra_postargs=None,
+                           build_temp=None,
+                           target_lang=None):
         self.link(CCompiler.SHARED_OBJECT, objects,
                   output_filename, output_dir,
                   libraries, library_dirs, runtime_library_dirs,
@@ -732,10 +719,17 @@ def link_shared_object(self, objects, output_filename, output_dir=None,
                   extra_preargs, extra_postargs, build_temp, target_lang)
 
 
-    def link_executable(self, objects, output_progname, output_dir=None,
-                        libraries=None, library_dirs=None,
-                        runtime_library_dirs=None, debug=0, extra_preargs=None,
-                        extra_postargs=None, target_lang=None):
+    def link_executable(self,
+                        objects,
+                        output_progname,
+                        output_dir=None,
+                        libraries=None,
+                        library_dirs=None,
+                        runtime_library_dirs=None,
+                        debug=0,
+                        extra_preargs=None,
+                        extra_postargs=None,
+                        target_lang=None):
         self.link(CCompiler.EXECUTABLE, objects,
                   self.executable_filename(output_progname), output_dir,
                   libraries, library_dirs, runtime_library_dirs, None,
@@ -917,7 +911,7 @@ def spawn(self, cmd):
     def move_file(self, src, dst):
         return move_file(src, dst, dry_run=self.dry_run)
 
-    def mkpath(self, name, mode=0o777):
+    def mkpath (self, name, mode=0o777):
         mkpath(name, mode, dry_run=self.dry_run)
 
 
@@ -1085,14 +1079,12 @@ def gen_preprocess_options(macros, include_dirs):
     return pp_opts
 
 
-def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
+def gen_lib_options (compiler, library_dirs, runtime_library_dirs, libraries):
     """Generate linker options for searching library directories and
-    linking with specific libraries.
-
-    'libraries' and 'library_dirs' are, respectively, lists of library names
-    (not filenames!) and search directories.  Returns a list of command-line
-    options suitable for use with some compiler (depending on the two format
-    strings passed in).
+    linking with specific libraries.  'libraries' and 'library_dirs' are,
+    respectively, lists of library names (not filenames!) and search
+    directories.  Returns a list of command-line options suitable for use
+    with some compiler (depending on the two format strings passed in).
     """
     lib_opts = []
 
@@ -1102,7 +1094,7 @@ def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
     for dir in runtime_library_dirs:
         opt = compiler.runtime_library_dir_option(dir)
         if isinstance(opt, list):
-            lib_opts.extend(opt)
+            lib_opts = lib_opts + opt
         else:
             lib_opts.append(opt)
 
@@ -1113,14 +1105,14 @@ def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
     # pretty nasty way to arrange your C code.
 
     for lib in libraries:
-        lib_dir, lib_name = os.path.split(lib)
-        if lib_dir != '':
+        (lib_dir, lib_name) = os.path.split(lib)
+        if lib_dir:
             lib_file = compiler.find_library_file([lib_dir], lib_name)
-            if lib_file is not None:
+            if lib_file:
                 lib_opts.append(lib_file)
             else:
                 compiler.warn("no library file corresponding to "
                               "'%s' found (skipping)" % lib)
         else:
-            lib_opts.append(compiler.library_option(lib))
+            lib_opts.append(compiler.library_option (lib))
     return lib_opts
diff --git a/cmd.py b/cmd.py
index 08632099aa..ae4efc7efc 100644
--- a/cmd.py
+++ b/cmd.py
@@ -367,11 +367,9 @@ def spawn(self, cmd, search_path=1, level=1):
         from distutils.spawn import spawn
         spawn(cmd, search_path, dry_run=self.dry_run)
 
-    def make_archive(self, base_name, format, root_dir=None, base_dir=None,
-                     owner=None, group=None):
-        return archive_util.make_archive(base_name, format, root_dir,
-                                         base_dir, dry_run=self.dry_run,
-                                         owner=owner, group=group)
+    def make_archive(self, base_name, format, root_dir=None, base_dir=None):
+        return archive_util.make_archive(base_name, format, root_dir, base_dir,
+                                         dry_run=self.dry_run)
 
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
diff --git a/command/bdist.py b/command/bdist.py
index 72b0cefe42..1a360b59e3 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -6,10 +6,9 @@
 __revision__ = "$Id$"
 
 import os
-
-from distutils.util import get_platform
 from distutils.core import Command
-from distutils.errors import DistutilsPlatformError, DistutilsOptionError
+from distutils.errors import *
+from distutils.util import get_platform
 
 
 def show_formats():
@@ -40,12 +39,6 @@ class bdist(Command):
                      "[default: dist]"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
-                    ('owner=', 'u',
-                     "Owner name used when creating a tar file"
-                     " [default: current user]"),
-                    ('group=', 'g',
-                     "Group name used when creating a tar file"
-                     " [default: current group]"),
                    ]
 
     boolean_options = ['skip-build']
@@ -87,8 +80,6 @@ def initialize_options(self):
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
-        self.group = None
-        self.owner = None
 
     def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
@@ -134,11 +125,6 @@ def run(self):
             if cmd_name not in self.no_format_option:
                 sub_cmd.format = self.formats[i]
 
-            # passing the owner and group names for tar archiving
-            if cmd_name == 'bdist_dumb':
-                sub_cmd.owner = self.owner
-                sub_cmd.group = self.group
-
             # If we're going to need to run this command again, tell it to
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index c2af95f13a..2d39922672 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -7,18 +7,16 @@
 __revision__ = "$Id$"
 
 import os
-
-from sysconfig import get_python_version
-
-from distutils.util import get_platform
 from distutils.core import Command
+from distutils.util import get_platform
 from distutils.dir_util import remove_tree, ensure_relative
-from distutils.errors import DistutilsPlatformError
+from distutils.errors import *
+from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_dumb(Command):
 
-    description = 'create a "dumb" built distribution'
+    description = "create a \"dumb\" built distribution"
 
     user_options = [('bdist-dir=', 'd',
                      "temporary directory for creating the distribution"),
@@ -37,12 +35,6 @@ class bdist_dumb(Command):
                     ('relative', None,
                      "build the archive using relative paths"
                      "(default: false)"),
-                    ('owner=', 'u',
-                     "Owner name used when creating a tar file"
-                     " [default: current user]"),
-                    ('group=', 'g',
-                     "Group name used when creating a tar file"
-                     " [default: current group]"),
                    ]
 
     boolean_options = ['keep-temp', 'skip-build', 'relative']
@@ -59,8 +51,6 @@ def initialize_options(self):
         self.dist_dir = None
         self.skip_build = 0
         self.relative = 0
-        self.owner = None
-        self.group = None
 
     def finalize_options(self):
         if self.bdist_dir is None:
@@ -118,8 +108,7 @@ def run(self):
 
         # Make the archive
         filename = self.make_archive(pseudoinstall_root,
-                                     self.format, root_dir=archive_root,
-                                     owner=self.owner, group=self.group)
+                                     self.format, root_dir=archive_root)
         if self.distribution.has_ext_modules():
             pyversion = get_python_version()
         else:
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f13c73b36d..c4be47b579 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -6,15 +6,15 @@
 """
 Implements the bdist_msi command.
 """
-import sys, os
-from sysconfig import get_python_version, get_platform
 
+import sys, os
 from distutils.core import Command
 from distutils.dir_util import remove_tree
+from distutils.sysconfig import get_python_version
 from distutils.version import StrictVersion
 from distutils.errors import DistutilsOptionError
+from distutils.util import get_platform
 from distutils import log
-
 import msilib
 from msilib import schema, sequence, text
 from msilib import Directory, Feature, Dialog, add_data
@@ -28,6 +28,7 @@ def __init__(self, *args, **kw):
         default, cancel, bitmap=true)"""
         Dialog.__init__(self, *args)
         ruler = self.h - 36
+        bmwidth = 152*ruler/328
         #if kw.get("bitmap", True):
         #    self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
         self.line("BottomLine", 0, ruler, self.w, 0)
@@ -418,6 +419,7 @@ def add_ui(self):
         # see "Dialog Style Bits"
         modal = 3      # visible | modal
         modeless = 1   # visible
+        track_disk_space = 32
 
         # UI customization properties
         add_data(db, "Property",
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 0a579dbb93..452f9502ad 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -5,14 +5,13 @@
 
 __revision__ = "$Id$"
 
-import sys
-import os
-
+import sys, os
 from distutils.core import Command
 from distutils.debug import DEBUG
+from distutils.util import get_platform
 from distutils.file_util import write_file
-from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
-                              DistutilsFileError, DistutilsExecError)
+from distutils.errors import *
+from distutils.sysconfig import get_python_version
 from distutils import log
 
 class bdist_rpm(Command):
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 71cc79881a..d6d01c630d 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -5,16 +5,13 @@
 
 __revision__ = "$Id$"
 
-import sys
-import os
-
-from sysconfig import get_python_version
-
+import sys, os
 from distutils.core import Command
-from distutils.dir_util import remove_tree
-from distutils.errors import DistutilsOptionError, DistutilsPlatformError
-from distutils import log
 from distutils.util import get_platform
+from distutils.dir_util import create_tree, remove_tree
+from distutils.errors import *
+from distutils.sysconfig import get_python_version
+from distutils import log
 
 class bdist_wininst(Command):
 
diff --git a/command/build.py b/command/build.py
index 4d30f8ff2b..9c2667cfd2 100644
--- a/command/build.py
+++ b/command/build.py
@@ -5,15 +5,16 @@
 __revision__ = "$Id$"
 
 import sys, os
-
-from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
+from distutils.util import get_platform
+
 
 def show_compilers():
     from distutils.ccompiler import show_compilers
     show_compilers()
 
+
 class build(Command):
 
     description = "build everything needed to install"
@@ -126,6 +127,7 @@ def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
 
+
     # -- Predicates for the sub-command list ---------------------------
 
     def has_pure_modules(self):
@@ -140,6 +142,7 @@ def has_ext_modules(self):
     def has_scripts(self):
         return self.distribution.has_scripts()
 
+
     sub_commands = [('build_py',      has_pure_modules),
                     ('build_clib',    has_c_libraries),
                     ('build_ext',     has_ext_modules),
diff --git a/command/build_clib.py b/command/build_clib.py
index 4c6443ca6e..258d7c10be 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -18,8 +18,8 @@
 
 import os
 from distutils.core import Command
-from distutils.errors import DistutilsSetupError
-from distutils.ccompiler import customize_compiler
+from distutils.errors import *
+from distutils.sysconfig import customize_compiler
 from distutils import log
 
 def show_compilers():
diff --git a/command/build_ext.py b/command/build_ext.py
index 8f41facd4a..bd61bc56f3 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -7,14 +7,12 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from warnings import warn
-
-from distutils.util import get_platform
 from distutils.core import Command
 from distutils.errors import *
-from distutils.ccompiler import customize_compiler
+from distutils.sysconfig import customize_compiler, get_python_version
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
+from distutils.util import get_platform
 from distutils import log
 
 # this keeps compatibility from 2.3 to 2.5
@@ -114,39 +112,6 @@ class build_ext(Command):
          "list available compilers", show_compilers),
         ]
 
-    # making 'compiler' a property to deprecate
-    # its usage as something else than a compiler type
-    # e.g. like a compiler instance
-    def __init__(self, dist):
-        self._compiler = None
-        Command.__init__(self, dist)
-
-    def __setattr__(self, name, value):
-        # need this to make sure setattr() (used in distutils)
-        # doesn't kill our property
-        if name == 'compiler':
-            self._set_compiler(value)
-        else:
-            self.__dict__[name] = value
-
-    def _set_compiler(self, compiler):
-        if not isinstance(compiler, str) and compiler is not None:
-            # we don't want to allow that anymore in the future
-            warn("'compiler' specifies the compiler type in build_ext. "
-                 "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", DeprecationWarning)
-        self._compiler = compiler
-
-    def _get_compiler(self):
-        if not isinstance(self._compiler, str) and self._compiler is not None:
-            # we don't want to allow that anymore in the future
-            warn("'compiler' specifies the compiler type in build_ext. "
-                 "If you want to get the compiler object itself, "
-                 "use 'compiler_obj'", DeprecationWarning)
-        return self._compiler
-
-    compiler = property(_get_compiler, _set_compiler)
-
     def initialize_options(self):
         self.extensions = None
         self.build_lib = None
@@ -171,7 +136,8 @@ def initialize_options(self):
         self.user = None
 
     def finalize_options(self):
-        _sysconfig = __import__('sysconfig')
+        from distutils import sysconfig
+
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('build_temp', 'build_temp'),
@@ -188,8 +154,8 @@ def finalize_options(self):
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        py_include = _sysconfig.get_path('include')
-        plat_py_include = _sysconfig.get_path('platinclude')
+        py_include = sysconfig.get_python_inc()
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         if self.include_dirs is None:
             self.include_dirs = self.distribution.include_dirs or []
         if isinstance(self.include_dirs, str):
@@ -261,13 +227,13 @@ def finalize_options(self):
         if os.name == 'os2':
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
 
-        # for extensions under Cygwin Python's library directory must be
+        # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin':
+        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                  "python" + _sysconfig.get_python_version(),
+                                                      "python" + get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions
@@ -275,13 +241,13 @@ def finalize_options(self):
 
         # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        _sysconfig.get_config_var('Py_ENABLE_SHARED')
+        sysconfig.get_config_var('Py_ENABLE_SHARED')
         if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
              or sys.platform.startswith('sunos'))
-            and _sysconfig.get_config_var('Py_ENABLE_SHARED')):
+            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
-                self.library_dirs.append(_sysconfig.get_config_var('LIBDIR'))
+                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:
                 # building python standard extensions
                 self.library_dirs.append('.')
@@ -344,50 +310,38 @@ def run(self):
 
         # Setup the CCompiler object that we'll use to do all the
         # compiling and linking
-
-        # used to prevent the usage of an existing compiler for the
-        # compiler option when calling new_compiler()
-        # this will be removed in 3.3 and 2.8
-        if not isinstance(self._compiler, str):
-            self._compiler = None
-
-        self.compiler_obj = new_compiler(compiler=self._compiler,
-                                         verbose=self.verbose,
-                                         dry_run=self.dry_run,
-                                         force=self.force)
-
-        # used to keep the compiler object reachable with
-        # "self.compiler". this will be removed in 3.3 and 2.8
-        self._compiler = self.compiler_obj
-
-        customize_compiler(self.compiler_obj)
+        self.compiler = new_compiler(compiler=self.compiler,
+                                     verbose=self.verbose,
+                                     dry_run=self.dry_run,
+                                     force=self.force)
+        customize_compiler(self.compiler)
         # If we are cross-compiling, init the compiler now (if we are not
         # cross-compiling, init would not hurt, but people may rely on
         # late initialization of compiler even if they shouldn't...)
         if os.name == 'nt' and self.plat_name != get_platform():
-            self.compiler_obj.initialize(self.plat_name)
+            self.compiler.initialize(self.plat_name)
 
         # And make sure that any compile/link-related options (which might
         # come from the command-line or from the setup script) are set in
         # that CCompiler object -- that way, they automatically apply to
         # all compiling and linking done here.
         if self.include_dirs is not None:
-            self.compiler_obj.set_include_dirs(self.include_dirs)
+            self.compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
             for (name, value) in self.define:
-                self.compiler_obj.define_macro(name, value)
+                self.compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
-                self.compiler_obj.undefine_macro(macro)
+                self.compiler.undefine_macro(macro)
         if self.libraries is not None:
-            self.compiler_obj.set_libraries(self.libraries)
+            self.compiler.set_libraries(self.libraries)
         if self.library_dirs is not None:
-            self.compiler_obj.set_library_dirs(self.library_dirs)
+            self.compiler.set_library_dirs(self.library_dirs)
         if self.rpath is not None:
-            self.compiler_obj.set_runtime_library_dirs(self.rpath)
+            self.compiler.set_runtime_library_dirs(self.rpath)
         if self.link_objects is not None:
-            self.compiler_obj.set_link_objects(self.link_objects)
+            self.compiler.set_link_objects(self.link_objects)
 
         # Now actually compile and link everything.
         self.build_extensions()
@@ -548,13 +502,13 @@ def build_extension(self, ext):
         for undef in ext.undef_macros:
             macros.append((undef,))
 
-        objects = self.compiler_obj.compile(sources,
-                                            output_dir=self.build_temp,
-                                            macros=macros,
-                                            include_dirs=ext.include_dirs,
-                                            debug=self.debug,
-                                            extra_postargs=extra_args,
-                                            depends=ext.depends)
+        objects = self.compiler.compile(sources,
+                                         output_dir=self.build_temp,
+                                         macros=macros,
+                                         include_dirs=ext.include_dirs,
+                                         debug=self.debug,
+                                         extra_postargs=extra_args,
+                                         depends=ext.depends)
 
         # XXX -- this is a Vile HACK!
         #
@@ -575,9 +529,9 @@ def build_extension(self, ext):
         extra_args = ext.extra_link_args or []
 
         # Detect target language, if not provided
-        language = ext.language or self.compiler_obj.detect_language(sources)
+        language = ext.language or self.compiler.detect_language(sources)
 
-        self.compiler_obj.link_shared_object(
+        self.compiler.link_shared_object(
             objects, ext_path,
             libraries=self.get_libraries(ext),
             library_dirs=ext.library_dirs,
@@ -710,13 +664,13 @@ def get_ext_filename(self, ext_name):
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-        _sysconfig = __import__('sysconfig')
+        from distutils.sysconfig import get_config_var
         ext_path = ext_name.split('.')
         # OS/2 has an 8 character module (extension) limit :-(
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
-        so_ext = _sysconfig.get_config_var('SO')
+        so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
             return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
@@ -744,7 +698,7 @@ def get_libraries(self, ext):
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
             from distutils.msvccompiler import MSVCCompiler
-            if not isinstance(self.compiler_obj, MSVCCompiler):
+            if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
                     template = template + '_d'
@@ -775,12 +729,28 @@ def get_libraries(self, ext):
             # don't extend ext.libraries, it may be shared with other
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
+        elif sys.platform[:6] == "atheos":
+            from distutils import sysconfig
+
+            template = "python%d.%d"
+            pythonlib = (template %
+                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+            # Get SHLIBS from Makefile
+            extra = []
+            for lib in sysconfig.get_config_var('SHLIBS').split():
+                if lib.startswith('-l'):
+                    extra.append(lib[2:])
+                else:
+                    extra.append(lib)
+            # don't extend ext.libraries, it may be shared with other
+            # extensions, it is a reference to the original list
+            return ext.libraries + [pythonlib, "m"] + extra
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
         else:
-            _sysconfig = __import__('sysconfig')
-            if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            from distutils import sysconfig
+            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 template = "python%d.%d"
                 pythonlib = (template %
                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
diff --git a/command/build_py.py b/command/build_py.py
index 7cc935390f..26002e4b3f 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -4,16 +4,16 @@
 
 __revision__ = "$Id$"
 
-import os
+import sys, os
 import sys
 from glob import glob
 
 from distutils.core import Command
-from distutils.errors import DistutilsOptionError, DistutilsFileError
+from distutils.errors import *
 from distutils.util import convert_path, Mixin2to3
 from distutils import log
 
-class build_py(Command):
+class build_py (Command):
 
     description = "\"build\" pure Python modules (copy to build directory)"
 
@@ -133,6 +133,7 @@ def find_data_files(self, package, src_dir):
 
     def build_package_data(self):
         """Copy data files into build directory"""
+        lastdir = None
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
diff --git a/command/build_scripts.py b/command/build_scripts.py
index a54d6ed742..8b08bfeaf0 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -6,6 +6,7 @@
 
 import os, re
 from stat import ST_MODE
+from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
 from distutils.util import convert_path, Mixin2to3
@@ -56,7 +57,6 @@ def copy_scripts(self):
         ie. starts with "\#!" and contains "python"), then adjust the first
         line to refer to the current Python interpreter as we copy.
         """
-        _sysconfig = __import__('sysconfig')
         self.mkpath(self.build_dir)
         outfiles = []
         updated_files = []
@@ -96,16 +96,16 @@ def copy_scripts(self):
                 updated_files.append(outfile)
                 if not self.dry_run:
                     outf = open(outfile, "w")
-                    if not _sysconfig.is_python_build():
+                    if not sysconfig.python_build:
                         outf.write("#!%s%s\n" %
                                    (self.executable,
                                     post_interp))
                     else:
                         outf.write("#!%s%s\n" %
                                    (os.path.join(
-                            _sysconfig.get_config_var("BINDIR"),
-                           "python%s%s" % (_sysconfig.get_config_var("VERSION"),
-                                           _sysconfig.get_config_var("EXE"))),
+                            sysconfig.get_config_var("BINDIR"),
+                           "python%s%s" % (sysconfig.get_config_var("VERSION"),
+                                           sysconfig.get_config_var("EXE"))),
                                     post_interp))
                     outf.writelines(f.readlines())
                     outf.close()
diff --git a/command/config.py b/command/config.py
index 56f643c88b..ac80a54eb1 100644
--- a/command/config.py
+++ b/command/config.py
@@ -11,12 +11,11 @@
 
 __revision__ = "$Id$"
 
-import os
-import re
+import sys, os, re
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
-from distutils.ccompiler import customize_compiler
+from distutils.sysconfig import customize_compiler
 from distutils import log
 
 LANG_EXT = {"c": ".c", "c++": ".cxx"}
diff --git a/command/install.py b/command/install.py
index e3e387ab5d..2a905d92f8 100644
--- a/command/install.py
+++ b/command/install.py
@@ -7,17 +7,26 @@
 import sys
 import os
 
-from sysconfig import get_config_vars, get_paths, get_path, get_config_var
-
 from distutils import log
 from distutils.core import Command
 from distutils.debug import DEBUG
+from distutils.sysconfig import get_config_vars
 from distutils.errors import DistutilsPlatformError
 from distutils.file_util import write_file
-from distutils.util import convert_path, change_root, get_platform
+from distutils.util import convert_path, subst_vars, change_root
+from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
 
-# kept for backward compat, will be removed in 3.2
+# this keeps compatibility from 2.3 to 2.5
+if sys.version < "2.6":
+    USER_BASE = None
+    USER_SITE = None
+    HAS_USER_SITE = False
+else:
+    from site import USER_BASE
+    from site import USER_SITE
+    HAS_USER_SITE = True
+
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
         'purelib': '$base',
@@ -50,21 +59,15 @@
         'scripts': '$base/bin',
         'data'   : '$base',
         },
-    'unix_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        },
     'nt': WINDOWS_SCHEME,
-    'nt_user': {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
-        'data'   : '$userbase',
+    'mac': {
+        'purelib': '$base/Lib/site-packages',
+        'platlib': '$base/Lib/site-packages',
+        'headers': '$base/Include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
         },
+
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -72,26 +75,47 @@
         'scripts': '$base/Scripts',
         'data'   : '$base',
         },
-    'os2_home': {
+    }
+
+# user site schemes
+if HAS_USER_SITE:
+    INSTALL_SCHEMES['nt_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+        'scripts': '$userbase/Scripts',
+        'data'   : '$userbase',
+        }
+
+    INSTALL_SCHEMES['unix_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
         'headers': '$userbase/include/python$py_version_short/$dist_name',
         'scripts': '$userbase/bin',
         'data'   : '$userbase',
-        },
-    }
+        }
+
+    INSTALL_SCHEMES['mac_user'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/$py_version_short/include/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
 
+    INSTALL_SCHEMES['os2_home'] = {
+        'purelib': '$usersite',
+        'platlib': '$usersite',
+        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'scripts': '$userbase/bin',
+        'data'   : '$userbase',
+        }
+
+# The keys to an installation scheme; if any new types of files are to be
+# installed, be sure to add an entry to every installation scheme above,
+# and to SCHEME_KEYS here.
 SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
-# end of backward compat
 
-def _subst_vars(s, local_vars):
-    try:
-        return s.format(**local_vars)
-    except KeyError:
-        try:
-            return s.format(**os.environ)
-        except KeyError as var:
-            raise AttributeError('{%s}' % var)
 
 class install(Command):
 
@@ -158,10 +182,11 @@ class install(Command):
 
     boolean_options = ['compile', 'force', 'skip-build']
 
-    user_options.append(('user', None,
-                        "install in user site-package '%s'" % \
-                            get_path('purelib', '%s_user' % os.name)))
-    boolean_options.append('user')
+    if HAS_USER_SITE:
+        user_options.append(('user', None,
+                             "install in user site-package '%s'" % USER_SITE))
+        boolean_options.append('user')
+
     negative_opt = {'no-compile' : 'compile'}
 
 
@@ -191,8 +216,8 @@ def initialize_options(self):
         self.install_lib = None         # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
-        self.install_userbase = get_config_var('userbase')
-        self.install_usersite = get_path('purelib', '%s_user' % os.name)
+        self.install_userbase = USER_BASE
+        self.install_usersite = USER_SITE
 
         self.compile = None
         self.optimize = None
@@ -302,9 +327,7 @@ def finalize_options(self):
         # about needing recursive variable expansion (shudder).
 
         py_version = sys.version.split()[0]
-        prefix, exec_prefix, srcdir, projectbase = get_config_vars('prefix', 'exec_prefix',
-                                                      'srcdir', 'projectbase')
-
+        (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
@@ -315,12 +338,12 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
-                            'srcdir': srcdir,
-                            'projectbase': projectbase,
                            }
 
-        self.config_vars['userbase'] = self.install_userbase
-        self.config_vars['usersite'] = self.install_usersite
+        if HAS_USER_SITE:
+            self.config_vars['userbase'] = self.install_userbase
+            self.config_vars['usersite'] = self.install_usersite
+
         self.expand_basedirs()
 
         self.dump_dirs("post-expand_basedirs()")
@@ -424,10 +447,10 @@ def finalize_unix(self):
                 raise DistutilsPlatformError(
                     "User base directory is not specified")
             self.install_base = self.install_platbase = self.install_userbase
-            self.select_scheme("posix_user")
+            self.select_scheme("unix_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("posix_home")
+            self.select_scheme("unix_home")
         else:
             if self.prefix is None:
                 if self.exec_prefix is not None:
@@ -443,7 +466,7 @@ def finalize_unix(self):
 
             self.install_base = self.prefix
             self.install_platbase = self.exec_prefix
-            self.select_scheme("posix_prefix")
+            self.select_scheme("unix_prefix")
 
     def finalize_other(self):
         """Finalizes options for non-posix platforms"""
@@ -455,7 +478,7 @@ def finalize_other(self):
             self.select_scheme(os.name + "_user")
         elif self.home is not None:
             self.install_base = self.install_platbase = self.home
-            self.select_scheme("posix_home")
+            self.select_scheme("unix_home")
         else:
             if self.prefix is None:
                 self.prefix = os.path.normpath(sys.prefix)
@@ -470,15 +493,11 @@ def finalize_other(self):
     def select_scheme(self, name):
         """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
-        scheme = get_paths(name, expand=False)
-        for key, value in scheme.items():
-            if key == 'platinclude':
-                key = 'headers'
-                value = os.path.join(value, self.distribution.get_name())
+        scheme = INSTALL_SCHEMES[name]
+        for key in SCHEME_KEYS:
             attrname = 'install_' + key
-            if hasattr(self, attrname):
-                if getattr(self, attrname) is None:
-                    setattr(self, attrname, value)
+            if getattr(self, attrname) is None:
+                setattr(self, attrname, scheme[key])
 
     def _expand_attrs(self, attrs):
         for attr in attrs:
@@ -486,7 +505,7 @@ def _expand_attrs(self, attrs):
             if val is not None:
                 if os.name == 'posix' or os.name == 'nt':
                     val = os.path.expanduser(val)
-                val = _subst_vars(val, self.config_vars)
+                val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
     def expand_basedirs(self):
diff --git a/command/register.py b/command/register.py
index 7d3dc53afe..bdf5f8f09c 100644
--- a/command/register.py
+++ b/command/register.py
@@ -7,15 +7,13 @@
 
 __revision__ = "$Id$"
 
-import os
-import string
-import getpass
+import os, string, getpass
 import io
-import urllib.parse
-import urllib.request
+import urllib.parse, urllib.request
 from warnings import warn
 
 from distutils.core import PyPIRCCommand
+from distutils.errors import *
 from distutils import log
 
 class register(PyPIRCCommand):
diff --git a/command/sdist.py b/command/sdist.py
index f6e099b89f..bb2106120a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -7,14 +7,14 @@
 import os
 import string
 import sys
+from types import *
 from glob import glob
 from warnings import warn
 
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
-from distutils.errors import (DistutilsPlatformError, DistutilsOptionError,
-                              DistutilsTemplateError)
+from distutils.errors import *
 from distutils.filelist import FileList
 from distutils import log
 from distutils.util import convert_path
@@ -76,10 +76,6 @@ def checking_metadata(self):
         ('medata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
-        ('owner=', 'u',
-         "Owner name used when creating a tar file [default: current user]"),
-        ('group=', 'g',
-         "Group name used when creating a tar file [default: current group]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
@@ -119,8 +115,6 @@ def initialize_options(self):
 
         self.archive_files = None
         self.metadata_check = 1
-        self.owner = None
-        self.group = None
 
     def finalize_options(self):
         if self.manifest is None:
@@ -424,8 +418,7 @@ def make_distribution(self):
             self.formats.append(self.formats.pop(self.formats.index('tar')))
 
         for fmt in self.formats:
-            file = self.make_archive(base_name, fmt, base_dir=base_dir,
-                                     owner=self.owner, group=self.group)
+            file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
             self.distribution.dist_files.append(('sdist', '', file))
 
diff --git a/command/upload.py b/command/upload.py
index bb1b7fc4fe..f602fbeb68 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,19 +1,25 @@
 """distutils.command.upload
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-import os
-import io
-import socket
-import platform
-from urllib.request import urlopen, Request, HTTPError
-from base64 import standard_b64encode
-from urllib.parse import urlparse
-from hashlib import md5
 
-from distutils.errors import DistutilsOptionError
+from distutils.errors import *
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log
+import sys
+import os, io
+import socket
+import platform
+import configparser
+import http.client as httpclient
+from base64 import standard_b64encode
+import urllib.parse
+
+# this keeps compatibility for 2.3 and 2.4
+if sys.version < "2.5":
+    from md5 import md5
+else:
+    from hashlib import md5
 
 class upload(PyPIRCCommand):
 
@@ -60,15 +66,6 @@ def run(self):
             self.upload_file(command, pyversion, filename)
 
     def upload_file(self, command, pyversion, filename):
-        # Makes sure the repository URL is compliant
-        schema, netloc, url, params, query, fragments = \
-            urlparse(self.repository)
-        if params or query or fragments:
-            raise AssertionError("Incompatible url %s" % self.repository)
-
-        if schema not in ('http', 'https'):
-            raise AssertionError("unsupported schema " + schema)
-
         # Sign if requested
         if self.sign:
             gpg_args = ["gpg", "--detach-sign", "-a", filename]
@@ -140,10 +137,10 @@ def upload_file(self, command, pyversion, filename):
         for key, value in data.items():
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
-            if not isinstance(value, list):
+            if type(value) != type([]):
                 value = [value]
             for value in value:
-                if isinstance(value, tuple):
+                if type(value) is tuple:
                     title += '; filename="%s"' % value[0]
                     value = value[1]
                 else:
@@ -161,30 +158,40 @@ def upload_file(self, command, pyversion, filename):
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
 
         # build the Request
-        headers = {'Content-type':
-                        'multipart/form-data; boundary=%s' % boundary,
-                   'Content-length': str(len(body)),
-                   'Authorization': auth}
-
-        request = Request(self.repository, data=body,
-                          headers=headers)
-        # send the data
+        # We can't use urllib since we need to send the Basic
+        # auth right with the first request
+        # TODO(jhylton): Can we fix urllib?
+        schema, netloc, url, params, query, fragments = \
+            urllib.parse.urlparse(self.repository)
+        assert not params and not query and not fragments
+        if schema == 'http':
+            http = httpclient.HTTPConnection(netloc)
+        elif schema == 'https':
+            http = httpclient.HTTPSConnection(netloc)
+        else:
+            raise AssertionError("unsupported schema "+schema)
+
+        data = ''
+        loglevel = log.INFO
         try:
-            result = urlopen(request)
-            status = result.getcode()
-            reason = result.msg
+            http.connect()
+            http.putrequest("POST", url)
+            http.putheader('Content-type',
+                           'multipart/form-data; boundary=%s'%boundary)
+            http.putheader('Content-length', str(len(body)))
+            http.putheader('Authorization', auth)
+            http.endheaders()
+            http.send(body)
         except socket.error as e:
             self.announce(str(e), log.ERROR)
             return
-        except HTTPError as e:
-            status = e.code
-            reason = e.msg
 
-        if status == 200:
-            self.announce('Server response (%s): %s' % (status, reason),
+        r = http.getresponse()
+        if r.status == 200:
+            self.announce('Server response (%s): %s' % (r.status, r.reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (status, reason),
+            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, result.read(), '-'*75)
+            self.announce('-'*75, r.read(), '-'*75)
diff --git a/config.py b/config.py
index fe41ce977e..5b625f3f7d 100644
--- a/config.py
+++ b/config.py
@@ -4,6 +4,7 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
+import sys
 from configparser import ConfigParser
 
 from distutils.cmd import Command
@@ -59,6 +60,8 @@ def _read_pypirc(self):
         if os.path.exists(rc):
             self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
+            realm = self.realm or self.DEFAULT_REALM
+
             config = ConfigParser()
             config.read(rc)
             sections = config.sections()
diff --git a/core.py b/core.py
index 6ed3e8fa97..6e4892039e 100644
--- a/core.py
+++ b/core.py
@@ -8,12 +8,10 @@
 
 __revision__ = "$Id$"
 
-import sys
-import os
+import sys, os
 
 from distutils.debug import DEBUG
-from distutils.errors import (DistutilsSetupError, DistutilsArgError,
-                              DistutilsError, CCompilerError)
+from distutils.errors import *
 from distutils.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils.core import" them.
@@ -33,9 +31,9 @@
    or: %(script)s cmd --help
 """
 
-def gen_usage(script_name):
+def gen_usage (script_name):
     script = os.path.basename(script_name)
-    return USAGE % {'script': script}
+    return USAGE % vars()
 
 
 # Some mild magic to control the behaviour of 'setup()' from 'run_setup()'.
@@ -58,7 +56,7 @@ def gen_usage(script_name):
                       'extra_objects', 'extra_compile_args', 'extra_link_args',
                       'swig_opts', 'export_symbols', 'depends', 'language')
 
-def setup(**attrs):
+def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
     to do, in a highly flexible and user-driven way.  Briefly: create a
     Distribution instance; find and parse config files; parse the command
@@ -131,9 +129,8 @@ class found in 'cmdclass' is used in place of the default, which is
     if _setup_stop_after == "config":
         return dist
 
-    # Parse the command line and override config files; any
-    # command-line errors are the end user's fault, so turn them into
-    # SystemExit to suppress tracebacks.
+    # Parse the command line; any command-line errors are the end user's
+    # fault, so turn them into SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError as msg:
@@ -170,8 +167,10 @@ class found in 'cmdclass' is used in place of the default, which is
 
     return dist
 
+# setup ()
 
-def run_setup(script_name, script_args=None, stop_after="run"):
+
+def run_setup (script_name, script_args=None, stop_after="run"):
     """Run a setup script in a somewhat controlled environment, and
     return the Distribution instance that drives things.  This is useful
     if you need to find out the distribution meta-data (passed as
@@ -234,4 +233,7 @@ def run_setup(script_name, script_args=None, stop_after="run"):
 
     # I wonder if the setup script's namespace -- g and l -- would be of
     # any interest to callers?
+    #print "_setup_distribution:", _setup_distribution
     return _setup_distribution
+
+# run_setup ()
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index f381f60875..8504371810 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -50,13 +50,16 @@
 import os
 import sys
 import copy
+from subprocess import Popen, PIPE
 import re
-from warnings import warn
 
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils.util import get_compiler_versions
+from distutils import log
+from distutils.version import LooseVersion
+from distutils.spawn import find_executable
 
 def get_msvcr():
     """Include the appropriate MSVC runtime library if Python was built
@@ -107,7 +110,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
                 % details)
 
         self.gcc_version, self.ld_version, self.dllwrap_version = \
-            get_compiler_versions()
+            get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
                          (self.gcc_version,
                           self.ld_version,
@@ -337,7 +340,7 @@ def check_config_h():
     # XXX since this function also checks sys.version, it's not strictly a
     # "pyconfig.h" check -- should probably be renamed...
 
-    _sysconfig = __import__('sysconfig')
+    from distutils import sysconfig
 
     # if sys.version contains GCC then python was compiled with GCC, and the
     # pyconfig.h file should be OK
@@ -345,7 +348,7 @@ def check_config_h():
         return CONFIG_H_OK, "sys.version mentions 'GCC'"
 
     # let's see if __GNUC__ is mentioned in python.h
-    fn = _sysconfig.get_config_h_filename()
+    fn = sysconfig.get_config_h_filename()
     try:
         with open(fn) as config_h:
             if "__GNUC__" in config_h.read():
@@ -356,27 +359,33 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-class _Deprecated_SRE_Pattern(object):
-    def __init__(self, pattern):
-        self.pattern = pattern
+RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
 
-    def __getattr__(self, name):
-        if name in ('findall', 'finditer', 'match', 'scanner', 'search',
-                    'split', 'sub', 'subn'):
-            warn("'distutils.cygwinccompiler.RE_VERSION' is deprecated "
-                 "and will be removed in the next version", DeprecationWarning)
-        return getattr(self.pattern, name)
+def _find_exe_version(cmd):
+    """Find the version of an executable by running `cmd` in the shell.
 
-
-RE_VERSION = _Deprecated_SRE_Pattern(re.compile('(\d+\.\d+(\.\d+)*)'))
+    If the command is not found, or the output does not match
+    `RE_VERSION`, returns None.
+    """
+    executable = cmd.split()[0]
+    if find_executable(executable) is None:
+        return None
+    out = Popen(cmd, shell=True, stdout=PIPE).stdout
+    try:
+        out_string = out.read()
+    finally:
+        out.close()
+    result = RE_VERSION.search(out_string)
+    if result is None:
+        return None
+    # LooseVersion works with strings
+    # so we need to decode our bytes
+    return LooseVersion(result.group(1).decode())
 
 def get_versions():
     """ Try to find out the versions of gcc, ld and dllwrap.
 
     If not possible it returns None for it.
     """
-    warn("'distutils.cygwinccompiler.get_versions' is deprecated "
-         "use 'distutils.util.get_compiler_versions' instead",
-         DeprecationWarning)
-
-    return get_compiler_versions()
+    commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
+    return tuple([_find_exe_version(cmd) for cmd in commands])
diff --git a/dep_util.py b/dep_util.py
index b91a62eb56..07b3549c6f 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -9,27 +9,29 @@
 import os
 from distutils.errors import DistutilsFileError
 
-def newer(source, target):
-    """Tells if the target is newer than the source.
 
-    Return true if 'source' exists and is more recently modified than
-    'target', or if 'source' exists and 'target' doesn't.
-
-    Return false if both exist and 'target' is the same age or younger
-    than 'source'. Raise DistutilsFileError if 'source' does not exist.
-
-    Note that this test is not very accurate: files created in the same second
-    will have the same "age".
+def newer (source, target):
+    """Return true if 'source' exists and is more recently modified than
+    'target', or if 'source' exists and 'target' doesn't.  Return false if
+    both exist and 'target' is the same age or younger than 'source'.
+    Raise DistutilsFileError if 'source' does not exist.
     """
     if not os.path.exists(source):
         raise DistutilsFileError("file '%s' does not exist" %
                                  os.path.abspath(source))
     if not os.path.exists(target):
-        return True
+        return 1
+
+    from stat import ST_MTIME
+    mtime1 = os.stat(source)[ST_MTIME]
+    mtime2 = os.stat(target)[ST_MTIME]
+
+    return mtime1 > mtime2
+
+# newer ()
 
-    return os.stat(source).st_mtime > os.stat(target).st_mtime
 
-def newer_pairwise(sources, targets):
+def newer_pairwise (sources, targets):
     """Walk two filename lists in parallel, testing if each source is newer
     than its corresponding target.  Return a pair of lists (sources,
     targets) where source is newer than target, according to the semantics
@@ -41,18 +43,19 @@ def newer_pairwise(sources, targets):
     # build a pair of lists (sources, targets) where  source is newer
     n_sources = []
     n_targets = []
-    for source, target in zip(sources, targets):
-        if newer(source, target):
-            n_sources.append(source)
-            n_targets.append(target)
+    for i in range(len(sources)):
+        if newer(sources[i], targets[i]):
+            n_sources.append(sources[i])
+            n_targets.append(targets[i])
 
-    return n_sources, n_targets
+    return (n_sources, n_targets)
+
+# newer_pairwise ()
 
-def newer_group(sources, target, missing='error'):
-    """Return true if 'target' is out-of-date with respect to any file
-    listed in 'sources'.
 
-    In other words, if 'target' exists and is newer
+def newer_group (sources, target, missing='error'):
+    """Return true if 'target' is out-of-date with respect to any file
+    listed in 'sources'.  In other words, if 'target' exists and is newer
     than every file in 'sources', return false; otherwise return true.
     'missing' controls what we do when a source file is missing; the
     default ("error") is to blow up with an OSError from inside 'stat()';
@@ -65,14 +68,14 @@ def newer_group(sources, target, missing='error'):
     """
     # If the target doesn't even exist, then it's definitely out-of-date.
     if not os.path.exists(target):
-        return True
+        return 1
 
     # Otherwise we have to find out the hard way: if *any* source file
     # is more recent than 'target', then 'target' is out-of-date and
     # we can immediately return true.  If we fall through to the end
     # of the loop, then 'target' is up-to-date and we return false.
-    target_mtime = os.stat(target).st_mtime
-
+    from stat import ST_MTIME
+    target_mtime = os.stat(target)[ST_MTIME]
     for source in sources:
         if not os.path.exists(source):
             if missing == 'error':      # blow up when we stat() the file
@@ -80,9 +83,12 @@ def newer_group(sources, target, missing='error'):
             elif missing == 'ignore':   # missing source dropped from
                 continue                #  target's dependency list
             elif missing == 'newer':    # missing source means target is
-                return True             #  out-of-date
+                return 1                #  out-of-date
 
-        if os.stat(source).st_mtime > target_mtime:
-            return True
+        source_mtime = os.stat(source)[ST_MTIME]
+        if source_mtime > target_mtime:
+            return 1
+    else:
+        return 0
 
-    return False
+# newer_group ()
diff --git a/dir_util.py b/dir_util.py
index 370025b734..98e6252c6c 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -4,7 +4,7 @@
 
 __revision__ = "$Id$"
 
-import os
+import os, sys
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/dist.py b/dist.py
index 5a107e7d83..1c1ea477db 100644
--- a/dist.py
+++ b/dist.py
@@ -7,15 +7,13 @@
 __revision__ = "$Id$"
 
 import sys, os, re
-from email import message_from_file
 
 try:
     import warnings
 except ImportError:
     warnings = None
 
-from distutils.errors import (DistutilsOptionError, DistutilsArgError,
-                              DistutilsModuleError, DistutilsClassError)
+from distutils.errors import *
 from distutils.fancy_getopt import FancyGetopt, translate_longopt
 from distutils.util import check_environ, strtobool, rfc822_escape
 from distutils import log
@@ -55,9 +53,7 @@ class Distribution:
                       ('quiet', 'q', "run quietly (turns verbosity off)"),
                       ('dry-run', 'n', "don't actually do anything"),
                       ('help', 'h', "show detailed help message"),
-                      ('no-user-cfg', None,
-                       'ignore pydistutils.cfg in your home directory'),
-    ]
+                     ]
 
     # 'common_usage' is a short (2-3 line) string describing the common
     # usage of the setup script.
@@ -264,22 +260,6 @@ def __init__ (self, attrs=None):
                     else:
                         sys.stderr.write(msg + "\n")
 
-        # no-user-cfg is handled before other command line args
-        # because other args override the config files, and this
-        # one is needed before we can load the config files.
-        # If attrs['script_args'] wasn't passed, assume false.
-        #
-        # This also make sure we just look at the global options
-        self.want_user_cfg = True
-
-        if self.script_args is not None:
-            for arg in self.script_args:
-                if not arg.startswith('-'):
-                    break
-                if arg == '--no-user-cfg':
-                    self.want_user_cfg = False
-                    break
-
         self.finalize_options()
 
     def get_option_dict(self, command):
@@ -331,10 +311,7 @@ def find_config_files(self):
         Distutils installation directory (ie. where the top-level
         Distutils __inst__.py file lives), a file in the user's home
         directory named .pydistutils.cfg on Unix and pydistutils.cfg
-        on Windows/Mac; and setup.cfg in the current directory.
-
-        The file in the user's home directory can be disabled with the
-        --no-user-cfg option.
+        on Windows/Mac, and setup.cfg in the current directory.
         """
         files = []
         check_environ()
@@ -354,19 +331,15 @@ def find_config_files(self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        if self.want_user_cfg:
-            user_file = os.path.join(os.path.expanduser('~'), user_filename)
-            if os.path.isfile(user_file):
-                files.append(user_file)
+        user_file = os.path.join(os.path.expanduser('~'), user_filename)
+        if os.path.isfile(user_file):
+            files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):
             files.append(local_file)
 
-        if DEBUG:
-            self.announce("using config files: %s" % ', '.join(files))
-
         return files
 
     def parse_config_files(self, filenames=None):
@@ -1016,80 +989,25 @@ class DistributionMetadata:
                          "provides", "requires", "obsoletes",
                          )
 
-    def __init__(self, path=None):
-        if path is not None:
-            self.read_pkg_file(open(path))
-        else:
-            self.name = None
-            self.version = None
-            self.author = None
-            self.author_email = None
-            self.maintainer = None
-            self.maintainer_email = None
-            self.url = None
-            self.license = None
-            self.description = None
-            self.long_description = None
-            self.keywords = None
-            self.platforms = None
-            self.classifiers = None
-            self.download_url = None
-            # PEP 314
-            self.provides = None
-            self.requires = None
-            self.obsoletes = None
-
-    def read_pkg_file(self, file):
-        """Reads the metadata values from a file object."""
-        msg = message_from_file(file)
-
-        def _read_field(name):
-            value = msg[name]
-            if value == 'UNKNOWN':
-                return None
-            return value
-
-        def _read_list(name):
-            values = msg.get_all(name, None)
-            if values == []:
-                return None
-            return values
-
-        metadata_version = msg['metadata-version']
-        self.name = _read_field('name')
-        self.version = _read_field('version')
-        self.description = _read_field('summary')
-        # we are filling author only.
-        self.author = _read_field('author')
+    def __init__ (self):
+        self.name = None
+        self.version = None
+        self.author = None
+        self.author_email = None
         self.maintainer = None
-        self.author_email = _read_field('author-email')
         self.maintainer_email = None
-        self.url = _read_field('home-page')
-        self.license = _read_field('license')
-
-        if 'download-url' in msg:
-            self.download_url = _read_field('download-url')
-        else:
-            self.download_url = None
-
-        self.long_description = _read_field('description')
-        self.description = _read_field('summary')
-
-        if 'keywords' in msg:
-            self.keywords = _read_field('keywords').split(',')
-
-        self.platforms = _read_list('platform')
-        self.classifiers = _read_list('classifier')
-
-        # PEP 314 - these fields only exist in 1.1
-        if metadata_version == '1.1':
-            self.requires = _read_list('requires')
-            self.provides = _read_list('provides')
-            self.obsoletes = _read_list('obsoletes')
-        else:
-            self.requires = None
-            self.provides = None
-            self.obsoletes = None
+        self.url = None
+        self.license = None
+        self.description = None
+        self.long_description = None
+        self.keywords = None
+        self.platforms = None
+        self.classifiers = None
+        self.download_url = None
+        # PEP 314
+        self.provides = None
+        self.requires = None
+        self.obsoletes = None
 
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
diff --git a/emxccompiler.py b/emxccompiler.py
index fd79aec2cf..62a4c5b4e8 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -21,13 +21,12 @@
 
 __revision__ = "$Id$"
 
-import os, sys, copy
-from warnings import warn
-
+import os,sys,copy
+from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils.util import get_compiler_versions
+from distutils import log
 
 class EMXCCompiler (UnixCCompiler):
 
@@ -56,8 +55,8 @@ def __init__ (self,
                 ("Reason: %s." % details) +
                 "Compiling may fail because of undefined preprocessor macros.")
 
-        gcc_version, ld_version, dllwrap_version = get_compiler_versions()
-        self.gcc_version, self.ld_version = gcc_version, ld_version
+        (self.gcc_version, self.ld_version) = \
+            get_versions()
         self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
                          (self.gcc_version,
                           self.ld_version) )
@@ -292,11 +291,23 @@ def get_versions():
     """ Try to find out the versions of gcc and ld.
         If not possible it returns None for it.
     """
-    warn("'distutils.emxccompiler.get_versions' is deprecated "
-         "use 'distutils.util.get_compiler_versions' instead",
-         DeprecationWarning)
-
+    from distutils.version import StrictVersion
+    from distutils.spawn import find_executable
+    import re
+
+    gcc_exe = find_executable('gcc')
+    if gcc_exe:
+        out = os.popen(gcc_exe + ' -dumpversion','r')
+        out_string = out.read()
+        out.close()
+        result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
+        if result:
+            gcc_version = StrictVersion(result.group(1))
+        else:
+            gcc_version = None
+    else:
+        gcc_version = None
     # EMX ld has no way of reporting version number, and we use GCC
     # anyway - so we can link OMF DLLs
-    gcc_version, ld_version, dllwrap_version = get_compiler_versions()
-    return gcc_version, None
+    ld_version = None
+    return (gcc_version, ld_version)
diff --git a/errors.py b/errors.py
index d9c47c761c..acecacccb5 100644
--- a/errors.py
+++ b/errors.py
@@ -10,79 +10,90 @@
 
 __revision__ = "$Id$"
 
-class DistutilsError(Exception):
+class DistutilsError (Exception):
     """The root of all Distutils evil."""
+    pass
 
-class DistutilsModuleError(DistutilsError):
+class DistutilsModuleError (DistutilsError):
     """Unable to load an expected module, or to find an expected class
     within some module (in particular, command modules and classes)."""
+    pass
 
-class DistutilsClassError(DistutilsError):
+class DistutilsClassError (DistutilsError):
     """Some command class (or possibly distribution class, if anyone
     feels a need to subclass Distribution) is found not to be holding
     up its end of the bargain, ie. implementing some part of the
     "command "interface."""
+    pass
 
-class DistutilsGetoptError(DistutilsError):
+class DistutilsGetoptError (DistutilsError):
     """The option table provided to 'fancy_getopt()' is bogus."""
+    pass
 
-class DistutilsArgError(DistutilsError):
+class DistutilsArgError (DistutilsError):
     """Raised by fancy_getopt in response to getopt.error -- ie. an
     error in the command line usage."""
+    pass
 
-class DistutilsFileError(DistutilsError):
+class DistutilsFileError (DistutilsError):
     """Any problems in the filesystem: expected file not found, etc.
     Typically this is for problems that we detect before IOError or
     OSError could be raised."""
+    pass
 
-class DistutilsOptionError(DistutilsError):
+class DistutilsOptionError (DistutilsError):
     """Syntactic/semantic errors in command options, such as use of
     mutually conflicting options, or inconsistent options,
     badly-spelled values, etc.  No distinction is made between option
     values originating in the setup script, the command line, config
     files, or what-have-you -- but if we *know* something originated in
     the setup script, we'll raise DistutilsSetupError instead."""
+    pass
 
-class DistutilsSetupError(DistutilsError):
+class DistutilsSetupError (DistutilsError):
     """For errors that can be definitely blamed on the setup script,
     such as invalid keyword arguments to 'setup()'."""
+    pass
 
-class DistutilsPlatformError(DistutilsError):
+class DistutilsPlatformError (DistutilsError):
     """We don't know how to do something on the current platform (but
     we do know how to do it on some platform) -- eg. trying to compile
     C files on a platform not supported by a CCompiler subclass."""
+    pass
 
-class DistutilsExecError(DistutilsError):
+class DistutilsExecError (DistutilsError):
     """Any problems executing an external program (such as the C
     compiler, when compiling C files)."""
+    pass
 
-class DistutilsInternalError(DistutilsError):
+class DistutilsInternalError (DistutilsError):
     """Internal inconsistencies or impossibilities (obviously, this
     should never be seen if the code is working!)."""
+    pass
 
-class DistutilsTemplateError(DistutilsError):
+class DistutilsTemplateError (DistutilsError):
     """Syntax error in a file list template."""
 
 class DistutilsByteCompileError(DistutilsError):
     """Byte compile error."""
 
 # Exception classes used by the CCompiler implementation classes
-class CCompilerError(Exception):
+class CCompilerError (Exception):
     """Some compile/link operation failed."""
 
-class PreprocessError(CCompilerError):
+class PreprocessError (CCompilerError):
     """Failure to preprocess one or more C/C++ files."""
 
-class CompileError(CCompilerError):
+class CompileError (CCompilerError):
     """Failure to compile one or more C/C++ source files."""
 
-class LibError(CCompilerError):
+class LibError (CCompilerError):
     """Failure to create a static library from one or more C/C++ object
     files."""
 
-class LinkError(CCompilerError):
+class LinkError (CCompilerError):
     """Failure to link one or more C/C++ object files into an executable
     or shared library file."""
 
-class UnknownFileError(CCompilerError):
+class UnknownFileError (CCompilerError):
     """Attempt to process an unknown file type."""
diff --git a/extension.py b/extension.py
index ebe5437c22..5c07bdae82 100644
--- a/extension.py
+++ b/extension.py
@@ -6,6 +6,7 @@
 __revision__ = "$Id$"
 
 import os
+import sys
 import warnings
 
 # This class is really only used by the "build_ext" command, so it might
@@ -134,17 +135,14 @@ def __init__(self, name, sources,
 
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
-    warnings.warn('distutils.extensions.read_setup_file is deprecated. '
-                  'It will be removed in the next Python release.')
-    _sysconfig = __import__('sysconfig')
-    from distutils.sysconfig import (expand_makefile_vars,
+    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
                                      _variable_rx)
 
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
     # First pass over the file to gather "VAR = VALUE" assignments.
-    vars = _sysconfig._parse_makefile(filename)
+    vars = parse_makefile(filename)
 
     # Second pass to gobble up the real content: lines of the form
     #   <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -164,10 +162,7 @@ def read_setup_file(filename):
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            line = expand_makefile_vars(line, vars)
-
+        line = expand_makefile_vars(line, vars)
         words = split_quoted(line)
 
         # NB. this parses a slightly different syntax than the old
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 73343ad5af..879d4d25bf 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -10,11 +10,9 @@
 
 __revision__ = "$Id$"
 
-import sys
-import string
-import re
+import sys, string, re
 import getopt
-from distutils.errors import DistutilsGetoptError, DistutilsArgError
+from distutils.errors import *
 
 # Much like command_re in distutils.core, this is close to but not quite
 # the same as a Python NAME -- except, in the spirit of most GNU
@@ -446,3 +444,16 @@ def __init__(self, options=[]):
         'options' will be initialized to None."""
         for opt in options:
             setattr(self, opt, None)
+
+
+if __name__ == "__main__":
+    text = """\
+Tra-la-la, supercalifragilisticexpialidocious.
+How *do* you spell that odd word, anyways?
+(Someone ask Mary -- she'll know [or she'll
+say, "How should I know?"].)"""
+
+    for w in (10, 20, 30, 40):
+        print("width: %d" % w)
+        print("\n".join(wrap_text(text, w)))
+        print()
diff --git a/file_util.py b/file_util.py
index 3a71bfd1ac..65aa7e0fdd 100644
--- a/file_util.py
+++ b/file_util.py
@@ -10,18 +10,17 @@
 from distutils import log
 
 # for generating verbose output in 'copy_file()'
-_copy_action = {None: 'copying',
-                'hard': 'hard linking',
-                'sym': 'symbolically linking'}
+_copy_action = { None:   'copying',
+                 'hard': 'hard linking',
+                 'sym':  'symbolically linking' }
 
 
 def _copy_file_contents(src, dst, buffer_size=16*1024):
-    """Copy the file 'src' to 'dst'.
-
-    Both must be filenames. Any error opening either file, reading from
-    'src', or writing to 'dst', raises DistutilsFileError.  Data is
-    read/written in chunks of 'buffer_size' bytes (default 16k).  No attempt
-    is made to handle anything apart from regular files.
+    """Copy the file 'src' to 'dst'; both must be filenames.  Any error
+    opening either file, reading from 'src', or writing to 'dst', raises
+    DistutilsFileError.  Data is read/written in chunks of 'buffer_size'
+    bytes (default 16k).  No attempt is made to handle anything apart from
+    regular files.
     """
     # Stolen from shutil module in the standard library, but with
     # custom error-handling added.
@@ -69,16 +68,15 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
 
 def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
               link=None, verbose=1, dry_run=0):
-    """Copy a file 'src' to 'dst'.
-
-    If 'dst' is a directory, then 'src' is copied there with the same name;
-    otherwise, it must be a filename.  (If the file exists, it will be
-    ruthlessly clobbered.)  If 'preserve_mode' is true (the default),
-    the file's mode (type and permission bits, or whatever is analogous on
-    the current platform) is copied.  If 'preserve_times' is true (the
-    default), the last-modified and last-access times are copied as well.
-    If 'update' is true, 'src' will only be copied if 'dst' does not exist,
-    or if 'dst' does exist but is older than 'src'.
+    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
+    copied there with the same name; otherwise, it must be a filename.  (If
+    the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
+    is true (the default), the file's mode (type and permission bits, or
+    whatever is analogous on the current platform) is copied.  If
+    'preserve_times' is true (the default), the last-modified and
+    last-access times are copied as well.  If 'update' is true, 'src' will
+    only be copied if 'dst' does not exist, or if 'dst' does exist but is
+    older than 'src'.
 
     'link' allows you to make hard links (os.link) or symbolic links
     (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
@@ -132,6 +130,15 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     if dry_run:
         return (dst, 1)
 
+    # On Mac OS, use the native file copy routine
+    if os.name == 'mac':
+        import macostools
+        try:
+            macostools.copy(src, dst, 0, preserve_times)
+        except os.error as exc:
+            raise DistutilsFileError(
+                  "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
+
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
@@ -159,12 +166,13 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
 
 
 # XXX I suspect this is Unix-specific -- need porting help!
-def move_file(src, dst, verbose=1, dry_run=0):
-    """Move a file 'src' to 'dst'.
+def move_file (src, dst,
+               verbose=1,
+               dry_run=0):
 
-    If 'dst' is a directory, the file will be moved into it with the same
-    name; otherwise, 'src' is just renamed to 'dst'.  Return the new
-    full name of the file.
+    """Move a file 'src' to 'dst'.  If 'dst' is a directory, the file will
+    be moved into it with the same name; otherwise, 'src' is just renamed
+    to 'dst'.  Return the new full name of the file.
 
     Handles cross-device moves on Unix using 'copy_file()'.  What about
     other systems???
@@ -221,7 +229,7 @@ def move_file(src, dst, verbose=1, dry_run=0):
     return dst
 
 
-def write_file(filename, contents):
+def write_file (filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
diff --git a/filelist.py b/filelist.py
index bfc6df694a..06a8da9a07 100644
--- a/filelist.py
+++ b/filelist.py
@@ -108,7 +108,7 @@ def process_template_line(self, line):
         # defined: it's the first word of the line.  Which of the other
         # three are defined depends on the action; it'll be either
         # patterns, (dir and patterns), or (dir_pattern).
-        action, patterns, dir, dir_pattern = self._parse_template_line(line)
+        (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
 
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
@@ -175,15 +175,15 @@ def process_template_line(self, line):
             raise DistutilsInternalError(
                   "this cannot happen: invalid action '%s'" % action)
 
+
     # -- Filtering/selection methods -----------------------------------
 
     def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         """Select strings (presumably filenames) from 'self.files' that
-        match 'pattern', a Unix-style wildcard (glob) pattern.
-
-        Patterns are not quite the same as implemented by the 'fnmatch'
-        module: '*' and '?'  match non-special characters, where "special"
-        is platform-dependent: slash on Unix; colon, slash, and backslash on
+        match 'pattern', a Unix-style wildcard (glob) pattern.  Patterns
+        are not quite the same as implemented by the 'fnmatch' module: '*'
+        and '?'  match non-special characters, where "special" is platform-
+        dependent: slash on Unix; colon, slash, and backslash on
         DOS/Windows; and colon on Mac OS.
 
         If 'anchor' is true (the default), then the pattern match is more
@@ -220,13 +220,13 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
         return files_found
 
 
-    def exclude_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
+    def exclude_pattern (self, pattern,
+                         anchor=1, prefix=None, is_regex=0):
         """Remove strings (presumably filenames) from 'files' that match
-        'pattern'.
-
-        Other parameters are the same as for 'include_pattern()', above.
-        The list 'self.files' is modified in place. Return 1 if files are
-        found.
+        'pattern'.  Other parameters are the same as for
+        'include_pattern()', above.
+        The list 'self.files' is modified in place.
+        Return True if files are found, False otherwise.
         """
         files_found = False
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
@@ -275,11 +275,10 @@ def findall(dir=os.curdir):
 
 
 def glob_to_re(pattern):
-    """Translate a shell-like glob pattern to a regular expression.
-
-    Return a string containing the regex.  Differs from
-    'fnmatch.translate()' in that '*' does not match "special characters"
-    (which are platform-specific).
+    """Translate a shell-like glob pattern to a regular expression; return
+    a string containing the regex.  Differs from 'fnmatch.translate()' in
+    that '*' does not match "special characters" (which are
+    platform-specific).
     """
     pattern_re = fnmatch.translate(pattern)
 
@@ -297,9 +296,7 @@ def glob_to_re(pattern):
 
 def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     """Translate a shell-like wildcard pattern to a compiled regular
-    expression.
-
-    Return the compiled regex.  If 'is_regex' true,
+    expression.  Return the compiled regex.  If 'is_regex' true,
     then 'pattern' is directly compiled to a regex (if it's a string)
     or just returned as-is (assumes it's a regex object).
     """
@@ -317,7 +314,7 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     if prefix is not None:
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
-        prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
+        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
         pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 15425d7194..761b9ca236 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -19,9 +19,10 @@
 import sys
 import re
 
-from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
-                              CompileError, LibError, LinkError)
-from distutils.ccompiler import CCompiler, gen_lib_options
+from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
+                             CompileError, LibError, LinkError
+from distutils.ccompiler import CCompiler, gen_preprocess_options, \
+                                gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
diff --git a/msvccompiler.py b/msvccompiler.py
index dc3bd8de47..1cd0f91d5f 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -10,12 +10,12 @@
 
 __revision__ = "$Id$"
 
-import sys
-import os
-
-from distutils.errors import (DistutilsExecError, DistutilsPlatformError,
-                              CompileError, LibError, LinkError)
-from distutils.ccompiler import CCompiler, gen_lib_options
+import sys, os
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
+     CompileError, LibError, LinkError
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
 from distutils import log
 
 _can_read_reg = False
@@ -124,7 +124,7 @@ def load_macros(self, version):
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallrootv1.1")
             else:
                 self.set_macro("FrameworkSDKDir", net, "sdkinstallroot")
-        except KeyError:
+        except KeyError as exc: #
             raise DistutilsPlatformError(
             """Python was built with Visual Studio 2003;
 extensions must be built with a compiler than can generate compatible binaries.
diff --git a/sysconfig.py b/sysconfig.py
index 4a8629e6bd..0fbd5412bc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -7,9 +7,6 @@
 
 Written by:   Fred L. Drake, Jr.
 Email:        <fdrake@acm.org>
-
-**This module has been moved out of Distutils and will be removed from
-Python in the next version (3.3)**
 """
 
 __revision__ = "$Id$"
@@ -17,45 +14,51 @@
 import io
 import os
 import re
-from warnings import warn
-
-from distutils.errors import DistutilsPlatformError
-
-# importing sysconfig from Lib
-# to avoid this module to shadow it
-_sysconfig = __import__('sysconfig')
-
-# names defined here to keep backward compatibility
-# for APIs that were relocated
-get_python_version = _sysconfig.get_python_version
-get_config_h_filename = _sysconfig.get_config_h_filename
-parse_config_h = _sysconfig.parse_config_h
-get_config_vars = _sysconfig.get_config_vars
-get_config_var = _sysconfig.get_config_var
-from distutils.ccompiler import customize_compiler
-
-_DEPRECATION_MSG = ("distutils.sysconfig.%s is deprecated. "
-                    "Use the APIs provided by the sysconfig module instead")
-
-def _get_project_base():
-    return _sysconfig._PROJECT_BASE
-
-project_base = _get_project_base()
-
-class _DeprecatedBool(int):
-    def __nonzero__(self):
-        warn(_DEPRECATION_MSG % 'get_python_version', DeprecationWarning)
-        return super(_DeprecatedBool, self).__nonzero__()
-
+import sys
+
+from .errors import DistutilsPlatformError
+
+# These are needed in a couple of spots, so just compute them once.
+PREFIX = os.path.normpath(sys.prefix)
+EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+
+# Path to the base directory of the project. On Windows the binary may
+# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+# it'll live in project/PCbuild/amd64.
+project_base = os.path.dirname(os.path.abspath(sys.executable))
+if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
+# PC/VS7.1
+if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
+# PC/AMD64
+if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
+    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
+                                                os.path.pardir))
+
+# python_build: (Boolean) if true, we're either building Python or
+# building an extension with an un-installed Python, so we use
+# different (hard-wired) directories.
+# Setup.local is available for Makefile builds including VPATH builds,
+# Setup.dist is available on Windows
 def _python_build():
-    return _DeprecatedBool(_sysconfig.is_python_build())
-
+    for fn in ("Setup.dist", "Setup.local"):
+        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
+            return True
+    return False
 python_build = _python_build()
 
-def get_python_inc(plat_specific=0, prefix=None):
-    """This function is deprecated.
+def get_python_version():
+    """Return a string containing the major and minor Python version,
+    leaving off the patchlevel.  Sample return values could be '1.5'
+    or '2.2'.
+    """
+    return sys.version[:3]
+
 
-    Return the directory containing installed Python header files.
+def get_python_inc(plat_specific=0, prefix=None):
+    """Return the directory containing installed Python header files.
 
     If 'plat_specific' is false (the default), this is the path to the
     non-platform-specific header files, i.e. Python.h and so on;
@@ -65,22 +68,39 @@ def get_python_inc(plat_specific=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    warn(_DEPRECATION_MSG % 'get_python_inc', DeprecationWarning)
-    get_path = _sysconfig.get_path
-
-    if prefix is not None:
-        vars = {'base': prefix}
-        return get_path('include', vars=vars)
-
-    if not plat_specific:
-        return get_path('include')
+    if prefix is None:
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
+    if os.name == "posix":
+        if python_build:
+            # Assume the executable is in the build directory.  The
+            # pyconfig.h file should be in the same directory.  Since
+            # the build directory may not be the source directory, we
+            # must use "srcdir" from the makefile to find the "Include"
+            # directory.
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if plat_specific:
+                return base
+            else:
+                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                return os.path.normpath(incdir)
+        return os.path.join(prefix, "include", "python" + get_python_version())
+    elif os.name == "nt":
+        return os.path.join(prefix, "include")
+    elif os.name == "mac":
+        if plat_specific:
+            return os.path.join(prefix, "Mac", "Include")
+        else:
+            return os.path.join(prefix, "Include")
+    elif os.name == "os2":
+        return os.path.join(prefix, "Include")
     else:
-        return get_path('platinclude')
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its C header files "
+            "on platform '%s'" % os.name)
 
-def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
-    """This function is deprecated.
 
-    Return the directory containing the Python library (standard or
+def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+    """Return the directory containing the Python library (standard or
     site additions).
 
     If 'plat_specific' is true, return the directory containing
@@ -93,33 +113,149 @@ def get_python_lib(plat_specific=False, standard_lib=False, prefix=None):
     If 'prefix' is supplied, use it instead of sys.prefix or
     sys.exec_prefix -- i.e., ignore 'plat_specific'.
     """
-    warn(_DEPRECATION_MSG % 'get_python_lib', DeprecationWarning)
-    vars = {}
-    get_path = _sysconfig.get_path
-    if prefix is not None:
-        if plat_specific:
-            vars['platbase'] = prefix
+    if prefix is None:
+        prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+    if os.name == "posix":
+        libpython = os.path.join(prefix,
+                                 "lib", "python" + get_python_version())
+        if standard_lib:
+            return libpython
         else:
-            vars['base'] = prefix
-    if standard_lib:
+            return os.path.join(libpython, "site-packages")
+    elif os.name == "nt":
+        if standard_lib:
+            return os.path.join(prefix, "Lib")
+        else:
+            if get_python_version() < "2.2":
+                return prefix
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
+    elif os.name == "mac":
         if plat_specific:
-            return get_path('platstdlib', vars=vars)
+            if standard_lib:
+                return os.path.join(prefix, "Lib", "lib-dynload")
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
+        else:
+            if standard_lib:
+                return os.path.join(prefix, "Lib")
+            else:
+                return os.path.join(prefix, "Lib", "site-packages")
+    elif os.name == "os2":
+        if standard_lib:
+            return os.path.join(prefix, "Lib")
         else:
-            return get_path('stdlib', vars=vars)
+            return os.path.join(prefix, "Lib", "site-packages")
     else:
-        if plat_specific:
-            return get_path('platlib', vars=vars)
+        raise DistutilsPlatformError(
+            "I don't know where Python installs its library "
+            "on platform '%s'" % os.name)
+
+
+def customize_compiler(compiler):
+    """Do any platform-specific customization of a CCompiler instance.
+
+    Mainly needed on Unix, so we can plug in the information that
+    varies across Unices and is stored in Python's Makefile.
+    """
+    if compiler.compiler_type == "unix":
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
+
+        if 'CC' in os.environ:
+            cc = os.environ['CC']
+        if 'CXX' in os.environ:
+            cxx = os.environ['CXX']
+        if 'LDSHARED' in os.environ:
+            ldshared = os.environ['LDSHARED']
+        if 'CPP' in os.environ:
+            cpp = os.environ['CPP']
+        else:
+            cpp = cc + " -E"           # not always
+        if 'LDFLAGS' in os.environ:
+            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+        if 'CFLAGS' in os.environ:
+            cflags = opt + ' ' + os.environ['CFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CFLAGS']
+        if 'CPPFLAGS' in os.environ:
+            cpp = cpp + ' ' + os.environ['CPPFLAGS']
+            cflags = cflags + ' ' + os.environ['CPPFLAGS']
+            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
         else:
-            return get_path('purelib', vars=vars)
+            archiver = ar + ' ' + ar_flags
+
+        cc_cmd = cc + ' ' + cflags
+        compiler.set_executables(
+            preprocessor=cpp,
+            compiler=cc_cmd,
+            compiler_so=cc_cmd + ' ' + ccshared,
+            compiler_cxx=cxx,
+            linker_so=ldshared,
+            linker_exe=cc,
+            archiver=archiver)
+
+        compiler.shared_lib_extension = so_ext
+
+
+def get_config_h_filename():
+    """Return full pathname of installed pyconfig.h file."""
+    if python_build:
+        if os.name == "nt":
+            inc_dir = os.path.join(project_base, "PC")
+        else:
+            inc_dir = project_base
+    else:
+        inc_dir = get_python_inc(plat_specific=1)
+    if get_python_version() < '2.2':
+        config_h = 'config.h'
+    else:
+        # The name of the config.h file changed in 2.2
+        config_h = 'pyconfig.h'
+    return os.path.join(inc_dir, config_h)
+
 
 def get_makefile_filename():
-    """This function is deprecated.
+    """Return full pathname of installed Makefile from the Python build."""
+    if python_build:
+        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+    return os.path.join(lib_dir, "config", "Makefile")
+
+
+def parse_config_h(fp, g=None):
+    """Parse a config.h-style file.
 
-    Return full pathname of installed Makefile from the Python build.
+    A dictionary containing name/value pairs is returned.  If an
+    optional dictionary is passed in as the second argument, it is
+    used instead of a new dictionary.
     """
+    if g is None:
+        g = {}
+    define_rx = re.compile("#define ([A-Z][A-Za-z0-9_]+) (.*)\n")
+    undef_rx = re.compile("/[*] #undef ([A-Z][A-Za-z0-9_]+) [*]/\n")
+    #
+    while True:
+        line = fp.readline()
+        if not line:
+            break
+        m = define_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            try: v = int(v)
+            except ValueError: pass
+            g[n] = v
+        else:
+            m = undef_rx.match(line)
+            if m:
+                g[m.group(1)] = 0
+    return g
 
-    warn(_DEPRECATION_MSG % 'get_makefile_filename', DeprecationWarning)
-    return _sysconfig._get_makefile_filename()
 
 # Regexes needed for parsing Makefile (and similar syntaxes,
 # like old-style Setup files).
@@ -128,29 +264,91 @@ def get_makefile_filename():
 _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
 
 def parse_makefile(fn, g=None):
-    """This function is deprecated.
-
-    Parse a Makefile-style file.
+    """Parse a Makefile-style file.
 
     A dictionary containing name/value pairs is returned.  If an
     optional dictionary is passed in as the second argument, it is
     used instead of a new dictionary.
     """
-    warn(_DEPRECATION_MSG % 'parse_makefile', DeprecationWarning)
-    return _sysconfig._parse_makefile(fn, g)
+    from distutils.text_file import TextFile
+    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
 
-def expand_makefile_vars(s, vars):
-    """This function is deprecated.
+    if g is None:
+        g = {}
+    done = {}
+    notdone = {}
 
-    Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
+    while True:
+        line = fp.readline()
+        if line is None: # eof
+            break
+        m = _variable_rx.match(line)
+        if m:
+            n, v = m.group(1, 2)
+            v = v.strip()
+            # `$$' is a literal `$' in make
+            tmpv = v.replace('$$', '')
+
+            if "$" in tmpv:
+                notdone[n] = v
+            else:
+                try:
+                    v = int(v)
+                except ValueError:
+                    # insert literal `$'
+                    done[n] = v.replace('$$', '$')
+                else:
+                    done[n] = v
+
+    # do variable interpolation here
+    while notdone:
+        for name in list(notdone):
+            value = notdone[name]
+            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+            if m:
+                n = m.group(1)
+                found = True
+                if n in done:
+                    item = str(done[n])
+                elif n in notdone:
+                    # get it on a subsequent round
+                    found = False
+                elif n in os.environ:
+                    # do it like make: fall back to environment
+                    item = os.environ[n]
+                else:
+                    done[n] = item = ""
+                if found:
+                    after = value[m.end():]
+                    value = value[:m.start()] + item + after
+                    if "$" in after:
+                        notdone[name] = value
+                    else:
+                        try: value = int(value)
+                        except ValueError:
+                            done[name] = value.strip()
+                        else:
+                            done[name] = value
+                        del notdone[name]
+            else:
+                # bogus variable reference; just drop it since we can't deal
+                del notdone[name]
+
+    fp.close()
+
+    # save the results in the global dictionary
+    g.update(done)
+    return g
+
+
+def expand_makefile_vars(s, vars):
+    """Expand Makefile-style variables -- "${foo}" or "$(foo)" -- in
     'string' according to 'vars' (a dictionary mapping variable names to
     values).  Variables not present in 'vars' are silently expanded to the
     empty string.  The variable values in 'vars' should not contain further
     variable expansions; if 'vars' is the output of 'parse_makefile()',
     you're fine.  Returns a variable-expanded version of 's'.
     """
-    warn('this function will be removed in then next version of Python',
-         DeprecationWarning)
 
     # This algorithm does multiple expansion, so if vars['foo'] contains
     # "${bar}", it will expand ${foo} to ${bar}, and then expand
@@ -166,3 +364,220 @@ def expand_makefile_vars(s, vars):
         else:
             break
     return s
+
+
+_config_vars = None
+
+def _init_posix():
+    """Initialize the module as appropriate for POSIX systems."""
+    g = {}
+    # load the installed Makefile:
+    try:
+        filename = get_makefile_filename()
+        parse_makefile(filename, g)
+    except IOError as msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(io.open(filename), g)
+    except IOError as msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # On MacOSX we need to check the setting of the environment variable
+    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
+    # it needs to be compatible.
+    # If it isn't set we set it to the configure-time value
+    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
+        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
+        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
+        if cur_target == '':
+            cur_target = cfg_target
+            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
+        elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]:
+            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
+                % (cur_target, cfg_target))
+            raise DistutilsPlatformError(my_msg)
+
+    # On AIX, there are wrong paths to the linker scripts in the Makefile
+    # -- these paths are relative to the Python source, but when installed
+    # the scripts are in another directory.
+    if python_build:
+        g['LDSHARED'] = g['BLDSHARED']
+
+    elif get_python_version() < '2.1':
+        # The following two branches are for 1.5.2 compatibility.
+        if sys.platform == 'aix4':          # what about AIX 3.x ?
+            # Linker script is in the config directory, not in Modules as the
+            # Makefile says.
+            python_lib = get_python_lib(standard_lib=1)
+            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
+            python_exp = os.path.join(python_lib, 'config', 'python.exp')
+
+            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
+
+    global _config_vars
+    _config_vars = g
+
+
+def _init_nt():
+    """Initialize the module as appropriate for NT"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    g['SO'] = '.pyd'
+    g['EXE'] = ".exe"
+    g['VERSION'] = get_python_version().replace(".", "")
+    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
+
+    global _config_vars
+    _config_vars = g
+
+
+def _init_mac():
+    """Initialize the module as appropriate for Macintosh systems"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    import MacOS
+    if not hasattr(MacOS, 'runtimemodel'):
+        g['SO'] = '.ppc.slb'
+    else:
+        g['SO'] = '.%s.slb' % MacOS.runtimemodel
+
+    # XXX are these used anywhere?
+    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
+    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
+
+    # These are used by the extension module build
+    g['srcdir'] = ':'
+    global _config_vars
+    _config_vars = g
+
+
+def _init_os2():
+    """Initialize the module as appropriate for OS/2"""
+    g = {}
+    # set basic install directories
+    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
+
+    # XXX hmmm.. a normal install puts include files here
+    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
+
+    g['SO'] = '.pyd'
+    g['EXE'] = ".exe"
+
+    global _config_vars
+    _config_vars = g
+
+
+def get_config_vars(*args):
+    """With no arguments, return a dictionary of all configuration
+    variables relevant for the current platform.  Generally this includes
+    everything needed to build extensions and install both pure modules and
+    extensions.  On Unix, this means every variable defined in Python's
+    installed Makefile; on Windows and Mac OS it's a much smaller set.
+
+    With arguments, return a list of values that result from looking up
+    each argument in the configuration variable dictionary.
+    """
+    global _config_vars
+    if _config_vars is None:
+        func = globals().get("_init_" + os.name)
+        if func:
+            func()
+        else:
+            _config_vars = {}
+
+        # Normalized versions of prefix and exec_prefix are handy to have;
+        # in fact, these are the standard versions used most places in the
+        # Distutils.
+        _config_vars['prefix'] = PREFIX
+        _config_vars['exec_prefix'] = EXEC_PREFIX
+
+        # Convert srcdir into an absolute path if it appears necessary.
+        # Normally it is relative to the build directory.  However, during
+        # testing, for example, we might be running a non-installed python
+        # from a different directory.
+        if python_build and os.name == "posix":
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if (not os.path.isabs(_config_vars['srcdir']) and
+                base != os.getcwd()):
+                # srcdir is relative and we are not in the same directory
+                # as the executable. Assume executable is in the build
+                # directory and make srcdir absolute.
+                srcdir = os.path.join(base, _config_vars['srcdir'])
+                _config_vars['srcdir'] = os.path.normpath(srcdir)
+
+        if sys.platform == 'darwin':
+            kernel_version = os.uname()[2] # Kernel version (8.4.3)
+            major_version = int(kernel_version.split('.')[0])
+
+            if major_version < 8:
+                # On Mac OS X before 10.4, check if -arch and -isysroot
+                # are in CFLAGS or LDFLAGS and remove them if they are.
+                # This is needed when building extensions on a 10.3 system
+                # using a universal build of python.
+                for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+                    flags = _config_vars[key]
+                    flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
+                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
+                    _config_vars[key] = flags
+
+            else:
+
+                # Allow the user to override the architecture flags using
+                # an environment variable.
+                # NOTE: This name was introduced by Apple in OSX 10.5 and
+                # is used by several scripting languages distributed with
+                # that OS release.
+
+                if 'ARCHFLAGS' in os.environ:
+                    arch = os.environ['ARCHFLAGS']
+                    for key in ('LDFLAGS', 'BASECFLAGS',
+                        # a number of derived variables. These need to be
+                        # patched up as well.
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                        flags = _config_vars[key]
+                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
+                        flags = flags + ' ' + arch
+                        _config_vars[key] = flags
+
+    if args:
+        vals = []
+        for name in args:
+            vals.append(_config_vars.get(name))
+        return vals
+    else:
+        return _config_vars
+
+def get_config_var(name):
+    """Return the value of a single variable using the dictionary
+    returned by 'get_config_vars()'.  Equivalent to
+    get_config_vars().get(name)
+    """
+    return get_config_vars().get(name)
diff --git a/tests/support.py b/tests/support.py
index 45c94411ee..e258d2e58d 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -3,19 +3,11 @@
 import shutil
 import tempfile
 from copy import deepcopy
-import warnings
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
-def capture_warnings(func):
-    def _capture_warnings(*args, **kw):
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            return func(*args, **kw)
-    return _capture_warnings
-
 class LoggingSilencer(object):
 
     def setUp(self):
@@ -63,8 +55,6 @@ def tearDown(self):
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()
-            if not os.path.exists(d):
-                continue
             shutil.rmtree(d, os.name in ('nt', 'cygwin'))
 
     def mkdtemp(self):
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 682f19a2b3..c6e08cbc2b 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -14,31 +14,16 @@
 from distutils.tests import support
 from test.support import check_warnings
 
-try:
-    import grp
-    import pwd
-    UID_GID_SUPPORT = True
-except ImportError:
-    UID_GID_SUPPORT = False
-
 try:
     import zipfile
     ZIP_SUPPORT = True
 except ImportError:
     ZIP_SUPPORT = find_executable('zip')
 
-# some tests will fail if zlib is not available
-try:
-    import zlib
-except ImportError:
-    zlib = None
-
-
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -49,7 +34,7 @@ def test_make_tarball(self):
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
-                            "source and target should be on same drive")
+                            "Source and target should be on same drive")
 
         base_name = os.path.join(tmpdir2, 'archive')
 
@@ -99,7 +84,6 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
-    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
                          'Need the tar command to run')
     def test_tarfile_vs_tar(self):
@@ -185,7 +169,6 @@ def test_compress_deprecated(self):
         self.assertTrue(not os.path.exists(tarball))
         self.assertEquals(len(w.warnings), 1)
 
-    @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
         # creating something to tar
@@ -210,59 +193,6 @@ def test_make_archive(self):
         base_name = os.path.join(tmpdir, 'archive')
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
-    @unittest.skipUnless(zlib, "Requires zlib")
-    def test_make_archive_owner_group(self):
-        # testing make_archive with owner and group, with various combinations
-        # this works even if there's not gid/uid support
-        if UID_GID_SUPPORT:
-            group = grp.getgrgid(0)[0]
-            owner = pwd.getpwuid(0)[0]
-        else:
-            group = owner = 'root'
-
-        base_dir, root_dir, base_name =  self._create_files()
-        base_name = os.path.join(self.mkdtemp() , 'archive')
-        res = make_archive(base_name, 'zip', root_dir, base_dir, owner=owner,
-                           group=group)
-        self.assertTrue(os.path.exists(res))
-
-        res = make_archive(base_name, 'zip', root_dir, base_dir)
-        self.assertTrue(os.path.exists(res))
-
-        res = make_archive(base_name, 'tar', root_dir, base_dir,
-                           owner=owner, group=group)
-        self.assertTrue(os.path.exists(res))
-
-        res = make_archive(base_name, 'tar', root_dir, base_dir,
-                           owner='kjhkjhkjg', group='oihohoh')
-        self.assertTrue(os.path.exists(res))
-
-    @unittest.skipUnless(zlib, "Requires zlib")
-    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
-    def test_tarfile_root_owner(self):
-        tmpdir, tmpdir2, base_name =  self._create_files()
-        old_dir = os.getcwd()
-        os.chdir(tmpdir)
-        group = grp.getgrgid(0)[0]
-        owner = pwd.getpwuid(0)[0]
-        try:
-            archive_name = make_tarball(base_name, 'dist', compress=None,
-                                        owner=owner, group=group)
-        finally:
-            os.chdir(old_dir)
-
-        # check if the compressed tarball was created
-        self.assertTrue(os.path.exists(archive_name))
-
-        # now checks the rights
-        archive = tarfile.open(archive_name)
-        try:
-            for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
-        finally:
-            archive.close()
-
     def test_make_archive_cwd(self):
         current_dir = os.getcwd()
         def _breaks(*args, **kw):
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index 29dcc7c8ba..f2849a9756 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -5,8 +5,6 @@
 import tempfile
 import shutil
 
-from test.support import run_unittest
-
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
@@ -42,4 +40,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 746144bf5b..5e76809f23 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -4,15 +4,6 @@
 import sys
 import os
 
-# zlib is not used here, but if it's not available
-# test_simple_built will fail
-try:
-    import zlib
-except ImportError:
-    zlib = None
-
-from test.support import run_unittest
-
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -42,7 +33,6 @@ def tearDown(self):
         sys.argv[:] = self.old_sys_argv[1]
         super(BuildDumbTestCase, self).tearDown()
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_simple_built(self):
 
         # let's create a simple package
@@ -83,23 +73,8 @@ def test_simple_built(self):
         # now let's check what we have in the zip file
         # XXX to be done
 
-    def test_finalize_options(self):
-        pkg_dir, dist = self.create_dist()
-        os.chdir(pkg_dir)
-        cmd = bdist_dumb(dist)
-        self.assertEquals(cmd.bdist_dir, None)
-        cmd.finalize_options()
-
-        # bdist_dir is initialized to bdist_base/dumb if not set
-        base = cmd.get_finalized_command('bdist').bdist_base
-        self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb'))
-
-        # the format is set to a default value depending on the os.name
-        default = cmd.default_format[os.name]
-        self.assertEquals(cmd.format, default)
-
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 1014e549af..2aa257f7e6 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -6,8 +6,6 @@
 import tempfile
 import shutil
 
-from test.support import run_unittest
-
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
 from distutils.tests import support
@@ -124,4 +122,4 @@ def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index ffe413536c..9b1ba6d107 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,8 +1,6 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
 
-from test.support import run_unittest
-
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
@@ -29,4 +27,4 @@ def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 145eff5453..536cd67319 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -120,7 +120,8 @@ def test_run(self):
         # before we run the command, we want to make sure
         # all commands are present on the system
         # by creating a compiler and checking its executables
-        from distutils.ccompiler import new_compiler, customize_compiler
+        from distutils.ccompiler import new_compiler
+        from distutils.sysconfig import customize_compiler
 
         compiler = new_compiler()
         customize_compiler(compiler)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e41a824fde..b7cdc20aa4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -3,13 +3,10 @@
 import tempfile
 import shutil
 from io import StringIO
-import warnings
-from test.support import check_warnings
-from test.support import captured_stdout
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
-import sysconfig
+from distutils import sysconfig
 from distutils.tests.support import TempdirManager
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
@@ -25,23 +22,19 @@
 
 def _get_source_filename():
     srcdir = sysconfig.get_config_var('srcdir')
-    if srcdir is None:
-        return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
-_XX_MODULE_PATH = _get_source_filename()
-
-class BuildExtTestCase(TempdirManager, LoggingSilencer, unittest.TestCase):
-
+class BuildExtTestCase(TempdirManager,
+                       LoggingSilencer,
+                       unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
         # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        if os.path.exists(_XX_MODULE_PATH):
-            self.sys_path = sys.path[:]
-            sys.path.append(self.tmp_dir)
-            shutil.copy(_XX_MODULE_PATH, self.tmp_dir)
+        self.sys_path = sys.path, sys.path[:]
+        sys.path.append(self.tmp_dir)
+        shutil.copy(_get_source_filename(), self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -49,19 +42,6 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
-    def tearDown(self):
-        # Get everything back to normal
-        if os.path.exists(_XX_MODULE_PATH):
-            support.unload('xx')
-            sys.path[:] = self.sys_path
-            # XXX on Windows the test leaves a directory
-            # with xx module in TEMP
-        shutil.rmtree(self.tmp_dir, os.name == 'nt' or
-                                    sys.platform == 'cygwin')
-        super(BuildExtTestCase, self).tearDown()
-
-    @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
-                     'xxmodule.c not found')
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -104,23 +84,35 @@ def test_build_ext(self):
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 
+    def tearDown(self):
+        # Get everything back to normal
+        support.unload('xx')
+        sys.path = self.sys_path[0]
+        sys.path[:] = self.sys_path[1]
+        if sys.version > "2.6":
+            import site
+            site.USER_BASE = self.old_user_base
+            from distutils.command import build_ext
+            build_ext.USER_BASE = self.old_user_base
+        super(BuildExtTestCase, self).tearDown()
+
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)
         old = sys.platform
 
         sys.platform = 'sunos' # fooling finalize_options
-        from sysconfig import _CONFIG_VARS
-        old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED')
-        _CONFIG_VARS['Py_ENABLE_SHARED'] = 1
+        from distutils.sysconfig import  _config_vars
+        old_var = _config_vars.get('Py_ENABLE_SHARED')
+        _config_vars['Py_ENABLE_SHARED'] = 1
         try:
             cmd.ensure_finalized()
         finally:
             sys.platform = old
             if old_var is None:
-                del _CONFIG_VARS['Py_ENABLE_SHARED']
+                del _config_vars['Py_ENABLE_SHARED']
             else:
-                _CONFIG_VARS['Py_ENABLE_SHARED'] = old_var
+                _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
         self.assertTrue(len(cmd.library_dirs) > 0)
@@ -182,10 +174,11 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.finalize_options()
 
-        py_include = sysconfig.get_path('include')
+        from distutils import sysconfig
+        py_include = sysconfig.get_python_inc()
         self.assertTrue(py_include in cmd.include_dirs)
 
-        plat_py_include = sysconfig.get_path('platinclude')
+        plat_py_include = sysconfig.get_python_inc(plat_specific=1)
         self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
@@ -336,6 +329,7 @@ def test_get_outputs(self):
         self.assertEquals(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
+        cmd.compiler = None
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))
@@ -404,26 +398,6 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEquals(wanted, path)
 
-    def test_compiler_deprecation_warning(self):
-        dist = Distribution()
-        cmd = build_ext(dist)
-
-        class MyCompiler(object):
-            def do_something(self):
-                pass
-
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            cmd.compiler = MyCompiler()
-            self.assertEquals(len(w.warnings), 1)
-            cmd.compile = 'unix'
-            self.assertEquals(len(w.warnings), 1)
-            cmd.compiler = MyCompiler()
-            cmd.compiler.do_something()
-            # two more warnings genereated by the get
-            # and the set
-            self.assertEquals(len(w.warnings), 3)
-
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 61e213a586..3e45f6e89e 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -16,7 +16,7 @@ class BuildPyTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
-    def _setup_package_data(self):
+    def test_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
         f.write("# Pretend this is a package.")
@@ -52,18 +52,9 @@ def _setup_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        return files
-
-    def test_package_data(self):
-        files = self._setup_package_data()
         self.assertTrue("__init__.py" in files)
-        self.assertTrue("README.txt" in files)
-
-    @unittest.skipIf(sys.flags.optimize >= 2,
-                     "pyc files are not written with -O2 and above")
-    def test_package_data_pyc(self):
-        files = self._setup_package_data()
         self.assertTrue("__init__.pyc" in files)
+        self.assertTrue("README.txt" in files)
 
     def test_empty_package_dir (self):
         # See SF 1668596/1720897.
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 72e8915c00..b1d2d079bd 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -5,7 +5,7 @@
 
 from distutils.command.build_scripts import build_scripts
 from distutils.core import Distribution
-import sysconfig
+from distutils import sysconfig
 
 from distutils.tests import support
 
@@ -91,12 +91,12 @@ def test_version_int(self):
         # --with-suffix=3`, python is compiled okay but the build scripts
         # failed when writing the name of the executable
         old = sysconfig.get_config_vars().get('VERSION')
-        sysconfig._CONFIG_VARS['VERSION'] = 4
+        sysconfig._config_vars['VERSION'] = 4
         try:
             cmd.run()
         finally:
             if old is not None:
-                sysconfig._CONFIG_VARS['VERSION'] = old
+                sysconfig._config_vars['VERSION'] = old
 
         built = os.listdir(target)
         for name in expected:
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
deleted file mode 100644
index 27b51a0645..0000000000
--- a/tests/test_ccompiler.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""Tests for distutils.ccompiler."""
-import os
-import unittest
-from test.support import captured_stdout
-
-from distutils.ccompiler import (gen_lib_options, CCompiler,
-                                 get_default_compiler, customize_compiler)
-from distutils import debug
-from distutils.tests import support
-
-class FakeCompiler(object):
-    def library_dir_option(self, dir):
-        return "-L" + dir
-
-    def runtime_library_dir_option(self, dir):
-        return ["-cool", "-R" + dir]
-
-    def find_library_file(self, dirs, lib, debug=0):
-        return 'found'
-
-    def library_option(self, lib):
-        return "-l" + lib
-
-class CCompilerTestCase(support.EnvironGuard, unittest.TestCase):
-
-    def test_gen_lib_options(self):
-        compiler = FakeCompiler()
-        libdirs = ['lib1', 'lib2']
-        runlibdirs = ['runlib1']
-        libs = [os.path.join('dir', 'name'), 'name2']
-
-        opts = gen_lib_options(compiler, libdirs, runlibdirs, libs)
-        wanted = ['-Llib1', '-Llib2', '-cool', '-Rrunlib1', 'found',
-                  '-lname2']
-        self.assertEquals(opts, wanted)
-
-    def test_debug_print(self):
-
-        class MyCCompiler(CCompiler):
-            executables = {}
-
-        compiler = MyCCompiler()
-        with captured_stdout() as stdout:
-            compiler.debug_print('xxx')
-        stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
-
-        debug.DEBUG = True
-        try:
-            with captured_stdout() as stdout:
-                compiler.debug_print('xxx')
-            stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
-        finally:
-            debug.DEBUG = False
-
-    def test_customize_compiler(self):
-
-        # not testing if default compiler is not unix
-        if get_default_compiler() != 'unix':
-            return
-
-        os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
-
-        # make sure AR gets caught
-        class compiler:
-            compiler_type = 'unix'
-
-            def set_executables(self, **kw):
-                self.exes = kw
-
-        comp = compiler()
-        customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
-
-def test_suite():
-    return unittest.makeSuite(CCompilerTestCase)
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 728652e2ca..55ae421d46 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout, run_unittest
+from test.support import captured_stdout
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -124,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 374f392d61..a57694d48e 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -2,21 +2,29 @@
 import unittest
 import sys
 import os
+from io import BytesIO
 import subprocess
-import warnings
-import sysconfig
-
-from test.support import check_warnings, run_unittest
-from test.support import captured_stdout
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
                                        CONFIG_H_UNCERTAIN, get_versions,
-                                       get_msvcr, RE_VERSION)
-from distutils.util import get_compiler_versions
+                                       get_msvcr)
 from distutils.tests import support
 
+class FakePopen(object):
+    test_class = None
+
+    def __init__(self, cmd, shell, stdout):
+        self.cmd = cmd.split()[0]
+        exes = self.test_class._exes
+        if self.cmd in exes:
+            # issue #6438 in Python 3.x, Popen returns bytes
+            self.stdout = BytesIO(exes[self.cmd])
+        else:
+            self.stdout = os.popen(cmd, 'r')
+
+
 class CygwinCCompilerTestCase(support.TempdirManager,
                               unittest.TestCase):
 
@@ -24,17 +32,32 @@ def setUp(self):
         super(CygwinCCompilerTestCase, self).setUp()
         self.version = sys.version
         self.python_h = os.path.join(self.mkdtemp(), 'python.h')
+        from distutils import sysconfig
         self.old_get_config_h_filename = sysconfig.get_config_h_filename
         sysconfig.get_config_h_filename = self._get_config_h_filename
+        self.old_find_executable = cygwinccompiler.find_executable
+        cygwinccompiler.find_executable = self._find_executable
+        self._exes = {}
+        self.old_popen = cygwinccompiler.Popen
+        FakePopen.test_class = self
+        cygwinccompiler.Popen = FakePopen
 
     def tearDown(self):
         sys.version = self.version
+        from distutils import sysconfig
         sysconfig.get_config_h_filename = self.old_get_config_h_filename
+        cygwinccompiler.find_executable = self.old_find_executable
+        cygwinccompiler.Popen = self.old_popen
         super(CygwinCCompilerTestCase, self).tearDown()
 
     def _get_config_h_filename(self):
         return self.python_h
 
+    def _find_executable(self, name):
+        if name in self._exes:
+            return name
+        return None
+
     def test_check_config_h(self):
 
         # check_config_h looks for "GCC" in sys.version first
@@ -58,6 +81,40 @@ def test_check_config_h(self):
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
         self.assertEquals(check_config_h()[0], CONFIG_H_OK)
 
+    def test_get_versions(self):
+
+        # get_versions calls distutils.spawn.find_executable on
+        # 'gcc', 'ld' and 'dllwrap'
+        self.assertEquals(get_versions(), (None, None, None))
+
+        # Let's fake we have 'gcc' and it returns '3.4.5'
+        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[0]), '3.4.5')
+
+        # and let's see what happens when the version
+        # doesn't match the regular expression
+        # (\d+\.\d+(\.\d+)*)
+        self._exes['gcc'] = b'very strange output'
+        res = get_versions()
+        self.assertEquals(res[0], None)
+
+        # same thing for ld
+        self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
+        res = get_versions()
+        self.assertEquals(str(res[1]), '2.17.50')
+        self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
+        res = get_versions()
+        self.assertEquals(res[1], None)
+
+        # and dllwrap
+        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
+        res = get_versions()
+        self.assertEquals(str(res[2]), '2.17.50')
+        self._exes['dllwrap'] = b'Cheese Wrap'
+        res = get_versions()
+        self.assertEquals(res[2], None)
+
     def test_get_msvcr(self):
 
         # none
@@ -90,23 +147,8 @@ def test_get_msvcr(self):
                        '[MSC v.1999 32 bits (Intel)]')
         self.assertRaises(ValueError, get_msvcr)
 
-
-    def test_get_version_deprecated(self):
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            # make sure get_compiler_versions and get_versions
-            # returns the same thing
-            self.assertEquals(get_compiler_versions(), get_versions())
-            # make sure using get_version() generated a warning
-            self.assertEquals(len(w.warnings), 1)
-            # make sure any usage of RE_VERSION will also
-            # generate a warning, but till works
-            version = RE_VERSION.search('1.2').group(1)
-            self.assertEquals(version, '1.2')
-            self.assertEquals(len(w.warnings), 2)
-
 def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
-    run_unittest(test_suite())
+    test_support.run_unittest(test_suite())
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 4f51c16e51..3b7637f3af 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -7,9 +7,8 @@
 import warnings
 import textwrap
 
-from distutils.dist import Distribution, fix_help_options, DistributionMetadata
+from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
-import distutils.dist
 
 from test.support import TESTFN, captured_stdout
 from distutils.tests import support
@@ -38,8 +37,7 @@ def find_config_files(self):
         return self._config_files
 
 
-class DistributionTestCase(support.TempdirManager,
-                           support.LoggingSilencer,
+class DistributionTestCase(support.LoggingSilencer,
                            support.EnvironGuard,
                            unittest.TestCase):
 
@@ -60,27 +58,6 @@ def create_distribution(self, configfiles=()):
         d.parse_command_line()
         return d
 
-    def test_debug_mode(self):
-        with open(TESTFN, "w") as f:
-            f.write("[global]")
-            f.write("command_packages = foo.bar, splat")
-
-        files = [TESTFN]
-        sys.argv.append("build")
-
-        with captured_stdout() as stdout:
-            self.create_distribution(files)
-        stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
-        distutils.dist.DEBUG = True
-        try:
-            with captured_stdout() as stdout:
-                self.create_distribution(files)
-            stdout.seek(0)
-            self.assertEquals(stdout.read(), '')
-        finally:
-            distutils.dist.DEBUG = False
-
     def test_command_packages_unspecified(self):
         sys.argv.append("build")
         d = self.create_distribution()
@@ -182,35 +159,6 @@ def test_announce(self):
         kwargs = {'level': 'ok2'}
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
-    def test_find_config_files_disable(self):
-        # Ticket #1180: Allow user to disable their home config file.
-        temp_home = self.mkdtemp()
-        if os.name == 'posix':
-            user_filename = os.path.join(temp_home, ".pydistutils.cfg")
-        else:
-            user_filename = os.path.join(temp_home, "pydistutils.cfg")
-
-        with open(user_filename, 'w') as f:
-            f.write('[distutils]\n')
-
-        def _expander(path):
-            return temp_home
-
-        old_expander = os.path.expanduser
-        os.path.expanduser = _expander
-        try:
-            d = distutils.dist.Distribution()
-            all_files = d.find_config_files()
-
-            d = distutils.dist.Distribution(attrs={'script_args':
-                                            ['--no-user-cfg']})
-            files = d.find_config_files()
-        finally:
-            os.path.expanduser = old_expander
-
-        # make sure --no-user-cfg disables the user cfg file
-        self.assertEquals(len(all_files)-1, len(files))
-
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
@@ -364,38 +312,11 @@ def test_long_description(self):
                  "version": "1.0",
                  "long_description": long_desc}
 
-        dist = distutils.dist.Distribution(attrs)
+        dist = Distribution(attrs)
         meta = self.format_metadata(dist)
         meta = meta.replace('\n' + 8 * ' ', '\n')
         self.assertTrue(long_desc in meta)
 
-    def test_read_metadata(self):
-        attrs = {"name": "package",
-                 "version": "1.0",
-                 "long_description": "desc",
-                 "description": "xxx",
-                 "download_url": "http://example.com",
-                 "keywords": ['one', 'two'],
-                 "requires": ['foo']}
-
-        dist = Distribution(attrs)
-        metadata = dist.metadata
-
-        # write it then reloads it
-        PKG_INFO = io.StringIO()
-        metadata.write_pkg_file(PKG_INFO)
-        PKG_INFO.seek(0)
-        metadata.read_pkg_file(PKG_INFO)
-
-        self.assertEquals(metadata.name, "package")
-        self.assertEquals(metadata.version, "1.0")
-        self.assertEquals(metadata.description, "xxx")
-        self.assertEquals(metadata.download_url, 'http://example.com')
-        self.assertEquals(metadata.keywords, ['one', 'two'])
-        self.assertEquals(metadata.platforms, ['UNKNOWN'])
-        self.assertEquals(metadata.obsoletes, None)
-        self.assertEquals(metadata.requires, ['foo'])
-
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))
diff --git a/tests/test_emxccompiler.py b/tests/test_emxccompiler.py
deleted file mode 100644
index 1360f8297a..0000000000
--- a/tests/test_emxccompiler.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""Tests for distutils.emxccompiler."""
-import unittest
-import sys
-import os
-import warnings
-
-from test.support import check_warnings, run_unittest
-from test.support import captured_stdout
-
-from distutils.emxccompiler import get_versions
-from distutils.util import get_compiler_versions
-from distutils.tests import support
-
-class EmxCCompilerTestCase(support.TempdirManager,
-                           unittest.TestCase):
-
-    def test_get_version_deprecated(self):
-        with check_warnings() as w:
-            warnings.simplefilter("always")
-            # make sure get_compiler_versions and get_versions
-            # returns the same gcc
-            gcc, ld, dllwrap = get_compiler_versions()
-            emx_gcc, emx_ld = get_versions()
-            self.assertEquals(gcc, emx_gcc)
-
-            # make sure using get_version() generated a warning
-            self.assertEquals(len(w.warnings), 1)
-
-def test_suite():
-    return unittest.makeSuite(EmxCCompilerTestCase)
-
-if __name__ == '__main__':
-    run_unittest(test_suite())
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 857284dd55..1ee30585fa 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -1,16 +1,13 @@
 """Tests for distutils.extension."""
-import os
-import sys
 import unittest
+import os
 import warnings
 
 from test.support import check_warnings
 from distutils.extension import read_setup_file, Extension
-from distutils.tests.support import capture_warnings
 
 class ExtensionTestCase(unittest.TestCase):
 
-    @capture_warnings
     def test_read_setup_file(self):
         # trying to read a Setup file
         # (sample extracted from the PyGame project)
@@ -33,22 +30,16 @@ def test_read_setup_file(self):
 
         self.assertEquals(names, wanted)
 
-    @unittest.skipIf(sys.flags.optimize >= 2,
-                     "Assertions are omitted with -O2 and above")
-    def test_extension_init_assertions(self):
-        # The first argument, which is the name, must be a string.
+    def test_extension_init(self):
+        # the first argument, which is the name, must be a string
         self.assertRaises(AssertionError, Extension, 1, [])
+        ext = Extension('name', [])
+        self.assertEquals(ext.name, 'name')
 
         # the second argument, which is the list of files, must
         # be a list of strings
         self.assertRaises(AssertionError, Extension, 'name', 'file')
         self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
-
-    def test_extension_init(self):
-        ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
-
-
         ext = Extension('name', ['file1', 'file2'])
         self.assertEquals(ext.sources, ['file1', 'file2'])
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 99b421f73f..fac4a5d1a9 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -3,7 +3,7 @@
 import os
 import shutil
 
-from distutils.file_util import move_file, write_file, copy_file
+from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
 
@@ -55,21 +55,6 @@ def test_move_file_verbosity(self):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEquals(self._logs, wanted)
 
-    def test_write_file(self):
-        lines = ['a', 'b', 'c']
-        dir = self.mkdtemp()
-        foo = os.path.join(dir, 'foo')
-        write_file(foo, lines)
-        content = [line.strip() for line in open(foo).readlines()]
-        self.assertEquals(content, lines)
-
-    def test_copy_file(self):
-        src_dir = self.mkdtemp()
-        foo = os.path.join(src_dir, 'foo')
-        write_file(foo, 'content')
-        dst_dir = self.mkdtemp()
-        copy_file(foo, dst_dir)
-        self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo')))
 
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index d98325ae54..331180d235 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,25 +1,10 @@
 """Tests for distutils.filelist."""
-from os.path import join
 import unittest
-from test.support import captured_stdout
 
 from distutils.filelist import glob_to_re, FileList
+from test.support import captured_stdout
 from distutils import debug
 
-MANIFEST_IN = """\
-include ok
-include xo
-exclude xo
-include foo.tmp
-global-include *.x
-global-include *.txt
-global-exclude *.tmp
-recursive-include f *.oo
-recursive-exclude global *.x
-graft dir
-prune dir3
-"""
-
 class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
@@ -34,34 +19,6 @@ def test_glob_to_re(self):
         self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
         self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
-    def test_process_template_line(self):
-        # testing  all MANIFEST.in template patterns
-        file_list = FileList()
-
-        # simulated file list
-        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
-                              join('global', 'one.txt'),
-                              join('global', 'two.txt'),
-                              join('global', 'files.x'),
-                              join('global', 'here.tmp'),
-                              join('f', 'o', 'f.oo'),
-                              join('dir', 'graft-one'),
-                              join('dir', 'dir2', 'graft2'),
-                              join('dir3', 'ok'),
-                              join('dir3', 'sub', 'ok.txt')
-                              ]
-
-        for line in MANIFEST_IN.split('\n'):
-            if line.strip() == '':
-                continue
-            file_list.process_template_line(line)
-
-        wanted = ['ok', 'four.txt', join('global', 'one.txt'),
-                  join('global', 'two.txt'), join('f', 'o', 'f.oo'),
-                  join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
-
-        self.assertEquals(file_list.files, wanted)
-
     def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
diff --git a/tests/test_install.py b/tests/test_install.py
index 59e90801f2..76fa02acda 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -5,14 +5,12 @@
 import sys
 import unittest
 import site
-import sysconfig
-from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES,
-                       get_config_var, get_path)
 
 from test.support import captured_stdout
 
 from distutils.command.install import install
 from distutils.command import install as install_module
+from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
 
@@ -38,23 +36,9 @@ def test_home_installation_scheme(self):
             build_lib=os.path.join(builddir, "lib"),
             )
 
-
-
-        posix_prefix = _INSTALL_SCHEMES['posix_prefix']
-        old_posix_prefix = posix_prefix['platinclude']
-        posix_prefix['platinclude'] = \
-                '{platbase}/include/python{py_version_short}'
-
-        posix_home = _INSTALL_SCHEMES['posix_home']
-        old_posix_home = posix_home['platinclude']
-        posix_home['platinclude'] = '{base}/include/python'
-        try:
-            cmd = install(dist)
-            cmd.home = destination
-            cmd.ensure_finalized()
-        finally:
-            posix_home['platinclude'] = old_posix_home
-            posix_prefix['platinclude'] = old_posix_prefix
+        cmd = install(dist)
+        cmd.home = destination
+        cmd.ensure_finalized()
 
         self.assertEqual(cmd.install_base, destination)
         self.assertEqual(cmd.install_platbase, destination)
@@ -79,19 +63,18 @@ def test_user_site(self):
             return
 
         # preparing the environement for the test
-        self.old_user_base = get_config_var('userbase')
-        self.old_user_site = get_path('purelib', '%s_user' % os.name)
+        self.old_user_base = site.USER_BASE
+        self.old_user_site = site.USER_SITE
         self.tmpdir = self.mkdtemp()
         self.user_base = os.path.join(self.tmpdir, 'B')
         self.user_site = os.path.join(self.tmpdir, 'S')
-        _CONFIG_VARS['userbase'] = self.user_base
-        scheme = _INSTALL_SCHEMES['%s_user' % os.name]
-        scheme['purelib'] = self.user_site
+        site.USER_BASE = self.user_base
+        site.USER_SITE = self.user_site
+        install_module.USER_BASE = self.user_base
+        install_module.USER_SITE = self.user_site
 
         def _expanduser(path):
-            if path[0] == '~':
-                path = os.path.normpath(self.tmpdir) + path[1:]
-            return path
+            return self.tmpdir
         self.old_expand = os.path.expanduser
         os.path.expanduser = _expanduser
 
@@ -99,17 +82,19 @@ def _expanduser(path):
             # this is the actual test
             self._test_user_site()
         finally:
-            _CONFIG_VARS['userbase'] = self.old_user_base
-            scheme['purelib'] = self.old_user_site
+            site.USER_BASE = self.old_user_base
+            site.USER_SITE = self.old_user_site
+            install_module.USER_BASE = self.old_user_base
+            install_module.USER_SITE = self.old_user_site
             os.path.expanduser = self.old_expand
 
     def _test_user_site(self):
-        schemes = get_scheme_names()
-        for key in ('nt_user', 'posix_user', 'os2_home'):
-            self.assertTrue(key in schemes)
+        for key in ('nt_user', 'unix_user', 'os2_home'):
+            self.assertTrue(key in INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
+
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
@@ -200,7 +185,7 @@ def test_record(self):
         with open(cmd.record) as f:
             self.assertEquals(len(f.readlines()), 1)
 
-    def _test_debug_mode(self):
+    def test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)
         install_module.DEBUG = True
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 13d27abac0..99a6d90627 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -1,6 +1,6 @@
 """Tests for distutils.command.install_data."""
-import os
 import sys
+import os
 import unittest
 
 from distutils.command.install_lib import install_lib
@@ -31,7 +31,9 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEquals(cmd.optimize, 2)
 
-    def _setup_byte_compile(self):
+    @unittest.skipUnless(not sys.dont_write_bytecode,
+                         'byte-compile not supported')
+    def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
         cmd = install_lib(dist)
         cmd.compile = cmd.optimize = 1
@@ -39,15 +41,8 @@ def _setup_byte_compile(self):
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        return pkg_dir
-
-    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile not enabled')
-    def test_byte_compile(self):
-        pkg_dir = self._setup_byte_compile()
-        if sys.flags.optimize < 1:
-            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        else:
-            self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
+        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/tests/test_register.py b/tests/test_register.py
index acda1b1ac1..c03ad10147 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -202,10 +202,10 @@ def test_strict(self):
         self.assertRaises(DistutilsSetupError, cmd.run)
 
         # we don't test the reSt feature if docutils
-        # is not installed or we our on py3k
+        # is not installed
         try:
             import docutils
-        except Exception:
+        except ImportError:
             return
 
         # metadata are OK but long_description is broken
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 9a76eacb65..f95035dfb0 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -3,22 +3,6 @@
 import unittest
 import shutil
 import zipfile
-import tarfile
-
-# zlib is not used here, but if it's not available
-# the tests that use zipfile may fail
-try:
-    import zlib
-except ImportError:
-    zlib = None
-
-try:
-    import grp
-    import pwd
-    UID_GID_SUPPORT = True
-except ImportError:
-    UID_GID_SUPPORT = False
-
 from os.path import join
 import sys
 import tempfile
@@ -95,7 +79,6 @@ def _warn(*args):
         cmd.warn = _warn
         return dist, cmd
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
@@ -137,7 +120,6 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEquals(len(content), 4)
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_make_distribution(self):
 
         # check if tar and gzip are installed
@@ -174,7 +156,6 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_add_defaults(self):
 
         # http://bugs.python.org/issue2279
@@ -236,7 +217,6 @@ def test_add_defaults(self):
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
         self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):
         # testing the `medata-check` option
         dist, cmd = self.get_cmd(metadata={})
@@ -296,57 +276,7 @@ def test_finalize_options(self):
         cmd.formats = 'supazipa'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
-    @unittest.skipUnless(zlib, "requires zlib")
-    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
-    def test_make_distribution_owner_group(self):
-
-        # check if tar and gzip are installed
-        if (find_executable('tar') is None or
-            find_executable('gzip') is None):
-            return
-
-        # now building a sdist
-        dist, cmd = self.get_cmd()
-
-        # creating a gztar and specifying the owner+group
-        cmd.formats = ['gztar']
-        cmd.owner = pwd.getpwuid(0)[0]
-        cmd.group = grp.getgrgid(0)[0]
-        cmd.ensure_finalized()
-        cmd.run()
-
-        # making sure we have the good rights
-        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
-        archive = tarfile.open(archive_name)
-        try:
-            for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
-        finally:
-            archive.close()
-
-        # building a sdist again
-        dist, cmd = self.get_cmd()
-
-        # creating a gztar
-        cmd.formats = ['gztar']
-        cmd.ensure_finalized()
-        cmd.run()
-
-        # making sure we have the good rights
-        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
-        archive = tarfile.open(archive_name)
-
-        # note that we are not testing the group ownership here
-        # because, depending on the platforms and the container
-        # rights (see #7408)
-        try:
-            for member in archive.getmembers():
-                self.assertEquals(member.uid, os.getuid())
-        finally:
-            archive.close()
 
-    @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 9496950f70..edc755ed15 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -2,9 +2,9 @@
 import os
 import test
 import unittest
-import shutil
 
 from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
 from test.support import TESTFN, run_unittest
 
@@ -26,7 +26,10 @@ def cleanup_testfn(self):
         elif os.path.isdir(TESTFN):
             shutil.rmtree(TESTFN)
 
-    @support.capture_warnings
+    def test_get_config_h_filename(self):
+        config_h = sysconfig.get_config_h_filename()
+        self.assertTrue(os.path.isfile(config_h), config_h)
+
     def test_get_python_lib(self):
         lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
@@ -34,11 +37,7 @@ def test_get_python_lib(self):
         # test for pythonxx.lib?
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
-        _sysconfig = __import__('sysconfig')
-        res = sysconfig.get_python_lib(True, True)
-        self.assertEquals(_sysconfig.get_path('platstdlib'), res)
 
-    @support.capture_warnings
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()
         # This is not much of a test.  We make sure Python.h exists
@@ -48,7 +47,31 @@ def test_get_python_inc(self):
         python_h = os.path.join(inc_dir, "Python.h")
         self.assertTrue(os.path.isfile(python_h), python_h)
 
-    @support.capture_warnings
+    def test_get_config_vars(self):
+        cvars = sysconfig.get_config_vars()
+        self.assertTrue(isinstance(cvars, dict))
+        self.assertTrue(cvars)
+
+    def test_customize_compiler(self):
+
+        # not testing if default compiler is not unix
+        if get_default_compiler() != 'unix':
+            return
+
+        os.environ['AR'] = 'my_ar'
+        os.environ['ARFLAGS'] = '-arflags'
+
+        # make sure AR gets caught
+        class compiler:
+            compiler_type = 'unix'
+
+            def set_executables(self, **kw):
+                self.exes = kw
+
+        comp = compiler()
+        sysconfig.customize_compiler(comp)
+        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 6976dd55f8..3a41e6fcaa 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,8 +1,8 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
-import sysconfig
 
+from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
 
 class UnixCCompilerTestCase(unittest.TestCase):
@@ -114,14 +114,6 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-R/foo')
 
-        # AIX C/C++ linker
-        sys.platform = 'aix'
-        def gcv(v):
-            return 'xxx'
-        sysconfig.get_config_var = gcv
-        self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
-
-
 def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 979ab228dd..35e970051e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -2,8 +2,8 @@
 import sys
 import os
 import unittest
+import http.client as httpclient
 
-from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
@@ -38,37 +38,48 @@
 [server1]
 username:me
 """
+class Response(object):
+    def __init__(self, status=200, reason='OK'):
+        self.status = status
+        self.reason = reason
 
-class FakeOpen(object):
+class FakeConnection(object):
 
-    def __init__(self, url):
-        self.url = url
-        if not isinstance(url, str):
-            self.req = url
-        else:
-            self.req = None
-        self.msg = 'OK'
+    def __init__(self):
+        self.requests = []
+        self.headers = []
+        self.body = ''
 
-    def getcode(self):
-        return 200
+    def __call__(self, netloc):
+        return self
 
+    def connect(self):
+        pass
+    endheaders = connect
+
+    def putrequest(self, method, url):
+        self.requests.append((method, url))
+
+    def putheader(self, name, value):
+        self.headers.append((name, value))
+
+    def send(self, body):
+        self.body = body
+
+    def getresponse(self):
+        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_open = upload_mod.urlopen
-        upload_mod.urlopen = self._urlopen
-        self.last_open = None
+        self.old_class = httpclient.HTTPConnection
+        self.conn = httpclient.HTTPConnection = FakeConnection()
 
     def tearDown(self):
-        upload_mod.urlopen = self.old_open
+        httpclient.HTTPConnection = self.old_class
         super(uploadTestCase, self).tearDown()
 
-    def _urlopen(self, url):
-        self.last_open = FakeOpen(url)
-        return self.last_open
-
     def test_finalize_options(self):
 
         # new format
@@ -113,15 +124,13 @@ def test_upload(self):
         cmd.run()
 
         # what did we send ?
-        headers = dict(self.last_open.req.headers)
+        headers = dict(self.conn.headers)
         self.assertEquals(headers['Content-length'], '2087')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
-        self.assertEquals(self.last_open.req.get_method(), 'POST')
-        self.assertEquals(self.last_open.req.get_full_url(),
-                          'http://pypi.python.org/pypi')
-        self.assertTrue(b'xxx' in self.last_open.req.data)
-        auth = self.last_open.req.headers['Authorization']
-        self.assertFalse('\n' in auth)
+        self.assertFalse('\n' in headers['Authorization'])
+
+        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
+        self.assert_((b'xxx') in self.conn.body)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 896e1e07df..0c732f8244 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,33 +3,15 @@
 import sys
 import unittest
 from copy import copy
-from io import BytesIO
-import subprocess
 
-from sysconfig import get_config_vars, get_platform
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
-from distutils.util import (convert_path, change_root,
+from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
-                            rfc822_escape, get_compiler_versions,
-                            _find_exe_version, _MAC_OS_X_LD_VERSION,
-                            byte_compile)
-from distutils import util
+                            rfc822_escape, byte_compile)
+from distutils import util # used to patch _environ_checked
+from distutils.sysconfig import get_config_vars
+from distutils import sysconfig
 from distutils.tests import support
-from distutils.version import LooseVersion
-
-class FakePopen(object):
-    test_class = None
-    def __init__(self, cmd, shell, stdout, stderr):
-        self.cmd = cmd.split()[0]
-        exes = self.test_class._exes
-        if self.cmd not in exes:
-            # we don't want to call the system, returning an empty
-            # output so it doesn't match
-            self.stdout = BytesIO()
-            self.stderr = BytesIO()
-        else:
-            self.stdout = BytesIO(exes[self.cmd])
-            self.stderr = BytesIO()
 
 class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -43,7 +25,7 @@ def setUp(self):
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        #self._config_vars = copy(sysconfig._config_vars)
+        self._config_vars = copy(sysconfig._config_vars)
 
         # patching os.uname
         if hasattr(os, 'uname'):
@@ -52,17 +34,8 @@ def setUp(self):
         else:
             self.uname = None
             self._uname = None
-        os.uname = self._get_uname
 
-        # patching POpen
-        self.old_find_executable = util.find_executable
-        util.find_executable = self._find_executable
-        self._exes = {}
-        self.old_popen = subprocess.Popen
-        self.old_stdout  = sys.stdout
-        self.old_stderr = sys.stderr
-        FakePopen.test_class = self
-        subprocess.Popen = FakePopen
+        os.uname = self._get_uname
 
     def tearDown(self):
         # getting back the environment
@@ -77,11 +50,7 @@ def tearDown(self):
             os.uname = self.uname
         else:
             del os.uname
-        #sysconfig._config_vars = copy(self._config_vars)
-        util.find_executable = self.old_find_executable
-        subprocess.Popen = self.old_popen
-        sys.old_stdout  = self.old_stdout
-        sys.old_stderr = self.old_stderr
+        sysconfig._config_vars = copy(self._config_vars)
         super(UtilTestCase, self).tearDown()
 
     def _set_uname(self, uname):
@@ -91,11 +60,103 @@ def _get_uname(self):
         return self._uname
 
     def test_get_platform(self):
-        platform = util.get_platform()
-        self.assertEquals(platform, get_platform())
-        util.set_platform('MyOwnPlatform')
-        self.assertEquals('MyOwnPlatform', util.get_platform())
-        util.set_platform(platform)
+
+        # windows XP, 32bits
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Intel)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win32')
+
+        # windows XP, amd64
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Amd64)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-amd64')
+
+        # windows XP, itanium
+        os.name = 'nt'
+        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
+                       '[MSC v.1310 32 bit (Itanium)]')
+        sys.platform = 'win32'
+        self.assertEquals(get_platform(), 'win-ia64')
+
+        # macbook
+        os.name = 'posix'
+        sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
+                       '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
+        sys.platform = 'darwin'
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
+        cursize = sys.maxsize
+        sys.maxsize = (2 ** 31)-1
+        try:
+            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        finally:
+            sys.maxsize = cursize
+
+        # macbook with fat binaries (fat, universal or fat64)
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+
+        get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+
+        get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
+                                       '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                       '-fno-strict-aliasing -fno-common '
+                                       '-dynamic -DNDEBUG -g -O3')
+
+        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+
+        for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
+                                           '/Developer/SDKs/MacOSX10.4u.sdk  '
+                                           '-fno-strict-aliasing -fno-common '
+                                           '-dynamic -DNDEBUG -g -O3'%(arch,))
+
+            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+
+        # linux debian sarge
+        os.name = 'posix'
+        sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
+                       '\n[GCC 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)]')
+        sys.platform = 'linux2'
+        self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
+                    '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
+
+        self.assertEquals(get_platform(), 'linux-i686')
+
+        # XXX more platforms to tests here
 
     def test_convert_path(self):
         # linux/mac
@@ -199,70 +260,6 @@ def test_rfc822_escape(self):
                   'header%(8s)s') % {'8s': '\n'+8*' '}
         self.assertEquals(res, wanted)
 
-    def test_find_exe_version(self):
-        # the ld version scheme under MAC OS is:
-        #   ^@(#)PROGRAM:ld  PROJECT:ld64-VERSION
-        #
-        # where VERSION is a 2-digit number for major
-        # revisions. For instance under Leopard, it's
-        # currently 77
-        #
-        # Dots are used when branching is done.
-        #
-        # The SnowLeopard ld64 is currently 95.2.12
-
-        for output, version in ((b'@(#)PROGRAM:ld  PROJECT:ld64-77', '77'),
-                                (b'@(#)PROGRAM:ld  PROJECT:ld64-95.2.12',
-                                 '95.2.12')):
-            result = _MAC_OS_X_LD_VERSION.search(output)
-            self.assertEquals(result.group(1).decode(), version)
-
-    def _find_executable(self, name):
-        if name in self._exes:
-            return name
-        return None
-
-    def test_get_compiler_versions(self):
-        # get_versions calls distutils.spawn.find_executable on
-        # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_compiler_versions(), (None, None, None))
-
-        # Let's fake we have 'gcc' and it returns '3.4.5'
-        self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
-        res = get_compiler_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
-
-        # and let's see what happens when the version
-        # doesn't match the regular expression
-        # (\d+\.\d+(\.\d+)*)
-        self._exes['gcc'] = b'very strange output'
-        res = get_compiler_versions()
-        self.assertEquals(res[0], None)
-
-        # same thing for ld
-        if sys.platform != 'darwin':
-            self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
-            res = get_compiler_versions()
-            self.assertEquals(str(res[1]), '2.17.50')
-            self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
-            res = get_compiler_versions()
-            self.assertEquals(res[1], None)
-        else:
-            self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
-            res = get_compiler_versions()
-            self.assertEquals(res[1], None)
-            self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
-            res = get_compiler_versions()
-            self.assertEquals(str(res[1]), '77')
-
-        # and dllwrap
-        self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
-        res = get_compiler_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
-        self._exes['dllwrap'] = b'Cheese Wrap'
-        res = get_compiler_versions()
-        self.assertEquals(res[2], None)
-
     def test_dont_write_bytecode(self):
         # makes sure byte_compile raise a DistutilsError
         # if sys.dont_write_bytecode is True
diff --git a/text_file.py b/text_file.py
index 53c8561a3e..97459fbf73 100644
--- a/text_file.py
+++ b/text_file.py
@@ -6,8 +6,8 @@
 
 __revision__ = "$Id$"
 
-import sys
-import io
+import sys, os, io
+
 
 class TextFile:
     """Provides a file-like object that takes care of all the things you
diff --git a/unixccompiler.py b/unixccompiler.py
index 081790827d..bf73416154 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -17,6 +17,7 @@
 
 import os, sys, re
 
+from distutils import sysconfig
 from distutils.dep_util import newer
 from distutils.ccompiler import \
      CCompiler, gen_preprocess_options, gen_lib_options
@@ -24,7 +25,6 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
-
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -74,7 +74,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
 
     if 'ARCHFLAGS' in os.environ and not stripArch:
         # User specified different -arch flags in the environ,
-        # see also the sysconfig
+        # see also distutils.sysconfig
         compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
 
     if stripSysroot:
@@ -281,9 +281,7 @@ def runtime_library_dir_option(self, dir):
         # this time, there's no way to determine this information from
         # the configuration data stored in the Python installation, so
         # we use this hack.
-        _sysconfig = __import__('sysconfig')
-
-        compiler = os.path.basename(_sysconfig.get_config_var("CC"))
+        compiler = os.path.basename(sysconfig.get_config_var("CC"))
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
@@ -293,24 +291,23 @@ def runtime_library_dir_option(self, dir):
             return ["+s", "-L" + dir]
         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
             return ["-rpath", dir]
-        elif self._is_gcc(compiler):
-            # gcc on non-GNU systems does not need -Wl, but can
-            # use it anyway.  Since distutils has always passed in
-            # -Wl whenever gcc was used in the past it is probably
-            # safest to keep doing so.
-            if _sysconfig.get_config_var("GNULD") == "yes":
-                # GNU ld needs an extra option to get a RUNPATH
-                # instead of just an RPATH.
-                return "-Wl,--enable-new-dtags,-R" + dir
-            else:
-                return "-Wl,-R" + dir
-        elif sys.platform[:3] == "aix":
-            return "-blibpath:" + dir
         else:
-            # No idea how --enable-new-dtags would be passed on to
-            # ld if this system was using GNU ld.  Don't know if a
-            # system like this even exists.
-            return "-R" + dir
+            if self._is_gcc(compiler):
+                # gcc on non-GNU systems does not need -Wl, but can
+                # use it anyway.  Since distutils has always passed in
+                # -Wl whenever gcc was used in the past it is probably
+                # safest to keep doing so.
+                if sysconfig.get_config_var("GNULD") == "yes":
+                    # GNU ld needs an extra option to get a RUNPATH
+                    # instead of just an RPATH.
+                    return "-Wl,--enable-new-dtags,-R" + dir
+                else:
+                    return "-Wl,-R" + dir
+            else:
+                # No idea how --enable-new-dtags would be passed on to
+                # ld if this system was using GNU ld.  Don't know if a
+                # system like this even exists.
+                return "-R" + dir
 
     def library_option(self, lib):
         return "-l" + lib
@@ -324,8 +321,7 @@ def find_library_file(self, dirs, lib, debug=0):
             # On OSX users can specify an alternate SDK using
             # '-isysroot', calculate the SDK root if it is specified
             # (and use it further on)
-            _sysconfig = __import__('sysconfig')
-            cflags = _sysconfig.get_config_var('CFLAGS')
+            cflags = sysconfig.get_config_var('CFLAGS')
             m = re.search(r'-isysroot\s+(\S+)', cflags)
             if m is None:
                 sysroot = '/'
diff --git a/util.py b/util.py
index c8bf0064cd..8175434586 100644
--- a/util.py
+++ b/util.py
@@ -7,40 +7,182 @@
 __revision__ = "$Id$"
 
 import sys, os, string, re
-
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
-from distutils.spawn import spawn, find_executable
+from distutils.spawn import spawn
 from distutils import log
-from distutils.version import LooseVersion
 from distutils.errors import DistutilsByteCompileError
 
-_sysconfig = __import__('sysconfig')
-_PLATFORM = None
+def get_platform ():
+    """Return a string that identifies the current platform.  This is used
+    mainly to distinguish platform-specific build directories and
+    platform-specific built distributions.  Typically includes the OS name
+    and version and the architecture (as supplied by 'os.uname()'),
+    although the exact information included depends on the OS; eg. for IRIX
+    the architecture isn't particularly important (IRIX only runs on SGI
+    hardware), but for Linux the kernel version isn't particularly
+    important.
+
+    Examples of returned values:
+       linux-i586
+       linux-alpha (?)
+       solaris-2.6-sun4u
+       irix-5.3
+       irix64-6.2
+
+    Windows will return one of:
+       win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
+       win-ia64 (64bit Windows on Itanium)
+       win32 (all others - specifically, sys.platform is returned)
+
+    For other non-POSIX platforms, currently just returns 'sys.platform'.
+    """
+    if os.name == 'nt':
+        # sniff sys.version for architecture.
+        prefix = " bit ("
+        i = sys.version.find(prefix)
+        if i == -1:
+            return sys.platform
+        j = sys.version.find(")", i)
+        look = sys.version[i+len(prefix):j].lower()
+        if look == 'amd64':
+            return 'win-amd64'
+        if look == 'itanium':
+            return 'win-ia64'
+        return sys.platform
+
+    if os.name != "posix" or not hasattr(os, 'uname'):
+        # XXX what about the architecture? NT is Intel or Alpha,
+        # Mac OS is M68k or PPC, etc.
+        return sys.platform
+
+    # Try to distinguish various flavours of Unix
+
+    (osname, host, release, version, machine) = os.uname()
+
+    # Convert the OS name to lowercase, remove '/' characters
+    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
+    osname = osname.lower().replace('/', '')
+    machine = machine.replace(' ', '_')
+    machine = machine.replace('/', '-')
+
+    if osname[:5] == "linux":
+        # At least on Linux/Intel, 'machine' is the processor --
+        # i386, etc.
+        # XXX what about Alpha, SPARC, etc?
+        return  "%s-%s" % (osname, machine)
+    elif osname[:5] == "sunos":
+        if release[0] >= "5":           # SunOS 5 == Solaris 2
+            osname = "solaris"
+            release = "%d.%s" % (int(release[0]) - 3, release[2:])
+        # fall through to standard osname-release-machine representation
+    elif osname[:4] == "irix":              # could be "irix64"!
+        return "%s-%s" % (osname, release)
+    elif osname[:3] == "aix":
+        return "%s-%s.%s" % (osname, version, release)
+    elif osname[:6] == "cygwin":
+        osname = "cygwin"
+        rel_re = re.compile (r'[\d.]+', re.ASCII)
+        m = rel_re.match(release)
+        if m:
+            release = m.group()
+    elif osname[:6] == "darwin":
+        #
+        # For our purposes, we'll assume that the system version from
+        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
+        # to. This makes the compatibility story a bit more sane because the
+        # machine is going to compile and link as if it were
+        # MACOSX_DEPLOYMENT_TARGET.
+        from distutils.sysconfig import get_config_vars
+        cfgvars = get_config_vars()
+
+        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
+        if not macver:
+            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+
+        if 1:
+            # Always calculate the release of the running machine,
+            # needed to determine if we can build fat binaries or not.
+
+            macrelease = macver
+            # Get the system version. Reading this plist is a documented
+            # way to get the system version (see the documentation for
+            # the Gestalt Manager)
+            try:
+                f = open('/System/Library/CoreServices/SystemVersion.plist')
+            except IOError:
+                # We're on a plain darwin box, fall back to the default
+                # behaviour.
+                pass
+            else:
+                m = re.search(
+                        r'<key>ProductUserVisibleVersion</key>\s*' +
+                        r'<string>(.*?)</string>', f.read())
+                f.close()
+                if m is not None:
+                    macrelease = '.'.join(m.group(1).split('.')[:2])
+                # else: fall back to the default behaviour
+
+        if not macver:
+            macver = macrelease
+
+        if macver:
+            from distutils.sysconfig import get_config_vars
+            release = macver
+            osname = "macosx"
+
+            if (macrelease + '.') >= '10.4.' and \
+                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
+                # The universal build will build fat binaries, but not on
+                # systems before 10.4
+                #
+                # Try to detect 4-way universal builds, those have machine-type
+                # 'universal' instead of 'fat'.
+
+                machine = 'fat'
+                cflags = get_config_vars().get('CFLAGS')
+
+                archs = re.findall('-arch\s+(\S+)', cflags)
+                archs = tuple(sorted(set(archs)))
+
+                if len(archs) == 1:
+                    machine = archs[0]
+                elif archs == ('i386', 'ppc'):
+                    machine = 'fat'
+                elif archs == ('i386', 'x86_64'):
+                    machine = 'intel'
+                elif archs == ('i386', 'ppc', 'x86_64'):
+                    machine = 'fat3'
+                elif archs == ('ppc64', 'x86_64'):
+                    machine = 'fat64'
+                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
+                    machine = 'universal'
+                else:
+                    raise ValueError(
+                       "Don't know machine value for archs=%r"%(archs,))
 
-def get_platform():
-    """Return a string that identifies the current platform.
+            elif machine == 'i386':
+                # On OSX the machine type returned by uname is always the
+                # 32-bit variant, even if the executable architecture is
+                # the 64-bit variant
+                if sys.maxsize >= 2**32:
+                    machine = 'x86_64'
 
-    By default, will return the value returned by sysconfig.get_platform(),
-    but it can be changed by calling set_platform().
-    """
-    global _PLATFORM
-    if _PLATFORM is None:
-        _PLATFORM = _sysconfig.get_platform()
-    return _PLATFORM
+            elif machine in ('PowerPC', 'Power_Macintosh'):
+                # Pick a sane name for the PPC architecture.
+                machine = 'ppc'
 
-def set_platform(identifier):
-    """Sets the platform string identifier returned by get_platform().
+                # See 'i386' case
+                if sys.maxsize >= 2**32:
+                    machine = 'ppc64'
 
-    Note that this change doesn't impact the value returned by
-    sysconfig.get_platform() and is local to Distutils
-    """
-    global _PLATFORM
-    _PLATFORM = identifier
+    return "%s-%s-%s" % (osname, release, machine)
+
+# get_platform ()
 
-def convert_path(pathname):
-    """Return 'pathname' as a name that will work on the native filesystem.
 
+def convert_path (pathname):
+    """Return 'pathname' as a name that will work on the native filesystem,
     i.e. split it on '/' and put it back together again using the current
     directory separator.  Needed because filenames in the setup script are
     always supplied in Unix style, and have to be converted to the local
@@ -64,12 +206,12 @@ def convert_path(pathname):
         return os.curdir
     return os.path.join(*paths)
 
+# convert_path ()
 
-def change_root(new_root, pathname):
-    """Return 'pathname' with 'new_root' prepended.
 
-    If 'pathname' is relative, this is equivalent to
-    "os.path.join(new_root,pathname)".
+def change_root (new_root, pathname):
+    """Return 'pathname' with 'new_root' prepended.  If 'pathname' is
+    relative, this is equivalent to "os.path.join(new_root,pathname)".
     Otherwise, it requires making 'pathname' relative and then joining the
     two, which is tricky on DOS/Windows and Mac OS.
     """
@@ -91,16 +233,23 @@ def change_root(new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
-    else:
-        raise DistutilsPlatformError("nothing known about "
-                                     "platform '%s'" % os.name)
+    elif os.name == 'mac':
+        if not os.path.isabs(pathname):
+            return os.path.join(new_root, pathname)
+        else:
+            # Chop off volume name from start of path
+            elements = pathname.split(":", 1)
+            pathname = ":" + elements[1]
+            return os.path.join(new_root, pathname)
 
-_environ_checked = 0
+    else:
+        raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
 
-def check_environ():
-    """Ensure that 'os.environ' has all the environment variables needed.
 
-    We guarantee that users can use in config files, command-line options,
+_environ_checked = 0
+def check_environ ():
+    """Ensure that 'os.environ' has all the environment variables we
+    guarantee that users can use in config files, command-line options,
     etc.  Currently this includes:
       HOME - user's home directory (Unix only)
       PLAT - description of the current platform, including hardware
@@ -115,14 +264,14 @@ def check_environ():
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
     if 'PLAT' not in os.environ:
-        os.environ['PLAT'] = _sysconfig.get_platform()
+        os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
 
-def subst_vars(s, local_vars):
-    """Perform shell/Perl-style variable substitution on 'string'.
 
-    Every occurrence of '$' followed by a name is considered a variable, and
+def subst_vars (s, local_vars):
+    """Perform shell/Perl-style variable substitution on 'string'.  Every
+    occurrence of '$' followed by a name is considered a variable, and
     variable is substituted by the value found in the 'local_vars'
     dictionary, or in 'os.environ' if it's not in 'local_vars'.
     'os.environ' is first checked/augmented to guarantee that it contains
@@ -142,11 +291,12 @@ def _subst (match, local_vars=local_vars):
     except KeyError as var:
         raise ValueError("invalid variable '$%s'" % var)
 
-def grok_environment_error(exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError.
+# subst_vars ()
 
-    This will generate an IOError or an OSError exception object.
-    Handles Python 1.5.1 and 1.5.2 styles, and
+
+def grok_environment_error (exc, prefix="error: "):
+    """Generate a useful error message from an EnvironmentError (IOError or
+    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
     does what it can to deal with exception objects that don't have a
     filename (which happens when the error is due to a two-file operation,
     such as 'rename()' or 'link()'.  Returns the error message as a string
@@ -165,20 +315,18 @@ def grok_environment_error(exc, prefix="error: "):
 
     return error
 
+
 # Needed by 'split_quoted()'
 _wordchars_re = _squote_re = _dquote_re = None
-
 def _init_regex():
     global _wordchars_re, _squote_re, _dquote_re
     _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)
     _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'")
     _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"')
 
-def split_quoted(s):
+def split_quoted (s):
     """Split a string up according to Unix shell-like rules for quotes and
-    backslashes.
-
-    In short: words are delimited by spaces, as long as those
+    backslashes.  In short: words are delimited by spaces, as long as those
     spaces are not escaped by a backslash, or inside a quoted string.
     Single and double quotes are equivalent, and the quote characters can
     be backslash-escaped.  The backslash is stripped from any two-character
@@ -186,6 +334,7 @@ def split_quoted(s):
     characters are stripped from any quoted string.  Returns a list of
     words.
     """
+
     # This is a nice algorithm for splitting up a single string, since it
     # doesn't require character-by-character examination.  It was a little
     # bit of a brain-bender to get it working right, though...
@@ -233,12 +382,13 @@ def split_quoted(s):
 
     return words
 
+# split_quoted ()
 
-def execute(func, args, msg=None, verbose=0, dry_run=0):
-    """Perform some action that affects the outside world.
 
-    eg. by writing to the filesystem).  Such actions are special because
-    they are disabled by the 'dry_run' flag.  This method takes care of all
+def execute (func, args, msg=None, verbose=0, dry_run=0):
+    """Perform some action that affects the outside world (eg.  by
+    writing to the filesystem).  Such actions are special because they
+    are disabled by the 'dry_run' flag.  This method takes care of all
     that bureaucracy for you; all you have to do is supply the
     function to call and an argument tuple for it (to embody the
     "external action" being performed), and an optional message to
@@ -254,7 +404,7 @@ def execute(func, args, msg=None, verbose=0, dry_run=0):
         func(*args)
 
 
-def strtobool(val):
+def strtobool (val):
     """Convert a string representation of truth to true (1) or false (0).
 
     True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
@@ -270,13 +420,15 @@ def strtobool(val):
         raise ValueError("invalid truth value %r" % (val,))
 
 
-def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
-                  verbose=1, dry_run=0, direct=None):
+def byte_compile (py_files,
+                  optimize=0, force=0,
+                  prefix=None, base_dir=None,
+                  verbose=1, dry_run=0,
+                  direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.
-
-    'py_files' is a list of files to compile; any files that don't end in
-    ".py" are silently skipped. 'optimize' must be one of the following:
+    or .pyo files in the same directory.  'py_files' is a list of files
+    to compile; any files that don't end in ".py" are silently skipped.
+    'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
@@ -392,8 +544,8 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:
-                    raise ValueError("invalid prefix: filename %r doesn't "
-                                     "start with %r" % (file, prefix))
+                    raise ValueError("invalid prefix: filename %r doesn't start with %r"
+                           % (file, prefix))
                 dfile = dfile[len(prefix):]
             if base_dir:
                 dfile = os.path.join(base_dir, dfile)
@@ -408,8 +560,9 @@ def byte_compile(py_files, optimize=0, force=0, prefix=None, base_dir=None,
                     log.debug("skipping byte-compilation of %s to %s",
                               file, cfile_base)
 
+# byte_compile ()
 
-def rfc822_escape(header):
+def rfc822_escape (header):
     """Return a version of the string escaped for inclusion in an
     RFC-822 header, by ensuring there are 8 spaces space after each newline.
     """
@@ -417,56 +570,6 @@ def rfc822_escape(header):
     sep = '\n' + 8 * ' '
     return sep.join(lines)
 
-_RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
-_MAC_OS_X_LD_VERSION = re.compile(b'^@\(#\)PROGRAM:ld  PROJECT:ld64-((\d+)(\.\d+)*)')
-
-def _find_ld_version():
-    """Finds the ld version. The version scheme differs under Mac OSX."""
-    if sys.platform == 'darwin':
-        return _find_exe_version('ld -v', _MAC_OS_X_LD_VERSION)
-    else:
-        return _find_exe_version('ld -v')
-
-def _find_exe_version(cmd, pattern=_RE_VERSION):
-    """Find the version of an executable by running `cmd` in the shell.
-
-    `pattern` is a compiled regular expression. If not provided, default
-    to _RE_VERSION. If the command is not found, or the output does not
-    match the mattern, returns None.
-    """
-    from subprocess import Popen, PIPE
-    executable = cmd.split()[0]
-    if find_executable(executable) is None:
-        return None
-    pipe = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
-    try:
-        stdout, stderr = pipe.stdout.read(), pipe.stderr.read()
-    finally:
-        pipe.stdout.close()
-        pipe.stderr.close()
-    # some commands like ld under MacOS X, will give the
-    # output in the stderr, rather than stdout.
-    if stdout != b'':
-        out_string = stdout
-    else:
-        out_string = stderr
-
-    result = pattern.search(out_string)
-    if result is None:
-        return None
-    return LooseVersion(result.group(1).decode())
-
-def get_compiler_versions():
-    """Returns a tuple providing the versions of gcc, ld and dllwrap
-
-    For each command, if a command is not found, None is returned.
-    Otherwise a LooseVersion instance is returned.
-    """
-    gcc = _find_exe_version('gcc -dumpversion')
-    ld = _find_ld_version()
-    dllwrap = _find_exe_version('dllwrap --version')
-    return gcc, ld, dllwrap
-
 # 2to3 support
 
 def run_2to3(files, fixer_names=None, options=None, explicit=None):

From 575e9faa64b8e84e15de1124de71c3471b966327 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Fri, 23 Jul 2010 09:43:17 +0000
Subject: [PATCH 3008/8469] Ensure that the Makefile variable expansion in
 distutils.sysconfig matches that in the toplevel sysconfig module.

Without this patch universal builds on OSX are
broken.

Als add a test that checks that the two version
of get_config_vars agree on important values.
---
 sysconfig.py            | 23 +++++++++++++++++++++++
 tests/test_sysconfig.py |  9 +++++++++
 2 files changed, 32 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 0fbd5412bc..48f3fe4d59 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -300,6 +300,12 @@ def parse_makefile(fn, g=None):
                 else:
                     done[n] = v
 
+    # Variables with a 'PY_' prefix in the makefile. These need to
+    # be made available without that prefix through sysconfig.
+    # Special care is needed to ensure that variable expansion works, even
+    # if the expansion uses the name without a prefix.
+    renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS')
+
     # do variable interpolation here
     while notdone:
         for name in list(notdone):
@@ -316,6 +322,16 @@ def parse_makefile(fn, g=None):
                 elif n in os.environ:
                     # do it like make: fall back to environment
                     item = os.environ[n]
+
+                elif n in renamed_variables:
+                    if name.startswith('PY_') and name[3:] in renamed_variables:
+                        item = ""
+
+                    elif 'PY_' + n in notdone:
+                        found = False
+
+                    else:
+                        item = str(done['PY_' + n])
                 else:
                     done[n] = item = ""
                 if found:
@@ -330,6 +346,13 @@ def parse_makefile(fn, g=None):
                         else:
                             done[name] = value
                         del notdone[name]
+
+                        if name.startswith('PY_') \
+                            and name[3:] in renamed_variables:
+
+                            name = name[3:]
+                            if name not in done:
+                                done[name] = value
             else:
                 # bogus variable reference; just drop it since we can't deal
                 del notdone[name]
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index edc755ed15..0167e0f1a3 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -93,6 +93,15 @@ def test_parse_makefile_literal_dollar(self):
                               'OTHER': 'foo'})
 
 
+    def test_sysconfig_module(self):
+        import sysconfig as global_sysconfig
+        self.assertEquals(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
+        self.assertEquals(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
+        self.assertEquals(global_sysconfig.get_config_var('LDSHARED'),sysconfig.get_config_var('LDSHARED'))
+        self.assertEquals(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
+
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SysconfigTestCase))

From fadd3a199f2c99ef0fb5d58e78016274cad6cc20 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Sat, 24 Jul 2010 12:55:44 +0100
Subject: [PATCH 3009/8469] Importing url2pathname from the correct place, so
 2to3 can do it's job.

--HG--
branch : distribute
extra : rebase_source : 43178821d2b4776dbfdf5ad9493bca8dc401b048
---
 setuptools/package_index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1d467f7861..1f9b6bd849 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,5 @@
 """PyPI and direct package downloading"""
-import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO
+import sys, os.path, re, urlparse, urllib, urllib2, shutil, random, socket, cStringIO
 import httplib
 from pkg_resources import *
 from distutils import log
@@ -642,7 +642,7 @@ def _download_url(self, scheme, url, tmpdir):
         if scheme=='svn' or scheme.startswith('svn+'):
             return self._download_svn(url, filename)
         elif scheme=='file':
-            return urllib2.url2pathname(urlparse.urlparse(url)[2])
+            return urllib.url2pathname(urlparse.urlparse(url)[2])
         else:
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
@@ -791,7 +791,7 @@ def fix_sf_url(url):
 def local_open(url):
     """Read a local path, with special support for directories"""
     scheme, server, path, param, query, frag = urlparse.urlparse(url)
-    filename = urllib2.url2pathname(path)
+    filename = urllib.url2pathname(path)
     if os.path.isfile(filename):
         return urllib2.urlopen(url)
     elif path.endswith('/') and os.path.isdir(filename):

From 35b06106c2c50e0d0709f2e75be4bc8fe56aef34 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Sat, 24 Jul 2010 14:56:42 +0100
Subject: [PATCH 3010/8469] Only do the decoding if there is something to
 decode.

--HG--
branch : distribute
extra : rebase_source : 6510b361ce8885f536a3babfc66a7ebdfaa25b2d
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1f9b6bd849..4ff963030f 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -199,7 +199,7 @@ def process_url(self, url, retrieve=False):
 
         base = f.url     # handle redirects
         page = f.read()
-        if sys.version_info >= (3,):
+        if sys.version_info >= (3,) and not isinstance(f, urllib2.HTTPError):
             charset = f.headers.get_param('charset') or 'latin-1'
             page = page.decode(charset, "ignore")
         f.close()

From 022d6c31d81f8d4f42776503786dbfa486417322 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 31 Jul 2010 08:56:11 +0000
Subject: [PATCH 3011/8469] Bump versions and review NEWS file.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 18b02fc629..7b2227916a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2a0"
+__version__ = "3.2a1"
 #--end constants--

From b9efa362d457b32845e11e0e03f377472112c0f1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 31 Jul 2010 21:54:24 +0000
Subject: [PATCH 3012/8469] #8292: Fix three instances of truth tests on return
 values of filter() (which is always true in Python 3).

---
 command/sdist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index bb2106120a..f51d72fad7 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -240,8 +240,7 @@ def add_defaults(self):
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
             files = filter(os.path.isfile, glob(pattern))
-            if files:
-                self.filelist.extend(files)
+            self.filelist.extend(files)
 
         # build_py is used to get:
         #  - python modules

From dd1e83e827cd6658e31699039aae197149e4557e Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Sun, 1 Aug 2010 01:53:52 +0000
Subject: [PATCH 3013/8469] Merged revisions 75659 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

Only the try/except was backported; owner and group were added in 2.7,
as was the test file.

........
  r75659 | tarek.ziade | 2009-10-24 09:29:44 -0400 (Sat, 24 Oct 2009) | 1 line

  #7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
........
---
 archive_util.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 264e66faf2..251c0df4e9 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -162,9 +162,12 @@ def make_archive (base_name, format,
         kwargs[arg] = val
     filename = apply(func, (base_name, base_dir), kwargs)
 
-    if root_dir is not None:
-        log.debug("changing back to '%s'", save_cwd)
-        os.chdir(save_cwd)
+    try:
+        filename = func(base_name, base_dir, **kwargs)
+    finally:
+        if root_dir is not None:
+            log.debug("changing back to '%s'", save_cwd)
+            os.chdir(save_cwd)
 
     return filename
 

From f5fa4f4f916ef28498df9c9cb54fb3f563d824bd Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 1 Aug 2010 19:07:28 +0000
Subject: [PATCH 3014/8469] Merged revisions 83371,83390 via svnmerge from
 svn+ssh://svn.python.org/python/branches/py3k

........
  r83371 | georg.brandl | 2010-07-31 23:54:24 +0200 (Sa, 31 Jul 2010) | 1 line

  #8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3).
........
  r83390 | georg.brandl | 2010-08-01 10:07:49 +0200 (So, 01 Aug 2010) | 1 line

  #8230: make Lib/test/sortperf.py run on Python 3.
........
---
 command/sdist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index bb2106120a..f51d72fad7 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -240,8 +240,7 @@ def add_defaults(self):
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
             files = filter(os.path.isfile, glob(pattern))
-            if files:
-                self.filelist.extend(files)
+            self.filelist.extend(files)
 
         # build_py is used to get:
         #  - python modules

From 8e471803385c10cd1f4f98d669826eb388cc6476 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 2 Aug 2010 19:16:34 +0000
Subject: [PATCH 3015/8469] #7973: Fix distutils options spelling.

---
 command/bdist_msi.py     | 2 +-
 command/bdist_wininst.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index c4be47b579..8a458d8536 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -148,7 +148,7 @@ def finalize_options(self):
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError(
-                      "target version can only be %s, or the '--skip_build'"
+                      "target version can only be %s, or the '--skip-build'"
                       " option must be specified" % (short_version,))
         else:
             self.versions = list(self.all_versions)
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d6d01c630d..3aa1dac7f3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -89,7 +89,7 @@ def finalize_options(self):
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError(
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,))
             self.target_version = short_version
 

From df831fea4bc33d771c8e6a1fb72533f71d7c2464 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 2 Aug 2010 20:26:41 +0000
Subject: [PATCH 3016/8469] Merged revisions 79558 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79558 | florent.xicluna | 2010-04-01 21:17:09 +0300 (Thu, 01 Apr 2010) | 2 lines

  #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
---
 command/build_ext.py | 2 +-
 util.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8248089fec..aeb6b744dc 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -676,7 +676,7 @@ def get_ext_filename(self, ext_name):
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
-            return apply(os.path.join, ext_path) + '_d' + so_ext
+            return os.path.join(*ext_path) + '_d' + so_ext
         return os.path.join(*ext_path) + so_ext
 
     def get_export_symbols (self, ext):
diff --git a/util.py b/util.py
index c4a8711d08..90f68d8208 100644
--- a/util.py
+++ b/util.py
@@ -205,7 +205,7 @@ def convert_path (pathname):
         paths.remove('.')
     if not paths:
         return os.curdir
-    return apply(os.path.join, paths)
+    return os.path.join(*paths)
 
 # convert_path ()
 

From 5a5a41af466e35970c94b0ab039d62f68581de05 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 2 Aug 2010 21:35:06 +0000
Subject: [PATCH 3017/8469] Merged revisions 78757 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78757 | florent.xicluna | 2010-03-07 14:14:25 +0200 (Sun, 07 Mar 2010) | 2 lines

  Fix some py3k warnings in the standard library.
........
---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 90f68d8208..e92bef1b5f 100644
--- a/util.py
+++ b/util.py
@@ -405,7 +405,7 @@ def execute (func, args, msg=None, verbose=0, dry_run=0):
 
     log.info(msg)
     if not dry_run:
-        apply(func, args)
+        func(*args)
 
 
 def strtobool (val):

From 231e1cc9526df4a63a21c09b41015b05d98cd7f9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 2 Aug 2010 21:44:25 +0000
Subject: [PATCH 3018/8469] Merged revisions
 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

  #8578: mention danger of not incref'ing weak referenced object.
........
  r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #7973: Fix distutils options spelling.
........
  r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

  #7386: add example that shows that trailing path separators are stripped.
........
  r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #8172: how does one use a property?
........
  r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

  #9451: strengthen warning about __*__ special name usage.
........
  r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

  #7280: note about nasmw.exe.
........
  r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

  #8861: remove unused variable.
........
  r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

  #8648: document UTF-7 codec functions.
........
  r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line

  #9037: add example how to raise custom exceptions from C code.
........
  r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line

  #9111: document that do_help() looks at docstrings.
........
  r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line

  Clarify that abs() is not a namespace.
........
  r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line

  #6867: epoll.register() returns None.
........
  r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line

  #9238: zipfile does handle archive comments.
........
---
 command/bdist_msi.py     | 2 +-
 command/bdist_wininst.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 72578498f7..ded837d752 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -148,7 +148,7 @@ def finalize_options (self):
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
         else:
             self.versions = list(self.all_versions)
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 88c0532f81..a31a5f7bac 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -95,7 +95,7 @@ def finalize_options (self):
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
             self.target_version = short_version
 

From 59c26754fc99abfc3cf85a7b435eb0ec14333812 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 2 Aug 2010 21:45:43 +0000
Subject: [PATCH 3019/8469] Merged revisions 83593 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83593 | georg.brandl | 2010-08-02 23:44:25 +0200 (Mo, 02 Aug 2010) | 57 lines

  Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

    #8578: mention danger of not incref'ing weak referenced object.
  ........
    r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #7973: Fix distutils options spelling.
  ........
    r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

    #7386: add example that shows that trailing path separators are stripped.
  ........
    r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

    #8172: how does one use a property?
  ........
    r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

    #9451: strengthen warning about __*__ special name usage.
  ........
    r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

    #7280: note about nasmw.exe.
  ........
    r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

    #8861: remove unused variable.
  ........
    r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

    #8648: document UTF-7 codec functions.
  ........
    r83563 | georg.brandl | 2010-08-02 22:21:21 +0200 (Mo, 02 Aug 2010) | 1 line

    #9037: add example how to raise custom exceptions from C code.
  ........
    r83565 | georg.brandl | 2010-08-02 22:27:20 +0200 (Mo, 02 Aug 2010) | 1 line

    #9111: document that do_help() looks at docstrings.
  ........
    r83571 | georg.brandl | 2010-08-02 22:44:34 +0200 (Mo, 02 Aug 2010) | 1 line

    Clarify that abs() is not a namespace.
  ........
    r83574 | georg.brandl | 2010-08-02 22:47:56 +0200 (Mo, 02 Aug 2010) | 1 line

    #6867: epoll.register() returns None.
  ........
    r83575 | georg.brandl | 2010-08-02 22:52:10 +0200 (Mo, 02 Aug 2010) | 1 line

    #9238: zipfile does handle archive comments.
  ........
................
---
 command/bdist_msi.py     | 2 +-
 command/bdist_wininst.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index da0b30d864..42271c4df3 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -138,7 +138,7 @@ def finalize_options (self):
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
         else:
             self.target_version = short_version
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d153e2bc38..128e1992cb 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -93,7 +93,7 @@ def finalize_options (self):
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError, \
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,)
             self.target_version = short_version
 

From 95fbccaf635ace75fe1838449f512c46dd5b2e49 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 3 Aug 2010 07:51:50 +0000
Subject: [PATCH 3020/8469] Merged revisions 79191 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79191 | florent.xicluna | 2010-03-21 13:50:17 +0200 (Sun, 21 Mar 2010) | 3 lines

  No more deprecation warnings for distutils.sysconfig, following r78666.
  But when the "dl" module is available, it gives a py3k deprecation warning.
........
---
 archive_util.py         | 2 +-
 command/build_py.py     | 4 ++--
 dir_util.py             | 2 +-
 filelist.py             | 2 +-
 tests/test_build_ext.py | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 251c0df4e9..782d4ef96c 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -160,7 +160,7 @@ def make_archive (base_name, format,
     func = format_info[0]
     for (arg,val) in format_info[1]:
         kwargs[arg] = val
-    filename = apply(func, (base_name, base_dir), kwargs)
+    filename = func(base_name, base_dir, **kwargs)
 
     try:
         filename = func(base_name, base_dir, **kwargs)
diff --git a/command/build_py.py b/command/build_py.py
index 708ef0f38f..9f8a759a74 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -157,7 +157,7 @@ def get_package_dir (self, package):
 
         if not self.package_dir:
             if path:
-                return apply(os.path.join, path)
+                return os.path.join(*path)
             else:
                 return ''
         else:
@@ -184,7 +184,7 @@ def get_package_dir (self, package):
                     tail.insert(0, pdir)
 
                 if tail:
-                    return apply(os.path.join, tail)
+                    return os.path.join(*tail)
                 else:
                     return ''
 
diff --git a/dir_util.py b/dir_util.py
index 77f253255f..92f49346f7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -204,7 +204,7 @@ def remove_tree (directory, verbose=0, dry_run=0):
     _build_cmdtuple(directory, cmdtuples)
     for cmd in cmdtuples:
         try:
-            apply(cmd[0], (cmd[1],))
+            cmd[0](cmd[1])
             # remove dir from cache if it's already there
             abspath = os.path.abspath(cmd[1])
             if abspath in _path_created:
diff --git a/filelist.py b/filelist.py
index 88b33c7c94..4448d5c5a0 100644
--- a/filelist.py
+++ b/filelist.py
@@ -68,7 +68,7 @@ def sort (self):
         sortable_files.sort()
         self.files = []
         for sort_tuple in sortable_files:
-            self.files.append(apply(os.path.join, sort_tuple))
+            self.files.append(os.path.join(*sort_tuple))
 
 
     # -- Other miscellaneous utility methods ---------------------------
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5ecfe15bff..1ed9d04b99 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -349,6 +349,11 @@ def test_build_ext_inplace(self):
         self.assertEquals(wanted, path)
 
     def test_setuptools_compat(self):
+        try:
+            # on some platforms, it loads the deprecated "dl" module
+            test_support.import_module('setuptools_build_ext', deprecated=True)
+        except test_support.TestSkipped:
+            return
         from setuptools_build_ext import build_ext as setuptools_build_ext
         from setuptools_extension import Extension
 

From 60f0fc889114642ceeba5b3d812c705ea4b97de9 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 3 Aug 2010 21:18:06 +0000
Subject: [PATCH 3021/8469] - Issue #8447: Make distutils.sysconfig follow
 symlinks in the path to   the interpreter executable.  This fixes a failure
 of test_httpservers   on OS X.

---
 sysconfig.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index bb53315bca..46d23ecc78 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -25,7 +25,7 @@
 # Path to the base directory of the project. On Windows the binary may
 # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
 # it'll live in project/PCbuild/amd64.
-project_base = os.path.dirname(os.path.abspath(sys.executable))
+project_base = os.path.dirname(os.path.realpath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
 # PC/VS7.1
@@ -74,7 +74,7 @@ def get_python_inc(plat_specific=0, prefix=None):
 
     if os.name == "posix":
         if python_build:
-            buildir = os.path.dirname(sys.executable)
+            buildir = os.path.dirname(os.path.realpath(sys.executable))
             if plat_specific:
                 # python.h is located in the buildir
                 inc_dir = buildir
@@ -222,7 +222,8 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+        return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
+                            "Makefile")
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 
@@ -459,7 +460,7 @@ def _init_nt():
     g['SO'] = '.pyd'
     g['EXE'] = ".exe"
     g['VERSION'] = get_python_version().replace(".", "")
-    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
+    g['BINDIR'] = os.path.dirname(os.path.realpath(sys.executable))
 
     global _config_vars
     _config_vars = g

From 5673d48db60eb63f4da8a53f210656c22b95c7a4 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 3 Aug 2010 21:33:04 +0000
Subject: [PATCH 3022/8469] Issue #8447: Make distutils.sysconfig follow
 symlinks in the path to the interpreter executable.  This fixes a failure of
 test_httpservers on OS X.

---
 sysconfig.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0fbd5412bc..9842d26c47 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -25,7 +25,7 @@
 # Path to the base directory of the project. On Windows the binary may
 # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
 # it'll live in project/PCbuild/amd64.
-project_base = os.path.dirname(os.path.abspath(sys.executable))
+project_base = os.path.dirname(os.path.realpath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
 # PC/VS7.1
@@ -77,7 +77,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             # the build directory may not be the source directory, we
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
-            base = os.path.dirname(os.path.abspath(sys.executable))
+            base = os.path.dirname(os.path.realpath(sys.executable))
             if plat_specific:
                 return base
             else:
@@ -223,7 +223,8 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+        return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
+                            "Makefile")
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 
@@ -442,7 +443,7 @@ def _init_nt():
     g['SO'] = '.pyd'
     g['EXE'] = ".exe"
     g['VERSION'] = get_python_version().replace(".", "")
-    g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
+    g['BINDIR'] = os.path.dirname(os.path.realpath(sys.executable))
 
     global _config_vars
     _config_vars = g

From 499b7fdd90857e215a9abcc6a56971e04e1aa1a0 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 3 Aug 2010 22:39:42 +0000
Subject: [PATCH 3023/8469] Bumping to 2.6.6 rc 1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9e7ab903d2..a861b3fb02 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.5"
+__version__ = "2.6.6rc1"
 #--end constants--

From a0e52b4f32d7383d92658e921017fe4b493af43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 14 Aug 2010 02:07:26 +0000
Subject: [PATCH 3024/8469] Revert regression from r81256 (with release manager
 approval, see #8688)

---
 command/sdist.py    | 86 +++++++++++++++++++++++++++++++--------------
 tests/test_sdist.py | 62 --------------------------------
 2 files changed, 59 insertions(+), 89 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 535b8d2aea..a366d1eaf6 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -57,8 +57,7 @@ class sdist (Command):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual. "
-         "Deprecated: now the manifest is always regenerated."),
+         "forcibly regenerate the manifest and carry on as usual"),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',
@@ -191,34 +190,67 @@ def get_file_list (self):
         distribution, and put it in 'self.filelist'.  This might involve
         reading the manifest template (and writing the manifest), or just
         reading the manifest, or just using the default file set -- it all
-        depends on the user's options.
+        depends on the user's options and the state of the filesystem.
         """
-        # new behavior:
-        # the file list is recalculated everytime because
-        # even if MANIFEST.in or setup.py are not changed
-        # the user might have added some files in the tree that
-        # need to be included.
-        #
-        #  This makes --force the default and only behavior.
-        template_exists = os.path.isfile(self.template)
-        if not template_exists:
-            self.warn(("manifest template '%s' does not exist " +
-                        "(using default file list)") %
-                        self.template)
-        self.filelist.findall()
-
-        if self.use_defaults:
-            self.add_defaults()
 
+        # If we have a manifest template, see if it's newer than the
+        # manifest; if so, we'll regenerate the manifest.
+        template_exists = os.path.isfile(self.template)
         if template_exists:
-            self.read_template()
-
-        if self.prune:
-            self.prune_file_list()
-
-        self.filelist.sort()
-        self.filelist.remove_duplicates()
-        self.write_manifest()
+            template_newer = dep_util.newer(self.template, self.manifest)
+
+        # The contents of the manifest file almost certainly depend on the
+        # setup script as well as the manifest template -- so if the setup
+        # script is newer than the manifest, we'll regenerate the manifest
+        # from the template.  (Well, not quite: if we already have a
+        # manifest, but there's no template -- which will happen if the
+        # developer elects to generate a manifest some other way -- then we
+        # can't regenerate the manifest, so we don't.)
+        self.debug_print("checking if %s newer than %s" %
+                         (self.distribution.script_name, self.manifest))
+        setup_newer = dep_util.newer(self.distribution.script_name,
+                                     self.manifest)
+
+        # cases:
+        #   1) no manifest, template exists: generate manifest
+        #      (covered by 2a: no manifest == template newer)
+        #   2) manifest & template exist:
+        #      2a) template or setup script newer than manifest:
+        #          regenerate manifest
+        #      2b) manifest newer than both:
+        #          do nothing (unless --force or --manifest-only)
+        #   3) manifest exists, no template:
+        #      do nothing (unless --force or --manifest-only)
+        #   4) no manifest, no template: generate w/ warning ("defaults only")
+
+        manifest_outofdate = (template_exists and
+                              (template_newer or setup_newer))
+        force_regen = self.force_manifest or self.manifest_only
+        manifest_exists = os.path.isfile(self.manifest)
+        neither_exists = (not template_exists and not manifest_exists)
+
+        # Regenerate the manifest if necessary (or if explicitly told to)
+        if manifest_outofdate or neither_exists or force_regen:
+            if not template_exists:
+                self.warn(("manifest template '%s' does not exist " +
+                           "(using default file list)") %
+                          self.template)
+            self.filelist.findall()
+
+            if self.use_defaults:
+                self.add_defaults()
+            if template_exists:
+                self.read_template()
+            if self.prune:
+                self.prune_file_list()
+
+            self.filelist.sort()
+            self.filelist.remove_duplicates()
+            self.write_manifest()
+
+        # Don't regenerate the manifest, just read it in.
+        else:
+            self.read_manifest()
 
     # get_file_list ()
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 6b8784ac3d..e322c1385c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,7 +29,6 @@ def setUp(self):
         super(sdistTestCase, self).setUp()
         self.old_path = os.getcwd()
         self.temp_pkg = os.path.join(self.mkdtemp(), 'temppkg')
-        self.tmp_dir = self.mkdtemp()
 
     def tearDown(self):
         os.chdir(self.old_path)
@@ -152,67 +151,6 @@ def test_make_distribution(self):
         self.assertEquals(result,
                 ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
-    def get_cmd(self, metadata=None):
-        """Returns a cmd"""
-        if metadata is None:
-            metadata = {'name': 'fake', 'version': '1.0',
-                        'url': 'xxx', 'author': 'xxx',
-                        'author_email': 'xxx'}
-        dist = Distribution(metadata)
-        dist.script_name = 'setup.py'
-        dist.packages = ['somecode']
-        dist.include_package_data = True
-        cmd = sdist(dist)
-        cmd.dist_dir = 'dist'
-        def _warn(*args):
-            pass
-        cmd.warn = _warn
-        return dist, cmd
-
-    def test_get_file_list(self):
-        # make sure MANIFEST is recalculated
-        dist, cmd = self.get_cmd()
-
-        os.chdir(self.tmp_dir)
-
-        # filling data_files by pointing files in package_data
-        os.mkdir(os.path.join(self.tmp_dir, 'somecode'))
-        self.write_file((self.tmp_dir, 'somecode', '__init__.py'), '#')
-        self.write_file((self.tmp_dir, 'somecode', 'one.py'), '#')
-        cmd.ensure_finalized()
-        cmd.run()
-
-        f = open(cmd.manifest)
-        try:
-            manifest = [line.strip() for line in f.read().split('\n')
-                        if line.strip() != '']
-        finally:
-            f.close()
-
-        self.assertEquals(len(manifest), 2)
-
-        # adding a file
-        self.write_file((self.tmp_dir, 'somecode', 'two.py'), '#')
-
-        # make sure build_py is reinitinialized, like a fresh run
-        build_py = dist.get_command_obj('build_py')
-        build_py.finalized = False
-        build_py.ensure_finalized()
-
-        cmd.run()
-
-        f = open(cmd.manifest)
-        try:
-            manifest2 = [line.strip() for line in f.read().split('\n')
-                         if line.strip() != '']
-        finally:
-            f.close()
-
-        # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 3)
-        self.assert_('two.py' in manifest2[-1])
-
-
 def test_suite():
     return unittest.makeSuite(sdistTestCase)
 

From aefeb97682f95d9ae4df1c41a5bd8f1fd047c016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 14 Aug 2010 02:30:34 +0000
Subject: [PATCH 3025/8469] Use a marker in generated MANIFEST files, don't
 touch files without it. Fixes #8688.

---
 command/sdist.py    | 17 +++++++++++++++--
 tests/test_sdist.py | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f51d72fad7..818a45260d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -335,8 +335,21 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        self.execute(file_util.write_file,
-                     (self.manifest, self.filelist.files),
+        if os.path.isfile(self.manifest):
+            fp = open(self.manifest)
+            try:
+                first_line = fp.readline()
+            finally:
+                fp.close()
+
+            if first_line != '# file GENERATED by distutils, do NOT edit\n':
+                log.info("not writing to manually maintained "
+                         "manifest file '%s'" % self.manifest)
+                return
+
+        content = self.filelist.files[:]
+        content.insert(0, '# file GENERATED by distutils, do NOT edit')
+        self.execute(file_util.write_file, (self.manifest, content),
                      "writing manifest file '%s'" % self.manifest)
 
     def read_manifest(self):
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f95035dfb0..209aa59baf 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,6 +29,7 @@
 """
 
 MANIFEST = """\
+# file GENERATED by distutils, do NOT edit
 README
 inroot.txt
 setup.py
@@ -294,7 +295,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 4)
+        self.assertEquals(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -314,9 +315,40 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 5)
+        self.assertEquals(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    def test_manifest_marker(self):
+        # check that autogenerated MANIFESTs have a marker
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest[0],
+                         '# file GENERATED by distutils, do NOT edit')
+
+    def test_manual_manifest(self):
+        # check that a MANIFEST without a marker is left alone
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest, ['README.manual'])
 
 def test_suite():
     return unittest.makeSuite(SDistTestCase)

From 6d8137e922dd736506976931c7acec8953025d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 14 Aug 2010 02:36:26 +0000
Subject: [PATCH 3026/8469] Merged revisions 83993 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r83993 | eric.araujo | 2010-08-14 04:30:34 +0200 (sam., 14 août 2010) | 2 lines

  Use a marker in generated MANIFEST files, don't touch files without it. Fixes #8688.
........
---
 command/sdist.py    | 17 +++++++++++++++--
 tests/test_sdist.py | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index f51d72fad7..818a45260d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -335,8 +335,21 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        self.execute(file_util.write_file,
-                     (self.manifest, self.filelist.files),
+        if os.path.isfile(self.manifest):
+            fp = open(self.manifest)
+            try:
+                first_line = fp.readline()
+            finally:
+                fp.close()
+
+            if first_line != '# file GENERATED by distutils, do NOT edit\n':
+                log.info("not writing to manually maintained "
+                         "manifest file '%s'" % self.manifest)
+                return
+
+        content = self.filelist.files[:]
+        content.insert(0, '# file GENERATED by distutils, do NOT edit')
+        self.execute(file_util.write_file, (self.manifest, content),
                      "writing manifest file '%s'" % self.manifest)
 
     def read_manifest(self):
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f95035dfb0..209aa59baf 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,6 +29,7 @@
 """
 
 MANIFEST = """\
+# file GENERATED by distutils, do NOT edit
 README
 inroot.txt
 setup.py
@@ -294,7 +295,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 4)
+        self.assertEquals(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -314,9 +315,40 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 5)
+        self.assertEquals(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    def test_manifest_marker(self):
+        # check that autogenerated MANIFESTs have a marker
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest[0],
+                         '# file GENERATED by distutils, do NOT edit')
+
+    def test_manual_manifest(self):
+        # check that a MANIFEST without a marker is left alone
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest, ['README.manual'])
 
 def test_suite():
     return unittest.makeSuite(SDistTestCase)

From 517674a725c862dc2c5b0905b4f341d53e93f66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 14 Aug 2010 03:07:46 +0000
Subject: [PATCH 3027/8469] Merged revisions 83993 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r83993 | eric.araujo | 2010-08-14 04:30:34 +0200 (sam., 14 août 2010) | 2 lines

  Use a marker in generated MANIFEST files, don't touch files without it. Fixes #8688.
........
---
 command/sdist.py    | 17 +++++++++++++++--
 tests/test_sdist.py | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 087ae9dcc6..f2d2f94beb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -349,8 +349,21 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        self.execute(file_util.write_file,
-                     (self.manifest, self.filelist.files),
+        if os.path.isfile(self.manifest):
+            fp = open(self.manifest)
+            try:
+                first_line = fp.readline()
+            finally:
+                fp.close()
+
+            if first_line != '# file GENERATED by distutils, do NOT edit\n':
+                log.info("not writing to manually maintained "
+                         "manifest file '%s'" % self.manifest)
+                return
+
+        content = self.filelist.files[:]
+        content.insert(0, '# file GENERATED by distutils, do NOT edit')
+        self.execute(file_util.write_file, (self.manifest, content),
                      "writing manifest file '%s'" % self.manifest)
 
     def read_manifest(self):
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f83b9f29b6..87adb45894 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -45,6 +45,7 @@
 """
 
 MANIFEST = """\
+# file GENERATED by distutils, do NOT edit
 README
 inroot.txt
 setup.py
@@ -364,7 +365,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 4)
+        self.assertEquals(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -384,9 +385,40 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 5)
+        self.assertEquals(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    def test_manifest_marker(self):
+        # check that autogenerated MANIFESTs have a marker
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest[0],
+                         '# file GENERATED by distutils, do NOT edit')
+
+    def test_manual_manifest(self):
+        # check that a MANIFEST without a marker is left alone
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
+        cmd.run()
+
+        f = open(cmd.manifest)
+        try:
+            manifest = [line.strip() for line in f.read().split('\n')
+                        if line.strip() != '']
+        finally:
+            f.close()
+
+        self.assertEqual(manifest, ['README.manual'])
 
 def test_suite():
     return unittest.makeSuite(SDistTestCase)

From 55096b84cc9e0882c64d0772880b9d08f2f9e41e Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 16 Aug 2010 22:19:57 +0000
Subject: [PATCH 3028/8469] Bumping to 2.6.6rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a861b3fb02..c456c7487f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.6rc1"
+__version__ = "2.6.6rc2"
 #--end constants--

From e870a5993437de693e68c83e15ed02f3b7af1575 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 23 Aug 2010 23:37:56 +0000
Subject: [PATCH 3029/8469] 2.6.6 final.  \o/

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c456c7487f..90f96feae1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.6rc2"
+__version__ = "2.6.6"
 #--end constants--

From 36cae28e19a68627c873ff982d2a2dd3279cea9c Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 30 Aug 2010 14:05:50 +0000
Subject: [PATCH 3030/8469] remove pointless coding cookies

---
 command/bdist_msi.py | 1 -
 tests/test_dist.py   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 8a458d8536..b11957a7dc 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2005, 2006 Martin von Löwis
 # Licensed to PSF under a Contributor Agreement.
 # The bdist_wininst command proper
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 3b7637f3af..007803e12d 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -1,4 +1,3 @@
-# -*- coding: utf8 -*-
 """Tests for distutils.dist."""
 import os
 import io

From b202a1a25f6d7ab9707910d6e36df58e8f9a2508 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 3 Sep 2010 18:30:30 +0000
Subject: [PATCH 3031/8469] PEP 3149 is accepted.

http://mail.python.org/pipermail/python-dev/2010-September/103408.html
---
 tests/test_build_ext.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b7cdc20aa4..52479d7d37 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -323,8 +323,8 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        so_ext = sysconfig.get_config_var('SO')
+        self.assertTrue(so_file.endswith(so_ext))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, other_tmp_dir)
 
@@ -333,8 +333,7 @@ def test_get_outputs(self):
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        self.assertTrue(so_file.endswith(so_ext))
         so_dir = os.path.dirname(so_file)
         self.assertEquals(so_dir, cmd.build_lib)
 

From a51303cf88483095772fd60fc7184fceafc9073c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 5 Sep 2010 08:30:40 +0000
Subject: [PATCH 3032/8469] Bump to 3.2a2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7b2227916a..92ed8f4db2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2a1"
+__version__ = "3.2a2"
 #--end constants--

From 0aeceb2acf76e1ecb122098bc9a797218568bece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 22:11:52 +0000
Subject: [PATCH 3033/8469] Fix eon-old bug in build_clib options (#1718574)

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

diff --git a/command/build_clib.py b/command/build_clib.py
index 258d7c10be..428011a64d 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -32,9 +32,9 @@ class build_clib(Command):
     description = "build C/C++ libraries used by Python extensions"
 
     user_options = [
-        ('build-clib', 'b',
+        ('build-clib=', 'b',
          "directory to build C/C++ libraries to"),
-        ('build-temp', 't',
+        ('build-temp=', 't',
          "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),

From 53eb48ea76c6fe4f6ee380f926ecac6136d2eee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 22:17:04 +0000
Subject: [PATCH 3034/8469] Merged revisions 84608 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84608 | eric.araujo | 2010-09-08 00:11:52 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix eon-old bug in build_clib options (#1718574)
........
---
 command/build_clib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 258d7c10be..428011a64d 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -32,9 +32,9 @@ class build_clib(Command):
     description = "build C/C++ libraries used by Python extensions"
 
     user_options = [
-        ('build-clib', 'b',
+        ('build-clib=', 'b',
          "directory to build C/C++ libraries to"),
-        ('build-temp', 't',
+        ('build-temp=', 't',
          "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),

From 878ab41a641d75ce127fda7857f7b271bd19efac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 22:18:34 +0000
Subject: [PATCH 3035/8469] Merged revisions 84608 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84608 | eric.araujo | 2010-09-08 00:11:52 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix eon-old bug in build_clib options (#1718574)
........
---
 command/build_clib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/build_clib.py b/command/build_clib.py
index 8d49de75e1..98a1726ffa 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -32,9 +32,9 @@ class build_clib(Command):
     description = "build C/C++ libraries used by Python extensions"
 
     user_options = [
-        ('build-clib', 'b',
+        ('build-clib=', 'b',
          "directory to build C/C++ libraries to"),
-        ('build-temp', 't',
+        ('build-temp=', 't',
          "directory to put temporary build by-products"),
         ('debug', 'g',
          "compile with debugging information"),

From fe763ddd66aa35cad53dd175d483ed37f26726d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 23:08:57 +0000
Subject: [PATCH 3036/8469] Fix incorrect use of Command.announce (#9199)

---
 command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index f602fbeb68..41df127799 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -194,4 +194,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, r.read(), '-'*75)
+            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            self.announce(msg, log.INFO)

From 77ea1a964b3e95dddca07562f1c724a9ef71cdf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 23:09:44 +0000
Subject: [PATCH 3037/8469] Merged revisions 84611 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84611 | eric.araujo | 2010-09-08 01:08:57 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix incorrect use of Command.announce (#9199)
........
---
 command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index f602fbeb68..41df127799 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -194,4 +194,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, r.read(), '-'*75)
+            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            self.announce(msg, log.INFO)

From 4123cdd0eebf95195be93eaa84c4b62d587a9028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 7 Sep 2010 23:12:59 +0000
Subject: [PATCH 3038/8469] Merged revisions 84611 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84611 | eric.araujo | 2010-09-08 01:08:57 +0200 (mer., 08 sept. 2010) | 2 lines

  Fix incorrect use of Command.announce (#9199)
........
---
 command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 18a10a0b7f..4b3ed3f991 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -186,4 +186,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            self.announce('-'*75, result.read(), '-'*75)
+            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            self.announce(msg, log.INFO)

From 3136e10a506a31f07107f7d08c96074d2709626b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 8 Sep 2010 00:00:45 +0000
Subject: [PATCH 3039/8469] Follow-up to #9199: Fix str.join use, add newlines.

Thanks to Konrad Delong for writing a test for upload_docs
--show-response in distutils2, letting me catch my mistake.
---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 41df127799..99e03d747c 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -194,5 +194,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
             self.announce(msg, log.INFO)

From 7a18c28655272f4da8f115d20b5b5f975699bf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 8 Sep 2010 00:02:00 +0000
Subject: [PATCH 3040/8469] Merged revisions 84614 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84614 | eric.araujo | 2010-09-08 02:00:45 +0200 (mer., 08 sept. 2010) | 5 lines

  Follow-up to #9199: Fix str.join use, add newlines.

  Thanks to Konrad Delong for writing a test for upload_docs
  --show-response in distutils2, letting me catch my mistake.
........
---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 41df127799..99e03d747c 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -194,5 +194,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
             self.announce(msg, log.INFO)

From e0136d1da875b82d0cb33b89430ca52a4f5656fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 8 Sep 2010 00:02:29 +0000
Subject: [PATCH 3041/8469] Merged revisions 84614 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84614 | eric.araujo | 2010-09-08 02:00:45 +0200 (mer., 08 sept. 2010) | 5 lines

  Follow-up to #9199: Fix str.join use, add newlines.

  Thanks to Konrad Delong for writing a test for upload_docs
  --show-response in distutils2, letting me catch my mistake.
........
---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 4b3ed3f991..c3f19d207f 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -186,5 +186,5 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            msg = ''.join('-' * 75, r.read(), '-' * 75)
+            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
             self.announce(msg, log.INFO)

From 2f09caa926e12dbc91a0652c0e3d8ab494046579 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 10 Sep 2010 19:44:44 +0000
Subject: [PATCH 3042/8469] =?UTF-8?q?Issue=20#941346:=20Improve=20the=20bu?=
 =?UTF-8?q?ild=20process=20under=20AIX=20and=20allow=20Python=20to=20be=20?=
 =?UTF-8?q?built=20as=20a=20shared=20library.=20=20Patch=20by=20S=C3=A9bas?=
 =?UTF-8?q?tien=20Sabl=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 command/build_ext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index bd61bc56f3..4e664642b8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -748,6 +748,9 @@ def get_libraries(self, ext):
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
+        elif sys.platform[:3] == 'aix':
+            # Don't use the default code below
+            return ext.libraries
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):

From ba76a4b8033a52729a7ab55129b9113ccca9a2e4 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 10 Sep 2010 19:55:19 +0000
Subject: [PATCH 3043/8469] Merged revisions 84680 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r84680 | antoine.pitrou | 2010-09-10 21:44:44 +0200 (ven., 10 sept. 2010) | 4 lines

  Issue #941346: Improve the build process under AIX and allow Python to
  be built as a shared library.  Patch by Sébastien Sablé.
........
---
 command/build_ext.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index bd61bc56f3..4e664642b8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -748,6 +748,9 @@ def get_libraries(self, ext):
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
+        elif sys.platform[:3] == 'aix':
+            # Don't use the default code below
+            return ext.libraries
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):

From 8bede4b22db5241e8e141a6b4c2d718b02f4a57b Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 10 Sep 2010 20:03:17 +0000
Subject: [PATCH 3044/8469] Merged revisions 84680 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r84680 | antoine.pitrou | 2010-09-10 21:44:44 +0200 (ven., 10 sept. 2010) | 4 lines

  Issue #941346: Improve the build process under AIX and allow Python to
  be built as a shared library.  Patch by Sébastien Sablé.
........
---
 command/build_ext.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index aeb6b744dc..5b3be6fbd6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -753,7 +753,9 @@ def get_libraries (self, ext):
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
-
+        elif sys.platform[:3] == 'aix':
+            # Don't use the default code below
+            return ext.libraries
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):

From 944d8d8d40616d46d4ebf34a58b2fd75bd317589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 11 Sep 2010 15:28:56 +0000
Subject: [PATCH 3045/8469] Fix typo in option name

---
 command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 818a45260d..1118060cbb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -73,7 +73,7 @@ def checking_metadata(self):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
-        ('medata-check', None,
+        ('metadata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
         ]

From 5a1680dbd2d366418cd676f6b979a0589b645950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 11 Sep 2010 15:30:19 +0000
Subject: [PATCH 3046/8469] Merged revisions 84711 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84711 | eric.araujo | 2010-09-11 17:28:56 +0200 (sam., 11 sept. 2010) | 2 lines

  Fix typo in option name
........
---
 command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 818a45260d..1118060cbb 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -73,7 +73,7 @@ def checking_metadata(self):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
-        ('medata-check', None,
+        ('metadata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
         ]

From 095b65f89a72607c6ec21acfdc655633a9aecb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 11 Sep 2010 15:31:13 +0000
Subject: [PATCH 3047/8469] Merged revisions 84711 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84711 | eric.araujo | 2010-09-11 17:28:56 +0200 (sam., 11 sept. 2010) | 2 lines

  Fix typo in option name
........
---
 command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index f2d2f94beb..0c3b0b55bf 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -73,7 +73,7 @@ def checking_metadata(self):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
-        ('medata-check', None,
+        ('metadata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
         ('owner=', 'u',

From d4b44c7d2deb42b35cb3c54d8f367f16fa37e1ab Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Sun, 12 Sep 2010 22:55:40 +0000
Subject: [PATCH 3048/8469] Issue #9313: Skips test_remove_visual_c_ref on old
 MSVC.

---
 tests/test_msvc9compiler.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 8a908d9954..39e2c11cc2 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -109,6 +109,11 @@ def test_reg_class(self):
         self.assertTrue('Desktop' in keys)
 
     def test_remove_visual_c_ref(self):
+        from distutils.msvccompiler import get_build_version
+        if get_build_version() < 8.0:
+            # this test is only for MSVC8.0 or above
+            return
+
         from distutils.msvc9compiler import MSVCCompiler
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')

From 50e74d1aefc924a81eb8a4ce26c7376b4c41c055 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 05:36:21 +0000
Subject: [PATCH 3049/8469] Issue #9313: Use unittest.skipUnless to skip old
 MSVC.

---
 tests/test_msvc9compiler.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 39e2c11cc2..ec2b2e367a 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -60,7 +60,12 @@
   </dependency>
 </assembly>"""
 
+if sys.platform=="win32":
+    from distutils.msvccompiler import get_build_version
+
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
+                                               " MSVC8.0 or above")
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
@@ -68,10 +73,6 @@ def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None
@@ -86,11 +87,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
-
         from distutils.msvc9compiler import Reg
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
 
@@ -109,11 +105,6 @@ def test_reg_class(self):
         self.assertTrue('Desktop' in keys)
 
     def test_remove_visual_c_ref(self):
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
-
         from distutils.msvc9compiler import MSVCCompiler
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')

From 74e96af334b6541dc32dba42f6ba5c042111ddfd Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 05:48:30 +0000
Subject: [PATCH 3050/8469] Merged revisions 84753,84760 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84753 | hirokazu.yamamoto | 2010-09-13 07:55:40 +0900 | 1 line

  Issue #9313: Skips test_remove_visual_c_ref on old MSVC.
........
  r84760 | hirokazu.yamamoto | 2010-09-13 14:36:21 +0900 | 1 line

  Issue #9313: Use unittest.skipUnless to skip old MSVC.
........
---
 tests/test_msvc9compiler.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 8a908d9954..ec2b2e367a 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -60,7 +60,12 @@
   </dependency>
 </assembly>"""
 
+if sys.platform=="win32":
+    from distutils.msvccompiler import get_build_version
+
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
+                                               " MSVC8.0 or above")
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
@@ -68,10 +73,6 @@ def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None
@@ -86,11 +87,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
-
         from distutils.msvc9compiler import Reg
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
 

From 9b43905136212f7c0463ec8e844c02c9830df14e Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 06:36:09 +0000
Subject: [PATCH 3051/8469] Merged revisions 84753,84760 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84753 | hirokazu.yamamoto | 2010-09-13 07:55:40 +0900 | 1 line

  Issue #9313: Skips test_remove_visual_c_ref on old MSVC.
........
  r84760 | hirokazu.yamamoto | 2010-09-13 14:36:21 +0900 | 1 line

  Issue #9313: Use unittest.skipUnless to skip old MSVC.
........
---
 tests/test_msvc9compiler.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 503a5a8056..cd162516cf 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -60,7 +60,12 @@
   </dependency>
 </assembly>"""
 
+if sys.platform=="win32":
+    from distutils.msvccompiler import get_build_version
+
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
+                                               " MSVC8.0 or above")
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
@@ -68,10 +73,6 @@ def test_no_compiler(self):
         # makes sure query_vcvarsall throws
         # a DistutilsPlatformError if the compiler
         # is not found
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
         from distutils.msvc9compiler import query_vcvarsall
         def _find_vcvarsall(version):
             return None
@@ -86,11 +87,6 @@ def _find_vcvarsall(version):
             msvc9compiler.find_vcvarsall = old_find_vcvarsall
 
     def test_reg_class(self):
-        from distutils.msvccompiler import get_build_version
-        if get_build_version() < 8.0:
-            # this test is only for MSVC8.0 or above
-            return
-
         from distutils.msvc9compiler import Reg
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
 

From c9bc9d98d8766b49eea3d8fbc084e9313094b94e Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 07:18:30 +0000
Subject: [PATCH 3052/8469] get_build_version() is needed even where
 sys.platform != "win32". Try to fix buildbot error in other way.

---
 tests/test_msvc9compiler.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index ec2b2e367a..f1da843fab 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -62,10 +62,14 @@
 
 if sys.platform=="win32":
     from distutils.msvccompiler import get_build_version
-
-@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
-@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
-                                               " MSVC8.0 or above")
+    if get_build_version()>=8.0:
+        SKIP_MESSAGE = None
+    else:
+        SKIP_MESSAGE = "These tests are only for MSVC8.0 or above"
+else:
+    SKIP_MESSAGE = "These tests are only for win32"
+
+@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 

From 93127be78a63414c9ca002640c693192224221aa Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 07:48:22 +0000
Subject: [PATCH 3053/8469] Merged revisions 84765 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84765 | hirokazu.yamamoto | 2010-09-13 16:18:30 +0900 | 2 lines

  get_build_version() is needed even where sys.platform != "win32".
  Try to fix buildbot error in other way.
........
---
 tests/test_msvc9compiler.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index ec2b2e367a..f1da843fab 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -62,10 +62,14 @@
 
 if sys.platform=="win32":
     from distutils.msvccompiler import get_build_version
-
-@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
-@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
-                                               " MSVC8.0 or above")
+    if get_build_version()>=8.0:
+        SKIP_MESSAGE = None
+    else:
+        SKIP_MESSAGE = "These tests are only for MSVC8.0 or above"
+else:
+    SKIP_MESSAGE = "These tests are only for win32"
+
+@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 

From 3033d62a264a06b0d60459c769af0d5d2ffb4db9 Mon Sep 17 00:00:00 2001
From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 13 Sep 2010 08:14:41 +0000
Subject: [PATCH 3054/8469] Merged revisions 84765 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84765 | hirokazu.yamamoto | 2010-09-13 16:18:30 +0900 | 2 lines

  get_build_version() is needed even where sys.platform != "win32".
  Try to fix buildbot error in other way.
........
---
 tests/test_msvc9compiler.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index cd162516cf..c957954482 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -62,10 +62,14 @@
 
 if sys.platform=="win32":
     from distutils.msvccompiler import get_build_version
-
-@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
-@unittest.skipUnless(get_build_version()>=8.0, "These tests are only for"
-                                               " MSVC8.0 or above")
+    if get_build_version()>=8.0:
+        SKIP_MESSAGE = None
+    else:
+        SKIP_MESSAGE = "These tests are only for MSVC8.0 or above"
+else:
+    SKIP_MESSAGE = "These tests are only for win32"
+
+@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)
 class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 

From fdc07fb43978baae1dbe06a43707d5c81a14d1db Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 17 Sep 2010 16:35:37 +0000
Subject: [PATCH 3055/8469] Fix Issue2236: Distutils' mkpath implementation
 ignoring the "mode" parameter

---
 dir_util.py            | 2 +-
 tests/test_dir_util.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 98e6252c6c..54376e5ca5 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -68,7 +68,7 @@ def mkpath(name, mode=0o777, verbose=1, dry_run=0):
 
         if not dry_run:
             try:
-                os.mkdir(head)
+                os.mkdir(head, mode)
                 created_dirs.append(head)
             except OSError as exc:
                 raise DistutilsFileError(
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 0f694aa020..8986ca55d4 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -1,6 +1,7 @@
 """Tests for distutils.dir_util."""
 import unittest
 import os
+import stat
 import shutil
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -48,6 +49,12 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    def test_mkpath_with_custom_mode(self):
+        mkpath(self.target, 0o700)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        mkpath(self.target2, 0o555)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)

From 1fbe22435a7a8e26625d33b3f1c5531fd8eb0090 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 17 Sep 2010 16:40:01 +0000
Subject: [PATCH 3056/8469] Merged revisions 84861 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84861 | senthil.kumaran | 2010-09-17 22:05:37 +0530 (Fri, 17 Sep 2010) | 3 lines

  Fix Issue2236: Distutils' mkpath implementation ignoring the "mode" parameter
........
---
 dir_util.py            | 2 +-
 tests/test_dir_util.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 9b4d2adb5c..5a968063f7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -68,7 +68,7 @@ def mkpath(name, mode=0777, verbose=1, dry_run=0):
 
         if not dry_run:
             try:
-                os.mkdir(head)
+                os.mkdir(head, mode)
                 created_dirs.append(head)
             except OSError, exc:
                 raise DistutilsFileError, \
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 0f694aa020..8986ca55d4 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -1,6 +1,7 @@
 """Tests for distutils.dir_util."""
 import unittest
 import os
+import stat
 import shutil
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -48,6 +49,12 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    def test_mkpath_with_custom_mode(self):
+        mkpath(self.target, 0o700)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        mkpath(self.target2, 0o555)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)

From 8ff8c31883ff47ba9489fa9e265dce2e3dfc2361 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 17 Sep 2010 16:42:05 +0000
Subject: [PATCH 3057/8469] Merged revisions 84861 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84861 | senthil.kumaran | 2010-09-17 22:05:37 +0530 (Fri, 17 Sep 2010) | 3 lines

  Fix Issue2236: Distutils' mkpath implementation ignoring the "mode" parameter
........
---
 dir_util.py            | 2 +-
 tests/test_dir_util.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 98e6252c6c..54376e5ca5 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -68,7 +68,7 @@ def mkpath(name, mode=0o777, verbose=1, dry_run=0):
 
         if not dry_run:
             try:
-                os.mkdir(head)
+                os.mkdir(head, mode)
                 created_dirs.append(head)
             except OSError as exc:
                 raise DistutilsFileError(
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 0f694aa020..8986ca55d4 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -1,6 +1,7 @@
 """Tests for distutils.dir_util."""
 import unittest
 import os
+import stat
 import shutil
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -48,6 +49,12 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    def test_mkpath_with_custom_mode(self):
+        mkpath(self.target, 0o700)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        mkpath(self.target2, 0o555)
+        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)

From e2489f924e1603823889e36f900b10e9211d903d Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sat, 18 Sep 2010 02:55:03 +0000
Subject: [PATCH 3058/8469] Skip the distutils mode test on Windows OS.

---
 tests/test_dir_util.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 8986ca55d4..892a66d2ad 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,6 +3,7 @@
 import os
 import stat
 import shutil
+import sys
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
                                 ensure_relative)
@@ -49,6 +50,8 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    @unittest.skipIf(sys.platform.startswith('win'),
+                        "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
         mkpath(self.target, 0o700)
         self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)

From 2e99ac7174e503aa7a717d339eff6bcbd620e7d2 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sat, 18 Sep 2010 02:57:28 +0000
Subject: [PATCH 3059/8469] Merged revisions 84871 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84871 | senthil.kumaran | 2010-09-18 08:25:03 +0530 (Sat, 18 Sep 2010) | 3 lines

  Skip the distutils mode test on Windows OS.
........
---
 tests/test_dir_util.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 8986ca55d4..892a66d2ad 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,6 +3,7 @@
 import os
 import stat
 import shutil
+import sys
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
                                 ensure_relative)
@@ -49,6 +50,8 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    @unittest.skipIf(sys.platform.startswith('win'),
+                        "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
         mkpath(self.target, 0o700)
         self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)

From eb473877ee82b71b02cee7c530d5f279670f8a4d Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sat, 18 Sep 2010 02:58:49 +0000
Subject: [PATCH 3060/8469] Merged revisions 84871 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84871 | senthil.kumaran | 2010-09-18 08:25:03 +0530 (Sat, 18 Sep 2010) | 3 lines

  Skip the distutils mode test on Windows OS.
........
---
 tests/test_dir_util.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 8986ca55d4..892a66d2ad 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,6 +3,7 @@
 import os
 import stat
 import shutil
+import sys
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
                                 ensure_relative)
@@ -49,6 +50,8 @@ def test_mkpath_remove_tree_verbosity(self):
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
         self.assertEquals(self._logs, wanted)
 
+    @unittest.skipIf(sys.platform.startswith('win'),
+                        "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
         mkpath(self.target, 0o700)
         self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)

From ebefff189367909ff68453fd010eb61213827644 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 19 Sep 2010 03:09:54 +0000
Subject: [PATCH 3061/8469] Update the test_distutils mode test to test with
 umask value properly.

---
 tests/test_dir_util.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 892a66d2ad..a1647fbcf5 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -53,10 +53,15 @@ def test_mkpath_remove_tree_verbosity(self):
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
+        # Get and set the current umask value for testing mode bits.
+        umask = os.umask(0o002)
+        os.umask(umask)
         mkpath(self.target, 0o700)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
         mkpath(self.target2, 0o555)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
 
     def test_create_tree_verbosity(self):
 

From d8b66d133304a36d1597de05eeaac5dfb60a8712 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 19 Sep 2010 03:12:28 +0000
Subject: [PATCH 3062/8469] Merged revisions 84889 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84889 | senthil.kumaran | 2010-09-19 08:39:54 +0530 (Sun, 19 Sep 2010) | 3 lines

  Update the test_distutils mode test to test with umask value properly.
........
---
 tests/test_dir_util.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 892a66d2ad..a1647fbcf5 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -53,10 +53,15 @@ def test_mkpath_remove_tree_verbosity(self):
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
+        # Get and set the current umask value for testing mode bits.
+        umask = os.umask(0o002)
+        os.umask(umask)
         mkpath(self.target, 0o700)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
         mkpath(self.target2, 0o555)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
 
     def test_create_tree_verbosity(self):
 

From b5a3263df80e4b7b52e97e0f9ac4d92993c7b5dc Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 19 Sep 2010 03:12:35 +0000
Subject: [PATCH 3063/8469] Merged revisions 84889 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84889 | senthil.kumaran | 2010-09-19 08:39:54 +0530 (Sun, 19 Sep 2010) | 3 lines

  Update the test_distutils mode test to test with umask value properly.
........
---
 tests/test_dir_util.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 892a66d2ad..a1647fbcf5 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -53,10 +53,15 @@ def test_mkpath_remove_tree_verbosity(self):
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
+        # Get and set the current umask value for testing mode bits.
+        umask = os.umask(0o002)
+        os.umask(umask)
         mkpath(self.target, 0o700)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target).st_mode), 0o700)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target).st_mode), 0o700 & ~umask)
         mkpath(self.target2, 0o555)
-        self.assertEqual(stat.S_IMODE(os.stat(self.target2).st_mode), 0o555)
+        self.assertEqual(
+            stat.S_IMODE(os.stat(self.target2).st_mode), 0o555 & ~umask)
 
     def test_create_tree_verbosity(self):
 

From 70b1270636c9a42b0f1f4458d37bbbbabac4bb32 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 20 Sep 2010 10:13:13 +0000
Subject: [PATCH 3064/8469] logging: added hasHandlers() to LoggerAdapter.

---
 sysconfig.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 48f3fe4d59..3567db8349 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -56,6 +56,18 @@ def get_python_version():
     """
     return sys.version[:3]
 
+def _get_build_dir(name, plat_specific):
+    # Assume the executable is in the build directory.  The
+    # pyconfig.h file should be in the same directory.  Since
+    # the build directory may not be the source directory, we
+    # must use "srcdir" from the makefile to find the "Include"
+    # directory.
+    base = os.path.dirname(os.path.abspath(sys.executable))
+    if plat_specific:
+        return base
+    else:
+        thedir = os.path.join(get_config_var('srcdir'), name)
+        return os.path.normpath(thedir)
 
 def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
@@ -72,17 +84,7 @@ def get_python_inc(plat_specific=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
-            # Assume the executable is in the build directory.  The
-            # pyconfig.h file should be in the same directory.  Since
-            # the build directory may not be the source directory, we
-            # must use "srcdir" from the makefile to find the "Include"
-            # directory.
-            base = os.path.dirname(os.path.abspath(sys.executable))
-            if plat_specific:
-                return base
-            else:
-                incdir = os.path.join(get_config_var('srcdir'), 'Include')
-                return os.path.normpath(incdir)
+            return _get_build_dir('Include', plat_specific)
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
@@ -117,6 +119,8 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
+        if python_build:
+            return _get_build_dir('Lib', plat_specific)
         libpython = os.path.join(prefix,
                                  "lib", "python" + get_python_version())
         if standard_lib:

From 8eb84ccb87fb80d1e95382003af64a8c7d2f83de Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 20 Sep 2010 10:29:54 +0000
Subject: [PATCH 3065/8469] Reverted changes which were inadvertently
 committed.

---
 sysconfig.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 3567db8349..48f3fe4d59 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -56,18 +56,6 @@ def get_python_version():
     """
     return sys.version[:3]
 
-def _get_build_dir(name, plat_specific):
-    # Assume the executable is in the build directory.  The
-    # pyconfig.h file should be in the same directory.  Since
-    # the build directory may not be the source directory, we
-    # must use "srcdir" from the makefile to find the "Include"
-    # directory.
-    base = os.path.dirname(os.path.abspath(sys.executable))
-    if plat_specific:
-        return base
-    else:
-        thedir = os.path.join(get_config_var('srcdir'), name)
-        return os.path.normpath(thedir)
 
 def get_python_inc(plat_specific=0, prefix=None):
     """Return the directory containing installed Python header files.
@@ -84,7 +72,17 @@ def get_python_inc(plat_specific=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
     if os.name == "posix":
         if python_build:
-            return _get_build_dir('Include', plat_specific)
+            # Assume the executable is in the build directory.  The
+            # pyconfig.h file should be in the same directory.  Since
+            # the build directory may not be the source directory, we
+            # must use "srcdir" from the makefile to find the "Include"
+            # directory.
+            base = os.path.dirname(os.path.abspath(sys.executable))
+            if plat_specific:
+                return base
+            else:
+                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                return os.path.normpath(incdir)
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
@@ -119,8 +117,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
-        if python_build:
-            return _get_build_dir('Lib', plat_specific)
         libpython = os.path.join(prefix,
                                  "lib", "python" + get_python_version())
         if standard_lib:

From a6f96e7709806a0211de70a0eb9089de77d000e2 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Tue, 21 Sep 2010 17:35:08 +0200
Subject: [PATCH 3066/8469] fixed typo - thanks to Ted Tibbets

--HG--
branch : distribute
extra : rebase_source : 87b145e4977333b08b77bdf857930f456c8b0e13
---
 CHANGES.txt                     | 6 ++++++
 setuptools/command/bdist_egg.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 342ad4bbcb..3d9f905cd3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.15
+------
+
+* Fixed typo in bdist_egg
+
 ------
 0.6.14
 ------
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 90e1f52568..3bb56fc35b 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -535,6 +535,6 @@ def visit(z, dirname, names):
         z.close()
     else:
         for dirname, dirs, files in os.walk(base_dir):
-            visit(None, dirname, file)
+            visit(None, dirname, files)
     return zip_filename
 #

From f63c10f0b8f07a02e58c75b2da2454808529442c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 3 Oct 2010 14:18:09 +0000
Subject: [PATCH 3067/8469] Fixed #8980: distutils.command.check was failing w/
 docutils installed

---
 command/check.py       |  2 +-
 tests/test_register.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/check.py b/command/check.py
index 12844cbf9f..2657c696e5 100644
--- a/command/check.py
+++ b/command/check.py
@@ -13,7 +13,7 @@
     from docutils.parsers.rst import Parser
     from docutils import frontend
     from docutils import nodes
-    from StringIO import StringIO
+    from io import StringIO
 
     class SilentReporter(Reporter):
 
diff --git a/tests/test_register.py b/tests/test_register.py
index c03ad10147..7d0ac9ee3a 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -224,24 +224,24 @@ def test_strict(self):
         cmd = self._get_cmd(metadata)
         cmd.ensure_finalized()
         cmd.strict = 1
-        inputs = RawInputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs.__call__
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
         # let's run the command
         try:
             cmd.run()
         finally:
-            del register_module.raw_input
+            del register_module.input
 
         # strict is not by default
         cmd = self._get_cmd()
         cmd.ensure_finalized()
-        inputs = RawInputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs.__call__
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
         # let's run the command
         try:
             cmd.run()
         finally:
-            del register_module.raw_input
+            del register_module.input
 
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated

From 3e5aeeda898da45a6d8f3f83397193500495183c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= <ziade.tarek@gmail.com>
Date: Sun, 3 Oct 2010 14:30:11 +0000
Subject: [PATCH 3068/8469] Merged revisions 85197 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85197 | tarek.ziade | 2010-10-03 16:18:09 +0200 (Sun, 03 Oct 2010) | 1 line

  Fixed #8980: distutils.command.check was failing w/ docutils installed
........
---
 command/check.py       |  2 +-
 tests/test_register.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/check.py b/command/check.py
index 12844cbf9f..2657c696e5 100644
--- a/command/check.py
+++ b/command/check.py
@@ -13,7 +13,7 @@
     from docutils.parsers.rst import Parser
     from docutils import frontend
     from docutils import nodes
-    from StringIO import StringIO
+    from io import StringIO
 
     class SilentReporter(Reporter):
 
diff --git a/tests/test_register.py b/tests/test_register.py
index c03ad10147..7d0ac9ee3a 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -224,24 +224,24 @@ def test_strict(self):
         cmd = self._get_cmd(metadata)
         cmd.ensure_finalized()
         cmd.strict = 1
-        inputs = RawInputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs.__call__
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
         # let's run the command
         try:
             cmd.run()
         finally:
-            del register_module.raw_input
+            del register_module.input
 
         # strict is not by default
         cmd = self._get_cmd()
         cmd.ensure_finalized()
-        inputs = RawInputs('1', 'tarek', 'y')
-        register_module.raw_input = inputs.__call__
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
         # let's run the command
         try:
             cmd.run()
         finally:
-            del register_module.raw_input
+            del register_module.input
 
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated

From aa258286d3d9a2651701148dca8781bd2a38adc1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 6 Oct 2010 08:26:09 +0000
Subject: [PATCH 3069/8469] Merged revisions
 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560
 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k

........
  r82805 | georg.brandl | 2010-07-11 11:42:10 +0200 (So, 11 Jul 2010) | 1 line

  #7935: cross-reference to ast.literal_eval() from eval() docs.
........
  r82806 | georg.brandl | 2010-07-11 12:22:44 +0200 (So, 11 Jul 2010) | 1 line

  #9223: link to Command class reference, and move Command interface docs nearer to class docs.
........
  r83523 | georg.brandl | 2010-08-02 14:06:18 +0200 (Mo, 02 Aug 2010) | 1 line

  #9209 and #7781: fix two crashes in pstats interactive browser.
........
  r83524 | georg.brandl | 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) | 1 line

  #9428: fix running scripts from profile/cProfile with their own name and the right namespace.  Same fix as for trace.py in #1690103.
........
  r83525 | georg.brandl | 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) | 1 line

  Get rid of spurious "threading" entries in trace output.
........
  r83526 | georg.brandl | 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) | 1 line

  Fix softspace relic.
........
  r83527 | georg.brandl | 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) | 1 line

  #3821: beginnings of a trace.py unittest.
........
  r83536 | georg.brandl | 2010-08-02 19:49:25 +0200 (Mo, 02 Aug 2010) | 1 line

  #8578: mention danger of not incref'ing weak referenced object.
........
  r83538 | georg.brandl | 2010-08-02 20:10:13 +0200 (Mo, 02 Aug 2010) | 1 line

  #6928: fix class docs w.r.t. new metaclasses.
........
  r83542 | georg.brandl | 2010-08-02 20:56:54 +0200 (Mo, 02 Aug 2010) | 1 line

  Move test_SimpleHTTPServer into test_httpservers.
........
  r83546 | georg.brandl | 2010-08-02 21:16:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #7973: Fix distutils options spelling.
........
  r83547 | georg.brandl | 2010-08-02 21:19:26 +0200 (Mo, 02 Aug 2010) | 1 line

  #7386: add example that shows that trailing path separators are stripped.
........
  r83548 | georg.brandl | 2010-08-02 21:23:34 +0200 (Mo, 02 Aug 2010) | 1 line

  #8172: how does one use a property?
........
  r83550 | georg.brandl | 2010-08-02 21:32:43 +0200 (Mo, 02 Aug 2010) | 1 line

  #9451: strengthen warning about __*__ special name usage.
........
  r83551 | georg.brandl | 2010-08-02 21:35:06 +0200 (Mo, 02 Aug 2010) | 1 line

  Remove XXX comment that was displayed.
........
  r83552 | georg.brandl | 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) | 1 line

  #9438: clarify that constant names also cannot be assigned as attributes.
........
  r83553 | georg.brandl | 2010-08-02 21:39:17 +0200 (Mo, 02 Aug 2010) | 1 line

  Remove redundant information.
........
  r83554 | georg.brandl | 2010-08-02 21:43:05 +0200 (Mo, 02 Aug 2010) | 1 line

  #7280: note about nasmw.exe.
........
  r83555 | georg.brandl | 2010-08-02 21:44:48 +0200 (Mo, 02 Aug 2010) | 1 line

  #8861: remove unused variable.
........
  r83558 | georg.brandl | 2010-08-02 22:05:19 +0200 (Mo, 02 Aug 2010) | 1 line

  #8648: document UTF-7 codec functions.
........
  r83560 | georg.brandl | 2010-08-02 22:16:18 +0200 (Mo, 02 Aug 2010) | 1 line

  #9087: update json docstrings -- unicode and long do not exist anymore.
........
---
 command/bdist_msi.py     | 2 +-
 command/bdist_wininst.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index c4be47b579..8a458d8536 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -148,7 +148,7 @@ def finalize_options(self):
             if not self.skip_build and self.distribution.has_ext_modules()\
                and self.target_version != short_version:
                 raise DistutilsOptionError(
-                      "target version can only be %s, or the '--skip_build'"
+                      "target version can only be %s, or the '--skip-build'"
                       " option must be specified" % (short_version,))
         else:
             self.versions = list(self.all_versions)
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d6d01c630d..3aa1dac7f3 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -89,7 +89,7 @@ def finalize_options(self):
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
                 raise DistutilsOptionError(
-                      "target version can only be %s, or the '--skip_build'" \
+                      "target version can only be %s, or the '--skip-build'" \
                       " option must be specified" % (short_version,))
             self.target_version = short_version
 

From 107ea98e7050ff3c6ea4aaf1a3b7f73aef69bfbf Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Oct 2010 09:37:12 +0000
Subject: [PATCH 3070/8469] Issue #9437: Fix building C extensions with
 non-default LDFLAGS.

---
 sysconfig.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 48f3fe4d59..8847e31743 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -359,6 +359,11 @@ def parse_makefile(fn, g=None):
 
     fp.close()
 
+    # strip spurious spaces
+    for k, v in done.items():
+        if isinstance(v, str):
+            done[k] = v.strip()
+
     # save the results in the global dictionary
     g.update(done)
     return g

From 8a775b192d5d53db9bf259d3526348be1462df34 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 10 Oct 2010 09:40:34 +0000
Subject: [PATCH 3071/8469] Bump to 3.2a3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 92ed8f4db2..9df61ab029 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2a2"
+__version__ = "3.2a3"
 #--end constants--

From 04895087400890db00af176be74899e4b51a5a84 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Oct 2010 09:54:59 +0000
Subject: [PATCH 3072/8469] Merged revisions 85353 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85353 | antoine.pitrou | 2010-10-10 11:37:12 +0200 (dim., 10 oct. 2010) | 3 lines

  Issue #9437: Fix building C extensions with non-default LDFLAGS.
........
---
 sysconfig.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 4d16b2674c..9888cd52cb 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -318,6 +318,11 @@ def parse_makefile(fn, g=None):
 
     fp.close()
 
+    # strip spurious spaces
+    for k, v in done.items():
+        if isinstance(v, str):
+            done[k] = v.strip()
+
     # save the results in the global dictionary
     g.update(done)
     return g

From f88b5e54e08c0a816c2a0154254959a0056f2184 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Sat, 16 Oct 2010 01:04:07 +0000
Subject: [PATCH 3073/8469] First (uncontroversial) part of issue 9807.

* Expose the build flags to Python as sys.abiflags
* Shared library libpythonX.Y<abiflags>.so
* python-config --abiflags
* Make two distutils tests that failed with --enable-shared (even before this
  patch) succeed.
* Fix a few small style issues.
---
 command/build_ext.py    |  6 +++---
 tests/test_build_ext.py | 26 +++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4e664642b8..cc0d414cf9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -754,9 +754,9 @@ def get_libraries(self, ext):
         else:
             from distutils import sysconfig
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):
-                template = "python%d.%d"
-                pythonlib = (template %
-                             (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
+                pythonlib = 'python{}.{}{}'.format(
+                    sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff,
+                    sys.abiflags)
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 52479d7d37..4351c0f8d5 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,17 +1,16 @@
 import sys
 import os
-import tempfile
 import shutil
 from io import StringIO
 
-from distutils.core import Extension, Distribution
+from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests.support import TempdirManager
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
-from distutils.errors import (UnknownFileError, DistutilsSetupError,
-                              CompileError)
+from distutils.errors import (
+    CompileError, DistutilsSetupError, UnknownFileError)
 
 import unittest
 from test import support
@@ -42,6 +41,20 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
+    def _fixup_command(self, cmd):
+        # When Python was build with --enable-shared, -L. is not good enough
+        # to find the libpython<blah>.so.  This is because regrtest runs it
+        # under a tempdir, not in the top level where the .so lives.  By the
+        # time we've gotten here, Python's already been chdir'd to the
+        # tempdir.
+        #
+        # To further add to the fun, we can't just add library_dirs to the
+        # Extension() instance because that doesn't get plumbed through to the
+        # final compiler command.
+        if not sys.platform.startswith('win'):
+            library_dir = sysconfig.get_config_var('srcdir')
+            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -49,6 +62,7 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         if os.name == "nt":
             # On Windows, we must build a debug version iff running
             # a debug build of Python
@@ -235,7 +249,8 @@ def test_check_extensions_list(self):
         cmd.finalize_options()
 
         #'extensions' option must be a list of Extension instances
-        self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, 'foo')
+        self.assertRaises(DistutilsSetupError,
+                          cmd.check_extensions_list, 'foo')
 
         # each element of 'ext_modules' option must be an
         # Extension instance or 2-tuple
@@ -302,6 +317,7 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 

From b6d0fe5087a6648ec9541670386eccf38d53018e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 21 Oct 2010 18:46:36 +0000
Subject: [PATCH 3074/8469] Backport fix for #10126

---
 tests/test_build_ext.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b7cdc20aa4..04ebc5b1ef 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -42,6 +42,20 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
+    def _fixup_command(self, cmd):
+        # When Python was build with --enable-shared, -L. is not good enough
+        # to find the libpython<blah>.so.  This is because regrtest runs it
+        # under a tempdir, not in the top level where the .so lives.  By the
+        # time we've gotten here, Python's already been chdir'd to the
+        # tempdir.
+        #
+        # To further add to the fun, we can't just add library_dirs to the
+        # Extension() instance because that doesn't get plumbed through to the
+        # final compiler command.
+        if not sys.platform.startswith('win'):
+            library_dir = sysconfig.get_config_var('srcdir')
+            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -49,6 +63,7 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         if os.name == "nt":
             # On Windows, we must build a debug version iff running
             # a debug build of Python

From d48f22926fe4e190cb1f490661eab6bf2cc61a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 21 Oct 2010 18:48:59 +0000
Subject: [PATCH 3075/8469] Backport fix for #10126

---
 tests/test_build_ext.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index beb6d96c8b..154771f2c7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -49,6 +49,20 @@ def tearDown(self):
                                     sys.platform == 'cygwin')
         super(BuildExtTestCase, self).tearDown()
 
+    def _fixup_command(self, cmd):
+        # When Python was build with --enable-shared, -L. is not good enough
+        # to find the libpython<blah>.so.  This is because regrtest runs it
+        # under a tempdir, not in the top level where the .so lives.  By the
+        # time we've gotten here, Python's already been chdir'd to the
+        # tempdir.
+        #
+        # To further add to the fun, we can't just add library_dirs to the
+        # Extension() instance because that doesn't get plumbed through to the
+        # final compiler command.
+        if not sys.platform.startswith('win'):
+            library_dir = sysconfig.get_config_var('srcdir')
+            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+
     @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
                      'xxmodule.c not found')
     def test_build_ext(self):
@@ -58,6 +72,7 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         if os.name == "nt":
             # On Windows, we must build a debug version iff running
             # a debug build of Python

From 7404daed7bf476fd57a47aac41c64ed48cc78d45 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 21 Oct 2010 22:13:29 +0000
Subject: [PATCH 3076/8469] Fix issue 10126 for Python 2.7 by using $RUNSHARED
 to find the directory to the shared library.  test_distutils now passes when
 Python was built with --enable-shared.

---
 tests/test_build_ext.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 154771f2c7..e04593065d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -60,8 +60,12 @@ def _fixup_command(self, cmd):
         # Extension() instance because that doesn't get plumbed through to the
         # final compiler command.
         if not sys.platform.startswith('win'):
-            library_dir = sysconfig.get_config_var('srcdir')
-            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+            runshared = sysconfig.get_config_var('RUNSHARED')
+            if runshared is None:
+                cmd.library_dirs = ['.']
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)
 
     @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
                      'xxmodule.c not found')
@@ -265,6 +269,7 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 

From 1415d2f24237092366c384aae24fbb6d17e67abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 21 Oct 2010 23:02:07 +0000
Subject: [PATCH 3077/8469] Apply fix from r85784 on py3k too.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes bug #10126 for Python 3.2 by using $RUNSHARED to find the
directory to the shared library.  test_distutils now passes when
Python was built with --enable-shared (Barry didn’t have the error
but I did).
---
 tests/test_build_ext.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4351c0f8d5..6858e5a4b2 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -52,8 +52,12 @@ def _fixup_command(self, cmd):
         # Extension() instance because that doesn't get plumbed through to the
         # final compiler command.
         if not sys.platform.startswith('win'):
-            library_dir = sysconfig.get_config_var('srcdir')
-            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+            runshared = sysconfig.get_config_var('RUNSHARED')
+            if runshared is None:
+                cmd.library_dirs = ['.']
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)
 
     def test_build_ext(self):
         global ALREADY_TESTED

From d8c874020da7deef2a07f22929ad75ce5cd74021 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 22 Oct 2010 15:31:44 +0000
Subject: [PATCH 3078/8469] Only hack cmd.library_dirs when running under
 Py_ENABLE_SHARED.  Tested both with and without --enable-shared on Ubuntu
 10.10.  Hopefully this finally solves bug 10126.  Will check 3.1 and py3k
 next.

---
 tests/test_build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e04593065d..d14c5f6b10 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -59,7 +59,8 @@ def _fixup_command(self, cmd):
         # To further add to the fun, we can't just add library_dirs to the
         # Extension() instance because that doesn't get plumbed through to the
         # final compiler command.
-        if not sys.platform.startswith('win'):
+        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
+            not sys.platform.startswith('win')):
             runshared = sysconfig.get_config_var('RUNSHARED')
             if runshared is None:
                 cmd.library_dirs = ['.']

From d6acf0666e6011bcf96c64e07c5f95574c1e1fbd Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 22 Oct 2010 17:17:51 +0000
Subject: [PATCH 3079/8469] Only hack cmd.library_dirs when running under
 Py_ENABLE_SHARED.  Tested both with and without --enable-shared on Ubuntu
 10.10.  Hopefully this finally solves bug 10126.  Will check 3.1 next.

---
 tests/test_build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6858e5a4b2..18e0011743 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -51,7 +51,8 @@ def _fixup_command(self, cmd):
         # To further add to the fun, we can't just add library_dirs to the
         # Extension() instance because that doesn't get plumbed through to the
         # final compiler command.
-        if not sys.platform.startswith('win'):
+        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
+            not sys.platform.startswith('win')):
             runshared = sysconfig.get_config_var('RUNSHARED')
             if runshared is None:
                 cmd.library_dirs = ['.']

From 1208ea17d6e97abffe76f3994d8575be5db3582f Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 22 Oct 2010 18:34:13 +0000
Subject: [PATCH 3080/8469] Should fix remaining 3.1 buildbot failure

---
 tests/test_build_ext.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 04ebc5b1ef..226f7bb1fe 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -52,9 +52,14 @@ def _fixup_command(self, cmd):
         # To further add to the fun, we can't just add library_dirs to the
         # Extension() instance because that doesn't get plumbed through to the
         # final compiler command.
-        if not sys.platform.startswith('win'):
-            library_dir = sysconfig.get_config_var('srcdir')
-            cmd.library_dirs = [('.' if library_dir is None else library_dir)]
+        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
+            not sys.platform.startswith('win')):
+            runshared = sysconfig.get_config_var('RUNSHARED')
+            if runshared is None:
+                cmd.library_dirs = ['.']
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -317,6 +322,7 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
+        self._fixup_command(cmd)
         cmd.ensure_finalized()
         self.assertEquals(len(cmd.get_outputs()), 1)
 

From c4405aad904aac1948e1798945118759ef677af6 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 23 Oct 2010 17:02:31 +0000
Subject: [PATCH 3081/8469] Issue #6011: sysconfig and distutils.sysconfig use
 the surrogateescape error handler to parse the Makefile file. Avoid a
 UnicodeDecodeError if the source code directory name contains a non-ASCII
 character and the locale encoding is ASCII.

---
 sysconfig.py | 2 +-
 text_file.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8847e31743..6b5daa5190 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -271,7 +271,7 @@ def parse_makefile(fn, g=None):
     used instead of a new dictionary.
     """
     from distutils.text_file import TextFile
-    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1)
+    fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1, errors="surrogateescape")
 
     if g is None:
         g = {}
diff --git a/text_file.py b/text_file.py
index 97459fbf73..454725c626 100644
--- a/text_file.py
+++ b/text_file.py
@@ -58,6 +58,8 @@ class TextFile:
          collapse_join [default: false]
            strip leading whitespace from lines that are joined to their
            predecessor; only matters if (join_lines and not lstrip_ws)
+         errors [default: 'strict']
+           error handler used to decode the file content
 
        Note that since 'rstrip_ws' can strip the trailing newline, the
        semantics of 'readline()' must differ from those of the builtin file
@@ -72,6 +74,7 @@ class TextFile:
                         'rstrip_ws':      1,
                         'join_lines':     0,
                         'collapse_join':  0,
+                        'errors':         'strict',
                       }
 
     def __init__(self, filename=None, file=None, **options):
@@ -111,7 +114,7 @@ def open(self, filename):
         """Open a new file named 'filename'.  This overrides both the
            'filename' and 'file' arguments to the constructor."""
         self.filename = filename
-        self.file = io.open(self.filename, 'r')
+        self.file = io.open(self.filename, 'r', errors=self.errors)
         self.current_line = 0
 
     def close(self):

From 91b89f544e774b04a09af9d1849334f4f7dc20b5 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 29 Oct 2010 22:36:08 +0000
Subject: [PATCH 3082/8469] Have distutils.sysconfig close a file to remove
 ResourceWarnings coming up during the build from setup.py.

---
 sysconfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 6b5daa5190..8b55f217cd 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -413,7 +413,8 @@ def _init_posix():
     # load the installed pyconfig.h:
     try:
         filename = get_config_h_filename()
-        parse_config_h(io.open(filename), g)
+        with open(filename) as file:
+            parse_config_h(file, g)
     except IOError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):

From 3b9b511708f987254fdcfdc5fc0f020d7a0ab923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 5 Nov 2010 23:51:56 +0000
Subject: [PATCH 3083/8469] Always close files in distutils code and tests
 (#10252).

---
 ccompiler.py                |  10 ++-
 command/bdist_wininst.py    |   6 +-
 command/upload.py           |   6 +-
 core.py                     |   6 +-
 cygwinccompiler.py          |   5 +-
 dist.py                     |   8 +-
 emxccompiler.py             |  12 ++-
 extension.py                | 155 ++++++++++++++++++------------------
 file_util.py                |   8 +-
 tests/test_build_py.py      |  12 ++-
 tests/test_build_scripts.py |   6 +-
 tests/test_config.py        |   8 +-
 tests/test_core.py          |   6 +-
 tests/test_dir_util.py      |   6 +-
 tests/test_dist.py          |  40 +++++-----
 tests/test_file_util.py     |   6 +-
 tests/test_install.py       |   5 +-
 tests/test_msvc9compiler.py |  14 ++--
 tests/test_register.py      |   8 +-
 tests/test_sdist.py         |   8 +-
 tests/test_sysconfig.py     |  16 ++--
 tests/test_text_file.py     |  52 ++++++++----
 util.py                     |  16 ++--
 23 files changed, 253 insertions(+), 166 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 34c77a37a3..291c008f20 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -779,14 +779,16 @@ def has_function(self, funcname, includes=None, include_dirs=None,
             library_dirs = []
         fd, fname = tempfile.mkstemp(".c", funcname, text=True)
         f = os.fdopen(fd, "w")
-        for incl in includes:
-            f.write("""#include "%s"\n""" % incl)
-        f.write("""\
+        try:
+            for incl in includes:
+                f.write("""#include "%s"\n""" % incl)
+            f.write("""\
 main (int argc, char **argv) {
     %s();
 }
 """ % funcname)
-        f.close()
+        finally:
+            f.close()
         try:
             objects = self.compile([fname], include_dirs=include_dirs)
         except CompileError:
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3aa1dac7f3..b2e2fc6dc8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -340,4 +340,8 @@ def get_exe_bytes(self):
             sfix = ''
 
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
-        return open(filename, "rb").read()
+        f = open(filename, "rb")
+        try:
+            return f.read()
+        finally:
+            f.close()
diff --git a/command/upload.py b/command/upload.py
index 99e03d747c..4926aa3e15 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -76,7 +76,11 @@ def upload_file(self, command, pyversion, filename):
 
         # Fill in the data - send all the meta-data in case we need to
         # register a new release
-        content = open(filename,'rb').read()
+        f = open(filename,'rb')
+        try:
+            content = f.read()
+        finally:
+            f.close()
         meta = self.distribution.metadata
         data = {
             # action
diff --git a/core.py b/core.py
index 6e4892039e..fd2a43d7d2 100644
--- a/core.py
+++ b/core.py
@@ -215,7 +215,11 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            exec(open(script_name).read(), g, l)
+            f = open(script_name)
+            try:
+                exec(f.read(), g, l)
+            finally:
+                f.close()
         finally:
             sys.argv = save_argv
             _setup_stop_after = None
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 8504371810..95fa3ed3c8 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -350,11 +350,14 @@ def check_config_h():
     # let's see if __GNUC__ is mentioned in python.h
     fn = sysconfig.get_config_h_filename()
     try:
-        with open(fn) as config_h:
+        config_h = open(fn)
+        try:
             if "__GNUC__" in config_h.read():
                 return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn
             else:
                 return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
+        finally:
+            config_h.close()
     except IOError as exc:
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
diff --git a/dist.py b/dist.py
index 1c1ea477db..01f1f1cfc0 100644
--- a/dist.py
+++ b/dist.py
@@ -1012,9 +1012,11 @@ def __init__ (self):
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-        pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
-        self.write_pkg_file(pkg_info)
-        pkg_info.close()
+        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
+        try:
+            self.write_pkg_file(pkg_info)
+        finally:
+            pkg_info.close()
 
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
diff --git a/emxccompiler.py b/emxccompiler.py
index 62a4c5b4e8..16dce53524 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -270,8 +270,10 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
-        s = f.read()
-        f.close()
+        try:
+            s = f.read()
+        finally:
+            f.close()
 
     except IOError as exc:
         # if we can't read this file, we cannot say it is wrong
@@ -298,8 +300,10 @@ def get_versions():
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
+        try:
+            out_string = out.read()
+        finally:
+            out.close()
         result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
         if result:
             gcc_version = StrictVersion(result.group(1))
diff --git a/extension.py b/extension.py
index 5c07bdae82..2d1c36bd5c 100644
--- a/extension.py
+++ b/extension.py
@@ -149,84 +149,87 @@ def read_setup_file(filename):
     file = TextFile(filename,
                     strip_comments=1, skip_blanks=1, join_lines=1,
                     lstrip_ws=1, rstrip_ws=1)
-    extensions = []
-
-    while True:
-        line = file.readline()
-        if line is None:                # eof
-            break
-        if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
-            continue
-
-        if line[0] == line[-1] == "*":
-            file.warn("'%s' lines not handled yet" % line)
-            continue
-
-        line = expand_makefile_vars(line, vars)
-        words = split_quoted(line)
-
-        # NB. this parses a slightly different syntax than the old
-        # makesetup script: here, there must be exactly one extension per
-        # line, and it must be the first word of the line.  I have no idea
-        # why the old syntax supported multiple extensions per line, as
-        # they all wind up being the same.
-
-        module = words[0]
-        ext = Extension(module, [])
-        append_next_word = None
-
-        for word in words[1:]:
-            if append_next_word is not None:
-                append_next_word.append(word)
-                append_next_word = None
+    try:
+        extensions = []
+
+        while True:
+            line = file.readline()
+            if line is None:                # eof
+                break
+            if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
                 continue
 
-            suffix = os.path.splitext(word)[1]
-            switch = word[0:2] ; value = word[2:]
-
-            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
-                # hmm, should we do something about C vs. C++ sources?
-                # or leave it up to the CCompiler implementation to
-                # worry about?
-                ext.sources.append(word)
-            elif switch == "-I":
-                ext.include_dirs.append(value)
-            elif switch == "-D":
-                equals = value.find("=")
-                if equals == -1:        # bare "-DFOO" -- no value
-                    ext.define_macros.append((value, None))
-                else:                   # "-DFOO=blah"
-                    ext.define_macros.append((value[0:equals],
-                                              value[equals+2:]))
-            elif switch == "-U":
-                ext.undef_macros.append(value)
-            elif switch == "-C":        # only here 'cause makesetup has it!
-                ext.extra_compile_args.append(word)
-            elif switch == "-l":
-                ext.libraries.append(value)
-            elif switch == "-L":
-                ext.library_dirs.append(value)
-            elif switch == "-R":
-                ext.runtime_library_dirs.append(value)
-            elif word == "-rpath":
-                append_next_word = ext.runtime_library_dirs
-            elif word == "-Xlinker":
-                append_next_word = ext.extra_link_args
-            elif word == "-Xcompiler":
-                append_next_word = ext.extra_compile_args
-            elif switch == "-u":
-                ext.extra_link_args.append(word)
-                if not value:
+            if line[0] == line[-1] == "*":
+                file.warn("'%s' lines not handled yet" % line)
+                continue
+
+            line = expand_makefile_vars(line, vars)
+            words = split_quoted(line)
+
+            # NB. this parses a slightly different syntax than the old
+            # makesetup script: here, there must be exactly one extension per
+            # line, and it must be the first word of the line.  I have no idea
+            # why the old syntax supported multiple extensions per line, as
+            # they all wind up being the same.
+
+            module = words[0]
+            ext = Extension(module, [])
+            append_next_word = None
+
+            for word in words[1:]:
+                if append_next_word is not None:
+                    append_next_word.append(word)
+                    append_next_word = None
+                    continue
+
+                suffix = os.path.splitext(word)[1]
+                switch = word[0:2] ; value = word[2:]
+
+                if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
+                    # hmm, should we do something about C vs. C++ sources?
+                    # or leave it up to the CCompiler implementation to
+                    # worry about?
+                    ext.sources.append(word)
+                elif switch == "-I":
+                    ext.include_dirs.append(value)
+                elif switch == "-D":
+                    equals = value.find("=")
+                    if equals == -1:        # bare "-DFOO" -- no value
+                        ext.define_macros.append((value, None))
+                    else:                   # "-DFOO=blah"
+                        ext.define_macros.append((value[0:equals],
+                                                  value[equals+2:]))
+                elif switch == "-U":
+                    ext.undef_macros.append(value)
+                elif switch == "-C":        # only here 'cause makesetup has it!
+                    ext.extra_compile_args.append(word)
+                elif switch == "-l":
+                    ext.libraries.append(value)
+                elif switch == "-L":
+                    ext.library_dirs.append(value)
+                elif switch == "-R":
+                    ext.runtime_library_dirs.append(value)
+                elif word == "-rpath":
+                    append_next_word = ext.runtime_library_dirs
+                elif word == "-Xlinker":
                     append_next_word = ext.extra_link_args
-            elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
-                # NB. a really faithful emulation of makesetup would
-                # append a .o file to extra_objects only if it
-                # had a slash in it; otherwise, it would s/.o/.c/
-                # and append it to sources.  Hmmmm.
-                ext.extra_objects.append(word)
-            else:
-                file.warn("unrecognized argument '%s'" % word)
-
-        extensions.append(ext)
+                elif word == "-Xcompiler":
+                    append_next_word = ext.extra_compile_args
+                elif switch == "-u":
+                    ext.extra_link_args.append(word)
+                    if not value:
+                        append_next_word = ext.extra_link_args
+                elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
+                    # NB. a really faithful emulation of makesetup would
+                    # append a .o file to extra_objects only if it
+                    # had a slash in it; otherwise, it would s/.o/.c/
+                    # and append it to sources.  Hmmmm.
+                    ext.extra_objects.append(word)
+                else:
+                    file.warn("unrecognized argument '%s'" % word)
+
+            extensions.append(ext)
+    finally:
+        file.close()
 
     return extensions
diff --git a/file_util.py b/file_util.py
index 65aa7e0fdd..c36e7128d0 100644
--- a/file_util.py
+++ b/file_util.py
@@ -234,6 +234,8 @@ def write_file (filename, contents):
     sequence of strings without line terminators) to it.
     """
     f = open(filename, "w")
-    for line in contents:
-        f.write(line + "\n")
-    f.close()
+    try:
+        for line in contents:
+            f.write(line + "\n")
+    finally:
+        f.close()
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 3e45f6e89e..8a69aaa0d6 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -19,11 +19,15 @@ class BuildPyTestCase(support.TempdirManager,
     def test_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
-        f.write("# Pretend this is a package.")
-        f.close()
+        try:
+            f.write("# Pretend this is a package.")
+        finally:
+            f.close()
         f = open(os.path.join(sources, "README.txt"), "w")
-        f.write("Info about this package")
-        f.close()
+        try:
+            f.write("Info about this package")
+        finally:
+            f.close()
 
         destination = self.mkdtemp()
 
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b1d2d079bd..85b0400460 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -71,8 +71,10 @@ def write_sample_scripts(self, dir):
 
     def write_script(self, dir, name, text):
         f = open(os.path.join(dir, name), "w")
-        f.write(text)
-        f.close()
+        try:
+            f.write(text)
+        finally:
+            f.close()
 
     def test_version_int(self):
         source = self.mkdtemp()
diff --git a/tests/test_config.py b/tests/test_config.py
index 71c63678f8..6a45a328b6 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -105,8 +105,12 @@ def test_server_empty_registration(self):
         self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
-        content = open(rc).read()
-        self.assertEquals(content, WANTED)
+        f = open(rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED)
+        finally:
+            f.close()
 
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
diff --git a/tests/test_core.py b/tests/test_core.py
index b478fa6291..e937b45a6b 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -52,7 +52,11 @@ def cleanup_testfn(self):
             shutil.rmtree(path)
 
     def write_setup(self, text, path=test.support.TESTFN):
-        open(path, "w").write(text)
+        f = open(path, "w")
+        try:
+            f.write(text)
+        finally:
+            f.close()
         return path
 
     def test_run_setup_provides_file(self):
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index a1647fbcf5..aa9f9ebb9f 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -88,8 +88,10 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
         f = open(a_file, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 007803e12d..ee8e8d4dae 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -79,29 +79,29 @@ def test_command_packages_cmdline(self):
 
     def test_command_packages_configfile(self):
         sys.argv.append("build")
+        self.addCleanup(os.unlink, TESTFN)
         f = open(TESTFN, "w")
         try:
             print("[global]", file=f)
             print("command_packages = foo.bar, splat", file=f)
+        finally:
             f.close()
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "foo.bar", "splat"])
-
-            # ensure command line overrides config:
-            sys.argv[1:] = ["--command-packages", "spork", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "spork"])
-
-            # Setting --command-packages to '' should cause the default to
-            # be used even if a config file specified something else:
-            sys.argv[1:] = ["--command-packages", "", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
-        finally:
-            os.unlink(TESTFN)
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "foo.bar", "splat"])
+
+        # ensure command line overrides config:
+        sys.argv[1:] = ["--command-packages", "spork", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "spork"])
+
+        # Setting --command-packages to '' should cause the default to
+        # be used even if a config file specified something else:
+        sys.argv[1:] = ["--command-packages", "", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
@@ -260,8 +260,10 @@ def test_custom_pydistutils(self):
         temp_dir = self.mkdtemp()
         user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
-        f.write('.')
-        f.close()
+        try:
+            f.write('.')
+        finally:
+            f.close()
 
         try:
             dist = Distribution()
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index fac4a5d1a9..74618b523a 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -31,8 +31,10 @@ def tearDown(self):
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
diff --git a/tests/test_install.py b/tests/test_install.py
index 76fa02acda..bc407cf9ab 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -182,8 +182,11 @@ def test_record(self):
 
         # let's check the RECORD file was created with one
         # line (the egg info file)
-        with open(cmd.record) as f:
+        f = open(cmd.record)
+        try:
             self.assertEquals(len(f.readlines()), 1)
+        finally:
+            f.close()
 
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index f1da843fab..40cb8be6d1 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -113,17 +113,21 @@ def test_remove_visual_c_ref(self):
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
-        f.write(_MANIFEST)
-        f.close()
+        try:
+            f.write(_MANIFEST)
+        finally:
+            f.close()
 
         compiler = MSVCCompiler()
         compiler._remove_visual_c_ref(manifest)
 
         # see what we got
         f = open(manifest)
-        # removing trailing spaces
-        content = '\n'.join([line.rstrip() for line in f.readlines()])
-        f.close()
+        try:
+            # removing trailing spaces
+            content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
+            f.close()
 
         # makes sure the manifest was properly cleaned
         self.assertEquals(content, _CLEANED_MANIFEST)
diff --git a/tests/test_register.py b/tests/test_register.py
index 7d0ac9ee3a..3b80b6dc05 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -118,8 +118,12 @@ def test_create_pypirc(self):
         self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
-        content = open(self.rc).read()
-        self.assertEquals(content, WANTED_PYPIRC)
+        f = open(self.rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED_PYPIRC)
+        finally:
+            f.close()
 
         # now let's make sure the .pypirc file generated
         # really works : we shouldn't be asked anything
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 209aa59baf..ad527c7dd6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -215,8 +215,12 @@ def test_add_defaults(self):
         self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
-        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        f = open(join(self.tmp_dir, 'MANIFEST'))
+        try:
+            manifest = f.read()
+            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        finally:
+            f.close()
 
     def test_metadata_check_option(self):
         # testing the `medata-check` option
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 0167e0f1a3..215dc82df0 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -75,9 +75,11 @@ def set_executables(self, **kw):
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
                               'OTHER': 'foo'})
@@ -85,9 +87,11 @@ def test_parse_makefile_base(self):
     def test_parse_makefile_literal_dollar(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
                               'OTHER': 'foo'})
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 00f083a130..3093097dba 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -58,28 +58,46 @@ def test_input(count, description, file, expected_result):
         finally:
             out_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (1, "no processing", in_file, result1)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(1, "no processing", in_file, result1)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (2, "strip comments", in_file, result2)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(2, "strip comments", in_file, result2)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (3, "strip blanks", in_file, result3)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(3, "strip blanks", in_file, result3)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename)
-        test_input (4, "default processing", in_file, result4)
+        in_file = TextFile(filename)
+        try:
+            test_input(4, "default processing", in_file, result4)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1)
-        test_input (5, "join lines without collapsing", in_file, result5)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1)
+        try:
+            test_input(5, "join lines without collapsing", in_file, result5)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1, collapse_join=1)
-        test_input (6, "join lines with collapsing", in_file, result6)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1, collapse_join=1)
+        try:
+            test_input(6, "join lines with collapsing", in_file, result6)
+        finally:
+            in_file.close()
 
 def test_suite():
     return unittest.makeSuite(TextFileTestCase)
diff --git a/util.py b/util.py
index 8175434586..3081245b62 100644
--- a/util.py
+++ b/util.py
@@ -115,13 +115,15 @@ def get_platform ():
                 # behaviour.
                 pass
             else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
-                if m is not None:
-                    macrelease = '.'.join(m.group(1).split('.')[:2])
-                # else: fall back to the default behaviour
+                try:
+                    m = re.search(
+                            r'<key>ProductUserVisibleVersion</key>\s*' +
+                            r'<string>(.*?)</string>', f.read())
+                    if m is not None:
+                        macrelease = '.'.join(m.group(1).split('.')[:2])
+                    # else: fall back to the default behaviour
+                finally:
+                    f.close()
 
         if not macver:
             macver = macrelease

From 41c052c438ce9e6f236c7015a228c3b9b1cdda2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 5 Nov 2010 23:59:32 +0000
Subject: [PATCH 3084/8469] Of course, I forgot one file in r86223.

---
 tests/test_install_scripts.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index b7eb625ac5..08360d297b 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -42,8 +42,10 @@ def test_installation(self):
         def write_script(name, text):
             expected.append(name)
             f = open(os.path.join(source, name), "w")
-            f.write(text)
-            f.close()
+            try:
+                f.write(text)
+            finally:
+                f.close()
 
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"
                                     "# bogus script w/ Python sh-bang\n"

From 522ffa25d2d5d28511e8e104ff7497a36705365e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 02:10:32 +0000
Subject: [PATCH 3085/8469] Also close file descriptors from os.popen and
 subprocess.Popen

---
 command/bdist_rpm.py | 36 ++++++++++++++++++++----------------
 msvc9compiler.py     | 10 ++++++----
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 452f9502ad..e2ae877d9a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -343,22 +343,26 @@ def run(self):
             src_rpm, non_src_rpm, spec_path)
 
         out = os.popen(q_cmd)
-        binary_rpms = []
-        source_rpm = None
-        while True:
-            line = out.readline()
-            if not line:
-                break
-            l = line.strip().split()
-            assert(len(l) == 2)
-            binary_rpms.append(l[1])
-            # The source rpm is named after the first entry in the spec file
-            if source_rpm is None:
-                source_rpm = l[0]
-
-        status = out.close()
-        if status:
-            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+        try:
+            binary_rpms = []
+            source_rpm = None
+            while True:
+                line = out.readline()
+                if not line:
+                    break
+                l = line.strip().split()
+                assert(len(l) == 2)
+                binary_rpms.append(l[1])
+                # The source rpm is named after the first entry in the spec file
+                if source_rpm is None:
+                    source_rpm = l[0]
+
+            status = out.close()
+            if status:
+                raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
+        finally:
+            out.close()
 
         self.spawn(rpm_cmd)
 
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 761b9ca236..6d7825df86 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -263,10 +263,12 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
-
-    stdout, stderr = popen.communicate()
-    if popen.wait() != 0:
-        raise DistutilsPlatformError(stderr.decode("mbcs"))
+    try:
+        stdout, stderr = popen.communicate()
+        if popen.wait() != 0:
+            raise DistutilsPlatformError(stderr.decode("mbcs"))
+    finally:
+        popen.close()
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):

From 74c3638728339edf3a8a99dbd61875e9ce624e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 02:44:43 +0000
Subject: [PATCH 3086/8469] Make sure each test can be run standalone (./python
 Lib/distutils/tests/x.py)

---
 tests/__init__.py              | 5 +++--
 tests/test_archive_util.py     | 4 ++--
 tests/test_bdist.py            | 3 ++-
 tests/test_bdist_dumb.py       | 3 ++-
 tests/test_bdist_msi.py        | 2 +-
 tests/test_bdist_rpm.py        | 3 ++-
 tests/test_bdist_wininst.py    | 3 ++-
 tests/test_build.py            | 3 ++-
 tests/test_build_clib.py       | 4 +++-
 tests/test_build_ext.py        | 1 +
 tests/test_build_py.py         | 3 ++-
 tests/test_build_scripts.py    | 3 ++-
 tests/test_check.py            | 3 ++-
 tests/test_clean.py            | 3 ++-
 tests/test_cmd.py              | 6 +++---
 tests/test_config.py           | 3 ++-
 tests/test_config_cmd.py       | 3 ++-
 tests/test_core.py             | 4 ++--
 tests/test_cygwinccompiler.py  | 3 ++-
 tests/test_dep_util.py         | 3 ++-
 tests/test_dir_util.py         | 3 ++-
 tests/test_dist.py             | 4 ++--
 tests/test_extension.py        | 4 ++--
 tests/test_file_util.py        | 3 ++-
 tests/test_filelist.py         | 4 ++--
 tests/test_install.py          | 4 ++--
 tests/test_install_data.py     | 3 ++-
 tests/test_install_headers.py  | 3 ++-
 tests/test_install_lib.py      | 3 ++-
 tests/test_install_scripts.py  | 3 ++-
 tests/test_log.py              | 3 ++-
 tests/test_msvc9compiler.py    | 3 ++-
 tests/test_register.py         | 4 ++--
 tests/test_sdist.py            | 8 +++-----
 tests/test_spawn.py            | 4 ++--
 tests/test_text_file.py        | 3 ++-
 tests/test_unixccompiler.py    | 3 ++-
 tests/test_upload.py           | 5 ++---
 tests/test_util.py             | 3 ++-
 tests/test_version.py          | 3 ++-
 tests/test_versionpredicate.py | 4 ++++
 41 files changed, 86 insertions(+), 56 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 7bdb912463..1b939cbd5d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,9 +15,10 @@
 import os
 import sys
 import unittest
+from test.support import run_unittest
 
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or os.curdir
 
 
 def test_suite():
@@ -32,4 +33,4 @@ def test_suite():
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index c6e08cbc2b..9e6264aa89 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -12,7 +12,7 @@
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 try:
     import zipfile
@@ -211,4 +211,4 @@ def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index f2849a9756..bf56e842b7 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -4,6 +4,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
@@ -40,4 +41,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 5e76809f23..7d9d0aa834 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -3,6 +3,7 @@
 import unittest
 import sys
 import os
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
@@ -77,4 +78,4 @@ def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 2b2d8542ee..9308c79d91 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -11,7 +11,7 @@ class BDistMSITestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
 
-    def test_minial(self):
+    def test_minimal(self):
         # minimal test XXX need more tests
         from distutils.command.bdist_msi import bdist_msi
         pkg_pth, dist = self.create_dist()
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2aa257f7e6..804fb1355f 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -5,6 +5,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
@@ -122,4 +123,4 @@ def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 9b1ba6d107..f9e8f89e21 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,5 +1,6 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -27,4 +28,4 @@ def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_build.py b/tests/test_build.py
index 2418e1656d..9f0e0ad23c 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.support import run_unittest
 
 from distutils.command.build import build
 from distutils.tests import support
@@ -51,4 +52,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 536cd67319..e59b8f9a19 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -3,6 +3,8 @@
 import os
 import sys
 
+from test.support import run_unittest
+
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
@@ -141,4 +143,4 @@ def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 18e0011743..46ac9aafc3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -14,6 +14,7 @@
 
 import unittest
 from test import support
+from test.support import run_unittest
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 8a69aaa0d6..da3232cea8 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -10,6 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -114,4 +115,4 @@ def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 85b0400460..e3326b8517 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -8,6 +8,7 @@
 from distutils import sysconfig
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildScriptsTestCase(support.TempdirManager,
@@ -108,4 +109,4 @@ def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_check.py b/tests/test_check.py
index 372bae367b..6ad2fe3920 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,5 +1,6 @@
 """Tests for distutils.command.check."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.check import check, HAS_DOCUTILS
 from distutils.tests import support
@@ -95,4 +96,4 @@ def test_suite():
     return unittest.makeSuite(CheckTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_clean.py b/tests/test_clean.py
index dbc4ee2a18..649855f7ab 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -6,6 +6,7 @@
 
 from distutils.command.clean import clean
 from distutils.tests import support
+from test.support import run_unittest
 
 class cleanTestCase(support.TempdirManager,
                     support.LoggingSilencer,
@@ -47,4 +48,4 @@ def test_suite():
     return unittest.makeSuite(cleanTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 55ae421d46..969f82ba0f 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -99,7 +99,7 @@ def test_ensure_filename(self):
 
     def test_ensure_dirname(self):
         cmd = self.cmd
-        cmd.option1 = os.path.dirname(__file__)
+        cmd.option1 = os.path.dirname(__file__) or os.curdir
         cmd.ensure_dirname('option1')
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
@@ -124,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_config.py b/tests/test_config.py
index 6a45a328b6..05a35da903 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -10,6 +10,7 @@
 from distutils.log import WARN
 
 from distutils.tests import support
+from test.support import run_unittest
 
 PYPIRC = """\
 [distutils]
@@ -116,4 +117,4 @@ def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index ef2e7bc317..c224a5c36d 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.support import run_unittest
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -86,4 +87,4 @@ def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_core.py b/tests/test_core.py
index e937b45a6b..47fae245e7 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,7 +6,7 @@
 import shutil
 import sys
 import test.support
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
 
@@ -105,4 +105,4 @@ def test_suite():
     return unittest.makeSuite(CoreTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index a57694d48e..e57bab269a 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -4,6 +4,7 @@
 import os
 from io import BytesIO
 import subprocess
+from test.support import run_unittest
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
@@ -151,4 +152,4 @@ def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index d81d9143b4..390ed9b602 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -6,6 +6,7 @@
 from distutils.dep_util import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
+from test.support import run_unittest
 
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -77,4 +78,4 @@ def test_suite():
     return unittest.makeSuite(DepUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index aa9f9ebb9f..7356c766e6 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -10,6 +10,7 @@
 
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -112,4 +113,4 @@ def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dist.py b/tests/test_dist.py
index ee8e8d4dae..a8eb8b1d5a 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -9,7 +9,7 @@
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 
-from test.support import TESTFN, captured_stdout
+from test.support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
 
 
@@ -325,4 +325,4 @@ def test_suite():
     return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 1ee30585fa..c9c8965706 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -3,7 +3,7 @@
 import os
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
@@ -66,4 +66,4 @@ def test_suite():
     return unittest.makeSuite(ExtensionTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 74618b523a..be743f3436 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -6,6 +6,7 @@
 from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -62,4 +63,4 @@ def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 331180d235..6312a29485 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -2,7 +2,7 @@
 import unittest
 
 from distutils.filelist import glob_to_re, FileList
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils import debug
 
 class FileListTestCase(unittest.TestCase):
@@ -39,4 +39,4 @@ def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install.py b/tests/test_install.py
index bc407cf9ab..22e79b8909 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -6,7 +6,7 @@
 import unittest
 import site
 
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.command.install import install
 from distutils.command import install as install_module
@@ -203,4 +203,4 @@ def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 377ae86e2f..6b3b4c82ce 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_data import install_data
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -73,4 +74,4 @@ def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 5b32b13ee4..dc74c58d6c 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_headers import install_headers
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
@@ -37,4 +38,4 @@ def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 99a6d90627..790d4ce300 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -7,6 +7,7 @@
 from distutils.extension import Extension
 from distutils.tests import support
 from distutils.errors import DistutilsOptionError
+from test.support import run_unittest
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
@@ -98,4 +99,4 @@ def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 08360d297b..8952e744e5 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -7,6 +7,7 @@
 from distutils.core import Distribution
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class InstallScriptsTestCase(support.TempdirManager,
@@ -78,4 +79,4 @@ def test_suite():
     return unittest.makeSuite(InstallScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_log.py b/tests/test_log.py
index d35de3456c..5f87076bd7 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from tempfile import NamedTemporaryFile
+from test.support import run_unittest
 
 from distutils import log
 
@@ -33,4 +34,4 @@ def test_suite():
     return unittest.makeSuite(TestLog)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 40cb8be6d1..45bae77a6c 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -5,6 +5,7 @@
 
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
+from test.support import run_unittest
 
 _MANIFEST = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -137,4 +138,4 @@ def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_register.py b/tests/test_register.py
index 3b80b6dc05..9336ac8604 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -6,7 +6,7 @@
 import urllib
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 from distutils.command import register as register_module
 from distutils.command.register import register
@@ -259,4 +259,4 @@ def test_suite():
     return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index ad527c7dd6..73962d34f2 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -8,11 +8,9 @@
 import tempfile
 import warnings
 
-from test.support import check_warnings
-from test.support import captured_stdout
+from test.support import captured_stdout, check_warnings, run_unittest
 
-from distutils.command.sdist import sdist
-from distutils.command.sdist import show_formats
+from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -358,4 +356,4 @@ def test_suite():
     return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 950e5789b5..5b91aa5a11 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 import time
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn, find_executable
@@ -55,4 +55,4 @@ def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 3093097dba..953cb8ea08 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -3,6 +3,7 @@
 import unittest
 from distutils.text_file import TextFile
 from distutils.tests import support
+from test.support import run_unittest
 
 TEST_DATA = """# test file
 
@@ -103,4 +104,4 @@ def test_suite():
     return unittest.makeSuite(TextFileTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 3a41e6fcaa..1bff38e9ee 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,6 +1,7 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+from test.support import run_unittest
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
@@ -118,4 +119,4 @@ def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 35e970051e..4661ed3212 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,13 +1,12 @@
 """Tests for distutils.command.upload."""
-import sys
 import os
 import unittest
 import http.client as httpclient
+from test.support import run_unittest
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
-from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 PYPIRC_LONG_PASSWORD = """\
@@ -136,4 +135,4 @@ def test_suite():
     return unittest.makeSuite(uploadTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_util.py b/tests/test_util.py
index 0c732f8244..3b7159d72f 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from copy import copy
+from test.support import run_unittest
 
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
@@ -274,4 +275,4 @@ def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_version.py b/tests/test_version.py
index fa21433046..ff40f6b45c 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -2,6 +2,7 @@
 import unittest
 from distutils.version import LooseVersion
 from distutils.version import StrictVersion
+from test.support import run_unittest
 
 class VersionTestCase(unittest.TestCase):
 
@@ -67,4 +68,4 @@ def test_suite():
     return unittest.makeSuite(VersionTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_versionpredicate.py b/tests/test_versionpredicate.py
index 8a60dbe806..28ae09dc20 100644
--- a/tests/test_versionpredicate.py
+++ b/tests/test_versionpredicate.py
@@ -4,6 +4,10 @@
 
 import distutils.versionpredicate
 import doctest
+from test.support import run_unittest
 
 def test_suite():
     return doctest.DocTestSuite(distutils.versionpredicate)
+
+if __name__ == '__main__':
+    run_unittest(test_suite())

From c705a947d03d1505af6e1aeed5db58860fd5b717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 02:58:56 +0000
Subject: [PATCH 3087/8469] Merged revisions 86223-86224,86226,86234 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86223 | eric.araujo | 2010-11-06 00:51:56 +0100 (sam., 06 nov. 2010) | 2 lines

  Always close files in distutils code and tests (#10252).
........
  r86224 | eric.araujo | 2010-11-06 00:58:34 +0100 (sam., 06 nov. 2010) | 2 lines

  Add missing entry for r86223.
........
  r86226 | eric.araujo | 2010-11-06 00:59:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Of course, I forgot one file in r86223.
........
  r86234 | eric.araujo | 2010-11-06 03:10:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Also close file descriptors from os.popen and subprocess.Popen
........
---
 ccompiler.py                  |  10 ++-
 command/bdist_rpm.py          |  36 ++++----
 command/bdist_wininst.py      |   6 +-
 command/upload.py             |   6 +-
 core.py                       |   6 +-
 cygwinccompiler.py            |   5 +-
 dist.py                       |   8 +-
 emxccompiler.py               |  12 ++-
 extension.py                  | 155 +++++++++++++++++-----------------
 file_util.py                  |   8 +-
 msvc9compiler.py              |  10 ++-
 tests/test_build_py.py        |  12 ++-
 tests/test_build_scripts.py   |   6 +-
 tests/test_config.py          |   8 +-
 tests/test_core.py            |   6 +-
 tests/test_dir_util.py        |   6 +-
 tests/test_dist.py            |  40 ++++-----
 tests/test_file_util.py       |   6 +-
 tests/test_install.py         |   5 +-
 tests/test_install_scripts.py |   6 +-
 tests/test_msvc9compiler.py   |  14 +--
 tests/test_register.py        |   8 +-
 tests/test_sdist.py           |   8 +-
 tests/test_sysconfig.py       |  16 ++--
 tests/test_text_file.py       |  52 ++++++++----
 util.py                       |  16 ++--
 26 files changed, 283 insertions(+), 188 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 34c77a37a3..291c008f20 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -779,14 +779,16 @@ def has_function(self, funcname, includes=None, include_dirs=None,
             library_dirs = []
         fd, fname = tempfile.mkstemp(".c", funcname, text=True)
         f = os.fdopen(fd, "w")
-        for incl in includes:
-            f.write("""#include "%s"\n""" % incl)
-        f.write("""\
+        try:
+            for incl in includes:
+                f.write("""#include "%s"\n""" % incl)
+            f.write("""\
 main (int argc, char **argv) {
     %s();
 }
 """ % funcname)
-        f.close()
+        finally:
+            f.close()
         try:
             objects = self.compile([fname], include_dirs=include_dirs)
         except CompileError:
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 452f9502ad..e2ae877d9a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -343,22 +343,26 @@ def run(self):
             src_rpm, non_src_rpm, spec_path)
 
         out = os.popen(q_cmd)
-        binary_rpms = []
-        source_rpm = None
-        while True:
-            line = out.readline()
-            if not line:
-                break
-            l = line.strip().split()
-            assert(len(l) == 2)
-            binary_rpms.append(l[1])
-            # The source rpm is named after the first entry in the spec file
-            if source_rpm is None:
-                source_rpm = l[0]
-
-        status = out.close()
-        if status:
-            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+        try:
+            binary_rpms = []
+            source_rpm = None
+            while True:
+                line = out.readline()
+                if not line:
+                    break
+                l = line.strip().split()
+                assert(len(l) == 2)
+                binary_rpms.append(l[1])
+                # The source rpm is named after the first entry in the spec file
+                if source_rpm is None:
+                    source_rpm = l[0]
+
+            status = out.close()
+            if status:
+                raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
+        finally:
+            out.close()
 
         self.spawn(rpm_cmd)
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3aa1dac7f3..b2e2fc6dc8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -340,4 +340,8 @@ def get_exe_bytes(self):
             sfix = ''
 
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
-        return open(filename, "rb").read()
+        f = open(filename, "rb")
+        try:
+            return f.read()
+        finally:
+            f.close()
diff --git a/command/upload.py b/command/upload.py
index 99e03d747c..4926aa3e15 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -76,7 +76,11 @@ def upload_file(self, command, pyversion, filename):
 
         # Fill in the data - send all the meta-data in case we need to
         # register a new release
-        content = open(filename,'rb').read()
+        f = open(filename,'rb')
+        try:
+            content = f.read()
+        finally:
+            f.close()
         meta = self.distribution.metadata
         data = {
             # action
diff --git a/core.py b/core.py
index 6e4892039e..fd2a43d7d2 100644
--- a/core.py
+++ b/core.py
@@ -215,7 +215,11 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            exec(open(script_name).read(), g, l)
+            f = open(script_name)
+            try:
+                exec(f.read(), g, l)
+            finally:
+                f.close()
         finally:
             sys.argv = save_argv
             _setup_stop_after = None
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 8504371810..95fa3ed3c8 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -350,11 +350,14 @@ def check_config_h():
     # let's see if __GNUC__ is mentioned in python.h
     fn = sysconfig.get_config_h_filename()
     try:
-        with open(fn) as config_h:
+        config_h = open(fn)
+        try:
             if "__GNUC__" in config_h.read():
                 return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn
             else:
                 return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
+        finally:
+            config_h.close()
     except IOError as exc:
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
diff --git a/dist.py b/dist.py
index 1c1ea477db..01f1f1cfc0 100644
--- a/dist.py
+++ b/dist.py
@@ -1012,9 +1012,11 @@ def __init__ (self):
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-        pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
-        self.write_pkg_file(pkg_info)
-        pkg_info.close()
+        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
+        try:
+            self.write_pkg_file(pkg_info)
+        finally:
+            pkg_info.close()
 
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
diff --git a/emxccompiler.py b/emxccompiler.py
index 62a4c5b4e8..16dce53524 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -270,8 +270,10 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
-        s = f.read()
-        f.close()
+        try:
+            s = f.read()
+        finally:
+            f.close()
 
     except IOError as exc:
         # if we can't read this file, we cannot say it is wrong
@@ -298,8 +300,10 @@ def get_versions():
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
+        try:
+            out_string = out.read()
+        finally:
+            out.close()
         result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
         if result:
             gcc_version = StrictVersion(result.group(1))
diff --git a/extension.py b/extension.py
index 5c07bdae82..2d1c36bd5c 100644
--- a/extension.py
+++ b/extension.py
@@ -149,84 +149,87 @@ def read_setup_file(filename):
     file = TextFile(filename,
                     strip_comments=1, skip_blanks=1, join_lines=1,
                     lstrip_ws=1, rstrip_ws=1)
-    extensions = []
-
-    while True:
-        line = file.readline()
-        if line is None:                # eof
-            break
-        if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
-            continue
-
-        if line[0] == line[-1] == "*":
-            file.warn("'%s' lines not handled yet" % line)
-            continue
-
-        line = expand_makefile_vars(line, vars)
-        words = split_quoted(line)
-
-        # NB. this parses a slightly different syntax than the old
-        # makesetup script: here, there must be exactly one extension per
-        # line, and it must be the first word of the line.  I have no idea
-        # why the old syntax supported multiple extensions per line, as
-        # they all wind up being the same.
-
-        module = words[0]
-        ext = Extension(module, [])
-        append_next_word = None
-
-        for word in words[1:]:
-            if append_next_word is not None:
-                append_next_word.append(word)
-                append_next_word = None
+    try:
+        extensions = []
+
+        while True:
+            line = file.readline()
+            if line is None:                # eof
+                break
+            if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
                 continue
 
-            suffix = os.path.splitext(word)[1]
-            switch = word[0:2] ; value = word[2:]
-
-            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
-                # hmm, should we do something about C vs. C++ sources?
-                # or leave it up to the CCompiler implementation to
-                # worry about?
-                ext.sources.append(word)
-            elif switch == "-I":
-                ext.include_dirs.append(value)
-            elif switch == "-D":
-                equals = value.find("=")
-                if equals == -1:        # bare "-DFOO" -- no value
-                    ext.define_macros.append((value, None))
-                else:                   # "-DFOO=blah"
-                    ext.define_macros.append((value[0:equals],
-                                              value[equals+2:]))
-            elif switch == "-U":
-                ext.undef_macros.append(value)
-            elif switch == "-C":        # only here 'cause makesetup has it!
-                ext.extra_compile_args.append(word)
-            elif switch == "-l":
-                ext.libraries.append(value)
-            elif switch == "-L":
-                ext.library_dirs.append(value)
-            elif switch == "-R":
-                ext.runtime_library_dirs.append(value)
-            elif word == "-rpath":
-                append_next_word = ext.runtime_library_dirs
-            elif word == "-Xlinker":
-                append_next_word = ext.extra_link_args
-            elif word == "-Xcompiler":
-                append_next_word = ext.extra_compile_args
-            elif switch == "-u":
-                ext.extra_link_args.append(word)
-                if not value:
+            if line[0] == line[-1] == "*":
+                file.warn("'%s' lines not handled yet" % line)
+                continue
+
+            line = expand_makefile_vars(line, vars)
+            words = split_quoted(line)
+
+            # NB. this parses a slightly different syntax than the old
+            # makesetup script: here, there must be exactly one extension per
+            # line, and it must be the first word of the line.  I have no idea
+            # why the old syntax supported multiple extensions per line, as
+            # they all wind up being the same.
+
+            module = words[0]
+            ext = Extension(module, [])
+            append_next_word = None
+
+            for word in words[1:]:
+                if append_next_word is not None:
+                    append_next_word.append(word)
+                    append_next_word = None
+                    continue
+
+                suffix = os.path.splitext(word)[1]
+                switch = word[0:2] ; value = word[2:]
+
+                if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
+                    # hmm, should we do something about C vs. C++ sources?
+                    # or leave it up to the CCompiler implementation to
+                    # worry about?
+                    ext.sources.append(word)
+                elif switch == "-I":
+                    ext.include_dirs.append(value)
+                elif switch == "-D":
+                    equals = value.find("=")
+                    if equals == -1:        # bare "-DFOO" -- no value
+                        ext.define_macros.append((value, None))
+                    else:                   # "-DFOO=blah"
+                        ext.define_macros.append((value[0:equals],
+                                                  value[equals+2:]))
+                elif switch == "-U":
+                    ext.undef_macros.append(value)
+                elif switch == "-C":        # only here 'cause makesetup has it!
+                    ext.extra_compile_args.append(word)
+                elif switch == "-l":
+                    ext.libraries.append(value)
+                elif switch == "-L":
+                    ext.library_dirs.append(value)
+                elif switch == "-R":
+                    ext.runtime_library_dirs.append(value)
+                elif word == "-rpath":
+                    append_next_word = ext.runtime_library_dirs
+                elif word == "-Xlinker":
                     append_next_word = ext.extra_link_args
-            elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
-                # NB. a really faithful emulation of makesetup would
-                # append a .o file to extra_objects only if it
-                # had a slash in it; otherwise, it would s/.o/.c/
-                # and append it to sources.  Hmmmm.
-                ext.extra_objects.append(word)
-            else:
-                file.warn("unrecognized argument '%s'" % word)
-
-        extensions.append(ext)
+                elif word == "-Xcompiler":
+                    append_next_word = ext.extra_compile_args
+                elif switch == "-u":
+                    ext.extra_link_args.append(word)
+                    if not value:
+                        append_next_word = ext.extra_link_args
+                elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
+                    # NB. a really faithful emulation of makesetup would
+                    # append a .o file to extra_objects only if it
+                    # had a slash in it; otherwise, it would s/.o/.c/
+                    # and append it to sources.  Hmmmm.
+                    ext.extra_objects.append(word)
+                else:
+                    file.warn("unrecognized argument '%s'" % word)
+
+            extensions.append(ext)
+    finally:
+        file.close()
 
     return extensions
diff --git a/file_util.py b/file_util.py
index 65aa7e0fdd..c36e7128d0 100644
--- a/file_util.py
+++ b/file_util.py
@@ -234,6 +234,8 @@ def write_file (filename, contents):
     sequence of strings without line terminators) to it.
     """
     f = open(filename, "w")
-    for line in contents:
-        f.write(line + "\n")
-    f.close()
+    try:
+        for line in contents:
+            f.write(line + "\n")
+    finally:
+        f.close()
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 761b9ca236..6d7825df86 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -263,10 +263,12 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
-
-    stdout, stderr = popen.communicate()
-    if popen.wait() != 0:
-        raise DistutilsPlatformError(stderr.decode("mbcs"))
+    try:
+        stdout, stderr = popen.communicate()
+        if popen.wait() != 0:
+            raise DistutilsPlatformError(stderr.decode("mbcs"))
+    finally:
+        popen.close()
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 3e45f6e89e..8a69aaa0d6 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -19,11 +19,15 @@ class BuildPyTestCase(support.TempdirManager,
     def test_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
-        f.write("# Pretend this is a package.")
-        f.close()
+        try:
+            f.write("# Pretend this is a package.")
+        finally:
+            f.close()
         f = open(os.path.join(sources, "README.txt"), "w")
-        f.write("Info about this package")
-        f.close()
+        try:
+            f.write("Info about this package")
+        finally:
+            f.close()
 
         destination = self.mkdtemp()
 
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index b1d2d079bd..85b0400460 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -71,8 +71,10 @@ def write_sample_scripts(self, dir):
 
     def write_script(self, dir, name, text):
         f = open(os.path.join(dir, name), "w")
-        f.write(text)
-        f.close()
+        try:
+            f.write(text)
+        finally:
+            f.close()
 
     def test_version_int(self):
         source = self.mkdtemp()
diff --git a/tests/test_config.py b/tests/test_config.py
index 71c63678f8..6a45a328b6 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -105,8 +105,12 @@ def test_server_empty_registration(self):
         self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
-        content = open(rc).read()
-        self.assertEquals(content, WANTED)
+        f = open(rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED)
+        finally:
+            f.close()
 
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
diff --git a/tests/test_core.py b/tests/test_core.py
index b478fa6291..e937b45a6b 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -52,7 +52,11 @@ def cleanup_testfn(self):
             shutil.rmtree(path)
 
     def write_setup(self, text, path=test.support.TESTFN):
-        open(path, "w").write(text)
+        f = open(path, "w")
+        try:
+            f.write(text)
+        finally:
+            f.close()
         return path
 
     def test_run_setup_provides_file(self):
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index a1647fbcf5..aa9f9ebb9f 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -88,8 +88,10 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
         f = open(a_file, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 3b7637f3af..f9c5a4fd96 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -80,29 +80,29 @@ def test_command_packages_cmdline(self):
 
     def test_command_packages_configfile(self):
         sys.argv.append("build")
+        self.addCleanup(os.unlink, TESTFN)
         f = open(TESTFN, "w")
         try:
             print("[global]", file=f)
             print("command_packages = foo.bar, splat", file=f)
+        finally:
             f.close()
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "foo.bar", "splat"])
-
-            # ensure command line overrides config:
-            sys.argv[1:] = ["--command-packages", "spork", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "spork"])
-
-            # Setting --command-packages to '' should cause the default to
-            # be used even if a config file specified something else:
-            sys.argv[1:] = ["--command-packages", "", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
-        finally:
-            os.unlink(TESTFN)
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "foo.bar", "splat"])
+
+        # ensure command line overrides config:
+        sys.argv[1:] = ["--command-packages", "spork", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "spork"])
+
+        # Setting --command-packages to '' should cause the default to
+        # be used even if a config file specified something else:
+        sys.argv[1:] = ["--command-packages", "", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
@@ -261,8 +261,10 @@ def test_custom_pydistutils(self):
         temp_dir = self.mkdtemp()
         user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
-        f.write('.')
-        f.close()
+        try:
+            f.write('.')
+        finally:
+            f.close()
 
         try:
             dist = Distribution()
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index fac4a5d1a9..74618b523a 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -31,8 +31,10 @@ def tearDown(self):
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
diff --git a/tests/test_install.py b/tests/test_install.py
index 76fa02acda..bc407cf9ab 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -182,8 +182,11 @@ def test_record(self):
 
         # let's check the RECORD file was created with one
         # line (the egg info file)
-        with open(cmd.record) as f:
+        f = open(cmd.record)
+        try:
             self.assertEquals(len(f.readlines()), 1)
+        finally:
+            f.close()
 
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index b7eb625ac5..08360d297b 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -42,8 +42,10 @@ def test_installation(self):
         def write_script(name, text):
             expected.append(name)
             f = open(os.path.join(source, name), "w")
-            f.write(text)
-            f.close()
+            try:
+                f.write(text)
+            finally:
+                f.close()
 
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"
                                     "# bogus script w/ Python sh-bang\n"
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index f1da843fab..40cb8be6d1 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -113,17 +113,21 @@ def test_remove_visual_c_ref(self):
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
-        f.write(_MANIFEST)
-        f.close()
+        try:
+            f.write(_MANIFEST)
+        finally:
+            f.close()
 
         compiler = MSVCCompiler()
         compiler._remove_visual_c_ref(manifest)
 
         # see what we got
         f = open(manifest)
-        # removing trailing spaces
-        content = '\n'.join([line.rstrip() for line in f.readlines()])
-        f.close()
+        try:
+            # removing trailing spaces
+            content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
+            f.close()
 
         # makes sure the manifest was properly cleaned
         self.assertEquals(content, _CLEANED_MANIFEST)
diff --git a/tests/test_register.py b/tests/test_register.py
index 7d0ac9ee3a..3b80b6dc05 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -118,8 +118,12 @@ def test_create_pypirc(self):
         self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
-        content = open(self.rc).read()
-        self.assertEquals(content, WANTED_PYPIRC)
+        f = open(self.rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED_PYPIRC)
+        finally:
+            f.close()
 
         # now let's make sure the .pypirc file generated
         # really works : we shouldn't be asked anything
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 209aa59baf..ad527c7dd6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -215,8 +215,12 @@ def test_add_defaults(self):
         self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
-        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        f = open(join(self.tmp_dir, 'MANIFEST'))
+        try:
+            manifest = f.read()
+            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        finally:
+            f.close()
 
     def test_metadata_check_option(self):
         # testing the `medata-check` option
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index edc755ed15..78bce9461f 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -75,9 +75,11 @@ def set_executables(self, **kw):
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
                               'OTHER': 'foo'})
@@ -85,9 +87,11 @@ def test_parse_makefile_base(self):
     def test_parse_makefile_literal_dollar(self):
         self.makefile = TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
                               'OTHER': 'foo'})
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 00f083a130..3093097dba 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -58,28 +58,46 @@ def test_input(count, description, file, expected_result):
         finally:
             out_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (1, "no processing", in_file, result1)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(1, "no processing", in_file, result1)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (2, "strip comments", in_file, result2)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(2, "strip comments", in_file, result2)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (3, "strip blanks", in_file, result3)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(3, "strip blanks", in_file, result3)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename)
-        test_input (4, "default processing", in_file, result4)
+        in_file = TextFile(filename)
+        try:
+            test_input(4, "default processing", in_file, result4)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1)
-        test_input (5, "join lines without collapsing", in_file, result5)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1)
+        try:
+            test_input(5, "join lines without collapsing", in_file, result5)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1, collapse_join=1)
-        test_input (6, "join lines with collapsing", in_file, result6)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1, collapse_join=1)
+        try:
+            test_input(6, "join lines with collapsing", in_file, result6)
+        finally:
+            in_file.close()
 
 def test_suite():
     return unittest.makeSuite(TextFileTestCase)
diff --git a/util.py b/util.py
index 8175434586..3081245b62 100644
--- a/util.py
+++ b/util.py
@@ -115,13 +115,15 @@ def get_platform ():
                 # behaviour.
                 pass
             else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
-                if m is not None:
-                    macrelease = '.'.join(m.group(1).split('.')[:2])
-                # else: fall back to the default behaviour
+                try:
+                    m = re.search(
+                            r'<key>ProductUserVisibleVersion</key>\s*' +
+                            r'<string>(.*?)</string>', f.read())
+                    if m is not None:
+                        macrelease = '.'.join(m.group(1).split('.')[:2])
+                    # else: fall back to the default behaviour
+                finally:
+                    f.close()
 
         if not macver:
             macver = macrelease

From a5d239446824885f4c30d1924d3368874c9319ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 04:06:18 +0000
Subject: [PATCH 3088/8469] Merged revisions 86223-86224,86226,86234 via
 svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86223 | eric.araujo | 2010-11-06 00:51:56 +0100 (sam., 06 nov. 2010) | 2 lines

  Always close files in distutils code and tests (#10252).
........
  r86224 | eric.araujo | 2010-11-06 00:58:34 +0100 (sam., 06 nov. 2010) | 2 lines

  Add missing entry for r86223.
........
  r86226 | eric.araujo | 2010-11-06 00:59:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Of course, I forgot one file in r86223.
........
  r86234 | eric.araujo | 2010-11-06 03:10:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Also close file descriptors from os.popen and subprocess.Popen
........
---
 ccompiler.py                  |  10 ++-
 command/bdist_rpm.py          |  36 ++++----
 command/bdist_wininst.py      |   6 +-
 command/upload.py             |   6 +-
 core.py                       |   6 +-
 cygwinccompiler.py            |   6 +-
 dist.py                       |   8 +-
 emxccompiler.py               |  12 ++-
 extension.py                  | 165 ++++++++++++++++++----------------
 file_util.py                  |   8 +-
 msvc9compiler.py              |  10 ++-
 tests/test_build_py.py        |  12 ++-
 tests/test_build_scripts.py   |   6 +-
 tests/test_config.py          |   8 +-
 tests/test_core.py            |   6 +-
 tests/test_dir_util.py        |   6 +-
 tests/test_dist.py            |  40 +++++----
 tests/test_file_util.py       |   6 +-
 tests/test_install_scripts.py |   6 +-
 tests/test_msvc9compiler.py   |  14 +--
 tests/test_register.py        |   8 +-
 tests/test_sdist.py           |   8 +-
 tests/test_sysconfig.py       |  16 ++--
 tests/test_text_file.py       |  52 +++++++----
 util.py                       |  16 ++--
 25 files changed, 287 insertions(+), 190 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index a34177e71f..c2b1f6fbe9 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -794,14 +794,16 @@ def has_function(self, funcname, includes=None, include_dirs=None,
             library_dirs = []
         fd, fname = tempfile.mkstemp(".c", funcname, text=True)
         f = os.fdopen(fd, "w")
-        for incl in includes:
-            f.write("""#include "%s"\n""" % incl)
-        f.write("""\
+        try:
+            for incl in includes:
+                f.write("""#include "%s"\n""" % incl)
+            f.write("""\
 main (int argc, char **argv) {
     %s();
 }
 """ % funcname)
-        f.close()
+        finally:
+            f.close()
         try:
             objects = self.compile([fname], include_dirs=include_dirs)
         except CompileError:
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 6d9d47d2eb..0bba363557 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -355,22 +355,26 @@ def run (self):
             src_rpm, non_src_rpm, spec_path)
 
         out = os.popen(q_cmd)
-        binary_rpms = []
-        source_rpm = None
-        while 1:
-            line = out.readline()
-            if not line:
-                break
-            l = string.split(string.strip(line))
-            assert(len(l) == 2)
-            binary_rpms.append(l[1])
-            # The source rpm is named after the first entry in the spec file
-            if source_rpm is None:
-                source_rpm = l[0]
-
-        status = out.close()
-        if status:
-            raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+        try:
+            binary_rpms = []
+            source_rpm = None
+            while 1:
+                line = out.readline()
+                if not line:
+                    break
+                l = string.split(string.strip(line))
+                assert(len(l) == 2)
+                binary_rpms.append(l[1])
+                # The source rpm is named after the first entry in the spec file
+                if source_rpm is None:
+                    source_rpm = l[0]
+
+            status = out.close()
+            if status:
+                raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
+
+        finally:
+            out.close()
 
         self.spawn(rpm_cmd)
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index a31a5f7bac..36d46bd627 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -356,5 +356,9 @@ def get_exe_bytes (self):
             sfix = ''
 
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
-        return open(filename, "rb").read()
+        f = open(filename, "rb")
+        try:
+            return f.read()
+        finally:
+            f.close()
 # class bdist_wininst
diff --git a/command/upload.py b/command/upload.py
index c3f19d207f..980cf68d06 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -79,7 +79,11 @@ def upload_file(self, command, pyversion, filename):
 
         # Fill in the data - send all the meta-data in case we need to
         # register a new release
-        content = open(filename,'rb').read()
+        f = open(filename,'rb')
+        try:
+            content = f.read()
+        finally:
+            f.close()
         meta = self.distribution.metadata
         data = {
             # action
diff --git a/core.py b/core.py
index 99ccf44fad..b89557d767 100644
--- a/core.py
+++ b/core.py
@@ -216,7 +216,11 @@ def run_setup(script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            exec open(script_name, 'r').read() in g, l
+            f = open(script_name)
+            try:
+                exec f.read() in g, l
+            finally:
+                f.close()
         finally:
             sys.argv = save_argv
             _setup_stop_after = None
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 2dabc0f0fe..a1ee815c6c 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -382,8 +382,10 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
-        s = f.read()
-        f.close()
+        try:
+            s = f.read()
+        finally:
+            f.close()
 
     except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
diff --git a/dist.py b/dist.py
index 5dbdaef19c..597909ea1a 100644
--- a/dist.py
+++ b/dist.py
@@ -1101,9 +1101,11 @@ def _read_list(name):
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-        pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
-        self.write_pkg_file(pkg_info)
-        pkg_info.close()
+        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
+        try:
+            self.write_pkg_file(pkg_info)
+        finally:
+            pkg_info.close()
 
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
diff --git a/emxccompiler.py b/emxccompiler.py
index f52e63232d..a0172058a3 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -272,8 +272,10 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
-        s = f.read()
-        f.close()
+        try:
+            s = f.read()
+        finally:
+            f.close()
 
     except IOError, exc:
         # if we can't read this file, we cannot say it is wrong
@@ -300,8 +302,10 @@ def get_versions():
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
-        out_string = out.read()
-        out.close()
+        try:
+            out_string = out.read()
+        finally:
+            out.close()
         result = re.search('(\d+\.\d+\.\d+)',out_string)
         if result:
             gcc_version = StrictVersion(result.group(1))
diff --git a/extension.py b/extension.py
index 440d128cdc..9a67ca8b3e 100644
--- a/extension.py
+++ b/extension.py
@@ -150,87 +150,96 @@ def read_setup_file (filename):
     file = TextFile(filename,
                     strip_comments=1, skip_blanks=1, join_lines=1,
                     lstrip_ws=1, rstrip_ws=1)
-    extensions = []
-
-    while 1:
-        line = file.readline()
-        if line is None:                # eof
-            break
-        if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
-            continue
-
-        if line[0] == line[-1] == "*":
-            file.warn("'%s' lines not handled yet" % line)
-            continue
-
-        #print "original line: " + line
-        line = expand_makefile_vars(line, vars)
-        words = split_quoted(line)
-        #print "expanded line: " + line
-
-        # NB. this parses a slightly different syntax than the old
-        # makesetup script: here, there must be exactly one extension per
-        # line, and it must be the first word of the line.  I have no idea
-        # why the old syntax supported multiple extensions per line, as
-        # they all wind up being the same.
-
-        module = words[0]
-        ext = Extension(module, [])
-        append_next_word = None
-
-        for word in words[1:]:
-            if append_next_word is not None:
-                append_next_word.append(word)
-                append_next_word = None
+    try:
+        extensions = []
+
+        while 1:
+            line = file.readline()
+            if line is None:                # eof
+                break
+            if _variable_rx.match(line):    # VAR=VALUE, handled in first pass
                 continue
 
-            suffix = os.path.splitext(word)[1]
-            switch = word[0:2] ; value = word[2:]
-
-            if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
-                # hmm, should we do something about C vs. C++ sources?
-                # or leave it up to the CCompiler implementation to
-                # worry about?
-                ext.sources.append(word)
-            elif switch == "-I":
-                ext.include_dirs.append(value)
-            elif switch == "-D":
-                equals = string.find(value, "=")
-                if equals == -1:        # bare "-DFOO" -- no value
-                    ext.define_macros.append((value, None))
-                else:                   # "-DFOO=blah"
-                    ext.define_macros.append((value[0:equals],
-                                              value[equals+2:]))
-            elif switch == "-U":
-                ext.undef_macros.append(value)
-            elif switch == "-C":        # only here 'cause makesetup has it!
-                ext.extra_compile_args.append(word)
-            elif switch == "-l":
-                ext.libraries.append(value)
-            elif switch == "-L":
-                ext.library_dirs.append(value)
-            elif switch == "-R":
-                ext.runtime_library_dirs.append(value)
-            elif word == "-rpath":
-                append_next_word = ext.runtime_library_dirs
-            elif word == "-Xlinker":
-                append_next_word = ext.extra_link_args
-            elif word == "-Xcompiler":
-                append_next_word = ext.extra_compile_args
-            elif switch == "-u":
-                ext.extra_link_args.append(word)
-                if not value:
+                if line[0] == line[-1] == "*":
+                    file.warn("'%s' lines not handled yet" % line)
+                    continue
+
+            #print "original line: " + line
+            line = expand_makefile_vars(line, vars)
+            words = split_quoted(line)
+            #print "expanded line: " + line
+
+            # NB. this parses a slightly different syntax than the old
+            # makesetup script: here, there must be exactly one extension per
+            # line, and it must be the first word of the line.  I have no idea
+            # why the old syntax supported multiple extensions per line, as
+            # they all wind up being the same.
+
+            module = words[0]
+            ext = Extension(module, [])
+            append_next_word = None
+
+            for word in words[1:]:
+                if append_next_word is not None:
+                    append_next_word.append(word)
+                    append_next_word = None
+                    continue
+
+                suffix = os.path.splitext(word)[1]
+                switch = word[0:2] ; value = word[2:]
+
+                if suffix in (".c", ".cc", ".cpp", ".cxx", ".c++", ".m", ".mm"):
+                    # hmm, should we do something about C vs. C++ sources?
+                    # or leave it up to the CCompiler implementation to
+                    # worry about?
+                    ext.sources.append(word)
+                elif switch == "-I":
+                    ext.include_dirs.append(value)
+                elif switch == "-D":
+                    equals = string.find(value, "=")
+                    if equals == -1:        # bare "-DFOO" -- no value
+                        ext.define_macros.append((value, None))
+                    else:                   # "-DFOO=blah"
+                        ext.define_macros.append((value[0:equals],
+                                                  value[equals+2:]))
+                elif switch == "-U":
+                    ext.undef_macros.append(value)
+                elif switch == "-C":        # only here 'cause makesetup has it!
+                    ext.extra_compile_args.append(word)
+                elif switch == "-l":
+                    ext.libraries.append(value)
+                elif switch == "-L":
+                    ext.library_dirs.append(value)
+                elif switch == "-R":
+                    ext.runtime_library_dirs.append(value)
+                elif word == "-rpath":
+                    append_next_word = ext.runtime_library_dirs
+                elif word == "-Xlinker":
                     append_next_word = ext.extra_link_args
-            elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
-                # NB. a really faithful emulation of makesetup would
-                # append a .o file to extra_objects only if it
-                # had a slash in it; otherwise, it would s/.o/.c/
-                # and append it to sources.  Hmmmm.
-                ext.extra_objects.append(word)
-            else:
-                file.warn("unrecognized argument '%s'" % word)
-
-        extensions.append(ext)
+                elif word == "-Xcompiler":
+                    append_next_word = ext.extra_compile_args
+                elif switch == "-u":
+                    ext.extra_link_args.append(word)
+                    if not value:
+                        append_next_word = ext.extra_link_args
+                elif word == "-Xcompiler":
+                    append_next_word = ext.extra_compile_args
+                elif switch == "-u":
+                    ext.extra_link_args.append(word)
+                    if not value:
+                        append_next_word = ext.extra_link_args
+                elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
+                    # NB. a really faithful emulation of makesetup would
+                    # append a .o file to extra_objects only if it
+                    # had a slash in it; otherwise, it would s/.o/.c/
+                    # and append it to sources.  Hmmmm.
+                    ext.extra_objects.append(word)
+                else:
+                    file.warn("unrecognized argument '%s'" % word)
+
+            extensions.append(ext)
+    finally:
+        file.close()
 
         #print "module:", module
         #print "source files:", source_files
diff --git a/file_util.py b/file_util.py
index b3d9d54ec0..b9f0786133 100644
--- a/file_util.py
+++ b/file_util.py
@@ -224,6 +224,8 @@ def write_file (filename, contents):
     sequence of strings without line terminators) to it.
     """
     f = open(filename, "w")
-    for line in contents:
-        f.write(line + "\n")
-    f.close()
+    try:
+        for line in contents:
+            f.write(line + "\n")
+    finally:
+        f.close()
diff --git a/msvc9compiler.py b/msvc9compiler.py
index d5d7f66528..55a4db1880 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -273,10 +273,12 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
-
-    stdout, stderr = popen.communicate()
-    if popen.wait() != 0:
-        raise DistutilsPlatformError(stderr.decode("mbcs"))
+    try:
+        stdout, stderr = popen.communicate()
+        if popen.wait() != 0:
+            raise DistutilsPlatformError(stderr.decode("mbcs"))
+    finally:
+        popen.close()
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 3c8bc41bae..03517392fb 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -19,11 +19,15 @@ class BuildPyTestCase(support.TempdirManager,
     def _setup_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
-        f.write("# Pretend this is a package.")
-        f.close()
+        try:
+            f.write("# Pretend this is a package.")
+        finally:
+            f.close()
         f = open(os.path.join(sources, "README.txt"), "w")
-        f.write("Info about this package")
-        f.close()
+        try:
+            f.write("Info about this package")
+        finally:
+            f.close()
 
         destination = self.mkdtemp()
 
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 72e8915c00..df89cdec25 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -71,8 +71,10 @@ def write_sample_scripts(self, dir):
 
     def write_script(self, dir, name, text):
         f = open(os.path.join(dir, name), "w")
-        f.write(text)
-        f.close()
+        try:
+            f.write(text)
+        finally:
+            f.close()
 
     def test_version_int(self):
         source = self.mkdtemp()
diff --git a/tests/test_config.py b/tests/test_config.py
index 0a1bb961ff..6c85efad24 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -108,8 +108,12 @@ def test_server_empty_registration(self):
         self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
-        content = open(rc).read()
-        self.assertEquals(content, WANTED)
+        f = open(rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED)
+        finally:
+            f.close()
 
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
diff --git a/tests/test_core.py b/tests/test_core.py
index 48ec1b436e..63f6b31da6 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -52,7 +52,11 @@ def cleanup_testfn(self):
             shutil.rmtree(path)
 
     def write_setup(self, text, path=test.test_support.TESTFN):
-        open(path, "w").write(text)
+        f = open(path, "w")
+        try:
+            f.write(text)
+        finally:
+            f.close()
         return path
 
     def test_run_setup_provides_file(self):
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index a1647fbcf5..aa9f9ebb9f 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -88,8 +88,10 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
         f = open(a_file, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 1eddf6d25c..d9b413f954 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -102,29 +102,29 @@ def test_command_packages_cmdline(self):
 
     def test_command_packages_configfile(self):
         sys.argv.append("build")
+        self.addCleanup(os.unlink, TESTFN)
         f = open(TESTFN, "w")
         try:
             print >>f, "[global]"
             print >>f, "command_packages = foo.bar, splat"
+        finally:
             f.close()
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "foo.bar", "splat"])
-
-            # ensure command line overrides config:
-            sys.argv[1:] = ["--command-packages", "spork", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(),
-                             ["distutils.command", "spork"])
-
-            # Setting --command-packages to '' should cause the default to
-            # be used even if a config file specified something else:
-            sys.argv[1:] = ["--command-packages", "", "build"]
-            d = self.create_distribution([TESTFN])
-            self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
-        finally:
-            os.unlink(TESTFN)
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "foo.bar", "splat"])
+
+        # ensure command line overrides config:
+        sys.argv[1:] = ["--command-packages", "spork", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(),
+                         ["distutils.command", "spork"])
+
+        # Setting --command-packages to '' should cause the default to
+        # be used even if a config file specified something else:
+        sys.argv[1:] = ["--command-packages", "", "build"]
+        d = self.create_distribution([TESTFN])
+        self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
     def test_write_pkg_file(self):
         # Check DistributionMetadata handling of Unicode fields
@@ -341,8 +341,10 @@ def test_custom_pydistutils(self):
         temp_dir = self.mkdtemp()
         user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
-        f.write('.')
-        f.close()
+        try:
+            f.write('.')
+        finally:
+            f.close()
 
         try:
             dist = Distribution()
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 99b421f73f..823f211089 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -31,8 +31,10 @@ def tearDown(self):
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
-        f.write('some content')
-        f.close()
+        try:
+            f.write('some content')
+        finally:
+            f.close()
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index b7eb625ac5..08360d297b 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -42,8 +42,10 @@ def test_installation(self):
         def write_script(name, text):
             expected.append(name)
             f = open(os.path.join(source, name), "w")
-            f.write(text)
-            f.close()
+            try:
+                f.write(text)
+            finally:
+                f.close()
 
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"
                                     "# bogus script w/ Python sh-bang\n"
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index c957954482..567505ddf1 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -113,17 +113,21 @@ def test_remove_visual_c_ref(self):
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
-        f.write(_MANIFEST)
-        f.close()
+        try:
+            f.write(_MANIFEST)
+        finally:
+            f.close()
 
         compiler = MSVCCompiler()
         compiler._remove_visual_c_ref(manifest)
 
         # see what we got
         f = open(manifest)
-        # removing trailing spaces
-        content = '\n'.join([line.rstrip() for line in f.readlines()])
-        f.close()
+        try:
+            # removing trailing spaces
+            content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
+            f.close()
 
         # makes sure the manifest was properly cleaned
         self.assertEquals(content, _CLEANED_MANIFEST)
diff --git a/tests/test_register.py b/tests/test_register.py
index 370d659893..6da479b139 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -119,8 +119,12 @@ def test_create_pypirc(self):
         self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
-        content = open(self.rc).read()
-        self.assertEquals(content, WANTED_PYPIRC)
+        f = open(self.rc)
+        try:
+            content = f.read()
+            self.assertEquals(content, WANTED_PYPIRC)
+        finally:
+            f.close()
 
         # now let's make sure the .pypirc file generated
         # really works : we shouldn't be asked anything
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 87adb45894..7cebbf53ad 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -234,8 +234,12 @@ def test_add_defaults(self):
         self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
-        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
-        self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        f = open(join(self.tmp_dir, 'MANIFEST'))
+        try:
+            manifest = f.read()
+            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        finally:
+            f.close()
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 3066486066..8449ddca78 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -50,9 +50,11 @@ def test_get_python_inc(self):
     def test_parse_makefile_base(self):
         self.makefile = test.test_support.TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
                               'OTHER': 'foo'})
@@ -60,9 +62,11 @@ def test_parse_makefile_base(self):
     def test_parse_makefile_literal_dollar(self):
         self.makefile = test.test_support.TESTFN
         fd = open(self.makefile, 'w')
-        fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
-        fd.write('VAR=$OTHER\nOTHER=foo')
-        fd.close()
+        try:
+            fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
+            fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
+            fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
                               'OTHER': 'foo'})
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 00f083a130..3093097dba 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -58,28 +58,46 @@ def test_input(count, description, file, expected_result):
         finally:
             out_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (1, "no processing", in_file, result1)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(1, "no processing", in_file, result1)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (2, "strip comments", in_file, result2)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(2, "strip comments", in_file, result2)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
-                            lstrip_ws=0, rstrip_ws=0)
-        test_input (3, "strip blanks", in_file, result3)
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
+                           lstrip_ws=0, rstrip_ws=0)
+        try:
+            test_input(3, "strip blanks", in_file, result3)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename)
-        test_input (4, "default processing", in_file, result4)
+        in_file = TextFile(filename)
+        try:
+            test_input(4, "default processing", in_file, result4)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1)
-        test_input (5, "join lines without collapsing", in_file, result5)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1)
+        try:
+            test_input(5, "join lines without collapsing", in_file, result5)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
-                            join_lines=1, rstrip_ws=1, collapse_join=1)
-        test_input (6, "join lines with collapsing", in_file, result6)
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
+                           join_lines=1, rstrip_ws=1, collapse_join=1)
+        try:
+            test_input(6, "join lines with collapsing", in_file, result6)
+        finally:
+            in_file.close()
 
 def test_suite():
     return unittest.makeSuite(TextFileTestCase)
diff --git a/util.py b/util.py
index 4dcfeb5505..f06e4fdf88 100644
--- a/util.py
+++ b/util.py
@@ -116,13 +116,15 @@ def get_platform ():
                 # behaviour.
                 pass
             else:
-                m = re.search(
-                        r'<key>ProductUserVisibleVersion</key>\s*' +
-                        r'<string>(.*?)</string>', f.read())
-                f.close()
-                if m is not None:
-                    macrelease = '.'.join(m.group(1).split('.')[:2])
-                # else: fall back to the default behaviour
+                try:
+                    m = re.search(
+                            r'<key>ProductUserVisibleVersion</key>\s*' +
+                            r'<string>(.*?)</string>', f.read())
+                    if m is not None:
+                        macrelease = '.'.join(m.group(1).split('.')[:2])
+                    # else: fall back to the default behaviour
+                finally:
+                    f.close()
 
         if not macver:
             macver = macrelease

From 41f08f2173e692b35d9dc8d232eee3a44a6285d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 04:48:05 +0000
Subject: [PATCH 3089/8469] Prevent race condition with mkdir in distutils. 
 Patch by Arfrever on #9281.

---
 dir_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 54376e5ca5..c7c9fccfd7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -69,10 +69,11 @@ def mkpath(name, mode=0o777, verbose=1, dry_run=0):
         if not dry_run:
             try:
                 os.mkdir(head, mode)
-                created_dirs.append(head)
             except OSError as exc:
-                raise DistutilsFileError(
-                      "could not create '%s': %s" % (head, exc.args[-1]))
+                if not (exc.errno == errno.EEXIST and os.path.isdir(head)):
+                    raise DistutilsFileError(
+                          "could not create '%s': %s" % (head, exc.args[-1]))
+            created_dirs.append(head)
 
         _path_created[abs_head] = 1
     return created_dirs

From d7f8760f536a13a32a3e93c28d527b9b48e0b849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 04:51:10 +0000
Subject: [PATCH 3090/8469] Merged revisions 86244 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86244 | eric.araujo | 2010-11-06 05:48:05 +0100 (sam., 06 nov. 2010) | 3 lines

  Prevent race condition with mkdir in distutils.  Patch by Arfrever on #9281.
........
---
 dir_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 54376e5ca5..c7c9fccfd7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -69,10 +69,11 @@ def mkpath(name, mode=0o777, verbose=1, dry_run=0):
         if not dry_run:
             try:
                 os.mkdir(head, mode)
-                created_dirs.append(head)
             except OSError as exc:
-                raise DistutilsFileError(
-                      "could not create '%s': %s" % (head, exc.args[-1]))
+                if not (exc.errno == errno.EEXIST and os.path.isdir(head)):
+                    raise DistutilsFileError(
+                          "could not create '%s': %s" % (head, exc.args[-1]))
+            created_dirs.append(head)
 
         _path_created[abs_head] = 1
     return created_dirs

From 80531c1bf96caa7748c38597cb19161b804e8c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 04:53:42 +0000
Subject: [PATCH 3091/8469] Merged revisions 86244 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86244 | eric.araujo | 2010-11-06 05:48:05 +0100 (sam., 06 nov. 2010) | 3 lines

  Prevent race condition with mkdir in distutils.  Patch by Arfrever on #9281.
........
---
 dir_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 5a968063f7..d6875936d6 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -69,10 +69,11 @@ def mkpath(name, mode=0777, verbose=1, dry_run=0):
         if not dry_run:
             try:
                 os.mkdir(head, mode)
-                created_dirs.append(head)
             except OSError, exc:
-                raise DistutilsFileError, \
-                      "could not create '%s': %s" % (head, exc[-1])
+                if not (exc.errno == errno.EEXIST and os.path.isdir(head)):
+                    raise DistutilsFileError(
+                          "could not create '%s': %s" % (head, exc.args[-1]))
+            created_dirs.append(head)
 
         _path_created[abs_head] = 1
     return created_dirs

From 228a5b4d720ae63f6f5a2b9acf535d9da00f934f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 06:00:54 +0000
Subject: [PATCH 3092/8469] Remove traces of Mac OS 9 support, again (#9508).

This was done in r80805 (#7908) and erroneously brought back by the
distutils revert.  This commit removes more code than the original,
which was uncomplete.  There is no NEWS entry, like in r80805.
---
 command/install.py | 16 ----------------
 file_util.py       |  9 ---------
 sysconfig.py       | 42 ------------------------------------------
 util.py            |  9 ---------
 4 files changed, 76 deletions(-)

diff --git a/command/install.py b/command/install.py
index 2a905d92f8..58f6ec5b16 100644
--- a/command/install.py
+++ b/command/install.py
@@ -60,14 +60,6 @@
         'data'   : '$base',
         },
     'nt': WINDOWS_SCHEME,
-    'mac': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
-
     'os2': {
         'purelib': '$base/Lib/site-packages',
         'platlib': '$base/Lib/site-packages',
@@ -95,14 +87,6 @@
         'data'   : '$userbase',
         }
 
-    INSTALL_SCHEMES['mac_user'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/$py_version_short/include/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
     INSTALL_SCHEMES['os2_home'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
diff --git a/file_util.py b/file_util.py
index c36e7128d0..e1eb932926 100644
--- a/file_util.py
+++ b/file_util.py
@@ -130,15 +130,6 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     if dry_run:
         return (dst, 1)
 
-    # On Mac OS, use the native file copy routine
-    if os.name == 'mac':
-        import macostools
-        try:
-            macostools.copy(src, dst, 0, preserve_times)
-        except os.error as exc:
-            raise DistutilsFileError(
-                  "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
-
     # If linking (hard or symbolic), use the appropriate system call
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
diff --git a/sysconfig.py b/sysconfig.py
index 8b55f217cd..be91f92c36 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -86,11 +86,6 @@ def get_python_inc(plat_specific=0, prefix=None):
         return os.path.join(prefix, "include", "python" + get_python_version())
     elif os.name == "nt":
         return os.path.join(prefix, "include")
-    elif os.name == "mac":
-        if plat_specific:
-            return os.path.join(prefix, "Mac", "Include")
-        else:
-            return os.path.join(prefix, "Include")
     elif os.name == "os2":
         return os.path.join(prefix, "Include")
     else:
@@ -131,17 +126,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return prefix
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
-    elif os.name == "mac":
-        if plat_specific:
-            if standard_lib:
-                return os.path.join(prefix, "Lib", "lib-dynload")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
-        else:
-            if standard_lib:
-                return os.path.join(prefix, "Lib")
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
     elif os.name == "os2":
         if standard_lib:
             return os.path.join(prefix, "Lib")
@@ -477,32 +461,6 @@ def _init_nt():
     _config_vars = g
 
 
-def _init_mac():
-    """Initialize the module as appropriate for Macintosh systems"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    import MacOS
-    if not hasattr(MacOS, 'runtimemodel'):
-        g['SO'] = '.ppc.slb'
-    else:
-        g['SO'] = '.%s.slb' % MacOS.runtimemodel
-
-    # XXX are these used anywhere?
-    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
-    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
-
-    # These are used by the extension module build
-    g['srcdir'] = ':'
-    global _config_vars
-    _config_vars = g
-
-
 def _init_os2():
     """Initialize the module as appropriate for OS/2"""
     g = {}
diff --git a/util.py b/util.py
index 3081245b62..ce3cd6ca33 100644
--- a/util.py
+++ b/util.py
@@ -235,15 +235,6 @@ def change_root (new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
-    elif os.name == 'mac':
-        if not os.path.isabs(pathname):
-            return os.path.join(new_root, pathname)
-        else:
-            # Chop off volume name from start of path
-            elements = pathname.split(":", 1)
-            pathname = ":" + elements[1]
-            return os.path.join(new_root, pathname)
-
     else:
         raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
 

From d722bd3324c1d22541a8e8f924fa490fd7c1046f Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 22 Nov 2010 18:12:18 +0100
Subject: [PATCH 3093/8469] We need to make sure that the result is always a
 str, even if the result is an error response. Otherwise you get an error when
 trying to pattern match in line 206.

--HG--
branch : distribute
extra : rebase_source : dc5fe8b1365544fc763414b67227cc78dc1f8524
---
 setuptools/package_index.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4ff963030f..459cae2c0b 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -199,8 +199,12 @@ def process_url(self, url, retrieve=False):
 
         base = f.url     # handle redirects
         page = f.read()
-        if sys.version_info >= (3,) and not isinstance(f, urllib2.HTTPError):
-            charset = f.headers.get_param('charset') or 'latin-1'
+        if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
+            if isinstance(f, urllib2.HTTPError):
+                # Errors have no charset, assume latin1:
+                charset = 'latin-1'
+            else:
+                charset = f.headers.get_param('charset') or 'latin-1'
             page = page.decode(charset, "ignore")
         f.close()
         for match in HREF.finditer(page):

From c337060368f6bce8442372bdc4049d31d279eba8 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 24 Nov 2010 11:40:25 +0100
Subject: [PATCH 3094/8469] Updated CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : 146a6656573c5b7173e62f294ebc713cdc4a6f0b
---
 CHANGES.txt                          | 1 +
 distribute.egg-info/entry_points.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d9f905cd3..fc843b6448 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ------
 
 * Fixed typo in bdist_egg
+* Several issues under Python 3 has been solved.
 
 ------
 0.6.14
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..e1f704d8cb 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 7473dcbb92dd3fdeadfd67c725f08729a32cd06f Mon Sep 17 00:00:00 2001
From: Robert Myers <myer0052@gmail.com>
Date: Sat, 4 Dec 2010 14:47:25 -0600
Subject: [PATCH 3095/8469] Adding DATA/LIB/site-packages to the list of
 prefixes searched in an exe file during installation.

--HG--
branch : distribute
extra : rebase_source : f300b49beac88354af6238df4a83798721860716
---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 27fd00c7c0..61fbcf7f9d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1445,7 +1445,8 @@ def get_exe_prefixes(exe_filename):
     prefixes = [
         ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''),
         ('PLATLIB/', ''),
-        ('SCRIPTS/', 'EGG-INFO/scripts/')
+        ('SCRIPTS/', 'EGG-INFO/scripts/'),
+        ('DATA/LIB/site-packages', ''),
     ]
     z = zipfile.ZipFile(exe_filename)
     try:

From ecf025e13c30a54f7e97a8f531114d64d150fb5f Mon Sep 17 00:00:00 2001
From: Robert Myers <myer0052@gmail.com>
Date: Thu, 9 Dec 2010 22:45:11 -0600
Subject: [PATCH 3096/8469] Updated CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : b6e9ebbe1127a40bfb3b14660d71c74b24d6a5ea
---
 CHANGES.txt      | 1 +
 CONTRIBUTORS.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fc843b6448..ee3dea6e89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Fixed typo in bdist_egg
 * Several issues under Python 3 has been solved.
+* Issue 146: Fixed missing DLL files after easy_install of windows exe package.
 
 ------
 0.6.14
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f0ec2ba490..9ef062c773 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -14,6 +14,7 @@ Contributors
 * Noufal Ibrahim
 * Philip Jenvey
 * Reinout van Rees
+* Robert Myers
 * Tarek Ziadé
 * Toshio Kuratomi
 

From 71e69bc81462b72c45b2f86a689b9a680918cc0d Mon Sep 17 00:00:00 2001
From: Jonathan Ballet <jon@multani.info>
Date: Sat, 6 Nov 2010 15:01:33 +0100
Subject: [PATCH 3097/8469] Remove spurious message 'install_dir'

Fixes #184

--HG--
branch : distribute
extra : rebase_source : b4ecdac54934e36dfbb74949c87b4af1fc2b1b86
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 61fbcf7f9d..4ffef3def5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -377,7 +377,7 @@ def warn_deprecated_options(self):
 
     def check_site_dir(self):
         """Verify that self.install_dir is .pth-capable dir, if needed"""
-        print 'install_dir', self.install_dir
+
         instdir = normalize_path(self.install_dir)
         pth_file = os.path.join(instdir,'easy-install.pth')
 

From f34397aa8e5ae017fcfabbbaad6fc41b53e41372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 14:16:30 +0000
Subject: [PATCH 3098/8469] Remove one trace of Mac OS 9 support (#7908
 follow-up)

This was overlooked in r80804.  This change is not really a bug fix,
but the release manager agreed to it.  There is no NEWS entry, like
in the original commit.
---
 sysconfig.py | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 9888cd52cb..33cc5a38a5 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -453,32 +453,6 @@ def _init_nt():
     _config_vars = g
 
 
-def _init_mac():
-    """Initialize the module as appropriate for Macintosh systems"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    import MacOS
-    if not hasattr(MacOS, 'runtimemodel'):
-        g['SO'] = '.ppc.slb'
-    else:
-        g['SO'] = '.%s.slb' % MacOS.runtimemodel
-
-    # XXX are these used anywhere?
-    g['install_lib'] = os.path.join(EXEC_PREFIX, "Lib")
-    g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
-
-    # These are used by the extension module build
-    g['srcdir'] = ':'
-    global _config_vars
-    _config_vars = g
-
-
 def _init_os2():
     """Initialize the module as appropriate for OS/2"""
     g = {}

From dd5fb967d4f2e247a7bc154a206a2218b613c4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 15:57:52 +0000
Subject: [PATCH 3099/8469] Correct the fix for #10252: Popen objects have no
 close method.

---
 cygwinccompiler.py |  4 +++-
 msvc9compiler.py   | 31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 95fa3ed3c8..5676e91a79 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -377,7 +377,9 @@ def _find_exe_version(cmd):
     try:
         out_string = out.read()
     finally:
-        out.close()
+        out.stdin.close()
+        out.stdout.close()
+        out.stderr.close()
     result = RE_VERSION.search(out_string)
     if result is None:
         return None
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 6d7825df86..488524db91 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -267,21 +267,24 @@ def query_vcvarsall(version, arch="x86"):
         stdout, stderr = popen.communicate()
         if popen.wait() != 0:
             raise DistutilsPlatformError(stderr.decode("mbcs"))
+
+        stdout = stdout.decode("mbcs")
+        for line in stdout.split("\n"):
+            line = Reg.convert_mbcs(line)
+            if '=' not in line:
+                continue
+            line = line.strip()
+            key, value = line.split('=', 1)
+            key = key.lower()
+            if key in interesting:
+                if value.endswith(os.pathsep):
+                    value = value[:-1]
+                result[key] = removeDuplicates(value)
+
     finally:
-        popen.close()
-
-    stdout = stdout.decode("mbcs")
-    for line in stdout.split("\n"):
-        line = Reg.convert_mbcs(line)
-        if '=' not in line:
-            continue
-        line = line.strip()
-        key, value = line.split('=', 1)
-        key = key.lower()
-        if key in interesting:
-            if value.endswith(os.pathsep):
-                value = value[:-1]
-            result[key] = removeDuplicates(value)
+        popen.stdin.close()
+        popen.stdout.close()
+        popen.stderr.close()
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))

From 9c49a045a524afebada7c86980e2598de93f8615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 6 Nov 2010 18:03:52 +0000
Subject: [PATCH 3100/8469] Fix #10252 again (hopefully definitely).  Patch by
 Brian Curtin.

---
 cygwinccompiler.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 5676e91a79..95fa3ed3c8 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -377,9 +377,7 @@ def _find_exe_version(cmd):
     try:
         out_string = out.read()
     finally:
-        out.stdin.close()
-        out.stdout.close()
-        out.stderr.close()
+        out.close()
     result = RE_VERSION.search(out_string)
     if result is None:
         return None

From 6f3d8cbb6fec170ba7c4e07c6c67d4a9bb57d625 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 9 Nov 2010 09:32:19 +0000
Subject: [PATCH 3101/8469] Issue #10359: Remove ";" after function definition,
 invalid in ISO C

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 46ac9aafc3..203cbc98fe 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -318,7 +318,7 @@ def test_compiler_option(self):
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {}\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

From 436be32af39f9ac45717ae3c02a745252b0be238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 12 Nov 2010 20:27:45 +0000
Subject: [PATCH 3102/8469] Merged revisions 86274,86276 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86274 | eric.araujo | 2010-11-06 16:57:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Correct the fix for #10252: Popen objects have no close method.
........
  r86276 | eric.araujo | 2010-11-06 19:03:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Fix #10252 again (hopefully definitely).  Patch by Brian Curtin.
........
---
 msvc9compiler.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 6d7825df86..488524db91 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -267,21 +267,24 @@ def query_vcvarsall(version, arch="x86"):
         stdout, stderr = popen.communicate()
         if popen.wait() != 0:
             raise DistutilsPlatformError(stderr.decode("mbcs"))
+
+        stdout = stdout.decode("mbcs")
+        for line in stdout.split("\n"):
+            line = Reg.convert_mbcs(line)
+            if '=' not in line:
+                continue
+            line = line.strip()
+            key, value = line.split('=', 1)
+            key = key.lower()
+            if key in interesting:
+                if value.endswith(os.pathsep):
+                    value = value[:-1]
+                result[key] = removeDuplicates(value)
+
     finally:
-        popen.close()
-
-    stdout = stdout.decode("mbcs")
-    for line in stdout.split("\n"):
-        line = Reg.convert_mbcs(line)
-        if '=' not in line:
-            continue
-        line = line.strip()
-        key, value = line.split('=', 1)
-        key = key.lower()
-        if key in interesting:
-            if value.endswith(os.pathsep):
-                value = value[:-1]
-            result[key] = removeDuplicates(value)
+        popen.stdin.close()
+        popen.stdout.close()
+        popen.stderr.close()
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))

From 021d150839a1a8b960ae2eb7ee6136f6e081e875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 12 Nov 2010 20:31:17 +0000
Subject: [PATCH 3103/8469] Merged revisions 86274,86276 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86274 | eric.araujo | 2010-11-06 16:57:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Correct the fix for #10252: Popen objects have no close method.
........
  r86276 | eric.araujo | 2010-11-06 19:03:52 +0100 (sam., 06 nov. 2010) | 2 lines

  Fix #10252 again (hopefully definitely).  Patch by Brian Curtin.
........
---
 msvc9compiler.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 55a4db1880..615d8b83a0 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -277,21 +277,24 @@ def query_vcvarsall(version, arch="x86"):
         stdout, stderr = popen.communicate()
         if popen.wait() != 0:
             raise DistutilsPlatformError(stderr.decode("mbcs"))
+
+        stdout = stdout.decode("mbcs")
+        for line in stdout.split("\n"):
+            line = Reg.convert_mbcs(line)
+            if '=' not in line:
+                continue
+            line = line.strip()
+            key, value = line.split('=', 1)
+            key = key.lower()
+            if key in interesting:
+                if value.endswith(os.pathsep):
+                    value = value[:-1]
+                result[key] = removeDuplicates(value)
+
     finally:
-        popen.close()
-
-    stdout = stdout.decode("mbcs")
-    for line in stdout.split("\n"):
-        line = Reg.convert_mbcs(line)
-        if '=' not in line:
-            continue
-        line = line.strip()
-        key, value = line.split('=', 1)
-        key = key.lower()
-        if key in interesting:
-            if value.endswith(os.pathsep):
-                value = value[:-1]
-            result[key] = removeDuplicates(value)
+        popen.stdin.close()
+        popen.stdout.close()
+        popen.stderr.close()
 
     if len(result) != len(interesting):
         raise ValueError(str(list(result.keys())))

From 7c48608dcc43fbbded053bda97ba12fbb835003d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 12 Nov 2010 22:25:23 +0000
Subject: [PATCH 3104/8469] And now for something completely different: Finish
 fixing #10252 again.

---
 msvc9compiler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 488524db91..e849e16d51 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -282,7 +282,6 @@ def query_vcvarsall(version, arch="x86"):
                 result[key] = removeDuplicates(value)
 
     finally:
-        popen.stdin.close()
         popen.stdout.close()
         popen.stderr.close()
 

From c393ee270dfd8a7b7f25324d7bf1a361b4850678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 12 Nov 2010 22:26:37 +0000
Subject: [PATCH 3105/8469] Merged revisions 86438 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86438 | eric.araujo | 2010-11-12 23:25:23 +0100 (ven., 12 nov. 2010) | 2 lines

  And now for something completely different: Finish fixing #10252 again.
........
---
 msvc9compiler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 488524db91..e849e16d51 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -282,7 +282,6 @@ def query_vcvarsall(version, arch="x86"):
                 result[key] = removeDuplicates(value)
 
     finally:
-        popen.stdin.close()
         popen.stdout.close()
         popen.stderr.close()
 

From ef556865368e00fb747ce7aae3d4f156688300c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 12 Nov 2010 22:27:28 +0000
Subject: [PATCH 3106/8469] Merged revisions 86438 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86438 | eric.araujo | 2010-11-12 23:25:23 +0100 (ven., 12 nov. 2010) | 2 lines

  And now for something completely different: Finish fixing #10252 again.
........
---
 msvc9compiler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 615d8b83a0..bf85ac75c7 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -292,7 +292,6 @@ def query_vcvarsall(version, arch="x86"):
                 result[key] = removeDuplicates(value)
 
     finally:
-        popen.stdin.close()
         popen.stdout.close()
         popen.stderr.close()
 

From bbcb611025969e9a4b8a987a7ce1528776740ae2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 13 Nov 2010 06:39:58 +0000
Subject: [PATCH 3107/8469] Bump to 3.2a4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9df61ab029..bae33b5530 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2a3"
+__version__ = "3.2a4"
 #--end constants--

From 65e43d3b792289e3c4025cf203f1f3f1a2949ca4 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Nov 2010 17:28:56 +0000
Subject: [PATCH 3108/8469] bump to 3.1.3rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6dca599fd6..9684a11c45 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.2"
+__version__ = "3.1.3rc1"
 #--end constants--

From 0f51e1c350bb195a7add16991c466fe9d59b9ced Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Nov 2010 17:33:04 +0000
Subject: [PATCH 3109/8469] 2.7.1rc1 bump

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2c69a1836a..f9f9792794 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.1a0"
+__version__ = "2.7.1rc1"
 #--end constants--

From df79f96e47490dedbcb676f77c426fad14df1c6f Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 20 Nov 2010 19:04:17 +0000
Subject: [PATCH 3110/8469] #9424: Replace deprecated assert* methods in the
 Python test suite.

---
 tests/test_archive_util.py    | 14 ++++----
 tests/test_bdist.py           |  4 +--
 tests/test_bdist_dumb.py      |  2 +-
 tests/test_build.py           | 14 ++++----
 tests/test_build_clib.py      | 10 +++---
 tests/test_build_ext.py       | 48 +++++++++++++--------------
 tests/test_check.py           | 14 ++++----
 tests/test_cmd.py             | 10 +++---
 tests/test_config.py          |  6 ++--
 tests/test_config_cmd.py      | 12 +++----
 tests/test_core.py            |  4 +--
 tests/test_cygwinccompiler.py | 32 +++++++++---------
 tests/test_dep_util.py        |  4 +--
 tests/test_dir_util.py        | 22 ++++++-------
 tests/test_dist.py            | 20 +++++------
 tests/test_extension.py       | 16 ++++-----
 tests/test_file_util.py       |  6 ++--
 tests/test_filelist.py        | 18 +++++-----
 tests/test_install.py         | 20 +++++------
 tests/test_install_data.py    |  8 ++---
 tests/test_install_headers.py |  4 +--
 tests/test_install_lib.py     |  8 ++---
 tests/test_log.py             |  4 +--
 tests/test_msvc9compiler.py   |  4 +--
 tests/test_register.py        | 14 ++++----
 tests/test_sdist.py           | 34 +++++++++----------
 tests/test_spawn.py           |  2 +-
 tests/test_sysconfig.py       | 18 +++++-----
 tests/test_text_file.py       |  2 +-
 tests/test_upload.py          | 12 +++----
 tests/test_util.py            | 62 +++++++++++++++++------------------
 tests/test_version.py         | 20 +++++------
 32 files changed, 233 insertions(+), 235 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 9e6264aa89..aff426521d 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -113,7 +113,7 @@ def test_tarfile_vs_tar(self):
 
         self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
-        self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
+        self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -153,7 +153,7 @@ def test_compress_deprecated(self):
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
         self.assertTrue(os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
         # same test with dry_run
         os.remove(tarball)
@@ -167,7 +167,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         self.assertTrue(not os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
@@ -184,9 +184,9 @@ def test_make_zipfile(self):
         tarball = base_name + '.zip'
 
     def test_check_archive_formats(self):
-        self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
-                          'xxx')
-        self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
+        self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
+                         'xxx')
+        self.assertEqual(check_archive_formats(['gztar', 'zip']), None)
 
     def test_make_archive(self):
         tmpdir = self.mkdtemp()
@@ -203,7 +203,7 @@ def _breaks(*args, **kw):
                 make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
             except:
                 pass
-            self.assertEquals(os.getcwd(), current_dir)
+            self.assertEqual(os.getcwd(), current_dir)
         finally:
             del ARCHIVE_FORMATS['xxx']
 
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index bf56e842b7..94d40cc25b 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -24,7 +24,7 @@ def test_formats(self):
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
-        self.assertEquals(cmd.formats, ['msi'])
+        self.assertEqual(cmd.formats, ['msi'])
 
         # what format bdist offers ?
         # XXX an explicit list in bdist is
@@ -35,7 +35,7 @@ def test_formats(self):
         formats.sort()
         founded = list(cmd.format_command.keys())
         founded.sort()
-        self.assertEquals(founded, formats)
+        self.assertEqual(founded, formats)
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 7d9d0aa834..cc37fef8b0 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -69,7 +69,7 @@ def test_simple_built(self):
             base = base.replace(':', '-')
 
         wanted = ['%s.zip' % base]
-        self.assertEquals(dist_created, wanted)
+        self.assertEqual(dist_created, wanted)
 
         # now let's check what we have in the zip file
         # XXX to be done
diff --git a/tests/test_build.py b/tests/test_build.py
index 9f0e0ad23c..3391f36d4b 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -18,11 +18,11 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         # if not specified, plat_name gets the current platform
-        self.assertEquals(cmd.plat_name, get_platform())
+        self.assertEqual(cmd.plat_name, get_platform())
 
         # build_purelib is build + lib
         wanted = os.path.join(cmd.build_base, 'lib')
-        self.assertEquals(cmd.build_purelib, wanted)
+        self.assertEqual(cmd.build_purelib, wanted)
 
         # build_platlib is 'build/lib.platform-x.x[-pydebug]'
         # examples:
@@ -32,21 +32,21 @@ def test_finalize_options(self):
             self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
             plat_spec += '-pydebug'
         wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
-        self.assertEquals(cmd.build_platlib, wanted)
+        self.assertEqual(cmd.build_platlib, wanted)
 
         # by default, build_lib = build_purelib
-        self.assertEquals(cmd.build_lib, cmd.build_purelib)
+        self.assertEqual(cmd.build_lib, cmd.build_purelib)
 
         # build_temp is build/temp.<plat>
         wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
-        self.assertEquals(cmd.build_temp, wanted)
+        self.assertEqual(cmd.build_temp, wanted)
 
         # build_scripts is build/scripts-x.x
         wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
-        self.assertEquals(cmd.build_scripts, wanted)
+        self.assertEqual(cmd.build_scripts, wanted)
 
         # executable is os.path.normpath(sys.executable)
-        self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
+        self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index e59b8f9a19..69bd2bf624 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -57,14 +57,14 @@ def test_get_source_files(self):
         self.assertRaises(DistutilsSetupError, cmd.get_source_files)
 
         cmd.libraries = [('name', {'sources': ['a', 'b']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')}),
                          ('name2', {'sources': ['c', 'd']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
 
     def test_build_libraries(self):
 
@@ -93,11 +93,11 @@ def test_finalize_options(self):
 
         cmd.include_dirs = 'one-dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, ['one-dir'])
+        self.assertEqual(cmd.include_dirs, ['one-dir'])
 
         cmd.include_dirs = None
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, [])
+        self.assertEqual(cmd.include_dirs, [])
 
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 203cbc98fe..dcba75f703 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -96,11 +96,11 @@ def test_build_ext(self):
         for attr in ('error', 'foo', 'new', 'roj'):
             self.assertTrue(hasattr(xx, attr))
 
-        self.assertEquals(xx.foo(2, 5), 7)
-        self.assertEquals(xx.foo(13,15), 28)
-        self.assertEquals(xx.new().demo(), None)
+        self.assertEqual(xx.foo(2, 5), 7)
+        self.assertEqual(xx.foo(13,15), 28)
+        self.assertEqual(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
-        self.assertEquals(xx.__doc__, doc)
+        self.assertEqual(xx.__doc__, doc)
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 
@@ -206,7 +206,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.libraries = 'my_lib'
         cmd.finalize_options()
-        self.assertEquals(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
@@ -220,7 +220,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.rpath = os.pathsep.join(['one', 'two'])
         cmd.finalize_options()
-        self.assertEquals(cmd.rpath, ['one', 'two'])
+        self.assertEqual(cmd.rpath, ['one', 'two'])
 
         # XXX more tests to perform for win32
 
@@ -229,25 +229,25 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.define = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+        self.assertEqual(cmd.define, [('one', '1'), ('two', '1')])
 
         # make sure undef is turned into a list of
         # strings if they are ','-separated strings
         cmd = build_ext(dist)
         cmd.undef = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.undef, ['one', 'two'])
+        self.assertEqual(cmd.undef, ['one', 'two'])
 
         # make sure swig_opts is turned into a list
         cmd = build_ext(dist)
         cmd.swig_opts = None
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, [])
+        self.assertEqual(cmd.swig_opts, [])
 
         cmd = build_ext(dist)
         cmd.swig_opts = '1 2'
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, ['1', '2'])
+        self.assertEqual(cmd.swig_opts, ['1', '2'])
 
     def test_check_extensions_list(self):
         dist = Distribution()
@@ -284,7 +284,7 @@ def test_check_extensions_list(self):
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
-        self.assertEquals(ext.libraries, 'foo')
+        self.assertEqual(ext.libraries, 'foo')
         self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
@@ -294,15 +294,15 @@ def test_check_extensions_list(self):
 
         exts[0][1]['macros'] = [('1', '2'), ('3',)]
         cmd.check_extensions_list(exts)
-        self.assertEquals(exts[0].undef_macros, ['3'])
-        self.assertEquals(exts[0].define_macros, [('1', '2')])
+        self.assertEqual(exts[0].undef_macros, ['3'])
+        self.assertEqual(exts[0].define_macros, [('1', '2')])
 
     def test_get_source_files(self):
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertEquals(cmd.get_source_files(), ['xxx'])
+        self.assertEqual(cmd.get_source_files(), ['xxx'])
 
     def test_compiler_option(self):
         # cmd.compiler is an option and
@@ -313,7 +313,7 @@ def test_compiler_option(self):
         cmd.compiler = 'unix'
         cmd.ensure_finalized()
         cmd.run()
-        self.assertEquals(cmd.compiler, 'unix')
+        self.assertEqual(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
@@ -325,7 +325,7 @@ def test_get_outputs(self):
         cmd = build_ext(dist)
         self._fixup_command(cmd)
         cmd.ensure_finalized()
-        self.assertEquals(len(cmd.get_outputs()), 1)
+        self.assertEqual(len(cmd.get_outputs()), 1)
 
         if os.name == "nt":
             cmd.debug = sys.executable.endswith("_d.exe")
@@ -348,7 +348,7 @@ def test_get_outputs(self):
         so_ext = sysconfig.get_config_var('SO')
         self.assertTrue(so_file.endswith(so_ext))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, other_tmp_dir)
+        self.assertEqual(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.compiler = None
@@ -357,7 +357,7 @@ def test_get_outputs(self):
         self.assertTrue(os.path.exists(so_file))
         self.assertTrue(so_file.endswith(so_ext))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, cmd.build_lib)
+        self.assertEqual(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
         build_py = cmd.get_finalized_command('build_py')
@@ -365,7 +365,7 @@ def test_get_outputs(self):
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        self.assertEquals(path, cmd.build_lib)
+        self.assertEqual(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -379,7 +379,7 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, 'bar')
+        self.assertEqual(lastdir, 'bar')
 
     def test_ext_fullpath(self):
         ext = sysconfig.get_config_vars()['SO']
@@ -395,14 +395,14 @@ def test_ext_fullpath(self):
         curdir = os.getcwd()
         wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
         wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap not inplace
         build_py = cmd.get_finalized_command('build_py')
@@ -411,13 +411,13 @@ def test_ext_fullpath(self):
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
                               'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
 def test_suite():
     src = _get_source_filename()
diff --git a/tests/test_check.py b/tests/test_check.py
index 6ad2fe3920..229ae25c6d 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -27,7 +27,7 @@ def test_check_metadata(self):
         # by default, check is checking the metadata
         # should have some warnings
         cmd = self._run()
-        self.assertEquals(cmd._warnings, 2)
+        self.assertEqual(cmd._warnings, 2)
 
         # now let's add the required fields
         # and run it again, to make sure we don't get
@@ -36,7 +36,7 @@ def test_check_metadata(self):
                     'author_email': 'xxx',
                     'name': 'xxx', 'version': 'xxx'}
         cmd = self._run(metadata)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
         # now with the strict mode, we should
         # get an error if there are missing metadata
@@ -44,7 +44,7 @@ def test_check_metadata(self):
 
         # and of course, no error when all metadata are present
         cmd = self._run(metadata, strict=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_document(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -55,12 +55,12 @@ def test_check_document(self):
         # let's see if it detects broken rest
         broken_rest = 'title\n===\n\ntest'
         msgs = cmd._check_rst_data(broken_rest)
-        self.assertEquals(len(msgs), 1)
+        self.assertEqual(len(msgs), 1)
 
         # and non-broken rest
         rest = 'title\n=====\n\ntest'
         msgs = cmd._check_rst_data(rest)
-        self.assertEquals(len(msgs), 0)
+        self.assertEqual(len(msgs), 0)
 
     def test_check_restructuredtext(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -70,7 +70,7 @@ def test_check_restructuredtext(self):
         pkg_info, dist = self.create_dist(long_description=broken_rest)
         cmd = check(dist)
         cmd.check_restructuredtext()
-        self.assertEquals(cmd._warnings, 1)
+        self.assertEqual(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
         metadata = {'url': 'xxx', 'author': 'xxx',
@@ -83,7 +83,7 @@ def test_check_restructuredtext(self):
         # and non-broken rest
         metadata['long_description'] = 'title\n=====\n\ntest'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_all(self):
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 969f82ba0f..195045cc7b 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -44,7 +44,7 @@ def test_make_file(self):
 
         # making sure execute gets called properly
         def _execute(func, args, exec_msg, level):
-            self.assertEquals(exec_msg, 'generating out from in')
+            self.assertEqual(exec_msg, 'generating out from in')
         cmd.force = True
         cmd.execute = _execute
         cmd.make_file(infiles='in', outfile='out', func='func', args=())
@@ -63,7 +63,7 @@ def _announce(msg, level):
 
         wanted = ["command options for 'MyCmd':", '  option1 = 1',
                   '  option2 = 1']
-        self.assertEquals(msgs, wanted)
+        self.assertEqual(msgs, wanted)
 
     def test_ensure_string(self):
         cmd = self.cmd
@@ -81,7 +81,7 @@ def test_ensure_string_list(self):
         cmd = self.cmd
         cmd.option1 = 'ok,dok'
         cmd.ensure_string_list('option1')
-        self.assertEquals(cmd.option1, ['ok', 'dok'])
+        self.assertEqual(cmd.option1, ['ok', 'dok'])
 
         cmd.option2 = ['xxx', 'www']
         cmd.ensure_string_list('option2')
@@ -109,14 +109,14 @@ def test_debug_print(self):
         with captured_stdout() as stdout:
             cmd.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 cmd.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 05a35da903..525bee9416 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -89,7 +89,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server1'), ('username', 'me')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
         # old format
         self.write_file(self.rc, PYPIRC_OLD)
@@ -98,7 +98,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server-login'), ('username', 'tarek')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
@@ -109,7 +109,7 @@ def test_server_empty_registration(self):
         f = open(rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED)
+            self.assertEqual(content, WANTED)
         finally:
             f.close()
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index c224a5c36d..4f7ebdd9fc 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -35,7 +35,7 @@ def test_dump_file(self):
             f.close()
 
         dump_file(this_file, 'I am the header')
-        self.assertEquals(len(self._logs), numlines+1)
+        self.assertEqual(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
         if sys.platform == 'win32':
@@ -45,10 +45,10 @@ def test_search_cpp(self):
 
         # simple pattern searches
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
-        self.assertEquals(match, 0)
+        self.assertEqual(match, 0)
 
         match = cmd.search_cpp(pattern='_configtest', body='// xxx')
-        self.assertEquals(match, 1)
+        self.assertEqual(match, 1)
 
     def test_finalize_options(self):
         # finalize_options does a bit of transformation
@@ -60,9 +60,9 @@ def test_finalize_options(self):
         cmd.library_dirs = 'three%sfour' % os.pathsep
         cmd.ensure_finalized()
 
-        self.assertEquals(cmd.include_dirs, ['one', 'two'])
-        self.assertEquals(cmd.libraries, ['one'])
-        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+        self.assertEqual(cmd.include_dirs, ['one', 'two'])
+        self.assertEqual(cmd.libraries, ['one'])
+        self.assertEqual(cmd.library_dirs, ['three', 'four'])
 
     def test_clean(self):
         # _clean removes files
diff --git a/tests/test_core.py b/tests/test_core.py
index 47fae245e7..41321f7db4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -89,7 +89,7 @@ def test_debug_mode(self):
         with captured_stdout() as stdout:
             distutils.core.setup(name='bar')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), 'bar\n')
+        self.assertEqual(stdout.read(), 'bar\n')
 
         distutils.core.DEBUG = True
         try:
@@ -99,7 +99,7 @@ def test_debug_mode(self):
             distutils.core.DEBUG = False
         stdout.seek(0)
         wanted = "options (after parsing config files):\n"
-        self.assertEquals(stdout.readlines()[0], wanted)
+        self.assertEqual(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index e57bab269a..856921679d 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -66,82 +66,82 @@ def test_check_config_h(self):
         sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
                        '4.0.1 (Apple Computer, Inc. build 5370)]')
 
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
         # then it tries to see if it can find "__GNUC__" in pyconfig.h
         sys.version = 'something without the *CC word'
 
         # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
-        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
+        self.assertEqual(check_config_h()[0], CONFIG_H_UNCERTAIN)
 
         # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
         self.write_file(self.python_h, 'xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_NOTOK)
 
         # and CONFIG_H_OK if __GNUC__ is found
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
     def test_get_versions(self):
 
         # get_versions calls distutils.spawn.find_executable on
         # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_versions(), (None, None, None))
+        self.assertEqual(get_versions(), (None, None, None))
 
         # Let's fake we have 'gcc' and it returns '3.4.5'
         self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
         res = get_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
+        self.assertEqual(str(res[0]), '3.4.5')
 
         # and let's see what happens when the version
         # doesn't match the regular expression
         # (\d+\.\d+(\.\d+)*)
         self._exes['gcc'] = b'very strange output'
         res = get_versions()
-        self.assertEquals(res[0], None)
+        self.assertEqual(res[0], None)
 
         # same thing for ld
         self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
         res = get_versions()
-        self.assertEquals(str(res[1]), '2.17.50')
+        self.assertEqual(str(res[1]), '2.17.50')
         self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
         res = get_versions()
-        self.assertEquals(res[1], None)
+        self.assertEqual(res[1], None)
 
         # and dllwrap
         self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
         res = get_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
+        self.assertEqual(str(res[2]), '2.17.50')
         self._exes['dllwrap'] = b'Cheese Wrap'
         res = get_versions()
-        self.assertEquals(res[2], None)
+        self.assertEqual(res[2], None)
 
     def test_get_msvcr(self):
 
         # none
         sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
                         '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
-        self.assertEquals(get_msvcr(), None)
+        self.assertEqual(get_msvcr(), None)
 
         # MSVC 7.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1300 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr70'])
+        self.assertEqual(get_msvcr(), ['msvcr70'])
 
         # MSVC 7.1
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1310 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr71'])
+        self.assertEqual(get_msvcr(), ['msvcr71'])
 
         # VS2005 / MSVC 8.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1400 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr80'])
+        self.assertEqual(get_msvcr(), ['msvcr80'])
 
         # VS2008 / MSVC 9.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1500 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr90'])
+        self.assertEqual(get_msvcr(), ['msvcr90'])
 
         # unknown
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index 390ed9b602..3e1c366892 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -43,8 +43,8 @@ def test_newer_pairwise(self):
         self.write_file(two)
         self.write_file(four)
 
-        self.assertEquals(newer_pairwise([one, two], [three, four]),
-                          ([one],[three]))
+        self.assertEqual(newer_pairwise([one, two], [three, four]),
+                         ([one],[three]))
 
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 7356c766e6..ce74589dde 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -38,18 +38,18 @@ def test_mkpath_remove_tree_verbosity(self):
 
         mkpath(self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         remove_tree(self.root_target, verbose=0)
 
         mkpath(self.target, verbose=1)
         wanted = ['creating %s' % self.root_target,
                   'creating %s' % self.target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         self._logs = []
 
         remove_tree(self.root_target, verbose=1)
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
@@ -67,12 +67,12 @@ def test_mkpath_with_custom_mode(self):
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
         remove_tree(self.root_target, verbose=0)
 
         wanted = ['creating %s' % self.root_target]
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
 
@@ -82,7 +82,7 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
 
         copy_tree(self.target, self.target2, verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
 
         remove_tree(self.root_target, verbose=0)
 
@@ -96,18 +96,18 @@ def test_copy_tree_verbosity(self):
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
     def test_ensure_relative(self):
         if os.sep == '/':
-            self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
-            self.assertEquals(ensure_relative('some/path'), 'some/path')
+            self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
+            self.assertEqual(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
-            self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+            self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
+            self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index a8eb8b1d5a..a20d6c8ffc 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -124,7 +124,7 @@ def _warn(msg):
         finally:
             warnings.warn = old_warn
 
-        self.assertEquals(len(warns), 0)
+        self.assertEqual(len(warns), 0)
 
     def test_finalize_options(self):
 
@@ -135,20 +135,20 @@ def test_finalize_options(self):
         dist.finalize_options()
 
         # finalize_option splits platforms and keywords
-        self.assertEquals(dist.metadata.platforms, ['one', 'two'])
-        self.assertEquals(dist.metadata.keywords, ['one', 'two'])
+        self.assertEqual(dist.metadata.platforms, ['one', 'two'])
+        self.assertEqual(dist.metadata.keywords, ['one', 'two'])
 
     def test_get_command_packages(self):
         dist = Distribution()
-        self.assertEquals(dist.command_packages, None)
+        self.assertEqual(dist.command_packages, None)
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command'])
-        self.assertEquals(dist.command_packages,
-                          ['distutils.command'])
+        self.assertEqual(cmds, ['distutils.command'])
+        self.assertEqual(dist.command_packages,
+                         ['distutils.command'])
 
         dist.command_packages = 'one,two'
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
+        self.assertEqual(cmds, ['distutils.command', 'one', 'two'])
 
 
     def test_announce(self):
@@ -287,8 +287,8 @@ def test_custom_pydistutils(self):
     def test_fix_help_options(self):
         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
         fancy_options = fix_help_options(help_tuples)
-        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
-        self.assertEquals(fancy_options[1], (1, 2, 3))
+        self.assertEqual(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEqual(fancy_options[1], (1, 2, 3))
 
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
diff --git a/tests/test_extension.py b/tests/test_extension.py
index c9c8965706..e35f2738b6 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -28,38 +28,38 @@ def test_read_setup_file(self):
                   'rect', 'rwobject', 'scrap', 'surface', 'surflock',
                   'time', 'transform']
 
-        self.assertEquals(names, wanted)
+        self.assertEqual(names, wanted)
 
     def test_extension_init(self):
         # the first argument, which is the name, must be a string
         self.assertRaises(AssertionError, Extension, 1, [])
         ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
+        self.assertEqual(ext.name, 'name')
 
         # the second argument, which is the list of files, must
         # be a list of strings
         self.assertRaises(AssertionError, Extension, 'name', 'file')
         self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
         ext = Extension('name', ['file1', 'file2'])
-        self.assertEquals(ext.sources, ['file1', 'file2'])
+        self.assertEqual(ext.sources, ['file1', 'file2'])
 
         # others arguments have defaults
         for attr in ('include_dirs', 'define_macros', 'undef_macros',
                      'library_dirs', 'libraries', 'runtime_library_dirs',
                      'extra_objects', 'extra_compile_args', 'extra_link_args',
                      'export_symbols', 'swig_opts', 'depends'):
-            self.assertEquals(getattr(ext, attr), [])
+            self.assertEqual(getattr(ext, attr), [])
 
-        self.assertEquals(ext.language, None)
-        self.assertEquals(ext.optional, None)
+        self.assertEqual(ext.language, None)
+        self.assertEqual(ext.optional, None)
 
         # if there are unknown keyword options, warn about them
         with check_warnings() as w:
             warnings.simplefilter('always')
             ext = Extension('name', ['file1', 'file2'], chic=True)
 
-        self.assertEquals(len(w.warnings), 1)
-        self.assertEquals(str(w.warnings[0].message),
+        self.assertEqual(len(w.warnings), 1)
+        self.assertEqual(str(w.warnings[0].message),
                           "Unknown Extension options: 'chic'")
 
 def test_suite():
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index be743f3436..3c3e3dcb3b 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -39,14 +39,14 @@ def test_move_file_verbosity(self):
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
 
         move_file(self.source, self.target, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
@@ -56,7 +56,7 @@ def test_move_file_verbosity(self):
         os.mkdir(self.target_dir)
         move_file(self.source, self.target_dir, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
 
 def test_suite():
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 6312a29485..c7e5201b17 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -9,29 +9,29 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
     def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
             file_list.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 file_list.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_install.py b/tests/test_install.py
index 22e79b8909..a76e3e7a3c 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -123,23 +123,23 @@ def test_handle_extra_path(self):
 
         # two elements
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
-        self.assertEquals(cmd.extra_dirs, 'dirs')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path', 'dirs'])
+        self.assertEqual(cmd.extra_dirs, 'dirs')
+        self.assertEqual(cmd.path_file, 'path')
 
         # one element
         cmd.extra_path = ['path']
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path'])
-        self.assertEquals(cmd.extra_dirs, 'path')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path'])
+        self.assertEqual(cmd.extra_dirs, 'path')
+        self.assertEqual(cmd.path_file, 'path')
 
         # none
         dist.extra_path = cmd.extra_path = None
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, None)
-        self.assertEquals(cmd.extra_dirs, '')
-        self.assertEquals(cmd.path_file, None)
+        self.assertEqual(cmd.extra_path, None)
+        self.assertEqual(cmd.extra_dirs, '')
+        self.assertEqual(cmd.path_file, None)
 
         # three elements (no way !)
         cmd.extra_path = 'path,dirs,again'
@@ -184,7 +184,7 @@ def test_record(self):
         # line (the egg info file)
         f = open(cmd.record)
         try:
-            self.assertEquals(len(f.readlines()), 1)
+            self.assertEqual(len(f.readlines()), 1)
         finally:
             f.close()
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 6b3b4c82ce..4d8c00acb9 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -28,14 +28,14 @@ def test_simple_run(self):
         self.write_file(two, 'xxx')
 
         cmd.data_files = [one, (inst2, [two])]
-        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+        self.assertEqual(cmd.get_inputs(), [one, (inst2, [two])])
 
         # let's run the command
         cmd.ensure_finalized()
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
@@ -48,7 +48,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
@@ -66,7 +66,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assertEqual(len(cmd.get_outputs()), 4)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index dc74c58d6c..d953157bb7 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -24,7 +24,7 @@ def test_simple_run(self):
 
         pkg_dir, dist = self.create_dist(headers=headers)
         cmd = install_headers(dist)
-        self.assertEquals(cmd.get_inputs(), headers)
+        self.assertEqual(cmd.get_inputs(), headers)
 
         # let's run the command
         cmd.install_dir = os.path.join(pkg_dir, 'inst')
@@ -32,7 +32,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the results
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
 
 def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 790d4ce300..fddaabe111 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -19,8 +19,8 @@ def test_finalize_options(self):
         cmd = install_lib(dist)
 
         cmd.finalize_options()
-        self.assertEquals(cmd.compile, 1)
-        self.assertEquals(cmd.optimize, 0)
+        self.assertEqual(cmd.compile, 1)
+        self.assertEqual(cmd.optimize, 0)
 
         # optimize must be 0, 1, or 2
         cmd.optimize = 'foo'
@@ -30,7 +30,7 @@ def test_finalize_options(self):
 
         cmd.optimize = '2'
         cmd.finalize_options()
-        self.assertEquals(cmd.optimize, 2)
+        self.assertEqual(cmd.optimize, 2)
 
     @unittest.skipUnless(not sys.dont_write_bytecode,
                          'byte-compile not supported')
@@ -77,7 +77,7 @@ def test_get_inputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_input should return 2 elements
-        self.assertEquals(len(cmd.get_inputs()), 2)
+        self.assertEqual(len(cmd.get_inputs()), 2)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_log.py b/tests/test_log.py
index 5f87076bd7..ce66ee51e7 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -23,9 +23,9 @@ def test_non_ascii(self):
                 log.debug("debug:\xe9")
                 log.fatal("fatal:\xe9")
                 stdout.seek(0)
-                self.assertEquals(stdout.read().rstrip(), "debug:\\xe9")
+                self.assertEqual(stdout.read().rstrip(), "debug:\\xe9")
                 stderr.seek(0)
-                self.assertEquals(stderr.read().rstrip(), "fatal:\\xe9")
+                self.assertEqual(stderr.read().rstrip(), "fatal:\\xe9")
         finally:
             sys.stdout = old_stdout
             sys.stderr = old_stderr
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 45bae77a6c..a0d62efcfd 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -104,7 +104,7 @@ def test_reg_class(self):
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
-        self.assertEquals(keys, None)
+        self.assertEqual(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
@@ -131,7 +131,7 @@ def test_remove_visual_c_ref(self):
             f.close()
 
         # makes sure the manifest was properly cleaned
-        self.assertEquals(content, _CLEANED_MANIFEST)
+        self.assertEqual(content, _CLEANED_MANIFEST)
 
 
 def test_suite():
diff --git a/tests/test_register.py b/tests/test_register.py
index 9336ac8604..c712f56a78 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -121,7 +121,7 @@ def test_create_pypirc(self):
         f = open(self.rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED_PYPIRC)
+            self.assertEqual(content, WANTED_PYPIRC)
         finally:
             f.close()
 
@@ -141,8 +141,8 @@ def _no_way(prompt=''):
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
-        self.assertEquals(req1['Content-length'], '1374')
-        self.assertEquals(req2['Content-length'], '1374')
+        self.assertEqual(req1['Content-length'], '1374')
+        self.assertEqual(req2['Content-length'], '1374')
         self.assertTrue((b'xxx') in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
@@ -155,7 +155,7 @@ def test_password_not_in_file(self):
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(cmd.distribution.password, 'password')
+        self.assertEqual(cmd.distribution.password, 'password')
 
     def test_registering(self):
         # this test runs choice 2
@@ -172,7 +172,7 @@ def test_registering(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '608')
+        self.assertEqual(headers['Content-length'], '608')
         self.assertTrue((b'tarek') in req.data)
 
     def test_password_reset(self):
@@ -190,7 +190,7 @@ def test_password_reset(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '290')
+        self.assertEqual(headers['Content-length'], '290')
         self.assertTrue((b'tarek') in req.data)
 
     def test_strict(self):
@@ -253,7 +253,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 73962d34f2..655e50dcfc 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -108,7 +108,7 @@ def test_prune_file_list(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -117,7 +117,7 @@ def test_prune_file_list(self):
             zip_file.close()
 
         # making sure everything has been pruned correctly
-        self.assertEquals(len(content), 4)
+        self.assertEqual(len(content), 4)
 
     def test_make_distribution(self):
 
@@ -138,8 +138,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -152,8 +151,7 @@ def test_make_distribution(self):
 
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
     def test_add_defaults(self):
 
@@ -201,7 +199,7 @@ def test_add_defaults(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -210,13 +208,13 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 11)
+        self.assertEqual(len(content), 11)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
 
@@ -229,7 +227,7 @@ def test_metadata_check_option(self):
         cmd.ensure_finalized()
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 2)
+        self.assertEqual(len(warnings), 2)
 
         # trying with a complete set of metadata
         self.clear_logs()
@@ -238,7 +236,7 @@ def test_metadata_check_option(self):
         cmd.metadata_check = 0
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 0)
+        self.assertEqual(len(warnings), 0)
 
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
@@ -246,7 +244,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
     def test_show_formats(self):
         with captured_stdout() as stdout:
@@ -256,7 +254,7 @@ def test_show_formats(self):
         num_formats = len(ARCHIVE_FORMATS.keys())
         output = [line for line in stdout.getvalue().split('\n')
                   if line.strip().startswith('--formats=')]
-        self.assertEquals(len(output), num_formats)
+        self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
 
@@ -264,9 +262,9 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         # default options set by finalize
-        self.assertEquals(cmd.manifest, 'MANIFEST')
-        self.assertEquals(cmd.template, 'MANIFEST.in')
-        self.assertEquals(cmd.dist_dir, 'dist')
+        self.assertEqual(cmd.manifest, 'MANIFEST')
+        self.assertEqual(cmd.template, 'MANIFEST.in')
+        self.assertEqual(cmd.dist_dir, 'dist')
 
         # formats has to be a string splitable on (' ', ',') or
         # a stringlist
@@ -297,7 +295,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 5)
+        self.assertEqual(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -317,7 +315,7 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 6)
+        self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
     def test_manifest_marker(self):
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 5b91aa5a11..6c7eb20c47 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -20,7 +20,7 @@ def test_nt_quote_args(self):
                                (['nochange', 'nospace'],
                                 ['nochange', 'nospace'])):
             res = _nt_quote_args(args)
-            self.assertEquals(res, wanted)
+            self.assertEqual(res, wanted)
 
 
     @unittest.skipUnless(os.name in ('nt', 'posix'),
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 215dc82df0..336c6a5b95 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -70,7 +70,7 @@ def set_executables(self, **kw):
 
         comp = compiler()
         sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+        self.assertEqual(comp.exes['archiver'], 'my_ar -arflags')
 
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
@@ -81,8 +81,8 @@ def test_parse_makefile_base(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
-                              'OTHER': 'foo'})
+        self.assertEqual(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
+                             'OTHER': 'foo'})
 
     def test_parse_makefile_literal_dollar(self):
         self.makefile = TESTFN
@@ -93,16 +93,16 @@ def test_parse_makefile_literal_dollar(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
-                              'OTHER': 'foo'})
+        self.assertEqual(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                             'OTHER': 'foo'})
 
 
     def test_sysconfig_module(self):
         import sysconfig as global_sysconfig
-        self.assertEquals(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
-        self.assertEquals(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
-        self.assertEquals(global_sysconfig.get_config_var('LDSHARED'),sysconfig.get_config_var('LDSHARED'))
-        self.assertEquals(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
+        self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
+        self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),sysconfig.get_config_var('LDSHARED'))
+        self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
 
 
 
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 953cb8ea08..7e76240a9a 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -49,7 +49,7 @@ def test_class(self):
 
         def test_input(count, description, file, expected_result):
             result = file.readlines()
-            self.assertEquals(result, expected_result)
+            self.assertEqual(result, expected_result)
 
         tmpdir = self.mkdtemp()
         filename = os.path.join(tmpdir, "test.txt")
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 4661ed3212..4c6464a32e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -89,7 +89,7 @@ def test_finalize_options(self):
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
                              ('repository', 'http://pypi.python.org/pypi')):
-            self.assertEquals(getattr(cmd, attr), waited)
+            self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):
         # file with no password
@@ -99,14 +99,14 @@ def test_saved_password(self):
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, None)
+        self.assertEqual(cmd.password, None)
 
         # make sure we get it as well, if another command
         # initialized it at the dist level
         dist.password = 'xxx'
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, 'xxx')
+        self.assertEqual(cmd.password, 'xxx')
 
     def test_upload(self):
         tmp = self.mkdtemp()
@@ -124,12 +124,12 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.conn.headers)
-        self.assertEquals(headers['Content-length'], '2087')
+        self.assertEqual(headers['Content-length'], '2087')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertFalse('\n' in headers['Authorization'])
 
-        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
-        self.assert_((b'xxx') in self.conn.body)
+        self.assertEqual(self.conn.requests, [('POST', '/pypi')])
+        self.assertTrue((b'xxx') in self.conn.body)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 3b7159d72f..8ff5ae2085 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -67,21 +67,21 @@ def test_get_platform(self):
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Intel)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win32')
+        self.assertEqual(get_platform(), 'win32')
 
         # windows XP, amd64
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Amd64)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-amd64')
+        self.assertEqual(get_platform(), 'win-amd64')
 
         # windows XP, itanium
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Itanium)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-ia64')
+        self.assertEqual(get_platform(), 'win-ia64')
 
         # macbook
         os.name = 'posix'
@@ -100,7 +100,7 @@ def test_get_platform(self):
         cursize = sys.maxsize
         sys.maxsize = (2 ** 31)-1
         try:
-            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+            self.assertEqual(get_platform(), 'macosx-10.3-i386')
         finally:
             sys.maxsize = cursize
 
@@ -111,33 +111,33 @@ def test_get_platform(self):
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+        self.assertEqual(get_platform(), 'macosx-10.4-intel')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat3')
 
         get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+        self.assertEqual(get_platform(), 'macosx-10.4-universal')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat64')
 
         for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
             get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
@@ -145,7 +145,7 @@ def test_get_platform(self):
                                            '-fno-strict-aliasing -fno-common '
                                            '-dynamic -DNDEBUG -g -O3'%(arch,))
 
-            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+            self.assertEqual(get_platform(), 'macosx-10.4-%s'%(arch,))
 
         # linux debian sarge
         os.name = 'posix'
@@ -155,7 +155,7 @@ def test_get_platform(self):
         self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
                     '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
 
-        self.assertEquals(get_platform(), 'linux-i686')
+        self.assertEqual(get_platform(), 'linux-i686')
 
         # XXX more platforms to tests here
 
@@ -166,8 +166,8 @@ def _join(path):
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(convert_path('/home/to/my/stuff'),
-                          '/home/to/my/stuff')
+        self.assertEqual(convert_path('/home/to/my/stuff'),
+                         '/home/to/my/stuff')
 
         # win
         os.sep = '\\'
@@ -178,10 +178,10 @@ def _join(*path):
         self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
         self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
 
-        self.assertEquals(convert_path('home/to/my/stuff'),
-                          'home\\to\\my\\stuff')
-        self.assertEquals(convert_path('.'),
-                          os.curdir)
+        self.assertEqual(convert_path('home/to/my/stuff'),
+                         'home\\to\\my\\stuff')
+        self.assertEqual(convert_path('.'),
+                         os.curdir)
 
     def test_change_root(self):
         # linux/mac
@@ -193,10 +193,10 @@ def _join(*path):
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('/root', '/old/its/here'),
-                          '/root/old/its/here')
-        self.assertEquals(change_root('/root', 'its/here'),
-                          '/root/its/here')
+        self.assertEqual(change_root('/root', '/old/its/here'),
+                         '/root/old/its/here')
+        self.assertEqual(change_root('/root', 'its/here'),
+                         '/root/its/here')
 
         # windows
         os.name = 'nt'
@@ -212,10 +212,10 @@ def _join(*path):
             return '\\'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
-                          'c:\\root\\old\\its\\here')
-        self.assertEquals(change_root('c:\\root', 'its\\here'),
-                          'c:\\root\\its\\here')
+        self.assertEqual(change_root('c:\\root', 'c:\\old\\its\\here'),
+                         'c:\\root\\old\\its\\here')
+        self.assertEqual(change_root('c:\\root', 'its\\here'),
+                         'c:\\root\\its\\here')
 
         # BugsBunny os (it's a great os)
         os.name = 'BugsBunny'
@@ -233,16 +233,16 @@ def test_check_environ(self):
         if os.name == 'posix':  # this test won't run on windows
             check_environ()
             import pwd
-            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
+            self.assertEqual(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(os.environ['PLAT'], get_platform())
-        self.assertEquals(util._environ_checked, 1)
+        self.assertEqual(os.environ['PLAT'], get_platform())
+        self.assertEqual(util._environ_checked, 1)
 
     def test_split_quoted(self):
-        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
-                          ['one', 'two', 'three', 'four'])
+        self.assertEqual(split_quoted('""one"" "two" \'three\' \\four'),
+                         ['one', 'two', 'three', 'four'])
 
     def test_strtobool(self):
         yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
@@ -259,7 +259,7 @@ def test_rfc822_escape(self):
         res = rfc822_escape(header)
         wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
                   'header%(8s)s') % {'8s': '\n'+8*' '}
-        self.assertEquals(res, wanted)
+        self.assertEqual(res, wanted)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile raise a DistutilsError
diff --git a/tests/test_version.py b/tests/test_version.py
index ff40f6b45c..15f14c7de3 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -8,12 +8,12 @@ class VersionTestCase(unittest.TestCase):
 
     def test_prerelease(self):
         version = StrictVersion('1.2.3a1')
-        self.assertEquals(version.version, (1, 2, 3))
-        self.assertEquals(version.prerelease, ('a', 1))
-        self.assertEquals(str(version), '1.2.3a1')
+        self.assertEqual(version.version, (1, 2, 3))
+        self.assertEqual(version.prerelease, ('a', 1))
+        self.assertEqual(str(version), '1.2.3a1')
 
         version = StrictVersion('1.2.0')
-        self.assertEquals(str(version), '1.2')
+        self.assertEqual(str(version), '1.2')
 
     def test_cmp_strict(self):
         versions = (('1.5.1', '1.5.2b2', -1),
@@ -42,9 +42,9 @@ def test_cmp_strict(self):
                     raise AssertionError(("cmp(%s, %s) "
                                           "shouldn't raise ValueError")
                                             % (v1, v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 
     def test_cmp(self):
@@ -60,9 +60,9 @@ def test_cmp(self):
 
         for v1, v2, wanted in versions:
             res = LooseVersion(v1)._cmp(LooseVersion(v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 def test_suite():
     return unittest.makeSuite(VersionTestCase)

From 0ed78e843c5c79f31e9664a39820e21722b537d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Nov 2010 19:35:27 +0000
Subject: [PATCH 3111/8469] Fix two NameErrors in distutils (#10407)

---
 dir_util.py             | 1 +
 tests/test_sysconfig.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dir_util.py b/dir_util.py
index c7c9fccfd7..5b005f0865 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os, sys
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 336c6a5b95..fbe26bf65d 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,5 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
+import shutil
 import test
 import unittest
 

From 33f7d87cb4ff994bfed3923052bde36b9698a6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Nov 2010 19:45:32 +0000
Subject: [PATCH 3112/8469] Merged revisions 86601,86605 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines

  Fix two NameErrors in distutils (#10407)
........
  r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines

  Add entry for r86601
........
---
 dir_util.py             | 1 +
 tests/test_sysconfig.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dir_util.py b/dir_util.py
index c7c9fccfd7..5b005f0865 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os, sys
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 78bce9461f..309be7b8b1 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,5 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
+import shutil
 import test
 import unittest
 

From d9cf33af24cb0537a0dc26fb94e79959467483ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Nov 2010 20:02:41 +0000
Subject: [PATCH 3113/8469] Merged revisions 86601,86605 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

In 2.7, there was only one NameError.

........
  r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines

  Fix two NameErrors in distutils (#10407)
........
  r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines

  Add entry for r86601
........
---
 dir_util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dir_util.py b/dir_util.py
index d6875936d6..9c5cf337c6 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 

From dcc7727442e3d4796d7d2bb8db40c8e04f42703a Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 21 Nov 2010 01:30:29 +0000
Subject: [PATCH 3114/8469] Merged revisions 86596 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
---
 tests/test_archive_util.py    | 14 ++++----
 tests/test_bdist.py           |  4 +--
 tests/test_bdist_dumb.py      |  2 +-
 tests/test_build_clib.py      | 10 +++---
 tests/test_build_ext.py       | 56 +++++++++++++++----------------
 tests/test_check.py           | 14 ++++----
 tests/test_cmd.py             | 10 +++---
 tests/test_config.py          |  6 ++--
 tests/test_config_cmd.py      | 12 +++----
 tests/test_core.py            |  4 +--
 tests/test_cygwinccompiler.py | 32 +++++++++---------
 tests/test_dir_util.py        | 22 ++++++-------
 tests/test_dist.py            | 20 +++++------
 tests/test_extension.py       | 16 ++++-----
 tests/test_file_util.py       |  6 ++--
 tests/test_filelist.py        | 18 +++++-----
 tests/test_install.py         | 20 +++++------
 tests/test_install_data.py    |  8 ++---
 tests/test_install_headers.py |  4 +--
 tests/test_install_lib.py     |  8 ++---
 tests/test_log.py             |  4 +--
 tests/test_msvc9compiler.py   |  4 +--
 tests/test_register.py        | 14 ++++----
 tests/test_sdist.py           | 34 +++++++++----------
 tests/test_spawn.py           |  2 +-
 tests/test_sysconfig.py       |  8 ++---
 tests/test_text_file.py       |  2 +-
 tests/test_upload.py          | 12 +++----
 tests/test_util.py            | 62 +++++++++++++++++------------------
 tests/test_version.py         | 20 +++++------
 30 files changed, 223 insertions(+), 225 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index c6e08cbc2b..d77302d547 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -113,7 +113,7 @@ def test_tarfile_vs_tar(self):
 
         self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
-        self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
+        self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -153,7 +153,7 @@ def test_compress_deprecated(self):
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
         self.assertTrue(os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
         # same test with dry_run
         os.remove(tarball)
@@ -167,7 +167,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         self.assertTrue(not os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile(self):
@@ -184,9 +184,9 @@ def test_make_zipfile(self):
         tarball = base_name + '.zip'
 
     def test_check_archive_formats(self):
-        self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
-                          'xxx')
-        self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
+        self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
+                         'xxx')
+        self.assertEqual(check_archive_formats(['gztar', 'zip']), None)
 
     def test_make_archive(self):
         tmpdir = self.mkdtemp()
@@ -203,7 +203,7 @@ def _breaks(*args, **kw):
                 make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
             except:
                 pass
-            self.assertEquals(os.getcwd(), current_dir)
+            self.assertEqual(os.getcwd(), current_dir)
         finally:
             del ARCHIVE_FORMATS['xxx']
 
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index f2849a9756..715283cb97 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -23,7 +23,7 @@ def test_formats(self):
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
-        self.assertEquals(cmd.formats, ['msi'])
+        self.assertEqual(cmd.formats, ['msi'])
 
         # what format bdist offers ?
         # XXX an explicit list in bdist is
@@ -34,7 +34,7 @@ def test_formats(self):
         formats.sort()
         founded = list(cmd.format_command.keys())
         founded.sort()
-        self.assertEquals(founded, formats)
+        self.assertEqual(founded, formats)
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 5e76809f23..bf146eb573 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -68,7 +68,7 @@ def test_simple_built(self):
             base = base.replace(':', '-')
 
         wanted = ['%s.zip' % base]
-        self.assertEquals(dist_created, wanted)
+        self.assertEqual(dist_created, wanted)
 
         # now let's check what we have in the zip file
         # XXX to be done
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 536cd67319..d6d1a4d0c1 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -55,14 +55,14 @@ def test_get_source_files(self):
         self.assertRaises(DistutilsSetupError, cmd.get_source_files)
 
         cmd.libraries = [('name', {'sources': ['a', 'b']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')}),
                          ('name2', {'sources': ['c', 'd']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
 
     def test_build_libraries(self):
 
@@ -91,11 +91,11 @@ def test_finalize_options(self):
 
         cmd.include_dirs = 'one-dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, ['one-dir'])
+        self.assertEqual(cmd.include_dirs, ['one-dir'])
 
         cmd.include_dirs = None
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, [])
+        self.assertEqual(cmd.include_dirs, [])
 
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 226f7bb1fe..e8b15f156d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -96,11 +96,11 @@ def test_build_ext(self):
         for attr in ('error', 'foo', 'new', 'roj'):
             self.assertTrue(hasattr(xx, attr))
 
-        self.assertEquals(xx.foo(2, 5), 7)
-        self.assertEquals(xx.foo(13,15), 28)
-        self.assertEquals(xx.new().demo(), None)
+        self.assertEqual(xx.foo(2, 5), 7)
+        self.assertEqual(xx.foo(13,15), 28)
+        self.assertEqual(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
-        self.assertEquals(xx.__doc__, doc)
+        self.assertEqual(xx.__doc__, doc)
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 
@@ -206,7 +206,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.libraries = 'my_lib'
         cmd.finalize_options()
-        self.assertEquals(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
@@ -220,7 +220,7 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.rpath = os.pathsep.join(['one', 'two'])
         cmd.finalize_options()
-        self.assertEquals(cmd.rpath, ['one', 'two'])
+        self.assertEqual(cmd.rpath, ['one', 'two'])
 
         # XXX more tests to perform for win32
 
@@ -229,25 +229,25 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.define = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+        self.assertEqual(cmd.define, [('one', '1'), ('two', '1')])
 
         # make sure undef is turned into a list of
         # strings if they are ','-separated strings
         cmd = build_ext(dist)
         cmd.undef = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.undef, ['one', 'two'])
+        self.assertEqual(cmd.undef, ['one', 'two'])
 
         # make sure swig_opts is turned into a list
         cmd = build_ext(dist)
         cmd.swig_opts = None
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, [])
+        self.assertEqual(cmd.swig_opts, [])
 
         cmd = build_ext(dist)
         cmd.swig_opts = '1 2'
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, ['1', '2'])
+        self.assertEqual(cmd.swig_opts, ['1', '2'])
 
     def test_check_extensions_list(self):
         dist = Distribution()
@@ -283,7 +283,7 @@ def test_check_extensions_list(self):
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
-        self.assertEquals(ext.libraries, 'foo')
+        self.assertEqual(ext.libraries, 'foo')
         self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
@@ -293,15 +293,15 @@ def test_check_extensions_list(self):
 
         exts[0][1]['macros'] = [('1', '2'), ('3',)]
         cmd.check_extensions_list(exts)
-        self.assertEquals(exts[0].undef_macros, ['3'])
-        self.assertEquals(exts[0].define_macros, [('1', '2')])
+        self.assertEqual(exts[0].undef_macros, ['3'])
+        self.assertEqual(exts[0].define_macros, [('1', '2')])
 
     def test_get_source_files(self):
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertEquals(cmd.get_source_files(), ['xxx'])
+        self.assertEqual(cmd.get_source_files(), ['xxx'])
 
     def test_compiler_option(self):
         # cmd.compiler is an option and
@@ -312,7 +312,7 @@ def test_compiler_option(self):
         cmd.compiler = 'unix'
         cmd.ensure_finalized()
         cmd.run()
-        self.assertEquals(cmd.compiler, 'unix')
+        self.assertEqual(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
@@ -324,7 +324,7 @@ def test_get_outputs(self):
         cmd = build_ext(dist)
         self._fixup_command(cmd)
         cmd.ensure_finalized()
-        self.assertEquals(len(cmd.get_outputs()), 1)
+        self.assertEqual(len(cmd.get_outputs()), 1)
 
         if os.name == "nt":
             cmd.debug = sys.executable.endswith("_d.exe")
@@ -344,20 +344,20 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        self.assertEqual(os.path.splitext(so_file)[-1],
+                         sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, other_tmp_dir)
+        self.assertEqual(so_dir, other_tmp_dir)
 
         cmd.inplace = 0
         cmd.compiler = None
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        self.assertEqual(os.path.splitext(so_file)[-1],
+                         sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, cmd.build_lib)
+        self.assertEqual(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
         build_py = cmd.get_finalized_command('build_py')
@@ -365,7 +365,7 @@ def test_get_outputs(self):
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        self.assertEquals(path, cmd.build_lib)
+        self.assertEqual(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -379,7 +379,7 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, 'bar')
+        self.assertEqual(lastdir, 'bar')
 
     def test_ext_fullpath(self):
         ext = sysconfig.get_config_vars()['SO']
@@ -395,14 +395,14 @@ def test_ext_fullpath(self):
         curdir = os.getcwd()
         wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
         wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap not inplace
         build_py = cmd.get_finalized_command('build_py')
@@ -411,13 +411,13 @@ def test_ext_fullpath(self):
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
                               'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
 def test_suite():
     src = _get_source_filename()
diff --git a/tests/test_check.py b/tests/test_check.py
index 372bae367b..7c56c04339 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -26,7 +26,7 @@ def test_check_metadata(self):
         # by default, check is checking the metadata
         # should have some warnings
         cmd = self._run()
-        self.assertEquals(cmd._warnings, 2)
+        self.assertEqual(cmd._warnings, 2)
 
         # now let's add the required fields
         # and run it again, to make sure we don't get
@@ -35,7 +35,7 @@ def test_check_metadata(self):
                     'author_email': 'xxx',
                     'name': 'xxx', 'version': 'xxx'}
         cmd = self._run(metadata)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
         # now with the strict mode, we should
         # get an error if there are missing metadata
@@ -43,7 +43,7 @@ def test_check_metadata(self):
 
         # and of course, no error when all metadata are present
         cmd = self._run(metadata, strict=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_document(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -54,12 +54,12 @@ def test_check_document(self):
         # let's see if it detects broken rest
         broken_rest = 'title\n===\n\ntest'
         msgs = cmd._check_rst_data(broken_rest)
-        self.assertEquals(len(msgs), 1)
+        self.assertEqual(len(msgs), 1)
 
         # and non-broken rest
         rest = 'title\n=====\n\ntest'
         msgs = cmd._check_rst_data(rest)
-        self.assertEquals(len(msgs), 0)
+        self.assertEqual(len(msgs), 0)
 
     def test_check_restructuredtext(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -69,7 +69,7 @@ def test_check_restructuredtext(self):
         pkg_info, dist = self.create_dist(long_description=broken_rest)
         cmd = check(dist)
         cmd.check_restructuredtext()
-        self.assertEquals(cmd._warnings, 1)
+        self.assertEqual(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
         metadata = {'url': 'xxx', 'author': 'xxx',
@@ -82,7 +82,7 @@ def test_check_restructuredtext(self):
         # and non-broken rest
         metadata['long_description'] = 'title\n=====\n\ntest'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_all(self):
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 55ae421d46..5821fcd286 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -44,7 +44,7 @@ def test_make_file(self):
 
         # making sure execute gets called properly
         def _execute(func, args, exec_msg, level):
-            self.assertEquals(exec_msg, 'generating out from in')
+            self.assertEqual(exec_msg, 'generating out from in')
         cmd.force = True
         cmd.execute = _execute
         cmd.make_file(infiles='in', outfile='out', func='func', args=())
@@ -63,7 +63,7 @@ def _announce(msg, level):
 
         wanted = ["command options for 'MyCmd':", '  option1 = 1',
                   '  option2 = 1']
-        self.assertEquals(msgs, wanted)
+        self.assertEqual(msgs, wanted)
 
     def test_ensure_string(self):
         cmd = self.cmd
@@ -81,7 +81,7 @@ def test_ensure_string_list(self):
         cmd = self.cmd
         cmd.option1 = 'ok,dok'
         cmd.ensure_string_list('option1')
-        self.assertEquals(cmd.option1, ['ok', 'dok'])
+        self.assertEqual(cmd.option1, ['ok', 'dok'])
 
         cmd.option2 = ['xxx', 'www']
         cmd.ensure_string_list('option2')
@@ -109,14 +109,14 @@ def test_debug_print(self):
         with captured_stdout() as stdout:
             cmd.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 cmd.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 6a45a328b6..2c075d7ee7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -88,7 +88,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server1'), ('username', 'me')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
         # old format
         self.write_file(self.rc, PYPIRC_OLD)
@@ -97,7 +97,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server-login'), ('username', 'tarek')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
@@ -108,7 +108,7 @@ def test_server_empty_registration(self):
         f = open(rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED)
+            self.assertEqual(content, WANTED)
         finally:
             f.close()
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index ef2e7bc317..fcb798e73b 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -34,7 +34,7 @@ def test_dump_file(self):
             f.close()
 
         dump_file(this_file, 'I am the header')
-        self.assertEquals(len(self._logs), numlines+1)
+        self.assertEqual(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
         if sys.platform == 'win32':
@@ -44,10 +44,10 @@ def test_search_cpp(self):
 
         # simple pattern searches
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
-        self.assertEquals(match, 0)
+        self.assertEqual(match, 0)
 
         match = cmd.search_cpp(pattern='_configtest', body='// xxx')
-        self.assertEquals(match, 1)
+        self.assertEqual(match, 1)
 
     def test_finalize_options(self):
         # finalize_options does a bit of transformation
@@ -59,9 +59,9 @@ def test_finalize_options(self):
         cmd.library_dirs = 'three%sfour' % os.pathsep
         cmd.ensure_finalized()
 
-        self.assertEquals(cmd.include_dirs, ['one', 'two'])
-        self.assertEquals(cmd.libraries, ['one'])
-        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+        self.assertEqual(cmd.include_dirs, ['one', 'two'])
+        self.assertEqual(cmd.libraries, ['one'])
+        self.assertEqual(cmd.library_dirs, ['three', 'four'])
 
     def test_clean(self):
         # _clean removes files
diff --git a/tests/test_core.py b/tests/test_core.py
index e937b45a6b..d781555da5 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -89,7 +89,7 @@ def test_debug_mode(self):
         with captured_stdout() as stdout:
             distutils.core.setup(name='bar')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), 'bar\n')
+        self.assertEqual(stdout.read(), 'bar\n')
 
         distutils.core.DEBUG = True
         try:
@@ -99,7 +99,7 @@ def test_debug_mode(self):
             distutils.core.DEBUG = False
         stdout.seek(0)
         wanted = "options (after parsing config files):\n"
-        self.assertEquals(stdout.readlines()[0], wanted)
+        self.assertEqual(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index a57694d48e..79377a7763 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -65,82 +65,82 @@ def test_check_config_h(self):
         sys.version = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) \n[GCC '
                        '4.0.1 (Apple Computer, Inc. build 5370)]')
 
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
         # then it tries to see if it can find "__GNUC__" in pyconfig.h
         sys.version = 'something without the *CC word'
 
         # if the file doesn't exist it returns  CONFIG_H_UNCERTAIN
-        self.assertEquals(check_config_h()[0], CONFIG_H_UNCERTAIN)
+        self.assertEqual(check_config_h()[0], CONFIG_H_UNCERTAIN)
 
         # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK
         self.write_file(self.python_h, 'xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_NOTOK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_NOTOK)
 
         # and CONFIG_H_OK if __GNUC__ is found
         self.write_file(self.python_h, 'xxx __GNUC__ xxx')
-        self.assertEquals(check_config_h()[0], CONFIG_H_OK)
+        self.assertEqual(check_config_h()[0], CONFIG_H_OK)
 
     def test_get_versions(self):
 
         # get_versions calls distutils.spawn.find_executable on
         # 'gcc', 'ld' and 'dllwrap'
-        self.assertEquals(get_versions(), (None, None, None))
+        self.assertEqual(get_versions(), (None, None, None))
 
         # Let's fake we have 'gcc' and it returns '3.4.5'
         self._exes['gcc'] = b'gcc (GCC) 3.4.5 (mingw special)\nFSF'
         res = get_versions()
-        self.assertEquals(str(res[0]), '3.4.5')
+        self.assertEqual(str(res[0]), '3.4.5')
 
         # and let's see what happens when the version
         # doesn't match the regular expression
         # (\d+\.\d+(\.\d+)*)
         self._exes['gcc'] = b'very strange output'
         res = get_versions()
-        self.assertEquals(res[0], None)
+        self.assertEqual(res[0], None)
 
         # same thing for ld
         self._exes['ld'] = b'GNU ld version 2.17.50 20060824'
         res = get_versions()
-        self.assertEquals(str(res[1]), '2.17.50')
+        self.assertEqual(str(res[1]), '2.17.50')
         self._exes['ld'] = b'@(#)PROGRAM:ld  PROJECT:ld64-77'
         res = get_versions()
-        self.assertEquals(res[1], None)
+        self.assertEqual(res[1], None)
 
         # and dllwrap
         self._exes['dllwrap'] = b'GNU dllwrap 2.17.50 20060824\nFSF'
         res = get_versions()
-        self.assertEquals(str(res[2]), '2.17.50')
+        self.assertEqual(str(res[2]), '2.17.50')
         self._exes['dllwrap'] = b'Cheese Wrap'
         res = get_versions()
-        self.assertEquals(res[2], None)
+        self.assertEqual(res[2], None)
 
     def test_get_msvcr(self):
 
         # none
         sys.version  = ('2.6.1 (r261:67515, Dec  6 2008, 16:42:21) '
                         '\n[GCC 4.0.1 (Apple Computer, Inc. build 5370)]')
-        self.assertEquals(get_msvcr(), None)
+        self.assertEqual(get_msvcr(), None)
 
         # MSVC 7.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1300 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr70'])
+        self.assertEqual(get_msvcr(), ['msvcr70'])
 
         # MSVC 7.1
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1310 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr71'])
+        self.assertEqual(get_msvcr(), ['msvcr71'])
 
         # VS2005 / MSVC 8.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1400 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr80'])
+        self.assertEqual(get_msvcr(), ['msvcr80'])
 
         # VS2008 / MSVC 9.0
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
                        '[MSC v.1500 32 bits (Intel)]')
-        self.assertEquals(get_msvcr(), ['msvcr90'])
+        self.assertEqual(get_msvcr(), ['msvcr90'])
 
         # unknown
         sys.version = ('2.5.1 (r251:54863, Apr 18 2007, 08:51:08) '
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index aa9f9ebb9f..84a0ec6cfc 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -37,18 +37,18 @@ def test_mkpath_remove_tree_verbosity(self):
 
         mkpath(self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         remove_tree(self.root_target, verbose=0)
 
         mkpath(self.target, verbose=1)
         wanted = ['creating %s' % self.root_target,
                   'creating %s' % self.target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         self._logs = []
 
         remove_tree(self.root_target, verbose=1)
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
@@ -66,12 +66,12 @@ def test_mkpath_with_custom_mode(self):
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
         remove_tree(self.root_target, verbose=0)
 
         wanted = ['creating %s' % self.root_target]
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
 
@@ -81,7 +81,7 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
 
         copy_tree(self.target, self.target2, verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
 
         remove_tree(self.root_target, verbose=0)
 
@@ -95,18 +95,18 @@ def test_copy_tree_verbosity(self):
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
     def test_ensure_relative(self):
         if os.sep == '/':
-            self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
-            self.assertEquals(ensure_relative('some/path'), 'some/path')
+            self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
+            self.assertEqual(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
-            self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+            self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
+            self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index f9c5a4fd96..2c19d89266 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -125,7 +125,7 @@ def _warn(msg):
         finally:
             warnings.warn = old_warn
 
-        self.assertEquals(len(warns), 0)
+        self.assertEqual(len(warns), 0)
 
     def test_finalize_options(self):
 
@@ -136,20 +136,20 @@ def test_finalize_options(self):
         dist.finalize_options()
 
         # finalize_option splits platforms and keywords
-        self.assertEquals(dist.metadata.platforms, ['one', 'two'])
-        self.assertEquals(dist.metadata.keywords, ['one', 'two'])
+        self.assertEqual(dist.metadata.platforms, ['one', 'two'])
+        self.assertEqual(dist.metadata.keywords, ['one', 'two'])
 
     def test_get_command_packages(self):
         dist = Distribution()
-        self.assertEquals(dist.command_packages, None)
+        self.assertEqual(dist.command_packages, None)
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command'])
-        self.assertEquals(dist.command_packages,
-                          ['distutils.command'])
+        self.assertEqual(cmds, ['distutils.command'])
+        self.assertEqual(dist.command_packages,
+                         ['distutils.command'])
 
         dist.command_packages = 'one,two'
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
+        self.assertEqual(cmds, ['distutils.command', 'one', 'two'])
 
 
     def test_announce(self):
@@ -288,8 +288,8 @@ def test_custom_pydistutils(self):
     def test_fix_help_options(self):
         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
         fancy_options = fix_help_options(help_tuples)
-        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
-        self.assertEquals(fancy_options[1], (1, 2, 3))
+        self.assertEqual(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEqual(fancy_options[1], (1, 2, 3))
 
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
diff --git a/tests/test_extension.py b/tests/test_extension.py
index 1ee30585fa..d9a47a89c8 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -28,38 +28,38 @@ def test_read_setup_file(self):
                   'rect', 'rwobject', 'scrap', 'surface', 'surflock',
                   'time', 'transform']
 
-        self.assertEquals(names, wanted)
+        self.assertEqual(names, wanted)
 
     def test_extension_init(self):
         # the first argument, which is the name, must be a string
         self.assertRaises(AssertionError, Extension, 1, [])
         ext = Extension('name', [])
-        self.assertEquals(ext.name, 'name')
+        self.assertEqual(ext.name, 'name')
 
         # the second argument, which is the list of files, must
         # be a list of strings
         self.assertRaises(AssertionError, Extension, 'name', 'file')
         self.assertRaises(AssertionError, Extension, 'name', ['file', 1])
         ext = Extension('name', ['file1', 'file2'])
-        self.assertEquals(ext.sources, ['file1', 'file2'])
+        self.assertEqual(ext.sources, ['file1', 'file2'])
 
         # others arguments have defaults
         for attr in ('include_dirs', 'define_macros', 'undef_macros',
                      'library_dirs', 'libraries', 'runtime_library_dirs',
                      'extra_objects', 'extra_compile_args', 'extra_link_args',
                      'export_symbols', 'swig_opts', 'depends'):
-            self.assertEquals(getattr(ext, attr), [])
+            self.assertEqual(getattr(ext, attr), [])
 
-        self.assertEquals(ext.language, None)
-        self.assertEquals(ext.optional, None)
+        self.assertEqual(ext.language, None)
+        self.assertEqual(ext.optional, None)
 
         # if there are unknown keyword options, warn about them
         with check_warnings() as w:
             warnings.simplefilter('always')
             ext = Extension('name', ['file1', 'file2'], chic=True)
 
-        self.assertEquals(len(w.warnings), 1)
-        self.assertEquals(str(w.warnings[0].message),
+        self.assertEqual(len(w.warnings), 1)
+        self.assertEqual(str(w.warnings[0].message),
                           "Unknown Extension options: 'chic'")
 
 def test_suite():
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 74618b523a..730ffde4ff 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -38,14 +38,14 @@ def test_move_file_verbosity(self):
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
 
         move_file(self.source, self.target, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
@@ -55,7 +55,7 @@ def test_move_file_verbosity(self):
         os.mkdir(self.target_dir)
         move_file(self.source, self.target_dir, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
 
 def test_suite():
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 331180d235..d2a2b449ee 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -9,29 +9,29 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
     def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
             file_list.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 file_list.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_install.py b/tests/test_install.py
index bc407cf9ab..f9c142e446 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -123,23 +123,23 @@ def test_handle_extra_path(self):
 
         # two elements
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path', 'dirs'])
-        self.assertEquals(cmd.extra_dirs, 'dirs')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path', 'dirs'])
+        self.assertEqual(cmd.extra_dirs, 'dirs')
+        self.assertEqual(cmd.path_file, 'path')
 
         # one element
         cmd.extra_path = ['path']
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, ['path'])
-        self.assertEquals(cmd.extra_dirs, 'path')
-        self.assertEquals(cmd.path_file, 'path')
+        self.assertEqual(cmd.extra_path, ['path'])
+        self.assertEqual(cmd.extra_dirs, 'path')
+        self.assertEqual(cmd.path_file, 'path')
 
         # none
         dist.extra_path = cmd.extra_path = None
         cmd.handle_extra_path()
-        self.assertEquals(cmd.extra_path, None)
-        self.assertEquals(cmd.extra_dirs, '')
-        self.assertEquals(cmd.path_file, None)
+        self.assertEqual(cmd.extra_path, None)
+        self.assertEqual(cmd.extra_dirs, '')
+        self.assertEqual(cmd.path_file, None)
 
         # three elements (no way !)
         cmd.extra_path = 'path,dirs,again'
@@ -184,7 +184,7 @@ def test_record(self):
         # line (the egg info file)
         f = open(cmd.record)
         try:
-            self.assertEquals(len(f.readlines()), 1)
+            self.assertEqual(len(f.readlines()), 1)
         finally:
             f.close()
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 377ae86e2f..86db4a12c5 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -27,14 +27,14 @@ def test_simple_run(self):
         self.write_file(two, 'xxx')
 
         cmd.data_files = [one, (inst2, [two])]
-        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+        self.assertEqual(cmd.get_inputs(), [one, (inst2, [two])])
 
         # let's run the command
         cmd.ensure_finalized()
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
@@ -47,7 +47,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
@@ -65,7 +65,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assertEqual(len(cmd.get_outputs()), 4)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 5b32b13ee4..aa8a4e6014 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -23,7 +23,7 @@ def test_simple_run(self):
 
         pkg_dir, dist = self.create_dist(headers=headers)
         cmd = install_headers(dist)
-        self.assertEquals(cmd.get_inputs(), headers)
+        self.assertEqual(cmd.get_inputs(), headers)
 
         # let's run the command
         cmd.install_dir = os.path.join(pkg_dir, 'inst')
@@ -31,7 +31,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the results
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
 
 def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 99a6d90627..4636304692 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -18,8 +18,8 @@ def test_finalize_options(self):
         cmd = install_lib(dist)
 
         cmd.finalize_options()
-        self.assertEquals(cmd.compile, 1)
-        self.assertEquals(cmd.optimize, 0)
+        self.assertEqual(cmd.compile, 1)
+        self.assertEqual(cmd.optimize, 0)
 
         # optimize must be 0, 1, or 2
         cmd.optimize = 'foo'
@@ -29,7 +29,7 @@ def test_finalize_options(self):
 
         cmd.optimize = '2'
         cmd.finalize_options()
-        self.assertEquals(cmd.optimize, 2)
+        self.assertEqual(cmd.optimize, 2)
 
     @unittest.skipUnless(not sys.dont_write_bytecode,
                          'byte-compile not supported')
@@ -76,7 +76,7 @@ def test_get_inputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_input should return 2 elements
-        self.assertEquals(len(cmd.get_inputs()), 2)
+        self.assertEqual(len(cmd.get_inputs()), 2)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_log.py b/tests/test_log.py
index d35de3456c..9d40dcd72c 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -22,9 +22,9 @@ def test_non_ascii(self):
                 log.debug("debug:\xe9")
                 log.fatal("fatal:\xe9")
                 stdout.seek(0)
-                self.assertEquals(stdout.read().rstrip(), "debug:\\xe9")
+                self.assertEqual(stdout.read().rstrip(), "debug:\\xe9")
                 stderr.seek(0)
-                self.assertEquals(stderr.read().rstrip(), "fatal:\\xe9")
+                self.assertEqual(stderr.read().rstrip(), "fatal:\\xe9")
         finally:
             sys.stdout = old_stdout
             sys.stderr = old_stderr
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 40cb8be6d1..570fda121e 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -103,7 +103,7 @@ def test_reg_class(self):
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
-        self.assertEquals(keys, None)
+        self.assertEqual(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
@@ -130,7 +130,7 @@ def test_remove_visual_c_ref(self):
             f.close()
 
         # makes sure the manifest was properly cleaned
-        self.assertEquals(content, _CLEANED_MANIFEST)
+        self.assertEqual(content, _CLEANED_MANIFEST)
 
 
 def test_suite():
diff --git a/tests/test_register.py b/tests/test_register.py
index 3b80b6dc05..c98e28a1a4 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -121,7 +121,7 @@ def test_create_pypirc(self):
         f = open(self.rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED_PYPIRC)
+            self.assertEqual(content, WANTED_PYPIRC)
         finally:
             f.close()
 
@@ -141,8 +141,8 @@ def _no_way(prompt=''):
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
-        self.assertEquals(req1['Content-length'], '1374')
-        self.assertEquals(req2['Content-length'], '1374')
+        self.assertEqual(req1['Content-length'], '1374')
+        self.assertEqual(req2['Content-length'], '1374')
         self.assertTrue((b'xxx') in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
@@ -155,7 +155,7 @@ def test_password_not_in_file(self):
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(cmd.distribution.password, 'password')
+        self.assertEqual(cmd.distribution.password, 'password')
 
     def test_registering(self):
         # this test runs choice 2
@@ -172,7 +172,7 @@ def test_registering(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '608')
+        self.assertEqual(headers['Content-length'], '608')
         self.assertTrue((b'tarek') in req.data)
 
     def test_password_reset(self):
@@ -190,7 +190,7 @@ def test_password_reset(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '290')
+        self.assertEqual(headers['Content-length'], '290')
         self.assertTrue((b'tarek') in req.data)
 
     def test_strict(self):
@@ -253,7 +253,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index ad527c7dd6..d734ea0ac5 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -110,7 +110,7 @@ def test_prune_file_list(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -119,7 +119,7 @@ def test_prune_file_list(self):
             zip_file.close()
 
         # making sure everything has been pruned correctly
-        self.assertEquals(len(content), 4)
+        self.assertEqual(len(content), 4)
 
     def test_make_distribution(self):
 
@@ -140,8 +140,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -154,8 +153,7 @@ def test_make_distribution(self):
 
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
     def test_add_defaults(self):
 
@@ -203,7 +201,7 @@ def test_add_defaults(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -212,13 +210,13 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 11)
+        self.assertEqual(len(content), 11)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
 
@@ -231,7 +229,7 @@ def test_metadata_check_option(self):
         cmd.ensure_finalized()
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 2)
+        self.assertEqual(len(warnings), 2)
 
         # trying with a complete set of metadata
         self.clear_logs()
@@ -240,7 +238,7 @@ def test_metadata_check_option(self):
         cmd.metadata_check = 0
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 0)
+        self.assertEqual(len(warnings), 0)
 
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
@@ -248,7 +246,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
     def test_show_formats(self):
         with captured_stdout() as stdout:
@@ -258,7 +256,7 @@ def test_show_formats(self):
         num_formats = len(ARCHIVE_FORMATS.keys())
         output = [line for line in stdout.getvalue().split('\n')
                   if line.strip().startswith('--formats=')]
-        self.assertEquals(len(output), num_formats)
+        self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
 
@@ -266,9 +264,9 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         # default options set by finalize
-        self.assertEquals(cmd.manifest, 'MANIFEST')
-        self.assertEquals(cmd.template, 'MANIFEST.in')
-        self.assertEquals(cmd.dist_dir, 'dist')
+        self.assertEqual(cmd.manifest, 'MANIFEST')
+        self.assertEqual(cmd.template, 'MANIFEST.in')
+        self.assertEqual(cmd.dist_dir, 'dist')
 
         # formats has to be a string splitable on (' ', ',') or
         # a stringlist
@@ -299,7 +297,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 5)
+        self.assertEqual(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -319,7 +317,7 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 6)
+        self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
     def test_manifest_marker(self):
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 950e5789b5..0616c9f2e3 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -20,7 +20,7 @@ def test_nt_quote_args(self):
                                (['nochange', 'nospace'],
                                 ['nochange', 'nospace'])):
             res = _nt_quote_args(args)
-            self.assertEquals(res, wanted)
+            self.assertEqual(res, wanted)
 
 
     @unittest.skipUnless(os.name in ('nt', 'posix'),
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 309be7b8b1..41414bb52e 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -71,7 +71,7 @@ def set_executables(self, **kw):
 
         comp = compiler()
         sysconfig.customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+        self.assertEqual(comp.exes['archiver'], 'my_ar -arflags')
 
     def test_parse_makefile_base(self):
         self.makefile = TESTFN
@@ -82,7 +82,7 @@ def test_parse_makefile_base(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
+        self.assertEqual(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
                               'OTHER': 'foo'})
 
     def test_parse_makefile_literal_dollar(self):
@@ -94,8 +94,8 @@ def test_parse_makefile_literal_dollar(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
-                              'OTHER': 'foo'})
+        self.assertEqual(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                             'OTHER': 'foo'})
 
 
 def test_suite():
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 3093097dba..f1e32b6cc6 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -48,7 +48,7 @@ def test_class(self):
 
         def test_input(count, description, file, expected_result):
             result = file.readlines()
-            self.assertEquals(result, expected_result)
+            self.assertEqual(result, expected_result)
 
         tmpdir = self.mkdtemp()
         filename = os.path.join(tmpdir, "test.txt")
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 35e970051e..8891820d67 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -90,7 +90,7 @@ def test_finalize_options(self):
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
                              ('repository', 'http://pypi.python.org/pypi')):
-            self.assertEquals(getattr(cmd, attr), waited)
+            self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):
         # file with no password
@@ -100,14 +100,14 @@ def test_saved_password(self):
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, None)
+        self.assertEqual(cmd.password, None)
 
         # make sure we get it as well, if another command
         # initialized it at the dist level
         dist.password = 'xxx'
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, 'xxx')
+        self.assertEqual(cmd.password, 'xxx')
 
     def test_upload(self):
         tmp = self.mkdtemp()
@@ -125,12 +125,12 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.conn.headers)
-        self.assertEquals(headers['Content-length'], '2087')
+        self.assertEqual(headers['Content-length'], '2087')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertFalse('\n' in headers['Authorization'])
 
-        self.assertEquals(self.conn.requests, [('POST', '/pypi')])
-        self.assert_((b'xxx') in self.conn.body)
+        self.assertEqual(self.conn.requests, [('POST', '/pypi')])
+        self.assertTrue((b'xxx') in self.conn.body)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
diff --git a/tests/test_util.py b/tests/test_util.py
index 0c732f8244..f40caac838 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -66,21 +66,21 @@ def test_get_platform(self):
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Intel)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win32')
+        self.assertEqual(get_platform(), 'win32')
 
         # windows XP, amd64
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Amd64)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-amd64')
+        self.assertEqual(get_platform(), 'win-amd64')
 
         # windows XP, itanium
         os.name = 'nt'
         sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
                        '[MSC v.1310 32 bit (Itanium)]')
         sys.platform = 'win32'
-        self.assertEquals(get_platform(), 'win-ia64')
+        self.assertEqual(get_platform(), 'win-ia64')
 
         # macbook
         os.name = 'posix'
@@ -99,7 +99,7 @@ def test_get_platform(self):
         cursize = sys.maxsize
         sys.maxsize = (2 ** 31)-1
         try:
-            self.assertEquals(get_platform(), 'macosx-10.3-i386')
+            self.assertEqual(get_platform(), 'macosx-10.3-i386')
         finally:
             sys.maxsize = cursize
 
@@ -110,33 +110,33 @@ def test_get_platform(self):
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-intel')
+        self.assertEqual(get_platform(), 'macosx-10.4-intel')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat3')
 
         get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
-        self.assertEquals(get_platform(), 'macosx-10.4-universal')
+        self.assertEqual(get_platform(), 'macosx-10.4-universal')
 
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
 
-        self.assertEquals(get_platform(), 'macosx-10.4-fat64')
+        self.assertEqual(get_platform(), 'macosx-10.4-fat64')
 
         for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
             get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
@@ -144,7 +144,7 @@ def test_get_platform(self):
                                            '-fno-strict-aliasing -fno-common '
                                            '-dynamic -DNDEBUG -g -O3'%(arch,))
 
-            self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+            self.assertEqual(get_platform(), 'macosx-10.4-%s'%(arch,))
 
         # linux debian sarge
         os.name = 'posix'
@@ -154,7 +154,7 @@ def test_get_platform(self):
         self._set_uname(('Linux', 'aglae', '2.6.21.1dedibox-r7',
                     '#1 Mon Apr 30 17:25:38 CEST 2007', 'i686'))
 
-        self.assertEquals(get_platform(), 'linux-i686')
+        self.assertEqual(get_platform(), 'linux-i686')
 
         # XXX more platforms to tests here
 
@@ -165,8 +165,8 @@ def _join(path):
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(convert_path('/home/to/my/stuff'),
-                          '/home/to/my/stuff')
+        self.assertEqual(convert_path('/home/to/my/stuff'),
+                         '/home/to/my/stuff')
 
         # win
         os.sep = '\\'
@@ -177,10 +177,10 @@ def _join(*path):
         self.assertRaises(ValueError, convert_path, '/home/to/my/stuff')
         self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
 
-        self.assertEquals(convert_path('home/to/my/stuff'),
-                          'home\\to\\my\\stuff')
-        self.assertEquals(convert_path('.'),
-                          os.curdir)
+        self.assertEqual(convert_path('home/to/my/stuff'),
+                         'home\\to\\my\\stuff')
+        self.assertEqual(convert_path('.'),
+                         os.curdir)
 
     def test_change_root(self):
         # linux/mac
@@ -192,10 +192,10 @@ def _join(*path):
             return '/'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('/root', '/old/its/here'),
-                          '/root/old/its/here')
-        self.assertEquals(change_root('/root', 'its/here'),
-                          '/root/its/here')
+        self.assertEqual(change_root('/root', '/old/its/here'),
+                         '/root/old/its/here')
+        self.assertEqual(change_root('/root', 'its/here'),
+                         '/root/its/here')
 
         # windows
         os.name = 'nt'
@@ -211,10 +211,10 @@ def _join(*path):
             return '\\'.join(path)
         os.path.join = _join
 
-        self.assertEquals(change_root('c:\\root', 'c:\\old\\its\\here'),
-                          'c:\\root\\old\\its\\here')
-        self.assertEquals(change_root('c:\\root', 'its\\here'),
-                          'c:\\root\\its\\here')
+        self.assertEqual(change_root('c:\\root', 'c:\\old\\its\\here'),
+                         'c:\\root\\old\\its\\here')
+        self.assertEqual(change_root('c:\\root', 'its\\here'),
+                         'c:\\root\\its\\here')
 
         # BugsBunny os (it's a great os)
         os.name = 'BugsBunny'
@@ -232,16 +232,16 @@ def test_check_environ(self):
         if os.name == 'posix':  # this test won't run on windows
             check_environ()
             import pwd
-            self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
+            self.assertEqual(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
         else:
             check_environ()
 
-        self.assertEquals(os.environ['PLAT'], get_platform())
-        self.assertEquals(util._environ_checked, 1)
+        self.assertEqual(os.environ['PLAT'], get_platform())
+        self.assertEqual(util._environ_checked, 1)
 
     def test_split_quoted(self):
-        self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'),
-                          ['one', 'two', 'three', 'four'])
+        self.assertEqual(split_quoted('""one"" "two" \'three\' \\four'),
+                         ['one', 'two', 'three', 'four'])
 
     def test_strtobool(self):
         yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
@@ -258,7 +258,7 @@ def test_rfc822_escape(self):
         res = rfc822_escape(header)
         wanted = ('I am a%(8s)spoor%(8s)slonesome%(8s)s'
                   'header%(8s)s') % {'8s': '\n'+8*' '}
-        self.assertEquals(res, wanted)
+        self.assertEqual(res, wanted)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile raise a DistutilsError
diff --git a/tests/test_version.py b/tests/test_version.py
index fa21433046..980f83f29a 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -7,12 +7,12 @@ class VersionTestCase(unittest.TestCase):
 
     def test_prerelease(self):
         version = StrictVersion('1.2.3a1')
-        self.assertEquals(version.version, (1, 2, 3))
-        self.assertEquals(version.prerelease, ('a', 1))
-        self.assertEquals(str(version), '1.2.3a1')
+        self.assertEqual(version.version, (1, 2, 3))
+        self.assertEqual(version.prerelease, ('a', 1))
+        self.assertEqual(str(version), '1.2.3a1')
 
         version = StrictVersion('1.2.0')
-        self.assertEquals(str(version), '1.2')
+        self.assertEqual(str(version), '1.2')
 
     def test_cmp_strict(self):
         versions = (('1.5.1', '1.5.2b2', -1),
@@ -41,9 +41,9 @@ def test_cmp_strict(self):
                     raise AssertionError(("cmp(%s, %s) "
                                           "shouldn't raise ValueError")
                                             % (v1, v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 
     def test_cmp(self):
@@ -59,9 +59,9 @@ def test_cmp(self):
 
         for v1, v2, wanted in versions:
             res = LooseVersion(v1)._cmp(LooseVersion(v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 def test_suite():
     return unittest.makeSuite(VersionTestCase)

From d82693d941869773f3654c04da63d586c5ad1a2c Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 21 Nov 2010 13:34:58 +0000
Subject: [PATCH 3115/8469] Merged revisions 86596 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
---
 tests/test_archive_util.py    | 18 ++++----
 tests/test_bdist.py           |  4 +-
 tests/test_bdist_dumb.py      |  8 ++--
 tests/test_build.py           | 14 +++---
 tests/test_build_clib.py      | 10 ++--
 tests/test_build_ext.py       | 86 +++++++++++++++++------------------
 tests/test_ccompiler.py       |  8 ++--
 tests/test_check.py           | 14 +++---
 tests/test_cmd.py             | 10 ++--
 tests/test_config.py          |  6 +--
 tests/test_config_cmd.py      | 12 ++---
 tests/test_core.py            |  4 +-
 tests/test_dep_util.py        |  4 +-
 tests/test_dir_util.py        | 22 ++++-----
 tests/test_dist.py            | 42 ++++++++---------
 tests/test_file_util.py       |  8 ++--
 tests/test_filelist.py        | 20 ++++----
 tests/test_install_data.py    |  8 ++--
 tests/test_install_headers.py |  4 +-
 tests/test_install_lib.py     |  8 ++--
 tests/test_msvc9compiler.py   |  4 +-
 tests/test_register.py        | 12 ++---
 tests/test_sdist.py           | 40 ++++++++--------
 tests/test_spawn.py           |  2 +-
 tests/test_sysconfig.py       | 10 ++--
 tests/test_text_file.py       |  2 +-
 tests/test_upload.py          | 14 +++---
 tests/test_version.py         | 20 ++++----
 28 files changed, 206 insertions(+), 208 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index a9b46d8e22..bab91577f2 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -129,7 +129,7 @@ def test_tarfile_vs_tar(self):
 
         self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
-        self.assertEquals(self._tarinfo(tarball), self._tarinfo(tarball2))
+        self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -169,7 +169,7 @@ def test_compress_deprecated(self):
             os.chdir(old_dir)
         tarball = base_name + '.tar.Z'
         self.assertTrue(os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
         # same test with dry_run
         os.remove(tarball)
@@ -183,7 +183,7 @@ def test_compress_deprecated(self):
         finally:
             os.chdir(old_dir)
         self.assertTrue(not os.path.exists(tarball))
-        self.assertEquals(len(w.warnings), 1)
+        self.assertEqual(len(w.warnings), 1)
 
     @unittest.skipUnless(zlib, "Requires zlib")
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
@@ -201,9 +201,9 @@ def test_make_zipfile(self):
         tarball = base_name + '.zip'
 
     def test_check_archive_formats(self):
-        self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']),
-                          'xxx')
-        self.assertEquals(check_archive_formats(['gztar', 'zip']), None)
+        self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
+                         'xxx')
+        self.assertEqual(check_archive_formats(['gztar', 'zip']), None)
 
     def test_make_archive(self):
         tmpdir = self.mkdtemp()
@@ -258,8 +258,8 @@ def test_tarfile_root_owner(self):
         archive = tarfile.open(archive_name)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
+                self.assertEqual(member.uid, 0)
+                self.assertEqual(member.gid, 0)
         finally:
             archive.close()
 
@@ -273,7 +273,7 @@ def _breaks(*args, **kw):
                 make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
             except:
                 pass
-            self.assertEquals(os.getcwd(), current_dir)
+            self.assertEqual(os.getcwd(), current_dir)
         finally:
             del ARCHIVE_FORMATS['xxx']
 
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index a37f4a9b09..fa7cd5adb5 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -25,7 +25,7 @@ def test_formats(self):
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
-        self.assertEquals(cmd.formats, ['msi'])
+        self.assertEqual(cmd.formats, ['msi'])
 
         # what format bdist offers ?
         # XXX an explicit list in bdist is
@@ -36,7 +36,7 @@ def test_formats(self):
         formats.sort()
         founded = cmd.format_command.keys()
         founded.sort()
-        self.assertEquals(founded, formats)
+        self.assertEqual(founded, formats)
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index f2220f474d..5a22a10ec8 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -78,7 +78,7 @@ def test_simple_built(self):
             base = base.replace(':', '-')
 
         wanted = ['%s.zip' % base]
-        self.assertEquals(dist_created, wanted)
+        self.assertEqual(dist_created, wanted)
 
         # now let's check what we have in the zip file
         # XXX to be done
@@ -87,16 +87,16 @@ def test_finalize_options(self):
         pkg_dir, dist = self.create_dist()
         os.chdir(pkg_dir)
         cmd = bdist_dumb(dist)
-        self.assertEquals(cmd.bdist_dir, None)
+        self.assertEqual(cmd.bdist_dir, None)
         cmd.finalize_options()
 
         # bdist_dir is initialized to bdist_base/dumb if not set
         base = cmd.get_finalized_command('bdist').bdist_base
-        self.assertEquals(cmd.bdist_dir, os.path.join(base, 'dumb'))
+        self.assertEqual(cmd.bdist_dir, os.path.join(base, 'dumb'))
 
         # the format is set to a default value depending on the os.name
         default = cmd.default_format[os.name]
-        self.assertEquals(cmd.format, default)
+        self.assertEqual(cmd.format, default)
 
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
diff --git a/tests/test_build.py b/tests/test_build.py
index 2418e1656d..3db570382e 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -17,11 +17,11 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         # if not specified, plat_name gets the current platform
-        self.assertEquals(cmd.plat_name, get_platform())
+        self.assertEqual(cmd.plat_name, get_platform())
 
         # build_purelib is build + lib
         wanted = os.path.join(cmd.build_base, 'lib')
-        self.assertEquals(cmd.build_purelib, wanted)
+        self.assertEqual(cmd.build_purelib, wanted)
 
         # build_platlib is 'build/lib.platform-x.x[-pydebug]'
         # examples:
@@ -31,21 +31,21 @@ def test_finalize_options(self):
             self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
             plat_spec += '-pydebug'
         wanted = os.path.join(cmd.build_base, 'lib' + plat_spec)
-        self.assertEquals(cmd.build_platlib, wanted)
+        self.assertEqual(cmd.build_platlib, wanted)
 
         # by default, build_lib = build_purelib
-        self.assertEquals(cmd.build_lib, cmd.build_purelib)
+        self.assertEqual(cmd.build_lib, cmd.build_purelib)
 
         # build_temp is build/temp.<plat>
         wanted = os.path.join(cmd.build_base, 'temp' + plat_spec)
-        self.assertEquals(cmd.build_temp, wanted)
+        self.assertEqual(cmd.build_temp, wanted)
 
         # build_scripts is build/scripts-x.x
         wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
-        self.assertEquals(cmd.build_scripts, wanted)
+        self.assertEqual(cmd.build_scripts, wanted)
 
         # executable is os.path.normpath(sys.executable)
-        self.assertEquals(cmd.executable, os.path.normpath(sys.executable))
+        self.assertEqual(cmd.executable, os.path.normpath(sys.executable))
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 145eff5453..d77912ae08 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -55,14 +55,14 @@ def test_get_source_files(self):
         self.assertRaises(DistutilsSetupError, cmd.get_source_files)
 
         cmd.libraries = [('name', {'sources': ['a', 'b']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b'])
 
         cmd.libraries = [('name', {'sources': ('a', 'b')}),
                          ('name2', {'sources': ['c', 'd']})]
-        self.assertEquals(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
+        self.assertEqual(cmd.get_source_files(), ['a', 'b', 'c', 'd'])
 
     def test_build_libraries(self):
 
@@ -91,11 +91,11 @@ def test_finalize_options(self):
 
         cmd.include_dirs = 'one-dir'
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, ['one-dir'])
+        self.assertEqual(cmd.include_dirs, ['one-dir'])
 
         cmd.include_dirs = None
         cmd.finalize_options()
-        self.assertEquals(cmd.include_dirs, [])
+        self.assertEqual(cmd.include_dirs, [])
 
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d14c5f6b10..86568ebb7a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -103,15 +103,15 @@ def test_build_ext(self):
         import xx
 
         for attr in ('error', 'foo', 'new', 'roj'):
-            self.assert_(hasattr(xx, attr))
+            self.assertTrue(hasattr(xx, attr))
 
-        self.assertEquals(xx.foo(2, 5), 7)
-        self.assertEquals(xx.foo(13,15), 28)
-        self.assertEquals(xx.new().demo(), None)
+        self.assertEqual(xx.foo(2, 5), 7)
+        self.assertEqual(xx.foo(13,15), 28)
+        self.assertEqual(xx.new().demo(), None)
         doc = 'This is a template module just for instruction.'
-        self.assertEquals(xx.__doc__, doc)
-        self.assert_(isinstance(xx.Null(), xx.Null))
-        self.assert_(isinstance(xx.Str(), xx.Str))
+        self.assertEqual(xx.__doc__, doc)
+        self.assertTrue(isinstance(xx.Null(), xx.Null))
+        self.assertTrue(isinstance(xx.Str(), xx.Str))
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
@@ -132,7 +132,7 @@ def test_solaris_enable_shared(self):
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assert_(len(cmd.library_dirs) > 0)
+        self.assertTrue(len(cmd.library_dirs) > 0)
 
     def test_finalize_options(self):
         # Make sure Python's include directories (for Python.h, pyconfig.h,
@@ -144,31 +144,31 @@ def test_finalize_options(self):
 
         from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
-        self.assert_(py_include in cmd.include_dirs)
+        self.assertTrue(py_include in cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assert_(plat_py_include in cmd.include_dirs)
+        self.assertTrue(plat_py_include in cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
         cmd = build_ext(dist)
         cmd.libraries = 'my_lib'
         cmd.finalize_options()
-        self.assertEquals(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir'
         cmd.finalize_options()
-        self.assert_('my_lib_dir' in cmd.library_dirs)
+        self.assertTrue('my_lib_dir' in cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a list of os.pathsep's paths
         cmd = build_ext(dist)
         cmd.rpath = os.pathsep.join(['one', 'two'])
         cmd.finalize_options()
-        self.assertEquals(cmd.rpath, ['one', 'two'])
+        self.assertEqual(cmd.rpath, ['one', 'two'])
 
         # XXX more tests to perform for win32
 
@@ -177,25 +177,25 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.define = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.define, [('one', '1'), ('two', '1')])
+        self.assertEqual(cmd.define, [('one', '1'), ('two', '1')])
 
         # make sure undef is turned into a list of
         # strings if they are ','-separated strings
         cmd = build_ext(dist)
         cmd.undef = 'one,two'
         cmd.finalize_options()
-        self.assertEquals(cmd.undef, ['one', 'two'])
+        self.assertEqual(cmd.undef, ['one', 'two'])
 
         # make sure swig_opts is turned into a list
         cmd = build_ext(dist)
         cmd.swig_opts = None
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, [])
+        self.assertEqual(cmd.swig_opts, [])
 
         cmd = build_ext(dist)
         cmd.swig_opts = '1 2'
         cmd.finalize_options()
-        self.assertEquals(cmd.swig_opts, ['1', '2'])
+        self.assertEqual(cmd.swig_opts, ['1', '2'])
 
     def test_check_extensions_list(self):
         dist = Distribution()
@@ -226,13 +226,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assert_(isinstance(ext, Extension))
+        self.assertTrue(isinstance(ext, Extension))
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
-        self.assertEquals(ext.libraries, 'foo')
-        self.assert_(not hasattr(ext, 'some'))
+        self.assertEqual(ext.libraries, 'foo')
+        self.assertTrue(not hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
@@ -241,15 +241,15 @@ def test_check_extensions_list(self):
 
         exts[0][1]['macros'] = [('1', '2'), ('3',)]
         cmd.check_extensions_list(exts)
-        self.assertEquals(exts[0].undef_macros, ['3'])
-        self.assertEquals(exts[0].define_macros, [('1', '2')])
+        self.assertEqual(exts[0].undef_macros, ['3'])
+        self.assertEqual(exts[0].define_macros, [('1', '2')])
 
     def test_get_source_files(self):
         modules = [Extension('foo', ['xxx'])]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertEquals(cmd.get_source_files(), ['xxx'])
+        self.assertEqual(cmd.get_source_files(), ['xxx'])
 
     def test_compiler_option(self):
         # cmd.compiler is an option and
@@ -260,7 +260,7 @@ def test_compiler_option(self):
         cmd.compiler = 'unix'
         cmd.ensure_finalized()
         cmd.run()
-        self.assertEquals(cmd.compiler, 'unix')
+        self.assertEqual(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
@@ -272,7 +272,7 @@ def test_get_outputs(self):
         cmd = build_ext(dist)
         self._fixup_command(cmd)
         cmd.ensure_finalized()
-        self.assertEquals(len(cmd.get_outputs()), 1)
+        self.assertEqual(len(cmd.get_outputs()), 1)
 
         if os.name == "nt":
             cmd.debug = sys.executable.endswith("_d.exe")
@@ -291,20 +291,20 @@ def test_get_outputs(self):
             so_file = cmd.get_outputs()[0]
         finally:
             os.chdir(old_wd)
-        self.assert_(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        self.assertTrue(os.path.exists(so_file))
+        self.assertEqual(os.path.splitext(so_file)[-1],
+                         sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, other_tmp_dir)
+        self.assertEqual(so_dir, other_tmp_dir)
         cmd.compiler = None
         cmd.inplace = 0
         cmd.run()
         so_file = cmd.get_outputs()[0]
-        self.assert_(os.path.exists(so_file))
-        self.assertEquals(os.path.splitext(so_file)[-1],
-                          sysconfig.get_config_var('SO'))
+        self.assertTrue(os.path.exists(so_file))
+        self.assertEqual(os.path.splitext(so_file)[-1],
+                         sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, cmd.build_lib)
+        self.assertEqual(so_dir, cmd.build_lib)
 
         # inplace = 0, cmd.package = 'bar'
         build_py = cmd.get_finalized_command('build_py')
@@ -312,7 +312,7 @@ def test_get_outputs(self):
         path = cmd.get_ext_fullpath('foo')
         # checking that the last directory is the build_dir
         path = os.path.split(path)[0]
-        self.assertEquals(path, cmd.build_lib)
+        self.assertEqual(path, cmd.build_lib)
 
         # inplace = 1, cmd.package = 'bar'
         cmd.inplace = 1
@@ -326,7 +326,7 @@ def test_get_outputs(self):
         # checking that the last directory is bar
         path = os.path.split(path)[0]
         lastdir = os.path.split(path)[-1]
-        self.assertEquals(lastdir, 'bar')
+        self.assertEqual(lastdir, 'bar')
 
     def test_ext_fullpath(self):
         ext = sysconfig.get_config_vars()['SO']
@@ -338,14 +338,14 @@ def test_ext_fullpath(self):
         curdir = os.getcwd()
         wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building lxml.etree not inplace
         cmd.inplace = 0
         cmd.build_lib = os.path.join(curdir, 'tmpdir')
         wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap not inplace
         build_py = cmd.get_finalized_command('build_py')
@@ -354,13 +354,13 @@ def test_ext_fullpath(self):
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
                               'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
         # building twisted.runner.portmap inplace
         cmd.inplace = 1
         path = cmd.get_ext_fullpath('twisted.runner.portmap')
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
     def test_build_ext_inplace(self):
         etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
@@ -375,7 +375,7 @@ def test_build_ext_inplace(self):
         ext = sysconfig.get_config_var("SO")
         wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
         path = cmd.get_ext_fullpath('lxml.etree')
-        self.assertEquals(wanted, path)
+        self.assertEqual(wanted, path)
 
     def test_setuptools_compat(self):
         import distutils.core, distutils.extension, distutils.command.build_ext
@@ -400,7 +400,7 @@ def test_setuptools_compat(self):
             ext = sysconfig.get_config_var("SO")
             wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
             path = cmd.get_ext_fullpath('lxml.etree')
-            self.assertEquals(wanted, path)
+            self.assertEqual(wanted, path)
         finally:
             # restoring Distutils' Extension class otherwise its broken
             distutils.extension.Extension = saved_ext
@@ -415,7 +415,7 @@ def test_build_ext_path_with_os_sep(self):
         ext_name = os.path.join('UpdateManager', 'fdsend')
         ext_path = cmd.get_ext_fullpath(ext_name)
         wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
-        self.assertEquals(ext_path, wanted)
+        self.assertEqual(ext_path, wanted)
 
     def test_build_ext_path_cross_platform(self):
         if sys.platform != 'win32':
@@ -428,7 +428,7 @@ def test_build_ext_path_cross_platform(self):
         ext_name = 'UpdateManager/fdsend'
         ext_path = cmd.get_ext_fullpath(ext_name)
         wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
-        self.assertEquals(ext_path, wanted)
+        self.assertEqual(ext_path, wanted)
 
 def test_suite():
     return unittest.makeSuite(BuildExtTestCase)
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index 317e77fded..e21873e821 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -32,7 +32,7 @@ def test_gen_lib_options(self):
         opts = gen_lib_options(compiler, libdirs, runlibdirs, libs)
         wanted = ['-Llib1', '-Llib2', '-cool', '-Rrunlib1', 'found',
                   '-lname2']
-        self.assertEquals(opts, wanted)
+        self.assertEqual(opts, wanted)
 
     def test_debug_print(self):
 
@@ -43,14 +43,14 @@ class MyCCompiler(CCompiler):
         with captured_stdout() as stdout:
             compiler.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 compiler.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
@@ -72,7 +72,7 @@ def set_executables(self, **kw):
 
         comp = compiler()
         customize_compiler(comp)
-        self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+        self.assertEqual(comp.exes['archiver'], 'my_ar -arflags')
 
 def test_suite():
     return unittest.makeSuite(CCompilerTestCase)
diff --git a/tests/test_check.py b/tests/test_check.py
index 372bae367b..7c56c04339 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -26,7 +26,7 @@ def test_check_metadata(self):
         # by default, check is checking the metadata
         # should have some warnings
         cmd = self._run()
-        self.assertEquals(cmd._warnings, 2)
+        self.assertEqual(cmd._warnings, 2)
 
         # now let's add the required fields
         # and run it again, to make sure we don't get
@@ -35,7 +35,7 @@ def test_check_metadata(self):
                     'author_email': 'xxx',
                     'name': 'xxx', 'version': 'xxx'}
         cmd = self._run(metadata)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
         # now with the strict mode, we should
         # get an error if there are missing metadata
@@ -43,7 +43,7 @@ def test_check_metadata(self):
 
         # and of course, no error when all metadata are present
         cmd = self._run(metadata, strict=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_document(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -54,12 +54,12 @@ def test_check_document(self):
         # let's see if it detects broken rest
         broken_rest = 'title\n===\n\ntest'
         msgs = cmd._check_rst_data(broken_rest)
-        self.assertEquals(len(msgs), 1)
+        self.assertEqual(len(msgs), 1)
 
         # and non-broken rest
         rest = 'title\n=====\n\ntest'
         msgs = cmd._check_rst_data(rest)
-        self.assertEquals(len(msgs), 0)
+        self.assertEqual(len(msgs), 0)
 
     def test_check_restructuredtext(self):
         if not HAS_DOCUTILS: # won't test without docutils
@@ -69,7 +69,7 @@ def test_check_restructuredtext(self):
         pkg_info, dist = self.create_dist(long_description=broken_rest)
         cmd = check(dist)
         cmd.check_restructuredtext()
-        self.assertEquals(cmd._warnings, 1)
+        self.assertEqual(cmd._warnings, 1)
 
         # let's see if we have an error with strict=1
         metadata = {'url': 'xxx', 'author': 'xxx',
@@ -82,7 +82,7 @@ def test_check_restructuredtext(self):
         # and non-broken rest
         metadata['long_description'] = 'title\n=====\n\ntest'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
-        self.assertEquals(cmd._warnings, 0)
+        self.assertEqual(cmd._warnings, 0)
 
     def test_check_all(self):
 
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index cfd6485113..97cdb8ad69 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -44,7 +44,7 @@ def test_make_file(self):
 
         # making sure execute gets called properly
         def _execute(func, args, exec_msg, level):
-            self.assertEquals(exec_msg, 'generating out from in')
+            self.assertEqual(exec_msg, 'generating out from in')
         cmd.force = True
         cmd.execute = _execute
         cmd.make_file(infiles='in', outfile='out', func='func', args=())
@@ -63,7 +63,7 @@ def _announce(msg, level):
 
         wanted = ["command options for 'MyCmd':", '  option1 = 1',
                   '  option2 = 1']
-        self.assertEquals(msgs, wanted)
+        self.assertEqual(msgs, wanted)
 
     def test_ensure_string(self):
         cmd = self.cmd
@@ -81,7 +81,7 @@ def test_ensure_string_list(self):
         cmd = self.cmd
         cmd.option1 = 'ok,dok'
         cmd.ensure_string_list('option1')
-        self.assertEquals(cmd.option1, ['ok', 'dok'])
+        self.assertEqual(cmd.option1, ['ok', 'dok'])
 
         cmd.option2 = ['xxx', 'www']
         cmd.ensure_string_list('option2')
@@ -109,14 +109,14 @@ def test_debug_print(self):
         with captured_stdout() as stdout:
             cmd.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 cmd.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 6c85efad24..8d71234d6e 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -90,7 +90,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server1'), ('username', 'me')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
         # old format
         self.write_file(self.rc, PYPIRC_OLD)
@@ -100,7 +100,7 @@ def test_server_registration(self):
         waited = [('password', 'secret'), ('realm', 'pypi'),
                   ('repository', 'http://pypi.python.org/pypi'),
                   ('server', 'server-login'), ('username', 'tarek')]
-        self.assertEquals(config, waited)
+        self.assertEqual(config, waited)
 
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
@@ -111,7 +111,7 @@ def test_server_empty_registration(self):
         f = open(rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED)
+            self.assertEqual(content, WANTED)
         finally:
             f.close()
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index ef2e7bc317..fcb798e73b 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -34,7 +34,7 @@ def test_dump_file(self):
             f.close()
 
         dump_file(this_file, 'I am the header')
-        self.assertEquals(len(self._logs), numlines+1)
+        self.assertEqual(len(self._logs), numlines+1)
 
     def test_search_cpp(self):
         if sys.platform == 'win32':
@@ -44,10 +44,10 @@ def test_search_cpp(self):
 
         # simple pattern searches
         match = cmd.search_cpp(pattern='xxx', body='// xxx')
-        self.assertEquals(match, 0)
+        self.assertEqual(match, 0)
 
         match = cmd.search_cpp(pattern='_configtest', body='// xxx')
-        self.assertEquals(match, 1)
+        self.assertEqual(match, 1)
 
     def test_finalize_options(self):
         # finalize_options does a bit of transformation
@@ -59,9 +59,9 @@ def test_finalize_options(self):
         cmd.library_dirs = 'three%sfour' % os.pathsep
         cmd.ensure_finalized()
 
-        self.assertEquals(cmd.include_dirs, ['one', 'two'])
-        self.assertEquals(cmd.libraries, ['one'])
-        self.assertEquals(cmd.library_dirs, ['three', 'four'])
+        self.assertEqual(cmd.include_dirs, ['one', 'two'])
+        self.assertEqual(cmd.libraries, ['one'])
+        self.assertEqual(cmd.library_dirs, ['three', 'four'])
 
     def test_clean(self):
         # _clean removes files
diff --git a/tests/test_core.py b/tests/test_core.py
index 63f6b31da6..74d1f3b269 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -89,7 +89,7 @@ def test_debug_mode(self):
         with captured_stdout() as stdout:
             distutils.core.setup(name='bar')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), 'bar\n')
+        self.assertEqual(stdout.read(), 'bar\n')
 
         distutils.core.DEBUG = True
         try:
@@ -99,7 +99,7 @@ def test_debug_mode(self):
             distutils.core.DEBUG = False
         stdout.seek(0)
         wanted = "options (after parsing config files):\n"
-        self.assertEquals(stdout.readlines()[0], wanted)
+        self.assertEqual(stdout.readlines()[0], wanted)
 
 def test_suite():
     return unittest.makeSuite(CoreTestCase)
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index d81d9143b4..3550819681 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -42,8 +42,8 @@ def test_newer_pairwise(self):
         self.write_file(two)
         self.write_file(four)
 
-        self.assertEquals(newer_pairwise([one, two], [three, four]),
-                          ([one],[three]))
+        self.assertEqual(newer_pairwise([one, two], [three, four]),
+                         ([one],[three]))
 
     def test_newer_group(self):
         tmpdir = self.mkdtemp()
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index aa9f9ebb9f..84a0ec6cfc 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -37,18 +37,18 @@ def test_mkpath_remove_tree_verbosity(self):
 
         mkpath(self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         remove_tree(self.root_target, verbose=0)
 
         mkpath(self.target, verbose=1)
         wanted = ['creating %s' % self.root_target,
                   'creating %s' % self.target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
         self._logs = []
 
         remove_tree(self.root_target, verbose=1)
         wanted = ["removing '%s' (and everything under it)" % self.root_target]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
     @unittest.skipIf(sys.platform.startswith('win'),
                         "This test is only appropriate for POSIX-like systems.")
@@ -66,12 +66,12 @@ def test_mkpath_with_custom_mode(self):
     def test_create_tree_verbosity(self):
 
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
         remove_tree(self.root_target, verbose=0)
 
         wanted = ['creating %s' % self.root_target]
         create_tree(self.root_target, ['one', 'two', 'three'], verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
 
@@ -81,7 +81,7 @@ def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
 
         copy_tree(self.target, self.target2, verbose=0)
-        self.assertEquals(self._logs, [])
+        self.assertEqual(self._logs, [])
 
         remove_tree(self.root_target, verbose=0)
 
@@ -95,18 +95,18 @@ def test_copy_tree_verbosity(self):
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
     def test_ensure_relative(self):
         if os.sep == '/':
-            self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
-            self.assertEquals(ensure_relative('some/path'), 'some/path')
+            self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
+            self.assertEqual(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
-            self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+            self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
+            self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index d9b413f954..8ab7e9fc31 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -70,13 +70,13 @@ def test_debug_mode(self):
         with captured_stdout() as stdout:
             self.create_distribution(files)
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
         distutils.dist.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 self.create_distribution(files)
             stdout.seek(0)
-            self.assertEquals(stdout.read(), '')
+            self.assertEqual(stdout.read(), '')
         finally:
             distutils.dist.DEBUG = False
 
@@ -175,7 +175,7 @@ def _warn(msg):
         finally:
             warnings.warn = old_warn
 
-        self.assertEquals(len(warns), 0)
+        self.assertEqual(len(warns), 0)
 
     def test_finalize_options(self):
 
@@ -186,20 +186,20 @@ def test_finalize_options(self):
         dist.finalize_options()
 
         # finalize_option splits platforms and keywords
-        self.assertEquals(dist.metadata.platforms, ['one', 'two'])
-        self.assertEquals(dist.metadata.keywords, ['one', 'two'])
+        self.assertEqual(dist.metadata.platforms, ['one', 'two'])
+        self.assertEqual(dist.metadata.keywords, ['one', 'two'])
 
     def test_get_command_packages(self):
         dist = Distribution()
-        self.assertEquals(dist.command_packages, None)
+        self.assertEqual(dist.command_packages, None)
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command'])
-        self.assertEquals(dist.command_packages,
-                          ['distutils.command'])
+        self.assertEqual(cmds, ['distutils.command'])
+        self.assertEqual(dist.command_packages,
+                         ['distutils.command'])
 
         dist.command_packages = 'one,two'
         cmds = dist.get_command_packages()
-        self.assertEquals(cmds, ['distutils.command', 'one', 'two'])
+        self.assertEqual(cmds, ['distutils.command', 'one', 'two'])
 
 
     def test_announce(self):
@@ -236,7 +236,7 @@ def _expander(path):
             os.path.expanduser = old_expander
 
         # make sure --no-user-cfg disables the user cfg file
-        self.assertEquals(len(all_files)-1, len(files))
+        self.assertEqual(len(all_files)-1, len(files))
 
 
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
@@ -368,8 +368,8 @@ def test_custom_pydistutils(self):
     def test_fix_help_options(self):
         help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)]
         fancy_options = fix_help_options(help_tuples)
-        self.assertEquals(fancy_options[0], ('a', 'b', 'c'))
-        self.assertEquals(fancy_options[1], (1, 2, 3))
+        self.assertEqual(fancy_options[0], ('a', 'b', 'c'))
+        self.assertEqual(fancy_options[1], (1, 2, 3))
 
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
@@ -417,14 +417,14 @@ def test_read_metadata(self):
         PKG_INFO.seek(0)
         metadata.read_pkg_file(PKG_INFO)
 
-        self.assertEquals(metadata.name, "package")
-        self.assertEquals(metadata.version, "1.0")
-        self.assertEquals(metadata.description, "xxx")
-        self.assertEquals(metadata.download_url, 'http://example.com')
-        self.assertEquals(metadata.keywords, ['one', 'two'])
-        self.assertEquals(metadata.platforms, ['UNKNOWN'])
-        self.assertEquals(metadata.obsoletes, None)
-        self.assertEquals(metadata.requires, ['foo'])
+        self.assertEqual(metadata.name, "package")
+        self.assertEqual(metadata.version, "1.0")
+        self.assertEqual(metadata.description, "xxx")
+        self.assertEqual(metadata.download_url, 'http://example.com')
+        self.assertEqual(metadata.keywords, ['one', 'two'])
+        self.assertEqual(metadata.platforms, ['UNKNOWN'])
+        self.assertEqual(metadata.obsoletes, None)
+        self.assertEqual(metadata.requires, ['foo'])
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 823f211089..dbc6283981 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -38,14 +38,14 @@ def test_move_file_verbosity(self):
 
         move_file(self.source, self.target, verbose=0)
         wanted = []
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
 
         move_file(self.source, self.target, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
         # back to original state
         move_file(self.target, self.source, verbose=0)
@@ -55,7 +55,7 @@ def test_move_file_verbosity(self):
         os.mkdir(self.target_dir)
         move_file(self.source, self.target_dir, verbose=1)
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
-        self.assertEquals(self._logs, wanted)
+        self.assertEqual(self._logs, wanted)
 
     def test_write_file(self):
         lines = ['a', 'b', 'c']
@@ -63,7 +63,7 @@ def test_write_file(self):
         foo = os.path.join(dir, 'foo')
         write_file(foo, lines)
         content = [line.strip() for line in open(foo).readlines()]
-        self.assertEquals(content, lines)
+        self.assertEqual(content, lines)
 
     def test_copy_file(self):
         src_dir = self.mkdtemp()
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 0cbb48bcc6..32c56c75bc 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -24,15 +24,15 @@ class FileListTestCase(unittest.TestCase):
 
     def test_glob_to_re(self):
         # simple cases
-        self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEquals(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
+        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
 
         # special cases
-        self.assertEquals(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEquals(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEquals(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
+        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
+        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
 
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns
@@ -60,21 +60,21 @@ def test_process_template_line(self):
                   join('global', 'two.txt'), join('f', 'o', 'f.oo'),
                   join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
 
-        self.assertEquals(file_list.files, wanted)
+        self.assertEqual(file_list.files, wanted)
 
     def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
             file_list.debug_print('xxx')
         stdout.seek(0)
-        self.assertEquals(stdout.read(), '')
+        self.assertEqual(stdout.read(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 file_list.debug_print('xxx')
             stdout.seek(0)
-            self.assertEquals(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.read(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 377ae86e2f..86db4a12c5 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -27,14 +27,14 @@ def test_simple_run(self):
         self.write_file(two, 'xxx')
 
         cmd.data_files = [one, (inst2, [two])]
-        self.assertEquals(cmd.get_inputs(), [one, (inst2, [two])])
+        self.assertEqual(cmd.get_inputs(), [one, (inst2, [two])])
 
         # let's run the command
         cmd.ensure_finalized()
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         rtwo = os.path.split(two)[-1]
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         rone = os.path.split(one)[-1]
@@ -47,7 +47,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
         cmd.outfiles = []
@@ -65,7 +65,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertEquals(len(cmd.get_outputs()), 4)
+        self.assertEqual(len(cmd.get_outputs()), 4)
         self.assertTrue(os.path.exists(os.path.join(inst2, rtwo)))
         self.assertTrue(os.path.exists(os.path.join(inst, rone)))
 
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index 5b32b13ee4..aa8a4e6014 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -23,7 +23,7 @@ def test_simple_run(self):
 
         pkg_dir, dist = self.create_dist(headers=headers)
         cmd = install_headers(dist)
-        self.assertEquals(cmd.get_inputs(), headers)
+        self.assertEqual(cmd.get_inputs(), headers)
 
         # let's run the command
         cmd.install_dir = os.path.join(pkg_dir, 'inst')
@@ -31,7 +31,7 @@ def test_simple_run(self):
         cmd.run()
 
         # let's check the results
-        self.assertEquals(len(cmd.get_outputs()), 2)
+        self.assertEqual(len(cmd.get_outputs()), 2)
 
 def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 13d27abac0..754ea636a5 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -18,8 +18,8 @@ def test_finalize_options(self):
         cmd = install_lib(dist)
 
         cmd.finalize_options()
-        self.assertEquals(cmd.compile, 1)
-        self.assertEquals(cmd.optimize, 0)
+        self.assertEqual(cmd.compile, 1)
+        self.assertEqual(cmd.optimize, 0)
 
         # optimize must be 0, 1, or 2
         cmd.optimize = 'foo'
@@ -29,7 +29,7 @@ def test_finalize_options(self):
 
         cmd.optimize = '2'
         cmd.finalize_options()
-        self.assertEquals(cmd.optimize, 2)
+        self.assertEqual(cmd.optimize, 2)
 
     def _setup_byte_compile(self):
         pkg_dir, dist = self.create_dist()
@@ -81,7 +81,7 @@ def test_get_inputs(self):
         cmd.distribution.script_name = 'setup.py'
 
         # get_input should return 2 elements
-        self.assertEquals(len(cmd.get_inputs()), 2)
+        self.assertEqual(len(cmd.get_inputs()), 2)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 567505ddf1..b8e2209482 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -103,7 +103,7 @@ def test_reg_class(self):
         import _winreg
         HKCU = _winreg.HKEY_CURRENT_USER
         keys = Reg.read_keys(HKCU, 'xxxx')
-        self.assertEquals(keys, None)
+        self.assertEqual(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Control Panel')
         self.assertTrue('Desktop' in keys)
@@ -130,7 +130,7 @@ def test_remove_visual_c_ref(self):
             f.close()
 
         # makes sure the manifest was properly cleaned
-        self.assertEquals(content, _CLEANED_MANIFEST)
+        self.assertEqual(content, _CLEANED_MANIFEST)
 
 
 def test_suite():
diff --git a/tests/test_register.py b/tests/test_register.py
index 6da479b139..915427b7d9 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -122,7 +122,7 @@ def test_create_pypirc(self):
         f = open(self.rc)
         try:
             content = f.read()
-            self.assertEquals(content, WANTED_PYPIRC)
+            self.assertEqual(content, WANTED_PYPIRC)
         finally:
             f.close()
 
@@ -141,7 +141,7 @@ def _no_way(prompt=''):
         self.assertTrue(self.conn.reqs, 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
-        self.assertEquals(req2['Content-length'], req1['Content-length'])
+        self.assertEqual(req2['Content-length'], req1['Content-length'])
         self.assertTrue('xxx' in self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
@@ -154,7 +154,7 @@ def test_password_not_in_file(self):
 
         # dist.password should be set
         # therefore used afterwards by other commands
-        self.assertEquals(cmd.distribution.password, 'password')
+        self.assertEqual(cmd.distribution.password, 'password')
 
     def test_registering(self):
         # this test runs choice 2
@@ -171,7 +171,7 @@ def test_registering(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '608')
+        self.assertEqual(headers['Content-length'], '608')
         self.assertTrue('tarek' in req.data)
 
     def test_password_reset(self):
@@ -189,7 +189,7 @@ def test_password_reset(self):
         self.assertTrue(self.conn.reqs, 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
-        self.assertEquals(headers['Content-length'], '290')
+        self.assertEqual(headers['Content-length'], '290')
         self.assertTrue('tarek' in req.data)
 
     def test_strict(self):
@@ -252,7 +252,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 7cebbf53ad..b9d86bb02e 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -127,7 +127,7 @@ def test_prune_file_list(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -136,7 +136,7 @@ def test_prune_file_list(self):
             zip_file.close()
 
         # making sure everything has been pruned correctly
-        self.assertEquals(len(content), 4)
+        self.assertEqual(len(content), 4)
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_make_distribution(self):
@@ -158,8 +158,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                          ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -172,8 +171,7 @@ def test_make_distribution(self):
 
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEquals(result,
-                ['fake-1.0.tar', 'fake-1.0.tar.gz'])
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_add_defaults(self):
@@ -222,7 +220,7 @@ def test_add_defaults(self):
         # now let's check what we have
         dist_folder = join(self.tmp_dir, 'dist')
         files = os.listdir(dist_folder)
-        self.assertEquals(files, ['fake-1.0.zip'])
+        self.assertEqual(files, ['fake-1.0.zip'])
 
         zip_file = zipfile.ZipFile(join(dist_folder, 'fake-1.0.zip'))
         try:
@@ -231,13 +229,13 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 11)
+        self.assertEqual(len(content), 11)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
 
@@ -251,7 +249,7 @@ def test_metadata_check_option(self):
         cmd.ensure_finalized()
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 2)
+        self.assertEqual(len(warnings), 2)
 
         # trying with a complete set of metadata
         self.clear_logs()
@@ -260,7 +258,7 @@ def test_metadata_check_option(self):
         cmd.metadata_check = 0
         cmd.run()
         warnings = self.get_logs(WARN)
-        self.assertEquals(len(warnings), 0)
+        self.assertEqual(len(warnings), 0)
 
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
@@ -268,7 +266,7 @@ def test_check_metadata_deprecated(self):
         with check_warnings() as w:
             warnings.simplefilter("always")
             cmd.check_metadata()
-            self.assertEquals(len(w.warnings), 1)
+            self.assertEqual(len(w.warnings), 1)
 
     def test_show_formats(self):
         with captured_stdout() as stdout:
@@ -278,7 +276,7 @@ def test_show_formats(self):
         num_formats = len(ARCHIVE_FORMATS.keys())
         output = [line for line in stdout.getvalue().split('\n')
                   if line.strip().startswith('--formats=')]
-        self.assertEquals(len(output), num_formats)
+        self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
 
@@ -286,9 +284,9 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         # default options set by finalize
-        self.assertEquals(cmd.manifest, 'MANIFEST')
-        self.assertEquals(cmd.template, 'MANIFEST.in')
-        self.assertEquals(cmd.dist_dir, 'dist')
+        self.assertEqual(cmd.manifest, 'MANIFEST')
+        self.assertEqual(cmd.template, 'MANIFEST.in')
+        self.assertEqual(cmd.dist_dir, 'dist')
 
         # formats has to be a string splitable on (' ', ',') or
         # a stringlist
@@ -325,8 +323,8 @@ def test_make_distribution_owner_group(self):
         archive = tarfile.open(archive_name)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
+                self.assertEqual(member.uid, 0)
+                self.assertEqual(member.gid, 0)
         finally:
             archive.close()
 
@@ -347,7 +345,7 @@ def test_make_distribution_owner_group(self):
         # rights (see #7408)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, os.getuid())
+                self.assertEqual(member.uid, os.getuid())
         finally:
             archive.close()
 
@@ -369,7 +367,7 @@ def test_get_file_list(self):
         finally:
             f.close()
 
-        self.assertEquals(len(manifest), 5)
+        self.assertEqual(len(manifest), 5)
 
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
@@ -389,7 +387,7 @@ def test_get_file_list(self):
             f.close()
 
         # do we have the new file in MANIFEST ?
-        self.assertEquals(len(manifest2), 6)
+        self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
     def test_manifest_marker(self):
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index b9fd610e2f..6caf039031 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -20,7 +20,7 @@ def test_nt_quote_args(self):
                                (['nochange', 'nospace'],
                                 ['nochange', 'nospace'])):
             res = _nt_quote_args(args)
-            self.assertEquals(res, wanted)
+            self.assertEqual(res, wanted)
 
 
     @unittest.skipUnless(os.name in ('nt', 'posix'),
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 8449ddca78..49570c4ce5 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -36,7 +36,7 @@ def test_get_python_lib(self):
                             sysconfig.get_python_lib(prefix=TESTFN))
         _sysconfig = __import__('sysconfig')
         res = sysconfig.get_python_lib(True, True)
-        self.assertEquals(_sysconfig.get_path('platstdlib'), res)
+        self.assertEqual(_sysconfig.get_path('platstdlib'), res)
 
     def test_get_python_inc(self):
         inc_dir = sysconfig.get_python_inc()
@@ -56,8 +56,8 @@ def test_parse_makefile_base(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
-                              'OTHER': 'foo'})
+        self.assertEqual(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
+                             'OTHER': 'foo'})
 
     def test_parse_makefile_literal_dollar(self):
         self.makefile = test.test_support.TESTFN
@@ -68,8 +68,8 @@ def test_parse_makefile_literal_dollar(self):
         finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
-        self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
-                              'OTHER': 'foo'})
+        self.assertEqual(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",
+                             'OTHER': 'foo'})
 
 
 def test_suite():
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index 3093097dba..f1e32b6cc6 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -48,7 +48,7 @@ def test_class(self):
 
         def test_input(count, description, file, expected_result):
             result = file.readlines()
-            self.assertEquals(result, expected_result)
+            self.assertEqual(result, expected_result)
 
         tmpdir = self.mkdtemp()
         filename = os.path.join(tmpdir, "test.txt")
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 3ae89498a1..f45ee41e8c 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -80,7 +80,7 @@ def test_finalize_options(self):
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
                              ('repository', 'http://pypi.python.org/pypi')):
-            self.assertEquals(getattr(cmd, attr), waited)
+            self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):
         # file with no password
@@ -90,14 +90,14 @@ def test_saved_password(self):
         dist = Distribution()
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, None)
+        self.assertEqual(cmd.password, None)
 
         # make sure we get it as well, if another command
         # initialized it at the dist level
         dist.password = 'xxx'
         cmd = upload(dist)
         cmd.finalize_options()
-        self.assertEquals(cmd.password, 'xxx')
+        self.assertEqual(cmd.password, 'xxx')
 
     def test_upload(self):
         tmp = self.mkdtemp()
@@ -116,11 +116,11 @@ def test_upload(self):
         # what did we send ?
         self.assertIn('dédé', self.last_open.req.data)
         headers = dict(self.last_open.req.headers)
-        self.assertEquals(headers['Content-length'], '2085')
+        self.assertEqual(headers['Content-length'], '2085')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
-        self.assertEquals(self.last_open.req.get_method(), 'POST')
-        self.assertEquals(self.last_open.req.get_full_url(),
-                          'http://pypi.python.org/pypi')
+        self.assertEqual(self.last_open.req.get_method(), 'POST')
+        self.assertEqual(self.last_open.req.get_full_url(),
+                         'http://pypi.python.org/pypi')
         self.assertTrue('xxx' in self.last_open.req.data)
         auth = self.last_open.req.headers['Authorization']
         self.assertFalse('\n' in auth)
diff --git a/tests/test_version.py b/tests/test_version.py
index 747db94804..1d9fbc7985 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -7,12 +7,12 @@ class VersionTestCase(unittest.TestCase):
 
     def test_prerelease(self):
         version = StrictVersion('1.2.3a1')
-        self.assertEquals(version.version, (1, 2, 3))
-        self.assertEquals(version.prerelease, ('a', 1))
-        self.assertEquals(str(version), '1.2.3a1')
+        self.assertEqual(version.version, (1, 2, 3))
+        self.assertEqual(version.prerelease, ('a', 1))
+        self.assertEqual(str(version), '1.2.3a1')
 
         version = StrictVersion('1.2.0')
-        self.assertEquals(str(version), '1.2')
+        self.assertEqual(str(version), '1.2')
 
     def test_cmp_strict(self):
         versions = (('1.5.1', '1.5.2b2', -1),
@@ -41,9 +41,9 @@ def test_cmp_strict(self):
                     raise AssertionError(("cmp(%s, %s) "
                                           "shouldn't raise ValueError")
                                             % (v1, v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 
     def test_cmp(self):
@@ -59,9 +59,9 @@ def test_cmp(self):
 
         for v1, v2, wanted in versions:
             res = LooseVersion(v1).__cmp__(LooseVersion(v2))
-            self.assertEquals(res, wanted,
-                              'cmp(%s, %s) should be %s, got %s' %
-                              (v1, v2, wanted, res))
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
 
 def test_suite():
     return unittest.makeSuite(VersionTestCase)

From bc76c36d325cd64296b2d7a7420479c87e51be22 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 24 Nov 2010 19:43:47 +0000
Subject: [PATCH 3116/8469] Final patch for issue 9807.

---
 command/install.py |  6 ++++--
 sysconfig.py       | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/command/install.py b/command/install.py
index 58f6ec5b16..7f9d00f2dd 100644
--- a/command/install.py
+++ b/command/install.py
@@ -48,7 +48,7 @@
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
         'platlib': '$platbase/lib/python$py_version_short/site-packages',
-        'headers': '$base/include/python$py_version_short/$dist_name',
+        'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
@@ -82,7 +82,8 @@
     INSTALL_SCHEMES['unix_user'] = {
         'purelib': '$usersite',
         'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
+        'headers':
+            '$userbase/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$userbase/bin',
         'data'   : '$userbase',
         }
@@ -322,6 +323,7 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            'abiflags': sys.abiflags,
                            }
 
         if HAS_USER_SITE:
diff --git a/sysconfig.py b/sysconfig.py
index be91f92c36..897b7d63d6 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -11,7 +11,6 @@
 
 __revision__ = "$Id$"
 
-import io
 import os
 import re
 import sys
@@ -49,6 +48,18 @@ def _python_build():
     return False
 python_build = _python_build()
 
+# Calculate the build qualifier flags if they are defined.  Adding the flags
+# to the include and lib directories only makes sense for an installation, not
+# an in-source build.
+build_flags = ''
+try:
+    if not python_build:
+        build_flags = sys.abiflags
+except AttributeError:
+    # It's not a configure-based build, so the sys module doesn't have
+    # this attribute, which is fine.
+    pass
+
 def get_python_version():
     """Return a string containing the major and minor Python version,
     leaving off the patchlevel.  Sample return values could be '1.5'
@@ -83,7 +94,8 @@ def get_python_inc(plat_specific=0, prefix=None):
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
                 return os.path.normpath(incdir)
-        return os.path.join(prefix, "include", "python" + get_python_version())
+        python_dir = 'python' + get_python_version() + build_flags
+        return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":
         return os.path.join(prefix, "include")
     elif os.name == "os2":
@@ -209,7 +221,8 @@ def get_makefile_filename():
     if python_build:
         return os.path.join(os.path.dirname(sys.executable), "Makefile")
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
-    return os.path.join(lib_dir, "config", "Makefile")
+    config_file = 'config-{}{}'.format(get_python_version(), build_flags)
+    return os.path.join(lib_dir, config_file, 'Makefile')
 
 
 def parse_config_h(fp, g=None):

From 47c1750f35348e99498ca6e8fcec38b67efe95d9 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 25 Nov 2010 03:46:44 +0000
Subject: [PATCH 3117/8469] sys.abiflags is not defined on all platforms.

---
 command/install.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 7f9d00f2dd..bdc3a09b22 100644
--- a/command/install.py
+++ b/command/install.py
@@ -313,6 +313,11 @@ def finalize_options(self):
 
         py_version = sys.version.split()[0]
         (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
+        try:
+            abiflags = sys.abiflags
+        except AttributeError:
+            # sys.abiflags may not be defined on all platforms.
+            abiflags = ''
         self.config_vars = {'dist_name': self.distribution.get_name(),
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
@@ -323,7 +328,7 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
-                            'abiflags': sys.abiflags,
+                            'abiflags': abiflags,
                            }
 
         if HAS_USER_SITE:

From 22eaecf1e9401c320a4da6e387798e094de0679b Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Nov 2010 14:40:29 +0000
Subject: [PATCH 3118/8469] 2.7.1 final version bump

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f9f9792794..a82d4cb589 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.1rc1"
+__version__ = "2.7.1"
 #--end constants--

From 8e91a860e081fec22be2322c09613ebac1a1968c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 27 Nov 2010 14:46:13 +0000
Subject: [PATCH 3119/8469] 3.1.3 final version bump

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9684a11c45..6f55f016a2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.3rc1"
+__version__ = "3.1.3"
 #--end constants--

From a708da6b241d23acd2ae934de3a42d36a2bcaefb Mon Sep 17 00:00:00 2001
From: "Phillip J. Eby" <pje@telecommunity.com>
Date: Fri, 3 Dec 2010 17:00:40 +0000
Subject: [PATCH 3120/8469] Fix for issue10367, courtesy of Daniel Tavares.

---
 command/upload.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 980cf68d06..d0133353a6 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -176,6 +176,9 @@ def upload_file(self, command, pyversion, filename):
             result = urlopen(request)
             status = result.getcode()
             reason = result.msg
+            if self.show_response:
+                msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
+                self.announce(msg, log.INFO)
         except socket.error, e:
             self.announce(str(e), log.ERROR)
             return
@@ -189,6 +192,3 @@ def upload_file(self, command, pyversion, filename):
         else:
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
-        if self.show_response:
-            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
-            self.announce(msg, log.INFO)

From 13652894fa830ff6d9eff472a956034f09f0922e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 4 Dec 2010 19:09:24 +0000
Subject: [PATCH 3121/8469] Bump to 3.2b1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index bae33b5530..8b85f35f9d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2a4"
+__version__ = "3.2b1"
 #--end constants--

From 549a7e010309ec57035d877a7b2ca9da993d1772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 20:26:30 +0000
Subject: [PATCH 3122/8469] Fix wrong name in docstring and doc (#10693). 
 Original patch by Eli Bendersky.

---
 archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archive_util.py b/archive_util.py
index 16164c7f1f..6dd0445dbe 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -68,7 +68,7 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
 
-    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    The output zip file will be named 'base_name' + ".zip".  Uses either the
     "zipfile" Python module (if available) or the InfoZIP "zip" utility
     (if installed and found on the default search path).  If neither tool is
     available, raises DistutilsExecError.  Returns the name of the output zip

From ffc0137f6db0847ca5701ca4735511f3a816ef24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 20:30:51 +0000
Subject: [PATCH 3123/8469] Merged revisions 87277 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r87277 | eric.araujo | 2010-12-15 21:26:30 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix wrong name in docstring and doc (#10693).  Original patch by Eli Bendersky.
........
---
 archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archive_util.py b/archive_util.py
index 16164c7f1f..6dd0445dbe 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -68,7 +68,7 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
 
-    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    The output zip file will be named 'base_name' + ".zip".  Uses either the
     "zipfile" Python module (if available) or the InfoZIP "zip" utility
     (if installed and found on the default search path).  If neither tool is
     available, raises DistutilsExecError.  Returns the name of the output zip

From 2b3c0661ab064462c5b404b65befe70842f2ca88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 20:33:50 +0000
Subject: [PATCH 3124/8469] Merged revisions 87277 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r87277 | eric.araujo | 2010-12-15 21:26:30 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix wrong name in docstring and doc (#10693).  Original patch by Eli Benderski.
........
---
 archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archive_util.py b/archive_util.py
index c741cc0174..834b722ed3 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -121,7 +121,7 @@ def _set_uid_gid(tarinfo):
 def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     """Create a zip file from all the files under 'base_dir'.
 
-    The output zip file will be named 'base_dir' + ".zip".  Uses either the
+    The output zip file will be named 'base_name' + ".zip".  Uses either the
     "zipfile" Python module (if available) or the InfoZIP "zip" utility
     (if installed and found on the default search path).  If neither tool is
     available, raises DistutilsExecError.  Returns the name of the output zip

From 034ae816b59d337b63d8fc521bb786a4cefe7541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 21:07:22 +0000
Subject: [PATCH 3125/8469] Fix build_ext with VS 8.0.  Patch by Hirokazu
 Yamamoto (#9558).

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index cc0d414cf9..fb31648951 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -214,7 +214,7 @@ def finalize_options(self):
 
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS8.0', 'win32release'))
+                                         'PC', 'VS8.0'))
             elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))

From 2b9d979b2156e50f3649eb0e72c0dfb54d40abec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 21:12:12 +0000
Subject: [PATCH 3126/8469] Merged revisions 87280 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r87280 | eric.araujo | 2010-12-15 22:07:22 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix build_ext with VS 8.0.  Patch by Hirokazu Yamamoto (#9558).
........
---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 4e664642b8..502b39a82f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -214,7 +214,7 @@ def finalize_options(self):
 
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS8.0', 'win32release'))
+                                         'PC', 'VS8.0'))
             elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))

From 673ea4dd320b5e8abc19b0d6766f3c285e3c9eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Dec 2010 21:15:25 +0000
Subject: [PATCH 3127/8469] Merged revisions 87280 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

........
  r87280 | eric.araujo | 2010-12-15 22:07:22 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix build_ext with VS 8.0.  Patch by Hirokazu Yamamoto (#9558).
........
---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 5b3be6fbd6..55a4288ac0 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -207,7 +207,7 @@ def finalize_options(self):
 
             elif MSVC_VERSION == 8:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS8.0', 'win32release'))
+                                         'PC', 'VS8.0'))
             elif MSVC_VERSION == 7:
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VS7.1'))

From 6451e39efcacf15bdbe420fd9a21e46dac0a0b2e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 19 Dec 2010 10:30:28 +0000
Subject: [PATCH 3128/8469] Bump to 3.2b2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8b85f35f9d..1d752e5e03 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2b1"
+__version__ = "3.2b2"
 #--end constants--

From c0b2f9e8190d95578e94c2a550144a91aa9c5e18 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 15 Jan 2011 17:08:53 +0000
Subject: [PATCH 3129/8469] Bump to 3.2rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 1d752e5e03..40ca9b2a3a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2b2"
+__version__ = "3.2rc1"
 #--end constants--

From 663bdd57f912467e076d8e7f0be95a4755c99e4f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 30 Jan 2011 14:03:33 +0000
Subject: [PATCH 3130/8469] Bump version.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 40ca9b2a3a..4bb5012318 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2rc1"
+__version__ = "3.2rc2"
 #--end constants--

From 23a12ce1d87ed000f879d4a702e0f5c1b6ad8a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 2 Feb 2011 21:38:37 +0000
Subject: [PATCH 3131/8469] Merged revisions
 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The missing NEWS entries correspond to changes that were made before 3.1.3, but
I think it’s not usual to edit entries of released versions, so I put them at
the top.

........
  r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines

  Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
  r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines

  Prevent ResourceWarnings in test_gettext
........
  r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines

  Add missing NEWS entry for a fix committed by Senthil.

  All recent modifications to distutils should now be covered in NEWS.
........
  r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines

  This was actually fixed for the previous alpha.
........
  r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines

  Improve trace documentation (#9264).  Patch by Eli Bendersky.
........
  r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines

  Use nested method directives, rewrap long lines, fix whitespace.
........
  r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines

  Fix typo in superclass method name
........
---
 tests/__init__.py              | 5 +++--
 tests/test_archive_util.py     | 4 ++--
 tests/test_bdist.py            | 3 ++-
 tests/test_bdist_dumb.py       | 3 ++-
 tests/test_bdist_rpm.py        | 3 ++-
 tests/test_bdist_wininst.py    | 3 ++-
 tests/test_build_clib.py       | 4 +++-
 tests/test_build_ext.py        | 1 +
 tests/test_build_py.py         | 3 ++-
 tests/test_build_scripts.py    | 3 ++-
 tests/test_check.py            | 3 ++-
 tests/test_clean.py            | 3 ++-
 tests/test_cmd.py              | 6 +++---
 tests/test_config.py           | 3 ++-
 tests/test_config_cmd.py       | 3 ++-
 tests/test_core.py             | 4 ++--
 tests/test_cygwinccompiler.py  | 3 ++-
 tests/test_dir_util.py         | 3 ++-
 tests/test_dist.py             | 4 ++--
 tests/test_extension.py        | 4 ++--
 tests/test_file_util.py        | 3 ++-
 tests/test_filelist.py         | 4 ++--
 tests/test_install.py          | 4 ++--
 tests/test_install_data.py     | 3 ++-
 tests/test_install_headers.py  | 3 ++-
 tests/test_install_lib.py      | 3 ++-
 tests/test_install_scripts.py  | 3 ++-
 tests/test_log.py              | 3 ++-
 tests/test_msvc9compiler.py    | 3 ++-
 tests/test_register.py         | 4 ++--
 tests/test_sdist.py            | 8 +++-----
 tests/test_spawn.py            | 4 ++--
 tests/test_text_file.py        | 3 ++-
 tests/test_unixccompiler.py    | 3 ++-
 tests/test_upload.py           | 5 ++---
 tests/test_util.py             | 3 ++-
 tests/test_version.py          | 3 ++-
 tests/test_versionpredicate.py | 4 ++++
 38 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 7bdb912463..1b939cbd5d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,9 +15,10 @@
 import os
 import sys
 import unittest
+from test.support import run_unittest
 
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or os.curdir
 
 
 def test_suite():
@@ -32,4 +33,4 @@ def test_suite():
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index d77302d547..aff426521d 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -12,7 +12,7 @@
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 try:
     import zipfile
@@ -211,4 +211,4 @@ def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index 715283cb97..94d40cc25b 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -4,6 +4,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
@@ -40,4 +41,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index bf146eb573..cc37fef8b0 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -3,6 +3,7 @@
 import unittest
 import sys
 import os
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
@@ -77,4 +78,4 @@ def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 2aa257f7e6..804fb1355f 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -5,6 +5,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
@@ -122,4 +123,4 @@ def test_suite():
     return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 9b1ba6d107..f9e8f89e21 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,5 +1,6 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -27,4 +28,4 @@ def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index d6d1a4d0c1..69bd2bf624 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -3,6 +3,8 @@
 import os
 import sys
 
+from test.support import run_unittest
+
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
@@ -141,4 +143,4 @@ def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e8b15f156d..11844d66d3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -15,6 +15,7 @@
 
 import unittest
 from test import support
+from test.support import run_unittest
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 8a69aaa0d6..da3232cea8 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -10,6 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -114,4 +115,4 @@ def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index 85b0400460..e3326b8517 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -8,6 +8,7 @@
 from distutils import sysconfig
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildScriptsTestCase(support.TempdirManager,
@@ -108,4 +109,4 @@ def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_check.py b/tests/test_check.py
index 7c56c04339..229ae25c6d 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,5 +1,6 @@
 """Tests for distutils.command.check."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.check import check, HAS_DOCUTILS
 from distutils.tests import support
@@ -95,4 +96,4 @@ def test_suite():
     return unittest.makeSuite(CheckTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_clean.py b/tests/test_clean.py
index dbc4ee2a18..649855f7ab 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -6,6 +6,7 @@
 
 from distutils.command.clean import clean
 from distutils.tests import support
+from test.support import run_unittest
 
 class cleanTestCase(support.TempdirManager,
                     support.LoggingSilencer,
@@ -47,4 +48,4 @@ def test_suite():
     return unittest.makeSuite(cleanTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 5821fcd286..195045cc7b 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -99,7 +99,7 @@ def test_ensure_filename(self):
 
     def test_ensure_dirname(self):
         cmd = self.cmd
-        cmd.option1 = os.path.dirname(__file__)
+        cmd.option1 = os.path.dirname(__file__) or os.curdir
         cmd.ensure_dirname('option1')
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
@@ -124,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_config.py b/tests/test_config.py
index 2c075d7ee7..525bee9416 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -10,6 +10,7 @@
 from distutils.log import WARN
 
 from distutils.tests import support
+from test.support import run_unittest
 
 PYPIRC = """\
 [distutils]
@@ -116,4 +117,4 @@ def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index fcb798e73b..4f7ebdd9fc 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.support import run_unittest
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -86,4 +87,4 @@ def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_core.py b/tests/test_core.py
index d781555da5..41321f7db4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,7 +6,7 @@
 import shutil
 import sys
 import test.support
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
 
@@ -105,4 +105,4 @@ def test_suite():
     return unittest.makeSuite(CoreTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 79377a7763..856921679d 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -4,6 +4,7 @@
 import os
 from io import BytesIO
 import subprocess
+from test.support import run_unittest
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
@@ -151,4 +152,4 @@ def test_suite():
     return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
-    test_support.run_unittest(test_suite())
+    run_unittest(test_suite())
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 84a0ec6cfc..ce74589dde 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -10,6 +10,7 @@
 
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -112,4 +113,4 @@ def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 2c19d89266..1624f00e53 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -10,7 +10,7 @@
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 
-from test.support import TESTFN, captured_stdout
+from test.support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
 
 
@@ -326,4 +326,4 @@ def test_suite():
     return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_extension.py b/tests/test_extension.py
index d9a47a89c8..e35f2738b6 100755
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -3,7 +3,7 @@
 import os
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
@@ -66,4 +66,4 @@ def test_suite():
     return unittest.makeSuite(ExtensionTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 730ffde4ff..3c3e3dcb3b 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -6,6 +6,7 @@
 from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -62,4 +63,4 @@ def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index d2a2b449ee..c7e5201b17 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -2,7 +2,7 @@
 import unittest
 
 from distutils.filelist import glob_to_re, FileList
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils import debug
 
 class FileListTestCase(unittest.TestCase):
@@ -39,4 +39,4 @@ def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install.py b/tests/test_install.py
index f9c142e446..a76e3e7a3c 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -6,7 +6,7 @@
 import unittest
 import site
 
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.command.install import install
 from distutils.command import install as install_module
@@ -203,4 +203,4 @@ def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 86db4a12c5..4d8c00acb9 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_data import install_data
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -73,4 +74,4 @@ def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index aa8a4e6014..d953157bb7 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_headers import install_headers
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
@@ -37,4 +38,4 @@ def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 4636304692..fddaabe111 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -7,6 +7,7 @@
 from distutils.extension import Extension
 from distutils.tests import support
 from distutils.errors import DistutilsOptionError
+from test.support import run_unittest
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
@@ -98,4 +99,4 @@ def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 08360d297b..8952e744e5 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -7,6 +7,7 @@
 from distutils.core import Distribution
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class InstallScriptsTestCase(support.TempdirManager,
@@ -78,4 +79,4 @@ def test_suite():
     return unittest.makeSuite(InstallScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_log.py b/tests/test_log.py
index 9d40dcd72c..ce66ee51e7 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from tempfile import NamedTemporaryFile
+from test.support import run_unittest
 
 from distutils import log
 
@@ -33,4 +34,4 @@ def test_suite():
     return unittest.makeSuite(TestLog)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 570fda121e..a0d62efcfd 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -5,6 +5,7 @@
 
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
+from test.support import run_unittest
 
 _MANIFEST = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -137,4 +138,4 @@ def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_register.py b/tests/test_register.py
index c98e28a1a4..c712f56a78 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -6,7 +6,7 @@
 import urllib
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 from distutils.command import register as register_module
 from distutils.command.register import register
@@ -259,4 +259,4 @@ def test_suite():
     return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index d734ea0ac5..655e50dcfc 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -8,11 +8,9 @@
 import tempfile
 import warnings
 
-from test.support import check_warnings
-from test.support import captured_stdout
+from test.support import captured_stdout, check_warnings, run_unittest
 
-from distutils.command.sdist import sdist
-from distutils.command.sdist import show_formats
+from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -356,4 +354,4 @@ def test_suite():
     return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 0616c9f2e3..6c7eb20c47 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 import time
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn, find_executable
@@ -55,4 +55,4 @@ def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index f1e32b6cc6..7e76240a9a 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -3,6 +3,7 @@
 import unittest
 from distutils.text_file import TextFile
 from distutils.tests import support
+from test.support import run_unittest
 
 TEST_DATA = """# test file
 
@@ -103,4 +104,4 @@ def test_suite():
     return unittest.makeSuite(TextFileTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 3a41e6fcaa..1bff38e9ee 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,6 +1,7 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+from test.support import run_unittest
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
@@ -118,4 +119,4 @@ def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 8891820d67..4c6464a32e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,13 +1,12 @@
 """Tests for distutils.command.upload."""
-import sys
 import os
 import unittest
 import http.client as httpclient
+from test.support import run_unittest
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
-from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 PYPIRC_LONG_PASSWORD = """\
@@ -136,4 +135,4 @@ def test_suite():
     return unittest.makeSuite(uploadTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_util.py b/tests/test_util.py
index f40caac838..8ff5ae2085 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from copy import copy
+from test.support import run_unittest
 
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
@@ -274,4 +275,4 @@ def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_version.py b/tests/test_version.py
index 980f83f29a..15f14c7de3 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -2,6 +2,7 @@
 import unittest
 from distutils.version import LooseVersion
 from distutils.version import StrictVersion
+from test.support import run_unittest
 
 class VersionTestCase(unittest.TestCase):
 
@@ -67,4 +68,4 @@ def test_suite():
     return unittest.makeSuite(VersionTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_versionpredicate.py b/tests/test_versionpredicate.py
index 8a60dbe806..28ae09dc20 100644
--- a/tests/test_versionpredicate.py
+++ b/tests/test_versionpredicate.py
@@ -4,6 +4,10 @@
 
 import distutils.versionpredicate
 import doctest
+from test.support import run_unittest
 
 def test_suite():
     return doctest.DocTestSuite(distutils.versionpredicate)
+
+if __name__ == '__main__':
+    run_unittest(test_suite())

From b33ff8df881999f3d2ec8b99e15f5b66faca4837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 3 Feb 2011 00:12:18 +0000
Subject: [PATCH 3132/8469] Merged revisions
 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To comply with the 2.x doc style, the methods in trace.rst use brackets around
optional arguments.  The rest is a mostly straight merge, modulo support changed
to test_support and use of the old super call style in test_tuple.

........
  r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines

  Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
  r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines

  Prevent ResourceWarnings in test_gettext
........
  r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines

  Add missing NEWS entry for a fix committed by Senthil.

  All recent modifications to distutils should now be covered in NEWS.
........
  r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines

  This was actually fixed for the previous alpha.
........
  r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines

  Improve trace documentation (#9264).  Patch by Eli Bendersky.
........
  r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines

  Use nested method directives, rewrap long lines, fix whitespace.
........
  r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines

  Fix typo in superclass method name
........
---
 tests/__init__.py              | 5 +++--
 tests/test_archive_util.py     | 4 ++--
 tests/test_bdist_msi.py        | 2 +-
 tests/test_build.py            | 3 ++-
 tests/test_build_clib.py       | 4 +++-
 tests/test_build_py.py         | 3 ++-
 tests/test_build_scripts.py    | 3 ++-
 tests/test_check.py            | 3 ++-
 tests/test_clean.py            | 3 ++-
 tests/test_cmd.py              | 2 +-
 tests/test_config.py           | 3 ++-
 tests/test_config_cmd.py       | 3 ++-
 tests/test_core.py             | 4 ++--
 tests/test_dep_util.py         | 3 ++-
 tests/test_dir_util.py         | 3 ++-
 tests/test_dist.py             | 4 ++--
 tests/test_file_util.py        | 3 ++-
 tests/test_filelist.py         | 4 ++--
 tests/test_install.py          | 4 +++-
 tests/test_install_data.py     | 3 ++-
 tests/test_install_headers.py  | 3 ++-
 tests/test_install_lib.py      | 3 ++-
 tests/test_install_scripts.py  | 3 ++-
 tests/test_msvc9compiler.py    | 3 ++-
 tests/test_register.py         | 4 ++--
 tests/test_sdist.py            | 8 +++-----
 tests/test_spawn.py            | 4 ++--
 tests/test_text_file.py        | 3 ++-
 tests/test_unixccompiler.py    | 3 ++-
 tests/test_upload.py           | 7 +++----
 tests/test_util.py             | 3 ++-
 tests/test_version.py          | 3 ++-
 tests/test_versionpredicate.py | 4 ++++
 33 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 7bdb912463..697ff84045 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,9 +15,10 @@
 import os
 import sys
 import unittest
+from test.test_support import run_unittest
 
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or os.curdir
 
 
 def test_suite():
@@ -32,4 +33,4 @@ def test_suite():
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index bab91577f2..1f7106f84f 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -12,7 +12,7 @@
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
 
 try:
     import grp
@@ -281,4 +281,4 @@ def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 7554e9f170..1c897ab04d 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -11,7 +11,7 @@ class BDistMSITestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
 
-    def test_minial(self):
+    def test_minimal(self):
         # minimal test XXX need more tests
         from distutils.command.bdist_msi import bdist_msi
         pkg_pth, dist = self.create_dist()
diff --git a/tests/test_build.py b/tests/test_build.py
index 3db570382e..eeb8d73e14 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.test_support import run_unittest
 
 from distutils.command.build import build
 from distutils.tests import support
@@ -51,4 +52,4 @@ def test_suite():
     return unittest.makeSuite(BuildTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index d77912ae08..4f4e2bc7c6 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -3,6 +3,8 @@
 import os
 import sys
 
+from test.test_support import run_unittest
+
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
@@ -140,4 +142,4 @@ def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 03517392fb..937fa0ce90 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -10,6 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
+from test.test_support import run_unittest
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -123,4 +124,4 @@ def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index df89cdec25..4da93cc140 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -8,6 +8,7 @@
 import sysconfig
 
 from distutils.tests import support
+from test.test_support import run_unittest
 
 
 class BuildScriptsTestCase(support.TempdirManager,
@@ -108,4 +109,4 @@ def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_check.py b/tests/test_check.py
index 7c56c04339..4ea83dcb79 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,5 +1,6 @@
 """Tests for distutils.command.check."""
 import unittest
+from test.test_support import run_unittest
 
 from distutils.command.check import check, HAS_DOCUTILS
 from distutils.tests import support
@@ -95,4 +96,4 @@ def test_suite():
     return unittest.makeSuite(CheckTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_clean.py b/tests/test_clean.py
index dbc4ee2a18..2d1610da7c 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -6,6 +6,7 @@
 
 from distutils.command.clean import clean
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class cleanTestCase(support.TempdirManager,
                     support.LoggingSilencer,
@@ -47,4 +48,4 @@ def test_suite():
     return unittest.makeSuite(cleanTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 97cdb8ad69..e074099609 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -99,7 +99,7 @@ def test_ensure_filename(self):
 
     def test_ensure_dirname(self):
         cmd = self.cmd
-        cmd.option1 = os.path.dirname(__file__)
+        cmd.option1 = os.path.dirname(__file__) or os.curdir
         cmd.ensure_dirname('option1')
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
diff --git a/tests/test_config.py b/tests/test_config.py
index 8d71234d6e..cfd096ebc2 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -11,6 +11,7 @@
 from distutils.log import WARN
 
 from distutils.tests import support
+from test.test_support import run_unittest
 
 PYPIRC = """\
 [distutils]
@@ -119,4 +120,4 @@ def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index fcb798e73b..a36a1d5b49 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.test_support import run_unittest
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -86,4 +87,4 @@ def test_suite():
     return unittest.makeSuite(ConfigTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_core.py b/tests/test_core.py
index 74d1f3b269..0d979bcde9 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -6,7 +6,7 @@
 import shutil
 import sys
 import test.test_support
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
 
@@ -105,4 +105,4 @@ def test_suite():
     return unittest.makeSuite(CoreTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index 3550819681..751043432e 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -6,6 +6,7 @@
 from distutils.dep_util import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -77,4 +78,4 @@ def test_suite():
     return unittest.makeSuite(DepUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 84a0ec6cfc..693f77cf64 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -10,6 +10,7 @@
 
 from distutils import log
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -112,4 +113,4 @@ def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8ab7e9fc31..ba60638179 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -11,7 +11,7 @@
 from distutils.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils.cmd import Command
 import distutils.dist
-from test.test_support import TESTFN, captured_stdout
+from test.test_support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
 
 class test_dist(Command):
@@ -433,4 +433,4 @@ def test_suite():
     return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index dbc6283981..7dbcf52c68 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -6,6 +6,7 @@
 from distutils.file_util import move_file, write_file, copy_file
 from distutils import log
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -77,4 +78,4 @@ def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 32c56c75bc..be11ea5d13 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,7 +1,7 @@
 """Tests for distutils.filelist."""
 from os.path import join
 import unittest
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
 
 from distutils.filelist import glob_to_re, FileList
 from distutils import debug
@@ -82,4 +82,4 @@ def test_suite():
     return unittest.makeSuite(FileListTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install.py b/tests/test_install.py
index c834b91b38..4f976f34e6 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -3,6 +3,8 @@
 import os
 import unittest
 
+from test.test_support import run_unittest
+
 from distutils.command.install import install
 from distutils.core import Distribution
 
@@ -52,4 +54,4 @@ def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 86db4a12c5..477569444f 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_data import install_data
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class InstallDataTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -73,4 +74,4 @@ def test_suite():
     return unittest.makeSuite(InstallDataTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index aa8a4e6014..b37224b93d 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -6,6 +6,7 @@
 
 from distutils.command.install_headers import install_headers
 from distutils.tests import support
+from test.test_support import run_unittest
 
 class InstallHeadersTestCase(support.TempdirManager,
                              support.LoggingSilencer,
@@ -37,4 +38,4 @@ def test_suite():
     return unittest.makeSuite(InstallHeadersTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 754ea636a5..4d863089c0 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -7,6 +7,7 @@
 from distutils.extension import Extension
 from distutils.tests import support
 from distutils.errors import DistutilsOptionError
+from test.test_support import run_unittest
 
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
@@ -103,4 +104,4 @@ def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 08360d297b..46085458bf 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -7,6 +7,7 @@
 from distutils.core import Distribution
 
 from distutils.tests import support
+from test.test_support import run_unittest
 
 
 class InstallScriptsTestCase(support.TempdirManager,
@@ -78,4 +79,4 @@ def test_suite():
     return unittest.makeSuite(InstallScriptsTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index b8e2209482..e155dbfea3 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -5,6 +5,7 @@
 
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
+from test.test_support import run_unittest
 
 _MANIFEST = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -137,4 +138,4 @@ def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_register.py b/tests/test_register.py
index 915427b7d9..dd60f8c804 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -7,7 +7,7 @@
 import urllib2
 import warnings
 
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
 
 from distutils.command import register as register_module
 from distutils.command.register import register
@@ -258,4 +258,4 @@ def test_suite():
     return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index b9d86bb02e..ab8c3d917b 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -24,11 +24,9 @@
 import tempfile
 import warnings
 
-from test.test_support import check_warnings
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, check_warnings, run_unittest
 
-from distutils.command.sdist import sdist
-from distutils.command.sdist import show_formats
+from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -426,4 +424,4 @@ def test_suite():
     return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 6caf039031..defa54d87f 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 import time
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
 
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn, find_executable
@@ -57,4 +57,4 @@ def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_text_file.py b/tests/test_text_file.py
index f1e32b6cc6..ce19cd4dcd 100644
--- a/tests/test_text_file.py
+++ b/tests/test_text_file.py
@@ -3,6 +3,7 @@
 import unittest
 from distutils.text_file import TextFile
 from distutils.tests import support
+from test.test_support import run_unittest
 
 TEST_DATA = """# test file
 
@@ -103,4 +104,4 @@ def test_suite():
     return unittest.makeSuite(TextFileTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 3f233e2823..40c908a24d 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,6 +1,7 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+from test.test_support import run_unittest
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
@@ -126,4 +127,4 @@ def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_upload.py b/tests/test_upload.py
index f45ee41e8c..99111999d8 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,14 +1,13 @@
-"""Tests for distutils.command.upload."""
 # -*- encoding: utf8 -*-
-import sys
+"""Tests for distutils.command.upload."""
 import os
 import unittest
+from test.test_support import run_unittest
 
 from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
-from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 PYPIRC_LONG_PASSWORD = """\
@@ -129,4 +128,4 @@ def test_suite():
     return unittest.makeSuite(uploadTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_util.py b/tests/test_util.py
index 981ad000da..67cd4cc7e6 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,7 @@
 """Tests for distutils.util."""
 import sys
 import unittest
+from test.test_support import run_unittest
 
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import byte_compile
@@ -21,4 +22,4 @@ def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_version.py b/tests/test_version.py
index 1d9fbc7985..2189956429 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -2,6 +2,7 @@
 import unittest
 from distutils.version import LooseVersion
 from distutils.version import StrictVersion
+from test.test_support import run_unittest
 
 class VersionTestCase(unittest.TestCase):
 
@@ -67,4 +68,4 @@ def test_suite():
     return unittest.makeSuite(VersionTestCase)
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    run_unittest(test_suite())
diff --git a/tests/test_versionpredicate.py b/tests/test_versionpredicate.py
index 8a60dbe806..1d6c8d5a98 100644
--- a/tests/test_versionpredicate.py
+++ b/tests/test_versionpredicate.py
@@ -4,6 +4,10 @@
 
 import distutils.versionpredicate
 import doctest
+from test.test_support import run_unittest
 
 def test_suite():
     return doctest.DocTestSuite(distutils.versionpredicate)
+
+if __name__ == '__main__':
+    run_unittest(test_suite())

From d3d4f43f285902d969a2cfb2e8f4523c4937a299 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 13 Feb 2011 10:00:57 +0000
Subject: [PATCH 3133/8469] Bump for 3.2rc3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 4bb5012318..8a7e3ff92b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2rc2"
+__version__ = "3.2rc3"
 #--end constants--

From 41ef9736602618dc38120340185ef00b954058ca Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 20 Feb 2011 10:29:04 +0000
Subject: [PATCH 3134/8469] Version bump to 3.2 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8a7e3ff92b..49b6d517f6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2rc3"
+__version__ = "3.2"
 #--end constants--

From d6f2a6b6356b8963212a475e3488df3bb585fb80 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 20 Feb 2011 10:37:07 +0000
Subject: [PATCH 3135/8469] Bump trunk to 3.3 alpha 0.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 49b6d517f6..bd7d9dd634 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2"
+__version__ = "3.3a0"
 #--end constants--

From e78f5a1f0ab26979bbd4167b7db86e8579ce3c1e Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Tue, 22 Feb 2011 12:05:49 -0800
Subject: [PATCH 3136/8469] Fix for easy_install running on python-3.2

--HG--
branch : distribute
extra : rebase_source : caaf0829ce479d95efa48e5e422e699e0c4d8ff3
---
 setuptools/command/easy_install.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4ffef3def5..1a0ee561d7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -204,6 +204,12 @@ def finalize_options(self):
                             'exec_prefix': exec_prefix,
                            }
 
+        try:
+            self.config_vars['abiflags'] = sys.abiflags
+        except AttributeError:
+            # Only python-3.2+ has sys.abiflags
+            self.config_vars['abiflags'] = ''
+
         if HAS_USER_SITE:
             self.config_vars['userbase'] = self.install_userbase
             self.config_vars['usersite'] = self.install_usersite

From 6a40d111b0a9aeab8353793baaf6cfd4e61089f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= <mal@egenix.com>
Date: Fri, 25 Feb 2011 15:42:01 +0000
Subject: [PATCH 3137/8469] Normalize the encoding names for Latin-1 and UTF-8
 to 'latin-1' and 'utf-8'.

These are optimized in the Python Unicode implementation
to result in more direct processing, bypassing the codec
registry.

Also see issue11303.
---
 command/bdist_wininst.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b2e2fc6dc8..b886055f27 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -263,11 +263,11 @@ def create_exe(self, arcname, fullname, bitmap=None):
         cfgdata = cfgdata + b"\0"
         if self.pre_install_script:
             # We need to normalize newlines, so we open in text mode and
-            # convert back to bytes. "latin1" simply avoids any possible
+            # convert back to bytes. "latin-1" simply avoids any possible
             # failures.
             with open(self.pre_install_script, "r",
-                encoding="latin1") as script:
-                script_data = script.read().encode("latin1")
+                encoding="latin-1") as script:
+                script_data = script.read().encode("latin-1")
             cfgdata = cfgdata + script_data + b"\n\0"
         else:
             # empty pre-install script

From c8e04e093a418473f9fa49a2580e83c68fcf6c9b Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Sat, 12 Mar 2011 06:49:03 -0800
Subject: [PATCH 3138/8469] Use different version of py3.2 fix from Vinay Sajip

--HG--
branch : distribute
extra : rebase_source : 9eea7c29a6f7e961ca6a39decdc2e52c828e8464
---
 setuptools/command/easy_install.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 1a0ee561d7..203553414f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -202,14 +202,10 @@ def finalize_options(self):
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
+                            # Only python 3.2+ has abiflags
+                            'abiflags': getattr(sys, 'abiflags', ''),
                            }
 
-        try:
-            self.config_vars['abiflags'] = sys.abiflags
-        except AttributeError:
-            # Only python-3.2+ has sys.abiflags
-            self.config_vars['abiflags'] = ''
-
         if HAS_USER_SITE:
             self.config_vars['userbase'] = self.install_userbase
             self.config_vars['usersite'] = self.install_usersite

From 3860cc209929f5e6ec927d71cc41420665311434 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 14 Mar 2011 20:03:36 -0400
Subject: [PATCH 3139/8469] Issue #3080: skip test_bdist_rpm if sys.executable
 is not encodable to UTF-8

---
 tests/test_bdist_rpm.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 804fb1355f..030933f17c 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -28,6 +28,11 @@ class BuildRpmTestCase(support.TempdirManager,
                        unittest.TestCase):
 
     def setUp(self):
+        try:
+            sys.executable.encode("UTF-8")
+        except UnicodeEncodeError:
+            raise unittest.SkipTest("sys.executable is not encodable to UTF-8")
+
         super(BuildRpmTestCase, self).setUp()
         self.old_location = os.getcwd()
         self.old_sys_argv = sys.argv, sys.argv[:]

From 7b90f7fd67dc5e30fcd3984e3987846ae6ccd026 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2011 12:30:01 -0400
Subject: [PATCH 3140/8469] Added tag 0.6.15 for changeset 51a9d1a1f31a

--HG--
branch : distribute
extra : rebase_source : 7c3a9e67f9c30417b125cde2369890bdcd728516
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cefd3429e7..0f10f5f441 100644
--- a/.hgtags
+++ b/.hgtags
@@ -17,3 +17,4 @@ e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
 48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12
 dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14
+51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15

From 5ad4feb46a452280651cb7f6411bbaacb6b6466d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2011 12:32:24 -0400
Subject: [PATCH 3141/8469] Bumped version numbers to 0.6.16 Updated copyright
 to include 2010,2011.

--HG--
branch : distribute
extra : rebase_source : b8fc0374e3cdedf002f66c6b1b1fb5e0d378323d
---
 distribute_setup.py | 2 +-
 docs/conf.py        | 6 +++---
 setup.py            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e8f0ed06b0..23eeb2864a 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.15"
+DEFAULT_VERSION = "0.6.16"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 2bf4d37ee9..f3bd26daf0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'Distribute'
-copyright = u'2009, The fellowship of the packaging'
+copyright = u'2009-2011, The fellowship of the packaging'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.15'
+version = '0.6.16'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.15'
+release = '0.6.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index a78588239b..05b666917a 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.15"
+VERSION = "0.6.16"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 5bff24b86b4ad1400e9f063f3e371cac0fdd0e59 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 15 Mar 2011 21:02:59 +0100
Subject: [PATCH 3142/8469] On behalf of Tarek: Issue #11501:
 disutils.archive_utils.make_zipfile no longer fails if zlib is not installed.
 Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile.
 Patch by Natalia B. Bidart.

---
 archive_util.py            | 19 ++++++++++-------
 tests/test_archive_util.py | 42 ++++++++++++++++++++++++++++++++++----
 tests/test_bdist_dumb.py   |  8 ++++++++
 tests/test_sdist.py        | 15 +++++++++++++-
 4 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 6dd0445dbe..c06eba351d 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -9,6 +9,12 @@
 from warnings import warn
 import sys
 
+try:
+    import zipfile
+except ImportError:
+    zipfile = None
+
+
 from distutils.errors import DistutilsExecError
 from distutils.spawn import spawn
 from distutils.dir_util import mkpath
@@ -74,11 +80,6 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
     available, raises DistutilsExecError.  Returns the name of the output zip
     file.
     """
-    try:
-        import zipfile
-    except ImportError:
-        zipfile = None
-
     zip_filename = base_name + ".zip"
     mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
 
@@ -105,8 +106,12 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
                  zip_filename, base_dir)
 
         if not dry_run:
-            zip = zipfile.ZipFile(zip_filename, "w",
-                                  compression=zipfile.ZIP_DEFLATED)
+            try:
+                zip = zipfile.ZipFile(zip_filename, "w",
+                                      compression=zipfile.ZIP_DEFLATED)
+            except RuntimeError:
+                zip = zipfile.ZipFile(zip_filename, "w",
+                                      compression=zipfile.ZIP_STORED)
 
             for dirpath, dirnames, filenames in os.walk(base_dir):
                 for name in filenames:
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index aff426521d..f969849590 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -7,12 +7,13 @@
 from os.path import splitdrive
 import warnings
 
+from distutils import archive_util
 from distutils.archive_util import (check_archive_formats, make_tarball,
                                     make_zipfile, make_archive,
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings, run_unittest
+from test.support import check_warnings, run_unittest, patch
 
 try:
     import zipfile
@@ -20,10 +21,18 @@
 except ImportError:
     ZIP_SUPPORT = find_executable('zip')
 
+try:
+    import zlib
+    ZLIB_SUPPORT = True
+except ImportError:
+    ZLIB_SUPPORT = False
+
+
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
                           unittest.TestCase):
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_make_tarball(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -84,8 +93,9 @@ def _create_files(self):
         base_name = os.path.join(tmpdir2, 'archive')
         return tmpdir, tmpdir2, base_name
 
-    @unittest.skipUnless(find_executable('tar') and find_executable('gzip'),
-                         'Need the tar command to run')
+    @unittest.skipUnless(find_executable('tar') and find_executable('gzip')
+                         and ZLIB_SUPPORT,
+                         'Need the tar, gzip and zlib command to run')
     def test_tarfile_vs_tar(self):
         tmpdir, tmpdir2, base_name =  self._create_files()
         old_dir = os.getcwd()
@@ -169,7 +179,8 @@ def test_compress_deprecated(self):
         self.assertTrue(not os.path.exists(tarball))
         self.assertEqual(len(w.warnings), 1)
 
-    @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
+    @unittest.skipUnless(ZIP_SUPPORT and ZLIB_SUPPORT,
+                         'Need zip and zlib support to run')
     def test_make_zipfile(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -182,6 +193,29 @@ def test_make_zipfile(self):
 
         # check if the compressed tarball was created
         tarball = base_name + '.zip'
+        self.assertTrue(os.path.exists(tarball))
+
+    @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
+    def test_make_zipfile_no_zlib(self):
+        patch(self, archive_util.zipfile, 'zlib', None)  # force zlib ImportError
+
+        called = []
+        zipfile_class = zipfile.ZipFile
+        def fake_zipfile(*a, **kw):
+            if kw.get('compression', None) == zipfile.ZIP_STORED:
+                called.append((a, kw))
+            return zipfile_class(*a, **kw)
+
+        patch(self, archive_util.zipfile, 'ZipFile', fake_zipfile)
+
+        # create something to tar and compress
+        tmpdir, tmpdir2, base_name = self._create_files()
+        make_zipfile(base_name, tmpdir)
+
+        tarball = base_name + '.zip'
+        self.assertEqual(called,
+                         [((tarball, "w"), {'compression': zipfile.ZIP_STORED})])
+        self.assertTrue(os.path.exists(tarball))
 
     def test_check_archive_formats(self):
         self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index cc37fef8b0..55ba58d14f 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -18,6 +18,13 @@
 
 """
 
+try:
+    import zlib
+    ZLIB_SUPPORT = True
+except ImportError:
+    ZLIB_SUPPORT = False
+
+
 class BuildDumbTestCase(support.TempdirManager,
                         support.LoggingSilencer,
                         support.EnvironGuard,
@@ -34,6 +41,7 @@ def tearDown(self):
         sys.argv[:] = self.old_sys_argv[1]
         super(BuildDumbTestCase, self).tearDown()
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_simple_built(self):
 
         # let's create a simple package
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 655e50dcfc..eaf39a45ba 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -40,6 +40,13 @@
 somecode%(sep)sdoc.txt
 """
 
+try:
+    import zlib
+    ZLIB_SUPPORT = True
+except ImportError:
+    ZLIB_SUPPORT = False
+
+
 class SDistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
@@ -78,6 +85,7 @@ def _warn(*args):
         cmd.warn = _warn
         return dist, cmd
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_prune_file_list(self):
         # this test creates a package with some vcs dirs in it
         # and launch sdist to make sure they get pruned
@@ -119,6 +127,7 @@ def test_prune_file_list(self):
         # making sure everything has been pruned correctly
         self.assertEqual(len(content), 4)
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_make_distribution(self):
 
         # check if tar and gzip are installed
@@ -153,6 +162,7 @@ def test_make_distribution(self):
         result.sort()
         self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_add_defaults(self):
 
         # http://bugs.python.org/issue2279
@@ -218,6 +228,7 @@ def test_add_defaults(self):
         finally:
             f.close()
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_metadata_check_option(self):
         # testing the `medata-check` option
         dist, cmd = self.get_cmd(metadata={})
@@ -277,7 +288,7 @@ def test_finalize_options(self):
         cmd.formats = 'supazipa'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
-
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated
         dist, cmd = self.get_cmd()
@@ -318,6 +329,7 @@ def test_get_file_list(self):
         self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_manifest_marker(self):
         # check that autogenerated MANIFESTs have a marker
         dist, cmd = self.get_cmd()
@@ -334,6 +346,7 @@ def test_manifest_marker(self):
         self.assertEqual(manifest[0],
                          '# file GENERATED by distutils, do NOT edit')
 
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()

From 877161a90666a528acaa1169d33db58abbf2c964 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 16 Mar 2011 11:05:33 +0200
Subject: [PATCH 3143/8469] #11565: Fix several typos. Patch by Piotr Kasprzyk.

---
 cmd.py                | 2 +-
 cygwinccompiler.py    | 2 +-
 tests/test_clean.py   | 2 +-
 tests/test_install.py | 2 +-
 tests/test_sdist.py   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd.py b/cmd.py
index ae4efc7efc..5b1d085c32 100644
--- a/cmd.py
+++ b/cmd.py
@@ -359,7 +359,7 @@ def copy_tree(self, infile, outfile, preserve_mode=1, preserve_times=1,
                                   not self.force, dry_run=self.dry_run)
 
     def move_file (self, src, dst, level=1):
-        """Move a file respectin dry-run flag."""
+        """Move a file respecting dry-run flag."""
         return file_util.move_file(src, dst, dry_run=self.dry_run)
 
     def spawn(self, cmd, search_path=1, level=1):
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 95fa3ed3c8..536aa6b61b 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -155,7 +155,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
             self.dll_libraries = get_msvcr()
 
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-        """Compiles the source by spawing GCC and windres if needed."""
+        """Compiles the source by spawning GCC and windres if needed."""
         if ext == '.rc' or ext == '.res':
             # gcc needs '.res' and '.rc' compiled to object files !!!
             try:
diff --git a/tests/test_clean.py b/tests/test_clean.py
index 649855f7ab..eb8958bff5 100755
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -39,7 +39,7 @@ def test_simple_run(self):
             self.assertTrue(not os.path.exists(path),
                          '%s was not removed' % path)
 
-        # let's run the command again (should spit warnings but suceed)
+        # let's run the command again (should spit warnings but succeed)
         cmd.all = 1
         cmd.ensure_finalized()
         cmd.run()
diff --git a/tests/test_install.py b/tests/test_install.py
index a76e3e7a3c..ed69b0cbb0 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -62,7 +62,7 @@ def test_user_site(self):
         if sys.version < '2.6':
             return
 
-        # preparing the environement for the test
+        # preparing the environment for the test
         self.old_user_base = site.USER_BASE
         self.old_user_site = site.USER_SITE
         self.tmpdir = self.mkdtemp()
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index eaf39a45ba..c7dd47fb5c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -311,7 +311,7 @@ def test_get_file_list(self):
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
 
-        # make sure build_py is reinitinialized, like a fresh run
+        # make sure build_py is reinitialized, like a fresh run
         build_py = dist.get_command_obj('build_py')
         build_py.finalized = False
         build_py.ensure_finalized()

From 14b28f28de2b0ac9e40d9838ea72df93fb661b51 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 16 Mar 2011 12:34:31 +0200
Subject: [PATCH 3144/8469] #11565: Fix several typos. Patch by Piotr Kasprzyk.

---
 cmd.py              | 2 +-
 tests/test_clean.py | 2 +-
 tests/test_sdist.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd.py b/cmd.py
index dc40c14d61..9ad5657e40 100644
--- a/cmd.py
+++ b/cmd.py
@@ -377,7 +377,7 @@ def copy_tree(self, infile, outfile,
             dry_run=self.dry_run)
 
     def move_file (self, src, dst, level=1):
-        """Move a file respectin dry-run flag."""
+        """Move a file respecting dry-run flag."""
         return file_util.move_file(src, dst, dry_run = self.dry_run)
 
     def spawn (self, cmd, search_path=1, level=1):
diff --git a/tests/test_clean.py b/tests/test_clean.py
index 2d1610da7c..7b988f7f32 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -39,7 +39,7 @@ def test_simple_run(self):
             self.assertTrue(not os.path.exists(path),
                          '%s was not removed' % path)
 
-        # let's run the command again (should spit warnings but suceed)
+        # let's run the command again (should spit warnings but succeed)
         cmd.all = 1
         cmd.ensure_finalized()
         cmd.run()
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index ab8c3d917b..54a32b88f5 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -370,7 +370,7 @@ def test_get_file_list(self):
         # adding a file
         self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#')
 
-        # make sure build_py is reinitinialized, like a fresh run
+        # make sure build_py is reinitialized, like a fresh run
         build_py = dist.get_command_obj('build_py')
         build_py.finalized = False
         build_py.ensure_finalized()

From 6d6e6bcde6387eccbbd6ec9eadce75a25d0219a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Mar 2011 14:46:31 -0400
Subject: [PATCH 3145/8469] Now builds gztar for sdist, even on Windows

--HG--
branch : distribute
extra : rebase_source : b2bdd9e6dc69f742c5b203ee26fc5d9b7c7224b3
---
 CHANGES.txt                          | 6 ++++++
 distribute.egg-info/entry_points.txt | 2 +-
 setup.cfg                            | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ee3dea6e89..69f9b9c22b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.16
+------
+
+* Builds sdist gztar even on Windows (avoiding Issue 193).
+
 ------
 0.6.15
 ------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index e1f704d8cb..9fd4175819 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setup.cfg b/setup.cfg
index dc4cfd970e..d7dfbb772e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,4 +13,7 @@ build-dir = docs/build
 all_files = 1
 
 [upload_docs]
-upload-dir = docs/build/html
\ No newline at end of file
+upload-dir = docs/build/html
+
+[sdist]
+formats=gztar

From 5a4d274c93ab53f31f3926757cbe80a0dbdf0130 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Mar 2011 16:19:13 -0400
Subject: [PATCH 3146/8469] Fix for issue192

--HG--
branch : distribute
extra : rebase_source : cbae39614a979ea69ced9a0541e71b0377c3a9d5
---
 setuptools/command/bdist_egg.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 3bb56fc35b..68ca15c799 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -332,7 +332,11 @@ def gen_header(self):
 
 
     def copy_metadata_to(self, target_dir):
-        prefix = os.path.join(self.egg_info,'')
+        "Copy metadata (egg info) to the target_dir"
+        # normalize the path (so that a forward-slash in egg_info will
+        # match using startswith below)
+        norm_egg_info = os.path.normpath(self.egg_info)
+        prefix = os.path.join(norm_egg_info,'')
         for path in self.ei_cmd.filelist.files:
             if path.startswith(prefix):
                 target = os.path.join(target_dir, path[len(prefix):])

From 8bf1bc0e657b65bdc41575f9b6b0372f77f2d7b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Mar 2011 16:21:40 -0400
Subject: [PATCH 3147/8469] updated CHANGES

--HG--
branch : distribute
extra : rebase_source : efcd3ced19c5f87851089e8506a118dc6f2aa21a
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 69f9b9c22b..7e5f8cb785 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ CHANGES
 ------
 
 * Builds sdist gztar even on Windows (avoiding Issue 193).
+* Fix for Issue 192 - metadata omitted on Windows when package_dir
+  specified with forward-slash.
 
 ------
 0.6.15

From 0cb7fa265e11dcb58dcdf3a8be4497bf3beb01a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2011 10:34:57 -0400
Subject: [PATCH 3148/8469] Applying patch provided by Didrik Pinte on #195 for
 Cython build_ext support

--HG--
branch : distribute
extra : rebase_source : 69be8a07f86d1fbbdace2b7965a2c4a6cc5a14bf
---
 setuptools/extension.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index d186c7a2d3..df1ef02ae7 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -3,8 +3,16 @@
 _Extension = _get_unpatched(_Extension)
 
 try:
-    from Pyrex.Distutils.build_ext import build_ext
+    # testing Cython first as it is supposed to replace pyrex
+    from Cython.Distutils.build_ext import build_ext
 except ImportError:
+    try:
+        from Pyrex.Distutils.build_ext import build_ext
+    except:
+        have_pyrex = False
+    else:
+        has_pyrex = True
+
     have_pyrex = False
 else:
     have_pyrex = True

From c60c5df22eab4e1bd4eead560e18184ebdcca108 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2011 10:44:42 -0400
Subject: [PATCH 3149/8469] Refactored Cython/Pyrex optional build support to
 unify logic

--HG--
branch : distribute
extra : rebase_source : c924cf1817736349e9a254098b6d99cd97a3d35f
---
 setuptools/extension.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index df1ef02ae7..980ee0a7b4 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -2,20 +2,16 @@
 from setuptools.dist import _get_unpatched
 _Extension = _get_unpatched(_Extension)
 
-try:
-    # testing Cython first as it is supposed to replace pyrex
-    from Cython.Distutils.build_ext import build_ext
-except ImportError:
-    try:
-        from Pyrex.Distutils.build_ext import build_ext
-    except:
-        have_pyrex = False
-    else:
-        has_pyrex = True
-
-    have_pyrex = False
-else:
-    have_pyrex = True
+# Prefer Cython to Pyrex
+pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
+for pyrex_impl in pyrex_impls:
+	try:
+		# from (pyrex_impl) import build_ext
+		build_ext = __import__(pyrex_impl, fromlist=['build_ext']).build_ext
+		break
+	except:
+		pass
+have_pyrex = 'build_ext' in globals()
 
 
 class Extension(_Extension):

From 119e1f717238083a18d973f988114789c5b3e41b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2011 10:45:47 -0400
Subject: [PATCH 3150/8469] Updated changes.txt. Fixes #195.

--HG--
branch : distribute
extra : rebase_source : 3d0a67b5a6a9e265e56e68b598341e69fc1256b4
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7e5f8cb785..b1263eb84e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES
 * Builds sdist gztar even on Windows (avoiding Issue 193).
 * Fix for Issue 192 - metadata omitted on Windows when package_dir
   specified with forward-slash.
+* Issue 195: Cython build support.
 
 ------
 0.6.15

From 623c67f82759f75b20834aa82085593d553c6ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 14 Apr 2011 03:49:19 +0200
Subject: [PATCH 3151/8469] Fix improper tests in RegisterTestCase

---
 tests/test_register.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_register.py b/tests/test_register.py
index c712f56a78..cb72a11538 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -137,7 +137,7 @@ def _no_way(prompt=''):
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assertTrue(self.conn.reqs, 2)
+        self.assertEqual(len(self.conn.reqs), 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
 
@@ -169,7 +169,7 @@ def test_registering(self):
             del register_module.input
 
         # we should have send a request
-        self.assertTrue(self.conn.reqs, 1)
+        self.assertEqual(len(self.conn.reqs), 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '608')
@@ -187,7 +187,7 @@ def test_password_reset(self):
             del register_module.input
 
         # we should have send a request
-        self.assertTrue(self.conn.reqs, 1)
+        self.assertEqual(len(self.conn.reqs), 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '290')

From fb7e64a2c2d32923a81b4ea701e61d65e970bdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 14 Apr 2011 03:49:19 +0200
Subject: [PATCH 3152/8469] Fix improper tests in RegisterTestCase

---
 tests/test_register.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_register.py b/tests/test_register.py
index dd60f8c804..bf63487035 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -138,7 +138,7 @@ def _no_way(prompt=''):
 
         # let's see what the server received : we should
         # have 2 similar requests
-        self.assertTrue(self.conn.reqs, 2)
+        self.assertEqual(len(self.conn.reqs), 2)
         req1 = dict(self.conn.reqs[0].headers)
         req2 = dict(self.conn.reqs[1].headers)
         self.assertEqual(req2['Content-length'], req1['Content-length'])
@@ -168,7 +168,7 @@ def test_registering(self):
             del register_module.raw_input
 
         # we should have send a request
-        self.assertTrue(self.conn.reqs, 1)
+        self.assertEqual(len(self.conn.reqs), 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '608')
@@ -186,7 +186,7 @@ def test_password_reset(self):
             del register_module.raw_input
 
         # we should have send a request
-        self.assertTrue(self.conn.reqs, 1)
+        self.assertEqual(len(self.conn.reqs), 1)
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '290')

From 1509fe5874ad7155482d71b1b922bfdeb522ab58 Mon Sep 17 00:00:00 2001
From: agroszer <none@none>
Date: Fri, 15 Apr 2011 10:49:49 +0200
Subject: [PATCH 3153/8469] Fixing #200

--HG--
branch : distribute
extra : rebase_source : 4446e76a0bcf2e968abce2020569aecbaab1df01
---
 setuptools/command/easy_install.py    |  3 ++-
 setuptools/package_index.py           | 17 +++++++++++++----
 setuptools/tests/test_packageindex.py |  9 +++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 203553414f..fb0f997994 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -15,6 +15,7 @@
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
+from distutils.util import get_platform
 from distutils.util import convert_path, subst_vars
 from distutils.sysconfig import get_python_lib, get_config_vars
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
@@ -854,7 +855,7 @@ def install_exe(self, dist_filename, tmpdir):
         # Create a dummy distribution object until we build the real distro
         dist = Distribution(None,
             project_name=cfg.get('metadata','name'),
-            version=cfg.get('metadata','version'), platform="win32"
+            version=cfg.get('metadata','version'), platform=get_platform()
         )
 
         # Convert the .exe to an unpacked egg
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 459cae2c0b..6d4047af61 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -31,16 +31,25 @@ def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
     lower = name.lower()
-    base, py_ver = None, None
+    base, py_ver, plat = None, None, None
 
     if lower.endswith('.exe'):
         if lower.endswith('.win32.exe'):
             base = name[:-10]
+            plat = 'win32'
         elif lower.startswith('.win32-py',-16):
             py_ver = name[-7:-4]
             base = name[:-16]
+            plat = 'win32'
+        elif lower.endswith('.win-amd64.exe'):
+            base = name[:-14]
+            plat = 'win-amd64'
+        elif lower.startswith('.win-amd64-py',-20):
+            py_ver = name[-7:-4]
+            base = name[:-20]
+            plat = 'win-amd64'
+    return base,py_ver,plat
 
-    return base,py_ver
 
 def egg_info_for_url(url):
     scheme, server, path, parameters, query, fragment = urlparse.urlparse(url)
@@ -69,10 +78,10 @@ def distros_for_location(location, basename, metadata=None):
         return [Distribution.from_location(location, basename, metadata)]
 
     if basename.endswith('.exe'):
-        win_base, py_ver = parse_bdist_wininst(basename)
+        win_base, py_ver, platform = parse_bdist_wininst(basename)
         if win_base is not None:
             return interpret_distro_name(
-                location, win_base, metadata, py_ver, BINARY_DIST, "win32"
+                location, win_base, metadata, py_ver, BINARY_DIST, platform
             )
 
     # Try source distro extensions (.zip, .tgz, etc.)
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 42cb8c1e5e..00d44ca689 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -108,5 +108,14 @@ def test_links_priority(self):
         # the link should be from the index
         self.assert_('correct_md5' in pi['foobar'][0].location)
 
+    def test_parse_bdist_wininst(self):
+        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
+            'reportlab-2.5.win32-py2.4.exe'), ('reportlab-2.5', '2.4', 'win32'))
+        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
+            'reportlab-2.5.win32.exe'), ('reportlab-2.5', None, 'win32'))
+        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
+            'reportlab-2.5.win-amd64-py2.7.exe'), ('reportlab-2.5', '2.7', 'win-amd64'))
+        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
+            'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64'))
 
 

From f55d96faafe20a6b938a4706834abb69aa0b48c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 17 Apr 2011 14:27:07 +0200
Subject: [PATCH 3154/8469] Fix resource warning found manually

---
 command/sdist.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 1118060cbb..fdbebd7e0f 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -294,17 +294,20 @@ def read_template(self):
                             join_lines=1, lstrip_ws=1, rstrip_ws=1,
                             collapse_join=1)
 
-        while True:
-            line = template.readline()
-            if line is None:            # end of file
-                break
-
-            try:
-                self.filelist.process_template_line(line)
-            except DistutilsTemplateError as msg:
-                self.warn("%s, line %d: %s" % (template.filename,
-                                               template.current_line,
-                                               msg))
+        try:
+            while True:
+                line = template.readline()
+                if line is None:            # end of file
+                    break
+
+                try:
+                    self.filelist.process_template_line(line)
+                except DistutilsTemplateError as msg:
+                    self.warn("%s, line %d: %s" % (template.filename,
+                                                   template.current_line,
+                                                   msg))
+        finally:
+            template.close()
 
     def prune_file_list(self):
         """Prune off branches that might slip into the file list as created

From 85a903122782775c4e41b0f2ef1f262f71c1b439 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Apr 2011 09:26:11 -0400
Subject: [PATCH 3155/8469] Updated changelog to include fix for Issue 200

--HG--
branch : distribute
extra : rebase_source : 0a839d22eb973622610fa3cb2fbfae638c1c89b7
---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b1263eb84e..8476903492 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,9 +7,10 @@ CHANGES
 ------
 
 * Builds sdist gztar even on Windows (avoiding Issue 193).
-* Fix for Issue 192 - metadata omitted on Windows when package_dir
+* Issue 192: Fixed metadata omitted on Windows when package_dir
   specified with forward-slash.
 * Issue 195: Cython build support.
+* Issue 200: Issues with recognizing 64-bit packages on Windows.
 
 ------
 0.6.15

From a14f22b9e70e85b20f6171b3e108464bf5359f55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Apr 2011 09:10:25 -0400
Subject: [PATCH 3156/8469] Added tag 0.6.16 for changeset 3f1ff138e947

--HG--
branch : distribute
extra : rebase_source : aa7a4724efac75554f3a1790034ed55ec3a877d2
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0f10f5f441..bf64adc605 100644
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,4 @@ e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
 dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14
 51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15
+3f1ff138e947bfc1c9bcfe0037030b7bfb4ab3a5 0.6.16

From dba705d9f2ffb25b4ecf293604b01dbcf88c6d7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Apr 2011 09:14:15 -0400
Subject: [PATCH 3157/8469] Bumped working revisions to 0.6.17

--HG--
branch : distribute
extra : rebase_source : 0d0c60865356a460ec83f3d4554cf9cd522ec8a1
---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 setup.py            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 23eeb2864a..9f441067b1 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.16"
+DEFAULT_VERSION = "0.6.17"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index f3bd26daf0..e52891fe7a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.16'
+version = '0.6.17'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.16'
+release = '0.6.17'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 05b666917a..f2a3a6d9e8 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.16"
+VERSION = "0.6.17"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From c9e28986af40be12d8e52c4e2b5445946cfeb640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 1 May 2011 02:05:58 +0200
Subject: [PATCH 3158/8469] Fix file handle leak

---
 command/sdist.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 0c3b0b55bf..cf8982bd9d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -306,17 +306,20 @@ def read_template(self):
                             rstrip_ws=1,
                             collapse_join=1)
 
-        while 1:
-            line = template.readline()
-            if line is None:            # end of file
-                break
-
-            try:
-                self.filelist.process_template_line(line)
-            except DistutilsTemplateError, msg:
-                self.warn("%s, line %d: %s" % (template.filename,
-                                               template.current_line,
-                                               msg))
+        try:
+            while 1:
+                line = template.readline()
+                if line is None:            # end of file
+                    break
+
+                try:
+                    self.filelist.process_template_line(line)
+                except DistutilsTemplateError, msg:
+                    self.warn("%s, line %d: %s" % (template.filename,
+                                                   template.current_line,
+                                                   msg))
+        finally:
+            template.close()
 
     def prune_file_list(self):
         """Prune off branches that might slip into the file list as created

From 540753de877e149efb1ff20e132031d004ab33de Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 8 May 2011 09:03:36 +0200
Subject: [PATCH 3159/8469] Bump to 3.2.1b1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 49b6d517f6..17c89ee82e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2"
+__version__ = "3.2.1b1"
 #--end constants--

From dcd99c95a5aef0137ccf177c6830de9d7c5d52ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 8 May 2011 16:27:13 +0200
Subject: [PATCH 3160/8469] Make test_distutils pass without zlib (fixes #9435)

---
 tests/test_sdist.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 54a32b88f5..61f9c1f79b 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -388,6 +388,7 @@ def test_get_file_list(self):
         self.assertEqual(len(manifest2), 6)
         self.assertIn('doc2.txt', manifest2[-1])
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_manifest_marker(self):
         # check that autogenerated MANIFESTs have a marker
         dist, cmd = self.get_cmd()
@@ -404,6 +405,7 @@ def test_manifest_marker(self):
         self.assertEqual(manifest[0],
                          '# file GENERATED by distutils, do NOT edit')
 
+    @unittest.skipUnless(zlib, "requires zlib")
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()

From 942c7a73182fd88a290e89dc3e06ac2871cfbced Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 11 May 2011 00:14:28 +0200
Subject: [PATCH 3161/8469] Close #10419, issue #6011: build_scripts command of
 distutils handles correctly non-ASCII path (path to the Python executable).
 Open and write the script in binary mode, but ensure that the shebang is
 decodable from UTF-8 and from the encoding of the script.

---
 command/build_scripts.py | 45 ++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 8b08bfeaf0..a43a7c306a 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -11,9 +11,10 @@
 from distutils.dep_util import newer
 from distutils.util import convert_path, Mixin2to3
 from distutils import log
+import tokenize
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
+first_line_re = re.compile(b'^#!.*python[0-9.]*([ \t].*)?$')
 
 class build_scripts(Command):
 
@@ -74,12 +75,14 @@ def copy_scripts(self):
             # that way, we'll get accurate feedback if we can read the
             # script.
             try:
-                f = open(script, "r")
+                f = open(script, "rb")
             except IOError:
                 if not self.dry_run:
                     raise
                 f = None
             else:
+                encoding, lines = tokenize.detect_encoding(f.readline)
+                f.seek(0)
                 first_line = f.readline()
                 if not first_line:
                     self.warn("%s is an empty file (skipping)" % script)
@@ -88,25 +91,45 @@ def copy_scripts(self):
                 match = first_line_re.match(first_line)
                 if match:
                     adjust = True
-                    post_interp = match.group(1) or ''
+                    post_interp = match.group(1) or b''
 
             if adjust:
                 log.info("copying and adjusting %s -> %s", script,
                          self.build_dir)
                 updated_files.append(outfile)
                 if not self.dry_run:
-                    outf = open(outfile, "w")
                     if not sysconfig.python_build:
-                        outf.write("#!%s%s\n" %
-                                   (self.executable,
-                                    post_interp))
+                        executable = self.executable
                     else:
-                        outf.write("#!%s%s\n" %
-                                   (os.path.join(
+                        executable = os.path.join(
                             sysconfig.get_config_var("BINDIR"),
                            "python%s%s" % (sysconfig.get_config_var("VERSION"),
-                                           sysconfig.get_config_var("EXE"))),
-                                    post_interp))
+                                           sysconfig.get_config_var("EXE")))
+                    executable = os.fsencode(executable)
+                    shebang = b"#!" + executable + post_interp + b"\n"
+                    # Python parser starts to read a script using UTF-8 until
+                    # it gets a #coding:xxx cookie. The shebang has to be the
+                    # first line of a file, the #coding:xxx cookie cannot be
+                    # written before. So the shebang has to be decodable from
+                    # UTF-8.
+                    try:
+                        shebang.decode('utf-8')
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from utf-8".format(shebang))
+                    # If the script is encoded to a custom encoding (use a
+                    # #coding:xxx cookie), the shebang has to be decodable from
+                    # the script encoding too.
+                    try:
+                        shebang.decode(encoding)
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from the script encoding ({})"
+                            .format(shebang, encoding))
+                    outf = open(outfile, "wb")
+                    outf.write(shebang)
                     outf.writelines(f.readlines())
                     outf.close()
                 if f:

From aadd806fbbb624e62206009ca056d30847176d9a Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 11 May 2011 00:14:28 +0200
Subject: [PATCH 3162/8469] Close #10419, issue #6011: build_scripts command of
 distutils handles correctly non-ASCII path (path to the Python executable).
 Open and write the script in binary mode, but ensure that the shebang is
 decodable from UTF-8 and from the encoding of the script.

---
 command/build_scripts.py | 45 ++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 8b08bfeaf0..a43a7c306a 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -11,9 +11,10 @@
 from distutils.dep_util import newer
 from distutils.util import convert_path, Mixin2to3
 from distutils import log
+import tokenize
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
+first_line_re = re.compile(b'^#!.*python[0-9.]*([ \t].*)?$')
 
 class build_scripts(Command):
 
@@ -74,12 +75,14 @@ def copy_scripts(self):
             # that way, we'll get accurate feedback if we can read the
             # script.
             try:
-                f = open(script, "r")
+                f = open(script, "rb")
             except IOError:
                 if not self.dry_run:
                     raise
                 f = None
             else:
+                encoding, lines = tokenize.detect_encoding(f.readline)
+                f.seek(0)
                 first_line = f.readline()
                 if not first_line:
                     self.warn("%s is an empty file (skipping)" % script)
@@ -88,25 +91,45 @@ def copy_scripts(self):
                 match = first_line_re.match(first_line)
                 if match:
                     adjust = True
-                    post_interp = match.group(1) or ''
+                    post_interp = match.group(1) or b''
 
             if adjust:
                 log.info("copying and adjusting %s -> %s", script,
                          self.build_dir)
                 updated_files.append(outfile)
                 if not self.dry_run:
-                    outf = open(outfile, "w")
                     if not sysconfig.python_build:
-                        outf.write("#!%s%s\n" %
-                                   (self.executable,
-                                    post_interp))
+                        executable = self.executable
                     else:
-                        outf.write("#!%s%s\n" %
-                                   (os.path.join(
+                        executable = os.path.join(
                             sysconfig.get_config_var("BINDIR"),
                            "python%s%s" % (sysconfig.get_config_var("VERSION"),
-                                           sysconfig.get_config_var("EXE"))),
-                                    post_interp))
+                                           sysconfig.get_config_var("EXE")))
+                    executable = os.fsencode(executable)
+                    shebang = b"#!" + executable + post_interp + b"\n"
+                    # Python parser starts to read a script using UTF-8 until
+                    # it gets a #coding:xxx cookie. The shebang has to be the
+                    # first line of a file, the #coding:xxx cookie cannot be
+                    # written before. So the shebang has to be decodable from
+                    # UTF-8.
+                    try:
+                        shebang.decode('utf-8')
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from utf-8".format(shebang))
+                    # If the script is encoded to a custom encoding (use a
+                    # #coding:xxx cookie), the shebang has to be decodable from
+                    # the script encoding too.
+                    try:
+                        shebang.decode(encoding)
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from the script encoding ({})"
+                            .format(shebang, encoding))
+                    outf = open(outfile, "wb")
+                    outf.write(shebang)
                     outf.writelines(f.readlines())
                     outf.close()
                 if f:

From 8c2ad1791ef7504de9f6483af7617da21cc53daf Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 11 May 2011 00:57:29 +0200
Subject: [PATCH 3163/8469] Issue #10419: Fix build_scripts command of
 distutils to handle correctly non-ASCII scripts. Open and write the script in
 binary mode, but ensure that the shebang is decodable from UTF-8 and from the
 encoding of the script.

---
 command/build_scripts.py | 47 ++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 8b08bfeaf0..b3c767e319 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -11,9 +11,11 @@
 from distutils.dep_util import newer
 from distutils.util import convert_path, Mixin2to3
 from distutils import log
+import sys
+import tokenize
 
 # check if Python is called on the first line with this expression
-first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
+first_line_re = re.compile(b'^#!.*python[0-9.]*([ \t].*)?$')
 
 class build_scripts(Command):
 
@@ -74,12 +76,14 @@ def copy_scripts(self):
             # that way, we'll get accurate feedback if we can read the
             # script.
             try:
-                f = open(script, "r")
+                f = open(script, "rb")
             except IOError:
                 if not self.dry_run:
                     raise
                 f = None
             else:
+                encoding, lines = tokenize.detect_encoding(f.readline)
+                f.seek(0)
                 first_line = f.readline()
                 if not first_line:
                     self.warn("%s is an empty file (skipping)" % script)
@@ -88,25 +92,46 @@ def copy_scripts(self):
                 match = first_line_re.match(first_line)
                 if match:
                     adjust = True
-                    post_interp = match.group(1) or ''
+                    post_interp = match.group(1) or b''
 
             if adjust:
                 log.info("copying and adjusting %s -> %s", script,
                          self.build_dir)
                 updated_files.append(outfile)
                 if not self.dry_run:
-                    outf = open(outfile, "w")
                     if not sysconfig.python_build:
-                        outf.write("#!%s%s\n" %
-                                   (self.executable,
-                                    post_interp))
+                        executable = self.executable
                     else:
-                        outf.write("#!%s%s\n" %
-                                   (os.path.join(
+                        executable = os.path.join(
                             sysconfig.get_config_var("BINDIR"),
                            "python%s%s" % (sysconfig.get_config_var("VERSION"),
-                                           sysconfig.get_config_var("EXE"))),
-                                    post_interp))
+                                           sysconfig.get_config_var("EXE")))
+                    executable = executable.encode(sys.getfilesystemencoding(),
+                                                   'surrogateescape')
+                    shebang = b"#!" + executable + post_interp + b"\n"
+                    # Python parser starts to read a script using UTF-8 until
+                    # it gets a #coding:xxx cookie. The shebang has to be the
+                    # first line of a file, the #coding:xxx cookie cannot be
+                    # written before. So the shebang has to be decodable from
+                    # UTF-8.
+                    try:
+                        shebang.decode('utf-8')
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from utf-8".format(shebang))
+                    # If the script is encoded to a custom encoding (use a
+                    # #coding:xxx cookie), the shebang has to be decodable from
+                    # the script encoding too.
+                    try:
+                        shebang.decode(encoding)
+                    except UnicodeDecodeError:
+                        raise ValueError(
+                            "The shebang ({!r}) is not decodable "
+                            "from the script encoding ({})"
+                            .format(shebang, encoding))
+                    outf = open(outfile, "wb")
+                    outf.write(shebang)
                     outf.writelines(f.readlines())
                     outf.close()
                 if f:

From c2520e2d34b0139205471d0c6867393d15fb5d6a Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 11 May 2011 19:06:35 +0200
Subject: [PATCH 3164/8469] Support Python >=3.1.4 and >=3.2.1. Type of
 distutils.command.build_scripts.first_line_re has been changed by the fix for
 http://bugs.python.org/issue10419.

--HG--
branch : distribute
extra : rebase_source : cd656cab87ff4f912ce5146b96e841b4eb17c49d
---
 CHANGES.txt                        | 6 ++++++
 setuptools/command/easy_install.py | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8476903492..542424d18f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.17
+------
+
+* Support Python >=3.1.4 and >=3.2.1.
+
 ------
 0.6.16
 ------
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fb0f997994..58e7ab3913 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1590,6 +1590,11 @@ def make_relative(self,path):
 def get_script_header(script_text, executable=sys_executable, wininst=False):
     """Create a #! line, getting options (if any) from script_text"""
     from distutils.command.build_scripts import first_line_re
+
+    # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern.
+    if not isinstance(first_line_re.pattern, str):
+        first_line_re = re.compile(first_line_re.pattern.decode())
+
     first = (script_text+'\n').splitlines()[0]
     match = first_line_re.match(first)
     options = ''

From 563a44dea6e49eff7883c6c9c8b08a887e096738 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 15 May 2011 16:44:27 +0200
Subject: [PATCH 3165/8469] Issue #9516: avoid errors in sysconfig when
 MACOSX_DEPLOYMENT_TARGET is set in shell.

Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.
---
 sysconfig.py            |  2 +-
 tests/test_build_ext.py | 56 ++++++++++++++++++++++++++++++++++++++++-
 util.py                 |  4 +--
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 33cc5a38a5..d206e0cdf9 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -389,7 +389,7 @@ def _init_posix():
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
             cur_target = cfg_target
-            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
+            os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target
         elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 86568ebb7a..46dcb5ed5d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -3,12 +3,13 @@
 import tempfile
 import shutil
 from StringIO import StringIO
+import textwrap
 
 from distutils.core import Extension, Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests import support
-from distutils.errors import DistutilsSetupError
+from distutils.errors import DistutilsSetupError, CompileError
 
 import unittest
 from test import test_support
@@ -430,6 +431,59 @@ def test_build_ext_path_cross_platform(self):
         wanted = os.path.join(cmd.build_lib, 'UpdateManager', 'fdsend' + ext)
         self.assertEqual(ext_path, wanted)
 
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target(self):
+        self._try_compile_deployment_target()
+
+        orig_environ = os.environ
+        os.environ = orig_environ.copy()
+        self.addCleanup(setattr, os, 'environ', orig_environ)
+
+        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.1'
+        self._try_compile_deployment_target()
+
+
+    def _try_compile_deployment_target(self):
+        deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c')
+
+        with open(deptarget_c, 'w') as fp:
+            fp.write(textwrap.dedent('''\
+                #include <AvailabilityMacros.h>
+
+                int dummy;
+
+                #if TARGET != MAC_OS_X_VERSION_MIN_REQUIRED
+                #error "Unexpected target"
+               #endif
+
+            '''))
+
+        target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+        target = tuple(map(int, target.split('.')))
+        target = '%02d%01d0' % target
+
+        deptarget_ext = Extension(
+            'deptarget',
+            [deptarget_c],
+            extra_compile_args=['-DTARGET=%s'%(target,)],
+        )
+        dist = Distribution({
+            'name': 'deptarget',
+            'ext_modules': [deptarget_ext]
+        })
+        dist.package_dir = self.tmp_dir
+        cmd = build_ext(dist)
+        cmd.build_lib = self.tmp_dir
+        cmd.build_temp = self.tmp_dir
+
+        try:
+            old_stdout = sys.stdout
+            cmd.ensure_finalized()
+            cmd.run()
+
+        except CompileError:
+            self.fail("Wrong deployment target during compilation")
+
 def test_suite():
     return unittest.makeSuite(BuildExtTestCase)
 
diff --git a/util.py b/util.py
index f06e4fdf88..6c49f0b1cb 100644
--- a/util.py
+++ b/util.py
@@ -97,9 +97,7 @@ def get_platform ():
         from distutils.sysconfig import get_config_vars
         cfgvars = get_config_vars()
 
-        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
-        if not macver:
-            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+        macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
 
         if 1:
             # Always calculate the release of the running machine,

From bc38a51782ce2e7d290cc6afbb7a22a8fde5e109 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 15 May 2011 16:46:11 +0200
Subject: [PATCH 3166/8469] Issue #9516: avoid errors in sysconfig when
 MACOSX_DEPLOYMENT_TARGET is set in shell.

Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.
---
 sysconfig.py            |  2 +-
 tests/test_build_ext.py | 62 +++++++++++++++++++++++++++++++++++++++++
 tests/test_util.py      |  9 ++++--
 util.py                 |  4 +--
 4 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 897b7d63d6..06bbc01cd6 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -428,7 +428,7 @@ def _init_posix():
         cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
         if cur_target == '':
             cur_target = cfg_target
-            os.putenv('MACOSX_DEPLOYMENT_TARGET', cfg_target)
+            os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target
         elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]:
             my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
                 % (cur_target, cfg_target))
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index dcba75f703..0aa99babee 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -2,6 +2,7 @@
 import os
 import shutil
 from io import StringIO
+import textwrap
 
 from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
@@ -419,6 +420,67 @@ def test_ext_fullpath(self):
         wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext)
         self.assertEqual(wanted, path)
 
+
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target(self):
+        self._try_compile_deployment_target()
+
+        orig_environ = os.environ
+        os.environ = orig_environ.copy()
+        self.addCleanup(setattr, os, 'environ', orig_environ)
+
+        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.1'
+        self._try_compile_deployment_target()
+
+
+    def _try_compile_deployment_target(self):
+        deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c')
+
+        with open(deptarget_c, 'w') as fp:
+            fp.write(textwrap.dedent('''\
+                #include <AvailabilityMacros.h>
+
+                int dummy;
+
+                #if TARGET != MAC_OS_X_VERSION_MIN_REQUIRED
+                #error "Unexpected target"
+                #endif
+
+            '''))
+
+        target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+        target = tuple(map(int, target.split('.')))
+        target = '%02d%01d0' % target
+
+        deptarget_ext = Extension(
+            'deptarget',
+            [deptarget_c],
+            extra_compile_args=['-DTARGET=%s'%(target,)],
+        )
+        dist = Distribution({
+            'name': 'deptarget',
+            'ext_modules': [deptarget_ext]
+        })
+        dist.package_dir = self.tmp_dir
+        cmd = build_ext(dist)
+        cmd.build_lib = self.tmp_dir
+        cmd.build_temp = self.tmp_dir
+
+        try:
+            old_stdout = sys.stdout
+            if not support.verbose:
+                # silence compiler output
+                sys.stdout = StringIO()
+            try:
+                cmd.ensure_finalized()
+                cmd.run()
+            finally:
+                sys.stdout = old_stdout
+
+        except CompileError:
+            self.fail("Wrong deployment target during compilation")
+
+
 def test_suite():
     src = _get_source_filename()
     if not os.path.exists(src):
diff --git a/tests/test_util.py b/tests/test_util.py
index 8ff5ae2085..1a06d4c4a1 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -92,7 +92,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+        get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -105,7 +105,7 @@ def test_get_platform(self):
             sys.maxsize = cursize
 
         # macbook with fat binaries (fat, universal or fat64)
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+        get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -113,6 +113,10 @@ def test_get_platform(self):
 
         self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.1'
+        self.assertEqual(get_platform(), 'macosx-10.4-fat')
+
+
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -147,6 +151,7 @@ def test_get_platform(self):
 
             self.assertEqual(get_platform(), 'macosx-10.4-%s'%(arch,))
 
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '
diff --git a/util.py b/util.py
index ce3cd6ca33..d6f89d65e5 100644
--- a/util.py
+++ b/util.py
@@ -96,9 +96,7 @@ def get_platform ():
         from distutils.sysconfig import get_config_vars
         cfgvars = get_config_vars()
 
-        macver = os.environ.get('MACOSX_DEPLOYMENT_TARGET')
-        if not macver:
-            macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
+        macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
 
         if 1:
             # Always calculate the release of the running machine,

From 47892871bc741f9c21e2cdec4384b5aec2f2bb1a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 15 May 2011 17:52:42 +0200
Subject: [PATCH 3167/8469] Bump to 3.2.1rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 17c89ee82e..70ab7dbf2b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1b1"
+__version__ = "3.2.1rc1"
 #--end constants--

From f679304a95d0b377fd069c56fc975a82da9ee2ca Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 16 May 2011 14:22:31 +0200
Subject: [PATCH 3168/8469] Tolerate responses with multiple Content-Length
 headers - fixes #196

--HG--
branch : distribute
extra : rebase_source : b0f0f73fd59017dd9a9bb6e58b2a1fd9e5773dd2
---
 setuptools/package_index.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 6d4047af61..0230497d4d 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -579,7 +579,9 @@ def _download_to(self, url, filename):
             bs = self.dl_blocksize
             size = -1
             if "content-length" in headers:
-                size = int(headers["Content-Length"])
+                # Some servers return multiple Content-Length headers :(
+                content_length = headers.getheaders("Content-Length")[0]
+                size = int(content_length)
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')
             while True:

From 44c1998e667e3ccd2f793e29c6bac3806a08e1ee Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 16 May 2011 18:02:09 +0200
Subject: [PATCH 3169/8469] Fix a typo in documentation.

--HG--
branch : distribute
extra : rebase_source : 871f62d8e38382e2b75d26ce80085133bc0c1153
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index da159bfe54..4105dc2e41 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2519,7 +2519,7 @@ a non-None value.  Here's an example validation function::
 
 Your function should accept three arguments: the ``Distribution`` object,
 the attribute name, and the attribute value.  It should raise a
-``DistutilsSetupError`` (from the ``distutils.error`` module) if the argument
+``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
 is invalid.  Remember, your function will only be called with non-None values,
 and the default value of arguments defined this way is always None.  So, your
 commands should always be prepared for the possibility that the attribute will

From 606015e88f41070ffb182dfcc57926a858dd3358 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <aurelien@bompard.org>
Date: Tue, 17 May 2011 08:12:10 +0200
Subject: [PATCH 3170/8469] Don't try to import the parent of a namespace
 package in declare_namespace -- fixes #204

--HG--
branch : distribute
extra : rebase_source : 1644e937b2d0b2fae58e27740d0fddfe082586cd
---
 pkg_resources.py                   | 11 ++++++-----
 setuptools/tests/test_resources.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 30dbc18812..5eb19df357 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1773,11 +1773,12 @@ def declare_namespace(packageName):
         if '.' in packageName:
             parent = '.'.join(packageName.split('.')[:-1])
             declare_namespace(parent)
-            __import__(parent)
-            try:
-                path = sys.modules[parent].__path__
-            except AttributeError:
-                raise TypeError("Not a package:", parent)
+            if parent not in _namespace_packages:
+                __import__(parent)
+                try:
+                    path = sys.modules[parent].__path__
+                except AttributeError:
+                    raise TypeError("Not a package:", parent)
 
         # Track what packages are namespaces, so when new path items are added,
         # they can be updated
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 883cfad19f..e02bd8d544 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -3,7 +3,7 @@
 # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove
 from unittest import TestCase, makeSuite; from pkg_resources import *
 from setuptools.command.easy_install import get_script_header, is_sh
-import os, pkg_resources, sys, StringIO
+import os, pkg_resources, sys, StringIO, tempfile, shutil
 try: frozenset
 except NameError:
     from sets import ImmutableSet as frozenset
@@ -563,3 +563,29 @@ def test_get_script_header_jython_workaround(self):
             sys.platform = platform
             sys.stdout = stdout
 
+
+
+
+class NamespaceTests(TestCase):
+
+    def setUp(self):
+        self._ns_pkgs = pkg_resources._namespace_packages.copy()
+        self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-")
+        sys.path.append(self._tmpdir)
+
+    def tearDown(self):
+        shutil.rmtree(self._tmpdir)
+        pkg_resources._namespace_packages = self._ns_pkgs.copy()
+        sys.path.remove(self._tmpdir)
+
+    def test_two_levels_deep(self):
+        os.makedirs(os.path.join(self._tmpdir, "pkg1", "pkg2"))
+        declare_namespace("pkg1")
+        self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys())
+        try:
+            declare_namespace("pkg1.pkg2")
+        except ImportError, e:
+            self.fail("Distribute tried to import the parent namespace package")
+        self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys())
+        self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
+

From 09653b8554161ad38cf06341a4893c610da44f5a Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 19 May 2011 15:18:36 +0200
Subject: [PATCH 3171/8469] Issue #10419, issue #6011: port 6ad356525381 fix
 from distutils to packaging

build_scripts command of packaging now handles correctly non-ASCII path (path
to the Python executable). Open and write the script in binary mode, but ensure
that the shebang is decodable from UTF-8 and from the encoding of the script.
---
 command/build_scripts.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index a43a7c306a..31be7930d7 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -128,10 +128,9 @@ def copy_scripts(self):
                             "The shebang ({!r}) is not decodable "
                             "from the script encoding ({})"
                             .format(shebang, encoding))
-                    outf = open(outfile, "wb")
-                    outf.write(shebang)
-                    outf.writelines(f.readlines())
-                    outf.close()
+                    with open(outfile, "wb") as outf:
+                        outf.write(shebang)
+                        outf.writelines(f.readlines())
                 if f:
                     f.close()
             else:

From d71f44e082fb25025dd678e6440aad3e623dcb2e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 19 May 2011 19:56:12 +0200
Subject: [PATCH 3172/8469] Issue #12120, Issue #12119: tests were missing a
 sys.dont_write_bytecode check

---
 tests/test_build_py.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index da3232cea8..00a57cc922 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -58,7 +58,8 @@ def test_package_data(self):
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
         self.assertTrue("__init__.py" in files)
-        self.assertTrue("__init__.pyc" in files)
+        if not sys.dont_write_bytecode:
+            self.assertTrue("__init__.pyc" in files)
         self.assertTrue("README.txt" in files)
 
     def test_empty_package_dir (self):

From d76ad0a7d55448992833c36ecbc1899ae0e17683 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Fri, 20 May 2011 10:14:01 +0200
Subject: [PATCH 3173/8469] save the working set state

--HG--
branch : distribute
extra : rebase_source : 001d8f0f0c467b664751fffc42b1b1c344654e93
---
 pkg_resources.py | 56 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5eb19df357..d704aad5f0 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -52,9 +52,41 @@ def _bypass_ensure_directory(name, mode=0777):
         mkdir(dirname, mode)
 
 
+_state_vars = {}
 
+def _declare_state(vartype, **kw):
+    g = globals()
+    for name, val in kw.iteritems():
+        g[name] = val
+        _state_vars[name] = vartype
+
+def __getstate__():
+    state = {}
+    g = globals()
+    for k, v in _state_vars.iteritems():
+        state[k] = g['_sget_'+v](g[k])
+    return state
+
+def __setstate__(state):
+    g = globals()
+    for k, v in state.iteritems():
+        g['_sset_'+_state_vars[k]](k, g[k], v)
+    return state
+
+def _sget_dict(val):
+    return val.copy()
+
+def _sset_dict(key, ob, state):
+    ob.clear()
+    ob.update(state)
+
+def _sget_object(val):
+    return val.__getstate__()
 
+def _sset_object(key, ob, state):
+    ob.__setstate__(state)
 
+_sget_none = _sset_none = lambda *args: None
 
 
 
@@ -672,12 +704,14 @@ def _added_new(self, dist):
         for callback in self.callbacks:
             callback(dist)
 
+    def __getstate__(self):
+        return (self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
+                self.callbacks[:])
 
-
-
-
-
-
+    def __setstate__(self, (entries, keys, by_key, callbacks)):
+        self.entries = entries[:]
+        self.by_key = by_key.copy()
+        self.callbacks = callbacks[:]
 
 
 
@@ -1638,7 +1672,7 @@ def get_importer(path_item):
 
 
 
-_distribution_finders = {}
+_declare_state('dict', _distribution_finders = {})
 
 def register_finder(importer_type, distribution_finder):
     """Register `distribution_finder` to find distributions in sys.path items
@@ -1720,8 +1754,9 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(ImpWrapper,find_on_path)
 
-_namespace_handlers = {}
-_namespace_packages = {}
+_declare_state('dict', _namespace_handlers={})
+_declare_state('dict', _namespace_packages={})
+
 
 def register_namespace_handler(importer_type, namespace_handler):
     """Register `namespace_handler` to declare namespace packages
@@ -2651,7 +2686,7 @@ def _mkstemp(*args,**kw):
         os.open = old_open  # and then put it back
 
 
-# Set up global resource manager
+# Set up global resource manager (deliberately not state-saved)
 _manager = ResourceManager()
 def _initialize(g):
     for name in dir(_manager):
@@ -2660,7 +2695,8 @@ def _initialize(g):
 _initialize(globals())
 
 # Prepare the master working set and make the ``require()`` API available
-working_set = WorkingSet()
+_declare_state('object', working_set = WorkingSet())
+
 try:
     # Does the main program list any requirements?
     from __main__ import __requires__

From 38ac54038c96d339f55a66af6ad8da20320ff411 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Fri, 20 May 2011 16:08:26 -0400
Subject: [PATCH 3174/8469] Adds some missing bits to the sandbox fix--need to
 actually save/restore the pkg_resources state.

--HG--
branch : distribute
extra : rebase_source : 961ca56f30a6aabb5d24eff3cabb527d1be93ae4
---
 pkg_resources.py      | 1 +
 setuptools/sandbox.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index d704aad5f0..636d6ff997 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -710,6 +710,7 @@ def __getstate__(self):
 
     def __setstate__(self, (entries, keys, by_key, callbacks)):
         self.entries = entries[:]
+        self.entry_keys = keys.copy()
         self.by_key = by_key.copy()
         self.callbacks = callbacks[:]
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index a06d44837c..8e0c09b5ea 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,4 +1,4 @@
-import os, sys, __builtin__, tempfile, operator
+import os, sys, __builtin__, tempfile, operator, pkg_resources
 _os = sys.modules[os.name]
 try:
     _file = file
@@ -19,6 +19,7 @@ def run_setup(setup_script, args):
     if not os.path.isdir(temp_dir): os.makedirs(temp_dir)
     save_tmp = tempfile.tempdir
     save_modules = sys.modules.copy()
+    pr_state = pkg_resources.__getstate__()
     try:
         tempfile.tempdir = temp_dir
         os.chdir(setup_dir)
@@ -36,6 +37,7 @@ def run_setup(setup_script, args):
                 raise
             # Normal exit, just return
     finally:
+        pkg_resources.__setstate__(pr_state)
         sys.modules.update(save_modules)
         for key in list(sys.modules):
             if key not in save_modules: del sys.modules[key]

From 2c6268e3d2cddb476763b780ffaaba62a154a38d Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sun, 22 May 2011 22:09:55 +0200
Subject: [PATCH 3175/8469] Issue 12132 - skip the test_buil_ext test if the xx
 module is not found

---
 tests/test_build_ext.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 0aa99babee..a5b9700fe6 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -35,7 +35,9 @@ def setUp(self):
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
-        shutil.copy(_get_source_filename(), self.tmp_dir)
+        filename = _get_source_filename()
+        if os.path.exists(filename):
+            shutil.copy(filename, self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -65,6 +67,8 @@ def _fixup_command(self, cmd):
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
+        if not os.path.exists(xx_c):
+            return
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir

From d47eed43b85912d5e9443b6cc5514913946075cd Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sun, 22 May 2011 23:47:14 +0200
Subject: [PATCH 3176/8469] Support
 DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment variable to
 allow to disable installation of easy_install-${version} script.

--HG--
branch : distribute
extra : rebase_source : 9a278ec5528955480faee8f9192295b3b8e77b5b
---
 CHANGES.txt |  2 ++
 setup.py    | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 542424d18f..55662218b4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.17
 ------
 
+* Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment
+  variable to allow to disable installation of easy_install-${version} script.
 * Support Python >=3.1.4 and >=3.2.1.
 
 ------
diff --git a/setup.py b/setup.py
index f2a3a6d9e8..21db64c314 100755
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,10 @@
 
 scripts = []
 
+console_scripts = ["easy_install = setuptools.command.easy_install:main"]
+if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+    console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
+
 # specific command that is used to generate windows .exe files
 class build_py(_build_py):
     def build_package_data(self):
@@ -182,11 +186,7 @@ def _being_installed():
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
 
-        "console_scripts": [
-             "easy_install = setuptools.command.easy_install:main",
-             "easy_install-%s = setuptools.command.easy_install:main"
-                % sys.version[:3]
-        ],
+        "console_scripts": console_scripts,
 
         "setuptools.file_finders":
             ["svn_cvs = setuptools.command.sdist:_default_revctrl"],

From 6ad276bf9c860d9d62af0ec45c537cef03b3fc93 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Mon, 23 May 2011 10:52:19 -0400
Subject: [PATCH 3177/8469] setting to_scan to [] instead of None ensures
 (somewhat confusingly) that find_links are used, when available, to install
 each dist listed in setup_requires

--HG--
branch : distribute
extra : rebase_source : 4efd4ba05e527df60a33c55da30c19586a9cecdb
---
 setuptools/dist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index fd4ca66b93..0ad18122cf 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -266,6 +266,7 @@ def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
         try:
             cmd = self._egg_fetcher
+            cmd.package_index.to_scan = []
         except AttributeError:
             from setuptools.command.easy_install import easy_install
             dist = self.__class__({'script_args':['easy_install']})

From d9b753aa56fa9bd0b9f6d9aa0d7ea32a5cdbc750 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 23 May 2011 15:22:56 -0400
Subject: [PATCH 3178/8469] Replay changeset 70238:03e488b5c009 from fubar
 branch.  Original commit message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.
---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 90f96feae1..6f4c021c62 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.6"
+__version__ = "2.6.7rc1"
 #--end constants--

From 744a4d498494ca6760eae00670adf90c777e32e5 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Mon, 23 May 2011 15:26:11 -0400
Subject: [PATCH 3179/8469] Replay changeset 70248:c714e2f92f63 from fubar
 branch.  Original commit message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.
---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6f4c021c62..b2a208201c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.7rc1"
+__version__ = "2.6.7rc2"
 #--end constants--

From 2c7c3ba77385bd56ed6f8f59abdeff78cca3fe8a Mon Sep 17 00:00:00 2001
From: Oliver Tonnhofer <olt@bogosoft.com>
Date: Thu, 26 May 2011 10:01:41 +0200
Subject: [PATCH 3180/8469] make isntallation instructions from "Make the
 transition today" image copy&pastable

--HG--
branch : distribute
extra : rebase_source : 27fe3c391ba104b4a98c1836a92af608ef3cc0df
---
 docs/index.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/index.txt b/docs/index.txt
index fa87ac36b1..5f3b945b20 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -28,3 +28,9 @@ Documentation content:
 .. image:: http://python-distribute.org/pip_distribute.png
 
 Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0
+
+Copy & paste::
+
+ curl -O http://python-distribute.org/distribute_setup.py
+ python distribute_setup.py
+ easy_install pip
\ No newline at end of file

From d715e5ae9aeabfec93c9f4478f9933f9b991b06a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 26 May 2011 12:12:42 +0200
Subject: [PATCH 3181/8469] skipping a tets if in virtualenv

--HG--
branch : distribute
extra : rebase_source : c0928a6dc8eaa695a8abedd25c9defb0561145a3
---
 setuptools/tests/test_develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index a567dd5a74..5576d5e5f2 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -43,7 +43,7 @@ def tearDown(self):
             site.USER_SITE = self.old_site
 
     def test_develop(self):
-        if sys.version < "2.6":
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
         dist = Distribution()
         dist.script_name = 'setup.py'

From ce2661f4246098d8d1dbc3336b8cf0e58f514eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 28 May 2011 23:21:19 +0200
Subject: [PATCH 3182/8469] Fix test_distutils when sys.dont_write_bytecode is
 true (#9831).

The tests now pass all combinations of -O/-OO and -B.  See also #7071
and #6292 for previous variations on the same theme.
---
 tests/test_build_py.py | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 937fa0ce90..6c6ec208aa 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -17,7 +17,7 @@ class BuildPyTestCase(support.TempdirManager,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
-    def _setup_package_data(self):
+    def test_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
         try:
@@ -57,20 +57,15 @@ def _setup_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        return files
-
-    def test_package_data(self):
-        files = self._setup_package_data()
-        self.assertTrue("__init__.py" in files)
-        self.assertTrue("README.txt" in files)
-
-    @unittest.skipIf(sys.flags.optimize >= 2,
-                     "pyc files are not written with -O2 and above")
-    def test_package_data_pyc(self):
-        files = self._setup_package_data()
-        self.assertTrue("__init__.pyc" in files)
-
-    def test_empty_package_dir (self):
+        self.assertIn("__init__.py", files)
+        self.assertIn("README.txt", files)
+        # XXX even with -O, distutils writes pyc, not pyo; bug?
+        if sys.dont_write_bytecode:
+            self.assertNotIn("__init__.pyc", files)
+        else:
+            self.assertIn("__init__.pyc", files)
+
+    def test_empty_package_dir(self):
         # See SF 1668596/1720897.
         cwd = os.getcwd()
 
@@ -118,7 +113,7 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+        self.assertIn('byte-compiling is disabled', self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From b62fd2a2e3fed4d2ad97131f67cbc77c19246431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 28 May 2011 23:32:50 +0200
Subject: [PATCH 3183/8469] Fix test_build_py when sys.dont_write_bytecode is
 true (#9831).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tests now pass all combinations of -O/-OO and -B.  See also #7071
and #6292 for previous variations on the same theme.

test_versionpredicate needs a skip when sys.flags.optimize is true, but
I don’t know how to make that work with a DocTestSuite.
---
 tests/test_build_py.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index da3232cea8..4e46339b43 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -57,11 +57,15 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
-        self.assertTrue("__init__.py" in files)
-        self.assertTrue("__init__.pyc" in files)
-        self.assertTrue("README.txt" in files)
-
-    def test_empty_package_dir (self):
+        self.assertIn("__init__.py", files)
+        self.assertIn("README.txt", files)
+        # XXX even with -O, distutils writes pyc, not pyo; bug?
+        if sys.dont_write_bytecode:
+            self.assertNotIn("__init__.pyc", files)
+        else:
+            self.assertIn("__init__.pyc", files)
+
+    def test_empty_package_dir(self):
         # See SF 1668596/1720897.
         cwd = os.getcwd()
 
@@ -109,7 +113,7 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+        self.assertIn('byte-compiling is disabled', self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

From b93d39b5f98d32aea6a9dc32ba80f2822018b953 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 May 2011 16:06:00 -0500
Subject: [PATCH 3184/8469] bump to 3.1.4rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6f55f016a2..5f8425fb1d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.3"
+__version__ = "3.1.4rc1"
 #--end constants--

From 8dff8ac3dff450113681b7510636be1c8e9d0270 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 May 2011 16:50:27 -0500
Subject: [PATCH 3185/8469] bump to 2.7.2rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a82d4cb589..e9fc2d6c45 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.1"
+__version__ = "2.7.2rc1"
 #--end constants--

From d80cea8774172de2c584d27aab700a7dfe6ffdbd Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 17:55:38 +0200
Subject: [PATCH 3186/8469] Updated CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : ad6afd0836e49aae866d90c1700afe13e1018c63
---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 55662218b4..a403e39f7e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,11 @@ CHANGES
 * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment
   variable to allow to disable installation of easy_install-${version} script.
 * Support Python >=3.1.4 and >=3.2.1.
+* Issue 204: Don't try to import the parent of a namespace package in
+  declare_namespace
+* Issue 196: Tolerate responses with multiple Content-Length headers
+* Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires
+  problems.
 
 ------
 0.6.16

From 9cb687060e6c5b0dac3c72b355e979fbdb9982ef Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 17:55:43 +0200
Subject: [PATCH 3187/8469] Added tag 0.6.17 for changeset 9c40f23d0bda

--HG--
branch : distribute
extra : rebase_source : aa3210e0b90b00f293137efd8b1a938cc0bf1935
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bf64adc605..2c81ae6b12 100644
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14
 51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15
 3f1ff138e947bfc1c9bcfe0037030b7bfb4ab3a5 0.6.16
+9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17

From 4a8759265e61381d3c7d6a9df186c0f445fa793e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 17:57:31 +0200
Subject: [PATCH 3188/8469] Added tag 0.6.17 for changeset 4bbc01e4709e

--HG--
branch : distribute
extra : rebase_source : 661dc79b27aeffa34c8350d219c71fc0f5a7ad98
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 2c81ae6b12..ca83854ead 100644
--- a/.hgtags
+++ b/.hgtags
@@ -20,3 +20,5 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15
 3f1ff138e947bfc1c9bcfe0037030b7bfb4ab3a5 0.6.16
 9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
+9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
+4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17

From 43c96023483bb0f15a764b96c5fb33146ec3ace2 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 17:57:54 +0200
Subject: [PATCH 3189/8469] update the version in missing place

--HG--
branch : distribute
extra : rebase_source : f42bd6c515d6085277c1d6a1052fa58b201e4f65
---
 README.txt | 6 +++---
 release.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index 6daeab03c9..91a60321d7 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.15.tar.gz
-    $ tar -xzvf distribute-0.6.15.tar.gz
-    $ cd distribute-0.6.15
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.17.tar.gz
+    $ tar -xzvf distribute-0.6.17.tar.gz
+    $ cd distribute-0.6.17
     $ python setup.py install
 
 ---------------------------
diff --git a/release.sh b/release.sh
index 0281e3528d..ee0d8589c1 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.15"
+export VERSION="0.6.17"
 
 # tagging
 hg tag $VERSION

From 91479552a228a08d9e44ba4e3b62c82926bade33 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 17:57:56 +0200
Subject: [PATCH 3190/8469] Added tag 0.6.17 for changeset 0502d5117d83

--HG--
branch : distribute
extra : rebase_source : a99a5fea3008fbdb186bf99a1015a36b64dad26c
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index ca83854ead..7221b83f73 100644
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,5 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
 9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
 4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
+4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
+0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17

From db34965623975ce24d9193dad5592924107f980d Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 18:00:44 +0200
Subject: [PATCH 3191/8469] starting 0.6.18

--HG--
branch : distribute
extra : rebase_source : 5d775d7c1cae24d5a671bd92594981b2979d40e7
---
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.txt b/README.txt
index 91a60321d7..2eefab4c40 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.17.tar.gz
-    $ tar -xzvf distribute-0.6.17.tar.gz
-    $ cd distribute-0.6.17
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.18.tar.gz
+    $ tar -xzvf distribute-0.6.18.tar.gz
+    $ cd distribute-0.6.18
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9fd4175819..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/release.sh b/release.sh
index ee0d8589c1..c757143714 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.17"
+export VERSION="0.6.18"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 21db64c314..92838b9ad3 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.17"
+VERSION = "0.6.18"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 0343339ddae02847a24ef3726eaf1df6789aa4a8 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Mon, 30 May 2011 18:01:28 +0200
Subject: [PATCH 3192/8469] starting 0.6.18

--HG--
branch : distribute
extra : rebase_source : ff71015f3fe27b69e34ec10d936ee605556c7e33
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 9f441067b1..33dfd81d1b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.17"
+DEFAULT_VERSION = "0.6.18"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 

From c7470ef715ed90469e7ee8f215d5307834479d8c Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <aurelien@bompard.org>
Date: Wed, 1 Jun 2011 09:18:22 +0200
Subject: [PATCH 3193/8469] Update the child's __path__ in declare_namespace,
 even if the parent is already a namespace package -- fixes #204

--HG--
branch : distribute
extra : rebase_source : 48e1ed2309ae053b8987a664231e72c35a0bbb40
---
 pkg_resources.py                   |  8 +++----
 setuptools/tests/test_resources.py | 37 ++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 636d6ff997..52d92669b3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1811,10 +1811,10 @@ def declare_namespace(packageName):
             declare_namespace(parent)
             if parent not in _namespace_packages:
                 __import__(parent)
-                try:
-                    path = sys.modules[parent].__path__
-                except AttributeError:
-                    raise TypeError("Not a package:", parent)
+            try:
+                path = sys.modules[parent].__path__
+            except AttributeError:
+                raise TypeError("Not a package:", parent)
 
         # Track what packages are namespaces, so when new path items are added,
         # they can be updated
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index e02bd8d544..c10ca21083 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -571,21 +571,48 @@ class NamespaceTests(TestCase):
     def setUp(self):
         self._ns_pkgs = pkg_resources._namespace_packages.copy()
         self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-")
-        sys.path.append(self._tmpdir)
+        os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
+        self._prev_sys_path = sys.path[:]
+        sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
 
     def tearDown(self):
         shutil.rmtree(self._tmpdir)
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
-        sys.path.remove(self._tmpdir)
+        sys.path = self._prev_sys_path[:]
 
     def test_two_levels_deep(self):
-        os.makedirs(os.path.join(self._tmpdir, "pkg1", "pkg2"))
-        declare_namespace("pkg1")
+        """
+        Test nested namespace packages
+        Create namespace packages in the following tree :
+            site-packages-1/pkg1/pkg2
+            site-packages-2/pkg1/pkg2
+        Check both are in the _namespace_packages dict and that their __path__
+        is correct
+        """
+        sys.path.append(os.path.join(self._tmpdir, "site-pkgs2"))
+        os.makedirs(os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"))
+        os.makedirs(os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2"))
+        ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
+        for site in ["site-pkgs", "site-pkgs2"]:
+            pkg1_init = open(os.path.join(self._tmpdir, site,
+                             "pkg1", "__init__.py"), "w")
+            pkg1_init.write(ns_str)
+            pkg1_init.close()
+            pkg2_init = open(os.path.join(self._tmpdir, site,
+                             "pkg1", "pkg2", "__init__.py"), "w")
+            pkg2_init.write(ns_str)
+            pkg2_init.close()
+        import pkg1
         self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys())
         try:
-            declare_namespace("pkg1.pkg2")
+            import pkg1.pkg2
         except ImportError, e:
             self.fail("Distribute tried to import the parent namespace package")
+        # check the _namespace_packages dict
         self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys())
         self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
+        # check the __path__ attribute contains both paths
+        self.assertEqual(pkg1.pkg2.__path__, [
+                os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"),
+                os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2") ])
 

From 5e8a4ecafec20d693b3a1ba72747c2e1765242a8 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 1 Jun 2011 12:19:31 +0200
Subject: [PATCH 3194/8469] added a changeset entry

--HG--
branch : distribute
extra : rebase_source : 134389daa797968df033c2e7bfebc54c1b8b8d2c
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a403e39f7e..3fa013a829 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.18
+------
+
+* Issue 210: Fixed a regression introduced by Issue 204 fix.
+
 ------
 0.6.17
 ------

From f21d251e436fb99f1a1b935d42f7b21053b25682 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 1 Jun 2011 12:19:36 +0200
Subject: [PATCH 3195/8469] Added tag 0.6.18 for changeset 74108d7f0734

--HG--
branch : distribute
extra : rebase_source : 850911b0915d3c9bd7d7c23373d7c7807e3971b4
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7221b83f73..74203b79fc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
 4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
 0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
+74108d7f07343556a8db94e8122221a43243f586 0.6.18

From 8d8653a2fb38196fbf1d4dd2bc92ef0baad9c6f2 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Wed, 1 Jun 2011 12:24:32 +0200
Subject: [PATCH 3196/8469] starting 0.6.19

--HG--
branch : distribute
extra : rebase_source : e4d2913a33c81962f624d9a9c0803e622e8bfd62
---
 CHANGES.txt         | 6 ++++++
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3fa013a829..d085b75479 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.19
+------
+
+* ADD STUFF HERE
+
 ------
 0.6.18
 ------
diff --git a/README.txt b/README.txt
index 2eefab4c40..97e9660d5c 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.18.tar.gz
-    $ tar -xzvf distribute-0.6.18.tar.gz
-    $ cd distribute-0.6.18
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.19.tar.gz
+    $ tar -xzvf distribute-0.6.19.tar.gz
+    $ cd distribute-0.6.19
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 33dfd81d1b..bbb6f3c25e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.18"
+DEFAULT_VERSION = "0.6.19"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/release.sh b/release.sh
index c757143714..268f4ba738 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.18"
+export VERSION="0.6.19"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 92838b9ad3..44f773af2d 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.18"
+VERSION = "0.6.19"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From b672805ffe0c8ef4be0acc0ce05d5273f25d6533 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 2 Jun 2011 02:10:13 +0200
Subject: [PATCH 3197/8469] make sure we don't use getheaders(). get() works
 for all py versions - fixes #206

--HG--
branch : distribute
extra : rebase_source : c9e414a0642dd5b2222dd3fc4aa1b11a442e48a1
---
 CHANGES.txt                          | 3 ++-
 distribute.egg-info/entry_points.txt | 2 +-
 setuptools/package_index.py          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d085b75479..5f92af2d8c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ CHANGES
 0.6.19
 ------
 
-* ADD STUFF HERE
+* Issue 206: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
+
 
 ------
 0.6.18
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..9fd4175819 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0230497d4d..f064b110d5 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -580,7 +580,7 @@ def _download_to(self, url, filename):
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                content_length = headers.getheaders("Content-Length")[0]
+                content_length = headers.get("Content-Length")
                 size = int(content_length)
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')

From 9021d7ff16d8c567c44610c2302982809e9aa30e Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 2 Jun 2011 02:10:19 +0200
Subject: [PATCH 3198/8469] Added tag 0.6.19 for changeset 611910892a04

--HG--
branch : distribute
extra : rebase_source : 91a0b03342dbd0eb6275bccc3d558979231036ae
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 74203b79fc..8d467fbc47 100644
--- a/.hgtags
+++ b/.hgtags
@@ -25,3 +25,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
 0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
 74108d7f07343556a8db94e8122221a43243f586 0.6.18
+611910892a0421633d72677979f94a25ef590d54 0.6.19

From 323679aa633452abb46f1618c7bc8bfa3121ef2a Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 2 Jun 2011 02:10:28 +0200
Subject: [PATCH 3199/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : c409a9370e8edb15093c2fecdb9e59ce7fb74f54
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9fd4175819..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From e46e9743081ec738c970931c8dbfa3de8a8ebff7 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 2 Jun 2011 02:12:54 +0200
Subject: [PATCH 3200/8469] starting 0.6.20

--HG--
branch : distribute
extra : rebase_source : f5cf2fdcae5a8895f0218fddd57e0496d302d919
---
 CHANGES.txt         | 7 ++++++-
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5f92af2d8c..aa3eb476fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,13 +2,18 @@
 CHANGES
 =======
 
+------
+0.6.20
+------
+
+* ADD STUFF HERE
+
 ------
 0.6.19
 ------
 
 * Issue 206: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
 
-
 ------
 0.6.18
 ------
diff --git a/README.txt b/README.txt
index 97e9660d5c..f562d628bb 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.19.tar.gz
-    $ tar -xzvf distribute-0.6.19.tar.gz
-    $ cd distribute-0.6.19
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.20.tar.gz
+    $ tar -xzvf distribute-0.6.20.tar.gz
+    $ cd distribute-0.6.20
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index bbb6f3c25e..22c2d65f19 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.19"
+DEFAULT_VERSION = "0.6.20"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/release.sh b/release.sh
index 268f4ba738..7f791691cf 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.19"
+export VERSION="0.6.20"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 44f773af2d..bfb6240646 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.19"
+VERSION = "0.6.20"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 9b7671822624669b22aa7574daa190b990c6906a Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 3 Jun 2011 20:02:47 -0400
Subject: [PATCH 3201/8469] Replay svn r88850.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b2a208201c..beb65bb568 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.7rc2"
+__version__ = "2.6.7"
 #--end constants--

From e3ba28ec2b8a5d8d5585de892f9e42f7021b436c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 4 Jun 2011 20:45:33 +0200
Subject: [PATCH 3202/8469] Remove unnecessary executable bit on one distutils
 file

---
 tests/Setup.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tests/Setup.sample

diff --git a/tests/Setup.sample b/tests/Setup.sample
old mode 100755
new mode 100644

From 1151498802d17fe753a722f275bbf67485d2f637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 4 Jun 2011 20:47:26 +0200
Subject: [PATCH 3203/8469] Remove unneeded executable bit on two distutils
 files

---
 tests/Setup.sample      | 0
 tests/test_extension.py | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tests/Setup.sample
 mode change 100755 => 100644 tests/test_extension.py

diff --git a/tests/Setup.sample b/tests/Setup.sample
old mode 100755
new mode 100644
diff --git a/tests/test_extension.py b/tests/test_extension.py
old mode 100755
new mode 100644

From 38896a09fc855ee5e5fbd5ad47e7d502546cf251 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jun 2011 18:27:42 -0400
Subject: [PATCH 3204/8469] Updated documentation to reflect implementation

--HG--
branch : distribute
extra : rebase_source : e261625bedbacd836d2b8343f1ff0ff604bb8cfb
---
 docs/python3.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/python3.txt b/docs/python3.txt
index d5c3da67f0..82d8e4e243 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -81,8 +81,10 @@ Advanced features
 =================
 
 If certain fixers are to be suppressed, this again can be overridden with the
-list ``setuptools.commands.build_py.build_py.fixers``, which then contains the
-list of all fixer class names.
+list ``setuptools.command.build_py.build_py.fixer_names``, which at some
+point contains the list of all fixer class names. For an example of how this
+can be done, see the `jaraco.util <https://bitbucket.org/jaraco/jaraco.util>`_
+project.
 
 If you don't want to run the 2to3 conversion on the doctests in Python files,
 you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.

From e63f3e7d864b26529d6b197e053b4084be20decf Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 8 Jun 2011 15:47:30 +0200
Subject: [PATCH 3205/8469] Fix a typo in documentation (issue #213).

--HG--
branch : distribute
extra : rebase_source : 66aec4b4380512e96e64285421eae404013964e1
---
 docs/python3.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/python3.txt b/docs/python3.txt
index 82d8e4e243..43845f609d 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -66,7 +66,7 @@ and no conversion will happen.
 
 In general, if code doesn't seem to be converted, deleting the build directory
 and trying again is a good saferguard against the build directory getting
-"out of sync" with teh source directory.
+"out of sync" with the source directory.
 
 Distributing Python 3 modules
 =============================

From e7cc03bf1da67e855bed7ac89acb895a51bfeb9a Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 09:42:44 -0500
Subject: [PATCH 3206/8469] bump to 2.7.2 final

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e9fc2d6c45..a849f1a9cd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.2rc1"
+__version__ = "2.7.2"
 #--end constants--

From edb4ad2deb371136eba9ab0d9c27687c3aa5df23 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 09:58:58 -0500
Subject: [PATCH 3207/8469] bump to 3.1.4

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 5f8425fb1d..a3e2993648 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.4rc1"
+__version__ = "3.1.4"
 #--end constants--

From d6e07e40b2eb968c89070316983beed527c2b111 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 00:39:19 -0700
Subject: [PATCH 3208/8469] Issue #12141: Install a copy of template C module
 file so that test_build_ext of test_distutils is no longer silently skipped
 when run outside of a build directory.

---
 tests/test_build_ext.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 46dcb5ed5d..44fc980a30 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -19,6 +19,11 @@
 ALREADY_TESTED = False
 
 def _get_source_filename():
+    # use installed copy if available
+    tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
+    if os.path.exists(tests_f):
+        return tests_f
+    # otherwise try using copy from build directory
     srcdir = sysconfig.get_config_var('srcdir')
     if srcdir is None:
         return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')

From 32d401bb9f75df6acc4dd67a361d5b3de036f98a Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 00:42:50 -0700
Subject: [PATCH 3209/8469] Issue #12141: Install a copy of template C module
 file so that test_build_ext of test_distutils is no longer silently skipped
 when run outside of a build directory.

---
 tests/test_build_ext.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 0aa99babee..d924f585ba 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -22,6 +22,11 @@
 ALREADY_TESTED = False
 
 def _get_source_filename():
+    # use installed copy if available
+    tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
+    if os.path.exists(tests_f):
+        return tests_f
+    # otherwise try using copy from build directory
     srcdir = sysconfig.get_config_var('srcdir')
     return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
@@ -35,7 +40,9 @@ def setUp(self):
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
-        shutil.copy(_get_source_filename(), self.tmp_dir)
+        filename = _get_source_filename()
+        if os.path.exists(filename):
+            shutil.copy(filename, self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -65,6 +72,8 @@ def _fixup_command(self, cmd):
     def test_build_ext(self):
         global ALREADY_TESTED
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
+        if not os.path.exists(xx_c):
+            return
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir

From 303c2b4c7af695706369e68cd6b32606ab5401d6 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 19:39:10 -0700
Subject: [PATCH 3210/8469] Issue #9516: Correct and expand OS X deployment
 target tests in distutils test_build_ext.

---
 tests/test_build_ext.py | 49 ++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 44fc980a30..ced1329efd 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -9,7 +9,8 @@
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests import support
-from distutils.errors import DistutilsSetupError, CompileError
+from distutils.errors import (DistutilsSetupError, CompileError,
+                              DistutilsPlatformError)
 
 import unittest
 from test import test_support
@@ -437,18 +438,43 @@ def test_build_ext_path_cross_platform(self):
         self.assertEqual(ext_path, wanted)
 
     @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
-    def test_deployment_target(self):
-        self._try_compile_deployment_target()
+    def test_deployment_target_default(self):
+        # Issue 9516: Test that, in the absence of the environment variable,
+        # an extension module is compiled with the same deployment target as
+        #  the interpreter.
+        self._try_compile_deployment_target('==', None)
 
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target_too_low(self):
+        # Issue 9516: Test that an extension module is not allowed to be
+        # compiled with a deployment target less than that of the interpreter.
+        self.assertRaises(DistutilsPlatformError,
+            self._try_compile_deployment_target, '>', '10.1')
+
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target_higher_ok(self):
+        # Issue 9516: Test that an extension module can be compiled with a
+        # deployment target higher than that of the interpreter: the ext
+        # module may depend on some newer OS feature.
+        deptarget = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+        if deptarget:
+            # increment the minor version number (i.e. 10.6 -> 10.7)
+            deptarget = [int(x) for x in deptarget.split('.')]
+            deptarget[-1] += 1
+            deptarget = '.'.join(str(i) for i in deptarget)
+            self._try_compile_deployment_target('<', deptarget)
+
+    def _try_compile_deployment_target(self, operator, target):
         orig_environ = os.environ
         os.environ = orig_environ.copy()
         self.addCleanup(setattr, os, 'environ', orig_environ)
 
-        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.1'
-        self._try_compile_deployment_target()
-
+        if target is None:
+            if os.environ.get('MACOSX_DEPLOYMENT_TARGET'):
+                del os.environ['MACOSX_DEPLOYMENT_TARGET']
+        else:
+            os.environ['MACOSX_DEPLOYMENT_TARGET'] = target
 
-    def _try_compile_deployment_target(self):
         deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c')
 
         with open(deptarget_c, 'w') as fp:
@@ -457,16 +483,17 @@ def _try_compile_deployment_target(self):
 
                 int dummy;
 
-                #if TARGET != MAC_OS_X_VERSION_MIN_REQUIRED
+                #if TARGET %s MAC_OS_X_VERSION_MIN_REQUIRED
+                #else
                 #error "Unexpected target"
-               #endif
+                #endif
 
-            '''))
+            ''' % operator))
 
+        # get the deployment target that the interpreter was built with
         target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
         target = tuple(map(int, target.split('.')))
         target = '%02d%01d0' % target
-
         deptarget_ext = Extension(
             'deptarget',
             [deptarget_c],

From d671b9c866f6f54493dfa07e5004a92b104b205d Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 19:40:39 -0700
Subject: [PATCH 3211/8469] Issue #9516: Change distutils to no longer globally
 attempt to check and set the MACOSX_DEPLOYMENT_TARGET env variable for the
 interpreter process on OS X.  This could cause failures in non-distutils
 subprocesses and was unreliable since tests or user programs could modify the
 interpreter environment after distutils set it.  Instead, have distutils set
 the the deployment target only in the environment of each build subprocess.

Continue to use the previous algorithm for deriving the deployment target
value:
    if MACOSX_DEPLOYMENT_TARGET is not set in the interpreter's env:
        use the interpreter build configure MACOSX_DEPLOYMENT_TARGET
    elif the MACOSX_DEPLOYMENT_TARGET env value >= configure value:
        use the env MACOSX_DEPLOYMENT_TARGET
    else: # env value less than interpreter build configure value
        raise exception
This allows building extensions that can only run on newer versions of
the OS than the version python was built for, for example with a python
built for 10.3 or later and an extension that needs to be built for 10.5.
---
 spawn.py     | 28 +++++++++++++++++++++++++++-
 sysconfig.py | 15 ---------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/spawn.py b/spawn.py
index 5c014c4be2..7306099f6b 100644
--- a/spawn.py
+++ b/spawn.py
@@ -96,17 +96,43 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
             raise DistutilsExecError, \
                   "command '%s' failed with exit status %d" % (cmd[0], rc)
 
+if sys.platform == 'darwin':
+    from distutils import sysconfig
+    _cfg_target = None
+    _cfg_target_split = None
 
 def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
+    exec_args = [cmd[0], cmd]
+    if sys.platform == 'darwin':
+        global _cfg_target, _cfg_target_split
+        if _cfg_target is None:
+            _cfg_target = sysconfig.get_config_var(
+                                  'MACOSX_DEPLOYMENT_TARGET') or ''
+            if _cfg_target:
+                _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
+        if _cfg_target:
+            # ensure that the deployment target of build process is not less
+            # than that used when the interpreter was built. This ensures
+            # extension modules are built with correct compatibility values
+            cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
+            if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
+                my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
+                          'now "%s" but "%s" during configure'
+                                % (cur_target, _cfg_target))
+                raise DistutilsPlatformError(my_msg)
+            env = dict(os.environ,
+                       MACOSX_DEPLOYMENT_TARGET=cur_target)
+            exec_fn = search_path and os.execvpe or os.execve
+            exec_args.append(env)
     pid = os.fork()
 
     if pid == 0:  # in the child
         try:
-            exec_fn(cmd[0], cmd)
+            exec_fn(*exec_args)
         except OSError, e:
             sys.stderr.write("unable to execute %s: %s\n" %
                              (cmd[0], e.strerror))
diff --git a/sysconfig.py b/sysconfig.py
index d206e0cdf9..0d6d4c4fea 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -380,21 +380,6 @@ def _init_posix():
 
         raise DistutilsPlatformError(my_msg)
 
-    # On MacOSX we need to check the setting of the environment variable
-    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
-    # it needs to be compatible.
-    # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
-        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
-        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
-        if cur_target == '':
-            cur_target = cfg_target
-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target
-        elif map(int, cfg_target.split('.')) > map(int, cur_target.split('.')):
-            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
-                % (cur_target, cfg_target))
-            raise DistutilsPlatformError(my_msg)
-
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.

From 140120ec23e70358cb6dfeadf92b9aada4af835b Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 19:43:15 -0700
Subject: [PATCH 3212/8469] Issue #9516: Correct and expand OS X deployment
 target tests in distutils test_build_ext.

---
 tests/test_build_ext.py | 47 ++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index d924f585ba..0ce7f0f81c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -11,7 +11,8 @@
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
 from distutils.errors import (
-    CompileError, DistutilsSetupError, UnknownFileError)
+    CompileError, DistutilsPlatformError, DistutilsSetupError,
+    UnknownFileError)
 
 import unittest
 from test import support
@@ -431,18 +432,43 @@ def test_ext_fullpath(self):
 
 
     @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
-    def test_deployment_target(self):
-        self._try_compile_deployment_target()
+    def test_deployment_target_default(self):
+        # Issue 9516: Test that, in the absence of the environment variable,
+        # an extension module is compiled with the same deployment target as
+        #  the interpreter.
+        self._try_compile_deployment_target('==', None)
 
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target_too_low(self):
+        # Issue 9516: Test that an extension module is not allowed to be
+        # compiled with a deployment target less than that of the interpreter.
+        self.assertRaises(DistutilsPlatformError,
+            self._try_compile_deployment_target, '>', '10.1')
+
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
+    def test_deployment_target_higher_ok(self):
+        # Issue 9516: Test that an extension module can be compiled with a
+        # deployment target higher than that of the interpreter: the ext
+        # module may depend on some newer OS feature.
+        deptarget = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+        if deptarget:
+            # increment the minor version number (i.e. 10.6 -> 10.7)
+            deptarget = [int(x) for x in deptarget.split('.')]
+            deptarget[-1] += 1
+            deptarget = '.'.join(str(i) for i in deptarget)
+            self._try_compile_deployment_target('<', deptarget)
+
+    def _try_compile_deployment_target(self, operator, target):
         orig_environ = os.environ
         os.environ = orig_environ.copy()
         self.addCleanup(setattr, os, 'environ', orig_environ)
 
-        os.environ['MACOSX_DEPLOYMENT_TARGET']='10.1'
-        self._try_compile_deployment_target()
-
+        if target is None:
+            if os.environ.get('MACOSX_DEPLOYMENT_TARGET'):
+                del os.environ['MACOSX_DEPLOYMENT_TARGET']
+        else:
+            os.environ['MACOSX_DEPLOYMENT_TARGET'] = target
 
-    def _try_compile_deployment_target(self):
         deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c')
 
         with open(deptarget_c, 'w') as fp:
@@ -451,16 +477,17 @@ def _try_compile_deployment_target(self):
 
                 int dummy;
 
-                #if TARGET != MAC_OS_X_VERSION_MIN_REQUIRED
+                #if TARGET %s MAC_OS_X_VERSION_MIN_REQUIRED
+                #else
                 #error "Unexpected target"
                 #endif
 
-            '''))
+            ''' % operator))
 
+        # get the deployment target that the interpreter was built with
         target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
         target = tuple(map(int, target.split('.')))
         target = '%02d%01d0' % target
-
         deptarget_ext = Extension(
             'deptarget',
             [deptarget_c],

From 40bee45e0bd8a042c3a8f893328f6a6a52698fdf Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 Jun 2011 19:44:24 -0700
Subject: [PATCH 3213/8469] Issue #9516: Change distutils to no longer globally
 attempt to check and set the MACOSX_DEPLOYMENT_TARGET env variable for the
 interpreter process on OS X.  This could cause failures in non-distutils
 subprocesses and was unreliable since tests or user programs could modify the
 interpreter environment after distutils set it.  Instead, have distutils set
 the the deployment target only in the environment of each build subprocess.

Continue to use the previous algorithm for deriving the deployment target
value:
    if MACOSX_DEPLOYMENT_TARGET is not set in the interpreter's env:
        use the interpreter build configure MACOSX_DEPLOYMENT_TARGET
    elif the MACOSX_DEPLOYMENT_TARGET env value >= configure value:
        use the env MACOSX_DEPLOYMENT_TARGET
    else: # env value less than interpreter build configure value
        raise exception
This allows building extensions that can only run on newer versions of
the OS than the version python was built for, for example with a python
built for 10.3 or later and an extension that needs to be built for 10.5.
---
 spawn.py     | 29 ++++++++++++++++++++++++++++-
 sysconfig.py | 15 ---------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/spawn.py b/spawn.py
index 8c476dc23f..2b62c968a4 100644
--- a/spawn.py
+++ b/spawn.py
@@ -96,15 +96,42 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
             raise DistutilsExecError(
                   "command '%s' failed with exit status %d" % (cmd[0], rc))
 
+if sys.platform == 'darwin':
+    from distutils import sysconfig
+    _cfg_target = None
+    _cfg_target_split = None
+
 def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
     exec_fn = search_path and os.execvp or os.execv
+    exec_args = [cmd[0], cmd]
+    if sys.platform == 'darwin':
+        global _cfg_target, _cfg_target_split
+        if _cfg_target is None:
+            _cfg_target = sysconfig.get_config_var(
+                                  'MACOSX_DEPLOYMENT_TARGET') or ''
+            if _cfg_target:
+                _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
+        if _cfg_target:
+            # ensure that the deployment target of build process is not less
+            # than that used when the interpreter was built. This ensures
+            # extension modules are built with correct compatibility values
+            cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
+            if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
+                my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
+                          'now "%s" but "%s" during configure'
+                                % (cur_target, _cfg_target))
+                raise DistutilsPlatformError(my_msg)
+            env = dict(os.environ,
+                       MACOSX_DEPLOYMENT_TARGET=cur_target)
+            exec_fn = search_path and os.execvpe or os.execve
+            exec_args.append(env)
     pid = os.fork()
     if pid == 0: # in the child
         try:
-            exec_fn(cmd[0], cmd)
+            exec_fn(*exec_args)
         except OSError as e:
             sys.stderr.write("unable to execute %s: %s\n"
                              % (cmd[0], e.strerror))
diff --git a/sysconfig.py b/sysconfig.py
index 06bbc01cd6..9d7d1902aa 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -419,21 +419,6 @@ def _init_posix():
 
         raise DistutilsPlatformError(my_msg)
 
-    # On MacOSX we need to check the setting of the environment variable
-    # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so
-    # it needs to be compatible.
-    # If it isn't set we set it to the configure-time value
-    if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g:
-        cfg_target = g['MACOSX_DEPLOYMENT_TARGET']
-        cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '')
-        if cur_target == '':
-            cur_target = cfg_target
-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target
-        elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]:
-            my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure'
-                % (cur_target, cfg_target))
-            raise DistutilsPlatformError(my_msg)
-
     # On AIX, there are wrong paths to the linker scripts in the Makefile
     # -- these paths are relative to the Python source, but when installed
     # the scripts are in another directory.

From bf799fa9dfd51f6ff2bda9e768f4f4333d351f76 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 30 Jun 2011 15:40:22 +0200
Subject: [PATCH 3214/8469] Issue #12451: distutils now opens the setup script
 in binary mode to read the encoding cookie, instead of opening it in UTF-8.

---
 core.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core.py b/core.py
index fd2a43d7d2..c0a04de3af 100644
--- a/core.py
+++ b/core.py
@@ -8,7 +8,8 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import os
+import sys
 
 from distutils.debug import DEBUG
 from distutils.errors import *
@@ -215,11 +216,8 @@ def run_setup (script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            f = open(script_name)
-            try:
+            with open(script_name, 'rb') as f:
                 exec(f.read(), g, l)
-            finally:
-                f.close()
         finally:
             sys.argv = save_argv
             _setup_stop_after = None

From f2b3625193af66b537f99fc0c7843b4051f1bd1b Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 30 Jun 2011 23:25:47 +0200
Subject: [PATCH 3215/8469] Issue #12451: Add support.create_empty_file()

We don't need to create a temporary buffered binary or text file object just to
create an empty file.

Replace also os.fdopen(handle).close() by os.close(handle).
---
 tests/test_build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 4e46339b43..c7c36f3cc7 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -10,7 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
-from test.support import run_unittest
+from test.support import run_unittest, create_empty_file
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -71,11 +71,11 @@ def test_empty_package_dir(self):
 
         # create the distribution files.
         sources = self.mkdtemp()
-        open(os.path.join(sources, "__init__.py"), "w").close()
+        create_empty_file(os.path.join(sources, "__init__.py"))
 
         testdir = os.path.join(sources, "doc")
         os.mkdir(testdir)
-        open(os.path.join(testdir, "testfile"), "w").close()
+        create_empty_file(os.path.join(testdir, "testfile"))
 
         os.chdir(sources)
         old_stdout = sys.stdout

From 4758a6576c8847d6848ebe98f99f6526673f35b8 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 3 Jul 2011 09:41:27 +0200
Subject: [PATCH 3216/8469] Bump to 3.2.1rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 70ab7dbf2b..2602c5074b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1rc1"
+__version__ = "3.2.1rc2"
 #--end constants--

From 7d80bbfb319d76b2306d4193fdb082acd919927d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 9 Jul 2011 08:56:21 +0200
Subject: [PATCH 3217/8469] Bump version to 3.2.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2602c5074b..a470ade93e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1rc2"
+__version__ = "3.2.1"
 #--end constants--

From b4aecb449c912f0b405c687c763b9976c4cd884d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2011 17:51:23 -0400
Subject: [PATCH 3218/8469] Fix issue where easy_install fails on Python 3 on
 windows installer. Fixes #212

--HG--
branch : distribute
extra : rebase_source : 1920a8d261fa7918d9d3813a104cf2ed11878c7c
---
 distribute.egg-info/entry_points.txt |  2 +-
 setuptools/command/easy_install.py   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..9fd4175819 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 58e7ab3913..c1bae1c0b1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1425,7 +1425,16 @@ def extract_wininst_cfg(dist_filename):
         f.seek(prepended-(12+cfglen))
         cfg = ConfigParser.RawConfigParser({'version':'','target_version':''})
         try:
-            cfg.readfp(StringIO.StringIO(f.read(cfglen).split(chr(0),1)[0]))
+            part = f.read(cfglen)
+            # part is in bytes, but we need to read up to the first null
+            #  byte.
+            null_byte = bytes([0]) if sys.version_info >= (2,6) else chr(0)
+            config, = part.split(null_byte, 1)
+            # Now the config is in bytes, but on Python 3, it must be
+            #  unicode for the RawConfigParser, so decode it. Is this the
+            #  right encoding?
+            config = config.decode('ascii')
+            cfg.readfp(StringIO.StringIO(config))
         except ConfigParser.Error:
             return None
         if not cfg.has_section('metadata') or not cfg.has_section('Setup'):

From 4320a750da7c64db5dd3c18714655f5673198b33 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 28 Jul 2011 22:32:49 +0800
Subject: [PATCH 3219/8469] Fix closes Issue11439 Remove the SVN keywords from
 the code as it is no longer applicable in hg. Patch Contributed by Neil
 Muller.

---
 __init__.py                | 2 --
 archive_util.py            | 2 --
 bcppcompiler.py            | 2 --
 ccompiler.py               | 2 --
 cmd.py                     | 2 --
 command/__init__.py        | 2 --
 command/bdist.py           | 2 --
 command/bdist_dumb.py      | 2 --
 command/bdist_rpm.py       | 2 --
 command/bdist_wininst.py   | 2 --
 command/build.py           | 2 --
 command/build_clib.py      | 2 --
 command/build_ext.py       | 2 --
 command/build_py.py        | 2 --
 command/build_scripts.py   | 2 --
 command/check.py           | 2 --
 command/clean.py           | 2 --
 command/config.py          | 2 --
 command/install.py         | 2 --
 command/install_data.py    | 2 --
 command/install_headers.py | 2 --
 command/install_lib.py     | 2 --
 command/install_scripts.py | 2 --
 command/register.py        | 2 --
 command/sdist.py           | 2 --
 core.py                    | 2 --
 cygwinccompiler.py         | 2 --
 debug.py                   | 2 --
 dep_util.py                | 2 --
 dir_util.py                | 2 --
 dist.py                    | 2 --
 emxccompiler.py            | 2 --
 errors.py                  | 2 --
 extension.py               | 2 --
 fancy_getopt.py            | 2 --
 file_util.py               | 2 --
 filelist.py                | 2 --
 msvc9compiler.py           | 2 --
 msvccompiler.py            | 2 --
 spawn.py                   | 2 --
 sysconfig.py               | 2 --
 tests/test_archive_util.py | 2 --
 text_file.py               | 2 --
 unixccompiler.py           | 2 --
 util.py                    | 2 --
 45 files changed, 90 deletions(-)

diff --git a/__init__.py b/__init__.py
index a470ade93e..c06002eab3 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,8 +8,6 @@
    setup (...)
 """
 
-__revision__ = "$Id$"
-
 # Distutils version
 #
 # Updated automatically by the Python release process.
diff --git a/archive_util.py b/archive_util.py
index c06eba351d..fcda08e20a 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -3,8 +3,6 @@
 Utility functions for creating archive files (tarballs, zip files,
 that sort of thing)."""
 
-__revision__ = "$Id$"
-
 import os
 from warnings import warn
 import sys
diff --git a/bcppcompiler.py b/bcppcompiler.py
index c5e5cd2571..9f4c432d90 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -11,8 +11,6 @@
 # someone should sit down and factor out the common code as
 # WindowsCCompiler!  --GPW
 
-__revision__ = "$Id$"
-
 
 import os
 from distutils.errors import \
diff --git a/ccompiler.py b/ccompiler.py
index 291c008f20..c795c958fe 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,8 +3,6 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-__revision__ = "$Id$"
-
 import sys, os, re
 from distutils.errors import *
 from distutils.spawn import spawn
diff --git a/cmd.py b/cmd.py
index 5b1d085c32..3ea08101ac 100644
--- a/cmd.py
+++ b/cmd.py
@@ -4,8 +4,6 @@
 in the distutils.command package.
 """
 
-__revision__ = "$Id$"
-
 import sys, os, re
 from distutils.errors import DistutilsOptionError
 from distutils import util, dir_util, file_util, archive_util, dep_util
diff --git a/command/__init__.py b/command/__init__.py
index c379edbed0..481eea9fd4 100644
--- a/command/__init__.py
+++ b/command/__init__.py
@@ -3,8 +3,6 @@
 Package containing implementation of all the standard Distutils
 commands."""
 
-__revision__ = "$Id$"
-
 __all__ = ['build',
            'build_py',
            'build_ext',
diff --git a/command/bdist.py b/command/bdist.py
index 1a360b59e3..c5188eb371 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist' command (create a built [binary]
 distribution)."""
 
-__revision__ = "$Id$"
-
 import os
 from distutils.core import Command
 from distutils.errors import *
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 2d39922672..170e889461 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -4,8 +4,6 @@
 distribution -- i.e., just an archive to be unpacked under $prefix or
 $exec_prefix)."""
 
-__revision__ = "$Id$"
-
 import os
 from distutils.core import Command
 from distutils.util import get_platform
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index e2ae877d9a..678e118896 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-__revision__ = "$Id$"
-
 import sys, os
 from distutils.core import Command
 from distutils.debug import DEBUG
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b2e2fc6dc8..b7916e31a1 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-__revision__ = "$Id$"
-
 import sys, os
 from distutils.core import Command
 from distutils.util import get_platform
diff --git a/command/build.py b/command/build.py
index 9c2667cfd2..cfc15cf0dd 100644
--- a/command/build.py
+++ b/command/build.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build' command."""
 
-__revision__ = "$Id$"
-
 import sys, os
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
diff --git a/command/build_clib.py b/command/build_clib.py
index 428011a64d..3e20ef23cd 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -4,8 +4,6 @@
 that is included in the module distribution and needed by an extension
 module."""
 
-__revision__ = "$Id$"
-
 
 # XXX this module has *lots* of code ripped-off quite transparently from
 # build_ext.py -- not surprisingly really, as the work required to build
diff --git a/command/build_ext.py b/command/build_ext.py
index fb31648951..8d843d689f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,8 +4,6 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-__revision__ = "$Id$"
-
 import sys, os, re
 from distutils.core import Command
 from distutils.errors import *
diff --git a/command/build_py.py b/command/build_py.py
index 26002e4b3f..3868c12f5b 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_py' command."""
 
-__revision__ = "$Id$"
-
 import sys, os
 import sys
 from glob import glob
diff --git a/command/build_scripts.py b/command/build_scripts.py
index a43a7c306a..ec43477061 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'build_scripts' command."""
 
-__revision__ = "$Id$"
-
 import os, re
 from stat import ST_MODE
 from distutils import sysconfig
diff --git a/command/check.py b/command/check.py
index 2657c696e5..b67c795308 100644
--- a/command/check.py
+++ b/command/check.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'check' command.
 """
-__revision__ = "$Id$"
-
 from distutils.core import Command
 from distutils.errors import DistutilsSetupError
 
diff --git a/command/clean.py b/command/clean.py
index ae1d22c376..0cb2701662 100644
--- a/command/clean.py
+++ b/command/clean.py
@@ -4,8 +4,6 @@
 
 # contributed by Bastian Kleineidam <calvin@cs.uni-sb.de>, added 2000-03-18
 
-__revision__ = "$Id$"
-
 import os
 from distutils.core import Command
 from distutils.dir_util import remove_tree
diff --git a/command/config.py b/command/config.py
index ac80a54eb1..847e858160 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,8 +9,6 @@
 this header file lives".
 """
 
-__revision__ = "$Id$"
-
 import sys, os, re
 
 from distutils.core import Command
diff --git a/command/install.py b/command/install.py
index bdc3a09b22..0161898f49 100644
--- a/command/install.py
+++ b/command/install.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'install' command."""
 
-__revision__ = "$Id$"
-
 import sys
 import os
 
diff --git a/command/install_data.py b/command/install_data.py
index ab40797b98..947cd76a99 100644
--- a/command/install_data.py
+++ b/command/install_data.py
@@ -5,8 +5,6 @@
 
 # contributed by Bastian Kleineidam
 
-__revision__ = "$Id$"
-
 import os
 from distutils.core import Command
 from distutils.util import change_root, convert_path
diff --git a/command/install_headers.py b/command/install_headers.py
index 38125b5513..9bb0b18dc0 100644
--- a/command/install_headers.py
+++ b/command/install_headers.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
-__revision__ = "$Id$"
-
 from distutils.core import Command
 
 
diff --git a/command/install_lib.py b/command/install_lib.py
index 6022d30f27..3d01d07115 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -3,8 +3,6 @@
 Implements the Distutils 'install_lib' command
 (install all Python modules)."""
 
-__revision__ = "$Id$"
-
 import os
 import sys
 
diff --git a/command/install_scripts.py b/command/install_scripts.py
index ea8d5aa654..31a1130ee5 100644
--- a/command/install_scripts.py
+++ b/command/install_scripts.py
@@ -5,8 +5,6 @@
 
 # contributed by Bastian Kleineidam
 
-__revision__ = "$Id$"
-
 import os
 from distutils.core import Command
 from distutils import log
diff --git a/command/register.py b/command/register.py
index bdf5f8f09c..99545affa4 100644
--- a/command/register.py
+++ b/command/register.py
@@ -5,8 +5,6 @@
 
 # created 2002/10/21, Richard Jones
 
-__revision__ = "$Id$"
-
 import os, string, getpass
 import io
 import urllib.parse, urllib.request
diff --git a/command/sdist.py b/command/sdist.py
index fdbebd7e0f..48cb26b6ae 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -2,8 +2,6 @@
 
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
-__revision__ = "$Id$"
-
 import os
 import string
 import sys
diff --git a/core.py b/core.py
index c0a04de3af..260332a2ac 100644
--- a/core.py
+++ b/core.py
@@ -6,8 +6,6 @@
 really defined in distutils.dist and distutils.cmd.
 """
 
-__revision__ = "$Id$"
-
 import os
 import sys
 
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 536aa6b61b..819e1a97be 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -45,8 +45,6 @@
 # * mingw gcc 3.2/ld 2.13 works
 #   (ld supports -shared)
 
-__revision__ = "$Id$"
-
 import os
 import sys
 import copy
diff --git a/debug.py b/debug.py
index 2886744402..daf1660f0d 100644
--- a/debug.py
+++ b/debug.py
@@ -1,7 +1,5 @@
 import os
 
-__revision__ = "$Id$"
-
 # If DISTUTILS_DEBUG is anything other than the empty string, we run in
 # debug mode.
 DEBUG = os.environ.get('DISTUTILS_DEBUG')
diff --git a/dep_util.py b/dep_util.py
index 07b3549c6f..d74f5e4e92 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -4,8 +4,6 @@
 and groups of files; also, function based entirely on such
 timestamp dependency analysis."""
 
-__revision__ = "$Id$"
-
 import os
 from distutils.errors import DistutilsFileError
 
diff --git a/dir_util.py b/dir_util.py
index 5b005f0865..30daf49a6e 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,8 +2,6 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-__revision__ = "$Id$"
-
 import os, sys
 import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
diff --git a/dist.py b/dist.py
index 01f1f1cfc0..02cd79ba2f 100644
--- a/dist.py
+++ b/dist.py
@@ -4,8 +4,6 @@
 being built/installed/distributed.
 """
 
-__revision__ = "$Id$"
-
 import sys, os, re
 
 try:
diff --git a/emxccompiler.py b/emxccompiler.py
index 16dce53524..3675f8df9c 100644
--- a/emxccompiler.py
+++ b/emxccompiler.py
@@ -19,8 +19,6 @@
 #
 # * EMX gcc 2.81/EMX 0.9d fix03
 
-__revision__ = "$Id$"
-
 import os,sys,copy
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
diff --git a/errors.py b/errors.py
index acecacccb5..eb13c983e9 100644
--- a/errors.py
+++ b/errors.py
@@ -8,8 +8,6 @@
 This module is safe to use in "from ... import *" mode; it only exports
 symbols whose names start with "Distutils" and end with "Error"."""
 
-__revision__ = "$Id$"
-
 class DistutilsError (Exception):
     """The root of all Distutils evil."""
     pass
diff --git a/extension.py b/extension.py
index 2d1c36bd5c..a93655af2c 100644
--- a/extension.py
+++ b/extension.py
@@ -3,8 +3,6 @@
 Provides the Extension class, used to describe C/C++ extension
 modules in setup scripts."""
 
-__revision__ = "$Id$"
-
 import os
 import sys
 import warnings
diff --git a/fancy_getopt.py b/fancy_getopt.py
index 879d4d25bf..7d170dd277 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -8,8 +8,6 @@
   * options set attributes of a passed-in object
 """
 
-__revision__ = "$Id$"
-
 import sys, string, re
 import getopt
 from distutils.errors import *
diff --git a/file_util.py b/file_util.py
index e1eb932926..9bdd14e42e 100644
--- a/file_util.py
+++ b/file_util.py
@@ -3,8 +3,6 @@
 Utility functions for operating on single files.
 """
 
-__revision__ = "$Id$"
-
 import os
 from distutils.errors import DistutilsFileError
 from distutils import log
diff --git a/filelist.py b/filelist.py
index 06a8da9a07..a94b5c8e96 100644
--- a/filelist.py
+++ b/filelist.py
@@ -4,8 +4,6 @@
 and building lists of files.
 """
 
-__revision__ = "$Id$"
-
 import os, re
 import fnmatch
 from distutils.util import convert_path
diff --git a/msvc9compiler.py b/msvc9compiler.py
index e849e16d51..0cddb5c8e0 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -12,8 +12,6 @@
 #   finding DevStudio (through the registry)
 # ported to VS2005 and VS 2008 by Christian Heimes
 
-__revision__ = "$Id$"
-
 import os
 import subprocess
 import sys
diff --git a/msvccompiler.py b/msvccompiler.py
index 1cd0f91d5f..8116656961 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -8,8 +8,6 @@
 # hacked by Robin Becker and Thomas Heller to do a better job of
 #   finding DevStudio (through the registry)
 
-__revision__ = "$Id$"
-
 import sys, os
 from distutils.errors import \
      DistutilsExecError, DistutilsPlatformError, \
diff --git a/spawn.py b/spawn.py
index 2b62c968a4..f58c55f902 100644
--- a/spawn.py
+++ b/spawn.py
@@ -6,8 +6,6 @@
 executable name.
 """
 
-__revision__ = "$Id$"
-
 import sys
 import os
 
diff --git a/sysconfig.py b/sysconfig.py
index 9d7d1902aa..5ea724c096 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -9,8 +9,6 @@
 Email:        <fdrake@acm.org>
 """
 
-__revision__ = "$Id$"
-
 import os
 import re
 import sys
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index f969849590..8edfab49f8 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -1,6 +1,4 @@
 """Tests for distutils.archive_util."""
-__revision__ = "$Id$"
-
 import unittest
 import os
 import tarfile
diff --git a/text_file.py b/text_file.py
index 454725c626..40b8484a68 100644
--- a/text_file.py
+++ b/text_file.py
@@ -4,8 +4,6 @@
 that (optionally) takes care of stripping comments, ignoring blank
 lines, and joining lines with backslashes."""
 
-__revision__ = "$Id$"
-
 import sys, os, io
 
 
diff --git a/unixccompiler.py b/unixccompiler.py
index bf73416154..c70a3cc555 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -13,8 +13,6 @@
   * link shared library handled by 'cc -shared'
 """
 
-__revision__ = "$Id$"
-
 import os, sys, re
 
 from distutils import sysconfig
diff --git a/util.py b/util.py
index d6f89d65e5..023ddffc82 100644
--- a/util.py
+++ b/util.py
@@ -4,8 +4,6 @@
 one of the other *util.py modules.
 """
 
-__revision__ = "$Id$"
-
 import sys, os, string, re
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer

From 69896eb64dc3f52097d8cb26a693b794dbf81504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 31 Jul 2011 02:04:00 +0200
Subject: [PATCH 3220/8469] Fix regression with distutils MANIFEST handing
 (#11104, #8688).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The changed behavior of sdist in 2.7 broke packaging for projects that
wanted to use a manually-maintained MANIFEST file (instead of having a
MANIFEST.in template and letting distutils generate the MANIFEST).

The fixes that were committed for #8688 (d29399100973 by Tarek and
f7639dcdffc3 by me) did not fix all issues exposed in the bug report,
and also added one problem: the MANIFEST file format gained comments,
but the read_manifest method was not updated to handle (i.e. ignore)
them.  This changeset should fix everything; the tests have been
expanded and I successfully tested with Mercurial, which suffered from
this regression.

I have grouped the versionchanged directives for these bugs in one place
and added micro version numbers to help users know the quirks of the
exact version they’re using.  I also removed a stanza in the docs that
was forgotten in Tarek’s first changeset.

Initial report, thorough diagnosis and patch by John Dennis, further
work on the patch by Stephen Thorne, and a few edits and additions by
me.
---
 command/sdist.py    | 48 +++++++++++++++++++++++++++------------------
 tests/test_sdist.py | 43 +++++++++++++++++++++++++++++++---------
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index cf8982bd9d..75950f3d18 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -182,14 +182,20 @@ def get_file_list(self):
         reading the manifest, or just using the default file set -- it all
         depends on the user's options.
         """
-        # new behavior:
+        # new behavior when using a template:
         # the file list is recalculated everytime because
         # even if MANIFEST.in or setup.py are not changed
         # the user might have added some files in the tree that
         # need to be included.
         #
-        #  This makes --force the default and only behavior.
+        #  This makes --force the default and only behavior with templates.
         template_exists = os.path.isfile(self.template)
+        if not template_exists and self._manifest_is_not_generated():
+            self.read_manifest()
+            self.filelist.sort()
+            self.filelist.remove_duplicates()
+            return
+
         if not template_exists:
             self.warn(("manifest template '%s' does not exist " +
                         "(using default file list)") %
@@ -352,23 +358,28 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        if os.path.isfile(self.manifest):
-            fp = open(self.manifest)
-            try:
-                first_line = fp.readline()
-            finally:
-                fp.close()
-
-            if first_line != '# file GENERATED by distutils, do NOT edit\n':
-                log.info("not writing to manually maintained "
-                         "manifest file '%s'" % self.manifest)
-                return
+        if self._manifest_is_not_generated():
+            log.info("not writing to manually maintained "
+                     "manifest file '%s'" % self.manifest)
+            return
 
         content = self.filelist.files[:]
         content.insert(0, '# file GENERATED by distutils, do NOT edit')
         self.execute(file_util.write_file, (self.manifest, content),
                      "writing manifest file '%s'" % self.manifest)
 
+    def _manifest_is_not_generated(self):
+        # check for special comment used in 2.7.1 and higher
+        if not os.path.isfile(self.manifest):
+            return False
+
+        fp = open(self.manifest, 'rU')
+        try:
+            first_line = fp.readline()
+        finally:
+            fp.close()
+        return first_line != '# file GENERATED by distutils, do NOT edit\n'
+
     def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
         fill in 'self.filelist', the list of files to include in the source
@@ -376,12 +387,11 @@ def read_manifest(self):
         """
         log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest)
-        while 1:
-            line = manifest.readline()
-            if line == '':              # end of file
-                break
-            if line[-1] == '\n':
-                line = line[0:-1]
+        for line in manifest:
+            # ignore comments and blank lines
+            line = line.strip()
+            if line.startswith('#') or not line:
+                continue
             self.filelist.append(line)
         manifest.close()
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 61f9c1f79b..8da6fe4de8 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -1,9 +1,11 @@
 """Tests for distutils.command.sdist."""
 import os
+import tarfile
 import unittest
-import shutil
+import warnings
 import zipfile
-import tarfile
+from os.path import join
+from textwrap import dedent
 
 # zlib is not used here, but if it's not available
 # the tests that use zipfile may fail
@@ -19,19 +21,13 @@
 except ImportError:
     UID_GID_SUPPORT = False
 
-from os.path import join
-import sys
-import tempfile
-import warnings
-
 from test.test_support import captured_stdout, check_warnings, run_unittest
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
-from distutils.errors import DistutilsExecError, DistutilsOptionError
+from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
-from distutils.tests import support
 from distutils.log import WARN
 from distutils.archive_util import ARCHIVE_FORMATS
 
@@ -405,13 +401,33 @@ def test_manifest_marker(self):
         self.assertEqual(manifest[0],
                          '# file GENERATED by distutils, do NOT edit')
 
+    @unittest.skipUnless(zlib, 'requires zlib')
+    def test_manifest_comments(self):
+        # make sure comments don't cause exceptions or wrong includes
+        contents = dedent("""\
+            # bad.py
+            #bad.py
+            good.py
+            """)
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        self.write_file((self.tmp_dir, cmd.manifest), contents)
+        self.write_file((self.tmp_dir, 'good.py'), '# pick me!')
+        self.write_file((self.tmp_dir, 'bad.py'), "# don't pick me!")
+        self.write_file((self.tmp_dir, '#bad.py'), "# don't pick me!")
+        cmd.run()
+        self.assertEqual(cmd.filelist.files, ['good.py'])
+
     @unittest.skipUnless(zlib, "requires zlib")
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
+        self.write_file((self.tmp_dir, 'README.manual'),
+                         'This project maintains its MANIFEST file itself.')
         cmd.run()
+        self.assertEqual(cmd.filelist.files, ['README.manual'])
 
         f = open(cmd.manifest)
         try:
@@ -422,6 +438,15 @@ def test_manual_manifest(self):
 
         self.assertEqual(manifest, ['README.manual'])
 
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            filenames = [tarinfo.name for tarinfo in archive]
+        finally:
+            archive.close()
+        self.assertEqual(sorted(filenames), ['fake-1.0', 'fake-1.0/PKG-INFO',
+                                             'fake-1.0/README.manual'])
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From 2659dbffbdccd9365d0e81be91a230884a7430f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 31 Jul 2011 04:06:12 +0200
Subject: [PATCH 3221/8469] Fix regression with distutils MANIFEST handing
 (#11104, #8688).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The changed behavior of sdist in 3.1 broke packaging for projects that
wanted to use a manually-maintained MANIFEST file (instead of having a
MANIFEST.in template and letting distutils generate the MANIFEST).

The fixes that were committed for #8688 (76643c286b9f by Tarek and
d54da9248ed9 by me) did not fix all issues exposed in the bug report,
and also added one problem: the MANIFEST file format gained comments,
but the read_manifest method was not updated to handle (i.e. ignore)
them.  This changeset should fix everything; the tests have been
expanded and I successfully tested the 2.7 version with Mercurial, which
suffered from this regression.

I have grouped the versionchanged directives for these bugs in one place
and added micro version numbers to help users know the quirks of the
exact version they’re using.

Initial report, thorough diagnosis and patch by John Dennis, further
work on the patch by Stephen Thorne, and a few edits and additions by
me.
---
 command/sdist.py    | 48 +++++++++++++++++++++++++++------------------
 tests/test_sdist.py | 39 ++++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 48cb26b6ae..21ea61d96a 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -174,14 +174,20 @@ def get_file_list(self):
         reading the manifest, or just using the default file set -- it all
         depends on the user's options.
         """
-        # new behavior:
+        # new behavior when using a template:
         # the file list is recalculated everytime because
         # even if MANIFEST.in or setup.py are not changed
         # the user might have added some files in the tree that
         # need to be included.
         #
-        #  This makes --force the default and only behavior.
+        #  This makes --force the default and only behavior with templates.
         template_exists = os.path.isfile(self.template)
+        if not template_exists and self._manifest_is_not_generated():
+            self.read_manifest()
+            self.filelist.sort()
+            self.filelist.remove_duplicates()
+            return
+
         if not template_exists:
             self.warn(("manifest template '%s' does not exist " +
                         "(using default file list)") %
@@ -336,23 +342,28 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        if os.path.isfile(self.manifest):
-            fp = open(self.manifest)
-            try:
-                first_line = fp.readline()
-            finally:
-                fp.close()
-
-            if first_line != '# file GENERATED by distutils, do NOT edit\n':
-                log.info("not writing to manually maintained "
-                         "manifest file '%s'" % self.manifest)
-                return
+        if self._manifest_is_not_generated():
+            log.info("not writing to manually maintained "
+                     "manifest file '%s'" % self.manifest)
+            return
 
         content = self.filelist.files[:]
         content.insert(0, '# file GENERATED by distutils, do NOT edit')
         self.execute(file_util.write_file, (self.manifest, content),
                      "writing manifest file '%s'" % self.manifest)
 
+    def _manifest_is_not_generated(self):
+        # check for special comment used in 3.1.3 and higher
+        if not os.path.isfile(self.manifest):
+            return False
+
+        fp = open(self.manifest)
+        try:
+            first_line = fp.readline()
+        finally:
+            fp.close()
+        return first_line != '# file GENERATED by distutils, do NOT edit\n'
+
     def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
         fill in 'self.filelist', the list of files to include in the source
@@ -360,12 +371,11 @@ def read_manifest(self):
         """
         log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest)
-        while True:
-            line = manifest.readline()
-            if line == '':              # end of file
-                break
-            if line[-1] == '\n':
-                line = line[0:-1]
+        for line in manifest:
+            # ignore comments and blank lines
+            line = line.strip()
+            if line.startswith('#') or not line:
+                continue
             self.filelist.append(line)
         manifest.close()
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index c7dd47fb5c..440af9886c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -1,21 +1,19 @@
 """Tests for distutils.command.sdist."""
 import os
+import tarfile
 import unittest
-import shutil
+import warnings
 import zipfile
 from os.path import join
-import sys
-import tempfile
-import warnings
+from textwrap import dedent
 
 from test.support import captured_stdout, check_warnings, run_unittest
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
-from distutils.errors import DistutilsExecError, DistutilsOptionError
+from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
-from distutils.tests import support
 from distutils.log import WARN
 from distutils.archive_util import ARCHIVE_FORMATS
 
@@ -346,13 +344,33 @@ def test_manifest_marker(self):
         self.assertEqual(manifest[0],
                          '# file GENERATED by distutils, do NOT edit')
 
+    @unittest.skipUnless(ZLIB_SUPPORT, "Need zlib support to run")
+    def test_manifest_comments(self):
+        # make sure comments don't cause exceptions or wrong includes
+        contents = dedent("""\
+            # bad.py
+            #bad.py
+            good.py
+            """)
+        dist, cmd = self.get_cmd()
+        cmd.ensure_finalized()
+        self.write_file((self.tmp_dir, cmd.manifest), contents)
+        self.write_file((self.tmp_dir, 'good.py'), '# pick me!')
+        self.write_file((self.tmp_dir, 'bad.py'), "# don't pick me!")
+        self.write_file((self.tmp_dir, '#bad.py'), "# don't pick me!")
+        cmd.run()
+        self.assertEqual(cmd.filelist.files, ['good.py'])
+
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
+        self.write_file((self.tmp_dir, 'README.manual'),
+                         'This project maintains its MANIFEST file itself.')
         cmd.run()
+        self.assertEqual(cmd.filelist.files, ['README.manual'])
 
         f = open(cmd.manifest)
         try:
@@ -363,6 +381,15 @@ def test_manual_manifest(self):
 
         self.assertEqual(manifest, ['README.manual'])
 
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            filenames = [tarinfo.name for tarinfo in archive]
+        finally:
+            archive.close()
+        self.assertEqual(sorted(filenames), ['fake-1.0', 'fake-1.0/PKG-INFO',
+                                             'fake-1.0/README.manual'])
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From 9b09f6d159a7d5f4ffeaf9de4710ee869258fed7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2011 04:38:03 -0400
Subject: [PATCH 3222/8469] Corrected ValueError introduced in the last commit
 due to incorrect use of arg unpacking

--HG--
branch : distribute
extra : rebase_source : 0ebd905145e32bf072c00bc663dde8716ad4b88a
---
 distribute.egg-info/entry_points.txt | 2 +-
 setuptools/command/easy_install.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9fd4175819..9dc5c2e138 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-3.2 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c1bae1c0b1..f44e8d4ae2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1429,7 +1429,7 @@ def extract_wininst_cfg(dist_filename):
             # part is in bytes, but we need to read up to the first null
             #  byte.
             null_byte = bytes([0]) if sys.version_info >= (2,6) else chr(0)
-            config, = part.split(null_byte, 1)
+            config = part.split(null_byte, 1)[0]
             # Now the config is in bytes, but on Python 3, it must be
             #  unicode for the RawConfigParser, so decode it. Is this the
             #  right encoding?

From 4a58c74f7e7e12cc7ee6e6832249c8b39dc58f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 2 Aug 2011 03:16:12 +0200
Subject: [PATCH 3223/8469] Fix incorrect mtime comparison in distutils
 (#11933).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a regression introduced in 9211a5d7d0b4, when uses of ST_MTIME
constants were changed to uses of st_mtime attributes.  As diagnosed in
the bug report, this change is not merely stylistic: st_mtime is a
float but ST_MTIME’s resolution is rounded to the seconds, so there was
a mismatch between the values seen by file_util and dep_util which
caused an sdist to be unnecessarily created a second time on an ext4
filesystem.

This patch has been tested by John S. Gruber, who reported the bug.
As this is a simple code revert, I think it’s okay to commit without a
unit test.
---
 dep_util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dep_util.py b/dep_util.py
index 4e40df6899..2b759056ea 100644
--- a/dep_util.py
+++ b/dep_util.py
@@ -7,6 +7,7 @@
 __revision__ = "$Id$"
 
 import os
+from stat import ST_MTIME
 from distutils.errors import DistutilsFileError
 
 def newer(source, target):
@@ -27,7 +28,7 @@ def newer(source, target):
     if not os.path.exists(target):
         return True
 
-    return os.stat(source).st_mtime > os.stat(target).st_mtime
+    return os.stat(source)[ST_MTIME] > os.stat(target)[ST_MTIME]
 
 def newer_pairwise(sources, targets):
     """Walk two filename lists in parallel, testing if each source is newer
@@ -71,7 +72,7 @@ def newer_group(sources, target, missing='error'):
     # is more recent than 'target', then 'target' is out-of-date and
     # we can immediately return true.  If we fall through to the end
     # of the loop, then 'target' is up-to-date and we return false.
-    target_mtime = os.stat(target).st_mtime
+    target_mtime = os.stat(target)[ST_MTIME]
 
     for source in sources:
         if not os.path.exists(source):
@@ -82,7 +83,7 @@ def newer_group(sources, target, missing='error'):
             elif missing == 'newer':    # missing source means target is
                 return True             #  out-of-date
 
-        if os.stat(source).st_mtime > target_mtime:
+        if os.stat(source)[ST_MTIME] > target_mtime:
             return True
 
     return False

From 477a6fa41f95c753e0c5d3cc4f6f872cdd96c3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 10 Aug 2011 02:46:33 +0200
Subject: [PATCH 3224/8469] Revert cosmetic change.

A reminder: distutils only gets bug fixes.  Cosmetic changes, especially
in tests, are not worth the time spent, and can even make future merges
of bugfixes a bit less easy.
---
 tests/test_build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index c7c36f3cc7..4e46339b43 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -10,7 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
-from test.support import run_unittest, create_empty_file
+from test.support import run_unittest
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -71,11 +71,11 @@ def test_empty_package_dir(self):
 
         # create the distribution files.
         sources = self.mkdtemp()
-        create_empty_file(os.path.join(sources, "__init__.py"))
+        open(os.path.join(sources, "__init__.py"), "w").close()
 
         testdir = os.path.join(sources, "doc")
         os.mkdir(testdir)
-        create_empty_file(os.path.join(testdir, "testfile"))
+        open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
         old_stdout = sys.stdout

From 2af5d249da9647a383d27799c9bb9bf9802566c9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 13 Aug 2011 11:34:58 +0200
Subject: [PATCH 3225/8469] Bump version to 3.2.2rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c06002eab3..b31b2d203d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.1"
+__version__ = "3.2.2rc1"
 #--end constants--

From edaefa4982e0aac7b07048c4761446ed66fec524 Mon Sep 17 00:00:00 2001
From: Alex Clark <aclark@aclark.net>
Date: Sun, 14 Aug 2011 19:18:17 -0400
Subject: [PATCH 3226/8469] Remove extraneous 2nd argument in call to open_url,
 apparently intended to issue a warning (looks like open_url takes an optional
 `warning` argument, but I couldn't get that to work either). Fixes #135. This
 fix is better than the status quo, but probably not as good as issuing a
 warning instead of failure.

--HG--
branch : distribute
extra : rebase_source : 39889bf4dd21abbd57207bfafe6f8bad68b1e46f
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f064b110d5..c9e3d63777 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -198,7 +198,7 @@ def process_url(self, url, retrieve=False):
             return
 
         self.info("Reading %s", url)
-        f = self.open_url(url, "Download error: %s -- Some packages may not be found!")
+        f = self.open_url(url)
         if f is None: return
         self.fetched_urls[url] = self.fetched_urls[f.url] = True
 

From e6a12bbf1a51bb572145fd46715e2a20e54bfc52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 17 Aug 2011 03:44:27 -0400
Subject: [PATCH 3227/8469] Include url in warning when processing URL. Fixes
 #135.

--HG--
branch : distribute
extra : rebase_source : 1241e1cb548adad562fcf61ce33538712a64aaed
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f064b110d5..1dccabcb38 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -198,7 +198,7 @@ def process_url(self, url, retrieve=False):
             return
 
         self.info("Reading %s", url)
-        f = self.open_url(url, "Download error: %s -- Some packages may not be found!")
+        f = self.open_url(url, "Download error on %s: %%s -- Some packages may not be found!" % url)
         if f is None: return
         self.fetched_urls[url] = self.fetched_urls[f.url] = True
 

From faba07dcbfdb0bec687496bd329985497f907fbb Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 17 Aug 2011 20:49:41 +0200
Subject: [PATCH 3228/8469] Issue #12326: don't test the major version of
 sys.platform

Use startswith, instead of ==, when testing sys.platform to support
new platforms like Linux 3 or OpenBSD 5.
---
 tests/test_bdist_rpm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 030933f17c..9b0639a549 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -47,7 +47,7 @@ def test_quiet(self):
 
         # XXX I am unable yet to make this test work without
         # spurious sdtout/stderr output under Mac OS X
-        if sys.platform != 'linux2':
+        if not sys.platform.startswith('linux'):
             return
 
         # this test will run only if the rpm commands are found
@@ -87,7 +87,7 @@ def test_no_optimize_flag(self):
 
         # XXX I am unable yet to make this test work without
         # spurious sdtout/stderr output under Mac OS X
-        if sys.platform != 'linux2':
+        if not sys.platform.startswith('linux'):
             return
 
         # http://bugs.python.org/issue1533164

From 7c3f41d0b318ce9ef1400563cc20308cc9de33ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Aug 2011 18:34:40 -0400
Subject: [PATCH 3229/8469] Added tag 0.6.20 for changeset a7cf5ae137f1

--HG--
branch : distribute
extra : rebase_source : 321bdfe4b7b77edeab7de739e2c5481c94d22941
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8d467fbc47..0cec1be510 100644
--- a/.hgtags
+++ b/.hgtags
@@ -26,3 +26,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
 74108d7f07343556a8db94e8122221a43243f586 0.6.18
 611910892a0421633d72677979f94a25ef590d54 0.6.19
+a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20

From 781b4157b9ea9e95c75187048d5f008432bff16e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Aug 2011 18:37:58 -0400
Subject: [PATCH 3230/8469] Bumped revision

--HG--
branch : distribute
extra : rebase_source : 6ebf94097c5975957a8596aaadc1b466cdcbf796
---
 distribute.egg-info/entry_points.txt | 2 +-
 distribute_setup.py                  | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9dc5c2e138..9fd4175819 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.2 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 22c2d65f19..5a95c9275c 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.20"
+DEFAULT_VERSION = "0.6.21"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/release.sh b/release.sh
index 7f791691cf..667fd5fe44 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.20"
+export VERSION="0.6.21"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index bfb6240646..2982fcf0a4 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.20"
+VERSION = "0.6.21"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 5a82cc72c7252dcf4c6d64d93ce353f985090218 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Aug 2011 18:51:22 -0400
Subject: [PATCH 3231/8469] Updated changes (should have done this sooner).

--HG--
branch : distribute
extra : rebase_source : efb1d8a52b7c7faaea3bd9ca428a49c632813d73
---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa3eb476fe..616ba45891 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,9 @@ CHANGES
 0.6.20
 ------
 
-* ADD STUFF HERE
+* Issue #135: Include url in warning when processing URLs in package_index.
+* Issue #212: Fix issue where easy_instal fails on Python 3 on windows installer.
+* Issue #213: Fix typo in documentation.
 
 ------
 0.6.19

From 827916050d68864c15cb91962908dd01f0fd25ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Aug 2011 18:52:06 -0400
Subject: [PATCH 3232/8469] Added tag 0.6.20 for changeset c4a375336d55

--HG--
branch : distribute
extra : rebase_source : f7dd2894fdd0b6cd05991adf76129aa2270d5049
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 8d467fbc47..f740877164 100644
--- a/.hgtags
+++ b/.hgtags
@@ -26,3 +26,5 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
 74108d7f07343556a8db94e8122221a43243f586 0.6.18
 611910892a0421633d72677979f94a25ef590d54 0.6.19
+a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
+c4a375336d552129aef174486018ed09c212d684 0.6.20

From 415e9dbe45360be9a592d5916e87cb16b1b023a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Aug 2011 18:59:35 -0400
Subject: [PATCH 3233/8469] Bumped version in README and CHANGES

--HG--
branch : distribute
extra : rebase_source : ef7f9f76ee6efa1973b3aa0e8a3e2aa6b97ee5d0
---
 CHANGES.txt | 6 ++++++
 README.txt  | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 616ba45891..8a4bcebff5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.21
+------
+
+* ADD STUFF HERE
+
 ------
 0.6.20
 ------
diff --git a/README.txt b/README.txt
index f562d628bb..3ce7df6e11 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.20.tar.gz
-    $ tar -xzvf distribute-0.6.20.tar.gz
-    $ cd distribute-0.6.20
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.21.tar.gz
+    $ tar -xzvf distribute-0.6.21.tar.gz
+    $ cd distribute-0.6.21
     $ python setup.py install
 
 ---------------------------

From d2d11c0f224789430dee34ca05de87d70982d6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 06:27:18 +0200
Subject: [PATCH 3234/8469] Refactor the copying of xxmodule.c in distutils
 tests (#12141).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I need to copy this file in another test too, so I moved the support
code to distutils.tests.support and improved it:

- don’t skip when run from the Lib/distutils/tests directory
- use proper skip machinery instead of custom print/return/test suite
  fiddling.
---
 tests/support.py        | 42 +++++++++++++++++++++++++++++++++++++++++
 tests/test_build_ext.py | 28 ++++-----------------------
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index e258d2e58d..0e33827fe8 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,12 +2,15 @@
 import os
 import shutil
 import tempfile
+import unittest
+import sysconfig
 from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+
 class LoggingSilencer(object):
 
     def setUp(self):
@@ -41,6 +44,7 @@ def _format(msg, args):
     def clear_logs(self):
         self.logs = []
 
+
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
 
@@ -97,6 +101,7 @@ def create_dist(self, pkg_name='foo', **kw):
 
         return pkg_dir, dist
 
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
@@ -107,6 +112,7 @@ def __init__(self, **kwargs):
     def ensure_finalized(self):
         pass
 
+
 class EnvironGuard(object):
 
     def setUp(self):
@@ -123,3 +129,39 @@ def tearDown(self):
                 del os.environ[key]
 
         super(EnvironGuard, self).tearDown()
+
+
+def copy_xxmodule_c(directory):
+    """Helper for tests that need the xxmodule.c source file.
+
+    Example use:
+
+            def test_compile(self):
+                copy_xxmodule_c(self.tmpdir)
+                self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
+
+    If the source file can be found, it will be copied to *directory*.  If not,
+    the test will be skipped.  Errors during copy are not caught.
+    """
+    filename = _get_xxmodule_path()
+    if filename is None:
+        raise unittest.SkipTest('cannot find xxmodule.c (test must run in '
+                                'the python build dir)')
+    shutil.copy(filename, directory)
+
+
+def _get_xxmodule_path():
+    srcdir = sysconfig.get_config_var('srcdir')
+    candidates = [
+        # use installed copy if available
+        os.path.join(os.path.dirname(__file__), 'xxmodule.c'),
+        # otherwise try using copy from build directory
+        os.path.join(srcdir, 'Modules', 'xxmodule.c'),
+        # srcdir mysteriously can be $srcdir/Lib/distutils/tests when
+        # this file is run from its parent directory, so walk up the
+        # tree to find the real srcdir
+        os.path.join(srcdir, '..', '..', '..', 'Modules', 'xxmodule.c'),
+    ]
+    for path in candidates:
+        if os.path.exists(path):
+            return path
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 0ce7f0f81c..de53afb1c3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,14 +1,13 @@
 import sys
 import os
-import shutil
 from io import StringIO
 import textwrap
 
 from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
-from distutils.tests.support import TempdirManager
-from distutils.tests.support import LoggingSilencer
+from distutils.tests.support import (TempdirManager, LoggingSilencer,
+                                     copy_xxmodule_c)
 from distutils.extension import Extension
 from distutils.errors import (
     CompileError, DistutilsPlatformError, DistutilsSetupError,
@@ -16,20 +15,11 @@
 
 import unittest
 from test import support
-from test.support import run_unittest
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-def _get_source_filename():
-    # use installed copy if available
-    tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
-    if os.path.exists(tests_f):
-        return tests_f
-    # otherwise try using copy from build directory
-    srcdir = sysconfig.get_config_var('srcdir')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
 class BuildExtTestCase(TempdirManager,
                        LoggingSilencer,
@@ -41,9 +31,6 @@ def setUp(self):
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
-        filename = _get_source_filename()
-        if os.path.exists(filename):
-            shutil.copy(filename, self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -72,9 +59,8 @@ def _fixup_command(self, cmd):
 
     def test_build_ext(self):
         global ALREADY_TESTED
+        copy_xxmodule_c(self.tmp_dir)
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
-        if not os.path.exists(xx_c):
-            return
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
@@ -518,13 +504,7 @@ def _try_compile_deployment_target(self, operator, target):
 
 
 def test_suite():
-    src = _get_source_filename()
-    if not os.path.exists(src):
-        if support.verbose:
-            print('test_build_ext: Cannot find source code (test'
-                  ' must run in python build dir)')
-        return unittest.TestSuite()
-    else: return unittest.makeSuite(BuildExtTestCase)
+    return unittest.makeSuite(BuildExtTestCase)
 
 if __name__ == '__main__':
     support.run_unittest(test_suite())

From 5deb9c1a36539871aeb5a1fab451942aa2cf5cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 06:27:18 +0200
Subject: [PATCH 3235/8469] Refactor the copying of xxmodule.c in distutils
 tests (#12141).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I need to copy this file in another test too, so I moved the support
code to distutils.tests.support and improved it:

- don’t skip when run from the Lib/distutils/tests directory
- use proper skip machinery instead of custom print/return/test suite
  fiddling.
---
 tests/support.py        | 42 +++++++++++++++++++++++++++++++++++++++++
 tests/test_build_ext.py | 28 ++++-----------------------
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index e258d2e58d..0e33827fe8 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -2,12 +2,15 @@
 import os
 import shutil
 import tempfile
+import unittest
+import sysconfig
 from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+
 class LoggingSilencer(object):
 
     def setUp(self):
@@ -41,6 +44,7 @@ def _format(msg, args):
     def clear_logs(self):
         self.logs = []
 
+
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
 
@@ -97,6 +101,7 @@ def create_dist(self, pkg_name='foo', **kw):
 
         return pkg_dir, dist
 
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
@@ -107,6 +112,7 @@ def __init__(self, **kwargs):
     def ensure_finalized(self):
         pass
 
+
 class EnvironGuard(object):
 
     def setUp(self):
@@ -123,3 +129,39 @@ def tearDown(self):
                 del os.environ[key]
 
         super(EnvironGuard, self).tearDown()
+
+
+def copy_xxmodule_c(directory):
+    """Helper for tests that need the xxmodule.c source file.
+
+    Example use:
+
+            def test_compile(self):
+                copy_xxmodule_c(self.tmpdir)
+                self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
+
+    If the source file can be found, it will be copied to *directory*.  If not,
+    the test will be skipped.  Errors during copy are not caught.
+    """
+    filename = _get_xxmodule_path()
+    if filename is None:
+        raise unittest.SkipTest('cannot find xxmodule.c (test must run in '
+                                'the python build dir)')
+    shutil.copy(filename, directory)
+
+
+def _get_xxmodule_path():
+    srcdir = sysconfig.get_config_var('srcdir')
+    candidates = [
+        # use installed copy if available
+        os.path.join(os.path.dirname(__file__), 'xxmodule.c'),
+        # otherwise try using copy from build directory
+        os.path.join(srcdir, 'Modules', 'xxmodule.c'),
+        # srcdir mysteriously can be $srcdir/Lib/distutils/tests when
+        # this file is run from its parent directory, so walk up the
+        # tree to find the real srcdir
+        os.path.join(srcdir, '..', '..', '..', 'Modules', 'xxmodule.c'),
+    ]
+    for path in candidates:
+        if os.path.exists(path):
+            return path
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 0ce7f0f81c..de53afb1c3 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,14 +1,13 @@
 import sys
 import os
-import shutil
 from io import StringIO
 import textwrap
 
 from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
-from distutils.tests.support import TempdirManager
-from distutils.tests.support import LoggingSilencer
+from distutils.tests.support import (TempdirManager, LoggingSilencer,
+                                     copy_xxmodule_c)
 from distutils.extension import Extension
 from distutils.errors import (
     CompileError, DistutilsPlatformError, DistutilsSetupError,
@@ -16,20 +15,11 @@
 
 import unittest
 from test import support
-from test.support import run_unittest
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-def _get_source_filename():
-    # use installed copy if available
-    tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
-    if os.path.exists(tests_f):
-        return tests_f
-    # otherwise try using copy from build directory
-    srcdir = sysconfig.get_config_var('srcdir')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
 class BuildExtTestCase(TempdirManager,
                        LoggingSilencer,
@@ -41,9 +31,6 @@ def setUp(self):
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
-        filename = _get_source_filename()
-        if os.path.exists(filename):
-            shutil.copy(filename, self.tmp_dir)
         if sys.version > "2.6":
             import site
             self.old_user_base = site.USER_BASE
@@ -72,9 +59,8 @@ def _fixup_command(self, cmd):
 
     def test_build_ext(self):
         global ALREADY_TESTED
+        copy_xxmodule_c(self.tmp_dir)
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
-        if not os.path.exists(xx_c):
-            return
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
@@ -518,13 +504,7 @@ def _try_compile_deployment_target(self, operator, target):
 
 
 def test_suite():
-    src = _get_source_filename()
-    if not os.path.exists(src):
-        if support.verbose:
-            print('test_build_ext: Cannot find source code (test'
-                  ' must run in python build dir)')
-        return unittest.TestSuite()
-    else: return unittest.makeSuite(BuildExtTestCase)
+    return unittest.makeSuite(BuildExtTestCase)
 
 if __name__ == '__main__':
     support.run_unittest(test_suite())

From 1273191a70b9b8a174da03506f34fe9e3b53fc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 07:00:41 +0200
Subject: [PATCH 3236/8469] Rework test_record a bit to make the test more
 exact

---
 tests/test_install.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/test_install.py b/tests/test_install.py
index ed69b0cbb0..3e47d819fe 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.install."""
 
 import os
-import os.path
 import sys
 import unittest
 import site
@@ -167,33 +166,36 @@ def test_finalize_options(self):
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
     def test_record(self):
-
         install_dir = self.mkdtemp()
-        pkgdir, dist = self.create_dist()
+        project_dir, dist = self.create_dist(scripts=['hello'])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        self.write_file('hello', "print('o hai')")
 
-        dist = Distribution()
         cmd = install(dist)
         dist.command_obj['install'] = cmd
         cmd.root = install_dir
-        cmd.record = os.path.join(pkgdir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'RECORD')
         cmd.ensure_finalized()
-
         cmd.run()
 
-        # let's check the RECORD file was created with one
-        # line (the egg info file)
         f = open(cmd.record)
         try:
-            self.assertEqual(len(f.readlines()), 1)
+            content = f.read()
         finally:
             f.close()
 
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = ['hello',
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)
         install_module.DEBUG = True
         try:
-            with captured_stdout() as stdout:
+            with captured_stdout():
                 self.test_record()
         finally:
             install_module.DEBUG = False

From 07f33c845c7823038bc7a8a3eee9a55caff2b80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 21 Aug 2011 17:02:07 +0200
Subject: [PATCH 3237/8469] Factor out the build_ext fixup for shared Python
 builds.

I need this to fix the failing test_install.
---
 tests/support.py        | 27 +++++++++++++++++++++++++++
 tests/test_build_ext.py | 31 ++++++-------------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 0e33827fe8..562a65c861 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,5 +1,6 @@
 """Support code for distutils test cases."""
 import os
+import sys
 import shutil
 import tempfile
 import unittest
@@ -165,3 +166,29 @@ def _get_xxmodule_path():
     for path in candidates:
         if os.path.exists(path):
             return path
+
+
+def fixup_build_ext(cmd):
+    """Function needed to make build_ext tests pass on shared builds.
+
+    When Python was build with --enable-shared, -L. is not good enough to find
+    the libpython<blah>.so.  This is because regrtest runs it under a tempdir,
+    not in the top level where the .so lives.  By the time we've gotten here,
+    Python's already been chdir'd to the tempdir.  This function work arounds
+    that.  Example use:
+
+        cmd = build_ext(dist)
+        support.fixup_build_ext(cmd)
+        cmd.ensure_finalized()
+    """
+    # To further add to the fun, we can't just add library_dirs to the
+    # Extension() instance because that doesn't get plumbed through to the
+    # final compiler command.
+    if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
+        not sys.platform.startswith('win')):
+        runshared = sysconfig.get_config_var('RUNSHARED')
+        if runshared is None:
+            cmd.library_dirs = ['.']
+        else:
+            name, equals, value = runshared.partition('=')
+            cmd.library_dirs = value.split(os.pathsep)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index de53afb1c3..8eb59b4d2e 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -7,7 +7,7 @@
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests.support import (TempdirManager, LoggingSilencer,
-                                     copy_xxmodule_c)
+                                     copy_xxmodule_c, fixup_build_ext)
 from distutils.extension import Extension
 from distutils.errors import (
     CompileError, DistutilsPlatformError, DistutilsSetupError,
@@ -38,25 +38,6 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
-    def _fixup_command(self, cmd):
-        # When Python was build with --enable-shared, -L. is not good enough
-        # to find the libpython<blah>.so.  This is because regrtest runs it
-        # under a tempdir, not in the top level where the .so lives.  By the
-        # time we've gotten here, Python's already been chdir'd to the
-        # tempdir.
-        #
-        # To further add to the fun, we can't just add library_dirs to the
-        # Extension() instance because that doesn't get plumbed through to the
-        # final compiler command.
-        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
-            not sys.platform.startswith('win')):
-            runshared = sysconfig.get_config_var('RUNSHARED')
-            if runshared is None:
-                cmd.library_dirs = ['.']
-            else:
-                name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
-
     def test_build_ext(self):
         global ALREADY_TESTED
         copy_xxmodule_c(self.tmp_dir)
@@ -65,7 +46,7 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
+        fixup_build_ext(cmd)
         if os.name == "nt":
             # On Windows, we must build a debug version iff running
             # a debug build of Python
@@ -162,9 +143,9 @@ def test_user_site(self):
 
         # see if include_dirs and library_dirs
         # were set
-        self.assertTrue(lib in cmd.library_dirs)
-        self.assertTrue(lib in cmd.rpath)
-        self.assertTrue(incl in cmd.include_dirs)
+        self.assertIn(lib, cmd.library_dirs)
+        self.assertIn(lib, cmd.rpath)
+        self.assertIn(incl, cmd.include_dirs)
 
     def test_optional_extension(self):
 
@@ -320,7 +301,7 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
+        fixup_build_ext(cmd)
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
 

From b359d8104f3393cb1eeda51a76ffc85289b91b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 07:00:41 +0200
Subject: [PATCH 3238/8469] Rework test_record a bit to make the test more
 exact

---
 tests/test_install.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/test_install.py b/tests/test_install.py
index ed69b0cbb0..3e47d819fe 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.install."""
 
 import os
-import os.path
 import sys
 import unittest
 import site
@@ -167,33 +166,36 @@ def test_finalize_options(self):
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
     def test_record(self):
-
         install_dir = self.mkdtemp()
-        pkgdir, dist = self.create_dist()
+        project_dir, dist = self.create_dist(scripts=['hello'])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        self.write_file('hello', "print('o hai')")
 
-        dist = Distribution()
         cmd = install(dist)
         dist.command_obj['install'] = cmd
         cmd.root = install_dir
-        cmd.record = os.path.join(pkgdir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'RECORD')
         cmd.ensure_finalized()
-
         cmd.run()
 
-        # let's check the RECORD file was created with one
-        # line (the egg info file)
         f = open(cmd.record)
         try:
-            self.assertEqual(len(f.readlines()), 1)
+            content = f.read()
         finally:
             f.close()
 
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = ['hello',
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)
         install_module.DEBUG = True
         try:
-            with captured_stdout() as stdout:
+            with captured_stdout():
                 self.test_record()
         finally:
             install_module.DEBUG = False

From 13d8a65041270b836929fe82d2c925b92bdfbb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 07:08:51 +0200
Subject: [PATCH 3239/8469] Add a test for extension modules in the distutils
 record file.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I made a note a month ago that install --record wrote incorrect entries
for extension modules (I think the problem was that the first character
of the file was stripped), so I’m now adding a test to try to reproduce
that in the current versions.
---
 tests/test_install.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/test_install.py b/tests/test_install.py
index 3e47d819fe..2133fa7916 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -7,11 +7,14 @@
 
 from test.support import captured_stdout, run_unittest
 
+from distutils import sysconfig
 from distutils.command.install import install
 from distutils.command import install as install_module
+from distutils.command.build_ext import build_ext
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils.extension import Extension
 
 from distutils.tests import support
 
@@ -190,6 +193,36 @@ def test_record(self):
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
+    def test_record_extensions(self):
+        install_dir = self.mkdtemp()
+        project_dir, dist = self.create_dist(ext_modules=[
+            Extension('xx', ['xxmodule.c'])])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        support.copy_xxmodule_c(project_dir)
+
+        buildcmd = build_ext(dist)
+        buildcmd.ensure_finalized()
+        buildcmd.run()
+
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.record)
+        try:
+            content = f.read()
+        finally:
+            f.close()
+
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = ['xx%s' % sysconfig.get_config_var('SO'),
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)

From d45ea9f230f69621dd6e9fbf8b8c8526a7e28ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 07:08:51 +0200
Subject: [PATCH 3240/8469] Add a test for extension modules in the distutils
 record file.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I made a note a month ago that install --record wrote incorrect entries
for extension modules (I think the problem was that the first character
of the file was stripped), so I’m now adding a test to try to reproduce
that in the current versions.
---
 tests/test_install.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/test_install.py b/tests/test_install.py
index 3e47d819fe..2133fa7916 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -7,11 +7,14 @@
 
 from test.support import captured_stdout, run_unittest
 
+from distutils import sysconfig
 from distutils.command.install import install
 from distutils.command import install as install_module
+from distutils.command.build_ext import build_ext
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils.extension import Extension
 
 from distutils.tests import support
 
@@ -190,6 +193,36 @@ def test_record(self):
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
+    def test_record_extensions(self):
+        install_dir = self.mkdtemp()
+        project_dir, dist = self.create_dist(ext_modules=[
+            Extension('xx', ['xxmodule.c'])])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        support.copy_xxmodule_c(project_dir)
+
+        buildcmd = build_ext(dist)
+        buildcmd.ensure_finalized()
+        buildcmd.run()
+
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.record)
+        try:
+            content = f.read()
+        finally:
+            f.close()
+
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = ['xx%s' % sysconfig.get_config_var('SO'),
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
     def test_debug_mode(self):
         # this covers the code called when DEBUG is set
         old_logs_len = len(self.logs)

From b4d117a031abecb380ffea57535241ca339d3622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 07:25:39 +0200
Subject: [PATCH 3241/8469] Dedent example in docstring

---
 tests/support.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 0e33827fe8..81289db4a1 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -136,9 +136,9 @@ def copy_xxmodule_c(directory):
 
     Example use:
 
-            def test_compile(self):
-                copy_xxmodule_c(self.tmpdir)
-                self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
+        def test_compile(self):
+            copy_xxmodule_c(self.tmpdir)
+            self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
 
     If the source file can be found, it will be copied to *directory*.  If not,
     the test will be skipped.  Errors during copy are not caught.

From 2e6300e37739b614e8b4286a9c6f534305c1c005 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 20 Aug 2011 11:52:00 +0200
Subject: [PATCH 3242/8469] don't use ternary operator - fixes #225

--HG--
branch : distribute
extra : rebase_source : ecff177a6be463bfc55c40deec0a3f1e2804e895
---
 setuptools/command/easy_install.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f44e8d4ae2..263b429c3c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1428,7 +1428,10 @@ def extract_wininst_cfg(dist_filename):
             part = f.read(cfglen)
             # part is in bytes, but we need to read up to the first null
             #  byte.
-            null_byte = bytes([0]) if sys.version_info >= (2,6) else chr(0)
+            if sys.version_info >= (2,6):
+                null_byte = bytes([0])
+            else:
+                chr(0)
             config = part.split(null_byte, 1)[0]
             # Now the config is in bytes, but on Python 3, it must be
             #  unicode for the RawConfigParser, so decode it. Is this the

From 4edb9c187d266dab1673aaad56c93d1a0be323bc Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 20 Aug 2011 11:55:08 +0200
Subject: [PATCH 3243/8469] added a note change

--HG--
branch : distribute
extra : rebase_source : 5a1be47325345d91791d77860aeef30c527b70e6
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8a4bcebff5..9d2b4f5438 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.21
 ------
 
-* ADD STUFF HERE
+* Issue #225: FIxed a regression on py2.4
 
 ------
 0.6.20

From aad36d610b0d3b9778e1fe53fd3a1aefe5da2e71 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 20 Aug 2011 11:56:41 +0200
Subject: [PATCH 3244/8469] Added tag 0.6.21 for changeset de44acab3cfc

--HG--
branch : distribute
extra : rebase_source : 63dcebb8a273de6b634466ef81dc7912223e34e4
---
 .hgtags | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.hgtags b/.hgtags
index 9db36cc31e..734cd0c073 100644
--- a/.hgtags
+++ b/.hgtags
@@ -27,4 +27,5 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 74108d7f07343556a8db94e8122221a43243f586 0.6.18
 611910892a0421633d72677979f94a25ef590d54 0.6.19
 a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
-c4a375336d552129aef174486018ed09c212d684 0.6.20
\ No newline at end of file
+c4a375336d552129aef174486018ed09c212d684 0.6.20
+de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21

From b11523cfc567b2be5d0a56b954541d747bced9fe Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Sat, 20 Aug 2011 12:02:34 +0200
Subject: [PATCH 3245/8469] starting 0.6.22 dev

--HG--
branch : distribute
extra : rebase_source : 14a38f62c8faf493b64102b7e21244048edea5be
---
 CHANGES.txt                          | 6 ++++++
 README.txt                           | 6 +++---
 distribute.egg-info/entry_points.txt | 2 +-
 distribute_setup.py                  | 2 +-
 release.sh                           | 2 +-
 setup.py                             | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d2b4f5438..3f13a3f65c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.22
+------
+
+* ADD STUFF HERE
+
 ------
 0.6.21
 ------
diff --git a/README.txt b/README.txt
index 3ce7df6e11..8faa59b472 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.21.tar.gz
-    $ tar -xzvf distribute-0.6.21.tar.gz
-    $ cd distribute-0.6.21
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.22.tar.gz
+    $ tar -xzvf distribute-0.6.22.tar.gz
+    $ cd distribute-0.6.22
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 9fd4175819..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/distribute_setup.py b/distribute_setup.py
index 5a95c9275c..2ee0f1249f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.21"
+DEFAULT_VERSION = "0.6.22"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/release.sh b/release.sh
index 667fd5fe44..0da1886273 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.21"
+export VERSION="0.6.22"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 2982fcf0a4..3e9754c789 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.21"
+VERSION = "0.6.22"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 05564db286ce0b50ea5296adea3e462793dfcbe1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2011 07:51:48 -0600
Subject: [PATCH 3246/8469] Fix NameError on Python 2.4, 2.5; reference #225

--HG--
branch : distribute
extra : rebase_source : b2c739a08485c49b0735f5f7544f354b46ad1d12
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 263b429c3c..853753c19b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1431,7 +1431,7 @@ def extract_wininst_cfg(dist_filename):
             if sys.version_info >= (2,6):
                 null_byte = bytes([0])
             else:
-                chr(0)
+                null_byte = chr(0)
             config = part.split(null_byte, 1)[0]
             # Now the config is in bytes, but on Python 3, it must be
             #  unicode for the RawConfigParser, so decode it. Is this the

From 0da4543c2641cb04affb1d9b9e1d15f6e4f3fbea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2011 07:58:51 -0600
Subject: [PATCH 3247/8469] Updated CHANGES regarding #225

--HG--
branch : distribute
extra : rebase_source : 4a44e46730c28e420aeffb873ab061f6d9ef0599
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3f13a3f65c..fe529fb3a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.22
 ------
 
-* ADD STUFF HERE
+* Issue #225: Fixed a NameError on Python 2.5, 2.4
 
 ------
 0.6.21

From d6a76c9070699d8701c00123b24d204484df68e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 20 Aug 2011 19:52:07 +0200
Subject: [PATCH 3248/8469] Fix sdist test on Windows (#12678).  Patch by
 Jeremy Kloth.

---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 440af9886c..f34f786c92 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -365,6 +365,7 @@ def test_manifest_comments(self):
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
         self.write_file((self.tmp_dir, 'README.manual'),

From c0f9165822276f0cd6b74ea6d0296e494b3e5a3f Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 21 Aug 2011 00:39:18 +0200
Subject: [PATCH 3249/8469] Issue #12326: refactor usage of sys.platform

 * Use str.startswith(tuple): I didn't know this Python feature, Python rocks!
 * Replace sometimes sys.platform.startswith('linux') with
   sys.platform == 'linux'
 * sys.platform doesn't contain the major version on Cygwin on Mac OS X
   (it's just 'cygwin' and 'darwin')
---
 command/build_ext.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8d843d689f..8baf538f2a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -240,8 +240,7 @@ def finalize_options(self):
         # for extensions under Linux or Solaris with a shared Python library,
         # Python's library directory must be appended to library_dirs
         sysconfig.get_config_var('Py_ENABLE_SHARED')
-        if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
-             or sys.platform.startswith('sunos'))
+        if (sys.platform.startswith(('linux', 'gnu', 'sunos'))
             and sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions

From e081dd68394c4fb8961c78fd2a4d8c71f69ac0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 21 Aug 2011 12:53:37 +0200
Subject: [PATCH 3250/8469] Add missing closing paren in docstring (thanks
 Ezio)

---
 tests/support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/support.py b/tests/support.py
index 81289db4a1..49277111bf 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -138,7 +138,7 @@ def copy_xxmodule_c(directory):
 
         def test_compile(self):
             copy_xxmodule_c(self.tmpdir)
-            self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
+            self.assertIn('xxmodule.c', os.listdir(self.tmpdir))
 
     If the source file can be found, it will be copied to *directory*.  If not,
     the test will be skipped.  Errors during copy are not caught.

From b96da7b0feee847c2a2b51678da402731378b097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 21 Aug 2011 17:02:07 +0200
Subject: [PATCH 3251/8469] Factor out the build_ext fixup for shared Python
 builds.

I need this to fix the failing test_install.
---
 tests/support.py        | 27 +++++++++++++++++++++++++++
 tests/test_build_ext.py | 31 ++++++-------------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 49277111bf..ffef98bae4 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,5 +1,6 @@
 """Support code for distutils test cases."""
 import os
+import sys
 import shutil
 import tempfile
 import unittest
@@ -165,3 +166,29 @@ def _get_xxmodule_path():
     for path in candidates:
         if os.path.exists(path):
             return path
+
+
+def fixup_build_ext(cmd):
+    """Function needed to make build_ext tests pass on shared builds.
+
+    When Python was build with --enable-shared, -L. is not good enough to find
+    the libpython<blah>.so.  This is because regrtest runs it under a tempdir,
+    not in the top level where the .so lives.  By the time we've gotten here,
+    Python's already been chdir'd to the tempdir.  This function work arounds
+    that.  Example use:
+
+        cmd = build_ext(dist)
+        support.fixup_build_ext(cmd)
+        cmd.ensure_finalized()
+    """
+    # To further add to the fun, we can't just add library_dirs to the
+    # Extension() instance because that doesn't get plumbed through to the
+    # final compiler command.
+    if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
+        not sys.platform.startswith('win')):
+        runshared = sysconfig.get_config_var('RUNSHARED')
+        if runshared is None:
+            cmd.library_dirs = ['.']
+        else:
+            name, equals, value = runshared.partition('=')
+            cmd.library_dirs = value.split(os.pathsep)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index de53afb1c3..8eb59b4d2e 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -7,7 +7,7 @@
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
 from distutils.tests.support import (TempdirManager, LoggingSilencer,
-                                     copy_xxmodule_c)
+                                     copy_xxmodule_c, fixup_build_ext)
 from distutils.extension import Extension
 from distutils.errors import (
     CompileError, DistutilsPlatformError, DistutilsSetupError,
@@ -38,25 +38,6 @@ def setUp(self):
             from distutils.command import build_ext
             build_ext.USER_BASE = site.USER_BASE
 
-    def _fixup_command(self, cmd):
-        # When Python was build with --enable-shared, -L. is not good enough
-        # to find the libpython<blah>.so.  This is because regrtest runs it
-        # under a tempdir, not in the top level where the .so lives.  By the
-        # time we've gotten here, Python's already been chdir'd to the
-        # tempdir.
-        #
-        # To further add to the fun, we can't just add library_dirs to the
-        # Extension() instance because that doesn't get plumbed through to the
-        # final compiler command.
-        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
-            not sys.platform.startswith('win')):
-            runshared = sysconfig.get_config_var('RUNSHARED')
-            if runshared is None:
-                cmd.library_dirs = ['.']
-            else:
-                name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
-
     def test_build_ext(self):
         global ALREADY_TESTED
         copy_xxmodule_c(self.tmp_dir)
@@ -65,7 +46,7 @@ def test_build_ext(self):
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
+        fixup_build_ext(cmd)
         if os.name == "nt":
             # On Windows, we must build a debug version iff running
             # a debug build of Python
@@ -162,9 +143,9 @@ def test_user_site(self):
 
         # see if include_dirs and library_dirs
         # were set
-        self.assertTrue(lib in cmd.library_dirs)
-        self.assertTrue(lib in cmd.rpath)
-        self.assertTrue(incl in cmd.include_dirs)
+        self.assertIn(lib, cmd.library_dirs)
+        self.assertIn(lib, cmd.rpath)
+        self.assertIn(incl, cmd.include_dirs)
 
     def test_optional_extension(self):
 
@@ -320,7 +301,7 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
+        fixup_build_ext(cmd)
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
 

From babd93f6a36c537938f716994004f31ea22e03e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 21 Aug 2011 17:03:19 +0200
Subject: [PATCH 3252/8469] Fix distutils test_install for shared CPython
 builds

---
 tests/test_install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_install.py b/tests/test_install.py
index 2133fa7916..e065aa3dcd 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -202,6 +202,7 @@ def test_record_extensions(self):
         support.copy_xxmodule_c(project_dir)
 
         buildcmd = build_ext(dist)
+        support.fixup_build_ext(buildcmd)
         buildcmd.ensure_finalized()
         buildcmd.run()
 

From 9e1eee4615f9ef0410ef1502b111c74c7880e32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 21 Aug 2011 17:03:19 +0200
Subject: [PATCH 3253/8469] Fix distutils test_install for shared CPython
 builds

---
 tests/test_install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_install.py b/tests/test_install.py
index 2133fa7916..e065aa3dcd 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -202,6 +202,7 @@ def test_record_extensions(self):
         support.copy_xxmodule_c(project_dir)
 
         buildcmd = build_ext(dist)
+        support.fixup_build_ext(buildcmd)
         buildcmd.ensure_finalized()
         buildcmd.run()
 

From 54bac89d98770275e3801f293c88251211354d8c Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 21 Aug 2011 22:35:41 +0200
Subject: [PATCH 3254/8469] Issue #12678: Fix distutils sdist test on Windows.

Patch by Jeremy Kloth.
---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 440af9886c..f34f786c92 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -365,6 +365,7 @@ def test_manifest_comments(self):
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
         self.write_file((self.tmp_dir, 'README.manual'),

From 6e23eb2a22ad885a41f58d035b7d11c3e3c0658a Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 21 Aug 2011 22:35:41 +0200
Subject: [PATCH 3255/8469] Issue #12678: Fix distutils sdist test on Windows.

Patch by Jeremy Kloth.
---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 440af9886c..f34f786c92 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -365,6 +365,7 @@ def test_manifest_comments(self):
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
         self.write_file((self.tmp_dir, 'README.manual'),

From 5b49959934750e3cfd186c85fe8f5a4bcffc253b Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 21 Aug 2011 22:40:04 +0200
Subject: [PATCH 3256/8469] Issue #12678: Fix distutils sdist test on Windows.

Patch by Jeremy Kloth.
---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 8da6fe4de8..42faa5d16b 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -351,6 +351,7 @@ def test_get_file_list(self):
         # filling data_files by pointing files in package_data
         dist.package_data = {'somecode': ['*.txt']}
         self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         cmd.run()
 

From fa9b78e7d73bf1af3d6959caa43d19c7d6059240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 24 Aug 2011 01:29:10 +0200
Subject: [PATCH 3257/8469] Fix distutils tests on Windows (#12678).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- First, support.fixup_build_ext (already used to set proper
  library_dirs value under Unix shared builds) gains the ability to
  correctly set the debug attribute under Windows debug builds.

- Second, the filename for the extension module gets a _d suffix under
  debug builds.

- Third, the test code properly puts our customized build_ext object
  into an internal dictionary to make sure that the install command will
  later use our object instead of re-creating one.  That’s the downside
  of using low-level APIs in our test code: we have to manually push
  knobs and turn handles that would otherwise be handled behind the
  scenes.

Thanks to Nadeem for the testing.
---
 tests/support.py        | 28 +++++++++++++++++-----------
 tests/test_build_ext.py |  7 -------
 tests/test_install.py   | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 562a65c861..7a76ca05a0 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -169,23 +169,29 @@ def _get_xxmodule_path():
 
 
 def fixup_build_ext(cmd):
-    """Function needed to make build_ext tests pass on shared builds.
+    """Function needed to make build_ext tests pass.
 
-    When Python was build with --enable-shared, -L. is not good enough to find
-    the libpython<blah>.so.  This is because regrtest runs it under a tempdir,
-    not in the top level where the .so lives.  By the time we've gotten here,
-    Python's already been chdir'd to the tempdir.  This function work arounds
-    that.  Example use:
+    When Python was build with --enable-shared on Unix, -L. is not good
+    enough to find the libpython<blah>.so.  This is because regrtest runs
+    it under a tempdir, not in the top level where the .so lives.  By the
+    time we've gotten here, Python's already been chdir'd to the tempdir.
+
+    When Python was built with in debug mode on Windows, build_ext commands
+    need their debug attribute set, and it is not done automatically for
+    some reason.
+
+    This function handles both of these things.  Example use:
 
         cmd = build_ext(dist)
         support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
     """
-    # To further add to the fun, we can't just add library_dirs to the
-    # Extension() instance because that doesn't get plumbed through to the
-    # final compiler command.
-    if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
-        not sys.platform.startswith('win')):
+    if os.name == 'nt':
+        cmd.debug = sys.executable.endswith('_d.exe')
+    elif sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        # To further add to the shared builds fun on Unix, we can't just add
+        # library_dirs to the Extension() instance because that doesn't get
+        # plumbed through to the final compiler command.
         runshared = sysconfig.get_config_var('RUNSHARED')
         if runshared is None:
             cmd.library_dirs = ['.']
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 8eb59b4d2e..1827437628 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -47,10 +47,6 @@ def test_build_ext(self):
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
         fixup_build_ext(cmd)
-        if os.name == "nt":
-            # On Windows, we must build a debug version iff running
-            # a debug build of Python
-            cmd.debug = sys.executable.endswith("_d.exe")
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 
@@ -305,9 +301,6 @@ def test_get_outputs(self):
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
 
-        if os.name == "nt":
-            cmd.debug = sys.executable.endswith("_d.exe")
-
         cmd.build_lib = os.path.join(self.tmp_dir, 'build')
         cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
 
diff --git a/tests/test_install.py b/tests/test_install.py
index e065aa3dcd..5c105af95a 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -18,6 +18,14 @@
 
 from distutils.tests import support
 
+
+def _make_ext_name(modname):
+    if os.name == 'nt':
+        if sys.executable.endswith('_d.exe'):
+            modname += '_d'
+    return modname + sysconfig.get_config_var('SO')
+
+
 class InstallTestCase(support.TempdirManager,
                       support.EnvironGuard,
                       support.LoggingSilencer,
@@ -201,13 +209,13 @@ def test_record_extensions(self):
         os.chdir(project_dir)
         support.copy_xxmodule_c(project_dir)
 
-        buildcmd = build_ext(dist)
-        support.fixup_build_ext(buildcmd)
-        buildcmd.ensure_finalized()
-        buildcmd.run()
+        buildextcmd = build_ext(dist)
+        support.fixup_build_ext(buildextcmd)
+        buildextcmd.ensure_finalized()
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
+        dist.command_obj['build_ext'] = buildextcmd
         cmd.root = install_dir
         cmd.record = os.path.join(project_dir, 'RECORD')
         cmd.ensure_finalized()
@@ -220,7 +228,7 @@ def test_record_extensions(self):
             f.close()
 
         found = [os.path.basename(line) for line in content.splitlines()]
-        expected = ['xx%s' % sysconfig.get_config_var('SO'),
+        expected = [_make_ext_name('xx'),
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 

From c8bf9949a369a69aa561332b150f813539dbfd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 24 Aug 2011 01:29:10 +0200
Subject: [PATCH 3258/8469] Fix distutils tests on Windows (#12678).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- First, support.fixup_build_ext (already used to set proper
  library_dirs value under Unix shared builds) gains the ability to
  correctly set the debug attribute under Windows debug builds.

- Second, the filename for the extension module gets a _d suffix under
  debug builds.

- Third, the test code properly puts our customized build_ext object
  into an internal dictionary to make sure that the install command will
  later use our object instead of re-creating one.  That’s the downside
  of using low-level APIs in our test code: we have to manually push
  knobs and turn handles that would otherwise be handled behind the
  scenes.

Thanks to Nadeem for the testing.
---
 tests/support.py        | 28 +++++++++++++++++-----------
 tests/test_build_ext.py |  7 -------
 tests/test_install.py   | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index ffef98bae4..dc0e660e69 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -169,23 +169,29 @@ def _get_xxmodule_path():
 
 
 def fixup_build_ext(cmd):
-    """Function needed to make build_ext tests pass on shared builds.
+    """Function needed to make build_ext tests pass.
 
-    When Python was build with --enable-shared, -L. is not good enough to find
-    the libpython<blah>.so.  This is because regrtest runs it under a tempdir,
-    not in the top level where the .so lives.  By the time we've gotten here,
-    Python's already been chdir'd to the tempdir.  This function work arounds
-    that.  Example use:
+    When Python was build with --enable-shared on Unix, -L. is not good
+    enough to find the libpython<blah>.so.  This is because regrtest runs
+    it under a tempdir, not in the top level where the .so lives.  By the
+    time we've gotten here, Python's already been chdir'd to the tempdir.
+
+    When Python was built with in debug mode on Windows, build_ext commands
+    need their debug attribute set, and it is not done automatically for
+    some reason.
+
+    This function handles both of these things.  Example use:
 
         cmd = build_ext(dist)
         support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
     """
-    # To further add to the fun, we can't just add library_dirs to the
-    # Extension() instance because that doesn't get plumbed through to the
-    # final compiler command.
-    if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
-        not sys.platform.startswith('win')):
+    if os.name == 'nt':
+        cmd.debug = sys.executable.endswith('_d.exe')
+    elif sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        # To further add to the shared builds fun on Unix, we can't just add
+        # library_dirs to the Extension() instance because that doesn't get
+        # plumbed through to the final compiler command.
         runshared = sysconfig.get_config_var('RUNSHARED')
         if runshared is None:
             cmd.library_dirs = ['.']
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 8eb59b4d2e..1827437628 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -47,10 +47,6 @@ def test_build_ext(self):
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
         fixup_build_ext(cmd)
-        if os.name == "nt":
-            # On Windows, we must build a debug version iff running
-            # a debug build of Python
-            cmd.debug = sys.executable.endswith("_d.exe")
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 
@@ -305,9 +301,6 @@ def test_get_outputs(self):
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
 
-        if os.name == "nt":
-            cmd.debug = sys.executable.endswith("_d.exe")
-
         cmd.build_lib = os.path.join(self.tmp_dir, 'build')
         cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
 
diff --git a/tests/test_install.py b/tests/test_install.py
index e065aa3dcd..5c105af95a 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -18,6 +18,14 @@
 
 from distutils.tests import support
 
+
+def _make_ext_name(modname):
+    if os.name == 'nt':
+        if sys.executable.endswith('_d.exe'):
+            modname += '_d'
+    return modname + sysconfig.get_config_var('SO')
+
+
 class InstallTestCase(support.TempdirManager,
                       support.EnvironGuard,
                       support.LoggingSilencer,
@@ -201,13 +209,13 @@ def test_record_extensions(self):
         os.chdir(project_dir)
         support.copy_xxmodule_c(project_dir)
 
-        buildcmd = build_ext(dist)
-        support.fixup_build_ext(buildcmd)
-        buildcmd.ensure_finalized()
-        buildcmd.run()
+        buildextcmd = build_ext(dist)
+        support.fixup_build_ext(buildextcmd)
+        buildextcmd.ensure_finalized()
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
+        dist.command_obj['build_ext'] = buildextcmd
         cmd.root = install_dir
         cmd.record = os.path.join(project_dir, 'RECORD')
         cmd.ensure_finalized()
@@ -220,7 +228,7 @@ def test_record_extensions(self):
             f.close()
 
         found = [os.path.basename(line) for line in content.splitlines()]
-        expected = ['xx%s' % sysconfig.get_config_var('SO'),
+        expected = [_make_ext_name('xx'),
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 

From aa066f5e3d725c0b3aff6f5c10488b054d4bc846 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 25 Aug 2011 18:32:02 +0200
Subject: [PATCH 3259/8469] Issue #12333: fix test_distutils failures under
 Solaris and derivatives

---
 tests/support.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index dc0e660e69..44fcd6b7d8 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -54,9 +54,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super().setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()

From 6198e2b4d7424a977b9461df869598fb5404c3c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 29 Aug 2011 21:48:39 +0200
Subject: [PATCH 3260/8469] Make bdist_* commands respect --skip-build passed
 to bdist (#10946)

---
 command/bdist_dumb.py    |  5 +++--
 command/bdist_msi.py     |  6 ++++-
 command/bdist_wininst.py |  6 ++++-
 tests/test_bdist.py      | 48 ++++++++++++++++++++++------------------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 170e889461..1ab09d1616 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -47,7 +47,7 @@ def initialize_options(self):
         self.format = None
         self.keep_temp = 0
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.relative = 0
 
     def finalize_options(self):
@@ -65,7 +65,8 @@ def finalize_options(self):
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
-                                   ('plat_name', 'plat_name'))
+                                   ('plat_name', 'plat_name'),
+                                   ('skip_build', 'skip_build'))
 
     def run(self):
         if not self.skip_build:
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index b11957a7dc..b3cfe9ceff 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -130,18 +130,22 @@ def initialize_options(self):
         self.no_target_optimize = 0
         self.target_version = None
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.versions = None
 
     def finalize_options(self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
+
         short_version = get_python_version()
         if (not self.target_version) and self.distribution.has_ext_modules():
             self.target_version = short_version
+
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b7916e31a1..e3ed3ad82c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -65,13 +65,15 @@ def initialize_options(self):
         self.dist_dir = None
         self.bitmap = None
         self.title = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.user_access_control = None
 
 
     def finalize_options(self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             if self.skip_build and self.plat_name:
                 # If build is skipped and plat_name is overridden, bdist will
@@ -81,8 +83,10 @@ def finalize_options(self):
                 # next the command will be initialized using that name
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
+
         if not self.target_version:
             self.target_version = ""
+
         if not self.skip_build and self.distribution.has_ext_modules():
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index 94d40cc25b..503a6e857d 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -1,41 +1,47 @@
 """Tests for distutils.command.bdist."""
-import unittest
-import sys
 import os
-import tempfile
-import shutil
+import unittest
 from test.support import run_unittest
 
-from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
-from distutils.spawn import find_executable
-from distutils import spawn
-from distutils.errors import DistutilsExecError
+
 
 class BuildTestCase(support.TempdirManager,
                     unittest.TestCase):
 
     def test_formats(self):
-
         # let's create a command and make sure
-        # we can fix the format
-        pkg_pth, dist = self.create_dist()
+        # we can set the format
+        dist = self.create_dist()[1]
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
         self.assertEqual(cmd.formats, ['msi'])
 
-        # what format bdist offers ?
-        # XXX an explicit list in bdist is
-        # not the best way to  bdist_* commands
-        # we should add a registry
-        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
-                   'tar', 'wininst', 'msi']
-        formats.sort()
-        founded = list(cmd.format_command.keys())
-        founded.sort()
-        self.assertEqual(founded, formats)
+        # what formats does bdist offer?
+        formats = ['bztar', 'gztar', 'msi', 'rpm', 'tar',
+                   'wininst', 'zip', 'ztar']
+        found = sorted(cmd.format_command)
+        self.assertEqual(found, formats)
+
+    def test_skip_build(self):
+        # bug #10946: bdist --skip-build should trickle down to subcommands
+        dist = self.create_dist()[1]
+        cmd = bdist(dist)
+        cmd.skip_build = 1
+        cmd.ensure_finalized()
+        dist.command_obj['bdist'] = cmd
+
+        names = ['bdist_dumb', 'bdist_wininst']  # bdist_rpm does not support --skip-build
+        if os.name == 'nt':
+            names.append('bdist_msi')
+
+        for name in names:
+            subcmd = cmd.get_finalized_command(name)
+            self.assertTrue(subcmd.skip_build,
+                            '%s should take --skip-build from bdist' % name)
+
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)

From 48f414cea0e31da0a1267b9248ac38363d006fd4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 3 Sep 2011 11:17:55 +0200
Subject: [PATCH 3261/8469] Bump to 3.2.2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b31b2d203d..9ec6165864 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.2rc1"
+__version__ = "3.2.2"
 #--end constants--

From 3b9a1c74f1e174853a335c8662a3f6c7b81e4bd3 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 25 Aug 2011 18:32:02 +0200
Subject: [PATCH 3262/8469] Issue #12333: fix test_distutils failures under
 Solaris and derivatives

---
 tests/support.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index 7a76ca05a0..8452feb155 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -54,9 +54,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super().setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()

From 55ab37cb7ef7e8527ba59c5e47a1bc99227df4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 00:03:22 +0200
Subject: [PATCH 3263/8469] Turn two ifs into one in the code I commited a few
 days ago

---
 tests/test_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/test_install.py b/tests/test_install.py
index 5c105af95a..dfc46b197b 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -20,9 +20,8 @@
 
 
 def _make_ext_name(modname):
-    if os.name == 'nt':
-        if sys.executable.endswith('_d.exe'):
-            modname += '_d'
+    if os.name == 'nt' and sys.executable.endswith('_d.exe'):
+        modname += '_d'
     return modname + sysconfig.get_config_var('SO')
 
 

From e4a8ae8b1b59394478295eb916023e9dc4369026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 01:56:15 +0200
Subject: [PATCH 3264/8469] Refactor helpers for compiling the xx module in
 distutils tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I need to copy the xxmodule.c file in other tests, so I moved the
support code to distutils.tests.support and improved it:
- don’t skip when run from the Lib/distutils/tests directory
- use proper skip machinery instead of custom print/return/test suite
  fiddling.

I also took out the fixup_build_ext function, which is needed for tests
to pass on Unix shared builds and Windows debug builds.

Finally, I cleaned up a few things:
- don’t remove directories in tearDown when the parent class’ tearDown
  has already registered the directories for removal
- simplify restoration of sys.path
- remove a few unused names found by pyflakes.
---
 tests/support.py        | 76 +++++++++++++++++++++++++++++++++++++++++
 tests/test_build_ext.py | 68 +++++-------------------------------
 2 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 783318e8d3..788acdaa3e 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -1,7 +1,10 @@
 """Support code for distutils test cases."""
 import os
+import sys
 import shutil
 import tempfile
+import unittest
+import sysconfig
 from copy import deepcopy
 import warnings
 
@@ -9,6 +12,7 @@
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+
 def capture_warnings(func):
     def _capture_warnings(*args, **kw):
         with warnings.catch_warnings():
@@ -16,6 +20,7 @@ def _capture_warnings(*args, **kw):
             return func(*args, **kw)
     return _capture_warnings
 
+
 class LoggingSilencer(object):
 
     def setUp(self):
@@ -49,6 +54,7 @@ def _format(msg, args):
     def clear_logs(self):
         self.logs = []
 
+
 class TempdirManager(object):
     """Mix-in class that handles temporary directories for test cases.
 
@@ -105,6 +111,7 @@ def create_dist(self, pkg_name='foo', **kw):
 
         return pkg_dir, dist
 
+
 class DummyCommand:
     """Class to store options for retrieval via set_undefined_options()."""
 
@@ -115,6 +122,7 @@ def __init__(self, **kwargs):
     def ensure_finalized(self):
         pass
 
+
 class EnvironGuard(object):
 
     def setUp(self):
@@ -131,3 +139,71 @@ def tearDown(self):
                 del os.environ[key]
 
         super(EnvironGuard, self).tearDown()
+
+
+def copy_xxmodule_c(directory):
+    """Helper for tests that need the xxmodule.c source file.
+
+    Example use:
+
+        def test_compile(self):
+            copy_xxmodule_c(self.tmpdir)
+            self.assertIn('xxmodule.c', os.listdir(self.tmpdir))
+
+    If the source file can be found, it will be copied to *directory*.  If not,
+    the test will be skipped.  Errors during copy are not caught.
+    """
+    filename = _get_xxmodule_path()
+    if filename is None:
+        raise unittest.SkipTest('cannot find xxmodule.c (test must run in '
+                                'the python build dir)')
+    shutil.copy(filename, directory)
+
+
+def _get_xxmodule_path():
+    srcdir = sysconfig.get_config_var('srcdir')
+    candidates = [
+        # use installed copy if available
+        os.path.join(os.path.dirname(__file__), 'xxmodule.c'),
+        # otherwise try using copy from build directory
+        os.path.join(srcdir, 'Modules', 'xxmodule.c'),
+        # srcdir mysteriously can be $srcdir/Lib/distutils/tests when
+        # this file is run from its parent directory, so walk up the
+        # tree to find the real srcdir
+        os.path.join(srcdir, '..', '..', '..', 'Modules', 'xxmodule.c'),
+    ]
+    for path in candidates:
+        if os.path.exists(path):
+            return path
+
+
+def fixup_build_ext(cmd):
+    """Function needed to make build_ext tests pass.
+
+    When Python was build with --enable-shared on Unix, -L. is not good
+    enough to find the libpython<blah>.so.  This is because regrtest runs
+    it under a tempdir, not in the top level where the .so lives.  By the
+    time we've gotten here, Python's already been chdir'd to the tempdir.
+
+    When Python was built with in debug mode on Windows, build_ext commands
+    need their debug attribute set, and it is not done automatically for
+    some reason.
+
+    This function handles both of these things.  Example use:
+
+        cmd = build_ext(dist)
+        support.fixup_build_ext(cmd)
+        cmd.ensure_finalized()
+    """
+    if os.name == 'nt':
+        cmd.debug = sys.executable.endswith('_d.exe')
+    elif sysconfig.get_config_var('Py_ENABLE_SHARED'):
+        # To further add to the shared builds fun on Unix, we can't just add
+        # library_dirs to the Extension() instance because that doesn't get
+        # plumbed through to the final compiler command.
+        runshared = sysconfig.get_config_var('RUNSHARED')
+        if runshared is None:
+            cmd.library_dirs = ['.']
+        else:
+            name, equals, value = runshared.partition('=')
+            cmd.library_dirs = value.split(os.pathsep)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index ced1329efd..30de0e2b7b 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -1,7 +1,5 @@
 import sys
 import os
-import tempfile
-import shutil
 from StringIO import StringIO
 import textwrap
 
@@ -19,76 +17,34 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-def _get_source_filename():
-    # use installed copy if available
-    tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
-    if os.path.exists(tests_f):
-        return tests_f
-    # otherwise try using copy from build directory
-    srcdir = sysconfig.get_config_var('srcdir')
-    if srcdir is None:
-        return os.path.join(sysconfig.project_base, 'Modules', 'xxmodule.c')
-    return os.path.join(srcdir, 'Modules', 'xxmodule.c')
-
-_XX_MODULE_PATH = _get_source_filename()
 
 class BuildExtTestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
     def setUp(self):
-        # Create a simple test environment
-        # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
-        self.tmp_dir = tempfile.mkdtemp(prefix="pythontest_")
-        if os.path.exists(_XX_MODULE_PATH):
-            self.sys_path = sys.path[:]
-            sys.path.append(self.tmp_dir)
-            shutil.copy(_XX_MODULE_PATH, self.tmp_dir)
+        self.tmp_dir = self.mkdtemp()
+        self.xx_created = False
+        sys.path.append(self.tmp_dir)
+        self.addCleanup(sys.path.remove, self.tmp_dir)
 
     def tearDown(self):
-        # Get everything back to normal
-        if os.path.exists(_XX_MODULE_PATH):
+        if self.xx_created:
             test_support.unload('xx')
-            sys.path[:] = self.sys_path
             # XXX on Windows the test leaves a directory
             # with xx module in TEMP
-        shutil.rmtree(self.tmp_dir, os.name == 'nt' or
-                                    sys.platform == 'cygwin')
         super(BuildExtTestCase, self).tearDown()
 
-    def _fixup_command(self, cmd):
-        # When Python was build with --enable-shared, -L. is not good enough
-        # to find the libpython<blah>.so.  This is because regrtest runs it
-        # under a tempdir, not in the top level where the .so lives.  By the
-        # time we've gotten here, Python's already been chdir'd to the
-        # tempdir.
-        #
-        # To further add to the fun, we can't just add library_dirs to the
-        # Extension() instance because that doesn't get plumbed through to the
-        # final compiler command.
-        if (sysconfig.get_config_var('Py_ENABLE_SHARED') and
-            not sys.platform.startswith('win')):
-            runshared = sysconfig.get_config_var('RUNSHARED')
-            if runshared is None:
-                cmd.library_dirs = ['.']
-            else:
-                name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
-
-    @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
-                     'xxmodule.c not found')
     def test_build_ext(self):
         global ALREADY_TESTED
+        support.copy_xxmodule_c(self.tmp_dir)
+        self.xx_created = True
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
-        if os.name == "nt":
-            # On Windows, we must build a debug version iff running
-            # a debug build of Python
-            cmd.debug = sys.executable.endswith("_d.exe")
+        support.fixup_build_ext(cmd)
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 
@@ -149,7 +105,6 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.finalize_options()
 
-        from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
         self.assertTrue(py_include in cmd.include_dirs)
 
@@ -277,13 +232,10 @@ def test_get_outputs(self):
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
         cmd = build_ext(dist)
-        self._fixup_command(cmd)
+        support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
 
-        if os.name == "nt":
-            cmd.debug = sys.executable.endswith("_d.exe")
-
         cmd.build_lib = os.path.join(self.tmp_dir, 'build')
         cmd.build_temp = os.path.join(self.tmp_dir, 'tempt')
 
@@ -509,10 +461,8 @@ def _try_compile_deployment_target(self, operator, target):
         cmd.build_temp = self.tmp_dir
 
         try:
-            old_stdout = sys.stdout
             cmd.ensure_finalized()
             cmd.run()
-
         except CompileError:
             self.fail("Wrong deployment target during compilation")
 

From 997e4e8ba78bcff625c3b4b4ef9e244c2cc7cc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 02:00:14 +0200
Subject: [PATCH 3265/8469] Add tests for build_ext --user (backport from 3.2)

---
 tests/test_build_ext.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 30de0e2b7b..2fa63d300b 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -27,6 +27,12 @@ def setUp(self):
         self.xx_created = False
         sys.path.append(self.tmp_dir)
         self.addCleanup(sys.path.remove, self.tmp_dir)
+        if sys.version > "2.6":
+            import site
+            self.old_user_base = site.USER_BASE
+            site.USER_BASE = self.mkdtemp()
+            from distutils.command import build_ext
+            build_ext.USER_BASE = site.USER_BASE
 
     def tearDown(self):
         if self.xx_created:
@@ -97,6 +103,36 @@ def test_solaris_enable_shared(self):
         # make sure we get some library dirs under solaris
         self.assertTrue(len(cmd.library_dirs) > 0)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        import site
+        dist = Distribution({'name': 'xx'})
+        cmd = build_ext(dist)
+
+        # making sure the user option is there
+        options = [name for name, short, label in
+                   cmd.user_options]
+        self.assertIn('user', options)
+
+        # setting a value
+        cmd.user = 1
+
+        # setting user based lib and include
+        lib = os.path.join(site.USER_BASE, 'lib')
+        incl = os.path.join(site.USER_BASE, 'include')
+        os.mkdir(lib)
+        os.mkdir(incl)
+
+        cmd.ensure_finalized()
+
+        # see if include_dirs and library_dirs were set
+        self.assertIn(lib, cmd.library_dirs)
+        self.assertIn(lib, cmd.rpath)
+        self.assertIn(incl, cmd.include_dirs)
+
     def test_finalize_options(self):
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.

From add9fe8cd89fd81c86867a7596b29d15d2a74294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 02:05:44 +0200
Subject: [PATCH 3266/8469] Try to fix test_distutils on Windows (#12678)

---
 tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 8da6fe4de8..4c80bc0bbe 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -422,6 +422,7 @@ def test_manifest_comments(self):
     def test_manual_manifest(self):
         # check that a MANIFEST without a marker is left alone
         dist, cmd = self.get_cmd()
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
         self.write_file((self.tmp_dir, 'README.manual'),

From c166f6b99d408b46e92b3acaca0972085f658b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 02:06:27 +0200
Subject: [PATCH 3267/8469] Backport tests for the distutils install command

---
 tests/test_install.py | 195 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 193 insertions(+), 2 deletions(-)

diff --git a/tests/test_install.py b/tests/test_install.py
index 4f976f34e6..ebfb04f446 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,17 +1,33 @@
 """Tests for distutils.command.install."""
 
 import os
+import sys
 import unittest
+import site
 
-from test.test_support import run_unittest
+from test.test_support import captured_stdout, run_unittest
 
+from distutils import sysconfig
 from distutils.command.install import install
+from distutils.command import install as install_module
+from distutils.command.build_ext import build_ext
+from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
+from distutils.errors import DistutilsOptionError
+from distutils.extension import Extension
 
 from distutils.tests import support
 
 
-class InstallTestCase(support.TempdirManager, unittest.TestCase):
+def _make_ext_name(modname):
+    if os.name == 'nt' and sys.executable.endswith('_d.exe'):
+        modname += '_d'
+    return modname + sysconfig.get_config_var('SO')
+
+
+class InstallTestCase(support.TempdirManager,
+                      support.LoggingSilencer,
+                      unittest.TestCase):
 
     def test_home_installation_scheme(self):
         # This ensure two things:
@@ -49,6 +65,181 @@ def check_path(got, expected):
         check_path(cmd.install_scripts, os.path.join(destination, "bin"))
         check_path(cmd.install_data, destination)
 
+    def test_user_site(self):
+        # site.USER_SITE was introduced in 2.6
+        if sys.version < '2.6':
+            return
+
+        # preparing the environment for the test
+        self.old_user_base = site.USER_BASE
+        self.old_user_site = site.USER_SITE
+        self.tmpdir = self.mkdtemp()
+        self.user_base = os.path.join(self.tmpdir, 'B')
+        self.user_site = os.path.join(self.tmpdir, 'S')
+        site.USER_BASE = self.user_base
+        site.USER_SITE = self.user_site
+        install_module.USER_BASE = self.user_base
+        install_module.USER_SITE = self.user_site
+
+        def _expanduser(path):
+            return self.tmpdir
+        self.old_expand = os.path.expanduser
+        os.path.expanduser = _expanduser
+
+        try:
+            # this is the actual test
+            self._test_user_site()
+        finally:
+            site.USER_BASE = self.old_user_base
+            site.USER_SITE = self.old_user_site
+            install_module.USER_BASE = self.old_user_base
+            install_module.USER_SITE = self.old_user_site
+            os.path.expanduser = self.old_expand
+
+    def _test_user_site(self):
+        for key in ('nt_user', 'unix_user', 'os2_home'):
+            self.assertTrue(key in INSTALL_SCHEMES)
+
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # making sure the user option is there
+        options = [name for name, short, lable in
+                   cmd.user_options]
+        self.assertTrue('user' in options)
+
+        # setting a value
+        cmd.user = 1
+
+        # user base and site shouldn't be created yet
+        self.assertTrue(not os.path.exists(self.user_base))
+        self.assertTrue(not os.path.exists(self.user_site))
+
+        # let's run finalize
+        cmd.ensure_finalized()
+
+        # now they should
+        self.assertTrue(os.path.exists(self.user_base))
+        self.assertTrue(os.path.exists(self.user_site))
+
+        self.assertTrue('userbase' in cmd.config_vars)
+        self.assertTrue('usersite' in cmd.config_vars)
+
+    def test_handle_extra_path(self):
+        dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
+        cmd = install(dist)
+
+        # two elements
+        cmd.handle_extra_path()
+        self.assertEqual(cmd.extra_path, ['path', 'dirs'])
+        self.assertEqual(cmd.extra_dirs, 'dirs')
+        self.assertEqual(cmd.path_file, 'path')
+
+        # one element
+        cmd.extra_path = ['path']
+        cmd.handle_extra_path()
+        self.assertEqual(cmd.extra_path, ['path'])
+        self.assertEqual(cmd.extra_dirs, 'path')
+        self.assertEqual(cmd.path_file, 'path')
+
+        # none
+        dist.extra_path = cmd.extra_path = None
+        cmd.handle_extra_path()
+        self.assertEqual(cmd.extra_path, None)
+        self.assertEqual(cmd.extra_dirs, '')
+        self.assertEqual(cmd.path_file, None)
+
+        # three elements (no way !)
+        cmd.extra_path = 'path,dirs,again'
+        self.assertRaises(DistutilsOptionError, cmd.handle_extra_path)
+
+    def test_finalize_options(self):
+        dist = Distribution({'name': 'xx'})
+        cmd = install(dist)
+
+        # must supply either prefix/exec-prefix/home or
+        # install-base/install-platbase -- not both
+        cmd.prefix = 'prefix'
+        cmd.install_base = 'base'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # must supply either home or prefix/exec-prefix -- not both
+        cmd.install_base = None
+        cmd.home = 'home'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+        # can't combine user with with prefix/exec_prefix/home or
+        # install_(plat)base
+        cmd.prefix = None
+        cmd.user = 'user'
+        self.assertRaises(DistutilsOptionError, cmd.finalize_options)
+
+    def test_record(self):
+        install_dir = self.mkdtemp()
+        project_dir, dist = self.create_dist(scripts=['hello'])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        self.write_file('hello', "print('o hai')")
+
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.record)
+        try:
+            content = f.read()
+        finally:
+            f.close()
+
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = ['hello',
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
+    def test_record_extensions(self):
+        install_dir = self.mkdtemp()
+        project_dir, dist = self.create_dist(ext_modules=[
+            Extension('xx', ['xxmodule.c'])])
+        self.addCleanup(os.chdir, os.getcwd())
+        os.chdir(project_dir)
+        support.copy_xxmodule_c(project_dir)
+
+        buildextcmd = build_ext(dist)
+        support.fixup_build_ext(buildextcmd)
+        buildextcmd.ensure_finalized()
+
+        cmd = install(dist)
+        dist.command_obj['install'] = cmd
+        dist.command_obj['build_ext'] = buildextcmd
+        cmd.root = install_dir
+        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.ensure_finalized()
+        cmd.run()
+
+        f = open(cmd.record)
+        try:
+            content = f.read()
+        finally:
+            f.close()
+
+        found = [os.path.basename(line) for line in content.splitlines()]
+        expected = [_make_ext_name('xx'),
+                    'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+        self.assertEqual(found, expected)
+
+    def test_debug_mode(self):
+        # this covers the code called when DEBUG is set
+        old_logs_len = len(self.logs)
+        install_module.DEBUG = True
+        try:
+            with captured_stdout():
+                self.test_record()
+        finally:
+            install_module.DEBUG = False
+        self.assertTrue(len(self.logs) > old_logs_len)
 
 def test_suite():
     return unittest.makeSuite(InstallTestCase)

From 20aa4645fe05e538fe7e1083bd87380b156d9fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 26 Aug 2011 16:35:19 +0200
Subject: [PATCH 3268/8469] Add FIXME note as a reminder

---
 tests/support.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index 788acdaa3e..648a8e4156 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -161,6 +161,8 @@ def test_compile(self):
 
 
 def _get_xxmodule_path():
+    # FIXME when run from regrtest, srcdir seems to be '.', which does not help
+    # us find the xxmodule.c file
     srcdir = sysconfig.get_config_var('srcdir')
     candidates = [
         # use installed copy if available

From 8cd4035750552f84c14fd0d799aa848c643aae77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 29 Aug 2011 21:48:39 +0200
Subject: [PATCH 3269/8469] Make bdist_* commands respect --skip-build passed
 to bdist (#10946)

---
 command/bdist_dumb.py    |  5 +++--
 command/bdist_msi.py     |  6 ++++-
 command/bdist_wininst.py |  6 ++++-
 tests/test_bdist.py      | 48 ++++++++++++++++++++++------------------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 170e889461..1ab09d1616 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -47,7 +47,7 @@ def initialize_options(self):
         self.format = None
         self.keep_temp = 0
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.relative = 0
 
     def finalize_options(self):
@@ -65,7 +65,8 @@ def finalize_options(self):
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
-                                   ('plat_name', 'plat_name'))
+                                   ('plat_name', 'plat_name'),
+                                   ('skip_build', 'skip_build'))
 
     def run(self):
         if not self.skip_build:
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index b11957a7dc..b3cfe9ceff 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -130,18 +130,22 @@ def initialize_options(self):
         self.no_target_optimize = 0
         self.target_version = None
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.versions = None
 
     def finalize_options(self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
+
         short_version = get_python_version()
         if (not self.target_version) and self.distribution.has_ext_modules():
             self.target_version = short_version
+
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b7916e31a1..e3ed3ad82c 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -65,13 +65,15 @@ def initialize_options(self):
         self.dist_dir = None
         self.bitmap = None
         self.title = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.user_access_control = None
 
 
     def finalize_options(self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             if self.skip_build and self.plat_name:
                 # If build is skipped and plat_name is overridden, bdist will
@@ -81,8 +83,10 @@ def finalize_options(self):
                 # next the command will be initialized using that name
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
+
         if not self.target_version:
             self.target_version = ""
+
         if not self.skip_build and self.distribution.has_ext_modules():
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index 94d40cc25b..503a6e857d 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -1,41 +1,47 @@
 """Tests for distutils.command.bdist."""
-import unittest
-import sys
 import os
-import tempfile
-import shutil
+import unittest
 from test.support import run_unittest
 
-from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
-from distutils.spawn import find_executable
-from distutils import spawn
-from distutils.errors import DistutilsExecError
+
 
 class BuildTestCase(support.TempdirManager,
                     unittest.TestCase):
 
     def test_formats(self):
-
         # let's create a command and make sure
-        # we can fix the format
-        pkg_pth, dist = self.create_dist()
+        # we can set the format
+        dist = self.create_dist()[1]
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
         self.assertEqual(cmd.formats, ['msi'])
 
-        # what format bdist offers ?
-        # XXX an explicit list in bdist is
-        # not the best way to  bdist_* commands
-        # we should add a registry
-        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
-                   'tar', 'wininst', 'msi']
-        formats.sort()
-        founded = list(cmd.format_command.keys())
-        founded.sort()
-        self.assertEqual(founded, formats)
+        # what formats does bdist offer?
+        formats = ['bztar', 'gztar', 'msi', 'rpm', 'tar',
+                   'wininst', 'zip', 'ztar']
+        found = sorted(cmd.format_command)
+        self.assertEqual(found, formats)
+
+    def test_skip_build(self):
+        # bug #10946: bdist --skip-build should trickle down to subcommands
+        dist = self.create_dist()[1]
+        cmd = bdist(dist)
+        cmd.skip_build = 1
+        cmd.ensure_finalized()
+        dist.command_obj['bdist'] = cmd
+
+        names = ['bdist_dumb', 'bdist_wininst']  # bdist_rpm does not support --skip-build
+        if os.name == 'nt':
+            names.append('bdist_msi')
+
+        for name in names:
+            subcmd = cmd.get_finalized_command(name)
+            self.assertTrue(subcmd.skip_build,
+                            '%s should take --skip-build from bdist' % name)
+
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)

From 152743f52b84cd0b37f8f5ec8e10803181c41181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 30 Aug 2011 01:48:59 +0200
Subject: [PATCH 3270/8469] Make bdist_* commands respect --skip-build passed
 to bdist (#10946)

---
 command/bdist_dumb.py    |  5 ++--
 command/bdist_msi.py     |  6 ++++-
 command/bdist_wininst.py |  6 ++++-
 tests/test_bdist.py      | 49 +++++++++++++++++++++++-----------------
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 7c60d39be9..2f3c66829a 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -58,7 +58,7 @@ def initialize_options (self):
         self.format = None
         self.keep_temp = 0
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.relative = 0
         self.owner = None
         self.group = None
@@ -78,7 +78,8 @@ def finalize_options(self):
 
         self.set_undefined_options('bdist',
                                    ('dist_dir', 'dist_dir'),
-                                   ('plat_name', 'plat_name'))
+                                   ('plat_name', 'plat_name'),
+                                   ('skip_build', 'skip_build'))
 
     def run(self):
         if not self.skip_build:
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index ded837d752..703f873b16 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -131,18 +131,22 @@ def initialize_options (self):
         self.no_target_optimize = 0
         self.target_version = None
         self.dist_dir = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.versions = None
 
     def finalize_options (self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'msi')
+
         short_version = get_python_version()
         if (not self.target_version) and self.distribution.has_ext_modules():
             self.target_version = short_version
+
         if self.target_version:
             self.versions = [self.target_version]
             if not self.skip_build and self.distribution.has_ext_modules()\
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 36d46bd627..aa9383af98 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -71,7 +71,7 @@ def initialize_options (self):
         self.dist_dir = None
         self.bitmap = None
         self.title = None
-        self.skip_build = 0
+        self.skip_build = None
         self.install_script = None
         self.pre_install_script = None
         self.user_access_control = None
@@ -80,6 +80,8 @@ def initialize_options (self):
 
 
     def finalize_options (self):
+        self.set_undefined_options('bdist', ('skip_build', 'skip_build'))
+
         if self.bdist_dir is None:
             if self.skip_build and self.plat_name:
                 # If build is skipped and plat_name is overridden, bdist will
@@ -89,8 +91,10 @@ def finalize_options (self):
                 # next the command will be initialized using that name
             bdist_base = self.get_finalized_command('bdist').bdist_base
             self.bdist_dir = os.path.join(bdist_base, 'wininst')
+
         if not self.target_version:
             self.target_version = ""
+
         if not self.skip_build and self.distribution.has_ext_modules():
             short_version = get_python_version()
             if self.target_version and self.target_version != short_version:
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index fa7cd5adb5..121d0992db 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -1,42 +1,49 @@
 """Tests for distutils.command.bdist."""
-import unittest
-import sys
 import os
-import tempfile
-import shutil
+import unittest
 
 from test.test_support import run_unittest
 
-from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
-from distutils.spawn import find_executable
-from distutils import spawn
-from distutils.errors import DistutilsExecError
+
 
 class BuildTestCase(support.TempdirManager,
                     unittest.TestCase):
 
     def test_formats(self):
-
         # let's create a command and make sure
-        # we can fix the format
-        pkg_pth, dist = self.create_dist()
+        # we can set the format
+        dist = self.create_dist()[1]
         cmd = bdist(dist)
         cmd.formats = ['msi']
         cmd.ensure_finalized()
         self.assertEqual(cmd.formats, ['msi'])
 
-        # what format bdist offers ?
-        # XXX an explicit list in bdist is
-        # not the best way to  bdist_* commands
-        # we should add a registry
-        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
-                   'tar', 'wininst', 'msi']
-        formats.sort()
-        founded = cmd.format_command.keys()
-        founded.sort()
-        self.assertEqual(founded, formats)
+        # what formats does bdist offer?
+        formats = ['bztar', 'gztar', 'msi', 'rpm', 'tar',
+                   'wininst', 'zip', 'ztar']
+        found = sorted(cmd.format_command)
+        self.assertEqual(found, formats)
+
+    def test_skip_build(self):
+        # bug #10946: bdist --skip-build should trickle down to subcommands
+        dist = self.create_dist()[1]
+        cmd = bdist(dist)
+        cmd.skip_build = 1
+        cmd.ensure_finalized()
+        dist.command_obj['bdist'] = cmd
+
+        names = ['bdist_dumb', 'bdist_wininst']
+        # bdist_rpm does not support --skip-build
+        if os.name == 'nt':
+            names.append('bdist_msi')
+
+        for name in names:
+            subcmd = cmd.get_finalized_command(name)
+            self.assertTrue(subcmd.skip_build,
+                            '%s should take --skip-build from bdist' % name)
+
 
 def test_suite():
     return unittest.makeSuite(BuildTestCase)

From b568b2ffb5d4e5c767452fce2353adec70d93a00 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Tue, 30 Aug 2011 12:34:37 -0400
Subject: [PATCH 3271/8469] First stab at a fix. The hack that allows it to
 work is that it allows the easy_install command to take a '-' argument which
 simply means 'don't run', so that arguments can be passed to the easy_install
 command from the comannd line without running it.

--HG--
branch : distribute
extra : rebase_source : 6eff3586cbcf36e846b3419218979d03079d1bcf
---
 setuptools/command/easy_install.py | 22 +++++++++++++++++++++-
 setuptools/dist.py                 |  3 ++-
 setuptools/package_index.py        |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 853753c19b..3f1b42284d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -267,7 +267,8 @@ def finalize_options(self):
                     )
                 else:
                     self.all_site_dirs.append(normalize_path(d))
-        if not self.editable: self.check_site_dir()
+        if not self.editable and self.args != ['-']:
+            self.check_site_dir()
         self.index_url = self.index_url or "http://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
@@ -338,6 +339,11 @@ def expand_dirs(self):
                             'install_scripts', 'install_data',])
 
     def run(self):
+        if self.args == ['-']:
+            # A single dash as an argument means 'do nothing' and is just a way
+            # to pass arguments to the easy_install command without running it
+            return
+
         if self.verbose != self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
@@ -1079,6 +1085,20 @@ def build_and_install(self, setup_script, setup_base):
         )
         try:
             args.append(dist_dir)
+            ei_opts = self.distribution.get_option_dict('easy_install').copy()
+            keep = (
+                'find_links', 'site_dirs', 'index_url', 'optimize',
+                'site_dirs', 'allow_hosts'
+            )
+            for key in ei_opts.keys():
+                if key not in keep:
+                    del ei_opts[key]
+            if ei_opts:
+                args.append('easy_install')
+                for key, val in ei_opts.iteritems():
+                    args.append('--%s=%s' % (key.replace('_', '-'), val[1]))
+                args.append('-')
+
             self.run_setup(setup_script, setup_base, args)
             all_eggs = Environment([dist_dir])
             eggs = []
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0ad18122cf..204dcdfa6b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -269,8 +269,9 @@ def fetch_build_egg(self, req):
             cmd.package_index.to_scan = []
         except AttributeError:
             from setuptools.command.easy_install import easy_install
-            dist = self.__class__({'script_args':['easy_install']})
+            dist = self.__class__()
             dist.parse_config_files()
+            dist.parse_command_line()
             opts = dist.get_option_dict('easy_install')
             keep = (
                 'find_links', 'site_dirs', 'index_url', 'optimize',
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index bb0ae12996..1dccabcb38 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -842,4 +842,4 @@ def local_open(url):
 
 
 
-# this line is a kludge to keep the trailing blank lines for pje's editor
\ No newline at end of file
+# this line is a kludge to keep the trailing blank lines for pje's editor

From 0d6b0fdd59f5fb29c06ed335fc7597951c5f277f Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Tue, 30 Aug 2011 13:03:25 -0400
Subject: [PATCH 3272/8469] Fix unintended addition of newline

--HG--
branch : distribute
extra : rebase_source : 9ba9d12380a73ae3a0908a0015b887dbe26bd7ae
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1dccabcb38..bb0ae12996 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -842,4 +842,4 @@ def local_open(url):
 
 
 
-# this line is a kludge to keep the trailing blank lines for pje's editor
+# this line is a kludge to keep the trailing blank lines for pje's editor
\ No newline at end of file

From 3c115835bc766964c0fb33fb0636538030c03135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 1 Sep 2011 23:37:56 +0200
Subject: [PATCH 3273/8469] Fix typo (was build) and remove redundancy in
 docstring

---
 tests/support.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 44fcd6b7d8..d77bbee362 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -175,10 +175,9 @@ def _get_xxmodule_path():
 def fixup_build_ext(cmd):
     """Function needed to make build_ext tests pass.
 
-    When Python was build with --enable-shared on Unix, -L. is not good
-    enough to find the libpython<blah>.so.  This is because regrtest runs
-    it under a tempdir, not in the top level where the .so lives.  By the
-    time we've gotten here, Python's already been chdir'd to the tempdir.
+    When Python was built with --enable-shared on Unix, -L. is not enough to
+    find libpython<blah>.so, because regrtest runs in a tempdir, not in the
+    source directory where the .so lives.
 
     When Python was built with in debug mode on Windows, build_ext commands
     need their debug attribute set, and it is not done automatically for

From f2643f2baea9c954e666420396b85ee94658dc86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 3 Sep 2011 00:28:43 +0200
Subject: [PATCH 3274/8469] Enable catching WARN-level logging messages in
 distutils' test_sdist

---
 tests/test_sdist.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f34f786c92..f9e28c8471 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -78,9 +78,6 @@ def get_cmd(self, metadata=None):
         dist.include_package_data = True
         cmd = sdist(dist)
         cmd.dist_dir = 'dist'
-        def _warn(*args):
-            pass
-        cmd.warn = _warn
         return dist, cmd
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
@@ -235,7 +232,8 @@ def test_metadata_check_option(self):
         # with the `check` subcommand
         cmd.ensure_finalized()
         cmd.run()
-        warnings = self.get_logs(WARN)
+        warnings = [msg for msg in self.get_logs(WARN) if
+                    msg.startswith('warning: check:')]
         self.assertEqual(len(warnings), 2)
 
         # trying with a complete set of metadata
@@ -244,7 +242,8 @@ def test_metadata_check_option(self):
         cmd.ensure_finalized()
         cmd.metadata_check = 0
         cmd.run()
-        warnings = self.get_logs(WARN)
+        warnings = [msg for msg in self.get_logs(WARN) if
+                    msg.startswith('warning: check:')]
         self.assertEqual(len(warnings), 0)
 
     def test_check_metadata_deprecated(self):

From 2b01850d8817f36295cde7daf2ac670582514e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 3 Sep 2011 00:28:43 +0200
Subject: [PATCH 3275/8469] Enable catching WARN-level logging messages in
 distutils' test_sdist

---
 tests/test_sdist.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 2f09c9bea1..5134e6aba2 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -85,9 +85,6 @@ def get_cmd(self, metadata=None):
         dist.include_package_data = True
         cmd = sdist(dist)
         cmd.dist_dir = 'dist'
-        def _warn(*args):
-            pass
-        cmd.warn = _warn
         return dist, cmd
 
     @unittest.skipUnless(zlib, "requires zlib")
@@ -242,7 +239,8 @@ def test_metadata_check_option(self):
         # with the `check` subcommand
         cmd.ensure_finalized()
         cmd.run()
-        warnings = self.get_logs(WARN)
+        warnings = [msg for msg in self.get_logs(WARN) if
+                    msg.startswith('warning: check:')]
         self.assertEqual(len(warnings), 2)
 
         # trying with a complete set of metadata
@@ -251,7 +249,8 @@ def test_metadata_check_option(self):
         cmd.ensure_finalized()
         cmd.metadata_check = 0
         cmd.run()
-        warnings = self.get_logs(WARN)
+        warnings = [msg for msg in self.get_logs(WARN) if
+                    msg.startswith('warning: check:')]
         self.assertEqual(len(warnings), 0)
 
     def test_check_metadata_deprecated(self):

From e5113fc0545f3bb694c82341216ced067dac3dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 3 Sep 2011 00:42:04 +0200
Subject: [PATCH 3276/8469] Warn instead of crashing because of invalid path in
 MANIFEST.in (#8286).

sdist used to crash with a full traceback dump instead of printing a
nice warning with the faulty line number.
---
 command/sdist.py    |  5 ++++-
 tests/test_sdist.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 21ea61d96a..a9429a4296 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -306,7 +306,10 @@ def read_template(self):
 
                 try:
                     self.filelist.process_template_line(line)
-                except DistutilsTemplateError as msg:
+                # the call above can raise a DistutilsTemplateError for
+                # malformed lines, or a ValueError from the lower-level
+                # convert_path function
+                except (DistutilsTemplateError, ValueError) as msg:
                     self.warn("%s, line %d: %s" % (template.filename,
                                                    template.current_line,
                                                    msg))
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index f9e28c8471..529b4ef5c6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -15,6 +15,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.log import WARN
+from distutils.filelist import FileList
 from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
@@ -265,7 +266,6 @@ def test_show_formats(self):
         self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
-
         dist, cmd = self.get_cmd()
         cmd.finalize_options()
 
@@ -285,6 +285,32 @@ def test_finalize_options(self):
         cmd.formats = 'supazipa'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
+    # the following tests make sure there is a nice error message instead
+    # of a traceback when parsing an invalid manifest template
+
+    def _test_template(self, content):
+        dist, cmd = self.get_cmd()
+        os.chdir(self.tmp_dir)
+        self.write_file('MANIFEST.in', content)
+        cmd.ensure_finalized()
+        cmd.filelist = FileList()
+        cmd.read_template()
+        warnings = self.get_logs(WARN)
+        self.assertEqual(len(warnings), 1)
+
+    def test_invalid_template_unknown_command(self):
+        self._test_template('taunt knights *')
+
+    def test_invalid_template_wrong_arguments(self):
+        # this manifest command takes one argument
+        self._test_template('prune')
+
+    @unittest.skipIf(os.name != 'nt', 'test relevant for Windows only')
+    def test_invalid_template_wrong_path(self):
+        # on Windows, trailing slashes are not allowed
+        # this used to crash instead of raising a warning: #8286
+        self._test_template('include examples/')
+
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated

From e5ed1dfa7ad8b538fdb67ef59174ab17f0ee677d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 3 Sep 2011 00:47:07 +0200
Subject: [PATCH 3277/8469] Warn instead of crashing because of invalid path in
 MANIFEST.in (#8286).

sdist used to crash with a full traceback dump instead of printing a
nice warning with the faulty line number.
---
 command/sdist.py    |  5 ++++-
 tests/test_sdist.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 75950f3d18..d30de10673 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -320,7 +320,10 @@ def read_template(self):
 
                 try:
                     self.filelist.process_template_line(line)
-                except DistutilsTemplateError, msg:
+                # the call above can raise a DistutilsTemplateError for
+                # malformed lines, or a ValueError from the lower-level
+                # convert_path function
+                except (DistutilsTemplateError, ValueError) as msg:
                     self.warn("%s, line %d: %s" % (template.filename,
                                                    template.current_line,
                                                    msg))
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 5134e6aba2..33f6ee69a9 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -29,6 +29,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.log import WARN
+from distutils.filelist import FileList
 from distutils.archive_util import ARCHIVE_FORMATS
 
 SETUP_PY = """
@@ -272,7 +273,6 @@ def test_show_formats(self):
         self.assertEqual(len(output), num_formats)
 
     def test_finalize_options(self):
-
         dist, cmd = self.get_cmd()
         cmd.finalize_options()
 
@@ -342,6 +342,32 @@ def test_make_distribution_owner_group(self):
         finally:
             archive.close()
 
+    # the following tests make sure there is a nice error message instead
+    # of a traceback when parsing an invalid manifest template
+
+    def _test_template(self, content):
+        dist, cmd = self.get_cmd()
+        os.chdir(self.tmp_dir)
+        self.write_file('MANIFEST.in', content)
+        cmd.ensure_finalized()
+        cmd.filelist = FileList()
+        cmd.read_template()
+        warnings = self.get_logs(WARN)
+        self.assertEqual(len(warnings), 1)
+
+    def test_invalid_template_unknown_command(self):
+        self._test_template('taunt knights *')
+
+    def test_invalid_template_wrong_arguments(self):
+        # this manifest command takes one argument
+        self._test_template('prune')
+
+    @unittest.skipIf(os.name != 'nt', 'test relevant for Windows only')
+    def test_invalid_template_wrong_path(self):
+        # on Windows, trailing slashes are not allowed
+        # this used to crash instead of raising a warning: #8286
+        self._test_template('include examples/')
+
     @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):
         # make sure MANIFEST is recalculated

From e95a6f1db95dfd2ebb63de9af3211718bb47346a Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 5 Sep 2011 23:44:56 +0200
Subject: [PATCH 3278/8469] Issue #9561: distutils now reads and writes
 egg-info files using UTF-8

instead of the locale encoding.
---
 command/install_egg_info.py | 5 ++---
 dist.py                     | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index c8880310df..c2a7d649c0 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -40,9 +40,8 @@ def run(self):
                          "Creating "+self.install_dir)
         log.info("Writing %s", target)
         if not self.dry_run:
-            f = open(target, 'w')
-            self.distribution.metadata.write_pkg_file(f)
-            f.close()
+            with open(target, 'w', encoding='UTF-8') as f:
+                self.distribution.metadata.write_pkg_file(f)
 
     def get_outputs(self):
         return self.outputs
diff --git a/dist.py b/dist.py
index 02cd79ba2f..8ca5b6f4f1 100644
--- a/dist.py
+++ b/dist.py
@@ -1010,11 +1010,9 @@ def __init__ (self):
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
-        try:
+        with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
+                  encoding='UTF-8') as pkg_info:
             self.write_pkg_file(pkg_info)
-        finally:
-            pkg_info.close()
 
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.

From beedb510e63fa7cf09ef572c178a0e6a161335fa Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Fri, 9 Sep 2011 18:50:59 +0200
Subject: [PATCH 3279/8469] Issue #12333: fix test_distutils failures under
 Solaris and derivatives. Patch by Antoine Pitrou

---
 tests/support.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/support.py b/tests/support.py
index 648a8e4156..a2190c0214 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -63,9 +63,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super(TempdirManager, self).setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super(TempdirManager, self).tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()

From 274ec9cd20e5bdf61fbb0b5c468b547607cf50f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 10 Sep 2011 01:34:44 +0200
Subject: [PATCH 3280/8469] Slight cleanup in distutils test_dist.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I have tests to add in this file and it’s always nice to start from a
clean base.
---
 tests/test_dist.py | 98 ++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index a20d6c8ffc..7050cbed26 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -74,7 +74,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        self.assertTrue(isinstance(cmd, test_dist))
+        self.assertIsInstance(cmd, test_dist)
         self.assertEqual(cmd.sample_option, "sometext")
 
     def test_command_packages_configfile(self):
@@ -106,28 +106,23 @@ def test_command_packages_configfile(self):
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
         # list of attributes
-        klass = Distribution
 
         # catching warnings
         warns = []
+
         def _warn(msg):
             warns.append(msg)
 
-        old_warn = warnings.warn
+        self.addCleanup(setattr, warnings, 'warn', warnings.warn)
         warnings.warn = _warn
-        try:
-            dist = klass(attrs={'author': 'xxx',
-                                'name': 'xxx',
-                                'version': 'xxx',
-                                'url': 'xxxx',
-                                'options': {}})
-        finally:
-            warnings.warn = old_warn
+        dist = Distribution(attrs={'author': 'xxx', 'name': 'xxx',
+                                   'version': 'xxx', 'url': 'xxxx',
+                                   'options': {}})
 
         self.assertEqual(len(warns), 0)
+        self.assertNotIn('options', dir(dist))
 
     def test_finalize_options(self):
-
         attrs = {'keywords': 'one,two',
                  'platforms': 'one,two'}
 
@@ -150,7 +145,6 @@ def test_get_command_packages(self):
         cmds = dist.get_command_packages()
         self.assertEqual(cmds, ['distutils.command', 'one', 'two'])
 
-
     def test_announce(self):
         # make sure the level is known
         dist = Distribution()
@@ -158,6 +152,7 @@ def test_announce(self):
         kwargs = {'level': 'ok2'}
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 
@@ -170,15 +165,20 @@ def tearDown(self):
         sys.argv[:] = self.argv[1]
         super(MetadataTestCase, self).tearDown()
 
+    def format_metadata(self, dist):
+        sio = io.StringIO()
+        dist.metadata.write_pkg_file(sio)
+        return sio.getvalue()
+
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
         dist = Distribution(attrs)
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.0" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.0", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertNotIn("requires:", meta.lower())
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_provides(self):
         attrs = {"name": "package",
@@ -190,9 +190,9 @@ def test_provides(self):
         self.assertEqual(dist.get_provides(),
                          ["package", "package.sub"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("requires:", meta.lower())
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_provides_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -210,11 +210,11 @@ def test_requires(self):
         self.assertEqual(dist.get_requires(),
                          ["other", "another (==1.0)"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("Requires: other" in meta)
-        self.assertTrue("Requires: another (==1.0)" in meta)
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertIn("Requires: other", meta)
+        self.assertIn("Requires: another (==1.0)", meta)
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_requires_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -232,11 +232,11 @@ def test_obsoletes(self):
         self.assertEqual(dist.get_obsoletes(),
                          ["other", "another (<1.0)"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("Obsoletes: other" in meta)
-        self.assertTrue("Obsoletes: another (<1.0)" in meta)
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertNotIn("requires:", meta.lower())
+        self.assertIn("Obsoletes: other", meta)
+        self.assertIn("Obsoletes: another (<1.0)", meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -244,10 +244,20 @@ def test_obsoletes_illegal(self):
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
 
-    def format_metadata(self, dist):
-        sio = io.StringIO()
-        dist.metadata.write_pkg_file(sio)
-        return sio.getvalue()
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertIn(long_desc, meta)
 
     def test_custom_pydistutils(self):
         # fixes #2166
@@ -272,14 +282,14 @@ def test_custom_pydistutils(self):
             if sys.platform in ('linux', 'darwin'):
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assertTrue(user_filename in files)
+                self.assertIn(user_filename, files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assertTrue(user_filename in files,
+                self.assertIn(user_filename, files,
                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
@@ -301,22 +311,8 @@ def test_show_help(self):
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
-        self.assertTrue(len(output) > 0)
-
-    def test_long_description(self):
-        long_desc = textwrap.dedent("""\
-        example::
-              We start here
-            and continue here
-          and end here.""")
-        attrs = {"name": "package",
-                 "version": "1.0",
-                 "long_description": long_desc}
+        self.assertTrue(output)
 
-        dist = Distribution(attrs)
-        meta = self.format_metadata(dist)
-        meta = meta.replace('\n' + 8 * ' ', '\n')
-        self.assertTrue(long_desc in meta)
 
 def test_suite():
     suite = unittest.TestSuite()

From 9da8782eff11b5aa19156596f5cfec1d776c776f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 10 Sep 2011 01:51:40 +0200
Subject: [PATCH 3281/8469] =?UTF-8?q?Fix=20determination=20of=20Metadata?=
 =?UTF-8?q?=20version=20(#8933).=20=20Patch=20by=20Filip=20Gruszczy=C5=84s?=
 =?UTF-8?q?ki.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist.py            |  3 ++-
 tests/test_dist.py | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 8ca5b6f4f1..69825f206f 100644
--- a/dist.py
+++ b/dist.py
@@ -1018,7 +1018,8 @@ def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
         version = '1.0'
-        if self.provides or self.requires or self.obsoletes:
+        if (self.provides or self.requires or self.obsoletes or
+            self.classifiers or self.download_url):
             version = '1.1'
 
         file.write('Metadata-Version: %s\n' % version)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 7050cbed26..8aaae88cae 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -244,6 +244,20 @@ def test_obsoletes_illegal(self):
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
 
+    def test_classifier(self):
+        attrs = {'name': 'Boa', 'version': '3.0',
+                 'classifiers': ['Programming Language :: Python :: 3']}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertIn('Metadata-Version: 1.1', meta)
+
+    def test_download_url(self):
+        attrs = {'name': 'Boa', 'version': '3.0',
+                 'download_url': 'http://example.org/boa'}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertIn('Metadata-Version: 1.1', meta)
+
     def test_long_description(self):
         long_desc = textwrap.dedent("""\
         example::

From 4af2ac319602a3e46acfb4c97cc34d374433dd53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 10 Sep 2011 05:37:33 +0200
Subject: [PATCH 3282/8469] Slight cleanup in distutils test_dist.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I have tests to add in this file and it’s always nice to start from a
clean base.  I’ve also changed a test that used to write an invalid
config file ('[global]command_packages = etc.' on one line), but the
test passes before and after this change, so either it magically works
or the test is poorly written.  Sigh.
---
 tests/test_dist.py | 103 +++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index ba60638179..ff9fa8fc58 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,12 +8,13 @@
 import warnings
 import textwrap
 
-from distutils.dist import Distribution, fix_help_options, DistributionMetadata
+from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 import distutils.dist
 from test.test_support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
 
+
 class test_dist(Command):
     """Sample distutils extension command."""
 
@@ -61,7 +62,7 @@ def create_distribution(self, configfiles=()):
 
     def test_debug_mode(self):
         with open(TESTFN, "w") as f:
-            f.write("[global]")
+            f.write("[global]\n")
             f.write("command_packages = foo.bar, splat")
 
         files = [TESTFN]
@@ -97,7 +98,7 @@ def test_command_packages_cmdline(self):
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "distutils.tests"])
         cmd = d.get_command_obj("test_dist")
-        self.assertTrue(isinstance(cmd, test_dist))
+        self.assertIsInstance(cmd, test_dist)
         self.assertEqual(cmd.sample_option, "sometext")
 
     def test_command_packages_configfile(self):
@@ -105,8 +106,8 @@ def test_command_packages_configfile(self):
         self.addCleanup(os.unlink, TESTFN)
         f = open(TESTFN, "w")
         try:
-            print >>f, "[global]"
-            print >>f, "command_packages = foo.bar, splat"
+            print >> f, "[global]"
+            print >> f, "command_packages = foo.bar, splat"
         finally:
             f.close()
 
@@ -138,7 +139,6 @@ def test_write_pkg_file(self):
                             'description': u'Café torréfié',
                             'long_description': u'Héhéhé'})
 
-
         # let's make sure the file can be written
         # with Unicode fields. they are encoded with
         # PKG_INFO_ENCODING
@@ -152,33 +152,28 @@ def test_write_pkg_file(self):
                             'long_description': 'Hehehe'})
 
         my_file2 = os.path.join(tmp_dir, 'f2')
-        dist.metadata.write_pkg_file(open(my_file, 'w'))
+        dist.metadata.write_pkg_file(open(my_file2, 'w'))
 
     def test_empty_options(self):
         # an empty options dictionary should not stay in the
         # list of attributes
-        klass = Distribution
 
         # catching warnings
         warns = []
+
         def _warn(msg):
             warns.append(msg)
 
-        old_warn = warnings.warn
+        self.addCleanup(setattr, warnings, 'warn', warnings.warn)
         warnings.warn = _warn
-        try:
-            dist = klass(attrs={'author': 'xxx',
-                                'name': 'xxx',
-                                'version': 'xxx',
-                                'url': 'xxxx',
-                                'options': {}})
-        finally:
-            warnings.warn = old_warn
+        dist = Distribution(attrs={'author': 'xxx', 'name': 'xxx',
+                                   'version': 'xxx', 'url': 'xxxx',
+                                   'options': {}})
 
         self.assertEqual(len(warns), 0)
+        self.assertNotIn('options', dir(dist))
 
     def test_finalize_options(self):
-
         attrs = {'keywords': 'one,two',
                  'platforms': 'one,two'}
 
@@ -201,7 +196,6 @@ def test_get_command_packages(self):
         cmds = dist.get_command_packages()
         self.assertEqual(cmds, ['distutils.command', 'one', 'two'])
 
-
     def test_announce(self):
         # make sure the level is known
         dist = Distribution()
@@ -251,15 +245,30 @@ def tearDown(self):
         sys.argv[:] = self.argv[1]
         super(MetadataTestCase, self).tearDown()
 
+    def test_long_description(self):
+        long_desc = textwrap.dedent("""\
+        example::
+              We start here
+            and continue here
+          and end here.""")
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": long_desc}
+
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        meta = meta.replace('\n' + 8 * ' ', '\n')
+        self.assertIn(long_desc, meta)
+
     def test_simple_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0"}
         dist = Distribution(attrs)
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.0" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.0", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertNotIn("requires:", meta.lower())
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_provides(self):
         attrs = {"name": "package",
@@ -271,9 +280,9 @@ def test_provides(self):
         self.assertEqual(dist.get_provides(),
                          ["package", "package.sub"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("requires:", meta.lower())
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_provides_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -291,11 +300,11 @@ def test_requires(self):
         self.assertEqual(dist.get_requires(),
                          ["other", "another (==1.0)"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("Requires: other" in meta)
-        self.assertTrue("Requires: another (==1.0)" in meta)
-        self.assertTrue("obsoletes:" not in meta.lower())
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertIn("Requires: other", meta)
+        self.assertIn("Requires: another (==1.0)", meta)
+        self.assertNotIn("obsoletes:", meta.lower())
 
     def test_requires_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -313,11 +322,11 @@ def test_obsoletes(self):
         self.assertEqual(dist.get_obsoletes(),
                          ["other", "another (<1.0)"])
         meta = self.format_metadata(dist)
-        self.assertTrue("Metadata-Version: 1.1" in meta)
-        self.assertTrue("provides:" not in meta.lower())
-        self.assertTrue("requires:" not in meta.lower())
-        self.assertTrue("Obsoletes: other" in meta)
-        self.assertTrue("Obsoletes: another (<1.0)" in meta)
+        self.assertIn("Metadata-Version: 1.1", meta)
+        self.assertNotIn("provides:", meta.lower())
+        self.assertNotIn("requires:", meta.lower())
+        self.assertIn("Obsoletes: other", meta)
+        self.assertIn("Obsoletes: another (<1.0)", meta)
 
     def test_obsoletes_illegal(self):
         self.assertRaises(ValueError, Distribution,
@@ -353,14 +362,14 @@ def test_custom_pydistutils(self):
             if sys.platform in ('linux', 'darwin'):
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assertTrue(user_filename in files)
+                self.assertIn(user_filename, files)
 
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
-                self.assertTrue(user_filename in files,
+                self.assertIn(user_filename, files,
                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
@@ -382,22 +391,7 @@ def test_show_help(self):
 
         output = [line for line in s.getvalue().split('\n')
                   if line.strip() != '']
-        self.assertTrue(len(output) > 0)
-
-    def test_long_description(self):
-        long_desc = textwrap.dedent("""\
-        example::
-              We start here
-            and continue here
-          and end here.""")
-        attrs = {"name": "package",
-                 "version": "1.0",
-                 "long_description": long_desc}
-
-        dist = distutils.dist.Distribution(attrs)
-        meta = self.format_metadata(dist)
-        meta = meta.replace('\n' + 8 * ' ', '\n')
-        self.assertTrue(long_desc in meta)
+        self.assertTrue(output)
 
     def test_read_metadata(self):
         attrs = {"name": "package",
@@ -426,6 +420,7 @@ def test_read_metadata(self):
         self.assertEqual(metadata.obsoletes, None)
         self.assertEqual(metadata.requires, ['foo'])
 
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From d6c0aeb23999b2de522fcd76ad067de8acf34d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 10 Sep 2011 05:39:45 +0200
Subject: [PATCH 3283/8469] =?UTF-8?q?Fix=20determination=20of=20Metadata?=
 =?UTF-8?q?=20version=20(#8933).=20=20Patch=20by=20Filip=20Gruszczy=C5=84s?=
 =?UTF-8?q?ki.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist.py            |  3 ++-
 tests/test_dist.py | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 597909ea1a..e025313dbd 100644
--- a/dist.py
+++ b/dist.py
@@ -1111,7 +1111,8 @@ def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
         version = '1.0'
-        if self.provides or self.requires or self.obsoletes:
+        if (self.provides or self.requires or self.obsoletes or
+            self.classifiers or self.download_url):
             version = '1.1'
 
         self._write_field(file, 'Metadata-Version', version)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index ff9fa8fc58..4b7bbeb33e 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -245,6 +245,20 @@ def tearDown(self):
         sys.argv[:] = self.argv[1]
         super(MetadataTestCase, self).tearDown()
 
+    def test_classifier(self):
+        attrs = {'name': 'Boa', 'version': '3.0',
+                 'classifiers': ['Programming Language :: Python :: 3']}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertIn('Metadata-Version: 1.1', meta)
+
+    def test_download_url(self):
+        attrs = {'name': 'Boa', 'version': '3.0',
+                 'download_url': 'http://example.org/boa'}
+        dist = Distribution(attrs)
+        meta = self.format_metadata(dist)
+        self.assertIn('Metadata-Version: 1.1', meta)
+
     def test_long_description(self):
         long_desc = textwrap.dedent("""\
         example::

From 4593c7e5cdc0e467a1c1957a0c864db804c4147a Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Fri, 16 Sep 2011 23:10:06 +0300
Subject: [PATCH 3284/8469] Issue #237: fixing test on Python2.3

Added an _assertIn method (copied from a more recent version of unittest) and replaced the calls to assertTrue, which does not exist in Python 2.3

--HG--
branch : distribute
extra : rebase_source : a8ba9e47fdcbc2dbee8e801b5d1d5d84c989266f
---
 setuptools/tests/test_resources.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c10ca21083..227ecfdfba 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,6 +8,16 @@
 except NameError:
     from sets import ImmutableSet as frozenset
 
+def safe_repr(obj, short=False):
+    """ copied from Python2.7"""
+    try:
+        result = repr(obj)
+    except Exception:
+        result = object.__repr__(obj)
+    if not short or len(result) < _MAX_LENGTH:
+        return result
+    return result[:_MAX_LENGTH] + ' [truncated]...'
+
 class Metadata(EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 
@@ -580,6 +590,13 @@ def tearDown(self):
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]
 
+    def _assertIn(self, member, container):
+        """ assertIn and assertTrue does not exist in Python2.3"""
+        if member not in container:
+            standardMsg = '%s not found in %s' % (safe_repr(member),
+                                                  safe_repr(container))
+            self.fail(self._formatMessage(msg, standardMsg))
+
     def test_two_levels_deep(self):
         """
         Test nested namespace packages
@@ -603,13 +620,13 @@ def test_two_levels_deep(self):
             pkg2_init.write(ns_str)
             pkg2_init.close()
         import pkg1
-        self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys())
+        self._assertIn("pkg1", pkg_resources._namespace_packages.keys())
         try:
             import pkg1.pkg2
         except ImportError, e:
             self.fail("Distribute tried to import the parent namespace package")
         # check the _namespace_packages dict
-        self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys())
+        self._assertIn("pkg1.pkg2", pkg_resources._namespace_packages.keys())
         self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
         # check the __path__ attribute contains both paths
         self.assertEqual(pkg1.pkg2.__path__, [

From c0032c0de589c7f8f633314cae891bbb2191dbce Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Sat, 17 Sep 2011 16:20:05 +0300
Subject: [PATCH 3285/8469] Issue #208: fixing parse_version and post-release
 tags

including tests

--HG--
branch : distribute
extra : rebase_source : f953ba35614c338161249d6d74c7cda08acdf32b
---
 pkg_resources.py                   |  4 +---
 setuptools/tests/test_resources.py | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 52d92669b3..e8dae8a420 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1912,7 +1912,7 @@ def yield_lines(strs):
 def _parse_version_parts(s):
     for part in component_re.split(s):
         part = replace(part,part)
-        if not part or part=='.':
+        if part in ['', '.']:
             continue
         if part[:1] in '0123456789':
             yield part.zfill(8)    # pad for numeric comparison
@@ -1955,8 +1955,6 @@ def parse_version(s):
     parts = []
     for part in _parse_version_parts(s.lower()):
         if part.startswith('*'):
-            if part<'*final':   # remove '-' before a prerelease tag
-                while parts and parts[-1]=='*final-': parts.pop()
             # remove trailing zeros from each series of numeric parts
             while parts and parts[-1]=='00000000':
                 parts.pop()
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 227ecfdfba..3e0309f19d 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -477,14 +477,13 @@ def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
             self.assertEqual(p1,p2, (s1,s2,p1,p2))
 
-        c('1.2-rc1', '1.2rc1')
         c('0.4', '0.4.0')
         c('0.4.0.0', '0.4.0')
         c('0.4.0-0', '0.4-0')
         c('0pl1', '0.0pl1')
         c('0pre1', '0.0c1')
         c('0.0.0preview1', '0c1')
-        c('0.0c1', '0-rc1')
+        c('0.0c1', '0rc1')
         c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')
 
     def testVersionOrdering(self):
@@ -493,11 +492,14 @@ def c(s1,s2):
             self.assert_(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
+        c('2.1.0','2.10')
         c('2a1','2b0')
+        c('2b1','2c0')
         c('2a1','2.1')
         c('2.3a1', '2.3')
         c('2.1-1', '2.1-2')
         c('2.1-1', '2.1.1')
+        c('2.1', '2.1.1-1')
         c('2.1', '2.1pl4')
         c('2.1a0-20040501', '2.1')
         c('1.1', '02.1')
@@ -508,8 +510,20 @@ def c(s1,s2):
         c('0.4', '4.0')
         c('0.0.4', '0.4.0')
         c('0pl1', '0.4pl1')
-        c('2.1.0-rc1','2.1.0')
         c('2.1dev','2.1a0')
+        c('2.1.0rc1','2.1.0')
+        c('2.1.0','2.1.0-rc0')
+        c('2.1.0','2.1.0-a')
+        c('2.1.0','2.1.0-alpha')
+        c('2.1.0','2.1.0-foo')
+        c('1.0','1.0-1')
+        c('1.0-1','1.0.1')
+        c('1.0a','1.0b')
+        c('1.0dev','1.0rc1')
+        c('1.0pre','1.0')
+        c('1.0pre','1.0')
+        c('1.0a','1.0-a')
+        c('1.0rc1','1.0-rc1')
 
         torture ="""
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1

From 9b461896f9e80fb416acd393c0d0a9d29fd8f829 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Sat, 17 Sep 2011 16:24:50 +0300
Subject: [PATCH 3286/8469] Issue #207: updated executables for 32bit and 64bit

--HG--
branch : distribute
extra : rebase_source : feb8ad4f829140739feeba915b835dbd26ab1b80
---
 setuptools/cli-32.exe | Bin 0 -> 69632 bytes
 setuptools/cli-64.exe | Bin 0 -> 75264 bytes
 setuptools/cli.exe    | Bin 7168 -> 69632 bytes
 setuptools/gui-32.exe | Bin 0 -> 65536 bytes
 setuptools/gui-64.exe | Bin 0 -> 75264 bytes
 setuptools/gui.exe    | Bin 7168 -> 7168 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 setuptools/cli-32.exe
 create mode 100644 setuptools/cli-64.exe
 create mode 100644 setuptools/gui-32.exe
 create mode 100644 setuptools/gui-64.exe

diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..9b7717b78bbf71f105ccde26746a0f6e3a4d12db
GIT binary patch
literal 69632
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
bsj9#HerbVUTHu!!_@xDYX@UROTi|~I?X2KC

literal 0
HcmV?d00001

diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..265585afc4042ce55c59d28ef1aab37f0a68ecdc
GIT binary patch
literal 75264
zcmeFad3;nw)<4{x?j}u==7yyufJg%kMxz*wOG1P8g^u2qj>Zuc6*U@V7)1xey?`T2
z;_W!;ls)pyI5RrqIE>EX=#1km536EAAPYMv8bl@T)i!DnO~QJA-&56{1k~q!e(&e~
z^UVkP)~)r_sZ*y;opY*g*)1z<4x7#9#DB}O+1B7me?js4KmT+fdC-`3gKYm9xP9yz
zdu03AnR9=%z&F3@$3LvP^L}6Doew<lW8HVxJ-#aA0pE`v@P)3u-gp0x@4jb}$CKqx
zRsGb=mkZy$<h{!D|B9bzmHY7iM%gWuN5peR<y&|jJ^ZK2_e8z}mDM8tw#t{q^V-UH
z@chA#D(6xir$by`YO~$_sLQrz$U9}}v`*VNTXx1ko9zw6JRoD+&&4xWgoAc^P&mV8
zbI}j}(ob78QVCi3bJ&74=|ZWph?SM3ACxZ@LqXePxprH=2&H~1?6!7*()%~xZbO#;
z`@c?`ZG{B&JIhYe?^&!PWy$OKA%LjwseT|N{(LrD#iXjc@6_+a_@9F))M+EUwBvuj
zzaWw)$!xZdE<u710H1+p#;JfKU&EyNGNb4t`fAHUzPxYc3r?!KXWox7dVi)q00#oL
zao@@}4XOYC-~Wdg&|<Uw?wd68pig6OYwQUB2Z&LNYZVdJq_MYnz8kM>w!d%<4UA@P
z^4)>>O<HW0TZ_%j)nfDWwAf;wI#azty^*Sku=h2y%_?dLv*YV%{Jwfg>)ss?4YX_V
zhb*nKl|PtmvlVp}eIBXoZnlln;<M}##%rx*H>>r|^QO!;oK|yk;*@cQueNL1un=qh
z*KCb#WheQ6p`7M8P|(%vn5|h&$&8{dDxq1M>l}Cw2fkSHDvAv0SLAkCL}T;(n#Od0
zxyF|GXEi&<HBYyTZUw_^Gj&S6UA;}6-L!36e|#Jf@UL~E7yK2_t-6MSz>3CNHP+5;
zIrIi}06h{jvV7i6TFt=<OfHSNW)DF_MZj0oUoK+yX{@n+pvI0S2WeJA^^pq<XLHb+
zUGI*z8DD7es6U7{BJs!kK_EO55BY;yd?xB=TeVoo@8i=kd8?QB3vEj66TmKl!P!bQ
zMuYP|6y7Nd4?tl#I$9hBF*Krq?%kTzs#$HCqqVwZw(gO!f!3<*W<YPXA<{@{=G}f@
ze~1W1EFBTHmA^-rNWCW=fR+E}q-AOBG1=*&ZTw<tnLX{VCM48sBJA7&bZ`3~X-Q-I
zB(xFsmBx<6%iV&Q01-bAWLjjE7JaUcy<CgsMOcT%l4#m$QZ{7spQE+f2IEk$z6deF
zXqP@asBGB5e<I>_S846%`qjbelSFJS$$bcoGtLNhwb+e8MGZ()o@fYO)D>cUw^eKD
zLn5q&h;Ta}M3ckuWsyZyJ{znvfSt|Br%uW98O<2V(~PA@wFZPM2Ov{8cHSl`G@=*A
zFBA!5u|uhyX%V(&W2{f5)G%gRA9Z4S<=3_uLzw5$v36T+o9-^!V|gdPgH@X*8gk~-
z+`Jyt*MWDl!fh*RARNXc{`sMJaBk5aB7<`JnMFSpd@2DO_dJXC1+lk;{PX9ctmSo}
z+DLr1zdQmCp%F#QFD+`LQbD4GVl;O*s1QH-wo+>5^`bVErlkO-U)?V{H-cBVr~&V*
z@6ki6;O(H8qK0IMp>>T#{N?5rE9P2-VwSfWg+!bdf5P7>>bXbOGl=KOddg5wauth;
zWYAFua@{KEi1?Tmo972h(*1ciNrt4RI9mej$lPg#;`8lcwo_v#zIrKK*%@IUfHjq|
z9pQo<kw8}{eqF}Wv#w@Swh;5$`PEBhjvYuBi91T;GqdbVJ_uKC39~o(O9Mo&G678l
z3`DYn-wmR!p>h-svo8dx%9<lAvGn3H<~$g#+zw=Hdl#i0TlqW`2(u{%MRQ?CZwW2%
zMQMDV$G!x!V;)8dj0?CDe5PEG!yS@c(F7uXm3PC9ef_ODNQ?uV=L1hK=P9I^*i3(Z
zDeH+;9@=0dHbz{fs13~0@{W0%AP<|{EMg0VVYcn7mx?||-!bet7bLT*izn&1!Mc3n
z5}>6*Ezr0qiFfoimA_~Yy31U1sAnQa>?%uH?YbTBb7EIz*1K**sP3wPeDP|VjkT+R
zO~x6Luf;uMk;L^QmX)X#a6REK#52O0Su5ZBcT`x3R$s}XNH7-1PpJu+N3*tQ)<!Mx
z)&iwIBRF}p?w*pRJEwSzM6m8$;zv{l2wx3aR>cCw|K_pT0-JR|fc-DT_GXINnX3*F
zG1Xn~G7+d#a|l2m<+upd@E;t*9F?rtt+7r%<S5PAb}g{kP&9_#c=AvzaS^6ch=EnE
z!_=}}6+dsH8ZWiey7!Ra|64W2`MMs<QqALbEmjH;mb#buG_%>QS{U#_{C7yCS1p#Q
znJw<HdC+crDzM5QLDB{QV=H5yq>}?(OGigQBKcvK)5R;Ou+`j~`1KO5nP-C@_JS*y
zf>90QfBz%;&0Yt<*J5@hYQU*W*=D}(IQ6HMucLl~a|@yY=l%&+KH}UYU1G)&b*X6r
zy!|$sdzk(S{REZ5I#-SfsJSDtU|uAq`K~9*1m7x#Xi>DE9R?K#wkp4D2s9aIb8Vu{
z)*=K)qGBJ|3u-FbQ`E+9p8)pNY9+ih<|y)dx`_9Cixi}ad;si3;&=P!^CKv{qU)->
zpi=uwL~3j&e`Y-D?XmQ8&7PC`1g&zH#<pmUM_iG(Yr(m8oB6>Q?Y=#;!j55}IM41Z
zyDd2wfmQ@Gwi}tQL8h*0#mkKeRLe-J#Y^PL8nwnAm-#-5x1o4WLzh}yt&ih#0MvK)
zaETv~?63ldjdKYw*HD@kWsGpCv6=q46q)BmWGCbeko_8DSV58hCX_UT4HT=h@3>v^
zzPRg>0d`wc@Ol!!n9DuIZd*SLUB(iaxyFV8OS%G0N~8&(3aX5`J`UI+(*Qax=2}~T
z?jfrm>nn&PHoBD(e=ifCP9<ip8Hoy$i?Ia6y)7=3hz+xA=0*rUjc(0M+I7e@t_P4i
z`7!k&?%jY)rE$#>X04I9ci1_0@VbT+n!?Pvkx&(3!|Y-6sHJD)_oVJBtKDM^XvqLY
zT4Ae!st=n9yYUJt#4<>or8SUWaSjBZsk=r36}pSJfhIKO`3hr0OJL$5yl<1Z5R0ED
zkH8J=tD3CET~E6y+`ecM&44v8z99b2)e3fN-JfZVM<Kg_AQD%^BZG7K*XP=7%DVgV
zlw_6`pHXOeEo_=nfXMpIBf}szFICLOT;AM2_tnU~yDztd8%T*mg46<AsxAX4g9Rw9
ziwcx=59TRa!IpmTbSF*+=7;Dr;4m9e^Kw~pehMFeVyU96tI88_TrM-l34|MaGp69Z
z+aHu79KRLd68plyk1D~Uu6y~KafqsI(6jkV2w`y!#y}8FY1Ct;r~l^6QN~0;4^%~C
z*z9pvU9YU#6JBdi{e_i(>_&93>MX5$pZR{KJ|I%isKs(2V3x7gu-S1%xG^!nD3LFj
zcyZ{1=ggV2VucnPOcWKi+KjKu083WgV9ja_TdhV{lQJe~qfGc0t~p{m(`H*xNcm&e
zfmdFai*i9c+ws2x<?-P7---V{MtkxJfE)t6O4DHcM+yAMA_%n8n<#`Qr<YFp=`nV7
zR_FL_36js!eWzz%|08T)S#|@~lY%W>8#DF%`iy8popZ1f{g9AjZ3N_cCQ^(~k~v}4
z)TG6n=-@`+H6v_tch$u3TI;0vTNZJ&M%b>f`IS{xv^%`kCUIF)R=Zno3!4pYCCX4|
zs(QkHs`|yzkLvt`btCoqBdw9=id_0#si+%ej_XseSM}uxrlKyEIWA1SPUx*-Oe$um
z%#bTzmD(vZMX5iIEn3kYjCF2RX;)*Wo`un>8;o8j521g)suBGMD0W>Q2FXVW3qD1c
zDCDjhm>P2`(SYTS+p99gs3#9o3)@n2xs>H$u0>dzYJS+GcG;W}wp$;nvY@-HvfSC-
z9&zjje~XOY9j<J;nhnd<*z{bcxi!ZOcbDo=^c-cC>M%PxwI>PDMUdm#1Z5|lf=DX(
zN*PnJP9b48kD+^gLN!KQu3;p!LITc@#3Ftlh&RGEY7k)ghO;pmV98BF9?Oj&&nZHg
zd9X0T{^)-mgBD?b^FK+0$BtlEQ?#dy9bsD_o6Xk(NA;{o;44Fk1UBl*S}-?T;uZYT
z>!C<si;<(1JmFt~XyXHLf>c<4GZOerCat8T7MVn0eSIYGflPXtlKv)>D6FrPy<-Q8
zhw9m4_lIS6<Dx^=fyu^sfI=UOF?A@9U@5SvYq5j?@D}Q8nC;*@^C2(p(c%x=lWxlE
zQ0van*k>B;(hd|4*YBY{*snw;!0w{W`tW+klnZpvl-c^gDU%GW6^D~fEq<RJX~jd0
zom${C{elQEFd@RWM+$aEN*)tERUUnzf73hpOxZL$K`kGpmWOMA;5sePT@?W)^sy1P
zBUQml6kYgWFWlSta8VdY(aW`h_q39y{e+8!*I)|^aZ~ng8$X1>Oad6xr4<~YT%w|U
zkt>CR?R+b8744zAoNC=LKSZGaLS1Z2(h0^nKY}evHQot30CeL*LJ<M%Nsk-F45vm0
zQOru@U5JWqK#31zlmJcC4azVk@R6g5#voYQ)|0NSPg;uQ@k!u?tSLDJMDi9tgqO8o
z;I^0>atU^oi$R)&r^#$W&p}(IT-qX)hp`f{qv{&5Ghl~E{;Ng}B-nJfhgoCUsQqQ*
z+Y!ckP&R50?FqqaBmUyD@w-H9i$<~7Qqa`M4~tkJtZY;RZ9IGsVpOvOtLqN_wvaPt
z)0ReuoMUb(7m9%X?6n_%)dHRocDv0OtTi^~&gpKnEF<G^lh)Xlo4D<ib-r26!{W6^
zseJ@+^FtQ{_}FwXffWtZkJwO+)sb#ni_HM<_561>t;4(ZGgx&iVryOJLB=!OeDg(=
z1#r5C4n&TU>27_LU?g=So5w}j2J$~+jYajSX?kv#s3F7fnj%j|^YlDSi^Ix~GY%`u
z?futJu?7dtsb`bm0yVb*@Lbt|L|N^eWp=oeH<Fa^E84>+g8gXNBKyoWIml~Yb_QvJ
z<dy=$;9)3TL##cC^3_44hm_T4&H`I>LmO0V({re3p}CSkKB0;QJSb!*jD+M(f`5^;
zSOJuQwl+YxleE=GR#I-|ua6L-c=84f3Wqmo%!Bk(NGhsoG$1x6kod6oF9y`h@zkav
zp5Ky%g7f^vcGkW)i?;QJP$nhCrV9H`9=Mc97Q<g5WY|-Nzu)+i3}8S!i-0e$PcMnI
z(2S|KPpcm`5X;TvjmAy1%w7|1(683I8#B?m@&48EVFTyXd|)YaYL50Oi*{?wj#XhG
zn4AHPA0!McJ>hlfwRa&F<xVT&*b^?=7_M#78v$rhLz4#bHQTMG=pOxSC~wAVji2Qr
zJPP6Asjz}@wv2X0yNo(2hR#TNi|ymtCFti?{tmhey1VTpFmtdF6BM=<S~7gMYF0<T
z{Mc@&J4l1_+!myx^CKWNjzJ8zW|sGvRHTz_wRVZpr?j;i1Ar9oa%4lDYu#ugG08_S
zGCXb!g&}}0IKRK5^C-#5%t6g%P`yoVEpVXf^Zts>zU;I?5d~1oa7d4sS=mGz8P@J}
z$wdE>XpeL=QWIlNoje8v%l7Gc=;;Lr^L3MHqoTVB@Utl55HN;LpSz77o?}~qv1RBO
znz{w=zeOs)Qe+vu6KPs}>MlH>P5q7zm{VUr3(e_cP;d)Eyi7Kx&_=UOjhAOw-hUyU
z`qZby?c<FhTFCo!E9SvqDeGWwhu9H;Prm0Y?8?lk*9@}T>`L@F(B0yiOfLw9>Ly%(
zVC{aTb|+pj_=N<)my;+AsT5Nb2v?%Nmx<YwxJM-RP@*rwx`;nx*?|~~$)%ZJLd;zP
zUK%)AmBW8aSxYjFjN~U20rjN9e<6yu^X2r6Wm>PJ(e<NI?@wd`UjIn1_u(~yt*0vz
z;5r&QOg+xWnoLhfDyasU1SDCD(RhU@FYfsr9{d&B>&LxoWz-84^;bl#D6RcS&yt8)
zi!}(Z#>5uaB<P_CA1Zj8o3BKIifwET3gBsZUvDAl3)r7e>j5oQ!QQ0`#7zUWCvh)!
zgd&U~vnOWbjno98_%wUsT9LF(XfH{fwJ|Z3V&wee#`%QpR?^o0W-0}@@*kw0Td<?1
z_sOaEb5qYpKq3_X=VJMMgr0HFa*!ZDi>iyceti@Vn!71^k7&DaP1!9_c9pnZcoS>X
zjasGaT?A0@H}r5c))bQ|5-QvMw00%~YqKF#%_-6HdZY5qH6+y!T9nQ+yl8*PlRb!1
ze%T}n4UmOjBXklDr;9EAICJX9SVS_g6@CWG9--dG=V2ieJchpqeGZ>`K|1TYRMrKQ
zHJ7rgy;=WFSu?<?R`96MPCt~jb`)iqgapf5*erT~-6)XIJ3$e?4Yl$1E2whhC4R#*
zsFKZ7Qc(jb>Px7~0PojG!A#GDlIdN<M40P6ET@r}>i`}a^ETkYJge}_|N1#f^w2b@
z-EUBVuR$+76C;}(&U#GPF0fi7I)UhI+#>3OcnT`gFfN4<C@>=V{4y*=c+XGVD2Sxb
z){qCgm5+2)r_Aj#_K>@bjSaI0i^~c=?NXg{%19LY4C-5@_8oMj$bxRG6}qimC6_CY
z7GM~(`0Y7tdQT+Kp*->z<Y3c}Q`r11!sf$Hn-V3d&<xo15nxZ40fidd8+No<yD;_Z
zXt<XxP-~XjDi_?}VdQJ()Z_@%s-FeA`2ZpQJFN6T*&spQVYc1!ZbdYk;Z#%dJ1X1B
zuR=e=?8+d!-dR>z1`5R%1@HM`$6IBjp587PisfCj34?JpGFuR1n{oq}FSs{xIYt%=
z`8i?skgw?TaDi1aY2i$CE0@jqIudxl>T=n=1(#}pBUL$Cpl3m*+EwcG85fuVn?4Y|
z3iRmXlfy}CwHQ77r#&1S5CR^`94)G~%fe!dmL^rbEC42pLNLs3g^u|?JQrwT_F@0&
zF4qcTbGbrq=)=myIcO1M{Y#Z_p+tWTtZ_F8L^B(pif%WYfPX0OIw)c)C}xpp%yQiY
z6-)Q@Jd&Y|%1C@dGpSrEd&1_F<2IvUEg8c3)kA>1nDaQ8v4KTtI_Ls&W6UA+#j)vr
zh<V8o(5)VCneL|oEz{lffFOxn*)=orG6ts%FtA8A$aMr(M(}Hx70INy4U1!;P|Ydp
z?#hF3_V$7^vCZU-!)&&i$~@}}%Q7qdAk^{rUzwZcENK~{Yg!&K)efo7g!#&Fsg^A{
z(VXVC7JHyXsB>#phO(+L=~gzh@lVbJvGrJnbD$%cVL4Jfs&>z^NNP>%wU1za_`>W+
zn02zZgY^m8B(XPx_1mqjFvS9(D=ghvyMOtoss2EYBlaAm8l~M13<=B8DfOvcK>}4)
zs<DKg6E+tMknMw$mjQ~R`ZBSNWN)IGv(O9-V`#}3&Zh#SX7RbkU<t@SuizG@ECAU4
zJpfRDPT6AD9NYzl3W55wuknx;*H*;PknAIgbuNi5n1PGKY*!geV2)ITSO*?6L#z`I
znj^FDznnjR7#eXXH3DxNDt`{dSG50hv6!0o@zsNDwqj_;L6ACZ08xJ(O?D}FlluAu
zL{SxXr>^OF!ARV*VwYtpwd;_F)|Vk3JmcQ`0InKn(ep`}JU&v{fQ&yxMyO4(V;V!+
z>9YG8W|cXjZPhSZC$pe)K$Z})0N+qWpF^e3qS7OTLVF`=v7wEYn(QYUsT6e9)w;^x
z0=(bXmn6XXzP_leC2=A8B9L-aUmdK!KxJQru$>6fPe^6h`#mAl8tUZFl;~#zsEbbv
zeTTZ96wsR0q6WUwVy}oDxAIska>PqJrp#J2L{m0wo~CSg%-wky$a`N&I#jkrtK6tn
zLe)I16-iHI<pN2KN1bSEHrt{G_9)SZ01i~cO0*7(jtE?k4kXh_Z>Iw*(}7>3S@Vb;
z>MI0b5#DU}+^sym4D3OPRs&44M^&P<qcVG@E74svnmwgTbdrd<N{LPof$R1A&7N6G
z^ds?hi$2`!xl@Uft-|c7RHA=Dv4rL%mRxEJo15KXC_ygJ*enFz)+egUx{tDz*K7-h
zJcYedIZD|IHtz083_%IPW_iMmkj6%<U!k5uP)@1cn+nl6OnqhD!R#=*%~l%dR$22}
z%%J5;2nyKEZsf^D9wkb9OSF@&T2n%!ZKwzom%!uny824$=anj}%X-MP)_{C8Q$l5|
ziDw7JxU1;HXjD3j;7txy>q~p^7NWPhXsX21;+ZG|$Vi({X~F8vKGob7EXCl*WxC1^
zEAjJzY;^+$!IroWL9^!`<uNbHnLR&Tw$tqSkrF+GG_&UcCHmhY@M9(V8xfeV-(&VH
zP@>;}KbSp+62&$F85b+Hdr{Gvv+<U^-fEo_Dj5uugxQz@$c-<xg00%_BgwJA3}NJx
zPJxkRmem?69;}0hHd3}j1zW)=LJ20I152_I#+5Z79~(GBg(?K5(&$GIRXDF}4*4U6
zYW%vd>O%gq<n^kMekd(Og$5?4hS^dv{Cp*ZAxs^#phOo#`=NGi^69QQvCEPfvCGmp
zP0XW_2CCGxS!fQcsYaBdRAtg5XF*n3ikgy>#CTI3!%$OD&n#13EA2@R$N1rqE8+%}
zRU+&xWu;J+B9EsmuyLt7+}%#Fxn;#!qT(t?DQm#+EOo0J#Mox5=11M7fy1TBwTDAk
z$STNegRy%JNP((nRNMG1K$51i9jdiM4QyHNLftyF7RVRIob5goVGZ$Vg=SC5GKcDD
zA?KW}$z9}~LRF}*foiRSCMf=>{ei%1NHIz3Arc!{9Vk?y5GuhjwpvJPb`&O#10Tkq
zVD*U~8fps2k`#by&B^DGy6hY^zTq}1Rk@Qt1pI06w|No?w5832^v}AJ1Jn(al_n+j
zLD6Ffg8IP(PH2_bX+;IM;^kveh*pUZ`~*nPA+>qU2<DS1_<5?7y&l5O%xCRV+3})=
znop|{sgDi?Iw3$XkBX|fThs%Q2oulRRn#D$9~tO@*_(NWQ;tu3)KWS}b>Mu1#^oSr
z5tja~ya`)e5DlRxR5H^)OR1fK{)xf7kPzoykVzDHeli<zc0HF~3dGJJw#2U`2O~B^
z7g>Bsj$x$bdnWl4%q`IUp@MFt=U}--SA%e2U~m4@$KU9NP)-qqfC$CD#fQP3jI3^b
zIDVa{6e#4+p#Z856*a(uRIVF=o@EbeED3cKgivB6L^43yO5jIbL$lr5shOKI_^Lp9
zMi>_{sr>|3*C$4xxSE>+;W1I1{{n4@$#c~BivT}4UOccS0XM<qh~6&1Eo&>kTV_W+
zLD18Zkp#6qtTzvJ^YboIBdym&BE+4c!)WCy=mssNS2B&s#frop%*NSRba%D_8Dc%7
z6%Z?3tsia+p<=0(ClTN=DFXbV6&0U=N*NI(glMp%UzCKrgGJGYc@8@|Nh`gQFYM?b
zkgz@(zjO5h{La%o_+4cDifAG``FQme^9<NlTIe+=Sq(;!n^=U2gn%#c00Q;ICk`r8
zE;WW#FSlQ841(`KhKNdBi{vRqBL1S@_^*}3WfXt661{+)V7X`06O48YJ;7Or({r&B
zRp^QJE)!2$p=JxR4Jxa)i}i}n!;Z12E6@ymIS_^M1M(qC@+sd~77zufgOk5dqU0TV
zYKBqB0E{P|0xw5z&oxGrGDA#DFeD}ZYebi_?!@DGPLJoTq6Iq?*R@@Vr6T34gpn>d
zT1|0B3_8eSrV_seNk9$^LrDeHFf*Q0P37YuZ5L%oOqNA`x{8*^>lfm;Kp%(S^Yx+l
zEmUgrWDV|wlBy~(KnCoI6QsQWx-%1pDP(TTNPLC>p<_P%%%Y!}^rMxs56}k+mM5B#
zhyTDuWR`YyAQg`<rD~mvbw61AA0baB7J*8!cj(=-&c|+JF?=d2eB@~f$EKQtBzMwO
z^}*k26*lebW+5UJzpE7vJp2HfiLmz4A}btdG2A4MK1`GtbH$+9R@t_gXD+F@UAAme
z2DLAkURw7sw4&LT+B|(=R%z_v97Gi3r6dbKlPRVgF_Ey@Gz(((^!|mbnwV!KBCzT%
z@!zFH!(ym0m(jKoB^y#CKG&&L7KR<)thYf<DalhJd4gNP9V8wH+>!Vto!Fg;J`nt4
zB>bpA{}HxlCz)$4l2ym1nCoQ(!f_@6-?u>h7T{`iWpVX)Lk`b_lf8Ye+RR*)v?a7!
z0!>SzAe7NF@tVv8FchycOAQ=YwoEfGxAgn)ds4p#n_rt<znva#OeQwS@)koxAt5{*
zsr-~Y_8@#?4INW<-$xMJ{a^wE&;dV0CYuUb!5zks<*r+aeFfift}L0UVy(+bic#7N
zWLPa>+Bi461ILy;Qp!*(SjPeFzWuW_$LO|9Kx_sq+7Sj$>I150xT}-Po2R>LRLne!
zmT0r_n>C;xt2FSb5`y0NXaAw8*Qt@$%GHF@QlU;>j%Wh>GA&l5tZFcOG7PFMm>dY(
zpW#H%4abKRtm9I!x~%Cr$z0G=auVg$S{#@amTGMR7B$myD34u-cjn0gn3gvOO<;TO
zK>i4X2qIZ*|9#l{LqqX!VHv9|?o|QMUK#t+VrY|LlQ@^CRoJ`wW=m?KTmgb2031v`
z6FX9vU7<Jd9D%Bgd|=@H2--o(`C@kHki6DBfp&TM0b1Wk(-@EXbBRQ;HqleMID##d
zTi*5mCR9D`cT@9No`YCbpoHWPF2_5hi2%U_??-UDAWgmsAtg`<-Yl*3BIE>7E$kb3
z_rcn6K1wHjwB&HWM$(3?zwiBdf+v+u((`bqjch79qDB5{JT0#a&=s|@cFTMCUx-Jm
zn&s_45Xy@jsLI@NErZXyn6hp}>^iDN4E5hAJNzZly0Eu=hduzRDJbqe|LO)&uzg`@
zf7w?&n1^!c_Q(i2j14mkrKBl<PKm625P^~tgmsvA7Xgn@z@3(dw#jorAheAS(!#Bg
zAX1J|BQ4#wZCF*?J|+@@)g3OX?m(7aU^RptyUd>RtG<e>pPM~{7Y$g0&8e-arZEJ{
zT5|@%=8-|FawQBjPpT}`=uGMR7D-@XUXHu=e*%m<p(4sfTkwk|ec(;~(qBub4-@IV
z_L`!8d4AiQ2R7D`NPr`gi8w-tGZHV)g}@OY;*VvZ5>f}J^;f6pMW8lhhs^Ex-ND;0
zLUHMKlV9SxrVD0YAF07#d6`)E?>U5nP+;_>h*#M$<*E~b69%-`z3LZG6cAZRt$mLl
zJ}GvnL73tbSeUTBf&gf|_>TtkHhpf1>-BHY^f+o-J*DaOh)2_^a@BD)aNI!QzQ!R%
zl07pG0cp2-*Qfqx0R#+P!b~J!5H9oE`4fG8zd(a4BA_UfQ0&0G`v)Q5nG^yp5l|ck
z6kn@>uZ<1=4^Vs?@8th0!4QP}nF{>lXo8^Ly|ljU|28lUUkj7~m`SGq^E~3QYXvah
zsDW>c_5H|LVne9K=l}u61j@e4gt9L}#&^#_*gnWhTStwUqr>_2kO4pdmiHFKK<Ye(
z4IvE9De_6v5A5<n|5;en6~D&L?}cQrB7VDrv`&H1`NQnCr9X;Peu!oGxWjI{+MLp1
z)61`BIUQYUo~h^ZiI|MU>jzlPkT3k^v0+OtMCP588M&}6hI80|y+rijStldk=PD>U
z!bZP<_Zg=DLz_iL2Ve5>wZww>r{ISq(28jce<wg(2m(m)k(3{SkEwY@82EjD$CM1?
zif%OztEf%Cl$8`bl#3%C=kqg#*X;GVA=ZM<-#8iGxGjdlrsqW)9#YJX6S3)e$xL%b
zo)6BE8k>=8R=P#AIuwwx>|W9nyhF}eQtx5G$mEv*%;b6eUUUQV(?tu!S<1S~yg>`R
zv@>`XqB@!!j;#ll$OfUTl~^Yk47yC{oFlQj{dp<*3MQQpJ5*ZqksJc*|B50DxuDS4
zX$7V}i<2En{82O-sr(Yit%7`uk>ED{UKpA=)V8Kx0jtNJw_uz=`VT0b<!~`Xm#F4R
zyD^NH5cj|eJOS%x2#x!bqe^SLj5Cla1LHVSCaX%Q8!+a>Mv^0H8TJ_}wzng-g#Z#8
z069#gyrQ~M<ZBwP^qH3kT#_rqm<iwACXqXlff{<}4#tp>kS7)I(3Y=!pX7Q7knA1v
zVYl6Y!)&vVTi{;|aT-ka8E9z`#Il#oGsX#1#rcT-%ZG@D+8+WzpnXYG%2Yvo3-A=v
z85}udKt7c%nxi3X`Ztl3u)i0UQ~0MAAMFJwTKxQLsA6_ZW0z^QUHT|<x!Vp0T!tCD
z=|xJ}!IzMC2{}BQExB6Y#F95s*6AG4g8`QJx0DgEX@Pf_U;+uCdO4h6tJ{R;(e-Qx
zGCJBchVEGta;O;Q1L&j|PlCa~k3;B9V7sw|qGCAD8v*6!HKRGlN+oS@w{*~?Kc+b#
zf1Dpi#bI;F2}}$pYfe7AHXk&^n?Rnag+bwy@X|uZiwG;X2!#-zgSQp3oN<8|2BPZ6
ze3GwFxSA|)hp}N#741sqhGVl&*phI!+RE=jD(KL2ZwE;SQ(j0<=hFw}HaVxIy}lBM
zN2We`fH1LNGp8JYBMv9c8(0}cjltY|fS}Gf&^IxGtM<R9a3$=b(zS^A;zi^$Hmw61
zA}!Fez|S>+`fUl1dd+X^7FMa-H02*hB>B`@niA^4VrE($i}KKqpF@cPk7aOl_zj>p
zSd@+P&8hW>wm}t+3G(t7ft#&b?SB1VEe@(U`2xKRkS~&%rR;@rZ2Qw45JQV7AXi9R
zga)8@{t5wFUiXn>%2>4?{+Rkm(rdw;=q=^ZS11s_*<NRFc1(sQ2U1NLdakO~B{qnT
zG$BqZ=C6>eJ_D|l;^12KWSj9Zyb*b%7;eqQ7wAK)i)X_JOk`egzdY?m4m1^n#1Y9M
zsg&#M?V>!Cm#E!<>_$coWVx{34yX#IOwz}tvgS8CCIOn>qIstmjbCNg0?i9^>C6&;
z8C!?-n9cBhZ*~v`j_1FlD3CLz&fR`rzx^u&qkm!-pI!&QCE)eV86t)toiW6z5(vdA
zJEGzg#gw;+fI|NKkg{sO8eQTTZH&Rx#-t9B*H|6#vuW^;x_NvvacpAjf*yK3ouHyK
zrMiWNvz$20EbzG?*?`$bwp(3`wG*tN6@rl9liRkXBgwa*EpdzFfwb=sedF6NrEX$Z
zLBhKm+le}=AnvL8k|xe?q29+TIj<8B(9A57udq$1AnecLGZr8#Z6q|<sLO4-szHXw
zuu=suF;P+>g@P2qM!|I+Dy6V5g7W30|H9@P)nU(YqzWT2j`josfS9X?@?z^EUd;xu
zB3CU%!HzC!ab5cby+y??3yI~3ZE;OR<Ura?xO@l!om61+K0MIuT!b4_;rW*L&wqxZ
z+qDAu<Z3bwtf{EY@;-`qVBiW&Gt2uRUd*ZYB9qO?lKGB8?QVI?k+6=M5<8B`RHkMV
z0sB32F(wKOp@|Lf?*mNaf(h5R7k86RXg^NH<f`!*15{;oQz&+u6aU@#pEKw1i{MCC
zzKaqCC+eMJ<P0#sup2Ni#NpgxTStAYcb3$_x3p0+KckfIWb;DS!jebF#W2d%E`q}K
zVmltvd^lgk9AaU3szQBZd0+dJ%?2kl;wnmXDxPxe=htQ6u!6NQ&{XwJeaL?!RI%_b
zz{#i^ljkU_ZnA^48$xidJwq+n1ts~_@rV=0@uu1T<>Rlyj7N&P`pjs9@jAOQM{F)h
zgEpT?g<a{ymP?XK)IT4agOs0(AQ`S)A@;dJ8}hLmbC9o?=z}aTAk9KSW2E|=A7V{K
zZHV&mc8EV{<6A|*!A>m#Ur@xQN<E8Gw0$QCG%Rh{Qg=D*dQSDg-1_J+YLDy=jtqTB
z^*|rRplDqUVJex~ES}J@G?MSQ*@Uf9(r&z#yn<GPYeoYRzgOcypV>2FksI~Jr}>gO
zD!mOtU05zos|V-3tj56WRoI0-<`*Lb-RhfrX=nempT-dCg*>PipknxtcmR4OTwHzp
z-7Fg59+q<DoZNwRVyI@WX#j=7lR;xou0bIAz*^dD@@_0nST280aa0LB4Mtn<A!CSE
zkTW|?heb!&T<hPaTFJ2^&<YQn<FFlriuNL>7W=6v%v>$v4ddBq+Tan2%48d)+eU3z
zN@w`^7RZUI-IeeixI>=j3Ci=E<Q1BWUYZlyFsp6mv6IGx7S}q2fn?0Ri=V^VA-q4Y
z7to}5VzSgccET9a;#$$0GXpu3Z<xo98#ucH#?#``Q)w*dOs?-`tN=G<$_8@>L%mhV
z1!<c*F>~~D>0b1cW($!X)CFNMQ=Iea!TBzDC+y%Zh+~O7Py^(i-I%lt$KR4TbFGqN
zyRD=cN@oOA$F{KJAh~mxM_g5j8jGJGQzo6Zu7MSu!ac~Ytj2Ej`e(6aXi}n|B7&x+
z*ga27MK+7bYtAH<4{;TK+ji`(mN{d$=Y&eIa4C<*MUIevV)1PMME(5YS#~{NSyim8
z((HjFi@XIpQRii&0Z?_8GwgUHT(Hgf27qN0=NULLcjZ}YPojcqw>#|EB+}S5&YHv@
zF)j3bGvU<FG!q^@R}E}~XxEe+xyFgbCpmNt*>;mTYn*O8Tx$m7Ep}y2C^pBPbi{6l
zj%`^k*xcFys2cn&(Sc{l=np<ek84*$*uqXG@h0LhUHW>4tv$TU=G_m>j{fmGNOXLz
zuA`-{EFStim%Imx^YjagZ?@~_DXRwK?1Me9YY`bsE*h=Y!!GxR>b6sCnPXdE*Fqq_
zF{5~du``TyrOfe8S-~5|dLXXmOX?dzs{73^oqC@6rAN;p#lXn*vTy5U-`2~%trvZ}
z9bUdS=7!@-K6i>vDXTMy$;}}($;J%A8+=P4t79)n+KC8g2a|a49-078`>Uy|AULt1
zrW1y}I)?r_a1dZ2L<nr_xib?5AWP(u?9ZN|NeAg~1K!}^5t!~&qK|_X*7`t(d^Wso
zAZ9~^BhB;@#B1zVa+<cPYebftu_=uOVB~|6oV!V_&p0yI`bFlSQRYt5ZW$vrCSI^p
zT7}^WW6%fj<6pu>4f^8=&ml^S31Gl0>|KwxqFjbj3oW^=%k|2BOkAawHVl##)O}4Z
zY}1`F*U2QnpYD#ij)*``%=I+|-Xe7yjv&r>2?TM}wG_@CTa?wI8M$-RSX8USYGiGs
zEXfaK)|#U<0hSI&w))VBGpE%>?Y?t+GrdpS#u|&5$I_87n$|~0(Ar743gOo#x0T8F
zFvGLK-@vvkc;GY7Nr(#6PZuACermDNpCf|0Cp*#f6*^x)4oDM$fj@vZgahxux{lq)
zN5DJ32`*Yvg`0F00j*!E<ek>5QNX?s642d3ek)Y54}s3koN7M|BpJijVjwJj2)`|^
zB&2XaOUtj&?SVbZeVN>}u$p|N3cWys{t)DrAJPUU(5T<9F_RRtq`$k<EVdc&nq@u_
z(WakaLWmyB1A;&p)xcLzrD|B-sX0dU%TXqCP^H}7Fa8^HPh)1GDA}N2MU72ERmBuh
zlOQI-cZ)nsL)2^4h|mgl@>gYCIc3A^OY)Vf;m^wOEJ}*IhP{giR-BRM+6u%F<a<H4
zXo50ugEGe-o+Vr?ko^Xd@k*}h)Q7-NnDz)+)LR!XqkQJ_9$E?6weEf?MIxoer;%*+
zDuys6M9~J`g!VBp1R1t%!%V=6RznC7T2Z;e)kvg5OPYF@DC~PrBSxmj)mhR!41Xvg
zf0dMX(kX^qY`Lh444gDw3>dMb;D~BpoH#&cH?T*qp<Z{I)r1Q>>6OtFCHf=~qvA4>
z&X66;dp{sUb`WJhAmw`>kn+6`NP6!N<bZZU=P5vj>^Pix8jvFHbRa|aI)V~MYY5J?
z4(n~|mP+`a5@CZQFos`1$Ku!){u`_SI2Wsr3FBn~CV^^V!-#Xqt`%=#T@CEQY&<GB
zA6<z;GlCS+vR<ALEw!g*o-0uTp7&{)XAo}_=}$HQQOSa}V(WbpGkb*=XA}p86GK<|
zjc68JQ)YOV=sYd84BJU5Bp?X&_cm<**Zu|`-9>E({ewan3v0sPDMa&`d2T_4<`GNx
zSYApuJsKiFgmBZf1W8F9Xlg2plLm2D=^p`1tY#%(YEjPw(6*KuVyF~qt|24I^yZpw
zdH^r^yG7<TNRxc2Ky-<j6hj0lW4-8y>`}HzkF9S&Iuz4n)^q&=sM2Dlh++a6JQvJo
zg)Fg;W(Ns!VlJfjHv(qdWAPODwWkUdupZ014sR*NjuzMK>&PE~t6U(Irc4p@Tt#iM
zU6%J(BJWnjo&kC9YmB_*{SC#LGu+S;Co}oe2_axX5c-M8+oz3B$%{Vzpd2jHhd@V@
z%OBj{Z-~Ua5T47uf-x~l7AC73C}|4nhu&3_Z<FNPEcxb>Z$ii5;zQ)ye3|ByZ;Rzy
zm*^g=7WkxUKb8?IDI)G#1aVD@%i9qzN8_i!DCBKMV?-No9FAzyM~j7aIEu{NiRiSL
zJ%Ilb<yOdo*I-eRgA$Teq=!*2ASKXYsJ*nn)J<57^pU9O);Fl_9(|B`1x|8Nj#r^<
zOATuV`4D5Zx>SHWJH_hy<|+RZ$enNdOlX)Zu(JGJ43YI~NDQtTG(k#tO$@Qz7~lK}
zRoG7Bd?EAPLDDjf^GhgzsI#yILThvu0_RW=mm23aMAjJWt(exmGn#ax{nb+yTICU(
zxy1G^2#;2NxD|p*{0_TXbBt!iBB4PErZgx}pgffLJt}40Br^vaPr~tO)eiozVW}M@
z0TZnIkDqqy!Ma!cF+7{2{(3xMmATrU97?g2idag-`LiuF9zn<)#gUX!f~mvAu2sc`
znUaKx16x_STfMVTsN>EkhK@s?Q7cbvFrZ=@30cNJfBa@_KW2#&Y;-k@)a#JRwgUd*
z{dRT01?=pxS=hbL6~6p2Eq#d<pn99HdLJsO8F^Y|XIJARFuJ_=AqgG>0k$wLK%TxB
zIO=MIV;tWo(#9bz`9YD@)d*Mp*u(Cw#@y7cN;u+YzJC%9;jtNcuu~w-?D*1b&48ui
zufnnX0{-v@jIwk_hX{DTe5)Ww^lXT^?+y`04j~4WVj~TQbh3&lQQC_z5b5=~1^4Ab
zGm7g#9BjJZY7Kk|r}JeaLh!)a!7mz1d?b03+2#WTi7P-W=1EH*Z=O7fa{_FK1~q@&
z`ycFw=>7@e_}d0Ift-!WOb}=exMY{=_UXfm_OKn;Y-jLT2@zV4r9{63^<uK;LTOQ0
zXHTB-D!{`0#3@c>Wt;hGA2l5~q10|hPGuFc5!1s?Zyq#Q(6o^i=oEi&m=7YLQlGdB
z3}*x{S+WOJ;OdVsYYw>eZ1}dpB5NKSUUdjRiundwT#FrsjW3u&vj+~nB$Lai3Pgd4
zdCaNjw}90v(L0e;Bed-B21OW}pq%%y#J@TWRX{ejeup@^d}lB3xkSt`@9FwVzW)IF
z9QS_SfpX$LucEeQ*9WKto9N-c5Di|4s-C8*;+|$?TX&2&_FulQ!g^7m=V|2RgD}*%
z)eG32vhYe2|0zWt!TA8RxbQ;(;}xRfNb!5B=p>Fda{c1(f%O7Z4OrYLf<6ge1;ZZZ
z>bJY)q^y<DH&eDUN5i!&)a>Rz`@ZaZ-xFAP^l8FEt`80+V1&nuF$YT5VkZK2bnDLv
zmp#O}E)sqt=V_JuVFd`Y$a`)+0euRyneVwJeo4us!R-^ZSl%O|q>$=`Ku=c~nJ^aK
zF61)E0CIHcoD~LKAD$Y2ykf9Nn^S|EG1w6JX>-K?2;L}dD8E67q=d9=BW^N@U!BLl
z5yq8Puvxy06e=-S%O`+6=2}A!2r8~PjEV#3d_^BK?bA!AY+il$*B#<b&0;O`EJp?W
za?~lV7xT=e*9)i#)*cRQQXY8{5CTWxg5#0+kKsFY!mT_KMI70e57R7To#DXd1vA&#
za`6(_s43HSX^vf5U{}>(%JUi^hpH3Gl93SIp!2-Zrv=`ux{}hKqh1A?^b)NR2RY(r
z_CTr1pMe@49sBfSYGVg~T)ZN6hMSu*X_H8LkE-KtbR(rv3d-3^J1m;Az1Q6dnT!iQ
zKt|E-cHHnJa4hg6Ww7|@%l-`T<5LUq`0jI-eUi{A<rG=Y{eN3-H5U8VpsfP}v-t}!
zFMu(^W(Q*X(vFMh`dXuPpmD7{c<0s~bYizsn}S<L;FViK=k1J~b@H6ub$Phc?Qqk!
zNToUj{zMU+Sa38#xf~n@x9M2}pp&)bl|r$17P~G7(sxxBQ{9e@kglr~mDI?M`K5ua
zRUc3bQgDY{OMfKO!qN{nmVZ4%hc?>M_UCbB1&vsjDW(qdiRO{Qg8oK6rhAv!VNZ$b
zbcKr?gDYtKSluq_H6$OWwL6KkbeNH;@jyFZC{T`D{7KAEP{BF0tEIu(NV2uu1NRpY
zd{D^YLdUy+KT@a@%|dThPkfWrtwcMKO4na^(A(~k$@)-o^ENl;YK<LE99JY7O;A+t
z>jEco;WnSw!?=zqIvv$S*fe(;)p;pia9xDU@I+#_xS`EGo}iNwh_V~Pr){`s^u_0?
zbFqKZgI(=3kGPduF5vKb0SEI8#jonvQpUD~0=t)<8*Y5xiB0rMWKl_V+?ZPyn{Dr5
zo=>+Ux9em4I$Du)$=fxPe}=n8+4`4})yQcv>1pDBa$(Kn6-Y_P)ll4BHIx6VUmQ)?
z<TW*u!TWpj)l%H#n#ow9d*dFVxQR8BAMY3UD8&t_nGBBCU}VX5NoHcdAPB^X0Gxq~
z3AmsYBIMwFbxa^4@gde!FeE|EeNHy11r`2m*S$;F^87$Pu9uIQcnF$-pE-hwl~B3R
z*h3OJ?b<sij)l9z{Gu+l+x#p;iIVC`1fB(OB2b+U07-~(DAAvafKx9sKO3N*XCAfd
zckq?4(Mh$9Hda67o~~8<q;_&QYKF$=FYgdFc~;_)_C%kbcmXvc?YA=RiBr-rYLvD}
zrp@o4mNfYD)Hir7(nf}Kp!W$XTCoy^urUVpCbvRSdb5+X_>E9`ric|6!nIcMQ(hOi
zC|d^Ref&-w@jTC;9D`;%p@ajt2|Rki<<}k}cF)1g?M5a{hFxf_toCywOO2N~_(M%l
zdcbwb4g1_)aOf50F*h_v$FlXo<}s(969I=U4nZ=SpS&=_HV~ypplXB4<j)j_-rj8t
z4Y5^39xad3?_>C%bcrIASi(F5(JQu_wm{5fN7&IylL2}>;f?U<N)*7V+v=7Ize46|
z--0S$=dn&OpqSGS@G=43r3WnQH8(N`4j3NxD{71FRIR;97u$+Q-~e<$fZGMQjUkbk
zfE8IYLooqeQA7HyCLA;u1bdw{$;pX$R?M^SZIB|K@1OF79o6y<V6;JK#|FTc965D3
z&5mp_8!T@V<_FkO2s8^DFewhmeUs|@E7g<MhhR(Uc@h!)HSEoadFEoLM5ku;Ou0Mi
zQ*{XbiR&F|ip43~0&{Vm)0n`5zNtRfFGlFzsblFeXzDn6WKOjOpRyYR_)npH-X`RM
zULFko`cLpz%lm8Wa8gO%!B-2-srSR6L+Z0zgirtIo4~iAQHH27is-ZriBqQHLIl{T
zw(_H-osQ3T*y|mz@qG$QyO3OPR}l}ugNJ0Sm}@V18TAtEVDv!LR*kc@_fY9qP`WxW
z6&F|P)3wSkg!xZ{GoOu$;(|bwsS;Q9Lhftj83o@X9)A1=vYRb#c<^YBcGPY>i<W**
zt)h{uFpV{H!sB=aX`KzD@q^$km~Dgw@TXuuk2gqi<ay{BkIa0KEO-VLOxS_CK3#o(
zf51N3YM#FWXR6_nr<(U*YTyD+woh##O*Oi|M+b|{2%DSSMW0s(#u<ZQ@BciwY8+N>
zI4>}sEKw~S-XZ#~chqIVw?SD&_q#$8ItOzRs2F;B2BgxhtD`W1|BhQ;efj|W4mAEi
zl?-gY3P)+_bW%|lFe0z)st(|2R&`*YA#N?gbx4TE90UvaNOy;0Q~U%TZgoxBVUv^%
z{uhDSI_el_TpHbCjE4WhARHvNR~L^%HMplGn=Ub^?Lt3T=k7#uFfJ!U`vaOYagQ+$
zNtfa-S0hQ}p<fH<FZUFme$|wL`g9=VGG#+6k6<QKfl=t;pnAIFR&<^Urtpx=MiLOx
zL~#NKR#W0;j7O>+Y)V8siD8JNuDIZG<)_<ePaj_JFOt@KB}Afs?6AT1Nf-p_SAkm+
z>EA&rlK9l)Fmt5$QE>BYc75>{(k<^cETN#V3B+P!Q_lbjF+B*gHp4-#?67ca;#3Yf
zVUQL?>IhyXA-_@w#jORT^fyKe99l42tHcIFgW7PxbvP6X|DoMg8YxHPMAvec0xg8I
zv#(y^bDFC4hp06q=r}g@RxnEyL*5XIjh;b_lU&mY3*~9o5#gBJYjf&P$G||4c?P40
za0`T2oEq2tIA6HUxXAJbAPdNSfu7UiB6}SXb#g5HC4dU%*^d}HrWo20^X#NB9YbA*
zEHIH6Udww-AdL1EV%Zrg*1BUjP%$1ld&fxx&NjN!fiK8Wv6y}ewSr^XZmd{MMSDW=
zYwfrK1F^WE>~1<1@(fj4$<@F?=$64XZhxK7g-yvO{ldN~sGO((*8X|$N+GswdGA75
zx~DapOm!1rdJeO%F;4Io7LYb47X)_b1JQe>HbMjC9oyRjB{~@qp<*Anw$*^A(UW?1
z7BpddT-ix=?iTjG9_ld^uBf;jqFBO)l5`mtu4e>8+kO^d6=|;^O(WNHF;IQC;x2&;
z3)u?kpuKR{ft(DI5<4#PT=@@`i@EM0%^T*(cyg^Mls-X3cCB#FDa7_36iYidv9t)8
zTF|}R|1j6DSD`e#CJJrZYZpCx;QXh+W??^s5~~~1oU0ni$%UlyDzv<n0#Im%;SYl#
zR>5%5e#`p?#L;xPkg^~*1O=Hm91-L@UmSs)zJ`!VpJIrNZ`alorJ9Qb4n&ktdn7hG
z3$2B_Uq{GIU<tA|Q(71-q~fpdenL35v^&ARiW<tGk|(O5%jxp@udYGanoX2O%P;;?
z_ah1<LaCP*LcZK^OCv3!Np~vGioVQ%8GrPSX;Ew*Ica$KLb$U?JzMezwQY+h1w2k5
ze!)cHQR&U4L12yj)l|3#RM`-6L!}l>j^mdJZy3PX&%sPq$0Ja@iX|D+f{+o?ei8iW
zzlo+pejj;|rSzS`V{C%08fzznuarKq*H271GXU;W>Vdxf<^R_;N$m9f_QOBjpteu@
zE0%HG5in;(J<SMQA$7;|na1Jpn)LlseRo^I>V=C1p(S%iaJ6DLE~MHW9{;+|VfyMp
zx$Cf+;r>Q(4OI!k7o@^t5gsn1vv3X7S};O8lx_GuDSl6g-{a!<nD{*^evgRX9$L}=
z`EM!pwAr;1&y+pTP(Fd(F6}Glgg_NO+%k=kuD~TB;%Eq&4FY?Op^?Dmg@d%fc0D6@
z4&>!OqNDWYFb7)U8aUBd%NP3jZ97u_gMDXtVpvw7Ddbf!Prz5=#~PCdL51p=`~O93
z0HTLla^EnemIMrCwLGvX)IoCsjSC}M;2SW<z=?$(c!AP%-ofX+hz;_WsIo<Txq^R0
zwc}JBI0osQ`?SjaJPj)DfR_Q)H63*=n!;a38R7r<ZD2QV!%0P|Oo?jfTK@{gamu;@
z@GB<&Qeyt8jGtnkM+BPIb|>DXh?L4a_BWwbSJ@1wbfN)Hpf{C0RfQ1&hk%z5SH>EQ
zb#*xe`px<oC9<4Ss}LAy^XD)R{mk+@k#6?<M5*njM!t=o$P2*FPW0k?I{4An-VXlo
zbhzmj9h&P>=f~fd3c2DYbHWH%+-NUwnjIdu_aEt4v_x#Kpw!Tm(j%a=ePqgk#N*>%
zLVR8e4sYYH!h9svd>4pG==l#ai9yABvy9k=*an_g;(8GY5U(J$?mjGJK2P#ReiBei
zr)Pe+HweXeatMDBx%hj%ky4<A8ar*r1_S#R+;CDoLJ;EGx-H@^zT~}-PI1KGERb<>
zwq_pfSTr3yQ2>ivGHUm0#GQ!>aqFSwy{8Z6AD6hgA<^T?Nx(c>!d#%4$2u00Rh?%O
ze3$<Z@bR%ogk)iP^Or)9Xyt8N=)_2JFL$RC6q)d{NT6=7Kdn!N<g$!j9U>w7Ld=x-
zRdB;T91b)r7|$C~OdGqT|HeLr%eUHy>Eb2><sUF%;d=vo^aL6U=pwN?@8C^>LTF_4
zGqk|51%v6n%y>>FA)$%C{}+P$v?C+5c@+4T;^a=`5XU#h^T`5?*{6bW1`$U&z{qY%
zUMWsaOy)66PhgJqaOGTrW-D)L!6a|xJfC(y54mtWBMEng8TkZr7XJ~b9T)55+sw*5
zn-n2}SmWjSGlB)WlZd>a4s@{(r9mWcANXYh6c2v>ELu-#KZJj9A5-9~VRK_G$%z0g
zs1Gpj%(Er)_#=N3%Hyrvi<wEN+R80N$%Y}r%7&?3;;3{^iH`HGDIA5KzIQJ=RL}wQ
zv;QT8q#LRaDMg>-V;79mhN*HNSVXWCu#tM=(*ei_+ML8k0?x6;!VdVY(G+ML2xw`0
z`X3aDuw!)XTimq-oHg8d5(id49fQ*;oe{8^^0ND^S!%tm6bCc9g1b&)%akEDPIhA;
zJa)QwJ#W`ns9hliW+e~IN?V0l={K0j=<AozkCS`sAxKrI|4h_>HFI_%d#1ZuiN1|!
zem%@{r0&K+X)M?c7-Qu8Y8xqYh7l0BZAnp{Xu>(HhiOEW=pRuE+lPVJ%i;bfyjb3B
zB!Orn5W^v;%%YEWL>D22G%2%Q^`K75Tx$wB8s5A0*`?U#9l=fB=hvYnI9cz-?H*4w
ztLBp7aMbpx^`YUBx`_Wa`JsTikbkyn-i;&zb9ORJ*DGxmebX<dkH!=<g&p`f2P{@U
z+evLeo(svMm>m2PP^K`kEu=Jf-k+&TMuCY#Ir*@3h8rk@@cNY!CYGpKw2Q%g1GxGj
zy#hc?&36%=u%=7#yy+pJn-g;6RzdijljsC3#$RZ=#d4sP#yt)Ke!?g$dX{%Kicz6y
zXcnjZ3XVIL_=6?${1N3b+U5$x;RKQr{Rg#1tCr;U!Mb^L?%xwZE>UeLUW)BNPGfKN
zme-c5`x6v}`+LN`<Y63Z4&n<d_ke`#f`l@R;mT?UhGLG{lQjoj!EGr|;OgC`jDA@z
zRaO&@=1zn^WB^%|S}132@E`<axJYgL9L#_a52urj#a0V7#G2HCO=@7X@`xRb3Bm*J
zumClav9cByFRgJ95h>B1;AtLnDYf??z?(LwMONO9U@R}u4y${;Llm`Iu4a*M=-9Rr
zxtfI#Y6)eQ19dj4J^3fg`@|xI+mpW%?|%Rp7i=Md&mn?Wh~T$?CdvGHP>|y;6cwa;
z9MSRXJw&ZRE&d<B4+0_%_HLFvSTM03iVkb@lq@5=?hF;@t>_;ds2d?*AXsz68fvpu
z?b61Ai;yTm#qlYRP(cGgcpeHUx}YQ|`XFp`TKox-Cq291M+?Bgw=co?Yv~%af=;cH
zjwuA1mB+~B%Qmm0nUqHBHQ;Co>GJUOLh5&7B{C6vP-@{;A$v9sJrkwAuWuLPo*Iz+
z<_sbMLzxphLp7V>8A|^f#s4`mSnKdwbL1p-bMtq1v$6Gm(am{)lj!|wfd0K*eH)U@
zX<fa7y1EhZVzjQokgMVlGR@xk;CbnRnsiEMav&+gSB-kHQT(5idaXJ7Jh*NZ<a+Ge
z(|buw@c9M!I07Ctzi$AlVa+0c=cfub7VX*H6T(IyHMpr+zulm5?xY@712{Ts**itG
z${iTy93q8MEW2^f%9cJhpoI#Wi3#A`DXPH0XFFiN4+XlGznXMg-t9UKCtj7uTS5Np
zgzPQ&g9`KiBLfH<|3Cs&AyyYbRrqX3n7v_nGgDPUd88HXPdtu{@J|v|CLW>cw(_Sp
zqK0KhuoA~zZot*MCIt0twR(zwByQP4D!&-{TIgzj8xJFB`f!yN;tNjD`uUij)<W_X
z{unDNN$_>_UbBf7&;FOGNEt)gM8w*jUS=V_7UBxm2pnfB_mLC*nf!xB;L(Z|^R)=1
zoJ6on5<M4Lfdk58e?TZOI?#+Ai1|x|aZf7NPFgf0@u^b~ZGM99ess;6!JOU7hDf2?
zeBW*q@Oo5-S}S{NB}22XpY-rhgIJG~_X9oOK(1Or6?BCPai(!_Dcb~7J`(6o9(aFv
z`KaD{c%i5nathM#1`~t`a*jwxb6=xU*@@Ge%aYBJ!eB0mzw=2H=|!5@$3rH`BXp%c
z+ENG)Bhxx*4CT-C)=C1zJ|F?|Q5{4STVU$A&4id|1!4|pa4-^xnJ^yF=7&Jc{#m$l
z<7*%$PatLjzpl43xwP~{$(+|DN`3-wgb)05-VsH+LhzT-3lKE}QPA1oyx#(%VI#}(
z4yz)<C383A126ZYZX8Mb0`;VZax2|DdO6UGJ?416w>RNiZGW~wv`zS_5U9cDRpj{*
z;aUXoJ-sdP^Pi!b(<?~bP4OJ6fy}&+B<;88re&N<f?|kVw9228d)i_Zhf!_D2<Rp>
zEZ5WFGA3N9(q}d%Yw_!GHR2ZB`@Se!S(Pyj7#Qs&pZTr$%mk=QE7&K>${lSmef|wK
zrJ*k;IU9Pg#1spV%6(a{Z8&u{z8qgqleaaByZiT*1-2W5!t!UY;X@}b$D2Mp9N4>X
z2qn5gb>}2`89sP)1wuTAo_^~pdg1-UpLrEj+e8MWa(UaweYovo0g&)v>Xbb8`YVWH
z2sOO;*%V$h@?P0mT5_M;@I}~8r~&ybIGTj8;nwtjo`R$2a1Im~N7mDFC{B8*`25o(
zaoj7JoOo(<4n^x&Qs6!CaTqr$3;_68OVKf<)&<rc!uPF^Y}t*QVIU+$XC&}p)ktL(
z)cA0Q;{V3}0&)f26SqSP9A5B=$~F}=Lkd2(wC+4VuSRdzL7ub4awVuj(U2Y%+(>*F
ztE7MzTgMajh1Y6vz2KzAPNFVqMUkzP^|i8-c2l3Q=7JV9;tSPH>a7=IPReO+O*vXj
zJc+79b@K|W<U66d0{+b_-?6ioW0Hj=Q4Rd42p)3YOHoduTtqZNsD(tEvE*hg{@}Oa
z`#ao8Qdl?zz5>9<m!S6kI8dTaqCBilX?O(|QUI*P+I33W<A~T6yrCbPuE60Ih(@v7
z%C(p=ON%Y7z^-Tzc(GQrS&NnCg_!q`ui0!HAZ>t8m$7}3SXpie-_r`QuVOd2v5^bK
zAFx7!w~TAyLS=_&TFSPIvw_fZ3w;W>vE@DZ0C*TQxutAxD0co2P-AkG<=t>UEwkR~
zc!kbBq=eoK#k`l`Ey8ZY)dgkqLxG*kE>T$<K2V|-Y!4O}>sevP=D<$l5ZujG)>zP}
z7Hn1njZ3pa@c9kJ%H}6=DQ;`56eZtOqO$=tKvSaEBT!0YSWPkPPj%=GZi@<hYGmR*
z^AM|WcK?nh3T|S=X_QeZO%NbAKX9v#y_VMx_#>4)p#a?Zrl1aOJ*>d=r>Gm=g%MAE
z)#k+gc(>A?e_BVlyPF2MDl#J;xgr;{8{a{Ss|tP34OSTpen%(2Wj1QT9u(&ngD@W{
z(T_1hS~9m`)0E8Rd0)`T3AZp<isAl@WA>D(fu<1<6Je#f!ZrqQL;di)1Q;!93p6Ux
z8OX_Quwk8nP77*9R^~3HxsGGpcOVm(7VHCRpi_yC6?NV~moR>iwIIN1tAPnM0NDpu
z3)zt4af{GZ=EgQ6Ut^_<Wj(l!G$k!5sE@4sDAc*ELZU$H?h+_~9Vv3DK*71+LcvY9
zrceO=V>r;Rk7;p;?hoZ7J|}0I24U!d#Z6$K2^4Vy>_|B1PMII*?GONg6pmg(NQZr4
zp2UEDh3p8xLHA(;*g^JN1PcR=Ms_b+lAd(0L}!3b%e(VFbQd<R8J(e$3k?^4d_4vu
zer@Wl25+o6u^qU<G8|!_h63GWy#X1`9~O$?zU)_tyx`vstDl1{cH#<0KG#R%#_7xs
zsS{S9aD**gOv6YAq^97#Xn!PLHlOWcJJAu@8(xcIq?3b#8tz<2Dn4Ao8c<<x7Ry@$
zXd{)aAbw{kuobs>A4}w-I)o)@F1riPQDM>$-c0@*koJjG7hQ~F!Jx=}i?aG?Su;QE
z1by-iH`Bm;2y;5o=6-!bYG87Cb&}{(I9m6ON|}>v^3J0DNwci75eSFCG~<_GgA50X
zCDa%!az%g-7rvP%#%asFVC1Dvh!@Tx+;Jrb3mCxnhMH(d@Ff$v{0MW9FCT;PSc-%W
zcuU~g?+~s}m1C3755s_&94kww+M?1xkthrM8roq!P=f>x(-Em1yb&d^?$BMG$6;%R
z58yu#Lvn9fo>sJ-ANmb-5&V#WA2RU6_&vU~{3gD`ms;mjcd^W;+Y7{5d#u6xRH(~#
zp#m25lZSl>vU3BTv;dbA0?1jr7>O?<5<w`!<b{~fW)l77<8>vH=-QSy@$Tc-!hZrn
z$lR21rJ|p+_WUrrH5cnW9Jc8QF8Bah5Bl-;Ao2D>@OJQbLj!L|pIjIH7T^fp?hY}}
zwzVmzoTB|@tTV)p;u7}wB0CY%R15|H_nr?Skl=yK>7_pcKWNh3v8hj>T=G)Od;Eu#
z=&8l4<ls9(G0!5rg#tU2=tN0}N|X-0ftM?_<j=;8x%enTCfyLq<~zG@Ta0m=RmPe}
z!E>5u1Uy&Jh~q8G`?tA7+#R97hmsqquM)RiHdkAd;=jv55Q}aGpM`ocMcJ368BJDi
zE=921Pj4i$?jV+nW5mbgowvO#_fKSL2g^kVab`51ST4L4aGMC_WEhk(wuxw)+<y7I
zpA&ftumu~2BRAQD#b&_rb^$A>#v5T}6(RUb5iJ9K-H68A5uD^4@RiF}llYb(ZV_Vl
z%tu@3rvZ|r)wN>Ssd%DOlH;&pBNjq8vEP7;ApIC3!W@`JA4lNj$d&5ITM;l1Rtg|Q
zK9vB0UKoUBdG91>z*>&cwAjgCSVe3NlfX@r;NY*tBnV;>XqW`$m;|}~C&8(6prUsU
z1m%@xd>hL5(z3jvn&v=|=0GtKJ`%~TmuQ~m04=`q)-zn9B?x~KL=_PJ>8BJ(@&=~l
zCoC$2kJNYB1M$5$xO^**JOg@zf26zWPWqV5rF85dyWW|F@7M@wwyQA%)<T8|ljGd1
z&?$5^I(3hXa*7yd8NQ|0m~a`_$$&%0iEd|>CKAOb^g8jWy-eIxLSxs|MBmRt8=?U;
z1p6Z*@j*TMOMlM~!Swg_e6ZZ&%%T%Fj?c_;gGKwanA#Dc&+4&IRwu>wi0|yF&>G`g
zd2gVxF$p?-)W5zJTFp^%f3EuPHK@?0<T<mHyiit9t7)vpJHR-I1Cf+tO%U%9mLuDX
zC`|+L|2j7=#>mR0#`5qQ&ZW3Kit|w%W<z6;;yWlF`te8#FsqefJ1Mrucp+TFsRh_0
z>7keer2MkqT1dX%?muv_BJ5~AeSq-c>GT+h0n*GwM!!K41B5td?;xcIsJw50%mk>K
z1{&6QyU{y9;5sxwQ2O;Y@xL6OP*x9Nq7x0%0O9-vzH5j90^)|rW>j}1HrUuJhG&5s
zp1$!G;{%?xNRAK2f`+AcnB@30_8Xr_sy)JQ58)S-5Xl1SXJ*kLggM1^P#o-GGqZL9
zE-^wheAi(hBN8$>KyE}1{-4HY9qml$EN2HMjJQ{g3`Q*M=0Aspm=3S-m<;6cY8mkH
zMKX}jACQ4Uevb%b^V?)Zkk6C>jn9yQaz0H4X7LgksNjV%FqfY#1I7F-8JN$#GO(EE
zhyWv;ahnVi+vH!vlTc%91%<f`6I<c$$nZ)E?~>u?DZELBU#9RH8K!lb|4oJ)D7;dJ
zTPgg64DX_FoeZ~Ac!>;mP<Xx!a|+)r!<`hKCBr=wj>s@MEAgNV)8Qn3u?&;I#`9%3
zkHTllu#dvIGAxctJ7u_#;(J~eeJ`f)K^YEGxI>2Nz%zeChRZ43N?|i~e<DnF)B464
z-|O=H^$)O~y7;rA1is!D@cdrJtdKFei20?AS=L*Vpcz^m`|1kkA)_uc-XM$OxP|9l
z88cnR<Rhj+##|_4up)bIlrdvuOfh02GR7lgf{2+WV~+hpkR^2Jo?;o3pqNzmq|Zqq
zzG6wXNe?NB+{B;H3)R_q@!wMlmD5#A&}c>eMoTj3rEYDayQBt^IY3@+1M8nlts9(t
z4YyI@tGR-`!<7&U4cvW`B;%lhWd1g4kheOm#47#YSe%6a3$9>o#}!p@!ID3Fgy!c8
z0&h5hH-r+Q`56e!Pa4q2sVcH5eg~k>z1RmRzR-!URY1hIj67UA5r%(aT}Ig22<Xnk
z!e%!<OX6DGQ{wT-5Ds09`0VdT)U>0tE(;ASwR6C^L{-_Ly3k+?rwq!IPvVnu+@9`O
z;(lc5?bml8_$|QpeQ+mV=nr?B#HCti4_l4B$o!0uIS9D?8C5h62uS`naJdC-p8D6f
zp2|<x(HcKWey|Q-tGf|nhdOUcf2;136@BhMr+v0=EBu<%pRIeX?{jtdP#t}*4vU{V
z^})K9q>}zv9nPrGD*nI!W*wtbEvYZv$$p#yzgPvwQ5S~6f5|@CnPr?u+B2&aamE*^
zrOg<FQPLHeo+HzZLmH|c)j*%nTLDQWL%$6D(E_O9Rt*Piv;dYVBZ462a40L+n2I1~
zX(%htfG)4mN1p-SPU}{B{rqjZ{3y|PB!597PST{;-v2BI-}r6Slr|_fWb1uC2R<nN
zu^FPTQWj%7*yAB8hUhw&ul;LUX{<rZoxF*OldU2D6#5hZX`MTu8G#5`OxcH8-lw1?
zK$i!?^I!vtCUFe`h70~w-m{?@PkrecYrXi=b@knD_X$#Y6_cO{y-B}wlm8n##b`bm
zZ3sKX;8Wlf+IVTG_!9^+F#6|zCkf{%nw|X(6~93AcNr?q<L^H&3>E9}_-@O=E^_1`
zlsriLXCSPfrD900rGoA$fOMZcgU|1+iPws{HEF9L0~&ldljrgWWRq9*W<1?kaa*cM
zLe|{xvQ`M*<+EJX&rqHF<fojLqdxKVCJc)QCw<+iPc|io;ss}tr~42AC7DfRqJzD-
zT~zD6eKoarfSx?<mjQDTHV%+&@C~p-JpVO}09*`vw35*mzX&YX(((&K+j1!3EbqWu
z2o&;$QKFC8DZzUq5(MddJPQFzSU?G&m^c1UduIY4Wpy?DJ6T}J!URYl5s*<pqEU>1
zZ6Hu*V4@REU}RBjT?koBYDlKZ41yvA6O=H-QfsZ&Es5AttH4()qE(t8o1zeR>YBRL
zCk|F>WpT~-Klgbi2?1K)_x<|z_kM3DT+V&&dhWT~x%ZxX?iNsONExjI>_Le1y$2<Y
zrz9NSkDA_pSs<U{{hao`*YdvI^xn|r{iya{W_e$WH@e@6_Au@uo^uL$m6@SCQ|4O1
ze3A<H)(I1aWsF@U7DTIJE3u&C&M%SK94$onG;pP$HBMrL5-$}G6z+`F`Lv5JP9}_&
zz@*Ms1)u`dd<Vg;@8xTeTfNoCYbggw#@+ccq52-8GjJ2b@x;d|;qQ@Z$FC*3y@7GY
zZZ^~<p>!@wnR_}X<Nt!?k4%^44<{|}U=k#hct5_zt(FHna?kVfS*|EPCWO9hXRgo6
zttSSrG_?ycqwdc_Qq@`edDPOx+RvkdgF~@*+zlPh3B|4f)+er#uaU-Ga^l!a0LVJ>
z*|^p`IjR+%futuh>1oCfPaI(x5p;(dXetTb2@5Dnf^U|JkyLoEQ<`bVrjSf%$ndU<
z6|F)2>D4x#Sd7EZSjF+Eaqt<FQgM&VbZmUe=b_jS??BT~;3}yFX`r1cdVhgcZl>tP
z!c!SJHxiHKt)we*!EDoe8(95{ICKi4Gvea(a`voSI3MZk=gBSwsjx(^z-nIGExkog
zxqtWGhmVJ@^;VR3S5D|p`60tNf2CYQ_&5-gUmxUZ#i8ICMz*F&(J1FpvcI}ia&D&2
zyE;1PJ@U#V3gW(sTC$t}M=jg#UNu(qCL-gO+i<1L9eFbMB;D@hl?r{|#@M18E8)Te
zbIoUS#ShI0Y{A%RY<AbG43X5?5;9+4kf$Jmv9)`m!rU48IwRP}^e21A%30t+=3Gh7
zHEp9DKR(aIEtoE^M+EHdC#9CcSvA><0*N)*bH&9jE~mMlOcE$%ND8J(=-@yJ#pQ^(
zL9n=n)&A2_`Jpw!G>?Cgf!BTbGY$^~T`sG}T<AX35`!$1W6Sfk9hu>i+=p94+%#}z
zL(YBTI63XwXx4(Yt<NBwUp=^XkKN7FeWwOvvY%ZztaeX~+-5t8TQ9CdJM6(UzH%Ko
zZ?n~TncK19tLV=yGW>+D)VYi>F~Q;dZwpQe?Wk>!3fR#ag;@2qkSsU`(c6*6a*pqI
zD&dAC92d$Eze{wj+A%8X(7vIahu?|*T32;${S^`*DiC$}o#UKdGB2Fm)g)Y59F5B9
zX7}-tc^{3fOnE#Ya-4WQchlbMy38znZ+uHmXctVUZogb?js1Ni*HusmpZFq|J{bs}
zF)sdEdY{(siM*;Q<Buwhy~chzgYW`@%NPR-e@PRUPAJEM2%c@;j6E2a{dsWsA=f;v
zts74fTnp$j02v!4E?a9Slg?VP3&Ze-*^y)F1+!#_O^&JY7oqz+?!drS@VXoCHjiL*
z{@Vi*DdE|C4$P<S@TA#A;4Og(cYc$3CN3A=x>*OAs}P_@CYa4tyA~s)_?*~VQVj{j
z(%iy(jge`chNQ2inaslN6eoLlF}XTwS7F!8!h5-`Um?|SRte5s%!20w)kCb|5z<4>
zV0Blry{GQx`%HWb!2M(>0kc2~rd&fjZZ~}cqkSaY-^lGs!ekHbB(N4`@R?bh-sRsr
zi}TDZgdFpPIVhENk$JLg@&zI(3Re&~6^lK9lF{5GV?NE4=N1p64+csy>GRAZYBq!u
zlXqNe_rqtzK3oSSOnrvF+9}OHg)k)$*cB*YiYdJfPr2xjV7w476id9sbm9Dqon`!F
z_!7w&kDTbbOp(9Nl(w1D3>+)!2~#^IpG1+DTFFOe%AAXFI<hEuL+$8uB{THP5?B(7
zNC}AukiIKLS2#u*P+ECs%4QM)nP*5qu1E#oE{{UQ%T{k^$|Q|NU{Hy4s_=lFv8}gS
zca%Qn%88`FQGm$S)XUsZyR9@L&)p?A0F8ViGH@XB0Q4(?fk^-JQV}mVa!(7P{}Q<a
zVATsxO+`32#1UlX$V45oaUsczWPhee_M=l=<mDZk`j*s3i@bcVUay5F!|S`w$ZZH<
zBj8uZoU9Sf^n~g~35%QSR7*46*?(P<fx1@2Gqc}9ewRbVC;Aam<}bZ--<k56&x(i?
z!$5E0a*6ECK2VkJ%Br*lP7P@XjfkUe0wds2$K)e%FmAm^I@B2?dmMbFk9{o-e7jj!
zCLZuT?8fcXXvj>ZaS3^2kP`<T%Co{o%Hg#vz7U4#s3U>Mda|1*H7|Hm2TmkWU|Gtt
z6Mxmj7Ht7iItaBsf}LYO#CSyj$BP6nqvt^y#N@u6!6~&<K3Yy~2gk6iPvyD9Kmr5{
zrfFRt;e^Lg5zrZqeH;}82yUIONhERWhjAtdLx11hkuk*h9oAZ>yuM-%MhI83q7flR
z`VqU{-T3N(6+El66FVEh^BTq`@Ql}Zekp@qYbSW}q)o{4HRFQ_`CI_Hsht5=?UZbd
z?&(LNJM=i{3fr`3h7_GdytN6@B78I0`1r0ajH8Z+u|^hJ>U&Em#@hs^RK}*RXyGeB
z{haJXkDz|Kw~&LhL?3o^O80nQlhs}8Ax{#RbEF!R#OnjMSt*qRk7XC7F&fL|98U<S
z=b(`2G2&dQmu^d0rsjnr<MFHaF-(}kR2PK;ADGwGYnO~qP{HvHGx`}9GPbQTztiYw
z<E<xqDz|pZb3iYS{G!t{KEY%gM=&vPmo(|3P~Hc^&ZQ-Fri{sxk=LqFxfp>UpG!0`
zdZkv;#0U?nDKH&8j->#pByp{2v~dx>%uAH!n70&Mx$+iCXg`v_@(_4}v4PQD4ki$#
z>3GJ*Ov;D~ZNScaWnmP8g72`ntL=0-8tx)MUSa2jA=IFV2(N5cN=})G5gzgCC#=x6
z<fwg~G!9KevFVBjvDID=eX`ABr%S@x0k$^sq|uC4jYGVL>(wGKn;wqlaU(Or;rm4P
z^H5L+=UxqElaygfh|c-qg>VyIT_^&b$LmYByn1dI#%6%?MH%3^`To$@CyeIMSnuI5
z3&`BouVX}Rywx}_FWLz0Y;BMAL>nF?nVsP@7(PT?D32sa!T)>@%)gV)n3KKVv4Rg%
zBd5@0w|L2wBK=ZU!-czygLl%N7+W%B$rSJwz6KT#5DHxYZMCsCVuNE!Xyd>|Ud&=k
zr23>CE<1V&oI70o;%et5&~IAEURdK-TR)7Iqis}za#Js|hjGm_BE#3RgNu4L_!ln>
z)QT2fnD`16o)X%uyY2TPA4CbwS(&3@X+eHkkjp%vGuK9;*xVby!klB%g-3U~wUXE;
zVql9=oqZaUU<K5sap*TZkl1I<VcZ2TCWCRhOi_QnUb>Jhlw5OWMHcIB(c&%Bswp`X
zifvya8HuzI8?KLT#3v_oiackrkAbrO1}K2UQ0OBMmwnJKp8YJM^pZ)#oK)^><}xrN
z06~LSwKt^FqO|BIew_YyraWqS*I3@c>vr-i7#}e8oq>703yDz7Ex*P=DA{!;jAjbQ
z%`(qZrhZ-L!sRDA7v7siNI4g_#2qGE;ttbU)f&x+i#05=g>TOZJ%?z5C3Lfw`e3f3
zQaV%Yw9(KJ;XEp7N=SEn7YvO{<erVWs_ws2$*DE1FG*Nak*N4%UZK88w_6UAM+9W5
z&OtusxucW6T$2AaG~jtTo-c9KJwuuDvkwOl(h)vc>%5TvGG)$V{|p3Kdy3oy94q=E
zh^phkldIg&p^kc>XW|VicxHFh9?`TUktH|rtXE1UkEUEoTQ}A0eR{i;iF?gE15=Ni
zfJqhFT4%~C;uG7{Pn~~<$TT0;i!pBGbIP2==_x`S%O?tDg0V&hA@nV#{7gB2E?>-N
zL$Nn<=6uzaKhUxla{GE}T*qQ=b5R>S`p^=Xoa5NU0o+!1gZmGn&pgIm+v>y#HRzU0
zG!A;dJ1&QbF4mL%OklSs;~C_~o@U>)_nKNJRMtO7%x5WNPrOcql)Vk!eZp6Lx(Liz
z+D$PI+=lJ=TNSZ*buGT&10%A8w2x)_ykGWmws@EG-MQ@AM`Zz)S-U7%1xLcaSno&;
z$IndT`#rg%aGqn6$YqGYWE3|mBGQvIwa)Fv0qI%XTtEghV5gnMAStysV_z38-NJ~-
z=~_#jd7^frCl3izr047@AHce*pr}g?jxlT}F7Du;@?Mw}B|KctGG68YSQl)!F_#fE
zY=_%2ZpUVhC8W)SSHv}M{!2&TpHfhu!~<;X5%LMXkQ302DDeV(>SHfqxFN1ruOHIk
z!E>|&JUB9^pYt{!?^>NtkWixB^3=?Emq)XB)QUbcYtD?kp;SBNkhyz1{10>sF72VW
z7%`@k*>&840}6RESU@s7UV?&!yCn$pyih7GN5qI$JxzI}mBh;l$T;IV`Oe<CFcp`Y
z$rGmp9cEP;Z&5s&Dd$8_+r#XlMYGVzG8I$lbtYULS3P^|Q!}r3y?rwqV!_U{6cDNC
z$NNGXV;d9E8rXk^K7DuYG^6BJ>%fJ}zP%cxaotb25wJ-pEYI~wldv?jar;O|A8CyF
zJJGX=9==Wr{FGFn-gniaUaZu187ts?^pKU;Fe*w!slKWpkk*&Nt4n){Yh7{NhBcHb
z%6hmS@v=nS@`225$5FA@^kb3$&uAw4@o$(#enG@Zo|Y-kC0wvqI42)Olc%w$SC&rF
zYyFx<XL)7h2U&z_wcFM6<(&^-?Gv&Bu`NxNnb4<EW`-Tek(TzB?bsV-ABcUQMW_t}
zu_RpN2-UGECac4Me)J(z3X2!2t^Uk=?SB%=(tUlA{jl$ZK9SDpYyDbue?D()YSHB!
z;ad67s2T!`g3skZ6nx$YP*2cfd9%=HUSpBcTJ#XC1|Nb+X!4+3Y#R!atbJFHssV=F
zF}xpv3%x}@NwEe;*;~{-O6CMnRUW!HS>|@1G3}3nilc5Eol|bqZ8GI<0*Q`It4GNc
z(b{g0Z|y24FX2Q)-b3a!XejO%tuz)dZR+e0%FmNKuc0rjF)}xVO0#{&E`%VYN2T!w
zz%iOgJM_gjc)Cf(I;rqp&DPrTeTr>Q@G*segvgD%K=W&JtnrK1l~(WaFZEcnSt#VK
zU5v#4pgd+kX)ZifjJ#hT=z9*NLgk#$!6n2JCNPhuwKv<~hGZU3$Hi&%BP?~ly0+z;
zu56)P523qxrqEqaEvd4WG^BHo1ZPa;^3I7o+dz@H*2w<;3aP$m*hWX4=9hV*5WmRI
z1J-mpXAyfEY^NjMIsQe_sBxj2ScSq?)JfH_i=|twQ6bc#2tHv$uj`pmo`|46FR^<}
z!_g!|zzcK>K>5OMUBbmFx;@Fr6>n^$<ypvz@;?*P6_-I(1{u2CT$vx{QTIIdqoWy1
zi4oc!ewVZDqxeGE+|eS3q1fG3;H;TK#_OlnQ34NQx^q-0C7(&f{d;NkB6Ik;r#=VC
z&c7m^XwPXV?96^i3zBb!r-B`l!dQw{%=v)Qu=^M14!xWMw`L2cb*3ynkB*RX7$TXe
zvd;t0{E`R@*Qd1O><KkAO8(iqmtLl2$#=Rlp5xs+9&YHD8@&xt$4^3gxCGGZLCsyg
z88);+_*hT&(;|Mpi_<isbcg>m5+3a~I$$`N^bmQxVF&Er1N1&m_KqbysfY%@4U|;i
zuYm6CmxFJ6LJte?=E)9=3}k;#s7&N`1O3R%vEn!Q<Ye!X_1e=Nmy=LV_O_*Z@is$$
zJhwDXPnR7oK4GDgG@E?O_cU2*dz5rs?F~s$RWD^-!Q&}8g9FdX3mk0WJ0{tyVkdcR
z3)zs9*EYf*Y?hknkZZ&f?~yVu&CoGdM`G3zlgpg6hVIC_t;p}@TRT5sLF0!Z)*S0$
z(8()2;K}}*qi#PPBR9gBJC+t9L8%4gP3iDC2yT9-i$U)ek{7LVA|!wAS(H*Z^MFWf
zlH5Hcx3iBWCH}W9G+bsRT7)CQV(-vGn}5@R{RFm10;04T(A4WsOUc6wO*Ti}XHp%Z
z1}S}HE9>Y2ou&)auBA|S3XQIg6yq~CvZJcz9wmQz&WY9;SD$H>28LbaE|*!dr-O{s
zbxE}BX;(?Q#ZLp5bYYicw^j%ggmJ@Kf!s7j*Z;|(IWeJp`VFG)J9_%Ria-1zf~Q^l
z_U~6iyN2oA4iDl$n=>dLf~a|+u!pV~pBv&ng%7dzIZ)^Uv)#TY?H1>GNVY#~-11i;
z@&T^0)+rXOZgd_M=QZeF1kpon2%L5`4dYP)3)3XpEMNS}T=fuGDDMuvdQ{L=1Vuq0
zL1hWC*N6kZj(c?++*`s78aZ~Wo0=WmEWONnqI<_l?yN5-Q*v6!molI4HMVommm7NC
zcnTQW!7_wpF1pdng%-tGy%rls^NT%XTrD|ogJ>e)y$<X{rrfrkU%F&m<>c=Up{L-4
zeGPU5y}O0Gx0u4+-$KT<7cP<Mmf4IoiA=UXkTRTbvfV0JFxgHqvN;koCmW_Mu2{$j
zYfZMkn@>F1cGTz;I%Uyf&bNBe;tKhakkv_%&3JaQB2(^zpTabLFXXaodN9vI06pdQ
zo^RzvdN}MPV=Z}`Xmqgh>pcGaE0d95_`gL=MyBkq&?OZnC#i>y2PWT4?%Zi%0(a;w
zxoS7cm_`QOCDvE9tYTkw6AkMlT{WlVXMf<RdkOm!^cYsm&l!)f29Op@3H&G-Hf6@;
z5<=ZWgz#jQ@+`->OK*_b>T9mp^YGxgi}(tH=U>>R$>kwiI?=%}k67-ocednB92-2?
z+0vz&uo1NMDuPAz_TY%e`;n+I1_3M4tbtxGhGk)=Yj-kUZ)a}KL66z?;QM*?XA2AL
zXJTIDtv~l0c3{ZKJo<2Fe;k;YH}R~`aSUV{C5O%HWIr@q6x1xU-d4VQR1KMFCR)E$
zipELw^W<cI9T4&IceEZ!<2K^30J}$LusyINuRfim@8y$SZMz^_Wrhe@A=VNCij?yS
z1wblrE04F!qV^lEx91fa!gHL*F}0Q(KsPg+;k1C0yrI7CnkBJnileTXWZhYp$0~GC
zXbdU5eoaN5Xg+tKq|CKG)HNS|hiaCK)2mk#E^p!jV%#V(3J=4l98|`uQt1?^ByVE*
zK@}KIb38~|HZ(?x98<k)zIX1>o<W0Mj)+n)(T3ONsMR}2=vloUd^YRCeobMifWVS)
zHK^Q-hlNT<6|ELkZwFO={n+poWa?NUj5*ldz(H)o1yO9@td<jpyuz05Z1T8eRa=3p
z*&yIn?=o|6)XB=3O|888QM+iZyX>S(MI@7@2R#yt&@fC%rG?rawH6L=-%-Yl6}mwQ
zlI7z2-tQ0rfMMqlw80l;c=wsDA-PvyFfuqU(hT$7+>DpK(X)BXZsi$lp->Xet+@gB
zi|<Nlwg>yy?nWM>R+`coLTg6VN^ll3)6kzY=JNrrOeJ?R9f*t1bm{md-$##QnIdFN
zdpO^i44N{PbBoUy_Lwe$@VAJ#Tp~L2q%SnQrWaDj>SXt`jUw_+)^>)=Tp_YJ>^>*4
z*8D#5lU0g7B5O0oTn&qR$eaCk&|{3GMBOye41zU2OoTG7EEb);56Z0_So2&|j^0>k
zW=*WJ2S>=lgLh&fj~Ve5VVfhjK*Olhj4wf{-+0F+In@{*L&HRWX4d$?9ga=Wj>n#9
z{gXX@7boC}a%nmIq~ozx9@5Z?GPi5HV+Di#@o+*cuA>Am^G>qD7VbM~EAp?Mt*dye
zH2629B2o3Mx4k+?w~c4Nd-SOj<o{9p&$wyH)C`u!pjRZ_B(bQGA;f0<2#*l)*jHq`
zr_CFRlFHgug9^B(nNy4#2TE$PZ!GeENpf^P>*xV`uKP*aHx0bijXnfenF$Q!SuhX5
zG-ESa=ri>nV=+bLI!3Vb!GSt`=o1z&*|Ettu`;iH4?C@fOD-q|zjG?hjWan8)GrFH
z{%Z|ajYM6*D$hCgb#Snc5!Rf#77j7ykTR$1V|4~1{L=9t-l0#>Lr}L0+d58;Z<NHd
zUkkkGS+(SxER=5&EGMed-PY-LY}qS^dnx?K(-Ti?O+CM<eeWC2AHqe}_gyc9-P!xx
zj;Z@-3i)KDnVFrzp~mJKDOLi>8P9903@sf~1cB9~8nNq5PMfjuRU$Pcwz?(mzKcS2
zx=g%=n(2yspuE7nIgTiD?(a3vYggrE_H$3##cOQ1OMz|%x>x3_NF;advz_kf*K-@@
z*xU`JhdnDjnf*MIIs@|~0Z3sYDFiM?9xZ=mT*R3;3<yLyB2gx~YmnF&8}TI0B#ASe
zIBDH+%m|+oRpLyFRE+QooGH^~63(%B*r~Ke+2Y<S6K)~9o7~%7y_F9_F&N+c7*<YP
z9&w>y<RfxDAQdddu5r{Y#t(GRy)CO5>a4%J<^~lP>|2AHh?sC}O;M)(OK%~9YH#I-
zKHvtiOy{n=Y{OAIi9uRx<8iNw88sR87;!kbxa6LwpFGX&+}06>ezL{m@^<cG=C2-_
z%N`P1XXAqX&{7-KVX}4Y9ZwOC0&2u`0Z|j8FZxL-O(6x6vx+-woD^47D?Fa5ZP!m^
zRS*bL#J2M~J9`$;8#uM*Nu5w!V2o>JMkJ3_<~72Vo^$$zFUZY)E9i&>3&!q<jth^s
znv<Eems&Tjco`PYN{gII$SL5Ecl2U^fR(fvi1M<FM!6g}%EB#7PwFPL%cN&ixS!BU
zlP45*XM8LT!LdSip0hu3)EPjxRz;Va@y?;>8tz0zztizsX@jBH!b!DX#4Jk%*{VT!
zyQ5!Y#G9J+q)M7#Q-Svw7^gb6)Y;?<;v^dlH$>(cHz#%-KOybTmh7!T6fAE=!E*S@
zp7?nK*<@AwMbt`qz>)#0q9cUD6(UWn{USPejO!#xDPvza*&^2A*K=T23STtFy~Gj$
zwly#Gq~`G58E?H{a77KiMcDcAFKP`k)?rC3bttbF1_yVhbd1Hm%NPji8tM0GP#%ux
zCS)U=5&O3(ot&?lM0GiSwln(U`X!m(4k1|fYfng54)iZ^Pn@Gp(0HdeOis^-&b8Nf
zHC*;AN0rnbq3!12R>I7mgp>!{&7$Ku%6uZA;ev0vnr>9d#3bExV>-5yAJ=L-zBpdf
zmDQfvbRj#p=(a^!ZTIJA>lWL;Gv#a6=XBZ?>j@z3*HO0?8_g+!Vjf*L=j+0iOuS8B
zj162=QlCKsmOLWWBn=rS5%KBaG%=FQ%GsHd!k0=rPd+NCU~EbKAXXdZ*y-K5RVEfr
ziK30l7vPM9q#$(tWG<jZGEWI7MBEF-y&gq@hyrGR=(uscH2YH{dCK_G)$9{^#{x>5
zq}457S8Jq!P%Cns_<3WVuKBONL7%|~9J`0hI#XUbljBVuZWwC(o}CnPPBYrHH5U9j
zPX1bUWEXG&B=li;J+0?u{5s@OOjz;LjbHM`bhWH2ZuhjTtHk&jizZXlVQ%*#_6m`=
zVp=_c+&j;LYyCW0_slS3Dv6JOgDWs;UAd5AM+!}9{2N?>UHvYIW>2|msZ6}D3Q<EJ
z=7kPh`g!ig*<Jhoi2Q5b*9v;*#(7Syh-R!|fE?+z0wRL%Y!h`C!FX+v#$E)I8SUNX
z;gRF^7MA`Q#)D?;S{+-aYAI6B*ms(-!xeC%DQ|N$BKm#M<>Ew&U;xUxM8VHqqnc$9
zl7T74q%Jg!89HhBS^R5>$&uLU+8=BObp`94-|1$4!u^#Bt0_nCM=AI*_s5g+>RqW`
z9?a^=`0)HSCEzgkcQtO=F@JrhYh5ZX4VAX~MR&{5z&>5VMH_SKp5vbNqRsA2N#VZi
zDf>OEcvCEI)NJF|{iV+ZdT{V&8z@_dHi{?y?5IjPyhFMAB1E}-$*9?i3<J?Qai7U%
zH+zOkdR&Wp<Ssd8t3eEWcE<C8NywC)W4I_-eO7IJr!g2?FO@So59pF{t<b6COSlye
z;)Q95n%V<)a#ZB_vHK6C>I$<D{RRE8oe%euGI-Q>B=O1x|BaOY(&Rr!?dPsw$dmm=
zXs_e8R^GJ^?Fz@U0~GEPdOjQ#+8f&O1WAhi3h&6Rf%B)xYATR5MUh<Kj46tu1WukJ
znhfNNP82w8iUO%X|Lm=Sp&e&42Dn4}!vmg@{uPdUih$^j;F19(vb&$E;ZuY{eAOqf
ziv86B7^t>W>qZ&4uB&l3<SeJ}YM~Jy<#PoFqZ;GmllbqGq}peABb|7H7fB^l$B7@x
z4R9l@GtgJQhlb<%NMfU!k73%=$bA#?M$4s^Q;b)rE0ff}!M0OL8!#HNhIncOjAiGj
zMNni0@_Hd<8y`{y=&a>fhM82-Oy4O)QP?<dfA@3=fr>^Et#z!B6|sz@E$-0Hk*%n_
zn5Jd?Ty+Nm6OT<5G!OGs2TAL6N#9Jgp=YAOY;R#aQmY%U69jwem(C4&wkx@M^G#>U
zM`QH#H;BR*dpL#*Wpz9U@maxjrYyvdNiyF|r}Xcp)2!2BXX_afk@eHu&XiZviT_UU
zS4I%Gohp&?g?}N7hCc3^J+5%S+9T1y7_6-E(Rs<EMx*!18bgr&a&ZJ{y@4tsH=ejp
zHR4|6Zagakc9;s(cpR@>Sv79tti3Be=x<zc6S?M~^Rj*`P0?NVSzu8pp4&OXUj35o
z8>+w~m7HcA2yh6QRZH-I4_pqu$dKN_^umd8x7ey{B{E>fD{PoSm{bm(Tqp79DEzO7
zC|l?NA}HNT4zg8e<dA_lY}AF&Sco>7$EClo_-inU<}!O^t6cW@OaE|G{DIJpk*&PM
z0R|UN5h>KbnS238^A)868GHdo@fD-=n;kJKn7;BhJqm?KJZ__xNfI=lfu5CXO=o*#
zm@+%PqfT(4X?omr6~~H)_@d2?rr0f{t6YvcdC^&{HGw4p5R|zY7nqovmPz33{R{io
zejT$gtM+TOMV8~_*s@yZWpb{ePuv+SXPi3hF2@SF%*r9Br}G<TPPr|s=?`_5$t?|r
z#+C@VD#Ss$L*0@tx}!amQYm9T`^(x(v^2@CwNqNpHH?{_Pk#RgUVim7xW4hMtkZ~e
zyh#)XPbYe&eACI^*Gba0;4X~)?EC1EvOX2PEAN5K6hSLEQlr3;gK?`_hmN|>nav|a
z?2twj!P0Mr2xn)1vhYVx!*SDBpaex6H-Dtjrgc%erd_&pj=Hx^N8KP+izCGdX6fw~
zA&X$|ep1RvLo3`)WSU!y$CI($n9em?UFHSgf>d1g2g}~DRtJUgu2m1|vYK7MRrA5J
z$Sa4D?wwWRvX|SlyoKyd_7u<Lt-9^BlbWIdS<70Dq?Y!+cF%w;xm=JJJVj3sLr>7P
z^6YkJ&&ER25J@n19cqbg$71#Sw?|PJjy#VYxP%q&9=s^NQwq-b)tT}Fku+&gQ!-~H
z3G6bK{z&%UhN1&N-v(d|kZS<CcvEYNQtjVRt<5ZvI;OJ6t&91rmO}j;0ooS{m-jqF
zY)qW&X5Kw&m*BU2TaDz`V*?f0nb5X+pPv5n>b*{_&3$ey8*jDq-bB6yxs7MsNM49$
z;dJ96zYJuWt?9MjVzgG8T#?>|Y^WP08FB7r_k>(W2%E|LMd78$E_`?=R4zHmz#?pd
z$5<!~&jEsXYiZIdFp(XabZ;R8jO+zc1WFHI{9b?&g$FGy*+V^uhhs!A6{e`-6_{cD
zfz(Ta(FsQNnX>s4Mf}=rb47Ds_x)z}fwr0(dR)tTiLfWwLNY`~L{ga}yGE~gnM$29
z_skX949+vqv9in9Yd1%_SJ7mE548{8FX@{i#)o=_WJgVIgnUY!>Skidi@b6%6m|^G
zmwFK1SB`>Gd$M5qaNtnBshl#@!AVMP_8w~DR1ogwNwol-wdIv%;oC8Uq1KaiPJpM`
zUJdMF*DDttEIT||nSs_PE~gHRg|KE%usEXKKF_YcQNp*i7Uq0x#ohSiW`E;Y(TK&}
zaOp&X88i0_);!NafR(t5+t~YL=kzsi!`x`uNW5NXDPnh=u_03-Z&mI;S3<rdlnQQ@
z@oPs<hEQW~%w?A_PXt8?w#WFW<pjabk&~l_rBUHTaATVh876W);)O4!r8LYs+qjR3
zmL#OKr!f#Ev2{g;=)MPC_LgC=C4+;EDO8A-h%w6V)g{Plm=`Nsz>f<F%|h1gAy&5-
z&||G9K<gLRNR&Ossic(GFrlxpoKunfj6ZuqS-A}{lX+LHtq`=RUVnZlW)$!J%2SP{
zBuAq<c9ZxblGECIjEm#7M1;I{ypR-fYxmn(8p{Tc|At4yCmU(xlL!A*1D?8Qdp)eZ
zhM1+3?d}?>4h}ZpGWHnNx^CFWx?G=1buR=sOOZCn=&R+<d%kajDsqt!aiR}$JV<$X
ztBPx{t<<CJ5i&pre7Hr)OR~mqaMe!S*?x<S3NJf)x3q#<XNuD)txHsfG+YWUyYzwQ
z^(RYRacsIXc#bihs<n0+r(q4@bGh`Ia$zb_*(_&B@QcWvUnSRio_<16XfhRT+MZB5
z8+5tZ?|4J6<T&zo;=G|*Pao`q-(h01bZGbuqaP{PX2k~Mjd!52$(6}XWF|l2WRO&6
zN^peKIZbhwTqM{#9KLPN4Ohru$l`2|v4dKZLOSYZ)4XwbX0KE}9ODEc9^U62+UY&~
zj<<8K*6ujkSlE@35z@^Bt^HLbDob+~L3RB}g~Vm$x5p^!N?hJ*Kt4l1*}&Lf%GsGU
zp)afRj^l1)x@0XgYLem5*}!tiJ&f>71Z7E7?z)0lHgpahk#KhOJq@Ek96!+V`q3kY
z5HC#CTi4WUDyb4iTN!41UQ?H8<Z>hdsEI781W{%rW0pOykb!)7F44G;@8(*5F89~+
zuW6Z!TIt<WS9xq%=Q}oCZnH<VxR<|2jVX^~OPl+JFVFzwg4LS~#5EuqfrRHv7YLi@
z6bOUoom!J;v)3TgznfW4Wi97hA(5Eb%l$^}9u-a{l+C^@oD}f~30$&jc*rx@ceCUb
zcDN6}KD1@DYEi7kKtf7pm-1L=3S*3|WkT1YQBINZgpNH9o?k0Pd{pMZa2)!{DyT;r
zEkmCl<jLfq4-sa~=~Cj4{CPW}$9IN08ZL<OG+fPk^RQ>tC#+@%ao;A;f9U|OWG?Ni
z<!BzY<+Dz88S}}Xew+>Hjexm+z8EYzV24GyhdV1Pc*LEx$i{MR2Xg(U%b$N=O13h+
zqMDjhDWl|k(&S7!G`x-_B*XI00BnGtEsAA%NU+ypBBlkN$Zn^_?CyM)b<CTh_V{T!
z$nr0LL<@4%K8D@#m?>jk(%K%~ke3=$QonkX?4EKiWK;<a>&;y=dbp$RCL(0NgVZPE
zl`QP@cssbk8<X2GJ340Rr3kZ#POXOF-;_&JVt{OMTeoWR;b-!rlb?34nrdH{6hv87
zE{8bvQQ^L>l@q<Sah(*IQzP_i+jHfVqqRp4o=Kks#<{cK?8*tP?eC#WbLkLvyR7IE
zQO8I7$bR=0CUf-CaNH(q*>sSm3hI$qgr}21K)4k7@XMsf2SZdHm)4;*>xwLK$<%T?
z!tCJ6fU=Dhv%J-@Bu(1dYF&6nEaQDB1Z5Erd(K!xe&MRxucLzUjO1w-b1s(sNiaj0
z1s|)m&Xj9OM1RRfy(Em@esL;%Qh$Z}=`){fLj+KW)0uL~Nwm>eQ}|TalFk$lE^_wh
zFy7_h%^Yj>rK9EB+Cj97F_gVH*HLF+)*XsaY|}*~VcyeN#MQ`?#tL-~iLPLnxze15
z67DE>P&JOnV*B7HJz{Q2{Z#v^*w4?BYCW=YDi5gesJY%4I3$G16b2wmY!hI}xFumq
z6TEi2bit?X4NLkWwGhpG9yAc(5{kkSN+lRc&@8vUuXvp*m&T3wu3{NZZI!B&jlqs+
zY4INRz~~QIumx^5%!LmbQF~;tW5p_hb@wxqA=z0-g#;vgsd16u0u8g=4U=P}ntiZg
z@R;Lqk4D@=JN(5__kC#vh&?d-g;Bf4zPeS2oQ9&9NGU$_hEgWMfx(xtW4P`ol5`uV
z<)>-49l;^FAqN6_#turCU;kYxScmK&<%It7$P`c3xIp@<DBhr%^mJf^@!OwC?3C~i
z@NOuNwdEFW=dG2bRW|pe9l^J9LI-mTpAVny%KDKlkXf@hYEtlwtjnT<qumYX$MDvq
zH~Lw_Z>I2TokE~bY%U7pqo2)63q0!<nWMK*S?h^z_i*Ux@=gq@z!;Mv6LmDbH^7yi
z7ULjXE)&X3sWI=w@xecOqCccr>*_K}i%s&)^>UAbmBdAq(D;xFqUlgVV|G!bH5z4D
zDf~_)HP_LP0gi6O0SireqikSj3OPLR1RTiGbmWm#!3@@5UT$baUPvpp)2Gi_vaJH=
zu-mY0)@)XC?}utXC=j$9#)8|Jfm>h`qW5Xpm5_cx6G3{8(Q`vXD4xuY883OGUo{?m
z>;x>^9adsa64R*&dH=X0+KH@)JkUY09}$e@G1$2~rgf?v(J*Z1aXG_LC(_<I8PpZ5
z>0WPi%CPU#Itt&GLHkb|G?l#3U*-w*FLH<8M3jsM2AjOsoAFw1^bq3|a5^qe9iwr|
zS4QZkg4A|IdZd&`B&pzL&qR8hW5un|)?0{DZnJ-oYUm|n&!!V3`G4jKgB$z09*hJB
z<Ge>t5cDR3>P{nlWsFv8p(FG^QG_`XA^OX(yaXcLJ$lE_6Sdsm<)KRXKa?1KnRJ^y
zDE|62?L;S@SAXuub0e-l#Z_8u9_%eQ!d}iH(DH37DPh;xb|r(GspE=E3S1RA%Qys;
zYMsj1Bh=D!ey`nRHj>{3H8$LRhqr!CTM6=*(_A!S2t&mg+5>|al6L9%Mm>pyRCo;2
z)G6z1f#HXqjtZn2KgD&Y?E5OCR9ji2sPK!LZ(#YS`6zvlLijrv-9MrmgMo*;6m8=>
zjkBZ}a4+96G6comuQCZQVz@!@xC#=&%Vas4<({}mL_J^!cN-VetIV*4LaHuNk2#!Z
zBJ0Fygbgu|(X`rC@paDx2DZLyNBASYE&J0T^10V{q8A2z!36y>+$a05UWeyPg4R6~
zY{_DqS>#T-)0Cw<%+);UOQkSL2%fOcU>5DLLr1IJC%Q|{HFB+gxK>70lN>J?PLC`+
zMEpWD!XrFSb!!2Z!@J>#<V=z4)xpVzf*{>Px(K>Etrha%tAtdnDvlPBVUXaulYW#O
z>7YLdEl}*<`84E6gB)&GRtAT6Z1-QpDR2o=FZh+j?<#R;UzAkEDQNaZ1F!8{;*P#3
zIefZ&4X!#>K<c$a#qp$YGSV<wX@63n-&F1}q>7qZ$EG1PZk$gtvp8F_ctx`4TLRhf
zD~WF-nOSBQv&<}JnOV#-vzTROF-vE$wMQ1W=`2dJUkIL2!kGzb^ANflMKP_b>`kmN
zw5Wh}QK4fE4yeXzkLujjMWCK_sVlO)`yfeb6B>6+ARgN5sMb|B_$c?Jmf#_DR_1bb
zEhcL~@UyG|c@7T`-*bJf$FGMzvD*D?eI$=UT4a<xUsOx;)MQ>pTfSrJOT~GiVWU|!
za+C0->cJ)M<?pHk`3-le1B^Nhp|}P)86>Xo@U*Zb@^B%)h}sL75>(n6w@;#&Y_nYP
zw037e{;2k;8d6kf&C$G`Qw9^(G(AEHj}m$zWY_X9z5LAUg<<%EULM}Ud{T$|Ou4Q|
z7=h$xjUSnrlXQ2<yU;KbYCcXvyx;8+4)4MKq;oW8kIUF$EI2lj)~jU9K8}Zuk=^BC
zVbYBTTO`UD+U4KnVZ1RdQpRrVv2_K2O5>kdp2fh{!m(J0zaGd+1=QZ)XR98D_Nn>D
zR05HC^Lu&L5Mm>YiY|NE4U1HQRedhwwXCCJihC&EXVkPF$9bN$em<(Q&8yp!O#~vz
zODixvMs|4|Ll^d5lo8$KuZu1DKh7SwGCq>QxVv4sbaC0c{BG?HUg47p=itP$YOA$*
zdD=W?jNY4<(V;o6(6h#GTXb5kE1o9hfBDZVuZQs~vfy<VTw}pz3qE1Nw=H<cg8h@t
z_@`R%3=2-S;Dr{v+=4%};1Ub2w%{);_>cv+S#X~P_gl~|=l=Xov*08PPPbsG1(#TG
zwFU36;93iAwBQpK++o3e7Bnn)#DaYWoB1YN@MH^)wV=m>J_}xM!Ey`UX2JCq++o3X
z3m&pylFUj{J_}B;;B*UKX~BR6Z?WLr7JSHpTP*mZ1>d#c5ewSoe2U*m7Ch5}-?O04
zf|pzHhZelff@>_;Xu*vZ++x8t3%+Z?uPkU!GxJTg;29Rw$o!rEo=cPSL8b1VX~N%K
zX+rzeChQ&6`y11J<4MQ&kAyENC@U{6at11$R~HAI#f!=U&ce!~VrNNJ<pQU_s<N=S
zx_T_4I^E$4tBMN(#XbF;qpKDF^lw^au)N4wQ7LH^7mAPNUQi*9C1n*wPT%4{X=Q~D
z5DXN|FE1vTNCU}l<SBmbJC^9?w{}+3%=nf5;tC!5tm?w5GJjyKpW|csO{=WR0ePQ^
zu~G|EwJKDVs!A2}H&zv?a{iP`R~0I#?VO;?cSW$g+_dU%Bo+FwH^=5}bRX3xDk&x>
zCnr{Z=VmIOj^NDl&FyPf-_6Xt)W_iHbjrM{?DI<J@l$G%e-S@BA&`==+W~g|<Wv8W
zvTV8@H(JmZ6&(}Xr?0(VTzo=ee@D`QfrFA$1`kP1J89^!;U|x9o^tBQQKL^AlYaUc
z8E2j~_Uz1a#*LqF?svYMHE~k*<SE}f&*h#v&69Kf1>W2XFUrfGKErqM%vrNJRhfI)
z_kVEt6<1z0uV8**QE|!DrDZ?7rhGv~rT<4&)q&u`YZooP?)oJ+EM2CLe+99sU`3#8
zL9w&As;aWesZ^p>A+z&l%$jAoYNuJb(=X`psXR0C-MQ1dU1okKbNqzFICq7!!0#_F
zD=Y|<QPrgd)y@S4G^+yK1A*cN{(v;O^2!35UTLv&nlqArdD;A`f~v*NvWmjWs;c6`
zK>6aaalZ26g6d)#W<{W&keI~ik@}cwXLZo;udKqSxL|>^gaRz6tSTlAtP3;-V<Y7e
z{KhB7o#k|QqY)(S{8_nqJz9RCw5-}$P+eWTV1D^xXHl@Ktm0~C1xYOwG$=?}MOmP%
zpuFrloqXJE2~XRW0v8k0IX`$c-_FIA!K$9Pj&<e+oCIA^Ssieemt9j#>QbDl;_6^|
zz*$-1EG#H5m&~A);B;1D<pRI%qUmQBmRFtbED2T=YMSaETF{MDMRlMmSQw!2{L`ME
z^78zGvI<>xDfc)jx9*x1mBFh^oz?z=LV7yE%PYzDD1!B**EzlD)m8Rlv+`!nHt8KG
z1?kF)!s4;to*q5($&`Gik(%Jxok@{|0snDX;vcNgBL=OfJA|{exWI3wB;mgMcglHf
zS&xXi?z-cB=Y;X914Vx)-nkObAEd=CEUO9x3(C7INorGPAb8O)PC);wDl25@J)6cO
zBd{J6yYM<^qQvViw;luO3)PiWSyA!Avch6Btn_2@Ime<?@ghI{hrwN_)7?WQlo?Lb
zDM-#%xCJ!9vOp>0dy%w=YkJ0!bWcnlD^gKGpr9KSolm0K6nb=5Js4CK|0q~oEyzjh
zpJ@#~RBE8OYC#ztjm9W#K)OM&B3La%y|&>0;ZQ(%GBsU~+aHQ6sL9HT1;rHst2`23
z)AhLF3#zUTO5p0Q(o1;V-%1$d0@9)Vm1Pxyu8~TTk>Rgcw{DhvWrbCh)s-ay=Otyj
zw9_&&y6BQ;4vIq1IQqiav18R_=H{!b80{(w7`1~H*HlzqTk$>W)gon%jN_-o#W5jD
zut`o`8*&JwT7=h+{5YIziHUpw5$-tZyMgb>+$F(o>Gl2NUf*kaeRIwGsQ7Hb9rgXw
zUf+FcYHq4oUc&?&eN)X%H`XM_#xeu1Sg``cGc#*^H7l7-)5m1_F0EmHWfJ!JR)Ur@
zy=G+%u@uvAX=$n5-glATf34qt%=}A`|J6UI>iw4vPh|e}_Br0S7tZMK{ne>s|Bep7
zTy_81)VKTVnZk{#`!9;)({J+^iSPVhUH4|;kFC|x|LzuGTi*3&`<A~*4GO%`*8LY{
z`*wek_{Wz1KkD+2dVu7V%wHr&`RcYOsc%_eD_HOF->$UXp^{X$-L%=v1*p{%YL?$v
zTesq-n^)Ga3axIq<;QD&a_diT``PV3zvIqd+;#Uo_ukjo)O`Qi2Y&ghb-#Y_HxE6$
ze#6H9^V>&$_vog_Hb4Hv@1J~X%O6@=w?4gX`;MKvo_TinbI<SD+xEhXFTMQAtFP_*
z<Lhs{`PSR-wEyYd_ul{D&mS5cABFdS{FhG-{PokneRlBB;Uk}a@#R-&3RVBr1<;8X
zINxdk^sg@ezdHZ_GX4M20`$cGdI9>cF2C11X~BX?)sbxqRmAU1XFfltSQhisJtaT?
z?4qKx%@1Ebhin-6d5Q~JBNkVgUrJ4{TzJ&?3|3^~J*(Kyveyjg4qhFsM!fUFV7X5G
zLU?eA@Ag-f$sR?1K~-U?mEifs^Q(d^h^<d`VL^rdBwxu(k-ns@NK?|oR1kl$q$TMn
z;!7Mgs~`}pD#C-``Bi0>O{v+X!K&)6FQqOmE~+T*;V>IEUA*%vD|Dz?K?@cHBprz_
zaTMVsjKW`|dO>kyFXmE~#g*623h2d_!hKG4an+3ZKV)r^+r2<{TLr{Fub?{MW{tbB
z*jMQf`b`hqO*b<+mCwFZ!PUi6D;JqD=gi8PIey$&PhOrG9y~w?tUwMNK@|$%1uY;6
zlz~9d335R-hzAWJB@`9H@|!ke`iwcVN2#%_zvVl!A2oKqP6qb{oO|GoB!m2BEoL>d
zU}j~dWb!S3w&4kCcpzR4FN#ycXZKUXC)m~SacS*C+EQB5M#QSb32RiMZMEt{`R&Ns
z`C!s*@zE;YHcZ82Vjq^Eh81CE$E#rz;?%HlsRstPC$|l3N%E(i9<PQ>n5l-?n5z!-
zZ%=58Yq9(L&g<hd)5_#fbilA!HEe!r%V2-Xykyebe};&pDb>zt_rqy0<?Uu6Y<;3s
zpK(!{wzN2vHo>9NW~Lk%)IOli(URy-m>2KU{#E!VN2%oBCS}?jG0HKak8+HQ_YW8b
zUPTV@>#v4Yb>kPwYuXqjRnnE(XXVu|E=I*o=%?al_VGu;3<0l4FkcWxpv{?}oJ9ka
zb9Rz)lCHCA*nyMUQ`-i&B>QbieN<AQFLzdf;}TkI$W-(j7n^BIwX4)3%<R4@6~EMR
z$rg=@pwah_OQT)TsGl=YIk%-LXCRe4hmhZ3<+Ke{X$OY1r?hp`tYxB7&tZgqrIUgE
zqE$cJlPXH;N$3{nr_#tjjr`NdKW$t}i!C({oG{dVDs>M|y6y%@8H)N*2D?g{na~oU
z!*6KjBd01g_)lcQZ-At`ErGP-NgKOWFA^Tq)z#CeN6gt)__5fZ#av~5+fwW*C4edF
zt5U!zW!!+40mr(vMe^T}qtqvuMUnWruKK9Baee$Y2lZVPPrb(}M^(JvmJp>9Yy(u<
zsJ?1o(eKp236H3Owv8&@Z?-=_Yq<eBeqS9wlE=x6sn=p|v+_tA0SzX=J5_bJVCf54
zUFE0j0m=@&(x4YK=)$+*Vx=ya*`3w^s~t!38ghwJXJH<;@-p!;%M+pDNBAGa?6AVb
zU8>YMm_JA242n^MCiGQ<#yNC*6}sPofX0)UNSqh2+b`>mW6~-~Ic7VQ<G0Xih+Pc<
z{~@!1q%~yRAiu7gm*c6QIO>KvnmM3d*LTmdj!S7D)Ha~2eVlZaQg2{7E!_IW*i;Pd
zB~soC3Y5AI<9yeIz5VaR?;ebeG6)<nBo4fiz{#P8R1G>Xpxx1y*b?8>FI~)7FJauI
zCqHYP@ac5tcjr61M5#i|6@(LLv+%Md+f_2{HktOHOc|4BCLP_5W<nd?cM_>z+BxG~
z8tp5sioRpFDf?8?(rw6Yw!ywps;})XWgFOs_Ligu{<gnAabAK?=LbF}-TQWpO<i#r
zYX;~stDka^XM|pt29+wnECX-(rJc=KJ>f^u!)+ze#~V|fL!sHwI5o7WzZyCrQ4O6r
z<bYX2X4??DuD$`42AK6$nwn-aqkIDf^icyQB&Y#1g~D<3A~@W)RH^qcKaYgh<xNm=
zx6<eI_>si;;b8peuTpQd#{RPsb4CP`!DA40H&6|l*8jJ02kh;A+G1Lwd}jZnNm}$6
z06l1nFUI@R&PhCXWFSe6V7wkmdPBw!tm=Otp*^n6-V&KNvLs&rDAj*lT&689O6Z>X
zkIMX=+m$NAbd`B<oEi+ygUMrX)xh?ow*D;%{`h$|U4M@%b6y<4yqLti=z!+^)$m)*
zd2xX5D~XgVK@FKHt-qVLh4(785)+|S8t1byTg~!PY-P5${<OD5+FOE3zBP%_2zP0Z
z10(*lL&oT2#>3=sR(s^TYd+IsE@MrAv4(Ne8q2%JoZa^$>4e#C)t5O&_a{7Um^^8_
zdhU#jFCVW}YS05py={fRjqjXaD)o)^t;;aqECbV|N*fcOlQu1xku~u^e0#sPzAdr-
zn0e8ek$RN^>GIr2ThwDY;|F7lHHLJJ6&F8*Qh<k*8uFe{fH=~wW)DztFVe1bzhun{
z?USKBbGq3tXD2`h#`r4Q%BZ+=2ag}HwKo<rHg~rz#y8^YF;3bl?JRX>@`3IekMo&*
zl72`3m%e99gSO2_^A~ZM|F~b3Z&&JGOjjE_B~G0(Ax)j~=}8At+XuHLw+!?Tn3ojc
zReS@Iqg8TqlHW0}dz_lFN2w*4%m__nzL*JLb9_GSfbeOy*eDe{fgP-2{nRk{vL2ZG
z;=wy@B;#A}+VVwZ3Y``S-SxbgNco}dt?~ZNNis^9zc!ICI1u?d7XDjq!KBr{<rYjj
z{Hx^_X4)<&t|+eJ;AWb6GBqtwRi3kuGZA<p`~q@1KaG>qt`qvwm`e-F0_Rs&&Ej;V
zyx3e3s-LN8TE4&v=2q&V=vl?Y)W=<tsJEb^sGJq`XOe1uWl^xa_<RmXr*jTM=!<e@
zPS43>C0JC>Qu=k3Q^ASSv?>m3If|Rbnv>&bq^+a!iVGGNALIUccbaB4aC@U;W|bGS
z!gfZHpP=O~D&n}79fMd~Pmu$^#GO{TU;+5$l~sVu?a?y><#Q^oWdWSCNbQ$$n5iNp
zA#}->6lVpBOh?v1l7f_F_F{jrnrQkKaH8m!g|b`yf!&7kVkq3JIOoL7j+~lxQTIWO
zO^_q>ipWA-O^umTQL3p2K80*ZKnt>iK#Wx}V0S|A-BG#Ko?_0luP(0gQFy7=pG)a3
zF%LY=Lh{y?xaCz=UK8}6Z=F+90kV5hFFw->{Om$V3*nqIp#Cg4%4%O9Rw>mK<>jRE
z{HkL3%6qikUCueAx?GpVCqz)Q#O|KvW9Ah4%*e?X`zzpg38(Qzx`nYXpkAfs<)Gdt
zr*0H*v+UIL_&(2eet9(s5R07)mwZ70^Xq%^rO`Mbb=CvJ^*yLMTOX9>vI{Up!keh7
zpTt~B?dTTC&9gjC_^iV_+UBECxe=*>-gW4%D4OLjt1uhJMK;Mir~3?YRzTzrs@<wZ
z@;}x?<((kLrD|!+rDa9M(@G1fW>@CR`R>%kfnv4w`03EvAJBBC)IIiQl)6v5nmv;}
zuIP({#Z`-a#Z_9qf&+hzH&iZ>I+<Noc#YM<f763rR?~!FGjz+=8z!@nIdNC(HjhoM
z)%naUHi=oMV_Q9+TE4x<Hyxi=G8M`Pt4k&R)L=<TaTUGtji|h7`2~KHW>7sjx~tr?
zD<i~EZ}kjCxu=-DP3SDWk9e-5T?k`H{&`wd!t9XheQ6((d!(7EUz+qQyAJH8scGev
z)x}o#zR7GE)=1`7zvxk#8Nq-*7?75{=BQ9)D*dv@7_rzIA0<<_nu*-g0)IhOaaU>Q
z9PL5^uLzDk+RP;dRb?VV;a2mbXL8gpDJk`$8LDVTiTOQJN^ez}^h$OQ1YezPfaW+q
zh@1;l`k(%5&oSk(BISsDA9YHS6!ASVjKa%yV((*oB)ph^|Nc#Ze^cN;Pl0jG@0@jK
zhEmU8;e4?K4IvMuoARz*eepB%`@r8!$dwTNtBL#1=lS<yO1^_Jk^UWR+1b9=%A{g}
ziI_eZxxg;s^$8fe1;tIi1wHW-S)GWVq$_a+Ixv!l3{B!T0K+zhHsXE?M%+<Hp~JbY
z?`hUIQ;m+p7O4(5%YsZ8I(@b*b>1-1+J6DiiD4p8!!WRn8h<H=;8TMUoR?ehMxd0X
z79;+37{Ld5ASL3qY}M%RCZOQE79(Z-6-L56hLJL{B-j400mVNRq6mE=G{dTYwut2f
z-@Uw#8LNB8|Br_MkH-IJr{5c&-rv3R|M&Mlg91q>{F%8qPx$+1VDsOf=81(fOk7SZ
z9Pr<d>pv^U6E*>ht2|*7aQ?F}`j@8rKfOt$o9hKzRE$i^YAqA|yc-wac#1{TU%q2n
znjSFW^84Dq5}RvjjfU$8-+KS+_d8ARWBy<Mjp^jF;G^F%yxR)DiST=y-)}xieb8()
zqv@d6uPgnfO*+QKFeDehe&y><b=B)Xe0^N6(9GvA?R&fZbIv`NnlV57#^j^82HPot
zr}c{Q-!;#;&N_PC)(Z{wul5%@{5@Lu#vLF317Df+t+84D(I#xmG@;KbcO>n|x3b!$
zFt<HvA-t9R=Awc~;^;;TOt-#;N0Z-?&rSabTRhMDwgxGcZhZ?+Cch&`%<#f<%CF7(
z9%O#1M(aD(`YyG;)2wfo^^KYq{j*!&9HZ)A+hH?(;Wg#A&iX#t{8THgZ;n#*&uM)-
zt#9Ly8UGaP`@li-`&8@OXMM{#jQm{IH(QnZmuY=pXMH=ZZ{3M;OSQfu#I{@Ccid^_
z^ZyFco%K4P5h!&NsSm9B7ilk_TK&=&Yqpa-3wkZ+v7pO>lP#EK!AuLLThM92Bnz_H
zt=rFMF(x!D_`U_(E%>Gd_gU~|3$|JCIScNx;5G}kSnx>;Znoe?3pQHtHVdw{U?lxI
z>wAd>0~Rc`;5-ZZEa<XemIWtRFx`Sl7E~7O#{w?W=Y;T){y5gGhOYlzR=+NvYSQVy
z3YS^G$ao<*NS+Z~q<uvCxFAu(0!{o5{M8%>e6wbY^MCs1^ZeK1w_EgZjyLJidwlBs
zE%S=}B2eto=d&@WiqYq$KL<XFc^UIJ%m50UiJ6XBAcf}_i8l$mtYxpo+>ZGj<|WLh
z7&&e|8<UR_?Y93v{Qi-2c~q}owDpUWJ*$sdPni}>x1iI4J=<C&&i`o0fQo2>%Ias+
zus;*rqCPg21e}f$cOUQuCc4{juK_;9Bqw16wqgA7HVwBY<A?h$;Fc6Lx?^tvx|sxD
z#-0akWdb~co%`HsJ(HiauT61BTfK&nboK$i%Ooi7S-@h;UJBfTkuWX54=uX^Je^5W
z!mp*H^kqU6yT}-f#z^>d;0#PVb|3KIDa`+bIRd<i32_M>p#@kr(u`XU{0QSB%zogC
zQE2ACK6f;BjHJI3*lO9g0bjT5p8?05hP*0a(t!mSp<xkl&=}L647@j8smlqo4|pCM
zLXxHn_}UrBNr^k~BaGlL@-hu)Dzy>!HNb+ikhjEM1iTaTCic65?_ngJ_krg!NWPCf
z3%Chm?{8C^f%i;={<t>+8z!@tg)G?`;0}z?rww>;3Ubl79|7L*J?a|wT|fgP_z1M0
zXW9i$$4I_D;FB21OW=7f)&`{G0&chLyMR77Y2q%h0h5&o4nWsb&VM94@NtYmUQYs}
zr<v);0FPic6DG!ktRdzI_BFskIcC0R0+Y{Ye+-%noQo0q3+#IV;YrgDywYoyYaZ|o
zjE6AxT<C!jItVPe5IW#q3j6{i<@yTvP9AlKdpq#%eA2-#@XYCEn-O@w4?o=33Y-bf
z5(c;pBQzBFz1e0NYvxez7@^@lVE!ez6TTey6O4qv4S4>g;J`CLUf^>WDVM+l7>O%z
z^kqs-CQLf;*BEhs2>9stNeB1Mz?{pOCnX)=f-C9Q*!{pqFp?L#71SY&#61H1`YQNO
z!l-%3OkpHUD$s`!90abk>;kt~c2|K?%Q5?iTL=6V<_Pw6z-<^wXBY7HLX)=JfajLL
zTjK5muE6-PuK{kw2tM0@u~(aM(fy#DmR;bCQnOBdz!5*h&N$-)4!(vyMLMa#XUnM%
z?9TyH7cd`+J8(DVN$l;wm<pwKVfO$Z!AN`f9q@CE3mm=zPD2T**qwgn-YUjH!U*(W
zBzzt)s@kmI7~pG`eIKwYz?kDe0V?oojI>FVGN^@^7!<@U0=~M0F$()WV85lviDORy
zj#$QCGIl5Mb<9K9-v@?nq>W);4SeQi@WK8ZaQ;ft$6f^7vkE%X*V=%Wg=pL0u=W=E
z(HhDieGs@0BmGg}f}fb~e&FYrRL04#fG^x?+Fu6d{M57?w=q`y%xn)ez{hTfKBTi5
z82@v#?h=6NPU;SKfj*4TO5p95eJwEO7qlnBc!AH}&6t4wIp9|q2`_N-J!W14+wO%9
zgb~>HJ~J;na9AVd!ChcO6Lo>T5jdmSY;Qi`SD0bauYoo9o9PQYZ7uy7cOS6)m-Kh+
z0{?)y8+!{d=hx(m{chmH51Q$31jhfyOeX<&0j7;G=p#|J7-{o$z|jwxZ6h7{gNMPB
zFqZ?LTTdIHUIf0e0Uize`@mN>Dm4oGKHzU3WzNR_JK&T}W<9!qa~?D8bAk5Xqtk~l
z0<XnLds_soc+#Bj)&dV>gq}x$*KVVaNEqNp+u7H_z90C}^UU312mW!7QlDXe6ZoUO
zX1xc12Vbz}Q{bAHpg-+I;At;gWdt6=Ove2P@Vl>=`DOv5_t9r?j{&y737xSE^uJ}M
zFYt=DO`J=C8SN&W{lG04C3OMZhgm{97x)FnOSuHfeF3oxJlnDhoMYMLK7h#dOBjJ7
zdoOl@4_kJDJ1o1vcP#s#fg*1%;ROzQ*R+d_xyXf!yFiis7Tg3bv)l!Wtgg5V6xmI&
z3l#ZTu?u_~Bk2e{Y}vm7itMVm3ly1639ljc{nXL7{vCkM1YXy?v3YZIOY^?w_GbUu
zMQgd}p=L`WjY*Ad_qX3~+@JYS=EIvG-uLj4hf~*QtzWc$&H6jmH?Ci|e&hO<^}E&^
z>yNCrZ%Eycz9DOacf;Hbr5hG)Sh?Yj4eK^+-mq)Kz758PBO7FqLU&U3#?;32#;itf
zqpxvp<GjYwMt|d?#+t^JjcXe3Xl!ZR)!5d!ud%(+Xgtt(q)|25o06JRo19JQO_@zu
zO|B+yldoxR)4ZnACV$hSrkbXeO>3I&XliU)*R-)|b5l#xuBNu8eNF96M$>_&BTcH=
z-kj8&+U#u3YW6kHZJyU$+U##$)LhfNvUyGO9nI^S=iOg=f6@b~4>%u4e?W@-@87>E
J@V|uu{}<nag|q+w

literal 0
HcmV?d00001

diff --git a/setuptools/cli.exe b/setuptools/cli.exe
index 8906ff77a26d30d63766158b2cebe1284188e637..9b7717b78bbf71f105ccde26746a0f6e3a4d12db 100644
GIT binary patch
literal 69632
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
bsj9#HerbVUTHu!!_@xDYX@UROTi|~I?X2KC

literal 7168
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

diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..3f64af7de42fd6597b4c6cf50896d32a98a7d6a2
GIT binary patch
literal 65536
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

literal 0
HcmV?d00001

diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..3ab4378e1d401d198b92a33ce249d29bcdb26a63
GIT binary patch
literal 75264
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

literal 0
HcmV?d00001

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
index 474838d5220133fc3bd4898bce43e12ffd0be09f..8906ff77a26d30d63766158b2cebe1284188e637 100644
GIT binary patch
delta 374
zcmZp$Xt0>j!8mPVr#xfB#FhH2dD4sw%p32n=8Q}`?!w1WP<hOSkBi~BiwX+^5OkWT
zys+T_(ubRW{4W*lEKy-O&Z5F#;K1-g_0RwRFZVMtF!XMH@$dhCpbicOAP=OZlSSpl
zKXwKN#$%l_DlgtlzROjXGym`Z|DCOOfMjp$3lJM<L-$k=zncl9J`HGG=keA9rLu5Q
zpbDU6A|T7$e*-Oh2y_t0VIY@vyK*qMJ^|`>0BN28w5+rB0mxVzl^3p)_j7A8N=<&n
zEiL!&7f_73`7p~qpxYR%OF3#KyF+=pSvG;RJ)Eq}qaj$z2Gm>ww#y7;SMB5&9%)BM
zplEOEm*}|o*u$ZnPlKD^h`eY8sXY9m4M>5#3v!2WX9&<E3?Snofc7^Z5s8jHB)~9X
S!sb0Z9E^<nHy`D-<^upY+L`A7

delta 235
zcmZp$Xt0>j!8m7Pr#$0=i7WM4KfPyQVA^<hHK*ut7e0=H%5sL|E-EYxK+tKT^1@;A
zLM|~z&B;5s<hYqQ7#J9jb;_u`_%Qh)R~h5t$r0T0j9HT_xMdl=Cr{&+<DbF~)Yban
z@BjauHYzVXCm-h4Vw9Wwj$4|E>Gx!A9%;s>lht`N1S{Eq%4$?tj<cwk88|S!Xq=qD
zBkk%66zxs@5*-&GdpNZ7X>ju!kr$mHm4{z+0V$xXI2eJh>K5({QDNz3=wwlO5d*ZT
d`G`n#>>&Y$2@^nW-n@s0gOPFf=A*pUd;o7^PZ9tC


From 793092ce4a71e3c2ac8f5ea2bf30144f7104a4ad Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Sat, 17 Sep 2011 16:25:22 +0300
Subject: [PATCH 3287/8469] Issue #207: passing ctrl-c events to python child
 process

--HG--
branch : distribute
extra : rebase_source : e8f22b9c0389b62edf48c5c540498f46fac206ea
---
 launcher.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 91 insertions(+), 11 deletions(-)

diff --git a/launcher.c b/launcher.c
index 201219cc46..ea4c80b5c4 100755
--- a/launcher.c
+++ b/launcher.c
@@ -25,9 +25,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <string.h>
+#include <windows.h>
+#include <tchar.h>
 #include <fcntl.h>
-#include "windows.h"
+
+int child_pid=0;
 
 int fail(char *format, char *data) {
     /* Print error message to stderr and return 2 */
@@ -35,10 +38,6 @@ int fail(char *format, char *data) {
     return 2;
 }
 
-
-
-
-
 char *quoted(char *data) {
     int i, ln = strlen(data), nb;
 
@@ -90,7 +89,7 @@ char *loadable_exe(char *exename) {
     /* Return the absolute filename for spawnv */
     result = calloc(MAX_PATH, sizeof(char));
     strncpy(result, exename, MAX_PATH);
-    /*if (result) GetModuleFileName(hPython, result, MAX_PATH);
+    /*if (result) GetModuleFileNameA(hPython, result, MAX_PATH);
 
     FreeLibrary(hPython); */
     return result;
@@ -160,8 +159,82 @@ char **parse_argv(char *cmdline, int *argc)
     } while (1);
 }
 
+void pass_control_to_child(DWORD control_type) {
+    /*
+     * distribute-issue207
+     * passes the control event to child process (Python)
+     */
+    if (!child_pid) {
+        return;
+    }
+    GenerateConsoleCtrlEvent(child_pid,0);
+}
+
+BOOL control_handler(DWORD control_type) {
+    /* 
+     * distribute-issue207
+     * control event handler callback function
+     */
+    switch (control_type) {
+        case CTRL_C_EVENT:
+            pass_control_to_child(0);
+            break;
+    }
+    return TRUE;
+}
+
+int create_and_wait_for_subprocess(char* command) {
+    /*
+     * distribute-issue207
+     * launches child process (Python)
+     */
+    DWORD return_value = 0;
+    LPSTR commandline = command;
+    STARTUPINFOA s_info;
+    PROCESS_INFORMATION p_info;
+    ZeroMemory(&p_info, sizeof(p_info));
+    ZeroMemory(&s_info, sizeof(s_info));
+    s_info.cb = sizeof(STARTUPINFO);
+    // set-up control handler callback funciotn
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE) control_handler, TRUE);
+    if (!CreateProcessA(NULL, commandline, NULL, NULL, TRUE, 0, NULL, NULL, &s_info, &p_info)) {
+        fprintf(stderr, "failed to create process.\n");
+        return 0;
+    }   
+    child_pid = p_info.dwProcessId;
+    // wait for Python to exit
+    WaitForSingleObject(p_info.hProcess, INFINITE);
+    if (!GetExitCodeProcess(p_info.hProcess, &return_value)) {
+        fprintf(stderr, "failed to get exit code from process.\n");
+        return 0;
+    }
+    return return_value;
+}
 
+char* join_executable_and_args(char *executable, char **args, int argc)
+{
+    /*
+     * distribute-issue207
+     * CreateProcess needs a long string of the executable and command-line arguments,
+     * so we need to convert it from the args that was built
+     */
+    int len,counter;
+    char* cmdline;
+    
+    len=strlen(executable)+2;
+    for (counter=1; counter<argc; counter++) {
+        len+=strlen(args[counter])+1;
+    }
 
+    cmdline = (char*)calloc(len, sizeof(char));
+    sprintf(cmdline, "%s", executable);
+    len=strlen(executable);
+    for (counter=1; counter<argc; counter++) {
+        sprintf(cmdline+len, " %s", args[counter]);
+        len+=strlen(args[counter])+1;
+    }
+    return cmdline;
+}
 
 int run(int argc, char **argv, int is_gui) {
 
@@ -173,10 +246,11 @@ int run(int argc, char **argv, int is_gui) {
 
     char **newargs, **newargsp, **parsedargs; /* argument array for exec */
     char *ptr, *end;    /* working pointers for string manipulation */
+    char *cmdline;
     int i, parsedargc;              /* loop counter */
 
     /* compute script name from our .exe name*/
-    GetModuleFileName(NULL, script, sizeof(script));
+    GetModuleFileNameA(NULL, script, sizeof(script));
     end = script + strlen(script);
     while( end>script && *end != '.')
         *end-- = '\0';
@@ -236,12 +310,18 @@ int run(int argc, char **argv, int is_gui) {
         return fail("Could not exec %s", ptr);   /* shouldn't get here! */
     }
 
-    /* We *do* need to wait for a CLI to finish, so use spawn */
-    return spawnv(P_WAIT, ptr, (const char * const *)(newargs));
+    /*
+     * distribute-issue207: using CreateProcessA instead of spawnv
+     */
+    cmdline = join_executable_and_args(ptr, newargs, parsedargc + argc);
+    return create_and_wait_for_subprocess(cmdline);
 }
 
-
 int WINAPI WinMain(HINSTANCE hI, HINSTANCE hP, LPSTR lpCmd, int nShow) {
     return run(__argc, __argv, GUI);
 }
 
+int main(int argc, char** argv) {
+    return run(argc, argv, GUI);
+}
+

From dff9e6b6bc0bd04180d00df52eb74340fa3df580 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Sat, 17 Sep 2011 16:27:04 +0300
Subject: [PATCH 3288/8469] Issue #238: using 65bit wrappers on Python64bit on
 windows

--HG--
branch : distribute
extra : rebase_source : c0f80f1633017229ec77f4cc1d7c56e86aba3a84
---
 setuptools/command/easy_install.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 853753c19b..4700fe0eaa 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -42,6 +42,10 @@
 import site
 HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE
 
+import struct
+def is_64bit():
+    return struct.calcsize("P") == 8
+
 def samefile(p1,p2):
     if hasattr(os.path,'samefile') and (
         os.path.exists(p1) and os.path.exists(p2)
@@ -1781,7 +1785,10 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     ext, launcher = '-script.py', 'cli.exe'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-
+                if is_64bit():
+                    launcher = launcher.replace(".", "-64.")
+                else:
+                    launcher = launcher.replace(".", "-32.")
                 if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
                     hdr = new_header
                 else:

From 8b25dd9f9edc2f2506efb5a471f2facdf4082a31 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Mon, 19 Sep 2011 23:41:21 +0300
Subject: [PATCH 3289/8469] Fixing regression tests on Windows: #241, #240,
 #239

--HG--
branch : distribute
extra : rebase_source : fb5248f9bd280ccc075c1e93dd74379bf06d10f7
---
 distribute.egg-info/entry_points.txt  | 122 +++++++++++++-------------
 setuptools/tests/test_easy_install.py |  21 +++--
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..e99675cc9b 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 85616605c2..1ae0ba700c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -67,7 +67,7 @@ def test_get_script_args(self):
 
         old_platform = sys.platform
         try:
-            name, script = get_script_args(dist).next()
+            name, script = get_script_args(dist).next()[0:2]
         finally:
             sys.platform = old_platform
 
@@ -141,9 +141,13 @@ def test_add_from_cwd_site_sets_dirty(self):
         self.assert_(pth.dirty)
 
     def test_add_from_site_is_ignored(self):
-        pth = PthDistributions('does-not_exist', ['/test/location/does-not-have-to-exist'])
+        if os.name != 'nt':
+            location = '/test/location/does-not-have-to-exist'
+        else:
+            location = 'c:\\does_not_exist'
+        pth = PthDistributions('does-not_exist', [location, ])
         self.assert_(not pth.dirty)
-        pth.add(PRDistribution('/test/location/does-not-have-to-exist'))
+        pth.add(PRDistribution(location))
         self.assert_(not pth.dirty)
 
 
@@ -221,7 +225,7 @@ def test_local_index(self):
 
         sys.path.append(target)
         old_ppath = os.environ.get('PYTHONPATH')
-        os.environ['PYTHONPATH'] = ':'.join(sys.path)
+        os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
         try:
             dist = Distribution()
             dist.script_name = 'setup.py'
@@ -234,8 +238,13 @@ def test_local_index(self):
             self.assertEquals(res.location, new_location)
         finally:
             sys.path.remove(target)
-            shutil.rmtree(new_location)
-            shutil.rmtree(target)
+            for basedir in [new_location, target, ]:
+                if not os.path.exists(basedir) or not os.path.isdir(basedir):
+                    continue
+                try:
+                    shutil.rmtree(basedir)
+                except:
+                    pass
             if old_ppath is not None:
                 os.environ['PYTHONPATH'] = old_ppath
             else:

From 3b8de2876b38e5b2afc4210e6d37c5b90fecb8a4 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Tue, 20 Sep 2011 00:05:59 +0300
Subject: [PATCH 3290/8469] fixing regression -- generator syntax on python3

--HG--
branch : distribute
extra : rebase_source : 3708d2ca5f9a8fc2398204dbcb3febb6d61e134b
---
 distribute.egg-info/entry_points.txt  | 122 +++++++++++++-------------
 setuptools/tests/test_easy_install.py |   2 +-
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index e99675cc9b..1c9f123d89 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1ae0ba700c..4150ad1061 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -67,7 +67,7 @@ def test_get_script_args(self):
 
         old_platform = sys.platform
         try:
-            name, script = get_script_args(dist).next()[0:2]
+            name, script = [i for i in get_script_args(dist).next()][0:2]
         finally:
             sys.platform = old_platform
 

From 51e06f7936437e869dd4ad29f052435e3d814e61 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Tue, 20 Sep 2011 10:07:23 +0300
Subject: [PATCH 3291/8469] copying gui-32.exe to gui.exe

--HG--
branch : distribute
extra : rebase_source : 36d39326b09155e123f2ea69c8a2ab493e761126
---
 setuptools/gui.exe | Bin 7168 -> 65536 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/setuptools/gui.exe b/setuptools/gui.exe
index 8906ff77a26d30d63766158b2cebe1284188e637..3f64af7de42fd6597b4c6cf50896d32a98a7d6a2 100644
GIT binary patch
literal 65536
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

literal 7168
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


From 4f5c1303ca73fdb1860bf00ee9a37a2c1b6fe294 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Tue, 20 Sep 2011 16:40:58 +0300
Subject: [PATCH 3292/8469] Issue #244 raises ValueError in upload and register
 commands if using a section without a repository value

--HG--
branch : distribute
extra : rebase_source : e57437a8ac03832ed8170c902996423a27235856
---
 distribute.egg-info/entry_points.txt |  3 +-
 setuptools/command/__init__.py       |  5 --
 setuptools/command/register.py       | 60 +++++++++++++++++++++
 setuptools/command/upload.py         | 78 +++++++++++++++++++++++++++-
 4 files changed, 138 insertions(+), 8 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d89..3b205225af 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,6 +8,7 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
+upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
@@ -32,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.3 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 152406b332..a601e2d3d7 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -8,13 +8,8 @@
 from setuptools.command import install_scripts
 import sys
 
-if sys.version>='2.5':
-    # In Python 2.5 and above, distutils includes its own upload command
-    __all__.remove('upload')
-
 from distutils.command.bdist import bdist
 
-
 if 'egg' not in bdist.format_commands:
     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
     bdist.format_commands.append('egg')
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 3b2e085907..874401a5ca 100755
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,4 +1,6 @@
 from distutils.command.register import register as _register
+from ConfigParser import ConfigParser
+import os
 
 class register(_register):
     __doc__ = _register.__doc__
@@ -6,5 +8,63 @@ class register(_register):
     def run(self):
         # Make sure that we are using valid current name/version info
         self.run_command('egg_info')
+        self._section_name = self.repository
         _register.run(self)
 
+    def _read_pypirc(self):
+        """Reads the .pypirc file."""
+        rc = self._get_rc_file()
+        if os.path.exists(rc):
+            repository = self.repository
+            config = ConfigParser()
+            config.read(rc)
+            sections = config.sections()
+            if 'distutils' in sections:
+                # let's get the list of servers
+                index_servers = config.get('distutils', 'index-servers')
+                _servers = [server.strip() for server in
+                            index_servers.split('\n')
+                            if server.strip() != '']
+                if _servers == []:
+                    # nothing set, let's try to get the default pypi
+                    if 'pypi' in sections:
+                        _servers = ['pypi']
+                    else:
+                        # the file is not properly defined, returning
+                        # an empty dict
+                        return {}
+                for server in _servers:
+                    current = {'server': server}
+                    current['username'] = config.get(server, 'username')
+
+                    # optional params
+                    for key, default in (('repository',
+                                          None),
+                                         ('realm', self.DEFAULT_REALM),
+                                         ('password', None)):
+                        if config.has_option(server, key):
+                            current[key] = config.get(server, key)
+                        else:
+                            current[key] = default
+                    if (current['server'] == repository or
+                        current['repository'] == repository):
+                        return current
+            elif 'server-login' in sections:
+                # old format
+                server = 'server-login'
+                if config.has_option(server, 'repository'):
+                    repository = config.get(server, 'repository')
+                else:
+                    repository = None
+                return {'username': config.get(server, 'username'),
+                        'password': config.get(server, 'password'),
+                        'repository': repository,
+                        'server': server,
+                        'realm': self.DEFAULT_REALM}
+
+        return {}
+
+    def _set_config(self):
+        _register._set_config(self)
+        if self.repository is None:
+                raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 1f49745e3e..042fcbb5ae 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -2,6 +2,7 @@
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
+
 from distutils.errors import *
 from distutils.core import Command
 from distutils.spawn import spawn
@@ -11,6 +12,7 @@
 except ImportError:
     from md5 import md5
 import os
+import sys
 import socket
 import platform
 import ConfigParser
@@ -19,7 +21,7 @@
 import urlparse
 import cStringIO as StringIO
 
-class upload(Command):
+class _upload(Command):
 
     description = "upload binary package to PyPI"
 
@@ -65,7 +67,7 @@ def finalize_options(self):
                 if not self.password:
                     self.password = config.get('server-login', 'password')
         if not self.repository:
-            self.repository = self.DEFAULT_REPOSITORY
+            raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
 
     def run(self):
         if not self.distribution.dist_files:
@@ -181,3 +183,75 @@ def upload_file(self, command, pyversion, filename):
                           log.ERROR)
         if self.show_response:
             print '-'*75, r.read(), '-'*75
+
+if sys.version >= "2.5":
+    from distutils.command.upload import upload as distutils_upload
+    class upload(distutils_upload):
+
+        def run(self):
+            self._section_name = self.repository
+            distutils_upload.run(self)
+
+        def _read_pypirc(self):
+            """Reads the .pypirc file."""
+            self._section_name = self.repository
+            rc = self._get_rc_file()
+            if os.path.exists(rc):
+                repository = self.repository
+                config = ConfigParser.ConfigParser()
+                config.read(rc)
+                sections = config.sections()
+                if 'distutils' in sections:
+                    # let's get the list of servers
+                    index_servers = config.get('distutils', 'index-servers')
+                    _servers = [server.strip() for server in
+                                index_servers.split('\n')
+                                if server.strip() != '']
+                    if _servers == []:
+                        # nothing set, let's try to get the default pypi
+                        if 'pypi' in sections:
+                            _servers = ['pypi']
+                        else:
+                            # the file is not properly defined, returning
+                            # an empty dict
+                            return {}
+                    for server in _servers:
+                        current = {'server': server}
+                        current['username'] = config.get(server, 'username')
+
+                        # optional params
+                        for key, default in (('repository',
+                                              None),
+                                             ('realm', self.DEFAULT_REALM),
+                                             ('password', None)):
+                            if config.has_option(server, key):
+                                current[key] = config.get(server, key)
+                            else:
+                                current[key] = default
+                        if (current['server'] == repository or
+                            current['repository'] == repository):
+                            return current
+                elif 'server-login' in sections:
+                    # old format
+                    server = 'server-login'
+                    if config.has_option(server, 'repository'):
+                        repository = config.get(server, 'repository')
+                    else:
+                        repository = None
+                    return {'username': config.get(server, 'username'),
+                            'password': config.get(server, 'password'),
+                            'repository': repository,
+                            'server': server,
+                            'realm': self.DEFAULT_REALM}
+
+            return {}
+
+        def finalize_options(self):
+            distutils_upload.finalize_options(self)
+            if not self.repository:
+                raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
+
+
+else:
+    upload = _upload
+

From 9806553a0ad3bb86da844606fbef832d5fccd106 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:28:31 +0300
Subject: [PATCH 3293/8469] Added tag 0.6.23 for changeset 1a1ab844f03e

--HG--
branch : distribute
extra : rebase_source : 1b1d9c1b07b730213328ea606e8bc78052cfd1a5
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 734cd0c073..a63d11de3c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -29,3 +29,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
 a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
 c4a375336d552129aef174486018ed09c212d684 0.6.20
 de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
+1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23

From ea5a0098d408c1390a392d772b21b378a3880c22 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:28:31 +0300
Subject: [PATCH 3294/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : 830f7186c8f3c26e86eac1e4287f0545e23a2744
---
 CHANGES.txt         | 15 +++++++++++++++
 distribute_setup.py |  2 +-
 release.sh          |  2 +-
 setup.py            |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fe529fb3a5..855447a786 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+------
+0.6.23
+------
+
+* Issue #244: Fixed a test
+* Issue #243: Fixed a test
+* Issue #239: Fixed a test
+* Issue #240: Fixed a test
+* Issue #241: Fixed a test
+* Issue #237: Fixed a test
+* Issue #238: easy_install now uses 64bit executable wrappers on 64bit Python
+* Issue #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
+* Issue #207: Windows cli and gui wrappers pass CTRL-C to child python process
+* Issue #227: easy_install now passe its arguments to setup.py bdist_egg
+
 ------
 0.6.22
 ------
diff --git a/distribute_setup.py b/distribute_setup.py
index 2ee0f1249f..a16284497b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.22"
+DEFAULT_VERSION = "0.6.23"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/release.sh b/release.sh
index 0da1886273..cad44245a5 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.22"
+export VERSION="0.6.23"
 
 # tagging
 hg tag $VERSION
diff --git a/setup.py b/setup.py
index 3e9754c789..216cdd2a7f 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.22"
+VERSION = "0.6.23"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 1aa72667bc16834643bd9bc90fd226430b757d76 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:44:15 +0300
Subject: [PATCH 3295/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : 8fb241578720e046ebd938075664d0dc6bea0171
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 3b205225af..1a12642720 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -33,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.3 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 829e6f0672d0b22fc93209599053e39691111520 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:45:50 +0300
Subject: [PATCH 3296/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : d66cd994b21e83e8419c4d94a0eb965f16d9ca83
---
 README.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.txt b/README.txt
index 8faa59b472..887d811c6a 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.22.tar.gz
-    $ tar -xzvf distribute-0.6.22.tar.gz
-    $ cd distribute-0.6.22
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.23.tar.gz
+    $ tar -xzvf distribute-0.6.23.tar.gz
+    $ cd distribute-0.6.23
     $ python setup.py install
 
 ---------------------------

From ab76d9a3b0a38651bb07cb7aacba59ab7b9742fc Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:46:10 +0300
Subject: [PATCH 3297/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : e74b24ad1789428a550b7ef8593c1ffa04656087
---
 distribute.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1a12642720..acbe228182 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -33,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl

From 64cbfc7a171da28d6688356e27ae470b7ac41341 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:56:33 +0300
Subject: [PATCH 3298/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : 8ed8b565fc2a32f8da055ec9892a5a34daf6a24f
---
 docs/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index e52891fe7a..601ac6ab68 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.17'
+version = '0.6.23'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.17'
+release = '0.6.23'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From b14d6f5de65d65d25af6a64741dad5160182ba48 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:57:34 +0300
Subject: [PATCH 3299/8469] Added tag 0.6.23 for changeset 9406c5dac842

--HG--
branch : distribute
extra : rebase_source : 3e5a3d601c2c26d983e310ed298624ef241888dd
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index a63d11de3c..afbb60ffd3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -30,3 +30,5 @@ a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
 c4a375336d552129aef174486018ed09c212d684 0.6.20
 de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
+1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
+9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23

From ae7bd543495b7f0bb55ab674df1d01fdb47d1cc4 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 18:57:34 +0300
Subject: [PATCH 3300/8469] bumped revision

--HG--
branch : distribute
extra : rebase_source : ff16d114bfdaff7a969371dfb51f303298fec106
---
 release.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index cad44245a5..9c98f1d507 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@
 export VERSION="0.6.23"
 
 # tagging
-hg tag $VERSION
+hg tag $VERSION -f
 hg ci -m "bumped revision"
 
 # creating the releases
@@ -11,6 +11,7 @@ rm -rf ./dist
 # now preparing the source release, pushing it and its doc
 python2.6 setup.py -q egg_info -RDb '' sdist register upload
 cd docs/
+make clean
 make html
 cd ..
 python2.6 setup.py upload_docs

From d36c067b3247bf7dc3102051b088fe744ac74ae0 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 20:50:45 +0300
Subject: [PATCH 3301/8469] Issue #246

--HG--
branch : distribute
extra : rebase_source : e14172505ff8938f00f51de4f29a8fb2834ac933
---
 setup.cfg                    | 2 +-
 setuptools/command/upload.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d7dfbb772e..0c5596134d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = dev
+tag_build = 
 tag_svn_revision = 1
 
 [aliases]
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 042fcbb5ae..1b70894395 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -228,8 +228,10 @@ def _read_pypirc(self):
                                 current[key] = config.get(server, key)
                             else:
                                 current[key] = default
+                        # Issue #246, handling url ambiguity
                         if (current['server'] == repository or
-                            current['repository'] == repository):
+                            current['repository'] == repository or
+                            (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)):
                             return current
                 elif 'server-login' in sections:
                     # old format

From 694a9231f495a82cf62340f9b98eb4fd7272ecf3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 4 Oct 2011 11:01:49 -0400
Subject: [PATCH 3302/8469] Added options to exclude 2to3 fixers. Fixes #249

--HG--
branch : distribute
extra : rebase_source : 2033bcdd4c2e78e0e03796f1f9cf6d6e9a59fc21
---
 CHANGES.txt                    |  1 +
 docs/python3.txt               | 33 +++++++++++++++------------------
 setup.py                       |  3 ++-
 setuptools/command/build_py.py | 28 +++++++++++++++++++++-------
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 855447a786..6b981dd47d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@ CHANGES
 * Issue #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
 * Issue #207: Windows cli and gui wrappers pass CTRL-C to child python process
 * Issue #227: easy_install now passe its arguments to setup.py bdist_egg
+* Issue #249: Added options to exclude 2to3 fixers
 
 ------
 0.6.22
diff --git a/docs/python3.txt b/docs/python3.txt
index 43845f609d..2f6cde4ab3 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -26,18 +26,20 @@ directory, as opposed from the source directory as is normally done.
 
 Distribute will convert all Python files, and also all doctests in Python
 files. However, if you have doctests located in separate text files, these
-will not automatically be converted. By adding them to the 
-``convert_2to3_doctests`` keyword parameter Distrubute will convert them as 
-well. 
+will not automatically be converted. By adding them to the
+``convert_2to3_doctests`` keyword parameter Distrubute will convert them as
+well.
 
 By default, the conversion uses all fixers in the ``lib2to3.fixers`` package.
-To use additional fixes, the parameter ``use_2to3_fixers`` can be set
-to a list of names of packages containing fixers.
+To use additional fixers, the parameter ``use_2to3_fixers`` can be set
+to a list of names of packages containing fixers. To exclude fixers, the
+parameter ``use_2to3_exclude_fixers`` can be set to fixer names to be
+skipped.
 
 A typical setup.py can look something like this::
 
     from setuptools import setup
-    
+
     setup(
         name='your.module',
         version = '1.0',
@@ -49,7 +51,8 @@ A typical setup.py can look something like this::
         test_suite = 'your.module.tests',
         use_2to3 = True,
         convert_2to3_doctests = ['src/your/module/README.txt'],
-        use_2to3_fixers = ['your.fixers']
+        use_2to3_fixers = ['your.fixers'],
+        use_2to3_exclude_fixers = ['lib2to3.fixes.fix_import'],
     )
 
 Differential conversion
@@ -58,10 +61,10 @@ Differential conversion
 Note that a file will only be copied and converted during the build process
 if the source file has been changed. If you add a file to the doctests
 that should be converted, it will not be converted the next time you run
-the tests, since it hasn't been modified. You need to remove it from the 
+the tests, since it hasn't been modified. You need to remove it from the
 build directory. Also if you run the build, install or test commands before
 adding the use_2to3 parameter, you will have to remove the build directory
-before you run the test command, as the files otherwise will seem updated, 
+before you run the test command, as the files otherwise will seem updated,
 and no conversion will happen.
 
 In general, if code doesn't seem to be converted, deleting the build directory
@@ -80,12 +83,6 @@ already converted code, and hence no 2to3 conversion is needed during install.
 Advanced features
 =================
 
-If certain fixers are to be suppressed, this again can be overridden with the
-list ``setuptools.command.build_py.build_py.fixer_names``, which at some
-point contains the list of all fixer class names. For an example of how this
-can be done, see the `jaraco.util <https://bitbucket.org/jaraco/jaraco.util>`_
-project.
-
 If you don't want to run the 2to3 conversion on the doctests in Python files,
 you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.
 
@@ -96,18 +93,18 @@ Setuptools do not know about the new keyword parameters to support Python 3.
 As a result it will warn about the unknown keyword parameters if you use
 setuptools instead of Distribute under Python 2. This is not an error, and
 install process will continue as normal, but if you want to get rid of that
-error this is easy. Simply conditionally add the new parameters into an extra 
+error this is easy. Simply conditionally add the new parameters into an extra
 dict and pass that dict into setup()::
 
     from setuptools import setup
     import sys
-    
+
     extra = {}
     if sys.version_info >= (3,):
         extra['use_2to3'] = True
         extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
         extra['use_2to3_fixers'] = ['your.fixers']
-    
+
     setup(
         name='your.module',
         version = '1.0',
diff --git a/setup.py b/setup.py
index 216cdd2a7f..28efcf9756 100755
--- a/setup.py
+++ b/setup.py
@@ -172,7 +172,8 @@ def _being_installed():
             "test_loader            = setuptools.dist:check_importable",
             "use_2to3               = setuptools.dist:assert_bool",
             "convert_2to3_doctests  = setuptools.dist:assert_string_list",
-            "use_2to3_fixers = setuptools.dist:assert_string_list",
+            "use_2to3_fixers        = setuptools.dist:assert_string_list",
+            "use_2to3_exclude_fixers = setuptools.dist:assert_string_list",
         ],
 
         "egg_info.writers": [
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index a01e28430a..d53960fe47 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -28,13 +28,8 @@ def run_2to3(self, files, doctests = False):
             if not files:
                 return
             log.info("Fixing "+" ".join(files))
-            if not self.fixer_names:
-                self.fixer_names = []
-                for p in setuptools.lib2to3_fixer_packages:
-                    self.fixer_names.extend(get_fixers_from_package(p))
-                if self.distribution.use_2to3_fixers is not None:
-                    for p in self.distribution.use_2to3_fixers:
-                        self.fixer_names.extend(get_fixers_from_package(p))
+            self.__build_fixer_names()
+            self.__exclude_fixers()
             if doctests:
                 if setuptools.run_2to3_on_doctests:
                     r = DistutilsRefactoringTool(self.fixer_names)
@@ -42,6 +37,25 @@ def run_2to3(self, files, doctests = False):
             else:
                 _Mixin2to3.run_2to3(self, files)
 
+        def __build_fixer_names(self):
+            if self.fixer_names: return
+            self.fixer_names = []
+            for p in setuptools.lib2to3_fixer_packages:
+                self.fixer_names.extend(get_fixers_from_package(p))
+            if self.distribution.use_2to3_fixers is not None:
+                for p in self.distribution.use_2to3_fixers:
+                    self.fixer_names.extend(get_fixers_from_package(p))
+
+        def __exclude_fixers(self):
+            excluded_fixers = getattr(self, 'exclude_fixers', [])
+            if self.distribution.use_2to3_exclude_fixers is not None:
+                excluded_fixers.extend(self.distribution.use_2to3_exclude_fixers)
+            for fixer_name in excluded_fixers:
+                if fixer_name not in self.fixer_names:
+                    log.warn("Excluded fixer %s not found", fixer_name)
+                    continue
+                self.fixer_names.remove(fixer_name)
+
 except ImportError:
     class Mixin2to3:
         def run_2to3(self, files, doctests=True):

From c2389b351fe071241bf68ec9d43a9fd384e84181 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 4 Oct 2011 11:28:31 -0400
Subject: [PATCH 3303/8469] Updated changelog to reflect change in proper
 revision

--HG--
branch : distribute
extra : rebase_source : cf900f1bec43dfd946065d1acc6ce88c726319a2
---
 CHANGES.txt                          | 7 ++++++-
 distribute.egg-info/entry_points.txt | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6b981dd47d..a5b4f2bb0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.24
+------
+
+* Issue #249: Added options to exclude 2to3 fixers
+
 ------
 0.6.23
 ------
@@ -16,7 +22,6 @@ CHANGES
 * Issue #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
 * Issue #207: Windows cli and gui wrappers pass CTRL-C to child python process
 * Issue #227: easy_install now passe its arguments to setup.py bdist_egg
-* Issue #249: Added options to exclude 2to3 fixers
 
 ------
 0.6.22
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index acbe228182..4801e1f9fa 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -33,7 +33,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
@@ -42,6 +42,7 @@ svn_cvs = setuptools.command.sdist:_default_revctrl
 dependency_links = setuptools.dist:assert_string_list
 entry_points = setuptools.dist:check_entry_points
 extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 package_data = setuptools.dist:check_package_data
 install_requires = setuptools.dist:check_requirements
 use_2to3 = setuptools.dist:assert_bool

From 837d8866a41ffe9d035b65361513ab06dc964a27 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Oct 2011 10:57:28 -0400
Subject: [PATCH 3304/8469] Updated CHANGES to reflect that 0.6.22 was never
 tagged/released.

--HG--
branch : distribute
extra : rebase_source : d29f1577e0e39e6d881b148a6f78cc848ddab07d
---
 CHANGES.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a5b4f2bb0b..85b1c269c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,12 +21,7 @@ CHANGES
 * Issue #238: easy_install now uses 64bit executable wrappers on 64bit Python
 * Issue #208: Fixed parsed_versions, it now honors post-releases as noted in the documentation
 * Issue #207: Windows cli and gui wrappers pass CTRL-C to child python process
-* Issue #227: easy_install now passe its arguments to setup.py bdist_egg
-
-------
-0.6.22
-------
-
+* Issue #227: easy_install now passes its arguments to setup.py bdist_egg
 * Issue #225: Fixed a NameError on Python 2.5, 2.4
 
 ------

From 257f23372a797ede9e14ae3e62c8319896943857 Mon Sep 17 00:00:00 2001
From: "Guy Rozendorn (guyr@infinidat.com)"
 <Guy Rozendorn (guyr@infinidat.com)>
Date: Fri, 7 Oct 2011 18:55:31 +0200
Subject: [PATCH 3305/8469] Revert 8d1cb51a01b6 because of issue #250

--HG--
branch : distribute
extra : rebase_source : 842a0d796e6e3cd5ecf312dd5c3ff2bb35d601a5
---
 setup.cfg                    | 2 +-
 setuptools/command/upload.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 0c5596134d..d7dfbb772e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = 
+tag_build = dev
 tag_svn_revision = 1
 
 [aliases]
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 1b70894395..f2e0b2e139 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -228,10 +228,7 @@ def _read_pypirc(self):
                                 current[key] = config.get(server, key)
                             else:
                                 current[key] = default
-                        # Issue #246, handling url ambiguity
-                        if (current['server'] == repository or
-                            current['repository'] == repository or
-                            (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)):
+                                if (current['server'] == repository:
                             return current
                 elif 'server-login' in sections:
                     # old format

From d5df4531433b2031186ed2a8b335892b3600912b Mon Sep 17 00:00:00 2001
From: "Guy Rozendorn (guyr@infinidat.com)"
 <Guy Rozendorn (guyr@infinidat.com)>
Date: Fri, 7 Oct 2011 19:08:55 +0200
Subject: [PATCH 3306/8469] Reverting 1a1ab844f03e due to issue 250

--HG--
branch : distribute
extra : rebase_source : 0dca5e604c96429f07c4d7786d3a0991c42c129d
---
 distribute.egg-info/entry_points.txt |  1 -
 setuptools/command/__init__.py       |  4 ++
 setuptools/command/register.py       | 60 ----------------------
 setuptools/command/upload.py         | 76 +---------------------------
 4 files changed, 6 insertions(+), 135 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 4801e1f9fa..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -8,7 +8,6 @@ saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
 upload_docs = setuptools.command.upload_docs:upload_docs
-upload = setuptools.command.upload:upload
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
 alias = setuptools.command.alias:alias
 easy_install = setuptools.command.easy_install:easy_install
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index a601e2d3d7..b063fa1925 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -8,6 +8,10 @@
 from setuptools.command import install_scripts
 import sys
 
+if sys.version>='2.5':
+    # In Python 2.5 and above, distutils includes its own upload command
+    __all__.remove('upload')
+
 from distutils.command.bdist import bdist
 
 if 'egg' not in bdist.format_commands:
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 874401a5ca..3b2e085907 100755
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,6 +1,4 @@
 from distutils.command.register import register as _register
-from ConfigParser import ConfigParser
-import os
 
 class register(_register):
     __doc__ = _register.__doc__
@@ -8,63 +6,5 @@ class register(_register):
     def run(self):
         # Make sure that we are using valid current name/version info
         self.run_command('egg_info')
-        self._section_name = self.repository
         _register.run(self)
 
-    def _read_pypirc(self):
-        """Reads the .pypirc file."""
-        rc = self._get_rc_file()
-        if os.path.exists(rc):
-            repository = self.repository
-            config = ConfigParser()
-            config.read(rc)
-            sections = config.sections()
-            if 'distutils' in sections:
-                # let's get the list of servers
-                index_servers = config.get('distutils', 'index-servers')
-                _servers = [server.strip() for server in
-                            index_servers.split('\n')
-                            if server.strip() != '']
-                if _servers == []:
-                    # nothing set, let's try to get the default pypi
-                    if 'pypi' in sections:
-                        _servers = ['pypi']
-                    else:
-                        # the file is not properly defined, returning
-                        # an empty dict
-                        return {}
-                for server in _servers:
-                    current = {'server': server}
-                    current['username'] = config.get(server, 'username')
-
-                    # optional params
-                    for key, default in (('repository',
-                                          None),
-                                         ('realm', self.DEFAULT_REALM),
-                                         ('password', None)):
-                        if config.has_option(server, key):
-                            current[key] = config.get(server, key)
-                        else:
-                            current[key] = default
-                    if (current['server'] == repository or
-                        current['repository'] == repository):
-                        return current
-            elif 'server-login' in sections:
-                # old format
-                server = 'server-login'
-                if config.has_option(server, 'repository'):
-                    repository = config.get(server, 'repository')
-                else:
-                    repository = None
-                return {'username': config.get(server, 'username'),
-                        'password': config.get(server, 'password'),
-                        'repository': repository,
-                        'server': server,
-                        'realm': self.DEFAULT_REALM}
-
-        return {}
-
-    def _set_config(self):
-        _register._set_config(self)
-        if self.repository is None:
-                raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index f2e0b2e139..4bd6021d91 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -2,7 +2,6 @@
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
-
 from distutils.errors import *
 from distutils.core import Command
 from distutils.spawn import spawn
@@ -12,7 +11,6 @@
 except ImportError:
     from md5 import md5
 import os
-import sys
 import socket
 import platform
 import ConfigParser
@@ -21,7 +19,7 @@
 import urlparse
 import cStringIO as StringIO
 
-class _upload(Command):
+class upload(Command):
 
     description = "upload binary package to PyPI"
 
@@ -67,7 +65,7 @@ def finalize_options(self):
                 if not self.password:
                     self.password = config.get('server-login', 'password')
         if not self.repository:
-            raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
+            self.repository = self.DEFAULT_REPOSITORY
 
     def run(self):
         if not self.distribution.dist_files:
@@ -184,73 +182,3 @@ def upload_file(self, command, pyversion, filename):
         if self.show_response:
             print '-'*75, r.read(), '-'*75
 
-if sys.version >= "2.5":
-    from distutils.command.upload import upload as distutils_upload
-    class upload(distutils_upload):
-
-        def run(self):
-            self._section_name = self.repository
-            distutils_upload.run(self)
-
-        def _read_pypirc(self):
-            """Reads the .pypirc file."""
-            self._section_name = self.repository
-            rc = self._get_rc_file()
-            if os.path.exists(rc):
-                repository = self.repository
-                config = ConfigParser.ConfigParser()
-                config.read(rc)
-                sections = config.sections()
-                if 'distutils' in sections:
-                    # let's get the list of servers
-                    index_servers = config.get('distutils', 'index-servers')
-                    _servers = [server.strip() for server in
-                                index_servers.split('\n')
-                                if server.strip() != '']
-                    if _servers == []:
-                        # nothing set, let's try to get the default pypi
-                        if 'pypi' in sections:
-                            _servers = ['pypi']
-                        else:
-                            # the file is not properly defined, returning
-                            # an empty dict
-                            return {}
-                    for server in _servers:
-                        current = {'server': server}
-                        current['username'] = config.get(server, 'username')
-
-                        # optional params
-                        for key, default in (('repository',
-                                              None),
-                                             ('realm', self.DEFAULT_REALM),
-                                             ('password', None)):
-                            if config.has_option(server, key):
-                                current[key] = config.get(server, key)
-                            else:
-                                current[key] = default
-                                if (current['server'] == repository:
-                            return current
-                elif 'server-login' in sections:
-                    # old format
-                    server = 'server-login'
-                    if config.has_option(server, 'repository'):
-                        repository = config.get(server, 'repository')
-                    else:
-                        repository = None
-                    return {'username': config.get(server, 'username'),
-                            'password': config.get(server, 'password'),
-                            'repository': repository,
-                            'server': server,
-                            'realm': self.DEFAULT_REALM}
-
-            return {}
-
-        def finalize_options(self):
-            distutils_upload.finalize_options(self)
-            if not self.repository:
-                raise ValueError('%s is missing a repository value in .pypirc' % self._section_name)
-
-
-else:
-    upload = _upload
-

From c29e03a0344d5914bc500782ffc243dee4e3aac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 7 Oct 2011 23:13:45 +0200
Subject: [PATCH 3307/8469] Make C code in one distutils test comply with ISO C
 (#10359).

Patch by Hallvard B Furuseth.
---
 tests/test_config_cmd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 4f7ebdd9fc..e2e6e4ebaa 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -44,10 +44,10 @@ def test_search_cpp(self):
         cmd = config(dist)
 
         # simple pattern searches
-        match = cmd.search_cpp(pattern='xxx', body='// xxx')
+        match = cmd.search_cpp(pattern='xxx', body='/* xxx */')
         self.assertEqual(match, 0)
 
-        match = cmd.search_cpp(pattern='_configtest', body='// xxx')
+        match = cmd.search_cpp(pattern='_configtest', body='/* xxx */')
         self.assertEqual(match, 1)
 
     def test_finalize_options(self):

From 37dc7d3a99a8690db8fe7db84f27a2a2a2fff76f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 8 Oct 2011 00:34:13 +0200
Subject: [PATCH 3308/8469] Fix distutils byte-compilation to comply with PEP
 3147 (#11254).

Patch by Jeff Ramnani.  Tested with -B, -O and -OO.
---
 tests/test_build_py.py    |  9 ++++++---
 tests/test_install_lib.py | 11 +++++++----
 util.py                   | 11 +++++++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 4e46339b43..80316ad7d0 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import io
+import imp
 import unittest
 
 from distutils.command.build_py import build_py
@@ -57,13 +58,15 @@ def test_package_data(self):
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
+        pycache_dir = os.path.join(pkgdest, "__pycache__")
         self.assertIn("__init__.py", files)
         self.assertIn("README.txt", files)
-        # XXX even with -O, distutils writes pyc, not pyo; bug?
         if sys.dont_write_bytecode:
-            self.assertNotIn("__init__.pyc", files)
+            self.assertFalse(os.path.exists(pycache_dir))
         else:
-            self.assertIn("__init__.pyc", files)
+            # XXX even with -O, distutils writes pyc, not pyo; bug?
+            pyc_files = os.listdir(pycache_dir)
+            self.assertIn("__init__.%s.pyc" % imp.get_tag(), pyc_files)
 
     def test_empty_package_dir(self):
         # See SF 1668596/1720897.
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index fddaabe111..b42b03b2fa 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -1,6 +1,7 @@
 """Tests for distutils.command.install_data."""
 import sys
 import os
+import imp
 import unittest
 
 from distutils.command.install_lib import install_lib
@@ -32,18 +33,20 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEqual(cmd.optimize, 2)
 
-    @unittest.skipUnless(not sys.dont_write_bytecode,
-                         'byte-compile not supported')
+    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
     def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
+        os.chdir(pkg_dir)
         cmd = install_lib(dist)
         cmd.compile = cmd.optimize = 1
 
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        pyc_file = imp.cache_from_source('foo.py')
+        pyo_file = imp.cache_from_source('foo.py', debug_override=False)
+        self.assertTrue(os.path.exists(pyc_file))
+        self.assertTrue(os.path.exists(pyo_file))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/util.py b/util.py
index 023ddffc82..631f5dfb70 100644
--- a/util.py
+++ b/util.py
@@ -4,7 +4,11 @@
 one of the other *util.py modules.
 """
 
-import sys, os, string, re
+import os
+import re
+import imp
+import sys
+import string
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -529,7 +533,10 @@ def byte_compile (py_files,
             # Terminology from the py_compile module:
             #   cfile - byte-compiled file
             #   dfile - purported source filename (same as 'file' by default)
-            cfile = file + (__debug__ and "c" or "o")
+            if optimize >= 0:
+                cfile = imp.cache_from_source(file, debug_override=not optimize)
+            else:
+                cfile = imp.cache_from_source(file)
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:

From b51f2da1992ea985b9df544c8240936a89c162bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 8 Oct 2011 01:56:52 +0200
Subject: [PATCH 3309/8469] Fix distutils.sysconfig.get_makefile_filename when
 prefix != exec-prefix

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 5ea724c096..ac06313b19 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -218,7 +218,7 @@ def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
         return os.path.join(os.path.dirname(sys.executable), "Makefile")
-    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
+    lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
     return os.path.join(lib_dir, config_file, 'Makefile')
 

From d90cd637fcbde15bfe066c0758f4ce2f456e4e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 8 Oct 2011 02:15:55 +0200
Subject: [PATCH 3310/8469] Make C code in one distutils test comply with ISO C
 (#10359).

Patch by Hallvard B Furuseth.
---
 tests/test_config_cmd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index a36a1d5b49..2cf3886cb5 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -44,10 +44,10 @@ def test_search_cpp(self):
         cmd = config(dist)
 
         # simple pattern searches
-        match = cmd.search_cpp(pattern='xxx', body='// xxx')
+        match = cmd.search_cpp(pattern='xxx', body='/* xxx */')
         self.assertEqual(match, 0)
 
-        match = cmd.search_cpp(pattern='_configtest', body='// xxx')
+        match = cmd.search_cpp(pattern='_configtest', body='/* xxx */')
         self.assertEqual(match, 1)
 
     def test_finalize_options(self):

From 8cc629dc1088bc2883ebad92b778c22c0134b6be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 8 Oct 2011 03:02:37 +0200
Subject: [PATCH 3311/8469] Fix docstring of distutils.util.byte_compile
 (followup for #11254)

---
 util.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util.py b/util.py
index 631f5dfb70..f42c6a18b9 100644
--- a/util.py
+++ b/util.py
@@ -419,9 +419,9 @@ def byte_compile (py_files,
                   verbose=1, dry_run=0,
                   direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.  'py_files' is a list of files
-    to compile; any files that don't end in ".py" are silently skipped.
-    'optimize' must be one of the following:
+    or .pyo files in a __pycache__ subdirectory.  'py_files' is a list
+    of files to compile; any files that don't end in ".py" are silently
+    skipped.  'optimize' must be one of the following:
       0 - don't optimize (generate .pyc)
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")

From 7558986e63b1d4b62bacb37b89c13a7221ec43f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 9 Oct 2011 07:11:19 +0200
Subject: [PATCH 3312/8469] =?UTF-8?q?Fix=20distutils=E2=80=99=20check=20an?=
 =?UTF-8?q?d=20register=20Unicode=20handling=20(#13114).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The check command was fixed by Kirill Kuzminykh.

The register command was using StringIO.getvalue, which uses “''.join�
and thus coerces to str using the default encoding (ASCII), so I changed
the code to use one extra intermediary list and correctly encode to
UTF-8.
---
 command/check.py       |  3 +++
 command/register.py    | 28 ++++++++++++++++++----------
 tests/test_check.py    | 14 ++++++++++++--
 tests/test_register.py | 20 +++++++++++++++++++-
 4 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/command/check.py b/command/check.py
index bc29baaba4..4b64e458bc 100644
--- a/command/check.py
+++ b/command/check.py
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 from distutils.core import Command
+from distutils.dist import PKG_INFO_ENCODING
 from distutils.errors import DistutilsSetupError
 
 try:
@@ -108,6 +109,8 @@ def check_metadata(self):
     def check_restructuredtext(self):
         """Checks if the long string fields are reST-compliant."""
         data = self.distribution.get_long_description()
+        if not isinstance(data, unicode):
+            data = data.decode(PKG_INFO_ENCODING)
         for warning in self._check_rst_data(data):
             line = warning[-1].get('line')
             if line is None:
diff --git a/command/register.py b/command/register.py
index dc089902f1..edb42b955d 100644
--- a/command/register.py
+++ b/command/register.py
@@ -10,7 +10,6 @@
 import urllib2
 import getpass
 import urlparse
-import StringIO
 from warnings import warn
 
 from distutils.core import PyPIRCCommand
@@ -260,21 +259,30 @@ def post_to_server(self, data, auth=None):
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = '\n--' + boundary
         end_boundary = sep_boundary + '--'
-        body = StringIO.StringIO()
+        chunks = []
         for key, value in data.items():
             # handle multiple entries for the same name
             if type(value) not in (type([]), type( () )):
                 value = [value]
             for value in value:
-                body.write(sep_boundary)
-                body.write('\nContent-Disposition: form-data; name="%s"'%key)
-                body.write("\n\n")
-                body.write(value)
+                chunks.append(sep_boundary)
+                chunks.append('\nContent-Disposition: form-data; name="%s"'%key)
+                chunks.append("\n\n")
+                chunks.append(value)
                 if value and value[-1] == '\r':
-                    body.write('\n')  # write an extra newline (lurve Macs)
-        body.write(end_boundary)
-        body.write("\n")
-        body = body.getvalue()
+                    chunks.append('\n')  # write an extra newline (lurve Macs)
+        chunks.append(end_boundary)
+        chunks.append("\n")
+
+        # chunks may be bytes (str) or unicode objects that we need to encode
+        body = []
+        for chunk in chunks:
+            if isinstance(chunk, unicode):
+                body.append(chunk.encode('utf-8'))
+            else:
+                body.append(chunk)
+
+        body = ''.join(body)
 
         # build the Request
         headers = {
diff --git a/tests/test_check.py b/tests/test_check.py
index 4ea83dcb79..f73342ade8 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf8 -*-
 """Tests for distutils.command.check."""
 import unittest
 from test.test_support import run_unittest
@@ -46,6 +47,15 @@ def test_check_metadata(self):
         cmd = self._run(metadata, strict=1)
         self.assertEqual(cmd._warnings, 0)
 
+        # now a test with Unicode entries
+        metadata = {'url': u'xxx', 'author': u'\u00c9ric',
+                    'author_email': u'xxx', u'name': 'xxx',
+                    'version': u'xxx',
+                    'description': u'Something about esszet \u00df',
+                    'long_description': u'More things about esszet \u00df'}
+        cmd = self._run(metadata)
+        self.assertEqual(cmd._warnings, 0)
+
     def test_check_document(self):
         if not HAS_DOCUTILS: # won't test without docutils
             return
@@ -80,8 +90,8 @@ def test_check_restructuredtext(self):
         self.assertRaises(DistutilsSetupError, self._run, metadata,
                           **{'strict': 1, 'restructuredtext': 1})
 
-        # and non-broken rest
-        metadata['long_description'] = 'title\n=====\n\ntest'
+        # and non-broken rest, including a non-ASCII character to test #12114
+        metadata['long_description'] = u'title\n=====\n\ntest \u00df'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEqual(cmd._warnings, 0)
 
diff --git a/tests/test_register.py b/tests/test_register.py
index bf63487035..aa9bc43c5c 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -1,5 +1,5 @@
-"""Tests for distutils.command.register."""
 # -*- encoding: utf8 -*-
+"""Tests for distutils.command.register."""
 import sys
 import os
 import unittest
@@ -246,6 +246,24 @@ def test_strict(self):
         finally:
             del register_module.raw_input
 
+        # and finally a Unicode test (bug #12114)
+        metadata = {'url': u'xxx', 'author': u'\u00c9ric',
+                    'author_email': u'xxx', u'name': 'xxx',
+                    'version': u'xxx',
+                    'description': u'Something about esszet \u00df',
+                    'long_description': u'More things about esszet \u00df'}
+
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        inputs = RawInputs('1', 'tarek', 'y')
+        register_module.raw_input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.raw_input
+
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
         cmd = self._get_cmd()

From c43ef144109d289030fdc9851cbd89b6700dcb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 9 Oct 2011 07:25:33 +0200
Subject: [PATCH 3313/8469] =?UTF-8?q?Add=20tests=20for=20Unicode=20handlin?=
 =?UTF-8?q?g=20in=20distutils=E2=80=99=20check=20and=20register=20(#13114)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/test_check.py    | 13 +++++++++++--
 tests/test_register.py | 20 +++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/tests/test_check.py b/tests/test_check.py
index 229ae25c6d..4de64734c4 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -46,6 +46,15 @@ def test_check_metadata(self):
         cmd = self._run(metadata, strict=1)
         self.assertEqual(cmd._warnings, 0)
 
+        # now a test with non-ASCII characters
+        metadata = {'url': 'xxx', 'author': '\u00c9ric',
+                    'author_email': 'xxx', 'name': 'xxx',
+                    'version': 'xxx',
+                    'description': 'Something about esszet \u00df',
+                    'long_description': 'More things about esszet \u00df'}
+        cmd = self._run(metadata)
+        self.assertEqual(cmd._warnings, 0)
+
     def test_check_document(self):
         if not HAS_DOCUTILS: # won't test without docutils
             return
@@ -80,8 +89,8 @@ def test_check_restructuredtext(self):
         self.assertRaises(DistutilsSetupError, self._run, metadata,
                           **{'strict': 1, 'restructuredtext': 1})
 
-        # and non-broken rest
-        metadata['long_description'] = 'title\n=====\n\ntest'
+        # and non-broken rest, including a non-ASCII character to test #12114
+        metadata['long_description'] = 'title\n=====\n\ntest \u00df'
         cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEqual(cmd._warnings, 0)
 
diff --git a/tests/test_register.py b/tests/test_register.py
index cb72a11538..5863ae1422 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -214,7 +214,7 @@ def test_strict(self):
 
         # metadata are OK but long_description is broken
         metadata = {'url': 'xxx', 'author': 'xxx',
-                    'author_email': 'xxx',
+                    'author_email': 'éxéxé',
                     'name': 'xxx', 'version': 'xxx',
                     'long_description': 'title\n==\n\ntext'}
 
@@ -247,6 +247,24 @@ def test_strict(self):
         finally:
             del register_module.input
 
+        # and finally a Unicode test (bug #12114)
+        metadata = {'url': 'xxx', 'author': '\u00c9ric',
+                    'author_email': 'xxx', 'name': 'xxx',
+                    'version': 'xxx',
+                    'description': 'Something about esszet \u00df',
+                    'long_description': 'More things about esszet \u00df'}
+
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = 1
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
+        # let's run the command
+        try:
+            cmd.run()
+        finally:
+            del register_module.input
+
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
         cmd = self._get_cmd()

From a5b80fee6d16abbaa5c94ae1a6ea967cdfb3e888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 11 Oct 2011 02:45:51 +0200
Subject: [PATCH 3314/8469] Increase test coverage for distutils.filelist
 (#11751).

Patch by Justin Love.
---
 tests/test_filelist.py | 201 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 194 insertions(+), 7 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index c7e5201b17..f3304b2e33 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,11 +1,25 @@
 """Tests for distutils.filelist."""
+import re
 import unittest
+from distutils import debug
+from distutils.log import WARN
+from distutils.errors import DistutilsTemplateError
+from distutils.filelist import glob_to_re, translate_pattern, FileList
 
-from distutils.filelist import glob_to_re, FileList
 from test.support import captured_stdout, run_unittest
-from distutils import debug
+from distutils.tests import support
+
+
+class FileListTestCase(support.LoggingSilencer,
+                       unittest.TestCase):
 
-class FileListTestCase(unittest.TestCase):
+    def assertNoWarnings(self):
+        self.assertEqual(self.get_logs(WARN), [])
+        self.clear_logs()
+
+    def assertWarnings(self):
+        self.assertGreater(len(self.get_logs(WARN)), 0)
+        self.clear_logs()
 
     def test_glob_to_re(self):
         # simple cases
@@ -23,18 +37,191 @@ def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
             file_list.debug_print('xxx')
-        stdout.seek(0)
-        self.assertEqual(stdout.read(), '')
+        self.assertEqual(stdout.getvalue(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 file_list.debug_print('xxx')
-            stdout.seek(0)
-            self.assertEqual(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.getvalue(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
+    def test_set_allfiles(self):
+        file_list = FileList()
+        files = ['a', 'b', 'c']
+        file_list.set_allfiles(files)
+        self.assertEqual(file_list.allfiles, files)
+
+    def test_remove_duplicates(self):
+        file_list = FileList()
+        file_list.files = ['a', 'b', 'a', 'g', 'c', 'g']
+        # files must be sorted beforehand (sdist does it)
+        file_list.sort()
+        file_list.remove_duplicates()
+        self.assertEqual(file_list.files, ['a', 'b', 'c', 'g'])
+
+    def test_translate_pattern(self):
+        # not regex
+        self.assertTrue(hasattr(
+            translate_pattern('a', anchor=True, is_regex=False),
+            'search'))
+
+        # is a regex
+        regex = re.compile('a')
+        self.assertEqual(
+            translate_pattern(regex, anchor=True, is_regex=True),
+            regex)
+
+        # plain string flagged as regex
+        self.assertTrue(hasattr(
+            translate_pattern('a', anchor=True, is_regex=True),
+            'search'))
+
+        # glob support
+        self.assertTrue(translate_pattern(
+            '*.py', anchor=True, is_regex=False).search('filelist.py'))
+
+    def test_exclude_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        self.assertFalse(file_list.exclude_pattern('*.py'))
+
+        # return True if files match
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.py']
+        self.assertTrue(file_list.exclude_pattern('*.py'))
+
+        # test excludes
+        file_list = FileList()
+        file_list.files = ['a.py', 'a.txt']
+        file_list.exclude_pattern('*.py')
+        self.assertEqual(file_list.files, ['a.txt'])
+
+    def test_include_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        file_list.set_allfiles([])
+        self.assertFalse(file_list.include_pattern('*.py'))
+
+        # return True if files match
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        self.assertTrue(file_list.include_pattern('*.py'))
+
+        # test * matches all files
+        file_list = FileList()
+        self.assertIsNone(file_list.allfiles)
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        file_list.include_pattern('*')
+        self.assertEqual(file_list.allfiles, ['a.py', 'b.txt'])
+
+    def test_process_template(self):
+        # invalid lines
+        file_list = FileList()
+        for action in ('include', 'exclude', 'global-include',
+                       'global-exclude', 'recursive-include',
+                       'recursive-exclude', 'graft', 'prune', 'blarg'):
+            self.assertRaises(DistutilsTemplateError,
+                              file_list.process_template_line, action)
+
+        # include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+
+        file_list.process_template_line('include *.py')
+        self.assertEqual(file_list.files, ['a.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('include *.rb')
+        self.assertEqual(file_list.files, ['a.py'])
+        self.assertWarnings()
+
+        # exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+
+        file_list.process_template_line('exclude *.py')
+        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('exclude *.rb')
+        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertWarnings()
+
+        # global-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+
+        file_list.process_template_line('global-include *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-include *.rb')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertWarnings()
+
+        # global-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+
+        file_list.process_template_line('global-exclude *.py')
+        self.assertEqual(file_list.files, ['b.txt'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-exclude *.rb')
+        self.assertEqual(file_list.files, ['b.txt'])
+        self.assertWarnings()
+
+        # recursive-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py'])
+
+        file_list.process_template_line('recursive-include d *.py')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-include e *.py')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertWarnings()
+
+        # recursive-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py']
+
+        file_list.process_template_line('recursive-exclude d *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-exclude e *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertWarnings()
+
+        # graft
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py'])
+
+        file_list.process_template_line('graft d')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('graft e')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertWarnings()
+
+        # prune
+        file_list = FileList()
+        file_list.files = ['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py']
+
+        file_list.process_template_line('prune d')
+        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('prune e')
+        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertWarnings()
+
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 

From 67ee093341a7342fcbe29dd99800c373abd872a0 Mon Sep 17 00:00:00 2001
From: Paulo Koch <paulo.koch@gmail.com>
Date: Tue, 11 Oct 2011 18:25:09 +0100
Subject: [PATCH 3315/8469] Add support for git URLs.

--HG--
branch : distribute
extra : rebase_source : f664e8cf2b7b6f78096cd00463f4e2009bdeb3ac
---
 setuptools/package_index.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d0896febc4..da586a2741 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -657,6 +657,8 @@ def _download_url(self, scheme, url, tmpdir):
         #
         if scheme=='svn' or scheme.startswith('svn+'):
             return self._download_svn(url, filename)
+        elif scheme=='git' or scheme.startswith('git+'):
+            return self._download_git(url, filename)
         elif scheme=='file':
             return urllib.url2pathname(urlparse.urlparse(url)[2])
         else:
@@ -697,6 +699,15 @@ def _download_svn(self, url, filename):
         os.system("svn checkout -q %s %s" % (url, filename))
         return filename
 
+    def _download_git(self, url, filename):
+        if url.startswith('git+'):
+            url = url[4:]
+        url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        filename = filename.split('#',1)[0]   # remove any fragment to get a decent name.
+        self.info("Doing git clone from %s to %s", url, filename)
+        os.system("git clone -q %s %s" % (url, filename))
+        return filename
+
     def debug(self, msg, *args):
         log.debug(msg, *args)
 

From 930b2596aaa267e9ba28bb5a1066b20d9e0fcfeb Mon Sep 17 00:00:00 2001
From: Paulo Koch <paulo.koch@gmail.com>
Date: Tue, 11 Oct 2011 20:08:25 +0100
Subject: [PATCH 3316/8469] Add support for Mercurial URLs.

--HG--
branch : distribute
extra : rebase_source : 7c33d5bea70d9300cff635646988b13c007e24c9
---
 setuptools/package_index.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index da586a2741..cd89e9a6bc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -659,6 +659,8 @@ def _download_url(self, scheme, url, tmpdir):
             return self._download_svn(url, filename)
         elif scheme=='git' or scheme.startswith('git+'):
             return self._download_git(url, filename)
+        elif scheme.startswith('hg+'):
+            return self._download_hg(url, filename)
         elif scheme=='file':
             return urllib.url2pathname(urlparse.urlparse(url)[2])
         else:
@@ -708,6 +710,15 @@ def _download_git(self, url, filename):
         os.system("git clone -q %s %s" % (url, filename))
         return filename
 
+    def _download_hg(self, url, filename):
+        if url.startswith('hg+'):
+            url = url[3:]
+        url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        filename = filename.split('#',1)[0]   # remove any fragment to get a decent name.
+        self.info("Doing hg clone from %s to %s", url, filename)
+        os.system("hg clone --quiet %s %s" % (url, filename))
+        return filename
+
     def debug(self, msg, *args):
         log.debug(msg, *args)
 

From 8372d395c718cf17a144eb6db314832eb86582e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 11:50:26 -0400
Subject: [PATCH 3317/8469] Bumped to 0.6.24 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 91a4d836ff8a34f433a37f838ec78408ace2aee7
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.sh          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 887d811c6a..5a3146b8a7 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.23.tar.gz
-    $ tar -xzvf distribute-0.6.23.tar.gz
-    $ cd distribute-0.6.23
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz
+    $ tar -xzvf distribute-0.6.24.tar.gz
+    $ cd distribute-0.6.24
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index a16284497b..b204902e31 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.23"
+DEFAULT_VERSION = "0.6.24"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 601ac6ab68..65ee57be83 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.23'
+version = '0.6.24'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.23'
+release = '0.6.24'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.sh b/release.sh
index 9c98f1d507..286ae59aeb 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.23"
+export VERSION="0.6.24"
 
 # tagging
 hg tag $VERSION -f
diff --git a/setup.py b/setup.py
index 28efcf9756..c0ce54da16 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.23"
+VERSION = "0.6.24"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 92a211d570706bb5ecebaeea04845ceec9c77ac3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:00:36 -0400
Subject: [PATCH 3318/8469] Adding release.py, an attempt to fully automate the
 release process in a platform-friendly way. If this works, it should replace
 release.sh.

--HG--
branch : distribute
extra : rebase_source : b4297ff244fc6e2fa68f5891a226cd7840166e22
---
 release.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 release.py

diff --git a/release.py b/release.py
new file mode 100644
index 0000000000..958d937352
--- /dev/null
+++ b/release.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+
+"""
+Script to fully automate the release process. Requires Python 2.6+
+with sphinx installed and the 'hg' command on the path.
+"""
+
+from __future__ import print_function
+
+import subprocess
+import shutil
+import os
+import sys
+
+VERSION='0.6.24'
+
+def get_next_version():
+	digits = map(int, VERSION.split('.'))
+	digits[-1] += 1
+	return '.'.join(map(str, digits))
+
+def bump_versions():
+	files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
+		'release.sh', 'README.txt', 'distribute_setup.py')
+	list(map(bump_version, files_with_versions))
+
+def bump_version(filename):
+	with open(filename, 'rb') as f:
+		lines = [line.replace(VERSION, get_next_version()) for line in f]
+	with open(filename, 'wb') as f:
+		f.writelines(lines)
+
+def do_release():
+	res = raw_input('Have you read through the SCM changelog and '
+		'confirmed the changelog is current for releasing {VERSION}? '
+		.format(**globals()))
+	if not res.lower.startswith('y'):
+		print("Please do that")
+		raise SystemExit(1)
+	
+	subprocess.check_call(['hg', 'tag', VERSION])
+
+	subprocess.check_call(['hg', 'update', VERSION])
+
+	build_docs()
+	shutil.rmtree('./dist')
+	subprocess.check_call([sys.executable, 'setup.py',
+		'-q', 'egg_info', '-RD', '-b', '""', 'sdist', 'register',
+		'upload', 'upload_docs'])
+	upload_boostrap_script()
+
+	# we just tagged the current version, bump for the next release.
+	bump_versions()
+	subprocess.check_call(['hg', 'ci', '-m',
+		'Bumped to {VERSION} in preparation for next release.'.format(**globals())])
+
+	# push the changes
+	subprocess.check_call(['hg', 'push'])
+
+def build_docs():
+	shutil.rmtree('docs/build')
+	subprocess.check_call([
+		'sphinx-build',
+		'-b', 'html',
+		'build/html',
+		],
+		cwd='docs')
+
+def upload_bootstrap_script():
+	scp_command = 'pscp' if sys.platform.startswith('win') else 'scp'
+	try:
+		subprocess.check_call([scp_command, 'distribute_setup.py',
+			'ziade.org:websites/python-distribute.org/'])
+	except:
+		print("Unable to upload bootstrap script. Ask Tarek to do it.")
+
+if __name__ == '__main__':
+	do_release()

From 7b2e8854237e74d196cdb5b736838b8ac1c8ec68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 14 Oct 2011 18:15:31 +0200
Subject: [PATCH 3319/8469] Increase test coverage for distutils.filelist
 (#11751).

Patch by Justin Love.
---
 tests/test_filelist.py | 207 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 197 insertions(+), 10 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index be11ea5d13..1e04077f82 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,10 +1,14 @@
 """Tests for distutils.filelist."""
-from os.path import join
+import re
 import unittest
-from test.test_support import captured_stdout, run_unittest
-
-from distutils.filelist import glob_to_re, FileList
+from os.path import join
 from distutils import debug
+from distutils.log import WARN
+from distutils.errors import DistutilsTemplateError
+from distutils.filelist import glob_to_re, translate_pattern, FileList
+
+from test.test_support import captured_stdout, run_unittest
+from distutils.tests import support
 
 MANIFEST_IN = """\
 include ok
@@ -20,7 +24,17 @@
 prune dir3
 """
 
-class FileListTestCase(unittest.TestCase):
+
+class FileListTestCase(support.LoggingSilencer,
+                       unittest.TestCase):
+
+    def assertNoWarnings(self):
+        self.assertEqual(self.get_logs(WARN), [])
+        self.clear_logs()
+
+    def assertWarnings(self):
+        self.assertGreater(len(self.get_logs(WARN)), 0)
+        self.clear_logs()
 
     def test_glob_to_re(self):
         # simple cases
@@ -48,7 +62,7 @@ def test_process_template_line(self):
                               join('dir', 'graft-one'),
                               join('dir', 'dir2', 'graft2'),
                               join('dir3', 'ok'),
-                              join('dir3', 'sub', 'ok.txt')
+                              join('dir3', 'sub', 'ok.txt'),
                               ]
 
         for line in MANIFEST_IN.split('\n'):
@@ -66,18 +80,191 @@ def test_debug_print(self):
         file_list = FileList()
         with captured_stdout() as stdout:
             file_list.debug_print('xxx')
-        stdout.seek(0)
-        self.assertEqual(stdout.read(), '')
+        self.assertEqual(stdout.getvalue(), '')
 
         debug.DEBUG = True
         try:
             with captured_stdout() as stdout:
                 file_list.debug_print('xxx')
-            stdout.seek(0)
-            self.assertEqual(stdout.read(), 'xxx\n')
+            self.assertEqual(stdout.getvalue(), 'xxx\n')
         finally:
             debug.DEBUG = False
 
+    def test_set_allfiles(self):
+        file_list = FileList()
+        files = ['a', 'b', 'c']
+        file_list.set_allfiles(files)
+        self.assertEqual(file_list.allfiles, files)
+
+    def test_remove_duplicates(self):
+        file_list = FileList()
+        file_list.files = ['a', 'b', 'a', 'g', 'c', 'g']
+        # files must be sorted beforehand (sdist does it)
+        file_list.sort()
+        file_list.remove_duplicates()
+        self.assertEqual(file_list.files, ['a', 'b', 'c', 'g'])
+
+    def test_translate_pattern(self):
+        # not regex
+        self.assertTrue(hasattr(
+            translate_pattern('a', anchor=True, is_regex=False),
+            'search'))
+
+        # is a regex
+        regex = re.compile('a')
+        self.assertEqual(
+            translate_pattern(regex, anchor=True, is_regex=True),
+            regex)
+
+        # plain string flagged as regex
+        self.assertTrue(hasattr(
+            translate_pattern('a', anchor=True, is_regex=True),
+            'search'))
+
+        # glob support
+        self.assertTrue(translate_pattern(
+            '*.py', anchor=True, is_regex=False).search('filelist.py'))
+
+    def test_exclude_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        self.assertFalse(file_list.exclude_pattern('*.py'))
+
+        # return True if files match
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.py']
+        self.assertTrue(file_list.exclude_pattern('*.py'))
+
+        # test excludes
+        file_list = FileList()
+        file_list.files = ['a.py', 'a.txt']
+        file_list.exclude_pattern('*.py')
+        self.assertEqual(file_list.files, ['a.txt'])
+
+    def test_include_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        file_list.set_allfiles([])
+        self.assertFalse(file_list.include_pattern('*.py'))
+
+        # return True if files match
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        self.assertTrue(file_list.include_pattern('*.py'))
+
+        # test * matches all files
+        file_list = FileList()
+        self.assertIsNone(file_list.allfiles)
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        file_list.include_pattern('*')
+        self.assertEqual(file_list.allfiles, ['a.py', 'b.txt'])
+
+    def test_process_template(self):
+        # invalid lines
+        file_list = FileList()
+        for action in ('include', 'exclude', 'global-include',
+                       'global-exclude', 'recursive-include',
+                       'recursive-exclude', 'graft', 'prune', 'blarg'):
+            self.assertRaises(DistutilsTemplateError,
+                              file_list.process_template_line, action)
+
+        # include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+
+        file_list.process_template_line('include *.py')
+        self.assertEqual(file_list.files, ['a.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('include *.rb')
+        self.assertEqual(file_list.files, ['a.py'])
+        self.assertWarnings()
+
+        # exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+
+        file_list.process_template_line('exclude *.py')
+        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('exclude *.rb')
+        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertWarnings()
+
+        # global-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+
+        file_list.process_template_line('global-include *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-include *.rb')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertWarnings()
+
+        # global-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+
+        file_list.process_template_line('global-exclude *.py')
+        self.assertEqual(file_list.files, ['b.txt'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-exclude *.rb')
+        self.assertEqual(file_list.files, ['b.txt'])
+        self.assertWarnings()
+
+        # recursive-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py'])
+
+        file_list.process_template_line('recursive-include d *.py')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-include e *.py')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertWarnings()
+
+        # recursive-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py']
+
+        file_list.process_template_line('recursive-exclude d *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-exclude e *.py')
+        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertWarnings()
+
+        # graft
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py'])
+
+        file_list.process_template_line('graft d')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('graft e')
+        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertWarnings()
+
+        # prune
+        file_list = FileList()
+        file_list.files = ['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py']
+
+        file_list.process_template_line('prune d')
+        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertNoWarnings()
+
+        file_list.process_template_line('prune e')
+        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertWarnings()
+
+
 def test_suite():
     return unittest.makeSuite(FileListTestCase)
 

From 9af04bdc389e811e4d97187cf3be7a7f531b787b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:15:38 -0400
Subject: [PATCH 3320/8469] Fixed error in do_release

--HG--
branch : distribute
extra : rebase_source : cc27ca582dfcc618e6adebc60d32532aed09b07e
---
 release.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index 958d937352..b353156ced 100644
--- a/release.py
+++ b/release.py
@@ -34,10 +34,10 @@ def do_release():
 	res = raw_input('Have you read through the SCM changelog and '
 		'confirmed the changelog is current for releasing {VERSION}? '
 		.format(**globals()))
-	if not res.lower.startswith('y'):
+	if not res.lower().startswith('y'):
 		print("Please do that")
 		raise SystemExit(1)
-	
+
 	subprocess.check_call(['hg', 'tag', VERSION])
 
 	subprocess.check_call(['hg', 'update', VERSION])

From 7a512c0681cbb92aa8ec9b31d86e25ef2e4e995b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:17:40 -0400
Subject: [PATCH 3321/8469] Fixed issue in rmtree calls

--HG--
branch : distribute
extra : rebase_source : 9ea9db9ab7c23c06e6fdf087f50938e995f0d187
---
 release.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index b353156ced..a6044ecd9b 100644
--- a/release.py
+++ b/release.py
@@ -43,7 +43,8 @@ def do_release():
 	subprocess.check_call(['hg', 'update', VERSION])
 
 	build_docs()
-	shutil.rmtree('./dist')
+	if os.path.isdir('./dist'):
+		shutil.rmtree('./dist')
 	subprocess.check_call([sys.executable, 'setup.py',
 		'-q', 'egg_info', '-RD', '-b', '""', 'sdist', 'register',
 		'upload', 'upload_docs'])
@@ -58,7 +59,8 @@ def do_release():
 	subprocess.check_call(['hg', 'push'])
 
 def build_docs():
-	shutil.rmtree('docs/build')
+	if os.path.isdir('docs/build'):
+		shutil.rmtree('docs/build')
 	subprocess.check_call([
 		'sphinx-build',
 		'-b', 'html',

From 400aece53173768934077f003a8c634ab4351974 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:20:12 -0400
Subject: [PATCH 3322/8469] Fixed sphinx-build to match makefile usage

--HG--
branch : distribute
extra : rebase_source : 049179f267bb721c43f0e9bdec1dbed1d13a73b1
---
 release.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.py b/release.py
index a6044ecd9b..0dbca28ce4 100644
--- a/release.py
+++ b/release.py
@@ -64,6 +64,8 @@ def build_docs():
 	subprocess.check_call([
 		'sphinx-build',
 		'-b', 'html',
+		'-d', 'build/doctrees',
+		'.',
 		'build/html',
 		],
 		cwd='docs')

From 4ce3c9f3270aa9f431795933d4c756063eb7a8f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:20:23 -0400
Subject: [PATCH 3323/8469] Added tag 0.6.24 for changeset 7fd7b6e30a0e

--HG--
branch : distribute
extra : rebase_source : 86ef684970eafe416f49e042d5a7252d172ace29
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index afbb60ffd3..1c2c996504 100644
--- a/.hgtags
+++ b/.hgtags
@@ -32,3 +32,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
 1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
 9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
+7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24

From 025351ce05277b00288db22e880f547d5825983f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:23:15 -0400
Subject: [PATCH 3324/8469] Fixed NameError

--HG--
branch : distribute
extra : rebase_source : c7e392b567048863b5bde5f5828f653ae4647281
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 0dbca28ce4..13b3e33221 100644
--- a/release.py
+++ b/release.py
@@ -48,7 +48,7 @@ def do_release():
 	subprocess.check_call([sys.executable, 'setup.py',
 		'-q', 'egg_info', '-RD', '-b', '""', 'sdist', 'register',
 		'upload', 'upload_docs'])
-	upload_boostrap_script()
+	upload_bootstrap_script()
 
 	# we just tagged the current version, bump for the next release.
 	bump_versions()

From a119995b29457b2e4dffddd798faa320c257f32b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:24:25 -0400
Subject: [PATCH 3325/8469] Bumped to 0.6.25 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : f6e1463807528017b439623835cdeaf07bc1369a
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 release.sh          | 2 +-
 setup.py            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.txt b/README.txt
index 5a3146b8a7..2a12bd16da 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz
-    $ tar -xzvf distribute-0.6.24.tar.gz
-    $ cd distribute-0.6.24
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.25.tar.gz
+    $ tar -xzvf distribute-0.6.25.tar.gz
+    $ cd distribute-0.6.25
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index b204902e31..f0bfa25ac4 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.24"
+DEFAULT_VERSION = "0.6.25"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 65ee57be83..e4bd76af8a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.24'
+version = '0.6.25'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.24'
+release = '0.6.25'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 13b3e33221..fc4831a294 100644
--- a/release.py
+++ b/release.py
@@ -12,7 +12,7 @@
 import os
 import sys
 
-VERSION='0.6.24'
+VERSION='0.6.25'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/release.sh b/release.sh
index 286ae59aeb..7831697427 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VERSION="0.6.24"
+export VERSION="0.6.25"
 
 # tagging
 hg tag $VERSION -f
diff --git a/setup.py b/setup.py
index c0ce54da16..3500d3e23a 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.24"
+VERSION = "0.6.25"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 6beba487c092be35525d63bbec3e3c45ae0bba04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2011 12:33:56 -0400
Subject: [PATCH 3326/8469] Updated bump message to use the bumped version, not
 the old version.

--HG--
branch : distribute
extra : rebase_source : 9baf8490fa439e610c2cdb2b3e5db28920bdea1c
---
 release.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/release.py b/release.py
index fc4831a294..466f5cdaef 100644
--- a/release.py
+++ b/release.py
@@ -19,6 +19,8 @@ def get_next_version():
 	digits[-1] += 1
 	return '.'.join(map(str, digits))
 
+NEXT_VERSION = get_next_version()
+
 def bump_versions():
 	files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
 		'release.sh', 'README.txt', 'distribute_setup.py')
@@ -26,7 +28,7 @@ def bump_versions():
 
 def bump_version(filename):
 	with open(filename, 'rb') as f:
-		lines = [line.replace(VERSION, get_next_version()) for line in f]
+		lines = [line.replace(VERSION, NEXT_VERSION) for line in f]
 	with open(filename, 'wb') as f:
 		f.writelines(lines)
 
@@ -53,7 +55,8 @@ def do_release():
 	# we just tagged the current version, bump for the next release.
 	bump_versions()
 	subprocess.check_call(['hg', 'ci', '-m',
-		'Bumped to {VERSION} in preparation for next release.'.format(**globals())])
+		'Bumped to {NEXT_VERSION} in preparation for next '
+		'release.'.format(**globals())])
 
 	# push the changes
 	subprocess.check_call(['hg', 'push'])

From b2c661b2eb9d355255a447db715b05a742eba965 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Oct 2011 09:13:24 -0400
Subject: [PATCH 3327/8469] Fixed release script so it doesn't leave an empty
 tag and thus a dash at the end (it's powershell that needs the double-quotes
 inside single quotes)

--HG--
branch : distribute
extra : rebase_source : c7658c4f86de5055bdb3a20f5bc8b5a0dc3eb4de
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 0dbca28ce4..91ae6dfb80 100644
--- a/release.py
+++ b/release.py
@@ -46,7 +46,7 @@ def do_release():
 	if os.path.isdir('./dist'):
 		shutil.rmtree('./dist')
 	subprocess.check_call([sys.executable, 'setup.py',
-		'-q', 'egg_info', '-RD', '-b', '""', 'sdist', 'register',
+		'-q', 'egg_info', '-RD', '-b', '', 'sdist', 'register',
 		'upload', 'upload_docs'])
 	upload_boostrap_script()
 

From ed45aad402e3df6f660d88c19710e56951126286 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Mon, 17 Oct 2011 11:05:36 +1100
Subject: [PATCH 3328/8469] Issue #7833: Ext. modules built using distutils on
 Windows no longer get a manifest

---
 msvc9compiler.py            | 77 +++++++++++++++++++++++++++----------
 tests/test_msvc9compiler.py | 47 +++++++++++++++++++++-
 2 files changed, 102 insertions(+), 22 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index bf85ac75c7..9838d64a0e 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -640,15 +640,7 @@ def link(self,
                     self.library_filename(dll_name))
                 ld_args.append ('/IMPLIB:' + implib_file)
 
-            # Embedded manifests are recommended - see MSDN article titled
-            # "How to: Embed a Manifest Inside a C/C++ Application"
-            # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
-            # Ask the linker to generate the manifest in the temp dir, so
-            # we can embed it later.
-            temp_manifest = os.path.join(
-                    build_temp,
-                    os.path.basename(output_filename) + ".manifest")
-            ld_args.append('/MANIFESTFILE:' + temp_manifest)
+            self.manifest_setup_ldargs(output_filename, build_temp, ld_args)
 
             if extra_preargs:
                 ld_args[:0] = extra_preargs
@@ -666,20 +658,54 @@ def link(self,
             # will still consider the DLL up-to-date, but it will not have a
             # manifest.  Maybe we should link to a temp file?  OTOH, that
             # implies a build environment error that shouldn't go undetected.
-            if target_desc == CCompiler.EXECUTABLE:
-                mfid = 1
-            else:
-                mfid = 2
-                self._remove_visual_c_ref(temp_manifest)
-            out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
-            try:
-                self.spawn(['mt.exe', '-nologo', '-manifest',
-                            temp_manifest, out_arg])
-            except DistutilsExecError, msg:
-                raise LinkError(msg)
+            mfinfo = self.manifest_get_embed_info(target_desc, ld_args)
+            if mfinfo is not None:
+                mffilename, mfid = mfinfo
+                out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
+                try:
+                    self.spawn(['mt.exe', '-nologo', '-manifest',
+                                mffilename, out_arg])
+                except DistutilsExecError, msg:
+                    raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def manifest_setup_ldargs(self, output_filename, build_temp, ld_args):
+        # If we need a manifest at all, an embedded manifest is recommended.
+        # See MSDN article titled
+        # "How to: Embed a Manifest Inside a C/C++ Application"
+        # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
+        # Ask the linker to generate the manifest in the temp dir, so
+        # we can check it, and possibly embed it, later.
+        temp_manifest = os.path.join(
+                build_temp,
+                os.path.basename(output_filename) + ".manifest")
+        ld_args.append('/MANIFESTFILE:' + temp_manifest)
+
+    def manifest_get_embed_info(self, target_desc, ld_args):
+        # If a manifest should be embedded, return a tuple of
+        # (manifest_filename, resource_id).  Returns None if no manifest
+        # should be embedded.  See http://bugs.python.org/issue7833 for why 
+        # we want to avoid any manifest for extension modules if we can)
+        for arg in ld_args:
+            if arg.startswith("/MANIFESTFILE:"):
+                temp_manifest = arg.split(":", 1)[1]
+                break
+        else:
+            # no /MANIFESTFILE so nothing to do.
+            return None
+        if target_desc == CCompiler.EXECUTABLE:
+            # by default, executables always get the manifest with the
+            # CRT referenced.
+            mfid = 1
+        else:
+            # Extension modules try and avoid any manifest if possible.
+            mfid = 2
+            temp_manifest = self._remove_visual_c_ref(temp_manifest)
+        if temp_manifest is None:
+            return None
+        return temp_manifest, mfid
+
     def _remove_visual_c_ref(self, manifest_file):
         try:
             # Remove references to the Visual C runtime, so they will
@@ -688,6 +714,8 @@ def _remove_visual_c_ref(self, manifest_file):
             # runtimes are not in WinSxS folder, but in Python's own
             # folder), the runtimes do not need to be in every folder
             # with .pyd's.
+            # Returns either the filename of the modified manifest or
+            # None if no manifest should be embedded.
             manifest_f = open(manifest_file)
             try:
                 manifest_buf = manifest_f.read()
@@ -700,9 +728,18 @@ def _remove_visual_c_ref(self, manifest_file):
             manifest_buf = re.sub(pattern, "", manifest_buf)
             pattern = "<dependentAssembly>\s*</dependentAssembly>"
             manifest_buf = re.sub(pattern, "", manifest_buf)
+            # Now see if any other assemblies are referenced - if not, we 
+            # don't want a manifest embedded.
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""
+                r""".*?(?:/>|</assemblyIdentity>)""", re.DOTALL)
+            if re.search(pattern, manifest_buf) is None:
+                return None
+
             manifest_f = open(manifest_file, 'w')
             try:
                 manifest_f.write(manifest_buf)
+                return manifest_file
             finally:
                 manifest_f.close()
         except IOError:
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index e155dbfea3..73470729fd 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -7,7 +7,36 @@
 from distutils.tests import support
 from test.test_support import run_unittest
 
-_MANIFEST = """\
+# A manifest with the only assembly reference being the msvcrt assembly, so
+# should have the assembly completely stripped.  Note that although the
+# assembly has a <security> reference the assembly is removed - that is
+# currently a "feature", not a bug :)
+_MANIFEST_WITH_ONLY_MSVC_REFERENCE = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+# A manifest with references to assemblies other than msvcrt.  When processed,
+# this assembly should be returned with just the msvcrt part removed.
+_MANIFEST_WITH_MULTIPLE_REFERENCES = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
           manifestVersion="1.0">
@@ -115,7 +144,7 @@ def test_remove_visual_c_ref(self):
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
         try:
-            f.write(_MANIFEST)
+            f.write(_MANIFEST_WITH_MULTIPLE_REFERENCES)
         finally:
             f.close()
 
@@ -133,6 +162,20 @@ def test_remove_visual_c_ref(self):
         # makes sure the manifest was properly cleaned
         self.assertEqual(content, _CLEANED_MANIFEST)
 
+    def test_remove_entire_manifest(self):
+        from distutils.msvc9compiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        try:
+            f.write(_MANIFEST_WITH_ONLY_MSVC_REFERENCE)
+        finally:
+            f.close()
+
+        compiler = MSVCCompiler()
+        got = compiler._remove_visual_c_ref(manifest)
+        self.assertIs(got, None)
+
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)

From 1f218d0f3f8aa86e62b9b8c39efdb077d66481d4 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Mon, 17 Oct 2011 11:05:57 +1100
Subject: [PATCH 3329/8469] Issue #7833: Ext. modules built using distutils on
 Windows no longer get a manifest

---
 msvc9compiler.py            | 78 +++++++++++++++++++++++++++----------
 tests/test_msvc9compiler.py | 47 +++++++++++++++++++++-
 2 files changed, 102 insertions(+), 23 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 0cddb5c8e0..0807a36095 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -627,15 +627,7 @@ def link(self,
                     self.library_filename(dll_name))
                 ld_args.append ('/IMPLIB:' + implib_file)
 
-            # Embedded manifests are recommended - see MSDN article titled
-            # "How to: Embed a Manifest Inside a C/C++ Application"
-            # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
-            # Ask the linker to generate the manifest in the temp dir, so
-            # we can embed it later.
-            temp_manifest = os.path.join(
-                    build_temp,
-                    os.path.basename(output_filename) + ".manifest")
-            ld_args.append('/MANIFESTFILE:' + temp_manifest)
+            self.manifest_setup_ldargs(output_filename, build_temp, ld_args)
 
             if extra_preargs:
                 ld_args[:0] = extra_preargs
@@ -653,21 +645,54 @@ def link(self,
             # will still consider the DLL up-to-date, but it will not have a
             # manifest.  Maybe we should link to a temp file?  OTOH, that
             # implies a build environment error that shouldn't go undetected.
-            if target_desc == CCompiler.EXECUTABLE:
-                mfid = 1
-            else:
-                mfid = 2
-                # Remove references to the Visual C runtime
-                self._remove_visual_c_ref(temp_manifest)
-            out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
-            try:
-                self.spawn(['mt.exe', '-nologo', '-manifest',
-                            temp_manifest, out_arg])
-            except DistutilsExecError as msg:
-                raise LinkError(msg)
+            mfinfo = self.manifest_get_embed_info(target_desc, ld_args)
+            if mfinfo is not None:
+                mffilename, mfid = mfinfo
+                out_arg = '-outputresource:%s;%s' % (output_filename, mfid)
+                try:
+                    self.spawn(['mt.exe', '-nologo', '-manifest',
+                                mffilename, out_arg])
+                except DistutilsExecError as msg:
+                    raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def manifest_setup_ldargs(self, output_filename, build_temp, ld_args):
+        # If we need a manifest at all, an embedded manifest is recommended.
+        # See MSDN article titled
+        # "How to: Embed a Manifest Inside a C/C++ Application"
+        # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
+        # Ask the linker to generate the manifest in the temp dir, so
+        # we can check it, and possibly embed it, later.
+        temp_manifest = os.path.join(
+                build_temp,
+                os.path.basename(output_filename) + ".manifest")
+        ld_args.append('/MANIFESTFILE:' + temp_manifest)
+
+    def manifest_get_embed_info(self, target_desc, ld_args):
+        # If a manifest should be embedded, return a tuple of
+        # (manifest_filename, resource_id).  Returns None if no manifest
+        # should be embedded.  See http://bugs.python.org/issue7833 for why
+        # we want to avoid any manifest for extension modules if we can)
+        for arg in ld_args:
+            if arg.startswith("/MANIFESTFILE:"):
+                temp_manifest = arg.split(":", 1)[1]
+                break
+        else:
+            # no /MANIFESTFILE so nothing to do.
+            return None
+        if target_desc == CCompiler.EXECUTABLE:
+            # by default, executables always get the manifest with the
+            # CRT referenced.
+            mfid = 1
+        else:
+            # Extension modules try and avoid any manifest if possible.
+            mfid = 2
+            temp_manifest = self._remove_visual_c_ref(temp_manifest)
+        if temp_manifest is None:
+            return None
+        return temp_manifest, mfid
+
     def _remove_visual_c_ref(self, manifest_file):
         try:
             # Remove references to the Visual C runtime, so they will
@@ -676,6 +701,8 @@ def _remove_visual_c_ref(self, manifest_file):
             # runtimes are not in WinSxS folder, but in Python's own
             # folder), the runtimes do not need to be in every folder
             # with .pyd's.
+            # Returns either the filename of the modified manifest or
+            # None if no manifest should be embedded.
             manifest_f = open(manifest_file)
             try:
                 manifest_buf = manifest_f.read()
@@ -688,9 +715,18 @@ def _remove_visual_c_ref(self, manifest_file):
             manifest_buf = re.sub(pattern, "", manifest_buf)
             pattern = "<dependentAssembly>\s*</dependentAssembly>"
             manifest_buf = re.sub(pattern, "", manifest_buf)
+            # Now see if any other assemblies are referenced - if not, we 
+            # don't want a manifest embedded.
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""
+                r""".*?(?:/>|</assemblyIdentity>)""", re.DOTALL)
+            if re.search(pattern, manifest_buf) is None:
+                return None
+
             manifest_f = open(manifest_file, 'w')
             try:
                 manifest_f.write(manifest_buf)
+                return manifest_file
             finally:
                 manifest_f.close()
         except IOError:
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index a0d62efcfd..5fa1ca10d4 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -7,7 +7,36 @@
 from distutils.tests import support
 from test.support import run_unittest
 
-_MANIFEST = """\
+# A manifest with the only assembly reference being the msvcrt assembly, so
+# should have the assembly completely stripped.  Note that although the
+# assembly has a <security> reference the assembly is removed - that is
+# currently a "feature", not a bug :)
+_MANIFEST_WITH_ONLY_MSVC_REFERENCE = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+# A manifest with references to assemblies other than msvcrt.  When processed,
+# this assembly should be returned with just the msvcrt part removed.
+_MANIFEST_WITH_MULTIPLE_REFERENCES = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
           manifestVersion="1.0">
@@ -115,7 +144,7 @@ def test_remove_visual_c_ref(self):
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
         try:
-            f.write(_MANIFEST)
+            f.write(_MANIFEST_WITH_MULTIPLE_REFERENCES)
         finally:
             f.close()
 
@@ -133,6 +162,20 @@ def test_remove_visual_c_ref(self):
         # makes sure the manifest was properly cleaned
         self.assertEqual(content, _CLEANED_MANIFEST)
 
+    def test_remove_entire_manifest(self):
+        from distutils.msvc9compiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        try:
+            f.write(_MANIFEST_WITH_ONLY_MSVC_REFERENCE)
+        finally:
+            f.close()
+
+        compiler = MSVCCompiler()
+        got = compiler._remove_visual_c_ref(manifest)
+        self.assertIs(got, None)
+
 
 def test_suite():
     return unittest.makeSuite(msvc9compilerTestCase)

From a768a2ee006904565310189824cc120c62004568 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Mon, 17 Oct 2011 11:35:06 +1100
Subject: [PATCH 3330/8469] normalize whitespace in
 Lib/distutils/msvc9compiler.py

---
 msvc9compiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 9838d64a0e..7ec9b92a5d 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -685,7 +685,7 @@ def manifest_setup_ldargs(self, output_filename, build_temp, ld_args):
     def manifest_get_embed_info(self, target_desc, ld_args):
         # If a manifest should be embedded, return a tuple of
         # (manifest_filename, resource_id).  Returns None if no manifest
-        # should be embedded.  See http://bugs.python.org/issue7833 for why 
+        # should be embedded.  See http://bugs.python.org/issue7833 for why
         # we want to avoid any manifest for extension modules if we can)
         for arg in ld_args:
             if arg.startswith("/MANIFESTFILE:"):
@@ -728,7 +728,7 @@ def _remove_visual_c_ref(self, manifest_file):
             manifest_buf = re.sub(pattern, "", manifest_buf)
             pattern = "<dependentAssembly>\s*</dependentAssembly>"
             manifest_buf = re.sub(pattern, "", manifest_buf)
-            # Now see if any other assemblies are referenced - if not, we 
+            # Now see if any other assemblies are referenced - if not, we
             # don't want a manifest embedded.
             pattern = re.compile(
                 r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""

From e70a6aed3ac452c83b45bd30ba7efb0d8e388021 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Mon, 17 Oct 2011 11:35:31 +1100
Subject: [PATCH 3331/8469] normalize whitespace in
 Lib/distutils/msvc9compiler.py

---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 0807a36095..b3f6ce10a8 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -715,7 +715,7 @@ def _remove_visual_c_ref(self, manifest_file):
             manifest_buf = re.sub(pattern, "", manifest_buf)
             pattern = "<dependentAssembly>\s*</dependentAssembly>"
             manifest_buf = re.sub(pattern, "", manifest_buf)
-            # Now see if any other assemblies are referenced - if not, we 
+            # Now see if any other assemblies are referenced - if not, we
             # don't want a manifest embedded.
             pattern = re.compile(
                 r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""

From 542d7cfcc6866b5a886550a7fdf2801abea0242f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Oct 2011 09:29:46 -0400
Subject: [PATCH 3332/8469] Adding a prompt to remind that tests should pass
 before release.

--HG--
branch : distribute
extra : rebase_source : 3c51eb5782aa845d829066c84b8c5d94a5c272ca
---
 release.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release.py b/release.py
index eab2dc8acd..385d400e0d 100644
--- a/release.py
+++ b/release.py
@@ -40,6 +40,12 @@ def do_release():
 		print("Please do that")
 		raise SystemExit(1)
 
+	res = raw_input('Have you or has someone verified that the tests '
+		'pass on this revision? ')
+	if not res.lower().startswith('y'):
+		print("Please do that")
+		raise SystemExit(2)
+
 	subprocess.check_call(['hg', 'tag', VERSION])
 
 	subprocess.check_call(['hg', 'update', VERSION])

From 9c22ddc233928d4179c561c46d766bbfb9397b59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Oct 2011 09:30:55 -0400
Subject: [PATCH 3333/8469] Added note that we should also update the bitbucket
 milestones and versions as part of the release process

--HG--
branch : distribute
extra : rebase_source : ea82ad0c2bbd87a788b6b8cb9ef0f13da3eafa74
---
 release.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release.py b/release.py
index 385d400e0d..3b9950b3e7 100644
--- a/release.py
+++ b/release.py
@@ -67,6 +67,8 @@ def do_release():
 	# push the changes
 	subprocess.check_call(['hg', 'push'])
 
+	# TODO: update bitbucket milestones and versions
+
 def build_docs():
 	if os.path.isdir('docs/build'):
 		shutil.rmtree('docs/build')

From f9b08d3f6741d8dba8448f275ee591c9de04a484 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Oct 2011 12:39:42 -0400
Subject: [PATCH 3334/8469] Use pypi user when uploading the bootstrap script

--HG--
branch : distribute
extra : rebase_source : 83fcc3c6d84e6c8ec4ee9c09a829c77961dd832d
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 3b9950b3e7..f3000e0bac 100644
--- a/release.py
+++ b/release.py
@@ -85,7 +85,7 @@ def upload_bootstrap_script():
 	scp_command = 'pscp' if sys.platform.startswith('win') else 'scp'
 	try:
 		subprocess.check_call([scp_command, 'distribute_setup.py',
-			'ziade.org:websites/python-distribute.org/'])
+			'pypi@ziade.org:python-distribute.org/'])
 	except:
 		print("Unable to upload bootstrap script. Ask Tarek to do it.")
 

From bcfc28fc3fc10f99bfe31f883f0e2ff90ae5f461 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Oct 2011 14:14:50 -0400
Subject: [PATCH 3335/8469] Removing release.sh, replaced by release.py

--HG--
branch : distribute
extra : rebase_source : 8dd4dea1d410e6e60b2614008330530855a7afbb
---
 release.sh | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100755 release.sh

diff --git a/release.sh b/release.sh
deleted file mode 100755
index 7831697427..0000000000
--- a/release.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-export VERSION="0.6.25"
-
-# tagging
-hg tag $VERSION -f
-hg ci -m "bumped revision"
-
-# creating the releases
-rm -rf ./dist
-
-# now preparing the source release, pushing it and its doc
-python2.6 setup.py -q egg_info -RDb '' sdist register upload
-cd docs/
-make clean
-make html
-cd ..
-python2.6 setup.py upload_docs
-
-# pushing the bootstrap script
-scp distribute_setup.py ziade.org:websites/python-distribute.org/
-
-# starting the new dev
-hg push
-

From 427ee765c3c78e3aa63cd17881a4b70a009e8857 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Fri, 28 Oct 2011 14:45:05 +0200
Subject: [PATCH 3336/8469] Closes #13258: Use callable() built-in in the
 standard library.

---
 dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist.py b/dist.py
index 69825f206f..a702568278 100644
--- a/dist.py
+++ b/dist.py
@@ -537,7 +537,7 @@ def _parse_command_opts(self, parser, args):
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
                     help_option_found=1
-                    if hasattr(func, '__call__'):
+                    if callable(func):
                         func()
                     else:
                         raise DistutilsClassError(

From 489ea5a90ec0c0b9b72626b3420aa97854df2e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 2 Nov 2011 18:05:41 +0100
Subject: [PATCH 3337/8469] Cleanups in distutils tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Actually check the contents of the file created by bdist_dumb.
- Don’t use “RECORD� as filename for non-PEP 376 record file
- Don’t start method name with “_test�, it smells like a disabled test
  method instead of an helper method
- Fix some idioms (assertIn, addCleanup)
---
 tests/test_bdist_dumb.py | 23 +++++++++++++++++------
 tests/test_install.py    | 26 +++++++++++---------------
 tests/test_sdist.py      |  8 ++++----
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 55ba58d14f..1037d8216e 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -1,8 +1,10 @@
 """Tests for distutils.command.bdist_dumb."""
 
-import unittest
-import sys
 import os
+import imp
+import sys
+import zipfile
+import unittest
 from test.support import run_unittest
 
 from distutils.core import Distribution
@@ -72,15 +74,24 @@ def test_simple_built(self):
 
         # see what we have
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        base = "%s.%s" % (dist.get_fullname(), cmd.plat_name)
+        base = "%s.%s.zip" % (dist.get_fullname(), cmd.plat_name)
         if os.name == 'os2':
             base = base.replace(':', '-')
 
-        wanted = ['%s.zip' % base]
-        self.assertEqual(dist_created, wanted)
+        self.assertEqual(dist_created, [base])
 
         # now let's check what we have in the zip file
-        # XXX to be done
+        fp = zipfile.ZipFile(os.path.join('dist', base))
+        try:
+            contents = fp.namelist()
+        finally:
+            fp.close()
+
+        contents = sorted(os.path.basename(fn) for fn in contents)
+        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2],
+                  'foo.%s.pyc' % imp.get_tag(),
+                  'foo.py']
+        self.assertEqual(contents, sorted(wanted))
 
 def test_suite():
     return unittest.makeSuite(BuildDumbTestCase)
diff --git a/tests/test_install.py b/tests/test_install.py
index dfc46b197b..8a63af992f 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -87,19 +87,17 @@ def _expanduser(path):
         self.old_expand = os.path.expanduser
         os.path.expanduser = _expanduser
 
-        try:
-            # this is the actual test
-            self._test_user_site()
-        finally:
+        def cleanup():
             site.USER_BASE = self.old_user_base
             site.USER_SITE = self.old_user_site
             install_module.USER_BASE = self.old_user_base
             install_module.USER_SITE = self.old_user_site
             os.path.expanduser = self.old_expand
 
-    def _test_user_site(self):
+        self.addCleanup(cleanup)
+
         for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assertTrue(key in INSTALL_SCHEMES)
+            self.assertIn(key, INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
@@ -107,14 +105,14 @@ def _test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assertTrue('user' in options)
+        self.assertIn('user', options)
 
         # setting a value
         cmd.user = 1
 
         # user base and site shouldn't be created yet
-        self.assertTrue(not os.path.exists(self.user_base))
-        self.assertTrue(not os.path.exists(self.user_site))
+        self.assertFalse(os.path.exists(self.user_base))
+        self.assertFalse(os.path.exists(self.user_site))
 
         # let's run finalize
         cmd.ensure_finalized()
@@ -123,8 +121,8 @@ def _test_user_site(self):
         self.assertTrue(os.path.exists(self.user_base))
         self.assertTrue(os.path.exists(self.user_site))
 
-        self.assertTrue('userbase' in cmd.config_vars)
-        self.assertTrue('usersite' in cmd.config_vars)
+        self.assertIn('userbase', cmd.config_vars)
+        self.assertIn('usersite', cmd.config_vars)
 
     def test_handle_extra_path(self):
         dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
@@ -178,14 +176,13 @@ def test_finalize_options(self):
     def test_record(self):
         install_dir = self.mkdtemp()
         project_dir, dist = self.create_dist(scripts=['hello'])
-        self.addCleanup(os.chdir, os.getcwd())
         os.chdir(project_dir)
         self.write_file('hello', "print('o hai')")
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
         cmd.root = install_dir
-        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'filelist')
         cmd.ensure_finalized()
         cmd.run()
 
@@ -204,7 +201,6 @@ def test_record_extensions(self):
         install_dir = self.mkdtemp()
         project_dir, dist = self.create_dist(ext_modules=[
             Extension('xx', ['xxmodule.c'])])
-        self.addCleanup(os.chdir, os.getcwd())
         os.chdir(project_dir)
         support.copy_xxmodule_c(project_dir)
 
@@ -216,7 +212,7 @@ def test_record_extensions(self):
         dist.command_obj['install'] = cmd
         dist.command_obj['build_ext'] = buildextcmd
         cmd.root = install_dir
-        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'filelist')
         cmd.ensure_finalized()
         cmd.run()
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 529b4ef5c6..d0d16b2f55 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -288,7 +288,7 @@ def test_finalize_options(self):
     # the following tests make sure there is a nice error message instead
     # of a traceback when parsing an invalid manifest template
 
-    def _test_template(self, content):
+    def _check_template(self, content):
         dist, cmd = self.get_cmd()
         os.chdir(self.tmp_dir)
         self.write_file('MANIFEST.in', content)
@@ -299,17 +299,17 @@ def _test_template(self, content):
         self.assertEqual(len(warnings), 1)
 
     def test_invalid_template_unknown_command(self):
-        self._test_template('taunt knights *')
+        self._check_template('taunt knights *')
 
     def test_invalid_template_wrong_arguments(self):
         # this manifest command takes one argument
-        self._test_template('prune')
+        self._check_template('prune')
 
     @unittest.skipIf(os.name != 'nt', 'test relevant for Windows only')
     def test_invalid_template_wrong_path(self):
         # on Windows, trailing slashes are not allowed
         # this used to crash instead of raising a warning: #8286
-        self._test_template('include examples/')
+        self._check_template('include examples/')
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_get_file_list(self):

From 4d25e1b74cf370c9013b6e016e0ac9da4d57f6bb Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 3 Nov 2011 02:45:46 +0100
Subject: [PATCH 3338/8469] Issue #13307: fix bdist_rpm test failures

---
 command/build_py.py    | 6 +++---
 command/install_lib.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 3868c12f5b..9e2473fbb6 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'build_py' command."""
 
 import sys, os
-import sys
+import imp
 from glob import glob
 
 from distutils.core import Command
@@ -311,9 +311,9 @@ def get_outputs(self, include_bytecode=1):
             outputs.append(filename)
             if include_bytecode:
                 if self.compile:
-                    outputs.append(filename + "c")
+                    outputs.append(imp.cache_from_source(filename, True))
                 if self.optimize > 0:
-                    outputs.append(filename + "o")
+                    outputs.append(imp.cache_from_source(filename, False))
 
         outputs += [
             os.path.join(build_dir, filename)
diff --git a/command/install_lib.py b/command/install_lib.py
index 3d01d07115..8a6bc7dec4 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -4,6 +4,7 @@
 (install all Python modules)."""
 
 import os
+import imp
 import sys
 
 from distutils.core import Command
@@ -164,9 +165,9 @@ def _bytecode_filenames(self, py_filenames):
             if ext != PYTHON_SOURCE_EXTENSION:
                 continue
             if self.compile:
-                bytecode_files.append(py_file + "c")
+                bytecode_files.append(imp.cache_from_source(py_file, True))
             if self.optimize > 0:
-                bytecode_files.append(py_file + "o")
+                bytecode_files.append(imp.cache_from_source(py_file, False))
 
         return bytecode_files
 

From 21fe162a546a17caa23b72d5ddb7f055cc9d5207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 3 Nov 2011 03:45:33 +0100
Subject: [PATCH 3339/8469] More fixes for PEP 3147 compliance in distutils
 (#11254)

---
 command/build_py.py       |  9 +++--
 command/install_lib.py    |  7 ++--
 tests/test_build_py.py    | 72 +++++++++++++++++++++++++--------------
 tests/test_install.py     | 15 ++++----
 tests/test_install_lib.py | 52 ++++++++++++++++------------
 5 files changed, 95 insertions(+), 60 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 3868c12f5b..1371b3d6ff 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -2,7 +2,8 @@
 
 Implements the Distutils 'build_py' command."""
 
-import sys, os
+import os
+import imp
 import sys
 from glob import glob
 
@@ -311,9 +312,11 @@ def get_outputs(self, include_bytecode=1):
             outputs.append(filename)
             if include_bytecode:
                 if self.compile:
-                    outputs.append(filename + "c")
+                    outputs.append(imp.cache_from_source(filename,
+                                                         debug_override=True))
                 if self.optimize > 0:
-                    outputs.append(filename + "o")
+                    outputs.append(imp.cache_from_source(filename,
+                                                         debug_override=False))
 
         outputs += [
             os.path.join(build_dir, filename)
diff --git a/command/install_lib.py b/command/install_lib.py
index 3d01d07115..15c08f1249 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -4,6 +4,7 @@
 (install all Python modules)."""
 
 import os
+import imp
 import sys
 
 from distutils.core import Command
@@ -164,9 +165,11 @@ def _bytecode_filenames(self, py_filenames):
             if ext != PYTHON_SOURCE_EXTENSION:
                 continue
             if self.compile:
-                bytecode_files.append(py_file + "c")
+                bytecode_files.append(imp.cache_from_source(
+                    py_file, debug_override=True))
             if self.optimize > 0:
-                bytecode_files.append(py_file + "o")
+                bytecode_files.append(imp.cache_from_source(
+                    py_file, debug_override=False))
 
         return bytecode_files
 
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 80316ad7d0..e416edd4a1 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -2,7 +2,6 @@
 
 import os
 import sys
-import io
 import imp
 import unittest
 
@@ -54,7 +53,6 @@ def test_package_data(self):
         # This makes sure the list of outputs includes byte-compiled
         # files for Python modules but not for package data files
         # (there shouldn't *be* byte-code files for those!).
-        #
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
@@ -64,15 +62,11 @@ def test_package_data(self):
         if sys.dont_write_bytecode:
             self.assertFalse(os.path.exists(pycache_dir))
         else:
-            # XXX even with -O, distutils writes pyc, not pyo; bug?
             pyc_files = os.listdir(pycache_dir)
             self.assertIn("__init__.%s.pyc" % imp.get_tag(), pyc_files)
 
     def test_empty_package_dir(self):
-        # See SF 1668596/1720897.
-        cwd = os.getcwd()
-
-        # create the distribution files.
+        # See bugs #1668596/#1720897
         sources = self.mkdtemp()
         open(os.path.join(sources, "__init__.py"), "w").close()
 
@@ -81,30 +75,55 @@ def test_empty_package_dir(self):
         open(os.path.join(testdir, "testfile"), "w").close()
 
         os.chdir(sources)
-        old_stdout = sys.stdout
-        sys.stdout = io.StringIO()
+        dist = Distribution({"packages": ["pkg"],
+                             "package_dir": {"pkg": ""},
+                             "package_data": {"pkg": ["doc/*"]}})
+        # script_name need not exist, it just need to be initialized
+        dist.script_name = os.path.join(sources, "setup.py")
+        dist.script_args = ["build"]
+        dist.parse_command_line()
 
         try:
-            dist = Distribution({"packages": ["pkg"],
-                                 "package_dir": {"pkg": ""},
-                                 "package_data": {"pkg": ["doc/*"]}})
-            # script_name need not exist, it just need to be initialized
-            dist.script_name = os.path.join(sources, "setup.py")
-            dist.script_args = ["build"]
-            dist.parse_command_line()
-
-            try:
-                dist.run_commands()
-            except DistutilsFileError:
-                self.fail("failed package_data test when package_dir is ''")
-        finally:
-            # Restore state.
-            os.chdir(cwd)
-            sys.stdout = old_stdout
+            dist.run_commands()
+        except DistutilsFileError:
+            self.fail("failed package_data test when package_dir is ''")
+
+    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
+    def test_byte_compile(self):
+        project_dir, dist = self.create_dist(py_modules=['boiledeggs'])
+        os.chdir(project_dir)
+        self.write_file('boiledeggs.py', 'import antigravity')
+        cmd = build_py(dist)
+        cmd.compile = 1
+        cmd.build_lib = 'here'
+        cmd.finalize_options()
+        cmd.run()
+
+        found = os.listdir(cmd.build_lib)
+        self.assertEqual(sorted(found), ['__pycache__', 'boiledeggs.py'])
+        found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
+        self.assertEqual(found, ['boiledeggs.%s.pyc' % imp.get_tag()])
+
+    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
+    def test_byte_compile_optimized(self):
+        project_dir, dist = self.create_dist(py_modules=['boiledeggs'])
+        os.chdir(project_dir)
+        self.write_file('boiledeggs.py', 'import antigravity')
+        cmd = build_py(dist)
+        cmd.compile = 0
+        cmd.optimize = 1
+        cmd.build_lib = 'here'
+        cmd.finalize_options()
+        cmd.run()
+
+        found = os.listdir(cmd.build_lib)
+        self.assertEqual(sorted(found), ['__pycache__', 'boiledeggs.py'])
+        found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
+        self.assertEqual(sorted(found), ['boiledeggs.%s.pyo' % imp.get_tag()])
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
-        pkg_dir, dist = self.create_dist()
+        dist = self.create_dist()[1]
         cmd = build_py(dist)
         cmd.compile = 1
         cmd.optimize = 1
@@ -118,6 +137,7 @@ def test_dont_write_bytecode(self):
 
         self.assertIn('byte-compiling is disabled', self.logs[0][1])
 
+
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)
 
diff --git a/tests/test_install.py b/tests/test_install.py
index 8a63af992f..cb2e1f2879 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,6 +1,7 @@
 """Tests for distutils.command.install."""
 
 import os
+import imp
 import sys
 import unittest
 import site
@@ -67,10 +68,7 @@ def check_path(got, expected):
         check_path(cmd.install_data, destination)
 
     def test_user_site(self):
-        # site.USER_SITE was introduced in 2.6
-        if sys.version < '2.6':
-            return
-
+        # test install with --user
         # preparing the environment for the test
         self.old_user_base = site.USER_BASE
         self.old_user_site = site.USER_SITE
@@ -175,9 +173,11 @@ def test_finalize_options(self):
 
     def test_record(self):
         install_dir = self.mkdtemp()
-        project_dir, dist = self.create_dist(scripts=['hello'])
+        project_dir, dist = self.create_dist(py_modules=['hello'],
+                                             scripts=['sayhi'])
         os.chdir(project_dir)
-        self.write_file('hello', "print('o hai')")
+        self.write_file('hello.py', "def main(): print('o hai')")
+        self.write_file('sayhi', 'from hello import main; main()')
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
@@ -193,7 +193,7 @@ def test_record(self):
             f.close()
 
         found = [os.path.basename(line) for line in content.splitlines()]
-        expected = ['hello',
+        expected = ['hello.py', 'hello.%s.pyc' % imp.get_tag(), 'sayhi',
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
@@ -238,6 +238,7 @@ def test_debug_mode(self):
             install_module.DEBUG = False
         self.assertTrue(len(self.logs) > old_logs_len)
 
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index b42b03b2fa..2bd4dc6e96 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -10,13 +10,14 @@
 from distutils.errors import DistutilsOptionError
 from test.support import run_unittest
 
+
 class InstallLibTestCase(support.TempdirManager,
                          support.LoggingSilencer,
                          support.EnvironGuard,
                          unittest.TestCase):
 
     def test_finalize_options(self):
-        pkg_dir, dist = self.create_dist()
+        dist = self.create_dist()[1]
         cmd = install_lib(dist)
 
         cmd.finalize_options()
@@ -35,56 +36,62 @@ def test_finalize_options(self):
 
     @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
     def test_byte_compile(self):
-        pkg_dir, dist = self.create_dist()
-        os.chdir(pkg_dir)
+        project_dir, dist = self.create_dist()
+        os.chdir(project_dir)
         cmd = install_lib(dist)
         cmd.compile = cmd.optimize = 1
 
-        f = os.path.join(pkg_dir, 'foo.py')
+        f = os.path.join(project_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        pyc_file = imp.cache_from_source('foo.py')
+        pyc_file = imp.cache_from_source('foo.py', debug_override=True)
         pyo_file = imp.cache_from_source('foo.py', debug_override=False)
         self.assertTrue(os.path.exists(pyc_file))
         self.assertTrue(os.path.exists(pyo_file))
 
     def test_get_outputs(self):
-        pkg_dir, dist = self.create_dist()
+        project_dir, dist = self.create_dist()
+        os.chdir(project_dir)
+        os.mkdir('spam')
         cmd = install_lib(dist)
 
         # setting up a dist environment
         cmd.compile = cmd.optimize = 1
-        cmd.install_dir = pkg_dir
-        f = os.path.join(pkg_dir, 'foo.py')
-        self.write_file(f, '# python file')
-        cmd.distribution.py_modules = [pkg_dir]
+        cmd.install_dir = self.mkdtemp()
+        f = os.path.join(project_dir, 'spam', '__init__.py')
+        self.write_file(f, '# python package')
         cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
-        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.packages = ['spam']
         cmd.distribution.script_name = 'setup.py'
 
-        # get_output should return 4 elements
-        self.assertTrue(len(cmd.get_outputs()) >= 2)
+        # get_outputs should return 4 elements: spam/__init__.py, .pyc and
+        # .pyo, foo.import-tag-abiflags.so / foo.pyd
+        outputs = cmd.get_outputs()
+        self.assertEqual(len(outputs), 4, outputs)
 
     def test_get_inputs(self):
-        pkg_dir, dist = self.create_dist()
+        project_dir, dist = self.create_dist()
+        os.chdir(project_dir)
+        os.mkdir('spam')
         cmd = install_lib(dist)
 
         # setting up a dist environment
         cmd.compile = cmd.optimize = 1
-        cmd.install_dir = pkg_dir
-        f = os.path.join(pkg_dir, 'foo.py')
-        self.write_file(f, '# python file')
-        cmd.distribution.py_modules = [pkg_dir]
+        cmd.install_dir = self.mkdtemp()
+        f = os.path.join(project_dir, 'spam', '__init__.py')
+        self.write_file(f, '# python package')
         cmd.distribution.ext_modules = [Extension('foo', ['xxx'])]
-        cmd.distribution.packages = [pkg_dir]
+        cmd.distribution.packages = ['spam']
         cmd.distribution.script_name = 'setup.py'
 
-        # get_input should return 2 elements
-        self.assertEqual(len(cmd.get_inputs()), 2)
+        # get_inputs should return 2 elements: spam/__init__.py and
+        # foo.import-tag-abiflags.so / foo.pyd
+        inputs = cmd.get_inputs()
+        self.assertEqual(len(inputs), 2, inputs)
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
-        pkg_dir, dist = self.create_dist()
+        dist = self.create_dist()[1]
         cmd = install_lib(dist)
         cmd.compile = 1
         cmd.optimize = 1
@@ -98,6 +105,7 @@ def test_dont_write_bytecode(self):
 
         self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
+
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)
 

From 658d33c3b35e0cb0cdcb75c80026192adad14a4c Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Nov 2011 01:20:45 +0100
Subject: [PATCH 3340/8469] Issue #13193: fix distutils.filelist.FileList under
 Windows

---
 filelist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/filelist.py b/filelist.py
index a94b5c8e96..87b2cc6bc4 100644
--- a/filelist.py
+++ b/filelist.py
@@ -313,7 +313,10 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
-        pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
+        # match both path separators, as in Postel's principle
+        sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
+                                  if os.path.altsep else os.path.sep) + "]"
+        pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re

From 74d45d2ff91f898f30dcf8c4a47192ed8fc509c3 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Nov 2011 01:33:59 +0100
Subject: [PATCH 3341/8469] Issue #13193: Fix distutils.filelist.FileList under
 Windows.  The "recursive-include" directive now recognizes both legal path
 separators.

---
 filelist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/filelist.py b/filelist.py
index 4aac6d397a..ebd1411817 100644
--- a/filelist.py
+++ b/filelist.py
@@ -328,7 +328,10 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
-        pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
+        # match both path separators, as in Postel's principle
+        sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
+                                  if os.path.altsep else os.path.sep) + "]"
+        pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re

From b27cbb5efa3005728fe1c892a528a614e306bc5d Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 17 Nov 2011 11:07:08 -0800
Subject: [PATCH 3342/8469] workaround a cache issue refers #258

--HG--
branch : distribute
extra : rebase_source : c8897b0541098e34f4347621f54ed79ef32be229
---
 CHANGES.txt      | 1 +
 pkg_resources.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 85b1c269c2..889dc34b1b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ------
 
 * Issue #249: Added options to exclude 2to3 fixers
+* Issue #258: Workaround a cache issue
 
 ------
 0.6.23
diff --git a/pkg_resources.py b/pkg_resources.py
index e8dae8a420..4cc73bb853 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -508,6 +508,10 @@ def __iter__(self):
         """
         seen = {}
         for item in self.entries:
+            if item not in self.entry_keys:
+                # workaround a cache issue
+                continue
+
             for key in self.entry_keys[item]:
                 if key not in seen:
                     seen[key]=1

From 7ee58aa10f38d16c8e2525509b4cb24a11f8f6b3 Mon Sep 17 00:00:00 2001
From: Tarek Ziade <tarek@ziade.org>
Date: Thu, 17 Nov 2011 11:08:19 -0800
Subject: [PATCH 3343/8469] replaced the changelog where it belongs

--HG--
branch : distribute
extra : rebase_source : fe632afaf51fecd020b79c64f3fb9a5d391a6d5e
---
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 889dc34b1b..a44b048120 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,17 @@
 CHANGES
 =======
 
+------
+0.6.25
+------
+
+* Issue #258: Workaround a cache issue
+
 ------
 0.6.24
 ------
 
 * Issue #249: Added options to exclude 2to3 fixers
-* Issue #258: Workaround a cache issue
 
 ------
 0.6.23

From 70177237f6549f0647b490b2dc6a06ff14f0b321 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Nov 2011 09:55:28 -0500
Subject: [PATCH 3344/8469] distribute_setup.py now accepts the --user argument
 for installing to the user-local environment on Python 2.6 and later. Fixes
 #260.

--HG--
branch : distribute
extra : rebase_source : 7435c8b7f4d8eb6308cf7d5d9578f79c91f6b18b
---
 CHANGES.txt         |  2 ++
 distribute_setup.py | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a44b048120..b857227ddc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ CHANGES
 ------
 
 * Issue #258: Workaround a cache issue
+* Issue #260: distribute_setup.py now accepts the --user parameter for
+  Python 2.6 and later.
 
 ------
 0.6.24
diff --git a/distribute_setup.py b/distribute_setup.py
index f0bfa25ac4..d2c2899afa 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -63,7 +63,7 @@ def quote(arg):
 """ % SETUPTOOLS_FAKED_VERSION
 
 
-def _install(tarball):
+def _install(tarball, install_args=()):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
@@ -81,7 +81,7 @@ def _install(tarball):
 
         # installing
         log.warn('Installing Distribute')
-        if not _python_cmd('setup.py', 'install'):
+        if not _python_cmd('setup.py', 'install', *install_args):
             log.warn('Something went wrong during the installation.')
             log.warn('See the error message above.')
     finally:
@@ -474,11 +474,20 @@ def sorter(dir1, dir2):
             else:
                 self._dbg(1, "tarfile: %s" % e)
 
+def _build_install_args(argv):
+    install_args = []
+    user_install = '--user' in argv
+    if user_install and sys.version_info < (2,6):
+        log.warn("--user requires Python 2.6 or later")
+        raise SystemExit(1)
+    if user_install:
+        install_args.append('--user')
+    return install_args
 
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     tarball = download_setuptools()
-    _install(tarball)
+    _install(tarball, _build_install_args(argv))
 
 
 if __name__ == '__main__':

From bbe00513be4b20a82eb844dab52c15ca5e8e7113 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2011 12:55:33 -0500
Subject: [PATCH 3345/8469] Fix issue #262 - package_index.open_with_auth no
 longer throws LookupError on Python 3.

--HG--
branch : distribute
extra : rebase_source : ae4a0886ff89d3679f495f51171f94d3770e5d47
---
 CHANGES.txt                 |  2 ++
 setuptools/package_index.py | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b857227ddc..a245b2a4a9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@ CHANGES
 * Issue #258: Workaround a cache issue
 * Issue #260: distribute_setup.py now accepts the --user parameter for
   Python 2.6 and later.
+* Issue #262: package_index.open_with_auth no longer throws LookupError
+  on Python 3.
 
 ------
 0.6.24
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index bb0ae12996..d0896febc4 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
 """PyPI and direct package downloading"""
 import sys, os.path, re, urlparse, urllib, urllib2, shutil, random, socket, cStringIO
+import base64
 import httplib
 from pkg_resources import *
 from distutils import log
@@ -756,6 +757,22 @@ def _socket_timeout(*args, **kwargs):
         return _socket_timeout
     return _socket_timeout
 
+def _encode_auth(auth):
+    """
+    A function compatible with Python 2.3-3.3 that will encode
+    auth from a URL suitable for an HTTP header.
+    >>> _encode_auth('username%3Apassword')
+    u'dXNlcm5hbWU6cGFzc3dvcmQ='
+    """
+    auth_s = urllib2.unquote(auth)
+    # convert to bytes
+    auth_bytes = auth_s.encode()
+    # use the legacy interface for Python 2.3 support
+    encoded_bytes = base64.encodestring(auth_bytes)
+    # convert back to a string
+    encoded = encoded_bytes.decode()
+    # strip the trailing carriage return
+    return encoded.rstrip()
 
 def open_with_auth(url):
     """Open a urllib2 request, handling HTTP authentication"""
@@ -768,7 +785,7 @@ def open_with_auth(url):
         auth = None
 
     if auth:
-        auth = "Basic " + urllib2.unquote(auth).encode('base64').strip()
+        auth = "Basic " + _encode_auth(auth)
         new_url = urlparse.urlunparse((scheme,host,path,params,query,frag))
         request = urllib2.Request(new_url)
         request.add_header("Authorization", auth)

From 9d5c2363ccbdd0c8909f47fcf61cef647f302450 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2011 17:11:03 -0500
Subject: [PATCH 3346/8469] Updated release script to make sure bump happens in
 the right place

--HG--
branch : distribute
extra : rebase_source : c43255ab2e3cba530aa8043fd3989aa8e21cd4a7
---
 release.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release.py b/release.py
index f3000e0bac..2aab1344e9 100644
--- a/release.py
+++ b/release.py
@@ -58,6 +58,9 @@ def do_release():
 		'upload', 'upload_docs'])
 	upload_bootstrap_script()
 
+	# update to the tip for the next operation
+	subprocess.check_call(['hg', 'update'])
+
 	# we just tagged the current version, bump for the next release.
 	bump_versions()
 	subprocess.check_call(['hg', 'ci', '-m',

From 490e58f300e1cbed87b5efa671c3502d79e0c6a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Dec 2011 10:15:15 -0500
Subject: [PATCH 3347/8469] Issue #11638: Adding test to ensure .tar.gz files
 can be generated by sdist command with unicode metadata, based on David
 Barnett's patch. Issue #11638: Added tests to capture failures in
 make_tarball with various unicode strings. Following fix for Issue #13639,
 these tests now pass.

---
 tests/test_archive_util.py | 31 +++++++++++++++++++++++++++++--
 tests/test_sdist.py        | 22 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 1f7106f84f..2881148cc2 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Tests for distutils.archive_util."""
 __revision__ = "$Id$"
 
@@ -40,6 +41,9 @@ class ArchiveUtilTestCase(support.TempdirManager,
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_make_tarball(self):
+        self._make_tarball('archive')
+
+    def _make_tarball(self, target_name):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')
@@ -51,7 +55,7 @@ def test_make_tarball(self):
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
                             "source and target should be on same drive")
 
-        base_name = os.path.join(tmpdir2, 'archive')
+        base_name = os.path.join(tmpdir2, target_name)
 
         # working with relative paths to avoid tar warnings
         old_dir = os.getcwd()
@@ -66,7 +70,7 @@ def test_make_tarball(self):
         self.assertTrue(os.path.exists(tarball))
 
         # trying an uncompressed one
-        base_name = os.path.join(tmpdir2, 'archive')
+        base_name = os.path.join(tmpdir2, target_name)
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
@@ -277,6 +281,29 @@ def _breaks(*args, **kw):
         finally:
             del ARCHIVE_FORMATS['xxx']
 
+    @unittest.skipUnless(zlib, "requires zlib")
+    def test_make_tarball_unicode(self):
+        """
+        Mirror test_make_tarball, except filename is unicode.
+        """
+        self._make_tarball(u'archive')
+
+    @unittest.skipUnless(zlib, "requires zlib")
+    def test_make_tarball_unicode_latin1(self):
+        """
+        Mirror test_make_tarball, except filename is unicode and contains
+        latin characters.
+        """
+        self._make_tarball(u'Ã¥rchiv') # note this isn't a real word
+
+    @unittest.skipUnless(zlib, "requires zlib")
+    def test_make_tarball_unicode_extended(self):
+        """
+        Mirror test_make_tarball, except filename is unicode and contains
+        characters outside the latin charset.
+        """
+        self._make_tarball(u'�アーカイブ') # japanese for archive
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 33f6ee69a9..cb7beb7b2c 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -165,6 +165,28 @@ def test_make_distribution(self):
         result.sort()
         self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
+    @unittest.skipUnless(zlib, "requires zlib")
+    def test_unicode_metadata_tgz(self):
+        """
+        Unicode name or version should not break building to tar.gz format.
+        Reference issue #11638.
+        """
+
+        # create the sdist command with unicode parameters
+        dist, cmd = self.get_cmd({'name': u'fake', 'version': u'1.0'})
+
+        # create the sdist as gztar and run the command
+        cmd.formats = ['gztar']
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # The command should have created the .tar.gz file
+        dist_folder = join(self.tmp_dir, 'dist')
+        result = os.listdir(dist_folder)
+        self.assertEqual(result, ['fake-1.0.tar.gz'])
+
+        os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
+
     @unittest.skipUnless(zlib, "requires zlib")
     def test_add_defaults(self):
 

From 57661611c196b2b76a8be5463ae11db361e22eb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Dec 2011 12:17:01 -0500
Subject: [PATCH 3348/8469] Ported some test cases from 2.7 for #11638

---
 tests/test_archive_util.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 8edfab49f8..a6aeaf04a0 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Tests for distutils.archive_util."""
 import unittest
 import os
@@ -32,6 +33,24 @@ class ArchiveUtilTestCase(support.TempdirManager,
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_make_tarball(self):
+        self._make_tarball('archive')
+
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    def test_make_tarball_latin1(self):
+        """
+        Mirror test_make_tarball, except filename contains latin characters.
+        """
+        self._make_tarball('Ã¥rchiv') # note this isn't a real word
+
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    def test_make_tarball_extended(self):
+        """
+        Mirror test_make_tarball, except filename contains extended
+        characters outside the latin charset.
+        """
+        self._make_tarball('�アーカイブ') # japanese for archive
+
+    def _make_tarball(self, target_name):
         # creating something to tar
         tmpdir = self.mkdtemp()
         self.write_file([tmpdir, 'file1'], 'xxx')
@@ -43,7 +62,7 @@ def test_make_tarball(self):
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
                             "Source and target should be on same drive")
 
-        base_name = os.path.join(tmpdir2, 'archive')
+        base_name = os.path.join(tmpdir2, target_name)
 
         # working with relative paths to avoid tar warnings
         old_dir = os.getcwd()
@@ -58,7 +77,7 @@ def test_make_tarball(self):
         self.assertTrue(os.path.exists(tarball))
 
         # trying an uncompressed one
-        base_name = os.path.join(tmpdir2, 'archive')
+        base_name = os.path.join(tmpdir2, target_name)
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:

From 812d67fafa516462fdac0294a56dcf0cd1631a59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2011 10:45:08 -0500
Subject: [PATCH 3349/8469] Limit test scope to those platforms that can save
 the target filenames. Reference #11638.

---
 tests/test_archive_util.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index a6aeaf04a0..1afdd46225 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -2,6 +2,7 @@
 """Tests for distutils.archive_util."""
 import unittest
 import os
+import sys
 import tarfile
 from os.path import splitdrive
 import warnings
@@ -26,6 +27,18 @@
 except ImportError:
     ZLIB_SUPPORT = False
 
+def can_fs_encode(filename):
+    """
+    Return True if the filename can be saved in the file system.
+    """
+    if os.path.supports_unicode_filenames:
+        return True
+    try:
+        filename.encode(sys.getfilesystemencoding())
+    except UnicodeEncodeError:
+        return False
+    return True
+
 
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -36,6 +49,8 @@ def test_make_tarball(self):
         self._make_tarball('archive')
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    @unittest.skipUnless(can_fs_encode('Ã¥rchiv'),
+        'File system cannot handle this filename')
     def test_make_tarball_latin1(self):
         """
         Mirror test_make_tarball, except filename contains latin characters.
@@ -43,6 +58,8 @@ def test_make_tarball_latin1(self):
         self._make_tarball('Ã¥rchiv') # note this isn't a real word
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    @unittest.skipUnless(can_fs_encode('�アーカイブ'),
+        'File system cannot handle this filename')
     def test_make_tarball_extended(self):
         """
         Mirror test_make_tarball, except filename contains extended

From 92f16a5603d9ba55dd73f8c1ad34efb276021dc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2011 11:42:22 -0500
Subject: [PATCH 3350/8469] Limit test scope to those platforms that can save
 the target filenames. Reference #11638.

---
 tests/test_archive_util.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 2881148cc2..f01cec3263 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -4,6 +4,7 @@
 
 import unittest
 import os
+import sys
 import tarfile
 from os.path import splitdrive
 import warnings
@@ -34,6 +35,18 @@
 except ImportError:
     zlib = None
 
+def can_fs_encode(filename):
+    """
+    Return True if the filename can be saved in the file system.
+    """
+    if os.path.supports_unicode_filenames:
+        return True
+    try:
+        filename.encode(sys.getfilesystemencoding())
+    except UnicodeEncodeError:
+        return False
+    return True
+
 
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -289,6 +302,8 @@ def test_make_tarball_unicode(self):
         self._make_tarball(u'archive')
 
     @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(can_fs_encode(u'Ã¥rchiv'),
+        'File system cannot handle this filename')
     def test_make_tarball_unicode_latin1(self):
         """
         Mirror test_make_tarball, except filename is unicode and contains
@@ -297,6 +312,8 @@ def test_make_tarball_unicode_latin1(self):
         self._make_tarball(u'Ã¥rchiv') # note this isn't a real word
 
     @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(can_fs_encode(u'�アーカイブ'),
+        'File system cannot handle this filename')
     def test_make_tarball_unicode_extended(self):
         """
         Mirror test_make_tarball, except filename is unicode and contains

From 44a9a9edfced040982904c9adbc37c811845c512 Mon Sep 17 00:00:00 2001
From: Marcus Smith <qwcode@gmail.com>
Date: Sun, 8 Jan 2012 19:22:42 -0800
Subject: [PATCH 3351/8469] Update EasyInstall 'Custom Installation'
 documentation to be conscious of PEP-370

--HG--
branch : distribute
extra : rebase_source : 2d83be766be1dbe335848c5ece56430c7cfa58d3
---
 docs/easy_install.txt | 217 +++++++++---------------------------------
 1 file changed, 44 insertions(+), 173 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index ab008a1d90..cea4e122b5 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -940,194 +940,65 @@ Command-Line Options
 Custom Installation Locations
 -----------------------------
 
-EasyInstall manages what packages are active using Python ``.pth`` files, which
-are normally only usable in Python's main ``site-packages`` directory.  On some
-platforms (such as Mac OS X), there are additional ``site-packages``
-directories that you can use besides the main one, but usually there is only
-one directory on the system where you can install packages without extra steps.
-
-There are many reasons, however, why you might want to install packages
-somewhere other than the ``site-packages`` directory.  For example, you might
-not have write access to that directory.  You may be working with unstable
-versions of packages that you don't want to install system-wide.  And so on.
-
-The following sections describe various approaches to custom installation; feel
-free to choose which one best suits your system and needs.
-
-`Administrator Installation`_
-    This approach is for when you have write access to ``site-packages`` (or
-    another directory where ``.pth`` files are processed), but don't want to
-    install packages there.  This can also be used by a system administrator
-    to enable each user having their own private directories that EasyInstall
-    will use to install packages.
-
-`Mac OS X "User" Installation`_
-    This approach produces a result similar to an administrator installation
-    that gives each user their own private package directory, but on Mac OS X
-    the hard part has already been done for you.  This is probably the best
-    approach for Mac OS X users.
-
-`Creating a "Virtual" Python`_
-    This approach is for when you don't have "root" or access to write to the
-    ``site-packages`` directory, and would like to be able to set up one or
-    more "virtual python" executables for your projects.  This approach
-    gives you the benefits of multiple Python installations, but without having
-    to actually install Python more than once and use up lots of disk space.
-    (Only the Python executable is copied; the libraries will be symlinked
-    from the systemwide Python.)
-
-    If you don't already have any ``PYTHONPATH`` customization or
-    special distutils configuration, and you can't use either of the preceding
-    approaches, this is probably the best one for you.
-
-`"Traditional" PYTHONPATH-based Installation`_
-    If you already have a custom ``PYTHONPATH``, and/or a custom distutils
-    configuration, and don't want to change any of your existing setup, you may
-    be interested in this approach.  (If you're using a custom ``.pth`` file to
-    point to your custom installation location, however, you should use
-    `Administrator Installation`_ to enable ``.pth`` processing in the custom
-    location instead, as that is easier and more flexible than this approach.)
-
-
-Administrator Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you have root access to your machine, you can easily configure it to allow
-each user to have their own directory where Python packages can be installed
-and managed by EasyInstall.
-
-First, create an ``altinstall.pth`` file in Python's ``site-packages``
-directory,  containing the following line (substituting the correct Python
-version)::
-
-    import os, site; site.addsitedir(os.path.expanduser('~/lib/python2.3'))
+By default, EasyInstall installs python packages into Python's main ``site-packages`` directory, 
+and manages them using a custom ``.pth`` file in that same directory.
 
-This will automatically add each user's ``~/lib/python2.X`` directory to
-``sys.path`` (if it exists), *and* it will process any ``.pth`` files in that
-directory -- which is what makes it usable with EasyInstall.
+Very often though, a user or developer wants ``easy_install`` to install and manage python packages 
+in an alternative location, usually for one of 3 reasons:
 
-The next step is to create or modify ``distutils.cfg`` in the ``distutils``
-directory of your Python library.  The correct directory will be something like
-``/usr/lib/python2.X/distutils`` on most Posix systems and something like
-``C:\\Python2X\Lib\distutils`` on Windows machines.  Add the following lines
-to the file, substituting the correct Python version if necessary:
+1. They don't have access to write to the main Python site-packages directory.
 
-.. code-block:: ini
-
-    [install]
-    install_lib = ~/lib/python2.3
-
-    # This next line is optional but often quite useful; it directs EasyInstall
-    # and the distutils to install scripts in the user's "bin" directory.  For
-    # Mac OS X framework Python builds, you should use /usr/local/bin instead,
-    # because neither ~/bin nor the default script installation location are on
-    # the system PATH.
-    #
-    install_scripts = ~/bin
+2. They want a user-specific stash of packages, that is not visible to other users.
 
-This will configure the distutils and EasyInstall to install packages to the
-user's home directory by default.
+3. They want to isolate a set of packages to a specific python application, usually to minimize 
+   the possibility of version conflicts. 
 
-Of course, you aren't limited to using a ``~/lib/python2.X`` directory with
-this approach.  You can substitute a specific systemwide directory if you like.
-You can also edit ``~/.pydistutils.cfg`` (or ``~/pydistutils.cfg`` on Windows)
-instead of changing the master ``distutils.cfg`` file.  The true keys of this
-approach are simply that:
+Historically, there have been many approaches to achieve custom installation. 
+The following section lists only the easiest and most relevant approaches [1]_. 
 
-1. any custom installation directory must be added to ``sys.path`` using a
-   ``site.addsitedir()`` call from a working ``.pth`` file or
-   ``sitecustomize.py``.
+`Use the "--user" option`_
+    
+`Use the "--user" option and customize "PYTHONUSERBASE"`_  
 
-2. The active distutils configuration file(s) or ``easy_install`` command line
-   should include the custom directory in the ``--site-dirs`` option, so that
-   EasyInstall knows that ``.pth`` files will work in that location.  (This is
-   because Python does not keep track of what directories are or aren't enabled
-   for ``.pth`` processing, in any way that EasyInstall can find out.)
-
-As long as both of these things have been done, your custom installation
-location is good to go.
-
-
-Mac OS X "User" Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you are on a Mac OS X machine, you should just use the
-``~/Library/Python/2.x/site-packages`` directory as your custom installation
-location, because it is already configured to process ``.pth`` files, and
-EasyInstall already knows this.
-
-Before installing EasyInstall/setuptools, just create a ``~/.pydistutils.cfg``
-file with the following contents (or add this to the existing contents):
-
-.. code-block:: ini
+`Use "virtualenv"`_
 
-    [install]
-    install_lib = ~/Library/Python/$py_version_short/site-packages
-    install_scripts = ~/bin
+.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_ in Python 2.6.
 
-This will tell the distutils and EasyInstall to always install packages in
-your personal ``site-packages`` directory, and scripts to ``~/bin``.  (Note: do
-*not* replace ``$py_version_short`` with an actual Python version in the
-configuration file!  The distutils will substitute the correct value at
-runtime, so that the above configuration file should work correctly no matter
-what Python version you use, now or in the future.)
+.. _PEP-370: http://www.python.org/dev/peps/pep-0370/
 
-Once you have done this, you can follow the normal `installation instructions`_
-and use ``easy_install`` without any other special options or steps.
 
-(Note, however, that ``~/bin`` is not in the default ``PATH``, so you may have
-to refer to scripts by their full location.  You may want to modify your shell
-startup script (likely ``.bashrc`` or ``.profile``) or your
-``~/.MacOSX/environment.plist`` to include ``~/bin`` in your ``PATH``.
-
-
-Creating a "Virtual" Python
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you are on a Linux, BSD, Cygwin, or other similar Unix-like operating
-system, but don't have root access, you can create your own "virtual"
-Python installation, which uses its own library directories and some symlinks
-to the site-wide Python.
-
-Please refer to the `virtualenv`_ documentation for creating such an
-environment.
+Use the "--user" option
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+With Python 2.6 came the User scheme for installation, which means that all 
+python distributions support an alternative install location that is specific to a user [2]_ [3]_.
+The Default location for each OS is explained in the python documentation 
+for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
+specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
+This approach serves the need to have a user-specific stash of packages.
+
+.. [2] Prior to Python2.6, Mac OS X offered a form of the User scheme. That is now subsumed into the User scheme introduced in Python 2.6.
+.. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
+    
+Use the "--user" option and customize "PYTHONUSERBASE"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The User scheme install location can be customized by setting the ``PYTHONUSERBASE`` environment
+variable, which updates the value of ``site.USER_BASE``.  To isolate packages to a specific
+application, simply set the OS environment of that application to a specific value of       
+``PYTHONUSERBASE``, that contains just those packages.
+
+Use "virtualenv"
+~~~~~~~~~~~~~~~~
+"virtualenv" is a 3rd-party python package that effectively "clones" a python installation, thereby
+creating an isolated location to intall packages.  The evolution of "virtualenv" started before the existence
+of the User installation scheme.  "virtualenv" provides a version of ``easy_install`` that is
+scoped to the cloned python install and is used in the normal way. "virtualenv" does offer various features
+that the User installation scheme alone does not provide, e.g. the ability to hide the main python site-packages.
+
+Please refer to the `virtualenv`_ documentation for more details.
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 
 
-"Traditional" ``PYTHONPATH``-based Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This installation method is not as robust or as flexible as `creating a
-"virtual" python`_ installation, as it uses various tricks to fool Python into
-processing ``.pth`` files where it normally wouldn't.  We suggest you at least
-consider using one of the other approaches, as they will generally result in
-a cleaner, more usable Python configuration.  However, if for some reason you
-can't or won't use one of the other approaches, here's how to do it.
-
-Assuming that you want to install packages in a directory called ``~/py-lib``,
-and scripts in ``~/bin``, here's what you need to do:
-
-First, edit ``~/.pydistutils.cfg`` to include these settings, if you don't
-already have them:
-
-.. code-block:: ini
-
-    [install]
-    install_lib = ~/py-lib
-    install_scripts = ~/bin
-
-Be sure to do this *before* you try to run the ``distribute_setup.py``
-installation script.  Then, follow the standard `installation instructions`_,
-but make sure that ``~/py-lib`` is listed in your ``PYTHONPATH`` environment
-variable.
-
-Your library installation directory *must* be in listed in ``PYTHONPATH``,
-not only when you install packages with EasyInstall, but also when you use
-any packages that are installed using EasyInstall.  You will probably want to
-edit your ``~/.profile`` or other configuration file(s) to ensure that it is
-set, if you haven't already got this set up on your machine.
-
 
 Package Index "API"
 -------------------

From 28f1f51717d813a91f6f290cac073b67257e266d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Jan 2012 08:25:22 -0500
Subject: [PATCH 3352/8469] Removed broken reference to 'Administrator
 Installation'.

--HG--
branch : distribute
extra : rebase_source : a844b98f9f382efd746498fdf03e02b17f012e70
---
 docs/easy_install.txt | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index cea4e122b5..9b4fcfbb6e 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -875,9 +875,6 @@ Command-Line Options
     judgment and force an installation directory to be treated as if it
     supported ``.pth`` files.
 
-    (If you want to *make* a non-``PYTHONPATH`` directory support ``.pth``
-    files, please see the `Administrator Installation`_ section below.)
-
 ``--no-deps, -N``  (New in 0.6a6)
     Don't install any dependencies.  This is intended as a convenience for
     tools that wrap eggs in a platform-specific packaging system.  (We don't
@@ -940,25 +937,25 @@ Command-Line Options
 Custom Installation Locations
 -----------------------------
 
-By default, EasyInstall installs python packages into Python's main ``site-packages`` directory, 
+By default, EasyInstall installs python packages into Python's main ``site-packages`` directory,
 and manages them using a custom ``.pth`` file in that same directory.
 
-Very often though, a user or developer wants ``easy_install`` to install and manage python packages 
+Very often though, a user or developer wants ``easy_install`` to install and manage python packages
 in an alternative location, usually for one of 3 reasons:
 
 1. They don't have access to write to the main Python site-packages directory.
 
 2. They want a user-specific stash of packages, that is not visible to other users.
 
-3. They want to isolate a set of packages to a specific python application, usually to minimize 
-   the possibility of version conflicts. 
+3. They want to isolate a set of packages to a specific python application, usually to minimize
+   the possibility of version conflicts.
 
-Historically, there have been many approaches to achieve custom installation. 
-The following section lists only the easiest and most relevant approaches [1]_. 
+Historically, there have been many approaches to achieve custom installation.
+The following section lists only the easiest and most relevant approaches [1]_.
 
 `Use the "--user" option`_
-    
-`Use the "--user" option and customize "PYTHONUSERBASE"`_  
+
+`Use the "--user" option and customize "PYTHONUSERBASE"`_
 
 `Use "virtualenv"`_
 
@@ -968,22 +965,22 @@ The following section lists only the easiest and most relevant approaches [1]_.
 
 
 Use the "--user" option
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-With Python 2.6 came the User scheme for installation, which means that all 
+~~~~~~~~~~~~~~~~~~~~~~~
+With Python 2.6 came the User scheme for installation, which means that all
 python distributions support an alternative install location that is specific to a user [2]_ [3]_.
-The Default location for each OS is explained in the python documentation 
+The Default location for each OS is explained in the python documentation
 for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
 specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
 This approach serves the need to have a user-specific stash of packages.
 
 .. [2] Prior to Python2.6, Mac OS X offered a form of the User scheme. That is now subsumed into the User scheme introduced in Python 2.6.
 .. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
-    
+
 Use the "--user" option and customize "PYTHONUSERBASE"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The User scheme install location can be customized by setting the ``PYTHONUSERBASE`` environment
 variable, which updates the value of ``site.USER_BASE``.  To isolate packages to a specific
-application, simply set the OS environment of that application to a specific value of       
+application, simply set the OS environment of that application to a specific value of
 ``PYTHONUSERBASE``, that contains just those packages.
 
 Use "virtualenv"

From a63bd68dca86bd47cd4424767b76e7cab6f9d136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 15 Jan 2012 02:48:55 +0100
Subject: [PATCH 3353/8469] Stop ignoring RPMs in distutils' upload command
 (#2945).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug reported by Hartmut Goebel and patch contributed by Carl Robben.
Carl tested the fix and we have a buildbot with rpm installed, so I’m
committing even though I could not run this test (but I do understand
the changed code :)
---
 command/bdist_rpm.py    | 12 ++++++++++++
 tests/test_bdist_rpm.py |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 678e118896..357eaa575e 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -365,16 +365,28 @@ def run(self):
         self.spawn(rpm_cmd)
 
         if not self.dry_run:
+            if self.distribution.has_ext_modules():
+                pyversion = get_python_version()
+            else:
+                pyversion = 'any'
+
             if not self.binary_only:
                 srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
                 assert(os.path.exists(srpm))
                 self.move_file(srpm, self.dist_dir)
+                filename = os.path.join(self.dist_dir, source_rpm)
+                self.distribution.dist_files.append(
+                    ('bdist_rpm', pyversion, filename))
 
             if not self.source_only:
                 for rpm in binary_rpms:
                     rpm = os.path.join(rpm_dir['RPMS'], rpm)
                     if os.path.exists(rpm):
                         self.move_file(rpm, self.dist_dir)
+                        filename = os.path.join(self.dist_dir,
+                                                os.path.basename(rpm))
+                        self.distribution.dist_files.append(
+                            ('bdist_rpm', pyversion, filename))
 
     def _dist_path(self, path):
         return os.path.join(self.dist_dir, os.path.basename(path))
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 804fb1355f..ab7a1bf24e 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -78,6 +78,10 @@ def test_quiet(self):
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
         self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
+        # bug #2945: upload ignores bdist_rpm files
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
     def test_no_optimize_flag(self):
 
         # XXX I am unable yet to make this test work without
@@ -117,6 +121,11 @@ def test_no_optimize_flag(self):
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
         self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+
+        # bug #2945: upload ignores bdist_rpm files
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():

From 91c28e06be723398c598c6412136eeec653125be Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 03:51:38 +0100
Subject: [PATCH 3354/8469] Closes #13803: Under Solaris, distutils doesn't
 include bitness in the directory name

---
 util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 6c49f0b1cb..2e4617ef27 100644
--- a/util.py
+++ b/util.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re
+import sys, os, string, re, platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -76,6 +76,7 @@ def get_platform ():
         if release[0] >= "5":           # SunOS 5 == Solaris 2
             osname = "solaris"
             release = "%d.%s" % (int(release[0]) - 3, release[2:])
+            machine += ".%s" % platform.architecture()[0]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)

From 379a0e19faa93540a244372b3332262916b0140a Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 03:58:42 +0100
Subject: [PATCH 3355/8469] Closes #13803: Under Solaris, distutils doesn't
 include bitness in the directory name

---
 util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util.py b/util.py
index f42c6a18b9..36c4a68494 100644
--- a/util.py
+++ b/util.py
@@ -9,6 +9,7 @@
 import imp
 import sys
 import string
+import platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -77,6 +78,7 @@ def get_platform ():
         if release[0] >= "5":           # SunOS 5 == Solaris 2
             osname = "solaris"
             release = "%d.%s" % (int(release[0]) - 3, release[2:])
+            machine += ".%s" % platform.architecture()[0]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)

From 411af75d7af96d11ff9a9fbed91298e58a2d7d07 Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 04:25:28 +0100
Subject: [PATCH 3356/8469] Emergency fix for #13803 bootstrap issue: Under
 Solaris, distutils doesn't include bitness in the directory name

---
 util.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 2e4617ef27..0c24e8ca3e 100644
--- a/util.py
+++ b/util.py
@@ -6,7 +6,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os, string, re, platform
+import sys, os, string, re
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -76,7 +76,11 @@ def get_platform ():
         if release[0] >= "5":           # SunOS 5 == Solaris 2
             osname = "solaris"
             release = "%d.%s" % (int(release[0]) - 3, release[2:])
-            machine += ".%s" % platform.architecture()[0]
+            # We can't use "platform.architecture()[0]" because a
+            # bootstrap problem. We use a dict to get an error
+            # if some suspicious happens.
+            bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
+            machine += ".%s" % bitness[sys.maxint]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)

From 026f3483351ce08ffa47f9143aa17d7da02f10ec Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 04:27:37 +0100
Subject: [PATCH 3357/8469] Emergency fix for #13803 bootstrap issue: Under
 Solaris, distutils doesn't include bitness in the directory name

---
 util.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 36c4a68494..416deec71d 100644
--- a/util.py
+++ b/util.py
@@ -9,7 +9,6 @@
 import imp
 import sys
 import string
-import platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -78,7 +77,11 @@ def get_platform ():
         if release[0] >= "5":           # SunOS 5 == Solaris 2
             osname = "solaris"
             release = "%d.%s" % (int(release[0]) - 3, release[2:])
-            machine += ".%s" % platform.architecture()[0]
+            # We can't use "platform.architecture()[0]" because a
+            # bootstrap problem. We use a dict to get an error
+            # if some suspicious happens.
+            bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
+            machine += ".%s" % bitness[sys.maxint]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)

From 989fd55dddc6638eab5073ab0adcc9df0ceac154 Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Wed, 18 Jan 2012 05:04:49 +0100
Subject: [PATCH 3358/8469] And yet another emergency fix for #13803 bootstrap
 issue: Under Solaris, distutils doesn't include bitness in the directory name

---
 util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 416deec71d..bce840274d 100644
--- a/util.py
+++ b/util.py
@@ -81,7 +81,7 @@ def get_platform ():
             # bootstrap problem. We use a dict to get an error
             # if some suspicious happens.
             bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
-            machine += ".%s" % bitness[sys.maxint]
+            machine += ".%s" % bitness[sys.maxsize]
         # fall through to standard osname-release-machine representation
     elif osname[:4] == "irix":              # could be "irix64"!
         return "%s-%s" % (osname, release)

From 5e53787185059a78874e2f730c431ec611b0b8e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Jan 2012 14:11:03 -0500
Subject: [PATCH 3359/8469] Remove grody hack for later versions of Python
 where it is no longer necessary. Fixes #269.

--HG--
branch : distribute
extra : rebase_source : c4f18c8760303a2228baf5b88ec1f59a865999a5
---
 CHANGES.txt                 |  2 ++
 setuptools/command/sdist.py | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a245b2a4a9..3c13ae209e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES
   Python 2.6 and later.
 * Issue #262: package_index.open_with_auth no longer throws LookupError
   on Python 3.
+* Issue #269: AttributeError when an exception occurs reading Manifest.in
+  on late releases of Python.
 
 ------
 0.6.24
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 3442fe4be6..c49839cdee 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -199,15 +199,25 @@ def add_defaults(self):
             build_scripts = self.get_finalized_command('build_scripts')
             self.filelist.extend(build_scripts.get_source_files())
 
-    def read_template(self):
+    def __read_template_hack(self):
+        # This grody hack closes the template file (MANIFEST.in) if an
+        #  exception occurs during read_template.
+        # Doing so prevents an error when easy_install attempts to delete the
+        #  file.
         try:
             _sdist.read_template(self)
         except:
-            # grody hack to close the template file (MANIFEST.in)
-            # this prevents easy_install's attempt at deleting the file from
-            # dying and thus masking the real error
             sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
             raise
+    # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
+    #  has been fixed, so only override the method if we're using an earlier
+    #  Python.
+    if (
+            sys.version_info < (2,7,2)
+            or (3,0) <= sys.version_info < (3,1,4)
+            or (3,2) <= sys.version_info < (3,2,1)
+        ):
+        read_template = __read_template_hack
 
     def check_readme(self):
         alts = ("README", "README.txt")

From d881174c2ecbc975f906758ae79f2fd4a491a779 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jan 2012 20:47:39 -0500
Subject: [PATCH 3360/8469] Updated DEVGUIDE to match current approach.

--HG--
branch : distribute
extra : rebase_source : 0c6caeacf90a13277dae24a2f39041fd5e44dc65
---
 DEVGUIDE.txt | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index 54b7f71c4d..8dcabfd1d7 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -6,22 +6,16 @@ Distribute is using Mercurial.
 
 Grab the code at bitbucket::
 
-    $ hg clone https://tarek@bitbucket.org/tarek/distribute distribute
+    $ hg clone https://bitbucket.org/tarek/distribute
 
-If you want to work in the 0.6 branch, you have to switch to it::
+If you want to contribute changes, we recommend you fork the repository on
+bitbucket, commit the changes to your repository, and then make a pull request
+on bitbucket. If you make some changes, don't forget to:
 
-    $ hg update 0.6-maintenance
-
-    $ hg branch
-    0.6-maintenance
-
-If you make some changes, don't forget to:
-
-- backport it to the 0.7 branch
 - add a note in CHANGES.txt
 
-And remember that 0.6 is only bug fixes, and the APIs should
-be fully backward compatible with Setuptools.
+And remember that 0.6 (the only development line) is only bug fixes, and the
+APIs should be fully backward compatible with Setuptools.
 
 You can run the tests via::
 

From e8934cbb01ea226144ff9222ad666a26a715b1a2 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Fri, 3 Feb 2012 02:39:49 +0100
Subject: [PATCH 3361/8469] Issue #13901: Prevent test_distutils failures on OS
 X with --enable-shared.

---
 tests/support.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index a2190c0214..4e6058d0ec 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -200,6 +200,9 @@ def fixup_build_ext(cmd):
         cmd = build_ext(dist)
         support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
+
+    Unlike most other Unix platforms, Mac OS X embeds absolute paths
+    to shared libraries into executables, so the fixup is not needed there.
     """
     if os.name == 'nt':
         cmd.debug = sys.executable.endswith('_d.exe')
@@ -211,5 +214,8 @@ def fixup_build_ext(cmd):
         if runshared is None:
             cmd.library_dirs = ['.']
         else:
-            name, equals, value = runshared.partition('=')
-            cmd.library_dirs = value.split(os.pathsep)
+            if sys.platform == 'darwin':
+                cmd.library_dirs = []
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)

From ef0dc103554be0c54d48e5bc028050423efb4594 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Fri, 3 Feb 2012 02:42:16 +0100
Subject: [PATCH 3362/8469] Issue #13901: Prevent test_distutils failures on OS
 X with --enable-shared.

---
 tests/support.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index d77bbee362..84d9232328 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -188,6 +188,9 @@ def fixup_build_ext(cmd):
         cmd = build_ext(dist)
         support.fixup_build_ext(cmd)
         cmd.ensure_finalized()
+
+    Unlike most other Unix platforms, Mac OS X embeds absolute paths
+    to shared libraries into executables, so the fixup is not needed there.
     """
     if os.name == 'nt':
         cmd.debug = sys.executable.endswith('_d.exe')
@@ -199,5 +202,8 @@ def fixup_build_ext(cmd):
         if runshared is None:
             cmd.library_dirs = ['.']
         else:
-            name, equals, value = runshared.partition('=')
-            cmd.library_dirs = value.split(os.pathsep)
+            if sys.platform == 'darwin':
+                cmd.library_dirs = []
+            else:
+                name, equals, value = runshared.partition('=')
+                cmd.library_dirs = value.split(os.pathsep)

From d7907a5c969ad05970e458cc7b69b522dda46164 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Feb 2012 22:34:53 -0500
Subject: [PATCH 3363/8469] Fix #272 - TypeError when namespace_package is
 unicode

--HG--
branch : distribute
extra : rebase_source : 5bb6bc394dbe2834977b853af85241ae0a472de6
---
 CHANGES.txt                            | 3 +++
 setuptools/command/install_egg_info.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3c13ae209e..cf901dc07a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,9 @@ CHANGES
   on Python 3.
 * Issue #269: AttributeError when an exception occurs reading Manifest.in
   on late releases of Python.
+* Issue #272: Prevent TypeError when namespace package names are unicode
+  and single-install-externally-managed is used. Also fixes PIP issue
+  449.
 
 ------
 0.6.24
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index dd95552e0b..f44b34b555 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -89,6 +89,8 @@ def install_namespaces(self):
         if not self.dry_run:
             f = open(filename,'wt')
             for pkg in nsp:
+                # ensure pkg is not a unicode string under Python 2.7
+                pkg = str(pkg)
                 pth = tuple(pkg.split('.'))
                 trailer = '\n'
                 if '.' in pkg:

From f4a592c1240bbc3f0b1d0d08e261874857954225 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 8 Feb 2012 13:33:09 -0500
Subject: [PATCH 3364/8469] Now load legacy scripts wrappers from templates in
 the package, which get converted to Python 3 syntax when built on Python 3.
 Fixes #273.

--HG--
branch : distribute
extra : rebase_source : 900842f8a9e70d347296f7b076c6113ead6f7318
---
 CHANGES.txt                         |  1 +
 setuptools/command/easy_install.py  | 36 ++++++++++++++++-------------
 setuptools/script template (dev).py |  6 +++++
 setuptools/script template.py       |  4 ++++
 4 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 setuptools/script template (dev).py
 create mode 100644 setuptools/script template.py

diff --git a/CHANGES.txt b/CHANGES.txt
index cf901dc07a..5ee08823cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@ CHANGES
 * Issue #272: Prevent TypeError when namespace package names are unicode
   and single-install-externally-managed is used. Also fixes PIP issue
   449.
+* Issue #273: Legacy script launchers now install with Python2/3 support.
 
 ------
 0.6.24
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4700fe0eaa..a51d88f518 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -731,22 +731,26 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         spec = str(dist.as_requirement())
         is_script = is_python_script(script_text, script_name)
 
-        if is_script and dev_path:
-            script_text = get_script_header(script_text) + (
-                "# EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r\n"
-                "__requires__ = %(spec)r\n"
-                "from pkg_resources import require; require(%(spec)r)\n"
-                "del require\n"
-                "__file__ = %(dev_path)r\n"
-                "execfile(__file__)\n"
-            ) % locals()
-        elif is_script:
-            script_text = get_script_header(script_text) + (
-                "# EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r\n"
-                "__requires__ = %(spec)r\n"
-                "import pkg_resources\n"
-                "pkg_resources.run_script(%(spec)r, %(script_name)r)\n"
-            ) % locals()
+        def get_template(filename):
+            """
+            There are a couple of template scripts in the package. This
+            function loads one of them and prepares it for use.
+
+            These templates use triple-quotes to escape variable
+            substitutions so the scripts get the 2to3 treatment when build
+            on Python 3. The templates cannot use triple-quotes naturally.
+            """
+            raw_bytes = resource_string('setuptools', template_name)
+            template_str = raw_bytes.decode('utf-8')
+            clean_template = template_str.replace('"""', '')
+            return clean_template
+
+        if is_script:
+            template_name = 'script template.py'
+            if dev_path:
+                template_name = template_name.replace('.py', ' (dev).py')
+            script_text = (get_script_header(script_text) +
+                get_template(template_name) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
     def write_script(self, script_name, contents, mode="t", blockers=()):
diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
new file mode 100644
index 0000000000..6dd9dd4525
--- /dev/null
+++ b/setuptools/script template (dev).py	
@@ -0,0 +1,6 @@
+# EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
+__requires__ = """%(spec)r"""
+from pkg_resources import require; require("""%(spec)r""")
+del require
+__file__ = """%(dev_path)r"""
+execfile(__file__)
diff --git a/setuptools/script template.py b/setuptools/script template.py
new file mode 100644
index 0000000000..8dd5d51001
--- /dev/null
+++ b/setuptools/script template.py	
@@ -0,0 +1,4 @@
+# EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r
+__requires__ = """%(spec)r"""
+import pkg_resources
+pkg_resources.run_script("""%(spec)r""", """%(script_name)r""")

From 8108212a71996cd25d5cb5366148d9c9dace27b5 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Fri, 10 Feb 2012 12:59:06 +0100
Subject: [PATCH 3365/8469] Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2,
 building Distutils-based packages with C extension modules may fail because
 Apple has removed gcc-4.2, the version used to build python.org 64-bit/32-bit
 Pythons.  If the user does not explicitly override the default C compiler by
 setting the CC environment variable, Distutils will now attempt to compile
 extension modules with clang if gcc-4.2 is required but not found. Also as a
 convenience, if the user does explicitly set CC, substitute its value as the
 default compiler in the Distutils LDSHARED configuration variable for OS X.
 (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u SDK,
 neither of which are available in Xcode 4.  This change does not attempt to
 override settings to support their use with Xcode 4.)

---
 sysconfig.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0d6d4c4fea..4f9041a794 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -141,6 +141,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
+_USE_CLANG = None
 
 def customize_compiler(compiler):
     """Do any platform-specific customization of a CCompiler instance.
@@ -153,8 +154,38 @@ def customize_compiler(compiler):
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO')
 
+        newcc = None
         if 'CC' in os.environ:
-            cc = os.environ['CC']
+            newcc = os.environ['CC']
+        elif sys.platform == 'darwin' and cc == 'gcc-4.2':
+            # Issue #13590:
+            #       Since Apple removed gcc-4.2 in Xcode 4.2, we can no
+            #       longer assume it is available for extension module builds.
+            #       If Python was built with gcc-4.2, check first to see if
+            #       it is available on this system; if not, try to use clang
+            #       instead unless the caller explicitly set CC.
+            global _USE_CLANG
+            if _USE_CLANG is None:
+                from distutils import log
+                from subprocess import Popen, PIPE
+                p = Popen("! type gcc-4.2 && type clang && exit 2",
+                                shell=True, stdout=PIPE, stderr=PIPE)
+                p.wait()
+                if p.returncode == 2:
+                    _USE_CLANG = True
+                    log.warn("gcc-4.2 not found, using clang instead")
+                else:
+                    _USE_CLANG = False
+            if _USE_CLANG:
+                newcc = 'clang'
+        if newcc:
+            # On OS X, if CC is overridden, use that as the default
+            #       command for LDSHARED as well
+            if (sys.platform == 'darwin'
+                    and 'LDSHARED' not in os.environ
+                    and ldshared.startswith(cc)):
+                ldshared = newcc + ldshared[len(cc):]
+            cc = newcc
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:

From 008c905df03c73798516d88ffe6550261d4f9af3 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Fri, 10 Feb 2012 13:01:08 +0100
Subject: [PATCH 3366/8469] Issue #13590: On OS X 10.7 and 10.6 with Xcode 4.2,
 building Distutils-based packages with C extension modules may fail because
 Apple has removed gcc-4.2, the version used to build python.org 64-bit/32-bit
 Pythons.  If the user does not explicitly override the default C compiler by
 setting the CC environment variable, Distutils will now attempt to compile
 extension modules with clang if gcc-4.2 is required but not found. Also as a
 convenience, if the user does explicitly set CC, substitute its value as the
 default compiler in the Distutils LDSHARED configuration variable for OS X.
 (Note, the python.org 32-bit-only Pythons use gcc-4.0 and the 10.4u SDK,
 neither of which are available in Xcode 4.  This change does not attempt to
 override settings to support their use with Xcode 4.)

---
 sysconfig.py | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index ac06313b19..16902ca920 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,6 +146,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
+_USE_CLANG = None
 
 def customize_compiler(compiler):
     """Do any platform-specific customization of a CCompiler instance.
@@ -158,8 +159,38 @@ def customize_compiler(compiler):
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
 
+        newcc = None
         if 'CC' in os.environ:
-            cc = os.environ['CC']
+            newcc = os.environ['CC']
+        elif sys.platform == 'darwin' and cc == 'gcc-4.2':
+            # Issue #13590:
+            #       Since Apple removed gcc-4.2 in Xcode 4.2, we can no
+            #       longer assume it is available for extension module builds.
+            #       If Python was built with gcc-4.2, check first to see if
+            #       it is available on this system; if not, try to use clang
+            #       instead unless the caller explicitly set CC.
+            global _USE_CLANG
+            if _USE_CLANG is None:
+                from distutils import log
+                from subprocess import Popen, PIPE
+                p = Popen("! type gcc-4.2 && type clang && exit 2",
+                                shell=True, stdout=PIPE, stderr=PIPE)
+                p.wait()
+                if p.returncode == 2:
+                    _USE_CLANG = True
+                    log.warn("gcc-4.2 not found, using clang instead")
+                else:
+                    _USE_CLANG = False
+            if _USE_CLANG:
+                newcc = 'clang'
+        if newcc:
+            # On OS X, if CC is overridden, use that as the default
+            #       command for LDSHARED as well
+            if (sys.platform == 'darwin'
+                    and 'LDSHARED' not in os.environ
+                    and ldshared.startswith(cc)):
+                ldshared = newcc + ldshared[len(cc):]
+            cc = newcc
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:

From e1f6c4c9deda898b03f389edcbbe0fd16e547724 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sat, 11 Feb 2012 20:40:24 +0100
Subject: [PATCH 3367/8469] Issue #13994: Earler partial revert of Distutils
 enhancements in 2.7 has left two versions of customize_compiler, the original
 in distutils.sysconfig and another copy in distutils.ccompiler, with some
 parts of distutils calling one and others using the other. Complete the
 revert back to only having one in distutils.sysconfig as is the case in 3.x.

---
 ccompiler.py             | 52 ----------------------------------------
 command/build_clib.py    |  2 +-
 command/config.py        |  2 +-
 sysconfig.py             | 14 ++++++++---
 tests/test_build_clib.py |  3 ++-
 tests/test_ccompiler.py  |  3 ++-
 6 files changed, 17 insertions(+), 59 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index c2b1f6fbe9..7076b93394 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -18,58 +18,6 @@
 from distutils.util import split_quoted, execute
 from distutils import log
 
-_sysconfig = __import__('sysconfig')
-
-def customize_compiler(compiler):
-    """Do any platform-specific customization of a CCompiler instance.
-
-    Mainly needed on Unix, so we can plug in the information that
-    varies across Unices and is stored in Python's Makefile.
-    """
-    if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-            _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                                       'CCSHARED', 'LDSHARED', 'SO', 'AR',
-                                       'ARFLAGS')
-
-        if 'CC' in os.environ:
-            cc = os.environ['CC']
-        if 'CXX' in os.environ:
-            cxx = os.environ['CXX']
-        if 'LDSHARED' in os.environ:
-            ldshared = os.environ['LDSHARED']
-        if 'CPP' in os.environ:
-            cpp = os.environ['CPP']
-        else:
-            cpp = cc + " -E"           # not always
-        if 'LDFLAGS' in os.environ:
-            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-        if 'CFLAGS' in os.environ:
-            cflags = opt + ' ' + os.environ['CFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CFLAGS']
-        if 'CPPFLAGS' in os.environ:
-            cpp = cpp + ' ' + os.environ['CPPFLAGS']
-            cflags = cflags + ' ' + os.environ['CPPFLAGS']
-            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-        if 'AR' in os.environ:
-            ar = os.environ['AR']
-        if 'ARFLAGS' in os.environ:
-            archiver = ar + ' ' + os.environ['ARFLAGS']
-        else:
-            archiver = ar + ' ' + ar_flags
-
-        cc_cmd = cc + ' ' + cflags
-        compiler.set_executables(
-            preprocessor=cpp,
-            compiler=cc_cmd,
-            compiler_so=cc_cmd + ' ' + ccshared,
-            compiler_cxx=cxx,
-            linker_so=ldshared,
-            linker_exe=cc,
-            archiver=archiver)
-
-        compiler.shared_lib_extension = so_ext
-
 class CCompiler:
     """Abstract base class to define the interface that must be implemented
     by real compiler classes.  Also has some utility methods used by
diff --git a/command/build_clib.py b/command/build_clib.py
index 98a1726ffa..205587e7fc 100644
--- a/command/build_clib.py
+++ b/command/build_clib.py
@@ -19,7 +19,7 @@
 import os
 from distutils.core import Command
 from distutils.errors import DistutilsSetupError
-from distutils.ccompiler import customize_compiler
+from distutils.sysconfig import customize_compiler
 from distutils import log
 
 def show_compilers():
diff --git a/command/config.py b/command/config.py
index da8da59538..b084913563 100644
--- a/command/config.py
+++ b/command/config.py
@@ -16,7 +16,7 @@
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
-from distutils.ccompiler import customize_compiler
+from distutils.sysconfig import customize_compiler
 from distutils import log
 
 LANG_EXT = {'c': '.c', 'c++': '.cxx'}
diff --git a/sysconfig.py b/sysconfig.py
index 4f9041a794..4b193b2703 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -150,9 +150,10 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO')
+                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+                            'ARFLAGS')
 
         newcc = None
         if 'CC' in os.environ:
@@ -203,6 +204,12 @@ def customize_compiler(compiler):
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
             cflags = cflags + ' ' + os.environ['CPPFLAGS']
             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+        if 'AR' in os.environ:
+            ar = os.environ['AR']
+        if 'ARFLAGS' in os.environ:
+            archiver = ar + ' ' + os.environ['ARFLAGS']
+        else:
+            archiver = ar + ' ' + ar_flags
 
         cc_cmd = cc + ' ' + cflags
         compiler.set_executables(
@@ -211,7 +218,8 @@ def customize_compiler(compiler):
             compiler_so=cc_cmd + ' ' + ccshared,
             compiler_cxx=cxx,
             linker_so=ldshared,
-            linker_exe=cc)
+            linker_exe=cc,
+            archiver=archiver)
 
         compiler.shared_lib_extension = so_ext
 
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 4f4e2bc7c6..bef1bd9953 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -122,7 +122,8 @@ def test_run(self):
         # before we run the command, we want to make sure
         # all commands are present on the system
         # by creating a compiler and checking its executables
-        from distutils.ccompiler import new_compiler, customize_compiler
+        from distutils.ccompiler import new_compiler
+        from distutils.sysconfig import customize_compiler
 
         compiler = new_compiler()
         customize_compiler(compiler)
diff --git a/tests/test_ccompiler.py b/tests/test_ccompiler.py
index e21873e821..45e477a429 100644
--- a/tests/test_ccompiler.py
+++ b/tests/test_ccompiler.py
@@ -4,7 +4,8 @@
 from test.test_support import captured_stdout
 
 from distutils.ccompiler import (gen_lib_options, CCompiler,
-                                 get_default_compiler, customize_compiler)
+                                 get_default_compiler)
+from distutils.sysconfig import customize_compiler
 from distutils import debug
 from distutils.tests import support
 

From 2c62a97a9a02f45900b34cad9089a664f254ffd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 12 Feb 2012 04:41:36 +0100
Subject: [PATCH 3368/8469] Fix distutils.filelist.FileList under Windows
 (#13193).

The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows.  Antoine Pitrou
fixed it in 557a973709de by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.
---
 filelist.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/filelist.py b/filelist.py
index ebd1411817..5540b39a38 100644
--- a/filelist.py
+++ b/filelist.py
@@ -328,10 +328,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
-        # match both path separators, as in Postel's principle
-        sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
-                                  if os.path.altsep else os.path.sep) + "]"
-        pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
+        # paths should always use / in manifest templates
+        pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re

From 994f4c4872485a62b67461766025532e7144a82f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 12 Feb 2012 04:52:21 +0100
Subject: [PATCH 3369/8469] Fix distutils.filelist.FileList under Windows
 (#13193).

The code used to call os.path.join to build a regex but without escaping
the backslash, which lead to test failures on Windows.  Antoine Pitrou
fixed it in 0a94e2f807c7 by enhancing the code to accept both / and \,
with proper escaping, but in my opinion this goes against the distutils
feature freeze, hence this change.
---
 filelist.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/filelist.py b/filelist.py
index 87b2cc6bc4..91220321a4 100644
--- a/filelist.py
+++ b/filelist.py
@@ -313,10 +313,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
-        # match both path separators, as in Postel's principle
-        sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
-                                  if os.path.altsep else os.path.sep) + "]"
-        pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
+        # paths should always use / in manifest templates
+        pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re

From 0dcd74259a364fdc273223482084e595460ed4a1 Mon Sep 17 00:00:00 2001
From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Mon, 13 Feb 2012 21:33:51 +0200
Subject: [PATCH 3370/8469] Issue #13193: Fix distutils.filelist tests to
 always use / as path separator.

---
 tests/test_filelist.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 1e04077f82..d86ea44491 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,7 +1,6 @@
 """Tests for distutils.filelist."""
 import re
 import unittest
-from os.path import join
 from distutils import debug
 from distutils.log import WARN
 from distutils.errors import DistutilsTemplateError
@@ -54,15 +53,15 @@ def test_process_template_line(self):
 
         # simulated file list
         file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
-                              join('global', 'one.txt'),
-                              join('global', 'two.txt'),
-                              join('global', 'files.x'),
-                              join('global', 'here.tmp'),
-                              join('f', 'o', 'f.oo'),
-                              join('dir', 'graft-one'),
-                              join('dir', 'dir2', 'graft2'),
-                              join('dir3', 'ok'),
-                              join('dir3', 'sub', 'ok.txt'),
+                              'global/one.txt',
+                              'global/two.txt',
+                              'global/files.x',
+                              'global/here.tmp',
+                              'f/o/f.oo',
+                              'dir/graft-one',
+                              'dir/dir2/graft2',
+                              'dir3/ok',
+                              'dir3/sub/ok.txt',
                               ]
 
         for line in MANIFEST_IN.split('\n'):
@@ -70,9 +69,8 @@ def test_process_template_line(self):
                 continue
             file_list.process_template_line(line)
 
-        wanted = ['ok', 'four.txt', join('global', 'one.txt'),
-                  join('global', 'two.txt'), join('f', 'o', 'f.oo'),
-                  join('dir', 'graft-one'), join('dir', 'dir2', 'graft2')]
+        wanted = ['ok', 'four.txt', 'global/one.txt', 'global/two.txt',
+                  'f/o/f.oo', 'dir/graft-one', 'dir/dir2/graft2']
 
         self.assertEqual(file_list.files, wanted)
 

From f6cb3d29d919ff6b9313b8a3281c66cfb368c29b Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Mon, 13 Feb 2012 16:22:33 -0500
Subject: [PATCH 3371/8469] This allows the sdist command to ensure that any
 files listed in package_data are included in the dist, regardless of whether
 it's under version control, as is the case with distutil's sdist.  Setting
 include_package_data=True disables this functionality.

--HG--
branch : distribute
extra : rebase_source : 2cae1675c638dc12fd556368074c6b5c691c6f58
---
 setuptools/command/sdist.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index c49839cdee..484f8276f7 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -186,6 +186,14 @@ def add_defaults(self):
         if self.distribution.has_pure_modules():
             build_py = self.get_finalized_command('build_py')
             self.filelist.extend(build_py.get_source_files())
+            # This functionality is incompatible with include_package_data, and
+            # will in fact create an infinite recursion if include_package_data
+            # is True.  Use of include_package_data will imply that
+            # distutils-style automatic handling of package_data is disabled
+            if not self.distribution.include_package_data:
+                for _, src_dir, _, filenames in build_py.data_files:
+                    self.filelist.extend([os.path.join(src_dir, filename)
+                                          for filename in filenames])
 
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')

From d0303ebcf59e6498e2e42bd0edcd56b932441cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Feb 2012 16:28:20 +0100
Subject: [PATCH 3372/8469] Fix parsing of build_ext --libraries option
 (#1326113)

---
 command/build_ext.py    |  3 +--
 tests/test_build_ext.py | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 55a4288ac0..923197bac4 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -160,8 +160,7 @@ def finalize_options(self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if isinstance(self.libraries, str):
-            self.libraries = [self.libraries]
+        self.ensure_string_list('libraries')
 
         # Life is easier if we're not forever checking for None, so
         # simplify these options to empty lists if unset
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 2fa63d300b..198cce3257 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -150,21 +150,21 @@ def test_finalize_options(self):
         # make sure cmd.libraries is turned into a list
         # if it's a string
         cmd = build_ext(dist)
-        cmd.libraries = 'my_lib'
+        cmd.libraries = 'my_lib, other_lib lastlib'
         cmd.finalize_options()
-        self.assertEqual(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib', 'other_lib', 'lastlib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
         cmd = build_ext(dist)
-        cmd.library_dirs = 'my_lib_dir'
+        cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
         cmd.finalize_options()
-        self.assertTrue('my_lib_dir' in cmd.library_dirs)
+        self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir'])
 
         # make sure rpath is turned into a list
-        # if it's a list of os.pathsep's paths
+        # if it's a string
         cmd = build_ext(dist)
-        cmd.rpath = os.pathsep.join(['one', 'two'])
+        cmd.rpath = 'one%stwo' % os.pathsep
         cmd.finalize_options()
         self.assertEqual(cmd.rpath, ['one', 'two'])
 

From 366ee8997644ce4f83c440bcd7e08ae00cf29ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Feb 2012 16:44:37 +0100
Subject: [PATCH 3373/8469] Fix parsing of build_ext --libraries option
 (#1326113)

---
 command/build_ext.py    |  3 +--
 tests/test_build_ext.py | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 8d843d689f..34b61bdb82 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -165,8 +165,7 @@ def finalize_options(self):
         if plat_py_include != py_include:
             self.include_dirs.append(plat_py_include)
 
-        if isinstance(self.libraries, str):
-            self.libraries = [self.libraries]
+        self.ensure_string_list('libraries')
 
         # Life is easier if we're not forever checking for None, so
         # simplify these options to empty lists if unset
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 1827437628..87cceee22d 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -178,21 +178,21 @@ def test_finalize_options(self):
         # make sure cmd.libraries is turned into a list
         # if it's a string
         cmd = build_ext(dist)
-        cmd.libraries = 'my_lib'
+        cmd.libraries = 'my_lib, other_lib lastlib'
         cmd.finalize_options()
-        self.assertEqual(cmd.libraries, ['my_lib'])
+        self.assertEqual(cmd.libraries, ['my_lib', 'other_lib', 'lastlib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
         cmd = build_ext(dist)
-        cmd.library_dirs = 'my_lib_dir'
+        cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
         cmd.finalize_options()
-        self.assertTrue('my_lib_dir' in cmd.library_dirs)
+        self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir'])
 
         # make sure rpath is turned into a list
-        # if it's a list of os.pathsep's paths
+        # if it's a string
         cmd = build_ext(dist)
-        cmd.rpath = os.pathsep.join(['one', 'two'])
+        cmd.rpath = 'one%stwo' % os.pathsep
         cmd.finalize_options()
         self.assertEqual(cmd.rpath, ['one', 'two'])
 

From 9793abc54257ffe60b3c46e2b4a1f4ee9ef5eb98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Feb 2012 18:12:12 +0100
Subject: [PATCH 3374/8469] Fix test failure for shared builds caused by
 #1326113 fix

---
 tests/test_build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 87cceee22d..090eacfb2c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -187,7 +187,8 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
         cmd.finalize_options()
-        self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir'])
+        self.assertIn('my_lib_dir', cmd.library_dirs)
+        self.assertIn('other_lib_dir', cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a string

From 7348d1f553ead879a48850adf8bd17772996ec7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 15 Feb 2012 18:13:45 +0100
Subject: [PATCH 3375/8469] Fix test failure for shared builds caused by
 #1326113 fix

---
 tests/test_build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 198cce3257..b71cc983be 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -159,7 +159,8 @@ def test_finalize_options(self):
         cmd = build_ext(dist)
         cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
         cmd.finalize_options()
-        self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir'])
+        self.assertIn('my_lib_dir', cmd.library_dirs)
+        self.assertIn('other_lib_dir', cmd.library_dirs)
 
         # make sure rpath is turned into a list
         # if it's a string

From 8b33fb69465d080b685d431e4ea0b8aeb17e84b5 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 10:45:48 -0500
Subject: [PATCH 3376/8469] version now 3.1.5rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a3e2993648..0e427624b8 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.4"
+__version__ = "3.1.5rc1"
 #--end constants--

From eb324661c378f36df356215c350772111a978ef4 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 10:52:17 -0500
Subject: [PATCH 3377/8469] bump to 2.7.3rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a849f1a9cd..83126f679f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.2"
+__version__ = "2.7.3rc1"
 #--end constants--

From 2181299388e93cb98ddd887f4bf9fdd0c6caeeb5 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Thu, 23 Feb 2012 10:55:57 -0500
Subject: [PATCH 3378/8469] Bump to version 2.6.8rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index beb65bb568..279e17a9df 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.7"
+__version__ = "2.6.8rc1"
 #--end constants--

From 500a248b355d0e418e8fc58f787ba47cab97c2eb Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Thu, 23 Feb 2012 21:14:12 +0100
Subject: [PATCH 3379/8469] Bump version to 3.2.3rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9ec6165864..369750551c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.2"
+__version__ = "3.2.3rc1"
 #--end constants--

From 9db46d430b09baf00228adeb5a4773a02508f7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 25 Feb 2012 16:13:53 +0100
Subject: [PATCH 3380/8469] Fix long-standing bugs with MANIFEST.in parsing on
 Windows (#6884).

These regex changes fix a number of issues for distutils on Windows:
- #6884: impossible to include a file starting with 'build'
- #9691 and #14004: sdist includes too many files
- #13193: test_filelist failures

This commit replaces the incorrect changes done in 557a973709de,
c566a3447ba1 and 3925081a7ca0 to fix #13193; we were too eager to fix
the test failures and I did not study the code enough before
greenlighting patches.  This time we have unit tests from the problems
reported by users to be sure we have the right fix.

Thanks to Nadeem Vawda for his help.
---
 filelist.py            |  20 +++++---
 tests/test_filelist.py | 113 ++++++++++++++++++++++++++---------------
 tests/test_sdist.py    |  14 +++--
 3 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/filelist.py b/filelist.py
index 5540b39a38..2f1c457ea0 100644
--- a/filelist.py
+++ b/filelist.py
@@ -210,6 +210,7 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
 
         Return 1 if files are found.
         """
+        # XXX docstring lying about what the special chars are?
         files_found = 0
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("include_pattern: applying regex r'%s'" %
@@ -297,11 +298,14 @@ def glob_to_re(pattern):
     # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
     # and by extension they shouldn't match such "special characters" under
     # any OS.  So change all non-escaped dots in the RE to match any
-    # character except the special characters.
-    # XXX currently the "special characters" are just slash -- i.e. this is
-    # Unix-only.
-    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
-
+    # character except the special characters (currently: just os.sep).
+    sep = os.sep
+    if os.sep == '\\':
+        # we're using a regex to manipulate a regex, so we need
+        # to escape the backslash twice
+        sep = r'\\\\'
+    escaped = r'\1[^%s]' % sep
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', escaped, pattern_re)
     return pattern_re
 
 
@@ -328,8 +332,10 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
-        # paths should always use / in manifest templates
-        pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
+        sep = os.sep
+        if os.sep == '\\':
+            sep = r'\\'
+        pattern_re = "^" + sep.join((prefix_re, ".*" + pattern_re))
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index d86ea44491..69b88f2df2 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,4 +1,5 @@
 """Tests for distutils.filelist."""
+import os
 import re
 import unittest
 from distutils import debug
@@ -14,6 +15,7 @@
 include xo
 exclude xo
 include foo.tmp
+include buildout.cfg
 global-include *.x
 global-include *.txt
 global-exclude *.tmp
@@ -24,6 +26,11 @@
 """
 
 
+def make_local_path(s):
+    """Converts '/' in a string to os.sep"""
+    return s.replace('/', os.sep)
+
+
 class FileListTestCase(support.LoggingSilencer,
                        unittest.TestCase):
 
@@ -36,41 +43,60 @@ def assertWarnings(self):
         self.clear_logs()
 
     def test_glob_to_re(self):
-        # simple cases
-        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
-
-        # special cases
-        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        sep = os.sep
+        if os.sep == '\\':
+            sep = re.escape(os.sep)
+
+        for glob, regex in (
+            # simple cases
+            ('foo*', r'foo[^%(sep)s]*\Z(?ms)'),
+            ('foo?', r'foo[^%(sep)s]\Z(?ms)'),
+            ('foo??', r'foo[^%(sep)s][^%(sep)s]\Z(?ms)'),
+            # special cases
+            (r'foo\\*', r'foo\\\\[^%(sep)s]*\Z(?ms)'),
+            (r'foo\\\*', r'foo\\\\\\[^%(sep)s]*\Z(?ms)'),
+            ('foo????', r'foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s]\Z(?ms)'),
+            (r'foo\\??', r'foo\\\\[^%(sep)s][^%(sep)s]\Z(?ms)')):
+            regex = regex % {'sep': sep}
+            self.assertEqual(glob_to_re(glob), regex)
 
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns
         file_list = FileList()
+        l = make_local_path
 
         # simulated file list
         file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
-                              'global/one.txt',
-                              'global/two.txt',
-                              'global/files.x',
-                              'global/here.tmp',
-                              'f/o/f.oo',
-                              'dir/graft-one',
-                              'dir/dir2/graft2',
-                              'dir3/ok',
-                              'dir3/sub/ok.txt',
-                              ]
+                              'buildout.cfg',
+                              # filelist does not filter out VCS directories,
+                              # it's sdist that does
+                              l('.hg/last-message.txt'),
+                              l('global/one.txt'),
+                              l('global/two.txt'),
+                              l('global/files.x'),
+                              l('global/here.tmp'),
+                              l('f/o/f.oo'),
+                              l('dir/graft-one'),
+                              l('dir/dir2/graft2'),
+                              l('dir3/ok'),
+                              l('dir3/sub/ok.txt'),
+                             ]
 
         for line in MANIFEST_IN.split('\n'):
             if line.strip() == '':
                 continue
             file_list.process_template_line(line)
 
-        wanted = ['ok', 'four.txt', 'global/one.txt', 'global/two.txt',
-                  'f/o/f.oo', 'dir/graft-one', 'dir/dir2/graft2']
+        wanted = ['ok',
+                  'buildout.cfg',
+                  'four.txt',
+                  l('.hg/last-message.txt'),
+                  l('global/one.txt'),
+                  l('global/two.txt'),
+                  l('f/o/f.oo'),
+                  l('dir/graft-one'),
+                  l('dir/dir2/graft2'),
+                 ]
 
         self.assertEqual(file_list.files, wanted)
 
@@ -158,6 +184,7 @@ def test_include_pattern(self):
         self.assertEqual(file_list.allfiles, ['a.py', 'b.txt'])
 
     def test_process_template(self):
+        l = make_local_path
         # invalid lines
         file_list = FileList()
         for action in ('include', 'exclude', 'global-include',
@@ -168,7 +195,7 @@ def test_process_template(self):
 
         # include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('include *.py')
         self.assertEqual(file_list.files, ['a.py'])
@@ -180,31 +207,31 @@ def test_process_template(self):
 
         # exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('exclude *.py')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('exclude *.rb')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertWarnings()
 
         # global-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('global-include *.rb')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertWarnings()
 
         # global-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('global-exclude *.py')
         self.assertEqual(file_list.files, ['b.txt'])
@@ -216,50 +243,52 @@ def test_process_template(self):
 
         # recursive-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/c.txt'),
+                                l('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-include e *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # recursive-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
 
         file_list.process_template_line('recursive-exclude d *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-exclude e *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertWarnings()
 
         # graft
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/d/e.py'),
+                                l('f/f.py')])
 
         file_list.process_template_line('graft d')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('graft e')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # prune
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
 
         file_list.process_template_line('prune d')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('prune e')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertWarnings()
 
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index cb7beb7b2c..9e422fca17 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -42,6 +42,7 @@
 MANIFEST = """\
 # file GENERATED by distutils, do NOT edit
 README
+buildout.cfg
 inroot.txt
 setup.py
 data%(sep)sdata.dt
@@ -150,7 +151,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -209,11 +210,18 @@ def test_add_defaults(self):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        # make sure VCS directories are pruned (#14004)
+        hg_dir = join(self.tmp_dir, '.hg')
+        os.mkdir(hg_dir)
+        self.write_file((hg_dir, 'last-message.txt'), '#')
+        # a buggy regex used to prevent this from working on windows (#6884)
+        self.write_file((self.tmp_dir, 'buildout.cfg'), '#')
         self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
         dist.data_files = [('data', ['data/data.dt',
+                                     'buildout.cfg',
                                      'inroot.txt',
                                      'notexisting']),
                            'some/file.txt',
@@ -243,15 +251,15 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEqual(len(content), 11)
+        self.assertEqual(len(content), 12)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
+        self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):

From 0322e3da00dd0831ac4530e5044ead72a11d4d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 25 Feb 2012 16:13:53 +0100
Subject: [PATCH 3381/8469] Fix long-standing bugs with MANIFEST.in parsing on
 Windows (#6884).

These regex changes fix a number of issues for distutils on Windows:
- #6884: impossible to include a file starting with 'build'
- #9691 and #14004: sdist includes too many files
- #13193: test_filelist failures

This commit replaces the incorrect changes done in 557a973709de,
c566a3447ba1 and 3925081a7ca0 to fix #13193; we were too eager to fix
the test failures and I did not study the code enough before
greenlighting patches.  This time we have unit tests from the problems
reported by users to be sure we have the right fix.

Thanks to Nadeem Vawda for his help.
---
 filelist.py            |  20 +++++---
 tests/test_filelist.py | 113 ++++++++++++++++++++++++++---------------
 tests/test_sdist.py    |  14 +++--
 3 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/filelist.py b/filelist.py
index 5540b39a38..2f1c457ea0 100644
--- a/filelist.py
+++ b/filelist.py
@@ -210,6 +210,7 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
 
         Return 1 if files are found.
         """
+        # XXX docstring lying about what the special chars are?
         files_found = 0
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("include_pattern: applying regex r'%s'" %
@@ -297,11 +298,14 @@ def glob_to_re(pattern):
     # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
     # and by extension they shouldn't match such "special characters" under
     # any OS.  So change all non-escaped dots in the RE to match any
-    # character except the special characters.
-    # XXX currently the "special characters" are just slash -- i.e. this is
-    # Unix-only.
-    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
-
+    # character except the special characters (currently: just os.sep).
+    sep = os.sep
+    if os.sep == '\\':
+        # we're using a regex to manipulate a regex, so we need
+        # to escape the backslash twice
+        sep = r'\\\\'
+    escaped = r'\1[^%s]' % sep
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', escaped, pattern_re)
     return pattern_re
 
 
@@ -328,8 +332,10 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
         prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
-        # paths should always use / in manifest templates
-        pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
+        sep = os.sep
+        if os.sep == '\\':
+            sep = r'\\'
+        pattern_re = "^" + sep.join((prefix_re, ".*" + pattern_re))
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index d86ea44491..69b88f2df2 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,4 +1,5 @@
 """Tests for distutils.filelist."""
+import os
 import re
 import unittest
 from distutils import debug
@@ -14,6 +15,7 @@
 include xo
 exclude xo
 include foo.tmp
+include buildout.cfg
 global-include *.x
 global-include *.txt
 global-exclude *.tmp
@@ -24,6 +26,11 @@
 """
 
 
+def make_local_path(s):
+    """Converts '/' in a string to os.sep"""
+    return s.replace('/', os.sep)
+
+
 class FileListTestCase(support.LoggingSilencer,
                        unittest.TestCase):
 
@@ -36,41 +43,60 @@ def assertWarnings(self):
         self.clear_logs()
 
     def test_glob_to_re(self):
-        # simple cases
-        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
-
-        # special cases
-        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        sep = os.sep
+        if os.sep == '\\':
+            sep = re.escape(os.sep)
+
+        for glob, regex in (
+            # simple cases
+            ('foo*', r'foo[^%(sep)s]*\Z(?ms)'),
+            ('foo?', r'foo[^%(sep)s]\Z(?ms)'),
+            ('foo??', r'foo[^%(sep)s][^%(sep)s]\Z(?ms)'),
+            # special cases
+            (r'foo\\*', r'foo\\\\[^%(sep)s]*\Z(?ms)'),
+            (r'foo\\\*', r'foo\\\\\\[^%(sep)s]*\Z(?ms)'),
+            ('foo????', r'foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s]\Z(?ms)'),
+            (r'foo\\??', r'foo\\\\[^%(sep)s][^%(sep)s]\Z(?ms)')):
+            regex = regex % {'sep': sep}
+            self.assertEqual(glob_to_re(glob), regex)
 
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns
         file_list = FileList()
+        l = make_local_path
 
         # simulated file list
         file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
-                              'global/one.txt',
-                              'global/two.txt',
-                              'global/files.x',
-                              'global/here.tmp',
-                              'f/o/f.oo',
-                              'dir/graft-one',
-                              'dir/dir2/graft2',
-                              'dir3/ok',
-                              'dir3/sub/ok.txt',
-                              ]
+                              'buildout.cfg',
+                              # filelist does not filter out VCS directories,
+                              # it's sdist that does
+                              l('.hg/last-message.txt'),
+                              l('global/one.txt'),
+                              l('global/two.txt'),
+                              l('global/files.x'),
+                              l('global/here.tmp'),
+                              l('f/o/f.oo'),
+                              l('dir/graft-one'),
+                              l('dir/dir2/graft2'),
+                              l('dir3/ok'),
+                              l('dir3/sub/ok.txt'),
+                             ]
 
         for line in MANIFEST_IN.split('\n'):
             if line.strip() == '':
                 continue
             file_list.process_template_line(line)
 
-        wanted = ['ok', 'four.txt', 'global/one.txt', 'global/two.txt',
-                  'f/o/f.oo', 'dir/graft-one', 'dir/dir2/graft2']
+        wanted = ['ok',
+                  'buildout.cfg',
+                  'four.txt',
+                  l('.hg/last-message.txt'),
+                  l('global/one.txt'),
+                  l('global/two.txt'),
+                  l('f/o/f.oo'),
+                  l('dir/graft-one'),
+                  l('dir/dir2/graft2'),
+                 ]
 
         self.assertEqual(file_list.files, wanted)
 
@@ -158,6 +184,7 @@ def test_include_pattern(self):
         self.assertEqual(file_list.allfiles, ['a.py', 'b.txt'])
 
     def test_process_template(self):
+        l = make_local_path
         # invalid lines
         file_list = FileList()
         for action in ('include', 'exclude', 'global-include',
@@ -168,7 +195,7 @@ def test_process_template(self):
 
         # include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('include *.py')
         self.assertEqual(file_list.files, ['a.py'])
@@ -180,31 +207,31 @@ def test_process_template(self):
 
         # exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('exclude *.py')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('exclude *.rb')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertWarnings()
 
         # global-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('global-include *.rb')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertWarnings()
 
         # global-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('global-exclude *.py')
         self.assertEqual(file_list.files, ['b.txt'])
@@ -216,50 +243,52 @@ def test_process_template(self):
 
         # recursive-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/c.txt'),
+                                l('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-include e *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # recursive-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
 
         file_list.process_template_line('recursive-exclude d *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-exclude e *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertWarnings()
 
         # graft
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/d/e.py'),
+                                l('f/f.py')])
 
         file_list.process_template_line('graft d')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('graft e')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # prune
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
 
         file_list.process_template_line('prune d')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('prune e')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertWarnings()
 
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index cb7beb7b2c..9e422fca17 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -42,6 +42,7 @@
 MANIFEST = """\
 # file GENERATED by distutils, do NOT edit
 README
+buildout.cfg
 inroot.txt
 setup.py
 data%(sep)sdata.dt
@@ -150,7 +151,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -209,11 +210,18 @@ def test_add_defaults(self):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        # make sure VCS directories are pruned (#14004)
+        hg_dir = join(self.tmp_dir, '.hg')
+        os.mkdir(hg_dir)
+        self.write_file((hg_dir, 'last-message.txt'), '#')
+        # a buggy regex used to prevent this from working on windows (#6884)
+        self.write_file((self.tmp_dir, 'buildout.cfg'), '#')
         self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
         dist.data_files = [('data', ['data/data.dt',
+                                     'buildout.cfg',
                                      'inroot.txt',
                                      'notexisting']),
                            'some/file.txt',
@@ -243,15 +251,15 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEqual(len(content), 11)
+        self.assertEqual(len(content), 12)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
+        self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):

From c3e7f5f507f4e4506c400718e58c2aca4d3a6e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sat, 25 Feb 2012 16:28:05 +0100
Subject: [PATCH 3382/8469] Fix long-standing bugs with MANIFEST.in parsing on
 Windows (#6884).

These regex changes fix a number of issues for distutils on Windows:
- #6884: impossible to include a file starting with 'build'
- #9691 and #14004: sdist includes too many files
- #13193: test_filelist failures

This commit replaces the incorrect changes done in 0a94e2f807c7 and
90b30d62caf2 to fix #13193; we were too eager to fix the test failures
and I did not study the code enough before greenlighting patches.  This
time we have unit tests from the problems reported by users to be sure
we have the right fix.

Thanks to Nadeem Vawda for his help.
---
 filelist.py            |  22 ++++---
 tests/test_filelist.py | 130 +++++++++++++++++++++++++++++++----------
 tests/test_sdist.py    |  27 +++++----
 3 files changed, 131 insertions(+), 48 deletions(-)

diff --git a/filelist.py b/filelist.py
index 91220321a4..db3f7a9680 100644
--- a/filelist.py
+++ b/filelist.py
@@ -201,6 +201,7 @@ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
 
         Return True if files are found, False otherwise.
         """
+        # XXX docstring lying about what the special chars are?
         files_found = False
         pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
         self.debug_print("include_pattern: applying regex r'%s'" %
@@ -284,11 +285,14 @@ def glob_to_re(pattern):
     # IMHO is wrong -- '?' and '*' aren't supposed to match slash in Unix,
     # and by extension they shouldn't match such "special characters" under
     # any OS.  So change all non-escaped dots in the RE to match any
-    # character except the special characters.
-    # XXX currently the "special characters" are just slash -- i.e. this is
-    # Unix-only.
-    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', r'\1[^/]', pattern_re)
-
+    # character except the special characters (currently: just os.sep).
+    sep = os.sep
+    if os.sep == '\\':
+        # we're using a regex to manipulate a regex, so we need
+        # to escape the backslash twice
+        sep = r'\\\\'
+    escaped = r'\1[^%s]' % sep
+    pattern_re = re.sub(r'((?<!\\)(\\\\)*)\.', escaped, pattern_re)
     return pattern_re
 
 
@@ -312,9 +316,11 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
     if prefix is not None:
         # ditch end of pattern character
         empty_pattern = glob_to_re('')
-        prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
-        # paths should always use / in manifest templates
-        pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
+        prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
+        sep = os.sep
+        if os.sep == '\\':
+            sep = r'\\'
+        pattern_re = "^" + sep.join((prefix_re, ".*" + pattern_re))
     else:                               # no prefix -- respect anchor flag
         if anchor:
             pattern_re = "^" + pattern_re
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index f3304b2e33..e82bc3d2ed 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -1,4 +1,5 @@
 """Tests for distutils.filelist."""
+import os
 import re
 import unittest
 from distutils import debug
@@ -9,6 +10,26 @@
 from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
+MANIFEST_IN = """\
+include ok
+include xo
+exclude xo
+include foo.tmp
+include buildout.cfg
+global-include *.x
+global-include *.txt
+global-exclude *.tmp
+recursive-include f *.oo
+recursive-exclude global *.x
+graft dir
+prune dir3
+"""
+
+
+def make_local_path(s):
+    """Converts '/' in a string to os.sep"""
+    return s.replace('/', os.sep)
+
 
 class FileListTestCase(support.LoggingSilencer,
                        unittest.TestCase):
@@ -22,16 +43,62 @@ def assertWarnings(self):
         self.clear_logs()
 
     def test_glob_to_re(self):
-        # simple cases
-        self.assertEqual(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)')
-        self.assertEqual(glob_to_re('foo??'), 'foo[^/][^/]\\Z(?ms)')
-
-        # special cases
-        self.assertEqual(glob_to_re(r'foo\\*'), r'foo\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\\*'), r'foo\\\\\\[^/]*\Z(?ms)')
-        self.assertEqual(glob_to_re('foo????'), r'foo[^/][^/][^/][^/]\Z(?ms)')
-        self.assertEqual(glob_to_re(r'foo\\??'), r'foo\\\\[^/][^/]\Z(?ms)')
+        sep = os.sep
+        if os.sep == '\\':
+            sep = re.escape(os.sep)
+
+        for glob, regex in (
+            # simple cases
+            ('foo*', r'foo[^%(sep)s]*\Z(?ms)'),
+            ('foo?', r'foo[^%(sep)s]\Z(?ms)'),
+            ('foo??', r'foo[^%(sep)s][^%(sep)s]\Z(?ms)'),
+            # special cases
+            (r'foo\\*', r'foo\\\\[^%(sep)s]*\Z(?ms)'),
+            (r'foo\\\*', r'foo\\\\\\[^%(sep)s]*\Z(?ms)'),
+            ('foo????', r'foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s]\Z(?ms)'),
+            (r'foo\\??', r'foo\\\\[^%(sep)s][^%(sep)s]\Z(?ms)')):
+            regex = regex % {'sep': sep}
+            self.assertEqual(glob_to_re(glob), regex)
+
+    def test_process_template_line(self):
+        # testing  all MANIFEST.in template patterns
+        file_list = FileList()
+        l = make_local_path
+
+        # simulated file list
+        file_list.allfiles = ['foo.tmp', 'ok', 'xo', 'four.txt',
+                              'buildout.cfg',
+                              # filelist does not filter out VCS directories,
+                              # it's sdist that does
+                              l('.hg/last-message.txt'),
+                              l('global/one.txt'),
+                              l('global/two.txt'),
+                              l('global/files.x'),
+                              l('global/here.tmp'),
+                              l('f/o/f.oo'),
+                              l('dir/graft-one'),
+                              l('dir/dir2/graft2'),
+                              l('dir3/ok'),
+                              l('dir3/sub/ok.txt'),
+                             ]
+
+        for line in MANIFEST_IN.split('\n'):
+            if line.strip() == '':
+                continue
+            file_list.process_template_line(line)
+
+        wanted = ['ok',
+                  'buildout.cfg',
+                  'four.txt',
+                  l('.hg/last-message.txt'),
+                  l('global/one.txt'),
+                  l('global/two.txt'),
+                  l('f/o/f.oo'),
+                  l('dir/graft-one'),
+                  l('dir/dir2/graft2'),
+                 ]
+
+        self.assertEqual(file_list.files, wanted)
 
     def test_debug_print(self):
         file_list = FileList()
@@ -117,6 +184,7 @@ def test_include_pattern(self):
         self.assertEqual(file_list.allfiles, ['a.py', 'b.txt'])
 
     def test_process_template(self):
+        l = make_local_path
         # invalid lines
         file_list = FileList()
         for action in ('include', 'exclude', 'global-include',
@@ -127,7 +195,7 @@ def test_process_template(self):
 
         # include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('include *.py')
         self.assertEqual(file_list.files, ['a.py'])
@@ -139,31 +207,31 @@ def test_process_template(self):
 
         # exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('exclude *.py')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('exclude *.rb')
-        self.assertEqual(file_list.files, ['b.txt', 'd/c.py'])
+        self.assertEqual(file_list.files, ['b.txt', l('d/c.py')])
         self.assertWarnings()
 
         # global-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', 'd/c.py'])
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('global-include *.rb')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.py'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.py')])
         self.assertWarnings()
 
         # global-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', 'd/c.py']
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('global-exclude *.py')
         self.assertEqual(file_list.files, ['b.txt'])
@@ -175,50 +243,52 @@ def test_process_template(self):
 
         # recursive-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/c.txt'),
+                                l('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-include e *.py')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # recursive-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/c.txt', 'd/d/e.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
 
         file_list.process_template_line('recursive-exclude d *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-exclude e *.py')
-        self.assertEqual(file_list.files, ['a.py', 'd/c.txt'])
+        self.assertEqual(file_list.files, ['a.py', l('d/c.txt')])
         self.assertWarnings()
 
         # graft
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py'])
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/d/e.py'),
+                                l('f/f.py')])
 
         file_list.process_template_line('graft d')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('graft e')
-        self.assertEqual(file_list.files, ['d/b.py', 'd/d/e.py'])
+        self.assertEqual(file_list.files, [l('d/b.py'), l('d/d/e.py')])
         self.assertWarnings()
 
         # prune
         file_list = FileList()
-        file_list.files = ['a.py', 'd/b.py', 'd/d/e.py', 'f/f.py']
+        file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
 
         file_list.process_template_line('prune d')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertNoWarnings()
 
         file_list.process_template_line('prune e')
-        self.assertEqual(file_list.files, ['a.py', 'f/f.py'])
+        self.assertEqual(file_list.files, ['a.py', l('f/f.py')])
         self.assertWarnings()
 
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index d0d16b2f55..fd71dac8d6 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -7,6 +7,12 @@
 from os.path import join
 from textwrap import dedent
 
+try:
+    import zlib
+    ZLIB_SUPPORT = True
+except ImportError:
+    ZLIB_SUPPORT = False
+
 from test.support import captured_stdout, check_warnings, run_unittest
 
 from distutils.command.sdist import sdist, show_formats
@@ -28,6 +34,7 @@
 MANIFEST = """\
 # file GENERATED by distutils, do NOT edit
 README
+buildout.cfg
 inroot.txt
 setup.py
 data%(sep)sdata.dt
@@ -39,13 +46,6 @@
 somecode%(sep)sdoc.txt
 """
 
-try:
-    import zlib
-    ZLIB_SUPPORT = True
-except ImportError:
-    ZLIB_SUPPORT = False
-
-
 class SDistTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
@@ -143,7 +143,7 @@ def test_make_distribution(self):
         dist_folder = join(self.tmp_dir, 'dist')
         result = os.listdir(dist_folder)
         result.sort()
-        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'] )
+        self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz'])
 
         os.remove(join(dist_folder, 'fake-1.0.tar'))
         os.remove(join(dist_folder, 'fake-1.0.tar.gz'))
@@ -180,11 +180,18 @@ def test_add_defaults(self):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        # make sure VCS directories are pruned (#14004)
+        hg_dir = join(self.tmp_dir, '.hg')
+        os.mkdir(hg_dir)
+        self.write_file((hg_dir, 'last-message.txt'), '#')
+        # a buggy regex used to prevent this from working on windows (#6884)
+        self.write_file((self.tmp_dir, 'buildout.cfg'), '#')
         self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
         dist.data_files = [('data', ['data/data.dt',
+                                     'buildout.cfg',
                                      'inroot.txt',
                                      'notexisting']),
                            'some/file.txt',
@@ -214,15 +221,15 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEqual(len(content), 11)
+        self.assertEqual(len(content), 12)
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))
         try:
             manifest = f.read()
-            self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
         finally:
             f.close()
+        self.assertEqual(manifest, MANIFEST % {'sep': os.sep})
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_metadata_check_option(self):

From e660d4f2a247119bfc171fcf66715b6c36106051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 26 Feb 2012 01:16:47 +0100
Subject: [PATCH 3383/8469] Stop ignoring RPMs in distutils' upload command
 (#2945).

Bug reported by Hartmut Goebel and patch contributed by Carl Robben.
Untested backport of the fix committed and tested for 3.2.
---
 command/bdist_rpm.py    | 12 ++++++++++++
 tests/test_bdist_rpm.py |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 0bba363557..595824367e 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -379,16 +379,28 @@ def run (self):
         self.spawn(rpm_cmd)
 
         if not self.dry_run:
+            if self.distribution.has_ext_modules():
+                pyversion = get_python_version()
+            else:
+                pyversion = 'any'
+
             if not self.binary_only:
                 srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
                 assert(os.path.exists(srpm))
                 self.move_file(srpm, self.dist_dir)
+                filename = os.path.join(self.dist_dir, source_rpm)
+                self.distribution.dist_files.append(
+                    ('bdist_rpm', pyversion, filename))
 
             if not self.source_only:
                 for rpm in binary_rpms:
                     rpm = os.path.join(rpm_dir['RPMS'], rpm)
                     if os.path.exists(rpm):
                         self.move_file(rpm, self.dist_dir)
+                        filename = os.path.join(self.dist_dir,
+                                                os.path.basename(rpm))
+                        self.distribution.dist_files.append(
+                            ('bdist_rpm', pyversion, filename))
     # run()
 
     def _dist_path(self, path):
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 25a5763a72..37d89155c7 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -79,6 +79,10 @@ def test_quiet(self):
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
         self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
+        # bug #2945: upload ignores bdist_rpm files
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
     def test_no_optimize_flag(self):
 
         # XXX I am unable yet to make this test work without
@@ -118,6 +122,11 @@ def test_no_optimize_flag(self):
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
         self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+
+        # bug #2945: upload ignores bdist_rpm files
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+        self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
         os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():

From 760bf348a4913dfe637a06c87ca3e32e7456ddb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 26 Feb 2012 01:53:53 +0100
Subject: [PATCH 3384/8469] Synchronize some distutils tests with 3.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Actually check the contents of the file created by bdist_dumb.
- Don’t use “RECORD� as filename for non-PEP 376 record file
- Don’t start method name with “_test�, it looks like a disabled test
  method instead of an helper method
- Fix some idioms (assertIn, addCleanup)
---
 tests/test_bdist_dumb.py | 24 ++++++++++++++++--------
 tests/test_install.py    | 35 +++++++++++++++++------------------
 tests/test_sdist.py      | 10 +++++-----
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 5a22a10ec8..3378f49ea0 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -1,8 +1,10 @@
 """Tests for distutils.command.bdist_dumb."""
 
-import unittest
-import sys
 import os
+import sys
+import zipfile
+import unittest
+from test.test_support import run_unittest
 
 # zlib is not used here, but if it's not available
 # test_simple_built will fail
@@ -11,8 +13,6 @@
 except ImportError:
     zlib = None
 
-from test.test_support import run_unittest
-
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -73,15 +73,23 @@ def test_simple_built(self):
 
         # see what we have
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        base = "%s.%s" % (dist.get_fullname(), cmd.plat_name)
+        base = "%s.%s.zip" % (dist.get_fullname(), cmd.plat_name)
         if os.name == 'os2':
             base = base.replace(':', '-')
 
-        wanted = ['%s.zip' % base]
-        self.assertEqual(dist_created, wanted)
+        self.assertEqual(dist_created, [base])
 
         # now let's check what we have in the zip file
-        # XXX to be done
+        fp = zipfile.ZipFile(os.path.join('dist', base))
+        try:
+            contents = fp.namelist()
+        finally:
+            fp.close()
+
+        contents = sorted(os.path.basename(fn) for fn in contents)
+        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2],
+                  'foo.py', 'foo.pyc']
+        self.assertEqual(contents, sorted(wanted))
 
     def test_finalize_options(self):
         pkg_dir, dist = self.create_dist()
diff --git a/tests/test_install.py b/tests/test_install.py
index ebfb04f446..f17baa1e50 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -86,19 +86,17 @@ def _expanduser(path):
         self.old_expand = os.path.expanduser
         os.path.expanduser = _expanduser
 
-        try:
-            # this is the actual test
-            self._test_user_site()
-        finally:
+        def cleanup():
             site.USER_BASE = self.old_user_base
             site.USER_SITE = self.old_user_site
             install_module.USER_BASE = self.old_user_base
             install_module.USER_SITE = self.old_user_site
             os.path.expanduser = self.old_expand
 
-    def _test_user_site(self):
+        self.addCleanup(cleanup)
+
         for key in ('nt_user', 'unix_user', 'os2_home'):
-            self.assertTrue(key in INSTALL_SCHEMES)
+            self.assertIn(key, INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
         cmd = install(dist)
@@ -106,14 +104,14 @@ def _test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assertTrue('user' in options)
+        self.assertIn('user', options)
 
         # setting a value
         cmd.user = 1
 
         # user base and site shouldn't be created yet
-        self.assertTrue(not os.path.exists(self.user_base))
-        self.assertTrue(not os.path.exists(self.user_site))
+        self.assertFalse(os.path.exists(self.user_base))
+        self.assertFalse(os.path.exists(self.user_site))
 
         # let's run finalize
         cmd.ensure_finalized()
@@ -122,8 +120,8 @@ def _test_user_site(self):
         self.assertTrue(os.path.exists(self.user_base))
         self.assertTrue(os.path.exists(self.user_site))
 
-        self.assertTrue('userbase' in cmd.config_vars)
-        self.assertTrue('usersite' in cmd.config_vars)
+        self.assertIn('userbase', cmd.config_vars)
+        self.assertIn('usersite', cmd.config_vars)
 
     def test_handle_extra_path(self):
         dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'})
@@ -176,15 +174,16 @@ def test_finalize_options(self):
 
     def test_record(self):
         install_dir = self.mkdtemp()
-        project_dir, dist = self.create_dist(scripts=['hello'])
-        self.addCleanup(os.chdir, os.getcwd())
+        project_dir, dist = self.create_dist(py_modules=['hello'],
+                                             scripts=['sayhi'])
         os.chdir(project_dir)
-        self.write_file('hello', "print('o hai')")
+        self.write_file('hello.py', "def main(): print 'o hai'")
+        self.write_file('sayhi', 'from hello import main; main()')
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
         cmd.root = install_dir
-        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'filelist')
         cmd.ensure_finalized()
         cmd.run()
 
@@ -195,7 +194,7 @@ def test_record(self):
             f.close()
 
         found = [os.path.basename(line) for line in content.splitlines()]
-        expected = ['hello',
+        expected = ['hello.py', 'hello.pyc', 'sayhi',
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
@@ -203,7 +202,6 @@ def test_record_extensions(self):
         install_dir = self.mkdtemp()
         project_dir, dist = self.create_dist(ext_modules=[
             Extension('xx', ['xxmodule.c'])])
-        self.addCleanup(os.chdir, os.getcwd())
         os.chdir(project_dir)
         support.copy_xxmodule_c(project_dir)
 
@@ -215,7 +213,7 @@ def test_record_extensions(self):
         dist.command_obj['install'] = cmd
         dist.command_obj['build_ext'] = buildextcmd
         cmd.root = install_dir
-        cmd.record = os.path.join(project_dir, 'RECORD')
+        cmd.record = os.path.join(project_dir, 'filelist')
         cmd.ensure_finalized()
         cmd.run()
 
@@ -241,6 +239,7 @@ def test_debug_mode(self):
             install_module.DEBUG = False
         self.assertTrue(len(self.logs) > old_logs_len)
 
+
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 9e422fca17..3a89f73fa2 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -6,6 +6,7 @@
 import zipfile
 from os.path import join
 from textwrap import dedent
+from test.test_support import captured_stdout, check_warnings, run_unittest
 
 # zlib is not used here, but if it's not available
 # the tests that use zipfile may fail
@@ -21,7 +22,6 @@
 except ImportError:
     UID_GID_SUPPORT = False
 
-from test.test_support import captured_stdout, check_warnings, run_unittest
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
@@ -375,7 +375,7 @@ def test_make_distribution_owner_group(self):
     # the following tests make sure there is a nice error message instead
     # of a traceback when parsing an invalid manifest template
 
-    def _test_template(self, content):
+    def _check_template(self, content):
         dist, cmd = self.get_cmd()
         os.chdir(self.tmp_dir)
         self.write_file('MANIFEST.in', content)
@@ -386,17 +386,17 @@ def _test_template(self, content):
         self.assertEqual(len(warnings), 1)
 
     def test_invalid_template_unknown_command(self):
-        self._test_template('taunt knights *')
+        self._check_template('taunt knights *')
 
     def test_invalid_template_wrong_arguments(self):
         # this manifest command takes one argument
-        self._test_template('prune')
+        self._check_template('prune')
 
     @unittest.skipIf(os.name != 'nt', 'test relevant for Windows only')
     def test_invalid_template_wrong_path(self):
         # on Windows, trailing slashes are not allowed
         # this used to crash instead of raising a warning: #8286
-        self._test_template('include examples/')
+        self._check_template('include examples/')
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_get_file_list(self):

From 6e5272fa5cd907e730fabff4b6a7aaf4e6244167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 26 Feb 2012 02:14:33 +0100
Subject: [PATCH 3385/8469] Set archive format explicitly in one distutils test

---
 tests/test_sdist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index fd71dac8d6..1ba2a1a6a9 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -6,6 +6,7 @@
 import zipfile
 from os.path import join
 from textwrap import dedent
+from test.support import captured_stdout, check_warnings, run_unittest
 
 try:
     import zlib
@@ -13,7 +14,6 @@
 except ImportError:
     ZLIB_SUPPORT = False
 
-from test.support import captured_stdout, check_warnings, run_unittest
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
@@ -326,6 +326,7 @@ def test_get_file_list(self):
         # filling data_files by pointing files in package_data
         dist.package_data = {'somecode': ['*.txt']}
         self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+        cmd.formats = ['gztar']
         cmd.ensure_finalized()
         cmd.run()
 

From a38d0a2e44526c9a32aceca07fd7d09ac100a62f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 4 Mar 2012 16:23:53 +0100
Subject: [PATCH 3386/8469] Bump to 3.3.0a1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f883916f10..8b4261aa3c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3a0"
+__version__ = "3.3.0a1"
 #--end constants--

From 3cbf2176b6315a9307698ff77fb0bd8afc6aa46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 5 Mar 2012 16:09:29 +0100
Subject: [PATCH 3387/8469] =?UTF-8?q?Make=20distutils=E2=80=99=20upload=20?=
 =?UTF-8?q?command=20work=20with=20bdist=5Fmsi=20products=20(#13719).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Ralf Schmitt.
---
 command/bdist_msi.py    |  2 +-
 tests/test_bdist_msi.py | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index b3cfe9ceff..fde0f63fea 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -260,7 +260,7 @@ def run(self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            tup = 'bdist_msi', self.target_version or 'any', fullname
+            tup = 'bdist_msi', self.target_version or 'any', installer_name
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 9308c79d91..9cbfb0c5c4 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,12 +1,11 @@
 """Tests for distutils.command.bdist_msi."""
-import unittest
 import sys
-
+import unittest
 from test.support import run_unittest
-
 from distutils.tests import support
 
-@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+
+@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows')
 class BDistMSITestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
@@ -14,9 +13,18 @@ class BDistMSITestCase(support.TempdirManager,
     def test_minimal(self):
         # minimal test XXX need more tests
         from distutils.command.bdist_msi import bdist_msi
-        pkg_pth, dist = self.create_dist()
+        project_dir, dist = self.create_dist()
         cmd = bdist_msi(dist)
         cmd.ensure_finalized()
+        cmd.run()
+
+        bdists = os.listdir(os.path.join(project_dir, 'dist'))
+        self.assertEqual(bdists, ['foo-0.1.msi'])
+
+        # bug #13719: upload ignores bdist_msi files
+        self.assertEqual(dist.dist_files,
+                         [('bdist_msi', 'any', 'dist/foo-0.1.msi')])
+
 
 def test_suite():
     return unittest.makeSuite(BDistMSITestCase)

From 02b07135e60f45c28414eec6cae34040d20c053c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 5 Mar 2012 16:47:33 +0100
Subject: [PATCH 3388/8469] =?UTF-8?q?Make=20distutils=E2=80=99=20upload=20?=
 =?UTF-8?q?command=20work=20with=20bdist=5Fmsi=20products=20(#13719).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Ralf Schmitt.
---
 command/bdist_msi.py    |  2 +-
 tests/test_bdist_msi.py | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 703f873b16..09c6a89851 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -262,7 +262,7 @@ def run (self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            tup = 'bdist_msi', self.target_version or 'any', fullname
+            tup = 'bdist_msi', self.target_version or 'any', installer_name
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 1c897ab04d..f175ed442b 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,12 +1,11 @@
 """Tests for distutils.command.bdist_msi."""
-import unittest
 import sys
-
+import unittest
 from test.test_support import run_unittest
-
 from distutils.tests import support
 
-@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
+
+@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows')
 class BDistMSITestCase(support.TempdirManager,
                        support.LoggingSilencer,
                        unittest.TestCase):
@@ -14,9 +13,18 @@ class BDistMSITestCase(support.TempdirManager,
     def test_minimal(self):
         # minimal test XXX need more tests
         from distutils.command.bdist_msi import bdist_msi
-        pkg_pth, dist = self.create_dist()
+        project_dir, dist = self.create_dist()
         cmd = bdist_msi(dist)
         cmd.ensure_finalized()
+        cmd.run()
+
+        bdists = os.listdir(os.path.join(project_dir, 'dist'))
+        self.assertEqual(bdists, ['foo-0.1.msi'])
+
+        # bug #13719: upload ignores bdist_msi files
+        self.assertEqual(dist.dist_files,
+                         [('bdist_msi', 'any', 'dist/foo-0.1.msi')])
+
 
 def test_suite():
     return unittest.makeSuite(BDistMSITestCase)

From e7f62f5444701fafb18b8135b7f1c4a10dd9626c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 5 Mar 2012 17:00:49 +0100
Subject: [PATCH 3389/8469] Fix NameError

---
 tests/test_bdist_msi.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index f175ed442b..82a20cf1ff 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.bdist_msi."""
+import os
 import sys
 import unittest
 from test.test_support import run_unittest

From 2bddf6fa66bff4c9886995c43f138c5cf29004ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 5 Mar 2012 17:02:31 +0100
Subject: [PATCH 3390/8469] Fix NameError from #13719 fix

---
 tests/test_bdist_msi.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 9cbfb0c5c4..e599461070 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.bdist_msi."""
+import os
 import sys
 import unittest
 from test.support import run_unittest

From a151dfbe766cda5b5d3aa1c1de39aff381788e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 7 Mar 2012 20:48:55 +0100
Subject: [PATCH 3391/8469] Backout buggy patch committed for #13719

---
 command/bdist_msi.py    | 2 +-
 tests/test_bdist_msi.py | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index fde0f63fea..b3cfe9ceff 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -260,7 +260,7 @@ def run(self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            tup = 'bdist_msi', self.target_version or 'any', installer_name
+            tup = 'bdist_msi', self.target_version or 'any', fullname
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index e599461070..15d8bdff2b 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.bdist_msi."""
-import os
 import sys
 import unittest
 from test.support import run_unittest
@@ -17,14 +16,6 @@ def test_minimal(self):
         project_dir, dist = self.create_dist()
         cmd = bdist_msi(dist)
         cmd.ensure_finalized()
-        cmd.run()
-
-        bdists = os.listdir(os.path.join(project_dir, 'dist'))
-        self.assertEqual(bdists, ['foo-0.1.msi'])
-
-        # bug #13719: upload ignores bdist_msi files
-        self.assertEqual(dist.dist_files,
-                         [('bdist_msi', 'any', 'dist/foo-0.1.msi')])
 
 
 def test_suite():

From e412535a28d474125d9ab9ce254485acd72916f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 7 Mar 2012 21:00:44 +0100
Subject: [PATCH 3392/8469] Backout buggy patch for #13719

---
 command/bdist_msi.py    | 2 +-
 tests/test_bdist_msi.py | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 09c6a89851..703f873b16 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -262,7 +262,7 @@ def run (self):
         self.db.Commit()
 
         if hasattr(self.distribution, 'dist_files'):
-            tup = 'bdist_msi', self.target_version or 'any', installer_name
+            tup = 'bdist_msi', self.target_version or 'any', fullname
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 82a20cf1ff..f98b7a2199 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.bdist_msi."""
-import os
 import sys
 import unittest
 from test.test_support import run_unittest
@@ -17,14 +16,6 @@ def test_minimal(self):
         project_dir, dist = self.create_dist()
         cmd = bdist_msi(dist)
         cmd.ensure_finalized()
-        cmd.run()
-
-        bdists = os.listdir(os.path.join(project_dir, 'dist'))
-        self.assertEqual(bdists, ['foo-0.1.msi'])
-
-        # bug #13719: upload ignores bdist_msi files
-        self.assertEqual(dist.dist_files,
-                         [('bdist_msi', 'any', 'dist/foo-0.1.msi')])
 
 
 def test_suite():

From 887e5bd499ca29f1ad721e593827ac18f4db3191 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Mar 2012 23:07:45 -0800
Subject: [PATCH 3393/8469] Added tag 0.6.25 for changeset 6124053afb5c

--HG--
branch : distribute
extra : rebase_source : 18fe3f9b4c6b2b55638fdc4d6ea64b48fd49a823
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1c2c996504..19680f4f2e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -33,3 +33,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
 9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
 7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
+6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25

From caa4c83e9f2ac9a69457cb1b69b4b09215ac0a09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Mar 2012 23:13:28 -0800
Subject: [PATCH 3394/8469] Fix release script to not include deleted files.

--HG--
branch : distribute
extra : rebase_source : 354e36575fde2a29d731ac8880f58a627f13d27b
---
 release.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/release.py b/release.py
index 2aab1344e9..c16fd9d586 100644
--- a/release.py
+++ b/release.py
@@ -12,7 +12,7 @@
 import os
 import sys
 
-VERSION='0.6.25'
+VERSION = '0.6.25'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
@@ -21,9 +21,10 @@ def get_next_version():
 
 NEXT_VERSION = get_next_version()
 
+files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
+	'README.txt', 'distribute_setup.py')
+
 def bump_versions():
-	files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
-		'release.sh', 'README.txt', 'distribute_setup.py')
 	list(map(bump_version, files_with_versions))
 
 def bump_version(filename):
@@ -33,6 +34,8 @@ def bump_version(filename):
 		f.writelines(lines)
 
 def do_release():
+	assert all(map(os.path.exists, files_with_versions)), (
+		"Expected file(s) missing")
 	res = raw_input('Have you read through the SCM changelog and '
 		'confirmed the changelog is current for releasing {VERSION}? '
 		.format(**globals()))

From 7c0eeec316a6d593b7c868c96dfe1b96fb8775b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Mar 2012 23:15:44 -0800
Subject: [PATCH 3395/8469] Bumped to 0.6.26 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 3320fd7793afe7e4cc452ece99407e23c95b7a51
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 2a12bd16da..bc9b8454be 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.25.tar.gz
-    $ tar -xzvf distribute-0.6.25.tar.gz
-    $ cd distribute-0.6.25
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz
+    $ tar -xzvf distribute-0.6.26.tar.gz
+    $ cd distribute-0.6.26
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index d2c2899afa..3bc42fa148 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.25"
+DEFAULT_VERSION = "0.6.26"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index e4bd76af8a..80d8c0e150 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.25'
+version = '0.6.26'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.25'
+release = '0.6.26'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index c16fd9d586..c6ae00d54b 100644
--- a/release.py
+++ b/release.py
@@ -12,7 +12,7 @@
 import os
 import sys
 
-VERSION = '0.6.25'
+VERSION = '0.6.26'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 3500d3e23a..f576b520c5 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.25"
+VERSION = "0.6.26"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From ed9ebca5b0c012c6b44adad4efa475f1cccd460d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Mar 2012 19:03:23 -0800
Subject: [PATCH 3396/8469] Indent with spaces

--HG--
branch : distribute
extra : rebase_source : 799441b639f6f9c55fe25745e793ac29419f0293
---
 setuptools/extension.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index 980ee0a7b4..b5a0702b39 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -5,12 +5,12 @@
 # Prefer Cython to Pyrex
 pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
 for pyrex_impl in pyrex_impls:
-	try:
-		# from (pyrex_impl) import build_ext
-		build_ext = __import__(pyrex_impl, fromlist=['build_ext']).build_ext
-		break
-	except:
-		pass
+    try:
+        # from (pyrex_impl) import build_ext
+        build_ext = __import__(pyrex_impl, fromlist=['build_ext']).build_ext
+        break
+    except:
+        pass
 have_pyrex = 'build_ext' in globals()
 
 
@@ -18,7 +18,7 @@ class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
     if not have_pyrex:
-        # convert .pyx extensions to .c 
+        # convert .pyx extensions to .c
         def __init__(self,*args,**kw):
             _Extension.__init__(self,*args,**kw)
             sources = []

From 5e47a200c412793a2878e3df57f29e854e2e9356 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Mar 2012 19:21:15 -0800
Subject: [PATCH 3397/8469] Reorganized imports

--HG--
branch : distribute
extra : rebase_source : 3c54aa84f71220021b92f890359546b4ff41e5f6
---
 setuptools/extension.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index b5a0702b39..e87494adf0 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -1,6 +1,10 @@
-from distutils.core import Extension as _Extension
+import sys
+import distutils.core
+import distutils.extension
+
 from setuptools.dist import _get_unpatched
-_Extension = _get_unpatched(_Extension)
+
+_Extension = _get_unpatched(distutils.core.Extension)
 
 # Prefer Cython to Pyrex
 pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
@@ -19,12 +23,12 @@ class Extension(_Extension):
 
     if not have_pyrex:
         # convert .pyx extensions to .c
-        def __init__(self,*args,**kw):
-            _Extension.__init__(self,*args,**kw)
+        def __init__(self, *args, **kw):
+            _Extension.__init__(self, *args, **kw)
             sources = []
             for s in self.sources:
                 if s.endswith('.pyx'):
-                    sources.append(s[:-3]+'c')
+                    sources.append(s[:-3] + 'c')
                 else:
                     sources.append(s)
             self.sources = sources
@@ -32,9 +36,7 @@ def __init__(self,*args,**kw):
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
 
-import sys, distutils.core, distutils.extension
 distutils.core.Extension = Extension
 distutils.extension.Extension = Extension
 if 'distutils.command.build_ext' in sys.modules:
     sys.modules['distutils.command.build_ext'].Extension = Extension
-

From 9f5991b303d87d49479381b971652950f0cfdac1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Mar 2012 22:17:12 -0800
Subject: [PATCH 3398/8469] Refactored Extension class so that __init__ is
 always called, but patched behavior is still selected by has_pyrex.

--HG--
branch : distribute
extra : rebase_source : d5670bf4bc6606d828b4ec7be055e26a7d4a9730
---
 setuptools/extension.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index e87494adf0..db56330551 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -21,17 +21,15 @@
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
-    if not have_pyrex:
-        # convert .pyx extensions to .c
-        def __init__(self, *args, **kw):
-            _Extension.__init__(self, *args, **kw)
-            sources = []
-            for s in self.sources:
-                if s.endswith('.pyx'):
-                    sources.append(s[:-3] + 'c')
-                else:
-                    sources.append(s)
-            self.sources = sources
+    def __init__(self, *args, **kw):
+        _Extension.__init__(self, *args, **kw)
+        if not have_pyrex:
+            self._convert_pyx_sources_to_c()
+
+    def _convert_pyx_sources_to_c(self):
+        "convert .pyx extensions to .c"
+        self.sources = [source[:-3] + 'c' for source in self.sources
+            if source.endswith('.pyx')]
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""

From 8633ffe737039044e955a6e5bd52ac08a0d83b37 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Mar 2012 22:31:45 -0800
Subject: [PATCH 3399/8469] Converted have_pyrex into a function

--HG--
branch : distribute
extra : rebase_source : b676ea404118a121400f2fd1b67095ab4521b7a0
---
 setuptools/extension.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index db56330551..eb8b836cc3 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -6,16 +6,19 @@
 
 _Extension = _get_unpatched(distutils.core.Extension)
 
-# Prefer Cython to Pyrex
-pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
-for pyrex_impl in pyrex_impls:
-    try:
-        # from (pyrex_impl) import build_ext
-        build_ext = __import__(pyrex_impl, fromlist=['build_ext']).build_ext
-        break
-    except:
-        pass
-have_pyrex = 'build_ext' in globals()
+def have_pyrex():
+    """
+    Return True if Cython or Pyrex can be imported.
+    """
+    pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
+    for pyrex_impl in pyrex_impls:
+        try:
+            # from (pyrex_impl) import build_ext
+            __import__(pyrex_impl, fromlist=['build_ext']).build_ext
+            return True
+        except Exception:
+            pass
+    return False
 
 
 class Extension(_Extension):
@@ -23,13 +26,16 @@ class Extension(_Extension):
 
     def __init__(self, *args, **kw):
         _Extension.__init__(self, *args, **kw)
-        if not have_pyrex:
+        if not have_pyrex():
             self._convert_pyx_sources_to_c()
 
     def _convert_pyx_sources_to_c(self):
         "convert .pyx extensions to .c"
-        self.sources = [source[:-3] + 'c' for source in self.sources
-            if source.endswith('.pyx')]
+        def pyx_to_c(source):
+            if source.endswith('.pyx'):
+                source = source[:-4] + '.c'
+            return source
+        self.sources = map(pyx_to_c, self.sources)
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""

From 52a047831e0c60eda6bafeed22ea1996f4d7f752 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 12:25:54 -0500
Subject: [PATCH 3400/8469] bump to 2.7.3rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 83126f679f..a137950efb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.3rc1"
+__version__ = "2.7.3rc2"
 #--end constants--

From da495dc219c9185da495363c1bddabd93659b17f Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 13:57:27 -0500
Subject: [PATCH 3401/8469] bump to 3.1.5rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 0e427624b8..6ab1662570 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.5rc1"
+__version__ = "3.1.5rc2"
 #--end constants--

From 525cc3106994d2dd8e87f1eb28c2faadf0032b64 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Sat, 17 Mar 2012 18:19:15 -0400
Subject: [PATCH 3402/8469] Bump to 2.6.8rc2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 279e17a9df..141b377b94 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.8rc1"
+__version__ = "2.6.8rc2"
 #--end constants--

From e29e39376dd2de7a9aa9ae03a6b92409489a5856 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 18 Mar 2012 07:34:49 +0100
Subject: [PATCH 3403/8469] Bump to 3.2.3rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 369750551c..d8d61c5432 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.3rc1"
+__version__ = "3.2.3rc2"
 #--end constants--

From 39f910e2e4b68cf11ecd2cf12c697aacce451d3d Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Fri, 23 Mar 2012 13:50:04 -0400
Subject: [PATCH 3404/8469] Include symlinks when extracting source dist. Fixes
 #183.

--HG--
branch : distribute
extra : rebase_source : c0d44c559d3433e4e4ceddaff5467c2d82dd7688
---
 setuptools/archive_util.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index ab786f3d01..5787753f2a 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -180,19 +180,22 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     try:
         tarobj.chown = lambda *args: None   # don't do any chowning!
         for member in tarobj:
-            if member.isfile() or member.isdir():
-                name = member.name
-                # don't extract absolute paths or ones with .. in them
-                if not name.startswith('/') and '..' not in name:
-                    dst = os.path.join(extract_dir, *name.split('/'))                
-                    dst = progress_filter(name, dst)
-                    if dst:
-                        if dst.endswith(os.sep):
-                            dst = dst[:-1]
-                        try:
-                            tarobj._extract_member(member,dst)  # XXX Ugh
-                        except tarfile.ExtractError:
-                            pass    # chown/chmod/mkfifo/mknode/makedev failed
+            name = member.name
+            # don't extract absolute paths or ones with .. in them
+            if not name.startswith('/') and '..' not in name:
+                prelim_dst = os.path.join(extract_dir, *name.split('/'))
+                final_dst = progress_filter(name, prelim_dst)
+                # If progress_filter returns None, then we do not extract
+                # this file
+                # TODO: Do we really need to limit to just these file types?
+                # tarobj.extract() will handle all files on all platforms,
+                # turning file types that aren't allowed on that platform into
+                # regular files.
+                if final_dst and (member.isfile() or member.isdir() or
+                        member.islnk() or member.issym()):
+                    tarobj.extract(member, extract_dir)
+                    if final_dst != prelim_dst:
+                        shutil.move(prelim_dst, final_dst)
         return True
     finally:
         tarobj.close()

From df1e3725c0ef744f89e1769767e04b78ebc9a525 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 23 Mar 2012 13:55:31 -0400
Subject: [PATCH 3405/8469] Updated CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : 2295366e701d262d83aacec7ff7af6d65fc0b09c
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5ee08823cb..3895b0a3f1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.26
+------
+
+* Issue #183: Symlinked files are now extracted from source distributions.
+
 ------
 0.6.25
 ------

From be66b979ea6371d92a555c5fea28faa3e2b719bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 29 Mar 2012 23:36:28 -0400
Subject: [PATCH 3406/8469] Another attempt at a fix that uses setopt instead
 of hacking easy_install

--HG--
branch : distribute
extra : rebase_source : 907488d2ba609dbca39cd14c021c5cfb4f353a38
---
 setuptools/command/easy_install.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d200dac1b4..ef82808b62 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -271,8 +271,7 @@ def finalize_options(self):
                     )
                 else:
                     self.all_site_dirs.append(normalize_path(d))
-        if not self.editable and self.args != ['-']:
-            self.check_site_dir()
+        if not self.editable: self.check_site_dir()
         self.index_url = self.index_url or "http://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
@@ -343,11 +342,6 @@ def expand_dirs(self):
                             'install_scripts', 'install_data',])
 
     def run(self):
-        if self.args == ['-']:
-            # A single dash as an argument means 'do nothing' and is just a way
-            # to pass arguments to the easy_install command without running it
-            return
-
         if self.verbose != self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
@@ -1102,10 +1096,14 @@ def build_and_install(self, setup_script, setup_base):
                 if key not in keep:
                     del ei_opts[key]
             if ei_opts:
-                args.append('easy_install')
                 for key, val in ei_opts.iteritems():
-                    args.append('--%s=%s' % (key.replace('_', '-'), val[1]))
-                args.append('-')
+                    args.append('setopt')
+                    args.append('--command')
+                    args.append('easy_install')
+                    args.append('--option')
+                    args.append(key.replace('_', '-'))
+                    args.append('--set-value')
+                    args.append(val[1])
 
             self.run_setup(setup_script, setup_base, args)
             all_eggs = Environment([dist_dir])

From 23622dbdb01a2427ba8c40ffb9820793a6d21817 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 29 Mar 2012 23:57:57 -0400
Subject: [PATCH 3407/8469] Put the setopt directives before bdist_egg

--HG--
branch : distribute
extra : rebase_source : 23f656d6eb2ade3aa51f285a8bc288eab432819a
---
 setuptools/command/easy_install.py | 34 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ef82808b62..4ff57648f7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1081,29 +1081,27 @@ def run_setup(self, setup_script, setup_base, args):
             raise DistutilsError("Setup script exited with %s" % (v.args[0],))
 
     def build_and_install(self, setup_script, setup_base):
-        args = ['bdist_egg', '--dist-dir']
+        args = []
+
+        # first pass along any install directives using setopt
+        ei_opts = self.distribution.get_option_dict('easy_install').copy()
+        install_directives = (
+            'find_links', 'site_dirs', 'index_url', 'optimize',
+            'site_dirs', 'allow_hosts'
+        )
+        for key, val in ei_opts.iteritems():
+            if key not in install_directives: continue
+            args.extend(['setopt', '--command', 'easy_install',
+                '--option', key.replace('_', '-'),
+                '--set-value', val[1]])
+
+        args.extend(['bdist_egg', '--dist-dir'])
+
         dist_dir = tempfile.mkdtemp(
             prefix='egg-dist-tmp-', dir=os.path.dirname(setup_script)
         )
         try:
             args.append(dist_dir)
-            ei_opts = self.distribution.get_option_dict('easy_install').copy()
-            keep = (
-                'find_links', 'site_dirs', 'index_url', 'optimize',
-                'site_dirs', 'allow_hosts'
-            )
-            for key in ei_opts.keys():
-                if key not in keep:
-                    del ei_opts[key]
-            if ei_opts:
-                for key, val in ei_opts.iteritems():
-                    args.append('setopt')
-                    args.append('--command')
-                    args.append('easy_install')
-                    args.append('--option')
-                    args.append(key.replace('_', '-'))
-                    args.append('--set-value')
-                    args.append(val[1])
 
             self.run_setup(setup_script, setup_base, args)
             all_eggs = Environment([dist_dir])

From d388348dbca2972ed9cf6b2a9eff3b264f0e58b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 30 Mar 2012 09:08:23 -0400
Subject: [PATCH 3408/8469] Yet another approach - invoking setopt directly
 prior to invoking a new setup process. This approach works (compared to the
 previous setopt approach which did not).

--HG--
branch : distribute
extra : rebase_source : 4d28ae98e67d8bc1f2f98aee93d7a69000f10239
---
 setuptools/command/easy_install.py | 42 +++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4ff57648f7..dfd9f7ff8f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -21,6 +21,7 @@
 from distutils.errors import DistutilsArgError, DistutilsOptionError, \
     DistutilsError, DistutilsPlatformError
 from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
+from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
@@ -1081,26 +1082,13 @@ def run_setup(self, setup_script, setup_base, args):
             raise DistutilsError("Setup script exited with %s" % (v.args[0],))
 
     def build_and_install(self, setup_script, setup_base):
-        args = []
-
-        # first pass along any install directives using setopt
-        ei_opts = self.distribution.get_option_dict('easy_install').copy()
-        install_directives = (
-            'find_links', 'site_dirs', 'index_url', 'optimize',
-            'site_dirs', 'allow_hosts'
-        )
-        for key, val in ei_opts.iteritems():
-            if key not in install_directives: continue
-            args.extend(['setopt', '--command', 'easy_install',
-                '--option', key.replace('_', '-'),
-                '--set-value', val[1]])
-
-        args.extend(['bdist_egg', '--dist-dir'])
+        args = ['bdist_egg', '--dist-dir']
 
         dist_dir = tempfile.mkdtemp(
             prefix='egg-dist-tmp-', dir=os.path.dirname(setup_script)
         )
         try:
+            self._set_fetcher_options(os.path.dirname(setup_script))
             args.append(dist_dir)
 
             self.run_setup(setup_script, setup_base, args)
@@ -1117,6 +1105,30 @@ def build_and_install(self, setup_script, setup_base):
             rmtree(dist_dir)
             log.set_verbosity(self.verbose) # restore our log verbosity
 
+    def _set_fetcher_options(self, base):
+        """
+        When easy_install is about to run bdist_egg on a source dist, that
+        source dist might have 'setup_requires' directives, requiring
+        additional fetching. Ensure the fetcher options given to easy_install
+        are available to that command as well.
+        """
+        # find the fetch options from easy_install and write them out
+        #  to the setup.cfg file.
+        ei_opts = self.distribution.get_option_dict('easy_install').copy()
+        fetch_directives = (
+            'find_links', 'site_dirs', 'index_url', 'optimize',
+            'site_dirs', 'allow_hosts',
+        )
+        fetch_options = {}
+        for key, val in ei_opts.iteritems():
+            if key not in fetch_directives: continue
+            fetch_options[key.replace('_', '-')] = val[1]
+        # create a settings dictionary suitable for `edit_config`
+        settings = dict(easy_install=fetch_options)
+        cfg_filename = os.path.join(base, 'setup.cfg')
+        setopt.edit_config(cfg_filename, settings)
+
+
     def update_pth(self,dist):
         if self.pth_file is None:
             return

From c2ee921caa6757e4b8e34687cf758cf7859a0737 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 30 Mar 2012 09:10:44 -0400
Subject: [PATCH 3409/8469] Backout changes to dist.py from 488cc8a13f66

--HG--
branch : distribute
extra : rebase_source : 2aeb4f273f05dd10b26a530c40dabfcb57861d37
---
 setuptools/dist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 204dcdfa6b..0ad18122cf 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -269,9 +269,8 @@ def fetch_build_egg(self, req):
             cmd.package_index.to_scan = []
         except AttributeError:
             from setuptools.command.easy_install import easy_install
-            dist = self.__class__()
+            dist = self.__class__({'script_args':['easy_install']})
             dist.parse_config_files()
-            dist.parse_command_line()
             opts = dist.get_option_dict('easy_install')
             keep = (
                 'find_links', 'site_dirs', 'index_url', 'optimize',

From cf4a89429a762473c9ec2fdad424a0f11076a5b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 31 Mar 2012 18:28:34 -0400
Subject: [PATCH 3410/8469] Updated CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : 3838ae33ab0e8c584e4e945f1b2a8167adc7c27d
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3895b0a3f1..5e91876039 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,9 @@ CHANGES
 ------
 
 * Issue #183: Symlinked files are now extracted from source distributions.
+* Issue #227: Easy_install fetch parameters are now passed during the
+  installation of a source distribution; now fulfillment of setup_requires
+  dependencies will honor the parameters passed to easy_install.
 
 ------
 0.6.25

From ca25aeb8ebcee9808e9f2ead00586a1907a21f1b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 1 Apr 2012 13:49:21 +0200
Subject: [PATCH 3411/8469] Bump to 3.3.0a2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8b4261aa3c..661a8b6df4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0a1"
+__version__ = "3.3.0a2"
 #--end constants--

From 6629eabfe6f39e92ec6396634432df7657bc8843 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 08:59:33 -0400
Subject: [PATCH 3412/8469] Slightly nicer generation of trove classifiers
 without having to resort to list comprehensions.

--HG--
branch : distribute
extra : rebase_source : 78c6124f2398d786c45ce14fe5de19aa0d09e005
---
 setup.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index f576b520c5..d6c8ee0d34 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 """Distutils setup file, used to install or test 'setuptools'"""
 import sys
 import os
+import textwrap
 
 src_root = None
 if sys.version_info >= (3,):
@@ -197,23 +198,22 @@ def _being_installed():
         },
 
 
-    classifiers = [f.strip() for f in """
-    Development Status :: 5 - Production/Stable
-    Intended Audience :: Developers
-    License :: OSI Approved :: Python Software Foundation License
-    License :: OSI Approved :: Zope Public License
-    Operating System :: OS Independent
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Topic :: Software Development :: Libraries :: Python Modules
-    Topic :: System :: Archiving :: Packaging
-    Topic :: System :: Systems Administration
-    Topic :: Utilities""".splitlines() if f.strip()],
+    classifiers = textwrap.dedent("""
+        Development Status :: 5 - Production/Stable
+        Intended Audience :: Developers
+        License :: OSI Approved :: Python Software Foundation License
+        License :: OSI Approved :: Zope Public License
+        Operating System :: OS Independent
+        Programming Language :: Python
+        Programming Language :: Python :: 3
+        Topic :: Software Development :: Libraries :: Python Modules
+        Topic :: System :: Archiving :: Packaging
+        Topic :: System :: Systems Administration
+        Topic :: Utilities
+        """).strip().splitlines(),
     scripts = scripts,
 )
 
 if _being_installed():
     from distribute_setup import _after_install
     _after_install(dist)
-
-

From 5ac3e0119a483c7d9bb43148d2b6f16c546913ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 09:15:44 -0400
Subject: [PATCH 3413/8469] Reorganized imports

--HG--
branch : distribute
extra : rebase_source : b348504ee7341fc2928a786167f33baa136e2b93
---
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools/tests/__init__.py         |  30 ++++---
 2 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..2965458969 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 9af44a88bb..fec3854d3d 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,19 +1,21 @@
 """Tests for the 'setuptools' package"""
-from unittest import TestSuite, TestCase, makeSuite, defaultTestLoader
-import distutils.core, distutils.cmd
+import sys
+import os
+import doctest
+import distutils.core
+import distutils.cmd
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
 from distutils.errors import DistutilsSetupError
-import setuptools, setuptools.dist
-from setuptools import Feature
 from distutils.core import Extension
-extract_constant, get_module_constant = None, None
-from setuptools.depends import *
-from distutils.version import StrictVersion, LooseVersion
-from distutils.util import convert_path
-import sys, os.path
+from distutils.version import LooseVersion
+
+import unittest
+
+import setuptools.dist
+from setuptools import Feature
+from setuptools.depends import Require, find_module, get_module_constant, extract_constant
 
 def additional_tests():
-    import doctest, unittest
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
             os.path.join('tests', 'api_tests.txt'),
@@ -40,7 +42,7 @@ def makeSetup(**args):
 
 
 
-class DependsTests(TestCase):
+class DependsTests(unittest.TestCase):
 
     def testExtractConst(self):
         if not extract_constant: return  # skip on non-bytecode platforms
@@ -122,7 +124,7 @@ def testRequire(self):
         self.assert_(req.is_current(paths))
 
 
-class DistroTests(TestCase):
+class DistroTests(unittest.TestCase):
 
     def setUp(self):
         self.e1 = Extension('bar.ext',['bar.c'])
@@ -245,7 +247,7 @@ def testInvalidIncludeExclude(self):
 
 
 
-class FeatureTests(TestCase):
+class FeatureTests(unittest.TestCase):
 
     def setUp(self):
         self.req = Require('Distutils','1.0.3','distutils')
@@ -327,7 +329,7 @@ def testFeatureWithInvalidRemove(self):
             SystemExit, makeSetup, features = {'x':Feature('x', remove='y')}
         )
 
-class TestCommandTests(TestCase):
+class TestCommandTests(unittest.TestCase):
 
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')

From 61942ccf83167298cbd933f1594d59a32f5cf349 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 09:25:00 -0400
Subject: [PATCH 3414/8469] Cleaned up excess whitespace

--HG--
branch : distribute
extra : rebase_source : 722c3a4c556ba4415c633e74e34fb45f76d8653d
---
 setuptools/tests/__init__.py | 37 +++---------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fec3854d3d..7a3d6eb51c 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -40,15 +40,13 @@ def makeSetup(**args):
         distutils.core_setup_stop_after = None
 
 
-
-
 class DependsTests(unittest.TestCase):
 
     def testExtractConst(self):
         if not extract_constant: return  # skip on non-bytecode platforms
 
         def f1():
-            global x,y,z
+            global x, y, z
             x = "test"
             y = z
 
@@ -64,11 +62,11 @@ def f1():
         # recognized name, not assigned
         self.assertEqual(extract_constant(f1.func_code,'z', -1), None)
 
-
     def testFindModule(self):
         self.assertRaises(ImportError, find_module, 'no-such.-thing')
         self.assertRaises(ImportError, find_module, 'setuptools.non-existent')
-        f,p,i = find_module('setuptools.tests'); f.close()
+        f,p,i = find_module('setuptools.tests')
+        f.close()
 
     def testModuleExtract(self):
         if not get_module_constant: return  # skip on non-bytecode platforms
@@ -137,11 +135,9 @@ def setUp(self):
             package_dir = {},
         )
 
-
     def testDistroType(self):
         self.assert_(isinstance(self.dist,setuptools.dist.Distribution))
 
-
     def testExcludePackage(self):
         self.dist.exclude_package('a')
         self.assertEqual(self.dist.packages, ['b','c'])
@@ -159,12 +155,6 @@ def testExcludePackage(self):
         # test removals from unspecified options
         makeSetup().exclude_package('x')
 
-
-
-
-
-
-
     def testIncludeExclude(self):
         # remove an extension
         self.dist.exclude(ext_modules=[self.e1])
@@ -203,9 +193,6 @@ def testContents(self):
         self.dist.exclude_package('c')
         self.assert_(not self.dist.has_contents_for('c'))
 
-
-
-
     def testInvalidIncludeExclude(self):
         self.assertRaises(DistutilsSetupError,
             self.dist.include, nonexistent_option='x'
@@ -234,19 +221,6 @@ def testInvalidIncludeExclude(self):
         )
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 class FeatureTests(unittest.TestCase):
 
     def setUp(self):
@@ -365,8 +339,3 @@ def testNoSuite(self):
         ts5 = makeSetup().get_command_obj('test')
         ts5.ensure_finalized()
         self.assertEqual(ts5.test_suite, None)
-
-
-
-
-

From 83a86217e2f1cf1259d4b1921b840a449f0dd32b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 09:26:13 -0400
Subject: [PATCH 3415/8469] Reorganized imports and cleaned up whitespace

--HG--
branch : distribute
extra : rebase_source : 288c7531df0ab929030445973ecf6386a3e437b1
---
 setuptools/tests/test_easy_install.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4150ad1061..dce5501df5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,9 +1,12 @@
 """Easy install Tests
 """
 import sys
-import os, shutil, tempfile, unittest
+import os
+import shutil
+import tempfile
+import unittest
 import site
-from StringIO import StringIO
+
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -11,7 +14,8 @@
 from pkg_resources import Distribution as PRDistribution
 
 try:
-    import multiprocessing
+    # import multiprocessing solely for the purpose of testing its existence
+    __import__('multiprocessing')
     import logging
     _LOG = logging.getLogger('test_easy_install')
     logging.basicConfig(level=logging.INFO, stream=sys.stderr)
@@ -110,7 +114,7 @@ def test_no_find_links(self):
         # the project level
         dist = Distribution()
         cmd = easy_install(dist)
-        cmd.check_pth_processing = lambda : True
+        cmd.check_pth_processing = lambda: True
         cmd.no_find_links = True
         cmd.find_links = ['link1', 'link2']
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
@@ -120,7 +124,7 @@ def test_no_find_links(self):
 
         # let's try without it (default behavior)
         cmd = easy_install(dist)
-        cmd.check_pth_processing = lambda : True
+        cmd.check_pth_processing = lambda: True
         cmd.find_links = ['link1', 'link2']
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
         cmd.args = ['ok']
@@ -173,7 +177,7 @@ def setUp(self):
     def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
-        if sys.version >=  "2.6":
+        if sys.version >= "2.6":
             shutil.rmtree(site.USER_BASE)
             shutil.rmtree(site.USER_SITE)
             site.USER_BASE = self.old_base
@@ -249,4 +253,3 @@ def test_local_index(self):
                 os.environ['PYTHONPATH'] = old_ppath
             else:
                 del os.environ['PYTHONPATH']
-

From 1ed3a1602e14450433663f5923972a73686379fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 10:56:03 -0400
Subject: [PATCH 3416/8469] Cleaned up simulated index server, expanding
 documentation.

--HG--
branch : distribute
extra : rebase_source : b479cf805b766fa35c8e76c30c7725e93f56e6a2
---
 setuptools/tests/server.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index f4aaaa1cfc..2dcbe5af6e 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -2,7 +2,7 @@
 """
 import urllib2
 import sys
-from threading import Thread
+import threading
 from BaseHTTPServer import HTTPServer
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 
@@ -17,29 +17,36 @@ class IndexServer(HTTPServer):
         # The index files should be located in setuptools/tests/indexes
         s.stop()
     """
-    def __init__(self):
-        HTTPServer.__init__(self, ('', 0), SimpleHTTPRequestHandler)
+    def __init__(self, server_address=('', 0),
+            RequestHandlerClass=SimpleHTTPRequestHandler,
+            bind_and_activate=True):
+        HTTPServer.__init__(self, server_address, RequestHandlerClass,
+            bind_and_activate)
         self._run = True
 
     def serve(self):
-        while True:
+        while self._run:
             self.handle_request()
-            if not self._run: break
 
     def start(self):
-        self.thread = Thread(target=self.serve)
+        self.thread = threading.Thread(target=self.serve)
         self.thread.start()
 
     def stop(self):
-        """self.shutdown is not supported on python < 2.6"""
+        "Stop the server"
+
+        # self.shutdown is not supported on python < 2.6, so just
+        #  set _run to false, and make a request, causing it to
+        #  terminate.
         self._run = False
+        url = 'http://127.0.0.1:%(server_port)s/' % vars(self)
         try:
-            if sys.version > '2.6':
-                urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port,
-                                None, 5)
+            if sys.version_info >= (2, 6):
+                urllib2.urlopen(url, timeout=5)
             else:
-                urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port)
+                urllib2.urlopen(url)
         except urllib2.URLError:
+            # ignore any errors; all that's important is the request
             pass
         self.thread.join()
 

From fdc210e463688befd23e1a0e3ad1a599a891019d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 11:26:34 -0400
Subject: [PATCH 3417/8469] Started work on a Mock server that doesn't require
 a file system to back it.

--HG--
branch : distribute
extra : rebase_source : feac8d802a8f574124fffab8c6c22d218b61987c
---
 setuptools/tests/server.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 2dcbe5af6e..870d3c8e6e 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -3,6 +3,7 @@
 import urllib2
 import sys
 import threading
+import BaseHTTPServer
 from BaseHTTPServer import HTTPServer
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 
@@ -53,3 +54,19 @@ def stop(self):
     def base_url(self):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
+
+class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+    def do_GET(self):
+        requests = vars(self.server).setdefault('requests', [])
+        requests.append(self)
+        self.send_response(200, 'OK')
+
+class MockServer(HTTPServer):
+    """
+    A simple HTTP Server that records the requests made to it.
+    """
+    def __init__(self, server_address=('', 0),
+            RequestHandlerClass=RequestRecorder,
+            bind_and_activate=True):
+        HTTPServer.__init__(self, server_address, RequestHandlerClass,
+            bind_and_activate)

From ea977c0c8db023626f40f9b7c159549846f14a47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Apr 2012 15:28:56 -0400
Subject: [PATCH 3418/8469] Add test to capture issue 227

--HG--
branch : distribute
extra : rebase_source : 6a829eb08499c0b7a83dd653fb039b8695620fb0
---
 setuptools/tests/server.py            |  9 +++++
 setuptools/tests/test_easy_install.py | 51 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 870d3c8e6e..e04dcca576 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -70,3 +70,12 @@ def __init__(self, server_address=('', 0),
             bind_and_activate=True):
         HTTPServer.__init__(self, server_address, RequestHandlerClass,
             bind_and_activate)
+        self.threads = []
+
+    def handle_request_in_thread(self):
+        self.threads.append(threading.Thread(target = self.handle_request))
+        # todo: ensure that threads are closed.
+
+    def url(self):
+        return 'http://localhost:%(server_port)s/' % vars(self)
+    url = property(url)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index dce5501df5..6dcb1cbdc8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -6,12 +6,14 @@
 import tempfile
 import unittest
 import site
+import contextlib
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 from pkg_resources import Distribution as PRDistribution
+import setuptools.tests.server
 
 try:
     # import multiprocessing solely for the purpose of testing its existence
@@ -253,3 +255,52 @@ def test_local_index(self):
                 os.environ['PYTHONPATH'] = old_ppath
             else:
                 del os.environ['PYTHONPATH']
+
+
+class TestSetupRequires(unittest.TestCase):
+
+    def test_setup_requires_honors_fetch_params(self):
+        """
+        When easy_install installs a source distribution which specifies
+        setup_requires, it should honor the fetch parameters (such as
+        allow-hosts, index-url, and find-links).
+        """
+        # set up a server which will simulate an alternate package index.
+        p_index = setuptools.tests.server.MockServer()
+        p_index.handle_request_in_thread()
+        # create an sdist that has a build-time dependency.
+        dist_file = self.create_sdist()
+        with tempdir_context() as temp_install_dir:
+            with environment_context(PYTHONPATH=temp_install_dir):
+                ei_params = ['--index-url', p_index.url,
+                    '--allow-hosts', 'localhost',
+                    '--exclude-scripts', '--install-dir', temp_install_dir,
+                    dist_file]
+                easy_install_pkg.main(ei_params)
+            self.assertTrue(os.listdir(temp_install_dir))
+        self.assertEqual(len(p_index.requests), 1)
+        self.assertEqual(p_index.requests[0].path, 'x')
+
+    def create_sdist(self):
+        # for now, just use a known dist
+        return ('http://pypi.python.org/packages/source/j/jaraco.util/'
+            'jaraco.util-5.3.zip')
+
+@contextlib.contextmanager
+def tempdir_context():
+    temp_dir = tempfile.mkdtemp()
+    try:
+        yield temp_dir
+    finally:
+        shutil.rmtree(temp_dir)
+
+@contextlib.contextmanager
+def environment_context(**updates):
+    old_env = os.environ.copy()
+    os.environ.update(updates)
+    try:
+        yield
+    finally:
+        for key in updates:
+            del os.environ[key]
+        os.environ.update(old_env)

From 54af65c686e1b04ce8d83643ff3232c9043ad335 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Apr 2012 13:17:25 -0400
Subject: [PATCH 3419/8469] bump to 3.1.5 final

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6ab1662570..d79bfa1315 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.1.5rc2"
+__version__ = "3.1.5"
 #--end constants--

From b06c48c01625706c398e6ef6db343cbb192c184e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 11:24:05 -0400
Subject: [PATCH 3420/8469] Expanded TestSetupRequires so it actually stages
 the installation of an sdist with a setup_requires.

--HG--
branch : distribute
extra : rebase_source : 4266165d9e75e9e19551a3bf646820f309f631df
---
 setuptools/tests/test_easy_install.py | 95 +++++++++++++++++++++++----
 1 file changed, 81 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6dcb1cbdc8..aff2688a07 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -7,6 +7,7 @@
 import unittest
 import site
 import contextlib
+import textwrap
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
@@ -269,29 +270,95 @@ def test_setup_requires_honors_fetch_params(self):
         p_index = setuptools.tests.server.MockServer()
         p_index.handle_request_in_thread()
         # create an sdist that has a build-time dependency.
-        dist_file = self.create_sdist()
-        with tempdir_context() as temp_install_dir:
-            with environment_context(PYTHONPATH=temp_install_dir):
-                ei_params = ['--index-url', p_index.url,
-                    '--allow-hosts', 'localhost',
-                    '--exclude-scripts', '--install-dir', temp_install_dir,
-                    dist_file]
-                easy_install_pkg.main(ei_params)
-            self.assertTrue(os.listdir(temp_install_dir))
+        with TestSetupRequires.create_sdist() as dist_file:
+            with tempdir_context() as temp_install_dir:
+                with environment_context(PYTHONPATH=temp_install_dir):
+                    ei_params = ['--index-url', p_index.url,
+                        '--allow-hosts', 'localhost',
+                        '--exclude-scripts', '--install-dir', temp_install_dir,
+                        dist_file]
+                    # attempt to install the dist. It will fail because
+                    #  our fake server can't actually supply the dependency
+                    try:
+                        easy_install_pkg.main(ei_params)
+                    except Exception:
+                        pass
+                #self.assertTrue(os.listdir(temp_install_dir))
         self.assertEqual(len(p_index.requests), 1)
         self.assertEqual(p_index.requests[0].path, 'x')
 
-    def create_sdist(self):
-        # for now, just use a known dist
-        return ('http://pypi.python.org/packages/source/j/jaraco.util/'
-            'jaraco.util-5.3.zip')
+    @staticmethod
+    @contextlib.contextmanager
+    def create_sdist():
+        """
+        Return an sdist generated by self.generate_dist()
+
+        We don't generate it dynamically, because we don't want the test suite
+        to have to connect to the network for the setup_requires declaration
+        just to build the sdist.
+        """
+        with tempdir_context() as d:
+            dist_path = os.path.join(d, 'distribute-test-fetcher-1.0.tar.gz')
+            with open(dist_path, 'wb') as dist:
+                dist.write("""
+                    H4sICLBagE8C/2Rpc3RcZGlzdHJpYnV0ZS10ZXN0LWZldGNoZXItMS4wLnRhcgDtmNtvmzAUh/Ns
+                    Kf+DlZduUkmBYJAi5WHaXd2SqlG7h6pCNJwQa9xmm2j57+eQaqGpktKt0F3O9wI+XCJy/JmfCLlU
+                    gt8UCgwFUhlzULMFCMPqmyedJ8LUeJ5XbjW723LfsjzHNBmzXV23HJuxDmWdFiikCgSlT/KQ1Yf7
+                    SwgP9H97zF8f82+P9SGKDJ7Os5Om+m/brutg///4/oeQQxpCOlv5MU+/yr76rvb8Na7rHui/te0/
+                    0/PEdvWgQ03sf+OQDvI/81v+n52+Nz6O301qqHHI/4HFdvwfePp09L8FPoMKwkAFxiUIybN0SHXn
+                    u2QcJDCkeyZHl9w9eVokSSBWQ3oxPh1Pvoy75EOWgJEHEVRqrwq1yMS9ggFJwONK+ROfQSqrV74B
+                    ORM8V+Uv/qyexYGaZyKplFDndv2fTi7OX7+d7nnt1/ffdHb8dxgboP9tIEEVeT9fkdqLPXnMtCC/
+                    lCEfvkpluR/DEuKH5h7SoP81u/D4/M8cC/3H/I88q/81430tNWrn//L7HxswC/3H/I/5/zn932TD
+                    2Txq2H/r3vd/13QZ+t8GVzrM+eswd90lKoj8m4LHIR3RzUivDKAH5mYkl6kvYMnX6m+qqNy/73++
+                    avr9b3ne3fyv/Tdt9L8NeJJnQtGy1SrLYkm2u/1y9wWhmlQHglFvz2zpHZfnLDepYNTTk+e2VN5B
+                    LxrfCi5A6kXj6mgRlTc/uj4mL3H5QBAEQRAEaZsfEynDsQAoAAA=
+                    """.decode('base64'))
+            yield dist_path
+
+    @classmethod
+    def generate_sdist(cls):
+        """
+        generate the sdist suitable for create_sdist
+        """
+        with tempdir_context(cd=os.chdir):
+            with open('setup.py', 'wb') as setup_script:
+                setup_script.write(textwrap.dedent("""
+                    import setuptools
+                    setuptools.setup(
+                        name="distribute-test-fetcher",
+                        version="1.0",
+                        setup_requires = ['hgtools'],
+                    )
+                    """).lstrip())
+            with argv_context(['setup.py', 'sdist', '-q', '--formats', 'gztar']):
+                setuptools.setup(
+                    name="distribute-test-fetcher",
+                    version = "1.0",
+                    setup_requires = ['hgtools'],
+                )
+            filename = 'distribute-test-fetcher-1.0.tar.gz'
+            dist = os.path.join('dist', filename)
+            assert os.path.isfile(dist)
+            with open(dist, 'rb') as dist_f:
+                print("=====================")
+                print(dist_f.read().encode('base64'))
+
+@contextlib.contextmanager
+def argv_context(repl):
+    old_argv = sys.argv[:]
+    sys.argv[:] = repl
+    yield
+    sys.argv[:] = old_argv
 
 @contextlib.contextmanager
-def tempdir_context():
+def tempdir_context(cd=lambda dir:None):
     temp_dir = tempfile.mkdtemp()
+    orig_dir = os.getcwd()
     try:
+        cd(temp_dir)
         yield temp_dir
     finally:
+        cd(orig_dir)
         shutil.rmtree(temp_dir)
 
 @contextlib.contextmanager

From b73fcba7ff7721c1db0a057337863cdbab58ff81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 11:36:25 -0400
Subject: [PATCH 3421/8469] We expect easy_install to raise a SystemExit

--HG--
branch : distribute
extra : rebase_source : 74b6b4091c9719daab6f240f8c05b24183fc1b12
---
 setuptools/tests/test_easy_install.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aff2688a07..e78b59aae0 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -277,12 +277,10 @@ def test_setup_requires_honors_fetch_params(self):
                         '--allow-hosts', 'localhost',
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
-                    # attempt to install the dist. It will fail because
+                    # attempt to install the dist. It should fail because
                     #  our fake server can't actually supply the dependency
-                    try:
-                        easy_install_pkg.main(ei_params)
-                    except Exception:
-                        pass
+                    self.assertRaises(SystemExit,
+                        easy_install_pkg.main, ei_params)
                 #self.assertTrue(os.listdir(temp_install_dir))
         self.assertEqual(len(p_index.requests), 1)
         self.assertEqual(p_index.requests[0].path, 'x')

From 5112a1e998a49093f2531fa17fbbb21b6fcdb9d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 11:43:14 -0400
Subject: [PATCH 3422/8469] Create the sdist using tarfile and the code is much
 simpler

--HG--
branch : distribute
extra : rebase_source : f913f69988ddac8b6c27fb72d24728d18073fdb9
---
 setuptools/tests/test_easy_install.py | 56 ++++-----------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e78b59aae0..54e3cdf97f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -8,6 +8,7 @@
 import site
 import contextlib
 import textwrap
+import tarfile
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
@@ -289,64 +290,23 @@ def test_setup_requires_honors_fetch_params(self):
     @contextlib.contextmanager
     def create_sdist():
         """
-        Return an sdist generated by self.generate_dist()
-
-        We don't generate it dynamically, because we don't want the test suite
-        to have to connect to the network for the setup_requires declaration
-        just to build the sdist.
+        Return an sdist with a setup_requires dependency (of something that
+        doesn't exist)
         """
         with tempdir_context() as d:
-            dist_path = os.path.join(d, 'distribute-test-fetcher-1.0.tar.gz')
-            with open(dist_path, 'wb') as dist:
-                dist.write("""
-                    H4sICLBagE8C/2Rpc3RcZGlzdHJpYnV0ZS10ZXN0LWZldGNoZXItMS4wLnRhcgDtmNtvmzAUh/Ns
-                    Kf+DlZduUkmBYJAi5WHaXd2SqlG7h6pCNJwQa9xmm2j57+eQaqGpktKt0F3O9wI+XCJy/JmfCLlU
-                    gt8UCgwFUhlzULMFCMPqmyedJ8LUeJ5XbjW723LfsjzHNBmzXV23HJuxDmWdFiikCgSlT/KQ1Yf7
-                    SwgP9H97zF8f82+P9SGKDJ7Os5Om+m/brutg///4/oeQQxpCOlv5MU+/yr76rvb8Na7rHui/te0/
-                    0/PEdvWgQ03sf+OQDvI/81v+n52+Nz6O301qqHHI/4HFdvwfePp09L8FPoMKwkAFxiUIybN0SHXn
-                    u2QcJDCkeyZHl9w9eVokSSBWQ3oxPh1Pvoy75EOWgJEHEVRqrwq1yMS9ggFJwONK+ROfQSqrV74B
-                    ORM8V+Uv/qyexYGaZyKplFDndv2fTi7OX7+d7nnt1/ffdHb8dxgboP9tIEEVeT9fkdqLPXnMtCC/
-                    lCEfvkpluR/DEuKH5h7SoP81u/D4/M8cC/3H/I88q/81430tNWrn//L7HxswC/3H/I/5/zn932TD
-                    2Txq2H/r3vd/13QZ+t8GVzrM+eswd90lKoj8m4LHIR3RzUivDKAH5mYkl6kvYMnX6m+qqNy/73++
-                    avr9b3ne3fyv/Tdt9L8NeJJnQtGy1SrLYkm2u/1y9wWhmlQHglFvz2zpHZfnLDepYNTTk+e2VN5B
-                    LxrfCi5A6kXj6mgRlTc/uj4mL3H5QBAEQRAEaZsfEynDsQAoAAA=
-                    """.decode('base64'))
-            yield dist_path
-
-    @classmethod
-    def generate_sdist(cls):
-        """
-        generate the sdist suitable for create_sdist
-        """
-        with tempdir_context(cd=os.chdir):
             with open('setup.py', 'wb') as setup_script:
                 setup_script.write(textwrap.dedent("""
                     import setuptools
                     setuptools.setup(
                         name="distribute-test-fetcher",
                         version="1.0",
-                        setup_requires = ['hgtools'],
+                        setup_requires = ['does-not-exist'],
                     )
                     """).lstrip())
-            with argv_context(['setup.py', 'sdist', '-q', '--formats', 'gztar']):
-                setuptools.setup(
-                    name="distribute-test-fetcher",
-                    version = "1.0",
-                    setup_requires = ['hgtools'],
-                )
-            filename = 'distribute-test-fetcher-1.0.tar.gz'
-            dist = os.path.join('dist', filename)
-            assert os.path.isfile(dist)
-            with open(dist, 'rb') as dist_f:
-                print("=====================")
-                print(dist_f.read().encode('base64'))
-
-@contextlib.contextmanager
-def argv_context(repl):
-    old_argv = sys.argv[:]
-    sys.argv[:] = repl
-    yield
-    sys.argv[:] = old_argv
+            dist_path = os.path.join(d, 'distribute-test-fetcher-1.0.tar.gz')
+            with tarfile.open(dist_path, 'w:gz') as dist:
+                dist.add('setup.py')
+            yield dist_path
 
 @contextlib.contextmanager
 def tempdir_context(cd=lambda dir:None):

From dea4120fdc2cd90d9d68d3ffbc6e2118aadde125 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 12:16:56 -0400
Subject: [PATCH 3423/8469] Improved the MockServer so it now more effectively
 handles multiple requests (as any index server really must). Test now more
 accurately captures the working scenario.

--HG--
branch : distribute
extra : rebase_source : 8ee0afdd95219047e4700b85356792f6128b1fd8
---
 setuptools/tests/server.py            | 10 +++++-----
 setuptools/tests/test_easy_install.py | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index e04dcca576..8e06cc1d9f 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -61,7 +61,7 @@ def do_GET(self):
         requests.append(self)
         self.send_response(200, 'OK')
 
-class MockServer(HTTPServer):
+class MockServer(HTTPServer, threading.Thread):
     """
     A simple HTTP Server that records the requests made to it.
     """
@@ -70,11 +70,11 @@ def __init__(self, server_address=('', 0),
             bind_and_activate=True):
         HTTPServer.__init__(self, server_address, RequestHandlerClass,
             bind_and_activate)
-        self.threads = []
+        threading.Thread.__init__(self)
+        self.daemon = True
 
-    def handle_request_in_thread(self):
-        self.threads.append(threading.Thread(target = self.handle_request))
-        # todo: ensure that threads are closed.
+    def run(self):
+        self.serve_forever()
 
     def url(self):
         return 'http://localhost:%(server_port)s/' % vars(self)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 54e3cdf97f..87d24bb76e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -9,6 +9,7 @@
 import contextlib
 import textwrap
 import tarfile
+import urlparse
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
@@ -269,13 +270,14 @@ def test_setup_requires_honors_fetch_params(self):
         """
         # set up a server which will simulate an alternate package index.
         p_index = setuptools.tests.server.MockServer()
-        p_index.handle_request_in_thread()
+        p_index.start()
+        p_index_loc = urlparse.urlparse(p_index.url).netloc
         # create an sdist that has a build-time dependency.
         with TestSetupRequires.create_sdist() as dist_file:
             with tempdir_context() as temp_install_dir:
                 with environment_context(PYTHONPATH=temp_install_dir):
                     ei_params = ['--index-url', p_index.url,
-                        '--allow-hosts', 'localhost',
+                        '--allow-hosts', p_index_loc,
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
                     # attempt to install the dist. It should fail because
@@ -283,8 +285,8 @@ def test_setup_requires_honors_fetch_params(self):
                     self.assertRaises(SystemExit,
                         easy_install_pkg.main, ei_params)
                 #self.assertTrue(os.listdir(temp_install_dir))
-        self.assertEqual(len(p_index.requests), 1)
-        self.assertEqual(p_index.requests[0].path, 'x')
+        self.assertEqual(len(p_index.requests), 2)
+        self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
     @staticmethod
     @contextlib.contextmanager

From 1a9a961d96c1f9c11719356d6f375cdfc17e7e6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 12:40:19 -0400
Subject: [PATCH 3424/8469] Test now constructs the tarfile completely in
 memory (avoiding accidentally writing over our own setup.py)

--HG--
branch : distribute
extra : rebase_source : ad8ec142238405edeee6dce51c05d382e53d1299
---
 setuptools/tests/test_easy_install.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 87d24bb76e..3f38d50f01 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -10,6 +10,7 @@
 import textwrap
 import tarfile
 import urlparse
+import StringIO
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
@@ -296,18 +297,19 @@ def create_sdist():
         doesn't exist)
         """
         with tempdir_context() as d:
-            with open('setup.py', 'wb') as setup_script:
-                setup_script.write(textwrap.dedent("""
-                    import setuptools
-                    setuptools.setup(
-                        name="distribute-test-fetcher",
-                        version="1.0",
-                        setup_requires = ['does-not-exist'],
-                    )
-                    """).lstrip())
+            setup_py = tarfile.TarInfo(name="setup.py")
+            setup_py_bytes = StringIO.StringIO(textwrap.dedent("""
+                import setuptools
+                setuptools.setup(
+                    name="distribute-test-fetcher",
+                    version="1.0",
+                    setup_requires = ['does-not-exist'],
+                )
+                """).lstrip())
+            setup_py.size = len(setup_py_bytes.buf)
             dist_path = os.path.join(d, 'distribute-test-fetcher-1.0.tar.gz')
             with tarfile.open(dist_path, 'w:gz') as dist:
-                dist.add('setup.py')
+                dist.addfile(setup_py, fileobj=setup_py_bytes)
             yield dist_path
 
 @contextlib.contextmanager

From bf87c16fce3253d13370f9aa5a99473e646e439a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 13:26:44 -0400
Subject: [PATCH 3425/8469] Set the argv context so that easy_install.main
 invokes the command as if it had been run from the command-line

--HG--
branch : distribute
extra : rebase_source : 4916aebae87b1d83dc27b494715c89dce1ce1e12
---
 setuptools/tests/test_easy_install.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3f38d50f01..bec03ab594 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -281,11 +281,11 @@ def test_setup_requires_honors_fetch_params(self):
                         '--allow-hosts', p_index_loc,
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
-                    # attempt to install the dist. It should fail because
-                    #  our fake server can't actually supply the dependency
-                    self.assertRaises(SystemExit,
-                        easy_install_pkg.main, ei_params)
-                #self.assertTrue(os.listdir(temp_install_dir))
+                    with argv_context(['easy_install']):
+                        # attempt to install the dist. It should fail because
+                        #  it doesn't exist.
+                        self.assertRaises(SystemExit,
+                            easy_install_pkg.main, ei_params)
         self.assertEqual(len(p_index.requests), 2)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
@@ -333,3 +333,10 @@ def environment_context(**updates):
         for key in updates:
             del os.environ[key]
         os.environ.update(old_env)
+
+@contextlib.contextmanager
+def argv_context(repl):
+    old_argv = sys.argv[:]
+    sys.argv[:] = repl
+    yield
+    sys.argv[:] = old_argv

From ed8d0afca6d513359e16b9e9acf409dd430b50de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 13:43:29 -0400
Subject: [PATCH 3426/8469] Added another context to reset the
 _setup_stop_context

--HG--
branch : distribute
extra : rebase_source : b31f921755cea6d2559c9f24f42b737aa80198e7
---
 setuptools/tests/test_easy_install.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index bec03ab594..c5fb4d9d6e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -11,6 +11,7 @@
 import tarfile
 import urlparse
 import StringIO
+import distutils.core
 
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
@@ -281,11 +282,12 @@ def test_setup_requires_honors_fetch_params(self):
                         '--allow-hosts', p_index_loc,
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
-                    with argv_context(['easy_install']):
-                        # attempt to install the dist. It should fail because
-                        #  it doesn't exist.
-                        self.assertRaises(SystemExit,
-                            easy_install_pkg.main, ei_params)
+                    with reset_setup_stop_context():
+                        with argv_context(['easy_install']):
+                            # attempt to install the dist. It should fail because
+                            #  it doesn't exist.
+                            self.assertRaises(SystemExit,
+                                easy_install_pkg.main, ei_params)
         self.assertEqual(len(p_index.requests), 2)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
@@ -340,3 +342,16 @@ def argv_context(repl):
     sys.argv[:] = repl
     yield
     sys.argv[:] = old_argv
+
+@contextlib.contextmanager
+def reset_setup_stop_context():
+    """
+    When the distribute tests are run using setup.py test, and then
+    one wants to invoke another setup() command (such as easy_install)
+    within those tests, it's necessary to reset the global variable
+    in distutils.core so that the setup() command will run naturally.
+    """
+    setup_stop_after = distutils.core._setup_stop_after
+    distutils.core._setup_stop_after = None
+    yield
+    distutils.core._setup_stop_after = setup_stop_after

From 2d43eef466ba091d132cd3da740770c686d19444 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 13:51:20 -0400
Subject: [PATCH 3427/8469] Make sure to un-monkey-patch the Distribution class
 when running test_no_setup_cfg. Otherwise, it breaks other tests (notably the
 new test_setup_requires_honors_fetch_params).

--HG--
branch : distribute
extra : rebase_source : f54d67ea495c18ff1dc74d12ff96797e64abe5e1
---
 setuptools/tests/test_easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c5fb4d9d6e..d89c8ae34e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -103,7 +103,7 @@ def _parse_command_line(self):
             opts = self.command_options
             if 'easy_install' in opts:
                 assert 'find_links' not in opts['easy_install'], msg
-            return self._old_parse_command_line
+            return self._old_parse_command_line()
 
         Distribution._old_parse_command_line = Distribution.parse_command_line
         Distribution.parse_command_line = _parse_command_line
@@ -115,6 +115,7 @@ def _parse_command_line(self):
         finally:
             os.chdir(old_wd)
             shutil.rmtree(dir)
+            Distribution.parse_command_line = Distribution._old_parse_command_line
 
     def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at

From 6f830000f642af576434c52c7d229584ee0fdbd1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 13:52:20 -0400
Subject: [PATCH 3428/8469] Add requests to the instance, so it's always
 available even if no requests were made.

--HG--
branch : distribute
extra : rebase_source : b4bf42ec3470eda7ccef8e05aaf1944b450cf5e9
---
 setuptools/tests/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 8e06cc1d9f..8a149d36be 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -72,6 +72,7 @@ def __init__(self, server_address=('', 0),
             bind_and_activate)
         threading.Thread.__init__(self)
         self.daemon = True
+        self.requests = []
 
     def run(self):
         self.serve_forever()

From 4de50ce1877161a6a5ea332c40bcbfafa5dc2994 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Apr 2012 00:04:35 +0000
Subject: [PATCH 3429/8469] Converted new tests in test_easy_install to use
 call-back functions instead of with statements for Python2.4 compatibility.

--HG--
branch : distribute
extra : rebase_source : e7edcca83dc29038a6832501a0a8251f4f3856a6
---
 setuptools/tests/test_easy_install.py | 83 +++++++++++++++++----------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index d89c8ae34e..5cf136df03 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -275,31 +275,43 @@ def test_setup_requires_honors_fetch_params(self):
         p_index = setuptools.tests.server.MockServer()
         p_index.start()
         p_index_loc = urlparse.urlparse(p_index.url).netloc
-        # create an sdist that has a build-time dependency.
-        with TestSetupRequires.create_sdist() as dist_file:
-            with tempdir_context() as temp_install_dir:
-                with environment_context(PYTHONPATH=temp_install_dir):
+
+        # I realize this is all-but-impossible to read, because it was
+        #  ported from some well-factored, safe code using 'with'. If you
+        #  need to maintain this code, consider making the changes in
+        #  the parent revision (of this comment) and then port the changes
+        #  back for Python 2.4 (or deprecate Python 2.4).
+
+        def install(dist_file):
+            def install_at(temp_install_dir):
+                def install_env():
                     ei_params = ['--index-url', p_index.url,
                         '--allow-hosts', p_index_loc,
                         '--exclude-scripts', '--install-dir', temp_install_dir,
                         dist_file]
-                    with reset_setup_stop_context():
-                        with argv_context(['easy_install']):
+                    def install_clean_reset():
+                        def install_clean_argv():
                             # attempt to install the dist. It should fail because
                             #  it doesn't exist.
                             self.assertRaises(SystemExit,
                                 easy_install_pkg.main, ei_params)
+                        argv_context(install_clean_argv, ['easy_install'])
+                    reset_setup_stop_context(install_clean_reset)
+                environment_context(install_env, PYTHONPATH=temp_install_dir)
+            tempdir_context(install_at)
+
+        # create an sdist that has a build-time dependency.
+        self.create_sdist(install)
+
         self.assertEqual(len(p_index.requests), 2)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
-    @staticmethod
-    @contextlib.contextmanager
-    def create_sdist():
+    def create_sdist(self, installer):
         """
-        Return an sdist with a setup_requires dependency (of something that
-        doesn't exist)
+        Create an sdist with a setup_requires dependency (of something that
+        doesn't exist) and invoke installer on it.
         """
-        with tempdir_context() as d:
+        def build_sdist(dir):
             setup_py = tarfile.TarInfo(name="setup.py")
             setup_py_bytes = StringIO.StringIO(textwrap.dedent("""
                 import setuptools
@@ -310,42 +322,53 @@ def create_sdist():
                 )
                 """).lstrip())
             setup_py.size = len(setup_py_bytes.buf)
-            dist_path = os.path.join(d, 'distribute-test-fetcher-1.0.tar.gz')
-            with tarfile.open(dist_path, 'w:gz') as dist:
+            dist_path = os.path.join(dir, 'distribute-test-fetcher-1.0.tar.gz')
+            dist = tarfile.open(dist_path, 'w:gz')
+            try:
                 dist.addfile(setup_py, fileobj=setup_py_bytes)
-            yield dist_path
+            finally:
+                dist.close()
+            installer(dist_path)
+        tempdir_context(build_sdist)
 
-@contextlib.contextmanager
-def tempdir_context(cd=lambda dir:None):
+def tempdir_context(f, cd=lambda dir:None):
+    """
+    Invoke f in the context
+    """
     temp_dir = tempfile.mkdtemp()
     orig_dir = os.getcwd()
     try:
         cd(temp_dir)
-        yield temp_dir
+        f(temp_dir)
     finally:
         cd(orig_dir)
         shutil.rmtree(temp_dir)
 
-@contextlib.contextmanager
-def environment_context(**updates):
+def environment_context(f, **updates):
+    """
+    Invoke f in the context
+    """
     old_env = os.environ.copy()
     os.environ.update(updates)
     try:
-        yield
+        f()
     finally:
         for key in updates:
             del os.environ[key]
         os.environ.update(old_env)
 
-@contextlib.contextmanager
-def argv_context(repl):
+def argv_context(f, repl):
+    """
+    Invoke f in the context
+    """
     old_argv = sys.argv[:]
     sys.argv[:] = repl
-    yield
-    sys.argv[:] = old_argv
+    try:
+        f()
+    finally:
+        sys.argv[:] = old_argv
 
-@contextlib.contextmanager
-def reset_setup_stop_context():
+def reset_setup_stop_context(f):
     """
     When the distribute tests are run using setup.py test, and then
     one wants to invoke another setup() command (such as easy_install)
@@ -354,5 +377,7 @@ def reset_setup_stop_context():
     """
     setup_stop_after = distutils.core._setup_stop_after
     distutils.core._setup_stop_after = None
-    yield
-    distutils.core._setup_stop_after = setup_stop_after
+    try:
+        f()
+    finally:
+        distutils.core._setup_stop_after = setup_stop_after

From ad62e5caa3126d490127e486c92850afe36382a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Apr 2012 00:11:57 +0000
Subject: [PATCH 3430/8469] Removed unused import

--HG--
branch : distribute
extra : rebase_source : 4bad5e1f1f1e377a8cb5ade411a8ad572f85abb6
---
 setuptools/tests/test_easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 5cf136df03..9cf3441d55 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -6,7 +6,6 @@
 import tempfile
 import unittest
 import site
-import contextlib
 import textwrap
 import tarfile
 import urlparse

From 94f0f93eb75b4ad956a1a1d602cfcc2405268b9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Apr 2012 00:22:47 +0000
Subject: [PATCH 3431/8469] Removed bind_and_activate parameters (not
 compatible with Python 2.4

--HG--
branch : distribute
extra : rebase_source : bf2288bbb5fccc4aad0b8a09f5a444e0246c412e
---
 setuptools/tests/server.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 8a149d36be..6b9fe6ace9 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -19,10 +19,8 @@ class IndexServer(HTTPServer):
         s.stop()
     """
     def __init__(self, server_address=('', 0),
-            RequestHandlerClass=SimpleHTTPRequestHandler,
-            bind_and_activate=True):
-        HTTPServer.__init__(self, server_address, RequestHandlerClass,
-            bind_and_activate)
+            RequestHandlerClass=SimpleHTTPRequestHandler):
+        HTTPServer.__init__(self, server_address, RequestHandlerClass)
         self._run = True
 
     def serve(self):
@@ -66,10 +64,8 @@ class MockServer(HTTPServer, threading.Thread):
     A simple HTTP Server that records the requests made to it.
     """
     def __init__(self, server_address=('', 0),
-            RequestHandlerClass=RequestRecorder,
-            bind_and_activate=True):
-        HTTPServer.__init__(self, server_address, RequestHandlerClass,
-            bind_and_activate)
+            RequestHandlerClass=RequestRecorder):
+        HTTPServer.__init__(self, server_address, RequestHandlerClass)
         threading.Thread.__init__(self)
         self.daemon = True
         self.requests = []

From 1b9b6071393b5b40921c0f6bbf95fcceed8029d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Apr 2012 00:29:34 +0000
Subject: [PATCH 3432/8469] Fixed two issues for Python 2.4 compatibility.
 Tests now run again on Python 2.4

--HG--
branch : distribute
extra : rebase_source : c6dc5ce8070ec42190d4d8eb6af28523d447f962
---
 setuptools/tests/server.py            | 2 +-
 setuptools/tests/test_easy_install.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 6b9fe6ace9..7b5cacb934 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -67,7 +67,7 @@ def __init__(self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
         HTTPServer.__init__(self, server_address, RequestHandlerClass)
         threading.Thread.__init__(self)
-        self.daemon = True
+        self.setDaemon(True)
         self.requests = []
 
     def run(self):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 9cf3441d55..3f9b77242b 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -273,7 +273,8 @@ def test_setup_requires_honors_fetch_params(self):
         # set up a server which will simulate an alternate package index.
         p_index = setuptools.tests.server.MockServer()
         p_index.start()
-        p_index_loc = urlparse.urlparse(p_index.url).netloc
+        netloc = 1
+        p_index_loc = urlparse.urlparse(p_index.url)[netloc]
 
         # I realize this is all-but-impossible to read, because it was
         #  ported from some well-factored, safe code using 'with'. If you

From 01fccfb21c330195ff03515446460fddf0d54e52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 22:23:33 -0400
Subject: [PATCH 3433/8469] Added tag 0.6.26 for changeset b69f072c0002

--HG--
branch : distribute
extra : rebase_source : 854566f5be373b1e82cd296c77fc887b214ec48f
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 19680f4f2e..dbe06104fb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -34,3 +34,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
 7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
 6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25
+b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26

From a17a1c96caac7e6d602a750281dae564c56568cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Apr 2012 22:24:01 -0400
Subject: [PATCH 3434/8469] Bumped to 0.6.27 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 0addbfe4e10e6ce8b94bf4b2916079bce91bca7f
---
 README.txt                           |   6 +-
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 distribute_setup.py                  |   2 +-
 docs/conf.py                         |   4 +-
 release.py                           |   2 +-
 setup.py                             |   2 +-
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/README.txt b/README.txt
index bc9b8454be..fadc7d7935 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz
-    $ tar -xzvf distribute-0.6.26.tar.gz
-    $ cd distribute-0.6.26
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.27.tar.gz
+    $ tar -xzvf distribute-0.6.27.tar.gz
+    $ cd distribute-0.6.27
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2965458969..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/distribute_setup.py b/distribute_setup.py
index 3bc42fa148..ba46350d28 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.26"
+DEFAULT_VERSION = "0.6.27"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 80d8c0e150..5312272f6b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.26'
+version = '0.6.27'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.26'
+release = '0.6.27'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index c6ae00d54b..f889af99f0 100644
--- a/release.py
+++ b/release.py
@@ -12,7 +12,7 @@
 import os
 import sys
 
-VERSION = '0.6.26'
+VERSION = '0.6.27'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index d6c8ee0d34..7fac7f0143 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.26"
+VERSION = "0.6.27"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From e296a811339390d932989b039ec40824a94c6024 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Apr 2012 17:11:09 -0400
Subject: [PATCH 3435/8469] Fixed one failing test per #277.

--HG--
branch : distribute
extra : rebase_source : cc573d913c6c034204bcb0d6ada6d978aeabc0cd
---
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..2965458969 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+

From abcb749df3c0d99caffa76a575f6e01b37002ea6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Apr 2012 17:34:20 -0400
Subject: [PATCH 3436/8469] Fix one failing test per #277

--HG--
branch : distribute
extra : rebase_source : 74d2107a0e4f5ecda5030fa8610dfd38a2bd5740
---
 distribute.egg-info/entry_points.txt  | 124 +++++++++++++-------------
 setuptools/tests/test_easy_install.py |   2 +-
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2965458969..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3f9b77242b..5577dd6a34 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -321,7 +321,7 @@ def build_sdist(dir):
                     setup_requires = ['does-not-exist'],
                 )
                 """).lstrip())
-            setup_py.size = len(setup_py_bytes.buf)
+            setup_py.size = len(setup_py_bytes.getvalue())
             dist_path = os.path.join(dir, 'distribute-test-fetcher-1.0.tar.gz')
             dist = tarfile.open(dist_path, 'w:gz')
             try:

From d4855653e3edb3801094088e0c2b1514b02b6b86 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 19:04:04 -0400
Subject: [PATCH 3437/8469] bump to 2.7.3 final

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index a137950efb..036062cc33 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.3rc2"
+__version__ = "2.7.3"
 #--end constants--

From c2f6398480d1b115bb8436ba7b5fba0e64de251a Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Tue, 10 Apr 2012 10:59:35 -0400
Subject: [PATCH 3438/8469] Bump to 2.6.8

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 141b377b94..e5008c9717 100644
--- a/__init__.py
+++ b/__init__.py
@@ -22,5 +22,5 @@
 #
 
 #--start constants--
-__version__ = "2.6.8rc2"
+__version__ = "2.6.8"
 #--end constants--

From ad8c62a6235689d9f30f55dbb3a7547ba9961d89 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 10 Apr 2012 19:28:09 +0200
Subject: [PATCH 3439/8469] Bump to 3.2.3 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index d8d61c5432..b52a9fe6c4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.3rc2"
+__version__ = "3.2.3"
 #--end constants--

From 6d3883d96d604548dc1f6e5229c24595773b0655 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Apr 2012 13:30:09 -0400
Subject: [PATCH 3440/8469] Fixed issue where some functions are excluded from
 the depends module on certain platforms.

--HG--
branch : distribute
extra : rebase_source : d689792420ad98950659e80782b4353da3560403
---
 setuptools/tests/__init__.py | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fec3854d3d..db563766a9 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -12,8 +12,9 @@
 import unittest
 
 import setuptools.dist
+import setuptools.depends as dep
 from setuptools import Feature
-from setuptools.depends import Require, find_module, get_module_constant, extract_constant
+from setuptools.depends import Require
 
 def additional_tests():
     suite = unittest.TestSuite((
@@ -45,7 +46,9 @@ def makeSetup(**args):
 class DependsTests(unittest.TestCase):
 
     def testExtractConst(self):
-        if not extract_constant: return  # skip on non-bytecode platforms
+        if not hasattr(dep, 'extract_constant'):
+            # skip on non-bytecode platforms
+            return
 
         def f1():
             global x,y,z
@@ -53,38 +56,43 @@ def f1():
             y = z
 
         # unrecognized name
-        self.assertEqual(extract_constant(f1.func_code,'q', -1), None)
+        self.assertEqual(dep.extract_constant(f1.func_code,'q', -1), None)
 
         # constant assigned
-        self.assertEqual(extract_constant(f1.func_code,'x', -1), "test")
+        self.assertEqual(dep.extract_constant(f1.func_code,'x', -1), "test")
 
         # expression assigned
-        self.assertEqual(extract_constant(f1.func_code,'y', -1), -1)
+        self.assertEqual(dep.extract_constant(f1.func_code,'y', -1), -1)
 
         # recognized name, not assigned
-        self.assertEqual(extract_constant(f1.func_code,'z', -1), None)
+        self.assertEqual(dep.extract_constant(f1.func_code,'z', -1), None)
 
 
     def testFindModule(self):
-        self.assertRaises(ImportError, find_module, 'no-such.-thing')
-        self.assertRaises(ImportError, find_module, 'setuptools.non-existent')
-        f,p,i = find_module('setuptools.tests'); f.close()
+        self.assertRaises(ImportError, dep.find_module, 'no-such.-thing')
+        self.assertRaises(ImportError, dep.find_module, 'setuptools.non-existent')
+        f,p,i = dep.find_module('setuptools.tests'); f.close()
 
     def testModuleExtract(self):
-        if not get_module_constant: return  # skip on non-bytecode platforms
+        if not hasattr(dep, 'get_module_constant'):
+            # skip on non-bytecode platforms
+            return
+
         from email import __version__
         self.assertEqual(
-            get_module_constant('email','__version__'), __version__
+            dep.get_module_constant('email','__version__'), __version__
         )
         self.assertEqual(
-            get_module_constant('sys','version'), sys.version
+            dep.get_module_constant('sys','version'), sys.version
         )
         self.assertEqual(
-            get_module_constant('setuptools.tests','__doc__'),__doc__
+            dep.get_module_constant('setuptools.tests','__doc__'),__doc__
         )
 
     def testRequire(self):
-        if not extract_constant: return  # skip on non-bytecode platforms
+        if not hasattr(dep, 'extract_constant'):
+            # skip on non-bytecode platformsh
+            return
 
         req = Require('Email','1.0.3','email')
 

From 4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Apr 2012 18:17:54 +0000
Subject: [PATCH 3441/8469] Fixed test failures in the doctests on Python 3.

--HG--
branch : distribute
extra : rebase_source : e3c57d5c2650be765d7e152e191f7c7a0e7c578d
---
 setuptools/tests/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fec3854d3d..78ac920ffc 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,6 +1,7 @@
 """Tests for the 'setuptools' package"""
 import sys
 import os
+import unittest
 import doctest
 import distutils.core
 import distutils.cmd
@@ -9,13 +10,12 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-import unittest
-
 import setuptools.dist
 from setuptools import Feature
 from setuptools.depends import Require, find_module, get_module_constant, extract_constant
 
 def additional_tests():
+    import doctest, unittest
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
             os.path.join('tests', 'api_tests.txt'),

From 856ff28c515c35ad35db6661d0b74579f59c3e4c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Apr 2012 18:31:52 +0000
Subject: [PATCH 3442/8469] Ensure that the setup.py is generated as bytes on
 Python 2 and 3 so that the tarfile module will accept it.

--HG--
branch : distribute
extra : rebase_source : 07afe24875bff3a4892319e02ae66be0d3725c8e
---
 setuptools/tests/test_easy_install.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 5577dd6a34..cf2f91d696 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -313,14 +313,19 @@ def create_sdist(self, installer):
         """
         def build_sdist(dir):
             setup_py = tarfile.TarInfo(name="setup.py")
-            setup_py_bytes = StringIO.StringIO(textwrap.dedent("""
+            try:
+                # Python 3 (StringIO gets converted to io module)
+                MemFile = StringIO.BytesIO
+            except AttributeError:
+                MemFile = StringIO.StringIO
+            setup_py_bytes = MemFile(textwrap.dedent("""
                 import setuptools
                 setuptools.setup(
                     name="distribute-test-fetcher",
                     version="1.0",
                     setup_requires = ['does-not-exist'],
                 )
-                """).lstrip())
+                """).lstrip().encode('utf-8'))
             setup_py.size = len(setup_py_bytes.getvalue())
             dist_path = os.path.join(dir, 'distribute-test-fetcher-1.0.tar.gz')
             dist = tarfile.open(dist_path, 'w:gz')

From 347b49d545fbd9e8b2ef50f0778507fce84d2b19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Apr 2012 11:41:46 -0400
Subject: [PATCH 3443/8469] Skip test when MockServer can't detect the port to
 which it bound.

--HG--
branch : distribute
extra : rebase_source : c59caee49fcfb2e0d9b507fb1a01dfb2ddcdcdc8
---
 setuptools/tests/test_easy_install.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index cf2f91d696..6fd45e8bed 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -275,6 +275,10 @@ def test_setup_requires_honors_fetch_params(self):
         p_index.start()
         netloc = 1
         p_index_loc = urlparse.urlparse(p_index.url)[netloc]
+        if p_index_loc.endswith(':0'):
+            # Some platforms (Jython) don't find a port to which to bind,
+            #  so skip this test for them.
+            return
 
         # I realize this is all-but-impossible to read, because it was
         #  ported from some well-factored, safe code using 'with'. If you

From 1e64c9a55bc6e7b4560966b95c831d6ee8276295 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Apr 2012 13:35:52 -0400
Subject: [PATCH 3444/8469] Split one test 'bad urls' into several different
 tests (for clarity).

--HG--
branch : distribute
extra : rebase_source : cdc7ce4fe999eb578df356ec6a2d44b65312d7d9
---
 setuptools/tests/test_packageindex.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 00d44ca689..3a8808f7ae 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,15 +1,15 @@
 """Package Index Tests
 """
-# More would be better!
 import sys
-import os, shutil, tempfile, unittest, urllib2
+import unittest
+import urllib2
 import pkg_resources
 import setuptools.package_index
 from server import IndexServer
 
 class TestPackageIndex(unittest.TestCase):
 
-    def test_bad_urls(self):
+    def test_bad_url_bad_port(self):
         index = setuptools.package_index.PackageIndex()
         url = 'http://127.0.0.1:0/nonesuch/test_package_index'
         try:
@@ -19,6 +19,7 @@ def test_bad_urls(self):
         else:
             self.assert_(isinstance(v,urllib2.HTTPError))
 
+    def test_bad_url_typo(self):
         # issue 16
         # easy_install inquant.contentmirror.plone breaks because of a typo
         # in its home URL
@@ -34,6 +35,11 @@ def test_bad_urls(self):
         else:
             self.assert_(isinstance(v, urllib2.HTTPError))
 
+    def test_bad_url_bad_status_line(self):
+        index = setuptools.package_index.PackageIndex(
+            hosts=('www.example.com',)
+        )
+
         def _urlopen(*args):
             import httplib
             raise httplib.BadStatusLine('line')
@@ -51,6 +57,11 @@ def _urlopen(*args):
         finally:
             urllib2.urlopen = old_urlopen
 
+    def test_bad_url_double_scheme(self):
+        index = setuptools.package_index.PackageIndex(
+            hosts=('www.example.com',)
+        )
+
         # issue 20
         url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
         try:
@@ -58,6 +69,10 @@ def _urlopen(*args):
         except Exception, v:
             self.assert_('nonnumeric port' in str(v))
 
+    def test_bad_url_screwy_href(self):
+        index = setuptools.package_index.PackageIndex(
+            hosts=('www.example.com',)
+        )
 
         # issue #160
         if sys.version_info[0] == 2 and sys.version_info[1] == 7:
@@ -67,7 +82,6 @@ def _urlopen(*args):
                     'http://www.famfamfam.com/">')
             index.process_index(url, page)
 
-
     def test_url_ok(self):
         index = setuptools.package_index.PackageIndex(
             hosts=('www.example.com',)

From 9f2aec42c42499d265215db77cc0e242711e034b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Apr 2012 13:36:30 -0400
Subject: [PATCH 3445/8469] Skip another test that fails on Jython due to port
 0 binding behavior.

--HG--
branch : distribute
extra : rebase_source : 7cd547b51b3db433b6f3040f01b1533065af3d96
---
 setuptools/tests/test_packageindex.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 3a8808f7ae..1319547ba6 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -104,6 +104,10 @@ def test_links_priority(self):
           is used
         -> Distribute should use the link from pypi, not the external one.
         """
+        if sys.platform.startswith('java'):
+            # Skip this test on jython because binding to :0 fails
+            return
+
         # start an index server
         server = IndexServer()
         server.start()

From 0f29131df992aff401a8157931e419570826acaa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Apr 2012 13:41:52 -0400
Subject: [PATCH 3446/8469] Allow for three requests (fixes test on Python
 3.3).

--HG--
branch : distribute
extra : rebase_source : 42f8c571b3296488b167aaa863bdbfa771f6a9d9
---
 setuptools/tests/test_easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6fd45e8bed..7c807fc365 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -307,7 +307,9 @@ def install_clean_argv():
         # create an sdist that has a build-time dependency.
         self.create_sdist(install)
 
-        self.assertEqual(len(p_index.requests), 2)
+        # there should have been two or three requests to the server
+        #  (three happens on Python 3.3a)
+        self.assert_(2 <= len(p_index.requests) <= 3)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
     def create_sdist(self, installer):

From b35960c77a05217ed4db1e7e9ec86570f4e9b6dc Mon Sep 17 00:00:00 2001
From: iElectric <none@none>
Date: Mon, 16 Apr 2012 12:46:12 +0200
Subject: [PATCH 3447/8469] In the bootstrap script, don't attempt to write the
 setuptools egg info if write permission isn't available. Fixes #231.

--HG--
branch : distribute
extra : rebase_source : 2815a510842f63905a58f6e446b3889a81944299
---
 CHANGES.txt         | 6 ++++++
 distribute_setup.py | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5e91876039..f6bece7454 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.27
+------
+
+* Issue #231: Don't fiddle with system python when used with buildout (bootstrap.py)
+
 ------
 0.6.26
 ------
diff --git a/distribute_setup.py b/distribute_setup.py
index ba46350d28..b8c4a11d65 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -306,6 +306,9 @@ def _create_fake_setuptools_pkg_info(placeholder):
         log.warn('%s already exists', pkg_info)
         return
 
+    if not os.access(pkg_info, os.W_OK):
+        log.warn("Don't have permissions to write %s, skipping", pkg_info)
+
     log.warn('Creating %s', pkg_info)
     f = open(pkg_info, 'w')
     try:

From 8b6d10f3443e8f9b8d662097d496392a4e7ed599 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Apr 2012 15:30:31 -0400
Subject: [PATCH 3448/8469] Fix typo in protocol_version. Thanks aclark!

--HG--
branch : distribute
extra : rebase_source : ab90cfb5cae3189b8d0c71c43992bc0273a7587a
---
 setuptools/command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 4bd6021d91..9f9366b5f1 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -92,7 +92,7 @@ def upload_file(self, command, pyversion, filename):
             comment = "built on %s" % platform.platform(terse=1)
         data = {
             ':action':'file_upload',
-            'protcol_version':'1',
+            'protocol_version':'1',
             'name':self.distribution.get_name(),
             'version':self.distribution.get_version(),
             'content':(basename,content),

From 76f2440a4dad4038f4d3aadcd64e33e9ef22ad6e Mon Sep 17 00:00:00 2001
From: Alex Clark <aclark@aclark.net>
Date: Sun, 22 Apr 2012 21:41:29 -0400
Subject: [PATCH 3449/8469] README.rst is now a standard

--HG--
branch : distribute
extra : rebase_source : 261a30d0a7ec63b1ff4918d7906476a19945b288
---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index c49839cdee..1f88e93b9f 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -155,7 +155,7 @@ def run(self):
                 dist_files.append(data)
 
     def add_defaults(self):
-        standards = [('README', 'README.txt'),
+        standards = [('README', 'README.rst', 'README.txt'),
                      self.distribution.script_name]
         for fn in standards:
             if isinstance(fn, tuple):

From 28325c120466506f957074f06e28789aef990b7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Apr 2012 22:39:03 -0400
Subject: [PATCH 3450/8469] Updated README

--HG--
branch : distribute
extra : rebase_source : 4f75a63385ffd1c6e8b2fe60761a88b6d74cabc6
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5e91876039..35c3aa3b35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.27
+------
+
+* Distribute now recognizes README.rst as a standard, default readme file.
+
 ------
 0.6.26
 ------

From b6b2642ba9df7a37d18256e403214bf02b656936 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Apr 2012 07:10:41 -0400
Subject: [PATCH 3451/8469] Added support for automatic milestone addition in
 release script

--HG--
branch : distribute
extra : rebase_source : acf505d50f886449aefa428e2ecd4555497dbe9e
---
 release.py | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/release.py b/release.py
index f889af99f0..4c9b960d2b 100644
--- a/release.py
+++ b/release.py
@@ -11,6 +11,14 @@
 import shutil
 import os
 import sys
+import urllib2
+import getpass
+import collections
+
+try:
+	import keyring
+except Exception:
+	pass
 
 VERSION = '0.6.27'
 
@@ -24,6 +32,40 @@ def get_next_version():
 files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
 	'README.txt', 'distribute_setup.py')
 
+def get_mercurial_creds(system='https://bitbucket.org', username=None):
+	"""
+	Return named tuple of username,password in much the same way that
+	Mercurial would (from the keyring).
+	"""
+	# todo: consider getting this from .hgrc
+	username = username or getpass.getuser()
+	keyring_username = '@@'.join((username, system))
+	system = '@'.join((keyring_username, 'Mercurial'))
+	password = (
+		keyring.get_password(system, keyring_username)
+		if 'keyring' in globals()
+		else None
+	)
+	if not password:
+		password = getpass.getpass()
+	Credential = collections.namedtuple('Credential', 'username password')
+	return Credential(username, password)
+
+def add_milestone(version=NEXT_VERSION):
+	auth = 'Basic ' + ':'.join(get_mercurial_creds()).encode('base64').strip()
+	headers = {
+		'Authorization': auth,
+		}
+	base = 'https://api.bitbucket.org'
+	url = (base + '/1.0/repositories/'
+		'{repo}/issues/milestones'.format(repo = 'tarek/distribute'))
+	req = urllib2.Request(url = url, headers = headers,
+		data='name='+version)
+	try:
+		urllib2.urlopen(req)
+	except Exception as e:
+		print(e.fp.read())
+
 def bump_versions():
 	list(map(bump_version, files_with_versions))
 
@@ -73,7 +115,7 @@ def do_release():
 	# push the changes
 	subprocess.check_call(['hg', 'push'])
 
-	# TODO: update bitbucket milestones and versions
+	add_milestone()
 
 def build_docs():
 	if os.path.isdir('docs/build'):

From 912d0ff09025b61aec9937350e809ebeeaca61f8 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 1 May 2012 09:35:18 +0200
Subject: [PATCH 3452/8469] Bump to 3.3.0a3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 661a8b6df4..d39d82eea1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0a2"
+__version__ = "3.3.0a3"
 #--end constants--

From eeb3f1916e5a11a35bd90351d5df6e199c5a383c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 2 May 2012 16:03:44 +0200
Subject: [PATCH 3453/8469] Add support for CPython 3.3.

--HG--
branch : distribute
extra : rebase_source : b2b90c6df17a19e6e9b876f13a9c3239e41fa141
---
 pkg_resources.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4cc73bb853..e8a737766b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,6 +1325,14 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
+try:
+    # CPython >=3.3
+    import _frozen_importlib
+except ImportError:
+    pass
+else:
+    register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)
+
 
 class EmptyProvider(NullProvider):
     """Provider that returns nothing for all requests"""
@@ -1759,6 +1767,14 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(ImpWrapper,find_on_path)
 
+try:
+    # CPython >=3.3
+    import _frozen_importlib
+except ImportError:
+    pass
+else:
+    register_finder(_frozen_importlib.FileFinder, find_on_path)
+
 _declare_state('dict', _namespace_handlers={})
 _declare_state('dict', _namespace_packages={})
 

From 021d9e02866e72c17cc39725d8138cb65a474c39 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 2 May 2012 18:03:54 +0200
Subject: [PATCH 3454/8469] Fix support for namespace packages with CPython
 3.3.

--HG--
branch : distribute
extra : rebase_source : 3d6c103fefe30d3115dacca58c1a08fd26d0d8fa
---
 pkg_resources.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index e8a737766b..a61c0efe1c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1874,6 +1874,14 @@ def file_ns_handler(importer, path_item, packageName, module):
 register_namespace_handler(ImpWrapper,file_ns_handler)
 register_namespace_handler(zipimport.zipimporter,file_ns_handler)
 
+try:
+    # CPython >=3.3
+    import _frozen_importlib
+except ImportError:
+    pass
+else:
+    register_namespace_handler(_frozen_importlib.FileFinder, file_ns_handler)
+
 
 def null_ns_handler(importer, path_item, packageName, module):
     return None

From 5be712ee48b86f32284e72c3b862002fd3dedd85 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 3 May 2012 07:57:09 +0200
Subject: [PATCH 3455/8469] Update CHANGES.txt.

--HG--
branch : distribute
extra : rebase_source : 3f28bda28c732ba7e5865d1b77903da972533e56
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 35c3aa3b35..f5a729a208 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.27
 ------
 
+* Support current snapshots of CPython 3.3.
 * Distribute now recognizes README.rst as a standard, default readme file.
 
 ------

From 8dde28ee529c74d578e8142dfbb0a537a8bf0414 Mon Sep 17 00:00:00 2001
From: Justin Azoff <justin@bouncybouncy.net>
Date: Sat, 12 May 2012 19:01:44 -0400
Subject: [PATCH 3456/8469] When writing out scripts, respect the users umask

--HG--
branch : distribute
extra : rebase_source : d4fc14bcdcd3e1a45da8bdcdef490537863ece35
---
 setuptools/command/easy_install.py    | 10 ++++++++--
 setuptools/command/install_scripts.py |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index dfd9f7ff8f..49a2c41e42 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -10,7 +10,7 @@
 __ http://packages.python.org/distribute/easy_install.html
 
 """
-import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
+import sys, os, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
@@ -762,12 +762,13 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
         target = os.path.join(self.script_dir, script_name)
         self.add_output(target)
 
+        mask = current_umask()
         if not self.dry_run:
             ensure_directory(target)
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target,0755)
+            chmod(target, 0777-mask)
 
 
 
@@ -1870,6 +1871,11 @@ def onerror(*args):
     except os.error:
         onerror(os.rmdir, path, sys.exc_info())
 
+def current_umask():
+    tmp = os.umask(022)
+    os.umask(tmp)
+    return tmp
+
 def bootstrap():
     # This function is called when setuptools*.egg is run using /bin/sh
     import setuptools; argv0 = os.path.dirname(setuptools.__path__[0])
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 6ce1b99319..8245603597 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -39,15 +39,16 @@ def run(self):
 
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
-        from setuptools.command.easy_install import chmod
+        from setuptools.command.easy_install import chmod, current_umask
         log.info("Installing %s script to %s", script_name, self.install_dir)
         target = os.path.join(self.install_dir, script_name)
         self.outfiles.append(target)
 
+        mask = current_umask()
         if not self.dry_run:
             ensure_directory(target)
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target,0755)
+            chmod(target, 0777-mask)
 

From 12525d2ac00aeffb77cc20ffbc37f58fd086330a Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian@python.org>
Date: Sun, 13 May 2012 11:19:23 -0500
Subject: [PATCH 3457/8469] Fix #13210. Port the Windows build from VS2008 to
 VS2010.

---
 command/build_ext.py           |   2 +-
 command/wininst-10.0-amd64.exe | Bin 0 -> 222208 bytes
 command/wininst-10.0.exe       | Bin 0 -> 190976 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 command/wininst-10.0-amd64.exe
 create mode 100644 command/wininst-10.0.exe

diff --git a/command/build_ext.py b/command/build_ext.py
index 59d0cd2df2..ac37c1320a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -197,7 +197,7 @@ def finalize_options(self):
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
             self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
-            if MSVC_VERSION == 9:
+            if MSVC_VERSION >= 9:
                 # Use the .lib files for the correct architecture
                 if self.plat_name == 'win32':
                     suffix = ''
diff --git a/command/wininst-10.0-amd64.exe b/command/wininst-10.0-amd64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..6fa0dce16315854223a9fefc3ac9f3cf71730a6a
GIT binary patch
literal 222208
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%0D;z%}>Bg{_Qn8shrI5z=3bwqSka?5yxFu
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%0DX
zOg?9JvDDc5_~<;-qIm^QAH~;#l}ER8lbWurQ+h+Ku640%AC@iu<cPO{e`Fs$irv~i
z`eFTOAuVyW&ZqPiw|Dep7t$wZG9uW1E4^ICi_Tst?YflM*i}oH+U?m@+Sk>%`ZQav
z&vnKlzIsa2r)@BzZL@}))~oUOUKBGj6cDG35%D9&sf`4&qgL16FD=xB9ezU{rA_}E
z8(Ko@(vL#mrx~m2XxFQ?E!X2Rg|?U96?S!<B+<ki?7*x0$5HI=khaTJ)M@Mp8Ebd(
zX~gu!4;_E}`SG?zQXK!N@uhp)vi9TJy<8QlXsd;KOqUTwM*LG5k>%Q9uOwaC<U`Bc
zS;_9WJyws~ZXK`GC#SJTVQ|U9&~jhnl2A?kg`*qlYA&c>R25uOSwCTk-JfQ{qS_@F
zRMsz<xOCEJ-;&Cj>cwpMWHza}aP*{!IioM?pX~EZi?A7--aG0PW1HfJBV;|hu*s&0
zIvyX#w7TGbHINGXm$8Q-y8>MutdE|IJ?(Db#-?AT!KJ~FFC>3299>yIvu0`SwZXd4
zzJ}`jMY1o_g`*c&hU$Z(FPe5vH14i}qw&Z1I4SjM=XA;Iv~!|`Cit{-Y<*tj&-dpS
N70sMIW8OSN{vUE=L&yLC

literal 0
HcmV?d00001

diff --git a/command/wininst-10.0.exe b/command/wininst-10.0.exe
new file mode 100644
index 0000000000000000000000000000000000000000..afc3bc6c14847283f32f53327184c6c2806efe0a
GIT binary patch
literal 190976
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

literal 0
HcmV?d00001


From f568de0c10f5d67ef9a91b8609997dbdf4ecce3d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:03:48 -0400
Subject: [PATCH 3458/8469] Exclude 'encodings' modules when removing modules
 from sys.modules. Workaround for #285. (Fixes #285)

--HG--
branch : distribute
extra : rebase_source : 913eaebbb0971a044d6087dc4faa2fdb4220def2
---
 CHANGES.txt           |  2 ++
 setuptools/sandbox.py | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f5a729a208..654aacf1f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 
 * Support current snapshots of CPython 3.3.
 * Distribute now recognizes README.rst as a standard, default readme file.
+* Exclude 'encodings' modules when removing modules from sys.modules.
+  Workaround for #285.
 
 ------
 0.6.26
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 8e0c09b5ea..ab2543d96f 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -39,8 +39,14 @@ def run_setup(setup_script, args):
     finally:
         pkg_resources.__setstate__(pr_state)
         sys.modules.update(save_modules)
-        for key in list(sys.modules):
-            if key not in save_modules: del sys.modules[key]
+        # remove any modules imported within the sandbox
+        del_modules = [
+            mod_name for mod_name in sys.modules
+            if mod_name not in save_modules
+            # exclude any encodings modules. See #285
+            and not mod_name.startswith('encodings.')
+        ]
+        map(sys.modules.__delitem__, del_modules)
         os.chdir(old_dir)
         sys.path[:] = save_path
         sys.argv[:] = save_argv

From dea3863e862efe853b36d0f9a532f6a97893a0c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:07:20 -0400
Subject: [PATCH 3459/8469] Update release script to also update versions

--HG--
branch : distribute
extra : rebase_source : b4091cc3eaa617c2b54387a02294dc8e922255ec
---
 release.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/release.py b/release.py
index 4c9b960d2b..05c072485d 100644
--- a/release.py
+++ b/release.py
@@ -51,20 +51,21 @@ def get_mercurial_creds(system='https://bitbucket.org', username=None):
 	Credential = collections.namedtuple('Credential', 'username password')
 	return Credential(username, password)
 
-def add_milestone(version=NEXT_VERSION):
+def add_milestone_and_version(version=NEXT_VERSION):
 	auth = 'Basic ' + ':'.join(get_mercurial_creds()).encode('base64').strip()
 	headers = {
 		'Authorization': auth,
 		}
 	base = 'https://api.bitbucket.org'
-	url = (base + '/1.0/repositories/'
-		'{repo}/issues/milestones'.format(repo = 'tarek/distribute'))
-	req = urllib2.Request(url = url, headers = headers,
-		data='name='+version)
-	try:
-		urllib2.urlopen(req)
-	except Exception as e:
-		print(e.fp.read())
+	for type in 'milestones', 'versions':
+		url = (base + '/1.0/repositories/{repo}/issues/{type}'
+			.format(repo = 'tarek/distribute', type=type))
+		req = urllib2.Request(url = url, headers = headers,
+			data='name='+version)
+		try:
+			urllib2.urlopen(req)
+		except Exception as e:
+			print(e.fp.read())
 
 def bump_versions():
 	list(map(bump_version, files_with_versions))

From 5132e62a273c53cf5b189e715a3f7d9aad993ea1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:08:24 -0400
Subject: [PATCH 3460/8469] Updated function referenc

--HG--
branch : distribute
extra : rebase_source : 75f094bf88afa66a81412e29dc9ed8bccec843ba
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 05c072485d..1eb468c1a5 100644
--- a/release.py
+++ b/release.py
@@ -116,7 +116,7 @@ def do_release():
 	# push the changes
 	subprocess.check_call(['hg', 'push'])
 
-	add_milestone()
+	add_milestone_and_version()
 
 def build_docs():
 	if os.path.isdir('docs/build'):

From adc4fbb184e9b410744cc1c91d4832b2235de2a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:43:21 -0400
Subject: [PATCH 3461/8469] Fixed failing test on Python 2.7.3 (and probably
 other recent patch releases)

--HG--
branch : distribute
extra : rebase_source : 02f36e126ad338fb224b0904cce9eca61269ea0a
---
 distribute.egg-info/entry_points.txt  | 124 +++++++++++++-------------
 setuptools/tests/test_packageindex.py |  10 ++-
 2 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..2965458969 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 3a8808f7ae..5e424dd659 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,6 +4,8 @@
 import unittest
 import urllib2
 import pkg_resources
+import httplib
+import distutils.errors
 import setuptools.package_index
 from server import IndexServer
 
@@ -66,8 +68,12 @@ def test_bad_url_double_scheme(self):
         url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
         try:
             index.open_url(url)
-        except Exception, v:
-            self.assert_('nonnumeric port' in str(v))
+        except distutils.errors.DistutilsError, error:
+            # Python 2.7.3
+            self.assert_('getaddrinfo failed' in str(error))
+        except httplib.InvalidURL, error:
+            # Python 2.7.2 and earlier
+            self.assert_('nonnumeric port' in str(error))
 
     def test_bad_url_screwy_href(self):
         index = setuptools.package_index.PackageIndex(

From c12a58c82e556d8cba9b4a083d597f0669279185 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:45:54 -0400
Subject: [PATCH 3462/8469] Added tag 0.6.27 for changeset 469c3b948e41

--HG--
branch : distribute
extra : rebase_source : 5c2f18fcc28a6d5d7b2d43185ed9832e9fc49f06
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dbe06104fb..93f0176332 100644
--- a/.hgtags
+++ b/.hgtags
@@ -35,3 +35,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
 6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25
 b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
+469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27

From 7b49853cb59e15b9c7432584bc57f18b38845333 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 May 2012 15:46:40 -0400
Subject: [PATCH 3463/8469] Bumped to 0.6.28 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : eb9a0f08f4b371984517f556638682828e7048b1
---
 README.txt                           |   6 +-
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 distribute_setup.py                  |   2 +-
 docs/conf.py                         |   4 +-
 release.py                           |   2 +-
 setup.py                             |   2 +-
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/README.txt b/README.txt
index fadc7d7935..5d025d6124 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.27.tar.gz
-    $ tar -xzvf distribute-0.6.27.tar.gz
-    $ cd distribute-0.6.27
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.28.tar.gz
+    $ tar -xzvf distribute-0.6.28.tar.gz
+    $ cd distribute-0.6.28
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2965458969..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/distribute_setup.py b/distribute_setup.py
index b8c4a11d65..59426c1f3d 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.27"
+DEFAULT_VERSION = "0.6.28"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 5312272f6b..e7011e26ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.27'
+version = '0.6.28'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.27'
+release = '0.6.28'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 1eb468c1a5..3ca2445c84 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.27'
+VERSION = '0.6.28'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 7fac7f0143..c4351b1e74 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.27"
+VERSION = "0.6.28"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 0863f8d2a11e722a31624503f028fca44eb19ee6 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 May 2012 03:45:29 +0100
Subject: [PATCH 3464/8469] Implemented PEP 405 (Python virtual environments).

---
 sysconfig.py | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 16902ca920..977962f748 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -18,6 +18,8 @@
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+BASE_PREFIX = os.path.normpath(sys.base_prefix)
+BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
 
 # Path to the base directory of the project. On Windows the binary may
 # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
@@ -39,11 +41,18 @@
 # different (hard-wired) directories.
 # Setup.local is available for Makefile builds including VPATH builds,
 # Setup.dist is available on Windows
-def _python_build():
+def _is_python_source_dir(d):
     for fn in ("Setup.dist", "Setup.local"):
-        if os.path.isfile(os.path.join(project_base, "Modules", fn)):
+        if os.path.isfile(os.path.join(d, "Modules", fn)):
             return True
     return False
+_sys_home = getattr(sys, '_home', None)
+if _sys_home and os.name == 'nt' and _sys_home.lower().endswith('pcbuild'):
+    _sys_home = os.path.dirname(_sys_home)
+def _python_build():
+    if _sys_home:
+        return _is_python_source_dir(_sys_home)
+    return _is_python_source_dir(project_base)
 python_build = _python_build()
 
 # Calculate the build qualifier flags if they are defined.  Adding the flags
@@ -74,11 +83,11 @@ def get_python_inc(plat_specific=0, prefix=None):
     otherwise, this is the path to platform-specific header files
     (namely pyconfig.h).
 
-    If 'prefix' is supplied, use it instead of sys.prefix or
-    sys.exec_prefix -- i.e., ignore 'plat_specific'.
+    If 'prefix' is supplied, use it instead of sys.base_prefix or
+    sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
     """
     if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
+        prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
     if os.name == "posix":
         if python_build:
             # Assume the executable is in the build directory.  The
@@ -86,11 +95,12 @@ def get_python_inc(plat_specific=0, prefix=None):
             # the build directory may not be the source directory, we
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
-            base = os.path.dirname(os.path.abspath(sys.executable))
+            base = _sys_home or os.path.dirname(os.path.abspath(sys.executable))
             if plat_specific:
                 return base
             else:
-                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+                incdir = os.path.join(_sys_home or get_config_var('srcdir'),
+                                      'Include')
                 return os.path.normpath(incdir)
         python_dir = 'python' + get_python_version() + build_flags
         return os.path.join(prefix, "include", python_dir)
@@ -115,11 +125,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     containing standard Python library modules; otherwise, return the
     directory for site-specific modules.
 
-    If 'prefix' is supplied, use it instead of sys.prefix or
-    sys.exec_prefix -- i.e., ignore 'plat_specific'.
+    If 'prefix' is supplied, use it instead of sys.base_prefix or
+    sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
     """
     if prefix is None:
-        prefix = plat_specific and EXEC_PREFIX or PREFIX
+        if standard_lib:
+            prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+        else:
+            prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
         libpython = os.path.join(prefix,
@@ -232,9 +245,9 @@ def get_config_h_filename():
     """Return full pathname of installed pyconfig.h file."""
     if python_build:
         if os.name == "nt":
-            inc_dir = os.path.join(project_base, "PC")
+            inc_dir = os.path.join(_sys_home or project_base, "PC")
         else:
-            inc_dir = project_base
+            inc_dir = _sys_home or project_base
     else:
         inc_dir = get_python_inc(plat_specific=1)
     if get_python_version() < '2.2':
@@ -248,7 +261,8 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+        return os.path.join(_sys_home or os.path.dirname(sys.executable),
+                                                         "Makefile")
     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
     return os.path.join(lib_dir, config_file, 'Makefile')

From 0c18116bf577816e509ed9d150d36a5a9eab36f3 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 May 2012 20:36:12 +0100
Subject: [PATCH 3465/8469] Addressed some buildbot errors and comments on the
 checkin by Antoine on python-dev.

---
 sysconfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 977962f748..59315f7279 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -47,7 +47,8 @@ def _is_python_source_dir(d):
             return True
     return False
 _sys_home = getattr(sys, '_home', None)
-if _sys_home and os.name == 'nt' and _sys_home.lower().endswith('pcbuild'):
+if _sys_home and os.name == 'nt' and \
+    _sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
     _sys_home = os.path.dirname(_sys_home)
 def _python_build():
     if _sys_home:

From da98f1c9ec9114743a3cacfad74a5ec37ac2281e Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sun, 27 May 2012 17:30:09 +0100
Subject: [PATCH 3466/8469] Fixed _sys_home computation and added diagnostics
 for Windows buildbot failures.

---
 sysconfig.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 59315f7279..e86cb23236 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -50,6 +50,8 @@ def _is_python_source_dir(d):
 if _sys_home and os.name == 'nt' and \
     _sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
     _sys_home = os.path.dirname(_sys_home)
+    if _sys_home.endswith('pcbuild'):   # must be amd64
+        _sys_home = os.path.dirname(_sys_home)
 def _python_build():
     if _sys_home:
         return _is_python_source_dir(_sys_home)

From 54589c574b5f5acf9ed54dac1e1d0915cb5dc1f0 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 28 May 2012 22:34:46 +1000
Subject: [PATCH 3467/8469] Issue #14443: Tell rpmbuild to use the correct
 version of Python

---
 command/bdist_rpm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 357eaa575e..401bc41872 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -190,7 +190,7 @@ def finalize_options(self):
             if self.fix_python:
                 self.python = sys.executable
             else:
-                self.python = "python"
+                self.python = "python3"
         elif self.fix_python:
             raise DistutilsOptionError(
                   "--python and --fix-python are mutually exclusive options")
@@ -320,6 +320,7 @@ def run(self):
             rpm_cmd.append('-bb')
         else:
             rpm_cmd.append('-ba')
+        rpm_cmd.extend(['--define', '__python %s' % self.python])
         if self.rpm3_mode:
             rpm_cmd.extend(['--define',
                              '_topdir %s' % os.path.abspath(self.rpm_base)])

From 844216fd4e4c528b8064a750ee0ab99f5e987894 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Wed, 30 May 2012 22:04:31 +0200
Subject: [PATCH 3468/8469] Bump version to 3.3.0a4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index d39d82eea1..0da0d849f1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0a3"
+__version__ = "3.3.0a4"
 #--end constants--

From 722052b5dff3066947f2051e4b0dd85166912f85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2012 14:37:45 -0400
Subject: [PATCH 3469/8469] Added improvements to release script to better
 support other projects (as this script has been copied to keyring).

--HG--
branch : distribute
extra : rebase_source : e8ffb18f4415c4146b78a9515fe7539e00445e34
---
 release.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/release.py b/release.py
index 3ca2445c84..487e6d584f 100644
--- a/release.py
+++ b/release.py
@@ -32,6 +32,16 @@ def get_next_version():
 files_with_versions = ('docs/conf.py', 'setup.py', 'release.py',
 	'README.txt', 'distribute_setup.py')
 
+def get_repo_name():
+	"""
+	Get the repo name from the hgrc default path.
+	"""
+	default = subprocess.check_output('hg paths default').strip()
+	parts = default.split('/')
+	if parts[-1] == '':
+		parts.pop()
+	return '/'.join(parts[-2:])
+
 def get_mercurial_creds(system='https://bitbucket.org', username=None):
 	"""
 	Return named tuple of username,password in much the same way that
@@ -59,12 +69,12 @@ def add_milestone_and_version(version=NEXT_VERSION):
 	base = 'https://api.bitbucket.org'
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
-			.format(repo = 'tarek/distribute', type=type))
+			.format(repo = get_repo_name(), type=type))
 		req = urllib2.Request(url = url, headers = headers,
 			data='name='+version)
 		try:
 			urllib2.urlopen(req)
-		except Exception as e:
+		except urllib2.HTTPError as e:
 			print(e.fp.read())
 
 def bump_versions():
@@ -96,12 +106,14 @@ def do_release():
 
 	subprocess.check_call(['hg', 'update', VERSION])
 
-	build_docs()
+	has_docs = build_docs()
 	if os.path.isdir('./dist'):
 		shutil.rmtree('./dist')
-	subprocess.check_call([sys.executable, 'setup.py',
-		'-q', 'egg_info', '-RD', '-b', '', 'sdist', 'register',
-		'upload', 'upload_docs'])
+	cmd = [sys.executable, 'setup.py', '-q', 'egg_info', '-RD', '-b', '',
+		'sdist', 'register', 'upload']
+	if has_docs:
+		cmd.append('upload_docs')
+	subprocess.check_call(cmd)
 	upload_bootstrap_script()
 
 	# update to the tip for the next operation
@@ -119,6 +131,8 @@ def do_release():
 	add_milestone_and_version()
 
 def build_docs():
+	if not os.path.isdir('docs'):
+		return
 	if os.path.isdir('docs/build'):
 		shutil.rmtree('docs/build')
 	subprocess.check_call([
@@ -129,6 +143,7 @@ def build_docs():
 		'build/html',
 		],
 		cwd='docs')
+	return True
 
 def upload_bootstrap_script():
 	scp_command = 'pscp' if sys.platform.startswith('win') else 'scp'

From d169177b19658f115db80d62c91593ca19bb5ee6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@python-works.com>
Date: Fri, 15 Jun 2012 10:12:17 +0200
Subject: [PATCH 3470/8469] pep8ify distribute_setup.py

--HG--
branch : distribute
extra : rebase_source : fdbb225bc46a65df53b248d75d62c3e3f744bdd7
---
 distribute_setup.py | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 59426c1f3d..8f5b0637bf 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -144,7 +144,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         except ImportError:
             return _do_download(version, download_base, to_dir, download_delay)
         try:
-            pkg_resources.require("distribute>="+version)
+            pkg_resources.require("distribute>=" + version)
             return
         except pkg_resources.VersionConflict:
             e = sys.exc_info()[1]
@@ -167,6 +167,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         if not no_fake:
             _create_fake_setuptools_pkg_info(to_dir)
 
+
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                         to_dir=os.curdir, delay=15):
     """Download distribute from a specified location and return its filename
@@ -203,6 +204,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
                 dst.close()
     return os.path.realpath(saveto)
 
+
 def _no_sandbox(function):
     def __no_sandbox(*args, **kw):
         try:
@@ -227,6 +229,7 @@ def violation(*args):
 
     return __no_sandbox
 
+
 def _patch_file(path, content):
     """Will backup the file then patch it"""
     existing_content = open(path).read()
@@ -245,15 +248,18 @@ def _patch_file(path, content):
 
 _patch_file = _no_sandbox(_patch_file)
 
+
 def _same_content(path, content):
     return open(path).read() == content
 
+
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
     log.warn('Renaming %s into %s', path, new_name)
     os.rename(path, new_name)
     return new_name
 
+
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
         log.warn('Unkown installation at %s', placeholder)
@@ -289,11 +295,13 @@ def _remove_flat_installation(placeholder):
 
 _remove_flat_installation = _no_sandbox(_remove_flat_installation)
 
+
 def _after_install(dist):
     log.warn('After install bootstrap.')
     placeholder = dist.get_command_obj('install').install_purelib
     _create_fake_setuptools_pkg_info(placeholder)
 
+
 def _create_fake_setuptools_pkg_info(placeholder):
     if not placeholder or not os.path.exists(placeholder):
         log.warn('Could not find the install location')
@@ -324,7 +332,10 @@ def _create_fake_setuptools_pkg_info(placeholder):
     finally:
         f.close()
 
-_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+_create_fake_setuptools_pkg_info = _no_sandbox(
+    _create_fake_setuptools_pkg_info
+)
+
 
 def _patch_egg_dir(path):
     # let's check if it's already patched
@@ -346,6 +357,7 @@ def _patch_egg_dir(path):
 
 _patch_egg_dir = _no_sandbox(_patch_egg_dir)
 
+
 def _before_install():
     log.warn('Before install bootstrap.')
     _fake_setuptools()
@@ -354,7 +366,7 @@ def _before_install():
 def _under_prefix(location):
     if 'install' not in sys.argv:
         return True
-    args = sys.argv[sys.argv.index('install')+1:]
+    args = sys.argv[sys.argv.index('install') + 1:]
     for index, arg in enumerate(args):
         for option in ('--root', '--prefix'):
             if arg.startswith('%s=' % option):
@@ -362,7 +374,7 @@ def _under_prefix(location):
                 return location.startswith(top_dir)
             elif arg == option:
                 if len(args) > index:
-                    top_dir = args[index+1]
+                    top_dir = args[index + 1]
                     return location.startswith(top_dir)
         if arg == '--user' and USER_SITE is not None:
             return location.startswith(USER_SITE)
@@ -379,11 +391,14 @@ def _fake_setuptools():
         return
     ws = pkg_resources.working_set
     try:
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
-                                  replacement=False))
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools', replacement=False)
+            )
     except TypeError:
         # old distribute API
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools')
+        )
 
     if setuptools_dist is None:
         log.warn('No setuptools distribution found')
@@ -425,7 +440,8 @@ def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
     # pip marker to avoid a relaunch bug
-    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+    _cmd = ['-c', 'install', '--single-version-externally-managed']
+    if sys.argv[:3] == _cmd:
         sys.argv[0] = 'setup.py'
     args = [sys.executable] + sys.argv
     sys.exit(subprocess.call(args))
@@ -451,7 +467,7 @@ def _extractall(self, path=".", members=None):
             # Extract directories with a safe mode.
             directories.append(tarinfo)
             tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 448 # decimal for oct 0700
+            tarinfo.mode = 448  # decimal for oct 0700
         self.extract(tarinfo, path)
 
     # Reverse sort directories.
@@ -477,16 +493,18 @@ def sorter(dir1, dir2):
             else:
                 self._dbg(1, "tarfile: %s" % e)
 
+
 def _build_install_args(argv):
     install_args = []
     user_install = '--user' in argv
-    if user_install and sys.version_info < (2,6):
+    if user_install and sys.version_info < (2, 6):
         log.warn("--user requires Python 2.6 or later")
         raise SystemExit(1)
     if user_install:
         install_args.append('--user')
     return install_args
 
+
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     tarball = download_setuptools()

From ec81bfe54962ae4f902e8536b5841e11402a6505 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 22 Jun 2012 23:33:19 -0400
Subject: [PATCH 3471/8469] find .dist-info distributions as well

--HG--
branch : distribute
extra : rebase_source : 9ec6872c031166c66743ee87d7018161aa415fb1
---
 pkg_resources.py | 61 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index a61c0efe1c..350a50ef22 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -15,6 +15,7 @@
 
 import sys, os, zipimport, time, re, imp, types
 from urlparse import urlparse, urlunparse
+from email.parser import Parser
 
 try:
     frozenset
@@ -1746,7 +1747,7 @@ def find_on_path(importer, path_item, only=False):
             # scan for .egg and .egg-info in directory
             for entry in os.listdir(path_item):
                 lower = entry.lower()
-                if lower.endswith('.egg-info'):
+                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
                     fullpath = os.path.join(path_item, entry)
                     if os.path.isdir(fullpath):
                         # egg-info directory, allow getting metadata
@@ -2119,6 +2120,8 @@ def _remove_md5_fragment(location):
 
 class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
+    PKG_INFO = 'PKG-INFO'
+    
     def __init__(self,
         location=None, metadata=None, project_name=None, version=None,
         py_version=PY_MAJOR, platform=None, precedence = EGG_DIST
@@ -2136,12 +2139,14 @@ def __init__(self,
     def from_location(cls,location,basename,metadata=None,**kw):
         project_name, version, py_version, platform = [None]*4
         basename, ext = os.path.splitext(basename)
-        if ext.lower() in (".egg",".egg-info"):
+        if ext.lower() in _distributionImpl:
+            # .dist-info gets much metadata differently
             match = EGG_NAME(basename)
             if match:
                 project_name, version, py_version, platform = match.group(
                     'name','ver','pyver','plat'
                 )
+            cls = _distributionImpl[ext.lower()]
         return cls(
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
@@ -2204,13 +2209,13 @@ def version(self):
         try:
             return self._version
         except AttributeError:
-            for line in self._get_metadata('PKG-INFO'):
+            for line in self._get_metadata(self.PKG_INFO):
                 if line.lower().startswith('version:'):
                     self._version = safe_version(line.split(':',1)[1].strip())
                     return self._version
             else:
                 raise ValueError(
-                    "Missing 'Version:' header and/or PKG-INFO file", self
+                    "Missing 'Version:' header and/or %s file" % self.PKG_INFO, self
                 )
     version = property(version)
 
@@ -2441,6 +2446,54 @@ def extras(self):
     extras = property(extras)
 
 
+class DistInfoDistribution(Distribution):
+    """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
+    PKG_INFO = 'METADATA'
+
+    @property
+    def _parsed_pkg_info(self):
+        """Parse and cache metadata"""
+        try:
+            return self._pkg_info
+        except AttributeError:
+            self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
+            return self._pkg_info
+    
+    @property
+    def _dep_map(self):
+        try:
+            return self.__dep_map
+        except AttributeError:
+            dm = self.__dep_map = {None: []}
+            # Including condition expressions
+            # XXX parse condition expressions, extras
+            reqs = self._parsed_pkg_info.get_all('Requires-Dist')
+#            extras = self._parsed_pkg_info.get_all('Provides-Extra') or []
+#            for extra,reqs in split_sections(self._get_metadata(name)):
+#                if extra: extra = safe_extra(extra)
+            dm.setdefault(None,[]).extend(parse_requirements(reqs))
+            return dm
+
+    def requires(self,extras=()):
+        """List of Requirements needed for this distro if `extras` are used"""
+        dm = self._dep_map
+        deps = []
+        deps.extend(dm.get(None,()))
+        for ext in extras:
+            try:
+                deps.extend(dm[safe_extra(ext)])
+            except KeyError:
+                raise UnknownExtra(
+                    "%s has no such extra feature %r" % (self, ext)
+                )
+        return deps
+
+
+_distributionImpl = {'.egg': Distribution,
+                     '.egg-info': Distribution,
+                     '.dist-info': DistInfoDistribution }
+
+
 def issue_warning(*args,**kw):
     level = 1
     g = globals()

From e562c287d7ac8c6e0f1d3642db817f049a7a6dd6 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sat, 23 Jun 2012 16:02:19 -0700
Subject: [PATCH 3472/8469] Issue #13590: Improve support for OS X Xcode 4: -
 Try to avoid building Python or extension modules with problematic   llvm-gcc
 compiler. - Since Xcode 4 removes ppc support, extension module builds now  
 check for ppc compiler support and automatically remove ppc and   ppc64 archs
 when not available. - Since Xcode 4 no longer install SDKs in default
 locations,   extension module builds now revert to using installed headers  
 and libs if the SDK used to build the interpreter is not   available. -
 Update ./configure to use better defaults for universal builds;   in
 particular, --enable-universalsdk=yes uses the Xcode default   SDK and
 --with-universal-archs now defaults to "intel" if ppc   not available.

---
 sysconfig.py     | 147 ++++++++++++++++++++++++++++++++++++-----------
 unixccompiler.py |  21 +++++--
 2 files changed, 131 insertions(+), 37 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index e86cb23236..dac3035f1b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -162,7 +162,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
-_USE_CLANG = None
+
 
 def customize_compiler(compiler):
     """Do any platform-specific customization of a CCompiler instance.
@@ -177,36 +177,7 @@ def customize_compiler(compiler):
 
         newcc = None
         if 'CC' in os.environ:
-            newcc = os.environ['CC']
-        elif sys.platform == 'darwin' and cc == 'gcc-4.2':
-            # Issue #13590:
-            #       Since Apple removed gcc-4.2 in Xcode 4.2, we can no
-            #       longer assume it is available for extension module builds.
-            #       If Python was built with gcc-4.2, check first to see if
-            #       it is available on this system; if not, try to use clang
-            #       instead unless the caller explicitly set CC.
-            global _USE_CLANG
-            if _USE_CLANG is None:
-                from distutils import log
-                from subprocess import Popen, PIPE
-                p = Popen("! type gcc-4.2 && type clang && exit 2",
-                                shell=True, stdout=PIPE, stderr=PIPE)
-                p.wait()
-                if p.returncode == 2:
-                    _USE_CLANG = True
-                    log.warn("gcc-4.2 not found, using clang instead")
-                else:
-                    _USE_CLANG = False
-            if _USE_CLANG:
-                newcc = 'clang'
-        if newcc:
-            # On OS X, if CC is overridden, use that as the default
-            #       command for LDSHARED as well
-            if (sys.platform == 'darwin'
-                    and 'LDSHARED' not in os.environ
-                    and ldshared.startswith(cc)):
-                ldshared = newcc + ldshared[len(cc):]
-            cc = newcc
+            cc = os.environ['CC']
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:
@@ -522,6 +493,29 @@ def _init_os2():
     _config_vars = g
 
 
+def _read_output(commandstring):
+    """
+    Returns os.popen(commandstring, "r").read(), but
+    without actually using os.popen because that
+    function is not usable during python bootstrap
+    """
+    # NOTE: tempfile is also not useable during
+    # bootstrap
+    import contextlib
+    try:
+        import tempfile
+        fp = tempfile.NamedTemporaryFile()
+    except ImportError:
+        fp = open("/tmp/distutils.%s"%(
+            os.getpid(),), "w+b")
+
+    with contextlib.closing(fp) as fp:
+        cmd = "%s >'%s'"%(commandstring, fp.name)
+        os.system(cmd)
+        data = fp.read()
+
+    return data.decode('utf-8')
+
 def get_config_vars(*args):
     """With no arguments, return a dictionary of all configuration
     variables relevant for the current platform.  Generally this includes
@@ -561,9 +555,70 @@ def get_config_vars(*args):
                 _config_vars['srcdir'] = os.path.normpath(srcdir)
 
         if sys.platform == 'darwin':
+            from distutils.spawn import find_executable
+
             kernel_version = os.uname()[2] # Kernel version (8.4.3)
             major_version = int(kernel_version.split('.')[0])
 
+            # Issue #13590:
+            #    The OSX location for the compiler varies between OSX
+            #    (or rather Xcode) releases.  With older releases (up-to 10.5)
+            #    the compiler is in /usr/bin, with newer releases the compiler
+            #    can only be found inside Xcode.app if the "Command Line Tools"
+            #    are not installed.
+            #
+            #    Futhermore, the compiler that can be used varies between
+            #    Xcode releases. Upto Xcode 4 it was possible to use 'gcc-4.2'
+            #    as the compiler, after that 'clang' should be used because
+            #    gcc-4.2 is either not present, or a copy of 'llvm-gcc' that
+            #    miscompiles Python.
+
+            # skip checks if the compiler was overriden with a CC env variable
+            if 'CC' not in os.environ:
+                cc = oldcc = _config_vars['CC']
+                if not find_executable(cc):
+                    # Compiler is not found on the shell search PATH.
+                    # Now search for clang, first on PATH (if the Command LIne
+                    # Tools have been installed in / or if the user has provided
+                    # another location via CC).  If not found, try using xcrun
+                    # to find an uninstalled clang (within a selected Xcode).
+
+                    # NOTE: Cannot use subprocess here because of bootstrap
+                    # issues when building Python itself (and os.popen is
+                    # implemented on top of subprocess and is therefore not
+                    # usable as well)
+
+                    data = (find_executable('clang') or
+                            _read_output(
+                                "/usr/bin/xcrun -find clang 2>/dev/null").strip())
+                    if not data:
+                        raise DistutilsPlatformError(
+                               "Cannot locate working compiler")
+
+                    _config_vars['CC'] = cc = data
+                    _config_vars['CXX'] = cc + '++'
+
+                elif os.path.basename(cc).startswith('gcc'):
+                    # Compiler is GCC, check if it is LLVM-GCC
+                    data = _read_output("'%s' --version 2>/dev/null"
+                                         % (cc.replace("'", "'\"'\"'"),))
+                    if 'llvm-gcc' in data:
+                        # Found LLVM-GCC, fall back to clang
+                        data = (find_executable('clang') or
+                                _read_output(
+                                    "/usr/bin/xcrun -find clang 2>/dev/null").strip())
+                        if find_executable(data):
+                            _config_vars['CC'] = cc = data
+                            _config_vars['CXX'] = cc + '++'
+
+                if (cc != oldcc
+                        and 'LDSHARED' in _config_vars
+                        and 'LDSHARED' not in os.environ):
+                    # modify LDSHARED if we modified CC
+                    ldshared = _config_vars['LDSHARED']
+                    if ldshared.startswith(oldcc):
+                        _config_vars['LDSHARED'] = cc + ldshared[len(oldcc):]
+
             if major_version < 8:
                 # On Mac OS X before 10.4, check if -arch and -isysroot
                 # are in CFLAGS or LDFLAGS and remove them if they are.
@@ -579,19 +634,45 @@ def get_config_vars(*args):
                     _config_vars[key] = flags
 
             else:
+                # Different Xcode releases support different sets for '-arch'
+                # flags. In particular, Xcode 4.x no longer supports the
+                # PPC architectures.
+                #
+                # This code automatically removes '-arch ppc' and '-arch ppc64'
+                # when these are not supported. That makes it possible to
+                # build extensions on OSX 10.7 and later with the prebuilt
+                # 32-bit installer on the python.org website.
+                flags = _config_vars['CFLAGS']
+                if re.search('-arch\s+ppc', flags) is not None:
+                    # NOTE: Cannot use subprocess here because of bootstrap
+                    # issues when building Python itself
+                    status = os.system("'%s' -arch ppc -x c /dev/null 2>/dev/null"%(
+                        _config_vars['CC'].replace("'", "'\"'\"'"),))
+
+                    if status != 0:
+                        # Compiler doesn't support PPC, remove the related
+                        # '-arch' flags.
+                        for key in ('LDFLAGS', 'BASECFLAGS',
+                            # a number of derived variables. These need to be
+                            # patched up as well.
+                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
+
+                            flags = _config_vars[key]
+                            flags = re.sub('-arch\s+ppc\w*\s', ' ', flags)
+                            _config_vars[key] = flags
+
 
                 # Allow the user to override the architecture flags using
                 # an environment variable.
                 # NOTE: This name was introduced by Apple in OSX 10.5 and
                 # is used by several scripting languages distributed with
                 # that OS release.
-
                 if 'ARCHFLAGS' in os.environ:
                     arch = os.environ['ARCHFLAGS']
                     for key in ('LDFLAGS', 'BASECFLAGS',
                         # a number of derived variables. These need to be
                         # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
 
                         flags = _config_vars[key]
                         flags = re.sub('-arch\s+\w+\s', ' ', flags)
diff --git a/unixccompiler.py b/unixccompiler.py
index c70a3cc555..5d45faa741 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -83,9 +83,8 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
-    # Check if the SDK that is used during compilation actually exists,
-    # the universal build requires the usage of a universal SDK and not all
-    # users have that installed by default.
+    # Check if the SDK that is used during compilation actually exists.
+    # If not, revert to using the installed headers and hope for the best.
     sysroot = None
     if '-isysroot' in cc_args:
         idx = cc_args.index('-isysroot')
@@ -97,7 +96,21 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     if sysroot and not os.path.isdir(sysroot):
         log.warn("Compiling with an SDK that doesn't seem to exist: %s",
                 sysroot)
-        log.warn("Please check your Xcode installation")
+        log.warn("Attempting to compile without the SDK")
+        while True:
+            try:
+                index = cc_args.index('-isysroot')
+                # Strip this argument and the next one:
+                del cc_args[index:index+2]
+            except ValueError:
+                break
+        while True:
+            try:
+                index = compiler_so.index('-isysroot')
+                # Strip this argument and the next one:
+                del compiler_so[index:index+2]
+            except ValueError:
+                break
 
     return compiler_so
 

From 4e6c91d7daf073463c531f79dbd4f4bf4b6898b7 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 25 Jun 2012 15:52:24 -0400
Subject: [PATCH 3473/8469] Issue #14443: ensure that brp-python-bytecompile is
 invoked with the correct python executable

The __os_install_macro defines some post-processing activities during an rpm
build; one of the scripts it calls is brp-python-bytecompile, which can take
an argument: the python executable with which to byte-compile .py files in the
package payload.

In some older versions of rpm (e.g. in RHEL 6), this invocation doesn't pass
in an argument, and brp-python-bytecompile defaults to using /usr/bin/python,
which can lead to the .py files being byte-compiled for the wrong version of
python.  This has been fixed in later versions of rpm by passing in
%{__python} as an argument to brp-python-bytecompile.

Workaround this by detecting if __os_install_post has a 0-argument invocation
of brp-python-bytecompile, and if so generating an equivalent macro that has
the argument, and explicitly provide the new definition within the specfile.
---
 command/bdist_rpm.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 401bc41872..ac4621791d 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-import sys, os
+import subprocess, sys, os
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.util import get_platform
@@ -406,6 +406,21 @@ def _make_spec_file(self):
             'Summary: ' + self.distribution.get_description(),
             ]
 
+        # Workaround for #14443 which affects some RPM based systems such as
+        # RHEL6 (and probably derivatives)
+        vendor_hook = subprocess.getoutput('rpm --eval %{__os_install_post}')
+        # Generate a potential replacement value for __os_install_post (whilst
+        # normalizing the whitespace to simplify the test for whether the
+        # invocation of brp-python-bytecompile passes in __python):
+        vendor_hook = '\n'.join(['  %s \\' % line.strip()
+                                 for line in vendor_hook.splitlines()])
+        problem = "brp-python-bytecompile \\\n"
+        fixed = "brp-python-bytecompile %{__python} \\\n"
+        fixed_hook = vendor_hook.replace(problem, fixed)
+        if fixed_hook != vendor_hook:
+            spec_file.append('# Workaround for http://bugs.python.org/issue14443')
+            spec_file.append('%define __os_install_post ' + fixed_hook + '\n')
+
         # put locale summaries into spec file
         # XXX not supported for now (hard to put a dictionary
         # in a config file -- arg!)

From 998406eedde8ea6686e42f77eb0e7c82486c874f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 26 Jun 2012 09:43:40 +0200
Subject: [PATCH 3474/8469] Bump version to 3.3.0b1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 0da0d849f1..7a7b8d6cb1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0a4"
+__version__ = "3.3.0b1"
 #--end constants--

From 2b4009c75e8ca5cb092424a21a53cbf2e231ea8d Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Tue, 26 Jun 2012 14:06:23 -0400
Subject: [PATCH 3475/8469] Issue #14443: ensure that brp-python-bytecompile is
 invoked with the correct python executable

The __os_install_macro defines some post-processing activities during an rpm
build; one of the scripts it calls is brp-python-bytecompile, which can take
an argument: the python executable with which to byte-compile .py files in the
package payload.

In some older versions of rpm (e.g. in RHEL 6), this invocation doesn't pass
in an argument, and brp-python-bytecompile defaults to using /usr/bin/python,
which can lead to the .py files being byte-compiled for the wrong version of
python.  This has been fixed in later versions of rpm by passing in
%{__python} as an argument to brp-python-bytecompile.

Workaround this by detecting if __os_install_post has a 0-argument invocation
of brp-python-bytecompile, and if so generating an equivalent macro that has
the argument, and explicitly provide the new definition within the specfile.
---
 command/bdist_rpm.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 401bc41872..ac4621791d 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'bdist_rpm' command (create RPM source and binary
 distributions)."""
 
-import sys, os
+import subprocess, sys, os
 from distutils.core import Command
 from distutils.debug import DEBUG
 from distutils.util import get_platform
@@ -406,6 +406,21 @@ def _make_spec_file(self):
             'Summary: ' + self.distribution.get_description(),
             ]
 
+        # Workaround for #14443 which affects some RPM based systems such as
+        # RHEL6 (and probably derivatives)
+        vendor_hook = subprocess.getoutput('rpm --eval %{__os_install_post}')
+        # Generate a potential replacement value for __os_install_post (whilst
+        # normalizing the whitespace to simplify the test for whether the
+        # invocation of brp-python-bytecompile passes in __python):
+        vendor_hook = '\n'.join(['  %s \\' % line.strip()
+                                 for line in vendor_hook.splitlines()])
+        problem = "brp-python-bytecompile \\\n"
+        fixed = "brp-python-bytecompile %{__python} \\\n"
+        fixed_hook = vendor_hook.replace(problem, fixed)
+        if fixed_hook != vendor_hook:
+            spec_file.append('# Workaround for http://bugs.python.org/issue14443')
+            spec_file.append('%define __os_install_post ' + fixed_hook + '\n')
+
         # put locale summaries into spec file
         # XXX not supported for now (hard to put a dictionary
         # in a config file -- arg!)

From 311fb781f87f8885d9a94343b4b7e9731bc0c9e7 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 26 Jun 2012 15:15:27 -0700
Subject: [PATCH 3476/8469] Add tests and fix for marshal.load of pyc files on
 Python 3.3

Fixes
https://bitbucket.org/tarek/distribute/issue/283/bdist_egg-issues-with-python-330ax

--HG--
branch : distribute
extra : rebase_source : ec6f2611d3f8a54b7e11cfadf9d03fdcdef39639
---
 setuptools/command/bdist_egg.py          |  6 +++++-
 tests/python3.3_bdist_egg_test/module.py |  0
 tests/python3.3_bdist_egg_test/setup.py  | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/python3.3_bdist_egg_test/module.py
 create mode 100644 tests/python3.3_bdist_egg_test/setup.py

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 68ca15c799..0ee9c55b86 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -426,7 +426,11 @@ def scan_module(egg_dir, base, name, stubs):
     pkg = base[len(egg_dir)+1:].replace(os.sep,'.')
     module = pkg+(pkg and '.' or '')+os.path.splitext(name)[0]
     f = open(filename,'rb'); f.read(8)   # skip magic & date
-    code = marshal.load(f);  f.close()
+    try:
+        code = marshal.load(f); f.close()
+    except ValueError:
+        f.seek(0); f.read(12)  # skip magic & date & file size; file size added in Python 3.3
+        code = marshal.load(f); f.close()
     safe = True
     symbols = dict.fromkeys(iter_symbols(code))
     for bad in ['__file__', '__path__']:
diff --git a/tests/python3.3_bdist_egg_test/module.py b/tests/python3.3_bdist_egg_test/module.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/python3.3_bdist_egg_test/setup.py b/tests/python3.3_bdist_egg_test/setup.py
new file mode 100644
index 0000000000..04caea7434
--- /dev/null
+++ b/tests/python3.3_bdist_egg_test/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+setup(
+    name='python3.3_bdist_egg_test',
+    version='0.0.0',
+    description='Test',
+    license='BSD',
+    py_modules=['module'],
+    author='Marc Abramowitz',
+    author_email='marc@marc-abramowitz.com',
+    url='https://bitbucket.org/msabramo/python3.3_bdist_egg_test',
+    # zip_safe=False,
+)

From 921b93fec344e0f75c80eff3cc8754215669f210 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 29 Jun 2012 01:05:26 +0200
Subject: [PATCH 3477/8469] Issue #10571: Fix the "--sign" option of distutils'
 upload command. Patch by Jakub Wilk.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 4926aa3e15..8b36851d25 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -125,7 +125,7 @@ def upload_file(self, command, pyversion, filename):
 
         if self.sign:
             data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc").read())
+                                     open(filename+".asc", "rb").read())
 
         # set up the authentication
         user_pass = (self.username + ":" + self.password).encode('ascii')

From ac2bc6ee75884f521d9097b83315adf413ff2a7c Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 29 Jun 2012 03:50:45 -0400
Subject: [PATCH 3478/8469] implement environment markers

--HG--
branch : distribute
extra : rebase_source : 16af7be95f787ab5de573388270b97cda6c9cea7
---
 pkg_resources.py | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 350a50ef22..5e3967f393 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -15,7 +15,6 @@
 
 import sys, os, zipimport, time, re, imp, types
 from urlparse import urlparse, urlunparse
-from email.parser import Parser
 
 try:
     frozenset
@@ -2456,6 +2455,7 @@ def _parsed_pkg_info(self):
         try:
             return self._pkg_info
         except AttributeError:
+            from email.parser import Parser
             self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
             return self._pkg_info
     
@@ -2464,15 +2464,41 @@ def _dep_map(self):
         try:
             return self.__dep_map
         except AttributeError:
-            dm = self.__dep_map = {None: []}
-            # Including condition expressions
-            # XXX parse condition expressions, extras
-            reqs = self._parsed_pkg_info.get_all('Requires-Dist')
-#            extras = self._parsed_pkg_info.get_all('Provides-Extra') or []
-#            for extra,reqs in split_sections(self._get_metadata(name)):
-#                if extra: extra = safe_extra(extra)
-            dm.setdefault(None,[]).extend(parse_requirements(reqs))
-            return dm
+            self.__dep_map = self._compute_dependencies()
+            return self.__dep_map
+            
+    def _compute_dependencies(self):
+        """Recompute this distribution's dependencies."""
+        def dummy_marker(marker):
+            def marker_fn(environment=None, override=None):
+                return True
+            return marker_fn
+        try:
+            from wheel.markers import as_function
+        except ImportError:
+            as_function = dummy_marker
+        dm = self.__dep_map = {None: []}
+
+        reqs = []
+        # Including any condition expressions
+        for req in self._parsed_pkg_info.get_all('Requires-Dist'):                
+            rs = req.split(';', 1) + ['']
+            parsed = parse_requirements(rs[0]).next()
+            parsed.marker_fn = as_function(rs[1].strip())
+            reqs.append(parsed)
+            
+        def reqs_for_extra(extra):
+            for req in reqs:
+                if req.marker_fn(override={'extra':extra}):
+                    yield req
+
+        common = set(reqs_for_extra(None))                        
+        dm[None].extend(common)
+            
+        for extra in self._parsed_pkg_info.get_all('Provides-Extra'):
+            dm[extra] = list(set(reqs_for_extra(extra)) - common)                
+
+        return dm
 
     def requires(self,extras=()):
         """List of Requirements needed for this distro if `extras` are used"""

From 07f0901db42f1bc5d411868e92e7e77d27f90323 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 29 Jun 2012 04:11:44 -0400
Subject: [PATCH 3479/8469] use markerlib

--HG--
branch : distribute
extra : rebase_source : a684fafb1aeb44954bdb8604a77fcc8d1549648c
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5e3967f393..dea544907b 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2474,7 +2474,7 @@ def marker_fn(environment=None, override=None):
                 return True
             return marker_fn
         try:
-            from wheel.markers import as_function
+            from markerlib import as_function
         except ImportError:
             as_function = dummy_marker
         dm = self.__dep_map = {None: []}

From d87cabbf4cf11c0049c95d3359fc249b002b542e Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 29 Jun 2012 19:48:39 -0400
Subject: [PATCH 3480/8469] add missing == to prefix-less Requires-Dist version
 specifiers

--HG--
branch : distribute
extra : rebase_source : 131e2f27792688da5dd1f8bf984939ab51403a64
---
 pkg_resources.py | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index dea544907b..10c8aff5c8 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2466,12 +2466,36 @@ def _dep_map(self):
         except AttributeError:
             self.__dep_map = self._compute_dependencies()
             return self.__dep_map
+
+    def _preparse_requirement(self, requires_dist):
+        """Return (dist, versions, marker).
+        Add == prefix to version specifiers as necessary.
+        """
+        m = re.compile(r"^(?P<d>.*?)\s*(\((?P<v>.*?)\))?\s*(;\s*(?P<m>.*))?$")
+        match = m.match(requires_dist)
+        if not match:
+            raise ValueError("Unexpected Requires-Dist: %s" % requires_dist)
+        dist = match.group('d')
+        if match.group('v'):
+            vers = match.group('v').split(',')
+        else:
+            vers = []
+        mark = match.group('m') or ''
+        for i, v in enumerate(vers):
+            if not VERSION(v):
+                v = "==%s" % v
+                if not VERSION(v):
+                    raise ValueError("Unexpected version: (%s)" % 
+                                     match.group('v'))
+                vers[i] = v
+        return (dist, ', '.join(vers), mark)
             
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
         def dummy_marker(marker):
             def marker_fn(environment=None, override=None):
                 return True
+            marker_fn.__doc__ = marker
             return marker_fn
         try:
             from markerlib import as_function
@@ -2481,10 +2505,10 @@ def marker_fn(environment=None, override=None):
 
         reqs = []
         # Including any condition expressions
-        for req in self._parsed_pkg_info.get_all('Requires-Dist'):                
-            rs = req.split(';', 1) + ['']
-            parsed = parse_requirements(rs[0]).next()
-            parsed.marker_fn = as_function(rs[1].strip())
+        for req in self._parsed_pkg_info.get_all('Requires-Dist'):
+            dist, vers, mark = self._preparse_requirement(req)
+            parsed = parse_requirements("%s %s" % (dist, vers)).next()
+            parsed.marker_fn = as_function(mark)
             reqs.append(parsed)
             
         def reqs_for_extra(extra):
@@ -2492,11 +2516,12 @@ def reqs_for_extra(extra):
                 if req.marker_fn(override={'extra':extra}):
                     yield req
 
-        common = set(reqs_for_extra(None))                        
+        common = set(reqs_for_extra(None))
         dm[None].extend(common)
             
         for extra in self._parsed_pkg_info.get_all('Provides-Extra'):
-            dm[extra] = list(set(reqs_for_extra(extra)) - common)                
+            extra = safe_extra(extra.strip())
+            dm[extra] = list(set(reqs_for_extra(extra)) - common)
 
         return dm
 

From 9b885a3c4843c3985413181a6d18b18ce015cdce Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 30 Jun 2012 08:52:43 -0400
Subject: [PATCH 3481/8469] simplify Requires-Dist pre-parser

--HG--
branch : distribute
extra : rebase_source : 10900b24f80bc412881812fcea4e54e473a86068
---
 pkg_resources.py | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 10c8aff5c8..20513dc708 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2448,6 +2448,7 @@ def extras(self):
 class DistInfoDistribution(Distribution):
     """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
     PKG_INFO = 'METADATA'
+    EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])")
 
     @property
     def _parsed_pkg_info(self):
@@ -2471,24 +2472,12 @@ def _preparse_requirement(self, requires_dist):
         """Return (dist, versions, marker).
         Add == prefix to version specifiers as necessary.
         """
-        m = re.compile(r"^(?P<d>.*?)\s*(\((?P<v>.*?)\))?\s*(;\s*(?P<m>.*))?$")
-        match = m.match(requires_dist)
-        if not match:
-            raise ValueError("Unexpected Requires-Dist: %s" % requires_dist)
-        dist = match.group('d')
-        if match.group('v'):
-            vers = match.group('v').split(',')
-        else:
-            vers = []
-        mark = match.group('m') or ''
-        for i, v in enumerate(vers):
-            if not VERSION(v):
-                v = "==%s" % v
-                if not VERSION(v):
-                    raise ValueError("Unexpected version: (%s)" % 
-                                     match.group('v'))
-                vers[i] = v
-        return (dist, ', '.join(vers), mark)
+        parts = requires_dist.split(';', 1) + ['']
+        distvers = parts[0].strip()
+        mark = parts[1].strip()
+        distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
+        distvers = distvers.replace('(', '').replace(')', '')
+        return (distvers, mark)
             
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
@@ -2506,8 +2495,8 @@ def marker_fn(environment=None, override=None):
         reqs = []
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist'):
-            dist, vers, mark = self._preparse_requirement(req)
-            parsed = parse_requirements("%s %s" % (dist, vers)).next()
+            distvers, mark = self._preparse_requirement(req)
+            parsed = parse_requirements(distvers).next()
             parsed.marker_fn = as_function(mark)
             reqs.append(parsed)
             

From 7afb6a596a2d16b4d74b1b890eb9ca44d11197bd Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 30 Jun 2012 09:02:41 -0400
Subject: [PATCH 3482/8469] update docstring

--HG--
branch : distribute
extra : rebase_source : ee1bf5fd6c851fa3d9c87c1132f0864a811f09e5
---
 pkg_resources.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 20513dc708..652079ecac 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2469,8 +2469,9 @@ def _dep_map(self):
             return self.__dep_map
 
     def _preparse_requirement(self, requires_dist):
-        """Return (dist, versions, marker).
-        Add == prefix to version specifiers as necessary.
+        """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
+        Split environment marker, add == prefix to version specifiers as 
+        necessary, and remove parenthesis.
         """
         parts = requires_dist.split(';', 1) + ['']
         distvers = parts[0].strip()

From 0d5901c018dbccaa9bffc8902796b40a546f7f3d Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 30 Jun 2012 12:34:31 -0400
Subject: [PATCH 3483/8469] handle missing provides-extra or requires-dist

--HG--
branch : distribute
extra : rebase_source : 99392449586f9f299abfd1627ba60b9752caf26d
---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 652079ecac..285aa1bbcb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2495,7 +2495,7 @@ def marker_fn(environment=None, override=None):
 
         reqs = []
         # Including any condition expressions
-        for req in self._parsed_pkg_info.get_all('Requires-Dist'):
+        for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
             distvers, mark = self._preparse_requirement(req)
             parsed = parse_requirements(distvers).next()
             parsed.marker_fn = as_function(mark)
@@ -2509,7 +2509,7 @@ def reqs_for_extra(extra):
         common = set(reqs_for_extra(None))
         dm[None].extend(common)
             
-        for extra in self._parsed_pkg_info.get_all('Provides-Extra'):
+        for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             extra = safe_extra(extra.strip())
             dm[extra] = list(set(reqs_for_extra(extra)) - common)
 

From f1f3ff37a4e88ffa90c3821bfc18db2009e1ed3b Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Sat, 30 Jun 2012 20:42:45 +0200
Subject: [PATCH 3484/8469] - Issue #14330: For cross builds, don't use host
 python, use host search paths   for host compiler.

---
 util.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/util.py b/util.py
index bce840274d..9833bf95c0 100644
--- a/util.py
+++ b/util.py
@@ -53,6 +53,10 @@ def get_platform ():
             return 'win-ia64'
         return sys.platform
 
+    # Set for cross builds explicitly
+    if "_PYTHON_HOST_PLATFORM" in os.environ:
+        return os.environ["_PYTHON_HOST_PLATFORM"]
+
     if os.name != "posix" or not hasattr(os, 'uname'):
         # XXX what about the architecture? NT is Intel or Alpha,
         # Mac OS is M68k or PPC, etc.

From 885b09228b2dc0062a31eede47183bd25983089b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 3 Jul 2012 01:12:42 -0400
Subject: [PATCH 3485/8469] Ignore .nfs* files in distutils (#7719).

These files are created by some NFS clients a file is edited and removed
concurrently (see added link in doc for more info).  If such a file is
removed between distutils calls listdir and copy, it will get confused.
Other special files are ignored in sdist (namely VCS directories), but
this has to be filtered out earlier.
---
 dir_util.py            |  4 ++++
 tests/test_dir_util.py | 18 ++++++++++++++++++
 tests/test_sdist.py    |  7 ++++---
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 9c5cf337c6..5026e24668 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -144,6 +144,10 @@ def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
         src_name = os.path.join(src, n)
         dst_name = os.path.join(dst, n)
 
+        if n.startswith('.nfs'):
+            # skip NFS rename files
+            continue
+
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
             if verbose >= 1:
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 693f77cf64..d82d9133d0 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -101,6 +101,24 @@ def test_copy_tree_verbosity(self):
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
+    def test_copy_tree_skips_nfs_temp_files(self):
+        mkpath(self.target, verbose=0)
+
+        a_file = os.path.join(self.target, 'ok.txt')
+        nfs_file = os.path.join(self.target, '.nfs123abc')
+        for f in a_file, nfs_file:
+            fh = open(f, 'w')
+            try:
+                fh.write('some content')
+            finally:
+                fh.close()
+
+        copy_tree(self.target, self.target2)
+        self.assertEqual(os.listdir(self.target2), ['ok.txt'])
+
+        remove_tree(self.root_target, verbose=0)
+        remove_tree(self.target2, verbose=0)
+
     def test_ensure_relative(self):
         if os.sep == '/':
             self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 3a89f73fa2..7e7d98d096 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -91,9 +91,8 @@ def get_cmd(self, metadata=None):
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_prune_file_list(self):
-        # this test creates a package with some vcs dirs in it
-        # and launch sdist to make sure they get pruned
-        # on all systems
+        # this test creates a project with some VCS dirs and an NFS rename
+        # file, then launches sdist to check they get pruned on all systems
 
         # creating VCS directories with some files in them
         os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
@@ -107,6 +106,8 @@ def test_prune_file_list(self):
         self.write_file((self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
+        self.write_file((self.tmp_dir, 'somecode', '.nfs0001'), 'xxx')
+
         # now building a sdist
         dist, cmd = self.get_cmd()
 

From 3facc55019acde02d0454008292d6c81c9e1e8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Tue, 3 Jul 2012 01:23:46 -0400
Subject: [PATCH 3486/8469] Create ~/.pypirc securely (#13512).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was a window between the write and the chmod where the user’s
password would be exposed, depending on default permissions.  Philip
Jenvey’s patch fixes it.
---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index afa403f2da..9d8b30ea30 100644
--- a/config.py
+++ b/config.py
@@ -42,7 +42,7 @@ def _get_rc_file(self):
     def _store_pypirc(self, username, password):
         """Creates a default .pypirc file."""
         rc = self._get_rc_file()
-        f = open(rc, 'w')
+        f = os.fdopen(os.open(rc, os.O_CREAT | os.O_WRONLY, 0600), 'w')
         try:
             f.write(DEFAULT_PYPIRC % (username, password))
         finally:

From a4f8d8fba9c3993b5afbd83cc4b02cded203918b Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 7 Jul 2012 18:10:02 +0200
Subject: [PATCH 3487/8469] Issue 294: Allow to run setup.py from another
 directory.

--HG--
branch : distribute
extra : rebase_source : 9219c67abb5791b37822fd67c224a537628c54b9
---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index c4351b1e74..4294f3f96c 100755
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,9 @@
 import os
 import textwrap
 
+# Allow to run setup.py from another directory.
+os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
 src_root = None
 if sys.version_info >= (3,):
     tmp_src = os.path.join("build", "src")

From 115c62e6a9a9167633eff93ef0f1a355505a0e5d Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 7 Jul 2012 11:51:13 -0700
Subject: [PATCH 3488/8469] Add a test for Python 3.3 bdist_egg issue

--HG--
branch : distribute
extra : rebase_source : e83ee69c3b15e4a75780811a7bb3612b8f7f54d1
---
 tests/test_python33_bdist_egg.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/test_python33_bdist_egg.py

diff --git a/tests/test_python33_bdist_egg.py b/tests/test_python33_bdist_egg.py
new file mode 100644
index 0000000000..58d9979642
--- /dev/null
+++ b/tests/test_python33_bdist_egg.py
@@ -0,0 +1,25 @@
+import sys
+import os
+import tempfile
+import unittest
+import shutil
+import copy
+
+CURDIR = os.path.abspath(os.path.dirname(__file__))
+TOPDIR = os.path.split(CURDIR)[0]
+sys.path.insert(0, TOPDIR)
+
+from distribute_setup import (use_setuptools, _build_egg, _python_cmd,
+                              _do_download, _install, DEFAULT_URL,
+                              DEFAULT_VERSION)
+import distribute_setup
+
+class TestPython33BdistEgg(unittest.TestCase):
+
+    def test_build_egg(self):
+        os.chdir(os.path.join(CURDIR, 'python3.3_bdist_egg_test'))
+        _python_cmd("setup.py", "bdist_egg")
+
+
+if __name__ == '__main__':
+    unittest.main()

From bfd4bf6118d69a70926982c602d411dc6f9ab1d4 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 7 Jul 2012 12:25:37 -0700
Subject: [PATCH 3489/8469] test_python33_bdist_egg.py: Check return value of
 bdist_egg command

--HG--
branch : distribute
extra : rebase_source : 1f6c2ebfe44bdb09ee48f49f2cea94edf933e540
---
 tests/test_python33_bdist_egg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_python33_bdist_egg.py b/tests/test_python33_bdist_egg.py
index 58d9979642..972d01e7b5 100644
--- a/tests/test_python33_bdist_egg.py
+++ b/tests/test_python33_bdist_egg.py
@@ -18,7 +18,7 @@ class TestPython33BdistEgg(unittest.TestCase):
 
     def test_build_egg(self):
         os.chdir(os.path.join(CURDIR, 'python3.3_bdist_egg_test'))
-        _python_cmd("setup.py", "bdist_egg")
+        self.assertTrue(_python_cmd("setup.py", "bdist_egg"))
 
 
 if __name__ == '__main__':

From 0a5180da06efb1d3e854cbdfec458968790c3a5e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 7 Jul 2012 12:29:07 -0700
Subject: [PATCH 3490/8469] Remove unnecessary stuff from
 test_python33_bdist_egg.py

--HG--
branch : distribute
extra : rebase_source : 3a993d4c266798501557f338abc8c4cdc2db3c8c
---
 tests/test_python33_bdist_egg.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/test_python33_bdist_egg.py b/tests/test_python33_bdist_egg.py
index 972d01e7b5..9f32470a32 100644
--- a/tests/test_python33_bdist_egg.py
+++ b/tests/test_python33_bdist_egg.py
@@ -1,18 +1,12 @@
 import sys
 import os
-import tempfile
 import unittest
-import shutil
-import copy
 
 CURDIR = os.path.abspath(os.path.dirname(__file__))
 TOPDIR = os.path.split(CURDIR)[0]
 sys.path.insert(0, TOPDIR)
 
-from distribute_setup import (use_setuptools, _build_egg, _python_cmd,
-                              _do_download, _install, DEFAULT_URL,
-                              DEFAULT_VERSION)
-import distribute_setup
+from distribute_setup import _python_cmd
 
 class TestPython33BdistEgg(unittest.TestCase):
 

From b73bf20cea512d0d95a29db4fd9ed837130c54fc Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 7 Jul 2012 23:24:20 -0400
Subject: [PATCH 3491/8469] test .dist-info distributions

--HG--
branch : distribute
extra : rebase_source : ea6870d73aa69f2deacc50beb2e257d3c21073e4
---
 pkg_resources.py                   | 16 +--------
 setuptools/tests/test_dist_info.py | 55 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 setuptools/tests/test_dist_info.py

diff --git a/pkg_resources.py b/pkg_resources.py
index 285aa1bbcb..27b9f83451 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2514,21 +2514,7 @@ def reqs_for_extra(extra):
             dm[extra] = list(set(reqs_for_extra(extra)) - common)
 
         return dm
-
-    def requires(self,extras=()):
-        """List of Requirements needed for this distro if `extras` are used"""
-        dm = self._dep_map
-        deps = []
-        deps.extend(dm.get(None,()))
-        for ext in extras:
-            try:
-                deps.extend(dm[safe_extra(ext)])
-            except KeyError:
-                raise UnknownExtra(
-                    "%s has no such extra feature %r" % (self, ext)
-                )
-        return deps
-
+    
 
 _distributionImpl = {'.egg': Distribution,
                      '.egg-info': Distribution,
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
new file mode 100644
index 0000000000..c40886d3a0
--- /dev/null
+++ b/setuptools/tests/test_dist_info.py
@@ -0,0 +1,55 @@
+"""Test .dist-info style distributions.
+"""
+import os, shutil, tempfile, unittest
+import pkg_resources
+from pkg_resources import Requirement
+
+class TestDistInfo(unittest.TestCase):
+
+    def test_distinfo(self):
+        dists = {}
+        for d in pkg_resources.find_distributions(self.tmpdir):
+            dists[d.project_name] = d
+            
+        unversioned = dists['UnversionedDistribution']
+        versioned = dists['VersionedDistribution']
+        
+        assert versioned.version == '2.718' # from filename        
+        assert unversioned.version == '0.3' # from METADATA
+        
+        requires = [Requirement.parse('splort==4'), 
+                    Requirement.parse('quux>=1.1')]
+        
+        for d in (unversioned, versioned):
+            self.assertEquals(d.requires(), requires[:1])
+            self.assertEquals(d.requires(extras=('baz',)), requires)
+            self.assertEquals(d.extras, ['baz'])
+
+    def setUp(self):
+        self.tmpdir = tempfile.mkdtemp()
+        versioned = os.path.join(self.tmpdir, 
+                                 'VersionedDistribution-2.718.dist-info')
+        os.mkdir(versioned)
+        open(os.path.join(versioned, 'METADATA'), 'w+').write(
+"""Metadata-Version: 1.2
+Name: VersionedDistribution
+Requires-Dist: splort (4)
+Provides-Extra: baz
+Requires-Dist: quux (>=1.1); extra == 'baz'
+""")
+
+        unversioned = os.path.join(self.tmpdir, 
+                                   'UnversionedDistribution.dist-info')
+        os.mkdir(unversioned)
+        open(os.path.join(unversioned, 'METADATA'), 'w+').write(
+"""Metadata-Version: 1.2
+Name: UnversionedDistribution
+Version: 0.3
+Requires-Dist: splort (==4)
+Provides-Extra: baz
+Requires-Dist: quux (>=1.1); extra == 'baz'
+""")
+
+    def tearDown(self):
+        shutil.rmtree(self.tmpdir)
+

From c62d8121c4660daa4fd6132643b8e98918faf58f Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 7 Jul 2012 23:34:12 -0400
Subject: [PATCH 3492/8469] improve .dist-info test

--HG--
branch : distribute
extra : rebase_source : 23b6b4023d413bf1b27b114687da8736a4b38d8b
---
 setuptools/tests/test_dist_info.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index c40886d3a0..119cc68bcd 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,6 +3,11 @@
 import os, shutil, tempfile, unittest
 import pkg_resources
 from pkg_resources import Requirement
+try:
+    import markerlib
+    has_markerlib = True
+except:
+    has_markerlib = False
 
 class TestDistInfo(unittest.TestCase):
 
@@ -11,19 +16,24 @@ def test_distinfo(self):
         for d in pkg_resources.find_distributions(self.tmpdir):
             dists[d.project_name] = d
             
+        assert len(dists) == 2, dists
+            
         unversioned = dists['UnversionedDistribution']
         versioned = dists['VersionedDistribution']
         
         assert versioned.version == '2.718' # from filename        
         assert unversioned.version == '0.3' # from METADATA
-        
+                
+    @unittest.skipIf(not has_markerlib, 
+                     "install markerlib to test conditional dependencies") 
+    def test_conditional_dependencies(self):
         requires = [Requirement.parse('splort==4'), 
                     Requirement.parse('quux>=1.1')]
         
-        for d in (unversioned, versioned):
+        for d in pkg_resources.find_distributions(self.tmpdir):
             self.assertEquals(d.requires(), requires[:1])
             self.assertEquals(d.requires(extras=('baz',)), requires)
-            self.assertEquals(d.extras, ['baz'])
+            self.assertEquals(d.extras, ['baz'])        
 
     def setUp(self):
         self.tmpdir = tempfile.mkdtemp()

From b44cc1ee01fc6742048240e9a2e19a16d3ce41aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Tue, 10 Jul 2012 07:07:06 +0200
Subject: [PATCH 3493/8469] Issue #15315: Support VS 2010 in distutils
 cygwincompiler.

---
 cygwinccompiler.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 819e1a97be..0bdd539c37 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -78,6 +78,9 @@ def get_msvcr():
         elif msc_ver == '1500':
             # VS2008 / MSVC 9.0
             return ['msvcr90']
+        elif msc_ver == '1600':
+            # VS2010 / MSVC 10.0
+            return ['msvcr100']
         else:
             raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 

From 12c0d7f3e916957294a095a8425554fe8413e42e Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@zope.com>
Date: Sat, 14 Jul 2012 14:25:06 -0400
Subject: [PATCH 3494/8469] Issue #283 bdist_egg issues with python 3.3.0aX

--HG--
branch : distribute
extra : rebase_source : 3173cb1ab5550635b8565767059701ab2649ac19
---
 CHANGES.txt                        |  6 +++
 setuptools/command/bdist_egg.py    |  2 +
 setuptools/tests/test_bdist_egg.py | 69 ++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 setuptools/tests/test_bdist_egg.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 2707f01cdc..a58c1ce16d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.28
+------
+
+* Issue #283 bdist_egg issues with python 3.3.0aX
+
 ------
 0.6.27
 ------
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 68ca15c799..a9d98d3b70 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -459,6 +459,8 @@ def iter_symbols(code):
                 yield name
 
 def can_scan():
+    if sys.version_info > (3, 3):
+        return False # Can't scan recent formats
     if not sys.platform.startswith('java') and sys.platform != 'cli':
         # CPython, PyPy, etc.
         return True
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
new file mode 100644
index 0000000000..7da122cc31
--- /dev/null
+++ b/setuptools/tests/test_bdist_egg.py
@@ -0,0 +1,69 @@
+"""develop tests
+"""
+import sys
+import os, re, shutil, tempfile, unittest
+import tempfile
+import site
+from StringIO import StringIO
+
+from distutils.errors import DistutilsError
+from setuptools.command.bdist_egg import bdist_egg
+from setuptools.command import easy_install as easy_install_pkg
+from setuptools.dist import Distribution
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(name='foo', py_modules=['hi'])
+"""
+
+class TestDevelopTest(unittest.TestCase):
+
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.dir)
+        f = open('setup.py', 'w')
+        f.write(SETUP_PY)
+        f.close()
+        f = open('hi.py', 'w')
+        f.write('1\n')
+        f.close()
+        if sys.version >= "2.6":
+            self.old_base = site.USER_BASE
+            site.USER_BASE = tempfile.mkdtemp()
+            self.old_site = site.USER_SITE
+            site.USER_SITE = tempfile.mkdtemp()
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        if sys.version >= "2.6":
+            shutil.rmtree(site.USER_BASE)
+            shutil.rmtree(site.USER_SITE)
+            site.USER_BASE = self.old_base
+            site.USER_SITE = self.old_site
+
+    def test_bdist_egg(self):
+        dist = Distribution(dict(
+            script_name='setup.py',
+            script_args=['bdist_egg'],
+            name='foo',
+            py_modules=['hi']
+            ))
+        os.makedirs(os.path.join('build', 'src'))
+        old_stdout = sys.stdout
+        sys.stdout = o = StringIO()
+        try:
+            dist.parse_command_line()
+            dist.run_commands()
+        finally:
+            sys.stdout = old_stdout
+
+        # let's see if we got our egg link at the right place
+        [content] = os.listdir('dist')
+        self.assertTrue(re.match('foo-0.0.0-py[23].\d.egg$', content))
+
+def test_suite():
+    return unittest.makeSuite(TestDevelopTest)
+

From 14ab73a69d74f3ed8ba1dc8ce347271845899785 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sun, 15 Jul 2012 21:30:03 -0700
Subject: [PATCH 3495/8469] Issue #13590: Improve support for OS X Xcode 4: -
 fix test_distutils and test_sysconfig test failures by   aligning sysconfig
 and distutils.sysconfig tailoring of   configure variables (as in 2.7)

---
 sysconfig.py     | 29 ++++++++++++++++++++++++++---
 unixccompiler.py | 21 ++++-----------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index dac3035f1b..f6e5d99909 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -624,7 +624,7 @@ def get_config_vars(*args):
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
+                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
                         'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
@@ -669,16 +669,39 @@ def get_config_vars(*args):
                 # that OS release.
                 if 'ARCHFLAGS' in os.environ:
                     arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
+                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
                         # a number of derived variables. These need to be
                         # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
+                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
 
                         flags = _config_vars[key]
                         flags = re.sub('-arch\s+\w+\s', ' ', flags)
                         flags = flags + ' ' + arch
                         _config_vars[key] = flags
 
+                # If we're on OSX 10.5 or later and the user tries to
+                # compiles an extension using an SDK that is not present
+                # on the current machine it is better to not use an SDK
+                # than to fail.
+                #
+                # The major usecase for this is users using a Python.org
+                # binary installer  on OSX 10.6: that installer uses
+                # the 10.4u SDK, but that SDK is not installed by default
+                # when you install Xcode.
+                #
+                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
+                if m is not None:
+                    sdk = m.group(1)
+                    if not os.path.exists(sdk):
+                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
+                             # a number of derived variables. These need to be
+                             # patched up as well.
+                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
+
+                            flags = _config_vars[key]
+                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
+                            _config_vars[key] = flags
+
     if args:
         vals = []
         for name in args:
diff --git a/unixccompiler.py b/unixccompiler.py
index 5d45faa741..c70a3cc555 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -83,8 +83,9 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
-    # Check if the SDK that is used during compilation actually exists.
-    # If not, revert to using the installed headers and hope for the best.
+    # Check if the SDK that is used during compilation actually exists,
+    # the universal build requires the usage of a universal SDK and not all
+    # users have that installed by default.
     sysroot = None
     if '-isysroot' in cc_args:
         idx = cc_args.index('-isysroot')
@@ -96,21 +97,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     if sysroot and not os.path.isdir(sysroot):
         log.warn("Compiling with an SDK that doesn't seem to exist: %s",
                 sysroot)
-        log.warn("Attempting to compile without the SDK")
-        while True:
-            try:
-                index = cc_args.index('-isysroot')
-                # Strip this argument and the next one:
-                del cc_args[index:index+2]
-            except ValueError:
-                break
-        while True:
-            try:
-                index = compiler_so.index('-isysroot')
-                # Strip this argument and the next one:
-                del compiler_so[index:index+2]
-            except ValueError:
-                break
+        log.warn("Please check your Xcode installation")
 
     return compiler_so
 

From cef0183bed891da1a3ec6e17083d5325141923b7 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 16 Jul 2012 18:24:55 +0100
Subject: [PATCH 3496/8469] Closes #15366: Corrected computation of include
 location for source builds. Thanks to Richard Oudkerk for the bug report and
 patch.

---
 sysconfig.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index f6e5d99909..409ef74ca1 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -101,10 +101,11 @@ def get_python_inc(plat_specific=0, prefix=None):
             base = _sys_home or os.path.dirname(os.path.abspath(sys.executable))
             if plat_specific:
                 return base
+            if _sys_home:
+                incdir = os.path.join(_sys_home, get_config_var('AST_H_DIR'))
             else:
-                incdir = os.path.join(_sys_home or get_config_var('srcdir'),
-                                      'Include')
-                return os.path.normpath(incdir)
+                incdir = os.path.join(get_config_var('srcdir'), 'Include')
+            return os.path.normpath(incdir)
         python_dir = 'python' + get_python_version() + build_flags
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":

From 7e4558cfe24f0fb019e741f5da76cfc6e7cdc40f Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 16 Jul 2012 18:30:03 +0100
Subject: [PATCH 3497/8469] Closes #15367: Corrected computation of include
 locations for source builds on Windows. Thanks to Richard Oudkerk for the bug
 report and patch.

---
 command/build_ext.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index ac37c1320a..f16e2f17ef 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -8,6 +8,7 @@
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
+from distutils.sysconfig import get_config_h_filename
 from distutils.dep_util import newer_group
 from distutils.extension import Extension
 from distutils.util import get_platform
@@ -196,7 +197,10 @@ def finalize_options(self):
 
             # Append the source distribution include and library directories,
             # this allows distutils on windows to work in the source tree
-            self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
+            self.include_dirs.append(os.path.dirname(get_config_h_filename()))
+            _sys_home = getattr(sys, '_home', None)
+            if _sys_home:
+                self.library_dirs.append(_sys_home)
             if MSVC_VERSION >= 9:
                 # Use the .lib files for the correct architecture
                 if self.plat_name == 'win32':

From 1f77c7ddcadb51accf01d3db76f23ec158a44256 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sat, 21 Jul 2012 05:36:30 -0700
Subject: [PATCH 3498/8469] Issue #15184: Ensure consistent results of OS X
 configuration tailoring for universal builds by factoring out common OS
 X-specific customizations from sysconfig, distutils.sysconfig,
 distutils.util, and distutils.unixccompiler into a new module _osx_support
 that can eventually also be used by packaging.

---
 sysconfig.py       | 190 +++++----------------------------------------
 tests/test_util.py |   9 +++
 unixccompiler.py   |  70 ++---------------
 util.py            |  92 +---------------------
 4 files changed, 39 insertions(+), 322 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 409ef74ca1..910e1047ab 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -172,6 +172,21 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
+        if sys.platform == "darwin":
+            # Perform first-time customization of compiler-related
+            # config vars on OS X now that we know we need a compiler.
+            # This is primarily to support Pythons from binary
+            # installers.  The kind and paths to build tools on
+            # the user system may vary significantly from the system
+            # that Python itself was built on.  Also the user OS
+            # version and build tools may not support the same set
+            # of CPU architectures for universal builds.
+            global _config_vars
+            if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''):
+                import _osx_support
+                _osx_support.customize_compiler(_config_vars)
+                _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+
         (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
@@ -494,35 +509,12 @@ def _init_os2():
     _config_vars = g
 
 
-def _read_output(commandstring):
-    """
-    Returns os.popen(commandstring, "r").read(), but
-    without actually using os.popen because that
-    function is not usable during python bootstrap
-    """
-    # NOTE: tempfile is also not useable during
-    # bootstrap
-    import contextlib
-    try:
-        import tempfile
-        fp = tempfile.NamedTemporaryFile()
-    except ImportError:
-        fp = open("/tmp/distutils.%s"%(
-            os.getpid(),), "w+b")
-
-    with contextlib.closing(fp) as fp:
-        cmd = "%s >'%s'"%(commandstring, fp.name)
-        os.system(cmd)
-        data = fp.read()
-
-    return data.decode('utf-8')
-
 def get_config_vars(*args):
     """With no arguments, return a dictionary of all configuration
     variables relevant for the current platform.  Generally this includes
     everything needed to build extensions and install both pure modules and
     extensions.  On Unix, this means every variable defined in Python's
-    installed Makefile; on Windows and Mac OS it's a much smaller set.
+    installed Makefile; on Windows it's a much smaller set.
 
     With arguments, return a list of values that result from looking up
     each argument in the configuration variable dictionary.
@@ -555,153 +547,11 @@ def get_config_vars(*args):
                 srcdir = os.path.join(base, _config_vars['srcdir'])
                 _config_vars['srcdir'] = os.path.normpath(srcdir)
 
+        # OS X platforms require special customization to handle
+        # multi-architecture, multi-os-version installers
         if sys.platform == 'darwin':
-            from distutils.spawn import find_executable
-
-            kernel_version = os.uname()[2] # Kernel version (8.4.3)
-            major_version = int(kernel_version.split('.')[0])
-
-            # Issue #13590:
-            #    The OSX location for the compiler varies between OSX
-            #    (or rather Xcode) releases.  With older releases (up-to 10.5)
-            #    the compiler is in /usr/bin, with newer releases the compiler
-            #    can only be found inside Xcode.app if the "Command Line Tools"
-            #    are not installed.
-            #
-            #    Futhermore, the compiler that can be used varies between
-            #    Xcode releases. Upto Xcode 4 it was possible to use 'gcc-4.2'
-            #    as the compiler, after that 'clang' should be used because
-            #    gcc-4.2 is either not present, or a copy of 'llvm-gcc' that
-            #    miscompiles Python.
-
-            # skip checks if the compiler was overriden with a CC env variable
-            if 'CC' not in os.environ:
-                cc = oldcc = _config_vars['CC']
-                if not find_executable(cc):
-                    # Compiler is not found on the shell search PATH.
-                    # Now search for clang, first on PATH (if the Command LIne
-                    # Tools have been installed in / or if the user has provided
-                    # another location via CC).  If not found, try using xcrun
-                    # to find an uninstalled clang (within a selected Xcode).
-
-                    # NOTE: Cannot use subprocess here because of bootstrap
-                    # issues when building Python itself (and os.popen is
-                    # implemented on top of subprocess and is therefore not
-                    # usable as well)
-
-                    data = (find_executable('clang') or
-                            _read_output(
-                                "/usr/bin/xcrun -find clang 2>/dev/null").strip())
-                    if not data:
-                        raise DistutilsPlatformError(
-                               "Cannot locate working compiler")
-
-                    _config_vars['CC'] = cc = data
-                    _config_vars['CXX'] = cc + '++'
-
-                elif os.path.basename(cc).startswith('gcc'):
-                    # Compiler is GCC, check if it is LLVM-GCC
-                    data = _read_output("'%s' --version 2>/dev/null"
-                                         % (cc.replace("'", "'\"'\"'"),))
-                    if 'llvm-gcc' in data:
-                        # Found LLVM-GCC, fall back to clang
-                        data = (find_executable('clang') or
-                                _read_output(
-                                    "/usr/bin/xcrun -find clang 2>/dev/null").strip())
-                        if find_executable(data):
-                            _config_vars['CC'] = cc = data
-                            _config_vars['CXX'] = cc + '++'
-
-                if (cc != oldcc
-                        and 'LDSHARED' in _config_vars
-                        and 'LDSHARED' not in os.environ):
-                    # modify LDSHARED if we modified CC
-                    ldshared = _config_vars['LDSHARED']
-                    if ldshared.startswith(oldcc):
-                        _config_vars['LDSHARED'] = cc + ldshared[len(oldcc):]
-
-            if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
-                # are in CFLAGS or LDFLAGS and remove them if they are.
-                # This is needed when building extensions on a 10.3 system
-                # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                    flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
-                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-                    _config_vars[key] = flags
-
-            else:
-                # Different Xcode releases support different sets for '-arch'
-                # flags. In particular, Xcode 4.x no longer supports the
-                # PPC architectures.
-                #
-                # This code automatically removes '-arch ppc' and '-arch ppc64'
-                # when these are not supported. That makes it possible to
-                # build extensions on OSX 10.7 and later with the prebuilt
-                # 32-bit installer on the python.org website.
-                flags = _config_vars['CFLAGS']
-                if re.search('-arch\s+ppc', flags) is not None:
-                    # NOTE: Cannot use subprocess here because of bootstrap
-                    # issues when building Python itself
-                    status = os.system("'%s' -arch ppc -x c /dev/null 2>/dev/null"%(
-                        _config_vars['CC'].replace("'", "'\"'\"'"),))
-
-                    if status != 0:
-                        # Compiler doesn't support PPC, remove the related
-                        # '-arch' flags.
-                        for key in ('LDFLAGS', 'BASECFLAGS',
-                            # a number of derived variables. These need to be
-                            # patched up as well.
-                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
-
-                            flags = _config_vars[key]
-                            flags = re.sub('-arch\s+ppc\w*\s', ' ', flags)
-                            _config_vars[key] = flags
-
-
-                # Allow the user to override the architecture flags using
-                # an environment variable.
-                # NOTE: This name was introduced by Apple in OSX 10.5 and
-                # is used by several scripting languages distributed with
-                # that OS release.
-                if 'ARCHFLAGS' in os.environ:
-                    arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                        flags = _config_vars[key]
-                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                        flags = flags + ' ' + arch
-                        _config_vars[key] = flags
-
-                # If we're on OSX 10.5 or later and the user tries to
-                # compiles an extension using an SDK that is not present
-                # on the current machine it is better to not use an SDK
-                # than to fail.
-                #
-                # The major usecase for this is users using a Python.org
-                # binary installer  on OSX 10.6: that installer uses
-                # the 10.4u SDK, but that SDK is not installed by default
-                # when you install Xcode.
-                #
-                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
-                if m is not None:
-                    sdk = m.group(1)
-                    if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                             # a number of derived variables. These need to be
-                             # patched up as well.
-                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                            flags = _config_vars[key]
-                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
-                            _config_vars[key] = flags
+            import _osx_support
+            _osx_support.customize_config_vars(_config_vars)
 
     if args:
         vals = []
diff --git a/tests/test_util.py b/tests/test_util.py
index 1a06d4c4a1..eac9b5141d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -13,6 +13,7 @@
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
 from distutils.tests import support
+import _osx_support
 
 class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -92,6 +93,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
@@ -105,6 +107,7 @@ def test_get_platform(self):
             sys.maxsize = cursize
 
         # macbook with fat binaries (fat, universal or fat64)
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
@@ -113,10 +116,12 @@ def test_get_platform(self):
 
         self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
+        _osx_support._remove_original_values(get_config_vars())
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.1'
         self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -124,18 +129,21 @@ def test_get_platform(self):
 
         self.assertEqual(get_platform(), 'macosx-10.4-intel')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
         self.assertEqual(get_platform(), 'macosx-10.4-fat3')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
         self.assertEqual(get_platform(), 'macosx-10.4-universal')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -144,6 +152,7 @@ def test_get_platform(self):
         self.assertEqual(get_platform(), 'macosx-10.4-fat64')
 
         for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            _osx_support._remove_original_values(get_config_vars())
             get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
                                            '/Developer/SDKs/MacOSX10.4u.sdk  '
                                            '-fno-strict-aliasing -fno-common '
diff --git a/unixccompiler.py b/unixccompiler.py
index c70a3cc555..094a2f0bd0 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -23,6 +23,9 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
+if sys.platform == 'darwin':
+    import _osx_support
+
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -38,68 +41,6 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
-def _darwin_compiler_fixup(compiler_so, cc_args):
-    """
-    This function will strip '-isysroot PATH' and '-arch ARCH' from the
-    compile flags if the user has specified one them in extra_compile_flags.
-
-    This is needed because '-arch ARCH' adds another architecture to the
-    build, without a way to remove an architecture. Furthermore GCC will
-    barf if multiple '-isysroot' arguments are present.
-    """
-    stripArch = stripSysroot = False
-
-    compiler_so = list(compiler_so)
-    kernel_version = os.uname()[2] # 8.4.3
-    major_version = int(kernel_version.split('.')[0])
-
-    if major_version < 8:
-        # OSX before 10.4.0, these don't support -arch and -isysroot at
-        # all.
-        stripArch = stripSysroot = True
-    else:
-        stripArch = '-arch' in cc_args
-        stripSysroot = '-isysroot' in cc_args
-
-    if stripArch or 'ARCHFLAGS' in os.environ:
-        while True:
-            try:
-                index = compiler_so.index('-arch')
-                # Strip this argument and the next one:
-                del compiler_so[index:index+2]
-            except ValueError:
-                break
-
-    if 'ARCHFLAGS' in os.environ and not stripArch:
-        # User specified different -arch flags in the environ,
-        # see also distutils.sysconfig
-        compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
-
-    if stripSysroot:
-        try:
-            index = compiler_so.index('-isysroot')
-            # Strip this argument and the next one:
-            del compiler_so[index:index+2]
-        except ValueError:
-            pass
-
-    # Check if the SDK that is used during compilation actually exists,
-    # the universal build requires the usage of a universal SDK and not all
-    # users have that installed by default.
-    sysroot = None
-    if '-isysroot' in cc_args:
-        idx = cc_args.index('-isysroot')
-        sysroot = cc_args[idx+1]
-    elif '-isysroot' in compiler_so:
-        idx = compiler_so.index('-isysroot')
-        sysroot = compiler_so[idx+1]
-
-    if sysroot and not os.path.isdir(sysroot):
-        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
-                sysroot)
-        log.warn("Please check your Xcode installation")
-
-    return compiler_so
 
 class UnixCCompiler(CCompiler):
 
@@ -168,7 +109,8 @@ def preprocess(self, source, output_file=None, macros=None,
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
         if sys.platform == 'darwin':
-            compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+            compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                    cc_args + extra_postargs)
         try:
             self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
@@ -247,7 +189,7 @@ def link(self, target_desc, objects,
                     linker[i] = self.compiler_cxx[i]
 
                 if sys.platform == 'darwin':
-                    linker = _darwin_compiler_fixup(linker, ld_args)
+                    linker = _osx_support.compiler_fixup(linker, ld_args)
 
                 self.spawn(linker + ld_args)
             except DistutilsExecError as msg:
diff --git a/util.py b/util.py
index 9833bf95c0..67d8166349 100644
--- a/util.py
+++ b/util.py
@@ -98,94 +98,10 @@ def get_platform ():
         if m:
             release = m.group()
     elif osname[:6] == "darwin":
-        #
-        # For our purposes, we'll assume that the system version from
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
-        # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were
-        # MACOSX_DEPLOYMENT_TARGET.
-        from distutils.sysconfig import get_config_vars
-        cfgvars = get_config_vars()
-
-        macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
-
-        if 1:
-            # Always calculate the release of the running machine,
-            # needed to determine if we can build fat binaries or not.
-
-            macrelease = macver
-            # Get the system version. Reading this plist is a documented
-            # way to get the system version (see the documentation for
-            # the Gestalt Manager)
-            try:
-                f = open('/System/Library/CoreServices/SystemVersion.plist')
-            except IOError:
-                # We're on a plain darwin box, fall back to the default
-                # behaviour.
-                pass
-            else:
-                try:
-                    m = re.search(
-                            r'<key>ProductUserVisibleVersion</key>\s*' +
-                            r'<string>(.*?)</string>', f.read())
-                    if m is not None:
-                        macrelease = '.'.join(m.group(1).split('.')[:2])
-                    # else: fall back to the default behaviour
-                finally:
-                    f.close()
-
-        if not macver:
-            macver = macrelease
-
-        if macver:
-            from distutils.sysconfig import get_config_vars
-            release = macver
-            osname = "macosx"
-
-            if (macrelease + '.') >= '10.4.' and \
-                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
-                # The universal build will build fat binaries, but not on
-                # systems before 10.4
-                #
-                # Try to detect 4-way universal builds, those have machine-type
-                # 'universal' instead of 'fat'.
-
-                machine = 'fat'
-                cflags = get_config_vars().get('CFLAGS')
-
-                archs = re.findall('-arch\s+(\S+)', cflags)
-                archs = tuple(sorted(set(archs)))
-
-                if len(archs) == 1:
-                    machine = archs[0]
-                elif archs == ('i386', 'ppc'):
-                    machine = 'fat'
-                elif archs == ('i386', 'x86_64'):
-                    machine = 'intel'
-                elif archs == ('i386', 'ppc', 'x86_64'):
-                    machine = 'fat3'
-                elif archs == ('ppc64', 'x86_64'):
-                    machine = 'fat64'
-                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
-                    machine = 'universal'
-                else:
-                    raise ValueError(
-                       "Don't know machine value for archs=%r"%(archs,))
-
-            elif machine == 'i386':
-                # On OSX the machine type returned by uname is always the
-                # 32-bit variant, even if the executable architecture is
-                # the 64-bit variant
-                if sys.maxsize >= 2**32:
-                    machine = 'x86_64'
-
-            elif machine in ('PowerPC', 'Power_Macintosh'):
-                # Pick a sane name for the PPC architecture.
-                machine = 'ppc'
-
-                # See 'i386' case
-                if sys.maxsize >= 2**32:
-                    machine = 'ppc64'
+        import _osx_support, distutils.sysconfig
+        osname, release, machine = _osx_support.get_platform_osx(
+                                        distutils.sysconfig.get_config_vars(),
+                                        osname, release, machine)
 
     return "%s-%s-%s" % (osname, release, machine)
 

From 832ac33b66bfba9d2826a50a31d656bf813dcba4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 16:59:55 -0400
Subject: [PATCH 3499/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : d5bef70d399dc0a4723cb589a2f92628d9695b46
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2707f01cdc..bb8cb52d82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.28
+------
+
+* Issue 294: setup.py can now be invoked from any directory.
+
+
 ------
 0.6.27
 ------

From cbb03edb6cf43016eed584f42506458893e4be05 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 17:04:33 -0400
Subject: [PATCH 3500/8469] Reorganized imports

--HG--
branch : distribute
extra : rebase_source : 6836f95f7e0668d6bd3e34f915d16de21d4f3731
---
 setuptools/command/easy_install.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 49a2c41e42..f226023604 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -10,7 +10,15 @@
 __ http://packages.python.org/distribute/easy_install.html
 
 """
-import sys, os, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
+import sys
+import os
+import zipimport
+import shutil
+import tempfile
+import zipfile
+import re
+import stat
+import random
 from glob import glob
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup

From cfaa9e966754c4305d01ce53ed00c3a091a896bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 17:05:35 -0400
Subject: [PATCH 3501/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : 81739cfc4802c4611cf2cffaf02ad9cdbe2046bb
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bb8cb52d82..673d7aecd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ CHANGES
 ------
 
 * Issue 294: setup.py can now be invoked from any directory.
-
+* Scripts are now installed honoring the umask.
 
 ------
 0.6.27

From 3a042756a6f849a81171204d1f922214fe8483f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 17:22:11 -0400
Subject: [PATCH 3502/8469] Updated changelog and contributors

--HG--
branch : distribute
extra : rebase_source : 478c91acb47b8ccb53d39877d5313b2f8803f815
---
 CHANGES.txt      | 1 +
 CONTRIBUTORS.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 673d7aecd1..7502ecac7f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Issue 294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
+* Added support for .dist-info directories.
 
 ------
 0.6.27
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9ef062c773..2ec6b3e6df 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -7,8 +7,11 @@ Contributors
 * Arfrever Frehtes Taifersar Arahesis
 * Christophe Combelles
 * Daniel Stutzbach
+* David Hoth
 * Hanno Schlichting
 * Jannis Leidel
+* Jason R. Coombs
+* Justin Azoff
 * Lennart Regebro
 * Martin von Löwis
 * Noufal Ibrahim

From 834b8b7521dbbd2bd25e66e428ba56d2ec78ce83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 17:26:07 -0400
Subject: [PATCH 3503/8469] Updated contributors

--HG--
branch : distribute
extra : rebase_source : dc5556f7a904b267bff352c5d4d10a96c1cd9612
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 2ec6b3e6df..65dd003997 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -11,6 +11,7 @@ Contributors
 * Hanno Schlichting
 * Jannis Leidel
 * Jason R. Coombs
+* Jim Fulton
 * Justin Azoff
 * Lennart Regebro
 * Martin von Löwis

From f8f7c6f7a315878e0c40baa64c5629f78a184a36 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Jul 2012 17:30:40 -0400
Subject: [PATCH 3504/8469] Updated changelog and contributors

--HG--
branch : distribute
extra : rebase_source : 41f0e72127b695aec4a0c74eb511dbf44841d0e5
---
 CHANGES.txt      | 3 ++-
 CONTRIBUTORS.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 149b1fed04..14f26d2676 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,8 @@ CHANGES
 * Issue 294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
 * Added support for .dist-info directories.
-* Issue #283 bdist_egg issues with python 3.3.0aX
+* Issue #283 bdist_egg issues with python 3.3.0aX.
+* Test and fix for marshal.load of .pyc files on Python 3.3.
 
 ------
 0.6.27
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 65dd003997..d44bdbee29 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -14,6 +14,7 @@ Contributors
 * Jim Fulton
 * Justin Azoff
 * Lennart Regebro
+* Marc Abramowitz
 * Martin von Löwis
 * Noufal Ibrahim
 * Philip Jenvey

From a0418246ba7379453fadeb07a77c10770751f25e Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sun, 22 Jul 2012 02:56:36 -0700
Subject: [PATCH 3505/8469] Issue #15184: Some config variables in
 test_sysconfig_module may differ between sysconfig and distutils.sysconfig
 due to compiler customizations on OS X.  For now, move those vars into a
 separate test and skip if the customization has taken place in distutils. 
 The long-term solution is to eliminate having two sysconfig modules.

---
 tests/test_sysconfig.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index fbe26bf65d..545ef3b548 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -102,7 +102,27 @@ def test_sysconfig_module(self):
         import sysconfig as global_sysconfig
         self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
         self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
-        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),sysconfig.get_config_var('LDSHARED'))
+
+    @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),'compiler flags customized')
+    def test_sysconfig_compiler_vars(self):
+        # On OS X, binary installers support extension module building on
+        # various levels of the operating system with differing Xcode
+        # configurations.  This requires customization of some of the
+        # compiler configuration directives to suit the environment on
+        # the installed machine.  Some of these customizations may require
+        # running external programs and, so, are deferred until needed by
+        # the first extension module build.  With Python 3.3, only
+        # the Distutils version of sysconfig is used for extension module
+        # builds, which happens earlier in the Distutils tests.  This may
+        # cause the following tests to fail since no tests have caused
+        # the global version of sysconfig to call the customization yet.
+        # The solution for now is to simply skip this test in this case.
+        # The longer-term solution is to only have one version of sysconfig.
+
+        import sysconfig as global_sysconfig
+        if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
+            return
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
         self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
 
 

From e34bf059df2e3f4812cf404749a2a6ca5d11dbcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 10:05:50 -0400
Subject: [PATCH 3506/8469] Adding travis.yml

--HG--
branch : distribute
extra : rebase_source : 01170ff9a0cb5380ae6a80727b7dade0edbd2986
---
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 travis.yml                           |   7 ++
 2 files changed, 69 insertions(+), 62 deletions(-)
 create mode 100644 travis.yml

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..2965458969 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/travis.yml b/travis.yml
new file mode 100644
index 0000000000..50f0e0b910
--- /dev/null
+++ b/travis.yml
@@ -0,0 +1,7 @@
+language: python
+python:
+  - 2.6
+  - 2.7
+  - 3.2
+# command to run tests
+script: python setup.py test

From 0d946957cc6d96ae4bbbd4f960a2e661331d0554 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 10:14:56 -0400
Subject: [PATCH 3507/8469] Add the install section back (I suspect it may be
 required to indicate a Python project).

--HG--
branch : distribute
extra : rebase_source : 1741ce7955e97e5f4837bcf9d64df56ac4bb4e78
---
 travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis.yml b/travis.yml
index 50f0e0b910..605923d348 100644
--- a/travis.yml
+++ b/travis.yml
@@ -3,5 +3,7 @@ python:
   - 2.6
   - 2.7
   - 3.2
+# install
+install: python --version
 # command to run tests
 script: python setup.py test

From ca8ed621f70c8be3944f2dc554bf9b70196ccb39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 10:17:55 -0400
Subject: [PATCH 3508/8469] Renamed travis.yml to correctly match the spec

--HG--
branch : distribute
extra : rebase_source : 4541bc1ab7af8fb6fbc54f68a0de8c473baa8a4d
---
 travis.yml => .travis.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename travis.yml => .travis.yml (100%)

diff --git a/travis.yml b/.travis.yml
similarity index 100%
rename from travis.yml
rename to .travis.yml

From 08b3db92e72b9ab3d91c5cf604b4ef734d256da9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:06:00 -0400
Subject: [PATCH 3509/8469] Updated Trove classifiers to indicate supported
 Python versions

--HG--
branch : distribute
extra : rebase_source : 430e99bf42cb46f6ac996d26d5b2fd1f0000418e
---
 .travis.yml | 2 ++
 setup.py    | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 605923d348..6239f00980 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: python
 python:
+  - 2.4
+  - 2.5
   - 2.6
   - 2.7
   - 3.2
diff --git a/setup.py b/setup.py
index 4294f3f96c..db469b92a4 100755
--- a/setup.py
+++ b/setup.py
@@ -207,7 +207,10 @@ def _being_installed():
         License :: OSI Approved :: Python Software Foundation License
         License :: OSI Approved :: Zope Public License
         Operating System :: OS Independent
-        Programming Language :: Python
+        Programming Language :: Python :: 2.4
+        Programming Language :: Python :: 2.5
+        Programming Language :: Python :: 2.6
+        Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging

From a84dcfa051d9fe02a5304a557b3527da21f45820 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:09:25 -0400
Subject: [PATCH 3510/8469] Added link to Travis-CI tests

--HG--
branch : distribute
extra : rebase_source : ab6f122c2b3a9533c9c2ee7f1ed845437acf75b7
---
 release.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release.py b/release.py
index 487e6d584f..54a361752c 100644
--- a/release.py
+++ b/release.py
@@ -96,6 +96,7 @@ def do_release():
 		print("Please do that")
 		raise SystemExit(1)
 
+	print("Travis-CI tests: http://travis-ci.org/#!/jaraco/distribute")
 	res = raw_input('Have you or has someone verified that the tests '
 		'pass on this revision? ')
 	if not res.lower().startswith('y'):

From 4af2d58dbfad9be4bd9df2612c8292bc29f8f4e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:12:19 -0400
Subject: [PATCH 3511/8469] Updated contributors with the correct name

--HG--
branch : distribute
extra : rebase_source : bf6243f89aad29eb1e52405175cff8f3412d6573
---
 CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d44bdbee29..852662391a 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -7,7 +7,7 @@ Contributors
 * Arfrever Frehtes Taifersar Arahesis
 * Christophe Combelles
 * Daniel Stutzbach
-* David Hoth
+* Daniel Holth
 * Hanno Schlichting
 * Jannis Leidel
 * Jason R. Coombs

From 9d94aa8feb11530c01dbc9d594f4a5f5c20740ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:15:53 -0400
Subject: [PATCH 3512/8469] Updated imports, removed excess whitespace

--HG--
branch : distribute
extra : rebase_source : a2cc4dde8a9a5de8c92e277099610e507fce2973
---
 setuptools/tests/test_dist_info.py | 31 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 119cc68bcd..fede54da91 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -1,6 +1,10 @@
 """Test .dist-info style distributions.
 """
-import os, shutil, tempfile, unittest
+import os
+import shutil
+import tempfile
+import unittest
+
 import pkg_resources
 from pkg_resources import Requirement
 try:
@@ -15,29 +19,29 @@ def test_distinfo(self):
         dists = {}
         for d in pkg_resources.find_distributions(self.tmpdir):
             dists[d.project_name] = d
-            
+
         assert len(dists) == 2, dists
-            
+
         unversioned = dists['UnversionedDistribution']
         versioned = dists['VersionedDistribution']
-        
-        assert versioned.version == '2.718' # from filename        
+
+        assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
-                
-    @unittest.skipIf(not has_markerlib, 
-                     "install markerlib to test conditional dependencies") 
+
+    @unittest.skipIf(not has_markerlib,
+                     "install markerlib to test conditional dependencies")
     def test_conditional_dependencies(self):
-        requires = [Requirement.parse('splort==4'), 
+        requires = [Requirement.parse('splort==4'),
                     Requirement.parse('quux>=1.1')]
-        
+
         for d in pkg_resources.find_distributions(self.tmpdir):
             self.assertEquals(d.requires(), requires[:1])
             self.assertEquals(d.requires(extras=('baz',)), requires)
-            self.assertEquals(d.extras, ['baz'])        
+            self.assertEquals(d.extras, ['baz'])
 
     def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
-        versioned = os.path.join(self.tmpdir, 
+        versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
         open(os.path.join(versioned, 'METADATA'), 'w+').write(
@@ -48,7 +52,7 @@ def setUp(self):
 Requires-Dist: quux (>=1.1); extra == 'baz'
 """)
 
-        unversioned = os.path.join(self.tmpdir, 
+        unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
         open(os.path.join(unversioned, 'METADATA'), 'w+').write(
@@ -62,4 +66,3 @@ def setUp(self):
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)
-

From 4f7bf7c846ae9761bd10a44f60c656b9741d69be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:21:02 -0400
Subject: [PATCH 3513/8469] Use DALS to avoid breaking indentation in test
 setup. Removed flag indicating presence of module.

--HG--
branch : distribute
extra : rebase_source : 48d8347f667ec05c28505bc76880dcd64dc43204
---
 setuptools/tests/test_dist_info.py | 48 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index fede54da91..318cd97336 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -4,14 +4,18 @@
 import shutil
 import tempfile
 import unittest
+import textwrap
 
-import pkg_resources
-from pkg_resources import Requirement
 try:
     import markerlib
-    has_markerlib = True
 except:
-    has_markerlib = False
+    pass
+
+import pkg_resources
+
+def DALS(s):
+    "dedent and left-strip"
+    return textwrap.dedent(s).lstrip()
 
 class TestDistInfo(unittest.TestCase):
 
@@ -28,11 +32,11 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @unittest.skipIf(not has_markerlib,
+    @unittest.skipIf('markerlib' not in globals(),
                      "install markerlib to test conditional dependencies")
     def test_conditional_dependencies(self):
-        requires = [Requirement.parse('splort==4'),
-                    Requirement.parse('quux>=1.1')]
+        requires = [pkg_resources.Requirement.parse('splort==4'),
+                    pkg_resources.Requirement.parse('quux>=1.1')]
 
         for d in pkg_resources.find_distributions(self.tmpdir):
             self.assertEquals(d.requires(), requires[:1])
@@ -44,25 +48,25 @@ def setUp(self):
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
-        open(os.path.join(versioned, 'METADATA'), 'w+').write(
-"""Metadata-Version: 1.2
-Name: VersionedDistribution
-Requires-Dist: splort (4)
-Provides-Extra: baz
-Requires-Dist: quux (>=1.1); extra == 'baz'
-""")
+        open(os.path.join(versioned, 'METADATA'), 'w+').write(DALS(
+            """Metadata-Version: 1.2
+            Name: VersionedDistribution
+            Requires-Dist: splort (4)
+            Provides-Extra: baz
+            Requires-Dist: quux (>=1.1); extra == 'baz'
+            """))
 
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
-        open(os.path.join(unversioned, 'METADATA'), 'w+').write(
-"""Metadata-Version: 1.2
-Name: UnversionedDistribution
-Version: 0.3
-Requires-Dist: splort (==4)
-Provides-Extra: baz
-Requires-Dist: quux (>=1.1); extra == 'baz'
-""")
+        open(os.path.join(unversioned, 'METADATA'), 'w+').write(DALS(
+            """Metadata-Version: 1.2
+            Name: UnversionedDistribution
+            Version: 0.3
+            Requires-Dist: splort (==4)
+            Provides-Extra: baz
+            Requires-Dist: quux (>=1.1); extra == 'baz'
+            """))
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)

From 2cbbedf7be98fd3f43ab8897f68e36c18e2bef9a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:35:47 -0400
Subject: [PATCH 3514/8469] Added python 2.4-2.6 support for skipIf

--HG--
branch : distribute
extra : rebase_source : cac18ef7c3dbde38ceac3a0c71cfb3b5ffa56dd5
---
 setuptools/tests/py26compat.py     | 13 +++++++++++++
 setuptools/tests/test_dist_info.py |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 setuptools/tests/py26compat.py

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
new file mode 100644
index 0000000000..ddf2ceb0b6
--- /dev/null
+++ b/setuptools/tests/py26compat.py
@@ -0,0 +1,13 @@
+import unittest
+
+try:
+	# provide skipIf for Python 2.4-2.6
+	skipIf = unittest.skipIf
+except AttributeError:
+	def skipIf(condition, reason):
+		def skipper(func):
+			def skip(*args, **kwargs):
+				return
+			if condition:
+				return skip
+			return func
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 318cd97336..cf8fb0f9ae 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -13,6 +13,8 @@
 
 import pkg_resources
 
+from setuptools.tests.py26compat import skipIf
+
 def DALS(s):
     "dedent and left-strip"
     return textwrap.dedent(s).lstrip()

From b34497eb49a2d498295d6ad12a77c48e69529410 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:43:05 -0400
Subject: [PATCH 3515/8469] Travis doesn't support Python 2.4 (and never will).

--HG--
branch : distribute
extra : rebase_source : 8a5e9acf606b18a5b88f3df1a108f9990bc4b891
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6239f00980..719323f4d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.4
   - 2.5
   - 2.6
   - 2.7

From 7bc21a080559758ed92d03c238d5b51bbf2c8835 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:44:27 -0400
Subject: [PATCH 3516/8469] Nothing during install

--HG--
branch : distribute
extra : rebase_source : 225691c27a718f11a94b31e8a661d56d3becc5b9
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 719323f4d3..cbc671e744 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,5 @@ python:
   - 2.6
   - 2.7
   - 3.2
-# install
-install: python --version
 # command to run tests
 script: python setup.py test

From e10bb776722f4dd1d5bcda17adcc557ea0eb8b14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:45:53 -0400
Subject: [PATCH 3517/8469] Use compatible skipIf

--HG--
branch : distribute
extra : rebase_source : 4964057db0c3186c1c8b9e934cf23f1b4ddcb167
---
 setuptools/tests/test_dist_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index cf8fb0f9ae..68ba9e2494 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -34,8 +34,8 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @unittest.skipIf('markerlib' not in globals(),
-                     "install markerlib to test conditional dependencies")
+    @skipIf('markerlib' not in globals(),
+        "install markerlib to test conditional dependencies")
     def test_conditional_dependencies(self):
         requires = [pkg_resources.Requirement.parse('splort==4'),
                     pkg_resources.Requirement.parse('quux>=1.1')]

From 22366805a3a7b6292774491db04792851a341b6f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 15:51:14 -0400
Subject: [PATCH 3518/8469] Fix compatibility skipIf

--HG--
branch : distribute
extra : rebase_source : a70fd5755fad7a30c478c44e270c1dad13e66a47
---
 setuptools/tests/py26compat.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index ddf2ceb0b6..d4fb891af6 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -11,3 +11,4 @@ def skip(*args, **kwargs):
 			if condition:
 				return skip
 			return func
+		return skipper

From 0cb6b8bebf4f16d9187827d843f5cdd908067b09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:01:06 -0400
Subject: [PATCH 3519/8469] Expand error message to help detect why this test
 fails on travis

--HG--
branch : distribute
extra : rebase_source : 9182fc8c4544cde849fdac373b558f9078af1254
---
 setuptools/tests/test_packageindex.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index f10b5ee80d..776382d022 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -70,10 +70,12 @@ def test_bad_url_double_scheme(self):
             index.open_url(url)
         except distutils.errors.DistutilsError, error:
             # Python 2.7.3
-            self.assert_('getaddrinfo failed' in str(error))
+            self.assertTrue('getaddrinfo failed' in str(error), "error was " +
+                str(error))
         except httplib.InvalidURL, error:
             # Python 2.7.2 and earlier
-            self.assert_('nonnumeric port' in str(error))
+            self.assertTrue('nonnumeric port' in str(error), "error was " +
+                str(error))
 
     def test_bad_url_screwy_href(self):
         index = setuptools.package_index.PackageIndex(
@@ -141,5 +143,3 @@ def test_parse_bdist_wininst(self):
             'reportlab-2.5.win-amd64-py2.7.exe'), ('reportlab-2.5', '2.7', 'win-amd64'))
         self.assertEqual(setuptools.package_index.parse_bdist_wininst(
             'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64'))
-
-

From 6ee14089b193c7e179fc2a0472644f5684d8bef4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:26:37 -0400
Subject: [PATCH 3520/8469] Update this test again to ensure it's trapping the
 expected exception (DistutilsError) and ensuring that it captures the
 expected error messages.

--HG--
branch : distribute
extra : rebase_source : b66947d43758f4cbea407043dfbeffdf3aaf9b01
---
 setuptools/tests/test_packageindex.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 5e424dd659..09e78bb303 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -60,6 +60,9 @@ def _urlopen(*args):
             urllib2.urlopen = old_urlopen
 
     def test_bad_url_double_scheme(self):
+        """
+        A bad URL with a double scheme should raise a DistutilsError.
+        """
         index = setuptools.package_index.PackageIndex(
             hosts=('www.example.com',)
         )
@@ -69,11 +72,9 @@ def test_bad_url_double_scheme(self):
         try:
             index.open_url(url)
         except distutils.errors.DistutilsError, error:
-            # Python 2.7.3
-            self.assert_('getaddrinfo failed' in str(error))
-        except httplib.InvalidURL, error:
-            # Python 2.7.2 and earlier
-            self.assert_('nonnumeric port' in str(error))
+            msg = unicode(error)
+            assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg
+        raise RuntimeError("Did not raise")
 
     def test_bad_url_screwy_href(self):
         index = setuptools.package_index.PackageIndex(

From 4b2a1a13fd5e01804b4fb281aea59407ccde43e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:34:19 -0400
Subject: [PATCH 3521/8469] Don't raise when exception is caught

--HG--
branch : distribute
extra : rebase_source : 9da60528c7ace0a59bf1d92c6e155bba2e11ef18
---
 setuptools/tests/test_packageindex.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 107a57b693..1b4d2fdf59 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -74,6 +74,7 @@ def test_bad_url_double_scheme(self):
         except distutils.errors.DistutilsError, error:
             msg = unicode(error)
             assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg
+            return
         raise RuntimeError("Did not raise")
 
     def test_bad_url_screwy_href(self):

From 80d5fa167350f89a7bb6dcdf1521c51e5466851c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:56:53 -0400
Subject: [PATCH 3522/8469] Check that Sphinx is installed before proceeding

--HG--
branch : distribute
extra : rebase_source : 369ae02ec1ac1825c2586d6f5efc59f37a58b3df
---
 release.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/release.py b/release.py
index 54a361752c..9a1f0f3c8e 100644
--- a/release.py
+++ b/release.py
@@ -89,6 +89,9 @@ def bump_version(filename):
 def do_release():
 	assert all(map(os.path.exists, files_with_versions)), (
 		"Expected file(s) missing")
+
+	assert has_sphinx(), "You must have Sphinx installed to release"
+
 	res = raw_input('Have you read through the SCM changelog and '
 		'confirmed the changelog is current for releasing {VERSION}? '
 		.format(**globals()))
@@ -131,6 +134,15 @@ def do_release():
 
 	add_milestone_and_version()
 
+def has_sphinx():
+	try:
+		devnull = open(os.path.devnull, 'wb')
+		subprocess.Popen(['sphinx-build', '--version'], stdout=devnull,
+			stderr=subprocess.STDOUT).wait()
+	except Exception:
+		return False
+	return True
+
 def build_docs():
 	if not os.path.isdir('docs'):
 		return

From 826d15b5981a50ce28f63b40020174f6d9ae823d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:57:53 -0400
Subject: [PATCH 3523/8469] Added tag 0.6.28 for changeset fc379e63586a

--HG--
branch : distribute
extra : rebase_source : 420bd55061dd7234c65482ca417995b5646e924a
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 93f0176332..287e85d21e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -36,3 +36,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25
 b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
 469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27
+fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28

From be5acb407cfa5dd1ff37ac1ed68d96ba92302cc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jul 2012 16:58:22 -0400
Subject: [PATCH 3524/8469] Bumped to 0.6.29 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 44417a6112b166bdfa875da05254ba206ef34cab
---
 README.txt                           |   6 +-
 distribute.egg-info/entry_points.txt | 124 +++++++++++++--------------
 distribute_setup.py                  |   2 +-
 docs/conf.py                         |   4 +-
 release.py                           |   2 +-
 setup.py                             |   2 +-
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/README.txt b/README.txt
index 5d025d6124..679b255138 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.28.tar.gz
-    $ tar -xzvf distribute-0.6.28.tar.gz
-    $ cd distribute-0.6.28
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.29.tar.gz
+    $ tar -xzvf distribute-0.6.29.tar.gz
+    $ cd distribute-0.6.29
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2965458969..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+develop = setuptools.command.develop:develop
+setopt = setuptools.command.setopt:setopt
+build_py = setuptools.command.build_py:build_py
+saveopts = setuptools.command.saveopts:saveopts
+egg_info = setuptools.command.egg_info:egg_info
+register = setuptools.command.register:register
+upload_docs = setuptools.command.upload_docs:upload_docs
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
+test = setuptools.command.test:test
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+namespace_packages = setuptools.dist:check_nsp
+test_suite = setuptools.dist:check_test_suite
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/distribute_setup.py b/distribute_setup.py
index 8f5b0637bf..dd24ec1e52 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.28"
+DEFAULT_VERSION = "0.6.29"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index e7011e26ba..7b82a884b2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.28'
+version = '0.6.29'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.28'
+release = '0.6.29'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 9a1f0f3c8e..f4f88bac35 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.28'
+VERSION = '0.6.29'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index db469b92a4..9df6bb495e 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.28"
+VERSION = "0.6.29"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From c9884d20b6860356be4f167ece51b54bd7a3da61 Mon Sep 17 00:00:00 2001
From: iElectric <none@none>
Date: Wed, 15 Aug 2012 23:17:55 +0200
Subject: [PATCH 3525/8469] Fix #231, second try.

--HG--
branch : distribute
extra : rebase_source : 72d5afb5f7f7ce1b57adb0bbec68bec003c6e699
---
 distribute_setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distribute_setup.py b/distribute_setup.py
index dd24ec1e52..f3199d125b 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -316,6 +316,7 @@ def _create_fake_setuptools_pkg_info(placeholder):
 
     if not os.access(pkg_info, os.W_OK):
         log.warn("Don't have permissions to write %s, skipping", pkg_info)
+        return
 
     log.warn('Creating %s', pkg_info)
     f = open(pkg_info, 'w')

From a4b326909d1f64037412b5048d59199bc6b648e8 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 20 Aug 2012 19:28:30 +0200
Subject: [PATCH 3526/8469] I guess nobody uses test.sh anymore, since it's
 unmaintained. Updated anyway.

--HG--
branch : distribute
extra : rebase_source : d4105c985efec3f6d7e298615299c5cc9359cbc2
---
 test.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test.sh b/test.sh
index 883271a4de..8f5ec654fc 100644
--- a/test.sh
+++ b/test.sh
@@ -1,13 +1,4 @@
 #!/bin/sh
-echo -n "Running tests for Python 2.3..."
-python2.3 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
 echo -n "Running tests for Python 2.4..."
 python2.4 setup.py -q test > /dev/null 2> /dev/null
 if [ $? -ne 0 ];then
@@ -45,3 +36,13 @@ else
     echo "Success"
 fi
 
+rm -rf build
+echo -n "Running tests for Python 3.2..."
+python3.2 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+

From ce53222d269dbf6bed8d97ed01437aba89faba53 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 20 Aug 2012 19:35:57 +0200
Subject: [PATCH 3527/8469] And Python 2.7, of course.

--HG--
branch : distribute
extra : rebase_source : 81e1d3c6e30c8096505bfdfd25bfe49b5dc37953
---
 distribute.egg-info/entry_points.txt | 2 +-
 test.sh                              | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..2c61c9c828 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-3.1 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/test.sh b/test.sh
index 8f5ec654fc..d62248f2c4 100644
--- a/test.sh
+++ b/test.sh
@@ -26,6 +26,15 @@ else
     echo "Success"
 fi
 
+echo -n "Running tests for Python 2.7..."
+python2.7 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+
 rm -rf build
 echo -n "Running tests for Python 3.1..."
 python3.1 setup.py -q test > /dev/null 2> /dev/null

From c8558d8d3b6c2cae273637ccec616489c2e7b439 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 21 Aug 2012 17:29:47 +0200
Subject: [PATCH 3528/8469] Add failing test for #301.

--HG--
branch : distribute
extra : rebase_source : 2972e762cdab88e90c1c8b9b9a336afc641e996f
---
 setuptools/command/test.py    |   3 +-
 setuptools/tests/test_test.py | 112 ++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/tests/test_test.py

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index b7aef9697a..59c10e84d3 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -141,9 +141,10 @@ def run_tests(self):
         import unittest
         loader_ep = EntryPoint.parse("x="+self.test_loader)
         loader_class = loader_ep.load(require=False)
+        cks = loader_class()
         unittest.main(
             None, None, [unittest.__file__]+self.test_args,
-            testLoader = loader_class()
+            testLoader = cks
         )
 
 
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
new file mode 100644
index 0000000000..7194399af4
--- /dev/null
+++ b/setuptools/tests/test_test.py
@@ -0,0 +1,112 @@
+"""develop tests
+"""
+import sys
+import os, shutil, tempfile, unittest
+import tempfile
+import site
+from StringIO import StringIO
+
+from distutils.errors import DistutilsError
+from setuptools.command.test import test
+from setuptools.command import easy_install as easy_install_pkg
+from setuptools.dist import Distribution
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(name='foo')
+"""
+
+NS_INIT = """try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
+"""
+TEST_PY = """import unittest
+
+class TestTest(unittest.TestCase):
+    def test_test(self):
+        print "Foo" # Should fail under Python 3 unless 2to3 is used
+
+test_suite = unittest.makeSuite(TestTest)
+"""
+
+class TestTestTest(unittest.TestCase):
+
+    def setUp(self):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+            return
+
+        # Directory structure
+        self.dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(self.dir, 'name'))
+        os.mkdir(os.path.join(self.dir, 'name', 'space'))
+        os.mkdir(os.path.join(self.dir, 'name', 'space', 'tests'))
+        # setup.py
+        setup = os.path.join(self.dir, 'setup.py')
+        f = open(setup, 'w')
+        f.write(SETUP_PY)
+        f.close()
+        self.old_cwd = os.getcwd()
+        # name/__init__.py
+        init = os.path.join(self.dir, 'name', '__init__.py')
+        f = open(init, 'w')
+        f.write(NS_INIT)
+        f.close()
+        # name/space/__init__.py
+        init = os.path.join(self.dir, 'name', 'space', '__init__.py')
+        f = open(init, 'w')
+        f.write('#empty\n')
+        f.close()
+        # name/space/tests/__init__.py
+        init = os.path.join(self.dir, 'name', 'space', 'tests', '__init__.py')
+        f = open(init, 'w')
+        f.write(TEST_PY)
+        f.close()
+        
+        os.chdir(self.dir)
+        self.old_base = site.USER_BASE
+        site.USER_BASE = tempfile.mkdtemp()
+        self.old_site = site.USER_SITE
+        site.USER_SITE = tempfile.mkdtemp()
+
+    def tearDown(self):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+            return
+        
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.dir)
+        shutil.rmtree(site.USER_BASE)
+        shutil.rmtree(site.USER_SITE)
+        site.USER_BASE = self.old_base
+        site.USER_SITE = self.old_site
+
+    def test_test(self):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+            return
+        
+        dist = Distribution(dict(
+            script_name='setup.py',
+            script_args=['bdist_egg'],
+            name='foo',
+            py_modules=['name'],
+            namespace_packages=['name'],
+            test_suite='name.space.tests.test_suite',
+            ))
+        dist.script_name = 'setup.py'
+        cmd = test(dist)
+        cmd.user = 1
+        cmd.ensure_finalized()
+        cmd.install_dir = site.USER_SITE
+        cmd.user = 1
+        old_stdout = sys.stdout
+        sys.stdout = StringIO()
+        try:
+            cmd.run()
+        except SystemExit: # The test runner calls sys.exit, stop that making an error.
+            pass
+        finally:
+            sys.stdout = old_stdout
+
+test_suite = unittest.makeSuite(TestTestTest)

From 78ac59d4ab00868456155cd3f83be15f78acccf3 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 21 Aug 2012 18:56:02 +0200
Subject: [PATCH 3529/8469] Once the test is correctly setup, the problem
 actually goes away.

--HG--
branch : distribute
extra : rebase_source : 8a1c310010599165aa973bb207b07616428df66b
---
 setuptools/tests/test_test.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 7194399af4..5000f234f6 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -14,10 +14,15 @@
 SETUP_PY = """\
 from setuptools import setup
 
-setup(name='foo')
+setup(name='foo',
+    packages=['name', 'name.space', 'name.space.tests'],
+    namespace_packages=['name'],
+    test_suite='name.space.tests.test_suite',
+)
 """
 
-NS_INIT = """try:
+NS_INIT = """
+try:
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
@@ -87,12 +92,11 @@ def test_test(self):
             return
         
         dist = Distribution(dict(
-            script_name='setup.py',
-            script_args=['bdist_egg'],
             name='foo',
-            py_modules=['name'],
+            packages=['name', 'name.space', 'name.space.tests'],
             namespace_packages=['name'],
             test_suite='name.space.tests.test_suite',
+            use_2to3=True,
             ))
         dist.script_name = 'setup.py'
         cmd = test(dist)

From 61f4c9c4cbf148253c9e06f3e05757e01affeb6e Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 21 Aug 2012 19:05:36 +0200
Subject: [PATCH 3530/8469] Added failing test for #299.

--HG--
branch : distribute
extra : rebase_source : 4a3ac76a6a49e06e1fecd1d6f4e08fa922f82f73
---
 setuptools/tests/test_develop.py | 48 ++++++++++++++++++++++++--------
 setuptools/tests/test_test.py    |  2 --
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 5576d5e5f2..f345d8fc72 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -14,33 +14,51 @@
 SETUP_PY = """\
 from setuptools import setup
 
-setup(name='foo')
+setup(name='foo',
+    packages=['foo'],
+)
+"""
+
+INIT_PY = """print "foo"
 """
 
 class TestDevelopTest(unittest.TestCase):
 
     def setUp(self):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+            return
+
+        # Directory structure
         self.dir = tempfile.mkdtemp()
+        os.mkdir(os.path.join(self.dir, 'foo'))
+        # setup.py
         setup = os.path.join(self.dir, 'setup.py')
         f = open(setup, 'w')
         f.write(SETUP_PY)
         f.close()
         self.old_cwd = os.getcwd()
+        # foo/__init__.py
+        init = os.path.join(self.dir, 'foo', '__init__.py')
+        f = open(init, 'w')
+        f.write(INIT_PY)
+        f.close()
+        
         os.chdir(self.dir)
-        if sys.version >= "2.6":
-            self.old_base = site.USER_BASE
-            site.USER_BASE = tempfile.mkdtemp()
-            self.old_site = site.USER_SITE
-            site.USER_SITE = tempfile.mkdtemp()
+        self.old_base = site.USER_BASE
+        site.USER_BASE = tempfile.mkdtemp()
+        self.old_site = site.USER_SITE
+        site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self):
+        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+            return
+        
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
-        if sys.version >= "2.6":
-            shutil.rmtree(site.USER_BASE)
-            shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
+        shutil.rmtree(site.USER_BASE)
+        shutil.rmtree(site.USER_SITE)
+        site.USER_BASE = self.old_base
+        site.USER_SITE = self.old_site
 
     def test_develop(self):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
@@ -64,6 +82,14 @@ def test_develop(self):
         content.sort()
         self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
 
+        # Check that we are using the right code.
+        path = open(os.path.join(site.USER_SITE, 'UNKNOWN.egg-link'), 'rt').read().split()[0].strip()
+        init = open(os.path.join(path, 'foo', '__init__.py'), 'rt').read().strip()
+        if sys.version < "3":
+            self.assertEquals(init, 'print "foo"')
+        else:
+            self.assertEquals(init, 'print("foo")')
+
     def test_develop_with_setup_requires(self):
 
         wanted = ("Could not find suitable distribution for "
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 5000f234f6..87ccaf448e 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -112,5 +112,3 @@ def test_test(self):
             pass
         finally:
             sys.stdout = old_stdout
-
-test_suite = unittest.makeSuite(TestTestTest)

From 42afe54cf9e15ef655e7ed5fef9483682fcd5af2 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 21 Aug 2012 20:52:16 +0200
Subject: [PATCH 3531/8469] Added fix for the develop command, #299.

--HG--
branch : distribute
extra : rebase_source : ef69472e5a9ce97d9102578898e81e516f06497a
---
 distribute.egg-info/entry_points.txt |  2 +-
 setuptools/command/develop.py        | 34 ++++++++++++++++++++++++----
 setuptools/tests/test_develop.py     | 16 +++++++++----
 setuptools/tests/test_test.py        |  7 +++---
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 2c61c9c828..663882d630 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -32,7 +32,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.1 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 93b7773ccc..c8bef72ef7 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -84,11 +84,35 @@ def finalize_options(self):
                 " installation directory", p, normalize_path(os.curdir))
 
     def install_for_development(self):
-        # Ensure metadata is up-to-date
-        self.run_command('egg_info')
-        # Build extensions in-place
-        self.reinitialize_command('build_ext', inplace=1)
-        self.run_command('build_ext')
+        if getattr(self.distribution, 'use_2to3', False):
+            # If we run 2to3 we can not do this inplace:
+
+            # Ensure metadata is up-to-date
+            self.reinitialize_command('build_py', inplace=0)
+            self.run_command('build_py')
+            bpy_cmd = self.get_finalized_command("build_py")
+            build_path = normalize_path(bpy_cmd.build_lib)
+
+            # Build extensions
+            self.reinitialize_command('egg_info', egg_base=build_path)
+            self.run_command('egg_info')
+
+            self.reinitialize_command('build_ext', inplace=0)
+            self.run_command('build_ext')
+            
+            # Fixup egg-link and easy-install.pth
+            ei_cmd = self.get_finalized_command("egg_info")
+            self.egg_path = build_path
+            self.dist.location = build_path
+            self.dist._provider = PathMetadata(build_path, ei_cmd.egg_info)    # XXX
+        else:
+            # Without 2to3 inplace works fine:
+            self.run_command('egg_info')
+
+            # Build extensions in-place
+            self.reinitialize_command('build_ext', inplace=1)
+            self.run_command('build_ext')
+        
         self.install_site_py()  # ensure that target dir is site-safe
         if setuptools.bootstrap_install_from:
             self.easy_install(setuptools.bootstrap_install_from)
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index f345d8fc72..fcf33c585e 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -16,6 +16,7 @@
 
 setup(name='foo',
     packages=['foo'],
+    use_2to3=True,
 )
 """
 
@@ -63,7 +64,12 @@ def tearDown(self):
     def test_develop(self):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
-        dist = Distribution()
+        dist = Distribution(
+            dict(name='foo',
+                 packages=['foo'],
+                 use_2to3=True,
+                 version='0.0',
+                 ))
         dist.script_name = 'setup.py'
         cmd = develop(dist)
         cmd.user = 1
@@ -71,7 +77,7 @@ def test_develop(self):
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
-        sys.stdout = StringIO()
+        #sys.stdout = StringIO()
         try:
             cmd.run()
         finally:
@@ -80,17 +86,17 @@ def test_develop(self):
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
         content.sort()
-        self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
+        self.assertEquals(content, ['easy-install.pth', 'foo.egg-link'])
 
         # Check that we are using the right code.
-        path = open(os.path.join(site.USER_SITE, 'UNKNOWN.egg-link'), 'rt').read().split()[0].strip()
+        path = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt').read().split()[0].strip()
         init = open(os.path.join(path, 'foo', '__init__.py'), 'rt').read().strip()
         if sys.version < "3":
             self.assertEquals(init, 'print "foo"')
         else:
             self.assertEquals(init, 'print("foo")')
 
-    def test_develop_with_setup_requires(self):
+    def notest_develop_with_setup_requires(self):
 
         wanted = ("Could not find suitable distribution for "
                   "Requirement.parse('I-DONT-EXIST')")
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 87ccaf448e..04134ec5fc 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -107,8 +107,9 @@ def test_test(self):
         old_stdout = sys.stdout
         sys.stdout = StringIO()
         try:
-            cmd.run()
-        except SystemExit: # The test runner calls sys.exit, stop that making an error.
-            pass
+            try: # try/except/finally doesn't work in Python 2.4, so we need nested try-statements.
+                cmd.run()
+            except SystemExit: # The test runner calls sys.exit, stop that making an error.
+                pass
         finally:
             sys.stdout = old_stdout

From 49b3d3139224fd5a6b89815af233b77244dc5bc8 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Tue, 21 Aug 2012 21:03:17 +0200
Subject: [PATCH 3532/8469] Documentation updates.

--HG--
branch : distribute
extra : rebase_source : ee1e27c3d9bb64e536b6f0c86d46d573db505b03
---
 CHANGES.txt         | 4 ++++
 docs/setuptools.txt | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a08cba780c..8fc1c3ff8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,10 @@ CHANGES
 ------
 
 * Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
+* Issue #299: The develop command didn't work on Python 3, when using 2to3,
+  as the egg link would go to the Python 2 source. Linking to the 2to3'd code
+  in build/lib makes it work, although you will have to rebuild the module
+  before testing it.
 
 ------
 0.6.28
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 4105dc2e41..d04973e7fa 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1082,6 +1082,14 @@ update the ``easy-install.pth`` file to include your project's source code,
 thereby making it available on ``sys.path`` for all programs using that Python
 installation.
 
+If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
+will not link directly to your source code when run under Python 3, since
+that source code would be made for Python 2 and not work under Python 3.
+Instead the ``setup.py develop`` will build Python 3 code under the ``build``
+directory, and link there. This means that after doing code changes you will
+have to run ``setup.py build`` before these changes are picked up by your
+Python 3 installation.
+
 In addition, the ``develop`` command creates wrapper scripts in the target
 script directory that will run your in-development scripts after ensuring that
 all your ``install_requires`` packages are available on ``sys.path``.

From 09e17ec652658269939b018ed50bdec2cc2c5bc1 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 10:45:10 +0200
Subject: [PATCH 3533/8469] Python 3.3b2's importlib doesn't like sys.paths
 that dissappear. By having a relative path in sys.path and then doinga
 chdir() that's exactly what happens. This bug will be fixed in the next 3.3
 release, but there is no drawback to adding the path as an absolute path, so
 we do that to make the tests run under 3.3b2.

--HG--
branch : distribute
extra : rebase_source : 51c5ac7f8916ca85fb2633b8cdbd7aa2e759e67e
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 9df6bb495e..9a0fffb41b 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@
     util.run_2to3(outfiles_2to3)
 
     # arrange setup to use the copy
-    sys.path.insert(0, tmp_src)
+    sys.path.insert(0, os.path.abspath(tmp_src))
     src_root = tmp_src
 
 from distutils.util import convert_path

From e19d57773e1abb8d8f3f46417b07c1617d2d91ea Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 10:48:44 +0200
Subject: [PATCH 3534/8469] The error message changed in Python 3.3.

--HG--
branch : distribute
extra : rebase_source : 107ac0ce6d98f4b17f31a6f4c006b1ae2e21381b
---
 setuptools/tests/test_packageindex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 1b4d2fdf59..886befcb2b 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -73,7 +73,7 @@ def test_bad_url_double_scheme(self):
             index.open_url(url)
         except distutils.errors.DistutilsError, error:
             msg = unicode(error)
-            assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg
+            assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
             return
         raise RuntimeError("Did not raise")
 

From 9dc9fea4a5661e119f30f4cdec3ef99e46b5f919 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 12:32:11 +0200
Subject: [PATCH 3535/8469] Issue #306: Even if 2to3 is used, we build in-place
 under Python 2.

--HG--
branch : distribute
extra : rebase_source : db4a1a3059533ad0c894f12c31e3fe1c238f4292
---
 CHANGES.txt                   | 1 +
 setuptools/command/develop.py | 4 ++--
 setuptools/command/test.py    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8fc1c3ff8d..c594a1031c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ CHANGES
   as the egg link would go to the Python 2 source. Linking to the 2to3'd code
   in build/lib makes it work, although you will have to rebuild the module
   before testing it.
+* Issue #306: Even if 2to3 is used, we build in-place under Python 2.
 
 ------
 0.6.28
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index c8bef72ef7..709e349c73 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -3,7 +3,7 @@
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsOptionError
-import os, setuptools, glob
+import os, sys, setuptools, glob
 
 class develop(easy_install):
     """Set up package for development"""
@@ -84,7 +84,7 @@ def finalize_options(self):
                 " installation directory", p, normalize_path(os.curdir))
 
     def install_for_development(self):
-        if getattr(self.distribution, 'use_2to3', False):
+        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 59c10e84d3..e5cb9bb59c 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -81,7 +81,7 @@ def finalize_options(self):
 
 
     def with_project_on_sys_path(self, func):
-        if getattr(self.distribution, 'use_2to3', False):
+        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date

From 03ae7b2149f0eb85a27f893b98f6d35d535456ac Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 12:34:48 +0200
Subject: [PATCH 3536/8469] Tests run under Python 3.3 now.

--HG--
branch : distribute
extra : rebase_source : 93e360785483082ab272dbf693d3e6ac3772b6ab
---
 setup.py |  3 +++
 test.sh  | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/setup.py b/setup.py
index 9a0fffb41b..6e04bd2403 100755
--- a/setup.py
+++ b/setup.py
@@ -212,6 +212,9 @@ def _being_installed():
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
+        Programming Language :: Python :: 3.1
+        Programming Language :: Python :: 3.2
+        Programming Language :: Python :: 3.3
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration
diff --git a/test.sh b/test.sh
index d62248f2c4..ed6d4efcb4 100644
--- a/test.sh
+++ b/test.sh
@@ -55,3 +55,13 @@ else
     echo "Success"
 fi
 
+rm -rf build
+echo -n "Running tests for Python 3.3..."
+python3.3 setup.py -q test > /dev/null 2> /dev/null
+if [ $? -ne 0 ];then
+    echo "Failed"
+    exit $1
+else
+    echo "Success"
+fi
+

From a3b6b2bba70b44b62865e6474e5a007400d62884 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 14:14:07 +0200
Subject: [PATCH 3537/8469] Issue #307: Prints the full path when .svn/entries
 is broken.

--HG--
branch : distribute
extra : rebase_source : 1836125ab8204364c8fb197d7c20c296a25f89c0
---
 CHANGES.txt                 | 1 +
 setuptools/command/sdist.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c594a1031c..086ebdee55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ CHANGES
   in build/lib makes it work, although you will have to rebuild the module
   before testing it.
 * Issue #306: Even if 2to3 is used, we build in-place under Python 2.
+* Issue #307: Prints the full path when .svn/entries is broken.
 
 ------
 0.6.28
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 1f88e93b9f..edb3b7f36c 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -97,7 +97,7 @@ def entries_finder(dirname, filename):
         for match in entries_pattern.finditer(data):
             yield joinpath(dirname,unescape(match.group(1)))
     else:
-        log.warn("unrecognized .svn/entries format in %s", dirname)
+        log.warn("unrecognized .svn/entries format in %s", os.path.abspath(dirname))
 
 
 finders = [

From cafaa3bd07185df0c17a19edee8820494d34267c Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 14:25:48 +0200
Subject: [PATCH 3538/8469] Merged the two lists of acceptable names of
 README.txt

--HG--
branch : distribute
extra : rebase_source : 604b23f6559c4688d1b43bc102601e0a0ed914a9
---
 setuptools/command/sdist.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index edb3b7f36c..16d3c37b01 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,6 +4,8 @@
 import os, re, sys, pkg_resources
 from glob import glob
 
+READMES = ('README', 'README.rst', 'README.txt')
+
 entities = [
     ("&lt;","<"), ("&gt;", ">"), ("&quot;", '"'), ("&apos;", "'"),
     ("&amp;", "&")
@@ -155,7 +157,7 @@ def run(self):
                 dist_files.append(data)
 
     def add_defaults(self):
-        standards = [('README', 'README.rst', 'README.txt'),
+        standards = [READMES,
                      self.distribution.script_name]
         for fn in standards:
             if isinstance(fn, tuple):
@@ -220,13 +222,12 @@ def __read_template_hack(self):
         read_template = __read_template_hack
 
     def check_readme(self):
-        alts = ("README", "README.txt")
-        for f in alts:
+        for f in READMES:
             if os.path.exists(f):
                 return
         else:
             self.warn(
-                "standard file not found: should have one of " +', '.join(alts)
+                "standard file not found: should have one of " +', '.join(READMES)
             )
 
 

From ec0ed85656b96812402439fa23c877fd27b99de5 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 16:36:29 +0200
Subject: [PATCH 3539/8469] Issue #313: Support for sdist subcommands (Python
 2.7)

--HG--
branch : distribute
extra : rebase_source : 5461cca20f4c91fec21b69128f76f6e6a0df205c
---
 CHANGES.txt                 |  1 +
 setuptools/command/sdist.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 086ebdee55..98e2246bd4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@ CHANGES
   before testing it.
 * Issue #306: Even if 2to3 is used, we build in-place under Python 2.
 * Issue #307: Prints the full path when .svn/entries is broken.
+* Issue #313: Support for sdist subcommands (Python 2.7)
 
 ------
 0.6.28
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 16d3c37b01..91c4fd1b6c 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -147,7 +147,17 @@ def run(self):
         self.filelist = ei_cmd.filelist
         self.filelist.append(os.path.join(ei_cmd.egg_info,'SOURCES.txt'))
         self.check_readme()
-        self.check_metadata()
+
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
+        # Call check_metadata only if no 'check' command
+        # (distutils <= 2.6)
+        import distutils.command
+        if 'check' not in distutils.command.__all__:
+            self.check_metadata()
+            
         self.make_distribution()
 
         dist_files = getattr(self.distribution,'dist_files',[])

From e743dabde0d60aaeca5c9e4dc5c29ac3ac625646 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 16:41:06 +0200
Subject: [PATCH 3540/8469] Got rid of deprecated assert_ and assertEquals.

--HG--
branch : distribute
extra : rebase_source : 9d7032bac7db98e445ab6a46b2610c278c691c2d
---
 setuptools/tests/__init__.py          | 64 +++++++++++++--------------
 setuptools/tests/test_develop.py      |  6 +--
 setuptools/tests/test_dist_info.py    |  6 +--
 setuptools/tests/test_easy_install.py | 20 ++++-----
 setuptools/tests/test_packageindex.py | 18 ++++----
 setuptools/tests/test_resources.py    | 42 +++++++++---------
 tests/test_distribute_setup.py        |  6 +--
 7 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 54c9902e80..eec76efd40 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -102,21 +102,21 @@ def testRequire(self):
 
         from email import __version__
         self.assertEqual(req.get_version(), __version__)
-        self.assert_(req.version_ok('1.0.9'))
-        self.assert_(not req.version_ok('0.9.1'))
-        self.assert_(not req.version_ok('unknown'))
+        self.assertTrue(req.version_ok('1.0.9'))
+        self.assertTrue(not req.version_ok('0.9.1'))
+        self.assertTrue(not req.version_ok('unknown'))
 
-        self.assert_(req.is_present())
-        self.assert_(req.is_current())
+        self.assertTrue(req.is_present())
+        self.assertTrue(req.is_current())
 
         req = Require('Email 3000','03000','email',format=LooseVersion)
-        self.assert_(req.is_present())
-        self.assert_(not req.is_current())
-        self.assert_(not req.version_ok('unknown'))
+        self.assertTrue(req.is_present())
+        self.assertTrue(not req.is_current())
+        self.assertTrue(not req.version_ok('unknown'))
 
         req = Require('Do-what-I-mean','1.0','d-w-i-m')
-        self.assert_(not req.is_present())
-        self.assert_(not req.is_current())
+        self.assertTrue(not req.is_present())
+        self.assertTrue(not req.is_current())
 
         req = Require('Tests', None, 'tests', homepage="http://example.com")
         self.assertEqual(req.format, None)
@@ -126,8 +126,8 @@ def testRequire(self):
         self.assertEqual(req.homepage, 'http://example.com')
 
         paths = [os.path.dirname(p) for p in __path__]
-        self.assert_(req.is_present(paths))
-        self.assert_(req.is_current(paths))
+        self.assertTrue(req.is_present(paths))
+        self.assertTrue(req.is_current(paths))
 
 
 class DistroTests(unittest.TestCase):
@@ -144,7 +144,7 @@ def setUp(self):
         )
 
     def testDistroType(self):
-        self.assert_(isinstance(self.dist,setuptools.dist.Distribution))
+        self.assertTrue(isinstance(self.dist,setuptools.dist.Distribution))
 
     def testExcludePackage(self):
         self.dist.exclude_package('a')
@@ -189,17 +189,17 @@ def testEmpty(self):
         dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
 
     def testContents(self):
-        self.assert_(self.dist.has_contents_for('a'))
+        self.assertTrue(self.dist.has_contents_for('a'))
         self.dist.exclude_package('a')
-        self.assert_(not self.dist.has_contents_for('a'))
+        self.assertTrue(not self.dist.has_contents_for('a'))
 
-        self.assert_(self.dist.has_contents_for('b'))
+        self.assertTrue(self.dist.has_contents_for('b'))
         self.dist.exclude_package('b')
-        self.assert_(not self.dist.has_contents_for('b'))
+        self.assertTrue(not self.dist.has_contents_for('b'))
 
-        self.assert_(self.dist.has_contents_for('c'))
+        self.assertTrue(self.dist.has_contents_for('c'))
         self.dist.exclude_package('c')
-        self.assert_(not self.dist.has_contents_for('c'))
+        self.assertTrue(not self.dist.has_contents_for('c'))
 
     def testInvalidIncludeExclude(self):
         self.assertRaises(DistutilsSetupError,
@@ -253,12 +253,12 @@ def setUp(self):
         )
 
     def testDefaults(self):
-        self.assert_(not
+        self.assertTrue(not
             Feature(
                 "test",standard=True,remove='x',available=False
             ).include_by_default()
         )
-        self.assert_(
+        self.assertTrue(
             Feature("test",standard=True,remove='x').include_by_default()
         )
         # Feature must have either kwargs, removes, or require_features
@@ -272,33 +272,33 @@ def testAvailability(self):
 
     def testFeatureOptions(self):
         dist = self.dist
-        self.assert_(
+        self.assertTrue(
             ('with-dwim',None,'include DWIM') in dist.feature_options
         )
-        self.assert_(
+        self.assertTrue(
             ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
         )
-        self.assert_(
+        self.assertTrue(
             ('with-bar',None,'include bar (default)') in dist.feature_options
         )
-        self.assert_(
+        self.assertTrue(
             ('without-bar',None,'exclude bar') in dist.feature_options
         )
         self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
         self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
         self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
-        self.assert_(not 'without-baz' in dist.feature_negopt)
+        self.assertTrue(not 'without-baz' in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist
         self.assertEqual(dist.with_foo,1)
         self.assertEqual(dist.with_bar,0)
         self.assertEqual(dist.with_baz,1)
-        self.assert_(not 'bar_et' in dist.py_modules)
-        self.assert_(not 'pkg.bar' in dist.packages)
-        self.assert_('pkg.baz' in dist.packages)
-        self.assert_('scripts/baz_it' in dist.scripts)
-        self.assert_(('libfoo','foo/foofoo.c') in dist.libraries)
+        self.assertTrue(not 'bar_et' in dist.py_modules)
+        self.assertTrue(not 'pkg.bar' in dist.packages)
+        self.assertTrue('pkg.baz' in dist.packages)
+        self.assertTrue('scripts/baz_it' in dist.scripts)
+        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
         self.assertEqual(dist.ext_modules,[])
         self.assertEqual(dist.require_features, [self.req])
 
@@ -315,7 +315,7 @@ class TestCommandTests(unittest.TestCase):
 
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')
-        self.assert_(isinstance(test_cmd, distutils.cmd.Command))
+        self.assertTrue(isinstance(test_cmd, distutils.cmd.Command))
 
     def testLongOptSuiteWNoDefault(self):
         ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite'])
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index fcf33c585e..3e071dade9 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -86,15 +86,15 @@ def test_develop(self):
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
         content.sort()
-        self.assertEquals(content, ['easy-install.pth', 'foo.egg-link'])
+        self.assertEqual(content, ['easy-install.pth', 'foo.egg-link'])
 
         # Check that we are using the right code.
         path = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt').read().split()[0].strip()
         init = open(os.path.join(path, 'foo', '__init__.py'), 'rt').read().strip()
         if sys.version < "3":
-            self.assertEquals(init, 'print "foo"')
+            self.assertEqual(init, 'print "foo"')
         else:
-            self.assertEquals(init, 'print("foo")')
+            self.assertEqual(init, 'print("foo")')
 
     def notest_develop_with_setup_requires(self):
 
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 68ba9e2494..001c443361 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -41,9 +41,9 @@ def test_conditional_dependencies(self):
                     pkg_resources.Requirement.parse('quux>=1.1')]
 
         for d in pkg_resources.find_distributions(self.tmpdir):
-            self.assertEquals(d.requires(), requires[:1])
-            self.assertEquals(d.requires(extras=('baz',)), requires)
-            self.assertEquals(d.extras, ['baz'])
+            self.assertEqual(d.requires(), requires[:1])
+            self.assertEqual(d.requires(extras=('baz',)), requires)
+            self.assertEqual(d.extras, ['baz'])
 
     def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7c807fc365..ab02e3145f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -68,7 +68,7 @@ def test_install_site_py(self):
         try:
             cmd.install_site_py()
             sitepy = os.path.join(cmd.install_dir, 'site.py')
-            self.assert_(os.path.exists(sitepy))
+            self.assertTrue(os.path.exists(sitepy))
         finally:
             shutil.rmtree(cmd.install_dir)
 
@@ -81,7 +81,7 @@ def test_get_script_args(self):
         finally:
             sys.platform = old_platform
 
-        self.assertEquals(script, WANTED)
+        self.assertEqual(script, WANTED)
 
     def test_no_setup_cfg(self):
         # makes sure easy_install as a command (main)
@@ -127,7 +127,7 @@ def test_no_find_links(self):
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
         cmd.args = ['ok']
         cmd.ensure_finalized()
-        self.assertEquals(cmd.package_index.scanned_urls, {})
+        self.assertEqual(cmd.package_index.scanned_urls, {})
 
         # let's try without it (default behavior)
         cmd = easy_install(dist)
@@ -138,7 +138,7 @@ def test_no_find_links(self):
         cmd.ensure_finalized()
         keys = cmd.package_index.scanned_urls.keys()
         keys.sort()
-        self.assertEquals(keys, ['link1', 'link2'])
+        self.assertEqual(keys, ['link1', 'link2'])
 
 
 class TestPTHFileWriter(unittest.TestCase):
@@ -147,9 +147,9 @@ def test_add_from_cwd_site_sets_dirty(self):
         if a distribution is in site but also the cwd
         '''
         pth = PthDistributions('does-not_exist', [os.getcwd()])
-        self.assert_(not pth.dirty)
+        self.assertTrue(not pth.dirty)
         pth.add(PRDistribution(os.getcwd()))
-        self.assert_(pth.dirty)
+        self.assertTrue(pth.dirty)
 
     def test_add_from_site_is_ignored(self):
         if os.name != 'nt':
@@ -157,9 +157,9 @@ def test_add_from_site_is_ignored(self):
         else:
             location = 'c:\\does_not_exist'
         pth = PthDistributions('does-not_exist', [location, ])
-        self.assert_(not pth.dirty)
+        self.assertTrue(not pth.dirty)
         pth.add(PRDistribution(location))
-        self.assert_(not pth.dirty)
+        self.assertTrue(not pth.dirty)
 
 
 class TestUserInstallTest(unittest.TestCase):
@@ -246,7 +246,7 @@ def test_local_index(self):
             cmd.ensure_finalized()
             cmd.local_index.scan([new_location])
             res = cmd.easy_install('foo')
-            self.assertEquals(res.location, new_location)
+            self.assertEqual(res.location, new_location)
         finally:
             sys.path.remove(target)
             for basedir in [new_location, target, ]:
@@ -309,7 +309,7 @@ def install_clean_argv():
 
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
-        self.assert_(2 <= len(p_index.requests) <= 3)
+        self.assertTrue(2 <= len(p_index.requests) <= 3)
         self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
 
     def create_sdist(self, installer):
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 886befcb2b..3e446b54d4 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -17,9 +17,9 @@ def test_bad_url_bad_port(self):
         try:
             v = index.open_url(url)
         except Exception, v:
-            self.assert_(url in str(v))
+            self.assertTrue(url in str(v))
         else:
-            self.assert_(isinstance(v,urllib2.HTTPError))
+            self.assertTrue(isinstance(v,urllib2.HTTPError))
 
     def test_bad_url_typo(self):
         # issue 16
@@ -33,9 +33,9 @@ def test_bad_url_typo(self):
         try:
             v = index.open_url(url)
         except Exception, v:
-            self.assert_(url in str(v))
+            self.assertTrue(url in str(v))
         else:
-            self.assert_(isinstance(v, urllib2.HTTPError))
+            self.assertTrue(isinstance(v, urllib2.HTTPError))
 
     def test_bad_url_bad_status_line(self):
         index = setuptools.package_index.PackageIndex(
@@ -53,7 +53,7 @@ def _urlopen(*args):
             try:
                 v = index.open_url(url)
             except Exception, v:
-                self.assert_('line' in str(v))
+                self.assertTrue('line' in str(v))
             else:
                 raise AssertionError('Should have raise here!')
         finally:
@@ -95,7 +95,7 @@ def test_url_ok(self):
             hosts=('www.example.com',)
         )
         url = 'file:///tmp/test_package_index'
-        self.assert_(index.url_ok(url, True))
+        self.assertTrue(index.url_ok(url, True))
 
     def test_links_priority(self):
         """
@@ -128,11 +128,11 @@ def test_links_priority(self):
         server.stop()
 
         # the distribution has been found
-        self.assert_('foobar' in pi)
+        self.assertTrue('foobar' in pi)
         # we have only one link, because links are compared without md5
-        self.assert_(len(pi['foobar'])==1)
+        self.assertTrue(len(pi['foobar'])==1)
         # the link should be from the index
-        self.assert_('correct_md5' in pi['foobar'][0].location)
+        self.assertTrue('correct_md5' in pi['foobar'][0].location)
 
     def test_parse_bdist_wininst(self):
         self.assertEqual(setuptools.package_index.parse_bdist_wininst(
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 3e0309f19d..d08fa32595 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -45,7 +45,7 @@ def testCollection(self):
         ad.add(Distribution.from_filename("FooPkg-1.2-py2.4.egg"))
 
         # Name is in there now
-        self.assert_(ad['FooPkg'])
+        self.assertTrue(ad['FooPkg'])
         # But only 1 package
         self.assertEqual(list(ad), ['foopkg'])
 
@@ -228,7 +228,7 @@ def assertfields(self, ep):
         self.assertEqual(ep.module_name,"setuptools.tests.test_resources")
         self.assertEqual(ep.attrs, ("EntryPointTests",))
         self.assertEqual(ep.extras, ("x",))
-        self.assert_(ep.load() is EntryPointTests)
+        self.assertTrue(ep.load() is EntryPointTests)
         self.assertEqual(
             str(ep),
             "foo = setuptools.tests.test_resources:EntryPointTests [x]"
@@ -328,20 +328,20 @@ def testBasicContains(self):
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11  = Distribution.from_filename("Twisted-1.1.egg")
         twist12  = Distribution.from_filename("Twisted-1.2.egg")
-        self.assert_(parse_version('1.2') in r)
-        self.assert_(parse_version('1.1') not in r)
-        self.assert_('1.2' in r)
-        self.assert_('1.1' not in r)
-        self.assert_(foo_dist not in r)
-        self.assert_(twist11 not in r)
-        self.assert_(twist12 in r)
+        self.assertTrue(parse_version('1.2') in r)
+        self.assertTrue(parse_version('1.1') not in r)
+        self.assertTrue('1.2' in r)
+        self.assertTrue('1.1' not in r)
+        self.assertTrue(foo_dist not in r)
+        self.assertTrue(twist11 not in r)
+        self.assertTrue(twist12 in r)
 
     def testAdvancedContains(self):
         r, = parse_requirements("Foo>=1.2,<=1.3,==1.9,>2.0,!=2.5,<3.0,==4.5")
         for v in ('1.2','1.2.2','1.3','1.9','2.0.1','2.3','2.6','3.0c1','4.5'):
-            self.assert_(v in r, (v,r))
+            self.assertTrue(v in r, (v,r))
         for v in ('1.2c1','1.3.1','1.5','1.9.1','2.0','2.5','3.0','4.0'):
-            self.assert_(v not in r, (v,r))
+            self.assertTrue(v not in r, (v,r))
 
 
     def testOptionsAndHashing(self):
@@ -363,14 +363,14 @@ def testVersionEquality(self):
         r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.assert_(d("foo-0.3a4.egg") not in r1)
-        self.assert_(d("foo-0.3a1.egg") not in r1)
-        self.assert_(d("foo-0.3a4.egg") not in r2)
+        self.assertTrue(d("foo-0.3a4.egg") not in r1)
+        self.assertTrue(d("foo-0.3a1.egg") not in r1)
+        self.assertTrue(d("foo-0.3a4.egg") not in r2)
 
-        self.assert_(d("foo-0.3a2.egg") in r1)
-        self.assert_(d("foo-0.3a2.egg") in r2)
-        self.assert_(d("foo-0.3a3.egg") in r2)
-        self.assert_(d("foo-0.3a5.egg") in r2)
+        self.assertTrue(d("foo-0.3a2.egg") in r1)
+        self.assertTrue(d("foo-0.3a2.egg") in r2)
+        self.assertTrue(d("foo-0.3a3.egg") in r2)
+        self.assertTrue(d("foo-0.3a5.egg") in r2)
 
     def testDistributeSetuptoolsOverride(self):
         # Plain setuptools or distribute mean we return distribute.
@@ -489,7 +489,7 @@ def c(s1,s2):
     def testVersionOrdering(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            self.assert_(p1<p2, (s1,s2,p1,p2))
+            self.assertTrue(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
         c('2.1.0','2.10')
@@ -577,12 +577,12 @@ def test_get_script_header_jython_workaround(self):
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
-            self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
+            self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
             sys.stdout = sys.stderr = StringIO.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
-            self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
+            self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
         finally:
             sys.platform = platform
             sys.stdout = stdout
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 4151587fcc..1f3da058d1 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_distribute_setup.py
@@ -43,13 +43,13 @@ def test_build_egg(self):
         # now trying to import it
         sys.path[0] = egg
         import setuptools
-        self.assert_(setuptools.__file__.startswith(egg))
+        self.assertTrue(setuptools.__file__.startswith(egg))
 
     def test_do_download(self):
         tmpdir = tempfile.mkdtemp()
         _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1)
         import setuptools
-        self.assert_(setuptools.bootstrap_install_from.startswith(tmpdir))
+        self.assertTrue(setuptools.bootstrap_install_from.startswith(tmpdir))
 
     def test_install(self):
         def _faked(*args):
@@ -58,7 +58,7 @@ def _faked(*args):
         _install(self.tarball)
 
     def test_use_setuptools(self):
-        self.assertEquals(use_setuptools(), None)
+        self.assertEqual(use_setuptools(), None)
 
         # make sure fake_setuptools is not called by default
         import pkg_resources

From ab7a3f122ea89a7288ddb5815a06fffb4ec48cac Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 16:48:48 +0200
Subject: [PATCH 3541/8469] Issue #314: test_local_index() would fail an OS X.

--HG--
branch : distribute
extra : rebase_source : 8d91abdbed53300e6ec80bd535e00bca17767206
---
 CHANGES.txt                           | 1 +
 setuptools/tests/test_easy_install.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 98e2246bd4..9ae342e762 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ CHANGES
 * Issue #306: Even if 2to3 is used, we build in-place under Python 2.
 * Issue #307: Prints the full path when .svn/entries is broken.
 * Issue #313: Support for sdist subcommands (Python 2.7)
+* Issue #314: test_local_index() would fail an OS X.
 
 ------
 0.6.28
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ab02e3145f..13f668d021 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -246,7 +246,8 @@ def test_local_index(self):
             cmd.ensure_finalized()
             cmd.local_index.scan([new_location])
             res = cmd.easy_install('foo')
-            self.assertEqual(res.location, new_location)
+            self.assertEqual(os.path.realpath(res.location),
+                             os.path.realpath(new_location))            
         finally:
             sys.path.remove(target)
             for basedir in [new_location, target, ]:

From ea687a55fe5d94167a1bf1ff4a75a0c14b5407cd Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 17:36:10 +0200
Subject: [PATCH 3542/8469] Issue 315:

--HG--
branch : distribute
extra : rebase_source : c7ad76794ac6db2a4bc1abc88e646ddcd14550db
---
 setuptools/tests/server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 7b5cacb934..daccaba925 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -2,6 +2,7 @@
 """
 import urllib2
 import sys
+import time
 import threading
 import BaseHTTPServer
 from BaseHTTPServer import HTTPServer
@@ -34,6 +35,9 @@ def start(self):
     def stop(self):
         "Stop the server"
 
+        # Let the server finish the last request adn wait for a new one.
+        time.sleep(0.1)
+
         # self.shutdown is not supported on python < 2.6, so just
         #  set _run to false, and make a request, causing it to
         #  terminate.

From 0d962727403be73b0b1eac234ed81b941dd7cae9 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Wed, 22 Aug 2012 18:01:49 +0200
Subject: [PATCH 3543/8469] Issue #310: Non-ascii characters in a namespace
 __init__.py causes errors.

--HG--
branch : distribute
extra : rebase_source : 668e1c79a2bcc314bcf1f7213b317766bb8511ab
---
 CHANGES.txt                    |  1 +
 setuptools/command/build_py.py |  4 ++--
 setuptools/tests/test_test.py  | 21 +++++++++++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9ae342e762..3eea84eb78 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@ CHANGES
 * Issue #307: Prints the full path when .svn/entries is broken.
 * Issue #313: Support for sdist subcommands (Python 2.7)
 * Issue #314: test_local_index() would fail an OS X.
+* Issue #310: Non-ascii characters in a namespace __init__.py causes errors.
 
 ------
 0.6.28
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index d53960fe47..505dd4f30a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -215,8 +215,8 @@ def check_package(self, package, package_dir):
         else:
             return init_py
 
-        f = open(init_py,'rU')
-        if 'declare_namespace' not in f.read():
+        f = open(init_py,'rbU')
+        if 'declare_namespace'.encode() not in f.read():
             from distutils import log
             log.warn(
                "WARNING: %s is a namespace package, but its __init__.py does\n"
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 04134ec5fc..ddbebaa90a 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*- 
+
 """develop tests
 """
 import sys
@@ -21,13 +23,19 @@
 )
 """
 
-NS_INIT = """
+NS_INIT = """# -*- coding: Latin-1 -*- 
+# Söme Arbiträry Ünicode to test Issüé 310
 try:
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:
     from pkgutil import extend_path
     __path__ = extend_path(__path__, __name__)
 """
+# Make sure this is Latin-1 binary, before writing:
+if sys.version_info < (3,):
+    NS_INIT = NS_INIT.decode('UTF-8')
+NS_INIT = NS_INIT.encode('Latin-1')
+
 TEST_PY = """import unittest
 
 class TestTest(unittest.TestCase):
@@ -50,23 +58,23 @@ def setUp(self):
         os.mkdir(os.path.join(self.dir, 'name', 'space', 'tests'))
         # setup.py
         setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'w')
+        f = open(setup, 'wt')
         f.write(SETUP_PY)
         f.close()
         self.old_cwd = os.getcwd()
         # name/__init__.py
         init = os.path.join(self.dir, 'name', '__init__.py')
-        f = open(init, 'w')
+        f = open(init, 'wb')
         f.write(NS_INIT)
         f.close()
         # name/space/__init__.py
         init = os.path.join(self.dir, 'name', 'space', '__init__.py')
-        f = open(init, 'w')
+        f = open(init, 'wt')
         f.write('#empty\n')
         f.close()
         # name/space/tests/__init__.py
         init = os.path.join(self.dir, 'name', 'space', 'tests', '__init__.py')
-        f = open(init, 'w')
+        f = open(init, 'wt')
         f.write(TEST_PY)
         f.close()
         
@@ -105,7 +113,7 @@ def test_test(self):
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
-        sys.stdout = StringIO()
+        #sys.stdout = StringIO()
         try:
             try: # try/except/finally doesn't work in Python 2.4, so we need nested try-statements.
                 cmd.run()
@@ -113,3 +121,4 @@ def test_test(self):
                 pass
         finally:
             sys.stdout = old_stdout
+            
\ No newline at end of file

From f090838c3613065fd6505cd390511a96e08755c4 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 22 Aug 2012 19:32:00 +0200
Subject: [PATCH 3544/8469] Fix a typo in a comment.

--HG--
branch : distribute
extra : rebase_source : 779baf947b6989f1275d99cff2044adad3dd7997
---
 setuptools/tests/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index daccaba925..b2ab7acc7c 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -35,7 +35,7 @@ def start(self):
     def stop(self):
         "Stop the server"
 
-        # Let the server finish the last request adn wait for a new one.
+        # Let the server finish the last request and wait for a new one.
         time.sleep(0.1)
 
         # self.shutdown is not supported on python < 2.6, so just

From 0e095bea8335a02f3e9ca868a5f689b79fc1aca9 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 22 Aug 2012 19:42:22 +0200
Subject: [PATCH 3545/8469] Delete redundant tests.
 setuptools/tests/test_bdist_egg.py is testing the same functionality.

--HG--
branch : distribute
extra : rebase_source : d53119dd1c6074923e8f42216d1ab773f2bc2467
---
 tests/python3.3_bdist_egg_test/module.py |  0
 tests/python3.3_bdist_egg_test/setup.py  | 13 -------------
 tests/test_python33_bdist_egg.py         | 19 -------------------
 3 files changed, 32 deletions(-)
 delete mode 100644 tests/python3.3_bdist_egg_test/module.py
 delete mode 100644 tests/python3.3_bdist_egg_test/setup.py
 delete mode 100644 tests/test_python33_bdist_egg.py

diff --git a/tests/python3.3_bdist_egg_test/module.py b/tests/python3.3_bdist_egg_test/module.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/python3.3_bdist_egg_test/setup.py b/tests/python3.3_bdist_egg_test/setup.py
deleted file mode 100644
index 04caea7434..0000000000
--- a/tests/python3.3_bdist_egg_test/setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='python3.3_bdist_egg_test',
-    version='0.0.0',
-    description='Test',
-    license='BSD',
-    py_modules=['module'],
-    author='Marc Abramowitz',
-    author_email='marc@marc-abramowitz.com',
-    url='https://bitbucket.org/msabramo/python3.3_bdist_egg_test',
-    # zip_safe=False,
-)
diff --git a/tests/test_python33_bdist_egg.py b/tests/test_python33_bdist_egg.py
deleted file mode 100644
index 9f32470a32..0000000000
--- a/tests/test_python33_bdist_egg.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import sys
-import os
-import unittest
-
-CURDIR = os.path.abspath(os.path.dirname(__file__))
-TOPDIR = os.path.split(CURDIR)[0]
-sys.path.insert(0, TOPDIR)
-
-from distribute_setup import _python_cmd
-
-class TestPython33BdistEgg(unittest.TestCase):
-
-    def test_build_egg(self):
-        os.chdir(os.path.join(CURDIR, 'python3.3_bdist_egg_test'))
-        self.assertTrue(_python_cmd("setup.py", "bdist_egg"))
-
-
-if __name__ == '__main__':
-    unittest.main()

From f8d45b50bfcafabe759183e716059a2e2f702420 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Fri, 24 Aug 2012 15:33:56 +0200
Subject: [PATCH 3546/8469] Oups.

--HG--
branch : distribute
extra : rebase_source : 515bd00c3028ba0d58e57fd51d524a798b9b898d
---
 setuptools/tests/test_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index ddbebaa90a..ad7cbd0f96 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -113,7 +113,7 @@ def test_test(self):
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
-        #sys.stdout = StringIO()
+        sys.stdout = StringIO()
         try:
             try: # try/except/finally doesn't work in Python 2.4, so we need nested try-statements.
                 cmd.run()

From 977f4db35a9390a3e10cd184f69fb2d42886b639 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 23 Jul 2012 22:31:07 -0400
Subject: [PATCH 3547/8469] use frozenset; 'empty marker' heuristic

--HG--
branch : distribute
extra : rebase_source : ebe5e94ea2a4dbea2754bef5d056f65f85fe6423
---
 pkg_resources.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 27b9f83451..ca0f21c4ee 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2484,7 +2484,8 @@ def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
         def dummy_marker(marker):
             def marker_fn(environment=None, override=None):
-                return True
+                # 'empty markers are True' heuristic won't install extra deps.
+                return not marker.strip()
             marker_fn.__doc__ = marker
             return marker_fn
         try:
@@ -2506,12 +2507,12 @@ def reqs_for_extra(extra):
                 if req.marker_fn(override={'extra':extra}):
                     yield req
 
-        common = set(reqs_for_extra(None))
+        common = frozenset(reqs_for_extra(None))
         dm[None].extend(common)
             
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             extra = safe_extra(extra.strip())
-            dm[extra] = list(set(reqs_for_extra(extra)) - common)
+            dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
 
         return dm
     

From 4084ebc22ff58d406b73fe25c069b5235f04c4d8 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 25 Jul 2012 05:11:56 +0200
Subject: [PATCH 3548/8469] Issue #283: Reenable scanning of *.pyc / *.pyo
 files on Python 3.3. Scanning of these files was fixed in commit
 2479772eeea7.

--HG--
branch : distribute
extra : rebase_source : fcbb14f0e6efc2c42b691fa2a8920816903ede42
---
 CHANGES.txt                     | 11 ++++++++---
 setuptools/command/bdist_egg.py |  2 --
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 14f26d2676..a08cba780c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,15 +2,20 @@
 CHANGES
 =======
 
+------
+0.6.29
+------
+
+* Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
+
 ------
 0.6.28
 ------
 
-* Issue 294: setup.py can now be invoked from any directory.
+* Issue #294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
 * Added support for .dist-info directories.
-* Issue #283 bdist_egg issues with python 3.3.0aX.
-* Test and fix for marshal.load of .pyc files on Python 3.3.
+* Issue #283: Fix and disable scanning of *.pyc / *.pyo files on Python 3.3.
 
 ------
 0.6.27
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index cf2d75e4c9..0ee9c55b86 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -463,8 +463,6 @@ def iter_symbols(code):
                 yield name
 
 def can_scan():
-    if sys.version_info > (3, 3):
-        return False # Can't scan recent formats
     if not sys.platform.startswith('java') and sys.platform != 'cli':
         # CPython, PyPy, etc.
         return True

From 1f80bd3ac6984d9941f06f1290639fc9572d59ed Mon Sep 17 00:00:00 2001
From: Richard Oudkerk <shibturn@gmail.com>
Date: Fri, 27 Jul 2012 12:06:55 +0100
Subject: [PATCH 3549/8469] Issue #15364: Fix
 sysconfig.get_config_var('srcdir') to be an absolute path.

---
 sysconfig.py            | 17 +++++++++++++++++
 tests/test_sysconfig.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index 910e1047ab..317640ca89 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -533,6 +533,23 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        # Always convert srcdir to an absolute path
+        srcdir = _config_vars.get('srcdir', project_base)
+        if os.name == 'posix':
+            if python_build:
+                # If srcdir is a relative path (typically '.' or '..')
+                # then it should be interpreted relative to the directory
+                # containing Makefile.
+                base = os.path.dirname(get_makefile_filename())
+                srcdir = os.path.join(base, srcdir)
+            else:
+                # srcdir is not meaningful since the installation is
+                # spread about the filesystem.  We choose the
+                # directory containing the Makefile since we know it
+                # exists.
+                srcdir = os.path.dirname(get_makefile_filename())
+        _config_vars['srcdir'] = os.path.abspath(os.path.normpath(srcdir))
+
         # Convert srcdir into an absolute path if it appears necessary.
         # Normally it is relative to the build directory.  However, during
         # testing, for example, we might be running a non-installed python
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 545ef3b548..546bb721a4 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -53,6 +53,34 @@ def test_get_config_vars(self):
         self.assertTrue(isinstance(cvars, dict))
         self.assertTrue(cvars)
 
+    def test_srcdir(self):
+        # See Issues #15322, #15364.
+        srcdir = sysconfig.get_config_var('srcdir')
+
+        self.assertTrue(os.path.isabs(srcdir), srcdir)
+        self.assertTrue(os.path.isdir(srcdir), srcdir)
+
+        if sysconfig.python_build:
+            # The python executable has not been installed so srcdir
+            # should be a full source checkout.
+            Python_h = os.path.join(srcdir, 'Include', 'Python.h')
+            self.assertTrue(os.path.exists(Python_h), Python_h)
+            self.assertTrue(sysconfig._is_python_source_dir(srcdir))
+        elif os.name == 'posix':
+            self.assertEqual(sysconfig.get_makefile_filename(), srcdir)
+
+    def test_srcdir_independent_of_cwd(self):
+        # srcdir should be independent of the current working directory
+        # See Issues #15322, #15364.
+        srcdir = sysconfig.get_config_var('srcdir')
+        cwd = os.getcwd()
+        try:
+            os.chdir('..')
+            srcdir2 = sysconfig.get_config_var('srcdir')
+        finally:
+            os.chdir(cwd)
+        self.assertEqual(srcdir, srcdir2)
+
     def test_customize_compiler(self):
 
         # not testing if default compiler is not unix

From cd406fc66618543efe51a4867f8b0ecfe90c9a3e Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Fri, 27 Jul 2012 23:37:04 -0700
Subject: [PATCH 3550/8469] Issue #15364: Fix test_srcdir for the installed
 case.

---
 tests/test_sysconfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 546bb721a4..826ea4247d 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -67,7 +67,8 @@ def test_srcdir(self):
             self.assertTrue(os.path.exists(Python_h), Python_h)
             self.assertTrue(sysconfig._is_python_source_dir(srcdir))
         elif os.name == 'posix':
-            self.assertEqual(sysconfig.get_makefile_filename(), srcdir)
+            self.assertEqual(os.path.dirname(sysconfig.get_makefile_filename()),
+                                 srcdir)
 
     def test_srcdir_independent_of_cwd(self):
         # srcdir should be independent of the current working directory

From ad445467dd7ddd5e69165fa38b83d303c096f132 Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@mumak.net>
Date: Fri, 10 Aug 2012 12:49:20 +0100
Subject: [PATCH 3551/8469] Set permissions when extracting from zipfile.

--HG--
branch : distribute
extra : rebase_source : 68b7fd4d6cc28f77a7202c5e7f63121d721be624
---
 setuptools/archive_util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 5787753f2a..8ad147521b 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -158,6 +158,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
                 finally:
                     f.close()
                     del data
+            os.chmod(target, info.external_attr >> 16)
     finally:
         z.close()
 

From 8a0aec34b9d22cd514bcc2404b3cab7242d90a79 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 11 Aug 2012 08:49:20 +0200
Subject: [PATCH 3552/8469] Bump to 3.3b2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7a7b8d6cb1..15042770d9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0b1"
+__version__ = "3.3.0b2"
 #--end constants--

From 1cfadca0b0482f1f0ab379c7427dff4b627cec32 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 25 Aug 2012 12:16:37 +0200
Subject: [PATCH 3553/8469] Bump to 3.3.0rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 15042770d9..8d73b51cbe 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0b2"
+__version__ = "3.3.0rc1"
 #--end constants--

From 776fdebc918822b57286ac7a2107f8766f43ce56 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 25 Aug 2012 15:26:08 -0400
Subject: [PATCH 3554/8469] add markerlib as _markerlib

--HG--
branch : distribute
extra : rebase_source : b9d8fa81db6c6fc3d89db54a70778eb3e8396e17
---
 _markerlib/__init__.py             |   1 +
 _markerlib/_markers_ast.py         | 132 +++++++++++++++++++++++++++++
 _markerlib/markers.py              | 110 ++++++++++++++++++++++++
 _markerlib/test_markerlib.py       |  90 ++++++++++++++++++++
 pkg_resources.py                   |   4 +-
 setuptools/tests/test_dist_info.py |  12 +--
 6 files changed, 342 insertions(+), 7 deletions(-)
 create mode 100644 _markerlib/__init__.py
 create mode 100644 _markerlib/_markers_ast.py
 create mode 100644 _markerlib/markers.py
 create mode 100644 _markerlib/test_markerlib.py

diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
new file mode 100644
index 0000000000..ef8c994c15
--- /dev/null
+++ b/_markerlib/__init__.py
@@ -0,0 +1 @@
+from _markerlib.markers import default_environment, compile, interpret, as_function
diff --git a/_markerlib/_markers_ast.py b/_markerlib/_markers_ast.py
new file mode 100644
index 0000000000..b7a5e0b9d8
--- /dev/null
+++ b/_markerlib/_markers_ast.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+"""
+Just enough of ast.py for markers.py
+"""
+
+from _ast import AST, PyCF_ONLY_AST
+
+def parse(source, filename='<unknown>', mode='exec'):
+    """
+    Parse the source into an AST node.
+    Equivalent to compile(source, filename, mode, PyCF_ONLY_AST).
+    """
+    return compile(source, filename, mode, PyCF_ONLY_AST)
+
+def copy_location(new_node, old_node):
+    """
+    Copy source location (`lineno` and `col_offset` attributes) from
+    *old_node* to *new_node* if possible, and return *new_node*.
+    """
+    for attr in 'lineno', 'col_offset':
+        if attr in old_node._attributes and attr in new_node._attributes \
+           and hasattr(old_node, attr):
+            setattr(new_node, attr, getattr(old_node, attr))
+    return new_node
+
+def iter_fields(node):
+    """
+    Yield a tuple of ``(fieldname, value)`` for each field in ``node._fields``
+    that is present on *node*.
+    """
+    for field in node._fields:
+        try:
+            yield field, getattr(node, field)
+        except AttributeError:
+            pass
+
+class NodeVisitor(object):
+    """
+    A node visitor base class that walks the abstract syntax tree and calls a
+    visitor function for every node found.  This function may return a value
+    which is forwarded by the `visit` method.
+
+    This class is meant to be subclassed, with the subclass adding visitor
+    methods.
+
+    Per default the visitor functions for the nodes are ``'visit_'`` +
+    class name of the node.  So a `TryFinally` node visit function would
+    be `visit_TryFinally`.  This behavior can be changed by overriding
+    the `visit` method.  If no visitor function exists for a node
+    (return value `None`) the `generic_visit` visitor is used instead.
+
+    Don't use the `NodeVisitor` if you want to apply changes to nodes during
+    traversing.  For this a special visitor exists (`NodeTransformer`) that
+    allows modifications.
+    """
+
+    def visit(self, node):
+        """Visit a node."""
+        method = 'visit_' + node.__class__.__name__
+        visitor = getattr(self, method, self.generic_visit)
+        return visitor(node)
+
+#    def generic_visit(self, node):
+#        """Called if no explicit visitor function exists for a node."""
+#        for field, value in iter_fields(node):
+#            if isinstance(value, list):
+#                for item in value:
+#                    if isinstance(item, AST):
+#                        self.visit(item)
+#            elif isinstance(value, AST):
+#                self.visit(value)
+
+
+class NodeTransformer(NodeVisitor):
+    """
+    A :class:`NodeVisitor` subclass that walks the abstract syntax tree and
+    allows modification of nodes.
+
+    The `NodeTransformer` will walk the AST and use the return value of the
+    visitor methods to replace or remove the old node.  If the return value of
+    the visitor method is ``None``, the node will be removed from its location,
+    otherwise it is replaced with the return value.  The return value may be the
+    original node in which case no replacement takes place.
+
+    Here is an example transformer that rewrites all occurrences of name lookups
+    (``foo``) to ``data['foo']``::
+
+       class RewriteName(NodeTransformer):
+
+           def visit_Name(self, node):
+               return copy_location(Subscript(
+                   value=Name(id='data', ctx=Load()),
+                   slice=Index(value=Str(s=node.id)),
+                   ctx=node.ctx
+               ), node)
+
+    Keep in mind that if the node you're operating on has child nodes you must
+    either transform the child nodes yourself or call the :meth:`generic_visit`
+    method for the node first.
+
+    For nodes that were part of a collection of statements (that applies to all
+    statement nodes), the visitor may also return a list of nodes rather than
+    just a single node.
+
+    Usually you use the transformer like this::
+
+       node = YourTransformer().visit(node)
+    """
+
+    def generic_visit(self, node):
+        for field, old_value in iter_fields(node):
+            old_value = getattr(node, field, None)
+            if isinstance(old_value, list):
+                new_values = []
+                for value in old_value:
+                    if isinstance(value, AST):
+                        value = self.visit(value)
+                        if value is None:
+                            continue
+                        elif not isinstance(value, AST):
+                            new_values.extend(value)
+                            continue
+                    new_values.append(value)
+                old_value[:] = new_values
+            elif isinstance(old_value, AST):
+                new_node = self.visit(old_value)
+                if new_node is None:
+                    delattr(node, field)
+                else:
+                    setattr(node, field, new_node)
+        return node
+    
\ No newline at end of file
diff --git a/_markerlib/markers.py b/_markerlib/markers.py
new file mode 100644
index 0000000000..293adf7235
--- /dev/null
+++ b/_markerlib/markers.py
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+"""Interpret PEP 345 environment markers.
+
+EXPR [in|==|!=|not in] EXPR [or|and] ...
+
+where EXPR belongs to any of those:
+
+    python_version = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    python_full_version = sys.version.split()[0]
+    os.name = os.name
+    sys.platform = sys.platform
+    platform.version = platform.version()
+    platform.machine = platform.machine()
+    platform.python_implementation = platform.python_implementation()
+    a free string, like '2.4', or 'win32'
+"""
+
+__all__ = ['default_environment', 'compile', 'interpret']
+
+# Would import from ast but for Python 2.5
+from _ast import Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop
+try:
+    from ast import parse, copy_location, NodeTransformer
+except ImportError: # pragma no coverage
+    from markerlib._markers_ast import parse, copy_location, NodeTransformer
+
+import os
+import platform
+import sys
+import weakref
+
+_builtin_compile = compile
+
+from platform import python_implementation
+
+# restricted set of variables
+_VARS = {'sys.platform': sys.platform,
+         'python_version': '%s.%s' % sys.version_info[:2],
+         # FIXME parsing sys.platform is not reliable, but there is no other
+         # way to get e.g. 2.7.2+, and the PEP is defined with sys.version
+         'python_full_version': sys.version.split(' ', 1)[0],
+         'os.name': os.name,
+         'platform.version': platform.version(),
+         'platform.machine': platform.machine(),
+         'platform.python_implementation': python_implementation(),
+         'extra': None # wheel extension
+        }
+
+def default_environment():
+    """Return copy of default PEP 385 globals dictionary."""
+    return dict(_VARS)
+
+class ASTWhitelist(NodeTransformer):
+    def __init__(self, statement):
+        self.statement = statement # for error messages
+    
+    ALLOWED = (Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop)
+    
+    def visit(self, node):
+        """Ensure statement only contains allowed nodes."""
+        if not isinstance(node, self.ALLOWED):
+            raise SyntaxError('Not allowed in environment markers.\n%s\n%s' %
+                               (self.statement, 
+                               (' ' * node.col_offset) + '^'))
+        return NodeTransformer.visit(self, node)
+    
+    def visit_Attribute(self, node):
+        """Flatten one level of attribute access."""
+        new_node = Name("%s.%s" % (node.value.id, node.attr), node.ctx)
+        return copy_location(new_node, node)
+
+def parse_marker(marker):
+    tree = parse(marker, mode='eval')
+    new_tree = ASTWhitelist(marker).generic_visit(tree)
+    return new_tree
+
+def compile_marker(parsed_marker):
+    return _builtin_compile(parsed_marker, '<environment marker>', 'eval',
+                   dont_inherit=True)
+
+_cache = weakref.WeakValueDictionary()
+
+def compile(marker):
+    """Return compiled marker as a function accepting an environment dict."""
+    try:
+        return _cache[marker]
+    except KeyError:
+        pass
+    if not marker.strip():
+        def marker_fn(environment=None, override=None):
+            """"""
+            return True
+    else:
+        compiled_marker = compile_marker(parse_marker(marker))
+        def marker_fn(environment=None, override=None):
+            """override updates environment"""
+            if override is None:
+                override = {}
+            if environment is None:
+                environment = default_environment()
+            environment.update(override)
+            return eval(compiled_marker, environment)
+    marker_fn.__doc__ = marker
+    _cache[marker] = marker_fn
+    return _cache[marker]
+
+as_function = compile # bw compat
+
+def interpret(marker, environment=None):
+    return compile(marker)(environment)
diff --git a/_markerlib/test_markerlib.py b/_markerlib/test_markerlib.py
new file mode 100644
index 0000000000..ff78d672cc
--- /dev/null
+++ b/_markerlib/test_markerlib.py
@@ -0,0 +1,90 @@
+import os
+import unittest
+import pkg_resources
+from setuptools.tests.py26compat import skipIf
+from unittest import expectedFailure
+
+try:
+    import _ast
+except ImportError:
+    pass
+
+class TestMarkerlib(unittest.TestCase):
+
+    def test_markers(self):
+        from _markerlib import interpret, default_environment, compile
+        
+        os_name = os.name
+        
+        self.assert_(interpret(""))
+        
+        self.assert_(interpret("os.name != 'buuuu'"))
+        self.assert_(interpret("python_version > '1.0'"))
+        self.assert_(interpret("python_version < '5.0'"))
+        self.assert_(interpret("python_version <= '5.0'"))
+        self.assert_(interpret("python_version >= '1.0'"))
+        self.assert_(interpret("'%s' in os.name" % os_name))
+        self.assert_(interpret("'buuuu' not in os.name"))
+        
+        self.assertFalse(interpret("os.name == 'buuuu'"))
+        self.assertFalse(interpret("python_version < '1.0'"))
+        self.assertFalse(interpret("python_version > '5.0'"))
+        self.assertFalse(interpret("python_version >= '5.0'"))
+        self.assertFalse(interpret("python_version <= '1.0'"))
+        self.assertFalse(interpret("'%s' not in os.name" % os_name))
+        self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))    
+        
+        environment = default_environment()
+        environment['extra'] = 'test'
+        self.assert_(interpret("extra == 'test'", environment))
+        self.assertFalse(interpret("extra == 'doc'", environment))
+        
+        @expectedFailure(NameError)
+        def raises_nameError():
+            interpret("python.version == '42'")
+        
+        raises_nameError()
+        
+        @expectedFailure(SyntaxError)
+        def raises_syntaxError():
+            interpret("(x for x in (4,))")
+            
+        raises_syntaxError()
+        
+        statement = "python_version == '5'"
+        self.assertEqual(compile(statement).__doc__, statement)
+        
+    @skipIf('_ast' not in globals(),
+        "ast not available (Python < 2.5?)")
+    def test_ast(self):
+        try:
+            import ast, nose
+            raise nose.SkipTest()
+        except ImportError:
+            pass
+        
+        # Nonsensical code coverage tests.
+        import _markerlib._markers_ast as _markers_ast
+        
+        class Node(_ast.AST):
+            _fields = ('bogus')
+        list(_markers_ast.iter_fields(Node()))
+        
+        class Node2(_ast.AST):
+            def __init__(self):
+                self._fields = ('bogus',)
+                self.bogus = [Node()]
+                
+        class NoneTransformer(_markers_ast.NodeTransformer):
+            def visit_Attribute(self, node):
+                return None
+            
+            def visit_Str(self, node):
+                return None
+            
+            def visit_Node(self, node):
+                return []
+                
+        NoneTransformer().visit(_markers_ast.parse('a.b = "c"'))
+        NoneTransformer().visit(Node2())
+        
diff --git a/pkg_resources.py b/pkg_resources.py
index ca0f21c4ee..63d1897798 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1746,7 +1746,7 @@ def find_on_path(importer, path_item, only=False):
             # scan for .egg and .egg-info in directory
             for entry in os.listdir(path_item):
                 lower = entry.lower()
-                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
+                if lower.endswith(('.egg-info', '.dist-info')):
                     fullpath = os.path.join(path_item, entry)
                     if os.path.isdir(fullpath):
                         # egg-info directory, allow getting metadata
@@ -2489,7 +2489,7 @@ def marker_fn(environment=None, override=None):
             marker_fn.__doc__ = marker
             return marker_fn
         try:
-            from markerlib import as_function
+            from _markerlib import as_function
         except ImportError:
             as_function = dummy_marker
         dm = self.__dep_map = {None: []}
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 001c443361..70dce2d44e 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -7,7 +7,7 @@
 import textwrap
 
 try:
-    import markerlib
+    import _markerlib
 except:
     pass
 
@@ -34,8 +34,8 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @skipIf('markerlib' not in globals(),
-        "install markerlib to test conditional dependencies")
+    @skipIf('_markerlib' not in globals(),
+        "_markerlib is used to test conditional dependencies (Python >= 2.5)")
     def test_conditional_dependencies(self):
         requires = [pkg_resources.Requirement.parse('splort==4'),
                     pkg_resources.Requirement.parse('quux>=1.1')]
@@ -51,7 +51,8 @@ def setUp(self):
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
         open(os.path.join(versioned, 'METADATA'), 'w+').write(DALS(
-            """Metadata-Version: 1.2
+            """
+            Metadata-Version: 1.2
             Name: VersionedDistribution
             Requires-Dist: splort (4)
             Provides-Extra: baz
@@ -62,7 +63,8 @@ def setUp(self):
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
         open(os.path.join(unversioned, 'METADATA'), 'w+').write(DALS(
-            """Metadata-Version: 1.2
+            """
+            Metadata-Version: 1.2
             Name: UnversionedDistribution
             Version: 0.3
             Requires-Dist: splort (==4)

From 71d6c4c5a29e30a8dac82ad5a79356a5a849e783 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sat, 25 Aug 2012 15:31:37 -0400
Subject: [PATCH 3555/8469] move _markerlib test into setuptools/test

--HG--
branch : distribute
extra : rebase_source : b2d7118f3a3cdf931ba1e56090a35442bc70fd2a
---
 .../tests}/test_markerlib.py                  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
 rename {_markerlib => setuptools/tests}/test_markerlib.py (85%)

diff --git a/_markerlib/test_markerlib.py b/setuptools/tests/test_markerlib.py
similarity index 85%
rename from _markerlib/test_markerlib.py
rename to setuptools/tests/test_markerlib.py
index ff78d672cc..4cce0430c0 100644
--- a/_markerlib/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -1,8 +1,6 @@
 import os
 import unittest
-import pkg_resources
 from setuptools.tests.py26compat import skipIf
-from unittest import expectedFailure
 
 try:
     import _ast
@@ -11,6 +9,8 @@
 
 class TestMarkerlib(unittest.TestCase):
 
+    @skipIf('_ast' not in globals(),
+        "ast not available (Python < 2.5?)")
     def test_markers(self):
         from _markerlib import interpret, default_environment, compile
         
@@ -39,15 +39,23 @@ def test_markers(self):
         self.assert_(interpret("extra == 'test'", environment))
         self.assertFalse(interpret("extra == 'doc'", environment))
         
-        @expectedFailure(NameError)
         def raises_nameError():
-            interpret("python.version == '42'")
+            try:
+                interpret("python.version == '42'")
+            except NameError:
+                pass
+            else:
+                raise Exception("Expected NameError")
         
         raises_nameError()
         
-        @expectedFailure(SyntaxError)
         def raises_syntaxError():
-            interpret("(x for x in (4,))")
+            try:
+                interpret("(x for x in (4,))")
+            except SyntaxError:
+                pass
+            else:
+                raise Exception("Expected SyntaxError")
             
         raises_syntaxError()
         

From 4095eb5d31995c4a80d0a9b5125d8cefbf1d8390 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Sun, 26 Aug 2012 16:46:21 -0400
Subject: [PATCH 3556/8469] Python < 2.5 doesn't support tuple arguments to
 .endswith()

--HG--
branch : distribute
extra : rebase_source : c22d5cf00d0f5f053104ff81e60be4701ca27ad8
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 63d1897798..2d7f247ee9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1746,7 +1746,7 @@ def find_on_path(importer, path_item, only=False):
             # scan for .egg and .egg-info in directory
             for entry in os.listdir(path_item):
                 lower = entry.lower()
-                if lower.endswith(('.egg-info', '.dist-info')):
+                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
                     fullpath = os.path.join(path_item, entry)
                     if os.path.isdir(fullpath):
                         # egg-info directory, allow getting metadata

From 9ebbe014df37c19976a5a9cb0ac2fa228a03144a Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 27 Aug 2012 18:54:29 -0400
Subject: [PATCH 3557/8469] impractical to support _markerlib on Python < 2.6
 (no compile(ast))

--HG--
branch : distribute
extra : rebase_source : c5019294d83fab26bc393fe72f086d0b13b1e337
---
 _markerlib/__init__.py     |   1 +
 _markerlib/_markers_ast.py | 132 -------------------------------------
 _markerlib/markers.py      |  12 +---
 pkg_resources.py           |   6 +-
 4 files changed, 7 insertions(+), 144 deletions(-)
 delete mode 100644 _markerlib/_markers_ast.py

diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
index ef8c994c15..a7b260375f 100644
--- a/_markerlib/__init__.py
+++ b/_markerlib/__init__.py
@@ -1 +1,2 @@
+"""Used by pkg_resources to interpret PEP 345 environment markers."""
 from _markerlib.markers import default_environment, compile, interpret, as_function
diff --git a/_markerlib/_markers_ast.py b/_markerlib/_markers_ast.py
deleted file mode 100644
index b7a5e0b9d8..0000000000
--- a/_markerlib/_markers_ast.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Just enough of ast.py for markers.py
-"""
-
-from _ast import AST, PyCF_ONLY_AST
-
-def parse(source, filename='<unknown>', mode='exec'):
-    """
-    Parse the source into an AST node.
-    Equivalent to compile(source, filename, mode, PyCF_ONLY_AST).
-    """
-    return compile(source, filename, mode, PyCF_ONLY_AST)
-
-def copy_location(new_node, old_node):
-    """
-    Copy source location (`lineno` and `col_offset` attributes) from
-    *old_node* to *new_node* if possible, and return *new_node*.
-    """
-    for attr in 'lineno', 'col_offset':
-        if attr in old_node._attributes and attr in new_node._attributes \
-           and hasattr(old_node, attr):
-            setattr(new_node, attr, getattr(old_node, attr))
-    return new_node
-
-def iter_fields(node):
-    """
-    Yield a tuple of ``(fieldname, value)`` for each field in ``node._fields``
-    that is present on *node*.
-    """
-    for field in node._fields:
-        try:
-            yield field, getattr(node, field)
-        except AttributeError:
-            pass
-
-class NodeVisitor(object):
-    """
-    A node visitor base class that walks the abstract syntax tree and calls a
-    visitor function for every node found.  This function may return a value
-    which is forwarded by the `visit` method.
-
-    This class is meant to be subclassed, with the subclass adding visitor
-    methods.
-
-    Per default the visitor functions for the nodes are ``'visit_'`` +
-    class name of the node.  So a `TryFinally` node visit function would
-    be `visit_TryFinally`.  This behavior can be changed by overriding
-    the `visit` method.  If no visitor function exists for a node
-    (return value `None`) the `generic_visit` visitor is used instead.
-
-    Don't use the `NodeVisitor` if you want to apply changes to nodes during
-    traversing.  For this a special visitor exists (`NodeTransformer`) that
-    allows modifications.
-    """
-
-    def visit(self, node):
-        """Visit a node."""
-        method = 'visit_' + node.__class__.__name__
-        visitor = getattr(self, method, self.generic_visit)
-        return visitor(node)
-
-#    def generic_visit(self, node):
-#        """Called if no explicit visitor function exists for a node."""
-#        for field, value in iter_fields(node):
-#            if isinstance(value, list):
-#                for item in value:
-#                    if isinstance(item, AST):
-#                        self.visit(item)
-#            elif isinstance(value, AST):
-#                self.visit(value)
-
-
-class NodeTransformer(NodeVisitor):
-    """
-    A :class:`NodeVisitor` subclass that walks the abstract syntax tree and
-    allows modification of nodes.
-
-    The `NodeTransformer` will walk the AST and use the return value of the
-    visitor methods to replace or remove the old node.  If the return value of
-    the visitor method is ``None``, the node will be removed from its location,
-    otherwise it is replaced with the return value.  The return value may be the
-    original node in which case no replacement takes place.
-
-    Here is an example transformer that rewrites all occurrences of name lookups
-    (``foo``) to ``data['foo']``::
-
-       class RewriteName(NodeTransformer):
-
-           def visit_Name(self, node):
-               return copy_location(Subscript(
-                   value=Name(id='data', ctx=Load()),
-                   slice=Index(value=Str(s=node.id)),
-                   ctx=node.ctx
-               ), node)
-
-    Keep in mind that if the node you're operating on has child nodes you must
-    either transform the child nodes yourself or call the :meth:`generic_visit`
-    method for the node first.
-
-    For nodes that were part of a collection of statements (that applies to all
-    statement nodes), the visitor may also return a list of nodes rather than
-    just a single node.
-
-    Usually you use the transformer like this::
-
-       node = YourTransformer().visit(node)
-    """
-
-    def generic_visit(self, node):
-        for field, old_value in iter_fields(node):
-            old_value = getattr(node, field, None)
-            if isinstance(old_value, list):
-                new_values = []
-                for value in old_value:
-                    if isinstance(value, AST):
-                        value = self.visit(value)
-                        if value is None:
-                            continue
-                        elif not isinstance(value, AST):
-                            new_values.extend(value)
-                            continue
-                    new_values.append(value)
-                old_value[:] = new_values
-            elif isinstance(old_value, AST):
-                new_node = self.visit(old_value)
-                if new_node is None:
-                    delattr(node, field)
-                else:
-                    setattr(node, field, new_node)
-        return node
-    
\ No newline at end of file
diff --git a/_markerlib/markers.py b/_markerlib/markers.py
index 293adf7235..54c2828a02 100644
--- a/_markerlib/markers.py
+++ b/_markerlib/markers.py
@@ -12,17 +12,13 @@
     platform.version = platform.version()
     platform.machine = platform.machine()
     platform.python_implementation = platform.python_implementation()
-    a free string, like '2.4', or 'win32'
+    a free string, like '2.6', or 'win32'
 """
 
 __all__ = ['default_environment', 'compile', 'interpret']
 
-# Would import from ast but for Python 2.5
-from _ast import Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop
-try:
-    from ast import parse, copy_location, NodeTransformer
-except ImportError: # pragma no coverage
-    from markerlib._markers_ast import parse, copy_location, NodeTransformer
+from ast import Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop
+from ast import parse, copy_location, NodeTransformer
 
 import os
 import platform
@@ -104,7 +100,5 @@ def marker_fn(environment=None, override=None):
     _cache[marker] = marker_fn
     return _cache[marker]
 
-as_function = compile # bw compat
-
 def interpret(marker, environment=None):
     return compile(marker)(environment)
diff --git a/pkg_resources.py b/pkg_resources.py
index 2d7f247ee9..060db64463 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2489,9 +2489,9 @@ def marker_fn(environment=None, override=None):
             marker_fn.__doc__ = marker
             return marker_fn
         try:
-            from _markerlib import as_function
+            from _markerlib import compile as compile_marker
         except ImportError:
-            as_function = dummy_marker
+            compile_marker = dummy_marker
         dm = self.__dep_map = {None: []}
 
         reqs = []
@@ -2499,7 +2499,7 @@ def marker_fn(environment=None, override=None):
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
             distvers, mark = self._preparse_requirement(req)
             parsed = parse_requirements(distvers).next()
-            parsed.marker_fn = as_function(mark)
+            parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
             
         def reqs_for_extra(extra):

From 165f95218ab30580eafba4e2571e03ed14ca482f Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 27 Aug 2012 19:11:13 -0400
Subject: [PATCH 3558/8469] move Python < 2.6 fallback into _markerlib

--HG--
branch : distribute
extra : rebase_source : 901265cef35594b3ab20ae4ba3b270a5da6f9ea7
---
 _markerlib/__init__.py | 18 ++++++++++++++++--
 pkg_resources.py       | 11 +----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
index a7b260375f..d13e4d5a67 100644
--- a/_markerlib/__init__.py
+++ b/_markerlib/__init__.py
@@ -1,2 +1,16 @@
-"""Used by pkg_resources to interpret PEP 345 environment markers."""
-from _markerlib.markers import default_environment, compile, interpret, as_function
+try:
+    import ast
+    from markerlib.markers import default_environment, compile, interpret
+except ImportError:
+    if 'ast' in globals():
+        raise
+    def default_environment():
+        return {}
+    def compile(marker):
+        def marker_fn(environment=None, override=None):
+            # 'empty markers are True' heuristic won't install extra deps.
+            return not marker.strip()
+        marker_fn.__doc__ = marker
+        return marker_fn
+    def interpret(marker, environment=None, override=None):
+        return compile(marker)()
diff --git a/pkg_resources.py b/pkg_resources.py
index 060db64463..a5a10eb4b5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2482,16 +2482,7 @@ def _preparse_requirement(self, requires_dist):
             
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
-        def dummy_marker(marker):
-            def marker_fn(environment=None, override=None):
-                # 'empty markers are True' heuristic won't install extra deps.
-                return not marker.strip()
-            marker_fn.__doc__ = marker
-            return marker_fn
-        try:
-            from _markerlib import compile as compile_marker
-        except ImportError:
-            compile_marker = dummy_marker
+        from _markerlib import compile as compile_marker
         dm = self.__dep_map = {None: []}
 
         reqs = []

From dbc8208b379835ee43224e83829b41790347e1e2 Mon Sep 17 00:00:00 2001
From: Pedro Romano <pedro.romano@digitaluna.net>
Date: Thu, 30 Aug 2012 11:58:22 +0100
Subject: [PATCH 3559/8469] Use 'optparse' module to parse command line
 arguments.

--HG--
branch : distribute
extra : rebase_source : 09f901daf15d650d2b2c5f620ef3660d78e5e4b7
---
 distribute_setup.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index f3199d125b..5b10f1efb2 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -19,6 +19,7 @@
 import fnmatch
 import tempfile
 import tarfile
+import optparse
 from distutils import log
 
 try:
@@ -495,22 +496,27 @@ def sorter(dir1, dir2):
                 self._dbg(1, "tarfile: %s" % e)
 
 
-def _build_install_args(argv):
+def _build_install_args(user_install):
     install_args = []
-    user_install = '--user' in argv
-    if user_install and sys.version_info < (2, 6):
-        log.warn("--user requires Python 2.6 or later")
-        raise SystemExit(1)
     if user_install:
-        install_args.append('--user')
+        if sys.version_info < (2, 6):
+            log.warn("--user requires Python 2.6 or later")
+            raise SystemExit(1)
+        else:
+            install_args.append('--user')
     return install_args
 
 
-def main(argv, version=DEFAULT_VERSION):
+def main(version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
+    parser = optparse.OptionParser()
+    parser.add_option(
+        '--user', dest='user_install', action='store_true', default=False,
+        help='install in user site package (requires Python 2.6 or later)')
+    options, args = parser.parse_args()
     tarball = download_setuptools()
-    _install(tarball, _build_install_args(argv))
+    _install(tarball, _build_install_args(options.user_install))
 
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    main()

From 9c822a826b6d0ed1ecd746c6b3f8039054d2c84b Mon Sep 17 00:00:00 2001
From: Pedro Romano <pedro.romano@digitaluna.net>
Date: Thu, 30 Aug 2012 12:18:15 +0100
Subject: [PATCH 3560/8469] New command line option to enable downloading the
 distribute package from an alternative location.

--HG--
branch : distribute
extra : rebase_source : 114d0bb6c9c065ae369b8d0e603eb6d1d3a0b6fc
---
 distribute_setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 5b10f1efb2..eca355ce76 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -513,8 +513,12 @@ def main(version=DEFAULT_VERSION):
     parser.add_option(
         '--user', dest='user_install', action='store_true', default=False,
         help='install in user site package (requires Python 2.6 or later)')
+    parser.add_option(
+        '--download-base', dest='download_base', metavar="URL",
+        default=DEFAULT_URL,
+        help='alternative URL from where to download the distribute package')
     options, args = parser.parse_args()
-    tarball = download_setuptools()
+    tarball = download_setuptools(download_base=options.download_base)
     _install(tarball, _build_install_args(options.user_install))
 
 

From bf06ab669aacba63dfe4ee8adb5f50b72387c0bd Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Wed, 5 Sep 2012 19:01:58 -0400
Subject: [PATCH 3561/8469] adds a test for pr #4

--HG--
branch : distribute
extra : rebase_source : 347b39fb279b7168490a2c62562b4223b6c419e2
---
 setuptools/tests/test_sdist.py | 79 ++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 setuptools/tests/test_sdist.py

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
new file mode 100644
index 0000000000..8d9ed922a9
--- /dev/null
+++ b/setuptools/tests/test_sdist.py
@@ -0,0 +1,79 @@
+"""sdist tests"""
+
+
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+from StringIO import StringIO
+
+
+from setuptools.command.sdist import sdist
+from setuptools.dist import Distribution
+
+
+SETUP_ATTRS = {
+    'name': 'sdist_test',
+    'version': '0.0',
+    'packages': ['sdist_test'],
+    'package_data': {'sdist_test': ['*.txt']}
+}
+
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(**%r)
+""" % SETUP_ATTRS
+
+
+class TestSdistTest(unittest.TestCase):
+    def setUp(self):
+        self.temp_dir = tempfile.mkdtemp()
+        f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
+        f.write(SETUP_PY)
+        f.close()
+        # Set up the rest of the test package
+        test_pkg = os.path.join(self.temp_dir, 'sdist_test')
+        os.mkdir(test_pkg)
+        # *.rst was not included in package_data, so c.rst should not be
+        # automatically added to the manifest when not under version control
+        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']:
+            # Just touch the files; their contents are irrelevant
+            open(os.path.join(test_pkg, fname), 'w').close()
+
+        self.old_cwd = os.getcwd()
+        os.chdir(self.temp_dir)
+
+    def tearDown(self):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.temp_dir)
+
+    def test_package_data_in_sdist(self):
+        """Regression test for pull request #4: ensures that files listed in
+        package_data are included in the manifest even if they're not added to
+        version control.
+        """
+
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # squelch output
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO()
+        sys.stderr = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+        manifest = cmd.filelist.files
+
+        self.assert_(os.path.join('sdist_test', 'a.txt') in manifest)
+        self.assert_(os.path.join('sdist_test', 'b.txt') in manifest)
+        self.assert_(os.path.join('sdist_test', 'c.rst') not in manifest)

From 6eece1023d4a0d5e7229d33dc53600e8e31d7942 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Wed, 5 Sep 2012 19:12:10 -0400
Subject: [PATCH 3562/8469] Add a note about how this fix relates to
 include_package_data. Although still somewhat buried, this should clarify the
 issue raised in #218, and points out that include_package_data should really
 only be used if all the relevant files are in a supported version control
 system.

--HG--
branch : distribute
extra : rebase_source : e29284c59469ba9543b57afa64a0f52ee07eebf3
---
 docs/setuptools.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 4105dc2e41..34169c7e42 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -756,17 +756,18 @@ e.g.::
         include_package_data = True
     )
 
-This tells setuptools to install any data files it finds in your packages.  The
-data files must be under CVS or Subversion control, or else they must be
+This tells setuptools to install any data files it finds in your packages.
+The data files must be under CVS or Subversion control, or else they must be
 specified via the distutils' ``MANIFEST.in`` file.  (They can also be tracked
 by another revision control system, using an appropriate plugin.  See the
 section below on `Adding Support for Other Revision Control Systems`_ for
 information on how to write such plugins.)
 
-If you want finer-grained control over what files are included (for example, if
-you have documentation files in your package directories and want to exclude
-them from installation), then you can also use the ``package_data`` keyword,
-e.g.::
+If the data files are not under version control, or are not in a supported
+version control system, or if you want finer-grained control over what files
+are included (for example, if you have documentation files in your package
+directories and want to exclude them from installation), then you can also use
+the ``package_data`` keyword, e.g.::
 
     from setuptools import setup, find_packages
     setup(
@@ -822,7 +823,10 @@ converts slashes to appropriate platform-specific separators at build time.
 (Note: although the ``package_data`` argument was previously only available in
 ``setuptools``, it was also added to the Python ``distutils`` package as of
 Python 2.4; there is `some documentation for the feature`__ available on the
-python.org website.)
+python.org website.  If using the setuptools-specific ``include_package_data``
+argument, files specified by ``package_data`` will *not* be automatically
+added to the manifest unless they are tracked by a supported version control
+system, or are listed in the MANIFEST.in file.)
 
 __ http://docs.python.org/dist/node11.html
 

From 9fbb4e4ac9f4ba7c9e4de2168844bf3e6c64416e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Sep 2012 20:45:21 -0400
Subject: [PATCH 3563/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : 96d2de7069a6d567ad125e408df82241f515bd07
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3eea84eb78..82ae6e5802 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,9 @@ CHANGES
 * Issue #313: Support for sdist subcommands (Python 2.7)
 * Issue #314: test_local_index() would fail an OS X.
 * Issue #310: Non-ascii characters in a namespace __init__.py causes errors.
+* Issue #218: Improved documentation on behavior of `package_data` and
+  `include_package_data`. Files indicated by `package_data` are now included
+  in the manifest.
 
 ------
 0.6.28

From 932ea7cc2b1ef4eba5d8c1ee46c64cce529e3207 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Sep 2012 21:10:29 -0400
Subject: [PATCH 3564/8469] Extract argument parsing as a separate function

--HG--
branch : distribute
extra : rebase_source : d2143d4dd1332558689b6b90770c013bce3a7e37
---
 distribute_setup.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index eca355ce76..95ba23c52a 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -20,6 +20,7 @@
 import tempfile
 import tarfile
 import optparse
+
 from distutils import log
 
 try:
@@ -496,19 +497,22 @@ def sorter(dir1, dir2):
                 self._dbg(1, "tarfile: %s" % e)
 
 
-def _build_install_args(user_install):
+def _build_install_args(options):
+    """
+    Build the arguments to 'python setup.py install' on the distribute package
+    """
     install_args = []
-    if user_install:
+    if options.user_install:
         if sys.version_info < (2, 6):
             log.warn("--user requires Python 2.6 or later")
             raise SystemExit(1)
-        else:
-            install_args.append('--user')
+        install_args.append('--user')
     return install_args
 
-
-def main(version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
+def _parse_args():
+    """
+    Parse the command line for options
+    """
     parser = optparse.OptionParser()
     parser.add_option(
         '--user', dest='user_install', action='store_true', default=False,
@@ -518,9 +522,14 @@ def main(version=DEFAULT_VERSION):
         default=DEFAULT_URL,
         help='alternative URL from where to download the distribute package')
     options, args = parser.parse_args()
-    tarball = download_setuptools(download_base=options.download_base)
-    _install(tarball, _build_install_args(options.user_install))
+    # positional arguments are ignored
+    return options
 
+def main(version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    options = _parse_args()
+    tarball = download_setuptools(download_base=options.download_base)
+    _install(tarball, _build_install_args(options))
 
 if __name__ == '__main__':
     main()

From 06959116eed7effdbf3af575946f619cdb7fcd71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Sep 2012 21:11:19 -0400
Subject: [PATCH 3565/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : f92b138358cd2699cea63bf39a552e10bf62c02d
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 82ae6e5802..b59a0b0011 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,8 @@ CHANGES
 * Issue #218: Improved documentation on behavior of `package_data` and
   `include_package_data`. Files indicated by `package_data` are now included
   in the manifest.
+* `distribute_setup.py` now allows a `--download-base` argument for retrieving
+  distribute from a specified location.
 
 ------
 0.6.28

From d847dbfeee2b2c85d7bc0a66813c33836a9850fa Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Thu, 6 Sep 2012 15:51:09 -0400
Subject: [PATCH 3566/8469] Adds a fix for issue #318, including a regression
 test.  This also fixes another test that was passing trivially due to *bug*
 in yet another test, ugh

--HG--
branch : distribute
extra : rebase_source : 476550766b7b756dced040ad4356b7685d6f062a
---
 setuptools/dist.py                    |   3 +-
 setuptools/sandbox.py                 |  10 +--
 setuptools/tests/__init__.py          |   2 +-
 setuptools/tests/test_easy_install.py | 102 ++++++++++++++++++++------
 4 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0ad18122cf..6607cf7bb4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -264,6 +264,7 @@ def finalize_options(self):
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
+
         try:
             cmd = self._egg_fetcher
             cmd.package_index.to_scan = []
@@ -287,7 +288,7 @@ def fetch_build_egg(self, req):
             cmd = easy_install(
                 dist, args=["x"], install_dir=os.curdir, exclude_scripts=True,
                 always_copy=False, build_directory=None, editable=False,
-                upgrade=False, multi_version=True, no_report = True
+                upgrade=False, multi_version=True, no_report=True, user=False
             )
             cmd.ensure_finalized()
             self._egg_fetcher = cmd
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index ab2543d96f..64f725e72d 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -166,12 +166,12 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
     _EXCEPTIONS = []
 
 try:
-	from win32com.client.gencache import GetGeneratePath
-	_EXCEPTIONS.append(GetGeneratePath())
-	del GetGeneratePath
+    from win32com.client.gencache import GetGeneratePath
+    _EXCEPTIONS.append(GetGeneratePath())
+    del GetGeneratePath
 except ImportError:
-	# it appears pywin32 is not installed, so no need to exclude.
-	pass
+    # it appears pywin32 is not installed, so no need to exclude.
+    pass
 
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index eec76efd40..b6988a08d7 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -38,7 +38,7 @@ def makeSetup(**args):
     try:
         return setuptools.setup(**args)
     finally:
-        distutils.core_setup_stop_after = None
+        distutils.core._setup_stop_after = None
 
 
 class DependsTests(unittest.TestCase):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 13f668d021..ce8b611b47 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -12,6 +12,7 @@
 import StringIO
 import distutils.core
 
+from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import easy_install, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -110,7 +111,9 @@ def _parse_command_line(self):
         old_wd = os.getcwd()
         try:
             os.chdir(dir)
-            main([])
+            reset_setup_stop_context(
+                lambda: self.assertRaises(SystemExit, main, [])
+            )
         finally:
             os.chdir(old_wd)
             shutil.rmtree(dir)
@@ -247,7 +250,7 @@ def test_local_index(self):
             cmd.local_index.scan([new_location])
             res = cmd.easy_install('foo')
             self.assertEqual(os.path.realpath(res.location),
-                             os.path.realpath(new_location))            
+                             os.path.realpath(new_location))
         finally:
             sys.path.remove(target)
             for basedir in [new_location, target, ]:
@@ -262,6 +265,50 @@ def test_local_index(self):
             else:
                 del os.environ['PYTHONPATH']
 
+    def test_setup_requires(self):
+        """Regression test for issue #318
+
+        Ensures that a package with setup_requires can be installed when
+        distribute is installed in the user site-packages without causing a
+        SandboxViolation.
+        """
+
+        test_setup_attrs = {
+            'name': 'test_pkg', 'version': '0.0',
+            'setup_requires': ['foobar'],
+            'dependency_links': [os.path.abspath(self.dir)]
+        }
+
+        test_pkg = os.path.join(self.dir, 'test_pkg')
+        test_setup_py = os.path.join(test_pkg, 'setup.py')
+        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+        os.mkdir(test_pkg)
+
+        f = open(test_setup_py, 'w')
+        f.write(textwrap.dedent("""\
+            import setuptools
+            setuptools.setup(**%r)
+        """ % test_setup_attrs))
+        f.close()
+
+        foobar_path = os.path.join(self.dir, 'foobar-0.1.tar.gz')
+        make_trivial_sdist(
+            foobar_path,
+            textwrap.dedent("""\
+                import setuptools
+                setuptools.setup(
+                    name='foobar',
+                    version='0.1'
+                )
+            """))
+
+        try:
+            reset_setup_stop_context(
+                lambda: run_setup(test_setup_py, ['install'])
+            )
+        except SandboxViolation:
+            self.fail('Installation caused SandboxViolation')
+
 
 class TestSetupRequires(unittest.TestCase):
 
@@ -319,30 +366,41 @@ def create_sdist(self, installer):
         doesn't exist) and invoke installer on it.
         """
         def build_sdist(dir):
-            setup_py = tarfile.TarInfo(name="setup.py")
-            try:
-                # Python 3 (StringIO gets converted to io module)
-                MemFile = StringIO.BytesIO
-            except AttributeError:
-                MemFile = StringIO.StringIO
-            setup_py_bytes = MemFile(textwrap.dedent("""
-                import setuptools
-                setuptools.setup(
-                    name="distribute-test-fetcher",
-                    version="1.0",
-                    setup_requires = ['does-not-exist'],
-                )
-                """).lstrip().encode('utf-8'))
-            setup_py.size = len(setup_py_bytes.getvalue())
             dist_path = os.path.join(dir, 'distribute-test-fetcher-1.0.tar.gz')
-            dist = tarfile.open(dist_path, 'w:gz')
-            try:
-                dist.addfile(setup_py, fileobj=setup_py_bytes)
-            finally:
-                dist.close()
+            make_trivial_sdist(
+                dist_path,
+                textwrap.dedent("""
+                    import setuptools
+                    setuptools.setup(
+                        name="distribute-test-fetcher",
+                        version="1.0",
+                        setup_requires = ['does-not-exist'],
+                    )
+                """).lstrip())
             installer(dist_path)
         tempdir_context(build_sdist)
 
+
+def make_trivial_sdist(dist_path, setup_py):
+    """Create a simple sdist tarball at dist_path, containing just a
+    setup.py, the contents of which are provided by the setup_py string.
+    """
+
+    setup_py_file = tarfile.TarInfo(name='setup.py')
+    try:
+        # Python 3 (StringIO gets converted to io module)
+        MemFile = StringIO.BytesIO
+    except AttributeError:
+        MemFile = StringIO.StringIO
+    setup_py_bytes = MemFile(setup_py.encode('utf-8'))
+    setup_py_file.size = len(setup_py_bytes.getvalue())
+    dist = tarfile.open(dist_path, 'w:gz')
+    try:
+        dist.addfile(setup_py_file, fileobj=setup_py_bytes)
+    finally:
+        dist.close()
+
+
 def tempdir_context(f, cd=lambda dir:None):
     """
     Invoke f in the context

From f0e94e21399229808cd34bea8cba5175f14ab07d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Sep 2012 08:56:46 +0200
Subject: [PATCH 3567/8469] Bump to 3.3.0rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8d73b51cbe..f23d886420 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc1"
+__version__ = "3.3.0rc2"
 #--end constants--

From 8866de1785cc6961d2111f1e0f55b781a7de660d Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Tue, 11 Sep 2012 08:00:12 -0400
Subject: [PATCH 3568/8469] Remove missing import (since b62968cd2666)

--HG--
branch : distribute
extra : rebase_source : d1190f895d794dfcb838f7eb40a60ab07b8b309e
---
 _markerlib/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
index a7b260375f..9c37bb9aea 100644
--- a/_markerlib/__init__.py
+++ b/_markerlib/__init__.py
@@ -1,2 +1,2 @@
 """Used by pkg_resources to interpret PEP 345 environment markers."""
-from _markerlib.markers import default_environment, compile, interpret, as_function
+from _markerlib.markers import default_environment, compile, interpret

From cada83b25777a9b089b85bc4417baa7016a9c652 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Tue, 11 Sep 2012 08:12:04 -0400
Subject: [PATCH 3569/8469] Make this test less chatty

--HG--
branch : distribute
extra : rebase_source : da18973713f46ff00931ea79f0fcd39a13fb8349
---
 setuptools/tests/test_easy_install.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ce8b611b47..e49c6f49d8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -302,12 +302,19 @@ def test_setup_requires(self):
                 )
             """))
 
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO.StringIO()
+        sys.stderr = StringIO.StringIO()
         try:
             reset_setup_stop_context(
                 lambda: run_setup(test_setup_py, ['install'])
             )
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
 
 
 class TestSetupRequires(unittest.TestCase):

From dbbfab8fe8a8c146c2353f751d617c8761f6ddc4 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Tue, 11 Sep 2012 13:53:29 -0400
Subject: [PATCH 3570/8469] Fixes and adds a regression test for #323; required
 adding some new keyword arguments to existing pkg_resources methods. Also had
 to update how __path__ is handled for namespace packages to ensure that when
 a new egg distribution containing a namespace package is placed on sys.path,
 the entries in __path__ are in the same order they would have been in had
 that egg been on the path when pkg_resources was first imported

--HG--
branch : distribute
extra : rebase_source : 63a120c9397f6619d2768ec982e5c6b664c97e40
---
 pkg_resources.py                      |  60 +++++++----
 setuptools/dist.py                    |   5 +-
 setuptools/tests/test_easy_install.py | 142 +++++++++++++++++++-------
 3 files changed, 148 insertions(+), 59 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 060db64463..7495f1b69e 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -517,7 +517,7 @@ def __iter__(self):
                     seen[key]=1
                     yield self.by_key[key]
 
-    def add(self, dist, entry=None, insert=True):
+    def add(self, dist, entry=None, insert=True, replace=False):
         """Add `dist` to working set, associated with `entry`
 
         If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
@@ -525,8 +525,9 @@ def add(self, dist, entry=None, insert=True):
         set's ``.entries`` (if it wasn't already present).
 
         `dist` is only added to the working set if it's for a project that
-        doesn't already have a distribution in the set.  If it's added, any
-        callbacks registered with the ``subscribe()`` method will be called.
+        doesn't already have a distribution in the set, unless `replace=True`.
+        If it's added, any callbacks registered with the ``subscribe()`` method
+        will be called.
         """
         if insert:
             dist.insert_on(self.entries, entry)
@@ -535,7 +536,7 @@ def add(self, dist, entry=None, insert=True):
             entry = dist.location
         keys = self.entry_keys.setdefault(entry,[])
         keys2 = self.entry_keys.setdefault(dist.location,[])
-        if dist.key in self.by_key:
+        if not replace and dist.key in self.by_key:
             return      # ignore hidden distros
 
         self.by_key[dist.key] = dist
@@ -545,7 +546,8 @@ def add(self, dist, entry=None, insert=True):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None, replacement=True):
+    def resolve(self, requirements, env=None, installer=None,
+                replacement=True, replace_conflicting=False):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -555,6 +557,12 @@ def resolve(self, requirements, env=None, installer=None, replacement=True):
         will be invoked with each requirement that cannot be met by an
         already-installed distribution; it should return a ``Distribution`` or
         ``None``.
+
+        Unless `replace_conflicting=True`, raises a VersionConflict exception if
+        any requirements are found on the path that have the correct name but
+        the wrong version.  Otherwise, if an `installer` is supplied it will be
+        invoked to obtain the correct version of the requirement and activate
+        it.
         """
 
         requirements = list(requirements)[::-1]  # set up the stack
@@ -574,10 +582,18 @@ def resolve(self, requirements, env=None, installer=None, replacement=True):
             if dist is None:
                 # Find the best distribution and add it to the map
                 dist = self.by_key.get(req.key)
-                if dist is None:
+                if dist is None or (dist not in req and replace_conflicting):
+                    ws = self
                     if env is None:
-                        env = Environment(self.entries)
-                    dist = best[req.key] = env.best_match(req, self, installer)
+                        if dist is None:
+                            env = Environment(self.entries)
+                        else:
+                            # Use an empty environment and workingset to avoid
+                            # any further conflicts with the conflicting
+                            # distribution
+                            env = Environment([])
+                            ws = WorkingSet([])
+                    dist = best[req.key] = env.best_match(req, ws, installer)
                     if dist is None:
                         #msg = ("The '%s' distribution was not found on this "
                         #       "system, and is required by this application.")
@@ -1798,6 +1814,7 @@ def namespace_handler(importer,path_entry,moduleName,module):
 
 def _handle_ns(packageName, path_item):
     """Ensure that named package includes a subpath of path_item (if needed)"""
+
     importer = get_importer(path_item)
     if importer is None:
         return None
@@ -1807,14 +1824,19 @@ def _handle_ns(packageName, path_item):
     module = sys.modules.get(packageName)
     if module is None:
         module = sys.modules[packageName] = types.ModuleType(packageName)
-        module.__path__ = []; _set_parent_ns(packageName)
+        module.__path__ = []
+        _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
     handler = _find_adapter(_namespace_handlers, importer)
-    subpath = handler(importer,path_item,packageName,module)
+    subpath = handler(importer, path_item, packageName, module)
     if subpath is not None:
-        path = module.__path__; path.append(subpath)
-        loader.load_module(packageName); module.__path__ = path
+        path = module.__path__
+        path.append(subpath)
+        loader.load_module(packageName)
+        for path_item in path:
+            if path_item not in module.__path__:
+                module.__path__.append(path_item)
     return subpath
 
 def declare_namespace(packageName):
@@ -2120,7 +2142,7 @@ def _remove_md5_fragment(location):
 class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
-    
+
     def __init__(self,
         location=None, metadata=None, project_name=None, version=None,
         py_version=PY_MAJOR, platform=None, precedence = EGG_DIST
@@ -2459,7 +2481,7 @@ def _parsed_pkg_info(self):
             from email.parser import Parser
             self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
             return self._pkg_info
-    
+
     @property
     def _dep_map(self):
         try:
@@ -2470,7 +2492,7 @@ def _dep_map(self):
 
     def _preparse_requirement(self, requires_dist):
         """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
-        Split environment marker, add == prefix to version specifiers as 
+        Split environment marker, add == prefix to version specifiers as
         necessary, and remove parenthesis.
         """
         parts = requires_dist.split(';', 1) + ['']
@@ -2479,7 +2501,7 @@ def _preparse_requirement(self, requires_dist):
         distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
         distvers = distvers.replace('(', '').replace(')', '')
         return (distvers, mark)
-            
+
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
         def dummy_marker(marker):
@@ -2501,7 +2523,7 @@ def marker_fn(environment=None, override=None):
             parsed = parse_requirements(distvers).next()
             parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
-            
+
         def reqs_for_extra(extra):
             for req in reqs:
                 if req.marker_fn(override={'extra':extra}):
@@ -2509,13 +2531,13 @@ def reqs_for_extra(extra):
 
         common = frozenset(reqs_for_extra(None))
         dm[None].extend(common)
-            
+
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             extra = safe_extra(extra.strip())
             dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
 
         return dm
-    
+
 
 _distributionImpl = {'.egg': Distribution,
                      '.egg-info': Distribution,
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6607cf7bb4..2061c0a2b2 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -242,9 +242,10 @@ def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         from pkg_resources import working_set, parse_requirements
         for dist in working_set.resolve(
-            parse_requirements(requires), installer=self.fetch_build_egg
+            parse_requirements(requires), installer=self.fetch_build_egg,
+            replace_conflicting=True
         ):
-            working_set.add(dist)
+            working_set.add(dist, replace=True)
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e49c6f49d8..1540bdc6ed 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -17,8 +17,10 @@
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
+from pkg_resources import working_set, VersionConflict
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
+import pkg_resources
 
 try:
     # import multiprocessing solely for the purpose of testing its existence
@@ -273,48 +275,16 @@ def test_setup_requires(self):
         SandboxViolation.
         """
 
-        test_setup_attrs = {
-            'name': 'test_pkg', 'version': '0.0',
-            'setup_requires': ['foobar'],
-            'dependency_links': [os.path.abspath(self.dir)]
-        }
-
-        test_pkg = os.path.join(self.dir, 'test_pkg')
+        test_pkg = create_setup_requires_package(self.dir)
         test_setup_py = os.path.join(test_pkg, 'setup.py')
-        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
-        os.mkdir(test_pkg)
 
-        f = open(test_setup_py, 'w')
-        f.write(textwrap.dedent("""\
-            import setuptools
-            setuptools.setup(**%r)
-        """ % test_setup_attrs))
-        f.close()
-
-        foobar_path = os.path.join(self.dir, 'foobar-0.1.tar.gz')
-        make_trivial_sdist(
-            foobar_path,
-            textwrap.dedent("""\
-                import setuptools
-                setuptools.setup(
-                    name='foobar',
-                    version='0.1'
-                )
-            """))
-
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO.StringIO()
-        sys.stderr = StringIO.StringIO()
         try:
-            reset_setup_stop_context(
-                lambda: run_setup(test_setup_py, ['install'])
-            )
+            quiet_context(
+                lambda: reset_setup_stop_context(
+                    lambda: run_setup(test_setup_py, ['install'])
+            ))
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
-        finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
 
 
 class TestSetupRequires(unittest.TestCase):
@@ -360,7 +330,7 @@ def install_clean_argv():
             tempdir_context(install_at)
 
         # create an sdist that has a build-time dependency.
-        self.create_sdist(install)
+        quiet_context(lambda: self.create_sdist(install))
 
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
@@ -387,6 +357,81 @@ def build_sdist(dir):
             installer(dist_path)
         tempdir_context(build_sdist)
 
+    def test_setup_requires_overrides_version_conflict(self):
+        """
+        Regression test for issue #323.
+
+        Ensures that a distribution's setup_requires requirements can still be
+        installed and used locally even if a conflicting version of that
+        requirement is already on the path.
+        """
+
+        pr_state = pkg_resources.__getstate__()
+        fake_dist = PRDistribution('does-not-matter', project_name='foobar',
+                                   version='0.0')
+        working_set.add(fake_dist)
+
+        def setup_and_run(temp_dir):
+            test_pkg = create_setup_requires_package(temp_dir)
+            test_setup_py = os.path.join(test_pkg, 'setup.py')
+            try:
+                stdout, stderr = quiet_context(
+                    lambda: reset_setup_stop_context(
+                        # Don't even need to install the package, just running
+                        # the setup.py at all is sufficient
+                        lambda: run_setup(test_setup_py, ['--name'])
+                ))
+            except VersionConflict:
+                self.fail('Installing setup.py requirements caused '
+                          'VersionConflict')
+
+            lines = stdout.splitlines()
+            self.assertGreater(len(lines), 0)
+            self.assert_(lines[-1].strip(), 'test_pkg')
+
+        try:
+            tempdir_context(setup_and_run)
+        finally:
+            pkg_resources.__setstate__(pr_state)
+
+
+def create_setup_requires_package(path):
+    """Creates a source tree under path for a trivial test package that has a
+    single requirement in setup_requires--a tarball for that requirement is
+    also created and added to the dependency_links argument.
+    """
+
+    test_setup_attrs = {
+        'name': 'test_pkg', 'version': '0.0',
+        'setup_requires': ['foobar==0.1'],
+        'dependency_links': [os.path.abspath(path)]
+    }
+
+    test_pkg = os.path.join(path, 'test_pkg')
+    test_setup_py = os.path.join(test_pkg, 'setup.py')
+    test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+    os.mkdir(test_pkg)
+
+    f = open(test_setup_py, 'w')
+    f.write(textwrap.dedent("""\
+        import setuptools
+        setuptools.setup(**%r)
+    """ % test_setup_attrs))
+    f.close()
+
+    foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
+    make_trivial_sdist(
+        foobar_path,
+        textwrap.dedent("""\
+            import setuptools
+            setuptools.setup(
+                name='foobar',
+                version='0.1'
+            )
+        """))
+
+    return test_pkg
+
 
 def make_trivial_sdist(dist_path, setup_py):
     """Create a simple sdist tarball at dist_path, containing just a
@@ -421,6 +466,7 @@ def tempdir_context(f, cd=lambda dir:None):
         cd(orig_dir)
         shutil.rmtree(temp_dir)
 
+
 def environment_context(f, **updates):
     """
     Invoke f in the context
@@ -434,6 +480,7 @@ def environment_context(f, **updates):
             del os.environ[key]
         os.environ.update(old_env)
 
+
 def argv_context(f, repl):
     """
     Invoke f in the context
@@ -445,6 +492,7 @@ def argv_context(f, repl):
     finally:
         sys.argv[:] = old_argv
 
+
 def reset_setup_stop_context(f):
     """
     When the distribute tests are run using setup.py test, and then
@@ -458,3 +506,21 @@ def reset_setup_stop_context(f):
         f()
     finally:
         distutils.core._setup_stop_after = setup_stop_after
+
+
+def quiet_context(f):
+    """
+    Redirect stdout/stderr to StringIO objects to prevent console output from
+    distutils commands.
+    """
+
+    old_stdout = sys.stdout
+    old_stderr = sys.stderr
+    new_stdout = sys.stdout = StringIO.StringIO()
+    new_stderr = sys.stderr = StringIO.StringIO()
+    try:
+        f()
+    finally:
+        sys.stdout = old_stdout
+        sys.stderr = old_stderr
+    return new_stdout.getvalue(), new_stderr.getvalue()

From 85097e081f3d987c7acf6ab51e29a307f4f8f167 Mon Sep 17 00:00:00 2001
From: Paulo Koch <paulo.koch@gmail.com>
Date: Thu, 13 Sep 2012 00:19:08 +0100
Subject: [PATCH 3571/8469] Make revision specifiable.

--HG--
branch : distribute
extra : rebase_source : 059208b9bdcd9a0cf2c2f654f25b638a65f2d9d1
---
 setuptools/package_index.py | 49 ++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cd89e9a6bc..e085732d49 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -701,22 +701,53 @@ def _download_svn(self, url, filename):
         os.system("svn checkout -q %s %s" % (url, filename))
         return filename
 
+    def _vcs_split_rev_from_url(self, url, pop_prefix=False):
+        scheme, netloc, path, query, frag = urlparse.urlsplit(url)
+
+        scheme = scheme.split('+', 1)[-1]
+
+        # Some fragment identification fails
+        path = path.split('#',1)[0]
+
+        rev = None
+        if '@' in path:
+            path, rev = path.rsplit('@', 1)
+
+        # Also, discard fragment
+        url = urlparse.urlunsplit((scheme, netloc, path, query, ''))
+
+        return url, rev
+
     def _download_git(self, url, filename):
-        if url.startswith('git+'):
-            url = url[4:]
-        url = url.split('#',1)[0]   # remove any fragment for svn's sake
-        filename = filename.split('#',1)[0]   # remove any fragment to get a decent name.
+        filename = filename.split('#',1)[0]
+        url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+
         self.info("Doing git clone from %s to %s", url, filename)
-        os.system("git clone -q %s %s" % (url, filename))
+        os.system("git clone --quiet %s %s" % (url, filename))
+
+        if rev is not None:
+            self.info("Checking out %s", rev)
+            os.system("(cd %s && git checkout --quiet %s)" % (
+                filename,
+                rev,
+            ))
+
         return filename
 
     def _download_hg(self, url, filename):
-        if url.startswith('hg+'):
-            url = url[3:]
-        url = url.split('#',1)[0]   # remove any fragment for svn's sake
-        filename = filename.split('#',1)[0]   # remove any fragment to get a decent name.
+        filename = filename.split('#',1)[0]
+        url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+
         self.info("Doing hg clone from %s to %s", url, filename)
         os.system("hg clone --quiet %s %s" % (url, filename))
+
+        if rev is not None:
+            self.info("Updating to %s", rev)
+            os.system("(cd %s && hg up -C -r %s >&-)" % (
+                filename,
+                rev,
+            ))
+
         return filename
 
     def debug(self, msg, *args):

From fa1318a4b29050341b5397685bc26ecf6ed57d52 Mon Sep 17 00:00:00 2001
From: Paulo Koch <paulo.koch@gmail.com>
Date: Thu, 13 Sep 2012 00:20:05 +0100
Subject: [PATCH 3572/8469] Add docs for using VCS repos as dependency_links.

--HG--
branch : distribute
extra : rebase_source : 5795a4e630010c2380cb777c94f9bbc73fafd401
---
 docs/setuptools.txt | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 31eedcb160..e0557984c8 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -616,14 +616,20 @@ Dependencies that aren't in PyPI
 
 If your project depends on packages that aren't registered in PyPI, you may
 still be able to depend on them, as long as they are available for download
-as an egg, in the standard distutils ``sdist`` format, or as a single ``.py``
-file.  You just need to add some URLs to the ``dependency_links`` argument to
+as:
+
+- an egg, in the standard distutils ``sdist`` format,
+- a single ``.py`` file, or
+- a VCS repository (Subversion, Mercurial, or Git).
+
+You just need to add some URLs to the ``dependency_links`` argument to
 ``setup()``.
 
 The URLs must be either:
 
-1. direct download URLs, or
-2. the URLs of web pages that contain direct download links
+1. direct download URLs,
+2. the URLs of web pages that contain direct download links, or
+3. the repository's URL
 
 In general, it's better to link to web pages, because it is usually less
 complex to update a web page than to release a new version of your project.
@@ -637,6 +643,27 @@ by replacing them with underscores.)  EasyInstall will recognize this suffix
 and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
 as an egg.
 
+In the case of a VCS checkout, you should also append ``#egg=project-version``
+in order to identify for what package that checkout should be used. You can
+append ``@REV`` to the URL's path (before the fragment) to specify a revision.
+Additionally, you can also force the VCS being used by prepending the URL with
+a certain prefix. Currently available are:
+
+-  ``svn+URL`` for Subversion,
+-  ``git+URL`` for Git, and
+-  ``hg+URL`` for Mercurial
+
+A more complete example would be:
+
+    ``vcs+proto://host/path@revision#egg=project-version``
+
+Be careful with the version. It should match the one inside the project files.
+If you want do disregard the version, you have to omit it both in the
+``requires`` and in the URL's fragment.
+
+This will do a checkout (or a clone, in Git and Mercurial parlance) to a
+temporary folder and run ``setup.py bdist_egg``.
+
 The ``dependency_links`` option takes the form of a list of URL strings.  For
 example, the below will cause EasyInstall to search the specified page for
 eggs or source distributions, if the package's dependencies aren't already

From 25d00ab637a11693f0a82548904058095f0a64cb Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 17 Sep 2012 08:40:37 -0400
Subject: [PATCH 3573/8469] skip markerlib tests on Python < 2.6 (no ast
 compilation)

--HG--
branch : distribute
extra : rebase_source : 2044b531becb5ca6882bfb3b59ab53aac2c8ae2e
---
 setuptools/tests/test_dist_info.py |  6 ++---
 setuptools/tests/test_markerlib.py | 40 +++---------------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 70dce2d44e..623ccc471a 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -7,7 +7,7 @@
 import textwrap
 
 try:
-    import _markerlib
+    import ast
 except:
     pass
 
@@ -34,8 +34,8 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @skipIf('_markerlib' not in globals(),
-        "_markerlib is used to test conditional dependencies (Python >= 2.5)")
+    @skipIf('ast' not in globals(),
+        "ast is used to test conditional dependencies (Python >= 2.6)")
     def test_conditional_dependencies(self):
         requires = [pkg_resources.Requirement.parse('splort==4'),
                     pkg_resources.Requirement.parse('quux>=1.1')]
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index 4cce0430c0..7ff2f5841c 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -3,14 +3,14 @@
 from setuptools.tests.py26compat import skipIf
 
 try:
-    import _ast
+    import ast
 except ImportError:
     pass
 
 class TestMarkerlib(unittest.TestCase):
 
-    @skipIf('_ast' not in globals(),
-        "ast not available (Python < 2.5?)")
+    @skipIf('ast' not in globals(),
+        "ast not available (Python < 2.6?)")
     def test_markers(self):
         from _markerlib import interpret, default_environment, compile
         
@@ -62,37 +62,3 @@ def raises_syntaxError():
         statement = "python_version == '5'"
         self.assertEqual(compile(statement).__doc__, statement)
         
-    @skipIf('_ast' not in globals(),
-        "ast not available (Python < 2.5?)")
-    def test_ast(self):
-        try:
-            import ast, nose
-            raise nose.SkipTest()
-        except ImportError:
-            pass
-        
-        # Nonsensical code coverage tests.
-        import _markerlib._markers_ast as _markers_ast
-        
-        class Node(_ast.AST):
-            _fields = ('bogus')
-        list(_markers_ast.iter_fields(Node()))
-        
-        class Node2(_ast.AST):
-            def __init__(self):
-                self._fields = ('bogus',)
-                self.bogus = [Node()]
-                
-        class NoneTransformer(_markers_ast.NodeTransformer):
-            def visit_Attribute(self, node):
-                return None
-            
-            def visit_Str(self, node):
-                return None
-            
-            def visit_Node(self, node):
-                return []
-                
-        NoneTransformer().visit(_markers_ast.parse('a.b = "c"'))
-        NoneTransformer().visit(Node2())
-        

From fb321a77f92988e24bac25f3493397c82146db6a Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Mon, 17 Sep 2012 08:43:15 -0400
Subject: [PATCH 3574/8469] markerlib -> _markerlib

--HG--
branch : distribute
extra : rebase_source : d44490f6b809c93eb9b20409862ea28a3f039aae
---
 _markerlib/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
index d13e4d5a67..e2b237b1f6 100644
--- a/_markerlib/__init__.py
+++ b/_markerlib/__init__.py
@@ -1,6 +1,6 @@
 try:
     import ast
-    from markerlib.markers import default_environment, compile, interpret
+    from _markerlib.markers import default_environment, compile, interpret
 except ImportError:
     if 'ast' in globals():
         raise

From ffefa25af237361253ed505a9045ae8b9642ae02 Mon Sep 17 00:00:00 2001
From: Lennart Regebro <regebro@gmail.com>
Date: Mon, 17 Sep 2012 15:48:03 +0200
Subject: [PATCH 3575/8469] Fixed so _markerlib is included in Python 3 as
 well. I don't like the package pollution, but we can maybe fix that later.

--HG--
branch : distribute
extra : rebase_source : 5b3de3075ffea309979c51df9d6a6a6fb1188050
---
 MANIFEST.in                          |  1 +
 distribute.egg-info/entry_points.txt | 92 ++++++++++++++--------------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 461cfd4f13..9837747a22 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
+recursive-include _markerlib *.py
 include *.py
 include *.txt
 include MANIFEST.in
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 663882d630..667a6d7ada 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
 [egg_info.writers]
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
+include_package_data = setuptools.dist:assert_bool
+test_loader = setuptools.dist:check_importable
+use_2to3_fixers = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
 extras_require = setuptools.dist:check_extras
+eager_resources = setuptools.dist:assert_string_list
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+entry_points = setuptools.dist:check_entry_points
 namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
+use_2to3 = setuptools.dist:assert_bool
+tests_require = setuptools.dist:check_requirements
 packages = setuptools.dist:check_packages
+test_suite = setuptools.dist:check_test_suite
 convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[distutils.commands]
+upload_docs = setuptools.command.upload_docs:upload_docs
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+saveopts = setuptools.command.saveopts:saveopts
+install_lib = setuptools.command.install_lib:install_lib
+register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_py = setuptools.command.build_py:build_py
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+test = setuptools.command.test:test
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+install = setuptools.command.install:install
+install_scripts = setuptools.command.install_scripts:install_scripts
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+sdist = setuptools.command.sdist:sdist
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 

From 6cfedcaaf8d8e65a0686b2d856d2eb95fd6c85bf Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@mumak.net>
Date: Wed, 19 Sep 2012 11:17:36 +0100
Subject: [PATCH 3576/8469] Guard the chmod in case external_attr is 0.

--HG--
branch : distribute
extra : rebase_source : 79d8c285c70c3cf44273439c5178cfa54b0c3b21
---
 setuptools/archive_util.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 8ad147521b..e22b25c00d 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -158,7 +158,9 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
                 finally:
                     f.close()
                     del data
-            os.chmod(target, info.external_attr >> 16)
+            unix_attributes = info.external_attr >> 16
+            if unix_attributes:
+                os.chmod(target, unix_attributes)
     finally:
         z.close()
 

From db43cb973d253a6e01945b61c92f6161921d7ce2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 23 Sep 2012 17:15:21 +0200
Subject: [PATCH 3577/8469] Bump to 3.3.0rc3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f23d886420..b755eaaf2c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc2"
+__version__ = "3.3.0rc3"
 #--end constants--

From a5609a81b25425fdff1ac8aab120d8d6a4313f8b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 29 Sep 2012 09:04:54 +0200
Subject: [PATCH 3578/8469] Bump version to 3.3.0 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b755eaaf2c..345ac4f8dd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc3"
+__version__ = "3.3.0"
 #--end constants--

From ff6785063112982ccd38892d21859b8a8a45318a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 29 Sep 2012 09:34:13 +0200
Subject: [PATCH 3579/8469] Bump version to 3.4.0 alpha 0.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 345ac4f8dd..70a72b0967 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0"
+__version__ = "3.4.0a0"
 #--end constants--

From 7efb0c1885fecfcc7dfdd2955bdeaab5b6549b48 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 13:02:10 +0200
Subject: [PATCH 3580/8469] Avoid import loop in Python 3.3. Fixes #304.

--HG--
branch : distribute
extra : rebase_source : 8ce699d489f708a68338b2417771854174a734e8
---
 distribute.egg-info/entry_points.txt | 86 ++++++++++++++--------------
 site.py                              |  3 +-
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 667a6d7ada..6e3ac87bcd 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
+[distutils.commands]
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+setopt = setuptools.command.setopt:setopt
+egg_info = setuptools.command.egg_info:egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+register = setuptools.command.register:register
+build_py = setuptools.command.build_py:build_py
+sdist = setuptools.command.sdist:sdist
+upload_docs = setuptools.command.upload_docs:upload_docs
+rotate = setuptools.command.rotate:rotate
+alias = setuptools.command.alias:alias
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install_lib = setuptools.command.install_lib:install_lib
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+develop = setuptools.command.develop:develop
+build_ext = setuptools.command.build_ext:build_ext
+easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
+saveopts = setuptools.command.saveopts:saveopts
+
+[console_scripts]
+easy_install-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
 [egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
 top_level.txt = setuptools.command.egg_info:write_toplevel_names
 requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
 
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
 [distutils.setup_keywords]
-include_package_data = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-use_2to3_fixers = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
-eager_resources = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
 entry_points = setuptools.dist:check_entry_points
-namespace_packages = setuptools.dist:check_nsp
-use_2to3 = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
 tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 packages = setuptools.dist:check_packages
+dependency_links = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_fixers = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+eager_resources = setuptools.dist:assert_string_list
 test_suite = setuptools.dist:check_test_suite
+install_requires = setuptools.dist:check_requirements
 convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
 
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[distutils.commands]
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-saveopts = setuptools.command.saveopts:saveopts
-install_lib = setuptools.command.install_lib:install_lib
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_ext = setuptools.command.build_ext:build_ext
-test = setuptools.command.test:test
-egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-sdist = setuptools.command.sdist:sdist
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/site.py b/site.py
index 80e084b257..a7166f1407 100755
--- a/site.py
+++ b/site.py
@@ -1,5 +1,5 @@
 def __boot():
-    import sys, imp, os, os.path   
+    import sys, os, os.path
     PYTHONPATH = os.environ.get('PYTHONPATH')
     if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH):
         PYTHONPATH = []
@@ -23,6 +23,7 @@ def __boot():
                 break
         else:
             try:
+                import imp # Avoid import loop in Python >= 3.3
                 stream, path, descr = imp.find_module('site',[item])
             except ImportError:
                 continue

From 71ae17459b9f3c64833e0c197b130e8dcbe1f45b Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 13:06:14 +0200
Subject: [PATCH 3581/8469] Remove egg-info from repo.

--HG--
branch : distribute
extra : rebase_source : 89a58a7b518862cdbf37a30a4b512853730251cc
---
 distribute.egg-info/entry_points.txt | 62 ----------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 distribute.egg-info/entry_points.txt

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
deleted file mode 100644
index 6e3ac87bcd..0000000000
--- a/distribute.egg-info/entry_points.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-[distutils.commands]
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-setopt = setuptools.command.setopt:setopt
-egg_info = setuptools.command.egg_info:egg_info
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-register = setuptools.command.register:register
-build_py = setuptools.command.build_py:build_py
-sdist = setuptools.command.sdist:sdist
-upload_docs = setuptools.command.upload_docs:upload_docs
-rotate = setuptools.command.rotate:rotate
-alias = setuptools.command.alias:alias
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install_lib = setuptools.command.install_lib:install_lib
-install_scripts = setuptools.command.install_scripts:install_scripts
-install = setuptools.command.install:install
-develop = setuptools.command.develop:develop
-build_ext = setuptools.command.build_ext:build_ext
-easy_install = setuptools.command.easy_install:easy_install
-test = setuptools.command.test:test
-saveopts = setuptools.command.saveopts:saveopts
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-entry_points.txt = setuptools.command.egg_info:write_entries
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-requires.txt = setuptools.command.egg_info:write_requirements
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-
-[distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-zip_safe = setuptools.dist:assert_bool
-include_package_data = setuptools.dist:assert_bool
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-dependency_links = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-eager_resources = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-install_requires = setuptools.dist:check_requirements
-convert_2to3_doctests = setuptools.dist:assert_string_list
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-

From 077a69aef0973333cafe4c7548dceb5418d1c36f Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 13:29:03 +0200
Subject: [PATCH 3582/8469] Purge modules under test from sys.modules prior to
 running tests. Fixes #301.

--HG--
branch : distribute
extra : rebase_source : 87561670c15ec8315f47157cdc0c06328ce8c20f
---
 setuptools/command/test.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e5cb9bb59c..a02ac14240 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,6 +2,7 @@
 from distutils.errors import DistutilsOptionError
 import sys
 from pkg_resources import *
+from pkg_resources import _namespace_packages
 from unittest import TestLoader, main
 
 class ScanningLoader(TestLoader):
@@ -139,6 +140,22 @@ def run(self):
 
     def run_tests(self):
         import unittest
+
+        # Purge modules under test from sys.modules. The test loader will
+        # re-import them from the build location. Required when 2to3 is used
+        # with namespace packages.
+        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
+            module = self.test_args[-1].split('.')[0]
+            if module in _namespace_packages:
+                del_modules = []
+                if module in sys.modules:
+                    del_modules.append(module)
+                module += '.'
+                for name in sys.modules:
+                    if name.startswith(module):
+                        del_modules.append(name)
+                map(sys.modules.__delitem__, del_modules)
+
         loader_ep = EntryPoint.parse("x="+self.test_loader)
         loader_class = loader_ep.load(require=False)
         cks = loader_class()

From 6851d4e38e1e4e5a2bbbf2556523fd19675cdbf7 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 19:48:19 +0200
Subject: [PATCH 3583/8469] Make sure the manifest never contains decomposed
 UTF-8.

--HG--
branch : distribute
extra : rebase_source : 0e0fb3beac56f66f12670ec69ebfd3996d12d912
---
 setuptools/command/egg_info.py | 14 +++++++++++++
 setuptools/tests/test_sdist.py | 37 +++++++++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 46cdf4e097..e932d46a4d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -287,6 +287,19 @@ def append(self, item):
 
 
 
+def compose(path):
+    # Apple's HFS Plus returns decomposed UTF-8. Since just about
+    # everyone else chokes on it, we must make sure to return fully
+    # composed UTF-8 only.
+    if sys.getfilesystemencoding().lower() == 'utf-8':
+        from unicodedata import normalize
+        if sys.version_info >= (3,):
+            path = normalize('NFC', path)
+        else:
+            path = normalize('NFC', path.decode('utf-8')).encode('utf-8')
+    return path
+
+
 class manifest_maker(sdist):
 
     template = "MANIFEST.in"
@@ -311,6 +324,7 @@ def run(self):
         self.prune_file_list()
         self.filelist.sort()
         self.filelist.remove_duplicates()
+        self.filelist.files = [compose(path) for path in self.filelist.files]
         self.write_manifest()
 
     def write_manifest (self):
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 8d9ed922a9..3412354548 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """sdist tests"""
 
 
@@ -74,6 +75,36 @@ def test_package_data_in_sdist(self):
 
         manifest = cmd.filelist.files
 
-        self.assert_(os.path.join('sdist_test', 'a.txt') in manifest)
-        self.assert_(os.path.join('sdist_test', 'b.txt') in manifest)
-        self.assert_(os.path.join('sdist_test', 'c.rst') not in manifest)
+        self.assertTrue(os.path.join('sdist_test', 'a.txt') in manifest)
+        self.assertTrue(os.path.join('sdist_test', 'b.txt') in manifest)
+        self.assertTrue(os.path.join('sdist_test', 'c.rst') not in manifest)
+
+    def test_filelist_is_fully_composed(self):
+        # Test for #303. Requires HFS Plus to fail.
+
+        # Add file with non-ASCII filename
+        filename = os.path.join('sdist_test', 'smörbröd.py')
+        open(filename, 'w').close()
+
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # squelch output
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO()
+        sys.stderr = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+        self.assertTrue(filename in cmd.filelist.files)
+
+
+def test_suite():
+    return unittest.defaultTestLoader.loadTestsFromName(__name__)
+

From d76ec4bfdf2fe9a2bced5ca2a3610831020453c6 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 19:52:32 +0200
Subject: [PATCH 3584/8469] Read and write manifest in UTF-8 under Python 3.
 Fixes #303.

--HG--
branch : distribute
extra : rebase_source : 609c654effd2711aa803f6a0e84013294026608f
---
 setuptools/command/sdist.py    | 27 +++++++++++++++
 setuptools/tests/test_sdist.py | 60 ++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a176f635a1..d5259c2bde 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -262,7 +262,34 @@ def make_release_tree(self, base_dir, files):
 
         self.get_finalized_command('egg_info').save_version_info(dest)
 
+    def _manifest_is_not_generated(self):
+        # check for special comment used in 2.7.1 and higher
+        if not os.path.isfile(self.manifest):
+            return False
 
+        fp = open(self.manifest, 'rbU')
+        try:
+            first_line = fp.readline()
+        finally:
+            fp.close()
+        return first_line != '# file GENERATED by distutils, do NOT edit\n'.encode()
+
+    def read_manifest(self):
+        """Read the manifest file (named by 'self.manifest') and use it to
+        fill in 'self.filelist', the list of files to include in the source
+        distribution.
+        """
+        log.info("reading manifest file '%s'", self.manifest)
+        manifest = open(self.manifest, 'rbU')
+        for line in manifest:
+            if sys.version_info >= (3,):
+                line = line.decode('UTF-8')
+            # ignore comments and blank lines
+            line = line.strip()
+            if line.startswith('#') or not line:
+                continue
+            self.filelist.append(line)
+        manifest.close()
 
 
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 3412354548..7e2f0a498b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -104,6 +104,66 @@ def test_filelist_is_fully_composed(self):
 
         self.assertTrue(filename in cmd.filelist.files)
 
+    def test_manifest_is_written_in_utf8(self):
+        # Test for #303.
+
+        # Add file with non-ASCII filename
+        filename = os.path.join('sdist_test', 'smörbröd.py')
+        open(filename, 'w').close()
+
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # squelch output
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO()
+        sys.stderr = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+        manifest = open(os.path.join('sdist_test.egg-info', 'SOURCES.txt'), 'rbU')
+        contents = manifest.read()
+        manifest.close()
+        self.assertTrue(len(contents))
+
+        # This must not fail:
+        contents.decode('UTF-8')
+
+    def test_manifest_is_read_in_utf8(self):
+        # Test for #303.
+
+        # Add file with non-ASCII filename
+        filename = os.path.join('sdist_test', 'smörbröd.py')
+        open(filename, 'w').close()
+
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # squelch output
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO()
+        sys.stderr = StringIO()
+        try:
+            cmd.run()
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
+
+        cmd.filelist.files = []
+        cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        cmd.read_manifest()
+
+        self.assertTrue(filename in cmd.filelist.files)
+
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)

From 11270be66d228aacca12a211e3fdcb38988fb193 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 20:32:46 +0200
Subject: [PATCH 3585/8469] Print metadata in UTF-8 independent of platform.
 Fixes #311.

--HG--
branch : distribute
extra : rebase_source : 4ff0df4ad7d9ea8cee6342f9c642e4fe634b7f18
---
 setuptools/dist.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6607cf7bb4..afac180ebb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -640,6 +640,38 @@ def iter_distribution_names(self):
                 name = name[:-6]
             yield name
 
+
+    def handle_display_options(self, option_order):
+        """If there were any non-global "display-only" options
+        (--help-commands or the metadata display options) on the command
+        line, display the requested info and return true; else return
+        false.
+        """
+        import sys
+
+        if sys.version_info < (3,) or self.help_commands:
+            return _Distribution.handle_display_options(self, option_order)
+
+        # Stdout may be StringIO (e.g. in tests)
+        import io
+        if not isinstance(sys.stdout, io.TextIOWrapper):
+            return _Distribution.handle_display_options(self, option_order)
+
+        # Print metadata in UTF-8 no matter the platform
+        encoding = sys.stdout.encoding
+        errors = sys.stdout.errors
+        newline = sys.platform != 'win32' and '\n' or None
+        line_buffering = sys.stdout.line_buffering
+
+        sys.stdout = io.TextIOWrapper(
+            sys.stdout.detach(), 'utf-8', errors, newline, line_buffering)
+        try:
+            return _Distribution.handle_display_options(self, option_order)
+        finally:
+            sys.stdout = io.TextIOWrapper(
+                sys.stdout.detach(), encoding, errors, newline, line_buffering)
+
+
 # Install it throughout the distutils
 for module in distutils.dist, distutils.core, distutils.cmd:
     module.Distribution = Distribution

From 645b5b084aa46696b490344a038875f105793308 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 20:37:54 +0200
Subject: [PATCH 3586/8469] Remove a missing fixer warning which showed during
 normal operations. Fixes #305.

--HG--
branch : distribute
extra : rebase_source : 3e5912a80758abf1e198d400c29ab03112eb68d6
---
 setuptools/command/build_py.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 505dd4f30a..8751acd493 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -51,10 +51,8 @@ def __exclude_fixers(self):
             if self.distribution.use_2to3_exclude_fixers is not None:
                 excluded_fixers.extend(self.distribution.use_2to3_exclude_fixers)
             for fixer_name in excluded_fixers:
-                if fixer_name not in self.fixer_names:
-                    log.warn("Excluded fixer %s not found", fixer_name)
-                    continue
-                self.fixer_names.remove(fixer_name)
+                if fixer_name in self.fixer_names:
+                    self.fixer_names.remove(fixer_name)
 
 except ImportError:
     class Mixin2to3:

From 9eca33ff8e3664ac2f2127aadeb358d213745123 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 20:55:39 +0200
Subject: [PATCH 3587/8469] os.access() cannot test for "createable" Fixes
 #320.

--HG--
branch : distribute
extra : rebase_source : d572b2701ceac9c8a46083cc6658c6eeed86d497
---
 distribute_setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 95ba23c52a..e367fdd16d 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -316,12 +316,12 @@ def _create_fake_setuptools_pkg_info(placeholder):
         log.warn('%s already exists', pkg_info)
         return
 
-    if not os.access(pkg_info, os.W_OK):
+    log.warn('Creating %s', pkg_info)
+    try:
+        f = open(pkg_info, 'w')
+    except EnvironmentError:
         log.warn("Don't have permissions to write %s, skipping", pkg_info)
         return
-
-    log.warn('Creating %s', pkg_info)
-    f = open(pkg_info, 'w')
     try:
         f.write(SETUPTOOLS_PKG_INFO)
     finally:

From 9553dd9910df577351ea04bb1613767096beeca0 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 20:58:18 +0200
Subject: [PATCH 3588/8469] marshall.load() does not necessarily raise
 ValueError. Fixes #283.

--HG--
branch : distribute
extra : rebase_source : 203cee618118fb65bf109d2db0275aa90aa5a12d
---
 setuptools/command/bdist_egg.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 0ee9c55b86..17fae984a7 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -425,12 +425,12 @@ def scan_module(egg_dir, base, name, stubs):
         return True     # Extension module
     pkg = base[len(egg_dir)+1:].replace(os.sep,'.')
     module = pkg+(pkg and '.' or '')+os.path.splitext(name)[0]
-    f = open(filename,'rb'); f.read(8)   # skip magic & date
-    try:
-        code = marshal.load(f); f.close()
-    except ValueError:
-        f.seek(0); f.read(12)  # skip magic & date & file size; file size added in Python 3.3
-        code = marshal.load(f); f.close()
+    if sys.version_info < (3, 3):
+        skip = 8   # skip magic & date
+    else:
+        skip = 12  # skip magic & date & file size
+    f = open(filename,'rb'); f.read(skip)
+    code = marshal.load(f); f.close()
     safe = True
     symbols = dict.fromkeys(iter_symbols(code))
     for bad in ['__file__', '__path__']:

From 907d9f46c3e0ef8dbc55528da9efe5087c182c9f Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 21:06:52 +0200
Subject: [PATCH 3589/8469] Fix duplicate application of version tags in
 'egg_info' command. Fixes #299.

--HG--
branch : distribute
extra : rebase_source : 9f6fb87944bc3b9828b04bf8ac5ba7b3a40bfc95
---
 setuptools/command/egg_info.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e932d46a4d..2dc5918738 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -162,7 +162,12 @@ def delete_file(self, filename):
             os.unlink(filename)
 
     def tagged_version(self):
-        return safe_version(self.distribution.get_version() + self.vtags)
+        version = self.distribution.get_version()
+        # egg_info may be called more than once for a distribution,
+        # in which case the version string already contains all tags.
+        if self.vtags and version.endswith(self.vtags):
+            return safe_version(version)
+        return safe_version(version + self.vtags)
 
     def run(self):
         self.mkpath(self.egg_info)

From 7a54a88a7727399ea369010a78637ce6db9bf725 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 21:42:31 +0200
Subject: [PATCH 3590/8469] Add my name to contributors list.

--HG--
branch : distribute
extra : rebase_source : d65f390123cbc59ac453e31b1d3d38c1fce6f105
---
 CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 852662391a..0335b224b8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -20,6 +20,7 @@ Contributors
 * Philip Jenvey
 * Reinout van Rees
 * Robert Myers
+* Stefan H. Holek
 * Tarek Ziadé
 * Toshio Kuratomi
 

From 0d407a3924d53323f81935124117c62d116b2068 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 8 Oct 2012 22:21:32 +0200
Subject: [PATCH 3591/8469] Fix a few messages in distribute_setup.py.

--HG--
branch : distribute
extra : rebase_source : ce0d4548e026262b6e4cf55c46dc5f209dbadd44
---
 distribute_setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index e367fdd16d..a52d5c16a5 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -257,7 +257,7 @@ def _same_content(path, content):
 
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s into %s', path, new_name)
+    log.warn('Renaming %s to %s', path, new_name)
     os.rename(path, new_name)
     return new_name
 
@@ -275,7 +275,7 @@ def _remove_flat_installation(placeholder):
         log.warn('Could not locate setuptools*.egg-info')
         return
 
-    log.warn('Removing elements out of the way...')
+    log.warn('Moving elements out of the way...')
     pkg_info = os.path.join(placeholder, file)
     if os.path.isdir(pkg_info):
         patched = _patch_egg_dir(pkg_info)
@@ -435,7 +435,7 @@ def _fake_setuptools():
         res = _patch_egg_dir(setuptools_location)
         if not res:
             return
-    log.warn('Patched done.')
+    log.warn('Patching complete.')
     _relaunch()
 
 

From 95907bcc8ddc3f87e46fdc6b9518d3c2f2a015ed Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 9 Oct 2012 18:38:21 +0200
Subject: [PATCH 3592/8469] Fix cause of test failure on Mac OS X. Refs #20.

--HG--
branch : distribute
extra : rebase_source : 92ba8151d6dfa3755b31139a9b5ada570183731d
---
 setuptools/package_index.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d0896febc4..ffbffa9960 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -779,6 +779,12 @@ def open_with_auth(url):
 
     scheme, netloc, path, params, query, frag = urlparse.urlparse(url)
 
+    # Double scheme does not raise on Mac OS X as revealed by a
+    # failing test. We would expect "nonnumeric port". Refs #20.
+    if sys.platform == 'darwin':
+        if netloc.endswith(':'):
+            raise httplib.InvalidURL("nonnumeric port: ''")
+
     if scheme in ('http', 'https'):
         auth, host = urllib2.splituser(netloc)
     else:
@@ -859,4 +865,4 @@ def local_open(url):
 
 
 
-# this line is a kludge to keep the trailing blank lines for pje's editor
\ No newline at end of file
+# this line is a kludge to keep the trailing blank lines for pje's editor

From db678072da41b75408680dab3e23c1b76573bf1d Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 9 Oct 2012 22:57:20 +0200
Subject: [PATCH 3593/8469] Update CHANGES.

--HG--
branch : distribute
extra : rebase_source : a97e83b5ec8e426bfd567cec9fbe1e2b39b0935a
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b59a0b0011..e2b7874bc8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,12 @@ CHANGES
 0.6.29
 ------
 
+* Issue #320: Fix check for "createable" in distribute_setup.py.
+* Issue #305: Remove a warning that was triggered during normal operations.
+* Issue #311: Print metadata in UTF-8 independent of platform.
+* Issue #303: Read manifest file with UTF-8 encoding under Python 3.
+* Issue #301: Allow to run tests of namespace packages when using 2to3.
+* Issue #304: Prevent import loop in site.py under Python 3.3.
 * Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
 * Issue #299: The develop command didn't work on Python 3, when using 2to3,
   as the egg link would go to the Python 2 source. Linking to the 2to3'd code

From 495e4bf6c1029b10cab8fa83ce28caf7011d0955 Mon Sep 17 00:00:00 2001
From: Jesus Cea <jcea@jcea.es>
Date: Thu, 11 Oct 2012 01:20:12 +0200
Subject: [PATCH 3594/8469] Closes #16135: Removal of OS/2 support (distutils)

---
 ccompiler.py             |   5 +-
 command/bdist.py         |   3 +-
 command/bdist_dumb.py    |   8 +-
 command/build_ext.py     |  26 +---
 command/install.py       |  15 --
 emxccompiler.py          | 315 ---------------------------------------
 spawn.py                 |  24 +--
 sysconfig.py             |  24 ---
 tests/test_bdist_dumb.py |   2 -
 tests/test_install.py    |   2 +-
 tests/test_util.py       |   2 +-
 util.py                  |   6 -
 12 files changed, 7 insertions(+), 425 deletions(-)
 delete mode 100644 emxccompiler.py

diff --git a/ccompiler.py b/ccompiler.py
index c795c958fe..911e84dd3b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -351,7 +351,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends,
         return macros, objects, extra, pp_opts, build
 
     def _get_cc_args(self, pp_opts, debug, before):
-        # works for unixccompiler, emxccompiler, cygwinccompiler
+        # works for unixccompiler, cygwinccompiler
         cc_args = pp_opts + ['-c']
         if debug:
             cc_args[:0] = ['-g']
@@ -926,7 +926,6 @@ def mkpath (self, name, mode=0o777):
     # on a cygwin built python we can use gcc like an ordinary UNIXish
     # compiler
     ('cygwin.*', 'unix'),
-    ('os2emx', 'emx'),
 
     # OS name mappings
     ('posix', 'unix'),
@@ -968,8 +967,6 @@ def get_default_compiler(osname=None, platform=None):
                                "Mingw32 port of GNU C Compiler for Win32"),
                    'bcpp':    ('bcppcompiler', 'BCPPCompiler',
                                "Borland C++ Compiler"),
-                   'emx':     ('emxccompiler', 'EMXCCompiler',
-                               "EMX port of GNU C Compiler for OS/2"),
                  }
 
 def show_compilers():
diff --git a/command/bdist.py b/command/bdist.py
index c5188eb371..38b169afd1 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -52,8 +52,7 @@ class bdist(Command):
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
     default_format = {'posix': 'gztar',
-                      'nt': 'zip',
-                      'os2': 'zip'}
+                      'nt': 'zip'}
 
     # Establish the preferred order (for the --help-formats option).
     format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 1ab09d1616..eefdfea5ad 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -38,8 +38,7 @@ class bdist_dumb(Command):
     boolean_options = ['keep-temp', 'skip-build', 'relative']
 
     default_format = { 'posix': 'gztar',
-                       'nt': 'zip',
-                       'os2': 'zip' }
+                       'nt': 'zip' }
 
     def initialize_options(self):
         self.bdist_dir = None
@@ -85,11 +84,6 @@ def run(self):
         archive_basename = "%s.%s" % (self.distribution.get_fullname(),
                                       self.plat_name)
 
-        # OS/2 objects to any ":" characters in a filename (such as when
-        # a timestamp is used in a version) so change them to hyphens.
-        if os.name == "os2":
-            archive_basename = archive_basename.replace(":", "-")
-
         pseudoinstall_root = os.path.join(self.dist_dir, archive_basename)
         if not self.relative:
             archive_root = self.bdist_dir
diff --git a/command/build_ext.py b/command/build_ext.py
index f16e2f17ef..6b6a04e8bf 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -223,11 +223,6 @@ def finalize_options(self):
                 self.library_dirs.append(os.path.join(sys.exec_prefix,
                                          'PC', 'VC6'))
 
-        # OS/2 (EMX) doesn't support Debug vs Release builds, but has the
-        # import libraries in its "Config" subdirectory
-        if os.name == 'os2':
-            self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
-
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
         if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
@@ -613,9 +608,6 @@ def find_swig(self):
                     return fn
             else:
                 return "swig.exe"
-        elif os.name == "os2":
-            # assume swig available in the PATH.
-            return "swig.exe"
         else:
             raise DistutilsPlatformError(
                   "I don't know how to find (much less run) SWIG "
@@ -666,9 +658,6 @@ def get_ext_filename(self, ext_name):
         """
         from distutils.sysconfig import get_config_var
         ext_path = ext_name.split('.')
-        # OS/2 has an 8 character module (extension) limit :-(
-        if os.name == "os2":
-            ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')
         if os.name == 'nt' and self.debug:
@@ -689,7 +678,7 @@ def get_export_symbols(self, ext):
     def get_libraries(self, ext):
         """Return the list of libraries to link against when building a
         shared extension.  On most platforms, this is just 'ext.libraries';
-        on Windows and OS/2, we add the Python library (eg. python20.dll).
+        on Windows, we add the Python library (eg. python20.dll).
         """
         # The python library is always needed on Windows.  For MSVC, this
         # is redundant, since the library is mentioned in a pragma in
@@ -709,19 +698,6 @@ def get_libraries(self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-        elif sys.platform == "os2emx":
-            # EMX/GCC requires the python library explicitly, and I
-            # believe VACPP does as well (though not confirmed) - AIM Apr01
-            template = "python%d%d"
-            # debug versions of the main DLL aren't supported, at least
-            # not at this time - AIM Apr01
-            #if self.debug:
-            #    template = template + '_d'
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "cygwin":
             template = "python%d.%d"
             pythonlib = (template %
diff --git a/command/install.py b/command/install.py
index 0161898f49..04326a1731 100644
--- a/command/install.py
+++ b/command/install.py
@@ -58,13 +58,6 @@
         'data'   : '$base',
         },
     'nt': WINDOWS_SCHEME,
-    'os2': {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-        },
     }
 
 # user site schemes
@@ -86,14 +79,6 @@
         'data'   : '$userbase',
         }
 
-    INSTALL_SCHEMES['os2_home'] = {
-        'purelib': '$usersite',
-        'platlib': '$usersite',
-        'headers': '$userbase/include/python$py_version_short/$dist_name',
-        'scripts': '$userbase/bin',
-        'data'   : '$userbase',
-        }
-
 # The keys to an installation scheme; if any new types of files are to be
 # installed, be sure to add an entry to every installation scheme above,
 # and to SCHEME_KEYS here.
diff --git a/emxccompiler.py b/emxccompiler.py
deleted file mode 100644
index 3675f8df9c..0000000000
--- a/emxccompiler.py
+++ /dev/null
@@ -1,315 +0,0 @@
-"""distutils.emxccompiler
-
-Provides the EMXCCompiler class, a subclass of UnixCCompiler that
-handles the EMX port of the GNU C compiler to OS/2.
-"""
-
-# issues:
-#
-# * OS/2 insists that DLLs can have names no longer than 8 characters
-#   We put export_symbols in a def-file, as though the DLL can have
-#   an arbitrary length name, but truncate the output filename.
-#
-# * only use OMF objects and use LINK386 as the linker (-Zomf)
-#
-# * always build for multithreading (-Zmt) as the accompanying OS/2 port
-#   of Python is only distributed with threads enabled.
-#
-# tested configurations:
-#
-# * EMX gcc 2.81/EMX 0.9d fix03
-
-import os,sys,copy
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
-from distutils.unixccompiler import UnixCCompiler
-from distutils.file_util import write_file
-from distutils.errors import DistutilsExecError, CompileError, UnknownFileError
-from distutils import log
-
-class EMXCCompiler (UnixCCompiler):
-
-    compiler_type = 'emx'
-    obj_extension = ".obj"
-    static_lib_extension = ".lib"
-    shared_lib_extension = ".dll"
-    static_lib_format = "%s%s"
-    shared_lib_format = "%s%s"
-    res_extension = ".res"      # compiled resource file
-    exe_extension = ".exe"
-
-    def __init__ (self,
-                  verbose=0,
-                  dry_run=0,
-                  force=0):
-
-        UnixCCompiler.__init__ (self, verbose, dry_run, force)
-
-        (status, details) = check_config_h()
-        self.debug_print("Python's GCC status: %s (details: %s)" %
-                         (status, details))
-        if status is not CONFIG_H_OK:
-            self.warn(
-                "Python's pyconfig.h doesn't seem to support your compiler.  " +
-                ("Reason: %s." % details) +
-                "Compiling may fail because of undefined preprocessor macros.")
-
-        (self.gcc_version, self.ld_version) = \
-            get_versions()
-        self.debug_print(self.compiler_type + ": gcc %s, ld %s\n" %
-                         (self.gcc_version,
-                          self.ld_version) )
-
-        # Hard-code GCC because that's what this is all about.
-        # XXX optimization, warnings etc. should be customizable.
-        self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                             compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                             linker_exe='gcc -Zomf -Zmt -Zcrtdll',
-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-
-        # want the gcc library statically linked (so that we don't have
-        # to distribute a version dependent on the compiler we have)
-        self.dll_libraries=["gcc"]
-
-    # __init__ ()
-
-    def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-        if ext == '.rc':
-            # gcc requires '.rc' compiled to binary ('.res') files !!!
-            try:
-                self.spawn(["rc", "-r", src])
-            except DistutilsExecError as msg:
-                raise CompileError(msg)
-        else: # for other files use the C-compiler
-            try:
-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-                           extra_postargs)
-            except DistutilsExecError as msg:
-                raise CompileError(msg)
-
-    def link (self,
-              target_desc,
-              objects,
-              output_filename,
-              output_dir=None,
-              libraries=None,
-              library_dirs=None,
-              runtime_library_dirs=None,
-              export_symbols=None,
-              debug=0,
-              extra_preargs=None,
-              extra_postargs=None,
-              build_temp=None,
-              target_lang=None):
-
-        # use separate copies, so we can modify the lists
-        extra_preargs = copy.copy(extra_preargs or [])
-        libraries = copy.copy(libraries or [])
-        objects = copy.copy(objects or [])
-
-        # Additional libraries
-        libraries.extend(self.dll_libraries)
-
-        # handle export symbols by creating a def-file
-        # with executables this only works with gcc/ld as linker
-        if ((export_symbols is not None) and
-            (target_desc != self.EXECUTABLE)):
-            # (The linker doesn't do anything if output is up-to-date.
-            # So it would probably better to check if we really need this,
-            # but for this we had to insert some unchanged parts of
-            # UnixCCompiler, and this is not what we want.)
-
-            # we want to put some files in the same directory as the
-            # object files are, build_temp doesn't help much
-            # where are the object files
-            temp_dir = os.path.dirname(objects[0])
-            # name of dll to give the helper files the same base name
-            (dll_name, dll_extension) = os.path.splitext(
-                os.path.basename(output_filename))
-
-            # generate the filenames for these files
-            def_file = os.path.join(temp_dir, dll_name + ".def")
-
-            # Generate .def file
-            contents = [
-                "LIBRARY %s INITINSTANCE TERMINSTANCE" % \
-                os.path.splitext(os.path.basename(output_filename))[0],
-                "DATA MULTIPLE NONSHARED",
-                "EXPORTS"]
-            for sym in export_symbols:
-                contents.append('  "%s"' % sym)
-            self.execute(write_file, (def_file, contents),
-                         "writing %s" % def_file)
-
-            # next add options for def-file and to creating import libraries
-            # for gcc/ld the def-file is specified as any other object files
-            objects.append(def_file)
-
-        #end: if ((export_symbols is not None) and
-        #        (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")):
-
-        # who wants symbols and a many times larger output file
-        # should explicitly switch the debug mode on
-        # otherwise we let dllwrap/ld strip the output file
-        # (On my machine: 10KB < stripped_file < ??100KB
-        #   unstripped_file = stripped_file + XXX KB
-        #  ( XXX=254 for a typical python extension))
-        if not debug:
-            extra_preargs.append("-s")
-
-        UnixCCompiler.link(self,
-                           target_desc,
-                           objects,
-                           output_filename,
-                           output_dir,
-                           libraries,
-                           library_dirs,
-                           runtime_library_dirs,
-                           None, # export_symbols, we do this in our def-file
-                           debug,
-                           extra_preargs,
-                           extra_postargs,
-                           build_temp,
-                           target_lang)
-
-    # link ()
-
-    # -- Miscellaneous methods -----------------------------------------
-
-    # override the object_filenames method from CCompiler to
-    # support rc and res-files
-    def object_filenames (self,
-                          source_filenames,
-                          strip_dir=0,
-                          output_dir=''):
-        if output_dir is None: output_dir = ''
-        obj_names = []
-        for src_name in source_filenames:
-            # use normcase to make sure '.rc' is really '.rc' and not '.RC'
-            (base, ext) = os.path.splitext (os.path.normcase(src_name))
-            if ext not in (self.src_extensions + ['.rc']):
-                raise UnknownFileError("unknown file type '%s' (from '%s')" % \
-                      (ext, src_name))
-            if strip_dir:
-                base = os.path.basename (base)
-            if ext == '.rc':
-                # these need to be compiled to object files
-                obj_names.append (os.path.join (output_dir,
-                                            base + self.res_extension))
-            else:
-                obj_names.append (os.path.join (output_dir,
-                                            base + self.obj_extension))
-        return obj_names
-
-    # object_filenames ()
-
-    # override the find_library_file method from UnixCCompiler
-    # to deal with file naming/searching differences
-    def find_library_file(self, dirs, lib, debug=0):
-        shortlib = '%s.lib' % lib
-        longlib = 'lib%s.lib' % lib    # this form very rare
-
-        # get EMX's default library directory search path
-        try:
-            emx_dirs = os.environ['LIBRARY_PATH'].split(';')
-        except KeyError:
-            emx_dirs = []
-
-        for dir in dirs + emx_dirs:
-            shortlibp = os.path.join(dir, shortlib)
-            longlibp = os.path.join(dir, longlib)
-            if os.path.exists(shortlibp):
-                return shortlibp
-            elif os.path.exists(longlibp):
-                return longlibp
-
-        # Oops, didn't find it in *any* of 'dirs'
-        return None
-
-# class EMXCCompiler
-
-
-# Because these compilers aren't configured in Python's pyconfig.h file by
-# default, we should at least warn the user if he is using a unmodified
-# version.
-
-CONFIG_H_OK = "ok"
-CONFIG_H_NOTOK = "not ok"
-CONFIG_H_UNCERTAIN = "uncertain"
-
-def check_config_h():
-
-    """Check if the current Python installation (specifically, pyconfig.h)
-    appears amenable to building extensions with GCC.  Returns a tuple
-    (status, details), where 'status' is one of the following constants:
-      CONFIG_H_OK
-        all is well, go ahead and compile
-      CONFIG_H_NOTOK
-        doesn't look good
-      CONFIG_H_UNCERTAIN
-        not sure -- unable to read pyconfig.h
-    'details' is a human-readable string explaining the situation.
-
-    Note there are two ways to conclude "OK": either 'sys.version' contains
-    the string "GCC" (implying that this Python was built with GCC), or the
-    installed "pyconfig.h" contains the string "__GNUC__".
-    """
-
-    # XXX since this function also checks sys.version, it's not strictly a
-    # "pyconfig.h" check -- should probably be renamed...
-
-    from distutils import sysconfig
-    # if sys.version contains GCC then python was compiled with
-    # GCC, and the pyconfig.h file should be OK
-    if sys.version.find("GCC") >= 0:
-        return (CONFIG_H_OK, "sys.version mentions 'GCC'")
-
-    fn = sysconfig.get_config_h_filename()
-    try:
-        # It would probably better to read single lines to search.
-        # But we do this only once, and it is fast enough
-        f = open(fn)
-        try:
-            s = f.read()
-        finally:
-            f.close()
-
-    except IOError as exc:
-        # if we can't read this file, we cannot say it is wrong
-        # the compiler will complain later about this file as missing
-        return (CONFIG_H_UNCERTAIN,
-                "couldn't read '%s': %s" % (fn, exc.strerror))
-
-    else:
-        # "pyconfig.h" contains an "#ifdef __GNUC__" or something similar
-        if s.find("__GNUC__") >= 0:
-            return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
-        else:
-            return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)
-
-
-def get_versions():
-    """ Try to find out the versions of gcc and ld.
-        If not possible it returns None for it.
-    """
-    from distutils.version import StrictVersion
-    from distutils.spawn import find_executable
-    import re
-
-    gcc_exe = find_executable('gcc')
-    if gcc_exe:
-        out = os.popen(gcc_exe + ' -dumpversion','r')
-        try:
-            out_string = out.read()
-        finally:
-            out.close()
-        result = re.search('(\d+\.\d+\.\d+)', out_string, re.ASCII)
-        if result:
-            gcc_version = StrictVersion(result.group(1))
-        else:
-            gcc_version = None
-    else:
-        gcc_version = None
-    # EMX ld has no way of reporting version number, and we use GCC
-    # anyway - so we can link OMF DLLs
-    ld_version = None
-    return (gcc_version, ld_version)
diff --git a/spawn.py b/spawn.py
index f58c55f902..b1c5a442a5 100644
--- a/spawn.py
+++ b/spawn.py
@@ -32,8 +32,6 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
         _spawn_posix(cmd, search_path, dry_run=dry_run)
     elif os.name == 'nt':
         _spawn_nt(cmd, search_path, dry_run=dry_run)
-    elif os.name == 'os2':
-        _spawn_os2(cmd, search_path, dry_run=dry_run)
     else:
         raise DistutilsPlatformError(
               "don't know how to spawn programs on platform '%s'" % os.name)
@@ -74,26 +72,6 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
             raise DistutilsExecError(
                   "command '%s' failed with exit status %d" % (cmd[0], rc))
 
-def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
-    executable = cmd[0]
-    if search_path:
-        # either we find one or it stays the same
-        executable = find_executable(executable) or executable
-    log.info(' '.join([executable] + cmd[1:]))
-    if not dry_run:
-        # spawnv for OS/2 EMX requires a full path to the .exe
-        try:
-            rc = os.spawnv(os.P_WAIT, executable, cmd)
-        except OSError as exc:
-            # this seems to happen when the command isn't found
-            raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
-        if rc != 0:
-            # and this reflects the command running but failing
-            log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
-            raise DistutilsExecError(
-                  "command '%s' failed with exit status %d" % (cmd[0], rc))
-
 if sys.platform == 'darwin':
     from distutils import sysconfig
     _cfg_target = None
@@ -180,7 +158,7 @@ def find_executable(executable, path=None):
     paths = path.split(os.pathsep)
     base, ext = os.path.splitext(executable)
 
-    if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
+    if (sys.platform == 'win32') and (ext != '.exe'):
         executable = executable + '.exe'
 
     if not os.path.isfile(executable):
diff --git a/sysconfig.py b/sysconfig.py
index 317640ca89..3b6549fccc 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -110,8 +110,6 @@ def get_python_inc(plat_specific=0, prefix=None):
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":
         return os.path.join(prefix, "include")
-    elif os.name == "os2":
-        return os.path.join(prefix, "Include")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its C header files "
@@ -153,11 +151,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
                 return prefix
             else:
                 return os.path.join(prefix, "Lib", "site-packages")
-    elif os.name == "os2":
-        if standard_lib:
-            return os.path.join(prefix, "Lib")
-        else:
-            return os.path.join(prefix, "Lib", "site-packages")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "
@@ -492,23 +485,6 @@ def _init_nt():
     _config_vars = g
 
 
-def _init_os2():
-    """Initialize the module as appropriate for OS/2"""
-    g = {}
-    # set basic install directories
-    g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-    g['BINLIBDEST'] = get_python_lib(plat_specific=1, standard_lib=1)
-
-    # XXX hmmm.. a normal install puts include files here
-    g['INCLUDEPY'] = get_python_inc(plat_specific=0)
-
-    g['SO'] = '.pyd'
-    g['EXE'] = ".exe"
-
-    global _config_vars
-    _config_vars = g
-
-
 def get_config_vars(*args):
     """With no arguments, return a dictionary of all configuration
     variables relevant for the current platform.  Generally this includes
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 1037d8216e..761051c155 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -75,8 +75,6 @@ def test_simple_built(self):
         # see what we have
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
         base = "%s.%s.zip" % (dist.get_fullname(), cmd.plat_name)
-        if os.name == 'os2':
-            base = base.replace(':', '-')
 
         self.assertEqual(dist_created, [base])
 
diff --git a/tests/test_install.py b/tests/test_install.py
index cb2e1f2879..47d630ccc5 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -94,7 +94,7 @@ def cleanup():
 
         self.addCleanup(cleanup)
 
-        for key in ('nt_user', 'unix_user', 'os2_home'):
+        for key in ('nt_user', 'unix_user'):
             self.assertIn(key, INSTALL_SCHEMES)
 
         dist = Distribution({'name': 'xx'})
diff --git a/tests/test_util.py b/tests/test_util.py
index eac9b5141d..b73cfe9424 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -236,7 +236,7 @@ def _join(*path):
         self.assertRaises(DistutilsPlatformError,
                           change_root, 'c:\\root', 'its\\here')
 
-        # XXX platforms to be covered: os2, mac
+        # XXX platforms to be covered: mac
 
     def test_check_environ(self):
         util._environ_checked = 0
diff --git a/util.py b/util.py
index 67d8166349..ba09ac450a 100644
--- a/util.py
+++ b/util.py
@@ -154,12 +154,6 @@ def change_root (new_root, pathname):
             path = path[1:]
         return os.path.join(new_root, path)
 
-    elif os.name == 'os2':
-        (drive, path) = os.path.splitdrive(pathname)
-        if path[0] == os.sep:
-            path = path[1:]
-        return os.path.join(new_root, path)
-
     else:
         raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
 

From 13d0d367f40c0f7cf943cbbe959166fa5aee844c Mon Sep 17 00:00:00 2001
From: Gabriel <g2p.code@gmail.com>
Date: Sun, 14 Oct 2012 23:28:28 +0200
Subject: [PATCH 3595/8469] Make sure distribute_setup.py signals errors in its
 exit status.

--HG--
branch : distribute
extra : rebase_source : f35cb75558f090197e25083994d0bbbbaf2285d6
---
 distribute_setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index a52d5c16a5..04c9864baa 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -86,6 +86,8 @@ def _install(tarball, install_args=()):
         if not _python_cmd('setup.py', 'install', *install_args):
             log.warn('Something went wrong during the installation.')
             log.warn('See the error message above.')
+            # exitcode will be 2
+            return 2
     finally:
         os.chdir(old_wd)
 
@@ -529,7 +531,7 @@ def main(version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()
     tarball = download_setuptools(download_base=options.download_base)
-    _install(tarball, _build_install_args(options))
+    return _install(tarball, _build_install_args(options))
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())

From 21ead63de1689b99007d0ab9b41a19b09543e7b3 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 15 Oct 2012 14:48:49 +0200
Subject: [PATCH 3596/8469] Revert 86d7748 drive-by commit because of unclear
 BBB consequences.

--HG--
branch : distribute
extra : rebase_source : 2fb9a6ec09184e238551be4d0ea908e719badd27
---
 setuptools/command/egg_info.py | 14 -------------
 setuptools/tests/test_sdist.py | 38 +++++++++++-----------------------
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 2dc5918738..e1a8c9ad04 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -292,19 +292,6 @@ def append(self, item):
 
 
 
-def compose(path):
-    # Apple's HFS Plus returns decomposed UTF-8. Since just about
-    # everyone else chokes on it, we must make sure to return fully
-    # composed UTF-8 only.
-    if sys.getfilesystemencoding().lower() == 'utf-8':
-        from unicodedata import normalize
-        if sys.version_info >= (3,):
-            path = normalize('NFC', path)
-        else:
-            path = normalize('NFC', path.decode('utf-8')).encode('utf-8')
-    return path
-
-
 class manifest_maker(sdist):
 
     template = "MANIFEST.in"
@@ -329,7 +316,6 @@ def run(self):
         self.prune_file_list()
         self.filelist.sort()
         self.filelist.remove_duplicates()
-        self.filelist.files = [compose(path) for path in self.filelist.files]
         self.write_manifest()
 
     def write_manifest (self):
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 7e2f0a498b..4478d43870 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -29,6 +29,17 @@
 """ % SETUP_ATTRS
 
 
+def compose(path):
+    # HFS Plus returns decomposed UTF-8
+    if sys.platform == 'darwin':
+        from unicodedata import normalize
+        if sys.version_info >= (3,):
+            path = normalize('NFC', path)
+        else:
+            path = normalize('NFC', path.decode('utf-8')).encode('utf-8')
+    return path
+
+
 class TestSdistTest(unittest.TestCase):
     def setUp(self):
         self.temp_dir = tempfile.mkdtemp()
@@ -79,31 +90,6 @@ def test_package_data_in_sdist(self):
         self.assertTrue(os.path.join('sdist_test', 'b.txt') in manifest)
         self.assertTrue(os.path.join('sdist_test', 'c.rst') not in manifest)
 
-    def test_filelist_is_fully_composed(self):
-        # Test for #303. Requires HFS Plus to fail.
-
-        # Add file with non-ASCII filename
-        filename = os.path.join('sdist_test', 'smörbröd.py')
-        open(filename, 'w').close()
-
-        dist = Distribution(SETUP_ATTRS)
-        dist.script_name = 'setup.py'
-        cmd = sdist(dist)
-        cmd.ensure_finalized()
-
-        # squelch output
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
-        try:
-            cmd.run()
-        finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
-
-        self.assertTrue(filename in cmd.filelist.files)
-
     def test_manifest_is_written_in_utf8(self):
         # Test for #303.
 
@@ -162,7 +148,7 @@ def test_manifest_is_read_in_utf8(self):
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         cmd.read_manifest()
 
-        self.assertTrue(filename in cmd.filelist.files)
+        self.assertTrue(filename in [compose(x) for x in cmd.filelist.files])
 
 
 def test_suite():

From 422682d8c44fb310e3431d56b2ee0a991ced72db Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 16 Oct 2012 13:08:55 +0200
Subject: [PATCH 3597/8469] Don't re-use FileList global name in egg_info.py.

--HG--
branch : distribute
extra : rebase_source : ac180d4a23ab4fc03c243aa92dd8e6bc42bdabeb
---
 setuptools/command/egg_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e1a8c9ad04..e1aaa491b4 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -9,7 +9,7 @@
 from distutils import log
 from setuptools.command.sdist import sdist
 from distutils.util import convert_path
-from distutils.filelist import FileList
+from distutils.filelist import FileList as _FileList
 from pkg_resources import parse_requirements, safe_name, parse_version, \
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename
 from sdist import walk_revctrl
@@ -274,7 +274,7 @@ def check_broken_egg_info(self):
             self.broken_egg_info = self.egg_info
             self.egg_info = bei     # make it work for now
 
-class FileList(FileList):
+class FileList(_FileList):
     """File list that accepts only existing, platform-independent paths"""
 
     def append(self, item):

From b68c62e1cd28a9bedf6c6b8f65c5428361e644a9 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 16 Oct 2012 17:12:58 +0200
Subject: [PATCH 3598/8469] Fix Python 2.4 incompatibility in
 test_easy_install.py.

--HG--
branch : distribute
extra : rebase_source : ba9360ee8ff6c69f2ef589ef7c920fc0c8219b61
---
 setuptools/tests/test_easy_install.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e49c6f49d8..64cf1ca453 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -307,11 +307,12 @@ def test_setup_requires(self):
         sys.stdout = StringIO.StringIO()
         sys.stderr = StringIO.StringIO()
         try:
-            reset_setup_stop_context(
-                lambda: run_setup(test_setup_py, ['install'])
-            )
-        except SandboxViolation:
-            self.fail('Installation caused SandboxViolation')
+            try:
+                reset_setup_stop_context(
+                    lambda: run_setup(test_setup_py, ['install'])
+                )
+            except SandboxViolation:
+                self.fail('Installation caused SandboxViolation')
         finally:
             sys.stdout = old_stdout
             sys.stderr = old_stderr

From 9d66fb61d9579516c5333d51eb85dc3495e6032f Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Wed, 17 Oct 2012 10:54:39 +0200
Subject: [PATCH 3599/8469] Use surrogateescape error handler when reading and
 writing the manifest. Refs #303.

--HG--
branch : distribute
extra : rebase_source : f0231cf87e2478f988f798dfe579f28e7561aeff
---
 setuptools/command/egg_info.py |   2 +-
 setuptools/command/sdist.py    |   2 +-
 setuptools/tests/test_sdist.py | 256 +++++++++++++++++++++++++++------
 3 files changed, 214 insertions(+), 46 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e1aaa491b4..9955c8ef39 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -360,7 +360,7 @@ def write_file (filename, contents):
     """
     contents = "\n".join(contents)
     if sys.version_info >= (3,):
-        contents = contents.encode("utf-8")
+        contents = contents.encode("utf-8", "surrogateescape")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d5259c2bde..42558143b4 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,7 +283,7 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                line = line.decode('UTF-8')
+                line = line.decode('UTF-8', 'surrogateescape')
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 4478d43870..65b83b6e10 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -7,10 +7,13 @@
 import sys
 import tempfile
 import unittest
+import urllib
+import unicodedata
 from StringIO import StringIO
 
 
 from setuptools.command.sdist import sdist
+from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
 
 
@@ -29,18 +32,58 @@
 """ % SETUP_ATTRS
 
 
-def compose(path):
-    # HFS Plus returns decomposed UTF-8
-    if sys.platform == 'darwin':
-        from unicodedata import normalize
+if sys.version_info >= (3,):
+    LATIN1_FILENAME = 'smörbröd.py'.encode('latin-1')
+else:
+    LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
+
+
+# Cannot use context manager because of Python 2.4
+def quiet():
+    global old_stdout, old_stderr
+    old_stdout, old_stderr = sys.stdout, sys.stderr
+    sys.stdout, sys.stderr = StringIO(), StringIO()
+
+def unquiet():
+    sys.stdout, sys.stderr = old_stdout, old_stderr
+
+
+# Fake byte literals to shut up Python <= 2.5
+def b(s, encoding='utf-8'):
+    if sys.version_info >= (3,):
+        return s.encode(encoding)
+    return s
+
+
+# HFS Plus returns decomposed UTF-8
+def decompose(path):
+    if isinstance(path, unicode):
+        return unicodedata.normalize('NFD', path)
+    try:
+        path = path.decode('utf-8')
+        path = unicodedata.normalize('NFD', path)
+        path = path.encode('utf-8')
+    except UnicodeError:
+        pass # Not UTF-8
+    return path
+
+
+# HFS Plus quotes unknown bytes like so: %F6
+def hfs_quote(path):
+    if isinstance(path, unicode):
+        raise TypeError('bytes are required')
+    try:
+        u = path.decode('utf-8')
+    except UnicodeDecodeError:
+        path = urllib.quote(path) # Not UTF-8
+    else:
         if sys.version_info >= (3,):
-            path = normalize('NFC', path)
-        else:
-            path = normalize('NFC', path.decode('utf-8')).encode('utf-8')
+            path = u
     return path
 
 
 class TestSdistTest(unittest.TestCase):
+
     def setUp(self):
         self.temp_dir = tempfile.mkdtemp()
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
@@ -74,81 +117,206 @@ def test_package_data_in_sdist(self):
         cmd.ensure_finalized()
 
         # squelch output
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
+        quiet()
         try:
             cmd.run()
         finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+            unquiet()
 
         manifest = cmd.filelist.files
-
         self.assertTrue(os.path.join('sdist_test', 'a.txt') in manifest)
         self.assertTrue(os.path.join('sdist_test', 'b.txt') in manifest)
         self.assertTrue(os.path.join('sdist_test', 'c.rst') not in manifest)
 
-    def test_manifest_is_written_in_utf8(self):
+    def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        mm = manifest_maker(dist)
+        mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        os.mkdir('sdist_test.egg-info')
 
-        # Add file with non-ASCII filename
+        # UTF-8 filename
         filename = os.path.join('sdist_test', 'smörbröd.py')
-        open(filename, 'w').close()
 
+        # Add UTF-8 filename and write manifest
+        quiet()
+        try:
+            mm.run()
+            mm.filelist.files.append(filename)
+            mm.write_manifest()
+        finally:
+            unquiet()
+
+        manifest = open(mm.manifest, 'rbU')
+        contents = manifest.read()
+        manifest.close()
+
+        # The manifest should be UTF-8 encoded
+        try:
+            u = contents.decode('UTF-8')
+        except UnicodeDecodeError, e:
+            self.fail(e)
+
+        # The manifest should contain the UTF-8 filename
+        if sys.version_info >= (3,):
+            self.assertTrue(filename in u)
+        else:
+            self.assertTrue(filename in contents)
+
+    def test_manifest_is_written_with_surrogateescape_error_handler(self):
+        # Test for #303.
         dist = Distribution(SETUP_ATTRS)
         dist.script_name = 'setup.py'
-        cmd = sdist(dist)
-        cmd.ensure_finalized()
+        mm = manifest_maker(dist)
+        mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        os.mkdir('sdist_test.egg-info')
 
-        # squelch output
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
+        # Latin-1 filename
+        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+
+        # Add filename with surrogates and write manifest
+        quiet()
         try:
-            cmd.run()
+            mm.run()
+            if sys.version_info >= (3,):
+                u = filename.decode('utf-8', 'surrogateescape')
+                mm.filelist.files.append(u)
+            else:
+                mm.filelist.files.append(filename)
+            mm.write_manifest()
         finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+            unquiet()
 
-        manifest = open(os.path.join('sdist_test.egg-info', 'SOURCES.txt'), 'rbU')
+        manifest = open(mm.manifest, 'rbU')
         contents = manifest.read()
         manifest.close()
-        self.assertTrue(len(contents))
 
-        # This must not fail:
-        contents.decode('UTF-8')
+        # The manifest should contain the Latin-1 filename
+        self.assertTrue(filename in contents)
 
-    def test_manifest_is_read_in_utf8(self):
+    def test_manifest_is_read_with_utf8_encoding(self):
         # Test for #303.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
 
-        # Add file with non-ASCII filename
+        # UTF-8 filename
         filename = os.path.join('sdist_test', 'smörbröd.py')
         open(filename, 'w').close()
 
+        quiet()
+        try:
+            cmd.run()
+        finally:
+            unquiet()
+
+        # The filelist should contain the UTF-8 filename
+        if sys.platform == 'darwin':
+            filename = decompose(filename)
+        self.assertTrue(filename in cmd.filelist.files)
+
+    def test_manifest_is_read_with_surrogateescape_error_handler(self):
+        # Test for #303.
+
+        # This is hard to test on HFS Plus because it quotes unknown
+        # bytes (see previous test). Furthermore, egg_info.FileList
+        # only appends filenames that os.path.exist.
+
+        # We therefore write the manifest file by hand and check whether
+        # read_manifest produces a UnicodeDecodeError.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+
+        quiet()
+        try:
+            cmd.run()
+            # Add Latin-1 filename to manifest
+            cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+            manifest = open(cmd.manifest, 'ab')
+            manifest.write(filename+b('\n'))
+            manifest.close()
+            # Re-read manifest
+            try:
+                cmd.read_manifest()
+            except UnicodeDecodeError, e:
+                self.fail(e)
+        finally:
+            unquiet()
+
+    def test_sdist_with_utf8_encoded_filename(self):
+        # Test for #303.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # UTF-8 filename
+        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+        open(filename, 'w').close()
+
+        quiet()
+        try:
+            cmd.run()
+        finally:
+            unquiet()
+
+        # The filelist should contain the UTF-8 filename
+        # (in one representation or other)
+        if sys.version_info >= (3,):
+            filename = filename.decode(sys.getfilesystemencoding(), 'surrogateescape')
+        if sys.platform == 'darwin':
+            filename = decompose(filename)
+        self.assertTrue(filename in cmd.filelist.files)
+
+    def test_sdist_with_latin1_encoded_filename(self):
+        # Test for #303.
         dist = Distribution(SETUP_ATTRS)
         dist.script_name = 'setup.py'
         cmd = sdist(dist)
         cmd.ensure_finalized()
 
-        # squelch output
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
+        # Latin-1 filename
+        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        open(filename, 'w').close()
+
+        quiet()
         try:
             cmd.run()
         finally:
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+            unquiet()
+
+        # The filelist should contain the Latin-1 filename
+        # (in one representation or other)
+        if sys.platform == 'darwin':
+            filename = hfs_quote(filename)
+        elif sys.version_info >= (3,):
+            filename = filename.decode(sys.getfilesystemencoding(), 'surrogateescape')
+        self.assertTrue(filename in cmd.filelist.files)
+
+    def test_decompose(self):
+        self.assertNotEqual('smörbröd.py', decompose('smörbröd.py'))
 
-        cmd.filelist.files = []
-        cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-        cmd.read_manifest()
+        if sys.version_info >= (3,):
+            self.assertEqual(len('smörbröd.py'), 11)
+            self.assertEqual(len(decompose('smörbröd.py')), 13)
+        else:
+            self.assertEqual(len('smörbröd.py'), 13)
+            self.assertEqual(len(decompose('smörbröd.py')), 15)
+
+    def test_hfs_quote(self):
+        self.assertEqual(hfs_quote(LATIN1_FILENAME), 'sm%F6rbr%F6d.py')
 
-        self.assertTrue(filename in [compose(x) for x in cmd.filelist.files])
+        # Bytes are required
+        if sys.version_info >= (3,):
+            self.assertRaises(TypeError, hfs_quote, 'smörbröd.py')
+        else:
+            self.assertRaises(TypeError, hfs_quote, 'smörbröd.py'.decode('utf-8'))
 
 
 def test_suite():

From 25e819620334f3126cf5ba3809ab1338f648fa88 Mon Sep 17 00:00:00 2001
From: Lee Trout <lee@leetrout.com>
Date: Thu, 18 Oct 2012 13:17:44 -0400
Subject: [PATCH 3600/8469] Fix command order for pip 1.2 per
 https://bitbucket.org/tarek/distribute/issue/327

--HG--
branch : distribute
extra : rebase_source : 89c65271f70999d45aa6136be5f037d62370b8a2
---
 distribute_setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index a52d5c16a5..1922dd7da4 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -444,7 +444,8 @@ def _relaunch():
     # we have to relaunch the process
     # pip marker to avoid a relaunch bug
     _cmd = ['-c', 'install', '--single-version-externally-managed']
-    if sys.argv[:3] == _cmd:
+    _cmd2 = ['-c', 'install', '--record']
+    if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
         sys.argv[0] = 'setup.py'
     args = [sys.executable] + sys.argv
     sys.exit(subprocess.call(args))

From 197c1c33644d1bae8e58f0fbdbd33b387d8ec0bb Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 19 Oct 2012 04:15:20 +0200
Subject: [PATCH 3601/8469] Miscellaneous updates to the upload_docs command.

a) upload_docs now runs build_sphinx to generate documentation.
b) The temporary ZIP file is properly disposed of.
c) Auth credentials now work under Python 3. Fixes #326.

hg record cannot split hunks, thus the large commit.

--HG--
branch : distribute
extra : rebase_source : 76d81880a2aaeb5b94a1d2388cb838068e4f64e3
---
 setuptools/command/upload_docs.py | 128 +++++++++++++++++-------------
 1 file changed, 74 insertions(+), 54 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 213f7b588e..c43b0f421e 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -9,10 +9,13 @@
 import socket
 import zipfile
 import httplib
-import base64
 import urlparse
 import tempfile
 import sys
+import shutil
+
+from base64 import standard_b64encode
+from pkg_resources import iter_entry_points
 
 from distutils import log
 from distutils.errors import DistutilsOptionError
@@ -22,20 +25,18 @@
 except ImportError:
     from setuptools.command.upload import upload
 
-_IS_PYTHON3 = sys.version > '3'
+if sys.version_info >= (3,):
+    errors = 'surrogateescape'
+else:
+    errors = 'strict'
 
-try:
-    bytes
-except NameError:
-    bytes = str
 
-def b(str_or_bytes):
-    """Return bytes by either encoding the argument as ASCII or simply return
-    the argument as-is."""
-    if not isinstance(str_or_bytes, bytes):
-        return str_or_bytes.encode('ascii')
-    else:
-        return str_or_bytes
+# This is not just a replacement for byte literals
+# but works as a general purpose encoder
+def b(s, encoding='utf-8'):
+    if isinstance(s, unicode):
+        return s.encode(encoding, errors)
+    return s
 
 
 class upload_docs(upload):
@@ -51,40 +52,62 @@ class upload_docs(upload):
         ]
     boolean_options = upload.boolean_options
 
+    def has_sphinx(self):
+        if self.upload_dir is None:
+            for ep in iter_entry_points('distutils.commands', 'build_sphinx'):
+                return True
+
+    sub_commands = [('build_sphinx', has_sphinx)]
+
     def initialize_options(self):
         upload.initialize_options(self)
         self.upload_dir = None
+        self.target_dir = None
 
     def finalize_options(self):
         upload.finalize_options(self)
         if self.upload_dir is None:
-            build = self.get_finalized_command('build')
-            self.upload_dir = os.path.join(build.build_base, 'docs')
-            self.mkpath(self.upload_dir)
-        self.ensure_dirname('upload_dir')
-        self.announce('Using upload directory %s' % self.upload_dir)
+            if self.has_sphinx():
+                build_sphinx = self.get_finalized_command('build_sphinx')
+                self.target_dir = build_sphinx.builder_target_dir
+            else:
+                build = self.get_finalized_command('build')
+                self.target_dir = os.path.join(build.build_base, 'docs')
+        else:
+            self.ensure_dirname('upload_dir')
+            self.target_dir = self.upload_dir
+        self.announce('Using upload directory %s' % self.target_dir)
 
-    def create_zipfile(self):
-        name = self.distribution.metadata.get_name()
-        tmp_dir = tempfile.mkdtemp()
-        tmp_file = os.path.join(tmp_dir, "%s.zip" % name)
-        zip_file = zipfile.ZipFile(tmp_file, "w")
-        for root, dirs, files in os.walk(self.upload_dir):
-            if root == self.upload_dir and not files:
-                raise DistutilsOptionError(
-                    "no files found in upload directory '%s'"
-                    % self.upload_dir)
-            for name in files:
-                full = os.path.join(root, name)
-                relative = root[len(self.upload_dir):].lstrip(os.path.sep)
-                dest = os.path.join(relative, name)
-                zip_file.write(full, dest)
-        zip_file.close()
-        return tmp_file
+    def create_zipfile(self, filename):
+        zip_file = zipfile.ZipFile(filename, "w")
+        try:
+            self.mkpath(self.target_dir)  # just in case
+            for root, dirs, files in os.walk(self.target_dir):
+                if root == self.target_dir and not files:
+                    raise DistutilsOptionError(
+                        "no files found in upload directory '%s'"
+                        % self.target_dir)
+                for name in files:
+                    full = os.path.join(root, name)
+                    relative = root[len(self.target_dir):].lstrip(os.path.sep)
+                    dest = os.path.join(relative, name)
+                    zip_file.write(full, dest)
+        finally:
+            zip_file.close()
 
     def run(self):
-        zip_file = self.create_zipfile()
-        self.upload_file(zip_file)
+        # Run sub commands
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
+        tmp_dir = tempfile.mkdtemp()
+        name = self.distribution.metadata.get_name()
+        zip_file = os.path.join(tmp_dir, "%s.zip" % name)
+        try:
+            self.create_zipfile(zip_file)
+            self.upload_file(zip_file)
+        finally:
+            shutil.rmtree(tmp_dir)
 
     def upload_file(self, filename):
         content = open(filename, 'rb').read()
@@ -95,36 +118,33 @@ def upload_file(self, filename):
             'content': (os.path.basename(filename), content),
         }
         # set up the authentication
-        credentials = self.username + ':' + self.password
-        if _IS_PYTHON3:  # base64 only works with bytes in Python 3.
-            encoded_creds = base64.encodebytes(credentials.encode('utf8'))
-            auth = bytes("Basic ")
-        else:
-            encoded_creds = base64.encodestring(credentials)
-            auth = "Basic "
-        auth += encoded_creds.strip()
+        credentials = b(self.username + ':' + self.password)
+        credentials = standard_b64encode(credentials)
+        if sys.version_info >= (3,):
+            credentials = credentials.decode('ascii')
+        auth = "Basic " + credentials
 
         # Build up the MIME payload for the POST data
-        boundary = b('--------------GHSKFJDLGDS7543FJKLFHRE75642756743254')
-        sep_boundary = b('\n--') + boundary
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = b('\n--') + b(boundary)
         end_boundary = sep_boundary + b('--')
         body = []
-        for key, values in data.items():
+        for key, values in data.iteritems():
+            title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if type(values) != type([]):
                 values = [values]
             for value in values:
                 if type(value) is tuple:
-                    fn = b(';filename="%s"' % value[0])
+                    title += '; filename="%s"' % value[0]
                     value = value[1]
                 else:
-                    fn = b("")
+                    value = b(value)
                 body.append(sep_boundary)
-                body.append(b('\nContent-Disposition: form-data; name="%s"'%key))
-                body.append(fn)
+                body.append(b(title))
                 body.append(b("\n\n"))
-                body.append(b(value))
-                if value and value[-1] == b('\r'):
+                body.append(value)
+                if value and value[-1:] == b('\r'):
                     body.append(b('\n'))  # write an extra newline (lurve Macs)
         body.append(end_boundary)
         body.append(b("\n"))

From 0a1a4cdedb6bfd3e1fc2121275dd765c597e33ed Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 19 Oct 2012 04:15:58 +0200
Subject: [PATCH 3602/8469] Update CHANGES and docs.

--HG--
branch : distribute
extra : rebase_source : e24a57706eebda4c1f989467a0a3bc951f550dd4
---
 CHANGES.txt         | 3 +++
 docs/setuptools.txt | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e2b7874bc8..3d90f53440 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ CHANGES
 0.6.29
 ------
 
+* If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
+  to produce uploadable documentation.
+* Issue #326: `upload_docs` provided mangled auth credentials under Python 3.
 * Issue #320: Fix check for "createable" in distribute_setup.py.
 * Issue #305: Remove a warning that was triggered during normal operations.
 * Issue #311: Print metadata in UTF-8 independent of platform.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 31eedcb160..81c3aae31e 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2423,7 +2423,12 @@ command::
 
     python setup.py upload_docs --upload-dir=docs/build/html
 
-As with any other ``setuptools`` based command, you can define useful
+If no ``--upload-dir`` is given, ``upload_docs`` will attempt to run the
+``build_sphinx`` command to generate uploadable documentation.
+For the command to become available, `Sphinx <http://sphinx.pocoo.org/>`_
+must be installed in the same environment as distribute.
+
+As with other ``setuptools``-based commands, you can define useful
 defaults in the ``setup.cfg`` of your Python project, e.g.:
 
 .. code-block:: ini

From 47598ca259c8870efa3061144493758c187deb3d Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 19 Oct 2012 11:35:52 +0200
Subject: [PATCH 3603/8469] Fix a test broken by 984cedb.

--HG--
branch : distribute
extra : rebase_source : f9fe65a5b00a1a64f812aa99716cc913a4b39188
---
 setuptools/tests/test_upload_docs.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 8b2dc89220..fddb755d9c 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -54,12 +54,17 @@ def test_create_zipfile(self):
 
         cmd = upload_docs(dist)
         cmd.upload_dir = self.upload_dir
-        zip_file = cmd.create_zipfile()
+        cmd.target_dir = self.upload_dir
+        tmp_dir = tempfile.mkdtemp()
+        tmp_file = os.path.join(tmp_dir, 'foo.zip')
+        try:
+            zip_file = cmd.create_zipfile(tmp_file)
 
-        assert zipfile.is_zipfile(zip_file)
+            assert zipfile.is_zipfile(tmp_file)
 
-        zip_f = zipfile.ZipFile(zip_file) # woh...
-
-        assert zip_f.namelist() == ['index.html']
+            zip_file = zipfile.ZipFile(tmp_file) # woh...
 
+            assert zip_file.namelist() == ['index.html']
+        finally:
+            shutil.rmtree(tmp_dir)
 

From 6f9ff72c3264915ce11003cc736c53185957b784 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 19 Oct 2012 11:44:58 +0200
Subject: [PATCH 3604/8469] Update CHANGES.

--HG--
branch : distribute
extra : rebase_source : 9ecd22bbaa1c768c410ecb40d7f51f8872998736
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d90f53440..594100a45f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.29
 ------
 
+* Issue #327: Merged pull request #24 to fix a dependency problem with pip.
+* Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
   to produce uploadable documentation.
 * Issue #326: `upload_docs` provided mangled auth credentials under Python 3.

From c586b38480483bcfa87761e859d69a732f170374 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Oct 2012 09:31:34 -0400
Subject: [PATCH 3605/8469] Updated CHANGES and CONTRIBUTORS

--HG--
branch : distribute
extra : rebase_source : 55195db48ea2d88ecabe2307732bfc58db12b9e0
---
 CHANGES.txt      | 1 +
 CONTRIBUTORS.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 594100a45f..342add9327 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.29
 ------
 
+* Pull Request #14: Honor file permissions in zip files.
 * Issue #327: Merged pull request #24 to fix a dependency problem with pip.
 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0335b224b8..e180edac4b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -12,6 +12,7 @@ Contributors
 * Jannis Leidel
 * Jason R. Coombs
 * Jim Fulton
+* Jonathan Lange
 * Justin Azoff
 * Lennart Regebro
 * Marc Abramowitz

From 152931a9f0fc509eab7d3c10934f6d3137651104 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Oct 2012 03:38:07 -0400
Subject: [PATCH 3606/8469] Fix failing test case on Windows (can't rmtree if a
 file is open in that tree)

--HG--
branch : distribute
extra : rebase_source : 99e78b88c18007b410c0be28237db8341413e334
---
 setuptools/tests/test_upload_docs.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index fddb755d9c..769f16cc5a 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -65,6 +65,8 @@ def test_create_zipfile(self):
             zip_file = zipfile.ZipFile(tmp_file) # woh...
 
             assert zip_file.namelist() == ['index.html']
+
+            zip_file.close()
         finally:
             shutil.rmtree(tmp_dir)
 

From 44db905fd2d3c3a8cd7218a1c45cf54d353ed9ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Oct 2012 03:49:51 -0400
Subject: [PATCH 3607/8469] Fix two failing tests on Windows (paths separated
 by backslash didn't match manifest paths separated by slash).

--HG--
branch : distribute
extra : rebase_source : f8cd5491fcfe18f687a67423bb8ccc43d3d76672
---
 setuptools/tests/test_sdist.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 65b83b6e10..347e00859c 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,6 +9,7 @@
 import unittest
 import urllib
 import unicodedata
+import posixpath
 from StringIO import StringIO
 
 
@@ -137,7 +138,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         os.mkdir('sdist_test.egg-info')
 
         # UTF-8 filename
-        filename = os.path.join('sdist_test', 'smörbröd.py')
+        filename = posixpath.join('sdist_test', 'smörbröd.py')
 
         # Add UTF-8 filename and write manifest
         quiet()
@@ -173,7 +174,7 @@ def test_manifest_is_written_with_surrogateescape_error_handler(self):
         os.mkdir('sdist_test.egg-info')
 
         # Latin-1 filename
-        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        filename = posixpath.join(b('sdist_test'), LATIN1_FILENAME)
 
         # Add filename with surrogates and write manifest
         quiet()

From 724ffeddce8c6f302b84b2112bfc76971c7da4f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Oct 2012 04:01:09 -0400
Subject: [PATCH 3608/8469] Added tag 0.6.29 for changeset 4f82563d0f5d

--HG--
branch : distribute
extra : rebase_source : 1abfe95cb04e389c1bd353687ab12b471805a8fb
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 287e85d21e..619f5b5f63 100644
--- a/.hgtags
+++ b/.hgtags
@@ -37,3 +37,4 @@ de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
 b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
 469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27
 fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
+4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29

From ae5c5639d3704b1c4caece39839b6135fe8381b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Oct 2012 04:01:36 -0400
Subject: [PATCH 3609/8469] Bumped to 0.6.30 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 2181b40073d9790f489b692900f53c5efb3c34cd
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 679b255138..4152d37b67 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.29.tar.gz
-    $ tar -xzvf distribute-0.6.29.tar.gz
-    $ cd distribute-0.6.29
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.30.tar.gz
+    $ tar -xzvf distribute-0.6.30.tar.gz
+    $ cd distribute-0.6.30
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 23d2a7d5f5..482f2f20f3 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -48,7 +48,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.29"
+DEFAULT_VERSION = "0.6.30"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 7b82a884b2..e6cfdca094 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.29'
+version = '0.6.30'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.29'
+release = '0.6.30'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index f4f88bac35..dd12057f0c 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.29'
+VERSION = '0.6.30'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 6e04bd2403..f3f731d1b1 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.29"
+VERSION = "0.6.30"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 458736bf77ebf11bc05d0eca91ad21f01543fab3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Oct 2012 04:21:33 -0400
Subject: [PATCH 3610/8469] Fix RST rendering issues in CHANGES.txt

--HG--
branch : distribute
extra : rebase_source : d8cdde27fcf533474d99aa1d4acfa0b181e8ab71
---
 CHANGES.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 342add9327..8b6666e051 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,7 +18,7 @@ CHANGES
 * Issue #303: Read manifest file with UTF-8 encoding under Python 3.
 * Issue #301: Allow to run tests of namespace packages when using 2to3.
 * Issue #304: Prevent import loop in site.py under Python 3.3.
-* Issue #283: Reenable scanning of *.pyc / *.pyo files on Python 3.3.
+* Issue #283: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
 * Issue #299: The develop command didn't work on Python 3, when using 2to3,
   as the egg link would go to the Python 2 source. Linking to the 2to3'd code
   in build/lib makes it work, although you will have to rebuild the module
@@ -41,7 +41,8 @@ CHANGES
 * Issue #294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
 * Added support for .dist-info directories.
-* Issue #283: Fix and disable scanning of *.pyc / *.pyo files on Python 3.3.
+* Issue #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
+  Python 3.3.
 
 ------
 0.6.27

From 8e41afb1088ada9acb96ae295b0559a5353fdeba Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Sun, 21 Oct 2012 05:34:36 -0400
Subject: [PATCH 3611/8469] Fixed bug by renaming _cmd to _cmd1

--HG--
branch : distribute
extra : rebase_source : edc82698ce88ae89fc840ea0b47f9398b80550fa
---
 distribute_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index 482f2f20f3..d24e2360d7 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -445,7 +445,7 @@ def _relaunch():
     log.warn('Relaunching...')
     # we have to relaunch the process
     # pip marker to avoid a relaunch bug
-    _cmd = ['-c', 'install', '--single-version-externally-managed']
+    _cmd1 = ['-c', 'install', '--single-version-externally-managed']
     _cmd2 = ['-c', 'install', '--record']
     if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
         sys.argv[0] = 'setup.py'

From 18b97c5ff39229106f1561aaa2b59586d174a305 Mon Sep 17 00:00:00 2001
From: g2p <none@none>
Date: Mon, 22 Oct 2012 05:44:04 -0400
Subject: [PATCH 3612/8469] Clean up temporary directory in
 distribute_setup.py. Fixes #328.

--HG--
branch : distribute
extra : rebase_source : 430cf77fcf14e26cafbf4ba6abc680efa1fb3570
---
 distribute_setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/distribute_setup.py b/distribute_setup.py
index d24e2360d7..cebd80b190 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -14,6 +14,7 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 import os
+import shutil
 import sys
 import time
 import fnmatch
@@ -90,6 +91,7 @@ def _install(tarball, install_args=()):
             return 2
     finally:
         os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
 
 
 def _build_egg(egg, tarball, to_dir):
@@ -114,6 +116,7 @@ def _build_egg(egg, tarball, to_dir):
 
     finally:
         os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
     # returning the result
     log.warn(egg)
     if not os.path.exists(egg):

From b9d292c329653468b734fac0b83e764f4f06c052 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Oct 2012 06:01:29 -0400
Subject: [PATCH 3613/8469] Update changelog

--HG--
branch : distribute
extra : rebase_source : 90ca6c6b88b0d42dc1d9831aea44ae03082f1ce8
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8b6666e051..1ba872ff35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.30
+------
+
+* Issue #328: Clean up temporary directories in distribute_setup.py.
+* Fix fatal bug in distribute_setup.py.
+
 ------
 0.6.29
 ------

From aa5ab9e447106af6b82a12e640b7fc226f9fcfc1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Oct 2012 06:02:18 -0400
Subject: [PATCH 3614/8469] Added tag 0.6.30 for changeset 7464fc916fa4

--HG--
branch : distribute
extra : rebase_source : bfebceee0edda506992741c0be1e8802d87fd64f
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 619f5b5f63..903deb3eb3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -38,3 +38,4 @@ b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
 469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27
 fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29
+7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30

From 69fa64f972dc95b9e9bb583229e20bb117fb7102 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Oct 2012 06:03:05 -0400
Subject: [PATCH 3615/8469] Bumped to 0.6.31 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 74ac06a235b4d51a69d5be1c494bf922c8093072
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 4152d37b67..7b5ae24a36 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.30.tar.gz
-    $ tar -xzvf distribute-0.6.30.tar.gz
-    $ cd distribute-0.6.30
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.31.tar.gz
+    $ tar -xzvf distribute-0.6.31.tar.gz
+    $ cd distribute-0.6.31
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index cebd80b190..f3e85a1ed5 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.30"
+DEFAULT_VERSION = "0.6.31"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index e6cfdca094..08fa643df9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.30'
+version = '0.6.31'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.30'
+release = '0.6.31'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index dd12057f0c..18299a4fcb 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.30'
+VERSION = '0.6.31'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index f3f731d1b1..09a5c4fcc6 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.30"
+VERSION = "0.6.31"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From e89509b4a75dd077a7c87da186aac829c6ba4f99 Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Mon, 22 Oct 2012 20:32:42 +0300
Subject: [PATCH 3616/8469] Automatically link issues in CHANGES.txt uploaded
 to PyPI

--HG--
branch : distribute
extra : rebase_source : c5311107dd7fa43d90d6588d898bb40900d348e8
---
 setup.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 09a5c4fcc6..13c9be7c3a 100755
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 import sys
 import os
 import textwrap
+import re
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -130,6 +131,22 @@ def _being_installed():
     from distribute_setup import _before_install
     _before_install()
 
+# return contents of reStructureText file with linked issue references
+def _linkified(rstfile):
+    bitroot = 'http://bitbucket.org/tarek/distribute'
+    revision = re.compile(r'\b(issue\s*#?\d+)\b', re.M | re.I)
+
+    rstext = open(rstfile).read()    
+
+    anchors = revision.findall(rstext) # ['Issue #43', ...]
+    anchors = sorted(set(anchors))
+    rstext = revision.sub(r'`\1`_', rstext)
+    rstext += "\n"
+    for x in anchors:
+        issue = re.findall(r'\d+', x)[0]
+        rstext += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
+    rstext += "\n"
+    return rstext
 
 dist = setup(
     name="distribute",
@@ -139,7 +156,7 @@ def _being_installed():
     author="The fellowship of the packaging",
     author_email="distutils-sig@python.org",
     license="PSF or ZPL",
-    long_description = open('README.txt').read() + open('CHANGES.txt').read(),
+    long_description = open('README.txt').read() + _linkified('CHANGES.txt'),
     keywords = "CPAN PyPI distutils eggs package management",
     url = "http://packages.python.org/distribute",
     test_suite = 'setuptools.tests',

From 89efff76bc23c4859bfc21e6d4522cf5396a12b3 Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Mon, 22 Oct 2012 20:52:43 +0300
Subject: [PATCH 3617/8469] CHANGES.txt: remove issue URLs - these are inserted
 by autolinker

--HG--
branch : distribute
extra : rebase_source : 264ba8bd377f0580b34ee1febf3b796e18c5431e
---
 CHANGES.txt | 52 ++++++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1ba872ff35..12b4907a04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -306,11 +306,10 @@ CHANGES
 -----
 
 * Added the generation of `distribute_setup_3k.py` during the release.
-  This close http://bitbucket.org/tarek/distribute/issue/52.
+  This closes issue #52.
 
 * Added an upload_docs command to easily upload project documentation to
-  PyPI's http://packages.python.org.
-  This close http://bitbucket.org/tarek/distribute/issue/56.
+  PyPI's http://packages.python.org. This close issue #56.
 
 * Fixed a bootstrap bug on the use_setuptools() API.
 
@@ -339,7 +338,7 @@ setuptools
   This closes http://bugs.python.org/setuptools/issue39.
 
 * Added option to run 2to3 automatically when installing on Python 3.
-  This closes http://bitbucket.org/tarek/distribute/issue/31.
+  This closes issue #31.
 
 * Fixed invalid usage of requirement.parse, that broke develop -d.
   This closes http://bugs.python.org/setuptools/issue44.
@@ -353,11 +352,9 @@ setuptools
 bootstrapping
 =============
 
-* Fixed bootstrap not working on Windows.
-  This closes http://bitbucket.org/tarek/distribute/issue/49.
+* Fixed bootstrap not working on Windows. This closes issue #49.
 
-* Fixed 2.6 dependencies.
-  This closes http://bitbucket.org/tarek/distribute/issue/50.
+* Fixed 2.6 dependencies. This closes issue #50.
 
 * Make sure setuptools is patched when running through easy_install
   This closes http://bugs.python.org/setuptools/issue40.
@@ -370,16 +367,14 @@ setuptools
 ==========
 
 * package_index.urlopen now catches BadStatusLine and malformed url errors.
-  This closes http://bitbucket.org/tarek/distribute/issue/16 and
-  http://bitbucket.org/tarek/distribute/issue/18.
+  This closes issue #16 and issue #18.
 
 * zip_ok is now False by default. This closes
   http://bugs.python.org/setuptools/issue33.
 
 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
 
-* Fixed invalid bootstraping with easy_install installation
-  http://bitbucket.org/tarek/distribute/issue/40.
+* Fixed invalid bootstraping with easy_install installation (issue #40).
   Thanks to Florian Schulze for the help.
 
 * Removed buildout/bootstrap.py. A new repository will create a specific
@@ -391,7 +386,7 @@ bootstrapping
 
 * The boostrap process leave setuptools alone if detected in the system
   and --root or --prefix is provided, but is not in the same location.
-  This closes http://bitbucket.org/tarek/distribute/issue/10.
+  This closes issue #10.
 
 ---
 0.6
@@ -401,45 +396,38 @@ setuptools
 ==========
 
 * Packages required at build time where not fully present at install time.
-  This closes http://bitbucket.org/tarek/distribute/issue/12.
+  This closes issue #12.
 
-* Protected against failures in tarfile extraction. This closes
-  http://bitbucket.org/tarek/distribute/issue/10.
+* Protected against failures in tarfile extraction. This closes issue #10.
 
-* Made Jython api_tests.txt doctest compatible. This closes
-  http://bitbucket.org/tarek/distribute/issue/7.
+* Made Jython api_tests.txt doctest compatible. This closes issue #7.
 
 * sandbox.py replaced builtin type file with builtin function open. This
-  closes http://bitbucket.org/tarek/distribute/issue/6.
+  closes issue #6.
 
-* Immediately close all file handles. This closes
-  http://bitbucket.org/tarek/distribute/issue/3.
+* Immediately close all file handles. This closes issue #3.
 
-* Added compatibility with Subversion 1.6. This references
-  http://bitbucket.org/tarek/distribute/issue/1.
+* Added compatibility with Subversion 1.6. This references issue #1.
 
 pkg_resources
 =============
 
 * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API
-  instead. Based on a patch from ronaldoussoren. This closes
-  http://bitbucket.org/tarek/distribute/issue/5.
+  instead. Based on a patch from ronaldoussoren. This closes issue #5.
 
 * Fixed a SandboxViolation for mkdir that could occur in certain cases.
-  This closes http://bitbucket.org/tarek/distribute/issue/13.
+  This closes issue #13.
 
 * Allow to find_on_path on systems with tight permissions to fail gracefully.
-  This closes http://bitbucket.org/tarek/distribute/issue/9.
+  This closes issue #9.
 
 * Corrected inconsistency between documentation and code of add_entry.
-  This closes http://bitbucket.org/tarek/distribute/issue/8.
+  This closes issue #8.
 
-* Immediately close all file handles. This closes
-  http://bitbucket.org/tarek/distribute/issue/3.
+* Immediately close all file handles. This closes issue #3.
 
 easy_install
 ============
 
-* Immediately close all file handles. This closes
-  http://bitbucket.org/tarek/distribute/issue/3.
+* Immediately close all file handles. This closes issue #3.
 

From 285e4e10ef6678f0b5bdb61ff5c183dd6360a4af Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 23 Oct 2012 20:26:14 +0100
Subject: [PATCH 3618/8469] Issue #16116: Now uses corrected include and
 library paths when building C extensions in a venv.

---
 command/build_ext.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index f16e2f17ef..b1d951e6f8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -160,6 +160,11 @@ def finalize_options(self):
         if isinstance(self.include_dirs, str):
             self.include_dirs = self.include_dirs.split(os.pathsep)
 
+        # If in a virtualenv, add its include directory
+        # Issue 16116
+        if sys.exec_prefix != sys.base_exec_prefix:
+            self.include_dirs.append(os.path.join(sys.exec_prefix, 'include'))
+
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
         self.include_dirs.append(py_include)
@@ -190,6 +195,8 @@ def finalize_options(self):
             # must be the *native* platform.  But we don't really support
             # cross-compiling via a binary install anyway, so we let it go.
             self.library_dirs.append(os.path.join(sys.exec_prefix, 'libs'))
+            if sys.base_exec_prefix != sys.prefix:  # Issue 16116
+                self.library_dirs.append(os.path.join(sys.base_exec_prefix, 'libs'))
             if self.debug:
                 self.build_temp = os.path.join(self.build_temp, "Debug")
             else:

From a3966d17f6f7f0769b83d5ef56fc8f97f6a4b415 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 24 Oct 2012 03:19:23 +0200
Subject: [PATCH 3619/8469] Issue #329: Properly close files created by tests
 for compatibility with Jython.

--HG--
branch : distribute
extra : rebase_source : 09c503106ef73b7694e13443ae899666652922a4
---
 CHANGES.txt                        | 6 ++++++
 setuptools/tests/test_dist_info.py | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 12b4907a04..9513ed4595 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.31
+------
+
+* Issue #329: Properly close files created by tests for compatibility with Jython.
+
 ------
 0.6.30
 ------
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 623ccc471a..fcb78c36d9 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -50,7 +50,8 @@ def setUp(self):
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
-        open(os.path.join(versioned, 'METADATA'), 'w+').write(DALS(
+        metadata_file = open(os.path.join(versioned, 'METADATA'), 'w+')
+        metadata_file.write(DALS(
             """
             Metadata-Version: 1.2
             Name: VersionedDistribution
@@ -58,11 +59,13 @@ def setUp(self):
             Provides-Extra: baz
             Requires-Dist: quux (>=1.1); extra == 'baz'
             """))
+        metadata_file.close()
 
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
-        open(os.path.join(unversioned, 'METADATA'), 'w+').write(DALS(
+        metadata_file = open(os.path.join(unversioned, 'METADATA'), 'w+')
+        metadata_file.write(DALS(
             """
             Metadata-Version: 1.2
             Name: UnversionedDistribution
@@ -71,6 +74,7 @@ def setUp(self):
             Provides-Extra: baz
             Requires-Dist: quux (>=1.1); extra == 'baz'
             """))
+        metadata_file.close()
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)

From 3b26424a5a614cbed17f17591f91ec453be9d038 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Thu, 25 Oct 2012 23:45:25 +0200
Subject: [PATCH 3620/8469] When writing the manifest under Python 3, skip
 filenames that cannot be encoded to UTF-8.

--HG--
branch : distribute
extra : rebase_source : f1b439267fce37754aac49af15a9e26346950a26
---
 setuptools/command/egg_info.py | 14 +++++++++++++-
 setuptools/command/sdist.py    |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9955c8ef39..6e3d67af27 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -323,6 +323,18 @@ def write_manifest (self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
+        # The manifest must be UTF-8 encodable. See #303.
+        if sys.version_info >= (3,):
+            files = []
+            for file in self.filelist.files:
+                try:
+                    file.encode("utf-8")
+                except UnicodeEncodeError:
+                    log.warn("'%s' not UTF-8 encodable -- skipping" % file)
+                else:
+                    files.append(file)
+            self.filelist.files = files
+
         files = self.filelist.files
         if os.sep!='/':
             files = [f.replace(os.sep,'/') for f in files]
@@ -360,7 +372,7 @@ def write_file (filename, contents):
     """
     contents = "\n".join(contents)
     if sys.version_info >= (3,):
-        contents = contents.encode("utf-8", "surrogateescape")
+        contents = contents.encode("utf-8")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 42558143b4..d5259c2bde 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,7 +283,7 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                line = line.decode('UTF-8', 'surrogateescape')
+                line = line.decode('UTF-8')
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:

From 383ad7a4f7a1832cf74c250cdae5b63fa4ad61bb Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Thu, 25 Oct 2012 23:45:35 +0200
Subject: [PATCH 3621/8469] Update tests.

--HG--
branch : distribute
extra : rebase_source : 831e694725e5db1bc360298fbc4b7b58db836bdd
---
 setuptools/tests/test_sdist.py | 220 ++++++++++++++++++---------------
 1 file changed, 121 insertions(+), 99 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 347e00859c..a3fde02601 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,6 @@
 import unittest
 import urllib
 import unicodedata
-import posixpath
 from StringIO import StringIO
 
 
@@ -49,14 +48,22 @@ def unquiet():
     sys.stdout, sys.stderr = old_stdout, old_stderr
 
 
-# Fake byte literals to shut up Python <= 2.5
+# Fake byte literals for Python <= 2.5
 def b(s, encoding='utf-8'):
     if sys.version_info >= (3,):
         return s.encode(encoding)
     return s
 
 
-# HFS Plus returns decomposed UTF-8
+# Convert to POSIX path
+def posix(path):
+    if sys.version_info >= (3,) and not isinstance(path, str):
+        return path.replace(os.sep.encode('ascii'), b('/'))
+    else:
+        return path.replace(os.sep, '/')
+
+
+# HFS Plus uses decomposed UTF-8
 def decompose(path):
     if isinstance(path, unicode):
         return unicodedata.normalize('NFD', path)
@@ -69,20 +76,6 @@ def decompose(path):
     return path
 
 
-# HFS Plus quotes unknown bytes like so: %F6
-def hfs_quote(path):
-    if isinstance(path, unicode):
-        raise TypeError('bytes are required')
-    try:
-        u = path.decode('utf-8')
-    except UnicodeDecodeError:
-        path = urllib.quote(path) # Not UTF-8
-    else:
-        if sys.version_info >= (3,):
-            path = u
-    return path
-
-
 class TestSdistTest(unittest.TestCase):
 
     def setUp(self):
@@ -138,7 +131,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         os.mkdir('sdist_test.egg-info')
 
         # UTF-8 filename
-        filename = posixpath.join('sdist_test', 'smörbröd.py')
+        filename = os.path.join('sdist_test', 'smörbröd.py')
 
         # Add UTF-8 filename and write manifest
         quiet()
@@ -155,46 +148,94 @@ def test_manifest_is_written_with_utf8_encoding(self):
 
         # The manifest should be UTF-8 encoded
         try:
-            u = contents.decode('UTF-8')
+            u_contents = contents.decode('UTF-8')
         except UnicodeDecodeError, e:
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
         if sys.version_info >= (3,):
-            self.assertTrue(filename in u)
+            self.assertTrue(posix(filename) in u_contents)
         else:
-            self.assertTrue(filename in contents)
+            self.assertTrue(posix(filename) in contents)
 
-    def test_manifest_is_written_with_surrogateescape_error_handler(self):
-        # Test for #303.
-        dist = Distribution(SETUP_ATTRS)
-        dist.script_name = 'setup.py'
-        mm = manifest_maker(dist)
-        mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-        os.mkdir('sdist_test.egg-info')
+    # Python 3 only
+    if sys.version_info >= (3,):
 
-        # Latin-1 filename
-        filename = posixpath.join(b('sdist_test'), LATIN1_FILENAME)
+        def test_write_manifest_allows_utf8_filenames(self):
+            # Test for #303.
+            dist = Distribution(SETUP_ATTRS)
+            dist.script_name = 'setup.py'
+            mm = manifest_maker(dist)
+            mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+            os.mkdir('sdist_test.egg-info')
 
-        # Add filename with surrogates and write manifest
-        quiet()
-        try:
-            mm.run()
-            if sys.version_info >= (3,):
-                u = filename.decode('utf-8', 'surrogateescape')
-                mm.filelist.files.append(u)
-            else:
-                mm.filelist.files.append(filename)
-            mm.write_manifest()
-        finally:
-            unquiet()
+            # UTF-8 filename
+            filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
 
-        manifest = open(mm.manifest, 'rbU')
-        contents = manifest.read()
-        manifest.close()
+            # Add filename and write manifest
+            quiet()
+            try:
+                mm.run()
+                u_filename = filename.decode('utf-8')
+                mm.filelist.files.append(u_filename)
+                # Re-write manifest
+                mm.write_manifest()
+            finally:
+                unquiet()
+
+            manifest = open(mm.manifest, 'rbU')
+            contents = manifest.read()
+            manifest.close()
+
+            # The manifest should be UTF-8 encoded
+            try:
+                contents.decode('UTF-8')
+            except UnicodeDecodeError, e:
+                self.fail(e)
+
+            # The manifest should contain the UTF-8 filename
+            self.assertTrue(posix(filename) in contents)
+
+            # The filelist should have been updated as well
+            self.assertTrue(u_filename in mm.filelist.files)
 
-        # The manifest should contain the Latin-1 filename
-        self.assertTrue(filename in contents)
+        def test_write_manifest_skips_non_utf8_filenames(self):
+            # Test for #303.
+            dist = Distribution(SETUP_ATTRS)
+            dist.script_name = 'setup.py'
+            mm = manifest_maker(dist)
+            mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+            os.mkdir('sdist_test.egg-info')
+
+            # Latin-1 filename
+            filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+
+            # Add filename with surrogates and write manifest
+            quiet()
+            try:
+                mm.run()
+                u_filename = filename.decode('utf-8', 'surrogateescape')
+                mm.filelist.files.append(u_filename)
+                # Re-write manifest
+                mm.write_manifest()
+            finally:
+                unquiet()
+
+            manifest = open(mm.manifest, 'rbU')
+            contents = manifest.read()
+            manifest.close()
+
+            # The manifest should be UTF-8 encoded
+            try:
+                contents.decode('UTF-8')
+            except UnicodeDecodeError, e:
+                self.fail(e)
+
+            # The Latin-1 filename should have been skipped
+            self.assertFalse(posix(filename) in contents)
+
+            # The filelist should have been updated as well
+            self.assertFalse(u_filename in mm.filelist.files)
 
     def test_manifest_is_read_with_utf8_encoding(self):
         # Test for #303.
@@ -218,37 +259,37 @@ def test_manifest_is_read_with_utf8_encoding(self):
             filename = decompose(filename)
         self.assertTrue(filename in cmd.filelist.files)
 
-    def test_manifest_is_read_with_surrogateescape_error_handler(self):
-        # Test for #303.
+    # Python 3 only
+    if sys.version_info >= (3,):
 
-        # This is hard to test on HFS Plus because it quotes unknown
-        # bytes (see previous test). Furthermore, egg_info.FileList
-        # only appends filenames that os.path.exist.
+        def test_read_manifest_rejects_surrogates(self):
+            # Test for #303.
 
-        # We therefore write the manifest file by hand and check whether
-        # read_manifest produces a UnicodeDecodeError.
-        dist = Distribution(SETUP_ATTRS)
-        dist.script_name = 'setup.py'
-        cmd = sdist(dist)
-        cmd.ensure_finalized()
+            # This is hard to test on HFS Plus because it quotes unknown
+            # bytes (see previous test). Furthermore, egg_info.FileList
+            # only appends filenames that os.path.exist.
 
-        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+            # We therefore write the manifest file by hand and check whether
+            # read_manifest produces a UnicodeDecodeError.
+            dist = Distribution(SETUP_ATTRS)
+            dist.script_name = 'setup.py'
+            cmd = sdist(dist)
+            cmd.ensure_finalized()
 
-        quiet()
-        try:
-            cmd.run()
-            # Add Latin-1 filename to manifest
-            cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-            manifest = open(cmd.manifest, 'ab')
-            manifest.write(filename+b('\n'))
-            manifest.close()
-            # Re-read manifest
+            filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+
+            quiet()
             try:
-                cmd.read_manifest()
-            except UnicodeDecodeError, e:
-                self.fail(e)
-        finally:
-            unquiet()
+                cmd.run()
+                # Add Latin-1 filename to manifest
+                cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+                manifest = open(cmd.manifest, 'ab')
+                manifest.write(filename+b('\n'))
+                manifest.close()
+            finally:
+                unquiet()
+
+            self.assertRaises(UnicodeDecodeError, cmd.read_manifest)
 
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
@@ -268,9 +309,8 @@ def test_sdist_with_utf8_encoded_filename(self):
             unquiet()
 
         # The filelist should contain the UTF-8 filename
-        # (in one representation or other)
         if sys.version_info >= (3,):
-            filename = filename.decode(sys.getfilesystemencoding(), 'surrogateescape')
+            filename = filename.decode('utf-8')
         if sys.platform == 'darwin':
             filename = decompose(filename)
         self.assertTrue(filename in cmd.filelist.files)
@@ -292,32 +332,14 @@ def test_sdist_with_latin1_encoded_filename(self):
         finally:
             unquiet()
 
-        # The filelist should contain the Latin-1 filename
-        # (in one representation or other)
-        if sys.platform == 'darwin':
-            filename = hfs_quote(filename)
-        elif sys.version_info >= (3,):
-            filename = filename.decode(sys.getfilesystemencoding(), 'surrogateescape')
-        self.assertTrue(filename in cmd.filelist.files)
-
-    def test_decompose(self):
-        self.assertNotEqual('smörbröd.py', decompose('smörbröd.py'))
-
-        if sys.version_info >= (3,):
-            self.assertEqual(len('smörbröd.py'), 11)
-            self.assertEqual(len(decompose('smörbröd.py')), 13)
-        else:
-            self.assertEqual(len('smörbröd.py'), 13)
-            self.assertEqual(len(decompose('smörbröd.py')), 15)
-
-    def test_hfs_quote(self):
-        self.assertEqual(hfs_quote(LATIN1_FILENAME), 'sm%F6rbr%F6d.py')
-
-        # Bytes are required
+        # The Latin-1 filename should have been skipped
         if sys.version_info >= (3,):
-            self.assertRaises(TypeError, hfs_quote, 'smörbröd.py')
+            filename = filename.decode('latin-1')
+            self.assertFalse(filename in cmd.filelist.files)
         else:
-            self.assertRaises(TypeError, hfs_quote, 'smörbröd.py'.decode('utf-8'))
+            # No conversion takes place under Python 2 and the
+            # filename is included. We shall keep it that way for BBB.
+            self.assertTrue(filename in cmd.filelist.files)
 
 
 def test_suite():

From 22882958087e20839daf0139a94f8411d17d6a2c Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 26 Oct 2012 02:10:14 +0200
Subject: [PATCH 3622/8469] Make sdist tests pass on Windows.

--HG--
branch : distribute
extra : rebase_source : 9fb51372737224be8d5c50265b04a36f19543572
---
 setuptools/tests/test_sdist.py | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a3fde02601..378015a86a 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -308,12 +308,19 @@ def test_sdist_with_utf8_encoded_filename(self):
         finally:
             unquiet()
 
-        # The filelist should contain the UTF-8 filename
-        if sys.version_info >= (3,):
-            filename = filename.decode('utf-8')
         if sys.platform == 'darwin':
             filename = decompose(filename)
-        self.assertTrue(filename in cmd.filelist.files)
+
+        if sys.version_info >= (3,):
+            if sys.platform == 'win32':
+                # Python 3 mangles the UTF-8 filename
+                filename = filename.decode('cp1252')
+                self.assertTrue(filename in cmd.filelist.files)
+            else:
+                filename = filename.decode('utf-8')
+                self.assertTrue(filename in cmd.filelist.files)
+        else:
+            self.assertTrue(filename in cmd.filelist.files)
 
     def test_sdist_with_latin1_encoded_filename(self):
         # Test for #303.
@@ -332,13 +339,17 @@ def test_sdist_with_latin1_encoded_filename(self):
         finally:
             unquiet()
 
-        # The Latin-1 filename should have been skipped
         if sys.version_info >= (3,):
             filename = filename.decode('latin-1')
-            self.assertFalse(filename in cmd.filelist.files)
+            if sys.platform == 'win32':
+                # Latin-1 is similar to Windows-1252
+                self.assertTrue(filename in cmd.filelist.files)
+            else:
+                # The Latin-1 filename should have been skipped
+                self.assertFalse(filename in cmd.filelist.files)
         else:
-            # No conversion takes place under Python 2 and the
-            # filename is included. We shall keep it that way for BBB.
+            # No conversion takes place under Python 2 and the file
+            # is included. We shall keep it that way for BBB.
             self.assertTrue(filename in cmd.filelist.files)
 
 

From f8481f4b522f0fbeafbb36a20dd105497f2623ac Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 26 Oct 2012 02:10:48 +0200
Subject: [PATCH 3623/8469] This one also failed on Windows.

--HG--
branch : distribute
extra : rebase_source : c26a4318302d55dfdd67d379525e84172b440b82
---
 setuptools/package_index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 7a954e2137..0ee21e3b7b 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -834,9 +834,8 @@ def open_with_auth(url):
 
     # Double scheme does not raise on Mac OS X as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
-    if sys.platform == 'darwin':
-        if netloc.endswith(':'):
-            raise httplib.InvalidURL("nonnumeric port: ''")
+    if netloc.endswith(':'):
+        raise httplib.InvalidURL("nonnumeric port: ''")
 
     if scheme in ('http', 'https'):
         auth, host = urllib2.splituser(netloc)

From e485c19015d4fced68b25c09ca66a1743d3ab27c Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Fri, 26 Oct 2012 12:46:41 +0200
Subject: [PATCH 3624/8469] Keep 'surrogateescape' when reading the manifest,
 to avoid breaking on bad input.

--HG--
branch : distribute
extra : rebase_source : 6f894cd508e73fae0ad02860654df5181055ba4d
---
 setuptools/command/sdist.py    | 3 ++-
 setuptools/tests/test_sdist.py | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d5259c2bde..79eed214e6 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,7 +283,8 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                line = line.decode('UTF-8')
+                # Don't break if surrogates have crept into the manifest
+                line = line.decode('UTF-8', 'surrogateescape')
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 378015a86a..04b3db661e 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -262,7 +262,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
     # Python 3 only
     if sys.version_info >= (3,):
 
-        def test_read_manifest_rejects_surrogates(self):
+        def test_manifest_is_read_with_surrogateescape_error_handler(self):
             # Test for #303.
 
             # This is hard to test on HFS Plus because it quotes unknown
@@ -286,11 +286,14 @@ def test_read_manifest_rejects_surrogates(self):
                 manifest = open(cmd.manifest, 'ab')
                 manifest.write(filename+b('\n'))
                 manifest.close()
+                # Re-read manifest
+                try:
+                    cmd.read_manifest()
+                except UnicodeDecodeError, e:
+                    self.fail(e)
             finally:
                 unquiet()
 
-            self.assertRaises(UnicodeDecodeError, cmd.read_manifest)
-
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From f266bc3745169122fcfcacb781e7e3c70fc58bfb Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Thu, 1 Nov 2012 11:47:24 +0100
Subject: [PATCH 3625/8469] Skip undecodable filenames in read_manifest as
 well.

--HG--
branch : distribute
extra : rebase_source : 2dda494b1a4758e84dde81cc61170acd0e55d2f2
---
 setuptools/command/sdist.py    | 7 +++++--
 setuptools/tests/test_sdist.py | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 79eed214e6..7a6d2b7d7c 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,8 +283,11 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                # Don't break if surrogates have crept into the manifest
-                line = line.decode('UTF-8', 'surrogateescape')
+                try:
+                    line = line.decode('UTF-8')
+                except UnicodeDecodeError:
+                    log.warn("%r not UTF-8 decodable -- skipping" % line)
+                    continue
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 04b3db661e..a596f4bdb9 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -262,7 +262,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
     # Python 3 only
     if sys.version_info >= (3,):
 
-        def test_manifest_is_read_with_surrogateescape_error_handler(self):
+        def test_read_manifest_skips_non_utf8_filenames(self):
             # Test for #303.
 
             # This is hard to test on HFS Plus because it quotes unknown
@@ -277,6 +277,7 @@ def test_manifest_is_read_with_surrogateescape_error_handler(self):
             cmd.ensure_finalized()
 
             filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+            u_filename = filename.decode('latin-1')
 
             quiet()
             try:
@@ -284,7 +285,7 @@ def test_manifest_is_read_with_surrogateescape_error_handler(self):
                 # Add Latin-1 filename to manifest
                 cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
                 manifest = open(cmd.manifest, 'ab')
-                manifest.write(filename+b('\n'))
+                manifest.write(b('\n')+filename)
                 manifest.close()
                 # Re-read manifest
                 try:
@@ -294,6 +295,9 @@ def test_manifest_is_read_with_surrogateescape_error_handler(self):
             finally:
                 unquiet()
 
+            # The Latin-1 filename should have been skipped
+            self.assertFalse(u_filename in cmd.filelist.files)
+
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From 83b2066aa4a6e221dfd383e72c7a243850849c9d Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Fri, 2 Nov 2012 18:48:30 +0100
Subject: [PATCH 3626/8469] Work around Jython bugs #1980 and #1981.

--HG--
branch : distribute
extra : rebase_source : 3cc01234cdeeff2ed979316bb06319adab296dd6
---
 CHANGES.txt           |  1 +
 _markerlib/markers.py | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9513ed4595..18e685a9c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ------
 
 * Issue #329: Properly close files created by tests for compatibility with Jython.
+* Work around Jython bugs #1980 and #1981.
 
 ------
 0.6.30
diff --git a/_markerlib/markers.py b/_markerlib/markers.py
index 54c2828a02..23091e6418 100644
--- a/_markerlib/markers.py
+++ b/_markerlib/markers.py
@@ -17,9 +17,7 @@
 
 __all__ = ['default_environment', 'compile', 'interpret']
 
-from ast import Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop
-from ast import parse, copy_location, NodeTransformer
-
+import ast
 import os
 import platform
 import sys
@@ -46,27 +44,31 @@ def default_environment():
     """Return copy of default PEP 385 globals dictionary."""
     return dict(_VARS)
 
-class ASTWhitelist(NodeTransformer):
+class ASTWhitelist(ast.NodeTransformer):
     def __init__(self, statement):
         self.statement = statement # for error messages
-    
-    ALLOWED = (Compare, BoolOp, Attribute, Name, Load, Str, cmpop, boolop)
-    
+
+    ALLOWED = (ast.Compare, ast.BoolOp, ast.Attribute, ast.Name, ast.Load, ast.Str)
+    # Bool operations
+    ALLOWED += (ast.And, ast.Or)
+    # Comparison operations
+    ALLOWED += (ast.Eq, ast.Gt, ast.GtE, ast.In, ast.Is, ast.IsNot, ast.Lt, ast.LtE, ast.NotEq, ast.NotIn)
+
     def visit(self, node):
         """Ensure statement only contains allowed nodes."""
         if not isinstance(node, self.ALLOWED):
             raise SyntaxError('Not allowed in environment markers.\n%s\n%s' %
-                               (self.statement, 
+                               (self.statement,
                                (' ' * node.col_offset) + '^'))
-        return NodeTransformer.visit(self, node)
-    
+        return ast.NodeTransformer.visit(self, node)
+
     def visit_Attribute(self, node):
         """Flatten one level of attribute access."""
-        new_node = Name("%s.%s" % (node.value.id, node.attr), node.ctx)
-        return copy_location(new_node, node)
+        new_node = ast.Name("%s.%s" % (node.value.id, node.attr), node.ctx)
+        return ast.copy_location(new_node, node)
 
 def parse_marker(marker):
-    tree = parse(marker, mode='eval')
+    tree = ast.parse(marker, mode='eval')
     new_tree = ASTWhitelist(marker).generic_visit(tree)
     return new_tree
 

From 945189affe2ec3d2e25a9255a73bf05b828ab7c3 Mon Sep 17 00:00:00 2001
From: "stefan@epy" <stefan@epy>
Date: Mon, 5 Nov 2012 00:20:39 +0100
Subject: [PATCH 3627/8469] Rewrite tests for read_manifest.

--HG--
branch : distribute
extra : rebase_source : 8e52687fae6a06e1421c51ddec62870ef7499676
---
 setuptools/tests/test_sdist.py | 58 ++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a596f4bdb9..9d2c382fd7 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -57,7 +57,7 @@ def b(s, encoding='utf-8'):
 
 # Convert to POSIX path
 def posix(path):
-    if sys.version_info >= (3,) and not isinstance(path, str):
+    if sys.version_info >= (3,) and not isinstance(path, unicode):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')
@@ -244,19 +244,35 @@ def test_manifest_is_read_with_utf8_encoding(self):
         cmd = sdist(dist)
         cmd.ensure_finalized()
 
-        # UTF-8 filename
-        filename = os.path.join('sdist_test', 'smörbröd.py')
+        # Create manifest
+        quiet()
+        try:
+            cmd.run()
+        finally:
+            unquiet()
+
+        # Add UTF-8 filename to manifest
+        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+        cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        manifest = open(cmd.manifest, 'ab')
+        manifest.write(b('\n')+filename)
+        manifest.close()
+
+        # The file must exist to be included in the filelist
         open(filename, 'w').close()
 
+        # Re-read manifest
         quiet()
         try:
-            cmd.run()
+            cmd.read_manifest()
         finally:
             unquiet()
 
         # The filelist should contain the UTF-8 filename
         if sys.platform == 'darwin':
             filename = decompose(filename)
+        if sys.version_info >= (3,):
+            filename = filename.decode('utf-8')
         self.assertTrue(filename in cmd.filelist.files)
 
     # Python 3 only
@@ -264,30 +280,31 @@ def test_manifest_is_read_with_utf8_encoding(self):
 
         def test_read_manifest_skips_non_utf8_filenames(self):
             # Test for #303.
-
-            # This is hard to test on HFS Plus because it quotes unknown
-            # bytes (see previous test). Furthermore, egg_info.FileList
-            # only appends filenames that os.path.exist.
-
-            # We therefore write the manifest file by hand and check whether
-            # read_manifest produces a UnicodeDecodeError.
             dist = Distribution(SETUP_ATTRS)
             dist.script_name = 'setup.py'
             cmd = sdist(dist)
             cmd.ensure_finalized()
 
+            # Create manifest
+            quiet()
+            try:
+                cmd.run()
+            finally:
+                unquiet()
+
+            # Add Latin-1 filename to manifest
             filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
-            u_filename = filename.decode('latin-1')
+            cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+            manifest = open(cmd.manifest, 'ab')
+            manifest.write(b('\n')+filename)
+            manifest.close()
 
+            # The file must exist to be included in the filelist
+            open(filename, 'w').close()
+
+            # Re-read manifest
             quiet()
             try:
-                cmd.run()
-                # Add Latin-1 filename to manifest
-                cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-                manifest = open(cmd.manifest, 'ab')
-                manifest.write(b('\n')+filename)
-                manifest.close()
-                # Re-read manifest
                 try:
                     cmd.read_manifest()
                 except UnicodeDecodeError, e:
@@ -296,7 +313,8 @@ def test_read_manifest_skips_non_utf8_filenames(self):
                 unquiet()
 
             # The Latin-1 filename should have been skipped
-            self.assertFalse(u_filename in cmd.filelist.files)
+            filename = filename.decode('latin-1')
+            self.assertFalse(filename in cmd.filelist.files)
 
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.

From 739d56cdb4f18829de123379488a78cf52e0a6d1 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 5 Nov 2012 00:26:25 +0100
Subject: [PATCH 3628/8469] No longer decompose filename for comparison.

--HG--
branch : distribute
extra : rebase_source : 02265fdf50dbe58c41b98e575f1d0d71c95e4bcf
---
 setuptools/tests/test_sdist.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 9d2c382fd7..cb601d8cea 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -269,8 +269,6 @@ def test_manifest_is_read_with_utf8_encoding(self):
             unquiet()
 
         # The filelist should contain the UTF-8 filename
-        if sys.platform == 'darwin':
-            filename = decompose(filename)
         if sys.version_info >= (3,):
             filename = filename.decode('utf-8')
         self.assertTrue(filename in cmd.filelist.files)

From 19a723890b724f92b8c42b162cea2a4052a746f2 Mon Sep 17 00:00:00 2001
From: "stefan@epy" <stefan@epy>
Date: Mon, 5 Nov 2012 01:35:25 +0100
Subject: [PATCH 3629/8469] Warn if filenames cannot be added to the filelist.

--HG--
branch : distribute
extra : rebase_source : 9fdc3c28b097e191db384cd81319c7a4edccf52b
---
 setuptools/command/egg_info.py | 10 ++++++++--
 setuptools/tests/test_sdist.py |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6e3d67af27..cf6ef63c74 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,8 +281,14 @@ def append(self, item):
         if item.endswith('\r'):     # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
-        if os.path.exists(path):
-            self.files.append(path)
+        try:
+            if os.path.exists(path):
+                self.files.append(path)
+            else:
+                log.warn("%r not found -- skipping", path)
+        except UnicodeEncodeError:
+            log.warn("%r not %s encodable -- skipping", path,
+                sys.getfilesystemencoding())
 
 
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index cb601d8cea..a9d5d6e56c 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -262,6 +262,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
         open(filename, 'w').close()
 
         # Re-read manifest
+        cmd.filelist.files = []
         quiet()
         try:
             cmd.read_manifest()
@@ -301,6 +302,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             open(filename, 'w').close()
 
             # Re-read manifest
+            cmd.filelist.files = []
             quiet()
             try:
                 try:

From 397eda9b80e96fbd1a9fa494e34b6bfda963cdc1 Mon Sep 17 00:00:00 2001
From: "stefan@epy" <stefan@epy>
Date: Mon, 5 Nov 2012 02:21:15 +0100
Subject: [PATCH 3630/8469] Python 3.0 has no surrogateescape.

--HG--
branch : distribute
extra : rebase_source : 83635f70b89fafb65f630947430b5c315cd9c80a
---
 setuptools/command/upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index c43b0f421e..e21a88ce52 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -25,7 +25,7 @@
 except ImportError:
     from setuptools.command.upload import upload
 
-if sys.version_info >= (3,):
+if sys.version_info >= (3, 1):
     errors = 'surrogateescape'
 else:
     errors = 'strict'

From 924d4355aeacd172c32ce6a894f3c141bc363991 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 5 Nov 2012 11:44:41 +0100
Subject: [PATCH 3631/8469] Don't warn about a missing MANIFEST.in.

--HG--
branch : distribute
extra : rebase_source : 219c8a4e10da4a319a736c728d162528220d36e1
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cf6ef63c74..098dfe840d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -284,7 +284,7 @@ def append(self, item):
         try:
             if os.path.exists(path):
                 self.files.append(path)
-            else:
+            elif path != manifest_maker.template:
                 log.warn("%r not found -- skipping", path)
         except UnicodeEncodeError:
             log.warn("%r not %s encodable -- skipping", path,

From 224634293910ce0cb4a6dd7865d4bc0ba70f5807 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 00:44:23 +0100
Subject: [PATCH 3632/8469] Encodability is irrelevant in FileList.append().

--HG--
branch : distribute
extra : rebase_source : 9a89af6da8e816d0c978ee367699aca32611f3d2
---
 setuptools/command/egg_info.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 098dfe840d..3de3441cf6 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -287,8 +287,7 @@ def append(self, item):
             elif path != manifest_maker.template:
                 log.warn("%r not found -- skipping", path)
         except UnicodeEncodeError:
-            log.warn("%r not %s encodable -- skipping", path,
-                sys.getfilesystemencoding())
+            self.files.append(path)
 
 
 

From e69eb1098a650ba05b6ef998d8a118cbc10365a7 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 02:05:17 +0100
Subject: [PATCH 3633/8469] Never skip because of encoding in append.

--HG--
branch : distribute
extra : rebase_source : 89414e7f828ed2ca2b7118dfd5e17c72ccc44f5b
---
 setuptools/command/egg_info.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 098dfe840d..ad02cec868 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,14 +281,15 @@ def append(self, item):
         if item.endswith('\r'):     # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
+        # Filter unused template files all of which have ASCII names
         try:
+            if sys.version_info >= (3,):
+                path.encode('ascii')
+        except UnicodeEncodeError:
+            self.files.append(path)
+        else:
             if os.path.exists(path):
                 self.files.append(path)
-            elif path != manifest_maker.template:
-                log.warn("%r not found -- skipping", path)
-        except UnicodeEncodeError:
-            log.warn("%r not %s encodable -- skipping", path,
-                sys.getfilesystemencoding())
 
 
 

From 057a7d98522cfb5fbee1c183b9922c919fb782b9 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 14:18:53 +0100
Subject: [PATCH 3634/8469] Revert yesterday's misguided attempt at being
 smart.

--HG--
branch : distribute
extra : rebase_source : 224fb95e8c8ad385a35187c49a102259e03e89a6
---
 setuptools/command/egg_info.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index ad02cec868..098dfe840d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,15 +281,14 @@ def append(self, item):
         if item.endswith('\r'):     # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
-        # Filter unused template files all of which have ASCII names
         try:
-            if sys.version_info >= (3,):
-                path.encode('ascii')
-        except UnicodeEncodeError:
-            self.files.append(path)
-        else:
             if os.path.exists(path):
                 self.files.append(path)
+            elif path != manifest_maker.template:
+                log.warn("%r not found -- skipping", path)
+        except UnicodeEncodeError:
+            log.warn("%r not %s encodable -- skipping", path,
+                sys.getfilesystemencoding())
 
 
 

From 98c3a5e71e558a80dafce9b5bb7baf8da9da7ec6 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 14:47:30 +0100
Subject: [PATCH 3635/8469] Log file not found message at debug level.

--HG--
branch : distribute
extra : rebase_source : 2c3afe957adc1b3c83f1dfba3d30adf7b0d7b3f3
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 098dfe840d..8b29e672cf 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -285,7 +285,7 @@ def append(self, item):
             if os.path.exists(path):
                 self.files.append(path)
             elif path != manifest_maker.template:
-                log.warn("%r not found -- skipping", path)
+                log.debug("%r not found -- skipping", path)
         except UnicodeEncodeError:
             log.warn("%r not %s encodable -- skipping", path,
                 sys.getfilesystemencoding())

From b7c5bd34a32f20e54100fd88ede20c136571b1cf Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 17:22:59 +0100
Subject: [PATCH 3636/8469] Windows can store UTF-8 bytes as is.

--HG--
branch : distribute
extra : rebase_source : 99e089901a7dac003a53d53e85b0c08480c86e27
---
 setuptools/command/egg_info.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8b29e672cf..9695627b99 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,15 +281,19 @@ def append(self, item):
         if item.endswith('\r'):     # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
-        try:
+        if sys.version_info >= (3,):
+            try:
+                if os.path.exists(path):
+                    self.files.append(path)
+                elif sys.platform == 'win32':
+                    if os.path.exists(path.encode('utf-8')):
+                        self.files.append(path)
+            except UnicodeEncodeError:
+                log.warn("%r not %s encodable -- skipping", path,
+                    sys.getfilesystemencoding())
+        else:
             if os.path.exists(path):
                 self.files.append(path)
-            elif path != manifest_maker.template:
-                log.debug("%r not found -- skipping", path)
-        except UnicodeEncodeError:
-            log.warn("%r not %s encodable -- skipping", path,
-                sys.getfilesystemencoding())
-
 
 
 

From 91379d9c17d2ac432f64e1952e2b3d47c83eedcc Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 18:45:20 +0100
Subject: [PATCH 3637/8469] Add comments.

--HG--
branch : distribute
extra : rebase_source : 2d4ac9964b247122715c8296158c97d1f11adf89
---
 setuptools/command/egg_info.py | 1 +
 setuptools/command/sdist.py    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9695627b99..d37ba90002 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -286,6 +286,7 @@ def append(self, item):
                 if os.path.exists(path):
                     self.files.append(path)
                 elif sys.platform == 'win32':
+                    # NTFS can store UTF-8 filenames as is
                     if os.path.exists(path.encode('utf-8')):
                         self.files.append(path)
             except UnicodeEncodeError:
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 7a6d2b7d7c..2fa3771aa6 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -282,6 +282,7 @@ def read_manifest(self):
         log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
+            # The manifest must contain UTF-8. See #303.
             if sys.version_info >= (3,):
                 try:
                     line = line.decode('UTF-8')

From be8173d7f6e5e971c5f028d5049d932cf5043efb Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Sat, 10 Nov 2012 22:14:57 +0100
Subject: [PATCH 3638/8469] Accept UTF-8 filenames into the filelist even if
 LANG=C.

--HG--
branch : distribute
extra : rebase_source : 499443a97846396e5790d80af32050f57f4aa43d
---
 setuptools/command/egg_info.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index d37ba90002..085a499bc2 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,17 +281,18 @@ def append(self, item):
         if item.endswith('\r'):     # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
+
         if sys.version_info >= (3,):
             try:
-                if os.path.exists(path):
+                if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
-                elif sys.platform == 'win32':
-                    # NTFS can store UTF-8 filenames as is
-                    if os.path.exists(path.encode('utf-8')):
-                        self.files.append(path)
             except UnicodeEncodeError:
-                log.warn("%r not %s encodable -- skipping", path,
-                    sys.getfilesystemencoding())
+                # Support UTF-8 filenames even if LANG=C
+                if os.path.exists(path.encode('utf-8')):
+                    self.files.append(path)
+                else:
+                    log.warn("%r not %s encodable -- skipping", path,
+                        sys.getfilesystemencoding())
         else:
             if os.path.exists(path):
                 self.files.append(path)

From 89e72217be0c95226fa6db0062f3a58298f3e7c2 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 12 Nov 2012 13:54:37 +0100
Subject: [PATCH 3639/8469] Can't use 'surrogateescape' in upload_docs either.

--HG--
branch : distribute
extra : rebase_source : 6e262cc5a15434bda3543868b29ea9d69c51e238
---
 setuptools/command/upload_docs.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index e21a88ce52..41d7f05591 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -18,6 +18,7 @@
 from pkg_resources import iter_entry_points
 
 from distutils import log
+from distutils.errors import DistutilsError
 from distutils.errors import DistutilsOptionError
 
 try:
@@ -25,17 +26,12 @@
 except ImportError:
     from setuptools.command.upload import upload
 
-if sys.version_info >= (3, 1):
-    errors = 'surrogateescape'
-else:
-    errors = 'strict'
-
 
 # This is not just a replacement for byte literals
 # but works as a general purpose encoder
 def b(s, encoding='utf-8'):
     if isinstance(s, unicode):
-        return s.encode(encoding, errors)
+        return s.encode(encoding)
     return s
 
 

From e0742352f7db736eb8fcb40a1b11f49f09b9ba10 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 12 Nov 2012 13:56:00 +0100
Subject: [PATCH 3640/8469] Rid unused import.

--HG--
branch : distribute
extra : rebase_source : 5d7f72cc77b6143cc4f36cb111a39c8af62f5b1e
---
 setuptools/command/upload_docs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 41d7f05591..98fb723337 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -18,7 +18,6 @@
 from pkg_resources import iter_entry_points
 
 from distutils import log
-from distutils.errors import DistutilsError
 from distutils.errors import DistutilsOptionError
 
 try:

From cdb51001a8302e2948a42c68654550be1e2f941d Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Mon, 12 Nov 2012 22:56:15 +0100
Subject: [PATCH 3641/8469] No need for repr as path is always str.

--HG--
branch : distribute
extra : rebase_source : 6784f7ac37d43a341bb8b2466fbf68a082af2bee
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 085a499bc2..6145d6ea06 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -291,7 +291,7 @@ def append(self, item):
                 if os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
                 else:
-                    log.warn("%r not %s encodable -- skipping", path,
+                    log.warn("'%s' not %s encodable -- skipping", path,
                         sys.getfilesystemencoding())
         else:
             if os.path.exists(path):

From 12599860ec654a39179704ce02323718c987114c Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 13 Nov 2012 14:01:29 +0100
Subject: [PATCH 3642/8469] Don't claim support for LANG=C.

--HG--
branch : distribute
extra : rebase_source : a366e936bfbce0c92831114e92a9d2c015841b5d
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6145d6ea06..0c2ea0cca3 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -287,7 +287,7 @@ def append(self, item):
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
             except UnicodeEncodeError:
-                # Support UTF-8 filenames even if LANG=C
+                # Accept UTF-8 filenames even if LANG=C
                 if os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
                 else:

From b42f4d2e305834e4b92fabbbc56e82d6757aa984 Mon Sep 17 00:00:00 2001
From: "Stefan H. Holek" <stefan@epy.co.at>
Date: Tue, 13 Nov 2012 14:01:41 +0100
Subject: [PATCH 3643/8469] Update CHANGES.

--HG--
branch : distribute
extra : rebase_source : 3fcde455c3af15df4f9696c827e60857de2b4747
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 18e685a9c9..af1d2efc03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 0.6.31
 ------
 
+* Issue #303: Make sure the manifest only ever contains UTF-8 in Python 3.
 * Issue #329: Properly close files created by tests for compatibility with Jython.
 * Work around Jython bugs #1980 and #1981.
 

From 36d2b289f92919582dff786969b41d7c6a6dd92f Mon Sep 17 00:00:00 2001
From: Pete Hollobon <bitbucket@hollobon.com>
Date: Thu, 22 Nov 2012 08:41:56 +0000
Subject: [PATCH 3644/8469] Decode contents of pth file within self-extracting
 exe on Python 3+

--HG--
branch : distribute
extra : rebase_source : 3b29e7832874265eddf3a29b4a64e588c17d20e3
---
 setuptools/command/easy_install.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f226023604..337532bcd9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1522,7 +1522,10 @@ def get_exe_prefixes(exe_filename):
             if name.endswith('-nspkg.pth'):
                 continue
             if parts[0].upper() in ('PURELIB','PLATLIB'):
-                for pth in yield_lines(z.read(name)):
+                contents = z.read(name)
+                if sys.version_info >= (3,):
+                    contents = contents.decode()
+                for pth in yield_lines(contents):
                     pth = pth.strip().replace('\\','/')
                     if not pth.startswith('import'):
                         prefixes.append((('%s/%s/' % (parts[0],pth)), ''))

From 7fbee015f7d31185ccfc890c59dbfab1c699db82 Mon Sep 17 00:00:00 2001
From: Gabriel <g2p.code@gmail.com>
Date: Fri, 23 Nov 2012 22:38:55 +0100
Subject: [PATCH 3645/8469] Don't wrap sys.stdout if it's in the correct
 encoding already.

--HG--
branch : distribute
extra : rebase_source : 314a8be1a2e63ceaf501ecb047a29f62302be0a0
---
 setuptools/dist.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index afac180ebb..3e9e025496 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -657,6 +657,9 @@ def handle_display_options(self, option_order):
         if not isinstance(sys.stdout, io.TextIOWrapper):
             return _Distribution.handle_display_options(self, option_order)
 
+        if sys.stdout.encoding.lower() in ('utf-8', 'utf8'):
+            return _Distribution.handle_display_options(self, option_order)
+
         # Print metadata in UTF-8 no matter the platform
         encoding = sys.stdout.encoding
         errors = sys.stdout.errors

From 76ea724d5b44140b7c7908a1ca89a273fe65e294 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 10:15:12 -0500
Subject: [PATCH 3646/8469] reindent

--HG--
branch : distribute
extra : rebase_source : b5323771ca355fb01a7fda42e10b661935421201
---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index af1d2efc03..c8e56c06ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,8 @@ CHANGES
 ------
 
 * Issue #303: Make sure the manifest only ever contains UTF-8 in Python 3.
-* Issue #329: Properly close files created by tests for compatibility with Jython.
+* Issue #329: Properly close files created by tests for compatibility with
+  Jython.
 * Work around Jython bugs #1980 and #1981.
 
 ------

From 9d1e4a7a1f340147dca2f215dc33485c31f1834e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 10:23:09 -0500
Subject: [PATCH 3647/8469] Added comment and updated CHANGES

--HG--
branch : distribute
extra : rebase_source : 4c828b71eced1215219f5b16d881fa1f35972744
---
 CHANGES.txt        | 7 +++++++
 setuptools/dist.py | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c8e56c06ef..1912edefc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,13 @@ CHANGES
 * Issue #329: Properly close files created by tests for compatibility with
   Jython.
 * Work around Jython bugs #1980 and #1981.
+* Issue #334: Provide workaround for packages that reference `sys.__stdout__`
+  such as numpy does. This change should address
+  `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
+  as the system encoding is UTF-8 or the IO encoding is specified in the
+  environment, i.e.::
+
+     PYTHONIOENCODING=utf8 pip install numpy
 
 ------
 0.6.30
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 3e9e025496..998a4dbe8b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -657,6 +657,8 @@ def handle_display_options(self, option_order):
         if not isinstance(sys.stdout, io.TextIOWrapper):
             return _Distribution.handle_display_options(self, option_order)
 
+        # Don't wrap stdout if utf-8 is already the encoding. Provides
+        #  workaround for #334.
         if sys.stdout.encoding.lower() in ('utf-8', 'utf8'):
             return _Distribution.handle_display_options(self, option_order)
 

From e0ea74d385bd5f2fcbf5030a67a1f51c65b564df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 10:23:23 -0500
Subject: [PATCH 3648/8469] Add hyperlinks to Jython bugs

--HG--
branch : distribute
extra : rebase_source : b3cfcd0da54b33c0571a678a1ea20b730e138f99
---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1912edefc9..2bb23165bb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,8 @@ CHANGES
 * Issue #303: Make sure the manifest only ever contains UTF-8 in Python 3.
 * Issue #329: Properly close files created by tests for compatibility with
   Jython.
-* Work around Jython bugs #1980 and #1981.
+* Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and
+  `#1981 <http://bugs.jython.org/issue1981`_.
 * Issue #334: Provide workaround for packages that reference `sys.__stdout__`
   such as numpy does. This change should address
   `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long

From 88abd2e3da9e9eb5bf631f04c29cb2d7066ff5ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 11:09:53 -0500
Subject: [PATCH 3649/8469] Update changelog and contributors

--HG--
branch : distribute
extra : rebase_source : 25d26d635ed69fd41e0872048c6c804c26b40ecc
---
 CHANGES.txt      | 2 ++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2bb23165bb..43211cb643 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,8 @@ CHANGES
 
      PYTHONIOENCODING=utf8 pip install numpy
 
+* Fix for encoding issue when installing from Windows executable on Python 3.
+
 ------
 0.6.30
 ------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e180edac4b..22c90aba19 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -18,6 +18,7 @@ Contributors
 * Marc Abramowitz
 * Martin von Löwis
 * Noufal Ibrahim
+* Pete Hollobon
 * Philip Jenvey
 * Reinout van Rees
 * Robert Myers

From 61568ea992268605a85d39edde0c179fe3850e9e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 11:10:14 -0500
Subject: [PATCH 3650/8469] Fix bug in hyperlink

--HG--
branch : distribute
extra : rebase_source : 4fff5c12aae70ab34ec71834b238ffbcc7bfd530
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 43211cb643..2b376104b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,7 +10,7 @@ CHANGES
 * Issue #329: Properly close files created by tests for compatibility with
   Jython.
 * Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and
-  `#1981 <http://bugs.jython.org/issue1981`_.
+  `#1981 <http://bugs.jython.org/issue1981>`_.
 * Issue #334: Provide workaround for packages that reference `sys.__stdout__`
   such as numpy does. This change should address
   `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long

From 7f175a0bfb78659680159c194480866078ac271f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 22:56:03 -0500
Subject: [PATCH 3651/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : 9fa0ef551c34deba0f744ef279ecf9fe4ef7c13d
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2b376104b3..29843abbcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,13 @@ CHANGES
      PYTHONIOENCODING=utf8 pip install numpy
 
 * Fix for encoding issue when installing from Windows executable on Python 3.
+* Issue #323: Allow `setup_requires` requirements to supercede installed
+  requirements. Added some new keyword arguments to existing pkg_resources
+  methods. Also had to updated how __path__ is handled for namespace packages
+  to ensure that when a new egg distribution containing a namespace package is
+  placed on sys.path, the entries in __path__ are found in the same order they
+  would have been in had that egg been on the path when pkg_resources was
+  first imported.
 
 ------
 0.6.30

From bb564ea0637851a516dad029c8ccf6d30c451728 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 23:02:31 -0500
Subject: [PATCH 3652/8469] Added tag 0.6.31 for changeset 17bc972d67ed

--HG--
branch : distribute
extra : rebase_source : 79d77654d3f4d512fecfa26b512616af6c69631f
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 903deb3eb3..4a15ad9a42 100644
--- a/.hgtags
+++ b/.hgtags
@@ -39,3 +39,4 @@ b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
 fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29
 7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30
+17bc972d67edd96c7748061910172e1200a73efe 0.6.31

From 40102f07a08808c2c356891608fd201ee02e618b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Nov 2012 23:04:02 -0500
Subject: [PATCH 3653/8469] Bumped to 0.6.32 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 107cb8e68f5d9d947096d0733e841ba568df0be2
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 7b5ae24a36..f27d2b95b9 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.31.tar.gz
-    $ tar -xzvf distribute-0.6.31.tar.gz
-    $ cd distribute-0.6.31
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz
+    $ tar -xzvf distribute-0.6.32.tar.gz
+    $ cd distribute-0.6.32
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index f3e85a1ed5..f8869e4444 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.31"
+DEFAULT_VERSION = "0.6.32"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 08fa643df9..c1417e771f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.31'
+version = '0.6.32'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.31'
+release = '0.6.32'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 18299a4fcb..177c11b457 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.31'
+VERSION = '0.6.32'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 13c9be7c3a..dc3b08a3ee 100755
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@
 exec(open(init_path).read(), d)
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.31"
+VERSION = "0.6.32"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From cbcd321ebc204d04a4460ecc3accfb245b9ffacd Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 26 Nov 2012 03:59:17 +0100
Subject: [PATCH 3654/8469] Do not use assertGreater(), which was introduced in
 Python 2.7 and 3.1.

--HG--
branch : distribute
extra : rebase_source : b0d3166887c9a287fd885e19f804e9d254b8dbc8
---
 CHANGES.txt                           | 6 ++++++
 setuptools/tests/test_easy_install.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 29843abbcd..5e024d133c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.32
+------
+
+* Fix test suite with Python 2.6.
+
 ------
 0.6.31
 ------
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1540bdc6ed..7ed0cd37a2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -386,7 +386,7 @@ def setup_and_run(temp_dir):
                           'VersionConflict')
 
             lines = stdout.splitlines()
-            self.assertGreater(len(lines), 0)
+            self.assertTrue(len(lines) > 0)
             self.assert_(lines[-1].strip(), 'test_pkg')
 
         try:

From f31fb0ff20c63dd9bb82f91af45c12e97428e38c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 26 Nov 2012 07:27:32 +0100
Subject: [PATCH 3655/8469] Fix some DeprecationWarnings and ResourceWarnings.

--HG--
branch : distribute
extra : rebase_source : 1293f856181d35c735670b021e8745208103f640
---
 CHANGES.txt                           |  1 +
 setup.py                              | 32 ++++++++++++++++++---------
 setuptools/tests/test_easy_install.py |  4 ++--
 setuptools/tests/test_markerlib.py    | 18 +++++++--------
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5e024d133c..3b5ba3d993 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ------
 
 * Fix test suite with Python 2.6.
+* Fix some DeprecationWarnings and ResourceWarnings.
 
 ------
 0.6.31
diff --git a/setup.py b/setup.py
index dc3b08a3ee..3b47c5ade0 100755
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,10 @@
     from distutils import dir_util, file_util, util, log
     log.set_verbosity(1)
     fl = FileList()
-    for line in open("MANIFEST.in"):
+    manifest_file = open("MANIFEST.in")
+    for line in manifest_file:
         fl.process_template_line(line)
+    manifest_file.close()
     dir_util.create_tree(tmp_src, fl.files)
     outfiles_2to3 = []
     dist_script = os.path.join("build", "src", "distribute_setup.py")
@@ -39,7 +41,9 @@
 
 d = {}
 init_path = convert_path('setuptools/command/__init__.py')
-exec(open(init_path).read(), d)
+init_file = open(init_path)
+exec(init_file.read(), d)
+init_file.close()
 
 SETUP_COMMANDS = d['__all__']
 VERSION = "0.6.32"
@@ -132,21 +136,27 @@ def _being_installed():
     _before_install()
 
 # return contents of reStructureText file with linked issue references
-def _linkified(rstfile):
+def _linkified(rst_path):
     bitroot = 'http://bitbucket.org/tarek/distribute'
     revision = re.compile(r'\b(issue\s*#?\d+)\b', re.M | re.I)
 
-    rstext = open(rstfile).read()    
+    rst_file = open(rst_path)
+    rst_content = rst_file.read()
+    rst_file.close()
 
-    anchors = revision.findall(rstext) # ['Issue #43', ...]
+    anchors = revision.findall(rst_content) # ['Issue #43', ...]
     anchors = sorted(set(anchors))
-    rstext = revision.sub(r'`\1`_', rstext)
-    rstext += "\n"
+    rst_content = revision.sub(r'`\1`_', rst_content)
+    rst_content += "\n"
     for x in anchors:
         issue = re.findall(r'\d+', x)[0]
-        rstext += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
-    rstext += "\n"
-    return rstext
+        rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
+    rst_content += "\n"
+    return rst_content
+
+readme_file = open('README.txt')
+long_description = readme_file.read() + _linkified('CHANGES.txt')
+readme_file.close()
 
 dist = setup(
     name="distribute",
@@ -156,7 +166,7 @@ def _linkified(rstfile):
     author="The fellowship of the packaging",
     author_email="distutils-sig@python.org",
     license="PSF or ZPL",
-    long_description = open('README.txt').read() + _linkified('CHANGES.txt'),
+    long_description = long_description,
     keywords = "CPAN PyPI distutils eggs package management",
     url = "http://packages.python.org/distribute",
     test_suite = 'setuptools.tests',
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7ed0cd37a2..2f295b5c44 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -236,7 +236,7 @@ def test_local_index(self):
         f = open(egg_file, 'w')
         try:
             f.write('Name: foo\n')
-        except:
+        finally:
             f.close()
 
         sys.path.append(target)
@@ -387,7 +387,7 @@ def setup_and_run(temp_dir):
 
             lines = stdout.splitlines()
             self.assertTrue(len(lines) > 0)
-            self.assert_(lines[-1].strip(), 'test_pkg')
+            self.assertTrue(lines[-1].strip(), 'test_pkg')
 
         try:
             tempdir_context(setup_and_run)
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index 7ff2f5841c..aa461846b6 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -16,15 +16,15 @@ def test_markers(self):
         
         os_name = os.name
         
-        self.assert_(interpret(""))
+        self.assertTrue(interpret(""))
         
-        self.assert_(interpret("os.name != 'buuuu'"))
-        self.assert_(interpret("python_version > '1.0'"))
-        self.assert_(interpret("python_version < '5.0'"))
-        self.assert_(interpret("python_version <= '5.0'"))
-        self.assert_(interpret("python_version >= '1.0'"))
-        self.assert_(interpret("'%s' in os.name" % os_name))
-        self.assert_(interpret("'buuuu' not in os.name"))
+        self.assertTrue(interpret("os.name != 'buuuu'"))
+        self.assertTrue(interpret("python_version > '1.0'"))
+        self.assertTrue(interpret("python_version < '5.0'"))
+        self.assertTrue(interpret("python_version <= '5.0'"))
+        self.assertTrue(interpret("python_version >= '1.0'"))
+        self.assertTrue(interpret("'%s' in os.name" % os_name))
+        self.assertTrue(interpret("'buuuu' not in os.name"))
         
         self.assertFalse(interpret("os.name == 'buuuu'"))
         self.assertFalse(interpret("python_version < '1.0'"))
@@ -36,7 +36,7 @@ def test_markers(self):
         
         environment = default_environment()
         environment['extra'] = 'test'
-        self.assert_(interpret("extra == 'test'", environment))
+        self.assertTrue(interpret("extra == 'test'", environment))
         self.assertFalse(interpret("extra == 'doc'", environment))
         
         def raises_nameError():

From ceb03af882740ae02ef4be004a30b45c7b25b9ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Nov 2012 09:20:11 -0500
Subject: [PATCH 3656/8469] Backed out changeset: 98a9f9dcce0e; Fixes #335.

--HG--
branch : distribute
extra : rebase_source : 3f4ff1c880688e6dd72d2fa8fab3c07e7f486a7e
---
 pkg_resources.py                      |  60 ++++-------
 setuptools/dist.py                    |   5 +-
 setuptools/tests/test_easy_install.py | 142 +++++++-------------------
 3 files changed, 59 insertions(+), 148 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index a39a32dc1d..a5a10eb4b5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -517,7 +517,7 @@ def __iter__(self):
                     seen[key]=1
                     yield self.by_key[key]
 
-    def add(self, dist, entry=None, insert=True, replace=False):
+    def add(self, dist, entry=None, insert=True):
         """Add `dist` to working set, associated with `entry`
 
         If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
@@ -525,9 +525,8 @@ def add(self, dist, entry=None, insert=True, replace=False):
         set's ``.entries`` (if it wasn't already present).
 
         `dist` is only added to the working set if it's for a project that
-        doesn't already have a distribution in the set, unless `replace=True`.
-        If it's added, any callbacks registered with the ``subscribe()`` method
-        will be called.
+        doesn't already have a distribution in the set.  If it's added, any
+        callbacks registered with the ``subscribe()`` method will be called.
         """
         if insert:
             dist.insert_on(self.entries, entry)
@@ -536,7 +535,7 @@ def add(self, dist, entry=None, insert=True, replace=False):
             entry = dist.location
         keys = self.entry_keys.setdefault(entry,[])
         keys2 = self.entry_keys.setdefault(dist.location,[])
-        if not replace and dist.key in self.by_key:
+        if dist.key in self.by_key:
             return      # ignore hidden distros
 
         self.by_key[dist.key] = dist
@@ -546,8 +545,7 @@ def add(self, dist, entry=None, insert=True, replace=False):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None,
-                replacement=True, replace_conflicting=False):
+    def resolve(self, requirements, env=None, installer=None, replacement=True):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -557,12 +555,6 @@ def resolve(self, requirements, env=None, installer=None,
         will be invoked with each requirement that cannot be met by an
         already-installed distribution; it should return a ``Distribution`` or
         ``None``.
-
-        Unless `replace_conflicting=True`, raises a VersionConflict exception if
-        any requirements are found on the path that have the correct name but
-        the wrong version.  Otherwise, if an `installer` is supplied it will be
-        invoked to obtain the correct version of the requirement and activate
-        it.
         """
 
         requirements = list(requirements)[::-1]  # set up the stack
@@ -582,18 +574,10 @@ def resolve(self, requirements, env=None, installer=None,
             if dist is None:
                 # Find the best distribution and add it to the map
                 dist = self.by_key.get(req.key)
-                if dist is None or (dist not in req and replace_conflicting):
-                    ws = self
+                if dist is None:
                     if env is None:
-                        if dist is None:
-                            env = Environment(self.entries)
-                        else:
-                            # Use an empty environment and workingset to avoid
-                            # any further conflicts with the conflicting
-                            # distribution
-                            env = Environment([])
-                            ws = WorkingSet([])
-                    dist = best[req.key] = env.best_match(req, ws, installer)
+                        env = Environment(self.entries)
+                    dist = best[req.key] = env.best_match(req, self, installer)
                     if dist is None:
                         #msg = ("The '%s' distribution was not found on this "
                         #       "system, and is required by this application.")
@@ -1814,7 +1798,6 @@ def namespace_handler(importer,path_entry,moduleName,module):
 
 def _handle_ns(packageName, path_item):
     """Ensure that named package includes a subpath of path_item (if needed)"""
-
     importer = get_importer(path_item)
     if importer is None:
         return None
@@ -1824,19 +1807,14 @@ def _handle_ns(packageName, path_item):
     module = sys.modules.get(packageName)
     if module is None:
         module = sys.modules[packageName] = types.ModuleType(packageName)
-        module.__path__ = []
-        _set_parent_ns(packageName)
+        module.__path__ = []; _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
         raise TypeError("Not a package:", packageName)
     handler = _find_adapter(_namespace_handlers, importer)
-    subpath = handler(importer, path_item, packageName, module)
+    subpath = handler(importer,path_item,packageName,module)
     if subpath is not None:
-        path = module.__path__
-        path.append(subpath)
-        loader.load_module(packageName)
-        for path_item in path:
-            if path_item not in module.__path__:
-                module.__path__.append(path_item)
+        path = module.__path__; path.append(subpath)
+        loader.load_module(packageName); module.__path__ = path
     return subpath
 
 def declare_namespace(packageName):
@@ -2142,7 +2120,7 @@ def _remove_md5_fragment(location):
 class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
-
+    
     def __init__(self,
         location=None, metadata=None, project_name=None, version=None,
         py_version=PY_MAJOR, platform=None, precedence = EGG_DIST
@@ -2481,7 +2459,7 @@ def _parsed_pkg_info(self):
             from email.parser import Parser
             self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
             return self._pkg_info
-
+    
     @property
     def _dep_map(self):
         try:
@@ -2492,7 +2470,7 @@ def _dep_map(self):
 
     def _preparse_requirement(self, requires_dist):
         """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
-        Split environment marker, add == prefix to version specifiers as
+        Split environment marker, add == prefix to version specifiers as 
         necessary, and remove parenthesis.
         """
         parts = requires_dist.split(';', 1) + ['']
@@ -2501,7 +2479,7 @@ def _preparse_requirement(self, requires_dist):
         distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
         distvers = distvers.replace('(', '').replace(')', '')
         return (distvers, mark)
-
+            
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
         from _markerlib import compile as compile_marker
@@ -2514,7 +2492,7 @@ def _compute_dependencies(self):
             parsed = parse_requirements(distvers).next()
             parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
-
+            
         def reqs_for_extra(extra):
             for req in reqs:
                 if req.marker_fn(override={'extra':extra}):
@@ -2522,13 +2500,13 @@ def reqs_for_extra(extra):
 
         common = frozenset(reqs_for_extra(None))
         dm[None].extend(common)
-
+            
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             extra = safe_extra(extra.strip())
             dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
 
         return dm
-
+    
 
 _distributionImpl = {'.egg': Distribution,
                      '.egg-info': Distribution,
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6236d5beed..998a4dbe8b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -242,10 +242,9 @@ def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         from pkg_resources import working_set, parse_requirements
         for dist in working_set.resolve(
-            parse_requirements(requires), installer=self.fetch_build_egg,
-            replace_conflicting=True
+            parse_requirements(requires), installer=self.fetch_build_egg
         ):
-            working_set.add(dist, replace=True)
+            working_set.add(dist)
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2f295b5c44..b1799a5a2f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -17,10 +17,8 @@
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
-from pkg_resources import working_set, VersionConflict
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
-import pkg_resources
 
 try:
     # import multiprocessing solely for the purpose of testing its existence
@@ -275,16 +273,48 @@ def test_setup_requires(self):
         SandboxViolation.
         """
 
-        test_pkg = create_setup_requires_package(self.dir)
+        test_setup_attrs = {
+            'name': 'test_pkg', 'version': '0.0',
+            'setup_requires': ['foobar'],
+            'dependency_links': [os.path.abspath(self.dir)]
+        }
+
+        test_pkg = os.path.join(self.dir, 'test_pkg')
         test_setup_py = os.path.join(test_pkg, 'setup.py')
+        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+        os.mkdir(test_pkg)
 
+        f = open(test_setup_py, 'w')
+        f.write(textwrap.dedent("""\
+            import setuptools
+            setuptools.setup(**%r)
+        """ % test_setup_attrs))
+        f.close()
+
+        foobar_path = os.path.join(self.dir, 'foobar-0.1.tar.gz')
+        make_trivial_sdist(
+            foobar_path,
+            textwrap.dedent("""\
+                import setuptools
+                setuptools.setup(
+                    name='foobar',
+                    version='0.1'
+                )
+            """))
+
+        old_stdout = sys.stdout
+        old_stderr = sys.stderr
+        sys.stdout = StringIO.StringIO()
+        sys.stderr = StringIO.StringIO()
         try:
-            quiet_context(
-                lambda: reset_setup_stop_context(
-                    lambda: run_setup(test_setup_py, ['install'])
-            ))
+            reset_setup_stop_context(
+                lambda: run_setup(test_setup_py, ['install'])
+            )
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
 
 
 class TestSetupRequires(unittest.TestCase):
@@ -330,7 +360,7 @@ def install_clean_argv():
             tempdir_context(install_at)
 
         # create an sdist that has a build-time dependency.
-        quiet_context(lambda: self.create_sdist(install))
+        self.create_sdist(install)
 
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
@@ -357,81 +387,6 @@ def build_sdist(dir):
             installer(dist_path)
         tempdir_context(build_sdist)
 
-    def test_setup_requires_overrides_version_conflict(self):
-        """
-        Regression test for issue #323.
-
-        Ensures that a distribution's setup_requires requirements can still be
-        installed and used locally even if a conflicting version of that
-        requirement is already on the path.
-        """
-
-        pr_state = pkg_resources.__getstate__()
-        fake_dist = PRDistribution('does-not-matter', project_name='foobar',
-                                   version='0.0')
-        working_set.add(fake_dist)
-
-        def setup_and_run(temp_dir):
-            test_pkg = create_setup_requires_package(temp_dir)
-            test_setup_py = os.path.join(test_pkg, 'setup.py')
-            try:
-                stdout, stderr = quiet_context(
-                    lambda: reset_setup_stop_context(
-                        # Don't even need to install the package, just running
-                        # the setup.py at all is sufficient
-                        lambda: run_setup(test_setup_py, ['--name'])
-                ))
-            except VersionConflict:
-                self.fail('Installing setup.py requirements caused '
-                          'VersionConflict')
-
-            lines = stdout.splitlines()
-            self.assertTrue(len(lines) > 0)
-            self.assertTrue(lines[-1].strip(), 'test_pkg')
-
-        try:
-            tempdir_context(setup_and_run)
-        finally:
-            pkg_resources.__setstate__(pr_state)
-
-
-def create_setup_requires_package(path):
-    """Creates a source tree under path for a trivial test package that has a
-    single requirement in setup_requires--a tarball for that requirement is
-    also created and added to the dependency_links argument.
-    """
-
-    test_setup_attrs = {
-        'name': 'test_pkg', 'version': '0.0',
-        'setup_requires': ['foobar==0.1'],
-        'dependency_links': [os.path.abspath(path)]
-    }
-
-    test_pkg = os.path.join(path, 'test_pkg')
-    test_setup_py = os.path.join(test_pkg, 'setup.py')
-    test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
-    os.mkdir(test_pkg)
-
-    f = open(test_setup_py, 'w')
-    f.write(textwrap.dedent("""\
-        import setuptools
-        setuptools.setup(**%r)
-    """ % test_setup_attrs))
-    f.close()
-
-    foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
-    make_trivial_sdist(
-        foobar_path,
-        textwrap.dedent("""\
-            import setuptools
-            setuptools.setup(
-                name='foobar',
-                version='0.1'
-            )
-        """))
-
-    return test_pkg
-
 
 def make_trivial_sdist(dist_path, setup_py):
     """Create a simple sdist tarball at dist_path, containing just a
@@ -466,7 +421,6 @@ def tempdir_context(f, cd=lambda dir:None):
         cd(orig_dir)
         shutil.rmtree(temp_dir)
 
-
 def environment_context(f, **updates):
     """
     Invoke f in the context
@@ -480,7 +434,6 @@ def environment_context(f, **updates):
             del os.environ[key]
         os.environ.update(old_env)
 
-
 def argv_context(f, repl):
     """
     Invoke f in the context
@@ -492,7 +445,6 @@ def argv_context(f, repl):
     finally:
         sys.argv[:] = old_argv
 
-
 def reset_setup_stop_context(f):
     """
     When the distribute tests are run using setup.py test, and then
@@ -506,21 +458,3 @@ def reset_setup_stop_context(f):
         f()
     finally:
         distutils.core._setup_stop_after = setup_stop_after
-
-
-def quiet_context(f):
-    """
-    Redirect stdout/stderr to StringIO objects to prevent console output from
-    distutils commands.
-    """
-
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    new_stdout = sys.stdout = StringIO.StringIO()
-    new_stderr = sys.stderr = StringIO.StringIO()
-    try:
-        f()
-    finally:
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
-    return new_stdout.getvalue(), new_stderr.getvalue()

From 6dcbe27f5413720102fe57bff8ed9db8406a9282 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Nov 2012 09:12:36 -0500
Subject: [PATCH 3657/8469] Updated changelog

--HG--
branch : distribute
extra : rebase_source : 622abb171373b4432b02044cad40145e6dcee53c
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3b5ba3d993..db7609afbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 
 * Fix test suite with Python 2.6.
 * Fix some DeprecationWarnings and ResourceWarnings.
+* Issue #335: Backed out `setup_requires` superceding installed requirements
+  until regression can be addressed.
 
 ------
 0.6.31

From 49c2791a723073e0f00189892516ef90f9ce8935 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Nov 2012 12:18:13 -0500
Subject: [PATCH 3658/8469] Added tag 0.6.32 for changeset b1a7f86b315a

--HG--
branch : distribute
extra : rebase_source : ff44566346d016ad48040c3f6382c80805b70678
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4a15ad9a42..0e4cfac3b1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -40,3 +40,4 @@ fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29
 7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30
 17bc972d67edd96c7748061910172e1200a73efe 0.6.31
+b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32

From 1c2dff7451101c9cfb37e4ae16eb23ef17332f5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Nov 2012 12:18:36 -0500
Subject: [PATCH 3659/8469] Bumped to 0.6.33 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : cbb90a165b1e410ac7998fe5a57f0c84e9c024d3
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index f27d2b95b9..a364a06231 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz
-    $ tar -xzvf distribute-0.6.32.tar.gz
-    $ cd distribute-0.6.32
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.33.tar.gz
+    $ tar -xzvf distribute-0.6.33.tar.gz
+    $ cd distribute-0.6.33
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index f8869e4444..f7954e84a9 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.32"
+DEFAULT_VERSION = "0.6.33"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index c1417e771f..af26376e25 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.32'
+version = '0.6.33'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.32'
+release = '0.6.33'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 177c11b457..666e35064c 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.32'
+VERSION = '0.6.33'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 3b47c5ade0..4f7af02595 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.32"
+VERSION = "0.6.33"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 3b6b1d147dae6ba825d0597d88abfda4cc3d295a Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 26 Nov 2012 22:24:45 +0100
Subject: [PATCH 3660/8469] Fix 2 errors with Jython 2.5. (Now there remain 1
 failure and 2 errors with Jython 2.5 and 1 failure and 5 errors with Jython
 2.7.)

--HG--
branch : distribute
extra : rebase_source : c245820df5090ac5d005ebb7d6c4419145afce53
---
 CHANGES.txt           |  6 ++++++
 _markerlib/markers.py | 11 ++++++++++-
 setuptools/sandbox.py |  5 ++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index db7609afbc..4a79949731 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.33
+------
+
+* Fix 2 errors with Jython 2.5.
+
 ------
 0.6.32
 ------
diff --git a/_markerlib/markers.py b/_markerlib/markers.py
index 23091e6418..c93d7f3b67 100644
--- a/_markerlib/markers.py
+++ b/_markerlib/markers.py
@@ -25,7 +25,16 @@
 
 _builtin_compile = compile
 
-from platform import python_implementation
+try:
+    from platform import python_implementation
+except ImportError:
+    if os.name == "java":
+        # Jython 2.5 has ast module, but not platform.python_implementation() function.
+        def python_implementation():
+            return "Jython"
+    else:
+        raise
+
 
 # restricted set of variables
 _VARS = {'sys.platform': sys.platform,
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 64f725e72d..1583b81f26 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -1,5 +1,8 @@
 import os, sys, __builtin__, tempfile, operator, pkg_resources
-_os = sys.modules[os.name]
+if os.name == "java":
+    import org.python.modules.posix.PosixModule as _os
+else:
+    _os = sys.modules[os.name]
 try:
     _file = file
 except NameError:

From 753f783100cf598316e9030dcf59b24772819504 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 27 Nov 2012 00:40:15 +0100
Subject: [PATCH 3661/8469] Fix 1 failure with Jython 2.5 and 2.7. (Now there
 remain 0 failures and 2 errors with Jython 2.5 and 0 failures and 5 errors
 with Jython 2.7.)

--HG--
branch : distribute
extra : rebase_source : 319071404608c4f34616df74bfeaa28d590edd0c
---
 CHANGES.txt                           | 1 +
 setuptools/tests/test_easy_install.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4a79949731..2e51b44cff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ------
 
 * Fix 2 errors with Jython 2.5.
+* Fix 1 failure with Jython 2.5 and 2.7.
 
 ------
 0.6.32
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b1799a5a2f..582219cef9 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -13,7 +13,7 @@
 import distutils.core
 
 from setuptools.sandbox import run_setup, SandboxViolation
-from setuptools.command.easy_install import easy_install, get_script_args, main
+from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -51,7 +51,7 @@ def as_requirement(self):
     sys.exit(
         load_entry_point('spec', 'console_scripts', 'name')()
     )
-""" % sys.executable
+""" % fix_jython_executable(sys.executable, "")
 
 SETUP_PY = """\
 from setuptools import setup

From 11491404365ba925bb36935a9f7a14c1afe003cc Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 27 Nov 2012 00:44:17 +0100
Subject: [PATCH 3662/8469] Disable workaround for Jython scripts on Linux
 systems.

--HG--
branch : distribute
extra : rebase_source : 289980b084c335029d93732feb8e02da94472795
---
 CHANGES.txt                        |  1 +
 setuptools/command/easy_install.py |  5 +++++
 setuptools/tests/test_resources.py | 10 ++++++++++
 3 files changed, 16 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2e51b44cff..d5a1792a83 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Fix 2 errors with Jython 2.5.
 * Fix 1 failure with Jython 2.5 and 2.7.
+* Disable workaround for Jython scripts on Linux systems.
 
 ------
 0.6.32
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 337532bcd9..cb9111731a 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1788,6 +1788,11 @@ def chmod(path, mode):
 
 def fix_jython_executable(executable, options):
     if sys.platform.startswith('java') and is_sh(executable):
+        # Workaround for Jython is not needed on Linux systems.
+        import java
+        if java.lang.System.getProperty("os.name") == "Linux":
+            return executable
+
         # Workaround Jython's sys.executable being a .sh (an invalid
         # shebang line interpreter)
         if options:
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index d08fa32595..0bc1a0953d 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -561,6 +561,15 @@ def test_get_script_header_jython_workaround(self):
         if (sys.version_info >= (3,) and os.environ.get("LC_CTYPE")
             in (None, "C", "POSIX")):
             return
+
+        class java:
+            class lang:
+                class System:
+                    @staticmethod
+                    def getProperty(property):
+                        return ""
+        sys.modules["java"] = java
+
         platform = sys.platform
         sys.platform = 'java1.5.0_13'
         stdout = sys.stdout
@@ -584,6 +593,7 @@ def test_get_script_header_jython_workaround(self):
                              '#!%s -x\n' % self.non_ascii_exe)
             self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
         finally:
+            del sys.modules["java"]
             sys.platform = platform
             sys.stdout = stdout
 

From 6cc077d10b69b24307198f494675f7ab9418f180 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Nov 2012 02:24:30 -0500
Subject: [PATCH 3663/8469] Don't suppress SystemExit when running tests; Fixes
 #336

--HG--
branch : distribute
extra : rebase_source : f337a5cfc45c1303ef389334a58d1d8c65b95d93
---
 setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 4f7af02595..d2c1ba2c96 100755
--- a/setup.py
+++ b/setup.py
@@ -85,10 +85,8 @@ def run(self):
         entry_points = os.path.join('distribute.egg-info', 'entry_points.txt')
 
         if not os.path.exists(entry_points):
-            try:
-                _test.run(self)
-            finally:
-                return
+            _test.run(self)
+            return # even though _test.run will raise SystemExit
 
         f = open(entry_points)
 

From 993d79149275b17b639aebd6d3ca2eb960ec6876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 14:21:51 -0500
Subject: [PATCH 3664/8469] Ignore .nfs* files in distutils (#7719).

These files are created by some NFS clients a file is edited and removed
concurrently (see added link in doc for more info).  If such a file is
removed between distutils calls listdir and copy, it will get confused.
Other special files are ignored in sdist (namely VCS directories), but
this has to be filtered out earlier.
---
 dir_util.py            |  4 ++++
 tests/test_dir_util.py | 21 ++++++++++++++++-----
 tests/test_sdist.py    |  7 ++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 30daf49a6e..2826ff805d 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -141,6 +141,10 @@ def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
         src_name = os.path.join(src, n)
         dst_name = os.path.join(dst, n)
 
+        if n.startswith('.nfs'):
+            # skip NFS rename files
+            continue
+
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
             if verbose >= 1:
diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index ce74589dde..1589f1297d 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -76,7 +76,6 @@ def test_create_tree_verbosity(self):
 
         remove_tree(self.root_target, verbose=0)
 
-
     def test_copy_tree_verbosity(self):
 
         mkpath(self.target, verbose=0)
@@ -88,11 +87,8 @@ def test_copy_tree_verbosity(self):
 
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
-        f = open(a_file, 'w')
-        try:
+        with open(a_file, 'w') as f:
             f.write('some content')
-        finally:
-            f.close()
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
@@ -101,6 +97,21 @@ def test_copy_tree_verbosity(self):
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
 
+    def test_copy_tree_skips_nfs_temp_files(self):
+        mkpath(self.target, verbose=0)
+
+        a_file = os.path.join(self.target, 'ok.txt')
+        nfs_file = os.path.join(self.target, '.nfs123abc')
+        for f in a_file, nfs_file:
+            with open(f, 'w') as fh:
+                fh.write('some content')
+
+        copy_tree(self.target, self.target2)
+        self.assertEqual(os.listdir(self.target2), ['ok.txt'])
+
+        remove_tree(self.root_target, verbose=0)
+        remove_tree(self.target2, verbose=0)
+
     def test_ensure_relative(self):
         if os.sep == '/':
             self.assertEqual(ensure_relative('/home/foo'), 'home/foo')
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 1ba2a1a6a9..e6359d6a8a 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -83,9 +83,8 @@ def get_cmd(self, metadata=None):
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_prune_file_list(self):
-        # this test creates a package with some vcs dirs in it
-        # and launch sdist to make sure they get pruned
-        # on all systems
+        # this test creates a project with some VCS dirs and an NFS rename
+        # file, then launches sdist to check they get pruned on all systems
 
         # creating VCS directories with some files in them
         os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
@@ -99,6 +98,8 @@ def test_prune_file_list(self):
         self.write_file((self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
 
+        self.write_file((self.tmp_dir, 'somecode', '.nfs0001'), 'xxx')
+
         # now building a sdist
         dist, cmd = self.get_cmd()
 

From 6b0394e36c24c3fa6b341b2ce607de2981043ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 14:41:39 -0500
Subject: [PATCH 3665/8469] Remove code unneeded after f833e7ec4de1

---
 config.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config.py b/config.py
index 9d8b30ea30..1d327143be 100644
--- a/config.py
+++ b/config.py
@@ -47,11 +47,6 @@ def _store_pypirc(self, username, password):
             f.write(DEFAULT_PYPIRC % (username, password))
         finally:
             f.close()
-        try:
-            os.chmod(rc, 0600)
-        except OSError:
-            # should do something better here
-            pass
 
     def _read_pypirc(self):
         """Reads the .pypirc file."""

From 0bca979e33bd4dca758288e68912c9a763004a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 14:51:47 -0500
Subject: [PATCH 3666/8469] Create ~/.pypirc securely (#13512).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was a window between the write and the chmod where the user’s
password would be exposed, depending on default permissions.  Philip
Jenvey’s patch fixes it.
---
 config.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/config.py b/config.py
index 5b625f3f7d..1fd53346e9 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,6 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
-import sys
 from configparser import ConfigParser
 
 from distutils.cmd import Command
@@ -43,16 +42,8 @@ def _get_rc_file(self):
     def _store_pypirc(self, username, password):
         """Creates a default .pypirc file."""
         rc = self._get_rc_file()
-        f = open(rc, 'w')
-        try:
+        with os.fdopen(os.open(rc, os.O_CREAT | os.O_WRONLY, 0o600), 'w') as f:
             f.write(DEFAULT_PYPIRC % (username, password))
-        finally:
-            f.close()
-        try:
-            os.chmod(rc, 0o600)
-        except OSError:
-            # should do something better here
-            pass
 
     def _read_pypirc(self):
         """Reads the .pypirc file."""

From 40e66e5eb34a9d2dc8c4fe212f99fabdd48bca7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 22:26:57 -0500
Subject: [PATCH 3667/8469] Fix setup.py register failure with invalid rst in
 description (#13614).

Original patch by Julien Courteau and Pierre Paul Lefebvre.
---
 command/check.py       |  3 +++
 tests/test_register.py | 25 +++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/command/check.py b/command/check.py
index 4b64e458bc..152bf0de98 100644
--- a/command/check.py
+++ b/command/check.py
@@ -26,6 +26,9 @@ def __init__(self, source, report_level, halt_level, stream=None,
 
         def system_message(self, level, message, *children, **kwargs):
             self.messages.append((level, message, children, kwargs))
+            return nodes.system_message(message, level=level,
+                                        type=self.levels[level],
+                                        *children, **kwargs)
 
     HAS_DOCUTILS = True
 except ImportError:
diff --git a/tests/test_register.py b/tests/test_register.py
index aa9bc43c5c..9a0ff34c45 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -1,6 +1,5 @@
 # -*- encoding: utf8 -*-
 """Tests for distutils.command.register."""
-import sys
 import os
 import unittest
 import getpass
@@ -11,11 +10,14 @@
 
 from distutils.command import register as register_module
 from distutils.command.register import register
-from distutils.core import Distribution
 from distutils.errors import DistutilsSetupError
 
-from distutils.tests import support
-from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+try:
+    import docutils
+except ImportError:
+    docutils = None
 
 PYPIRC_NOPASSWORD = """\
 [distutils]
@@ -264,6 +266,21 @@ def test_strict(self):
         finally:
             del register_module.raw_input
 
+    @unittest.skipUnless(docutils is not None, 'needs docutils')
+    def test_register_invalid_long_description(self):
+        description = ':funkie:`str`'  # mimic Sphinx-specific markup
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': description}
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = True
+        inputs = RawInputs('2', 'tarek', 'tarek@ziade.org')
+        register_module.raw_input = inputs
+        self.addCleanup(delattr, register_module, 'raw_input')
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
         cmd = self._get_cmd()

From 47a3e44bf7c675ae1c222d594d557450f1f25b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 22:30:47 -0500
Subject: [PATCH 3668/8469] Use proper skip instead of reporting success in one
 distutils test

---
 tests/test_register.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/test_register.py b/tests/test_register.py
index 9a0ff34c45..4f34b18bd8 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -194,6 +194,7 @@ def test_password_reset(self):
         self.assertEqual(headers['Content-length'], '290')
         self.assertTrue('tarek' in req.data)
 
+    @unittest.skipUnless(docutils is not None, 'needs docutils')
     def test_strict(self):
         # testing the script option
         # when on, the register command stops if
@@ -206,13 +207,6 @@ def test_strict(self):
         cmd.strict = 1
         self.assertRaises(DistutilsSetupError, cmd.run)
 
-        # we don't test the reSt feature if docutils
-        # is not installed
-        try:
-            import docutils
-        except ImportError:
-            return
-
         # metadata are OK but long_description is broken
         metadata = {'url': 'xxx', 'author': 'xxx',
                     'author_email': u'éxéxé',

From 1bf87508cedffb239eb377928351b7d130a59e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <aeric@mtlpy.org>
Date: Sat, 8 Dec 2012 22:41:11 -0500
Subject: [PATCH 3669/8469] Fix setup.py register failure with invalid rst in
 description (#13614).

Original patch by Julien Courteau and Pierre Paul Lefebvre.
---
 command/check.py       |  3 +++
 tests/test_register.py | 34 +++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/command/check.py b/command/check.py
index b67c795308..22b9349dd6 100644
--- a/command/check.py
+++ b/command/check.py
@@ -23,6 +23,9 @@ def __init__(self, source, report_level, halt_level, stream=None,
 
         def system_message(self, level, message, *children, **kwargs):
             self.messages.append((level, message, children, kwargs))
+            return nodes.system_message(message, level=level,
+                                        type=self.levels[level],
+                                        *children, **kwargs)
 
     HAS_DOCUTILS = True
 except Exception:
diff --git a/tests/test_register.py b/tests/test_register.py
index 5863ae1422..a86b8606e4 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.register."""
-import sys
 import os
 import unittest
 import getpass
@@ -10,11 +9,14 @@
 
 from distutils.command import register as register_module
 from distutils.command.register import register
-from distutils.core import Distribution
 from distutils.errors import DistutilsSetupError
 
-from distutils.tests import support
-from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+from distutils.tests.test_config import PyPIRCCommandTestCase
+
+try:
+    import docutils
+except ImportError:
+    docutils = None
 
 PYPIRC_NOPASSWORD = """\
 [distutils]
@@ -193,6 +195,7 @@ def test_password_reset(self):
         self.assertEqual(headers['Content-length'], '290')
         self.assertTrue((b'tarek') in req.data)
 
+    @unittest.skipUnless(docutils is not None, 'needs docutils')
     def test_strict(self):
         # testing the script option
         # when on, the register command stops if
@@ -205,13 +208,6 @@ def test_strict(self):
         cmd.strict = 1
         self.assertRaises(DistutilsSetupError, cmd.run)
 
-        # we don't test the reSt feature if docutils
-        # is not installed
-        try:
-            import docutils
-        except ImportError:
-            return
-
         # metadata are OK but long_description is broken
         metadata = {'url': 'xxx', 'author': 'xxx',
                     'author_email': 'éxéxé',
@@ -265,6 +261,22 @@ def test_strict(self):
         finally:
             del register_module.input
 
+    @unittest.skipUnless(docutils is not None, 'needs docutils')
+    def test_register_invalid_long_description(self):
+        description = ':funkie:`str`'  # mimic Sphinx-specific markup
+        metadata = {'url': 'xxx', 'author': 'xxx',
+                    'author_email': 'xxx',
+                    'name': 'xxx', 'version': 'xxx',
+                    'long_description': description}
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = True
+        inputs = Inputs('2', 'tarek', 'tarek@ziade.org')
+        register_module.input = inputs
+        self.addCleanup(delattr, register_module, 'input')
+
+        self.assertRaises(DistutilsSetupError, cmd.run)
+
     def test_check_metadata_deprecated(self):
         # makes sure make_metadata is deprecated
         cmd = self._get_cmd()

From 20e832ab13ec7544d5fb014b25cb733e515119c7 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <djc.ochtman@kentyde.com>
Date: Mon, 17 Dec 2012 13:03:16 +0100
Subject: [PATCH 3670/8469] Minimize impact of namespace package support for
 CPython 3.3.

This solves a regression with an admittedly obscure use case involving
Mercurial's demandimport implementation, but it also seems like neater code.

--HG--
branch : distribute
extra : rebase_source : 10fb05d0391607140ced288a2c134f4463eddf5a
---
 pkg_resources.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index a5a10eb4b5..cf0ef7b439 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,12 +1325,8 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
-try:
-    # CPython >=3.3
+if sys.version_info[:2] >= 3.3:
     import _frozen_importlib
-except ImportError:
-    pass
-else:
     register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)
 
 

From 4607463e4a161e557f411b85eb193024b60c45ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Dec 2012 15:13:17 -0500
Subject: [PATCH 3671/8469] Resave with excess whitespace removed

--HG--
branch : distribute
extra : rebase_source : 5ed95bbd6e5742422dba402aa88707287be44d2e
---
 pkg_resources.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index cf0ef7b439..8f88db4df5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2116,7 +2116,7 @@ def _remove_md5_fragment(location):
 class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
-    
+
     def __init__(self,
         location=None, metadata=None, project_name=None, version=None,
         py_version=PY_MAJOR, platform=None, precedence = EGG_DIST
@@ -2455,7 +2455,7 @@ def _parsed_pkg_info(self):
             from email.parser import Parser
             self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
             return self._pkg_info
-    
+
     @property
     def _dep_map(self):
         try:
@@ -2466,7 +2466,7 @@ def _dep_map(self):
 
     def _preparse_requirement(self, requires_dist):
         """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
-        Split environment marker, add == prefix to version specifiers as 
+        Split environment marker, add == prefix to version specifiers as
         necessary, and remove parenthesis.
         """
         parts = requires_dist.split(';', 1) + ['']
@@ -2475,7 +2475,7 @@ def _preparse_requirement(self, requires_dist):
         distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
         distvers = distvers.replace('(', '').replace(')', '')
         return (distvers, mark)
-            
+
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
         from _markerlib import compile as compile_marker
@@ -2488,7 +2488,7 @@ def _compute_dependencies(self):
             parsed = parse_requirements(distvers).next()
             parsed.marker_fn = compile_marker(mark)
             reqs.append(parsed)
-            
+
         def reqs_for_extra(extra):
             for req in reqs:
                 if req.marker_fn(override={'extra':extra}):
@@ -2496,13 +2496,13 @@ def reqs_for_extra(extra):
 
         common = frozenset(reqs_for_extra(None))
         dm[None].extend(common)
-            
+
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             extra = safe_extra(extra.strip())
             dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
 
         return dm
-    
+
 
 _distributionImpl = {'.egg': Distribution,
                      '.egg-info': Distribution,

From 5854afbb1e30152e38dca1d9c70c1c4cb990e87d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Dec 2012 15:14:50 -0500
Subject: [PATCH 3672/8469] Fix issue with version detection

--HG--
branch : distribute
extra : rebase_source : 7e9dfc000ca44eaed1054d72144408530ec49741
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 8f88db4df5..5397808694 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,7 +1325,7 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
-if sys.version_info[:2] >= 3.3:
+if sys.version_info[:2] >= (3,3):
     import _frozen_importlib
     register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)
 

From cd1e33d5567d9f892f8145beb4b39eeeafa760b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 17 Dec 2012 15:15:53 -0500
Subject: [PATCH 3673/8469] Update changelog and add comment to registering of
 SourceFileLoader

--HG--
branch : distribute
extra : rebase_source : 2701f50b3375f9c2f2378ff22f274aade0b03107
---
 CHANGES.txt      | 3 +++
 pkg_resources.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d5a1792a83..6f6d9a8dc9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,9 @@ CHANGES
 * Fix 2 errors with Jython 2.5.
 * Fix 1 failure with Jython 2.5 and 2.7.
 * Disable workaround for Jython scripts on Linux systems.
+* Fix issue in pkg_resources where try/except around a platform-dependent
+  import would trigger hook load failures on Mercurial. See pull request 32
+  for details.
 
 ------
 0.6.32
diff --git a/pkg_resources.py b/pkg_resources.py
index 5397808694..717c1e6a1c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1325,6 +1325,9 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
+# Python 3.3 also supplies the SourceFileLoader.
+# Don't be tempted to do a try/except block here - it will break Mercurial
+#  hooks due to the demandimport functionality.
 if sys.version_info[:2] >= (3,3):
     import _frozen_importlib
     register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)

From 73e70541ad60633c5b373eeafab1cfba6e81606c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 18 Dec 2012 04:09:33 +0100
Subject: [PATCH 3674/8469] Clean handling of _frozen_importlib /
 importlib._bootstrap.

--HG--
branch : distribute
extra : rebase_source : 52fd775f637dfa40c401ef590708ffeaf47fd3a9
---
 pkg_resources.py | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 717c1e6a1c..85e008a2bd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -33,6 +33,12 @@
 from os import open as os_open
 from os.path import isdir, split
 
+# Avoid try/except due to potential problems with delayed import mechanisms.
+if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
+    import importlib._bootstrap as importlib_bootstrap
+else:
+    importlib_bootstrap = None
+
 # This marker is used to simplify the process that checks is the
 # setuptools package was installed by the Setuptools project
 # or by the Distribute project, in case Setuptools creates
@@ -1325,12 +1331,8 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
-# Python 3.3 also supplies the SourceFileLoader.
-# Don't be tempted to do a try/except block here - it will break Mercurial
-#  hooks due to the demandimport functionality.
-if sys.version_info[:2] >= (3,3):
-    import _frozen_importlib
-    register_loader_type(_frozen_importlib.SourceFileLoader, DefaultProvider)
+if importlib_bootstrap is not None:
+    register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider)
 
 
 class EmptyProvider(NullProvider):
@@ -1766,13 +1768,8 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(ImpWrapper,find_on_path)
 
-try:
-    # CPython >=3.3
-    import _frozen_importlib
-except ImportError:
-    pass
-else:
-    register_finder(_frozen_importlib.FileFinder, find_on_path)
+if importlib_bootstrap is not None:
+    register_finder(importlib_bootstrap.FileFinder, find_on_path)
 
 _declare_state('dict', _namespace_handlers={})
 _declare_state('dict', _namespace_packages={})
@@ -1873,13 +1870,8 @@ def file_ns_handler(importer, path_item, packageName, module):
 register_namespace_handler(ImpWrapper,file_ns_handler)
 register_namespace_handler(zipimport.zipimporter,file_ns_handler)
 
-try:
-    # CPython >=3.3
-    import _frozen_importlib
-except ImportError:
-    pass
-else:
-    register_namespace_handler(_frozen_importlib.FileFinder, file_ns_handler)
+if importlib_bootstrap is not None:
+    register_namespace_handler(importlib_bootstrap.FileFinder, file_ns_handler)
 
 
 def null_ns_handler(importer, path_item, packageName, module):

From c24868ba84f1b66d88d6b1f5a3f9190bcd2ca5c5 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 18 Dec 2012 21:14:22 +0200
Subject: [PATCH 3675/8469] Issue #16714: use 'raise' exceptions, don't
 'throw'.

Patch by Serhiy Storchaka.
---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 5fa1ca10d4..301d43d20c 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -104,7 +104,7 @@ class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
     def test_no_compiler(self):
-        # makes sure query_vcvarsall throws
+        # makes sure query_vcvarsall raises
         # a DistutilsPlatformError if the compiler
         # is not found
         from distutils.msvc9compiler import query_vcvarsall

From 75cf27d5a437064a0bfcf9f7e8ab7bc501260b61 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 18 Dec 2012 21:27:37 +0200
Subject: [PATCH 3676/8469] Issue #16714: use 'raise' exceptions, don't
 'throw'.

Patch by Serhiy Storchaka.
---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 73470729fd..2d94a1117e 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -104,7 +104,7 @@ class msvc9compilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
     def test_no_compiler(self):
-        # makes sure query_vcvarsall throws
+        # makes sure query_vcvarsall raises
         # a DistutilsPlatformError if the compiler
         # is not found
         from distutils.msvc9compiler import query_vcvarsall

From ca8d16926ecb9629ca53aa93327c0bdd2a144f5c Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 18 Dec 2012 22:02:39 +0200
Subject: [PATCH 3677/8469] Issue #16706: get rid of os.error

---
 core.py      |  2 +-
 dir_util.py  |  2 +-
 file_util.py | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core.py b/core.py
index 260332a2ac..a43d72588b 100644
--- a/core.py
+++ b/core.py
@@ -148,7 +148,7 @@ class found in 'cmdclass' is used in place of the default, which is
             dist.run_commands()
         except KeyboardInterrupt:
             raise SystemExit("interrupted")
-        except (IOError, os.error) as exc:
+        except (IOError, OSError) as exc:
             error = grok_environment_error(exc)
 
             if DEBUG:
diff --git a/dir_util.py b/dir_util.py
index 2826ff805d..7d1c78ab29 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -124,7 +124,7 @@ def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
               "cannot copy tree '%s': not a directory" % src)
     try:
         names = os.listdir(src)
-    except os.error as e:
+    except OSError as e:
         (errno, errstr) = e
         if dry_run:
             names = []
diff --git a/file_util.py b/file_util.py
index 9bdd14e42e..f6ed290f13 100644
--- a/file_util.py
+++ b/file_util.py
@@ -27,26 +27,26 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
     try:
         try:
             fsrc = open(src, 'rb')
-        except os.error as e:
+        except OSError as e:
             raise DistutilsFileError("could not open '%s': %s" % (src, e.strerror))
 
         if os.path.exists(dst):
             try:
                 os.unlink(dst)
-            except os.error as e:
+            except OSError as e:
                 raise DistutilsFileError(
                       "could not delete '%s': %s" % (dst, e.strerror))
 
         try:
             fdst = open(dst, 'wb')
-        except os.error as e:
+        except OSError as e:
             raise DistutilsFileError(
                   "could not create '%s': %s" % (dst, e.strerror))
 
         while True:
             try:
                 buf = fsrc.read(buffer_size)
-            except os.error as e:
+            except OSError as e:
                 raise DistutilsFileError(
                       "could not read from '%s': %s" % (src, e.strerror))
 
@@ -55,7 +55,7 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
 
             try:
                 fdst.write(buf)
-            except os.error as e:
+            except OSError as e:
                 raise DistutilsFileError(
                       "could not write to '%s': %s" % (dst, e.strerror))
     finally:
@@ -193,7 +193,7 @@ def move_file (src, dst,
     copy_it = False
     try:
         os.rename(src, dst)
-    except os.error as e:
+    except OSError as e:
         (num, msg) = e
         if num == errno.EXDEV:
             copy_it = True
@@ -205,11 +205,11 @@ def move_file (src, dst,
         copy_file(src, dst, verbose=verbose)
         try:
             os.unlink(src)
-        except os.error as e:
+        except OSError as e:
             (num, msg) = e
             try:
                 os.unlink(dst)
-            except os.error:
+            except OSError:
                 pass
             raise DistutilsFileError(
                   "couldn't move '%s' to '%s' by copy/delete: "

From 437e5b731feb5f5b0e7205ff94d15c07c32e83a4 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 18 Dec 2012 23:10:48 +0200
Subject: [PATCH 3678/8469] Issue #16717: get rid of socket.error, replace with
 OSError

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 8b36851d25..88990b2c6b 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -186,7 +186,7 @@ def upload_file(self, command, pyversion, filename):
             http.putheader('Authorization', auth)
             http.endheaders()
             http.send(body)
-        except socket.error as e:
+        except OSError as e:
             self.announce(str(e), log.ERROR)
             return
 

From 8b21b15c3cebd6cf09d1ceb8abf91f0ebbafa499 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 25 Dec 2012 16:47:37 +0200
Subject: [PATCH 3679/8469] Replace IOError with OSError (#16715)

---
 command/build_scripts.py | 2 +-
 core.py                  | 2 +-
 cygwinccompiler.py       | 2 +-
 dir_util.py              | 2 +-
 errors.py                | 4 ++--
 msvc9compiler.py         | 2 +-
 sysconfig.py             | 4 ++--
 util.py                  | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/command/build_scripts.py b/command/build_scripts.py
index 4b5b22ec20..90a8380a04 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -74,7 +74,7 @@ def copy_scripts(self):
             # script.
             try:
                 f = open(script, "rb")
-            except IOError:
+            except OSError:
                 if not self.dry_run:
                     raise
                 f = None
diff --git a/core.py b/core.py
index a43d72588b..91e5132934 100644
--- a/core.py
+++ b/core.py
@@ -148,7 +148,7 @@ class found in 'cmdclass' is used in place of the default, which is
             dist.run_commands()
         except KeyboardInterrupt:
             raise SystemExit("interrupted")
-        except (IOError, OSError) as exc:
+        except OSError as exc:
             error = grok_environment_error(exc)
 
             if DEBUG:
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 0bdd539c37..0c23ab1b7f 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -359,7 +359,7 @@ def check_config_h():
                 return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn
         finally:
             config_h.close()
-    except IOError as exc:
+    except OSError as exc:
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
diff --git a/dir_util.py b/dir_util.py
index 7d1c78ab29..2b35aa318e 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -198,7 +198,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
             abspath = os.path.abspath(cmd[1])
             if abspath in _path_created:
                 del _path_created[abspath]
-        except (IOError, OSError) as exc:
+        except OSError as exc:
             log.warn(grok_environment_error(
                     exc, "error removing %s: " % directory))
 
diff --git a/errors.py b/errors.py
index eb13c983e9..8b93059e19 100644
--- a/errors.py
+++ b/errors.py
@@ -35,8 +35,8 @@ class DistutilsArgError (DistutilsError):
 
 class DistutilsFileError (DistutilsError):
     """Any problems in the filesystem: expected file not found, etc.
-    Typically this is for problems that we detect before IOError or
-    OSError could be raised."""
+    Typically this is for problems that we detect before OSError
+    could be raised."""
     pass
 
 class DistutilsOptionError (DistutilsError):
diff --git a/msvc9compiler.py b/msvc9compiler.py
index b3f6ce10a8..9688f20019 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -729,7 +729,7 @@ def _remove_visual_c_ref(self, manifest_file):
                 return manifest_file
             finally:
                 manifest_f.close()
-        except IOError:
+        except OSError:
             pass
 
     # -- Miscellaneous methods -----------------------------------------
diff --git a/sysconfig.py b/sysconfig.py
index 3b6549fccc..91ed1a498c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -426,7 +426,7 @@ def _init_posix():
     try:
         filename = get_makefile_filename()
         parse_makefile(filename, g)
-    except IOError as msg:
+    except OSError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
             my_msg = my_msg + " (%s)" % msg.strerror
@@ -438,7 +438,7 @@ def _init_posix():
         filename = get_config_h_filename()
         with open(filename) as file:
             parse_config_h(file, g)
-    except IOError as msg:
+    except OSError as msg:
         my_msg = "invalid Python installation: unable to open %s" % filename
         if hasattr(msg, "strerror"):
             my_msg = my_msg + " (%s)" % msg.strerror
diff --git a/util.py b/util.py
index ba09ac450a..a2f9544519 100644
--- a/util.py
+++ b/util.py
@@ -207,8 +207,8 @@ def _subst (match, local_vars=local_vars):
 
 
 def grok_environment_error (exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError (IOError or
-    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
+    """Generate a useful error message from an OSError
+    exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
     does what it can to deal with exception objects that don't have a
     filename (which happens when the error is due to a two-file operation,
     such as 'rename()' or 'link()'.  Returns the error message as a string

From 5f6ebc0579291a7dd316e2a64466e688ef7bdb69 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 29 Dec 2012 05:27:56 +0100
Subject: [PATCH 3680/8469] Issue #341: Fix a ResourceWarning.

--HG--
branch : distribute
extra : rebase_source : 63fc40de80b49769d8463e04c1590ea4b1e751fc
---
 CHANGES.txt      | 1 +
 pkg_resources.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6f6d9a8dc9..c1c648dfac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ CHANGES
 * Fix issue in pkg_resources where try/except around a platform-dependent
   import would trigger hook load failures on Mercurial. See pull request 32
   for details.
+* Issue #341: Fix a ResourceWarning.
 
 ------
 0.6.32
diff --git a/pkg_resources.py b/pkg_resources.py
index 85e008a2bd..939a7c64aa 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1761,11 +1761,13 @@ def find_on_path(importer, path_item, only=False):
                     for dist in find_distributions(os.path.join(path_item, entry)):
                         yield dist
                 elif not only and lower.endswith('.egg-link'):
-                    for line in open(os.path.join(path_item, entry)):
+                    entry_file = open(os.path.join(path_item, entry))
+                    for line in entry_file:
                         if not line.strip(): continue
                         for item in find_distributions(os.path.join(path_item,line.rstrip())):
                             yield item
                         break
+                    entry_file.close()
 register_finder(ImpWrapper,find_on_path)
 
 if importlib_bootstrap is not None:

From 721559fe76a1cda3de639ee2aaa446595169d26b Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 29 Dec 2012 06:23:09 +0100
Subject: [PATCH 3681/8469] Fix some ResourceWarnings.

--HG--
branch : distribute
extra : rebase_source : 31ac3f0135d8cfe0fabc274f1649d1c99eba2868
---
 distribute_setup.py                     |  9 ++++++--
 setuptools/command/develop.py           |  4 +++-
 setuptools/command/easy_install.py      |  2 +-
 setuptools/command/upload.py            |  5 +++--
 setuptools/command/upload_docs.py       |  4 +++-
 setuptools/tests/doctest.py             |  8 +++++--
 setuptools/tests/test_develop.py        |  8 +++++--
 setuptools/tests/win_script_wrapper.txt | 28 ++++++++++++++++++-------
 8 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/distribute_setup.py b/distribute_setup.py
index f7954e84a9..23503c640e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -239,7 +239,9 @@ def violation(*args):
 
 def _patch_file(path, content):
     """Will backup the file then patch it"""
-    existing_content = open(path).read()
+    f = open(path)
+    existing_content = f.read()
+    f.close()
     if existing_content == content:
         # already patched
         log.warn('Already patched.')
@@ -257,7 +259,10 @@ def _patch_file(path, content):
 
 
 def _same_content(path, content):
-    return open(path).read() == content
+    f = open(path)
+    existing_content = f.read()
+    f.close()
+    return existing_content == content
 
 
 def _rename_path(path):
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 709e349c73..1d500040d0 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -132,7 +132,9 @@ def install_for_development(self):
     def uninstall_link(self):
         if os.path.exists(self.egg_link):
             log.info("Removing %s (link to %s)", self.egg_link, self.egg_base)
-            contents = [line.rstrip() for line in open(self.egg_link)]
+            egg_link_file = open(self.egg_link)
+            contents = [line.rstrip() for line in egg_link_file]
+            egg_link_file.close()
             if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
                 log.warn("Link points to %s: uninstall aborted", contents)
                 return
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index cb9111731a..0d72f75843 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -491,7 +491,7 @@ def check_pth_processing(self):
             self.cant_write_to_target()
         else:
             try:
-                f.write("import os;open(%r,'w').write('OK')\n" % (ok_file,))
+                f.write("import os; f = open(%r, 'w'); f.write('OK'); f.close()\n" % (ok_file,))
                 f.close(); f=None
                 executable = sys.executable
                 if os.name=='nt':
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 9f9366b5f1..21b9615c42 100755
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -109,8 +109,9 @@ def upload_file(self, command, pyversion, filename):
         data['comment'] = comment
 
         if self.sign:
-            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc").read())
+            asc_file = open(filename + ".asc")
+            data['gpg_signature'] = (os.path.basename(filename) + ".asc", asc_file.read())
+            asc_file.close()
 
         # set up the authentication
         auth = "Basic " + base64.encodestring(self.username + ":" + self.password).strip()
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 98fb723337..1d5a744512 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -105,7 +105,9 @@ def run(self):
             shutil.rmtree(tmp_dir)
 
     def upload_file(self, filename):
-        content = open(filename, 'rb').read()
+        f = open(filename, 'rb')
+        content = f.read()
+        f.close()
         meta = self.distribution.metadata
         data = {
             ':action': 'doc_upload',
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index be399a9d22..cc1e06c398 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -1968,7 +1968,9 @@ class doctest.Tester, then merges the results into (or creates)
         runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
 
     # Read the file, convert it to a test, and run it.
-    s = open(filename).read()
+    f = open(filename)
+    s = f.read()
+    f.close()
     test = parser.get_doctest(s, globs, name, filename, 0)
     runner.run(test)
 
@@ -2353,7 +2355,9 @@ def DocFileTest(path, module_relative=True, package=None,
 
     # Find the file and read it.
     name = os.path.basename(path)
-    doc = open(path).read()
+    f = open(path)
+    doc = f.read()
+    f.close()
 
     # Convert it to a test, and wrap it in a DocFileCase.
     test = parser.get_doctest(doc, globs, name, path, 0)
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 3e071dade9..315058c575 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -89,8 +89,12 @@ def test_develop(self):
         self.assertEqual(content, ['easy-install.pth', 'foo.egg-link'])
 
         # Check that we are using the right code.
-        path = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt').read().split()[0].strip()
-        init = open(os.path.join(path, 'foo', '__init__.py'), 'rt').read().strip()
+        egg_link_file = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt')
+        path = egg_link_file.read().split()[0].strip()
+        egg_link_file.close()
+        init_file = open(os.path.join(path, 'foo', '__init__.py'), 'rt')
+        init = init_file.read().strip()
+        init_file.close()
         if sys.version < "3":
             self.assertEqual(init, 'print "foo"')
         else:
diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 2e1bff7434..9f7c81d6b7 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -16,7 +16,8 @@ Let's create a simple script, foo-script.py:
     >>> import os, sys, tempfile
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
+    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
+    >>> f.write(
     ... """#!%(python_exe)s
     ... import sys
     ... input = repr(sys.stdin.read())
@@ -26,6 +27,7 @@ Let's create a simple script, foo-script.py:
     ... if __debug__:
     ...     print 'non-optimized'
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+    >>> f.close()
 
 Note that the script starts with a Unix-style '#!' line saying which
 Python executable to run.  The wrapper will use this to find the
@@ -34,9 +36,11 @@ correct Python executable.
 We'll also copy cli.exe to the sample-directory with the name foo.exe:
 
     >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'foo.exe'), 'wb').write(
+    >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
+    >>> f.write(
     ...     pkg_resources.resource_string('setuptools', 'cli.exe')
     ...     )
+    >>> f.close()
 
 When the copy of cli.exe, foo.exe in this example, runs, it examines
 the path name it was run with and computes a Python script path name
@@ -77,7 +81,8 @@ to start the interactive interpreter.  You can combine multiple
 options as usual. For example, to run in optimized mode and
 enter the interpreter after running the script, you could use -Oi:
 
-    >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
+    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
+    >>> f.write(
     ... """#!%(python_exe)s  -Oi  
     ... import sys
     ... input = repr(sys.stdin.read())
@@ -88,6 +93,7 @@ enter the interpreter after running the script, you could use -Oi:
     ...     print 'non-optimized'
     ... sys.ps1 = '---'
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+    >>> f.close()
 
     >>> input, output = os.popen4(nt_quote_arg(os.path.join(sample_directory, 'foo.exe')))
     >>> input.close()
@@ -105,18 +111,24 @@ Now let's test the GUI version with the simple scipt, bar-script.py:
     >>> import os, sys, tempfile
     >>> from setuptools.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
-    >>> open(os.path.join(sample_directory, 'bar-script.pyw'), 'w').write(
+    >>> f = open(os.path.join(sample_directory, 'bar-script.pyw'), 'w')
+    >>> f.write(
     ... """#!%(python_exe)s
     ... import sys
-    ... open(sys.argv[1], 'wb').write(repr(sys.argv[2]))
+    ... f = open(sys.argv[1], 'wb')
+    ... f.write(repr(sys.argv[2]))
+    ... f.close()
     ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
+    >>> f.close()
 
 We'll also copy gui.exe to the sample-directory with the name bar.exe:
 
     >>> import pkg_resources
-    >>> open(os.path.join(sample_directory, 'bar.exe'), 'wb').write(
+    >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
+    >>> f.write(
     ...     pkg_resources.resource_string('setuptools', 'gui.exe')
     ...     )
+    >>> f.close()
 
 Finally, we'll run the script and check the result:
 
@@ -126,8 +138,10 @@ Finally, we'll run the script and check the result:
     >>> input.close()
     >>> print output.read()
     <BLANKLINE>
-    >>> print open(os.path.join(sample_directory, 'test_output.txt'), 'rb').read()
+    >>> f = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
+    >>> print f.read()
     'Test Argument'
+    >>> f.close()
 
 
 We're done with the sample_directory:

From d73c8722858cc7aaca77a22d0e84795bc6262420 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sat, 29 Dec 2012 12:54:21 -0500
Subject: [PATCH 3682/8469] Harden fix for issue #341 against exceptins.

--HG--
branch : distribute
extra : rebase_source : 5cb7f22523a741e678b03a699f0ef09f09ed8070
---
 pkg_resources.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 939a7c64aa..cb8d3dcf36 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1762,12 +1762,14 @@ def find_on_path(importer, path_item, only=False):
                         yield dist
                 elif not only and lower.endswith('.egg-link'):
                     entry_file = open(os.path.join(path_item, entry))
-                    for line in entry_file:
-                        if not line.strip(): continue
-                        for item in find_distributions(os.path.join(path_item,line.rstrip())):
-                            yield item
-                        break
-                    entry_file.close()
+                    try:
+                        for line in entry_file:
+                            if not line.strip(): continue
+                            for item in find_distributions(os.path.join(path_item,line.rstrip())):
+                                yield item
+                            break
+                    finally:
+                        entry_file.close()
 register_finder(ImpWrapper,find_on_path)
 
 if importlib_bootstrap is not None:

From 2910bb06b9521aaf552f2550d462ed14e3f58ec2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2012 16:31:16 -0500
Subject: [PATCH 3683/8469] Update changelog

--HG--
branch : distribute
extra : rebase_source : 44b7e6234f791c1a1182f202bc429d40922074ee
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d5a1792a83..7c605c7ee4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ CHANGES
 * Fix 2 errors with Jython 2.5.
 * Fix 1 failure with Jython 2.5 and 2.7.
 * Disable workaround for Jython scripts on Linux systems.
+* Issue #336: `setup.py` no longer masks failure exit code when tests fail.
 
 ------
 0.6.32

From 76db48d2fc73a6b4ba6af346c893e77e1183338e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2012 17:09:50 -0500
Subject: [PATCH 3684/8469] Added tag 0.6.33 for changeset 6acac3919ae9

--HG--
branch : distribute
extra : rebase_source : 3628e4db31b5aaac331e357428e9d9b30ae30e86
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0e4cfac3b1..32fb831c52 100644
--- a/.hgtags
+++ b/.hgtags
@@ -41,3 +41,4 @@ fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30
 17bc972d67edd96c7748061910172e1200a73efe 0.6.31
 b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
+6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33

From 2a3d28cf5fed225bfe2c3f95dfbf61c2d23fd6c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2012 17:10:54 -0500
Subject: [PATCH 3685/8469] Bumped to 0.6.34 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 4455898775fbb40a5a331909c61d45622a9ea97a
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index a364a06231..0603ba47e6 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.33.tar.gz
-    $ tar -xzvf distribute-0.6.33.tar.gz
-    $ cd distribute-0.6.33
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz
+    $ tar -xzvf distribute-0.6.34.tar.gz
+    $ cd distribute-0.6.34
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 23503c640e..a1cc2a1a9f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.33"
+DEFAULT_VERSION = "0.6.34"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index af26376e25..15226651f2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.33'
+version = '0.6.34'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.33'
+release = '0.6.34'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 666e35064c..d3746054bb 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.33'
+VERSION = '0.6.34'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index d2c1ba2c96..a1e9ca91a7 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.33"
+VERSION = "0.6.34"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 2f8c8bd5de518bd1b42cb99f1a6644543520154b Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 30 Dec 2012 23:45:44 -0500
Subject: [PATCH 3686/8469] Close issue #341:  0.6.33 fails to build under
 python 2.4

--HG--
branch : distribute
extra : rebase_source : 065aad71143a72cb6abd3064e0e947fc4568422f
---
 CHANGES.txt      |  6 ++++++
 pkg_resources.py | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ebc2bdcc55..1b24810806 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----------
+Unreleased
+----------
+
++ Issue #341: 0.6.33 fails to build under python 2.4
+
 ------
 0.6.33
 ------
diff --git a/pkg_resources.py b/pkg_resources.py
index cb8d3dcf36..49aab6757f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1763,13 +1763,14 @@ def find_on_path(importer, path_item, only=False):
                 elif not only and lower.endswith('.egg-link'):
                     entry_file = open(os.path.join(path_item, entry))
                     try:
-                        for line in entry_file:
-                            if not line.strip(): continue
-                            for item in find_distributions(os.path.join(path_item,line.rstrip())):
-                                yield item
-                            break
+                        entry_lines = entry_file.readlines()
                     finally:
                         entry_file.close()
+                    for line in entry_lines:
+                        if not line.strip(): continue
+                        for item in find_distributions(os.path.join(path_item,line.rstrip())):
+                            yield item
+                        break
 register_finder(ImpWrapper,find_on_path)
 
 if importlib_bootstrap is not None:

From 3c251bf338c72f65c83a3b51ea709c738c460722 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Dec 2012 10:26:46 -0500
Subject: [PATCH 3687/8469] Added tag 0.6.34 for changeset 23c310bf4ae8

--HG--
branch : distribute
extra : rebase_source : 6ba1380f0a2496882d7eb15ab82e7660b755398b
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 32fb831c52..9bd19948ca 100644
--- a/.hgtags
+++ b/.hgtags
@@ -42,3 +42,4 @@ fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 17bc972d67edd96c7748061910172e1200a73efe 0.6.31
 b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33
+23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34

From 9e26a920ffd60595ed80f1c4e6f4bdd49507c0f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Dec 2012 10:27:51 -0500
Subject: [PATCH 3688/8469] Bumped to 0.6.35 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 77f34fdeebd01224a2d399855f0674108133b3e6
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 0603ba47e6..ea13a9bc43 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz
-    $ tar -xzvf distribute-0.6.34.tar.gz
-    $ cd distribute-0.6.34
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz
+    $ tar -xzvf distribute-0.6.35.tar.gz
+    $ cd distribute-0.6.35
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index a1cc2a1a9f..a447f7ec8f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.34"
+DEFAULT_VERSION = "0.6.35"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 15226651f2..98380ba9d6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.34'
+version = '0.6.35'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.34'
+release = '0.6.35'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index d3746054bb..983703047f 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.34'
+VERSION = '0.6.35'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index a1e9ca91a7..81de4e3d67 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.34"
+VERSION = "0.6.35"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 22869cb64b8779feca1a0dfe3d03d4bcce7af992 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 1 Jan 2013 11:04:25 +0100
Subject: [PATCH 3689/8469] Fix CHANGES.txt.

--HG--
branch : distribute
extra : rebase_source : f3de640431934e28140f322bab420a3f51361440
---
 CHANGES.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1b24810806..623bc4b79f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,15 @@
 CHANGES
 =======
 
-----------
-Unreleased
-----------
+------
+0.6.35
+------
+
+------
+0.6.34
+------
 
-+ Issue #341: 0.6.33 fails to build under python 2.4
+* Issue #341: 0.6.33 fails to build under Python 2.4.
 
 ------
 0.6.33

From 5f738c54a3de45e1f44321eb8e27cfe10ce97e90 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 1 Jan 2013 11:05:11 +0100
Subject: [PATCH 3690/8469] Fix parsing of CHANGES.txt.

--HG--
branch : distribute
extra : rebase_source : f9b735b0478ac8a6aaf371882dd5a5032bef751e
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 81de4e3d67..cecb9e9fda 100755
--- a/setup.py
+++ b/setup.py
@@ -136,7 +136,7 @@ def _being_installed():
 # return contents of reStructureText file with linked issue references
 def _linkified(rst_path):
     bitroot = 'http://bitbucket.org/tarek/distribute'
-    revision = re.compile(r'\b(issue\s*#?\d+)\b', re.M | re.I)
+    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
 
     rst_file = open(rst_path)
     rst_content = rst_file.read()

From 2e7e993256b1f737cd3ddec9a1cfc205455b2be2 Mon Sep 17 00:00:00 2001
From: "doko@python.org" <doko@python.org>
Date: Fri, 25 Jan 2013 14:33:33 +0100
Subject: [PATCH 3691/8469] - Issue #15484: Fix _PYTHON_PROJECT_BASE for srcdir
 != builddir builds;   use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.

---
 sysconfig.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 317640ca89..d125e0b44a 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -24,7 +24,11 @@
 # Path to the base directory of the project. On Windows the binary may
 # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
 # it'll live in project/PCbuild/amd64.
-project_base = os.path.dirname(os.path.abspath(sys.executable))
+# set for cross builds
+if "_PYTHON_PROJECT_BASE" in os.environ:
+    project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])
+else:
+    project_base = os.path.dirname(os.path.abspath(sys.executable))
 if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
 # PC/VS7.1
@@ -98,7 +102,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             # the build directory may not be the source directory, we
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
-            base = _sys_home or os.path.dirname(os.path.abspath(sys.executable))
+            base = _sys_home or project_base
             if plat_specific:
                 return base
             if _sys_home:
@@ -251,8 +255,7 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return os.path.join(_sys_home or os.path.dirname(sys.executable),
-                                                         "Makefile")
+        return os.path.join(_sys_home or project_base, "Makefile")
     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
     return os.path.join(lib_dir, config_file, 'Makefile')
@@ -555,7 +558,7 @@ def get_config_vars(*args):
         # testing, for example, we might be running a non-installed python
         # from a different directory.
         if python_build and os.name == "posix":
-            base = os.path.dirname(os.path.abspath(sys.executable))
+            base = project_base
             if (not os.path.isabs(_config_vars['srcdir']) and
                 base != os.getcwd()):
                 # srcdir is relative and we are not in the same directory

From 0ad57ca49e9ca519a62ae5da00d2217ba91f464e Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 27 Jan 2013 19:45:49 +0200
Subject: [PATCH 3692/8469] - Issue #17041: Fix testing when Python is
 configured with the   --without-doc-strings option.

---
 tests/test_build_ext.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b71cc983be..f6a503b538 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -77,8 +77,9 @@ def test_build_ext(self):
         self.assertEqual(xx.foo(2, 5), 7)
         self.assertEqual(xx.foo(13,15), 28)
         self.assertEqual(xx.new().demo(), None)
-        doc = 'This is a template module just for instruction.'
-        self.assertEqual(xx.__doc__, doc)
+        if test_support.HAVE_DOCSTRINGS:
+            doc = 'This is a template module just for instruction.'
+            self.assertEqual(xx.__doc__, doc)
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 

From 28dd71b74f49f8abf4f65fb05bb29fbc00f4e574 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 27 Jan 2013 19:47:45 +0200
Subject: [PATCH 3693/8469] Issue #17041: Fix testing when Python is configured
 with the --without-doc-strings.

---
 tests/test_build_ext.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 090eacfb2c..065a6a21c9 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -73,8 +73,9 @@ def test_build_ext(self):
         self.assertEqual(xx.foo(2, 5), 7)
         self.assertEqual(xx.foo(13,15), 28)
         self.assertEqual(xx.new().demo(), None)
-        doc = 'This is a template module just for instruction.'
-        self.assertEqual(xx.__doc__, doc)
+        if support.HAVE_DOCSTRINGS:
+            doc = 'This is a template module just for instruction.'
+            self.assertEqual(xx.__doc__, doc)
         self.assertTrue(isinstance(xx.Null(), xx.Null))
         self.assertTrue(isinstance(xx.Str(), xx.Str))
 

From 30f6c6e37e64b06ccca07acb169bf517687ba2ec Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Thu, 31 Jan 2013 01:24:55 -0800
Subject: [PATCH 3694/8469] Issue #13590: OS X Xcode 4 - improve support for
 universal extension modules     In particular, fix extension module build
 failures when trying to use     32-bit-only installer Pythons on systems with
 Xcode 4 (currently     OS X 10.8, 10.7, and optionally 10.6).     * Backport
 3.3.0 fixes to 2.7 branch (for release in 2.7.4)     * Since Xcode 4 removes
 ppc support, extension module builds now       check for ppc compiler support
 and by default remove ppc and       ppc64 archs when they are not available. 
    * Extension module builds now revert to using system installed      
 headers and libs (/usr and /System/Library) if the SDK used       to build
 the interpreter is not installed or has moved.     * Try to avoid building
 extension modules with deprecated       and problematic Apple llvm-gcc
 compiler.  If original compiler       is not available, use clang instead by
 default.

---
 sysconfig.py            | 111 ++++++++--------------------------------
 tests/test_sysconfig.py |  29 +++++++++++
 unixccompiler.py        |  70 +++----------------------
 util.py                 |  92 ++-------------------------------
 4 files changed, 60 insertions(+), 242 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 4b193b2703..daa4dc77ca 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -141,7 +141,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
-_USE_CLANG = None
+
 
 def customize_compiler(compiler):
     """Do any platform-specific customization of a CCompiler instance.
@@ -150,6 +150,21 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
+        if sys.platform == "darwin":
+            # Perform first-time customization of compiler-related
+            # config vars on OS X now that we know we need a compiler.
+            # This is primarily to support Pythons from binary
+            # installers.  The kind and paths to build tools on
+            # the user system may vary significantly from the system
+            # that Python itself was built on.  Also the user OS
+            # version and build tools may not support the same set
+            # of CPU architectures for universal builds.
+            global _config_vars
+            if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''):
+                import _osx_support
+                _osx_support.customize_compiler(_config_vars)
+                _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+
         (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO', 'AR',
@@ -157,36 +172,7 @@ def customize_compiler(compiler):
 
         newcc = None
         if 'CC' in os.environ:
-            newcc = os.environ['CC']
-        elif sys.platform == 'darwin' and cc == 'gcc-4.2':
-            # Issue #13590:
-            #       Since Apple removed gcc-4.2 in Xcode 4.2, we can no
-            #       longer assume it is available for extension module builds.
-            #       If Python was built with gcc-4.2, check first to see if
-            #       it is available on this system; if not, try to use clang
-            #       instead unless the caller explicitly set CC.
-            global _USE_CLANG
-            if _USE_CLANG is None:
-                from distutils import log
-                from subprocess import Popen, PIPE
-                p = Popen("! type gcc-4.2 && type clang && exit 2",
-                                shell=True, stdout=PIPE, stderr=PIPE)
-                p.wait()
-                if p.returncode == 2:
-                    _USE_CLANG = True
-                    log.warn("gcc-4.2 not found, using clang instead")
-                else:
-                    _USE_CLANG = False
-            if _USE_CLANG:
-                newcc = 'clang'
-        if newcc:
-            # On OS X, if CC is overridden, use that as the default
-            #       command for LDSHARED as well
-            if (sys.platform == 'darwin'
-                    and 'LDSHARED' not in os.environ
-                    and ldshared.startswith(cc)):
-                ldshared = newcc + ldshared[len(cc):]
-            cc = newcc
+            cc = os.environ['CC']
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:
@@ -518,66 +504,11 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        # OS X platforms require special customization to handle
+        # multi-architecture, multi-os-version installers
         if sys.platform == 'darwin':
-            kernel_version = os.uname()[2] # Kernel version (8.4.3)
-            major_version = int(kernel_version.split('.')[0])
-
-            if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
-                # are in CFLAGS or LDFLAGS and remove them if they are.
-                # This is needed when building extensions on a 10.3 system
-                # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                    flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-                    _config_vars[key] = flags
-
-            else:
-
-                # Allow the user to override the architecture flags using
-                # an environment variable.
-                # NOTE: This name was introduced by Apple in OSX 10.5 and
-                # is used by several scripting languages distributed with
-                # that OS release.
-
-                if 'ARCHFLAGS' in os.environ:
-                    arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                        flags = _config_vars[key]
-                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                        flags = flags + ' ' + arch
-                        _config_vars[key] = flags
-
-                # If we're on OSX 10.5 or later and the user tries to
-                # compiles an extension using an SDK that is not present
-                # on the current machine it is better to not use an SDK
-                # than to fail.
-                #
-                # The major usecase for this is users using a Python.org
-                # binary installer  on OSX 10.6: that installer uses
-                # the 10.4u SDK, but that SDK is not installed by default
-                # when you install Xcode.
-                #
-                m = re.search('-isysroot\s+(\S+)', _config_vars['CFLAGS'])
-                if m is not None:
-                    sdk = m.group(1)
-                    if not os.path.exists(sdk):
-                        for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                             # a number of derived variables. These need to be
-                             # patched up as well.
-                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                            flags = _config_vars[key]
-                            flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
-                            _config_vars[key] = flags
+            import _osx_support
+            _osx_support.customize_config_vars(_config_vars)
 
     if args:
         vals = []
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 49570c4ce5..c064d2b0f7 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -72,6 +72,35 @@ def test_parse_makefile_literal_dollar(self):
                              'OTHER': 'foo'})
 
 
+    def test_sysconfig_module(self):
+        import sysconfig as global_sysconfig
+        self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
+        self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
+
+    @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),'compiler flags customized')
+    def test_sysconfig_compiler_vars(self):
+        # On OS X, binary installers support extension module building on
+        # various levels of the operating system with differing Xcode
+        # configurations.  This requires customization of some of the
+        # compiler configuration directives to suit the environment on
+        # the installed machine.  Some of these customizations may require
+        # running external programs and, so, are deferred until needed by
+        # the first extension module build.  With Python 3.3, only
+        # the Distutils version of sysconfig is used for extension module
+        # builds, which happens earlier in the Distutils tests.  This may
+        # cause the following tests to fail since no tests have caused
+        # the global version of sysconfig to call the customization yet.
+        # The solution for now is to simply skip this test in this case.
+        # The longer-term solution is to only have one version of sysconfig.
+
+        import sysconfig as global_sysconfig
+        if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
+            return
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
+        self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
+
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SysconfigTestCase))
diff --git a/unixccompiler.py b/unixccompiler.py
index c49ac9ba91..2aa1cb1d27 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -26,6 +26,9 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
+if sys.platform == 'darwin':
+    import _osx_support
+
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -41,68 +44,6 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
-def _darwin_compiler_fixup(compiler_so, cc_args):
-    """
-    This function will strip '-isysroot PATH' and '-arch ARCH' from the
-    compile flags if the user has specified one them in extra_compile_flags.
-
-    This is needed because '-arch ARCH' adds another architecture to the
-    build, without a way to remove an architecture. Furthermore GCC will
-    barf if multiple '-isysroot' arguments are present.
-    """
-    stripArch = stripSysroot = 0
-
-    compiler_so = list(compiler_so)
-    kernel_version = os.uname()[2] # 8.4.3
-    major_version = int(kernel_version.split('.')[0])
-
-    if major_version < 8:
-        # OSX before 10.4.0, these don't support -arch and -isysroot at
-        # all.
-        stripArch = stripSysroot = True
-    else:
-        stripArch = '-arch' in cc_args
-        stripSysroot = '-isysroot' in cc_args
-
-    if stripArch or 'ARCHFLAGS' in os.environ:
-        while 1:
-            try:
-                index = compiler_so.index('-arch')
-                # Strip this argument and the next one:
-                del compiler_so[index:index+2]
-            except ValueError:
-                break
-
-    if 'ARCHFLAGS' in os.environ and not stripArch:
-        # User specified different -arch flags in the environ,
-        # see also distutils.sysconfig
-        compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
-
-    if stripSysroot:
-        try:
-            index = compiler_so.index('-isysroot')
-            # Strip this argument and the next one:
-            del compiler_so[index:index+2]
-        except ValueError:
-            pass
-
-    # Check if the SDK that is used during compilation actually exists,
-    # the universal build requires the usage of a universal SDK and not all
-    # users have that installed by default.
-    sysroot = None
-    if '-isysroot' in cc_args:
-        idx = cc_args.index('-isysroot')
-        sysroot = cc_args[idx+1]
-    elif '-isysroot' in compiler_so:
-        idx = compiler_so.index('-isysroot')
-        sysroot = compiler_so[idx+1]
-
-    if sysroot and not os.path.isdir(sysroot):
-        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
-                sysroot)
-        log.warn("Please check your Xcode installation")
-
-    return compiler_so
 
 class UnixCCompiler(CCompiler):
 
@@ -172,7 +113,8 @@ def preprocess(self, source,
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
         if sys.platform == 'darwin':
-            compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+            compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                    cc_args + extra_postargs)
         try:
             self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
@@ -251,7 +193,7 @@ def link(self, target_desc, objects,
                     linker[i] = self.compiler_cxx[i]
 
                 if sys.platform == 'darwin':
-                    linker = _darwin_compiler_fixup(linker, ld_args)
+                    linker = _osx_support.compiler_fixup(linker, ld_args)
 
                 self.spawn(linker + ld_args)
             except DistutilsExecError, msg:
diff --git a/util.py b/util.py
index 0c24e8ca3e..5279411294 100644
--- a/util.py
+++ b/util.py
@@ -93,94 +93,10 @@ def get_platform ():
         if m:
             release = m.group()
     elif osname[:6] == "darwin":
-        #
-        # For our purposes, we'll assume that the system version from
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
-        # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were
-        # MACOSX_DEPLOYMENT_TARGET.
-        from distutils.sysconfig import get_config_vars
-        cfgvars = get_config_vars()
-
-        macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
-
-        if 1:
-            # Always calculate the release of the running machine,
-            # needed to determine if we can build fat binaries or not.
-
-            macrelease = macver
-            # Get the system version. Reading this plist is a documented
-            # way to get the system version (see the documentation for
-            # the Gestalt Manager)
-            try:
-                f = open('/System/Library/CoreServices/SystemVersion.plist')
-            except IOError:
-                # We're on a plain darwin box, fall back to the default
-                # behaviour.
-                pass
-            else:
-                try:
-                    m = re.search(
-                            r'<key>ProductUserVisibleVersion</key>\s*' +
-                            r'<string>(.*?)</string>', f.read())
-                    if m is not None:
-                        macrelease = '.'.join(m.group(1).split('.')[:2])
-                    # else: fall back to the default behaviour
-                finally:
-                    f.close()
-
-        if not macver:
-            macver = macrelease
-
-        if macver:
-            from distutils.sysconfig import get_config_vars
-            release = macver
-            osname = "macosx"
-
-            if (macrelease + '.') >= '10.4.' and \
-                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
-                # The universal build will build fat binaries, but not on
-                # systems before 10.4
-                #
-                # Try to detect 4-way universal builds, those have machine-type
-                # 'universal' instead of 'fat'.
-
-                machine = 'fat'
-                cflags = get_config_vars().get('CFLAGS')
-
-                archs = re.findall('-arch\s+(\S+)', cflags)
-                archs = tuple(sorted(set(archs)))
-
-                if len(archs) == 1:
-                    machine = archs[0]
-                elif archs == ('i386', 'ppc'):
-                    machine = 'fat'
-                elif archs == ('i386', 'x86_64'):
-                    machine = 'intel'
-                elif archs == ('i386', 'ppc', 'x86_64'):
-                    machine = 'fat3'
-                elif archs == ('ppc64', 'x86_64'):
-                    machine = 'fat64'
-                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
-                    machine = 'universal'
-                else:
-                    raise ValueError(
-                       "Don't know machine value for archs=%r"%(archs,))
-
-            elif machine == 'i386':
-                # On OSX the machine type returned by uname is always the
-                # 32-bit variant, even if the executable architecture is
-                # the 64-bit variant
-                if sys.maxint >= 2**32:
-                    machine = 'x86_64'
-
-            elif machine in ('PowerPC', 'Power_Macintosh'):
-                # Pick a sane name for the PPC architecture.
-                machine = 'ppc'
-
-                # See 'i386' case
-                if sys.maxint >= 2**32:
-                    machine = 'ppc64'
+        import _osx_support, distutils.sysconfig
+        osname, release, machine = _osx_support.get_platform_osx(
+                                        distutils.sysconfig.get_config_vars(),
+                                        osname, release, machine)
 
     return "%s-%s-%s" % (osname, release, machine)
 

From 2374a4ccde18f6e6f3f20a7279dc0b1a7a2cf89d Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Thu, 31 Jan 2013 01:28:23 -0800
Subject: [PATCH 3695/8469] Issue #13590: OS X Xcode 4 - improve support for
 universal extension modules     In particular, fix extension module build
 failures when trying to use     32-bit-only installer Pythons on systems with
 Xcode 4 (currently     OS X 10.8, 10.7, and optionally 10.6).     * Backport
 3.3.0 fixes to 3.2 branch (for release in 3.2.4)     * Since Xcode 4 removes
 ppc support, extension module builds now       check for ppc compiler support
 and by default remove ppc and       ppc64 archs when they are not available. 
    * Extension module builds now revert to using system installed      
 headers and libs (/usr and /System/Library) if the SDK used       to build
 the interpreter is not installed or has moved.     * Try to avoid building
 extension modules with deprecated       and problematic Apple llvm-gcc
 compiler.  If original compiler       is not available, use clang instead by
 default.

---
 sysconfig.py            | 88 ++++++++++-----------------------------
 tests/test_sysconfig.py | 22 +++++++++-
 tests/test_util.py      |  9 ++++
 unixccompiler.py        | 70 +++----------------------------
 util.py                 | 92 ++---------------------------------------
 5 files changed, 61 insertions(+), 220 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 16902ca920..b6007a904f 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,7 +146,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             "I don't know where Python installs its library "
             "on platform '%s'" % os.name)
 
-_USE_CLANG = None
+
 
 def customize_compiler(compiler):
     """Do any platform-specific customization of a CCompiler instance.
@@ -155,42 +155,28 @@ def customize_compiler(compiler):
     varies across Unices and is stored in Python's Makefile.
     """
     if compiler.compiler_type == "unix":
+        if sys.platform == "darwin":
+            # Perform first-time customization of compiler-related
+            # config vars on OS X now that we know we need a compiler.
+            # This is primarily to support Pythons from binary
+            # installers.  The kind and paths to build tools on
+            # the user system may vary significantly from the system
+            # that Python itself was built on.  Also the user OS
+            # version and build tools may not support the same set
+            # of CPU architectures for universal builds.
+            global _config_vars
+            if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''):
+                import _osx_support
+                _osx_support.customize_compiler(_config_vars)
+                _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+
         (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
 
         newcc = None
         if 'CC' in os.environ:
-            newcc = os.environ['CC']
-        elif sys.platform == 'darwin' and cc == 'gcc-4.2':
-            # Issue #13590:
-            #       Since Apple removed gcc-4.2 in Xcode 4.2, we can no
-            #       longer assume it is available for extension module builds.
-            #       If Python was built with gcc-4.2, check first to see if
-            #       it is available on this system; if not, try to use clang
-            #       instead unless the caller explicitly set CC.
-            global _USE_CLANG
-            if _USE_CLANG is None:
-                from distutils import log
-                from subprocess import Popen, PIPE
-                p = Popen("! type gcc-4.2 && type clang && exit 2",
-                                shell=True, stdout=PIPE, stderr=PIPE)
-                p.wait()
-                if p.returncode == 2:
-                    _USE_CLANG = True
-                    log.warn("gcc-4.2 not found, using clang instead")
-                else:
-                    _USE_CLANG = False
-            if _USE_CLANG:
-                newcc = 'clang'
-        if newcc:
-            # On OS X, if CC is overridden, use that as the default
-            #       command for LDSHARED as well
-            if (sys.platform == 'darwin'
-                    and 'LDSHARED' not in os.environ
-                    and ldshared.startswith(cc)):
-                ldshared = newcc + ldshared[len(cc):]
-            cc = newcc
+            cc = os.environ['CC']
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:
@@ -543,43 +529,11 @@ def get_config_vars(*args):
                 srcdir = os.path.join(base, _config_vars['srcdir'])
                 _config_vars['srcdir'] = os.path.normpath(srcdir)
 
+        # OS X platforms require special customization to handle
+        # multi-architecture, multi-os-version installers
         if sys.platform == 'darwin':
-            kernel_version = os.uname()[2] # Kernel version (8.4.3)
-            major_version = int(kernel_version.split('.')[0])
-
-            if major_version < 8:
-                # On Mac OS X before 10.4, check if -arch and -isysroot
-                # are in CFLAGS or LDFLAGS and remove them if they are.
-                # This is needed when building extensions on a 10.3 system
-                # using a universal build of python.
-                for key in ('LDFLAGS', 'BASECFLAGS',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                    flags = _config_vars[key]
-                    flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
-                    flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-                    _config_vars[key] = flags
-
-            else:
-
-                # Allow the user to override the architecture flags using
-                # an environment variable.
-                # NOTE: This name was introduced by Apple in OSX 10.5 and
-                # is used by several scripting languages distributed with
-                # that OS release.
-
-                if 'ARCHFLAGS' in os.environ:
-                    arch = os.environ['ARCHFLAGS']
-                    for key in ('LDFLAGS', 'BASECFLAGS',
-                        # a number of derived variables. These need to be
-                        # patched up as well.
-                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-
-                        flags = _config_vars[key]
-                        flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                        flags = flags + ' ' + arch
-                        _config_vars[key] = flags
+            import _osx_support
+            _osx_support.customize_config_vars(_config_vars)
 
     if args:
         vals = []
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index fbe26bf65d..545ef3b548 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -102,7 +102,27 @@ def test_sysconfig_module(self):
         import sysconfig as global_sysconfig
         self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
         self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
-        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),sysconfig.get_config_var('LDSHARED'))
+
+    @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),'compiler flags customized')
+    def test_sysconfig_compiler_vars(self):
+        # On OS X, binary installers support extension module building on
+        # various levels of the operating system with differing Xcode
+        # configurations.  This requires customization of some of the
+        # compiler configuration directives to suit the environment on
+        # the installed machine.  Some of these customizations may require
+        # running external programs and, so, are deferred until needed by
+        # the first extension module build.  With Python 3.3, only
+        # the Distutils version of sysconfig is used for extension module
+        # builds, which happens earlier in the Distutils tests.  This may
+        # cause the following tests to fail since no tests have caused
+        # the global version of sysconfig to call the customization yet.
+        # The solution for now is to simply skip this test in this case.
+        # The longer-term solution is to only have one version of sysconfig.
+
+        import sysconfig as global_sysconfig
+        if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
+            return
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
         self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
 
 
diff --git a/tests/test_util.py b/tests/test_util.py
index 1a06d4c4a1..eac9b5141d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -13,6 +13,7 @@
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
 from distutils.tests import support
+import _osx_support
 
 class UtilTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -92,6 +93,7 @@ def test_get_platform(self):
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
                     'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
 
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
@@ -105,6 +107,7 @@ def test_get_platform(self):
             sys.maxsize = cursize
 
         # macbook with fat binaries (fat, universal or fat64)
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
         get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
@@ -113,10 +116,12 @@ def test_get_platform(self):
 
         self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
+        _osx_support._remove_original_values(get_config_vars())
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.1'
         self.assertEqual(get_platform(), 'macosx-10.4-fat')
 
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -124,18 +129,21 @@ def test_get_platform(self):
 
         self.assertEqual(get_platform(), 'macosx-10.4-intel')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
         self.assertEqual(get_platform(), 'macosx-10.4-fat3')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
                                        '-dynamic -DNDEBUG -g -O3')
         self.assertEqual(get_platform(), 'macosx-10.4-universal')
 
+        _osx_support._remove_original_values(get_config_vars())
         get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
                                        '/Developer/SDKs/MacOSX10.4u.sdk  '
                                        '-fno-strict-aliasing -fno-common '
@@ -144,6 +152,7 @@ def test_get_platform(self):
         self.assertEqual(get_platform(), 'macosx-10.4-fat64')
 
         for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+            _osx_support._remove_original_values(get_config_vars())
             get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
                                            '/Developer/SDKs/MacOSX10.4u.sdk  '
                                            '-fno-strict-aliasing -fno-common '
diff --git a/unixccompiler.py b/unixccompiler.py
index c70a3cc555..094a2f0bd0 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -23,6 +23,9 @@
      DistutilsExecError, CompileError, LibError, LinkError
 from distutils import log
 
+if sys.platform == 'darwin':
+    import _osx_support
+
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's
 #     Makefile and live with it.  Is this adequate?  If not, we might
@@ -38,68 +41,6 @@
 #     should just happily stuff them into the preprocessor/compiler/linker
 #     options and carry on.
 
-def _darwin_compiler_fixup(compiler_so, cc_args):
-    """
-    This function will strip '-isysroot PATH' and '-arch ARCH' from the
-    compile flags if the user has specified one them in extra_compile_flags.
-
-    This is needed because '-arch ARCH' adds another architecture to the
-    build, without a way to remove an architecture. Furthermore GCC will
-    barf if multiple '-isysroot' arguments are present.
-    """
-    stripArch = stripSysroot = False
-
-    compiler_so = list(compiler_so)
-    kernel_version = os.uname()[2] # 8.4.3
-    major_version = int(kernel_version.split('.')[0])
-
-    if major_version < 8:
-        # OSX before 10.4.0, these don't support -arch and -isysroot at
-        # all.
-        stripArch = stripSysroot = True
-    else:
-        stripArch = '-arch' in cc_args
-        stripSysroot = '-isysroot' in cc_args
-
-    if stripArch or 'ARCHFLAGS' in os.environ:
-        while True:
-            try:
-                index = compiler_so.index('-arch')
-                # Strip this argument and the next one:
-                del compiler_so[index:index+2]
-            except ValueError:
-                break
-
-    if 'ARCHFLAGS' in os.environ and not stripArch:
-        # User specified different -arch flags in the environ,
-        # see also distutils.sysconfig
-        compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
-
-    if stripSysroot:
-        try:
-            index = compiler_so.index('-isysroot')
-            # Strip this argument and the next one:
-            del compiler_so[index:index+2]
-        except ValueError:
-            pass
-
-    # Check if the SDK that is used during compilation actually exists,
-    # the universal build requires the usage of a universal SDK and not all
-    # users have that installed by default.
-    sysroot = None
-    if '-isysroot' in cc_args:
-        idx = cc_args.index('-isysroot')
-        sysroot = cc_args[idx+1]
-    elif '-isysroot' in compiler_so:
-        idx = compiler_so.index('-isysroot')
-        sysroot = compiler_so[idx+1]
-
-    if sysroot and not os.path.isdir(sysroot):
-        log.warn("Compiling with an SDK that doesn't seem to exist: %s",
-                sysroot)
-        log.warn("Please check your Xcode installation")
-
-    return compiler_so
 
 class UnixCCompiler(CCompiler):
 
@@ -168,7 +109,8 @@ def preprocess(self, source, output_file=None, macros=None,
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
         if sys.platform == 'darwin':
-            compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+            compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                    cc_args + extra_postargs)
         try:
             self.spawn(compiler_so + cc_args + [src, '-o', obj] +
                        extra_postargs)
@@ -247,7 +189,7 @@ def link(self, target_desc, objects,
                     linker[i] = self.compiler_cxx[i]
 
                 if sys.platform == 'darwin':
-                    linker = _darwin_compiler_fixup(linker, ld_args)
+                    linker = _osx_support.compiler_fixup(linker, ld_args)
 
                 self.spawn(linker + ld_args)
             except DistutilsExecError as msg:
diff --git a/util.py b/util.py
index bce840274d..52280db0b2 100644
--- a/util.py
+++ b/util.py
@@ -94,94 +94,10 @@ def get_platform ():
         if m:
             release = m.group()
     elif osname[:6] == "darwin":
-        #
-        # For our purposes, we'll assume that the system version from
-        # distutils' perspective is what MACOSX_DEPLOYMENT_TARGET is set
-        # to. This makes the compatibility story a bit more sane because the
-        # machine is going to compile and link as if it were
-        # MACOSX_DEPLOYMENT_TARGET.
-        from distutils.sysconfig import get_config_vars
-        cfgvars = get_config_vars()
-
-        macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
-
-        if 1:
-            # Always calculate the release of the running machine,
-            # needed to determine if we can build fat binaries or not.
-
-            macrelease = macver
-            # Get the system version. Reading this plist is a documented
-            # way to get the system version (see the documentation for
-            # the Gestalt Manager)
-            try:
-                f = open('/System/Library/CoreServices/SystemVersion.plist')
-            except IOError:
-                # We're on a plain darwin box, fall back to the default
-                # behaviour.
-                pass
-            else:
-                try:
-                    m = re.search(
-                            r'<key>ProductUserVisibleVersion</key>\s*' +
-                            r'<string>(.*?)</string>', f.read())
-                    if m is not None:
-                        macrelease = '.'.join(m.group(1).split('.')[:2])
-                    # else: fall back to the default behaviour
-                finally:
-                    f.close()
-
-        if not macver:
-            macver = macrelease
-
-        if macver:
-            from distutils.sysconfig import get_config_vars
-            release = macver
-            osname = "macosx"
-
-            if (macrelease + '.') >= '10.4.' and \
-                    '-arch' in get_config_vars().get('CFLAGS', '').strip():
-                # The universal build will build fat binaries, but not on
-                # systems before 10.4
-                #
-                # Try to detect 4-way universal builds, those have machine-type
-                # 'universal' instead of 'fat'.
-
-                machine = 'fat'
-                cflags = get_config_vars().get('CFLAGS')
-
-                archs = re.findall('-arch\s+(\S+)', cflags)
-                archs = tuple(sorted(set(archs)))
-
-                if len(archs) == 1:
-                    machine = archs[0]
-                elif archs == ('i386', 'ppc'):
-                    machine = 'fat'
-                elif archs == ('i386', 'x86_64'):
-                    machine = 'intel'
-                elif archs == ('i386', 'ppc', 'x86_64'):
-                    machine = 'fat3'
-                elif archs == ('ppc64', 'x86_64'):
-                    machine = 'fat64'
-                elif archs == ('i386', 'ppc', 'ppc64', 'x86_64'):
-                    machine = 'universal'
-                else:
-                    raise ValueError(
-                       "Don't know machine value for archs=%r"%(archs,))
-
-            elif machine == 'i386':
-                # On OSX the machine type returned by uname is always the
-                # 32-bit variant, even if the executable architecture is
-                # the 64-bit variant
-                if sys.maxsize >= 2**32:
-                    machine = 'x86_64'
-
-            elif machine in ('PowerPC', 'Power_Macintosh'):
-                # Pick a sane name for the PPC architecture.
-                machine = 'ppc'
-
-                # See 'i386' case
-                if sys.maxsize >= 2**32:
-                    machine = 'ppc64'
+        import _osx_support, distutils.sysconfig
+        osname, release, machine = _osx_support.get_platform_osx(
+                                        distutils.sysconfig.get_config_vars(),
+                                        osname, release, machine)
 
     return "%s-%s-%s" % (osname, release, machine)
 

From 9c2f75cbc7aeb61b3a2aad135472c72cfbc1dd44 Mon Sep 17 00:00:00 2001
From: "doko@python.org" <doko@python.org>
Date: Thu, 31 Jan 2013 23:52:03 +0100
Subject: [PATCH 3696/8469] - Issue #17086: Backport the patches from the 3.3
 branch to cross-build   the package.

---
 sysconfig.py | 7 ++++++-
 util.py      | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index daa4dc77ca..250ef38bed 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -37,6 +37,11 @@
     project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
                                                 os.path.pardir))
 
+# set for cross builds
+if "_PYTHON_PROJECT_BASE" in os.environ:
+    # this is the build directory, at least for posix
+    project_base = os.path.normpath(os.environ["_PYTHON_PROJECT_BASE"])
+
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
@@ -230,7 +235,7 @@ def get_config_h_filename():
 def get_makefile_filename():
     """Return full pathname of installed Makefile from the Python build."""
     if python_build:
-        return os.path.join(os.path.dirname(sys.executable), "Makefile")
+        return os.path.join(project_base, "Makefile")
     lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
     return os.path.join(lib_dir, "config", "Makefile")
 
diff --git a/util.py b/util.py
index 5279411294..ea6ed8a9ac 100644
--- a/util.py
+++ b/util.py
@@ -51,6 +51,10 @@ def get_platform ():
             return 'win-ia64'
         return sys.platform
 
+    # Set for cross builds explicitly
+    if "_PYTHON_HOST_PLATFORM" in os.environ:
+        return os.environ["_PYTHON_HOST_PLATFORM"]
+
     if os.name != "posix" or not hasattr(os, 'uname'):
         # XXX what about the architecture? NT is Intel or Alpha,
         # Mac OS is M68k or PPC, etc.

From 4627dd0881a1ab9bafe97aff94867456135d057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 3 Feb 2013 11:41:19 -0500
Subject: [PATCH 3697/8469] Add alias to restore 2.7.2 compatibility for setup
 scripts (#13994).

The customize_compiler function moved many times during the 2.7 series;
in 2.7.3, setup scripts importing this function from ccompiler were
broken.  This commit restores compatibility without reintroducing the
issue that #13994 originally fixed (duplication of the function).

A unit test makes little sense here, as distutils tests never do imports
in functions, and the fix is very simple.
---
 ccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ccompiler.py b/ccompiler.py
index 7076b93394..4907a0aa5a 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -17,6 +17,8 @@
 from distutils.dep_util import newer_group
 from distutils.util import split_quoted, execute
 from distutils import log
+# following import is for backward compatibility
+from distutils.sysconfig import customize_compiler
 
 class CCompiler:
     """Abstract base class to define the interface that must be implemented

From b5cd47fbd96ae900dd835b68484084ab1219f260 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 02:13:45 -0500
Subject: [PATCH 3698/8469] Backed out changeset: d0a8d1a83053 In the
 discussion in #278, it became clear that the deviance in behavior from
 setuptools is problemmatic. For compatibility, defer to the setuptools
 version scheme as specifically intended.

--HG--
branch : distribute
extra : rebase_source : 1d5cc8c216f974b247e2dc84d8d40c868d6d3639
---
 pkg_resources.py                   |  4 +++-
 setuptools/tests/test_resources.py | 20 +++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 49aab6757f..69601480d3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1936,7 +1936,7 @@ def yield_lines(strs):
 def _parse_version_parts(s):
     for part in component_re.split(s):
         part = replace(part,part)
-        if part in ['', '.']:
+        if not part or part=='.':
             continue
         if part[:1] in '0123456789':
             yield part.zfill(8)    # pad for numeric comparison
@@ -1979,6 +1979,8 @@ def parse_version(s):
     parts = []
     for part in _parse_version_parts(s.lower()):
         if part.startswith('*'):
+            if part<'*final':   # remove '-' before a prerelease tag
+                while parts and parts[-1]=='*final-': parts.pop()
             # remove trailing zeros from each series of numeric parts
             while parts and parts[-1]=='00000000':
                 parts.pop()
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 0bc1a0953d..292b78d1ab 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -477,13 +477,14 @@ def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
             self.assertEqual(p1,p2, (s1,s2,p1,p2))
 
+        c('1.2-rc1', '1.2rc1')
         c('0.4', '0.4.0')
         c('0.4.0.0', '0.4.0')
         c('0.4.0-0', '0.4-0')
         c('0pl1', '0.0pl1')
         c('0pre1', '0.0c1')
         c('0.0.0preview1', '0c1')
-        c('0.0c1', '0rc1')
+        c('0.0c1', '0-rc1')
         c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')
 
     def testVersionOrdering(self):
@@ -492,14 +493,11 @@ def c(s1,s2):
             self.assertTrue(p1<p2, (s1,s2,p1,p2))
 
         c('2.1','2.1.1')
-        c('2.1.0','2.10')
         c('2a1','2b0')
-        c('2b1','2c0')
         c('2a1','2.1')
         c('2.3a1', '2.3')
         c('2.1-1', '2.1-2')
         c('2.1-1', '2.1.1')
-        c('2.1', '2.1.1-1')
         c('2.1', '2.1pl4')
         c('2.1a0-20040501', '2.1')
         c('1.1', '02.1')
@@ -510,20 +508,8 @@ def c(s1,s2):
         c('0.4', '4.0')
         c('0.0.4', '0.4.0')
         c('0pl1', '0.4pl1')
+        c('2.1.0-rc1','2.1.0')
         c('2.1dev','2.1a0')
-        c('2.1.0rc1','2.1.0')
-        c('2.1.0','2.1.0-rc0')
-        c('2.1.0','2.1.0-a')
-        c('2.1.0','2.1.0-alpha')
-        c('2.1.0','2.1.0-foo')
-        c('1.0','1.0-1')
-        c('1.0-1','1.0.1')
-        c('1.0a','1.0b')
-        c('1.0dev','1.0rc1')
-        c('1.0pre','1.0')
-        c('1.0pre','1.0')
-        c('1.0a','1.0-a')
-        c('1.0rc1','1.0-rc1')
 
         torture ="""
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1

From 3a467f695d9a10fec13bf7b0206ecc10af6517f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 02:47:06 -0500
Subject: [PATCH 3699/8469] Updated docs to match originally-intended behavior
 and the behavior of setuptools 0.6. This fixes #278.

--HG--
branch : distribute
extra : rebase_source : 2b4f2ca890d32a2d1a3179bb1805b6a1f1e9be77
---
 CHANGES.txt         |  7 +++++++
 docs/setuptools.txt | 18 ++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 623bc4b79f..cae946e0dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,13 @@ CHANGES
 0.6.35
 ------
 
+Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
+how it parses version numbers.
+
+* Issue #278: Restored compatibility with distribute 0.6.22 and setuptools
+  0.6. Updated the documentation to match more closely with the version
+  parsing as intended in setuptools 0.6.
+
 ------
 0.6.34
 ------
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 31ecc931f2..fe8bb3f615 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -187,10 +187,11 @@ than ``2.4.1`` (which has a higher release number).
 
 A pre-release tag is a series of letters that are alphabetically before
 "final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
-``a``, ``c``, ``dev``, and so on.  You do not have to place a dot before
-the prerelease tag if it's immediately after a number, but it's okay to do
-so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` both represent release
-candidate 1 of version ``2.4``, and are treated as identical by setuptools.
+``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
+before the prerelease tag if it's immediately after a number, but it's okay to
+do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
+represent release candidate 1 of version ``2.4``, and are treated as identical
+by setuptools.
 
 In addition, there are three special prerelease tags that are treated as if
 they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
@@ -216,13 +217,6 @@ a post-release tag, so this version is *newer* than ``0.6a9.dev``.
 For the most part, setuptools' interpretation of version numbers is intuitive,
 but here are a few tips that will keep you out of trouble in the corner cases:
 
-* Don't use ``-`` or any other character than ``.`` as a separator, unless you
-  really want a post-release.  Remember that ``2.1-rc2`` means you've
-  *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates
-  you're putting out *before* ``2.1``.  If you accidentally distribute copies
-  of a post-release that you meant to be a pre-release, the only safe fix is to
-  bump your main release number (e.g. to ``2.1.1``) and re-release the project.
-
 * Don't stick adjoining pre-release tags together without a dot or number
   between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
   *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
@@ -239,7 +233,7 @@ but here are a few tips that will keep you out of trouble in the corner cases:
     >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
     True
     >>> parse_version('2.1-rc2') < parse_version('2.1')
-    False
+    True
     >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
     True
 

From f2b43352cc25c12115ed5bf4db86a6f88fc81a9f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 03:11:43 -0500
Subject: [PATCH 3700/8469] Added tag 0.6.35 for changeset 2abe1117543b

--HG--
branch : distribute
extra : rebase_source : 1e3462505836a61244ec301a635305b88a56c35c
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9bd19948ca..5f3ee48dc5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -43,3 +43,4 @@ fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
 b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33
 23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
+2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35

From 1e7b49282e6f36d5d624bdf50f1ea9a34f52cfee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 03:12:35 -0500
Subject: [PATCH 3701/8469] Bumped to 0.6.36 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 82ea3f25bc7836db7398b0e602ef34baa1f2c34e
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index ea13a9bc43..a827f4a627 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz
-    $ tar -xzvf distribute-0.6.35.tar.gz
-    $ cd distribute-0.6.35
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
+    $ tar -xzvf distribute-0.6.36.tar.gz
+    $ cd distribute-0.6.36
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index a447f7ec8f..f630bca4f9 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.35"
+DEFAULT_VERSION = "0.6.36"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 98380ba9d6..586e3fe6ad 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.35'
+version = '0.6.36'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.35'
+release = '0.6.36'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 983703047f..46720a8e1f 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.35'
+VERSION = '0.6.36'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index cecb9e9fda..607954d03a 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.35"
+VERSION = "0.6.36"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 7e2bae18571ec5b6e7df9cade381da605ebbac55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Feb 2013 03:23:23 -0500
Subject: [PATCH 3702/8469] Update release script to use keyring more properly
 (rather than bundling an artifact of the backend I was using).

--HG--
branch : distribute
extra : rebase_source : 188dcdb7f0873f1b382e8bde65377c5f43266f9f
---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index 46720a8e1f..199ad65a51 100644
--- a/release.py
+++ b/release.py
@@ -50,7 +50,7 @@ def get_mercurial_creds(system='https://bitbucket.org', username=None):
 	# todo: consider getting this from .hgrc
 	username = username or getpass.getuser()
 	keyring_username = '@@'.join((username, system))
-	system = '@'.join((keyring_username, 'Mercurial'))
+	system = 'Mercurial'
 	password = (
 		keyring.get_password(system, keyring_username)
 		if 'keyring' in globals()

From 86a22eb827e436ff4648552d4b6922c2c08b573a Mon Sep 17 00:00:00 2001
From: rlacko <none@none>
Date: Tue, 19 Feb 2013 09:16:13 +0100
Subject: [PATCH 3703/8469] Fix for PermissionError when installing on Python
 3.3: __pycache__ dir inside distutils scripts metadata directory

--HG--
branch : distribute
extra : rebase_source : e6761715dec0e43a90b54c26f25fa68d97c97938
---
 CHANGES.txt                        | 7 +++++++
 setuptools/command/easy_install.py | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cae946e0dc..479850a738 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------------
+Next version
+------------
+
+- Fix for distutils scripts installation on Python 3, related to
+  ``__pycache__`` directories.
+
 ------
 0.6.35
 ------
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0d72f75843..ba98fa13fd 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -522,6 +522,9 @@ def install_egg_scripts(self, dist):
         """Write all the scripts for `dist`, unless scripts are excluded"""
         if not self.exclude_scripts and dist.metadata_isdir('scripts'):
             for script_name in dist.metadata_listdir('scripts'):
+                if dist.metadata_isdir('scripts/' + script_name):
+                    # Probably Python 3 __pycache__ directory.
+                    continue                
                 self.install_script(
                     dist, script_name,
                     dist.get_metadata('scripts/'+script_name)

From 9ec4ed534ba8d93a5de4a97267807819fbdf1104 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 11 Mar 2013 17:56:17 -0400
Subject: [PATCH 3704/8469] Issue #17047: remove doubled words found in 2.7 to
 3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.

---
 command/install.py    | 4 ++--
 tests/test_install.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install.py b/command/install.py
index f1f3bd5c6f..b9f1c6c566 100644
--- a/command/install.py
+++ b/command/install.py
@@ -265,8 +265,8 @@ def finalize_options (self):
 
         if self.user and (self.prefix or self.exec_prefix or self.home or
                 self.install_base or self.install_platbase):
-            raise DistutilsOptionError("can't combine user with with prefix/"
-                                       "exec_prefix/home or install_(plat)base")
+            raise DistutilsOptionError("can't combine user with prefix, "
+                                       "exec_prefix/home, or install_(plat)base")
 
         # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name != "posix":
diff --git a/tests/test_install.py b/tests/test_install.py
index f17baa1e50..2996161797 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -166,7 +166,7 @@ def test_finalize_options(self):
         cmd.home = 'home'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
-        # can't combine user with with prefix/exec_prefix/home or
+        # can't combine user with prefix/exec_prefix/home or
         # install_(plat)base
         cmd.prefix = None
         cmd.user = 'user'

From 6b2cfd3d4e003b9a39b2b3a89a150bce9ecdc250 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 11 Mar 2013 17:57:08 -0400
Subject: [PATCH 3705/8469] Issue #17047: remove doubled words found in 2.7 to
 3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.

---
 command/install.py    | 4 ++--
 tests/test_install.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install.py b/command/install.py
index 0161898f49..9b1c36af82 100644
--- a/command/install.py
+++ b/command/install.py
@@ -278,8 +278,8 @@ def finalize_options(self):
 
         if self.user and (self.prefix or self.exec_prefix or self.home or
                 self.install_base or self.install_platbase):
-            raise DistutilsOptionError("can't combine user with with prefix/"
-                                       "exec_prefix/home or install_(plat)base")
+            raise DistutilsOptionError("can't combine user with prefix, "
+                                       "exec_prefix/home, or install_(plat)base")
 
         # Next, stuff that's wrong (or dubious) only on certain platforms.
         if os.name != "posix":
diff --git a/tests/test_install.py b/tests/test_install.py
index cb2e1f2879..1bd31e2469 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -165,7 +165,7 @@ def test_finalize_options(self):
         cmd.home = 'home'
         self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
-        # can't combine user with with prefix/exec_prefix/home or
+        # can't combine user with prefix/exec_prefix/home or
         # install_(plat)base
         cmd.prefix = None
         cmd.user = 'user'

From 5bbae64025d2dd4378bc28a08f311a61c6478565 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 16 Mar 2013 19:48:51 +0200
Subject: [PATCH 3706/8469] #11420: make test suite pass with
 -B/DONTWRITEBYTECODE set.  Initial patch by Thomas Wouters.

---
 tests/test_bdist_dumb.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 1037d8216e..0ad32d421e 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -88,9 +88,9 @@ def test_simple_built(self):
             fp.close()
 
         contents = sorted(os.path.basename(fn) for fn in contents)
-        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2],
-                  'foo.%s.pyc' % imp.get_tag(),
-                  'foo.py']
+        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py']
+        if not sys.dont_write_bytecode:
+            wanted.append('foo.%s.pyc' % imp.get_tag())
         self.assertEqual(contents, sorted(wanted))
 
 def test_suite():

From a72d9ae0b5ea2ad5fd4aed4b3745776bede75c7b Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 16 Mar 2013 20:04:44 +0200
Subject: [PATCH 3707/8469] #11420: make test suite pass with
 -B/DONTWRITEBYTECODE set.  Initial patch by Thomas Wouters.

---
 tests/test_bdist_dumb.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 3378f49ea0..5db3a850f8 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -87,8 +87,9 @@ def test_simple_built(self):
             fp.close()
 
         contents = sorted(os.path.basename(fn) for fn in contents)
-        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2],
-                  'foo.py', 'foo.pyc']
+        wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py']
+        if not sys.dont_write_bytecode:
+            wanted.append('foo.pyc')
         self.assertEqual(contents, sorted(wanted))
 
     def test_finalize_options(self):

From 0c09bf1bc035dfbc0caf1339c05a04cca238fcd6 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 18 Mar 2013 15:20:56 -0700
Subject: [PATCH 3708/8469] use the HTTPS for pypi upload

---
 config.py            | 11 ++++++++++-
 tests/test_config.py |  4 ++--
 tests/test_upload.py |  8 ++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/config.py b/config.py
index 1fd53346e9..7439a83a4f 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
     """Base command that knows how to handle the .pypirc file
     """
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
     DEFAULT_REALM = 'pypi'
     repository = None
     realm = None
@@ -83,6 +83,15 @@ def _read_pypirc(self):
                             current[key] = config.get(server, key)
                         else:
                             current[key] = default
+
+                    # work around people having "repository" for the "pypi"
+                    # section of their config set to the HTTP (rather than
+                    # HTTPS) URL
+                    if (server == 'pypi' and
+                        repository in (self.DEFAULT_REPOSITORY, 'pypi')):
+                        current['repository'] = self.DEFAULT_REPOSITORY
+                        return current
+
                     if (current['server'] == repository or
                         current['repository'] == repository):
                         return current
diff --git a/tests/test_config.py b/tests/test_config.py
index 525bee9416..12593610aa 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -87,7 +87,7 @@ def test_server_registration(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('repository', 'https://pypi.python.org/pypi'),
                   ('server', 'server1'), ('username', 'me')]
         self.assertEqual(config, waited)
 
@@ -96,7 +96,7 @@ def test_server_registration(self):
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('repository', 'https://pypi.python.org/pypi'),
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEqual(config, waited)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 4c6464a32e..d2696866fe 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -72,11 +72,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httpclient.HTTPConnection
-        self.conn = httpclient.HTTPConnection = FakeConnection()
+        self.old_class = httpclient.HTTPSConnection
+        self.conn = httpclient.HTTPSConnection = FakeConnection()
 
     def tearDown(self):
-        httpclient.HTTPConnection = self.old_class
+        httpclient.HTTPSConnection = self.old_class
         super(uploadTestCase, self).tearDown()
 
     def test_finalize_options(self):
@@ -88,7 +88,7 @@ def test_finalize_options(self):
         cmd.finalize_options()
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
-                             ('repository', 'http://pypi.python.org/pypi')):
+                             ('repository', 'https://pypi.python.org/pypi')):
             self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):

From 156e81825b9ee6d636f84ffdddd25e952347678b Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Thu, 21 Mar 2013 13:21:49 -0700
Subject: [PATCH 3709/8469] - Issue #16754: Fix the incorrect shared library
 extension on linux. Introduce   two makefile macros SHLIB_SUFFIX and
 EXT_SUFFIX. SO now has the value of   SHLIB_SUFFIX again (as in 2.x and 3.1).
 The SO macro is removed in 3.4.

---
 command/build_ext.py    | 6 +++---
 sysconfig.py            | 8 +++++---
 tests/test_build_ext.py | 8 ++++----
 tests/test_install.py   | 2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 34b61bdb82..64f634caed 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -667,10 +667,10 @@ def get_ext_filename(self, ext_name):
         if os.name == "os2":
             ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
-        so_ext = get_config_var('SO')
+        ext_suffix = get_config_var('EXT_SUFFIX')
         if os.name == 'nt' and self.debug:
-            return os.path.join(*ext_path) + '_d' + so_ext
-        return os.path.join(*ext_path) + so_ext
+            return os.path.join(*ext_path) + '_d' + ext_suffix
+        return os.path.join(*ext_path) + ext_suffix
 
     def get_export_symbols(self, ext):
         """Return the list of symbols that a shared extension has to
diff --git a/sysconfig.py b/sysconfig.py
index b6007a904f..dec37f8be1 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -170,9 +170,9 @@ def customize_compiler(compiler):
                 _osx_support.customize_compiler(_config_vars)
                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
 
-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-                            'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
+                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
 
         newcc = None
         if 'CC' in os.environ:
@@ -211,7 +211,7 @@ def customize_compiler(compiler):
             linker_exe=cc,
             archiver=archiver)
 
-        compiler.shared_lib_extension = so_ext
+        compiler.shared_lib_extension = shlib_suffix
 
 
 def get_config_h_filename():
@@ -466,6 +466,7 @@ def _init_nt():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.pyd'
+    g['EXT_SUFFIX'] = '.pyd'
     g['EXE'] = ".exe"
     g['VERSION'] = get_python_version().replace(".", "")
     g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))
@@ -485,6 +486,7 @@ def _init_os2():
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
     g['SO'] = '.pyd'
+    g['EXT_SUFFIX'] = '.pyd'
     g['EXE'] = ".exe"
 
     global _config_vars
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 065a6a21c9..44a9852f4c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -318,8 +318,8 @@ def test_get_outputs(self):
         finally:
             os.chdir(old_wd)
         self.assertTrue(os.path.exists(so_file))
-        so_ext = sysconfig.get_config_var('SO')
-        self.assertTrue(so_file.endswith(so_ext))
+        ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
+        self.assertTrue(so_file.endswith(ext_suffix))
         so_dir = os.path.dirname(so_file)
         self.assertEqual(so_dir, other_tmp_dir)
 
@@ -328,7 +328,7 @@ def test_get_outputs(self):
         cmd.run()
         so_file = cmd.get_outputs()[0]
         self.assertTrue(os.path.exists(so_file))
-        self.assertTrue(so_file.endswith(so_ext))
+        self.assertTrue(so_file.endswith(ext_suffix))
         so_dir = os.path.dirname(so_file)
         self.assertEqual(so_dir, cmd.build_lib)
 
@@ -355,7 +355,7 @@ def test_get_outputs(self):
         self.assertEqual(lastdir, 'bar')
 
     def test_ext_fullpath(self):
-        ext = sysconfig.get_config_vars()['SO']
+        ext = sysconfig.get_config_var('EXT_SUFFIX')
         # building lxml.etree inplace
         #etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c')
         #etree_ext = Extension('lxml.etree', [etree_c])
diff --git a/tests/test_install.py b/tests/test_install.py
index 1bd31e2469..b1901273e9 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -23,7 +23,7 @@
 def _make_ext_name(modname):
     if os.name == 'nt' and sys.executable.endswith('_d.exe'):
         modname += '_d'
-    return modname + sysconfig.get_config_var('SO')
+    return modname + sysconfig.get_config_var('EXT_SUFFIX')
 
 
 class InstallTestCase(support.TempdirManager,

From 98057644b0bde93fc52346011633276b87ccb3a4 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Thu, 21 Mar 2013 15:02:16 -0700
Subject: [PATCH 3710/8469] - Issue #13150: sysconfig no longer parses the
 Makefile and config.h files   when imported, instead doing it at build time. 
 This makes importing   sysconfig faster and reduces Python startup time by
 20%.

---
 sysconfig.py | 63 ++++------------------------------------------------
 1 file changed, 4 insertions(+), 59 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 250ef38bed..0c726d92ff 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -387,66 +387,11 @@ def expand_makefile_vars(s, vars):
 
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
-    g = {}
-    # load the installed Makefile:
-    try:
-        filename = get_makefile_filename()
-        parse_makefile(filename, g)
-    except IOError, msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # load the installed pyconfig.h:
-    try:
-        filename = get_config_h_filename()
-        parse_config_h(file(filename), g)
-    except IOError, msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # On AIX, there are wrong paths to the linker scripts in the Makefile
-    # -- these paths are relative to the Python source, but when installed
-    # the scripts are in another directory.
-    if python_build:
-        g['LDSHARED'] = g['BLDSHARED']
-
-    elif get_python_version() < '2.1':
-        # The following two branches are for 1.5.2 compatibility.
-        if sys.platform == 'aix4':          # what about AIX 3.x ?
-            # Linker script is in the config directory, not in Modules as the
-            # Makefile says.
-            python_lib = get_python_lib(standard_lib=1)
-            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-            python_exp = os.path.join(python_lib, 'config', 'python.exp')
-
-            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
-
-        elif sys.platform == 'beos':
-            # Linker script is in the config directory.  In the Makefile it is
-            # relative to the srcdir, which after installation no longer makes
-            # sense.
-            python_lib = get_python_lib(standard_lib=1)
-            linkerscript_path = string.split(g['LDSHARED'])[0]
-            linkerscript_name = os.path.basename(linkerscript_path)
-            linkerscript = os.path.join(python_lib, 'config',
-                                        linkerscript_name)
-
-            # XXX this isn't the right place to do this: adding the Python
-            # library to the link, if needed, should be in the "build_ext"
-            # command.  (It's also needed for non-MS compilers on Windows, and
-            # it's taken care of for them by the 'build_ext.get_libraries()'
-            # method.)
-            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
-                             (linkerscript, PREFIX, get_python_version()))
-
+    # _sysconfigdata is generated at build time, see the sysconfig module
+    from _sysconfigdata import build_time_vars
     global _config_vars
-    _config_vars = g
+    _config_vars = {}
+    _config_vars.update(build_time_vars)
 
 
 def _init_nt():

From c02b720fc0e7ec3db46e6fcb61b680be7c18fbff Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 22 Mar 2013 09:37:13 -0500
Subject: [PATCH 3711/8469] backout 66e30c4870bb for breaking OSX (#13150)

---
 sysconfig.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 0c726d92ff..250ef38bed 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -387,11 +387,66 @@ def expand_makefile_vars(s, vars):
 
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
-    # _sysconfigdata is generated at build time, see the sysconfig module
-    from _sysconfigdata import build_time_vars
+    g = {}
+    # load the installed Makefile:
+    try:
+        filename = get_makefile_filename()
+        parse_makefile(filename, g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # load the installed pyconfig.h:
+    try:
+        filename = get_config_h_filename()
+        parse_config_h(file(filename), g)
+    except IOError, msg:
+        my_msg = "invalid Python installation: unable to open %s" % filename
+        if hasattr(msg, "strerror"):
+            my_msg = my_msg + " (%s)" % msg.strerror
+
+        raise DistutilsPlatformError(my_msg)
+
+    # On AIX, there are wrong paths to the linker scripts in the Makefile
+    # -- these paths are relative to the Python source, but when installed
+    # the scripts are in another directory.
+    if python_build:
+        g['LDSHARED'] = g['BLDSHARED']
+
+    elif get_python_version() < '2.1':
+        # The following two branches are for 1.5.2 compatibility.
+        if sys.platform == 'aix4':          # what about AIX 3.x ?
+            # Linker script is in the config directory, not in Modules as the
+            # Makefile says.
+            python_lib = get_python_lib(standard_lib=1)
+            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
+            python_exp = os.path.join(python_lib, 'config', 'python.exp')
+
+            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
+
+        elif sys.platform == 'beos':
+            # Linker script is in the config directory.  In the Makefile it is
+            # relative to the srcdir, which after installation no longer makes
+            # sense.
+            python_lib = get_python_lib(standard_lib=1)
+            linkerscript_path = string.split(g['LDSHARED'])[0]
+            linkerscript_name = os.path.basename(linkerscript_path)
+            linkerscript = os.path.join(python_lib, 'config',
+                                        linkerscript_name)
+
+            # XXX this isn't the right place to do this: adding the Python
+            # library to the link, if needed, should be in the "build_ext"
+            # command.  (It's also needed for non-MS compilers on Windows, and
+            # it's taken care of for them by the 'build_ext.get_libraries()'
+            # method.)
+            g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
+                             (linkerscript, PREFIX, get_python_version()))
+
     global _config_vars
-    _config_vars = {}
-    _config_vars.update(build_time_vars)
+    _config_vars = g
 
 
 def _init_nt():

From 449644ec384bd9ec0e8066bf54a22d19f162977f Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 23 Mar 2013 16:02:08 +0100
Subject: [PATCH 3712/8469] Bump to 3.2.4rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b52a9fe6c4..834d89671b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.3"
+__version__ = "3.2.4rc1"
 #--end constants--

From b262efd97d7ac908bbefc87ad8e5eee19ea8f47a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 23 Mar 2013 16:05:12 +0100
Subject: [PATCH 3713/8469] Bump to 3.3.1rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 345ac4f8dd..c30da0bb41 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0"
+__version__ = "3.3.1rc1"
 #--end constants--

From 447a41bf99cf4b4dd10f41fc91a1ef7d1a94552c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Mar 2013 10:17:29 -0500
Subject: [PATCH 3714/8469] version to 2.7.4rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 036062cc33..15b511bee5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,5 +15,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "2.7.3"
+__version__ = "2.7.4rc1"
 #--end constants--

From 463e07e68ee64bb15aea8516239908e3f6d4f40f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2013 17:10:55 -0400
Subject: [PATCH 3715/8469] Update release notes and comment to provide a bit
 more detail about the issue and to be more consistent with the solution.

--HG--
branch : distribute
extra : rebase_source : c813a29e831f266d427d4a4bce3da97f475a8eee
---
 CHANGES.txt                        | 14 +++++++++-----
 setuptools/command/easy_install.py |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 479850a738..16461a21aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,16 @@
 CHANGES
 =======
 
-------------
-Next version
-------------
+------
+0.6.36
+------
 
-- Fix for distutils scripts installation on Python 3, related to
-  ``__pycache__`` directories.
+* Pull Request #35: In `Buildout issue 64
+  <https://github.com/buildout/buildout/issues/64>`_, it was reported that
+  under Python 3, installation of distutils scripts could attempt to copy
+  the ``__pycache__`` directory as a file, causing an error, apparently only
+  under Windows. Easy_install now skips all directories when processing
+  metadata scripts.
 
 ------
 0.6.35
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ba98fa13fd..98af262097 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -523,8 +523,9 @@ def install_egg_scripts(self, dist):
         if not self.exclude_scripts and dist.metadata_isdir('scripts'):
             for script_name in dist.metadata_listdir('scripts'):
                 if dist.metadata_isdir('scripts/' + script_name):
-                    # Probably Python 3 __pycache__ directory.
-                    continue                
+                    # The "script" is a directory, likely a Python 3
+                    # __pycache__ directory, so skip it.
+                    continue
                 self.install_script(
                     dist, script_name,
                     dist.get_metadata('scripts/'+script_name)

From c7c39afa08b282a3a4c886e73dfe983475ee3598 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2013 17:14:21 -0400
Subject: [PATCH 3716/8469] Added tag 0.6.36 for changeset c813a29e831f

--HG--
branch : distribute
extra : rebase_source : a9dbc2819651b77ad8184101004a793f37be0f1b
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f3ee48dc5..3fda0d951b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -44,3 +44,4 @@ b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33
 23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
 2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35
+c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36

From db6d5f7ac474fa0605213514e793f98a0157a2ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2013 17:14:51 -0400
Subject: [PATCH 3717/8469] Bumped to 0.6.37 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : a59fcbbf5ca73fb41958d42d33d3de299ad9ae7c
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index a827f4a627..10a0ca92d8 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
-    $ tar -xzvf distribute-0.6.36.tar.gz
-    $ cd distribute-0.6.36
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.37.tar.gz
+    $ tar -xzvf distribute-0.6.37.tar.gz
+    $ cd distribute-0.6.37
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index f630bca4f9..7488237edd 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.36"
+DEFAULT_VERSION = "0.6.37"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 586e3fe6ad..0a943a16ba 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.36'
+version = '0.6.37'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.36'
+release = '0.6.37'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 199ad65a51..22ddfba8a6 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.36'
+VERSION = '0.6.37'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 607954d03a..a3a658f8b0 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.36"
+VERSION = "0.6.37"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 51ce4bbdaea029fbf434a0df91c7e0c0e46eab1b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 6 Apr 2013 09:36:20 +0200
Subject: [PATCH 3718/8469] Bump to 3.2.4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 834d89671b..b8f1c164c0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.4rc1"
+__version__ = "3.2.4"
 #--end constants--

From d6653309f0330f1e4e239e58226640a70a5c2f5a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 6 Apr 2013 09:40:02 +0200
Subject: [PATCH 3719/8469] Bump to 3.3.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c30da0bb41..f8af1b336e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.1rc1"
+__version__ = "3.3.1"
 #--end constants--

From 036968d741e319006ddfcbeb48d5a22f5da574dc Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 19 Apr 2013 04:23:09 +0300
Subject: [PATCH 3720/8469] Fix uploadTestCase to work even when
 HTTPSConnection is not available.

---
 tests/test_upload.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_upload.py b/tests/test_upload.py
index d2696866fe..4a71ca4a8d 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -72,13 +72,13 @@ class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httpclient.HTTPSConnection
+        if hasattr(httpclient, 'HTTPSConnection'):
+            self.addCleanup(setattr, httpclient, 'HTTPSConnection',
+                            httpclient.HTTPSConnection)
+        else:
+            self.addCleanup(delattr, httpclient, 'HTTPSConnection')
         self.conn = httpclient.HTTPSConnection = FakeConnection()
 
-    def tearDown(self):
-        httpclient.HTTPSConnection = self.old_class
-        super(uploadTestCase, self).tearDown()
-
     def test_finalize_options(self):
 
         # new format

From aa5a03972360fdd48530183a60171ecbf477d1e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:05:52 -0400
Subject: [PATCH 3721/8469] Include a launcher manifest for console scripts to
 prevent undesirable UAC elevation for scripts detected as installers (such as
 easy_install). Fixes #143.

--HG--
branch : distribute
extra : rebase_source : be6f65eea9c10ce78b6698d8c220b6e5de577292
---
 CHANGES.txt                              | 10 ++++++++++
 setuptools/command/easy_install.py       | 13 +++++++++++++
 setuptools/command/launcher manifest.xml | 15 +++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 setuptools/command/launcher manifest.xml

diff --git a/CHANGES.txt b/CHANGES.txt
index 16461a21aa..69d370cbc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+------
+0.6.37
+------
+
+* Issue #143: Launcher scripts, including easy_install itself, are now
+  accompanied by a manifest on 32-bit Windows environments to avoid the
+  Installer Detection Technology and thus undesirable UAC elevation described
+  in `this Microsoft article
+  <http://technet.microsoft.com/en-us/library/cc709628%28WS.10%29.aspx>`_.
+
 ------
 0.6.36
 ------
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 98af262097..7281d92d46 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -20,6 +20,7 @@
 import stat
 import random
 from glob import glob
+import pkg_resources
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
@@ -1851,11 +1852,23 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     name+'.exe', resource_string('setuptools', launcher),
                     'b' # write in binary mode
                 )
+                if not is_64bit():
+                    # install a manifest for the launcher to prevent Windows
+                    #  from detecting it as an installer (which it will for
+                    #  launchers like easy_install.exe). Consider only
+                    #  adding a manifest for launchers detected as installers.
+                    #  See Distribute #143 for details.
+                    m_name = name + '.exe.manifest'
+                    yield (m_name, load_launcher_manifest(name), 't')
             else:
                 # On other platforms, we assume the right thing to do is to
                 # just write the stub with no extension.
                 yield (name, header+script_text)
 
+def load_launcher_manifest(name):
+    manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
+    return manifest % vars()
+
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
     """Recursively delete a directory tree.
 
diff --git a/setuptools/command/launcher manifest.xml b/setuptools/command/launcher manifest.xml
new file mode 100644
index 0000000000..844d2264cd
--- /dev/null
+++ b/setuptools/command/launcher manifest.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity version="1.0.0.0"
+    processorArchitecture="X86"
+    name="%(name)s"
+    type="win32"/>
+    <!-- Identify the application security requirements. -->
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+        <requestedPrivileges>
+            <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+        </requestedPrivileges>
+    </security>
+    </trustInfo>
+</assembly>

From 58cde2532559799557fd776b29a0322d9bc44501 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:08:56 -0400
Subject: [PATCH 3722/8469] Added tag 0.6.37 for changeset be6f65eea9c1

--HG--
branch : distribute
extra : rebase_source : d3b1d90f953d90ad1e03bf5173c3b6198daa9907
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3fda0d951b..d84d27cf05 100644
--- a/.hgtags
+++ b/.hgtags
@@ -45,3 +45,4 @@ b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
 2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35
 c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
+be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37

From a34e56cef2e2cb2aea3d4ff5b532949d426e3b97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:10:00 -0400
Subject: [PATCH 3723/8469] Bumped to 0.6.38 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : cf2ffa52b8e0cf1403b4e8ca23921a4cda51ba5b
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 10a0ca92d8..aa07f447a3 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.37.tar.gz
-    $ tar -xzvf distribute-0.6.37.tar.gz
-    $ cd distribute-0.6.37
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.38.tar.gz
+    $ tar -xzvf distribute-0.6.38.tar.gz
+    $ cd distribute-0.6.38
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 7488237edd..b2e045ad59 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.37"
+DEFAULT_VERSION = "0.6.38"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 0a943a16ba..b5dc23bddd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.37'
+version = '0.6.38'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.37'
+release = '0.6.38'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 22ddfba8a6..b1cd904c73 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.37'
+VERSION = '0.6.38'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index a3a658f8b0..4ee8a08f8f 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.37"
+VERSION = "0.6.38"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From d020c5a8efa0b5d903b00844d02c1460b51ff9ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:14:01 -0400
Subject: [PATCH 3724/8469] Add *.xml to MANIFEST.in

--HG--
branch : distribute
extra : rebase_source : 2b26ec8909bff210f47c5f8fc620bc505e1610b5
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9837747a22..68337800cc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include setuptools *.py *.txt *.exe
+recursive-include setuptools *.py *.txt *.exe *.xml
 recursive-include tests *.py *.c *.pyx *.txt
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html

From c9307877a0b6acad4a574fd4d78150a0705956c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 May 2013 22:14:12 -0400
Subject: [PATCH 3725/8469] Added tag 0.6.37 for changeset 2b26ec8909bf

--HG--
branch : distribute
extra : rebase_source : f31307d41fedbbabdd3be5b5a6621a8af54ebf46
---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 3fda0d951b..dc3daea6ce 100644
--- a/.hgtags
+++ b/.hgtags
@@ -45,3 +45,5 @@ b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
 2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35
 c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
+be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
+2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37

From ce9cbd6577c6ab67d70ea292468fae7f4d3add26 Mon Sep 17 00:00:00 2001
From: "guy@guyr-air.infinidat.com" <guy@guyr-air.infinidat.com>
Date: Sun, 5 May 2013 11:16:24 +0300
Subject: [PATCH 3726/8469] Issue #371: instructing setup.py to install the xml
 files in setuptools.command

--HG--
branch : distribute
extra : rebase_source : 3d0a26ca9a25c2e7467c6ffb515d0cb92f2f8173
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4ee8a08f8f..83612ebc88 100755
--- a/setup.py
+++ b/setup.py
@@ -170,7 +170,7 @@ def _linkified(rst_path):
     test_suite = 'setuptools.tests',
     src_root = src_root,
     packages = find_packages(),
-    package_data = {'setuptools':['*.exe']},
+    package_data = {'setuptools':['*.exe'], 'setuptools.command':['*.xml']},
 
     py_modules = ['pkg_resources', 'easy_install', 'site'],
 

From d7dec0f7e8cdc12ffc7c8ad42f8b0d4216d8864d Mon Sep 17 00:00:00 2001
From: "wyj1046@gmail.com" <wyj1046@gmail.com>
Date: Sun, 5 May 2013 17:07:31 +0800
Subject: [PATCH 3727/8469] decode manifest bytes(utf-8) to string first if py
 version is 3

--HG--
branch : distribute
extra : rebase_source : 1038acda4912af8ac637d0e149630a95f3536dec
---
 setuptools/command/easy_install.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7281d92d46..dc851d1e6d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1867,7 +1867,10 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
 
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
-    return manifest % vars()
+    if sys.version_info[0] < 3:
+        return manifest % vars()
+    else:
+        return manifest.decode('utf-8') % vars()
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
     """Recursively delete a directory tree.

From d607a20ed15715909bf4788e5374a9cbdf092285 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 08:45:08 -0400
Subject: [PATCH 3728/8469] Update release notes

--HG--
branch : distribute
extra : rebase_source : f0d502a83f6c83ba38ad21c15a849c2daf389ec7
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 69d370cbc4..6e2b3b286b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.38
+------
+
+* Issue #371: The launcher manifest file is now installed properly.
+
 ------
 0.6.37
 ------

From 06fcc7c974de667fa43abe247c4d6fa94e3c1936 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 08:45:17 -0400
Subject: [PATCH 3729/8469] Added tag 0.6.38 for changeset f0d502a83f6c

--HG--
branch : distribute
extra : rebase_source : 7e648708c7e4e87917fcace787085f2fa9de7fa1
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dc3daea6ce..e01ab6986e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -47,3 +47,4 @@ b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
 c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
 be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
 2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
+f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38

From 878a81c62061ab506ed1874d541cbeb714fe06fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 08:45:43 -0400
Subject: [PATCH 3730/8469] Bumped to 0.6.39 in preparation for next release.

--HG--
branch : distribute
extra : rebase_source : 3e627b0d100b8ae32e8dc995f2da0003bbd9c605
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index aa07f447a3..c2bfc20f64 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.38.tar.gz
-    $ tar -xzvf distribute-0.6.38.tar.gz
-    $ cd distribute-0.6.38
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.39.tar.gz
+    $ tar -xzvf distribute-0.6.39.tar.gz
+    $ cd distribute-0.6.39
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index b2e045ad59..f9dc2d7425 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.38"
+DEFAULT_VERSION = "0.6.39"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index b5dc23bddd..fc60a00841 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.38'
+version = '0.6.39'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.38'
+release = '0.6.39'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index b1cd904c73..13df4d69a8 100644
--- a/release.py
+++ b/release.py
@@ -20,7 +20,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.38'
+VERSION = '0.6.39'
 
 def get_next_version():
 	digits = map(int, VERSION.split('.'))
diff --git a/setup.py b/setup.py
index 83612ebc88..4f56fe15fe 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.38"
+VERSION = "0.6.39"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From a0f5752e58db3a0eaaa68b22f0b1f878e824a117 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 09:08:11 -0400
Subject: [PATCH 3731/8469] Extract another function for constructing linkified
 changes

--HG--
branch : distribute
extra : rebase_source : e764f523fff11bf7caa7e5183c7300afeee75dab
---
 setup.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 4f56fe15fe..bc8137c841 100755
--- a/setup.py
+++ b/setup.py
@@ -133,15 +133,18 @@ def _being_installed():
     from distribute_setup import _before_install
     _before_install()
 
-# return contents of reStructureText file with linked issue references
 def _linkified(rst_path):
-    bitroot = 'http://bitbucket.org/tarek/distribute'
-    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
-
+    "return contents of reStructureText file with linked issue references"
     rst_file = open(rst_path)
     rst_content = rst_file.read()
     rst_file.close()
 
+    return _linkified_text(rst_content)
+
+def _linkified_text(rst_content):
+    bitroot = 'http://bitbucket.org/tarek/distribute'
+    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
+
     anchors = revision.findall(rst_content) # ['Issue #43', ...]
     anchors = sorted(set(anchors))
     rst_content = revision.sub(r'`\1`_', rst_content)

From b78ecd63d5c206a5cd0b065656a4493ffe496fe5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 09:36:55 -0400
Subject: [PATCH 3732/8469] Fix linkification of CHANGES.txt (broken due to
 buildout issue reference)

--HG--
branch : distribute
extra : rebase_source : a331dda293481f2cf121956070f94bfe6c9e0a0c
---
 setup.py | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index bc8137c841..1db770e9fe 100755
--- a/setup.py
+++ b/setup.py
@@ -142,12 +142,24 @@ def _linkified(rst_path):
     return _linkified_text(rst_content)
 
 def _linkified_text(rst_content):
-    bitroot = 'http://bitbucket.org/tarek/distribute'
-    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
+    # first identify any existing HREFs so they're not changed
+    HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
+
+    # split on the HREF pattern, returning the parts to be linkified
+    plain_text_parts = HREF_pattern.split(rst_content)
+    anchors = []
+    linkified_parts = [_linkified_part(part, anchors)
+        for part in plain_text_parts]
+    pairs = itertools.izip_longest(
+        linkified_parts,
+        HREF_pattern.findall(rst_content),
+        fillvalue='',
+    )
+    rst_content = ''.join(flatten(pairs))
+
+    anchors = sorted(anchors)
 
-    anchors = revision.findall(rst_content) # ['Issue #43', ...]
-    anchors = sorted(set(anchors))
-    rst_content = revision.sub(r'`\1`_', rst_content)
+    bitroot = 'http://bitbucket.org/tarek/distribute'
     rst_content += "\n"
     for x in anchors:
         issue = re.findall(r'\d+', x)[0]
@@ -155,6 +167,21 @@ def _linkified_text(rst_content):
     rst_content += "\n"
     return rst_content
 
+import itertools
+def flatten(listOfLists):
+    "Flatten one level of nesting"
+    return itertools.chain.from_iterable(listOfLists)
+
+
+def _linkified_part(text, anchors):
+    """
+    Linkify a part and collect any anchors generated
+    """
+    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
+
+    anchors.extend(revision.findall(text)) # ['Issue #43', ...]
+    return revision.sub(r'`\1`_', text)
+
 readme_file = open('README.txt')
 long_description = readme_file.read() + _linkified('CHANGES.txt')
 readme_file.close()

From 92952a515bca3813de6d5e27638a8e7fcd0117a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 09:50:36 -0400
Subject: [PATCH 3733/8469] Moved link generation routine from setup.py to
 release.py. The new routine requires Python 2.6 for izip_longest and
 chain.from_iterable, so it's not suitable for setup.py. Also, there's no
 reason that every installer needs to compute the links - they can be resolved
 in advance during the release process.

--HG--
branch : distribute
extra : rebase_source : 9f4af99f70fdfa00290be2261a921af9a76ba597
---
 .hgignore  |  1 +
 release.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py   | 53 +++----------------------------------------------
 3 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/.hgignore b/.hgignore
index 21ec620a54..4e5d0bcfca 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,3 +11,4 @@ bin
 include
 \.Python
 *.swp
+CHANGES (links).txt
diff --git a/release.py b/release.py
index 13df4d69a8..aeb989d52b 100644
--- a/release.py
+++ b/release.py
@@ -14,6 +14,8 @@
 import urllib2
 import getpass
 import collections
+import itertools
+import re
 
 try:
 	import keyring
@@ -110,6 +112,8 @@ def do_release():
 
 	subprocess.check_call(['hg', 'update', VERSION])
 
+	linkify('CHANGES.txt', 'CHANGES (links).txt')
+
 	has_docs = build_docs()
 	if os.path.isdir('./dist'):
 		shutil.rmtree('./dist')
@@ -166,5 +170,59 @@ def upload_bootstrap_script():
 	except:
 		print("Unable to upload bootstrap script. Ask Tarek to do it.")
 
+def linkify(source, dest):
+	with open(source) as source:
+		out = _linkified_text(source.read())
+	with open(dest, 'w') as dest:
+		dest.write(out)
+
+def _linkified(rst_path):
+	"return contents of reStructureText file with linked issue references"
+	rst_file = open(rst_path)
+	rst_content = rst_file.read()
+	rst_file.close()
+
+	return _linkified_text(rst_content)
+
+def _linkified_text(rst_content):
+	# first identify any existing HREFs so they're not changed
+	HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
+
+	# split on the HREF pattern, returning the parts to be linkified
+	plain_text_parts = HREF_pattern.split(rst_content)
+	anchors = []
+	linkified_parts = [_linkified_part(part, anchors)
+		for part in plain_text_parts]
+	pairs = itertools.izip_longest(
+		linkified_parts,
+		HREF_pattern.findall(rst_content),
+		fillvalue='',
+	)
+	rst_content = ''.join(flatten(pairs))
+
+	anchors = sorted(anchors)
+
+	bitroot = 'http://bitbucket.org/tarek/distribute'
+	rst_content += "\n"
+	for x in anchors:
+		issue = re.findall(r'\d+', x)[0]
+		rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
+	rst_content += "\n"
+	return rst_content
+
+def flatten(listOfLists):
+	"Flatten one level of nesting"
+	return itertools.chain.from_iterable(listOfLists)
+
+
+def _linkified_part(text, anchors):
+	"""
+	Linkify a part and collect any anchors generated
+	"""
+	revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
+
+	anchors.extend(revision.findall(text)) # ['Issue #43', ...]
+	return revision.sub(r'`\1`_', text)
+
 if __name__ == '__main__':
 	do_release()
diff --git a/setup.py b/setup.py
index 1db770e9fe..e79fb65918 100755
--- a/setup.py
+++ b/setup.py
@@ -133,58 +133,11 @@ def _being_installed():
     from distribute_setup import _before_install
     _before_install()
 
-def _linkified(rst_path):
-    "return contents of reStructureText file with linked issue references"
-    rst_file = open(rst_path)
-    rst_content = rst_file.read()
-    rst_file.close()
-
-    return _linkified_text(rst_content)
-
-def _linkified_text(rst_content):
-    # first identify any existing HREFs so they're not changed
-    HREF_pattern = re.compile('`.*?`_', re.MULTILINE | re.DOTALL)
-
-    # split on the HREF pattern, returning the parts to be linkified
-    plain_text_parts = HREF_pattern.split(rst_content)
-    anchors = []
-    linkified_parts = [_linkified_part(part, anchors)
-        for part in plain_text_parts]
-    pairs = itertools.izip_longest(
-        linkified_parts,
-        HREF_pattern.findall(rst_content),
-        fillvalue='',
-    )
-    rst_content = ''.join(flatten(pairs))
-
-    anchors = sorted(anchors)
-
-    bitroot = 'http://bitbucket.org/tarek/distribute'
-    rst_content += "\n"
-    for x in anchors:
-        issue = re.findall(r'\d+', x)[0]
-        rst_content += '.. _`%s`: %s/issue/%s\n' % (x, bitroot, issue)
-    rst_content += "\n"
-    return rst_content
-
-import itertools
-def flatten(listOfLists):
-    "Flatten one level of nesting"
-    return itertools.chain.from_iterable(listOfLists)
-
-
-def _linkified_part(text, anchors):
-    """
-    Linkify a part and collect any anchors generated
-    """
-    revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
-
-    anchors.extend(revision.findall(text)) # ['Issue #43', ...]
-    return revision.sub(r'`\1`_', text)
-
 readme_file = open('README.txt')
-long_description = readme_file.read() + _linkified('CHANGES.txt')
+changes_file = open('CHANGES (links).txt')
+long_description = readme_file.read() + changes_file.read()
 readme_file.close()
+changes_file.close()
 
 dist = setup(
     name="distribute",

From a938092e7b189337cdd25c101c2e8fc984433eff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 May 2013 19:59:39 -0400
Subject: [PATCH 3734/8469] Allow the setup script to run even if the linked
 changelog hasn't been generated

--HG--
branch : distribute
extra : rebase_source : e94ca350b1a601b75ff6ae786dcdabbe517877c3
---
 setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e79fb65918..eeec315368 100755
--- a/setup.py
+++ b/setup.py
@@ -134,7 +134,12 @@ def _being_installed():
     _before_install()
 
 readme_file = open('README.txt')
-changes_file = open('CHANGES (links).txt')
+# the release script adds hyperlinks to issues
+if os.path.exists('CHANGES (links).txt'):
+    changes_file = open('CHANGES (links).txt')
+else:
+    # but if the release script has not run, fall back to the source file
+    changes_file = open('CHANGES.txt')
 long_description = readme_file.read() + changes_file.read()
 readme_file.close()
 changes_file.close()

From 065e8eb834d65b4e0572611c16f7f2950db4512b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 10:59:30 +0100
Subject: [PATCH 3735/8469] Verified that not isinstance(IOError(), os.error),
 so there's no value in this statement being in the try block.

--HG--
branch : distribute
extra : rebase_source : 79dc86f2251503336feaa3d3f99c744d0ea45887
---
 pkg_resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 69601480d3..9d406e3833 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1409,10 +1409,10 @@ def _extract_resource(self, manager, zip_path):
         )
         timestamp = time.mktime(date_time)
 
+        if not WRITE_SUPPORT:
+            raise IOError('"os.rename" and "os.unlink" are not supported '
+                          'on this platform')
         try:
-            if not WRITE_SUPPORT:
-                raise IOError('"os.rename" and "os.unlink" are not supported '
-                              'on this platform')
 
             real_path = manager.get_cache_path(
                 self.egg_name, self._parts(zip_path)

From 9027ce5419a346e068927df72dbfcd650cdee33f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 12:43:23 +0100
Subject: [PATCH 3736/8469] Extract static method for calculating size and
 timestamp on a zip resource

--HG--
branch : distribute
extra : rebase_source : 3acd099bb90d9abf4d3b265946e0c59b8edcae6e
---
 pkg_resources.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9d406e3833..579e3b46f9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1392,6 +1392,16 @@ def get_resource_filename(self, manager, resource_name):
                 self._extract_resource(manager, self._eager_to_zip(name))
         return self._extract_resource(manager, zip_path)
 
+    @staticmethod
+    def _get_date_and_size(zip_stat):
+        t,d,size = zip_stat[5], zip_stat[6], zip_stat[3]
+        date_time = (
+            (d>>9)+1980, (d>>5)&0xF, d&0x1F,                      # ymd
+            (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1   # hms, etc.
+        )
+        timestamp = time.mktime(date_time)
+        return timestamp, size
+
     def _extract_resource(self, manager, zip_path):
 
         if zip_path in self._index():
@@ -1401,13 +1411,7 @@ def _extract_resource(self, manager, zip_path):
                 )
             return os.path.dirname(last)  # return the extracted directory name
 
-        zip_stat = self.zipinfo[zip_path]
-        t,d,size = zip_stat[5], zip_stat[6], zip_stat[3]
-        date_time = (
-            (d>>9)+1980, (d>>5)&0xF, d&0x1F,                      # ymd
-            (t&0xFFFF)>>11, (t>>5)&0x3F, (t&0x1F) * 2, 0, 0, -1   # hms, etc.
-        )
-        timestamp = time.mktime(date_time)
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
 
         if not WRITE_SUPPORT:
             raise IOError('"os.rename" and "os.unlink" are not supported '

From 7adfcead12a21b2ed6b13f5a75477914b524cb12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 12:54:26 +0100
Subject: [PATCH 3737/8469] Extract method to determine if a temporary file is
 current.

--HG--
branch : distribute
extra : rebase_source : ec2c1860f0ce9abbc3ea999aa54304ea9cc6ecd7
---
 pkg_resources.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 579e3b46f9..b59f170387 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1422,11 +1422,8 @@ def _extract_resource(self, manager, zip_path):
                 self.egg_name, self._parts(zip_path)
             )
 
-            if os.path.isfile(real_path):
-                stat = os.stat(real_path)
-                if stat.st_size==size and stat.st_mtime==timestamp:
-                    # size and stamp match, don't bother extracting
-                    return real_path
+            if self.is_current(real_path, zip_path):
+                return real_path
 
             outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))
             os.write(outf, self.loader.get_data(zip_path))
@@ -1439,11 +1436,9 @@ def _extract_resource(self, manager, zip_path):
 
             except os.error:
                 if os.path.isfile(real_path):
-                    stat = os.stat(real_path)
-
-                    if stat.st_size==size and stat.st_mtime==timestamp:
-                        # size and stamp match, somebody did it just ahead of
-                        # us, so we're done
+                    if self._is_current(real_path, zip_path):
+                        # the file became current since it was checked above,
+                        #  so proceed.
                         return real_path
                     elif os.name=='nt':     # Windows, del old file and retry
                         unlink(real_path)
@@ -1456,6 +1451,16 @@ def _extract_resource(self, manager, zip_path):
 
         return real_path
 
+    def _is_current(self, file_path, zip_path):
+        """
+        Return True if the file_path is current for this zip_path
+        """
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+        if not os.path.isfile(file_path):
+            return False
+        stat = os.stat(file_path)
+        return stat.st_size==size and stat.st_mtime==timestamp
+
     def _get_eager_resources(self):
         if self.eagers is None:
             eagers = []

From f0a3905357e596c9a2a85358fda0f41384ff3d39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 May 2013 13:05:32 +0100
Subject: [PATCH 3738/8469] Fix for yet unpublished issue to ensure that
 get_resource_filename always re-extracts the content of a temporary filename
 if it does not match that of the source content.

--HG--
branch : distribute
extra : rebase_source : 5605ee258010cde1237db058b770c62264c215e2
---
 CHANGES.txt      | 7 +++++++
 pkg_resources.py | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6e2b3b286b..5d4c13bcc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 ------
+0.6.39
+------
+
+* Issue ####: Resources extracted from a zip egg to the file system now also
+  check the contents of the file against the zip contents during each
+  invocation of get_resource_filename.
+
 0.6.38
 ------
 
diff --git a/pkg_resources.py b/pkg_resources.py
index b59f170387..2ec645d3a3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1459,7 +1459,14 @@ def _is_current(self, file_path, zip_path):
         if not os.path.isfile(file_path):
             return False
         stat = os.stat(file_path)
-        return stat.st_size==size and stat.st_mtime==timestamp
+        if stat.st_size!=size or stat.st_mtime!=timestamp:
+            return False
+        # check that the contents match
+        zip_contents = self.loader.get_data(zip_path)
+        f = open(file_path, 'rb')
+        file_contents = f.read()
+        f.close()
+        return zip_contents == file_contents
 
     def _get_eager_resources(self):
         if self.eagers is None:

From a5f153fd048ccd978ab90f54f940f46d77852f51 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 12:28:20 +0200
Subject: [PATCH 3739/8469] Bump to version 3.2.5.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b8f1c164c0..f9016d6d17 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.4"
+__version__ = "3.2.5"
 #--end constants--

From 590f1383d4eb948cafba8ff7bd63acad94531d19 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 12:36:07 +0200
Subject: [PATCH 3740/8469] Closes issue #17732: ignore install-directory
 specific options in distutils.cfg when a venv is active.

---
 dist.py            | 14 +++++++++-
 tests/test_dist.py | 64 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/dist.py b/dist.py
index a702568278..f7fac08918 100644
--- a/dist.py
+++ b/dist.py
@@ -343,6 +343,18 @@ def find_config_files(self):
     def parse_config_files(self, filenames=None):
         from configparser import ConfigParser
 
+        # Ignore install directory options if we have a venv
+        if sys.prefix != sys.base_prefix:
+            ignore_options = [
+                'install-base', 'install-platbase', 'install-lib',
+                'install-platlib', 'install-purelib', 'install-headers',
+                'install-scripts', 'install-data', 'prefix', 'exec-prefix',
+                'home', 'user', 'root']
+        else:
+            ignore_options = []
+
+        ignore_options = frozenset(ignore_options)
+
         if filenames is None:
             filenames = self.find_config_files()
 
@@ -359,7 +371,7 @@ def parse_config_files(self, filenames=None):
                 opt_dict = self.get_option_dict(section)
 
                 for opt in options:
-                    if opt != '__name__':
+                    if opt != '__name__' and opt not in ignore_options:
                         val = parser.get(section,opt)
                         opt = opt.replace('-', '_')
                         opt_dict[opt] = (filename, val)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 8aaae88cae..66c20e27e2 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -6,6 +6,8 @@
 import warnings
 import textwrap
 
+from unittest import mock
+
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 
@@ -18,7 +20,7 @@ class test_dist(Command):
 
     user_options = [
         ("sample-option=", "S", "help text"),
-        ]
+    ]
 
     def initialize_options(self):
         self.sample_option = None
@@ -77,6 +79,64 @@ def test_command_packages_cmdline(self):
         self.assertIsInstance(cmd, test_dist)
         self.assertEqual(cmd.sample_option, "sometext")
 
+    def test_venv_install_options(self):
+        sys.argv.append("install")
+        self.addCleanup(os.unlink, TESTFN)
+
+        fakepath = '/somedir'
+
+        with open(TESTFN, "w") as f:
+            print(("[install]\n"
+                   "install-base = {0}\n"
+                   "install-platbase = {0}\n"
+                   "install-lib = {0}\n"
+                   "install-platlib = {0}\n"
+                   "install-purelib = {0}\n"
+                   "install-headers = {0}\n"
+                   "install-scripts = {0}\n"
+                   "install-data = {0}\n"
+                   "prefix = {0}\n"
+                   "exec-prefix = {0}\n"
+                   "home = {0}\n"
+                   "user = {0}\n"
+                   "root = {0}").format(fakepath), file=f)
+
+        # Base case: Not in a Virtual Environment
+        with mock.patch.multiple(sys, prefix='/a', base_prefix='/a') as values:
+            d = self.create_distribution([TESTFN])
+
+        option_tuple = (TESTFN, fakepath)
+
+        result_dict = {
+            'install_base': option_tuple,
+            'install_platbase': option_tuple,
+            'install_lib': option_tuple,
+            'install_platlib': option_tuple,
+            'install_purelib': option_tuple,
+            'install_headers': option_tuple,
+            'install_scripts': option_tuple,
+            'install_data': option_tuple,
+            'prefix': option_tuple,
+            'exec_prefix': option_tuple,
+            'home': option_tuple,
+            'user': option_tuple,
+            'root': option_tuple,
+        }
+
+        self.assertEqual(
+            sorted(d.command_options.get('install').keys()),
+            sorted(result_dict.keys()))
+
+        for (key, value) in d.command_options.get('install').items():
+            self.assertEqual(value, result_dict[key])
+
+        # Test case: In a Virtual Environment
+        with mock.patch.multiple(sys, prefix='/a', base_prefix='/b') as values:
+            d = self.create_distribution([TESTFN])
+
+        for key in result_dict.keys():
+            self.assertNotIn(key, d.command_options.get('install', {}))
+
     def test_command_packages_configfile(self):
         sys.argv.append("build")
         self.addCleanup(os.unlink, TESTFN)
@@ -304,7 +364,7 @@ def test_custom_pydistutils(self):
                 os.environ['HOME'] = temp_dir
                 files = dist.find_config_files()
                 self.assertIn(user_filename, files,
-                             '%r not found in %r' % (user_filename, files))
+                              '%r not found in %r' % (user_filename, files))
         finally:
             os.remove(user_filename)
 

From 7c5ce9920a18c33d93d4f8c7091db6b197dcbbe2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 12:51:38 +0200
Subject: [PATCH 3741/8469] bump to 3.3.2

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f8af1b336e..83d7cb7f4c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.1"
+__version__ = "3.3.2"
 #--end constants--

From b9661afd506c7c5f43d01c092ce313f33e730892 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 13:34:15 -0400
Subject: [PATCH 3742/8469] Fix AttributeError on underscore-prefixed method
 name.

--HG--
branch : distribute
extra : rebase_source : 8ceb2c2f067a60225bb83817a8584d93f489a3d0
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2ec645d3a3..f8de449e87 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1422,7 +1422,7 @@ def _extract_resource(self, manager, zip_path):
                 self.egg_name, self._parts(zip_path)
             )
 
-            if self.is_current(real_path, zip_path):
+            if self._is_current(real_path, zip_path):
                 return real_path
 
             outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))

From e73268755f8d4889f5491907a9b366f8c2b0770d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 13:46:50 -0400
Subject: [PATCH 3743/8469] Adding test that captures the new requirement.

--HG--
branch : distribute
extra : rebase_source : fcf8db4d0becf51a1e192ec438c13f81d391e342
---
 tests/test_pkg_resources.py | 61 +++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 tests/test_pkg_resources.py

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
new file mode 100644
index 0000000000..7009b4abc0
--- /dev/null
+++ b/tests/test_pkg_resources.py
@@ -0,0 +1,61 @@
+import sys
+import tempfile
+import os
+import zipfile
+
+import pkg_resources
+
+class EggRemover(unicode):
+	def __call__(self):
+		if self in sys.path:
+			sys.path.remove(self)
+		if os.path.exists(self):
+			os.remove(self)
+
+class TestZipProvider(object):
+	finalizers = []
+
+	@classmethod
+	def setup_class(cls):
+		"create a zip egg and add it to sys.path"
+		egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False)
+		zip_egg = zipfile.ZipFile(egg, 'w')
+		zip_info = zipfile.ZipInfo()
+		zip_info.filename = 'mod.py'
+		zip_info.date_time = 2013, 5, 12, 13, 25, 0
+		zip_egg.writestr(zip_info, 'x = 3\n')
+		zip_info = zipfile.ZipInfo()
+		zip_info.filename = 'data.dat'
+		zip_info.date_time = 2013, 5, 12, 13, 25, 0
+		zip_egg.writestr(zip_info, 'hello, world!')
+		zip_egg.close()
+		egg.close()
+
+		sys.path.append(egg.name)
+		cls.finalizers.append(EggRemover(egg.name))
+
+	@classmethod
+	def teardown_class(cls):
+		for finalizer in cls.finalizers:
+			finalizer()
+
+	def test_resource_filename_rewrites_on_change(self):
+		"""
+		If a previous call to get_resource_filename has saved the file, but
+		the file has been subsequently mutated with different file of the
+		same size and modification time, it should not be overwritten on a
+		subsequent call to get_resource_filename.
+		"""
+		import mod
+		manager = pkg_resources.ResourceManager()
+		zp = pkg_resources.ZipProvider(mod)
+		filename = zp.get_resource_filename(manager, 'data.dat')
+		assert os.stat(filename).st_mtime == 1368379500
+		f = open(filename, 'wb')
+		f.write('hello, world?')
+		f.close()
+		os.utime(filename, (1368379500, 1368379500))
+		filename = zp.get_resource_filename(manager, 'data.dat')
+		f = open(filename)
+		assert f.read() == 'hello, world!'
+		manager.cleanup_resources()

From f3dce599fca8023d441decd8c60896c44151b803 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 May 2013 13:52:43 -0400
Subject: [PATCH 3744/8469] Update CHANGELOG to reflect relevant issue.

--HG--
branch : distribute
extra : rebase_source : 785fddb50677fe7779949089e3b090891c3c5bd1
---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5d4c13bcc2..377dc8a501 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES
 0.6.39
 ------
 
-* Issue ####: Resources extracted from a zip egg to the file system now also
+* Issue #375: Resources extracted from a zip egg to the file system now also
   check the contents of the file against the zip contents during each
   invocation of get_resource_filename.
 

From b1bf410e4e9a180ba5b24efcaee6d5f021e4ee5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 15:44:04 -0400
Subject: [PATCH 3745/8469] Update changelog

--HG--
branch : distribute
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index dadd0c7777..eb3e56e1b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ CHANGES
 ------
 
 * External links finder no longer yields duplicate links.
+* Issue #337: Moved site.py to setuptools/site-patch.py (graft of very old
+  patch from setuptools trunk which inspired PR #31).
 
 ------
 0.6.41

From 62e96b0e72c19c087c9de388d6c8897710a3e080 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 15:53:45 -0400
Subject: [PATCH 3746/8469] Added tag 0.6.42 for changeset f30167716b65

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 78cdfc1411..a17ee8b8a2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -51,3 +51,4 @@ f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
 d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
+f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42

From 3116049570db091f6824a36e93925be75e9a7ab5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 16:04:19 -0400
Subject: [PATCH 3747/8469] Bumped to 0.6.43 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 9ab453564e..2792ed9c11 100755
--- a/README.txt
+++ b/README.txt
@@ -99,9 +99,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.42.tar.gz
-    $ tar -xzvf distribute-0.6.42.tar.gz
-    $ cd distribute-0.6.42
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz
+    $ tar -xzvf distribute-0.6.43.tar.gz
+    $ cd distribute-0.6.43
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 53345bbd80..cb93356056 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.42"
+DEFAULT_VERSION = "0.6.43"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index bd9028b685..e4e982b052 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.42'
+version = '0.6.43'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.42'
+release = '0.6.43'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index b657d990eb..168b7512a0 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.42'
+VERSION = '0.6.43'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index a9b7bb0f8f..3ed5b1fb68 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.42"
+VERSION = "0.6.43"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 5f422f5a0c8377a03d1c19c419f61b057a51f783 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 18:17:10 -0400
Subject: [PATCH 3748/8469] Update code repository link.

--HG--
branch : distribute
---
 README.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.txt b/README.txt
index 2792ed9c11..f5cbf69066 100755
--- a/README.txt
+++ b/README.txt
@@ -224,5 +224,4 @@ Feedback and getting involved
 
 - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig
 - Issue tracker: http://bitbucket.org/tarek/distribute/issues/
-- Code Repository: http://bitbucket.org/tarek/distribute
-
+- Code Repository: http://bitbucket.org/pypa/setuptools?at=distribute

From 33c71453d52f1b35ecab54f281de8d7db13fd4ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 18:21:06 -0400
Subject: [PATCH 3749/8469] Update About the fork

--HG--
branch : distribute
---
 README.txt | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/README.txt b/README.txt
index f5cbf69066..cdfa9e09bb 100755
--- a/README.txt
+++ b/README.txt
@@ -11,35 +11,14 @@ Disclaimers
 About the fork
 ==============
 
-`Distribute` is a fork of the `Setuptools` project.
+`Distribute` is a now deprecated fork of the `Setuptools` project.
 
-Distribute is intended to replace Setuptools as the standard method
-for working with Python module distributions.
+Distribute was intended to replace Setuptools as the standard method
+for working with Python module distributions. The code has since been merged
+back into the parent project as is being maintained by the community at large.
 
-The fork has two goals:
-
-- Providing a backward compatible version to replace Setuptools
-  and make all distributions that depend on Setuptools work as
-  before, but with less bugs and behaviorial issues.
-
-  This work is done in the 0.6.x series.
-
-  Starting with version 0.6.2, Distribute supports Python 3.
-  Installing and using distribute for Python 3 code works exactly
-  the same as for Python 2 code, but Distribute also helps you to support
-  Python 2 and Python 3 from the same source code by letting you run 2to3
-  on the code as a part of the build process, by setting the keyword parameter
-  ``use_2to3`` to True. See http://packages.python.org/distribute for more
-  information.
-
-- Refactoring the code, and releasing it in several distributions.
-  This work is being done in the 0.7.x series but not yet released.
-
-The roadmap is still evolving, and the page that is up-to-date is
-located at : `http://packages.python.org/distribute/roadmap`.
-
-If you install `Distribute` and want to switch back for any reason to
-`Setuptools`, get to the `Uninstallation instructions`_ section.
+`Distribute` is now being maintained as a branch in the `Setuptools
+repository <https://bitbucket.org/pypa/setuptools>`_.
 
 More documentation
 ==================

From 2b48816298bc0ad2632a393560176ed151149aa5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 20:37:47 -0400
Subject: [PATCH 3750/8469] Restore Python 2.4 compatible syntax

--HG--
branch : distribute
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0a3f9e05dc..b0388628cd 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -12,7 +12,7 @@
     from md5 import md5
 from fnmatch import translate
 
-from .py24compat import wraps
+from setuptools.py24compat import wraps
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)

From 85086e979f56c92ca096642b899c9df38ac133d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 20:38:46 -0400
Subject: [PATCH 3751/8469] Update changelog

--HG--
branch : distribute
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index eb3e56e1b7..7d22ae1b73 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+0.6.43
+------
+
+* Issue #378: Restore support for Python 2.4 Syntax (regression in 0.6.42).
+
 ------
 0.6.42
 ------

From e1febd2666c8bb27d03f9fce8624e2132a09e764 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 20:43:21 -0400
Subject: [PATCH 3752/8469] Added tag 0.6.43 for changeset 35086ee28673

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a17ee8b8a2..1090fe2c56 100644
--- a/.hgtags
+++ b/.hgtags
@@ -52,3 +52,4 @@ d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
 0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
+35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43

From c12b3db412210faa982134dce22b5e6ddad31bba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 May 2013 20:43:50 -0400
Subject: [PATCH 3753/8469] Bumped to 0.6.44 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index cdfa9e09bb..95eeb1c201 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz
-    $ tar -xzvf distribute-0.6.43.tar.gz
-    $ cd distribute-0.6.43
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.44.tar.gz
+    $ tar -xzvf distribute-0.6.44.tar.gz
+    $ cd distribute-0.6.44
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index cb93356056..a2a066642e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.43"
+DEFAULT_VERSION = "0.6.44"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index e4e982b052..02d1170769 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.43'
+version = '0.6.44'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.43'
+release = '0.6.44'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 168b7512a0..533c922eee 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.43'
+VERSION = '0.6.44'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 3ed5b1fb68..69d814b79e 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.43"
+VERSION = "0.6.44"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From bf1ea34fb467367688fa6ec5d77e98282020d82d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 11:16:50 -0400
Subject: [PATCH 3754/8469] Allow setuptools 0.7 to satisfy use_setuptools.

--HG--
branch : distribute
---
 CHANGES.txt         | 7 +++++++
 distribute_setup.py | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d22ae1b73..e18a534b41 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.44
+------
+
+* ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to
+  satisfy use_setuptools.
+
 ------
 0.6.43
 ------
diff --git a/distribute_setup.py b/distribute_setup.py
index a2a066642e..411c9c8c4f 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -144,6 +144,15 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         try:
             import pkg_resources
+
+            # Setuptools 0.7b and later is a suitable (and preferable)
+            # substitute for any Distribute version.
+            try:
+                pkg_resources.require("setuptools>=0.7b")
+                return
+            except pkg_resources.DistributionNotFound:
+                pass
+
             if not hasattr(pkg_resources, '_distribute'):
                 if not no_fake:
                     _fake_setuptools()

From 8bf427c077bb87c02766129743a09cb333f0c8d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 11:19:36 -0400
Subject: [PATCH 3755/8469] Added tag 0.6.44 for changeset 73aa98aee6bb

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1090fe2c56..07e34faeb9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -53,3 +53,4 @@ d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
+73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44

From 4edd0409cb3a47e3ad8bd681cddfe9957d1e7da9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 11:20:05 -0400
Subject: [PATCH 3756/8469] Bumped to 0.6.45 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 95eeb1c201..d659d8949d 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.44.tar.gz
-    $ tar -xzvf distribute-0.6.44.tar.gz
-    $ cd distribute-0.6.44
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz
+    $ tar -xzvf distribute-0.6.45.tar.gz
+    $ cd distribute-0.6.45
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 411c9c8c4f..a9c00982da 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.44"
+DEFAULT_VERSION = "0.6.45"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 02d1170769..ff934d405c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.44'
+version = '0.6.45'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.44'
+release = '0.6.45'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 533c922eee..5b691c4cb1 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.44'
+VERSION = '0.6.45'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 69d814b79e..c0136dd752 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.44"
+VERSION = "0.6.45"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From b39c770280a208f82159352d2bdf086775b46d92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 28 May 2013 11:21:05 -0400
Subject: [PATCH 3757/8469] Run tests on 3.3 as well

--HG--
branch : distribute
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cbc671e744..83efa5a439 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,6 @@ python:
   - 2.6
   - 2.7
   - 3.2
+  - 3.3
 # command to run tests
 script: python setup.py test

From 8e4909b4686ce72b8cc7798927fd75b83f5bcbff Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Tue, 28 May 2013 16:35:30 -0700
Subject: [PATCH 3758/8469] Issue #18080: When building a C extension module on
 OS X, if the compiler is overriden with the CC environment variable, use the
 new compiler as the default for linking if LDSHARED is not also overriden. 
 This restores Distutils behavior introduced in 3.2.3 and inadvertently
 dropped in 3.3.0.

---
 sysconfig.py                | 10 ++++++++--
 tests/test_unixccompiler.py | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index b73503d296..b9479889f4 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -195,9 +195,15 @@ def customize_compiler(compiler):
             get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
 
-        newcc = None
         if 'CC' in os.environ:
-            cc = os.environ['CC']
+            newcc = os.environ['CC']
+            if (sys.platform == 'darwin'
+                    and 'LDSHARED' not in os.environ
+                    and ldshared.startswith(cc)):
+                # On OS X, if CC is overridden, use that as the default
+                #       command for LDSHARED as well
+                ldshared = newcc + ldshared[len(cc):]
+            cc = newcc
         if 'CXX' in os.environ:
             cxx = os.environ['CXX']
         if 'LDSHARED' in os.environ:
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 1bff38e9ee..a5a63fdde3 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,7 +1,8 @@
 """Tests for distutils.unixccompiler."""
+import os
 import sys
 import unittest
-from test.support import run_unittest
+from test.support import EnvironmentVarGuard, run_unittest
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
@@ -94,7 +95,6 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')
 
-
         # non-GCC GNULD
         sys.platform = 'bar'
         def gcv(v):
@@ -115,6 +115,38 @@ def gcv(v):
         sysconfig.get_config_var = gcv
         self.assertEqual(self.cc.rpath_foo(), '-R/foo')
 
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X')
+    def test_osx_cc_overrides_ldshared(self):
+        # Issue #18080:
+        # ensure that setting CC env variable also changes default linker
+        def gcv(v):
+            if v == 'LDSHARED':
+                return 'gcc-4.2 -bundle -undefined dynamic_lookup '
+            return 'gcc-4.2'
+        sysconfig.get_config_var = gcv
+        with EnvironmentVarGuard() as env:
+            env['CC'] = 'my_cc'
+            del env['LDSHARED']
+            sysconfig.customize_compiler(self.cc)
+        self.assertEqual(self.cc.linker_so[0], 'my_cc')
+
+    @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X')
+    def test_osx_explict_ldshared(self):
+        # Issue #18080:
+        # ensure that setting CC env variable does not change
+        #   explicit LDSHARED setting for linker
+        def gcv(v):
+            if v == 'LDSHARED':
+                return 'gcc-4.2 -bundle -undefined dynamic_lookup '
+            return 'gcc-4.2'
+        sysconfig.get_config_var = gcv
+        with EnvironmentVarGuard() as env:
+            env['CC'] = 'my_cc'
+            env['LDSHARED'] = 'my_ld -bundle -dynamic'
+            sysconfig.customize_compiler(self.cc)
+        self.assertEqual(self.cc.linker_so[0], 'my_ld')
+
+
 def test_suite():
     return unittest.makeSuite(UnixCCompilerTestCase)
 

From 09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 29 May 2013 07:35:38 -0400
Subject: [PATCH 3759/8469] Catch VersionConflict in distribute_setup when
 checking for setuptools 0.7 (to allow upgrade from setuptools to distribute).
 Fixes #379

--HG--
branch : distribute
---
 CHANGES.txt         | 7 +++++++
 distribute_setup.py | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e18a534b41..ac7f59d1a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.45
+------
+
+* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+  restoring ability to upgrade from an older setuptools version.
+
 ------
 0.6.44
 ------
diff --git a/distribute_setup.py b/distribute_setup.py
index a9c00982da..c67b752471 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -150,7 +150,8 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
             try:
                 pkg_resources.require("setuptools>=0.7b")
                 return
-            except pkg_resources.DistributionNotFound:
+            except (pkg_resources.DistributionNotFound,
+                    pkg_resources.VersionConflict):
                 pass
 
             if not hasattr(pkg_resources, '_distribute'):

From 75e163b3bfbef013cbb132727c43df738d028ffe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 29 May 2013 07:36:35 -0400
Subject: [PATCH 3760/8469] Added tag 0.6.45 for changeset ddca71ae5ceb

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 07e34faeb9..c4b0214539 100644
--- a/.hgtags
+++ b/.hgtags
@@ -54,3 +54,4 @@ ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
+ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45

From 641eac6550896506fa939205f249bcfb8f057d57 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 29 May 2013 07:37:04 -0400
Subject: [PATCH 3761/8469] Bumped to 0.6.46 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index d659d8949d..dd763a5714 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.45.tar.gz
-    $ tar -xzvf distribute-0.6.45.tar.gz
-    $ cd distribute-0.6.45
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.46.tar.gz
+    $ tar -xzvf distribute-0.6.46.tar.gz
+    $ cd distribute-0.6.46
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index c67b752471..f7f465a8bf 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.45"
+DEFAULT_VERSION = "0.6.46"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index ff934d405c..ba020915ca 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.45'
+version = '0.6.46'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.45'
+release = '0.6.46'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 5b691c4cb1..9e8764664f 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.45'
+VERSION = '0.6.46'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index c0136dd752..bb21d8153f 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.45"
+VERSION = "0.6.46"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From e2bc5bcf0766570d98e23ccbfaf77589491cc198 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Thu, 13 Jun 2013 20:57:26 -0400
Subject: [PATCH 3762/8469] Issue #18200: Update the stdlib (except tests) to
 use ModuleNotFoundError.

---
 archive_util.py | 2 +-
 ccompiler.py    | 7 +++----
 dist.py         | 9 ++++-----
 msvccompiler.py | 4 ++--
 util.py         | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index fcda08e20a..ba74045dc0 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -9,7 +9,7 @@
 
 try:
     import zipfile
-except ImportError:
+except ModuleNotFoundError:
     zipfile = None
 
 
diff --git a/ccompiler.py b/ccompiler.py
index 911e84dd3b..bc183fc5d1 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,7 +3,7 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-import sys, os, re
+import importlib, sys, os, re
 from distutils.errors import *
 from distutils.spawn import spawn
 from distutils.file_util import move_file
@@ -1013,10 +1013,9 @@ def new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0):
 
     try:
         module_name = "distutils." + module_name
-        __import__ (module_name)
-        module = sys.modules[module_name]
+        module = importlib.import_module(module_name)
         klass = vars(module)[class_name]
-    except ImportError:
+    except ModuleNotFoundError:
         raise DistutilsModuleError(
               "can't compile C/C++ code: unable to load module '%s'" % \
               module_name)
diff --git a/dist.py b/dist.py
index f7fac08918..11f6ff8fbc 100644
--- a/dist.py
+++ b/dist.py
@@ -4,11 +4,11 @@
 being built/installed/distributed.
 """
 
-import sys, os, re
+import importlib, sys, os, re
 
 try:
     import warnings
-except ImportError:
+except ModuleNotFoundError:
     warnings = None
 
 from distutils.errors import *
@@ -788,9 +788,8 @@ def get_command_class(self, command):
             klass_name = command
 
             try:
-                __import__ (module_name)
-                module = sys.modules[module_name]
-            except ImportError:
+                module = importlib.import_module(module_name)
+            except ModuleNotFoundError:
                 continue
 
             try:
diff --git a/msvccompiler.py b/msvccompiler.py
index 8116656961..9a94b41ad6 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -28,7 +28,7 @@
     RegEnumValue = winreg.EnumValue
     RegError = winreg.error
 
-except ImportError:
+except ModuleNotFoundError:
     try:
         import win32api
         import win32con
@@ -39,7 +39,7 @@
         RegEnumKey = win32api.RegEnumKey
         RegEnumValue = win32api.RegEnumValue
         RegError = win32api.error
-    except ImportError:
+    except ModuleNotFoundError:
         log.info("Warning: Can't read registry to find the "
                  "necessary compiler setting\n"
                  "Make sure that Python modules winreg, "
diff --git a/util.py b/util.py
index a2f9544519..e241f59b94 100644
--- a/util.py
+++ b/util.py
@@ -388,7 +388,7 @@ def byte_compile (py_files,
         try:
             from tempfile import mkstemp
             (script_fd, script_name) = mkstemp(".py")
-        except ImportError:
+        except ModuleNotFoundError:
             from tempfile import mktemp
             (script_fd, script_name) = None, mktemp(".py")
         log.info("writing byte-compilation script '%s'", script_name)

From dc3634843234941af85a87b89458982f131e56a2 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sat, 15 Jun 2013 12:59:53 -0400
Subject: [PATCH 3763/8469] Issue #17177: Stop using imp in distutils

---
 command/build_py.py       | 10 +++++-----
 command/install_lib.py    |  6 +++---
 tests/test_bdist_dumb.py  |  3 +--
 tests/test_build_py.py    | 10 ++++++----
 tests/test_install.py     |  4 ++--
 tests/test_install_lib.py |  8 +++++---
 util.py                   |  7 ++++---
 7 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 1371b3d6ff..677723f0b1 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -3,7 +3,7 @@
 Implements the Distutils 'build_py' command."""
 
 import os
-import imp
+import importlib.util
 import sys
 from glob import glob
 
@@ -312,11 +312,11 @@ def get_outputs(self, include_bytecode=1):
             outputs.append(filename)
             if include_bytecode:
                 if self.compile:
-                    outputs.append(imp.cache_from_source(filename,
-                                                         debug_override=True))
+                    outputs.append(importlib.util.cache_from_source(
+                        filename, debug_override=True))
                 if self.optimize > 0:
-                    outputs.append(imp.cache_from_source(filename,
-                                                         debug_override=False))
+                    outputs.append(importlib.util.cache_from_source(
+                        filename, debug_override=False))
 
         outputs += [
             os.path.join(build_dir, filename)
diff --git a/command/install_lib.py b/command/install_lib.py
index 15c08f1249..215813ba97 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -4,7 +4,7 @@
 (install all Python modules)."""
 
 import os
-import imp
+import importlib.util
 import sys
 
 from distutils.core import Command
@@ -165,10 +165,10 @@ def _bytecode_filenames(self, py_filenames):
             if ext != PYTHON_SOURCE_EXTENSION:
                 continue
             if self.compile:
-                bytecode_files.append(imp.cache_from_source(
+                bytecode_files.append(importlib.util.cache_from_source(
                     py_file, debug_override=True))
             if self.optimize > 0:
-                bytecode_files.append(imp.cache_from_source(
+                bytecode_files.append(importlib.util.cache_from_source(
                     py_file, debug_override=False))
 
         return bytecode_files
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index 73061668ae..c8ccdc2383 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.bdist_dumb."""
 
 import os
-import imp
 import sys
 import zipfile
 import unittest
@@ -88,7 +87,7 @@ def test_simple_built(self):
         contents = sorted(os.path.basename(fn) for fn in contents)
         wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py']
         if not sys.dont_write_bytecode:
-            wanted.append('foo.%s.pyc' % imp.get_tag())
+            wanted.append('foo.%s.pyc' % sys.implementation.cache_tag)
         self.assertEqual(contents, sorted(wanted))
 
 def test_suite():
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index e416edd4a1..1b410c397d 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -2,7 +2,6 @@
 
 import os
 import sys
-import imp
 import unittest
 
 from distutils.command.build_py import build_py
@@ -63,7 +62,8 @@ def test_package_data(self):
             self.assertFalse(os.path.exists(pycache_dir))
         else:
             pyc_files = os.listdir(pycache_dir)
-            self.assertIn("__init__.%s.pyc" % imp.get_tag(), pyc_files)
+            self.assertIn("__init__.%s.pyc" % sys.implementation.cache_tag,
+                          pyc_files)
 
     def test_empty_package_dir(self):
         # See bugs #1668596/#1720897
@@ -102,7 +102,8 @@ def test_byte_compile(self):
         found = os.listdir(cmd.build_lib)
         self.assertEqual(sorted(found), ['__pycache__', 'boiledeggs.py'])
         found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
-        self.assertEqual(found, ['boiledeggs.%s.pyc' % imp.get_tag()])
+        self.assertEqual(found,
+                         ['boiledeggs.%s.pyc' % sys.implementation.cache_tag])
 
     @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
     def test_byte_compile_optimized(self):
@@ -119,7 +120,8 @@ def test_byte_compile_optimized(self):
         found = os.listdir(cmd.build_lib)
         self.assertEqual(sorted(found), ['__pycache__', 'boiledeggs.py'])
         found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
-        self.assertEqual(sorted(found), ['boiledeggs.%s.pyo' % imp.get_tag()])
+        self.assertEqual(sorted(found),
+                         ['boiledeggs.%s.pyo' % sys.implementation.cache_tag])
 
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
diff --git a/tests/test_install.py b/tests/test_install.py
index e9b2642732..42bd269bf4 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.install."""
 
 import os
-import imp
 import sys
 import unittest
 import site
@@ -193,7 +192,8 @@ def test_record(self):
             f.close()
 
         found = [os.path.basename(line) for line in content.splitlines()]
-        expected = ['hello.py', 'hello.%s.pyc' % imp.get_tag(), 'sayhi',
+        expected = ['hello.py', 'hello.%s.pyc' % sys.implementation.cache_tag,
+                    'sayhi',
                     'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
         self.assertEqual(found, expected)
 
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 2bd4dc6e96..dbb3e9a67e 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -1,7 +1,7 @@
 """Tests for distutils.command.install_data."""
 import sys
 import os
-import imp
+import importlib.util
 import unittest
 
 from distutils.command.install_lib import install_lib
@@ -44,8 +44,10 @@ def test_byte_compile(self):
         f = os.path.join(project_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        pyc_file = imp.cache_from_source('foo.py', debug_override=True)
-        pyo_file = imp.cache_from_source('foo.py', debug_override=False)
+        pyc_file = importlib.util.cache_from_source('foo.py',
+                                                    debug_override=True)
+        pyo_file = importlib.util.cache_from_source('foo.py',
+                                                    debug_override=False)
         self.assertTrue(os.path.exists(pyc_file))
         self.assertTrue(os.path.exists(pyo_file))
 
diff --git a/util.py b/util.py
index e241f59b94..257de68e18 100644
--- a/util.py
+++ b/util.py
@@ -6,7 +6,7 @@
 
 import os
 import re
-import imp
+import importlib.util
 import sys
 import string
 from distutils.errors import DistutilsPlatformError
@@ -453,9 +453,10 @@ def byte_compile (py_files,
             #   cfile - byte-compiled file
             #   dfile - purported source filename (same as 'file' by default)
             if optimize >= 0:
-                cfile = imp.cache_from_source(file, debug_override=not optimize)
+                cfile = importlib.util.cache_from_source(
+                    file, debug_override=not optimize)
             else:
-                cfile = imp.cache_from_source(file)
+                cfile = importlib.util.cache_from_source(file)
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:

From be8320718ce02583374df5312502490f0bd7e8a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Jun 2013 23:11:41 -0400
Subject: [PATCH 3764/8469] Issue a UserWarning when the egg cache directory is
 likely to be vulnerable to security issues per #375.

--HG--
branch : distribute
---
 pkg_resources.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index f8de449e87..50e4ce9b99 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -14,6 +14,8 @@
 """
 
 import sys, os, zipimport, time, re, imp, types
+import warnings
+import stat
 from urlparse import urlparse, urlunparse
 
 try:
@@ -987,6 +989,7 @@ def get_cache_path(self, archive_name, names=()):
         extract, as it tracks the generated names for possible cleanup later.
         """
         extract_path = self.extraction_path or get_default_cache()
+        self._warn_unsafe_extraction(extract_path)
         target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
         try:
             _bypass_ensure_directory(target_path)
@@ -996,6 +999,28 @@ def get_cache_path(self, archive_name, names=()):
         self.cached_files[target_path] = 1
         return target_path
 
+    @staticmethod
+    def warn_unsafe_extraction_path(path):
+        """
+        If the default extraction path is overridden and set to an insecure
+        location, such as /tmp, it opens up an opportunity for an attacker to
+        replace an extracted file with an unauthorized payload. Warn the user
+        if a known insecure location is used.
+
+        See Distribute #375 for more details.
+        """
+        if os.name == 'nt' and not path.startswith(os.environ['windir']):
+            # On Windows, permissions are generally restrictive by default
+            #  and temp directories are not writable by other users, so
+            #  bypass the warning.
+            return
+        mode = os.stat(path).st_mode
+        if mode & stat.S_IWOTH:
+            msg = ("%s is writable by others and vulnerable to attack when "
+                "used with get_resource_filename. Consider a more secure "
+                "location (set with .set_extraction_path or the "
+                "PYTHON_EGG_CACHE environment variable)." % path)
+            warnings.warn(msg, UserWarning)
 
 
 

From 7e8c32eeda9db5eab02e30ee4528c8c8674e57c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Jun 2013 05:18:05 -0400
Subject: [PATCH 3765/8469] Also protect against group-writable files

--HG--
branch : distribute
---
 pkg_resources.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 50e4ce9b99..69e53ebd0c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1015,8 +1015,9 @@ def warn_unsafe_extraction_path(path):
             #  bypass the warning.
             return
         mode = os.stat(path).st_mode
-        if mode & stat.S_IWOTH:
-            msg = ("%s is writable by others and vulnerable to attack when "
+        if mode & stat.S_IWOTH or mode & stat.S_IWGRP:
+            msg = ("%s is writable by group/others and vulnerable to attack "
+                "when "
                 "used with get_resource_filename. Consider a more secure "
                 "location (set with .set_extraction_path or the "
                 "PYTHON_EGG_CACHE environment variable)." % path)

From 1ba56e8ddabe69b7837307f260a6b5e2f1c0b7c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:06:53 -0400
Subject: [PATCH 3766/8469] Update changelog

--HG--
branch : distribute
---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 377dc8a501..42a5c3afd3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+------
+0.6.46
+------
+
+* Issue #375: Issue a warning if the PYTHON_EGG_CACHE or otherwise
+  customized egg cache location specifies a directory that's group- or
+  world-writable.
+
 ------
 0.6.39
 ------

From fc98145ffdb334dc7a8fe9f48fd2b5bf450114ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:26:25 -0400
Subject: [PATCH 3767/8469] Added tag 0.6.46 for changeset b57e5ba93476

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c4b0214539..43fe0a663a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -55,3 +55,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
+b57e5ba934767dd498669b17551678081b3047b5 0.6.46

From 1ce8f258058dd17fe833968a90e75da6935109a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Jun 2013 10:27:08 -0400
Subject: [PATCH 3768/8469] Bumped to 0.6.47 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index dd763a5714..d40b77d589 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.46.tar.gz
-    $ tar -xzvf distribute-0.6.46.tar.gz
-    $ cd distribute-0.6.46
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.47.tar.gz
+    $ tar -xzvf distribute-0.6.47.tar.gz
+    $ cd distribute-0.6.47
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index f7f465a8bf..d23f0ebeb3 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.46"
+DEFAULT_VERSION = "0.6.47"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index ba020915ca..e6abf19b27 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.46'
+version = '0.6.47'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.46'
+release = '0.6.47'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 9e8764664f..7d92e8d2d1 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.46'
+VERSION = '0.6.47'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index bb21d8153f..60c33e9e7c 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.46"
+VERSION = "0.6.47"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From a6f5642c86af003b1dce6299c2d9a941b2bd63f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:23:00 -0400
Subject: [PATCH 3769/8469] Correct AttributeError

--HG--
branch : distribute
---
 CHANGES.txt      | 7 +++++++
 pkg_resources.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 42a5c3afd3..de4fa77c23 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.47
+------
+
+* Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
+  0.6.46.
+
 ------
 0.6.46
 ------
diff --git a/pkg_resources.py b/pkg_resources.py
index 69e53ebd0c..844c145dc6 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -989,7 +989,7 @@ def get_cache_path(self, archive_name, names=()):
         extract, as it tracks the generated names for possible cleanup later.
         """
         extract_path = self.extraction_path or get_default_cache()
-        self._warn_unsafe_extraction(extract_path)
+        self._warn_unsafe_extraction_path(extract_path)
         target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
         try:
             _bypass_ensure_directory(target_path)

From 57d70005210c8575ccc4fc844fa9e6e3510b020c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:27:08 -0400
Subject: [PATCH 3770/8469] Added tag 0.6.47 for changeset ee2c96701702

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 43fe0a663a..54dd2171ee 100644
--- a/.hgtags
+++ b/.hgtags
@@ -56,3 +56,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
+ee2c967017024197b38e39ced852808265387a4b 0.6.47

From a388b6922478b5d5048d1f7f1685da2ca16050c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 08:27:52 -0400
Subject: [PATCH 3771/8469] Bumped to 0.6.48 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index d40b77d589..e24506bb1e 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.47.tar.gz
-    $ tar -xzvf distribute-0.6.47.tar.gz
-    $ cd distribute-0.6.47
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.48.tar.gz
+    $ tar -xzvf distribute-0.6.48.tar.gz
+    $ cd distribute-0.6.48
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index d23f0ebeb3..112f9202b7 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.47"
+DEFAULT_VERSION = "0.6.48"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index e6abf19b27..9c9a05f283 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.47'
+version = '0.6.48'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.47'
+release = '0.6.48'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 7d92e8d2d1..c258441179 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.47'
+VERSION = '0.6.48'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 60c33e9e7c..929c73b90d 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.47"
+VERSION = "0.6.48"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 96af0a8db149cc8c45c24c1a9066a71ab1935248 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:39:05 -0400
Subject: [PATCH 3772/8469] Correct AttributeError again (this time verified)

--HG--
branch : distribute
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 844c145dc6..e0e0c1a361 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1000,7 +1000,7 @@ def get_cache_path(self, archive_name, names=()):
         return target_path
 
     @staticmethod
-    def warn_unsafe_extraction_path(path):
+    def _warn_unsafe_extraction_path(path):
         """
         If the default extraction path is overridden and set to an insecure
         location, such as /tmp, it opens up an opportunity for an attacker to

From e338182730c76368a994e90357f19dac809bbe00 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:41:42 -0400
Subject: [PATCH 3773/8469] Update changelog

--HG--
branch : distribute
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3baf6e7a82..3efef119a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+0.6.48
+------
+
+* Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
+  0.6.46 (redo).
+
 ------
 0.6.47
 ------

From 3bcd16d6a3f783e53fd8b083c5f9c655a08439fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:42:29 -0400
Subject: [PATCH 3774/8469] Added tag 0.6.48 for changeset cae9127e0534

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 54dd2171ee..c52e79dfed 100644
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
+cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48

From 132ef1524599896fd97bc1477d86a339bcf51415 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Jul 2013 11:42:56 -0400
Subject: [PATCH 3775/8469] Bumped to 0.6.49 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index e24506bb1e..47b4241202 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.48.tar.gz
-    $ tar -xzvf distribute-0.6.48.tar.gz
-    $ cd distribute-0.6.48
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz
+    $ tar -xzvf distribute-0.6.49.tar.gz
+    $ cd distribute-0.6.49
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 112f9202b7..3553b2135e 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.48"
+DEFAULT_VERSION = "0.6.49"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 9c9a05f283..4146dcaa59 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.48'
+version = '0.6.49'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.48'
+release = '0.6.49'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index c258441179..59ac9122e8 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.48'
+VERSION = '0.6.49'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 929c73b90d..99291e883b 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.48"
+VERSION = "0.6.49"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 32a9bf9e2e195447cb3d995e9d8778e8a8d5573e Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Thu, 4 Jul 2013 17:43:24 -0400
Subject: [PATCH 3776/8469] Issue #18200: Back out usage of ModuleNotFoundError
 (8d28d44f3a9a)

---
 archive_util.py | 2 +-
 ccompiler.py    | 7 ++++---
 dist.py         | 9 +++++----
 msvccompiler.py | 4 ++--
 util.py         | 2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index ba74045dc0..fcda08e20a 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -9,7 +9,7 @@
 
 try:
     import zipfile
-except ModuleNotFoundError:
+except ImportError:
     zipfile = None
 
 
diff --git a/ccompiler.py b/ccompiler.py
index bc183fc5d1..911e84dd3b 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -3,7 +3,7 @@
 Contains CCompiler, an abstract base class that defines the interface
 for the Distutils compiler abstraction model."""
 
-import importlib, sys, os, re
+import sys, os, re
 from distutils.errors import *
 from distutils.spawn import spawn
 from distutils.file_util import move_file
@@ -1013,9 +1013,10 @@ def new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0):
 
     try:
         module_name = "distutils." + module_name
-        module = importlib.import_module(module_name)
+        __import__ (module_name)
+        module = sys.modules[module_name]
         klass = vars(module)[class_name]
-    except ModuleNotFoundError:
+    except ImportError:
         raise DistutilsModuleError(
               "can't compile C/C++ code: unable to load module '%s'" % \
               module_name)
diff --git a/dist.py b/dist.py
index 11f6ff8fbc..f7fac08918 100644
--- a/dist.py
+++ b/dist.py
@@ -4,11 +4,11 @@
 being built/installed/distributed.
 """
 
-import importlib, sys, os, re
+import sys, os, re
 
 try:
     import warnings
-except ModuleNotFoundError:
+except ImportError:
     warnings = None
 
 from distutils.errors import *
@@ -788,8 +788,9 @@ def get_command_class(self, command):
             klass_name = command
 
             try:
-                module = importlib.import_module(module_name)
-            except ModuleNotFoundError:
+                __import__ (module_name)
+                module = sys.modules[module_name]
+            except ImportError:
                 continue
 
             try:
diff --git a/msvccompiler.py b/msvccompiler.py
index 9a94b41ad6..8116656961 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -28,7 +28,7 @@
     RegEnumValue = winreg.EnumValue
     RegError = winreg.error
 
-except ModuleNotFoundError:
+except ImportError:
     try:
         import win32api
         import win32con
@@ -39,7 +39,7 @@
         RegEnumKey = win32api.RegEnumKey
         RegEnumValue = win32api.RegEnumValue
         RegError = win32api.error
-    except ModuleNotFoundError:
+    except ImportError:
         log.info("Warning: Can't read registry to find the "
                  "necessary compiler setting\n"
                  "Make sure that Python modules winreg, "
diff --git a/util.py b/util.py
index 257de68e18..efb3834cf5 100644
--- a/util.py
+++ b/util.py
@@ -388,7 +388,7 @@ def byte_compile (py_files,
         try:
             from tempfile import mkstemp
             (script_fd, script_name) = mkstemp(".py")
-        except ModuleNotFoundError:
+        except ImportError:
             from tempfile import mktemp
             (script_fd, script_name) = None, mktemp(".py")
         log.info("writing byte-compilation script '%s'", script_name)

From 9b6dfd8fcd35777b17a132ee0475d25ab1e6ac92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 21:09:03 -0400
Subject: [PATCH 3777/8469] Move warning check in `get_cache_path` to follow
 directory creation. Fixes #375.

--HG--
branch : distribute
---
 CHANGES.txt      | 8 ++++++++
 pkg_resources.py | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index de4fa77c23..c22effd580 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+------
+next..
+------
+
+* Move warning check in ``get_cache_path`` to follow the directory creation
+  to avoid errors when the cache path does not yet exist. Fixes the error
+  reported in #375.
+
 ------
 0.6.47
 ------
diff --git a/pkg_resources.py b/pkg_resources.py
index e0e0c1a361..025a116247 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -989,13 +989,14 @@ def get_cache_path(self, archive_name, names=()):
         extract, as it tracks the generated names for possible cleanup later.
         """
         extract_path = self.extraction_path or get_default_cache()
-        self._warn_unsafe_extraction_path(extract_path)
         target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
         try:
             _bypass_ensure_directory(target_path)
         except:
             self.extraction_error()
 
+        self._warn_unsafe_extraction_path(extract_path)
+
         self.cached_files[target_path] = 1
         return target_path
 

From c84f0b5a6ab113824d02c07849b2304b69fc0d5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 21:59:19 -0400
Subject: [PATCH 3778/8469] Added tag 0.6.49 for changeset f657df1f1ed4

--HG--
branch : distribute
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c52e79dfed..c42cee41a9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -58,3 +58,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
 cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
+f657df1f1ed46596d236376649c99a470662b4ba 0.6.49

From d19a508528b019abbd41e88fa823677ae2f60560 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jul 2013 22:00:07 -0400
Subject: [PATCH 3779/8469] Bumped to 0.6.50 in preparation for next release.

--HG--
branch : distribute
---
 README.txt          | 6 +++---
 distribute_setup.py | 2 +-
 docs/conf.py        | 4 ++--
 release.py          | 2 +-
 setup.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.txt b/README.txt
index 47b4241202..0816138958 100755
--- a/README.txt
+++ b/README.txt
@@ -78,9 +78,9 @@ Source installation
 
 Download the source tarball, uncompress it, then run the install command::
 
-    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz
-    $ tar -xzvf distribute-0.6.49.tar.gz
-    $ cd distribute-0.6.49
+    $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.50.tar.gz
+    $ tar -xzvf distribute-0.6.50.tar.gz
+    $ cd distribute-0.6.50
     $ python setup.py install
 
 ---------------------------
diff --git a/distribute_setup.py b/distribute_setup.py
index 3553b2135e..647c2f8050 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -49,7 +49,7 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.49"
+DEFAULT_VERSION = "0.6.50"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
diff --git a/docs/conf.py b/docs/conf.py
index 4146dcaa59..4132312267 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.49'
+version = '0.6.50'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.49'
+release = '0.6.50'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/release.py b/release.py
index 59ac9122e8..e40d5c40dd 100644
--- a/release.py
+++ b/release.py
@@ -22,7 +22,7 @@
 except Exception:
 	pass
 
-VERSION = '0.6.49'
+VERSION = '0.6.50'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 PACKAGE_INDEX = 'https://pypi.python.org/pypi'
 
diff --git a/setup.py b/setup.py
index 99291e883b..4541f83c68 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 init_file.close()
 
 SETUP_COMMANDS = d['__all__']
-VERSION = "0.6.49"
+VERSION = "0.6.50"
 
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py as _build_py

From 814117ef8e4aa624fc497ce1c47040f68d07daba Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 3 Aug 2013 12:58:12 -0700
Subject: [PATCH 3780/8469] Bumped version to 3.4.0a1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 70a72b0967..f4076d7484 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0a0"
+__version__ = "3.4.0a1"
 #--end constants--

From 82af3811567b3e375d91163f5a0a706b2ecdc9c3 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 17 Aug 2013 16:11:40 +0300
Subject: [PATCH 3781/8469] =?UTF-8?q?#18741:=20fix=20more=20typos.=20=20Pa?=
 =?UTF-8?q?tch=20by=20F=C3=A9vry=20Thibault.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 command/install.py       | 2 +-
 command/sdist.py         | 2 +-
 tests/test_build_clib.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/install.py b/command/install.py
index 9b1c36af82..3c675d1182 100644
--- a/command/install.py
+++ b/command/install.py
@@ -545,7 +545,7 @@ def handle_extra_path(self):
         self.extra_dirs = extra_dirs
 
     def change_roots(self, *names):
-        """Change the install direcories pointed by name using root."""
+        """Change the install directories pointed by name using root."""
         for name in names:
             attr = "install_" + name
             setattr(self, attr, change_root(self.root, getattr(self, attr)))
diff --git a/command/sdist.py b/command/sdist.py
index a9429a4296..116f67ef9b 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -175,7 +175,7 @@ def get_file_list(self):
         depends on the user's options.
         """
         # new behavior when using a template:
-        # the file list is recalculated everytime because
+        # the file list is recalculated every time because
         # even if MANIFEST.in or setup.py are not changed
         # the user might have added some files in the tree that
         # need to be included.
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 69bd2bf624..ee1c04162b 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -77,7 +77,7 @@ def compile(*args, **kw):
 
         cmd.compiler = FakeCompiler()
 
-        # build_libraries is also doing a bit of typoe checking
+        # build_libraries is also doing a bit of typo checking
         lib = [('name', {'sources': 'notvalid'})]
         self.assertRaises(DistutilsSetupError, cmd.build_libraries, lib)
 

From 76f628ffc58098870233d90e64cd26d2e135adcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 25 Aug 2013 13:09:07 -0400
Subject: [PATCH 3782/8469] Updated distribute documentation home page to
 indicate the deprecation and provide links to the newer hotness. Fixes
 Distribute #384.

--HG--
branch : distribute
---
 docs/index.txt | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 5f3b945b20..f3aa78d107 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,16 +1,13 @@
 Welcome to Distribute's documentation!
 ======================================
 
-`Distribute` is a fork of the `Setuptools` project.
+`Distribute` is a deprecated fork of the `Setuptools` project.
 
-Distribute is intended to replace Setuptools as the standard method for
-working with Python module distributions.
-
-For those who may wonder why they should switch to Distribute over Setuptools, it’s quite simple:
-
-- Distribute is a drop-in replacement for Setuptools
-- The code is actively maintained, and has over 10 commiters
-- Distribute offers Python 3 support !
+Since the Setuptools 0.7 release, Setuptools and Distribute have merged
+and Distribute is no longer being maintained. This documentation is kept here
+for posterity, but all ongoing effort should reference the
+`Setuptools project <https://bitbucket.org/pypa/setuptools>`_ and the
+`Setuptools documentation <https://pythonhosted.org/setuptools>`_.
 
 Documentation content:
 
@@ -23,14 +20,3 @@ Documentation content:
    setuptools
    easy_install
    pkg_resources
-
-
-.. image:: http://python-distribute.org/pip_distribute.png
-
-Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0
-
-Copy & paste::
-
- curl -O http://python-distribute.org/distribute_setup.py
- python distribute_setup.py
- easy_install pip
\ No newline at end of file

From 6200cf0997fe3b832b4fda03a4a1cc0d6347c151 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 7 Sep 2013 23:42:07 +1200
Subject: [PATCH 3783/8469] Version number bump for Python 3.4.0a2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f4076d7484..3afd84fefb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0a1"
+__version__ = "3.4.0a2"
 #--end constants--

From d30e05735221377ec2823a2b2942375194753d35 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 28 Sep 2013 23:51:00 +0100
Subject: [PATCH 3784/8469] Version bump to 3.4.0a3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 3afd84fefb..cc18893517 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0a2"
+__version__ = "3.4.0a3"
 #--end constants--

From 6e02dbc3db2e648c23ecbbafc81dff296e8cd262 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 29 Sep 2013 01:48:40 +0200
Subject: [PATCH 3785/8469] Issue #4366: Fix building extensions on all
 platforms when --enable-shared is used.

---
 command/build_ext.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1ad0d5ff58..bc6a23f1b6 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -247,11 +247,10 @@ def finalize_options(self):
                 # building python standard extensions
                 self.library_dirs.append('.')
 
-        # for extensions under Linux or Solaris with a shared Python library,
+        # For building extensions with a shared Python library,
         # Python's library directory must be appended to library_dirs
-        sysconfig.get_config_var('Py_ENABLE_SHARED')
-        if (sys.platform.startswith(('linux', 'gnu', 'sunos'))
-            and sysconfig.get_config_var('Py_ENABLE_SHARED')):
+        # See Issues: #1600860, #4366
+        if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))

From f67dd5be98be8295fb480eb9180b730f53b3e95d Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 11:13:27 -0400
Subject: [PATCH 3786/8469] condense two tests with the same name (closes
 #19114)

---
 tests/test_cmd.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/test_cmd.py b/tests/test_cmd.py
index 195045cc7b..cf5197c30f 100644
--- a/tests/test_cmd.py
+++ b/tests/test_cmd.py
@@ -34,6 +34,18 @@ def test_ensure_string_list(self):
         self.assertRaises(DistutilsOptionError,
                           cmd.ensure_string_list, 'not_string_list2')
 
+        cmd.option1 = 'ok,dok'
+        cmd.ensure_string_list('option1')
+        self.assertEqual(cmd.option1, ['ok', 'dok'])
+
+        cmd.option2 = ['xxx', 'www']
+        cmd.ensure_string_list('option2')
+
+        cmd.option3 = ['ok', 2]
+        self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
+                          'option3')
+
+
     def test_make_file(self):
 
         cmd = self.cmd
@@ -77,19 +89,6 @@ def test_ensure_string(self):
         cmd.option3 = 1
         self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
 
-    def test_ensure_string_list(self):
-        cmd = self.cmd
-        cmd.option1 = 'ok,dok'
-        cmd.ensure_string_list('option1')
-        self.assertEqual(cmd.option1, ['ok', 'dok'])
-
-        cmd.option2 = ['xxx', 'www']
-        cmd.ensure_string_list('option2')
-
-        cmd.option3 = ['ok', 2]
-        self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
-                          'option3')
-
     def test_ensure_filename(self):
         cmd = self.cmd
         cmd.option1 = __file__

From 5cc44b40db683dc8402c77d5c7c13e726a4f7dec Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 30 Sep 2013 22:28:10 +0200
Subject: [PATCH 3787/8469] Issue #12641: Avoid passing "-mno-cygwin" to the
 mingw32 compiler, except when necessary. Patch by Oscar Benjamin.

---
 cygwinccompiler.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 0bdd539c37..e0074a18f3 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -48,7 +48,7 @@
 import os
 import sys
 import copy
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, check_output
 import re
 
 from distutils.ccompiler import gen_preprocess_options, gen_lib_options
@@ -294,13 +294,18 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         else:
             entry_point = ''
 
-        self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
-                             compiler_so='gcc -mno-cygwin -mdll -O -Wall',
-                             compiler_cxx='g++ -mno-cygwin -O -Wall',
-                             linker_exe='gcc -mno-cygwin',
-                             linker_so='%s -mno-cygwin %s %s'
-                                        % (self.linker_dll, shared_option,
-                                           entry_point))
+        if self.gcc_version < '4' or is_cygwingcc():
+            no_cygwin = ' -mno-cygwin'
+        else:
+            no_cygwin = ''
+
+        self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                             compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                             compiler_cxx='g++%s -O -Wall' % no_cygwin,
+                             linker_exe='gcc%s' % no_cygwin,
+                             linker_so='%s%s %s %s'
+                                    % (self.linker_dll, no_cygwin,
+                                       shared_option, entry_point))
         # Maybe we should also append -mthreads, but then the finished
         # dlls need another dll (mingwm10.dll see Mingw32 docs)
         # (-mthreads: Support thread-safe exception handling on `Mingw32')
@@ -393,3 +398,8 @@ def get_versions():
     """
     commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version']
     return tuple([_find_exe_version(cmd) for cmd in commands])
+
+def is_cygwingcc():
+    '''Try to determine if the gcc that would be used is from cygwin.'''
+    out_string = check_output(['gcc', '-dumpmachine'])
+    return out_string.strip().endswith(b'cygwin')

From 1c073f36e3b5850a448d65d90c383a92ddce83ff Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 20 Oct 2013 02:01:29 -0700
Subject: [PATCH 3788/8469] Version bump for 3.4.0a4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index cc18893517..355542edd0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0a3"
+__version__ = "3.4.0a4"
 #--end constants--

From 6302a7c47d5c17bd2b2b51e4e604e2c3dc9378c9 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 27 Oct 2013 09:22:59 +0100
Subject: [PATCH 3789/8469] Bump to 3.3.3rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 83d7cb7f4c..812d8f35dc 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.2"
+__version__ = "3.3.3rc1"
 #--end constants--

From faefc5ec4eaf3fd5f73dd20e43be883326cdb4cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Oct 2013 22:26:46 -0400
Subject: [PATCH 3790/8469] Distribute maintenance discontinued

--HG--
branch : distribute
extra : close : 1

From bdb93d0d82c82df219172499741eb33e22da359e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 11:29:33 -0400
Subject: [PATCH 3791/8469] Issue #19286: Adding test demonstrating the failure
 when a directory is found in the package_data globs.

---
 tests/test_build_py.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index e416edd4a1..2ce9d4492d 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -121,6 +121,37 @@ def test_byte_compile_optimized(self):
         found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
         self.assertEqual(sorted(found), ['boiledeggs.%s.pyo' % imp.get_tag()])
 
+    def test_dir_in_package_data(self):
+        """
+        A directory in package_data should not be added to the filelist.
+        """
+        # See bug 19286
+        sources = self.mkdtemp()
+        pkg_dir = os.path.join(sources, "pkg")
+
+        os.mkdir(pkg_dir)
+        open(os.path.join(pkg_dir, "__init__.py"), "w").close()
+
+        docdir = os.path.join(pkg_dir, "doc")
+        os.mkdir(docdir)
+        open(os.path.join(docdir, "testfile"), "w").close()
+
+        # create the directory that could be incorrectly detected as a file
+        os.mkdir(os.path.join(docdir, 'otherdir'))
+
+        os.chdir(sources)
+        dist = Distribution({"packages": ["pkg"],
+                             "package_data": {"pkg": ["doc/*"]}})
+        # script_name need not exist, it just need to be initialized
+        dist.script_name = os.path.join(sources, "setup.py")
+        dist.script_args = ["build"]
+        dist.parse_command_line()
+
+        try:
+            dist.run_commands()
+        except DistutilsFileError:
+            self.fail("failed package_data when data dir includes a dir")
+
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
         dist = self.create_dist()[1]

From 35249e2c9b4afa5baf6699573c3900e442f0910f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Nov 2013 11:07:35 -0400
Subject: [PATCH 3792/8469] Issue #19286: [distutils] Only match files in
 build_py.find_data_files.

---
 command/build_py.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_py.py b/command/build_py.py
index 1371b3d6ff..d48eb69900 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -127,7 +127,8 @@ def find_data_files(self, package, src_dir):
             # Each pattern has to be converted to a platform-specific path
             filelist = glob(os.path.join(src_dir, convert_path(pattern)))
             # Files that match more than one pattern are only added once
-            files.extend([fn for fn in filelist if fn not in files])
+            files.extend([fn for fn in filelist if fn not in files
+                and os.path.isfile(fn)])
         return files
 
     def build_package_data(self):

From 1849010928400b19f07d68f68404665c50142463 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 12:36:17 -0500
Subject: [PATCH 3793/8469] Re-opening old wounds (branches) to further
 deprecate Distribute and remove docs.

--HG--
branch : distribute
---
 docs/Makefile          |   75 -
 docs/easy_install.txt  | 1597 --------------------
 docs/index.txt         |   16 +-
 docs/pkg_resources.txt | 1955 ------------------------
 docs/python3.txt       |  121 --
 docs/roadmap.txt       |   86 --
 docs/setuptools.txt    | 3230 ----------------------------------------
 docs/using.txt         |   21 -
 8 files changed, 2 insertions(+), 7099 deletions(-)
 delete mode 100644 docs/Makefile
 delete mode 100644 docs/easy_install.txt
 delete mode 100644 docs/pkg_resources.txt
 delete mode 100644 docs/python3.txt
 delete mode 100644 docs/roadmap.txt
 delete mode 100644 docs/setuptools.txt
 delete mode 100644 docs/using.txt

diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 30bf10a930..0000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html      to make standalone HTML files"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
-	@echo "  htmlhelp  to make HTML files and a HTML help project"
-	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  changes   to make an overview over all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
-
-clean:
-	-rm -rf build/*
-
-html:
-	mkdir -p build/html build/doctrees
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
-	@echo
-	@echo "Build finished. The HTML pages are in build/html."
-
-pickle:
-	mkdir -p build/pickle build/doctrees
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-web: pickle
-
-json:
-	mkdir -p build/json build/doctrees
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	mkdir -p build/htmlhelp build/doctrees
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in build/htmlhelp."
-
-latex:
-	mkdir -p build/latex build/doctrees
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in build/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
-
-changes:
-	mkdir -p build/changes build/doctrees
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
-	@echo
-	@echo "The overview file is in build/changes."
-
-linkcheck:
-	mkdir -p build/linkcheck build/doctrees
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in build/linkcheck/output.txt."
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
deleted file mode 100644
index 9b4fcfbb6e..0000000000
--- a/docs/easy_install.txt
+++ /dev/null
@@ -1,1597 +0,0 @@
-============
-Easy Install
-============
-
-Easy Install is a python module (``easy_install``) bundled with ``setuptools``
-that lets you automatically download, build, install, and manage Python
-packages.
-
-Please share your experiences with us! If you encounter difficulty installing
-a package, please contact us via the `distutils mailing list
-<http://mail.python.org/pipermail/distutils-sig/>`_.  (Note: please DO NOT send
-private email directly to the author of setuptools; it will be discarded.  The
-mailing list is a searchable archive of previously-asked and answered
-questions; you should begin your research there before reporting something as a
-bug -- and then do so via list discussion first.)
-
-(Also, if you'd like to learn about how you can use ``setuptools`` to make your
-own packages work better with EasyInstall, or provide EasyInstall-like features
-without requiring your users to use EasyInstall directly, you'll probably want
-to check out the full `setuptools`_ documentation as well.)
-
-.. contents:: **Table of Contents**
-
-
-Using "Easy Install"
-====================
-
-
-.. _installation instructions:
-
-Installing "Easy Install"
--------------------------
-
-Please see the `setuptools PyPI page <http://pypi.python.org/pypi/setuptools>`_
-for download links and basic installation instructions for each of the
-supported platforms.
-
-You will need at least Python 2.3.5, or if you are on a 64-bit platform, Python
-2.4.  An ``easy_install`` script will be installed in the normal location for
-Python scripts on your platform.
-
-Note that the instructions on the setuptools PyPI page assume that you are
-are installling to Python's primary ``site-packages`` directory.  If this is
-not the case, you should consult the section below on `Custom Installation
-Locations`_ before installing.  (And, on Windows, you should not use the
-``.exe`` installer when installing to an alternate location.)
-
-Note that ``easy_install`` normally works by downloading files from the
-internet.  If you are behind an NTLM-based firewall that prevents Python
-programs from accessing the net directly, you may wish to first install and use
-the `APS proxy server <http://ntlmaps.sf.net/>`_, which lets you get past such
-firewalls in the same way that your web browser(s) do.
-
-(Alternately, if you do not wish easy_install to actually download anything, you
-can restrict it from doing so with the ``--allow-hosts`` option; see the
-sections on `restricting downloads with --allow-hosts`_ and `command-line
-options`_ for more details.)
-
-
-Troubleshooting
-~~~~~~~~~~~~~~~
-
-If EasyInstall/setuptools appears to install correctly, and you can run the
-``easy_install`` command but it fails with an ``ImportError``, the most likely
-cause is that you installed to a location other than ``site-packages``,
-without taking any of the steps described in the `Custom Installation
-Locations`_ section below.  Please see that section and follow the steps to
-make sure that your custom location will work correctly.  Then re-install.
-
-Similarly, if you can run ``easy_install``, and it appears to be installing
-packages, but then you can't import them, the most likely issue is that you
-installed EasyInstall correctly but are using it to install packages to a
-non-standard location that hasn't been properly prepared.  Again, see the
-section on `Custom Installation Locations`_ for more details.
-
-
-Windows Notes
-~~~~~~~~~~~~~
-
-On Windows, an ``easy_install.exe`` launcher will also be installed, so that
-you can just type ``easy_install`` as long as it's on your ``PATH``.  If typing
-``easy_install`` at the command prompt doesn't work, check to make sure your
-``PATH`` includes the appropriate ``C:\\Python2X\\Scripts`` directory.  On
-most current versions of Windows, you can change the ``PATH`` by right-clicking
-"My Computer", choosing "Properties" and selecting the "Advanced" tab, then
-clicking the "Environment Variables" button.  ``PATH`` will be in the "System
-Variables" section, and you will need to exit and restart your command shell
-(command.com, cmd.exe, bash, or other) for the change to take effect.  Be sure
-to add a ``;`` after the last item on ``PATH`` before adding the scripts
-directory to it.
-
-Note that instead of changing your ``PATH`` to include the Python scripts
-directory, you can also retarget the installation location for scripts so they
-go on a directory that's already on the ``PATH``.  For more information see the
-sections below on `Command-Line Options`_ and `Configuration Files`_.  You
-can pass command line options (such as ``--script-dir``) to
-``distribute_setup.py`` to control where ``easy_install.exe`` will be installed.
-
-
-
-Downloading and Installing a Package
-------------------------------------
-
-For basic use of ``easy_install``, you need only supply the filename or URL of
-a source distribution or .egg file (`Python Egg`__).
-
-__ http://peak.telecommunity.com/DevCenter/PythonEggs
-
-**Example 1**. Install a package by name, searching PyPI for the latest
-version, and automatically downloading, building, and installing it::
-
-    easy_install SQLObject
-
-**Example 2**. Install or upgrade a package by name and version by finding
-links on a given "download page"::
-
-    easy_install -f http://pythonpaste.org/package_index.html SQLObject
-
-**Example 3**. Download a source distribution from a specified URL,
-automatically building and installing it::
-
-    easy_install http://example.com/path/to/MyPackage-1.2.3.tgz
-
-**Example 4**. Install an already-downloaded .egg file::
-
-    easy_install /my_downloads/OtherPackage-3.2.1-py2.3.egg
-
-**Example 5**.  Upgrade an already-installed package to the latest version
-listed on PyPI::
-
-    easy_install --upgrade PyProtocols
-
-**Example 6**.  Install a source distribution that's already downloaded and
-extracted in the current directory (New in 0.5a9)::
-
-    easy_install .
-
-**Example 7**.  (New in 0.6a1) Find a source distribution or Subversion
-checkout URL for a package, and extract it or check it out to
-``~/projects/sqlobject`` (the name will always be in all-lowercase), where it
-can be examined or edited.  (The package will not be installed, but it can
-easily be installed with ``easy_install ~/projects/sqlobject``.  See `Editing
-and Viewing Source Packages`_ below for more info.)::
-
-    easy_install --editable --build-directory ~/projects SQLObject
-
-**Example 7**. (New in 0.6.11) Install a distribution within your home dir::
-
-    easy_install --user SQLAlchemy
-
-Easy Install accepts URLs, filenames, PyPI package names (i.e., ``distutils``
-"distribution" names), and package+version specifiers.  In each case, it will
-attempt to locate the latest available version that meets your criteria.
-
-When downloading or processing downloaded files, Easy Install recognizes
-distutils source distribution files with extensions of .tgz, .tar, .tar.gz,
-.tar.bz2, or .zip.  And of course it handles already-built .egg
-distributions as well as ``.win32.exe`` installers built using distutils.
-
-By default, packages are installed to the running Python installation's
-``site-packages`` directory, unless you provide the ``-d`` or ``--install-dir``
-option to specify an alternative directory, or specify an alternate location
-using distutils configuration files.  (See `Configuration Files`_, below.)
-
-By default, any scripts included with the package are installed to the running
-Python installation's standard script installation location.  However, if you
-specify an installation directory via the command line or a config file, then
-the default directory for installing scripts will be the same as the package
-installation directory, to ensure that the script will have access to the
-installed package.  You can override this using the ``-s`` or ``--script-dir``
-option.
-
-Installed packages are added to an ``easy-install.pth`` file in the install
-directory, so that Python will always use the most-recently-installed version
-of the package.  If you would like to be able to select which version to use at
-runtime, you should use the ``-m`` or ``--multi-version`` option.
-
-
-Upgrading a Package
--------------------
-
-You don't need to do anything special to upgrade a package: just install the
-new version, either by requesting a specific version, e.g.::
-
-    easy_install "SomePackage==2.0"
-
-a version greater than the one you have now::
-
-    easy_install "SomePackage>2.0"
-
-using the upgrade flag, to find the latest available version on PyPI::
-
-    easy_install --upgrade SomePackage
-
-or by using a download page, direct download URL, or package filename::
-
-    easy_install -f http://example.com/downloads ExamplePackage
-
-    easy_install http://example.com/downloads/ExamplePackage-2.0-py2.4.egg
-
-    easy_install my_downloads/ExamplePackage-2.0.tgz
-
-If you're using ``-m`` or ``--multi-version`` , using the ``require()``
-function at runtime automatically selects the newest installed version of a
-package that meets your version criteria.  So, installing a newer version is
-the only step needed to upgrade such packages.
-
-If you're installing to a directory on PYTHONPATH, or a configured "site"
-directory (and not using ``-m``), installing a package automatically replaces
-any previous version in the ``easy-install.pth`` file, so that Python will
-import the most-recently installed version by default.  So, again, installing
-the newer version is the only upgrade step needed.
-
-If you haven't suppressed script installation (using ``--exclude-scripts`` or
-``-x``), then the upgraded version's scripts will be installed, and they will
-be automatically patched to ``require()`` the corresponding version of the
-package, so that you can use them even if they are installed in multi-version
-mode.
-
-``easy_install`` never actually deletes packages (unless you're installing a
-package with the same name and version number as an existing package), so if
-you want to get rid of older versions of a package, please see `Uninstalling
-Packages`_, below.
-
-
-Changing the Active Version
----------------------------
-
-If you've upgraded a package, but need to revert to a previously-installed
-version, you can do so like this::
-
-    easy_install PackageName==1.2.3
-
-Where ``1.2.3`` is replaced by the exact version number you wish to switch to.
-If a package matching the requested name and version is not already installed
-in a directory on ``sys.path``, it will be located via PyPI and installed.
-
-If you'd like to switch to the latest installed version of ``PackageName``, you
-can do so like this::
-
-    easy_install PackageName
-
-This will activate the latest installed version.  (Note: if you have set any
-``find_links`` via distutils configuration files, those download pages will be
-checked for the latest available version of the package, and it will be
-downloaded and installed if it is newer than your current version.)
-
-Note that changing the active version of a package will install the newly
-active version's scripts, unless the ``--exclude-scripts`` or ``-x`` option is
-specified.
-
-
-Uninstalling Packages
----------------------
-
-If you have replaced a package with another version, then you can just delete
-the package(s) you don't need by deleting the PackageName-versioninfo.egg file
-or directory (found in the installation directory).
-
-If you want to delete the currently installed version of a package (or all
-versions of a package), you should first run::
-
-    easy_install -m PackageName
-
-This will ensure that Python doesn't continue to search for a package you're
-planning to remove. After you've done this, you can safely delete the .egg
-files or directories, along with any scripts you wish to remove.
-
-
-Managing Scripts
-----------------
-
-Whenever you install, upgrade, or change versions of a package, EasyInstall
-automatically installs the scripts for the selected package version, unless
-you tell it not to with ``-x`` or ``--exclude-scripts``.  If any scripts in
-the script directory have the same name, they are overwritten.
-
-Thus, you do not normally need to manually delete scripts for older versions of
-a package, unless the newer version of the package does not include a script
-of the same name.  However, if you are completely uninstalling a package, you
-may wish to manually delete its scripts.
-
-EasyInstall's default behavior means that you can normally only run scripts
-from one version of a package at a time.  If you want to keep multiple versions
-of a script available, however, you can simply use the ``--multi-version`` or
-``-m`` option, and rename the scripts that EasyInstall creates.  This works
-because EasyInstall installs scripts as short code stubs that ``require()`` the
-matching version of the package the script came from, so renaming the script
-has no effect on what it executes.
-
-For example, suppose you want to use two versions of the ``rst2html`` tool
-provided by the `docutils <http://docutils.sf.net/>`_ package.  You might
-first install one version::
-
-    easy_install -m docutils==0.3.9
-
-then rename the ``rst2html.py`` to ``r2h_039``, and install another version::
-
-    easy_install -m docutils==0.3.10
-
-This will create another ``rst2html.py`` script, this one using docutils
-version 0.3.10 instead of 0.3.9.  You now have two scripts, each using a
-different version of the package.  (Notice that we used ``-m`` for both
-installations, so that Python won't lock us out of using anything but the most
-recently-installed version of the package.)
-
-
-
-Tips & Techniques
------------------
-
-
-Multiple Python Versions
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-As of version 0.6a11, EasyInstall installs itself under two names:
-``easy_install`` and ``easy_install-N.N``, where ``N.N`` is the Python version
-used to install it.  Thus, if you install EasyInstall for both Python 2.3 and
-2.4, you can use the ``easy_install-2.3`` or ``easy_install-2.4`` scripts to
-install packages for Python 2.3 or 2.4, respectively.
-
-Also, if you're working with Python version 2.4 or higher, you can run Python
-with ``-m easy_install`` to run that particular Python version's
-``easy_install`` command.
-
-
-Restricting Downloads with ``--allow-hosts``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can use the ``--allow-hosts`` (``-H``) option to restrict what domains
-EasyInstall will look for links and downloads on.  ``--allow-hosts=None``
-prevents downloading altogether.  You can also use wildcards, for example
-to restrict downloading to hosts in your own intranet.  See the section below
-on `Command-Line Options`_ for more details on the ``--allow-hosts`` option.
-
-By default, there are no host restrictions in effect, but you can change this
-default by editing the appropriate `configuration files`_ and adding:
-
-.. code-block:: ini
-
-    [easy_install]
-    allow_hosts = *.myintranet.example.com,*.python.org
-
-The above example would then allow downloads only from hosts in the
-``python.org`` and ``myintranet.example.com`` domains, unless overridden on the
-command line.
-
-
-Installing on Un-networked Machines
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Just copy the eggs or source packages you need to a directory on the target
-machine, then use the ``-f`` or ``--find-links`` option to specify that
-directory's location.  For example::
-
-    easy_install -H None -f somedir SomePackage
-
-will attempt to install SomePackage using only eggs and source packages found
-in ``somedir`` and disallowing all remote access.  You should of course make
-sure you have all of SomePackage's dependencies available in somedir.
-
-If you have another machine of the same operating system and library versions
-(or if the packages aren't platform-specific), you can create the directory of
-eggs using a command like this::
-
-    easy_install -zmaxd somedir SomePackage
-
-This will tell EasyInstall to put zipped eggs or source packages for
-SomePackage and all its dependencies into ``somedir``, without creating any
-scripts or .pth files.  You can then copy the contents of ``somedir`` to the
-target machine.  (``-z`` means zipped eggs, ``-m`` means multi-version, which
-prevents .pth files from being used, ``-a`` means to copy all the eggs needed,
-even if they're installed elsewhere on the machine, and ``-d`` indicates the
-directory to place the eggs in.)
-
-You can also build the eggs from local development packages that were installed
-with the ``setup.py develop`` command, by including the ``-l`` option, e.g.::
-
-    easy_install -zmaxld somedir SomePackage
-
-This will use locally-available source distributions to build the eggs.
-
-
-Packaging Others' Projects As Eggs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Need to distribute a package that isn't published in egg form?  You can use
-EasyInstall to build eggs for a project.  You'll want to use the ``--zip-ok``,
-``--exclude-scripts``, and possibly ``--no-deps`` options (``-z``, ``-x`` and
-``-N``, respectively).  Use ``-d`` or ``--install-dir`` to specify the location
-where you'd like the eggs placed.  By placing them in a directory that is
-published to the web, you can then make the eggs available for download, either
-in an intranet or to the internet at large.
-
-If someone distributes a package in the form of a single ``.py`` file, you can
-wrap it in an egg by tacking an ``#egg=name-version`` suffix on the file's URL.
-So, something like this::
-
-    easy_install -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
-
-will install the package as an egg, and this::
-
-    easy_install -zmaxd. \
-        -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
-
-will create a ``.egg`` file in the current directory.
-
-
-Creating your own Package Index
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In addition to local directories and the Python Package Index, EasyInstall can
-find download links on most any web page whose URL is given to the ``-f``
-(``--find-links``) option.  In the simplest case, you can simply have a web
-page with links to eggs or Python source packages, even an automatically
-generated directory listing (such as the Apache web server provides).
-
-If you are setting up an intranet site for package downloads, you may want to
-configure the target machines to use your download site by default, adding
-something like this to their `configuration files`_:
-
-.. code-block:: ini
-
-    [easy_install]
-    find_links = http://mypackages.example.com/somedir/
-                 http://turbogears.org/download/
-                 http://peak.telecommunity.com/dist/
-
-As you can see, you can list multiple URLs separated by whitespace, continuing
-on multiple lines if necessary (as long as the subsequent lines are indented.
-
-If you are more ambitious, you can also create an entirely custom package index
-or PyPI mirror.  See the ``--index-url`` option under `Command-Line Options`_,
-below, and also the section on `Package Index "API"`_.
-
-
-Password-Protected Sites
-------------------------
-
-If a site you want to download from is password-protected using HTTP "Basic"
-authentication, you can specify your credentials in the URL, like so::
-
-    http://some_userid:some_password@some.example.com/some_path/
-
-You can do this with both index page URLs and direct download URLs.  As long
-as any HTML pages read by easy_install use *relative* links to point to the
-downloads, the same user ID and password will be used to do the downloading.
-
-
-Controlling Build Options
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall respects standard distutils `Configuration Files`_, so you can use
-them to configure build options for packages that it installs from source.  For
-example, if you are on Windows using the MinGW compiler, you can configure the
-default compiler by putting something like this:
-
-.. code-block:: ini
-
-    [build]
-    compiler = mingw32
-
-into the appropriate distutils configuration file.  In fact, since this is just
-normal distutils configuration, it will affect any builds using that config
-file, not just ones done by EasyInstall.  For example, if you add those lines
-to ``distutils.cfg`` in the ``distutils`` package directory, it will be the
-default compiler for *all* packages you build.  See `Configuration Files`_
-below for a list of the standard configuration file locations, and links to
-more documentation on using distutils configuration files.
-
-
-Editing and Viewing Source Packages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sometimes a package's source distribution  contains additional documentation,
-examples, configuration files, etc., that are not part of its actual code.  If
-you want to be able to examine these files, you can use the ``--editable``
-option to EasyInstall, and EasyInstall will look for a source distribution
-or Subversion URL for the package, then download and extract it or check it out
-as a subdirectory of the ``--build-directory`` you specify.  If you then wish
-to install the package after editing or configuring it, you can do so by
-rerunning EasyInstall with that directory as the target.
-
-Note that using ``--editable`` stops EasyInstall from actually building or
-installing the package; it just finds, obtains, and possibly unpacks it for
-you.  This allows you to make changes to the package if necessary, and to
-either install it in development mode using ``setup.py develop`` (if the
-package uses setuptools, that is), or by running ``easy_install projectdir``
-(where ``projectdir`` is the subdirectory EasyInstall created for the
-downloaded package.
-
-In order to use ``--editable`` (``-e`` for short), you *must* also supply a
-``--build-directory`` (``-b`` for short).  The project will be placed in a
-subdirectory of the build directory.  The subdirectory will have the same
-name as the project itself, but in all-lowercase.  If a file or directory of
-that name already exists, EasyInstall will print an error message and exit.
-
-Also, when using ``--editable``, you cannot use URLs or filenames as arguments.
-You *must* specify project names (and optional version requirements) so that
-EasyInstall knows what directory name(s) to create.  If you need to force
-EasyInstall to use a particular URL or filename, you should specify it as a
-``--find-links`` item (``-f`` for short), and then also specify
-the project name, e.g.::
-
-    easy_install -eb ~/projects \
-     -fhttp://prdownloads.sourceforge.net/ctypes/ctypes-0.9.6.tar.gz?download \
-     ctypes==0.9.6
-
-
-Dealing with Installation Conflicts
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-(NOTE: As of 0.6a11, this section is obsolete; it is retained here only so that
-people using older versions of EasyInstall can consult it.  As of version
-0.6a11, installation conflicts are handled automatically without deleting the
-old or system-installed packages, and without ignoring the issue.  Instead,
-eggs are automatically shifted to the front of ``sys.path`` using special
-code added to the ``easy-install.pth`` file.  So, if you are using version
-0.6a11 or better of setuptools, you do not need to worry about conflicts,
-and the following issues do not apply to you.)
-
-EasyInstall installs distributions in a "managed" way, such that each
-distribution can be independently activated or deactivated on ``sys.path``.
-However, packages that were not installed by EasyInstall are "unmanaged",
-in that they usually live all in one directory and cannot be independently
-activated or deactivated.
-
-As a result, if you are using EasyInstall to upgrade an existing package, or
-to install a package with the same name as an existing package, EasyInstall
-will warn you of the conflict.  (This is an improvement over ``setup.py
-install``, becuase the ``distutils`` just install new packages on top of old
-ones, possibly combining two unrelated packages or leaving behind modules that
-have been deleted in the newer version of the package.)
-
-By default, EasyInstall will stop the installation if it detects a conflict
-between an existing, "unmanaged" package, and a module or package in any of
-the distributions you're installing.  It will display a list of all of the
-existing files and directories that would need to be deleted for the new
-package to be able to function correctly.  You can then either delete these
-conflicting files and directories yourself and re-run EasyInstall, or you can
-just use the ``--delete-conflicting`` or ``--ignore-conflicts-at-my-risk``
-options, as described under `Command-Line Options`_, below.
-
-Of course, once you've replaced all of your existing "unmanaged" packages with
-versions managed by EasyInstall, you won't have any more conflicts to worry
-about!
-
-
-Compressed Installation
-~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall tries to install packages in zipped form, if it can.  Zipping
-packages can improve Python's overall import performance if you're not using
-the ``--multi-version`` option, because Python processes zipfile entries on
-``sys.path`` much faster than it does directories.
-
-As of version 0.5a9, EasyInstall analyzes packages to determine whether they
-can be safely installed as a zipfile, and then acts on its analysis.  (Previous
-versions would not install a package as a zipfile unless you used the
-``--zip-ok`` option.)
-
-The current analysis approach is fairly conservative; it currenly looks for:
-
- * Any use of the ``__file__`` or ``__path__`` variables (which should be
-   replaced with ``pkg_resources`` API calls)
-
- * Possible use of ``inspect`` functions that expect to manipulate source files
-   (e.g. ``inspect.getsource()``)
-
- * Top-level modules that might be scripts used with ``python -m`` (Python 2.4)
-
-If any of the above are found in the package being installed, EasyInstall will
-assume that the package cannot be safely run from a zipfile, and unzip it to
-a directory instead.  You can override this analysis with the ``-zip-ok`` flag,
-which will tell EasyInstall to install the package as a zipfile anyway.  Or,
-you can use the ``--always-unzip`` flag, in which case EasyInstall will always
-unzip, even if its analysis says the package is safe to run as a zipfile.
-
-Normally, however, it is simplest to let EasyInstall handle the determination
-of whether to zip or unzip, and only specify overrides when needed to work
-around a problem.  If you find you need to override EasyInstall's guesses, you
-may want to contact the package author and the EasyInstall maintainers, so that
-they can make appropriate changes in future versions.
-
-(Note: If a package uses ``setuptools`` in its setup script, the package author
-has the option to declare the package safe or unsafe for zipped usage via the
-``zip_safe`` argument to ``setup()``.  If the package author makes such a
-declaration, EasyInstall believes the package's author and does not perform its
-own analysis.  However, your command-line option, if any, will still override
-the package author's choice.)
-
-
-Reference Manual
-================
-
-Configuration Files
--------------------
-
-(New in 0.4a2)
-
-You may specify default options for EasyInstall using the standard
-distutils configuration files, under the command heading ``easy_install``.
-EasyInstall will look first for a ``setup.cfg`` file in the current directory,
-then a ``~/.pydistutils.cfg`` or ``$HOME\\pydistutils.cfg`` (on Unix-like OSes
-and Windows, respectively), and finally a ``distutils.cfg`` file in the
-``distutils`` package directory.  Here's a simple example:
-
-.. code-block:: ini
-
-    [easy_install]
-
-    # set the default location to install packages
-    install_dir = /home/me/lib/python
-
-    # Notice that indentation can be used to continue an option
-    # value; this is especially useful for the "--find-links"
-    # option, which tells easy_install to use download links on
-    # these pages before consulting PyPI:
-    #
-    find_links = http://sqlobject.org/
-                 http://peak.telecommunity.com/dist/
-
-In addition to accepting configuration for its own options under
-``[easy_install]``, EasyInstall also respects defaults specified for other
-distutils commands.  For example, if you don't set an ``install_dir`` for
-``[easy_install]``, but *have* set an ``install_lib`` for the ``[install]``
-command, this will become EasyInstall's default installation directory.  Thus,
-if you are already using distutils configuration files to set default install
-locations, build options, etc., EasyInstall will respect your existing settings
-until and unless you override them explicitly in an ``[easy_install]`` section.
-
-For more information, see also the current Python documentation on the `use and
-location of distutils configuration files <http://docs.python.org/inst/config-syntax.html>`_.
-
-Notice that ``easy_install`` will use the ``setup.cfg`` from the current
-working directory only if it was triggered from ``setup.py`` through the
-``install_requires`` option. The standalone command will not use that file.
-
-Command-Line Options
---------------------
-
-``--zip-ok, -z``
-    Install all packages as zip files, even if they are marked as unsafe for
-    running as a zipfile.  This can be useful when EasyInstall's analysis
-    of a non-setuptools package is too conservative, but keep in mind that
-    the package may not work correctly.  (Changed in 0.5a9; previously this
-    option was required in order for zipped installation to happen at all.)
-
-``--always-unzip, -Z``
-    Don't install any packages as zip files, even if the packages are marked
-    as safe for running as a zipfile.  This can be useful if a package does
-    something unsafe, but not in a way that EasyInstall can easily detect.
-    EasyInstall's default analysis is currently very conservative, however, so
-    you should only use this option if you've had problems with a particular
-    package, and *after* reporting the problem to the package's maintainer and
-    to the EasyInstall maintainers.
-
-    (Note: the ``-z/-Z`` options only affect the installation of newly-built
-    or downloaded packages that are not already installed in the target
-    directory; if you want to convert an existing installed version from
-    zipped to unzipped or vice versa, you'll need to delete the existing
-    version first, and re-run EasyInstall.)
-
-``--multi-version, -m``
-    "Multi-version" mode. Specifying this option prevents ``easy_install`` from
-    adding an ``easy-install.pth`` entry for the package being installed, and
-    if an entry for any version the package already exists, it will be removed
-    upon successful installation. In multi-version mode, no specific version of
-    the package is available for importing, unless you use
-    ``pkg_resources.require()`` to put it on ``sys.path``. This can be as
-    simple as::
-
-        from pkg_resources import require
-        require("SomePackage", "OtherPackage", "MyPackage")
-
-    which will put the latest installed version of the specified packages on
-    ``sys.path`` for you. (For more advanced uses, like selecting specific
-    versions and enabling optional dependencies, see the ``pkg_resources`` API
-    doc.)
-
-    Changed in 0.6a10: this option is no longer silently enabled when
-    installing to a non-PYTHONPATH, non-"site" directory.  You must always
-    explicitly use this option if you want it to be active.
-
-``--upgrade, -U``   (New in 0.5a4)
-    By default, EasyInstall only searches online if a project/version
-    requirement can't be met by distributions already installed
-    on sys.path or the installation directory.  However, if you supply the
-    ``--upgrade`` or ``-U`` flag, EasyInstall will always check the package
-    index and ``--find-links`` URLs before selecting a version to install.  In
-    this way, you can force EasyInstall to use the latest available version of
-    any package it installs (subject to any version requirements that might
-    exclude such later versions).
-
-``--install-dir=DIR, -d DIR``
-    Set the installation directory. It is up to you to ensure that this
-    directory is on ``sys.path`` at runtime, and to use
-    ``pkg_resources.require()`` to enable the installed package(s) that you
-    need.
-
-    (New in 0.4a2) If this option is not directly specified on the command line
-    or in a distutils configuration file, the distutils default installation
-    location is used.  Normally, this would be the ``site-packages`` directory,
-    but if you are using distutils configuration files, setting things like
-    ``prefix`` or ``install_lib``, then those settings are taken into
-    account when computing the default installation directory, as is the
-    ``--prefix`` option.
-
-``--script-dir=DIR, -s DIR``
-    Set the script installation directory.  If you don't supply this option
-    (via the command line or a configuration file), but you *have* supplied
-    an ``--install-dir`` (via command line or config file), then this option
-    defaults to the same directory, so that the scripts will be able to find
-    their associated package installation.  Otherwise, this setting defaults
-    to the location where the distutils would normally install scripts, taking
-    any distutils configuration file settings into account.
-
-``--exclude-scripts, -x``
-    Don't install scripts.  This is useful if you need to install multiple
-    versions of a package, but do not want to reset the version that will be
-    run by scripts that are already installed.
-
-``--user`` (New in 0.6.11)
-    Use the the user-site-packages as specified in :pep:`370`
-    instead of the global site-packages.
-
-``--always-copy, -a``   (New in 0.5a4)
-    Copy all needed distributions to the installation directory, even if they
-    are already present in a directory on sys.path.  In older versions of
-    EasyInstall, this was the default behavior, but now you must explicitly
-    request it.  By default, EasyInstall will no longer copy such distributions
-    from other sys.path directories to the installation directory, unless you
-    explicitly gave the distribution's filename on the command line.
-
-    Note that as of 0.6a10, using this option excludes "system" and
-    "development" eggs from consideration because they can't be reliably
-    copied.  This may cause EasyInstall to choose an older version of a package
-    than what you expected, or it may cause downloading and installation of a
-    fresh copy of something that's already installed.  You will see warning
-    messages for any eggs that EasyInstall skips, before it falls back to an
-    older version or attempts to download a fresh copy.
-
-``--find-links=URLS_OR_FILENAMES, -f URLS_OR_FILENAMES``
-    Scan the specified "download pages" or directories for direct links to eggs
-    or other distributions.  Any existing file or directory names or direct
-    download URLs are immediately added to EasyInstall's search cache, and any
-    indirect URLs (ones that don't point to eggs or other recognized archive
-    formats) are added to a list of additional places to search for download
-    links.  As soon as EasyInstall has to go online to find a package (either
-    because it doesn't exist locally, or because ``--upgrade`` or ``-U`` was
-    used), the specified URLs will be downloaded and scanned for additional
-    direct links.
-
-    Eggs and archives found by way of ``--find-links`` are only downloaded if
-    they are needed to meet a requirement specified on the command line; links
-    to unneeded packages are ignored.
-
-    If all requested packages can be found using links on the specified
-    download pages, the Python Package Index will not be consulted unless you
-    also specified the ``--upgrade`` or ``-U`` option.
-
-    (Note: if you want to refer to a local HTML file containing links, you must
-    use a ``file:`` URL, as filenames that do not refer to a directory, egg, or
-    archive are ignored.)
-
-    You may specify multiple URLs or file/directory names with this option,
-    separated by whitespace.  Note that on the command line, you will probably
-    have to surround the URL list with quotes, so that it is recognized as a
-    single option value.  You can also specify URLs in a configuration file;
-    see `Configuration Files`_, above.
-
-    Changed in 0.6a10: previously all URLs and directories passed to this
-    option were scanned as early as possible, but from 0.6a10 on, only
-    directories and direct archive links are scanned immediately; URLs are not
-    retrieved unless a package search was already going to go online due to a
-    package not being available locally, or due to the use of the ``--update``
-    or ``-U`` option.
-
-``--no-find-links`` Blocks the addition of any link. (New in Distribute 0.6.11)
-    This is useful if you want to avoid adding links defined in a project
-    easy_install is installing (wether it's a requested project or a
-    dependency.). When used, ``--find-links`` is ignored.
-
-``--delete-conflicting, -D`` (Removed in 0.6a11)
-    (As of 0.6a11, this option is no longer necessary; please do not use it!)
-
-    If you are replacing a package that was previously installed *without*
-    using EasyInstall, the old version may end up on ``sys.path`` before the
-    version being installed with EasyInstall.  EasyInstall will normally abort
-    the installation of a package if it detects such a conflict, and ask you to
-    manually remove the conflicting files or directories.  If you specify this
-    option, however, EasyInstall will attempt to delete the files or
-    directories itself, and then proceed with the installation.
-
-``--ignore-conflicts-at-my-risk`` (Removed in 0.6a11)
-    (As of 0.6a11, this option is no longer necessary; please do not use it!)
-
-    Ignore conflicting packages and proceed with installation anyway, even
-    though it means the package probably won't work properly.  If the
-    conflicting package is in a directory you can't write to, this may be your
-    only option, but you will need to take more invasive measures to get the
-    installed package to work, like manually adding it to ``PYTHONPATH`` or to
-    ``sys.path`` at runtime.
-
-``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
-    Specifies the base URL of the Python Package Index.  The default is
-    http://pypi.python.org/simple if not specified.  When a package is requested
-    that is not locally available or linked from a ``--find-links`` download
-    page, the package index will be searched for download pages for the needed
-    package, and those download pages will be searched for links to download
-    an egg or source distribution.
-
-``--editable, -e`` (New in 0.6a1)
-    Only find and download source distributions for the specified projects,
-    unpacking them to subdirectories of the specified ``--build-directory``.
-    EasyInstall will not actually build or install the requested projects or
-    their dependencies; it will just find and extract them for you.  See
-    `Editing and Viewing Source Packages`_ above for more details.
-
-``--build-directory=DIR, -b DIR`` (UPDATED in 0.6a1)
-    Set the directory used to build source packages.  If a package is built
-    from a source distribution or checkout, it will be extracted to a
-    subdirectory of the specified directory.  The subdirectory will have the
-    same name as the extracted distribution's project, but in all-lowercase.
-    If a file or directory of that name already exists in the given directory,
-    a warning will be printed to the console, and the build will take place in
-    a temporary directory instead.
-
-    This option is most useful in combination with the ``--editable`` option,
-    which forces EasyInstall to *only* find and extract (but not build and
-    install) source distributions.  See `Editing and Viewing Source Packages`_,
-    above, for more information.
-
-``--verbose, -v, --quiet, -q`` (New in 0.4a4)
-    Control the level of detail of EasyInstall's progress messages.  The
-    default detail level is "info", which prints information only about
-    relatively time-consuming operations like running a setup script, unpacking
-    an archive, or retrieving a URL.  Using ``-q`` or ``--quiet`` drops the
-    detail level to "warn", which will only display installation reports,
-    warnings, and errors.  Using ``-v`` or ``--verbose`` increases the detail
-    level to include individual file-level operations, link analysis messages,
-    and distutils messages from any setup scripts that get run.  If you include
-    the ``-v`` option more than once, the second and subsequent uses are passed
-    down to any setup scripts, increasing the verbosity of their reporting as
-    well.
-
-``--dry-run, -n`` (New in 0.4a4)
-    Don't actually install the package or scripts.  This option is passed down
-    to any setup scripts run, so packages should not actually build either.
-    This does *not* skip downloading, nor does it skip extracting source
-    distributions to a temporary/build directory.
-
-``--optimize=LEVEL``, ``-O LEVEL`` (New in 0.4a4)
-    If you are installing from a source distribution, and are *not* using the
-    ``--zip-ok`` option, this option controls the optimization level for
-    compiling installed ``.py`` files to ``.pyo`` files.  It does not affect
-    the compilation of modules contained in ``.egg`` files, only those in
-    ``.egg`` directories.  The optimization level can be set to 0, 1, or 2;
-    the default is 0 (unless it's set under ``install`` or ``install_lib`` in
-    one of your distutils configuration files).
-
-``--record=FILENAME``  (New in 0.5a4)
-    Write a record of all installed files to FILENAME.  This is basically the
-    same as the same option for the standard distutils "install" command, and
-    is included for compatibility with tools that expect to pass this option
-    to "setup.py install".
-
-``--site-dirs=DIRLIST, -S DIRLIST``   (New in 0.6a1)
-    Specify one or more custom "site" directories (separated by commas).
-    "Site" directories are directories where ``.pth`` files are processed, such
-    as the main Python ``site-packages`` directory.  As of 0.6a10, EasyInstall
-    automatically detects whether a given directory processes ``.pth`` files
-    (or can be made to do so), so you should not normally need to use this
-    option.  It is is now only necessary if you want to override EasyInstall's
-    judgment and force an installation directory to be treated as if it
-    supported ``.pth`` files.
-
-``--no-deps, -N``  (New in 0.6a6)
-    Don't install any dependencies.  This is intended as a convenience for
-    tools that wrap eggs in a platform-specific packaging system.  (We don't
-    recommend that you use it for anything else.)
-
-``--allow-hosts=PATTERNS, -H PATTERNS``   (New in 0.6a6)
-    Restrict downloading and spidering to hosts matching the specified glob
-    patterns.  E.g. ``-H *.python.org`` restricts web access so that only
-    packages listed and downloadable from machines in the ``python.org``
-    domain.  The glob patterns must match the *entire* user/host/port section of
-    the target URL(s).  For example, ``*.python.org`` will NOT accept a URL
-    like ``http://python.org/foo`` or ``http://www.python.org:8080/``.
-    Multiple patterns can be specified by separting them with commas.  The
-    default pattern is ``*``, which matches anything.
-
-    In general, this option is mainly useful for blocking EasyInstall's web
-    access altogether (e.g. ``-Hlocalhost``), or to restrict it to an intranet
-    or other trusted site.  EasyInstall will do the best it can to satisfy
-    dependencies given your host restrictions, but of course can fail if it
-    can't find suitable packages.  EasyInstall displays all blocked URLs, so
-    that you can adjust your ``--allow-hosts`` setting if it is more strict
-    than you intended.  Some sites may wish to define a restrictive default
-    setting for this option in their `configuration files`_, and then manually
-    override the setting on the command line as needed.
-
-``--prefix=DIR`` (New in 0.6a10)
-    Use the specified directory as a base for computing the default
-    installation and script directories.  On Windows, the resulting default
-    directories will be ``prefix\\Lib\\site-packages`` and ``prefix\\Scripts``,
-    while on other platforms the defaults will be
-    ``prefix/lib/python2.X/site-packages`` (with the appropriate version
-    substituted) for libraries and ``prefix/bin`` for scripts.
-
-    Note that the ``--prefix`` option only sets the *default* installation and
-    script directories, and does not override the ones set on the command line
-    or in a configuration file.
-
-``--local-snapshots-ok, -l`` (New in 0.6c6)
-    Normally, EasyInstall prefers to only install *released* versions of
-    projects, not in-development ones, because such projects may not
-    have a currently-valid version number.  So, it usually only installs them
-    when their ``setup.py`` directory is explicitly passed on the command line.
-
-    However, if this option is used, then any in-development projects that were
-    installed using the ``setup.py develop`` command, will be used to build
-    eggs, effectively upgrading the "in-development" project to a snapshot
-    release.  Normally, this option is used only in conjunction with the
-    ``--always-copy`` option to create a distributable snapshot of every egg
-    needed to run an application.
-
-    Note that if you use this option, you must make sure that there is a valid
-    version number (such as an SVN revision number tag) for any in-development
-    projects that may be used, as otherwise EasyInstall may not be able to tell
-    what version of the project is "newer" when future installations or
-    upgrades are attempted.
-
-
-.. _non-root installation:
-
-Custom Installation Locations
------------------------------
-
-By default, EasyInstall installs python packages into Python's main ``site-packages`` directory,
-and manages them using a custom ``.pth`` file in that same directory.
-
-Very often though, a user or developer wants ``easy_install`` to install and manage python packages
-in an alternative location, usually for one of 3 reasons:
-
-1. They don't have access to write to the main Python site-packages directory.
-
-2. They want a user-specific stash of packages, that is not visible to other users.
-
-3. They want to isolate a set of packages to a specific python application, usually to minimize
-   the possibility of version conflicts.
-
-Historically, there have been many approaches to achieve custom installation.
-The following section lists only the easiest and most relevant approaches [1]_.
-
-`Use the "--user" option`_
-
-`Use the "--user" option and customize "PYTHONUSERBASE"`_
-
-`Use "virtualenv"`_
-
-.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_ in Python 2.6.
-
-.. _PEP-370: http://www.python.org/dev/peps/pep-0370/
-
-
-Use the "--user" option
-~~~~~~~~~~~~~~~~~~~~~~~
-With Python 2.6 came the User scheme for installation, which means that all
-python distributions support an alternative install location that is specific to a user [2]_ [3]_.
-The Default location for each OS is explained in the python documentation
-for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
-specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
-This approach serves the need to have a user-specific stash of packages.
-
-.. [2] Prior to Python2.6, Mac OS X offered a form of the User scheme. That is now subsumed into the User scheme introduced in Python 2.6.
-.. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
-
-Use the "--user" option and customize "PYTHONUSERBASE"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The User scheme install location can be customized by setting the ``PYTHONUSERBASE`` environment
-variable, which updates the value of ``site.USER_BASE``.  To isolate packages to a specific
-application, simply set the OS environment of that application to a specific value of
-``PYTHONUSERBASE``, that contains just those packages.
-
-Use "virtualenv"
-~~~~~~~~~~~~~~~~
-"virtualenv" is a 3rd-party python package that effectively "clones" a python installation, thereby
-creating an isolated location to intall packages.  The evolution of "virtualenv" started before the existence
-of the User installation scheme.  "virtualenv" provides a version of ``easy_install`` that is
-scoped to the cloned python install and is used in the normal way. "virtualenv" does offer various features
-that the User installation scheme alone does not provide, e.g. the ability to hide the main python site-packages.
-
-Please refer to the `virtualenv`_ documentation for more details.
-
-.. _virtualenv: http://pypi.python.org/pypi/virtualenv
-
-
-
-Package Index "API"
--------------------
-
-Custom package indexes (and PyPI) must follow the following rules for
-EasyInstall to be able to look up and download packages:
-
-1. Except where stated otherwise, "pages" are HTML or XHTML, and "links"
-   refer to ``href`` attributes.
-
-2. Individual project version pages' URLs must be of the form
-   ``base/projectname/version``, where ``base`` is the package index's base URL.
-
-3. Omitting the ``/version`` part of a project page's URL (but keeping the
-   trailing ``/``) should result in a page that is either:
-
-   a) The single active version of that project, as though the version had been
-      explicitly included, OR
-
-   b) A page with links to all of the active version pages for that project.
-
-4. Individual project version pages should contain direct links to downloadable
-   distributions where possible.  It is explicitly permitted for a project's
-   "long_description" to include URLs, and these should be formatted as HTML
-   links by the package index, as EasyInstall does no special processing to
-   identify what parts of a page are index-specific and which are part of the
-   project's supplied description.
-
-5. Where available, MD5 information should be added to download URLs by
-   appending a fragment identifier of the form ``#md5=...``, where ``...`` is
-   the 32-character hex MD5 digest.  EasyInstall will verify that the
-   downloaded file's MD5 digest matches the given value.
-
-6. Individual project version pages should identify any "homepage" or
-   "download" URLs using ``rel="homepage"`` and ``rel="download"`` attributes
-   on the HTML elements linking to those URLs. Use of these attributes will
-   cause EasyInstall to always follow the provided links, unless it can be
-   determined by inspection that they are downloadable distributions. If the
-   links are not to downloadable distributions, they are retrieved, and if they
-   are HTML, they are scanned for download links. They are *not* scanned for
-   additional "homepage" or "download" links, as these are only processed for
-   pages that are part of a package index site.
-
-7. The root URL of the index, if retrieved with a trailing ``/``, must result
-   in a page containing links to *all* projects' active version pages.
-
-   (Note: This requirement is a workaround for the absence of case-insensitive
-   ``safe_name()`` matching of project names in URL paths. If project names are
-   matched in this fashion (e.g. via the PyPI server, mod_rewrite, or a similar
-   mechanism), then it is not necessary to include this all-packages listing
-   page.)
-
-8. If a package index is accessed via a ``file://`` URL, then EasyInstall will
-   automatically use ``index.html`` files, if present, when trying to read a
-   directory with a trailing ``/`` on the URL.
-
-
-Backward Compatibility
-~~~~~~~~~~~~~~~~~~~~~~
-
-Package indexes that wish to support setuptools versions prior to 0.6b4 should
-also follow these rules:
-
-* Homepage and download links must be preceded with ``"<th>Home Page"`` or
-  ``"<th>Download URL"``, in addition to (or instead of) the ``rel=""``
-  attributes on the actual links.  These marker strings do not need to be
-  visible, or uncommented, however!  For example, the following is a valid
-  homepage link that will work with any version of setuptools::
-
-    <li>
-     <strong>Home Page:</strong>
-     <!-- <th>Home Page -->
-     <a rel="homepage" href="http://sqlobject.org">http://sqlobject.org</a>
-    </li>
-
-  Even though the marker string is in an HTML comment, older versions of
-  EasyInstall will still "see" it and know that the link that follows is the
-  project's home page URL.
-
-* The pages described by paragraph 3(b) of the preceding section *must*
-  contain the string ``"Index of Packages</title>"`` somewhere in their text.
-  This can be inside of an HTML comment, if desired, and it can be anywhere
-  in the page.  (Note: this string MUST NOT appear on normal project pages, as
-  described in paragraphs 2 and 3(a)!)
-
-In addition, for compatibility with PyPI versions that do not use ``#md5=``
-fragment IDs, EasyInstall uses the following regular expression to match PyPI's
-displayed MD5 info (broken onto two lines for readability)::
-
-    <a href="([^"#]+)">([^<]+)</a>\n\s+\(<a href="[^?]+\?:action=show_md5
-    &amp;digest=([0-9a-f]{32})">md5</a>\)
-
-History
-=======
-
-0.6c9
- * Fixed ``win32.exe`` support for .pth files, so unnecessary directory nesting
-   is flattened out in the resulting egg.  (There was a case-sensitivity
-   problem that affected some distributions, notably ``pywin32``.)
-
- * Prevent ``--help-commands`` and other junk from showing under Python 2.5
-   when running ``easy_install --help``.
-
- * Fixed GUI scripts sometimes not executing on Windows
-
- * Fixed not picking up dependency links from recursive dependencies.
-
- * Only make ``.py``, ``.dll`` and ``.so`` files executable when unpacking eggs
-
- * Changes for Jython compatibility
-
- * Improved error message when a requirement is also a directory name, but the
-   specified directory is not a source package.
-
- * Fixed ``--allow-hosts`` option blocking ``file:`` URLs
-
- * Fixed HTTP SVN detection failing when the page title included a project
-   name (e.g. on SourceForge-hosted SVN)
-
- * Fix Jython script installation to handle ``#!`` lines better when
-   ``sys.executable`` is a script.
-
- * Removed use of deprecated ``md5`` module if ``hashlib`` is available
-
- * Keep site directories (e.g. ``site-packages``) from being included in
-   ``.pth`` files.
-
-0.6c7
- * ``ftp:`` download URLs now work correctly.
-
- * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to use
-   the Python Package Index's new simpler (and faster!) REST API.
-
-0.6c6
- * EasyInstall no longer aborts the installation process if a URL it wants to
-   retrieve can't be downloaded, unless the URL is an actual package download.
-   Instead, it issues a warning and tries to keep going.
-
- * Fixed distutils-style scripts originally built on Windows having their line
-   endings doubled when installed on any platform.
-
- * Added ``--local-snapshots-ok`` flag, to allow building eggs from projects
-   installed using ``setup.py develop``.
-
- * Fixed not HTML-decoding URLs scraped from web pages
-
-0.6c5
- * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
-   is installed unzipped.
-
-0.6c4
- * Added support for HTTP "Basic" authentication using ``http://user:pass@host``
-   URLs.  If a password-protected page contains links to the same host (and
-   protocol), those links will inherit the credentials used to access the
-   original page.
-
- * Removed all special support for Sourceforge mirrors, as Sourceforge's
-   mirror system now works well for non-browser downloads.
-
- * Fixed not recognizing ``win32.exe`` installers that included a custom
-   bitmap.
-
- * Fixed not allowing ``os.open()`` of paths outside the sandbox, even if they
-   are opened read-only (e.g. reading ``/dev/urandom`` for random numbers, as
-   is done by ``os.urandom()`` on some platforms).
-
- * Fixed a problem with ``.pth`` testing on Windows when ``sys.executable``
-   has a space in it (e.g., the user installed Python to a ``Program Files``
-   directory).
-
-0.6c3
- * You can once again use "python -m easy_install" with Python 2.4 and above.
-
- * Python 2.5 compatibility fixes added.
-
-0.6c2
- * Windows script wrappers now support quoted arguments and arguments
-   containing spaces.  (Patch contributed by Jim Fulton.)
-
- * The ``ez_setup.py`` script now actually works when you put a setuptools
-   ``.egg`` alongside it for bootstrapping an offline machine.
-
- * A writable installation directory on ``sys.path`` is no longer required to
-   download and extract a source distribution using ``--editable``.
-
- * Generated scripts now use ``-x`` on the ``#!`` line when ``sys.executable``
-   contains non-ASCII characters, to prevent deprecation warnings about an
-   unspecified encoding when the script is run.
-
-0.6c1
- * EasyInstall now includes setuptools version information in the
-   ``User-Agent`` string sent to websites it visits.
-
-0.6b4
- * Fix creating Python wrappers for non-Python scripts
-
- * Fix ``ftp://`` directory listing URLs from causing a crash when used in the
-   "Home page" or "Download URL" slots on PyPI.
-
- * Fix ``sys.path_importer_cache`` not being updated when an existing zipfile
-   or directory is deleted/overwritten.
-
- * Fix not recognizing HTML 404 pages from package indexes.
-
- * Allow ``file://`` URLs to be used as a package index.  URLs that refer to
-   directories will use an internally-generated directory listing if there is
-   no ``index.html`` file in the directory.
-
- * Allow external links in a package index to be specified using
-   ``rel="homepage"`` or ``rel="download"``, without needing the old
-   PyPI-specific visible markup.
-
- * Suppressed warning message about possibly-misspelled project name, if an egg
-   or link for that project name has already been seen.
-
-0.6b3
- * Fix local ``--find-links`` eggs not being copied except with
-   ``--always-copy``.
-
- * Fix sometimes not detecting local packages installed outside of "site"
-   directories.
-
- * Fix mysterious errors during initial ``setuptools`` install, caused by
-   ``ez_setup`` trying to run ``easy_install`` twice, due to a code fallthru
-   after deleting the egg from which it's running.
-
-0.6b2
- * Don't install or update a ``site.py`` patch when installing to a
-   ``PYTHONPATH`` directory with ``--multi-version``, unless an
-   ``easy-install.pth`` file is already in use there.
-
- * Construct ``.pth`` file paths in such a way that installing an egg whose
-   name begins with ``import`` doesn't cause a syntax error.
-
- * Fixed a bogus warning message that wasn't updated since the 0.5 versions.
-
-0.6b1
- * Better ambiguity management: accept ``#egg`` name/version even if processing
-   what appears to be a correctly-named distutils file, and ignore ``.egg``
-   files with no ``-``, since valid Python ``.egg`` files always have a version
-   number (but Scheme eggs often don't).
-
- * Support ``file://`` links to directories in ``--find-links``, so that
-   easy_install can build packages from local source checkouts.
-
- * Added automatic retry for Sourceforge mirrors.  The new download process is
-   to first just try dl.sourceforge.net, then randomly select mirror IPs and
-   remove ones that fail, until something works.  The removed IPs stay removed
-   for the remainder of the run.
-
- * Ignore bdist_dumb distributions when looking at download URLs.
-
-0.6a11
- * Process ``dependency_links.txt`` if found in a distribution, by adding the
-   URLs to the list for scanning.
-
- * Use relative paths in ``.pth`` files when eggs are being installed to the
-   same directory as the ``.pth`` file.  This maximizes portability of the
-   target directory when building applications that contain eggs.
-
- * Added ``easy_install-N.N`` script(s) for convenience when using multiple
-   Python versions.
-
- * Added automatic handling of installation conflicts.  Eggs are now shifted to
-   the front of sys.path, in an order consistent with where they came from,
-   making EasyInstall seamlessly co-operate with system package managers.
-
-   The ``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk`` options
-   are now no longer necessary, and will generate warnings at the end of a
-   run if you use them.
-
- * Don't recursively traverse subdirectories given to ``--find-links``.
-
-0.6a10
- * Added exhaustive testing of the install directory, including a spawn test
-   for ``.pth`` file support, and directory writability/existence checks.  This
-   should virtually eliminate the need to set or configure ``--site-dirs``.
-
- * Added ``--prefix`` option for more do-what-I-mean-ishness in the absence of
-   RTFM-ing.  :)
-
- * Enhanced ``PYTHONPATH`` support so that you don't have to put any eggs on it
-   manually to make it work.  ``--multi-version`` is no longer a silent
-   default; you must explicitly use it if installing to a non-PYTHONPATH,
-   non-"site" directory.
-
- * Expand ``$variables`` used in the ``--site-dirs``, ``--build-directory``,
-   ``--install-dir``, and ``--script-dir`` options, whether on the command line
-   or in configuration files.
-
- * Improved SourceForge mirror processing to work faster and be less affected
-   by transient HTML changes made by SourceForge.
-
- * PyPI searches now use the exact spelling of requirements specified on the
-   command line or in a project's ``install_requires``.  Previously, a
-   normalized form of the name was used, which could lead to unnecessary
-   full-index searches when a project's name had an underscore (``_``) in it.
-
- * EasyInstall can now download bare ``.py`` files and wrap them in an egg,
-   as long as you include an ``#egg=name-version`` suffix on the URL, or if
-   the ``.py`` file is listed as the "Download URL" on the project's PyPI page.
-   This allows third parties to "package" trivial Python modules just by
-   linking to them (e.g. from within their own PyPI page or download links
-   page).
-
- * The ``--always-copy`` option now skips "system" and "development" eggs since
-   they can't be reliably copied.  Note that this may cause EasyInstall to
-   choose an older version of a package than what you expected, or it may cause
-   downloading and installation of a fresh version of what's already installed.
-
- * The ``--find-links`` option previously scanned all supplied URLs and
-   directories as early as possible, but now only directories and direct
-   archive links are scanned immediately.  URLs are not retrieved unless a
-   package search was already going to go online due to a package not being
-   available locally, or due to the use of the ``--update`` or ``-U`` option.
-
- * Fixed the annoying ``--help-commands`` wart.
-
-0.6a9
- * Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
-   "baskets") when they weren't explicitly listed in the ``.pth`` file.
-
- * If more than one URL appears to describe the exact same distribution, prefer
-   the shortest one.  This helps to avoid "table of contents" CGI URLs like the
-   ones on effbot.org.
-
- * Quote arguments to python.exe (including python's path) to avoid problems
-   when Python (or a script) is installed in a directory whose name contains
-   spaces on Windows.
-
- * Support full roundtrip translation of eggs to and from ``bdist_wininst``
-   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
-   egg in an .exe that will safely install it as an egg (i.e., with metadata
-   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
-   back into an ``.egg`` file or directory and install it as such.
-
-0.6a8
- * Update for changed SourceForge mirror format
-
- * Fixed not installing dependencies for some packages fetched via Subversion
-
- * Fixed dependency installation with ``--always-copy`` not using the same
-   dependency resolution procedure as other operations.
-
- * Fixed not fully removing temporary directories on Windows, if a Subversion
-   checkout left read-only files behind
-
- * Fixed some problems building extensions when Pyrex was installed, especially
-   with Python 2.4 and/or packages using SWIG.
-
-0.6a7
- * Fixed not being able to install Windows script wrappers using Python 2.3
-
-0.6a6
- * Added support for "traditional" PYTHONPATH-based non-root installation, and
-   also the convenient ``virtual-python.py`` script, based on a contribution
-   by Ian Bicking.  The setuptools egg now contains a hacked ``site`` module
-   that makes the PYTHONPATH-based approach work with .pth files, so that you
-   can get the full EasyInstall feature set on such installations.
-
- * Added ``--no-deps`` and ``--allow-hosts`` options.
-
- * Improved Windows ``.exe`` script wrappers so that the script can have the
-   same name as a module without confusing Python.
-
- * Changed dependency processing so that it's breadth-first, allowing a
-   depender's preferences to override those of a dependee, to prevent conflicts
-   when a lower version is acceptable to the dependee, but not the depender.
-   Also, ensure that currently installed/selected packages aren't given
-   precedence over ones desired by a package being installed, which could
-   cause conflict errors.
-
-0.6a3
- * Improved error message when trying to use old ways of running
-   ``easy_install``.  Removed the ability to run via ``python -m`` or by
-   running ``easy_install.py``; ``easy_install`` is the command to run on all
-   supported platforms.
-
- * Improved wrapper script generation and runtime initialization so that a
-   VersionConflict doesn't occur if you later install a competing version of a
-   needed package as the default version of that package.
-
- * Fixed a problem parsing version numbers in ``#egg=`` links.
-
-0.6a2
- * EasyInstall can now install "console_scripts" defined by packages that use
-   ``setuptools`` and define appropriate entry points.  On Windows, console
-   scripts get an ``.exe`` wrapper so you can just type their name.  On other
-   platforms, the scripts are installed without a file extension.
-
- * Using ``python -m easy_install`` or running ``easy_install.py`` is now
-   DEPRECATED, since an ``easy_install`` wrapper is now available on all
-   platforms.
-
-0.6a1
- * EasyInstall now does MD5 validation of downloads from PyPI, or from any link
-   that has an "#md5=..." trailer with a 32-digit lowercase hex md5 digest.
-
- * EasyInstall now handles symlinks in target directories by removing the link,
-   rather than attempting to overwrite the link's destination.  This makes it
-   easier to set up an alternate Python "home" directory (as described above in
-   the `Non-Root Installation`_ section).
-
- * Added support for handling MacOS platform information in ``.egg`` filenames,
-   based on a contribution by Kevin Dangoor.  You may wish to delete and
-   reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
-   because the format for this platform information has changed so that minor
-   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
-   previous OS version to become obsolete.
-
- * easy_install's dependency processing algorithms have changed.  When using
-   ``--always-copy``, it now ensures that dependencies are copied too.  When
-   not using ``--always-copy``, it tries to use a single resolution loop,
-   rather than recursing.
-
- * Fixed installing extra ``.pyc`` or ``.pyo`` files for scripts with ``.py``
-   extensions.
-
- * Added ``--site-dirs`` option to allow adding custom "site" directories.
-   Made ``easy-install.pth`` work in platform-specific alternate site
-   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
-
- * If you manually delete the current version of a package, the next run of
-   EasyInstall against the target directory will now remove the stray entry
-   from the ``easy-install.pth`` file.
-
- * EasyInstall now recognizes URLs with a ``#egg=project_name`` fragment ID
-   as pointing to the named project's source checkout.  Such URLs have a lower
-   match precedence than any other kind of distribution, so they'll only be
-   used if they have a higher version number than any other available
-   distribution, or if you use the ``--editable`` option.  The ``#egg``
-   fragment can contain a version if it's formatted as ``#egg=proj-ver``,
-   where ``proj`` is the project name, and ``ver`` is the version number.  You
-   *must* use the format for these values that the ``bdist_egg`` command uses;
-   i.e., all non-alphanumeric runs must be condensed to single underscore
-   characters.
-
- * Added the ``--editable`` option; see `Editing and Viewing Source Packages`_
-   above for more info.  Also, slightly changed the behavior of the
-   ``--build-directory`` option.
-
- * Fixed the setup script sandbox facility not recognizing certain paths as
-   valid on case-insensitive platforms.
-
-0.5a12
- * Fix ``python -m easy_install`` not working due to setuptools being installed
-   as a zipfile.  Update safety scanner to check for modules that might be used
-   as ``python -m`` scripts.
-
- * Misc. fixes for win32.exe support, including changes to support Python 2.4's
-   changed ``bdist_wininst`` format.
-
-0.5a10
- * Put the ``easy_install`` module back in as a module, as it's needed for
-   ``python -m`` to run it!
-
- * Allow ``--find-links/-f`` to accept local directories or filenames as well
-   as URLs.
-
-0.5a9
- * EasyInstall now automatically detects when an "unmanaged" package or
-   module is going to be on ``sys.path`` ahead of a package you're installing,
-   thereby preventing the newer version from being imported.  By default, it
-   will abort installation to alert you of the problem, but there are also
-   new options (``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk``)
-   available to change the default behavior.  (Note: this new feature doesn't
-   take effect for egg files that were built with older ``setuptools``
-   versions, because they lack the new metadata file required to implement it.)
-
- * The ``easy_install`` distutils command now uses ``DistutilsError`` as its
-   base error type for errors that should just issue a message to stderr and
-   exit the program without a traceback.
-
- * EasyInstall can now be given a path to a directory containing a setup
-   script, and it will attempt to build and install the package there.
-
- * EasyInstall now performs a safety analysis on module contents to determine
-   whether a package is likely to run in zipped form, and displays
-   information about what modules may be doing introspection that would break
-   when running as a zipfile.
-
- * Added the ``--always-unzip/-Z`` option, to force unzipping of packages that
-   would ordinarily be considered safe to unzip, and changed the meaning of
-   ``--zip-ok/-z`` to "always leave everything zipped".
-
-0.5a8
- * There is now a separate documentation page for `setuptools`_; revision
-   history that's not specific to EasyInstall has been moved to that page.
-
- .. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
-
-0.5a5
- * Made ``easy_install`` a standard ``setuptools`` command, moving it from
-   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
-   that if you were importing or extending it, you must now change your imports
-   accordingly.  ``easy_install.py`` is still installed as a script, but not as
-   a module.
-
-0.5a4
- * Added ``--always-copy/-a`` option to always copy needed packages to the
-   installation directory, even if they're already present elsewhere on
-   sys.path. (In previous versions, this was the default behavior, but now
-   you must request it.)
-
- * Added ``--upgrade/-U`` option to force checking PyPI for latest available
-   version(s) of all packages requested by name and version, even if a matching
-   version is available locally.
-
- * Added automatic installation of dependencies declared by a distribution
-   being installed.  These dependencies must be listed in the distribution's
-   ``EGG-INFO`` directory, so the distribution has to have declared its
-   dependencies by using setuptools.  If a package has requirements it didn't
-   declare, you'll still have to deal with them yourself.  (E.g., by asking
-   EasyInstall to find and install them.)
-
- * Added the ``--record`` option to ``easy_install`` for the benefit of tools
-   that run ``setup.py install --record=filename`` on behalf of another
-   packaging system.)
-
-0.5a3
- * Fixed not setting script permissions to allow execution.
-
- * Improved sandboxing so that setup scripts that want a temporary directory
-   (e.g. pychecker) can still run in the sandbox.
-
-0.5a2
- * Fix stupid stupid refactoring-at-the-last-minute typos.  :(
-
-0.5a1
- * Added support for converting ``.win32.exe`` installers to eggs on the fly.
-   EasyInstall will now recognize such files by name and install them.
-
- * Fixed a problem with picking the "best" version to install (versions were
-   being sorted as strings, rather than as parsed values)
-
-0.4a4
- * Added support for the distutils "verbose/quiet" and "dry-run" options, as
-   well as the "optimize" flag.
-
- * Support downloading packages that were uploaded to PyPI (by scanning all
-   links on package pages, not just the homepage/download links).
-
-0.4a3
- * Add progress messages to the search/download process so that you can tell
-   what URLs it's reading to find download links.  (Hopefully, this will help
-   people report out-of-date and broken links to package authors, and to tell
-   when they've asked for a package that doesn't exist.)
-
-0.4a2
- * Added support for installing scripts
-
- * Added support for setting options via distutils configuration files, and
-   using distutils' default options as a basis for EasyInstall's defaults.
-
- * Renamed ``--scan-url/-s`` to ``--find-links/-f`` to free up ``-s`` for the
-   script installation directory option.
-
- * Use ``urllib2`` instead of ``urllib``, to allow use of ``https:`` URLs if
-   Python includes SSL support.
-
-0.4a1
- * Added ``--scan-url`` and ``--index-url`` options, to scan download pages
-   and search PyPI for needed packages.
-
-0.3a4
- * Restrict ``--build-directory=DIR/-b DIR`` option to only be used with single
-   URL installs, to avoid running the wrong setup.py.
-
-0.3a3
- * Added ``--build-directory=DIR/-b DIR`` option.
-
- * Added "installation report" that explains how to use 'require()' when doing
-   a multiversion install or alternate installation directory.
-
- * Added SourceForge mirror auto-select (Contributed by Ian Bicking)
-
- * Added "sandboxing" that stops a setup script from running if it attempts to
-   write to the filesystem outside of the build area
-
- * Added more workarounds for packages with quirky ``install_data`` hacks
-
-0.3a2
- * Added subversion download support for ``svn:`` and ``svn+`` URLs, as well as
-   automatic recognition of HTTP subversion URLs (Contributed by Ian Bicking)
-
- * Misc. bug fixes
-
-0.3a1
- * Initial release.
-
-
-Future Plans
-============
-
-* Additional utilities to list/remove/verify packages
-* Signature checking?  SSL?  Ability to suppress PyPI search?
-* Display byte progress meter when downloading distributions and long pages?
-* Redirect stdout/stderr to log during run_setup?
-
diff --git a/docs/index.txt b/docs/index.txt
index f3aa78d107..e075e433fe 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -4,19 +4,7 @@ Welcome to Distribute's documentation!
 `Distribute` is a deprecated fork of the `Setuptools` project.
 
 Since the Setuptools 0.7 release, Setuptools and Distribute have merged
-and Distribute is no longer being maintained. This documentation is kept here
-for posterity, but all ongoing effort should reference the
+and Distribute is no longer being maintained. All ongoing effort should
+reference the
 `Setuptools project <https://bitbucket.org/pypa/setuptools>`_ and the
 `Setuptools documentation <https://pythonhosted.org/setuptools>`_.
-
-Documentation content:
-
-.. toctree::
-   :maxdepth: 2
-
-   roadmap
-   python3
-   using
-   setuptools
-   easy_install
-   pkg_resources
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
deleted file mode 100644
index 480f9547ce..0000000000
--- a/docs/pkg_resources.txt
+++ /dev/null
@@ -1,1955 +0,0 @@
-=============================================================
-Package Discovery and Resource Access using ``pkg_resources``
-=============================================================
-
-The ``pkg_resources`` module distributed with ``setuptools`` provides an API
-for Python libraries to access their resource files, and for extensible
-applications and frameworks to automatically discover plugins.  It also
-provides runtime support for using C extensions that are inside zipfile-format
-eggs, support for merging packages that have separately-distributed modules or
-subpackages, and APIs for managing Python's current "working set" of active
-packages.
-
-
-.. contents:: **Table of Contents**
-
-
---------
-Overview
---------
-
-Eggs are a distribution format for Python modules, similar in concept to Java's
-"jars" or Ruby's "gems".  They differ from previous Python distribution formats
-in that they are importable (i.e. they can be added to ``sys.path``), and they
-are *discoverable*, meaning that they carry metadata that unambiguously
-identifies their contents and dependencies, and thus can be *automatically*
-found and added to ``sys.path`` in response to simple requests of the form,
-"get me everything I need to use docutils' PDF support".
-
-The ``pkg_resources`` module provides runtime facilities for finding,
-introspecting, activating and using eggs and other "pluggable" distribution
-formats.  Because these are new concepts in Python (and not that well-
-established in other languages either), it helps to have a few special terms
-for talking about eggs and how they can be used:
-
-project
-    A library, framework, script, plugin, application, or collection of data
-    or other resources, or some combination thereof.  Projects are assumed to
-    have "relatively unique" names, e.g. names registered with PyPI.
-
-release
-    A snapshot of a project at a particular point in time, denoted by a version
-    identifier.
-
-distribution
-    A file or files that represent a particular release.
-
-importable distribution
-    A file or directory that, if placed on ``sys.path``, allows Python to
-    import any modules contained within it.
-
-pluggable distribution
-    An importable distribution whose filename unambiguously identifies its
-    release (i.e. project and version), and whose contents unamabiguously
-    specify what releases of other projects will satisfy its runtime
-    requirements.
-
-extra
-    An "extra" is an optional feature of a release, that may impose additional
-    runtime requirements.  For example, if docutils PDF support required a
-    PDF support library to be present, docutils could define its PDF support as
-    an "extra", and list what other project releases need to be available in
-    order to provide it.
-
-environment
-    A collection of distributions potentially available for importing, but not
-    necessarily active.  More than one distribution (i.e. release version) for
-    a given project may be present in an environment.
-
-working set
-    A collection of distributions actually available for importing, as on
-    ``sys.path``.  At most one distribution (release version) of a given
-    project may be present in a working set, as otherwise there would be
-    ambiguity as to what to import.
-
-eggs
-    Eggs are pluggable distributions in one of the three formats currently
-    supported by ``pkg_resources``.  There are built eggs, development eggs,
-    and egg links.  Built eggs are directories or zipfiles whose name ends
-    with ``.egg`` and follows the egg naming conventions, and contain an
-    ``EGG-INFO`` subdirectory (zipped or otherwise).  Development eggs are
-    normal directories of Python code with one or more ``ProjectName.egg-info``
-    subdirectories.  And egg links are ``*.egg-link`` files that contain the
-    name of a built or development egg, to support symbolic linking on
-    platforms that do not have native symbolic links.
-
-(For more information about these terms and concepts, see also this
-`architectural overview`_ of ``pkg_resources`` and Python Eggs in general.)
-
-.. _architectural overview: http://mail.python.org/pipermail/distutils-sig/2005-June/004652.html
-
-
-.. -----------------
-.. Developer's Guide
-.. -----------------
-
-.. This section isn't written yet.  Currently planned topics include
-    Accessing Resources
-    Finding and Activating Package Distributions
-        get_provider()
-        require()
-        WorkingSet
-        iter_distributions
-    Running Scripts
-    Configuration
-    Namespace Packages
-    Extensible Applications and Frameworks
-        Locating entry points
-        Activation listeners
-        Metadata access
-        Extended Discovery and Installation
-    Supporting Custom PEP 302 Implementations
-.. For now, please check out the extensive `API Reference`_ below.
-
-
--------------
-API Reference
--------------
-
-Namespace Package Support
-=========================
-
-A namespace package is a package that only contains other packages and modules,
-with no direct contents of its own.  Such packages can be split across
-multiple, separately-packaged distributions.  Normally, you do not need to use
-the namespace package APIs directly; instead you should supply the
-``namespace_packages`` argument to ``setup()`` in your project's ``setup.py``.
-See the `setuptools documentation on namespace packages`_ for more information.
-
-However, if for some reason you need to manipulate namespace packages or
-directly alter ``sys.path`` at runtime, you may find these APIs useful:
-
-``declare_namespace(name)``
-    Declare that the dotted package name `name` is a "namespace package" whose
-    contained packages and modules may be spread across multiple distributions.
-    The named package's ``__path__`` will be extended to include the
-    corresponding package in all distributions on ``sys.path`` that contain a
-    package of that name.  (More precisely, if an importer's
-    ``find_module(name)`` returns a loader, then it will also be searched for
-    the package's contents.)  Whenever a Distribution's ``activate()`` method
-    is invoked, it checks for the presence of namespace packages and updates
-    their ``__path__`` contents accordingly.
-
-Applications that manipulate namespace packages or directly alter ``sys.path``
-at runtime may also need to use this API function:
-
-``fixup_namespace_packages(path_item)``
-    Declare that `path_item` is a newly added item on ``sys.path`` that may
-    need to be used to update existing namespace packages.  Ordinarily, this is
-    called for you when an egg is automatically added to ``sys.path``, but if
-    your application modifies ``sys.path`` to include locations that may
-    contain portions of a namespace package, you will need to call this
-    function to ensure they are added to the existing namespace packages.
-
-Although by default ``pkg_resources`` only supports namespace packages for
-filesystem and zip importers, you can extend its support to other "importers"
-compatible with PEP 302 using the ``register_namespace_handler()`` function.
-See the section below on `Supporting Custom Importers`_ for details.
-
-.. _setuptools documentation on namespace packages: http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-
-
-``WorkingSet`` Objects
-======================
-
-The ``WorkingSet`` class provides access to a collection of "active"
-distributions.  In general, there is only one meaningful ``WorkingSet``
-instance: the one that represents the distributions that are currently active
-on ``sys.path``.  This global instance is available under the name
-``working_set`` in the ``pkg_resources`` module.  However, specialized
-tools may wish to manipulate working sets that don't correspond to
-``sys.path``, and therefore may wish to create other ``WorkingSet`` instances.
-
-It's important to note that the global ``working_set`` object is initialized
-from ``sys.path`` when ``pkg_resources`` is first imported, but is only updated
-if you do all future ``sys.path`` manipulation via ``pkg_resources`` APIs.  If
-you manually modify ``sys.path``, you must invoke the appropriate methods on
-the ``working_set`` instance to keep it in sync.  Unfortunately, Python does
-not provide any way to detect arbitrary changes to a list object like
-``sys.path``, so ``pkg_resources`` cannot automatically update the
-``working_set`` based on changes to ``sys.path``.
-
-``WorkingSet(entries=None)``
-    Create a ``WorkingSet`` from an iterable of path entries.  If `entries`
-    is not supplied, it defaults to the value of ``sys.path`` at the time
-    the constructor is called.
-
-    Note that you will not normally construct ``WorkingSet`` instances
-    yourself, but instead you will implicitly or explicitly use the global
-    ``working_set`` instance.  For the most part, the ``pkg_resources`` API
-    is designed so that the ``working_set`` is used by default, such that you
-    don't have to explicitly refer to it most of the time.
-
-
-Basic ``WorkingSet`` Methods
-----------------------------
-
-The following methods of ``WorkingSet`` objects are also available as module-
-level functions in ``pkg_resources`` that apply to the default ``working_set``
-instance.  Thus, you can use e.g. ``pkg_resources.require()`` as an
-abbreviation for ``pkg_resources.working_set.require()``:
-
-
-``require(*requirements)``
-    Ensure that distributions matching `requirements` are activated
-
-    `requirements` must be a string or a (possibly-nested) sequence
-    thereof, specifying the distributions and versions required.  The
-    return value is a sequence of the distributions that needed to be
-    activated to fulfill the requirements; all relevant distributions are
-    included, even if they were already activated in this working set.
-
-    For the syntax of requirement specifiers, see the section below on
-    `Requirements Parsing`_.
-
-    In general, it should not be necessary for you to call this method
-    directly.  It's intended more for use in quick-and-dirty scripting and
-    interactive interpreter hacking than for production use. If you're creating
-    an actual library or application, it's strongly recommended that you create
-    a "setup.py" script using ``setuptools``, and declare all your requirements
-    there.  That way, tools like EasyInstall can automatically detect what
-    requirements your package has, and deal with them accordingly.
-
-    Note that calling ``require('SomePackage')`` will not install
-    ``SomePackage`` if it isn't already present.  If you need to do this, you
-    should use the ``resolve()`` method instead, which allows you to pass an
-    ``installer`` callback that will be invoked when a needed distribution
-    can't be found on the local machine.  You can then have this callback
-    display a dialog, automatically download the needed distribution, or
-    whatever else is appropriate for your application. See the documentation
-    below on the ``resolve()`` method for more information, and also on the
-    ``obtain()`` method of ``Environment`` objects.
-
-``run_script(requires, script_name)``
-    Locate distribution specified by `requires` and run its `script_name`
-    script.  `requires` must be a string containing a requirement specifier.
-    (See `Requirements Parsing`_ below for the syntax.)
-
-    The script, if found, will be executed in *the caller's globals*.  That's
-    because this method is intended to be called from wrapper scripts that
-    act as a proxy for the "real" scripts in a distribution.  A wrapper script
-    usually doesn't need to do anything but invoke this function with the
-    correct arguments.
-
-    If you need more control over the script execution environment, you
-    probably want to use the ``run_script()`` method of a ``Distribution``
-    object's `Metadata API`_ instead.
-
-``iter_entry_points(group, name=None)``
-    Yield entry point objects from `group` matching `name`
-
-    If `name` is None, yields all entry points in `group` from all
-    distributions in the working set, otherwise only ones matching both
-    `group` and `name` are yielded.  Entry points are yielded from the active
-    distributions in the order that the distributions appear in the working
-    set.  (For the global ``working_set``, this should be the same as the order
-    that they are listed in ``sys.path``.)  Note that within the entry points
-    advertised by an individual distribution, there is no particular ordering.
-
-    Please see the section below on `Entry Points`_ for more information.
-
-
-``WorkingSet`` Methods and Attributes
--------------------------------------
-
-These methods are used to query or manipulate the contents of a specific
-working set, so they must be explicitly invoked on a particular ``WorkingSet``
-instance:
-
-``add_entry(entry)``
-    Add a path item to the ``entries``, finding any distributions on it.  You
-    should use this when you add additional items to ``sys.path`` and you want
-    the global ``working_set`` to reflect the change.  This method is also
-    called by the ``WorkingSet()`` constructor during initialization.
-
-    This method uses ``find_distributions(entry,True)`` to find distributions
-    corresponding to the path entry, and then ``add()`` them.  `entry` is
-    always appended to the ``entries`` attribute, even if it is already
-    present, however. (This is because ``sys.path`` can contain the same value
-    more than once, and the ``entries`` attribute should be able to reflect
-    this.)
-
-``__contains__(dist)``
-    True if `dist` is active in this ``WorkingSet``.  Note that only one
-    distribution for a given project can be active in a given ``WorkingSet``.
-
-``__iter__()``
-    Yield distributions for non-duplicate projects in the working set.
-    The yield order is the order in which the items' path entries were
-    added to the working set.
-
-``find(req)``
-    Find a distribution matching `req` (a ``Requirement`` instance).
-    If there is an active distribution for the requested project, this
-    returns it, as long as it meets the version requirement specified by
-    `req`.  But, if there is an active distribution for the project and it
-    does *not* meet the `req` requirement, ``VersionConflict`` is raised.
-    If there is no active distribution for the requested project, ``None``
-    is returned.
-
-``resolve(requirements, env=None, installer=None)``
-    List all distributions needed to (recursively) meet `requirements`
-
-    `requirements` must be a sequence of ``Requirement`` objects.  `env`,
-    if supplied, should be an ``Environment`` instance.  If
-    not supplied, an ``Environment`` is created from the working set's
-    ``entries``.  `installer`, if supplied, will be invoked with each
-    requirement that cannot be met by an already-installed distribution; it
-    should return a ``Distribution`` or ``None``.  (See the ``obtain()`` method
-    of `Environment Objects`_, below, for more information on the `installer`
-    argument.)
-
-``add(dist, entry=None)``
-    Add `dist` to working set, associated with `entry`
-
-    If `entry` is unspecified, it defaults to ``dist.location``.  On exit from
-    this routine, `entry` is added to the end of the working set's ``.entries``
-    (if it wasn't already present).
-
-    `dist` is only added to the working set if it's for a project that
-    doesn't already have a distribution active in the set.  If it's
-    successfully added, any  callbacks registered with the ``subscribe()``
-    method will be called.  (See `Receiving Change Notifications`_, below.)
-
-    Note: ``add()`` is automatically called for you by the ``require()``
-    method, so you don't normally need to use this method directly.
-
-``entries``
-    This attribute represents a "shadow" ``sys.path``, primarily useful for
-    debugging.  If you are experiencing import problems, you should check
-    the global ``working_set`` object's ``entries`` against ``sys.path``, to
-    ensure that they match.  If they do not, then some part of your program
-    is manipulating ``sys.path`` without updating the ``working_set``
-    accordingly.  IMPORTANT NOTE: do not directly manipulate this attribute!
-    Setting it equal to ``sys.path`` will not fix your problem, any more than
-    putting black tape over an "engine warning" light will fix your car!  If
-    this attribute is out of sync with ``sys.path``, it's merely an *indicator*
-    of the problem, not the cause of it.
-
-
-Receiving Change Notifications
-------------------------------
-
-Extensible applications and frameworks may need to receive notification when
-a new distribution (such as a plug-in component) has been added to a working
-set.  This is what the ``subscribe()`` method and ``add_activation_listener()``
-function are for.
-
-``subscribe(callback)``
-    Invoke ``callback(distribution)`` once for each active distribution that is
-    in the set now, or gets added later.  Because the callback is invoked for
-    already-active distributions, you do not need to loop over the working set
-    yourself to deal with the existing items; just register the callback and
-    be prepared for the fact that it will be called immediately by this method.
-
-    Note that callbacks *must not* allow exceptions to propagate, or they will
-    interfere with the operation of other callbacks and possibly result in an
-    inconsistent working set state.  Callbacks should use a try/except block
-    to ignore, log, or otherwise process any errors, especially since the code
-    that caused the callback to be invoked is unlikely to be able to handle
-    the errors any better than the callback itself.
-
-``pkg_resources.add_activation_listener()`` is an alternate spelling of
-``pkg_resources.working_set.subscribe()``.
-
-
-Locating Plugins
-----------------
-
-Extensible applications will sometimes have a "plugin directory" or a set of
-plugin directories, from which they want to load entry points or other
-metadata.  The ``find_plugins()`` method allows you to do this, by scanning an
-environment for the newest version of each project that can be safely loaded
-without conflicts or missing requirements.
-
-``find_plugins(plugin_env, full_env=None, fallback=True)``
-   Scan `plugin_env` and identify which distributions could be added to this
-   working set without version conflicts or missing requirements.
-
-   Example usage::
-
-       distributions, errors = working_set.find_plugins(
-           Environment(plugin_dirlist)
-       )
-       map(working_set.add, distributions)  # add plugins+libs to sys.path
-       print "Couldn't load", errors        # display errors
-
-   The `plugin_env` should be an ``Environment`` instance that contains only
-   distributions that are in the project's "plugin directory" or directories.
-   The `full_env`, if supplied, should be an ``Environment`` instance that
-   contains all currently-available distributions.
-
-   If `full_env` is not supplied, one is created automatically from the
-   ``WorkingSet`` this method is called on, which will typically mean that
-   every directory on ``sys.path`` will be scanned for distributions.
-
-   This method returns a 2-tuple: (`distributions`, `error_info`), where
-   `distributions` is a list of the distributions found in `plugin_env` that
-   were loadable, along with any other distributions that are needed to resolve
-   their dependencies.  `error_info` is a dictionary mapping unloadable plugin
-   distributions to an exception instance describing the error that occurred.
-   Usually this will be a ``DistributionNotFound`` or ``VersionConflict``
-   instance.
-
-   Most applications will use this method mainly on the master ``working_set``
-   instance in ``pkg_resources``, and then immediately add the returned
-   distributions to the working set so that they are available on sys.path.
-   This will make it possible to find any entry points, and allow any other
-   metadata tracking and hooks to be activated.
-
-   The resolution algorithm used by ``find_plugins()`` is as follows.  First,
-   the project names of the distributions present in `plugin_env` are sorted.
-   Then, each project's eggs are tried in descending version order (i.e.,
-   newest version first).
-
-   An attempt is made to resolve each egg's dependencies. If the attempt is
-   successful, the egg and its dependencies are added to the output list and to
-   a temporary copy of the working set.  The resolution process continues with
-   the next project name, and no older eggs for that project are tried.
-
-   If the resolution attempt fails, however, the error is added to the error
-   dictionary.  If the `fallback` flag is true, the next older version of the
-   plugin is tried, until a working version is found.  If false, the resolution
-   process continues with the next plugin project name.
-
-   Some applications may have stricter fallback requirements than others. For
-   example, an application that has a database schema or persistent objects
-   may not be able to safely downgrade a version of a package. Others may want
-   to ensure that a new plugin configuration is either 100% good or else
-   revert to a known-good configuration.  (That is, they may wish to revert to
-   a known configuration if the `error_info` return value is non-empty.)
-
-   Note that this algorithm gives precedence to satisfying the dependencies of
-   alphabetically prior project names in case of version conflicts. If two
-   projects named "AaronsPlugin" and "ZekesPlugin" both need different versions
-   of "TomsLibrary", then "AaronsPlugin" will win and "ZekesPlugin" will be
-   disabled due to version conflict.
-
-
-``Environment`` Objects
-=======================
-
-An "environment" is a collection of ``Distribution`` objects, usually ones
-that are present and potentially importable on the current platform.
-``Environment`` objects are used by ``pkg_resources`` to index available
-distributions during dependency resolution.
-
-``Environment(search_path=None, platform=get_supported_platform(), python=PY_MAJOR)``
-    Create an environment snapshot by scanning `search_path` for distributions
-    compatible with `platform` and `python`.  `search_path` should be a
-    sequence of strings such as might be used on ``sys.path``.  If a
-    `search_path` isn't supplied, ``sys.path`` is used.
-
-    `platform` is an optional string specifying the name of the platform
-    that platform-specific distributions must be compatible with.  If
-    unspecified, it defaults to the current platform.  `python` is an
-    optional string naming the desired version of Python (e.g. ``'2.4'``);
-    it defaults to the currently-running version.
-
-    You may explicitly set `platform` (and/or `python`) to ``None`` if you
-    wish to include *all* distributions, not just those compatible with the
-    running platform or Python version.
-
-    Note that `search_path` is scanned immediately for distributions, and the
-    resulting ``Environment`` is a snapshot of the found distributions.  It
-    is not automatically updated if the system's state changes due to e.g.
-    installation or removal of distributions.
-
-``__getitem__(project_name)``
-    Returns a list of distributions for the given project name, ordered
-    from newest to oldest version.  (And highest to lowest format precedence
-    for distributions that contain the same version of the project.)  If there
-    are no distributions for the project, returns an empty list.
-
-``__iter__()``
-    Yield the unique project names of the distributions in this environment.
-    The yielded names are always in lower case.
-
-``add(dist)``
-    Add `dist` to the environment if it matches the platform and python version
-    specified at creation time, and only if the distribution hasn't already
-    been added. (i.e., adding the same distribution more than once is a no-op.)
-
-``remove(dist)``
-    Remove `dist` from the environment.
-
-``can_add(dist)``
-    Is distribution `dist` acceptable for this environment?  If it's not
-    compatible with the ``platform`` and ``python`` version values specified
-    when the environment was created, a false value is returned.
-
-``__add__(dist_or_env)``  (``+`` operator)
-    Add a distribution or environment to an ``Environment`` instance, returning
-    a *new* environment object that contains all the distributions previously
-    contained by both.  The new environment will have a ``platform`` and
-    ``python`` of ``None``, meaning that it will not reject any distributions
-    from being added to it; it will simply accept whatever is added.  If you
-    want the added items to be filtered for platform and Python version, or
-    you want to add them to the *same* environment instance, you should use
-    in-place addition (``+=``) instead.
-
-``__iadd__(dist_or_env)``  (``+=`` operator)
-    Add a distribution or environment to an ``Environment`` instance
-    *in-place*, updating the existing instance and returning it.  The
-    ``platform`` and ``python`` filter attributes take effect, so distributions
-    in the source that do not have a suitable platform string or Python version
-    are silently ignored.
-
-``best_match(req, working_set, installer=None)``
-    Find distribution best matching `req` and usable on `working_set`
-
-    This calls the ``find(req)`` method of the `working_set` to see if a
-    suitable distribution is already active.  (This may raise
-    ``VersionConflict`` if an unsuitable version of the project is already
-    active in the specified `working_set`.)  If a suitable distribution isn't
-    active, this method returns the newest distribution in the environment
-    that meets the ``Requirement`` in `req`.  If no suitable distribution is
-    found, and `installer` is supplied, then the result of calling
-    the environment's ``obtain(req, installer)`` method will be returned.
-
-``obtain(requirement, installer=None)``
-    Obtain a distro that matches requirement (e.g. via download).  In the
-    base ``Environment`` class, this routine just returns
-    ``installer(requirement)``, unless `installer` is None, in which case
-    None is returned instead.  This method is a hook that allows subclasses
-    to attempt other ways of obtaining a distribution before falling back
-    to the `installer` argument.
-
-``scan(search_path=None)``
-    Scan `search_path` for distributions usable on `platform`
-
-    Any distributions found are added to the environment.  `search_path` should
-    be a sequence of strings such as might be used on ``sys.path``.  If not
-    supplied, ``sys.path`` is used.  Only distributions conforming to
-    the platform/python version defined at initialization are added.  This
-    method is a shortcut for using the ``find_distributions()`` function to
-    find the distributions from each item in `search_path`, and then calling
-    ``add()`` to add each one to the environment.
-
-
-``Requirement`` Objects
-=======================
-
-``Requirement`` objects express what versions of a project are suitable for
-some purpose.  These objects (or their string form) are used by various
-``pkg_resources`` APIs in order to find distributions that a script or
-distribution needs.
-
-
-Requirements Parsing
---------------------
-
-``parse_requirements(s)``
-    Yield ``Requirement`` objects for a string or iterable of lines.  Each
-    requirement must start on a new line.  See below for syntax.
-
-``Requirement.parse(s)``
-    Create a ``Requirement`` object from a string or iterable of lines.  A
-    ``ValueError`` is raised if the string or lines do not contain a valid
-    requirement specifier, or if they contain more than one specifier.  (To
-    parse multiple specifiers from a string or iterable of strings, use
-    ``parse_requirements()`` instead.)
-
-    The syntax of a requirement specifier can be defined in EBNF as follows::
-
-        requirement  ::= project_name versionspec? extras?
-        versionspec  ::= comparison version (',' comparison version)*
-        comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>'
-        extras       ::= '[' extralist? ']'
-        extralist    ::= identifier (',' identifier)*
-        project_name ::= identifier
-        identifier   ::= [-A-Za-z0-9_]+
-        version      ::= [-A-Za-z0-9_.]+
-
-    Tokens can be separated by whitespace, and a requirement can be continued
-    over multiple lines using a backslash (``\\``).  Line-end comments (using
-    ``#``) are also allowed.
-
-    Some examples of valid requirement specifiers::
-
-        FooProject >= 1.2
-        Fizzy [foo, bar]
-        PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1
-        SomethingWhoseVersionIDontCareAbout
-
-    The project name is the only required portion of a requirement string, and
-    if it's the only thing supplied, the requirement will accept any version
-    of that project.
-
-    The "extras" in a requirement are used to request optional features of a
-    project, that may require additional project distributions in order to
-    function.  For example, if the hypothetical "Report-O-Rama" project offered
-    optional PDF support, it might require an additional library in order to
-    provide that support.  Thus, a project needing Report-O-Rama's PDF features
-    could use a requirement of ``Report-O-Rama[PDF]`` to request installation
-    or activation of both Report-O-Rama and any libraries it needs in order to
-    provide PDF support.  For example, you could use::
-
-        easy_install.py Report-O-Rama[PDF]
-
-    To install the necessary packages using the EasyInstall program, or call
-    ``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary
-    distributions to sys.path at runtime.
-
-
-``Requirement`` Methods and Attributes
---------------------------------------
-
-``__contains__(dist_or_version)``
-    Return true if `dist_or_version` fits the criteria for this requirement.
-    If `dist_or_version` is a ``Distribution`` object, its project name must
-    match the requirement's project name, and its version must meet the
-    requirement's version criteria.  If `dist_or_version` is a string, it is
-    parsed using the ``parse_version()`` utility function.  Otherwise, it is
-    assumed to be an already-parsed version.
-
-    The ``Requirement`` object's version specifiers (``.specs``) are internally
-    sorted into ascending version order, and used to establish what ranges of
-    versions are acceptable.  Adjacent redundant conditions are effectively
-    consolidated (e.g. ``">1, >2"`` produces the same results as ``">1"``, and
-    ``"<2,<3"`` produces the same results as``"<3"``). ``"!="`` versions are
-    excised from the ranges they fall within.  The version being tested for
-    acceptability is then checked for membership in the resulting ranges.
-    (Note that providing conflicting conditions for the same version (e.g.
-    ``"<2,>=2"`` or ``"==2,!=2"``) is meaningless and may therefore produce
-    bizarre results when compared with actual version number(s).)
-
-``__eq__(other_requirement)``
-    A requirement compares equal to another requirement if they have
-    case-insensitively equal project names, version specifiers, and "extras".
-    (The order that extras and version specifiers are in is also ignored.)
-    Equal requirements also have equal hashes, so that requirements can be
-    used in sets or as dictionary keys.
-
-``__str__()``
-    The string form of a ``Requirement`` is a string that, if passed to
-    ``Requirement.parse()``, would return an equal ``Requirement`` object.
-
-``project_name``
-    The name of the required project
-
-``key``
-    An all-lowercase version of the ``project_name``, useful for comparison
-    or indexing.
-
-``extras``
-    A tuple of names of "extras" that this requirement calls for.  (These will
-    be all-lowercase and normalized using the ``safe_extra()`` parsing utility
-    function, so they may not exactly equal the extras the requirement was
-    created with.)
-
-``specs``
-    A list of ``(op,version)`` tuples, sorted in ascending parsed-version
-    order.  The `op` in each tuple is a comparison operator, represented as
-    a string.  The `version` is the (unparsed) version number.  The relative
-    order of tuples containing the same version numbers is undefined, since
-    having more than one operator for a given version is either redundant or
-    self-contradictory.
-
-
-Entry Points
-============
-
-Entry points are a simple way for distributions to "advertise" Python objects
-(such as functions or classes) for use by other distributions.  Extensible
-applications and frameworks can search for entry points with a particular name
-or group, either from a specific distribution or from all active distributions
-on sys.path, and then inspect or load the advertised objects at will.
-
-Entry points belong to "groups" which are named with a dotted name similar to
-a Python package or module name.  For example, the ``setuptools`` package uses
-an entry point named ``distutils.commands`` in order to find commands defined
-by distutils extensions.  ``setuptools`` treats the names of entry points
-defined in that group as the acceptable commands for a setup script.
-
-In a similar way, other packages can define their own entry point groups,
-either using dynamic names within the group (like ``distutils.commands``), or
-possibly using predefined names within the group.  For example, a blogging
-framework that offers various pre- or post-publishing hooks might define an
-entry point group and look for entry points named "pre_process" and
-"post_process" within that group.
-
-To advertise an entry point, a project needs to use ``setuptools`` and provide
-an ``entry_points`` argument to ``setup()`` in its setup script, so that the
-entry points will be included in the distribution's metadata.  For more
-details, see the ``setuptools`` documentation.  (XXX link here to setuptools)
-
-Each project distribution can advertise at most one entry point of a given
-name within the same entry point group.  For example, a distutils extension
-could advertise two different ``distutils.commands`` entry points, as long as
-they had different names.  However, there is nothing that prevents *different*
-projects from advertising entry points of the same name in the same group.  In
-some cases, this is a desirable thing, since the application or framework that
-uses the entry points may be calling them as hooks, or in some other way
-combining them.  It is up to the application or framework to decide what to do
-if multiple distributions advertise an entry point; some possibilities include
-using both entry points, displaying an error message, using the first one found
-in sys.path order, etc.
-
-
-Convenience API
----------------
-
-In the following functions, the `dist` argument can be a ``Distribution``
-instance, a ``Requirement`` instance, or a string specifying a requirement
-(i.e. project name, version, etc.).  If the argument is a string or
-``Requirement``, the specified distribution is located (and added to sys.path
-if not already present).  An error will be raised if a matching distribution is
-not available.
-
-The `group` argument should be a string containing a dotted identifier,
-identifying an entry point group.  If you are defining an entry point group,
-you should include some portion of your package's name in the group name so as
-to avoid collision with other packages' entry point groups.
-
-``load_entry_point(dist, group, name)``
-    Load the named entry point from the specified distribution, or raise
-    ``ImportError``.
-
-``get_entry_info(dist, group, name)``
-    Return an ``EntryPoint`` object for the given `group` and `name` from
-    the specified distribution.  Returns ``None`` if the distribution has not
-    advertised a matching entry point.
-
-``get_entry_map(dist, group=None)``
-    Return the distribution's entry point map for `group`, or the full entry
-    map for the distribution.  This function always returns a dictionary,
-    even if the distribution advertises no entry points.  If `group` is given,
-    the dictionary maps entry point names to the corresponding ``EntryPoint``
-    object.  If `group` is None, the dictionary maps group names to
-    dictionaries that then map entry point names to the corresponding
-    ``EntryPoint`` instance in that group.
-
-``iter_entry_points(group, name=None)``
-    Yield entry point objects from `group` matching `name`.
-
-    If `name` is None, yields all entry points in `group` from all
-    distributions in the working set on sys.path, otherwise only ones matching
-    both `group` and `name` are yielded.  Entry points are yielded from
-    the active distributions in the order that the distributions appear on
-    sys.path.  (Within entry points for a particular distribution, however,
-    there is no particular ordering.)
-
-    (This API is actually a method of the global ``working_set`` object; see
-    the section above on `Basic WorkingSet Methods`_ for more information.)
-
-
-Creating and Parsing
---------------------
-
-``EntryPoint(name, module_name, attrs=(), extras=(), dist=None)``
-    Create an ``EntryPoint`` instance.  `name` is the entry point name.  The
-    `module_name` is the (dotted) name of the module containing the advertised
-    object.  `attrs` is an optional tuple of names to look up from the
-    module to obtain the advertised object.  For example, an `attrs` of
-    ``("foo","bar")`` and a `module_name` of ``"baz"`` would mean that the
-    advertised object could be obtained by the following code::
-
-        import baz
-        advertised_object = baz.foo.bar
-
-    The `extras` are an optional tuple of "extra feature" names that the
-    distribution needs in order to provide this entry point.  When the
-    entry point is loaded, these extra features are looked up in the `dist`
-    argument to find out what other distributions may need to be activated
-    on sys.path; see the ``load()`` method for more details.  The `extras`
-    argument is only meaningful if `dist` is specified.  `dist` must be
-    a ``Distribution`` instance.
-
-``EntryPoint.parse(src, dist=None)`` (classmethod)
-    Parse a single entry point from string `src`
-
-    Entry point syntax follows the form::
-
-        name = some.module:some.attr [extra1,extra2]
-
-    The entry name and module name are required, but the ``:attrs`` and
-    ``[extras]`` parts are optional, as is the whitespace shown between
-    some of the items.  The `dist` argument is passed through to the
-    ``EntryPoint()`` constructor, along with the other values parsed from
-    `src`.
-
-``EntryPoint.parse_group(group, lines, dist=None)`` (classmethod)
-    Parse `lines` (a string or sequence of lines) to create a dictionary
-    mapping entry point names to ``EntryPoint`` objects.  ``ValueError`` is
-    raised if entry point names are duplicated, if `group` is not a valid
-    entry point group name, or if there are any syntax errors.  (Note: the
-    `group` parameter is used only for validation and to create more
-    informative error messages.)  If `dist` is provided, it will be used to
-    set the ``dist`` attribute of the created ``EntryPoint`` objects.
-
-``EntryPoint.parse_map(data, dist=None)`` (classmethod)
-    Parse `data` into a dictionary mapping group names to dictionaries mapping
-    entry point names to ``EntryPoint`` objects.  If `data` is a dictionary,
-    then the keys are used as group names and the values are passed to
-    ``parse_group()`` as the `lines` argument.  If `data` is a string or
-    sequence of lines, it is first split into .ini-style sections (using
-    the ``split_sections()`` utility function) and the section names are used
-    as group names.  In either case, the `dist` argument is passed through to
-    ``parse_group()`` so that the entry points will be linked to the specified
-    distribution.
-
-
-``EntryPoint`` Objects
-----------------------
-
-For simple introspection, ``EntryPoint`` objects have attributes that
-correspond exactly to the constructor argument names: ``name``,
-``module_name``, ``attrs``, ``extras``, and ``dist`` are all available.  In
-addition, the following methods are provided:
-
-``load(require=True, env=None, installer=None)``
-    Load the entry point, returning the advertised Python object, or raise
-    ``ImportError`` if it cannot be obtained.  If `require` is a true value,
-    then ``require(env, installer)`` is called before attempting the import.
-
-``require(env=None, installer=None)``
-    Ensure that any "extras" needed by the entry point are available on
-    sys.path.  ``UnknownExtra`` is raised if the ``EntryPoint`` has ``extras``,
-    but no ``dist``, or if the named extras are not defined by the
-    distribution.  If `env` is supplied, it must be an ``Environment``, and it
-    will be used to search for needed distributions if they are not already
-    present on sys.path.  If `installer` is supplied, it must be a callable
-    taking a ``Requirement`` instance and returning a matching importable
-    ``Distribution`` instance or None.
-
-``__str__()``
-    The string form of an ``EntryPoint`` is a string that could be passed to
-    ``EntryPoint.parse()`` to produce an equivalent ``EntryPoint``.
-
-
-``Distribution`` Objects
-========================
-
-``Distribution`` objects represent collections of Python code that may or may
-not be importable, and may or may not have metadata and resources associated
-with them.  Their metadata may include information such as what other projects
-the distribution depends on, what entry points the distribution advertises, and
-so on.
-
-
-Getting or Creating Distributions
----------------------------------
-
-Most commonly, you'll obtain ``Distribution`` objects from a ``WorkingSet`` or
-an ``Environment``.  (See the sections above on `WorkingSet Objects`_ and
-`Environment Objects`_, which are containers for active distributions and
-available distributions, respectively.)  You can also obtain ``Distribution``
-objects from one of these high-level APIs:
-
-``find_distributions(path_item, only=False)``
-    Yield distributions accessible via `path_item`.  If `only` is true, yield
-    only distributions whose ``location`` is equal to `path_item`.  In other
-    words, if `only` is true, this yields any distributions that would be
-    importable if `path_item` were on ``sys.path``.  If `only` is false, this
-    also yields distributions that are "in" or "under" `path_item`, but would
-    not be importable unless their locations were also added to ``sys.path``.
-
-``get_distribution(dist_spec)``
-    Return a ``Distribution`` object for a given ``Requirement`` or string.
-    If `dist_spec` is already a ``Distribution`` instance, it is returned.
-    If it is a ``Requirement`` object or a string that can be parsed into one,
-    it is used to locate and activate a matching distribution, which is then
-    returned.
-
-However, if you're creating specialized tools for working with distributions,
-or creating a new distribution format, you may also need to create
-``Distribution`` objects directly, using one of the three constructors below.
-
-These constructors all take an optional `metadata` argument, which is used to
-access any resources or metadata associated with the distribution.  `metadata`
-must be an object that implements the ``IResourceProvider`` interface, or None.
-If it is None, an ``EmptyProvider`` is used instead.  ``Distribution`` objects
-implement both the `IResourceProvider`_ and `IMetadataProvider Methods`_ by
-delegating them to the `metadata` object.
-
-``Distribution.from_location(location, basename, metadata=None, **kw)`` (classmethod)
-    Create a distribution for `location`, which must be a string such as a
-    URL, filename, or other string that might be used on ``sys.path``.
-    `basename` is a string naming the distribution, like ``Foo-1.2-py2.4.egg``.
-    If `basename` ends with ``.egg``, then the project's name, version, python
-    version and platform are extracted from the filename and used to set those
-    properties of the created distribution.  Any additional keyword arguments
-    are forwarded to the ``Distribution()`` constructor.
-
-``Distribution.from_filename(filename, metadata=None**kw)`` (classmethod)
-    Create a distribution by parsing a local filename.  This is a shorter way
-    of saying  ``Distribution.from_location(normalize_path(filename),
-    os.path.basename(filename), metadata)``.  In other words, it creates a
-    distribution whose location is the normalize form of the filename, parsing
-    name and version information from the base portion of the filename.  Any
-    additional keyword arguments are forwarded to the ``Distribution()``
-    constructor.
-
-``Distribution(location,metadata,project_name,version,py_version,platform,precedence)``
-    Create a distribution by setting its properties.  All arguments are
-    optional and default to None, except for `py_version` (which defaults to
-    the current Python version) and `precedence` (which defaults to
-    ``EGG_DIST``; for more details see ``precedence`` under `Distribution
-    Attributes`_ below).  Note that it's usually easier to use the
-    ``from_filename()`` or ``from_location()`` constructors than to specify
-    all these arguments individually.
-
-
-``Distribution`` Attributes
----------------------------
-
-location
-    A string indicating the distribution's location.  For an importable
-    distribution, this is the string that would be added to ``sys.path`` to
-    make it actively importable.  For non-importable distributions, this is
-    simply a filename, URL, or other way of locating the distribution.
-
-project_name
-    A string, naming the project that this distribution is for.  Project names
-    are defined by a project's setup script, and they are used to identify
-    projects on PyPI.  When a ``Distribution`` is constructed, the
-    `project_name` argument is passed through the ``safe_name()`` utility
-    function to filter out any unacceptable characters.
-
-key
-    ``dist.key`` is short for ``dist.project_name.lower()``.  It's used for
-    case-insensitive comparison and indexing of distributions by project name.
-
-extras
-    A list of strings, giving the names of extra features defined by the
-    project's dependency list (the ``extras_require`` argument specified in
-    the project's setup script).
-
-version
-    A string denoting what release of the project this distribution contains.
-    When a ``Distribution`` is constructed, the `version` argument is passed
-    through the ``safe_version()`` utility function to filter out any
-    unacceptable characters.  If no `version` is specified at construction
-    time, then attempting to access this attribute later will cause the
-    ``Distribution`` to try to discover its version by reading its ``PKG-INFO``
-    metadata file.  If ``PKG-INFO`` is unavailable or can't be parsed,
-    ``ValueError`` is raised.
-
-parsed_version
-    The ``parsed_version`` is a tuple representing a "parsed" form of the
-    distribution's ``version``.  ``dist.parsed_version`` is a shortcut for
-    calling ``parse_version(dist.version)``.  It is used to compare or sort
-    distributions by version.  (See the `Parsing Utilities`_ section below for
-    more information on the ``parse_version()`` function.)  Note that accessing
-    ``parsed_version`` may result in a ``ValueError`` if the ``Distribution``
-    was constructed without a `version` and without `metadata` capable of
-    supplying the missing version info.
-
-py_version
-    The major/minor Python version the distribution supports, as a string.
-    For example, "2.3" or "2.4".  The default is the current version of Python.
-
-platform
-    A string representing the platform the distribution is intended for, or
-    ``None`` if the distribution is "pure Python" and therefore cross-platform.
-    See `Platform Utilities`_ below for more information on platform strings.
-
-precedence
-    A distribution's ``precedence`` is used to determine the relative order of
-    two distributions that have the same ``project_name`` and
-    ``parsed_version``.  The default precedence is ``pkg_resources.EGG_DIST``,
-    which is the highest (i.e. most preferred) precedence.  The full list
-    of predefined precedences, from most preferred to least preferred, is:
-    ``EGG_DIST``, ``BINARY_DIST``, ``SOURCE_DIST``, ``CHECKOUT_DIST``, and
-    ``DEVELOP_DIST``.  Normally, precedences other than ``EGG_DIST`` are used
-    only by the ``setuptools.package_index`` module, when sorting distributions
-    found in a package index to determine their suitability for installation.
-    "System" and "Development" eggs (i.e., ones that use the ``.egg-info``
-    format), however, are automatically given a precedence of ``DEVELOP_DIST``.
-
-
-
-``Distribution`` Methods
-------------------------
-
-``activate(path=None)``
-    Ensure distribution is importable on `path`.  If `path` is None,
-    ``sys.path`` is used instead.  This ensures that the distribution's
-    ``location`` is in the `path` list, and it also performs any necessary
-    namespace package fixups or declarations.  (That is, if the distribution
-    contains namespace packages, this method ensures that they are declared,
-    and that the distribution's contents for those namespace packages are
-    merged with the contents provided by any other active distributions.  See
-    the section above on `Namespace Package Support`_ for more information.)
-
-    ``pkg_resources`` adds a notification callback to the global ``working_set``
-    that ensures this method is called whenever a distribution is added to it.
-    Therefore, you should not normally need to explicitly call this method.
-    (Note that this means that namespace packages on ``sys.path`` are always
-    imported as soon as ``pkg_resources`` is, which is another reason why
-    namespace packages should not contain any code or import statements.)
-
-``as_requirement()``
-    Return a ``Requirement`` instance that matches this distribution's project
-    name and version.
-
-``requires(extras=())``
-    List the ``Requirement`` objects that specify this distribution's
-    dependencies.  If `extras` is specified, it should be a sequence of names
-    of "extras" defined by the distribution, and the list returned will then
-    include any dependencies needed to support the named "extras".
-
-``clone(**kw)``
-    Create a copy of the distribution.  Any supplied keyword arguments override
-    the corresponding argument to the ``Distribution()`` constructor, allowing
-    you to change some of the copied distribution's attributes.
-
-``egg_name()``
-    Return what this distribution's standard filename should be, not including
-    the ".egg" extension.  For example, a distribution for project "Foo"
-    version 1.2 that runs on Python 2.3 for Windows would have an ``egg_name()``
-    of ``Foo-1.2-py2.3-win32``.  Any dashes in the name or version are
-    converted to underscores.  (``Distribution.from_location()`` will convert
-    them back when parsing a ".egg" file name.)
-
-``__cmp__(other)``, ``__hash__()``
-    Distribution objects are hashed and compared on the basis of their parsed
-    version and precedence, followed by their key (lowercase project name),
-    location, Python version, and platform.
-
-The following methods are used to access ``EntryPoint`` objects advertised
-by the distribution.  See the section above on `Entry Points`_ for more
-detailed information about these operations:
-
-``get_entry_info(group, name)``
-    Return the ``EntryPoint`` object for `group` and `name`, or None if no
-    such point is advertised by this distribution.
-
-``get_entry_map(group=None)``
-    Return the entry point map for `group`.  If `group` is None, return
-    a dictionary mapping group names to entry point maps for all groups.
-    (An entry point map is a dictionary of entry point names to ``EntryPoint``
-    objects.)
-
-``load_entry_point(group, name)``
-    Short for ``get_entry_info(group, name).load()``.  Returns the object
-    advertised by the named entry point, or raises ``ImportError`` if
-    the entry point isn't advertised by this distribution, or there is some
-    other import problem.
-
-In addition to the above methods, ``Distribution`` objects also implement all
-of the `IResourceProvider`_ and `IMetadataProvider Methods`_ (which are
-documented in later sections):
-
-* ``has_metadata(name)``
-* ``metadata_isdir(name)``
-* ``metadata_listdir(name)``
-* ``get_metadata(name)``
-* ``get_metadata_lines(name)``
-* ``run_script(script_name, namespace)``
-* ``get_resource_filename(manager, resource_name)``
-* ``get_resource_stream(manager, resource_name)``
-* ``get_resource_string(manager, resource_name)``
-* ``has_resource(resource_name)``
-* ``resource_isdir(resource_name)``
-* ``resource_listdir(resource_name)``
-
-If the distribution was created with a `metadata` argument, these resource and
-metadata access methods are all delegated to that `metadata` provider.
-Otherwise, they are delegated to an ``EmptyProvider``, so that the distribution
-will appear to have no resources or metadata.  This delegation approach is used
-so that supporting custom importers or new distribution formats can be done
-simply by creating an appropriate `IResourceProvider`_ implementation; see the
-section below on `Supporting Custom Importers`_ for more details.
-
-
-``ResourceManager`` API
-=======================
-
-The ``ResourceManager`` class provides uniform access to package resources,
-whether those resources exist as files and directories or are compressed in
-an archive of some kind.
-
-Normally, you do not need to create or explicitly manage ``ResourceManager``
-instances, as the ``pkg_resources`` module creates a global instance for you,
-and makes most of its methods available as top-level names in the
-``pkg_resources`` module namespace.  So, for example, this code actually
-calls the ``resource_string()`` method of the global ``ResourceManager``::
-
-    import pkg_resources
-    my_data = pkg_resources.resource_string(__name__, "foo.dat")
-
-Thus, you can use the APIs below without needing an explicit
-``ResourceManager`` instance; just import and use them as needed.
-
-
-Basic Resource Access
----------------------
-
-In the following methods, the `package_or_requirement` argument may be either
-a Python package/module name (e.g. ``foo.bar``) or a ``Requirement`` instance.
-If it is a package or module name, the named module or package must be
-importable (i.e., be in a distribution or directory on ``sys.path``), and the
-`resource_name` argument is interpreted relative to the named package.  (Note
-that if a module name is used, then the resource name is relative to the
-package immediately containing the named module.  Also, you should not use use
-a namespace package name, because a namespace package can be spread across
-multiple distributions, and is therefore ambiguous as to which distribution
-should be searched for the resource.)
-
-If it is a ``Requirement``, then the requirement is automatically resolved
-(searching the current ``Environment`` if necessary) and a matching
-distribution is added to the ``WorkingSet`` and ``sys.path`` if one was not
-already present.  (Unless the ``Requirement`` can't be satisfied, in which
-case an exception is raised.)  The `resource_name` argument is then interpreted
-relative to the root of the identified distribution; i.e. its first path
-segment will be treated as a peer of the top-level modules or packages in the
-distribution.
-
-Note that resource names must be ``/``-separated paths and cannot be absolute
-(i.e. no leading ``/``) or contain relative names like ``".."``.  Do *not* use
-``os.path`` routines to manipulate resource paths, as they are *not* filesystem
-paths.
-
-``resource_exists(package_or_requirement, resource_name)``
-    Does the named resource exist?  Return ``True`` or ``False`` accordingly.
-
-``resource_stream(package_or_requirement, resource_name)``
-    Return a readable file-like object for the specified resource; it may be
-    an actual file, a ``StringIO``, or some similar object.  The stream is
-    in "binary mode", in the sense that whatever bytes are in the resource
-    will be read as-is.
-
-``resource_string(package_or_requirement, resource_name)``
-    Return the specified resource as a string.  The resource is read in
-    binary fashion, such that the returned string contains exactly the bytes
-    that are stored in the resource.
-
-``resource_isdir(package_or_requirement, resource_name)``
-    Is the named resource a directory?  Return ``True`` or ``False``
-    accordingly.
-
-``resource_listdir(package_or_requirement, resource_name)``
-    List the contents of the named resource directory, just like ``os.listdir``
-    except that it works even if the resource is in a zipfile.
-
-Note that only ``resource_exists()`` and ``resource_isdir()`` are insensitive
-as to the resource type.  You cannot use ``resource_listdir()`` on a file
-resource, and you can't use ``resource_string()`` or ``resource_stream()`` on
-directory resources.  Using an inappropriate method for the resource type may
-result in an exception or undefined behavior, depending on the platform and
-distribution format involved.
-
-
-Resource Extraction
--------------------
-
-``resource_filename(package_or_requirement, resource_name)``
-    Sometimes, it is not sufficient to access a resource in string or stream
-    form, and a true filesystem filename is needed.  In such cases, you can
-    use this method (or module-level function) to obtain a filename for a
-    resource.  If the resource is in an archive distribution (such as a zipped
-    egg), it will be extracted to a cache directory, and the filename within
-    the cache will be returned.  If the named resource is a directory, then
-    all resources within that directory (including subdirectories) are also
-    extracted.  If the named resource is a C extension or "eager resource"
-    (see the ``setuptools`` documentation for details), then all C extensions
-    and eager resources are extracted at the same time.
-
-    Archived resources are extracted to a cache location that can be managed by
-    the following two methods:
-
-``set_extraction_path(path)``
-    Set the base path where resources will be extracted to, if needed.
-
-    If you do not call this routine before any extractions take place, the
-    path defaults to the return value of ``get_default_cache()``.  (Which is
-    based on the ``PYTHON_EGG_CACHE`` environment variable, with various
-    platform-specific fallbacks.  See that routine's documentation for more
-    details.)
-
-    Resources are extracted to subdirectories of this path based upon
-    information given by the resource provider.  You may set this to a
-    temporary directory, but then you must call ``cleanup_resources()`` to
-    delete the extracted files when done.  There is no guarantee that
-    ``cleanup_resources()`` will be able to remove all extracted files.  (On
-    Windows, for example, you can't unlink .pyd or .dll files that are still
-    in use.)
-
-    Note that you may not change the extraction path for a given resource
-    manager once resources have been extracted, unless you first call
-    ``cleanup_resources()``.
-
-``cleanup_resources(force=False)``
-    Delete all extracted resource files and directories, returning a list
-    of the file and directory names that could not be successfully removed.
-    This function does not have any concurrency protection, so it should
-    generally only be called when the extraction path is a temporary
-    directory exclusive to a single process.  This method is not
-    automatically called; you must call it explicitly or register it as an
-    ``atexit`` function if you wish to ensure cleanup of a temporary
-    directory used for extractions.
-
-
-"Provider" Interface
---------------------
-
-If you are implementing an ``IResourceProvider`` and/or ``IMetadataProvider``
-for a new distribution archive format, you may need to use the following
-``IResourceManager`` methods to co-ordinate extraction of resources to the
-filesystem.  If you're not implementing an archive format, however, you have
-no need to use these methods.  Unlike the other methods listed above, they are
-*not* available as top-level functions tied to the global ``ResourceManager``;
-you must therefore have an explicit ``ResourceManager`` instance to use them.
-
-``get_cache_path(archive_name, names=())``
-    Return absolute location in cache for `archive_name` and `names`
-
-    The parent directory of the resulting path will be created if it does
-    not already exist.  `archive_name` should be the base filename of the
-    enclosing egg (which may not be the name of the enclosing zipfile!),
-    including its ".egg" extension.  `names`, if provided, should be a
-    sequence of path name parts "under" the egg's extraction location.
-
-    This method should only be called by resource providers that need to
-    obtain an extraction location, and only for names they intend to
-    extract, as it tracks the generated names for possible cleanup later.
-
-``extraction_error()``
-    Raise an ``ExtractionError`` describing the active exception as interfering
-    with the extraction process.  You should call this if you encounter any
-    OS errors extracting the file to the cache path; it will format the
-    operating system exception for you, and add other information to the
-    ``ExtractionError`` instance that may be needed by programs that want to
-    wrap or handle extraction errors themselves.
-
-``postprocess(tempname, filename)``
-    Perform any platform-specific postprocessing of `tempname`.
-    Resource providers should call this method ONLY after successfully
-    extracting a compressed resource.  They must NOT call it on resources
-    that are already in the filesystem.
-
-    `tempname` is the current (temporary) name of the file, and `filename`
-    is the name it will be renamed to by the caller after this routine
-    returns.
-
-
-Metadata API
-============
-
-The metadata API is used to access metadata resources bundled in a pluggable
-distribution.  Metadata resources are virtual files or directories containing
-information about the distribution, such as might be used by an extensible
-application or framework to connect "plugins".  Like other kinds of resources,
-metadata resource names are ``/``-separated and should not contain ``..`` or
-begin with a ``/``.  You should not use ``os.path`` routines to manipulate
-resource paths.
-
-The metadata API is provided by objects implementing the ``IMetadataProvider``
-or ``IResourceProvider`` interfaces.  ``Distribution`` objects implement this
-interface, as do objects returned by the ``get_provider()`` function:
-
-``get_provider(package_or_requirement)``
-    If a package name is supplied, return an ``IResourceProvider`` for the
-    package.  If a ``Requirement`` is supplied, resolve it by returning a
-    ``Distribution`` from the current working set (searching the current
-    ``Environment`` if necessary and adding the newly found ``Distribution``
-    to the working set).  If the named package can't be imported, or the
-    ``Requirement`` can't be satisfied, an exception is raised.
-
-    NOTE: if you use a package name rather than a ``Requirement``, the object
-    you get back may not be a pluggable distribution, depending on the method
-    by which the package was installed.  In particular, "development" packages
-    and "single-version externally-managed" packages do not have any way to
-    map from a package name to the corresponding project's metadata.  Do not
-    write code that passes a package name to ``get_provider()`` and then tries
-    to retrieve project metadata from the returned object.  It may appear to
-    work when the named package is in an ``.egg`` file or directory, but
-    it will fail in other installation scenarios.  If you want project
-    metadata, you need to ask for a *project*, not a package.
-
-
-``IMetadataProvider`` Methods
------------------------------
-
-The methods provided by objects (such as ``Distribution`` instances) that
-implement the ``IMetadataProvider`` or ``IResourceProvider`` interfaces are:
-
-``has_metadata(name)``
-    Does the named metadata resource exist?
-
-``metadata_isdir(name)``
-    Is the named metadata resource a directory?
-
-``metadata_listdir(name)``
-    List of metadata names in the directory (like ``os.listdir()``)
-
-``get_metadata(name)``
-    Return the named metadata resource as a string.  The data is read in binary
-    mode; i.e., the exact bytes of the resource file are returned.
-
-``get_metadata_lines(name)``
-    Yield named metadata resource as list of non-blank non-comment lines.  This
-    is short for calling ``yield_lines(provider.get_metadata(name))``.  See the
-    section on `yield_lines()`_ below for more information on the syntax it
-    recognizes.
-
-``run_script(script_name, namespace)``
-    Execute the named script in the supplied namespace dictionary.  Raises
-    ``ResolutionError`` if there is no script by that name in the ``scripts``
-    metadata directory.  `namespace` should be a Python dictionary, usually
-    a module dictionary if the script is being run as a module.
-
-
-Exceptions
-==========
-
-``pkg_resources`` provides a simple exception hierarchy for problems that may
-occur when processing requests to locate and activate packages::
-
-    ResolutionError
-        DistributionNotFound
-        VersionConflict
-        UnknownExtra
-
-    ExtractionError
-
-``ResolutionError``
-    This class is used as a base class for the other three exceptions, so that
-    you can catch all of them with a single "except" clause.  It is also raised
-    directly for miscellaneous requirement-resolution problems like trying to
-    run a script that doesn't exist in the distribution it was requested from.
-
-``DistributionNotFound``
-    A distribution needed to fulfill a requirement could not be found.
-
-``VersionConflict``
-    The requested version of a project conflicts with an already-activated
-    version of the same project.
-
-``UnknownExtra``
-    One of the "extras" requested was not recognized by the distribution it
-    was requested from.
-
-``ExtractionError``
-    A problem occurred extracting a resource to the Python Egg cache.  The
-    following attributes are available on instances of this exception:
-
-    manager
-        The resource manager that raised this exception
-
-    cache_path
-        The base directory for resource extraction
-
-    original_error
-        The exception instance that caused extraction to fail
-
-
-Supporting Custom Importers
-===========================
-
-By default, ``pkg_resources`` supports normal filesystem imports, and
-``zipimport`` importers.  If you wish to use the ``pkg_resources`` features
-with other (PEP 302-compatible) importers or module loaders, you may need to
-register various handlers and support functions using these APIs:
-
-``register_finder(importer_type, distribution_finder)``
-    Register `distribution_finder` to find distributions in ``sys.path`` items.
-    `importer_type` is the type or class of a PEP 302 "Importer" (``sys.path``
-    item handler), and `distribution_finder` is a callable that, when passed a
-    path item, the importer instance, and an `only` flag, yields
-    ``Distribution`` instances found under that path item.  (The `only` flag,
-    if true, means the finder should yield only ``Distribution`` objects whose
-    ``location`` is equal to the path item provided.)
-
-    See the source of the ``pkg_resources.find_on_path`` function for an
-    example finder function.
-
-``register_loader_type(loader_type, provider_factory)``
-    Register `provider_factory` to make ``IResourceProvider`` objects for
-    `loader_type`.  `loader_type` is the type or class of a PEP 302
-    ``module.__loader__``, and `provider_factory` is a function that, when
-    passed a module object, returns an `IResourceProvider`_ for that module,
-    allowing it to be used with the `ResourceManager API`_.
-
-``register_namespace_handler(importer_type, namespace_handler)``
-    Register `namespace_handler` to declare namespace packages for the given
-    `importer_type`.  `importer_type` is the type or class of a PEP 302
-    "importer" (sys.path item handler), and `namespace_handler` is a callable
-    with a signature like this::
-
-        def namespace_handler(importer, path_entry, moduleName, module):
-            # return a path_entry to use for child packages
-
-    Namespace handlers are only called if the relevant importer object has
-    already agreed that it can handle the relevant path item.  The handler
-    should only return a subpath if the module ``__path__`` does not already
-    contain an equivalent subpath.  Otherwise, it should return None.
-
-    For an example namespace handler, see the source of the
-    ``pkg_resources.file_ns_handler`` function, which is used for both zipfile
-    importing and regular importing.
-
-
-IResourceProvider
------------------
-
-``IResourceProvider`` is an abstract class that documents what methods are
-required of objects returned by a `provider_factory` registered with
-``register_loader_type()``.  ``IResourceProvider`` is a subclass of
-``IMetadataProvider``, so objects that implement this interface must also
-implement all of the `IMetadataProvider Methods`_ as well as the methods
-shown here.  The `manager` argument to the methods below must be an object
-that supports the full `ResourceManager API`_ documented above.
-
-``get_resource_filename(manager, resource_name)``
-    Return a true filesystem path for `resource_name`, co-ordinating the
-    extraction with `manager`, if the resource must be unpacked to the
-    filesystem.
-
-``get_resource_stream(manager, resource_name)``
-    Return a readable file-like object for `resource_name`.
-
-``get_resource_string(manager, resource_name)``
-    Return a string containing the contents of `resource_name`.
-
-``has_resource(resource_name)``
-    Does the package contain the named resource?
-
-``resource_isdir(resource_name)``
-    Is the named resource a directory?  Return a false value if the resource
-    does not exist or is not a directory.
-
-``resource_listdir(resource_name)``
-    Return a list of the contents of the resource directory, ala
-    ``os.listdir()``.  Requesting the contents of a non-existent directory may
-    raise an exception.
-
-Note, by the way, that your provider classes need not (and should not) subclass
-``IResourceProvider`` or ``IMetadataProvider``!  These classes exist solely
-for documentation purposes and do not provide any useful implementation code.
-You may instead wish to subclass one of the `built-in resource providers`_.
-
-
-Built-in Resource Providers
----------------------------
-
-``pkg_resources`` includes several provider classes that are automatically used
-where appropriate.  Their inheritance tree looks like this::
-
-    NullProvider
-        EggProvider
-            DefaultProvider
-                PathMetadata
-            ZipProvider
-                EggMetadata
-        EmptyProvider
-            FileMetadata
-
-
-``NullProvider``
-    This provider class is just an abstract base that provides for common
-    provider behaviors (such as running scripts), given a definition for just
-    a few abstract methods.
-
-``EggProvider``
-    This provider class adds in some egg-specific features that are common
-    to zipped and unzipped eggs.
-
-``DefaultProvider``
-    This provider class is used for unpacked eggs and "plain old Python"
-    filesystem modules.
-
-``ZipProvider``
-    This provider class is used for all zipped modules, whether they are eggs
-    or not.
-
-``EmptyProvider``
-    This provider class always returns answers consistent with a provider that
-    has no metadata or resources.  ``Distribution`` objects created without
-    a ``metadata`` argument use an instance of this provider class instead.
-    Since all ``EmptyProvider`` instances are equivalent, there is no need
-    to have more than one instance.  ``pkg_resources`` therefore creates a
-    global instance of this class under the name ``empty_provider``, and you
-    may use it if you have need of an ``EmptyProvider`` instance.
-
-``PathMetadata(path, egg_info)``
-    Create an ``IResourceProvider`` for a filesystem-based distribution, where
-    `path` is the filesystem location of the importable modules, and `egg_info`
-    is the filesystem location of the distribution's metadata directory.
-    `egg_info` should usually be the ``EGG-INFO`` subdirectory of `path` for an
-    "unpacked egg", and a ``ProjectName.egg-info`` subdirectory of `path` for
-    a "development egg".  However, other uses are possible for custom purposes.
-
-``EggMetadata(zipimporter)``
-    Create an ``IResourceProvider`` for a zipfile-based distribution.  The
-    `zipimporter` should be a ``zipimport.zipimporter`` instance, and may
-    represent a "basket" (a zipfile containing multiple ".egg" subdirectories)
-    a specific egg *within* a basket, or a zipfile egg (where the zipfile
-    itself is a ".egg").  It can also be a combination, such as a zipfile egg
-    that also contains other eggs.
-
-``FileMetadata(path_to_pkg_info)``
-    Create an ``IResourceProvider`` that provides exactly one metadata
-    resource: ``PKG-INFO``.  The supplied path should be a distutils PKG-INFO
-    file.  This is basically the same as an ``EmptyProvider``, except that
-    requests for ``PKG-INFO`` will be answered using the contents of the
-    designated file.  (This provider is used to wrap ``.egg-info`` files
-    installed by vendor-supplied system packages.)
-
-
-Utility Functions
-=================
-
-In addition to its high-level APIs, ``pkg_resources`` also includes several
-generally-useful utility routines.  These routines are used to implement the
-high-level APIs, but can also be quite useful by themselves.
-
-
-Parsing Utilities
------------------
-
-``parse_version(version)``
-    Parse a project's version string, returning a value that can be used to
-    compare versions by chronological order.  Semantically, the format is a
-    rough cross between distutils' ``StrictVersion`` and ``LooseVersion``
-    classes; if you give it versions that would work with ``StrictVersion``,
-    then they will compare the same way.  Otherwise, comparisons are more like
-    a "smarter" form of ``LooseVersion``.  It is *possible* to create
-    pathological version coding schemes that will fool this parser, but they
-    should be very rare in practice.
-
-    The returned value will be a tuple of strings.  Numeric portions of the
-    version are padded to 8 digits so they will compare numerically, but
-    without relying on how numbers compare relative to strings.  Dots are
-    dropped, but dashes are retained.  Trailing zeros between alpha segments
-    or dashes are suppressed, so that e.g. "2.4.0" is considered the same as
-    "2.4". Alphanumeric parts are lower-cased.
-
-    The algorithm assumes that strings like "-" and any alpha string that
-    alphabetically follows "final"  represents a "patch level".  So, "2.4-1"
-    is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is
-    considered newer than "2.4-1", which in turn is newer than "2.4".
-
-    Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that
-    come before "final" alphabetically) are assumed to be pre-release versions,
-    so that the version "2.4" is considered newer than "2.4a1".  Any "-"
-    characters preceding a pre-release indicator are removed.  (In versions of
-    setuptools prior to 0.6a9, "-" characters were not removed, leading to the
-    unintuitive result that "0.2-rc1" was considered a newer version than
-    "0.2".)
-
-    Finally, to handle miscellaneous cases, the strings "pre", "preview", and
-    "rc" are treated as if they were "c", i.e. as though they were release
-    candidates, and therefore are not as new as a version string that does not
-    contain them.  And the string "dev" is treated as if it were an "@" sign;
-    that is, a version coming before even "a" or "alpha".
-
-.. _yield_lines():
-
-``yield_lines(strs)``
-    Yield non-empty/non-comment lines from a string/unicode or a possibly-
-    nested sequence thereof.  If `strs` is an instance of ``basestring``, it
-    is split into lines, and each non-blank, non-comment line is yielded after
-    stripping leading and trailing whitespace.  (Lines whose first non-blank
-    character is ``#`` are considered comment lines.)
-
-    If `strs` is not an instance of ``basestring``, it is iterated over, and
-    each item is passed recursively to ``yield_lines()``, so that an arbitarily
-    nested sequence of strings, or sequences of sequences of strings can be
-    flattened out to the lines contained therein.  So for example, passing
-    a file object or a list of strings to ``yield_lines`` will both work.
-    (Note that between each string in a sequence of strings there is assumed to
-    be an implicit line break, so lines cannot bridge two strings in a
-    sequence.)
-
-    This routine is used extensively by ``pkg_resources`` to parse metadata
-    and file formats of various kinds, and most other ``pkg_resources``
-    parsing functions that yield multiple values will use it to break up their
-    input.  However, this routine is idempotent, so calling ``yield_lines()``
-    on the output of another call to ``yield_lines()`` is completely harmless.
-
-``split_sections(strs)``
-    Split a string (or possibly-nested iterable thereof), yielding ``(section,
-    content)`` pairs found using an ``.ini``-like syntax.  Each ``section`` is
-    a whitespace-stripped version of the section name ("``[section]``")
-    and each ``content`` is a list of stripped lines excluding blank lines and
-    comment-only lines.  If there are any non-blank, non-comment lines before
-    the first section header, they're yielded in a first ``section`` of
-    ``None``.
-
-    This routine uses ``yield_lines()`` as its front end, so you can pass in
-    anything that ``yield_lines()`` accepts, such as an open text file, string,
-    or sequence of strings.  ``ValueError`` is raised if a malformed section
-    header is found (i.e. a line starting with ``[`` but not ending with
-    ``]``).
-
-    Note that this simplistic parser assumes that any line whose first nonblank
-    character is ``[`` is a section heading, so it can't support .ini format
-    variations that allow ``[`` as the first nonblank character on other lines.
-
-``safe_name(name)``
-    Return a "safe" form of a project's name, suitable for use in a
-    ``Requirement`` string, as a distribution name, or a PyPI project name.
-    All non-alphanumeric runs are condensed to single "-" characters, such that
-    a name like "The $$$ Tree" becomes "The-Tree".  Note that if you are
-    generating a filename from this value you should combine it with a call to
-    ``to_filename()`` so all dashes ("-") are replaced by underscores ("_").
-    See ``to_filename()``.
-
-``safe_version(version)``
-    Similar to ``safe_name()`` except that spaces in the input become dots, and
-    dots are allowed to exist in the output.  As with ``safe_name()``, if you
-    are generating a filename from this you should replace any "-" characters
-    in the output with underscores.
-
-``safe_extra(extra)``
-    Return a "safe" form of an extra's name, suitable for use in a requirement
-    string or a setup script's ``extras_require`` keyword.  This routine is
-    similar to ``safe_name()`` except that non-alphanumeric runs are replaced
-    by a single underbar (``_``), and the result is lowercased.
-
-``to_filename(name_or_version)``
-    Escape a name or version string so it can be used in a dash-separated
-    filename (or ``#egg=name-version`` tag) without ambiguity.  You
-    should only pass in values that were returned by ``safe_name()`` or
-    ``safe_version()``.
-
-
-Platform Utilities
-------------------
-
-``get_build_platform()``
-    Return this platform's identifier string.  For Windows, the return value
-    is ``"win32"``, and for Mac OS X it is a string of the form
-    ``"macosx-10.4-ppc"``.  All other platforms return the same uname-based
-    string that the ``distutils.util.get_platform()`` function returns.
-    This string is the minimum platform version required by distributions built
-    on the local machine.  (Backward compatibility note: setuptools versions
-    prior to 0.6b1 called this function ``get_platform()``, and the function is
-    still available under that name for backward compatibility reasons.)
-
-``get_supported_platform()`` (New in 0.6b1)
-    This is the similar to ``get_build_platform()``, but is the maximum
-    platform version that the local machine supports.  You will usually want
-    to use this value as the ``provided`` argument to the
-    ``compatible_platforms()`` function.
-
-``compatible_platforms(provided, required)``
-    Return true if a distribution built on the `provided` platform may be used
-    on the `required` platform.  If either platform value is ``None``, it is
-    considered a wildcard, and the platforms are therefore compatible.
-    Likewise, if the platform strings are equal, they're also considered
-    compatible, and ``True`` is returned.  Currently, the only non-equal
-    platform strings that are considered compatible are Mac OS X platform
-    strings with the same hardware type (e.g. ``ppc``) and major version
-    (e.g. ``10``) with the `provided` platform's minor version being less than
-    or equal to the `required` platform's minor version.
-
-``get_default_cache()``
-    Determine the default cache location for extracting resources from zipped
-    eggs.  This routine returns the ``PYTHON_EGG_CACHE`` environment variable,
-    if set.  Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of
-    the user's "Application Data" directory.  On all other systems, it returns
-    ``os.path.expanduser("~/.python-eggs")`` if ``PYTHON_EGG_CACHE`` is not
-    set.
-
-
-PEP 302 Utilities
------------------
-
-``get_importer(path_item)``
-    Retrieve a PEP 302 "importer" for the given path item (which need not
-    actually be on ``sys.path``).  This routine simulates the PEP 302 protocol
-    for obtaining an "importer" object.  It first checks for an importer for
-    the path item in ``sys.path_importer_cache``, and if not found it calls
-    each of the ``sys.path_hooks`` and caches the result if a good importer is
-    found.  If no importer is found, this routine returns an ``ImpWrapper``
-    instance that wraps the builtin import machinery as a PEP 302-compliant
-    "importer" object.  This ``ImpWrapper`` is *not* cached; instead a new
-    instance is returned each time.
-
-    (Note: When run under Python 2.5, this function is simply an alias for
-    ``pkgutil.get_importer()``, and instead of ``pkg_resources.ImpWrapper``
-    instances, it may return ``pkgutil.ImpImporter`` instances.)
-
-
-File/Path Utilities
--------------------
-
-``ensure_directory(path)``
-    Ensure that the parent directory (``os.path.dirname``) of `path` actually
-    exists, using ``os.makedirs()`` if necessary.
-
-``normalize_path(path)``
-    Return a "normalized" version of `path`, such that two paths represent
-    the same filesystem location if they have equal ``normalized_path()``
-    values.  Specifically, this is a shortcut for calling ``os.path.realpath``
-    and ``os.path.normcase`` on `path`.  Unfortunately, on certain platforms
-    (notably Cygwin and Mac OS X) the ``normcase`` function does not accurately
-    reflect the platform's case-sensitivity, so there is always the possibility
-    of two apparently-different paths being equal on such platforms.
-
-History
--------
-
-0.6c9
- * Fix ``resource_listdir('')`` always returning an empty list for zipped eggs.
-
-0.6c7
- * Fix package precedence problem where single-version eggs installed in
-   ``site-packages`` would take precedence over ``.egg`` files (or directories)
-   installed in ``site-packages``.
-
-0.6c6
- * Fix extracted C extensions not having executable permissions under Cygwin.
-
- * Allow ``.egg-link`` files to contain relative paths.
-
- * Fix cache dir defaults on Windows when multiple environment vars are needed
-   to construct a path.
-
-0.6c4
- * Fix "dev" versions being considered newer than release candidates.
-
-0.6c3
- * Python 2.5 compatibility fixes.
-
-0.6c2
- * Fix a problem with eggs specified directly on ``PYTHONPATH`` on
-   case-insensitive filesystems possibly not showing up in the default
-   working set, due to differing normalizations of ``sys.path`` entries.
-
-0.6b3
- * Fixed a duplicate path insertion problem on case-insensitive filesystems.
-
-0.6b1
- * Split ``get_platform()`` into ``get_supported_platform()`` and
-   ``get_build_platform()`` to work around a Mac versioning problem that caused
-   the behavior of ``compatible_platforms()`` to be platform specific.
-
- * Fix entry point parsing when a standalone module name has whitespace
-   between it and the extras.
-
-0.6a11
- * Added ``ExtractionError`` and ``ResourceManager.extraction_error()`` so that
-   cache permission problems get a more user-friendly explanation of the
-   problem, and so that programs can catch and handle extraction errors if they
-   need to.
-
-0.6a10
- * Added the ``extras`` attribute to ``Distribution``, the ``find_plugins()``
-   method to ``WorkingSet``, and the ``__add__()`` and ``__iadd__()`` methods
-   to ``Environment``.
-
- * ``safe_name()`` now allows dots in project names.
-
- * There is a new ``to_filename()`` function that escapes project names and
-   versions for safe use in constructing egg filenames from a Distribution
-   object's metadata.
-
- * Added ``Distribution.clone()`` method, and keyword argument support to other
-   ``Distribution`` constructors.
-
- * Added the ``DEVELOP_DIST`` precedence, and automatically assign it to
-   eggs using ``.egg-info`` format.
-
-0.6a9
- * Don't raise an error when an invalid (unfinished) distribution is found
-   unless absolutely necessary.  Warn about skipping invalid/unfinished eggs
-   when building an Environment.
-
- * Added support for ``.egg-info`` files or directories with version/platform
-   information embedded in the filename, so that system packagers have the
-   option of including ``PKG-INFO`` files to indicate the presence of a
-   system-installed egg, without needing to use ``.egg`` directories, zipfiles,
-   or ``.pth`` manipulation.
-
- * Changed ``parse_version()`` to remove dashes before pre-release tags, so
-   that ``0.2-rc1`` is considered an *older* version than ``0.2``, and is equal
-   to ``0.2rc1``.  The idea that a dash *always* meant a post-release version
-   was highly non-intuitive to setuptools users and Python developers, who
-   seem to want to use ``-rc`` version numbers a lot.
-
-0.6a8
- * Fixed a problem with ``WorkingSet.resolve()`` that prevented version
-   conflicts from being detected at runtime.
-
- * Improved runtime conflict warning message to identify a line in the user's
-   program, rather than flagging the ``warn()`` call in ``pkg_resources``.
-
- * Avoid giving runtime conflict warnings for namespace packages, even if they
-   were declared by a different package than the one currently being activated.
-
- * Fix path insertion algorithm for case-insensitive filesystems.
-
- * Fixed a problem with nested namespace packages (e.g. ``peak.util``) not
-   being set as an attribute of their parent package.
-
-0.6a6
- * Activated distributions are now inserted in ``sys.path`` (and the working
-   set) just before the directory that contains them, instead of at the end.
-   This allows e.g. eggs in ``site-packages`` to override unmanaged modules in
-   the same location, and allows eggs found earlier on ``sys.path`` to override
-   ones found later.
-
- * When a distribution is activated, it now checks whether any contained
-   non-namespace modules have already been imported and issues a warning if
-   a conflicting module has already been imported.
-
- * Changed dependency processing so that it's breadth-first, allowing a
-   depender's preferences to override those of a dependee, to prevent conflicts
-   when a lower version is acceptable to the dependee, but not the depender.
-
- * Fixed a problem extracting zipped files on Windows, when the egg in question
-   has had changed contents but still has the same version number.
-
-0.6a4
- * Fix a bug in ``WorkingSet.resolve()`` that was introduced in 0.6a3.
-
-0.6a3
- * Added ``safe_extra()`` parsing utility routine, and use it for Requirement,
-   EntryPoint, and Distribution objects' extras handling.
-
-0.6a1
- * Enhanced performance of ``require()`` and related operations when all
-   requirements are already in the working set, and enhanced performance of
-   directory scanning for distributions.
-
- * Fixed some problems using ``pkg_resources`` w/PEP 302 loaders other than
-   ``zipimport``, and the previously-broken "eager resource" support.
-
- * Fixed ``pkg_resources.resource_exists()`` not working correctly, along with
-   some other resource API bugs.
-
- * Many API changes and enhancements:
-
-   * Added ``EntryPoint``, ``get_entry_map``, ``load_entry_point``, and
-     ``get_entry_info`` APIs for dynamic plugin discovery.
-
-   * ``list_resources`` is now ``resource_listdir`` (and it actually works)
-
-   * Resource API functions like ``resource_string()`` that accepted a package
-     name and resource name, will now also accept a ``Requirement`` object in
-     place of the package name (to allow access to non-package data files in
-     an egg).
-
-   * ``get_provider()`` will now accept a ``Requirement`` instance or a module
-     name.  If it is given a ``Requirement``, it will return a corresponding
-     ``Distribution`` (by calling ``require()`` if a suitable distribution
-     isn't already in the working set), rather than returning a metadata and
-     resource provider for a specific module.  (The difference is in how
-     resource paths are interpreted; supplying a module name means resources
-     path will be module-relative, rather than relative to the distribution's
-     root.)
-
-   * ``Distribution`` objects now implement the ``IResourceProvider`` and
-     ``IMetadataProvider`` interfaces, so you don't need to reference the (no
-     longer available) ``metadata`` attribute to get at these interfaces.
-
-   * ``Distribution`` and ``Requirement`` both have a ``project_name``
-     attribute for the project name they refer to.  (Previously these were
-     ``name`` and ``distname`` attributes.)
-
-   * The ``path`` attribute of ``Distribution`` objects is now ``location``,
-     because it isn't necessarily a filesystem path (and hasn't been for some
-     time now).  The ``location`` of ``Distribution`` objects in the filesystem
-     should always be normalized using ``pkg_resources.normalize_path()``; all
-     of the setuptools and EasyInstall code that generates distributions from
-     the filesystem (including ``Distribution.from_filename()``) ensure this
-     invariant, but if you use a more generic API like ``Distribution()`` or
-     ``Distribution.from_location()`` you should take care that you don't
-     create a distribution with an un-normalized filesystem path.
-
-   * ``Distribution`` objects now have an ``as_requirement()`` method that
-     returns a ``Requirement`` for the distribution's project name and version.
-
-   * Distribution objects no longer have an ``installed_on()`` method, and the
-     ``install_on()`` method is now ``activate()`` (but may go away altogether
-     soon).  The ``depends()`` method has also been renamed to ``requires()``,
-     and ``InvalidOption`` is now ``UnknownExtra``.
-
-   * ``find_distributions()`` now takes an additional argument called ``only``,
-     that tells it to only yield distributions whose location is the passed-in
-     path.  (It defaults to False, so that the default behavior is unchanged.)
-
-   * ``AvailableDistributions`` is now called ``Environment``, and the
-     ``get()``, ``__len__()``, and ``__contains__()`` methods were removed,
-     because they weren't particularly useful.  ``__getitem__()`` no longer
-     raises ``KeyError``; it just returns an empty list if there are no
-     distributions for the named project.
-
-   * The ``resolve()`` method of ``Environment`` is now a method of
-     ``WorkingSet`` instead, and the ``best_match()`` method now uses a working
-     set instead of a path list as its second argument.
-
-   * There is a new ``pkg_resources.add_activation_listener()`` API that lets
-     you register a callback for notifications about distributions added to
-     ``sys.path`` (including the distributions already on it).  This is
-     basically a hook for extensible applications and frameworks to be able to
-     search for plugin metadata in distributions added at runtime.
-
-0.5a13
- * Fixed a bug in resource extraction from nested packages in a zipped egg.
-
-0.5a12
- * Updated extraction/cache mechanism for zipped resources to avoid inter-
-   process and inter-thread races during extraction.  The default cache
-   location can now be set via the ``PYTHON_EGGS_CACHE`` environment variable,
-   and the default Windows cache is now a ``Python-Eggs`` subdirectory of the
-   current user's "Application Data" directory, if the ``PYTHON_EGGS_CACHE``
-   variable isn't set.
-
-0.5a10
- * Fix a problem with ``pkg_resources`` being confused by non-existent eggs on
-   ``sys.path`` (e.g. if a user deletes an egg without removing it from the
-   ``easy-install.pth`` file).
-
- * Fix a problem with "basket" support in ``pkg_resources``, where egg-finding
-   never actually went inside ``.egg`` files.
-
- * Made ``pkg_resources`` import the module you request resources from, if it's
-   not already imported.
-
-0.5a4
- * ``pkg_resources.AvailableDistributions.resolve()`` and related methods now
-   accept an ``installer`` argument: a callable taking one argument, a
-   ``Requirement`` instance.  The callable must return a ``Distribution``
-   object, or ``None`` if no distribution is found.  This feature is used by
-   EasyInstall to resolve dependencies by recursively invoking itself.
-
-0.4a4
- * Fix problems with ``resource_listdir()``, ``resource_isdir()`` and resource
-   directory extraction for zipped eggs.
-
-0.4a3
- * Fixed scripts not being able to see a ``__file__`` variable in ``__main__``
-
- * Fixed a problem with ``resource_isdir()`` implementation that was introduced
-   in 0.4a2.
-
-0.4a1
- * Fixed a bug in requirements processing for exact versions (i.e. ``==`` and
-   ``!=``) when only one condition was included.
-
- * Added ``safe_name()`` and ``safe_version()`` APIs to clean up handling of
-   arbitrary distribution names and versions found on PyPI.
-
-0.3a4
- * ``pkg_resources`` now supports resource directories, not just the resources
-   in them.  In particular, there are ``resource_listdir()`` and
-   ``resource_isdir()`` APIs.
-
- * ``pkg_resources`` now supports "egg baskets" -- .egg zipfiles which contain
-   multiple distributions in subdirectories whose names end with ``.egg``.
-   Having such a "basket" in a directory on ``sys.path`` is equivalent to
-   having the individual eggs in that directory, but the contained eggs can
-   be individually added (or not) to ``sys.path``.  Currently, however, there
-   is no automated way to create baskets.
-
- * Namespace package manipulation is now protected by the Python import lock.
-
-0.3a1
- * Initial release.
-
diff --git a/docs/python3.txt b/docs/python3.txt
deleted file mode 100644
index 2f6cde4ab3..0000000000
--- a/docs/python3.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-=====================================================
-Supporting both Python 2 and Python 3 with Distribute
-=====================================================
-
-Starting with version 0.6.2, Distribute supports Python 3. Installing and
-using distribute for Python 3 code works exactly the same as for Python 2
-code, but Distribute also helps you to support Python 2 and Python 3 from
-the same source code by letting you run 2to3 on the code as a part of the
-build process, by setting the keyword parameter ``use_2to3`` to True.
-
-
-Distribute as help during porting
-=================================
-
-Distribute can make the porting process much easier by automatically running
-2to3 as a part of the test running. To do this you need to configure the
-setup.py so that you can run the unit tests with ``python setup.py test``.
-
-See :ref:`test` for more information on this.
-
-Once you have the tests running under Python 2, you can add the use_2to3
-keyword parameters to setup(), and start running the tests under Python 3.
-The test command will now first run the build command during which the code
-will be converted with 2to3, and the tests will then be run from the build
-directory, as opposed from the source directory as is normally done.
-
-Distribute will convert all Python files, and also all doctests in Python
-files. However, if you have doctests located in separate text files, these
-will not automatically be converted. By adding them to the
-``convert_2to3_doctests`` keyword parameter Distrubute will convert them as
-well.
-
-By default, the conversion uses all fixers in the ``lib2to3.fixers`` package.
-To use additional fixers, the parameter ``use_2to3_fixers`` can be set
-to a list of names of packages containing fixers. To exclude fixers, the
-parameter ``use_2to3_exclude_fixers`` can be set to fixer names to be
-skipped.
-
-A typical setup.py can look something like this::
-
-    from setuptools import setup
-
-    setup(
-        name='your.module',
-        version = '1.0',
-        description='This is your awesome module',
-        author='You',
-        author_email='your@email',
-        package_dir = {'': 'src'},
-        packages = ['your', 'you.module'],
-        test_suite = 'your.module.tests',
-        use_2to3 = True,
-        convert_2to3_doctests = ['src/your/module/README.txt'],
-        use_2to3_fixers = ['your.fixers'],
-        use_2to3_exclude_fixers = ['lib2to3.fixes.fix_import'],
-    )
-
-Differential conversion
------------------------
-
-Note that a file will only be copied and converted during the build process
-if the source file has been changed. If you add a file to the doctests
-that should be converted, it will not be converted the next time you run
-the tests, since it hasn't been modified. You need to remove it from the
-build directory. Also if you run the build, install or test commands before
-adding the use_2to3 parameter, you will have to remove the build directory
-before you run the test command, as the files otherwise will seem updated,
-and no conversion will happen.
-
-In general, if code doesn't seem to be converted, deleting the build directory
-and trying again is a good saferguard against the build directory getting
-"out of sync" with the source directory.
-
-Distributing Python 3 modules
-=============================
-
-You can distribute your modules with Python 3 support in different ways. A
-normal source distribution will work, but can be slow in installing, as the
-2to3 process will be run during the install. But you can also distribute
-the module in binary format, such as a binary egg. That egg will contain the
-already converted code, and hence no 2to3 conversion is needed during install.
-
-Advanced features
-=================
-
-If you don't want to run the 2to3 conversion on the doctests in Python files,
-you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.
-
-Note on compatibility with setuptools
-=====================================
-
-Setuptools do not know about the new keyword parameters to support Python 3.
-As a result it will warn about the unknown keyword parameters if you use
-setuptools instead of Distribute under Python 2. This is not an error, and
-install process will continue as normal, but if you want to get rid of that
-error this is easy. Simply conditionally add the new parameters into an extra
-dict and pass that dict into setup()::
-
-    from setuptools import setup
-    import sys
-
-    extra = {}
-    if sys.version_info >= (3,):
-        extra['use_2to3'] = True
-        extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
-        extra['use_2to3_fixers'] = ['your.fixers']
-
-    setup(
-        name='your.module',
-        version = '1.0',
-        description='This is your awesome module',
-        author='You',
-        author_email='your@email',
-        package_dir = {'': 'src'},
-        packages = ['your', 'you.module'],
-        test_suite = 'your.module.tests',
-        **extra
-    )
-
-This way the parameters will only be used under Python 3, where you have to
-use Distribute.
diff --git a/docs/roadmap.txt b/docs/roadmap.txt
deleted file mode 100644
index ea5070eaaf..0000000000
--- a/docs/roadmap.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-=======
-Roadmap
-=======
-
-Distribute has two branches:
-
-- 0.6.x : provides a Setuptools-0.6cX compatible version
-- 0.7.x : will provide a refactoring
-
-0.6.x
-=====
-
-Not "much" is going to happen here, we want this branch to be helpful
-to the community *today* by addressing the 40-or-so bugs
-that were found in Setuptools and never fixed. This is eventually
-happen soon because its development is
-fast : there are up to 5 commiters that are working on it very often
-(and the number grows weekly.)
-
-The biggest issue with this branch is that it is providing the same
-packages and modules setuptools does, and this
-requires some bootstrapping work where we make sure once Distribute is
-installed, all Distribution that requires Setuptools
-will continue to work. This is done by faking the metadata of
-Setuptools 0.6c9. That's the only way we found to do this.
-
-There's one major thing though: thanks to the work of Lennart, Alex,
-Martin, this branch supports Python 3,
-which is great to have to speed up Py3 adoption.
-
-The goal of the 0.6.x is to remove as much bugs as we can, and try if
-possible to remove the patches done
-on Distutils. We will support 0.6.x maintenance for years and we will
-promote its usage everywhere instead of
-Setuptools.
-
-Some new commands are added there, when they are helpful and don't
-interact with the rest. I am thinking
-about "upload_docs" that let you upload documentation to PyPI. The
-goal is to move it to Distutils
-at some point, if the documentation feature of PyPI stays and starts to be used.
-
-0.7.x
-=====
-
-We've started to refactor Distribute with this roadmap in mind (and
-no, as someone said, it's not vaporware,
-we've done a lot already)
-
-- 0.7.x can be installed and used with 0.6.x
-
-- easy_install is going to be deprecated ! use Pip !
-
-- the version system will be deprecated, in favor of the one in Distutils
-
-- no more Distutils monkey-patch that happens once you use the code
-  (things like 'from distutils import cmd; cmd.Command = CustomCommand')
-
-- no more custom site.py (that is: if something misses in Python's
-  site.py we'll add it there instead of patching it)
-
-- no more namespaced packages system, if PEP 382 (namespaces package
-  support) makes it to 2.7
-
-- The code is splitted in many packages and might be distributed under
-  several distributions.
-
- - distribute.resources: that's the old pkg_resources, but
-   reorganized in clean, pep-8 modules. This package will
-   only contain the query APIs and will focus on being PEP 376
-   compatible. We will promote its usage and see if Pip wants
-   to use it as a basis.
-   It will probably shrink a lot though, once the stdlib provides PEP 376 support.
-
- - distribute.entrypoints: that's the old pkg_resources entry points
-   system, but on its own. it uses distribute.resources
-
- - distribute.index: that's package_index and a few other things.
-   everything required to interact with PyPI. We will promote
-   its usage and see if Pip wants to use it as a basis.
-
- - distribute.core (might be renamed to main): that's everything
-   else, and uses the other packages.
-
-Goal: A first release before (or when) Python 2.7 / 3.2 is out.
-
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
deleted file mode 100644
index fe8bb3f615..0000000000
--- a/docs/setuptools.txt
+++ /dev/null
@@ -1,3230 +0,0 @@
-==================================================
-Building and Distributing Packages with Distribute
-==================================================
-
-``Distribute`` is a collection of enhancements to the Python ``distutils``
-(for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum
-of Python 2.4) that allow you to more easily build and distribute Python
-packages, especially ones that have dependencies on other packages.
-
-Packages built and distributed using ``setuptools`` look to the user like
-ordinary Python packages based on the ``distutils``.  Your users don't need to
-install or even know about setuptools in order to use them, and you don't
-have to include the entire setuptools package in your distributions.  By
-including just a single `bootstrap module`_ (an 8K .py file), your package will
-automatically download and install ``setuptools`` if the user is building your
-package from source and doesn't have a suitable version already installed.
-
-.. _bootstrap module: http://nightly.ziade.org/distribute_setup.py
-
-Feature Highlights:
-
-* Automatically find/download/install/upgrade dependencies at build time using
-  the `EasyInstall tool <http://peak.telecommunity.com/DevCenter/EasyInstall>`_,
-  which supports downloading via HTTP, FTP, Subversion, and SourceForge, and
-  automatically scans web pages linked from PyPI to find download links.  (It's
-  the closest thing to CPAN currently available for Python.)
-
-* Create `Python Eggs <http://peak.telecommunity.com/DevCenter/PythonEggs>`_ -
-  a single-file importable distribution format
-
-* Include data files inside your package directories, where your code can
-  actually use them.  (Python 2.4 distutils also supports this feature, but
-  setuptools provides the feature for Python 2.3 packages also, and supports
-  accessing data files in zipped packages too.)
-
-* Automatically include all packages in your source tree, without listing them
-  individually in setup.py
-
-* Automatically include all relevant files in your source distributions,
-  without needing to create a ``MANIFEST.in`` file, and without having to force
-  regeneration of the ``MANIFEST`` file when your source tree changes.
-
-* Automatically generate wrapper scripts or Windows (console and GUI) .exe
-  files for any number of "main" functions in your project.  (Note: this is not
-  a py2exe replacement; the .exe files rely on the local Python installation.)
-
-* Transparent Pyrex support, so that your setup.py can list ``.pyx`` files and
-  still work even when the end-user doesn't have Pyrex installed (as long as
-  you include the Pyrex-generated C in your source distribution)
-
-* Command aliases - create project-specific, per-user, or site-wide shortcut
-  names for commonly used commands and options
-
-* PyPI upload support - upload your source distributions and eggs to PyPI
-
-* Deploy your project in "development mode", such that it's available on
-  ``sys.path``, yet can still be edited directly from its source checkout.
-
-* Easily extend the distutils with new commands or ``setup()`` arguments, and
-  distribute/reuse your extensions for multiple projects, without copying code.
-
-* Create extensible applications and frameworks that automatically discover
-  extensions, using simple "entry points" declared in a project's setup script.
-
-In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `Python SVN sandbox`_, and in-development versions of the
-`0.6 branch`_ are available as well.
-
-.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-
-.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
-
-.. contents:: **Table of Contents**
-
-.. _distribute_setup.py: `bootstrap module`_
-
-
------------------
-Developer's Guide
------------------
-
-
-Installing ``setuptools``
-=========================
-
-Please follow the `EasyInstall Installation Instructions`_ to install the
-current stable version of setuptools.  In particular, be sure to read the
-section on `Custom Installation Locations`_ if you are installing anywhere
-other than Python's ``site-packages`` directory.
-
-.. _EasyInstall Installation Instructions: http://peak.telecommunity.com/DevCenter/EasyInstall#installation-instructions
-
-.. _Custom Installation Locations: http://peak.telecommunity.com/DevCenter/EasyInstall#custom-installation-locations
-
-If you want the current in-development version of setuptools, you should first
-install a stable version, and then run::
-
-    distribute_setup.py setuptools==dev
-
-This will download and install the latest development (i.e. unstable) version
-of setuptools from the Python Subversion sandbox.
-
-
-Basic Use
-=========
-
-For basic use of setuptools, just import things from setuptools instead of
-the distutils.  Here's a minimal setup script using setuptools::
-
-    from setuptools import setup, find_packages
-    setup(
-        name = "HelloWorld",
-        version = "0.1",
-        packages = find_packages(),
-    )
-
-As you can see, it doesn't take much to use setuptools in a project.
-Just by doing the above, this project will be able to produce eggs, upload to
-PyPI, and automatically include all packages in the directory where the
-setup.py lives.  See the `Command Reference`_ section below to see what
-commands you can give to this setup script.
-
-Of course, before you release your project to PyPI, you'll want to add a bit
-more information to your setup script to help people find or learn about your
-project.  And maybe your project will have grown by then to include a few
-dependencies, and perhaps some data files and scripts::
-
-    from setuptools import setup, find_packages
-    setup(
-        name = "HelloWorld",
-        version = "0.1",
-        packages = find_packages(),
-        scripts = ['say_hello.py'],
-
-        # Project uses reStructuredText, so ensure that the docutils get
-        # installed or upgraded on the target machine
-        install_requires = ['docutils>=0.3'],
-
-        package_data = {
-            # If any package contains *.txt or *.rst files, include them:
-            '': ['*.txt', '*.rst'],
-            # And include any *.msg files found in the 'hello' package, too:
-            'hello': ['*.msg'],
-        },
-
-        # metadata for upload to PyPI
-        author = "Me",
-        author_email = "me@example.com",
-        description = "This is an Example Package",
-        license = "PSF",
-        keywords = "hello world example examples",
-        url = "http://example.com/HelloWorld/",   # project home page, if any
-
-        # could also include long_description, download_url, classifiers, etc.
-    )
-
-In the sections that follow, we'll explain what most of these ``setup()``
-arguments do (except for the metadata ones), and the various ways you might use
-them in your own project(s).
-
-
-Specifying Your Project's Version
----------------------------------
-
-Setuptools can work well with most versioning schemes; there are, however, a
-few special things to watch out for, in order to ensure that setuptools and
-EasyInstall can always tell what version of your package is newer than another
-version.  Knowing these things will also help you correctly specify what
-versions of other projects your project depends on.
-
-A version consists of an alternating series of release numbers and pre-release
-or post-release tags.  A release number is a series of digits punctuated by
-dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
-numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
-same release number, denoting the first subrelease of release 2.  But  ``2.10``
-is the *tenth* subrelease of release 2, and so is a different and newer release
-from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
-ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
-
-Following a release number, you can have either a pre-release or post-release
-tag.  Pre-release tags make a version be considered *older* than the version
-they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
-which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
-a version be considered *newer* than the version they are appended to.  So,
-revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
-than ``2.4.1`` (which has a higher release number).
-
-A pre-release tag is a series of letters that are alphabetically before
-"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
-``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
-before the prerelease tag if it's immediately after a number, but it's okay to
-do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
-represent release candidate 1 of version ``2.4``, and are treated as identical
-by setuptools.
-
-In addition, there are three special prerelease tags that are treated as if
-they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
-``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
-``2.4c1``, and are treated as identical by setuptools.
-
-A post-release tag is either a series of letters that are alphabetically
-greater than or equal to "final", or a dash (``-``).  Post-release tags are
-generally used to separate patch numbers, port numbers, build numbers, revision
-numbers, or date stamps from the release number.  For example, the version
-``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
-version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
-post-release.
-
-Notice that after each pre or post-release tag, you are free to place another
-release number, followed again by more pre- or post-release tags.  For example,
-``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
-development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
-a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
-which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
-a post-release tag, so this version is *newer* than ``0.6a9.dev``.
-
-For the most part, setuptools' interpretation of version numbers is intuitive,
-but here are a few tips that will keep you out of trouble in the corner cases:
-
-* Don't stick adjoining pre-release tags together without a dot or number
-  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
-  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
-  ``1.9a.dev``, or separate the prerelease tags with a number, as in
-  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
-  identical versions from setuptools' point of view, so you can use whatever
-  scheme you prefer.
-
-* If you want to be certain that your chosen numbering scheme works the way
-  you think it will, you can use the ``pkg_resources.parse_version()`` function
-  to compare different version numbers::
-
-    >>> from pkg_resources import parse_version
-    >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
-    True
-    >>> parse_version('2.1-rc2') < parse_version('2.1')
-    True
-    >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
-    True
-
-Once you've decided on a version numbering scheme for your project, you can
-have setuptools automatically tag your in-development releases with various
-pre- or post-release tags.  See the following sections for more details:
-
-* `Tagging and "Daily Build" or "Snapshot" Releases`_
-* `Managing "Continuous Releases" Using Subversion`_
-* The `egg_info`_ command
-
-
-New and Changed ``setup()`` Keywords
-====================================
-
-The following keyword arguments to ``setup()`` are added or changed by
-``setuptools``.  All of them are optional; you do not have to supply them
-unless you need the associated ``setuptools`` feature.
-
-``include_package_data``
-    If set to ``True``, this tells ``setuptools`` to automatically include any
-    data files it finds inside your package directories, that are either under
-    CVS or Subversion control, or which are specified by your ``MANIFEST.in``
-    file.  For more information, see the section below on `Including Data
-    Files`_.
-
-``exclude_package_data``
-    A dictionary mapping package names to lists of glob patterns that should
-    be *excluded* from your package directories.  You can use this to trim back
-    any excess files included by ``include_package_data``.  For a complete
-    description and examples, see the section below on `Including Data Files`_.
-
-``package_data``
-    A dictionary mapping package names to lists of glob patterns.  For a
-    complete description and examples, see the section below on `Including
-    Data Files`_.  You do not need to use this option if you are using
-    ``include_package_data``, unless you need to add e.g. files that are
-    generated by your setup script and build process.  (And are therefore not
-    in source control or are files that you don't want to include in your
-    source distribution.)
-
-``zip_safe``
-    A boolean (True or False) flag specifying whether the project can be
-    safely installed and run from a zip file.  If this argument is not
-    supplied, the ``bdist_egg`` command will have to analyze all of your
-    project's contents for possible problems each time it buids an egg.
-
-``install_requires``
-    A string or list of strings specifying what other distributions need to
-    be installed when this one is.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``entry_points``
-    A dictionary mapping entry point group names to strings or lists of strings
-    defining the entry points.  Entry points are used to support dynamic
-    discovery of services or plugins provided by a project.  See `Dynamic
-    Discovery of Services and Plugins`_ for details and examples of the format
-    of this argument.  In addition, this keyword is used to support `Automatic
-    Script Creation`_.
-
-``extras_require``
-    A dictionary mapping names of "extras" (optional features of your project)
-    to strings or lists of strings specifying what other distributions must be
-    installed to support those features.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``setup_requires``
-    A string or list of strings specifying what other distributions need to
-    be present in order for the *setup script* to run.  ``setuptools`` will
-    attempt to obtain these (even going so far as to download them using
-    ``EasyInstall``) before processing the rest of the setup script or commands.
-    This argument is needed if you are using distutils extensions as part of
-    your build process; for example, extensions that process setup() arguments
-    and turn them into EGG-INFO metadata files.
-
-    (Note: projects listed in ``setup_requires`` will NOT be automatically
-    installed on the system where the setup script is being run.  They are
-    simply downloaded to the setup directory if they're not locally available
-    already.  If you want them to be installed, as well as being available
-    when the setup script is run, you should add them to ``install_requires``
-    **and** ``setup_requires``.)
-
-``dependency_links``
-    A list of strings naming URLs to be searched when satisfying dependencies.
-    These links will be used if needed to install packages specified by
-    ``setup_requires`` or ``tests_require``.  They will also be written into
-    the egg's metadata for use by tools like EasyInstall to use when installing
-    an ``.egg`` file.
-
-``namespace_packages``
-    A list of strings naming the project's "namespace packages".  A namespace
-    package is a package that may be split across multiple project
-    distributions.  For example, Zope 3's ``zope`` package is a namespace
-    package, because subpackages like ``zope.interface`` and ``zope.publisher``
-    may be distributed separately.  The egg runtime system can automatically
-    merge such subpackages into a single parent package at runtime, as long
-    as you declare them in each project that contains any subpackages of the
-    namespace package, and as long as the namespace package's ``__init__.py``
-    does not contain any code other than a namespace declaration.  See the
-    section below on `Namespace Packages`_ for more information.
-
-``test_suite``
-    A string naming a ``unittest.TestCase`` subclass (or a package or module
-    containing one or more of them, or a method of such a subclass), or naming
-    a function that can be called with no arguments and returns a
-    ``unittest.TestSuite``.  If the named suite is a module, and the module
-    has an ``additional_tests()`` function, it is called and the results are
-    added to the tests to be run.  If the named suite is a package, any
-    submodules and subpackages are recursively added to the overall test suite.
-
-    Specifying this argument enables use of the `test`_ command to run the
-    specified test suite, e.g. via ``setup.py test``.  See the section on the
-    `test`_ command below for more details.
-
-``tests_require``
-    If your project's tests need one or more additional packages besides those
-    needed to install it, you can use this option to specify them.  It should
-    be a string or list of strings specifying what other distributions need to
-    be present for the package's tests to run.  When you run the ``test``
-    command, ``setuptools`` will  attempt to obtain these (even going
-    so far as to download them using ``EasyInstall``).  Note that these
-    required projects will *not* be installed on the system where the tests
-    are run, but only downloaded to the project's setup directory if they're
-    not already installed locally.
-
-.. _test_loader:
-
-``test_loader``
-    If you would like to use a different way of finding tests to run than what
-    setuptools normally uses, you can specify a module name and class name in
-    this argument.  The named class must be instantiable with no arguments, and
-    its instances must support the ``loadTestsFromNames()`` method as defined
-    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
-    pass only one test "name" in the `names` argument: the value supplied for
-    the ``test_suite`` argument.  The loader you specify may interpret this
-    string in any way it likes, as there are no restrictions on what may be
-    contained in a ``test_suite`` string.
-
-    The module name and class name must be separated by a ``:``.  The default
-    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
-    you want to use the default ``unittest`` behavior, you can specify
-    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
-    will prevent automatic scanning of submodules and subpackages.
-
-    The module and class you specify here may be contained in another package,
-    as long as you use the ``tests_require`` option to ensure that the package
-    containing the loader class is available when the ``test`` command is run.
-
-``eager_resources``
-    A list of strings naming resources that should be extracted together, if
-    any of them is needed, or if any C extensions included in the project are
-    imported.  This argument is only useful if the project will be installed as
-    a zipfile, and there is a need to have all of the listed resources be
-    extracted to the filesystem *as a unit*.  Resources listed here
-    should be '/'-separated paths, relative to the source root, so to list a
-    resource ``foo.png`` in package ``bar.baz``, you would include the string
-    ``bar/baz/foo.png`` in this argument.
-
-    If you only need to obtain resources one at a time, or you don't have any C
-    extensions that access other files in the project (such as data files or
-    shared libraries), you probably do NOT need this argument and shouldn't
-    mess with it.  For more details on how this argument works, see the section
-    below on `Automatic Resource Extraction`_.
-
-``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`python3` for more details.
-
-``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3.
-    See :doc:`python3` for more details.
-
-``use_2to3_fixers``
-    A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`python3` for more details.
-
-
-Using ``find_packages()``
--------------------------
-
-For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
-package list updated.  That's what ``setuptools.find_packages()`` is for.
-
-``find_packages()`` takes a source directory, and a list of package names or
-patterns to exclude.  If omitted, the source directory defaults to the same
-directory as the setup script.  Some projects use a ``src`` or ``lib``
-directory as the root of their source tree, and those projects would of course
-use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir = {'':'src'}`` in their
-``setup()`` arguments, but that's just a normal distutils thing.)
-
-Anyway, ``find_packages()`` walks the target directory, and finds Python
-packages by looking for ``__init__.py`` files.  It then filters the list of
-packages using the exclusion patterns.
-
-Exclusion patterns are package names, optionally including wildcards.  For
-example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
-last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
-"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
-but it still won't exclude a top-level ``tests`` package or the children
-thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
-something like this::
-
-    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
-
-in order to cover all the bases.  Really, the exclusion patterns are intended
-to cover simpler use cases than this, like excluding a single, specified
-package and its subpackages.
-
-Regardless of the target directory or exclusions, the ``find_packages()``
-function returns a list of package names suitable for use as the ``packages``
-argument to ``setup()``, and so is usually the easiest way to set that
-argument in your setup script.  Especially since it frees you from having to
-remember to modify your setup script whenever your project grows additional
-top-level packages or subpackages.
-
-
-Automatic Script Creation
-=========================
-
-Packaging and installing scripts can be a bit awkward with the distutils.  For
-one thing, there's no easy way to have a script's filename match local
-conventions on both Windows and POSIX platforms.  For another, you often have
-to create a separate file just for the "main" script, when your actual "main"
-is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
-option only works for actual ``.py`` files that aren't installed in a package.
-
-``setuptools`` fixes all of these problems by automatically generating scripts
-for you with the correct extension, and on Windows it will even create an
-``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
-The way to use this feature is to define "entry points" in your setup script
-that indicate what function the generated script should import and run.  For
-example, to create two console scripts called ``foo`` and ``bar``, and a GUI
-script called ``baz``, you might do something like this::
-
-    setup(
-        # other arguments here...
-        entry_points = {
-            'console_scripts': [
-                'foo = my_package.some_module:main_func',
-                'bar = other_module:some_func',
-            ],
-            'gui_scripts': [
-                'baz = my_package_gui.start_func',
-            ]
-        }
-    )
-
-When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or by using EasyInstall), a set of ``foo``,
-``bar``, and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules.  The functions you specify are called
-with no arguments, and their return value is passed to ``sys.exit()``, so you
-can return an errorlevel or message to print to stderr.
-
-On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
-created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
-``.exe`` wrappers find and execute the right version of Python to run the
-``.py`` or ``.pyw`` file.
-
-You may define as many "console script" and "gui script" entry points as you
-like, and each one can optionally specify "extras" that it depends on, that
-will be added to ``sys.path`` when the script is run.  For more information on
-"extras", see the section below on `Declaring Extras`_.  For more information
-on "entry points" in general, see the section below on `Dynamic Discovery of
-Services and Plugins`_.
-
-
-"Eggsecutable" Scripts
-----------------------
-
-Occasionally, there are situations where it's desirable to make an ``.egg``
-file directly executable.  You can do this by including an entry point such
-as the following::
-
-    setup(
-        # other arguments here...
-        entry_points = {
-            'setuptools.installation': [
-                'eggsecutable = my_package.some_module:main_func',
-            ]
-        }
-    )
-
-Any eggs built from the above setup script will include a short excecutable
-prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
-The prelude can be run on Unix-like platforms (including Mac and Linux) by
-invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
-``.egg`` file.  For the executable prelude to run, the appropriate version of
-Python must be available via the ``PATH`` environment variable, under its
-"long" name.  That is, if the egg is built for Python 2.3, there must be a
-``python2.3`` executable present in a directory on ``PATH``.
-
-This feature is primarily intended to support distribute_setup the installation of
-setuptools itself on non-Windows platforms, but may also be useful for other
-projects as well.
-
-IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
-invoked via symlinks.  They *must* be invoked using their original filename, in
-order to ensure that, once running, ``pkg_resources`` will know what project
-and version is in use.  The header script will check this and exit with an
-error if the ``.egg`` file has been renamed or is invoked via a symlink that
-changes its base name.
-
-
-Declaring Dependencies
-======================
-
-``setuptools`` supports automatically installing dependencies when a package is
-installed, and including information about dependencies in Python Eggs (so that
-package management tools like EasyInstall can use the information).
-
-``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
-project's required dependencies.  This syntax consists of a project's PyPI
-name, optionally followed by a comma-separated list of "extras" in square
-brackets, optionally followed by a comma-separated list of version
-specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
-``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
-separated by whitespace, but any whitespace or nonstandard characters within a
-project name or version identifier must be replaced with ``-``.
-
-Version specifiers for a given project are internally sorted into ascending
-version order, and used to establish what ranges of versions are acceptable.
-Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
-``">1"``, and ``"<2,<3"`` becomes ``"<3"``). ``"!="`` versions are excised from
-the ranges they fall within.  A project's version is then checked for
-membership in the resulting ranges. (Note that providing conflicting conditions
-for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
-therefore produce bizarre results.)
-
-Here are some example requirement specifiers::
-
-    docutils >= 0.3
-
-    # comment lines and \ continuations are allowed in requirement strings
-    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
-        ==1.6, ==1.7  # and so are line-end comments
-
-    PEAK[FastCGI, reST]>=0.5a4
-
-    setuptools==0.5a7
-
-The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers.  If you include more than one
-requirement in a string, each requirement must begin on a new line.
-
-This has three effects:
-
-1. When your project is installed, either by using EasyInstall, ``setup.py
-   install``, or ``setup.py develop``, all of the dependencies not already
-   installed will be located (via PyPI), downloaded, built (if necessary),
-   and installed.
-
-2. Any scripts in your project will be installed with wrappers that verify
-   the availability of the specified dependencies at runtime, and ensure that
-   the correct versions are added to ``sys.path`` (e.g. if multiple versions
-   have been installed).
-
-3. Python Egg distributions will include a metadata file listing the
-   dependencies.
-
-Note, by the way, that if you declare your dependencies in ``setup.py``, you do
-*not* need to use the ``require()`` function in your scripts or modules, as
-long as you either install the project or use ``setup.py develop`` to do
-development work on it.  (See `"Development Mode"`_ below for more details on
-using ``setup.py develop``.)
-
-
-Dependencies that aren't in PyPI
---------------------------------
-
-If your project depends on packages that aren't registered in PyPI, you may
-still be able to depend on them, as long as they are available for download
-as:
-
-- an egg, in the standard distutils ``sdist`` format,
-- a single ``.py`` file, or
-- a VCS repository (Subversion, Mercurial, or Git).
-
-You just need to add some URLs to the ``dependency_links`` argument to
-``setup()``.
-
-The URLs must be either:
-
-1. direct download URLs,
-2. the URLs of web pages that contain direct download links, or
-3. the repository's URL
-
-In general, it's better to link to web pages, because it is usually less
-complex to update a web page than to release a new version of your project.
-You can also use a SourceForge ``showfiles.php`` link in the case where a
-package you depend on is distributed via SourceForge.
-
-If you depend on a package that's distributed as a single ``.py`` file, you
-must include an ``"#egg=project-version"`` suffix to the URL, to give a project
-name and version number.  (Be sure to escape any dashes in the name or version
-by replacing them with underscores.)  EasyInstall will recognize this suffix
-and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
-as an egg.
-
-In the case of a VCS checkout, you should also append ``#egg=project-version``
-in order to identify for what package that checkout should be used. You can
-append ``@REV`` to the URL's path (before the fragment) to specify a revision.
-Additionally, you can also force the VCS being used by prepending the URL with
-a certain prefix. Currently available are:
-
--  ``svn+URL`` for Subversion,
--  ``git+URL`` for Git, and
--  ``hg+URL`` for Mercurial
-
-A more complete example would be:
-
-    ``vcs+proto://host/path@revision#egg=project-version``
-
-Be careful with the version. It should match the one inside the project files.
-If you want do disregard the version, you have to omit it both in the
-``requires`` and in the URL's fragment.
-
-This will do a checkout (or a clone, in Git and Mercurial parlance) to a
-temporary folder and run ``setup.py bdist_egg``.
-
-The ``dependency_links`` option takes the form of a list of URL strings.  For
-example, the below will cause EasyInstall to search the specified page for
-eggs or source distributions, if the package's dependencies aren't already
-installed::
-
-    setup(
-        ...
-        dependency_links = [
-            "http://peak.telecommunity.com/snapshots/"
-        ],
-    )
-
-
-.. _Declaring Extras:
-
-
-Declaring "Extras" (optional features with their own dependencies)
-------------------------------------------------------------------
-
-Sometimes a project has "recommended" dependencies, that are not required for
-all uses of the project.  For example, a project might offer optional PDF
-output if ReportLab is installed, and reStructuredText support if docutils is
-installed.  These optional features are called "extras", and setuptools allows
-you to define their requirements as well.  In this way, other projects that
-require these optional features can force the additional requirements to be
-installed, by naming the desired extras in their ``install_requires``.
-
-For example, let's say that Project A offers optional PDF and reST support::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require = {
-            'PDF':  ["ReportLab>=1.2", "RXP"],
-            'reST': ["docutils>=0.3"],
-        }
-    )
-
-As you can see, the ``extras_require`` argument takes a dictionary mapping
-names of "extra" features, to strings or lists of strings describing those
-features' requirements.  These requirements will *not* be automatically
-installed unless another package depends on them (directly or indirectly) by
-including the desired "extras" in square brackets after the associated project
-name.  (Or if the extras were listed in a requirement spec on the EasyInstall
-command line.)
-
-Extras can be used by a project's `entry points`_ to specify dynamic
-dependencies.  For example, if Project A includes a "rst2pdf" script, it might
-declare it like this, so that the "PDF" requirements are only resolved if the
-"rst2pdf" script is run::
-
-    setup(
-        name="Project-A",
-        ...
-        entry_points = {
-            'console_scripts':
-                ['rst2pdf = project_a.tools.pdfgen [PDF]'],
-                ['rst2html = project_a.tools.htmlgen'],
-                # more script entry points ...
-        }
-    )
-
-Projects can also use another project's extras when specifying dependencies.
-For example, if project B needs "project A" with PDF support installed, it
-might declare the dependency like this::
-
-    setup(
-        name="Project-B",
-        install_requires = ["Project-A[PDF]"],
-        ...
-    )
-
-This will cause ReportLab to be installed along with project A, if project B is
-installed -- even if project A was already installed.  In this way, a project
-can encapsulate groups of optional "downstream dependencies" under a feature
-name, so that packages that depend on it don't have to know what the downstream
-dependencies are.  If a later version of Project A builds in PDF support and
-no longer needs ReportLab, or if it ends up needing other dependencies besides
-ReportLab in order to provide PDF support, Project B's setup information does
-not need to change, but the right packages will still be installed if needed.
-
-Note, by the way, that if a project ends up not needing any other packages to
-support a feature, it should keep an empty requirements list for that feature
-in its ``extras_require`` argument, so that packages depending on that feature
-don't break (due to an invalid feature name).  For example, if Project A above
-builds in PDF support and no longer needs ReportLab, it could change its
-setup to this::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require = {
-            'PDF':  [],
-            'reST': ["docutils>=0.3"],
-        }
-    )
-
-so that Package B doesn't have to remove the ``[PDF]`` from its requirement
-specifier.
-
-
-Including Data Files
-====================
-
-The distutils have traditionally allowed installation of "data files", which
-are placed in a platform-specific location.  However, the most common use case
-for data files distributed with a package is for use *by* the package, usually
-by including the data files in the package directory.
-
-Setuptools offers three ways to specify data files to be included in your
-packages.  First, you can simply use the ``include_package_data`` keyword,
-e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        include_package_data = True
-    )
-
-This tells setuptools to install any data files it finds in your packages.
-The data files must be under CVS or Subversion control, or else they must be
-specified via the distutils' ``MANIFEST.in`` file.  (They can also be tracked
-by another revision control system, using an appropriate plugin.  See the
-section below on `Adding Support for Other Revision Control Systems`_ for
-information on how to write such plugins.)
-
-If the data files are not under version control, or are not in a supported
-version control system, or if you want finer-grained control over what files
-are included (for example, if you have documentation files in your package
-directories and want to exclude them from installation), then you can also use
-the ``package_data`` keyword, e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        package_data = {
-            # If any package contains *.txt or *.rst files, include them:
-            '': ['*.txt', '*.rst'],
-            # And include any *.msg files found in the 'hello' package, too:
-            'hello': ['*.msg'],
-        }
-    )
-
-The ``package_data`` argument is a dictionary that maps from package names to
-lists of glob patterns.  The globs may include subdirectory names, if the data
-files are contained in a subdirectory of the package.  For example, if the
-package tree looks like this::
-
-    setup.py
-    src/
-        mypkg/
-            __init__.py
-            mypkg.txt
-            data/
-                somefile.dat
-                otherdata.dat
-
-The setuptools setup file might look like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages = find_packages('src'),  # include all packages under src
-        package_dir = {'':'src'},   # tell distutils packages are under src
-
-        package_data = {
-            # If any package contains *.txt files, include them:
-            '': ['*.txt'],
-            # And include any *.dat files found in the 'data' subdirectory
-            # of the 'mypkg' package, also:
-            'mypkg': ['data/*.dat'],
-        }
-    )
-
-Notice that if you list patterns in ``package_data`` under the empty string,
-these patterns are used to find files in every package, even ones that also
-have their own patterns listed.  Thus, in the above example, the ``mypkg.txt``
-file gets included even though it's not listed in the patterns for ``mypkg``.
-
-Also notice that if you use paths, you *must* use a forward slash (``/``) as
-the path separator, even if you are on Windows.  Setuptools automatically
-converts slashes to appropriate platform-specific separators at build time.
-
-(Note: although the ``package_data`` argument was previously only available in
-``setuptools``, it was also added to the Python ``distutils`` package as of
-Python 2.4; there is `some documentation for the feature`__ available on the
-python.org website.  If using the setuptools-specific ``include_package_data``
-argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are tracked by a supported version control
-system, or are listed in the MANIFEST.in file.)
-
-__ http://docs.python.org/dist/node11.html
-
-Sometimes, the ``include_package_data`` or ``package_data`` options alone
-aren't sufficient to precisely define what files you want included.  For
-example, you may want to include package README files in your revision control
-system and source distributions, but exclude them from being installed.  So,
-setuptools offers an ``exclude_package_data`` option as well, that allows you
-to do things like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages = find_packages('src'),  # include all packages under src
-        package_dir = {'':'src'},   # tell distutils packages are under src
-
-        include_package_data = True,    # include everything in source control
-
-        # ...but exclude README.txt from all packages
-        exclude_package_data = { '': ['README.txt'] },
-    )
-
-The ``exclude_package_data`` option is a dictionary mapping package names to
-lists of wildcard patterns, just like the ``package_data`` option.  And, just
-as with that option, a key of ``''`` will apply the given pattern(s) to all
-packages.  However, any files that match these patterns will be *excluded*
-from installation, even if they were listed in ``package_data`` or were
-included as a result of using ``include_package_data``.
-
-In summary, the three options allow you to:
-
-``include_package_data``
-    Accept all data files and directories matched by ``MANIFEST.in`` or found
-    in source control.
-
-``package_data``
-    Specify additional patterns to match files and directories that may or may
-    not be matched by ``MANIFEST.in`` or found in source control.
-
-``exclude_package_data``
-    Specify patterns for data files and directories that should *not* be
-    included when a package is installed, even if they would otherwise have
-    been included due to the use of the preceding options.
-
-NOTE: Due to the way the distutils build process works, a data file that you
-include in your project and then stop including may be "orphaned" in your
-project's build directories, requiring you to run ``setup.py clean --all`` to
-fully remove them.  This may also be important for your users and contributors
-if they track intermediate revisions of your project using Subversion; be sure
-to let them know when you make changes that remove files from inclusion so they
-can run ``setup.py clean --all``.
-
-
-Accessing Data Files at Runtime
--------------------------------
-
-Typically, existing programs manipulate a package's ``__file__`` attribute in
-order to find the location of data files.  However, this manipulation isn't
-compatible with PEP 302-based import hooks, including importing from zip files
-and Python Eggs.  It is strongly recommended that, if you are using data files,
-you should use the `Resource Management API`_ of ``pkg_resources`` to access
-them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
-you're using setuptools to distribute your package, there is no reason not to
-use its resource management API.  See also `Accessing Package Resources`_ for
-a quick example of converting code that uses ``__file__`` to use
-``pkg_resources`` instead.
-
-.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PythonEggs#resource-management
-.. _Accessing Package Resources: http://peak.telecommunity.com/DevCenter/PythonEggs#accessing-package-resources
-
-
-Non-Package Data Files
-----------------------
-
-The ``distutils`` normally install general "data files" to a platform-specific
-location (e.g. ``/usr/share``).  This feature intended to be used for things
-like documentation, example configuration files, and the like.  ``setuptools``
-does not install these data files in a separate location, however.  They are
-bundled inside the egg file or directory, alongside the Python modules and
-packages.  The data files can also be accessed using the `Resource Management
-API`_, by specifying a ``Requirement`` instead of a package name::
-
-    from pkg_resources import Requirement, resource_filename
-    filename = resource_filename(Requirement.parse("MyProject"),"sample.conf")
-
-The above code will obtain the filename of the "sample.conf" file in the data
-root of the "MyProject" distribution.
-
-Note, by the way, that this encapsulation of data files means that you can't
-actually install data files to some arbitrary location on a user's machine;
-this is a feature, not a bug.  You can always include a script in your
-distribution that extracts and copies your the documentation or data files to
-a user-specified location, at their discretion.  If you put related data files
-in a single directory, you can use ``resource_filename()`` with the directory
-name to get a filesystem directory that then can be copied with the ``shutil``
-module.  (Even if your package is installed as a zipfile, calling
-``resource_filename()`` on a directory will return an actual filesystem
-directory, whose contents will be that entire subtree of your distribution.)
-
-(Of course, if you're writing a new package, you can just as easily place your
-data files or directories inside one of your packages, rather than using the
-distutils' approach.  However, if you're updating an existing application, it
-may be simpler not to change the way it currently specifies these data files.)
-
-
-Automatic Resource Extraction
------------------------------
-
-If you are using tools that expect your resources to be "real" files, or your
-project includes non-extension native libraries or other files that your C
-extensions expect to be able to access, you may need to list those files in
-the ``eager_resources`` argument to ``setup()``, so that the files will be
-extracted together, whenever a C extension in the project is imported.
-
-This is especially important if your project includes shared libraries *other*
-than distutils-built C extensions, and those shared libraries use file
-extensions other than ``.dll``, ``.so``, or ``.dylib``, which are the
-extensions that setuptools 0.6a8 and higher automatically detects as shared
-libraries and adds to the ``native_libs.txt`` file for you.  Any shared
-libraries whose names do not end with one of those extensions should be listed
-as ``eager_resources``, because they need to be present in the filesystem when
-he C extensions that link to them are used.
-
-The ``pkg_resources`` runtime for compressed packages will automatically
-extract *all* C extensions and ``eager_resources`` at the same time, whenever
-*any* C extension or eager resource is requested via the ``resource_filename()``
-API.  (C extensions are imported using ``resource_filename()`` internally.)
-This ensures that C extensions will see all of the "real" files that they
-expect to see.
-
-Note also that you can list directory resource names in ``eager_resources`` as
-well, in which case the directory's contents (including subdirectories) will be
-extracted whenever any C extension or eager resource is requested.
-
-Please note that if you're not sure whether you need to use this argument, you
-don't!  It's really intended to support projects with lots of non-Python
-dependencies and as a last resort for crufty projects that can't otherwise
-handle being compressed.  If your package is pure Python, Python plus data
-files, or Python plus C, you really don't need this.  You've got to be using
-either C or an external program that needs "real" files in your project before
-there's any possibility of ``eager_resources`` being relevant to your project.
-
-
-Extensible Applications and Frameworks
-======================================
-
-
-.. _Entry Points:
-
-Dynamic Discovery of Services and Plugins
------------------------------------------
-
-``setuptools`` supports creating libraries that "plug in" to extensible
-applications and frameworks, by letting you register "entry points" in your
-project that can be imported by the application or framework.
-
-For example, suppose that a blogging tool wants to support plugins
-that provide translation for various file types to the blog's output format.
-The framework might define an "entry point group" called ``blogtool.parsers``,
-and then allow plugins to register entry points for the file extensions they
-support.
-
-This would allow people to create distributions that contain one or more
-parsers for different file types, and then the blogging tool would be able to
-find the parsers at runtime by looking up an entry point for the file
-extension (or mime type, or however it wants to).
-
-Note that if the blogging tool includes parsers for certain file formats, it
-can register these as entry points in its own setup script, which means it
-doesn't have to special-case its built-in formats.  They can just be treated
-the same as any other plugin's entry points would be.
-
-If you're creating a project that plugs in to an existing application or
-framework, you'll need to know what entry points or entry point groups are
-defined by that application or framework.  Then, you can register entry points
-in your setup script.  Here are a few examples of ways you might register an
-``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
-for our hypothetical blogging tool::
-
-    setup(
-        # ...
-        entry_points = {'blogtool.parsers': '.rst = some_module:SomeClass'}
-    )
-
-    setup(
-        # ...
-        entry_points = {'blogtool.parsers': ['.rst = some_module:a_func']}
-    )
-
-    setup(
-        # ...
-        entry_points = """
-            [blogtool.parsers]
-            .rst = some.nested.module:SomeClass.some_classmethod [reST]
-        """,
-        extras_require = dict(reST = "Docutils>=0.3.5")
-    )
-
-The ``entry_points`` argument to ``setup()`` accepts either a string with
-``.ini``-style sections, or a dictionary mapping entry point group names to
-either strings or lists of strings containing entry point specifiers.  An
-entry point specifier consists of a name and value, separated by an ``=``
-sign.  The value consists of a dotted module name, optionally followed by a
-``:`` and a dotted identifier naming an object within the module.  It can
-also include a bracketed list of "extras" that are required for the entry
-point to be used.  When the invoking application or framework requests loading
-of an entry point, any requirements implied by the associated extras will be
-passed to ``pkg_resources.require()``, so that an appropriate error message
-can be displayed if the needed package(s) are missing.  (Of course, the
-invoking app or framework can ignore such errors if it wants to make an entry
-point optional if a requirement isn't installed.)
-
-
-Defining Additional Metadata
-----------------------------
-
-Some extensible applications and frameworks may need to define their own kinds
-of metadata to include in eggs, which they can then access using the
-``pkg_resources`` metadata APIs.  Ordinarily, this is done by having plugin
-developers include additional files in their ``ProjectName.egg-info``
-directory.  However, since it can be tedious to create such files by hand, you
-may want to create a distutils extension that will create the necessary files
-from arguments to ``setup()``, in much the same way that ``setuptools`` does
-for many of the ``setup()`` arguments it adds.  See the section below on
-`Creating distutils Extensions`_ for more details, especially the subsection on
-`Adding new EGG-INFO Files`_.
-
-
-"Development Mode"
-==================
-
-Under normal circumstances, the ``distutils`` assume that you are going to
-build a distribution of your project, not use it in its "raw" or "unbuilt"
-form.  If you were to use the ``distutils`` that way, you would have to rebuild
-and reinstall your project every time you made a change to it during
-development.
-
-Another problem that sometimes comes up with the ``distutils`` is that you may
-need to do development on two related projects at the same time.  You may need
-to put both projects' packages in the same directory to run them, but need to
-keep them separate for revision control purposes.  How can you do this?
-
-Setuptools allows you to deploy your projects for use in a common directory or
-staging area, but without copying any files.  Thus, you can edit each project's
-code in its checkout directory, and only need to run build commands when you
-change a project's C extensions or similarly compiled files.  You can even
-deploy a project into another project's checkout directory, if that's your
-preferred way of working (as opposed to using a common independent staging area
-or the site-packages directory).
-
-To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install`` or the EasyInstall tool, except that it doesn't actually
-install anything.  Instead, it creates a special ``.egg-link`` file in the
-deployment directory, that links to your project's source code.  And, if your
-deployment directory is Python's ``site-packages`` directory, it will also
-update the ``easy-install.pth`` file to include your project's source code,
-thereby making it available on ``sys.path`` for all programs using that Python
-installation.
-
-If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
-will not link directly to your source code when run under Python 3, since
-that source code would be made for Python 2 and not work under Python 3.
-Instead the ``setup.py develop`` will build Python 3 code under the ``build``
-directory, and link there. This means that after doing code changes you will
-have to run ``setup.py build`` before these changes are picked up by your
-Python 3 installation.
-
-In addition, the ``develop`` command creates wrapper scripts in the target
-script directory that will run your in-development scripts after ensuring that
-all your ``install_requires`` packages are available on ``sys.path``.
-
-You can deploy the same project to multiple staging areas, e.g. if you have
-multiple projects on the same machine that are sharing the same project you're
-doing development work.
-
-When you're done with a given development task, you can remove the project
-source from a staging area using ``setup.py develop --uninstall``, specifying
-the desired staging area if it's not the default.
-
-There are several options to control the precise behavior of the ``develop``
-command; see the section on the `develop`_ command below for more details.
-
-Note that you can also apply setuptools commands to non-setuptools projects,
-using commands like this::
-
-   python -c "import setuptools; execfile('setup.py')" develop
-
-That is, you can simply list the normal setup commands and options following
-the quoted part.
-
-
-Distributing a ``setuptools``-based project
-===========================================
-
-Using ``setuptools``...  Without bundling it!
----------------------------------------------
-
-Your users might not have ``setuptools`` installed on their machines, or even
-if they do, it might not be the right version.  Fixing this is easy; just
-download `distribute_setup.py`_, and put it in the same directory as your ``setup.py``
-script.  (Be sure to add it to your revision control system, too.)  Then add
-these two lines to the very top of your setup script, before the script imports
-anything from setuptools:
-
-.. code-block:: python
-
-    import distribute_setup
-    distribute_setup.use_setuptools()
-
-That's it.  The ``distribute_setup`` module will automatically download a matching
-version of ``setuptools`` from PyPI, if it isn't present on the target system.
-Whenever you install an updated version of setuptools, you should also update
-your projects' ``distribute_setup.py`` files, so that a matching version gets installed
-on the target machine(s).
-
-By the way, setuptools supports the new PyPI "upload" command, so you can use
-``setup.py sdist upload`` or ``setup.py bdist_egg upload`` to upload your
-source or egg distributions respectively.  Your project's current version must
-be registered with PyPI first, of course; you can use ``setup.py register`` to
-do that.  Or you can do it all in one step, e.g. ``setup.py register sdist
-bdist_egg upload`` will register the package, build source and egg
-distributions, and then upload them both to PyPI, where they'll be easily
-found by other projects that depend on them.
-
-(By the way, if you need to distribute a specific version of ``setuptools``,
-you can specify the exact version and base download URL as parameters to the
-``use_setuptools()`` function.  See the function's docstring for details.)
-
-
-What Your Users Should Know
----------------------------
-
-In general, a setuptools-based project looks just like any distutils-based
-project -- as long as your users have an internet connection and are installing
-to ``site-packages``, that is.  But for some users, these conditions don't
-apply, and they may become frustrated if this is their first encounter with
-a setuptools-based project.  To keep these users happy, you should review the
-following topics in your project's installation instructions, if they are
-relevant to your project and your target audience isn't already familiar with
-setuptools and ``easy_install``.
-
-Network Access
-    If your project is using ``distribute_setup``, you should inform users of the
-    need to either have network access, or to preinstall the correct version of
-    setuptools using the `EasyInstall installation instructions`_.  Those
-    instructions also have tips for dealing with firewalls as well as how to
-    manually download and install setuptools.
-
-Custom Installation Locations
-    You should inform your users that if they are installing your project to
-    somewhere other than the main ``site-packages`` directory, they should
-    first install setuptools using the instructions for `Custom Installation
-    Locations`_, before installing your project.
-
-Your Project's Dependencies
-    If your project depends on other projects that may need to be downloaded
-    from PyPI or elsewhere, you should list them in your installation
-    instructions, or tell users how to find out what they are.  While most
-    users will not need this information, any users who don't have unrestricted
-    internet access may have to find, download, and install the other projects
-    manually.  (Note, however, that they must still install those projects
-    using ``easy_install``, or your project will not know they are installed,
-    and your setup script will try to download them again.)
-
-    If you want to be especially friendly to users with limited network access,
-    you may wish to build eggs for your project and its dependencies, making
-    them all available for download from your site, or at least create a page
-    with links to all of the needed eggs.  In this way, users with limited
-    network access can manually download all the eggs to a single directory,
-    then use the ``-f`` option of ``easy_install`` to specify the directory
-    to find eggs in.  Users who have full network access can just use ``-f``
-    with the URL of your download page, and ``easy_install`` will find all the
-    needed eggs using your links directly.  This is also useful when your
-    target audience isn't able to compile packages (e.g. most Windows users)
-    and your package or some of its dependencies include C code.
-
-Subversion or CVS Users and Co-Developers
-    Users and co-developers who are tracking your in-development code using
-    CVS, Subversion, or some other revision control system should probably read
-    this manual's sections regarding such development.  Alternately, you may
-    wish to create a quick-reference guide containing the tips from this manual
-    that apply to your particular situation.  For example, if you recommend
-    that people use ``setup.py develop`` when tracking your in-development
-    code, you should let them know that this needs to be run after every update
-    or commit.
-
-    Similarly, if you remove modules or data files from your project, you
-    should remind them to run ``setup.py clean --all`` and delete any obsolete
-    ``.pyc`` or ``.pyo``.  (This tip applies to the distutils in general, not
-    just setuptools, but not everybody knows about them; be kind to your users
-    by spelling out your project's best practices rather than leaving them
-    guessing.)
-
-Creating System Packages
-    Some users want to manage all Python packages using a single package
-    manager, and sometimes that package manager isn't ``easy_install``!
-    Setuptools currently supports ``bdist_rpm``, ``bdist_wininst``, and
-    ``bdist_dumb`` formats for system packaging.  If a user has a locally-
-    installed "bdist" packaging tool that internally uses the distutils
-    ``install`` command, it should be able to work with ``setuptools``.  Some
-    examples of "bdist" formats that this should work with include the
-    ``bdist_nsi`` and ``bdist_msi`` formats for Windows.
-
-    However, packaging tools that build binary distributions by running
-    ``setup.py install`` on the command line or as a subprocess will require
-    modification to work with setuptools.  They should use the
-    ``--single-version-externally-managed`` option to the ``install`` command,
-    combined with the standard ``--root`` or ``--record`` options.
-    See the `install command`_ documentation below for more details.  The
-    ``bdist_deb`` command is an example of a command that currently requires
-    this kind of patching to work with setuptools.
-
-    If you or your users have a problem building a usable system package for
-    your project, please report the problem via the mailing list so that
-    either the "bdist" tool in question or setuptools can be modified to
-    resolve the issue.
-
-
-
-Managing Multiple Projects
---------------------------
-
-If you're managing several projects that need to use ``distribute_setup``, and you
-are using Subversion as your revision control system, you can use the
-"svn:externals" property to share a single copy of ``distribute_setup`` between
-projects, so that it will always be up-to-date whenever you check out or update
-an individual project, without having to manually update each project to use
-a new version.
-
-However, because Subversion only supports using directories as externals, you
-have to turn ``distribute_setup.py`` into ``distribute_setup/__init__.py`` in order
-to do this, then create "externals" definitions that map the ``distribute_setup``
-directory into each project.  Also, if any of your projects use
-``find_packages()`` on their setup directory, you will need to exclude the
-resulting ``distribute_setup`` package, to keep it from being included in your
-distributions, e.g.::
-
-    setup(
-        ...
-        packages = find_packages(exclude=['distribute_setup']),
-    )
-
-Of course, the ``distribute_setup`` package will still be included in your
-packages' source distributions, as it needs to be.
-
-For your convenience, you may use the following external definition, which will
-track the latest version of setuptools::
-
-    ez_setup svn://svn.eby-sarna.com/svnroot/ez_setup
-
-You can set this by executing this command in your project directory::
-
-    svn propedit svn:externals .
-
-And then adding the line shown above to the file that comes up for editing.
-
-
-Setting the ``zip_safe`` flag
------------------------------
-
-For maximum performance, Python packages are best installed as zip files.
-Not all packages, however, are capable of running in compressed form, because
-they may expect to be able to access either source code or data files as
-normal operating system files.  So, ``setuptools`` can install your project
-as a zipfile or a directory, and its default choice is determined by the
-project's ``zip_safe`` flag.
-
-You can pass a True or False value for the ``zip_safe`` argument to the
-``setup()`` function, or you can omit it.  If you omit it, the ``bdist_egg``
-command will analyze your project's contents to see if it can detect any
-conditions that would prevent it from working in a zipfile.  It will output
-notices to the console about any such conditions that it finds.
-
-Currently, this analysis is extremely conservative: it will consider the
-project unsafe if it contains any C extensions or datafiles whatsoever.  This
-does *not* mean that the project can't or won't work as a zipfile!  It just
-means that the ``bdist_egg`` authors aren't yet comfortable asserting that
-the project *will* work.  If the project contains no C or data files, and does
-no ``__file__`` or ``__path__`` introspection or source code manipulation, then
-there is an extremely solid chance the project will work when installed as a
-zipfile.  (And if the project uses ``pkg_resources`` for all its data file
-access, then C extensions and other data files shouldn't be a problem at all.
-See the `Accessing Data Files at Runtime`_ section above for more information.)
-
-However, if ``bdist_egg`` can't be *sure* that your package will work, but
-you've checked over all the warnings it issued, and you are either satisfied it
-*will* work (or if you want to try it for yourself), then you should set
-``zip_safe`` to ``True`` in your ``setup()`` call.  If it turns out that it
-doesn't work, you can always change it to ``False``, which will force
-``setuptools`` to install your project as a directory rather than as a zipfile.
-
-Of course, the end-user can still override either decision, if they are using
-EasyInstall to install your package.  And, if you want to override for testing
-purposes, you can just run ``setup.py easy_install --zip-ok .`` or ``setup.py
-easy_install --always-unzip .`` in your project directory. to install the
-package as a zipfile or directory, respectively.
-
-In the future, as we gain more experience with different packages and become
-more satisfied with the robustness of the ``pkg_resources`` runtime, the
-"zip safety" analysis may become less conservative.  However, we strongly
-recommend that you determine for yourself whether your project functions
-correctly when installed as a zipfile, correct any problems if you can, and
-then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
-flag, so that it will not be necessary for ``bdist_egg`` or ``EasyInstall`` to
-try to guess whether your project can work as a zipfile.
-
-
-Namespace Packages
-------------------
-
-Sometimes, a large package is more useful if distributed as a collection of
-smaller eggs.  However, Python does not normally allow the contents of a
-package to be retrieved from more than one location.  "Namespace packages"
-are a solution for this problem.  When you declare a package to be a namespace
-package, it means that the package has no meaningful contents in its
-``__init__.py``, and that it is merely a container for modules and subpackages.
-
-The ``pkg_resources`` runtime will then automatically ensure that the contents
-of namespace packages that are spread over multiple eggs or directories are
-combined into a single "virtual" package.
-
-The ``namespace_packages`` argument to ``setup()`` lets you declare your
-project's namespace packages, so that they will be included in your project's
-metadata.  The argument should list the namespace packages that the egg
-participates in.  For example, the ZopeInterface project might do this::
-
-    setup(
-        # ...
-        namespace_packages = ['zope']
-    )
-
-because it contains a ``zope.interface`` package that lives in the ``zope``
-namespace package.  Similarly, a project for a standalone ``zope.publisher``
-would also declare the ``zope`` namespace package.  When these projects are
-installed and used, Python will see them both as part of a "virtual" ``zope``
-package, even though they will be installed in different locations.
-
-Namespace packages don't have to be top-level packages.  For example, Zope 3's
-``zope.app`` package is a namespace package, and in the future PEAK's
-``peak.util`` package will be too.
-
-Note, by the way, that your project's source tree must include the namespace
-packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
-packages), in a normal Python package layout.  These ``__init__.py`` files
-*must* contain the line::
-
-    __import__('pkg_resources').declare_namespace(__name__)
-
-This code ensures that the namespace package machinery is operating and that
-the current package is registered as a namespace package.
-
-You must NOT include any other code and data in a namespace package's
-``__init__.py``.  Even though it may appear to work during development, or when
-projects are installed as ``.egg`` files, it will not work when the projects
-are installed using "system" packaging tools -- in such cases the
-``__init__.py`` files will not be installed, let alone executed.
-
-You must include the ``declare_namespace()``  line in the ``__init__.py`` of
-*every* project that has contents for the namespace package in question, in
-order to ensure that the namespace will be declared regardless of which
-project's copy of ``__init__.py`` is loaded first.  If the first loaded
-``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!)
-
-
-TRANSITIONAL NOTE
-~~~~~~~~~~~~~~~~~
-
-Setuptools 0.6a automatically calls ``declare_namespace()`` for you at runtime,
-but the 0.7a versions will *not*.  This is because the automatic declaration
-feature has some negative side effects, such as needing to import all namespace
-packages during the initialization of the ``pkg_resources`` runtime, and also
-the need for ``pkg_resources`` to be explicitly imported before any namespace
-packages work at all.  Beginning with the 0.7a releases, you'll be responsible
-for including your own declaration lines, and the automatic declaration feature
-will be dropped to get rid of the negative side effects.
-
-During the remainder of the 0.6 development cycle, therefore, setuptools will
-warn you about missing ``declare_namespace()`` calls in your ``__init__.py``
-files, and you should correct these as soon as possible before setuptools 0.7a1
-is released.  Namespace packages without declaration lines will not work
-correctly once a user has upgraded to setuptools 0.7a1, so it's important that
-you make this change now in order to avoid having your code break in the field.
-Our apologies for the inconvenience, and thank you for your patience.
-
-
-
-Tagging and "Daily Build" or "Snapshot" Releases
-------------------------------------------------
-
-When a set of related projects are under development, it may be important to
-track finer-grained version increments than you would normally use for e.g.
-"stable" releases.  While stable releases might be measured in dotted numbers
-with alpha/beta/etc. status codes, development versions of a project often
-need to be tracked by revision or build number or even build date.  This is
-especially true when projects in development need to refer to one another, and
-therefore may literally need an up-to-the-minute version of something!
-
-To support these scenarios, ``setuptools`` allows you to "tag" your source and
-egg distributions by adding one or more of the following to the project's
-"official" version identifier:
-
-* A manually-specified pre-release tag, such as "build" or "dev", or a
-  manually-specified post-release tag, such as a build or revision number
-  (``--tag-build=STRING, -bSTRING``)
-
-* A "last-modified revision number" string generated automatically from
-  Subversion's metadata (assuming your project is being built from a Subversion
-  "working copy")  (``--tag-svn-revision, -r``)
-
-* An 8-character representation of the build date (``--tag-date, -d``), as
-  a postrelease tag
-
-You can add these tags by adding ``egg_info`` and the desired options to
-the command line ahead of the ``sdist`` or ``bdist`` commands that you want
-to generate a daily build or snapshot for.  See the section below on the
-`egg_info`_ command for more details.
-
-(Also, before you release your project, be sure to see the section above on
-`Specifying Your Project's Version`_ for more information about how pre- and
-post-release tags affect how setuptools and EasyInstall interpret version
-numbers.  This is important in order to make sure that dependency processing
-tools will know which versions of your project are newer than others.)
-
-Finally, if you are creating builds frequently, and either building them in a
-downloadable location or are copying them to a distribution server, you should
-probably also check out the `rotate`_ command, which lets you automatically
-delete all but the N most-recently-modified distributions matching a glob
-pattern.  So, you can use a command line like::
-
-    setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
-
-to build an egg whose version info includes 'DEV-rNNNN' (where NNNN is the
-most recent Subversion revision that affected the source tree), and then
-delete any egg files from the distribution directory except for the three
-that were built most recently.
-
-If you have to manage automated builds for multiple packages, each with
-different tagging and rotation policies, you may also want to check out the
-`alias`_ command, which would let each package define an alias like ``daily``
-that would perform the necessary tag, build, and rotate commands.  Then, a
-simpler script or cron job could just run ``setup.py daily`` in each project
-directory.  (And, you could also define sitewide or per-user default versions
-of the ``daily`` alias, so that projects that didn't define their own would
-use the appropriate defaults.)
-
-
-Generating Source Distributions
--------------------------------
-
-``setuptools`` enhances the distutils' default algorithm for source file
-selection, so that all files managed by CVS or Subversion in your project tree
-are included in any source distribution you build.  This is a big improvement
-over having to manually write a ``MANIFEST.in`` file and try to keep it in
-sync with your project.  So, if you are using CVS or Subversion, and your
-source distributions only need to include files that you're tracking in
-revision control, don't create a a ``MANIFEST.in`` file for your project.
-(And, if you already have one, you might consider deleting it the next time
-you would otherwise have to change it.)
-
-(NOTE: other revision control systems besides CVS and Subversion can be
-supported using plugins; see the section below on `Adding Support for Other
-Revision Control Systems`_ for information on how to write such plugins.)
-
-If you need to include automatically generated files, or files that are kept in
-an unsupported revision control system, you'll need to create a ``MANIFEST.in``
-file to specify any files that the default file location algorithm doesn't
-catch.  See the distutils documentation for more information on the format of
-the ``MANIFEST.in`` file.
-
-But, be sure to ignore any part of the distutils documentation that deals with
-``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
-from these issues and doesn't work the same way in any case.  Unlike the
-distutils, setuptools regenerates the source distribution manifest file
-every time you build a source distribution, and it builds it inside the
-project's ``.egg-info`` directory, out of the way of your main project
-directory.  You therefore need not worry about whether it is up-to-date or not.
-
-Indeed, because setuptools' approach to determining the contents of a source
-distribution is so much simpler, its ``sdist`` command omits nearly all of
-the options that the distutils' more complex ``sdist`` process requires.  For
-all practical purposes, you'll probably use only the ``--formats`` option, if
-you use any option at all.
-
-(By the way, if you're using some other revision control system, you might
-consider creating and publishing a `revision control plugin for setuptools`_.)
-
-
-.. _revision control plugin for setuptools: `Adding Support for Other Revision Control Systems`_
-
-
-Making your package available for EasyInstall
----------------------------------------------
-
-If you use the ``register`` command (``setup.py register``) to register your
-package with PyPI, that's most of the battle right there.  (See the
-`docs for the register command`_ for more details.)
-
-.. _docs for the register command: http://docs.python.org/dist/package-index.html
-
-If you also use the `upload`_ command to upload actual distributions of your
-package, that's even better, because EasyInstall will be able to find and
-download them directly from your project's PyPI page.
-
-However, there may be reasons why you don't want to upload distributions to
-PyPI, and just want your existing distributions (or perhaps a Subversion
-checkout) to be used instead.
-
-So here's what you need to do before running the ``register`` command.  There
-are three ``setup()`` arguments that affect EasyInstall:
-
-``url`` and ``download_url``
-   These become links on your project's PyPI page.  EasyInstall will examine
-   them to see if they link to a package ("primary links"), or whether they are
-   HTML pages.  If they're HTML pages, EasyInstall scans all HREF's on the
-   page for primary links
-
-``long_description``
-   EasyInstall will check any URLs contained in this argument to see if they
-   are primary links.
-
-A URL is considered a "primary link" if it is a link to a .tar.gz, .tgz, .zip,
-.egg, .egg.zip, .tar.bz2, or .exe file, or if it has an ``#egg=project`` or
-``#egg=project-version`` fragment identifier attached to it.  EasyInstall
-attempts to determine a project name and optional version number from the text
-of a primary link *without* downloading it.  When it has found all the primary
-links, EasyInstall will select the best match based on requested version,
-platform compatibility, and other criteria.
-
-So, if your ``url`` or ``download_url`` point either directly to a downloadable
-source distribution, or to HTML page(s) that have direct links to such, then
-EasyInstall will be able to locate downloads automatically.  If you want to
-make Subversion checkouts available, then you should create links with either
-``#egg=project`` or ``#egg=project-version`` added to the URL.  You should
-replace ``project`` and ``version`` with the values they would have in an egg
-filename.  (Be sure to actually generate an egg and then use the initial part
-of the filename, rather than trying to guess what the escaped form of the
-project name and version number will be.)
-
-Note that Subversion checkout links are of lower precedence than other kinds
-of distributions, so EasyInstall will not select a Subversion checkout for
-downloading unless it has a version included in the ``#egg=`` suffix, and
-it's a higher version than EasyInstall has seen in any other links for your
-project.
-
-As a result, it's a common practice to use mark checkout URLs with a version of
-"dev" (i.e., ``#egg=projectname-dev``), so that users can do something like
-this::
-
-    easy_install --editable projectname==dev
-
-in order to check out the in-development version of ``projectname``.
-
-
-Managing "Continuous Releases" Using Subversion
------------------------------------------------
-
-If you expect your users to track in-development versions of your project via
-Subversion, there are a few additional steps you should take to ensure that
-things work smoothly with EasyInstall.  First, you should add the following
-to your project's ``setup.cfg`` file:
-
-.. code-block:: ini
-
-    [egg_info]
-    tag_build = .dev
-    tag_svn_revision = 1
-
-This will tell ``setuptools`` to generate package version numbers like
-``1.0a1.dev-r1263``, which will be considered to be an *older* release than
-``1.0a1``.  Thus, when you actually release ``1.0a1``, the entire egg
-infrastructure (including ``setuptools``, ``pkg_resources`` and EasyInstall)
-will know that ``1.0a1`` supersedes any interim snapshots from Subversion, and
-handle upgrades accordingly.
-
-(Note: the project version number you specify in ``setup.py`` should always be
-the *next* version of your software, not the last released version.
-Alternately, you can leave out the ``tag_build=.dev``, and always use the
-*last* release as a version number, so that your post-1.0 builds are labelled
-``1.0-r1263``, indicating a post-1.0 patchlevel.  Most projects so far,
-however, seem to prefer to think of their project as being a future version
-still under development, rather than a past version being patched.  It is of
-course possible for a single project to have both situations, using
-post-release numbering on release branches, and pre-release numbering on the
-trunk.  But you don't have to make things this complex if you don't want to.)
-
-Commonly, projects releasing code from Subversion will include a PyPI link to
-their checkout URL (as described in the previous section) with an
-``#egg=projectname-dev`` suffix.  This allows users to request EasyInstall
-to download ``projectname==dev`` in order to get the latest in-development
-code.  Note that if your project depends on such in-progress code, you may wish
-to specify your ``install_requires`` (or other requirements) to include
-``==dev``, e.g.:
-
-.. code-block:: python
-
-    install_requires = ["OtherProject>=0.2a1.dev-r143,==dev"]
-
-The above example says, "I really want at least this particular development
-revision number, but feel free to follow and use an ``#egg=OtherProject-dev``
-link if you find one".  This avoids the need to have actual source or binary
-distribution snapshots of in-development code available, just to be able to
-depend on the latest and greatest a project has to offer.
-
-A final note for Subversion development: if you are using SVN revision tags
-as described in this section, it's a good idea to run ``setup.py develop``
-after each Subversion checkin or update, because your project's version number
-will be changing, and your script wrappers need to be updated accordingly.
-
-Also, if the project's requirements have changed, the ``develop`` command will
-take care of fetching the updated dependencies, building changed extensions,
-etc.  Be sure to also remind any of your users who check out your project
-from Subversion that they need to run ``setup.py develop`` after every update
-in order to keep their checkout completely in sync.
-
-
-Making "Official" (Non-Snapshot) Releases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When you make an official release, creating source or binary distributions,
-you will need to override the tag settings from ``setup.cfg``, so that you
-don't end up registering versions like ``foobar-0.7a1.dev-r34832``.  This is
-easy to do if you are developing on the trunk and using tags or branches for
-your releases - just make the change to ``setup.cfg`` after branching or
-tagging the release, so the trunk will still produce development snapshots.
-
-Alternately, if you are not branching for releases, you can override the
-default version options on the command line, using something like::
-
-    python setup.py egg_info -RDb "" sdist bdist_egg register upload
-
-The first part of this command (``egg_info -RDb ""``) will override the
-configured tag information, before creating source and binary eggs, registering
-the project with PyPI, and uploading the files.  Thus, these commands will use
-the plain version from your ``setup.py``, without adding the Subversion
-revision number or build designation string.
-
-Of course, if you will be doing this a lot, you may wish to create a personal
-alias for this operation, e.g.::
-
-    python setup.py alias -u release egg_info -RDb ""
-
-You can then use it like this::
-
-    python setup.py release sdist bdist_egg register upload
-
-Or of course you can create more elaborate aliases that do all of the above.
-See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
-
-
-
-Distributing Extensions compiled with Pyrex
--------------------------------------------
-
-``setuptools`` includes transparent support for building Pyrex extensions, as
-long as you define your extensions using ``setuptools.Extension``, *not*
-``distutils.Extension``.  You must also not import anything from Pyrex in
-your setup script.
-
-If you follow these rules, you can safely list ``.pyx`` files as the source
-of your ``Extension`` objects in the setup script.  ``setuptools`` will detect
-at build time whether Pyrex is installed or not.  If it is, then ``setuptools``
-will use it.  If not, then ``setuptools`` will silently change the
-``Extension`` objects to refer to the ``.c`` counterparts of the ``.pyx``
-files, so that the normal distutils C compilation process will occur.
-
-Of course, for this to work, your source distributions must include the C
-code generated by Pyrex, as well as your original ``.pyx`` files.  This means
-that you will probably want to include current ``.c`` files in your revision
-control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files.  This will ensure that people tracking your project in CVS or
-Subversion will be able to build it even if they don't have Pyrex installed,
-and that your source releases will be similarly usable with or without Pyrex.
-
-
------------------
-Command Reference
------------------
-
-.. _alias:
-
-``alias`` - Define shortcuts for commonly used commands
-=======================================================
-
-Sometimes, you need to use the same commands over and over, but you can't
-necessarily set them as defaults.  For example, if you produce both development
-snapshot releases and "stable" releases of a project, you may want to put
-the distributions in different places, or use different ``egg_info`` tagging
-options, etc.  In these cases, it doesn't make sense to set the options in
-a distutils configuration file, because the values of the options changed based
-on what you're trying to do.
-
-Setuptools therefore allows you to define "aliases" - shortcut names for
-an arbitrary string of commands and options, using ``setup.py alias aliasname
-expansion``, where aliasname is the name of the new alias, and the remainder of
-the command line supplies its expansion.  For example, this command defines
-a sitewide alias called "daily", that sets various ``egg_info`` tagging
-options::
-
-    setup.py alias --global-config daily egg_info --tag-svn-revision \
-        --tag-build=development
-
-Once the alias is defined, it can then be used with other setup commands,
-e.g.::
-
-    setup.py daily bdist_egg        # generate a daily-build .egg file
-    setup.py daily sdist            # generate a daily-build source distro
-    setup.py daily sdist bdist_egg  # generate both
-
-The above commands are interpreted as if the word ``daily`` were replaced with
-``egg_info --tag-svn-revision --tag-build=development``.
-
-Note that setuptools will expand each alias *at most once* in a given command
-line.  This serves two purposes.  First, if you accidentally create an alias
-loop, it will have no effect; you'll instead get an error message about an
-unknown command.  Second, it allows you to define an alias for a command, that
-uses that command.  For example, this (project-local) alias::
-
-    setup.py alias bdist_egg bdist_egg rotate -k1 -m.egg
-
-redefines the ``bdist_egg`` command so that it always runs the ``rotate``
-command afterwards to delete all but the newest egg file.  It doesn't loop
-indefinitely on ``bdist_egg`` because the alias is only expanded once when
-used.
-
-You can remove a defined alias with the ``--remove`` (or ``-r``) option, e.g.::
-
-    setup.py alias --global-config --remove daily
-
-would delete the "daily" alias we defined above.
-
-Aliases can be defined on a project-specific, per-user, or sitewide basis.  The
-default is to define or remove a project-specific alias, but you can use any of
-the `configuration file options`_ (listed under the `saveopts`_ command, below)
-to determine which distutils configuration file an aliases will be added to
-(or removed from).
-
-Note that if you omit the "expansion" argument to the ``alias`` command,
-you'll get output showing that alias' current definition (and what
-configuration file it's defined in).  If you omit the alias name as well,
-you'll get a listing of all current aliases along with their configuration
-file locations.
-
-
-``bdist_egg`` - Create a Python Egg for the project
-===================================================
-
-This command generates a Python Egg (``.egg`` file) for the project.  Python
-Eggs are the preferred binary distribution format for EasyInstall, because they
-are cross-platform (for "pure" packages), directly importable, and contain
-project metadata including scripts and information about the project's
-dependencies.  They can be simply downloaded and added to ``sys.path``
-directly, or they can be placed in a directory on ``sys.path`` and then
-automatically discovered by the egg runtime system.
-
-This command runs the `egg_info`_ command (if it hasn't already run) to update
-the project's metadata (``.egg-info``) directory.  If you have added any extra
-metadata files to the ``.egg-info`` directory, those files will be included in
-the new egg file's metadata directory, for use by the egg runtime system or by
-any applications or frameworks that use that metadata.
-
-You won't usually need to specify any special options for this command; just
-use ``bdist_egg`` and you're done.  But there are a few options that may
-be occasionally useful:
-
-``--dist-dir=DIR, -d DIR``
-    Set the directory where the ``.egg`` file will be placed.  If you don't
-    supply this, then the ``--dist-dir`` setting of the ``bdist`` command
-    will be used, which is usually a directory named ``dist`` in the project
-    directory.
-
-``--plat-name=PLATFORM, -p PLATFORM``
-    Set the platform name string that will be embedded in the egg's filename
-    (assuming the egg contains C extensions).  This can be used to override
-    the distutils default platform name with something more meaningful.  Keep
-    in mind, however, that the egg runtime system expects to see eggs with
-    distutils platform names, so it may ignore or reject eggs with non-standard
-    platform names.  Similarly, the EasyInstall program may ignore them when
-    searching web pages for download links.  However, if you are
-    cross-compiling or doing some other unusual things, you might find a use
-    for this option.
-
-``--exclude-source-files``
-    Don't include any modules' ``.py`` files in the egg, just compiled Python,
-    C, and data files.  (Note that this doesn't affect any ``.py`` files in the
-    EGG-INFO directory or its subdirectories, since for example there may be
-    scripts with a ``.py`` extension which must still be retained.)  We don't
-    recommend that you use this option except for packages that are being
-    bundled for proprietary end-user applications, or for "embedded" scenarios
-    where space is at an absolute premium.  On the other hand, if your package
-    is going to be installed and used in compressed form, you might as well
-    exclude the source because Python's ``traceback`` module doesn't currently
-    understand how to display zipped source code anyway, or how to deal with
-    files that are in a different place from where their code was compiled.
-
-There are also some options you will probably never need, but which are there
-because they were copied from similar ``bdist`` commands used as an example for
-creating this one.  They may be useful for testing and debugging, however,
-which is why we kept them:
-
-``--keep-temp, -k``
-    Keep the contents of the ``--bdist-dir`` tree around after creating the
-    ``.egg`` file.
-
-``--bdist-dir=DIR, -b DIR``
-    Set the temporary directory for creating the distribution.  The entire
-    contents of this directory are zipped to create the ``.egg`` file, after
-    running various installation commands to copy the package's modules, data,
-    and extensions here.
-
-``--skip-build``
-    Skip doing any "build" commands; just go straight to the
-    install-and-compress phases.
-
-
-.. _develop:
-
-``develop`` - Deploy the project source in "Development Mode"
-=============================================================
-
-This command allows you to deploy your project's source for use in one or more
-"staging areas" where it will be available for importing.  This deployment is
-done in such a way that changes to the project source are immediately available
-in the staging area(s), without needing to run a build or install step after
-each change.
-
-The ``develop`` command works by creating an ``.egg-link`` file (named for the
-project) in the given staging area.  If the staging area is Python's
-``site-packages`` directory, it also updates an ``easy-install.pth`` file so
-that the project is on ``sys.path`` by default for all programs run using that
-Python installation.
-
-The ``develop`` command also installs wrapper scripts in the staging area (or
-a separate directory, as specified) that will ensure the project's dependencies
-are available on ``sys.path`` before running the project's source scripts.
-And, it ensures that any missing project dependencies are available in the
-staging area, by downloading and installing them if necessary.
-
-Last, but not least, the ``develop`` command invokes the ``build_ext -i``
-command to ensure any C extensions in the project have been built and are
-up-to-date, and the ``egg_info`` command to ensure the project's metadata is
-updated (so that the runtime and wrappers know what the project's dependencies
-are).  If you make any changes to the project's setup script or C extensions,
-you should rerun the ``develop`` command against all relevant staging areas to
-keep the project's scripts, metadata and extensions up-to-date.  Most other
-kinds of changes to your project should not require any build operations or
-rerunning ``develop``, but keep in mind that even minor changes to the setup
-script (e.g. changing an entry point definition) require you to re-run the
-``develop`` or ``test`` commands to keep the distribution updated.
-
-Here are some of the options that the ``develop`` command accepts.  Note that
-they affect the project's dependencies as well as the project itself, so if you
-have dependencies that need to be installed and you use ``--exclude-scripts``
-(for example), the dependencies' scripts will not be installed either!  For
-this reason, you may want to use EasyInstall to install the project's
-dependencies before using the ``develop`` command, if you need finer control
-over the installation options for dependencies.
-
-``--uninstall, -u``
-    Un-deploy the current project.  You may use the ``--install-dir`` or ``-d``
-    option to designate the staging area.  The created ``.egg-link`` file will
-    be removed, if present and it is still pointing to the project directory.
-    The project directory will be removed from ``easy-install.pth`` if the
-    staging area is Python's ``site-packages`` directory.
-
-    Note that this option currently does *not* uninstall script wrappers!  You
-    must uninstall them yourself, or overwrite them by using EasyInstall to
-    activate a different version of the package.  You can also avoid installing
-    script wrappers in the first place, if you use the ``--exclude-scripts``
-    (aka ``-x``) option when you run ``develop`` to deploy the project.
-
-``--multi-version, -m``
-    "Multi-version" mode. Specifying this option prevents ``develop`` from
-    adding an ``easy-install.pth`` entry for the project(s) being deployed, and
-    if an entry for any version of a project already exists, the entry will be
-    removed upon successful deployment.  In multi-version mode, no specific
-    version of the package is available for importing, unless you use
-    ``pkg_resources.require()`` to put it on ``sys.path``, or you are running
-    a wrapper script generated by ``setuptools`` or EasyInstall.  (In which
-    case the wrapper script calls ``require()`` for you.)
-
-    Note that if you install to a directory other than ``site-packages``,
-    this option is automatically in effect, because ``.pth`` files can only be
-    used in ``site-packages`` (at least in Python 2.3 and 2.4). So, if you use
-    the ``--install-dir`` or ``-d`` option (or they are set via configuration
-    file(s)) your project and its dependencies will be deployed in multi-
-    version mode.
-
-``--install-dir=DIR, -d DIR``
-    Set the installation directory (staging area).  If this option is not
-    directly specified on the command line or in a distutils configuration
-    file, the distutils default installation location is used.  Normally, this
-    will be the ``site-packages`` directory, but if you are using distutils
-    configuration files, setting things like ``prefix`` or ``install_lib``,
-    then those settings are taken into account when computing the default
-    staging area.
-
-``--script-dir=DIR, -s DIR``
-    Set the script installation directory.  If you don't supply this option
-    (via the command line or a configuration file), but you *have* supplied
-    an ``--install-dir`` (via command line or config file), then this option
-    defaults to the same directory, so that the scripts will be able to find
-    their associated package installation.  Otherwise, this setting defaults
-    to the location where the distutils would normally install scripts, taking
-    any distutils configuration file settings into account.
-
-``--exclude-scripts, -x``
-    Don't deploy script wrappers.  This is useful if you don't want to disturb
-    existing versions of the scripts in the staging area.
-
-``--always-copy, -a``
-    Copy all needed distributions to the staging area, even if they
-    are already present in another directory on ``sys.path``.  By default, if
-    a requirement can be met using a distribution that is already available in
-    a directory on ``sys.path``, it will not be copied to the staging area.
-
-``--egg-path=DIR``
-    Force the generated ``.egg-link`` file to use a specified relative path
-    to the source directory.  This can be useful in circumstances where your
-    installation directory is being shared by code running under multiple
-    platforms (e.g. Mac and Windows) which have different absolute locations
-    for the code under development, but the same *relative* locations with
-    respect to the installation directory.  If you use this option when
-    installing, you must supply the same relative path when uninstalling.
-
-In addition to the above options, the ``develop`` command also accepts all of
-the same options accepted by ``easy_install``.  If you've configured any
-``easy_install`` settings in your ``setup.cfg`` (or other distutils config
-files), the ``develop`` command will use them as defaults, unless you override
-them in a ``[develop]`` section or on the command line.
-
-
-``easy_install`` - Find and install packages
-============================================
-
-This command runs the `EasyInstall tool
-<http://peak.telecommunity.com/DevCenter/EasyInstall>`_ for you.  It is exactly
-equivalent to running the ``easy_install`` command.  All command line arguments
-following this command are consumed and not processed further by the distutils,
-so this must be the last command listed on the command line.  Please see
-the EasyInstall documentation for the options reference and usage examples.
-Normally, there is no reason to use this command via the command line, as you
-can just use ``easy_install`` directly.  It's only listed here so that you know
-it's a distutils command, which means that you can:
-
-* create command aliases that use it,
-* create distutils extensions that invoke it as a subcommand, and
-* configure options for it in your ``setup.cfg`` or other distutils config
-  files.
-
-
-.. _egg_info:
-
-``egg_info`` - Create egg metadata and set build tags
-=====================================================
-
-This command performs two operations: it updates a project's ``.egg-info``
-metadata directory (used by the ``bdist_egg``, ``develop``, and ``test``
-commands), and it allows you to temporarily change a project's version string,
-to support "daily builds" or "snapshot" releases.  It is run automatically by
-the ``sdist``, ``bdist_egg``, ``develop``, ``register``, and ``test`` commands
-in order to update the project's metadata, but you can also specify it
-explicitly in order to temporarily change the project's version string while
-executing other commands.  (It also generates the``.egg-info/SOURCES.txt``
-manifest file, which is used when you are building source distributions.)
-
-In addition to writing the core egg metadata defined by ``setuptools`` and
-required by ``pkg_resources``, this command can be extended to write other
-metadata files as well, by defining entry points in the ``egg_info.writers``
-group.  See the section on `Adding new EGG-INFO Files`_ below for more details.
-Note that using additional metadata writers may require you to include a
-``setup_requires`` argument to ``setup()`` in order to ensure that the desired
-writers are available on ``sys.path``.
-
-
-Release Tagging Options
------------------------
-
-The following options can be used to modify the project's version string for
-all remaining commands on the setup command line.  The options are processed
-in the order shown, so if you use more than one, the requested tags will be
-added in the following order:
-
-``--tag-build=NAME, -b NAME``
-    Append NAME to the project's version string.  Due to the way setuptools
-    processes "pre-release" version suffixes beginning with the letters "a"
-    through "e" (like "alpha", "beta", and "candidate"), you will usually want
-    to use a tag like ".build" or ".dev", as this will cause the version number
-    to be considered *lower* than the project's default version.  (If you
-    want to make the version number *higher* than the default version, you can
-    always leave off --tag-build and then use one or both of the following
-    options.)
-
-    If you have a default build tag set in your ``setup.cfg``, you can suppress
-    it on the command line using ``-b ""`` or ``--tag-build=""`` as an argument
-    to the ``egg_info`` command.
-
-``--tag-svn-revision, -r``
-    If the current directory is a Subversion checkout (i.e. has a ``.svn``
-    subdirectory, this appends a string of the form "-rNNNN" to the project's
-    version string, where NNNN is the revision number of the most recent
-    modification to the current directory, as obtained from the ``svn info``
-    command.
-
-    If the current directory is not a Subversion checkout, the command will
-    look for a ``PKG-INFO`` file instead, and try to find the revision number
-    from that, by looking for a "-rNNNN" string at the end of the version
-    number.  (This is so that building a package from a source distribution of
-    a Subversion snapshot will produce a binary with the correct version
-    number.)
-
-    If there is no ``PKG-INFO`` file, or the version number contained therein
-    does not end with ``-r`` and a number, then ``-r0`` is used.
-
-``--no-svn-revision, -R``
-    Don't include the Subversion revision in the version number.  This option
-    is included so you can override a default setting put in ``setup.cfg``.
-
-``--tag-date, -d``
-    Add a date stamp of the form "-YYYYMMDD" (e.g. "-20050528") to the
-    project's version number.
-
-``--no-date, -D``
-    Don't include a date stamp in the version number.  This option is included
-    so you can override a default setting in ``setup.cfg``.
-
-
-(Note: Because these options modify the version number used for source and
-binary distributions of your project, you should first make sure that you know
-how the resulting version numbers will be interpreted by automated tools
-like EasyInstall.  See the section above on `Specifying Your Project's
-Version`_ for an explanation of pre- and post-release tags, as well as tips on
-how to choose and verify a versioning scheme for your your project.)
-
-For advanced uses, there is one other option that can be set, to change the
-location of the project's ``.egg-info`` directory.  Commands that need to find
-the project's source directory or metadata should get it from this setting:
-
-
-Other ``egg_info`` Options
---------------------------
-
-``--egg-base=SOURCEDIR, -e SOURCEDIR``
-    Specify the directory that should contain the .egg-info directory.  This
-    should normally be the root of your project's source tree (which is not
-    necessarily the same as your project directory; some projects use a ``src``
-    or ``lib`` subdirectory as the source root).  You should not normally need
-    to specify this directory, as it is normally determined from the
-    ``package_dir`` argument to the ``setup()`` function, if any.  If there is
-    no ``package_dir`` set, this option defaults to the current directory.
-
-
-``egg_info`` Examples
----------------------
-
-Creating a dated "nightly build" snapshot egg::
-
-    python setup.py egg_info --tag-date --tag-build=DEV bdist_egg
-
-Creating and uploading a release with no version tags, even if some default
-tags are specified in ``setup.cfg``::
-
-    python setup.py egg_info -RDb "" sdist bdist_egg register upload
-
-(Notice that ``egg_info`` must always appear on the command line *before* any
-commands that you want the version changes to apply to.)
-
-
-.. _install command:
-
-``install`` - Run ``easy_install`` or old-style installation
-============================================================
-
-The setuptools ``install`` command is basically a shortcut to run the
-``easy_install`` command on the current project.  However, for convenience
-in creating "system packages" of setuptools-based projects, you can also
-use this option:
-
-``--single-version-externally-managed``
-    This boolean option tells the ``install`` command to perform an "old style"
-    installation, with the addition of an ``.egg-info`` directory so that the
-    installed project will still have its metadata available and operate
-    normally.  If you use this option, you *must* also specify the ``--root``
-    or ``--record`` options (or both), because otherwise you will have no way
-    to identify and remove the installed files.
-
-This option is automatically in effect when ``install`` is invoked by another
-distutils command, so that commands like ``bdist_wininst`` and ``bdist_rpm``
-will create system packages of eggs.  It is also automatically in effect if
-you specify the ``--root`` option.
-
-
-``install_egg_info`` - Install an ``.egg-info`` directory in ``site-packages``
-==============================================================================
-
-Setuptools runs this command as part of ``install`` operations that use the
-``--single-version-externally-managed`` options.  You should not invoke it
-directly; it is documented here for completeness and so that distutils
-extensions such as system package builders can make use of it.  This command
-has only one option:
-
-``--install-dir=DIR, -d DIR``
-    The parent directory where the ``.egg-info`` directory will be placed.
-    Defaults to the same as the ``--install-dir`` option specified for the
-    ``install_lib`` command, which is usually the system ``site-packages``
-    directory.
-
-This command assumes that the ``egg_info`` command has been given valid options
-via the command line or ``setup.cfg``, as it will invoke the ``egg_info``
-command and use its options to locate the project's source ``.egg-info``
-directory.
-
-
-.. _rotate:
-
-``rotate`` - Delete outdated distribution files
-===============================================
-
-As you develop new versions of your project, your distribution (``dist``)
-directory will gradually fill up with older source and/or binary distribution
-files.  The ``rotate`` command lets you automatically clean these up, keeping
-only the N most-recently modified files matching a given pattern.
-
-``--match=PATTERNLIST, -m PATTERNLIST``
-    Comma-separated list of glob patterns to match.  This option is *required*.
-    The project name and ``-*`` is prepended to the supplied patterns, in order
-    to match only distributions belonging to the current project (in case you
-    have a shared distribution directory for multiple projects).  Typically,
-    you will use a glob pattern like ``.zip`` or ``.egg`` to match files of
-    the specified type.  Note that each supplied pattern is treated as a
-    distinct group of files for purposes of selecting files to delete.
-
-``--keep=COUNT, -k COUNT``
-    Number of matching distributions to keep.  For each group of files
-    identified by a pattern specified with the ``--match`` option, delete all
-    but the COUNT most-recently-modified files in that group.  This option is
-    *required*.
-
-``--dist-dir=DIR, -d DIR``
-    Directory where the distributions are.  This defaults to the value of the
-    ``bdist`` command's ``--dist-dir`` option, which will usually be the
-    project's ``dist`` subdirectory.
-
-**Example 1**: Delete all .tar.gz files from the distribution directory, except
-for the 3 most recently modified ones::
-
-    setup.py rotate --match=.tar.gz --keep=3
-
-**Example 2**: Delete all Python 2.3 or Python 2.4 eggs from the distribution
-directory, except the most recently modified one for each Python version::
-
-    setup.py rotate --match=-py2.3*.egg,-py2.4*.egg --keep=1
-
-
-.. _saveopts:
-
-``saveopts`` - Save used options to a configuration file
-========================================================
-
-Finding and editing ``distutils`` configuration files can be a pain, especially
-since you also have to translate the configuration options from command-line
-form to the proper configuration file format.  You can avoid these hassles by
-using the ``saveopts`` command.  Just add it to the command line to save the
-options you used.  For example, this command builds the project using
-the ``mingw32`` C compiler, then saves the --compiler setting as the default
-for future builds (even those run implicitly by the ``install`` command)::
-
-    setup.py build --compiler=mingw32 saveopts
-
-The ``saveopts`` command saves all options for every commmand specified on the
-command line to the project's local ``setup.cfg`` file, unless you use one of
-the `configuration file options`_ to change where the options are saved.  For
-example, this command does the same as above, but saves the compiler setting
-to the site-wide (global) distutils configuration::
-
-    setup.py build --compiler=mingw32 saveopts -g
-
-Note that it doesn't matter where you place the ``saveopts`` command on the
-command line; it will still save all the options specified for all commands.
-For example, this is another valid way to spell the last example::
-
-    setup.py saveopts -g build --compiler=mingw32
-
-Note, however, that all of the commands specified are always run, regardless of
-where ``saveopts`` is placed on the command line.
-
-
-Configuration File Options
---------------------------
-
-Normally, settings such as options and aliases are saved to the project's
-local ``setup.cfg`` file.  But you can override this and save them to the
-global or per-user configuration files, or to a manually-specified filename.
-
-``--global-config, -g``
-    Save settings to the global ``distutils.cfg`` file inside the ``distutils``
-    package directory.  You must have write access to that directory to use
-    this option.  You also can't combine this option with ``-u`` or ``-f``.
-
-``--user-config, -u``
-    Save settings to the current user's ``~/.pydistutils.cfg`` (POSIX) or
-    ``$HOME/pydistutils.cfg`` (Windows) file.  You can't combine this option
-    with ``-g`` or ``-f``.
-
-``--filename=FILENAME, -f FILENAME``
-    Save settings to the specified configuration file to use.  You can't
-    combine this option with ``-g`` or ``-u``.  Note that if you specify a
-    non-standard filename, the ``distutils`` and ``setuptools`` will not
-    use the file's contents.  This option is mainly included for use in
-    testing.
-
-These options are used by other ``setuptools`` commands that modify
-configuration files, such as the `alias`_ and `setopt`_ commands.
-
-
-.. _setopt:
-
-``setopt`` - Set a distutils or setuptools option in a config file
-==================================================================
-
-This command is mainly for use by scripts, but it can also be used as a quick
-and dirty way to change a distutils configuration option without having to
-remember what file the options are in and then open an editor.
-
-**Example 1**.  Set the default C compiler to ``mingw32`` (using long option
-names)::
-
-    setup.py setopt --command=build --option=compiler --set-value=mingw32
-
-**Example 2**.  Remove any setting for the distutils default package
-installation directory (short option names)::
-
-    setup.py setopt -c install -o install_lib -r
-
-
-Options for the ``setopt`` command:
-
-``--command=COMMAND, -c COMMAND``
-    Command to set the option for.  This option is required.
-
-``--option=OPTION, -o OPTION``
-    The name of the option to set.  This option is required.
-
-``--set-value=VALUE, -s VALUE``
-    The value to set the option to.  Not needed if ``-r`` or ``--remove`` is
-    set.
-
-``--remove, -r``
-    Remove (unset) the option, instead of setting it.
-
-In addition to the above options, you may use any of the `configuration file
-options`_ (listed under the `saveopts`_ command, above) to determine which
-distutils configuration file the option will be added to (or removed from).
-
-
-.. _test:
-
-``test`` - Build package and run a unittest suite
-=================================================
-
-When doing test-driven development, or running automated builds that need
-testing before they are deployed for downloading or use, it's often useful
-to be able to run a project's unit tests without actually deploying the project
-anywhere, even using the ``develop`` command.  The ``test`` command runs a
-project's unit tests without actually deploying it, by temporarily putting the
-project's source on ``sys.path``, after first running ``build_ext -i`` and
-``egg_info`` to ensure that any C extensions and project metadata are
-up-to-date.
-
-To use this command, your project's tests must be wrapped in a ``unittest``
-test suite by either a function, a ``TestCase`` class or method, or a module
-or package containing ``TestCase`` classes.  If the named suite is a module,
-and the module has an ``additional_tests()`` function, it is called and the
-result (which must be a ``unittest.TestSuite``) is added to the tests to be
-run.  If the named suite is a package, any submodules and subpackages are
-recursively added to the overall test suite.  (Note: if your project specifies
-a ``test_loader``, the rules for processing the chosen ``test_suite`` may
-differ; see the `test_loader`_ documentation for more details.)
-
-Note that many test systems including ``doctest`` support wrapping their
-non-``unittest`` tests in ``TestSuite`` objects.  So, if you are using a test
-package that does not support this, we suggest you encourage its developers to
-implement test suite support, as this is a convenient and standard way to
-aggregate a collection of tests to be run under a common test harness.
-
-By default, tests will be run in the "verbose" mode of the ``unittest``
-package's text test runner, but you can get the "quiet" mode (just dots) if
-you supply the ``-q`` or ``--quiet`` option, either as a global option to
-the setup script (e.g. ``setup.py -q test``) or as an option for the ``test``
-command itself (e.g. ``setup.py test -q``).  There is one other option
-available:
-
-``--test-suite=NAME, -s NAME``
-    Specify the test suite (or module, class, or method) to be run
-    (e.g. ``some_module.test_suite``).  The default for this option can be
-    set by giving a ``test_suite`` argument to the ``setup()`` function, e.g.::
-
-        setup(
-            # ...
-            test_suite = "my_package.tests.test_all"
-        )
-
-    If you did not set a ``test_suite`` in your ``setup()`` call, and do not
-    provide a ``--test-suite`` option, an error will occur.
-
-
-.. _upload:
-
-``upload`` - Upload source and/or egg distributions to PyPI
-===========================================================
-
-PyPI now supports uploading project files for redistribution; uploaded files
-are easily found by EasyInstall, even if you don't have download links on your
-project's home page.
-
-Although Python 2.5 will support uploading all types of distributions to PyPI,
-setuptools only supports source distributions and eggs.  (This is partly
-because PyPI's upload support is currently broken for various other file
-types.)  To upload files, you must include the ``upload`` command *after* the
-``sdist`` or ``bdist_egg`` commands on the setup command line.  For example::
-
-    setup.py bdist_egg upload         # create an egg and upload it
-    setup.py sdist upload             # create a source distro and upload it
-    setup.py sdist bdist_egg upload   # create and upload both
-
-Note that to upload files for a project, the corresponding version must already
-be registered with PyPI, using the distutils ``register`` command.  It's
-usually a good idea to include the ``register`` command at the start of the
-command line, so that any registration problems can be found and fixed before
-building and uploading the distributions, e.g.::
-
-    setup.py register sdist bdist_egg upload
-
-This will update PyPI's listing for your project's current version.
-
-Note, by the way, that the metadata in your ``setup()`` call determines what
-will be listed in PyPI for your package.  Try to fill out as much of it as
-possible, as it will save you a lot of trouble manually adding and updating
-your PyPI listings.  Just put it in ``setup.py`` and use the ``register``
-comamnd to keep PyPI up to date.
-
-The ``upload`` command has a few options worth noting:
-
-``--sign, -s``
-    Sign each uploaded file using GPG (GNU Privacy Guard).  The ``gpg`` program
-    must be available for execution on the system ``PATH``.
-
-``--identity=NAME, -i NAME``
-    Specify the identity or key name for GPG to use when signing.  The value of
-    this option will be passed through the ``--local-user`` option of the
-    ``gpg`` program.
-
-``--show-response``
-    Display the full response text from server; this is useful for debugging
-    PyPI problems.
-
-``--repository=URL, -r URL``
-    The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
-
-.. _upload_docs:
-
-``upload_docs`` - Upload package documentation to PyPI
-======================================================
-
-PyPI now supports uploading project documentation to the dedicated URL
-http://packages.python.org/<project>/.
-
-The ``upload_docs`` command will create the necessary zip file out of a
-documentation directory and will post to the repository.
-
-Note that to upload the documentation of a project, the corresponding version
-must already be registered with PyPI, using the distutils ``register``
-command -- just like the ``upload`` command.
-
-Assuming there is an ``Example`` project with documentation in the
-subdirectory ``docs``, e.g.::
-
-  Example/
-  |-- example.py
-  |-- setup.cfg
-  |-- setup.py
-  |-- docs
-  |   |-- build
-  |   |   `-- html
-  |   |   |   |-- index.html
-  |   |   |   `-- tips_tricks.html
-  |   |-- conf.py
-  |   |-- index.txt
-  |   `-- tips_tricks.txt
-
-You can simply pass the documentation directory path to the ``upload_docs``
-command::
-
-    python setup.py upload_docs --upload-dir=docs/build/html
-
-If no ``--upload-dir`` is given, ``upload_docs`` will attempt to run the
-``build_sphinx`` command to generate uploadable documentation.
-For the command to become available, `Sphinx <http://sphinx.pocoo.org/>`_
-must be installed in the same environment as distribute.
-
-As with other ``setuptools``-based commands, you can define useful
-defaults in the ``setup.cfg`` of your Python project, e.g.:
-
-.. code-block:: ini
-
-    [upload_docs]
-    upload-dir = docs/build/html
-
-The ``upload_docs`` command has the following options:
-
-``--upload-dir``
-    The directory to be uploaded to the repository.
-
-``--show-response``
-    Display the full response text from server; this is useful for debugging
-    PyPI problems.
-
-``--repository=URL, -r URL``
-    The URL of the repository to upload to.  Defaults to
-    http://pypi.python.org/pypi (i.e., the main PyPI installation).
-
-
---------------------------------
-Extending and Reusing Distribute
---------------------------------
-
-Creating ``distutils`` Extensions
-=================================
-
-It can be hard to add new commands or setup arguments to the distutils.  But
-the ``setuptools`` package makes it a bit easier, by allowing you to distribute
-a distutils extension as a separate project, and then have projects that need
-the extension just refer to it in their ``setup_requires`` argument.
-
-With ``setuptools``, your distutils extension projects can hook in new
-commands and ``setup()`` arguments just by defining "entry points".  These
-are mappings from command or argument names to a specification of where to
-import a handler from.  (See the section on `Dynamic Discovery of Services and
-Plugins`_ above for some more background on entry points.)
-
-
-Adding Commands
----------------
-
-You can add new ``setup`` commands by defining entry points in the
-``distutils.commands`` group.  For example, if you wanted to add a ``foo``
-command, you might add something like this to your distutils extension
-project's setup script::
-
-    setup(
-        # ...
-        entry_points = {
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-        },
-    )
-
-(Assuming, of course, that the ``foo`` class in ``mypackage.some_module`` is
-a ``setuptools.Command`` subclass.)
-
-Once a project containing such entry points has been activated on ``sys.path``,
-(e.g. by running "install" or "develop" with a site-packages installation
-directory) the command(s) will be available to any ``setuptools``-based setup
-scripts.  It is not necessary to use the ``--command-packages`` option or
-to monkeypatch the ``distutils.command`` package to install your commands;
-``setuptools`` automatically adds a wrapper to the distutils to search for
-entry points in the active distributions on ``sys.path``.  In fact, this is
-how setuptools' own commands are installed: the setuptools project's setup
-script defines entry points for them!
-
-
-Adding ``setup()`` Arguments
-----------------------------
-
-Sometimes, your commands may need additional arguments to the ``setup()``
-call.  You can enable this by defining entry points in the
-``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
-argument called ``bar_baz``, you might add something like this to your
-distutils extension project's setup script::
-
-    setup(
-        # ...
-        entry_points = {
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-            "distutils.setup_keywords": [
-                "bar_baz = mypackage.some_module:validate_bar_baz",
-            ],
-        },
-    )
-
-The idea here is that the entry point defines a function that will be called
-to validate the ``setup()`` argument, if it's supplied.  The ``Distribution``
-object will have the initial value of the attribute set to ``None``, and the
-validation function will only be called if the ``setup()`` call sets it to
-a non-None value.  Here's an example validation function::
-
-    def assert_bool(dist, attr, value):
-        """Verify that value is True, False, 0, or 1"""
-        if bool(value) != value:
-            raise DistutilsSetupError(
-                "%r must be a boolean value (got %r)" % (attr,value)
-            )
-
-Your function should accept three arguments: the ``Distribution`` object,
-the attribute name, and the attribute value.  It should raise a
-``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
-is invalid.  Remember, your function will only be called with non-None values,
-and the default value of arguments defined this way is always None.  So, your
-commands should always be prepared for the possibility that the attribute will
-be ``None`` when they access it later.
-
-If more than one active distribution defines an entry point for the same
-``setup()`` argument, *all* of them will be called.  This allows multiple
-distutils extensions to define a common argument, as long as they agree on
-what values of that argument are valid.
-
-Also note that as with commands, it is not necessary to subclass or monkeypatch
-the distutils ``Distribution`` class in order to add your arguments; it is
-sufficient to define the entry points in your extension, as long as any setup
-script using your extension lists your project in its ``setup_requires``
-argument.
-
-
-Adding new EGG-INFO Files
--------------------------
-
-Some extensible applications or frameworks may want to allow third parties to
-develop plugins with application or framework-specific metadata included in
-the plugins' EGG-INFO directory, for easy access via the ``pkg_resources``
-metadata API.  The easiest way to allow this is to create a distutils extension
-to be used from the plugin projects' setup scripts (via ``setup_requires``)
-that defines a new setup keyword, and then uses that data to write an EGG-INFO
-file when the ``egg_info`` command is run.
-
-The ``egg_info`` command looks for extension points in an ``egg_info.writers``
-group, and calls them to write the files.  Here's a simple example of a
-distutils extension defining a setup argument ``foo_bar``, which is a list of
-lines that will be written to ``foo_bar.txt`` in the EGG-INFO directory of any
-project that uses the argument::
-
-    setup(
-        # ...
-        entry_points = {
-            "distutils.setup_keywords": [
-                "foo_bar = setuptools.dist:assert_string_list",
-            ],
-            "egg_info.writers": [
-                "foo_bar.txt = setuptools.command.egg_info:write_arg",
-            ],
-        },
-    )
-
-This simple example makes use of two utility functions defined by setuptools
-for its own use: a routine to validate that a setup keyword is a sequence of
-strings, and another one that looks up a setup argument and writes it to
-a file.  Here's what the writer utility looks like::
-
-    def write_arg(cmd, basename, filename):
-        argname = os.path.splitext(basename)[0]
-        value = getattr(cmd.distribution, argname, None)
-        if value is not None:
-            value = '\n'.join(value)+'\n'
-        cmd.write_or_delete_file(argname, filename, value)
-
-As you can see, ``egg_info.writers`` entry points must be a function taking
-three arguments: a ``egg_info`` command instance, the basename of the file to
-write (e.g. ``foo_bar.txt``), and the actual full filename that should be
-written to.
-
-In general, writer functions should honor the command object's ``dry_run``
-setting when writing files, and use the ``distutils.log`` object to do any
-console output.  The easiest way to conform to this requirement is to use
-the ``cmd`` object's ``write_file()``, ``delete_file()``, and
-``write_or_delete_file()`` methods exclusively for your file operations.  See
-those methods' docstrings for more details.
-
-
-Adding Support for Other Revision Control Systems
--------------------------------------------------
-
-If you would like to create a plugin for ``setuptools`` to find files in other
-source control systems besides CVS and Subversion, you can do so by adding an
-entry point to the ``setuptools.file_finders`` group.  The entry point should
-be a function accepting a single directory name, and should yield
-all the filenames within that directory (and any subdirectories thereof) that
-are under revision control.
-
-For example, if you were going to create a plugin for a revision control system
-called "foobar", you would write a function something like this:
-
-.. code-block:: python
-
-    def find_files_for_foobar(dirname):
-        # loop to yield paths that start with `dirname`
-
-And you would register it in a setup script using something like this::
-
-    entry_points = {
-        "setuptools.file_finders": [
-            "foobar = my_foobar_module:find_files_for_foobar"
-        ]
-    }
-
-Then, anyone who wants to use your plugin can simply install it, and their
-local setuptools installation will be able to find the necessary files.
-
-It is not necessary to distribute source control plugins with projects that
-simply use the other source control system, or to specify the plugins in
-``setup_requires``.  When you create a source distribution with the ``sdist``
-command, setuptools automatically records what files were found in the
-``SOURCES.txt`` file.  That way, recipients of source distributions don't need
-to have revision control at all.  However, if someone is working on a package
-by checking out with that system, they will need the same plugin(s) that the
-original author is using.
-
-A few important points for writing revision control file finders:
-
-* Your finder function MUST return relative paths, created by appending to the
-  passed-in directory name.  Absolute paths are NOT allowed, nor are relative
-  paths that reference a parent directory of the passed-in directory.
-
-* Your finder function MUST accept an empty string as the directory name,
-  meaning the current directory.  You MUST NOT convert this to a dot; just
-  yield relative paths.  So, yielding a subdirectory named ``some/dir`` under
-  the current directory should NOT be rendered as ``./some/dir`` or
-  ``/somewhere/some/dir``, but *always* as simply ``some/dir``
-
-* Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
-  with the absence of needed programs (i.e., ones belonging to the revision
-  control system itself.  It *may*, however, use ``distutils.log.warn()`` to
-  inform the user of the missing program(s).
-
-
-Subclassing ``Command``
------------------------
-
-Sorry, this section isn't written yet, and neither is a lot of what's below
-this point, except for the change log.  You might want to `subscribe to changes
-in this page <setuptools?action=subscribe>`_ to see when new documentation is
-added or updated.
-
-XXX
-
-
-Reusing ``setuptools`` Code
-===========================
-
-``distribute_setup``
---------------------
-
-XXX
-
-
-``setuptools.archive_util``
----------------------------
-
-XXX
-
-
-``setuptools.sandbox``
-----------------------
-
-XXX
-
-
-``setuptools.package_index``
-----------------------------
-
-XXX
-
-History
-=======
-
-0.6c9
- * Fixed a missing files problem when using Windows source distributions on
-   non-Windows platforms, due to distutils not handling manifest file line
-   endings correctly.
-
- * Updated Pyrex support to work with Pyrex 0.9.6 and higher.
-
- * Minor changes for Jython compatibility, including skipping tests that can't
-   work on Jython.
-
- * Fixed not installing eggs in ``install_requires`` if they were also used for
-   ``setup_requires`` or ``tests_require``.
-
- * Fixed not fetching eggs in ``install_requires`` when running tests.
-
- * Allow ``ez_setup.use_setuptools()`` to upgrade existing setuptools
-   installations when called from a standalone ``setup.py``.
-
- * Added a warning if a namespace package is declared, but its parent package
-   is not also declared as a namespace.
-
- * Support Subversion 1.5
-
- * Removed use of deprecated ``md5`` module if ``hashlib`` is available
-
- * Fixed ``bdist_wininst upload`` trying to upload the ``.exe`` twice
-
- * Fixed ``bdist_egg`` putting a ``native_libs.txt`` in the source package's
-   ``.egg-info``, when it should only be in the built egg's ``EGG-INFO``.
-
- * Ensure that _full_name is set on all shared libs before extensions are
-   checked for shared lib usage.  (Fixes a bug in the experimental shared
-   library build support.)
-
- * Fix to allow unpacked eggs containing native libraries to fail more
-   gracefully under Google App Engine (with an ``ImportError`` loading the
-   C-based module, instead of getting a ``NameError``).
-
-0.6c7
- * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and
-   ``egg_info`` command failing on new, uncommitted SVN directories.
-
- * Fix import problems with nested namespace packages installed via
-   ``--root`` or ``--single-version-externally-managed``, due to the
-   parent package not having the child package as an attribute.
-
-0.6c6
- * Added ``--egg-path`` option to ``develop`` command, allowing you to force
-   ``.egg-link`` files to use relative paths (allowing them to be shared across
-   platforms on a networked drive).
-
- * Fix not building binary RPMs correctly.
-
- * Fix "eggsecutables" (such as setuptools' own egg) only being runnable with
-   bash-compatible shells.
-
- * Fix ``#!`` parsing problems in Windows ``.exe`` script wrappers, when there
-   was whitespace inside a quoted argument or at the end of the ``#!`` line
-   (a regression introduced in 0.6c4).
-
- * Fix ``test`` command possibly failing if an older version of the project
-   being tested was installed on ``sys.path`` ahead of the test source
-   directory.
-
- * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
-   their names as packages.
-
-0.6c5
- * Fix uploaded ``bdist_rpm`` packages being described as ``bdist_egg``
-   packages under Python versions less than 2.5.
-
- * Fix uploaded ``bdist_wininst`` packages being described as suitable for
-   "any" version by Python 2.5, even if a ``--target-version`` was specified.
-
-0.6c4
- * Overhauled Windows script wrapping to support ``bdist_wininst`` better.
-   Scripts installed with ``bdist_wininst`` will always use ``#!python.exe`` or
-   ``#!pythonw.exe`` as the executable name (even when built on non-Windows
-   platforms!), and the wrappers will look for the executable in the script's
-   parent directory (which should find the right version of Python).
-
- * Fix ``upload`` command not uploading files built by ``bdist_rpm`` or
-   ``bdist_wininst`` under Python 2.3 and 2.4.
-
- * Add support for "eggsecutable" headers: a ``#!/bin/sh`` script that is
-   prepended to an ``.egg`` file to allow it to be run as a script on Unix-ish
-   platforms.  (This is mainly so that setuptools itself can have a single-file
-   installer on Unix, without doing multiple downloads, dealing with firewalls,
-   etc.)
-
- * Fix problem with empty revision numbers in Subversion 1.4 ``entries`` files
-
- * Use cross-platform relative paths in ``easy-install.pth`` when doing
-   ``develop`` and the source directory is a subdirectory of the installation
-   target directory.
-
- * Fix a problem installing eggs with a system packaging tool if the project
-   contained an implicit namespace package; for example if the ``setup()``
-   listed a namespace package ``foo.bar`` without explicitly listing ``foo``
-   as a namespace package.
-
-0.6c3
- * Fixed breakages caused by Subversion 1.4's new "working copy" format
-
-0.6c2
- * The ``ez_setup`` module displays the conflicting version of setuptools (and
-   its installation location) when a script requests a version that's not
-   available.
-
- * Running ``setup.py develop`` on a setuptools-using project will now install
-   setuptools if needed, instead of only downloading the egg.
-
-0.6c1
- * Fixed ``AttributeError`` when trying to download a ``setup_requires``
-   dependency when a distribution lacks a ``dependency_links`` setting.
-
- * Made ``zip-safe`` and ``not-zip-safe`` flag files contain a single byte, so
-   as to play better with packaging tools that complain about zero-length
-   files.
-
- * Made ``setup.py develop`` respect the ``--no-deps`` option, which it
-   previously was ignoring.
-
- * Support ``extra_path`` option to ``setup()`` when ``install`` is run in
-   backward-compatibility mode.
-
- * Source distributions now always include a ``setup.cfg`` file that explicitly
-   sets ``egg_info`` options such that they produce an identical version number
-   to the source distribution's version number.  (Previously, the default
-   version number could be different due to the use of ``--tag-date``, or if
-   the version was overridden on the command line that built the source
-   distribution.)
-
-0.6b4
- * Fix ``register`` not obeying name/version set by ``egg_info`` command, if
-   ``egg_info`` wasn't explicitly run first on the same command line.
-
- * Added ``--no-date`` and ``--no-svn-revision`` options to ``egg_info``
-   command, to allow suppressing tags configured in ``setup.cfg``.
-
- * Fixed redundant warnings about missing ``README`` file(s); it should now
-   appear only if you are actually a source distribution.
-
-0.6b3
- * Fix ``bdist_egg`` not including files in subdirectories of ``.egg-info``.
-
- * Allow ``.py`` files found by the ``include_package_data`` option to be
-   automatically included.  Remove duplicate data file matches if both
-   ``include_package_data`` and ``package_data`` are used to refer to the same
-   files.
-
-0.6b1
- * Strip ``module`` from the end of compiled extension modules when computing
-   the name of a ``.py`` loader/wrapper.  (Python's import machinery ignores
-   this suffix when searching for an extension module.)
-
-0.6a11
- * Added ``test_loader`` keyword to support custom test loaders
-
- * Added ``setuptools.file_finders`` entry point group to allow implementing
-   revision control plugins.
-
- * Added ``--identity`` option to ``upload`` command.
-
- * Added ``dependency_links`` to allow specifying URLs for ``--find-links``.
-
- * Enhanced test loader to scan packages as well as modules, and call
-   ``additional_tests()`` if present to get non-unittest tests.
-
- * Support namespace packages in conjunction with system packagers, by omitting
-   the installation of any ``__init__.py`` files for namespace packages, and
-   adding a special ``.pth`` file to create a working package in
-   ``sys.modules``.
-
- * Made ``--single-version-externally-managed`` automatic when ``--root`` is
-   used, so that most system packagers won't require special support for
-   setuptools.
-
- * Fixed ``setup_requires``, ``tests_require``, etc. not using ``setup.cfg`` or
-   other configuration files for their option defaults when installing, and
-   also made the install use ``--multi-version`` mode so that the project
-   directory doesn't need to support .pth files.
-
- * ``MANIFEST.in`` is now forcibly closed when any errors occur while reading
-   it.  Previously, the file could be left open and the actual error would be
-   masked by problems trying to remove the open file on Windows systems.
-
-0.6a10
- * Fixed the ``develop`` command ignoring ``--find-links``.
-
-0.6a9
- * The ``sdist`` command no longer uses the traditional ``MANIFEST`` file to
-   create source distributions.  ``MANIFEST.in`` is still read and processed,
-   as are the standard defaults and pruning.  But the manifest is built inside
-   the project's ``.egg-info`` directory as ``SOURCES.txt``, and it is rebuilt
-   every time the ``egg_info`` command is run.
-
- * Added the ``include_package_data`` keyword to ``setup()``, allowing you to
-   automatically include any package data listed in revision control or
-   ``MANIFEST.in``
-
- * Added the ``exclude_package_data`` keyword to ``setup()``, allowing you to
-   trim back files included via the ``package_data`` and
-   ``include_package_data`` options.
-
- * Fixed ``--tag-svn-revision`` not working when run from a source
-   distribution.
-
- * Added warning for namespace packages with missing ``declare_namespace()``
-
- * Added ``tests_require`` keyword to ``setup()``, so that e.g. packages
-   requiring ``nose`` to run unit tests can make this dependency optional
-   unless the ``test`` command is run.
-
- * Made all commands that use ``easy_install`` respect its configuration
-   options, as this was causing some problems with ``setup.py install``.
-
- * Added an ``unpack_directory()`` driver to ``setuptools.archive_util``, so
-   that you can process a directory tree through a processing filter as if it
-   were a zipfile or tarfile.
-
- * Added an internal ``install_egg_info`` command to use as part of old-style
-   ``install`` operations, that installs an ``.egg-info`` directory with the
-   package.
-
- * Added a ``--single-version-externally-managed`` option to the ``install``
-   command so that you can more easily wrap a "flat" egg in a system package.
-
- * Enhanced ``bdist_rpm`` so that it installs single-version eggs that
-   don't rely on a ``.pth`` file.  The ``--no-egg`` option has been removed,
-   since all RPMs are now built in a more backwards-compatible format.
-
- * Support full roundtrip translation of eggs to and from ``bdist_wininst``
-   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
-   egg in an .exe that will safely install it as an egg (i.e., with metadata
-   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
-   back into an ``.egg`` file or directory and install it as such.
-
-
-0.6a8
- * Fixed some problems building extensions when Pyrex was installed, especially
-   with Python 2.4 and/or packages using SWIG.
-
- * Made ``develop`` command accept all the same options as ``easy_install``,
-   and use the ``easy_install`` command's configuration settings as defaults.
-
- * Made ``egg_info --tag-svn-revision`` fall back to extracting the revision
-   number from ``PKG-INFO`` in case it is being run on a source distribution of
-   a snapshot taken from a Subversion-based project.
-
- * Automatically detect ``.dll``, ``.so`` and ``.dylib`` files that are being
-   installed as data, adding them to ``native_libs.txt`` automatically.
-
- * Fixed some problems with fresh checkouts of projects that don't include
-   ``.egg-info/PKG-INFO`` under revision control and put the project's source
-   code directly in the project directory.  If such a package had any
-   requirements that get processed before the ``egg_info`` command can be run,
-   the setup scripts would fail with a "Missing 'Version:' header and/or
-   PKG-INFO file" error, because the egg runtime interpreted the unbuilt
-   metadata in a directory on ``sys.path`` (i.e. the current directory) as
-   being a corrupted egg.  Setuptools now monkeypatches the distribution
-   metadata cache to pretend that the egg has valid version information, until
-   it has a chance to make it actually be so (via the ``egg_info`` command).
-
-0.6a5
- * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
-
-0.6a3
- * Added ``gui_scripts`` entry point group to allow installing GUI scripts
-   on Windows and other platforms.  (The special handling is only for Windows;
-   other platforms are treated the same as for ``console_scripts``.)
-
-0.6a2
- * Added ``console_scripts`` entry point group to allow installing scripts
-   without the need to create separate script files.  On Windows, console
-   scripts get an ``.exe`` wrapper so you can just type their name.  On other
-   platforms, the scripts are written without a file extension.
-
-0.6a1
- * Added support for building "old-style" RPMs that don't install an egg for
-   the target package, using a ``--no-egg`` option.
-
- * The ``build_ext`` command now works better when using the ``--inplace``
-   option and multiple Python versions.  It now makes sure that all extensions
-   match the current Python version, even if newer copies were built for a
-   different Python version.
-
- * The ``upload`` command no longer attaches an extra ``.zip`` when uploading
-   eggs, as PyPI now supports egg uploads without trickery.
-
- * The ``ez_setup`` script/module now displays a warning before downloading
-   the setuptools egg, and attempts to check the downloaded egg against an
-   internal MD5 checksum table.
-
- * Fixed the ``--tag-svn-revision`` option of ``egg_info`` not finding the
-   latest revision number; it was using the revision number of the directory
-   containing ``setup.py``, not the highest revision number in the project.
-
- * Added ``eager_resources`` setup argument
-
- * The ``sdist`` command now recognizes Subversion "deleted file" entries and
-   does not include them in source distributions.
-
- * ``setuptools`` now embeds itself more thoroughly into the distutils, so that
-   other distutils extensions (e.g. py2exe, py2app) will subclass setuptools'
-   versions of things, rather than the native distutils ones.
-
- * Added ``entry_points`` and ``setup_requires`` arguments to ``setup()``;
-   ``setup_requires`` allows you to automatically find and download packages
-   that are needed in order to *build* your project (as opposed to running it).
-
- * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
-   metadata writers using entry points, so that they can be extended by
-   third-party packages.  See `Creating distutils Extensions`_ above for more
-   details.
-
- * The vestigial ``depends`` command has been removed.  It was never finished
-   or documented, and never would have worked without EasyInstall - which it
-   pre-dated and was never compatible with.
-
-0.5a12
- * The zip-safety scanner now checks for modules that might be used with
-   ``python -m``, and marks them as unsafe for zipping, since Python 2.4 can't
-   handle ``-m`` on zipped modules.
-
-0.5a11
- * Fix breakage of the "develop" command that was caused by the addition of
-   ``--always-unzip`` to the ``easy_install`` command.
-
-0.5a9
- * Include ``svn:externals`` directories in source distributions as well as
-   normal subversion-controlled files and directories.
-
- * Added ``exclude=patternlist`` option to ``setuptools.find_packages()``
-
- * Changed --tag-svn-revision to include an "r" in front of the revision number
-   for better readability.
-
- * Added ability to build eggs without including source files (except for any
-   scripts, of course), using the ``--exclude-source-files`` option to
-   ``bdist_egg``.
-
- * ``setup.py install`` now automatically detects when an "unmanaged" package
-   or module is going to be on ``sys.path`` ahead of a package being installed,
-   thereby preventing the newer version from being imported.  If this occurs,
-   a warning message is output to ``sys.stderr``, but installation proceeds
-   anyway.  The warning message informs the user what files or directories
-   need deleting, and advises them they can also use EasyInstall (with the
-   ``--delete-conflicting`` option) to do it automatically.
-
- * The ``egg_info`` command now adds a ``top_level.txt`` file to the metadata
-   directory that lists all top-level modules and packages in the distribution.
-   This is used by the ``easy_install`` command to find possibly-conflicting
-   "unmanaged" packages when installing the distribution.
-
- * Added ``zip_safe`` and ``namespace_packages`` arguments to ``setup()``.
-   Added package analysis to determine zip-safety if the ``zip_safe`` flag
-   is not given, and advise the author regarding what code might need changing.
-
- * Fixed the swapped ``-d`` and ``-b`` options of ``bdist_egg``.
-
-0.5a8
- * The "egg_info" command now always sets the distribution metadata to "safe"
-   forms of the distribution name and version, so that distribution files will
-   be generated with parseable names (i.e., ones that don't include '-' in the
-   name or version).  Also, this means that if you use the various ``--tag``
-   options of "egg_info", any distributions generated will use the tags in the
-   version, not just egg distributions.
-
- * Added support for defining command aliases in distutils configuration files,
-   under the "[aliases]" section.  To prevent recursion and to allow aliases to
-   call the command of the same name, a given alias can be expanded only once
-   per command-line invocation.  You can define new aliases with the "alias"
-   command, either for the local, global, or per-user configuration.
-
- * Added "rotate" command to delete old distribution files, given a set of
-   patterns to match and the number of files to keep.  (Keeps the most
-   recently-modified distribution files matching each pattern.)
-
- * Added "saveopts" command that saves all command-line options for the current
-   invocation to the local, global, or per-user configuration file.  Useful for
-   setting defaults without having to hand-edit a configuration file.
-
- * Added a "setopt" command that sets a single option in a specified distutils
-   configuration file.
-
-0.5a7
- * Added "upload" support for egg and source distributions, including a bug
-   fix for "upload" and a temporary workaround for lack of .egg support in
-   PyPI.
-
-0.5a6
- * Beefed up the "sdist" command so that if you don't have a MANIFEST.in, it
-   will include all files under revision control (CVS or Subversion) in the
-   current directory, and it will regenerate the list every time you create a
-   source distribution, not just when you tell it to.  This should make the
-   default "do what you mean" more often than the distutils' default behavior
-   did, while still retaining the old behavior in the presence of MANIFEST.in.
-
- * Fixed the "develop" command always updating .pth files, even if you
-   specified ``-n`` or ``--dry-run``.
-
- * Slightly changed the format of the generated version when you use
-   ``--tag-build`` on the "egg_info" command, so that you can make tagged
-   revisions compare *lower* than the version specified in setup.py (e.g. by
-   using ``--tag-build=dev``).
-
-0.5a5
- * Added ``develop`` command to ``setuptools``-based packages.  This command
-   installs an ``.egg-link`` pointing to the package's source directory, and
-   script wrappers that ``execfile()`` the source versions of the package's
-   scripts.  This lets you put your development checkout(s) on sys.path without
-   having to actually install them.  (To uninstall the link, use
-   use ``setup.py develop --uninstall``.)
-
- * Added ``egg_info`` command to ``setuptools``-based packages.  This command
-   just creates or updates the "projectname.egg-info" directory, without
-   building an egg.  (It's used by the ``bdist_egg``, ``test``, and ``develop``
-   commands.)
-
- * Enhanced the ``test`` command so that it doesn't install the package, but
-   instead builds any C extensions in-place, updates the ``.egg-info``
-   metadata, adds the source directory to ``sys.path``, and runs the tests
-   directly on the source.  This avoids an "unmanaged" installation of the
-   package to ``site-packages`` or elsewhere.
-
- * Made ``easy_install`` a standard ``setuptools`` command, moving it from
-   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
-   that if you were importing or extending it, you must now change your imports
-   accordingly.  ``easy_install.py`` is still installed as a script, but not as
-   a module.
-
-0.5a4
- * Setup scripts using setuptools can now list their dependencies directly in
-   the setup.py file, without having to manually create a ``depends.txt`` file.
-   The ``install_requires`` and ``extras_require`` arguments to ``setup()``
-   are used to create a dependencies file automatically.  If you are manually
-   creating ``depends.txt`` right now, please switch to using these setup
-   arguments as soon as practical, because ``depends.txt`` support will be
-   removed in the 0.6 release cycle.  For documentation on the new arguments,
-   see the ``setuptools.dist.Distribution`` class.
-
- * Setup scripts using setuptools now always install using ``easy_install``
-   internally, for ease of uninstallation and upgrading.
-
-0.5a1
- * Added support for "self-installation" bootstrapping.  Packages can now
-   include ``ez_setup.py`` in their source distribution, and add the following
-   to their ``setup.py``, in order to automatically bootstrap installation of
-   setuptools as part of their setup process::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-    from setuptools import setup
-    # etc...
-
-0.4a2
- * Added ``ez_setup.py`` installer/bootstrap script to make initial setuptools
-   installation easier, and to allow distributions using setuptools to avoid
-   having to include setuptools in their source distribution.
-
- * All downloads are now managed by the ``PackageIndex`` class (which is now
-   subclassable and replaceable), so that embedders can more easily override
-   download logic, give download progress reports, etc.  The class has also
-   been moved to the new ``setuptools.package_index`` module.
-
- * The ``Installer`` class no longer handles downloading, manages a temporary
-   directory, or tracks the ``zip_ok`` option.  Downloading is now handled
-   by ``PackageIndex``, and ``Installer`` has become an ``easy_install``
-   command class based on ``setuptools.Command``.
-
- * There is a new ``setuptools.sandbox.run_setup()`` API to invoke a setup
-   script in a directory sandbox, and a new ``setuptools.archive_util`` module
-   with an ``unpack_archive()`` API.  These were split out of EasyInstall to
-   allow reuse by other tools and applications.
-
- * ``setuptools.Command`` now supports reinitializing commands using keyword
-   arguments to set/reset options.  Also, ``Command`` subclasses can now set
-   their ``command_consumes_arguments`` attribute to ``True`` in order to
-   receive an ``args`` option containing the rest of the command line.
-
-0.3a2
- * Added new options to ``bdist_egg`` to allow tagging the egg's version number
-   with a subversion revision number, the current date, or an explicit tag
-   value.  Run ``setup.py bdist_egg --help`` to get more information.
-
- * Misc. bug fixes
-
-0.3a1
- * Initial release.
-
-Mailing List and Bug Tracker
-============================
-
-Please use the `distutils-sig mailing list`_ for questions and discussion about
-setuptools, and the `setuptools bug tracker`_ ONLY for issues you have
-confirmed via the list are actual bugs, and which you have reduced to a minimal
-set of steps to reproduce.
-
-.. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-.. _setuptools bug tracker: http://bugs.python.org/setuptools/
-
diff --git a/docs/using.txt b/docs/using.txt
deleted file mode 100644
index 192f1dc234..0000000000
--- a/docs/using.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-================================
-Using Distribute in your project
-================================
-
-To use Distribute in your project, the recommended way is to ship
-`distribute_setup.py` alongside your `setup.py` script and call 
-it at the very begining of `setup.py` like this::
-
-    from distribute_setup import use_setuptools
-    use_setuptools()
-
-Another way is to add ``Distribute`` in the ``install_requires`` option::
-
-    from setuptools import setup
-
-    setup(...
-          install_requires=['distribute']
-    )
-
-
-XXX to be finished

From f6e12f545d8b358ef90f5e2d69cb0e77d549dad2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Nov 2013 12:38:20 -0500
Subject: [PATCH 3794/8469] Closing distribute branch again.

--HG--
branch : distribute
extra : close : 1

From 60e84ced7d203fd12f5784889aeb80343d33b9b6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 4 Nov 2013 07:43:32 +0100
Subject: [PATCH 3795/8469] Backout d80207d15294.

---
 tests/test_build_py.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 2ce9d4492d..e416edd4a1 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -121,37 +121,6 @@ def test_byte_compile_optimized(self):
         found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
         self.assertEqual(sorted(found), ['boiledeggs.%s.pyo' % imp.get_tag()])
 
-    def test_dir_in_package_data(self):
-        """
-        A directory in package_data should not be added to the filelist.
-        """
-        # See bug 19286
-        sources = self.mkdtemp()
-        pkg_dir = os.path.join(sources, "pkg")
-
-        os.mkdir(pkg_dir)
-        open(os.path.join(pkg_dir, "__init__.py"), "w").close()
-
-        docdir = os.path.join(pkg_dir, "doc")
-        os.mkdir(docdir)
-        open(os.path.join(docdir, "testfile"), "w").close()
-
-        # create the directory that could be incorrectly detected as a file
-        os.mkdir(os.path.join(docdir, 'otherdir'))
-
-        os.chdir(sources)
-        dist = Distribution({"packages": ["pkg"],
-                             "package_data": {"pkg": ["doc/*"]}})
-        # script_name need not exist, it just need to be initialized
-        dist.script_name = os.path.join(sources, "setup.py")
-        dist.script_args = ["build"]
-        dist.parse_command_line()
-
-        try:
-            dist.run_commands()
-        except DistutilsFileError:
-            self.fail("failed package_data when data dir includes a dir")
-
     def test_dont_write_bytecode(self):
         # makes sure byte_compile is not used
         dist = self.create_dist()[1]

From abe7d6ae5236f5d11f76e9f3b8c4665dda6a29f1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 4 Nov 2013 07:43:41 +0100
Subject: [PATCH 3796/8469] Backout 265d369ad3b9.

---
 command/build_py.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index d48eb69900..1371b3d6ff 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -127,8 +127,7 @@ def find_data_files(self, package, src_dir):
             # Each pattern has to be converted to a platform-specific path
             filelist = glob(os.path.join(src_dir, convert_path(pattern)))
             # Files that match more than one pattern are only added once
-            files.extend([fn for fn in filelist if fn not in files
-                and os.path.isfile(fn)])
+            files.extend([fn for fn in filelist if fn not in files])
         return files
 
     def build_package_data(self):

From b5e1e144277c1b90052d1e29451877e599b00fbd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Nov 2013 20:28:18 -0500
Subject: [PATCH 3797/8469] Fix failing test incorrectly merged in b1244046f37a

---
 tests/test_upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_upload.py b/tests/test_upload.py
index c640b2ac6d..7d704cf166 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -117,7 +117,7 @@ def test_upload(self):
         self.assert_(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEquals(self.last_open.req.get_method(), 'POST')
         self.assertEquals(self.last_open.req.get_full_url(),
-                          'http://pypi.python.org/pypi')
+                          'https://pypi.python.org/pypi')
         self.assert_(b'xxx' in self.last_open.req.data)
 
 def test_suite():

From 5f1980bbc9dc1da41e154a2ed0bf988d91c4c7d6 Mon Sep 17 00:00:00 2001
From: Andrew Kuchling <amk@amk.ca>
Date: Fri, 15 Nov 2013 13:01:52 -0500
Subject: [PATCH 3798/8469] Issue #19544 and Issue #6516: Restore support for
 --user and --group parameters to sdist command as found in Python 2.7 and
 originally slated for Python 3.2 but accidentally rolled back as part of the
 distutils2 rollback. Closes Issue #6516.

---
 archive_util.py            | 71 +++++++++++++++++++++++++++++++++++---
 cmd.py                     |  6 ++--
 command/bdist.py           | 13 +++++++
 command/bdist_dumb.py      | 11 +++++-
 command/sdist.py           |  9 ++++-
 tests/test_archive_util.py | 61 +++++++++++++++++++++++++++++++-
 tests/test_sdist.py        | 53 ++++++++++++++++++++++++++++
 7 files changed, 214 insertions(+), 10 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index fcda08e20a..306ef6a838 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -18,15 +18,55 @@
 from distutils.dir_util import mkpath
 from distutils import log
 
-def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
+try:
+    from pwd import getpwnam
+except AttributeError:
+    getpwnam = None
+
+try:
+    from grp import getgrnam
+except AttributeError:
+    getgrnam = None
+
+def _get_gid(name):
+    """Returns a gid, given a group name."""
+    if getgrnam is None or name is None:
+        return None
+    try:
+        result = getgrnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def _get_uid(name):
+    """Returns an uid, given a user name."""
+    if getpwnam is None or name is None:
+        return None
+    try:
+        result = getpwnam(name)
+    except KeyError:
+        result = None
+    if result is not None:
+        return result[2]
+    return None
+
+def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
+                 owner=None, group=None):
     """Create a (possibly compressed) tar file from all the files under
     'base_dir'.
 
     'compress' must be "gzip" (the default), "compress", "bzip2", or None.
-    Both "tar" and the compression utility named by 'compress' must be on
-    the default program search path, so this is probably Unix-specific.
+    (compress will be deprecated in Python 3.2)
+
+    'owner' and 'group' can be used to define an owner and a group for the
+    archive that is being built. If not provided, the current owner and group
+    will be used.
+
     The output tar file will be named 'base_dir' +  ".tar", possibly plus
     the appropriate compression extension (".gz", ".bz2" or ".Z").
+
     Returns the output filename.
     """
     tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
@@ -48,10 +88,23 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0):
     import tarfile  # late import so Python build itself doesn't break
 
     log.info('Creating tar archive')
+
+    uid = _get_uid(owner)
+    gid = _get_gid(group)
+
+    def _set_uid_gid(tarinfo):
+        if gid is not None:
+            tarinfo.gid = gid
+            tarinfo.gname = group
+        if uid is not None:
+            tarinfo.uid = uid
+            tarinfo.uname = owner
+        return tarinfo
+
     if not dry_run:
         tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress])
         try:
-            tar.add(base_dir)
+            tar.add(base_dir, filter=_set_uid_gid)
         finally:
             tar.close()
 
@@ -140,7 +193,7 @@ def check_archive_formats(formats):
     return None
 
 def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
-                 dry_run=0):
+                 dry_run=0, owner=None, group=None):
     """Create an archive file (eg. zip or tar).
 
     'base_name' is the name of the file to create, minus any format-specific
@@ -153,6 +206,9 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     ie. 'base_dir' will be the common prefix of all files and
     directories in the archive.  'root_dir' and 'base_dir' both default
     to the current directory.  Returns the name of the archive file.
+
+    'owner' and 'group' are used when creating a tar archive. By default,
+    uses the current owner and group.
     """
     save_cwd = os.getcwd()
     if root_dir is not None:
@@ -174,6 +230,11 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     func = format_info[0]
     for arg, val in format_info[1]:
         kwargs[arg] = val
+
+    if format != 'zip':
+        kwargs['owner'] = owner
+        kwargs['group'] = group
+
     try:
         filename = func(base_name, base_dir, **kwargs)
     finally:
diff --git a/cmd.py b/cmd.py
index 3ea08101ac..c89d5efc45 100644
--- a/cmd.py
+++ b/cmd.py
@@ -365,9 +365,11 @@ def spawn(self, cmd, search_path=1, level=1):
         from distutils.spawn import spawn
         spawn(cmd, search_path, dry_run=self.dry_run)
 
-    def make_archive(self, base_name, format, root_dir=None, base_dir=None):
+    def make_archive(self, base_name, format, root_dir=None, base_dir=None,
+                     owner=None, group=None):
         return archive_util.make_archive(base_name, format, root_dir, base_dir,
-                                         dry_run=self.dry_run)
+                                         dry_run=self.dry_run,
+                                         owner=owner, group=group)
 
     def make_file(self, infiles, outfile, func, args,
                   exec_msg=None, skip_msg=None, level=1):
diff --git a/command/bdist.py b/command/bdist.py
index 38b169afd1..6814a1c382 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -37,6 +37,12 @@ class bdist(Command):
                      "[default: dist]"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['skip-build']
@@ -77,6 +83,8 @@ def initialize_options(self):
         self.formats = None
         self.dist_dir = None
         self.skip_build = 0
+        self.group = None
+        self.owner = None
 
     def finalize_options(self):
         # have to finalize 'plat_name' before 'bdist_base'
@@ -122,6 +130,11 @@ def run(self):
             if cmd_name not in self.no_format_option:
                 sub_cmd.format = self.formats[i]
 
+            # passing the owner and group names for tar archiving
+            if cmd_name == 'bdist_dumb':
+                sub_cmd.owner = self.owner
+                sub_cmd.group = self.group
+
             # If we're going to need to run this command again, tell it to
             # keep its temporary files around so subsequent runs go faster.
             if cmd_name in commands[i+1:]:
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index eefdfea5ad..4405d12c05 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -33,6 +33,12 @@ class bdist_dumb(Command):
                     ('relative', None,
                      "build the archive using relative paths"
                      "(default: false)"),
+                    ('owner=', 'u',
+                     "Owner name used when creating a tar file"
+                     " [default: current user]"),
+                    ('group=', 'g',
+                     "Group name used when creating a tar file"
+                     " [default: current group]"),
                    ]
 
     boolean_options = ['keep-temp', 'skip-build', 'relative']
@@ -48,6 +54,8 @@ def initialize_options(self):
         self.dist_dir = None
         self.skip_build = None
         self.relative = 0
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.bdist_dir is None:
@@ -101,7 +109,8 @@ def run(self):
 
         # Make the archive
         filename = self.make_archive(pseudoinstall_root,
-                                     self.format, root_dir=archive_root)
+                                     self.format, root_dir=archive_root,
+                                     owner=self.owner, group=self.group)
         if self.distribution.has_ext_modules():
             pyversion = get_python_version()
         else:
diff --git a/command/sdist.py b/command/sdist.py
index 116f67ef9b..7ea3d5fa27 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -74,6 +74,10 @@ def checking_metadata(self):
         ('metadata-check', None,
          "Ensure that all required elements of meta-data "
          "are supplied. Warn if any missing. [default]"),
+        ('owner=', 'u',
+         "Owner name used when creating a tar file [default: current user]"),
+        ('group=', 'g',
+         "Group name used when creating a tar file [default: current group]"),
         ]
 
     boolean_options = ['use-defaults', 'prune',
@@ -113,6 +117,8 @@ def initialize_options(self):
 
         self.archive_files = None
         self.metadata_check = 1
+        self.owner = None
+        self.group = None
 
     def finalize_options(self):
         if self.manifest is None:
@@ -444,7 +450,8 @@ def make_distribution(self):
             self.formats.append(self.formats.pop(self.formats.index('tar')))
 
         for fmt in self.formats:
-            file = self.make_archive(base_name, fmt, base_dir=base_dir)
+            file = self.make_archive(base_name, fmt, base_dir=base_dir,
+                                     owner=self.owner, group=self.group)
             archive_files.append(file)
             self.distribution.dist_files.append(('sdist', '', file))
 
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 1afdd46225..581c0cc841 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -15,6 +15,13 @@
 from distutils.tests import support
 from test.support import check_warnings, run_unittest, patch
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
+
 try:
     import zipfile
     ZIP_SUPPORT = True
@@ -77,7 +84,7 @@ def _make_tarball(self, target_name):
 
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
-                            "Source and target should be on same drive")
+                            "source and target should be on same drive")
 
         base_name = os.path.join(tmpdir2, target_name)
 
@@ -275,6 +282,58 @@ def _breaks(*args, **kw):
         finally:
             del ARCHIVE_FORMATS['xxx']
 
+    def test_make_archive_owner_group(self):
+        # testing make_archive with owner and group, with various combinations
+        # this works even if there's not gid/uid support
+        if UID_GID_SUPPORT:
+            group = grp.getgrgid(0)[0]
+            owner = pwd.getpwuid(0)[0]
+        else:
+            group = owner = 'root'
+
+        base_dir, root_dir, base_name =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'zip', root_dir, base_dir, owner=owner,
+                           group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'zip', root_dir, base_dir)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner=owner, group=group)
+        self.assertTrue(os.path.exists(res))
+
+        res = make_archive(base_name, 'tar', root_dir, base_dir,
+                           owner='kjhkjhkjg', group='oihohoh')
+        self.assertTrue(os.path.exists(res))
+
+    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_tarfile_root_owner(self):
+        tmpdir, tmpdir2, base_name =  self._create_files()
+        old_dir = os.getcwd()
+        os.chdir(tmpdir)
+        group = grp.getgrgid(0)[0]
+        owner = pwd.getpwuid(0)[0]
+        try:
+            archive_name = make_tarball(base_name, 'dist', compress=None,
+                                        owner=owner, group=group)
+        finally:
+            os.chdir(old_dir)
+
+        # check if the compressed tarball was created
+        self.assertTrue(os.path.exists(archive_name))
+
+        # now checks the rights
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
 def test_suite():
     return unittest.makeSuite(ArchiveUtilTestCase)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index e6359d6a8a..6170a48fea 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -14,6 +14,12 @@
 except ImportError:
     ZLIB_SUPPORT = False
 
+try:
+    import grp
+    import pwd
+    UID_GID_SUPPORT = True
+except ImportError:
+    UID_GID_SUPPORT = False
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
@@ -425,6 +431,53 @@ def test_manual_manifest(self):
         self.assertEqual(sorted(filenames), ['fake-1.0', 'fake-1.0/PKG-INFO',
                                              'fake-1.0/README.manual'])
 
+    @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
+    def test_make_distribution_owner_group(self):
+
+        # check if tar and gzip are installed
+        if (find_executable('tar') is None or
+            find_executable('gzip') is None):
+            return
+
+        # now building a sdist
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar and specifying the owner+group
+        cmd.formats = ['gztar']
+        cmd.owner = pwd.getpwuid(0)[0]
+        cmd.group = grp.getgrgid(0)[0]
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, 0)
+                self.assertEquals(member.gid, 0)
+        finally:
+            archive.close()
+
+        # building a sdist again
+        dist, cmd = self.get_cmd()
+
+        # creating a gztar
+        cmd.formats = ['gztar']
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # making sure we have the good rights
+        archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
+        archive = tarfile.open(archive_name)
+        try:
+            for member in archive.getmembers():
+                self.assertEquals(member.uid, os.getuid())
+                self.assertEquals(member.gid, os.getgid())
+        finally:
+            archive.close()
+
 def test_suite():
     return unittest.makeSuite(SDistTestCase)
 

From 53ae4bd7bad05c5717d8b713e57d41e90d47057c Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Fri, 15 Nov 2013 23:08:21 +0100
Subject: [PATCH 3799/8469] Issue #19544 and Issue #6516: quick workaround for
 failing builds

---
 archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 306ef6a838..82046a8ad7 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -20,12 +20,12 @@
 
 try:
     from pwd import getpwnam
-except AttributeError:
+except (ImportError, AttributeError):
     getpwnam = None
 
 try:
     from grp import getgrnam
-except AttributeError:
+except (ImportError, AttributeError):
     getgrnam = None
 
 def _get_gid(name):

From 7c572215c02f83b007a506953969b34d2bb9dd9a Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 15 Nov 2013 23:13:17 +0100
Subject: [PATCH 3800/8469] Issue #19544, #6516: no need to catch
 AttributeError on import pwd/grp

---
 archive_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 82046a8ad7..4470bb0222 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -20,12 +20,12 @@
 
 try:
     from pwd import getpwnam
-except (ImportError, AttributeError):
+except ImportError:
     getpwnam = None
 
 try:
     from grp import getgrnam
-except (ImportError, AttributeError):
+except ImportError:
     getgrnam = None
 
 def _get_gid(name):

From 11857584767cb29d5a3761c9a4ed00793f576164 Mon Sep 17 00:00:00 2001
From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 10 Nov 2013 18:11:00 -0500
Subject: [PATCH 3801/8469] Issue #19544 and Issue #1180: Restore global option
 to ignore  ~/.pydistutils.cfg in Distutils, accidentally removed in backout
 of distutils2 changes.

---
 core.py            |  5 +++--
 dist.py            | 35 ++++++++++++++++++++++++++++++-----
 tests/test_dist.py | 29 +++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/core.py b/core.py
index 91e5132934..c811d5bd9c 100644
--- a/core.py
+++ b/core.py
@@ -128,8 +128,9 @@ class found in 'cmdclass' is used in place of the default, which is
     if _setup_stop_after == "config":
         return dist
 
-    # Parse the command line; any command-line errors are the end user's
-    # fault, so turn them into SystemExit to suppress tracebacks.
+    # Parse the command line and override config files; any
+    # command-line errors are the end user's fault, so turn them into
+    # SystemExit to suppress tracebacks.
     try:
         ok = dist.parse_command_line()
     except DistutilsArgError as msg:
diff --git a/dist.py b/dist.py
index 11a210279e..7eb04bc3f5 100644
--- a/dist.py
+++ b/dist.py
@@ -52,7 +52,9 @@ class Distribution:
                       ('quiet', 'q', "run quietly (turns verbosity off)"),
                       ('dry-run', 'n', "don't actually do anything"),
                       ('help', 'h', "show detailed help message"),
-                     ]
+                      ('no-user-cfg', None,
+                       'ignore pydistutils.cfg in your home directory'),
+    ]
 
     # 'common_usage' is a short (2-3 line) string describing the common
     # usage of the setup script.
@@ -259,6 +261,22 @@ def __init__ (self, attrs=None):
                     else:
                         sys.stderr.write(msg + "\n")
 
+        # no-user-cfg is handled before other command line args
+        # because other args override the config files, and this
+        # one is needed before we can load the config files.
+        # If attrs['script_args'] wasn't passed, assume false.
+        #
+        # This also make sure we just look at the global options
+        self.want_user_cfg = True
+
+        if self.script_args is not None:
+            for arg in self.script_args:
+                if not arg.startswith('-'):
+                    break
+                if arg == '--no-user-cfg':
+                    self.want_user_cfg = False
+                    break
+
         self.finalize_options()
 
     def get_option_dict(self, command):
@@ -310,7 +328,10 @@ def find_config_files(self):
         Distutils installation directory (ie. where the top-level
         Distutils __inst__.py file lives), a file in the user's home
         directory named .pydistutils.cfg on Unix and pydistutils.cfg
-        on Windows/Mac, and setup.cfg in the current directory.
+        on Windows/Mac; and setup.cfg in the current directory.
+
+        The file in the user's home directory can be disabled with the
+        --no-user-cfg option.
         """
         files = []
         check_environ()
@@ -330,15 +351,19 @@ def find_config_files(self):
             user_filename = "pydistutils.cfg"
 
         # And look for the user config file
-        user_file = os.path.join(os.path.expanduser('~'), user_filename)
-        if os.path.isfile(user_file):
-            files.append(user_file)
+        if self.want_user_cfg:
+            user_file = os.path.join(os.path.expanduser('~'), user_filename)
+            if os.path.isfile(user_file):
+                files.append(user_file)
 
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):
             files.append(local_file)
 
+        if DEBUG:
+            self.announce("using config files: %s" % ', '.join(files))
+
         return files
 
     def parse_config_files(self, filenames=None):
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 9a8ca19902..102c553db9 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -39,6 +39,7 @@ def find_config_files(self):
 
 
 class DistributionTestCase(support.LoggingSilencer,
+                           support.TempdirManager,
                            support.EnvironGuard,
                            unittest.TestCase):
 
@@ -213,6 +214,34 @@ def test_announce(self):
         self.assertRaises(ValueError, dist.announce, args, kwargs)
 
 
+    def test_find_config_files_disable(self):
+        # Ticket #1180: Allow user to disable their home config file.
+        temp_home = self.mkdtemp()
+        if os.name == 'posix':
+            user_filename = os.path.join(temp_home, ".pydistutils.cfg")
+        else:
+            user_filename = os.path.join(temp_home, "pydistutils.cfg")
+
+        with open(user_filename, 'w') as f:
+            f.write('[distutils]\n')
+
+        def _expander(path):
+            return temp_home
+
+        old_expander = os.path.expanduser
+        os.path.expanduser = _expander
+        try:
+            d = Distribution()
+            all_files = d.find_config_files()
+
+            d = Distribution(attrs={'script_args': ['--no-user-cfg']})
+            files = d.find_config_files()
+        finally:
+            os.path.expanduser = old_expander
+
+        # make sure --no-user-cfg disables the user cfg file
+        self.assertEquals(len(all_files)-1, len(files))
+
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
 

From 5edd62fecb7444f731574a38a7108e002893dac7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Nov 2013 18:15:03 -0500
Subject: [PATCH 3802/8469] Issue 19544 and Issue #7457: Restore the
 read_pkg_file method to distutils.dist.DistributionMetadata accidentally
 removed in the undo of distutils2.

---
 dist.py            | 90 +++++++++++++++++++++++++++++++++++++---------
 tests/test_dist.py | 29 ++++++++++++++-
 2 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/dist.py b/dist.py
index f7fac08918..11a210279e 100644
--- a/dist.py
+++ b/dist.py
@@ -5,6 +5,7 @@
 """
 
 import sys, os, re
+from email import message_from_file
 
 try:
     import warnings
@@ -999,25 +1000,80 @@ class DistributionMetadata:
                          "provides", "requires", "obsoletes",
                          )
 
-    def __init__ (self):
-        self.name = None
-        self.version = None
-        self.author = None
-        self.author_email = None
+    def __init__(self, path=None):
+        if path is not None:
+            self.read_pkg_file(open(path))
+        else:
+            self.name = None
+            self.version = None
+            self.author = None
+            self.author_email = None
+            self.maintainer = None
+            self.maintainer_email = None
+            self.url = None
+            self.license = None
+            self.description = None
+            self.long_description = None
+            self.keywords = None
+            self.platforms = None
+            self.classifiers = None
+            self.download_url = None
+            # PEP 314
+            self.provides = None
+            self.requires = None
+            self.obsoletes = None
+
+    def read_pkg_file(self, file):
+        """Reads the metadata values from a file object."""
+        msg = message_from_file(file)
+
+        def _read_field(name):
+            value = msg[name]
+            if value == 'UNKNOWN':
+                return None
+            return value
+
+        def _read_list(name):
+            values = msg.get_all(name, None)
+            if values == []:
+                return None
+            return values
+
+        metadata_version = msg['metadata-version']
+        self.name = _read_field('name')
+        self.version = _read_field('version')
+        self.description = _read_field('summary')
+        # we are filling author only.
+        self.author = _read_field('author')
         self.maintainer = None
+        self.author_email = _read_field('author-email')
         self.maintainer_email = None
-        self.url = None
-        self.license = None
-        self.description = None
-        self.long_description = None
-        self.keywords = None
-        self.platforms = None
-        self.classifiers = None
-        self.download_url = None
-        # PEP 314
-        self.provides = None
-        self.requires = None
-        self.obsoletes = None
+        self.url = _read_field('home-page')
+        self.license = _read_field('license')
+
+        if 'download-url' in msg:
+            self.download_url = _read_field('download-url')
+        else:
+            self.download_url = None
+
+        self.long_description = _read_field('description')
+        self.description = _read_field('summary')
+
+        if 'keywords' in msg:
+            self.keywords = _read_field('keywords').split(',')
+
+        self.platforms = _read_list('platform')
+        self.classifiers = _read_list('classifier')
+
+        # PEP 314 - these fields only exist in 1.1
+        if metadata_version == '1.1':
+            self.requires = _read_list('requires')
+            self.provides = _read_list('provides')
+            self.obsoletes = _read_list('obsoletes')
+        else:
+            self.requires = None
+            self.provides = None
+            self.obsoletes = None
 
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 66c20e27e2..9a8ca19902 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,7 +8,7 @@
 
 from unittest import mock
 
-from distutils.dist import Distribution, fix_help_options
+from distutils.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils.cmd import Command
 
 from test.support import TESTFN, captured_stdout, run_unittest
@@ -388,6 +388,33 @@ def test_show_help(self):
         self.assertTrue(output)
 
 
+    def test_read_metadata(self):
+        attrs = {"name": "package",
+                 "version": "1.0",
+                 "long_description": "desc",
+                 "description": "xxx",
+                 "download_url": "http://example.com",
+                 "keywords": ['one', 'two'],
+                 "requires": ['foo']}
+
+        dist = Distribution(attrs)
+        metadata = dist.metadata
+
+        # write it then reloads it
+        PKG_INFO = io.StringIO()
+        metadata.write_pkg_file(PKG_INFO)
+        PKG_INFO.seek(0)
+        metadata.read_pkg_file(PKG_INFO)
+
+        self.assertEquals(metadata.name, "package")
+        self.assertEquals(metadata.version, "1.0")
+        self.assertEquals(metadata.description, "xxx")
+        self.assertEquals(metadata.download_url, 'http://example.com')
+        self.assertEquals(metadata.keywords, ['one', 'two'])
+        self.assertEquals(metadata.platforms, ['UNKNOWN'])
+        self.assertEquals(metadata.obsoletes, None)
+        self.assertEquals(metadata.requires, ['foo'])
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DistributionTestCase))

From 66f3b499473504c130a52d222b827a4413127f12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Nov 2013 18:50:10 -0500
Subject: [PATCH 3803/8469] Issue #19544 and Issue #6286: Restore use of urllib
 over http allowing use of http_proxy for Distutils upload command, a feature
 accidentally lost in the rollback of distutils2.

---
 command/upload.py    | 60 ++++++++++++++++++++---------------------
 tests/test_upload.py | 63 ++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 8b36851d25..d2bc82cea3 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -10,10 +10,9 @@
 import os, io
 import socket
 import platform
-import configparser
-import http.client as httpclient
 from base64 import standard_b64encode
-import urllib.parse
+from urllib.request import urlopen, Request, HTTPError
+from urllib.parse import urlparse
 
 # this keeps compatibility for 2.3 and 2.4
 if sys.version < "2.5":
@@ -66,6 +65,15 @@ def run(self):
             self.upload_file(command, pyversion, filename)
 
     def upload_file(self, command, pyversion, filename):
+        # Makes sure the repository URL is compliant
+        schema, netloc, url, params, query, fragments = \
+            urlparse(self.repository)
+        if params or query or fragments:
+            raise AssertionError("Incompatible url %s" % self.repository)
+
+        if schema not in ('http', 'https'):
+            raise AssertionError("unsupported schema " + schema)
+
         # Sign if requested
         if self.sign:
             gpg_args = ["gpg", "--detach-sign", "-a", filename]
@@ -162,41 +170,31 @@ def upload_file(self, command, pyversion, filename):
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
 
         # build the Request
-        # We can't use urllib since we need to send the Basic
-        # auth right with the first request
-        # TODO(jhylton): Can we fix urllib?
-        schema, netloc, url, params, query, fragments = \
-            urllib.parse.urlparse(self.repository)
-        assert not params and not query and not fragments
-        if schema == 'http':
-            http = httpclient.HTTPConnection(netloc)
-        elif schema == 'https':
-            http = httpclient.HTTPSConnection(netloc)
-        else:
-            raise AssertionError("unsupported schema "+schema)
-
-        data = ''
-        loglevel = log.INFO
+        headers = {'Content-type':
+                        'multipart/form-data; boundary=%s' % boundary,
+                   'Content-length': str(len(body)),
+                   'Authorization': auth}
+
+        request = Request(self.repository, data=body,
+                          headers=headers)
+        # send the data
         try:
-            http.connect()
-            http.putrequest("POST", url)
-            http.putheader('Content-type',
-                           'multipart/form-data; boundary=%s'%boundary)
-            http.putheader('Content-length', str(len(body)))
-            http.putheader('Authorization', auth)
-            http.endheaders()
-            http.send(body)
+            result = urlopen(request)
+            status = result.getcode()
+            reason = result.msg
         except socket.error as e:
             self.announce(str(e), log.ERROR)
             return
+        except HTTPError as e:
+            status = e.code
+            reason = e.msg
 
-        r = http.getresponse()
-        if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
+        if status == 200:
+            self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
+            self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            msg = '\n'.join(('-' * 75, r.read(), '-' * 75))
+            msg = '\n'.join(('-' * 75, result.read(), '-' * 75))
             self.announce(msg, log.INFO)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 4c6464a32e..a474596e33 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,9 +1,9 @@
 """Tests for distutils.command.upload."""
 import os
 import unittest
-import http.client as httpclient
 from test.support import run_unittest
 
+from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
@@ -37,48 +37,37 @@
 [server1]
 username:me
 """
-class Response(object):
-    def __init__(self, status=200, reason='OK'):
-        self.status = status
-        self.reason = reason
 
-class FakeConnection(object):
+class FakeOpen(object):
 
-    def __init__(self):
-        self.requests = []
-        self.headers = []
-        self.body = ''
+    def __init__(self, url):
+        self.url = url
+        if not isinstance(url, str):
+            self.req = url
+        else:
+            self.req = None
+        self.msg = 'OK'
 
-    def __call__(self, netloc):
-        return self
+    def getcode(self):
+        return 200
 
-    def connect(self):
-        pass
-    endheaders = connect
-
-    def putrequest(self, method, url):
-        self.requests.append((method, url))
-
-    def putheader(self, name, value):
-        self.headers.append((name, value))
-
-    def send(self, body):
-        self.body = body
-
-    def getresponse(self):
-        return Response()
 
 class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httpclient.HTTPConnection
-        self.conn = httpclient.HTTPConnection = FakeConnection()
+        self.old_open = upload_mod.urlopen
+        upload_mod.urlopen = self._urlopen
+        self.last_open = None
 
     def tearDown(self):
-        httpclient.HTTPConnection = self.old_class
+        upload_mod.urlopen = self.old_open
         super(uploadTestCase, self).tearDown()
 
+    def _urlopen(self, url):
+        self.last_open = FakeOpen(url)
+        return self.last_open
+
     def test_finalize_options(self):
 
         # new format
@@ -122,14 +111,14 @@ def test_upload(self):
         cmd.ensure_finalized()
         cmd.run()
 
-        # what did we send ?
-        headers = dict(self.conn.headers)
+         # what did we send ?
+        headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
-        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
-        self.assertFalse('\n' in headers['Authorization'])
-
-        self.assertEqual(self.conn.requests, [('POST', '/pypi')])
-        self.assertTrue((b'xxx') in self.conn.body)
+        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertEquals(self.last_open.req.get_method(), 'POST')
+        self.assertEquals(self.last_open.req.get_full_url(),
+                          'http://pypi.python.org/pypi')
+        self.assert_(b'xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 341dbe79bfe1e225ff5a05731eb56e69ac989bce Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Mon, 11 Nov 2013 06:13:54 +0100
Subject: [PATCH 3804/8469] Bump to 3.3.3rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 812d8f35dc..0650dd277a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.3rc1"
+__version__ = "3.3.3rc2"
 #--end constants--

From 303e2b0c71421dc5a0fa03019354124305579fbd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Nov 2013 19:24:07 -0500
Subject: [PATCH 3805/8469] Issue #7408: Forward port limited test from Python
 2.7, fixing failing buildbot tests on BSD-based platforms.

---
 tests/test_sdist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 6170a48fea..280b9bca90 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -471,10 +471,13 @@ def test_make_distribution_owner_group(self):
         # making sure we have the good rights
         archive_name = join(self.tmp_dir, 'dist', 'fake-1.0.tar.gz')
         archive = tarfile.open(archive_name)
+
+        # note that we are not testing the group ownership here
+        # because, depending on the platforms and the container
+        # rights (see #7408)
         try:
             for member in archive.getmembers():
                 self.assertEquals(member.uid, os.getuid())
-                self.assertEquals(member.gid, os.getgid())
         finally:
             archive.close()
 

From ccce5b21bbd52d95a00704f48f6cf3923cad9776 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Nov 2013 19:35:05 -0500
Subject: [PATCH 3806/8469] Use preferred assertEqual form. Correct
 indentation.

---
 tests/test_sdist.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 280b9bca90..164586b784 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -437,7 +437,7 @@ def test_make_distribution_owner_group(self):
 
         # check if tar and gzip are installed
         if (find_executable('tar') is None or
-            find_executable('gzip') is None):
+                find_executable('gzip') is None):
             return
 
         # now building a sdist
@@ -455,8 +455,8 @@ def test_make_distribution_owner_group(self):
         archive = tarfile.open(archive_name)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
+                self.assertEqual(member.uid, 0)
+                self.assertEqual(member.gid, 0)
         finally:
             archive.close()
 
@@ -477,7 +477,7 @@ def test_make_distribution_owner_group(self):
         # rights (see #7408)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, os.getuid())
+                self.assertEqual(member.uid, os.getuid())
         finally:
             archive.close()
 

From 59262e8d7386c303a4f651ade1b5105d2b3e0c3c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Nov 2013 19:38:51 -0500
Subject: [PATCH 3807/8469] Use preferred assertEqual

---
 tests/test_dist.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 102c553db9..b7fd3fbf90 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -240,7 +240,7 @@ def _expander(path):
             os.path.expanduser = old_expander
 
         # make sure --no-user-cfg disables the user cfg file
-        self.assertEquals(len(all_files)-1, len(files))
+        self.assertEqual(len(all_files)-1, len(files))
 
 class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
                        unittest.TestCase):
@@ -435,14 +435,14 @@ def test_read_metadata(self):
         PKG_INFO.seek(0)
         metadata.read_pkg_file(PKG_INFO)
 
-        self.assertEquals(metadata.name, "package")
-        self.assertEquals(metadata.version, "1.0")
-        self.assertEquals(metadata.description, "xxx")
-        self.assertEquals(metadata.download_url, 'http://example.com')
-        self.assertEquals(metadata.keywords, ['one', 'two'])
-        self.assertEquals(metadata.platforms, ['UNKNOWN'])
-        self.assertEquals(metadata.obsoletes, None)
-        self.assertEquals(metadata.requires, ['foo'])
+        self.assertEqual(metadata.name, "package")
+        self.assertEqual(metadata.version, "1.0")
+        self.assertEqual(metadata.description, "xxx")
+        self.assertEqual(metadata.download_url, 'http://example.com')
+        self.assertEqual(metadata.keywords, ['one', 'two'])
+        self.assertEqual(metadata.platforms, ['UNKNOWN'])
+        self.assertEqual(metadata.obsoletes, None)
+        self.assertEqual(metadata.requires, ['foo'])
 
 def test_suite():
     suite = unittest.TestSuite()

From 5960d28f32e53337043371f95c7f349e34024f40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Nov 2013 19:41:57 -0500
Subject: [PATCH 3808/8469] Update more usage of assertEqual

---
 tests/test_archive_util.py | 4 ++--
 tests/test_upload.py       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 581c0cc841..caa0db20b7 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -329,8 +329,8 @@ def test_tarfile_root_owner(self):
         archive = tarfile.open(archive_name)
         try:
             for member in archive.getmembers():
-                self.assertEquals(member.uid, 0)
-                self.assertEquals(member.gid, 0)
+                self.assertEqual(member.uid, 0)
+                self.assertEqual(member.gid, 0)
         finally:
             archive.close()
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 7d704cf166..9a2265eeb8 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -115,9 +115,9 @@ def test_upload(self):
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
         self.assert_(headers['Content-type'].startswith('multipart/form-data'))
-        self.assertEquals(self.last_open.req.get_method(), 'POST')
-        self.assertEquals(self.last_open.req.get_full_url(),
-                          'https://pypi.python.org/pypi')
+        self.assertEqual(self.last_open.req.get_method(), 'POST')
+        expected_url = 'https://pypi.python.org/pypi'
+        self.assertEqual(self.last_open.req.get_full_url(), expected_url)
         self.assert_(b'xxx' in self.last_open.req.data)
 
 def test_suite():

From f169cafe969605899f196b8dfb86b0385e0da5ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2013 10:35:46 -0500
Subject: [PATCH 3809/8469] Issue #19586: Update remaining deprecated
 assertions to their preferred usage.

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

diff --git a/tests/test_upload.py b/tests/test_upload.py
index 9a2265eeb8..8e8ff720ae 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -114,11 +114,11 @@ def test_upload(self):
          # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         expected_url = 'https://pypi.python.org/pypi'
         self.assertEqual(self.last_open.req.get_full_url(), expected_url)
-        self.assert_(b'xxx' in self.last_open.req.data)
+        self.assertTrue(b'xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From ad0f0c5c29e6c8af182a9e72d995d91911cc8349 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2013 10:47:17 -0500
Subject: [PATCH 3810/8469] Correct long line

---
 tests/test_upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_upload.py b/tests/test_upload.py
index 8e8ff720ae..1fcba889b2 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -114,7 +114,8 @@ def test_upload(self):
          # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
-        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
+        content_type = headers['Content-type']
+        self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         expected_url = 'https://pypi.python.org/pypi'
         self.assertEqual(self.last_open.req.get_full_url(), expected_url)

From c0d4c5676e3118c7189a97a555bfb70447276f29 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 17 Nov 2013 00:17:46 +0200
Subject: [PATCH 3811/8469] Issue #19600: Use specific asserts in distutils
 tests.

---
 tests/test_archive_util.py    |  2 +-
 tests/test_bdist_rpm.py       |  4 ++--
 tests/test_bdist_wininst.py   |  2 +-
 tests/test_build_clib.py      |  2 +-
 tests/test_build_ext.py       | 16 ++++++++--------
 tests/test_build_scripts.py   |  8 ++++----
 tests/test_clean.py           |  2 +-
 tests/test_config.py          |  2 +-
 tests/test_config_cmd.py      |  2 +-
 tests/test_install.py         |  2 +-
 tests/test_install_lib.py     |  2 +-
 tests/test_install_scripts.py | 10 +++++-----
 tests/test_msvc9compiler.py   |  6 +++---
 tests/test_register.py        |  8 ++++----
 tests/test_sysconfig.py       |  2 +-
 tests/test_util.py            |  2 +-
 16 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 1afdd46225..d3fb24ad56 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -210,7 +210,7 @@ def test_compress_deprecated(self):
                              dry_run=True)
         finally:
             os.chdir(old_dir)
-        self.assertTrue(not os.path.exists(tarball))
+        self.assertFalse(os.path.exists(tarball))
         self.assertEqual(len(w.warnings), 1)
 
     @unittest.skipUnless(ZIP_SUPPORT and ZLIB_SUPPORT,
diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index b090b79e0c..aa1445d10a 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -81,7 +81,7 @@ def test_quiet(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertIn('foo-0.1-1.noarch.rpm', dist_created)
 
         # bug #2945: upload ignores bdist_rpm files
         self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
@@ -125,7 +125,7 @@ def test_no_optimize_flag(self):
         cmd.run()
 
         dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
-        self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+        self.assertIn('foo-0.1-1.noarch.rpm', dist_created)
 
         # bug #2945: upload ignores bdist_rpm files
         self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index f9e8f89e21..5d17ab19a9 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -22,7 +22,7 @@ def test_get_exe_bytes(self):
         # and make sure it finds it and returns its content
         # no matter what platform we have
         exe_file = cmd.get_exe_bytes()
-        self.assertTrue(len(exe_file) > 10)
+        self.assertGreater(len(exe_file), 10)
 
 def test_suite():
     return unittest.makeSuite(BuildWinInstTestCase)
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index ee1c04162b..c2b981f20e 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -137,7 +137,7 @@ def test_run(self):
         cmd.run()
 
         # let's check the result
-        self.assertTrue('libfoo.a' in os.listdir(build_temp))
+        self.assertIn('libfoo.a', os.listdir(build_temp))
 
 def test_suite():
     return unittest.makeSuite(BuildCLibTestCase)
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 44a9852f4c..3cfaa2c692 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -76,8 +76,8 @@ def test_build_ext(self):
         if support.HAVE_DOCSTRINGS:
             doc = 'This is a template module just for instruction.'
             self.assertEqual(xx.__doc__, doc)
-        self.assertTrue(isinstance(xx.Null(), xx.Null))
-        self.assertTrue(isinstance(xx.Str(), xx.Str))
+        self.assertIsInstance(xx.Null(), xx.Null)
+        self.assertIsInstance(xx.Str(), xx.Str)
 
     def tearDown(self):
         # Get everything back to normal
@@ -110,7 +110,7 @@ def test_solaris_enable_shared(self):
                 _config_vars['Py_ENABLE_SHARED'] = old_var
 
         # make sure we get some library dirs under solaris
-        self.assertTrue(len(cmd.library_dirs) > 0)
+        self.assertGreater(len(cmd.library_dirs), 0)
 
     def test_user_site(self):
         # site.USER_SITE was introduced in 2.6
@@ -124,7 +124,7 @@ def test_user_site(self):
         # making sure the user option is there
         options = [name for name, short, lable in
                    cmd.user_options]
-        self.assertTrue('user' in options)
+        self.assertIn('user', options)
 
         # setting a value
         cmd.user = 1
@@ -171,10 +171,10 @@ def test_finalize_options(self):
 
         from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
-        self.assertTrue(py_include in cmd.include_dirs)
+        self.assertIn(py_include, cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assertTrue(plat_py_include in cmd.include_dirs)
+        self.assertIn(plat_py_include, cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
@@ -255,13 +255,13 @@ def test_check_extensions_list(self):
                              'some': 'bar'})]
         cmd.check_extensions_list(exts)
         ext = exts[0]
-        self.assertTrue(isinstance(ext, Extension))
+        self.assertIsInstance(ext, Extension)
 
         # check_extensions_list adds in ext the values passed
         # when they are in ('include_dirs', 'library_dirs', 'libraries'
         # 'extra_objects', 'extra_compile_args', 'extra_link_args')
         self.assertEqual(ext.libraries, 'foo')
-        self.assertTrue(not hasattr(ext, 'some'))
+        self.assertFalse(hasattr(ext, 'some'))
 
         # 'macros' element of build info dict must be 1- or 2-tuple
         exts = [('foo.bar', {'sources': [''], 'libraries': 'foo',
diff --git a/tests/test_build_scripts.py b/tests/test_build_scripts.py
index e3326b8517..954fc76398 100644
--- a/tests/test_build_scripts.py
+++ b/tests/test_build_scripts.py
@@ -17,8 +17,8 @@ class BuildScriptsTestCase(support.TempdirManager,
 
     def test_default_settings(self):
         cmd = self.get_build_scripts_cmd("/foo/bar", [])
-        self.assertTrue(not cmd.force)
-        self.assertTrue(cmd.build_dir is None)
+        self.assertFalse(cmd.force)
+        self.assertIsNone(cmd.build_dir)
 
         cmd.finalize_options()
 
@@ -38,7 +38,7 @@ def test_build(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assertTrue(name in built)
+            self.assertIn(name, built)
 
     def get_build_scripts_cmd(self, target, scripts):
         import sys
@@ -103,7 +103,7 @@ def test_version_int(self):
 
         built = os.listdir(target)
         for name in expected:
-            self.assertTrue(name in built)
+            self.assertIn(name, built)
 
 def test_suite():
     return unittest.makeSuite(BuildScriptsTestCase)
diff --git a/tests/test_clean.py b/tests/test_clean.py
index eb8958bff5..b64f300a04 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -36,7 +36,7 @@ def test_simple_run(self):
 
         # make sure the files where removed
         for name, path in dirs:
-            self.assertTrue(not os.path.exists(path),
+            self.assertFalse(os.path.exists(path),
                          '%s was not removed' % path)
 
         # let's run the command again (should spit warnings but succeed)
diff --git a/tests/test_config.py b/tests/test_config.py
index 525bee9416..0e8d65e271 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -103,7 +103,7 @@ def test_server_registration(self):
     def test_server_empty_registration(self):
         cmd = self._cmd(self.dist)
         rc = cmd._get_rc_file()
-        self.assertTrue(not os.path.exists(rc))
+        self.assertFalse(os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
         f = open(rc)
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index e2e6e4ebaa..79894c78d3 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -81,7 +81,7 @@ def test_clean(self):
         cmd._clean(f1, f2)
 
         for f in (f1, f2):
-            self.assertTrue(not os.path.exists(f))
+            self.assertFalse(os.path.exists(f))
 
 def test_suite():
     return unittest.makeSuite(ConfigTestCase)
diff --git a/tests/test_install.py b/tests/test_install.py
index b1901273e9..ede88e5d90 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -236,7 +236,7 @@ def test_debug_mode(self):
                 self.test_record()
         finally:
             install_module.DEBUG = False
-        self.assertTrue(len(self.logs) > old_logs_len)
+        self.assertGreater(len(self.logs), old_logs_len)
 
 
 def test_suite():
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 2bd4dc6e96..d0dfca00d7 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -103,7 +103,7 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
+        self.assertIn('byte-compiling is disabled', self.logs[0][1])
 
 
 def test_suite():
diff --git a/tests/test_install_scripts.py b/tests/test_install_scripts.py
index 8952e744e5..1f7b1038cb 100644
--- a/tests/test_install_scripts.py
+++ b/tests/test_install_scripts.py
@@ -24,10 +24,10 @@ def test_default_settings(self):
             skip_build=1,
             )
         cmd = install_scripts(dist)
-        self.assertTrue(not cmd.force)
-        self.assertTrue(not cmd.skip_build)
-        self.assertTrue(cmd.build_dir is None)
-        self.assertTrue(cmd.install_dir is None)
+        self.assertFalse(cmd.force)
+        self.assertFalse(cmd.skip_build)
+        self.assertIsNone(cmd.build_dir)
+        self.assertIsNone(cmd.install_dir)
 
         cmd.finalize_options()
 
@@ -72,7 +72,7 @@ def write_script(name, text):
 
         installed = os.listdir(target)
         for name in expected:
-            self.assertTrue(name in installed)
+            self.assertIn(name, installed)
 
 
 def test_suite():
diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 301d43d20c..5e18c61360 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -128,7 +128,7 @@ def test_reg_class(self):
         # windows registeries versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
-        self.assertTrue(v in ('0', '1', '2'))
+        self.assertIn(v, ('0', '1', '2'))
 
         import winreg
         HKCU = winreg.HKEY_CURRENT_USER
@@ -136,7 +136,7 @@ def test_reg_class(self):
         self.assertEqual(keys, None)
 
         keys = Reg.read_keys(HKCU, r'Control Panel')
-        self.assertTrue('Desktop' in keys)
+        self.assertIn('Desktop', keys)
 
     def test_remove_visual_c_ref(self):
         from distutils.msvc9compiler import MSVCCompiler
@@ -174,7 +174,7 @@ def test_remove_entire_manifest(self):
 
         compiler = MSVCCompiler()
         got = compiler._remove_visual_c_ref(manifest)
-        self.assertIs(got, None)
+        self.assertIsNone(got)
 
 
 def test_suite():
diff --git a/tests/test_register.py b/tests/test_register.py
index a86b8606e4..f4efa13d78 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -98,7 +98,7 @@ def test_create_pypirc(self):
         cmd = self._get_cmd()
 
         # we shouldn't have a .pypirc file yet
-        self.assertTrue(not os.path.exists(self.rc))
+        self.assertFalse(os.path.exists(self.rc))
 
         # patching input and getpass.getpass
         # so register gets happy
@@ -145,7 +145,7 @@ def _no_way(prompt=''):
 
         self.assertEqual(req1['Content-length'], '1374')
         self.assertEqual(req2['Content-length'], '1374')
-        self.assertTrue((b'xxx') in self.conn.reqs[1].data)
+        self.assertIn(b'xxx', self.conn.reqs[1].data)
 
     def test_password_not_in_file(self):
 
@@ -175,7 +175,7 @@ def test_registering(self):
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '608')
-        self.assertTrue((b'tarek') in req.data)
+        self.assertIn(b'tarek', req.data)
 
     def test_password_reset(self):
         # this test runs choice 3
@@ -193,7 +193,7 @@ def test_password_reset(self):
         req = self.conn.reqs[0]
         headers = dict(req.headers)
         self.assertEqual(headers['Content-length'], '290')
-        self.assertTrue((b'tarek') in req.data)
+        self.assertIn(b'tarek', req.data)
 
     @unittest.skipUnless(docutils is not None, 'needs docutils')
     def test_strict(self):
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 826ea4247d..07812d80fc 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -50,7 +50,7 @@ def test_get_python_inc(self):
 
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()
-        self.assertTrue(isinstance(cvars, dict))
+        self.assertIsInstance(cvars, dict)
         self.assertTrue(cvars)
 
     def test_srcdir(self):
diff --git a/tests/test_util.py b/tests/test_util.py
index eac9b5141d..00219cfdba 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -266,7 +266,7 @@ def test_strtobool(self):
             self.assertTrue(strtobool(y))
 
         for n in no:
-            self.assertTrue(not strtobool(n))
+            self.assertFalse(strtobool(n))
 
     def test_rfc822_escape(self):
         header = 'I am a\npoor\nlonesome\nheader\n'

From ab27da2853e1eb770873803bd6a8008e612ac796 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 17 Nov 2013 07:58:22 +0100
Subject: [PATCH 3812/8469] Bump to 3.3.3 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 0650dd277a..6747ab8677 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.3rc2"
+__version__ = "3.3.3"
 #--end constants--

From b1290f15cc21206e9b16c91fa45cf4451137f732 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 22 Nov 2013 15:31:35 -0500
Subject: [PATCH 3813/8469] Issue 19555 for distutils, plus a little clean up
 (pyflakes, line lengths).

---
 sysconfig.py            |  8 ++++++++
 tests/test_sysconfig.py | 45 ++++++++++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d9c9d65818..392d63d1d9 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -518,6 +518,11 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
+        # For backward compatibility, see issue19555
+        SO = _config_vars.get('EXT_SUFFIX')
+        if SO is not None:
+            _config_vars['SO'] = SO
+
         # Always convert srcdir to an absolute path
         srcdir = _config_vars.get('srcdir', project_base)
         if os.name == 'posix':
@@ -568,4 +573,7 @@ def get_config_var(name):
     returned by 'get_config_vars()'.  Equivalent to
     get_config_vars().get(name)
     """
+    if name == 'SO':
+        import warnings
+        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning)
     return get_config_vars().get(name)
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 07812d80fc..e14646edf7 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,7 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
 import shutil
-import test
 import unittest
 
 from distutils import sysconfig
@@ -9,8 +8,7 @@
 from distutils.tests import support
 from test.support import TESTFN, run_unittest
 
-class SysconfigTestCase(support.EnvironGuard,
-                        unittest.TestCase):
+class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     def setUp(self):
         super(SysconfigTestCase, self).setUp()
         self.makefile = None
@@ -32,7 +30,6 @@ def test_get_config_h_filename(self):
         self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_python_lib(self):
-        lib_dir = sysconfig.get_python_lib()
         # XXX doesn't work on Linux when Python was never installed before
         #self.assertTrue(os.path.isdir(lib_dir), lib_dir)
         # test for pythonxx.lib?
@@ -67,8 +64,9 @@ def test_srcdir(self):
             self.assertTrue(os.path.exists(Python_h), Python_h)
             self.assertTrue(sysconfig._is_python_source_dir(srcdir))
         elif os.name == 'posix':
-            self.assertEqual(os.path.dirname(sysconfig.get_makefile_filename()),
-                                 srcdir)
+            self.assertEqual(
+                os.path.dirname(sysconfig.get_makefile_filename()),
+                srcdir)
 
     def test_srcdir_independent_of_cwd(self):
         # srcdir should be independent of the current working directory
@@ -129,10 +127,13 @@ def test_parse_makefile_literal_dollar(self):
 
     def test_sysconfig_module(self):
         import sysconfig as global_sysconfig
-        self.assertEqual(global_sysconfig.get_config_var('CFLAGS'), sysconfig.get_config_var('CFLAGS'))
-        self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'), sysconfig.get_config_var('LDFLAGS'))
+        self.assertEqual(global_sysconfig.get_config_var('CFLAGS'),
+                         sysconfig.get_config_var('CFLAGS'))
+        self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'),
+                         sysconfig.get_config_var('LDFLAGS'))
 
-    @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),'compiler flags customized')
+    @unittest.skipIf(sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'),
+                     'compiler flags customized')
     def test_sysconfig_compiler_vars(self):
         # On OS X, binary installers support extension module building on
         # various levels of the operating system with differing Xcode
@@ -151,9 +152,29 @@ def test_sysconfig_compiler_vars(self):
         import sysconfig as global_sysconfig
         if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
             return
-        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
-        self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
-
+        self.assertEqual(global_sysconfig.get_config_var('LDSHARED'),
+                         sysconfig.get_config_var('LDSHARED'))
+        self.assertEqual(global_sysconfig.get_config_var('CC'),
+                         sysconfig.get_config_var('CC'))
+
+    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
+                     'EXT_SUFFIX required for this test')
+    def test_SO_deprecation(self):
+        self.assertWarns(DeprecationWarning,
+                         sysconfig.get_config_var, 'SO')
+
+    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
+                     'EXT_SUFFIX required for this test')
+    def test_SO_value(self):
+        self.assertEqual(sysconfig.get_config_var('SO'),
+                         sysconfig.get_config_var('EXT_SUFFIX'))
+
+    @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
+                     'EXT_SUFFIX required for this test')
+    def test_SO_in_vars(self):
+        vars = sysconfig.get_config_vars()
+        self.assertIsNotNone(vars['SO'])
+        self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
 
 def test_suite():

From 58403d4abc8fdef0ff3b0fc9bb14c203cfd17349 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 24 Nov 2013 06:59:35 -0800
Subject: [PATCH 3814/8469] Bump version number to 3.4.0b1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 355542edd0..38a50869ea 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0a4"
+__version__ = "3.4.0b1"
 #--end constants--

From 4f57b30b05e31f7a12d2411a99d0faeb6e669196 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 26 Nov 2013 17:08:24 +0200
Subject: [PATCH 3815/8469] Issue #19760: Silence sysconfig's 'SO' key
 deprecation warnings in tests. Change stacklevel in warnings.warn() for 'SO'
 key to 2.

---
 sysconfig.py            | 2 +-
 tests/test_sysconfig.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 392d63d1d9..75537db8d0 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -575,5 +575,5 @@ def get_config_var(name):
     """
     if name == 'SO':
         import warnings
-        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning)
+        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2)
     return get_config_vars().get(name)
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index e14646edf7..b5fdc98dc9 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -6,7 +6,7 @@
 from distutils import sysconfig
 from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
-from test.support import TESTFN, run_unittest
+from test.support import TESTFN, run_unittest, check_warnings
 
 class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     def setUp(self):
@@ -166,8 +166,9 @@ def test_SO_deprecation(self):
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')
     def test_SO_value(self):
-        self.assertEqual(sysconfig.get_config_var('SO'),
-                         sysconfig.get_config_var('EXT_SUFFIX'))
+        with check_warnings(('', DeprecationWarning)):
+            self.assertEqual(sysconfig.get_config_var('SO'),
+                             sysconfig.get_config_var('EXT_SUFFIX'))
 
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')

From aad9a7feb8d3ce64a6ea07e76044777303d62be3 Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 3 Dec 2013 13:55:20 +0100
Subject: [PATCH 3816/8469] Issue #9709: Stop adding PyInit_" + module_name' to
 export_symbols.  This is already done by PyMODINIT_FUNC.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 80689b6357..9be592370a 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -538,7 +538,7 @@ def build_extension(self, ext):
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
             extra_postargs=extra_args,
-            export_symbols=self.get_export_symbols(ext),
+            export_symbols=ext.export_symbols,
             debug=self.debug,
             build_temp=self.build_temp,
             target_lang=language)

From 89924f9e965ce58b5ceab3545989e6d827931d2f Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 18 Dec 2013 16:41:01 +0200
Subject: [PATCH 3817/8469] Issue #19492: Silently skipped distutils tests now
 reported as skipped.

---
 tests/test_bdist_rpm.py     | 40 ++++++++++++++++---------------------
 tests/test_build_clib.py    |  7 ++-----
 tests/test_build_ext.py     |  8 ++------
 tests/test_check.py         |  6 ++----
 tests/test_config_cmd.py    |  3 +--
 tests/test_sdist.py         | 10 ++++------
 tests/test_sysconfig.py     |  9 +++------
 tests/test_unixccompiler.py |  6 +-----
 8 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index aa1445d10a..bcbb5633e8 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -43,18 +43,15 @@ def tearDown(self):
         sys.argv[:] = self.old_sys_argv[1]
         super(BuildRpmTestCase, self).tearDown()
 
+    # XXX I am unable yet to make this test work without
+    # spurious sdtout/stderr output under Mac OS X
+    @unittest.skipUnless(sys.platform.startswith('linux'),
+                         'spurious sdtout/stderr output under Mac OS X')
+    @unittest.skipIf(find_executable('rpm') is None,
+                     'the rpm command is not found')
+    @unittest.skipIf(find_executable('rpmbuild') is None,
+                     'the rpmbuild command is not found')
     def test_quiet(self):
-
-        # XXX I am unable yet to make this test work without
-        # spurious sdtout/stderr output under Mac OS X
-        if not sys.platform.startswith('linux'):
-            return
-
-        # this test will run only if the rpm commands are found
-        if (find_executable('rpm') is None or
-            find_executable('rpmbuild') is None):
-            return
-
         # let's create a package
         tmp_dir = self.mkdtemp()
         pkg_dir = os.path.join(tmp_dir, 'foo')
@@ -87,19 +84,16 @@ def test_quiet(self):
         self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
         self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
 
+    # XXX I am unable yet to make this test work without
+    # spurious sdtout/stderr output under Mac OS X
+    @unittest.skipUnless(sys.platform.startswith('linux'),
+                         'spurious sdtout/stderr output under Mac OS X')
+    # http://bugs.python.org/issue1533164
+    @unittest.skipIf(find_executable('rpm') is None,
+                     'the rpm command is not found')
+    @unittest.skipIf(find_executable('rpmbuild') is None,
+                     'the rpmbuild command is not found')
     def test_no_optimize_flag(self):
-
-        # XXX I am unable yet to make this test work without
-        # spurious sdtout/stderr output under Mac OS X
-        if not sys.platform.startswith('linux'):
-            return
-
-        # http://bugs.python.org/issue1533164
-        # this test will run only if the rpm command is found
-        if (find_executable('rpm') is None or
-            find_executable('rpmbuild') is None):
-            return
-
         # let's create a package that brakes bdist_rpm
         tmp_dir = self.mkdtemp()
         pkg_dir = os.path.join(tmp_dir, 'foo')
diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index c2b981f20e..acc99e78c1 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -102,11 +102,8 @@ def test_finalize_options(self):
         cmd.distribution.libraries = 'WONTWORK'
         self.assertRaises(DistutilsSetupError, cmd.finalize_options)
 
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_run(self):
-        # can't test on windows
-        if sys.platform == 'win32':
-            return
-
         pkg_dir, dist = self.create_dist()
         cmd = build_clib(dist)
 
@@ -131,7 +128,7 @@ def test_run(self):
             if ccmd is None:
                 continue
             if find_executable(ccmd[0]) is None:
-                return # can't test
+                self.skipTest('The %r command is not found' % ccmd[0])
 
         # this should work
         cmd.run()
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 3cfaa2c692..9853abd4c5 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -61,9 +61,9 @@ def test_build_ext(self):
             sys.stdout = old_stdout
 
         if ALREADY_TESTED:
-            return
+            self.skipTest('Already tested in %s' % ALREADY_TESTED)
         else:
-            ALREADY_TESTED = True
+            ALREADY_TESTED = type(self).__name__
 
         import xx
 
@@ -113,10 +113,6 @@ def test_solaris_enable_shared(self):
         self.assertGreater(len(cmd.library_dirs), 0)
 
     def test_user_site(self):
-        # site.USER_SITE was introduced in 2.6
-        if sys.version < '2.6':
-            return
-
         import site
         dist = Distribution({'name': 'xx'})
         cmd = build_ext(dist)
diff --git a/tests/test_check.py b/tests/test_check.py
index 4de64734c4..601b68686b 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -55,9 +55,8 @@ def test_check_metadata(self):
         cmd = self._run(metadata)
         self.assertEqual(cmd._warnings, 0)
 
+    @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
     def test_check_document(self):
-        if not HAS_DOCUTILS: # won't test without docutils
-            return
         pkg_info, dist = self.create_dist()
         cmd = check(dist)
 
@@ -71,9 +70,8 @@ def test_check_document(self):
         msgs = cmd._check_rst_data(rest)
         self.assertEqual(len(msgs), 0)
 
+    @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
     def test_check_restructuredtext(self):
-        if not HAS_DOCUTILS: # won't test without docutils
-            return
         # let's see if it detects broken rest in long_description
         broken_rest = 'title\n===\n\ntest'
         pkg_info, dist = self.create_dist(long_description=broken_rest)
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 79894c78d3..0c8dbd8269 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -37,9 +37,8 @@ def test_dump_file(self):
         dump_file(this_file, 'I am the header')
         self.assertEqual(len(self._logs), numlines+1)
 
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_search_cpp(self):
-        if sys.platform == 'win32':
-            return
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
 
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index e6359d6a8a..c952406131 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -125,13 +125,11 @@ def test_prune_file_list(self):
         self.assertEqual(len(content), 4)
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    @unittest.skipIf(find_executable('tar') is None,
+                     "The tar command is not found")
+    @unittest.skipIf(find_executable('gzip') is None,
+                     "The gzip command is not found")
     def test_make_distribution(self):
-
-        # check if tar and gzip are installed
-        if (find_executable('tar') is None or
-            find_executable('gzip') is None):
-            return
-
         # now building a sdist
         dist, cmd = self.get_cmd()
 
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 07812d80fc..a1cb47d87c 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -82,12 +82,9 @@ def test_srcdir_independent_of_cwd(self):
             os.chdir(cwd)
         self.assertEqual(srcdir, srcdir2)
 
+    @unittest.skipUnless(get_default_compiler() == 'unix',
+                         'not testing if default compiler is not unix')
     def test_customize_compiler(self):
-
-        # not testing if default compiler is not unix
-        if get_default_compiler() != 'unix':
-            return
-
         os.environ['AR'] = 'my_ar'
         os.environ['ARFLAGS'] = '-arflags'
 
@@ -150,7 +147,7 @@ def test_sysconfig_compiler_vars(self):
 
         import sysconfig as global_sysconfig
         if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
-            return
+            self.skipTest('compiler flags customized')
         self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED'))
         self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC'))
 
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index a5a63fdde3..3d14e12aa9 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -21,12 +21,8 @@ def tearDown(self):
         sys.platform = self._backup_platform
         sysconfig.get_config_var = self._backup_get_config_var
 
+    @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_runtime_libdir_option(self):
-
-        # not tested under windows
-        if sys.platform == 'win32':
-            return
-
         # Issue#5900
         #
         # Ensure RUNPATH is added to extension modules with RPATH if

From 3beec05fa08399627b01eedec1555c8c697f4fdf Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 21 Dec 2013 22:19:46 +0100
Subject: [PATCH 3818/8469] Fix DeprecationWarnings in test suite

---
 tests/test_dist.py   | 16 ++++++++--------
 tests/test_upload.py | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/test_dist.py b/tests/test_dist.py
index 9a8ca19902..61ac57d230 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -406,14 +406,14 @@ def test_read_metadata(self):
         PKG_INFO.seek(0)
         metadata.read_pkg_file(PKG_INFO)
 
-        self.assertEquals(metadata.name, "package")
-        self.assertEquals(metadata.version, "1.0")
-        self.assertEquals(metadata.description, "xxx")
-        self.assertEquals(metadata.download_url, 'http://example.com')
-        self.assertEquals(metadata.keywords, ['one', 'two'])
-        self.assertEquals(metadata.platforms, ['UNKNOWN'])
-        self.assertEquals(metadata.obsoletes, None)
-        self.assertEquals(metadata.requires, ['foo'])
+        self.assertEqual(metadata.name, "package")
+        self.assertEqual(metadata.version, "1.0")
+        self.assertEqual(metadata.description, "xxx")
+        self.assertEqual(metadata.download_url, 'http://example.com')
+        self.assertEqual(metadata.keywords, ['one', 'two'])
+        self.assertEqual(metadata.platforms, ['UNKNOWN'])
+        self.assertEqual(metadata.obsoletes, None)
+        self.assertEqual(metadata.requires, ['foo'])
 
 def test_suite():
     suite = unittest.TestSuite()
diff --git a/tests/test_upload.py b/tests/test_upload.py
index a474596e33..df35b429d2 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -114,11 +114,11 @@ def test_upload(self):
          # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
-        self.assertEquals(self.last_open.req.get_method(), 'POST')
-        self.assertEquals(self.last_open.req.get_full_url(),
-                          'http://pypi.python.org/pypi')
-        self.assert_(b'xxx' in self.last_open.req.data)
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertEqual(self.last_open.req.get_method(), 'POST')
+        self.assertEqual(self.last_open.req.get_full_url(),
+                         'http://pypi.python.org/pypi')
+        self.assertIn(b'xxx', self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From c2c0846c8840e37fe93fc8bed174801e6799db7e Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 21 Dec 2013 22:57:56 +0100
Subject: [PATCH 3819/8469] Issue #20045: Fix "setup.py register
 --list-classifiers".

---
 command/register.py    |  5 ++++-
 tests/support.py       |  7 ++++---
 tests/test_register.py | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/command/register.py b/command/register.py
index 99545affa4..9b39ed36aa 100644
--- a/command/register.py
+++ b/command/register.py
@@ -5,6 +5,7 @@
 
 # created 2002/10/21, Richard Jones
 
+import cgi
 import os, string, getpass
 import io
 import urllib.parse, urllib.request
@@ -87,7 +88,9 @@ def classifiers(self):
         '''
         url = self.repository+'?:action=list_classifiers'
         response = urllib.request.urlopen(url)
-        log.info(response.read())
+        content_type = response.getheader('content-type', 'text/plain')
+        encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
+        log.info(response.read().decode(encoding))
 
     def verify_metadata(self):
         ''' Send the metadata to the package index server to be checked.
diff --git a/tests/support.py b/tests/support.py
index 84d9232328..71ad4f42b2 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -32,14 +32,15 @@ def tearDown(self):
     def _log(self, level, msg, args):
         if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
             raise ValueError('%s wrong log level' % str(level))
+        if not isinstance(msg, str):
+            raise TypeError("msg should be str, not '%.200s'"
+                            % (type(msg).__name__))
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):
         def _format(msg, args):
-            if len(args) == 0:
-                return msg
             return msg % args
-        return [_format(msg, args) for level, msg, args
+        return [msg % args for level, msg, args
                 in self.logs if level in levels]
 
     def clear_logs(self):
diff --git a/tests/test_register.py b/tests/test_register.py
index f4efa13d78..8bcc85851a 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -10,6 +10,7 @@
 from distutils.command import register as register_module
 from distutils.command.register import register
 from distutils.errors import DistutilsSetupError
+from distutils.log import INFO
 
 from distutils.tests.test_config import PyPIRCCommandTestCase
 
@@ -58,12 +59,18 @@ def __init__(self):
     def __call__(self, *args):
         return self
 
-    def open(self, req):
+    def open(self, req, data=None, timeout=None):
         self.reqs.append(req)
         return self
 
     def read(self):
-        return 'xxx'
+        return b'xxx'
+
+    def getheader(self, name, default=None):
+        return {
+            'content-type': 'text/plain; charset=utf-8',
+            }.get(name.lower(), default)
+
 
 class RegisterTestCase(PyPIRCCommandTestCase):
 
@@ -285,6 +292,14 @@ def test_check_metadata_deprecated(self):
             cmd.check_metadata()
             self.assertEqual(len(w.warnings), 1)
 
+    def test_list_classifiers(self):
+        cmd = self._get_cmd()
+        cmd.list_classifiers = 1
+        cmd.run()
+        results = self.get_logs(INFO)
+        self.assertEqual(results, ['running check', 'xxx'])
+
+
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
 

From 17a7b8192a8fcba2649854c844ae22fa0f512085 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 22 Dec 2013 00:44:01 +0100
Subject: [PATCH 3820/8469] Fix urllib.request.build_opener mocking in
 test_distutils (should fix some random buildbot failures)

---
 tests/test_register.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_register.py b/tests/test_register.py
index 8bcc85851a..6180133994 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -81,11 +81,13 @@ def setUp(self):
         def _getpass(prompt):
             return 'password'
         getpass.getpass = _getpass
+        urllib.request._opener = None
         self.old_opener = urllib.request.build_opener
         self.conn = urllib.request.build_opener = FakeOpener()
 
     def tearDown(self):
         getpass.getpass = self._old_getpass
+        urllib.request._opener = None
         urllib.request.build_opener = self.old_opener
         super(RegisterTestCase, self).tearDown()
 

From 9f4a8134cd20941bd90e6419948c7bdc83475ad0 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 22 Dec 2013 01:35:53 +0100
Subject: [PATCH 3821/8469] Issue #12226: HTTPS is now used by default when
 connecting to PyPI.

---
 config.py            | 2 +-
 tests/test_config.py | 4 ++--
 tests/test_upload.py | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.py b/config.py
index 1fd53346e9..a97635f2c0 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
     """Base command that knows how to handle the .pypirc file
     """
-    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
     DEFAULT_REALM = 'pypi'
     repository = None
     realm = None
diff --git a/tests/test_config.py b/tests/test_config.py
index 525bee9416..12593610aa 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -87,7 +87,7 @@ def test_server_registration(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('repository', 'https://pypi.python.org/pypi'),
                   ('server', 'server1'), ('username', 'me')]
         self.assertEqual(config, waited)
 
@@ -96,7 +96,7 @@ def test_server_registration(self):
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'http://pypi.python.org/pypi'),
+                  ('repository', 'https://pypi.python.org/pypi'),
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEqual(config, waited)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 4c6464a32e..d2696866fe 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -72,11 +72,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()
-        self.old_class = httpclient.HTTPConnection
-        self.conn = httpclient.HTTPConnection = FakeConnection()
+        self.old_class = httpclient.HTTPSConnection
+        self.conn = httpclient.HTTPSConnection = FakeConnection()
 
     def tearDown(self):
-        httpclient.HTTPConnection = self.old_class
+        httpclient.HTTPSConnection = self.old_class
         super(uploadTestCase, self).tearDown()
 
     def test_finalize_options(self):
@@ -88,7 +88,7 @@ def test_finalize_options(self):
         cmd.finalize_options()
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
-                             ('repository', 'http://pypi.python.org/pypi')):
+                             ('repository', 'https://pypi.python.org/pypi')):
             self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):

From a9d129418d7569a12e225e130711524a89868eca Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 22 Dec 2013 18:13:51 +0100
Subject: [PATCH 3822/8469] Fix TypeError on "setup.py upload --show-response".

---
 command/register.py  |  5 +----
 command/upload.py    |  3 ++-
 config.py            |  7 +++++++
 tests/test_upload.py | 17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/command/register.py b/command/register.py
index 9b39ed36aa..55656c2353 100644
--- a/command/register.py
+++ b/command/register.py
@@ -5,7 +5,6 @@
 
 # created 2002/10/21, Richard Jones
 
-import cgi
 import os, string, getpass
 import io
 import urllib.parse, urllib.request
@@ -88,9 +87,7 @@ def classifiers(self):
         '''
         url = self.repository+'?:action=list_classifiers'
         response = urllib.request.urlopen(url)
-        content_type = response.getheader('content-type', 'text/plain')
-        encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
-        log.info(response.read().decode(encoding))
+        log.info(self._read_pypi_response(response))
 
     def verify_metadata(self):
         ''' Send the metadata to the package index server to be checked.
diff --git a/command/upload.py b/command/upload.py
index d2bc82cea3..e30c189791 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -196,5 +196,6 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Upload failed (%s): %s' % (status, reason),
                           log.ERROR)
         if self.show_response:
-            msg = '\n'.join(('-' * 75, result.read(), '-' * 75))
+            text = self._read_pypi_response(result)
+            msg = '\n'.join(('-' * 75, text, '-' * 75))
             self.announce(msg, log.INFO)
diff --git a/config.py b/config.py
index a97635f2c0..7e10fff9d9 100644
--- a/config.py
+++ b/config.py
@@ -3,6 +3,7 @@
 Provides the PyPIRCCommand class, the base class for the command classes
 that uses .pypirc in the distutils.command package.
 """
+import cgi
 import os
 from configparser import ConfigParser
 
@@ -101,6 +102,12 @@ def _read_pypirc(self):
 
         return {}
 
+    def _read_pypi_response(self, response):
+        """Read and decode a PyPI HTTP response."""
+        content_type = response.getheader('content-type', 'text/plain')
+        encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
+        return response.read().decode(encoding)
+
     def initialize_options(self):
         """Initialize options."""
         self.repository = None
diff --git a/tests/test_upload.py b/tests/test_upload.py
index fbf80e3804..8532369aa5 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -6,6 +6,7 @@
 from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
+from distutils.log import INFO
 
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
@@ -48,6 +49,14 @@ def __init__(self, url):
             self.req = None
         self.msg = 'OK'
 
+    def getheader(self, name, default=None):
+        return {
+            'content-type': 'text/plain; charset=utf-8',
+            }.get(name.lower(), default)
+
+    def read(self):
+        return b'xyzzy'
+
     def getcode(self):
         return 200
 
@@ -108,10 +117,11 @@ def test_upload(self):
         # lets run it
         pkg_dir, dist = self.create_dist(dist_files=dist_files)
         cmd = upload(dist)
+        cmd.show_response = 1
         cmd.ensure_finalized()
         cmd.run()
 
-         # what did we send ?
+        # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
@@ -120,6 +130,11 @@ def test_upload(self):
                          'https://pypi.python.org/pypi')
         self.assertIn(b'xxx', self.last_open.req.data)
 
+        # The PyPI response body was echoed
+        results = self.get_logs(INFO)
+        self.assertIn('xyzzy\n', results[-1])
+
+
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
 

From 8ee4e0365d4d31b4d0b42511567fa2c2657dcdcb Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 22 Dec 2013 19:37:17 +0100
Subject: [PATCH 3823/8469] Fix bootstrap issue by importing the cgi module
 lazily

---
 config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py b/config.py
index 7e10fff9d9..106e146598 100644
--- a/config.py
+++ b/config.py
@@ -3,7 +3,6 @@
 Provides the PyPIRCCommand class, the base class for the command classes
 that uses .pypirc in the distutils.command package.
 """
-import cgi
 import os
 from configparser import ConfigParser
 
@@ -104,6 +103,7 @@ def _read_pypirc(self):
 
     def _read_pypi_response(self, response):
         """Read and decode a PyPI HTTP response."""
+        import cgi
         content_type = response.getheader('content-type', 'text/plain')
         encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
         return response.read().decode(encoding)

From 889b0255164812a81f21cec8fae9c4cd6929b532 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 30 Dec 2013 14:39:46 -0600
Subject: [PATCH 3824/8469] Issue #19544, #6516: check ZLIB_SUPPORT, not zlib
 (which might not be bound)

---
 tests/test_archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 6b42c5a213..2d72af4aa6 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -308,7 +308,7 @@ def test_make_archive_owner_group(self):
                            owner='kjhkjhkjg', group='oihohoh')
         self.assertTrue(os.path.exists(res))
 
-    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib")
     @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
     def test_tarfile_root_owner(self):
         tmpdir, tmpdir2, base_name =  self._create_files()

From 8fd408904c0379e17ba17f8ee313627645562dfe Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 30 Dec 2013 15:09:20 -0600
Subject: [PATCH 3825/8469] Issue #19544, #6516: check ZLIB_SUPPORT, not zlib
 (which might not be bound)

---
 tests/test_sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 49e267e20a..5a04e0ddd0 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -429,7 +429,7 @@ def test_manual_manifest(self):
         self.assertEqual(sorted(filenames), ['fake-1.0', 'fake-1.0/PKG-INFO',
                                              'fake-1.0/README.manual'])
 
-    @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(ZLIB_SUPPORT, "requires zlib")
     @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
     @unittest.skipIf(find_executable('tar') is None,
                      "The tar command is not found")

From e6808a7ee674d31e2f10310237cee1dc7d1ce6ca Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 5 Jan 2014 04:40:25 -0800
Subject: [PATCH 3826/8469] Bump version number for 3.4.0b2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 38a50869ea..725a33d6dc 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0b1"
+__version__ = "3.4.0b2"
 #--end constants--

From 7f50db7ceebeb2134f9000f8228588c7c18e59a6 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 25 Jan 2014 09:19:50 +0100
Subject: [PATCH 3827/8469] Bump to 3.3.4rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6747ab8677..8a637d1bd9 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.3"
+__version__ = "3.3.4rc1"
 #--end constants--

From 4a1da2e04a6c5ca6e81bf48c37daef69c38cdb23 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 26 Jan 2014 00:48:23 -0800
Subject: [PATCH 3828/8469] Version bump for 3.4.0b3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 725a33d6dc..bf9badd5f5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0b2"
+__version__ = "3.4.0b3"
 #--end constants--

From 51bb181329a0d4167451376ad8168a1af005ba70 Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Tue, 28 Jan 2014 15:04:40 +0100
Subject: [PATCH 3829/8469] Issue #9709: Revert 97fb852c5c26. Many extensions
 are not using PyMODINIT_FUNC.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 9be592370a..80689b6357 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -538,7 +538,7 @@ def build_extension(self, ext):
             library_dirs=ext.library_dirs,
             runtime_library_dirs=ext.runtime_library_dirs,
             extra_postargs=extra_args,
-            export_symbols=ext.export_symbols,
+            export_symbols=self.get_export_symbols(ext),
             debug=self.debug,
             build_temp=self.build_temp,
             target_lang=language)

From 4988103fdd5b6a0c02e3df2a282bea48a7a34a7f Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 6 Feb 2014 22:49:45 +0200
Subject: [PATCH 3830/8469] Issue #20363. Fixed BytesWarning triggerred by test
 suite. Patch by Berker Peksag.

---
 command/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/register.py b/command/register.py
index 55656c2353..b49f86fe58 100644
--- a/command/register.py
+++ b/command/register.py
@@ -300,5 +300,5 @@ def post_to_server(self, data, auth=None):
             result = 200, 'OK'
         if self.show_response:
             dashes = '-' * 75
-            self.announce('%s%s%s' % (dashes, data, dashes))
+            self.announce('%s%r%s' % (dashes, data, dashes))
         return result

From f5efce06e4cf3367c6f316bb78847c43eb4e2054 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Feb 2014 08:43:05 +0100
Subject: [PATCH 3831/8469] Bump to 3.3.4 final

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 8a637d1bd9..de5560b4f6 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.4rc1"
+__version__ = "3.3.4"
 #--end constants--

From c256b0353847fe4c0235bfd4604660193f5b8a9e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 15:37:32 -0500
Subject: [PATCH 3832/8469] Bumped to 3.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3e5907dcf9..3764723de3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.3"
+DEFAULT_VERSION = "3.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 93bbb90e96..f7d2e86941 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '2.3'
+__version__ = '3.0'

From 875393f610a867ae7258d673c1cf5638e253eff4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 15:51:20 -0500
Subject: [PATCH 3833/8469] Declare support for Python 3.4

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index dc4391c27a..5d19cd9659 100755
--- a/setup.py
+++ b/setup.py
@@ -181,6 +181,7 @@ def run(self):
         Programming Language :: Python :: 3.1
         Programming Language :: Python :: 3.2
         Programming Language :: Python :: 3.3
+        Programming Language :: Python :: 3.4
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration

From 4c7aaccacb0a756f45862826025bfdd579195d1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 16:09:01 -0500
Subject: [PATCH 3834/8469] Use zip files rather than tar files for source
 distributions of setuptools itself. Fixes #7 for users of Python 2.7.4 and
 later.

---
 CHANGES.txt |  4 ++++
 ez_setup.py | 34 ++++++++++++++++------------------
 setup.cfg   |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8200b99a95..3fcff3a9bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,10 @@ CHANGES
   handled properly at runtime.  In 2.x it was possible to get away without
   including the declaration, but only at the cost of forcing namespace
   packages to be imported early, which 3.0 no longer does.
+* Issue #7: Setuptools itself is now distributed as a zipfile instead of a
+  tarball. This approach avoids the potential security vulnerabilities
+  presented by use of tar files. It also leverages the security features added
+  to ZipFile.extract in Python 2.7.4.
 
 ---
 2.3
diff --git a/ez_setup.py b/ez_setup.py
index 3764723de3..548abe719f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -17,7 +17,7 @@
 import shutil
 import sys
 import tempfile
-import tarfile
+import zipfile
 import optparse
 import subprocess
 import platform
@@ -40,16 +40,15 @@ def _python_cmd(*args):
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 
-def _install(tarball, install_args=()):
-    # extracting the tarball
+def _install(archive_filename, install_args=()):
+    # extracting the archive
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        tar.extractall()
-        tar.close()
+        with zipfile.ZipFile(archive_filename) as archive:
+            archive.extractall()
 
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
@@ -68,16 +67,15 @@ def _install(tarball, install_args=()):
         shutil.rmtree(tmpdir)
 
 
-def _build_egg(egg, tarball, to_dir):
-    # extracting the tarball
+def _build_egg(egg, archive_filename, to_dir):
+    # extracting the archive
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        tar.extractall()
-        tar.close()
+        with zipfile.ZipFile(archive_filename) as archive:
+            archive.extractall()
 
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
@@ -101,9 +99,9 @@ def _do_download(version, download_base, to_dir, download_delay):
     egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg'
                        % (version, sys.version_info[0], sys.version_info[1]))
     if not os.path.exists(egg):
-        tarball = download_setuptools(version, download_base,
+        archive = download_setuptools(version, download_base,
                                       to_dir, download_delay)
-        _build_egg(egg, tarball, to_dir)
+        _build_egg(egg, archive, to_dir)
     sys.path.insert(0, egg)
 
     # Remove previously-imported pkg_resources if present (see
@@ -276,9 +274,9 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     """
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
-    tgz_name = "setuptools-%s.tar.gz" % version
-    url = download_base + tgz_name
-    saveto = os.path.join(to_dir, tgz_name)
+    zip_name = "setuptools-%s.zip" % version
+    url = download_base + zip_name
+    saveto = os.path.join(to_dir, zip_name)
     if not os.path.exists(saveto):  # Avoid repeated downloads
         log.warn("Downloading %s", url)
         downloader = downloader_factory()
@@ -315,9 +313,9 @@ def _parse_args():
 def main(version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()
-    tarball = download_setuptools(download_base=options.download_base,
+    archive = download_setuptools(download_base=options.download_base,
         downloader_factory=options.downloader_factory)
-    return _install(tarball, _build_install_args(options))
+    return _install(archive, _build_install_args(options))
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/setup.cfg b/setup.cfg
index 0a0079e055..a78a8033c3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ all_files = 1
 upload-dir = docs/build/html
 
 [sdist]
-formats=gztar
+formats=zip
 
 [wheel]
 universal=1

From 0ccb40aaa4e49ca6b656fbba9996c78de1856b56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 16:13:53 -0500
Subject: [PATCH 3835/8469] Extract 'archive_context' from _install and
 _build_egg

---
 ez_setup.py | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 548abe719f..e4a357eb35 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -22,6 +22,7 @@
 import subprocess
 import platform
 import textwrap
+import contextlib
 
 from distutils import log
 
@@ -40,21 +41,9 @@ def _python_cmd(*args):
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 
-def _install(archive_filename, install_args=()):
-    # extracting the archive
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        with zipfile.ZipFile(archive_filename) as archive:
-            archive.extractall()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
 
+def _install(archive_filename, install_args=()):
+    with archive_context(archive_filename):
         # installing
         log.warn('Installing Setuptools')
         if not _python_cmd('setup.py', 'install', *install_args):
@@ -62,37 +51,39 @@ def _install(archive_filename, install_args=()):
             log.warn('See the error message above.')
             # exitcode will be 2
             return 2
-    finally:
-        os.chdir(old_wd)
-        shutil.rmtree(tmpdir)
 
 
 def _build_egg(egg, archive_filename, to_dir):
+    with archive_context(archive_filename):
+        # building an egg
+        log.warn('Building a Setuptools egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+@contextlib.contextmanager
+def archive_context(filename):
     # extracting the archive
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        with zipfile.ZipFile(archive_filename) as archive:
+        with zipfile.ZipFile(filename) as archive:
             archive.extractall()
 
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
         os.chdir(subdir)
         log.warn('Now working in %s', subdir)
-
-        # building an egg
-        log.warn('Building a Setuptools egg in %s', to_dir)
-        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+        yield
 
     finally:
         os.chdir(old_wd)
         shutil.rmtree(tmpdir)
-    # returning the result
-    log.warn(egg)
-    if not os.path.exists(egg):
-        raise IOError('Could not build the egg.')
 
 
 def _do_download(version, download_base, to_dir, download_delay):

From 972daaf261612e7d6cfd7e23082e275aba69f5f3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 17:03:59 -0500
Subject: [PATCH 3836/8469] Updated installation instructions, expanding on new
 techniques available to Windows 8 users and clarifying which technique Mac OS
 X users should use. Fixes #59.

---
 README.txt | 62 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/README.txt b/README.txt
index 6079c2e555..2e5ca8fde0 100755
--- a/README.txt
+++ b/README.txt
@@ -9,38 +9,56 @@ Installing and Using Setuptools
 Installation Instructions
 -------------------------
 
-Upgrading from Distribute
-=========================
+The recommended way to bootstrap setuptools on any system is to download
+`ez_setup.py`_ and run it using the target Python environment. Different
+operating systems have different recommended techniques to accomplish this
+basic routine, so here are some examples to get you started.
 
-Currently, Distribute disallows installing Setuptools 0.7+ over Distribute.
-You must first uninstall any active version of Distribute first (see
-`Uninstalling`_).
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+
+Windows 8 (Powershell)
+======================
+
+For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
-Upgrading from Setuptools 0.6
-=============================
+Using Windows 8 or later, it's possible to install with one simple Powershell
+command. Start up Powershell and paste this command::
 
-Upgrading from prior versions of Setuptools is supported. Initial reports
-good success in this regard.
+    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | python -
 
-Windows
-=======
+You must start the Powershell with Administrative privileges or you may choose
+to install a user-local installation::
+
+    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | python - --user
+
+If you have Python 3.3 or later, you can use the ``py`` command to install to
+different Python versions. For example, to install to Python 3.3 if you have
+Python 2.7 installed::
+
+    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | py -3 -
 
 The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
 file and install it for you.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
-
-For best results, uninstall previous versions FIRST (see `Uninstalling`_).
-
 Once installation is complete, you will find an ``easy_install`` program in
 your Python ``Scripts`` subdirectory.  For simple invocation and best results,
 add this directory to your ``PATH`` environment variable, if it is not already
-present.
+present. If you did a user-local install, the ``Scripts`` subdirectory is
+``$env:APPDATA\Python\Scripts``.
+
 
+Windows 7 (or graphical install)
+================================
 
-Unix-based Systems including Mac OS X
-=====================================
+For Windows 7 and earlier, download `ez_setup.py`_ using your favorite web
+browser or other technique and "run" that file.
+
+
+Unix (wget)
+===========
+
+Most Linux distributions come with wget.
 
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
@@ -55,9 +73,13 @@ install to the system Python::
 Alternatively, on Python 2.6 and later, Setuptools may be installed to a
 user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
-    > python ez_setup.py --user
+    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python - --user
+
+Unix including Mac OS X (curl)
+==============================
 
+If your system has curl installed, follow the ``wget`` instructions but
+replace ``wget`` with ``curl`` and ``-O`` with ``-o``.
 
 Python 2.4 and Python 2.5 support
 =================================

From 65b76ae3e3aa1171de28d6af7be95b594d046f96 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 17:05:31 -0500
Subject: [PATCH 3837/8469] Updated docs to declare Python requirement prior to
 installation instructions.

---
 README.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 2e5ca8fde0..4871735df0 100755
--- a/README.txt
+++ b/README.txt
@@ -14,6 +14,10 @@ The recommended way to bootstrap setuptools on any system is to download
 operating systems have different recommended techniques to accomplish this
 basic routine, so here are some examples to get you started.
 
+Setuptools requires Python 2.6 or later. To install setuptools
+on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
+<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+
 .. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
 
 Windows 8 (Powershell)
@@ -81,13 +85,6 @@ Unix including Mac OS X (curl)
 If your system has curl installed, follow the ``wget`` instructions but
 replace ``wget`` with ``curl`` and ``-O`` with ``-o``.
 
-Python 2.4 and Python 2.5 support
-=================================
-
-Setuptools 2.0 and later requires Python 2.6 or later. To install setuptools
-on Python 2.4 or Python 2.5, use the bootstrap script for Setuptools 1.x:
-https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py.
-
 
 Advanced Installation
 =====================

From fbf26248da1664d103df596bcbf11acfd638516f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 17:17:32 -0500
Subject: [PATCH 3838/8469] Removed Features functionality. Fixes #65.

---
 CHANGES.txt                  |   1 +
 setuptools/__init__.py       |   4 +-
 setuptools/dist.py           | 259 +----------------------------------
 setuptools/tests/__init__.py |  83 -----------
 4 files changed, 6 insertions(+), 341 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3fcff3a9bd..0beaded091 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@ CHANGES
   tarball. This approach avoids the potential security vulnerabilities
   presented by use of tar files. It also leverages the security features added
   to ZipFile.extract in Python 2.7.4.
+* Issue #65: Removed deprecated Features functionality.
 
 ---
 2.3
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index fc9b7b936c..fb2fffc02b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -9,11 +9,11 @@
 
 import setuptools.version
 from setuptools.extension import Extension
-from setuptools.dist import Distribution, Feature, _get_unpatched
+from setuptools.dist import Distribution, _get_unpatched
 from setuptools.depends import Require
 
 __all__ = [
-    'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
+    'setup', 'Distribution', 'Command', 'Extension', 'Require',
     'find_packages'
 ]
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0801ae74ff..dcb9ba4ee0 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -3,15 +3,12 @@
 import re
 import os
 import sys
-import warnings
 import distutils.log
 import distutils.core
 import distutils.cmd
 from distutils.core import Distribution as _Distribution
-from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
-    DistutilsSetupError)
+from distutils.errors import DistutilsSetupError
 
-from setuptools.depends import Require
 from setuptools.compat import numeric_types, basestring
 import pkg_resources
 
@@ -137,7 +134,7 @@ def check_packages(dist, attr, value):
 
 
 class Distribution(_Distribution):
-    """Distribution with support for features, tests, and package data
+    """Distribution with support for tests and package data
 
     This is an enhanced version of 'distutils.dist.Distribution' that
     effectively adds the following new optional keyword arguments to 'setup()':
@@ -164,21 +161,6 @@ class Distribution(_Distribution):
         EasyInstall and requests one of your extras, the corresponding
         additional requirements will be installed if needed.
 
-     'features' **deprecated** -- a dictionary mapping option names to
-        'setuptools.Feature'
-        objects.  Features are a portion of the distribution that can be
-        included or excluded based on user options, inter-feature dependencies,
-        and availability on the current system.  Excluded features are omitted
-        from all setup commands, including source and binary distributions, so
-        you can create multiple distributions from the same source tree.
-        Feature names should be valid Python identifiers, except that they may
-        contain the '-' (minus) sign.  Features can be included or excluded
-        via the command line options '--with-X' and '--without-X', where 'X' is
-        the name of the feature.  Whether a feature is included by default, and
-        whether you are allowed to control this from the command line, is
-        determined by the Feature object.  See the 'Feature' class for more
-        information.
-
      'test_suite' -- the name of a test suite to run for the 'test' command.
         If the user runs 'python setup.py test', the package will be installed,
         and the named test suite will be run.  The format is the same as
@@ -200,8 +182,7 @@ class Distribution(_Distribution):
     for manipulating the distribution's contents.  For example, the 'include()'
     and 'exclude()' methods can be thought of as in-place add and subtract
     commands that add or remove packages, modules, extensions, and so on from
-    the distribution.  They are used by the feature subsystem to configure the
-    distribution for the included and excluded features.
+    the distribution.
     """
 
     _patched_dist = None
@@ -223,11 +204,6 @@ def __init__(self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
-        _attrs_dict = attrs or {}
-        if 'features' in _attrs_dict or 'require_features' in _attrs_dict:
-            Feature.warn_deprecated()
-        self.require_features = []
-        self.features = {}
         self.dist_files = []
         self.src_root = attrs and attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
@@ -245,17 +221,6 @@ def __init__(self, attrs=None):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 
-    def parse_command_line(self):
-        """Process features after parsing command line options"""
-        result = _Distribution.parse_command_line(self)
-        if self.features:
-            self._finalize_features()
-        return result
-
-    def _feature_attrname(self,name):
-        """Convert feature name to corresponding option attribute name"""
-        return 'with_'+name.replace('-','_')
-
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         from pkg_resources import working_set, parse_requirements
@@ -267,8 +232,6 @@ def fetch_build_eggs(self, requires):
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
-        if self.features:
-            self._set_global_opts_from_features()
 
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             value = getattr(self,ep.name,None)
@@ -313,47 +276,6 @@ def fetch_build_egg(self, req):
             self._egg_fetcher = cmd
         return cmd.easy_install(req)
 
-    def _set_global_opts_from_features(self):
-        """Add --with-X/--without-X options based on optional features"""
-
-        go = []
-        no = self.negative_opt.copy()
-
-        for name,feature in self.features.items():
-            self._set_feature(name,None)
-            feature.validate(self)
-
-            if feature.optional:
-                descr = feature.description
-                incdef = ' (default)'
-                excdef=''
-                if not feature.include_by_default():
-                    excdef, incdef = incdef, excdef
-
-                go.append(('with-'+name, None, 'include '+descr+incdef))
-                go.append(('without-'+name, None, 'exclude '+descr+excdef))
-                no['without-'+name] = 'with-'+name
-
-        self.global_options = self.feature_options = go + self.global_options
-        self.negative_opt = self.feature_negopt = no
-
-    def _finalize_features(self):
-        """Add/remove features and resolve dependencies between them"""
-
-        # First, flag all the enabled items (and thus their dependencies)
-        for name,feature in self.features.items():
-            enabled = self.feature_is_included(name)
-            if enabled or (enabled is None and feature.include_by_default()):
-                feature.include_in(self)
-                self._set_feature(name,1)
-
-        # Then disable the rest, so that off-by-default features don't
-        # get flagged as errors when they're required by an enabled feature
-        for name,feature in self.features.items():
-            if not self.feature_is_included(name):
-                feature.exclude_from(self)
-                self._set_feature(name,0)
-
     def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
@@ -373,25 +295,6 @@ def print_commands(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
-    def _set_feature(self,name,status):
-        """Set feature's inclusion status"""
-        setattr(self,self._feature_attrname(name),status)
-
-    def feature_is_included(self,name):
-        """Return 1 if feature is included, 0 if excluded, 'None' if unknown"""
-        return getattr(self,self._feature_attrname(name))
-
-    def include_feature(self,name):
-        """Request inclusion of feature named 'name'"""
-
-        if self.feature_is_included(name)==0:
-            descr = self.features[name].description
-            raise DistutilsOptionError(
-                descr + " is required, but was excluded or is not available"
-            )
-        self.features[name].include_in(self)
-        self._set_feature(name,1)
-
     def include(self,**attrs):
         """Add items to distribution that are named in keyword arguments
 
@@ -639,159 +542,3 @@ def handle_display_options(self, option_order):
 # Install it throughout the distutils
 for module in distutils.dist, distutils.core, distutils.cmd:
     module.Distribution = Distribution
-
-
-class Feature:
-    """
-    **deprecated** -- The `Feature` facility was never completely implemented
-    or supported, `has reported issues
-    <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
-    a future version.
-
-    A subset of the distribution that can be excluded if unneeded/wanted
-
-    Features are created using these keyword arguments:
-
-      'description' -- a short, human readable description of the feature, to
-         be used in error messages, and option help messages.
-
-      'standard' -- if true, the feature is included by default if it is
-         available on the current system.  Otherwise, the feature is only
-         included if requested via a command line '--with-X' option, or if
-         another included feature requires it.  The default setting is 'False'.
-
-      'available' -- if true, the feature is available for installation on the
-         current system.  The default setting is 'True'.
-
-      'optional' -- if true, the feature's inclusion can be controlled from the
-         command line, using the '--with-X' or '--without-X' options.  If
-         false, the feature's inclusion status is determined automatically,
-         based on 'availabile', 'standard', and whether any other feature
-         requires it.  The default setting is 'True'.
-
-      'require_features' -- a string or sequence of strings naming features
-         that should also be included if this feature is included.  Defaults to
-         empty list.  May also contain 'Require' objects that should be
-         added/removed from the distribution.
-
-      'remove' -- a string or list of strings naming packages to be removed
-         from the distribution if this feature is *not* included.  If the
-         feature *is* included, this argument is ignored.  This argument exists
-         to support removing features that "crosscut" a distribution, such as
-         defining a 'tests' feature that removes all the 'tests' subpackages
-         provided by other features.  The default for this argument is an empty
-         list.  (Note: the named package(s) or modules must exist in the base
-         distribution when the 'setup()' function is initially called.)
-
-      other keywords -- any other keyword arguments are saved, and passed to
-         the distribution's 'include()' and 'exclude()' methods when the
-         feature is included or excluded, respectively.  So, for example, you
-         could pass 'packages=["a","b"]' to cause packages 'a' and 'b' to be
-         added or removed from the distribution as appropriate.
-
-    A feature must include at least one 'requires', 'remove', or other
-    keyword argument.  Otherwise, it can't affect the distribution in any way.
-    Note also that you can subclass 'Feature' to create your own specialized
-    feature types that modify the distribution in other ways when included or
-    excluded.  See the docstrings for the various methods here for more detail.
-    Aside from the methods, the only feature attributes that distributions look
-    at are 'description' and 'optional'.
-    """
-
-    @staticmethod
-    def warn_deprecated():
-        warnings.warn(
-            "Features are deprecated and will be removed in a future "
-                "version. See http://bitbucket.org/pypa/setuptools/65.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-
-    def __init__(self, description, standard=False, available=True,
-            optional=True, require_features=(), remove=(), **extras):
-        self.warn_deprecated()
-
-        self.description = description
-        self.standard = standard
-        self.available = available
-        self.optional = optional
-        if isinstance(require_features,(str,Require)):
-            require_features = require_features,
-
-        self.require_features = [
-            r for r in require_features if isinstance(r,str)
-        ]
-        er = [r for r in require_features if not isinstance(r,str)]
-        if er: extras['require_features'] = er
-
-        if isinstance(remove,str):
-            remove = remove,
-        self.remove = remove
-        self.extras = extras
-
-        if not remove and not require_features and not extras:
-            raise DistutilsSetupError(
-                "Feature %s: must define 'require_features', 'remove', or at least one"
-                " of 'packages', 'py_modules', etc."
-            )
-
-    def include_by_default(self):
-        """Should this feature be included by default?"""
-        return self.available and self.standard
-
-    def include_in(self,dist):
-
-        """Ensure feature and its requirements are included in distribution
-
-        You may override this in a subclass to perform additional operations on
-        the distribution.  Note that this method may be called more than once
-        per feature, and so should be idempotent.
-
-        """
-
-        if not self.available:
-            raise DistutilsPlatformError(
-                self.description+" is required,"
-                "but is not available on this platform"
-            )
-
-        dist.include(**self.extras)
-
-        for f in self.require_features:
-            dist.include_feature(f)
-
-    def exclude_from(self,dist):
-
-        """Ensure feature is excluded from distribution
-
-        You may override this in a subclass to perform additional operations on
-        the distribution.  This method will be called at most once per
-        feature, and only after all included features have been asked to
-        include themselves.
-        """
-
-        dist.exclude(**self.extras)
-
-        if self.remove:
-            for item in self.remove:
-                dist.exclude_package(item)
-
-    def validate(self,dist):
-
-        """Verify that feature makes sense in context of distribution
-
-        This method is called by the distribution just before it parses its
-        command line.  It checks to ensure that the 'remove' attribute, if any,
-        contains only valid package/module names that are present in the base
-        distribution when 'setup()' is called.  You may override it in a
-        subclass to perform any other required validation of the feature
-        against a target distribution.
-        """
-
-        for item in self.remove:
-            if not dist.has_contents_for(item):
-                raise DistutilsSetupError(
-                    "%s wants to be able to remove %s, but the distribution"
-                    " doesn't contain any packages or modules under %s"
-                    % (self.description, item, item)
-                )
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b5328ce67a..3749fd99f9 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -231,89 +231,6 @@ def testInvalidIncludeExclude(self):
             self.dist.exclude, package_dir=['q']
         )
 
-
-class FeatureTests(unittest.TestCase):
-
-    def setUp(self):
-        self.req = Require('Distutils','1.0.3','distutils')
-        self.dist = makeSetup(
-            features={
-                'foo': Feature("foo",standard=True,require_features=['baz',self.req]),
-                'bar': Feature("bar",  standard=True, packages=['pkg.bar'],
-                               py_modules=['bar_et'], remove=['bar.ext'],
-                       ),
-                'baz': Feature(
-                        "baz", optional=False, packages=['pkg.baz'],
-                        scripts = ['scripts/baz_it'],
-                        libraries=[('libfoo','foo/foofoo.c')]
-                       ),
-                'dwim': Feature("DWIM", available=False, remove='bazish'),
-            },
-            script_args=['--without-bar', 'install'],
-            packages = ['pkg.bar', 'pkg.foo'],
-            py_modules = ['bar_et', 'bazish'],
-            ext_modules = [Extension('bar.ext',['bar.c'])]
-        )
-
-    def testDefaults(self):
-        self.assertTrue(not
-            Feature(
-                "test",standard=True,remove='x',available=False
-            ).include_by_default()
-        )
-        self.assertTrue(
-            Feature("test",standard=True,remove='x').include_by_default()
-        )
-        # Feature must have either kwargs, removes, or require_features
-        self.assertRaises(DistutilsSetupError, Feature, "test")
-
-    def testAvailability(self):
-        self.assertRaises(
-            DistutilsPlatformError,
-            self.dist.features['dwim'].include_in, self.dist
-        )
-
-    def testFeatureOptions(self):
-        dist = self.dist
-        self.assertTrue(
-            ('with-dwim',None,'include DWIM') in dist.feature_options
-        )
-        self.assertTrue(
-            ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
-        )
-        self.assertTrue(
-            ('with-bar',None,'include bar (default)') in dist.feature_options
-        )
-        self.assertTrue(
-            ('without-bar',None,'exclude bar') in dist.feature_options
-        )
-        self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
-        self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
-        self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
-        self.assertTrue(not 'without-baz' in dist.feature_negopt)
-
-    def testUseFeatures(self):
-        dist = self.dist
-        self.assertEqual(dist.with_foo,1)
-        self.assertEqual(dist.with_bar,0)
-        self.assertEqual(dist.with_baz,1)
-        self.assertTrue(not 'bar_et' in dist.py_modules)
-        self.assertTrue(not 'pkg.bar' in dist.packages)
-        self.assertTrue('pkg.baz' in dist.packages)
-        self.assertTrue('scripts/baz_it' in dist.scripts)
-        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
-        self.assertEqual(dist.ext_modules,[])
-        self.assertEqual(dist.require_features, [self.req])
-
-        # If we ask for bar, it should fail because we explicitly disabled
-        # it on the command line
-        self.assertRaises(DistutilsOptionError, dist.include_feature, 'bar')
-
-    def testFeatureWithInvalidRemove(self):
-        self.assertRaises(
-            SystemExit, makeSetup, features = {'x':Feature('x', remove='y')}
-        )
-
 class TestCommandTests(unittest.TestCase):
 
     def testTestIsCommand(self):

From 871d5104c7b998a3fe4e52f8ea53ebec409a7052 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:18:56 -0500
Subject: [PATCH 3839/8469] Remove import (missed in parent commit).

---
 setuptools/tests/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 3749fd99f9..a8eb711040 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -14,7 +14,6 @@
 from setuptools.compat import func_code
 import setuptools.dist
 import setuptools.depends as dep
-from setuptools import Feature
 from setuptools.depends import Require
 
 def additional_tests():

From 4dcbe9cd38e5143431541c66d5dba418b665bb5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:32:28 -0500
Subject: [PATCH 3840/8469] Remove unused import and excess whitespace.

---
 setuptools/command/test.py | 40 +-------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index db2fc7b140..e936418d0f 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,7 +3,7 @@
 import sys
 from pkg_resources import *
 from pkg_resources import _namespace_packages
-from unittest import TestLoader, main
+from unittest import TestLoader
 
 class ScanningLoader(TestLoader):
 
@@ -57,7 +57,6 @@ def initialize_options(self):
         self.test_module = None
         self.test_loader = None
 
-
     def finalize_options(self):
 
         if self.test_suite is None:
@@ -79,8 +78,6 @@ def finalize_options(self):
         if self.test_loader is None:
             self.test_loader = "setuptools.command.test:ScanningLoader"
 
-
-
     def with_project_on_sys_path(self, func):
         if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
@@ -122,7 +119,6 @@ def with_project_on_sys_path(self, func):
             sys.modules.update(old_modules)
             working_set.__init__()
 
-
     def run(self):
         if self.distribution.install_requires:
             self.distribution.fetch_build_eggs(self.distribution.install_requires)
@@ -137,7 +133,6 @@ def run(self):
                 self.announce('running "unittest %s"' % cmd)
                 self.with_project_on_sys_path(self.run_tests)
 
-
     def run_tests(self):
         import unittest
 
@@ -163,36 +158,3 @@ def run_tests(self):
             None, None, [unittest.__file__]+self.test_args,
             testLoader = cks
         )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From c20ed4dffd0779fc12c9b2fbc6433621424dbfcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:37:09 -0500
Subject: [PATCH 3841/8469] Remove import *

---
 setuptools/command/test.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e936418d0f..a9a0d1d735 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,8 +1,9 @@
 from setuptools import Command
 from distutils.errors import DistutilsOptionError
 import sys
-from pkg_resources import *
-from pkg_resources import _namespace_packages
+from pkg_resources import (resource_listdir, resource_exists,
+    normalize_path, working_set, _namespace_packages, add_activation_listener,
+    require, EntryPoint)
 from unittest import TestLoader
 
 class ScanningLoader(TestLoader):

From a31410a54b0e756c3ee27f2bcfe2dd6301968c77 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:41:55 -0500
Subject: [PATCH 3842/8469] Remove excess whitespace and unused imports.

---
 setuptools/command/alias.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 52384e1a28..465d6ae46b 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,7 +1,3 @@
-import distutils, os
-from setuptools import Command
-from distutils.util import convert_path
-from distutils import log
 from distutils.errors import *
 from setuptools.command.setopt import edit_config, option_base, config_file
 
@@ -11,17 +7,17 @@ def shquote(arg):
         if c in arg: return repr(arg)
     if arg.split() != [arg]:
         return repr(arg)
-    return arg        
+    return arg
 
 
 class alias(option_base):
     """Define a shortcut that invokes one or more commands"""
-    
+
     description = "define a shortcut to invoke one or more commands"
     command_consumes_arguments = True
 
     user_options = [
-        ('remove',   'r', 'remove (unset) the alias'), 
+        ('remove',  'r', 'remove (unset) the alias'),
     ] + option_base.user_options
 
     boolean_options = option_base.boolean_options + ['remove']
@@ -77,6 +73,3 @@ def format_alias(name, aliases):
     else:
         source = '--filename=%r' % source
     return source+name+' '+command
-            
-
-

From 0eacd77e0ebd6a0a4e0672fbd1c77663f3507966 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:42:42 -0500
Subject: [PATCH 3843/8469] Remove import *

---
 setuptools/command/alias.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 465d6ae46b..05c0766bd4 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,4 +1,5 @@
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
+
 from setuptools.command.setopt import edit_config, option_base, config_file
 
 def shquote(arg):

From c5cbf5fd6a47e022c5ff66545c417b43dfa9a060 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:48:55 -0500
Subject: [PATCH 3844/8469] Normalize indentation and remove unused imports

---
 setuptools/command/build_ext.py | 75 +++++++++++++++------------------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 50a039ce50..513f9b9674 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -5,7 +5,8 @@
 except ImportError:
     _build_ext = _du_build_ext
 
-import os, sys
+import os
+import sys
 from distutils.file_util import copy_file
 from setuptools.extension import Library
 from distutils.ccompiler import new_compiler
@@ -41,10 +42,6 @@ def if_dl(s):
     return ''
 
 
-
-
-
-
 class build_ext(_build_ext):
     def run(self):
         """Build extensions in build directory, then copy if --inplace"""
@@ -75,7 +72,6 @@ def copy_extensions_to_source(self):
             if ext._needs_stub:
                 self.write_stub(package_dir or os.curdir, ext, True)
 
-
     if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
         # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
         def swig_sources(self, sources, *otherargs):
@@ -84,8 +80,6 @@ def swig_sources(self, sources, *otherargs):
             # Then do any actual SWIG stuff on the remainder
             return _du_build_ext.swig_sources(self, sources, *otherargs)
 
-
-
     def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self,fullname)
         if fullname in self.ext_map:
@@ -109,7 +103,7 @@ def finalize_options(self):
         self.extensions = self.extensions or []
         self.check_extensions_list(self.extensions)
         self.shlibs = [ext for ext in self.extensions
-                        if isinstance(ext,Library)]
+            if isinstance(ext, Library)]
         if self.shlibs:
             self.setup_shlib_compiler()
         for ext in self.extensions:
@@ -171,8 +165,6 @@ def setup_shlib_compiler(self):
         # hack so distutils' build_extension() builds a library instead
         compiler.link_shared_object = link_shared_object.__get__(compiler)
 
-
-
     def get_export_symbols(self, ext):
         if isinstance(ext,Library):
             return ext.export_symbols
@@ -221,27 +213,29 @@ def write_stub(self, output_dir, ext, compile=False):
             raise DistutilsError(stub_file+" already exists! Please delete.")
         if not self.dry_run:
             f = open(stub_file,'w')
-            f.write('\n'.join([
-                "def __bootstrap__():",
-                "   global __bootstrap__, __file__, __loader__",
-                "   import sys, os, pkg_resources, imp"+if_dl(", dl"),
-                "   __file__ = pkg_resources.resource_filename(__name__,%r)"
-                   % os.path.basename(ext._file_name),
-                "   del __bootstrap__",
-                "   if '__loader__' in globals():",
-                "       del __loader__",
-                if_dl("   old_flags = sys.getdlopenflags()"),
-                "   old_dir = os.getcwd()",
-                "   try:",
-                "     os.chdir(os.path.dirname(__file__))",
-                if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
-                "     imp.load_dynamic(__name__,__file__)",
-                "   finally:",
-                if_dl("     sys.setdlopenflags(old_flags)"),
-                "     os.chdir(old_dir)",
-                "__bootstrap__()",
-                "" # terminal \n
-            ]))
+            f.write(
+                '\n'.join([
+                    "def __bootstrap__():",
+                    "   global __bootstrap__, __file__, __loader__",
+                    "   import sys, os, pkg_resources, imp"+if_dl(", dl"),
+                    "   __file__ = pkg_resources.resource_filename(__name__,%r)"
+                        % os.path.basename(ext._file_name),
+                    "   del __bootstrap__",
+                    "   if '__loader__' in globals():",
+                    "       del __loader__",
+                    if_dl("   old_flags = sys.getdlopenflags()"),
+                    "   old_dir = os.getcwd()",
+                    "   try:",
+                    "     os.chdir(os.path.dirname(__file__))",
+                    if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
+                    "     imp.load_dynamic(__name__,__file__)",
+                    "   finally:",
+                    if_dl("     sys.setdlopenflags(old_flags)"),
+                    "     os.chdir(old_dir)",
+                    "__bootstrap__()",
+                    "" # terminal \n
+                ])
+            )
             f.close()
         if compile:
             from distutils.util import byte_compile
@@ -259,10 +253,10 @@ def write_stub(self, output_dir, ext, compile=False):
     # Build shared libraries
     #
     def link_shared_object(self, objects, output_libname, output_dir=None,
-        libraries=None, library_dirs=None, runtime_library_dirs=None,
-        export_symbols=None, debug=0, extra_preargs=None,
-        extra_postargs=None, build_temp=None, target_lang=None
-    ):  self.link(
+            libraries=None, library_dirs=None, runtime_library_dirs=None,
+            export_symbols=None, debug=0, extra_preargs=None,
+            extra_postargs=None, build_temp=None, target_lang=None):
+        self.link(
             self.SHARED_LIBRARY, objects, output_libname,
             output_dir, libraries, library_dirs, runtime_library_dirs,
             export_symbols, debug, extra_preargs, extra_postargs,
@@ -273,10 +267,9 @@ def link_shared_object(self, objects, output_libname, output_dir=None,
     libtype = 'static'
 
     def link_shared_object(self, objects, output_libname, output_dir=None,
-        libraries=None, library_dirs=None, runtime_library_dirs=None,
-        export_symbols=None, debug=0, extra_preargs=None,
-        extra_postargs=None, build_temp=None, target_lang=None
-    ):
+            libraries=None, library_dirs=None, runtime_library_dirs=None,
+            export_symbols=None, debug=0, extra_preargs=None,
+            extra_postargs=None, build_temp=None, target_lang=None):
         # XXX we need to either disallow these attrs on Library instances,
         #     or warn/abort here if set, or something...
         #libraries=None, library_dirs=None, runtime_library_dirs=None,
@@ -294,5 +287,3 @@ def link_shared_object(self, objects, output_libname, output_dir=None,
         self.create_static_lib(
             objects, basename, output_dir, debug, target_lang
         )
-
-

From 74c3cea6941fa3789d6ae3873ce260fd4a7dc029 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:50:16 -0500
Subject: [PATCH 3845/8469] Remove import *

---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 513f9b9674..e08131d777 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -20,7 +20,7 @@
     del get_config_var
     from distutils.sysconfig import _config_vars as _CONFIG_VARS
 from distutils import log
-from distutils.errors import *
+from distutils.errors import DistutilsError
 
 have_rtld = False
 use_stubs = False

From 2394cfef645c1d22de240c0c8b1a9eb918a1f6ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:51:37 -0500
Subject: [PATCH 3846/8469] Reorganize imports and remove excess whitespace

---
 setuptools/command/rotate.py | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index b10acfb41f..c556aa17c0 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -1,9 +1,9 @@
-import distutils, os
+import os
 from setuptools import Command
 from setuptools.compat import basestring
 from distutils.util import convert_path
 from distutils import log
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 
 class rotate(Command):
     """Delete older distributions"""
@@ -29,7 +29,7 @@ def finalize_options(self):
                 "(e.g. '.zip' or '.egg')"
             )
         if self.keep is None:
-            raise DistutilsOptionError("Must specify number of files to keep")           
+            raise DistutilsOptionError("Must specify number of files to keep")
         try:
             self.keep = int(self.keep)
         except ValueError:
@@ -56,28 +56,3 @@ def run(self):
                 log.info("Deleting %s", f)
                 if not self.dry_run:
                     os.unlink(f)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 8c7d2e1f80901375a50a99d1903386c29a423f26 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Feb 2014 18:54:45 -0500
Subject: [PATCH 3847/8469] Normalize whitespace and imports

---
 setuptools/command/setopt.py | 51 +++++++++++-------------------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index aa468c88fe..575653c8c7 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -1,8 +1,9 @@
-import distutils, os
+import os
+import distutils
 from setuptools import Command
 from distutils.util import convert_path
 from distutils import log
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 
 __all__ = ['config_file', 'edit_config', 'option_base', 'setopt']
 
@@ -25,20 +26,6 @@ def config_file(kind="local"):
         "config_file() type must be 'local', 'global', or 'user'", kind
     )
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def edit_config(filename, settings, dry_run=False):
     """Edit a configuration file to include `settings`
 
@@ -61,13 +48,14 @@ def edit_config(filename, settings, dry_run=False):
                 opts.add_section(section)
             for option,value in options.items():
                 if value is None:
-                    log.debug("Deleting %s.%s from %s",
+                    log.debug(
+                        "Deleting %s.%s from %s",
                         section, option, filename
                     )
                     opts.remove_option(section,option)
                     if not opts.options(section):
                         log.info("Deleting empty [%s] section from %s",
-                                  section, filename)
+                            section, filename)
                         opts.remove_section(section)
                 else:
                     log.debug(
@@ -78,27 +66,28 @@ def edit_config(filename, settings, dry_run=False):
 
     log.info("Writing %s", filename)
     if not dry_run:
-        f = open(filename,'w'); opts.write(f); f.close()
+        with open(filename, 'w') as f:
+            opts.write(f)
 
 class option_base(Command):
     """Abstract base class for commands that mess with config files"""
-    
+
     user_options = [
         ('global-config', 'g',
-                 "save options to the site-wide distutils.cfg file"),
+            "save options to the site-wide distutils.cfg file"),
         ('user-config', 'u',
-                 "save options to the current user's pydistutils.cfg file"),
+            "save options to the current user's pydistutils.cfg file"),
         ('filename=', 'f',
-                 "configuration file to use (default=setup.cfg)"),
+            "configuration file to use (default=setup.cfg)"),
     ]
 
     boolean_options = [
         'global-config', 'user-config',
-    ]    
+    ]
 
     def initialize_options(self):
         self.global_config = None
-        self.user_config   = None
+        self.user_config = None
         self.filename = None
 
     def finalize_options(self):
@@ -116,9 +105,7 @@ def finalize_options(self):
                 "Must specify only one configuration file option",
                 filenames
             )
-        self.filename, = filenames    
-
-
+        self.filename, = filenames
 
 
 class setopt(option_base):
@@ -130,7 +117,7 @@ class setopt(option_base):
         ('command=', 'c', 'command to set an option for'),
         ('option=',  'o',  'option to set'),
         ('set-value=',   's', 'value of the option'),
-        ('remove',   'r', 'remove (unset) the value'), 
+        ('remove',   'r', 'remove (unset) the value'),
     ] + option_base.user_options
 
     boolean_options = option_base.boolean_options + ['remove']
@@ -156,9 +143,3 @@ def run(self):
             },
             self.dry_run
         )
-
-
-
-
-
-

From 154e4ab5dff1cc780dcfa04140506bc574e22179 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Mon, 10 Feb 2014 14:45:05 -0800
Subject: [PATCH 3848/8469] Python 3.4.0rc1: Version bump.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index bf9badd5f5..4c716e2075 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0b3"
+__version__ = "3.4.0rc1"
 #--end constants--

From 191f5a01dc9bdace571fa8474f4bd50743b65994 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 11 Feb 2014 16:17:54 +0100
Subject: [PATCH 3849/8469] Issue #7: Generate both tar archive and zip
 archive.

---
 CHANGES.txt | 8 ++++----
 setup.cfg   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0beaded091..602d826933 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,10 +14,10 @@ CHANGES
   handled properly at runtime.  In 2.x it was possible to get away without
   including the declaration, but only at the cost of forcing namespace
   packages to be imported early, which 3.0 no longer does.
-* Issue #7: Setuptools itself is now distributed as a zipfile instead of a
-  tarball. This approach avoids the potential security vulnerabilities
-  presented by use of tar files. It also leverages the security features added
-  to ZipFile.extract in Python 2.7.4.
+* Issue #7: Setuptools itself is now distributed as a zip archive in addition to
+  tar archive. ez_setup.py now uses zip archive. This approach avoids the potential
+  security vulnerabilities presented by use of tar archives in ez_setup.py.
+  It also leverages the security features added to ZipFile.extract in Python 2.7.4.
 * Issue #65: Removed deprecated Features functionality.
 
 ---
diff --git a/setup.cfg b/setup.cfg
index a78a8033c3..35d93b51b2 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ all_files = 1
 upload-dir = docs/build/html
 
 [sdist]
-formats=zip
+formats = gztar zip
 
 [wheel]
 universal=1

From 4104aa38286858dd73eca1da6da25f2c8a170f1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Feb 2014 10:43:21 -0500
Subject: [PATCH 3850/8469] Delint site-patch

---
 setuptools/site-patch.py | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index a7166f1407..c2168019ad 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -1,5 +1,6 @@
 def __boot():
-    import sys, os, os.path
+    import sys
+    import os
     PYTHONPATH = os.environ.get('PYTHONPATH')
     if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH):
         PYTHONPATH = []
@@ -49,13 +50,13 @@ def __boot():
         addsitedir(item)
 
     sys.__egginsert += oldpos           # restore effective old position
-    
-    d,nd = makepath(stdpath[0])
+
+    d, nd = makepath(stdpath[0])
     insert_at = None
     new_path = []
 
     for item in sys.path:
-        p,np = makepath(item)
+        p, np = makepath(item)
 
         if np==nd and insert_at is None:
             # We've hit the first 'system' path entry, so added entries go here
@@ -67,17 +68,9 @@ def __boot():
             # new path after the insert point, back-insert it
             new_path.insert(insert_at, item)
             insert_at += 1
-            
+
     sys.path[:] = new_path
 
-if __name__=='site':    
+if __name__=='site':
     __boot()
     del __boot
-    
-
-
-
-
-
-
-

From 911fe5e498a58f1a05b2a7b3a34dfcaa7b9dd89d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Feb 2014 22:33:15 -0500
Subject: [PATCH 3851/8469] Backed out changeset 28901bac2f2e See #148

--HG--
branch : setuptools
extra : amend_source : 73cc453f11a0b77f930138eee03b1fc8e69399af
---
 setuptools/command/bdist_egg.py | 54 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index eb92bd2483..0a9d9a0ccb 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -26,8 +26,8 @@ def write_stub(resource, pyfile):
     ]))
     f.close()
 
-# stub __init__.py for packages distributed without one
-NS_PKG_STUB = '__import__("pkg_resources").declare_namespace(__name__)'
+
+
 
 
 
@@ -186,7 +186,7 @@ def run(self):
                 write_stub(os.path.basename(ext_name), pyfile)
             to_compile.append(pyfile)
             ext_outputs[p] = ext_name.replace(os.sep,'/')
-        to_compile.extend(self.make_init_files())
+
         if to_compile:
             cmd.byte_compile(to_compile)
 
@@ -260,30 +260,30 @@ def zip_safe(self):
         log.warn("zip_safe flag not set; analyzing archive contents...")
         return analyze_egg(self.bdist_dir, self.stubs)
 
-    def make_init_files(self):
-        """Create missing package __init__ files"""
-        init_files = []       
-        for base,dirs,files in walk_egg(self.bdist_dir):
-            if base==self.bdist_dir:
-                # don't put an __init__ in the root
-                continue
-            for name in files:
-                if name.endswith('.py'):
-                    if '__init__.py' not in files:
-                        pkg = base[len(self.bdist_dir)+1:].replace(os.sep,'.')
-                        if self.distribution.has_contents_for(pkg):
-                            log.warn("Creating missing __init__.py for %s",pkg)
-                            filename = os.path.join(base,'__init__.py')
-                            if not self.dry_run:
-                                f = open(filename,'w'); f.write(NS_PKG_STUB)
-                                f.close()    
-                            init_files.append(filename)
-                    break
-            else:
-                # not a package, don't traverse to subdirectories
-                dirs[:] = []
-
-        return init_files
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""

From c6deb3393c545c20ce22c094975766e286a831d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Feb 2014 22:59:05 -0500
Subject: [PATCH 3852/8469] Added tag 3.0b1 for changeset faba785e9b9e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e3af502655..ac04062818 100644
--- a/.hgtags
+++ b/.hgtags
@@ -118,3 +118,4 @@ b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
 ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1
 caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
 39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2
+faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1

From d2d40d0c30f6b5178851e79a0bca116492b63898 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Feb 2014 16:56:08 -0500
Subject: [PATCH 3853/8469] 2.3 was never released.

---
 CHANGES.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 52058d22a8..1df52ba4e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,11 +23,6 @@ CHANGES
   security vulnerabilities presented by use of tar archives in ez_setup.py.
   It also leverages the security features added to ZipFile.extract in Python 2.7.4.
 * Issue #65: Removed deprecated Features functionality.
-
----
-2.3
----
-
 * Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
   available in Python 2.6 and later, but also has better compatibility with
   Python 3 environments.

From 0daefd2b07a5435b0795f3dd0c3d102352611343 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 15 Feb 2014 14:56:16 -0600
Subject: [PATCH 3854/8469] Fixed Issue #125: setuptools leaves a ~/.subversion
 dir laying around                   after it completes This is the best that
 can probably be done.  Temporary directories are used for get the svn binary
 version and to get the initial directory info (for determining if one is, in
 fact, in a svn working directory)

ALSO: The check for SVN was not right.  Decided on files to only check for
.svn/entries because missing properties just leaves out the external refs.
And then incorporated a test on the code to make sure that svn info completed.

Test passed on CPytonh 2.x and 2.3 on windows, travis-ci, and travis-ci/mac.
Note: There seems to be an issue with pypy and a test.
---
 setuptools/svn_utils.py | 54 +++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index a9bdc5c334..e1d336e26b 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -4,6 +4,8 @@
 from distutils import log
 import xml.dom.pulldom
 import shlex
+import shutil
+import tempfile
 import locale
 import codecs
 import unicodedata
@@ -27,6 +29,25 @@
 #       http://stackoverflow.com/questions/5658622/
 #              python-subprocess-popen-environment-path
 
+class TempDir(object):
+    """"
+    Very simple temporary directory context manager.
+    Will try to delete afterward, but will also ignore OS and similar
+    errors on deletion.
+    """
+    def __init__(self):
+        self.path = None
+
+    def __enter__(self):
+        self.path = tempfile.mkdtemp()
+        return self
+
+    def __exit__(self, exctype, excvalue, exctrace):
+        try:
+            shutil.rmtree(self.path, True)
+        except OSError: #removal errors are not the only possible
+            pass
+        self.path = None
 
 def _run_command(args, stdout=_PIPE, stderr=_PIPE, encoding=None, stream=0):
     #regarding the shell argument, see: http://bugs.python.org/issue8557
@@ -231,7 +252,16 @@ class SvnInfo(object):
 
     @staticmethod
     def get_svn_version():
-        code, data = _run_command(['svn', '--version', '--quiet'])
+        # Temp config directory should be enough to check for repository
+        # This is needed because .svn always creates .subversion and 
+        # some operating systems do not handle dot directory correctly.
+        # Real queries in real svn repos with be concerned with it creation
+        with TempDir() as tempdir:
+            code, data = _run_command(['svn', 
+                                       '--config-dir', tempdir.path,
+                                       '--version', 
+                                       '--quiet'])
+
         if code == 0 and data:
             return data.strip()
         else:
@@ -247,13 +277,22 @@ def get_svn_version():
     @classmethod
     def load(cls, dirname=''):
         normdir = os.path.normpath(dirname)
-        code, data = _run_command(['svn', 'info', normdir])
+
+        # Temp config directory should be enough to check for repository
+        # This is needed because .svn always creates .subversion and 
+        # some operating systems do not handle dot directory correctly.
+        # Real queries in real svn repos with be concerned with it creation
+        with TempDir() as tempdir:
+            code, data = _run_command(['svn', 
+                                       '--config-dir', tempdir.path,
+                                       'info', normdir])
+
         # Must check for some contents, as some use empty directories
-        # in testcases
+        # in testcases, however only enteries is needed also the info
+        # command above MUST have worked
         svn_dir = os.path.join(normdir, '.svn')
-        has_svn = (os.path.isfile(os.path.join(svn_dir, 'entries')) or
-                   os.path.isfile(os.path.join(svn_dir, 'dir-props')) or
-                   os.path.isfile(os.path.join(svn_dir, 'dir-prop-base')))
+        is_svn_wd = (not code or
+                     os.path.isfile(os.path.join(svn_dir, 'entries')))
 
         svn_version = tuple(cls.get_svn_version().split('.'))
 
@@ -262,7 +301,8 @@ def load(cls, dirname=''):
         except ValueError:
             base_svn_version = tuple()
 
-        if not has_svn:
+        if not is_svn_wd:
+            #return an instance of this NO-OP class
             return SvnInfo(dirname)
 
         if code or not base_svn_version or base_svn_version < (1, 3):

From 962664bbb8564ccd3cff8072f20d56a9bdcf3043 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 15 Feb 2014 22:35:49 +0100
Subject: [PATCH 3855/8469] Use tempfile.TemporaryDirectory() with Python
 >=3.2.

---
 setuptools/py31compat.py | 26 ++++++++++++++++++++++++++
 setuptools/svn_utils.py  | 30 +++++-------------------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index dbb324b0e3..e6b2910a5b 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -9,3 +9,29 @@ def get_path(name):
         if name not in ('platlib', 'purelib'):
             raise ValueError("Name must be purelib or platlib")
         return get_python_lib(name=='platlib')
+
+try:
+    # Python >=3.2
+    from tempfile import TemporaryDirectory
+except ImportError:
+    import shutil
+    import tempfile
+    class TemporaryDirectory(object):
+        """"
+        Very simple temporary directory context manager.
+        Will try to delete afterward, but will also ignore OS and similar
+        errors on deletion.
+        """
+        def __init__(self):
+            self.name = None # Handle mkdtemp raising an exception
+            self.name = tempfile.mkdtemp()
+
+        def __enter__(self):
+            return self.name
+
+        def __exit__(self, exctype, excvalue, exctrace):
+            try:
+                shutil.rmtree(self.name, True)
+            except OSError: #removal errors are not the only possible
+                pass
+            self.name = None
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index e1d336e26b..d62fecd02a 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -5,12 +5,12 @@
 import xml.dom.pulldom
 import shlex
 import shutil
-import tempfile
 import locale
 import codecs
 import unicodedata
 import warnings
 from setuptools.compat import unicode
+from setuptools.py31compat import TemporaryDirectory
 from xml.sax.saxutils import unescape
 
 try:
@@ -29,26 +29,6 @@
 #       http://stackoverflow.com/questions/5658622/
 #              python-subprocess-popen-environment-path
 
-class TempDir(object):
-    """"
-    Very simple temporary directory context manager.
-    Will try to delete afterward, but will also ignore OS and similar
-    errors on deletion.
-    """
-    def __init__(self):
-        self.path = None
-
-    def __enter__(self):
-        self.path = tempfile.mkdtemp()
-        return self
-
-    def __exit__(self, exctype, excvalue, exctrace):
-        try:
-            shutil.rmtree(self.path, True)
-        except OSError: #removal errors are not the only possible
-            pass
-        self.path = None
-
 def _run_command(args, stdout=_PIPE, stderr=_PIPE, encoding=None, stream=0):
     #regarding the shell argument, see: http://bugs.python.org/issue8557
     try:
@@ -256,9 +236,9 @@ def get_svn_version():
         # This is needed because .svn always creates .subversion and 
         # some operating systems do not handle dot directory correctly.
         # Real queries in real svn repos with be concerned with it creation
-        with TempDir() as tempdir:
+        with TemporaryDirectory() as tempdir:
             code, data = _run_command(['svn', 
-                                       '--config-dir', tempdir.path,
+                                       '--config-dir', tempdir,
                                        '--version', 
                                        '--quiet'])
 
@@ -282,9 +262,9 @@ def load(cls, dirname=''):
         # This is needed because .svn always creates .subversion and 
         # some operating systems do not handle dot directory correctly.
         # Real queries in real svn repos with be concerned with it creation
-        with TempDir() as tempdir:
+        with TemporaryDirectory() as tempdir:
             code, data = _run_command(['svn', 
-                                       '--config-dir', tempdir.path,
+                                       '--config-dir', tempdir,
                                        'info', normdir])
 
         # Must check for some contents, as some use empty directories

From 657501ddc8410495c9f44b7280f4a7abf3241753 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 15 Feb 2014 22:54:03 +0100
Subject: [PATCH 3856/8469] Clean some imports.

---
 setuptools/command/install_egg_info.py | 2 +-
 setuptools/svn_utils.py                | 1 -
 setuptools/tests/test_bdist_egg.py     | 7 +++++--
 setuptools/tests/test_build_ext.py     | 3 +--
 setuptools/tests/test_develop.py       | 6 ++++--
 setuptools/tests/test_test.py          | 6 ++++--
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index f44b34b555..73b5ef7375 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,7 +1,7 @@
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 from distutils import log, dir_util
-import os, shutil, pkg_resources
+import os, pkg_resources
 
 class install_egg_info(Command):
     """Install an .egg-info directory for the package"""
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index d62fecd02a..8fc552fa73 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -4,7 +4,6 @@
 from distutils import log
 import xml.dom.pulldom
 import shlex
-import shutil
 import locale
 import codecs
 import unicodedata
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 1a12218645..cf4bcd1179 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -1,9 +1,12 @@
 """develop tests
 """
+import os
+import re
+import shutil
+import site
 import sys
-import os, re, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.compat import StringIO
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index a520ced9d6..a92e53ae26 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,6 +1,6 @@
 """build_ext tests
 """
-import os, shutil, tempfile, unittest
+import unittest
 from distutils.command.build_ext import build_ext as distutils_build_ext
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
@@ -17,4 +17,3 @@ def test_get_ext_filename(self):
         res = cmd.get_ext_filename('foo')
         wanted = distutils_build_ext.get_ext_filename(cmd, 'foo')
         assert res == wanted
-
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 7b90161a8a..18f35c0f45 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,9 +1,11 @@
 """develop tests
 """
+import os
+import shutil
+import site
 import sys
-import os, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 7a06a40329..f85123b05e 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -2,10 +2,12 @@
 
 """develop tests
 """
+import os
+import shutil
+import site
 import sys
-import os, shutil, tempfile, unittest
 import tempfile
-import site
+import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.compat import StringIO

From acad569cbe8ef47a3e891bff32e31c760bfdf200 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Feb 2014 09:25:05 -0500
Subject: [PATCH 3857/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1df52ba4e2..8fb29c4e11 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 3.0
 ---
 
+* Issue #125: Prevent Subversion support from creating a ~/.subversion
+  directory just for checking the presence of a Subversion repository.
 * Issue #12: Namespace packages are now imported lazily.  That is, the mere
   declaration of a namespace package in an egg on ``sys.path`` no longer
   causes it to be imported when ``pkg_resources`` is imported.  Note that this

From 7b7c594c8ce8b6a3e44e4a387dbc5da5a3d9094e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 15:21:12 -0500
Subject: [PATCH 3858/8469] Delint bdist_wininst

---
 setuptools/command/bdist_wininst.py | 38 ++++-------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index e8521f834c..b5be1f348b 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,12 +1,12 @@
+import os
 from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst
-import os, sys
 
 class bdist_wininst(_bdist_wininst):
     _good_upload = _bad_upload = None
 
     def create_exe(self, arcname, fullname, bitmap=None):
         _bdist_wininst.create_exe(self, arcname, fullname, bitmap)
-        installer_name = self.get_installer_filename(fullname) 
+        installer_name = self.get_installer_filename(fullname)
         if self.target_version:
             pyversion = self.target_version
             # fix 2.5+ bdist_wininst ignoring --target-version spec
@@ -14,7 +14,7 @@ def create_exe(self, arcname, fullname, bitmap=None):
         else:
             pyversion = 'any'
         self._good_upload = ('bdist_wininst', pyversion, installer_name)
-        
+
     def _fix_upload_names(self):
         good, bad = self._good_upload, self._bad_upload
         dist_files = getattr(self.distribution, 'dist_files', [])
@@ -23,7 +23,7 @@ def _fix_upload_names(self):
         if good not in dist_files:
             dist_files.append(good)
 
-    def reinitialize_command (self, command, reinit_subcommands=0):
+    def reinitialize_command(self, command, reinit_subcommands=0):
         cmd = self.distribution.reinitialize_command(
             command, reinit_subcommands)
         if command in ('install', 'install_lib'):
@@ -38,7 +38,6 @@ def run(self):
         finally:
             self._is_running = False
 
-
     if not hasattr(_bdist_wininst, 'get_installer_filename'):
         def get_installer_filename(self, fullname):
             # Factored out to allow overriding in subclasses
@@ -47,36 +46,9 @@ def get_installer_filename(self, fullname):
                 # it's better to include this in the name
                 installer_name = os.path.join(self.dist_dir,
                                               "%s.win32-py%s.exe" %
-                                               (fullname, self.target_version))
+                                              (fullname, self.target_version))
             else:
                 installer_name = os.path.join(self.dist_dir,
                                               "%s.win32.exe" % fullname)
             return installer_name
     # get_installer_filename()
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 22d6ecdd7229d471c27374523f21d2d37173db7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 15:26:11 -0500
Subject: [PATCH 3859/8469] Remove get_installer_filename (copied from some
 version of Python now required to be supplied).

---
 setuptools/command/bdist_wininst.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index b5be1f348b..b0eb4eaaf9 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -37,18 +37,3 @@ def run(self):
             self._fix_upload_names()
         finally:
             self._is_running = False
-
-    if not hasattr(_bdist_wininst, 'get_installer_filename'):
-        def get_installer_filename(self, fullname):
-            # Factored out to allow overriding in subclasses
-            if self.target_version:
-                # if we create an installer for a specific python version,
-                # it's better to include this in the name
-                installer_name = os.path.join(self.dist_dir,
-                                              "%s.win32-py%s.exe" %
-                                              (fullname, self.target_version))
-            else:
-                installer_name = os.path.join(self.dist_dir,
-                                              "%s.win32.exe" % fullname)
-            return installer_name
-    # get_installer_filename()

From 7747b612e8aa87883e7d495473f4f7df6d3b720d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 15:26:32 -0500
Subject: [PATCH 3860/8469] Remove unused import

---
 setuptools/command/bdist_wininst.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index b0eb4eaaf9..f6f06c4ef2 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,4 +1,3 @@
-import os
 from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst
 
 class bdist_wininst(_bdist_wininst):

From 5ae17b58d4823cb5e74ec1b7802c0debbc119dc9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 15:55:45 -0500
Subject: [PATCH 3861/8469] Remove patching of upload_names (dist_files) -
 Python 2.6 already does the right thing.

---
 setuptools/command/bdist_wininst.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index f6f06c4ef2..5effab2786 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,27 +1,6 @@
 from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst
 
 class bdist_wininst(_bdist_wininst):
-    _good_upload = _bad_upload = None
-
-    def create_exe(self, arcname, fullname, bitmap=None):
-        _bdist_wininst.create_exe(self, arcname, fullname, bitmap)
-        installer_name = self.get_installer_filename(fullname)
-        if self.target_version:
-            pyversion = self.target_version
-            # fix 2.5+ bdist_wininst ignoring --target-version spec
-            self._bad_upload = ('bdist_wininst', 'any', installer_name)
-        else:
-            pyversion = 'any'
-        self._good_upload = ('bdist_wininst', pyversion, installer_name)
-
-    def _fix_upload_names(self):
-        good, bad = self._good_upload, self._bad_upload
-        dist_files = getattr(self.distribution, 'dist_files', [])
-        if bad in dist_files:
-            dist_files.remove(bad)
-        if good not in dist_files:
-            dist_files.append(good)
-
     def reinitialize_command(self, command, reinit_subcommands=0):
         cmd = self.distribution.reinitialize_command(
             command, reinit_subcommands)
@@ -33,6 +12,5 @@ def run(self):
         self._is_running = True
         try:
             _bdist_wininst.run(self)
-            self._fix_upload_names()
         finally:
             self._is_running = False

From 404b7af74fb65299aa9c14e0e40541e3a4a68285 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 19:32:11 -0500
Subject: [PATCH 3862/8469] Update workaround to reference filed ticket.

---
 setuptools/command/bdist_wininst.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 5effab2786..d4d195a086 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -2,10 +2,14 @@
 
 class bdist_wininst(_bdist_wininst):
     def reinitialize_command(self, command, reinit_subcommands=0):
+        """
+        Supplement reinitialize_command to work around
+        http://bugs.python.org/issue20819
+        """
         cmd = self.distribution.reinitialize_command(
             command, reinit_subcommands)
         if command in ('install', 'install_lib'):
-            cmd.install_lib = None  # work around distutils bug
+            cmd.install_lib = None
         return cmd
 
     def run(self):

From 3ca95bfdfe8b4e68338f43de462e6b57e3fdf1a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Mar 2014 19:45:51 -0500
Subject: [PATCH 3863/8469] Remove excess whitespace

---
 setuptools/command/install_scripts.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 105dabca6a..1c6cc51d50 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -51,4 +51,3 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f.write(contents)
             f.close()
             chmod(target, 0x1FF-mask)  # 0777
-

From a0c7e67a26b11e3458424112bc78be90d52b2fc5 Mon Sep 17 00:00:00 2001
From: lsinger <none@none>
Date: Sat, 1 Mar 2014 18:02:23 -0800
Subject: [PATCH 3864/8469] Map .pyx sources to .c or .cpp depending on
 language

---
 setuptools/extension.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index d7892d3d9f..b72f6e2ac8 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -27,7 +27,18 @@ class Extension(_Extension):
     def __init__(self, *args, **kw):
         _Extension.__init__(self, *args, **kw)
         if not have_pyrex():
-            self._convert_pyx_sources_to_c()
+            if self.language.lower() == 'c++':
+                self._convert_pyx_sources_to_cpp()
+            else:
+                self._convert_pyx_sources_to_c()
+
+    def _convert_pyx_sources_to_cpp(self):
+        "convert .pyx extensions to .cpp"
+        def pyx_to_c(source):
+            if source.endswith('.pyx'):
+                source = source[:-4] + '.cpp'
+            return source
+        self.sources = list(map(pyx_to_c, self.sources))
 
     def _convert_pyx_sources_to_c(self):
         "convert .pyx extensions to .c"

From 11f4bbc2d46628ff5b3890b037928fec93802f3c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 4 Mar 2014 14:28:47 +0100
Subject: [PATCH 3865/8469] Issue #156: Fix spelling of __PYVENV_LAUNCHER__
 variable.

---
 CHANGES.txt                        | 1 +
 setuptools/command/easy_install.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8fb29c4e11..572280b73c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,7 @@ CHANGES
 * Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
   available in Python 2.6 and later, but also has better compatibility with
   Python 3 environments.
+* Issue #156: Fix spelling of __PYVENV_LAUNCHER__ variable.
 
 ---
 2.2
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8e39ee8024..4f497c3bed 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -53,7 +53,7 @@
     VersionConflict, DEVELOP_DIST,
 )
 
-sys_executable = os.environ.get('__VENV_LAUNCHER__',
+sys_executable = os.environ.get('__PYVENV_LAUNCHER__',
     os.path.normpath(sys.executable))
 
 __all__ = [

From d404db9c746c793109a43f286570faacf6d9d55c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 05:28:59 -0500
Subject: [PATCH 3866/8469] Added tag 3.0 for changeset 8e8c50925f18

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ac04062818..f2d9e2936d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -119,3 +119,4 @@ ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1
 caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
 39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2
 faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
+8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0

From 6d3b451a1084419d7cbfa09cfc59452bb5f983bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 05:29:28 -0500
Subject: [PATCH 3867/8469] Bumped to 3.1 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 90 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e4a357eb35..324c0774d5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.0"
+DEFAULT_VERSION = "3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 5e417433f7..78e8c09240 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[egg_info.writers]
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-requires.txt = setuptools.command.egg_info:write_requirements
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+[distutils.setup_keywords]
+eager_resources = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
 
 [distutils.commands]
-install = setuptools.command.install:install
 develop = setuptools.command.develop:develop
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
+build_py = setuptools.command.build_py:build_py
 rotate = setuptools.command.rotate:rotate
-saveopts = setuptools.command.saveopts:saveopts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-easy_install = setuptools.command.easy_install:easy_install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+install = setuptools.command.install:install
 install_lib = setuptools.command.install_lib:install_lib
-egg_info = setuptools.command.egg_info:egg_info
-sdist = setuptools.command.sdist:sdist
-build_py = setuptools.command.build_py:build_py
-upload_docs = setuptools.command.upload_docs:upload_docs
-register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 test = setuptools.command.test:test
+upload_docs = setuptools.command.upload_docs:upload_docs
+sdist = setuptools.command.sdist:sdist
+egg_info = setuptools.command.egg_info:egg_info
+easy_install = setuptools.command.easy_install:easy_install
+saveopts = setuptools.command.saveopts:saveopts
 setopt = setuptools.command.setopt:setopt
+install_scripts = setuptools.command.install_scripts:install_scripts
 
-[distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-use_2to3 = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-convert_2to3_doctests = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-tests_require = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[egg_info.writers]
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
 
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.4 = setuptools.command.easy_install:main
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fd464d812..9a6bf43731 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index f7d2e86941..27d4bb6661 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.0'
+__version__ = '3.1'

From 23fbe1420ca21a13d4324d87debb07a8e72a8625 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 05:36:37 -0500
Subject: [PATCH 3868/8469] Update documentation to reflect that ez_setup.py
 moves. Fixes #155.

---
 README.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.txt b/README.txt
index 4871735df0..c0ba1cb96d 100755
--- a/README.txt
+++ b/README.txt
@@ -18,6 +18,9 @@ Setuptools requires Python 2.6 or later. To install setuptools
 on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
 <https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
 
+The link provided to ez_setup.py is a bookmark to bootstrap script for the
+latest known stable release.
+
 .. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
 
 Windows 8 (Powershell)

From 0a7c27a2c4366fdfe4b1ba0b40e3b3761bdc0791 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 05:40:03 -0500
Subject: [PATCH 3869/8469] Add an actual curl example (for easier copy/paste).

---
 README.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.txt b/README.txt
index c0ba1cb96d..a6f6acba2f 100755
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Installation Instructions
 The recommended way to bootstrap setuptools on any system is to download
 `ez_setup.py`_ and run it using the target Python environment. Different
 operating systems have different recommended techniques to accomplish this
-basic routine, so here are some examples to get you started.
+basic routine, so below are some examples to get you started.
 
 Setuptools requires Python 2.6 or later. To install setuptools
 on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
@@ -77,8 +77,7 @@ install to the system Python::
 
     > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | sudo python
 
-Alternatively, on Python 2.6 and later, Setuptools may be installed to a
-user-local path::
+Alternatively, Setuptools may be installed to a user-local path::
 
     > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python - --user
 
@@ -86,7 +85,9 @@ Unix including Mac OS X (curl)
 ==============================
 
 If your system has curl installed, follow the ``wget`` instructions but
-replace ``wget`` with ``curl`` and ``-O`` with ``-o``.
+replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example::
+
+    > curl https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -o - | python
 
 
 Advanced Installation

From 2610eb2913cccd2e7264f47a79bdbf772611764a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 05:49:43 -0500
Subject: [PATCH 3870/8469] Removing the contributors file. While the project
 is immensely grateful for each and every contribution, a flat file of
 contributors is an extra burden for maintenance and has the potential to
 leave some contributors unacknowledged. Given the detailed use of the source
 code tools and references to the issue tracking systems, the actual
 contributions of each and every contributor, large or small, are
 transparently described. Thanks go out to all.

---
 CONTRIBUTORS.txt | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 CONTRIBUTORS.txt

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
deleted file mode 100644
index dd0b8c7f11..0000000000
--- a/CONTRIBUTORS.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-============
-Contributors
-============
-
-* Alex Grönholm
-* Alice Bevan-McGregor
-* Arfrever Frehtes Taifersar Arahesis
-* Christophe Combelles
-* Daniel Stutzbach
-* Daniel Holth
-* Dirley Rodrigues
-* Donald Stufft
-* Grigory Petrov
-* Hanno Schlichting
-* Jannis Leidel
-* Jason R. Coombs
-* Jim Fulton
-* Jonathan Lange
-* Justin Azoff
-* Lennart Regebro
-* Marc Abramowitz
-* Martin von Löwis
-* Noufal Ibrahim
-* Pedro Algarvio
-* Pete Hollobon
-* Phillip J. Eby
-* Philip Jenvey
-* Philip Thiem
-* Reinout van Rees
-* Robert Myers
-* Stefan H. Holek
-* Tarek Ziadé
-* Toshio Kuratomi
-
-If you think you name is missing, please add it (alpha order by first name)
-

From 468929dc9320a78926dd1cacd8353bdfe8fdedd1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 06:24:27 -0500
Subject: [PATCH 3871/8469] Restore support for Python 2.6 in bootstrap script.
 Fixes #157.

---
 CHANGES.txt |  7 +++++++
 ez_setup.py | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 572280b73c..2974a3b06f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+3.0.1
+-----
+
+* Issue #157: Restore support for Python 2.6 in bootstrap script where
+  ``zipfile.ZipFile`` does not yet have support for context managers.
+
 ---
 3.0
 ---
diff --git a/ez_setup.py b/ez_setup.py
index 324c0774d5..dbe2a2e3e1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -64,6 +64,19 @@ def _build_egg(egg, archive_filename, to_dir):
         raise IOError('Could not build the egg.')
 
 
+def get_zip_class():
+    """
+    Supplement ZipFile class to support context manager for Python 2.6
+    """
+    class ContextualZipFile(zipfile.ZipFile):
+        def __enter__(self):
+            return self
+        def __exit__(self, type, value, traceback):
+            self.close
+    return zipfile.Zipfile if hasattr(zipfile.ZipFile, '__exit__') else \
+        ContextualZipFile
+
+
 @contextlib.contextmanager
 def archive_context(filename):
     # extracting the archive
@@ -72,7 +85,7 @@ def archive_context(filename):
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        with zipfile.ZipFile(filename) as archive:
+        with get_zip_class()(filename) as archive:
             archive.extractall()
 
         # going in the directory

From eb2cbf86238b219b07a76f8f3c786e31df3a8327 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 06:24:45 -0500
Subject: [PATCH 3872/8469] Bumped to 3.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index dbe2a2e3e1..6ed0ef803a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.1"
+DEFAULT_VERSION = "3.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 27d4bb6661..b7a5531438 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.1'
+__version__ = '3.0.1'

From 83ef1504f4118c48af65b078f1a5968c4a173827 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 06:24:47 -0500
Subject: [PATCH 3873/8469] Added tag 3.0.1 for changeset cd9e857476ac

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f2d9e2936d..80103fc68e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -120,3 +120,4 @@ caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
 39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2
 faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
 8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0
+cd9e857476ac70515f7436f846b593f696ac672d 3.0.1

From 8005b272a99f4b5d992cefc332512898b3f9fa89 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 06:25:13 -0500
Subject: [PATCH 3874/8469] Bumped to 3.0.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 84 ++++++++++++++--------------
 setuptools/version.py                |  2 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6ed0ef803a..09821c3cc6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.0.1"
+DEFAULT_VERSION = "3.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 78e8c09240..0ad659229e 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,54 +1,34 @@
-[distutils.setup_keywords]
-eager_resources = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-extras_require = setuptools.dist:check_extras
-zip_safe = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-include_package_data = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
+[egg_info.writers]
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [distutils.commands]
-develop = setuptools.command.develop:develop
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+test = setuptools.command.test:test
+sdist = setuptools.command.sdist:sdist
+easy_install = setuptools.command.easy_install:easy_install
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
 register = setuptools.command.register:register
-build_py = setuptools.command.build_py:build_py
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+develop = setuptools.command.develop:develop
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_ext = setuptools.command.build_ext:build_ext
 rotate = setuptools.command.rotate:rotate
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 alias = setuptools.command.alias:alias
-build_ext = setuptools.command.build_ext:build_ext
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+build_py = setuptools.command.build_py:build_py
 install = setuptools.command.install:install
+saveopts = setuptools.command.saveopts:saveopts
 install_lib = setuptools.command.install_lib:install_lib
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-test = setuptools.command.test:test
 upload_docs = setuptools.command.upload_docs:upload_docs
-sdist = setuptools.command.sdist:sdist
-egg_info = setuptools.command.egg_info:egg_info
-easy_install = setuptools.command.easy_install:easy_install
-saveopts = setuptools.command.saveopts:saveopts
-setopt = setuptools.command.setopt:setopt
-install_scripts = setuptools.command.install_scripts:install_scripts
-
-[egg_info.writers]
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
@@ -60,3 +40,23 @@ eggsecutable = setuptools.command.easy_install:bootstrap
 easy_install = setuptools.command.easy_install:main
 easy_install-3.4 = setuptools.command.easy_install:main
 
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
+test_suite = setuptools.dist:check_test_suite
+exclude_package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+test_loader = setuptools.dist:check_importable
+entry_points = setuptools.dist:check_entry_points
+extras_require = setuptools.dist:check_extras
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+
diff --git a/setuptools/version.py b/setuptools/version.py
index b7a5531438..da4039bce3 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.0.2'

From a0999be8ebc5d05763c3ea96ecfa9b8055e264f3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 09:30:02 -0500
Subject: [PATCH 3875/8469] Correct typo in previous bugfix

---
 CHANGES.txt | 6 ++++++
 ez_setup.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2974a3b06f..6bf73335d0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+3.0.2
+-----
+
+* Correct typo in previous bugfix.
+
 -----
 3.0.1
 -----
diff --git a/ez_setup.py b/ez_setup.py
index 09821c3cc6..e5adaca6c6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -73,7 +73,7 @@ def __enter__(self):
             return self
         def __exit__(self, type, value, traceback):
             self.close
-    return zipfile.Zipfile if hasattr(zipfile.ZipFile, '__exit__') else \
+    return zipfile.ZipFile if hasattr(zipfile.ZipFile, '__exit__') else \
         ContextualZipFile
 
 

From 78f26911a6c396355641eb359beb877479e24153 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 09:30:12 -0500
Subject: [PATCH 3876/8469] Added tag 3.0.2 for changeset bad1f30ee0df

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 80103fc68e..bbe48b933e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -121,3 +121,4 @@ caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
 faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
 8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0
 cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
+bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2

From b57bf23d249df282af0ae499bb99bcdc2bebcc1c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 09:30:39 -0500
Subject: [PATCH 3877/8469] Bumped to 3.0.3 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 92 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e5adaca6c6..68ca77ace6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.0.2"
+DEFAULT_VERSION = "3.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 0ad659229e..d5bc899083 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
 [egg_info.writers]
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
 dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+requires.txt = setuptools.command.egg_info:write_requirements
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+
+[distutils.setup_keywords]
+namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+convert_2to3_doctests = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+test_loader = setuptools.dist:check_importable
+tests_require = setuptools.dist:check_requirements
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+install_requires = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+use_2to3_fixers = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 test = setuptools.command.test:test
-sdist = setuptools.command.sdist:sdist
-easy_install = setuptools.command.easy_install:easy_install
-egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-register = setuptools.command.register:register
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
 develop = setuptools.command.develop:develop
-install_scripts = setuptools.command.install_scripts:install_scripts
 build_ext = setuptools.command.build_ext:build_ext
 rotate = setuptools.command.rotate:rotate
-alias = setuptools.command.alias:alias
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_py = setuptools.command.build_py:build_py
+easy_install = setuptools.command.easy_install:easy_install
 install = setuptools.command.install:install
-saveopts = setuptools.command.saveopts:saveopts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
 install_lib = setuptools.command.install_lib:install_lib
 upload_docs = setuptools.command.upload_docs:upload_docs
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+alias = setuptools.command.alias:alias
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
+egg_info = setuptools.command.egg_info:egg_info
+setopt = setuptools.command.setopt:setopt
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_py = setuptools.command.build_py:build_py
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-package_data = setuptools.dist:check_package_data
-test_suite = setuptools.dist:check_test_suite
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-test_loader = setuptools.dist:check_importable
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 9a6bf43731..4fd464d812 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==0.0.8
-
 [ssl:sys_platform=='win32']
-wincertstore==0.1
\ No newline at end of file
+wincertstore==0.1
+
+[certs]
+certifi==0.0.8
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index da4039bce3..d2983471fb 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.0.2'
+__version__ = '3.0.3'

From 418afc938ef45cbedb7cbf37f11133725c43f6c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 09:50:34 -0500
Subject: [PATCH 3878/8469] Try invoking ez_setup.py to ensure it works at a
 basic level

--HG--
extra : amend_source : 7cb5d6115f9933afd90e5d96a53af9c3ada79b80
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e13a5d4fde..2afa21a7af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,6 @@ python:
   - 3.3
   - pypy
 # command to run tests
-script: python setup.py test
+script:
+ - python setup.py test
+ - python ez_setup.py --user

From 4a641d6b17ca46fd04d3d5f75c80809bf32ad75d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 09:54:32 -0500
Subject: [PATCH 3879/8469] The DEFAULT_VERSION won't be present. Try an
 earlier vesion.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2afa21a7af..819885a628 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ python:
 # command to run tests
 script:
  - python setup.py test
- - python ez_setup.py --user
+ - python -c "import ez_setup; ez_setup.main('3.0.2')" --user

From 65f1b9b492d38e014be35489ffda591ce40552db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 10:29:44 -0500
Subject: [PATCH 3880/8469] Allow version to be passed to ez_setup.py. The
 parameter to main wasn't being used, so removed it.

--HG--
extra : amend_source : 2a653d81b4afea7d91c9e58a537317dd24673ee0
---
 ez_setup.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 68ca77ace6..97d60e768e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -310,15 +310,22 @@ def _parse_args():
         const=lambda: download_file_insecure, default=get_best_downloader,
         help='Use internal, non-validating downloader'
     )
+    parser.add_option(
+        '--version', help="Specify which version to download",
+        default=DEFAULT_VERSION,
+    )
     options, args = parser.parse_args()
     # positional arguments are ignored
     return options
 
-def main(version=DEFAULT_VERSION):
+def main():
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()
-    archive = download_setuptools(download_base=options.download_base,
-        downloader_factory=options.downloader_factory)
+    archive = download_setuptools(
+        version=options.version,
+        download_base=options.download_base,
+        downloader_factory=options.downloader_factory,
+    )
     return _install(archive, _build_install_args(options))
 
 if __name__ == '__main__':

From d263e40875b2d7bea9659df905dc3bb94a42a30e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 10:30:36 -0500
Subject: [PATCH 3881/8469] Exercise ez_setup.py now using the new version
 command line parameter.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 819885a628..90b715d86f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ python:
 # command to run tests
 script:
  - python setup.py test
- - python -c "import ez_setup; ez_setup.main('3.0.2')" --user
+ - python ez_setup.py --version 3.0.2 --user

From 3e99a57dcc3f2f0d9cc3f7f40077039bfd7a45a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 6 Mar 2014 10:46:12 -0500
Subject: [PATCH 3882/8469] Forget --user

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 90b715d86f..bf0aeba634 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ python:
 # command to run tests
 script:
  - python setup.py test
- - python ez_setup.py --version 3.0.2 --user
+ - python ez_setup.py --version 3.0.2

From e4460fad043f4fa0edc7b7e1eef0b209f4588fe5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Mar 2014 08:24:33 -0500
Subject: [PATCH 3883/8469] Backout b17e9a0ea116 and 50725de303ef, restoring
 Feature model. Fixes #161 and re-opens #65.

--HG--
extra : amend_source : f14bc0bf6c9f04e16d30ce0abf7bcb944f41ebea
---
 setuptools/__init__.py       |   4 +-
 setuptools/dist.py           | 259 ++++++++++++++++++++++++++++++++++-
 setuptools/tests/__init__.py |  84 ++++++++++++
 3 files changed, 342 insertions(+), 5 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index fb2fffc02b..fc9b7b936c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -9,11 +9,11 @@
 
 import setuptools.version
 from setuptools.extension import Extension
-from setuptools.dist import Distribution, _get_unpatched
+from setuptools.dist import Distribution, Feature, _get_unpatched
 from setuptools.depends import Require
 
 __all__ = [
-    'setup', 'Distribution', 'Command', 'Extension', 'Require',
+    'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
 ]
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index dcb9ba4ee0..0801ae74ff 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -3,12 +3,15 @@
 import re
 import os
 import sys
+import warnings
 import distutils.log
 import distutils.core
 import distutils.cmd
 from distutils.core import Distribution as _Distribution
-from distutils.errors import DistutilsSetupError
+from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
+    DistutilsSetupError)
 
+from setuptools.depends import Require
 from setuptools.compat import numeric_types, basestring
 import pkg_resources
 
@@ -134,7 +137,7 @@ def check_packages(dist, attr, value):
 
 
 class Distribution(_Distribution):
-    """Distribution with support for tests and package data
+    """Distribution with support for features, tests, and package data
 
     This is an enhanced version of 'distutils.dist.Distribution' that
     effectively adds the following new optional keyword arguments to 'setup()':
@@ -161,6 +164,21 @@ class Distribution(_Distribution):
         EasyInstall and requests one of your extras, the corresponding
         additional requirements will be installed if needed.
 
+     'features' **deprecated** -- a dictionary mapping option names to
+        'setuptools.Feature'
+        objects.  Features are a portion of the distribution that can be
+        included or excluded based on user options, inter-feature dependencies,
+        and availability on the current system.  Excluded features are omitted
+        from all setup commands, including source and binary distributions, so
+        you can create multiple distributions from the same source tree.
+        Feature names should be valid Python identifiers, except that they may
+        contain the '-' (minus) sign.  Features can be included or excluded
+        via the command line options '--with-X' and '--without-X', where 'X' is
+        the name of the feature.  Whether a feature is included by default, and
+        whether you are allowed to control this from the command line, is
+        determined by the Feature object.  See the 'Feature' class for more
+        information.
+
      'test_suite' -- the name of a test suite to run for the 'test' command.
         If the user runs 'python setup.py test', the package will be installed,
         and the named test suite will be run.  The format is the same as
@@ -182,7 +200,8 @@ class Distribution(_Distribution):
     for manipulating the distribution's contents.  For example, the 'include()'
     and 'exclude()' methods can be thought of as in-place add and subtract
     commands that add or remove packages, modules, extensions, and so on from
-    the distribution.
+    the distribution.  They are used by the feature subsystem to configure the
+    distribution for the included and excluded features.
     """
 
     _patched_dist = None
@@ -204,6 +223,11 @@ def __init__(self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
+        _attrs_dict = attrs or {}
+        if 'features' in _attrs_dict or 'require_features' in _attrs_dict:
+            Feature.warn_deprecated()
+        self.require_features = []
+        self.features = {}
         self.dist_files = []
         self.src_root = attrs and attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
@@ -221,6 +245,17 @@ def __init__(self, attrs=None):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 
+    def parse_command_line(self):
+        """Process features after parsing command line options"""
+        result = _Distribution.parse_command_line(self)
+        if self.features:
+            self._finalize_features()
+        return result
+
+    def _feature_attrname(self,name):
+        """Convert feature name to corresponding option attribute name"""
+        return 'with_'+name.replace('-','_')
+
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         from pkg_resources import working_set, parse_requirements
@@ -232,6 +267,8 @@ def fetch_build_eggs(self, requires):
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
+        if self.features:
+            self._set_global_opts_from_features()
 
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             value = getattr(self,ep.name,None)
@@ -276,6 +313,47 @@ def fetch_build_egg(self, req):
             self._egg_fetcher = cmd
         return cmd.easy_install(req)
 
+    def _set_global_opts_from_features(self):
+        """Add --with-X/--without-X options based on optional features"""
+
+        go = []
+        no = self.negative_opt.copy()
+
+        for name,feature in self.features.items():
+            self._set_feature(name,None)
+            feature.validate(self)
+
+            if feature.optional:
+                descr = feature.description
+                incdef = ' (default)'
+                excdef=''
+                if not feature.include_by_default():
+                    excdef, incdef = incdef, excdef
+
+                go.append(('with-'+name, None, 'include '+descr+incdef))
+                go.append(('without-'+name, None, 'exclude '+descr+excdef))
+                no['without-'+name] = 'with-'+name
+
+        self.global_options = self.feature_options = go + self.global_options
+        self.negative_opt = self.feature_negopt = no
+
+    def _finalize_features(self):
+        """Add/remove features and resolve dependencies between them"""
+
+        # First, flag all the enabled items (and thus their dependencies)
+        for name,feature in self.features.items():
+            enabled = self.feature_is_included(name)
+            if enabled or (enabled is None and feature.include_by_default()):
+                feature.include_in(self)
+                self._set_feature(name,1)
+
+        # Then disable the rest, so that off-by-default features don't
+        # get flagged as errors when they're required by an enabled feature
+        for name,feature in self.features.items():
+            if not self.feature_is_included(name):
+                feature.exclude_from(self)
+                self._set_feature(name,0)
+
     def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
@@ -295,6 +373,25 @@ def print_commands(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
+    def _set_feature(self,name,status):
+        """Set feature's inclusion status"""
+        setattr(self,self._feature_attrname(name),status)
+
+    def feature_is_included(self,name):
+        """Return 1 if feature is included, 0 if excluded, 'None' if unknown"""
+        return getattr(self,self._feature_attrname(name))
+
+    def include_feature(self,name):
+        """Request inclusion of feature named 'name'"""
+
+        if self.feature_is_included(name)==0:
+            descr = self.features[name].description
+            raise DistutilsOptionError(
+                descr + " is required, but was excluded or is not available"
+            )
+        self.features[name].include_in(self)
+        self._set_feature(name,1)
+
     def include(self,**attrs):
         """Add items to distribution that are named in keyword arguments
 
@@ -542,3 +639,159 @@ def handle_display_options(self, option_order):
 # Install it throughout the distutils
 for module in distutils.dist, distutils.core, distutils.cmd:
     module.Distribution = Distribution
+
+
+class Feature:
+    """
+    **deprecated** -- The `Feature` facility was never completely implemented
+    or supported, `has reported issues
+    <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
+    a future version.
+
+    A subset of the distribution that can be excluded if unneeded/wanted
+
+    Features are created using these keyword arguments:
+
+      'description' -- a short, human readable description of the feature, to
+         be used in error messages, and option help messages.
+
+      'standard' -- if true, the feature is included by default if it is
+         available on the current system.  Otherwise, the feature is only
+         included if requested via a command line '--with-X' option, or if
+         another included feature requires it.  The default setting is 'False'.
+
+      'available' -- if true, the feature is available for installation on the
+         current system.  The default setting is 'True'.
+
+      'optional' -- if true, the feature's inclusion can be controlled from the
+         command line, using the '--with-X' or '--without-X' options.  If
+         false, the feature's inclusion status is determined automatically,
+         based on 'availabile', 'standard', and whether any other feature
+         requires it.  The default setting is 'True'.
+
+      'require_features' -- a string or sequence of strings naming features
+         that should also be included if this feature is included.  Defaults to
+         empty list.  May also contain 'Require' objects that should be
+         added/removed from the distribution.
+
+      'remove' -- a string or list of strings naming packages to be removed
+         from the distribution if this feature is *not* included.  If the
+         feature *is* included, this argument is ignored.  This argument exists
+         to support removing features that "crosscut" a distribution, such as
+         defining a 'tests' feature that removes all the 'tests' subpackages
+         provided by other features.  The default for this argument is an empty
+         list.  (Note: the named package(s) or modules must exist in the base
+         distribution when the 'setup()' function is initially called.)
+
+      other keywords -- any other keyword arguments are saved, and passed to
+         the distribution's 'include()' and 'exclude()' methods when the
+         feature is included or excluded, respectively.  So, for example, you
+         could pass 'packages=["a","b"]' to cause packages 'a' and 'b' to be
+         added or removed from the distribution as appropriate.
+
+    A feature must include at least one 'requires', 'remove', or other
+    keyword argument.  Otherwise, it can't affect the distribution in any way.
+    Note also that you can subclass 'Feature' to create your own specialized
+    feature types that modify the distribution in other ways when included or
+    excluded.  See the docstrings for the various methods here for more detail.
+    Aside from the methods, the only feature attributes that distributions look
+    at are 'description' and 'optional'.
+    """
+
+    @staticmethod
+    def warn_deprecated():
+        warnings.warn(
+            "Features are deprecated and will be removed in a future "
+                "version. See http://bitbucket.org/pypa/setuptools/65.",
+            DeprecationWarning,
+            stacklevel=3,
+        )
+
+    def __init__(self, description, standard=False, available=True,
+            optional=True, require_features=(), remove=(), **extras):
+        self.warn_deprecated()
+
+        self.description = description
+        self.standard = standard
+        self.available = available
+        self.optional = optional
+        if isinstance(require_features,(str,Require)):
+            require_features = require_features,
+
+        self.require_features = [
+            r for r in require_features if isinstance(r,str)
+        ]
+        er = [r for r in require_features if not isinstance(r,str)]
+        if er: extras['require_features'] = er
+
+        if isinstance(remove,str):
+            remove = remove,
+        self.remove = remove
+        self.extras = extras
+
+        if not remove and not require_features and not extras:
+            raise DistutilsSetupError(
+                "Feature %s: must define 'require_features', 'remove', or at least one"
+                " of 'packages', 'py_modules', etc."
+            )
+
+    def include_by_default(self):
+        """Should this feature be included by default?"""
+        return self.available and self.standard
+
+    def include_in(self,dist):
+
+        """Ensure feature and its requirements are included in distribution
+
+        You may override this in a subclass to perform additional operations on
+        the distribution.  Note that this method may be called more than once
+        per feature, and so should be idempotent.
+
+        """
+
+        if not self.available:
+            raise DistutilsPlatformError(
+                self.description+" is required,"
+                "but is not available on this platform"
+            )
+
+        dist.include(**self.extras)
+
+        for f in self.require_features:
+            dist.include_feature(f)
+
+    def exclude_from(self,dist):
+
+        """Ensure feature is excluded from distribution
+
+        You may override this in a subclass to perform additional operations on
+        the distribution.  This method will be called at most once per
+        feature, and only after all included features have been asked to
+        include themselves.
+        """
+
+        dist.exclude(**self.extras)
+
+        if self.remove:
+            for item in self.remove:
+                dist.exclude_package(item)
+
+    def validate(self,dist):
+
+        """Verify that feature makes sense in context of distribution
+
+        This method is called by the distribution just before it parses its
+        command line.  It checks to ensure that the 'remove' attribute, if any,
+        contains only valid package/module names that are present in the base
+        distribution when 'setup()' is called.  You may override it in a
+        subclass to perform any other required validation of the feature
+        against a target distribution.
+        """
+
+        for item in self.remove:
+            if not dist.has_contents_for(item):
+                raise DistutilsSetupError(
+                    "%s wants to be able to remove %s, but the distribution"
+                    " doesn't contain any packages or modules under %s"
+                    % (self.description, item, item)
+                )
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index a8eb711040..b5328ce67a 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -14,6 +14,7 @@
 from setuptools.compat import func_code
 import setuptools.dist
 import setuptools.depends as dep
+from setuptools import Feature
 from setuptools.depends import Require
 
 def additional_tests():
@@ -230,6 +231,89 @@ def testInvalidIncludeExclude(self):
             self.dist.exclude, package_dir=['q']
         )
 
+
+class FeatureTests(unittest.TestCase):
+
+    def setUp(self):
+        self.req = Require('Distutils','1.0.3','distutils')
+        self.dist = makeSetup(
+            features={
+                'foo': Feature("foo",standard=True,require_features=['baz',self.req]),
+                'bar': Feature("bar",  standard=True, packages=['pkg.bar'],
+                               py_modules=['bar_et'], remove=['bar.ext'],
+                       ),
+                'baz': Feature(
+                        "baz", optional=False, packages=['pkg.baz'],
+                        scripts = ['scripts/baz_it'],
+                        libraries=[('libfoo','foo/foofoo.c')]
+                       ),
+                'dwim': Feature("DWIM", available=False, remove='bazish'),
+            },
+            script_args=['--without-bar', 'install'],
+            packages = ['pkg.bar', 'pkg.foo'],
+            py_modules = ['bar_et', 'bazish'],
+            ext_modules = [Extension('bar.ext',['bar.c'])]
+        )
+
+    def testDefaults(self):
+        self.assertTrue(not
+            Feature(
+                "test",standard=True,remove='x',available=False
+            ).include_by_default()
+        )
+        self.assertTrue(
+            Feature("test",standard=True,remove='x').include_by_default()
+        )
+        # Feature must have either kwargs, removes, or require_features
+        self.assertRaises(DistutilsSetupError, Feature, "test")
+
+    def testAvailability(self):
+        self.assertRaises(
+            DistutilsPlatformError,
+            self.dist.features['dwim'].include_in, self.dist
+        )
+
+    def testFeatureOptions(self):
+        dist = self.dist
+        self.assertTrue(
+            ('with-dwim',None,'include DWIM') in dist.feature_options
+        )
+        self.assertTrue(
+            ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
+        )
+        self.assertTrue(
+            ('with-bar',None,'include bar (default)') in dist.feature_options
+        )
+        self.assertTrue(
+            ('without-bar',None,'exclude bar') in dist.feature_options
+        )
+        self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
+        self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
+        self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
+        self.assertTrue(not 'without-baz' in dist.feature_negopt)
+
+    def testUseFeatures(self):
+        dist = self.dist
+        self.assertEqual(dist.with_foo,1)
+        self.assertEqual(dist.with_bar,0)
+        self.assertEqual(dist.with_baz,1)
+        self.assertTrue(not 'bar_et' in dist.py_modules)
+        self.assertTrue(not 'pkg.bar' in dist.packages)
+        self.assertTrue('pkg.baz' in dist.packages)
+        self.assertTrue('scripts/baz_it' in dist.scripts)
+        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
+        self.assertEqual(dist.ext_modules,[])
+        self.assertEqual(dist.require_features, [self.req])
+
+        # If we ask for bar, it should fail because we explicitly disabled
+        # it on the command line
+        self.assertRaises(DistutilsOptionError, dist.include_feature, 'bar')
+
+    def testFeatureWithInvalidRemove(self):
+        self.assertRaises(
+            SystemExit, makeSetup, features = {'x':Feature('x', remove='y')}
+        )
+
 class TestCommandTests(unittest.TestCase):
 
     def testTestIsCommand(self):

From 487a7dab9a16614dcdb80f557cb27eb234e17052 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Mar 2014 08:29:36 -0500
Subject: [PATCH 3884/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6bf73335d0..68a369969c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+3.1
+---
+
+* Issue #161: Restore Features functionality to allow backward compatibility
+  (for Features) until the uses of that functionality is sufficiently removed.
+
 -----
 3.0.2
 -----

From de6b16d5e0eb055dfbb55df4d90cf7f3eab80390 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Mar 2014 08:35:29 -0500
Subject: [PATCH 3885/8469] Bumped to 3.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 97d60e768e..1f668e5bb6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.0.3"
+DEFAULT_VERSION = "3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index d2983471fb..27d4bb6661 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.0.3'
+__version__ = '3.1'

From 5baf7744df8c0d06562938f409a9ad95e6d77cab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Mar 2014 08:35:37 -0500
Subject: [PATCH 3886/8469] Added tag 3.1 for changeset 47224d55ddc6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bbe48b933e..b9e6efddcd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -122,3 +122,4 @@ faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
 8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0
 cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
 bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
+47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1

From 7a47250f321d165b6765d5590c4869d200960edd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Mar 2014 08:36:15 -0500
Subject: [PATCH 3887/8469] Bumped to 3.2 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 72 ++++++++++++++--------------
 setuptools/version.py                |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1f668e5bb6..f7eb67f22b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.1"
+DEFAULT_VERSION = "3.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index d5bc899083..c876c7794f 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 requires.txt = setuptools.command.egg_info:write_requirements
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
 
 [distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
 use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
 test_suite = setuptools.dist:check_test_suite
-convert_2to3_doctests = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-zip_safe = setuptools.dist:assert_bool
 exclude_package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
 test_loader = setuptools.dist:check_importable
+zip_safe = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
 use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-use_2to3_fixers = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
 extras_require = setuptools.dist:check_extras
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
+namespace_packages = setuptools.dist:check_nsp
 
 [distutils.commands]
-test = setuptools.command.test:test
-develop = setuptools.command.develop:develop
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 easy_install = setuptools.command.easy_install:easy_install
-install = setuptools.command.install:install
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
 upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
 register = setuptools.command.register:register
+install_lib = setuptools.command.install_lib:install_lib
+test = setuptools.command.test:test
+build_py = setuptools.command.build_py:build_py
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+sdist = setuptools.command.sdist:sdist
+develop = setuptools.command.develop:develop
+build_ext = setuptools.command.build_ext:build_ext
 egg_info = setuptools.command.egg_info:egg_info
-setopt = setuptools.command.setopt:setopt
+rotate = setuptools.command.rotate:rotate
 install_scripts = setuptools.command.install_scripts:install_scripts
-build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
+saveopts = setuptools.command.saveopts:saveopts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install = setuptools.command.install:install
 
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
+
diff --git a/setuptools/version.py b/setuptools/version.py
index 27d4bb6661..d7e6e824bc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.1'
+__version__ = '3.2'

From 261a4ed096f5be63d138eadc31361038b0b515fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Mar 2014 08:19:09 -0400
Subject: [PATCH 3888/8469] Use a single method to handle both languages.

---
 CHANGES.txt             |  6 ++++++
 setuptools/extension.py | 34 +++++++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 68a369969c..ca1bd00cf1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+3.2
+---
+
+* Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
+
 ---
 3.1
 ---
diff --git a/setuptools/extension.py b/setuptools/extension.py
index b72f6e2ac8..06ec1cec51 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -26,27 +26,23 @@ class Extension(_Extension):
 
     def __init__(self, *args, **kw):
         _Extension.__init__(self, *args, **kw)
-        if not have_pyrex():
-            if self.language.lower() == 'c++':
-                self._convert_pyx_sources_to_cpp()
-            else:
-                self._convert_pyx_sources_to_c()
-
-    def _convert_pyx_sources_to_cpp(self):
-        "convert .pyx extensions to .cpp"
-        def pyx_to_c(source):
+        self._convert_pyx_sources_to_lang()
+
+    def _convert_pyx_sources_to_lang(self):
+        """
+        Replace sources with .pyx extensions to sources with the target
+        language extension. This mechanism allows language authors to supply
+        pre-converted sources but to prefer the .pyx sources.
+        """
+        if have_pyrex():
+            # the build has Cython, so allow it to compile the .pyx files
+            return
+        def pyx_to_target(source):
+            target_ext = '.cpp' if self.language.lower() == 'c++' else '.c'
             if source.endswith('.pyx'):
-                source = source[:-4] + '.cpp'
+                source = source[:-4] + target_ext
             return source
-        self.sources = list(map(pyx_to_c, self.sources))
-
-    def _convert_pyx_sources_to_c(self):
-        "convert .pyx extensions to .c"
-        def pyx_to_c(source):
-            if source.endswith('.pyx'):
-                source = source[:-4] + '.c'
-            return source
-        self.sources = list(map(pyx_to_c, self.sources))
+        self.sources = list(map(pyx_to_target, self.sources))
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""

From c8da4c3399dd564c24a42171e7043d43e0b01659 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Mar 2014 08:22:09 -0400
Subject: [PATCH 3889/8469] self.language could be None (and is None by
 default)

---
 setuptools/extension.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index 06ec1cec51..d8516092e6 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -38,7 +38,8 @@ def _convert_pyx_sources_to_lang(self):
             # the build has Cython, so allow it to compile the .pyx files
             return
         def pyx_to_target(source):
-            target_ext = '.cpp' if self.language.lower() == 'c++' else '.c'
+            lang = self.language or ''
+            target_ext = '.cpp' if lang.lower() == 'c++' else '.c'
             if source.endswith('.pyx'):
                 source = source[:-4] + target_ext
             return source

From 8dfa58696aff81a6fa7ab2d10d859610711fdb49 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Mar 2014 08:26:10 -0400
Subject: [PATCH 3890/8469] Use functools.partial and re.sub to construct the
 substitution function.

---
 setuptools/extension.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index d8516092e6..ab5908dabb 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -1,4 +1,6 @@
 import sys
+import re
+import functools
 import distutils.core
 import distutils.extension
 
@@ -37,13 +39,10 @@ def _convert_pyx_sources_to_lang(self):
         if have_pyrex():
             # the build has Cython, so allow it to compile the .pyx files
             return
-        def pyx_to_target(source):
-            lang = self.language or ''
-            target_ext = '.cpp' if lang.lower() == 'c++' else '.c'
-            if source.endswith('.pyx'):
-                source = source[:-4] + target_ext
-            return source
-        self.sources = list(map(pyx_to_target, self.sources))
+        lang = self.language or ''
+        target_ext = '.cpp' if lang.lower() == 'c++' else '.c'
+        sub = functools.partial(re.sub, '.pyx$', target_ext)
+        self.sources = list(map(sub, self.sources))
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""

From f7d2631f4d00b8dfe3bd949691025bc957c0ee97 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Tue, 11 Mar 2014 02:51:16 +0100
Subject: [PATCH 3891/8469] Issue #162: Update dependency on certifi to 1.0.1.

---
 CHANGES.txt                              | 1 +
 setup.py                                 | 4 ++--
 setuptools.egg-info/dependency_links.txt | 2 +-
 setuptools.egg-info/requires.txt         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ca1bd00cf1..8cf7184635 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ---
 
 * Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
+* Issue #162: Update dependency on certifi to 1.0.1.
 
 ---
 3.1
diff --git a/setup.py b/setup.py
index 5d19cd9659..8023c4693d 100755
--- a/setup.py
+++ b/setup.py
@@ -189,10 +189,10 @@ def run(self):
         """).strip().splitlines(),
     extras_require = {
         "ssl:sys_platform=='win32'": "wincertstore==0.1",
-        "certs": "certifi==0.0.8",
+        "certs": "certifi==1.0.1",
     },
     dependency_links = [
-        'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
     ],
     scripts = [],
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index b1c9a2c9c6..0936bf3512 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,2 +1,2 @@
-https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec
+https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790
 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fd464d812..24df854413 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -4,4 +4,4 @@
 wincertstore==0.1
 
 [certs]
-certifi==0.0.8
\ No newline at end of file
+certifi==1.0.1

From 4ca7386a58ba92c5c89d0872933384f7d1fea115 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Mar 2014 22:48:41 -0400
Subject: [PATCH 3892/8469] Reindent and remove excess whitespace

---
 setuptools/command/install_lib.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index c508cd3317..63dc11fe38 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -14,10 +14,9 @@ def run(self):
     def get_exclusions(self):
         exclude = {}
         nsp = self.distribution.namespace_packages
-
-        if (nsp and self.get_finalized_command('install')
-               .single_version_externally_managed
-        ):
+        svem = (nsp and self.get_finalized_command('install')
+            .single_version_externally_managed)
+        if svem:
             for pkg in nsp:
                 parts = pkg.split('.')
                 while parts:
@@ -62,9 +61,3 @@ def get_outputs(self):
         if exclude:
             return [f for f in outputs if f not in exclude]
         return outputs
-
-
-
-
-
-

From e72e8676e8b9eec8e39c14258c145b8e2e120769 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Mar 2014 23:11:19 -0400
Subject: [PATCH 3893/8469] Remove special handling of 'no_compile' option with
 comment about making DISTUTILS_DEBUG work right. While testing on Python 2.6
 and later, I was unable to evoke any abberant or distinct behavior by
 removing the value (with DISTUTILS_DEBUG enabled and using variations of
 --compile and --no-compile). Therefore, I believe that whatever was the
 motivation for adding the attribute (in 2c91c12dc9b1), its purpose has
 passed.

---
 setuptools/command/install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 459cd3cd59..784e8efd6c 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -25,7 +25,6 @@ def initialize_options(self):
         _install.initialize_options(self)
         self.old_and_unmanageable = None
         self.single_version_externally_managed = None
-        self.no_compile = None  # make DISTUTILS_DEBUG work right!
 
     def finalize_options(self):
         _install.finalize_options(self)

From d85061213f0f899826feefd4c45e7222989883b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Mar 2014 21:26:03 -0400
Subject: [PATCH 3894/8469] Python 2.6 or later is required

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8023c4693d..e7065c2beb 100755
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,7 @@ def run(self):
 
     py_modules = ['pkg_resources', 'easy_install'],
 
-    zip_safe = (sys.version>="2.5"),   # <2.5 needs unzipped for -m to work
+    zip_safe = True,
 
     cmdclass = {'test': test},
     entry_points = {

From d896eb9ee9ea29817ef0084996e6e52d547938b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Mar 2014 21:29:55 -0400
Subject: [PATCH 3895/8469] Bump wincertstore to 0.2. Fixes #164.

---
 CHANGES.txt | 1 +
 setup.py    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8cf7184635..f5b220d949 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
 * Issue #162: Update dependency on certifi to 1.0.1.
+* Issue #164: Update dependency on wincertstore to 0.2.
 
 ---
 3.1
diff --git a/setup.py b/setup.py
index e7065c2beb..3d5307d533 100755
--- a/setup.py
+++ b/setup.py
@@ -188,12 +188,12 @@ def run(self):
         Topic :: Utilities
         """).strip().splitlines(),
     extras_require = {
-        "ssl:sys_platform=='win32'": "wincertstore==0.1",
+        "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==1.0.1",
     },
     dependency_links = [
         'https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790',
-        'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c',
+        'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts = [],
     # tests_require = "setuptools[ssl]",

From a85e52f43285ba8eac8ea57c1996a33e6ea23fa4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Mar 2014 23:11:43 -0400
Subject: [PATCH 3896/8469] Fix failing test on Windows

---
 setuptools/tests/test_easy_install.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index d2cc7a0fe6..70e2ad993f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -208,8 +208,9 @@ def test_local_index(self):
             cmd.ensure_finalized()
             cmd.local_index.scan([new_location])
             res = cmd.easy_install('foo')
-            self.assertEqual(os.path.realpath(res.location),
-                             os.path.realpath(new_location))
+            actual = os.path.normcase(os.path.realpath(res.location))
+            expected = os.path.normcase(os.path.realpath(new_location))
+            self.assertEqual(actual, expected)
         finally:
             sys.path.remove(target)
             for basedir in [new_location, target, ]:

From b0737549cba2029ce058d7353ec2f9afb264322e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Mar 2014 23:15:27 -0400
Subject: [PATCH 3897/8469] Added tag 3.2 for changeset 07c459bea1c5

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b9e6efddcd..d9f35d0ad3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -123,3 +123,4 @@ faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
 cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
 bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
 47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1
+07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2

From 9fb3ebb7470702513ba603e8011219f44b35537b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Mar 2014 23:15:55 -0400
Subject: [PATCH 3898/8469] Bumped to 3.3 in preparation for next release.

---
 ez_setup.py                              |  2 +-
 setuptools.egg-info/dependency_links.txt |  2 +-
 setuptools.egg-info/entry_points.txt     | 90 ++++++++++++------------
 setuptools.egg-info/requires.txt         |  6 +-
 setuptools/version.py                    |  2 +-
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f7eb67f22b..6a6adf7c7e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.2"
+DEFAULT_VERSION = "3.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
index 0936bf3512..b454c16810 100644
--- a/setuptools.egg-info/dependency_links.txt
+++ b/setuptools.egg-info/dependency_links.txt
@@ -1,2 +1,2 @@
 https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790
-https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c
+https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index c876c7794f..3eba6cc3eb 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-requires.txt = setuptools.command.egg_info:write_requirements
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-test_suite = setuptools.dist:check_test_suite
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-test_loader = setuptools.dist:check_importable
-zip_safe = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-namespace_packages = setuptools.dist:check_nsp
-
 [distutils.commands]
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-easy_install = setuptools.command.easy_install:easy_install
-upload_docs = setuptools.command.upload_docs:upload_docs
 alias = setuptools.command.alias:alias
-register = setuptools.command.register:register
-install_lib = setuptools.command.install_lib:install_lib
-test = setuptools.command.test:test
-build_py = setuptools.command.build_py:build_py
 install_egg_info = setuptools.command.install_egg_info:install_egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
-build_ext = setuptools.command.build_ext:build_ext
+upload_docs = setuptools.command.upload_docs:upload_docs
+build_py = setuptools.command.build_py:build_py
+test = setuptools.command.test:test
+register = setuptools.command.register:register
 egg_info = setuptools.command.egg_info:egg_info
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
 rotate = setuptools.command.rotate:rotate
+sdist = setuptools.command.sdist:sdist
 install_scripts = setuptools.command.install_scripts:install_scripts
-setopt = setuptools.command.setopt:setopt
+build_ext = setuptools.command.build_ext:build_ext
 saveopts = setuptools.command.saveopts:saveopts
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+develop = setuptools.command.develop:develop
+easy_install = setuptools.command.easy_install:easy_install
+setopt = setuptools.command.setopt:setopt
+install_lib = setuptools.command.install_lib:install_lib
 install = setuptools.command.install:install
 
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
+[distutils.setup_keywords]
+exclude_package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+test_suite = setuptools.dist:check_test_suite
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+use_2to3_fixers = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+use_2to3 = setuptools.dist:assert_bool
+dependency_links = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+namespace_packages = setuptools.dist:check_nsp
+test_loader = setuptools.dist:check_importable
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
+
+[egg_info.writers]
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
 easy_install-3.4 = setuptools.command.easy_install:main
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 24df854413..a49a923ef5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
 [certs]
 certifi==1.0.1
+
+[ssl:sys_platform=='win32']
+wincertstore==0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index d7e6e824bc..83935d5d3b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.2'
+__version__ = '3.3'

From f2bb3b0ab09da5fc1c186765052aea8fd87a9b2b Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3899/8469] Add unit tests for find_packages

--HG--
extra : rebase_source : 75f5ce4d2fb9d0ccd7168739c23d9ea1eeeb9112
---
 setuptools/tests/test_find_packages.py | 72 ++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 setuptools/tests/test_find_packages.py

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
new file mode 100644
index 0000000000..f66ea3333c
--- /dev/null
+++ b/setuptools/tests/test_find_packages.py
@@ -0,0 +1,72 @@
+"""Tests for setuptools.find_packages()."""
+import os
+import shutil
+import tempfile
+import unittest
+
+from setuptools import find_packages
+
+
+class TestFindPackages(unittest.TestCase):
+
+    def setUp(self):
+        self.dist_dir = tempfile.mkdtemp()
+        self._make_pkg_structure()
+
+    def tearDown(self):
+        shutil.rmtree(self.dist_dir)
+
+    def _make_pkg_structure(self):
+        """Make basic package structure.
+
+        dist/
+            docs/
+                conf.py
+            pkg/
+                __pycache__/
+                nspkg/
+                    mod.py
+                subpkg/
+                    assets/
+                        asset
+                    __init__.py
+            setup.py
+
+        """
+        self.docs_dir = self._mkdir('docs', self.dist_dir)
+        self._touch('conf.py', self.docs_dir)
+        self.pkg_dir = self._mkdir('pkg', self.dist_dir)
+        self._mkdir('__pycache__', self.pkg_dir)
+        self.ns_pkg_dir = self._mkdir('nspkg', self.pkg_dir)
+        self._touch('mod.py', self.ns_pkg_dir)
+        self.sub_pkg_dir = self._mkdir('subpkg', self.pkg_dir)
+        self.asset_dir = self._mkdir('assets', self.sub_pkg_dir)
+        self._touch('asset', self.asset_dir)
+        self._touch('__init__.py', self.sub_pkg_dir)
+        self._touch('setup.py', self.dist_dir)
+
+    def _mkdir(self, path, parent_dir=None):
+        if parent_dir:
+            path = os.path.join(parent_dir, path)
+        os.mkdir(path)
+        return path
+
+    def _touch(self, path, dir_=None):
+        if dir_:
+            path = os.path.join(dir_, path)
+        fp = open(path, 'w')
+        fp.close()
+        return path
+
+    def test_regular_package(self):
+        self._touch('__init__.py', self.pkg_dir)
+        packages = find_packages(self.dist_dir)
+        self.assertEqual(packages, ['pkg', 'pkg.subpkg'])
+
+    def test_dir_with_dot_is_skipped(self):
+        shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
+        data_dir = self._mkdir('some.data', self.pkg_dir)
+        self._touch('__init__.py', data_dir)
+        self._touch('file.dat', data_dir)
+        packages = find_packages(self.dist_dir)
+        self.assertNotIn('pkg.some.data', packages)

From c6669ca42c3e2afeb24660af404f72c606174353 Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3900/8469] Setup find_packages excludes early for clarity.

--HG--
extra : rebase_source : 7c05859ef526ed8a2d9af738e54dc9dca510245e
---
 setuptools/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index fc9b7b936c..d12886581b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -38,6 +38,7 @@ def find_packages(where='.', exclude=()):
     """
     out = []
     stack=[(convert_path(where), '')]
+    exclude = list(exclude) + ['ez_setup']
     while stack:
         where,prefix = stack.pop(0)
         for name in os.listdir(where):
@@ -50,7 +51,7 @@ def find_packages(where='.', exclude=()):
             if looks_like_package:
                 out.append(prefix+name)
                 stack.append((fn, prefix+name+'.'))
-    for pat in list(exclude)+['ez_setup']:
+    for pat in exclude:
         from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out

From 406b907f1b790dc9aa9afbf9de1a4d07c7e21802 Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3901/8469] Exclude __pycache__ in find_packages.

--HG--
extra : rebase_source : fecc027e4355f36d779967683a213fb2d867d21a
---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d12886581b..ff24c178a9 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -38,7 +38,7 @@ def find_packages(where='.', exclude=()):
     """
     out = []
     stack=[(convert_path(where), '')]
-    exclude = list(exclude) + ['ez_setup']
+    exclude = list(exclude) + ['ez_setup', '*__pycache__']
     while stack:
         where,prefix = stack.pop(0)
         for name in os.listdir(where):

From 193b2ee5695838d25f99ddc3dbf22deeb97eafe0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 03:49:02 -0400
Subject: [PATCH 3902/8469] Move import to top

--HG--
extra : rebase_source : 3b48a37ada247203bfebf87cdbb473b72e6e208b
---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ff24c178a9..c5b00ba5b9 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -6,6 +6,7 @@
 import distutils.filelist
 from distutils.core import Command as _Command
 from distutils.util import convert_path
+from fnmatch import fnmatchcase
 
 import setuptools.version
 from setuptools.extension import Extension
@@ -52,7 +53,6 @@ def find_packages(where='.', exclude=()):
                 out.append(prefix+name)
                 stack.append((fn, prefix+name+'.'))
     for pat in exclude:
-        from fnmatch import fnmatchcase
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out
 

From cc20858d5ead318ae7e8ddcdaf61c610fa1e0578 Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3903/8469] Add include parameter to find_packages.

--HG--
extra : rebase_source : 1fec39a038ac2c460e62ef2ee2eee5a0b66a676d
---
 CHANGES.txt            |  6 ++++++
 setuptools/__init__.py | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f5b220d949..960e5d9b70 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+3.3
+---
+
+* Add ``include`` parameter to ``setuptools.find_packages()``.
+
 ---
 3.2
 ---
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index c5b00ba5b9..a96e4c9db6 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -28,7 +28,7 @@
 # Standard package names for fixer packages
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
-def find_packages(where='.', exclude=()):
+def find_packages(where='.', exclude=(), include=()):
     """Return a list all Python packages found within directory 'where'
 
     'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
@@ -36,9 +36,18 @@ def find_packages(where='.', exclude=()):
     sequence of package names to exclude; '*' can be used as a wildcard in the
     names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
     'foo' itself).
+
+    'include' is a sequence of package names to include.  If it's specified,
+    only the named packages will be included.  If it's not specified, all found
+    packages will be included.  'include' can contain shell style wildcard
+    patterns just like 'exclude'.
+
+    The list of included packages is built up first and then any explicitly
+    excluded packages are removed from it.
     """
     out = []
     stack=[(convert_path(where), '')]
+    include = list(include)
     exclude = list(exclude) + ['ez_setup', '*__pycache__']
     while stack:
         where,prefix = stack.pop(0)
@@ -50,8 +59,11 @@ def find_packages(where='.', exclude=()):
                 and os.path.isfile(os.path.join(fn, '__init__.py'))
             )
             if looks_like_package:
-                out.append(prefix+name)
-                stack.append((fn, prefix+name+'.'))
+                pkg_name = prefix + name
+                if (not include or
+                        any(fnmatchcase(pkg_name, pat) for pat in include)):
+                    out.append(pkg_name)
+                    stack.append((fn, pkg_name + '.'))
     for pat in exclude:
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out

From db165ca67c638fdcae9b3a85154b2b4b23e3f5db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 04:00:06 -0400
Subject: [PATCH 3904/8469] Add test for find_packages(include=)

--HG--
extra : rebase_source : bee4238f4cd00fa8bd3104017f4caf234dcf0729
---
 setuptools/tests/test_find_packages.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index f66ea3333c..1edbfab325 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -63,6 +63,16 @@ def test_regular_package(self):
         packages = find_packages(self.dist_dir)
         self.assertEqual(packages, ['pkg', 'pkg.subpkg'])
 
+    def test_include_excludes_other(self):
+        """
+        If include is specified, other packages should be excluded.
+        """
+        self._touch('__init__.py', self.pkg_dir)
+        alt_dir = self._mkdir('other_pkg', self.dist_dir)
+        self._touch('__init__.py', alt_dir)
+        packages = find_packages(self.dist_dir, include=['other_pkg'])
+        self.assertEqual(packages, ['other_pkg'])
+
     def test_dir_with_dot_is_skipped(self):
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
         data_dir = self._mkdir('some.data', self.pkg_dir)

From 3e6b92ec702c3139802b60df651fa14360e382b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 04:12:13 -0400
Subject: [PATCH 3905/8469] Update test for Python 2.6 compatibility

---
 setuptools/tests/test_find_packages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 1edbfab325..c50309d269 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -79,4 +79,4 @@ def test_dir_with_dot_is_skipped(self):
         self._touch('__init__.py', data_dir)
         self._touch('file.dat', data_dir)
         packages = find_packages(self.dist_dir)
-        self.assertNotIn('pkg.some.data', packages)
+        self.assertTrue('pkg.some.data' not in packages)

From eff1456d59d8abf700de991bfd5a36cdfc35df5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 04:24:32 -0400
Subject: [PATCH 3906/8469] Update documentation to reflect new include
 parameter.

---
 docs/setuptools.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d277dcb5d3..6d21fef1c3 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -416,19 +416,22 @@ the ``packages`` argument of ``setup()``.  However, for very large projects
 (Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
 package list updated.  That's what ``setuptools.find_packages()`` is for.
 
-``find_packages()`` takes a source directory, and a list of package names or
-patterns to exclude.  If omitted, the source directory defaults to the same
+``find_packages()`` takes a source directory and two lists of package name
+patterns to exclude and include.  If omitted, the source directory defaults to
+the same
 directory as the setup script.  Some projects use a ``src`` or ``lib``
 directory as the root of their source tree, and those projects would of course
 use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
 such projects also need something like ``package_dir = {'':'src'}`` in their
 ``setup()`` arguments, but that's just a normal distutils thing.)
 
-Anyway, ``find_packages()`` walks the target directory, and finds Python
+Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
+patterns, and finds Python
 packages by looking for ``__init__.py`` files.  It then filters the list of
 packages using the exclusion patterns.
 
-Exclusion patterns are package names, optionally including wildcards.  For
+Inclusion and exclusion patterns are package names, optionally including
+wildcards.  For
 example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
 last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
 "*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
@@ -442,7 +445,7 @@ in order to cover all the bases.  Really, the exclusion patterns are intended
 to cover simpler use cases than this, like excluding a single, specified
 package and its subpackages.
 
-Regardless of the target directory or exclusions, the ``find_packages()``
+Regardless of the parameters, the ``find_packages()``
 function returns a list of package names suitable for use as the ``packages``
 argument to ``setup()``, and so is usually the easiest way to set that
 argument in your setup script.  Especially since it frees you from having to

From f23f741c4a0d866f8a38e641065ced7feb106de2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:04:34 -0400
Subject: [PATCH 3907/8469] Added tag 3.3 for changeset b306e681a945

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d9f35d0ad3..b5abdc07d7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -124,3 +124,4 @@ cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
 bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
 47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1
 07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2
+b306e681a945406833fb297ae10241e2241fc22b 3.3

From c74177b8d8c565650abec45d2f90550be0c2702f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:05:02 -0400
Subject: [PATCH 3908/8469] Bumped to 3.4 in preparation for next release.

---
 ez_setup.py                          |  2 +-
 setuptools.egg-info/entry_points.txt | 82 ++++++++++++++--------------
 setuptools.egg-info/requires.txt     |  8 +--
 setuptools/version.py                |  2 +-
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6a6adf7c7e..9811d7d8ab 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.3"
+DEFAULT_VERSION = "3.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 3eba6cc3eb..0253d11a07 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,60 +1,60 @@
-[distutils.commands]
-alias = setuptools.command.alias:alias
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-build_py = setuptools.command.build_py:build_py
-test = setuptools.command.test:test
-register = setuptools.command.register:register
-egg_info = setuptools.command.egg_info:egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-rotate = setuptools.command.rotate:rotate
-sdist = setuptools.command.sdist:sdist
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_ext = setuptools.command.build_ext:build_ext
-saveopts = setuptools.command.saveopts:saveopts
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-develop = setuptools.command.develop:develop
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
-install_lib = setuptools.command.install_lib:install_lib
-install = setuptools.command.install:install
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
 [setuptools.installation]
 eggsecutable = setuptools.command.easy_install:bootstrap
 
 [distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
 test_suite = setuptools.dist:check_test_suite
-zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+convert_2to3_doctests = setuptools.dist:assert_string_list
 extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
 use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+test_loader = setuptools.dist:check_importable
 use_2to3 = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
 eager_resources = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
 tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-namespace_packages = setuptools.dist:check_nsp
-test_loader = setuptools.dist:check_importable
-entry_points = setuptools.dist:check_entry_points
 package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.commands]
+setopt = setuptools.command.setopt:setopt
+easy_install = setuptools.command.easy_install:easy_install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+register = setuptools.command.register:register
+test = setuptools.command.test:test
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+alias = setuptools.command.alias:alias
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_py = setuptools.command.build_py:build_py
+install_lib = setuptools.command.install_lib:install_lib
+rotate = setuptools.command.rotate:rotate
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+egg_info = setuptools.command.egg_info:egg_info
+develop = setuptools.command.develop:develop
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+saveopts = setuptools.command.saveopts:saveopts
+upload_docs = setuptools.command.upload_docs:upload_docs
 
 [egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
 namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-entry_points.txt = setuptools.command.egg_info:write_entries
-requires.txt = setuptools.command.egg_info:write_requirements
 eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+entry_points.txt = setuptools.command.egg_info:write_entries
 PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923ef5..e5db30adfb 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==1.0.1
-
 [ssl:sys_platform=='win32']
-wincertstore==0.2
\ No newline at end of file
+wincertstore==0.2
+
+[certs]
+certifi==1.0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 83935d5d3b..36f7773514 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.3'
+__version__ = '3.4'

From 80fc5b6d418b2df0243989b1b8c999f795f3f55e Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3909/8469] Add support for PEP 420 namespace packages to
 find_packages()

On Python 3.3+, `find_packages()` now considers any subdirectory of the
start directory that's not a regular package (i.e., that doesn't have an
`__init__.py`) to be a namespace package.

The other way this supports PEP 420 is by making sure `__pycache__`
directories are never added to the list of packages.

Fixes issue #97
---
 CHANGES.txt                            |   9 ++
 setuptools.egg-info/entry_points.txt   | 124 ++++++++++++-------------
 setuptools.egg-info/requires.txt       |   8 +-
 setuptools/__init__.py                 |   5 +-
 setuptools/tests/test_find_packages.py |  38 ++++++++
 5 files changed, 117 insertions(+), 67 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 960e5d9b70..7a9ed44695 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+---
+4.0
+---
+
+* Issue #97: ``find_packages()`` now supports PEP 420 namespace packages. It
+  does so by considering all subdirectories of the start directory that
+  aren't regular packages to be PEP 420 namespace packages (on Python 3.3+
+  only).
+
 ---
 3.3
 ---
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 0253d11a07..560a70417f 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[distutils.setup_keywords]
-packages = setuptools.dist:check_packages
-entry_points = setuptools.dist:check_entry_points
-test_suite = setuptools.dist:check_test_suite
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-convert_2to3_doctests = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-namespace_packages = setuptools.dist:check_nsp
-test_loader = setuptools.dist:check_importable
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.commands]
-setopt = setuptools.command.setopt:setopt
-easy_install = setuptools.command.easy_install:easy_install
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-register = setuptools.command.register:register
-test = setuptools.command.test:test
-install_scripts = setuptools.command.install_scripts:install_scripts
-install = setuptools.command.install:install
-alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-build_py = setuptools.command.build_py:build_py
-install_lib = setuptools.command.install_lib:install_lib
-rotate = setuptools.command.rotate:rotate
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-egg_info = setuptools.command.egg_info:egg_info
-develop = setuptools.command.develop:develop
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-saveopts = setuptools.command.saveopts:saveopts
-upload_docs = setuptools.command.upload_docs:upload_docs
-
-[egg_info.writers]
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-requires.txt = setuptools.command.egg_info:write_requirements
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
-
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+entry_points.txt = setuptools.command.egg_info:write_entries
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+requires.txt = setuptools.command.egg_info:write_requirements
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[console_scripts]
+easy_install-3.4 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
+
+[distutils.setup_keywords]
+use_2to3_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+packages = setuptools.dist:check_packages
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+entry_points = setuptools.dist:check_entry_points
+test_loader = setuptools.dist:check_importable
+namespace_packages = setuptools.dist:check_nsp
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+eager_resources = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+package_data = setuptools.dist:check_package_data
+test_suite = setuptools.dist:check_test_suite
+include_package_data = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+
+[distutils.commands]
+upload_docs = setuptools.command.upload_docs:upload_docs
+egg_info = setuptools.command.egg_info:egg_info
+install_scripts = setuptools.command.install_scripts:install_scripts
+saveopts = setuptools.command.saveopts:saveopts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+rotate = setuptools.command.rotate:rotate
+install = setuptools.command.install:install
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+test = setuptools.command.test:test
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+install_lib = setuptools.command.install_lib:install_lib
+sdist = setuptools.command.sdist:sdist
+register = setuptools.command.register:register
+develop = setuptools.command.develop:develop
+build_py = setuptools.command.build_py:build_py
+setopt = setuptools.command.setopt:setopt
+build_ext = setuptools.command.build_ext:build_ext
+alias = setuptools.command.alias:alias
+easy_install = setuptools.command.easy_install:easy_install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e5db30adfb..a49a923ef5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.2
-
 [certs]
-certifi==1.0.1
\ No newline at end of file
+certifi==1.0.1
+
+[ssl:sys_platform=='win32']
+wincertstore==0.2
\ No newline at end of file
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a96e4c9db6..86afab63f4 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -56,7 +56,10 @@ def find_packages(where='.', exclude=(), include=()):
             looks_like_package = (
                 '.' not in name
                 and os.path.isdir(fn)
-                and os.path.isfile(os.path.join(fn, '__init__.py'))
+                and (
+                    os.path.isfile(os.path.join(fn, '__init__.py'))
+                    or sys.version_info[:2] >= (3, 3)  # PEP 420
+                )
             )
             if looks_like_package:
                 pkg_name = prefix + name
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index c50309d269..abb0dd6162 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -1,12 +1,16 @@
 """Tests for setuptools.find_packages()."""
 import os
 import shutil
+import sys
 import tempfile
 import unittest
 
 from setuptools import find_packages
 
 
+PEP420 = sys.version_info[:2] >= (3, 3)
+
+
 class TestFindPackages(unittest.TestCase):
 
     def setUp(self):
@@ -58,6 +62,7 @@ def _touch(self, path, dir_=None):
         fp.close()
         return path
 
+    @unittest.skipIf(PEP420, 'Not a PEP 420 env')
     def test_regular_package(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(self.dist_dir)
@@ -80,3 +85,36 @@ def test_dir_with_dot_is_skipped(self):
         self._touch('file.dat', data_dir)
         packages = find_packages(self.dist_dir)
         self.assertTrue('pkg.some.data' not in packages)
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package(self):
+        packages = find_packages(
+            self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_includes(self):
+        packages = find_packages(
+            self.dist_dir, exclude=['pkg.subpkg.assets'])
+        self.assertEqual(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_includes_or_excludes(self):
+        packages = find_packages(self.dist_dir)
+        expected = [
+            'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
+        self.assertEqual(packages, expected)
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_regular_package_with_nested_pep420_ns_packages(self):
+        self._touch('__init__.py', self.pkg_dir)
+        packages = find_packages(
+            self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_non_package_dirs(self):
+        shutil.rmtree(self.docs_dir)
+        shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
+        packages = find_packages(self.dist_dir)
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])

From f0e9aa7a337530e07b94c503e4258b6daf422e06 Mon Sep 17 00:00:00 2001
From: Wyatt Lee Baldwin <self@wyattbaldwin.com>
Date: Wed, 12 Feb 2014 00:52:26 -0800
Subject: [PATCH 3910/8469] Add support for PEP 420 namespace packages to
 find_packages()

On Python 3.3+, `find_packages()` now considers any subdirectory of the
start directory that's not a regular package (i.e., that doesn't have an
`__init__.py`) to be a namespace package. Because this will often
include non-package directories, a new `include` argument has been added
to `find_packages()`.

`include` can make it easier to narrow which directories are considered
packages instead of having to specify numerous excludes. In
particular, it's an easy way to keep top-level, non-source directories
from being considered packages.

The other way this supports PEP 420 is by making sure `__pycache__`
directories are never added to the list of packages.

Refs issue #97
---
 CHANGES.txt                            |   5 ++
 setuptools/__init__.py                 |  29 +++++--
 setuptools/tests/test_find_packages.py | 110 +++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 6 deletions(-)
 create mode 100644 setuptools/tests/test_find_packages.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 52058d22a8..9ec8c09275 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,11 @@ CHANGES
   security vulnerabilities presented by use of tar archives in ez_setup.py.
   It also leverages the security features added to ZipFile.extract in Python 2.7.4.
 * Issue #65: Removed deprecated Features functionality.
+* Issue #97: ``find_packages()`` now supports PEP 420 namespace packages. It
+  does so by considering all subdirectories of the start directory that
+  aren't regular packages to be PEP 420 namespace packages (on Python 3.3+
+  only). Also, a list of packages to include can be now be specified; this
+  provides an easy way to narrow the list of candidate directories.
 
 ---
 2.3
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index fb2fffc02b..6d7b4f38fd 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -27,7 +27,7 @@
 # Standard package names for fixer packages
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
-def find_packages(where='.', exclude=()):
+def find_packages(where='.', exclude=(), include=()):
     """Return a list all Python packages found within directory 'where'
 
     'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
@@ -35,7 +35,19 @@ def find_packages(where='.', exclude=()):
     sequence of package names to exclude; '*' can be used as a wildcard in the
     names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
     'foo' itself).
+
+    'include' is a sequence of package names to include.  If it's specified,
+    only the named packages will be included.  If it's not specified, all found
+    packages will be included.  'include' can contain shell style wildcard
+    patterns just like 'exclude'.
+
+    The list of included packages is built up first and then any explicitly
+    excluded packages are removed from it.
+
     """
+    from fnmatch import fnmatchcase
+    include = list(include)
+    exclude = list(exclude) + ['ez_setup', '*__pycache__']
     out = []
     stack=[(convert_path(where), '')]
     while stack:
@@ -45,13 +57,18 @@ def find_packages(where='.', exclude=()):
             looks_like_package = (
                 '.' not in name
                 and os.path.isdir(fn)
-                and os.path.isfile(os.path.join(fn, '__init__.py'))
+                and (
+                    os.path.isfile(os.path.join(fn, '__init__.py'))
+                    or sys.version_info[:2] >= (3, 3)  # PEP 420
+                )
             )
             if looks_like_package:
-                out.append(prefix+name)
-                stack.append((fn, prefix+name+'.'))
-    for pat in list(exclude)+['ez_setup']:
-        from fnmatch import fnmatchcase
+                pkg_name = prefix + name
+                if (not include or
+                        any(fnmatchcase(pkg_name, pat) for pat in include)):
+                    out.append(pkg_name)
+                    stack.append((fn, pkg_name + '.'))
+    for pat in exclude:
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out
 
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
new file mode 100644
index 0000000000..017cccfc87
--- /dev/null
+++ b/setuptools/tests/test_find_packages.py
@@ -0,0 +1,110 @@
+"""Tests for setuptools.find_packages()."""
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from setuptools import find_packages
+
+
+PEP420 = sys.version_info[:2] >= (3, 3)
+
+
+class TestFindPackages(unittest.TestCase):
+
+    def setUp(self):
+        self.dist_dir = tempfile.mkdtemp()
+        self._make_pkg_structure()
+
+    def tearDown(self):
+        shutil.rmtree(self.dist_dir)
+
+    def _make_pkg_structure(self):
+        """Make basic package structure.
+
+        dist/
+            docs/
+                conf.py
+            pkg/
+                __pycache__/
+                nspkg/
+                    mod.py
+                subpkg/
+                    assets/
+                        asset
+                    __init__.py
+            setup.py
+
+        """
+        self.docs_dir = self._mkdir('docs', self.dist_dir)
+        self._touch('conf.py', self.docs_dir)
+        self.pkg_dir = self._mkdir('pkg', self.dist_dir)
+        self._mkdir('__pycache__', self.pkg_dir)
+        self.ns_pkg_dir = self._mkdir('nspkg', self.pkg_dir)
+        self._touch('mod.py', self.ns_pkg_dir)
+        self.sub_pkg_dir = self._mkdir('subpkg', self.pkg_dir)
+        self.asset_dir = self._mkdir('assets', self.sub_pkg_dir)
+        self._touch('asset', self.asset_dir)
+        self._touch('__init__.py', self.sub_pkg_dir)
+        self._touch('setup.py', self.dist_dir)
+
+    def _mkdir(self, path, parent_dir=None):
+        if parent_dir:
+            path = os.path.join(parent_dir, path)
+        os.mkdir(path)
+        return path
+
+    def _touch(self, path, dir_=None):
+        if dir_:
+            path = os.path.join(dir_, path)
+        fp = open(path, 'w')
+        fp.close()
+        return path
+
+    @unittest.skipIf(PEP420, 'Not a PEP 420 env')
+    def test_regular_package(self):
+        self._touch('__init__.py', self.pkg_dir)
+        packages = find_packages(self.dist_dir)
+        self.assertEqual(packages, ['pkg', 'pkg.subpkg'])
+
+    def test_dir_with_dot_is_skipped(self):
+        shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
+        data_dir = self._mkdir('some.data', self.pkg_dir)
+        self._touch('__init__.py', data_dir)
+        self._touch('file.dat', data_dir)
+        packages = find_packages(self.dist_dir)
+        self.assertNotIn('pkg.some.data', packages)
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package(self):
+        packages = find_packages(
+            self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_includes(self):
+        packages = find_packages(
+            self.dist_dir, exclude=['pkg.subpkg.assets'])
+        self.assertEqual(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_includes_or_excludes(self):
+        packages = find_packages(self.dist_dir)
+        expected = [
+            'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
+        self.assertEqual(packages, expected)
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_regular_package_with_nested_pep420_ns_packages(self):
+        self._touch('__init__.py', self.pkg_dir)
+        packages = find_packages(
+            self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+
+    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    def test_pep420_ns_package_no_non_package_dirs(self):
+        shutil.rmtree(self.docs_dir)
+        shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
+        packages = find_packages(self.dist_dir)
+        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])

From ff69c43e5d22036c7f433331e26808fd53f2bf4d Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 23 Feb 2014 08:30:06 +0100
Subject: [PATCH 3911/8469] Bump to 3.3.5rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index de5560b4f6..b79071a691 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.4"
+__version__ = "3.3.5rc1"
 #--end constants--

From 63aab90f407ec2c12fc1bfcfaa50b0714687275c Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 23 Feb 2014 02:18:24 -0600
Subject: [PATCH 3912/8469] Version bump for Python 3.4.0rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 4c716e2075..c03185bd80 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0rc1"
+__version__ = "3.4.0rc2"
 #--end constants--

From 27d5cd873de20e7ff51d7b13e515b73000e8f727 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 2 Mar 2014 09:19:03 +0100
Subject: [PATCH 3913/8469] Bump to 3.3.5rc2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b79071a691..7d40ab4748 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.5rc1"
+__version__ = "3.3.5rc2"
 #--end constants--

From 9c925df0618a7ae0eccfea65da04faab89b32fc7 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 9 Mar 2014 09:37:14 +0100
Subject: [PATCH 3914/8469] Bump to 3.3.5 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 7d40ab4748..2e8719f8b7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.5rc2"
+__version__ = "3.3.5"
 #--end constants--

From 971530e1532467ef3f1d412019cfc68cf5e041d9 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 9 Mar 2014 04:13:05 -0700
Subject: [PATCH 3915/8469] Version bump for 3.4.0rc3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c03185bd80..954b50dbac 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0rc2"
+__version__ = "3.4.0rc3"
 #--end constants--

From 7da8f82720d47877cea2324b54952ff2b19ff6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Wed, 12 Mar 2014 03:34:02 -0400
Subject: [PATCH 3916/8469] =?UTF-8?q?Avoid=20=E2=80=9Cerror:=20None?=
 =?UTF-8?q?=E2=80=9D=20messages=20from=20distutils=20(#4931).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Amaury Forgeot d’Arc and Philip J. Eby.
---
 core.py            |  7 ++-----
 dir_util.py        |  6 ++----
 tests/test_util.py | 10 +++++++++-
 util.py            | 23 ++++-------------------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/core.py b/core.py
index 260332a2ac..25d91baa0f 100644
--- a/core.py
+++ b/core.py
@@ -11,7 +11,6 @@
 
 from distutils.debug import DEBUG
 from distutils.errors import *
-from distutils.util import grok_environment_error
 
 # Mainly import these so setup scripts can "from distutils.core import" them.
 from distutils.dist import Distribution
@@ -149,13 +148,11 @@ class found in 'cmdclass' is used in place of the default, which is
         except KeyboardInterrupt:
             raise SystemExit("interrupted")
         except (IOError, os.error) as exc:
-            error = grok_environment_error(exc)
-
             if DEBUG:
-                sys.stderr.write(error + "\n")
+                sys.stderr.write("error: %s\n" % (exc,))
                 raise
             else:
-                raise SystemExit(error)
+                raise SystemExit("error: %s" % (exc,))
 
         except (DistutilsError,
                 CCompilerError) as msg:
diff --git a/dir_util.py b/dir_util.py
index 2826ff805d..6a72bdd4cd 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -2,7 +2,7 @@
 
 Utility functions for manipulating directories and directory trees."""
 
-import os, sys
+import os
 import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
@@ -182,7 +182,6 @@ def remove_tree(directory, verbose=1, dry_run=0):
     Any errors are ignored (apart from being reported to stdout if 'verbose'
     is true).
     """
-    from distutils.util import grok_environment_error
     global _path_created
 
     if verbose >= 1:
@@ -199,8 +198,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
             if abspath in _path_created:
                 del _path_created[abspath]
         except (IOError, OSError) as exc:
-            log.warn(grok_environment_error(
-                    exc, "error removing %s: " % directory))
+            log.warn("error removing %s: %s", directory, exc)
 
 def ensure_relative(path):
     """Take the full path 'path', and make it a relative path.
diff --git a/tests/test_util.py b/tests/test_util.py
index 00219cfdba..a1abf8f029 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -8,7 +8,8 @@
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
                             check_environ, split_quoted, strtobool,
-                            rfc822_escape, byte_compile)
+                            rfc822_escape, byte_compile,
+                            grok_environment_error)
 from distutils import util # used to patch _environ_checked
 from distutils.sysconfig import get_config_vars
 from distutils import sysconfig
@@ -285,6 +286,13 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
+    def test_grok_environment_error(self):
+        # test obsolete function to ensure backward compat (#4931)
+        exc = IOError("Unable to find batch file")
+        msg = grok_environment_error(exc)
+        self.assertEqual(msg, "error: Unable to find batch file")
+
+
 def test_suite():
     return unittest.makeSuite(UtilTestCase)
 
diff --git a/util.py b/util.py
index 67d8166349..b558957814 100644
--- a/util.py
+++ b/util.py
@@ -213,25 +213,10 @@ def _subst (match, local_vars=local_vars):
 
 
 def grok_environment_error (exc, prefix="error: "):
-    """Generate a useful error message from an EnvironmentError (IOError or
-    OSError) exception object.  Handles Python 1.5.1 and 1.5.2 styles, and
-    does what it can to deal with exception objects that don't have a
-    filename (which happens when the error is due to a two-file operation,
-    such as 'rename()' or 'link()'.  Returns the error message as a string
-    prefixed with 'prefix'.
-    """
-    # check for Python 1.5.2-style {IO,OS}Error exception objects
-    if hasattr(exc, 'filename') and hasattr(exc, 'strerror'):
-        if exc.filename:
-            error = prefix + "%s: %s" % (exc.filename, exc.strerror)
-        else:
-            # two-argument functions in posix module don't
-            # include the filename in the exception object!
-            error = prefix + "%s" % exc.strerror
-    else:
-        error = prefix + str(exc.args[-1])
-
-    return error
+    # Function kept for backward compatibility.
+    # Used to try clever things with EnvironmentErrors,
+    # but nowadays str(exception) produces good messages.
+    return prefix + str(exc)
 
 
 # Needed by 'split_quoted()'

From fd9aa7570cbc4241b6d2b3cd177930bab0f018f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Thu, 13 Mar 2014 04:55:35 -0400
Subject: [PATCH 3917/8469] Make distutils error messages more helpful
 (#11599).

When running external programs such as a C compiler and getting an
error code, distutils only prints the program name.  With this change,
one can get the full command line by setting the DISTUTILS_DEBUG
environment variable.

This should have no compatibility issues, unless there are tools
that depend on the exact format of distutils debug messages.
---
 spawn.py | 63 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/spawn.py b/spawn.py
index f58c55f902..f66ff93dfb 100644
--- a/spawn.py
+++ b/spawn.py
@@ -10,6 +10,7 @@
 import os
 
 from distutils.errors import DistutilsPlatformError, DistutilsExecError
+from distutils.debug import DEBUG
 from distutils import log
 
 def spawn(cmd, search_path=1, verbose=0, dry_run=0):
@@ -28,6 +29,9 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
     Raise DistutilsExecError if running the program fails in any way; just
     return on success.
     """
+    # cmd is documented as a list, but just in case some code passes a tuple
+    # in, protect our %-formatting code against horrible death
+    cmd = list(cmd)
     if os.name == 'posix':
         _spawn_posix(cmd, search_path, dry_run=dry_run)
     elif os.name == 'nt':
@@ -67,12 +71,16 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
             rc = os.spawnv(os.P_WAIT, executable, cmd)
         except OSError as exc:
             # this seems to happen when the command isn't found
+            if not DEBUG:
+                cmd = executable
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
+                  "command %r failed: %s" % (cmd, exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
+            if not DEBUG:
+                cmd = executable
             raise DistutilsExecError(
-                  "command '%s' failed with exit status %d" % (cmd[0], rc))
+                  "command %r failed with exit status %d" % (cmd, rc))
 
 def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
     executable = cmd[0]
@@ -86,13 +94,17 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
             rc = os.spawnv(os.P_WAIT, executable, cmd)
         except OSError as exc:
             # this seems to happen when the command isn't found
+            if not DEBUG:
+                cmd = executable
             raise DistutilsExecError(
-                  "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
+                  "command %r failed: %s" % (cmd, exc.args[-1]))
         if rc != 0:
             # and this reflects the command running but failing
-            log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
+            if not DEBUG:
+                cmd = executable
+            log.debug("command %r failed with exit status %d" % (cmd, rc))
             raise DistutilsExecError(
-                  "command '%s' failed with exit status %d" % (cmd[0], rc))
+                  "command %r failed with exit status %d" % (cmd, rc))
 
 if sys.platform == 'darwin':
     from distutils import sysconfig
@@ -103,8 +115,9 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
+    executable = cmd[0]
     exec_fn = search_path and os.execvp or os.execv
-    exec_args = [cmd[0], cmd]
+    env = None
     if sys.platform == 'darwin':
         global _cfg_target, _cfg_target_split
         if _cfg_target is None:
@@ -125,17 +138,23 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
             env = dict(os.environ,
                        MACOSX_DEPLOYMENT_TARGET=cur_target)
             exec_fn = search_path and os.execvpe or os.execve
-            exec_args.append(env)
     pid = os.fork()
     if pid == 0: # in the child
         try:
-            exec_fn(*exec_args)
+            if env is None:
+                exec_fn(executable, cmd)
+            else:
+                exec_fn(executable, cmd, env)
         except OSError as e:
-            sys.stderr.write("unable to execute %s: %s\n"
-                             % (cmd[0], e.strerror))
+            if not DEBUG:
+                cmd = executable
+            sys.stderr.write("unable to execute %r: %s\n"
+                             % (cmd, e.strerror))
             os._exit(1)
 
-        sys.stderr.write("unable to execute %s for unknown reasons" % cmd[0])
+        if not DEBUG:
+            cmd = executable
+        sys.stderr.write("unable to execute %r for unknown reasons" % cmd)
         os._exit(1)
     else: # in the parent
         # Loop until the child either exits or is terminated by a signal
@@ -147,26 +166,34 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
                 import errno
                 if exc.errno == errno.EINTR:
                     continue
+                if not DEBUG:
+                    cmd = executable
                 raise DistutilsExecError(
-                      "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
+                      "command %r failed: %s" % (cmd, exc.args[-1]))
             if os.WIFSIGNALED(status):
+                if not DEBUG:
+                    cmd = executable
                 raise DistutilsExecError(
-                      "command '%s' terminated by signal %d"
-                      % (cmd[0], os.WTERMSIG(status)))
+                      "command %r terminated by signal %d"
+                      % (cmd, os.WTERMSIG(status)))
             elif os.WIFEXITED(status):
                 exit_status = os.WEXITSTATUS(status)
                 if exit_status == 0:
                     return   # hey, it succeeded!
                 else:
+                    if not DEBUG:
+                        cmd = executable
                     raise DistutilsExecError(
-                          "command '%s' failed with exit status %d"
-                          % (cmd[0], exit_status))
+                          "command %r failed with exit status %d"
+                          % (cmd, exit_status))
             elif os.WIFSTOPPED(status):
                 continue
             else:
+                if not DEBUG:
+                    cmd = executable
                 raise DistutilsExecError(
-                      "unknown error executing '%s': termination status %d"
-                      % (cmd[0], status))
+                      "unknown error executing %r: termination status %d"
+                      % (cmd, status))
 
 def find_executable(executable, path=None):
     """Tries to find 'executable' in the directories listed in 'path'.

From 8028742c28561801bde9e5a0ffdd287fc11fb5ff Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 15 Mar 2014 22:34:24 -0700
Subject: [PATCH 3918/8469] Release bump for 3.4.0 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 954b50dbac..04804c1f42 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0rc3"
+__version__ = "3.4.0"
 #--end constants--

From ddce1ca3b19ac6fa504a996ca6d652681503381a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:30:18 -0400
Subject: [PATCH 3919/8469] Bumped to 4.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9811d7d8ab..0b59831276 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4"
+DEFAULT_VERSION = "4.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 36f7773514..a93f051817 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4'
+__version__ = '4.0'

From cdbcb2b5ea59a09ab16a3f024c27f4ce6553ddff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:33:24 -0400
Subject: [PATCH 3920/8469] Use py26compat for skipIf

---
 setuptools/tests/test_find_packages.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index abb0dd6162..bc7d03bfad 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -6,6 +6,7 @@
 import unittest
 
 from setuptools import find_packages
+from setuptools.tests.py26compat import skipIf
 
 
 PEP420 = sys.version_info[:2] >= (3, 3)
@@ -62,7 +63,7 @@ def _touch(self, path, dir_=None):
         fp.close()
         return path
 
-    @unittest.skipIf(PEP420, 'Not a PEP 420 env')
+    @skipIf(PEP420, 'Not a PEP 420 env')
     def test_regular_package(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(self.dist_dir)
@@ -86,33 +87,33 @@ def test_dir_with_dot_is_skipped(self):
         packages = find_packages(self.dist_dir)
         self.assertTrue('pkg.some.data' not in packages)
 
-    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package(self):
         packages = find_packages(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
         self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes(self):
         packages = find_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
         self.assertEqual(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes_or_excludes(self):
         packages = find_packages(self.dist_dir)
         expected = [
             'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self.assertEqual(packages, expected)
 
-    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    @skipIf(not PEP420, 'PEP 420 only')
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
         self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @unittest.skipIf(not PEP420, 'PEP 420 only')
+    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))

From 8880e2c2872e381b94adcd63e5bed7f69241d6e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:39:05 -0400
Subject: [PATCH 3921/8469] Update documentation to reflect PEP420 support

---
 docs/setuptools.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 6d21fef1c3..68467dc187 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -426,9 +426,9 @@ such projects also need something like ``package_dir = {'':'src'}`` in their
 ``setup()`` arguments, but that's just a normal distutils thing.)
 
 Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
-patterns, and finds Python
-packages by looking for ``__init__.py`` files.  It then filters the list of
-packages using the exclusion patterns.
+patterns, and finds Python packages (any directory). On Python 3.2 and
+earlier, packages are only recognized if they include an ``__init__.py`` file.
+Finally, exclusion patterns are applied to remove matching packages.
 
 Inclusion and exclusion patterns are package names, optionally including
 wildcards.  For

From 069dc42ee0cae4988e45ed4ced47f22ce7344029 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 05:42:34 -0400
Subject: [PATCH 3922/8469] Check packages without deference to order

---
 setuptools/tests/test_find_packages.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index bc7d03bfad..3e2619fc41 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -87,35 +87,38 @@ def test_dir_with_dot_is_skipped(self):
         packages = find_packages(self.dist_dir)
         self.assertTrue('pkg.some.data' not in packages)
 
+    def _assert_packages(self, actual, expected):
+        self.assertEqual(set(actual), set(expected))
+
     @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package(self):
         packages = find_packages(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
-        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+        self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes(self):
         packages = find_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
-        self.assertEqual(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
+        self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes_or_excludes(self):
         packages = find_packages(self.dist_dir)
         expected = [
             'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
-        self.assertEqual(packages, expected)
+        self._assert_packages(packages, expected)
 
     @skipIf(not PEP420, 'PEP 420 only')
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
-        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+        self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
         packages = find_packages(self.dist_dir)
-        self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+        self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])

From 3940c139f3082bef33c52cec4a8a0f6484bef202 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 06:05:16 -0400
Subject: [PATCH 3923/8469] Update setuptools setup.py to work with setuptools
 4.0

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3d5307d533..13736be53a 100755
--- a/setup.py
+++ b/setup.py
@@ -116,7 +116,10 @@ def run(self):
     url = "https://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
-    packages = setuptools.find_packages(),
+    packages = setuptools.find_packages(
+        include=['setuptools*', '_markerlib'],
+        exclude=['setuptools.tests*.*'],
+    ),
     package_data = package_data,
 
     py_modules = ['pkg_resources', 'easy_install'],

From 6ef85d9d2d900707b3dcbfe56f4d671add72e91d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 06:17:18 -0400
Subject: [PATCH 3924/8469] Added tag 4.0b1 for changeset 78c8cfbe3e10

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b5abdc07d7..e90fb5dc6e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -125,3 +125,4 @@ bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
 47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1
 07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2
 b306e681a945406833fb297ae10241e2241fc22b 3.3
+78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1

From 97724357315e4ec8068cc2c80a450cd19766f875 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 06:23:24 -0400
Subject: [PATCH 3925/8469] Sort entry points when writing so they render
 consistently

---
 setuptools.egg-info/entry_points.txt | 124 +++++++++++++--------------
 setuptools/command/egg_info.py       |   4 +-
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 560a70417f..41a596108f 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
-[egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[console_scripts]
-easy_install-3.4 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
-
-[distutils.setup_keywords]
-use_2to3_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-entry_points = setuptools.dist:check_entry_points
-test_loader = setuptools.dist:check_importable
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
-eager_resources = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-package_data = setuptools.dist:check_package_data
-test_suite = setuptools.dist:check_test_suite
-include_package_data = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-
-[distutils.commands]
-upload_docs = setuptools.command.upload_docs:upload_docs
-egg_info = setuptools.command.egg_info:egg_info
-install_scripts = setuptools.command.install_scripts:install_scripts
-saveopts = setuptools.command.saveopts:saveopts
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-install = setuptools.command.install:install
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-test = setuptools.command.test:test
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-install_lib = setuptools.command.install_lib:install_lib
-sdist = setuptools.command.sdist:sdist
-register = setuptools.command.register:register
-develop = setuptools.command.develop:develop
-build_py = setuptools.command.build_py:build_py
-setopt = setuptools.command.setopt:setopt
-build_ext = setuptools.command.build_ext:build_ext
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
+
+[distutils.commands]
+alias = setuptools.command.alias:alias
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+build_ext = setuptools.command.build_ext:build_ext
+build_py = setuptools.command.build_py:build_py
+develop = setuptools.command.develop:develop
+easy_install = setuptools.command.easy_install:easy_install
+egg_info = setuptools.command.egg_info:egg_info
+install = setuptools.command.install:install
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+install_lib = setuptools.command.install_lib:install_lib
+install_scripts = setuptools.command.install_scripts:install_scripts
+register = setuptools.command.register:register
+rotate = setuptools.command.rotate:rotate
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+setopt = setuptools.command.setopt:setopt
+test = setuptools.command.test:test
+upload_docs = setuptools.command.upload_docs:upload_docs
+
+[distutils.setup_keywords]
+convert_2to3_doctests = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
+eager_resources = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+exclude_package_data = setuptools.dist:check_package_data
+extras_require = setuptools.dist:check_extras
+include_package_data = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+namespace_packages = setuptools.dist:check_nsp
+package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+test_loader = setuptools.dist:check_importable
+test_suite = setuptools.dist:check_test_suite
+tests_require = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+use_2to3_fixers = setuptools.dist:assert_string_list
+zip_safe = setuptools.dist:assert_bool
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5953aad4f6..4f5c969483 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -369,10 +369,10 @@ def write_entries(cmd, basename, filename):
         data = ep
     elif ep is not None:
         data = []
-        for section, contents in ep.items():
+        for section, contents in sorted(ep.items()):
             if not isinstance(contents,basestring):
                 contents = EntryPoint.parse_group(section, contents)
-                contents = '\n'.join(map(str,contents.values()))
+                contents = '\n'.join(sorted(map(str,contents.values())))
             data.append('[%s]\n%s\n\n' % (section,contents))
         data = ''.join(data)
 

From d68b390410c2f3ee0d3e47c95fe556cd29cb3c78 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 06:26:47 -0400
Subject: [PATCH 3926/8469] Use binary mode to save/restore entry_points - no
 need to mutate newlines

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 13736be53a..19a1dfb7b2 100755
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ def run(self):
             return # even though _test.run will raise SystemExit
 
         # save the content
-        with open(entry_points) as f:
+        with open(entry_points, 'rb') as f:
             ep_content = f.read()
 
         # run the test
@@ -78,7 +78,7 @@ def run(self):
             _test.run(self)
         finally:
             # restore the file
-            with open(entry_points, 'w') as f:
+            with open(entry_points, 'wb') as f:
                 f.write(ep_content)
 
 

From 70bbc5c7a66df8a8cfb3c0fa4e90644da530a78b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Mar 2014 06:31:10 -0400
Subject: [PATCH 3927/8469] Use a context manager instead of calling _test.run
 in multiple places. Alleviates need to warn about Exceptions

---
 setup.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 19a1dfb7b2..6bcea9514c 100755
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@
 import os
 import sys
 import textwrap
+import contextlib
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -63,19 +64,24 @@ def build_package_data(self):
 class test(_test):
     """Specific test class to avoid rewriting the entry_points.txt"""
     def run(self):
+        with self._save_entry_points():
+            _test.run(self)
+
+    @contextlib.contextmanager
+    def _save_entry_points(self):
         entry_points = os.path.join('setuptools.egg-info', 'entry_points.txt')
 
         if not os.path.exists(entry_points):
-            _test.run(self)
-            return # even though _test.run will raise SystemExit
+            yield
+            return
 
         # save the content
         with open(entry_points, 'rb') as f:
             ep_content = f.read()
 
-        # run the test
+        # run the tests
         try:
-            _test.run(self)
+            yield
         finally:
             # restore the file
             with open(entry_points, 'wb') as f:

From 25d93525889d4bc3e8e4dc39091482ada4fbd84b Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 16 Mar 2014 23:05:59 -0700
Subject: [PATCH 3928/8469] Version bump to 3.5, step 2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 4c716e2075..328bea6ffe 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0rc1"
+__version__ = "3.5.0a0"
 #--end constants--

From c9494d73ee409d6b8f69fed82b26f5c71681bdaf Mon Sep 17 00:00:00 2001
From: Steven Maude <bitbucket@stevenmaude.co.uk>
Date: Mon, 17 Mar 2014 11:29:02 +0000
Subject: [PATCH 3929/8469] Fix buids -> builds

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 68467dc187..eee48f965b 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -276,7 +276,7 @@ unless you need the associated ``setuptools`` feature.
     A boolean (True or False) flag specifying whether the project can be
     safely installed and run from a zip file.  If this argument is not
     supplied, the ``bdist_egg`` command will have to analyze all of your
-    project's contents for possible problems each time it buids an egg.
+    project's contents for possible problems each time it builds an egg.
 
 ``install_requires``
     A string or list of strings specifying what other distributions need to

From a42e746af0306d9d6d10f7dfc46b95394f7829a7 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 20 Mar 2014 08:50:33 +0100
Subject: [PATCH 3930/8469] Issue #20978: Remove last part of OS/2 support in
 distutils

---
 spawn.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spawn.py b/spawn.py
index d9cf950a9b..22e87e8fdb 100644
--- a/spawn.py
+++ b/spawn.py
@@ -36,8 +36,6 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
         _spawn_posix(cmd, search_path, dry_run=dry_run)
     elif os.name == 'nt':
         _spawn_nt(cmd, search_path, dry_run=dry_run)
-    elif os.name == 'os2':
-        _spawn_os2(cmd, search_path, dry_run=dry_run)
     else:
         raise DistutilsPlatformError(
               "don't know how to spawn programs on platform '%s'" % os.name)

From 2b13fb2cdaf1bec24a36d874878505ba53272ff3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Mar 2014 22:41:09 -0400
Subject: [PATCH 3931/8469] Use a default that communicates the purpose and
 also degenerates nicely.

---
 setuptools/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 86afab63f4..8f0887c695 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -28,7 +28,7 @@
 # Standard package names for fixer packages
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
-def find_packages(where='.', exclude=(), include=()):
+def find_packages(where='.', exclude=(), include=('*',)):
     """Return a list all Python packages found within directory 'where'
 
     'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
@@ -63,8 +63,7 @@ def find_packages(where='.', exclude=(), include=()):
             )
             if looks_like_package:
                 pkg_name = prefix + name
-                if (not include or
-                        any(fnmatchcase(pkg_name, pat) for pat in include)):
+                if any(fnmatchcase(pkg_name, pat) for pat in include):
                     out.append(pkg_name)
                     stack.append((fn, pkg_name + '.'))
     for pat in exclude:

From 8a4809f7c232a18d3192798c2e583726304efd4b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Mar 2014 22:46:59 -0400
Subject: [PATCH 3932/8469] Perform the inclusion filter after traversal for
 congruency with exclude

---
 setuptools/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8f0887c695..9d06d627f2 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -63,9 +63,10 @@ def find_packages(where='.', exclude=(), include=('*',)):
             )
             if looks_like_package:
                 pkg_name = prefix + name
-                if any(fnmatchcase(pkg_name, pat) for pat in include):
-                    out.append(pkg_name)
-                    stack.append((fn, pkg_name + '.'))
+                out.append(pkg_name)
+                stack.append((fn, pkg_name + '.'))
+    for pat in include:
+        out = [item for item in out if fnmatchcase(item,pat)]
     for pat in exclude:
         out = [item for item in out if not fnmatchcase(item,pat)]
     return out

From 4545777795b8cd7abecc5ff59dcbacd957237f84 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Mar 2014 23:05:57 -0400
Subject: [PATCH 3933/8469] Extract out filtering by filename

---
 setuptools/__init__.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9d06d627f2..a4c462222c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -12,6 +12,7 @@
 from setuptools.extension import Extension
 from setuptools.dist import Distribution, Feature, _get_unpatched
 from setuptools.depends import Require
+from setuptools.compat import filterfalse
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
@@ -47,8 +48,6 @@ def find_packages(where='.', exclude=(), include=('*',)):
     """
     out = []
     stack=[(convert_path(where), '')]
-    include = list(include)
-    exclude = list(exclude) + ['ez_setup', '*__pycache__']
     while stack:
         where,prefix = stack.pop(0)
         for name in os.listdir(where):
@@ -65,11 +64,18 @@ def find_packages(where='.', exclude=(), include=('*',)):
                 pkg_name = prefix + name
                 out.append(pkg_name)
                 stack.append((fn, pkg_name + '.'))
-    for pat in include:
-        out = [item for item in out if fnmatchcase(item,pat)]
-    for pat in exclude:
-        out = [item for item in out if not fnmatchcase(item,pat)]
-    return out
+    includes = _build_filter(*include)
+    excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
+    out = filter(includes, out)
+    out = filterfalse(excludes, out)
+    return list(out)
+
+def _build_filter(*patterns):
+    """
+    Given a list of patterns, return a callable that will be true only if
+    the input matches one of the patterns.
+    """
+    return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
 
 setup = distutils.core.setup
 

From 17c19bd6ef3c63e112f82f3e81c1d863fd5074e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:05:56 -0400
Subject: [PATCH 3934/8469] Extracted directory detection and presence of '.'
 in name.

---
 setuptools/__init__.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a4c462222c..2e9c14f407 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -50,15 +50,13 @@ def find_packages(where='.', exclude=(), include=('*',)):
     stack=[(convert_path(where), '')]
     while stack:
         where,prefix = stack.pop(0)
-        for name in os.listdir(where):
+        dirs = _dirs(where)
+        suitable = filterfalse(lambda n: '.' in n, dirs)
+        for name in suitable:
             fn = os.path.join(where,name)
             looks_like_package = (
-                '.' not in name
-                and os.path.isdir(fn)
-                and (
-                    os.path.isfile(os.path.join(fn, '__init__.py'))
-                    or sys.version_info[:2] >= (3, 3)  # PEP 420
-                )
+                os.path.isfile(os.path.join(fn, '__init__.py'))
+                or sys.version_info[:2] >= (3, 3)  # PEP 420
             )
             if looks_like_package:
                 pkg_name = prefix + name
@@ -70,6 +68,16 @@ def find_packages(where='.', exclude=(), include=('*',)):
     out = filterfalse(excludes, out)
     return list(out)
 
+def _dirs(target):
+    """
+    Return all directories in target
+    """
+    return (
+        fn
+        for fn in os.listdir(target)
+        if os.path.isdir(os.path.join(target, fn))
+    )
+
 def _build_filter(*patterns):
     """
     Given a list of patterns, return a callable that will be true only if

From 8679c5facc30a558613c137c5ec3305d320134b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:10:14 -0400
Subject: [PATCH 3935/8469] Extract path assembly

---
 setuptools/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2e9c14f407..f12c8dd6e3 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -52,16 +52,17 @@ def find_packages(where='.', exclude=(), include=('*',)):
         where,prefix = stack.pop(0)
         dirs = _dirs(where)
         suitable = filterfalse(lambda n: '.' in n, dirs)
-        for name in suitable:
-            fn = os.path.join(where,name)
+        paths = (os.path.join(where, name) for name in suitable)
+        for path in paths:
+            name = os.path.basename(path)
             looks_like_package = (
-                os.path.isfile(os.path.join(fn, '__init__.py'))
+                os.path.isfile(os.path.join(path, '__init__.py'))
                 or sys.version_info[:2] >= (3, 3)  # PEP 420
             )
             if looks_like_package:
                 pkg_name = prefix + name
                 out.append(pkg_name)
-                stack.append((fn, pkg_name + '.'))
+                stack.append((path, pkg_name + '.'))
     includes = _build_filter(*include)
     excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
     out = filter(includes, out)

From 50f98edc5d47d11a93a9e28fe2fd5577ca36320b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:12:33 -0400
Subject: [PATCH 3936/8469] Extract _looks_like_package

---
 setuptools/__init__.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index f12c8dd6e3..33b0581560 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -53,22 +53,24 @@ def find_packages(where='.', exclude=(), include=('*',)):
         dirs = _dirs(where)
         suitable = filterfalse(lambda n: '.' in n, dirs)
         paths = (os.path.join(where, name) for name in suitable)
-        for path in paths:
+        packages = filter(_looks_like_package, paths)
+        for path in packages:
             name = os.path.basename(path)
-            looks_like_package = (
-                os.path.isfile(os.path.join(path, '__init__.py'))
-                or sys.version_info[:2] >= (3, 3)  # PEP 420
-            )
-            if looks_like_package:
-                pkg_name = prefix + name
-                out.append(pkg_name)
-                stack.append((path, pkg_name + '.'))
+            pkg_name = prefix + name
+            out.append(pkg_name)
+            stack.append((path, pkg_name + '.'))
     includes = _build_filter(*include)
     excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
     out = filter(includes, out)
     out = filterfalse(excludes, out)
     return list(out)
 
+def _looks_like_package(path):
+    return (
+        os.path.isfile(os.path.join(path, '__init__.py'))
+        or sys.version_info[:2] >= (3, 3)  # PEP 420
+    )
+
 def _dirs(target):
     """
     Return all directories in target

From 53ee4c9c87337d60d66ecca05450f4936c7c7465 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:16:27 -0400
Subject: [PATCH 3937/8469] Extract _find_packages_iter

---
 setuptools/__init__.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 33b0581560..dbe4368c58 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -46,8 +46,16 @@ def find_packages(where='.', exclude=(), include=('*',)):
     The list of included packages is built up first and then any explicitly
     excluded packages are removed from it.
     """
+    out = _find_packages_iter(convert_path(where))
+    includes = _build_filter(*include)
+    excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
+    out = filter(includes, out)
+    out = filterfalse(excludes, out)
+    return list(out)
+
+def _find_packages_iter(where):
     out = []
-    stack=[(convert_path(where), '')]
+    stack=[(where, '')]
     while stack:
         where,prefix = stack.pop(0)
         dirs = _dirs(where)
@@ -59,11 +67,7 @@ def find_packages(where='.', exclude=(), include=('*',)):
             pkg_name = prefix + name
             out.append(pkg_name)
             stack.append((path, pkg_name + '.'))
-    includes = _build_filter(*include)
-    excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
-    out = filter(includes, out)
-    out = filterfalse(excludes, out)
-    return list(out)
+    return out
 
 def _looks_like_package(path):
     return (

From 77b7c39d468a1065cb3cf10386ea4ddd185114b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:52:51 -0400
Subject: [PATCH 3938/8469] Extracted _all_dirs and rewrote _find_packages_iter
 as a proper iterator.

---
 setuptools/__init__.py | 43 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index dbe4368c58..05a14329fd 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -53,21 +53,24 @@ def find_packages(where='.', exclude=(), include=('*',)):
     out = filterfalse(excludes, out)
     return list(out)
 
-def _find_packages_iter(where):
-    out = []
-    stack=[(where, '')]
-    while stack:
-        where,prefix = stack.pop(0)
-        dirs = _dirs(where)
-        suitable = filterfalse(lambda n: '.' in n, dirs)
-        paths = (os.path.join(where, name) for name in suitable)
-        packages = filter(_looks_like_package, paths)
-        for path in packages:
-            name = os.path.basename(path)
-            pkg_name = prefix + name
-            out.append(pkg_name)
-            stack.append((path, pkg_name + '.'))
-    return out
+def _all_dirs(base_path):
+    """
+    Return all dirs in base_path, relative to base_path
+    """
+    for root, dirs, files in os.walk(base_path):
+        for dir in dirs:
+            yield os.path.relpath(os.path.join(root, dir), base_path)
+
+def _find_packages_iter(base_path):
+    dirs = _all_dirs(base_path)
+    suitable = filterfalse(lambda n: '.' in n, dirs)
+    packages = (
+        path
+        for path in suitable
+        if _looks_like_package(os.path.join(base_path, path))
+    )
+    for pkg_path in packages:
+        yield pkg_path.replace(os.path.sep, '.')
 
 def _looks_like_package(path):
     return (
@@ -75,16 +78,6 @@ def _looks_like_package(path):
         or sys.version_info[:2] >= (3, 3)  # PEP 420
     )
 
-def _dirs(target):
-    """
-    Return all directories in target
-    """
-    return (
-        fn
-        for fn in os.listdir(target)
-        if os.path.isdir(os.path.join(target, fn))
-    )
-
 def _build_filter(*patterns):
     """
     Given a list of patterns, return a callable that will be true only if

From d39698082f57b330546e208ac8799be75007de67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 09:53:39 -0400
Subject: [PATCH 3939/8469] Pulled find_package functionality into a
 PackageFinder class

---
 setuptools/__init__.py | 119 ++++++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 05a14329fd..9ec39b790f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -29,61 +29,70 @@
 # Standard package names for fixer packages
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
-def find_packages(where='.', exclude=(), include=('*',)):
-    """Return a list all Python packages found within directory 'where'
-
-    'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
-    will be converted to the appropriate local path syntax.  'exclude' is a
-    sequence of package names to exclude; '*' can be used as a wildcard in the
-    names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
-    'foo' itself).
-
-    'include' is a sequence of package names to include.  If it's specified,
-    only the named packages will be included.  If it's not specified, all found
-    packages will be included.  'include' can contain shell style wildcard
-    patterns just like 'exclude'.
-
-    The list of included packages is built up first and then any explicitly
-    excluded packages are removed from it.
-    """
-    out = _find_packages_iter(convert_path(where))
-    includes = _build_filter(*include)
-    excludes = _build_filter('ez_setup', '*__pycache__', *exclude)
-    out = filter(includes, out)
-    out = filterfalse(excludes, out)
-    return list(out)
-
-def _all_dirs(base_path):
-    """
-    Return all dirs in base_path, relative to base_path
-    """
-    for root, dirs, files in os.walk(base_path):
-        for dir in dirs:
-            yield os.path.relpath(os.path.join(root, dir), base_path)
-
-def _find_packages_iter(base_path):
-    dirs = _all_dirs(base_path)
-    suitable = filterfalse(lambda n: '.' in n, dirs)
-    packages = (
-        path
-        for path in suitable
-        if _looks_like_package(os.path.join(base_path, path))
-    )
-    for pkg_path in packages:
-        yield pkg_path.replace(os.path.sep, '.')
-
-def _looks_like_package(path):
-    return (
-        os.path.isfile(os.path.join(path, '__init__.py'))
-        or sys.version_info[:2] >= (3, 3)  # PEP 420
-    )
-
-def _build_filter(*patterns):
-    """
-    Given a list of patterns, return a callable that will be true only if
-    the input matches one of the patterns.
-    """
-    return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
+
+class PackageFinder(object):
+    @classmethod
+    def find(cls, where='.', exclude=(), include=('*',)):
+        """Return a list all Python packages found within directory 'where'
+
+        'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
+        will be converted to the appropriate local path syntax.  'exclude' is a
+        sequence of package names to exclude; '*' can be used as a wildcard in the
+        names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
+        'foo' itself).
+
+        'include' is a sequence of package names to include.  If it's specified,
+        only the named packages will be included.  If it's not specified, all found
+        packages will be included.  'include' can contain shell style wildcard
+        patterns just like 'exclude'.
+
+        The list of included packages is built up first and then any explicitly
+        excluded packages are removed from it.
+        """
+        out = cls._find_packages_iter(convert_path(where))
+        includes = cls._build_filter(*include)
+        excludes = cls._build_filter('ez_setup', '*__pycache__', *exclude)
+        out = filter(includes, out)
+        out = filterfalse(excludes, out)
+        return list(out)
+
+    @staticmethod
+    def _all_dirs(base_path):
+        """
+        Return all dirs in base_path, relative to base_path
+        """
+        for root, dirs, files in os.walk(base_path):
+            for dir in dirs:
+                yield os.path.relpath(os.path.join(root, dir), base_path)
+
+    @classmethod
+    def _find_packages_iter(cls, base_path):
+        dirs = cls._all_dirs(base_path)
+        suitable = filterfalse(lambda n: '.' in n, dirs)
+        packages = (
+            path
+            for path in suitable
+            if cls._looks_like_package(os.path.join(base_path, path))
+        )
+        for pkg_path in packages:
+            yield pkg_path.replace(os.path.sep, '.')
+
+    @staticmethod
+    def _looks_like_package(path):
+        return (
+            os.path.isfile(os.path.join(path, '__init__.py'))
+            or sys.version_info[:2] >= (3, 3)  # PEP 420
+        )
+
+    @staticmethod
+    def _build_filter(*patterns):
+        """
+        Given a list of patterns, return a callable that will be true only if
+        the input matches one of the patterns.
+        """
+        return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
+
+find_packages = PackageFinder.find
 
 setup = distutils.core.setup
 

From 0b99bde8ba1e3727e43ba98fb07b6ca6713a0fde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 10:01:01 -0400
Subject: [PATCH 3940/8469] Created PEP420PackageFinder, whose .find method can
 be used to find any suitable directory.

---
 setuptools/__init__.py                 | 10 ++++++----
 setuptools/tests/test_find_packages.py | 23 +++++++----------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9ec39b790f..27bd74ff59 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -79,10 +79,7 @@ def _find_packages_iter(cls, base_path):
 
     @staticmethod
     def _looks_like_package(path):
-        return (
-            os.path.isfile(os.path.join(path, '__init__.py'))
-            or sys.version_info[:2] >= (3, 3)  # PEP 420
-        )
+        return os.path.isfile(os.path.join(path, '__init__.py'))
 
     @staticmethod
     def _build_filter(*patterns):
@@ -92,6 +89,11 @@ def _build_filter(*patterns):
         """
         return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
 
+class PEP420PackageFinder(PackageFinder):
+    @staticmethod
+    def _looks_like_package(path):
+        return True
+
 find_packages = PackageFinder.find
 
 setup = distutils.core.setup
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 3e2619fc41..b382c104dd 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -1,16 +1,13 @@
 """Tests for setuptools.find_packages()."""
 import os
 import shutil
-import sys
 import tempfile
 import unittest
 
+import setuptools
 from setuptools import find_packages
-from setuptools.tests.py26compat import skipIf
-
-
-PEP420 = sys.version_info[:2] >= (3, 3)
 
+find_420_packages = setuptools.PEP420PackageFinder.find
 
 class TestFindPackages(unittest.TestCase):
 
@@ -63,7 +60,6 @@ def _touch(self, path, dir_=None):
         fp.close()
         return path
 
-    @skipIf(PEP420, 'Not a PEP 420 env')
     def test_regular_package(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(self.dist_dir)
@@ -90,35 +86,30 @@ def test_dir_with_dot_is_skipped(self):
     def _assert_packages(self, actual, expected):
         self.assertEqual(set(actual), set(expected))
 
-    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package(self):
-        packages = find_packages(
+        packages = find_420_packages(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes(self):
-        packages = find_packages(
+        packages = find_420_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_includes_or_excludes(self):
-        packages = find_packages(self.dist_dir)
+        packages = find_420_packages(self.dist_dir)
         expected = [
             'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self._assert_packages(packages, expected)
 
-    @skipIf(not PEP420, 'PEP 420 only')
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
-        packages = find_packages(
+        packages = find_420_packages(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @skipIf(not PEP420, 'PEP 420 only')
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
-        packages = find_packages(self.dist_dir)
+        packages = find_420_packages(self.dist_dir)
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])

From 2c0a61206618c83fb683a8b478b62eff88d9b33a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 10:02:04 -0400
Subject: [PATCH 3941/8469] Reindent docstring

---
 setuptools/__init__.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 27bd74ff59..ab1541d792 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -35,19 +35,19 @@ class PackageFinder(object):
     def find(cls, where='.', exclude=(), include=('*',)):
         """Return a list all Python packages found within directory 'where'
 
-        'where' should be supplied as a "cross-platform" (i.e. URL-style) path; it
-        will be converted to the appropriate local path syntax.  'exclude' is a
-        sequence of package names to exclude; '*' can be used as a wildcard in the
-        names, such that 'foo.*' will exclude all subpackages of 'foo' (but not
-        'foo' itself).
-
-        'include' is a sequence of package names to include.  If it's specified,
-        only the named packages will be included.  If it's not specified, all found
-        packages will be included.  'include' can contain shell style wildcard
-        patterns just like 'exclude'.
-
-        The list of included packages is built up first and then any explicitly
-        excluded packages are removed from it.
+        'where' should be supplied as a "cross-platform" (i.e. URL-style)
+        path; it will be converted to the appropriate local path syntax.
+        'exclude' is a sequence of package names to exclude; '*' can be used
+        as a wildcard in the names, such that 'foo.*' will exclude all
+        subpackages of 'foo' (but not 'foo' itself).
+
+        'include' is a sequence of package names to include.  If it's
+        specified, only the named packages will be included.  If it's not
+        specified, all found packages will be included.  'include' can contain
+        shell style wildcard patterns just like 'exclude'.
+
+        The list of included packages is built up first and then any
+        explicitly excluded packages are removed from it.
         """
         out = cls._find_packages_iter(convert_path(where))
         includes = cls._build_filter(*include)

From fa9eb7791874200e83d52830ea7b124fc889a156 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 10:04:58 -0400
Subject: [PATCH 3942/8469] Update changelog

---
 CHANGES.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7a9ed44695..aeba99ec00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,13 +3,12 @@ CHANGES
 =======
 
 ---
-4.0
+3.4
 ---
 
-* Issue #97: ``find_packages()`` now supports PEP 420 namespace packages. It
-  does so by considering all subdirectories of the start directory that
-  aren't regular packages to be PEP 420 namespace packages (on Python 3.3+
-  only).
+* Issue #97: Added experimental support for PEP 420 namespace package
+  discovery via the ``PEP420PackageFinder.find`` method. This new method will
+  discover packages for directories lacking an __init__.py module.
 
 ---
 3.3

From 8609e20047c05bdee087fe251335e9822fca2718 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 10:05:16 -0400
Subject: [PATCH 3943/8469] Bumped to 3.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0b59831276..9811d7d8ab 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "4.0"
+DEFAULT_VERSION = "3.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index a93f051817..36f7773514 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '4.0'
+__version__ = '3.4'

From 5143389a680ebc281e34f0aa9c52ced3c79824c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 10:07:02 -0400
Subject: [PATCH 3944/8469] Backed out changeset: 78c8cfbe3e10

---
 setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 6bcea9514c..046104c48a 100755
--- a/setup.py
+++ b/setup.py
@@ -122,10 +122,7 @@ def _save_entry_points(self):
     url = "https://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     src_root = src_root,
-    packages = setuptools.find_packages(
-        include=['setuptools*', '_markerlib'],
-        exclude=['setuptools.tests*.*'],
-    ),
+    packages = setuptools.find_packages(),
     package_data = package_data,
 
     py_modules = ['pkg_resources', 'easy_install'],

From d7cb8f24e3ba0a39adf1a94d29caf9d26184840b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 22 Mar 2014 17:39:42 -0400
Subject: [PATCH 3945/8469] Add test for exclude

---
 setuptools/tests/test_find_packages.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index b382c104dd..d8b6f47a5d 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -65,6 +65,11 @@ def test_regular_package(self):
         packages = find_packages(self.dist_dir)
         self.assertEqual(packages, ['pkg', 'pkg.subpkg'])
 
+    def test_exclude(self):
+        self._touch('__init__.py', self.pkg_dir)
+        packages = find_packages(self.dist_dir, exclude=('pkg.*',))
+        assert packages == ['pkg']
+
     def test_include_excludes_other(self):
         """
         If include is specified, other packages should be excluded.

From b3bf461294d6730617a04e2e6191c14e6a66d79e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 11:24:40 -0400
Subject: [PATCH 3946/8469] Move the transform operation into the generator
 expression.

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

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ab1541d792..6f58896206 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -69,13 +69,11 @@ def _all_dirs(base_path):
     def _find_packages_iter(cls, base_path):
         dirs = cls._all_dirs(base_path)
         suitable = filterfalse(lambda n: '.' in n, dirs)
-        packages = (
-            path
+        return (
+            path.replace(os.path.sep, '.')
             for path in suitable
             if cls._looks_like_package(os.path.join(base_path, path))
         )
-        for pkg_path in packages:
-            yield pkg_path.replace(os.path.sep, '.')
 
     @staticmethod
     def _looks_like_package(path):

From c2b328e8ce968066fd113fd10941b46947f9655a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 12:02:28 -0400
Subject: [PATCH 3947/8469] Remove 'Distribute' artifact. Fixes #171

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index eee48f965b..734408ece7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2435,7 +2435,7 @@ The ``upload_docs`` command has the following options:
 
 
 --------------------------------
-Extending and Reusing Distribute
+Extending and Reusing Setuptools
 --------------------------------
 
 Creating ``distutils`` Extensions

From c8507a0553425210a7729a30b85e40870848648b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 12:31:03 -0400
Subject: [PATCH 3948/8469] Don't trap KeyboardInterrupt (or other
 non-Exceptions) when testing download method. Fixes #172.

---
 ez_setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9811d7d8ab..775c3fb4da 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -181,7 +181,7 @@ def has_powershell():
     try:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
     finally:
         devnull.close()
@@ -199,7 +199,7 @@ def has_curl():
     try:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
     finally:
         devnull.close()
@@ -217,7 +217,7 @@ def has_wget():
     try:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
     finally:
         devnull.close()

From 8d070ba63c77512f7a8f807a52a36f5004dfb570 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 18:24:55 -0400
Subject: [PATCH 3949/8469] Enable commented code (requiring ssl extra for
 tests).

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 046104c48a..71301632f6 100755
--- a/setup.py
+++ b/setup.py
@@ -202,7 +202,9 @@ def _save_entry_points(self):
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts = [],
-    # tests_require = "setuptools[ssl]",
+    tests_require = [
+        'setuptools[ssl]',
+    ],
 )
 
 if __name__ == '__main__':

From 1cd424b6952d4495ead86c27abcf6d1f0cd3631f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 18:30:05 -0400
Subject: [PATCH 3950/8469] Add support for running tests via pytest-runner.

--HG--
extra : amend_source : d60530fbb3e3cc3455abae8e5100f85f697f3dac
---
 setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup.py b/setup.py
index 71301632f6..9e2e80e364 100755
--- a/setup.py
+++ b/setup.py
@@ -109,6 +109,8 @@ def _save_entry_points(self):
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
+pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+
 setup_params = dict(
     name="setuptools",
     version=main_ns['__version__'],
@@ -204,7 +206,10 @@ def _save_entry_points(self):
     scripts = [],
     tests_require = [
         'setuptools[ssl]',
+        'pytest',
     ],
+    setup_requires = [
+    ] + pytest_runner,
 )
 
 if __name__ == '__main__':

From e7515f5680840bb1f8303b781942a1b2ec14ed79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 18:31:26 -0400
Subject: [PATCH 3951/8469] Use pytest for running tests in Travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bf0aeba634..f6d5d04b4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,5 @@ python:
   - pypy
 # command to run tests
 script:
- - python setup.py test
+ - python setup.py ptr
  - python ez_setup.py --version 3.0.2

From 54f9f754be22953ca91714f15d5b2eea29a4036c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 18:43:13 -0400
Subject: [PATCH 3952/8469] Bypass the 'manual test' when running with pytest

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 35d93b51b2..1089e3534e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,3 +19,6 @@ formats = gztar zip
 
 [wheel]
 universal=1
+
+[pytest]
+addopts=--ignore tests/manual_test.py

From d83a2165548afbeaafc6b9d39a1dd1f6800290bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 18:46:40 -0400
Subject: [PATCH 3953/8469] Bypass shlib_test when running tests under pytest

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 1089e3534e..eb63264c18 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,4 +21,4 @@ formats = gztar zip
 universal=1
 
 [pytest]
-addopts=--ignore tests/manual_test.py
+addopts=--ignore tests/manual_test.py --ignore tests/shlib_test

From 6d4a70d613d5d03723ad55d2835f9d650b420356 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 19:08:46 -0400
Subject: [PATCH 3954/8469] Fix build of setuptools on Windows (do not create
 empty tag)

---
 tests/test_ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 26881f52c1..1825fb3403 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -23,7 +23,7 @@ def setUp(self):
         self.cwd = os.getcwd()
         self.tmpdir = tempfile.mkdtemp()
         os.chdir(TOPDIR)
-        _python_cmd("setup.py", "-q", "egg_info", "-RDb", "''", "sdist",
+        _python_cmd("setup.py", "-q", "egg_info", "-RDb", "", "sdist",
                     "--dist-dir", "%s" % self.tmpdir)
         tarball = os.listdir(self.tmpdir)[0]
         self.tarball = os.path.join(self.tmpdir, tarball)

From bfe8fb26996ca3d06c0c87176ff46a60834fb593 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 19:26:16 -0400
Subject: [PATCH 3955/8469] Force sdist zip format (preferred for _build_egg)

--HG--
extra : amend_source : eb261716fc15148a101c059fb03c0f51b683c673
---
 tests/test_ez_setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 1825fb3403..7a6baf0ca7 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -24,9 +24,9 @@ def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
         os.chdir(TOPDIR)
         _python_cmd("setup.py", "-q", "egg_info", "-RDb", "", "sdist",
-                    "--dist-dir", "%s" % self.tmpdir)
-        tarball = os.listdir(self.tmpdir)[0]
-        self.tarball = os.path.join(self.tmpdir, tarball)
+            "--formats", "zip", "--dist-dir", self.tmpdir)
+        zipball = os.listdir(self.tmpdir)[0]
+        self.zipball = os.path.join(self.tmpdir, zipball)
         from setuptools.compat import urllib2
         urllib2.urlopen = self.urlopen
 
@@ -37,7 +37,7 @@ def tearDown(self):
 
     def test_build_egg(self):
         # making it an egg
-        egg = _build_egg('Egg to be built', self.tarball, self.tmpdir)
+        egg = _build_egg('Egg to be built', self.zipball, self.tmpdir)
 
         # now trying to import it
         sys.path[0] = egg
@@ -54,7 +54,7 @@ def test_install(self):
         def _faked(*args):
             return True
         ez_setup.python_cmd = _faked
-        _install(self.tarball)
+        _install(self.zipball)
 
     def test_use_setuptools(self):
         self.assertEqual(use_setuptools(), None)

From 71a75cab2ea0fff6e4b199267e4d6db0d653acad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 20:06:22 -0400
Subject: [PATCH 3956/8469] Remove test_build_egg. The test doesn't work and
 it's difficult to test _build_egg given the current interface.

---
 tests/test_ez_setup.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 7a6baf0ca7..3e895dd4e5 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -35,15 +35,6 @@ def tearDown(self):
         os.chdir(self.cwd)
         sys.path = copy.copy(self.old_sys_path)
 
-    def test_build_egg(self):
-        # making it an egg
-        egg = _build_egg('Egg to be built', self.zipball, self.tmpdir)
-
-        # now trying to import it
-        sys.path[0] = egg
-        import setuptools
-        self.assertTrue(setuptools.__file__.startswith(egg))
-
     def test_do_download(self):
         tmpdir = tempfile.mkdtemp()
         _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1)

From 8173752ef1a4dc9e3b6039638821dbe71f216642 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Mar 2014 20:16:21 -0400
Subject: [PATCH 3957/8469] Remove test_do_download, which also no longer works
 due to complexities around secure downloaders.

---
 tests/test_ez_setup.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 3e895dd4e5..5e7ffa62f2 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -9,8 +9,7 @@
 TOPDIR = os.path.split(CURDIR)[0]
 sys.path.insert(0, TOPDIR)
 
-from ez_setup import (use_setuptools, _build_egg, _python_cmd, _do_download,
-    _install, DEFAULT_URL, DEFAULT_VERSION)
+from ez_setup import (use_setuptools, _python_cmd, _install)
 import ez_setup
 
 class TestSetup(unittest.TestCase):
@@ -35,12 +34,6 @@ def tearDown(self):
         os.chdir(self.cwd)
         sys.path = copy.copy(self.old_sys_path)
 
-    def test_do_download(self):
-        tmpdir = tempfile.mkdtemp()
-        _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1)
-        import setuptools
-        self.assertTrue(setuptools.bootstrap_install_from.startswith(tmpdir))
-
     def test_install(self):
         def _faked(*args):
             return True

From 342c210603c74e4de0fc56d210c962ef9acc2cca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 10:54:21 +0000
Subject: [PATCH 3958/8469] Update test_install to actually patch the hidden
 _python_cmd.

---
 tests/test_ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 5e7ffa62f2..e62833064d 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -37,7 +37,7 @@ def tearDown(self):
     def test_install(self):
         def _faked(*args):
             return True
-        ez_setup.python_cmd = _faked
+        ez_setup._python_cmd = _faked
         _install(self.zipball)
 
     def test_use_setuptools(self):

From 3be0c6c18a61f35ae5804464cc0da867fd0065f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 10:58:09 +0000
Subject: [PATCH 3959/8469] Remove test for use_setuptools, as it fails when
 running under pytest because the installed version of setuptools is already
 present.

---
 tests/test_ez_setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index e62833064d..89629a8d2e 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -9,7 +9,7 @@
 TOPDIR = os.path.split(CURDIR)[0]
 sys.path.insert(0, TOPDIR)
 
-from ez_setup import (use_setuptools, _python_cmd, _install)
+from ez_setup import _python_cmd, _install
 import ez_setup
 
 class TestSetup(unittest.TestCase):
@@ -40,8 +40,5 @@ def _faked(*args):
         ez_setup._python_cmd = _faked
         _install(self.zipball)
 
-    def test_use_setuptools(self):
-        self.assertEqual(use_setuptools(), None)
-
 if __name__ == '__main__':
     unittest.main()

From 4ad02f9f8bb2a805d474fd6068def77f05d8b72d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 10:59:57 +0000
Subject: [PATCH 3960/8469] Just remove test_ez_setup, as the last remaining
 test, test_install, only barely touches the functionality as the actually
 installation command is mocked. The test run in the travis config is much
 more comprehensive.

---
 tests/test_ez_setup.py | 44 ------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 tests/test_ez_setup.py

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
deleted file mode 100644
index 89629a8d2e..0000000000
--- a/tests/test_ez_setup.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import sys
-import os
-import tempfile
-import unittest
-import shutil
-import copy
-
-CURDIR = os.path.abspath(os.path.dirname(__file__))
-TOPDIR = os.path.split(CURDIR)[0]
-sys.path.insert(0, TOPDIR)
-
-from ez_setup import _python_cmd, _install
-import ez_setup
-
-class TestSetup(unittest.TestCase):
-
-    def urlopen(self, url):
-        return open(self.tarball, 'rb')
-
-    def setUp(self):
-        self.old_sys_path = copy.copy(sys.path)
-        self.cwd = os.getcwd()
-        self.tmpdir = tempfile.mkdtemp()
-        os.chdir(TOPDIR)
-        _python_cmd("setup.py", "-q", "egg_info", "-RDb", "", "sdist",
-            "--formats", "zip", "--dist-dir", self.tmpdir)
-        zipball = os.listdir(self.tmpdir)[0]
-        self.zipball = os.path.join(self.tmpdir, zipball)
-        from setuptools.compat import urllib2
-        urllib2.urlopen = self.urlopen
-
-    def tearDown(self):
-        shutil.rmtree(self.tmpdir)
-        os.chdir(self.cwd)
-        sys.path = copy.copy(self.old_sys_path)
-
-    def test_install(self):
-        def _faked(*args):
-            return True
-        ez_setup._python_cmd = _faked
-        _install(self.zipball)
-
-if __name__ == '__main__':
-    unittest.main()

From abb8efdc4aeaa0d31c82ecf9f96d115b34e70b4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 11:35:01 +0000
Subject: [PATCH 3961/8469] Update test to use local timestamps, so the tests
 pass in any timezone.

---
 tests/test_pkg_resources.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index dfa27120e8..8ce7725578 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -2,6 +2,7 @@
 import tempfile
 import os
 import zipfile
+import datetime
 
 import pkg_resources
 
@@ -17,9 +18,25 @@ def __call__(self):
         if os.path.exists(self):
             os.remove(self)
 
+ZERO = datetime.timedelta(0)
+class UTC(datetime.tzinfo):
+    """UTC"""
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
 class TestZipProvider(object):
     finalizers = []
 
+    ref_time = datetime.datetime(2013, 5, 12, 13, 25, 0)
+    "A reference time for a file modification"
+
     @classmethod
     def setup_class(cls):
         "create a zip egg and add it to sys.path"
@@ -27,11 +44,11 @@ def setup_class(cls):
         zip_egg = zipfile.ZipFile(egg, 'w')
         zip_info = zipfile.ZipInfo()
         zip_info.filename = 'mod.py'
-        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_info.date_time = cls.ref_time.timetuple()
         zip_egg.writestr(zip_info, 'x = 3\n')
         zip_info = zipfile.ZipInfo()
         zip_info.filename = 'data.dat'
-        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_info.date_time = cls.ref_time.timetuple()
         zip_egg.writestr(zip_info, 'hello, world!')
         zip_egg.close()
         egg.close()
@@ -55,11 +72,13 @@ def test_resource_filename_rewrites_on_change(self):
         manager = pkg_resources.ResourceManager()
         zp = pkg_resources.ZipProvider(mod)
         filename = zp.get_resource_filename(manager, 'data.dat')
-        assert os.stat(filename).st_mtime == 1368379500
+        actual = datetime.datetime.fromtimestamp(os.stat(filename).st_mtime)
+        assert actual == self.ref_time
         f = open(filename, 'w')
         f.write('hello, world?')
         f.close()
-        os.utime(filename, (1368379500, 1368379500))
+        ts = self.ref_time.timestamp()
+        os.utime(filename, (ts, ts))
         filename = zp.get_resource_filename(manager, 'data.dat')
         f = open(filename)
         assert f.read() == 'hello, world!'

From 8f5e0004edcd54aafe7f6fc30527f20aa8e05838 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 11:48:15 +0000
Subject: [PATCH 3962/8469] Use mktime for Python 3.2 compatibility

---
 tests/test_pkg_resources.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 8ce7725578..ed41409617 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -3,6 +3,7 @@
 import os
 import zipfile
 import datetime
+import time
 
 import pkg_resources
 
@@ -11,6 +12,16 @@
 except NameError:
     unicode = str
 
+def timestamp(dt):
+    """
+    Return a timestamp for a local, naive datetime instance.
+    """
+    try:
+        return dt.timestamp()
+    except AttributeError:
+        # Python 3.2 and earlier
+        return time.mktime(dt.timetuple())
+
 class EggRemover(unicode):
     def __call__(self):
         if self in sys.path:
@@ -77,7 +88,7 @@ def test_resource_filename_rewrites_on_change(self):
         f = open(filename, 'w')
         f.write('hello, world?')
         f.close()
-        ts = self.ref_time.timestamp()
+        ts = timestamp(self.ref_time)
         os.utime(filename, (ts, ts))
         filename = zp.get_resource_filename(manager, 'data.dat')
         f = open(filename)

From 0873d4713fb81f1402c481ac6c7745fbc586c9a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Mar 2014 11:52:06 +0000
Subject: [PATCH 3963/8469] Remove unused UTC implementation

---
 tests/test_pkg_resources.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index ed41409617..11edfe851a 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -29,19 +29,6 @@ def __call__(self):
         if os.path.exists(self):
             os.remove(self)
 
-ZERO = datetime.timedelta(0)
-class UTC(datetime.tzinfo):
-    """UTC"""
-
-    def utcoffset(self, dt):
-        return ZERO
-
-    def tzname(self, dt):
-        return "UTC"
-
-    def dst(self, dt):
-        return ZERO
-
 class TestZipProvider(object):
     finalizers = []
 

From 8b714dc7a9b2b74c67cd36d29e70d46fcc7f0773 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 28 Mar 2014 22:12:23 +0000
Subject: [PATCH 3964/8469] Apply patch based on patch in 2008 by Klaus
 Zimmerman. Fixes #176.

---
 CHANGES.txt                |  2 ++
 setup.py                   |  1 +
 setuptools/command/test.py | 10 ++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aeba99ec00..650b6de8dd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@ CHANGES
 * Issue #97: Added experimental support for PEP 420 namespace package
   discovery via the ``PEP420PackageFinder.find`` method. This new method will
   discover packages for directories lacking an __init__.py module.
+* Issue #176: Add parameter to the test command to support a custom test
+  runner: --test-runner or -r.
 
 ---
 3.3
diff --git a/setup.py b/setup.py
index 9e2e80e364..f76d371a73 100755
--- a/setup.py
+++ b/setup.py
@@ -152,6 +152,7 @@ def _save_entry_points(self):
             "packages               = setuptools.dist:check_packages",
             "dependency_links       = setuptools.dist:assert_string_list",
             "test_loader            = setuptools.dist:check_importable",
+            "test_runner            = setuptools.dist:check_importable",
             "use_2to3               = setuptools.dist:assert_bool",
             "convert_2to3_doctests  = setuptools.dist:assert_string_list",
             "use_2to3_fixers        = setuptools.dist:assert_string_list",
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index a9a0d1d735..2418833296 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -51,12 +51,14 @@ class test(Command):
         ('test-module=','m', "Run 'test_suite' in specified module"),
         ('test-suite=','s',
             "Test suite to run (e.g. 'some_module.test_suite')"),
+        ('test-runner=', 'r', "Test runner to use"),
     ]
 
     def initialize_options(self):
         self.test_suite = None
         self.test_module = None
         self.test_loader = None
+        self.test_runner = None
 
     def finalize_options(self):
 
@@ -78,6 +80,8 @@ def finalize_options(self):
             self.test_loader = getattr(self.distribution,'test_loader',None)
         if self.test_loader is None:
             self.test_loader = "setuptools.command.test:ScanningLoader"
+        if self.test_runner is None:
+            self.test_runner = getattr(self.distribution, 'test_runner', None)
 
     def with_project_on_sys_path(self, func):
         if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
@@ -154,8 +158,10 @@ def run_tests(self):
 
         loader_ep = EntryPoint.parse("x="+self.test_loader)
         loader_class = loader_ep.load(require=False)
-        cks = loader_class()
+        runner_ep = EntryPoint.parse("x=" + self.test_runner)
+        runner_class = runner_ep.load(require=False)
         unittest.main(
             None, None, [unittest.__file__]+self.test_args,
-            testLoader = cks
+            testLoader=loader_class(),
+            testRunner=runner_class(),
         )

From 768568cd1bf28ed6c474a19423286211eb0eb502 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 28 Mar 2014 22:13:08 +0000
Subject: [PATCH 3965/8469] Re-ran egg_info

---
 setuptools.egg-info/entry_points.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 41a596108f..de842da822 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -37,6 +37,7 @@ namespace_packages = setuptools.dist:check_nsp
 package_data = setuptools.dist:check_package_data
 packages = setuptools.dist:check_packages
 test_loader = setuptools.dist:check_importable
+test_runner = setuptools.dist:check_importable
 test_suite = setuptools.dist:check_test_suite
 tests_require = setuptools.dist:check_requirements
 use_2to3 = setuptools.dist:assert_bool

From 1ed2b9fd0f11fb50bedbf6d700ba6f6ab763550e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 28 Mar 2014 22:14:12 +0000
Subject: [PATCH 3966/8469] Removed notice about PEP 420 package finder.
 Discussion in the ticket (Ref #97) indicates that the implementation is
 currently inadequate.

---
 CHANGES.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 650b6de8dd..9be3987b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,9 +6,6 @@ CHANGES
 3.4
 ---
 
-* Issue #97: Added experimental support for PEP 420 namespace package
-  discovery via the ``PEP420PackageFinder.find`` method. This new method will
-  discover packages for directories lacking an __init__.py module.
 * Issue #176: Add parameter to the test command to support a custom test
   runner: --test-runner or -r.
 

From 0407725e4bd3b01f41017b48aac1d57e3c6c3cf6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 11:40:03 +0100
Subject: [PATCH 3967/8469] Remove excess whitespace; Normalize imports.

--HG--
extra : amend_source : 62f689b409b4645eda5f81b2604c50a84713ee52
---
 setuptools/command/bdist_rpm.py | 37 +++------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 8c48da3559..380fd19667 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -3,8 +3,9 @@
 # them, another kludge to allow you to build old-style non-egg RPMs, and
 # finally, a kludge to track .rpm files for uploading when run on Python <2.5.
 
+import sys
+import os
 from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
-import sys, os
 
 class bdist_rpm(_bdist_rpm):
 
@@ -27,25 +28,13 @@ def run(self):
         self.run_command('egg_info')    # ensure distro name is up-to-date
         _bdist_rpm.run(self)
 
-
-
-
-
-
-
-
-
-
-
-
-
     def _make_spec_file(self):
         version = self.distribution.get_version()
         rpmversion = version.replace('-','_')
         spec = _bdist_rpm._make_spec_file(self)
         line23 = '%define version '+version
         line24 = '%define version '+rpmversion
-        spec  = [
+        spec = [
             line.replace(
                 "Source0: %{name}-%{version}.tar",
                 "Source0: %{name}-%{unmangled_version}.tar"
@@ -60,23 +49,3 @@ def _make_spec_file(self):
         ]
         spec.insert(spec.index(line24)+1, "%define unmangled_version "+version)
         return spec
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 49298396c6067617cc6ba08e0c88921c604c28b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 11:43:40 +0100
Subject: [PATCH 3968/8469] Remove legacy compatibility in bdist_rpm

--HG--
extra : amend_source : 829ebde0696d12adfb54aca74ea6b1b510177ff4
---
 setuptools/command/bdist_rpm.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 380fd19667..d71420d5fb 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -1,10 +1,7 @@
 # This is just a kludge so that bdist_rpm doesn't guess wrong about the
 # distribution name and version, if the egg_info command is going to alter
-# them, another kludge to allow you to build old-style non-egg RPMs, and
-# finally, a kludge to track .rpm files for uploading when run on Python <2.5.
+# them, another kludge to allow you to build old-style non-egg RPMs.
 
-import sys
-import os
 from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
 
 class bdist_rpm(_bdist_rpm):
@@ -13,17 +10,6 @@ def initialize_options(self):
         _bdist_rpm.initialize_options(self)
         self.no_egg = None
 
-    if sys.version<"2.5":
-        # Track for uploading any .rpm file(s) moved to self.dist_dir
-        def move_file(self, src, dst, level=1):
-            _bdist_rpm.move_file(self, src, dst, level)
-            if dst==self.dist_dir and src.endswith('.rpm'):
-                getattr(self.distribution,'dist_files',[]).append(
-                    ('bdist_rpm',
-                    src.endswith('.src.rpm') and 'any' or sys.version[:3],
-                     os.path.join(dst, os.path.basename(src)))
-                )
-
     def run(self):
         self.run_command('egg_info')    # ensure distro name is up-to-date
         _bdist_rpm.run(self)

From ab81837b707280b960ca02675a85da7918d17fec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 11:54:24 +0100
Subject: [PATCH 3969/8469] Adjust to match modern style conventions.

---
 setuptools/command/bdist_rpm.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index d71420d5fb..194fa266ee 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -11,15 +11,17 @@ def initialize_options(self):
         self.no_egg = None
 
     def run(self):
-        self.run_command('egg_info')    # ensure distro name is up-to-date
+        # ensure distro name is up-to-date
+        self.run_command('egg_info')
+
         _bdist_rpm.run(self)
 
     def _make_spec_file(self):
         version = self.distribution.get_version()
         rpmversion = version.replace('-','_')
         spec = _bdist_rpm._make_spec_file(self)
-        line23 = '%define version '+version
-        line24 = '%define version '+rpmversion
+        line23 = '%define version ' + version
+        line24 = '%define version ' + rpmversion
         spec = [
             line.replace(
                 "Source0: %{name}-%{version}.tar",
@@ -30,8 +32,10 @@ def _make_spec_file(self):
             ).replace(
                 "%setup",
                 "%setup -n %{name}-%{unmangled_version}"
-            ).replace(line23,line24)
+            ).replace(line23, line24)
             for line in spec
         ]
-        spec.insert(spec.index(line24)+1, "%define unmangled_version "+version)
+        insert_loc = spec.index(line24) + 1
+        unmangled_version = "%define unmangled_version " + version
+        spec.insert(insert_loc, unmangled_version)
         return spec

From ee51f57c4616357bb032e61a726a34cda0e71a66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 12:12:01 +0100
Subject: [PATCH 3970/8469] The no_egg option is no longer present.

---
 setuptools/command/bdist_rpm.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 194fa266ee..a22584013f 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -6,10 +6,6 @@
 
 class bdist_rpm(_bdist_rpm):
 
-    def initialize_options(self):
-        _bdist_rpm.initialize_options(self)
-        self.no_egg = None
-
     def run(self):
         # ensure distro name is up-to-date
         self.run_command('egg_info')

From 58eb4b2b034d90f45b3daa12900f24a390bb4782 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 12:16:15 +0100
Subject: [PATCH 3971/8469] Replace outdated deprecating comments with a proper
 doc string.

---
 setuptools/command/bdist_rpm.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index a22584013f..c13732fad9 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -1,10 +1,15 @@
-# This is just a kludge so that bdist_rpm doesn't guess wrong about the
-# distribution name and version, if the egg_info command is going to alter
-# them, another kludge to allow you to build old-style non-egg RPMs.
-
 from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
 
 class bdist_rpm(_bdist_rpm):
+    """
+    Override the default bdist_rpm behavior to do the following:
+
+    1. Run egg_info to ensure the name and version are properly calculated.
+    2. Always run 'install' using --single-version-externally-managed to
+       disable eggs in RPM distributions.
+    3. Replace dash with underscore in the version numbers for better RPM
+       compatibility.
+    """
 
     def run(self):
         # ensure distro name is up-to-date

From 0b80f934c1e2effcc2484ae644613ad9beedf02f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 12:41:43 +0100
Subject: [PATCH 3972/8469] Extract a method to capture the intention of caller
 detection.

---
 setuptools/command/install.py | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 784e8efd6c..c3f1ff92c9 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -52,19 +52,8 @@ def run(self):
         if self.old_and_unmanageable or self.single_version_externally_managed:
             return _install.run(self)
 
-        # Attempt to detect whether we were called from setup() or by another
-        # command.  If we were called by setup(), our caller will be the
-        # 'run_command' method in 'distutils.dist', and *its* caller will be
-        # the 'run_commands' method.  If we were called any other way, our
-        # immediate caller *might* be 'run_command', but it won't have been
-        # called by 'run_commands'.  This is slightly kludgy, but seems to
-        # work.
-        #
-        caller = sys._getframe(2)
-        caller_module = caller.f_globals.get('__name__','')
-        caller_name = caller.f_code.co_name
-
-        if caller_module != 'distutils.dist' or caller_name!='run_commands':
+        called_from_setup = self._called_from_setup(sys._getframe(2))
+        if not called_from_setup:
             # We weren't called from the command line or setup(), so we
             # should run in backward-compatibility mode to support bdist_*
             # commands.
@@ -72,6 +61,25 @@ def run(self):
         else:
             self.do_egg_install()
 
+    @staticmethod
+    def _called_from_setup(run_parent_parent):
+        """
+        Attempt to detect whether we were called from setup() or by another
+        command.  If we were called by setup(), our caller will be the
+        'run_command' method in 'distutils.dist', and *its* caller will be
+        the 'run_commands' method.  If we were called any other way, our
+        immediate caller *might* be 'run_command', but it won't have been
+        called by 'run_commands'.  This is slightly kludgy, but seems to
+        work.
+        """
+        caller = run_parent_parent
+        caller_module = caller.f_globals.get('__name__','')
+        caller_name = caller.f_code.co_name
+        return (
+            caller_module == 'distutils.dist'
+            and caller_name == 'run_commands'
+        )
+
     def do_egg_install(self):
 
         easy_install = self.distribution.get_command_class('easy_install')

From 215a0cddf02d70e9b92b27b5b7997314b6527426 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 12:59:37 +0100
Subject: [PATCH 3973/8469] Use inspect module instead of _getframe

---
 setuptools/command/install.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index c3f1ff92c9..1d7810b814 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -1,5 +1,5 @@
 import setuptools
-import sys
+import inspect
 import glob
 from distutils.command.install import install as _install
 from distutils.errors import DistutilsArgError
@@ -52,7 +52,7 @@ def run(self):
         if self.old_and_unmanageable or self.single_version_externally_managed:
             return _install.run(self)
 
-        called_from_setup = self._called_from_setup(sys._getframe(2))
+        called_from_setup = self._called_from_setup(inspect.currentframe())
         if not called_from_setup:
             # We weren't called from the command line or setup(), so we
             # should run in backward-compatibility mode to support bdist_*
@@ -62,7 +62,7 @@ def run(self):
             self.do_egg_install()
 
     @staticmethod
-    def _called_from_setup(run_parent_parent):
+    def _called_from_setup(run_frame):
         """
         Attempt to detect whether we were called from setup() or by another
         command.  If we were called by setup(), our caller will be the
@@ -72,12 +72,13 @@ def _called_from_setup(run_parent_parent):
         called by 'run_commands'.  This is slightly kludgy, but seems to
         work.
         """
-        caller = run_parent_parent
-        caller_module = caller.f_globals.get('__name__','')
-        caller_name = caller.f_code.co_name
+        res = inspect.getouterframes(run_frame)[2]
+        caller, = res[:1]
+        info = inspect.getframeinfo(caller)
+        caller_module = caller.f_globals.get('__name__', '')
         return (
             caller_module == 'distutils.dist'
-            and caller_name == 'run_commands'
+            and info.function == 'run_commands'
         )
 
     def do_egg_install(self):

From be01e5c951fb85be934cf66a4d7878faebbb6cda Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:02:50 +0100
Subject: [PATCH 3974/8469] Update docstring

---
 setuptools/command/install.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 1d7810b814..3e6ba427ac 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -64,13 +64,12 @@ def run(self):
     @staticmethod
     def _called_from_setup(run_frame):
         """
-        Attempt to detect whether we were called from setup() or by another
-        command.  If we were called by setup(), our caller will be the
+        Attempt to detect whether run() was called from setup() or by another
+        command.  If called by setup(), the parent caller will be the
         'run_command' method in 'distutils.dist', and *its* caller will be
-        the 'run_commands' method.  If we were called any other way, our
+        the 'run_commands' method.  If called any other way, the
         immediate caller *might* be 'run_command', but it won't have been
-        called by 'run_commands'.  This is slightly kludgy, but seems to
-        work.
+        called by 'run_commands'. Return True in that case or False otherwise.
         """
         res = inspect.getouterframes(run_frame)[2]
         caller, = res[:1]

From 421bad961106fd8353980708487b4fdfff802731 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:04:17 +0100
Subject: [PATCH 3975/8469] Simplify comment not to repeat the obvious
 implication of the 'if' test.

--HG--
extra : amend_source : c92063405d99e7fdb7fe0a6312fa8438c3727c2f
---
 setuptools/command/install.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 3e6ba427ac..05a25c260d 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -54,9 +54,7 @@ def run(self):
 
         called_from_setup = self._called_from_setup(inspect.currentframe())
         if not called_from_setup:
-            # We weren't called from the command line or setup(), so we
-            # should run in backward-compatibility mode to support bdist_*
-            # commands.
+            # Run in backward-compatibility mode to support bdist_* commands.
             _install.run(self)
         else:
             self.do_egg_install()

From 359dcd429be8857202ebcfa5b85686b032414759 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:04:49 +0100
Subject: [PATCH 3976/8469] variable name is superfluous now

---
 setuptools/command/install.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 05a25c260d..f52423f43c 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -52,8 +52,7 @@ def run(self):
         if self.old_and_unmanageable or self.single_version_externally_managed:
             return _install.run(self)
 
-        called_from_setup = self._called_from_setup(inspect.currentframe())
-        if not called_from_setup:
+        if not self._called_from_setup(inspect.currentframe()):
             # Run in backward-compatibility mode to support bdist_* commands.
             _install.run(self)
         else:

From 292f0a6f46fd43144ccbe43512bc3eb4ff01dd9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:28:18 +0100
Subject: [PATCH 3977/8469] Allow install to proceed with an egg install on
 IronPython and any other environment that has no stack support. Fixes #177.

---
 CHANGES.txt                   |  4 ++++
 setuptools/command/install.py | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9be3987b07..f7340776fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@ CHANGES
 
 * Issue #176: Add parameter to the test command to support a custom test
   runner: --test-runner or -r.
+* Issue #177: Now assume most common invocation to install command on
+  platforms/environments without stack support (issuing a warning). Setuptools
+  now installs naturally on IronPython. Behavior on CPython should be
+  unchanged.
 
 ---
 3.3
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index f52423f43c..1681617f76 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -1,6 +1,8 @@
 import setuptools
 import inspect
 import glob
+import warnings
+import platform
 from distutils.command.install import install as _install
 from distutils.errors import DistutilsArgError
 
@@ -66,8 +68,16 @@ def _called_from_setup(run_frame):
         'run_command' method in 'distutils.dist', and *its* caller will be
         the 'run_commands' method.  If called any other way, the
         immediate caller *might* be 'run_command', but it won't have been
-        called by 'run_commands'. Return True in that case or False otherwise.
+        called by 'run_commands'. Return True in that case or if a call stack
+        is unavailable. Return False otherwise.
         """
+        if run_frame is None:
+            msg = "Call stack not available. bdist_* commands may fail."
+            warnings.warn(msg)
+            if platform.python_implementation() == 'IronPython':
+                msg = "For best results, pass -X:Frames to enable call stack."
+                warnings.warn(msg)
+            return True
         res = inspect.getouterframes(run_frame)[2]
         caller, = res[:1]
         info = inspect.getframeinfo(caller)

From c2972a931934f8bb764fdb60df82d760ed3a1199 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:46:24 +0100
Subject: [PATCH 3978/8469] Added tag 3.4 for changeset 5cb90066d987

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e90fb5dc6e..f4d37f9846 100644
--- a/.hgtags
+++ b/.hgtags
@@ -126,3 +126,4 @@ bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
 07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2
 b306e681a945406833fb297ae10241e2241fc22b 3.3
 78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1
+5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4

From 90f4ab45dbf6f5f91fae080078d5790fe547b57d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:47:10 +0100
Subject: [PATCH 3979/8469] Bumped to 3.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 775c3fb4da..c9b588bfa7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4"
+DEFAULT_VERSION = "3.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 36f7773514..b48a18ad41 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4'
+__version__ = '3.5'

From 4d159b9c8e84676146e41b144271818492f2a6fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:54:26 +0100
Subject: [PATCH 3980/8469] Update bdist_egg for style

---
 setuptools/command/bdist_egg.py | 133 ++++++++------------------------
 1 file changed, 34 insertions(+), 99 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 8f4d44c328..383eb5f84a 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -3,7 +3,9 @@
 Build .egg distributions"""
 
 # This module should be kept compatible with Python 2.3
-import sys, os, marshal
+import sys
+import os
+import marshal
 from setuptools import Command
 from distutils.dir_util import remove_tree, mkpath
 try:
@@ -33,22 +35,21 @@ def strip_module(filename):
 
 def write_stub(resource, pyfile):
     f = open(pyfile,'w')
-    f.write('\n'.join([
-        "def __bootstrap__():",
-        "   global __bootstrap__, __loader__, __file__",
-        "   import sys, pkg_resources, imp",
-        "   __file__ = pkg_resources.resource_filename(__name__,%r)"
-            % resource,
-        "   __loader__ = None; del __bootstrap__, __loader__",
-        "   imp.load_dynamic(__name__,__file__)",
-        "__bootstrap__()",
-        "" # terminal \n
-    ]))
+    f.write(
+        '\n'.join([
+            "def __bootstrap__():",
+            "   global __bootstrap__, __loader__, __file__",
+            "   import sys, pkg_resources, imp",
+            "   __file__ = pkg_resources.resource_filename(__name__,%r)"
+                % resource,
+            "   __loader__ = None; del __bootstrap__, __loader__",
+            "   imp.load_dynamic(__name__,__file__)",
+            "__bootstrap__()",
+            "" # terminal \n
+        ]))
     f.close()
 
 
-
-
 class bdist_egg(Command):
 
     description = "create an \"egg\" distribution"
@@ -56,41 +57,24 @@ class bdist_egg(Command):
     user_options = [
         ('bdist-dir=', 'b',
             "temporary directory for creating the distribution"),
-        ('plat-name=', 'p',
-                     "platform name to embed in generated filenames "
-                     "(default: %s)" % get_build_platform()),
+        ('plat-name=', 'p', "platform name to embed in generated filenames "
+            "(default: %s)" % get_build_platform()),
         ('exclude-source-files', None,
-                     "remove all .py files from the generated egg"),
+            "remove all .py files from the generated egg"),
         ('keep-temp', 'k',
-                     "keep the pseudo-installation tree around after " +
-                     "creating the distribution archive"),
+            "keep the pseudo-installation tree around after " +
+            "creating the distribution archive"),
         ('dist-dir=', 'd',
-                     "directory to put final built distributions in"),
+            "directory to put final built distributions in"),
         ('skip-build', None,
-                     "skip rebuilding everything (for testing/debugging)"),
+            "skip rebuilding everything (for testing/debugging)"),
     ]
 
     boolean_options = [
         'keep-temp', 'skip-build', 'exclude-source-files'
     ]
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    def initialize_options (self):
+    def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
         self.keep_temp = 0
@@ -99,7 +83,6 @@ def initialize_options (self):
         self.egg_output = None
         self.exclude_source_files = None
 
-
     def finalize_options(self):
         ei_cmd = self.ei_cmd = self.get_finalized_command("egg_info")
         self.egg_info = ei_cmd.egg_info
@@ -124,13 +107,6 @@ def finalize_options(self):
 
             self.egg_output = os.path.join(self.dist_dir, basename+'.egg')
 
-
-
-
-
-
-
-
     def do_install_data(self):
         # Hack for packages that install data to install's --install-lib
         self.get_finalized_command('install').install_lib = self.bdist_dir
@@ -156,11 +132,9 @@ def do_install_data(self):
         finally:
             self.distribution.data_files = old
 
-
     def get_outputs(self):
         return [self.egg_output]
 
-
     def call_command(self,cmdname,**kw):
         """Invoke reinitialized command `cmdname` with keyword args"""
         for dirname in INSTALL_DIRECTORY_ATTRS:
@@ -171,7 +145,6 @@ def call_command(self,cmdname,**kw):
         self.run_command(cmdname)
         return cmd
 
-
     def run(self):
         # Generate metadata first
         self.run_command("egg_info")
@@ -179,7 +152,8 @@ def run(self):
         # pull their data path from the install_lib command.
         log.info("installing library code to %s" % self.bdist_dir)
         instcmd = self.get_finalized_command('install')
-        old_root = instcmd.root; instcmd.root = None
+        old_root = instcmd.root
+        instcmd.root = None
         if self.distribution.has_c_libraries() and not self.skip_build:
             self.run_command('build_clib')
         cmd = self.call_command('install_lib', warn_dir=0)
@@ -242,7 +216,7 @@ def run(self):
 
         # Make the archive
         make_zipfile(self.egg_output, archive_root, verbose=self.verbose,
-                          dry_run=self.dry_run, mode=self.gen_header())
+            dry_run=self.dry_run, mode=self.gen_header())
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
@@ -250,9 +224,6 @@ def run(self):
         getattr(self.distribution,'dist_files',[]).append(
             ('bdist_egg',get_python_version(),self.egg_output))
 
-
-
-
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
         for base,dirs,files in walk_egg(self.bdist_dir):
@@ -269,8 +240,6 @@ def zip_safe(self):
         log.warn("zip_safe flag not set; analyzing archive contents...")
         return analyze_egg(self.bdist_dir, self.stubs)
 
-
-
     def gen_header(self):
         epm = EntryPoint.parse_map(self.distribution.entry_points or '')
         ep = epm.get('setuptools.installation',{}).get('eggsecutable')
@@ -311,7 +280,6 @@ def gen_header(self):
             f.close()
         return 'a'
 
-
     def copy_metadata_to(self, target_dir):
         "Copy metadata (egg info) to the target_dir"
         # normalize the path (so that a forward-slash in egg_info will
@@ -355,8 +323,6 @@ def get_ext_outputs(self):
 NATIVE_EXTENSIONS = dict.fromkeys('.dll .so .dylib .pyd'.split())
 
 
-
-
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
     walker = os.walk(egg_dir)
@@ -391,7 +357,9 @@ def write_safety_flag(egg_dir, safe):
             if safe is None or bool(safe) != flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe)==flag:
-            f=open(fn,'wt'); f.write('\n'); f.close()
+            f = open(fn,'wt')
+            f.write('\n')
+            f.close()
 
 safety_flags = {
     True: 'zip-safe',
@@ -410,8 +378,10 @@ def scan_module(egg_dir, base, name, stubs):
         skip = 8   # skip magic & date
     else:
         skip = 12  # skip magic & date & file size
-    f = open(filename,'rb'); f.read(skip)
-    code = marshal.load(f); f.close()
+    f = open(filename,'rb')
+    f.read(skip)
+    code = marshal.load(f)
+    f.close()
     safe = True
     symbols = dict.fromkeys(iter_symbols(code))
     for bad in ['__file__', '__path__']:
@@ -451,39 +421,6 @@ def can_scan():
     log.warn("Please ask the author to include a 'zip_safe'"
              " setting (either True or False) in the package's setup.py")
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # Attribute names of options for commands that might need to be convinced to
 # install to the egg build directory
 
@@ -492,8 +429,7 @@ def can_scan():
 ]
 
 def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None,
-    mode='w'
-):
+        mode='w'):
     """Create a zip file from all the files under 'base_dir'.  The output
     zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
     Python module (if available) or the InfoZIP "zip" utility (if installed
@@ -526,4 +462,3 @@ def visit(z, dirname, names):
         for dirname, dirs, files in os.walk(base_dir):
             visit(None, dirname, files)
     return zip_filename
-#

From c410f8d4eaaba5575453fbee26948419bbc2a247 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:58:43 +0100
Subject: [PATCH 3981/8469] Create stub template from a multiline string.

---
 setuptools/command/bdist_egg.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 383eb5f84a..0d1cc65e2e 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -6,6 +6,7 @@
 import sys
 import os
 import marshal
+import textwrap
 from setuptools import Command
 from distutils.dir_util import remove_tree, mkpath
 try:
@@ -34,19 +35,17 @@ def strip_module(filename):
     return filename
 
 def write_stub(resource, pyfile):
+    _stub_template = textwrap.dedent("""
+        def __bootstrap__():
+            global __bootstrap__, __loader__, __file__
+            import sys, pkg_resources, imp
+            __file__ = pkg_resources.resource_filename(__name__, %r)
+            __loader__ = None; del __bootstrap__, __loader__
+            imp.load_dynamic(__name__,__file__)
+        __bootstrap__()
+        """).lstrip()
     f = open(pyfile,'w')
-    f.write(
-        '\n'.join([
-            "def __bootstrap__():",
-            "   global __bootstrap__, __loader__, __file__",
-            "   import sys, pkg_resources, imp",
-            "   __file__ = pkg_resources.resource_filename(__name__,%r)"
-                % resource,
-            "   __loader__ = None; del __bootstrap__, __loader__",
-            "   imp.load_dynamic(__name__,__file__)",
-            "__bootstrap__()",
-            "" # terminal \n
-        ]))
+    f.write(_stub_template % resource)
     f.close()
 
 

From 86cd51682907df59a05918584bb85663862adeac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 13:59:13 +0100
Subject: [PATCH 3982/8469] Use file context for write_stub

---
 setuptools/command/bdist_egg.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 0d1cc65e2e..c19a0ba7ea 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -44,9 +44,8 @@ def __bootstrap__():
             imp.load_dynamic(__name__,__file__)
         __bootstrap__()
         """).lstrip()
-    f = open(pyfile,'w')
-    f.write(_stub_template % resource)
-    f.close()
+    with open(pyfile, 'w') as f:
+        f.write(_stub_template % resource)
 
 
 class bdist_egg(Command):

From 588f3c4adf63bbd49f40ae3329da36a007f3091b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 17:02:52 +0100
Subject: [PATCH 3983/8469] Reformat to add the conventional whitespace and
 shorter lines.

---
 setuptools/command/test.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 2418833296..c46efc0f0d 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -16,26 +16,24 @@ def loadTestsFromModule(self, module):
         the return value to the tests.
         """
         tests = []
-        if module.__name__!='setuptools.tests.doctest':  # ugh
-            tests.append(TestLoader.loadTestsFromModule(self,module))
+        if module.__name__ != 'setuptools.tests.doctest':  # ugh
+            tests.append(TestLoader.loadTestsFromModule(self, module))
 
         if hasattr(module, "additional_tests"):
             tests.append(module.additional_tests())
 
         if hasattr(module, '__path__'):
             for file in resource_listdir(module.__name__, ''):
-                if file.endswith('.py') and file!='__init__.py':
-                    submodule = module.__name__+'.'+file[:-3]
+                if file.endswith('.py') and file != '__init__.py':
+                    submodule = module.__name__ + '.' + file[:-3]
                 else:
-                    if resource_exists(
-                        module.__name__, file+'/__init__.py'
-                    ):
+                    if resource_exists(module.__name__, file + '/__init__.py'):
                         submodule = module.__name__+'.'+file
                     else:
                         continue
                 tests.append(self.loadTestsFromName(submodule))
 
-        if len(tests)!=1:
+        if len(tests) != 1:
             return self.suiteClass(tests)
         else:
             return tests[0] # don't create a nested suite for only one return
@@ -66,7 +64,7 @@ def finalize_options(self):
             if self.test_module is None:
                 self.test_suite = self.distribution.test_suite
             else:
-                self.test_suite = self.test_module+".test_suite"
+                self.test_suite = self.test_module + ".test_suite"
         elif self.test_module:
             raise DistutilsOptionError(
                 "You may specify a module or a suite, but not both"
@@ -77,14 +75,18 @@ def finalize_options(self):
         if self.verbose:
             self.test_args.insert(0,'--verbose')
         if self.test_loader is None:
-            self.test_loader = getattr(self.distribution,'test_loader',None)
+            self.test_loader = getattr(self.distribution, 'test_loader', None)
         if self.test_loader is None:
             self.test_loader = "setuptools.command.test:ScanningLoader"
         if self.test_runner is None:
             self.test_runner = getattr(self.distribution, 'test_runner', None)
 
     def with_project_on_sys_path(self, func):
-        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
+        with_2to3 = (
+            sys.version_info >= (3,)
+            and getattr(self.distribution, 'use_2to3', False)
+        )
+        if with_2to3:
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date

From 9cd58f5b62a43b50bbf01a41a9f6ad18002bcdd1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 17:13:37 +0100
Subject: [PATCH 3984/8469] Also run tests under unittest for now. Ref #181.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f6d5d04b4c..0b5672cb8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,6 @@ python:
   - pypy
 # command to run tests
 script:
+ - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 3.0.2

From 628b5278a174d94907a25d065403feed1d2cd1d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 17:20:36 +0100
Subject: [PATCH 3985/8469] Extract the resolution of loader/runner classes.
 Allows None value to pass-through to unittest.main. Fixes #180.

---
 CHANGES.txt                |  6 ++++++
 setuptools/command/test.py | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f7340776fd..fbfb4885ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+3.4.1
+-----
+
+* Issue #180: Fix regression in test command not caught by py.test-run tests.
+
 ---
 3.4
 ---
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index c46efc0f0d..e377a78144 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -158,12 +158,19 @@ def run_tests(self):
                         del_modules.append(name)
                 list(map(sys.modules.__delitem__, del_modules))
 
-        loader_ep = EntryPoint.parse("x="+self.test_loader)
-        loader_class = loader_ep.load(require=False)
-        runner_ep = EntryPoint.parse("x=" + self.test_runner)
-        runner_class = runner_ep.load(require=False)
         unittest.main(
             None, None, [unittest.__file__]+self.test_args,
-            testLoader=loader_class(),
-            testRunner=runner_class(),
+            testLoader=self._resolve_as_ep(self.test_loader),
+            testRunner=self._resolve_as_ep(self.test_runner),
         )
+
+    @staticmethod
+    def _resolve_as_ep(val):
+        """
+        Load the indicated attribute value, called, as a as if it were
+        specified as an entry point.
+        """
+        if val is None:
+            return
+        parsed = EntryPoint.parse("x=" + val)
+        return parsed.load(require=False)()

From b2c25b76747deecc9d7b8fea04f7c2de2787aa14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 18:26:28 +0100
Subject: [PATCH 3986/8469] Skip this test because it now fails under Python
 3.3 and earlier apparently due to a bug in the inspect module. Since the test
 passes under Python 3.4 and later, that should still serve as a suitable
 regression test.

---
 setuptools/tests/test_easy_install.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 70e2ad993f..53114efd81 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -23,6 +23,7 @@
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
 import pkg_resources
+from .py26compat import skipIf
 
 class FakeDist(object):
     def get_entry_map(self, group):
@@ -225,6 +226,9 @@ def test_local_index(self):
             else:
                 del os.environ['PYTHONPATH']
 
+    @skipIf(sys.version_info < (3, 4),
+        "Test fails on Python 3.3 and earlier due to bug in inspect but only "
+        "when run under setup.py test")
     def test_setup_requires(self):
         """Regression test for Distribute issue #318
 

From 10fdeafd2e235e02269552e9f67fe41e4ac1ed2c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 18:35:58 +0100
Subject: [PATCH 3987/8469] Bumped to 3.4.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c9b588bfa7..f5fa741b84 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.5"
+DEFAULT_VERSION = "3.4.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index b48a18ad41..da4564dd63 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.5'
+__version__ = '3.4.1'

From 248a2a7f1496558ef5826edf04bf0605f72c60c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 18:36:00 +0100
Subject: [PATCH 3988/8469] Added tag 3.4.1 for changeset e39de2d3eb77

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f4d37f9846..5dcf93968c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -127,3 +127,4 @@ bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
 b306e681a945406833fb297ae10241e2241fc22b 3.3
 78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1
 5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4
+e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1

From d5f19d2efb05693cf0934e8fc32f6c2b71ee6e38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Mar 2014 18:36:44 +0100
Subject: [PATCH 3989/8469] Bumped to 3.4.2 in preparation for next release.

---
 ez_setup.py                      | 2 +-
 setuptools.egg-info/requires.txt | 8 ++++----
 setuptools/version.py            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f5fa741b84..1429de915b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4.1"
+DEFAULT_VERSION = "3.4.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923ef5..e5db30adfb 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==1.0.1
-
 [ssl:sys_platform=='win32']
-wincertstore==0.2
\ No newline at end of file
+wincertstore==0.2
+
+[certs]
+certifi==1.0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index da4564dd63..daee014fe1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4.1'
+__version__ = '3.4.2'

From 8b74269476d72e2e05a6f7ff35d693b816e9457c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Apr 2014 18:33:37 -0400
Subject: [PATCH 3990/8469] Wrap unittest.main in a compatibility wrapper for
 Python 3.1 compatibility. Fixes #183

---
 CHANGES.txt                |  6 ++++++
 setuptools/command/test.py | 11 +++++++----
 setuptools/py31compat.py   | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fbfb4885ab..5980f7af3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+3.4.2
+-----
+
+* Issue #183: Fix additional regression in test command on Python 3.1.
+
 -----
 3.4.1
 -----
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e377a78144..7422b71907 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,10 +1,15 @@
+import unittest
+from unittest import TestLoader
+
 from setuptools import Command
 from distutils.errors import DistutilsOptionError
 import sys
 from pkg_resources import (resource_listdir, resource_exists,
     normalize_path, working_set, _namespace_packages, add_activation_listener,
     require, EntryPoint)
-from unittest import TestLoader
+
+from setuptools.py31compat import unittest_main
+
 
 class ScanningLoader(TestLoader):
 
@@ -141,8 +146,6 @@ def run(self):
                 self.with_project_on_sys_path(self.run_tests)
 
     def run_tests(self):
-        import unittest
-
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
@@ -158,7 +161,7 @@ def run_tests(self):
                         del_modules.append(name)
                 list(map(sys.modules.__delitem__, del_modules))
 
-        unittest.main(
+        unittest_main(
             None, None, [unittest.__file__]+self.test_args,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index e6b2910a5b..6e76558293 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -1,3 +1,6 @@
+import sys
+import unittest
+
 __all__ = ['get_config_vars', 'get_path']
 
 try:
@@ -35,3 +38,15 @@ def __exit__(self, exctype, excvalue, exctrace):
             except OSError: #removal errors are not the only possible
                 pass
             self.name = None
+
+
+unittest_main = unittest.main
+
+_PY31 = (3, 1) <= sys.version_info[:2] < (3, 2)
+if _PY31:
+    # on Python 3.1, translate testRunner==None to defaultTestLoader
+    # for compatibility with Python 2.6, 2.7, and 3.2+
+    def unittest_main(*args, **kwargs):
+        if 'testRunner' in kwargs and kwargs['testRunner'] is None:
+            kwargs['testRunner'] = unittest.defaultTestLoader
+        return unittest.main(*args, **kwargs)

From a9986a9acf2e081fbc753492991a91b388b28d13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Apr 2014 18:35:57 -0400
Subject: [PATCH 3991/8469] Added tag 3.4.2 for changeset 369f6f90f696

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5dcf93968c..c5cfe1f600 100644
--- a/.hgtags
+++ b/.hgtags
@@ -128,3 +128,4 @@ b306e681a945406833fb297ae10241e2241fc22b 3.3
 78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1
 5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4
 e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
+369f6f90f69683702cc0b72827ccf949977808b0 3.4.2

From 6801265563d5dd46359989c22355a61357ea5db1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Apr 2014 18:36:29 -0400
Subject: [PATCH 3992/8469] Bumped to 3.4.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1429de915b..d3014523b6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4.2"
+DEFAULT_VERSION = "3.4.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index daee014fe1..c2d1211f14 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4.2'
+__version__ = '3.4.3'

From 9937d7d8f536c32c2f38e3dc665f19e70ad0a537 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 7 Apr 2014 13:58:29 +0200
Subject: [PATCH 3993/8469] Issue #183: Really fix test command with Python
 3.1.

---
 CHANGES.txt              | 6 ++++++
 setuptools/py31compat.py | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5980f7af3d..512127b3d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+3.4.3
+-----
+
+* Issue #183: Really fix test command with Python 3.1.
+
 -----
 3.4.2
 -----
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 6e76558293..c487ac0439 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -44,9 +44,9 @@ def __exit__(self, exctype, excvalue, exctrace):
 
 _PY31 = (3, 1) <= sys.version_info[:2] < (3, 2)
 if _PY31:
-    # on Python 3.1, translate testRunner==None to defaultTestLoader
+    # on Python 3.1, translate testRunner==None to TextTestRunner
     # for compatibility with Python 2.6, 2.7, and 3.2+
     def unittest_main(*args, **kwargs):
         if 'testRunner' in kwargs and kwargs['testRunner'] is None:
-            kwargs['testRunner'] = unittest.defaultTestLoader
+            kwargs['testRunner'] = unittest.TextTestRunner
         return unittest.main(*args, **kwargs)

From 4e2ee153c1656abd97ef54df117c3acc3be67db1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Apr 2014 14:53:44 -0400
Subject: [PATCH 3994/8469] Added tag 3.4.3 for changeset 06a56e063c32

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c5cfe1f600..6c789a0edf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -129,3 +129,4 @@ b306e681a945406833fb297ae10241e2241fc22b 3.3
 5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4
 e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 369f6f90f69683702cc0b72827ccf949977808b0 3.4.2
+06a56e063c327b0606f9e9690764279d424646b2 3.4.3

From 951352507c88bc2430bf21d00adf16b1e55de105 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Apr 2014 14:54:35 -0400
Subject: [PATCH 3995/8469] Bumped to 3.4.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d3014523b6..1b8fd95975 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4.3"
+DEFAULT_VERSION = "3.4.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c2d1211f14..6f9c25387a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4.3'
+__version__ = '3.4.4'

From b118b5f25040715111699eff1345d1eb08457270 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Apr 2014 19:20:31 -0400
Subject: [PATCH 3996/8469] Add test capturing overmatching in new
 find_packages. Ref #184.

---
 setuptools/tests/test_find_packages.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index d8b6f47a5d..47ea9e053b 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -88,6 +88,17 @@ def test_dir_with_dot_is_skipped(self):
         packages = find_packages(self.dist_dir)
         self.assertTrue('pkg.some.data' not in packages)
 
+    def test_dir_with_packages_in_subdir_is_excluded(self):
+        """
+        Ensure that a package in a non-package such as build/pkg/__init__.py
+        is excluded.
+        """
+        build_dir = self._mkdir('build', self.dist_dir)
+        build_pkg_dir = self._mkdir('pkg', build_dir)
+        self._touch('__init__.py', build_pkg_dir)
+        packages = find_packages(self.dist_dir)
+        self.assertTrue('build.pkg' not in packages)
+
     def _assert_packages(self, actual, expected):
         self.assertEqual(set(actual), set(expected))
 

From c87de03d89ca07416bb2e2c252c7721313e5d9ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Apr 2014 00:45:04 -0400
Subject: [PATCH 3997/8469] Exclude children of excluded parents when doing
 package discovery. Fixes #184.

---
 CHANGES.txt            |  7 +++++++
 setuptools/__init__.py | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 512127b3d3..1c54ea5ee7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+3.4.4
+-----
+
+* Issue #184: Correct failure where find_package over-matched packages
+  when directory traversal isn't short-circuited.
+
 -----
 3.4.3
 -----
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6f58896206..8d46b6dde1 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -50,12 +50,29 @@ def find(cls, where='.', exclude=(), include=('*',)):
         explicitly excluded packages are removed from it.
         """
         out = cls._find_packages_iter(convert_path(where))
+        out = cls.require_parents(out)
         includes = cls._build_filter(*include)
         excludes = cls._build_filter('ez_setup', '*__pycache__', *exclude)
         out = filter(includes, out)
         out = filterfalse(excludes, out)
         return list(out)
 
+    @staticmethod
+    def require_parents(packages):
+        """
+        Exclude any apparent package that apparently doesn't include its
+        parent.
+
+        For example, exclude 'foo.bar' if 'foo' is not present.
+        """
+        found = []
+        for pkg in packages:
+            base, sep, child = pkg.rpartition('.')
+            if base and base not in found:
+                continue
+            found.append(pkg)
+            yield pkg
+
     @staticmethod
     def _all_dirs(base_path):
         """

From b1989ddb47fbcd9e79b984e123d8d3a0b82cb20a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Apr 2014 00:50:38 -0400
Subject: [PATCH 3998/8469] Added tag 3.4.4 for changeset 0917d575d260

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6c789a0edf..0f189371c4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -130,3 +130,4 @@ b306e681a945406833fb297ae10241e2241fc22b 3.3
 e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 369f6f90f69683702cc0b72827ccf949977808b0 3.4.2
 06a56e063c327b0606f9e9690764279d424646b2 3.4.3
+0917d575d26091a184796624743825914994bf95 3.4.4

From 6c6fcae287fa60c959b0e63f60b0d12318e0f9f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Apr 2014 00:51:14 -0400
Subject: [PATCH 3999/8469] Bumped to 3.4.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1b8fd95975..b9fd08f09a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4.4"
+DEFAULT_VERSION = "3.4.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 6f9c25387a..c56dd17d2a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4.4'
+__version__ = '3.4.5'

From cb2fa7e5dd86949a06dcdb3babdecc778985fd02 Mon Sep 17 00:00:00 2001
From: "yyfeng88625@gmail.com" <yyfeng88625@gmail.com>
Date: Fri, 21 Mar 2014 13:43:54 +0800
Subject: [PATCH 4000/8469] Python2.x needs encode as well.

--HG--
extra : source : ab82442e2205a4ab1016711e482388590688fa15
---
 setuptools/command/egg_info.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 4f5c969483..30873e19cb 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -304,8 +304,7 @@ def write_file(filename, contents):
     sequence of strings without line terminators) to it.
     """
     contents = "\n".join(contents)
-    if sys.version_info >= (3,):
-        contents = contents.encode("utf-8")
+    contents = contents.encode("utf-8")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()

From 84b76498861b75f70242a11c1751a382532e5b81 Mon Sep 17 00:00:00 2001
From: Giampaolo Rodola <g.rodola@gmail.com>
Date: Thu, 27 Mar 2014 14:14:16 +0100
Subject: [PATCH 4001/8469] Minor cosmetic enhancement to provide a more
 readable repr()esentation of Extension instances:

- <distutils.extension.Extension at 0x2b2088b79b00>
+ <distutils.extension.Extension('_struct') at 0x2b2088b79b00>
---
 extension.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/extension.py b/extension.py
index a93655af2c..cc04a18a3a 100644
--- a/extension.py
+++ b/extension.py
@@ -131,6 +131,14 @@ def __init__(self, name, sources,
             msg = "Unknown Extension options: %s" % options
             warnings.warn(msg)
 
+    def __repr__(self):
+        return '<%s.%s(%r) at %#x>' % (
+            self.__class__.__module__,
+            self.__class__.__name__,
+            self.name,
+            id(self))
+
+
 def read_setup_file(filename):
     """Reads a Setup file and returns Extension instances."""
     from distutils.sysconfig import (parse_makefile, expand_makefile_vars,

From 57e567ec43dfa2c103ee1f99bca8628da091c9db Mon Sep 17 00:00:00 2001
From: Martin Froehlich <martin.froehlich@goodscloud.net>
Date: Sun, 13 Apr 2014 19:46:54 +0000
Subject: [PATCH 4002/8469] Fix typo in formats.txt

--HG--
extra : source : 32166eed1174dc565d903c81b9d99c292357aecc
---
 docs/formats.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/formats.txt b/docs/formats.txt
index ef28353e6a..36954bef75 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -397,7 +397,7 @@ and how it works, as well as the `Zip File Issues`_ section below.
 
 These are zero-length files, and either one or the other should exist.
 If ``zip-safe`` exists, it means that the project will work properly
-when installedas an ``.egg`` zipfile, and conversely the existence of
+when installed as an ``.egg`` zipfile, and conversely the existence of
 ``not-zip-safe`` means the project should not be installed as an
 ``.egg`` file.  The ``zip_safe`` option to setuptools' ``setup()``
 determines which file will be written. If the option isn't provided,

From 896fd3d8c7eec74766560559f095fe92e49ecfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Tue, 15 Apr 2014 17:31:55 +0200
Subject: [PATCH 4003/8469] quick-fix #168: avoid using stale cached zipped egg
 dist info in easy_install

When installing a zipped egg, into a Python environment with a same named zipped
egg already installed, the installation can fail with a zipimport.ZipImportError
complaining about a 'bad local header' encountered in the new zip archive.

This can occur if setuptools loads the original egg for some reason and the two
zip archives have different content. Then if Python attempts to read a file from
the new archive, it will expect it in a location pointed to by the original
archive's directory. This will report an error if zipimport does not encounter
the expected local file start header in the given location.

The mismatch between the two archives can be reproduced by installing the same
setuptools version (prior to this commit and after commit
f40b810acc5f6494735c912a625d647dc2a3c582 that first introduced the requires.txt
metadata information file into the setuptools project) twice from its sources -
which can randomly fail due to the scenario described above. That will package
the zipped egg archive twice, with each of the archives containing slightly
different Python modules. In case this causes any of the compressed modules to
have different size (easy_install.pyc is often the culprit here), then
attempting to read any later file in the zip archive will fail (requires.txt
package metadata file is often the culprit here). A similar scenario can be
reproduced more consistently by manually modifying the setuptools
easy_install.py source file before building the new egg, e.g. by adding some
additional empty lines to its start.

The underlying reason for this problem is setuptools using zipimporter instances
with cached zip archive content directory information from the older zip
archive, even after the old archive has been replaced.

This patch cleans up only one such old zipimporter instance - one referenced via
easy_install command's local_index attribute. That is the one that has been
causing all the currently reported/reproduced installation failures.

A clean solution needs to make certain there are no more zipimporter instances
with stale archive content directory caches left behind after replacing a zipped
egg archive with another. There are currently at least the following known
potential sources for such stale zipimporter instances (all holding references
to Distribution instances that can then hold a reference to a zipimporter
related to their zipped egg archive):
  easy_install command attributes:
      local_index (Environment with a list of Distributions)
      package_index (PackageIndex with a list of Distributions)
      pth_file (PthDistributions with a list of Distributions)
  global pkg_resources.working_set object (holds a list of Distributions)
  imported module's __loader__ attribute (zipimporter instance)
  zipimport._zip_directory_cache
  sys.path_importer_cache

Further debugging & development note: A complete list of all the currently
active stale zipimporter instances can be read using CPython's gc module and its
object reference introspection functionality (gc.get_objects() &
gc.get_referrers()) from inside the uncache_zipdir() method in the setuptools
easy_install.py module. That is the method called just after the old arhive has
been replaced by the new one and all the stale zipimporter instances were
supposed to have been released.

--HG--
extra : rebase_source : 041d2819881b8f7e5c4da333a387fc86d4f7b791
---
 setuptools/command/easy_install.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index de139f2f13..10176874ef 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -646,6 +646,15 @@ def select_scheme(self, name):
     def process_distribution(self, requirement, dist, deps=True, *info):
         self.update_pth(dist)
         self.package_index.add(dist)
+        # First remove the dist from self.local_index, to avoid problems using
+        # old cached data in case its underlying file has been replaced.
+        #
+        # This is a quick-fix for a zipimporter caching issue in case the dist
+        # has been implemented as and already loaded from a zip file that got
+        # replaced later on. For more detailed information see setuptools issue
+        # #168 at 'http://bitbucket.org/pypa/setuptools/issue/168'.
+        if dist in self.local_index[dist.key]:
+            self.local_index.remove(dist)
         self.local_index.add(dist)
         self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist

From bdab866e5efd23d156b4f598f79baa2208f16157 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Apr 2014 13:54:53 -0400
Subject: [PATCH 4004/8469] Extract first_line_re function to encapsulate
 compatibility mechanism

---
 setuptools/command/easy_install.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4f497c3bed..d947e548c1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1526,16 +1526,21 @@ def make_relative(self,path):
         else:
             return path
 
-def get_script_header(script_text, executable=sys_executable, wininst=False):
-    """Create a #! line, getting options (if any) from script_text"""
+
+def _first_line_re():
     from distutils.command.build_scripts import first_line_re
 
     # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern.
     if not isinstance(first_line_re.pattern, str):
-        first_line_re = re.compile(first_line_re.pattern.decode())
+        return re.compile(first_line_re.pattern.decode())
+
+    return first_line_re
 
+
+def get_script_header(script_text, executable=sys_executable, wininst=False):
+    """Create a #! line, getting options (if any) from script_text"""
     first = (script_text+'\n').splitlines()[0]
-    match = first_line_re.match(first)
+    match = _first_line_re().match(first)
     options = ''
     if match:
         options = match.group(1) or ''

From 48864fad436fcb2ca9f4832fbdabbb66d12b7610 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Apr 2014 13:55:23 -0400
Subject: [PATCH 4005/8469] Move import to the top

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d947e548c1..5206698f50 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -28,6 +28,8 @@
 import struct
 from glob import glob
 from distutils import log, dir_util
+from distutils.command.build_scripts import first_line_re
+
 
 import pkg_resources
 from setuptools import Command, _dont_write_bytecode
@@ -1528,8 +1530,6 @@ def make_relative(self,path):
 
 
 def _first_line_re():
-    from distutils.command.build_scripts import first_line_re
-
     # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern.
     if not isinstance(first_line_re.pattern, str):
         return re.compile(first_line_re.pattern.decode())

From 0f0c892487277e25ce79a39477b193822f1edf79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Apr 2014 14:11:09 -0400
Subject: [PATCH 4006/8469] Re-arrange _first_line_re to put core functionality
 at the top level

---
 setuptools/command/easy_install.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5206698f50..de139f2f13 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1530,11 +1530,15 @@ def make_relative(self,path):
 
 
 def _first_line_re():
-    # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern.
-    if not isinstance(first_line_re.pattern, str):
-        return re.compile(first_line_re.pattern.decode())
+    """
+    Return a regular expression based on first_line_re suitable for matching
+    strings.
+    """
+    if isinstance(first_line_re.pattern, str):
+        return first_line_re
 
-    return first_line_re
+    # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern.
+    return re.compile(first_line_re.pattern.decode())
 
 
 def get_script_header(script_text, executable=sys_executable, wininst=False):

From cf1cb5ba177568bfe699d9e0b2d67a78a9800101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Tue, 15 Apr 2014 22:47:14 +0200
Subject: [PATCH 4007/8469] pkg_resources.Environment.__getitem__() code
 cleanup

Better commented the code, especially the result caching & lazy distribution
list sorting strategies implemented there. Added several TODO comments
indicating things to look into there in the future.

General code cleanup:
 - stopped reusing the project_name variable for different purposes
 - added an assertion to detect corrupt distribution list caches

--HG--
extra : source : 86ef8f59ef4e1fc253c155b9ca0856497455372d
---
 pkg_resources.py | 64 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2d656f1a2b..0d8987c8f6 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -811,30 +811,70 @@ def scan(self, search_path=None):
             for dist in find_distributions(item):
                 self.add(dist)
 
-    def __getitem__(self,project_name):
+    def __getitem__(self, project_name):
         """Return a newest-to-oldest list of distributions for `project_name`
+
+        Uses case-insensitive `project_name` comparison, assuming all the
+        project's distributions use their project's name converted to all
+        lowercase as their key.
+
         """
+        # Result caching here serves two purposes:
+        #  1. Speed up the project_name --> distribution list lookup.
+        #  2. 'First access' flag indicating the distribution list requires
+        #     sorting before it can be returned to the user.
+        #TODO: This caching smells like premature optimization. It could be
+        # that the distribution list lookup speed is not really affected by
+        # this, in which case the whole cache could be removed and replaced
+        # with a single 'dist_list_sorted' flag. This seems strongly indicated
+        # by the fact that this function does not really cache the distribution
+        # list under the given project name but only under its canonical
+        # distribution key variant. That means that repeated access using a non
+        # canonical project name does not get any speedup at all.
         try:
             return self._cache[project_name]
         except KeyError:
-            project_name = project_name.lower()
-            if project_name not in self._distmap:
-                return []
+            pass
 
-        if project_name not in self._cache:
-            dists = self._cache[project_name] = self._distmap[project_name]
+        # We expect all distribution keys to contain lower-case characters
+        # only.
+        #TODO: See if this expectation can be implemented better, e.g. by using
+        # some sort of a name --> key conversion function on the Distribution
+        # class or something similar.
+        #TODO: This requires all classes derived from Distribution to use
+        # lower-case only keys even if they do not calculate them from the
+        # project's name. It might be better to make this function simpler by
+        # passing it the the exact distribution key as a parameter and have the
+        # caller convert a `project_name` to its corresponding distribution key
+        # as needed.
+        distribution_key = project_name.lower()
+        try:
+            dists = self._distmap[distribution_key]
+        except KeyError:
+            return []
+
+        # Sort the project's distribution list lazily on first access.
+        if distribution_key not in self._cache:
+            self._cache[distribution_key] = dists
             _sort_dists(dists)
 
-        return self._cache[project_name]
+        return dists
 
-    def add(self,dist):
-        """Add `dist` if we ``can_add()`` it and it isn't already added"""
+    def add(self, dist):
+        """Add `dist` if we ``can_add()`` it and it has not already been added
+        """
         if self.can_add(dist) and dist.has_version():
-            dists = self._distmap.setdefault(dist.key,[])
+            dists = self._distmap.setdefault(dist.key, [])
             if dist not in dists:
                 dists.append(dist)
-                if dist.key in self._cache:
-                    _sort_dists(self._cache[dist.key])
+                cached_dists = self._cache.get(dist.key)
+                if cached_dists:
+                    # The distribution list has been cached on first access,
+                    # therefore we know it has already been sorted lazily and
+                    # we are expected to keep it in sorted order.
+                    _sort_dists(dists)
+                    assert cached_dists is dists,  \
+                        "Distribution list cache corrupt."
 
     def best_match(self, req, working_set, installer=None):
         """Find distribution best matching `req` and usable on `working_set`

From cb4b1a9e751b10d63d91197934d1d8f8fff44be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Tue, 15 Apr 2014 23:27:23 +0200
Subject: [PATCH 4008/8469] clean up easy_install.uncache_zipdir() code &
 comments

--HG--
extra : rebase_source : 79778a670897cb92c17307f2535fcac6447e16b4
---
 setuptools/command/easy_install.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 10176874ef..8c28159070 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1583,18 +1583,30 @@ def auto_chmod(func, arg, exc):
     reraise(et, (ev[0], ev[1] + (" %s %s" % (func,arg))))
 
 def uncache_zipdir(path):
-    """Ensure that the importer caches dont have stale info for `path`"""
-    from zipimport import _zip_directory_cache as zdc
-    _uncache(path, zdc)
+    """
+    Remove any globally cached zip file related data for `path`
+
+    Stale zipimport.zipimporter objects need to be removed when a zip file is
+    replaced as they contain cached zip file directory information. If they are
+    asked to get data from their zip file, they will use that cached
+    information to calculate the data location in the zip file. This calculated
+    location may be incorrect for the replaced zip file, which may in turn
+    cause the read operation to either fail or return incorrect data.
+
+    Note we have no way to clear any local caches from here. That is left up to
+    whomever is in charge of maintaining that cache.
+
+    """
+    _uncache(path, zipimport._zip_directory_cache)
     _uncache(path, sys.path_importer_cache)
 
 def _uncache(path, cache):
     if path in cache:
         del cache[path]
     else:
-        path = normalize_path(path)
+        normalized_path = normalize_path(path)
         for p in cache:
-            if normalize_path(p)==path:
+            if normalize_path(p) == normalized_path:
                 del cache[p]
                 return
 

From 92cbda9859d98267e36c836ca954ca884df9b07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Tue, 15 Apr 2014 23:35:44 +0200
Subject: [PATCH 4009/8469] make easy_install.uncache_zipdir() remove more
 stale zipimporter instances

Since paths are case-insensitive on Windows, zipped egg modules may be loaded
using different but equivalent paths. Importing each such different path causes
a new zipimporter to be instantiated. Removing cached zipimporter instances must
then not forget about removing those created for differently spelled paths to
the same replaced egg.

Other missed zipimporter instances are those used to access zipped eggs stored
inside zipped eggs. When clearing zipimporter instances got a given path, we
need to clear all the instances related to any of its subpaths as well.

--HG--
extra : rebase_source : 86aeadd1e639fbc83d27a0c551fdc2b8a68a6f85
---
 setuptools/command/easy_install.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8c28159070..d4bb2b90d7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1597,18 +1597,20 @@ def uncache_zipdir(path):
     whomever is in charge of maintaining that cache.
 
     """
-    _uncache(path, zipimport._zip_directory_cache)
-    _uncache(path, sys.path_importer_cache)
-
-def _uncache(path, cache):
-    if path in cache:
-        del cache[path]
-    else:
-        normalized_path = normalize_path(path)
-        for p in cache:
-            if normalize_path(p) == normalized_path:
-                del cache[p]
-                return
+    normalized_path = normalize_path(path)
+    _uncache(normalized_path, zipimport._zip_directory_cache)
+    _uncache(normalized_path, sys.path_importer_cache)
+
+def _uncache(normalized_path, cache):
+    to_remove = []
+    prefix_len = len(normalized_path)
+    for p in cache:
+        np = normalize_path(p)
+        if (np.startswith(normalized_path) and
+                np[prefix_len:prefix_len + 1] in (os.sep, '')):
+            to_remove.append(p)
+    for p in to_remove:
+        del cache[p]
 
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"

From b84464da6025f83488ad9f085692bc32c868fca7 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Wed, 16 Apr 2014 15:26:18 -0500
Subject: [PATCH 4010/8469] caching the zip manifests Fixes #154

--HG--
extra : rebase_source : 0f32792e01b6a1b746a1e07ffa4d7a85eeda1595
---
 pkg_resources.py | 71 ++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5734989dd6..fd1663c234 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1530,33 +1530,48 @@ def __init__(self):
 empty_provider = EmptyProvider()
 
 
-def build_zipmanifest(path):
-    """
-    This builds a similar dictionary to the zipimport directory
-    caches.  However instead of tuples, ZipInfo objects are stored.
-
-    The translation of the tuple is as follows:
-      * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
-              on pypy it is the same (one reason why distribute did work
-              in some cases on pypy and win32).
-      * [1] - zipinfo.compress_type
-      * [2] - zipinfo.compress_size
-      * [3] - zipinfo.file_size
-      * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
-              len(ascii encoding of filename) otherwise
-      * [5] - (zipinfo.date_time[0] - 1980) << 9 |
-               zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
-      * [6] - (zipinfo.date_time[3] - 1980) << 11 |
-               zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
-      * [7] - zipinfo.CRC
-    """
-    zipinfo = dict()
-    with ContextualZipFile(path) as zfile:
-        for zitem in zfile.namelist():
-            zpath = zitem.replace('/', os.sep)
-            zipinfo[zpath] = zfile.getinfo(zitem)
-            assert zipinfo[zpath] is not None
-    return zipinfo
+class ZipManifests(object):
+
+    def __init__(self):
+        self.known = dict()
+
+    def __call__(self, path):
+        path = os.path.normpath(path)
+        stat = os.stat(path)
+
+        if path not in self.known or self.known[path][0] != stat.st_mtime:
+            self.known[path] = (stat.st_mtime, self.build_manifest(path))
+
+        return self.known[path][1]
+
+    def build_manifest(self, path):
+        """
+        This builds a similar dictionary to the zipimport directory
+        caches.  However instead of tuples, ZipInfo objects are stored.
+    
+        The translation of the tuple is as follows:
+          * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
+                  on pypy it is the same (one reason why distribute did work
+                  in some cases on pypy and win32).
+          * [1] - zipinfo.compress_type
+          * [2] - zipinfo.compress_size
+          * [3] - zipinfo.file_size
+          * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
+                  len(ascii encoding of filename) otherwise
+          * [5] - (zipinfo.date_time[0] - 1980) << 9 |
+                   zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
+          * [6] - (zipinfo.date_time[3] - 1980) << 11 |
+                   zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
+          * [7] - zipinfo.CRC
+        """
+        zipinfo = dict()
+        with ContextualZipFile(path) as zfile:
+            for zitem in zfile.namelist():
+                zpath = zitem.replace('/', os.sep)
+                zipinfo[zpath] = zfile.getinfo(zitem)
+                assert zipinfo[zpath] is not None
+        return zipinfo
+build_zipmanifest = ZipManifests()
 
 
 class ContextualZipFile(zipfile.ZipFile):
@@ -1586,7 +1601,6 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self, module)
-        self.zipinfo = build_zipmanifest(self.loader.archive)
         self.zip_pre = self.loader.archive+os.sep
 
     def _zipinfo_name(self, fspath):
@@ -1802,7 +1816,6 @@ class EggMetadata(ZipProvider):
     def __init__(self, importer):
         """Create a metadata provider from a zipimporter"""
 
-        self.zipinfo = build_zipmanifest(importer.archive)
         self.zip_pre = importer.archive+os.sep
         self.loader = importer
         if importer.prefix:

From 1fe3013bb336d8e76a6e1a816550197157207963 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 31 May 2014 09:14:37 -0500
Subject: [PATCH 4011/8469] Development Heads.

--HG--
branch : develop

From 5208cd6fc27e0459e251a967f432c77556d2bf40 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Wed, 16 Apr 2014 18:26:58 -0500
Subject: [PATCH 4012/8469] Applied Patch from cazabon to handle svn tag
 revisions

--HG--
branch : develop
extra : rebase_source : 571dac8142fc43b54bcd0302598766b0bb9e13ff
---
 setuptools/command/egg_info.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9019524db3..6bb2ead9af 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -168,9 +168,10 @@ def tags(self):
         version = ''
         if self.tag_build:
             version+=self.tag_build
-        if self.tag_svn_revision and (
-            os.path.exists('.svn') or os.path.exists('PKG-INFO')
-        ):  version += '-r%s' % self.get_svn_revision()
+        if self.tag_svn_revision:
+            rev = self.get_svn_revision()
+            if rev:     # is 0 if it's not an svn working copy
+                version += '-r%s' % rev
         if self.tag_date:
             import time
             version += time.strftime("-%Y%m%d")

From 17cf6313ef57d7b4316f827a9b7855eedbccb105 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Wed, 16 Apr 2014 19:06:47 -0500
Subject: [PATCH 4013/8469] Fixes Issue #185: Svn not working on new style svn
 metadata.

--HG--
branch : develop
extra : rebase_source : 07c28db844959df06d385e21bc62c8d05c729dba
---
 CHANGES.txt                          | 7 +++++++
 setuptools.egg-info/entry_points.txt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3df689332a..5a2b17ae53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,6 +40,13 @@ CHANGES
 * Issue #192: Preferred bootstrap location is now
   https://bootstrap.pypa.io/ez_setup.py (mirrored from former location).
 
+-----
+3.4.5
+-----
+
+* Issue #185: Applied patch and added regression tests for making
+  svn tagging work on the new style SVN metadata.
+
 -----
 3.4.4
 -----
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index de842da822..c345395da2 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,6 +1,6 @@
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
 
 [distutils.commands]
 alias = setuptools.command.alias:alias

From c147c6789efe24bf54e20d5644aa338bd532adb7 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Wed, 23 Apr 2014 18:29:43 -0500
Subject: [PATCH 4014/8469] Add Regression Tests for svn tagging.

--HG--
branch : develop
extra : rebase_source : a05d5f844416113562066786c697170ed85c48fd
---
 setuptools/tests/test_egg_info.py | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 278543662f..4c41a2ccd9 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -138,6 +138,43 @@ def test_sources(self):
 
         return data
 
+    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
+    def test_svn_tags(self):
+        code, data = environment.run_setup_py(["egg_info", 
+                                               "--tag-svn-revision"],
+                                              pypath=self.old_cwd,
+                                              data_stream=1)
+        if code:
+            raise AssertionError(data)
+
+        pkginfo = os.path.join('dummy.egg-info', 'PKG-INFO')
+        infile = open(pkginfo, 'r')
+        try:
+            read_contents = infile.readlines()
+        finally:
+            infile.close()
+            del infile
+
+        self.assertIn("Version: 0.1.1-r1\n", read_contents)
+
+    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
+    def test_no_tags(self):
+        code, data = environment.run_setup_py(["egg_info"],
+                                              pypath=self.old_cwd,
+                                              data_stream=1)
+        if code:
+            raise AssertionError(data)
+
+        pkginfo = os.path.join('dummy.egg-info', 'PKG-INFO')
+        infile = open(pkginfo, 'r')
+        try:
+            read_contents = infile.readlines()
+        finally:
+            infile.close()
+            del infile
+
+        self.assertIn("Version: 0.1.1\n", read_contents)
+
 
 class TestSvnDummyLegacy(environment.ZippedEnvironment):
 

From d118aae6b768cfdf387aca862e150e7736c7cd71 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Wed, 23 Apr 2014 21:54:27 -0500
Subject: [PATCH 4015/8469] Prune paths file list starting with (RCS|CVS|.svn)
 as well as path with such sub directories.

--HG--
branch : develop
extra : rebase_source : 2b3326fe668e880b351b0d5f388472239d915d58
---
 CHANGES.txt                    | 2 ++
 setuptools/command/egg_info.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a2b17ae53..73569cc91a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,8 @@ CHANGES
 
 * Issue #185: Applied patch and added regression tests for making
   svn tagging work on the new style SVN metadata.
+* Prune revision control directories (e.g .svn) from base path
+  as well as subfolders.
 
 -----
 3.4.4
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6bb2ead9af..be326ac265 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -316,7 +316,8 @@ def prune_file_list(self):
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
         sep = re.escape(os.sep)
-        self.filelist.exclude_pattern(sep+r'(RCS|CVS|\.svn)'+sep, is_regex=1)
+        self.filelist.exclude_pattern(r'(^|'+sep+r')(RCS|CVS|\.svn)'+sep, 
+                                      is_regex=1)
 
 
 def write_file(filename, contents):

From 573c2c86d4d4f506a87a1fc16060f32c1386ad38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Apr 2014 17:38:29 -0400
Subject: [PATCH 4016/8469] Correct indentation and clarify meaning by using
 namespacing

--HG--
extra : amend_source : 20ab7547c8478eb084767fe701e627bdd462ba16
---
 setuptools/command/bdist_rpm.py       |  8 ++++----
 setuptools/command/bdist_wininst.py   |  6 +++---
 setuptools/command/build_py.py        | 20 ++++++++++----------
 setuptools/command/install.py         | 20 ++++++++++----------
 setuptools/command/install_lib.py     |  8 ++++----
 setuptools/command/install_scripts.py |  9 ++++-----
 setuptools/command/register.py        |  9 ++++-----
 setuptools/command/sdist.py           |  8 ++++----
 8 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index c13732fad9..9938682499 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -1,6 +1,6 @@
-from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
+import distutils.command.bdist_rpm as orig
 
-class bdist_rpm(_bdist_rpm):
+class bdist_rpm(orig.bdist_rpm):
     """
     Override the default bdist_rpm behavior to do the following:
 
@@ -15,12 +15,12 @@ def run(self):
         # ensure distro name is up-to-date
         self.run_command('egg_info')
 
-        _bdist_rpm.run(self)
+        orig.bdist_rpm.run(self)
 
     def _make_spec_file(self):
         version = self.distribution.get_version()
         rpmversion = version.replace('-','_')
-        spec = _bdist_rpm._make_spec_file(self)
+        spec = orig.bdist_rpm._make_spec_file(self)
         line23 = '%define version ' + version
         line24 = '%define version ' + rpmversion
         spec = [
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index d4d195a086..f9d8d4f076 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,6 +1,6 @@
-from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst
+import distutils.command.bdist_wininst as orig
 
-class bdist_wininst(_bdist_wininst):
+class bdist_wininst(orig.bdist_wininst):
     def reinitialize_command(self, command, reinit_subcommands=0):
         """
         Supplement reinitialize_command to work around
@@ -15,6 +15,6 @@ def reinitialize_command(self, command, reinit_subcommands=0):
     def run(self):
         self._is_running = True
         try:
-            _bdist_wininst.run(self)
+            orig.bdist_wininst.run(self)
         finally:
             self._is_running = False
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 1efabc02b7..53bfb7df23 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -2,7 +2,7 @@
 import sys
 import fnmatch
 import textwrap
-from distutils.command.build_py import build_py as _build_py
+import distutils.command.build_py as orig
 from distutils.util import convert_path
 from glob import glob
 
@@ -13,7 +13,7 @@ class Mixin2to3:
         def run_2to3(self, files, doctests=True):
             "do nothing"
 
-class build_py(_build_py, Mixin2to3):
+class build_py(orig.build_py, Mixin2to3):
     """Enhanced 'build_py' command that includes data files with packages
 
     The data files are specified via a 'package_data' argument to 'setup()'.
@@ -23,7 +23,7 @@ class build_py(_build_py, Mixin2to3):
     'py_modules' and 'packages' in the same setup operation.
     """
     def finalize_options(self):
-        _build_py.finalize_options(self)
+        orig.build_py.finalize_options(self)
         self.package_data = self.distribution.package_data
         self.exclude_package_data = self.distribution.exclude_package_data or {}
         if 'data_files' in self.__dict__: del self.__dict__['data_files']
@@ -48,16 +48,16 @@ def run(self):
 
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
-        self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
+        self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=0))
 
     def __getattr__(self, attr):
         if attr=='data_files':  # lazily compute data files
             self.data_files = files = self._get_data_files()
             return files
-        return _build_py.__getattr__(self,attr)
+        return orig.build_py.__getattr__(self,attr)
 
     def build_module(self, module, module_file, package):
-        outfile, copied = _build_py.build_module(self, module, module_file, package)
+        outfile, copied = orig.build_py.build_module(self, module, module_file, package)
         if copied:
             self.__updated_files.append(outfile)
         return outfile, copied
@@ -140,7 +140,7 @@ def get_outputs(self, include_bytecode=1):
             needed for the 'install_lib' command to do its job properly, and to
             generate a correct installation manifest.)
             """
-            return _build_py.get_outputs(self, include_bytecode) + [
+            return orig.build_py.get_outputs(self, include_bytecode) + [
                 os.path.join(build_dir, filename)
                 for package, src_dir, build_dir,filenames in self.data_files
                 for filename in filenames
@@ -153,7 +153,7 @@ def check_package(self, package, package_dir):
         except KeyError:
             pass
 
-        init_py = _build_py.check_package(self, package, package_dir)
+        init_py = orig.build_py.check_package(self, package, package_dir)
         self.packages_checked[package] = init_py
 
         if not init_py or not self.distribution.namespace_packages:
@@ -179,10 +179,10 @@ def check_package(self, package, package_dir):
 
     def initialize_options(self):
         self.packages_checked={}
-        _build_py.initialize_options(self)
+        orig.build_py.initialize_options(self)
 
     def get_package_dir(self, package):
-        res = _build_py.get_package_dir(self, package)
+        res = orig.build_py.get_package_dir(self, package)
         if self.distribution.src_root is not None:
             return os.path.join(self.distribution.src_root, res)
         return res
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 1681617f76..3425dbf713 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -3,18 +3,18 @@
 import glob
 import warnings
 import platform
-from distutils.command.install import install as _install
+import distutils.command.install as orig
 from distutils.errors import DistutilsArgError
 
-class install(_install):
+class install(orig.install):
     """Use easy_install to install the package, w/dependencies"""
 
-    user_options = _install.user_options + [
+    user_options = orig.install.user_options + [
         ('old-and-unmanageable', None, "Try not to use this!"),
         ('single-version-externally-managed', None,
             "used by system package builders to create 'flat' eggs"),
     ]
-    boolean_options = _install.boolean_options + [
+    boolean_options = orig.install.boolean_options + [
         'old-and-unmanageable', 'single-version-externally-managed',
     ]
     new_commands = [
@@ -24,12 +24,12 @@ class install(_install):
     _nc = dict(new_commands)
 
     def initialize_options(self):
-        _install.initialize_options(self)
+        orig.install.initialize_options(self)
         self.old_and_unmanageable = None
         self.single_version_externally_managed = None
 
     def finalize_options(self):
-        _install.finalize_options(self)
+        orig.install.finalize_options(self)
         if self.root:
             self.single_version_externally_managed = True
         elif self.single_version_externally_managed:
@@ -42,7 +42,7 @@ def finalize_options(self):
     def handle_extra_path(self):
         if self.root or self.single_version_externally_managed:
             # explicit backward-compatibility mode, allow extra_path to work
-            return _install.handle_extra_path(self)
+            return orig.install.handle_extra_path(self)
 
         # Ignore extra_path when installing an egg (or being run by another
         # command without --root or --single-version-externally-managed
@@ -52,11 +52,11 @@ def handle_extra_path(self):
     def run(self):
         # Explicit request for old-style install?  Just do it
         if self.old_and_unmanageable or self.single_version_externally_managed:
-            return _install.run(self)
+            return orig.install.run(self)
 
         if not self._called_from_setup(inspect.currentframe()):
             # Run in backward-compatibility mode to support bdist_* commands.
-            _install.run(self)
+            orig.install.run(self)
         else:
             self.do_egg_install()
 
@@ -113,5 +113,5 @@ def do_egg_install(self):
 
 # XXX Python 3.1 doesn't see _nc if this is inside the class
 install.sub_commands = [
-        cmd for cmd in _install.sub_commands if cmd[0] not in install._nc
+        cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc
     ] + install.new_commands
diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 63dc11fe38..747fbabbae 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,7 +1,7 @@
-from distutils.command.install_lib import install_lib as _install_lib
+import distutils.command.install_lib as orig
 import os
 
-class install_lib(_install_lib):
+class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
 
     def run(self):
@@ -34,7 +34,7 @@ def copy_tree(
         exclude = self.get_exclusions()
 
         if not exclude:
-            return _install_lib.copy_tree(self, infile, outfile)
+            return orig.install_lib.copy_tree(self, infile, outfile)
 
         # Exclude namespace package __init__.py* files from the output
 
@@ -56,7 +56,7 @@ def pf(src, dst):
         return outfiles
 
     def get_outputs(self):
-        outputs = _install_lib.get_outputs(self)
+        outputs = orig.install_lib.get_outputs(self)
         exclude = self.get_exclusions()
         if exclude:
             return [f for f in outputs if f not in exclude]
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 1c6cc51d50..c19536bfdc 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,14 +1,13 @@
-from distutils.command.install_scripts import install_scripts \
-     as _install_scripts
+import distutils.command.install_scripts as orig
 from pkg_resources import Distribution, PathMetadata, ensure_directory
 import os
 from distutils import log
 
-class install_scripts(_install_scripts):
+class install_scripts(orig.install_scripts):
     """Do normal script install, plus any egg_info wrapper scripts"""
 
     def initialize_options(self):
-        _install_scripts.initialize_options(self)
+        orig.install_scripts.initialize_options(self)
         self.no_ep = False
 
     def run(self):
@@ -17,7 +16,7 @@ def run(self):
 
         self.run_command("egg_info")
         if self.distribution.scripts:
-            _install_scripts.run(self)  # run first to set up self.outfiles
+            orig.install_scripts.run(self)  # run first to set up self.outfiles
         else:
             self.outfiles = []
         if self.no_ep:
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 3b2e085907..6694d1c0a7 100755
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,10 +1,9 @@
-from distutils.command.register import register as _register
+import distutils.command.register as orig
 
-class register(_register):
-    __doc__ = _register.__doc__
+class register(orig.register):
+    __doc__ = orig.register.__doc__
 
     def run(self):
         # Make sure that we are using valid current name/version info
         self.run_command('egg_info')
-        _register.run(self)
-
+        orig.register.run(self)
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 76e1c5f18b..948d27fafb 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,7 +4,7 @@
 from glob import glob
 
 import pkg_resources
-from distutils.command.sdist import sdist as _sdist
+import distutils.command.sdist as orig
 from distutils.util import convert_path
 from distutils import log
 from setuptools import svn_utils
@@ -72,7 +72,7 @@ def _default_revctrl(dirname=''):
 ]
 
 
-class sdist(_sdist):
+class sdist(orig.sdist):
     """Smart sdist that finds anything supported by revision control"""
 
     user_options = [
@@ -119,7 +119,7 @@ def __read_template_hack(self):
         # Doing so prevents an error when easy_install attempts to delete the
         #  file.
         try:
-            _sdist.read_template(self)
+            orig.sdist.read_template(self)
         except:
             sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
             raise
@@ -197,7 +197,7 @@ def check_readme(self):
             )
 
     def make_release_tree(self, base_dir, files):
-        _sdist.make_release_tree(self, base_dir, files)
+        orig.sdist.make_release_tree(self, base_dir, files)
 
         # Save any egg_info command line options used to create this sdist
         dest = os.path.join(base_dir, 'setup.cfg')

From 9551d30ebf4e6c735504c59673a90ea837e05345 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 May 2014 18:34:53 -0400
Subject: [PATCH 4017/8469] Updated references to bootstrap module to use new
 bootstrap.pypa.io locations. Fixes #192.

---
 README.txt          | 16 ++++++++--------
 docs/setuptools.txt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.txt b/README.txt
index a6f6acba2f..ad6386e5b9 100755
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
 The link provided to ez_setup.py is a bookmark to bootstrap script for the
 latest known stable release.
 
-.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+.. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
 
 Windows 8 (Powershell)
 ======================
@@ -31,18 +31,18 @@ For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 Using Windows 8 or later, it's possible to install with one simple Powershell
 command. Start up Powershell and paste this command::
 
-    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | python -
+    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python -
 
 You must start the Powershell with Administrative privileges or you may choose
 to install a user-local installation::
 
-    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | python - --user
+    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user
 
 If you have Python 3.3 or later, you can use the ``py`` command to install to
 different Python versions. For example, to install to Python 3.3 if you have
 Python 2.7 installed::
 
-    > (Invoke-WebRequest https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py).Content | py -3 -
+    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 -
 
 The recommended way to install setuptools on Windows is to download
 `ez_setup.py`_ and run it. The script will download the appropriate .egg
@@ -70,16 +70,16 @@ Most Linux distributions come with wget.
 Download `ez_setup.py`_ and run it using the target Python version. The script
 will download the appropriate version and install it for you::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python
+    > wget https://bootstrap.pypa.io/ez_setup.py -O - | python
 
 Note that you will may need to invoke the command with superuser privileges to
 install to the system Python::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | sudo python
+    > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python
 
 Alternatively, Setuptools may be installed to a user-local path::
 
-    > wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | python - --user
+    > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
 
 Unix including Mac OS X (curl)
 ==============================
@@ -87,7 +87,7 @@ Unix including Mac OS X (curl)
 If your system has curl installed, follow the ``wget`` instructions but
 replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example::
 
-    > curl https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -o - | python
+    > curl https://bootstrap.pypa.io/ez_setup.py -o - | python
 
 
 Advanced Installation
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 734408ece7..a793af53e5 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -15,7 +15,7 @@ including just a single `bootstrap module`_ (a 12K .py file), your package will
 automatically download and install ``setuptools`` if the user is building your
 package from source and doesn't have a suitable version already installed.
 
-.. _bootstrap module: https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
+.. _bootstrap module: https://bootstrap.pypa.io/ez_setup.py
 
 Feature Highlights:
 

From 36addf1ea62cde1ab5884f91e18ac4d1954529cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 11:46:21 -0400
Subject: [PATCH 4018/8469] Monkey-patch the write_pkg_info method on Python
 3.1 DistributionMetadata. Fixes #197

---
 CHANGES.txt        |  7 +++++++
 setuptools/dist.py | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1c54ea5ee7..cf8b0898bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+3.5
+---
+
+* Issue #197: On Python 3.1, PKG-INFO is now saved in a UTF-8 encoding instead
+  of ``sys.getpreferredencoding`` to match the behavior on Python 2.6-3.4.
+
 -----
 3.4.4
 -----
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0801ae74ff..59a892362c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -7,6 +7,7 @@
 import distutils.log
 import distutils.core
 import distutils.cmd
+import distutils.dist
 from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
@@ -31,6 +32,26 @@ def _get_unpatched(cls):
 
 _Distribution = _get_unpatched(_Distribution)
 
+def _patch_distribution_metadata_write_pkg_info():
+    """
+    Workaround issue #197 - Python 3.1 uses an environment-local encoding to
+    save the pkg_info. Monkey-patch its write_pkg_info method to correct
+    this undesirable behavior.
+    """
+    if sys.version_info[:2] != (3,1):
+        return
+
+    # from Python 3.4
+    def write_pkg_info(self, base_dir):
+        """Write the PKG-INFO file into the release tree.
+        """
+        with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
+                  encoding='UTF-8') as pkg_info:
+            self.write_pkg_file(pkg_info)
+
+    distutils.dist.DistributionMetadata.write_pkg_info = write_pkg_info
+_patch_distribution_metadata_write_pkg_info()
+
 sequence = tuple, list
 
 def check_importable(dist, attr, value):

From 0515f30739d1dce3bc10921db403f336358ef447 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 12:58:13 -0400
Subject: [PATCH 4019/8469] Backed out changeset: b0a2fcc5275a Ref #193

---
 setuptools/command/egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 30873e19cb..4f5c969483 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -304,7 +304,8 @@ def write_file(filename, contents):
     sequence of strings without line terminators) to it.
     """
     contents = "\n".join(contents)
-    contents = contents.encode("utf-8")
+    if sys.version_info >= (3,):
+        contents = contents.encode("utf-8")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()

From 118e245064fe77ea85ae936223edf09ff1448314 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:14:22 -0400
Subject: [PATCH 4020/8469] Add test capturing failure when find_packages no
 longer follows symlinks. Ref #195

--HG--
extra : amend_source : 4efa6b87d3acaefebdfcc953e78a452ffc1f160d
---
 setuptools.egg-info/requires.txt       |  8 ++++----
 setuptools/tests/test_find_packages.py | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e5db30adfb..a49a923ef5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.2
-
 [certs]
-certifi==1.0.1
\ No newline at end of file
+certifi==1.0.1
+
+[ssl:sys_platform=='win32']
+wincertstore==0.2
\ No newline at end of file
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 47ea9e053b..92f7aff7ca 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -1,14 +1,24 @@
 """Tests for setuptools.find_packages()."""
 import os
+import sys
 import shutil
 import tempfile
 import unittest
+import platform
 
 import setuptools
 from setuptools import find_packages
+from setuptools.tests.py26compat import skipIf
 
 find_420_packages = setuptools.PEP420PackageFinder.find
 
+def has_symlink():
+    bad_symlink = (
+        # Windows symlink directory detection is broken on Python 3.2
+        platform.system() == 'Windows' and sys.version_info[:2] == (3,2)
+    )
+    return hasattr(os, 'symlink') and not bad_symlink
+
 class TestFindPackages(unittest.TestCase):
 
     def setUp(self):
@@ -99,6 +109,21 @@ def test_dir_with_packages_in_subdir_is_excluded(self):
         packages = find_packages(self.dist_dir)
         self.assertTrue('build.pkg' not in packages)
 
+    @skipIf(not has_symlink(), 'Symlink support required')
+    def test_symlinked_packages_are_included(self):
+        """
+        A symbolically-linked directory should be treated like any other
+        directory when matched as a package.
+
+        Create a link from lpkg -> pkg.
+        """
+        self._touch('__init__.py', self.pkg_dir)
+        linked_pkg = os.path.join(self.dist_dir, 'lpkg')
+        os.symlink('pkg', linked_pkg)
+        assert os.path.isdir(linked_pkg)
+        packages = find_packages(self.dist_dir)
+        self.assertTrue('lpkg' in packages)
+
     def _assert_packages(self, actual, expected):
         self.assertEqual(set(actual), set(expected))
 

From 439f6f846869c8266954adfedad232933caaa813 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:26:05 -0400
Subject: [PATCH 4021/8469] Restore traversal of symbolic links in
 find_packages. Fixes #195.

---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8d46b6dde1..d99ab2a6b4 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -78,7 +78,7 @@ def _all_dirs(base_path):
         """
         Return all dirs in base_path, relative to base_path
         """
-        for root, dirs, files in os.walk(base_path):
+        for root, dirs, files in os.walk(base_path, followlinks=True):
             for dir in dirs:
                 yield os.path.relpath(os.path.join(root, dir), base_path)
 

From a7997c7d799a439d597c2781444d7706e4671517 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:28:21 -0400
Subject: [PATCH 4022/8469] Update changelog

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cf8b0898bd..0f531db93a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,12 @@ CHANGES
 3.5
 ---
 
+* Issue #195: Follow symbolic links in find_packages (restoring behavior
+  broken in 3.4).
 * Issue #197: On Python 3.1, PKG-INFO is now saved in a UTF-8 encoding instead
   of ``sys.getpreferredencoding`` to match the behavior on Python 2.6-3.4.
+* Issue #192: Preferred bootstrap location is now
+  https://bootstrap.pypa.io/ez_setup.py (mirrored from former location).
 
 -----
 3.4.4

From 18a5dbb7ef3ef1c7739bb5d9e27f5752ed49bf5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:29:49 -0400
Subject: [PATCH 4023/8469] Bumped to 3.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b9fd08f09a..c9b588bfa7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.4.5"
+DEFAULT_VERSION = "3.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c56dd17d2a..b48a18ad41 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.4.5'
+__version__ = '3.5'

From ea3bb0f33c6e86f41faf2ea32c1e02dd17ffa99d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:29:53 -0400
Subject: [PATCH 4024/8469] Added tag 3.5 for changeset 98f29d521c3a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0f189371c4..f6d203994f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -131,3 +131,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 369f6f90f69683702cc0b72827ccf949977808b0 3.4.2
 06a56e063c327b0606f9e9690764279d424646b2 3.4.3
 0917d575d26091a184796624743825914994bf95 3.4.4
+98f29d521c3a57bae0090d2bc5597d93db95b108 3.5

From a781730b09a385da8c6f4102ec0acdc3ff8184a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 May 2014 13:30:25 -0400
Subject: [PATCH 4025/8469] Bumped to 3.6 in preparation for next release.

---
 ez_setup.py                      | 2 +-
 setuptools.egg-info/requires.txt | 8 ++++----
 setuptools/version.py            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c9b588bfa7..e5e6e56fee 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.5"
+DEFAULT_VERSION = "3.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923ef5..e5db30adfb 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==1.0.1
-
 [ssl:sys_platform=='win32']
-wincertstore==0.2
\ No newline at end of file
+wincertstore==0.2
+
+[certs]
+certifi==1.0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index b48a18ad41..f1d9320859 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.5'
+__version__ = '3.6'

From 1ced5f833688b3dd3116d9aacafdfb504ccfa950 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 09:07:53 -0400
Subject: [PATCH 4026/8469] Give comma-separated values a little room to
 breathe (use common style convention).

---
 pkg_resources.py | 230 +++++++++++++++++++++++------------------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2d656f1a2b..af11f58302 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -219,7 +219,7 @@ def register_loader_type(loader_type, provider_factory):
 
 def get_provider(moduleOrReq):
     """Return an IResourceProvider for the named module or requirement"""
-    if isinstance(moduleOrReq,Requirement):
+    if isinstance(moduleOrReq, Requirement):
         return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
     try:
         module = sys.modules[moduleOrReq]
@@ -247,7 +247,7 @@ def _macosx_vers(_cache=[]):
     return _cache[0]
 
 def _macosx_arch(machine):
-    return {'PowerPC':'ppc', 'Power_Macintosh':'ppc'}.get(machine,machine)
+    return {'PowerPC':'ppc', 'Power_Macintosh':'ppc'}.get(machine, machine)
 
 def get_build_platform():
     """Return this platform's string for platform-specific distributions
@@ -279,7 +279,7 @@ def get_build_platform():
 get_platform = get_build_platform   # XXX backward compat
 
 
-def compatible_platforms(provided,required):
+def compatible_platforms(provided, required):
     """Can code for the `provided` platform run on the `required` platform?
 
     Returns true if either platform is ``None``, or the platforms are equal.
@@ -340,9 +340,9 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist,basestring): dist = Requirement.parse(dist)
-    if isinstance(dist,Requirement): dist = get_provider(dist)
-    if not isinstance(dist,Distribution):
+    if isinstance(dist, basestring): dist = Requirement.parse(dist)
+    if isinstance(dist, Requirement): dist = get_provider(dist)
+    if not isinstance(dist, Distribution):
         raise TypeError("Expected string, Requirement, or Distribution", dist)
     return dist
 
@@ -484,7 +484,7 @@ def add_entry(self, entry):
         for dist in find_distributions(entry, True):
             self.add(dist, entry, False)
 
-    def __contains__(self,dist):
+    def __contains__(self, dist):
         """True if `dist` is the active distribution for its project"""
         return self.by_key.get(dist.key) == dist
 
@@ -500,7 +500,7 @@ def find(self, req):
         """
         dist = self.by_key.get(req.key)
         if dist is not None and dist not in req:
-            raise VersionConflict(dist,req)     # XXX add more info
+            raise VersionConflict(dist, req)     # XXX add more info
         else:
             return dist
 
@@ -629,7 +629,7 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                raise VersionConflict(dist,req) # XXX put more info here
+                raise VersionConflict(dist, req) # XXX put more info here
             requirements.extend(dist.requires(req.extras)[::-1])
             processed[req] = True
 
@@ -790,7 +790,7 @@ def can_add(self, dist):
         """
         return (self.python is None or dist.py_version is None
             or dist.py_version==self.python) \
-            and compatible_platforms(dist.platform,self.platform)
+            and compatible_platforms(dist.platform, self.platform)
 
     def remove(self, dist):
         """Remove `dist` from the environment"""
@@ -811,7 +811,7 @@ def scan(self, search_path=None):
             for dist in find_distributions(item):
                 self.add(dist)
 
-    def __getitem__(self,project_name):
+    def __getitem__(self, project_name):
         """Return a newest-to-oldest list of distributions for `project_name`
         """
         try:
@@ -827,7 +827,7 @@ def __getitem__(self,project_name):
 
         return self._cache[project_name]
 
-    def add(self,dist):
+    def add(self, dist):
         """Add `dist` if we ``can_add()`` it and it isn't already added"""
         if self.can_add(dist) and dist.has_version():
             dists = self._distmap.setdefault(dist.key,[])
@@ -876,9 +876,9 @@ def __iter__(self):
 
     def __iadd__(self, other):
         """In-place addition of a distribution or environment"""
-        if isinstance(other,Distribution):
+        if isinstance(other, Distribution):
             self.add(other)
-        elif isinstance(other,Environment):
+        elif isinstance(other, Environment):
             for project in other:
                 for dist in other[project]:
                     self.add(dist)
@@ -1123,7 +1123,7 @@ def get_default_cache():
                 break
         else:
             if subdir:
-                dirname = os.path.join(dirname,subdir)
+                dirname = os.path.join(dirname, subdir)
             return os.path.join(dirname, 'Python-Eggs')
     else:
         raise RuntimeError(
@@ -1207,12 +1207,12 @@ def normalize_exception(exc):
     @classmethod
     def and_test(cls, nodelist):
         # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        return functools.reduce(operator.and_, [cls.interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+        return functools.reduce(operator.and_, [cls.interpret(nodelist[i]) for i in range(1, len(nodelist),2)])
 
     @classmethod
     def test(cls, nodelist):
         # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        return functools.reduce(operator.or_, [cls.interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
+        return functools.reduce(operator.or_, [cls.interpret(nodelist[i]) for i in range(1, len(nodelist),2)])
 
     @classmethod
     def atom(cls, nodelist):
@@ -1352,43 +1352,43 @@ def has_resource(self, resource_name):
         return self._has(self._fn(self.module_path, resource_name))
 
     def has_metadata(self, name):
-        return self.egg_info and self._has(self._fn(self.egg_info,name))
+        return self.egg_info and self._has(self._fn(self.egg_info, name))
 
     if sys.version_info <= (3,):
         def get_metadata(self, name):
             if not self.egg_info:
                 return ""
-            return self._get(self._fn(self.egg_info,name))
+            return self._get(self._fn(self.egg_info, name))
     else:
         def get_metadata(self, name):
             if not self.egg_info:
                 return ""
-            return self._get(self._fn(self.egg_info,name)).decode("utf-8")
+            return self._get(self._fn(self.egg_info, name)).decode("utf-8")
 
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
 
-    def resource_isdir(self,resource_name):
+    def resource_isdir(self, resource_name):
         return self._isdir(self._fn(self.module_path, resource_name))
 
-    def metadata_isdir(self,name):
-        return self.egg_info and self._isdir(self._fn(self.egg_info,name))
+    def metadata_isdir(self, name):
+        return self.egg_info and self._isdir(self._fn(self.egg_info, name))
 
-    def resource_listdir(self,resource_name):
-        return self._listdir(self._fn(self.module_path,resource_name))
+    def resource_listdir(self, resource_name):
+        return self._listdir(self._fn(self.module_path, resource_name))
 
-    def metadata_listdir(self,name):
+    def metadata_listdir(self, name):
         if self.egg_info:
-            return self._listdir(self._fn(self.egg_info,name))
+            return self._listdir(self._fn(self.egg_info, name))
         return []
 
-    def run_script(self,script_name,namespace):
+    def run_script(self, script_name, namespace):
         script = 'scripts/'+script_name
         if not self.has_metadata(script):
             raise ResolutionError("No script named %r" % script_name)
-        script_text = self.get_metadata(script).replace('\r\n','\n')
-        script_text = script_text.replace('\r','\n')
-        script_filename = self._fn(self.egg_info,script)
+        script_text = self.get_metadata(script).replace('\r\n', '\n')
+        script_text = script_text.replace('\r', '\n')
+        script_filename = self._fn(self.egg_info, script)
         namespace['__file__'] = script_filename
         if os.path.exists(script_filename):
             execfile(script_filename, namespace, namespace)
@@ -1397,7 +1397,7 @@ def run_script(self,script_name,namespace):
             cache[script_filename] = (
                 len(script_text), 0, script_text.split('\n'), script_filename
             )
-            script_code = compile(script_text,script_filename,'exec')
+            script_code = compile(script_text, script_filename,'exec')
             exec(script_code, namespace, namespace)
 
     def _has(self, path):
@@ -1433,8 +1433,8 @@ def _get(self, path):
 class EggProvider(NullProvider):
     """Provider based on a virtual filesystem"""
 
-    def __init__(self,module):
-        NullProvider.__init__(self,module)
+    def __init__(self, module):
+        NullProvider.__init__(self, module)
         self._setup_prefix()
 
     def _setup_prefix(self):
@@ -1457,10 +1457,10 @@ class DefaultProvider(EggProvider):
     def _has(self, path):
         return os.path.exists(path)
 
-    def _isdir(self,path):
+    def _isdir(self, path):
         return os.path.isdir(path)
 
-    def _listdir(self,path):
+    def _listdir(self, path):
         return os.listdir(path)
 
     def get_resource_stream(self, manager, resource_name):
@@ -1482,9 +1482,9 @@ def _get(self, path):
 class EmptyProvider(NullProvider):
     """Provider that returns nothing for all requests"""
 
-    _isdir = _has = lambda self,path: False
-    _get = lambda self,path: ''
-    _listdir = lambda self,path: []
+    _isdir = _has = lambda self, path: False
+    _get = lambda self, path: ''
+    _listdir = lambda self, path: []
     module_path = None
 
     def __init__(self):
@@ -1532,7 +1532,7 @@ class ZipProvider(EggProvider):
     eagers = None
 
     def __init__(self, module):
-        EggProvider.__init__(self,module)
+        EggProvider.__init__(self, module)
         self.zipinfo = build_zipmanifest(self.loader.archive)
         self.zip_pre = self.loader.archive+os.sep
 
@@ -1542,16 +1542,16 @@ def _zipinfo_name(self, fspath):
         if fspath.startswith(self.zip_pre):
             return fspath[len(self.zip_pre):]
         raise AssertionError(
-            "%s is not a subpath of %s" % (fspath,self.zip_pre)
+            "%s is not a subpath of %s" % (fspath, self.zip_pre)
         )
 
-    def _parts(self,zip_path):
+    def _parts(self, zip_path):
         # Convert a zipfile subpath into an egg-relative path part list
         fspath = self.zip_pre+zip_path  # pseudo-fs path
         if fspath.startswith(self.egg_root+os.sep):
             return fspath[len(self.egg_root)+1:].split(os.sep)
         raise AssertionError(
-            "%s is not a subpath of %s" % (fspath,self.egg_root)
+            "%s is not a subpath of %s" % (fspath, self.egg_root)
         )
 
     def get_resource_filename(self, manager, resource_name):
@@ -1601,7 +1601,7 @@ def _extract_resource(self, manager, zip_path):
             outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))
             os.write(outf, self.loader.get_data(zip_path))
             os.close(outf)
-            utime(tmpnam, (timestamp,timestamp))
+            utime(tmpnam, (timestamp, timestamp))
             manager.postprocess(tmpnam, real_path)
 
             try:
@@ -1671,17 +1671,17 @@ def _has(self, fspath):
         zip_path = self._zipinfo_name(fspath)
         return zip_path in self.zipinfo or zip_path in self._index()
 
-    def _isdir(self,fspath):
+    def _isdir(self, fspath):
         return self._zipinfo_name(fspath) in self._index()
 
-    def _listdir(self,fspath):
+    def _listdir(self, fspath):
         return list(self._index().get(self._zipinfo_name(fspath), ()))
 
-    def _eager_to_zip(self,resource_name):
-        return self._zipinfo_name(self._fn(self.egg_root,resource_name))
+    def _eager_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.egg_root, resource_name))
 
-    def _resource_to_zip(self,resource_name):
-        return self._zipinfo_name(self._fn(self.module_path,resource_name))
+    def _resource_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.module_path, resource_name))
 
 register_loader_type(zipimport.zipimporter, ZipProvider)
 
@@ -1698,13 +1698,13 @@ class FileMetadata(EmptyProvider):
     the provided location.
     """
 
-    def __init__(self,path):
+    def __init__(self, path):
         self.path = path
 
-    def has_metadata(self,name):
+    def has_metadata(self, name):
         return name=='PKG-INFO'
 
-    def get_metadata(self,name):
+    def get_metadata(self, name):
         if name=='PKG-INFO':
             f = open(self.path,'rU')
             metadata = f.read()
@@ -1712,7 +1712,7 @@ def get_metadata(self,name):
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")
 
-    def get_metadata_lines(self,name):
+    def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
 
 
@@ -1727,7 +1727,7 @@ class PathMetadata(DefaultProvider):
         base_dir = os.path.dirname(egg_info)
         metadata = PathMetadata(base_dir, egg_info)
         dist_name = os.path.splitext(os.path.basename(egg_info))[0]
-        dist = Distribution(basedir,project_name=dist_name,metadata=metadata)
+        dist = Distribution(basedir, project_name=dist_name, metadata=metadata)
 
         # Unpacked egg directories:
 
@@ -1797,7 +1797,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
 
 def find_nothing(importer, path_item, only=False):
     return ()
-register_finder(object,find_nothing)
+register_finder(object, find_nothing)
 
 def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
@@ -1823,7 +1823,7 @@ def find_on_path(importer, path_item, only=False):
                     else:
                         metadata = FileMetadata(fullpath)
                     yield Distribution.from_location(
-                        path_item,entry,metadata,precedence=DEVELOP_DIST
+                        path_item, entry, metadata, precedence=DEVELOP_DIST
                     )
                 elif not only and lower.endswith('.egg'):
                     for dist in find_distributions(os.path.join(path_item, entry)):
@@ -1836,10 +1836,10 @@ def find_on_path(importer, path_item, only=False):
                         entry_file.close()
                     for line in entry_lines:
                         if not line.strip(): continue
-                        for item in find_distributions(os.path.join(path_item,line.rstrip())):
+                        for item in find_distributions(os.path.join(path_item, line.rstrip())):
                             yield item
                         break
-register_finder(pkgutil.ImpImporter,find_on_path)
+register_finder(pkgutil.ImpImporter, find_on_path)
 
 if importlib_bootstrap is not None:
     register_finder(importlib_bootstrap.FileFinder, find_on_path)
@@ -1854,7 +1854,7 @@ def register_namespace_handler(importer_type, namespace_handler):
     `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
     handler), and `namespace_handler` is a callable like this::
 
-        def namespace_handler(importer,path_entry,moduleName,module):
+        def namespace_handler(importer, path_entry, moduleName, module):
             # return a path_entry to use for child packages
 
     Namespace handlers are only called if the importer object has already
@@ -1930,7 +1930,7 @@ def fixup_namespace_packages(path_item, parent=None):
     try:
         for package in _namespace_packages.get(parent,()):
             subpath = _handle_ns(package, path_item)
-            if subpath: fixup_namespace_packages(subpath,package)
+            if subpath: fixup_namespace_packages(subpath, package)
     finally:
         imp.release_lock()
 
@@ -1946,8 +1946,8 @@ def file_ns_handler(importer, path_item, packageName, module):
         # Only return the path if it's not already there
         return subpath
 
-register_namespace_handler(pkgutil.ImpImporter,file_ns_handler)
-register_namespace_handler(zipimport.zipimporter,file_ns_handler)
+register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+register_namespace_handler(zipimport.zipimporter, file_ns_handler)
 
 if importlib_bootstrap is not None:
     register_namespace_handler(importlib_bootstrap.FileFinder, file_ns_handler)
@@ -1956,14 +1956,14 @@ def file_ns_handler(importer, path_item, packageName, module):
 def null_ns_handler(importer, path_item, packageName, module):
     return None
 
-register_namespace_handler(object,null_ns_handler)
+register_namespace_handler(object, null_ns_handler)
 
 
 def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
     return os.path.normcase(os.path.realpath(filename))
 
-def _normalize_cached(filename,_cache={}):
+def _normalize_cached(filename, _cache={}):
     try:
         return _cache[filename]
     except KeyError:
@@ -1980,7 +1980,7 @@ def _set_parent_ns(packageName):
 
 def yield_lines(strs):
     """Yield non-empty/non-comment lines of a ``basestring`` or sequence"""
-    if isinstance(strs,basestring):
+    if isinstance(strs, basestring):
         for s in strs.splitlines():
             s = s.strip()
             if s and not s.startswith('#'):     # skip blank lines/comments
@@ -2009,7 +2009,7 @@ def yield_lines(strs):
 
 def _parse_version_parts(s):
     for part in component_re.split(s):
-        part = replace(part,part)
+        part = replace(part, part)
         if not part or part=='.':
             continue
         if part[:1] in '0123456789':
@@ -2085,19 +2085,19 @@ def __repr__(self):
 
     def load(self, require=True, env=None, installer=None):
         if require: self.require(env, installer)
-        entry = __import__(self.module_name, globals(),globals(), ['__name__'])
+        entry = __import__(self.module_name, globals(), globals(), ['__name__'])
         for attr in self.attrs:
             try:
-                entry = getattr(entry,attr)
+                entry = getattr(entry, attr)
             except AttributeError:
-                raise ImportError("%r has no %r attribute" % (entry,attr))
+                raise ImportError("%r has no %r attribute" % (entry, attr))
         return entry
 
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
             raise UnknownExtra("Can't require() without a distribution", self)
         list(map(working_set.add,
-            working_set.resolve(self.dist.requires(self.extras),env,installer)))
+            working_set.resolve(self.dist.requires(self.extras), env, installer)))
 
     @classmethod
     def parse(cls, src, dist=None):
@@ -2105,21 +2105,21 @@ def parse(cls, src, dist=None):
 
         Entry point syntax follows the form::
 
-            name = some.module:some.attr [extra1,extra2]
+            name = some.module:some.attr [extra1, extra2]
 
         The entry name and module name are required, but the ``:attrs`` and
         ``[extras]`` parts are optional
         """
         try:
             attrs = extras = ()
-            name,value = src.split('=',1)
+            name, value = src.split('=',1)
             if '[' in value:
-                value,extras = value.split('[',1)
+                value, extras = value.split('[',1)
                 req = Requirement.parse("x["+extras)
                 if req.specs: raise ValueError
                 extras = req.extras
             if ':' in value:
-                value,attrs = value.split(':',1)
+                value, attrs = value.split(':',1)
                 if not MODULE(attrs.rstrip()):
                     raise ValueError
                 attrs = attrs.rstrip().split('.')
@@ -2147,7 +2147,7 @@ def parse_group(cls, group, lines, dist=None):
     @classmethod
     def parse_map(cls, data, dist=None):
         """Parse a map of entry point groups"""
-        if isinstance(data,dict):
+        if isinstance(data, dict):
             data = data.items()
         else:
             data = split_sections(data)
@@ -2190,7 +2190,7 @@ def __init__(self, location=None, metadata=None, project_name=None,
         self._provider = metadata or empty_provider
 
     @classmethod
-    def from_location(cls,location,basename,metadata=None,**kw):
+    def from_location(cls, location, basename, metadata=None,**kw):
         project_name, version, py_version, platform = [None]*4
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
@@ -2274,7 +2274,7 @@ def _dep_map(self):
         except AttributeError:
             dm = self.__dep_map = {None: []}
             for name in 'requires.txt', 'depends.txt':
-                for extra,reqs in split_sections(self._get_metadata(name)):
+                for extra, reqs in split_sections(self._get_metadata(name)):
                     if extra:
                         if ':' in extra:
                             extra, marker = extra.split(':',1)
@@ -2286,7 +2286,7 @@ def _dep_map(self):
                     dm.setdefault(extra,[]).extend(parse_requirements(reqs))
             return dm
 
-    def requires(self,extras=()):
+    def requires(self, extras=()):
         """List of Requirements needed for this distro if `extras` are used"""
         dm = self._dep_map
         deps = []
@@ -2300,12 +2300,12 @@ def requires(self,extras=()):
                 )
         return deps
 
-    def _get_metadata(self,name):
+    def _get_metadata(self, name):
         if self.has_metadata(name):
             for line in self.get_metadata_lines(name):
                 yield line
 
-    def activate(self,path=None):
+    def activate(self, path=None):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None: path = sys.path
         self.insert_on(path)
@@ -2328,7 +2328,7 @@ def egg_name(self):
 
     def __repr__(self):
         if self.location:
-            return "%s (%s)" % (self,self.location)
+            return "%s (%s)" % (self, self.location)
         else:
             return str(self)
 
@@ -2336,16 +2336,16 @@ def __str__(self):
         try: version = getattr(self,'version',None)
         except ValueError: version = None
         version = version or "[unknown version]"
-        return "%s %s" % (self.project_name,version)
+        return "%s %s" % (self.project_name, version)
 
-    def __getattr__(self,attr):
+    def __getattr__(self, attr):
         """Delegate all unrecognized public attributes to .metadata provider"""
         if attr.startswith('_'):
             raise AttributeError(attr)
         return getattr(self._provider, attr)
 
     @classmethod
-    def from_filename(cls,filename,metadata=None, **kw):
+    def from_filename(cls, filename, metadata=None, **kw):
         return cls.from_location(
             _normalize_cached(filename), os.path.basename(filename), metadata,
             **kw
@@ -2357,9 +2357,9 @@ def as_requirement(self):
 
     def load_entry_point(self, group, name):
         """Return the `name` entry point of `group` or raise ImportError"""
-        ep = self.get_entry_info(group,name)
+        ep = self.get_entry_info(group, name)
         if ep is None:
-            raise ImportError("Entry point %r not found" % ((group,name),))
+            raise ImportError("Entry point %r not found" % ((group, name),))
         return ep.load()
 
     def get_entry_map(self, group=None):
@@ -2452,7 +2452,7 @@ def clone(self,**kw):
             'project_name', 'version', 'py_version', 'platform', 'location',
             'precedence'
         ):
-            kw.setdefault(attr, getattr(self,attr,None))
+            kw.setdefault(attr, getattr(self, attr, None))
         kw.setdefault('metadata', self._provider)
         return self.__class__(**kw)
 
@@ -2554,12 +2554,12 @@ def parse_requirements(strs):
     # create a steppable iterator, so we can handle \-continuations
     lines = iter(yield_lines(strs))
 
-    def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
+    def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
 
         items = []
 
-        while not TERMINATOR(line,p):
-            if CONTINUE(line,p):
+        while not TERMINATOR(line, p):
+            if CONTINUE(line, p):
                 try:
                     line = next(lines)
                     p = 0
@@ -2568,22 +2568,22 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
                         "\\ must not appear on the last nonblank line"
                     )
 
-            match = ITEM(line,p)
+            match = ITEM(line, p)
             if not match:
                 raise ValueError("Expected "+item_name+" in",line,"at",line[p:])
 
             items.append(match.group(*groups))
             p = match.end()
 
-            match = COMMA(line,p)
+            match = COMMA(line, p)
             if match:
                 p = match.end() # skip the comma
-            elif not TERMINATOR(line,p):
+            elif not TERMINATOR(line, p):
                 raise ValueError(
                     "Expected ',' or end-of-list in",line,"at",line[p:]
                 )
 
-        match = TERMINATOR(line,p)
+        match = TERMINATOR(line, p)
         if match: p = match.end()   # skip the terminator, if any
         return line, p, items
 
@@ -2595,22 +2595,22 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
         p = match.end()
         extras = []
 
-        match = OBRACKET(line,p)
+        match = OBRACKET(line, p)
         if match:
             p = match.end()
             line, p, extras = scan_list(
                 DISTRO, CBRACKET, line, p, (1,), "'extra' name"
             )
 
-        line, p, specs = scan_list(VERSION,LINE_END,line,p,(1,2),"version spec")
-        specs = [(op,safe_version(val)) for op,val in specs]
+        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),"version spec")
+        specs = [(op, safe_version(val)) for op, val in specs]
         yield Requirement(project_name, specs, extras)
 
 
 def _sort_dists(dists):
-    tmp = [(dist.hashcmp,dist) for dist in dists]
+    tmp = [(dist.hashcmp, dist) for dist in dists]
     tmp.sort()
-    dists[::-1] = [d for hc,d in tmp]
+    dists[::-1] = [d for hc, d in tmp]
 
 
 class Requirement:
@@ -2618,12 +2618,12 @@ def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         self.unsafe_name, project_name = project_name, safe_name(project_name)
         self.project_name, self.key = project_name, project_name.lower()
-        index = [(parse_version(v),state_machine[op],op,v) for op,v in specs]
+        index = [(parse_version(v), state_machine[op], op, v) for op, v in specs]
         index.sort()
-        self.specs = [(op,ver) for parsed,trans,op,ver in index]
-        self.index, self.extras = index, tuple(map(safe_extra,extras))
+        self.specs = [(op, ver) for parsed, trans, op, ver in index]
+        self.index, self.extras = index, tuple(map(safe_extra, extras))
         self.hashCmp = (
-            self.key, tuple([(op,parsed) for parsed,trans,op,ver in index]),
+            self.key, tuple([(op, parsed) for parsed, trans, op, ver in index]),
             frozenset(self.extras)
         )
         self.__hash = hash(self.hashCmp)
@@ -2634,19 +2634,19 @@ def __str__(self):
         if extras: extras = '[%s]' % extras
         return '%s%s%s' % (self.project_name, extras, specs)
 
-    def __eq__(self,other):
-        return isinstance(other,Requirement) and self.hashCmp==other.hashCmp
+    def __eq__(self, other):
+        return isinstance(other, Requirement) and self.hashCmp==other.hashCmp
 
-    def __contains__(self,item):
-        if isinstance(item,Distribution):
+    def __contains__(self, item):
+        if isinstance(item, Distribution):
             if item.key != self.key: return False
             if self.index: item = item.parsed_version  # only get if we need it
-        elif isinstance(item,basestring):
+        elif isinstance(item, basestring):
             item = parse_version(item)
         last = None
         compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1
-        for parsed,trans,op,ver in self.index:
-            action = trans[compare(item,parsed)] # Indexing: 0, 1, -1
+        for parsed, trans, op, ver in self.index:
+            action = trans[compare(item, parsed)] # Indexing: 0, 1, -1
             if action=='F':
                 return False
             elif action=='T':
@@ -2684,8 +2684,8 @@ def parse(s):
 
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
-    if not isinstance(cls,type):
-        class cls(cls,object): pass
+    if not isinstance(cls, type):
+        class cls(cls, object): pass
         return cls.__mro__[1:]
     return cls.__mro__
 
@@ -2703,7 +2703,7 @@ def ensure_directory(path):
         os.makedirs(dirname)
 
 def split_sections(s):
-    """Split a string or iterable thereof into (section,content) pairs
+    """Split a string or iterable thereof into (section, content) pairs
 
     Each ``section`` is a stripped version of the section header ("[section]")
     and each ``content`` is a list of stripped lines excluding blank lines and
@@ -2759,4 +2759,4 @@ def _initialize(g):
 # calling ``require()``) will get activated as well.
 add_activation_listener(lambda dist: dist.activate())
 working_set.entries=[]
-list(map(working_set.add_entry,sys.path)) # match order
+list(map(working_set.add_entry, sys.path)) # match order

From a2bc4f69c7f6c2cec29123669ca6ae517277b67a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 09:31:35 -0400
Subject: [PATCH 4027/8469] Restore install._install with a comment to capture
 its requirement on earlier NumPy versions. Fixes #199.

--HG--
extra : amend_source : a76d060c98e0048506e5aadddd675151db9d273c
---
 CHANGES.txt                   | 7 +++++++
 setuptools/command/install.py | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0f531db93a..a1d251943d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+3.5.1
+-----
+
+* Issue #199: Restored ``install._install`` for compatibility with earlier
+  NumPy versions.
+
 ---
 3.5
 ---
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 3425dbf713..1f489734d4 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -6,6 +6,10 @@
 import distutils.command.install as orig
 from distutils.errors import DistutilsArgError
 
+# Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
+#  now. See https://bitbucket.org/pypa/setuptools/issue/199/
+_install = orig.install
+
 class install(orig.install):
     """Use easy_install to install the package, w/dependencies"""
 

From 99c16a3378bf712964afb594c14e6a7c40eb8325 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 09:43:06 -0400
Subject: [PATCH 4028/8469] Bumped to 3.5.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e5e6e56fee..23ea9a2b7e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.6"
+DEFAULT_VERSION = "3.5.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index f1d9320859..bf5afe7f3f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.6'
+__version__ = '3.5.1'

From d61742cc32cb053b2b5befc8cec200fa9a079b38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 09:43:08 -0400
Subject: [PATCH 4029/8469] Added tag 3.5.1 for changeset 254d8c625f46

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f6d203994f..0120d6b398 100644
--- a/.hgtags
+++ b/.hgtags
@@ -132,3 +132,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 06a56e063c327b0606f9e9690764279d424646b2 3.4.3
 0917d575d26091a184796624743825914994bf95 3.4.4
 98f29d521c3a57bae0090d2bc5597d93db95b108 3.5
+254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1

From 09719162082439735da57a160fc9ea7fbe0f6935 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 09:43:37 -0400
Subject: [PATCH 4030/8469] Bumped to 3.5.2 in preparation for next release.

---
 ez_setup.py                      | 2 +-
 setuptools.egg-info/requires.txt | 8 ++++----
 setuptools/version.py            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 23ea9a2b7e..6c58f105aa 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.5.1"
+DEFAULT_VERSION = "3.5.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e5db30adfb..a49a923ef5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.2
-
 [certs]
-certifi==1.0.1
\ No newline at end of file
+certifi==1.0.1
+
+[ssl:sys_platform=='win32']
+wincertstore==0.2
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index bf5afe7f3f..0bc4055f60 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.5.1'
+__version__ = '3.5.2'

From 3d8a7a975f07b8497b2b8a8e4af98fe8aadfb053 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 May 2014 10:03:14 -0400
Subject: [PATCH 4031/8469] Sort _distmap entries on insert. Obviates need for
 a cache.

---
 pkg_resources.py | 52 +++---------------------------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0d8987c8f6..39805ad670 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -29,6 +29,7 @@
 import symbol
 import operator
 import platform
+import bisect
 from pkgutil import get_importer
 
 try:
@@ -776,7 +777,6 @@ def __init__(self, search_path=None, platform=get_supported_platform(), python=P
         running platform or Python version.
         """
         self._distmap = {}
-        self._cache = {}
         self.platform = platform
         self.python = python
         self.scan(search_path)
@@ -819,46 +819,8 @@ def __getitem__(self, project_name):
         lowercase as their key.
 
         """
-        # Result caching here serves two purposes:
-        #  1. Speed up the project_name --> distribution list lookup.
-        #  2. 'First access' flag indicating the distribution list requires
-        #     sorting before it can be returned to the user.
-        #TODO: This caching smells like premature optimization. It could be
-        # that the distribution list lookup speed is not really affected by
-        # this, in which case the whole cache could be removed and replaced
-        # with a single 'dist_list_sorted' flag. This seems strongly indicated
-        # by the fact that this function does not really cache the distribution
-        # list under the given project name but only under its canonical
-        # distribution key variant. That means that repeated access using a non
-        # canonical project name does not get any speedup at all.
-        try:
-            return self._cache[project_name]
-        except KeyError:
-            pass
-
-        # We expect all distribution keys to contain lower-case characters
-        # only.
-        #TODO: See if this expectation can be implemented better, e.g. by using
-        # some sort of a name --> key conversion function on the Distribution
-        # class or something similar.
-        #TODO: This requires all classes derived from Distribution to use
-        # lower-case only keys even if they do not calculate them from the
-        # project's name. It might be better to make this function simpler by
-        # passing it the the exact distribution key as a parameter and have the
-        # caller convert a `project_name` to its corresponding distribution key
-        # as needed.
         distribution_key = project_name.lower()
-        try:
-            dists = self._distmap[distribution_key]
-        except KeyError:
-            return []
-
-        # Sort the project's distribution list lazily on first access.
-        if distribution_key not in self._cache:
-            self._cache[distribution_key] = dists
-            _sort_dists(dists)
-
-        return dists
+        return self._distmap.get(distribution_key, [])
 
     def add(self, dist):
         """Add `dist` if we ``can_add()`` it and it has not already been added
@@ -866,15 +828,7 @@ def add(self, dist):
         if self.can_add(dist) and dist.has_version():
             dists = self._distmap.setdefault(dist.key, [])
             if dist not in dists:
-                dists.append(dist)
-                cached_dists = self._cache.get(dist.key)
-                if cached_dists:
-                    # The distribution list has been cached on first access,
-                    # therefore we know it has already been sorted lazily and
-                    # we are expected to keep it in sorted order.
-                    _sort_dists(dists)
-                    assert cached_dists is dists,  \
-                        "Distribution list cache corrupt."
+                bisect.insort(dists, dist)
 
     def best_match(self, req, working_set, installer=None):
         """Find distribution best matching `req` and usable on `working_set`

From 0852c4534733db6427dc7f4d6b20798c8e3695e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 02:46:19 -0400
Subject: [PATCH 4032/8469] Correct sort order by using list.sort with support
 for 'key' and 'reverse'. This method is less efficient, but allows the tests
 to pass.

---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 39805ad670..d9cff7c871 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -29,7 +29,6 @@
 import symbol
 import operator
 import platform
-import bisect
 from pkgutil import get_importer
 
 try:
@@ -828,7 +827,8 @@ def add(self, dist):
         if self.can_add(dist) and dist.has_version():
             dists = self._distmap.setdefault(dist.key, [])
             if dist not in dists:
-                bisect.insort(dists, dist)
+                dists.append(dist)
+                dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
 
     def best_match(self, req, working_set, installer=None):
         """Find distribution best matching `req` and usable on `working_set`

From c35659d044bb7cdb8f0a5d14cf0947ae0f722fe1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 02:46:50 -0400
Subject: [PATCH 4033/8469] Remove _sort_dists (unused)

---
 pkg_resources.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index d9cff7c871..cc01075401 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2601,12 +2601,6 @@ def scan_list(ITEM,TERMINATOR,line,p,groups,item_name):
         yield Requirement(project_name, specs, extras)
 
 
-def _sort_dists(dists):
-    tmp = [(dist.hashcmp,dist) for dist in dists]
-    tmp.sort()
-    dists[::-1] = [d for hc,d in tmp]
-
-
 class Requirement:
     def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""

From 5a07c8be339c93f1d1d2733498bc1133fb1123db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 02:57:43 -0400
Subject: [PATCH 4034/8469] Rewrite hashcmp using modern syntax

---
 pkg_resources.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 54285ca8a4..dc673e640f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2200,16 +2200,17 @@ def from_location(cls, location, basename, metadata=None,**kw):
             py_version=py_version, platform=platform, **kw
         )
 
-    hashcmp = property(
-        lambda self: (
-            getattr(self,'parsed_version',()),
+    @property
+    def hashcmp(self):
+        return (
+            getattr(self, 'parsed_version', ()),
             self.precedence,
             self.key,
             _remove_md5_fragment(self.location),
             self.py_version,
-            self.platform
+            self.platform,
         )
-    )
+
     def __hash__(self): return hash(self.hashcmp)
     def __lt__(self, other):
         return self.hashcmp < other.hashcmp

From 4aca4845a3e536d0138eaebfe8b7b7b3817ca233 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:00:54 -0400
Subject: [PATCH 4035/8469] Reformat for consistency

---
 pkg_resources.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index dc673e640f..8788eca1db 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2211,20 +2211,27 @@ def hashcmp(self):
             self.platform,
         )
 
-    def __hash__(self): return hash(self.hashcmp)
+    def __hash__(self):
+        return hash(self.hashcmp)
+
     def __lt__(self, other):
         return self.hashcmp < other.hashcmp
+
     def __le__(self, other):
         return self.hashcmp <= other.hashcmp
+
     def __gt__(self, other):
         return self.hashcmp > other.hashcmp
+
     def __ge__(self, other):
         return self.hashcmp >= other.hashcmp
+
     def __eq__(self, other):
         if not isinstance(other, self.__class__):
             # It's not a Distribution, so they are not equal
             return False
         return self.hashcmp == other.hashcmp
+
     def __ne__(self, other):
         return not self == other
 

From 322db6ab6e096653842edb0980e582805b70e8c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:12:33 -0400
Subject: [PATCH 4036/8469] Reindent long line

---
 pkg_resources.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 8788eca1db..df9bac5735 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -758,7 +758,8 @@ def __setstate__(self, e_k_b_c):
 class Environment(object):
     """Searchable snapshot of distributions on a search path"""
 
-    def __init__(self, search_path=None, platform=get_supported_platform(), python=PY_MAJOR):
+    def __init__(self, search_path=None, platform=get_supported_platform(),
+            python=PY_MAJOR):
         """Snapshot distributions available on a search path
 
         Any distributions found on `search_path` are added to the environment.

From e7818e76dab11e1ae0cda7cc6f29b163b6a240c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:13:04 -0400
Subject: [PATCH 4037/8469] Use simpler syntax to get the same info

---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index df9bac5735..105c039351 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1164,8 +1164,8 @@ class MarkerEvaluation(object):
     values = {
         'os_name': lambda: os.name,
         'sys_platform': lambda: sys.platform,
-        'python_full_version': lambda: sys.version.split()[0],
-        'python_version': lambda:'%s.%s' % (sys.version_info[0], sys.version_info[1]),
+        'python_full_version': platform.python_version,
+        'python_version': lambda: platform.python_version()[:3],
         'platform_version': platform.version,
         'platform_machine': platform.machine,
         'python_implementation': platform.python_implementation,

From 5896c4ef68be93c1a9990b72d22b5a7b2d882f1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:20:42 -0400
Subject: [PATCH 4038/8469] Reindent long lines in marker impl

---
 pkg_resources.py | 47 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 105c039351..29fc395966 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1186,9 +1186,11 @@ def is_invalid_marker(cls, text):
     @staticmethod
     def normalize_exception(exc):
         """
-        Given a SyntaxError from a marker evaluation, normalize the error message:
+        Given a SyntaxError from a marker evaluation, normalize the error
+        message:
          - Remove indications of filename and line number.
-         - Replace platform-specific error messages with standard error messages.
+         - Replace platform-specific error messages with standard error
+           messages.
         """
         subs = {
             'unexpected EOF while parsing': 'invalid syntax',
@@ -1202,12 +1204,20 @@ def normalize_exception(exc):
     @classmethod
     def and_test(cls, nodelist):
         # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        return functools.reduce(operator.and_, [cls.interpret(nodelist[i]) for i in range(1, len(nodelist),2)])
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.and_, items)
 
     @classmethod
     def test(cls, nodelist):
         # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        return functools.reduce(operator.or_, [cls.interpret(nodelist[i]) for i in range(1, len(nodelist),2)])
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.or_, items)
 
     @classmethod
     def atom(cls, nodelist):
@@ -1216,12 +1226,14 @@ def atom(cls, nodelist):
             if nodelist[2][0] == token.RPAR:
                 raise SyntaxError("Empty parentheses")
             return cls.interpret(nodelist[2])
-        raise SyntaxError("Language feature not supported in environment markers")
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
 
     @classmethod
     def comparison(cls, nodelist):
-        if len(nodelist)>4:
-            raise SyntaxError("Chained comparison not allowed in environment markers")
+        if len(nodelist) > 4:
+            msg = "Chained comparison not allowed in environment markers"
+            raise SyntaxError(msg)
         comp = nodelist[2][1]
         cop = comp[1]
         if comp[0] == token.NAME:
@@ -1233,7 +1245,8 @@ def comparison(cls, nodelist):
         try:
             cop = cls.get_op(cop)
         except KeyError:
-            raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
+            msg = repr(cop) + " operator not allowed in environment markers"
+            raise SyntaxError(msg)
         return cop(cls.evaluate(nodelist[1]), cls.evaluate(nodelist[3]))
 
     @classmethod
@@ -1259,7 +1272,8 @@ def evaluate_marker(cls, text, extra=None):
         Return a boolean indicating the marker result in this environment.
         Raise SyntaxError if marker is invalid.
 
-        This implementation uses the 'parser' module, which is not implemented on
+        This implementation uses the 'parser' module, which is not implemented
+        on
         Jython and has been superseded by the 'ast' module in Python 2.6 and
         later.
         """
@@ -1313,12 +1327,21 @@ def evaluate(cls, nodelist):
             return op()
         if kind==token.STRING:
             s = nodelist[1]
-            if s[:1] not in "'\"" or s.startswith('"""') or s.startswith("'''") \
-                    or '\\' in s:
+            if not cls._safe_string(s):
                 raise SyntaxError(
                     "Only plain strings allowed in environment markers")
             return s[1:-1]
-        raise SyntaxError("Language feature not supported in environment markers")
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
+
+    @staticmethod
+    def _safe_string(cand):
+        return (
+            cand[:1] in "'\"" and
+            not cand.startswith('"""') and
+            not cand.startswith("'''") and
+            '\\' not in cand
+        )
 
 invalid_marker = MarkerEvaluation.is_invalid_marker
 evaluate_marker = MarkerEvaluation.evaluate_marker

From a75766f574957e58e732901426b9aa60f2b9ac61 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:32:07 -0400
Subject: [PATCH 4039/8469] Reindent more long lines. Other minor syntax
 modernization.

---
 pkg_resources.py | 60 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 29fc395966..8aa3d339ee 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1844,7 +1844,8 @@ def find_on_path(importer, path_item, only=False):
                         path_item, entry, metadata, precedence=DEVELOP_DIST
                     )
                 elif not only and lower.endswith('.egg'):
-                    for dist in find_distributions(os.path.join(path_item, entry)):
+                    dists = find_distributions(os.path.join(path_item, entry))
+                    for dist in dists:
                         yield dist
                 elif not only and lower.endswith('.egg-link'):
                     entry_file = open(os.path.join(path_item, entry))
@@ -1853,8 +1854,11 @@ def find_on_path(importer, path_item, only=False):
                     finally:
                         entry_file.close()
                     for line in entry_lines:
-                        if not line.strip(): continue
-                        for item in find_distributions(os.path.join(path_item, line.rstrip())):
+                        if not line.strip():
+                            continue
+                        path = os.path.join(path_item, line.rstrip())
+                        dists = find_distributions(path)
+                        for item in dists:
                             yield item
                         break
 register_finder(pkgutil.ImpImporter, find_on_path)
@@ -2103,7 +2107,8 @@ def __repr__(self):
 
     def load(self, require=True, env=None, installer=None):
         if require: self.require(env, installer)
-        entry = __import__(self.module_name, globals(), globals(), ['__name__'])
+        entry = __import__(self.module_name, globals(), globals(),
+            ['__name__'])
         for attr in self.attrs:
             try:
                 entry = getattr(entry, attr)
@@ -2114,8 +2119,9 @@ def load(self, require=True, env=None, installer=None):
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
             raise UnknownExtra("Can't require() without a distribution", self)
-        list(map(working_set.add,
-            working_set.resolve(self.dist.requires(self.extras), env, installer)))
+        reqs = self.dist.requires(self.extras)
+        items = working_set.resolve(reqs, env, installer)
+        list(map(working_set.add, items))
 
     @classmethod
     def parse(cls, src, dist=None):
@@ -2289,9 +2295,8 @@ def version(self):
                     self._version = safe_version(line.split(':',1)[1].strip())
                     return self._version
             else:
-                raise ValueError(
-                    "Missing 'Version:' header and/or %s file" % self.PKG_INFO, self
-                )
+                tmpl = "Missing 'Version:' header and/or %s file"
+                raise ValueError(tmpl % self.PKG_INFO, self)
 
     @property
     def _dep_map(self):
@@ -2499,7 +2504,8 @@ def _parsed_pkg_info(self):
             return self._pkg_info
         except AttributeError:
             from email.parser import Parser
-            self._pkg_info = Parser().parsestr(self.get_metadata(self.PKG_INFO))
+            metadata = self.get_metadata(self.PKG_INFO)
+            self._pkg_info = Parser().parsestr(metadata)
             return self._pkg_info
 
     @property
@@ -2596,18 +2602,19 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
 
             match = ITEM(line, p)
             if not match:
-                raise ValueError("Expected "+item_name+" in",line,"at",line[p:])
+                msg = "Expected " + item_name + " in"
+                raise ValueError(msg, line, "at", line[p:])
 
             items.append(match.group(*groups))
             p = match.end()
 
             match = COMMA(line, p)
             if match:
-                p = match.end() # skip the comma
+                # skip the comma
+                p = match.end()
             elif not TERMINATOR(line, p):
-                raise ValueError(
-                    "Expected ',' or end-of-list in",line,"at",line[p:]
-                )
+                msg = "Expected ',' or end-of-list in"
+                raise ValueError(msg, line, "at", line[p:])
 
         match = TERMINATOR(line, p)
         if match: p = match.end()   # skip the terminator, if any
@@ -2628,7 +2635,8 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
                 DISTRO, CBRACKET, line, p, (1,), "'extra' name"
             )
 
-        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),"version spec")
+        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),
+            "version spec")
         specs = [(op, safe_version(val)) for op, val in specs]
         yield Requirement(project_name, specs, extras)
 
@@ -2638,13 +2646,20 @@ def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         self.unsafe_name, project_name = project_name, safe_name(project_name)
         self.project_name, self.key = project_name, project_name.lower()
-        index = [(parse_version(v), state_machine[op], op, v) for op, v in specs]
+        index = [
+            (parse_version(v), state_machine[op], op, v)
+            for op, v in specs
+        ]
         index.sort()
         self.specs = [(op, ver) for parsed, trans, op, ver in index]
         self.index, self.extras = index, tuple(map(safe_extra, extras))
         self.hashCmp = (
-            self.key, tuple([(op, parsed) for parsed, trans, op, ver in index]),
-            frozenset(self.extras)
+            self.key,
+            tuple([
+                (op, parsed)
+                for parsed, trans, op, ver in index
+            ]),
+            frozenset(self.extras),
         )
         self.__hash = hash(self.hashCmp)
 
@@ -2659,8 +2674,11 @@ def __eq__(self, other):
 
     def __contains__(self, item):
         if isinstance(item, Distribution):
-            if item.key != self.key: return False
-            if self.index: item = item.parsed_version  # only get if we need it
+            if item.key != self.key:
+                return False
+            # only get if we need it
+            if self.index:
+                item = item.parsed_version
         elif isinstance(item, basestring):
             item = parse_version(item)
         last = None

From 951477214f1321a199bf69f9edaea05dec9345d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:32:48 -0400
Subject: [PATCH 4040/8469] Remove unnecessary list comprehension

---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 8aa3d339ee..b4e38ddbf3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2655,10 +2655,10 @@ def __init__(self, project_name, specs, extras):
         self.index, self.extras = index, tuple(map(safe_extra, extras))
         self.hashCmp = (
             self.key,
-            tuple([
+            tuple(
                 (op, parsed)
                 for parsed, trans, op, ver in index
-            ]),
+            ),
             frozenset(self.extras),
         )
         self.__hash = hash(self.hashCmp)

From a92a8c9aaf22e3bcb705924e92962523ccb6cd5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:34:01 -0400
Subject: [PATCH 4041/8469] Now this syntax fits nicely on one line

---
 pkg_resources.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index b4e38ddbf3..972a442595 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2655,10 +2655,7 @@ def __init__(self, project_name, specs, extras):
         self.index, self.extras = index, tuple(map(safe_extra, extras))
         self.hashCmp = (
             self.key,
-            tuple(
-                (op, parsed)
-                for parsed, trans, op, ver in index
-            ),
+            tuple((op, parsed) for parsed, trans, op, ver in index),
             frozenset(self.extras),
         )
         self.__hash = hash(self.hashCmp)

From 7932954f60b7667c54b7bb9463a510bfd01f5aa0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:36:41 -0400
Subject: [PATCH 4042/8469] Fix spacing in __all__

---
 pkg_resources.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 972a442595..6a53eb5223 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -147,7 +147,8 @@ def get_supported_platform():
 __all__ = [
     # Basic resource access and distribution/entry point discovery
     'require', 'run_script', 'get_provider',  'get_distribution',
-    'load_entry_point', 'get_entry_map', 'get_entry_info', 'iter_entry_points',
+    'load_entry_point', 'get_entry_map', 'get_entry_info',
+    'iter_entry_points',
     'resource_string', 'resource_stream', 'resource_filename',
     'resource_listdir', 'resource_exists', 'resource_isdir',
 
@@ -161,8 +162,8 @@ def get_supported_platform():
     'Distribution', 'Requirement', 'EntryPoint',
 
     # Exceptions
-    'ResolutionError','VersionConflict','DistributionNotFound','UnknownExtra',
-    'ExtractionError',
+    'ResolutionError', 'VersionConflict', 'DistributionNotFound',
+    'UnknownExtra', 'ExtractionError',
 
     # Parsing functions and string utilities
     'parse_requirements', 'parse_version', 'safe_name', 'safe_version',

From 574ed793b454314593a5edc64ebf112d3b159d2f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:47:17 -0400
Subject: [PATCH 4043/8469] Avoid trailing comments

---
 pkg_resources.py | 139 +++++++++++++++++++++++++++++++----------------
 1 file changed, 92 insertions(+), 47 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 6a53eb5223..09a5f2ed54 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -141,7 +141,8 @@ def get_supported_platform():
         try:
             plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
         except ValueError:
-            pass    # not Mac OS X
+            # not Mac OS X
+            pass
     return plat
 
 __all__ = [
@@ -248,7 +249,7 @@ def _macosx_vers(_cache=[]):
     return _cache[0]
 
 def _macosx_arch(machine):
-    return {'PowerPC':'ppc', 'Power_Macintosh':'ppc'}.get(machine, machine)
+    return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
 
 def get_build_platform():
     """Return this platform's string for platform-specific distributions
@@ -277,7 +278,8 @@ def get_build_platform():
 
 macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)")
 darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)")
-get_platform = get_build_platform   # XXX backward compat
+# XXX backward compat
+get_platform = get_build_platform
 
 
 def compatible_platforms(provided, required):
@@ -288,7 +290,8 @@ def compatible_platforms(provided, required):
     XXX Needs compatibility checks for Linux and other unixy OSes.
     """
     if provided is None or required is None or provided==required:
-        return True     # easy case
+        # easy case
+        return True
 
     # Mac OS X special cases
     reqMac = macosVersionString.match(required)
@@ -337,7 +340,8 @@ def run_script(dist_spec, script_name):
     ns['__name__'] = name
     require(dist_spec)[0].run_script(script_name, ns)
 
-run_main = run_script   # backward compatibility
+# backward compatibility
+run_main = run_script
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
@@ -501,7 +505,8 @@ def find(self, req):
         """
         dist = self.by_key.get(req.key)
         if dist is not None and dist not in req:
-            raise VersionConflict(dist, req)     # XXX add more info
+            # XXX add more info
+            raise VersionConflict(dist, req)
         else:
             return dist
 
@@ -565,7 +570,8 @@ def add(self, dist, entry=None, insert=True, replace=False):
         keys = self.entry_keys.setdefault(entry,[])
         keys2 = self.entry_keys.setdefault(dist.location,[])
         if not replace and dist.key in self.by_key:
-            return      # ignore hidden distros
+            # ignore hidden distros
+            return
 
         self.by_key[dist.key] = dist
         if dist.key not in keys:
@@ -593,13 +599,17 @@ def resolve(self, requirements, env=None, installer=None,
         it.
         """
 
-        requirements = list(requirements)[::-1]  # set up the stack
-        processed = {}  # set of processed requirements
-        best = {}  # key -> dist
+        # set up the stack
+        requirements = list(requirements)[::-1]
+        # set of processed requirements
+        processed = {}
+        # key -> dist
+        best = {}
         to_activate = []
 
         while requirements:
-            req = requirements.pop(0)   # process dependencies breadth-first
+            # process dependencies breadth-first
+            req = requirements.pop(0)
             if req in processed:
                 # Ignore cyclic or redundant dependencies
                 continue
@@ -634,7 +644,8 @@ def resolve(self, requirements, env=None, installer=None,
             requirements.extend(dist.requires(req.extras)[::-1])
             processed[req] = True
 
-        return to_activate    # return list of distros to activate
+        # return list of distros to activate
+        return to_activate
 
     def find_plugins(self, plugin_env, full_env=None, installer=None,
             fallback=True):
@@ -671,7 +682,8 @@ def find_plugins(self, plugin_env, full_env=None, installer=None,
         """
 
         plugin_projects = list(plugin_env)
-        plugin_projects.sort()  # scan project names in alphabetic order
+        # scan project names in alphabetic order
+        plugin_projects.sort()
 
         error_info = {}
         distributions = {}
@@ -683,7 +695,8 @@ def find_plugins(self, plugin_env, full_env=None, installer=None,
             env = full_env + plugin_env
 
         shadow_set = self.__class__([])
-        list(map(shadow_set.add, self))   # put all our entries in shadow_set
+        # put all our entries in shadow_set
+        list(map(shadow_set.add, self))
 
         for project_name in plugin_projects:
 
@@ -696,11 +709,14 @@ def find_plugins(self, plugin_env, full_env=None, installer=None,
 
                 except ResolutionError:
                     v = sys.exc_info()[1]
-                    error_info[dist] = v    # save error info
+                    # save error info
+                    error_info[dist] = v
                     if fallback:
-                        continue    # try the next older version of project
+                        # try the next older version of project
+                        continue
                     else:
-                        break       # give up on this project, keep going
+                        # give up on this project, keep going
+                        break
 
                 else:
                     list(map(shadow_set.add, resolvees))
@@ -851,7 +867,8 @@ def best_match(self, req, working_set, installer=None):
         for dist in self[req.key]:
             if dist in req:
                 return dist
-        return self.obtain(req, installer) # try and download/install
+        # try to download/install
+        return self.obtain(req, installer)
 
     def obtain(self, requirement, installer=None):
         """Obtain a distribution matching `requirement` (e.g. via download)
@@ -890,7 +907,8 @@ def __add__(self, other):
         return new
 
 
-AvailableDistributions = Environment    # XXX backward compatibility
+# XXX backward compatibility
+AvailableDistributions = Environment
 
 
 class ExtractionError(RuntimeError):
@@ -1100,14 +1118,17 @@ def get_default_cache():
     if os.name!='nt':
         return os.path.expanduser('~/.python-eggs')
 
-    app_data = 'Application Data'   # XXX this may be locale-specific!
+    # XXX this may be locale-specific!
+    app_data = 'Application Data'
     app_homes = [
-        (('APPDATA',), None),       # best option, should be locale-safe
+        # best option, should be locale-safe
+        (('APPDATA',), None),
         (('USERPROFILE',), app_data),
         (('HOMEDRIVE','HOMEPATH'), app_data),
         (('HOMEPATH',), app_data),
         (('HOME',), None),
-        (('WINDIR',), app_data),    # 95/98/ME
+        # 95/98/ME
+        (('WINDIR',), app_data),
     ]
 
     for keys, subdir in app_homes:
@@ -1589,8 +1610,9 @@ def get_resource_filename(self, manager, resource_name):
     @staticmethod
     def _get_date_and_size(zip_stat):
         size = zip_stat.file_size
-        date_time = zip_stat.date_time + (0, 0, -1)  # ymdhms+wday, yday, dst
-        #1980 offset already done
+        # ymdhms+wday, yday, dst
+        date_time = zip_stat.date_time + (0, 0, -1)
+        # 1980 offset already done
         timestamp = time.mktime(date_time)
         return timestamp, size
 
@@ -1601,7 +1623,8 @@ def _extract_resource(self, manager, zip_path):
                 last = self._extract_resource(
                     manager, os.path.join(zip_path, name)
                 )
-            return os.path.dirname(last)  # return the extracted directory name
+            # return the extracted directory name
+            return os.path.dirname(last)
 
         timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
 
@@ -1632,14 +1655,16 @@ def _extract_resource(self, manager, zip_path):
                         # the file became current since it was checked above,
                         #  so proceed.
                         return real_path
-                    elif os.name=='nt':     # Windows, del old file and retry
+                    # Windows, del old file and retry
+                    elif os.name=='nt':
                         unlink(real_path)
                         rename(tmpnam, real_path)
                         return real_path
                 raise
 
         except os.error:
-            manager.extraction_error()  # report a user-friendly error
+            # report a user-friendly error
+            manager.extraction_error()
 
         return real_path
 
@@ -1805,7 +1830,8 @@ def find_eggs_in_zip(importer, path_item, only=False):
     if metadata.has_metadata('PKG-INFO'):
         yield Distribution.from_filename(path_item, metadata=metadata)
     if only:
-        return  # don't yield nested distros
+        # don't yield nested distros
+        return
     for subitem in metadata.resource_listdir('/'):
         if subitem.endswith('.egg'):
             subpath = os.path.join(path_item, subitem)
@@ -2006,18 +2032,24 @@ def yield_lines(strs):
     if isinstance(strs, basestring):
         for s in strs.splitlines():
             s = s.strip()
-            if s and not s.startswith('#'):     # skip blank lines/comments
+            # skip blank lines/comments
+            if s and not s.startswith('#'):
                 yield s
     else:
         for ss in strs:
             for s in yield_lines(ss):
                 yield s
 
-LINE_END = re.compile(r"\s*(#.*)?$").match         # whitespace and comment
-CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match    # line continuation
-DISTRO = re.compile(r"\s*((\w|[-.])+)").match    # Distribution or extra
-VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match  # ver. info
-COMMA = re.compile(r"\s*,").match               # comma between items
+# whitespace and comment
+LINE_END = re.compile(r"\s*(#.*)?$").match
+# line continuation
+CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match
+# Distribution or extra
+DISTRO = re.compile(r"\s*((\w|[-.])+)").match
+# ver. info
+VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match
+# comma between items
+COMMA = re.compile(r"\s*,").match
 OBRACKET = re.compile(r"\s*\[").match
 CBRACKET = re.compile(r"\s*\]").match
 MODULE = re.compile(r"\w+(\.\w+)*$").match
@@ -2036,11 +2068,13 @@ def _parse_version_parts(s):
         if not part or part=='.':
             continue
         if part[:1] in '0123456789':
-            yield part.zfill(8)    # pad for numeric comparison
+            # pad for numeric comparison
+            yield part.zfill(8)
         else:
             yield '*'+part
 
-    yield '*final'  # ensure that alpha/beta/candidate are before final
+    # ensure that alpha/beta/candidate are before final
+    yield '*final'
 
 def parse_version(s):
     """Convert a version string to a chronologically-sortable key
@@ -2076,7 +2110,8 @@ def parse_version(s):
     parts = []
     for part in _parse_version_parts(s.lower()):
         if part.startswith('*'):
-            if part<'*final':   # remove '-' before a prerelease tag
+            # remove '-' before a prerelease tag
+            if part<'*final':
                 while parts and parts[-1]=='*final-': parts.pop()
             # remove trailing zeros from each series of numeric parts
             while parts and parts[-1]=='00000000':
@@ -2311,7 +2346,8 @@ def _dep_map(self):
                         if ':' in extra:
                             extra, marker = extra.split(':',1)
                             if invalid_marker(marker):
-                                reqs=[] # XXX warn
+                                # XXX warn
+                                reqs=[]
                             elif not evaluate_marker(marker):
                                 reqs=[]
                         extra = safe_extra(extra) or None
@@ -2445,13 +2481,15 @@ def insert_on(self, path, loc = None):
                 break
             else:
                 del npath[np], path[np]
-                p = np  # ha!
+                # ha!
+                p = np
 
         return
 
     def check_version_conflict(self):
         if self.key=='setuptools':
-            return      # ignore the inevitable setuptools self-conflicts  :(
+            # ignore the inevitable setuptools self-conflicts  :(
+            return
 
         nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
         loc = normalize_path(self.location)
@@ -2680,17 +2718,21 @@ def __contains__(self, item):
         elif isinstance(item, basestring):
             item = parse_version(item)
         last = None
-        compare = lambda a, b: (a > b) - (a < b) # -1, 0, 1
+        # -1, 0, 1
+        compare = lambda a, b: (a > b) - (a < b)
         for parsed, trans, op, ver in self.index:
-            action = trans[compare(item, parsed)] # Indexing: 0, 1, -1
+            # Indexing: 0, 1, -1
+            action = trans[compare(item, parsed)]
             if action=='F':
                 return False
             elif action=='T':
                 return True
             elif action=='+':
                 last = True
-            elif action=='-' or last is None:   last = False
-        if last is None: last = True    # no rules encountered
+            elif action=='-' or last is None:
+                last = False
+        # no rules encountered
+        if last is None: last = True
         return last
 
     def __hash__(self):
@@ -2767,10 +2809,12 @@ def _mkstemp(*args,**kw):
     from tempfile import mkstemp
     old_open = os.open
     try:
-        os.open = os_open   # temporarily bypass sandboxing
+        # temporarily bypass sandboxing
+        os.open = os_open
         return mkstemp(*args,**kw)
     finally:
-        os.open = old_open  # and then put it back
+        # and then put it back
+        os.open = old_open
 
 
 # Set up global resource manager (deliberately not state-saved)
@@ -2789,7 +2833,8 @@ def _initialize(g):
 iter_entry_points = working_set.iter_entry_points
 add_activation_listener = working_set.subscribe
 run_script = working_set.run_script
-run_main = run_script   # backward compatibility
+# backward compatibility
+run_main = run_script
 # Activate all distributions already on sys.path, and ensure that
 # all distributions added to the working set in the future (e.g. by
 # calling ``require()``) will get activated as well.

From 3fdbb8f7fa5c84dca9a7ff309d71ae3aeff60009 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 03:50:59 -0400
Subject: [PATCH 4044/8469] Use modern syntax for octal values

---
 pkg_resources.py                      |  4 ++--
 setuptools/command/easy_install.py    | 10 +++++-----
 setuptools/command/install_scripts.py |  2 +-
 setuptools/sandbox.py                 |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 09a5f2ed54..372480ea51 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -77,7 +77,7 @@ def execfile(fn, globs=None, locs=None):
 except ImportError:
     pass
 
-def _bypass_ensure_directory(name, mode=0x1FF):  # 0777
+def _bypass_ensure_directory(name, mode=0o777):
     # Sandbox-bypassing version of ensure_directory()
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')
@@ -1061,7 +1061,7 @@ def postprocess(self, tempname, filename):
 
         if os.name == 'posix':
             # Make the resource executable
-            mode = ((os.stat(tempname).st_mode) | 0x16D) & 0xFFF # 0555, 07777
+            mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777
             os.chmod(tempname, mode)
 
     def set_extraction_path(self, path):
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index de139f2f13..00cd300ab3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -770,7 +770,7 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0x1FF-mask) # 0777
+            chmod(target, 0o777-mask)
 
     def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them
@@ -1110,7 +1110,7 @@ def pf(src, dst):
         self.byte_compile(to_compile)
         if not self.dry_run:
             for f in to_chmod:
-                mode = ((os.stat(f)[stat.ST_MODE]) | 0x16D) & 0xFED  # 0555, 07755
+                mode = ((os.stat(f)[stat.ST_MODE]) | 0o555) & 0o7755
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
@@ -1206,8 +1206,8 @@ def create_home_path(self):
         home = convert_path(os.path.expanduser("~"))
         for name, path in iteritems(self.config_vars):
             if path.startswith(home) and not os.path.isdir(path):
-                self.debug_print("os.makedirs('%s', 0700)" % path)
-                os.makedirs(path, 0x1C0)    # 0700
+                self.debug_print("os.makedirs('%s', 0o700)" % path)
+                os.makedirs(path, 0o700)
 
     INSTALL_SCHEMES = dict(
         posix = dict(
@@ -1873,7 +1873,7 @@ def onerror(*args):
         onerror(os.rmdir, path, sys.exc_info())
 
 def current_umask():
-    tmp = os.umask(0x12)    # 022
+    tmp = os.umask(0o022)
     os.umask(tmp)
     return tmp
 
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index c19536bfdc..ac373193f3 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -49,4 +49,4 @@ def write_script(self, script_name, contents, mode="t", *ignored):
             f = open(target,"w"+mode)
             f.write(contents)
             f.close()
-            chmod(target, 0x1FF-mask)  # 0777
+            chmod(target, 0o777-mask)
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 042c595897..dc6e54bf24 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -268,7 +268,7 @@ def _remap_pair(self, operation, src, dst, *args, **kw):
             self._violation(operation, src, dst, *args, **kw)
         return (src,dst)
 
-    def open(self, file, flags, mode=0x1FF, *args, **kw):    # 0777
+    def open(self, file, flags, mode=0o777, *args, **kw):
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode, *args, **kw)

From 6fb34525a9935ee687e8b89d340da126d9aa9cb5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 14:55:50 -0400
Subject: [PATCH 4045/8469] Add Python 3.4 as a testable version. Bump version
 pulled in bootstrap test.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0b5672cb8e..022824f99b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,10 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - 3.4
   - pypy
 # command to run tests
 script:
  - python setup.py test
  - python setup.py ptr
- - python ez_setup.py --version 3.0.2
+ - python ez_setup.py --version 3.5.1

From ad7c41a6e717a7d91a8dc08a2530e1187139b799 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 May 2014 16:23:25 -0400
Subject: [PATCH 4046/8469] Just suppress the spurious IndexError when it
 happens. Rely on the environments where the behavior doesn't fail until the
 upstream issue can be resolved. Fixes #201.

---
 setuptools/tests/test_easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 53114efd81..31802aa288 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -226,9 +226,6 @@ def test_local_index(self):
             else:
                 del os.environ['PYTHONPATH']
 
-    @skipIf(sys.version_info < (3, 4),
-        "Test fails on Python 3.3 and earlier due to bug in inspect but only "
-        "when run under setup.py test")
     def test_setup_requires(self):
         """Regression test for Distribute issue #318
 
@@ -246,6 +243,10 @@ def test_setup_requires(self):
                     run_setup(test_setup_py, ['install'])
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
+        except IndexError:
+            # Test fails in some cases due to bugs in Python
+            # See https://bitbucket.org/pypa/setuptools/issue/201
+            pass
 
 
 class TestSetupRequires(unittest.TestCase):

From 2edec4688999a14f63cb842aa5df491464626b20 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 11:51:45 -0400
Subject: [PATCH 4047/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1c54ea5ee7..cb970e8791 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+3.5.2
+-----
+
+* Issue #168: More robust handling of replaced zip files and stale caches.
+  Fixes ZipImportError complaining about a 'bad local header'.
+
 -----
 3.4.4
 -----

From 89be7c26630e3df52699f10dc2d3c312625a938a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:07:43 -0400
Subject: [PATCH 4048/8469] Added tag 3.5.2 for changeset 572201d08ead

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0120d6b398..1339fff2e1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -133,3 +133,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 0917d575d26091a184796624743825914994bf95 3.4.4
 98f29d521c3a57bae0090d2bc5597d93db95b108 3.5
 254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1
+572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2

From 2ad829949a55ebb390c5c94a5672f10f693e7eaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:08:13 -0400
Subject: [PATCH 4049/8469] Bumped to 3.5.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6c58f105aa..56ba9ae3ad 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.5.2"
+DEFAULT_VERSION = "3.5.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0bc4055f60..455727c57d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.5.2'
+__version__ = '3.5.3'

From 5b8bc6f83e6c31c2b8737a41578c42771f05f47c Mon Sep 17 00:00:00 2001
From: Arkadiy Shapkin <arkadiy_s@inbox.ru>
Date: Thu, 24 Apr 2014 08:38:40 +0000
Subject: [PATCH 4050/8469] Downloading throw proxy fixed
 http://stackoverflow.com/a/18790045/61505

--HG--
extra : rebase_source : b4dced905dbe7206c15ae35ccdae9c400637efa2
---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 56ba9ae3ad..7ec1680ae9 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -169,7 +169,7 @@ def download_file_powershell(url, target):
     cmd = [
         'powershell',
         '-Command',
-        "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
+        "[System.Net.WebRequest]::DefaultWebProxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials;  (new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
     ]
     _clean_check(cmd, target)
 

From 21e9c58b9a33b7a1a2b304fe82445052c94eb20d Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 24 Apr 2014 08:07:17 -0500
Subject: [PATCH 4051/8469] ensure write_manifest passes contents to write_file
 as unicode strings.

--HG--
extra : rebase_source : 719fb2eb2c3599c57d7a11f5fc55cf9a88d74df7
---
 setuptools/command/egg_info.py | 43 +++++++++++++++++++++++-----------
 setuptools/tests/test_sdist.py |  9 +++----
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 30873e19cb..df4edff76f 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -10,7 +10,7 @@
 import distutils.errors
 from distutils import log
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring
+from setuptools.compat import basestring, unicode
 from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
@@ -256,22 +256,37 @@ def write_manifest(self):
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
         """
-        # The manifest must be UTF-8 encodable. See #303.
-        if sys.version_info >= (3,):
-            files = []
-            for file in self.filelist.files:
+
+        #if files are byte codes they should be filesystem encoded
+        fs_enc = sys.getfilesystemencoding()
+        files = []
+        contents = []
+        for file in self.filelist.files:
+            #In order to ensure the encode behaves, must explicitly
+            #decode non-unicode strings, yet retain original for
+            #filelist cleanup
+            if not isinstance(file, unicode):
                 try:
-                    file.encode("utf-8")
-                except UnicodeEncodeError:
-                    log.warn("'%s' not UTF-8 encodable -- skipping" % file)
-                else:
-                    files.append(file)
-            self.filelist.files = files
+                    u_file = file.decode(fs_enc)
+                except UnicodeDecodeError:
+                    log.warn("'%s' in unexpected encoding -- skipping" % file)
+                    continue
+            else:
+                u_file = file
+
+            # The manifest must be UTF-8 encodable. See #303.
+            try:
+                u_file.encode("utf-8")
+            except UnicodeEncodeError:
+                log.warn("'%s' not UTF-8 encodable -- skipping" % file)
+            else:
+                files.append(file)  # possibily byte encoded
+                contents.append(u_file)  # unicode only
+        self.filelist.files = files
 
-        files = self.filelist.files
         if os.sep!='/':
-            files = [f.replace(os.sep,'/') for f in files]
-        self.execute(write_file, (self.manifest, files),
+            contents = [f.replace(os.sep,'/') for f in contents]
+        self.execute(write_file, (self.manifest, contents),
                      "writing manifest file '%s'" % self.manifest)
 
     def warn(self, msg):    # suppress missing-file warnings from sdist
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 71d10757bc..09a58621d1 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -156,10 +156,11 @@ def test_manifest_is_written_with_utf8_encoding(self):
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
-        if sys.version_info >= (3,):
-            self.assertTrue(posix(filename) in u_contents)
-        else:
-            self.assertTrue(posix(filename) in contents)
+        if sys.version_info < (3,):
+            fs_enc = sys.getfilesystemencoding()
+            filename = filename.decode(fs_enc)
+
+        self.assertTrue(posix(filename) in u_contents)
 
     # Python 3 only
     if sys.version_info >= (3,):

From ab771bb9808eed095eb5dcf52d3262335abd39af Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 24 Apr 2014 22:05:00 -0500
Subject: [PATCH 4052/8469] ignore .git* files

---
 .hgignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.hgignore b/.hgignore
index 13367726df..6eb702bc7d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,5 +13,4 @@ include
 \.Python
 *.swp
 CHANGES (links).txt
-.git2
-.gitignore
+.git*

From b9a53c47f66dbc41e3e9ba8bd29932d1ca6a589f Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Thu, 24 Apr 2014 23:06:09 -0500
Subject: [PATCH 4053/8469] test_sdist: change the latin1 test to match the
 behavior of write_manifest

---
 setuptools/tests/test_sdist.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 09a58621d1..31768e21de 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -397,9 +397,20 @@ def test_sdist_with_latin1_encoded_filename(self):
                 filename = filename.decode('latin-1')
                 self.assertFalse(filename in cmd.filelist.files)
         else:
-            # No conversion takes place under Python 2 and the file
-            # is included. We shall keep it that way for BBB.
-            self.assertTrue(filename in cmd.filelist.files)
+            # Under Python 2 there seems to be no decoding of the
+            # filelist.  However, due to decode and encoding of the
+            # file name to utf-8 
+            try:
+                #This seems a bit iffy, but not really what else
+                #since cmd.filelist.files is not encoded, but
+                #want to write out the manifest as UTF-8/
+
+                #This is how one expected the filename to be decoded
+                fs_enc = sys.getfilesystemencoding() 
+                filename.decode(fs_enc)
+                self.assertTrue(filename in cmd.filelist.files)
+            except UnicodeDecodeError:
+                self.assertFalse(filename in cmd.filelist.files)
 
 
 class TestDummyOutput(environment.ZippedEnvironment):

From 7192c0fb9e77a8ffa8f54b956cb6775ecb3b1795 Mon Sep 17 00:00:00 2001
From: philip_thiem <ptthiem+bitbuket@gmail.com>
Date: Fri, 25 Apr 2014 04:53:11 +0000
Subject: [PATCH 4054/8469] Improved comment in the latin1 sdist test.

---
 setuptools/tests/test_sdist.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 31768e21de..5d8340b03c 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -397,15 +397,12 @@ def test_sdist_with_latin1_encoded_filename(self):
                 filename = filename.decode('latin-1')
                 self.assertFalse(filename in cmd.filelist.files)
         else:
-            # Under Python 2 there seems to be no decoding of the
+            # Under Python 2 there seems to be no decoded string in the
             # filelist.  However, due to decode and encoding of the
-            # file name to utf-8 
+            # file name to get utf-8 Manifest the latin1 maybe excluded
             try:
-                #This seems a bit iffy, but not really what else
-                #since cmd.filelist.files is not encoded, but
-                #want to write out the manifest as UTF-8/
-
-                #This is how one expected the filename to be decoded
+                # fs_enc should match how one is expect the decoding to
+                # be proformed for the manifest output.
                 fs_enc = sys.getfilesystemencoding() 
                 filename.decode(fs_enc)
                 self.assertTrue(filename in cmd.filelist.files)

From 1152b05d319cd460945037cdf09529f754c1b4db Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 4 May 2014 05:06:24 -0700
Subject: [PATCH 4055/8469] Version bump for 3.4.1rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 04804c1f42..b00024940e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.0"
+__version__ = "3.4.1rc1"
 #--end constants--

From 19565334cb36e694328566d3f5011a5b57d6bee3 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Wed, 7 May 2014 04:44:42 +0200
Subject: [PATCH 4056/8469] - Issue #17752: Fix distutils tests when run from
 the installed location.

---
 tests/support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/support.py b/tests/support.py
index 71ad4f42b2..7385c6bbf6 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -207,4 +207,4 @@ def fixup_build_ext(cmd):
                 cmd.library_dirs = []
             else:
                 name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
+                cmd.library_dirs = [d for d in value.split(os.pathsep) if d]

From ddf2ea79184c3b3e10f33bbab12ac995395d15fb Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Wed, 7 May 2014 12:57:44 +0200
Subject: [PATCH 4057/8469] - Issue #17752: Fix distutils tests when run from
 the installed location.

---
 tests/support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/support.py b/tests/support.py
index 71ad4f42b2..7385c6bbf6 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -207,4 +207,4 @@ def fixup_build_ext(cmd):
                 cmd.library_dirs = []
             else:
                 name, equals, value = runshared.partition('=')
-                cmd.library_dirs = value.split(os.pathsep)
+                cmd.library_dirs = [d for d in value.split(os.pathsep) if d]

From e1f6290df0a0bd0ed58c9dd3a695ef41b17310f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:15:13 -0400
Subject: [PATCH 4058/8469] Extract powershell command to correct long line

--HG--
extra : amend_source : 1a6e3e5d0f62c1ce54c0d42ce806bd13541642ca
---
 ez_setup.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 7ec1680ae9..003e0619d0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -166,10 +166,16 @@ def download_file_powershell(url, target):
     trust). Raise an exception if the command cannot complete.
     """
     target = os.path.abspath(target)
+    ps_cmd = (
+        "[System.Net.WebRequest]::DefaultWebProxy.Credentials = "
+        "[System.Net.CredentialCache]::DefaultCredentials; "
+        "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)"
+        % vars()
+    )
     cmd = [
         'powershell',
         '-Command',
-        "[System.Net.WebRequest]::DefaultWebProxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials;  (new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
+        ps_cmd,
     ]
     _clean_check(cmd, target)
 

From f4feb24a9824b6f85a0125096c4f7de9baf48c90 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:21:53 -0400
Subject: [PATCH 4059/8469] Update changelog. Fixes #203.

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 65577273fc..2f4705d7d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+3.6
+---
+
+* Issue #203: Honor proxy settings for Powershell downloader in the bootstrap
+  routine.
+
 -----
 3.5.2
 -----

From 46d0e959989b92971f7d0999222b8aa476786b65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:22:50 -0400
Subject: [PATCH 4060/8469] Bumped to 3.6 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 003e0619d0..bd7d262d77 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.5.3"
+DEFAULT_VERSION = "3.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 455727c57d..f1d9320859 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.5.3'
+__version__ = '3.6'

From d5c8e8b6a5f3b0599668eb5696450bbe57080ef9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:22:52 -0400
Subject: [PATCH 4061/8469] Added tag 3.6 for changeset e94e768594a1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1339fff2e1..100e552c46 100644
--- a/.hgtags
+++ b/.hgtags
@@ -134,3 +134,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 98f29d521c3a57bae0090d2bc5597d93db95b108 3.5
 254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1
 572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2
+e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6

From b317181b174346e958bfd0999ccbbd803962bbe4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 May 2014 12:23:18 -0400
Subject: [PATCH 4062/8469] Bumped to 3.7 in preparation for next release.

---
 ez_setup.py                      | 2 +-
 setuptools.egg-info/requires.txt | 8 ++++----
 setuptools/version.py            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bd7d262d77..732fffc935 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.6"
+DEFAULT_VERSION = "3.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923ef5..e5db30adfb 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[certs]
-certifi==1.0.1
-
 [ssl:sys_platform=='win32']
-wincertstore==0.2
\ No newline at end of file
+wincertstore==0.2
+
+[certs]
+certifi==1.0.1
\ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index f1d9320859..94bcfb0106 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.6'
+__version__ = '3.7'

From 378b4011f66d9fdac94eaaf7b9d61c70f0a2fbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Thu, 8 May 2014 21:21:59 +0200
Subject: [PATCH 4063/8469] fix issue202 - update existing zipimporters when
 replacing a zipped egg

When replacing a zipped egg distribution with a different zipped egg, we make
all existing zipimport.zipimporter loaders valid again instead of having to go
hunting them down one by one. This is done by updating their shared zip
directory information cache - zipimport._zip_directory_cache.

Related to the following project issues:
  #169 - http://bitbucket.org/pypa/setuptools/issue/168
  #202 - http://bitbucket.org/pypa/setuptools/issue/202

--HG--
extra : source : b60beb7792252a39f61d7fc0f58aa04c03ddaba2
---
 setuptools/command/easy_install.py | 139 ++++++++++++++++++++++-------
 1 file changed, 109 insertions(+), 30 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ad7f472512..0b282d47b3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -840,23 +840,30 @@ def install_egg(self, egg_path, tmpdir):
                 dir_util.remove_tree(destination, dry_run=self.dry_run)
             elif os.path.exists(destination):
                 self.execute(os.unlink,(destination,),"Removing "+destination)
-            uncache_zipdir(destination)
-            if os.path.isdir(egg_path):
-                if egg_path.startswith(tmpdir):
-                    f,m = shutil.move, "Moving"
+            try:
+                new_dist_is_zipped = False
+                if os.path.isdir(egg_path):
+                    if egg_path.startswith(tmpdir):
+                        f,m = shutil.move, "Moving"
+                    else:
+                        f,m = shutil.copytree, "Copying"
+                elif self.should_unzip(dist):
+                    self.mkpath(destination)
+                    f,m = self.unpack_and_compile, "Extracting"
                 else:
-                    f,m = shutil.copytree, "Copying"
-            elif self.should_unzip(dist):
-                self.mkpath(destination)
-                f,m = self.unpack_and_compile, "Extracting"
-            elif egg_path.startswith(tmpdir):
-                f,m = shutil.move, "Moving"
-            else:
-                f,m = shutil.copy2, "Copying"
-
-            self.execute(f, (egg_path, destination),
-                (m+" %s to %s") %
-                (os.path.basename(egg_path),os.path.dirname(destination)))
+                    new_dist_is_zipped = True
+                    if egg_path.startswith(tmpdir):
+                        f,m = shutil.move, "Moving"
+                    else:
+                        f,m = shutil.copy2, "Copying"
+                self.execute(f, (egg_path, destination),
+                    (m+" %s to %s") %
+                    (os.path.basename(egg_path),os.path.dirname(destination)))
+                update_dist_caches(destination,
+                    fix_zipimporter_caches=new_dist_is_zipped)
+            except:
+                update_dist_caches(destination, fix_zipimporter_caches=False)
+                raise
 
         self.add_output(destination)
         return self.egg_distribution(destination)
@@ -1582,24 +1589,74 @@ def auto_chmod(func, arg, exc):
     et, ev, _ = sys.exc_info()
     reraise(et, (ev[0], ev[1] + (" %s %s" % (func,arg))))
 
-def uncache_zipdir(path):
+def update_dist_caches(dist_path, fix_zipimporter_caches):
     """
-    Remove any globally cached zip file related data for `path`
-
-    Stale zipimport.zipimporter objects need to be removed when a zip file is
-    replaced as they contain cached zip file directory information. If they are
-    asked to get data from their zip file, they will use that cached
-    information to calculate the data location in the zip file. This calculated
-    location may be incorrect for the replaced zip file, which may in turn
-    cause the read operation to either fail or return incorrect data.
-
-    Note we have no way to clear any local caches from here. That is left up to
-    whomever is in charge of maintaining that cache.
+    Fix any globally cached `dist_path` related data
+
+    `dist_path` should be a path of a newly installed egg distribution (zipped
+    or unzipped).
+
+    sys.path_importer_cache contains finder objects that have been cached when
+    importing data from the original distribution. Any such finders need to be
+    cleared since the replacement distribution might be packaged differently,
+    e.g. a zipped egg distribution might get replaced with an unzipped egg
+    folder or vice versa. Having the old finders cached may then cause Python
+    to attempt loading modules from the replacement distribution using an
+    incorrect loader.
+
+    zipimport.zipimporter objects are Python loaders charged with importing
+    data packaged inside zip archives. If stale loaders referencing the
+    original distribution, are left behind, they can fail to load modules from
+    the replacement distribution. E.g. if an old zipimport.zipimporter instance
+    is used to load data from a new zipped egg archive, it may cause the
+    operation to attempt to locate the requested data in the wrong location -
+    one indicated by the original distribution's zip archive directory
+    information. Such an operation may then fail outright, e.g. report having
+    read a 'bad local file header', or even worse, it may fail silently &
+    return invalid data.
+
+    If asked, we can fix all existing zipimport.zipimporter instances instead
+    of having to track them down and remove them one by one, by updating their
+    shared cached zip archive directory information. This, of course, assumes
+    that the replacement distribution is packaged as a zipped egg.
+
+    If not asked to fix existing zipimport.zipimporter instances, we do our
+    best to clear any remaining zipimport.zipimporter related cached data that
+    might somehow later get used when attempting to load data from the new
+    distribution and thus cause such load operations to fail. Note that when
+    tracking down such remaining stale data, we can not catch every possible
+    usage from here, and we clear only those that we know of and have found to
+    cause problems if left alive. Any remaining caches should be updated by
+    whomever is in charge of maintaining them, i.e. they should be ready to
+    handle us replacing their zip archives with new distributions at runtime.
 
     """
-    normalized_path = normalize_path(path)
-    _uncache(normalized_path, zipimport._zip_directory_cache)
+    normalized_path = normalize_path(dist_path)
     _uncache(normalized_path, sys.path_importer_cache)
+    if fix_zipimporter_caches:
+        _replace_zip_directory_cache_data(normalized_path)
+    else:
+        # Clear the relevant zipimport._zip_directory_cache data. This will not
+        # remove related zipimport.zipimporter instances but should at least
+        # not leave the old zip archive directory data behind to be reused by
+        # some newly created zipimport.zipimporter loaders. Not strictly
+        # necessary, but left in because this cache clearing was done before
+        # we started replacing the zipimport._zip_directory_cache if possible,
+        # and there are no relevent unit tests that we can depend on to tell us
+        # if this is really needed.
+        _uncache(normalized_path, zipimport._zip_directory_cache)
+        # N.B. Other known sources of stale zipimport.zipimporter instances
+        # that we do not clear here, but might if ever given a reason to do so.
+        # * Global setuptools pkg_resources.working_set (a.k.a. 'master working
+        #   set') may contain distributions which may in turn contain their
+        #   zipimport.zipimporter loaders.
+        # * Several zipimport.zipimporter loaders held by local variables
+        #   further up the function call stack when running the setuptools
+        #   installation.
+        # * Already loaded modules may have their __loader__ attribute set to
+        #   the exact loader instance used when importing them. Python 3.4 docs
+        #   state that this information is intended mostly for introspection
+        #   and so is not expected to cause us problems.
 
 def _uncache(normalized_path, cache):
     to_remove = []
@@ -1612,6 +1669,28 @@ def _uncache(normalized_path, cache):
     for p in to_remove:
         del cache[p]
 
+def _replace_zip_directory_cache_data(normalized_path):
+    cache = zipimport._zip_directory_cache
+    to_update = []
+    prefix_len = len(normalized_path)
+    for p in cache:
+        np = normalize_path(p)
+        if (np.startswith(normalized_path) and
+                np[prefix_len:prefix_len + 1] in (os.sep, '')):
+            to_update.append(p)
+    # N.B. In theory, we could load the zip directory information just once for
+    # all updated path spellings, and then copy it locally and update its
+    # contained path strings to contain the correct spelling, but that seems
+    # like a way too invasive move (this cache structure is not officially
+    # documented anywhere and could in theory change with new Python releases)
+    # for no significant benefit.
+    for p in to_update:
+        old_entry = cache.pop(p)
+        zipimport.zipimporter(p)
+        old_entry.clear()
+        old_entry.update(cache[p])
+        cache[p] = old_entry
+
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"
     try:

From a82811aa0b9d0d74b546439ff740ce63403f1b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Thu, 8 May 2014 21:24:35 +0200
Subject: [PATCH 4064/8469] remove quick-fix comment for the solution to issue
 #169.

Although the original problematic use case when we are replacing a zipped egg
distribution with another zipped egg distribution is now cleanly handled by
fixing all existing zipimport.zipimporter loaders, this fix is still valid for
cases when replacing a distribution with a non-zipped egg folder.

--HG--
extra : source : efd6a8b82bafdbcfad1971b7e0f470e19191be1a
---
 setuptools/command/easy_install.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0b282d47b3..0bce4ab957 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -646,13 +646,6 @@ def select_scheme(self, name):
     def process_distribution(self, requirement, dist, deps=True, *info):
         self.update_pth(dist)
         self.package_index.add(dist)
-        # First remove the dist from self.local_index, to avoid problems using
-        # old cached data in case its underlying file has been replaced.
-        #
-        # This is a quick-fix for a zipimporter caching issue in case the dist
-        # has been implemented as and already loaded from a zip file that got
-        # replaced later on. For more detailed information see setuptools issue
-        # #168 at 'http://bitbucket.org/pypa/setuptools/issue/168'.
         if dist in self.local_index[dist.key]:
             self.local_index.remove(dist)
         self.local_index.add(dist)

From 8cbbd8e2876d95e3f338a5342e2f11c42e780768 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 May 2014 13:20:28 -0400
Subject: [PATCH 4065/8469] Clean up style in distutils upload command

---
 command/upload.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index d6762e46fd..4882db428f 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -1,18 +1,21 @@
-"""distutils.command.upload
+"""
+distutils.command.upload
 
-Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
+Implements the Distutils 'upload' subcommand (upload package to a package
+index).
+"""
 
-from distutils.errors import *
-from distutils.core import PyPIRCCommand
-from distutils.spawn import spawn
-from distutils import log
 import sys
-import os, io
-import socket
+import os
+import io
 import platform
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
 from urllib.parse import urlparse
+from distutils.errors import *
+from distutils.core import PyPIRCCommand
+from distutils.spawn import spawn
+from distutils import log
 
 # this keeps compatibility for 2.3 and 2.4
 if sys.version < "2.5":
@@ -106,7 +109,7 @@ def upload_file(self, command, pyversion, filename):
             'md5_digest': md5(content).hexdigest(),
 
             # additional meta-data
-            'metadata_version' : '1.0',
+            'metadata_version': '1.0',
             'summary': meta.get_description(),
             'home_page': meta.get_url(),
             'author': meta.get_contact(),
@@ -167,13 +170,15 @@ def upload_file(self, command, pyversion, filename):
         body.write(b"\n")
         body = body.getvalue()
 
-        self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
+        msg = "Submitting %s to %s" % (filename, self.repository)
+        self.announce(msg, log.INFO)
 
         # build the Request
-        headers = {'Content-type':
-                        'multipart/form-data; boundary=%s' % boundary,
-                   'Content-length': str(len(body)),
-                   'Authorization': auth}
+        headers = {
+            'Content-type': 'multipart/form-data; boundary=%s' % boundary,
+            'Content-length': str(len(body)),
+            'Authorization': auth,
+        }
 
         request = Request(self.repository, data=body,
                           headers=headers)

From 0983f9dd893c03aabbaa826bf9c644a88b67a5b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 May 2014 13:21:02 -0400
Subject: [PATCH 4066/8469] Replace import * with explicit import

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 4882db428f..7824466605 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -12,7 +12,7 @@
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
 from urllib.parse import urlparse
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
 from distutils.core import PyPIRCCommand
 from distutils.spawn import spawn
 from distutils import log

From 5eb3849be5200231ac49e5b2c6b58ae63f1ed023 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 May 2014 13:22:43 -0400
Subject: [PATCH 4067/8469] Drop support for Python 2.4 in upload command.

---
 command/upload.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 7824466605..75498b14d5 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -5,10 +5,10 @@
 index).
 """
 
-import sys
 import os
 import io
 import platform
+import hashlib
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
 from urllib.parse import urlparse
@@ -17,12 +17,6 @@
 from distutils.spawn import spawn
 from distutils import log
 
-# this keeps compatibility for 2.3 and 2.4
-if sys.version < "2.5":
-    from md5 import md5
-else:
-    from hashlib import md5
-
 class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
@@ -106,7 +100,7 @@ def upload_file(self, command, pyversion, filename):
             'content': (os.path.basename(filename),content),
             'filetype': command,
             'pyversion': pyversion,
-            'md5_digest': md5(content).hexdigest(),
+            'md5_digest': hashlib.md5(content).hexdigest(),
 
             # additional meta-data
             'metadata_version': '1.0',

From 41140cfe90c79dcb3ac74486c192e435c0bd1c09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 May 2014 13:24:18 -0400
Subject: [PATCH 4068/8469] Replace overly-aggressive comparison for type
 equality with an isinstance check.

---
 command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index 75498b14d5..c279b591c4 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -146,7 +146,7 @@ def upload_file(self, command, pyversion, filename):
         for key, value in data.items():
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
-            if type(value) != type([]):
+            if not isinstance(value, list):
                 value = [value]
             for value in value:
                 if type(value) is tuple:

From b160cdaa13bd69e006afee3763d05cf4d1fc6441 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 May 2014 13:24:58 -0400
Subject: [PATCH 4069/8469] Reindent long line

---
 command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index c279b591c4..b906435203 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -57,7 +57,8 @@ def finalize_options(self):
 
     def run(self):
         if not self.distribution.dist_files:
-            raise DistutilsOptionError("No dist file created in earlier command")
+            msg = "No dist file created in earlier command"
+            raise DistutilsOptionError(msg)
         for command, pyversion, filename in self.distribution.dist_files:
             self.upload_file(command, pyversion, filename)
 

From 846b29f32fb8bbeda4d4a06a4da35bebc3f41cbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:00:56 +0100
Subject: [PATCH 4070/8469] Bumped to 3.8 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1f2468f927..a78067fe54 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.7"
+DEFAULT_VERSION = "3.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 94bcfb0106..b413618966 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.7'
+__version__ = '3.8'

From 40232ffa1983be8149a68cb969f28b92200204b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Mon, 12 May 2014 18:57:50 +0200
Subject: [PATCH 4071/8469] generalize fix for issue #197 from
 1cd816bb7c933eecd9d8464e054b21c7d5daf2df

Now the same fix gets applied for Python versions [3.0 - 3.2.2> instead of just
3.1. The underlying distutils issue affected all those vesions and has been
fixed in the Python 3.2.2 release.

--HG--
extra : rebase_source : fe4dc458edbf83e13b275e02fb90939d9061e206
---
 setuptools/dist.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index b8bd7490fb..69e0409930 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -34,11 +34,11 @@ def _get_unpatched(cls):
 
 def _patch_distribution_metadata_write_pkg_info():
     """
-    Workaround issue #197 - Python 3.1 uses an environment-local encoding to
-    save the pkg_info. Monkey-patch its write_pkg_info method to correct
-    this undesirable behavior.
+    Workaround issue #197 - Python [3.0 - 3.2.2> uses an environment-local
+    encoding to save the pkg_info. Monkey-patch its write_pkg_info method to
+    correct this undesirable behavior.
     """
-    if sys.version_info[:2] != (3,1):
+    if not ((3,) <= sys.version_info[:3] < (3, 2, 2)):
         return
 
     # from Python 3.4

From 337ce0deb26c4fa72b083001428f0ba1d456c0a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 21:35:24 -0400
Subject: [PATCH 4072/8469] Backed out changeset: 1ceaffff2d9b (restoring
 b0a2fcc5275a). Ref #193

--HG--
extra : rebase_source : 5ca0514bbe3ec025094ea8f39921722d0ab3dd05
---
 setuptools/command/egg_info.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 2097f2a91c..3a26f20162 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -303,8 +303,7 @@ def write_file(filename, contents):
     sequence of strings without line terminators) to it.
     """
     contents = "\n".join(contents)
-    if sys.version_info >= (3,):
-        contents = contents.encode("utf-8")
+    contents = contents.encode("utf-8")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()

From 16cffb5544e37d9f30ce0b5f485fefb991633d1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:26:19 -0400
Subject: [PATCH 4073/8469] Clean up docstring

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 4f5c969483..c9d4d82e82 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -252,8 +252,8 @@ def run(self):
         self.write_manifest()
 
     def write_manifest(self):
-        """Write the file list in 'self.filelist' (presumably as filled in
-        by 'add_defaults()' and 'read_template()') to the manifest file
+        """
+        Write the file list in 'self.filelist' to the manifest file
         named by 'self.manifest'.
         """
         # The manifest must be UTF-8 encodable. See #303.

From c442269b78d994fb061afddc7a1314d96f91d487 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:33:46 -0400
Subject: [PATCH 4074/8469] This code path doesn't make sense. If the
 UnicodeEncodeError occurred above, it will occur here too.

---
 setuptools/command/egg_info.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index c9d4d82e82..ed8e458a37 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -214,10 +214,6 @@ def append(self, item):
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
             except UnicodeEncodeError:
-                # Accept UTF-8 filenames even if LANG=C
-                if os.path.exists(path.encode('utf-8')):
-                    self.files.append(path)
-                else:
                     log.warn("'%s' not %s encodable -- skipping", path,
                         sys.getfilesystemencoding())
         else:

From 83658a39f37a2ece19b1f7409edc11a1bdd9cce3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:34:00 -0400
Subject: [PATCH 4075/8469] Reindent

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index ed8e458a37..f6347af9a1 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -214,8 +214,8 @@ def append(self, item):
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     self.files.append(path)
             except UnicodeEncodeError:
-                    log.warn("'%s' not %s encodable -- skipping", path,
-                        sys.getfilesystemencoding())
+                log.warn("'%s' not %s encodable -- skipping", path,
+                    sys.getfilesystemencoding())
         else:
             if os.path.exists(path):
                 self.files.append(path)

From 836f7004959909767640822caee8ad3af26a938d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:39:17 -0400
Subject: [PATCH 4076/8469] Extend docstring for
 test_write_manifest_skips_non_utf8_filenames

---
 setuptools/tests/test_sdist.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 71d10757bc..10042a44b2 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -204,7 +204,12 @@ def test_write_manifest_allows_utf8_filenames(self):
             self.assertTrue(u_filename in mm.filelist.files)
 
         def test_write_manifest_skips_non_utf8_filenames(self):
-            # Test for #303.
+            """
+            Files that cannot be encoded to UTF-8 (specifically, those that
+            weren't originally successfully decoded and have surrogate
+            escapes) should be omitted from the manifest.
+            See https://bitbucket.org/tarek/distribute/issue/303 for history.
+            """
             dist = Distribution(SETUP_ATTRS)
             dist.script_name = 'setup.py'
             mm = manifest_maker(dist)

From 2c63bb2e7c3dd6e27836630cec051e9d10891723 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:40:37 -0400
Subject: [PATCH 4077/8469] Test should use the same high-level interface for
 appending filenames as the object itself will use when building the filelist.
 Ideally, FileList wouldn't expose this attribute at all.

---
 setuptools/tests/test_sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 10042a44b2..ec940d00a2 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -224,7 +224,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             try:
                 mm.run()
                 u_filename = filename.decode('utf-8', 'surrogateescape')
-                mm.filelist.files.append(u_filename)
+                mm.filelist.append(u_filename)
                 # Re-write manifest
                 mm.write_manifest()
             finally:

From c8c9b75cbb82654b463d3175430900f58ba951ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 May 2014 23:43:19 -0400
Subject: [PATCH 4078/8469] FileList.append already excludes files that are not
 UTF-8 encodable, so rely on it when building the manifest. Ref #193

---
 setuptools/command/egg_info.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index f6347af9a1..0175bbaae7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -252,21 +252,8 @@ def write_manifest(self):
         Write the file list in 'self.filelist' to the manifest file
         named by 'self.manifest'.
         """
-        # The manifest must be UTF-8 encodable. See #303.
-        if sys.version_info >= (3,):
-            files = []
-            for file in self.filelist.files:
-                try:
-                    file.encode("utf-8")
-                except UnicodeEncodeError:
-                    log.warn("'%s' not UTF-8 encodable -- skipping" % file)
-                else:
-                    files.append(file)
-            self.filelist.files = files
-
-        files = self.filelist.files
         if os.sep!='/':
-            files = [f.replace(os.sep,'/') for f in files]
+            files = [f.replace(os.sep,'/') for f in self.filelist.files]
         self.execute(write_file, (self.manifest, files),
                      "writing manifest file '%s'" % self.manifest)
 

From 4ba4909fe29c82db4a5db4bab2c0de2e6e0b1d10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:14:24 -0400
Subject: [PATCH 4079/8469] Fix failure on non-Windows systems

---
 setuptools/command/egg_info.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 0175bbaae7..ad3f4c1719 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -252,8 +252,7 @@ def write_manifest(self):
         Write the file list in 'self.filelist' to the manifest file
         named by 'self.manifest'.
         """
-        if os.sep!='/':
-            files = [f.replace(os.sep,'/') for f in self.filelist.files]
+        files = [f.replace(os.sep, '/') for f in self.filelist.files]
         self.execute(write_file, (self.manifest, files),
                      "writing manifest file '%s'" % self.manifest)
 

From 592c525ea6ae94f6d5434e25f6db1bb8f8ff73c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:15:06 -0400
Subject: [PATCH 4080/8469] Reindent

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index ad3f4c1719..00a50d0b9d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -253,8 +253,8 @@ def write_manifest(self):
         named by 'self.manifest'.
         """
         files = [f.replace(os.sep, '/') for f in self.filelist.files]
-        self.execute(write_file, (self.manifest, files),
-                     "writing manifest file '%s'" % self.manifest)
+        msg = "writing manifest file '%s'" % self.manifest
+        self.execute(write_file, (self.manifest, files), msg)
 
     def warn(self, msg):    # suppress missing-file warnings from sdist
         if not msg.startswith("standard file not found:"):

From fb2038bb99b46b8ec92ad046b79d21c182e718a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:28:45 -0400
Subject: [PATCH 4081/8469] Extract _safe_path

---
 setuptools/command/egg_info.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 00a50d0b9d..88027dd09d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -209,17 +209,20 @@ def append(self, item):
             item = item[:-1]
         path = convert_path(item)
 
+        if self._safe_path(path):
+            self.files.append(path)
+
+    def _safe_path(self, path):
         if sys.version_info >= (3,):
             try:
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
-                    self.files.append(path)
+                    return True
             except UnicodeEncodeError:
                 log.warn("'%s' not %s encodable -- skipping", path,
                     sys.getfilesystemencoding())
         else:
             if os.path.exists(path):
-                self.files.append(path)
-
+                return True
 
 class manifest_maker(sdist):
 

From a35ca3bb2f7e025270a7b305c133b57f917e0ef2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:29:36 -0400
Subject: [PATCH 4082/8469] Use compat for Python 3 detection

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 88027dd09d..50c2096a2a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -10,7 +10,7 @@
 import distutils.errors
 from distutils import log
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring
+from setuptools.compat import basestring, PY3
 from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
@@ -213,7 +213,7 @@ def append(self, item):
             self.files.append(path)
 
     def _safe_path(self, path):
-        if sys.version_info >= (3,):
+        if PY3:
             try:
                 if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                     return True

From 9d5d875b2ba0414eeef36aa135621cb214abe463 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:33:29 -0400
Subject: [PATCH 4083/8469] Move Python 3 code to the body of the function

---
 setuptools/command/egg_info.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 50c2096a2a..bb832ea602 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -213,16 +213,15 @@ def append(self, item):
             self.files.append(path)
 
     def _safe_path(self, path):
-        if PY3:
-            try:
-                if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
-                    return True
-            except UnicodeEncodeError:
-                log.warn("'%s' not %s encodable -- skipping", path,
-                    sys.getfilesystemencoding())
-        else:
-            if os.path.exists(path):
+        if not PY3:
+            return os.path.exists(path)
+
+        try:
+            if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
                 return True
+        except UnicodeEncodeError:
+            log.warn("'%s' not %s encodable -- skipping", path,
+                sys.getfilesystemencoding())
 
 class manifest_maker(sdist):
 

From afa18c94fe1ae79db2542af2cc056e31998400d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 00:35:56 -0400
Subject: [PATCH 4084/8469] Also override extend to check paths for safety.

---
 setuptools/command/egg_info.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index bb832ea602..a2f4d4445b 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -212,6 +212,9 @@ def append(self, item):
         if self._safe_path(path):
             self.files.append(path)
 
+    def extend(self, paths):
+        self.files.extend(filter(self._safe_path, paths))
+
     def _safe_path(self, path):
         if not PY3:
             return os.path.exists(path)

From 98252c9624c564444307544bf77c7aa3828aa024 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 May 2014 09:05:37 -0400
Subject: [PATCH 4085/8469] Add a _repair method to repair the FileList after
 unsafe entries have been added.

---
 setuptools/command/egg_info.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a2f4d4445b..2097f2a91c 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -215,6 +215,16 @@ def append(self, item):
     def extend(self, paths):
         self.files.extend(filter(self._safe_path, paths))
 
+    def _repair(self):
+        """
+        Replace self.files with only safe paths
+
+        Because some owners of FileList manipulate the underlying
+        ``files`` attribute directly, this method must be called to
+        repair those paths.
+        """
+        self.files = list(filter(self._safe_path, self.files))
+
     def _safe_path(self, path):
         if not PY3:
             return os.path.exists(path)
@@ -257,6 +267,8 @@ def write_manifest(self):
         Write the file list in 'self.filelist' to the manifest file
         named by 'self.manifest'.
         """
+        self.filelist._repair()
+
         files = [f.replace(os.sep, '/') for f in self.filelist.files]
         msg = "writing manifest file '%s'" % self.manifest
         self.execute(write_file, (self.manifest, files), msg)

From 3f4f5b3b4432203163258083f9e29b75d2aaedc4 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 02:30:28 -0500
Subject: [PATCH 4086/8469] Merge in test changes from previous try

--HG--
extra : rebase_source : 0dba3308549833dc7fc5b242e8ae3a4ec9f3c119
---
 setuptools/tests/test_sdist.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ec940d00a2..ada861897d 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -156,10 +156,11 @@ def test_manifest_is_written_with_utf8_encoding(self):
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
-        if sys.version_info >= (3,):
-            self.assertTrue(posix(filename) in u_contents)
-        else:
-            self.assertTrue(posix(filename) in contents)
+        if sys.version_info < (3,):
+            fs_enc = sys.getfilesystemencoding()
+            filename = filename.decode(fs_enc)
+
+        self.assertTrue(posix(filename) in u_contents)
 
     # Python 3 only
     if sys.version_info >= (3,):
@@ -401,10 +402,17 @@ def test_sdist_with_latin1_encoded_filename(self):
                 filename = filename.decode('latin-1')
                 self.assertFalse(filename in cmd.filelist.files)
         else:
-            # No conversion takes place under Python 2 and the file
-            # is included. We shall keep it that way for BBB.
-            self.assertTrue(filename in cmd.filelist.files)
-
+            # Under Python 2 there seems to be no decoded string in the
+            # filelist.  However, due to decode and encoding of the
+            # file name to get utf-8 Manifest the latin1 maybe excluded
+            try:
+                # fs_enc should match how one is expect the decoding to
+                # be proformed for the manifest output.
+                fs_enc = sys.getfilesystemencoding() 
+                filename.decode(fs_enc)
+                self.assertTrue(filename in cmd.filelist.files)
+            except UnicodeDecodeError:
+                self.assertFalse(filename in cmd.filelist.files)
 
 class TestDummyOutput(environment.ZippedEnvironment):
 

From 60a42fcd2ae461bac7bbe93af92a9d7e0d13b746 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 02:40:07 -0500
Subject: [PATCH 4087/8469] with_statements and output utf-8 output

*Since py2.5 has been dropped, we can use future imports to
make use of with statements.

*End goal was to always decode to utf-8 in write_file on 307

--HG--
extra : rebase_source : 502ea7128f4e3b843b16c6d64d6d0b2ac56ce87d
---
 setuptools/command/egg_info.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 2097f2a91c..1eca04ad7e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -1,6 +1,7 @@
 """setuptools.command.egg_info
 
 Create a distribution's .egg-info directory and contents"""
+from __future__ import with_statement
 
 import os
 import re
@@ -10,7 +11,7 @@
 import distutils.errors
 from distutils import log
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring, PY3
+from setuptools.compat import basestring, PY3, unicode
 from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
@@ -303,11 +304,13 @@ def write_file(filename, contents):
     sequence of strings without line terminators) to it.
     """
     contents = "\n".join(contents)
-    if sys.version_info >= (3,):
-        contents = contents.encode("utf-8")
-    f = open(filename, "wb")        # always write POSIX-style manifest
-    f.write(contents)
-    f.close()
+
+    #assuming the contents has been vetted for utf-8 encoding
+    contents = contents.encode("utf-8")
+    
+    with open(filename, "wb") as f:        # always write POSIX-style manifest
+        f.write(contents)
+
 
 def write_pkg_info(cmd, basename, filename):
     log.info("writing %s", filename)

From 1718b94353733bb79043a7c6d80efeba8bd0c8d1 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 04:14:19 -0500
Subject: [PATCH 4088/8469] Starting a unicode_utils module.

--HG--
extra : source : 2e47fa11a272ed61f7c1bbf88aae27e81040fe93
---
 setuptools/unicode_utils.py | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 setuptools/unicode_utils.py

diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
new file mode 100644
index 0000000000..d2de941a69
--- /dev/null
+++ b/setuptools/unicode_utils.py
@@ -0,0 +1,41 @@
+import unicodedata
+import sys
+from setuptools.compat import unicode as decoded_string
+
+
+# HFS Plus uses decomposed UTF-8
+def decompose(path):
+    if isinstance(path, decoded_string):
+        return unicodedata.normalize('NFD', path)
+    try:
+        path = path.decode('utf-8')
+        path = unicodedata.normalize('NFD', path)
+        path = path.encode('utf-8')
+    except UnicodeError:
+        pass  # Not UTF-8
+    return path
+
+
+def filesys_decode(path):
+    """
+    Ensure that the given path is decoded,
+    NONE when no expected encoding works
+    """
+
+    fs_enc = sys.getfilesystemencoding()
+    if isinstance(path, decoded_string):
+        return path
+
+    for enc in (fs_enc, "utf-8"):
+        try:
+            return path.decode(enc)
+        except UnicodeDecodeError:
+            continue
+
+
+def try_encode(string, enc):
+    "turn unicode encoding into a functional routine"
+    try:
+        return string.encode(enc)
+    except UnicodeEncodeError:
+        return None

From cade48d7d2751fe69d81957963f0a12d1606c9f6 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 04:15:55 -0500
Subject: [PATCH 4089/8469] In corporate the old unicode with the spirit of
 what the FileList updating.

--HG--
extra : source : 199c917b8a0be209144878872269c3bd08936d6a
---
 setuptools/command/egg_info.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1eca04ad7e..33fe147e9f 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -18,6 +18,7 @@
 from pkg_resources import (parse_requirements, safe_name, parse_version,
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 from setuptools.command.sdist import walk_revctrl
+import setuptools.unicode_utils as unicode_utils
 
 
 class egg_info(Command):
@@ -227,15 +228,28 @@ def _repair(self):
         self.files = list(filter(self._safe_path, self.files))
 
     def _safe_path(self, path):
-        if not PY3:
-            return os.path.exists(path)
+        enc_warn = "'%s' not %s encodable -- skipping"
+
+        #To avoid accidental trans-codings errors, first to unicode
+        u_path = unicode_utils.filesys_decode(path)
+        if u_path is None:
+            log.warn("'%s' in unexpected encoding -- skipping" % path)
+            return False
+
+        #Must ensure utf-8 encodability
+        utf8_path = unicode_utils.try_encode(u_path, "utf-8")
+        if utf8_path is None: 
+            log.warn(enc_warn, path, 'utf-8')
+            return False
 
         try:
-            if os.path.exists(path) or os.path.exists(path.encode('utf-8')):
+            #accept is either way checks out
+            if os.path.exists(u_path) or os.path.exists(utf8_path):
                 return True
+        #this will catch any encode errors decoding u_path
         except UnicodeEncodeError:
-            log.warn("'%s' not %s encodable -- skipping", path,
-                sys.getfilesystemencoding())
+            log.warn(enc_warn, path, sys.getfilesystemencoding())
+
 
 class manifest_maker(sdist):
 
@@ -263,6 +277,10 @@ def run(self):
         self.filelist.remove_duplicates()
         self.write_manifest()
 
+    def _manifest_normalize(self, path):
+        path = unicode_utils.filesys_decode(path)
+        return path.replace(os.sep, '/')
+
     def write_manifest(self):
         """
         Write the file list in 'self.filelist' to the manifest file
@@ -270,7 +288,8 @@ def write_manifest(self):
         """
         self.filelist._repair()
 
-        files = [f.replace(os.sep, '/') for f in self.filelist.files]
+        #Now _repairs should encodability, but not unicode
+        files = [self._manifest_normalize(f) for f in self.filelist.files]
         msg = "writing manifest file '%s'" % self.manifest
         self.execute(write_file, (self.manifest, files), msg)
 

From 3d6068d5f67f044b2e37711b6275d58915e41895 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:09:26 -0400
Subject: [PATCH 4090/8469] with_statement is available naturally in Python 2.6

---
 setuptools.egg-info/requires.txt | 8 ++++----
 setuptools/command/egg_info.py   | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e5db30adfb..a49a923ef5 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
 
 
-[ssl:sys_platform=='win32']
-wincertstore==0.2
-
 [certs]
-certifi==1.0.1
\ No newline at end of file
+certifi==1.0.1
+
+[ssl:sys_platform=='win32']
+wincertstore==0.2
\ No newline at end of file
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 33fe147e9f..22501c442b 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -1,7 +1,6 @@
 """setuptools.command.egg_info
 
 Create a distribution's .egg-info directory and contents"""
-from __future__ import with_statement
 
 import os
 import re
@@ -238,7 +237,7 @@ def _safe_path(self, path):
 
         #Must ensure utf-8 encodability
         utf8_path = unicode_utils.try_encode(u_path, "utf-8")
-        if utf8_path is None: 
+        if utf8_path is None:
             log.warn(enc_warn, path, 'utf-8')
             return False
 
@@ -326,7 +325,7 @@ def write_file(filename, contents):
 
     #assuming the contents has been vetted for utf-8 encoding
     contents = contents.encode("utf-8")
-    
+
     with open(filename, "wb") as f:        # always write POSIX-style manifest
         f.write(contents)
 

From 86ecb2c3ff6b8df273e153bc06d320472ce262c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:13:19 -0400
Subject: [PATCH 4091/8469] Compute PY3 directly and switch on that for
 clarity.

---
 setuptools/compat.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 7b824ba2ff..ec77127d93 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -1,9 +1,9 @@
 import sys
 import itertools
 
-if sys.version_info[0] < 3:
-    PY3 = False
+PY3 = sys.version_info >= (3,)
 
+if not PY3:
     basestring = basestring
     import __builtin__ as builtins
     import ConfigParser
@@ -34,9 +34,8 @@
 
     exec("""def reraise(tp, value, tb=None):
     raise tp, value, tb""")
-else:
-    PY3 = True
 
+if PY3:
     basestring = str
     import builtins
     import configparser as ConfigParser

From 3c85da71f22c43041e7475b01b4683f22fc3a618 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:14:46 -0400
Subject: [PATCH 4092/8469] Add a PY2 also.

---
 setuptools/compat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index ec77127d93..7397d7fa17 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -2,8 +2,9 @@
 import itertools
 
 PY3 = sys.version_info >= (3,)
+PY2 = not PY3
 
-if not PY3:
+if PY2:
     basestring = basestring
     import __builtin__ as builtins
     import ConfigParser

From 8567ca65adbf927a0af5c9b7314688dfbc46ab66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:25:31 -0400
Subject: [PATCH 4093/8469] Use PY3 and PY2 throughout

---
 setuptools/command/develop.py      |  8 +++++---
 setuptools/command/easy_install.py | 10 +++++-----
 setuptools/command/egg_info.py     |  2 +-
 setuptools/command/sdist.py        |  3 ++-
 setuptools/command/test.py         |  9 ++++-----
 setuptools/dist.py                 |  4 ++--
 setuptools/svn_utils.py            | 18 +++++++++---------
 setuptools/tests/test_resources.py |  5 ++---
 setuptools/tests/test_sdist.py     | 24 ++++++++++++------------
 setuptools/tests/test_test.py      |  4 ++--
 10 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 1d500040d0..129184cad0 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,6 +5,8 @@
 from distutils.errors import DistutilsError, DistutilsOptionError
 import os, sys, setuptools, glob
 
+from setuptools.compat import PY3
+
 class develop(easy_install):
     """Set up package for development"""
 
@@ -84,7 +86,7 @@ def finalize_options(self):
                 " installation directory", p, normalize_path(os.curdir))
 
     def install_for_development(self):
-        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
+        if PY3 and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
@@ -99,7 +101,7 @@ def install_for_development(self):
 
             self.reinitialize_command('build_ext', inplace=0)
             self.run_command('build_ext')
-            
+
             # Fixup egg-link and easy-install.pth
             ei_cmd = self.get_finalized_command("egg_info")
             self.egg_path = build_path
@@ -112,7 +114,7 @@ def install_for_development(self):
             # Build extensions in-place
             self.reinitialize_command('build_ext', inplace=1)
             self.run_command('build_ext')
-        
+
         self.install_site_py()  # ensure that target dir is site-safe
         if setuptools.bootstrap_install_from:
             self.easy_install(setuptools.bootstrap_install_from)
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a5f324e3dd..ad7f472512 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -47,7 +47,7 @@
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
 from setuptools.compat import (iteritems, maxsize, basestring, unicode,
-                               reraise)
+                               reraise, PY2, PY3)
 from pkg_resources import (
     yield_lines, normalize_path, resource_string, ensure_directory,
     get_distribution, find_distributions, Environment, Requirement,
@@ -75,7 +75,7 @@ def samefile(p1, p2):
     norm_p2 = os.path.normpath(os.path.normcase(p2))
     return norm_p1 == norm_p2
 
-if sys.version_info <= (3,):
+if PY2:
     def _to_ascii(s):
         return s
     def isascii(s):
@@ -1187,7 +1187,7 @@ def install_site_py(self):
             f = open(sitepy,'rb')
             current = f.read()
             # we want str, not bytes
-            if sys.version_info >= (3,):
+            if PY3:
                 current = current.decode()
 
             f.close()
@@ -1409,7 +1409,7 @@ def get_exe_prefixes(exe_filename):
                 continue
             if parts[0].upper() in ('PURELIB','PLATLIB'):
                 contents = z.read(name)
-                if sys.version_info >= (3,):
+                if PY3:
                     contents = contents.decode()
                 for pth in yield_lines(contents):
                     pth = pth.strip().replace('\\','/')
@@ -1855,7 +1855,7 @@ def get_win_launcher(type):
 
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
-    if sys.version_info[0] < 3:
+    if PY2:
         return manifest % vars()
     else:
         return manifest.decode('utf-8') % vars()
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 22501c442b..646f94607a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -128,7 +128,7 @@ def write_file(self, what, filename, data):
         to the file.
         """
         log.info("writing %s to %s", what, filename)
-        if sys.version_info >= (3,):
+        if PY3:
             data = data.encode("utf-8")
         if not self.dry_run:
             f = open(filename, 'wb')
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 948d27fafb..f9a5b7b919 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -8,6 +8,7 @@
 from distutils.util import convert_path
 from distutils import log
 from setuptools import svn_utils
+from setuptools.compat import PY3
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -230,7 +231,7 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             # The manifest must contain UTF-8. See #303.
-            if sys.version_info >= (3,):
+            if PY3:
                 try:
                     line = line.decode('UTF-8')
                 except UnicodeDecodeError:
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 7422b71907..3c3581a9a7 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -8,6 +8,7 @@
     normalize_path, working_set, _namespace_packages, add_activation_listener,
     require, EntryPoint)
 
+from setuptools.compat import PY3
 from setuptools.py31compat import unittest_main
 
 
@@ -87,10 +88,8 @@ def finalize_options(self):
             self.test_runner = getattr(self.distribution, 'test_runner', None)
 
     def with_project_on_sys_path(self, func):
-        with_2to3 = (
-            sys.version_info >= (3,)
-            and getattr(self.distribution, 'use_2to3', False)
-        )
+        with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)
+
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
 
@@ -149,7 +148,7 @@ def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
-        if sys.version_info >= (3,) and getattr(self.distribution, 'use_2to3', False):
+        if PY3 and getattr(self.distribution, 'use_2to3', False):
             module = self.test_args[-1].split('.')[0]
             if module in _namespace_packages:
                 del_modules = []
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 59a892362c..b8bd7490fb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,7 +13,7 @@
     DistutilsSetupError)
 
 from setuptools.depends import Require
-from setuptools.compat import numeric_types, basestring
+from setuptools.compat import numeric_types, basestring, PY2
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -629,7 +629,7 @@ def handle_display_options(self, option_order):
         """
         import sys
 
-        if sys.version_info < (3,) or self.help_commands:
+        if PY2 or self.help_commands:
             return _Distribution.handle_display_options(self, option_order)
 
         # Stdout may be StringIO (e.g. in tests)
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 8fc552fa73..2dcfd89913 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -8,7 +8,7 @@
 import codecs
 import unicodedata
 import warnings
-from setuptools.compat import unicode
+from setuptools.compat import unicode, PY2
 from setuptools.py31compat import TemporaryDirectory
 from xml.sax.saxutils import unescape
 
@@ -60,7 +60,7 @@ def _get_target_property(target):
 
 
 def _get_xml_data(decoded_str):
-    if sys.version_info < (3, 0):
+    if PY2:
         #old versions want an encoded string
         data = decoded_str.encode('utf-8')
     else:
@@ -180,12 +180,12 @@ def parse_external_prop(lines):
         if not line:
             continue
 
-        if sys.version_info < (3, 0):
+        if PY2:
             #shlex handles NULLs just fine and shlex in 2.7 tries to encode
             #as ascii automatiically
             line = line.encode('utf-8')
         line = shlex.split(line)
-        if sys.version_info < (3, 0):
+        if PY2:
             line = [x.decode('utf-8') for x in line]
 
         #EXT_FOLDERNAME is either the first or last depending on where
@@ -232,13 +232,13 @@ class SvnInfo(object):
     @staticmethod
     def get_svn_version():
         # Temp config directory should be enough to check for repository
-        # This is needed because .svn always creates .subversion and 
+        # This is needed because .svn always creates .subversion and
         # some operating systems do not handle dot directory correctly.
         # Real queries in real svn repos with be concerned with it creation
         with TemporaryDirectory() as tempdir:
-            code, data = _run_command(['svn', 
+            code, data = _run_command(['svn',
                                        '--config-dir', tempdir,
-                                       '--version', 
+                                       '--version',
                                        '--quiet'])
 
         if code == 0 and data:
@@ -258,11 +258,11 @@ def load(cls, dirname=''):
         normdir = os.path.normpath(dirname)
 
         # Temp config directory should be enough to check for repository
-        # This is needed because .svn always creates .subversion and 
+        # This is needed because .svn always creates .subversion and
         # some operating systems do not handle dot directory correctly.
         # Real queries in real svn repos with be concerned with it creation
         with TemporaryDirectory() as tempdir:
-            code, data = _run_command(['svn', 
+            code, data = _run_command(['svn',
                                        '--config-dir', tempdir,
                                        'info', normdir])
 
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c9fcf76c9b..443905cc24 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -15,7 +15,7 @@
 
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
-from setuptools.compat import StringIO, iteritems
+from setuptools.compat import StringIO, iteritems, PY3
 
 try:
     frozenset
@@ -522,8 +522,7 @@ def test_get_script_header(self):
 
     def test_get_script_header_jython_workaround(self):
         # This test doesn't work with Python 3 in some locales
-        if (sys.version_info >= (3,) and os.environ.get("LC_CTYPE")
-                in (None, "C", "POSIX")):
+        if PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
             return
 
         class java:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ada861897d..231b40d07c 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -12,7 +12,7 @@
 from setuptools.tests import environment, test_svn
 from setuptools.tests.py26compat import skipIf
 
-from setuptools.compat import StringIO, unicode
+from setuptools.compat import StringIO, unicode, PY3, PY2
 from setuptools.tests.py26compat import skipIf
 from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
@@ -34,7 +34,7 @@
 """ % SETUP_ATTRS
 
 
-if sys.version_info >= (3,):
+if PY3:
     LATIN1_FILENAME = 'smörbröd.py'.encode('latin-1')
 else:
     LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
@@ -52,14 +52,14 @@ def unquiet():
 
 # Fake byte literals for Python <= 2.5
 def b(s, encoding='utf-8'):
-    if sys.version_info >= (3,):
+    if PY3:
         return s.encode(encoding)
     return s
 
 
 # Convert to POSIX path
 def posix(path):
-    if sys.version_info >= (3,) and not isinstance(path, str):
+    if PY3 and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')
@@ -156,14 +156,14 @@ def test_manifest_is_written_with_utf8_encoding(self):
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
-        if sys.version_info < (3,):
+        if PY2:
             fs_enc = sys.getfilesystemencoding()
             filename = filename.decode(fs_enc)
 
         self.assertTrue(posix(filename) in u_contents)
 
     # Python 3 only
-    if sys.version_info >= (3,):
+    if PY3:
 
         def test_write_manifest_allows_utf8_filenames(self):
             # Test for #303.
@@ -281,12 +281,12 @@ def test_manifest_is_read_with_utf8_encoding(self):
             unquiet()
 
         # The filelist should contain the UTF-8 filename
-        if sys.version_info >= (3,):
+        if PY3:
             filename = filename.decode('utf-8')
         self.assertTrue(filename in cmd.filelist.files)
 
     # Python 3 only
-    if sys.version_info >= (3,):
+    if PY3:
 
         def test_read_manifest_skips_non_utf8_filenames(self):
             # Test for #303.
@@ -328,7 +328,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
-    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
+    @skipIf(PY3 and locale.getpreferredencoding() != 'UTF-8',
             'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
@@ -350,7 +350,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         if sys.platform == 'darwin':
             filename = decompose(filename)
 
-        if sys.version_info >= (3,):
+        if PY3:
             fs_enc = sys.getfilesystemencoding()
 
             if sys.platform == 'win32':
@@ -385,7 +385,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         finally:
             unquiet()
 
-        if sys.version_info >= (3,):
+        if PY3:
             #not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
                 # Latin-1 is similar to Windows-1252 however
@@ -408,7 +408,7 @@ def test_sdist_with_latin1_encoded_filename(self):
             try:
                 # fs_enc should match how one is expect the decoding to
                 # be proformed for the manifest output.
-                fs_enc = sys.getfilesystemencoding() 
+                fs_enc = sys.getfilesystemencoding()
                 filename.decode(fs_enc)
                 self.assertTrue(filename in cmd.filelist.files)
             except UnicodeDecodeError:
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index f85123b05e..df92085e5d 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -10,7 +10,7 @@
 import unittest
 
 from distutils.errors import DistutilsError
-from setuptools.compat import StringIO
+from setuptools.compat import StringIO, PY2
 from setuptools.command.test import test
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -34,7 +34,7 @@
     __path__ = extend_path(__path__, __name__)
 """
 # Make sure this is Latin-1 binary, before writing:
-if sys.version_info < (3,):
+if PY2:
     NS_INIT = NS_INIT.decode('UTF-8')
 NS_INIT = NS_INIT.encode('Latin-1')
 

From cac29acff1a8b95f3d11f8bca8015d5e7c67036a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:38:16 -0400
Subject: [PATCH 4094/8469] Convert quiet to a context manager, so its comment
 is no longer complaining and to simplify the code.

---
 setuptools/tests/test_sdist.py | 61 +++++++++-------------------------
 1 file changed, 16 insertions(+), 45 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 231b40d07c..93b8c2977e 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,6 +9,7 @@
 import unittest
 import unicodedata
 import re
+import contextlib
 from setuptools.tests import environment, test_svn
 from setuptools.tests.py26compat import skipIf
 
@@ -41,13 +42,14 @@
 
 
 # Cannot use context manager because of Python 2.4
+@contextlib.contextmanager
 def quiet():
-    global old_stdout, old_stderr
     old_stdout, old_stderr = sys.stdout, sys.stderr
     sys.stdout, sys.stderr = StringIO(), StringIO()
-
-def unquiet():
-    sys.stdout, sys.stderr = old_stdout, old_stderr
+    try:
+        yield
+    finally:
+        sys.stdout, sys.stderr = old_stdout, old_stderr
 
 
 # Fake byte literals for Python <= 2.5
@@ -112,12 +114,8 @@ def test_package_data_in_sdist(self):
         cmd = sdist(dist)
         cmd.ensure_finalized()
 
-        # squelch output
-        quiet()
-        try:
+        with quiet():
             cmd.run()
-        finally:
-            unquiet()
 
         manifest = cmd.filelist.files
         self.assertTrue(os.path.join('sdist_test', 'a.txt') in manifest)
@@ -136,13 +134,10 @@ def test_manifest_is_written_with_utf8_encoding(self):
         filename = os.path.join('sdist_test', 'smörbröd.py')
 
         # Add UTF-8 filename and write manifest
-        quiet()
-        try:
+        with quiet():
             mm.run()
             mm.filelist.files.append(filename)
             mm.write_manifest()
-        finally:
-            unquiet()
 
         manifest = open(mm.manifest, 'rbU')
         contents = manifest.read()
@@ -177,15 +172,12 @@ def test_write_manifest_allows_utf8_filenames(self):
             filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
 
             # Add filename and write manifest
-            quiet()
-            try:
+            with quiet():
                 mm.run()
                 u_filename = filename.decode('utf-8')
                 mm.filelist.files.append(u_filename)
                 # Re-write manifest
                 mm.write_manifest()
-            finally:
-                unquiet()
 
             manifest = open(mm.manifest, 'rbU')
             contents = manifest.read()
@@ -221,15 +213,12 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
 
             # Add filename with surrogates and write manifest
-            quiet()
-            try:
+            with quiet():
                 mm.run()
                 u_filename = filename.decode('utf-8', 'surrogateescape')
                 mm.filelist.append(u_filename)
                 # Re-write manifest
                 mm.write_manifest()
-            finally:
-                unquiet()
 
             manifest = open(mm.manifest, 'rbU')
             contents = manifest.read()
@@ -256,11 +245,8 @@ def test_manifest_is_read_with_utf8_encoding(self):
         cmd.ensure_finalized()
 
         # Create manifest
-        quiet()
-        try:
+        with quiet():
             cmd.run()
-        finally:
-            unquiet()
 
         # Add UTF-8 filename to manifest
         filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
@@ -274,11 +260,8 @@ def test_manifest_is_read_with_utf8_encoding(self):
 
         # Re-read manifest
         cmd.filelist.files = []
-        quiet()
-        try:
+        with quiet():
             cmd.read_manifest()
-        finally:
-            unquiet()
 
         # The filelist should contain the UTF-8 filename
         if PY3:
@@ -296,11 +279,8 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             cmd.ensure_finalized()
 
             # Create manifest
-            quiet()
-            try:
+            with quiet():
                 cmd.run()
-            finally:
-                unquiet()
 
             # Add Latin-1 filename to manifest
             filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
@@ -314,15 +294,12 @@ def test_read_manifest_skips_non_utf8_filenames(self):
 
             # Re-read manifest
             cmd.filelist.files = []
-            quiet()
-            try:
+            with quiet():
                 try:
                     cmd.read_manifest()
                 except UnicodeDecodeError:
                     e = sys.exc_info()[1]
                     self.fail(e)
-            finally:
-                unquiet()
 
             # The Latin-1 filename should have been skipped
             filename = filename.decode('latin-1')
@@ -341,11 +318,8 @@ def test_sdist_with_utf8_encoded_filename(self):
         filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
         open(filename, 'w').close()
 
-        quiet()
-        try:
+        with quiet():
             cmd.run()
-        finally:
-            unquiet()
 
         if sys.platform == 'darwin':
             filename = decompose(filename)
@@ -379,11 +353,8 @@ def test_sdist_with_latin1_encoded_filename(self):
         open(filename, 'w').close()
         self.assertTrue(os.path.isfile(filename))
 
-        quiet()
-        try:
+        with quiet():
             cmd.run()
-        finally:
-            unquiet()
 
         if PY3:
             #not all windows systems have a default FS encoding of cp1252

From c5d760b060efa63e8de92bc5d1b1e56700ff16e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 12:38:54 -0400
Subject: [PATCH 4095/8469] Remove unused import

---
 setuptools/tests/test_sdist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 93b8c2977e..d2188035a7 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -14,7 +14,6 @@
 from setuptools.tests.py26compat import skipIf
 
 from setuptools.compat import StringIO, unicode, PY3, PY2
-from setuptools.tests.py26compat import skipIf
 from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution

From 999a55b7526f857af17d3c85579c7d9380c5baa8 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 11:15:44 -0500
Subject: [PATCH 4096/8469] est_manifest_is_written_with_utf8_encoding should
 use the filelist's append, NOT filelist.files.append

--HG--
extra : rebase_source : cdf0df0a11b96a60c29c10483579e6e043a7fcd1
---
 setuptools/tests/test_sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index d2188035a7..9d2cc54f95 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -135,7 +135,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # Add UTF-8 filename and write manifest
         with quiet():
             mm.run()
-            mm.filelist.files.append(filename)
+            mm.filelist.append(filename)
             mm.write_manifest()
 
         manifest = open(mm.manifest, 'rbU')

From 3e5d3adf96b78fa10f1d1172b4dff32e4366a0ee Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 11:40:08 -0500
Subject: [PATCH 4097/8469] Must create files for tests, else they are remoed
 from manifests

--HG--
extra : rebase_source : c22b55cde69bbf7fc6a075bcd8797017797c6225
---
 setuptools/tests/test_sdist.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 9d2cc54f95..97ac51565e 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -75,7 +75,7 @@ def decompose(path):
         path = unicodedata.normalize('NFD', path)
         path = path.encode('utf-8')
     except UnicodeError:
-        pass # Not UTF-8
+        pass  # Not UTF-8
     return path
 
 
@@ -132,6 +132,9 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # UTF-8 filename
         filename = os.path.join('sdist_test', 'smörbröd.py')
 
+        # Must create the file or it will get stripped.
+        open(filename, 'w').close()
+
         # Add UTF-8 filename and write manifest
         with quiet():
             mm.run()
@@ -251,7 +254,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
         filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         manifest = open(cmd.manifest, 'ab')
-        manifest.write(b('\n')+filename)
+        manifest.write(b('\n') + filename)
         manifest.close()
 
         # The file must exist to be included in the filelist
@@ -285,7 +288,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
             cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
             manifest = open(cmd.manifest, 'ab')
-            manifest.write(b('\n')+filename)
+            manifest.write(b('\n') + filename)
             manifest.close()
 
             # The file must exist to be included in the filelist
@@ -356,7 +359,7 @@ def test_sdist_with_latin1_encoded_filename(self):
             cmd.run()
 
         if PY3:
-            #not all windows systems have a default FS encoding of cp1252
+            # not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
                 # Latin-1 is similar to Windows-1252 however
                 # on mbcs filesys it is not in latin-1 encoding
@@ -467,7 +470,7 @@ def setUp(self):
         elif self.base_version < (1, 3):
             raise ValueError('Insufficient SVN Version %s' % version)
         elif self.base_version >= (1, 9):
-            #trying the latest version
+            # trying the latest version
             self.base_version = (1, 8)
 
         self.dataname = "svn%i%i_example" % self.base_version
@@ -484,7 +487,7 @@ def test_walksvn(self):
             folder2 = 'third_party2'
             folder3 = 'third_party3'
 
-        #TODO is this right
+        # TODO is this right
         expected = set([
             os.path.join('a file'),
             os.path.join(folder2, 'Changes.txt'),

From ab8f277a286587dbfeee2e1e21a57f4744aaddd6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 13:16:58 -0400
Subject: [PATCH 4098/8469] Must create files for tests, else they are remoed
 from manifests

---
 setuptools/tests/test_sdist.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 97ac51565e..f4a492daf4 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -173,6 +173,9 @@ def test_write_manifest_allows_utf8_filenames(self):
             # UTF-8 filename
             filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
 
+            #Must touch the file or risk removal
+            open(filename, "w").close()
+
             # Add filename and write manifest
             with quiet():
                 mm.run()

From f84506654ff8199b07bb4eab8b210de25eb546f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 13:23:20 -0400
Subject: [PATCH 4099/8469] Add whitespace for readability.

---
 setuptools/tests/test_sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f4a492daf4..5b3862e998 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -173,7 +173,7 @@ def test_write_manifest_allows_utf8_filenames(self):
             # UTF-8 filename
             filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
 
-            #Must touch the file or risk removal
+            # Must touch the file or risk removal
             open(filename, "w").close()
 
             # Add filename and write manifest

From e96e4f96a6697678e85e8b8b5d261a477586c4e6 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 15:44:25 -0500
Subject: [PATCH 4100/8469] Must add zipinfo as a property

--HG--
extra : rebase_source : 2ae5fa38bd5c9d37b44a010879f2b3a4867c0ee4
---
 pkg_resources.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index fd1663c234..1df322b6ff 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1621,6 +1621,10 @@ def _parts(self, zip_path):
             "%s is not a subpath of %s" % (fspath, self.egg_root)
         )
 
+    @property
+    def zipinfo(self):
+        return build_zipmanifest(self.loader.archive)  # memoized
+
     def get_resource_filename(self, manager, resource_name):
         if not self.egg_name:
             raise NotImplementedError(

From c1d08d7441c9fc059241232eb7323d2a90d12b6e Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 17 May 2014 16:12:20 -0500
Subject: [PATCH 4101/8469] PY26 doesn't have assertIn

--HG--
branch : develop
extra : rebase_source : a891af85b68115431db3fe42acf5a102e02aa8b9
---
 setuptools/tests/test_egg_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4c41a2ccd9..7531e37c1f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -155,7 +155,7 @@ def test_svn_tags(self):
             infile.close()
             del infile
 
-        self.assertIn("Version: 0.1.1-r1\n", read_contents)
+        self.assertTrue("Version: 0.1.1-r1\n" in read_contents)
 
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_no_tags(self):
@@ -173,7 +173,7 @@ def test_no_tags(self):
             infile.close()
             del infile
 
-        self.assertIn("Version: 0.1.1\n", read_contents)
+        self.assertTrue("Version: 0.1.1\n" in read_contents)
 
 
 class TestSvnDummyLegacy(environment.ZippedEnvironment):

From 60beb22b4ca7e7d4f549c7137c7a20a633d72916 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 18:58:29 -0400
Subject: [PATCH 4102/8469] Extract variable

---
 setuptools/command/egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 646f94607a..169fcd3e1c 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -358,7 +358,8 @@ def warn_depends_obsolete(cmd, basename, filename):
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
     data = ['\n'.join(yield_lines(dist.install_requires or ()))]
-    for extra,reqs in (dist.extras_require or {}).items():
+    extras_require = dist.extras_require or {}
+    for extra,reqs in extras_require.items():
         data.append('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs))))
     cmd.write_or_delete_file("requirements", filename, ''.join(data))
 

From 380e609d0d788edbdc5808f6d58c6c730a78cb3a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 19:02:55 -0400
Subject: [PATCH 4103/8469] Write requirements in a deterministic order.

---
 setuptools/command/egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 169fcd3e1c..38a01fbf6e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -359,7 +359,8 @@ def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
     data = ['\n'.join(yield_lines(dist.install_requires or ()))]
     extras_require = dist.extras_require or {}
-    for extra,reqs in extras_require.items():
+    for extra in sorted(extras_require):
+        reqs = extras_require[extra]
         data.append('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs))))
     cmd.write_or_delete_file("requirements", filename, ''.join(data))
 

From faae7b49cab317203b07d4a418ee7b68c7afb48e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 19:14:29 -0400
Subject: [PATCH 4104/8469] Use StringIO to write out requirements. Use more
 common convention of adding newline to each line of the file, not just
 intervening lines.

---
 setuptools/command/egg_info.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 38a01fbf6e..470ba4662c 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -5,6 +5,7 @@
 import os
 import re
 import sys
+import io
 
 from setuptools import Command
 import distutils.errors
@@ -355,14 +356,21 @@ def warn_depends_obsolete(cmd, basename, filename):
         )
 
 
+def _write_requirements(stream, reqs):
+    lines = yield_lines(reqs or ())
+    append_cr = lambda line: line + '\n'
+    lines = map(append_cr, lines)
+    stream.writelines(lines)
+
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
-    data = ['\n'.join(yield_lines(dist.install_requires or ()))]
+    data = io.StringIO()
+    _write_requirements(data, dist.install_requires)
     extras_require = dist.extras_require or {}
     for extra in sorted(extras_require):
-        reqs = extras_require[extra]
-        data.append('\n\n[%s]\n%s' % (extra, '\n'.join(yield_lines(reqs))))
-    cmd.write_or_delete_file("requirements", filename, ''.join(data))
+        data.write('\n[{extra}]\n'.format(**vars()))
+        _write_requirements(data, extras_require[extra])
+    cmd.write_or_delete_file("requirements", filename, data.getvalue())
 
 def write_toplevel_names(cmd, basename, filename):
     pkgs = dict.fromkeys(

From aa8f6bed2212ae82ededad4b2985cec25f8c1db9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 19:14:54 -0400
Subject: [PATCH 4105/8469] Update requires.txt to match new, predictable
 order.

---
 setuptools.egg-info/requires.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923ef5..4fa66c7141 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,6 @@
 
-
 [certs]
 certifi==1.0.1
 
 [ssl:sys_platform=='win32']
-wincertstore==0.2
\ No newline at end of file
+wincertstore==0.2

From 95ca77339cdcd24fc1193b701c979e5f6fa72335 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 19:26:30 -0400
Subject: [PATCH 4106/8469] Restore Python 2 compatibility.

---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 470ba4662c..9019524db3 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -364,7 +364,7 @@ def _write_requirements(stream, reqs):
 
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
-    data = io.StringIO()
+    data = io.StringIO() if PY3 else io.BytesIO()
     _write_requirements(data, dist.install_requires)
     extras_require = dist.extras_require or {}
     for extra in sorted(extras_require):

From 02abac6610d70781ee9be1a1f10377b7b04bfd0a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 20:02:30 -0400
Subject: [PATCH 4107/8469] Use context managers to reliably close files

---
 ez_setup.py | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 732fffc935..a05069b22a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -183,14 +183,11 @@ def has_powershell():
     if platform.system() != 'Windows':
         return False
     cmd = ['powershell', '-Command', 'echo test']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
         except Exception:
             return False
-    finally:
-        devnull.close()
     return True
 
 download_file_powershell.viable = has_powershell
@@ -201,14 +198,11 @@ def download_file_curl(url, target):
 
 def has_curl():
     cmd = ['curl', '--version']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
         except Exception:
             return False
-    finally:
-        devnull.close()
     return True
 
 download_file_curl.viable = has_curl
@@ -219,14 +213,11 @@ def download_file_wget(url, target):
 
 def has_wget():
     cmd = ['wget', '--version']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
         except Exception:
             return False
-    finally:
-        devnull.close()
     return True
 
 download_file_wget.viable = has_wget
@@ -240,19 +231,16 @@ def download_file_insecure(url, target):
         from urllib.request import urlopen
     except ImportError:
         from urllib2 import urlopen
-    src = dst = None
+    src = urlopen(url)
     try:
-        src = urlopen(url)
-        # Read/write all in one block, so we don't create a corrupt file
-        # if the download is interrupted.
+        # Read all the data in one block.
         data = src.read()
-        dst = open(target, "wb")
-        dst.write(data)
     finally:
-        if src:
-            src.close()
-        if dst:
-            dst.close()
+        src.close()
+
+    # Write all the data in one block to avoid creating a partial file.
+    with open(target, "wb") as dst:
+        dst.write(data)
 
 download_file_insecure.viable = lambda: True
 

From aae75a3d3f81aaa8a6bfadb5885b936ec2db59da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 20:04:40 -0400
Subject: [PATCH 4108/8469] Move import to the top

---
 ez_setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a05069b22a..4c78d85288 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -26,6 +26,11 @@
 
 from distutils import log
 
+try:
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import urlopen
+
 try:
     from site import USER_SITE
 except ImportError:
@@ -227,10 +232,6 @@ def download_file_insecure(url, target):
     Use Python to download the file, even though it cannot authenticate the
     connection.
     """
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
     src = urlopen(url)
     try:
         # Read all the data in one block.

From 469c889e37ef184a78fb7b58505858e5ceea0f37 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 20:14:20 -0400
Subject: [PATCH 4109/8469] Use iterables for getting best downloader

---
 ez_setup.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4c78d85288..2c433d61a5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -246,16 +246,14 @@ def download_file_insecure(url, target):
 download_file_insecure.viable = lambda: True
 
 def get_best_downloader():
-    downloaders = [
+    downloaders = (
         download_file_powershell,
         download_file_curl,
         download_file_wget,
         download_file_insecure,
-    ]
-
-    for dl in downloaders:
-        if dl.viable():
-            return dl
+    )
+    viable_downloaders = (dl for dl in downloaders if dl.viable())
+    return next(viable_downloaders, None)
 
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, delay=15, downloader_factory=get_best_downloader):

From 365ca3bd6b4353a8caec406bc2aaec73650ec554 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 20:22:41 -0400
Subject: [PATCH 4110/8469] Actually call close on exit

---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2c433d61a5..a6c3ef4856 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -77,7 +77,7 @@ class ContextualZipFile(zipfile.ZipFile):
         def __enter__(self):
             return self
         def __exit__(self, type, value, traceback):
-            self.close
+            self.close()
     return zipfile.ZipFile if hasattr(zipfile.ZipFile, '__exit__') else \
         ContextualZipFile
 

From 20ee765db785160ee8cb3ec682a155062c024543 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 20:24:17 -0400
Subject: [PATCH 4111/8469] Refactor test

---
 ez_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a6c3ef4856..8d2199d531 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -78,8 +78,8 @@ def __enter__(self):
             return self
         def __exit__(self, type, value, traceback):
             self.close()
-    return zipfile.ZipFile if hasattr(zipfile.ZipFile, '__exit__') else \
-        ContextualZipFile
+    zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
+    return zipfile.ZipFile if zf_has_exit else ContextualZipFile
 
 
 @contextlib.contextmanager

From f78c3beaa55d4026b92703b18d9b54b7e4985e3d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 21:36:14 -0400
Subject: [PATCH 4112/8469] Use context manager

---
 pkg_resources.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 372480ea51..63a31fb8fd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1507,11 +1507,8 @@ def get_resource_stream(self, manager, resource_name):
         return open(self._fn(self.module_path, resource_name), 'rb')
 
     def _get(self, path):
-        stream = open(path, 'rb')
-        try:
+        with open(path, 'rb') as stream:
             return stream.read()
-        finally:
-            stream.close()
 
 register_loader_type(type(None), DefaultProvider)
 

From c671c5da8e8b85ecdbb372074fd5531f385113d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 21:56:27 -0400
Subject: [PATCH 4113/8469] Replace get_zip_class with a specialized
 constructor.

---
 ez_setup.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 8d2199d531..53350e45a8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -69,17 +69,25 @@ def _build_egg(egg, archive_filename, to_dir):
         raise IOError('Could not build the egg.')
 
 
-def get_zip_class():
+class ContextualZipFile(zipfile.ZipFile):
     """
     Supplement ZipFile class to support context manager for Python 2.6
     """
-    class ContextualZipFile(zipfile.ZipFile):
-        def __enter__(self):
-            return self
-        def __exit__(self, type, value, traceback):
-            self.close()
-    zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
-    return zipfile.ZipFile if zf_has_exit else ContextualZipFile
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    @classmethod
+    def compat(cls, *args, **kwargs):
+        """
+        Construct a ZipFile or ContextualZipFile as appropriate
+        """
+        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
+        class_ = zipfile.ZipFile if zf_has_exit else cls
+        return class_(*args, **kwargs)
 
 
 @contextlib.contextmanager
@@ -90,7 +98,7 @@ def archive_context(filename):
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        with get_zip_class()(filename) as archive:
+        with ContextualZipFile.compat(filename) as archive:
             archive.extractall()
 
         # going in the directory

From ec81e4dca2f1735bb1ac787b464a9d0f915dd7b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 22:04:35 -0400
Subject: [PATCH 4114/8469] Use ContextualZipFile for context manager support

---
 pkg_resources.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 63a31fb8fd..ba03f62804 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1551,18 +1551,35 @@ def build_zipmanifest(path):
       * [7] - zipinfo.CRC
     """
     zipinfo = dict()
-    zfile = zipfile.ZipFile(path)
-    #Got ZipFile has not __exit__ on python 3.1
-    try:
+    with ContextualZipFile.compat(path) as zfile:
         for zitem in zfile.namelist():
             zpath = zitem.replace('/', os.sep)
             zipinfo[zpath] = zfile.getinfo(zitem)
             assert zipinfo[zpath] is not None
-    finally:
-        zfile.close()
     return zipinfo
 
 
+class ContextualZipFile(zipfile.ZipFile):
+    """
+    Supplement ZipFile class to support context manager for Python 2.6
+    """
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    @classmethod
+    def compat(cls, *args, **kwargs):
+        """
+        Construct a ZipFile or ContextualZipFile as appropriate
+        """
+        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
+        class_ = zipfile.ZipFile if zf_has_exit else cls
+        return class_(*args, **kwargs)
+
+
 class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 

From 24d18354d9a2646d5192f959434c1044f7e7fbd4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 22:19:13 -0400
Subject: [PATCH 4115/8469] Use context managers in pkg_resources

---
 pkg_resources.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ba03f62804..4c28d72ceb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1694,9 +1694,8 @@ def _is_current(self, file_path, zip_path):
             return False
         # check that the contents match
         zip_contents = self.loader.get_data(zip_path)
-        f = open(file_path, 'rb')
-        file_contents = f.read()
-        f.close()
+        with open(file_path, 'rb') as f:
+            file_contents = f.read()
         return zip_contents == file_contents
 
     def _get_eager_resources(self):
@@ -1764,9 +1763,8 @@ def has_metadata(self, name):
 
     def get_metadata(self, name):
         if name=='PKG-INFO':
-            f = open(self.path,'rU')
-            metadata = f.read()
-            f.close()
+            with open(self.path,'rU') as f:
+                metadata = f.read()
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")
 
@@ -1889,11 +1887,8 @@ def find_on_path(importer, path_item, only=False):
                     for dist in dists:
                         yield dist
                 elif not only and lower.endswith('.egg-link'):
-                    entry_file = open(os.path.join(path_item, entry))
-                    try:
+                    with open(os.path.join(path_item, entry)) as entry_file:
                         entry_lines = entry_file.readlines()
-                    finally:
-                        entry_file.close()
                     for line in entry_lines:
                         if not line.strip():
                             continue

From f49559970b7e551f045b59c9530733b1bd1ed0e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 22:50:41 -0400
Subject: [PATCH 4116/8469] Update ContextualZipFile to use a single
 constructor

---
 ez_setup.py      | 11 +++++------
 pkg_resources.py | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 53350e45a8..df3848a3a1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -80,14 +80,13 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         self.close()
 
-    @classmethod
-    def compat(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         """
         Construct a ZipFile or ContextualZipFile as appropriate
         """
-        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
-        class_ = zipfile.ZipFile if zf_has_exit else cls
-        return class_(*args, **kwargs)
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
 
 
 @contextlib.contextmanager
@@ -98,7 +97,7 @@ def archive_context(filename):
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        with ContextualZipFile.compat(filename) as archive:
+        with ContextualZipFile(filename) as archive:
             archive.extractall()
 
         # going in the directory
diff --git a/pkg_resources.py b/pkg_resources.py
index 4c28d72ceb..1f8c3183eb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1551,7 +1551,7 @@ def build_zipmanifest(path):
       * [7] - zipinfo.CRC
     """
     zipinfo = dict()
-    with ContextualZipFile.compat(path) as zfile:
+    with ContextualZipFile(path) as zfile:
         for zitem in zfile.namelist():
             zpath = zitem.replace('/', os.sep)
             zipinfo[zpath] = zfile.getinfo(zitem)
@@ -1570,14 +1570,13 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         self.close()
 
-    @classmethod
-    def compat(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         """
         Construct a ZipFile or ContextualZipFile as appropriate
         """
-        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
-        class_ = zipfile.ZipFile if zf_has_exit else cls
-        return class_(*args, **kwargs)
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
 
 
 class ZipProvider(EggProvider):

From 14f168f249c86085dbf9f67fdc8d6a5b801946a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 22:58:50 -0400
Subject: [PATCH 4117/8469] Clean up whitespace

---
 setuptools/archive_util.py | 54 +++++---------------------------------
 1 file changed, 7 insertions(+), 47 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 1109f34677..a5be2f981e 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -6,7 +6,11 @@
     "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
 ]
 
-import zipfile, tarfile, os, shutil, posixpath
+import zipfile
+import tarfile
+import os
+import shutil
+import posixpath
 from pkg_resources import ensure_directory
 from distutils.errors import DistutilsError
 
@@ -14,34 +18,12 @@ class UnrecognizedFormat(DistutilsError):
     """Couldn't recognize the archive type"""
 
 def default_filter(src,dst):
-    """The default progress/filter callback; returns True for all files"""   
+    """The default progress/filter callback; returns True for all files"""
     return dst
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def unpack_archive(filename, extract_dir, progress_filter=default_filter,
-    drivers=None
-):
+        drivers=None):
     """Unpack `filename` to `extract_dir`, or raise ``UnrecognizedFormat``
 
     `progress_filter` is a function taking two arguments: a source path
@@ -75,11 +57,6 @@ def unpack_archive(filename, extract_dir, progress_filter=default_filter,
         )
 
 
-
-
-
-
-
 def unpack_directory(filename, extract_dir, progress_filter=default_filter):
     """"Unpack" a directory, using the same interface as for archives
 
@@ -94,7 +71,6 @@ def unpack_directory(filename, extract_dir, progress_filter=default_filter):
         for d in dirs:
             paths[os.path.join(base,d)] = src+d+'/', os.path.join(dst,d)
         for f in files:
-            name = src+f
             target = os.path.join(dst,f)
             target = progress_filter(src+f, target)
             if not target:
@@ -105,22 +81,6 @@ def unpack_directory(filename, extract_dir, progress_filter=default_filter):
             shutil.copystat(f, target)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
     """Unpack zip `filename` to `extract_dir`
 

From 0f7f8d71dc1c8eda869c423a324064d4bc419879 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:09:56 -0400
Subject: [PATCH 4118/8469] Use ContextualZipFile and contextlib.closing for
 archiveutil

---
 setuptools/archive_util.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index a5be2f981e..67a67e2362 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -11,7 +11,8 @@
 import os
 import shutil
 import posixpath
-from pkg_resources import ensure_directory
+import contextlib
+from pkg_resources import ensure_directory, ContextualZipFile
 from distutils.errors import DistutilsError
 
 class UnrecognizedFormat(DistutilsError):
@@ -92,8 +93,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
     if not zipfile.is_zipfile(filename):
         raise UnrecognizedFormat("%s is not a zip file" % (filename,))
 
-    z = zipfile.ZipFile(filename)
-    try:
+    with ContextualZipFile(filename) as z:
         for info in z.infolist():
             name = info.filename
 
@@ -121,8 +121,6 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
             unix_attributes = info.external_attr >> 16
             if unix_attributes:
                 os.chmod(target, unix_attributes)
-    finally:
-        z.close()
 
 
 def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
@@ -138,7 +136,7 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         raise UnrecognizedFormat(
             "%s is not a compressed or uncompressed tar file" % (filename,)
         )
-    try:
+    with contextlib.closing(tarobj):
         tarobj.chown = lambda *args: None   # don't do any chowning!
         for member in tarobj:
             name = member.name
@@ -164,7 +162,5 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                         except tarfile.ExtractError:
                             pass    # chown/chmod/mkfifo/mknode/makedev failed
         return True
-    finally:
-        tarobj.close()
 
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile

From 7c471a14c008d879b0877c15f0fd2079f580a1e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:21:19 -0400
Subject: [PATCH 4119/8469] Use context manager for brevity

---
 setuptools/compat.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 7397d7fa17..09e5af5cc6 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -70,11 +70,8 @@ def execfile(fn, globs=None, locs=None):
             globs = globals()
         if locs is None:
             locs = globs
-        f = open(fn, 'rb')
-        try:
+        with open(fn, 'rb') as f:
             source = f.read()
-        finally:
-            f.close()
         exec(compile(source, fn, 'exec'), globs, locs)
 
     def reraise(tp, value, tb=None):

From e6e3b8dfd12cb96b3abc7b34bda56c6431956719 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:33:56 -0400
Subject: [PATCH 4120/8469] Modernize syntax

--HG--
extra : amend_source : eeaee0372ea8d1d39475a722234c03f6a0247722
---
 setuptools/depends.py | 75 +++++++++----------------------------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index 8b9d1217b1..f6628799fa 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,7 +1,8 @@
-from __future__ import generators
-import sys, imp, marshal
+import sys
+import imp
+import marshal
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
-from distutils.version import StrictVersion, LooseVersion
+from distutils.version import StrictVersion
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -10,9 +11,8 @@
 class Require:
     """A prerequisite to building or installing a distribution"""
 
-    def __init__(self,name,requested_version,module,homepage='',
-        attribute=None,format=None
-    ):
+    def __init__(self, name, requested_version, module, homepage='',
+            attribute=None, format=None):
 
         if format is None and requested_version is not None:
             format = StrictVersion
@@ -25,20 +25,17 @@ def __init__(self,name,requested_version,module,homepage='',
         self.__dict__.update(locals())
         del self.self
 
-
     def full_name(self):
         """Return full package/distribution name, w/version"""
         if self.requested_version is not None:
             return '%s-%s' % (self.name,self.requested_version)
         return self.name
 
-
-    def version_ok(self,version):
+    def version_ok(self, version):
         """Is 'version' sufficiently up-to-date?"""
         return self.attribute is None or self.format is None or \
             str(version) != "unknown" and version >= self.requested_version
 
-
     def get_version(self, paths=None, default="unknown"):
 
         """Get version number of installed module, 'None', or 'default'
@@ -59,20 +56,18 @@ def get_version(self, paths=None, default="unknown"):
             except ImportError:
                 return None
 
-        v = get_module_constant(self.module,self.attribute,default,paths)
+        v = get_module_constant(self.module, self.attribute, default, paths)
 
         if v is not None and v is not default and self.format is not None:
             return self.format(v)
 
         return v
 
-
-    def is_present(self,paths=None):
+    def is_present(self, paths=None):
         """Return true if dependency is present on 'paths'"""
         return self.get_version(paths) is not None
 
-
-    def is_current(self,paths=None):
+    def is_current(self, paths=None):
         """Return true if dependency is present and up-to-date on 'paths'"""
         version = self.get_version(paths)
         if version is None:
@@ -113,14 +108,6 @@ def _iter_code(code):
         yield op,arg
 
 
-
-
-
-
-
-
-
-
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
 
@@ -140,28 +127,6 @@ def find_module(module, paths=None):
     return info
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def get_module_constant(module, symbol, default=-1, paths=None):
 
     """Find 'module' by searching 'paths', and extract 'symbol'
@@ -171,7 +136,7 @@ def get_module_constant(module, symbol, default=-1, paths=None):
     constant.  Otherwise, return 'default'."""
 
     try:
-        f, path, (suffix,mode,kind) = find_module(module,paths)
+        f, path, (suffix, mode, kind) = find_module(module, paths)
     except ImportError:
         # Module doesn't exist
         return None
@@ -187,23 +152,17 @@ def get_module_constant(module, symbol, default=-1, paths=None):
         else:
             # Not something we can parse; we'll have to import it.  :(
             if module not in sys.modules:
-                imp.load_module(module,f,path,(suffix,mode,kind))
-            return getattr(sys.modules[module],symbol,None)
+                imp.load_module(module, f, path, (suffix, mode, kind))
+            return getattr(sys.modules[module], symbol, None)
 
     finally:
         if f:
             f.close()
 
-    return extract_constant(code,symbol,default)
-
-
-
-
+    return extract_constant(code, symbol, default)
 
 
-
-
-def extract_constant(code,symbol,default=-1):
+def extract_constant(code, symbol, default=-1):
     """Extract the constant value of 'symbol' from 'code'
 
     If the name 'symbol' is bound to a constant value by the Python code
@@ -236,11 +195,9 @@ def extract_constant(code,symbol,default=-1):
             return const
         else:
             const = default
-            
+
 if sys.platform.startswith('java') or sys.platform == 'cli':
     # XXX it'd be better to test assertions about bytecode instead...
     del extract_constant, get_module_constant
     __all__.remove('extract_constant')
     __all__.remove('get_module_constant')
-
-

From ac86a30d6f4bc4ed403ea668d4a904d8ae933850 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:37:43 -0400
Subject: [PATCH 4121/8469] Fix NameError (is this code ever used?).

--HG--
extra : amend_source : 4361459883522692c4d70715135439819d981d7a
---
 setuptools/depends.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index f6628799fa..49fb8b374b 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -3,6 +3,7 @@
 import marshal
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 from distutils.version import StrictVersion
+from setuptools import compat
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -98,7 +99,7 @@ def _iter_code(code):
             ptr += 3
 
             if op==EXTENDED_ARG:
-                extended_arg = arg * long_type(65536)
+                extended_arg = arg * compat.long_type(65536)
                 continue
 
         else:

From 032cd636116a821d20a590d87afa99626de9bff6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:42:35 -0400
Subject: [PATCH 4122/8469] Patch globals in a function. This technique
 bypasses the linter warnings about the names not being present, and allows
 for better documentation.

---
 setuptools/depends.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index 49fb8b374b..e87ef3f39c 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -197,8 +197,19 @@ def extract_constant(code, symbol, default=-1):
         else:
             const = default
 
-if sys.platform.startswith('java') or sys.platform == 'cli':
-    # XXX it'd be better to test assertions about bytecode instead...
-    del extract_constant, get_module_constant
-    __all__.remove('extract_constant')
-    __all__.remove('get_module_constant')
+
+def _update_globals():
+    """
+    Patch the globals to remove the objects not available on some platforms.
+
+    XXX it'd be better to test assertions about bytecode instead.
+    """
+
+    if not sys.platform.startswith('java') and sys.platform != 'cli':
+        return
+    incompatible = 'extract_constant', 'get_module_constant'
+    for name in incompatible:
+        del globals()[name]
+        __all__.remove(name)
+
+_update_globals()

From f9f94d714cf97df731a49b614b35d146536449f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 May 2014 23:47:08 -0400
Subject: [PATCH 4123/8469] Use context manager

--HG--
extra : amend_source : 5e98bee2918d9eeb073c8c896a849c5f68da6634
---
 setuptools/package_index.py | 47 +++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 167c34e5b4..58572ce663 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -632,16 +632,15 @@ def gen_setup(self, filename, fragment, tmpdir):
                     shutil.copy2(filename, dst)
                     filename=dst
 
-            file = open(os.path.join(tmpdir, 'setup.py'), 'w')
-            file.write(
-                "from setuptools import setup\n"
-                "setup(name=%r, version=%r, py_modules=[%r])\n"
-                % (
-                    dists[0].project_name, dists[0].version,
-                    os.path.splitext(basename)[0]
+            with open(os.path.join(tmpdir, 'setup.py'), 'w') as file:
+                file.write(
+                    "from setuptools import setup\n"
+                    "setup(name=%r, version=%r, py_modules=[%r])\n"
+                    % (
+                        dists[0].project_name, dists[0].version,
+                        os.path.splitext(basename)[0]
+                    )
                 )
-            )
-            file.close()
             return filename
 
         elif match:
@@ -660,7 +659,7 @@ def gen_setup(self, filename, fragment, tmpdir):
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
         # Download the file
-        fp, tfp, info = None, None, None
+        fp, info = None, None
         try:
             checker = HashChecker.from_url(url)
             fp = self.open_url(strip_fragment(url))
@@ -677,21 +676,20 @@ def _download_to(self, url, filename):
                 sizes = get_all_headers(headers, 'Content-Length')
                 size = max(map(int, sizes))
                 self.reporthook(url, filename, blocknum, bs, size)
-            tfp = open(filename,'wb')
-            while True:
-                block = fp.read(bs)
-                if block:
-                    checker.feed(block)
-                    tfp.write(block)
-                    blocknum += 1
-                    self.reporthook(url, filename, blocknum, bs, size)
-                else:
-                    break
-            self.check_hash(checker, filename, tfp)
+            with open(filename,'wb') as tfp:
+                while True:
+                    block = fp.read(bs)
+                    if block:
+                        checker.feed(block)
+                        tfp.write(block)
+                        blocknum += 1
+                        self.reporthook(url, filename, blocknum, bs, size)
+                    else:
+                        break
+                self.check_hash(checker, filename, tfp)
             return headers
         finally:
             if fp: fp.close()
-            if tfp: tfp.close()
 
     def reporthook(self, url, filename, blocknum, blksize, size):
         pass    # no-op
@@ -1040,9 +1038,8 @@ def local_open(url):
         files = []
         for f in os.listdir(filename):
             if f=='index.html':
-                fp = open(os.path.join(filename,f),'r')
-                body = fp.read()
-                fp.close()
+                with open(os.path.join(filename,f),'r') as fp:
+                    body = fp.read()
                 break
             elif os.path.isdir(os.path.join(filename,f)):
                 f+='/'

From 37ceab37dd39345a8dab9c88082bd1a644ad7311 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 17 May 2014 21:46:35 -0700
Subject: [PATCH 4124/8469] Version bump for 3.4.1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index b00024940e..9463a35c79 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.1rc1"
+__version__ = "3.4.1"
 #--end constants--

From 771e560098734056abe2d2aefc7365d16534546f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 May 2014 21:34:16 -0400
Subject: [PATCH 4125/8469] Include the build launcher script in setuptools
 sdist. This helps address the requirement that all sources be included.

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 76822cbda2..2c587d40f9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,3 +8,4 @@ include *.py
 include *.txt
 include MANIFEST.in
 include launcher.c
+include msvc-build-launcher.cmd

From 467ea50e19e47b0c46a842da0f7faf2bd8e8d714 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 23 May 2014 08:12:13 -0400
Subject: [PATCH 4126/8469] Normalize whitespace

---
 setup.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index f76d371a73..caad649602 100755
--- a/setup.py
+++ b/setup.py
@@ -119,20 +119,20 @@ def _save_entry_points(self):
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     license="PSF or ZPL",
-    long_description = long_description,
-    keywords = "CPAN PyPI distutils eggs package management",
-    url = "https://pypi.python.org/pypi/setuptools",
-    test_suite = 'setuptools.tests',
-    src_root = src_root,
-    packages = setuptools.find_packages(),
-    package_data = package_data,
+    long_description=long_description,
+    keywords="CPAN PyPI distutils eggs package management",
+    url="https://pypi.python.org/pypi/setuptools",
+    test_suite='setuptools.tests',
+    src_root=src_root,
+    packages=setuptools.find_packages(),
+    package_data=package_data,
 
-    py_modules = ['pkg_resources', 'easy_install'],
+    py_modules=['pkg_resources', 'easy_install'],
 
-    zip_safe = True,
+    zip_safe=True,
 
-    cmdclass = {'test': test},
-    entry_points = {
+    cmdclass={'test': test},
+    entry_points={
         "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
             for cmd in SETUP_COMMANDS
@@ -178,7 +178,7 @@ def _save_entry_points(self):
     },
 
 
-    classifiers = textwrap.dedent("""
+    classifiers=textwrap.dedent("""
         Development Status :: 5 - Production/Stable
         Intended Audience :: Developers
         License :: OSI Approved :: Python Software Foundation License
@@ -196,20 +196,20 @@ def _save_entry_points(self):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
-    extras_require = {
+    extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==1.0.1",
     },
-    dependency_links = [
+    dependency_links=[
         'https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
-    scripts = [],
-    tests_require = [
+    scripts=[],
+    tests_require=[
         'setuptools[ssl]',
         'pytest',
     ],
-    setup_requires = [
+    setup_requires=[
     ] + pytest_runner,
 )
 

From d1034e6d0b8dfe3ed6e96bf29e3cd352d0a4ebd2 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 25 May 2014 13:17:44 +0000
Subject: [PATCH 4127/8469] Change the project URL to BitBucket rather than
 PyPI

Currently, the project metadata on PyPI doesn't provide an easy way to navigate to the BitBucket repo. This change replaces the current self-link back to PyPI with the appropriate link to BitBucket.

--HG--
branch : ncoghlan/setuppy-edited-online-with-bitbucket-1401023748153
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index caad649602..6b263702f3 100755
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,7 @@ def _save_entry_points(self):
     license="PSF or ZPL",
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
-    url="https://pypi.python.org/pypi/setuptools",
+    url="https://bitbucket.org/pypa/setuptools",
     test_suite='setuptools.tests',
     src_root=src_root,
     packages=setuptools.find_packages(),

From 55e8aecffc532c7f048ca2379a65fd325a062a92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 May 2014 03:11:37 +0200
Subject: [PATCH 4128/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2f4705d7d1..3df689332a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+3.7
+---
+
+* Issue #193: Improved handling of Unicode filenames when building manifests.
+
 ---
 3.6
 ---

From 72192792996ccfa39c12d0d7a6594e3531e47568 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 May 2014 03:12:04 +0200
Subject: [PATCH 4129/8469] Added tag 3.7b1 for changeset 292dfca15d33

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 100e552c46..81217163cf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -135,3 +135,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1
 572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2
 e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
+292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1

From e234ee81285a535ab525f9210bf714adfb769806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 28 May 2014 05:53:14 +0200
Subject: [PATCH 4130/8469] simplify ContextualZipFile implementation and avoid
 DeprecationWarnings

ContextualZipFile tried to be smart and have its __new__ method return
zipfile.ZipFile instances on Python versions supporting the zipfile.ZipFile
context manager interface (i.e. only on Python [2.7, 3.0> & 3.2+) while on
others it would return an actual ContextualZipFile instance.

The new implementation seems much simpler and avoids a DeprecationWarning on
Python [3.0, 3.2>. There zipFile.ZipFile's __new__ method implementation is
actually inherited from object, and calling object.__new__ with extra
parameters has been deprecated since Python 2.6 (it has even been converted to
an error since Python 3.3).

Notes on why there were no related problems in other Python versions:
* Python versions prior to 2.5 were not affected because they did not yet
deprecate passing extra parameters to object.__new__.
* Python version 2.6 was not affected because there zipfile.ZipFile was
implemented as an old-style class and therefore did not get its __new__ method
called in the first place.
* Python [2.7, 3.0> & 3.2+ - explained above.

--HG--
extra : source : 9388cc525f1919672fb916b0e62f80ca581072b7
---
 ez_setup.py      | 23 ++++++++++-------------
 pkg_resources.py | 23 ++++++++++-------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index df3848a3a1..810c552b99 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -71,22 +71,19 @@ def _build_egg(egg, archive_filename, to_dir):
 
 class ContextualZipFile(zipfile.ZipFile):
     """
-    Supplement ZipFile class to support context manager for Python 2.6
-    """
+    Supplement ZipFile context manager class supporting all Python versions.
+
+    ZipFile supports a context manager interface only in versions [2.7, 3.0> &
+    3.2+.
 
-    def __enter__(self):
-        return self
+    """
 
-    def __exit__(self, type, value, traceback):
-        self.close()
+    if not hasattr(zipfile.ZipFile, '__exit__'):
+        def __enter__(self):
+            return self
 
-    def __new__(cls, *args, **kwargs):
-        """
-        Construct a ZipFile or ContextualZipFile as appropriate
-        """
-        if hasattr(zipfile.ZipFile, '__exit__'):
-            return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
+        def __exit__(self, type, value, traceback):
+            self.close()
 
 
 @contextlib.contextmanager
diff --git a/pkg_resources.py b/pkg_resources.py
index 1f8c3183eb..a9c737c4c9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1561,22 +1561,19 @@ def build_zipmanifest(path):
 
 class ContextualZipFile(zipfile.ZipFile):
     """
-    Supplement ZipFile class to support context manager for Python 2.6
-    """
+    Supplement ZipFile context manager class supporting all Python versions.
 
-    def __enter__(self):
-        return self
+    ZipFile supports a context manager interface only in versions [2.7, 3.0> &
+    3.2+.
+
+    """
 
-    def __exit__(self, type, value, traceback):
-        self.close()
+    if not hasattr(zipfile.ZipFile, '__exit__'):
+        def __enter__(self):
+            return self
 
-    def __new__(cls, *args, **kwargs):
-        """
-        Construct a ZipFile or ContextualZipFile as appropriate
-        """
-        if hasattr(zipfile.ZipFile, '__exit__'):
-            return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
+        def __exit__(self, type, value, traceback):
+            self.close()
 
 
 class ZipProvider(EggProvider):

From eba9c893a275bc07e8f7e32f46bee0e2e2af7ff3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 May 2014 07:24:50 +0200
Subject: [PATCH 4131/8469] Suppress arguments to __new__. ZipFile doesn't want
 them, and object deprecates them.

--HG--
extra : amend_source : e41a2567b4174ef2eff09f3aa3f2a7faf214e054
---
 ez_setup.py      | 2 +-
 pkg_resources.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index df3848a3a1..1f2468f927 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -86,7 +86,7 @@ def __new__(cls, *args, **kwargs):
         """
         if hasattr(zipfile.ZipFile, '__exit__'):
             return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls)
 
 
 @contextlib.contextmanager
diff --git a/pkg_resources.py b/pkg_resources.py
index 1f8c3183eb..5734989dd6 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1576,7 +1576,7 @@ def __new__(cls, *args, **kwargs):
         """
         if hasattr(zipfile.ZipFile, '__exit__'):
             return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls)
 
 
 class ZipProvider(EggProvider):

From 0b70ebffe2c8cacc4c229c21286e74d0d2ebbd65 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 31 May 2014 09:42:49 -0500
Subject: [PATCH 4132/8469] Moved the additions to the change file up, after
 rebasing.

--HG--
branch : develop
---
 CHANGES.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 73569cc91a..ebc133732b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+-----
+3.7.?
+-----
+
+* Issue #185: Make svn tagging work on the new style SVN metadata. 
+  Thanks cazabon!
+* Prune revision control directories (e.g .svn) from base path
+  as well as sub-directories.
+
 ---
 3.7
 ---
@@ -40,15 +49,6 @@ CHANGES
 * Issue #192: Preferred bootstrap location is now
   https://bootstrap.pypa.io/ez_setup.py (mirrored from former location).
 
------
-3.4.5
------
-
-* Issue #185: Applied patch and added regression tests for making
-  svn tagging work on the new style SVN metadata.
-* Prune revision control directories (e.g .svn) from base path
-  as well as subfolders.
-
 -----
 3.4.4
 -----

From 4b47114ca44543adea38110dfabf85c629ec1324 Mon Sep 17 00:00:00 2001
From: Philip Thiem <ptthiem@gmail.com>
Date: Sat, 31 May 2014 09:48:00 -0500
Subject: [PATCH 4133/8469] Summarize zip_manifest cache changes.

--HG--
extra : rebase_source : b4dc90d0244a83083a299600eccce50446ad5846
---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8ca55c2ff2..41a8efee48 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+3.9
+---
+
+* Issue #154: Cache the reading of the zip file index for cases where the
+  same zip-file is used for multiple packages (like PEX).
+
 ---------------
 3.7.1 and 3.8.1
 ---------------

From fb44c46001e32f50747eb6135c9fa911e4aac388 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:00:19 +0100
Subject: [PATCH 4134/8469] Added tag 3.7 for changeset 49bd27eebf21

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 81217163cf..c58b00ec30 100644
--- a/.hgtags
+++ b/.hgtags
@@ -136,3 +136,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2
 e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
+49bd27eebf212c067392796bb2d0fa6d8e583586 3.7

From 11b6828342b5f34bc593d49b0b13dc23a2eb7a2d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:14:20 +0100
Subject: [PATCH 4135/8469] Use a variable for less busy syntax

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 69e0409930..7713bf022d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -34,11 +34,12 @@ def _get_unpatched(cls):
 
 def _patch_distribution_metadata_write_pkg_info():
     """
-    Workaround issue #197 - Python [3.0 - 3.2.2> uses an environment-local
+    Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
     encoding to save the pkg_info. Monkey-patch its write_pkg_info method to
     correct this undesirable behavior.
     """
-    if not ((3,) <= sys.version_info[:3] < (3, 2, 2)):
+    environment_local = (3,) <= sys.version_info[:3] < (3, 2, 2)
+    if not environment_local:
         return
 
     # from Python 3.4

From e565f7fafb1a14bda1125cb13342376c56caaef1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:16:20 +0100
Subject: [PATCH 4136/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3df689332a..4d8aba184e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+3.8
+---
+
+* Extend Issue #197 workaround to include all Python 3 versions prior to
+  3.2.2.
+
 ---
 3.7
 ---

From 2b41f1de480508dfdc1b9181516cd480277fc1a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:17:06 +0100
Subject: [PATCH 4137/8469] Added tag 3.8 for changeset 2fa97c06cc01

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c58b00ec30..e0b397c441 100644
--- a/.hgtags
+++ b/.hgtags
@@ -137,3 +137,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
 49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
+2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8

From 60da44f7292fbf85cb54285fefda25dfdae88a43 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:17:38 +0100
Subject: [PATCH 4138/8469] Bumped to 3.9 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a78067fe54..f191b954dc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.8"
+DEFAULT_VERSION = "3.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index b413618966..4d51b9ce86 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.8'
+__version__ = '3.9'

From 109d034dcda2d3578a34811faddabbf90b54f1de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:34:26 +0100
Subject: [PATCH 4139/8469] Remove excess whitespace

--HG--
extra : rebase_source : db1f9496cdda75a9467fcfb867b82108773b0443
---
 tests/api_tests.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index d34f231410..65dba76d0a 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -418,7 +418,3 @@ Environment Markers
 
     >>> em("'yx' in 'x'")
     False
-
-
-
-

From 0d688c047fa27b52bc71fb1dc24b30ef8814e1cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jun 2014 21:41:21 +0100
Subject: [PATCH 4140/8469] Perform actual symlink detection; alternate
 approach to answer Pull Request #53.

--HG--
extra : rebase_source : a70141cd6472cd8e4024be4037bfd89e4adcb396
---
 setuptools/tests/test_find_packages.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 92f7aff7ca..fe390728c9 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -12,12 +12,26 @@
 
 find_420_packages = setuptools.PEP420PackageFinder.find
 
+# modeled after CPython's test.support.can_symlink
+def can_symlink():
+    TESTFN = tempfile.mktemp()
+    symlink_path = TESTFN + "can_symlink"
+    try:
+        os.symlink(TESTFN, symlink_path)
+        can = True
+    except (OSError, NotImplementedError, AttributeError):
+        can = False
+    else:
+        os.remove(symlink_path)
+    globals().update(can_symlink=lambda: can)
+    return can
+
 def has_symlink():
     bad_symlink = (
         # Windows symlink directory detection is broken on Python 3.2
         platform.system() == 'Windows' and sys.version_info[:2] == (3,2)
     )
-    return hasattr(os, 'symlink') and not bad_symlink
+    return can_symlink() and not bad_symlink
 
 class TestFindPackages(unittest.TestCase):
 

From cfd9d789d301f3c1d74afe5a63e6c872ecefede0 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 14 Jun 2014 18:19:04 -0700
Subject: [PATCH 4141/8469] Include the script template files - fixes #220

The rename of the script template files to be .tmpl put them
into the realm of package data, rather than python files that
would be bundled automatically. Include them specifically in
package data so that they'll actually be installed.
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6b263702f3..719a1937e1 100755
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,8 @@ def _save_entry_points(self):
     with changes_file:
         long_description = readme_file.read() + '\n' + changes_file.read()
 
-package_data = {'setuptools': ['site-patch.py']}
+package_data = {
+        'setuptools': ['script (dev).tmpl', 'script.tmpl', 'site-patch.py']}
 force_windows_specific_files = (
     os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
     not in (None, "", "0")

From 47ebcbfebd8e999bc93a6f9797f29a0a70cf17a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:05:28 -0400
Subject: [PATCH 4142/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6186edc9c9..a12b038705 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+5.0.2
+-----
+
+* Issue #220: Restored script templates.
+
 -----
 5.0.1
 -----

From 13c3b04b8899244701fd5b3146a4775df446365d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:05:46 -0400
Subject: [PATCH 4143/8469] Added tag 5.0.2 for changeset 95996b713722

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 09c0876e4b..836fc08a32 100644
--- a/.hgtags
+++ b/.hgtags
@@ -142,3 +142,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 40744de29b848f0e88139ba91d645c08a56855e9 3.8.1
 84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0
 871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1
+95996b713722376679c3168b15ab12ea8360dd5f 5.0.2

From dc212fd1e1636fbc3bca6d9a1c7cf65ff7d311d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:06:14 -0400
Subject: [PATCH 4144/8469] Bumped to 5.0.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e045f7608c..107ed6906e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.0.2"
+DEFAULT_VERSION = "5.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 6a92b24477..f30cd813e2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.0.2'
+__version__ = '5.0.3'

From 912afb62d648e9c872fddc9392b73006e8335d9a Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Mon, 2 Jun 2014 22:23:58 +1000
Subject: [PATCH 4145/8469] Move tests.sh to a tox config

--HG--
extra : source : 0d6a065483104cc9781a3ff72c168f059ec11036
---
 test.sh | 67 ---------------------------------------------------------
 tox.ini |  5 +++++
 2 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 test.sh
 create mode 100644 tox.ini

diff --git a/test.sh b/test.sh
deleted file mode 100644
index ed6d4efcb4..0000000000
--- a/test.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-echo -n "Running tests for Python 2.4..."
-python2.4 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-echo -n "Running tests for Python 2.5..."
-python2.5 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-echo -n "Running tests for Python 2.6..."
-python2.6 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-echo -n "Running tests for Python 2.7..."
-python2.7 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-rm -rf build
-echo -n "Running tests for Python 3.1..."
-python3.1 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-rm -rf build
-echo -n "Running tests for Python 3.2..."
-python3.2 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
-rm -rf build
-echo -n "Running tests for Python 3.3..."
-python3.3 setup.py -q test > /dev/null 2> /dev/null
-if [ $? -ne 0 ];then
-    echo "Failed"
-    exit $1
-else
-    echo "Success"
-fi
-
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..06421a7344
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27,py31,py32,py33,py34
+[testenv]
+deps=pytest
+commands=py.test

From 18c255d1e1a83d45a055cfcc0fa3140c775afc0d Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Mon, 2 Jun 2014 22:26:36 +1000
Subject: [PATCH 4146/8469] Use compat's StringIO. Should fix bitbucket #213

https://bitbucket.org/pypa/setuptools/issue/213/regression-setuptools-37-installation

--HG--
extra : source : 182f68beacf5e436609fb7d1064a18279cbbd24a
---
 setuptools/command/egg_info.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9019524db3..04ed635762 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -5,13 +5,12 @@
 import os
 import re
 import sys
-import io
 
 from setuptools import Command
 import distutils.errors
 from distutils import log
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring, PY3, unicode
+from setuptools.compat import basestring, PY3, StringIO
 from setuptools import svn_utils
 from distutils.util import convert_path
 from distutils.filelist import FileList as _FileList
@@ -364,7 +363,7 @@ def _write_requirements(stream, reqs):
 
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
-    data = io.StringIO() if PY3 else io.BytesIO()
+    data = StringIO()
     _write_requirements(data, dist.install_requires)
     extras_require = dist.extras_require or {}
     for extra in sorted(extras_require):

From 087c203263f18b80f1fdc218561d1f065bf309d3 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Mon, 2 Jun 2014 22:34:22 +1000
Subject: [PATCH 4147/8469] Ignore the tox folder

--HG--
extra : source : f78ffe97964c6becbf42e946bf6504e8dc09f13b
---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index 6eb702bc7d..e2398d342b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,6 +3,7 @@ syntax: glob
 *~
 *.swp
 .coverage
+.tox
 distribute.egg-info
 setuptools.egg-info
 build

From 781879a354c5973ba127d87a0e5bdd0c4a10f1a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jun 2014 13:59:37 +0100
Subject: [PATCH 4148/8469] Bumped to 3.7.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1f2468f927..3012fd591b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.7"
+DEFAULT_VERSION = "3.7.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 94bcfb0106..380cd80aed 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.7'
+__version__ = '3.7.1'

From 23601696a493eda013072d76a727454a46b9510a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jun 2014 14:00:45 +0100
Subject: [PATCH 4149/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3df689332a..eb609eb6be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+3.7.1
+-----
+
+* Issue #213: Use legacy StringIO behavior for compatibility under pbr.
+
 ---
 3.7
 ---

From 0aea654b193043aef3f73490ac5ca7a38338e743 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jun 2014 14:01:27 +0100
Subject: [PATCH 4150/8469] Added tag 3.7.1 for changeset 9b422fc0b8b9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c58b00ec30..6b6d132661 100644
--- a/.hgtags
+++ b/.hgtags
@@ -137,3 +137,4 @@ e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
 e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
 49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
+9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1

From 78ea429dac53a07cde782e04ea2dc2581ae5b74a Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Mon, 2 Jun 2014 06:32:59 -0700
Subject: [PATCH 4151/8469] Have git ignore files created by tests

When the tests are run, some packages are installed or created in the
current directory. They should never be checked in, so add them to
.gitignore.

Change-Id: Ic7790ec85c9e2f0fc4bd06b492f75ea6c17ecda4

--HG--
extra : rebase_source : 7ad1502fd5d09d38f521a391e22af46cfce6ea4f
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..6167a533f4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.tox
+py-*.egg
+pytest-*.egg

From 6f98e16c52f7467d920bea4af3cbd262c6c5f5dc Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Mon, 2 Jun 2014 07:34:26 -0700
Subject: [PATCH 4152/8469] Add integration tests.

Set up integration tests that install packages to temporary
directories.

Change-Id: Iec90838fec961228fca24c0decc088de55303350

--HG--
extra : rebase_source : f5219f8411db4b79694a74659e22b0c0b1c771ab
---
 setuptools/tests/test_integration.py | 87 ++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 setuptools/tests/test_integration.py

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
new file mode 100644
index 0000000000..fdb8831eaa
--- /dev/null
+++ b/setuptools/tests/test_integration.py
@@ -0,0 +1,87 @@
+"""Run some integration tests.
+
+Try to install a few packages.
+"""
+
+import glob
+import os
+import shutil
+import site
+import sys
+import tempfile
+import unittest
+
+import pytest
+
+from setuptools.command.easy_install import easy_install
+from setuptools.command import easy_install as easy_install_pkg
+from setuptools.dist import Distribution
+
+
+@pytest.fixture
+def install_context(request):
+    """Fixture to set up temporary installation directory.
+    """
+    # Save old values so we can restore them.
+    new_cwd = tempfile.mkdtemp()
+    old_cwd = os.getcwd()
+    old_enable_site = site.ENABLE_USER_SITE
+    old_file = easy_install_pkg.__file__
+    old_base = site.USER_BASE
+    old_site = site.USER_SITE
+    old_ppath = os.environ.get('PYTHONPATH')
+
+    def fin():
+        os.chdir(old_cwd)
+        shutil.rmtree(new_cwd)
+        shutil.rmtree(site.USER_BASE)
+        shutil.rmtree(site.USER_SITE)
+        site.USER_BASE = old_base
+        site.USER_SITE = old_site
+        site.ENABLE_USER_SITE = old_enable_site
+        easy_install_pkg.__file__ = old_file
+        os.environ['PYTHONPATH'] = old_ppath or ''
+    request.addfinalizer(fin)
+
+    # Change the environment and site settings to control where the
+    # files are installed and ensure we do not overwrite anything.
+    site.USER_BASE = tempfile.mkdtemp()
+    site.USER_SITE = tempfile.mkdtemp()
+    easy_install_pkg.__file__ = site.USER_SITE
+    os.chdir(new_cwd)
+    install_dir = tempfile.mkdtemp()
+    sys.path.append(install_dir)
+    os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
+
+    # Set up the command for performing the installation.
+    values = {}
+    dist = Distribution()
+    cmd = easy_install(dist)
+    cmd.install_dir = install_dir
+    return cmd
+
+
+def _install_one(requirement, cmd, pkgname, modulename):
+    cmd.args = [requirement]
+    cmd.ensure_finalized()
+    cmd.run()
+    target = cmd.install_dir
+    dest_path = glob.glob(os.path.join(target, pkgname + '*.egg'))
+    assert dest_path
+    assert os.path.exists(os.path.join(dest_path[0], pkgname, modulename))
+
+def test_stevedore(install_context):
+    _install_one('stevedore', install_context,
+                 'stevedore', 'extension.py')
+
+# def test_virtualenvwrapper(install_context):
+#     _install_one('virtualenvwrapper', install_context,
+#                  'virtualenvwrapper', 'hook_loader.py')
+
+# def test_pbr(install_context):
+#     _install_one('pbr', install_context,
+#                  'pbr', 'core.py')
+
+# def test_python_novaclient(install_context):
+#     _install_one('python-novaclient', install_context,
+#                  'novaclient', 'base.py')

From 6168f740b5306903d601d97e30adc28ab64bb612 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Mon, 2 Jun 2014 07:44:54 -0700
Subject: [PATCH 4153/8469] update .gitignore from .hgignore

Change-Id: I6789ef2eda75748597c9ae76f2a5389140a9daab

--HG--
extra : rebase_source : 48bd79fb7ee229a89a3796df14aadbcca8ace016
---
 .gitignore | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6167a533f4..7b00d3c861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+*.pyc
+*~
+*.swp
+.coverage
 .tox
+distribute.egg-info
+setuptools.egg-info
+build
+dist
+lib
+bin
+include
+\.Python
+*.swp
+CHANGES (links).txt
+.git*
 py-*.egg
 pytest-*.egg

From 2bd140300eb0aa63b78a930463ca4c81fa2546bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Mon, 2 Jun 2014 16:48:14 +0200
Subject: [PATCH 4154/8469] fix clearing zipimport._zip_directory_cache on pypy

pypy uses a custom zipimport._zip_directory_cache implementation class that
does not support the complete dict interface, e.g. it does not support the
dict.pop() method.

For more detailed information see the following links:
  https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
  https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99

--HG--
extra : rebase_source : 95cff7946455f0a4422d97eecab11164a9ddef10
---
 setuptools/command/easy_install.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0bce4ab957..81158c43c5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1678,7 +1678,14 @@ def _replace_zip_directory_cache_data(normalized_path):
     # documented anywhere and could in theory change with new Python releases)
     # for no significant benefit.
     for p in to_update:
-        old_entry = cache.pop(p)
+        # N.B. pypy uses a custom zipimport._zip_directory_cache implementation
+        # class that does not support the complete dict interface, e.g. it does
+        # not support the dict.pop() method. For more detailed information see
+        # the following links:
+        #   https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+        #   https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
+        old_entry = cache[p]
+        del cache[p]
         zipimport.zipimporter(p)
         old_entry.clear()
         old_entry.update(cache[p])

From be98378594c42de60ff36e2681ebcecd8dafcd4f Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Mon, 2 Jun 2014 08:20:27 -0700
Subject: [PATCH 4155/8469] Activate more of the integration tests.

Change-Id: Ic3cc25a02de71b94a08f0bf64e8d8b01b572a23b

--HG--
extra : rebase_source : a49971d71570380f1ef51a88897d72328de337ed
---
 setuptools/tests/test_integration.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index fdb8831eaa..372535ecad 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -74,14 +74,14 @@ def test_stevedore(install_context):
     _install_one('stevedore', install_context,
                  'stevedore', 'extension.py')
 
-# def test_virtualenvwrapper(install_context):
-#     _install_one('virtualenvwrapper', install_context,
-#                  'virtualenvwrapper', 'hook_loader.py')
+def test_virtualenvwrapper(install_context):
+    _install_one('virtualenvwrapper', install_context,
+                 'virtualenvwrapper', 'hook_loader.py')
 
-# def test_pbr(install_context):
-#     _install_one('pbr', install_context,
-#                  'pbr', 'core.py')
+def test_pbr(install_context):
+    _install_one('pbr', install_context,
+                 'pbr', 'core.py')
 
-# def test_python_novaclient(install_context):
-#     _install_one('python-novaclient', install_context,
-#                  'novaclient', 'base.py')
+def test_python_novaclient(install_context):
+    _install_one('python-novaclient', install_context,
+                 'novaclient', 'base.py')

From 1f7d40e5e48a6f97fe851db93b5e48d8881e713f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 4 Jun 2014 07:57:40 +0200
Subject: [PATCH 4156/8469] update zipimporter cache clearing related code
 comments

--HG--
extra : rebase_source : c8c77d96880275e34c1580991c2d70486b6d0e00
---
 setuptools/command/easy_install.py | 56 +++++++++++++++++-------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 81158c43c5..39911f17ad 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1608,22 +1608,39 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
     read a 'bad local file header', or even worse, it may fail silently &
     return invalid data.
 
+    zipimport._zip_directory_cache contains cached zip archive directory
+    information for all existing zipimport.zipimporter instances and all such
+    instances connected to the same archive share the same cached directory
+    information.
+
     If asked, we can fix all existing zipimport.zipimporter instances instead
     of having to track them down and remove them one by one, by updating their
     shared cached zip archive directory information. This, of course, assumes
     that the replacement distribution is packaged as a zipped egg.
 
-    If not asked to fix existing zipimport.zipimporter instances, we do our
-    best to clear any remaining zipimport.zipimporter related cached data that
-    might somehow later get used when attempting to load data from the new
+    If not asked to fix existing zipimport.zipimporter instances, we still do
+    our best to clear any remaining zipimport.zipimporter related cached data
+    that might somehow later get used when attempting to load data from the new
     distribution and thus cause such load operations to fail. Note that when
-    tracking down such remaining stale data, we can not catch every possible
+    tracking down such remaining stale data, we can not catch every conceivable
     usage from here, and we clear only those that we know of and have found to
     cause problems if left alive. Any remaining caches should be updated by
     whomever is in charge of maintaining them, i.e. they should be ready to
     handle us replacing their zip archives with new distributions at runtime.
 
     """
+    # There are several other known sources of stale zipimport.zipimporter
+    # instances that we do not clear here, but might if ever given a reason to
+    # do so:
+    # * Global setuptools pkg_resources.working_set (a.k.a. 'master working
+    #   set') may contain distributions which may in turn contain their
+    #   zipimport.zipimporter loaders.
+    # * Several zipimport.zipimporter loaders held by local variables further
+    #   up the function call stack when running the setuptools installation.
+    # * Already loaded modules may have their __loader__ attribute set to the
+    #   exact loader instance used when importing them. Python 3.4 docs state
+    #   that this information is intended mostly for introspection and so is
+    #   not expected to cause us problems.
     normalized_path = normalize_path(dist_path)
     _uncache(normalized_path, sys.path_importer_cache)
     if fix_zipimporter_caches:
@@ -1632,24 +1649,13 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
         # Clear the relevant zipimport._zip_directory_cache data. This will not
         # remove related zipimport.zipimporter instances but should at least
         # not leave the old zip archive directory data behind to be reused by
-        # some newly created zipimport.zipimporter loaders. Not strictly
-        # necessary, but left in because this cache clearing was done before
-        # we started replacing the zipimport._zip_directory_cache if possible,
-        # and there are no relevent unit tests that we can depend on to tell us
-        # if this is really needed.
+        # some newly created zipimport.zipimporter loaders. This whole stale
+        # data removal step does not seem strictly necessary, but has been left
+        # in because it was done before we started replacing the zip archive
+        # directory information cache content if possible, and there are no
+        # relevant unit tests that we can depend on to tell us if this is
+        # really needed.
         _uncache(normalized_path, zipimport._zip_directory_cache)
-        # N.B. Other known sources of stale zipimport.zipimporter instances
-        # that we do not clear here, but might if ever given a reason to do so.
-        # * Global setuptools pkg_resources.working_set (a.k.a. 'master working
-        #   set') may contain distributions which may in turn contain their
-        #   zipimport.zipimporter loaders.
-        # * Several zipimport.zipimporter loaders held by local variables
-        #   further up the function call stack when running the setuptools
-        #   installation.
-        # * Already loaded modules may have their __loader__ attribute set to
-        #   the exact loader instance used when importing them. Python 3.4 docs
-        #   state that this information is intended mostly for introspection
-        #   and so is not expected to cause us problems.
 
 def _uncache(normalized_path, cache):
     to_remove = []
@@ -1678,10 +1684,10 @@ def _replace_zip_directory_cache_data(normalized_path):
     # documented anywhere and could in theory change with new Python releases)
     # for no significant benefit.
     for p in to_update:
-        # N.B. pypy uses a custom zipimport._zip_directory_cache implementation
-        # class that does not support the complete dict interface, e.g. it does
-        # not support the dict.pop() method. For more detailed information see
-        # the following links:
+        # N.B. pypy's custom zipimport._zip_directory_cache implementation does
+        # not support the complete dict interface, e.g. it does not support the
+        # dict.pop() method. For more detailed information see the following
+        # links:
         #   https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
         #   https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
         old_entry = cache[p]

From bbdcce69110d8783f21c121bc97fc902809aedf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 4 Jun 2014 08:03:41 +0200
Subject: [PATCH 4157/8469] extract duplicate code

Extracted code for collecting a list of zipimporter cache entries related to a
given path into _collect_zipimporter_cache_entries().

--HG--
extra : rebase_source : 54ab881d794f95467e811511433a2cd31595339e
---
 setuptools/command/easy_install.py | 31 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 39911f17ad..3f60fae58d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1657,33 +1657,38 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
         # really needed.
         _uncache(normalized_path, zipimport._zip_directory_cache)
 
-def _uncache(normalized_path, cache):
-    to_remove = []
+def _collect_zipimporter_cache_entries(normalized_path, cache):
+    """
+    Return zipimporter cache entry keys related to a given normalized path.
+
+    Alternative path spellings (e.g. those using different character case or
+    those using alternative path separators) related to the same path are
+    included. Any sub-path entries are included as well, i.e. those
+    corresponding to zip archives embedded in other zip archives.
+
+    """
+    result = []
     prefix_len = len(normalized_path)
     for p in cache:
         np = normalize_path(p)
         if (np.startswith(normalized_path) and
                 np[prefix_len:prefix_len + 1] in (os.sep, '')):
-            to_remove.append(p)
-    for p in to_remove:
+            result.append(p)
+    return result
+
+def _uncache(normalized_path, cache):
+    for p in _collect_zipimporter_cache_entries(normalized_path, cache):
         del cache[p]
 
 def _replace_zip_directory_cache_data(normalized_path):
-    cache = zipimport._zip_directory_cache
-    to_update = []
-    prefix_len = len(normalized_path)
-    for p in cache:
-        np = normalize_path(p)
-        if (np.startswith(normalized_path) and
-                np[prefix_len:prefix_len + 1] in (os.sep, '')):
-            to_update.append(p)
     # N.B. In theory, we could load the zip directory information just once for
     # all updated path spellings, and then copy it locally and update its
     # contained path strings to contain the correct spelling, but that seems
     # like a way too invasive move (this cache structure is not officially
     # documented anywhere and could in theory change with new Python releases)
     # for no significant benefit.
-    for p in to_update:
+    cache = zipimport._zip_directory_cache
+    for p in _collect_zipimporter_cache_entries(normalized_path, cache):
         # N.B. pypy's custom zipimport._zip_directory_cache implementation does
         # not support the complete dict interface, e.g. it does not support the
         # dict.pop() method. For more detailed information see the following

From 9101bdd5f3d0e9c45f8300045a2dc18ebbde3bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 4 Jun 2014 08:21:39 +0200
Subject: [PATCH 4158/8469] extract function for updating zipimporter cache
 data

_update_zipimporter_cache() extracted from _uncache() &
_replace_zip_directory_cache_data().

Code cleanup done in preparation for adding a bit more detailed cache item
clearing logic, so that would not require adding a separate function with yet
more code duplication.

--HG--
extra : rebase_source : e2e956e042c7cbfabe2c31ecc58a4f76c91f40aa
---
 setuptools/command/easy_install.py | 49 +++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3f60fae58d..0695ed8f88 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1676,18 +1676,21 @@ def _collect_zipimporter_cache_entries(normalized_path, cache):
             result.append(p)
     return result
 
-def _uncache(normalized_path, cache):
-    for p in _collect_zipimporter_cache_entries(normalized_path, cache):
-        del cache[p]
+def _update_zipimporter_cache(normalized_path, cache, updater=None):
+    """
+    Update zipimporter cache data for a given normalized path.
 
-def _replace_zip_directory_cache_data(normalized_path):
-    # N.B. In theory, we could load the zip directory information just once for
-    # all updated path spellings, and then copy it locally and update its
-    # contained path strings to contain the correct spelling, but that seems
-    # like a way too invasive move (this cache structure is not officially
-    # documented anywhere and could in theory change with new Python releases)
-    # for no significant benefit.
-    cache = zipimport._zip_directory_cache
+    Any sub-path entries are processed as well, i.e. those corresponding to zip
+    archives embedded in other zip archives.
+
+    Given updater is a callable taking a cache entry key and the original entry
+    (after already removing the entry from the cache), and expected to update
+    the entry and possibly return a new one to be inserted in its place.
+    Returning None indicates that the entry should not be replaced with a new
+    one. If no updater is given, the cache entries are simply removed without
+    any additional processing, the same as if the updater simply returned None.
+
+    """
     for p in _collect_zipimporter_cache_entries(normalized_path, cache):
         # N.B. pypy's custom zipimport._zip_directory_cache implementation does
         # not support the complete dict interface, e.g. it does not support the
@@ -1697,10 +1700,28 @@ def _replace_zip_directory_cache_data(normalized_path):
         #   https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
         old_entry = cache[p]
         del cache[p]
-        zipimport.zipimporter(p)
+        new_entry = updater and updater(p, old_entry)
+        if new_entry is not None:
+            cache[p] = new_entry
+
+def _uncache(normalized_path, cache):
+    _update_zipimporter_cache(normalized_path, cache)
+
+def _replace_zip_directory_cache_data(normalized_path):
+    def replace_cached_zip_archive_directory_data(path, old_entry):
+        # N.B. In theory, we could load the zip directory information just once
+        # for all updated path spellings, and then copy it locally and update
+        # its contained path strings to contain the correct spelling, but that
+        # seems like a way too invasive move (this cache structure is not
+        # officially documented anywhere and could in theory change with new
+        # Python releases) for no significant benefit.
         old_entry.clear()
-        old_entry.update(cache[p])
-        cache[p] = old_entry
+        zipimport.zipimporter(path)
+        old_entry.update(zipimport._zip_directory_cache[path])
+        return old_entry
+    _update_zipimporter_cache(normalized_path,
+        zipimport._zip_directory_cache,
+        updater=replace_cached_zip_archive_directory_data)
 
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"

From 3e6ecb094f15ac981c69950d6d1599ec2e4fc250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Wed, 4 Jun 2014 11:32:02 +0200
Subject: [PATCH 4159/8469] clear cached zip archive directory data when
 removing it from cache

This is an extra safety measure to avoid someone holding a reference to this
cached data and using its content even after we know that the underlying zip
archive has been removed and possibly even replaced.

Change suggested by PJ Eby (pje on BitBucket) in a setuptools pull request #51
comment:
  https://bitbucket.org/pypa/setuptools/pull-request/51/diff#comment-2018183

--HG--
extra : rebase_source : 6de2309bc7446647749cfe78ab00e0230a07f92f
---
 setuptools/command/easy_install.py | 32 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0695ed8f88..12299f4f3b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1646,16 +1646,21 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
     if fix_zipimporter_caches:
         _replace_zip_directory_cache_data(normalized_path)
     else:
-        # Clear the relevant zipimport._zip_directory_cache data. This will not
-        # remove related zipimport.zipimporter instances but should at least
-        # not leave the old zip archive directory data behind to be reused by
-        # some newly created zipimport.zipimporter loaders. This whole stale
-        # data removal step does not seem strictly necessary, but has been left
-        # in because it was done before we started replacing the zip archive
-        # directory information cache content if possible, and there are no
-        # relevant unit tests that we can depend on to tell us if this is
-        # really needed.
-        _uncache(normalized_path, zipimport._zip_directory_cache)
+        # Here, even though we do not want to fix existing and now stale
+        # zipimporter cache information, we still want to remove it. Related to
+        # Python's zip archive directory information cache, we clear each of
+        # its stale entries in two phases:
+        #   1. Clear the entry so attempting to access zip archive information
+        #      via any existing stale zipimport.zipimporter instances fails.
+        #   2. Remove the entry from the cache so any newly constructed
+        #      zipimport.zipimporter instances do not end up using old stale
+        #      zip archive directory information.
+        # This whole stale data removal step does not seem strictly necessary,
+        # but has been left in because it was done before we started replacing
+        # the zip archive directory information cache content if possible, and
+        # there are no relevant unit tests that we can depend on to tell us if
+        # this is really needed.
+        _remove_and_clear_zip_directory_cache_data(normalized_path)
 
 def _collect_zipimporter_cache_entries(normalized_path, cache):
     """
@@ -1723,6 +1728,13 @@ def replace_cached_zip_archive_directory_data(path, old_entry):
         zipimport._zip_directory_cache,
         updater=replace_cached_zip_archive_directory_data)
 
+def _remove_and_clear_zip_directory_cache_data(normalized_path):
+    def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
+        old_entry.clear()
+    _update_zipimporter_cache(normalized_path,
+        zipimport._zip_directory_cache,
+        updater=clear_and_remove_cached_zip_archive_directory_data)
+
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"
     try:

From 8adde1b89adf54a06a9ed5f46917fe83f0de676d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 09:03:43 -0400
Subject: [PATCH 4160/8469] Bumped to 3.8.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f191b954dc..66be176e36 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.9"
+DEFAULT_VERSION = "3.8.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 4d51b9ce86..64e0fe00ba 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.9'
+__version__ = '3.8.1'

From 17e27eec34d541525b7d6b83dd43797b8edc5ab9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 09:03:44 -0400
Subject: [PATCH 4161/8469] Added tag 3.8.1 for changeset 40744de29b84

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7afaf6e814..acb4161d77 100644
--- a/.hgtags
+++ b/.hgtags
@@ -139,3 +139,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
 2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8
 9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
+40744de29b848f0e88139ba91d645c08a56855e9 3.8.1

From c7366f281eb21ccd7697d4bdcb9b616a65f837ad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 09:04:18 -0400
Subject: [PATCH 4162/8469] Bumped to 3.8.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 66be176e36..a10d971218 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.8.1"
+DEFAULT_VERSION = "3.8.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 64e0fe00ba..5b2ac99513 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.8.1'
+__version__ = '3.8.2'

From 888950096b1d4f6263a726b6cc1bef7a26bb67ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 10:31:21 -0400
Subject: [PATCH 4163/8469] Reorganize imports

---
 setuptools/command/develop.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 129184cad0..195ec41235 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -1,10 +1,12 @@
-from setuptools.command.easy_install import easy_install
-from distutils.util import convert_path, subst_vars
-from pkg_resources import Distribution, PathMetadata, normalize_path
+import os
+import glob
+from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsOptionError
-import os, sys, setuptools, glob
 
+import setuptools
+from pkg_resources import Distribution, PathMetadata, normalize_path
+from setuptools.command.easy_install import easy_install
 from setuptools.compat import PY3
 
 class develop(easy_install):
@@ -166,4 +168,3 @@ def install_egg_scripts(self, dist):
             script_text = f.read()
             f.close()
             self.install_script(dist, script_name, script_text, script_path)
-

From c0c0a82890bf8d06510f563aa3d01a69491ff86e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 10:34:44 -0400
Subject: [PATCH 4164/8469] Normalize whitespace

---
 setuptools/command/develop.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 195ec41235..74d129490e 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -38,20 +38,14 @@ def initialize_options(self):
         self.setup_path = None
         self.always_copy_from = '.'   # always copy eggs installed in curdir
 
-
-
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
         if ei.broken_egg_info:
-            raise DistutilsError(
-            "Please rename %r to %r before using 'develop'"
-            % (ei.egg_info, ei.broken_egg_info)
-            )
+            template = "Please rename %r to %r before using 'develop'"
+            args = ei.egg_info, ei.broken_egg_info
+            raise DistutilsError(template % args)
         self.args = [ei.egg_name]
 
-
-
-
         easy_install.finalize_options(self)
         self.expand_basedirs()
         self.expand_dirs()
@@ -64,11 +58,12 @@ def finalize_options(self):
             self.egg_path = os.path.abspath(ei.egg_base)
 
         target = normalize_path(self.egg_base)
-        if normalize_path(os.path.join(self.install_dir, self.egg_path)) != target:
+        egg_path = normalize_path(os.path.join(self.install_dir, self.egg_path))
+        if egg_path != target:
             raise DistutilsOptionError(
                 "--egg-path must be a relative path from the install"
                 " directory to "+target
-        )
+            )
 
         # Make a distribution for the package's source
         self.dist = Distribution(
@@ -82,7 +77,7 @@ def finalize_options(self):
             p = '../' * (p.count('/')+1)
         self.setup_path = p
         p = normalize_path(os.path.join(self.install_dir, self.egg_path, p))
-        if  p != normalize_path(os.curdir):
+        if p != normalize_path(os.curdir):
             raise DistutilsOptionError(
                 "Can't get a consistent path to setup script from"
                 " installation directory", p, normalize_path(os.curdir))
@@ -132,7 +127,6 @@ def install_for_development(self):
         # and handling requirements
         self.process_distribution(None, self.dist, not self.no_deps)
 
-
     def uninstall_link(self):
         if os.path.exists(self.egg_link):
             log.info("Removing %s (link to %s)", self.egg_link, self.egg_base)

From 32beecb7ba01a9dad01068622cb365431f3a756a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 10:42:47 -0400
Subject: [PATCH 4165/8469] Now that 2to3 is no longer run on the codebase,
 it's safe for the templates to be syntactically incorrect (prior to
 substitution).

---
 setuptools/command/easy_install.py  | 8 +-------
 setuptools/script template (dev).py | 6 +++---
 setuptools/script template.py       | 4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ad7f472512..19ed12590c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -743,15 +743,9 @@ def get_template(filename):
             """
             There are a couple of template scripts in the package. This
             function loads one of them and prepares it for use.
-
-            These templates use triple-quotes to escape variable
-            substitutions so the scripts get the 2to3 treatment when build
-            on Python 3. The templates cannot use triple-quotes naturally.
             """
             raw_bytes = resource_string('setuptools', template_name)
-            template_str = raw_bytes.decode('utf-8')
-            clean_template = template_str.replace('"""', '')
-            return clean_template
+            return raw_bytes.decode('utf-8')
 
         if is_script:
             # See https://bitbucket.org/pypa/setuptools/issue/134 for info
diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
index b3fe209ecb..c476673f94 100644
--- a/setuptools/script template (dev).py	
+++ b/setuptools/script template (dev).py	
@@ -1,10 +1,10 @@
 # EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
-__requires__ = """%(spec)r"""
+__requires__ = %(spec)r
 import sys
 from pkg_resources import require
-require("""%(spec)r""")
+require(%(spec)r)
 del require
-__file__ = """%(dev_path)r"""
+__file__ = %(dev_path)r
 if sys.version_info < (3, 0):
     execfile(__file__)
 else:
diff --git a/setuptools/script template.py b/setuptools/script template.py
index 8dd5d51001..4504e26453 100644
--- a/setuptools/script template.py	
+++ b/setuptools/script template.py	
@@ -1,4 +1,4 @@
 # EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r
-__requires__ = """%(spec)r"""
+__requires__ = %(spec)r
 import pkg_resources
-pkg_resources.run_script("""%(spec)r""", """%(script_name)r""")
+pkg_resources.run_script(%(spec)r, %(script_name)r)

From 5c08ba7d5c14f27fa44b6b8278a8f3cbbbbc8614 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 11:01:06 -0400
Subject: [PATCH 4166/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b020e5331f..8ca55c2ff2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ CHANGES
 ---------------
 
 * Issue #213: Use legacy StringIO behavior for compatibility under pbr.
+* Issue #218: Setuptools 3.8.1 superseded 4.0.1, and 4.x was removed
+  from the available versions to install.
 
 ---
 3.8

From 39029c39265fa41750d39ec181200cd7379638d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 11:25:18 -0400
Subject: [PATCH 4167/8469] Remove excess whitespace

---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 1df322b6ff..796fd9c3f5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1548,7 +1548,7 @@ def build_manifest(self, path):
         """
         This builds a similar dictionary to the zipimport directory
         caches.  However instead of tuples, ZipInfo objects are stored.
-    
+
         The translation of the tuple is as follows:
           * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
                   on pypy it is the same (one reason why distribute did work

From fd0d9ace552a4fce85abcc622bdec9dc27f8c57d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 11:32:18 -0400
Subject: [PATCH 4168/8469] Subclass dict rather that wrap and proxy.

---
 pkg_resources.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 796fd9c3f5..323b28c8e8 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1530,19 +1530,16 @@ def __init__(self):
 empty_provider = EmptyProvider()
 
 
-class ZipManifests(object):
-
-    def __init__(self):
-        self.known = dict()
+class ZipManifests(dict):
 
     def __call__(self, path):
         path = os.path.normpath(path)
         stat = os.stat(path)
 
-        if path not in self.known or self.known[path][0] != stat.st_mtime:
-            self.known[path] = (stat.st_mtime, self.build_manifest(path))
+        if path not in self or self[path][0] != stat.st_mtime:
+            self[path] = (stat.st_mtime, self.build_manifest(path))
 
-        return self.known[path][1]
+        return self[path][1]
 
     def build_manifest(self, path):
         """

From 9348f13b70fee8de254c8898d2a7840c4286eac1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 11:53:14 -0400
Subject: [PATCH 4169/8469] Expose a method describing what it does, and alias
 that to 'call'.

---
 pkg_resources.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 323b28c8e8..42153d36e2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1531,8 +1531,14 @@ def __init__(self):
 
 
 class ZipManifests(dict):
+    """
+    Memoized zipfile manifests.
+    """
 
-    def __call__(self, path):
+    def load(self, path):
+        """
+        Load a manifest at path or return a suitable manifest already loaded.
+        """
         path = os.path.normpath(path)
         stat = os.stat(path)
 
@@ -1540,6 +1546,7 @@ def __call__(self, path):
             self[path] = (stat.st_mtime, self.build_manifest(path))
 
         return self[path][1]
+    __call__ = load
 
     def build_manifest(self, path):
         """

From dfcbd73ce9160ae691910e088ae9013b22a4a78e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:01:31 -0400
Subject: [PATCH 4170/8469] Implement 'build_manifest' as a classmethod. Rename
 to 'build' because Manifests is already in the classname.

---
 pkg_resources.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 42153d36e2..d12e93539f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1543,12 +1543,13 @@ def load(self, path):
         stat = os.stat(path)
 
         if path not in self or self[path][0] != stat.st_mtime:
-            self[path] = (stat.st_mtime, self.build_manifest(path))
+            self[path] = (stat.st_mtime, self.build(path))
 
         return self[path][1]
     __call__ = load
 
-    def build_manifest(self, path):
+    @classmethod
+    def build(cls, path):
         """
         This builds a similar dictionary to the zipimport directory
         caches.  However instead of tuples, ZipInfo objects are stored.

From 434df30acd39f412816773aca4a1d19e78a631be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:07:27 -0400
Subject: [PATCH 4171/8469] Rewrite construct/append loop with simple iterator.

---
 pkg_resources.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index d12e93539f..ca29ed66f2 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1569,13 +1569,15 @@ def build(cls, path):
                    zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
           * [7] - zipinfo.CRC
         """
-        zipinfo = dict()
         with ContextualZipFile(path) as zfile:
-            for zitem in zfile.namelist():
-                zpath = zitem.replace('/', os.sep)
-                zipinfo[zpath] = zfile.getinfo(zitem)
-                assert zipinfo[zpath] is not None
-        return zipinfo
+            items = (
+                (
+                    name.replace('/', os.sep),
+                    zfile.getinfo(name),
+                )
+                for name in zfile.namelist()
+            )
+            return dict(items)
 build_zipmanifest = ZipManifests()
 
 

From ca53b24b61d36165b173b590a1da8ac3bec963f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:09:10 -0400
Subject: [PATCH 4172/8469] Use direct voice

---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ca29ed66f2..e4ba9abfef 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1551,8 +1551,8 @@ def load(self, path):
     @classmethod
     def build(cls, path):
         """
-        This builds a similar dictionary to the zipimport directory
-        caches.  However instead of tuples, ZipInfo objects are stored.
+        Build a dictionary similar to the zipimport directory
+        caches, except instead of tuples, store ZipInfo objects.
 
         The translation of the tuple is as follows:
           * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep

From 2e35b91ed2d5b6dc5be9d92e485a9915da4b83f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:11:45 -0400
Subject: [PATCH 4173/8469] Remove documentation which seems irrelevant to this
 method.

---
 pkg_resources.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index e4ba9abfef..d124cb9acf 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1554,20 +1554,8 @@ def build(cls, path):
         Build a dictionary similar to the zipimport directory
         caches, except instead of tuples, store ZipInfo objects.
 
-        The translation of the tuple is as follows:
-          * [0] - zipinfo.filename on stock pythons this needs "/" --> os.sep
-                  on pypy it is the same (one reason why distribute did work
-                  in some cases on pypy and win32).
-          * [1] - zipinfo.compress_type
-          * [2] - zipinfo.compress_size
-          * [3] - zipinfo.file_size
-          * [4] - len(utf-8 encoding of filename) if zipinfo & 0x800
-                  len(ascii encoding of filename) otherwise
-          * [5] - (zipinfo.date_time[0] - 1980) << 9 |
-                   zipinfo.date_time[1] << 5 | zipinfo.date_time[2]
-          * [6] - (zipinfo.date_time[3] - 1980) << 11 |
-                   zipinfo.date_time[4] << 5 | (zipinfo.date_time[5] // 2)
-          * [7] - zipinfo.CRC
+        Use a platform-specific path separator (os.sep) for the path keys
+        for compatibility with pypy on Windows.
         """
         with ContextualZipFile(path) as zfile:
             items = (

From 8b16c25b199767f86350fff7dfff877fd38ed48c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:14:13 -0400
Subject: [PATCH 4174/8469] Use a more appropriate name and invoke .load
 directly.

---
 pkg_resources.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index d124cb9acf..e88f0d8baa 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1546,7 +1546,6 @@ def load(self, path):
             self[path] = (stat.st_mtime, self.build(path))
 
         return self[path][1]
-    __call__ = load
 
     @classmethod
     def build(cls, path):
@@ -1566,7 +1565,7 @@ def build(cls, path):
                 for name in zfile.namelist()
             )
             return dict(items)
-build_zipmanifest = ZipManifests()
+zip_manifests = ZipManifests()
 
 
 class ContextualZipFile(zipfile.ZipFile):
@@ -1618,7 +1617,7 @@ def _parts(self, zip_path):
 
     @property
     def zipinfo(self):
-        return build_zipmanifest(self.loader.archive)  # memoized
+        return zip_manifests.load(self.loader.archive)
 
     def get_resource_filename(self, manager, resource_name):
         if not self.egg_name:

From 7b7c55a2353dc5af925174e585bfa3d2200343f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:22:53 -0400
Subject: [PATCH 4175/8469] Stat is never reused

---
 pkg_resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index e88f0d8baa..1100978a43 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1540,10 +1540,10 @@ def load(self, path):
         Load a manifest at path or return a suitable manifest already loaded.
         """
         path = os.path.normpath(path)
-        stat = os.stat(path)
+        mtime = os.stat(path).st_mtime
 
-        if path not in self or self[path][0] != stat.st_mtime:
-            self[path] = (stat.st_mtime, self.build(path))
+        if path not in self or self[path][0] != mtime:
+            self[path] = (mtime, self.build(path))
 
         return self[path][1]
 

From 2c729473ff7838c9206b792b50bdea123fef2e4c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:27:18 -0400
Subject: [PATCH 4176/8469] Use a namedtuple to avoid numeric indexes

---
 pkg_resources.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 1100978a43..2151082bdf 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -29,6 +29,7 @@
 import symbol
 import operator
 import platform
+import collections
 from pkgutil import get_importer
 
 try:
@@ -1534,6 +1535,7 @@ class ZipManifests(dict):
     """
     Memoized zipfile manifests.
     """
+    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
 
     def load(self, path):
         """
@@ -1542,10 +1544,11 @@ def load(self, path):
         path = os.path.normpath(path)
         mtime = os.stat(path).st_mtime
 
-        if path not in self or self[path][0] != mtime:
-            self[path] = (mtime, self.build(path))
+        if path not in self or self[path].mtime != mtime:
+            manifest = self.build(path)
+            self[path] = self.manifest_mod(manifest, mtime)
 
-        return self[path][1]
+        return self[path].manifest
 
     @classmethod
     def build(cls, path):

From 80661eaf5a8e016db73bfd8b1ecc3384aa666fcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:54:47 -0400
Subject: [PATCH 4177/8469] Update changelog

---
 CHANGES.txt | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8ca55c2ff2..94689f0a50 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,14 +2,27 @@
 CHANGES
 =======
 
----------------
-3.7.1 and 3.8.1
----------------
+---
+5.0
+---
+
+* Issue #218: Re-release of 3.8.1 to signal that it supersedes 4.x.
+
+-------------------------
+3.7.1 and 3.8.1 and 4.0.1
+-------------------------
 
 * Issue #213: Use legacy StringIO behavior for compatibility under pbr.
 * Issue #218: Setuptools 3.8.1 superseded 4.0.1, and 4.x was removed
   from the available versions to install.
 
+---
+4.0
+---
+
+* Issue #210: ``setup.py develop`` now copies scripts in binary mode rather
+  than text mode, matching the behavior of the ``install`` command.
+
 ---
 3.8
 ---

From c5bfbfcffea2168b8a4c05806fb1b9184eaf4206 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:55:13 -0400
Subject: [PATCH 4178/8469] Bumped to 5.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a10d971218..9072a09c1c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "3.8.2"
+DEFAULT_VERSION = "5.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 5b2ac99513..647ffb047b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.8.2'
+__version__ = '5.0'

From 8f8ecd70680ce981c5ebc4f0dbcb404fddc60cba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:55:15 -0400
Subject: [PATCH 4179/8469] Added tag 5.0 for changeset 84d936fd18a9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index acb4161d77..f71fbe327a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -140,3 +140,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8
 9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
 40744de29b848f0e88139ba91d645c08a56855e9 3.8.1
+84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0

From 35d3732c71a391367bb2f77d3cec1b254daa2287 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 12:55:44 -0400
Subject: [PATCH 4180/8469] Bumped to 5.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9072a09c1c..10d299bfe5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.0"
+DEFAULT_VERSION = "5.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 647ffb047b..59ff8876c1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.0'
+__version__ = '5.1'

From 6401988885a42d3f4c612c20973948b7b4cab7a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 14:41:05 -0400
Subject: [PATCH 4181/8469] Rename script template to use .tmpl extensions.

--HG--
rename : setuptools/script template (dev).py => setuptools/script (dev).tmpl
rename : setuptools/script template.py => setuptools/script.tmpl
---
 CHANGES.txt                                                | 7 +++++++
 setuptools/command/easy_install.py                         | 4 ++--
 setuptools/{script template (dev).py => script (dev).tmpl} | 0
 setuptools/{script template.py => script.tmpl}             | 0
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename setuptools/{script template (dev).py => script (dev).tmpl} (100%)
 rename setuptools/{script template.py => script.tmpl} (100%)

diff --git a/CHANGES.txt b/CHANGES.txt
index 94689f0a50..6186edc9c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+5.0.1
+-----
+
+* Renamed script templates to end with .tmpl now that they no longer need
+  to be processed by 2to3. Fixes spurious syntax errors during build/install.
+
 ---
 5.0
 ---
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 19ed12590c..cc5ddbd600 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -750,9 +750,9 @@ def get_template(filename):
         if is_script:
             # See https://bitbucket.org/pypa/setuptools/issue/134 for info
             #  on script file naming and downstream issues with SVR4
-            template_name = 'script template.py'
+            template_name = 'script.tmpl'
             if dev_path:
-                template_name = template_name.replace('.py', ' (dev).py')
+                template_name = template_name.replace('.tmpl', ' (dev).tmpl')
             script_text = (get_script_header(script_text) +
                 get_template(template_name) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
diff --git a/setuptools/script template (dev).py b/setuptools/script (dev).tmpl
similarity index 100%
rename from setuptools/script template (dev).py
rename to setuptools/script (dev).tmpl
diff --git a/setuptools/script template.py b/setuptools/script.tmpl
similarity index 100%
rename from setuptools/script template.py
rename to setuptools/script.tmpl

From b0766e6833f77f2d01cf00f9ebd52edbfe6fbd9c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 16:13:46 -0400
Subject: [PATCH 4182/8469] Bumped to 5.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 10d299bfe5..414ee8b843 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.1"
+DEFAULT_VERSION = "5.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 59ff8876c1..3d96b2761b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.1'
+__version__ = '5.0.1'

From ec99bec719f468dfd08ee7938f3664bf111c7da4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 16:13:47 -0400
Subject: [PATCH 4183/8469] Added tag 5.0.1 for changeset 871bd7b4326f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f71fbe327a..09c0876e4b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -141,3 +141,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
 40744de29b848f0e88139ba91d645c08a56855e9 3.8.1
 84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0
+871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1

From 1f83ddb9a7817c02cf93caceeb8b0e3d9dbebeaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 16:14:15 -0400
Subject: [PATCH 4184/8469] Bumped to 5.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 414ee8b843..e045f7608c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.0.1"
+DEFAULT_VERSION = "5.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 3d96b2761b..6a92b24477 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.0.1'
+__version__ = '5.0.2'

From 80fe9c804ef7f69283cdd6e68e3b2f2da4e6f549 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:14:12 -0400
Subject: [PATCH 4185/8469] Extract embedded function as protected
 staticmethod.

--HG--
extra : rebase_source : 04b4807ccc7bf95d87797716f5d3488d420fa692
---
 setuptools/command/easy_install.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index cc5ddbd600..32852e07fd 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -739,14 +739,6 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         spec = str(dist.as_requirement())
         is_script = is_python_script(script_text, script_name)
 
-        def get_template(filename):
-            """
-            There are a couple of template scripts in the package. This
-            function loads one of them and prepares it for use.
-            """
-            raw_bytes = resource_string('setuptools', template_name)
-            return raw_bytes.decode('utf-8')
-
         if is_script:
             # See https://bitbucket.org/pypa/setuptools/issue/134 for info
             #  on script file naming and downstream issues with SVR4
@@ -754,9 +746,18 @@ def get_template(filename):
             if dev_path:
                 template_name = template_name.replace('.tmpl', ' (dev).tmpl')
             script_text = (get_script_header(script_text) +
-                get_template(template_name) % locals())
+                self._load_template(template_name) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
+    @staticmethod
+    def _load_template(name):
+        """
+        There are a couple of template scripts in the package. This
+        function loads one of them and prepares it for use.
+        """
+        raw_bytes = resource_string('setuptools', name)
+        return raw_bytes.decode('utf-8')
+
     def write_script(self, script_name, contents, mode="t", blockers=()):
         """Write an executable file to the scripts directory"""
         self.delete_blockers(   # clean up old .py/.pyw w/o a script

From 99475b7b9ca2650e265fb1d889710865f1fa35f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:31:33 -0400
Subject: [PATCH 4186/8469] Moved filename resolution into _load_template

--HG--
extra : rebase_source : beb6c57dfd500432304518b9d313d1a98e2614b9
---
 setuptools/command/easy_install.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 32852e07fd..a8ee6063b0 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -740,21 +740,22 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         is_script = is_python_script(script_text, script_name)
 
         if is_script:
-            # See https://bitbucket.org/pypa/setuptools/issue/134 for info
-            #  on script file naming and downstream issues with SVR4
-            template_name = 'script.tmpl'
-            if dev_path:
-                template_name = template_name.replace('.tmpl', ' (dev).tmpl')
             script_text = (get_script_header(script_text) +
-                self._load_template(template_name) % locals())
+                self._load_template(dev_path) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
     @staticmethod
-    def _load_template(name):
+    def _load_template(dev_path):
         """
         There are a couple of template scripts in the package. This
         function loads one of them and prepares it for use.
         """
+        # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+        #  on script file naming and downstream issues with SVR4
+        name = 'script.tmpl'
+        if dev_path:
+            name = name.replace('.tmpl', ' (dev).tmpl')
+
         raw_bytes = resource_string('setuptools', name)
         return raw_bytes.decode('utf-8')
 

From 7f5307b04dfcd19cc3d894a921bfa85160369d6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:46:38 -0400
Subject: [PATCH 4187/8469] Remove unused variable and import

---
 setuptools/tests/test_integration.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 372535ecad..0565e92602 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -9,7 +9,6 @@
 import site
 import sys
 import tempfile
-import unittest
 
 import pytest
 
@@ -54,7 +53,6 @@ def fin():
     os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
 
     # Set up the command for performing the installation.
-    values = {}
     dist = Distribution()
     cmd = easy_install(dist)
     cmd.install_dir = install_dir

From def90a0a72012590fccd9a8bc0e247242f09b795 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 08:47:16 -0400
Subject: [PATCH 4188/8469] Mark failing tests as xfail

---
 setuptools/tests/test_integration.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 0565e92602..3938ccc503 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -72,14 +72,17 @@ def test_stevedore(install_context):
     _install_one('stevedore', install_context,
                  'stevedore', 'extension.py')
 
+@pytest.mark.xfail
 def test_virtualenvwrapper(install_context):
     _install_one('virtualenvwrapper', install_context,
                  'virtualenvwrapper', 'hook_loader.py')
 
+@pytest.mark.xfail
 def test_pbr(install_context):
     _install_one('pbr', install_context,
                  'pbr', 'core.py')
 
+@pytest.mark.xfail
 def test_python_novaclient(install_context):
     _install_one('python-novaclient', install_context,
                  'novaclient', 'base.py')

From 7fecd7a9665f9710c609b6f8fd8227e126d99ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Sun, 15 Jun 2014 16:30:27 +0200
Subject: [PATCH 4189/8469] remove instead of fix stale
 zipimport._zip_directory_cache data on PyPy

PyPy's zipimport._zip_directory_cache implementation does not support direct
item assignment, thus breaking our attempts at silently updating the cached zip
archive directory information behind the scene. As a workaround, when using
PyPy, we fall back to simply clearing the stale cached information.

--HG--
extra : amend_source : 991e30244754d8fac042da56ac4cf0ad1a0f50d5
---
 setuptools/command/easy_install.py | 67 +++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 12299f4f3b..65e3dc8c56 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1613,10 +1613,11 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
     instances connected to the same archive share the same cached directory
     information.
 
-    If asked, we can fix all existing zipimport.zipimporter instances instead
-    of having to track them down and remove them one by one, by updating their
-    shared cached zip archive directory information. This, of course, assumes
-    that the replacement distribution is packaged as a zipped egg.
+    If asked, and the underlying Python implementation allows it, we can fix
+    all existing zipimport.zipimporter instances instead of having to track
+    them down and remove them one by one, by updating their shared cached zip
+    archive directory information. This, of course, assumes that the
+    replacement distribution is packaged as a zipped egg.
 
     If not asked to fix existing zipimport.zipimporter instances, we still do
     our best to clear any remaining zipimport.zipimporter related cached data
@@ -1698,11 +1699,14 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
     """
     for p in _collect_zipimporter_cache_entries(normalized_path, cache):
         # N.B. pypy's custom zipimport._zip_directory_cache implementation does
-        # not support the complete dict interface, e.g. it does not support the
-        # dict.pop() method. For more detailed information see the following
-        # links:
-        #   https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
-        #   https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
+        # not support the complete dict interface:
+        #  * Does not support item assignment, thus not allowing this function
+        #    to be used only for removing existing cache entries.
+        #  * Does not support the dict.pop() method, forcing us to use the
+        #    get/del patterns instead. For more detailed information see the
+        #    following links:
+        #      https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+        #      https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
         old_entry = cache[p]
         del cache[p]
         new_entry = updater and updater(p, old_entry)
@@ -1712,22 +1716,6 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
 def _uncache(normalized_path, cache):
     _update_zipimporter_cache(normalized_path, cache)
 
-def _replace_zip_directory_cache_data(normalized_path):
-    def replace_cached_zip_archive_directory_data(path, old_entry):
-        # N.B. In theory, we could load the zip directory information just once
-        # for all updated path spellings, and then copy it locally and update
-        # its contained path strings to contain the correct spelling, but that
-        # seems like a way too invasive move (this cache structure is not
-        # officially documented anywhere and could in theory change with new
-        # Python releases) for no significant benefit.
-        old_entry.clear()
-        zipimport.zipimporter(path)
-        old_entry.update(zipimport._zip_directory_cache[path])
-        return old_entry
-    _update_zipimporter_cache(normalized_path,
-        zipimport._zip_directory_cache,
-        updater=replace_cached_zip_archive_directory_data)
-
 def _remove_and_clear_zip_directory_cache_data(normalized_path):
     def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
         old_entry.clear()
@@ -1735,6 +1723,35 @@ def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
         zipimport._zip_directory_cache,
         updater=clear_and_remove_cached_zip_archive_directory_data)
 
+# PyPy Python implementation does not allow directly writing to the
+# zipimport._zip_directory_cache and so prevents us from attempting to correct
+# its content. The best we can do there is clear the problematic cache content
+# and have PyPy repopulate it as needed. The downside is that if there are any
+# stale zipimport.zipimporter instances laying around, attempting to use them
+# will fail due to not having its zip archive directory information available
+# instead of being automatically corrected to use the new correct zip archive
+# directory information.
+if '__pypy__' in sys.builtin_module_names:
+    _replace_zip_directory_cache_data =  \
+        _remove_and_clear_zip_directory_cache_data
+else:
+    def _replace_zip_directory_cache_data(normalized_path):
+        def replace_cached_zip_archive_directory_data(path, old_entry):
+            # N.B. In theory, we could load the zip directory information just
+            # once for all updated path spellings, and then copy it locally and
+            # update its contained path strings to contain the correct
+            # spelling, but that seems like a way too invasive move (this cache
+            # structure is not officially documented anywhere and could in
+            # theory change with new Python releases) for no significant
+            # benefit.
+            old_entry.clear()
+            zipimport.zipimporter(path)
+            old_entry.update(zipimport._zip_directory_cache[path])
+            return old_entry
+        _update_zipimporter_cache(normalized_path,
+            zipimport._zip_directory_cache,
+            updater=replace_cached_zip_archive_directory_data)
+
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"
     try:

From ca7d4bdf5a89e04565923c387cc28c15ddc37e5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:36:15 -0400
Subject: [PATCH 4190/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a12b038705..5ebe6f1c90 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+5.1
+---
+
+* Issue #202: Implemented more robust cache invalidation for the ZipImporter,
+  building on the work in Issue #168. Special thanks to Jurko Gospodnetić and
+  PJE.
+
 -----
 5.0.2
 -----

From 184e94ebbb8324496fdfd3510aa5767028586736 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:40:55 -0400
Subject: [PATCH 4191/8469] Use io.open for changes file as well to support
 UTF-8 encoding.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 719a1937e1..54a86e8bbc 100755
--- a/setup.py
+++ b/setup.py
@@ -92,10 +92,10 @@ def _save_entry_points(self):
 
 # the release script adds hyperlinks to issues
 if os.path.exists('CHANGES (links).txt'):
-    changes_file = open('CHANGES (links).txt')
+    changes_file = io.open('CHANGES (links).txt', encoding='utf-8')
 else:
     # but if the release script has not run, fall back to the source file
-    changes_file = open('CHANGES.txt')
+    changes_file = io.open('CHANGES.txt', encoding='utf-8')
 with readme_file:
     with changes_file:
         long_description = readme_file.read() + '\n' + changes_file.read()

From 8ddfbc2a194b35a39427e18381b0f63d4323e9a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:43:43 -0400
Subject: [PATCH 4192/8469] Use iterables to determine the best filename to use
 for changes.

---
 setup.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 54a86e8bbc..1c2e0234e2 100755
--- a/setup.py
+++ b/setup.py
@@ -90,12 +90,12 @@ def _save_entry_points(self):
 
 readme_file = io.open('README.txt', encoding='utf-8')
 
-# the release script adds hyperlinks to issues
-if os.path.exists('CHANGES (links).txt'):
-    changes_file = io.open('CHANGES (links).txt', encoding='utf-8')
-else:
-    # but if the release script has not run, fall back to the source file
-    changes_file = io.open('CHANGES.txt', encoding='utf-8')
+# The release script adds hyperlinks to issues,
+# but if the release script has not run, fall back to the source file
+changes_names = 'CHANGES (links).txt', 'CHANGES.txt'
+changes_fn = next(filter(os.path.exists, changes_names))
+changes_file = io.open(changes_fn, encoding='utf-8')
+
 with readme_file:
     with changes_file:
         long_description = readme_file.read() + '\n' + changes_file.read()

From 35e1b62fafef75e9ea9ff12b3953b61a8d197a87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:46:08 -0400
Subject: [PATCH 4193/8469] necessary to explicitly invoke 'iter' in Python 2

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1c2e0234e2..f7be05670c 100755
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,7 @@ def _save_entry_points(self):
 # The release script adds hyperlinks to issues,
 # but if the release script has not run, fall back to the source file
 changes_names = 'CHANGES (links).txt', 'CHANGES.txt'
-changes_fn = next(filter(os.path.exists, changes_names))
+changes_fn = next(iter(filter(os.path.exists, changes_names)))
 changes_file = io.open(changes_fn, encoding='utf-8')
 
 with readme_file:

From 18723dfe43aa77d40e75ed3f5dada23d48e78678 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:48:07 -0400
Subject: [PATCH 4194/8469] Bumped to 5.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 107ed6906e..10d299bfe5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.0.3"
+DEFAULT_VERSION = "5.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index f30cd813e2..59ff8876c1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.0.3'
+__version__ = '5.1'

From 0faca62f03cb259d1ccbbed2c4df76a7bfc3ae97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:48:09 -0400
Subject: [PATCH 4195/8469] Added tag 5.1 for changeset 3a948b6d01e3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 836fc08a32..e5a7d6b505 100644
--- a/.hgtags
+++ b/.hgtags
@@ -143,3 +143,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0
 871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1
 95996b713722376679c3168b15ab12ea8360dd5f 5.0.2
+3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1

From f29e0692c4e4cbfccda2cc2df48a14e09f54a2ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jun 2014 12:48:34 -0400
Subject: [PATCH 4196/8469] Bumped to 5.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 10d299bfe5..0206019984 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.1"
+DEFAULT_VERSION = "5.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 59ff8876c1..f01f2739ab 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.1'
+__version__ = '5.2'

From 68dd639c91b8ff263f53bd303a766f30399820d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jun 2014 07:56:55 -0400
Subject: [PATCH 4197/8469] Bypass dist/build/egg dirs when running tests

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index eb63264c18..7f5fc79681 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,3 +22,4 @@ universal=1
 
 [pytest]
 addopts=--ignore tests/manual_test.py --ignore tests/shlib_test
+norecursedirs=dist build *.egg

From 9e7522ee611796e568aa58dc0bc878ac8a1c471c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jun 2014 08:12:08 -0400
Subject: [PATCH 4198/8469] Started work on a developer guide.

---
 docs/developer-guide.txt | 41 ++++++++++++++++++++++++++++++++++++++++
 docs/development.txt     |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 docs/developer-guide.txt

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
new file mode 100644
index 0000000000..fbee5e672f
--- /dev/null
+++ b/docs/developer-guide.txt
@@ -0,0 +1,41 @@
+================================
+Developer's Guide for Setuptools
+================================
+
+If you want to know more about contributing on Setuptools, this is the place.
+
+
+.. contents:: **Table of Contents**
+
+
+----------------------
+Repository and Tracker
+----------------------
+
+...
+
+.. git mirror
+
+-----------------
+Authoring Tickets
+-----------------
+
+...
+
+------------------------
+Submitting Pull Requests
+------------------------
+
+Use Mercurial bookmarks or Git branches. Use incremental commits. Minimize
+stylistic changes.
+
+-------------------
+Semantic Versioning
+-------------------
+
+Setuptools follows ``semver`` with some exceptions:
+
+- Uses two-segment version when three segment version ends in zero
+- Omits 'v' prefix for tags.
+
+.. explain value of reflecting meaning in versions.
diff --git a/docs/development.txt b/docs/development.txt
index ba927c7360..e35ba39b69 100644
--- a/docs/development.txt
+++ b/docs/development.txt
@@ -30,6 +30,7 @@ setuptools changes.  You have been warned.
 .. toctree::
    :maxdepth: 1
 
+   .. developer-guide
    formats
    releases
 

From 96efb0e69b7caf488f73b1713b35fd442332ef00 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Jun 2014 11:02:35 -0400
Subject: [PATCH 4199/8469] Remove superfluous import

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7713bf022d..4fcae97801 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -280,12 +280,11 @@ def _feature_attrname(self,name):
 
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
-        from pkg_resources import working_set, parse_requirements
-        for dist in working_set.resolve(
-            parse_requirements(requires), installer=self.fetch_build_egg,
+        for dist in pkg_resources.working_set.resolve(
+            pkg_resources.parse_requirements(requires), installer=self.fetch_build_egg,
             replace_conflicting=True
         ):
-            working_set.add(dist, replace=True)
+            pkg_resources.working_set.add(dist, replace=True)
 
     def finalize_options(self):
         _Distribution.finalize_options(self)

From 25a0f6733a92425e55830f8169a38fc9b0d3350e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 Jun 2014 11:03:30 -0400
Subject: [PATCH 4200/8469] Extract variable for clarity.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4fcae97801..8de95a387f 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -280,10 +280,12 @@ def _feature_attrname(self,name):
 
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
-        for dist in pkg_resources.working_set.resolve(
-            pkg_resources.parse_requirements(requires), installer=self.fetch_build_egg,
-            replace_conflicting=True
-        ):
+        resolved_dists = pkg_resources.working_set.resolve(
+            pkg_resources.parse_requirements(requires),
+            installer=self.fetch_build_egg,
+            replace_conflicting=True,
+        )
+        for dist in resolved_dists:
             pkg_resources.working_set.add(dist, replace=True)
 
     def finalize_options(self):

From d9fd333e6548f9f39f5ee80bd59b258d4f1ca194 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Tue, 3 Jun 2014 13:28:24 +1000
Subject: [PATCH 4201/8469] Cleanup ignore files

---
 .gitignore | 26 ++++++++++++--------------
 .hgignore  | 21 ++++++++++-----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b00d3c861..05c0808d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,16 @@
-*.pyc
-*~
-*.swp
-.coverage
-.tox
-distribute.egg-info
-setuptools.egg-info
+# syntax: glob
+bin
 build
 dist
-lib
-bin
 include
-\.Python
-*.swp
+lib
+distribute.egg-info
+setuptools.egg-info
+.coverage
+.tox
 CHANGES (links).txt
-.git*
-py-*.egg
-pytest-*.egg
+*.egg
+*.py[cod]
+*.swp
+*~
+.hg*
diff --git a/.hgignore b/.hgignore
index e2398d342b..d70c9a7c48 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,17 +1,16 @@
 syntax: glob
-*.pyc
-*~
-*.swp
-.coverage
-.tox
-distribute.egg-info
-setuptools.egg-info
+bin
 build
 dist
-lib
-bin
 include
-\.Python
-*.swp
+lib
+distribute.egg-info
+setuptools.egg-info
+.coverage
+.tox
 CHANGES (links).txt
+*.egg
+*.py[cod]
+*.swp
+*~
 .git*

From 9179bdd01411484226a3a18ef57187dcf9022535 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Tue, 3 Jun 2014 14:06:53 +1000
Subject: [PATCH 4202/8469] Cleanup fixture using tmp and monkeypatch

---
 setuptools/tests/test_integration.py | 48 ++++++++++++----------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 3938ccc503..7144aa6c9a 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -5,10 +5,7 @@
 
 import glob
 import os
-import shutil
-import site
 import sys
-import tempfile
 
 import pytest
 
@@ -18,44 +15,35 @@
 
 
 @pytest.fixture
-def install_context(request):
+def install_context(request, tmpdir, monkeypatch):
     """Fixture to set up temporary installation directory.
     """
     # Save old values so we can restore them.
-    new_cwd = tempfile.mkdtemp()
-    old_cwd = os.getcwd()
-    old_enable_site = site.ENABLE_USER_SITE
-    old_file = easy_install_pkg.__file__
-    old_base = site.USER_BASE
-    old_site = site.USER_SITE
-    old_ppath = os.environ.get('PYTHONPATH')
+    new_cwd = tmpdir.mkdir('cwd')
+    user_base = tmpdir.mkdir('user_base')
+    user_site = tmpdir.mkdir('user_site')
+    install_dir = tmpdir.mkdir('install_dir')
 
     def fin():
-        os.chdir(old_cwd)
-        shutil.rmtree(new_cwd)
-        shutil.rmtree(site.USER_BASE)
-        shutil.rmtree(site.USER_SITE)
-        site.USER_BASE = old_base
-        site.USER_SITE = old_site
-        site.ENABLE_USER_SITE = old_enable_site
-        easy_install_pkg.__file__ = old_file
-        os.environ['PYTHONPATH'] = old_ppath or ''
+        new_cwd.remove()
+        user_base.remove()
+        user_site.remove()
+        install_dir.remove()
     request.addfinalizer(fin)
 
     # Change the environment and site settings to control where the
     # files are installed and ensure we do not overwrite anything.
-    site.USER_BASE = tempfile.mkdtemp()
-    site.USER_SITE = tempfile.mkdtemp()
-    easy_install_pkg.__file__ = site.USER_SITE
-    os.chdir(new_cwd)
-    install_dir = tempfile.mkdtemp()
-    sys.path.append(install_dir)
-    os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
+    monkeypatch.chdir(new_cwd)
+    monkeypatch.setattr(easy_install_pkg, '__file__', user_site.strpath)
+    monkeypatch.setattr('site.USER_BASE', user_base.strpath)
+    monkeypatch.setattr('site.USER_SITE', user_site.strpath)
+    monkeypatch.setattr('sys.path', sys.path + [install_dir.strpath])
+    monkeypatch.setenv('PYTHONPATH', os.path.pathsep.join(sys.path))
 
     # Set up the command for performing the installation.
     dist = Distribution()
     cmd = easy_install(dist)
-    cmd.install_dir = install_dir
+    cmd.install_dir = install_dir.strpath
     return cmd
 
 
@@ -68,20 +56,24 @@ def _install_one(requirement, cmd, pkgname, modulename):
     assert dest_path
     assert os.path.exists(os.path.join(dest_path[0], pkgname, modulename))
 
+
 def test_stevedore(install_context):
     _install_one('stevedore', install_context,
                  'stevedore', 'extension.py')
 
+
 @pytest.mark.xfail
 def test_virtualenvwrapper(install_context):
     _install_one('virtualenvwrapper', install_context,
                  'virtualenvwrapper', 'hook_loader.py')
 
+
 @pytest.mark.xfail
 def test_pbr(install_context):
     _install_one('pbr', install_context,
                  'pbr', 'core.py')
 
+
 @pytest.mark.xfail
 def test_python_novaclient(install_context):
     _install_one('python-novaclient', install_context,

From 8e3f9d3253d1d0fb820dad4249d5110d017595c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Wed, 18 Jun 2014 20:31:05 +0300
Subject: [PATCH 4203/8469] Fixed PEP 8 compliancy of the setuptools.command
 package

---
 setuptools/command/__init__.py           |   5 +-
 setuptools/command/alias.py              |  14 +-
 setuptools/command/bdist_egg.py          | 157 ++++---
 setuptools/command/bdist_rpm.py          |   3 +-
 setuptools/command/bdist_wininst.py      |   1 +
 setuptools/command/build_ext.py          | 122 +++---
 setuptools/command/build_py.py           |  65 +--
 setuptools/command/develop.py            |  37 +-
 setuptools/command/easy_install.py       | 529 +++++++++++++----------
 setuptools/command/egg_info.py           | 100 +++--
 setuptools/command/install.py            |  18 +-
 setuptools/command/install_egg_info.py   |  70 ++-
 setuptools/command/install_lib.py        |  12 +-
 setuptools/command/install_scripts.py    |  13 +-
 setuptools/command/launcher manifest.xml |  18 +-
 setuptools/command/register.py           |   1 +
 setuptools/command/rotate.py             |  23 +-
 setuptools/command/saveopts.py           |  14 +-
 setuptools/command/sdist.py              |  39 +-
 setuptools/command/setopt.py             |  45 +-
 setuptools/command/test.py               |  32 +-
 setuptools/command/upload_docs.py        |  18 +-
 22 files changed, 734 insertions(+), 602 deletions(-)

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 29c9d75ad1..f6dbc39c40 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -5,10 +5,11 @@
     'register', 'bdist_wininst', 'upload_docs',
 ]
 
-from setuptools.command import install_scripts
+from distutils.command.bdist import bdist
 import sys
 
-from distutils.command.bdist import bdist
+from setuptools.command import install_scripts
+
 
 if 'egg' not in bdist.format_commands:
     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 05c0766bd4..452a9244ea 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -2,10 +2,12 @@
 
 from setuptools.command.setopt import edit_config, option_base, config_file
 
+
 def shquote(arg):
     """Quote an argument for later parsing by shlex.split()"""
     for c in '"', "'", "\\", "#":
-        if c in arg: return repr(arg)
+        if c in arg:
+            return repr(arg)
     if arg.split() != [arg]:
         return repr(arg)
     return arg
@@ -18,7 +20,7 @@ class alias(option_base):
     command_consumes_arguments = True
 
     user_options = [
-        ('remove',  'r', 'remove (unset) the alias'),
+        ('remove', 'r', 'remove (unset) the alias'),
     ] + option_base.user_options
 
     boolean_options = option_base.boolean_options + ['remove']
@@ -46,7 +48,7 @@ def run(self):
                 print("setup.py alias", format_alias(alias, aliases))
             return
 
-        elif len(self.args)==1:
+        elif len(self.args) == 1:
             alias, = self.args
             if self.remove:
                 command = None
@@ -58,9 +60,9 @@ def run(self):
                 return
         else:
             alias = self.args[0]
-            command = ' '.join(map(shquote,self.args[1:]))
+            command = ' '.join(map(shquote, self.args[1:]))
 
-        edit_config(self.filename, {'aliases': {alias:command}}, self.dry_run)
+        edit_config(self.filename, {'aliases': {alias: command}}, self.dry_run)
 
 
 def format_alias(name, aliases):
@@ -73,4 +75,4 @@ def format_alias(name, aliases):
         source = ''
     else:
         source = '--filename=%r' % source
-    return source+name+' '+command
+    return source + name + ' ' + command
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index c19a0ba7ea..831d6042aa 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -3,29 +3,33 @@
 Build .egg distributions"""
 
 # This module should be kept compatible with Python 2.3
+from distutils.errors import DistutilsSetupError
+from distutils.dir_util import remove_tree, mkpath
+from distutils import log
+from types import CodeType
 import sys
 import os
 import marshal
 import textwrap
+
+from pkg_resources import get_build_platform, Distribution, ensure_directory
+from pkg_resources import EntryPoint
+from setuptools.compat import basestring, next
+from setuptools.extension import Library
 from setuptools import Command
-from distutils.dir_util import remove_tree, mkpath
+
 try:
     # Python 2.7 or >=3.2
     from sysconfig import get_path, get_python_version
+
     def _get_purelib():
         return get_path("purelib")
 except ImportError:
     from distutils.sysconfig import get_python_lib, get_python_version
+
     def _get_purelib():
         return get_python_lib(False)
 
-from distutils import log
-from distutils.errors import DistutilsSetupError
-from pkg_resources import get_build_platform, Distribution, ensure_directory
-from pkg_resources import EntryPoint
-from types import CodeType
-from setuptools.compat import basestring, next
-from setuptools.extension import Library
 
 def strip_module(filename):
     if '.' in filename:
@@ -34,6 +38,7 @@ def strip_module(filename):
         filename = filename[:-6]
     return filename
 
+
 def write_stub(resource, pyfile):
     _stub_template = textwrap.dedent("""
         def __bootstrap__():
@@ -49,23 +54,22 @@ def __bootstrap__():
 
 
 class bdist_egg(Command):
-
     description = "create an \"egg\" distribution"
 
     user_options = [
         ('bdist-dir=', 'b',
-            "temporary directory for creating the distribution"),
+         "temporary directory for creating the distribution"),
         ('plat-name=', 'p', "platform name to embed in generated filenames "
-            "(default: %s)" % get_build_platform()),
+                            "(default: %s)" % get_build_platform()),
         ('exclude-source-files', None,
-            "remove all .py files from the generated egg"),
+         "remove all .py files from the generated egg"),
         ('keep-temp', 'k',
-            "keep the pseudo-installation tree around after " +
-            "creating the distribution archive"),
+         "keep the pseudo-installation tree around after " +
+         "creating the distribution archive"),
         ('dist-dir=', 'd',
-            "directory to put final built distributions in"),
+         "directory to put final built distributions in"),
         ('skip-build', None,
-            "skip rebuilding everything (for testing/debugging)"),
+         "skip rebuilding everything (for testing/debugging)"),
     ]
 
     boolean_options = [
@@ -92,7 +96,7 @@ def finalize_options(self):
         if self.plat_name is None:
             self.plat_name = get_build_platform()
 
-        self.set_undefined_options('bdist',('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
         if self.egg_output is None:
 
@@ -103,25 +107,25 @@ def finalize_options(self):
                 self.distribution.has_ext_modules() and self.plat_name
             ).egg_name()
 
-            self.egg_output = os.path.join(self.dist_dir, basename+'.egg')
+            self.egg_output = os.path.join(self.dist_dir, basename + '.egg')
 
     def do_install_data(self):
         # Hack for packages that install data to install's --install-lib
         self.get_finalized_command('install').install_lib = self.bdist_dir
 
         site_packages = os.path.normcase(os.path.realpath(_get_purelib()))
-        old, self.distribution.data_files = self.distribution.data_files,[]
+        old, self.distribution.data_files = self.distribution.data_files, []
 
         for item in old:
-            if isinstance(item,tuple) and len(item)==2:
+            if isinstance(item, tuple) and len(item) == 2:
                 if os.path.isabs(item[0]):
                     realpath = os.path.realpath(item[0])
                     normalized = os.path.normcase(realpath)
-                    if normalized==site_packages or normalized.startswith(
-                        site_packages+os.sep
+                    if normalized == site_packages or normalized.startswith(
+                        site_packages + os.sep
                     ):
-                        item = realpath[len(site_packages)+1:], item[1]
-                    # XXX else: raise ???
+                        item = realpath[len(site_packages) + 1:], item[1]
+                        # XXX else: raise ???
             self.distribution.data_files.append(item)
 
         try:
@@ -133,11 +137,11 @@ def do_install_data(self):
     def get_outputs(self):
         return [self.egg_output]
 
-    def call_command(self,cmdname,**kw):
+    def call_command(self, cmdname, **kw):
         """Invoke reinitialized command `cmdname` with keyword args"""
         for dirname in INSTALL_DIRECTORY_ATTRS:
-            kw.setdefault(dirname,self.bdist_dir)
-        kw.setdefault('skip_build',self.skip_build)
+            kw.setdefault(dirname, self.bdist_dir)
+        kw.setdefault('skip_build', self.skip_build)
         kw.setdefault('dry_run', self.dry_run)
         cmd = self.reinitialize_command(cmdname, **kw)
         self.run_command(cmdname)
@@ -160,15 +164,16 @@ def run(self):
         all_outputs, ext_outputs = self.get_ext_outputs()
         self.stubs = []
         to_compile = []
-        for (p,ext_name) in enumerate(ext_outputs):
-            filename,ext = os.path.splitext(ext_name)
-            pyfile = os.path.join(self.bdist_dir, strip_module(filename)+'.py')
+        for (p, ext_name) in enumerate(ext_outputs):
+            filename, ext = os.path.splitext(ext_name)
+            pyfile = os.path.join(self.bdist_dir, strip_module(filename) +
+                                  '.py')
             self.stubs.append(pyfile)
             log.info("creating stub loader for %s" % ext_name)
             if not self.dry_run:
                 write_stub(os.path.basename(ext_name), pyfile)
             to_compile.append(pyfile)
-            ext_outputs[p] = ext_name.replace(os.sep,'/')
+            ext_outputs[p] = ext_name.replace(os.sep, '/')
 
         if to_compile:
             cmd.byte_compile(to_compile)
@@ -177,12 +182,13 @@ def run(self):
 
         # Make the EGG-INFO directory
         archive_root = self.bdist_dir
-        egg_info = os.path.join(archive_root,'EGG-INFO')
+        egg_info = os.path.join(archive_root, 'EGG-INFO')
         self.mkpath(egg_info)
         if self.distribution.scripts:
             script_dir = os.path.join(egg_info, 'scripts')
             log.info("installing scripts to %s" % script_dir)
-            self.call_command('install_scripts',install_dir=script_dir,no_ep=1)
+            self.call_command('install_scripts', install_dir=script_dir,
+                              no_ep=1)
 
         self.copy_metadata_to(egg_info)
         native_libs = os.path.join(egg_info, "native_libs.txt")
@@ -200,10 +206,10 @@ def run(self):
                 os.unlink(native_libs)
 
         write_safety_flag(
-            os.path.join(archive_root,'EGG-INFO'), self.zip_safe()
+            os.path.join(archive_root, 'EGG-INFO'), self.zip_safe()
         )
 
-        if os.path.exists(os.path.join(self.egg_info,'depends.txt')):
+        if os.path.exists(os.path.join(self.egg_info, 'depends.txt')):
             log.warn(
                 "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n"
                 "Use the install_requires/extras_require setup() args instead."
@@ -214,25 +220,25 @@ def run(self):
 
         # Make the archive
         make_zipfile(self.egg_output, archive_root, verbose=self.verbose,
-            dry_run=self.dry_run, mode=self.gen_header())
+                     dry_run=self.dry_run, mode=self.gen_header())
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
         # Add to 'Distribution.dist_files' so that the "upload" command works
-        getattr(self.distribution,'dist_files',[]).append(
-            ('bdist_egg',get_python_version(),self.egg_output))
+        getattr(self.distribution, 'dist_files', []).append(
+            ('bdist_egg', get_python_version(), self.egg_output))
 
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
-        for base,dirs,files in walk_egg(self.bdist_dir):
+        for base, dirs, files in walk_egg(self.bdist_dir):
             for name in files:
                 if name.endswith('.py'):
-                    path = os.path.join(base,name)
+                    path = os.path.join(base, name)
                     log.debug("Deleting %s", path)
                     os.unlink(path)
 
     def zip_safe(self):
-        safe = getattr(self.distribution,'zip_safe',None)
+        safe = getattr(self.distribution, 'zip_safe', None)
         if safe is not None:
             return safe
         log.warn("zip_safe flag not set; analyzing archive contents...")
@@ -240,7 +246,7 @@ def zip_safe(self):
 
     def gen_header(self):
         epm = EntryPoint.parse_map(self.distribution.entry_points or '')
-        ep = epm.get('setuptools.installation',{}).get('eggsecutable')
+        ep = epm.get('setuptools.installation', {}).get('eggsecutable')
         if ep is None:
             return 'w'  # not an eggsecutable, do it the usual way.
 
@@ -268,7 +274,6 @@ def gen_header(self):
             '  echo Please rename it back to %(basename)s and try again.\n'
             '  exec false\n'
             'fi\n'
-
         ) % locals()
 
         if not self.dry_run:
@@ -283,7 +288,7 @@ def copy_metadata_to(self, target_dir):
         # normalize the path (so that a forward-slash in egg_info will
         # match using startswith below)
         norm_egg_info = os.path.normpath(self.egg_info)
-        prefix = os.path.join(norm_egg_info,'')
+        prefix = os.path.join(norm_egg_info, '')
         for path in self.ei_cmd.filelist.files:
             if path.startswith(prefix):
                 target = os.path.join(target_dir, path[len(prefix):])
@@ -296,23 +301,24 @@ def get_ext_outputs(self):
         all_outputs = []
         ext_outputs = []
 
-        paths = {self.bdist_dir:''}
+        paths = {self.bdist_dir: ''}
         for base, dirs, files in os.walk(self.bdist_dir):
             for filename in files:
                 if os.path.splitext(filename)[1].lower() in NATIVE_EXTENSIONS:
-                    all_outputs.append(paths[base]+filename)
+                    all_outputs.append(paths[base] + filename)
             for filename in dirs:
-                paths[os.path.join(base,filename)] = paths[base]+filename+'/'
+                paths[os.path.join(base, filename)] = (paths[base] +
+                                                       filename + '/')
 
         if self.distribution.has_ext_modules():
             build_cmd = self.get_finalized_command('build_ext')
             for ext in build_cmd.extensions:
-                if isinstance(ext,Library):
+                if isinstance(ext, Library):
                     continue
                 fullname = build_cmd.get_ext_fullname(ext.name)
                 filename = build_cmd.get_ext_filename(fullname)
                 if not os.path.basename(filename).startswith('dl-'):
-                    if os.path.exists(os.path.join(self.bdist_dir,filename)):
+                    if os.path.exists(os.path.join(self.bdist_dir, filename)):
                         ext_outputs.append(filename)
 
         return all_outputs, ext_outputs
@@ -324,19 +330,21 @@ def get_ext_outputs(self):
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
     walker = os.walk(egg_dir)
-    base,dirs,files = next(walker)
+    base, dirs, files = next(walker)
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
-    yield base,dirs,files
+    yield base, dirs, files
     for bdf in walker:
         yield bdf
 
+
 def analyze_egg(egg_dir, stubs):
     # check for existing flag in EGG-INFO
-    for flag,fn in safety_flags.items():
-        if os.path.exists(os.path.join(egg_dir,'EGG-INFO',fn)):
+    for flag, fn in safety_flags.items():
+        if os.path.exists(os.path.join(egg_dir, 'EGG-INFO', fn)):
             return flag
-    if not can_scan(): return False
+    if not can_scan():
+        return False
     safe = True
     for base, dirs, files in walk_egg(egg_dir):
         for name in files:
@@ -347,36 +355,39 @@ def analyze_egg(egg_dir, stubs):
                 safe = scan_module(egg_dir, base, name, stubs) and safe
     return safe
 
+
 def write_safety_flag(egg_dir, safe):
     # Write or remove zip safety flag file(s)
-    for flag,fn in safety_flags.items():
+    for flag, fn in safety_flags.items():
         fn = os.path.join(egg_dir, fn)
         if os.path.exists(fn):
             if safe is None or bool(safe) != flag:
                 os.unlink(fn)
-        elif safe is not None and bool(safe)==flag:
-            f = open(fn,'wt')
+        elif safe is not None and bool(safe) == flag:
+            f = open(fn, 'wt')
             f.write('\n')
             f.close()
 
+
 safety_flags = {
     True: 'zip-safe',
     False: 'not-zip-safe',
 }
 
+
 def scan_module(egg_dir, base, name, stubs):
     """Check whether module possibly uses unsafe-for-zipfile stuff"""
 
-    filename = os.path.join(base,name)
+    filename = os.path.join(base, name)
     if filename[:-1] in stubs:
-        return True     # Extension module
-    pkg = base[len(egg_dir)+1:].replace(os.sep,'.')
-    module = pkg+(pkg and '.' or '')+os.path.splitext(name)[0]
+        return True  # Extension module
+    pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
+    module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
     if sys.version_info < (3, 3):
-        skip = 8   # skip magic & date
+        skip = 8  # skip magic & date
     else:
         skip = 12  # skip magic & date & file size
-    f = open(filename,'rb')
+    f = open(filename, 'rb')
     f.read(skip)
     code = marshal.load(f)
     f.close()
@@ -396,21 +407,24 @@ def scan_module(egg_dir, base, name, stubs):
                 log.warn("%s: module MAY be using inspect.%s", module, bad)
                 safe = False
     if '__name__' in symbols and '__main__' in symbols and '.' not in module:
-        if sys.version[:3]=="2.4":  # -m works w/zipfiles in 2.5
+        if sys.version[:3] == "2.4":  # -m works w/zipfiles in 2.5
             log.warn("%s: top-level module may be 'python -m' script", module)
             safe = False
     return safe
 
+
 def iter_symbols(code):
     """Yield names and strings used by `code` and its nested code objects"""
-    for name in code.co_names: yield name
+    for name in code.co_names:
+        yield name
     for const in code.co_consts:
-        if isinstance(const,basestring):
+        if isinstance(const, basestring):
             yield const
-        elif isinstance(const,CodeType):
+        elif isinstance(const, CodeType):
             for name in iter_symbols(const):
                 yield name
 
+
 def can_scan():
     if not sys.platform.startswith('java') and sys.platform != 'cli':
         # CPython, PyPy, etc.
@@ -426,8 +440,9 @@ def can_scan():
     'install_lib', 'install_dir', 'install_data', 'install_base'
 ]
 
+
 def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None,
-        mode='w'):
+                 mode='w'):
     """Create a zip file from all the files under 'base_dir'.  The output
     zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
     Python module (if available) or the InfoZIP "zip" utility (if installed
@@ -435,6 +450,7 @@ def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None,
     raises DistutilsExecError.  Returns the name of the output zip file.
     """
     import zipfile
+
     mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
     log.info("creating '%s' and adding '%s' to it", zip_filename, base_dir)
 
@@ -442,13 +458,14 @@ def visit(z, dirname, names):
         for name in names:
             path = os.path.normpath(os.path.join(dirname, name))
             if os.path.isfile(path):
-                p = path[len(base_dir)+1:]
+                p = path[len(base_dir) + 1:]
                 if not dry_run:
                     z.write(path, p)
                 log.debug("adding '%s'" % p)
 
     if compress is None:
-        compress = (sys.version>="2.4") # avoid 2.3 zipimport bug when 64 bits
+        # avoid 2.3 zipimport bug when 64 bits
+        compress = (sys.version >= "2.4")
 
     compression = [zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED][bool(compress)]
     if not dry_run:
diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 9938682499..70730927ec 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -1,5 +1,6 @@
 import distutils.command.bdist_rpm as orig
 
+
 class bdist_rpm(orig.bdist_rpm):
     """
     Override the default bdist_rpm behavior to do the following:
@@ -19,7 +20,7 @@ def run(self):
 
     def _make_spec_file(self):
         version = self.distribution.get_version()
-        rpmversion = version.replace('-','_')
+        rpmversion = version.replace('-', '_')
         spec = orig.bdist_rpm._make_spec_file(self)
         line23 = '%define version ' + version
         line24 = '%define version ' + rpmversion
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index f9d8d4f076..073de97b46 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,5 +1,6 @@
 import distutils.command.bdist_wininst as orig
 
+
 class bdist_wininst(orig.bdist_wininst):
     def reinitialize_command(self, command, reinit_subcommands=0):
         """
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index e08131d777..53bf9cd3ed 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -1,26 +1,29 @@
 from distutils.command.build_ext import build_ext as _du_build_ext
+from distutils.file_util import copy_file
+from distutils.ccompiler import new_compiler
+from distutils.sysconfig import customize_compiler
+from distutils.errors import DistutilsError
+from distutils import log
+import os
+import sys
+
+from setuptools.extension import Library
+
 try:
     # Attempt to use Pyrex for building extensions, if available
     from Pyrex.Distutils.build_ext import build_ext as _build_ext
 except ImportError:
     _build_ext = _du_build_ext
 
-import os
-import sys
-from distutils.file_util import copy_file
-from setuptools.extension import Library
-from distutils.ccompiler import new_compiler
-from distutils.sysconfig import customize_compiler
 try:
     # Python 2.7 or >=3.2
     from sysconfig import _CONFIG_VARS
 except ImportError:
     from distutils.sysconfig import get_config_var
+
     get_config_var("LDSHARED")  # make sure _config_vars is initialized
     del get_config_var
     from distutils.sysconfig import _config_vars as _CONFIG_VARS
-from distutils import log
-from distutils.errors import DistutilsError
 
 have_rtld = False
 use_stubs = False
@@ -31,11 +34,13 @@
 elif os.name != 'nt':
     try:
         from dl import RTLD_NOW
+
         have_rtld = True
         use_stubs = True
     except ImportError:
         pass
 
+
 def if_dl(s):
     if have_rtld:
         return s
@@ -59,8 +64,9 @@ def copy_extensions_to_source(self):
             modpath = fullname.split('.')
             package = '.'.join(modpath[:-1])
             package_dir = build_py.get_package_dir(package)
-            dest_filename = os.path.join(package_dir,os.path.basename(filename))
-            src_filename = os.path.join(self.build_lib,filename)
+            dest_filename = os.path.join(package_dir,
+                                         os.path.basename(filename))
+            src_filename = os.path.join(self.build_lib, filename)
 
             # Always copy, even if source is older than destination, to ensure
             # that the right extensions for the current Python/platform are
@@ -72,7 +78,8 @@ def copy_extensions_to_source(self):
             if ext._needs_stub:
                 self.write_stub(package_dir or os.curdir, ext, True)
 
-    if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
+    if _build_ext is not _du_build_ext and not hasattr(_build_ext,
+                                                       'pyrex_sources'):
         # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
         def swig_sources(self, sources, *otherargs):
             # first do any Pyrex processing
@@ -81,15 +88,15 @@ def swig_sources(self, sources, *otherargs):
             return _du_build_ext.swig_sources(self, sources, *otherargs)
 
     def get_ext_filename(self, fullname):
-        filename = _build_ext.get_ext_filename(self,fullname)
+        filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            if isinstance(ext,Library):
+            if isinstance(ext, Library):
                 fn, ext = os.path.splitext(filename)
-                return self.shlib_compiler.library_filename(fn,libtype)
+                return self.shlib_compiler.library_filename(fn, libtype)
             elif use_stubs and ext._links_to_dynamic:
-                d,fn = os.path.split(filename)
-                return os.path.join(d,'dl-'+fn)
+                d, fn = os.path.split(filename)
+                return os.path.join(d, 'dl-' + fn)
         return filename
 
     def initialize_options(self):
@@ -103,7 +110,7 @@ def finalize_options(self):
         self.extensions = self.extensions or []
         self.check_extensions_list(self.extensions)
         self.shlibs = [ext for ext in self.extensions
-            if isinstance(ext, Library)]
+                       if isinstance(ext, Library)]
         if self.shlibs:
             self.setup_shlib_compiler()
         for ext in self.extensions:
@@ -118,9 +125,10 @@ def finalize_options(self):
 
             ltd = ext._links_to_dynamic = \
                 self.shlibs and self.links_to_dynamic(ext) or False
-            ext._needs_stub = ltd and use_stubs and not isinstance(ext,Library)
+            ext._needs_stub = ltd and use_stubs and not isinstance(ext,
+                                                                   Library)
             filename = ext._file_name = self.get_ext_filename(fullname)
-            libdir = os.path.dirname(os.path.join(self.build_lib,filename))
+            libdir = os.path.dirname(os.path.join(self.build_lib, filename))
             if ltd and libdir not in ext.library_dirs:
                 ext.library_dirs.append(libdir)
             if ltd and use_stubs and os.curdir not in ext.runtime_library_dirs:
@@ -134,7 +142,8 @@ def setup_shlib_compiler(self):
             tmp = _CONFIG_VARS.copy()
             try:
                 # XXX Help!  I don't have any idea whether these are right...
-                _CONFIG_VARS['LDSHARED'] = "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
+                _CONFIG_VARS['LDSHARED'] = (
+                    "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup")
                 _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
                 _CONFIG_VARS['SO'] = ".dylib"
                 customize_compiler(compiler)
@@ -148,7 +157,7 @@ def setup_shlib_compiler(self):
             compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
-            for (name,value) in self.define:
+            for (name, value) in self.define:
                 compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
@@ -166,16 +175,16 @@ def setup_shlib_compiler(self):
         compiler.link_shared_object = link_shared_object.__get__(compiler)
 
     def get_export_symbols(self, ext):
-        if isinstance(ext,Library):
+        if isinstance(ext, Library):
             return ext.export_symbols
-        return _build_ext.get_export_symbols(self,ext)
+        return _build_ext.get_export_symbols(self, ext)
 
     def build_extension(self, ext):
         _compiler = self.compiler
         try:
-            if isinstance(ext,Library):
+            if isinstance(ext, Library):
                 self.compiler = self.shlib_compiler
-            _build_ext.build_extension(self,ext)
+            _build_ext.build_extension(self, ext)
             if ext._needs_stub:
                 self.write_stub(
                     self.get_finalized_command('build_py').build_lib, ext
@@ -189,9 +198,10 @@ def links_to_dynamic(self, ext):
         # XXX as dynamic, and not just using a locally-found version or a
         # XXX static-compiled version
         libnames = dict.fromkeys([lib._full_name for lib in self.shlibs])
-        pkg = '.'.join(ext._full_name.split('.')[:-1]+[''])
+        pkg = '.'.join(ext._full_name.split('.')[:-1] + [''])
         for libname in ext.libraries:
-            if pkg+libname in libnames: return True
+            if pkg + libname in libnames:
+                return True
         return False
 
     def get_outputs(self):
@@ -200,26 +210,29 @@ def get_outputs(self):
         for ext in self.extensions:
             if ext._needs_stub:
                 base = os.path.join(self.build_lib, *ext._full_name.split('.'))
-                outputs.append(base+'.py')
-                outputs.append(base+'.pyc')
+                outputs.append(base + '.py')
+                outputs.append(base + '.pyc')
                 if optimize:
-                    outputs.append(base+'.pyo')
+                    outputs.append(base + '.pyo')
         return outputs
 
     def write_stub(self, output_dir, ext, compile=False):
-        log.info("writing stub loader for %s to %s",ext._full_name, output_dir)
-        stub_file = os.path.join(output_dir, *ext._full_name.split('.'))+'.py'
+        log.info("writing stub loader for %s to %s", ext._full_name,
+                 output_dir)
+        stub_file = (os.path.join(output_dir, *ext._full_name.split('.')) +
+                     '.py')
         if compile and os.path.exists(stub_file):
-            raise DistutilsError(stub_file+" already exists! Please delete.")
+            raise DistutilsError(stub_file + " already exists! Please delete.")
         if not self.dry_run:
-            f = open(stub_file,'w')
+            f = open(stub_file, 'w')
             f.write(
                 '\n'.join([
                     "def __bootstrap__():",
                     "   global __bootstrap__, __file__, __loader__",
-                    "   import sys, os, pkg_resources, imp"+if_dl(", dl"),
-                    "   __file__ = pkg_resources.resource_filename(__name__,%r)"
-                        % os.path.basename(ext._file_name),
+                    "   import sys, os, pkg_resources, imp" + if_dl(", dl"),
+                    "   __file__ = pkg_resources.resource_filename"
+                    "(__name__,%r)"
+                    % os.path.basename(ext._file_name),
                     "   del __bootstrap__",
                     "   if '__loader__' in globals():",
                     "       del __loader__",
@@ -233,12 +246,13 @@ def write_stub(self, output_dir, ext, compile=False):
                     if_dl("     sys.setdlopenflags(old_flags)"),
                     "     os.chdir(old_dir)",
                     "__bootstrap__()",
-                    "" # terminal \n
+                    ""  # terminal \n
                 ])
             )
             f.close()
         if compile:
             from distutils.util import byte_compile
+
             byte_compile([stub_file], optimize=0,
                          force=True, dry_run=self.dry_run)
             optimize = self.get_finalized_command('install_lib').optimize
@@ -249,13 +263,14 @@ def write_stub(self, output_dir, ext, compile=False):
                 os.unlink(stub_file)
 
 
-if use_stubs or os.name=='nt':
+if use_stubs or os.name == 'nt':
     # Build shared libraries
     #
-    def link_shared_object(self, objects, output_libname, output_dir=None,
-            libraries=None, library_dirs=None, runtime_library_dirs=None,
-            export_symbols=None, debug=0, extra_preargs=None,
-            extra_postargs=None, build_temp=None, target_lang=None):
+    def link_shared_object(
+            self, objects, output_libname, output_dir=None, libraries=None,
+            library_dirs=None, runtime_library_dirs=None, export_symbols=None,
+            debug=0, extra_preargs=None, extra_postargs=None, build_temp=None,
+            target_lang=None):
         self.link(
             self.SHARED_LIBRARY, objects, output_libname,
             output_dir, libraries, library_dirs, runtime_library_dirs,
@@ -266,18 +281,19 @@ def link_shared_object(self, objects, output_libname, output_dir=None,
     # Build static libraries everywhere else
     libtype = 'static'
 
-    def link_shared_object(self, objects, output_libname, output_dir=None,
-            libraries=None, library_dirs=None, runtime_library_dirs=None,
-            export_symbols=None, debug=0, extra_preargs=None,
-            extra_postargs=None, build_temp=None, target_lang=None):
+    def link_shared_object(
+            self, objects, output_libname, output_dir=None, libraries=None,
+            library_dirs=None, runtime_library_dirs=None, export_symbols=None,
+            debug=0, extra_preargs=None, extra_postargs=None, build_temp=None,
+            target_lang=None):
         # XXX we need to either disallow these attrs on Library instances,
-        #     or warn/abort here if set, or something...
-        #libraries=None, library_dirs=None, runtime_library_dirs=None,
-        #export_symbols=None, extra_preargs=None, extra_postargs=None,
-        #build_temp=None
+        # or warn/abort here if set, or something...
+        # libraries=None, library_dirs=None, runtime_library_dirs=None,
+        # export_symbols=None, extra_preargs=None, extra_postargs=None,
+        # build_temp=None
 
-        assert output_dir is None   # distutils build_ext doesn't pass this
-        output_dir,filename = os.path.split(output_libname)
+        assert output_dir is None  # distutils build_ext doesn't pass this
+        output_dir, filename = os.path.split(output_libname)
         basename, ext = os.path.splitext(filename)
         if self.library_filename("x").startswith('lib'):
             # strip 'lib' prefix; this is kludgy if some platform uses
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 53bfb7df23..98080694ad 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -1,10 +1,10 @@
+from glob import glob
+from distutils.util import convert_path
+import distutils.command.build_py as orig
 import os
 import sys
 import fnmatch
 import textwrap
-import distutils.command.build_py as orig
-from distutils.util import convert_path
-from glob import glob
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
@@ -13,6 +13,7 @@ class Mixin2to3:
         def run_2to3(self, files, doctests=True):
             "do nothing"
 
+
 class build_py(orig.build_py, Mixin2to3):
     """Enhanced 'build_py' command that includes data files with packages
 
@@ -22,11 +23,14 @@ class build_py(orig.build_py, Mixin2to3):
     Also, this version of the 'build_py' command allows you to specify both
     'py_modules' and 'packages' in the same setup operation.
     """
+
     def finalize_options(self):
         orig.build_py.finalize_options(self)
         self.package_data = self.distribution.package_data
-        self.exclude_package_data = self.distribution.exclude_package_data or {}
-        if 'data_files' in self.__dict__: del self.__dict__['data_files']
+        self.exclude_package_data = (self.distribution.exclude_package_data or
+                                     {})
+        if 'data_files' in self.__dict__:
+            del self.__dict__['data_files']
         self.__updated_files = []
         self.__doctests_2to3 = []
 
@@ -51,13 +55,14 @@ def run(self):
         self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=0))
 
     def __getattr__(self, attr):
-        if attr=='data_files':  # lazily compute data files
+        if attr == 'data_files':  # lazily compute data files
             self.data_files = files = self._get_data_files()
             return files
-        return orig.build_py.__getattr__(self,attr)
+        return orig.build_py.__getattr__(self, attr)
 
     def build_module(self, module, module_file, package):
-        outfile, copied = orig.build_py.build_module(self, module, module_file, package)
+        outfile, copied = orig.build_py.build_module(self, module, module_file,
+                                                     package)
         if copied:
             self.__updated_files.append(outfile)
         return outfile, copied
@@ -74,12 +79,12 @@ def _get_data_files(self):
             build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
             # Length of path to strip from found files
-            plen = len(src_dir)+1
+            plen = len(src_dir) + 1
 
             # Strip directory from globbed filenames
             filenames = [
                 file[plen:] for file in self.find_data_files(package, src_dir)
-                ]
+            ]
             data.append((package, src_dir, build_dir, filenames))
         return data
 
@@ -102,7 +107,8 @@ def build_package_data(self):
                 srcfile = os.path.join(src_dir, filename)
                 outf, copied = self.copy_file(srcfile, target)
                 srcfile = os.path.abspath(srcfile)
-                if copied and srcfile in self.distribution.convert_2to3_doctests:
+                if (copied and
+                        srcfile in self.distribution.convert_2to3_doctests):
                     self.__doctests_2to3.append(outf)
 
     def analyze_manifest(self):
@@ -117,21 +123,22 @@ def analyze_manifest(self):
         self.run_command('egg_info')
         ei_cmd = self.get_finalized_command('egg_info')
         for path in ei_cmd.filelist.files:
-            d,f = os.path.split(assert_relative(path))
+            d, f = os.path.split(assert_relative(path))
             prev = None
             oldf = f
-            while d and d!=prev and d not in src_dirs:
+            while d and d != prev and d not in src_dirs:
                 prev = d
                 d, df = os.path.split(d)
                 f = os.path.join(df, f)
             if d in src_dirs:
-                if path.endswith('.py') and f==oldf:
-                    continue    # it's a module, not data
-                mf.setdefault(src_dirs[d],[]).append(path)
+                if path.endswith('.py') and f == oldf:
+                    continue  # it's a module, not data
+                mf.setdefault(src_dirs[d], []).append(path)
 
-    def get_data_files(self): pass  # kludge 2.4 for lazy computation
+    def get_data_files(self):
+        pass  # kludge 2.4 for lazy computation
 
-    if sys.version<"2.4":    # Python 2.4 already has this code
+    if sys.version < "2.4":  # Python 2.4 already has this code
         def get_outputs(self, include_bytecode=1):
             """Return complete list of files copied to the build directory
 
@@ -142,9 +149,9 @@ def get_outputs(self, include_bytecode=1):
             """
             return orig.build_py.get_outputs(self, include_bytecode) + [
                 os.path.join(build_dir, filename)
-                for package, src_dir, build_dir,filenames in self.data_files
+                for package, src_dir, build_dir, filenames in self.data_files
                 for filename in filenames
-                ]
+            ]
 
     def check_package(self, package, package_dir):
         """Check namespace packages' __init__ for declare_namespace"""
@@ -160,25 +167,26 @@ def check_package(self, package, package_dir):
             return init_py
 
         for pkg in self.distribution.namespace_packages:
-            if pkg==package or pkg.startswith(package+'.'):
+            if pkg == package or pkg.startswith(package + '.'):
                 break
         else:
             return init_py
 
-        f = open(init_py,'rbU')
+        f = open(init_py, 'rbU')
         if 'declare_namespace'.encode() not in f.read():
             from distutils.errors import DistutilsError
+
             raise DistutilsError(
-                "Namespace package problem: %s is a namespace package, but its\n"
-                "__init__.py does not call declare_namespace()! Please fix it.\n"
-                '(See the setuptools manual under "Namespace Packages" for '
-                "details.)\n" % (package,)
+                "Namespace package problem: %s is a namespace package, but "
+                "its\n__init__.py does not call declare_namespace()! Please "
+                'fix it.\n(See the setuptools manual under '
+                '"Namespace Packages" for details.)\n"' % (package,)
             )
         f.close()
         return init_py
 
     def initialize_options(self):
-        self.packages_checked={}
+        self.packages_checked = {}
         orig.build_py.initialize_options(self)
 
     def get_package_dir(self, package):
@@ -202,7 +210,7 @@ def exclude_data_files(self, package, src_dir, files):
         seen = {}
         return [
             f for f in files if f not in bad
-                and f not in seen and seen.setdefault(f,1)  # ditch dupes
+            and f not in seen and seen.setdefault(f, 1)  # ditch dupes
         ]
 
 
@@ -210,6 +218,7 @@ def assert_relative(path):
     if not os.path.isabs(path):
         return path
     from distutils.errors import DistutilsSetupError
+
     msg = textwrap.dedent("""
         Error: setup script specifies an absolute path:
 
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 74d129490e..368b64fed7 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -1,13 +1,14 @@
-import os
-import glob
 from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsOptionError
+import os
+import glob
 
-import setuptools
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
 from setuptools.compat import PY3
+import setuptools
+
 
 class develop(easy_install):
     """Set up package for development"""
@@ -36,7 +37,7 @@ def initialize_options(self):
         self.egg_path = None
         easy_install.initialize_options(self)
         self.setup_path = None
-        self.always_copy_from = '.'   # always copy eggs installed in curdir
+        self.always_copy_from = '.'  # always copy eggs installed in curdir
 
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
@@ -52,29 +53,31 @@ def finalize_options(self):
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
-        self.egg_link = os.path.join(self.install_dir, ei.egg_name+'.egg-link')
+        self.egg_link = os.path.join(self.install_dir, ei.egg_name +
+                                     '.egg-link')
         self.egg_base = ei.egg_base
         if self.egg_path is None:
             self.egg_path = os.path.abspath(ei.egg_base)
 
         target = normalize_path(self.egg_base)
-        egg_path = normalize_path(os.path.join(self.install_dir, self.egg_path))
+        egg_path = normalize_path(os.path.join(self.install_dir,
+                                               self.egg_path))
         if egg_path != target:
             raise DistutilsOptionError(
                 "--egg-path must be a relative path from the install"
-                " directory to "+target
+                " directory to " + target
             )
 
         # Make a distribution for the package's source
         self.dist = Distribution(
             target,
             PathMetadata(target, os.path.abspath(ei.egg_info)),
-            project_name = ei.egg_name
+            project_name=ei.egg_name
         )
 
-        p = self.egg_base.replace(os.sep,'/')
-        if p!= os.curdir:
-            p = '../' * (p.count('/')+1)
+        p = self.egg_base.replace(os.sep, '/')
+        if p != os.curdir:
+            p = '../' * (p.count('/') + 1)
         self.setup_path = p
         p = normalize_path(os.path.join(self.install_dir, self.egg_path, p))
         if p != normalize_path(os.curdir):
@@ -103,7 +106,8 @@ def install_for_development(self):
             ei_cmd = self.get_finalized_command("egg_info")
             self.egg_path = build_path
             self.dist.location = build_path
-            self.dist._provider = PathMetadata(build_path, ei_cmd.egg_info)    # XXX
+            # XXX
+            self.dist._provider = PathMetadata(build_path, ei_cmd.egg_info)
         else:
             # Without 2to3 inplace works fine:
             self.run_command('egg_info')
@@ -120,7 +124,7 @@ def install_for_development(self):
         # create an .egg-link in the installation dir, pointing to our egg
         log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
         if not self.dry_run:
-            f = open(self.egg_link,"w")
+            f = open(self.egg_link, "w")
             f.write(self.egg_path + "\n" + self.setup_path)
             f.close()
         # postprocess the installed distro, fixing up .pth, installing scripts,
@@ -133,7 +137,8 @@ def uninstall_link(self):
             egg_link_file = open(self.egg_link)
             contents = [line.rstrip() for line in egg_link_file]
             egg_link_file.close()
-            if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
+            if contents not in ([self.egg_path],
+                                [self.egg_path, self.setup_path]):
                 log.warn("Link points to %s: uninstall aborted", contents)
                 return
             if not self.dry_run:
@@ -147,7 +152,7 @@ def uninstall_link(self):
     def install_egg_scripts(self, dist):
         if dist is not self.dist:
             # Installing a dependency, so fall back to normal behavior
-            return easy_install.install_egg_scripts(self,dist)
+            return easy_install.install_egg_scripts(self, dist)
 
         # create wrapper scripts in the script dir, pointing to dist.scripts
 
@@ -158,7 +163,7 @@ def install_egg_scripts(self, dist):
         for script_name in self.distribution.scripts or []:
             script_path = os.path.abspath(convert_path(script_name))
             script_name = os.path.basename(script_path)
-            f = open(script_path,'rU')
+            f = open(script_path, 'rU')
             script_text = f.read()
             f.close()
             self.install_script(dist, script_name, script_text, script_path)
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2f476fed3f..6854827222 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -12,6 +12,14 @@
 
 """
 
+from glob import glob
+from distutils.util import get_platform
+from distutils.util import convert_path, subst_vars
+from distutils.errors import DistutilsArgError, DistutilsOptionError, \
+    DistutilsError, DistutilsPlatformError
+from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
+from distutils import log, dir_util
+from distutils.command.build_scripts import first_line_re
 import sys
 import os
 import zipimport
@@ -26,21 +34,10 @@
 import warnings
 import site
 import struct
-from glob import glob
-from distutils import log, dir_util
-from distutils.command.build_scripts import first_line_re
 
-
-import pkg_resources
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from setuptools.py31compat import get_path, get_config_vars
-
-from distutils.util import get_platform
-from distutils.util import convert_path, subst_vars
-from distutils.errors import DistutilsArgError, DistutilsOptionError, \
-    DistutilsError, DistutilsPlatformError
-from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
 from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
 from setuptools.package_index import PackageIndex
@@ -54,18 +51,22 @@
     Distribution, PathMetadata, EggMetadata, WorkingSet, DistributionNotFound,
     VersionConflict, DEVELOP_DIST,
 )
+import pkg_resources
+
 
 sys_executable = os.environ.get('__PYVENV_LAUNCHER__',
-    os.path.normpath(sys.executable))
+                                os.path.normpath(sys.executable))
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
     'main', 'get_exe_prefixes',
 ]
 
+
 def is_64bit():
     return struct.calcsize("P") == 8
 
+
 def samefile(p1, p2):
     both_exist = os.path.exists(p1) and os.path.exists(p2)
     use_samefile = hasattr(os.path, 'samefile') and both_exist
@@ -75,9 +76,11 @@ def samefile(p1, p2):
     norm_p2 = os.path.normpath(os.path.normcase(p2))
     return norm_p1 == norm_p2
 
+
 if PY2:
     def _to_ascii(s):
         return s
+
     def isascii(s):
         try:
             unicode(s, 'ascii')
@@ -87,6 +90,7 @@ def isascii(s):
 else:
     def _to_ascii(s):
         return s.encode('ascii')
+
     def isascii(s):
         try:
             s.encode('ascii')
@@ -94,6 +98,7 @@ def isascii(s):
         except UnicodeError:
             return False
 
+
 class easy_install(Command):
     """Manage a download/build/install process"""
     description = "Find/get/install Python packages"
@@ -111,22 +116,22 @@ class easy_install(Command):
         ("index-url=", "i", "base URL of Python Package Index"),
         ("find-links=", "f", "additional URL(s) to search for packages"),
         ("build-directory=", "b",
-            "download/extract/build in DIR; keep the results"),
+         "download/extract/build in DIR; keep the results"),
         ('optimize=', 'O',
-            "also compile with optimization: -O1 for \"python -O\", "
-            "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
+         "also compile with optimization: -O1 for \"python -O\", "
+         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
         ('record=', None,
-            "filename in which to record list of installed files"),
+         "filename in which to record list of installed files"),
         ('always-unzip', 'Z', "don't install as a zipfile, no matter what"),
-        ('site-dirs=','S',"list of directories where .pth files work"),
+        ('site-dirs=', 'S', "list of directories where .pth files work"),
         ('editable', 'e', "Install specified packages in editable form"),
         ('no-deps', 'N', "don't install dependencies"),
         ('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
         ('local-snapshots-ok', 'l',
-            "allow building eggs from local checkouts"),
+         "allow building eggs from local checkouts"),
         ('version', None, "print version information and exit"),
         ('no-find-links', None,
-            "Don't load find-links defined in packages being installed")
+         "Don't load find-links defined in packages being installed")
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
@@ -160,10 +165,10 @@ def initialize_options(self):
         self.editable = self.no_deps = self.allow_hosts = None
         self.root = self.prefix = self.no_report = None
         self.version = None
-        self.install_purelib = None     # for pure module distributions
-        self.install_platlib = None     # non-pure (dists w/ extensions)
-        self.install_headers = None     # for C/C++ headers
-        self.install_lib = None         # set to either purelib or platlib
+        self.install_purelib = None  # for pure module distributions
+        self.install_platlib = None  # non-pure (dists w/ extensions)
+        self.install_headers = None  # for C/C++ headers
+        self.install_lib = None  # set to either purelib or platlib
         self.install_scripts = None
         self.install_data = None
         self.install_base = None
@@ -198,7 +203,8 @@ def delete_blockers(self, blockers):
             if os.path.exists(filename) or os.path.islink(filename):
                 log.info("Deleting %s", filename)
                 if not self.dry_run:
-                    if os.path.isdir(filename) and not os.path.islink(filename):
+                    if (os.path.isdir(filename) and
+                            not os.path.islink(filename)):
                         rmtree(filename)
                     else:
                         os.unlink(filename)
@@ -231,7 +237,7 @@ def finalize_options(self):
             self.config_vars['usersite'] = self.install_usersite
 
         # fix the install_dir if "--user" was used
-        #XXX: duplicate of the code in the setup command
+        # XXX: duplicate of the code in the setup command
         if self.user and site.ENABLE_USER_SITE:
             self.create_home_path()
             if self.install_userbase is None:
@@ -246,7 +252,8 @@ def finalize_options(self):
         self.expand_basedirs()
         self.expand_dirs()
 
-        self._expand('install_dir','script_dir','build_directory','site_dirs')
+        self._expand('install_dir', 'script_dir', 'build_directory',
+                     'site_dirs')
         # If a non-default installation directory was specified, default the
         # script directory to match it.
         if self.script_dir is None:
@@ -258,12 +265,12 @@ def finalize_options(self):
         # Let install_dir get set by install_lib command, which in turn
         # gets its info from the install command, and takes into account
         # --prefix and --home and all that other crud.
-        self.set_undefined_options('install_lib',
-            ('install_dir','install_dir')
+        self.set_undefined_options(
+            'install_lib', ('install_dir', 'install_dir')
         )
         # Likewise, set default script_dir from 'install_scripts.install_dir'
-        self.set_undefined_options('install_scripts',
-            ('install_dir', 'script_dir')
+        self.set_undefined_options(
+            'install_scripts', ('install_dir', 'script_dir')
         )
 
         if self.user and self.install_purelib:
@@ -277,18 +284,20 @@ def finalize_options(self):
         self.all_site_dirs = get_site_dirs()
         if self.site_dirs is not None:
             site_dirs = [
-                os.path.expanduser(s.strip()) for s in self.site_dirs.split(',')
+                os.path.expanduser(s.strip()) for s in
+                self.site_dirs.split(',')
             ]
             for d in site_dirs:
                 if not os.path.isdir(d):
                     log.warn("%s (in --site-dirs) does not exist", d)
                 elif normalize_path(d) not in normpath:
                     raise DistutilsOptionError(
-                        d+" (in --site-dirs) is not on sys.path"
+                        d + " (in --site-dirs) is not on sys.path"
                     )
                 else:
                     self.all_site_dirs.append(normalize_path(d))
-        if not self.editable: self.check_site_dir()
+        if not self.editable:
+            self.check_site_dir()
         self.index_url = self.index_url or "https://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
@@ -301,9 +310,9 @@ def finalize_options(self):
             hosts = ['*']
         if self.package_index is None:
             self.package_index = self.create_index(
-                self.index_url, search_path = self.shadow_path, hosts=hosts,
+                self.index_url, search_path=self.shadow_path, hosts=hosts,
             )
-        self.local_index = Environment(self.shadow_path+sys.path)
+        self.local_index = Environment(self.shadow_path + sys.path)
 
         if self.find_links is not None:
             if isinstance(self.find_links, basestring):
@@ -311,14 +320,15 @@ def finalize_options(self):
         else:
             self.find_links = []
         if self.local_snapshots_ok:
-            self.package_index.scan_egg_links(self.shadow_path+sys.path)
+            self.package_index.scan_egg_links(self.shadow_path + sys.path)
         if not self.no_find_links:
             self.package_index.add_find_links(self.find_links)
-        self.set_undefined_options('install_lib', ('optimize','optimize'))
-        if not isinstance(self.optimize,int):
+        self.set_undefined_options('install_lib', ('optimize', 'optimize'))
+        if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                if not (0 <= self.optimize <= 2): raise ValueError
+                if not (0 <= self.optimize <= 2):
+                    raise ValueError
             except ValueError:
                 raise DistutilsOptionError("--optimize must be 0, 1, or 2")
 
@@ -350,7 +360,7 @@ def expand_dirs(self):
         """Calls `os.path.expanduser` on install dirs."""
         self._expand_attrs(['install_purelib', 'install_platlib',
                             'install_lib', 'install_headers',
-                            'install_scripts', 'install_data',])
+                            'install_scripts', 'install_data', ])
 
     def run(self):
         if self.verbose != self.distribution.verbose:
@@ -360,11 +370,12 @@ def run(self):
                 self.easy_install(spec, not self.no_deps)
             if self.record:
                 outputs = self.outputs
-                if self.root:               # strip any package prefix
+                if self.root:  # strip any package prefix
                     root_len = len(self.root)
                     for counter in range(len(outputs)):
                         outputs[counter] = outputs[counter][root_len:]
                 from distutils import file_util
+
                 self.execute(
                     file_util.write_file, (self.record, outputs),
                     "writing list of installed files to '%s'" %
@@ -392,7 +403,7 @@ def check_site_dir(self):
         """Verify that self.install_dir is .pth-capable dir, if needed"""
 
         instdir = normalize_path(self.install_dir)
-        pth_file = os.path.join(instdir,'easy-install.pth')
+        pth_file = os.path.join(instdir, 'easy-install.pth')
 
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
         is_site_dir = instdir in self.all_site_dirs
@@ -402,13 +413,14 @@ def check_site_dir(self):
             is_site_dir = self.check_pth_processing()
         else:
             # make sure we can write to target dir
-            testfile = self.pseudo_tempname()+'.write-test'
+            testfile = self.pseudo_tempname() + '.write-test'
             test_exists = os.path.exists(testfile)
             try:
-                if test_exists: os.unlink(testfile)
-                open(testfile,'w').close()
+                if test_exists:
+                    os.unlink(testfile)
+                open(testfile, 'w').close()
                 os.unlink(testfile)
-            except (OSError,IOError):
+            except (OSError, IOError):
                 self.cant_write_to_target()
 
         if not is_site_dir and not self.multi_version:
@@ -421,13 +433,13 @@ def check_site_dir(self):
         else:
             self.pth_file = None
 
-        PYTHONPATH = os.environ.get('PYTHONPATH','').split(os.pathsep)
+        PYTHONPATH = os.environ.get('PYTHONPATH', '').split(os.pathsep)
         if instdir not in map(normalize_path, [_f for _f in PYTHONPATH if _f]):
             # only PYTHONPATH dirs need a site.py, so pretend it's there
             self.sitepy_installed = True
         elif self.multi_version and not os.path.exists(pth_file):
-            self.sitepy_installed = True    # don't need site.py in this case
-            self.pth_file = None            # and don't create a .pth file
+            self.sitepy_installed = True  # don't need site.py in this case
+            self.pth_file = None  # and don't create a .pth file
         self.install_dir = instdir
 
     def cant_write_to_target(self):
@@ -473,32 +485,36 @@ def check_pth_processing(self):
         """Empirically verify whether .pth files are supported in inst. dir"""
         instdir = self.install_dir
         log.info("Checking .pth file support in %s", instdir)
-        pth_file = self.pseudo_tempname()+".pth"
-        ok_file = pth_file+'.ok'
+        pth_file = self.pseudo_tempname() + ".pth"
+        ok_file = pth_file + '.ok'
         ok_exists = os.path.exists(ok_file)
         try:
-            if ok_exists: os.unlink(ok_file)
+            if ok_exists:
+                os.unlink(ok_file)
             dirname = os.path.dirname(ok_file)
             if not os.path.exists(dirname):
                 os.makedirs(dirname)
-            f = open(pth_file,'w')
-        except (OSError,IOError):
+            f = open(pth_file, 'w')
+        except (OSError, IOError):
             self.cant_write_to_target()
         else:
             try:
-                f.write("import os; f = open(%r, 'w'); f.write('OK'); f.close()\n" % (ok_file,))
+                f.write("import os; f = open(%r, 'w'); f.write('OK'); "
+                        "f.close()\n" % (ok_file,))
                 f.close()
-                f=None
+                f = None
                 executable = sys.executable
-                if os.name=='nt':
-                    dirname,basename = os.path.split(executable)
-                    alt = os.path.join(dirname,'pythonw.exe')
-                    if basename.lower()=='python.exe' and os.path.exists(alt):
+                if os.name == 'nt':
+                    dirname, basename = os.path.split(executable)
+                    alt = os.path.join(dirname, 'pythonw.exe')
+                    if (basename.lower() == 'python.exe' and
+                            os.path.exists(alt)):
                         # use pythonw.exe to avoid opening a console window
                         executable = alt
 
                 from distutils.spawn import spawn
-                spawn([executable,'-E','-c','pass'],0)
+
+                spawn([executable, '-E', '-c', 'pass'], 0)
 
                 if os.path.exists(ok_file):
                     log.info(
@@ -527,7 +543,7 @@ def install_egg_scripts(self, dist):
                     continue
                 self.install_script(
                     dist, script_name,
-                    dist.get_metadata('scripts/'+script_name)
+                    dist.get_metadata('scripts/' + script_name)
                 )
         self.install_wrapper_scripts(dist)
 
@@ -535,7 +551,7 @@ def add_output(self, path):
         if os.path.isdir(path):
             for base, dirs, files in os.walk(path):
                 for filename in files:
-                    self.outputs.append(os.path.join(base,filename))
+                    self.outputs.append(os.path.join(base, filename))
         else:
             self.outputs.append(path)
 
@@ -547,7 +563,7 @@ def not_editable(self, spec):
                 % (spec,)
             )
 
-    def check_editable(self,spec):
+    def check_editable(self, spec):
         if not self.editable:
             return
 
@@ -560,15 +576,17 @@ def check_editable(self,spec):
     def easy_install(self, spec, deps=False):
         tmpdir = tempfile.mkdtemp(prefix="easy_install-")
         download = None
-        if not self.editable: self.install_site_py()
+        if not self.editable:
+            self.install_site_py()
 
         try:
-            if not isinstance(spec,Requirement):
+            if not isinstance(spec, Requirement):
                 if URL_SCHEME(spec):
                     # It's a url, download it to tmpdir and process
                     self.not_editable(spec)
                     download = self.package_index.download(spec, tmpdir)
-                    return self.install_item(None, download, tmpdir, deps, True)
+                    return self.install_item(None, download, tmpdir, deps,
+                                             True)
 
                 elif os.path.exists(spec):
                     # Existing file or directory, just process it directly
@@ -579,15 +597,15 @@ def easy_install(self, spec, deps=False):
 
             self.check_editable(spec)
             dist = self.package_index.fetch_distribution(
-                spec, tmpdir, self.upgrade, self.editable, not self.always_copy,
-                self.local_index
+                spec, tmpdir, self.upgrade, self.editable,
+                not self.always_copy, self.local_index
             )
             if dist is None:
                 msg = "Could not find suitable distribution for %r" % spec
                 if self.always_copy:
-                    msg+=" (--always-copy skips system and development eggs)"
+                    msg += " (--always-copy skips system and development eggs)"
                 raise DistutilsError(msg)
-            elif dist.precedence==DEVELOP_DIST:
+            elif dist.precedence == DEVELOP_DIST:
                 # .egg-info dists don't need installing, just process deps
                 self.process_distribution(spec, dist, deps, "Using")
                 return dist
@@ -614,10 +632,10 @@ def install_item(self, spec, download, tmpdir, deps, install_needed=False):
             # at this point, we know it's a local .egg, we just don't know if
             # it's already installed.
             for dist in self.local_index[spec.project_name]:
-                if dist.location==download:
+                if dist.location == download:
                     break
             else:
-                install_needed = True   # it's not in the local index
+                install_needed = True  # it's not in the local index
 
         log.info("Processing %s", os.path.basename(download))
 
@@ -704,17 +722,18 @@ def should_unzip(self, dist):
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)
         if os.path.exists(dst):
-            msg = "%r already exists in %s; build directory %s will not be kept"
+            msg = ("%r already exists in %s; build directory %s will not be "
+                   "kept")
             log.warn(msg, spec.key, self.build_directory, setup_base)
             return setup_base
         if os.path.isdir(dist_filename):
             setup_base = dist_filename
         else:
-            if os.path.dirname(dist_filename)==setup_base:
-                os.unlink(dist_filename)   # get it out of the tmp dir
+            if os.path.dirname(dist_filename) == setup_base:
+                os.unlink(dist_filename)  # get it out of the tmp dir
             contents = os.listdir(setup_base)
-            if len(contents)==1:
-                dist_filename = os.path.join(setup_base,contents[0])
+            if len(contents) == 1:
+                dist_filename = os.path.join(setup_base, contents[0])
                 if os.path.isdir(dist_filename):
                     # if the only thing there is a directory, move it instead
                     setup_base = dist_filename
@@ -734,7 +753,7 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
 
         if is_script:
             script_text = (get_script_header(script_text) +
-                self._load_template(dev_path) % locals())
+                           self._load_template(dev_path) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
     @staticmethod
@@ -744,7 +763,7 @@ def _load_template(dev_path):
         function loads one of them and prepares it for use.
         """
         # See https://bitbucket.org/pypa/setuptools/issue/134 for info
-        #  on script file naming and downstream issues with SVR4
+        # on script file naming and downstream issues with SVR4
         name = 'script.tmpl'
         if dev_path:
             name = name.replace('.tmpl', ' (dev).tmpl')
@@ -754,8 +773,9 @@ def _load_template(dev_path):
 
     def write_script(self, script_name, contents, mode="t", blockers=()):
         """Write an executable file to the scripts directory"""
-        self.delete_blockers(   # clean up old .py/.pyw w/o a script
-            [os.path.join(self.script_dir,x) for x in blockers])
+        self.delete_blockers(  # clean up old .py/.pyw w/o a script
+            [os.path.join(self.script_dir, x) for x in blockers]
+        )
         log.info("Installing %s script to %s", script_name, self.script_dir)
         target = os.path.join(self.script_dir, script_name)
         self.add_output(target)
@@ -765,10 +785,10 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             ensure_directory(target)
             if os.path.exists(target):
                 os.unlink(target)
-            f = open(target,"w"+mode)
+            f = open(target, "w" + mode)
             f.write(contents)
             f.close()
-            chmod(target, 0o777-mask)
+            chmod(target, 0o777 - mask)
 
     def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them
@@ -784,7 +804,7 @@ def install_eggs(self, spec, dist_filename, tmpdir):
         elif os.path.isdir(dist_filename):
             setup_base = os.path.abspath(dist_filename)
 
-        if (setup_base.startswith(tmpdir)   # something we downloaded
+        if (setup_base.startswith(tmpdir)  # something we downloaded
                 and self.build_directory and spec is not None):
             setup_base = self.maybe_move(spec, dist_filename, setup_base)
 
@@ -795,11 +815,13 @@ def install_eggs(self, spec, dist_filename, tmpdir):
             setups = glob(os.path.join(setup_base, '*', 'setup.py'))
             if not setups:
                 raise DistutilsError(
-                    "Couldn't find a setup script in %s" % os.path.abspath(dist_filename)
+                    "Couldn't find a setup script in %s" %
+                    os.path.abspath(dist_filename)
                 )
-            if len(setups)>1:
+            if len(setups) > 1:
                 raise DistutilsError(
-                    "Multiple setup scripts in %s" % os.path.abspath(dist_filename)
+                    "Multiple setup scripts in %s" %
+                    os.path.abspath(dist_filename)
                 )
             setup_script = setups[0]
 
@@ -812,13 +834,15 @@ def install_eggs(self, spec, dist_filename, tmpdir):
 
     def egg_distribution(self, egg_path):
         if os.path.isdir(egg_path):
-            metadata = PathMetadata(egg_path,os.path.join(egg_path,'EGG-INFO'))
+            metadata = PathMetadata(egg_path, os.path.join(egg_path,
+                                                           'EGG-INFO'))
         else:
             metadata = EggMetadata(zipimport.zipimporter(egg_path))
-        return Distribution.from_filename(egg_path,metadata=metadata)
+        return Distribution.from_filename(egg_path, metadata=metadata)
 
     def install_egg(self, egg_path, tmpdir):
-        destination = os.path.join(self.install_dir,os.path.basename(egg_path))
+        destination = os.path.join(self.install_dir,
+                                   os.path.basename(egg_path))
         destination = os.path.abspath(destination)
         if not self.dry_run:
             ensure_directory(destination)
@@ -828,28 +852,30 @@ def install_egg(self, egg_path, tmpdir):
             if os.path.isdir(destination) and not os.path.islink(destination):
                 dir_util.remove_tree(destination, dry_run=self.dry_run)
             elif os.path.exists(destination):
-                self.execute(os.unlink,(destination,),"Removing "+destination)
+                self.execute(os.unlink, (destination,), "Removing " +
+                             destination)
             try:
                 new_dist_is_zipped = False
                 if os.path.isdir(egg_path):
                     if egg_path.startswith(tmpdir):
-                        f,m = shutil.move, "Moving"
+                        f, m = shutil.move, "Moving"
                     else:
-                        f,m = shutil.copytree, "Copying"
+                        f, m = shutil.copytree, "Copying"
                 elif self.should_unzip(dist):
                     self.mkpath(destination)
-                    f,m = self.unpack_and_compile, "Extracting"
+                    f, m = self.unpack_and_compile, "Extracting"
                 else:
                     new_dist_is_zipped = True
                     if egg_path.startswith(tmpdir):
-                        f,m = shutil.move, "Moving"
+                        f, m = shutil.move, "Moving"
                     else:
-                        f,m = shutil.copy2, "Copying"
+                        f, m = shutil.copy2, "Copying"
                 self.execute(f, (egg_path, destination),
-                    (m+" %s to %s") %
-                    (os.path.basename(egg_path),os.path.dirname(destination)))
+                             (m + " %s to %s") %
+                             (os.path.basename(egg_path),
+                              os.path.dirname(destination)))
                 update_dist_caches(destination,
-                    fix_zipimporter_caches=new_dist_is_zipped)
+                                   fix_zipimporter_caches=new_dist_is_zipped)
             except:
                 update_dist_caches(destination, fix_zipimporter_caches=False)
                 raise
@@ -867,30 +893,32 @@ def install_exe(self, dist_filename, tmpdir):
         # Create a dummy distribution object until we build the real distro
         dist = Distribution(
             None,
-            project_name=cfg.get('metadata','name'),
-            version=cfg.get('metadata','version'), platform=get_platform(),
+            project_name=cfg.get('metadata', 'name'),
+            version=cfg.get('metadata', 'version'), platform=get_platform(),
         )
 
         # Convert the .exe to an unpacked egg
-        egg_path = dist.location = os.path.join(tmpdir, dist.egg_name()+'.egg')
+        egg_path = dist.location = os.path.join(tmpdir, dist.egg_name() +
+                                                '.egg')
         egg_tmp = egg_path + '.tmp'
         _egg_info = os.path.join(egg_tmp, 'EGG-INFO')
         pkg_inf = os.path.join(_egg_info, 'PKG-INFO')
-        ensure_directory(pkg_inf)   # make sure EGG-INFO dir exists
-        dist._provider = PathMetadata(egg_tmp, _egg_info)    # XXX
+        ensure_directory(pkg_inf)  # make sure EGG-INFO dir exists
+        dist._provider = PathMetadata(egg_tmp, _egg_info)  # XXX
         self.exe_to_egg(dist_filename, egg_tmp)
 
         # Write EGG-INFO/PKG-INFO
         if not os.path.exists(pkg_inf):
-            f = open(pkg_inf,'w')
+            f = open(pkg_inf, 'w')
             f.write('Metadata-Version: 1.0\n')
-            for k,v in cfg.items('metadata'):
+            for k, v in cfg.items('metadata'):
                 if k != 'target_version':
-                    f.write('%s: %s\n' % (k.replace('_','-').title(), v))
+                    f.write('%s: %s\n' % (k.replace('_', '-').title(), v))
             f.close()
-        script_dir = os.path.join(_egg_info,'scripts')
-        self.delete_blockers(   # delete entry-point scripts to avoid duping
-            [os.path.join(script_dir,args[0]) for args in get_script_args(dist)]
+        script_dir = os.path.join(_egg_info, 'scripts')
+        self.delete_blockers(  # delete entry-point scripts to avoid duping
+            [os.path.join(script_dir, args[0]) for args in
+             get_script_args(dist)]
         )
         # Build .egg file from tmpdir
         bdist_egg.make_zipfile(
@@ -906,11 +934,12 @@ def exe_to_egg(self, dist_filename, egg_tmp):
         to_compile = []
         native_libs = []
         top_level = {}
-        def process(src,dst):
+
+        def process(src, dst):
             s = src.lower()
-            for old,new in prefixes:
+            for old, new in prefixes:
                 if s.startswith(old):
-                    src = new+src[len(old):]
+                    src = new + src[len(old):]
                     parts = src.split('/')
                     dst = os.path.join(egg_tmp, *parts)
                     dl = dst.lower()
@@ -918,35 +947,37 @@ def process(src,dst):
                         parts[-1] = bdist_egg.strip_module(parts[-1])
                         top_level[os.path.splitext(parts[0])[0]] = 1
                         native_libs.append(src)
-                    elif dl.endswith('.py') and old!='SCRIPTS/':
+                    elif dl.endswith('.py') and old != 'SCRIPTS/':
                         top_level[os.path.splitext(parts[0])[0]] = 1
                         to_compile.append(dst)
                     return dst
             if not src.endswith('.pth'):
                 log.warn("WARNING: can't process %s", src)
             return None
+
         # extract, tracking .pyd/.dll->native_libs and .py -> to_compile
         unpack_archive(dist_filename, egg_tmp, process)
         stubs = []
         for res in native_libs:
-            if res.lower().endswith('.pyd'):    # create stubs for .pyd's
+            if res.lower().endswith('.pyd'):  # create stubs for .pyd's
                 parts = res.split('/')
                 resource = parts[-1]
-                parts[-1] = bdist_egg.strip_module(parts[-1])+'.py'
+                parts[-1] = bdist_egg.strip_module(parts[-1]) + '.py'
                 pyfile = os.path.join(egg_tmp, *parts)
                 to_compile.append(pyfile)
                 stubs.append(pyfile)
                 bdist_egg.write_stub(resource, pyfile)
-        self.byte_compile(to_compile)   # compile .py's
-        bdist_egg.write_safety_flag(os.path.join(egg_tmp,'EGG-INFO'),
+        self.byte_compile(to_compile)  # compile .py's
+        bdist_egg.write_safety_flag(
+            os.path.join(egg_tmp, 'EGG-INFO'),
             bdist_egg.analyze_egg(egg_tmp, stubs))  # write zip-safety flag
 
-        for name in 'top_level','native_libs':
+        for name in 'top_level', 'native_libs':
             if locals()[name]:
-                txt = os.path.join(egg_tmp, 'EGG-INFO', name+'.txt')
+                txt = os.path.join(egg_tmp, 'EGG-INFO', name + '.txt')
                 if not os.path.exists(txt):
-                    f = open(txt,'w')
-                    f.write('\n'.join(locals()[name])+'\n')
+                    f = open(txt, 'w')
+                    f.write('\n'.join(locals()[name]) + '\n')
                     f.close()
 
     def installation_report(self, req, dist, what="Installed"):
@@ -964,7 +995,7 @@ def installation_report(self, req, dist, what="Installed"):
     pkg_resources.require("%(name)s==%(version)s")  # this exact version
     pkg_resources.require("%(name)s>=%(version)s")  # this version or higher
 """
-            if self.install_dir not in map(normalize_path,sys.path):
+            if self.install_dir not in map(normalize_path, sys.path):
                 msg += """
 
 Note also that the installation directory must be on sys.path at runtime for
@@ -974,7 +1005,7 @@ def installation_report(self, req, dist, what="Installed"):
         eggloc = dist.location
         name = dist.project_name
         version = dist.version
-        extras = '' # TODO: self.report_extras(req, dist)
+        extras = ''  # TODO: self.report_extras(req, dist)
         return msg % locals()
 
     def report_editable(self, spec, setup_script):
@@ -995,15 +1026,15 @@ def run_setup(self, setup_script, setup_base, args):
         sys.modules.setdefault('distutils.command.egg_info', egg_info)
 
         args = list(args)
-        if self.verbose>2:
+        if self.verbose > 2:
             v = 'v' * (self.verbose - 1)
-            args.insert(0,'-'+v)
-        elif self.verbose<2:
-            args.insert(0,'-q')
+            args.insert(0, '-' + v)
+        elif self.verbose < 2:
+            args.insert(0, '-q')
         if self.dry_run:
-            args.insert(0,'-n')
+            args.insert(0, '-n')
         log.info(
-            "Running %s %s", setup_script[len(setup_base)+1:], ' '.join(args)
+            "Running %s %s", setup_script[len(setup_base) + 1:], ' '.join(args)
         )
         try:
             run_setup(setup_script, args)
@@ -1029,11 +1060,11 @@ def build_and_install(self, setup_script, setup_base):
                     eggs.append(self.install_egg(dist.location, setup_base))
             if not eggs and not self.dry_run:
                 log.warn("No eggs found in %s (setup script problem?)",
-                    dist_dir)
+                         dist_dir)
             return eggs
         finally:
             rmtree(dist_dir)
-            log.set_verbosity(self.verbose) # restore our log verbosity
+            log.set_verbosity(self.verbose)  # restore our log verbosity
 
     def _set_fetcher_options(self, base):
         """
@@ -1043,7 +1074,7 @@ def _set_fetcher_options(self, base):
         are available to that command as well.
         """
         # find the fetch options from easy_install and write them out
-        #  to the setup.cfg file.
+        # to the setup.cfg file.
         ei_opts = self.distribution.get_option_dict('easy_install').copy()
         fetch_directives = (
             'find_links', 'site_dirs', 'index_url', 'optimize',
@@ -1051,7 +1082,8 @@ def _set_fetcher_options(self, base):
         )
         fetch_options = {}
         for key, val in ei_opts.items():
-            if key not in fetch_directives: continue
+            if key not in fetch_directives:
+                continue
             fetch_options[key.replace('_', '-')] = val[1]
         # create a settings dictionary suitable for `edit_config`
         settings = dict(easy_install=fetch_options)
@@ -1062,7 +1094,7 @@ def update_pth(self, dist):
         if self.pth_file is None:
             return
 
-        for d in self.pth_file[dist.key]:    # drop old entries
+        for d in self.pth_file[dist.key]:  # drop old entries
             if self.multi_version or d.location != dist.location:
                 log.info("Removing %s from easy-install.pth file", d)
                 self.pth_file.remove(d)
@@ -1077,7 +1109,7 @@ def update_pth(self, dist):
                 )
             else:
                 log.info("Adding %s to easy-install.pth file", dist)
-                self.pth_file.add(dist) # add new entry
+                self.pth_file.add(dist)  # add new entry
                 if dist.location not in self.shadow_path:
                     self.shadow_path.append(dist.location)
 
@@ -1085,19 +1117,20 @@ def update_pth(self, dist):
 
             self.pth_file.save()
 
-            if dist.key=='setuptools':
+            if dist.key == 'setuptools':
                 # Ensure that setuptools itself never becomes unavailable!
                 # XXX should this check for latest version?
-                filename = os.path.join(self.install_dir,'setuptools.pth')
-                if os.path.islink(filename): os.unlink(filename)
+                filename = os.path.join(self.install_dir, 'setuptools.pth')
+                if os.path.islink(filename):
+                    os.unlink(filename)
                 f = open(filename, 'wt')
-                f.write(self.pth_file.make_relative(dist.location)+'\n')
+                f.write(self.pth_file.make_relative(dist.location) + '\n')
                 f.close()
 
     def unpack_progress(self, src, dst):
         # Progress filter for unpacking
         log.debug("Unpacking %s to %s", src, dst)
-        return dst     # only unpack-and-compile skips files for dry run
+        return dst  # only unpack-and-compile skips files for dry run
 
     def unpack_and_compile(self, egg_path, destination):
         to_compile = []
@@ -1108,7 +1141,7 @@ def pf(src, dst):
                 to_compile.append(dst)
             elif dst.endswith('.dll') or dst.endswith('.so'):
                 to_chmod.append(dst)
-            self.unpack_progress(src,dst)
+            self.unpack_progress(src, dst)
             return not self.dry_run and dst or None
 
         unpack_archive(egg_path, destination, pf)
@@ -1124,6 +1157,7 @@ def byte_compile(self, to_compile):
             return
 
         from distutils.util import byte_compile
+
         try:
             # try to make the byte compile messages quieter
             log.set_verbosity(self.verbose - 1)
@@ -1135,7 +1169,7 @@ def byte_compile(self, to_compile):
                     dry_run=self.dry_run
                 )
         finally:
-            log.set_verbosity(self.verbose)     # restore original verbosity
+            log.set_verbosity(self.verbose)  # restore original verbosity
 
     def no_default_version_msg(self):
         template = """bad install directory or PYTHONPATH
@@ -1166,7 +1200,7 @@ def no_default_version_msg(self):
   https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again."""
-        return template % (self.install_dir, os.environ.get('PYTHONPATH',''))
+        return template % (self.install_dir, os.environ.get('PYTHONPATH', ''))
 
     def install_site_py(self):
         """Make sure there's a site.py in the target dir, if needed"""
@@ -1180,7 +1214,7 @@ def install_site_py(self):
 
         if os.path.exists(sitepy):
             log.debug("Checking existing site.py in %s", self.install_dir)
-            f = open(sitepy,'rb')
+            f = open(sitepy, 'rb')
             current = f.read()
             # we want str, not bytes
             if PY3:
@@ -1197,7 +1231,7 @@ def install_site_py(self):
             log.info("Creating %s", sitepy)
             if not self.dry_run:
                 ensure_directory(sitepy)
-                f = open(sitepy,'wb')
+                f = open(sitepy, 'wb')
                 f.write(source)
                 f.close()
             self.byte_compile([sitepy])
@@ -1215,15 +1249,15 @@ def create_home_path(self):
                 os.makedirs(path, 0o700)
 
     INSTALL_SCHEMES = dict(
-        posix = dict(
-            install_dir = '$base/lib/python$py_version_short/site-packages',
-            script_dir = '$base/bin',
+        posix=dict(
+            install_dir='$base/lib/python$py_version_short/site-packages',
+            script_dir='$base/bin',
         ),
     )
 
     DEFAULT_SCHEME = dict(
-        install_dir = '$base/Lib/site-packages',
-        script_dir = '$base/Scripts',
+        install_dir='$base/Lib/site-packages',
+        script_dir='$base/Scripts',
     )
 
     def _expand(self, *attrs):
@@ -1233,12 +1267,13 @@ def _expand(self, *attrs):
             # Set default install_dir/scripts from --prefix
             config_vars = config_vars.copy()
             config_vars['base'] = self.prefix
-            scheme = self.INSTALL_SCHEMES.get(os.name,self.DEFAULT_SCHEME)
-            for attr,val in scheme.items():
-                if getattr(self,attr,None) is None:
-                    setattr(self,attr,val)
+            scheme = self.INSTALL_SCHEMES.get(os.name, self.DEFAULT_SCHEME)
+            for attr, val in scheme.items():
+                if getattr(self, attr, None) is None:
+                    setattr(self, attr, val)
 
         from distutils.util import subst_vars
+
         for attr in attrs:
             val = getattr(self, attr)
             if val is not None:
@@ -1247,6 +1282,7 @@ def _expand(self, *attrs):
                     val = os.path.expanduser(val)
                 setattr(self, attr, val)
 
+
 def get_site_dirs():
     # return a list of 'site' dirs
     sitedirs = [_f for _f in os.environ.get('PYTHONPATH',
@@ -1260,10 +1296,10 @@ def get_site_dirs():
                 sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
             elif os.sep == '/':
                 sitedirs.extend([os.path.join(prefix,
-                                         "lib",
-                                         "python" + sys.version[:3],
-                                         "site-packages"),
-                            os.path.join(prefix, "lib", "site-python")])
+                                              "lib",
+                                              "python" + sys.version[:3],
+                                              "site-packages"),
+                                 os.path.join(prefix, "lib", "site-python")])
             else:
                 sitedirs.extend(
                     [prefix, os.path.join(prefix, "lib", "site-packages")]
@@ -1283,7 +1319,8 @@ def get_site_dirs():
                                          'site-packages'))
     lib_paths = get_path('purelib'), get_path('platlib')
     for site_lib in lib_paths:
-        if site_lib not in sitedirs: sitedirs.append(site_lib)
+        if site_lib not in sitedirs:
+            sitedirs.append(site_lib)
 
     if site.ENABLE_USER_SITE:
         sitedirs.append(site.USER_SITE)
@@ -1314,12 +1351,12 @@ def expand_paths(inputs):
             if not name.endswith('.pth'):
                 # We only care about the .pth files
                 continue
-            if name in ('easy-install.pth','setuptools.pth'):
+            if name in ('easy-install.pth', 'setuptools.pth'):
                 # Ignore .pth files that we control
                 continue
 
             # Read the .pth file
-            f = open(os.path.join(dirname,name))
+            f = open(os.path.join(dirname, name))
             lines = list(yield_lines(f))
             f.close()
 
@@ -1339,7 +1376,7 @@ def extract_wininst_cfg(dist_filename):
 
     Returns a ConfigParser.RawConfigParser, or None
     """
-    f = open(dist_filename,'rb')
+    f = open(dist_filename, 'rb')
     try:
         endrec = zipfile._EndRecData(f)
         if endrec is None:
@@ -1348,21 +1385,23 @@ def extract_wininst_cfg(dist_filename):
         prepended = (endrec[9] - endrec[5]) - endrec[6]
         if prepended < 12:  # no wininst data here
             return None
-        f.seek(prepended-12)
+        f.seek(prepended - 12)
 
         from setuptools.compat import StringIO, ConfigParser
         import struct
-        tag, cfglen, bmlen = struct.unpack("<iii",f.read(12))
+
+        tag, cfglen, bmlen = struct.unpack("<iii", f.read(12))
         if tag not in (0x1234567A, 0x1234567B):
-            return None     # not a valid tag
+            return None  # not a valid tag
 
-        f.seek(prepended-(12+cfglen))
-        cfg = ConfigParser.RawConfigParser({'version':'','target_version':''})
+        f.seek(prepended - (12 + cfglen))
+        cfg = ConfigParser.RawConfigParser(
+            {'version': '', 'target_version': ''})
         try:
             part = f.read(cfglen)
             # part is in bytes, but we need to read up to the first null
-            #  byte.
-            if sys.version_info >= (2,6):
+            # byte.
+            if sys.version_info >= (2, 6):
                 null_byte = bytes([0])
             else:
                 null_byte = chr(0)
@@ -1395,25 +1434,25 @@ def get_exe_prefixes(exe_filename):
         for info in z.infolist():
             name = info.filename
             parts = name.split('/')
-            if len(parts)==3 and parts[2]=='PKG-INFO':
+            if len(parts) == 3 and parts[2] == 'PKG-INFO':
                 if parts[1].endswith('.egg-info'):
-                    prefixes.insert(0,('/'.join(parts[:2]), 'EGG-INFO/'))
+                    prefixes.insert(0, ('/'.join(parts[:2]), 'EGG-INFO/'))
                     break
             if len(parts) != 2 or not name.endswith('.pth'):
                 continue
             if name.endswith('-nspkg.pth'):
                 continue
-            if parts[0].upper() in ('PURELIB','PLATLIB'):
+            if parts[0].upper() in ('PURELIB', 'PLATLIB'):
                 contents = z.read(name)
                 if PY3:
                     contents = contents.decode()
                 for pth in yield_lines(contents):
-                    pth = pth.strip().replace('\\','/')
+                    pth = pth.strip().replace('\\', '/')
                     if not pth.startswith('import'):
-                        prefixes.append((('%s/%s/' % (parts[0],pth)), ''))
+                        prefixes.append((('%s/%s/' % (parts[0], pth)), ''))
     finally:
         z.close()
-    prefixes = [(x.lower(),y) for x, y in prefixes]
+    prefixes = [(x.lower(), y) for x, y in prefixes]
     prefixes.sort()
     prefixes.reverse()
     return prefixes
@@ -1427,6 +1466,7 @@ def parse_requirement_arg(spec):
             "Not a URL, existing file, or requirement spec: %r" % (spec,)
         )
 
+
 class PthDistributions(Environment):
     """A .pth file with Distribution paths in it"""
 
@@ -1446,7 +1486,7 @@ def _load(self):
         saw_import = False
         seen = dict.fromkeys(self.sitedirs)
         if os.path.isfile(self.filename):
-            f = open(self.filename,'rt')
+            f = open(self.filename, 'rt')
             for line in f:
                 if line.startswith('import'):
                     saw_import = True
@@ -1458,17 +1498,17 @@ def _load(self):
                 # skip non-existent paths, in case somebody deleted a package
                 # manually, and duplicate paths as well
                 path = self.paths[-1] = normalize_path(
-                    os.path.join(self.basedir,path)
+                    os.path.join(self.basedir, path)
                 )
                 if not os.path.exists(path) or path in seen:
-                    self.paths.pop()    # skip it
-                    self.dirty = True   # we cleaned up, so we're dirty now :)
+                    self.paths.pop()  # skip it
+                    self.dirty = True  # we cleaned up, so we're dirty now :)
                     continue
                 seen[path] = 1
             f.close()
 
         if self.paths and not saw_import:
-            self.dirty = True   # ensure anything we touch has import wrappers
+            self.dirty = True  # ensure anything we touch has import wrappers
         while self.paths and not self.paths[-1].strip():
             self.paths.pop()
 
@@ -1477,7 +1517,7 @@ def save(self):
         if not self.dirty:
             return
 
-        data = '\n'.join(map(self.make_relative,self.paths))
+        data = '\n'.join(map(self.make_relative, self.paths))
         if data:
             log.debug("Saving %s", self.filename)
             data = (
@@ -1491,7 +1531,7 @@ def save(self):
 
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
-            f = open(self.filename,'wt')
+            f = open(self.filename, 'wt')
             f.write(data)
             f.close()
 
@@ -1504,9 +1544,9 @@ def save(self):
     def add(self, dist):
         """Add `dist` to the distribution map"""
         if (dist.location not in self.paths and (
-                dist.location not in self.sitedirs or
-                dist.location == os.getcwd() # account for '.' being in PYTHONPATH
-                )):
+            dist.location not in self.sitedirs or
+            dist.location == os.getcwd()  # account for '.' being in PYTHONPATH
+        )):
             self.paths.append(dist.location)
             self.dirty = True
         Environment.add(self, dist)
@@ -1518,13 +1558,13 @@ def remove(self, dist):
             self.dirty = True
         Environment.remove(self, dist)
 
-    def make_relative(self,path):
+    def make_relative(self, path):
         npath, last = os.path.split(normalize_path(path))
         baselen = len(self.basedir)
         parts = [last]
-        sep = os.altsep=='/' and '/' or os.sep
-        while len(npath)>=baselen:
-            if npath==self.basedir:
+        sep = os.altsep == '/' and '/' or os.sep
+        while len(npath) >= baselen:
+            if npath == self.basedir:
                 parts.append(os.curdir)
                 parts.reverse()
                 return sep.join(parts)
@@ -1548,12 +1588,13 @@ def _first_line_re():
 
 def get_script_header(script_text, executable=sys_executable, wininst=False):
     """Create a #! line, getting options (if any) from script_text"""
-    first = (script_text+'\n').splitlines()[0]
+    first = (script_text + '\n').splitlines()[0]
     match = _first_line_re().match(first)
     options = ''
     if match:
         options = match.group(1) or ''
-        if options: options = ' '+options
+        if options:
+            options = ' ' + options
     if wininst:
         executable = "python.exe"
     else:
@@ -1563,20 +1604,22 @@ def get_script_header(script_text, executable=sys_executable, wininst=False):
         # Non-ascii path to sys.executable, use -x to prevent warnings
         if options:
             if options.strip().startswith('-'):
-                options = ' -x'+options.strip()[1:]
-            # else: punt, we can't do it, let the warning happen anyway
+                options = ' -x' + options.strip()[1:]
+                # else: punt, we can't do it, let the warning happen anyway
         else:
             options = ' -x'
     executable = fix_jython_executable(executable, options)
     hdr = "#!%(executable)s%(options)s\n" % locals()
     return hdr
 
+
 def auto_chmod(func, arg, exc):
-    if func is os.remove and os.name=='nt':
+    if func is os.remove and os.name == 'nt':
         chmod(arg, stat.S_IWRITE)
         return func(arg)
     et, ev, _ = sys.exc_info()
-    reraise(et, (ev[0], ev[1] + (" %s %s" % (func,arg))))
+    reraise(et, (ev[0], ev[1] + (" %s %s" % (func, arg))))
+
 
 def update_dist_caches(dist_path, fix_zipimporter_caches):
     """
@@ -1630,7 +1673,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
     # instances that we do not clear here, but might if ever given a reason to
     # do so:
     # * Global setuptools pkg_resources.working_set (a.k.a. 'master working
-    #   set') may contain distributions which may in turn contain their
+    # set') may contain distributions which may in turn contain their
     #   zipimport.zipimporter loaders.
     # * Several zipimport.zipimporter loaders held by local variables further
     #   up the function call stack when running the setuptools installation.
@@ -1659,6 +1702,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches):
         # this is really needed.
         _remove_and_clear_zip_directory_cache_data(normalized_path)
 
+
 def _collect_zipimporter_cache_entries(normalized_path, cache):
     """
     Return zipimporter cache entry keys related to a given normalized path.
@@ -1678,6 +1722,7 @@ def _collect_zipimporter_cache_entries(normalized_path, cache):
             result.append(p)
     return result
 
+
 def _update_zipimporter_cache(normalized_path, cache, updater=None):
     """
     Update zipimporter cache data for a given normalized path.
@@ -1696,7 +1741,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
     for p in _collect_zipimporter_cache_entries(normalized_path, cache):
         # N.B. pypy's custom zipimport._zip_directory_cache implementation does
         # not support the complete dict interface:
-        #  * Does not support item assignment, thus not allowing this function
+        # * Does not support item assignment, thus not allowing this function
         #    to be used only for removing existing cache entries.
         #  * Does not support the dict.pop() method, forcing us to use the
         #    get/del patterns instead. For more detailed information see the
@@ -1709,14 +1754,17 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
         if new_entry is not None:
             cache[p] = new_entry
 
+
 def _uncache(normalized_path, cache):
     _update_zipimporter_cache(normalized_path, cache)
 
+
 def _remove_and_clear_zip_directory_cache_data(normalized_path):
     def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
         old_entry.clear()
-    _update_zipimporter_cache(normalized_path,
-        zipimport._zip_directory_cache,
+
+    _update_zipimporter_cache(
+        normalized_path, zipimport._zip_directory_cache,
         updater=clear_and_remove_cached_zip_archive_directory_data)
 
 # PyPy Python implementation does not allow directly writing to the
@@ -1728,7 +1776,7 @@ def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
 # instead of being automatically corrected to use the new correct zip archive
 # directory information.
 if '__pypy__' in sys.builtin_module_names:
-    _replace_zip_directory_cache_data =  \
+    _replace_zip_directory_cache_data = \
         _remove_and_clear_zip_directory_cache_data
 else:
     def _replace_zip_directory_cache_data(normalized_path):
@@ -1744,10 +1792,12 @@ def replace_cached_zip_archive_directory_data(path, old_entry):
             zipimport.zipimporter(path)
             old_entry.update(zipimport._zip_directory_cache[path])
             return old_entry
-        _update_zipimporter_cache(normalized_path,
-            zipimport._zip_directory_cache,
+
+        _update_zipimporter_cache(
+            normalized_path, zipimport._zip_directory_cache,
             updater=replace_cached_zip_archive_directory_data)
 
+
 def is_python(text, filename='<string>'):
     "Is this string a valid Python script?"
     try:
@@ -1757,15 +1807,18 @@ def is_python(text, filename='<string>'):
     else:
         return True
 
+
 def is_sh(executable):
     """Determine if the specified executable is a .sh (contains a #! line)"""
     try:
         fp = open(executable)
         magic = fp.read(2)
         fp.close()
-    except (OSError,IOError): return executable
+    except (OSError, IOError):
+        return executable
     return magic == '#!'
 
+
 def nt_quote_arg(arg):
     """Quote a command line argument according to Windows parsing rules"""
 
@@ -1782,7 +1835,7 @@ def nt_quote_arg(arg):
             nb += 1
         elif c == '"':
             # double preceding backslashes, then add a \"
-            result.append('\\' * (nb*2) + '\\"')
+            result.append('\\' * (nb * 2) + '\\"')
             nb = 0
         else:
             if nb:
@@ -1794,29 +1847,33 @@ def nt_quote_arg(arg):
         result.append('\\' * nb)
 
     if needquote:
-        result.append('\\' * nb)    # double the trailing backslashes
+        result.append('\\' * nb)  # double the trailing backslashes
         result.append('"')
 
     return ''.join(result)
 
+
 def is_python_script(script_text, filename):
     """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc.
     """
     if filename.endswith('.py') or filename.endswith('.pyw'):
-        return True     # extension says it's Python
+        return True  # extension says it's Python
     if is_python(script_text, filename):
-        return True     # it's syntactically valid Python
+        return True  # it's syntactically valid Python
     if script_text.startswith('#!'):
         # It begins with a '#!' line, so check if 'python' is in it somewhere
         return 'python' in script_text.splitlines()[0].lower()
 
-    return False    # Not any Python I can recognize
+    return False  # Not any Python I can recognize
+
 
 try:
     from os import chmod as _chmod
 except ImportError:
     # Jython compatibility
-    def _chmod(*args): pass
+    def _chmod(*args):
+        pass
+
 
 def chmod(path, mode):
     log.debug("changing mode of %s to %o", path, mode)
@@ -1826,10 +1883,12 @@ def chmod(path, mode):
         e = sys.exc_info()[1]
         log.debug("chmod failed: %s", e)
 
+
 def fix_jython_executable(executable, options):
     if sys.platform.startswith('java') and is_sh(executable):
         # Workaround for Jython is not needed on Linux systems.
         import java
+
         if java.lang.System.getProperty("os.name") == "Linux":
             return executable
 
@@ -1878,19 +1937,19 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
             for name, ep in dist.get_entry_map(group).items():
                 script_text = gen_class.template % locals()
                 for res in gen_class._get_script_args(type_, name, header,
-                        script_text):
+                                                      script_text):
                     yield res
 
     @classmethod
     def get_writer(cls, force_windows):
-        if force_windows or sys.platform=='win32':
+        if force_windows or sys.platform == 'win32':
             return WindowsScriptWriter.get_writer()
         return cls
 
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         # Simply write the stub with no extension.
-        yield (name, header+script_text)
+        yield (name, header + script_text)
 
 
 class WindowsScriptWriter(ScriptWriter):
@@ -1913,12 +1972,12 @@ def _get_script_args(cls, type_, name, header, script_text):
         ext = dict(console='.pya', gui='.pyw')[type_]
         if ext not in os.environ['PATHEXT'].lower().split(';'):
             warnings.warn("%s not listed in PATHEXT; scripts will not be "
-                "recognized as executables." % ext, UserWarning)
+                          "recognized as executables." % ext, UserWarning)
         old = ['.pya', '.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)
-        blockers = [name+x for x in old]
-        yield name+ext, header+script_text, 't', blockers
+        blockers = [name + x for x in old]
+        yield name + ext, header + script_text, 't', blockers
 
     @staticmethod
     def _adjust_header(type_, orig_header):
@@ -1945,33 +2004,35 @@ def _get_script_args(cls, type_, name, header, script_text):
         """
         For Windows, add a .py extension and an .exe launcher
         """
-        if type_=='gui':
+        if type_ == 'gui':
             launcher_type = 'gui'
             ext = '-script.pyw'
             old = ['.pyw']
         else:
             launcher_type = 'cli'
             ext = '-script.py'
-            old = ['.py','.pyc','.pyo']
+            old = ['.py', '.pyc', '.pyo']
         hdr = cls._adjust_header(type_, header)
-        blockers = [name+x for x in old]
-        yield (name+ext, hdr+script_text, 't', blockers)
+        blockers = [name + x for x in old]
+        yield (name + ext, hdr + script_text, 't', blockers)
         yield (
-            name+'.exe', get_win_launcher(launcher_type),
-            'b' # write in binary mode
+            name + '.exe', get_win_launcher(launcher_type),
+            'b'  # write in binary mode
         )
         if not is_64bit():
             # install a manifest for the launcher to prevent Windows
-            #  from detecting it as an installer (which it will for
+            # from detecting it as an installer (which it will for
             #  launchers like easy_install.exe). Consider only
             #  adding a manifest for launchers detected as installers.
             #  See Distribute #143 for details.
             m_name = name + '.exe.manifest'
             yield (m_name, load_launcher_manifest(name), 't')
 
+
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args
 
+
 def get_win_launcher(type):
     """
     Load the Windows launcher (executable) suitable for launching a script.
@@ -1981,7 +2042,7 @@ def get_win_launcher(type):
     Returns the executable as a byte string.
     """
     launcher_fn = '%s.exe' % type
-    if platform.machine().lower()=='arm':
+    if platform.machine().lower() == 'arm':
         launcher_fn = launcher_fn.replace(".", "-arm.")
     if is_64bit():
         launcher_fn = launcher_fn.replace(".", "-64.")
@@ -1989,6 +2050,7 @@ def get_win_launcher(type):
         launcher_fn = launcher_fn.replace(".", "-32.")
     return resource_string('setuptools', launcher_fn)
 
+
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
     if PY2:
@@ -1996,6 +2058,7 @@ def load_launcher_manifest(name):
     else:
         return manifest.decode('utf-8') % vars()
 
+
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
     """Recursively delete a directory tree.
 
@@ -2031,19 +2094,23 @@ def onerror(*args):
     except os.error:
         onerror(os.rmdir, path, sys.exc_info())
 
+
 def current_umask():
     tmp = os.umask(0o022)
     os.umask(tmp)
     return tmp
 
+
 def bootstrap():
     # This function is called when setuptools*.egg is run using /bin/sh
     import setuptools
+
     argv0 = os.path.dirname(setuptools.__path__[0])
     sys.argv[0] = argv0
     sys.argv.append(argv0)
     main()
 
+
 def main(argv=None, **kw):
     from setuptools import setup
     from setuptools.dist import Distribution
@@ -2070,16 +2137,16 @@ def with_ei_usage(f):
     class DistributionWithoutHelpCommands(Distribution):
         common_usage = ""
 
-        def _show_help(self,*args,**kw):
-            with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
+        def _show_help(self, *args, **kw):
+            with_ei_usage(lambda: Distribution._show_help(self, *args, **kw))
 
     if argv is None:
         argv = sys.argv[1:]
 
-    with_ei_usage(lambda:
-        setup(
-            script_args = ['-q','easy_install', '-v']+argv,
-            script_name = sys.argv[0] or 'easy_install',
+    with_ei_usage(
+        lambda: setup(
+            script_args=['-q', 'easy_install', '-v'] + argv,
+            script_name=sys.argv[0] or 'easy_install',
             distclass=DistributionWithoutHelpCommands, **kw
         )
     )
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 04ed635762..981c7ab76d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -2,21 +2,22 @@
 
 Create a distribution's .egg-info directory and contents"""
 
+from distutils.filelist import FileList as _FileList
+from distutils.util import convert_path
+from distutils import log
+import distutils.errors
 import os
 import re
 import sys
 
 from setuptools import Command
-import distutils.errors
-from distutils import log
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
 from setuptools import svn_utils
-from distutils.util import convert_path
-from distutils.filelist import FileList as _FileList
-from pkg_resources import (parse_requirements, safe_name, parse_version,
-    safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 from setuptools.command.sdist import walk_revctrl
+from pkg_resources import (
+    parse_requirements, safe_name, parse_version,
+    safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 import setuptools.unicode_utils as unicode_utils
 
 
@@ -27,11 +28,11 @@ class egg_info(Command):
         ('egg-base=', 'e', "directory containing .egg-info directories"
                            " (default: top of the source tree)"),
         ('tag-svn-revision', 'r',
-            "Add subversion revision ID to version number"),
+         "Add subversion revision ID to version number"),
         ('tag-date', 'd', "Add date stamp (e.g. 20050528) to version number"),
         ('tag-build=', 'b', "Specify explicit tag to add to version number"),
         ('no-svn-revision', 'R',
-            "Don't add subversion revision ID [default]"),
+         "Don't add subversion revision ID [default]"),
         ('no-date', 'D', "Don't include date stamp [default]"),
     ]
 
@@ -52,6 +53,7 @@ def initialize_options(self):
 
     def save_version_info(self, filename):
         from setuptools.command.setopt import edit_config
+
         values = dict(
             egg_info=dict(
                 tag_svn_revision=0,
@@ -68,23 +70,25 @@ def finalize_options(self):
 
         try:
             list(
-                parse_requirements('%s==%s' % (self.egg_name,self.egg_version))
+                parse_requirements('%s==%s' % (self.egg_name,
+                                               self.egg_version))
             )
         except ValueError:
             raise distutils.errors.DistutilsOptionError(
                 "Invalid distribution name or version syntax: %s-%s" %
-                (self.egg_name,self.egg_version)
+                (self.egg_name, self.egg_version)
             )
 
         if self.egg_base is None:
             dirs = self.distribution.package_dir
-            self.egg_base = (dirs or {}).get('',os.curdir)
+            self.egg_base = (dirs or {}).get('', os.curdir)
 
         self.ensure_dirname('egg_base')
-        self.egg_info = to_filename(self.egg_name)+'.egg-info'
+        self.egg_info = to_filename(self.egg_name) + '.egg-info'
         if self.egg_base != os.curdir:
             self.egg_info = os.path.join(self.egg_base, self.egg_info)
-        if '-' in self.egg_name: self.check_broken_egg_info()
+        if '-' in self.egg_name:
+            self.check_broken_egg_info()
 
         # Set package version for the benefit of dumber commands
         # (e.g. sdist, bdist_wininst, etc.)
@@ -96,7 +100,7 @@ def finalize_options(self):
         # to the version info
         #
         pd = self.distribution._patched_dist
-        if pd is not None and pd.key==self.egg_name.lower():
+        if pd is not None and pd.key == self.egg_name.lower():
             pd._version = self.egg_version
             pd._parsed_version = parse_version(self.egg_version)
             self.distribution._patched_dist = None
@@ -154,7 +158,7 @@ def run(self):
         installer = self.distribution.fetch_build_egg
         for ep in iter_entry_points('egg_info.writers'):
             writer = ep.load(installer=installer)
-            writer(self, ep.name, os.path.join(self.egg_info,ep.name))
+            writer(self, ep.name, os.path.join(self.egg_info, ep.name))
 
         # Get rid of native_libs.txt if it was put there by older bdist_egg
         nl = os.path.join(self.egg_info, "native_libs.txt")
@@ -166,12 +170,14 @@ def run(self):
     def tags(self):
         version = ''
         if self.tag_build:
-            version+=self.tag_build
+            version += self.tag_build
         if self.tag_svn_revision and (
             os.path.exists('.svn') or os.path.exists('PKG-INFO')
-        ):  version += '-r%s' % self.get_svn_revision()
+        ):
+            version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             import time
+
             version += time.strftime("-%Y%m%d")
         return version
 
@@ -181,32 +187,33 @@ def get_svn_revision():
 
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
-        manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")
+        manifest_filename = os.path.join(self.egg_info, "SOURCES.txt")
         mm = manifest_maker(self.distribution)
         mm.manifest = manifest_filename
         mm.run()
         self.filelist = mm.filelist
 
     def check_broken_egg_info(self):
-        bei = self.egg_name+'.egg-info'
+        bei = self.egg_name + '.egg-info'
         if self.egg_base != os.curdir:
             bei = os.path.join(self.egg_base, bei)
         if os.path.exists(bei):
             log.warn(
-                "-"*78+'\n'
+                "-" * 78 + '\n'
                 "Note: Your current .egg-info directory has a '-' in its name;"
                 '\nthis will not work correctly with "setup.py develop".\n\n'
-                'Please rename %s to %s to correct this problem.\n'+'-'*78,
+                'Please rename %s to %s to correct this problem.\n' + '-' * 78,
                 bei, self.egg_info
             )
             self.broken_egg_info = self.egg_info
-            self.egg_info = bei     # make it work for now
+            self.egg_info = bei  # make it work for now
+
 
 class FileList(_FileList):
     """File list that accepts only existing, platform-independent paths"""
 
     def append(self, item):
-        if item.endswith('\r'):     # Fix older sdists built on Windows
+        if item.endswith('\r'):  # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
 
@@ -229,29 +236,28 @@ def _repair(self):
     def _safe_path(self, path):
         enc_warn = "'%s' not %s encodable -- skipping"
 
-        #To avoid accidental trans-codings errors, first to unicode
+        # To avoid accidental trans-codings errors, first to unicode
         u_path = unicode_utils.filesys_decode(path)
         if u_path is None:
             log.warn("'%s' in unexpected encoding -- skipping" % path)
             return False
 
-        #Must ensure utf-8 encodability
+        # Must ensure utf-8 encodability
         utf8_path = unicode_utils.try_encode(u_path, "utf-8")
         if utf8_path is None:
             log.warn(enc_warn, path, 'utf-8')
             return False
 
         try:
-            #accept is either way checks out
+            # accept is either way checks out
             if os.path.exists(u_path) or os.path.exists(utf8_path):
                 return True
-        #this will catch any encode errors decoding u_path
+        # this will catch any encode errors decoding u_path
         except UnicodeEncodeError:
             log.warn(enc_warn, path, sys.getfilesystemencoding())
 
 
 class manifest_maker(sdist):
-
     template = "MANIFEST.in"
 
     def initialize_options(self):
@@ -266,7 +272,7 @@ def finalize_options(self):
     def run(self):
         self.filelist = FileList()
         if not os.path.exists(self.manifest):
-            self.write_manifest()   # it must exist so it'll get in the list
+            self.write_manifest()  # it must exist so it'll get in the list
         self.filelist.findall()
         self.add_defaults()
         if os.path.exists(self.template):
@@ -287,12 +293,12 @@ def write_manifest(self):
         """
         self.filelist._repair()
 
-        #Now _repairs should encodability, but not unicode
+        # Now _repairs should encodability, but not unicode
         files = [self._manifest_normalize(f) for f in self.filelist.files]
         msg = "writing manifest file '%s'" % self.manifest
         self.execute(write_file, (self.manifest, files), msg)
 
-    def warn(self, msg):    # suppress missing-file warnings from sdist
+    def warn(self, msg):  # suppress missing-file warnings from sdist
         if not msg.startswith("standard file not found:"):
             sdist.warn(self, msg)
 
@@ -314,7 +320,8 @@ def prune_file_list(self):
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
         sep = re.escape(os.sep)
-        self.filelist.exclude_pattern(sep+r'(RCS|CVS|\.svn)'+sep, is_regex=1)
+        self.filelist.exclude_pattern(sep + r'(RCS|CVS|\.svn)' + sep,
+                                      is_regex=1)
 
 
 def write_file(filename, contents):
@@ -323,10 +330,10 @@ def write_file(filename, contents):
     """
     contents = "\n".join(contents)
 
-    #assuming the contents has been vetted for utf-8 encoding
+    # assuming the contents has been vetted for utf-8 encoding
     contents = contents.encode("utf-8")
 
-    with open(filename, "wb") as f:        # always write POSIX-style manifest
+    with open(filename, "wb") as f:  # always write POSIX-style manifest
         f.write(contents)
 
 
@@ -343,10 +350,12 @@ def write_pkg_info(cmd, basename, filename):
         finally:
             metadata.name, metadata.version = oldname, oldver
 
-        safe = getattr(cmd.distribution,'zip_safe',None)
+        safe = getattr(cmd.distribution, 'zip_safe', None)
         from setuptools.command import bdist_egg
+
         bdist_egg.write_safety_flag(cmd.egg_info, safe)
 
+
 def warn_depends_obsolete(cmd, basename, filename):
     if os.path.exists(filename):
         log.warn(
@@ -361,6 +370,7 @@ def _write_requirements(stream, reqs):
     lines = map(append_cr, lines)
     stream.writelines(lines)
 
+
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
     data = StringIO()
@@ -371,48 +381,52 @@ def write_requirements(cmd, basename, filename):
         _write_requirements(data, extras_require[extra])
     cmd.write_or_delete_file("requirements", filename, data.getvalue())
 
+
 def write_toplevel_names(cmd, basename, filename):
     pkgs = dict.fromkeys(
         [
-            k.split('.',1)[0]
+            k.split('.', 1)[0]
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(pkgs)+'\n')
+    cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):
     write_arg(cmd, basename, filename, True)
 
+
 def write_arg(cmd, basename, filename, force=False):
     argname = os.path.splitext(basename)[0]
     value = getattr(cmd.distribution, argname, None)
     if value is not None:
-        value = '\n'.join(value)+'\n'
+        value = '\n'.join(value) + '\n'
     cmd.write_or_delete_file(argname, filename, value, force)
 
+
 def write_entries(cmd, basename, filename):
     ep = cmd.distribution.entry_points
 
-    if isinstance(ep,basestring) or ep is None:
+    if isinstance(ep, basestring) or ep is None:
         data = ep
     elif ep is not None:
         data = []
         for section, contents in sorted(ep.items()):
-            if not isinstance(contents,basestring):
+            if not isinstance(contents, basestring):
                 contents = EntryPoint.parse_group(section, contents)
-                contents = '\n'.join(sorted(map(str,contents.values())))
-            data.append('[%s]\n%s\n\n' % (section,contents))
+                contents = '\n'.join(sorted(map(str, contents.values())))
+            data.append('[%s]\n%s\n\n' % (section, contents))
         data = ''.join(data)
 
     cmd.write_or_delete_file('entry points', filename, data, True)
 
+
 def get_pkg_info_revision():
     # See if we can get a -r### off of PKG-INFO, in case this is an sdist of
     # a subversion revision
     #
     if os.path.exists('PKG-INFO'):
-        f = open('PKG-INFO','rU')
+        f = open('PKG-INFO', 'rU')
         for line in f:
             match = re.match(r"Version:.*-r(\d+)\s*$", line)
             if match:
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 1f489734d4..d2bca2ec59 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -1,22 +1,24 @@
-import setuptools
+from distutils.errors import DistutilsArgError
 import inspect
 import glob
 import warnings
 import platform
 import distutils.command.install as orig
-from distutils.errors import DistutilsArgError
+
+import setuptools
 
 # Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
-#  now. See https://bitbucket.org/pypa/setuptools/issue/199/
+# now. See https://bitbucket.org/pypa/setuptools/issue/199/
 _install = orig.install
 
+
 class install(orig.install):
     """Use easy_install to install the package, w/dependencies"""
 
     user_options = orig.install.user_options + [
         ('old-and-unmanageable', None, "Try not to use this!"),
         ('single-version-externally-managed', None,
-            "used by system package builders to create 'flat' eggs"),
+         "used by system package builders to create 'flat' eggs"),
     ]
     boolean_options = orig.install.boolean_options + [
         'old-and-unmanageable', 'single-version-externally-managed',
@@ -115,7 +117,9 @@ def do_egg_install(self):
         cmd.run()
         setuptools.bootstrap_install_from = None
 
+
 # XXX Python 3.1 doesn't see _nc if this is inside the class
-install.sub_commands = [
-        cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc
-    ] + install.new_commands
+install.sub_commands = (
+    [cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc] +
+    install.new_commands
+)
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 73b5ef7375..a71268abef 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,7 +1,10 @@
+from distutils import log, dir_util
+import os
+
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
-from distutils import log, dir_util
-import os, pkg_resources
+import pkg_resources
+
 
 class install_egg_info(Command):
     """Install an .egg-info directory for the package"""
@@ -16,11 +19,12 @@ def initialize_options(self):
         self.install_dir = None
 
     def finalize_options(self):
-        self.set_undefined_options('install_lib',('install_dir','install_dir'))
+        self.set_undefined_options('install_lib',
+                                   ('install_dir', 'install_dir'))
         ei_cmd = self.get_finalized_command("egg_info")
         basename = pkg_resources.Distribution(
             None, None, ei_cmd.egg_name, ei_cmd.egg_version
-        ).egg_name()+'.egg-info'
+        ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
         self.outputs = [self.target]
@@ -31,11 +35,11 @@ def run(self):
         if os.path.isdir(self.target) and not os.path.islink(self.target):
             dir_util.remove_tree(self.target, dry_run=self.dry_run)
         elif os.path.exists(self.target):
-            self.execute(os.unlink,(self.target,),"Removing "+self.target)
+            self.execute(os.unlink, (self.target,), "Removing " + self.target)
         if not self.dry_run:
             pkg_resources.ensure_directory(self.target)
-        self.execute(self.copytree, (),
-            "Copying %s to %s" % (self.source, self.target)
+        self.execute(
+            self.copytree, (), "Copying %s to %s" % (self.source, self.target)
         )
         self.install_namespaces()
 
@@ -44,50 +48,29 @@ def get_outputs(self):
 
     def copytree(self):
         # Copy the .egg-info tree to site-packages
-        def skimmer(src,dst):
+        def skimmer(src, dst):
             # filter out source-control directories; note that 'src' is always
             # a '/'-separated path, regardless of platform.  'dst' is a
             # platform-specific path.
-            for skip in '.svn/','CVS/':
-                if src.startswith(skip) or '/'+skip in src:
+            for skip in '.svn/', 'CVS/':
+                if src.startswith(skip) or '/' + skip in src:
                     return None
             self.outputs.append(dst)
             log.debug("Copying %s to %s", src, dst)
             return dst
-        unpack_archive(self.source, self.target, skimmer)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+        unpack_archive(self.source, self.target, skimmer)
 
     def install_namespaces(self):
         nsp = self._get_all_ns_packages()
-        if not nsp: return
-        filename,ext = os.path.splitext(self.target)
-        filename += '-nspkg.pth'; self.outputs.append(filename)
-        log.info("Installing %s",filename)
+        if not nsp:
+            return
+        filename, ext = os.path.splitext(self.target)
+        filename += '-nspkg.pth'
+        self.outputs.append(filename)
+        log.info("Installing %s", filename)
         if not self.dry_run:
-            f = open(filename,'wt')
+            f = open(filename, 'wt')
             for pkg in nsp:
                 # ensure pkg is not a unicode string under Python 2.7
                 pkg = str(pkg)
@@ -101,10 +84,11 @@ def install_namespaces(self):
                 f.write(
                     "import sys,types,os; "
                     "p = os.path.join(sys._getframe(1).f_locals['sitedir'], "
-                        "*%(pth)r); "
+                    "*%(pth)r); "
                     "ie = os.path.exists(os.path.join(p,'__init__.py')); "
                     "m = not ie and "
-                        "sys.modules.setdefault(%(pkg)r,types.ModuleType(%(pkg)r)); "
+                    "sys.modules.setdefault(%(pkg)r,types.ModuleType"
+                    "(%(pkg)r)); "
                     "mp = (m or []) and m.__dict__.setdefault('__path__',[]); "
                     "(p not in mp) and mp.append(p)%(trailer)s"
                     % locals()
@@ -118,8 +102,6 @@ def _get_all_ns_packages(self):
             while pkg:
                 nsp['.'.join(pkg)] = 1
                 pkg.pop()
-        nsp=list(nsp)
+        nsp = list(nsp)
         nsp.sort()  # set up shorter names first
         return nsp
-
-
diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 747fbabbae..d7e117f08b 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,6 +1,7 @@
 import distutils.command.install_lib as orig
 import os
 
+
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
 
@@ -15,20 +16,20 @@ def get_exclusions(self):
         exclude = {}
         nsp = self.distribution.namespace_packages
         svem = (nsp and self.get_finalized_command('install')
-            .single_version_externally_managed)
+                .single_version_externally_managed)
         if svem:
             for pkg in nsp:
                 parts = pkg.split('.')
                 while parts:
                     pkgdir = os.path.join(self.install_dir, *parts)
                     for f in '__init__.py', '__init__.pyc', '__init__.pyo':
-                        exclude[os.path.join(pkgdir,f)] = 1
+                        exclude[os.path.join(pkgdir, f)] = 1
                     parts.pop()
         return exclude
 
     def copy_tree(
-        self, infile, outfile,
-        preserve_mode=1, preserve_times=1, preserve_symlinks=0, level=1
+            self, infile, outfile,
+            preserve_mode=1, preserve_times=1, preserve_symlinks=0, level=1
     ):
         assert preserve_mode and preserve_times and not preserve_symlinks
         exclude = self.get_exclusions()
@@ -45,7 +46,8 @@ def copy_tree(
 
         def pf(src, dst):
             if dst in exclude:
-                log.warn("Skipping installation of %s (namespace package)",dst)
+                log.warn("Skipping installation of %s (namespace package)",
+                         dst)
                 return False
 
             log.info("copying %s -> %s", src, os.path.dirname(dst))
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index ac373193f3..eb79fa3c73 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,7 +1,9 @@
+from distutils import log
 import distutils.command.install_scripts as orig
-from pkg_resources import Distribution, PathMetadata, ensure_directory
 import os
-from distutils import log
+
+from pkg_resources import Distribution, PathMetadata, ensure_directory
+
 
 class install_scripts(orig.install_scripts):
     """Do normal script install, plus any egg_info wrapper scripts"""
@@ -29,7 +31,7 @@ def run(self):
             ei_cmd.egg_name, ei_cmd.egg_version,
         )
         bs_cmd = self.get_finalized_command('build_scripts')
-        executable = getattr(bs_cmd,'executable',sys_executable)
+        executable = getattr(bs_cmd, 'executable', sys_executable)
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
@@ -39,6 +41,7 @@ def run(self):
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
         from setuptools.command.easy_install import chmod, current_umask
+
         log.info("Installing %s script to %s", script_name, self.install_dir)
         target = os.path.join(self.install_dir, script_name)
         self.outfiles.append(target)
@@ -46,7 +49,7 @@ def write_script(self, script_name, contents, mode="t", *ignored):
         mask = current_umask()
         if not self.dry_run:
             ensure_directory(target)
-            f = open(target,"w"+mode)
+            f = open(target, "w" + mode)
             f.write(contents)
             f.close()
-            chmod(target, 0o777-mask)
+            chmod(target, 0o777 - mask)
diff --git a/setuptools/command/launcher manifest.xml b/setuptools/command/launcher manifest.xml
index 844d2264cd..5972a96d8d 100644
--- a/setuptools/command/launcher manifest.xml	
+++ b/setuptools/command/launcher manifest.xml	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0"
-    processorArchitecture="X86"
-    name="%(name)s"
-    type="win32"/>
+    <assemblyIdentity version="1.0.0.0"
+                      processorArchitecture="X86"
+                      name="%(name)s"
+                      type="win32"/>
     <!-- Identify the application security requirements. -->
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-        </requestedPrivileges>
-    </security>
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+            </requestedPrivileges>
+        </security>
     </trustInfo>
 </assembly>
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 6694d1c0a7..8d6336a14d 100755
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,5 +1,6 @@
 import distutils.command.register as orig
 
+
 class register(orig.register):
     __doc__ = orig.register.__doc__
 
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index c556aa17c0..1b073620ea 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -1,18 +1,20 @@
-import os
-from setuptools import Command
-from setuptools.compat import basestring
 from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
+import os
+
+from setuptools import Command
+from setuptools.compat import basestring
+
 
 class rotate(Command):
     """Delete older distributions"""
 
     description = "delete older distributions, keeping N newest files"
     user_options = [
-        ('match=',    'm', "patterns to match (required)"),
+        ('match=', 'm', "patterns to match (required)"),
         ('dist-dir=', 'd', "directory where the distributions are"),
-        ('keep=',     'k', "number of matching distributions to keep"),
+        ('keep=', 'k', "number of matching distributions to keep"),
     ]
 
     boolean_options = []
@@ -38,21 +40,22 @@ def finalize_options(self):
             self.match = [
                 convert_path(p.strip()) for p in self.match.split(',')
             ]
-        self.set_undefined_options('bdist',('dist_dir', 'dist_dir'))
+        self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
     def run(self):
         self.run_command("egg_info")
         from glob import glob
+
         for pattern in self.match:
-            pattern = self.distribution.get_name()+'*'+pattern
-            files = glob(os.path.join(self.dist_dir,pattern))
-            files = [(os.path.getmtime(f),f) for f in files]
+            pattern = self.distribution.get_name() + '*' + pattern
+            files = glob(os.path.join(self.dist_dir, pattern))
+            files = [(os.path.getmtime(f), f) for f in files]
             files.sort()
             files.reverse()
 
             log.info("%d file(s) matching %s", len(files), pattern)
             files = files[self.keep:]
-            for (t,f) in files:
+            for (t, f) in files:
                 log.info("Deleting %s", f)
                 if not self.dry_run:
                     os.unlink(f)
diff --git a/setuptools/command/saveopts.py b/setuptools/command/saveopts.py
index 7209be4cd9..611cec5528 100755
--- a/setuptools/command/saveopts.py
+++ b/setuptools/command/saveopts.py
@@ -1,7 +1,6 @@
-import distutils, os
-from setuptools import Command
 from setuptools.command.setopt import edit_config, option_base
 
+
 class saveopts(option_base):
     """Save command-line options to a file"""
 
@@ -13,12 +12,11 @@ def run(self):
 
         for cmd in dist.command_options:
 
-            if cmd=='saveopts':
-                continue    # don't save our own options!
+            if cmd == 'saveopts':
+                continue  # don't save our own options!
 
-            for opt,(src,val) in dist.get_option_dict(cmd).items():
-                if src=="command line":
-                    settings.setdefault(cmd,{})[opt] = val
+            for opt, (src, val) in dist.get_option_dict(cmd).items():
+                if src == "command line":
+                    settings.setdefault(cmd, {})[opt] = val
 
         edit_config(self.filename, settings, self.dry_run)
-
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index f9a5b7b919..2aa1ee20fd 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,14 +1,14 @@
+from glob import glob
+from distutils.util import convert_path
+from distutils import log
+import distutils.command.sdist as orig
 import os
 import re
 import sys
-from glob import glob
 
-import pkg_resources
-import distutils.command.sdist as orig
-from distutils.util import convert_path
-from distutils import log
 from setuptools import svn_utils
 from setuptools.compat import PY3
+import pkg_resources
 
 READMES = ('README', 'README.rst', 'README.txt')
 
@@ -20,7 +20,7 @@ def walk_revctrl(dirname=''):
             yield item
 
 
-#TODO will need test case
+# TODO will need test case
 class re_finder(object):
     """
     Finder that locates files based on entries in a file matched by a
@@ -33,7 +33,7 @@ def __init__(self, path, pattern, postproc=lambda x: x):
         self.entries_path = convert_path(path)
 
     def _finder(self, dirname, filename):
-        f = open(filename,'rU')
+        f = open(filename, 'rU')
         try:
             data = f.read()
         finally:
@@ -51,12 +51,13 @@ def find(self, dirname=''):
         if not os.path.isfile(path):
             # entries file doesn't exist
             return
-        for path in self._finder(dirname,path):
+        for path in self._finder(dirname, path):
             if os.path.isfile(path):
                 yield path
             elif os.path.isdir(path):
                 for item in self.find(path):
                     yield item
+
     __call__ = find
 
 
@@ -85,7 +86,7 @@ class sdist(orig.sdist):
         ('dist-dir=', 'd',
          "directory to put the source distribution archive(s) in "
          "[default: dist]"),
-        ]
+    ]
 
     negative_opt = {}
 
@@ -93,7 +94,7 @@ def run(self):
         self.run_command('egg_info')
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist = ei_cmd.filelist
-        self.filelist.append(os.path.join(ei_cmd.egg_info,'SOURCES.txt'))
+        self.filelist.append(os.path.join(ei_cmd.egg_info, 'SOURCES.txt'))
         self.check_readme()
 
         # Run sub commands
@@ -103,12 +104,13 @@ def run(self):
         # Call check_metadata only if no 'check' command
         # (distutils <= 2.6)
         import distutils.command
+
         if 'check' not in distutils.command.__all__:
             self.check_metadata()
 
         self.make_distribution()
 
-        dist_files = getattr(self.distribution,'dist_files',[])
+        dist_files = getattr(self.distribution, 'dist_files', [])
         for file in self.archive_files:
             data = ('sdist', '', file)
             if data not in dist_files:
@@ -124,13 +126,14 @@ def __read_template_hack(self):
         except:
             sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
             raise
+
     # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
     #  has been fixed, so only override the method if we're using an earlier
     #  Python.
     has_leaky_handle = (
-        sys.version_info < (2,7,2)
-        or (3,0) <= sys.version_info < (3,1,4)
-        or (3,2) <= sys.version_info < (3,2,1)
+        sys.version_info < (2, 7, 2)
+        or (3, 0) <= sys.version_info < (3, 1, 4)
+        or (3, 2) <= sys.version_info < (3, 2, 1)
     )
     if has_leaky_handle:
         read_template = __read_template_hack
@@ -194,7 +197,8 @@ def check_readme(self):
                 return
         else:
             self.warn(
-                "standard file not found: should have one of " +', '.join(READMES)
+                "standard file not found: should have one of " +
+                ', '.join(READMES)
             )
 
     def make_release_tree(self, base_dir, files):
@@ -202,7 +206,7 @@ def make_release_tree(self, base_dir, files):
 
         # Save any egg_info command line options used to create this sdist
         dest = os.path.join(base_dir, 'setup.cfg')
-        if hasattr(os,'link') and os.path.exists(dest):
+        if hasattr(os, 'link') and os.path.exists(dest):
             # unlink and re-copy, since it might be hard-linked, and
             # we don't want to change the source version
             os.unlink(dest)
@@ -220,7 +224,8 @@ def _manifest_is_not_generated(self):
             first_line = fp.readline()
         finally:
             fp.close()
-        return first_line != '# file GENERATED by distutils, do NOT edit\n'.encode()
+        return (first_line !=
+                '# file GENERATED by distutils, do NOT edit\n'.encode())
 
     def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 575653c8c7..a04d6032ad 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -1,9 +1,11 @@
-import os
-import distutils
-from setuptools import Command
 from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
+import distutils
+import os
+
+from setuptools import Command
+
 
 __all__ = ['config_file', 'edit_config', 'option_base', 'setopt']
 
@@ -13,19 +15,20 @@ def config_file(kind="local"):
 
     `kind` must be one of "local", "global", or "user"
     """
-    if kind=='local':
+    if kind == 'local':
         return 'setup.cfg'
-    if kind=='global':
+    if kind == 'global':
         return os.path.join(
-            os.path.dirname(distutils.__file__),'distutils.cfg'
+            os.path.dirname(distutils.__file__), 'distutils.cfg'
         )
-    if kind=='user':
-        dot = os.name=='posix' and '.' or ''
+    if kind == 'user':
+        dot = os.name == 'posix' and '.' or ''
         return os.path.expanduser(convert_path("~/%spydistutils.cfg" % dot))
     raise ValueError(
         "config_file() type must be 'local', 'global', or 'user'", kind
     )
 
+
 def edit_config(filename, settings, dry_run=False):
     """Edit a configuration file to include `settings`
 
@@ -35,6 +38,7 @@ def edit_config(filename, settings, dry_run=False):
     A setting of ``None`` means to delete that setting.
     """
     from setuptools.compat import ConfigParser
+
     log.debug("Reading configuration from %s", filename)
     opts = ConfigParser.RawConfigParser()
     opts.read([filename])
@@ -46,39 +50,40 @@ def edit_config(filename, settings, dry_run=False):
             if not opts.has_section(section):
                 log.debug("Adding new section [%s] to %s", section, filename)
                 opts.add_section(section)
-            for option,value in options.items():
+            for option, value in options.items():
                 if value is None:
                     log.debug(
                         "Deleting %s.%s from %s",
                         section, option, filename
                     )
-                    opts.remove_option(section,option)
+                    opts.remove_option(section, option)
                     if not opts.options(section):
                         log.info("Deleting empty [%s] section from %s",
-                            section, filename)
+                                 section, filename)
                         opts.remove_section(section)
                 else:
                     log.debug(
                         "Setting %s.%s to %r in %s",
                         section, option, value, filename
                     )
-                    opts.set(section,option,value)
+                    opts.set(section, option, value)
 
     log.info("Writing %s", filename)
     if not dry_run:
         with open(filename, 'w') as f:
             opts.write(f)
 
+
 class option_base(Command):
     """Abstract base class for commands that mess with config files"""
 
     user_options = [
         ('global-config', 'g',
-            "save options to the site-wide distutils.cfg file"),
+         "save options to the site-wide distutils.cfg file"),
         ('user-config', 'u',
-            "save options to the current user's pydistutils.cfg file"),
+         "save options to the current user's pydistutils.cfg file"),
         ('filename=', 'f',
-            "configuration file to use (default=setup.cfg)"),
+         "configuration file to use (default=setup.cfg)"),
     ]
 
     boolean_options = [
@@ -100,7 +105,7 @@ def finalize_options(self):
             filenames.append(self.filename)
         if not filenames:
             filenames.append(config_file('local'))
-        if len(filenames)>1:
+        if len(filenames) > 1:
             raise DistutilsOptionError(
                 "Must specify only one configuration file option",
                 filenames
@@ -115,9 +120,9 @@ class setopt(option_base):
 
     user_options = [
         ('command=', 'c', 'command to set an option for'),
-        ('option=',  'o',  'option to set'),
-        ('set-value=',   's', 'value of the option'),
-        ('remove',   'r', 'remove (unset) the value'),
+        ('option=', 'o', 'option to set'),
+        ('set-value=', 's', 'value of the option'),
+        ('remove', 'r', 'remove (unset) the value'),
     ] + option_base.user_options
 
     boolean_options = option_base.boolean_options + ['remove']
@@ -139,7 +144,7 @@ def finalize_options(self):
     def run(self):
         edit_config(
             self.filename, {
-                self.command: {self.option.replace('-','_'):self.set_value}
+                self.command: {self.option.replace('-', '_'): self.set_value}
             },
             self.dry_run
         )
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 3c3581a9a7..18e90ffc0d 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,19 +1,17 @@
-import unittest
-from unittest import TestLoader
-
-from setuptools import Command
 from distutils.errors import DistutilsOptionError
+from unittest import TestLoader
+import unittest
 import sys
-from pkg_resources import (resource_listdir, resource_exists,
-    normalize_path, working_set, _namespace_packages, add_activation_listener,
-    require, EntryPoint)
 
+from pkg_resources import (resource_listdir, resource_exists, normalize_path,
+                           working_set, _namespace_packages,
+                           add_activation_listener, require, EntryPoint)
+from setuptools import Command
 from setuptools.compat import PY3
 from setuptools.py31compat import unittest_main
 
 
 class ScanningLoader(TestLoader):
-
     def loadTestsFromModule(self, module):
         """Return a suite of all tests cases contained in the given module
 
@@ -34,7 +32,7 @@ def loadTestsFromModule(self, module):
                     submodule = module.__name__ + '.' + file[:-3]
                 else:
                     if resource_exists(module.__name__, file + '/__init__.py'):
-                        submodule = module.__name__+'.'+file
+                        submodule = module.__name__ + '.' + file
                     else:
                         continue
                 tests.append(self.loadTestsFromName(submodule))
@@ -42,19 +40,18 @@ def loadTestsFromModule(self, module):
         if len(tests) != 1:
             return self.suiteClass(tests)
         else:
-            return tests[0] # don't create a nested suite for only one return
+            return tests[0]  # don't create a nested suite for only one return
 
 
 class test(Command):
-
     """Command to run unit tests after in-place build"""
 
     description = "run unit tests after in-place build"
 
     user_options = [
-        ('test-module=','m', "Run 'test_suite' in specified module"),
-        ('test-suite=','s',
-            "Test suite to run (e.g. 'some_module.test_suite')"),
+        ('test-module=', 'm', "Run 'test_suite' in specified module"),
+        ('test-suite=', 's',
+         "Test suite to run (e.g. 'some_module.test_suite')"),
         ('test-runner=', 'r', "Test runner to use"),
     ]
 
@@ -79,7 +76,7 @@ def finalize_options(self):
         self.test_args = [self.test_suite]
 
         if self.verbose:
-            self.test_args.insert(0,'--verbose')
+            self.test_args.insert(0, '--verbose')
         if self.test_loader is None:
             self.test_loader = getattr(self.distribution, 'test_loader', None)
         if self.test_loader is None:
@@ -132,7 +129,8 @@ def with_project_on_sys_path(self, func):
 
     def run(self):
         if self.distribution.install_requires:
-            self.distribution.fetch_build_eggs(self.distribution.install_requires)
+            self.distribution.fetch_build_eggs(
+                self.distribution.install_requires)
         if self.distribution.tests_require:
             self.distribution.fetch_build_eggs(self.distribution.tests_require)
 
@@ -161,7 +159,7 @@ def run_tests(self):
                 list(map(sys.modules.__delitem__, del_modules))
 
         unittest_main(
-            None, None, [unittest.__file__]+self.test_args,
+            None, None, [unittest.__file__] + self.test_args,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
         )
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index cad7a52d1b..cd6c300c9f 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -5,6 +5,10 @@
 PyPI's pythonhosted.org).
 """
 
+from base64 import standard_b64encode
+from distutils import log
+from distutils.errors import DistutilsOptionError
+from distutils.command.upload import upload
 import os
 import socket
 import zipfile
@@ -12,14 +16,9 @@
 import sys
 import shutil
 
-from base64 import standard_b64encode
+from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3
 from pkg_resources import iter_entry_points
 
-from distutils import log
-from distutils.errors import DistutilsOptionError
-from distutils.command.upload import upload
-
-from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3
 
 errors = 'surrogateescape' if PY3 else 'strict'
 
@@ -33,7 +32,6 @@ def b(s, encoding='utf-8'):
 
 
 class upload_docs(upload):
-
     description = 'Upload documentation to PyPI'
 
     user_options = [
@@ -42,7 +40,7 @@ class upload_docs(upload):
         ('show-response', None,
          'display full response text from server'),
         ('upload-dir=', None, 'directory to upload'),
-        ]
+    ]
     boolean_options = upload.boolean_options
 
     def has_sphinx(self):
@@ -159,7 +157,7 @@ def upload_file(self, filename):
         elif schema == 'https':
             conn = httplib.HTTPSConnection(netloc)
         else:
-            raise AssertionError("unsupported schema "+schema)
+            raise AssertionError("unsupported schema " + schema)
 
         data = ''
         try:
@@ -190,4 +188,4 @@ def upload_file(self, filename):
             self.announce('Upload failed (%s): %s' % (r.status, r.reason),
                           log.ERROR)
         if self.show_response:
-            print('-'*75, r.read(), '-'*75)
+            print('-' * 75, r.read(), '-' * 75)

From d47b6a2fadf767fe5caa430dd660f1f774affe4f Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 18 Jun 2014 23:07:46 -0400
Subject: [PATCH 4204/8469] Issue #21722: The distutils "upload" command now
 exits with a non-zero return code when uploading fails. Patch by Martin
 Dengler.

---
 command/upload.py    | 15 ++++++++-------
 tests/test_upload.py | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index d6762e46fd..180be7c750 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -2,10 +2,6 @@
 
 Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
 
-from distutils.errors import *
-from distutils.core import PyPIRCCommand
-from distutils.spawn import spawn
-from distutils import log
 import sys
 import os, io
 import socket
@@ -13,6 +9,10 @@
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
 from urllib.parse import urlparse
+from distutils.errors import DistutilsError, DistutilsOptionError
+from distutils.core import PyPIRCCommand
+from distutils.spawn import spawn
+from distutils import log
 
 # this keeps compatibility for 2.3 and 2.4
 if sys.version < "2.5":
@@ -184,7 +184,7 @@ def upload_file(self, command, pyversion, filename):
             reason = result.msg
         except OSError as e:
             self.announce(str(e), log.ERROR)
-            return
+            raise
         except HTTPError as e:
             status = e.code
             reason = e.msg
@@ -193,8 +193,9 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (status, reason),
-                          log.ERROR)
+            msg = 'Upload failed (%s): %s' % (status, reason)
+            self.announce(msg, log.ERROR)
+            raise DistutilsError(msg)
         if self.show_response:
             text = self._read_pypi_response(result)
             msg = '\n'.join(('-' * 75, text, '-' * 75))
diff --git a/tests/test_upload.py b/tests/test_upload.py
index f53eb266ed..0380f97944 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -6,6 +6,7 @@
 from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
+from distutils.errors import DistutilsError
 from distutils.log import INFO
 
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
@@ -41,13 +42,14 @@
 
 class FakeOpen(object):
 
-    def __init__(self, url):
+    def __init__(self, url, msg=None, code=None):
         self.url = url
         if not isinstance(url, str):
             self.req = url
         else:
             self.req = None
-        self.msg = 'OK'
+        self.msg = msg or 'OK'
+        self.code = code or 200
 
     def getheader(self, name, default=None):
         return {
@@ -58,7 +60,7 @@ def read(self):
         return b'xyzzy'
 
     def getcode(self):
-        return 200
+        return self.code
 
 
 class uploadTestCase(PyPIRCCommandTestCase):
@@ -68,13 +70,15 @@ def setUp(self):
         self.old_open = upload_mod.urlopen
         upload_mod.urlopen = self._urlopen
         self.last_open = None
+        self.next_msg = None
+        self.next_code = None
 
     def tearDown(self):
         upload_mod.urlopen = self.old_open
         super(uploadTestCase, self).tearDown()
 
     def _urlopen(self, url):
-        self.last_open = FakeOpen(url)
+        self.last_open = FakeOpen(url, msg=self.next_msg, code=self.next_code)
         return self.last_open
 
     def test_finalize_options(self):
@@ -135,6 +139,10 @@ def test_upload(self):
         results = self.get_logs(INFO)
         self.assertIn('xyzzy\n', results[-1])
 
+    def test_upload_fails(self):
+        self.next_msg = "Not Found"
+        self.next_code = 404
+        self.assertRaises(DistutilsError, self.test_upload)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)

From 92683cba709e8ee497e2b8f4413d44ddcee5cc2f Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Sun, 22 Jun 2014 21:48:22 +1000
Subject: [PATCH 4205/8469] Fix pep8 issues for install_egg_info

---
 setuptools/command/install_egg_info.py | 65 +++++++++-----------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 73b5ef7375..411fce6bd4 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,7 +1,10 @@
+import os
+
+import pkg_resources
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 from distutils import log, dir_util
-import os, pkg_resources
+
 
 class install_egg_info(Command):
     """Install an .egg-info directory for the package"""
@@ -16,7 +19,8 @@ def initialize_options(self):
         self.install_dir = None
 
     def finalize_options(self):
-        self.set_undefined_options('install_lib',('install_dir','install_dir'))
+        self.set_undefined_options('install_lib',
+                                   ('install_dir', 'install_dir'))
         ei_cmd = self.get_finalized_command("egg_info")
         basename = pkg_resources.Distribution(
             None, None, ei_cmd.egg_name, ei_cmd.egg_version
@@ -27,14 +31,14 @@ def finalize_options(self):
 
     def run(self):
         self.run_command('egg_info')
-        target = self.target
         if os.path.isdir(self.target) and not os.path.islink(self.target):
             dir_util.remove_tree(self.target, dry_run=self.dry_run)
         elif os.path.exists(self.target):
-            self.execute(os.unlink,(self.target,),"Removing "+self.target)
+            self.execute(os.unlink, (self.target, ), "Removing " + self.target)
         if not self.dry_run:
             pkg_resources.ensure_directory(self.target)
-        self.execute(self.copytree, (),
+        self.execute(
+            self.copytree, (),
             "Copying %s to %s" % (self.source, self.target)
         )
         self.install_namespaces()
@@ -44,50 +48,28 @@ def get_outputs(self):
 
     def copytree(self):
         # Copy the .egg-info tree to site-packages
-        def skimmer(src,dst):
+        def skimmer(src, dst):
             # filter out source-control directories; note that 'src' is always
             # a '/'-separated path, regardless of platform.  'dst' is a
             # platform-specific path.
-            for skip in '.svn/','CVS/':
-                if src.startswith(skip) or '/'+skip in src:
+            for skip in '.svn/', 'CVS/':
+                if src.startswith(skip) or '/' + skip in src:
                     return None
             self.outputs.append(dst)
             log.debug("Copying %s to %s", src, dst)
             return dst
         unpack_archive(self.source, self.target, skimmer)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def install_namespaces(self):
         nsp = self._get_all_ns_packages()
-        if not nsp: return
-        filename,ext = os.path.splitext(self.target)
-        filename += '-nspkg.pth'; self.outputs.append(filename)
-        log.info("Installing %s",filename)
+        if not nsp:
+            return
+        filename, ext = os.path.splitext(self.target)
+        filename += '-nspkg.pth'
+        self.outputs.append(filename)
+        log.info("Installing %s", filename)
         if not self.dry_run:
-            f = open(filename,'wt')
+            f = open(filename, 'wt')
             for pkg in nsp:
                 # ensure pkg is not a unicode string under Python 2.7
                 pkg = str(pkg)
@@ -101,10 +83,11 @@ def install_namespaces(self):
                 f.write(
                     "import sys,types,os; "
                     "p = os.path.join(sys._getframe(1).f_locals['sitedir'], "
-                        "*%(pth)r); "
+                    "*%(pth)r); "
                     "ie = os.path.exists(os.path.join(p,'__init__.py')); "
                     "m = not ie and "
-                        "sys.modules.setdefault(%(pkg)r,types.ModuleType(%(pkg)r)); "
+                    "sys.modules.setdefault(%(pkg)r, "
+                    "types.ModuleType(%(pkg)r)); "
                     "mp = (m or []) and m.__dict__.setdefault('__path__',[]); "
                     "(p not in mp) and mp.append(p)%(trailer)s"
                     % locals()
@@ -118,8 +101,6 @@ def _get_all_ns_packages(self):
             while pkg:
                 nsp['.'.join(pkg)] = 1
                 pkg.pop()
-        nsp=list(nsp)
+        nsp = list(nsp)
         nsp.sort()  # set up shorter names first
         return nsp
-
-

From 9ec3bbc7bcef27123270535c1a3ab7cc9adda95d Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Sun, 22 Jun 2014 22:01:17 +1000
Subject: [PATCH 4206/8469] Clean up _get_all_ns_packages

---
 setuptools/command/install_egg_info.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 411fce6bd4..578aa3d423 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -95,12 +95,11 @@ def install_namespaces(self):
             f.close()
 
     def _get_all_ns_packages(self):
-        nsp = {}
+        """Return sorted list of all package namespaces"""
+        nsp = set()
         for pkg in self.distribution.namespace_packages or []:
             pkg = pkg.split('.')
             while pkg:
-                nsp['.'.join(pkg)] = 1
+                nsp.add('.'.join(pkg))
                 pkg.pop()
-        nsp = list(nsp)
-        nsp.sort()  # set up shorter names first
-        return nsp
+        return sorted(nsp)

From ceb5894c2b5212b1bad48416c6ff2ca7315019b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:26:48 -0400
Subject: [PATCH 4207/8469] Move devguide notes to documentation.

---
 DEVGUIDE.txt             | 23 +----------------------
 docs/developer-guide.txt | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
index f96d811556..066a3a6bfb 100644
--- a/DEVGUIDE.txt
+++ b/DEVGUIDE.txt
@@ -1,22 +1 @@
-============================
-Quick notes for contributors
-============================
-
-Setuptools is developed using the DVCS Mercurial.
-
-Grab the code at bitbucket::
-
-    $ hg clone https://bitbucket.org/pypa/setuptools
-
-If you want to contribute changes, we recommend you fork the repository on
-bitbucket, commit the changes to your repository, and then make a pull request
-on bitbucket. If you make some changes, don't forget to:
-
-- add a note in CHANGES.txt
-
-Please commit bug-fixes against the current maintenance branch and new
-features to the default branch.
-
-You can run the tests via::
-
-    $ python setup.py test
+The canonical development guide can be found in docs/developer-guide.txt.
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index fbee5e672f..4577da5863 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -12,7 +12,24 @@ If you want to know more about contributing on Setuptools, this is the place.
 Repository and Tracker
 ----------------------
 
-...
+Setuptools is developed using the DVCS Mercurial.
+
+Grab the code at bitbucket::
+
+    $ hg clone https://bitbucket.org/pypa/setuptools
+
+If you want to contribute changes, we recommend you fork the repository on
+bitbucket, commit the changes to your repository, and then make a pull request
+on bitbucket. If you make some changes, don't forget to:
+
+- add a note in CHANGES.txt
+
+Please commit bug-fixes against the current maintenance branch and new
+features to the default branch.
+
+You can run the tests via::
+
+    $ python setup.py test
 
 .. git mirror
 

From 04dc170c8bd8791b4bc3e83fb0f223ca19264f54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:27:02 -0400
Subject: [PATCH 4208/8469] Expand on stylistic changes

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 4577da5863..805a61f3f6 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -44,7 +44,7 @@ Submitting Pull Requests
 ------------------------
 
 Use Mercurial bookmarks or Git branches. Use incremental commits. Minimize
-stylistic changes.
+stylistic changes or at least submit them as separate commits.
 
 -------------------
 Semantic Versioning

From f2d7c5373d575a958c8651e6b228d75ba8f4344f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:30:53 -0400
Subject: [PATCH 4209/8469] Added Recommended Reading

---
 docs/developer-guide.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 805a61f3f6..c2770e3fc9 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -8,6 +8,17 @@ If you want to know more about contributing on Setuptools, this is the place.
 .. contents:: **Table of Contents**
 
 
+-------------------
+Recommended Reading
+-------------------
+
+Please read `How to write the perfect pull request
+<http://blog.jaraco.com/2014/04/how-to-write-perfect-pull-request.html>`_
+for some tips on contributing to open source projects. Although the article
+is not authoritative, it was authored by the maintainer of Setuptools, so
+reflects his opinions and will improve the likelihood of acceptance and
+quality of contribution.
+
 ----------------------
 Repository and Tracker
 ----------------------

From 7f997bf31de1ae8d2afaae2048593d55c6765449 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:44:14 -0400
Subject: [PATCH 4210/8469] Expanded on Project Management

---
 docs/developer-guide.txt | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index c2770e3fc9..af64c153a6 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -19,19 +19,34 @@ is not authoritative, it was authored by the maintainer of Setuptools, so
 reflects his opinions and will improve the likelihood of acceptance and
 quality of contribution.
 
-----------------------
-Repository and Tracker
-----------------------
+------------------
+Project Management
+------------------
 
-Setuptools is developed using the DVCS Mercurial.
+Setuptools is maintained primarily in Bitbucket at `this home
+<https://bitbucket.org/pypa/setuptools>`_. Setuptools is maintained under the
+Python Packaging Authority (PyPA) with several core contributors. All bugs
+for Setuptools are filed and the canonical source is maintained in Bitbucket.
 
-Grab the code at bitbucket::
+User support and discussions are done through the issue tracker (for specific)
+issues, through the distutils-sig mailing list, or on IRC (Freenode) at
+#pypa.
+
+Discussions about development happen on the pypa-dev mailing list or on IRC
+(Freenode) at #pypa-dev.
+
+
+-----------
+Source Code
+-----------
+
+Grab the code at Bitbucket::
 
     $ hg clone https://bitbucket.org/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
-bitbucket, commit the changes to your repository, and then make a pull request
-on bitbucket. If you make some changes, don't forget to:
+Bitbucket, commit the changes to your repository, and then make a pull request
+on Bitbucket. If you make some changes, don't forget to:
 
 - add a note in CHANGES.txt
 

From 0b43972c3854cc62442d6b95e82dd01f8b9417a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:48:02 -0400
Subject: [PATCH 4211/8469] Added note about Github mirror

---
 docs/developer-guide.txt | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index af64c153a6..5839aca168 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -50,28 +50,35 @@ on Bitbucket. If you make some changes, don't forget to:
 
 - add a note in CHANGES.txt
 
-Please commit bug-fixes against the current maintenance branch and new
-features to the default branch.
+Please commit all changes in the 'default' branch against the latest available
+commit or for bug-fixes, against an earlier commit or release in which the
+bug occurred.
+
+If you find yourself working on more than one issue at a time, Setuptools
+generally prefers Git-style branches, so use Mercurial bookmarks or Git
+branches or multiple forks to maintain separate efforts.
+
+Setuptools also maintains an unofficial `Git mirror in Github
+<https://github.com/jaraco/setuptools>`_. Contributors are welcome to submit
+pull requests here, but because they are not integrated with the Bitbucket
+Issue tracker, linking pull requests to tickets is more difficult. The
+Continuous Integration tests that validate every release are run from this
+mirror.
+
+-------
+Testing
+-------
 
 You can run the tests via::
 
     $ python setup.py test
 
-.. git mirror
-
 -----------------
 Authoring Tickets
 -----------------
 
 ...
 
-------------------------
-Submitting Pull Requests
-------------------------
-
-Use Mercurial bookmarks or Git branches. Use incremental commits. Minimize
-stylistic changes or at least submit them as separate commits.
-
 -------------------
 Semantic Versioning
 -------------------

From 26afd74cb35062a9f692bb06cb23ad485f085a1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:51:11 -0400
Subject: [PATCH 4212/8469] Updated recommeded testing procedure.

---
 docs/developer-guide.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 5839aca168..c6f78d9ab4 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -69,9 +69,14 @@ mirror.
 Testing
 -------
 
-You can run the tests via::
+The primary tests are run using py.test. To run the tests::
 
-    $ python setup.py test
+    $ python setup.py ptr
+
+Or install py.test into your environment and run ``py.test``.
+
+Under continuous integration, additional tests may be run. See the
+``.travis.yml`` file for full details on the tests run under Travis-CI.
 
 -----------------
 Authoring Tickets

From 34808da486958a27dbfa2761a466938d0142ba66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:57:43 -0400
Subject: [PATCH 4213/8469] Expanded on authoring tickets.

---
 docs/developer-guide.txt | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index c6f78d9ab4..651e6be808 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -35,6 +35,27 @@ issues, through the distutils-sig mailing list, or on IRC (Freenode) at
 Discussions about development happen on the pypa-dev mailing list or on IRC
 (Freenode) at #pypa-dev.
 
+-----------------
+Authoring Tickets
+-----------------
+
+Before authoring any source code, it's often prudent to file a ticket
+describing the motivation behind making changes. First search to see if a
+ticket already exists for your issue. If not, create one. Try to think from
+the perspective of the reader. Explain what behavior you expected, what you
+got instead, and what factors might have contributed to the unexpected
+behavior. In Bitbucket, surround a block of code or traceback with the triple
+backtick "```" so that it is formatted nicely.
+
+Filing a ticket provides a forum for justification, discussion, and
+clarification. The ticket provides a record of the purpose for the change and
+any hard decisions that were made. It provides a single place for others to
+reference when trying to understand why the software operates the way it does
+or why certain changes were made.
+
+Setuptools makes extensive use of hyperlinks to tickets in the changelog so
+that system integrators and other users can get a quick summary, but then
+jump to the in-depth discussion about any subject referenced.
 
 -----------
 Source Code
@@ -78,12 +99,6 @@ Or install py.test into your environment and run ``py.test``.
 Under continuous integration, additional tests may be run. See the
 ``.travis.yml`` file for full details on the tests run under Travis-CI.
 
------------------
-Authoring Tickets
------------------
-
-...
-
 -------------------
 Semantic Versioning
 -------------------

From 0689e065e08d705488dad3d89c1afb0d8273a8ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:58:18 -0400
Subject: [PATCH 4214/8469] Expose developer guide in the documentation.

---
 docs/development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development.txt b/docs/development.txt
index e35ba39b69..6fe30f6eb1 100644
--- a/docs/development.txt
+++ b/docs/development.txt
@@ -30,7 +30,7 @@ setuptools changes.  You have been warned.
 .. toctree::
    :maxdepth: 1
 
-   .. developer-guide
+   developer-guide
    formats
    releases
 

From 9fe312e0d9825869e5eee2262e9f31588ded7711 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 08:59:47 -0400
Subject: [PATCH 4215/8469] Update changelog to reflect incidental change in
 5.0.

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5ebe6f1c90..381d1dcd0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,8 @@ CHANGES
 ---
 
 * Issue #218: Re-release of 3.8.1 to signal that it supersedes 4.x.
+* Incidentally, script templates were updated not to include the triple-quote
+  escaping.
 
 -------------------------
 3.7.1 and 3.8.1 and 4.0.1

From f3608428df8308afb55a382ddd0b678e6afa6026 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 09:03:15 -0400
Subject: [PATCH 4216/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 381d1dcd0b..9344ccbbff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+5.2
+---
+
+* Added a `Developer Guide
+  <https://pythonhosted.org/setuptools/developer-guide.html>`_ to the official
+  documentation.
+
 ---
 5.1
 ---

From e7a30ebf78b0d9aaea9cfeadd36df2ba9774c25c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 09:25:16 -0400
Subject: [PATCH 4217/8469] Remove trailing newline

---
 setuptools/command/install_egg_info.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 183d8188d4..06be25f3b1 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -103,4 +103,3 @@ def _get_all_ns_packages(self):
                 nsp.add('.'.join(pkg))
                 pkg.pop()
         return sorted(nsp)
-

From ab7d8ee3234b039d9dd3d6c896932b6985380327 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 09:37:30 -0400
Subject: [PATCH 4218/8469] Extract the lines of the namespace package pth file
 template for readability.

---
 setuptools/command/install_egg_info.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 06be25f3b1..3a8d5ec0f1 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -60,6 +60,16 @@ def skimmer(src, dst):
 
         unpack_archive(self.source, self.target, skimmer)
 
+    _nspkg_tmpl = [
+        "import sys, types, os",
+        "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
+        "ie = os.path.exists(os.path.join(p,'__init__.py'))",
+        "m = not ie and sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
+        "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
+        "(p not in mp) and mp.append(p)%(trailer)s",
+    ]
+    "lines for the namespace installer"
+
     def install_namespaces(self):
         nsp = self._get_all_ns_packages()
         if not nsp:
@@ -80,18 +90,8 @@ def install_namespaces(self):
                         "; m and setattr(sys.modules[%r], %r, m)\n"
                         % ('.'.join(pth[:-1]), pth[-1])
                     )
-                f.write(
-                    "import sys,types,os; "
-                    "p = os.path.join(sys._getframe(1).f_locals['sitedir'], "
-                    "*%(pth)r); "
-                    "ie = os.path.exists(os.path.join(p,'__init__.py')); "
-                    "m = not ie and "
-                    "sys.modules.setdefault(%(pkg)r, "
-                    "types.ModuleType(%(pkg)r)); "
-                    "mp = (m or []) and m.__dict__.setdefault('__path__',[]); "
-                    "(p not in mp) and mp.append(p)%(trailer)s"
-                    % locals()
-                )
+                dat = ';'.join(self._nspkg_tmpl) % locals()
+                f.write(dat)
             f.close()
 
     def _get_all_ns_packages(self):

From 17d0ff6e1f9d2efb134cac3fc734c0cf5fa55f68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:09:44 -0400
Subject: [PATCH 4219/8469] Extract the additional trailing lines when a parent
 package is indicated.

---
 setuptools/command/install_egg_info.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 3a8d5ec0f1..67ba745363 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -60,16 +60,21 @@ def skimmer(src, dst):
 
         unpack_archive(self.source, self.target, skimmer)
 
-    _nspkg_tmpl = [
+    _nspkg_tmpl = (
         "import sys, types, os",
         "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
         "m = not ie and sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
-        "(p not in mp) and mp.append(p)%(trailer)s",
-    ]
+        "(p not in mp) and mp.append(p)",
+    )
     "lines for the namespace installer"
 
+    _nspkg_tmpl_multi = (
+        'm and setattr(sys.modules[%(parent)r], %(child)r, m)',
+    )
+    "additional line(s) when a parent package is indicated"
+
     def install_namespaces(self):
         nsp = self._get_all_ns_packages()
         if not nsp:
@@ -84,13 +89,11 @@ def install_namespaces(self):
                 # ensure pkg is not a unicode string under Python 2.7
                 pkg = str(pkg)
                 pth = tuple(pkg.split('.'))
-                trailer = '\n'
-                if '.' in pkg:
-                    trailer = (
-                        "; m and setattr(sys.modules[%r], %r, m)\n"
-                        % ('.'.join(pth[:-1]), pth[-1])
-                    )
-                dat = ';'.join(self._nspkg_tmpl) % locals()
+                tmpl_lines = self._nspkg_tmpl
+                parent, sep, child = pkg.rpartition('.')
+                if parent:
+                    tmpl_lines += self._nspkg_tmpl_multi
+                dat = ';'.join(tmpl_lines) % locals() + '\n'
                 f.write(dat)
             f.close()
 

From 24978070e68c58dfd787b93d6f1e0a35f6871c52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:10:54 -0400
Subject: [PATCH 4220/8469] Use short-circuit for less nesting

---
 setuptools/command/install_egg_info.py | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 67ba745363..6aba68bed7 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -83,19 +83,21 @@ def install_namespaces(self):
         filename += '-nspkg.pth'
         self.outputs.append(filename)
         log.info("Installing %s", filename)
-        if not self.dry_run:
-            f = open(filename, 'wt')
-            for pkg in nsp:
-                # ensure pkg is not a unicode string under Python 2.7
-                pkg = str(pkg)
-                pth = tuple(pkg.split('.'))
-                tmpl_lines = self._nspkg_tmpl
-                parent, sep, child = pkg.rpartition('.')
-                if parent:
-                    tmpl_lines += self._nspkg_tmpl_multi
-                dat = ';'.join(tmpl_lines) % locals() + '\n'
-                f.write(dat)
-            f.close()
+        if self.dry_run:
+            return
+
+        f = open(filename, 'wt')
+        for pkg in nsp:
+            # ensure pkg is not a unicode string under Python 2.7
+            pkg = str(pkg)
+            pth = tuple(pkg.split('.'))
+            tmpl_lines = self._nspkg_tmpl
+            parent, sep, child = pkg.rpartition('.')
+            if parent:
+                tmpl_lines += self._nspkg_tmpl_multi
+            dat = ';'.join(tmpl_lines) % locals() + '\n'
+            f.write(dat)
+        f.close()
 
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""

From 9f48d842e5c7c916f472420c7bc9f62b333a40ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:13:38 -0400
Subject: [PATCH 4221/8469] Use context manager for opening and closing the
 file

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

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 6aba68bed7..87cfc4907c 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -86,7 +86,6 @@ def install_namespaces(self):
         if self.dry_run:
             return
 
-        f = open(filename, 'wt')
         for pkg in nsp:
             # ensure pkg is not a unicode string under Python 2.7
             pkg = str(pkg)
@@ -96,8 +95,9 @@ def install_namespaces(self):
             if parent:
                 tmpl_lines += self._nspkg_tmpl_multi
             dat = ';'.join(tmpl_lines) % locals() + '\n'
+
+        with open(filename, 'wt') as f:
             f.write(dat)
-        f.close()
 
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""

From 63b852dff23dc86e983fceddde1463724a9d8a07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:15:21 -0400
Subject: [PATCH 4222/8469] Reindent long line

---
 setuptools/command/install_egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 87cfc4907c..67e183e184 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -64,7 +64,8 @@ def skimmer(src, dst):
         "import sys, types, os",
         "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
-        "m = not ie and sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
+        "m = not ie and "
+            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",
     )

From d8192350d95f3daf8831b58c80ded4d0d3393d7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:26:00 -0400
Subject: [PATCH 4223/8469] Extract method for generating lines for a pkg in
 nsp. Fixes issue in 67bdf3a726962 where only the last dat would be written.

---
 setuptools/command/install_egg_info.py | 49 ++++++++++++++------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 67e183e184..35a00e54ed 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -60,6 +60,22 @@ def skimmer(src, dst):
 
         unpack_archive(self.source, self.target, skimmer)
 
+    def install_namespaces(self):
+        nsp = self._get_all_ns_packages()
+        if not nsp:
+            return
+        filename, ext = os.path.splitext(self.target)
+        filename += '-nspkg.pth'
+        self.outputs.append(filename)
+        log.info("Installing %s", filename)
+        if self.dry_run:
+            return
+
+        lines = map(self._gen_nspkg_line, nsp)
+
+        with open(filename, 'wt') as f:
+            list(map(f.write, lines))
+
     _nspkg_tmpl = (
         "import sys, types, os",
         "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
@@ -76,29 +92,16 @@ def skimmer(src, dst):
     )
     "additional line(s) when a parent package is indicated"
 
-    def install_namespaces(self):
-        nsp = self._get_all_ns_packages()
-        if not nsp:
-            return
-        filename, ext = os.path.splitext(self.target)
-        filename += '-nspkg.pth'
-        self.outputs.append(filename)
-        log.info("Installing %s", filename)
-        if self.dry_run:
-            return
-
-        for pkg in nsp:
-            # ensure pkg is not a unicode string under Python 2.7
-            pkg = str(pkg)
-            pth = tuple(pkg.split('.'))
-            tmpl_lines = self._nspkg_tmpl
-            parent, sep, child = pkg.rpartition('.')
-            if parent:
-                tmpl_lines += self._nspkg_tmpl_multi
-            dat = ';'.join(tmpl_lines) % locals() + '\n'
-
-        with open(filename, 'wt') as f:
-            f.write(dat)
+    @classmethod
+    def _gen_nspkg_line(cls, pkg):
+        # ensure pkg is not a unicode string under Python 2.7
+        pkg = str(pkg)
+        pth = tuple(pkg.split('.'))
+        tmpl_lines = cls._nspkg_tmpl
+        parent, sep, child = pkg.rpartition('.')
+        if parent:
+            tmpl_lines += cls._nspkg_tmpl_multi
+        return ';'.join(tmpl_lines) % locals() + '\n'
 
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""

From 96631f20ae4d9db6f077bf16d5d58db5239fa69d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:30:41 -0400
Subject: [PATCH 4224/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9344ccbbff..27c425a9bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@ CHANGES
 * Added a `Developer Guide
   <https://pythonhosted.org/setuptools/developer-guide.html>`_ to the official
   documentation.
+* Some code refactoring and cleanup was done with no intended behavioral
+  changes.
 
 ---
 5.1

From c3f158dcc26b86008c7427674aec5ed100540280 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:34:27 -0400
Subject: [PATCH 4225/8469] Prefer the writelines method.

---
 setuptools/command/install_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 35a00e54ed..3e41389839 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -74,7 +74,7 @@ def install_namespaces(self):
         lines = map(self._gen_nspkg_line, nsp)
 
         with open(filename, 'wt') as f:
-            list(map(f.write, lines))
+            f.writelines(lines)
 
     _nspkg_tmpl = (
         "import sys, types, os",

From 9d45f02e92ea875a88a964a629c0274d597f8d46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:37:24 -0400
Subject: [PATCH 4226/8469] Always generate the lines, even in dry run.

--HG--
extra : amend_source : fa41c3fb787b667f703f67a52aed7a2958e615b4
---
 CHANGES.txt                            | 2 ++
 setuptools/command/install_egg_info.py | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 27c425a9bf..829a37056c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES
   documentation.
 * Some code refactoring and cleanup was done with no intended behavioral
   changes.
+* During install_egg_info, the generated lines for namespace package .pth
+  files are now processed even during a dry run.
 
 ---
 5.1
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 3e41389839..fd0f118b33 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -68,11 +68,13 @@ def install_namespaces(self):
         filename += '-nspkg.pth'
         self.outputs.append(filename)
         log.info("Installing %s", filename)
+        lines = map(self._gen_nspkg_line, nsp)
+
         if self.dry_run:
+            # always generate the lines, even in dry run
+            list(lines)
             return
 
-        lines = map(self._gen_nspkg_line, nsp)
-
         with open(filename, 'wt') as f:
             f.writelines(lines)
 

From 01021fd5c712db072961c7a0e5b1d86c74a91da2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:51:40 -0400
Subject: [PATCH 4227/8469] Mention Ivoz as release manager

---
 docs/releases.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/releases.txt b/docs/releases.txt
index 5d1419be7c..387a4af8e8 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -15,4 +15,7 @@ project and administrative access to the BitBucket project.
 Release Managers
 ----------------
 
-Currently, the project has one release manager, Jason R. Coombs.
+Jason R. Coombs is the primary release manager. Additionally, the following
+people have access to create releases:
+
+- Matthew Iversen (Ivoz)

From 0c75cf4a2e2a5796fc5a62a5263ed9ca44683545 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Jun 2014 10:52:51 -0400
Subject: [PATCH 4228/8469] Write the actual command.

--HG--
extra : amend_source : a25cd725094883d738e9c37cd71e3ac3a946d9fe
---
 docs/releases.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/releases.txt b/docs/releases.txt
index 387a4af8e8..41a814bc96 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -12,6 +12,11 @@ the release process.
 A Setuptools release manager must have maintainer access on PyPI to the
 project and administrative access to the BitBucket project.
 
+To make a release, run the following from a Mercurial checkout at the
+revision slated for release::
+
+    python -m jaraco.packaging.release
+
 Release Managers
 ----------------
 

From 3b41be38bd2f498556615e8c20e8b0b485a44817 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jun 2014 14:42:27 -0400
Subject: [PATCH 4229/8469] Added tag 5.2 for changeset f493e6c4ffd8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e5a7d6b505..33e3b6364f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -144,3 +144,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1
 95996b713722376679c3168b15ab12ea8360dd5f 5.0.2
 3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1
+f493e6c4ffd88951871110858c141385305e0077 5.2

From ea05dfd88bf0c0d778cba2cd43dc4f8becbb310b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jun 2014 14:42:58 -0400
Subject: [PATCH 4230/8469] Bumped to 5.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0206019984..2dc324f3d6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.2"
+DEFAULT_VERSION = "5.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index f01f2739ab..adcb4271b4 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.2'
+__version__ = '5.3'

From fbf309d3e3b529f6ff0d57ecbb22514755b1154d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jun 2014 17:00:01 -0400
Subject: [PATCH 4231/8469] Remove unused imports, unused variables, and excess
 whitespace

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

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 18f35c0f45..66d182eb46 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -9,8 +9,6 @@
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
-from setuptools.command import easy_install as easy_install_pkg
-from setuptools.compat import StringIO
 from setuptools.dist import Distribution
 
 SETUP_PY = """\
@@ -114,11 +112,11 @@ def notest_develop_with_setup_requires(self):
         os.chdir(self.dir)
         try:
             try:
-                dist = Distribution({'setup_requires': ['I_DONT_EXIST']})
+                Distribution({'setup_requires': ['I_DONT_EXIST']})
             except DistutilsError:
                 e = sys.exc_info()[1]
                 error = str(e)
-                if error ==  wanted:
+                if error == wanted:
                     pass
         finally:
             os.chdir(old_dir)

From 5d58d955b5f5dcafe6ec624b82b327ce1fe9bbfd Mon Sep 17 00:00:00 2001
From: david <david.genest@ubisoft.com>
Date: Wed, 25 Jun 2014 10:47:59 -0400
Subject: [PATCH 4232/8469] fix failing integration (test_stevedore) test on
 windows because of an unreleased handle on the current directory

---
 setuptools/tests/test_integration.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 7144aa6c9a..8d6c1e55db 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -25,6 +25,9 @@ def install_context(request, tmpdir, monkeypatch):
     install_dir = tmpdir.mkdir('install_dir')
 
     def fin():
+        # undo the monkeypatch, particularly needed under
+        # windows because of kept handle on cwd
+        monkeypatch.undo() 
         new_cwd.remove()
         user_base.remove()
         user_site.remove()

From a8edd4b874fd83cf8d53b0c410c97477a3816c38 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Wed, 25 Jun 2014 13:36:14 -0700
Subject: [PATCH 4233/8469] Issue #21811: Anticipated fixes to 3.x and 2.7 for
 OS X 10.10 Yosemite.

---
 tests/test_build_ext.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 9853abd4c5..e9958667a4 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -444,8 +444,16 @@ def _try_compile_deployment_target(self, operator, target):
 
         # get the deployment target that the interpreter was built with
         target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-        target = tuple(map(int, target.split('.')))
-        target = '%02d%01d0' % target
+        target = tuple(map(int, target.split('.')[0:2]))
+        # format the target value as defined in the Apple
+        # Availability Macros.  We can't use the macro names since
+        # at least one value we test with will not exist yet.
+        if target[1] < 10:
+            # for 10.1 through 10.9.x -> "10n0"
+            target = '%02d%01d0' % target
+        else:
+            # for 10.10 and beyond -> "10nn00"
+            target = '%02d%02d00' % target
         deptarget_ext = Extension(
             'deptarget',
             [deptarget_c],

From acc44268e90aa32306dd747dc1304c15589c7a24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jun 2014 21:42:11 -0400
Subject: [PATCH 4234/8469] Added tag 5.3 for changeset 1f9505cfd752

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 33e3b6364f..bc743fd472 100644
--- a/.hgtags
+++ b/.hgtags
@@ -145,3 +145,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 95996b713722376679c3168b15ab12ea8360dd5f 5.0.2
 3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1
 f493e6c4ffd88951871110858c141385305e0077 5.2
+1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3

From 4acb16a206bb4467663a2e0dcd024cbdc6a5c649 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jun 2014 21:42:40 -0400
Subject: [PATCH 4235/8469] Bumped to 5.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2dc324f3d6..42785c3169 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.3"
+DEFAULT_VERSION = "5.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index adcb4271b4..e67e0a2f78 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.3'
+__version__ = '5.4'

From e221bdf38ccf35d0d2b1148b4072108fcd47ec0a Mon Sep 17 00:00:00 2001
From: Martin Geisler <martin@geisler.net>
Date: Sun, 29 Jun 2014 14:58:41 +0200
Subject: [PATCH 4236/8469] Fix typos

---
 setuptools/tests/win_script_wrapper.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
index 731243dd36..b3a52e0abd 100644
--- a/setuptools/tests/win_script_wrapper.txt
+++ b/setuptools/tests/win_script_wrapper.txt
@@ -3,7 +3,7 @@ Python Script Wrapper for Windows
 
 setuptools includes wrappers for Python scripts that allows them to be
 executed like regular windows programs.  There are 2 wrappers, once
-for command-line programs, cli.exe, and one for graphica programs,
+for command-line programs, cli.exe, and one for graphical programs,
 gui.exe.  These programs are almost identical, function pretty much
 the same way, and are generated from the same source file.  The
 wrapper programs are used by copying them to the directory containing
@@ -44,7 +44,7 @@ We'll also copy cli.exe to the sample-directory with the name foo.exe:
 
 When the copy of cli.exe, foo.exe in this example, runs, it examines
 the path name it was run with and computes a Python script path name
-by removing the '.exe' suffic and adding the '-script.py' suffix. (For
+by removing the '.exe' suffix and adding the '-script.py' suffix. (For
 GUI programs, the suffix '-script-pyw' is added.)  This is why we
 named out script the way we did.  Now we can run out script by running
 the wrapper:
@@ -68,8 +68,8 @@ This example was a little pathological in that it exercised windows
 - Double quotes in strings need to be escaped by preceding them with
   back slashes.
 
-- One or more backslashes preceding double quotes quotes need to be
-  escaped by preceding each of them them with back slashes.
+- One or more backslashes preceding double quotes need to be escaped
+  by preceding each of them with back slashes.
 
 
 Specifying Python Command-line Options

From 721f392408ac0de7dd8e77afe8ed6c1f020b6416 Mon Sep 17 00:00:00 2001
From: Martin Geisler <martin@geisler.net>
Date: Sun, 29 Jun 2014 15:23:29 +0200
Subject: [PATCH 4237/8469] Fixed capitalization of "Bitbucket"

Bitbucket is normally spelled with exactly one capital "b".
---
 docs/merge-faq.txt | 2 +-
 docs/releases.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
index 520130985e..ea45f30cfa 100644
--- a/docs/merge-faq.txt
+++ b/docs/merge-faq.txt
@@ -58,7 +58,7 @@ Who is invited to contribute? Who is excluded?
 
 While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the  community, especially those most familiar with Python packaging and its challenges to join us in the effort.
 
-We have lots of  ideas for how we'd like to improve the codebase, release process,  everything.  Like distribute, the post-merge setuptools will have its  source hosted on bitbucket.  (So if you're currently a distribute  contributor, about the only thing that's going to change is the URL of  the repository you follow.)  Also like distribute, it'll support Python  3, and hopefully we'll soon merge Vinay Sajip's patches to make it run  on Python 3 without needing 2to3 to be run on the code first.
+We have lots of  ideas for how we'd like to improve the codebase, release process,  everything.  Like distribute, the post-merge setuptools will have its  source hosted on Bitbucket.  (So if you're currently a distribute  contributor, about the only thing that's going to change is the URL of  the repository you follow.)  Also like distribute, it'll support Python  3, and hopefully we'll soon merge Vinay Sajip's patches to make it run  on Python 3 without needing 2to3 to be run on the code first.
 
 While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
 
diff --git a/docs/releases.txt b/docs/releases.txt
index 41a814bc96..66c0896f2d 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -10,7 +10,7 @@ module. The script does some checks (some interactive) and fully automates
 the release process.
 
 A Setuptools release manager must have maintainer access on PyPI to the
-project and administrative access to the BitBucket project.
+project and administrative access to the Bitbucket project.
 
 To make a release, run the following from a Mercurial checkout at the
 revision slated for release::

From d1e6671ef6f2cc89df210122a4e5e67fa6e2c321 Mon Sep 17 00:00:00 2001
From: Martin Geisler <martin@geisler.net>
Date: Sun, 29 Jun 2014 15:24:33 +0200
Subject: [PATCH 4238/8469] Spell check documentation

---
 docs/easy_install.txt  | 8 ++++----
 docs/formats.txt       | 4 ++--
 docs/pkg_resources.txt | 6 +++---
 docs/python3.txt       | 2 +-
 docs/setuptools.txt    | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 6739ba16ad..8dd176fdfb 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -39,7 +39,7 @@ You will need at least Python 2.6.  An ``easy_install`` script will be
 installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
-are installling to Python's primary ``site-packages`` directory.  If this is
+are installing to Python's primary ``site-packages`` directory.  If this is
 not the case, you should consult the section below on `Custom Installation
 Locations`_ before installing.  (And, on Windows, you should not use the
 ``.exe`` installer when installing to an alternate location.)
@@ -915,7 +915,7 @@ Command-Line Options
     domain.  The glob patterns must match the *entire* user/host/port section of
     the target URL(s).  For example, ``*.python.org`` will NOT accept a URL
     like ``http://python.org/foo`` or ``http://www.python.org:8080/``.
-    Multiple patterns can be specified by separting them with commas.  The
+    Multiple patterns can be specified by separating them with commas.  The
     default pattern is ``*``, which matches anything.
 
     In general, this option is mainly useful for blocking EasyInstall's web
@@ -1014,7 +1014,7 @@ application, simply set the OS environment of that application to a specific val
 Use "virtualenv"
 ~~~~~~~~~~~~~~~~
 "virtualenv" is a 3rd-party python package that effectively "clones" a python installation, thereby
-creating an isolated location to intall packages.  The evolution of "virtualenv" started before the existence
+creating an isolated location to install packages.  The evolution of "virtualenv" started before the existence
 of the User installation scheme.  "virtualenv" provides a version of ``easy_install`` that is
 scoped to the cloned python install and is used in the normal way. "virtualenv" does offer various features
 that the User installation scheme alone does not provide, e.g. the ability to hide the main python site-packages.
@@ -1171,7 +1171,7 @@ History
  * Fixed not HTML-decoding URLs scraped from web pages
 
 0.6c5
- * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
+ * Fixed ``.dll`` files on Cygwin not having executable permissions when an egg
    is installed unzipped.
 
 0.6c4
diff --git a/docs/formats.txt b/docs/formats.txt
index 36954bef75..5c461ecb61 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -349,7 +349,7 @@ of the project's "traditional" scripts (i.e., those specified using the
 ``scripts`` keyword to ``setup()``).  This is so that they can be
 reconstituted when an ``.egg`` file is installed.
 
-The scripts are placed here using the disutils' standard
+The scripts are placed here using the distutils' standard
 ``install_scripts`` command, so any ``#!`` lines reflect the Python
 installation where the egg was built.  But instead of copying the
 scripts to the local script installation directory, EasyInstall writes
@@ -595,7 +595,7 @@ order to one another that is defined by their ``PYTHONPATH`` and
 The net result of these changes is that ``sys.path`` order will be
 as follows at runtime:
 
-1. The ``sys.argv[0]`` directory, or an emtpy string if no script
+1. The ``sys.argv[0]`` directory, or an empty string if no script
    is being executed.
 
 2. All eggs installed by EasyInstall in any ``.pth`` file in each
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 18b68db731..f4a768e41d 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -62,7 +62,7 @@ importable distribution
 
 pluggable distribution
     An importable distribution whose filename unambiguously identifies its
-    release (i.e. project and version), and whose contents unamabiguously
+    release (i.e. project and version), and whose contents unambiguously
     specify what releases of other projects will satisfy its runtime
     requirements.
 
@@ -1434,7 +1434,7 @@ shown here.  The `manager` argument to the methods below must be an object
 that supports the full `ResourceManager API`_ documented above.
 
 ``get_resource_filename(manager, resource_name)``
-    Return a true filesystem path for `resource_name`, co-ordinating the
+    Return a true filesystem path for `resource_name`, coordinating the
     extraction with `manager`, if the resource must be unpacked to the
     filesystem.
 
@@ -1586,7 +1586,7 @@ Parsing Utilities
     character is ``#`` are considered comment lines.)
 
     If `strs` is not an instance of ``basestring``, it is iterated over, and
-    each item is passed recursively to ``yield_lines()``, so that an arbitarily
+    each item is passed recursively to ``yield_lines()``, so that an arbitrarily
     nested sequence of strings, or sequences of sequences of strings can be
     flattened out to the lines contained therein.  So for example, passing
     a file object or a list of strings to ``yield_lines`` will both work.
diff --git a/docs/python3.txt b/docs/python3.txt
index 1e019951c4..df173000f2 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -69,7 +69,7 @@ before you run the test command, as the files otherwise will seem updated,
 and no conversion will happen.
 
 In general, if code doesn't seem to be converted, deleting the build directory
-and trying again is a good saferguard against the build directory getting
+and trying again is a good safeguard against the build directory getting
 "out of sync" with the source directory.
 
 Distributing Python 3 modules
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index a793af53e5..86e23ff944 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -520,7 +520,7 @@ as the following::
         }
     )
 
-Any eggs built from the above setup script will include a short excecutable
+Any eggs built from the above setup script will include a short executable
 prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
 The prelude can be run on Unix-like platforms (including Mac and Linux) by
 invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
@@ -2180,7 +2180,7 @@ for future builds (even those run implicitly by the ``install`` command)::
 
     setup.py build --compiler=mingw32 saveopts
 
-The ``saveopts`` command saves all options for every commmand specified on the
+The ``saveopts`` command saves all options for every command specified on the
 command line to the project's local ``setup.cfg`` file, unless you use one of
 the `configuration file options`_ to change where the options are saved.  For
 example, this command does the same as above, but saves the compiler setting
@@ -2350,7 +2350,7 @@ Note, by the way, that the metadata in your ``setup()`` call determines what
 will be listed in PyPI for your package.  Try to fill out as much of it as
 possible, as it will save you a lot of trouble manually adding and updating
 your PyPI listings.  Just put it in ``setup.py`` and use the ``register``
-comamnd to keep PyPI up to date.
+command to keep PyPI up to date.
 
 The ``upload`` command has a few options worth noting:
 

From 04ee0d93a95c9b5f8c856856040d477647d1244d Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 30 Jun 2014 13:30:09 +0200
Subject: [PATCH 4239/8469] Use __import__() to avoid leaking imported names to
 the executed script.

---
 setuptools/script (dev).tmpl | 7 ++-----
 setuptools/script.tmpl       | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/setuptools/script (dev).tmpl b/setuptools/script (dev).tmpl
index c476673f94..6b1bef5bb7 100644
--- a/setuptools/script (dev).tmpl	
+++ b/setuptools/script (dev).tmpl	
@@ -1,11 +1,8 @@
 # EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
 __requires__ = %(spec)r
-import sys
-from pkg_resources import require
-require(%(spec)r)
-del require
+__import__('pkg_resources').require(%(spec)r)
 __file__ = %(dev_path)r
-if sys.version_info < (3, 0):
+if __import__('sys').version_info < (3, 0):
     execfile(__file__)
 else:
     exec(compile(open(__file__).read(), __file__, 'exec'))
diff --git a/setuptools/script.tmpl b/setuptools/script.tmpl
index 4504e26453..ff5efbcab3 100644
--- a/setuptools/script.tmpl
+++ b/setuptools/script.tmpl
@@ -1,4 +1,3 @@
 # EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r
 __requires__ = %(spec)r
-import pkg_resources
-pkg_resources.run_script(%(spec)r, %(script_name)r)
+__import__('pkg_resources').run_script(%(spec)r, %(script_name)r)

From d559b45bb0f9e3472ac62574c858f4ab29707a8e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jul 2014 08:04:52 -0400
Subject: [PATCH 4240/8469] Resave with excess whitespace removed

---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1818edcb3..72493d0b97 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -320,7 +320,7 @@ def prune_file_list(self):
         self.filelist.exclude_pattern(None, prefix=build.build_base)
         self.filelist.exclude_pattern(None, prefix=base_dir)
         sep = re.escape(os.sep)
-        self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep, 
+        self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep,
                                       is_regex=1)
 
 

From e64901cd8e4b49102390886ee264889a226c1945 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jul 2014 08:36:19 -0400
Subject: [PATCH 4241/8469] Normalize style per PEP-8

---
 dist.py | 69 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/dist.py b/dist.py
index 7eb04bc3f5..ffb33ff645 100644
--- a/dist.py
+++ b/dist.py
@@ -4,7 +4,9 @@
 being built/installed/distributed.
 """
 
-import sys, os, re
+import sys
+import os
+import re
 from email import message_from_file
 
 try:
@@ -22,7 +24,7 @@
 # the same as a Python NAME -- I don't allow leading underscores.  The fact
 # that they're very similar is no coincidence; the default naming scheme is
 # to look for a Python module named after the command.
-command_re = re.compile (r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
+command_re = re.compile(r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
 
 
 class Distribution:
@@ -39,7 +41,6 @@ class Distribution:
     See the code for 'setup()', in core.py, for details.
     """
 
-
     # 'global_options' describes the command-line options that may be
     # supplied to the setup script prior to any actual commands.
     # Eg. "./setup.py -n" or "./setup.py --quiet" both take advantage of
@@ -48,12 +49,13 @@ class Distribution:
     # don't want to pollute the commands with too many options that they
     # have minimal control over.
     # The fourth entry for verbose means that it can be repeated.
-    global_options = [('verbose', 'v', "run verbosely (default)", 1),
-                      ('quiet', 'q', "run quietly (turns verbosity off)"),
-                      ('dry-run', 'n', "don't actually do anything"),
-                      ('help', 'h', "show detailed help message"),
-                      ('no-user-cfg', None,
-                       'ignore pydistutils.cfg in your home directory'),
+    global_options = [
+        ('verbose', 'v', "run verbosely (default)", 1),
+        ('quiet', 'q', "run quietly (turns verbosity off)"),
+        ('dry-run', 'n', "don't actually do anything"),
+        ('help', 'h', "show detailed help message"),
+        ('no-user-cfg', None,
+            'ignore pydistutils.cfg in your home directory'),
     ]
 
     # 'common_usage' is a short (2-3 line) string describing the common
@@ -115,10 +117,9 @@ class Distribution:
     # negative options are options that exclude other options
     negative_opt = {'quiet': 'verbose'}
 
-
     # -- Creation/initialization methods -------------------------------
 
-    def __init__ (self, attrs=None):
+    def __init__(self, attrs=None):
         """Construct a new Distribution instance: initialize all the
         attributes of a Distribution, and then use 'attrs' (a dictionary
         mapping attribute names to values) to assign some of those
@@ -532,15 +533,15 @@ def _parse_command_opts(self, parser, args):
         # to be sure that the basic "command" interface is implemented.
         if not issubclass(cmd_class, Command):
             raise DistutilsClassError(
-                  "command class %s must subclass Command" % cmd_class)
+                "command class %s must subclass Command" % cmd_class)
 
         # Also make sure that the command object provides a list of its
         # known options.
         if not (hasattr(cmd_class, 'user_options') and
                 isinstance(cmd_class.user_options, list)):
-            raise DistutilsClassError(("command class %s must provide " +
-                   "'user_options' attribute (a list of tuples)") % \
-                  cmd_class)
+            msg = ("command class %s must provide "
+                "'user_options' attribute (a list of tuples)")
+            raise DistutilsClassError(msg % cmd_class)
 
         # If the command class has a list of negative alias options,
         # merge it in with the global negative aliases.
@@ -552,12 +553,11 @@ def _parse_command_opts(self, parser, args):
         # Check for help_options in command class.  They have a different
         # format (tuple of four) so we need to preprocess them here.
         if (hasattr(cmd_class, 'help_options') and
-            isinstance(cmd_class.help_options, list)):
+                isinstance(cmd_class.help_options, list)):
             help_options = fix_help_options(cmd_class.help_options)
         else:
             help_options = []
 
-
         # All commands support the global options too, just by adding
         # in 'global_options'.
         parser.set_option_table(self.global_options +
@@ -570,7 +570,7 @@ def _parse_command_opts(self, parser, args):
             return
 
         if (hasattr(cmd_class, 'help_options') and
-            isinstance(cmd_class.help_options, list)):
+                isinstance(cmd_class.help_options, list)):
             help_option_found=0
             for (help_option, short, desc, func) in cmd_class.help_options:
                 if hasattr(opts, parser.get_attr_name(help_option)):
@@ -647,7 +647,7 @@ def _show_help(self, parser, global_options=1, display_options=1,
             else:
                 klass = self.get_command_class(command)
             if (hasattr(klass, 'help_options') and
-                isinstance(klass.help_options, list)):
+                    isinstance(klass.help_options, list)):
                 parser.set_option_table(klass.user_options +
                                         fix_help_options(klass.help_options))
             else:
@@ -814,7 +814,7 @@ def get_command_class(self, command):
             klass_name = command
 
             try:
-                __import__ (module_name)
+                __import__(module_name)
                 module = sys.modules[module_name]
             except ImportError:
                 continue
@@ -823,8 +823,8 @@ def get_command_class(self, command):
                 klass = getattr(module, klass_name)
             except AttributeError:
                 raise DistutilsModuleError(
-                      "invalid command '%s' (no class '%s' in module '%s')"
-                      % (command, klass_name, module_name))
+                    "invalid command '%s' (no class '%s' in module '%s')"
+                    % (command, klass_name, module_name))
 
             self.cmdclass[command] = klass
             return klass
@@ -840,7 +840,7 @@ def get_command_obj(self, command, create=1):
         cmd_obj = self.command_obj.get(command)
         if not cmd_obj and create:
             if DEBUG:
-                self.announce("Distribution.get_command_obj(): " \
+                self.announce("Distribution.get_command_obj(): "
                               "creating '%s' command object" % command)
 
             klass = self.get_command_class(command)
@@ -897,8 +897,8 @@ def _set_command_options(self, command_obj, option_dict=None):
                     setattr(command_obj, option, value)
                 else:
                     raise DistutilsOptionError(
-                          "error in %s: command '%s' has no such option '%s'"
-                          % (source, command_name, option))
+                        "error in %s: command '%s' has no such option '%s'"
+                        % (source, command_name, option))
             except ValueError as msg:
                 raise DistutilsOptionError(msg)
 
@@ -974,7 +974,6 @@ def run_command(self, command):
         cmd_obj.run()
         self.have_run[command] = 1
 
-
     # -- Distribution query methods ------------------------------------
 
     def has_pure_modules(self):
@@ -1112,17 +1111,17 @@ def write_pkg_file(self, file):
         """
         version = '1.0'
         if (self.provides or self.requires or self.obsoletes or
-            self.classifiers or self.download_url):
+                self.classifiers or self.download_url):
             version = '1.1'
 
         file.write('Metadata-Version: %s\n' % version)
-        file.write('Name: %s\n' % self.get_name() )
-        file.write('Version: %s\n' % self.get_version() )
-        file.write('Summary: %s\n' % self.get_description() )
-        file.write('Home-page: %s\n' % self.get_url() )
-        file.write('Author: %s\n' % self.get_contact() )
-        file.write('Author-email: %s\n' % self.get_contact_email() )
-        file.write('License: %s\n' % self.get_license() )
+        file.write('Name: %s\n' % self.get_name())
+        file.write('Version: %s\n' % self.get_version())
+        file.write('Summary: %s\n' % self.get_description())
+        file.write('Home-page: %s\n' % self.get_url())
+        file.write('Author: %s\n' % self.get_contact())
+        file.write('Author-email: %s\n' % self.get_contact_email())
+        file.write('License: %s\n' % self.get_license())
         if self.download_url:
             file.write('Download-URL: %s\n' % self.download_url)
 
@@ -1131,7 +1130,7 @@ def write_pkg_file(self, file):
 
         keywords = ','.join(self.get_keywords())
         if keywords:
-            file.write('Keywords: %s\n' % keywords )
+            file.write('Keywords: %s\n' % keywords)
 
         self._write_list(file, 'Platform', self.get_platforms())
         self._write_list(file, 'Classifier', self.get_classifiers())

From bf0cecd76dd0501cbb98c77583c11a622dcfe73f Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Thu, 3 Jul 2014 17:03:39 +0300
Subject: [PATCH 4242/8469] ssl_support: Adjust to tunneling changes in Python
 2.7.7 and 3.4.1.

The fix for https://bugs.python.org/issue7776 changed httplib.HTTPConnection's
handling of tunneling: `host' now points to the proxy host, so we have to
adjust the code to perform the certificate validation on `_tunnel_host' instead
when it is available.
---
 setuptools/ssl_support.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 7b5f429f8f..cc7db067e9 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -178,12 +178,19 @@ def connect(self):
         if hasattr(self, '_tunnel') and getattr(self, '_tunnel_host', None):
             self.sock = sock
             self._tunnel()
+            # http://bugs.python.org/issue7776: Python>=3.4.1 and >=2.7.7
+            # change self.host to mean the proxy server host when tunneling is
+            # being used. Adapt, since we are interested in the destination
+            # host for the match_hostname() comparison.
+            actual_host = self._tunnel_host
+        else:
+            actual_host = self.host
 
         self.sock = ssl.wrap_socket(
             sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
         )
         try:
-            match_hostname(self.sock.getpeercert(), self.host)
+            match_hostname(self.sock.getpeercert(), actual_host)
         except CertificateError:
             self.sock.shutdown(socket.SHUT_RDWR)
             self.sock.close()

From 8ef8b53e1dc4563c63ddd2ae009bea42fe97f522 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 11:24:39 -0400
Subject: [PATCH 4243/8469] Create zip_manifests as a class attribute rather
 than a global

--HG--
extra : amend_source : 7754d23956c4157235dca41e90f05c29691078ee
---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 2151082bdf..b2631be7d3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1568,7 +1568,6 @@ def build(cls, path):
                 for name in zfile.namelist()
             )
             return dict(items)
-zip_manifests = ZipManifests()
 
 
 class ContextualZipFile(zipfile.ZipFile):
@@ -1595,6 +1594,7 @@ class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 
     eagers = None
+    _zip_manifests = ZipManifests()
 
     def __init__(self, module):
         EggProvider.__init__(self, module)
@@ -1620,7 +1620,7 @@ def _parts(self, zip_path):
 
     @property
     def zipinfo(self):
-        return zip_manifests.load(self.loader.archive)
+        return self._zip_manifests.load(self.loader.archive)
 
     def get_resource_filename(self, manager, resource_name):
         if not self.egg_name:

From e66c4d9c3aefaf98a7d8d9b19ce5948fe7840c49 Mon Sep 17 00:00:00 2001
From: Melvyn Sopacua <melvyn@magemana.nl>
Date: Sat, 5 Jul 2014 17:43:39 +0200
Subject: [PATCH 4244/8469] Fix exclude list on python 3.2+

imp.get_tag() is only available on 3.2+. Since 2<x<3.2 are EOL we shall
not worry.
We could implement a local get_tag(), but the point is moot: this
compilation tactic with __pycache__ subdirs and versioned import files
is new to python 3.x, so hasattr() is sufficient.
---
 setuptools/command/install_lib.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index d7e117f08b..cf5375f683 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,6 +1,5 @@
 import distutils.command.install_lib as orig
-import os
-
+import os, imp
 
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
@@ -17,12 +16,24 @@ def get_exclusions(self):
         nsp = self.distribution.namespace_packages
         svem = (nsp and self.get_finalized_command('install')
                 .single_version_externally_managed)
+        exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo']
+        if hasattr(imp, 'get_tag') :
+            exclude_names.extend(
+                os.path.join(
+                    '__pycache__',
+                    '__init__.' + imp.get_tag() + '.pyc'
+                ),
+                os.path.join(
+                    '__pycache__',
+                    '__init__.' + imp.get_tag() + '.pyo'
+                ),
+            )
         if svem:
             for pkg in nsp:
                 parts = pkg.split('.')
                 while parts:
                     pkgdir = os.path.join(self.install_dir, *parts)
-                    for f in '__init__.py', '__init__.pyc', '__init__.pyo':
+                    for f in exclude_names :
                         exclude[os.path.join(pkgdir, f)] = 1
                     parts.pop()
         return exclude

From e7df10e709c9a847e14d1db8d744b39c0183cf8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 11:57:04 -0400
Subject: [PATCH 4245/8469] Split MemoizedZipManifests from ZipManifests. Ref
 #154.

---
 pkg_resources.py | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index b2631be7d3..f4c7f5e9d9 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1533,22 +1533,8 @@ def __init__(self):
 
 class ZipManifests(dict):
     """
-    Memoized zipfile manifests.
+    zip manifest builder
     """
-    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
-
-    def load(self, path):
-        """
-        Load a manifest at path or return a suitable manifest already loaded.
-        """
-        path = os.path.normpath(path)
-        mtime = os.stat(path).st_mtime
-
-        if path not in self or self[path].mtime != mtime:
-            manifest = self.build(path)
-            self[path] = self.manifest_mod(manifest, mtime)
-
-        return self[path].manifest
 
     @classmethod
     def build(cls, path):
@@ -1569,6 +1555,28 @@ def build(cls, path):
             )
             return dict(items)
 
+    load = build
+
+
+class MemoizedZipManifests(ZipManifests):
+    """
+    Memoized zipfile manifests.
+    """
+    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
+
+    def load(self, path):
+        """
+        Load a manifest at path or return a suitable manifest already loaded.
+        """
+        path = os.path.normpath(path)
+        mtime = os.stat(path).st_mtime
+
+        if path not in self or self[path].mtime != mtime:
+            manifest = self.build(path)
+            self[path] = self.manifest_mod(manifest, mtime)
+
+        return self[path].manifest
+
 
 class ContextualZipFile(zipfile.ZipFile):
     """

From bd7e1edff511c8410acfb640d005502d66910b41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:02:01 -0400
Subject: [PATCH 4246/8469] Make memoized zip manifests opt-in using the
 PKG_RESOURCES_CACHE_ZIP_MANIFESTS environment variable. Ref #154.

---
 CHANGES.txt      | 8 ++++++--
 pkg_resources.py | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 003e2d5d7c..ef456a7e10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,12 @@ CHANGES
 5.4
 ---
 
-* Issue #154: Cache the reading of the zip file index for cases where the
-  same zip-file is used for multiple packages (like PEX).
+* Issue #154: ``pkg_resources`` will now cache the zip manifests rather than
+  re-processing the same file from disk multiple times, but only if the
+  environment variable ``PKG_RESOURCES_CACHE_ZIP_MANIFESTS`` is set. Clients
+  that package many modules in the same zip file will see some improvement
+  in startup time by enabling this feature. This feature is not enabled by
+  default because it causes a substantial increase in memory usage.
 
 ---
 5.3
diff --git a/pkg_resources.py b/pkg_resources.py
index f4c7f5e9d9..3782384a8d 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1602,7 +1602,11 @@ class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 
     eagers = None
-    _zip_manifests = ZipManifests()
+    _zip_manifests = (
+        MemoizedZipManifests()
+        if os.environ.get('PKG_RESOURCES_CACHE_ZIP_MANIFESTS') else
+        ZipManifests()
+    )
 
     def __init__(self, module):
         EggProvider.__init__(self, module)

From 879119ec99fdadf958f25e4b17755ebe2d3f8907 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:14:25 -0400
Subject: [PATCH 4247/8469] Use Python 3 syntax in 'script (dev).tmpl', as
 Python 2.6+ supports this syntax

---
 setuptools/script (dev).tmpl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/script (dev).tmpl b/setuptools/script (dev).tmpl
index 6b1bef5bb7..d58b1bb5bf 100644
--- a/setuptools/script (dev).tmpl	
+++ b/setuptools/script (dev).tmpl	
@@ -2,7 +2,4 @@
 __requires__ = %(spec)r
 __import__('pkg_resources').require(%(spec)r)
 __file__ = %(dev_path)r
-if __import__('sys').version_info < (3, 0):
-    execfile(__file__)
-else:
-    exec(compile(open(__file__).read(), __file__, 'exec'))
+exec(compile(open(__file__).read(), __file__, 'exec'))

From 773ebd845131ac32914e05cc33c0e78bfbc87ce3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:17:16 -0400
Subject: [PATCH 4248/8469] Added tag 5.4 for changeset baae103e80c3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bc743fd472..9204dc6ad1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -146,3 +146,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1
 f493e6c4ffd88951871110858c141385305e0077 5.2
 1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3
+baae103e80c307008b156e426a07eb9f486eb4f0 5.4

From 088a7a48bbf7a871dba5cea0b863242bc86d3889 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:17:45 -0400
Subject: [PATCH 4249/8469] Bumped to 5.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 42785c3169..b017944deb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.4"
+DEFAULT_VERSION = "5.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index e67e0a2f78..773d9307b1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.4'
+__version__ = '5.5'

From 243d54273d0308693f0181443fbc95197ffd4019 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:35:54 -0400
Subject: [PATCH 4250/8469] Move imports into header

--HG--
extra : amend_source : 371b48777dba5d8a4d62b5899944471752f830bd
extra : histedit_source : 0739a1da7f11a5f6e348a34b203a9328d0bc0f22
---
 pkg_resources.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 3782384a8d..470143ddad 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -30,6 +30,9 @@
 import operator
 import platform
 import collections
+import plistlib
+import email.parser
+import tempfile
 from pkgutil import get_importer
 
 try:
@@ -234,11 +237,9 @@ def get_provider(moduleOrReq):
 
 def _macosx_vers(_cache=[]):
     if not _cache:
-        import platform
         version = platform.mac_ver()[0]
         # fallback for MacPorts
         if version == '':
-            import plistlib
             plist = '/System/Library/CoreServices/SystemVersion.plist'
             if os.path.exists(plist):
                 if hasattr(plistlib, 'readPlist'):
@@ -2576,9 +2577,8 @@ def _parsed_pkg_info(self):
         try:
             return self._pkg_info
         except AttributeError:
-            from email.parser import Parser
             metadata = self.get_metadata(self.PKG_INFO)
-            self._pkg_info = Parser().parsestr(metadata)
+            self._pkg_info = email.parser.Parser().parsestr(metadata)
             return self._pkg_info
 
     @property
@@ -2646,8 +2646,7 @@ def issue_warning(*args,**kw):
             level += 1
     except ValueError:
         pass
-    from warnings import warn
-    warn(stacklevel = level+1, *args, **kw)
+    warnings.warn(stacklevel = level+1, *args, **kw)
 
 
 def parse_requirements(strs):
@@ -2840,12 +2839,11 @@ def split_sections(s):
     yield section, content
 
 def _mkstemp(*args,**kw):
-    from tempfile import mkstemp
     old_open = os.open
     try:
         # temporarily bypass sandboxing
         os.open = os_open
-        return mkstemp(*args,**kw)
+        return tempfile.mkstemp(*args,**kw)
     finally:
         # and then put it back
         os.open = old_open

From 843ffb56d0c9ec652ee9a2a180a6742caf8f68fb Mon Sep 17 00:00:00 2001
From: Melvyn Sopacua <melvyn@magemana.nl>
Date: Sat, 5 Jul 2014 18:41:12 +0200
Subject: [PATCH 4251/8469] Commit the fix we did when testing python3

I shall `hg status` before submitting PRs.
I shall `hg status` before submitting PRs.
I shall `hg status` before submitting PRs.
---
 setuptools/command/install_lib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index cf5375f683..7692e0f328 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -18,7 +18,7 @@ def get_exclusions(self):
                 .single_version_externally_managed)
         exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo']
         if hasattr(imp, 'get_tag') :
-            exclude_names.extend(
+            exclude_names.extend((
                 os.path.join(
                     '__pycache__',
                     '__init__.' + imp.get_tag() + '.pyc'
@@ -27,7 +27,7 @@ def get_exclusions(self):
                     '__pycache__',
                     '__init__.' + imp.get_tag() + '.pyo'
                 ),
-            )
+            ))
         if svem:
             for pkg in nsp:
                 parts = pkg.split('.')

From 3c936c87351d12ed57a09cf42454aadae155cb46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:42:24 -0400
Subject: [PATCH 4252/8469] Remove commented code

--HG--
extra : histedit_source : 7600ecd3914abc4767d4296f62b038a6397df673
---
 pkg_resources.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 470143ddad..b544fed441 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -311,11 +311,6 @@ def compatible_platforms(provided, required):
                 macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2))
                 if dversion == 7 and macosversion >= "10.3" or \
                         dversion == 8 and macosversion >= "10.4":
-
-                    #import warnings
-                    #warnings.warn("Mac eggs should be rebuilt to "
-                    #    "use the macosx designation instead of darwin.",
-                    #    category=DeprecationWarning)
                     return True
             return False    # egg isn't macosx or legacy darwin
 

From 3d4e1f728c1976caa56a463888a4fdbcee498e0b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 12:45:31 -0400
Subject: [PATCH 4253/8469] Avoid trailing comments in pkg_resources.

--HG--
extra : histedit_source : fba32276bb6acd7b5e44ff596407d10c94c618a9
---
 pkg_resources.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index b544fed441..21e4157138 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -312,7 +312,8 @@ def compatible_platforms(provided, required):
                 if dversion == 7 and macosversion >= "10.3" or \
                         dversion == 8 and macosversion >= "10.4":
                     return True
-            return False    # egg isn't macosx or legacy darwin
+            # egg isn't macosx or legacy darwin
+            return False
 
         # are they the same major version and machine type?
         if provMac.group(1) != reqMac.group(1) or \
@@ -637,7 +638,8 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                raise VersionConflict(dist, req) # XXX put more info here
+                # XXX put more info here
+                raise VersionConflict(dist, req)
             requirements.extend(dist.requires(req.extras)[::-1])
             processed[req] = True
 
@@ -653,8 +655,10 @@ def find_plugins(self, plugin_env, full_env=None, installer=None,
             distributions, errors = working_set.find_plugins(
                 Environment(plugin_dirlist)
             )
-            map(working_set.add, distributions)  # add plugins+libs to sys.path
-            print 'Could not load', errors        # display errors
+            # add plugins+libs to sys.path
+            map(working_set.add, distributions)
+            # display errors
+            print('Could not load', errors)
 
         The `plugin_env` should be an ``Environment`` instance that contains
         only distributions that are in the project's "plugin directory" or
@@ -1618,8 +1622,9 @@ def _zipinfo_name(self, fspath):
         )
 
     def _parts(self, zip_path):
-        # Convert a zipfile subpath into an egg-relative path part list
-        fspath = self.zip_pre+zip_path  # pseudo-fs path
+        # Convert a zipfile subpath into an egg-relative path part list.
+        # pseudo-fs path
+        fspath = self.zip_pre+zip_path
         if fspath.startswith(self.egg_root+os.sep):
             return fspath[len(self.egg_root)+1:].split(os.sep)
         raise AssertionError(
@@ -2684,7 +2689,8 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
                 raise ValueError(msg, line, "at", line[p:])
 
         match = TERMINATOR(line, p)
-        if match: p = match.end()   # skip the terminator, if any
+        # skip the terminator, if any
+        if match: p = match.end()
         return line, p, items
 
     for line in lines:
@@ -2867,4 +2873,5 @@ def _initialize(g):
 # calling ``require()``) will get activated as well.
 add_activation_listener(lambda dist: dist.activate())
 working_set.entries=[]
-list(map(working_set.add_entry, sys.path)) # match order
+# match order
+list(map(working_set.add_entry, sys.path))

From b8865685d6cad94c1e5a049ff2f63ae1bbfc1cf2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 13:01:13 -0400
Subject: [PATCH 4254/8469] Normalize whitespace per more modern style
 conventions.

---
 pkg_resources.py | 96 +++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 41 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 21e4157138..11debf6543 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -343,8 +343,10 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist, basestring): dist = Requirement.parse(dist)
-    if isinstance(dist, Requirement): dist = get_provider(dist)
+    if isinstance(dist, basestring):
+        dist = Requirement.parse(dist)
+    if isinstance(dist, Requirement):
+        dist = get_provider(dist)
     if not isinstance(dist, Distribution):
         raise TypeError("Expected string, Requirement, or Distribution", dist)
     return dist
@@ -886,7 +888,8 @@ def obtain(self, requirement, installer=None):
     def __iter__(self):
         """Yield the unique project names of the available distributions"""
         for key in self._distmap.keys():
-            if self[key]: yield key
+            if self[key]:
+                yield key
 
     def __iadd__(self, other):
         """In-place addition of a distribution or environment"""
@@ -2014,7 +2017,8 @@ def fixup_namespace_packages(path_item, parent=None):
     try:
         for package in _namespace_packages.get(parent,()):
             subpath = _handle_ns(package, path_item)
-            if subpath: fixup_namespace_packages(subpath, package)
+            if subpath:
+                fixup_namespace_packages(subpath, package)
     finally:
         imp.release_lock()
 
@@ -2146,13 +2150,16 @@ def parse_version(s):
     for part in _parse_version_parts(s.lower()):
         if part.startswith('*'):
             # remove '-' before a prerelease tag
-            if part<'*final':
-                while parts and parts[-1]=='*final-': parts.pop()
+            if part < '*final':
+                while parts and parts[-1] == '*final-':
+                    parts.pop()
             # remove trailing zeros from each series of numeric parts
             while parts and parts[-1]=='00000000':
                 parts.pop()
         parts.append(part)
     return tuple(parts)
+
+
 class EntryPoint(object):
     """Object representing an advertised importable object"""
 
@@ -2177,7 +2184,8 @@ def __repr__(self):
         return "EntryPoint.parse(%r)" % str(self)
 
     def load(self, require=True, env=None, installer=None):
-        if require: self.require(env, installer)
+        if require:
+            self.require(env, installer)
         entry = __import__(self.module_name, globals(), globals(),
             ['__name__'])
         for attr in self.attrs:
@@ -2207,22 +2215,21 @@ def parse(cls, src, dist=None):
         """
         try:
             attrs = extras = ()
-            name, value = src.split('=',1)
+            name, value = src.split('=', 1)
             if '[' in value:
-                value, extras = value.split('[',1)
-                req = Requirement.parse("x["+extras)
-                if req.specs: raise ValueError
+                value, extras = value.split('[', 1)
+                req = Requirement.parse("x[" + extras)
+                if req.specs:
+                    raise ValueError
                 extras = req.extras
             if ':' in value:
-                value, attrs = value.split(':',1)
+                value, attrs = value.split(':', 1)
                 if not MODULE(attrs.rstrip()):
                     raise ValueError
                 attrs = attrs.rstrip().split('.')
         except ValueError:
-            raise ValueError(
-                "EntryPoint must be in 'name=module:attrs [extras]' format",
-                src
-            )
+            msg = "EntryPoint must be in 'name=module:attrs [extras]' format"
+            raise ValueError(msg, src)
         else:
             return cls(name.strip(), value.strip(), attrs, extras, dist)
 
@@ -2379,7 +2386,7 @@ def _dep_map(self):
                 for extra, reqs in split_sections(self._get_metadata(name)):
                     if extra:
                         if ':' in extra:
-                            extra, marker = extra.split(':',1)
+                            extra, marker = extra.split(':', 1)
                             if invalid_marker(marker):
                                 # XXX warn
                                 reqs=[]
@@ -2393,7 +2400,7 @@ def requires(self, extras=()):
         """List of Requirements needed for this distro if `extras` are used"""
         dm = self._dep_map
         deps = []
-        deps.extend(dm.get(None,()))
+        deps.extend(dm.get(None, ()))
         for ext in extras:
             try:
                 deps.extend(dm[safe_extra(ext)])
@@ -2410,7 +2417,8 @@ def _get_metadata(self, name):
 
     def activate(self, path=None):
         """Ensure distribution is importable on `path` (default=sys.path)"""
-        if path is None: path = sys.path
+        if path is None:
+            path = sys.path
         self.insert_on(path)
         if path is sys.path:
             fixup_namespace_packages(self.location)
@@ -2426,7 +2434,7 @@ def egg_name(self):
         )
 
         if self.platform:
-            filename += '-'+self.platform
+            filename += '-' + self.platform
         return filename
 
     def __repr__(self):
@@ -2436,8 +2444,10 @@ def __repr__(self):
             return str(self)
 
     def __str__(self):
-        try: version = getattr(self,'version',None)
-        except ValueError: version = None
+        try:
+            version = getattr(self, 'version', None)
+        except ValueError:
+            version = None
         version = version or "[unknown version]"
         return "%s %s" % (self.project_name, version)
 
@@ -2493,9 +2503,9 @@ def insert_on(self, path, loc = None):
         npath= [(p and _normalize_cached(p) or p) for p in path]
 
         for p, item in enumerate(npath):
-            if item==nloc:
+            if item == nloc:
                 break
-            elif item==bdir and self.precedence==EGG_DIST:
+            elif item == bdir and self.precedence == EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
                 if path is sys.path:
                     self.check_version_conflict()
@@ -2509,7 +2519,7 @@ def insert_on(self, path, loc = None):
             return
 
         # p is the spot where we found or inserted loc; now remove duplicates
-        while 1:
+        while True:
             try:
                 np = npath.index(nloc, p+1)
             except ValueError:
@@ -2522,7 +2532,7 @@ def insert_on(self, path, loc = None):
         return
 
     def check_version_conflict(self):
-        if self.key=='setuptools':
+        if self.key == 'setuptools':
             # ignore the inevitable setuptools self-conflicts  :(
             return
 
@@ -2547,16 +2557,14 @@ def has_version(self):
         try:
             self.version
         except ValueError:
-            issue_warning("Unbuilt egg for "+repr(self))
+            issue_warning("Unbuilt egg for " + repr(self))
             return False
         return True
 
     def clone(self,**kw):
         """Copy this distribution, substituting in any changed keyword args"""
-        for attr in (
-            'project_name', 'version', 'py_version', 'platform', 'location',
-            'precedence'
-        ):
+        names = 'project_name version py_version platform location precedence'
+        for attr in names.split():
             kw.setdefault(attr, getattr(self, attr, None))
         kw.setdefault('metadata', self._provider)
         return self.__class__(**kw)
@@ -2646,7 +2654,7 @@ def issue_warning(*args,**kw):
             level += 1
     except ValueError:
         pass
-    warnings.warn(stacklevel = level+1, *args, **kw)
+    warnings.warn(stacklevel=level + 1, *args, **kw)
 
 
 def parse_requirements(strs):
@@ -2690,7 +2698,8 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
 
         match = TERMINATOR(line, p)
         # skip the terminator, if any
-        if match: p = match.end()
+        if match:
+            p = match.end()
         return line, p, items
 
     for line in lines:
@@ -2736,11 +2745,15 @@ def __init__(self, project_name, specs, extras):
     def __str__(self):
         specs = ','.join([''.join(s) for s in self.specs])
         extras = ','.join(self.extras)
-        if extras: extras = '[%s]' % extras
+        if extras:
+            extras = '[%s]' % extras
         return '%s%s%s' % (self.project_name, extras, specs)
 
     def __eq__(self, other):
-        return isinstance(other, Requirement) and self.hashCmp==other.hashCmp
+        return (
+            isinstance(other, Requirement) and
+            self.hashCmp == other.hashCmp
+        )
 
     def __contains__(self, item):
         if isinstance(item, Distribution):
@@ -2757,16 +2770,17 @@ def __contains__(self, item):
         for parsed, trans, op, ver in self.index:
             # Indexing: 0, 1, -1
             action = trans[compare(item, parsed)]
-            if action=='F':
+            if action == 'F':
                 return False
-            elif action=='T':
+            elif action == 'T':
                 return True
-            elif action=='+':
+            elif action == '+':
                 last = True
-            elif action=='-' or last is None:
+            elif action == '-' or last is None:
                 last = False
         # no rules encountered
-        if last is None: last = True
+        if last is None:
+            last = True
         return last
 
     def __hash__(self):
@@ -2778,7 +2792,7 @@ def __repr__(self): return "Requirement.parse(%r)" % str(self)
     def parse(s):
         reqs = list(parse_requirements(s))
         if reqs:
-            if len(reqs)==1:
+            if len(reqs) == 1:
                 return reqs[0]
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)

From 7e2477857dd3fee16ef47c2e89d1998f13514701 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 13:20:47 -0400
Subject: [PATCH 4255/8469] Add six 1.7.3 for bootstrapping purposes. Ref #229

--HG--
branch : feature/issue-229
extra : source : 7e8095f69ea350cd04fabdbeca5c9733a57ec8ff
---
 six.py | 747 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 747 insertions(+)
 create mode 100644 six.py

diff --git a/six.py b/six.py
new file mode 100644
index 0000000000..f8f7d402ff
--- /dev/null
+++ b/six.py
@@ -0,0 +1,747 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2014 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import functools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.7.3"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result) # Invokes __set__.
+        # This is a bit ugly, but it avoids running this again.
+        delattr(obj.__class__, self.name)
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+    MovedModule("winreg", "_winreg"),
+]
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+else:
+    def iterkeys(d, **kw):
+        return iter(d.iterkeys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.itervalues(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.iteritems(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.iterlists(**kw))
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+    def u(s):
+        return s
+    unichr = chr
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+    def byte2int(bs):
+        return ord(bs[0])
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    def iterbytes(buf):
+        return (ord(byte) for byte in buf)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                isinstance(data, unicode) and
+                fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    def wraps(wrapped):
+        def wrapper(f):
+            f = functools.wraps(wrapped)(f)
+            f.__wrapped__ = wrapped
+            return f
+        return wrapper
+else:
+    wraps = functools.wraps
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+            importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)

From 5b865b1b6e23379d23aa80e74adb38db8b14b6ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 13:21:54 -0400
Subject: [PATCH 4256/8469] Add dependency on six

--HG--
branch : feature/issue-229
extra : source : dc7d411977b4b040ba82be2f5881a5723c0637d5
---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index f7be05670c..cf401d456c 100755
--- a/setup.py
+++ b/setup.py
@@ -197,6 +197,9 @@ def _save_entry_points(self):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
+    install_requires=[
+        'six>=1.5',
+    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==1.0.1",

From f3829d8bd0cd852be133f8822aa4493a7a12fd51 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 13:34:34 -0400
Subject: [PATCH 4257/8469] Use numbers.Number to detect numeric type

---
 setuptools/compat.py | 2 --
 setuptools/dist.py   | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 09e5af5cc6..507f8e6c04 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -23,7 +23,6 @@
     long_type = long
     maxsize = sys.maxint
     next = lambda o: o.next()
-    numeric_types = (int, long, float)
     unichr = unichr
     unicode = unicode
     bytes = str
@@ -52,7 +51,6 @@
     long_type = int
     maxsize = sys.maxsize
     next = next
-    numeric_types = (int, float)
     unichr = chr
     unicode = str
     bytes = bytes
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 8de95a387f..dac4dfa8f8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -4,6 +4,7 @@
 import os
 import sys
 import warnings
+import numbers
 import distutils.log
 import distutils.core
 import distutils.cmd
@@ -13,7 +14,7 @@
     DistutilsSetupError)
 
 from setuptools.depends import Require
-from setuptools.compat import numeric_types, basestring, PY2
+from setuptools.compat import basestring, PY2
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -263,7 +264,7 @@ def __init__(self, attrs=None):
             if not hasattr(self,ep.name):
                 setattr(self,ep.name,None)
         _Distribution.__init__(self,attrs)
-        if isinstance(self.metadata.version, numeric_types):
+        if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 

From c4ecbd1e58a3384a5ab730450fa5487e48b68721 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 14:42:49 -0400
Subject: [PATCH 4258/8469] Since Python 3 will always need the _execfile
 functionality (to fulfill the test in test_sandbox), this functionality
 should become part of the core implementation.

---
 setuptools/compat.py             | 10 ----------
 setuptools/sandbox.py            | 23 ++++++++++++++++-------
 setuptools/tests/doctest.py      |  8 +++++---
 setuptools/tests/test_sandbox.py |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 507f8e6c04..45c2f24c95 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -10,7 +10,6 @@
     import ConfigParser
     from StringIO import StringIO
     BytesIO = StringIO
-    execfile = execfile
     func_code = lambda o: o.func_code
     func_globals = lambda o: o.func_globals
     im_func = lambda o: o.im_func
@@ -63,15 +62,6 @@
     )
     filterfalse = itertools.filterfalse
 
-    def execfile(fn, globs=None, locs=None):
-        if globs is None:
-            globs = globals()
-        if locs is None:
-            locs = globs
-        with open(fn, 'rb') as f:
-            source = f.read()
-        exec(compile(source, fn, 'exec'), globs, locs)
-
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
             raise value.with_traceback(tb)
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index dc6e54bf24..7985e9eef6 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -20,12 +20,23 @@
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
-from setuptools.compat import builtins, execfile
+from setuptools.compat import builtins
 
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
 
+def _execfile(filename, globals, locals=None):
+    """
+    Python 3 implementation of execfile.
+    """
+    with open(filename, 'rb') as stream:
+        script = stream.read()
+    if locals is None:
+        locals = globals
+    code = compile(script, filename, 'exec')
+    exec(code, globals, locals)
+
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
     old_dir = os.getcwd()
@@ -46,12 +57,10 @@ def run_setup(setup_script, args):
             # reset to include setup dir, w/clean callback list
             working_set.__init__()
             working_set.callbacks.append(lambda dist:dist.activate())
-            DirectorySandbox(setup_dir).run(
-                lambda: execfile(
-                    "setup.py",
-                    {'__file__':setup_script, '__name__':'__main__'}
-                )
-            )
+            def runner():
+                ns = dict(__file__=setup_script, __name__='__main__')
+                _execfile(setup_script, ns)
+            DirectorySandbox(setup_dir).run(runner)
         except SystemExit:
             v = sys.exc_info()[1]
             if v.args and v.args[0]:
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
index 47293c3c9c..75a1ff546e 100644
--- a/setuptools/tests/doctest.py
+++ b/setuptools/tests/doctest.py
@@ -109,7 +109,8 @@ def _test():
 import sys, traceback, inspect, linecache, os, re, types
 import unittest, difflib, pdb, tempfile
 import warnings
-from setuptools.compat import StringIO, execfile, func_code, im_func
+from setuptools.compat import StringIO, func_code, im_func
+from setuptools import sandbox
 
 # Don't whine about the deprecated is_private function in this
 # module's tests.
@@ -2554,14 +2555,15 @@ def debug_script(src, pm=False, globs=None):
 
         if pm:
             try:
-                execfile(srcfilename, globs, globs)
+                sandbox._execfile(srcfilename, globs)
             except:
                 print(sys.exc_info()[1])
                 pdb.post_mortem(sys.exc_info()[2])
         else:
             # Note that %r is vital here.  '%s' instead can, e.g., cause
             # backslashes to get treated as metacharacters on Windows.
-            pdb.run("execfile(%r)" % srcfilename, globs, globs)
+            cmd = "sandbox._execfile(%r, globals())" % srcfilename
+            pdb.run(cmd, globs, globs)
 
     finally:
         os.remove(srcfilename)
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 3dad137683..06b3d4340f 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -72,7 +72,7 @@ def test_setup_py_with_BOM(self):
         target = pkg_resources.resource_filename(__name__,
             'script-with-bom.py')
         namespace = types.ModuleType('namespace')
-        setuptools.sandbox.execfile(target, vars(namespace))
+        setuptools.sandbox._execfile(target, vars(namespace))
         assert namespace.result == 'passed'
 
 if __name__ == '__main__':

From 508f0f5134f3f5e87f53b7773086c8ecb30c527e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 15:00:26 -0400
Subject: [PATCH 4259/8469] next compatibility is no longer required

---
 setuptools/command/bdist_egg.py       | 2 +-
 setuptools/compat.py                  | 2 --
 setuptools/tests/test_easy_install.py | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 831d6042aa..34fdeec21f 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -14,7 +14,7 @@
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
-from setuptools.compat import basestring, next
+from setuptools.compat import basestring
 from setuptools.extension import Library
 from setuptools import Command
 
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 45c2f24c95..73e6e4aa7e 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -21,7 +21,6 @@
     iteritems = lambda o: o.iteritems()
     long_type = long
     maxsize = sys.maxint
-    next = lambda o: o.next()
     unichr = unichr
     unicode = unicode
     bytes = str
@@ -49,7 +48,6 @@
     iteritems = lambda o: o.items()
     long_type = int
     maxsize = sys.maxsize
-    next = next
     unichr = chr
     unicode = str
     bytes = bytes
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 31802aa288..a44309530f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -12,7 +12,7 @@
 import logging
 import distutils.core
 
-from setuptools.compat import StringIO, BytesIO, next, urlparse
+from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, get_script_args, nt_quote_arg)

From b49435397a5094f94678adf3549cc8941aa469b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 15:06:51 -0400
Subject: [PATCH 4260/8469] Use six for Python 2 compatibility

--HG--
branch : feature/issue-229
extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977
---
 setuptools/__init__.py                |   3 +-
 setuptools/command/bdist_egg.py       |   5 +-
 setuptools/command/develop.py         |   5 +-
 setuptools/command/easy_install.py    |  34 ++++-----
 setuptools/command/egg_info.py        |  11 +--
 setuptools/command/rotate.py          |   5 +-
 setuptools/command/sdist.py           |   5 +-
 setuptools/command/setopt.py          |   6 +-
 setuptools/command/test.py            |   7 +-
 setuptools/command/upload_docs.py     |  18 +++--
 setuptools/depends.py                 |   6 +-
 setuptools/dist.py                    |   7 +-
 setuptools/package_index.py           | 101 ++++++++++++++------------
 setuptools/py26compat.py              |   5 +-
 setuptools/sandbox.py                 |   4 +-
 setuptools/ssl_support.py             |  21 ++----
 setuptools/svn_utils.py               |  17 ++---
 setuptools/tests/__init__.py          |   6 +-
 setuptools/tests/server.py            |  25 ++++---
 setuptools/tests/test_bdist_egg.py    |   6 +-
 setuptools/tests/test_easy_install.py |  18 ++---
 setuptools/tests/test_packageindex.py |  17 +++--
 setuptools/tests/test_resources.py    |  11 +--
 setuptools/tests/test_sdist.py        |  29 ++++----
 setuptools/tests/test_svn.py          |  13 ++--
 setuptools/tests/test_test.py         |   9 ++-
 setuptools/unicode_utils.py           |   6 +-
 tests/manual_test.py                  |   5 +-
 28 files changed, 212 insertions(+), 193 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d99ab2a6b4..68bea4f64f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,11 +8,12 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
+from six.moves import filterfalse
+
 import setuptools.version
 from setuptools.extension import Extension
 from setuptools.dist import Distribution, Feature, _get_unpatched
 from setuptools.depends import Require
-from setuptools.compat import filterfalse
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 34fdeec21f..3d241b9919 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -12,9 +12,10 @@
 import marshal
 import textwrap
 
+import six
+
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
-from setuptools.compat import basestring
 from setuptools.extension import Library
 from setuptools import Command
 
@@ -418,7 +419,7 @@ def iter_symbols(code):
     for name in code.co_names:
         yield name
     for const in code.co_consts:
-        if isinstance(const, basestring):
+        if isinstance(const, six.string_types):
             yield const
         elif isinstance(const, CodeType):
             for name in iter_symbols(const):
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 368b64fed7..9f0b6f474b 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -4,9 +4,10 @@
 import os
 import glob
 
+import six
+
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
-from setuptools.compat import PY3
 import setuptools
 
 
@@ -86,7 +87,7 @@ def finalize_options(self):
                 " installation directory", p, normalize_path(os.curdir))
 
     def install_for_development(self):
-        if PY3 and getattr(self.distribution, 'use_2to3', False):
+        if six.PY3 and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6854827222..3be6fd9aac 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -35,6 +35,9 @@
 import site
 import struct
 
+import six
+from six.moves import configparser
+
 from setuptools import Command, _dont_write_bytecode
 from setuptools.sandbox import run_setup
 from setuptools.py31compat import get_path, get_config_vars
@@ -43,8 +46,6 @@
 from setuptools.package_index import PackageIndex
 from setuptools.package_index import URL_SCHEME
 from setuptools.command import bdist_egg, egg_info
-from setuptools.compat import (iteritems, maxsize, basestring, unicode,
-                               reraise, PY2, PY3)
 from pkg_resources import (
     yield_lines, normalize_path, resource_string, ensure_directory,
     get_distribution, find_distributions, Environment, Requirement,
@@ -77,13 +78,13 @@ def samefile(p1, p2):
     return norm_p1 == norm_p2
 
 
-if PY2:
+if six.PY2:
     def _to_ascii(s):
         return s
 
     def isascii(s):
         try:
-            unicode(s, 'ascii')
+            six.text_type(s, 'ascii')
             return True
         except UnicodeError:
             return False
@@ -315,7 +316,7 @@ def finalize_options(self):
         self.local_index = Environment(self.shadow_path + sys.path)
 
         if self.find_links is not None:
-            if isinstance(self.find_links, basestring):
+            if isinstance(self.find_links, six.string_types):
                 self.find_links = self.find_links.split()
         else:
             self.find_links = []
@@ -393,7 +394,7 @@ def pseudo_tempname(self):
         try:
             pid = os.getpid()
         except:
-            pid = random.randint(0, maxsize)
+            pid = random.randint(0, sys.maxsize)
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
     def warn_deprecated_options(self):
@@ -1217,7 +1218,7 @@ def install_site_py(self):
             f = open(sitepy, 'rb')
             current = f.read()
             # we want str, not bytes
-            if PY3:
+            if six.PY3:
                 current = current.decode()
 
             f.close()
@@ -1243,7 +1244,7 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for name, path in iteritems(self.config_vars):
+        for name, path in six.iteritems(self.config_vars):
             if path.startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0o700)" % path)
                 os.makedirs(path, 0o700)
@@ -1374,7 +1375,7 @@ def expand_paths(inputs):
 def extract_wininst_cfg(dist_filename):
     """Extract configuration data from a bdist_wininst .exe
 
-    Returns a ConfigParser.RawConfigParser, or None
+    Returns a configparser.RawConfigParser, or None
     """
     f = open(dist_filename, 'rb')
     try:
@@ -1387,15 +1388,12 @@ def extract_wininst_cfg(dist_filename):
             return None
         f.seek(prepended - 12)
 
-        from setuptools.compat import StringIO, ConfigParser
-        import struct
-
         tag, cfglen, bmlen = struct.unpack("<iii", f.read(12))
         if tag not in (0x1234567A, 0x1234567B):
             return None  # not a valid tag
 
         f.seek(prepended - (12 + cfglen))
-        cfg = ConfigParser.RawConfigParser(
+        cfg = configparser.RawConfigParser(
             {'version': '', 'target_version': ''})
         try:
             part = f.read(cfglen)
@@ -1409,8 +1407,8 @@ def extract_wininst_cfg(dist_filename):
             # Now the config is in bytes, but for RawConfigParser, it should
             #  be text, so decode it.
             config = config.decode(sys.getfilesystemencoding())
-            cfg.readfp(StringIO(config))
-        except ConfigParser.Error:
+            cfg.readfp(six.StringIO(config))
+        except configparser.Error:
             return None
         if not cfg.has_section('metadata') or not cfg.has_section('Setup'):
             return None
@@ -1444,7 +1442,7 @@ def get_exe_prefixes(exe_filename):
                 continue
             if parts[0].upper() in ('PURELIB', 'PLATLIB'):
                 contents = z.read(name)
-                if PY3:
+                if six.PY3:
                     contents = contents.decode()
                 for pth in yield_lines(contents):
                     pth = pth.strip().replace('\\', '/')
@@ -1618,7 +1616,7 @@ def auto_chmod(func, arg, exc):
         chmod(arg, stat.S_IWRITE)
         return func(arg)
     et, ev, _ = sys.exc_info()
-    reraise(et, (ev[0], ev[1] + (" %s %s" % (func, arg))))
+    six.reraise(et, (ev[0], ev[1] + (" %s %s" % (func, arg))))
 
 
 def update_dist_caches(dist_path, fix_zipimporter_caches):
@@ -2053,7 +2051,7 @@ def get_win_launcher(type):
 
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
-    if PY2:
+    if six.PY2:
         return manifest % vars()
     else:
         return manifest.decode('utf-8') % vars()
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 72493d0b97..debb52e4f3 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -10,9 +10,10 @@
 import re
 import sys
 
+import six
+
 from setuptools import Command
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring, PY3, StringIO
 from setuptools import svn_utils
 from setuptools.command.sdist import walk_revctrl
 from pkg_resources import (
@@ -132,7 +133,7 @@ def write_file(self, what, filename, data):
         to the file.
         """
         log.info("writing %s to %s", what, filename)
-        if PY3:
+        if six.PY3:
             data = data.encode("utf-8")
         if not self.dry_run:
             f = open(filename, 'wb')
@@ -373,7 +374,7 @@ def _write_requirements(stream, reqs):
 
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
-    data = StringIO()
+    data = six.StringIO()
     _write_requirements(data, dist.install_requires)
     extras_require = dist.extras_require or {}
     for extra in sorted(extras_require):
@@ -407,12 +408,12 @@ def write_arg(cmd, basename, filename, force=False):
 def write_entries(cmd, basename, filename):
     ep = cmd.distribution.entry_points
 
-    if isinstance(ep, basestring) or ep is None:
+    if isinstance(ep, six.string_types) or ep is None:
         data = ep
     elif ep is not None:
         data = []
         for section, contents in sorted(ep.items()):
-            if not isinstance(contents, basestring):
+            if not isinstance(contents, six.string_types):
                 contents = EntryPoint.parse_group(section, contents)
                 contents = '\n'.join(sorted(map(str, contents.values())))
             data.append('[%s]\n%s\n\n' % (section, contents))
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 1b073620ea..09eac496a4 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -3,8 +3,9 @@
 from distutils.errors import DistutilsOptionError
 import os
 
+import six
+
 from setuptools import Command
-from setuptools.compat import basestring
 
 
 class rotate(Command):
@@ -36,7 +37,7 @@ def finalize_options(self):
             self.keep = int(self.keep)
         except ValueError:
             raise DistutilsOptionError("--keep must be an integer")
-        if isinstance(self.match, basestring):
+        if isinstance(self.match, six.string_types):
             self.match = [
                 convert_path(p.strip()) for p in self.match.split(',')
             ]
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2aa1ee20fd..c99ad9b14d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -6,8 +6,9 @@
 import re
 import sys
 
+import six
+
 from setuptools import svn_utils
-from setuptools.compat import PY3
 import pkg_resources
 
 READMES = ('README', 'README.rst', 'README.txt')
@@ -236,7 +237,7 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             # The manifest must contain UTF-8. See #303.
-            if PY3:
+            if six.PY3:
                 try:
                     line = line.decode('UTF-8')
                 except UnicodeDecodeError:
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index a04d6032ad..f78e0cd50a 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,6 +4,8 @@
 import distutils
 import os
 
+from six.moves import configparser
+
 from setuptools import Command
 
 
@@ -37,10 +39,8 @@ def edit_config(filename, settings, dry_run=False):
     while a dictionary lists settings to be changed or deleted in that section.
     A setting of ``None`` means to delete that setting.
     """
-    from setuptools.compat import ConfigParser
-
     log.debug("Reading configuration from %s", filename)
-    opts = ConfigParser.RawConfigParser()
+    opts = configparser.RawConfigParser()
     opts.read([filename])
     for section, options in settings.items():
         if options is None:
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 1038da71af..14dd2600fc 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,11 +3,12 @@
 import unittest
 import sys
 
+import six
+
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
-from setuptools.compat import PY3
 from setuptools.py31compat import unittest_main
 
 
@@ -84,7 +85,7 @@ def finalize_options(self):
             self.test_runner = getattr(self.distribution, 'test_runner', None)
 
     def with_project_on_sys_path(self, func):
-        with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)
+        with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
@@ -145,7 +146,7 @@ def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
-        if PY3 and getattr(self.distribution, 'use_2to3', False):
+        if six.PY3 and getattr(self.distribution, 'use_2to3', False):
             module = self.test_args[-1].split('.')[0]
             if module in _namespace_packages:
                 del_modules = []
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index cd6c300c9f..360c10e8fe 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,17 +16,19 @@
 import sys
 import shutil
 
-from setuptools.compat import httplib, urlparse, unicode, iteritems, PY3
+from six.moves import http_client, urllib
+import six
+
 from pkg_resources import iter_entry_points
 
 
-errors = 'surrogateescape' if PY3 else 'strict'
+errors = 'surrogateescape' if six.PY3 else 'strict'
 
 
 # This is not just a replacement for byte literals
 # but works as a general purpose encoder
 def b(s, encoding='utf-8'):
-    if isinstance(s, unicode):
+    if isinstance(s, six.text_type):
         return s.encode(encoding, errors)
     return s
 
@@ -113,7 +115,7 @@ def upload_file(self, filename):
         # set up the authentication
         credentials = b(self.username + ':' + self.password)
         credentials = standard_b64encode(credentials)
-        if PY3:
+        if six.PY3:
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 
@@ -122,7 +124,7 @@ def upload_file(self, filename):
         sep_boundary = b('\n--') + b(boundary)
         end_boundary = sep_boundary + b('--')
         body = []
-        for key, values in iteritems(data):
+        for key, values in six.iteritems(data):
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if not isinstance(values, list):
@@ -150,12 +152,12 @@ def upload_file(self, filename):
         # We can't use urllib2 since we need to send the Basic
         # auth right with the first request
         schema, netloc, url, params, query, fragments = \
-            urlparse(self.repository)
+            urllib.parse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
-            conn = httplib.HTTPConnection(netloc)
+            conn = http_client.HTTPConnection(netloc)
         elif schema == 'https':
-            conn = httplib.HTTPSConnection(netloc)
+            conn = http_client.HTTPSConnection(netloc)
         else:
             raise AssertionError("unsupported schema " + schema)
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index e87ef3f39c..43617e6d95 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -3,7 +3,8 @@
 import marshal
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 from distutils.version import StrictVersion
-from setuptools import compat
+
+import six
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -99,7 +100,8 @@ def _iter_code(code):
             ptr += 3
 
             if op==EXTENDED_ARG:
-                extended_arg = arg * compat.long_type(65536)
+                long_type = six.integer_types[-1]
+                extended_arg = arg * long_type(65536)
                 continue
 
         else:
diff --git a/setuptools/dist.py b/setuptools/dist.py
index dac4dfa8f8..c6ac194610 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,8 +13,9 @@
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
+import six
+
 from setuptools.depends import Require
-from setuptools.compat import basestring, PY2
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -132,7 +133,7 @@ def check_entry_points(dist, attr, value):
         raise DistutilsSetupError(e)
 
 def check_test_suite(dist, attr, value):
-    if not isinstance(value,basestring):
+    if not isinstance(value, six.string_types):
         raise DistutilsSetupError("test_suite must be a string")
 
 def check_package_data(dist, attr, value):
@@ -632,7 +633,7 @@ def handle_display_options(self, option_order):
         """
         import sys
 
-        if PY2 or self.help_commands:
+        if six.PY2 or self.help_commands:
             return _Distribution.handle_display_options(self, option_order)
 
         # Stdout may be StringIO (e.g. in tests)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 58572ce663..9c8992189c 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -8,6 +8,14 @@
 import hashlib
 from functools import wraps
 
+try:
+    from urllib.parse import splituser
+except ImportError:
+    from urllib2 import splituser
+
+import six
+from six.moves import urllib, http_client
+
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     require, Environment, find_distributions, safe_name, safe_version,
@@ -16,12 +24,6 @@
 from setuptools import ssl_support
 from distutils import log
 from distutils.errors import DistutilsError
-from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
-                               urlparse, urlunparse, unquote, splituser,
-                               url2pathname, name2codepoint,
-                               unichr, urljoin, urlsplit, urlunsplit,
-                               ConfigParser)
-from setuptools.compat import filterfalse
 from fnmatch import translate
 from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
@@ -68,10 +70,11 @@ def parse_bdist_wininst(name):
 
 
 def egg_info_for_url(url):
-    scheme, server, path, parameters, query, fragment = urlparse(url)
-    base = unquote(path.split('/')[-1])
+    parts = urllib.parse.urlparse(url)
+    scheme, server, path, parameters, query, fragment = parts
+    base = urllib.parse.unquote(path.split('/')[-1])
     if server=='sourceforge.net' and base=='download':    # XXX Yuck
-        base = unquote(path.split('/')[-2])
+        base = urllib.parse.unquote(path.split('/')[-2])
     if '#' in base: base, fragment = base.split('#',1)
     return base,fragment
 
@@ -158,7 +161,7 @@ def unique_everseen(iterable, key=None):
     seen = set()
     seen_add = seen.add
     if key is None:
-        for element in filterfalse(seen.__contains__, iterable):
+        for element in six.moves.filterfalse(seen.__contains__, iterable):
             seen_add(element)
             yield element
     else:
@@ -190,14 +193,14 @@ def find_external_links(url, page):
         rels = set(map(str.strip, rel.lower().split(',')))
         if 'homepage' in rels or 'download' in rels:
             for match in HREF.finditer(tag):
-                yield urljoin(url, htmldecode(match.group(1)))
+                yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
             match = HREF.search(page,pos)
             if match:
-                yield urljoin(url, htmldecode(match.group(1)))
+                yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
 user_agent = "Python-urllib/%s setuptools/%s" % (
     sys.version[:3], require('setuptools')[0].version
@@ -240,7 +243,7 @@ def __init__(self, hash_name, expected):
     @classmethod
     def from_url(cls, url):
         "Construct a (possibly null) ContentChecker from a URL"
-        fragment = urlparse(url)[-1]
+        fragment = urllib.parse.urlparse(url)[-1]
         if not fragment:
             return ContentChecker()
         match = cls.pattern.search(fragment)
@@ -275,7 +278,7 @@ def __init__(
         self.to_scan = []
         if verify_ssl and ssl_support.is_available and (ca_bundle or ssl_support.find_ca_bundle()):
             self.opener = ssl_support.opener_for(ca_bundle)
-        else: self.opener = urllib2.urlopen
+        else: self.opener = urllib.request.urlopen
 
     def process_url(self, url, retrieve=False):
         """Evaluate a URL as a possible download, and maybe retrieve it"""
@@ -312,7 +315,7 @@ def process_url(self, url, retrieve=False):
         base = f.url     # handle redirects
         page = f.read()
         if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
-            if isinstance(f, HTTPError):
+            if isinstance(f, urllib.request.HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
             else:
@@ -320,7 +323,7 @@ def process_url(self, url, retrieve=False):
             page = page.decode(charset, "ignore")
         f.close()
         for match in HREF.finditer(page):
-            link = urljoin(base, htmldecode(match.group(1)))
+            link = urllib.parse.urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
         if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
             page = self.process_index(url, page)
@@ -343,7 +346,7 @@ def process_filename(self, fn, nested=False):
 
     def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
-        if (s and s.group(1).lower()=='file') or self.allows(urlparse(url)[1]):
+        if (s and s.group(1).lower()=='file') or self.allows(urllib.parse.urlparse(url)[1]):
             return True
         msg = ("\nNote: Bypassing %s (disallowed host; see "
             "http://bit.ly/1dg9ijs for details).\n")
@@ -374,7 +377,7 @@ def scan(link):
             # Process a URL to see if it's for a package page
             if link.startswith(self.index_url):
                 parts = list(map(
-                    unquote, link[len(self.index_url):].split('/')
+                    urllib.parse.unquote, link[len(self.index_url):].split('/')
                 ))
                 if len(parts)==2 and '#' not in parts[1]:
                     # it's a package page, sanitize and index it
@@ -387,7 +390,7 @@ def scan(link):
         # process an index page into the package-page index
         for match in HREF.finditer(page):
             try:
-                scan(urljoin(url, htmldecode(match.group(1))))
+                scan(urllib.parse.urljoin(url, htmldecode(match.group(1))))
             except ValueError:
                 pass
 
@@ -663,7 +666,7 @@ def _download_to(self, url, filename):
         try:
             checker = HashChecker.from_url(url)
             fp = self.open_url(strip_fragment(url))
-            if isinstance(fp, HTTPError):
+            if isinstance(fp, urllib.request.HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
                 )
@@ -699,24 +702,24 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url, self.opener)
-        except (ValueError, httplib.InvalidURL):
+        except (ValueError, http_client.InvalidURL):
             v = sys.exc_info()[1]
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
             else:
                 raise DistutilsError('%s %s' % (url, msg))
-        except urllib2.HTTPError:
+        except urllib.request.HTTPError:
             v = sys.exc_info()[1]
             return v
-        except urllib2.URLError:
+        except urllib.request.URLError:
             v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason))
-        except httplib.BadStatusLine:
+        except http_client.BadStatusLine:
             v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.line)
@@ -726,7 +729,7 @@ def open_url(self, url, warning=None):
                     'down, %s' %
                     (url, v.line)
                 )
-        except httplib.HTTPException:
+        except http_client.HTTPException:
             v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v)
@@ -758,7 +761,7 @@ def _download_url(self, scheme, url, tmpdir):
         elif scheme.startswith('hg+'):
             return self._download_hg(url, filename)
         elif scheme=='file':
-            return url2pathname(urlparse(url)[2])
+            return urllib.request.url2pathname(urllib.parse.urlparse(url)[2])
         else:
             self.url_ok(url, True)   # raises error if not allowed
             return self._attempt_download(url, filename)
@@ -792,7 +795,7 @@ def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
-            scheme, netloc, path, p, q, f = urlparse(url)
+            scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/',1)
                 auth, host = splituser(netloc)
@@ -803,14 +806,15 @@ def _download_svn(self, url, filename):
                     else:
                         creds = " --username="+auth
                     netloc = host
-                    url = urlunparse((scheme, netloc, url, p, q, f))
+                    parts = scheme, netloc, url, p, q, f
+                    url = urllib.parse.urlunparse(parts)
         self.info("Doing subversion checkout from %s to %s", url, filename)
         os.system("svn checkout%s -q %s %s" % (creds, url, filename))
         return filename
 
     @staticmethod
     def _vcs_split_rev_from_url(url, pop_prefix=False):
-        scheme, netloc, path, query, frag = urlsplit(url)
+        scheme, netloc, path, query, frag = urllib.parse.urlsplit(url)
 
         scheme = scheme.split('+', 1)[-1]
 
@@ -822,7 +826,7 @@ def _vcs_split_rev_from_url(url, pop_prefix=False):
             path, rev = path.rsplit('@', 1)
 
         # Also, discard fragment
-        url = urlunsplit((scheme, netloc, path, query, ''))
+        url = urllib.parse.urlunsplit((scheme, netloc, path, query, ''))
 
         return url, rev
 
@@ -874,7 +878,7 @@ def warn(self, msg, *args):
 def uchr(c):
     if not isinstance(c, int):
         return c
-    if c>255: return unichr(c)
+    if c>255: return six.unichr(c)
     return chr(c)
 
 def decode_entity(match):
@@ -884,7 +888,7 @@ def decode_entity(match):
     elif what.startswith('#'):
         what = int(what[1:])
     else:
-        what = name2codepoint.get(what, match.group(0))
+        what = six.moves.html_entities.name2codepoint.get(what, match.group(0))
     return uchr(what)
 
 def htmldecode(text):
@@ -915,7 +919,7 @@ def _encode_auth(auth):
     >>> chr(10) in str(_encode_auth(long_auth))
     False
     """
-    auth_s = unquote(auth)
+    auth_s = urllib.parse.unquote(auth)
     # convert to bytes
     auth_bytes = auth_s.encode()
     # use the legacy interface for Python 2.3 support
@@ -940,14 +944,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPIConfig(ConfigParser.ConfigParser):
+class PyPIConfig(six.moves.configparser.ConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        ConfigParser.ConfigParser.__init__(self, defaults)
+        six.moves.configparser.ConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):
@@ -979,15 +983,15 @@ def find_credential(self, url):
                 return cred
 
 
-def open_with_auth(url, opener=urllib2.urlopen):
+def open_with_auth(url, opener=urllib.request.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
-    scheme, netloc, path, params, query, frag = urlparse(url)
+    scheme, netloc, path, params, query, frag = urllib.parse.urlparse(url)
 
     # Double scheme does not raise on Mac OS X as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
     if netloc.endswith(':'):
-        raise httplib.InvalidURL("nonnumeric port: ''")
+        raise http_client.InvalidURL("nonnumeric port: ''")
 
     if scheme in ('http', 'https'):
         auth, host = splituser(netloc)
@@ -1003,11 +1007,12 @@ def open_with_auth(url, opener=urllib2.urlopen):
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        new_url = urlunparse((scheme,host,path,params,query,frag))
-        request = urllib2.Request(new_url)
+        parts = scheme, host, path, params, query, frag
+        new_url = urllib.parse.urlunparse(parts)
+        request = urllib.request.Request(new_url)
         request.add_header("Authorization", auth)
     else:
-        request = urllib2.Request(url)
+        request = urllib.request.Request(url)
 
     request.add_header('User-Agent', user_agent)
     fp = opener(request)
@@ -1015,9 +1020,10 @@ def open_with_auth(url, opener=urllib2.urlopen):
     if auth:
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
-        s2, h2, path2, param2, query2, frag2 = urlparse(fp.url)
+        s2, h2, path2, param2, query2, frag2 = urllib.parse.urlparse(fp.url)
         if s2==scheme and h2==host:
-            fp.url = urlunparse((s2,netloc,path2,param2,query2,frag2))
+            parts = s2, netloc, path2, param2, query2, frag2
+            fp.url = urllib.parse.urlunparse(parts)
 
     return fp
 
@@ -1030,10 +1036,10 @@ def fix_sf_url(url):
 
 def local_open(url):
     """Read a local path, with special support for directories"""
-    scheme, server, path, param, query, frag = urlparse(url)
-    filename = url2pathname(path)
+    scheme, server, path, param, query, frag = urllib.parse.urlparse(url)
+    filename = urllib.request.url2pathname(path)
     if os.path.isfile(filename):
-        return urllib2.urlopen(url)
+        return urllib.request.urlopen(url)
     elif path.endswith('/') and os.path.isdir(filename):
         files = []
         for f in os.listdir(filename):
@@ -1052,4 +1058,5 @@ def local_open(url):
         status, message, body = 404, "Path not found", "Not found"
 
     headers = {'content-type': 'text/html'}
-    return HTTPError(url, status, message, headers, StringIO(body))
+    body_stream = six.StringIO(body)
+    return urllib.error.HTTPError(url, status, message, headers, body_stream)
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 738b0cc40b..e52bd85b36 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -4,7 +4,10 @@
 
 import sys
 
-from setuptools.compat import splittag
+try:
+	from urllib.parse import splittag
+except ImportError:
+	from urllib import splittag
 
 def strip_fragment(url):
 	"""
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 7985e9eef6..185f257309 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -6,6 +6,8 @@
 import itertools
 import re
 
+from six.moves import builtins
+
 import pkg_resources
 
 if os.name == "java":
@@ -20,8 +22,6 @@
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
-from setuptools.compat import builtins
-
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 7b5f429f8f..b574f4b98f 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,9 +3,10 @@
 import atexit
 import re
 
+from six.moves import urllib, http_client
+
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
-from setuptools.compat import urllib2
 
 try:
     import ssl
@@ -27,17 +28,11 @@
 """.strip().split()
 
 
-HTTPSHandler = HTTPSConnection = object
-
-for what, where in (
-    ('HTTPSHandler', ['urllib2','urllib.request']),
-    ('HTTPSConnection', ['httplib', 'http.client']),
-):
-    for module in where:
-        try:
-            exec("from %s import %s" % (module, what))
-        except ImportError:
-            pass
+try:
+    HTTPSHandler = urllib.request.HTTPSHandler
+    HTTPSConnection = http_client.HTTPSConnection
+except AttributeError:
+    HTTPSHandler = HTTPSConnection = object
 
 is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
 
@@ -191,7 +186,7 @@ def connect(self):
 
 def opener_for(ca_bundle=None):
     """Get a urlopen() replacement that uses ca_bundle for verification"""
-    return urllib2.build_opener(
+    return urllib.request.build_opener(
         VerifyingHTTPSHandler(ca_bundle or find_ca_bundle())
     ).open
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 2dcfd89913..65e4b81537 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -8,14 +8,11 @@
 import codecs
 import unicodedata
 import warnings
-from setuptools.compat import unicode, PY2
 from setuptools.py31compat import TemporaryDirectory
 from xml.sax.saxutils import unescape
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import six
+from six.moves import urllib
 
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
@@ -60,7 +57,7 @@ def _get_target_property(target):
 
 
 def _get_xml_data(decoded_str):
-    if PY2:
+    if six.PY2:
         #old versions want an encoded string
         data = decoded_str.encode('utf-8')
     else:
@@ -118,7 +115,7 @@ def decode_as_string(text, encoding=None):
     if encoding is None:
         encoding = _console_encoding
 
-    if not isinstance(text, unicode):
+    if not isinstance(text, six.text_type):
         text = text.decode(encoding)
 
     text = unicodedata.normalize('NFC', text)
@@ -180,17 +177,17 @@ def parse_external_prop(lines):
         if not line:
             continue
 
-        if PY2:
+        if six.PY2:
             #shlex handles NULLs just fine and shlex in 2.7 tries to encode
             #as ascii automatiically
             line = line.encode('utf-8')
         line = shlex.split(line)
-        if PY2:
+        if six.PY2:
             line = [x.decode('utf-8') for x in line]
 
         #EXT_FOLDERNAME is either the first or last depending on where
         #the URL falls
-        if urlparse.urlsplit(line[-1])[0]:
+        if urllib.parse.urlsplit(line[-1])[0]:
             external = line[0]
         else:
             external = line[-1]
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index d6a4542eca..823cf93739 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -9,9 +9,9 @@
 from distutils.errors import DistutilsSetupError
 from distutils.core import Extension
 from distutils.version import LooseVersion
-from setuptools.compat import func_code
 
-from setuptools.compat import func_code
+import six
+
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools import Feature
@@ -54,7 +54,7 @@ def f1():
             x = "test"
             y = z
 
-        fc = func_code(f1)
+        fc = six.get_function_code(f1)
         # unrecognized name
         self.assertEqual(dep.extract_constant(fc,'q', -1), None)
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index ae2381e355..099e8b19be 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -3,11 +3,10 @@
 import sys
 import time
 import threading
-from setuptools.compat import BaseHTTPRequestHandler
-from setuptools.compat import (urllib2, URLError, HTTPServer,
-                               SimpleHTTPRequestHandler)
 
-class IndexServer(HTTPServer):
+from six.moves import BaseHTTPServer, SimpleHTTPServer, urllib
+
+class IndexServer(BaseHTTPServer.HTTPServer):
     """Basic single-threaded http server simulating a package index
 
     You can use this server in unittest like this::
@@ -19,8 +18,9 @@ class IndexServer(HTTPServer):
         s.stop()
     """
     def __init__(self, server_address=('', 0),
-            RequestHandlerClass=SimpleHTTPRequestHandler):
-        HTTPServer.__init__(self, server_address, RequestHandlerClass)
+            RequestHandlerClass=SimpleHTTPServer.SimpleHTTPRequestHandler):
+        BaseHTTPServer.HTTPServer.__init__(self, server_address,
+            RequestHandlerClass)
         self._run = True
 
     def serve(self):
@@ -44,10 +44,10 @@ def stop(self):
         url = 'http://127.0.0.1:%(server_port)s/' % vars(self)
         try:
             if sys.version_info >= (2, 6):
-                urllib2.urlopen(url, timeout=5)
+                urllib.request.urlopen(url, timeout=5)
             else:
-                urllib2.urlopen(url)
-        except URLError:
+                urllib.request.urlopen(url)
+        except urllib.error.URLError:
             # ignore any errors; all that's important is the request
             pass
         self.thread.join()
@@ -57,19 +57,20 @@ def base_url(self):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
-class RequestRecorder(BaseHTTPRequestHandler):
+class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)
         self.send_response(200, 'OK')
 
-class MockServer(HTTPServer, threading.Thread):
+class MockServer(BaseHTTPServer.HTTPServer, threading.Thread):
     """
     A simple HTTP Server that records the requests made to it.
     """
     def __init__(self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
-        HTTPServer.__init__(self, server_address, RequestHandlerClass)
+        BaseHTTPServer.HTTPServer.__init__(self, server_address,
+            RequestHandlerClass)
         threading.Thread.__init__(self)
         self.setDaemon(True)
         self.requests = []
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index cf4bcd1179..937e0ed074 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -8,8 +8,9 @@
 import tempfile
 import unittest
 
+import six
+
 from distutils.errors import DistutilsError
-from setuptools.compat import StringIO
 from setuptools.command.bdist_egg import bdist_egg
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -56,7 +57,7 @@ def test_bdist_egg(self):
             ))
         os.makedirs(os.path.join('build', 'src'))
         old_stdout = sys.stdout
-        sys.stdout = o = StringIO()
+        sys.stdout = o = six.StringIO()
         try:
             dist.parse_command_line()
             dist.run_commands()
@@ -69,4 +70,3 @@ def test_bdist_egg(self):
 
 def test_suite():
     return unittest.makeSuite(TestDevelopTest)
-
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a44309530f..8dfe234e8a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -11,8 +11,11 @@
 import tarfile
 import logging
 import distutils.core
+import io
+
+import six
+from six.moves import urllib
 
-from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, get_script_args, nt_quote_arg)
@@ -261,7 +264,7 @@ def test_setup_requires_honors_fetch_params(self):
         p_index = setuptools.tests.server.MockServer()
         p_index.start()
         netloc = 1
-        p_index_loc = urlparse(p_index.url)[netloc]
+        p_index_loc = urllib.parse.urlparse(p_index.url)[netloc]
         if p_index_loc.endswith(':0'):
             # Some platforms (Jython) don't find a port to which to bind,
             #  so skip this test for them.
@@ -385,12 +388,7 @@ def make_trivial_sdist(dist_path, setup_py):
     """
 
     setup_py_file = tarfile.TarInfo(name='setup.py')
-    try:
-        # Python 3 (StringIO gets converted to io module)
-        MemFile = BytesIO
-    except AttributeError:
-        MemFile = StringIO
-    setup_py_bytes = MemFile(setup_py.encode('utf-8'))
+    setup_py_bytes = io.BytesIO(setup_py.encode('utf-8'))
     setup_py_file.size = len(setup_py_bytes.getvalue())
     dist = tarfile.open(dist_path, 'w:gz')
     try:
@@ -451,8 +449,8 @@ def quiet_context():
 
     old_stdout = sys.stdout
     old_stderr = sys.stderr
-    new_stdout = sys.stdout = StringIO()
-    new_stderr = sys.stderr = StringIO()
+    new_stdout = sys.stdout = six.StringIO()
+    new_stderr = sys.stderr = six.StringIO()
     try:
         yield new_stdout, new_stderr
     finally:
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 664566a36c..40ae0af3d1 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -3,9 +3,12 @@
 import sys
 import os
 import unittest
-import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError, unicode, pathname2url
 import distutils.errors
+
+import six
+from six.moves import urllib, http_client
+
+import pkg_resources
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
 
@@ -20,7 +23,7 @@ def test_bad_url_bad_port(self):
             v = sys.exc_info()[1]
             self.assertTrue(url in str(v))
         else:
-            self.assertTrue(isinstance(v, HTTPError))
+            self.assertTrue(isinstance(v, urllib.error.HTTPError))
 
     def test_bad_url_typo(self):
         # issue 16
@@ -37,7 +40,7 @@ def test_bad_url_typo(self):
             v = sys.exc_info()[1]
             self.assertTrue(url in str(v))
         else:
-            self.assertTrue(isinstance(v, HTTPError))
+            self.assertTrue(isinstance(v, urllib.error.HTTPError))
 
     def test_bad_url_bad_status_line(self):
         index = setuptools.package_index.PackageIndex(
@@ -45,7 +48,7 @@ def test_bad_url_bad_status_line(self):
         )
 
         def _urlopen(*args):
-            raise httplib.BadStatusLine('line')
+            raise http_client.BadStatusLine('line')
 
         index.opener = _urlopen
         url = 'http://example.com'
@@ -71,7 +74,7 @@ def test_bad_url_double_scheme(self):
             index.open_url(url)
         except distutils.errors.DistutilsError:
             error = sys.exc_info()[1]
-            msg = unicode(error)
+            msg = six.text_type(error)
             assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
             return
         raise RuntimeError("Did not raise")
@@ -160,7 +163,7 @@ def test_local_index(self):
         f.write('<div>content</div>')
         f.close()
         try:
-            url = 'file:' + pathname2url(os.getcwd()) + '/'
+            url = 'file:' + urllib.request.pathname2url(os.getcwd()) + '/'
             res = setuptools.package_index.local_open(url)
         finally:
             os.remove('index.html')
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 443905cc24..2db87efaa0 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -15,7 +15,8 @@
 
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
-from setuptools.compat import StringIO, iteritems, PY3
+
+import six
 
 try:
     frozenset
@@ -270,7 +271,7 @@ def testRejects(self):
 
     def checkSubMap(self, m):
         self.assertEqual(len(m), len(self.submap_expect))
-        for key, ep in iteritems(self.submap_expect):
+        for key, ep in six.iteritems(self.submap_expect):
             self.assertEqual(repr(m.get(key)), repr(ep))
 
     submap_expect = dict(
@@ -522,7 +523,7 @@ def test_get_script_header(self):
 
     def test_get_script_header_jython_workaround(self):
         # This test doesn't work with Python 3 in some locales
-        if PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
+        if six.PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
             return
 
         class java:
@@ -545,12 +546,12 @@ def getProperty(property):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = sys.stderr = StringIO()
+            sys.stdout = sys.stderr = six.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python -x',
                                                executable=exe),
                              '#!%s  -x\n' % exe)
             self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
-            sys.stdout = sys.stderr = StringIO()
+            sys.stdout = sys.stderr = six.StringIO()
             self.assertEqual(get_script_header('#!/usr/bin/python',
                                                executable=self.non_ascii_exe),
                              '#!%s -x\n' % self.non_ascii_exe)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 5b3862e998..c78e5b0f68 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -10,10 +10,11 @@
 import unicodedata
 import re
 import contextlib
+
+import six
+
 from setuptools.tests import environment, test_svn
 from setuptools.tests.py26compat import skipIf
-
-from setuptools.compat import StringIO, unicode, PY3, PY2
 from setuptools.command.sdist import sdist, walk_revctrl
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
@@ -34,7 +35,7 @@
 """ % SETUP_ATTRS
 
 
-if PY3:
+if six.PY3:
     LATIN1_FILENAME = 'smörbröd.py'.encode('latin-1')
 else:
     LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
@@ -44,7 +45,7 @@
 @contextlib.contextmanager
 def quiet():
     old_stdout, old_stderr = sys.stdout, sys.stderr
-    sys.stdout, sys.stderr = StringIO(), StringIO()
+    sys.stdout, sys.stderr = six.StringIO(), six.StringIO()
     try:
         yield
     finally:
@@ -53,14 +54,14 @@ def quiet():
 
 # Fake byte literals for Python <= 2.5
 def b(s, encoding='utf-8'):
-    if PY3:
+    if six.PY3:
         return s.encode(encoding)
     return s
 
 
 # Convert to POSIX path
 def posix(path):
-    if PY3 and not isinstance(path, str):
+    if six.PY3 and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')
@@ -68,7 +69,7 @@ def posix(path):
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):
-    if isinstance(path, unicode):
+    if isinstance(path, six.text_type):
         return unicodedata.normalize('NFD', path)
     try:
         path = path.decode('utf-8')
@@ -153,14 +154,14 @@ def test_manifest_is_written_with_utf8_encoding(self):
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
-        if PY2:
+        if six.PY2:
             fs_enc = sys.getfilesystemencoding()
             filename = filename.decode(fs_enc)
 
         self.assertTrue(posix(filename) in u_contents)
 
     # Python 3 only
-    if PY3:
+    if six.PY3:
 
         def test_write_manifest_allows_utf8_filenames(self):
             # Test for #303.
@@ -269,12 +270,12 @@ def test_manifest_is_read_with_utf8_encoding(self):
             cmd.read_manifest()
 
         # The filelist should contain the UTF-8 filename
-        if PY3:
+        if six.PY3:
             filename = filename.decode('utf-8')
         self.assertTrue(filename in cmd.filelist.files)
 
     # Python 3 only
-    if PY3:
+    if six.PY3:
 
         def test_read_manifest_skips_non_utf8_filenames(self):
             # Test for #303.
@@ -310,7 +311,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
-    @skipIf(PY3 and locale.getpreferredencoding() != 'UTF-8',
+    @skipIf(six.PY3 and locale.getpreferredencoding() != 'UTF-8',
             'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
@@ -329,7 +330,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         if sys.platform == 'darwin':
             filename = decompose(filename)
 
-        if PY3:
+        if six.PY3:
             fs_enc = sys.getfilesystemencoding()
 
             if sys.platform == 'win32':
@@ -361,7 +362,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         with quiet():
             cmd.run()
 
-        if PY3:
+        if six.PY3:
             # not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
                 # Latin-1 is similar to Windows-1252 however
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
index 3340036210..0e6c3e9520 100644
--- a/setuptools/tests/test_svn.py
+++ b/setuptools/tests/test_svn.py
@@ -6,9 +6,10 @@
 import subprocess
 import sys
 import unittest
-from setuptools.tests import environment
-from setuptools.compat import unicode, unichr
 
+import six
+
+from setuptools.tests import environment
 from setuptools import svn_utils
 from setuptools.tests.py26compat import skipIf
 
@@ -119,13 +120,13 @@ def parse_tester(self, svn_name, ext_spaces):
             os.sep.join((example_base, folder3)),
             # folder is third_party大介
             os.sep.join((example_base,
-                       unicode('third_party') +
-                       unichr(0x5927) + unichr(0x4ecb))),
+                       six.text_type('third_party') +
+                       six.unichr(0x5927) + six.unichr(0x4ecb))),
             os.sep.join((example_base, 'folder', folder2)),
             os.sep.join((example_base, 'folder', folder3)),
             os.sep.join((example_base, 'folder',
-                       unicode('third_party') +
-                       unichr(0x5927) + unichr(0x4ecb))),
+                       six.text_type('third_party') +
+                       six.unichr(0x5927) + six.unichr(0x4ecb))),
             ])
 
         expected = set(os.path.normpath(x) for x in expected)
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index df92085e5d..67df14e58e 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -8,9 +8,10 @@
 import sys
 import tempfile
 import unittest
-
 from distutils.errors import DistutilsError
-from setuptools.compat import StringIO, PY2
+
+import six
+
 from setuptools.command.test import test
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -34,7 +35,7 @@
     __path__ = extend_path(__path__, __name__)
 """
 # Make sure this is Latin-1 binary, before writing:
-if PY2:
+if six.PY2:
     NS_INIT = NS_INIT.decode('UTF-8')
 NS_INIT = NS_INIT.encode('Latin-1')
 
@@ -115,7 +116,7 @@ def test_test(self):
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
         old_stdout = sys.stdout
-        sys.stdout = StringIO()
+        sys.stdout = six.StringIO()
         try:
             try: # try/except/finally doesn't work in Python 2.4, so we need nested try-statements.
                 cmd.run()
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index d2de941a69..f028589efb 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,11 +1,11 @@
 import unicodedata
 import sys
-from setuptools.compat import unicode as decoded_string
 
+import six
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):
-    if isinstance(path, decoded_string):
+    if isinstance(path, six.text_type):
         return unicodedata.normalize('NFD', path)
     try:
         path = path.decode('utf-8')
@@ -23,7 +23,7 @@ def filesys_decode(path):
     """
 
     fs_enc = sys.getfilesystemencoding()
-    if isinstance(path, decoded_string):
+    if isinstance(path, six.text_type):
         return path
 
     for enc in (fs_enc, "utf-8"):
diff --git a/tests/manual_test.py b/tests/manual_test.py
index e6489b1ced..af4ec09bea 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -7,7 +7,8 @@
 import subprocess
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
-from setuptools.compat import urlopen
+
+from six.moves import urllib
 
 def _system_call(*args):
     assert subprocess.call(args) == 0
@@ -76,7 +77,7 @@ def test_full():
         f.write(SIMPLE_BUILDOUT)
 
     with open('bootstrap.py', 'w') as f:
-        f.write(urlopen(BOOTSTRAP).read())
+        f.write(urllib.request.urlopen(BOOTSTRAP).read())
 
     _system_call('bin/python', 'bootstrap.py')
     _system_call('bin/buildout', '-q')

From 26d4bb13598407c64ab1a77a33716411c5fbad3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 20:31:39 -0400
Subject: [PATCH 4261/8469] Remove doctests module. It is now part of Python.

---
 setuptools/command/test.py   |    3 +-
 setuptools/tests/__init__.py |    3 +-
 setuptools/tests/doctest.py  | 2685 ----------------------------------
 3 files changed, 2 insertions(+), 2689 deletions(-)
 delete mode 100644 setuptools/tests/doctest.py

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 18e90ffc0d..1038da71af 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -20,8 +20,7 @@ def loadTestsFromModule(self, module):
         the return value to the tests.
         """
         tests = []
-        if module.__name__ != 'setuptools.tests.doctest':  # ugh
-            tests.append(TestLoader.loadTestsFromModule(self, module))
+        tests.append(TestLoader.loadTestsFromModule(self, module))
 
         if hasattr(module, "additional_tests"):
             tests.append(module.additional_tests())
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b5328ce67a..d6a4542eca 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -2,7 +2,7 @@
 import sys
 import os
 import unittest
-from setuptools.tests import doctest
+import doctest
 import distutils.core
 import distutils.cmd
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
@@ -18,7 +18,6 @@
 from setuptools.depends import Require
 
 def additional_tests():
-    import doctest, unittest
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
             os.path.join('tests', 'api_tests.txt'),
diff --git a/setuptools/tests/doctest.py b/setuptools/tests/doctest.py
deleted file mode 100644
index 75a1ff546e..0000000000
--- a/setuptools/tests/doctest.py
+++ /dev/null
@@ -1,2685 +0,0 @@
-# Module doctest.
-# Released to the public domain 16-Jan-2001, by Tim Peters (tim@python.org).
-# Major enhancements and refactoring by:
-#     Jim Fulton
-#     Edward Loper
-
-# Provided as-is; use at your own risk; no warranty; no promises; enjoy!
-
-try:
-    basestring
-except NameError:
-    basestring = str
-
-try:
-    enumerate
-except NameError:
-    def enumerate(seq):
-        return zip(range(len(seq)),seq)
-
-r"""Module doctest -- a framework for running examples in docstrings.
-
-In simplest use, end each module M to be tested with:
-
-def _test():
-    import doctest
-    doctest.testmod()
-
-if __name__ == "__main__":
-    _test()
-
-Then running the module as a script will cause the examples in the
-docstrings to get executed and verified:
-
-python M.py
-
-This won't display anything unless an example fails, in which case the
-failing example(s) and the cause(s) of the failure(s) are printed to stdout
-(why not stderr? because stderr is a lame hack <0.2 wink>), and the final
-line of output is "Test failed.".
-
-Run it with the -v switch instead:
-
-python M.py -v
-
-and a detailed report of all examples tried is printed to stdout, along
-with assorted summaries at the end.
-
-You can force verbose mode by passing "verbose=True" to testmod, or prohibit
-it by passing "verbose=False".  In either of those cases, sys.argv is not
-examined by testmod.
-
-There are a variety of other ways to run doctests, including integration
-with the unittest framework, and support for running non-Python text
-files containing doctests.  There are also many ways to override parts
-of doctest's default behaviors.  See the Library Reference Manual for
-details.
-"""
-
-__docformat__ = 'reStructuredText en'
-
-__all__ = [
-    # 0, Option Flags
-    'register_optionflag',
-    'DONT_ACCEPT_TRUE_FOR_1',
-    'DONT_ACCEPT_BLANKLINE',
-    'NORMALIZE_WHITESPACE',
-    'ELLIPSIS',
-    'IGNORE_EXCEPTION_DETAIL',
-    'COMPARISON_FLAGS',
-    'REPORT_UDIFF',
-    'REPORT_CDIFF',
-    'REPORT_NDIFF',
-    'REPORT_ONLY_FIRST_FAILURE',
-    'REPORTING_FLAGS',
-    # 1. Utility Functions
-    'is_private',
-    # 2. Example & DocTest
-    'Example',
-    'DocTest',
-    # 3. Doctest Parser
-    'DocTestParser',
-    # 4. Doctest Finder
-    'DocTestFinder',
-    # 5. Doctest Runner
-    'DocTestRunner',
-    'OutputChecker',
-    'DocTestFailure',
-    'UnexpectedException',
-    'DebugRunner',
-    # 6. Test Functions
-    'testmod',
-    'testfile',
-    'run_docstring_examples',
-    # 7. Tester
-    'Tester',
-    # 8. Unittest Support
-    'DocTestSuite',
-    'DocFileSuite',
-    'set_unittest_reportflags',
-    # 9. Debugging Support
-    'script_from_examples',
-    'testsource',
-    'debug_src',
-    'debug',
-]
-
-import __future__
-
-import sys, traceback, inspect, linecache, os, re, types
-import unittest, difflib, pdb, tempfile
-import warnings
-from setuptools.compat import StringIO, func_code, im_func
-from setuptools import sandbox
-
-# Don't whine about the deprecated is_private function in this
-# module's tests.
-warnings.filterwarnings("ignore", "is_private", DeprecationWarning,
-                        __name__, 0)
-
-# There are 4 basic classes:
-#  - Example: a <source, want> pair, plus an intra-docstring line number.
-#  - DocTest: a collection of examples, parsed from a docstring, plus
-#    info about where the docstring came from (name, filename, lineno).
-#  - DocTestFinder: extracts DocTests from a given object's docstring and
-#    its contained objects' docstrings.
-#  - DocTestRunner: runs DocTest cases, and accumulates statistics.
-#
-# So the basic picture is:
-#
-#                             list of:
-# +------+                   +---------+                   +-------+
-# |object| --DocTestFinder-> | DocTest | --DocTestRunner-> |results|
-# +------+                   +---------+                   +-------+
-#                            | Example |
-#                            |   ...   |
-#                            | Example |
-#                            +---------+
-
-# Option constants.
-
-OPTIONFLAGS_BY_NAME = {}
-def register_optionflag(name):
-    flag = 1 << len(OPTIONFLAGS_BY_NAME)
-    OPTIONFLAGS_BY_NAME[name] = flag
-    return flag
-
-DONT_ACCEPT_TRUE_FOR_1 = register_optionflag('DONT_ACCEPT_TRUE_FOR_1')
-DONT_ACCEPT_BLANKLINE = register_optionflag('DONT_ACCEPT_BLANKLINE')
-NORMALIZE_WHITESPACE = register_optionflag('NORMALIZE_WHITESPACE')
-ELLIPSIS = register_optionflag('ELLIPSIS')
-IGNORE_EXCEPTION_DETAIL = register_optionflag('IGNORE_EXCEPTION_DETAIL')
-
-COMPARISON_FLAGS = (DONT_ACCEPT_TRUE_FOR_1 |
-                    DONT_ACCEPT_BLANKLINE |
-                    NORMALIZE_WHITESPACE |
-                    ELLIPSIS |
-                    IGNORE_EXCEPTION_DETAIL)
-
-REPORT_UDIFF = register_optionflag('REPORT_UDIFF')
-REPORT_CDIFF = register_optionflag('REPORT_CDIFF')
-REPORT_NDIFF = register_optionflag('REPORT_NDIFF')
-REPORT_ONLY_FIRST_FAILURE = register_optionflag('REPORT_ONLY_FIRST_FAILURE')
-
-REPORTING_FLAGS = (REPORT_UDIFF |
-                   REPORT_CDIFF |
-                   REPORT_NDIFF |
-                   REPORT_ONLY_FIRST_FAILURE)
-
-# Special string markers for use in `want` strings:
-BLANKLINE_MARKER = '<BLANKLINE>'
-ELLIPSIS_MARKER = '...'
-
-######################################################################
-## Table of Contents
-######################################################################
-#  1. Utility Functions
-#  2. Example & DocTest -- store test cases
-#  3. DocTest Parser -- extracts examples from strings
-#  4. DocTest Finder -- extracts test cases from objects
-#  5. DocTest Runner -- runs test cases
-#  6. Test Functions -- convenient wrappers for testing
-#  7. Tester Class -- for backwards compatibility
-#  8. Unittest Support
-#  9. Debugging Support
-# 10. Example Usage
-
-######################################################################
-## 1. Utility Functions
-######################################################################
-
-def is_private(prefix, base):
-    """prefix, base -> true iff name prefix + "." + base is "private".
-
-    Prefix may be an empty string, and base does not contain a period.
-    Prefix is ignored (although functions you write conforming to this
-    protocol may make use of it).
-    Return true iff base begins with an (at least one) underscore, but
-    does not both begin and end with (at least) two underscores.
-
-    >>> is_private("a.b", "my_func")
-    False
-    >>> is_private("____", "_my_func")
-    True
-    >>> is_private("someclass", "__init__")
-    False
-    >>> is_private("sometypo", "__init_")
-    True
-    >>> is_private("x.y.z", "_")
-    True
-    >>> is_private("_x.y.z", "__")
-    False
-    >>> is_private("", "")  # senseless but consistent
-    False
-    """
-    warnings.warn("is_private is deprecated; it wasn't useful; "
-                  "examine DocTestFinder.find() lists instead",
-                  DeprecationWarning, stacklevel=2)
-    return base[:1] == "_" and not base[:2] == "__" == base[-2:]
-
-def _extract_future_flags(globs):
-    """
-    Return the compiler-flags associated with the future features that
-    have been imported into the given namespace (globs).
-    """
-    flags = 0
-    for fname in __future__.all_feature_names:
-        feature = globs.get(fname, None)
-        if feature is getattr(__future__, fname):
-            flags |= feature.compiler_flag
-    return flags
-
-def _normalize_module(module, depth=2):
-    """
-    Return the module specified by `module`.  In particular:
-      - If `module` is a module, then return module.
-      - If `module` is a string, then import and return the
-        module with that name.
-      - If `module` is None, then return the calling module.
-        The calling module is assumed to be the module of
-        the stack frame at the given depth in the call stack.
-    """
-    if inspect.ismodule(module):
-        return module
-    elif isinstance(module, basestring):
-        return __import__(module, globals(), locals(), ["*"])
-    elif module is None:
-        return sys.modules[sys._getframe(depth).f_globals['__name__']]
-    else:
-        raise TypeError("Expected a module, string, or None")
-
-def _indent(s, indent=4):
-    """
-    Add the given number of space characters to the beginning every
-    non-blank line in `s`, and return the result.
-    """
-    # This regexp matches the start of non-blank lines:
-    return re.sub('(?m)^(?!$)', indent*' ', s)
-
-def _exception_traceback(exc_info):
-    """
-    Return a string containing a traceback message for the given
-    exc_info tuple (as returned by sys.exc_info()).
-    """
-    # Get a traceback message.
-    excout = StringIO()
-    exc_type, exc_val, exc_tb = exc_info
-    traceback.print_exception(exc_type, exc_val, exc_tb, file=excout)
-    return excout.getvalue()
-
-# Override some StringIO methods.
-class _SpoofOut(StringIO):
-    def getvalue(self):
-        result = StringIO.getvalue(self)
-        # If anything at all was written, make sure there's a trailing
-        # newline.  There's no way for the expected output to indicate
-        # that a trailing newline is missing.
-        if result and not result.endswith("\n"):
-            result += "\n"
-        # Prevent softspace from screwing up the next test case, in
-        # case they used print with a trailing comma in an example.
-        if hasattr(self, "softspace"):
-            del self.softspace
-        return result
-
-    def truncate(self,   size=None):
-        StringIO.truncate(self, size)
-        if hasattr(self, "softspace"):
-            del self.softspace
-
-# Worst-case linear-time ellipsis matching.
-def _ellipsis_match(want, got):
-    """
-    Essentially the only subtle case:
-    >>> _ellipsis_match('aa...aa', 'aaa')
-    False
-    """
-    if want.find(ELLIPSIS_MARKER)==-1:
-        return want == got
-
-    # Find "the real" strings.
-    ws = want.split(ELLIPSIS_MARKER)
-    assert len(ws) >= 2
-
-    # Deal with exact matches possibly needed at one or both ends.
-    startpos, endpos = 0, len(got)
-    w = ws[0]
-    if w:   # starts with exact match
-        if got.startswith(w):
-            startpos = len(w)
-            del ws[0]
-        else:
-            return False
-    w = ws[-1]
-    if w:   # ends with exact match
-        if got.endswith(w):
-            endpos -= len(w)
-            del ws[-1]
-        else:
-            return False
-
-    if startpos > endpos:
-        # Exact end matches required more characters than we have, as in
-        # _ellipsis_match('aa...aa', 'aaa')
-        return False
-
-    # For the rest, we only need to find the leftmost non-overlapping
-    # match for each piece.  If there's no overall match that way alone,
-    # there's no overall match period.
-    for w in ws:
-        # w may be '' at times, if there are consecutive ellipses, or
-        # due to an ellipsis at the start or end of `want`.  That's OK.
-        # Search for an empty string succeeds, and doesn't change startpos.
-        startpos = got.find(w, startpos, endpos)
-        if startpos < 0:
-            return False
-        startpos += len(w)
-
-    return True
-
-def _comment_line(line):
-    "Return a commented form of the given line"
-    line = line.rstrip()
-    if line:
-        return '# '+line
-    else:
-        return '#'
-
-class _OutputRedirectingPdb(pdb.Pdb):
-    """
-    A specialized version of the python debugger that redirects stdout
-    to a given stream when interacting with the user.  Stdout is *not*
-    redirected when traced code is executed.
-    """
-    def __init__(self, out):
-        self.__out = out
-        pdb.Pdb.__init__(self)
-
-    def trace_dispatch(self, *args):
-        # Redirect stdout to the given stream.
-        save_stdout = sys.stdout
-        sys.stdout = self.__out
-        # Call Pdb's trace dispatch method.
-        try:
-            return pdb.Pdb.trace_dispatch(self, *args)
-        finally:
-            sys.stdout = save_stdout
-
-# [XX] Normalize with respect to os.path.pardir?
-def _module_relative_path(module, path):
-    if not inspect.ismodule(module):
-        raise TypeError('Expected a module: %r' % module)
-    if path.startswith('/'):
-        raise ValueError('Module-relative files may not have absolute paths')
-
-    # Find the base directory for the path.
-    if hasattr(module, '__file__'):
-        # A normal module/package
-        basedir = os.path.split(module.__file__)[0]
-    elif module.__name__ == '__main__':
-        # An interactive session.
-        if len(sys.argv)>0 and sys.argv[0] != '':
-            basedir = os.path.split(sys.argv[0])[0]
-        else:
-            basedir = os.curdir
-    else:
-        # A module w/o __file__ (this includes builtins)
-        raise ValueError("Can't resolve paths relative to the module " +
-                         module + " (it has no __file__)")
-
-    # Combine the base directory and the path.
-    return os.path.join(basedir, *(path.split('/')))
-
-######################################################################
-## 2. Example & DocTest
-######################################################################
-## - An "example" is a <source, want> pair, where "source" is a
-##   fragment of source code, and "want" is the expected output for
-##   "source."  The Example class also includes information about
-##   where the example was extracted from.
-##
-## - A "doctest" is a collection of examples, typically extracted from
-##   a string (such as an object's docstring).  The DocTest class also
-##   includes information about where the string was extracted from.
-
-class Example:
-    """
-    A single doctest example, consisting of source code and expected
-    output.  `Example` defines the following attributes:
-
-      - source: A single Python statement, always ending with a newline.
-        The constructor adds a newline if needed.
-
-      - want: The expected output from running the source code (either
-        from stdout, or a traceback in case of exception).  `want` ends
-        with a newline unless it's empty, in which case it's an empty
-        string.  The constructor adds a newline if needed.
-
-      - exc_msg: The exception message generated by the example, if
-        the example is expected to generate an exception; or `None` if
-        it is not expected to generate an exception.  This exception
-        message is compared against the return value of
-        `traceback.format_exception_only()`.  `exc_msg` ends with a
-        newline unless it's `None`.  The constructor adds a newline
-        if needed.
-
-      - lineno: The line number within the DocTest string containing
-        this Example where the Example begins.  This line number is
-        zero-based, with respect to the beginning of the DocTest.
-
-      - indent: The example's indentation in the DocTest string.
-        I.e., the number of space characters that preceed the
-        example's first prompt.
-
-      - options: A dictionary mapping from option flags to True or
-        False, which is used to override default options for this
-        example.  Any option flags not contained in this dictionary
-        are left at their default value (as specified by the
-        DocTestRunner's optionflags).  By default, no options are set.
-    """
-    def __init__(self, source, want, exc_msg=None, lineno=0, indent=0,
-                 options=None):
-        # Normalize inputs.
-        if not source.endswith('\n'):
-            source += '\n'
-        if want and not want.endswith('\n'):
-            want += '\n'
-        if exc_msg is not None and not exc_msg.endswith('\n'):
-            exc_msg += '\n'
-        # Store properties.
-        self.source = source
-        self.want = want
-        self.lineno = lineno
-        self.indent = indent
-        if options is None: options = {}
-        self.options = options
-        self.exc_msg = exc_msg
-
-class DocTest:
-    """
-    A collection of doctest examples that should be run in a single
-    namespace.  Each `DocTest` defines the following attributes:
-
-      - examples: the list of examples.
-
-      - globs: The namespace (aka globals) that the examples should
-        be run in.
-
-      - name: A name identifying the DocTest (typically, the name of
-        the object whose docstring this DocTest was extracted from).
-
-      - filename: The name of the file that this DocTest was extracted
-        from, or `None` if the filename is unknown.
-
-      - lineno: The line number within filename where this DocTest
-        begins, or `None` if the line number is unavailable.  This
-        line number is zero-based, with respect to the beginning of
-        the file.
-
-      - docstring: The string that the examples were extracted from,
-        or `None` if the string is unavailable.
-    """
-    def __init__(self, examples, globs, name, filename, lineno, docstring):
-        """
-        Create a new DocTest containing the given examples.  The
-        DocTest's globals are initialized with a copy of `globs`.
-        """
-        assert not isinstance(examples, basestring), \
-               "DocTest no longer accepts str; use DocTestParser instead"
-        self.examples = examples
-        self.docstring = docstring
-        self.globs = globs.copy()
-        self.name = name
-        self.filename = filename
-        self.lineno = lineno
-
-    def __repr__(self):
-        if len(self.examples) == 0:
-            examples = 'no examples'
-        elif len(self.examples) == 1:
-            examples = '1 example'
-        else:
-            examples = '%d examples' % len(self.examples)
-        return ('<DocTest %s from %s:%s (%s)>' %
-                (self.name, self.filename, self.lineno, examples))
-
-
-    # This lets us sort tests by name:
-    def __cmp__(self, other):
-        if not isinstance(other, DocTest):
-            return -1
-        return cmp((self.name, self.filename, self.lineno, id(self)),
-                   (other.name, other.filename, other.lineno, id(other)))
-
-######################################################################
-## 3. DocTestParser
-######################################################################
-
-class DocTestParser:
-    """
-    A class used to parse strings containing doctest examples.
-    """
-    # This regular expression is used to find doctest examples in a
-    # string.  It defines three groups: `source` is the source code
-    # (including leading indentation and prompts); `indent` is the
-    # indentation of the first (PS1) line of the source code; and
-    # `want` is the expected output (including leading indentation).
-    _EXAMPLE_RE = re.compile(r'''
-        # Source consists of a PS1 line followed by zero or more PS2 lines.
-        (?P<source>
-            (?:^(?P<indent> [ ]*) >>>    .*)    # PS1 line
-            (?:\n           [ ]*  \.\.\. .*)*)  # PS2 lines
-        \n?
-        # Want consists of any non-blank lines that do not start with PS1.
-        (?P<want> (?:(?![ ]*$)    # Not a blank line
-                     (?![ ]*>>>)  # Not a line starting with PS1
-                     .*$\n?       # But any other line
-                  )*)
-        ''', re.MULTILINE | re.VERBOSE)
-
-    # A regular expression for handling `want` strings that contain
-    # expected exceptions.  It divides `want` into three pieces:
-    #    - the traceback header line (`hdr`)
-    #    - the traceback stack (`stack`)
-    #    - the exception message (`msg`), as generated by
-    #      traceback.format_exception_only()
-    # `msg` may have multiple lines.  We assume/require that the
-    # exception message is the first non-indented line starting with a word
-    # character following the traceback header line.
-    _EXCEPTION_RE = re.compile(r"""
-        # Grab the traceback header.  Different versions of Python have
-        # said different things on the first traceback line.
-        ^(?P<hdr> Traceback\ \(
-            (?: most\ recent\ call\ last
-            |   innermost\ last
-            ) \) :
-        )
-        \s* $                # toss trailing whitespace on the header.
-        (?P<stack> .*?)      # don't blink: absorb stuff until...
-        ^ (?P<msg> \w+ .*)   #     a line *starts* with alphanum.
-        """, re.VERBOSE | re.MULTILINE | re.DOTALL)
-
-    # A callable returning a true value iff its argument is a blank line
-    # or contains a single comment.
-    _IS_BLANK_OR_COMMENT = re.compile(r'^[ ]*(#.*)?$').match
-
-    def parse(self, string, name='<string>'):
-        """
-        Divide the given string into examples and intervening text,
-        and return them as a list of alternating Examples and strings.
-        Line numbers for the Examples are 0-based.  The optional
-        argument `name` is a name identifying this string, and is only
-        used for error messages.
-        """
-        string = string.expandtabs()
-        # If all lines begin with the same indentation, then strip it.
-        min_indent = self._min_indent(string)
-        if min_indent > 0:
-            string = '\n'.join([l[min_indent:] for l in string.split('\n')])
-
-        output = []
-        charno, lineno = 0, 0
-        # Find all doctest examples in the string:
-        for m in self._EXAMPLE_RE.finditer(string):
-            # Add the pre-example text to `output`.
-            output.append(string[charno:m.start()])
-            # Update lineno (lines before this example)
-            lineno += string.count('\n', charno, m.start())
-            # Extract info from the regexp match.
-            (source, options, want, exc_msg) = \
-                     self._parse_example(m, name, lineno)
-            # Create an Example, and add it to the list.
-            if not self._IS_BLANK_OR_COMMENT(source):
-                output.append( Example(source, want, exc_msg,
-                                    lineno=lineno,
-                                    indent=min_indent+len(m.group('indent')),
-                                    options=options) )
-            # Update lineno (lines inside this example)
-            lineno += string.count('\n', m.start(), m.end())
-            # Update charno.
-            charno = m.end()
-        # Add any remaining post-example text to `output`.
-        output.append(string[charno:])
-        return output
-
-    def get_doctest(self, string, globs, name, filename, lineno):
-        """
-        Extract all doctest examples from the given string, and
-        collect them into a `DocTest` object.
-
-        `globs`, `name`, `filename`, and `lineno` are attributes for
-        the new `DocTest` object.  See the documentation for `DocTest`
-        for more information.
-        """
-        return DocTest(self.get_examples(string, name), globs,
-                       name, filename, lineno, string)
-
-    def get_examples(self, string, name='<string>'):
-        """
-        Extract all doctest examples from the given string, and return
-        them as a list of `Example` objects.  Line numbers are
-        0-based, because it's most common in doctests that nothing
-        interesting appears on the same line as opening triple-quote,
-        and so the first interesting line is called \"line 1\" then.
-
-        The optional argument `name` is a name identifying this
-        string, and is only used for error messages.
-        """
-        return [x for x in self.parse(string, name)
-                if isinstance(x, Example)]
-
-    def _parse_example(self, m, name, lineno):
-        """
-        Given a regular expression match from `_EXAMPLE_RE` (`m`),
-        return a pair `(source, want)`, where `source` is the matched
-        example's source code (with prompts and indentation stripped);
-        and `want` is the example's expected output (with indentation
-        stripped).
-
-        `name` is the string's name, and `lineno` is the line number
-        where the example starts; both are used for error messages.
-        """
-        # Get the example's indentation level.
-        indent = len(m.group('indent'))
-
-        # Divide source into lines; check that they're properly
-        # indented; and then strip their indentation & prompts.
-        source_lines = m.group('source').split('\n')
-        self._check_prompt_blank(source_lines, indent, name, lineno)
-        self._check_prefix(source_lines[1:], ' '*indent + '.', name, lineno)
-        source = '\n'.join([sl[indent+4:] for sl in source_lines])
-
-        # Divide want into lines; check that it's properly indented; and
-        # then strip the indentation.  Spaces before the last newline should
-        # be preserved, so plain rstrip() isn't good enough.
-        want = m.group('want')
-        want_lines = want.split('\n')
-        if len(want_lines) > 1 and re.match(r' *$', want_lines[-1]):
-            del want_lines[-1]  # forget final newline & spaces after it
-        self._check_prefix(want_lines, ' '*indent, name,
-                           lineno + len(source_lines))
-        want = '\n'.join([wl[indent:] for wl in want_lines])
-
-        # If `want` contains a traceback message, then extract it.
-        m = self._EXCEPTION_RE.match(want)
-        if m:
-            exc_msg = m.group('msg')
-        else:
-            exc_msg = None
-
-        # Extract options from the source.
-        options = self._find_options(source, name, lineno)
-
-        return source, options, want, exc_msg
-
-    # This regular expression looks for option directives in the
-    # source code of an example.  Option directives are comments
-    # starting with "doctest:".  Warning: this may give false
-    # positives for string-literals that contain the string
-    # "#doctest:".  Eliminating these false positives would require
-    # actually parsing the string; but we limit them by ignoring any
-    # line containing "#doctest:" that is *followed* by a quote mark.
-    _OPTION_DIRECTIVE_RE = re.compile(r'#\s*doctest:\s*([^\n\'"]*)$',
-                                      re.MULTILINE)
-
-    def _find_options(self, source, name, lineno):
-        """
-        Return a dictionary containing option overrides extracted from
-        option directives in the given source string.
-
-        `name` is the string's name, and `lineno` is the line number
-        where the example starts; both are used for error messages.
-        """
-        options = {}
-        # (note: with the current regexp, this will match at most once:)
-        for m in self._OPTION_DIRECTIVE_RE.finditer(source):
-            option_strings = m.group(1).replace(',', ' ').split()
-            for option in option_strings:
-                if (option[0] not in '+-' or
-                    option[1:] not in OPTIONFLAGS_BY_NAME):
-                    raise ValueError('line %r of the doctest for %s '
-                                     'has an invalid option: %r' %
-                                     (lineno+1, name, option))
-                flag = OPTIONFLAGS_BY_NAME[option[1:]]
-                options[flag] = (option[0] == '+')
-        if options and self._IS_BLANK_OR_COMMENT(source):
-            raise ValueError('line %r of the doctest for %s has an option '
-                             'directive on a line with no example: %r' %
-                             (lineno, name, source))
-        return options
-
-    # This regular expression finds the indentation of every non-blank
-    # line in a string.
-    _INDENT_RE = re.compile('^([ ]*)(?=\S)', re.MULTILINE)
-
-    def _min_indent(self, s):
-        "Return the minimum indentation of any non-blank line in `s`"
-        indents = [len(indent) for indent in self._INDENT_RE.findall(s)]
-        if len(indents) > 0:
-            return min(indents)
-        else:
-            return 0
-
-    def _check_prompt_blank(self, lines, indent, name, lineno):
-        """
-        Given the lines of a source string (including prompts and
-        leading indentation), check to make sure that every prompt is
-        followed by a space character.  If any line is not followed by
-        a space character, then raise ValueError.
-        """
-        for i, line in enumerate(lines):
-            if len(line) >= indent+4 and line[indent+3] != ' ':
-                raise ValueError('line %r of the docstring for %s '
-                                 'lacks blank after %s: %r' %
-                                 (lineno+i+1, name,
-                                  line[indent:indent+3], line))
-
-    def _check_prefix(self, lines, prefix, name, lineno):
-        """
-        Check that every line in the given list starts with the given
-        prefix; if any line does not, then raise a ValueError.
-        """
-        for i, line in enumerate(lines):
-            if line and not line.startswith(prefix):
-                raise ValueError('line %r of the docstring for %s has '
-                                 'inconsistent leading whitespace: %r' %
-                                 (lineno+i+1, name, line))
-
-
-######################################################################
-## 4. DocTest Finder
-######################################################################
-
-class DocTestFinder:
-    """
-    A class used to extract the DocTests that are relevant to a given
-    object, from its docstring and the docstrings of its contained
-    objects.  Doctests can currently be extracted from the following
-    object types: modules, functions, classes, methods, staticmethods,
-    classmethods, and properties.
-    """
-
-    def __init__(self, verbose=False, parser=DocTestParser(),
-                 recurse=True, _namefilter=None, exclude_empty=True):
-        """
-        Create a new doctest finder.
-
-        The optional argument `parser` specifies a class or
-        function that should be used to create new DocTest objects (or
-        objects that implement the same interface as DocTest).  The
-        signature for this factory function should match the signature
-        of the DocTest constructor.
-
-        If the optional argument `recurse` is false, then `find` will
-        only examine the given object, and not any contained objects.
-
-        If the optional argument `exclude_empty` is false, then `find`
-        will include tests for objects with empty docstrings.
-        """
-        self._parser = parser
-        self._verbose = verbose
-        self._recurse = recurse
-        self._exclude_empty = exclude_empty
-        # _namefilter is undocumented, and exists only for temporary backward-
-        # compatibility support of testmod's deprecated isprivate mess.
-        self._namefilter = _namefilter
-
-    def find(self, obj, name=None, module=None, globs=None,
-             extraglobs=None):
-        """
-        Return a list of the DocTests that are defined by the given
-        object's docstring, or by any of its contained objects'
-        docstrings.
-
-        The optional parameter `module` is the module that contains
-        the given object.  If the module is not specified or is None, then
-        the test finder will attempt to automatically determine the
-        correct module.  The object's module is used:
-
-            - As a default namespace, if `globs` is not specified.
-            - To prevent the DocTestFinder from extracting DocTests
-              from objects that are imported from other modules.
-            - To find the name of the file containing the object.
-            - To help find the line number of the object within its
-              file.
-
-        Contained objects whose module does not match `module` are ignored.
-
-        If `module` is False, no attempt to find the module will be made.
-        This is obscure, of use mostly in tests:  if `module` is False, or
-        is None but cannot be found automatically, then all objects are
-        considered to belong to the (non-existent) module, so all contained
-        objects will (recursively) be searched for doctests.
-
-        The globals for each DocTest is formed by combining `globs`
-        and `extraglobs` (bindings in `extraglobs` override bindings
-        in `globs`).  A new copy of the globals dictionary is created
-        for each DocTest.  If `globs` is not specified, then it
-        defaults to the module's `__dict__`, if specified, or {}
-        otherwise.  If `extraglobs` is not specified, then it defaults
-        to {}.
-
-        """
-        # If name was not specified, then extract it from the object.
-        if name is None:
-            name = getattr(obj, '__name__', None)
-            if name is None:
-                raise ValueError("DocTestFinder.find: name must be given "
-                        "when obj.__name__ doesn't exist: %r" %
-                                 (type(obj),))
-
-        # Find the module that contains the given object (if obj is
-        # a module, then module=obj.).  Note: this may fail, in which
-        # case module will be None.
-        if module is False:
-            module = None
-        elif module is None:
-            module = inspect.getmodule(obj)
-
-        # Read the module's source code.  This is used by
-        # DocTestFinder._find_lineno to find the line number for a
-        # given object's docstring.
-        try:
-            file = inspect.getsourcefile(obj) or inspect.getfile(obj)
-            source_lines = linecache.getlines(file)
-            if not source_lines:
-                source_lines = None
-        except TypeError:
-            source_lines = None
-
-        # Initialize globals, and merge in extraglobs.
-        if globs is None:
-            if module is None:
-                globs = {}
-            else:
-                globs = module.__dict__.copy()
-        else:
-            globs = globs.copy()
-        if extraglobs is not None:
-            globs.update(extraglobs)
-
-        # Recursively expore `obj`, extracting DocTests.
-        tests = []
-        self._find(tests, obj, name, module, source_lines, globs, {})
-        return tests
-
-    def _filter(self, obj, prefix, base):
-        """
-        Return true if the given object should not be examined.
-        """
-        return (self._namefilter is not None and
-                self._namefilter(prefix, base))
-
-    def _from_module(self, module, object):
-        """
-        Return true if the given object is defined in the given
-        module.
-        """
-        if module is None:
-            return True
-        elif inspect.isfunction(object):
-            return module.__dict__ is func_globals(object)
-        elif inspect.isclass(object):
-            return module.__name__ == object.__module__
-        elif inspect.getmodule(object) is not None:
-            return module is inspect.getmodule(object)
-        elif hasattr(object, '__module__'):
-            return module.__name__ == object.__module__
-        elif isinstance(object, property):
-            return True # [XX] no way not be sure.
-        else:
-            raise ValueError("object must be a class or function")
-
-    def _find(self, tests, obj, name, module, source_lines, globs, seen):
-        """
-        Find tests for the given object and any contained objects, and
-        add them to `tests`.
-        """
-        if self._verbose:
-            print('Finding tests in %s' % name)
-
-        # If we've already processed this object, then ignore it.
-        if id(obj) in seen:
-            return
-        seen[id(obj)] = 1
-
-        # Find a test for this object, and add it to the list of tests.
-        test = self._get_test(obj, name, module, globs, source_lines)
-        if test is not None:
-            tests.append(test)
-
-        # Look for tests in a module's contained objects.
-        if inspect.ismodule(obj) and self._recurse:
-            for valname, val in obj.__dict__.items():
-                # Check if this contained object should be ignored.
-                if self._filter(val, name, valname):
-                    continue
-                valname = '%s.%s' % (name, valname)
-                # Recurse to functions & classes.
-                if ((inspect.isfunction(val) or inspect.isclass(val)) and
-                    self._from_module(module, val)):
-                    self._find(tests, val, valname, module, source_lines,
-                               globs, seen)
-
-        # Look for tests in a module's __test__ dictionary.
-        if inspect.ismodule(obj) and self._recurse:
-            for valname, val in getattr(obj, '__test__', {}).items():
-                if not isinstance(valname, basestring):
-                    raise ValueError("DocTestFinder.find: __test__ keys "
-                                     "must be strings: %r" %
-                                     (type(valname),))
-                if not (inspect.isfunction(val) or inspect.isclass(val) or
-                        inspect.ismethod(val) or inspect.ismodule(val) or
-                        isinstance(val, basestring)):
-                    raise ValueError("DocTestFinder.find: __test__ values "
-                                     "must be strings, functions, methods, "
-                                     "classes, or modules: %r" %
-                                     (type(val),))
-                valname = '%s.__test__.%s' % (name, valname)
-                self._find(tests, val, valname, module, source_lines,
-                           globs, seen)
-
-        # Look for tests in a class's contained objects.
-        if inspect.isclass(obj) and self._recurse:
-            for valname, val in obj.__dict__.items():
-                # Check if this contained object should be ignored.
-                if self._filter(val, name, valname):
-                    continue
-                # Special handling for staticmethod/classmethod.
-                if isinstance(val, staticmethod):
-                    val = getattr(obj, valname)
-                if isinstance(val, classmethod):
-                    val = im_func(getattr(obj, valname))
-
-                # Recurse to methods, properties, and nested classes.
-                if ((inspect.isfunction(val) or inspect.isclass(val) or
-                      isinstance(val, property)) and
-                      self._from_module(module, val)):
-                    valname = '%s.%s' % (name, valname)
-                    self._find(tests, val, valname, module, source_lines,
-                               globs, seen)
-
-    def _get_test(self, obj, name, module, globs, source_lines):
-        """
-        Return a DocTest for the given object, if it defines a docstring;
-        otherwise, return None.
-        """
-        # Extract the object's docstring.  If it doesn't have one,
-        # then return None (no test for this object).
-        if isinstance(obj, basestring):
-            docstring = obj
-        else:
-            try:
-                if obj.__doc__ is None:
-                    docstring = ''
-                else:
-                    docstring = obj.__doc__
-                    if not isinstance(docstring, basestring):
-                        docstring = str(docstring)
-            except (TypeError, AttributeError):
-                docstring = ''
-
-        # Find the docstring's location in the file.
-        lineno = self._find_lineno(obj, source_lines)
-
-        # Don't bother if the docstring is empty.
-        if self._exclude_empty and not docstring:
-            return None
-
-        # Return a DocTest for this object.
-        if module is None:
-            filename = None
-        else:
-            filename = getattr(module, '__file__', module.__name__)
-            if filename[-4:] in (".pyc", ".pyo"):
-                filename = filename[:-1]
-        return self._parser.get_doctest(docstring, globs, name,
-                                        filename, lineno)
-
-    def _find_lineno(self, obj, source_lines):
-        """
-        Return a line number of the given object's docstring.  Note:
-        this method assumes that the object has a docstring.
-        """
-        lineno = None
-
-        # Find the line number for modules.
-        if inspect.ismodule(obj):
-            lineno = 0
-
-        # Find the line number for classes.
-        # Note: this could be fooled if a class is defined multiple
-        # times in a single file.
-        if inspect.isclass(obj):
-            if source_lines is None:
-                return None
-            pat = re.compile(r'^\s*class\s*%s\b' %
-                             getattr(obj, '__name__', '-'))
-            for i, line in enumerate(source_lines):
-                if pat.match(line):
-                    lineno = i
-                    break
-
-        # Find the line number for functions & methods.
-        if inspect.ismethod(obj): obj = im_func(obj)
-        if inspect.isfunction(obj): obj = func_code(obj)
-        if inspect.istraceback(obj): obj = obj.tb_frame
-        if inspect.isframe(obj): obj = obj.f_code
-        if inspect.iscode(obj):
-            lineno = getattr(obj, 'co_firstlineno', None)-1
-
-        # Find the line number where the docstring starts.  Assume
-        # that it's the first line that begins with a quote mark.
-        # Note: this could be fooled by a multiline function
-        # signature, where a continuation line begins with a quote
-        # mark.
-        if lineno is not None:
-            if source_lines is None:
-                return lineno+1
-            pat = re.compile('(^|.*:)\s*\w*("|\')')
-            for lineno in range(lineno, len(source_lines)):
-                if pat.match(source_lines[lineno]):
-                    return lineno
-
-        # We couldn't find the line number.
-        return None
-
-######################################################################
-## 5. DocTest Runner
-######################################################################
-
-class DocTestRunner:
-    """
-    A class used to run DocTest test cases, and accumulate statistics.
-    The `run` method is used to process a single DocTest case.  It
-    returns a tuple `(f, t)`, where `t` is the number of test cases
-    tried, and `f` is the number of test cases that failed.
-
-        >>> tests = DocTestFinder().find(_TestClass)
-        >>> runner = DocTestRunner(verbose=False)
-        >>> for test in tests:
-        ...     print runner.run(test)
-        (0, 2)
-        (0, 1)
-        (0, 2)
-        (0, 2)
-
-    The `summarize` method prints a summary of all the test cases that
-    have been run by the runner, and returns an aggregated `(f, t)`
-    tuple:
-
-        >>> runner.summarize(verbose=1)
-        4 items passed all tests:
-           2 tests in _TestClass
-           2 tests in _TestClass.__init__
-           2 tests in _TestClass.get
-           1 tests in _TestClass.square
-        7 tests in 4 items.
-        7 passed and 0 failed.
-        Test passed.
-        (0, 7)
-
-    The aggregated number of tried examples and failed examples is
-    also available via the `tries` and `failures` attributes:
-
-        >>> runner.tries
-        7
-        >>> runner.failures
-        0
-
-    The comparison between expected outputs and actual outputs is done
-    by an `OutputChecker`.  This comparison may be customized with a
-    number of option flags; see the documentation for `testmod` for
-    more information.  If the option flags are insufficient, then the
-    comparison may also be customized by passing a subclass of
-    `OutputChecker` to the constructor.
-
-    The test runner's display output can be controlled in two ways.
-    First, an output function (`out) can be passed to
-    `TestRunner.run`; this function will be called with strings that
-    should be displayed.  It defaults to `sys.stdout.write`.  If
-    capturing the output is not sufficient, then the display output
-    can be also customized by subclassing DocTestRunner, and
-    overriding the methods `report_start`, `report_success`,
-    `report_unexpected_exception`, and `report_failure`.
-    """
-    # This divider string is used to separate failure messages, and to
-    # separate sections of the summary.
-    DIVIDER = "*" * 70
-
-    def __init__(self, checker=None, verbose=None, optionflags=0):
-        """
-        Create a new test runner.
-
-        Optional keyword arg `checker` is the `OutputChecker` that
-        should be used to compare the expected outputs and actual
-        outputs of doctest examples.
-
-        Optional keyword arg 'verbose' prints lots of stuff if true,
-        only failures if false; by default, it's true iff '-v' is in
-        sys.argv.
-
-        Optional argument `optionflags` can be used to control how the
-        test runner compares expected output to actual output, and how
-        it displays failures.  See the documentation for `testmod` for
-        more information.
-        """
-        self._checker = checker or OutputChecker()
-        if verbose is None:
-            verbose = '-v' in sys.argv
-        self._verbose = verbose
-        self.optionflags = optionflags
-        self.original_optionflags = optionflags
-
-        # Keep track of the examples we've run.
-        self.tries = 0
-        self.failures = 0
-        self._name2ft = {}
-
-        # Create a fake output target for capturing doctest output.
-        self._fakeout = _SpoofOut()
-
-    #/////////////////////////////////////////////////////////////////
-    # Reporting methods
-    #/////////////////////////////////////////////////////////////////
-
-    def report_start(self, out, test, example):
-        """
-        Report that the test runner is about to process the given
-        example.  (Only displays a message if verbose=True)
-        """
-        if self._verbose:
-            if example.want:
-                out('Trying:\n' + _indent(example.source) +
-                    'Expecting:\n' + _indent(example.want))
-            else:
-                out('Trying:\n' + _indent(example.source) +
-                    'Expecting nothing\n')
-
-    def report_success(self, out, test, example, got):
-        """
-        Report that the given example ran successfully.  (Only
-        displays a message if verbose=True)
-        """
-        if self._verbose:
-            out("ok\n")
-
-    def report_failure(self, out, test, example, got):
-        """
-        Report that the given example failed.
-        """
-        out(self._failure_header(test, example) +
-            self._checker.output_difference(example, got, self.optionflags))
-
-    def report_unexpected_exception(self, out, test, example, exc_info):
-        """
-        Report that the given example raised an unexpected exception.
-        """
-        out(self._failure_header(test, example) +
-            'Exception raised:\n' + _indent(_exception_traceback(exc_info)))
-
-    def _failure_header(self, test, example):
-        out = [self.DIVIDER]
-        if test.filename:
-            if test.lineno is not None and example.lineno is not None:
-                lineno = test.lineno + example.lineno + 1
-            else:
-                lineno = '?'
-            out.append('File "%s", line %s, in %s' %
-                       (test.filename, lineno, test.name))
-        else:
-            out.append('Line %s, in %s' % (example.lineno+1, test.name))
-        out.append('Failed example:')
-        source = example.source
-        out.append(_indent(source))
-        return '\n'.join(out)
-
-    #/////////////////////////////////////////////////////////////////
-    # DocTest Running
-    #/////////////////////////////////////////////////////////////////
-
-    def __run(self, test, compileflags, out):
-        """
-        Run the examples in `test`.  Write the outcome of each example
-        with one of the `DocTestRunner.report_*` methods, using the
-        writer function `out`.  `compileflags` is the set of compiler
-        flags that should be used to execute examples.  Return a tuple
-        `(f, t)`, where `t` is the number of examples tried, and `f`
-        is the number of examples that failed.  The examples are run
-        in the namespace `test.globs`.
-        """
-        # Keep track of the number of failures and tries.
-        failures = tries = 0
-
-        # Save the option flags (since option directives can be used
-        # to modify them).
-        original_optionflags = self.optionflags
-
-        SUCCESS, FAILURE, BOOM = range(3) # `outcome` state
-
-        check = self._checker.check_output
-
-        # Process each example.
-        for examplenum, example in enumerate(test.examples):
-
-            # If REPORT_ONLY_FIRST_FAILURE is set, then supress
-            # reporting after the first failure.
-            quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
-                     failures > 0)
-
-            # Merge in the example's options.
-            self.optionflags = original_optionflags
-            if example.options:
-                for (optionflag, val) in example.options.items():
-                    if val:
-                        self.optionflags |= optionflag
-                    else:
-                        self.optionflags &= ~optionflag
-
-            # Record that we started this example.
-            tries += 1
-            if not quiet:
-                self.report_start(out, test, example)
-
-            # Use a special filename for compile(), so we can retrieve
-            # the source code during interactive debugging (see
-            # __patched_linecache_getlines).
-            filename = '<doctest %s[%d]>' % (test.name, examplenum)
-
-            # Run the example in the given context (globs), and record
-            # any exception that gets raised.  (But don't intercept
-            # keyboard interrupts.)
-            try:
-                # Don't blink!  This is where the user's code gets run.
-                exec(compile(example.source, filename, "single",
-                              compileflags, 1), test.globs)
-                self.debugger.set_continue() # ==== Example Finished ====
-                exception = None
-            except KeyboardInterrupt:
-                raise
-            except:
-                exception = sys.exc_info()
-                self.debugger.set_continue() # ==== Example Finished ====
-
-            got = self._fakeout.getvalue()  # the actual output
-            self._fakeout.truncate(0)
-            outcome = FAILURE   # guilty until proved innocent or insane
-
-            # If the example executed without raising any exceptions,
-            # verify its output.
-            if exception is None:
-                if check(example.want, got, self.optionflags):
-                    outcome = SUCCESS
-
-            # The example raised an exception:  check if it was expected.
-            else:
-                exc_info = sys.exc_info()
-                exc_msg = traceback.format_exception_only(*exc_info[:2])[-1]
-                if not quiet:
-                    got += _exception_traceback(exc_info)
-
-                # If `example.exc_msg` is None, then we weren't expecting
-                # an exception.
-                if example.exc_msg is None:
-                    outcome = BOOM
-
-                # We expected an exception:  see whether it matches.
-                elif check(example.exc_msg, exc_msg, self.optionflags):
-                    outcome = SUCCESS
-
-                # Another chance if they didn't care about the detail.
-                elif self.optionflags & IGNORE_EXCEPTION_DETAIL:
-                    m1 = re.match(r'[^:]*:', example.exc_msg)
-                    m2 = re.match(r'[^:]*:', exc_msg)
-                    if m1 and m2 and check(m1.group(0), m2.group(0),
-                                           self.optionflags):
-                        outcome = SUCCESS
-
-            # Report the outcome.
-            if outcome is SUCCESS:
-                if not quiet:
-                    self.report_success(out, test, example, got)
-            elif outcome is FAILURE:
-                if not quiet:
-                    self.report_failure(out, test, example, got)
-                failures += 1
-            elif outcome is BOOM:
-                if not quiet:
-                    self.report_unexpected_exception(out, test, example,
-                                                     exc_info)
-                failures += 1
-            else:
-                assert False, ("unknown outcome", outcome)
-
-        # Restore the option flags (in case they were modified)
-        self.optionflags = original_optionflags
-
-        # Record and return the number of failures and tries.
-        self.__record_outcome(test, failures, tries)
-        return failures, tries
-
-    def __record_outcome(self, test, f, t):
-        """
-        Record the fact that the given DocTest (`test`) generated `f`
-        failures out of `t` tried examples.
-        """
-        f2, t2 = self._name2ft.get(test.name, (0,0))
-        self._name2ft[test.name] = (f+f2, t+t2)
-        self.failures += f
-        self.tries += t
-
-    __LINECACHE_FILENAME_RE = re.compile(r'<doctest '
-                                         r'(?P<name>[\w\.]+)'
-                                         r'\[(?P<examplenum>\d+)\]>$')
-    def __patched_linecache_getlines(self, filename, module_globals=None):
-        m = self.__LINECACHE_FILENAME_RE.match(filename)
-        if m and m.group('name') == self.test.name:
-            example = self.test.examples[int(m.group('examplenum'))]
-            return example.source.splitlines(True)
-        elif func_code(self.save_linecache_getlines).co_argcount > 1:
-            return self.save_linecache_getlines(filename, module_globals)
-        else:
-            return self.save_linecache_getlines(filename)
-
-    def run(self, test, compileflags=None, out=None, clear_globs=True):
-        """
-        Run the examples in `test`, and display the results using the
-        writer function `out`.
-
-        The examples are run in the namespace `test.globs`.  If
-        `clear_globs` is true (the default), then this namespace will
-        be cleared after the test runs, to help with garbage
-        collection.  If you would like to examine the namespace after
-        the test completes, then use `clear_globs=False`.
-
-        `compileflags` gives the set of flags that should be used by
-        the Python compiler when running the examples.  If not
-        specified, then it will default to the set of future-import
-        flags that apply to `globs`.
-
-        The output of each example is checked using
-        `DocTestRunner.check_output`, and the results are formatted by
-        the `DocTestRunner.report_*` methods.
-        """
-        self.test = test
-
-        if compileflags is None:
-            compileflags = _extract_future_flags(test.globs)
-
-        save_stdout = sys.stdout
-        if out is None:
-            out = save_stdout.write
-        sys.stdout = self._fakeout
-
-        # Patch pdb.set_trace to restore sys.stdout during interactive
-        # debugging (so it's not still redirected to self._fakeout).
-        # Note that the interactive output will go to *our*
-        # save_stdout, even if that's not the real sys.stdout; this
-        # allows us to write test cases for the set_trace behavior.
-        save_set_trace = pdb.set_trace
-        self.debugger = _OutputRedirectingPdb(save_stdout)
-        self.debugger.reset()
-        pdb.set_trace = self.debugger.set_trace
-
-        # Patch linecache.getlines, so we can see the example's source
-        # when we're inside the debugger.
-        self.save_linecache_getlines = linecache.getlines
-        linecache.getlines = self.__patched_linecache_getlines
-
-        try:
-            return self.__run(test, compileflags, out)
-        finally:
-            sys.stdout = save_stdout
-            pdb.set_trace = save_set_trace
-            linecache.getlines = self.save_linecache_getlines
-            if clear_globs:
-                test.globs.clear()
-
-    #/////////////////////////////////////////////////////////////////
-    # Summarization
-    #/////////////////////////////////////////////////////////////////
-    def summarize(self, verbose=None):
-        """
-        Print a summary of all the test cases that have been run by
-        this DocTestRunner, and return a tuple `(f, t)`, where `f` is
-        the total number of failed examples, and `t` is the total
-        number of tried examples.
-
-        The optional `verbose` argument controls how detailed the
-        summary is.  If the verbosity is not specified, then the
-        DocTestRunner's verbosity is used.
-        """
-        if verbose is None:
-            verbose = self._verbose
-        notests = []
-        passed = []
-        failed = []
-        totalt = totalf = 0
-        for x in self._name2ft.items():
-            name, (f, t) = x
-            assert f <= t
-            totalt += t
-            totalf += f
-            if t == 0:
-                notests.append(name)
-            elif f == 0:
-                passed.append( (name, t) )
-            else:
-                failed.append(x)
-        if verbose:
-            if notests:
-                print(len(notests), "items had no tests:")
-                notests.sort()
-                for thing in notests:
-                    print("   ", thing)
-            if passed:
-                print(len(passed), "items passed all tests:")
-                passed.sort()
-                for thing, count in passed:
-                    print(" %3d tests in %s" % (count, thing))
-        if failed:
-            print(self.DIVIDER)
-            print(len(failed), "items had failures:")
-            failed.sort()
-            for thing, (f, t) in failed:
-                print(" %3d of %3d in %s" % (f, t, thing))
-        if verbose:
-            print(totalt, "tests in", len(self._name2ft), "items.")
-            print(totalt - totalf, "passed and", totalf, "failed.")
-        if totalf:
-            print("***Test Failed***", totalf, "failures.")
-        elif verbose:
-            print("Test passed.")
-        return totalf, totalt
-
-    #/////////////////////////////////////////////////////////////////
-    # Backward compatibility cruft to maintain doctest.master.
-    #/////////////////////////////////////////////////////////////////
-    def merge(self, other):
-        d = self._name2ft
-        for name, (f, t) in other._name2ft.items():
-            if name in d:
-                print("*** DocTestRunner.merge: '" + name + "' in both" \
-                    " testers; summing outcomes.")
-                f2, t2 = d[name]
-                f = f + f2
-                t = t + t2
-            d[name] = f, t
-
-class OutputChecker:
-    """
-    A class used to check the whether the actual output from a doctest
-    example matches the expected output.  `OutputChecker` defines two
-    methods: `check_output`, which compares a given pair of outputs,
-    and returns true if they match; and `output_difference`, which
-    returns a string describing the differences between two outputs.
-    """
-    def check_output(self, want, got, optionflags):
-        """
-        Return True iff the actual output from an example (`got`)
-        matches the expected output (`want`).  These strings are
-        always considered to match if they are identical; but
-        depending on what option flags the test runner is using,
-        several non-exact match types are also possible.  See the
-        documentation for `TestRunner` for more information about
-        option flags.
-        """
-        # Handle the common case first, for efficiency:
-        # if they're string-identical, always return true.
-        if got == want:
-            return True
-
-        # The values True and False replaced 1 and 0 as the return
-        # value for boolean comparisons in Python 2.3.
-        if not (optionflags & DONT_ACCEPT_TRUE_FOR_1):
-            if (got,want) == ("True\n", "1\n"):
-                return True
-            if (got,want) == ("False\n", "0\n"):
-                return True
-
-        # <BLANKLINE> can be used as a special sequence to signify a
-        # blank line, unless the DONT_ACCEPT_BLANKLINE flag is used.
-        if not (optionflags & DONT_ACCEPT_BLANKLINE):
-            # Replace <BLANKLINE> in want with a blank line.
-            want = re.sub('(?m)^%s\s*?$' % re.escape(BLANKLINE_MARKER),
-                          '', want)
-            # If a line in got contains only spaces, then remove the
-            # spaces.
-            got = re.sub('(?m)^\s*?$', '', got)
-            if got == want:
-                return True
-
-        # This flag causes doctest to ignore any differences in the
-        # contents of whitespace strings.  Note that this can be used
-        # in conjunction with the ELLIPSIS flag.
-        if optionflags & NORMALIZE_WHITESPACE:
-            got = ' '.join(got.split())
-            want = ' '.join(want.split())
-            if got == want:
-                return True
-
-        # The ELLIPSIS flag says to let the sequence "..." in `want`
-        # match any substring in `got`.
-        if optionflags & ELLIPSIS:
-            if _ellipsis_match(want, got):
-                return True
-
-        # We didn't find any match; return false.
-        return False
-
-    # Should we do a fancy diff?
-    def _do_a_fancy_diff(self, want, got, optionflags):
-        # Not unless they asked for a fancy diff.
-        if not optionflags & (REPORT_UDIFF |
-                              REPORT_CDIFF |
-                              REPORT_NDIFF):
-            return False
-
-        # If expected output uses ellipsis, a meaningful fancy diff is
-        # too hard ... or maybe not.  In two real-life failures Tim saw,
-        # a diff was a major help anyway, so this is commented out.
-        # [todo] _ellipsis_match() knows which pieces do and don't match,
-        # and could be the basis for a kick-ass diff in this case.
-        ##if optionflags & ELLIPSIS and ELLIPSIS_MARKER in want:
-        ##    return False
-
-        # ndiff does intraline difference marking, so can be useful even
-        # for 1-line differences.
-        if optionflags & REPORT_NDIFF:
-            return True
-
-        # The other diff types need at least a few lines to be helpful.
-        return want.count('\n') > 2 and got.count('\n') > 2
-
-    def output_difference(self, example, got, optionflags):
-        """
-        Return a string describing the differences between the
-        expected output for a given example (`example`) and the actual
-        output (`got`).  `optionflags` is the set of option flags used
-        to compare `want` and `got`.
-        """
-        want = example.want
-        # If <BLANKLINE>s are being used, then replace blank lines
-        # with <BLANKLINE> in the actual output string.
-        if not (optionflags & DONT_ACCEPT_BLANKLINE):
-            got = re.sub('(?m)^[ ]*(?=\n)', BLANKLINE_MARKER, got)
-
-        # Check if we should use diff.
-        if self._do_a_fancy_diff(want, got, optionflags):
-            # Split want & got into lines.
-            want_lines = want.splitlines(True)  # True == keep line ends
-            got_lines = got.splitlines(True)
-            # Use difflib to find their differences.
-            if optionflags & REPORT_UDIFF:
-                diff = difflib.unified_diff(want_lines, got_lines, n=2)
-                diff = list(diff)[2:] # strip the diff header
-                kind = 'unified diff with -expected +actual'
-            elif optionflags & REPORT_CDIFF:
-                diff = difflib.context_diff(want_lines, got_lines, n=2)
-                diff = list(diff)[2:] # strip the diff header
-                kind = 'context diff with expected followed by actual'
-            elif optionflags & REPORT_NDIFF:
-                engine = difflib.Differ(charjunk=difflib.IS_CHARACTER_JUNK)
-                diff = list(engine.compare(want_lines, got_lines))
-                kind = 'ndiff with -expected +actual'
-            else:
-                assert 0, 'Bad diff option'
-            # Remove trailing whitespace on diff output.
-            diff = [line.rstrip() + '\n' for line in diff]
-            return 'Differences (%s):\n' % kind + _indent(''.join(diff))
-
-        # If we're not using diff, then simply list the expected
-        # output followed by the actual output.
-        if want and got:
-            return 'Expected:\n%sGot:\n%s' % (_indent(want), _indent(got))
-        elif want:
-            return 'Expected:\n%sGot nothing\n' % _indent(want)
-        elif got:
-            return 'Expected nothing\nGot:\n%s' % _indent(got)
-        else:
-            return 'Expected nothing\nGot nothing\n'
-
-class DocTestFailure(Exception):
-    """A DocTest example has failed in debugging mode.
-
-    The exception instance has variables:
-
-    - test: the DocTest object being run
-
-    - excample: the Example object that failed
-
-    - got: the actual output
-    """
-    def __init__(self, test, example, got):
-        self.test = test
-        self.example = example
-        self.got = got
-
-    def __str__(self):
-        return str(self.test)
-
-class UnexpectedException(Exception):
-    """A DocTest example has encountered an unexpected exception
-
-    The exception instance has variables:
-
-    - test: the DocTest object being run
-
-    - excample: the Example object that failed
-
-    - exc_info: the exception info
-    """
-    def __init__(self, test, example, exc_info):
-        self.test = test
-        self.example = example
-        self.exc_info = exc_info
-
-    def __str__(self):
-        return str(self.test)
-
-class DebugRunner(DocTestRunner):
-    r"""Run doc tests but raise an exception as soon as there is a failure.
-
-       If an unexpected exception occurs, an UnexpectedException is raised.
-       It contains the test, the example, and the original exception:
-
-         >>> runner = DebugRunner(verbose=False)
-         >>> test = DocTestParser().get_doctest('>>> raise KeyError\n42',
-         ...                                    {}, 'foo', 'foo.py', 0)
-         >>> try:
-         ...     runner.run(test)
-         ... except UnexpectedException, failure:
-         ...     pass
-
-         >>> failure.test is test
-         True
-
-         >>> failure.example.want
-         '42\n'
-
-         >>> exc_info = failure.exc_info
-         >>> raise exc_info[0], exc_info[1], exc_info[2]
-         Traceback (most recent call last):
-         ...
-         KeyError
-
-       We wrap the original exception to give the calling application
-       access to the test and example information.
-
-       If the output doesn't match, then a DocTestFailure is raised:
-
-         >>> test = DocTestParser().get_doctest('''
-         ...      >>> x = 1
-         ...      >>> x
-         ...      2
-         ...      ''', {}, 'foo', 'foo.py', 0)
-
-         >>> try:
-         ...    runner.run(test)
-         ... except DocTestFailure, failure:
-         ...    pass
-
-       DocTestFailure objects provide access to the test:
-
-         >>> failure.test is test
-         True
-
-       As well as to the example:
-
-         >>> failure.example.want
-         '2\n'
-
-       and the actual output:
-
-         >>> failure.got
-         '1\n'
-
-       If a failure or error occurs, the globals are left intact:
-
-         >>> del test.globs['__builtins__']
-         >>> test.globs
-         {'x': 1}
-
-         >>> test = DocTestParser().get_doctest('''
-         ...      >>> x = 2
-         ...      >>> raise KeyError
-         ...      ''', {}, 'foo', 'foo.py', 0)
-
-         >>> runner.run(test)
-         Traceback (most recent call last):
-         ...
-         UnexpectedException: <DocTest foo from foo.py:0 (2 examples)>
-
-         >>> del test.globs['__builtins__']
-         >>> test.globs
-         {'x': 2}
-
-       But the globals are cleared if there is no error:
-
-         >>> test = DocTestParser().get_doctest('''
-         ...      >>> x = 2
-         ...      ''', {}, 'foo', 'foo.py', 0)
-
-         >>> runner.run(test)
-         (0, 1)
-
-         >>> test.globs
-         {}
-
-       """
-
-    def run(self, test, compileflags=None, out=None, clear_globs=True):
-        r = DocTestRunner.run(self, test, compileflags, out, False)
-        if clear_globs:
-            test.globs.clear()
-        return r
-
-    def report_unexpected_exception(self, out, test, example, exc_info):
-        raise UnexpectedException(test, example, exc_info)
-
-    def report_failure(self, out, test, example, got):
-        raise DocTestFailure(test, example, got)
-
-######################################################################
-## 6. Test Functions
-######################################################################
-# These should be backwards compatible.
-
-# For backward compatibility, a global instance of a DocTestRunner
-# class, updated by testmod.
-master = None
-
-def testmod(m=None, name=None, globs=None, verbose=None, isprivate=None,
-            report=True, optionflags=0, extraglobs=None,
-            raise_on_error=False, exclude_empty=False):
-    """m=None, name=None, globs=None, verbose=None, isprivate=None,
-       report=True, optionflags=0, extraglobs=None, raise_on_error=False,
-       exclude_empty=False
-
-    Test examples in docstrings in functions and classes reachable
-    from module m (or the current module if m is not supplied), starting
-    with m.__doc__.  Unless isprivate is specified, private names
-    are not skipped.
-
-    Also test examples reachable from dict m.__test__ if it exists and is
-    not None.  m.__test__ maps names to functions, classes and strings;
-    function and class docstrings are tested even if the name is private;
-    strings are tested directly, as if they were docstrings.
-
-    Return (#failures, #tests).
-
-    See doctest.__doc__ for an overview.
-
-    Optional keyword arg "name" gives the name of the module; by default
-    use m.__name__.
-
-    Optional keyword arg "globs" gives a dict to be used as the globals
-    when executing examples; by default, use m.__dict__.  A copy of this
-    dict is actually used for each docstring, so that each docstring's
-    examples start with a clean slate.
-
-    Optional keyword arg "extraglobs" gives a dictionary that should be
-    merged into the globals that are used to execute examples.  By
-    default, no extra globals are used.  This is new in 2.4.
-
-    Optional keyword arg "verbose" prints lots of stuff if true, prints
-    only failures if false; by default, it's true iff "-v" is in sys.argv.
-
-    Optional keyword arg "report" prints a summary at the end when true,
-    else prints nothing at the end.  In verbose mode, the summary is
-    detailed, else very brief (in fact, empty if all tests passed).
-
-    Optional keyword arg "optionflags" or's together module constants,
-    and defaults to 0.  This is new in 2.3.  Possible values (see the
-    docs for details):
-
-        DONT_ACCEPT_TRUE_FOR_1
-        DONT_ACCEPT_BLANKLINE
-        NORMALIZE_WHITESPACE
-        ELLIPSIS
-        IGNORE_EXCEPTION_DETAIL
-        REPORT_UDIFF
-        REPORT_CDIFF
-        REPORT_NDIFF
-        REPORT_ONLY_FIRST_FAILURE
-
-    Optional keyword arg "raise_on_error" raises an exception on the
-    first unexpected exception or failure. This allows failures to be
-    post-mortem debugged.
-
-    Deprecated in Python 2.4:
-    Optional keyword arg "isprivate" specifies a function used to
-    determine whether a name is private.  The default function is
-    treat all functions as public.  Optionally, "isprivate" can be
-    set to doctest.is_private to skip over functions marked as private
-    using the underscore naming convention; see its docs for details.
-
-    Advanced tomfoolery:  testmod runs methods of a local instance of
-    class doctest.Tester, then merges the results into (or creates)
-    global Tester instance doctest.master.  Methods of doctest.master
-    can be called directly too, if you want to do something unusual.
-    Passing report=0 to testmod is especially useful then, to delay
-    displaying a summary.  Invoke doctest.master.summarize(verbose)
-    when you're done fiddling.
-    """
-    global master
-
-    if isprivate is not None:
-        warnings.warn("the isprivate argument is deprecated; "
-                      "examine DocTestFinder.find() lists instead",
-                      DeprecationWarning)
-
-    # If no module was given, then use __main__.
-    if m is None:
-        # DWA - m will still be None if this wasn't invoked from the command
-        # line, in which case the following TypeError is about as good an error
-        # as we should expect
-        m = sys.modules.get('__main__')
-
-    # Check that we were actually given a module.
-    if not inspect.ismodule(m):
-        raise TypeError("testmod: module required; %r" % (m,))
-
-    # If no name was given, then use the module's name.
-    if name is None:
-        name = m.__name__
-
-    # Find, parse, and run all tests in the given module.
-    finder = DocTestFinder(_namefilter=isprivate, exclude_empty=exclude_empty)
-
-    if raise_on_error:
-        runner = DebugRunner(verbose=verbose, optionflags=optionflags)
-    else:
-        runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
-
-    for test in finder.find(m, name, globs=globs, extraglobs=extraglobs):
-        runner.run(test)
-
-    if report:
-        runner.summarize()
-
-    if master is None:
-        master = runner
-    else:
-        master.merge(runner)
-
-    return runner.failures, runner.tries
-
-def testfile(filename, module_relative=True, name=None, package=None,
-             globs=None, verbose=None, report=True, optionflags=0,
-             extraglobs=None, raise_on_error=False, parser=DocTestParser()):
-    """
-    Test examples in the given file.  Return (#failures, #tests).
-
-    Optional keyword arg "module_relative" specifies how filenames
-    should be interpreted:
-
-      - If "module_relative" is True (the default), then "filename"
-         specifies a module-relative path.  By default, this path is
-         relative to the calling module's directory; but if the
-         "package" argument is specified, then it is relative to that
-         package.  To ensure os-independence, "filename" should use
-         "/" characters to separate path segments, and should not
-         be an absolute path (i.e., it may not begin with "/").
-
-      - If "module_relative" is False, then "filename" specifies an
-        os-specific path.  The path may be absolute or relative (to
-        the current working directory).
-
-    Optional keyword arg "name" gives the name of the test; by default
-    use the file's basename.
-
-    Optional keyword argument "package" is a Python package or the
-    name of a Python package whose directory should be used as the
-    base directory for a module relative filename.  If no package is
-    specified, then the calling module's directory is used as the base
-    directory for module relative filenames.  It is an error to
-    specify "package" if "module_relative" is False.
-
-    Optional keyword arg "globs" gives a dict to be used as the globals
-    when executing examples; by default, use {}.  A copy of this dict
-    is actually used for each docstring, so that each docstring's
-    examples start with a clean slate.
-
-    Optional keyword arg "extraglobs" gives a dictionary that should be
-    merged into the globals that are used to execute examples.  By
-    default, no extra globals are used.
-
-    Optional keyword arg "verbose" prints lots of stuff if true, prints
-    only failures if false; by default, it's true iff "-v" is in sys.argv.
-
-    Optional keyword arg "report" prints a summary at the end when true,
-    else prints nothing at the end.  In verbose mode, the summary is
-    detailed, else very brief (in fact, empty if all tests passed).
-
-    Optional keyword arg "optionflags" or's together module constants,
-    and defaults to 0.  Possible values (see the docs for details):
-
-        DONT_ACCEPT_TRUE_FOR_1
-        DONT_ACCEPT_BLANKLINE
-        NORMALIZE_WHITESPACE
-        ELLIPSIS
-        IGNORE_EXCEPTION_DETAIL
-        REPORT_UDIFF
-        REPORT_CDIFF
-        REPORT_NDIFF
-        REPORT_ONLY_FIRST_FAILURE
-
-    Optional keyword arg "raise_on_error" raises an exception on the
-    first unexpected exception or failure. This allows failures to be
-    post-mortem debugged.
-
-    Optional keyword arg "parser" specifies a DocTestParser (or
-    subclass) that should be used to extract tests from the files.
-
-    Advanced tomfoolery:  testmod runs methods of a local instance of
-    class doctest.Tester, then merges the results into (or creates)
-    global Tester instance doctest.master.  Methods of doctest.master
-    can be called directly too, if you want to do something unusual.
-    Passing report=0 to testmod is especially useful then, to delay
-    displaying a summary.  Invoke doctest.master.summarize(verbose)
-    when you're done fiddling.
-    """
-    global master
-
-    if package and not module_relative:
-        raise ValueError("Package may only be specified for module-"
-                         "relative paths.")
-
-    # Relativize the path
-    if module_relative:
-        package = _normalize_module(package)
-        filename = _module_relative_path(package, filename)
-
-    # If no name was given, then use the file's name.
-    if name is None:
-        name = os.path.basename(filename)
-
-    # Assemble the globals.
-    if globs is None:
-        globs = {}
-    else:
-        globs = globs.copy()
-    if extraglobs is not None:
-        globs.update(extraglobs)
-
-    if raise_on_error:
-        runner = DebugRunner(verbose=verbose, optionflags=optionflags)
-    else:
-        runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
-
-    # Read the file, convert it to a test, and run it.
-    f = open(filename)
-    s = f.read()
-    f.close()
-    test = parser.get_doctest(s, globs, name, filename, 0)
-    runner.run(test)
-
-    if report:
-        runner.summarize()
-
-    if master is None:
-        master = runner
-    else:
-        master.merge(runner)
-
-    return runner.failures, runner.tries
-
-def run_docstring_examples(f, globs, verbose=False, name="NoName",
-                           compileflags=None, optionflags=0):
-    """
-    Test examples in the given object's docstring (`f`), using `globs`
-    as globals.  Optional argument `name` is used in failure messages.
-    If the optional argument `verbose` is true, then generate output
-    even if there are no failures.
-
-    `compileflags` gives the set of flags that should be used by the
-    Python compiler when running the examples.  If not specified, then
-    it will default to the set of future-import flags that apply to
-    `globs`.
-
-    Optional keyword arg `optionflags` specifies options for the
-    testing and output.  See the documentation for `testmod` for more
-    information.
-    """
-    # Find, parse, and run all tests in the given module.
-    finder = DocTestFinder(verbose=verbose, recurse=False)
-    runner = DocTestRunner(verbose=verbose, optionflags=optionflags)
-    for test in finder.find(f, name, globs=globs):
-        runner.run(test, compileflags=compileflags)
-
-######################################################################
-## 7. Tester
-######################################################################
-# This is provided only for backwards compatibility.  It's not
-# actually used in any way.
-
-class Tester:
-    def __init__(self, mod=None, globs=None, verbose=None,
-                 isprivate=None, optionflags=0):
-
-        warnings.warn("class Tester is deprecated; "
-                      "use class doctest.DocTestRunner instead",
-                      DeprecationWarning, stacklevel=2)
-        if mod is None and globs is None:
-            raise TypeError("Tester.__init__: must specify mod or globs")
-        if mod is not None and not inspect.ismodule(mod):
-            raise TypeError("Tester.__init__: mod must be a module; %r" %
-                            (mod,))
-        if globs is None:
-            globs = mod.__dict__
-        self.globs = globs
-
-        self.verbose = verbose
-        self.isprivate = isprivate
-        self.optionflags = optionflags
-        self.testfinder = DocTestFinder(_namefilter=isprivate)
-        self.testrunner = DocTestRunner(verbose=verbose,
-                                        optionflags=optionflags)
-
-    def runstring(self, s, name):
-        test = DocTestParser().get_doctest(s, self.globs, name, None, None)
-        if self.verbose:
-            print("Running string", name)
-        (f,t) = self.testrunner.run(test)
-        if self.verbose:
-            print(f, "of", t, "examples failed in string", name)
-        return (f,t)
-
-    def rundoc(self, object, name=None, module=None):
-        f = t = 0
-        tests = self.testfinder.find(object, name, module=module,
-                                     globs=self.globs)
-        for test in tests:
-            (f2, t2) = self.testrunner.run(test)
-            (f,t) = (f+f2, t+t2)
-        return (f,t)
-
-    def rundict(self, d, name, module=None):
-        import types
-        m = types.ModuleType(name)
-        m.__dict__.update(d)
-        if module is None:
-            module = False
-        return self.rundoc(m, name, module)
-
-    def run__test__(self, d, name):
-        import types
-        m = types.ModuleType(name)
-        m.__test__ = d
-        return self.rundoc(m, name)
-
-    def summarize(self, verbose=None):
-        return self.testrunner.summarize(verbose)
-
-    def merge(self, other):
-        self.testrunner.merge(other.testrunner)
-
-######################################################################
-## 8. Unittest Support
-######################################################################
-
-_unittest_reportflags = 0
-
-def set_unittest_reportflags(flags):
-    """Sets the unittest option flags.
-
-    The old flag is returned so that a runner could restore the old
-    value if it wished to:
-
-      >>> old = _unittest_reportflags
-      >>> set_unittest_reportflags(REPORT_NDIFF |
-      ...                          REPORT_ONLY_FIRST_FAILURE) == old
-      True
-
-      >>> import doctest
-      >>> doctest._unittest_reportflags == (REPORT_NDIFF |
-      ...                                   REPORT_ONLY_FIRST_FAILURE)
-      True
-
-    Only reporting flags can be set:
-
-      >>> set_unittest_reportflags(ELLIPSIS)
-      Traceback (most recent call last):
-      ...
-      ValueError: ('Only reporting flags allowed', 8)
-
-      >>> set_unittest_reportflags(old) == (REPORT_NDIFF |
-      ...                                   REPORT_ONLY_FIRST_FAILURE)
-      True
-    """
-    global _unittest_reportflags
-
-    if (flags & REPORTING_FLAGS) != flags:
-        raise ValueError("Only reporting flags allowed", flags)
-    old = _unittest_reportflags
-    _unittest_reportflags = flags
-    return old
-
-
-class DocTestCase(unittest.TestCase):
-
-    def __init__(self, test, optionflags=0, setUp=None, tearDown=None,
-                 checker=None):
-
-        unittest.TestCase.__init__(self)
-        self._dt_optionflags = optionflags
-        self._dt_checker = checker
-        self._dt_test = test
-        self._dt_setUp = setUp
-        self._dt_tearDown = tearDown
-
-    def setUp(self):
-        test = self._dt_test
-
-        if self._dt_setUp is not None:
-            self._dt_setUp(test)
-
-    def tearDown(self):
-        test = self._dt_test
-
-        if self._dt_tearDown is not None:
-            self._dt_tearDown(test)
-
-        test.globs.clear()
-
-    def runTest(self):
-        test = self._dt_test
-        old = sys.stdout
-        new = StringIO()
-        optionflags = self._dt_optionflags
-
-        if not (optionflags & REPORTING_FLAGS):
-            # The option flags don't include any reporting flags,
-            # so add the default reporting flags
-            optionflags |= _unittest_reportflags
-
-        runner = DocTestRunner(optionflags=optionflags,
-                               checker=self._dt_checker, verbose=False)
-
-        try:
-            runner.DIVIDER = "-"*70
-            failures, tries = runner.run(
-                test, out=new.write, clear_globs=False)
-        finally:
-            sys.stdout = old
-
-        if failures:
-            raise self.failureException(self.format_failure(new.getvalue()))
-
-    def format_failure(self, err):
-        test = self._dt_test
-        if test.lineno is None:
-            lineno = 'unknown line number'
-        else:
-            lineno = '%s' % test.lineno
-        lname = '.'.join(test.name.split('.')[-1:])
-        return ('Failed doctest test for %s\n'
-                '  File "%s", line %s, in %s\n\n%s'
-                % (test.name, test.filename, lineno, lname, err)
-                )
-
-    def debug(self):
-        r"""Run the test case without results and without catching exceptions
-
-           The unit test framework includes a debug method on test cases
-           and test suites to support post-mortem debugging.  The test code
-           is run in such a way that errors are not caught.  This way a
-           caller can catch the errors and initiate post-mortem debugging.
-
-           The DocTestCase provides a debug method that raises
-           UnexpectedException errors if there is an unexepcted
-           exception:
-
-             >>> test = DocTestParser().get_doctest('>>> raise KeyError\n42',
-             ...                {}, 'foo', 'foo.py', 0)
-             >>> case = DocTestCase(test)
-             >>> try:
-             ...     case.debug()
-             ... except UnexpectedException, failure:
-             ...     pass
-
-           The UnexpectedException contains the test, the example, and
-           the original exception:
-
-             >>> failure.test is test
-             True
-
-             >>> failure.example.want
-             '42\n'
-
-             >>> exc_info = failure.exc_info
-             >>> raise exc_info[0], exc_info[1], exc_info[2]
-             Traceback (most recent call last):
-             ...
-             KeyError
-
-           If the output doesn't match, then a DocTestFailure is raised:
-
-             >>> test = DocTestParser().get_doctest('''
-             ...      >>> x = 1
-             ...      >>> x
-             ...      2
-             ...      ''', {}, 'foo', 'foo.py', 0)
-             >>> case = DocTestCase(test)
-
-             >>> try:
-             ...    case.debug()
-             ... except DocTestFailure, failure:
-             ...    pass
-
-           DocTestFailure objects provide access to the test:
-
-             >>> failure.test is test
-             True
-
-           As well as to the example:
-
-             >>> failure.example.want
-             '2\n'
-
-           and the actual output:
-
-             >>> failure.got
-             '1\n'
-
-           """
-
-        self.setUp()
-        runner = DebugRunner(optionflags=self._dt_optionflags,
-                             checker=self._dt_checker, verbose=False)
-        runner.run(self._dt_test)
-        self.tearDown()
-
-    def id(self):
-        return self._dt_test.name
-
-    def __repr__(self):
-        name = self._dt_test.name.split('.')
-        return "%s (%s)" % (name[-1], '.'.join(name[:-1]))
-
-    __str__ = __repr__
-
-    def shortDescription(self):
-        return "Doctest: " + self._dt_test.name
-
-def DocTestSuite(module=None, globs=None, extraglobs=None, test_finder=None,
-                 **options):
-    """
-    Convert doctest tests for a module to a unittest test suite.
-
-    This converts each documentation string in a module that
-    contains doctest tests to a unittest test case.  If any of the
-    tests in a doc string fail, then the test case fails.  An exception
-    is raised showing the name of the file containing the test and a
-    (sometimes approximate) line number.
-
-    The `module` argument provides the module to be tested.  The argument
-    can be either a module or a module name.
-
-    If no argument is given, the calling module is used.
-
-    A number of options may be provided as keyword arguments:
-
-    setUp
-      A set-up function.  This is called before running the
-      tests in each file. The setUp function will be passed a DocTest
-      object.  The setUp function can access the test globals as the
-      globs attribute of the test passed.
-
-    tearDown
-      A tear-down function.  This is called after running the
-      tests in each file.  The tearDown function will be passed a DocTest
-      object.  The tearDown function can access the test globals as the
-      globs attribute of the test passed.
-
-    globs
-      A dictionary containing initial global variables for the tests.
-
-    optionflags
-       A set of doctest option flags expressed as an integer.
-    """
-
-    if test_finder is None:
-        test_finder = DocTestFinder()
-
-    module = _normalize_module(module)
-    tests = test_finder.find(module, globs=globs, extraglobs=extraglobs)
-    if globs is None:
-        globs = module.__dict__
-    if not tests:
-        # Why do we want to do this? Because it reveals a bug that might
-        # otherwise be hidden.
-        raise ValueError(module, "has no tests")
-
-    tests.sort()
-    suite = unittest.TestSuite()
-    for test in tests:
-        if len(test.examples) == 0:
-            continue
-        if not test.filename:
-            filename = module.__file__
-            if filename[-4:] in (".pyc", ".pyo"):
-                filename = filename[:-1]
-            test.filename = filename
-        suite.addTest(DocTestCase(test, **options))
-
-    return suite
-
-class DocFileCase(DocTestCase):
-
-    def id(self):
-        return '_'.join(self._dt_test.name.split('.'))
-
-    def __repr__(self):
-        return self._dt_test.filename
-    __str__ = __repr__
-
-    def format_failure(self, err):
-        return ('Failed doctest test for %s\n  File "%s", line 0\n\n%s'
-                % (self._dt_test.name, self._dt_test.filename, err)
-                )
-
-def DocFileTest(path, module_relative=True, package=None,
-                globs=None, parser=DocTestParser(), **options):
-    if globs is None:
-        globs = {}
-
-    if package and not module_relative:
-        raise ValueError("Package may only be specified for module-"
-                         "relative paths.")
-
-    # Relativize the path.
-    if module_relative:
-        package = _normalize_module(package)
-        path = _module_relative_path(package, path)
-
-    # Find the file and read it.
-    name = os.path.basename(path)
-    f = open(path)
-    doc = f.read()
-    f.close()
-
-    # Convert it to a test, and wrap it in a DocFileCase.
-    test = parser.get_doctest(doc, globs, name, path, 0)
-    return DocFileCase(test, **options)
-
-def DocFileSuite(*paths, **kw):
-    """A unittest suite for one or more doctest files.
-
-    The path to each doctest file is given as a string; the
-    interpretation of that string depends on the keyword argument
-    "module_relative".
-
-    A number of options may be provided as keyword arguments:
-
-    module_relative
-      If "module_relative" is True, then the given file paths are
-      interpreted as os-independent module-relative paths.  By
-      default, these paths are relative to the calling module's
-      directory; but if the "package" argument is specified, then
-      they are relative to that package.  To ensure os-independence,
-      "filename" should use "/" characters to separate path
-      segments, and may not be an absolute path (i.e., it may not
-      begin with "/").
-
-      If "module_relative" is False, then the given file paths are
-      interpreted as os-specific paths.  These paths may be absolute
-      or relative (to the current working directory).
-
-    package
-      A Python package or the name of a Python package whose directory
-      should be used as the base directory for module relative paths.
-      If "package" is not specified, then the calling module's
-      directory is used as the base directory for module relative
-      filenames.  It is an error to specify "package" if
-      "module_relative" is False.
-
-    setUp
-      A set-up function.  This is called before running the
-      tests in each file. The setUp function will be passed a DocTest
-      object.  The setUp function can access the test globals as the
-      globs attribute of the test passed.
-
-    tearDown
-      A tear-down function.  This is called after running the
-      tests in each file.  The tearDown function will be passed a DocTest
-      object.  The tearDown function can access the test globals as the
-      globs attribute of the test passed.
-
-    globs
-      A dictionary containing initial global variables for the tests.
-
-    optionflags
-      A set of doctest option flags expressed as an integer.
-
-    parser
-      A DocTestParser (or subclass) that should be used to extract
-      tests from the files.
-    """
-    suite = unittest.TestSuite()
-
-    # We do this here so that _normalize_module is called at the right
-    # level.  If it were called in DocFileTest, then this function
-    # would be the caller and we might guess the package incorrectly.
-    if kw.get('module_relative', True):
-        kw['package'] = _normalize_module(kw.get('package'))
-
-    for path in paths:
-        suite.addTest(DocFileTest(path, **kw))
-
-    return suite
-
-######################################################################
-## 9. Debugging Support
-######################################################################
-
-def script_from_examples(s):
-    r"""Extract script from text with examples.
-
-       Converts text with examples to a Python script.  Example input is
-       converted to regular code.  Example output and all other words
-       are converted to comments:
-
-       >>> text = '''
-       ...       Here are examples of simple math.
-       ...
-       ...           Python has super accurate integer addition
-       ...
-       ...           >>> 2 + 2
-       ...           5
-       ...
-       ...           And very friendly error messages:
-       ...
-       ...           >>> 1/0
-       ...           To Infinity
-       ...           And
-       ...           Beyond
-       ...
-       ...           You can use logic if you want:
-       ...
-       ...           >>> if 0:
-       ...           ...    blah
-       ...           ...    blah
-       ...           ...
-       ...
-       ...           Ho hum
-       ...           '''
-
-       >>> print script_from_examples(text)
-       # Here are examples of simple math.
-       #
-       #     Python has super accurate integer addition
-       #
-       2 + 2
-       # Expected:
-       ## 5
-       #
-       #     And very friendly error messages:
-       #
-       1/0
-       # Expected:
-       ## To Infinity
-       ## And
-       ## Beyond
-       #
-       #     You can use logic if you want:
-       #
-       if 0:
-          blah
-          blah
-       #
-       #     Ho hum
-       """
-    output = []
-    for piece in DocTestParser().parse(s):
-        if isinstance(piece, Example):
-            # Add the example's source code (strip trailing NL)
-            output.append(piece.source[:-1])
-            # Add the expected output:
-            want = piece.want
-            if want:
-                output.append('# Expected:')
-                output += ['## '+l for l in want.split('\n')[:-1]]
-        else:
-            # Add non-example text.
-            output += [_comment_line(l)
-                       for l in piece.split('\n')[:-1]]
-
-    # Trim junk on both ends.
-    while output and output[-1] == '#':
-        output.pop()
-    while output and output[0] == '#':
-        output.pop(0)
-    # Combine the output, and return it.
-    return '\n'.join(output)
-
-def testsource(module, name):
-    """Extract the test sources from a doctest docstring as a script.
-
-    Provide the module (or dotted name of the module) containing the
-    test to be debugged and the name (within the module) of the object
-    with the doc string with tests to be debugged.
-    """
-    module = _normalize_module(module)
-    tests = DocTestFinder().find(module)
-    test = [t for t in tests if t.name == name]
-    if not test:
-        raise ValueError(name, "not found in tests")
-    test = test[0]
-    testsrc = script_from_examples(test.docstring)
-    return testsrc
-
-def debug_src(src, pm=False, globs=None):
-    """Debug a single doctest docstring, in argument `src`'"""
-    testsrc = script_from_examples(src)
-    debug_script(testsrc, pm, globs)
-
-def debug_script(src, pm=False, globs=None):
-    "Debug a test script.  `src` is the script, as a string."
-    import pdb
-
-    # Note that tempfile.NameTemporaryFile() cannot be used.  As the
-    # docs say, a file so created cannot be opened by name a second time
-    # on modern Windows boxes, and execfile() needs to open it.
-    srcfilename = tempfile.mktemp(".py", "doctestdebug")
-    f = open(srcfilename, 'w')
-    f.write(src)
-    f.close()
-
-    try:
-        if globs:
-            globs = globs.copy()
-        else:
-            globs = {}
-
-        if pm:
-            try:
-                sandbox._execfile(srcfilename, globs)
-            except:
-                print(sys.exc_info()[1])
-                pdb.post_mortem(sys.exc_info()[2])
-        else:
-            # Note that %r is vital here.  '%s' instead can, e.g., cause
-            # backslashes to get treated as metacharacters on Windows.
-            cmd = "sandbox._execfile(%r, globals())" % srcfilename
-            pdb.run(cmd, globs, globs)
-
-    finally:
-        os.remove(srcfilename)
-
-def debug(module, name, pm=False):
-    """Debug a single doctest docstring.
-
-    Provide the module (or dotted name of the module) containing the
-    test to be debugged and the name (within the module) of the object
-    with the docstring with tests to be debugged.
-    """
-    module = _normalize_module(module)
-    testsrc = testsource(module, name)
-    debug_script(testsrc, pm, module.__dict__)
-
-######################################################################
-## 10. Example Usage
-######################################################################
-class _TestClass:
-    """
-    A pointless class, for sanity-checking of docstring testing.
-
-    Methods:
-        square()
-        get()
-
-    >>> _TestClass(13).get() + _TestClass(-12).get()
-    1
-    >>> hex(_TestClass(13).square().get())
-    '0xa9'
-    """
-
-    def __init__(self, val):
-        """val -> _TestClass object with associated value val.
-
-        >>> t = _TestClass(123)
-        >>> print t.get()
-        123
-        """
-
-        self.val = val
-
-    def square(self):
-        """square() -> square TestClass's associated value
-
-        >>> _TestClass(13).square().get()
-        169
-        """
-
-        self.val = self.val ** 2
-        return self
-
-    def get(self):
-        """get() -> return TestClass's associated value.
-
-        >>> x = _TestClass(-42)
-        >>> print x.get()
-        -42
-        """
-
-        return self.val
-
-__test__ = {"_TestClass": _TestClass,
-            "string": r"""
-                      Example of a string object, searched as-is.
-                      >>> x = 1; y = 2
-                      >>> x + y, x * y
-                      (3, 2)
-                      """,
-
-            "bool-int equivalence": r"""
-                                    In 2.2, boolean expressions displayed
-                                    0 or 1.  By default, we still accept
-                                    them.  This can be disabled by passing
-                                    DONT_ACCEPT_TRUE_FOR_1 to the new
-                                    optionflags argument.
-                                    >>> 4 == 4
-                                    1
-                                    >>> 4 == 4
-                                    True
-                                    >>> 4 > 4
-                                    0
-                                    >>> 4 > 4
-                                    False
-                                    """,
-
-            "blank lines": r"""
-                Blank lines can be marked with <BLANKLINE>:
-                    >>> print 'foo\n\nbar\n'
-                    foo
-                    <BLANKLINE>
-                    bar
-                    <BLANKLINE>
-            """,
-
-            "ellipsis": r"""
-                If the ellipsis flag is used, then '...' can be used to
-                elide substrings in the desired output:
-                    >>> print range(1000) #doctest: +ELLIPSIS
-                    [0, 1, 2, ..., 999]
-            """,
-
-            "whitespace normalization": r"""
-                If the whitespace normalization flag is used, then
-                differences in whitespace are ignored.
-                    >>> print range(30) #doctest: +NORMALIZE_WHITESPACE
-                    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-                     15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-                     27, 28, 29]
-            """,
-           }
-
-def _test():
-    r = unittest.TextTestRunner()
-    r.run(DocTestSuite())
-
-if __name__ == "__main__":
-    _test()
-

From 453afbe0de8c620fd487185aea74139aa6881a7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 20:58:13 -0400
Subject: [PATCH 4262/8469] Regenerate egg_info

--HG--
branch : feature/issue-229
extra : rebase_source : 0a5b822d4e140229760b7f1b4e7ef29b45e6fb2f
---
 setuptools.egg-info/requires.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fa66c7141..8ed3058afe 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,3 +1,4 @@
+six>=1.5
 
 [certs]
 certifi==1.0.1

From 73938137bcf0c82fda4f5f3533a162abe693e331 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 20:59:44 -0400
Subject: [PATCH 4263/8469] Remove compat module

--HG--
branch : feature/issue-229
extra : rebase_source : 3b189d29653b1e8026f92d0c5e43c6e0bfd3bfcd
---
 setuptools/compat.py | 66 --------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 setuptools/compat.py

diff --git a/setuptools/compat.py b/setuptools/compat.py
deleted file mode 100644
index 73e6e4aa7e..0000000000
--- a/setuptools/compat.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import sys
-import itertools
-
-PY3 = sys.version_info >= (3,)
-PY2 = not PY3
-
-if PY2:
-    basestring = basestring
-    import __builtin__ as builtins
-    import ConfigParser
-    from StringIO import StringIO
-    BytesIO = StringIO
-    func_code = lambda o: o.func_code
-    func_globals = lambda o: o.func_globals
-    im_func = lambda o: o.im_func
-    from htmlentitydefs import name2codepoint
-    import httplib
-    from BaseHTTPServer import HTTPServer
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
-    from BaseHTTPServer import BaseHTTPRequestHandler
-    iteritems = lambda o: o.iteritems()
-    long_type = long
-    maxsize = sys.maxint
-    unichr = unichr
-    unicode = unicode
-    bytes = str
-    from urllib import url2pathname, splittag, pathname2url
-    import urllib2
-    from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
-    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
-    filterfalse = itertools.ifilterfalse
-
-    exec("""def reraise(tp, value, tb=None):
-    raise tp, value, tb""")
-
-if PY3:
-    basestring = str
-    import builtins
-    import configparser as ConfigParser
-    from io import StringIO, BytesIO
-    func_code = lambda o: o.__code__
-    func_globals = lambda o: o.__globals__
-    im_func = lambda o: o.__func__
-    from html.entities import name2codepoint
-    import http.client as httplib
-    from http.server import HTTPServer, SimpleHTTPRequestHandler
-    from http.server import BaseHTTPRequestHandler
-    iteritems = lambda o: o.items()
-    long_type = int
-    maxsize = sys.maxsize
-    unichr = chr
-    unicode = str
-    bytes = bytes
-    from urllib.error import HTTPError, URLError
-    import urllib.request as urllib2
-    from urllib.request import urlopen, url2pathname, pathname2url
-    from urllib.parse import (
-        urlparse, urlunparse, unquote, splituser, urljoin, urlsplit,
-        urlunsplit, splittag,
-    )
-    filterfalse = itertools.filterfalse
-
-    def reraise(tp, value, tb=None):
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value

From d60e79a3daab4489a502842b49528c93ba5b1257 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 21:09:12 -0400
Subject: [PATCH 4264/8469] Try adding six as an egg for full compatibility
 with install_requires

--HG--
branch : feature/issue-229
extra : rebase_source : fb6ea5263750ad039250628e97d2f1cf6968fed3
---
 setup.py      |   2 +
 six-1.7.3.egg | Bin 0 -> 8240 bytes
 six.py        | 747 --------------------------------------------------
 3 files changed, 2 insertions(+), 747 deletions(-)
 create mode 100644 six-1.7.3.egg
 delete mode 100644 six.py

diff --git a/setup.py b/setup.py
index cf401d456c..b2f3ab3792 100755
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,8 @@
 import textwrap
 import contextlib
 
+sys.path.append('six-1.7.3.egg')
+
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
diff --git a/six-1.7.3.egg b/six-1.7.3.egg
new file mode 100644
index 0000000000000000000000000000000000000000..fe3e82c69bba092242593de34724c5eea6644b06
GIT binary patch
literal 8240
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
R0U!e+|5$nIpF077{|78O^Y{P&

literal 0
HcmV?d00001

diff --git a/six.py b/six.py
deleted file mode 100644
index f8f7d402ff..0000000000
--- a/six.py
+++ /dev/null
@@ -1,747 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2014 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import functools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.7.3"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-            def __len__(self):
-                return 1 << 31
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result) # Invokes __set__.
-        # This is a bit ugly, but it avoids running this again.
-        delattr(obj.__class__, self.name)
-        return result
-
-
-class MovedModule(_LazyDescr):
-
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-    """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
-
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser",
-                "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog",
-                "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
-                "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-    MovedModule("winreg", "_winreg"),
-]
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ['parse', 'error', 'request', 'response', 'robotparser']
-
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    Iterator = object
-else:
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    class Iterator(object):
-
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(get_unbound_function,
-         """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-else:
-    def iterkeys(d, **kw):
-        return iter(d.iterkeys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.itervalues(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.iteritems(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.iterlists(**kw))
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
-
-
-if PY3:
-    def b(s):
-        return s.encode("latin-1")
-    def u(s):
-        return s
-    unichr = chr
-    if sys.version_info[1] <= 1:
-        def int2byte(i):
-            return bytes((i,))
-    else:
-        # This is about 2x faster than the implementation above on 3.2+
-        int2byte = operator.methodcaller("to_bytes", 1, "big")
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-else:
-    def b(s):
-        return s
-    # Workaround for standalone backslash
-    def u(s):
-        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
-    unichr = unichr
-    int2byte = chr
-    def byte2int(bs):
-        return ord(bs[0])
-    def indexbytes(buf, i):
-        return ord(buf[i])
-    def iterbytes(buf):
-        return (ord(byte) for byte in buf)
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-
-    def reraise(tp, value, tb=None):
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-
-    exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
-""")
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (isinstance(fp, file) and
-                isinstance(data, unicode) and
-                fp.encoding is not None):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    def wraps(wrapped):
-        def wrapper(f):
-            f = functools.wraps(wrapped)(f)
-            f.__wrapped__ = wrapped
-            return f
-        return wrapper
-else:
-    wraps = functools.wraps
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        slots = orig_vars.get('__slots__')
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-            importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)

From 96aed21b42121acde68dd6b3732c3fbae0903569 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Jul 2014 21:17:52 -0400
Subject: [PATCH 4265/8469] Correct incorrect module for urllib.errors

--HG--
branch : feature/issue-229
extra : rebase_source : 93a1adbc64455d9cf7c3c8cceb7bbd283c06ac5b
---
 setuptools/package_index.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9c8992189c..a14c8ac6de 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -315,7 +315,7 @@ def process_url(self, url, retrieve=False):
         base = f.url     # handle redirects
         page = f.read()
         if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
-            if isinstance(f, urllib.request.HTTPError):
+            if isinstance(f, urllib.error.HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
             else:
@@ -666,7 +666,7 @@ def _download_to(self, url, filename):
         try:
             checker = HashChecker.from_url(url)
             fp = self.open_url(strip_fragment(url))
-            if isinstance(fp, urllib.request.HTTPError):
+            if isinstance(fp, urllib.error.HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code,fp.msg)
                 )
@@ -709,10 +709,10 @@ def open_url(self, url, warning=None):
                 self.warn(warning, msg)
             else:
                 raise DistutilsError('%s %s' % (url, msg))
-        except urllib.request.HTTPError:
+        except urllib.error.HTTPError:
             v = sys.exc_info()[1]
             return v
-        except urllib.request.URLError:
+        except urllib.error.URLError:
             v = sys.exc_info()[1]
             if warning:
                 self.warn(warning, v.reason)

From 0d6a21f045a6137d6ed96d89d966bceacd8a2531 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Jul 2014 14:00:46 -0400
Subject: [PATCH 4266/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ef456a7e10..107aa093e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+5.4.1
+-----
+
+* Python #7776: (ssl_support) Correct usage of host for validation when
+  tunneling for HTTPS.
+
 ---
 5.4
 ---

From 793bdfffdf388ae3203d4703b4feac3f1f4ccd96 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Jul 2014 14:04:10 -0400
Subject: [PATCH 4267/8469] Bumped to 5.4.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b017944deb..f9be4327e5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.5"
+DEFAULT_VERSION = "5.4.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 773d9307b1..2ac7a45eb7 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.5'
+__version__ = '5.4.1'

From 230e26cdb047dfb01ae66a41b076ea494c4ab2eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Jul 2014 14:04:12 -0400
Subject: [PATCH 4268/8469] Added tag 5.4.1 for changeset ba3b08c7bffd

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9204dc6ad1..79de7ea963 100644
--- a/.hgtags
+++ b/.hgtags
@@ -147,3 +147,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
 f493e6c4ffd88951871110858c141385305e0077 5.2
 1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3
 baae103e80c307008b156e426a07eb9f486eb4f0 5.4
+ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1

From f420ad2c7d1c0cb232c9713c02fc0f5c798fc682 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Jul 2014 14:04:46 -0400
Subject: [PATCH 4269/8469] Bumped to 5.4.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f9be4327e5..b2435fed37 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.4.1"
+DEFAULT_VERSION = "5.4.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 2ac7a45eb7..16cc138239 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.4.1'
+__version__ = '5.4.2'

From 9c8e39e04f9391ecc42bce0000f6fba119dae6eb Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sun, 6 Jul 2014 16:14:33 -0700
Subject: [PATCH 4270/8469] Issue #21923: Prevent AttributeError in
 distutils.sysconfig.customize_compiler due to possible uninitialized
 _config_vars.  Original patch by Alex Gaynor.

---
 sysconfig.py            |  3 ++-
 tests/test_sysconfig.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 75537db8d0..5b94fa2378 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -179,7 +179,8 @@ def customize_compiler(compiler):
             # version and build tools may not support the same set
             # of CPU architectures for universal builds.
             global _config_vars
-            if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''):
+            # Use get_config_var() to ensure _config_vars is initialized.
+            if not get_config_var('CUSTOMIZED_OSX_COMPILER'):
                 import _osx_support
                 _osx_support.customize_compiler(_config_vars)
                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 95fa9dc111..fc4d1de185 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,6 +1,9 @@
 """Tests for distutils.sysconfig."""
 import os
 import shutil
+import subprocess
+import sys
+import textwrap
 import unittest
 
 from distutils import sysconfig
@@ -174,6 +177,25 @@ def test_SO_in_vars(self):
         self.assertIsNotNone(vars['SO'])
         self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
+    def test_customize_compiler_before_get_config_vars(self):
+        # Issue #21923: test that a Distribution compiler
+        # instance can be called without an explicit call to
+        # get_config_vars().
+        with open(TESTFN, 'w') as f:
+            f.writelines(textwrap.dedent('''\
+                from distutils.core import Distribution
+                config = Distribution().get_command_obj('config')
+                # try_compile may pass or it may fail if no compiler
+                # is found but it should not raise an exception.
+                rc = config.try_compile('int x;')
+                '''))
+        p = subprocess.Popen([str(sys.executable), TESTFN],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                universal_newlines=True)
+        outs, errs = p.communicate()
+        self.assertEqual(0, p.returncode, "Subprocess failed: " + outs)
+
 
 def test_suite():
     suite = unittest.TestSuite()

From 4cd8b93b95ccac00f3926ffbcead754331853c6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Jul 2014 08:58:33 -0400
Subject: [PATCH 4271/8469] Use simple asserts. pytest handles this nicely.
 Removes broken _assertIn.

---
 setuptools/tests/test_resources.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 443905cc24..279fd1396a 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -575,13 +575,6 @@ def tearDown(self):
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]
 
-    def _assertIn(self, member, container):
-        """ assertIn and assertTrue does not exist in Python2.3"""
-        if member not in container:
-            standardMsg = '%s not found in %s' % (safe_repr(member),
-                                                  safe_repr(container))
-            self.fail(self._formatMessage(msg, standardMsg))
-
     def test_two_levels_deep(self):
         """
         Test nested namespace packages
@@ -605,13 +598,13 @@ def test_two_levels_deep(self):
             pkg2_init.write(ns_str)
             pkg2_init.close()
         import pkg1
-        self._assertIn("pkg1", pkg_resources._namespace_packages.keys())
+        assert "pkg1" in pkg_resources._namespace_packages
         try:
             import pkg1.pkg2
         except ImportError:
             self.fail("Setuptools tried to import the parent namespace package")
         # check the _namespace_packages dict
-        self._assertIn("pkg1.pkg2", pkg_resources._namespace_packages.keys())
+        assert "pkg1.pkg2" in pkg_resources._namespace_packages
         self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
         # check the __path__ attribute contains both paths
         self.assertEqual(pkg1.pkg2.__path__, [

From 7003458aa6b13578f8862dca6041ec5c55c21027 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Jul 2014 09:00:52 -0400
Subject: [PATCH 4272/8469] More simple asserts

---
 setuptools/tests/test_resources.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 279fd1396a..1f3b747de0 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -605,8 +605,10 @@ def test_two_levels_deep(self):
             self.fail("Setuptools tried to import the parent namespace package")
         # check the _namespace_packages dict
         assert "pkg1.pkg2" in pkg_resources._namespace_packages
-        self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])
+        assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]
         # check the __path__ attribute contains both paths
-        self.assertEqual(pkg1.pkg2.__path__, [
+        expected = [
             os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"),
-            os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2")])
+            os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2"),
+        ]
+        assert pkg1.pkg2.__path__ == expected

From a9283f60f7136c12b8ab555bffdeda63e4d4fea5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Jul 2014 09:05:37 -0400
Subject: [PATCH 4273/8469] Bump version pulled for testing ez_setup.py

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 022824f99b..44488787ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ python:
 script:
  - python setup.py test
  - python setup.py ptr
- - python ez_setup.py --version 3.5.1
+ - python ez_setup.py --version 5.4.1

From 1237522b992f84cf674833f0745b144874db817c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Jul 2014 09:12:38 -0400
Subject: [PATCH 4274/8469] Disable test_two_levels_deep when /tmp is a
 symlink. The results it is returning are suitable (shouldn't cause errors in
 runtime). Users are invited to trace the problem and find a solution. Fixes
 #231.

---
 setuptools/tests/test_resources.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 1f3b747de0..759bbcd5de 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -16,6 +16,7 @@
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3
+from .py26compat import skipIf
 
 try:
     frozenset
@@ -575,6 +576,8 @@ def tearDown(self):
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]
 
+    msg = "Test fails when /tmp is a symlink. See #231"
+    @skipIf(os.path.islink(tempfile.gettempdir()), msg)
     def test_two_levels_deep(self):
         """
         Test nested namespace packages

From c6fbf0c0ab840ad86687323c7532ff5b7de6c6bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Jul 2014 09:14:36 -0400
Subject: [PATCH 4275/8469] frozenset is available in Python 2.6

---
 setuptools/tests/test_resources.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 759bbcd5de..3baa3ab104 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -18,11 +18,6 @@
 from setuptools.compat import StringIO, iteritems, PY3
 from .py26compat import skipIf
 
-try:
-    frozenset
-except NameError:
-    from sets import ImmutableSet as frozenset
-
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
     try:

From 5ef6395c634d60e1e7aff46970590b615fc2b754 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 22 Jul 2014 15:00:37 +0300
Subject: [PATCH 4276/8469] Issue #22032: __qualname__ instead of __name__ is
 now always used to format fully qualified class names of Python implemented
 classes.

---
 extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension.py b/extension.py
index cc04a18a3a..7efbb74f89 100644
--- a/extension.py
+++ b/extension.py
@@ -134,7 +134,7 @@ def __init__(self, name, sources,
     def __repr__(self):
         return '<%s.%s(%r) at %#x>' % (
             self.__class__.__module__,
-            self.__class__.__name__,
+            self.__class__.__qualname__,
             self.name,
             id(self))
 

From b73d7fa62dae090d486c54c8cc434e955a06ffb6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 15:19:40 -0400
Subject: [PATCH 4277/8469] Remove unused variable

--HG--
extra : rebase_source : c4b515b677e318ffdcd78b2d90ab772e7d1f94e3
---
 setuptools/tests/test_sandbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 06b3d4340f..0e04ad1c34 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -19,7 +19,7 @@ def has_win32com():
     if not sys.platform.startswith('win32'):
         return False
     try:
-        mod = __import__('win32com')
+        __import__('win32com')
     except ImportError:
         return False
     return True

From ca46f074d12651e32250737c7f380b343b0882ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 15:20:32 -0400
Subject: [PATCH 4278/8469] Python 2.3 no longer supported

--HG--
extra : rebase_source : debc6141ad369eafeb78b808a15d8558ff3fb83b
---
 setuptools/tests/test_sandbox.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 0e04ad1c34..0f2e693d98 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -33,8 +33,6 @@ def tearDown(self):
         shutil.rmtree(self.dir)
 
     def test_devnull(self):
-        if sys.version < '2.4':
-            return
         sandbox = DirectorySandbox(self.dir)
         sandbox.run(self._file_writer(os.devnull))
 

From 33f496c61e086bd1ac701e44bc17315c0442010c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 15:29:11 -0400
Subject: [PATCH 4279/8469] Add test capturing failure on Python 2.6. Ref #236

--HG--
extra : rebase_source : 99a2b1e437691f9e1a9982357bc70d91fce91953
---
 setuptools.egg-info/entry_points.txt | 2 +-
 setuptools/tests/test_sandbox.py     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index de842da822..25a8e1c303 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,6 +1,6 @@
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
+easy_install-2.6 = setuptools.command.easy_install:main
 
 [distutils.commands]
 alias = setuptools.command.alias:alias
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 0f2e693d98..6a890ebc97 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -73,5 +73,11 @@ def test_setup_py_with_BOM(self):
         setuptools.sandbox._execfile(target, vars(namespace))
         assert namespace.result == 'passed'
 
+    def test_setup_py_with_CRLF(self):
+        setup_py = os.path.join(self.dir, 'setup.py')
+        with open(setup_py, 'wb') as stream:
+            stream.write(b'"degenerate script"\r\n')
+        setuptools.sandbox._execfile(setup_py, globals())
+
 if __name__ == '__main__':
     unittest.main()

From 249e5853496ec108dc78e58c003bf46315b50ffc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 15:31:47 -0400
Subject: [PATCH 4280/8469] Extract variable

---
 setuptools/sandbox.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 7985e9eef6..a0d3dc6139 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -30,7 +30,8 @@ def _execfile(filename, globals, locals=None):
     """
     Python 3 implementation of execfile.
     """
-    with open(filename, 'rb') as stream:
+    mode = 'rb'
+    with open(filename, mode) as stream:
         script = stream.read()
     if locals is None:
         locals = globals

From 59e3528c710363e167e0860aab4fd1a611cc058b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 15:36:08 -0400
Subject: [PATCH 4281/8469] Correct execfile implementation for Python 2.6.
 Fixes #236.

---
 CHANGES.txt                          | 6 ++++++
 setuptools.egg-info/entry_points.txt | 2 +-
 setuptools/sandbox.py                | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 107aa093e1..bb5dc66f79 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+5.4.2
+-----
+
+* Issue #236: Corrected regression in execfile implementation for Python 2.6.
+
 -----
 5.4.1
 -----
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 25a8e1c303..de842da822 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,6 +1,6 @@
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
 
 [distutils.commands]
 alias = setuptools.command.alias:alias
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index a0d3dc6139..e79a13a8a1 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -31,6 +31,10 @@ def _execfile(filename, globals, locals=None):
     Python 3 implementation of execfile.
     """
     mode = 'rb'
+    # Python 2.6 compile requires LF for newlines, so use deprecated
+    #  Universal newlines support.
+    if sys.version_info < (2, 7):
+        mode += 'U'
     with open(filename, mode) as stream:
         script = stream.read()
     if locals is None:

From 8b1cd5ffa7cff7de258e11199fa2ae69ac951c4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:01:36 -0400
Subject: [PATCH 4282/8469] Downgrade pytest to get tests to pass.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 44488787ea..dc7ed0802e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ python:
   - pypy
 # command to run tests
 script:
+ # work around https://bitbucket.org/hpk42/pytest/issue/555
+ - sudo easy_install 'pytest<2.6'
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From 28ad58b6655b09b9b3e602b2c97eceeb98a7cf9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:05:07 -0400
Subject: [PATCH 4283/8469] Use 'python -m' to install to active Python version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dc7ed0802e..957064dcfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 # command to run tests
 script:
  # work around https://bitbucket.org/hpk42/pytest/issue/555
- - sudo easy_install 'pytest<2.6'
+ - sudo python -m easy_install 'pytest<2.6'
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From 5eac25d201c836281793688282d7659670856d11 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:15:35 -0400
Subject: [PATCH 4284/8469] Try running not in the context of the project under
 test

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 957064dcfb..23a1986a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 # command to run tests
 script:
  # work around https://bitbucket.org/hpk42/pytest/issue/555
- - sudo python -m easy_install 'pytest<2.6'
+ - pushd /tmp; sudo python -m easy_install 'pytest<2.6'; popd
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From ba9c41335311efe36ac38a061bdceef7633968d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:21:17 -0400
Subject: [PATCH 4285/8469] Omit sudo. Hope pytest is in the virtualenv

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 23a1986a46..3077778afd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 # command to run tests
 script:
  # work around https://bitbucket.org/hpk42/pytest/issue/555
- - pushd /tmp; sudo python -m easy_install 'pytest<2.6'; popd
+ - pushd /tmp; python -m easy_install 'pytest<2.6'; popd
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From 1d84ad8fa7e6be6c27d57c3459a5153d55dca4f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:24:02 -0400
Subject: [PATCH 4286/8469] Added tag 5.4.2 for changeset 7adcf1397f6e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 79de7ea963..6b7d38a8cc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -148,3 +148,4 @@ f493e6c4ffd88951871110858c141385305e0077 5.2
 1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3
 baae103e80c307008b156e426a07eb9f486eb4f0 5.4
 ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
+7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2

From 0341e4d0b24162ec6a4280c99bafdf8b7bcab324 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Aug 2014 16:24:36 -0400
Subject: [PATCH 4287/8469] Bumped to 5.4.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b2435fed37..791973ec83 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.4.2"
+DEFAULT_VERSION = "5.4.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 16cc138239..0e0a34f944 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.4.2'
+__version__ = '5.4.3'

From 9ce32d32b0b4d62ba844884b436d5a57e5b921cb Mon Sep 17 00:00:00 2001
From: ericholscher <none@none>
Date: Sat, 2 Aug 2014 08:07:57 -0700
Subject: [PATCH 4288/8469] Fix docs to work

---
 docs/conf.py                         | 4 ++++
 setuptools.egg-info/entry_points.txt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 9929aaf692..4ab9f41c01 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,6 +13,9 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
+import sys, os
+
+sys.path.append(os.path.abspath('..'))
 
 import setup as setup_script
 
@@ -195,3 +198,4 @@
 
 # If false, no module index is generated.
 #latex_use_modindex = True
+
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index de842da822..528f38e789 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,6 +1,6 @@
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
+easy_install-2.7 = setuptools.command.easy_install:main
 
 [distutils.commands]
 alias = setuptools.command.alias:alias

From 22a27948727dea8a36c9ab663b78c6b24547c0f5 Mon Sep 17 00:00:00 2001
From: ericholscher <eric@ericholscher.com>
Date: Sat, 2 Aug 2014 15:35:20 +0000
Subject: [PATCH 4289/8469] entry_points.txt edited online with Bitbucket

---
 setuptools.egg-info/entry_points.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 528f38e789..de842da822 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,6 +1,6 @@
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.7 = setuptools.command.easy_install:main
+easy_install-3.4 = setuptools.command.easy_install:main
 
 [distutils.commands]
 alias = setuptools.command.alias:alias

From 702a87a0a2ab03c376fea01903075c8fed45a8fb Mon Sep 17 00:00:00 2001
From: ericholscher <eric@ericholscher.com>
Date: Sat, 2 Aug 2014 15:35:33 +0000
Subject: [PATCH 4290/8469] conf.py edited online with Bitbucket

---
 docs/conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4ab9f41c01..faf3a91508 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -198,4 +198,3 @@
 
 # If false, no module index is generated.
 #latex_use_modindex = True
-

From 1194bad8b3d424469364ef497c3202dfb4ebcf62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Aug 2014 10:41:58 -0400
Subject: [PATCH 4291/8469] Correct syntax in gui_scripts. Fixes #238.

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 86e23ff944..c3844cf212 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -479,7 +479,7 @@ script called ``baz``, you might do something like this::
                 'bar = other_module:some_func',
             ],
             'gui_scripts': [
-                'baz = my_package_gui.start_func',
+                'baz = my_package_gui:start_func',
             ]
         }
     )

From 0ce646ec0138c76d9cf7a1a25103a865a54f18fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Aug 2014 08:03:49 -0400
Subject: [PATCH 4292/8469] Testing fix for pytest-555

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3077778afd..18334df498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ python:
   - pypy
 # command to run tests
 script:
- # work around https://bitbucket.org/hpk42/pytest/issue/555
- - pushd /tmp; python -m easy_install 'pytest<2.6'; popd
+ # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
+ - pip install --pre -i https://devpi.net/hpk/dev/ pytest
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From f18617330c7c34684c7cd8e7d2fbb9873e12e874 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Aug 2014 08:13:15 -0400
Subject: [PATCH 4293/8469] Indicate upgrade to test pytest-555

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 18334df498..bc387f46cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
 # command to run tests
 script:
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
- - pip install --pre -i https://devpi.net/hpk/dev/ pytest
+ - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From ac14ffe92376c54bb2d5a443e5177d85faeda75d Mon Sep 17 00:00:00 2001
From: Benedikt Morbach <bmorbach@redhat.com>
Date: Thu, 7 Aug 2014 17:57:00 +0200
Subject: [PATCH 4294/8469] make order of lines in top_level.txt deterministic

like it was done for requirements and entry_points
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 72493d0b97..1ef723da69 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -389,7 +389,7 @@ def write_toplevel_names(cmd, basename, filename):
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n')
+    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):

From 50cd15aef3a657ee9cf86326e18e3bc2919b4cf6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 14:06:15 -0400
Subject: [PATCH 4295/8469] Include setup_requires directive in Distribution
 attributes and metadata. Fixes #239.

---
 CHANGES.txt        | 8 ++++++++
 setup.py           | 1 +
 setuptools/dist.py | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bb5dc66f79..71165b1903 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+5.5
+---
+
+* Issue #239: Setuptools now includes the setup_requires directive on
+  Distribution objects and validates the syntax just like install_requires
+  and tests_require directives.
+
 -----
 5.4.2
 -----
diff --git a/setup.py b/setup.py
index f7be05670c..52d16ff3bb 100755
--- a/setup.py
+++ b/setup.py
@@ -144,6 +144,7 @@ def _save_entry_points(self):
             "extras_require         = setuptools.dist:check_extras",
             "install_requires       = setuptools.dist:check_requirements",
             "tests_require          = setuptools.dist:check_requirements",
+            "setup_reqires          = setuptools.dist:check_requirements",
             "entry_points           = setuptools.dist:check_entry_points",
             "test_suite             = setuptools.dist:check_test_suite",
             "zip_safe               = setuptools.dist:assert_bool",
diff --git a/setuptools/dist.py b/setuptools/dist.py
index dac4dfa8f8..8b36f67c1d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -259,7 +259,7 @@ def __init__(self, attrs=None):
             self.dependency_links = attrs.pop('dependency_links', [])
             assert_string_list(self,'dependency_links',self.dependency_links)
         if attrs and 'setup_requires' in attrs:
-            self.fetch_build_eggs(attrs.pop('setup_requires'))
+            self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             if not hasattr(self,ep.name):
                 setattr(self,ep.name,None)

From 1531c8041c6b3f4e077d6edeb8305db2aacdbfb7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 14:45:59 -0400
Subject: [PATCH 4296/8469] Correct documentation

---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 791973ec83..96ec11d5c1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -268,7 +268,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     Download setuptools from a specified location and return its filename
 
     `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
+    as an sdist for download under the `download_base` URL (which should end
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download
     attempt.

From 28097c4d3dad73f7813a5e271ab3ad9dc6302b99 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 14:49:28 -0400
Subject: [PATCH 4297/8469] Bumped to 5.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 96ec11d5c1..3f98bd07b9 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.4.3"
+DEFAULT_VERSION = "5.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0e0a34f944..773d9307b1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.4.3'
+__version__ = '5.5'

From 19a627c768b7c0a155beea2fce0bb0f4c98c3959 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 14:49:30 -0400
Subject: [PATCH 4298/8469] Added tag 5.5 for changeset 68910a89f97a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6b7d38a8cc..74f7f16d65 100644
--- a/.hgtags
+++ b/.hgtags
@@ -149,3 +149,4 @@ f493e6c4ffd88951871110858c141385305e0077 5.2
 baae103e80c307008b156e426a07eb9f486eb4f0 5.4
 ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2
+68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5

From f4ff967301bdd5f33631d2650baad9776baa4c10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 14:50:14 -0400
Subject: [PATCH 4299/8469] Bumped to 5.6 in preparation for next release.

---
 ez_setup.py                          | 2 +-
 setuptools.egg-info/entry_points.txt | 1 +
 setuptools/version.py                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3f98bd07b9..4b9eee61b7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.5"
+DEFAULT_VERSION = "5.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index de842da822..df4ac2aefb 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -36,6 +36,7 @@ install_requires = setuptools.dist:check_requirements
 namespace_packages = setuptools.dist:check_nsp
 package_data = setuptools.dist:check_package_data
 packages = setuptools.dist:check_packages
+setup_reqires = setuptools.dist:check_requirements
 test_loader = setuptools.dist:check_importable
 test_runner = setuptools.dist:check_importable
 test_suite = setuptools.dist:check_test_suite
diff --git a/setuptools/version.py b/setuptools/version.py
index 773d9307b1..49e04a6265 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.5'
+__version__ = '5.6'

From b95f4114a81284d6c286eadd799032277c38f6f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 19:50:55 -0400
Subject: [PATCH 4300/8469] Fix typo; ref #239.

---
 CHANGES.txt | 6 ++++++
 setup.py    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 71165b1903..54284c886b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+5.5.1
+-----
+
+* Issue #239: Fix typo in 5.5 such that fix did not take.
+
 ---
 5.5
 ---
diff --git a/setup.py b/setup.py
index 52d16ff3bb..bac4e29dbf 100755
--- a/setup.py
+++ b/setup.py
@@ -144,7 +144,7 @@ def _save_entry_points(self):
             "extras_require         = setuptools.dist:check_extras",
             "install_requires       = setuptools.dist:check_requirements",
             "tests_require          = setuptools.dist:check_requirements",
-            "setup_reqires          = setuptools.dist:check_requirements",
+            "setup_requires         = setuptools.dist:check_requirements",
             "entry_points           = setuptools.dist:check_entry_points",
             "test_suite             = setuptools.dist:check_test_suite",
             "zip_safe               = setuptools.dist:assert_bool",

From 26cc02d02a295ff30c6a0f0b661bfc6f2fd2246b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 19:55:29 -0400
Subject: [PATCH 4301/8469] Bumped to 5.5.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4b9eee61b7..6de57c0404 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.6"
+DEFAULT_VERSION = "5.5.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 49e04a6265..45e4cae417 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.6'
+__version__ = '5.5.1'

From 09987b9fd84bf2cda4fea81bd4a8d500cb553281 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 19:55:32 -0400
Subject: [PATCH 4302/8469] Added tag 5.5.1 for changeset 949a66af4f03

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 74f7f16d65..6fb941db3d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -150,3 +150,4 @@ baae103e80c307008b156e426a07eb9f486eb4f0 5.4
 ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2
 68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5
+949a66af4f03521e1404deda940aa951418a13d2 5.5.1

From 064554652d35bfd14eb4787a808d4d27d4f643a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Aug 2014 19:56:16 -0400
Subject: [PATCH 4303/8469] Bumped to 5.5.2 in preparation for next release.

---
 ez_setup.py                          | 2 +-
 setuptools.egg-info/entry_points.txt | 2 +-
 setuptools/version.py                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6de57c0404..cf3621cac6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.5.1"
+DEFAULT_VERSION = "5.5.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index df4ac2aefb..72a5ffe0b5 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -36,7 +36,7 @@ install_requires = setuptools.dist:check_requirements
 namespace_packages = setuptools.dist:check_nsp
 package_data = setuptools.dist:check_package_data
 packages = setuptools.dist:check_packages
-setup_reqires = setuptools.dist:check_requirements
+setup_requires = setuptools.dist:check_requirements
 test_loader = setuptools.dist:check_importable
 test_runner = setuptools.dist:check_importable
 test_suite = setuptools.dist:check_test_suite
diff --git a/setuptools/version.py b/setuptools/version.py
index 45e4cae417..e441e91582 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.5.1'
+__version__ = '5.5.2'

From dd832d63bdc2c18a5456f41a1d099e59becd0bcb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Aug 2014 12:52:47 -0400
Subject: [PATCH 4304/8469] Use absolute_import in svn_utils. Fixes #242.

---
 CHANGES.txt             | 7 +++++++
 setuptools/svn_utils.py | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 54284c886b..3674383ccf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+5.6
+---
+
+* Issue #242: Use absolute imports in svn_utils to avoid issues if the
+  installing package adds an xml module to the path.
+
 -----
 5.5.1
 -----
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index 2dcfd89913..dadb682a59 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 import re
 import sys

From 0a9f4f05fd110d6676de8cd58506499a1ac00aad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Aug 2014 12:57:25 -0400
Subject: [PATCH 4305/8469] Bumped to 5.6 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index cf3621cac6..4b9eee61b7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.5.2"
+DEFAULT_VERSION = "5.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index e441e91582..49e04a6265 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.5.2'
+__version__ = '5.6'

From 912029443187711fcf3c0b7bf841dba4a6cb8d74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Aug 2014 12:57:27 -0400
Subject: [PATCH 4306/8469] Added tag 5.6 for changeset a1fc0220bfa3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6fb941db3d..93337a77b4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -151,3 +151,4 @@ ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2
 68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5
 949a66af4f03521e1404deda940aa951418a13d2 5.5.1
+a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6

From 06c0f3f41296ab29b626b3c7970f7bfa9e159439 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Aug 2014 12:58:05 -0400
Subject: [PATCH 4307/8469] Bumped to 5.7 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4b9eee61b7..a34fa806d6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.6"
+DEFAULT_VERSION = "5.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 49e04a6265..8666d542a9 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.6'
+__version__ = '5.7'

From 5cbc6c70851acaa617a581c977aa0a55e2391ef7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Aug 2014 09:50:33 -0400
Subject: [PATCH 4308/8469] Use MemoizedZipManifests for all operations. Fixes
 #240.

---
 CHANGES.txt      | 11 +++++++++++
 pkg_resources.py |  6 +-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3674383ccf..83b05bbe55 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,17 @@
 CHANGES
 =======
 
+---
+5.7
+---
+
+* Issue #240: Based on real-world performance measures against 5.4, zip
+  manifests are now cached in all circumstances. The
+  ``PKG_RESOURCES_CACHE_ZIP_MANIFESTS`` environment variable is no longer
+  relevant. The observed "memory increase" referenced in the 5.4 release
+  notes and detailed in Issue #154 was likely not an increase over the status
+  quo, but rather only an increase over not storing the zip info at all.
+
 ---
 5.6
 ---
diff --git a/pkg_resources.py b/pkg_resources.py
index 11debf6543..ee2c553ba1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1605,11 +1605,7 @@ class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 
     eagers = None
-    _zip_manifests = (
-        MemoizedZipManifests()
-        if os.environ.get('PKG_RESOURCES_CACHE_ZIP_MANIFESTS') else
-        ZipManifests()
-    )
+    _zip_manifests = MemoizedZipManifests()
 
     def __init__(self, module):
         EggProvider.__init__(self, module)

From 75f8f35ca991efcfdfcd4800e8e2f8241b9b1162 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Aug 2014 09:54:35 -0400
Subject: [PATCH 4309/8469] Added tag 5.7 for changeset 37ed55fd310d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 93337a77b4..1f1cac00e3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -152,3 +152,4 @@ ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5
 949a66af4f03521e1404deda940aa951418a13d2 5.5.1
 a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
+37ed55fd310d0cd32009dc5676121e86b404a23d 5.7

From 6c42630380e93d2945620bae9a351a506bf42b19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Aug 2014 09:55:11 -0400
Subject: [PATCH 4310/8469] Bumped to 5.8 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a34fa806d6..74c8224a3d 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.7"
+DEFAULT_VERSION = "5.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 8666d542a9..868f2d33f3 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.7'
+__version__ = '5.8'

From 9fe6b474304a5a679b00d6218f9d9471a2c8a2fd Mon Sep 17 00:00:00 2001
From: ericholscher <eric@ericholscher.com>
Date: Sat, 16 Aug 2014 15:52:49 +0000
Subject: [PATCH 4311/8469] Add comment to explain code.

---
 docs/conf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index faf3a91508..203dc93d34 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,9 +12,10 @@
 # autogenerated file.
 #
 # All configuration values have a default; values that are commented out
-# serve to show the default.
-import sys, os
+# serve to show the default
 
+# Allow Sphinx to find the setup command that is imported below.
+import sys, os
 sys.path.append(os.path.abspath('..'))
 
 import setup as setup_script

From 5804094016f1b5188c14d1c69fdae7c55f1f242d Mon Sep 17 00:00:00 2001
From: ericholscher <eric@ericholscher.com>
Date: Sun, 17 Aug 2014 05:52:57 +0000
Subject: [PATCH 4312/8469] Update conf.py to place it below original
 docstring.

---
 docs/conf.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 203dc93d34..8be5c3dd99 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,17 +14,16 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default
 
-# Allow Sphinx to find the setup command that is imported below.
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+
+# Allow Sphinx to find the setup command that is imported below, as referenced above.
 import sys, os
 sys.path.append(os.path.abspath('..'))
 
 import setup as setup_script
 
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
-
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions

From 3100d99a48f564f3d0673ce3f972a823fa514158 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 17 Aug 2014 23:00:42 -0500
Subject: [PATCH 4313/8469] remove 2.2 and 2.6 compat code (closes #22200)

Patch from Thomas Kluyver.
---
 command/install.py | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/command/install.py b/command/install.py
index 456511cdfb..d768dc5463 100644
--- a/command/install.py
+++ b/command/install.py
@@ -15,32 +15,17 @@
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
-
-if sys.version < "2.2":
-    WINDOWS_SCHEME = {
-        'purelib': '$base',
-        'platlib': '$base',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-else:
-    WINDOWS_SCHEME = {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
+from site import USER_BASE
+from site import USER_SITE
+HAS_USER_SITE = True
+
+WINDOWS_SCHEME = {
+    'purelib': '$base/Lib/site-packages',
+    'platlib': '$base/Lib/site-packages',
+    'headers': '$base/Include/$dist_name',
+    'scripts': '$base/Scripts',
+    'data'   : '$base',
+}
 
 INSTALL_SCHEMES = {
     'unix_prefix': {

From 7702536f882a3e03cea35bb3066069793351f1ce Mon Sep 17 00:00:00 2001
From: Hugues Lerebours <h.lerebours@criteo.com>
Date: Mon, 18 Aug 2014 14:11:34 +0200
Subject: [PATCH 4314/8469] [Fix/Typo] Fix missing parenthesis in egg_info.py

Syntax error introduced in be37eff86c761a399c1ec98b0e5eeed9a90c9cd7
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1ef723da69..06764a17c5 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -389,7 +389,7 @@ def write_toplevel_names(cmd, basename, filename):
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs) + '\n')
+    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs)) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):

From 0ea11fb8f355f41f4290dd2ffd638a8b3c21baea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Aug 2014 09:24:33 -0400
Subject: [PATCH 4315/8469] Updated documentation to reflect support for
 PowerShell 3 on earlier versions of Windows. Fixes #247.

---
 README.txt | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index ad6386e5b9..9a142bf778 100755
--- a/README.txt
+++ b/README.txt
@@ -23,13 +23,14 @@ latest known stable release.
 
 .. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
 
-Windows 8 (Powershell)
-======================
+Windows (Powershell 3 or later)
+===============================
 
 For best results, uninstall previous versions FIRST (see `Uninstalling`_).
 
-Using Windows 8 or later, it's possible to install with one simple Powershell
-command. Start up Powershell and paste this command::
+Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows
+with PowerShell 3 installed, it's possible to install with one simple
+Powershell command. Start up Powershell and paste this command::
 
     > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python -
 
@@ -45,8 +46,8 @@ Python 2.7 installed::
     > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 -
 
 The recommended way to install setuptools on Windows is to download
-`ez_setup.py`_ and run it. The script will download the appropriate .egg
-file and install it for you.
+`ez_setup.py`_ and run it. The script will download the appropriate
+distribution file and install it for you.
 
 Once installation is complete, you will find an ``easy_install`` program in
 your Python ``Scripts`` subdirectory.  For simple invocation and best results,
@@ -55,11 +56,12 @@ present. If you did a user-local install, the ``Scripts`` subdirectory is
 ``$env:APPDATA\Python\Scripts``.
 
 
-Windows 7 (or graphical install)
-================================
+Windows (simplified)
+====================
 
-For Windows 7 and earlier, download `ez_setup.py`_ using your favorite web
-browser or other technique and "run" that file.
+For Windows without PowerShell 3 or for installation without a command-line,
+download `ez_setup.py`_ using your preferred web browser or other technique
+and "run" that file.
 
 
 Unix (wget)

From f8844d7508fd6fe81b161b14320b2dcd8ec88315 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Aug 2014 09:48:06 -0400
Subject: [PATCH 4316/8469] Backed out changeset: be37eff86c76

Syntax was invalid.
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1ef723da69..72493d0b97 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -389,7 +389,7 @@ def write_toplevel_names(cmd, basename, filename):
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs) + '\n')
+    cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):

From 5725c38fc0280287b770ed7869c3c5258441f4fd Mon Sep 17 00:00:00 2001
From: Benedikt Morbach <bmorbach@redhat.com>
Date: Thu, 7 Aug 2014 17:57:00 +0200
Subject: [PATCH 4317/8469] make order of lines in top_level.txt deterministic

without this, every build produces a different result, as the lines are
ordered randomly.

This makes builds reproducible.
If you build a package two times, you get the same result, as you would
expect. Basically the same thing was already done for requirements and
entry_points.txt

It is useful e.g. if you want to rebuild a package that you downloaded,
to ensure that no-one tampered with it, or even if you just want to
examine the differences between two builds/versions of one package.
---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 72493d0b97..06764a17c5 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -389,7 +389,7 @@ def write_toplevel_names(cmd, basename, filename):
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
-    cmd.write_file("top-level names", filename, '\n'.join(pkgs) + '\n')
+    cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs)) + '\n')
 
 
 def overwrite_arg(cmd, basename, filename):

From 63ddca7cd1011b8d4b1348315c02fe9fd6a404e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 09:54:15 -0400
Subject: [PATCH 4318/8469] Normalize syntax

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

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 7692e0f328..c0c271a4ed 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -17,7 +17,7 @@ def get_exclusions(self):
         svem = (nsp and self.get_finalized_command('install')
                 .single_version_externally_managed)
         exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo']
-        if hasattr(imp, 'get_tag') :
+        if hasattr(imp, 'get_tag'):
             exclude_names.extend((
                 os.path.join(
                     '__pycache__',
@@ -33,7 +33,7 @@ def get_exclusions(self):
                 parts = pkg.split('.')
                 while parts:
                     pkgdir = os.path.join(self.install_dir, *parts)
-                    for f in exclude_names :
+                    for f in exclude_names:
                         exclude[os.path.join(pkgdir, f)] = 1
                     parts.pop()
         return exclude

From a7dbe706890eab7ba330c51ea59349c28080dfde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:02:01 -0400
Subject: [PATCH 4319/8469] Extract method for generating exclude names

---
 setuptools/command/install_lib.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index c0c271a4ed..259f0899a8 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -16,6 +16,22 @@ def get_exclusions(self):
         nsp = self.distribution.namespace_packages
         svem = (nsp and self.get_finalized_command('install')
                 .single_version_externally_managed)
+        if svem:
+            for pkg in nsp:
+                parts = pkg.split('.')
+                while parts:
+                    pkgdir = os.path.join(self.install_dir, *parts)
+                    for f in self._gen_exclude_names():
+                        exclude[os.path.join(pkgdir, f)] = 1
+                    parts.pop()
+        return exclude
+
+    @staticmethod
+    def _gen_exclude_names():
+        """
+        Generate the list of file paths to be excluded for namespace
+        packages (bytecode cache files).
+        """
         exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo']
         if hasattr(imp, 'get_tag'):
             exclude_names.extend((
@@ -28,15 +44,7 @@ def get_exclusions(self):
                     '__init__.' + imp.get_tag() + '.pyo'
                 ),
             ))
-        if svem:
-            for pkg in nsp:
-                parts = pkg.split('.')
-                while parts:
-                    pkgdir = os.path.join(self.install_dir, *parts)
-                    for f in exclude_names:
-                        exclude[os.path.join(pkgdir, f)] = 1
-                    parts.pop()
-        return exclude
+        return exclude_names
 
     def copy_tree(
             self, infile, outfile,

From 4e5bbb8e5175b35f8cbaace630bd0dd3091d6946 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:05:18 -0400
Subject: [PATCH 4320/8469] Generate the filenames more directly.

---
 setuptools/command/install_lib.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 259f0899a8..3f39d9450c 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -29,22 +29,18 @@ def get_exclusions(self):
     @staticmethod
     def _gen_exclude_names():
         """
-        Generate the list of file paths to be excluded for namespace
-        packages (bytecode cache files).
+        Generate file paths to be excluded for namespace packages (bytecode
+        cache files).
         """
-        exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo']
-        if hasattr(imp, 'get_tag'):
-            exclude_names.extend((
-                os.path.join(
-                    '__pycache__',
-                    '__init__.' + imp.get_tag() + '.pyc'
-                ),
-                os.path.join(
-                    '__pycache__',
-                    '__init__.' + imp.get_tag() + '.pyo'
-                ),
-            ))
-        return exclude_names
+        yield '__init__.py'
+        yield '__init__.pyc'
+        yield '__init__.pyo'
+
+        if not hasattr(imp, 'get_tag'):
+            return
+
+        yield os.path.join('__pycache__', '__init__.' + imp.get_tag() + '.pyc')
+        yield os.path.join('__pycache__', '__init__.' + imp.get_tag() + '.pyo')
 
     def copy_tree(
             self, infile, outfile,

From f6f409ac7dc06be2524211a717182cd96b21e13f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:06:35 -0400
Subject: [PATCH 4321/8469] Extract calculation of base path

---
 setuptools/command/install_lib.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 3f39d9450c..d1c91b7bed 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -39,8 +39,9 @@ def _gen_exclude_names():
         if not hasattr(imp, 'get_tag'):
             return
 
-        yield os.path.join('__pycache__', '__init__.' + imp.get_tag() + '.pyc')
-        yield os.path.join('__pycache__', '__init__.' + imp.get_tag() + '.pyo')
+        base = os.path.join('__pycache__', '__init__.' + imp.get_tag())
+        yield base + '.pyc'
+        yield base + '.pyo'
 
     def copy_tree(
             self, infile, outfile,

From 23f5f548a9dfffe5c04f40eee461d2270ecf5f53 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:07:07 -0400
Subject: [PATCH 4322/8469] Add comment

---
 setuptools/command/install_lib.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index d1c91b7bed..a1cbd2aada 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -32,7 +32,9 @@ def _gen_exclude_names():
         Generate file paths to be excluded for namespace packages (bytecode
         cache files).
         """
+        # always exclude the package module itself
         yield '__init__.py'
+
         yield '__init__.pyc'
         yield '__init__.pyo'
 

From 03fe70a1793ea5dae7685323f1146eb12c2a0e0e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:08:48 -0400
Subject: [PATCH 4323/8469] Construct exclusions as a set

---
 setuptools/command/install_lib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index a1cbd2aada..f4b295cc3e 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -12,7 +12,7 @@ def run(self):
             self.byte_compile(outfiles)
 
     def get_exclusions(self):
-        exclude = {}
+        exclude = set()
         nsp = self.distribution.namespace_packages
         svem = (nsp and self.get_finalized_command('install')
                 .single_version_externally_managed)
@@ -22,9 +22,9 @@ def get_exclusions(self):
                 while parts:
                     pkgdir = os.path.join(self.install_dir, *parts)
                     for f in self._gen_exclude_names():
-                        exclude[os.path.join(pkgdir, f)] = 1
+                        exclude.add(os.path.join(pkgdir, f))
                     parts.pop()
-        return exclude
+        return dict.fromkeys(exclude, 1)
 
     @staticmethod
     def _gen_exclude_names():

From e8914480487426305fece22422fdb725f88add7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:19:36 -0400
Subject: [PATCH 4324/8469] Add docstring for get_exclusions. Just return the
 set as it is a sized container.

---
 setuptools/command/install_lib.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index f4b295cc3e..91d2b25d10 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -12,6 +12,10 @@ def run(self):
             self.byte_compile(outfiles)
 
     def get_exclusions(self):
+        """
+        Return a collections.Sized collections.Container of paths to be
+        excluded for single_version_externally_managed installations.
+        """
         exclude = set()
         nsp = self.distribution.namespace_packages
         svem = (nsp and self.get_finalized_command('install')
@@ -24,7 +28,7 @@ def get_exclusions(self):
                     for f in self._gen_exclude_names():
                         exclude.add(os.path.join(pkgdir, f))
                     parts.pop()
-        return dict.fromkeys(exclude, 1)
+        return exclude
 
     @staticmethod
     def _gen_exclude_names():

From bd62121950280590c9388db065df389cf2d8280d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:29:38 -0400
Subject: [PATCH 4325/8469] Extract method for calculating namespace packages
 for single_version_externally_managed

---
 setuptools/command/install_lib.py | 34 +++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 91d2b25d10..bf587a041a 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -17,19 +17,31 @@ def get_exclusions(self):
         excluded for single_version_externally_managed installations.
         """
         exclude = set()
-        nsp = self.distribution.namespace_packages
-        svem = (nsp and self.get_finalized_command('install')
-                .single_version_externally_managed)
-        if svem:
-            for pkg in nsp:
-                parts = pkg.split('.')
-                while parts:
-                    pkgdir = os.path.join(self.install_dir, *parts)
-                    for f in self._gen_exclude_names():
-                        exclude.add(os.path.join(pkgdir, f))
-                    parts.pop()
+        for pkg in self._get_SVEM_NSPs():
+            parts = pkg.split('.')
+            while parts:
+                pkgdir = os.path.join(self.install_dir, *parts)
+                for f in self._gen_exclude_names():
+                    exclude.add(os.path.join(pkgdir, f))
+                parts.pop()
         return exclude
 
+    def _get_SVEM_NSPs(self):
+        """
+        Get namespace packages (list) but only for
+        single_version_externally_managed installations and empty otherwise.
+        """
+        # TODO: is it necessary to short-circuit here? i.e. what's the cost
+        # if get_finalized_command is called even when namespace_packages is
+        # False?
+        if not self.distribution.namespace_packages:
+            return []
+
+        install_cmd = self.get_finalized_command('install')
+        svem = install_cmd.single_version_externally_managed
+
+        return self.distribution.namespace_packages if svem else []
+
     @staticmethod
     def _gen_exclude_names():
         """

From 82c2101634a423ae9ccf003612b89fbd230f8303 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:39:53 -0400
Subject: [PATCH 4326/8469] Extract method for computing parent packages of a
 package

---
 setuptools/command/install_lib.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index bf587a041a..88b3597219 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -17,15 +17,24 @@ def get_exclusions(self):
         excluded for single_version_externally_managed installations.
         """
         exclude = set()
-        for pkg in self._get_SVEM_NSPs():
-            parts = pkg.split('.')
-            while parts:
+        for ns_pkg in self._get_SVEM_NSPs():
+            for pkg in self._all_packages(ns_pkg):
+                parts = pkg.split('.')
                 pkgdir = os.path.join(self.install_dir, *parts)
                 for f in self._gen_exclude_names():
                     exclude.add(os.path.join(pkgdir, f))
-                parts.pop()
         return exclude
 
+    @staticmethod
+    def _all_packages(pkg_name):
+        """
+        >>> list(install_lib._all_packages('foo.bar.baz'))
+        ['foo.bar.baz', 'foo.bar', 'foo']
+        """
+        while pkg_name:
+            yield pkg_name
+            pkg_name, sep, child = pkg_name.partition('.')
+
     def _get_SVEM_NSPs(self):
         """
         Get namespace packages (list) but only for

From 10e504abc7f0a0c45157bf4d6cbbd63dea6a67dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:41:49 -0400
Subject: [PATCH 4327/8469] Extract path calculation for paths

---
 setuptools/command/install_lib.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 88b3597219..92490b6e0d 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -17,12 +17,11 @@ def get_exclusions(self):
         excluded for single_version_externally_managed installations.
         """
         exclude = set()
+        pkg_path = lambda pkg: os.path.join(self.install_dir, *pkg.split('.'))
         for ns_pkg in self._get_SVEM_NSPs():
             for pkg in self._all_packages(ns_pkg):
-                parts = pkg.split('.')
-                pkgdir = os.path.join(self.install_dir, *parts)
                 for f in self._gen_exclude_names():
-                    exclude.add(os.path.join(pkgdir, f))
+                    exclude.add(os.path.join(pkg_path(pkg), f))
         return exclude
 
     @staticmethod

From b43f75980dd674153cafec047709092438d54b5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:43:35 -0400
Subject: [PATCH 4328/8469] Rewrite package traversal as a generator expression

---
 setuptools/command/install_lib.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 92490b6e0d..7f157a0f96 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -18,8 +18,12 @@ def get_exclusions(self):
         """
         exclude = set()
         pkg_path = lambda pkg: os.path.join(self.install_dir, *pkg.split('.'))
-        for ns_pkg in self._get_SVEM_NSPs():
-            for pkg in self._all_packages(ns_pkg):
+        all_packages = (
+            pkg
+            for ns_pkg in self._get_SVEM_NSPs()
+            for pkg in self._all_packages(ns_pkg)
+        )
+        for pkg in all_packages:
                 for f in self._gen_exclude_names():
                     exclude.add(os.path.join(pkg_path(pkg), f))
         return exclude

From c6340e42c8a06a35048659d7178efb329cda3249 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:43:43 -0400
Subject: [PATCH 4329/8469] Reindent

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

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 7f157a0f96..371a9e721c 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -24,8 +24,8 @@ def get_exclusions(self):
             for pkg in self._all_packages(ns_pkg)
         )
         for pkg in all_packages:
-                for f in self._gen_exclude_names():
-                    exclude.add(os.path.join(pkg_path(pkg), f))
+            for f in self._gen_exclude_names():
+                exclude.add(os.path.join(pkg_path(pkg), f))
         return exclude
 
     @staticmethod

From b908527864443899b89cf568ac9397aef7ad16c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:46:14 -0400
Subject: [PATCH 4330/8469] Use itertools.product for a cross-product of two
 iterables

---
 setuptools/command/install_lib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 371a9e721c..c2730568e6 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,5 +1,6 @@
 import distutils.command.install_lib as orig
 import os, imp
+from itertools import product
 
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
@@ -23,9 +24,8 @@ def get_exclusions(self):
             for ns_pkg in self._get_SVEM_NSPs()
             for pkg in self._all_packages(ns_pkg)
         )
-        for pkg in all_packages:
-            for f in self._gen_exclude_names():
-                exclude.add(os.path.join(pkg_path(pkg), f))
+        for pkg, f in product(all_packages, self._gen_exclude_names()):
+            exclude.add(os.path.join(pkg_path(pkg), f))
         return exclude
 
     @staticmethod

From 38b6f23637bcf8db5b9237393399041fbe36c65f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:46:37 -0400
Subject: [PATCH 4331/8469] Reorganize imports

---
 setuptools/command/install_lib.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index c2730568e6..cc531c0154 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,6 +1,7 @@
-import distutils.command.install_lib as orig
-import os, imp
+import os
+import imp
 from itertools import product
+import distutils.command.install_lib as orig
 
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""

From b925f19a4ef1b214650b770c74a083fc4f982758 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:52:20 -0400
Subject: [PATCH 4332/8469] Incorporate the exclusion path in the _exclude
 function.

---
 setuptools/command/install_lib.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index cc531c0154..f36d86515e 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -19,14 +19,18 @@ def get_exclusions(self):
         excluded for single_version_externally_managed installations.
         """
         exclude = set()
-        pkg_path = lambda pkg: os.path.join(self.install_dir, *pkg.split('.'))
+
+        def _exclude(pkg, exclusion_path):
+            parts = pkg.split('.') + [exclusion_path]
+            return os.path.join(self.install_dir, *parts)
+
         all_packages = (
             pkg
             for ns_pkg in self._get_SVEM_NSPs()
             for pkg in self._all_packages(ns_pkg)
         )
         for pkg, f in product(all_packages, self._gen_exclude_names()):
-            exclude.add(os.path.join(pkg_path(pkg), f))
+            exclude.add(_exclude(pkg, f))
         return exclude
 
     @staticmethod

From 86f35df37c309d2192a95259e77c6b4ba7f73876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:56:24 -0400
Subject: [PATCH 4333/8469] Return the exclusions directly

---
 setuptools/command/install_lib.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index f36d86515e..dcd85decc4 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,6 +1,6 @@
 import os
 import imp
-from itertools import product
+from itertools import product, starmap
 import distutils.command.install_lib as orig
 
 class install_lib(orig.install_lib):
@@ -18,9 +18,11 @@ def get_exclusions(self):
         Return a collections.Sized collections.Container of paths to be
         excluded for single_version_externally_managed installations.
         """
-        exclude = set()
-
         def _exclude(pkg, exclusion_path):
+            """
+            Given a package name and exclusion path within that package,
+            compute the full exclusion path.
+            """
             parts = pkg.split('.') + [exclusion_path]
             return os.path.join(self.install_dir, *parts)
 
@@ -29,9 +31,9 @@ def _exclude(pkg, exclusion_path):
             for ns_pkg in self._get_SVEM_NSPs()
             for pkg in self._all_packages(ns_pkg)
         )
-        for pkg, f in product(all_packages, self._gen_exclude_names()):
-            exclude.add(_exclude(pkg, f))
-        return exclude
+
+        excl_specs = product(all_packages, self._gen_exclude_names())
+        return set(starmap(_exclude, excl_specs))
 
     @staticmethod
     def _all_packages(pkg_name):

From e301ab4639508fd7d9d4a3beb51974d211d1c109 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 10:59:09 -0400
Subject: [PATCH 4334/8469] Move inline function into an instance method and
 rename for clarity.

---
 setuptools/command/install_lib.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index dcd85decc4..3cd16a8f00 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -18,22 +18,22 @@ def get_exclusions(self):
         Return a collections.Sized collections.Container of paths to be
         excluded for single_version_externally_managed installations.
         """
-        def _exclude(pkg, exclusion_path):
-            """
-            Given a package name and exclusion path within that package,
-            compute the full exclusion path.
-            """
-            parts = pkg.split('.') + [exclusion_path]
-            return os.path.join(self.install_dir, *parts)
-
         all_packages = (
             pkg
             for ns_pkg in self._get_SVEM_NSPs()
             for pkg in self._all_packages(ns_pkg)
         )
 
-        excl_specs = product(all_packages, self._gen_exclude_names())
-        return set(starmap(_exclude, excl_specs))
+        excl_specs = product(all_packages, self._gen_exclusion_paths())
+        return set(starmap(self._exclude_pkg_path, excl_specs))
+
+    def _exclude_pkg_path(self, pkg, exclusion_path):
+        """
+        Given a package name and exclusion path within that package,
+        compute the full exclusion path.
+        """
+        parts = pkg.split('.') + [exclusion_path]
+        return os.path.join(self.install_dir, *parts)
 
     @staticmethod
     def _all_packages(pkg_name):
@@ -62,7 +62,7 @@ def _get_SVEM_NSPs(self):
         return self.distribution.namespace_packages if svem else []
 
     @staticmethod
-    def _gen_exclude_names():
+    def _gen_exclusion_paths():
         """
         Generate file paths to be excluded for namespace packages (bytecode
         cache files).

From 13250db6b6ac59befa6e855f67958457f3dcf8c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 11:09:32 -0400
Subject: [PATCH 4335/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a6e27372d6..4fae469b9a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@ CHANGES
   Any users producing distributions with filenames that match those above
   case-insensitively, but not case-sensitively, should rename those files in
   their repository for better portability.
+* Pull Request #72: When using ``single_version_externally_managed``, the
+  exclusion list now includes Python 3.2 ``__pycache__`` entries.
 
 ---
 5.8

From 74a125575d6983979b244c07c36473b4bc79ac38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 11:12:15 -0400
Subject: [PATCH 4336/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4fae469b9a..4b20333d19 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,8 @@ CHANGES
   their repository for better portability.
 * Pull Request #72: When using ``single_version_externally_managed``, the
   exclusion list now includes Python 3.2 ``__pycache__`` entries.
+* Pull Request #76 and Pull Request #78: lines in top_level.txt are now
+  ordered deterministically.
 
 ---
 5.8

From b54668a95934f1f63647e219cbbcbeab4a524ac3 Mon Sep 17 00:00:00 2001
From: Jesse Weinstein <jesse.weinstein@zonarsystems.com>
Date: Thu, 28 Aug 2014 20:55:27 +0000
Subject: [PATCH 4337/8469] Fix issue #118: Prevent the egg-info directory from
 being redundantly included in the list of modified files.

--HG--
extra : rebase_source : 8bad8bf37ef1fdc59b4c1ba21fcff43d25f9b2be
---
 setuptools/command/install_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index fd0f118b33..992709f19a 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -27,7 +27,7 @@ def finalize_options(self):
         ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs = [self.target]
+        self.outputs = []
 
     def run(self):
         self.run_command('egg_info')

From 83b03cdd69f31da4b693db56f0ee8631e6ecff88 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 29 Aug 2014 07:07:35 +0300
Subject: [PATCH 4338/8469] Issue #22182: Use e.args to unpack exceptions
 correctly in distutils.file_util.move_file.

Patch by Claudiu Popa.
---
 file_util.py            |  4 ++--
 tests/test_file_util.py | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/file_util.py b/file_util.py
index f6ed290f13..7b14efbc07 100644
--- a/file_util.py
+++ b/file_util.py
@@ -194,7 +194,7 @@ def move_file (src, dst,
     try:
         os.rename(src, dst)
     except OSError as e:
-        (num, msg) = e
+        (num, msg) = e.args
         if num == errno.EXDEV:
             copy_it = True
         else:
@@ -206,7 +206,7 @@ def move_file (src, dst,
         try:
             os.unlink(src)
         except OSError as e:
-            (num, msg) = e
+            (num, msg) = e.args
             try:
                 os.unlink(dst)
             except OSError:
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 3c3e3dcb3b..270f81ebb6 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -2,10 +2,13 @@
 import unittest
 import os
 import shutil
+import errno
+from unittest.mock import patch
 
 from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
+from distutils.errors import DistutilsFileError
 from test.support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -58,6 +61,23 @@ def test_move_file_verbosity(self):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEqual(self._logs, wanted)
 
+    @patch('os.rename', side_effect=OSError('wrong', 1))
+    def test_move_file_exception_unpacking_rename(self, _):
+        # see issue 22182
+        with self.assertRaises(DistutilsFileError):
+            with open(self.source, 'w') as fobj:
+                fobj.write('spam eggs')
+            move_file(self.source, self.target, verbose=0)
+
+    @patch('os.rename', side_effect=OSError(errno.EXDEV, 'wrong'))
+    @patch('os.unlink', side_effect=OSError('wrong', 1))
+    def test_move_file_exception_unpacking_unlink(self, rename, unlink):
+        # see issue 22182
+        with self.assertRaises(DistutilsFileError):
+            with open(self.source, 'w') as fobj:
+                fobj.write('spam eggs')
+            move_file(self.source, self.target, verbose=0)
+
 
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)

From c1f5d6da2805e44809fec3e76b8a3bb9f45956f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 13:43:02 -0400
Subject: [PATCH 4339/8469] Remove unused import

---
 tests/test_dir_util.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 1589f1297d..7e84721f80 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -2,7 +2,6 @@
 import unittest
 import os
 import stat
-import shutil
 import sys
 
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,

From c73fc06c76dd902e3d913711852fd060fd3278b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 15:00:47 -0400
Subject: [PATCH 4340/8469] Correct indent

---
 tests/test_dir_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 7e84721f80..6181ec6ef1 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -51,7 +51,7 @@ def test_mkpath_remove_tree_verbosity(self):
         self.assertEqual(self._logs, wanted)
 
     @unittest.skipIf(sys.platform.startswith('win'),
-                        "This test is only appropriate for POSIX-like systems.")
+        "This test is only appropriate for POSIX-like systems.")
     def test_mkpath_with_custom_mode(self):
         # Get and set the current umask value for testing mode bits.
         umask = os.umask(0o002)

From cc179ffe784d64d8ad67f77d8ee74610ae4f7faa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 15:02:42 -0400
Subject: [PATCH 4341/8469] #22315: Add test to capture the failure.

---
 tests/test_dir_util.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 6181ec6ef1..eb83497fc6 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,7 +3,9 @@
 import os
 import stat
 import sys
+import contextlib
 
+from distutils import dir_util, errors
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
                                 ensure_relative)
 
@@ -11,6 +13,20 @@
 from distutils.tests import support
 from test.support import run_unittest
 
+
+@contextlib.context_manager
+def patch_obj(obj, attr, replacement):
+    """
+    A poor man's mock.patch.object
+    """
+    orig = getattr(obj, attr)
+    try:
+        setattr(obj, attr, replacement)
+        yield
+    finally:
+        setattr(obj, attr, orig)
+
+
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
@@ -119,6 +135,19 @@ def test_ensure_relative(self):
             self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
+    def test_copy_tree_exception_in_listdir(self):
+        """
+        An exception in listdir should raise a DistutilsFileError
+        """
+        def new_listdir(path):
+            raise OSError()
+        # simulate a transient network error or other failure invoking listdir
+        with patch_obj(os, 'listdir', new_listdir):
+            args = 'src', None
+            exc = errors.DistutilsFileError
+            self.assertRaises(exc, dir_util.copy_tree, *args)
+
+
 def test_suite():
     return unittest.makeSuite(DirUtilTestCase)
 

From d45818441e0698244819349b0bee441c9d9328de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 17:31:32 -0400
Subject: [PATCH 4342/8469] #22315: Use technique outlined in test_file_util

---
 tests/test_dir_util.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index eb83497fc6..c9f789c895 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -3,7 +3,7 @@
 import os
 import stat
 import sys
-import contextlib
+from unittest.mock import patch
 
 from distutils import dir_util, errors
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -14,19 +14,6 @@
 from test.support import run_unittest
 
 
-@contextlib.context_manager
-def patch_obj(obj, attr, replacement):
-    """
-    A poor man's mock.patch.object
-    """
-    orig = getattr(obj, attr)
-    try:
-        setattr(obj, attr, replacement)
-        yield
-    finally:
-        setattr(obj, attr, orig)
-
-
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
@@ -135,17 +122,13 @@ def test_ensure_relative(self):
             self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
-    def test_copy_tree_exception_in_listdir(self):
+    @patch('os.listdir', side_effect=OSError())
+    def test_copy_tree_exception_in_listdir(self, listdir):
         """
         An exception in listdir should raise a DistutilsFileError
         """
-        def new_listdir(path):
-            raise OSError()
-        # simulate a transient network error or other failure invoking listdir
-        with patch_obj(os, 'listdir', new_listdir):
-            args = 'src', None
-            exc = errors.DistutilsFileError
-            self.assertRaises(exc, dir_util.copy_tree, *args)
+        with self.assertRaises(errors.DistutilsFileError):
+            dir_util.copy_tree('src', None)
 
 
 def test_suite():

From 3896d0af83329e4c5e4d63bf76535a9de51c0772 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 17:37:35 -0400
Subject: [PATCH 4343/8469] #22315: Provide an actual directory during test
 invocation.

---
 tests/test_dir_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index c9f789c895..51e754a07e 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -128,7 +128,7 @@ def test_copy_tree_exception_in_listdir(self, listdir):
         An exception in listdir should raise a DistutilsFileError
         """
         with self.assertRaises(errors.DistutilsFileError):
-            dir_util.copy_tree('src', None)
+            dir_util.copy_tree(self.target, None)
 
 
 def test_suite():

From 58b1aba47823b942ab22d5c260d96707fe15c6dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 17:51:22 -0400
Subject: [PATCH 4344/8469] #22315: Use an existent directory for 'src' to
 trigger appropriate behavior.

---
 tests/test_dir_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index 51e754a07e..d2696b822c 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -128,7 +128,8 @@ def test_copy_tree_exception_in_listdir(self, listdir):
         An exception in listdir should raise a DistutilsFileError
         """
         with self.assertRaises(errors.DistutilsFileError):
-            dir_util.copy_tree(self.target, None)
+            src = self.tempdirs[-1]
+            dir_util.copy_tree(src, None)
 
 
 def test_suite():

From 01dbd70d47c352d868dce71898197ebe4c04f277 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Aug 2014 17:42:20 -0400
Subject: [PATCH 4345/8469] #22315: Use advertised API for OSError

---
 dir_util.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dir_util.py b/dir_util.py
index 9879b0dc07..0924c9b0f7 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -125,12 +125,11 @@ def copy_tree(src, dst, preserve_mode=1, preserve_times=1,
     try:
         names = os.listdir(src)
     except OSError as e:
-        (errno, errstr) = e
         if dry_run:
             names = []
         else:
             raise DistutilsFileError(
-                  "error listing files in '%s': %s" % (src, errstr))
+                  "error listing files in '%s': %s" % (src, e.strerror))
 
     if not dry_run:
         mkpath(dst, verbose=verbose)

From 15ea2f254869b3304ba5e840708654fb0a937edb Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Sep 2014 17:24:12 -0400
Subject: [PATCH 4346/8469] remove various dead version checks (closes #22349)

Patch from Thomas Kluyver.
---
 command/build_ext.py    | 17 ++++-------------
 sysconfig.py            | 24 +++---------------------
 tests/test_build_ext.py | 20 +++++++++-----------
 3 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 80689b6357..3ab2d04bf9 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -14,13 +14,7 @@
 from distutils.util import get_platform
 from distutils import log
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    HAS_USER_SITE = True
+from site import USER_BASE
 
 if os.name == 'nt':
     from distutils.msvccompiler import get_build_version
@@ -97,14 +91,11 @@ class build_ext(Command):
          "list of SWIG command line options"),
         ('swig=', None,
          "path to the SWIG executable"),
+        ('user', None,
+         "add user include, library and rpath")
         ]
 
-    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp']
-
-    if HAS_USER_SITE:
-        user_options.append(('user', None,
-                             "add user include, library and rpath"))
-        boolean_options.append('user')
+    boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
 
     help_options = [
         ('help-compiler', None,
diff --git a/sysconfig.py b/sysconfig.py
index 5b94fa2378..a1452fe167 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -151,10 +151,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         if standard_lib:
             return os.path.join(prefix, "Lib")
         else:
-            if get_python_version() < "2.2":
-                return prefix
-            else:
-                return os.path.join(prefix, "Lib", "site-packages")
+            return os.path.join(prefix, "Lib", "site-packages")
     else:
         raise DistutilsPlatformError(
             "I don't know where Python installs its library "
@@ -244,12 +241,8 @@ def get_config_h_filename():
             inc_dir = _sys_home or project_base
     else:
         inc_dir = get_python_inc(plat_specific=1)
-    if get_python_version() < '2.2':
-        config_h = 'config.h'
-    else:
-        # The name of the config.h file changed in 2.2
-        config_h = 'pyconfig.h'
-    return os.path.join(inc_dir, config_h)
+
+    return os.path.join(inc_dir, 'pyconfig.h')
 
 
 def get_makefile_filename():
@@ -461,17 +454,6 @@ def _init_posix():
     if python_build:
         g['LDSHARED'] = g['BLDSHARED']
 
-    elif get_python_version() < '2.1':
-        # The following two branches are for 1.5.2 compatibility.
-        if sys.platform == 'aix4':          # what about AIX 3.x ?
-            # Linker script is in the config directory, not in Modules as the
-            # Makefile says.
-            python_lib = get_python_lib(standard_lib=1)
-            ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-            python_exp = os.path.join(python_lib, 'config', 'python.exp')
-
-            g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
-
     global _config_vars
     _config_vars = g
 
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index e9958667a4..b9f407f401 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -31,12 +31,11 @@ def setUp(self):
         self.tmp_dir = self.mkdtemp()
         self.sys_path = sys.path, sys.path[:]
         sys.path.append(self.tmp_dir)
-        if sys.version > "2.6":
-            import site
-            self.old_user_base = site.USER_BASE
-            site.USER_BASE = self.mkdtemp()
-            from distutils.command import build_ext
-            build_ext.USER_BASE = site.USER_BASE
+        import site
+        self.old_user_base = site.USER_BASE
+        site.USER_BASE = self.mkdtemp()
+        from distutils.command import build_ext
+        build_ext.USER_BASE = site.USER_BASE
 
     def test_build_ext(self):
         global ALREADY_TESTED
@@ -84,11 +83,10 @@ def tearDown(self):
         support.unload('xx')
         sys.path = self.sys_path[0]
         sys.path[:] = self.sys_path[1]
-        if sys.version > "2.6":
-            import site
-            site.USER_BASE = self.old_user_base
-            from distutils.command import build_ext
-            build_ext.USER_BASE = self.old_user_base
+        import site
+        site.USER_BASE = self.old_user_base
+        from distutils.command import build_ext
+        build_ext.USER_BASE = self.old_user_base
         super(BuildExtTestCase, self).tearDown()
 
     def test_solaris_enable_shared(self):

From 199a482b6127e3e896809cbb82486ef167985da0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 9 Sep 2014 09:38:58 -0400
Subject: [PATCH 4347/8469] Move sister functions into proximity

---
 pkg_resources.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ee2c553ba1..23ac1a36e5 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -81,15 +81,6 @@ def execfile(fn, globs=None, locs=None):
 except ImportError:
     pass
 
-def _bypass_ensure_directory(name, mode=0o777):
-    # Sandbox-bypassing version of ensure_directory()
-    if not WRITE_SUPPORT:
-        raise IOError('"os.mkdir" not supported on this platform.')
-    dirname, filename = split(name)
-    if dirname and filename and not isdir(dirname):
-        _bypass_ensure_directory(dirname)
-        mkdir(dirname, mode)
-
 
 _state_vars = {}
 
@@ -2824,6 +2815,17 @@ def ensure_directory(path):
     if not os.path.isdir(dirname):
         os.makedirs(dirname)
 
+
+def _bypass_ensure_directory(name, mode=0o777):
+    """Sandbox-bypassing version of ensure_directory()"""
+    if not WRITE_SUPPORT:
+        raise IOError('"os.mkdir" not supported on this platform.')
+    dirname, filename = split(name)
+    if dirname and filename and not isdir(dirname):
+        _bypass_ensure_directory(dirname)
+        mkdir(dirname, mode)
+
+
 def split_sections(s):
     """Split a string or iterable thereof into (section, content) pairs
 

From c689acd8690d72a8d59085abbac98a41896f43c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 9 Sep 2014 09:39:47 -0400
Subject: [PATCH 4348/8469] Rename argument for consistency

--HG--
extra : amend_source : 006c17fc01743ef7f646bf54a166cbaeae92ab75
---
 pkg_resources.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 23ac1a36e5..0898391951 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2816,11 +2816,11 @@ def ensure_directory(path):
         os.makedirs(dirname)
 
 
-def _bypass_ensure_directory(name, mode=0o777):
+def _bypass_ensure_directory(path, mode=0o777):
     """Sandbox-bypassing version of ensure_directory()"""
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')
-    dirname, filename = split(name)
+    dirname, filename = split(path)
     if dirname and filename and not isdir(dirname):
         _bypass_ensure_directory(dirname)
         mkdir(dirname, mode)

From da99f1334e36171fdd2c4bbb7dee4845c6ad7dc5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:13:18 -0400
Subject: [PATCH 4349/8469] Add indicators for PY2 vs. PY3

--HG--
extra : rebase_source : 549637a713aba52da4c87f1a84436832eba82f1e
---
 pkg_resources.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 0898391951..9992b17d37 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -35,6 +35,9 @@
 import tempfile
 from pkgutil import get_importer
 
+PY3 = sys.version_info > (3,)
+PY2 = not PY3
+
 try:
     from urlparse import urlparse, urlunparse
 except ImportError:

From 26e4f9534a35fc13ec2c5e111e639d4af03e5644 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:16:33 -0400
Subject: [PATCH 4350/8469] Remove conditional import for frozenset (available
 in Python 2.6+)

---
 pkg_resources.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 9992b17d37..a056668872 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -43,10 +43,6 @@
 except ImportError:
     from urllib.parse import urlparse, urlunparse
 
-try:
-    frozenset
-except NameError:
-    from sets import ImmutableSet as frozenset
 try:
     basestring
     next = lambda o: o.next()

From 8f56e928f03f69a5e787f830c04714467307601e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:21:24 -0400
Subject: [PATCH 4351/8469] Use PY3/PY2 indicators to reliably select behavior.
 Fixes #237

--HG--
extra : amend_source : 33f3d298acd39933ccf60810902feb2a5d51c793
---
 CHANGES.txt      |  8 ++++++++
 pkg_resources.py | 17 +++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 83b05bbe55..185052fb12 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+5.8
+---
+
+* Issue #237: ``pkg_resources`` now uses explicit detection of Python 2 vs.
+  Python 3, supporting environments where builtins have been patched to make
+  Python 3 look more like Python 2.
+
 ---
 5.7
 ---
diff --git a/pkg_resources.py b/pkg_resources.py
index a056668872..5dcfd66ede 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -38,16 +38,13 @@
 PY3 = sys.version_info > (3,)
 PY2 = not PY3
 
-try:
-    from urlparse import urlparse, urlunparse
-except ImportError:
+if PY3:
     from urllib.parse import urlparse, urlunparse
 
-try:
-    basestring
-    next = lambda o: o.next()
-    from cStringIO import StringIO as BytesIO
-except NameError:
+if PY2:
+    from urlparse import urlparse, urlunparse
+
+if PY3:
     basestring = str
     from io import BytesIO
     def execfile(fn, globs=None, locs=None):
@@ -57,6 +54,10 @@ def execfile(fn, globs=None, locs=None):
             locs = globs
         exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
+if PY2:
+    next = lambda o: o.next()
+    from cStringIO import StringIO as BytesIO
+
 # capture these to bypass sandboxing
 from os import utime
 try:

From a2201d3d5a74ea034caf2f6eeeb877708e9017bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:25:45 -0400
Subject: [PATCH 4352/8469] next function and io module are available on Python
 2.6

---
 pkg_resources.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5dcfd66ede..d8c73320d3 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -16,6 +16,7 @@
 
 import sys
 import os
+import io
 import time
 import re
 import imp
@@ -46,7 +47,6 @@
 
 if PY3:
     basestring = str
-    from io import BytesIO
     def execfile(fn, globs=None, locs=None):
         if globs is None:
             globs = globals()
@@ -54,10 +54,6 @@ def execfile(fn, globs=None, locs=None):
             locs = globs
         exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
 
-if PY2:
-    next = lambda o: o.next()
-    from cStringIO import StringIO as BytesIO
-
 # capture these to bypass sandboxing
 from os import utime
 try:
@@ -1378,7 +1374,7 @@ def get_resource_filename(self, manager, resource_name):
         return self._fn(self.module_path, resource_name)
 
     def get_resource_stream(self, manager, resource_name):
-        return BytesIO(self.get_resource_string(manager, resource_name))
+        return io.BytesIO(self.get_resource_string(manager, resource_name))
 
     def get_resource_string(self, manager, resource_name):
         return self._get(self._fn(self.module_path, resource_name))

From 5d3002955232bb6a2b83faee486cd362dbbf8fa3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:31:09 -0400
Subject: [PATCH 4353/8469] Use the term 'string_types', following the pattern
 in six

--HG--
extra : amend_source : 3a4aeb2627549c3dfec15067579eccc8e1314de2
---
 pkg_resources.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index d8c73320d3..825b30042d 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -46,13 +46,15 @@
     from urlparse import urlparse, urlunparse
 
 if PY3:
-    basestring = str
+    string_types = str,
     def execfile(fn, globs=None, locs=None):
         if globs is None:
             globs = globals()
         if locs is None:
             locs = globs
         exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
+else:
+    string_types = str, eval('unicode')
 
 # capture these to bypass sandboxing
 from os import utime
@@ -330,7 +332,7 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist, basestring):
+    if isinstance(dist, string_types):
         dist = Requirement.parse(dist)
     if isinstance(dist, Requirement):
         dist = get_provider(dist)
@@ -2050,8 +2052,8 @@ def _set_parent_ns(packageName):
 
 
 def yield_lines(strs):
-    """Yield non-empty/non-comment lines of a ``basestring`` or sequence"""
-    if isinstance(strs, basestring):
+    """Yield non-empty/non-comment lines of a string or sequence"""
+    if isinstance(strs, string_types):
         for s in strs.splitlines():
             s = s.strip()
             # skip blank lines/comments
@@ -2643,8 +2645,7 @@ def issue_warning(*args,**kw):
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
-    `strs` must be an instance of ``basestring``, or a (possibly-nested)
-    iterable thereof.
+    `strs` must be a string, or a (possibly-nested) iterable thereof.
     """
     # create a steppable iterator, so we can handle \-continuations
     lines = iter(yield_lines(strs))
@@ -2745,7 +2746,7 @@ def __contains__(self, item):
             # only get if we need it
             if self.index:
                 item = item.parsed_version
-        elif isinstance(item, basestring):
+        elif isinstance(item, string_types):
             item = parse_version(item)
         last = None
         # -1, 0, 1

From d1bcc3545099d652f07fc13e1cfb449d0ed87d58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:34:23 -0400
Subject: [PATCH 4354/8469] Remove execfile compatibility - unnecessary on
 Python 2.6+

--HG--
extra : amend_source : 8a0dcd07e62a327647c834a44fe73b8ebc7b53b9
---
 pkg_resources.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 825b30042d..517298c90d 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -47,12 +47,6 @@
 
 if PY3:
     string_types = str,
-    def execfile(fn, globs=None, locs=None):
-        if globs is None:
-            globs = globals()
-        if locs is None:
-            locs = globs
-        exec(compile(open(fn).read(), fn, 'exec'), globs, locs)
 else:
     string_types = str, eval('unicode')
 
@@ -1424,7 +1418,9 @@ def run_script(self, script_name, namespace):
         script_filename = self._fn(self.egg_info, script)
         namespace['__file__'] = script_filename
         if os.path.exists(script_filename):
-            execfile(script_filename, namespace, namespace)
+            source = open(script_filename).read()
+            code = compile(source, script_filename, 'exec')
+            exec(code, namespace, namespace)
         else:
             from linecache import cache
             cache[script_filename] = (

From ea26aa25a738d9c805fd5b44b053138f0e560c20 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:39:44 -0400
Subject: [PATCH 4355/8469] Added tag 5.8 for changeset 67550a8ed9f4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1f1cac00e3..1753222139 100644
--- a/.hgtags
+++ b/.hgtags
@@ -153,3 +153,4 @@ ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 949a66af4f03521e1404deda940aa951418a13d2 5.5.1
 a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 37ed55fd310d0cd32009dc5676121e86b404a23d 5.7
+67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8

From 394ea0c104e7da5cf583680b418c3e5e4b9858d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Sep 2014 07:40:48 -0400
Subject: [PATCH 4356/8469] Bumped to 5.9 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 74c8224a3d..0fd1c8725e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.8"
+DEFAULT_VERSION = "5.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 868f2d33f3..7244139e8f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.8'
+__version__ = '5.9'

From aa5115c381d6b79e8db3a860bf71bf403c6fdb99 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 20 Sep 2014 11:53:12 -0400
Subject: [PATCH 4357/8469] use patch context manager instead of decorator
 because the decorator 'leaks' metadata onto the function

---
 tests/test_dir_util.py  |  6 +++---
 tests/test_file_util.py | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py
index d2696b822c..d436cf8319 100644
--- a/tests/test_dir_util.py
+++ b/tests/test_dir_util.py
@@ -122,12 +122,12 @@ def test_ensure_relative(self):
             self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
-    @patch('os.listdir', side_effect=OSError())
-    def test_copy_tree_exception_in_listdir(self, listdir):
+    def test_copy_tree_exception_in_listdir(self):
         """
         An exception in listdir should raise a DistutilsFileError
         """
-        with self.assertRaises(errors.DistutilsFileError):
+        with patch("os.listdir", side_effect=OSError()), \
+             self.assertRaises(errors.DistutilsFileError):
             src = self.tempdirs[-1]
             dir_util.copy_tree(src, None)
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 270f81ebb6..d3db5cef0e 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -61,24 +61,23 @@ def test_move_file_verbosity(self):
         wanted = ['moving %s -> %s' % (self.source, self.target_dir)]
         self.assertEqual(self._logs, wanted)
 
-    @patch('os.rename', side_effect=OSError('wrong', 1))
-    def test_move_file_exception_unpacking_rename(self, _):
+    def test_move_file_exception_unpacking_rename(self):
         # see issue 22182
-        with self.assertRaises(DistutilsFileError):
+        with patch("os.rename", side_effect=OSError("wrong", 1)), \
+             self.assertRaises(DistutilsFileError):
             with open(self.source, 'w') as fobj:
                 fobj.write('spam eggs')
             move_file(self.source, self.target, verbose=0)
 
-    @patch('os.rename', side_effect=OSError(errno.EXDEV, 'wrong'))
-    @patch('os.unlink', side_effect=OSError('wrong', 1))
-    def test_move_file_exception_unpacking_unlink(self, rename, unlink):
+    def test_move_file_exception_unpacking_unlink(self):
         # see issue 22182
-        with self.assertRaises(DistutilsFileError):
+        with patch("os.rename", side_effect=OSError(errno.EXDEV, "wrong")), \
+             patch("os.unlink", side_effect=OSError("wrong", 1)), \
+             self.assertRaises(DistutilsFileError):
             with open(self.source, 'w') as fobj:
                 fobj.write('spam eggs')
             move_file(self.source, self.target, verbose=0)
 
-
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
 

From 4e5c7d0657a9719d2fa961c852daf0926de91ae3 Mon Sep 17 00:00:00 2001
From: Randy Syring <randy.syring@lev12.com>
Date: Sat, 20 Sep 2014 16:29:41 -0400
Subject: [PATCH 4358/8469] sdist command: fix case insensitivity when adding
 some files to filelist

This should fix the problem in Bitbucket issue #100.  It gives the same behavior
for inclusion of default files (README*, etc.) on Windows as Linux.

BACKWARDS INCOMPATABILITY:

This may result in a backwards incompatible change for users on a
case insensitive file system.  If they were relying on some files getting
included in their distribution due to setuptools defaults, and their files do not
have the same case as the files being looked for in setuptools, those files
will no longer be included in the package.

For example, if a package had a file:

readme.rst

Previous to this commit, that file would have been included in the distribution
as:

README.rst

But it will now no longer be included at all.  To get the file included in
the package, it can be added to the package's MANIFEST.in file:

include readme.rst

Files affected by this change will have a case variant of the files or
patterns listed below:

README
README.txt
README.rst
setup.py (or whatever your setuptools script is named)
setup.cfg
test/test*.py
---
 setuptools/command/sdist.py    | 11 +++++++----
 setuptools/tests/test_sdist.py | 28 ++++++++++++++++++++++++++++
 setuptools/utils.py            | 11 +++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 setuptools/utils.py

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2aa1ee20fd..dc8d677395 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -8,6 +8,8 @@
 
 from setuptools import svn_utils
 from setuptools.compat import PY3
+from setuptools.utils import cs_path_exists
+
 import pkg_resources
 
 READMES = ('README', 'README.rst', 'README.txt')
@@ -146,7 +148,7 @@ def add_defaults(self):
                 alts = fn
                 got_it = 0
                 for fn in alts:
-                    if os.path.exists(fn):
+                    if cs_path_exists(fn):
                         got_it = 1
                         self.filelist.append(fn)
                         break
@@ -155,16 +157,17 @@ def add_defaults(self):
                     self.warn("standard file not found: should have one of " +
                               ', '.join(alts))
             else:
-                if os.path.exists(fn):
+                if cs_path_exists(fn):
                     self.filelist.append(fn)
                 else:
                     self.warn("standard file '%s' not found" % fn)
 
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
-            files = list(filter(os.path.isfile, glob(pattern)))
+            files = list(filter(cs_path_exists, glob(pattern)))
             if files:
-                self.filelist.extend(files)
+                actual_fnames = map(os.path.normcase, files)
+                self.filelist.extend(actual_fnames)
 
         # getting python files
         if self.distribution.has_pure_modules():
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 5b3862e998..5f8a190f46 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -86,6 +86,7 @@ def setUp(self):
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
         f.write(SETUP_PY)
         f.close()
+
         # Set up the rest of the test package
         test_pkg = os.path.join(self.temp_dir, 'sdist_test')
         os.mkdir(test_pkg)
@@ -121,6 +122,33 @@ def test_package_data_in_sdist(self):
         self.assertTrue(os.path.join('sdist_test', 'b.txt') in manifest)
         self.assertTrue(os.path.join('sdist_test', 'c.rst') not in manifest)
 
+
+    def test_defaults_case_sensitivity(self):
+        """
+            Make sure default files (README.*, etc.) are added in a case-sensitive
+            way to avoid problems with packages built on Windows.
+        """
+
+        open(os.path.join(self.temp_dir, 'readme.rst'), 'w').close()
+        open(os.path.join(self.temp_dir, 'SETUP.cfg'), 'w').close()
+
+        dist = Distribution(SETUP_ATTRS)
+        # the extension deliberately capitalized for this test
+        # to make sure the actual filename (not capitalized) gets added
+        # to the manifest
+        dist.script_name = 'setup.PY'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        with quiet():
+            cmd.run()
+
+        # lowercase all names so we can test in a case-insensitive way to make sure the files are not included
+        manifest = map(lambda x: x.lower(), cmd.filelist.files)
+        self.assertFalse('readme.rst' in manifest, manifest)
+        self.assertFalse('setup.py' in manifest, manifest)
+        self.assertFalse('setup.cfg' in manifest, manifest)
+
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
diff --git a/setuptools/utils.py b/setuptools/utils.py
new file mode 100644
index 0000000000..91e4b87f65
--- /dev/null
+++ b/setuptools/utils.py
@@ -0,0 +1,11 @@
+import os
+import os.path
+
+
+def cs_path_exists(fspath):
+    if not os.path.exists(fspath): 
+        return False
+    # make absolute so we always have a directory
+    abspath = os.path.abspath(fspath)
+    directory, filename = os.path.split(abspath)
+    return filename in os.listdir(directory)
\ No newline at end of file

From 1c05e6a7b7f2a54a55285857d498409df3dc9383 Mon Sep 17 00:00:00 2001
From: Randy Syring <randy.syring@lev12.com>
Date: Sat, 20 Sep 2014 16:37:25 -0400
Subject: [PATCH 4359/8469] remove unneeded code from last commit

---
 setuptools/command/sdist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index dc8d677395..a77c39f298 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -166,8 +166,7 @@ def add_defaults(self):
         for pattern in optional:
             files = list(filter(cs_path_exists, glob(pattern)))
             if files:
-                actual_fnames = map(os.path.normcase, files)
-                self.filelist.extend(actual_fnames)
+                self.filelist.extend(files)
 
         # getting python files
         if self.distribution.has_pure_modules():

From 17fc42a928be89366e183179353ae2a69ce48d93 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 21 Sep 2014 00:09:56 +0100
Subject: [PATCH 4360/8469] Bump version number for 3.4.2rc1 release.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 9463a35c79..750a5033ac 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.1"
+__version__ = "3.4.2rc1"
 #--end constants--

From d42aea783a347d431eaf293250bab60c05b4c779 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Sep 2014 00:22:22 -0400
Subject: [PATCH 4361/8469] Update changelog

---
 CHANGES.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 185052fb12..a6e27372d6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,28 @@
 CHANGES
 =======
 
+---
+6.0
+---
+
+* Issue #100: When building a distribution, Setuptools will no longer match
+  default files using platform-dependent case sensitivity, but rather will
+  only match the files if their case matches exactly. As a result, on Windows
+  and other case-insensitive file systems, files with names such as
+  'readme.txt' or 'README.TXT' will be omitted from the distribution and a
+  warning will be issued indicating that 'README.txt' was not found. Other
+  filenames affected are:
+
+    - README.rst
+    - README
+    - setup.cfg
+    - setup.py (or the script name)
+    - test/test*.py
+
+  Any users producing distributions with filenames that match those above
+  case-insensitively, but not case-sensitively, should rename those files in
+  their repository for better portability.
+
 ---
 5.8
 ---

From b0f93f3bdd1d67cce1dd03d4a6ecea8256fa4e55 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 25 Sep 2014 08:46:53 -0700
Subject: [PATCH 4362/8469] Adds monkeypatching for
 msvc9compiler.find_vcvarsall() to look for a standalone compiler installation
 and improves the error message for missing VC installation.

---
 setuptools/extension.py                |  54 ++++++++++
 setuptools/tests/test_msvc9compiler.py | 135 +++++++++++++++++++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 setuptools/tests/test_msvc9compiler.py

diff --git a/setuptools/extension.py b/setuptools/extension.py
index ab5908dabb..41a817b79a 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -2,12 +2,66 @@
 import re
 import functools
 import distutils.core
+import distutils.errors
 import distutils.extension
+import distutils.msvc9compiler
 
 from setuptools.dist import _get_unpatched
 
 _Extension = _get_unpatched(distutils.core.Extension)
 
+def _patch_msvc9compiler_find_vcvarsall():
+    """
+    Looks for the standalone VC for Python before falling back on
+    distutils's original approach.
+    """
+    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
+    find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
+    query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
+    if find_vcvarsall and find_vcvarsall.__module__.startswith('setuptools.'):
+        # Already patched
+        return
+    
+    def _find_vcvarsall(version):
+        Reg = distutils.msvc9compiler.Reg
+        try:
+            # Per-user installs register the compiler path here
+            productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
+        except KeyError:
+            try:
+                # All-user installs on a 64-bit system register here
+                productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
+            except KeyError:
+                productdir = None
+        
+        if productdir:
+            import os
+            vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+            if os.path.isfile(vcvarsall):
+                return vcvarsall
+        
+        return find_vcvarsall(version)
+    
+    def _query_vcvarsall(version, *args, **kwargs):
+        try:
+            return query_vcvarsall(version, *args, **kwargs)
+        except distutils.errors.DistutilsPlatformError:
+            exc = sys.exc_info()[1]
+            if exc and "vcvarsall.bat" in exc.args[0]:
+                message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
+                if int(version) == 9:
+                    # This redirection link is maintained by Microsoft.
+                    # Contact vspython@microsoft.com if it needs updating.
+                    raise distutils.errors.DistutilsPlatformError(
+                        message + ' Get it from http://aka.ms/vcpython27'
+                    )
+                raise distutils.errors.DistutilsPlatformError(message)
+            raise
+
+    distutils.msvc9compiler.find_vcvarsall = _find_vcvarsall
+    distutils.msvc9compiler.query_vcvarsall = _query_vcvarsall
+_patch_msvc9compiler_find_vcvarsall()
+
 def have_pyrex():
     """
     Return True if Cython or Pyrex can be imported.
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
new file mode 100644
index 0000000000..272e99e8e9
--- /dev/null
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -0,0 +1,135 @@
+"""msvc9compiler monkey patch test
+
+This test ensures that importing setuptools is sufficient to replace
+the standard find_vcvarsall function with our patched version that
+finds the Visual C++ for Python package.
+"""
+
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+try:
+    from winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
+except ImportError:
+    from _winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
+
+import distutils.msvc9compiler
+from distutils.errors import DistutilsPlatformError
+
+# importing only setuptools should apply the patch
+import setuptools
+
+class MockReg:
+    """Mock for distutils.msvc9compiler.Reg. We patch it
+    with an instance of this class that mocks out the
+    functions that access the registry.
+    """
+    
+    def __init__(self, hkey_local_machine={}, hkey_current_user={}):
+        self.hklm = hkey_local_machine
+        self.hkcu = hkey_current_user
+    
+    def __enter__(self):
+        self.original_read_keys = distutils.msvc9compiler.Reg.read_keys
+        self.original_read_values = distutils.msvc9compiler.Reg.read_values
+        
+        hives = {
+            HKEY_CURRENT_USER: self.hkcu,
+            HKEY_LOCAL_MACHINE: self.hklm,
+        }
+        
+        def read_keys(cls, base, key):
+            """Return list of registry keys."""
+            hive = hives.get(base, {})
+            return [k.rpartition('\\')[2]
+                    for k in hive if k.startswith(key.lower())]
+
+        def read_values(cls, base, key):
+            """Return dict of registry keys and values."""
+            hive = hives.get(base, {})
+            return dict((k.rpartition('\\')[2], hive[k])
+                        for k in hive if k.startswith(key.lower()))
+        
+        distutils.msvc9compiler.Reg.read_keys = classmethod(read_keys)
+        distutils.msvc9compiler.Reg.read_values = classmethod(read_values)
+        
+        return self
+    
+    def __exit__(self, exc_type, exc_value, exc_tb):
+        distutils.msvc9compiler.Reg.read_keys = self.original_read_keys
+        distutils.msvc9compiler.Reg.read_values = self.original_read_values
+
+class TestMSVC9Compiler(unittest.TestCase):
+
+    def test_find_vcvarsall_patch(self):
+        self.assertEqual(
+            "setuptools.extension",
+            distutils.msvc9compiler.find_vcvarsall.__module__,
+            "find_vcvarsall was not patched"
+        )
+
+        find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
+        query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
+
+        # No registry entries or environment variable means we should
+        # not find anything
+        old_value = os.environ.pop("VS90COMNTOOLS", None)
+        try:
+            with MockReg():
+                self.assertIsNone(find_vcvarsall(9.0))
+                
+                try:
+                    query_vcvarsall(9.0)
+                    self.fail('Expected DistutilsPlatformError from query_vcvarsall()')
+                except DistutilsPlatformError:
+                    exc_message = str(sys.exc_info()[1])
+                self.assertIn('aka.ms/vcpython27', exc_message)
+        finally:
+            if old_value:
+                os.environ["VS90COMNTOOLS"] = old_value
+        
+        key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
+        key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
+        
+        # Make two mock files so we can tell whether HCKU entries are
+        # preferred to HKLM entries.
+        mock_installdir_1 = tempfile.mkdtemp()
+        mock_vcvarsall_bat_1 = os.path.join(mock_installdir_1, 'vcvarsall.bat')
+        open(mock_vcvarsall_bat_1, 'w').close()
+        mock_installdir_2 = tempfile.mkdtemp()
+        mock_vcvarsall_bat_2 = os.path.join(mock_installdir_2, 'vcvarsall.bat')
+        open(mock_vcvarsall_bat_2, 'w').close()
+        try:
+            # Ensure we get the current user's setting first
+            with MockReg(
+                hkey_current_user={ key_32: mock_installdir_1 },
+                hkey_local_machine={
+                    key_32: mock_installdir_2,
+                    key_64: mock_installdir_2,
+                }
+            ):
+                self.assertEqual(mock_vcvarsall_bat_1, find_vcvarsall(9.0))
+
+            # Ensure we get the local machine value if it's there
+            with MockReg(hkey_local_machine={ key_32: mock_installdir_2 }):
+                self.assertEqual(mock_vcvarsall_bat_2, find_vcvarsall(9.0))
+
+            # Ensure we prefer the 64-bit local machine key
+            # (*not* the Wow6432Node key)
+            with MockReg(
+                hkey_local_machine={
+                    # This *should* only exist on 32-bit machines
+                    key_32: mock_installdir_1,
+                    # This *should* only exist on 64-bit machines
+                    key_64: mock_installdir_2,
+                }
+            ):
+                self.assertEqual(mock_vcvarsall_bat_1, find_vcvarsall(9.0))
+        finally:
+            shutil.rmtree(mock_installdir_1)
+            shutil.rmtree(mock_installdir_2)
+
+    
\ No newline at end of file

From 84c9006110e53c84296a05741edb7b9edd305f12 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Thu, 4 Sep 2014 20:27:48 -0400
Subject: [PATCH 4363/8469] Add a vendored copy of packaging

---
 Makefile                                    |   7 +
 setuptools/_vendor/packaging/__about__.py   |  31 +
 setuptools/_vendor/packaging/__init__.py    |  24 +
 setuptools/_vendor/packaging/_compat.py     |  27 +
 setuptools/_vendor/packaging/_structures.py |  78 ++
 setuptools/_vendor/packaging/version.py     | 786 ++++++++++++++++++++
 setuptools/_vendor/vendored.txt             |   1 +
 7 files changed, 954 insertions(+)
 create mode 100644 Makefile
 create mode 100644 setuptools/_vendor/packaging/__about__.py
 create mode 100644 setuptools/_vendor/packaging/__init__.py
 create mode 100644 setuptools/_vendor/packaging/_compat.py
 create mode 100644 setuptools/_vendor/packaging/_structures.py
 create mode 100644 setuptools/_vendor/packaging/version.py
 create mode 100644 setuptools/_vendor/vendored.txt

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..ab60b882c3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+empty:
+	exit 1
+
+update-vendored:
+	rm -rf setuptools/_vendor/packaging
+	pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
+	rm -rf setuptools/_vendor/*.{egg,dist}-info
diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
new file mode 100644
index 0000000000..b64681e4e7
--- /dev/null
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -0,0 +1,31 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "packaging"
+__summary__ = "Core utilities for Python packages"
+__uri__ = "https://github.com/pypa/packaging"
+
+__version__ = "14.2"
+
+__author__ = "Donald Stufft"
+__email__ = "donald@stufft.io"
+
+__license__ = "Apache License, Version 2.0"
+__copyright__ = "Copyright 2014 %s" % __author__
diff --git a/setuptools/_vendor/packaging/__init__.py b/setuptools/_vendor/packaging/__init__.py
new file mode 100644
index 0000000000..c39a8eab8e
--- /dev/null
+++ b/setuptools/_vendor/packaging/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+from .__about__ import (
+    __author__, __copyright__, __email__, __license__, __summary__, __title__,
+    __uri__, __version__
+)
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
diff --git a/setuptools/_vendor/packaging/_compat.py b/setuptools/_vendor/packaging/_compat.py
new file mode 100644
index 0000000000..f2ff383499
--- /dev/null
+++ b/setuptools/_vendor/packaging/_compat.py
@@ -0,0 +1,27 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+# flake8: noqa
+
+if PY3:
+    string_types = str,
+else:
+    string_types = basestring,
diff --git a/setuptools/_vendor/packaging/_structures.py b/setuptools/_vendor/packaging/_structures.py
new file mode 100644
index 0000000000..0ae9bb52a2
--- /dev/null
+++ b/setuptools/_vendor/packaging/_structures.py
@@ -0,0 +1,78 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+
+class Infinity(object):
+
+    def __repr__(self):
+        return "Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return False
+
+    def __le__(self, other):
+        return False
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return True
+
+    def __ge__(self, other):
+        return True
+
+    def __neg__(self):
+        return NegativeInfinity
+
+Infinity = Infinity()
+
+
+class NegativeInfinity(object):
+
+    def __repr__(self):
+        return "-Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return True
+
+    def __le__(self, other):
+        return True
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return False
+
+    def __ge__(self, other):
+        return False
+
+    def __neg__(self):
+        return Infinity
+
+NegativeInfinity = NegativeInfinity()
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
new file mode 100644
index 0000000000..0affe899f4
--- /dev/null
+++ b/setuptools/_vendor/packaging/version.py
@@ -0,0 +1,786 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+
+from ._compat import string_types
+from ._structures import Infinity
+
+
+__all__ = [
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "Specifier",
+    "InvalidSpecifier",
+]
+
+
+_Version = collections.namedtuple(
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
+)
+
+
+def parse(version):
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+
+    def __hash__(self):
+        return hash(self._key)
+
+    def __lt__(self, other):
+        return self._compare(other, lambda s, o: s < o)
+
+    def __le__(self, other):
+        return self._compare(other, lambda s, o: s <= o)
+
+    def __eq__(self, other):
+        return self._compare(other, lambda s, o: s == o)
+
+    def __ge__(self, other):
+        return self._compare(other, lambda s, o: s >= o)
+
+    def __gt__(self, other):
+        return self._compare(other, lambda s, o: s > o)
+
+    def __ne__(self, other):
+        return self._compare(other, lambda s, o: s != o)
+
+    def _compare(self, other, method):
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return method(self._key, other._key)
+
+
+class LegacyVersion(_BaseVersion):
+
+    def __init__(self, version):
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+    def __str__(self):
+        return self._version
+
+    def __repr__(self):
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        return self._version
+
+    @property
+    def local(self):
+        return None
+
+    @property
+    def is_prerelease(self):
+        return False
+
+
+_legacy_version_component_re = re.compile(
+    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
+)
+
+_legacy_version_replacement_map = {
+    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+    parts = tuple(parts)
+
+    return epoch, parts
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        v?
+        (?:
+            (?:(?P<epoch>[0-9]+)!)?                           # epoch
+            (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+            (?P<pre>                                          # pre-release
+                [-_\.]?
+                (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+                [-_\.]?
+                (?P<pre_n>[0-9]+)?
+            )?
+            (?P<post>                                         # post release
+                (?:-(?P<post_n1>[0-9]+))
+                |
+                (?:
+                    [-_\.]?
+                    (?P<post_l>post|rev|r)
+                    [-_\.]?
+                    (?P<post_n2>[0-9]+)?
+                )
+            )?
+            (?P<dev>                                          # dev release
+                [-_\.]?
+                (?P<dev_l>dev)
+                [-_\.]?
+                (?P<dev_n>[0-9]+)?
+            )?
+        )
+        (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    def __init__(self, version):
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(
+                match.group("pre_l"),
+                match.group("pre_n"),
+            ),
+            post=_parse_letter_version(
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
+            ),
+            dev=_parse_letter_version(
+                match.group("dev_l"),
+                match.group("dev_n"),
+            ),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        # Pre-release
+        if self._version.pre is not None:
+            parts.append("".join(str(x) for x in self._version.pre))
+
+        # Post-release
+        if self._version.post is not None:
+            parts.append(".post{0}".format(self._version.post[1]))
+
+        # Development release
+        if self._version.dev is not None:
+            parts.append(".dev{0}".format(self._version.dev[1]))
+
+        # Local version segment
+        if self._version.local is not None:
+            parts.append(
+                "+{0}".format(".".join(str(x) for x in self._version.local))
+            )
+
+        return "".join(parts)
+
+    @property
+    def public(self):
+        return str(self).split("+", 1)[0]
+
+    @property
+    def local(self):
+        version_string = str(self)
+        if "+" in version_string:
+            return version_string.split("+", 1)[1]
+
+    @property
+    def is_prerelease(self):
+        return bool(self._version.dev or self._version.pre)
+
+
+def _parse_letter_version(letter, number):
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["rc", "pre", "preview"]:
+            letter = "c"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+
+_local_version_seperators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_seperators.split(local)
+        )
+
+
+def _cmpkey(epoch, release, pre, post, dev, local):
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    release = tuple(
+        reversed(list(
+            itertools.dropwhile(
+                lambda x: x == 0,
+                reversed(release),
+            )
+        ))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        pre = -Infinity
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        pre = Infinity
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        post = -Infinity
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        dev = Infinity
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        local = -Infinity
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        local = tuple(
+            (i, "") if isinstance(i, int) else (-Infinity, i)
+            for i in local
+        )
+
+    return epoch, release, pre, post, dev, local
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class Specifier(object):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    def __init__(self, specs="", prereleases=None):
+        # Split on comma to get each individual specification
+        _specs = set()
+        for spec in (s for s in specs.split(",") if s):
+            match = self._regex.search(spec)
+            if not match:
+                raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+            _specs.add(
+                (
+                    match.group("operator").strip(),
+                    match.group("version").strip(),
+                )
+            )
+
+        # Set a frozen set for our specifications
+        self._specs = frozenset(_specs)
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        return "<Specifier({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        return ",".join(["".join(s) for s in sorted(self._specs)])
+
+    def __hash__(self):
+        return hash(self._specs)
+
+    def __and__(self, other):
+        if isinstance(other, string_types):
+            other = Specifier(other)
+        elif not isinstance(other, Specifier):
+            return NotImplemented
+
+        return self.__class__(",".join([str(self), str(other)]))
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            other = Specifier(other)
+        elif not isinstance(other, Specifier):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            other = Specifier(other)
+        elif not isinstance(other, Specifier):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    def _get_operator(self, op):
+        return getattr(self, "_compare_{0}".format(self._operators[op]))
+
+    def _compare_compatible(self, prospective, spec):
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post")
+                               and not x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return (self._get_operator(">=")(prospective, spec)
+                and self._get_operator("==")(prospective, prefix))
+
+    def _compare_equal(self, prospective, spec):
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            prospective = prospective[:len(spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            spec, prospective = _pad_version(spec, prospective)
+        else:
+            # Convert our spec string into a Version
+            spec = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec.local:
+                prospective = Version(prospective.public)
+
+        return prospective == spec
+
+    def _compare_not_equal(self, prospective, spec):
+        return not self._compare_equal(prospective, spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= Version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= Version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        # Less than are defined as exclusive operators, this implies that
+        # pre-releases do not match for the same series as the spec. This is
+        # implemented by making <V imply !=V.*.
+        return (prospective < Version(spec)
+                and self._get_operator("!=")(prospective, spec + ".*"))
+
+    def _compare_greater_than(self, prospective, spec):
+        # Greater than are defined as exclusive operators, this implies that
+        # pre-releases do not match for the same series as the spec. This is
+        # implemented by making >V imply !=V.*.
+        return (prospective > Version(spec)
+                and self._get_operator("!=")(prospective, spec + ".*"))
+
+    def _compare_arbitrary(self, prospective, spec):
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        for spec, version in self._specs:
+            if spec in ["==", ">=", "<=", "~="]:
+                # The == specifier can include a trailing .*, if it does we
+                # want to remove before parsing.
+                if spec == "==" and version.endswith(".*"):
+                    version = version[:-2]
+
+                # Parse the version, and if it is a pre-release than this
+                # specifier allows pre-releases.
+                if parse(version).is_prerelease:
+                    return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def contains(self, item, prereleases=None):
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        if isinstance(item, (Version, LegacyVersion)):
+            version_item = item
+        else:
+            try:
+                version_item = Version(item)
+            except ValueError:
+                version_item = LegacyVersion(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if version_item.is_prerelease and not prereleases:
+            return False
+
+        # Detect if we have any specifiers, if we do not then anything matches
+        # and we can short circuit all this logic.
+        if not self._specs:
+            return True
+
+        # If we're operating on a LegacyVersion, then we can only support
+        # arbitrary comparison so do a quick check to see if the spec contains
+        # any non arbitrary specifiers
+        if isinstance(version_item, LegacyVersion):
+            if any(op != "===" for op, _ in self._specs):
+                return False
+
+        # Ensure that the passed in version matches all of our version
+        # specifiers
+        return all(
+            self._get_operator(op)(
+                version_item if op != "===" else item,
+                spec,
+            )
+            for op, spec, in self._specs
+        )
+
+    def filter(self, iterable, prereleases=None):
+        iterable = list(iterable)
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            if not isinstance(version, (Version, LegacyVersion)):
+                parsed_version = parse(version)
+            else:
+                parsed_version = version
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if (parsed_version.is_prerelease
+                        and not (prereleases or self.prereleases)):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the begining.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    result = []
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split):])
+    right_split.append(left[len(right_split):])
+
+    # Insert our padding
+    left_split.insert(
+        1,
+        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
+    )
+    right_split.insert(
+        1,
+        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
+    )
+
+    return (
+        list(itertools.chain(*left_split)),
+        list(itertools.chain(*right_split)),
+    )
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
new file mode 100644
index 0000000000..df383d8bd3
--- /dev/null
+++ b/setuptools/_vendor/vendored.txt
@@ -0,0 +1 @@
+packaging==14.2

From 9382fa0c05e533400613e1c7c0a777cabb463390 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Thu, 4 Sep 2014 21:04:06 -0400
Subject: [PATCH 4364/8469] Implement PEP 440 by using the packaging library

---
 CHANGES.txt                        |   4 +-
 docs/pkg_resources.txt             |  66 +++---------
 pkg_resources.py                   | 161 ++++++++---------------------
 setuptools/_vendor/__init__.py     |   0
 setuptools/command/egg_info.py     |   8 +-
 setuptools/dist.py                 |  21 ++++
 setuptools/tests/test_egg_info.py  |   6 +-
 setuptools/tests/test_resources.py |  34 +++---
 8 files changed, 105 insertions(+), 195 deletions(-)
 create mode 100644 setuptools/_vendor/__init__.py

diff --git a/CHANGES.txt b/CHANGES.txt
index a6e27372d6..e458d76c33 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,6 @@
 CHANGES
 =======
 
----
 6.0
 ---
 
@@ -24,6 +23,9 @@ CHANGES
   case-insensitively, but not case-sensitively, should rename those files in
   their repository for better portability.
 
+* Implement PEP 440 within pkg_resources and setuptools. This will cause some
+  versions to no longer be installable without using the ``===`` escape hatch.
+
 ---
 5.8
 ---
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index f4a768e41d..6c6405a82e 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -594,7 +594,7 @@ Requirements Parsing
 
         requirement  ::= project_name versionspec? extras?
         versionspec  ::= comparison version (',' comparison version)*
-        comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>'
+        comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '==='
         extras       ::= '[' extralist? ']'
         extralist    ::= identifier (',' identifier)*
         project_name ::= identifier
@@ -646,13 +646,10 @@ Requirements Parsing
     The ``Requirement`` object's version specifiers (``.specs``) are internally
     sorted into ascending version order, and used to establish what ranges of
     versions are acceptable.  Adjacent redundant conditions are effectively
-    consolidated (e.g. ``">1, >2"`` produces the same results as ``">1"``, and
-    ``"<2,<3"`` produces the same results as``"<3"``). ``"!="`` versions are
+    consolidated (e.g. ``">1, >2"`` produces the same results as ``">2"``, and
+    ``"<2,<3"`` produces the same results as``"<2"``). ``"!="`` versions are
     excised from the ranges they fall within.  The version being tested for
     acceptability is then checked for membership in the resulting ranges.
-    (Note that providing conflicting conditions for the same version (e.g.
-    ``"<2,>=2"`` or ``"==2,!=2"``) is meaningless and may therefore produce
-    bizarre results when compared with actual version number(s).)
 
 ``__eq__(other_requirement)``
     A requirement compares equal to another requirement if they have
@@ -681,10 +678,7 @@ Requirements Parsing
 ``specs``
     A list of ``(op,version)`` tuples, sorted in ascending parsed-version
     order.  The `op` in each tuple is a comparison operator, represented as
-    a string.  The `version` is the (unparsed) version number.  The relative
-    order of tuples containing the same version numbers is undefined, since
-    having more than one operator for a given version is either redundant or
-    self-contradictory.
+    a string.  The `version` is the (unparsed) version number.
 
 
 Entry Points
@@ -967,7 +961,7 @@ version
     ``ValueError`` is raised.
 
 parsed_version
-    The ``parsed_version`` is a tuple representing a "parsed" form of the
+    The ``parsed_version`` is an object representing a "parsed" form of the
     distribution's ``version``.  ``dist.parsed_version`` is a shortcut for
     calling ``parse_version(dist.version)``.  It is used to compare or sort
     distributions by version.  (See the `Parsing Utilities`_ section below for
@@ -1541,40 +1535,12 @@ Parsing Utilities
 -----------------
 
 ``parse_version(version)``
-    Parse a project's version string, returning a value that can be used to
-    compare versions by chronological order.  Semantically, the format is a
-    rough cross between distutils' ``StrictVersion`` and ``LooseVersion``
-    classes; if you give it versions that would work with ``StrictVersion``,
-    then they will compare the same way.  Otherwise, comparisons are more like
-    a "smarter" form of ``LooseVersion``.  It is *possible* to create
-    pathological version coding schemes that will fool this parser, but they
-    should be very rare in practice.
-
-    The returned value will be a tuple of strings.  Numeric portions of the
-    version are padded to 8 digits so they will compare numerically, but
-    without relying on how numbers compare relative to strings.  Dots are
-    dropped, but dashes are retained.  Trailing zeros between alpha segments
-    or dashes are suppressed, so that e.g. "2.4.0" is considered the same as
-    "2.4". Alphanumeric parts are lower-cased.
-
-    The algorithm assumes that strings like "-" and any alpha string that
-    alphabetically follows "final"  represents a "patch level".  So, "2.4-1"
-    is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is
-    considered newer than "2.4-1", which in turn is newer than "2.4".
-
-    Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that
-    come before "final" alphabetically) are assumed to be pre-release versions,
-    so that the version "2.4" is considered newer than "2.4a1".  Any "-"
-    characters preceding a pre-release indicator are removed.  (In versions of
-    setuptools prior to 0.6a9, "-" characters were not removed, leading to the
-    unintuitive result that "0.2-rc1" was considered a newer version than
-    "0.2".)
-
-    Finally, to handle miscellaneous cases, the strings "pre", "preview", and
-    "rc" are treated as if they were "c", i.e. as though they were release
-    candidates, and therefore are not as new as a version string that does not
-    contain them.  And the string "dev" is treated as if it were an "@" sign;
-    that is, a version coming before even "a" or "alpha".
+    Parsed a project's version string as defined by PEP 440. The returned
+    value will be an object that represents the version. These objects may
+    be compared to each other and sorted. The sorting algorithm is as defined
+    by PEP 440 with the addition that any version which is not a valid PEP 440
+    version will be considered less than any valid PEP 440 version and the
+    invalid versions will continue sorting using the original algorithm.
 
 .. _yield_lines():
 
@@ -1629,10 +1595,12 @@ Parsing Utilities
     See ``to_filename()``.
 
 ``safe_version(version)``
-    Similar to ``safe_name()`` except that spaces in the input become dots, and
-    dots are allowed to exist in the output.  As with ``safe_name()``, if you
-    are generating a filename from this you should replace any "-" characters
-    in the output with underscores.
+    This will return the normalized form of any PEP 440 version, if the version
+    string is not PEP 440 compatible than it is similar to ``safe_name()``
+    except that spaces in the input become dots, and dots are allowed to exist
+    in the output.  As with ``safe_name()``, if you are generating a filename
+    from this you should replace any "-" characters in the output with
+    underscores.
 
 ``safe_extra(extra)``
     Return a "safe" form of an extra's name, suitable for use in a requirement
diff --git a/pkg_resources.py b/pkg_resources.py
index 517298c90d..b59ec52364 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -73,6 +73,14 @@
 except ImportError:
     pass
 
+# Import packaging.version.parse as parse_version for a compat shim with the
+# old parse_version that used to be defined in this file.
+from setuptools._vendor.packaging.version import parse as parse_version
+
+from setuptools._vendor.packaging.version import (
+    Version, InvalidVersion, Specifier,
+)
+
 
 _state_vars = {}
 
@@ -1143,13 +1151,14 @@ def safe_name(name):
 
 
 def safe_version(version):
-    """Convert an arbitrary string to a standard version string
-
-    Spaces become dots, and all other non-alphanumeric characters become
-    dashes, with runs of multiple dashes condensed to a single dash.
     """
-    version = version.replace(' ','.')
-    return re.sub('[^A-Za-z0-9.]+', '-', version)
+    Convert an arbitrary string to a standard version string
+    """
+    try:
+        return str(Version(version))  # this will normalize the version
+    except InvalidVersion:
+        version = version.replace(' ','.')
+        return re.sub('[^A-Za-z0-9.]+', '-', version)
 
 
 def safe_extra(extra):
@@ -2067,7 +2076,7 @@ def yield_lines(strs):
 # Distribution or extra
 DISTRO = re.compile(r"\s*((\w|[-.])+)").match
 # ver. info
-VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match
+VERSION = re.compile(r"\s*(<=?|>=?|===?|!=|~=)\s*((\w|[-.*_!+])+)").match
 # comma between items
 COMMA = re.compile(r"\s*,").match
 OBRACKET = re.compile(r"\s*\[").match
@@ -2079,67 +2088,6 @@ def yield_lines(strs):
     re.VERBOSE | re.IGNORECASE
 ).match
 
-component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
-replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get
-
-def _parse_version_parts(s):
-    for part in component_re.split(s):
-        part = replace(part, part)
-        if not part or part=='.':
-            continue
-        if part[:1] in '0123456789':
-            # pad for numeric comparison
-            yield part.zfill(8)
-        else:
-            yield '*'+part
-
-    # ensure that alpha/beta/candidate are before final
-    yield '*final'
-
-def parse_version(s):
-    """Convert a version string to a chronologically-sortable key
-
-    This is a rough cross between distutils' StrictVersion and LooseVersion;
-    if you give it versions that would work with StrictVersion, then it behaves
-    the same; otherwise it acts like a slightly-smarter LooseVersion. It is
-    *possible* to create pathological version coding schemes that will fool
-    this parser, but they should be very rare in practice.
-
-    The returned value will be a tuple of strings.  Numeric portions of the
-    version are padded to 8 digits so they will compare numerically, but
-    without relying on how numbers compare relative to strings.  Dots are
-    dropped, but dashes are retained.  Trailing zeros between alpha segments
-    or dashes are suppressed, so that e.g. "2.4.0" is considered the same as
-    "2.4". Alphanumeric parts are lower-cased.
-
-    The algorithm assumes that strings like "-" and any alpha string that
-    alphabetically follows "final"  represents a "patch level".  So, "2.4-1"
-    is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is
-    considered newer than "2.4-1", which in turn is newer than "2.4".
-
-    Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that
-    come before "final" alphabetically) are assumed to be pre-release versions,
-    so that the version "2.4" is considered newer than "2.4a1".
-
-    Finally, to handle miscellaneous cases, the strings "pre", "preview", and
-    "rc" are treated as if they were "c", i.e. as though they were release
-    candidates, and therefore are not as new as a version string that does not
-    contain them, and "dev" is replaced with an '@' so that it sorts lower than
-    than any other pre-release tag.
-    """
-    parts = []
-    for part in _parse_version_parts(s.lower()):
-        if part.startswith('*'):
-            # remove '-' before a prerelease tag
-            if part < '*final':
-                while parts and parts[-1] == '*final-':
-                    parts.pop()
-            # remove trailing zeros from each series of numeric parts
-            while parts and parts[-1]=='00000000':
-                parts.pop()
-        parts.append(part)
-    return tuple(parts)
-
 
 class EntryPoint(object):
     """Object representing an advertised importable object"""
@@ -2292,7 +2240,7 @@ def from_location(cls, location, basename, metadata=None,**kw):
     @property
     def hashcmp(self):
         return (
-            getattr(self, 'parsed_version', ()),
+            self.parsed_version,
             self.precedence,
             self.key,
             _remove_md5_fragment(self.location),
@@ -2338,11 +2286,10 @@ def key(self):
 
     @property
     def parsed_version(self):
-        try:
-            return self._parsed_version
-        except AttributeError:
-            self._parsed_version = pv = parse_version(self.version)
-            return pv
+        if not hasattr(self, "_parsed_version"):
+            self._parsed_version = parse_version(self.version)
+
+        return self._parsed_version
 
     @property
     def version(self):
@@ -2447,7 +2394,12 @@ def from_filename(cls, filename, metadata=None, **kw):
 
     def as_requirement(self):
         """Return a ``Requirement`` that matches this distribution exactly"""
-        return Requirement.parse('%s==%s' % (self.project_name, self.version))
+        if isinstance(self.parsed_version, Version):
+            spec = "%s==%s" % (self.project_name, self.parsed_version)
+        else:
+            spec = "%s===%s" % (self.project_name, self.parsed_version)
+
+        return Requirement.parse(spec)
 
     def load_entry_point(self, group, name):
         """Return the `name` entry point of `group` or raise ImportError"""
@@ -2699,7 +2651,7 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
 
         line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),
             "version spec")
-        specs = [(op, safe_version(val)) for op, val in specs]
+        specs = [(op, val) for op, val in specs]
         yield Requirement(project_name, specs, extras)
 
 
@@ -2708,26 +2660,23 @@ def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         self.unsafe_name, project_name = project_name, safe_name(project_name)
         self.project_name, self.key = project_name, project_name.lower()
-        index = [
-            (parse_version(v), state_machine[op], op, v)
-            for op, v in specs
-        ]
-        index.sort()
-        self.specs = [(op, ver) for parsed, trans, op, ver in index]
-        self.index, self.extras = index, tuple(map(safe_extra, extras))
+        self.specifier = Specifier(
+            ",".join(["".join([x, y]) for x, y in specs])
+        )
+        self.specs = specs
+        self.extras = tuple(map(safe_extra, extras))
         self.hashCmp = (
             self.key,
-            tuple((op, parsed) for parsed, trans, op, ver in index),
+            self.specifier,
             frozenset(self.extras),
         )
         self.__hash = hash(self.hashCmp)
 
     def __str__(self):
-        specs = ','.join([''.join(s) for s in self.specs])
         extras = ','.join(self.extras)
         if extras:
             extras = '[%s]' % extras
-        return '%s%s%s' % (self.project_name, extras, specs)
+        return '%s%s%s' % (self.project_name, extras, self.specifier)
 
     def __eq__(self, other):
         return (
@@ -2739,29 +2688,13 @@ def __contains__(self, item):
         if isinstance(item, Distribution):
             if item.key != self.key:
                 return False
-            # only get if we need it
-            if self.index:
-                item = item.parsed_version
-        elif isinstance(item, string_types):
-            item = parse_version(item)
-        last = None
-        # -1, 0, 1
-        compare = lambda a, b: (a > b) - (a < b)
-        for parsed, trans, op, ver in self.index:
-            # Indexing: 0, 1, -1
-            action = trans[compare(item, parsed)]
-            if action == 'F':
-                return False
-            elif action == 'T':
-                return True
-            elif action == '+':
-                last = True
-            elif action == '-' or last is None:
-                last = False
-        # no rules encountered
-        if last is None:
-            last = True
-        return last
+
+            item = item.version
+
+        # Allow prereleases always in order to match the previous behavior of
+        # this method. In the future this should be smarter and follow PEP 440
+        # more accurately.
+        return self.specifier.contains(item, prereleases=True)
 
     def __hash__(self):
         return self.__hash
@@ -2777,16 +2710,6 @@ def parse(s):
             raise ValueError("Expected only one requirement", s)
         raise ValueError("No requirements found", s)
 
-state_machine = {
-    #       =><
-    '<': '--T',
-    '<=': 'T-T',
-    '>': 'F+F',
-    '>=': 'T+F',
-    '==': 'T..',
-    '!=': 'F++',
-}
-
 
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
diff --git a/setuptools/_vendor/__init__.py b/setuptools/_vendor/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 72493d0b97..cb67255bca 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,6 +15,7 @@
 from setuptools.compat import basestring, PY3, StringIO
 from setuptools import svn_utils
 from setuptools.command.sdist import walk_revctrl
+from setuptools._vendor.packaging.version import Version
 from pkg_resources import (
     parse_requirements, safe_name, parse_version,
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
@@ -68,9 +69,14 @@ def finalize_options(self):
         self.vtags = self.tags()
         self.egg_version = self.tagged_version()
 
+        parsed_version = parse_version(self.egg_version)
+
         try:
+            spec = (
+                "%s==%s" if isinstance(parsed_version, Version) else "%s===%s"
+            )
             list(
-                parse_requirements('%s==%s' % (self.egg_name,
+                parse_requirements(spec % (self.egg_name,
                                                self.egg_version))
             )
         except ValueError:
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 8b36f67c1d..ae4ff554c8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -15,6 +15,7 @@
 
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2
+from setuptools._vendor.packaging.version import Version, InvalidVersion
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -268,6 +269,26 @@ def __init__(self, attrs=None):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
 
+        if self.metadata.version is not None:
+            try:
+                normalized_version = str(Version(self.metadata.version))
+                if self.metadata.version != normalized_version:
+                    warnings.warn(
+                        "The version specified requires normalization, "
+                        "consider using '%s' instead of '%s'." % (
+                            normalized_version,
+                            self.metadata.version,
+                        )
+                    )
+                    self.metadata.version = normalized_version
+            except (InvalidVersion, TypeError):
+                warnings.warn(
+                    "The version specified (%r) is an invalid version, this "
+                    "may not work as expected with newer versions of "
+                    "setuptools, pip, and PyPI. Please see PEP 440 for more "
+                    "details." % self.metadata.version
+                )
+
     def parse_command_line(self):
         """Process features after parsing command line options"""
         result = _Distribution.parse_command_line(self)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7531e37c1f..4c4f9456d7 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -34,7 +34,7 @@ def _write_entries(self, entries):
         entries_f = open(fn, 'wb')
         entries_f.write(entries)
         entries_f.close()
-   
+
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_version_10_format(self):
         """
@@ -140,7 +140,7 @@ def test_sources(self):
 
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_svn_tags(self):
-        code, data = environment.run_setup_py(["egg_info", 
+        code, data = environment.run_setup_py(["egg_info",
                                                "--tag-svn-revision"],
                                               pypath=self.old_cwd,
                                               data_stream=1)
@@ -155,7 +155,7 @@ def test_svn_tags(self):
             infile.close()
             del infile
 
-        self.assertTrue("Version: 0.1.1-r1\n" in read_contents)
+        self.assertTrue("Version: 0.1.1.post1\n" in read_contents)
 
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_no_tags(self):
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 3baa3ab104..9051b4140e 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -16,6 +16,7 @@
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3
+from setuptools._vendor.packaging.version import Specifier
 from .py26compat import skipIf
 
 def safe_repr(obj, short=False):
@@ -103,7 +104,7 @@ def testCollection(self):
     def checkFooPkg(self,d):
         self.assertEqual(d.project_name, "FooPkg")
         self.assertEqual(d.key, "foopkg")
-        self.assertEqual(d.version, "1.3-1")
+        self.assertEqual(d.version, "1.3.post1")
         self.assertEqual(d.py_version, "2.4")
         self.assertEqual(d.platform, "win32")
         self.assertEqual(d.parsed_version, parse_version("1.3-1"))
@@ -120,9 +121,9 @@ def testDistroBasics(self):
         self.assertEqual(d.platform, None)
 
     def testDistroParse(self):
-        d = dist_from_fn("FooPkg-1.3_1-py2.4-win32.egg")
+        d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg")
         self.checkFooPkg(d)
-        d = dist_from_fn("FooPkg-1.3_1-py2.4-win32.egg-info")
+        d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg-info")
         self.checkFooPkg(d)
 
     def testDistroMetadata(self):
@@ -330,24 +331,15 @@ def testBasicContains(self):
         self.assertTrue(twist11 not in r)
         self.assertTrue(twist12 in r)
 
-    def testAdvancedContains(self):
-        r, = parse_requirements("Foo>=1.2,<=1.3,==1.9,>2.0,!=2.5,<3.0,==4.5")
-        for v in ('1.2','1.2.2','1.3','1.9','2.0.1','2.3','2.6','3.0c1','4.5'):
-            self.assertTrue(v in r, (v,r))
-        for v in ('1.2c1','1.3.1','1.5','1.9.1','2.0','2.5','3.0','4.0'):
-            self.assertTrue(v not in r, (v,r))
-
     def testOptionsAndHashing(self):
         r1 = Requirement.parse("Twisted[foo,bar]>=1.2")
         r2 = Requirement.parse("Twisted[bar,FOO]>=1.2")
-        r3 = Requirement.parse("Twisted[BAR,FOO]>=1.2.0")
         self.assertEqual(r1,r2)
-        self.assertEqual(r1,r3)
         self.assertEqual(r1.extras, ("foo","bar"))
         self.assertEqual(r2.extras, ("bar","foo"))  # extras are normalized
         self.assertEqual(hash(r1), hash(r2))
         self.assertEqual(
-            hash(r1), hash(("twisted", ((">=",parse_version("1.2")),),
+            hash(r1), hash(("twisted", Specifier(">=1.2"),
                             frozenset(["foo","bar"])))
         )
 
@@ -420,7 +412,7 @@ def testSafeName(self):
         self.assertNotEqual(safe_name("peak.web"), "peak-web")
 
     def testSafeVersion(self):
-        self.assertEqual(safe_version("1.2-1"), "1.2-1")
+        self.assertEqual(safe_version("1.2-1"), "1.2.post1")
         self.assertEqual(safe_version("1.2 alpha"),  "1.2.alpha")
         self.assertEqual(safe_version("2.3.4 20050521"), "2.3.4.20050521")
         self.assertEqual(safe_version("Money$$$Maker"), "Money-Maker")
@@ -454,12 +446,12 @@ def c(s1,s2):
         c('0.4', '0.4.0')
         c('0.4.0.0', '0.4.0')
         c('0.4.0-0', '0.4-0')
-        c('0pl1', '0.0pl1')
+        c('0post1', '0.0post1')
         c('0pre1', '0.0c1')
         c('0.0.0preview1', '0c1')
         c('0.0c1', '0-rc1')
         c('1.2a1', '1.2.a.1')
-        c('1.2...a', '1.2a')
+        c('1.2.a', '1.2a')
 
     def testVersionOrdering(self):
         def c(s1,s2):
@@ -472,16 +464,14 @@ def c(s1,s2):
         c('2.3a1', '2.3')
         c('2.1-1', '2.1-2')
         c('2.1-1', '2.1.1')
-        c('2.1', '2.1pl4')
+        c('2.1', '2.1post4')
         c('2.1a0-20040501', '2.1')
         c('1.1', '02.1')
-        c('A56','B27')
-        c('3.2', '3.2.pl0')
-        c('3.2-1', '3.2pl1')
-        c('3.2pl1', '3.2pl1-1')
+        c('3.2', '3.2.post0')
+        c('3.2post1', '3.2post2')
         c('0.4', '4.0')
         c('0.0.4', '0.4.0')
-        c('0pl1', '0.4pl1')
+        c('0post1', '0.4post1')
         c('2.1.0-rc1','2.1.0')
         c('2.1dev','2.1a0')
 

From ec9cf181ba29c444f8fdf4cdd109f30185d69b51 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 11:24:40 -0400
Subject: [PATCH 4365/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4b20333d19..3a0e6936e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,8 @@ CHANGES
   exclusion list now includes Python 3.2 ``__pycache__`` entries.
 * Pull Request #76 and Pull Request #78: lines in top_level.txt are now
   ordered deterministically.
+* Issue #118: The egg-info directory is now no longer included in the list
+  of outputs.
 
 ---
 5.8

From 442e0b23457b68a188cc75e4c885a244251c4a9c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 11:29:50 -0400
Subject: [PATCH 4366/8469] Update changelog

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3a0e6936e6..ab58bb1448 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,9 @@ CHANGES
   ordered deterministically.
 * Issue #118: The egg-info directory is now no longer included in the list
   of outputs.
+* Pull Request #83: Setuptools now patches distutils msvc9compiler to
+  recognize the specially-packaged compiler package for easy extension module
+  support on Python 2.6, 2.7, and 3.2.
 
 ---
 5.8

From 0e2681c1782320311e8cf144d4df923cfafc48c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 11:30:01 -0400
Subject: [PATCH 4367/8469] Resave with excess whitespace removed

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

diff --git a/setuptools/extension.py b/setuptools/extension.py
index 41a817b79a..c695976ab1 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -21,7 +21,7 @@ def _patch_msvc9compiler_find_vcvarsall():
     if find_vcvarsall and find_vcvarsall.__module__.startswith('setuptools.'):
         # Already patched
         return
-    
+
     def _find_vcvarsall(version):
         Reg = distutils.msvc9compiler.Reg
         try:
@@ -33,15 +33,15 @@ def _find_vcvarsall(version):
                 productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
             except KeyError:
                 productdir = None
-        
+
         if productdir:
             import os
             vcvarsall = os.path.join(productdir, "vcvarsall.bat")
             if os.path.isfile(vcvarsall):
                 return vcvarsall
-        
+
         return find_vcvarsall(version)
-    
+
     def _query_vcvarsall(version, *args, **kwargs):
         try:
             return query_vcvarsall(version, *args, **kwargs)

From fb6baa09e5089c3984ee38da5f96b857c7e90c8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 15:17:55 -0400
Subject: [PATCH 4368/8469] Move monkey patch to a separate module

---
 setuptools/extension.py     | 56 ++-----------------------------------
 setuptools/msvc9_support.py | 55 ++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 53 deletions(-)
 create mode 100644 setuptools/msvc9_support.py

diff --git a/setuptools/extension.py b/setuptools/extension.py
index c695976ab1..8178ed33d7 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -4,63 +4,13 @@
 import distutils.core
 import distutils.errors
 import distutils.extension
-import distutils.msvc9compiler
 
-from setuptools.dist import _get_unpatched
+from .dist import _get_unpatched
+from . import msvc9_support
 
 _Extension = _get_unpatched(distutils.core.Extension)
 
-def _patch_msvc9compiler_find_vcvarsall():
-    """
-    Looks for the standalone VC for Python before falling back on
-    distutils's original approach.
-    """
-    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
-    find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
-    query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
-    if find_vcvarsall and find_vcvarsall.__module__.startswith('setuptools.'):
-        # Already patched
-        return
-
-    def _find_vcvarsall(version):
-        Reg = distutils.msvc9compiler.Reg
-        try:
-            # Per-user installs register the compiler path here
-            productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
-        except KeyError:
-            try:
-                # All-user installs on a 64-bit system register here
-                productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
-            except KeyError:
-                productdir = None
-
-        if productdir:
-            import os
-            vcvarsall = os.path.join(productdir, "vcvarsall.bat")
-            if os.path.isfile(vcvarsall):
-                return vcvarsall
-
-        return find_vcvarsall(version)
-
-    def _query_vcvarsall(version, *args, **kwargs):
-        try:
-            return query_vcvarsall(version, *args, **kwargs)
-        except distutils.errors.DistutilsPlatformError:
-            exc = sys.exc_info()[1]
-            if exc and "vcvarsall.bat" in exc.args[0]:
-                message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
-                if int(version) == 9:
-                    # This redirection link is maintained by Microsoft.
-                    # Contact vspython@microsoft.com if it needs updating.
-                    raise distutils.errors.DistutilsPlatformError(
-                        message + ' Get it from http://aka.ms/vcpython27'
-                    )
-                raise distutils.errors.DistutilsPlatformError(message)
-            raise
-
-    distutils.msvc9compiler.find_vcvarsall = _find_vcvarsall
-    distutils.msvc9compiler.query_vcvarsall = _query_vcvarsall
-_patch_msvc9compiler_find_vcvarsall()
+msvc9_support.patch_for_specialized_compiler()
 
 def have_pyrex():
     """
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
new file mode 100644
index 0000000000..fba2a71a09
--- /dev/null
+++ b/setuptools/msvc9_support.py
@@ -0,0 +1,55 @@
+import sys
+
+import distutils.msvc9compiler
+
+def patch_for_specialized_compiler():
+    """
+    Patch functions in distutils.msvc9compiler to use the standalone compiler
+    build for Python (Windows only). Fall back to original behavior when the
+    standalone compiler is not available.
+    """
+    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
+    find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
+    query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
+    if find_vcvarsall and find_vcvarsall.__module__.startswith('setuptools.'):
+        # Already patched
+        return
+
+    def _find_vcvarsall(version):
+        Reg = distutils.msvc9compiler.Reg
+        try:
+            # Per-user installs register the compiler path here
+            productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
+        except KeyError:
+            try:
+                # All-user installs on a 64-bit system register here
+                productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
+            except KeyError:
+                productdir = None
+
+        if productdir:
+            import os
+            vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+            if os.path.isfile(vcvarsall):
+                return vcvarsall
+
+        return find_vcvarsall(version)
+
+    def _query_vcvarsall(version, *args, **kwargs):
+        try:
+            return query_vcvarsall(version, *args, **kwargs)
+        except distutils.errors.DistutilsPlatformError:
+            exc = sys.exc_info()[1]
+            if exc and "vcvarsall.bat" in exc.args[0]:
+                message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
+                if int(version) == 9:
+                    # This redirection link is maintained by Microsoft.
+                    # Contact vspython@microsoft.com if it needs updating.
+                    raise distutils.errors.DistutilsPlatformError(
+                        message + ' Get it from http://aka.ms/vcpython27'
+                    )
+                raise distutils.errors.DistutilsPlatformError(message)
+            raise
+
+    distutils.msvc9compiler.find_vcvarsall = _find_vcvarsall
+    distutils.msvc9compiler.query_vcvarsall = _query_vcvarsall

From c735886bf4433d26f8c0679b722e46393a1dd92a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 15:21:56 -0400
Subject: [PATCH 4369/8469] Protect against import errors.

---
 setuptools/msvc9_support.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index fba2a71a09..f2e5cffc35 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,13 +1,17 @@
 import sys
 
-import distutils.msvc9compiler
-
 def patch_for_specialized_compiler():
     """
     Patch functions in distutils.msvc9compiler to use the standalone compiler
     build for Python (Windows only). Fall back to original behavior when the
     standalone compiler is not available.
     """
+    try:
+        distutils = __import__('distutils.msvc9compiler')
+    except ImportError:
+        # The module isn't available to be patched
+        return
+
     VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
     find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
     query_vcvarsall = distutils.msvc9compiler.query_vcvarsall

From 15f29791a68addcb4e6166cd43f67c1f656f82d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 17:08:20 -0400
Subject: [PATCH 4370/8469] Extract patched functions as top-level functions

---
 setuptools/msvc9_support.py | 78 +++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index f2e5cffc35..61ca85796e 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,59 +1,63 @@
 import sys
 
+distutils = None
+unpatched = dict()
+
 def patch_for_specialized_compiler():
     """
     Patch functions in distutils.msvc9compiler to use the standalone compiler
     build for Python (Windows only). Fall back to original behavior when the
     standalone compiler is not available.
     """
+    global distutils
     try:
         distutils = __import__('distutils.msvc9compiler')
     except ImportError:
         # The module isn't available to be patched
         return
 
-    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
-    find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
-    query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
-    if find_vcvarsall and find_vcvarsall.__module__.startswith('setuptools.'):
+    if unpatched:
         # Already patched
         return
 
-    def _find_vcvarsall(version):
-        Reg = distutils.msvc9compiler.Reg
+    unpatched.update(vars(distutils.msvc9compiler))
+
+    distutils.msvc9compiler.find_vcvarsall = find_vcvarsall
+    distutils.msvc9compiler.query_vcvarsall = query_vcvarsall
+
+def find_vcvarsall(version):
+    Reg = distutils.msvc9compiler.Reg
+    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
+    try:
+        # Per-user installs register the compiler path here
+        productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
+    except KeyError:
         try:
-            # Per-user installs register the compiler path here
-            productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
+            # All-user installs on a 64-bit system register here
+            productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
         except KeyError:
-            try:
-                # All-user installs on a 64-bit system register here
-                productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
-            except KeyError:
-                productdir = None
+            productdir = None
 
-        if productdir:
-            import os
-            vcvarsall = os.path.join(productdir, "vcvarsall.bat")
-            if os.path.isfile(vcvarsall):
-                return vcvarsall
+    if productdir:
+        import os
+        vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+        if os.path.isfile(vcvarsall):
+            return vcvarsall
 
-        return find_vcvarsall(version)
+    return unpatched['find_vcvarsall'](version)
 
-    def _query_vcvarsall(version, *args, **kwargs):
-        try:
-            return query_vcvarsall(version, *args, **kwargs)
-        except distutils.errors.DistutilsPlatformError:
-            exc = sys.exc_info()[1]
-            if exc and "vcvarsall.bat" in exc.args[0]:
-                message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
-                if int(version) == 9:
-                    # This redirection link is maintained by Microsoft.
-                    # Contact vspython@microsoft.com if it needs updating.
-                    raise distutils.errors.DistutilsPlatformError(
-                        message + ' Get it from http://aka.ms/vcpython27'
-                    )
-                raise distutils.errors.DistutilsPlatformError(message)
-            raise
-
-    distutils.msvc9compiler.find_vcvarsall = _find_vcvarsall
-    distutils.msvc9compiler.query_vcvarsall = _query_vcvarsall
+def query_vcvarsall(version, *args, **kwargs):
+    try:
+        return unpatched['query_vcvarsall'](version, *args, **kwargs)
+    except distutils.errors.DistutilsPlatformError:
+        exc = sys.exc_info()[1]
+        if exc and "vcvarsall.bat" in exc.args[0]:
+            message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
+            if int(version) == 9:
+                # This redirection link is maintained by Microsoft.
+                # Contact vspython@microsoft.com if it needs updating.
+                raise distutils.errors.DistutilsPlatformError(
+                    message + ' Get it from http://aka.ms/vcpython27'
+                )
+            raise distutils.errors.DistutilsPlatformError(message)
+        raise

From 84376ed5bb61c4a8a25048c83ad8d9fa60618db5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 17:09:44 -0400
Subject: [PATCH 4371/8469] Create global import more traditionally. Now the
 patched functions are available directly as well.

---
 setuptools/msvc9_support.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 61ca85796e..d0be70e2a9 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,6 +1,10 @@
 import sys
 
-distutils = None
+try:
+    import distutils.msvc9compiler
+except ImportError:
+    pass
+
 unpatched = dict()
 
 def patch_for_specialized_compiler():
@@ -9,10 +13,7 @@ def patch_for_specialized_compiler():
     build for Python (Windows only). Fall back to original behavior when the
     standalone compiler is not available.
     """
-    global distutils
-    try:
-        distutils = __import__('distutils.msvc9compiler')
-    except ImportError:
+    if 'distutils' not in globals():
         # The module isn't available to be patched
         return
 

From 933a2d7cf491ccade77d1382ecba1eae7a510874 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 26 Sep 2014 23:31:59 +0200
Subject: [PATCH 4372/8469] Issue #5309: distutils' build and build_ext
 commands now accept a ``-j`` option to enable parallel building of extension
 modules.

---
 command/build.py        |  9 +++++++
 command/build_ext.py    | 57 ++++++++++++++++++++++++++++++++++++-----
 tests/test_build_ext.py | 56 +++++++++++++++++++++++++---------------
 3 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/command/build.py b/command/build.py
index cfc15cf0dd..337dd0bfc1 100644
--- a/command/build.py
+++ b/command/build.py
@@ -36,6 +36,8 @@ class build(Command):
          "(default: %s)" % get_platform()),
         ('compiler=', 'c',
          "specify the compiler type"),
+        ('parallel=', 'j',
+         "number of parallel build jobs"),
         ('debug', 'g',
          "compile extensions and libraries with debugging information"),
         ('force', 'f',
@@ -65,6 +67,7 @@ def initialize_options(self):
         self.debug = None
         self.force = 0
         self.executable = None
+        self.parallel = None
 
     def finalize_options(self):
         if self.plat_name is None:
@@ -116,6 +119,12 @@ def finalize_options(self):
         if self.executable is None:
             self.executable = os.path.normpath(sys.executable)
 
+        if isinstance(self.parallel, str):
+            try:
+                self.parallel = int(self.parallel)
+            except ValueError:
+                raise DistutilsOptionError("parallel should be an integer")
+
     def run(self):
         # Run all relevant sub-commands.  This will be some subset of:
         #  - build_py      - pure Python modules
diff --git a/command/build_ext.py b/command/build_ext.py
index 3ab2d04bf9..08449e1a51 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -4,7 +4,10 @@
 modules (currently limited to C extensions, should accommodate C++
 extensions ASAP)."""
 
-import sys, os, re
+import contextlib
+import os
+import re
+import sys
 from distutils.core import Command
 from distutils.errors import *
 from distutils.sysconfig import customize_compiler, get_python_version
@@ -85,6 +88,8 @@ class build_ext(Command):
          "forcibly build everything (ignore file timestamps)"),
         ('compiler=', 'c',
          "specify the compiler type"),
+        ('parallel=', 'j',
+         "number of parallel build jobs"),
         ('swig-cpp', None,
          "make SWIG create C++ files (default is C)"),
         ('swig-opts=', None,
@@ -124,6 +129,7 @@ def initialize_options(self):
         self.swig_cpp = None
         self.swig_opts = None
         self.user = None
+        self.parallel = None
 
     def finalize_options(self):
         from distutils import sysconfig
@@ -134,6 +140,7 @@ def finalize_options(self):
                                    ('compiler', 'compiler'),
                                    ('debug', 'debug'),
                                    ('force', 'force'),
+                                   ('parallel', 'parallel'),
                                    ('plat_name', 'plat_name'),
                                    )
 
@@ -274,6 +281,12 @@ def finalize_options(self):
                 self.library_dirs.append(user_lib)
                 self.rpath.append(user_lib)
 
+        if isinstance(self.parallel, str):
+            try:
+                self.parallel = int(self.parallel)
+            except ValueError:
+                raise DistutilsOptionError("parallel should be an integer")
+
     def run(self):
         from distutils.ccompiler import new_compiler
 
@@ -442,15 +455,45 @@ def get_outputs(self):
     def build_extensions(self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
+        if self.parallel:
+            self._build_extensions_parallel()
+        else:
+            self._build_extensions_serial()
+
+    def _build_extensions_parallel(self):
+        workers = self.parallel
+        if self.parallel is True:
+            workers = os.cpu_count()  # may return None
+        try:
+            from concurrent.futures import ThreadPoolExecutor
+        except ImportError:
+            workers = None
+
+        if workers is None:
+            self._build_extensions_serial()
+            return
 
+        with ThreadPoolExecutor(max_workers=workers) as executor:
+            futures = [executor.submit(self.build_extension, ext)
+                       for ext in self.extensions]
+            for ext, fut in zip(self.extensions, futures):
+                with self._filter_build_errors(ext):
+                    fut.result()
+
+    def _build_extensions_serial(self):
         for ext in self.extensions:
-            try:
+            with self._filter_build_errors(ext):
                 self.build_extension(ext)
-            except (CCompilerError, DistutilsError, CompileError) as e:
-                if not ext.optional:
-                    raise
-                self.warn('building extension "%s" failed: %s' %
-                          (ext.name, e))
+
+    @contextlib.contextmanager
+    def _filter_build_errors(self, ext):
+        try:
+            yield
+        except (CCompilerError, DistutilsError, CompileError) as e:
+            if not ext.optional:
+                raise
+            self.warn('building extension "%s" failed: %s' %
+                      (ext.name, e))
 
     def build_extension(self, ext):
         sources = ext.sources
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index b9f407f401..366ffbec9f 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -37,6 +37,9 @@ def setUp(self):
         from distutils.command import build_ext
         build_ext.USER_BASE = site.USER_BASE
 
+    def build_ext(self, *args, **kwargs):
+        return build_ext(*args, **kwargs)
+
     def test_build_ext(self):
         global ALREADY_TESTED
         copy_xxmodule_c(self.tmp_dir)
@@ -44,7 +47,7 @@ def test_build_ext(self):
         xx_ext = Extension('xx', [xx_c])
         dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
         dist.package_dir = self.tmp_dir
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         fixup_build_ext(cmd)
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
@@ -91,7 +94,7 @@ def tearDown(self):
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         old = sys.platform
 
         sys.platform = 'sunos' # fooling finalize_options
@@ -113,7 +116,7 @@ def test_solaris_enable_shared(self):
     def test_user_site(self):
         import site
         dist = Distribution({'name': 'xx'})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
 
         # making sure the user option is there
         options = [name for name, short, lable in
@@ -144,14 +147,14 @@ def test_optional_extension(self):
         # with the optional argument.
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.ensure_finalized()
         self.assertRaises((UnknownFileError, CompileError),
                           cmd.run)  # should raise an error
 
         modules = [Extension('foo', ['xxx'], optional=True)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.ensure_finalized()
         cmd.run()  # should pass
 
@@ -160,7 +163,7 @@ def test_finalize_options(self):
         # etc.) are in the include search path.
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.finalize_options()
 
         from distutils import sysconfig
@@ -172,14 +175,14 @@ def test_finalize_options(self):
 
         # make sure cmd.libraries is turned into a list
         # if it's a string
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.libraries = 'my_lib, other_lib lastlib'
         cmd.finalize_options()
         self.assertEqual(cmd.libraries, ['my_lib', 'other_lib', 'lastlib'])
 
         # make sure cmd.library_dirs is turned into a list
         # if it's a string
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep
         cmd.finalize_options()
         self.assertIn('my_lib_dir', cmd.library_dirs)
@@ -187,7 +190,7 @@ def test_finalize_options(self):
 
         # make sure rpath is turned into a list
         # if it's a string
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.rpath = 'one%stwo' % os.pathsep
         cmd.finalize_options()
         self.assertEqual(cmd.rpath, ['one', 'two'])
@@ -196,32 +199,32 @@ def test_finalize_options(self):
 
         # make sure define is turned into 2-tuples
         # strings if they are ','-separated strings
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.define = 'one,two'
         cmd.finalize_options()
         self.assertEqual(cmd.define, [('one', '1'), ('two', '1')])
 
         # make sure undef is turned into a list of
         # strings if they are ','-separated strings
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.undef = 'one,two'
         cmd.finalize_options()
         self.assertEqual(cmd.undef, ['one', 'two'])
 
         # make sure swig_opts is turned into a list
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.swig_opts = None
         cmd.finalize_options()
         self.assertEqual(cmd.swig_opts, [])
 
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.swig_opts = '1 2'
         cmd.finalize_options()
         self.assertEqual(cmd.swig_opts, ['1', '2'])
 
     def test_check_extensions_list(self):
         dist = Distribution()
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.finalize_options()
 
         #'extensions' option must be a list of Extension instances
@@ -270,7 +273,7 @@ def test_check_extensions_list(self):
     def test_get_source_files(self):
         modules = [Extension('foo', ['xxx'], optional=False)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.ensure_finalized()
         self.assertEqual(cmd.get_source_files(), ['xxx'])
 
@@ -279,7 +282,7 @@ def test_compiler_option(self):
         # should not be overriden by a compiler instance
         # when the command is run
         dist = Distribution()
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.compiler = 'unix'
         cmd.ensure_finalized()
         cmd.run()
@@ -292,7 +295,7 @@ def test_get_outputs(self):
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         fixup_build_ext(cmd)
         cmd.ensure_finalized()
         self.assertEqual(len(cmd.get_outputs()), 1)
@@ -355,7 +358,7 @@ def test_ext_fullpath(self):
         #etree_ext = Extension('lxml.etree', [etree_c])
         #dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]})
         dist = Distribution()
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.inplace = 1
         cmd.distribution.package_dir = {'': 'src'}
         cmd.distribution.packages = ['lxml', 'lxml.html']
@@ -462,7 +465,7 @@ def _try_compile_deployment_target(self, operator, target):
             'ext_modules': [deptarget_ext]
         })
         dist.package_dir = self.tmp_dir
-        cmd = build_ext(dist)
+        cmd = self.build_ext(dist)
         cmd.build_lib = self.tmp_dir
         cmd.build_temp = self.tmp_dir
 
@@ -481,8 +484,19 @@ def _try_compile_deployment_target(self, operator, target):
             self.fail("Wrong deployment target during compilation")
 
 
+class ParallelBuildExtTestCase(BuildExtTestCase):
+
+    def build_ext(self, *args, **kwargs):
+        build_ext = super().build_ext(*args, **kwargs)
+        build_ext.parallel = True
+        return build_ext
+
+
 def test_suite():
-    return unittest.makeSuite(BuildExtTestCase)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(BuildExtTestCase))
+    suite.addTest(unittest.makeSuite(ParallelBuildExtTestCase))
+    return suite
 
 if __name__ == '__main__':
-    support.run_unittest(test_suite())
+    support.run_unittest(__name__)

From 2d58fe235143f63f56e1207ab51e8ea6df1bb04d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 18:14:44 -0400
Subject: [PATCH 4373/8469] Remove excess whitespace

--HG--
extra : amend_source : b8e14d29b2a36b84e30e22cf231d0b1730eeb7f4
---
 setuptools/tests/test_msvc9compiler.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 272e99e8e9..33dca836bd 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -27,20 +27,20 @@ class MockReg:
     with an instance of this class that mocks out the
     functions that access the registry.
     """
-    
+
     def __init__(self, hkey_local_machine={}, hkey_current_user={}):
         self.hklm = hkey_local_machine
         self.hkcu = hkey_current_user
-    
+
     def __enter__(self):
         self.original_read_keys = distutils.msvc9compiler.Reg.read_keys
         self.original_read_values = distutils.msvc9compiler.Reg.read_values
-        
+
         hives = {
             HKEY_CURRENT_USER: self.hkcu,
             HKEY_LOCAL_MACHINE: self.hklm,
         }
-        
+
         def read_keys(cls, base, key):
             """Return list of registry keys."""
             hive = hives.get(base, {})
@@ -52,12 +52,12 @@ def read_values(cls, base, key):
             hive = hives.get(base, {})
             return dict((k.rpartition('\\')[2], hive[k])
                         for k in hive if k.startswith(key.lower()))
-        
+
         distutils.msvc9compiler.Reg.read_keys = classmethod(read_keys)
         distutils.msvc9compiler.Reg.read_values = classmethod(read_values)
-        
+
         return self
-    
+
     def __exit__(self, exc_type, exc_value, exc_tb):
         distutils.msvc9compiler.Reg.read_keys = self.original_read_keys
         distutils.msvc9compiler.Reg.read_values = self.original_read_values
@@ -80,7 +80,7 @@ def test_find_vcvarsall_patch(self):
         try:
             with MockReg():
                 self.assertIsNone(find_vcvarsall(9.0))
-                
+
                 try:
                     query_vcvarsall(9.0)
                     self.fail('Expected DistutilsPlatformError from query_vcvarsall()')
@@ -90,10 +90,10 @@ def test_find_vcvarsall_patch(self):
         finally:
             if old_value:
                 os.environ["VS90COMNTOOLS"] = old_value
-        
+
         key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
         key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
-        
+
         # Make two mock files so we can tell whether HCKU entries are
         # preferred to HKLM entries.
         mock_installdir_1 = tempfile.mkdtemp()
@@ -105,7 +105,7 @@ def test_find_vcvarsall_patch(self):
         try:
             # Ensure we get the current user's setting first
             with MockReg(
-                hkey_current_user={ key_32: mock_installdir_1 },
+                hkey_current_user={key_32: mock_installdir_1},
                 hkey_local_machine={
                     key_32: mock_installdir_2,
                     key_64: mock_installdir_2,
@@ -114,7 +114,7 @@ def test_find_vcvarsall_patch(self):
                 self.assertEqual(mock_vcvarsall_bat_1, find_vcvarsall(9.0))
 
             # Ensure we get the local machine value if it's there
-            with MockReg(hkey_local_machine={ key_32: mock_installdir_2 }):
+            with MockReg(hkey_local_machine={key_32: mock_installdir_2}):
                 self.assertEqual(mock_vcvarsall_bat_2, find_vcvarsall(9.0))
 
             # Ensure we prefer the 64-bit local machine key
@@ -131,5 +131,3 @@ def test_find_vcvarsall_patch(self):
         finally:
             shutil.rmtree(mock_installdir_1)
             shutil.rmtree(mock_installdir_2)
-
-    
\ No newline at end of file

From d195bc900beccb22c8de243416c40564ea28402f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 18:25:32 -0400
Subject: [PATCH 4374/8469] Remove unused import

---
 setuptools/tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 33dca836bd..3a2ef9706d 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -20,7 +20,7 @@
 from distutils.errors import DistutilsPlatformError
 
 # importing only setuptools should apply the patch
-import setuptools
+__import__('setuptools')
 
 class MockReg:
     """Mock for distutils.msvc9compiler.Reg. We patch it

From e87ba1aa48bb891bb29704d321754623956fef44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 18:30:14 -0400
Subject: [PATCH 4375/8469] Move stable import into stdlib imports section

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

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 3a2ef9706d..74b5220b0b 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -10,6 +10,7 @@
 import sys
 import tempfile
 import unittest
+import distutils.errors
 
 try:
     from winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
@@ -17,7 +18,6 @@
     from _winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
 
 import distutils.msvc9compiler
-from distutils.errors import DistutilsPlatformError
 
 # importing only setuptools should apply the patch
 __import__('setuptools')
@@ -84,7 +84,7 @@ def test_find_vcvarsall_patch(self):
                 try:
                     query_vcvarsall(9.0)
                     self.fail('Expected DistutilsPlatformError from query_vcvarsall()')
-                except DistutilsPlatformError:
+                except distutils.errors.DistutilsPlatformError:
                     exc_message = str(sys.exc_info()[1])
                 self.assertIn('aka.ms/vcpython27', exc_message)
         finally:

From 57ff99e246a2fdb3d59e7aa977fe3b1e00924c99 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 18:38:39 -0400
Subject: [PATCH 4376/8469] Grab winreg module from distutils.msvc9compiler

---
 setuptools/tests/test_msvc9compiler.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 74b5220b0b..8f71c3d597 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -12,11 +12,6 @@
 import unittest
 import distutils.errors
 
-try:
-    from winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
-except ImportError:
-    from _winreg import HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE
-
 import distutils.msvc9compiler
 
 # importing only setuptools should apply the patch
@@ -36,9 +31,12 @@ def __enter__(self):
         self.original_read_keys = distutils.msvc9compiler.Reg.read_keys
         self.original_read_values = distutils.msvc9compiler.Reg.read_values
 
+        _winreg = getattr(distutils.msvc9compiler, '_winreg', None)
+        winreg = getattr(distutils.msvc9compiler, 'winreg', _winreg)
+
         hives = {
-            HKEY_CURRENT_USER: self.hkcu,
-            HKEY_LOCAL_MACHINE: self.hklm,
+            winreg.HKEY_CURRENT_USER: self.hkcu,
+            winreg.HKEY_LOCAL_MACHINE: self.hklm,
         }
 
         def read_keys(cls, base, key):

From dfa59bff40dce47c485cdba1f28d1a8908e7e2be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 18:47:55 -0400
Subject: [PATCH 4377/8469] Skip tests if msvc9compiler isn't available.

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

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 8f71c3d597..99afb10e78 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -12,8 +12,6 @@
 import unittest
 import distutils.errors
 
-import distutils.msvc9compiler
-
 # importing only setuptools should apply the patch
 __import__('setuptools')
 
@@ -63,6 +61,10 @@ def __exit__(self, exc_type, exc_value, exc_tb):
 class TestMSVC9Compiler(unittest.TestCase):
 
     def test_find_vcvarsall_patch(self):
+        if not hasattr(distutils, 'msvc9compiler'):
+            # skip
+            return
+
         self.assertEqual(
             "setuptools.extension",
             distutils.msvc9compiler.find_vcvarsall.__module__,

From 552e44fdce5a897f8e41efe07cf480759a59bb94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:05:16 -0400
Subject: [PATCH 4378/8469] Extracting environment patcher

---
 setuptools/tests/test_msvc9compiler.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 99afb10e78..80aac2f6f6 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -11,6 +11,7 @@
 import tempfile
 import unittest
 import distutils.errors
+import contextlib
 
 # importing only setuptools should apply the patch
 __import__('setuptools')
@@ -58,6 +59,25 @@ def __exit__(self, exc_type, exc_value, exc_tb):
         distutils.msvc9compiler.Reg.read_keys = self.original_read_keys
         distutils.msvc9compiler.Reg.read_values = self.original_read_values
 
+@contextlib.contextmanager
+def patch_env(**replacements):
+    saved = dict(
+        (key, os.environ['key'])
+        for key in replacements
+        if key in os.environ
+    )
+    os.environ.update(replacements)
+
+    # remove values that are null
+    null_keys = (key for (key, value) in replacements if value is None)
+    list(map(os.environ.pop, (null_keys)))
+
+    yield
+
+    for key in replacements:
+        os.environ.pop(key, None)
+    os.environ.update(saved)
+
 class TestMSVC9Compiler(unittest.TestCase):
 
     def test_find_vcvarsall_patch(self):
@@ -76,8 +96,7 @@ def test_find_vcvarsall_patch(self):
 
         # No registry entries or environment variable means we should
         # not find anything
-        old_value = os.environ.pop("VS90COMNTOOLS", None)
-        try:
+        with patch_env(VS90COMNTOOLS=None):
             with MockReg():
                 self.assertIsNone(find_vcvarsall(9.0))
 
@@ -87,9 +106,6 @@ def test_find_vcvarsall_patch(self):
                 except distutils.errors.DistutilsPlatformError:
                     exc_message = str(sys.exc_info()[1])
                 self.assertIn('aka.ms/vcpython27', exc_message)
-        finally:
-            if old_value:
-                os.environ["VS90COMNTOOLS"] = old_value
 
         key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
         key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'

From d501896d27cf94f62b80fe266d9369e681a32de6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:09:41 -0400
Subject: [PATCH 4379/8469] Correct test assertion

---
 setuptools/tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 80aac2f6f6..02ced8cf03 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -86,7 +86,7 @@ def test_find_vcvarsall_patch(self):
             return
 
         self.assertEqual(
-            "setuptools.extension",
+            "setuptools.msvc9_support",
             distutils.msvc9compiler.find_vcvarsall.__module__,
             "find_vcvarsall was not patched"
         )

From 475e7c869bb60dba329a9642ff13bd10d1cbdced Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:11:04 -0400
Subject: [PATCH 4380/8469] Meant 'items'

---
 setuptools/tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 02ced8cf03..1c557d391d 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -69,7 +69,7 @@ def patch_env(**replacements):
     os.environ.update(replacements)
 
     # remove values that are null
-    null_keys = (key for (key, value) in replacements if value is None)
+    null_keys = (key for (key, value) in replacements.items() if value is None)
     list(map(os.environ.pop, (null_keys)))
 
     yield

From 813855aa5c9cb09c1e0faffcb80bfa2cb0cb2852 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:18:50 -0400
Subject: [PATCH 4381/8469] Avoid passing None values to os.environ.

---
 setuptools/tests/test_msvc9compiler.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 1c557d391d..b2769759ac 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -66,13 +66,16 @@ def patch_env(**replacements):
         for key in replacements
         if key in os.environ
     )
-    os.environ.update(replacements)
 
     # remove values that are null
-    null_keys = (key for (key, value) in replacements.items() if value is None)
-    list(map(os.environ.pop, (null_keys)))
+    remove = (key for (key, value) in replacements.items() if value is None)
+    for key in list(remove):
+        os.environ.pop(key, None)
+        replacements.pop(key)
+
+    os.environ.update(replacements)
 
-    yield
+    yield saved
 
     for key in replacements:
         os.environ.pop(key, None)

From 8759ca96ec6c6c318d65e0c93ca8b3c93f45e7f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:20:32 -0400
Subject: [PATCH 4382/8469] Add docstring

---
 setuptools/tests/test_msvc9compiler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index b2769759ac..ac5e391475 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -61,6 +61,10 @@ def __exit__(self, exc_type, exc_value, exc_tb):
 
 @contextlib.contextmanager
 def patch_env(**replacements):
+    """
+    In a context, patch the environment with replacements. Pass None values
+    to clear the values.
+    """
     saved = dict(
         (key, os.environ['key'])
         for key in replacements

From 46a65a1a635cf3986c853907d1a16c5173cc125d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Sep 2014 19:21:21 -0400
Subject: [PATCH 4383/8469] Always restore os.environ even if an exception
 occurs.

---
 setuptools/tests/test_msvc9compiler.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index ac5e391475..970f76793d 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -79,11 +79,12 @@ def patch_env(**replacements):
 
     os.environ.update(replacements)
 
-    yield saved
-
-    for key in replacements:
-        os.environ.pop(key, None)
-    os.environ.update(saved)
+    try:
+        yield saved
+    finally:
+        for key in replacements:
+            os.environ.pop(key, None)
+        os.environ.update(saved)
 
 class TestMSVC9Compiler(unittest.TestCase):
 

From b67548a1ed3c0f606846303041e46bca76b635b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 02:08:19 -0400
Subject: [PATCH 4384/8469] Update changelog to reference documented issue.
 Fixes #258.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ab58bb1448..59e63aadc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,7 +29,7 @@ CHANGES
   ordered deterministically.
 * Issue #118: The egg-info directory is now no longer included in the list
   of outputs.
-* Pull Request #83: Setuptools now patches distutils msvc9compiler to
+* Issue #258: Setuptools now patches distutils msvc9compiler to
   recognize the specially-packaged compiler package for easy extension module
   support on Python 2.6, 2.7, and 3.2.
 

From 39f98548e30b5e333276994fcaea4e529be4e40c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 02:12:43 -0400
Subject: [PATCH 4385/8469] Bumped to 6.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0fd1c8725e..f4a1aaecf0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "5.9"
+DEFAULT_VERSION = "6.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 7244139e8f..5fa6331d5e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '5.9'
+__version__ = '6.0'

From 7caf6b91f8602fac8addbdcf5cb023b49d01e1f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 02:12:46 -0400
Subject: [PATCH 4386/8469] Added tag 6.0 for changeset 755cbfd3743f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1753222139..dadf223839 100644
--- a/.hgtags
+++ b/.hgtags
@@ -154,3 +154,4 @@ ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
 a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 37ed55fd310d0cd32009dc5676121e86b404a23d 5.7
 67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
+755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0

From bb37802dc9f5bcaff5418438a88877b521208932 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 02:13:23 -0400
Subject: [PATCH 4387/8469] Bumped to 6.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f4a1aaecf0..a693849f93 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.0"
+DEFAULT_VERSION = "6.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 5fa6331d5e..2d3f6733a8 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.0'
+__version__ = '6.1'

From 89bde0f0a7af8936e38dbedbd82e2af14f3efc39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:29:26 -0400
Subject: [PATCH 4388/8469] Add doctesting of modules. Ref #259.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc387f46cb..b434a79369 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ script:
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
- - python setup.py ptr
+ - python setup.py ptr --addopts='--doctest-modules'
  - python ez_setup.py --version 5.4.1

From 5802fd80e413b63af8be9198f14da1ade47d409c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:29:53 -0400
Subject: [PATCH 4389/8469] Use rpartition here, essential to the algorithm.
 Fixes #259.

--HG--
extra : amend_source : d7b3c001b4db616a67793dcc57d5c13e3828ad3a
---
 setuptools/command/install_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 3cd16a8f00..9b7722276b 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -43,7 +43,7 @@ def _all_packages(pkg_name):
         """
         while pkg_name:
             yield pkg_name
-            pkg_name, sep, child = pkg_name.partition('.')
+            pkg_name, sep, child = pkg_name.rpartition('.')
 
     def _get_SVEM_NSPs(self):
         """

From 84a4f9e884d4d173c7b1dbf076dcfb1b0232b261 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:40:32 -0400
Subject: [PATCH 4390/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 59e63aadc4..419c3c2b6f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+6.0.1
+-----
+
+* Issue #259: Fixed regression with namespace package handling on ``single
+  version, externally managed`` installs.
+
 ---
 6.0
 ---

From 977e98de5785333c945cd61e4e5878d4484fc4c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:40:48 -0400
Subject: [PATCH 4391/8469] Bumped to 6.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a693849f93..e8157e494a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.1"
+DEFAULT_VERSION = "6.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 2d3f6733a8..c4b0ef895d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.1'
+__version__ = '6.0.1'

From 3fb5d0ea96856387fc36603bc3a4d5b5fee2597c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:40:51 -0400
Subject: [PATCH 4392/8469] Added tag 6.0.1 for changeset bc6655b4acf2

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dadf223839..ff59322b8b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -155,3 +155,4 @@ a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 37ed55fd310d0cd32009dc5676121e86b404a23d 5.7
 67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
 755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
+bc6655b4acf205dd9f25c702955645656077398a 6.0.1

From b08527744e3f6cec0412a5de5cae9837e403061a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 09:41:26 -0400
Subject: [PATCH 4393/8469] Bumped to 6.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e8157e494a..c5d85d37e6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.0.1"
+DEFAULT_VERSION = "6.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c4b0ef895d..c974945db9 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.0.1'
+__version__ = '6.0.2'

From 60b97b0ca2335907fea90a904fcabedc44a47886 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 11:21:57 -0400
Subject: [PATCH 4394/8469] Try ignoring release.py

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b434a79369..b2ebcf1ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ script:
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
- - python setup.py ptr --addopts='--doctest-modules'
+ - python setup.py ptr --addopts='--doctest-modules --ignore release.py'
  - python ez_setup.py --version 5.4.1

From a40ae765974198e88337627123d97f9fc45a2e4b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 11:26:29 -0400
Subject: [PATCH 4395/8469] Also ignore lib2to3_ex.py

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b2ebcf1ede..b969053840 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,6 @@ script:
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
- - python setup.py ptr --addopts='--doctest-modules --ignore release.py'
+ - python setup.py ptr --addopts='--doctest-modules --ignore release.py
+ --ignore setuptools/lib2to3_ex.py'
  - python ez_setup.py --version 5.4.1

From 2b5d7f1333ff860bc9210ab3ad9ab2791db12bc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 14:56:52 -0400
Subject: [PATCH 4396/8469] Move doctest directive and ignores to setup.cfg

---
 .travis.yml | 3 +--
 setup.cfg   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b969053840..bc387f46cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,5 @@ script:
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
- - python setup.py ptr --addopts='--doctest-modules --ignore release.py
- --ignore setuptools/lib2to3_ex.py'
+ - python setup.py ptr
  - python ez_setup.py --version 5.4.1
diff --git a/setup.cfg b/setup.cfg
index 7f5fc79681..74a172a47a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,5 @@ formats = gztar zip
 universal=1
 
 [pytest]
-addopts=--ignore tests/manual_test.py --ignore tests/shlib_test
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test
 norecursedirs=dist build *.egg

From 13823cb975590687902edd3c4c073b2c1671cebc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 15:54:14 -0400
Subject: [PATCH 4397/8469] Update changelog with references to changes.

---
 CHANGES.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3cba63539a..19d8095f9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,14 @@ CHANGES
 7.0
 ---
 
-* Implement PEP 440 within pkg_resources and setuptools. This will cause some
-  versions to no longer be installable without using the ``===`` escape hatch.
+* Implement `PEP 440 <http://legacy.python.org/dev/peps/pep-0440/>`_ within
+  pkg_resources and setuptools. This change
+  deprecates some version numbers such that they will no longer be installable
+  without using the ``===`` escape hatch. See `the changes to test_resources
+  <https://bitbucket.org/pypa/setuptools/commits/dcd552da643c4448056de84c73d56da6d70769d5#chg-setuptools/tests/test_resources.py>`_
+  for specific examples of version numbers and specifiers that are no longer
+  supported. Setuptools now "vendors" the `packaging
+  <https://github.com/pypa/packaging>`_ library.
 
 -----
 6.0.1

From 6f6ee4f28ec5ceb95594264746da3676947aaa08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:05:06 -0400
Subject: [PATCH 4398/8469] Avoid trailing comments

---
 pkg_resources.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index b59ec52364..f2e8b850af 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1155,7 +1155,8 @@ def safe_version(version):
     Convert an arbitrary string to a standard version string
     """
     try:
-        return str(Version(version))  # this will normalize the version
+        # normalize the version
+        return str(Version(version))
     except InvalidVersion:
         version = version.replace(' ','.')
         return re.sub('[^A-Za-z0-9.]+', '-', version)

From a9541756f6a12c91704feffec4ddfee859f12c30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:10:17 -0400
Subject: [PATCH 4399/8469] Fix indent

---
 setuptools/command/egg_info.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9ba719fe71..de43bf0cde 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -76,8 +76,7 @@ def finalize_options(self):
                 "%s==%s" if isinstance(parsed_version, Version) else "%s===%s"
             )
             list(
-                parse_requirements(spec % (self.egg_name,
-                                               self.egg_version))
+                parse_requirements(spec % (self.egg_name, self.egg_version))
             )
         except ValueError:
             raise distutils.errors.DistutilsOptionError(

From 7d9c21a893431798ba77edd62b5490ff4ce47ecf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:13:48 -0400
Subject: [PATCH 4400/8469] Prefer packaging library if available.

---
 pkg_resources.py                   | 24 ++++++++++++++----------
 setup.py                           |  3 +++
 setuptools/command/egg_info.py     | 11 +++++++++--
 setuptools/dist.py                 | 14 +++++++++++---
 setuptools/tests/test_resources.py | 10 ++++++++--
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index f2e8b850af..6f21b0bfbc 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -14,6 +14,8 @@
 method.
 """
 
+from __future__ import absolute_import
+
 import sys
 import os
 import io
@@ -73,13 +75,15 @@
 except ImportError:
     pass
 
-# Import packaging.version.parse as parse_version for a compat shim with the
-# old parse_version that used to be defined in this file.
-from setuptools._vendor.packaging.version import parse as parse_version
+try:
+    import packaging.version
+except ImportError:
+    # fallback to vendored version
+    import setuptools._vendor.packaging.version
+    packaging = setuptools._vendor.packaging
 
-from setuptools._vendor.packaging.version import (
-    Version, InvalidVersion, Specifier,
-)
+# For compatibility, expose packaging.version.parse as parse_version
+parse_version = packaging.version.parse
 
 
 _state_vars = {}
@@ -1156,8 +1160,8 @@ def safe_version(version):
     """
     try:
         # normalize the version
-        return str(Version(version))
-    except InvalidVersion:
+        return str(packaging.version.Version(version))
+    except packaging.version.InvalidVersion:
         version = version.replace(' ','.')
         return re.sub('[^A-Za-z0-9.]+', '-', version)
 
@@ -2395,7 +2399,7 @@ def from_filename(cls, filename, metadata=None, **kw):
 
     def as_requirement(self):
         """Return a ``Requirement`` that matches this distribution exactly"""
-        if isinstance(self.parsed_version, Version):
+        if isinstance(self.parsed_version, packaging.version.Version):
             spec = "%s==%s" % (self.project_name, self.parsed_version)
         else:
             spec = "%s===%s" % (self.project_name, self.parsed_version)
@@ -2661,7 +2665,7 @@ def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         self.unsafe_name, project_name = project_name, safe_name(project_name)
         self.project_name, self.key = project_name, project_name.lower()
-        self.specifier = Specifier(
+        self.specifier = packaging.version.Specifier(
             ",".join(["".join([x, y]) for x, y in specs])
         )
         self.specs = specs
diff --git a/setup.py b/setup.py
index bac4e29dbf..cc0e468402 100755
--- a/setup.py
+++ b/setup.py
@@ -198,6 +198,9 @@ def _save_entry_points(self):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
+    install_requires=[
+        "packaging>=14.2,<15.0.dev0",
+    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==1.0.1",
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index de43bf0cde..43df87dcb5 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -10,12 +10,18 @@
 import re
 import sys
 
+try:
+    import packaging.version
+except ImportError:
+    # fallback to vendored version
+    import setuptools._vendor.packaging.version
+    packaging = setuptools._vendor.packaging
+
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
 from setuptools import svn_utils
 from setuptools.command.sdist import walk_revctrl
-from setuptools._vendor.packaging.version import Version
 from pkg_resources import (
     parse_requirements, safe_name, parse_version,
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
@@ -72,8 +78,9 @@ def finalize_options(self):
         parsed_version = parse_version(self.egg_version)
 
         try:
+            is_version = isinstance(parsed_version, packaging.version.Version)
             spec = (
-                "%s==%s" if isinstance(parsed_version, Version) else "%s===%s"
+                "%s==%s" if is_version else "%s===%s"
             )
             list(
                 parse_requirements(spec % (self.egg_name, self.egg_version))
diff --git a/setuptools/dist.py b/setuptools/dist.py
index ae4ff554c8..a3a37ee498 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,11 +13,18 @@
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
+try:
+    import packaging.version
+except ImportError:
+    # fallback to vendored version
+    import setuptools._vendor.packaging.version
+    packaging = setuptools._vendor.packaging
+
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2
-from setuptools._vendor.packaging.version import Version, InvalidVersion
 import pkg_resources
 
+
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
 
@@ -271,7 +278,8 @@ def __init__(self, attrs=None):
 
         if self.metadata.version is not None:
             try:
-                normalized_version = str(Version(self.metadata.version))
+                ver = packaging.version.Version(self.metadata.version)
+                normalized_version = str(ver)
                 if self.metadata.version != normalized_version:
                     warnings.warn(
                         "The version specified requires normalization, "
@@ -281,7 +289,7 @@ def __init__(self, attrs=None):
                         )
                     )
                     self.metadata.version = normalized_version
-            except (InvalidVersion, TypeError):
+            except (packaging.version.InvalidVersion, TypeError):
                 warnings.warn(
                     "The version specified (%r) is an invalid version, this "
                     "may not work as expected with newer versions of "
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 9051b4140e..8336a85d3a 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,6 +8,13 @@
 import shutil
 from unittest import TestCase
 
+try:
+    import packaging.version
+except ImportError:
+    # fallback to vendored version
+    import setuptools._vendor.packaging.version
+    packaging = setuptools._vendor.packaging
+
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
@@ -16,7 +23,6 @@
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3
-from setuptools._vendor.packaging.version import Specifier
 from .py26compat import skipIf
 
 def safe_repr(obj, short=False):
@@ -339,7 +345,7 @@ def testOptionsAndHashing(self):
         self.assertEqual(r2.extras, ("bar","foo"))  # extras are normalized
         self.assertEqual(hash(r1), hash(r2))
         self.assertEqual(
-            hash(r1), hash(("twisted", Specifier(">=1.2"),
+            hash(r1), hash(("twisted", packaging.version.Specifier(">=1.2"),
                             frozenset(["foo","bar"])))
         )
 

From c2e9f2ad32978620037bfbcc792e94e8e32f8097 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:16:22 -0400
Subject: [PATCH 4401/8469] Update requirements

---
 setuptools.egg-info/requires.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fa66c7141..f3f4471e81 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,3 +1,4 @@
+packaging>=14.2,<15.0.dev0
 
 [certs]
 certifi==1.0.1

From aa87355981a6475855116f1b663ba654e332b5a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:24:55 -0400
Subject: [PATCH 4402/8469] Bump to 7.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c5d85d37e6..a523401e97 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.0.2"
+DEFAULT_VERSION = "7.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c974945db9..29524eba32 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.0.2'
+__version__ = '7.0'

From 5e62aa3b59398252faef0d638a0f087d6c682800 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Sep 2014 16:25:13 -0400
Subject: [PATCH 4403/8469] Added tag 7.0b1 for changeset 8b8a52665803

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ff59322b8b..d3538875ed 100644
--- a/.hgtags
+++ b/.hgtags
@@ -156,3 +156,4 @@ a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
 755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
 bc6655b4acf205dd9f25c702955645656077398a 6.0.1
+8b8a52665803abf0bc2d2e892fc59ce5416f4bf7 7.0b1

From 04d00c2dbfc4a8facae5d91617f3a30de5474312 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 27 Sep 2014 16:56:15 -0400
Subject: [PATCH 4404/8469] #10510: make distuitls upload/register use HTML
 standards compliant CRLF.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Ian Cordasco, approved by Éric Araujo.
---
 command/upload.py    | 10 +++++-----
 tests/test_upload.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 180be7c750..9b15b67bae 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -143,11 +143,11 @@ def upload_file(self, command, pyversion, filename):
 
         # Build up the MIME payload for the POST data
         boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = b'\n--' + boundary.encode('ascii')
-        end_boundary = sep_boundary + b'--'
+        sep_boundary = b'\r\n--' + boundary.encode('ascii')
+        end_boundary = sep_boundary + b'--\r\n'
         body = io.BytesIO()
         for key, value in data.items():
-            title = '\nContent-Disposition: form-data; name="%s"' % key
+            title = '\r\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if type(value) != type([]):
                 value = [value]
@@ -159,12 +159,12 @@ def upload_file(self, command, pyversion, filename):
                     value = str(value).encode('utf-8')
                 body.write(sep_boundary)
                 body.write(title.encode('utf-8'))
-                body.write(b"\n\n")
+                body.write(b"\r\n\r\n")
                 body.write(value)
                 if value and value[-1:] == b'\r':
                     body.write(b'\n')  # write an extra newline (lurve Macs)
         body.write(end_boundary)
-        body.write(b"\n")
+        body.write(b"\r\n")
         body = body.getvalue()
 
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 0380f97944..24015416eb 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -127,7 +127,7 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.last_open.req.headers)
-        self.assertEqual(headers['Content-length'], '2087')
+        self.assertEqual(headers['Content-length'], '2163')
         content_type = headers['Content-type']
         self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')

From 731789f97ab96b9d91f5485c801078c1a9e66972 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 28 Sep 2014 11:01:11 -0400
Subject: [PATCH 4405/8469] #10510: Fix bug in forward port of 2.7 distutils
 patch.

Pointed out by Arfrever.
---
 command/upload.py    | 1 -
 tests/test_upload.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 9b15b67bae..1a96e2221e 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -164,7 +164,6 @@ def upload_file(self, command, pyversion, filename):
                 if value and value[-1:] == b'\r':
                     body.write(b'\n')  # write an extra newline (lurve Macs)
         body.write(end_boundary)
-        body.write(b"\r\n")
         body = body.getvalue()
 
         self.announce("Submitting %s to %s" % (filename, self.repository), log.INFO)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 24015416eb..dccaf77e3e 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -127,7 +127,7 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.last_open.req.headers)
-        self.assertEqual(headers['Content-length'], '2163')
+        self.assertEqual(headers['Content-length'], '2161')
         content_type = headers['Content-type']
         self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')

From 946652ee4def4236696a00d8873186bb07f15c71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 08:38:08 -0400
Subject: [PATCH 4406/8469] Backout 5692cd26a08e; Ref #262.

---
 setuptools/command/install_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 992709f19a..fd0f118b33 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -27,7 +27,7 @@ def finalize_options(self):
         ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs = []
+        self.outputs = [self.target]
 
     def run(self):
         self.run_command('egg_info')

From 2024eed40b8168372becc15e5c9c6f6125327af6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 08:38:24 -0400
Subject: [PATCH 4407/8469] Added tag 6.0.2b1 for changeset 1ae2a75724bb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ff59322b8b..a2912f64cf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -156,3 +156,4 @@ a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
 755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
 bc6655b4acf205dd9f25c702955645656077398a 6.0.1
+1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1

From 9e7f35fec4178dea678693cb768b6076d45e7ddd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 11:40:57 -0400
Subject: [PATCH 4408/8469] Update changelog. Fixes #262. Re-opens #118.

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 419c3c2b6f..0f5e56f43e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+6.0.2
+-----
+
+* Issue #262: Fixed regression in pip install due to egg-info directories
+  being omitted. Re-opens Issue #118.
+
 -----
 6.0.1
 -----

From 061820ccf195d6913a7ac3d1e44a9d5e9a475e66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 11:42:59 -0400
Subject: [PATCH 4409/8469] Added tag 6.0.2 for changeset 01271e84e512

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a2912f64cf..31fcc88244 100644
--- a/.hgtags
+++ b/.hgtags
@@ -157,3 +157,4 @@ a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
 bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1
+01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2

From 76b04a129ddf1bd141388533483b88dde6ba5605 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 11:43:50 -0400
Subject: [PATCH 4410/8469] Bumped to 6.0.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c5d85d37e6..c9bb039303 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.0.2"
+DEFAULT_VERSION = "6.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c974945db9..79b8fa5df2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.0.2'
+__version__ = '6.0.3'

From c5fa038292a9c7d6fe529c4d8001cec0d3bac9cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 21:29:03 -0400
Subject: [PATCH 4411/8469] Try adding six to PYTHONPATH

--HG--
branch : feature/issue-229
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bc387f46cb..f3dba4f82a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - pypy
 # command to run tests
 script:
+ - export PYTHONPATH=`pwd`/six-*.egg
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test

From e733ab4cbceab02aa2d746ba0e2867a9fe32432f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 21:40:38 -0400
Subject: [PATCH 4412/8469] Trim excess whitespace

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

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7531e37c1f..e803a41e88 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -34,7 +34,7 @@ def _write_entries(self, entries):
         entries_f = open(fn, 'wb')
         entries_f.write(entries)
         entries_f.close()
-   
+
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_version_10_format(self):
         """
@@ -140,7 +140,7 @@ def test_sources(self):
 
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_svn_tags(self):
-        code, data = environment.run_setup_py(["egg_info", 
+        code, data = environment.run_setup_py(["egg_info",
                                                "--tag-svn-revision"],
                                               pypath=self.old_cwd,
                                               data_stream=1)

From f4d7965c75a6452d405c0911102318f236a2afcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 21:56:12 -0400
Subject: [PATCH 4413/8469] Remove Python 2.5 compatibility methods for
 zipfiles

---
 setuptools/tests/environment.py | 53 +--------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index 476d280ae2..bbc7fd3537 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -10,57 +10,6 @@
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
-def _extract(self, member, path=None, pwd=None):
-    """for zipfile py2.5 borrowed from cpython"""
-    if not isinstance(member, zipfile.ZipInfo):
-        member = self.getinfo(member)
-
-    if path is None:
-        path = os.getcwd()
-
-    return _extract_member(self, member, path, pwd)
-
-
-def _extract_from_zip(self, name, dest_path):
-    dest_file = open(dest_path, 'wb')
-    try:
-        dest_file.write(self.read(name))
-    finally:
-        dest_file.close()
-
-
-def _extract_member(self, member, targetpath, pwd):
-    """for zipfile py2.5 borrowed from cpython"""
-    # build the destination pathname, replacing
-    # forward slashes to platform specific separators.
-    # Strip trailing path separator, unless it represents the root.
-    if (targetpath[-1:] in (os.path.sep, os.path.altsep)
-            and len(os.path.splitdrive(targetpath)[1]) > 1):
-        targetpath = targetpath[:-1]
-
-    # don't include leading "/" from file name if present
-    if member.filename[0] == '/':
-        targetpath = os.path.join(targetpath, member.filename[1:])
-    else:
-        targetpath = os.path.join(targetpath, member.filename)
-
-    targetpath = os.path.normpath(targetpath)
-
-    # Create all upper directories if necessary.
-    upperdirs = os.path.dirname(targetpath)
-    if upperdirs and not os.path.exists(upperdirs):
-        os.makedirs(upperdirs)
-
-    if member.filename[-1] == '/':
-        if not os.path.isdir(targetpath):
-            os.mkdir(targetpath)
-        return targetpath
-
-    _extract_from_zip(self, member.filename, targetpath)
-
-    return targetpath
-
-
 def _remove_dir(target):
 
     #on windows this seems to a problem
@@ -92,7 +41,7 @@ def setUp(self):
         try:
             zip_file = zipfile.ZipFile(self.datafile)
             for files in zip_file.namelist():
-                _extract(zip_file, files, self.temp_dir)
+                zip_file.extract(files, self.temp_dir)
         finally:
             if zip_file:
                 zip_file.close()

From 2ec13d5d118c249bfdb8b40a56c03c59e5c2e94d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 22:05:36 -0400
Subject: [PATCH 4414/8469] Correct typo

---
 setuptools/tests/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index bbc7fd3537..fa26a9ecea 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -107,7 +107,7 @@ def run_setup_py(cmd, pypath=None, path=None,
 
     #decode the console string if needed
     if hasattr(data,  "decode"):
-        data = data.decode()  # should use the preffered encoding
+        data = data.decode()  # should use the preferred encoding
         data = unicodedata.normalize('NFC', data)
 
     #communciate calls wait()

From 1166cd39f2be99bd0aeace80642a80ccde244989 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 22:14:39 -0400
Subject: [PATCH 4415/8469] Extract variable to be in proximity of its comment

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

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index fa26a9ecea..5fdbd96933 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -96,10 +96,12 @@ def run_setup_py(cmd, pypath=None, path=None,
 
     cmd = [sys.executable, "setup.py"] + list(cmd)
 
-    #regarding the shell argument, see: http://bugs.python.org/issue8557
+    # http://bugs.python.org/issue8557
+    shell = sys.platform == 'win32'
+
     try:
         proc = _Popen(cmd, stdout=_PIPE, stderr=_PIPE,
-                      shell=(sys.platform == 'win32'), env=env)
+                      shell=shell, env=env)
 
         data = proc.communicate()[data_stream]
     except OSError:

From 5e50991f8c53920f87fefa88ff9016b893829a7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Sep 2014 22:15:49 -0400
Subject: [PATCH 4416/8469] Reindent clause. Prefer leading comment to inline.

---
 setuptools/tests/environment.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index 5fdbd96933..c8d0e66921 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -100,8 +100,9 @@ def run_setup_py(cmd, pypath=None, path=None,
     shell = sys.platform == 'win32'
 
     try:
-        proc = _Popen(cmd, stdout=_PIPE, stderr=_PIPE,
-                      shell=shell, env=env)
+        proc = _Popen(
+            cmd, stdout=_PIPE, stderr=_PIPE, shell=shell, env=env,
+        )
 
         data = proc.communicate()[data_stream]
     except OSError:
@@ -109,7 +110,8 @@ def run_setup_py(cmd, pypath=None, path=None,
 
     #decode the console string if needed
     if hasattr(data,  "decode"):
-        data = data.decode()  # should use the preferred encoding
+        # use the default encoding
+        data = data.decode()
         data = unicodedata.normalize('NFC', data)
 
     #communciate calls wait()

From 59423d00f1ab2ba30212906ea691db28297cc47f Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 30 Sep 2014 14:58:22 +0200
Subject: [PATCH 4417/8469] Remove pointless "vile hack" that can cause the
 build step to fail when some extension modules can't be imported.

See issue #5309 for the build failures, issue #458343 for the original motivation.
---
 command/build_ext.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 08449e1a51..2ffab18162 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -545,15 +545,8 @@ def build_extension(self, ext):
                                          extra_postargs=extra_args,
                                          depends=ext.depends)
 
-        # XXX -- this is a Vile HACK!
-        #
-        # The setup.py script for Python on Unix needs to be able to
-        # get this list so it can perform all the clean up needed to
-        # avoid keeping object files around when cleaning out a failed
-        # build of an extension module.  Since Distutils does not
-        # track dependencies, we have to get rid of intermediates to
-        # ensure all the intermediates will be properly re-built.
-        #
+        # XXX outdated variable, kept here in case third-part code
+        # needs it.
         self._built_objects = objects[:]
 
         # Now link the object files together into a "shared object" --

From 198a91ac760d28bc16e919fd5068f6e607d56d12 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 30 Sep 2014 20:53:21 -0400
Subject: [PATCH 4418/8469] #22512: move distutils rpm test's .rpmdb to testing
 tmpdir.

Patch by Francis MB.
---
 tests/test_bdist_rpm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index bcbb5633e8..25c14abd32 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -24,6 +24,7 @@
 """
 
 class BuildRpmTestCase(support.TempdirManager,
+                       support.EnvironGuard,
                        support.LoggingSilencer,
                        unittest.TestCase):
 
@@ -54,6 +55,7 @@ def tearDown(self):
     def test_quiet(self):
         # let's create a package
         tmp_dir = self.mkdtemp()
+        os.environ['HOME'] = tmp_dir   # to confine dir '.rpmdb' creation
         pkg_dir = os.path.join(tmp_dir, 'foo')
         os.mkdir(pkg_dir)
         self.write_file((pkg_dir, 'setup.py'), SETUP_PY)
@@ -96,6 +98,7 @@ def test_quiet(self):
     def test_no_optimize_flag(self):
         # let's create a package that brakes bdist_rpm
         tmp_dir = self.mkdtemp()
+        os.environ['HOME'] = tmp_dir   # to confine dir '.rpmdb' creation
         pkg_dir = os.path.join(tmp_dir, 'foo')
         os.mkdir(pkg_dir)
         self.write_file((pkg_dir, 'setup.py'), SETUP_PY)

From 59b6796e92361bd1cc79deae7aba71ec12e32554 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Thu, 2 Oct 2014 02:10:47 +0200
Subject: [PATCH 4419/8469] - Issue #17219: Add library build dir for Python
 extension cross-builds.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 3ab2d04bf9..acbe648036 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -237,7 +237,7 @@ def finalize_options(self):
         # Python's library directory must be appended to library_dirs
         # See Issues: #1600860, #4366
         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-            if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
+            if not sysconfig.python_build:
                 # building third party extensions
                 self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
             else:

From 0d41723615b404279c772ce9535705f4f4e830cb Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 4 Oct 2014 14:15:42 +0200
Subject: [PATCH 4420/8469] Bump to 3.2.6rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index f9016d6d17..382e4b1c9d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.5"
+__version__ = "3.2.6rc1"
 #--end constants--

From 3859f945627998b2c426bf0e26bc86d54fc94731 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 4 Oct 2014 14:22:11 +0200
Subject: [PATCH 4421/8469] Bump to 3.3.6rc1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 2e8719f8b7..c58e98db56 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.5"
+__version__ = "3.3.6rc1"
 #--end constants--

From 1fc386404ed75da5f5be0cd0ca0adeff8ff6dd72 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 5 Oct 2014 19:05:50 -0700
Subject: [PATCH 4422/8469] Release bump for 3.4.2 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 750a5033ac..dfe62ffa4a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.2rc1"
+__version__ = "3.4.2"
 #--end constants--

From 42328153d2e438b94544568b9373e674cf4ac3b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Oct 2014 14:12:31 -0400
Subject: [PATCH 4423/8469] Remove broken link. Content that was at
 telecommunity.com was not generated from the source, so can't be maintained
 with setuptools any longer. Fixes #167.

---
 README.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.txt b/README.txt
index 9a142bf778..6920b90ccc 100755
--- a/README.txt
+++ b/README.txt
@@ -153,7 +153,6 @@ learning about Setuptools, Python Eggs, and EasyInstall:
 * `The EasyInstall user's guide and reference manual`_
 * `The setuptools Developer's Guide`_
 * `The pkg_resources API reference`_
-* `Package Compatibility Notes`_ (user-maintained)
 * `The Internal Structure of Python Eggs`_
 
 Questions, comments, and bug reports should be directed to the `distutils-sig
@@ -164,7 +163,6 @@ them there, so this reference list can be updated.  If you have working,
 the `setuptools bug tracker`_.
 
 .. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
-.. _Package Compatibility Notes: https://pythonhosted.org/setuptools/PackageNotes
 .. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
 .. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
 .. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html

From 35f70a6a7962643f32b87a6d9a125292060a60b1 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Fri, 10 Oct 2014 11:48:58 -0700
Subject: [PATCH 4424/8469] Make VersionConflict report who is requiring
 package

fixes issue 268

--HG--
branch : BB-268_make_VersionConflict_report_who_required_package_3
---
 pkg_resources.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 517298c90d..1ca8dd8efe 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -589,6 +589,9 @@ def resolve(self, requirements, env=None, installer=None,
         # key -> dist
         best = {}
         to_activate = []
+        # key with req -> set of things that required it
+        # useful for reporting info about conflicts
+        required_by = collections.defaultdict(set)
 
         while requirements:
             # process dependencies breadth-first
@@ -624,8 +627,13 @@ def resolve(self, requirements, env=None, installer=None,
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
                 # XXX put more info here
-                raise VersionConflict(dist, req)
-            requirements.extend(dist.requires(req.extras)[::-1])
+                raise VersionConflict(
+                    "%s is installed but %s is required by %s"
+                    % (dist, req, list(required_by.get(req))))
+            new_requirements = dist.requires(req.extras)[::-1]
+            requirements.extend(new_requirements)
+            for new_requirement in new_requirements:
+                required_by[new_requirement].add(req.project_name)
             processed[req] = True
 
         # return list of distros to activate

From f1b4ec01e0c2797580320a4b1fc04c0002e736b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 12:32:26 -0400
Subject: [PATCH 4425/8469] Update style in example for PEP-8 as suggested in
 PR #86.

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index c3844cf212..a34ec30444 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -473,7 +473,7 @@ script called ``baz``, you might do something like this::
 
     setup(
         # other arguments here...
-        entry_points = {
+        entry_points={
             'console_scripts': [
                 'foo = my_package.some_module:main_func',
                 'bar = other_module:some_func',

From 06ce668daf98eabfe821b8c7a910d067a2290b56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 12:53:39 -0400
Subject: [PATCH 4426/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0f5e56f43e..d7e3369d56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+6.1
+---
+
+* Issue #268: When resolving package versions, a VersionConflict now reports
+  which package previously required the conflicting version.
+
 -----
 6.0.2
 -----

From 9e8c932911dfa605f48428af7f3c23282012ab6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 12:55:09 -0400
Subject: [PATCH 4427/8469] Remove TODO comment, now done

---
 pkg_resources.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 1ca8dd8efe..35e2ed2450 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -626,7 +626,6 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                # XXX put more info here
                 raise VersionConflict(
                     "%s is installed but %s is required by %s"
                     % (dist, req, list(required_by.get(req))))

From e83d7d416f8706e262235b594384c70bf854eced Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 13:01:01 -0400
Subject: [PATCH 4428/8469] Extract variables

---
 pkg_resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 35e2ed2450..ac72d71fdd 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -626,9 +626,9 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                raise VersionConflict(
-                    "%s is installed but %s is required by %s"
-                    % (dist, req, list(required_by.get(req))))
+                tmpl = "%s is installed but %s is required by %s"
+                args = dist, req, list(required_by.get(req))
+                raise VersionConflict(tmpl % args)
             new_requirements = dist.requires(req.extras)[::-1]
             requirements.extend(new_requirements)
             for new_requirement in new_requirements:

From 0f27d17414b5a523614f16e6129ce426df3c3e66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 13:06:54 -0400
Subject: [PATCH 4429/8469] Update comment

---
 pkg_resources.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index ac72d71fdd..a5b0222393 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -589,8 +589,9 @@ def resolve(self, requirements, env=None, installer=None,
         # key -> dist
         best = {}
         to_activate = []
-        # key with req -> set of things that required it
-        # useful for reporting info about conflicts
+
+        # Mapping of requirement to set of distributions that required it;
+        # useful for reporting info about conflicts.
         required_by = collections.defaultdict(set)
 
         while requirements:

From f110f30df540d21c4fe7870460c07d70c6c8cd0b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 13:20:12 -0400
Subject: [PATCH 4430/8469] Add a couple of comments to help me understand.

---
 pkg_resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index a5b0222393..de50c4b013 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -630,10 +630,15 @@ def resolve(self, requirements, env=None, installer=None,
                 tmpl = "%s is installed but %s is required by %s"
                 args = dist, req, list(required_by.get(req))
                 raise VersionConflict(tmpl % args)
+
+            # push the new requirements onto the stack
             new_requirements = dist.requires(req.extras)[::-1]
             requirements.extend(new_requirements)
+
+            # Register the new requirements needed by req
             for new_requirement in new_requirements:
                 required_by[new_requirement].add(req.project_name)
+
             processed[req] = True
 
         # return list of distros to activate

From c4bc8b21d203668645ab551318aef5859e3acb9e Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 11 Oct 2014 15:42:24 -0700
Subject: [PATCH 4431/8469] Fix VersionConflict test failure

Fixes `TypeError: 'NoneType' object is not iterable` error at pkg_resources.py:632

Fixes issue #270

--HG--
branch : BB-270_fix_VersionConflict_test_failure_2
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index de50c4b013..511068a632 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -628,7 +628,7 @@ def resolve(self, requirements, env=None, installer=None,
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
                 tmpl = "%s is installed but %s is required by %s"
-                args = dist, req, list(required_by.get(req))
+                args = dist, req, list(required_by.get(req, []))
                 raise VersionConflict(tmpl % args)
 
             # push the new requirements onto the stack

From 95fcadd6d2fe0b48c9477f27f6b0071d6db18577 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Oct 2014 18:41:58 -0400
Subject: [PATCH 4432/8469] Removing stored egg-info

---
 setuptools.egg-info/dependency_links.txt |  2 -
 setuptools.egg-info/entry_points.txt     | 64 ------------------------
 setuptools.egg-info/requires.txt         |  6 ---
 3 files changed, 72 deletions(-)
 delete mode 100644 setuptools.egg-info/dependency_links.txt
 delete mode 100644 setuptools.egg-info/entry_points.txt
 delete mode 100644 setuptools.egg-info/requires.txt

diff --git a/setuptools.egg-info/dependency_links.txt b/setuptools.egg-info/dependency_links.txt
deleted file mode 100644
index b454c16810..0000000000
--- a/setuptools.egg-info/dependency_links.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790
-https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
deleted file mode 100644
index 72a5ffe0b5..0000000000
--- a/setuptools.egg-info/entry_points.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.4 = setuptools.command.easy_install:main
-
-[distutils.commands]
-alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-build_py = setuptools.command.build_py:build_py
-develop = setuptools.command.develop:develop
-easy_install = setuptools.command.easy_install:easy_install
-egg_info = setuptools.command.egg_info:egg_info
-install = setuptools.command.install:install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-install_lib = setuptools.command.install_lib:install_lib
-install_scripts = setuptools.command.install_scripts:install_scripts
-register = setuptools.command.register:register
-rotate = setuptools.command.rotate:rotate
-saveopts = setuptools.command.saveopts:saveopts
-sdist = setuptools.command.sdist:sdist
-setopt = setuptools.command.setopt:setopt
-test = setuptools.command.test:test
-upload_docs = setuptools.command.upload_docs:upload_docs
-
-[distutils.setup_keywords]
-convert_2to3_doctests = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-eager_resources = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-exclude_package_data = setuptools.dist:check_package_data
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-namespace_packages = setuptools.dist:check_nsp
-package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-setup_requires = setuptools.dist:check_requirements
-test_loader = setuptools.dist:check_importable
-test_runner = setuptools.dist:check_importable
-test_suite = setuptools.dist:check_test_suite
-tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-use_2to3_fixers = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-
-[egg_info.writers]
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
deleted file mode 100644
index 4fa66c7141..0000000000
--- a/setuptools.egg-info/requires.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-[certs]
-certifi==1.0.1
-
-[ssl:sys_platform=='win32']
-wincertstore==0.2

From 2c923b60ebb68e23de2f6ba64a3ca226204b116c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Oct 2014 19:31:28 -0400
Subject: [PATCH 4433/8469] Adding 'bootstrap.py' for bootstrapping a
 development environment when setuptools metadata isn't already present. Fixes
 #278.

---
 bootstrap.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 bootstrap.py

diff --git a/bootstrap.py b/bootstrap.py
new file mode 100644
index 0000000000..cbc1ca9d68
--- /dev/null
+++ b/bootstrap.py
@@ -0,0 +1,51 @@
+"""
+If setuptools is not already installed in the environment, it's not possible
+to invoke setuptools' own commands. This routine will bootstrap this local
+environment by creating a minimal egg-info directory and then invoking the
+egg-info command to flesh out the egg-info directory.
+"""
+
+import os
+import sys
+import textwrap
+import subprocess
+
+
+minimal_egg_info = textwrap.dedent("""
+    [distutils.commands]
+    egg_info = setuptools.command.egg_info:egg_info
+
+    [distutils.setup_keywords]
+    include_package_data = setuptools.dist:assert_bool
+    install_requires = setuptools.dist:check_requirements
+    extras_require = setuptools.dist:check_extras
+    entry_points = setuptools.dist:check_entry_points
+
+    [egg_info.writers]
+    dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+    entry_points.txt = setuptools.command.egg_info:write_entries
+    requires.txt = setuptools.command.egg_info:write_requirements
+    """)
+
+def ensure_egg_info():
+    if not os.path.exists('setuptools.egg-info'):
+        build_egg_info()
+
+
+def build_egg_info():
+    """
+    Build a minimal egg-info, enough to invoke egg_info
+    """
+
+    os.mkdir('setuptools.egg-info')
+    with open('setuptools.egg-info/entry_points.txt', 'w') as ep:
+        ep.write(minimal_egg_info)
+
+
+def run_egg_info():
+    subprocess.check_call([sys.executable, 'setup.py', 'egg_info'])
+
+
+if __name__ == '__main__':
+    ensure_egg_info()
+    run_egg_info()

From a23c2686487b050cf1edfd3532012a886ab0044c Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 11 Oct 2014 15:58:45 -0700
Subject: [PATCH 4434/8469] tox.ini: Add {posargs} to py.test invocation

This allows you to specify args on the tox command line that get passed through
to py.test -- e.g.:

tox -e py27 -- -k testResolve --tb=short setuptools/tests
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 06421a7344..1ac4620277 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,4 +2,4 @@
 envlist = py26,py27,py31,py32,py33,py34
 [testenv]
 deps=pytest
-commands=py.test
+commands=py.test {posargs}

From e3e55681150f7bd389d8c3e8ce99d18e743cdb2b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 19:34:27 -0400
Subject: [PATCH 4435/8469] Closing (merged)

--HG--
branch : BB-270_fix_VersionConflict_test_failure_2

From 7b8309661487c881eaeed7148481d9f0ff21d368 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 19:36:49 -0400
Subject: [PATCH 4436/8469] Bumped to 6.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c9bb039303..a693849f93 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.0.3"
+DEFAULT_VERSION = "6.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 79b8fa5df2..2d3f6733a8 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.0.3'
+__version__ = '6.1'

From 69ec1988c6f6cce6659c81717cefb21431df0be6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 19:36:52 -0400
Subject: [PATCH 4437/8469] Added tag 6.1 for changeset 7ea80190d494

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 31fcc88244..edac74a339 100644
--- a/.hgtags
+++ b/.hgtags
@@ -158,3 +158,4 @@ a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
 bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1
 01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2
+7ea80190d494a766c6356fce85c844703964b6cc 6.1

From 6281ff54a4276feae16ce808e9afd29c2691096a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Oct 2014 19:37:38 -0400
Subject: [PATCH 4438/8469] Bumped to 6.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a693849f93..dd20e984da 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.1"
+DEFAULT_VERSION = "6.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 2d3f6733a8..a00d9422ef 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.1'
+__version__ = '6.2'

From 49b4b07a6a16dff95918ab15344d3c8976cdafb2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 12 Oct 2014 08:50:38 +0200
Subject: [PATCH 4439/8469] Bump to 3.2.6

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 382e4b1c9d..6eb79cb639 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.2.6rc1"
+__version__ = "3.2.6"
 #--end constants--

From 49dde81581fd34569b50071587daa71eaf9e4546 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 12 Oct 2014 09:03:40 +0200
Subject: [PATCH 4440/8469] Bump to 3.3.6

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index c58e98db56..057e90b86c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.6rc1"
+__version__ = "3.3.6"
 #--end constants--

From c64524729fbd21cf5ad430acad82bf399b6f723d Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Mon, 13 Oct 2014 10:37:00 -0700
Subject: [PATCH 4441/8469] Cache eggs required for building in .eggs dir

This makes it so that these eggs don't prevent `install_requires` from
installing these packages.

Fixes ticket #80; workaround for ticket #209

--HG--
branch : put_setup_requires_egg_in_cache_dir_4
---
 CHANGES.txt         | 12 ++++++++++++
 setuptools/dist.py  | 21 +++++++++++++++++++--
 setuptools/win32.py | 19 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/win32.py

diff --git a/CHANGES.txt b/CHANGES.txt
index d7e3369d56..b1b7f2e8cf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,18 @@
 CHANGES
 =======
 
+----------
+Unreleased
+----------
+
+* Issue #80, #209: Eggs that are downloaded for ``setup_requires``,
+  ``test_requires``, etc. are now placed in a ``.eggs`` directory instead of
+  the package root directory. This is a better place for them as it doesn't
+  cause later phases of setuptools to think that the package is already
+  installed and then not install the package permanently in the environment
+  (See #209).
+
+
 ---
 6.1
 ---
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 8b36f67c1d..2d9da8c402 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,7 +14,8 @@
     DistutilsSetupError)
 
 from setuptools.depends import Require
-from setuptools.compat import basestring, PY2
+from setuptools.compat import basestring, PY2, unicode
+from setuptools import win32
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -305,6 +306,21 @@ def finalize_options(self):
         else:
             self.convert_2to3_doctests = []
 
+    def get_egg_cache_dir(self):
+        egg_cache_dir = os.path.join(os.curdir, '.eggs')
+        if not os.path.exists(egg_cache_dir):
+            os.mkdir(egg_cache_dir)
+            win32.hide_file(unicode(egg_cache_dir))
+            readme_txt_filename = os.path.join(egg_cache_dir, 'README.txt')
+            with open(readme_txt_filename, 'w') as f:
+                f.write('This directory contains eggs that were downloaded '
+                        'by setuptools to build, test, and run plug-ins.\n\n')
+                f.write('This directory caches those eggs to prevent '
+                        'repeated downloads.\n\n')
+                f.write('However, it is safe to delete this directory.\n\n')
+
+        return egg_cache_dir
+
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
 
@@ -328,8 +344,9 @@ def fetch_build_egg(self, req):
                 if 'find_links' in opts:
                     links = opts['find_links'][1].split() + links
                 opts['find_links'] = ('setup', links)
+            install_dir = self.get_egg_cache_dir()
             cmd = easy_install(
-                dist, args=["x"], install_dir=os.curdir, exclude_scripts=True,
+                dist, args=["x"], install_dir=install_dir, exclude_scripts=True,
                 always_copy=False, build_directory=None, editable=False,
                 upgrade=False, multi_version=True, no_report=True, user=False
             )
diff --git a/setuptools/win32.py b/setuptools/win32.py
new file mode 100644
index 0000000000..fd373009aa
--- /dev/null
+++ b/setuptools/win32.py
@@ -0,0 +1,19 @@
+# From http://stackoverflow.com/questions/19622133/python-set-hide-attribute-on-folders-in-windows-os
+
+import ctypes
+
+
+def hide_file(path):
+    """Sets the hidden attribute on a file or directory
+
+    `path` must be unicode; be careful that you escape backslashes or use raw
+    string literals - e.g.: `u'G:\\Dir\\folder1'` or `ur'G:\Dir\folder1'`.
+    """
+
+    SetFileAttributesW = ctypes.windll.kernel32.SetFileAttributesW
+
+    FILE_ATTRIBUTE_HIDDEN = 0x02
+
+    ret = SetFileAttributesW(path, FILE_ATTRIBUTE_HIDDEN)
+    if not ret:
+        raise ctypes.WinError()

From 0c1303c12ba7e94eb0f6a7d961828d0ff08ff93a Mon Sep 17 00:00:00 2001
From: "\"W. Trevor King\"" <wking@tremily.us>
Date: Thu, 16 Oct 2014 17:31:16 -0700
Subject: [PATCH 4442/8469] tests.egg_info: Test absolute egg-base install Make
 sure this copies the appropriate metadata into EGG-INFO.  This test currently
 fails, but the next commit fixes setuptools so it will pass.

---
 setuptools/tests/test_egg_info.py | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4c4f9456d7..9f81356044 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,8 +1,10 @@
 
+import distutils.core
 import os
 import sys
 import tempfile
 import shutil
+import stat
 import unittest
 
 import pkg_resources
@@ -35,6 +37,20 @@ def _write_entries(self, entries):
         entries_f.write(entries)
         entries_f.close()
 
+    def _create_project(self):
+        with open('setup.py', 'w') as f:
+            f.write('from setuptools import setup\n')
+            f.write('\n')
+            f.write('setup(\n')
+            f.write("    name='foo',\n")
+            f.write("    py_modules=['hello'],\n")
+            f.write("    entry_points={'console_scripts': ['hi = hello.run']},\n")
+            f.write('    zip_safe=False,\n')
+            f.write('    )\n')
+        with open('hello.py', 'w') as f:
+            f.write('def run():\n')
+            f.write("    print('hello')\n")
+
     @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
     def test_version_10_format(self):
         """
@@ -81,6 +97,48 @@ def test_version_10_format_legacy_parser(self):
 
         self.assertEqual(rev, '89000')
 
+    def test_egg_base_installed_egg_info(self):
+        self._create_project()
+        temp_dir = tempfile.mkdtemp(prefix='setuptools-test.')
+        os.chmod(temp_dir, stat.S_IRWXU)
+        try:
+            paths = {}
+            for dirname in ['home', 'lib', 'scripts', 'data', 'egg-base']:
+                paths[dirname] = os.path.join(temp_dir, dirname)
+                os.mkdir(paths[dirname])
+            config = os.path.join(paths['home'], '.pydistutils.cfg')
+            with open(config, 'w') as f:
+                f.write('[egg_info]\n')
+                f.write('egg-base = %s\n' % paths['egg-base'])
+            environ = os.environ.copy()
+            environ['HOME'] = paths['home']
+            code, data = environment.run_setup_py(
+                cmd=[
+                    'install', '--home', paths['home'],
+                    '--install-lib', paths['lib'],
+                    '--install-scripts', paths['scripts'],
+                    '--install-data', paths['data']],
+                pypath=':'.join([paths['lib'], self.old_cwd]),
+                data_stream=1,
+                env=environ)
+            if code:
+                raise AssertionError(data)
+            egg_info = None
+            for dirpath, dirnames, filenames in os.walk(paths['lib']):
+                if os.path.basename(dirpath) == 'EGG-INFO':
+                    egg_info = sorted(filenames)
+            self.assertEqual(
+                egg_info,
+                ['PKG-INFO',
+                 'SOURCES.txt',
+                 'dependency_links.txt',
+                 'entry_points.txt',
+                 'not-zip-safe',
+                 'top_level.txt'])
+        finally:
+            shutil.rmtree(temp_dir)
+
+
 DUMMY_SOURCE_TXT = """CHANGES.txt
 CONTRIBUTORS.txt
 HISTORY.txt

From 76906b7a50726de89307d55690338d0f40a5aadb Mon Sep 17 00:00:00 2001
From: "\"W. Trevor King\"" <wking@tremily.us>
Date: Thu, 16 Oct 2014 17:31:16 -0700
Subject: [PATCH 4443/8469] egg_info: Search egg-base for files to add to the
 manifest Before this commit, this:

  $ mkdir -p /tmp/xyz/{home,lib,scripts,data,egg}
  $ cat >/tmp/xyz/home/.pydistutils.cfg <<EOF
  > [egg_info]
  > egg-base = /tmp/xyz/egg
  > EOF
  $ export PYTHONPATH=/tmp/xyz/lib
  $ export HOME=/tmp/xyz/home
  $ setup.py install --home=/tmp/xyz/home --install-lib=/tmp/xyz/lib \
  >   --install-scripts=/tmp/xyz/scripts --install-data=/tmp/xyz/data

drops a lot of metadata, installing only SOURCES.txt and zip-safe
under EGG-INFO.  The problem is that the metadata files are written to
egg-base, but egg-base is not searched when creating the manifest
because it's outside of the current directory.  Work around this by
explicitly searching egg-base with distutils.filelist.findall (which
is really the version monkeypatched in by setuptools/__init__.py).

Since findall records relative paths, prefix the returned paths with
egg-base, so the include_pattern looking for the absolute
ei_cmd.egg_info will match them.
---
 setuptools/command/egg_info.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 43df87dcb5..2318e54d0d 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -6,6 +6,7 @@
 from distutils.util import convert_path
 from distutils import log
 import distutils.errors
+import distutils.filelist
 import os
 import re
 import sys
@@ -324,6 +325,10 @@ def add_defaults(self):
         elif os.path.exists(self.manifest):
             self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
+        if ei_cmd.egg_base != os.curdir:
+            self.filelist.allfiles.extend([
+                os.path.join(ei_cmd.egg_base, path)
+                for path in distutils.filelist.findall(ei_cmd.egg_base)])
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
     def prune_file_list(self):

From 03048c86ba6f955179cb4dcab5dd2db024609f19 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 16 Oct 2014 21:49:22 -0700
Subject: [PATCH 4444/8469] egg_info: Split manifest_maker._add_egg_info into
 its own method

On Sat, Oct 11, 2014 at 04:23:37PM -0000, Jason R. Coombs wrote [1]:
> I suggest implementing the functionality as a separate method with a
> docstring explaining the purpose.

so that's what we have here. The docstring is adapted from the
cbd4f603 (egg_info: Search egg-base for files to add to the manifest,
2014-10-16) commit message.

It's a lot of docs for a single command (although there is a newsted
list comprehension), so I'm fine if you drop this commit before
merging. The motivation behind the lines would still be available in
the version control history:

  $ hg blame -c setuptools/command/egg_info.py | grep -A1 ei_cmd.egg_base
  cbd4f6038604: if ei_cmd.egg_base != os.curdir:
  cbd4f6038604: self.filelist.allfiles.extend([
  cbd4f6038604: os.path.join(ei_cmd.egg_base, path)
  cbd4f6038604: for path in distutils.filelist.findall(ei_cmd.egg_base)])
  80108b046cb6: self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
  $ hg log -vr cbd4f6038604
  changeset: 3163:cbd4f6038604
  ...
  description:
  egg_info: Search egg-base for files to add to the manifest
  Before this commit, this:

    $ mkdir -p /tmp/xyz/{home,lib,scripts,data,egg}
    $ cat >/tmp/xyz/home/.pydistutils.cfg <<EOF
  ...

[1]: https://bitbucket.org/pypa/setuptools/pull-request/85/egg_info-search-egg-base-for-files-to-add/diff#comment-3418032
---
 setuptools/command/egg_info.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 2318e54d0d..302d687483 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -326,11 +326,28 @@ def add_defaults(self):
             self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
         if ei_cmd.egg_base != os.curdir:
-            self.filelist.allfiles.extend([
-                os.path.join(ei_cmd.egg_base, path)
-                for path in distutils.filelist.findall(ei_cmd.egg_base)])
+            self._add_egg_info(cmd=ei_cmd)
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
+    def _add_egg_info(self, cmd):
+        """Add paths for egg-info files for an external egg-base.
+
+        The egg-info files are written to egg-base.  If egg-base is
+        outside the current working directory, we need a separate step
+        (this method) to search the egg-base directory when creating
+        the manifest.  We use distutils.filelist.findall (which is
+        really the version monkeypatched in by setuptools/__init__.py)
+        to perform the search.
+
+        Since findall records relative paths, prefix the returned
+        paths with cmd.egg_base, so add_default's include_pattern call
+        (which is looking for the absolute cmd.egg_info) will match
+        them.
+        """
+        self.filelist.allfiles.extend([
+            os.path.join(cmd.egg_base, path)
+            for path in distutils.filelist.findall(cmd.egg_base)])
+
     def prune_file_list(self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()

From 5c68f3db41766e24d5fe6f7adbfd713bc83786a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 12:52:08 +0100
Subject: [PATCH 4445/8469] The name win32 is a misnomer. Use 'windows_support'
 instead.

---
 setuptools/dist.py                          | 4 ++--
 setuptools/{win32.py => windows_support.py} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename setuptools/{win32.py => windows_support.py} (100%)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2d9da8c402..4f3022324d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -15,7 +15,7 @@
 
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2, unicode
-from setuptools import win32
+from setuptools import windows_support
 import pkg_resources
 
 def _get_unpatched(cls):
@@ -310,7 +310,7 @@ def get_egg_cache_dir(self):
         egg_cache_dir = os.path.join(os.curdir, '.eggs')
         if not os.path.exists(egg_cache_dir):
             os.mkdir(egg_cache_dir)
-            win32.hide_file(unicode(egg_cache_dir))
+            windows_support.hide_file(unicode(egg_cache_dir))
             readme_txt_filename = os.path.join(egg_cache_dir, 'README.txt')
             with open(readme_txt_filename, 'w') as f:
                 f.write('This directory contains eggs that were downloaded '
diff --git a/setuptools/win32.py b/setuptools/windows_support.py
similarity index 100%
rename from setuptools/win32.py
rename to setuptools/windows_support.py

From 3d532f52850f0c860f0031519a25231797320976 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 12:55:43 +0100
Subject: [PATCH 4446/8469] Update docstring to be imperative and incorporate
 comment. Omit lessons about string literals.

---
 setuptools/windows_support.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/windows_support.py b/setuptools/windows_support.py
index fd373009aa..8da7124391 100644
--- a/setuptools/windows_support.py
+++ b/setuptools/windows_support.py
@@ -1,13 +1,13 @@
-# From http://stackoverflow.com/questions/19622133/python-set-hide-attribute-on-folders-in-windows-os
-
 import ctypes
 
 
 def hide_file(path):
-    """Sets the hidden attribute on a file or directory
+    """
+    Set the hidden attribute on a file or directory.
+
+    From http://stackoverflow.com/questions/19622133/
 
-    `path` must be unicode; be careful that you escape backslashes or use raw
-    string literals - e.g.: `u'G:\\Dir\\folder1'` or `ur'G:\Dir\folder1'`.
+    `path` must be text.
     """
 
     SetFileAttributesW = ctypes.windll.kernel32.SetFileAttributesW

From ae6eb3131a935824d1aca43c6ac5ac6bb4907078 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:02:37 +0100
Subject: [PATCH 4447/8469] Declare argtypes and restype on SetFileAttributesW
 so that it will cast Python 2 bytestrings to Unicode automatically.

---
 setuptools/dist.py            | 4 ++--
 setuptools/windows_support.py | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4f3022324d..6b9d350ec4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,7 +14,7 @@
     DistutilsSetupError)
 
 from setuptools.depends import Require
-from setuptools.compat import basestring, PY2, unicode
+from setuptools.compat import basestring, PY2
 from setuptools import windows_support
 import pkg_resources
 
@@ -310,7 +310,7 @@ def get_egg_cache_dir(self):
         egg_cache_dir = os.path.join(os.curdir, '.eggs')
         if not os.path.exists(egg_cache_dir):
             os.mkdir(egg_cache_dir)
-            windows_support.hide_file(unicode(egg_cache_dir))
+            windows_support.hide_file(egg_cache_dir)
             readme_txt_filename = os.path.join(egg_cache_dir, 'README.txt')
             with open(readme_txt_filename, 'w') as f:
                 f.write('This directory contains eggs that were downloaded '
diff --git a/setuptools/windows_support.py b/setuptools/windows_support.py
index 8da7124391..df35a5f4f7 100644
--- a/setuptools/windows_support.py
+++ b/setuptools/windows_support.py
@@ -1,4 +1,4 @@
-import ctypes
+import ctypes.wintypes
 
 
 def hide_file(path):
@@ -9,11 +9,12 @@ def hide_file(path):
 
     `path` must be text.
     """
-
-    SetFileAttributesW = ctypes.windll.kernel32.SetFileAttributesW
+    SetFileAttributes = ctypes.windll.kernel32.SetFileAttributesW
+    SetFileAttributes.argtypes = ctypes.wintypes.LPWSTR, ctypes.wintypes.DWORD
+    SetFileAttributes.restype = ctypes.wintypes.BOOL
 
     FILE_ATTRIBUTE_HIDDEN = 0x02
 
-    ret = SetFileAttributesW(path, FILE_ATTRIBUTE_HIDDEN)
+    ret = SetFileAttributes(path, FILE_ATTRIBUTE_HIDDEN)
     if not ret:
         raise ctypes.WinError()

From 81b4d929152eb7119f89a06294e2b656d36c3484 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:07:48 +0100
Subject: [PATCH 4448/8469] Decorate hide_file to only run on Windows.

---
 setuptools/windows_support.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/windows_support.py b/setuptools/windows_support.py
index df35a5f4f7..8e67e41a8e 100644
--- a/setuptools/windows_support.py
+++ b/setuptools/windows_support.py
@@ -1,6 +1,14 @@
+import platform
 import ctypes.wintypes
 
 
+def windows_only(func):
+    if platform.system() != 'Windows':
+        return lambda *args, **kwargs: None
+    return func
+
+
+@windows_only
 def hide_file(path):
     """
     Set the hidden attribute on a file or directory.

From 1fab75aaec4ada030ca2777e26edbf5eb76d9802 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:14:06 +0100
Subject: [PATCH 4449/8469] Defer importing of wintypes because it doesn't
 import nicely. See Python issue 16396.

---
 setuptools/windows_support.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/windows_support.py b/setuptools/windows_support.py
index 8e67e41a8e..cb977cff95 100644
--- a/setuptools/windows_support.py
+++ b/setuptools/windows_support.py
@@ -1,5 +1,5 @@
 import platform
-import ctypes.wintypes
+import ctypes
 
 
 def windows_only(func):
@@ -17,6 +17,7 @@ def hide_file(path):
 
     `path` must be text.
     """
+    __import__('ctypes.wintypes')
     SetFileAttributes = ctypes.windll.kernel32.SetFileAttributesW
     SetFileAttributes.argtypes = ctypes.wintypes.LPWSTR, ctypes.wintypes.DWORD
     SetFileAttributes.restype = ctypes.wintypes.BOOL

From 68522a3e6f7bea404dab4e30bc43f2901a16760e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:32:59 +0100
Subject: [PATCH 4450/8469] Update changelog for more detail about the impact
 and possible user actions necessary.

---
 CHANGES.txt | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b1b7f2e8cf..49529a04c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,17 +2,22 @@
 CHANGES
 =======
 
-----------
-Unreleased
-----------
+---
+7.0
+---
 
-* Issue #80, #209: Eggs that are downloaded for ``setup_requires``,
-  ``test_requires``, etc. are now placed in a ``.eggs`` directory instead of
-  the package root directory. This is a better place for them as it doesn't
-  cause later phases of setuptools to think that the package is already
-  installed and then not install the package permanently in the environment
-  (See #209).
+* Issue #80, Issue #209: Eggs that are downloaded for ``setup_requires``,
+  ``test_requires``, etc. are now placed in a ``./.eggs`` directory instead of
+  directly in the current directory. This choice of location means the files
+  can be readily managed (removed, ignored). Additionally,
+  later phases or invocations of setuptools will not detect the package as
+  already installed and ignore it for permanent install (See #209).
 
+  This change is indicated as backward-incompatible as installations that
+  depend on the installation in the current directory will need to account for
+  the new location. Systems that ignore ``*.egg`` will probably need to be
+  adapted to ignore ``.eggs``. The files will need to be manually moved or
+  will be retrieved again. Most use cases will require no attention.
 
 ---
 6.1

From dd32e04bc63ac7bd9f70b9684b76bdb283b6111d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:34:11 +0100
Subject: [PATCH 4451/8469] Bumped to 7.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index dd20e984da..a523401e97 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "6.2"
+DEFAULT_VERSION = "7.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index a00d9422ef..29524eba32 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '6.2'
+__version__ = '7.0'

From 6732c94e80d371cf69031d9c49637bf9b311f4da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:34:15 +0100
Subject: [PATCH 4452/8469] Added tag 7.0 for changeset df26609c2f61

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index edac74a339..7e995132ed 100644
--- a/.hgtags
+++ b/.hgtags
@@ -159,3 +159,4 @@ bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1
 01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2
 7ea80190d494a766c6356fce85c844703964b6cc 6.1
+df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0

From 8772accf84d424f6cc848567fde0747716448030 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Oct 2014 13:35:22 +0100
Subject: [PATCH 4453/8469] Bumped to 7.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a523401e97..8664761308 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "7.0"
+DEFAULT_VERSION = "7.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 29524eba32..0ab618ea56 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '7.0'
+__version__ = '7.1'

From 693d7bfd19d7be7427637bf784829134eeeb9efa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Oct 2014 11:20:44 -0400
Subject: [PATCH 4454/8469] Correct typo

---
 setuptools/svn_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
index dadb682a59..6502fc98ea 100644
--- a/setuptools/svn_utils.py
+++ b/setuptools/svn_utils.py
@@ -302,7 +302,7 @@ def __init__(self, path=''):
         self._externals = None
 
     def get_revision(self):
-        'Retrieve the directory revision informatino using svnversion'
+        'Retrieve the directory revision information using svnversion'
         code, data = _run_command(['svnversion', '-c', self.path])
         if code:
             log.warn("svnversion failed")

From 606b8fb55059ad29d1d31709686f43f17e03642c Mon Sep 17 00:00:00 2001
From: Victor Lin <bornstub@gmail.com>
Date: Thu, 23 Oct 2014 15:06:51 -0700
Subject: [PATCH 4455/8469] Fix #277, data files in symbol link directory are
 not included issue

--HG--
branch : bugfix-277
---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d99ab2a6b4..6c51072dc3 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -139,7 +139,7 @@ def findall(dir = os.curdir):
     (relative to 'dir').
     """
     all_files = []
-    for base, dirs, files in os.walk(dir):
+    for base, dirs, files in os.walk(dir, followlinks=True):
         if base==os.curdir or base.startswith(os.curdir+os.sep):
             base = base[2:]
         if base:

From ea346ec92092e3bd8d8c07f0522de5e9d1081f00 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Oct 2014 20:13:53 -0400
Subject: [PATCH 4456/8469] Remove Python 2.5 compatibility for
 sys.dont_write_bytecode

---
 setuptools/__init__.py             | 4 ----
 setuptools/command/easy_install.py | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6c51072dc3..ca025c305d 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -148,7 +148,3 @@ def findall(dir = os.curdir):
     return all_files
 
 distutils.filelist.findall = findall    # fix findall bug in distutils.
-
-# sys.dont_write_bytecode was introduced in Python 2.6.
-_dont_write_bytecode = getattr(sys, 'dont_write_bytecode',
-    bool(os.environ.get("PYTHONDONTWRITEBYTECODE")))
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6854827222..2e00b99630 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -35,7 +35,7 @@
 import site
 import struct
 
-from setuptools import Command, _dont_write_bytecode
+from setuptools import Command
 from setuptools.sandbox import run_setup
 from setuptools.py31compat import get_path, get_config_vars
 from setuptools.command import setopt
@@ -1152,7 +1152,7 @@ def pf(src, dst):
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
-        if _dont_write_bytecode:
+        if sys.dont_write_bytecode:
             self.warn('byte-compiling is disabled, skipping.')
             return
 

From f57e5a637c6d07f6aad463b3caa0cf047ba7bf50 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Oct 2014 20:15:43 -0400
Subject: [PATCH 4457/8469] Build the egg_info before running tests

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bc387f46cb..8122d8bbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - pypy
 # command to run tests
 script:
+ - python setup.py egg_info
  # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
  - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test

From 2c33dad04fd11ebd7fc8e15d0017ff2dc617e6a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Oct 2014 20:18:01 -0400
Subject: [PATCH 4458/8469] Remove workaround for pytest issue

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8122d8bbe1..22541671ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ python:
 # command to run tests
 script:
  - python setup.py egg_info
- # testing fix for https://bitbucket.org/hpk42/pytest/issue/555
- - pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
  - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From 909f8ed55e9b027b28fe9de50682d4a21d99743d Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 30 Oct 2014 19:37:07 +0100
Subject: [PATCH 4459/8469] Issue #8876: distutils now falls back to copying
 files when hard linking doesn't work.

This allows use with special filesystems such as VirtualBox shared folders.
---
 file_util.py            | 34 +++++++++++++++++++++-------------
 tests/test_file_util.py | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/file_util.py b/file_util.py
index 7b14efbc07..b3fee35a6c 100644
--- a/file_util.py
+++ b/file_util.py
@@ -80,7 +80,8 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     (os.symlink) instead of copying: set it to "hard" or "sym"; if it is
     None (the default), files are copied.  Don't set 'link' on systems that
     don't support it: 'copy_file()' doesn't check if hard or symbolic
-    linking is available.
+    linking is available. If hardlink fails, falls back to
+    _copy_file_contents().
 
     Under Mac OS, uses the native file copy function in macostools; on
     other systems, uses '_copy_file_contents()' to copy file contents.
@@ -132,24 +133,31 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
     # (Unix only, of course, but that's the caller's responsibility)
     elif link == 'hard':
         if not (os.path.exists(dst) and os.path.samefile(src, dst)):
-            os.link(src, dst)
+            try:
+                os.link(src, dst)
+                return (dst, 1)
+            except OSError:
+                # If hard linking fails, fall back on copying file
+                # (some special filesystems don't support hard linking
+                #  even under Unix, see issue #8876).
+                pass
     elif link == 'sym':
         if not (os.path.exists(dst) and os.path.samefile(src, dst)):
             os.symlink(src, dst)
+            return (dst, 1)
 
     # Otherwise (non-Mac, not linking), copy the file contents and
     # (optionally) copy the times and mode.
-    else:
-        _copy_file_contents(src, dst)
-        if preserve_mode or preserve_times:
-            st = os.stat(src)
-
-            # According to David Ascher <da@ski.org>, utime() should be done
-            # before chmod() (at least under NT).
-            if preserve_times:
-                os.utime(dst, (st[ST_ATIME], st[ST_MTIME]))
-            if preserve_mode:
-                os.chmod(dst, S_IMODE(st[ST_MODE]))
+    _copy_file_contents(src, dst)
+    if preserve_mode or preserve_times:
+        st = os.stat(src)
+
+        # According to David Ascher <da@ski.org>, utime() should be done
+        # before chmod() (at least under NT).
+        if preserve_times:
+            os.utime(dst, (st[ST_ATIME], st[ST_MTIME]))
+        if preserve_mode:
+            os.chmod(dst, S_IMODE(st[ST_MODE]))
 
     return (dst, 1)
 
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index d3db5cef0e..a6d04f065d 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -5,7 +5,7 @@
 import errno
 from unittest.mock import patch
 
-from distutils.file_util import move_file
+from distutils.file_util import move_file, copy_file
 from distutils import log
 from distutils.tests import support
 from distutils.errors import DistutilsFileError
@@ -78,6 +78,36 @@ def test_move_file_exception_unpacking_unlink(self):
                 fobj.write('spam eggs')
             move_file(self.source, self.target, verbose=0)
 
+    def test_copy_file_hard_link(self):
+        with open(self.source, 'w') as f:
+            f.write('some content')
+        st = os.stat(self.source)
+        copy_file(self.source, self.target, link='hard')
+        st2 = os.stat(self.source)
+        st3 = os.stat(self.target)
+        self.assertTrue(os.path.samestat(st, st2), (st, st2))
+        self.assertTrue(os.path.samestat(st2, st3), (st2, st3))
+        with open(self.source, 'r') as f:
+            self.assertEqual(f.read(), 'some content')
+
+    def test_copy_file_hard_link_failure(self):
+        # If hard linking fails, copy_file() falls back on copying file
+        # (some special filesystems don't support hard linking even under
+        #  Unix, see issue #8876).
+        with open(self.source, 'w') as f:
+            f.write('some content')
+        st = os.stat(self.source)
+        with patch("os.link", side_effect=OSError(0, "linking unsupported")):
+            copy_file(self.source, self.target, link='hard')
+        st2 = os.stat(self.source)
+        st3 = os.stat(self.target)
+        self.assertTrue(os.path.samestat(st, st2), (st, st2))
+        self.assertFalse(os.path.samestat(st2, st3), (st2, st3))
+        for fn in (self.source, self.target):
+            with open(fn, 'r') as f:
+                self.assertEqual(f.read(), 'some content')
+
+
 def test_suite():
     return unittest.makeSuite(FileUtilTestCase)
 

From b4a0c62c24f332dc0b7849f8e4b6675552d1203c Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Mon, 3 Nov 2014 14:06:44 +0000
Subject: [PATCH 4460/8469] Make egg_info command write out setup requirements

This commit makes the egg_info command write out setup requirements as well
as install requirements, setup requirements are written to a
setup_requires.txt file.

The commit adds a new function write_setup_requirements which uses the
existing _write_requirements function to write setup requirements out to a file
and adds a new entry point to the egg_info.writers group.
---
 setup.py                       | 1 +
 setuptools/command/egg_info.py | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/setup.py b/setup.py
index bac4e29dbf..ca312c0143 100755
--- a/setup.py
+++ b/setup.py
@@ -163,6 +163,7 @@ def _save_entry_points(self):
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
+            "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements",
             "entry_points.txt = setuptools.command.egg_info:write_entries",
             "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
             "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 06764a17c5..78d8698185 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -382,6 +382,12 @@ def write_requirements(cmd, basename, filename):
     cmd.write_or_delete_file("requirements", filename, data.getvalue())
 
 
+def write_setup_requirements(cmd, basename, filename):
+    data = StringIO()
+    _write_requirements(data, cmd.distribution.setup_requires)
+    cmd.write_or_delete_file("setup-requirements", filename, data.getvalue())
+
+
 def write_toplevel_names(cmd, basename, filename):
     pkgs = dict.fromkeys(
         [

From 5f5ad73d306818b6dd4ac94dc67f5abb60534037 Mon Sep 17 00:00:00 2001
From: Konstantin Tretyakov <kt@ut.ee>
Date: Thu, 13 Nov 2014 17:11:31 +0200
Subject: [PATCH 4461/8469] Mention in the README about possible problems with
 older wget versions refusing certificates.

---
 README.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.txt b/README.txt
index 6920b90ccc..c6973298ec 100755
--- a/README.txt
+++ b/README.txt
@@ -83,6 +83,18 @@ Alternatively, Setuptools may be installed to a user-local path::
 
     > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
 
+Note that on some older systems (noted on Debian 6 and CentOS 5 installations), 
+`wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` 
+does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using
+`wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the 
+host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` 
+(see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, 
+install Setuptools as follows::
+
+    > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py
+    > python ez_setup.py --insecure
+
+
 Unix including Mac OS X (curl)
 ==============================
 

From 7c5d53881122046a97420ba085d865f59458ddde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Nov 2014 10:30:23 -0500
Subject: [PATCH 4462/8469] Trying a new technique. In this approach,
 setuptools is aware of its dependencies and when imported makes sure the
 vendored versions are present on sys.path.

--HG--
branch : feature/issue-229
---
 .travis.yml                                   |   1 -
 setup.py                                      |   2 --
 setuptools/__init__.py                        |   2 ++
 .../_vendor/six-1.7.3.egg                     | Bin
 setuptools/bootstrap.py                       |  27 ++++++++++++++++++
 5 files changed, 29 insertions(+), 3 deletions(-)
 rename six-1.7.3.egg => setuptools/_vendor/six-1.7.3.egg (100%)
 create mode 100644 setuptools/bootstrap.py

diff --git a/.travis.yml b/.travis.yml
index 15268ccc33..22541671ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ python:
   - pypy
 # command to run tests
 script:
- - export PYTHONPATH=`pwd`/six-*.egg
  - python setup.py egg_info
  - python setup.py test
  - python setup.py ptr
diff --git a/setup.py b/setup.py
index ee2848f7f1..8a9a15584e 100755
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,6 @@
 import textwrap
 import contextlib
 
-sys.path.append('six-1.7.3.egg')
-
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 920dad3861..c885555dbf 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,5 +1,7 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
+__import__('setuptools.bootstrap').bootstrap.ensure_deps()
+
 import os
 import sys
 import distutils.core
diff --git a/six-1.7.3.egg b/setuptools/_vendor/six-1.7.3.egg
similarity index 100%
rename from six-1.7.3.egg
rename to setuptools/_vendor/six-1.7.3.egg
diff --git a/setuptools/bootstrap.py b/setuptools/bootstrap.py
new file mode 100644
index 0000000000..0cd95778ef
--- /dev/null
+++ b/setuptools/bootstrap.py
@@ -0,0 +1,27 @@
+"""
+When setuptools is installed in a clean environment, it doesn't have its
+dependencies, so it can't run to install its dependencies. This module
+checks those dependencies and if one or more are missing, it uses vendored
+versions.
+"""
+
+import os
+import sys
+import glob
+
+def ensure_deps():
+	"""
+	Detect if dependencies are installed and if not, use vendored versions.
+	"""
+	try:
+		__import__('six')
+	except ImportError:
+		use_vendor_deps()
+
+def use_vendor_deps():
+	"""
+	Use vendored versions
+	"""
+	here = os.path.dirname(__file__)
+	eggs = glob.glob(here + '/_vendor/*.egg')
+	sys.path.extend(eggs)

From 866ff739f6e64aaaefcf7816263410527c9f55f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Nov 2014 10:33:45 -0500
Subject: [PATCH 4463/8469] Include the _vendor directory in the sdist

--HG--
branch : feature/issue-229
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2c587d40f9..dc6a1c8801 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ recursive-include setuptools/tests *.html entries*
 recursive-include setuptools/tests/svn_data *.zip
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
+recursive-include setuptools/_vendor *
 include *.py
 include *.txt
 include MANIFEST.in

From 1714060fb8083ad4f7a440b049d1b8c71dc003be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Nov 2014 10:41:21 -0500
Subject: [PATCH 4464/8469] Add link to project home page. Fixes #224.

---
 docs/using.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/using.txt b/docs/using.txt
index e44847d642..bd80893da2 100644
--- a/docs/using.txt
+++ b/docs/using.txt
@@ -8,3 +8,6 @@ it at the very beginning of `setup.py` like this::
 
     from ez_setup import use_setuptools
     use_setuptools()
+
+More info on `ez_setup.py` can be found at `the project home page
+<https://pypy.python.org/pypi/setuptools>`_.

From 41f634812f1ee6b734e7d5fb25486b66ab351d0a Mon Sep 17 00:00:00 2001
From: matej <none@none>
Date: Tue, 18 Nov 2014 14:38:56 +0100
Subject: [PATCH 4465/8469] Different treatment of --user option to
 easy_install (refs #285)

---
 setuptools/command/easy_install.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2e00b99630..d0bae2b2c8 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -148,12 +148,9 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        if site.ENABLE_USER_SITE:
-            whereami = os.path.abspath(__file__)
-            self.user = whereami.startswith(site.USER_SITE)
-        else:
-            self.user = 0
-
+        # the --user option seemst to be an opt-in one,
+        # so the default should be False.
+        self.user = 0
         self.zip_ok = self.local_snapshots_ok = None
         self.install_dir = self.script_dir = self.exclude_scripts = None
         self.index_url = None

From 4b8fbbf7f064f170b0e0040f44bb528147ddedc9 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 19 Nov 2014 13:14:19 -0500
Subject: [PATCH 4466/8469] Upgrade packaging to 14.3

---
 pkg_resources.py                           |   4 +-
 setuptools/_vendor/packaging/__about__.py  |   2 +-
 setuptools/_vendor/packaging/_compat.py    |  13 +
 setuptools/_vendor/packaging/specifiers.py | 732 +++++++++++++++++++++
 setuptools/_vendor/packaging/version.py    | 412 +-----------
 setuptools/_vendor/vendored.txt            |   2 +-
 6 files changed, 751 insertions(+), 414 deletions(-)
 create mode 100644 setuptools/_vendor/packaging/specifiers.py

diff --git a/pkg_resources.py b/pkg_resources.py
index daf7732c36..422b31b547 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -77,9 +77,11 @@
 
 try:
     import packaging.version
+    import packaging.specifiers
 except ImportError:
     # fallback to vendored version
     import setuptools._vendor.packaging.version
+    import setuptools._vendor.packaging.specifiers
     packaging = setuptools._vendor.packaging
 
 # For compatibility, expose packaging.version.parse as parse_version
@@ -2678,7 +2680,7 @@ def __init__(self, project_name, specs, extras):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         self.unsafe_name, project_name = project_name, safe_name(project_name)
         self.project_name, self.key = project_name, project_name.lower()
-        self.specifier = packaging.version.Specifier(
+        self.specifier = packaging.specifiers.SpecifierSet(
             ",".join(["".join([x, y]) for x, y in specs])
         )
         self.specs = specs
diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index b64681e4e7..481589e76a 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "14.2"
+__version__ = "14.3"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/setuptools/_vendor/packaging/_compat.py b/setuptools/_vendor/packaging/_compat.py
index f2ff383499..5c396ceac6 100644
--- a/setuptools/_vendor/packaging/_compat.py
+++ b/setuptools/_vendor/packaging/_compat.py
@@ -25,3 +25,16 @@
     string_types = str,
 else:
     string_types = basestring,
+
+
+def with_metaclass(meta, *bases):
+    """
+    Create a base class with a metaclass.
+    """
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
new file mode 100644
index 0000000000..bea4a39820
--- /dev/null
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -0,0 +1,732 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import abc
+import functools
+import itertools
+import re
+
+from ._compat import string_types, with_metaclass
+from .version import Version, LegacyVersion, parse
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+
+    @abc.abstractmethod
+    def __str__(self):
+        """
+        Returns the str representation of this Specifier like object. This
+        should be representative of the Specifier itself.
+        """
+
+    @abc.abstractmethod
+    def __hash__(self):
+        """
+        Returns a hash value for this Specifier like object.
+        """
+
+    @abc.abstractmethod
+    def __eq__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are equal.
+        """
+
+    @abc.abstractmethod
+    def __ne__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are not equal.
+        """
+
+    @abc.abstractproperty
+    def prereleases(self):
+        """
+        Returns whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @prereleases.setter
+    def prereleases(self, value):
+        """
+        Sets whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @abc.abstractmethod
+    def contains(self, item, prereleases=None):
+        """
+        Determines if the given item is contained within this specifier.
+        """
+
+    @abc.abstractmethod
+    def filter(self, iterable, prereleases=None):
+        """
+        Takes an iterable of items and filters them so that only items which
+        are contained within this specifier are allowed in it.
+        """
+
+
+class _IndividualSpecifier(BaseSpecifier):
+
+    _operators = {}
+
+    def __init__(self, spec="", prereleases=None):
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<{0}({1!r}{2})>".format(
+            self.__class__.__name__,
+            str(self),
+            pre,
+        )
+
+    def __str__(self):
+        return "{0}{1}".format(*self._spec)
+
+    def __hash__(self):
+        return hash(self._spec)
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec == other._spec
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec != other._spec
+
+    def _get_operator(self, op):
+        return getattr(self, "_compare_{0}".format(self._operators[op]))
+
+    def _coerce_version(self, version):
+        if not isinstance(version, (LegacyVersion, Version)):
+            version = parse(version)
+        return version
+
+    @property
+    def prereleases(self):
+        return self._prereleases
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def contains(self, item, prereleases=None):
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        item = self._coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        return self._get_operator(self._spec[0])(item, self._spec[1])
+
+    def filter(self, iterable, prereleases=None):
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = self._coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if (parsed_version.is_prerelease
+                        and not (prereleases or self.prereleases)):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the begining.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+class LegacySpecifier(_IndividualSpecifier):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        (?P<operator>(==|!=|<=|>=|<|>))
+        \s*
+        (?P<version>
+            [^\s]* # We just match everything, except for whitespace since this
+                   # is a "legacy" specifier and the version string can be just
+                   # about anything.
+        )
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    _operators = {
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+    }
+
+    def _coerce_version(self, version):
+        if not isinstance(version, LegacyVersion):
+            version = LegacyVersion(str(version))
+        return version
+
+    def _compare_equal(self, prospective, spec):
+        return prospective == self._coerce_version(spec)
+
+    def _compare_not_equal(self, prospective, spec):
+        return prospective != self._coerce_version(spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= self._coerce_version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= self._coerce_version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        return prospective < self._coerce_version(spec)
+
+    def _compare_greater_than(self, prospective, spec):
+        return prospective > self._coerce_version(spec)
+
+
+def _require_version_compare(fn):
+    @functools.wraps(fn)
+    def wrapped(self, prospective, spec):
+        if not isinstance(prospective, Version):
+            return False
+        return fn(self, prospective, spec)
+    return wrapped
+
+
+class Specifier(_IndividualSpecifier):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    @_require_version_compare
+    def _compare_compatible(self, prospective, spec):
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post")
+                               and not x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return (self._get_operator(">=")(prospective, spec)
+                and self._get_operator("==")(prospective, prefix))
+
+    @_require_version_compare
+    def _compare_equal(self, prospective, spec):
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            prospective = prospective[:len(spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            spec, prospective = _pad_version(spec, prospective)
+        else:
+            # Convert our spec string into a Version
+            spec = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec.local:
+                prospective = Version(prospective.public)
+
+        return prospective == spec
+
+    @_require_version_compare
+    def _compare_not_equal(self, prospective, spec):
+        return not self._compare_equal(prospective, spec)
+
+    @_require_version_compare
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= Version(spec)
+
+    @_require_version_compare
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= Version(spec)
+
+    @_require_version_compare
+    def _compare_less_than(self, prospective, spec):
+        # Less than are defined as exclusive operators, this implies that
+        # pre-releases do not match for the same series as the spec. This is
+        # implemented by making <V imply !=V.*.
+        return (prospective < Version(spec)
+                and self._get_operator("!=")(prospective, spec + ".*"))
+
+    @_require_version_compare
+    def _compare_greater_than(self, prospective, spec):
+        # Greater than are defined as exclusive operators, this implies that
+        # pre-releases do not match for the same series as the spec. This is
+        # implemented by making >V imply !=V.*.
+        return (prospective > Version(spec)
+                and self._get_operator("!=")(prospective, spec + ".*"))
+
+    def _compare_arbitrary(self, prospective, spec):
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if parse(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    result = []
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split):])
+    right_split.append(left[len(right_split):])
+
+    # Insert our padding
+    left_split.insert(
+        1,
+        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
+    )
+    right_split.insert(
+        1,
+        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
+    )
+
+    return (
+        list(itertools.chain(*left_split)),
+        list(itertools.chain(*right_split)),
+    )
+
+
+class SpecifierSet(BaseSpecifier):
+
+    def __init__(self, specifiers="", prereleases=None):
+        # Split on , to break each indidivual specifier into it's own item, and
+        # strip each item to remove leading/trailing whitespace.
+        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+
+        # Parsed each individual specifier, attempting first to make it a
+        # Specifier and falling back to a LegacySpecifier.
+        parsed = set()
+        for specifier in specifiers:
+            try:
+                parsed.add(Specifier(specifier))
+            except InvalidSpecifier:
+                parsed.add(LegacySpecifier(specifier))
+
+        # Turn our parsed specifiers into a frozen set and save them for later.
+        self._specs = frozenset(parsed)
+
+        # Store our prereleases value so we can use it later to determine if
+        # we accept prereleases or not.
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
+
+    def __str__(self):
+        return ",".join(sorted(str(s) for s in self._specs))
+
+    def __hash__(self):
+        return hash(self._specs)
+
+    def __and__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        specifier = SpecifierSet()
+        specifier._specs = frozenset(self._specs | other._specs)
+
+        if self._prereleases is None and other._prereleases is not None:
+            specifier._prereleases = other._prereleases
+        elif self._prereleases is not None and other._prereleases is None:
+            specifier._prereleases = self._prereleases
+        elif self._prereleases == other._prereleases:
+            specifier._prereleases = self._prereleases
+        else:
+            raise ValueError(
+                "Cannot combine SpecifierSets with True and False prerelease "
+                "overrides."
+            )
+
+        return specifier
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    @property
+    def prereleases(self):
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        # Note: The use of any() here means that an empty set of specifiers
+        #       will always return False, this is an explicit design decision.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def contains(self, item, prereleases=None):
+        # Ensure that our item is a Version or LegacyVersion instance.
+        if not isinstance(item, (LegacyVersion, Version)):
+            item = parse(item)
+
+        # We can determine if we're going to allow pre-releases by looking to
+        # see if any of the underlying items supports them. If none of them do
+        # and this item is a pre-release then we do not allow it and we can
+        # short circuit that here.
+        # Note: This means that 1.0.dev1 would not be contained in something
+        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
+        if (not (self.prereleases or prereleases)) and item.is_prerelease:
+            return False
+
+        # Determine if we're forcing a prerelease or not, we bypass
+        # self.prereleases here and use self._prereleases because we want to
+        # only take into consideration actual *forced* values. The underlying
+        # specifiers will handle the other logic.
+        # The logic here is: If prereleases is anything but None, we'll just
+        #                    go aheand and continue to use that. However if
+        #                    prereleases is None, then we'll use whatever the
+        #                    value of self._prereleases is as long as it is not
+        #                    None itself.
+        if prereleases is None and self._prereleases is not None:
+            prereleases = self._prereleases
+
+        # We simply dispatch to the underlying specs here to make sure that the
+        # given version is contained within all of them.
+        # Note: This use of all() here means that an empty set of specifiers
+        #       will always return True, this is an explicit design decision.
+        return all(
+            s.contains(item, prereleases=prereleases)
+            for s in self._specs
+        )
+
+    def filter(self, iterable, prereleases=None):
+        # Determine if we're forcing a prerelease or not, we bypass
+        # self.prereleases here and use self._prereleases because we want to
+        # only take into consideration actual *forced* values. The underlying
+        # specifiers will handle the other logic.
+        # The logic here is: If prereleases is anything but None, we'll just
+        #                    go aheand and continue to use that. However if
+        #                    prereleases is None, then we'll use whatever the
+        #                    value of self._prereleases is as long as it is not
+        #                    None itself.
+        if prereleases is None and self._prereleases is not None:
+            prereleases = self._prereleases
+
+        # If we have any specifiers, then we want to wrap our iterable in the
+        # filter method for each one, this will act as a logical AND amongst
+        # each specifier.
+        if self._specs:
+            for spec in self._specs:
+                iterable = spec.filter(iterable, prereleases=prereleases)
+            return iterable
+        # If we do not have any specifiers, then we need to have a rough filter
+        # which will filter out any pre-releases, unless there are no final
+        # releases, and which will filter out LegacyVersion in general.
+        else:
+            filtered = []
+            found_prereleases = []
+
+            for item in iterable:
+                # Ensure that we some kind of Version class for this item.
+                if not isinstance(item, (LegacyVersion, Version)):
+                    parsed_version = parse(item)
+                else:
+                    parsed_version = item
+
+                # Filter out any item which is parsed as a LegacyVersion
+                if isinstance(parsed_version, LegacyVersion):
+                    continue
+
+                # Store any item which is a pre-release for later unless we've
+                # already found a final version or we are accepting prereleases
+                if parsed_version.is_prerelease and not prereleases:
+                    if not filtered:
+                        found_prereleases.append(item)
+                else:
+                    filtered.append(item)
+
+            # If we've found no items except for pre-releases, then we'll go
+            # ahead and use the pre-releases
+            if not filtered and found_prereleases and prereleases is None:
+                return found_prereleases
+
+            return filtered
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
index 0affe899f4..e76e960724 100644
--- a/setuptools/_vendor/packaging/version.py
+++ b/setuptools/_vendor/packaging/version.py
@@ -17,13 +17,11 @@
 import itertools
 import re
 
-from ._compat import string_types
 from ._structures import Infinity
 
 
 __all__ = [
-    "parse", "Version", "LegacyVersion", "InvalidVersion", "Specifier",
-    "InvalidSpecifier",
+    "parse", "Version", "LegacyVersion", "InvalidVersion",
 ]
 
 
@@ -376,411 +374,3 @@ def _cmpkey(epoch, release, pre, post, dev, local):
         )
 
     return epoch, release, pre, post, dev, local
-
-
-class InvalidSpecifier(ValueError):
-    """
-    An invalid specifier was found, users should refer to PEP 440.
-    """
-
-
-class Specifier(object):
-
-    _regex = re.compile(
-        r"""
-        ^
-        \s*
-        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
-        (?P<version>
-            (?:
-                # The identity operators allow for an escape hatch that will
-                # do an exact string match of the version you wish to install.
-                # This will not be parsed by PEP 440 and we cannot determine
-                # any semantic meaning from it. This operator is discouraged
-                # but included entirely as an escape hatch.
-                (?<====)  # Only match for the identity operator
-                \s*
-                [^\s]*    # We just match everything, except for whitespace
-                          # since we are only testing for strict identity.
-            )
-            |
-            (?:
-                # The (non)equality operators allow for wild card and local
-                # versions to be specified so we have to define these two
-                # operators separately to enable that.
-                (?<===|!=)            # Only match for equals and not equals
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-
-                # You cannot use a wild card and a dev or local version
-                # together so group them with a | and make them optional.
-                (?:
-                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
-                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
-                    |
-                    \.\*  # Wild card syntax of .*
-                )?
-            )
-            |
-            (?:
-                # The compatible operator requires at least two digits in the
-                # release segment.
-                (?<=~=)               # Only match for the compatible operator
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-            |
-            (?:
-                # All other operators only allow a sub set of what the
-                # (non)equality operators do. Specifically they do not allow
-                # local versions to be specified nor do they allow the prefix
-                # matching wild cards.
-                (?<!==|!=|~=)         # We have special cases for these
-                                      # operators so we want to make sure they
-                                      # don't match here.
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-        )
-        \s*
-        $
-        """,
-        re.VERBOSE | re.IGNORECASE,
-    )
-
-    _operators = {
-        "~=": "compatible",
-        "==": "equal",
-        "!=": "not_equal",
-        "<=": "less_than_equal",
-        ">=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-        "===": "arbitrary",
-    }
-
-    def __init__(self, specs="", prereleases=None):
-        # Split on comma to get each individual specification
-        _specs = set()
-        for spec in (s for s in specs.split(",") if s):
-            match = self._regex.search(spec)
-            if not match:
-                raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
-
-            _specs.add(
-                (
-                    match.group("operator").strip(),
-                    match.group("version").strip(),
-                )
-            )
-
-        # Set a frozen set for our specifications
-        self._specs = frozenset(_specs)
-
-        # Store whether or not this Specifier should accept prereleases
-        self._prereleases = prereleases
-
-    def __repr__(self):
-        return "<Specifier({0})>".format(repr(str(self)))
-
-    def __str__(self):
-        return ",".join(["".join(s) for s in sorted(self._specs)])
-
-    def __hash__(self):
-        return hash(self._specs)
-
-    def __and__(self, other):
-        if isinstance(other, string_types):
-            other = Specifier(other)
-        elif not isinstance(other, Specifier):
-            return NotImplemented
-
-        return self.__class__(",".join([str(self), str(other)]))
-
-    def __eq__(self, other):
-        if isinstance(other, string_types):
-            other = Specifier(other)
-        elif not isinstance(other, Specifier):
-            return NotImplemented
-
-        return self._specs == other._specs
-
-    def __ne__(self, other):
-        if isinstance(other, string_types):
-            other = Specifier(other)
-        elif not isinstance(other, Specifier):
-            return NotImplemented
-
-        return self._specs != other._specs
-
-    def _get_operator(self, op):
-        return getattr(self, "_compare_{0}".format(self._operators[op]))
-
-    def _compare_compatible(self, prospective, spec):
-        # Compatible releases have an equivalent combination of >= and ==. That
-        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
-        # implement this in terms of the other specifiers instead of
-        # implementing it ourselves. The only thing we need to do is construct
-        # the other specifiers.
-
-        # We want everything but the last item in the version, but we want to
-        # ignore post and dev releases and we want to treat the pre-release as
-        # it's own separate segment.
-        prefix = ".".join(
-            list(
-                itertools.takewhile(
-                    lambda x: (not x.startswith("post")
-                               and not x.startswith("dev")),
-                    _version_split(spec),
-                )
-            )[:-1]
-        )
-
-        # Add the prefix notation to the end of our string
-        prefix += ".*"
-
-        return (self._get_operator(">=")(prospective, spec)
-                and self._get_operator("==")(prospective, prefix))
-
-    def _compare_equal(self, prospective, spec):
-        # We need special logic to handle prefix matching
-        if spec.endswith(".*"):
-            # Split the spec out by dots, and pretend that there is an implicit
-            # dot in between a release segment and a pre-release segment.
-            spec = _version_split(spec[:-2])  # Remove the trailing .*
-
-            # Split the prospective version out by dots, and pretend that there
-            # is an implicit dot in between a release segment and a pre-release
-            # segment.
-            prospective = _version_split(str(prospective))
-
-            # Shorten the prospective version to be the same length as the spec
-            # so that we can determine if the specifier is a prefix of the
-            # prospective version or not.
-            prospective = prospective[:len(spec)]
-
-            # Pad out our two sides with zeros so that they both equal the same
-            # length.
-            spec, prospective = _pad_version(spec, prospective)
-        else:
-            # Convert our spec string into a Version
-            spec = Version(spec)
-
-            # If the specifier does not have a local segment, then we want to
-            # act as if the prospective version also does not have a local
-            # segment.
-            if not spec.local:
-                prospective = Version(prospective.public)
-
-        return prospective == spec
-
-    def _compare_not_equal(self, prospective, spec):
-        return not self._compare_equal(prospective, spec)
-
-    def _compare_less_than_equal(self, prospective, spec):
-        return prospective <= Version(spec)
-
-    def _compare_greater_than_equal(self, prospective, spec):
-        return prospective >= Version(spec)
-
-    def _compare_less_than(self, prospective, spec):
-        # Less than are defined as exclusive operators, this implies that
-        # pre-releases do not match for the same series as the spec. This is
-        # implemented by making <V imply !=V.*.
-        return (prospective < Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
-
-    def _compare_greater_than(self, prospective, spec):
-        # Greater than are defined as exclusive operators, this implies that
-        # pre-releases do not match for the same series as the spec. This is
-        # implemented by making >V imply !=V.*.
-        return (prospective > Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
-
-    def _compare_arbitrary(self, prospective, spec):
-        return str(prospective).lower() == str(spec).lower()
-
-    @property
-    def prereleases(self):
-        # If there is an explicit prereleases set for this, then we'll just
-        # blindly use that.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # Look at all of our specifiers and determine if they are inclusive
-        # operators, and if they are if they are including an explicit
-        # prerelease.
-        for spec, version in self._specs:
-            if spec in ["==", ">=", "<=", "~="]:
-                # The == specifier can include a trailing .*, if it does we
-                # want to remove before parsing.
-                if spec == "==" and version.endswith(".*"):
-                    version = version[:-2]
-
-                # Parse the version, and if it is a pre-release than this
-                # specifier allows pre-releases.
-                if parse(version).is_prerelease:
-                    return True
-
-        return False
-
-    @prereleases.setter
-    def prereleases(self, value):
-        self._prereleases = value
-
-    def contains(self, item, prereleases=None):
-        # Determine if prereleases are to be allowed or not.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # Normalize item to a Version or LegacyVersion, this allows us to have
-        # a shortcut for ``"2.0" in Specifier(">=2")
-        if isinstance(item, (Version, LegacyVersion)):
-            version_item = item
-        else:
-            try:
-                version_item = Version(item)
-            except ValueError:
-                version_item = LegacyVersion(item)
-
-        # Determine if we should be supporting prereleases in this specifier
-        # or not, if we do not support prereleases than we can short circuit
-        # logic if this version is a prereleases.
-        if version_item.is_prerelease and not prereleases:
-            return False
-
-        # Detect if we have any specifiers, if we do not then anything matches
-        # and we can short circuit all this logic.
-        if not self._specs:
-            return True
-
-        # If we're operating on a LegacyVersion, then we can only support
-        # arbitrary comparison so do a quick check to see if the spec contains
-        # any non arbitrary specifiers
-        if isinstance(version_item, LegacyVersion):
-            if any(op != "===" for op, _ in self._specs):
-                return False
-
-        # Ensure that the passed in version matches all of our version
-        # specifiers
-        return all(
-            self._get_operator(op)(
-                version_item if op != "===" else item,
-                spec,
-            )
-            for op, spec, in self._specs
-        )
-
-    def filter(self, iterable, prereleases=None):
-        iterable = list(iterable)
-        yielded = False
-        found_prereleases = []
-
-        kw = {"prereleases": prereleases if prereleases is not None else True}
-
-        # Attempt to iterate over all the values in the iterable and if any of
-        # them match, yield them.
-        for version in iterable:
-            if not isinstance(version, (Version, LegacyVersion)):
-                parsed_version = parse(version)
-            else:
-                parsed_version = version
-
-            if self.contains(parsed_version, **kw):
-                # If our version is a prerelease, and we were not set to allow
-                # prereleases, then we'll store it for later incase nothing
-                # else matches this specifier.
-                if (parsed_version.is_prerelease
-                        and not (prereleases or self.prereleases)):
-                    found_prereleases.append(version)
-                # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the begining.
-                else:
-                    yielded = True
-                    yield version
-
-        # Now that we've iterated over everything, determine if we've yielded
-        # any values, and if we have not and we have any prereleases stored up
-        # then we will go ahead and yield the prereleases.
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
-
-
-_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
-
-
-def _version_split(version):
-    result = []
-    for item in version.split("."):
-        match = _prefix_regex.search(item)
-        if match:
-            result.extend(match.groups())
-        else:
-            result.append(item)
-    return result
-
-
-def _pad_version(left, right):
-    left_split, right_split = [], []
-
-    # Get the release segment of our versions
-    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
-    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
-
-    # Get the rest of our versions
-    left_split.append(left[len(left_split):])
-    right_split.append(left[len(right_split):])
-
-    # Insert our padding
-    left_split.insert(
-        1,
-        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
-    )
-    right_split.insert(
-        1,
-        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
-    )
-
-    return (
-        list(itertools.chain(*left_split)),
-        list(itertools.chain(*right_split)),
-    )
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index df383d8bd3..b86bba005c 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==14.2
+packaging==14.3

From a15a276e1a7425ae884352958f87c9e506d2a1c8 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 19 Nov 2014 13:15:01 -0500
Subject: [PATCH 4467/8469] Remove packaging from setup.py

---
 setup.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup.py b/setup.py
index cc0e468402..bac4e29dbf 100755
--- a/setup.py
+++ b/setup.py
@@ -198,9 +198,6 @@ def _save_entry_points(self):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
-    install_requires=[
-        "packaging>=14.2,<15.0.dev0",
-    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==1.0.1",

From 4ae526d52609fe2a7515d87e4c0d047a826411a7 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 19 Nov 2014 13:38:16 -0500
Subject: [PATCH 4468/8469] Always use the vendored copy of packaging

---
 pkg_resources.py                   | 11 +++--------
 setuptools/tests/test_resources.py |  9 +++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 422b31b547..a3eef28f88 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -75,14 +75,9 @@
 except ImportError:
     pass
 
-try:
-    import packaging.version
-    import packaging.specifiers
-except ImportError:
-    # fallback to vendored version
-    import setuptools._vendor.packaging.version
-    import setuptools._vendor.packaging.specifiers
-    packaging = setuptools._vendor.packaging
+import setuptools._vendor.packaging.version
+import setuptools._vendor.packaging.specifiers
+packaging = setuptools._vendor.packaging
 
 # For compatibility, expose packaging.version.parse as parse_version
 parse_version = packaging.version.parse
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 8336a85d3a..a8520e12ad 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,12 +8,9 @@
 import shutil
 from unittest import TestCase
 
-try:
-    import packaging.version
-except ImportError:
-    # fallback to vendored version
-    import setuptools._vendor.packaging.version
-    packaging = setuptools._vendor.packaging
+import setuptools._vendor.packaging.version
+import setuptools._vendor.packaging.specifiers
+packaging = setuptools._vendor.packaging
 
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,

From 6f74eb003ba0df2049a92c60e2ebd6eaa4aba030 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 19 Nov 2014 13:38:32 -0500
Subject: [PATCH 4469/8469] Fix the use of pacakging.version.Specifier

---
 setuptools/tests/test_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index a8520e12ad..356e1ed4e6 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -342,7 +342,7 @@ def testOptionsAndHashing(self):
         self.assertEqual(r2.extras, ("bar","foo"))  # extras are normalized
         self.assertEqual(hash(r1), hash(r2))
         self.assertEqual(
-            hash(r1), hash(("twisted", packaging.version.Specifier(">=1.2"),
+            hash(r1), hash(("twisted", packaging.specifiers.SpecifierSet(">=1.2"),
                             frozenset(["foo","bar"])))
         )
 

From 5fa2a4519fc0521ee15b0ce0cad136afe304eb37 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 19 Nov 2014 21:40:21 -0500
Subject: [PATCH 4470/8469] fix left over merge indicator

---
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f4d8019a1e..cc2423b69d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -45,7 +45,6 @@ CHANGES
 
 * Issue #262: Fixed regression in pip install due to egg-info directories
   being omitted. Re-opens Issue #118.
->>>>>>> master
 
 -----
 6.0.1

From b880aac986be9e5c76411953dcaf56c443f5d584 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 22 Nov 2014 12:54:57 -0800
Subject: [PATCH 4471/8469] Issue #22919: Windows build updated to support VC
 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.

---
 command/build_ext.py           |   2 +-
 command/wininst-14.0-amd64.exe | Bin 0 -> 84480 bytes
 command/wininst-14.0.exe       | Bin 0 -> 75264 bytes
 msvc9compiler.py               |   3 +++
 msvccompiler.py                |   3 +++
 sysconfig.py                   |  27 +++++++++------------------
 6 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 command/wininst-14.0-amd64.exe
 create mode 100644 command/wininst-14.0.exe

diff --git a/command/build_ext.py b/command/build_ext.py
index 54ce13454f..605efbd68f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -209,7 +209,7 @@ def finalize_options(self):
             if MSVC_VERSION >= 9:
                 # Use the .lib files for the correct architecture
                 if self.plat_name == 'win32':
-                    suffix = ''
+                    suffix = 'win32'
                 else:
                     # win-amd64 or win-ia64
                     suffix = self.plat_name[4:]
diff --git a/command/wininst-14.0-amd64.exe b/command/wininst-14.0-amd64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..9affe13039517798970f5e3a8d9f4d1d13e79464
GIT binary patch
literal 84480
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%0AApdsA%z|%g>up>$nUTcWSs85Z`;uJlfBlT1UEmo
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
F{6EauG?M@T

literal 0
HcmV?d00001

diff --git a/command/wininst-14.0.exe b/command/wininst-14.0.exe
new file mode 100644
index 0000000000000000000000000000000000000000..3ce71b9f1b49afc4e6eb8a60ef551e7ced3e04b6
GIT binary patch
literal 75264
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

literal 0
HcmV?d00001

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 9688f20019..d1374efe13 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -179,6 +179,9 @@ def get_build_version():
     i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
     majorVersion = int(s[:-2]) - 6
+    if majorVersion >= 13:
+        # v13 was skipped and should be v14
+        majorVersion += 1
     minorVersion = int(s[2:3]) / 10.0
     # I don't think paths are affected by minor version in version 6
     if majorVersion == 6:
diff --git a/msvccompiler.py b/msvccompiler.py
index 8116656961..1048cd4159 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -157,6 +157,9 @@ def get_build_version():
     i = i + len(prefix)
     s, rest = sys.version[i:].split(" ", 1)
     majorVersion = int(s[:-2]) - 6
+    if majorVersion >= 13:
+        # v13 was skipped and should be v14
+        majorVersion += 1
     minorVersion = int(s[2:3]) / 10.0
     # I don't think paths are affected by minor version in version 6
     if majorVersion == 6:
diff --git a/sysconfig.py b/sysconfig.py
index a1452fe167..573724ddd7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -9,6 +9,7 @@
 Email:        <fdrake@acm.org>
 """
 
+import _imp
 import os
 import re
 import sys
@@ -22,23 +23,15 @@
 BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
 
 # Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-# it'll live in project/PCbuild/amd64.
+# live in project/PCBuild/win32 or project/PCBuild/amd64.
 # set for cross builds
 if "_PYTHON_PROJECT_BASE" in os.environ:
     project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])
 else:
     project_base = os.path.dirname(os.path.abspath(sys.executable))
-if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
-# PC/VS7.1
-if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
-# PC/AMD64
-if os.name == "nt" and "\\pcbuild\\amd64" in project_base[-14:].lower():
-    project_base = os.path.abspath(os.path.join(project_base, os.path.pardir,
-                                                os.path.pardir))
+if (os.name == 'nt' and
+    project_base.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
+    project_base = os.path.dirname(os.path.dirname(project_base))
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
@@ -51,11 +44,9 @@ def _is_python_source_dir(d):
             return True
     return False
 _sys_home = getattr(sys, '_home', None)
-if _sys_home and os.name == 'nt' and \
-    _sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
-    _sys_home = os.path.dirname(_sys_home)
-    if _sys_home.endswith('pcbuild'):   # must be amd64
-        _sys_home = os.path.dirname(_sys_home)
+if (_sys_home and os.name == 'nt' and
+    _sys_home.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
+    _sys_home = os.path.dirname(os.path.dirname(_sys_home))
 def _python_build():
     if _sys_home:
         return _is_python_source_dir(_sys_home)
@@ -468,7 +459,7 @@ def _init_nt():
     # XXX hmmm.. a normal install puts include files here
     g['INCLUDEPY'] = get_python_inc(plat_specific=0)
 
-    g['EXT_SUFFIX'] = '.pyd'
+    g['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
     g['EXE'] = ".exe"
     g['VERSION'] = get_python_version().replace(".", "")
     g['BINDIR'] = os.path.dirname(os.path.abspath(sys.executable))

From 818529ec6c3123df45102ec70861d11d1f12ab1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 25 Nov 2014 20:00:10 -0500
Subject: [PATCH 4472/8469] Now that pytest is invoked via setup.py, it should
 no longer be necessary to continue to support running tests via setup.py
 test.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 22541671ea..7d26aeaec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,5 @@ python:
 # command to run tests
 script:
  - python setup.py egg_info
- - python setup.py test
  - python setup.py ptr
  - python ez_setup.py --version 5.4.1

From 3bc1dafb0e22f3c694c63cc1159648cee720e638 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 25 Nov 2014 20:00:55 -0500
Subject: [PATCH 4473/8469] Test bootstrap against 7.0 release.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7d26aeaec8..0b685c1ab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ python:
 script:
  - python setup.py egg_info
  - python setup.py ptr
- - python ez_setup.py --version 5.4.1
+ - python ez_setup.py --version 7.0

From 2439ceb80430a4201efac7370c90474e429ab41b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Dec 2014 13:20:22 -0500
Subject: [PATCH 4474/8469] Added tag 8.0b1 for changeset 850a5c155c48

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7e995132ed..5d8d2873d7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -160,3 +160,4 @@ bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2
 7ea80190d494a766c6356fce85c844703964b6cc 6.1
 df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
+850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1

From a9fc84b43cfb38b7b3f5f009462e9d85bd74f5e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 10:46:32 -0500
Subject: [PATCH 4475/8469] Added tag 8.0 for changeset 7ea0e7498e4d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5d8d2873d7..8247a4dc8c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -161,3 +161,4 @@ bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 7ea80190d494a766c6356fce85c844703964b6cc 6.1
 df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
+7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0

From b3203c3fd58476f0bead1436bf83ef05d3288d26 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 10:47:06 -0500
Subject: [PATCH 4476/8469] Bumped to 8.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f6361e8eab..59cfada276 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0"
+DEFAULT_VERSION = "8.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 4ca9d5df21..ab31fdd340 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0'
+__version__ = '8.1'

From 9538ade5e17240ee19377d3f0d7567a31275ac38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 14:56:11 -0500
Subject: [PATCH 4477/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cc2423b69d..0d2988a681 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+8.1
+---
+
+* Pull Request #85: Search egg-base when adding egg-info to manifest.
+
 ---
 8.0
 ---

From 9a010cff9c654b4224721111eed0a27bb5ce726a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 14:59:23 -0500
Subject: [PATCH 4478/8469] Edit docstring for imperative form

---
 setuptools/command/egg_info.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 302d687483..cbc30ff819 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -330,12 +330,13 @@ def add_defaults(self):
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
     def _add_egg_info(self, cmd):
-        """Add paths for egg-info files for an external egg-base.
+        """
+        Add paths for egg-info files for an external egg-base.
 
-        The egg-info files are written to egg-base.  If egg-base is
-        outside the current working directory, we need a separate step
-        (this method) to search the egg-base directory when creating
-        the manifest.  We use distutils.filelist.findall (which is
+        The egg-info files are written to egg-base. If egg-base is
+        outside the current working directory, this method
+        searchs the egg-base directory for files to include
+        in the manifest. Uses distutils.filelist.findall (which is
         really the version monkeypatched in by setuptools/__init__.py)
         to perform the search.
 

From 3ad4ef1f994dcacc32b1a5f77d4c119ec0ce75af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 15:00:07 -0500
Subject: [PATCH 4479/8469] Remove superfluous list construction.

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cbc30ff819..e7e4cd7e6a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -345,9 +345,9 @@ def _add_egg_info(self, cmd):
         (which is looking for the absolute cmd.egg_info) will match
         them.
         """
-        self.filelist.allfiles.extend([
+        self.filelist.allfiles.extend(
             os.path.join(cmd.egg_base, path)
-            for path in distutils.filelist.findall(cmd.egg_base)])
+            for path in distutils.filelist.findall(cmd.egg_base))
 
     def prune_file_list(self):
         build = self.get_finalized_command('build')

From fec71bcbc8b0aa6bde0b0d054587bcd9c08019e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 15:03:48 -0500
Subject: [PATCH 4480/8469] Extract variables to capture substeps.

---
 setuptools/command/egg_info.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e7e4cd7e6a..782b2777e7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -345,9 +345,9 @@ def _add_egg_info(self, cmd):
         (which is looking for the absolute cmd.egg_info) will match
         them.
         """
-        self.filelist.allfiles.extend(
-            os.path.join(cmd.egg_base, path)
-            for path in distutils.filelist.findall(cmd.egg_base))
+        discovered = distutils.filelist.findall(cmd.egg_base)
+        resolved = (os.path.join(cmd.egg_base, path) for path in discovered)
+        self.filelist.allfiles.extend(resolved)
 
     def prune_file_list(self):
         build = self.get_finalized_command('build')

From e0bd38e357b89880dde1340a4089aacc1af4a89b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 15:07:15 -0500
Subject: [PATCH 4481/8469] Move invocation bypass into function itself,
 pertinent to the docstring.

---
 setuptools/command/egg_info.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 782b2777e7..e132412707 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -325,8 +325,7 @@ def add_defaults(self):
         elif os.path.exists(self.manifest):
             self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
-        if ei_cmd.egg_base != os.curdir:
-            self._add_egg_info(cmd=ei_cmd)
+        self._add_egg_info(cmd=ei_cmd)
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
     def _add_egg_info(self, cmd):
@@ -345,6 +344,10 @@ def _add_egg_info(self, cmd):
         (which is looking for the absolute cmd.egg_info) will match
         them.
         """
+        if cmd.egg_base == os.curdir:
+            # egg-info files were already added by something else
+            return
+
         discovered = distutils.filelist.findall(cmd.egg_base)
         resolved = (os.path.join(cmd.egg_base, path) for path in discovered)
         self.filelist.allfiles.extend(resolved)

From 1b5e1d478005b8d9d2838252e73f4c1f1e8b34da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 15:46:58 -0500
Subject: [PATCH 4482/8469] Use os.pathsep. Fixes failure on Windows

---
 setuptools/tests/test_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 9f81356044..e80684205f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -118,7 +118,7 @@ def test_egg_base_installed_egg_info(self):
                     '--install-lib', paths['lib'],
                     '--install-scripts', paths['scripts'],
                     '--install-data', paths['data']],
-                pypath=':'.join([paths['lib'], self.old_cwd]),
+                pypath=os.pathsep.join([paths['lib'], self.old_cwd]),
                 data_stream=1,
                 env=environ)
             if code:

From 523518180c127b6944528c18beb4f4e1edf77acd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 15:49:53 -0500
Subject: [PATCH 4483/8469] Added tag 8.1b1 for changeset 1af3a5f24f7d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8247a4dc8c..38df5a1d59 100644
--- a/.hgtags
+++ b/.hgtags
@@ -162,3 +162,4 @@ bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
 7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
+1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1

From 3c81a300356155761880d81a8445bd39581d6c85 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 13 Dec 2014 15:52:17 -0500
Subject: [PATCH 4484/8469] Add a warning when version is parsed as legacy

---
 pkg_resources.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 4c7924b7ba..5af4c86945 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2413,6 +2413,17 @@ def key(self):
     def parsed_version(self):
         if not hasattr(self, "_parsed_version"):
             self._parsed_version = parse_version(self.version)
+            if isinstance(
+                    self._parsed_version, packaging.version.LegacyVersion):
+                warnings.warn(
+                    "'%s (%s)' is being parsed as a legacy, non PEP 440, "
+                    "version. You may find odd behavior and sort order. In "
+                    "particular it will be sorted as less than 0.0. It is "
+                    "recommend to migrate to PEP 440 compatible versions." % (
+                        self.project_name, self.version,
+                    ),
+                    RuntimeWarning,
+                )
 
         return self._parsed_version
 

From 68bcfecf36ca0af76b76d15abfffa6403b2d6f54 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 13 Dec 2014 15:52:17 -0500
Subject: [PATCH 4485/8469] Add a warning when version is parsed as legacy

---
 pkg_resources.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index a3eef28f88..8fec29e17d 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2303,6 +2303,17 @@ def key(self):
     def parsed_version(self):
         if not hasattr(self, "_parsed_version"):
             self._parsed_version = parse_version(self.version)
+            if isinstance(
+                    self._parsed_version, packaging.version.LegacyVersion):
+                warnings.warn(
+                    "'%s (%s)' is being parsed as a legacy, non PEP 440, "
+                    "version. You may find odd behavior and sort order. In "
+                    "particular it will be sorted as less than 0.0. It is "
+                    "recommend to migrate to PEP 440 compatible versions." % (
+                        self.project_name, self.version,
+                    ),
+                    RuntimeWarning,
+                )
 
         return self._parsed_version
 

From 18fc31b1516b4493ff1925497d4a6b8bd0110809 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 13 Dec 2014 18:36:50 -0500
Subject: [PATCH 4486/8469] Restore iterating over Version objects for compat
 with buildout

---
 pkg_resources.py                   | 71 +++++++++++++++++++++++++++++-
 setuptools/tests/test_resources.py | 19 ++++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index a3eef28f88..e1109608b1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -79,8 +79,75 @@
 import setuptools._vendor.packaging.specifiers
 packaging = setuptools._vendor.packaging
 
-# For compatibility, expose packaging.version.parse as parse_version
-parse_version = packaging.version.parse
+
+class _SetuptoolsVersionMixin(object):
+    def __iter__(self):
+        component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+        replace = {
+            'pre': 'c',
+            'preview': 'c',
+            '-': 'final-',
+            'rc': 'c',
+            'dev': '@',
+        }.get
+
+        def _parse_version_parts(s):
+            for part in component_re.split(s):
+                part = replace(part, part)
+                if not part or part == '.':
+                    continue
+                if part[:1] in '0123456789':
+                    # pad for numeric comparison
+                    yield part.zfill(8)
+                else:
+                    yield '*'+part
+
+            # ensure that alpha/beta/candidate are before final
+            yield '*final'
+
+        def old_parse_version(s):
+            parts = []
+            for part in _parse_version_parts(s.lower()):
+                if part.startswith('*'):
+                    # remove '-' before a prerelease tag
+                    if part < '*final':
+                        while parts and parts[-1] == '*final-':
+                            parts.pop()
+                    # remove trailing zeros from each series of numeric parts
+                    while parts and parts[-1] == '00000000':
+                        parts.pop()
+                parts.append(part)
+            return tuple(parts)
+
+        # Warn for use of this function
+        warnings.warn(
+            "You have iterated over the result of "
+            "pkg_resources.parse_version. This is a legacy behavior which is "
+            "inconsistent with the new version class introduced in setuptools "
+            "8.0. That class should be used directly instead of attempting to "
+            "iterate over the result.",
+            RuntimeWarning,
+            stacklevel=1,
+        )
+
+        for part in old_parse_version(str(self)):
+            yield part
+
+
+class SetuptoolsVersion(_SetuptoolsVersionMixin, packaging.version.Version):
+    pass
+
+
+class SetuptoolsLegacyVersion(_SetuptoolsVersionMixin,
+                              packaging.version.LegacyVersion):
+    pass
+
+
+def parse_version(v):
+    try:
+        return SetuptoolsVersion(v)
+    except packaging.version.InvalidVersion:
+        return SetuptoolsLegacyVersion(v)
 
 
 _state_vars = {}
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 356e1ed4e6..23872e5d25 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -488,6 +488,25 @@ def c(s1,s2):
             for v2 in torture[p+1:]:
                 c(v2,v1)
 
+    def testVersionBuildout(self):
+        """
+        Buildout has a function in it's bootstrap.py that inspected the return
+        value of parse_version. The new parse_version returns a Version class
+        which needs to support this behavior, at least for now.
+        """
+        def buildout(parsed_version):
+            _final_parts = '*final-', '*final'
+
+            def _final_version(parsed_version):
+                for part in parsed_version:
+                    if (part[:1] == '*') and (part not in _final_parts):
+                        return False
+                return True
+            return _final_version(parsed_version)
+
+        self.assertTrue(buildout(parse_version("1.0")))
+        self.assertFalse(buildout(parse_version("1.0a1")))
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From 7f4df756b83a337ffad17bfd51fe11e583c9e4e0 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 13 Dec 2014 18:36:50 -0500
Subject: [PATCH 4487/8469] Restore iterating over Version objects for compat
 with buildout

---
 pkg_resources.py                   | 71 +++++++++++++++++++++++++++++-
 setuptools/tests/test_resources.py | 19 ++++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index a3eef28f88..e1109608b1 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -79,8 +79,75 @@
 import setuptools._vendor.packaging.specifiers
 packaging = setuptools._vendor.packaging
 
-# For compatibility, expose packaging.version.parse as parse_version
-parse_version = packaging.version.parse
+
+class _SetuptoolsVersionMixin(object):
+    def __iter__(self):
+        component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+        replace = {
+            'pre': 'c',
+            'preview': 'c',
+            '-': 'final-',
+            'rc': 'c',
+            'dev': '@',
+        }.get
+
+        def _parse_version_parts(s):
+            for part in component_re.split(s):
+                part = replace(part, part)
+                if not part or part == '.':
+                    continue
+                if part[:1] in '0123456789':
+                    # pad for numeric comparison
+                    yield part.zfill(8)
+                else:
+                    yield '*'+part
+
+            # ensure that alpha/beta/candidate are before final
+            yield '*final'
+
+        def old_parse_version(s):
+            parts = []
+            for part in _parse_version_parts(s.lower()):
+                if part.startswith('*'):
+                    # remove '-' before a prerelease tag
+                    if part < '*final':
+                        while parts and parts[-1] == '*final-':
+                            parts.pop()
+                    # remove trailing zeros from each series of numeric parts
+                    while parts and parts[-1] == '00000000':
+                        parts.pop()
+                parts.append(part)
+            return tuple(parts)
+
+        # Warn for use of this function
+        warnings.warn(
+            "You have iterated over the result of "
+            "pkg_resources.parse_version. This is a legacy behavior which is "
+            "inconsistent with the new version class introduced in setuptools "
+            "8.0. That class should be used directly instead of attempting to "
+            "iterate over the result.",
+            RuntimeWarning,
+            stacklevel=1,
+        )
+
+        for part in old_parse_version(str(self)):
+            yield part
+
+
+class SetuptoolsVersion(_SetuptoolsVersionMixin, packaging.version.Version):
+    pass
+
+
+class SetuptoolsLegacyVersion(_SetuptoolsVersionMixin,
+                              packaging.version.LegacyVersion):
+    pass
+
+
+def parse_version(v):
+    try:
+        return SetuptoolsVersion(v)
+    except packaging.version.InvalidVersion:
+        return SetuptoolsLegacyVersion(v)
 
 
 _state_vars = {}
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 356e1ed4e6..23872e5d25 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -488,6 +488,25 @@ def c(s1,s2):
             for v2 in torture[p+1:]:
                 c(v2,v1)
 
+    def testVersionBuildout(self):
+        """
+        Buildout has a function in it's bootstrap.py that inspected the return
+        value of parse_version. The new parse_version returns a Version class
+        which needs to support this behavior, at least for now.
+        """
+        def buildout(parsed_version):
+            _final_parts = '*final-', '*final'
+
+            def _final_version(parsed_version):
+                for part in parsed_version:
+                    if (part[:1] == '*') and (part not in _final_parts):
+                        return False
+                return True
+            return _final_version(parsed_version)
+
+        self.assertTrue(buildout(parse_version("1.0")))
+        self.assertFalse(buildout(parse_version("1.0a1")))
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From ce949ff5b789e35f7c1c4aa10c53ae9b5b7c4348 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 21:39:53 -0500
Subject: [PATCH 4488/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cc2423b69d..331cfd3f89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+8.0.1
+-----
+
+* Issue #296: Restore support for iteration over parse_version result, but
+  deprecated that usage with a warning. Fixes failure with buildout.
+
 ---
 8.0
 ---

From a2340678d25e143758e12e7d92d9a77cc8daa103 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 21:42:10 -0500
Subject: [PATCH 4489/8469] Bumped to 8.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 59cfada276..b152ac77a1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.1"
+DEFAULT_VERSION = "8.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index ab31fdd340..49920925be 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.1'
+__version__ = '8.0.1'

From 0437c549fae2aec3ed4689525e56e81e1b15089f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 21:42:11 -0500
Subject: [PATCH 4490/8469] Added tag 8.0.1 for changeset d62bf4e407b3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8247a4dc8c..c1de9dafdb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -162,3 +162,4 @@ bc6655b4acf205dd9f25c702955645656077398a 6.0.1
 df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
 7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
+d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1

From 5bf45c863a9b88a2c62fdaaeb75538c426ab5d41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Dec 2014 21:42:38 -0500
Subject: [PATCH 4491/8469] Bumped to 8.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b152ac77a1..17f64cc6a5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0.1"
+DEFAULT_VERSION = "8.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 49920925be..94d3757bb1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.1'
+__version__ = '8.0.2'

From 6f58c6800fcbaedd883cb56cb8197bf723f9e7ab Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sun, 14 Dec 2014 13:22:29 -0500
Subject: [PATCH 4492/8469] Add more compatability shims to SetuptoolsVersion

* Enables indexing the SetuptoolsVersion objects, triggering the
  legacy behavior warning.
* Enables comparing the SetuptoolsVersion object to a tuple, again
  triggering the legacy behavior warning.
---
 pkg_resources.py                   | 40 ++++++++++++++++++++++++++++++
 setuptools/tests/test_resources.py | 21 ++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index e1109608b1..5df5a3e66c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -81,6 +81,46 @@
 
 
 class _SetuptoolsVersionMixin(object):
+
+    def __lt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) < other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__lt__(other)
+
+    def __le__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) <= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__le__(other)
+
+    def __eq__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) == other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__eq__(other)
+
+    def __ge__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) >= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ge__(other)
+
+    def __gt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) > other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__gt__(other)
+
+    def __ne__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) != other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ne__(other)
+
+    def __getitem__(self, key):
+        return tuple(self)[key]
+
     def __iter__(self):
         component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
         replace = {
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 23872e5d25..13f80aa4cb 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -507,6 +507,27 @@ def _final_version(parsed_version):
         self.assertTrue(buildout(parse_version("1.0")))
         self.assertFalse(buildout(parse_version("1.0a1")))
 
+    def testVersionIndexable(self):
+        """
+        Some projects were doing things like parse_version("v")[0], so we'll
+        support indexing the same as we support iterating.
+        """
+        self.assertEqual(parse_version("1.0")[0], "00000001")
+
+    def testVersionTupleSort(self):
+        """
+        Some projects expected to be able to sort tuples against the return
+        value of parse_version. So again we'll add a warning enabled shim to
+        make this possible.
+        """
+        self.assertTrue(parse_version("1.0") < tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("1.0") <= tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("1.0") == tuple(parse_version("1.0")))
+        self.assertTrue(parse_version("3.0") > tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("3.0") >= tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("3.0") != tuple(parse_version("2.0")))
+        self.assertFalse(parse_version("3.0") != tuple(parse_version("3.0")))
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From e27bb7d12b73046f4805025fd2a53fc6bb3b1dfa Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sun, 14 Dec 2014 13:22:29 -0500
Subject: [PATCH 4493/8469] Add more compatability shims to SetuptoolsVersion

* Enables indexing the SetuptoolsVersion objects, triggering the
  legacy behavior warning.
* Enables comparing the SetuptoolsVersion object to a tuple, again
  triggering the legacy behavior warning.
---
 pkg_resources.py                   | 40 ++++++++++++++++++++++++++++++
 setuptools/tests/test_resources.py | 21 ++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index e1109608b1..5df5a3e66c 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -81,6 +81,46 @@
 
 
 class _SetuptoolsVersionMixin(object):
+
+    def __lt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) < other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__lt__(other)
+
+    def __le__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) <= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__le__(other)
+
+    def __eq__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) == other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__eq__(other)
+
+    def __ge__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) >= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ge__(other)
+
+    def __gt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) > other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__gt__(other)
+
+    def __ne__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) != other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ne__(other)
+
+    def __getitem__(self, key):
+        return tuple(self)[key]
+
     def __iter__(self):
         component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
         replace = {
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 23872e5d25..13f80aa4cb 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -507,6 +507,27 @@ def _final_version(parsed_version):
         self.assertTrue(buildout(parse_version("1.0")))
         self.assertFalse(buildout(parse_version("1.0a1")))
 
+    def testVersionIndexable(self):
+        """
+        Some projects were doing things like parse_version("v")[0], so we'll
+        support indexing the same as we support iterating.
+        """
+        self.assertEqual(parse_version("1.0")[0], "00000001")
+
+    def testVersionTupleSort(self):
+        """
+        Some projects expected to be able to sort tuples against the return
+        value of parse_version. So again we'll add a warning enabled shim to
+        make this possible.
+        """
+        self.assertTrue(parse_version("1.0") < tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("1.0") <= tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("1.0") == tuple(parse_version("1.0")))
+        self.assertTrue(parse_version("3.0") > tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("3.0") >= tuple(parse_version("2.0")))
+        self.assertTrue(parse_version("3.0") != tuple(parse_version("2.0")))
+        self.assertFalse(parse_version("3.0") != tuple(parse_version("3.0")))
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From 0f8f0542eb843e0d84ab551bf2e92fd3cdd6b727 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 14 Dec 2014 17:30:06 -0500
Subject: [PATCH 4494/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 331cfd3f89..9d5955f77e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+8.0.2
+-----
+
+* Issue #296: Restored support for ``__getitem__`` and sort operations on
+  parse_version result.
+
 -----
 8.0.1
 -----

From 998168496d8f1c42760ef94d5ae6d3aa6953a4d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 14 Dec 2014 17:30:51 -0500
Subject: [PATCH 4495/8469] Added tag 8.0.2 for changeset 1c03d512e39d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c1de9dafdb..17297f5475 100644
--- a/.hgtags
+++ b/.hgtags
@@ -163,3 +163,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
 7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
 d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
+1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2

From 4caa4af6ae275db9a499c27b66cc636cb9c596a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 14 Dec 2014 17:31:19 -0500
Subject: [PATCH 4496/8469] Bumped to 8.0.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 17f64cc6a5..70a9a7eeff 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0.2"
+DEFAULT_VERSION = "8.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 94d3757bb1..854fb2e89b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.2'
+__version__ = '8.0.3'

From c0d31b5915055be20b8593170cddb85770b9ccc9 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Mon, 15 Dec 2014 07:41:02 -0500
Subject: [PATCH 4497/8469] Define a __hash__ on the packaging.version.Version
 subclasses

In Python 3.x a subclass will not inherent the __hash__ method from
the parent classes if the subclass defines a __eq__ method. This
means that without defining our own __hash__ the SetuptoolsVersion
classes are unhashable.
---
 pkg_resources.py                   |  3 +++
 setuptools/tests/test_resources.py | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5df5a3e66c..4c7924b7ba 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -82,6 +82,9 @@
 
 class _SetuptoolsVersionMixin(object):
 
+    def __hash__(self):
+        return super(_SetuptoolsVersionMixin, self).__hash__()
+
     def __lt__(self, other):
         if isinstance(other, tuple):
             return tuple(self) < other
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 13f80aa4cb..1902fb2ce4 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -528,6 +528,16 @@ def testVersionTupleSort(self):
         self.assertTrue(parse_version("3.0") != tuple(parse_version("2.0")))
         self.assertFalse(parse_version("3.0") != tuple(parse_version("3.0")))
 
+    def testVersionHashable(self):
+        """
+        Ensure that our versions stay hashable even though we've subclassed
+        them and added some shim code to them.
+        """
+        self.assertEqual(
+            hash(parse_version("1.0")),
+            hash(parse_version("1.0")),
+        )
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From 7a991fd283fdf53f7320852e5c9878db6cb84349 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Mon, 15 Dec 2014 07:41:02 -0500
Subject: [PATCH 4498/8469] Define a __hash__ on the packaging.version.Version
 subclasses

In Python 3.x a subclass will not inherent the __hash__ method from
the parent classes if the subclass defines a __eq__ method. This
means that without defining our own __hash__ the SetuptoolsVersion
classes are unhashable.
---
 pkg_resources.py                   |  3 +++
 setuptools/tests/test_resources.py | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5df5a3e66c..4c7924b7ba 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -82,6 +82,9 @@
 
 class _SetuptoolsVersionMixin(object):
 
+    def __hash__(self):
+        return super(_SetuptoolsVersionMixin, self).__hash__()
+
     def __lt__(self, other):
         if isinstance(other, tuple):
             return tuple(self) < other
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 13f80aa4cb..1902fb2ce4 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -528,6 +528,16 @@ def testVersionTupleSort(self):
         self.assertTrue(parse_version("3.0") != tuple(parse_version("2.0")))
         self.assertFalse(parse_version("3.0") != tuple(parse_version("3.0")))
 
+    def testVersionHashable(self):
+        """
+        Ensure that our versions stay hashable even though we've subclassed
+        them and added some shim code to them.
+        """
+        self.assertEqual(
+            hash(parse_version("1.0")),
+            hash(parse_version("1.0")),
+        )
+
 
 class ScriptHeaderTests(TestCase):
     non_ascii_exe = '/Users/José/bin/python'

From 23b3e1f57c5fab2b8aee73169ddfe19a6fc46a94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 13:27:25 -0500
Subject: [PATCH 4499/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d5955f77e..866535db67 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+8.0.3
+-----
+
+* Issue #296: Restored support for ``__hash__`` on parse_version results.
+
 -----
 8.0.2
 -----

From 088ab27715af882ba6cbebfcd688955fe3d19f9c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 13:31:49 -0500
Subject: [PATCH 4500/8469] Added tag 8.0.3 for changeset 6c3467488123

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 17297f5475..5e57ab7fe9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -164,3 +164,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
 d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
+6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3

From ee2cd1464e2073ba37be8e3003536f2602d51b13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 13:32:18 -0500
Subject: [PATCH 4501/8469] Bumped to 8.0.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 70a9a7eeff..15ceb5a5cc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0.3"
+DEFAULT_VERSION = "8.0.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 854fb2e89b..09f50c23ba 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.3'
+__version__ = '8.0.4'

From ffffc9f34b0cf5a6c67f4e10a65e034c3bf5d468 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Mon, 15 Dec 2014 15:33:01 -0500
Subject: [PATCH 4502/8469] Upgrade packaging to 14.4

This fixes an error where there is a different result for if 2.0.5
is contained within >2.0dev and >2.0.dev even though normalization
rules should have made them equal.
---
 setuptools/_vendor/packaging/__about__.py  |  2 +-
 setuptools/_vendor/packaging/specifiers.py | 10 ++++++----
 setuptools/_vendor/vendored.txt            |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index 481589e76a..d3e3dacf03 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "14.3"
+__version__ = "14.4"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
index bea4a39820..8022578621 100644
--- a/setuptools/_vendor/packaging/specifiers.py
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -461,16 +461,18 @@ def _compare_less_than(self, prospective, spec):
         # Less than are defined as exclusive operators, this implies that
         # pre-releases do not match for the same series as the spec. This is
         # implemented by making <V imply !=V.*.
-        return (prospective < Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
+        spec = Version(spec)
+        return (prospective < spec
+                and self._get_operator("!=")(prospective, str(spec) + ".*"))
 
     @_require_version_compare
     def _compare_greater_than(self, prospective, spec):
         # Greater than are defined as exclusive operators, this implies that
         # pre-releases do not match for the same series as the spec. This is
         # implemented by making >V imply !=V.*.
-        return (prospective > Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
+        spec = Version(spec)
+        return (prospective > spec
+                and self._get_operator("!=")(prospective, str(spec) + ".*"))
 
     def _compare_arbitrary(self, prospective, spec):
         return str(prospective).lower() == str(spec).lower()
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index b86bba005c..576aa8db0e 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==14.3
+packaging==14.4

From f8b6c86a3121b2c2b68b2edc97b545d4567601d6 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Mon, 15 Dec 2014 15:33:01 -0500
Subject: [PATCH 4503/8469] Upgrade packaging to 14.4

This fixes an error where there is a different result for if 2.0.5
is contained within >2.0dev and >2.0.dev even though normalization
rules should have made them equal.
---
 setuptools/_vendor/packaging/__about__.py  |  2 +-
 setuptools/_vendor/packaging/specifiers.py | 10 ++++++----
 setuptools/_vendor/vendored.txt            |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index 481589e76a..d3e3dacf03 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "14.3"
+__version__ = "14.4"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
index bea4a39820..8022578621 100644
--- a/setuptools/_vendor/packaging/specifiers.py
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -461,16 +461,18 @@ def _compare_less_than(self, prospective, spec):
         # Less than are defined as exclusive operators, this implies that
         # pre-releases do not match for the same series as the spec. This is
         # implemented by making <V imply !=V.*.
-        return (prospective < Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
+        spec = Version(spec)
+        return (prospective < spec
+                and self._get_operator("!=")(prospective, str(spec) + ".*"))
 
     @_require_version_compare
     def _compare_greater_than(self, prospective, spec):
         # Greater than are defined as exclusive operators, this implies that
         # pre-releases do not match for the same series as the spec. This is
         # implemented by making >V imply !=V.*.
-        return (prospective > Version(spec)
-                and self._get_operator("!=")(prospective, spec + ".*"))
+        spec = Version(spec)
+        return (prospective > spec
+                and self._get_operator("!=")(prospective, str(spec) + ".*"))
 
     def _compare_arbitrary(self, prospective, spec):
         return str(prospective).lower() == str(spec).lower()
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index b86bba005c..576aa8db0e 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==14.3
+packaging==14.4

From 8ec591737ea9997dd0adecd52958bdf601c6aa0f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 15:42:57 -0500
Subject: [PATCH 4504/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 866535db67..ab8b703d0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+-----
+8.0.4
+-----
+
+* Upgrade ``packaging`` to 14.4, fixing an error where there is a
+  different result for if 2.0.5 is contained within >2.0dev and >2.0.dev even
+  though normalization rules should have made them equal.
+* Issue #296: Add warning when a version is parsed as legacy. This warning will
+  make it easier for developers to recognize deprecated version numbers.
+
 -----
 8.0.3
 -----

From d83eb30a8237d635a819c98f061407a609eab8a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 15:43:26 -0500
Subject: [PATCH 4505/8469] Added tag 8.0.4 for changeset 2c467afffe9f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5e57ab7fe9..fe834e483c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -165,3 +165,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
 d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
 6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
+2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4

From 4b4d420dac162a07f0ae57d88d563e4e41b290ad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 15:43:52 -0500
Subject: [PATCH 4506/8469] Bumped to 8.0.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 15ceb5a5cc..6c77135b17 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0.4"
+DEFAULT_VERSION = "8.0.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 09f50c23ba..d9d3601000 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.4'
+__version__ = '8.0.5'

From 4bf1bfade0e23f74667989932f3c80c1252a64ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Dec 2014 15:49:29 -0500
Subject: [PATCH 4507/8469] Correct syntax error in docs.

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 651e6be808..558d6ee76c 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -45,7 +45,7 @@ ticket already exists for your issue. If not, create one. Try to think from
 the perspective of the reader. Explain what behavior you expected, what you
 got instead, and what factors might have contributed to the unexpected
 behavior. In Bitbucket, surround a block of code or traceback with the triple
-backtick "```" so that it is formatted nicely.
+backtick "\`\`\`" so that it is formatted nicely.
 
 Filing a ticket provides a forum for justification, discussion, and
 clarification. The ticket provides a record of the purpose for the change and

From e25c444f65824e882fbb6493578ee1db836721bd Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 15 Dec 2014 15:03:44 -0800
Subject: [PATCH 4508/8469] Removes bdist_wininst dependency on MFC.

---
 command/wininst-14.0-amd64.exe | Bin 84480 -> 84480 bytes
 command/wininst-14.0.exe       | Bin 75264 -> 75264 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-14.0-amd64.exe b/command/wininst-14.0-amd64.exe
index 9affe13039517798970f5e3a8d9f4d1d13e79464..43b85b6d4f2dd93f4b77c4b904276293ff667054 100644
GIT binary patch
delta 111
zcmZpe!rCx}bpr<@^QQFv&D@Nfv*m$|5C$M%0^%?rKB3OYaDtZ+B*XwxWIShPp<s#D
z`A5cD9RBm0JhpImN55p+ewUYVvl=T%(TC|9co`)a8K-aLWfWr)fY96Tm@uk{0s!3L
BA3p#9

delta 160
zcmZpe!rCx}bpr<@v(1FI&D@Nfv*m$|5C$M%0^%?rKB3OYaDtZ+B*XwxWIShPp<u!v
z-n-&^mpQMh)vT4BxR#Z1`(0kf&1znpEDQ`Ez)Fz`Mh1{L1H=p@35d7=R`Kn(Oc>Qf
E0SG@DrT_o{

diff --git a/command/wininst-14.0.exe b/command/wininst-14.0.exe
index 3ce71b9f1b49afc4e6eb8a60ef551e7ced3e04b6..764524d746b35fe28228e41e8b75a6ed665d9228 100644
GIT binary patch
delta 159
zcmZoT!_shuWdjEz^YXO*&D@MH8|8tF5C$M%0^$H5-onJlu;mj-gn<F1NVs`vz945}
yER$@&bB_&&nLf8)wNYo@eDc$AVK0!H4<G^sFhY1x3Lym%5Wp(F{T3UenmhnEVjS%N

delta 159
zcmZoT!_shuWdjEz^OwH1&D@MH8|8tF5C$M%0^$H5-onJlu;mj-gn<F1NVs`vzMztO
z4ij7X2G^-ZrE_|}sA@58KKbdmuoou_1H%W1QY4a*0VK}Ah$IANLc|5Iif_Ng#;7I_
E0Iz=?$N&HU


From bebd47ea3228d5f71b06cf467410fac0eac2d3ee Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 15 Dec 2014 20:45:23 -0800
Subject: [PATCH 4509/8469] Fixes distutils adding/expecting too many _d
 suffixes.

---
 command/build_ext.py  | 3 ---
 tests/test_install.py | 2 --
 2 files changed, 5 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 605efbd68f..c5a3ce1915 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -691,10 +691,7 @@ def get_ext_filename(self, ext_name):
         """
         from distutils.sysconfig import get_config_var
         ext_path = ext_name.split('.')
-        # extensions in debug_mode are named 'module_d.pyd' under windows
         ext_suffix = get_config_var('EXT_SUFFIX')
-        if os.name == 'nt' and self.debug:
-            return os.path.join(*ext_path) + '_d' + ext_suffix
         return os.path.join(*ext_path) + ext_suffix
 
     def get_export_symbols(self, ext):
diff --git a/tests/test_install.py b/tests/test_install.py
index 18e1e57505..9313330e2b 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -20,8 +20,6 @@
 
 
 def _make_ext_name(modname):
-    if os.name == 'nt' and sys.executable.endswith('_d.exe'):
-        modname += '_d'
     return modname + sysconfig.get_config_var('EXT_SUFFIX')
 
 

From 6d98caab2c4103cba53e6c601fc127990298ab56 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 17 Dec 2014 20:49:13 -0500
Subject: [PATCH 4510/8469] Don't warn on empty non PEP 440 versions

Empty versions which are not PEP 440 are more likely to be the
fault of setuptools internals rather than anything a user has done
so these warnings are needless spam in that situation.
---
 pkg_resources.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index 5af4c86945..f3ac6c5072 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2415,15 +2415,23 @@ def parsed_version(self):
             self._parsed_version = parse_version(self.version)
             if isinstance(
                     self._parsed_version, packaging.version.LegacyVersion):
-                warnings.warn(
-                    "'%s (%s)' is being parsed as a legacy, non PEP 440, "
-                    "version. You may find odd behavior and sort order. In "
-                    "particular it will be sorted as less than 0.0. It is "
-                    "recommend to migrate to PEP 440 compatible versions." % (
-                        self.project_name, self.version,
-                    ),
-                    RuntimeWarning,
-                )
+                # While an empty version is techincally a legacy version and
+                # is not a valid PEP 440 version, it's also unlikely to
+                # actually come from someone and instead it is more likely that
+                # it comes from setuptools attempting to parse a filename and
+                # including it in the list. So for that we'll gate this warning
+                # on if the version is anything at all or not.
+                if self.version:
+                    warnings.warn(
+                        "'%s (%s)' is being parsed as a legacy, non PEP 440, "
+                        "version. You may find odd behavior and sort order. "
+                        "In particular it will be sorted as less than 0.0. It "
+                        "is recommend to migrate to PEP 440 compatible "
+                        "versions." % (
+                            self.project_name, self.version,
+                        ),
+                        RuntimeWarning,
+                    )
 
         return self._parsed_version
 

From ae712b5b623c9541f09816d8926f474d503fec2d Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 17 Dec 2014 21:37:45 -0500
Subject: [PATCH 4511/8469] Upgrade packaging to 14.5

* Normalizes release candidates to 1.0rc1 instead of 1.0c1
---
 setuptools/_vendor/packaging/__about__.py |  2 +-
 setuptools/_vendor/packaging/version.py   | 74 +++++++++++------------
 setuptools/_vendor/vendored.txt           |  2 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index d3e3dacf03..d3e50f1e17 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "14.4"
+__version__ = "14.5"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
index e76e960724..8d779a48d7 100644
--- a/setuptools/_vendor/packaging/version.py
+++ b/setuptools/_vendor/packaging/version.py
@@ -21,7 +21,7 @@
 
 
 __all__ = [
-    "parse", "Version", "LegacyVersion", "InvalidVersion",
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
 ]
 
 
@@ -156,44 +156,44 @@ def _legacy_cmpkey(version):
 
     return epoch, parts
 
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
 
 class Version(_BaseVersion):
 
     _regex = re.compile(
-        r"""
-        ^
-        \s*
-        v?
-        (?:
-            (?:(?P<epoch>[0-9]+)!)?                           # epoch
-            (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
-            (?P<pre>                                          # pre-release
-                [-_\.]?
-                (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
-                [-_\.]?
-                (?P<pre_n>[0-9]+)?
-            )?
-            (?P<post>                                         # post release
-                (?:-(?P<post_n1>[0-9]+))
-                |
-                (?:
-                    [-_\.]?
-                    (?P<post_l>post|rev|r)
-                    [-_\.]?
-                    (?P<post_n2>[0-9]+)?
-                )
-            )?
-            (?P<dev>                                          # dev release
-                [-_\.]?
-                (?P<dev_l>dev)
-                [-_\.]?
-                (?P<dev_n>[0-9]+)?
-            )?
-        )
-        (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-        \s*
-        $
-        """,
+        r"^\s*" + VERSION_PATTERN + r"\s*$",
         re.VERBOSE | re.IGNORECASE,
     )
 
@@ -297,8 +297,8 @@ def _parse_letter_version(letter, number):
             letter = "a"
         elif letter == "beta":
             letter = "b"
-        elif letter in ["rc", "pre", "preview"]:
-            letter = "c"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
 
         return letter, int(number)
     if not letter and number:
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 576aa8db0e..723e026b61 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==14.4
+packaging==14.5

From 20eb01f0cac85e0f6a280a8127a872572a53ec9b Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 17 Dec 2014 20:52:37 -0500
Subject: [PATCH 4512/8469] Add a PEP440Warning to make it easier to silence
 these warnings

---
 pkg_resources.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg_resources.py b/pkg_resources.py
index f3ac6c5072..87fd278209 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -80,6 +80,13 @@
 packaging = setuptools._vendor.packaging
 
 
+class PEP440Warning(RuntimeWarning):
+    """
+    Used when there is an issue with a version or specifier not complying with
+    PEP 440.
+    """
+
+
 class _SetuptoolsVersionMixin(object):
 
     def __hash__(self):
@@ -272,6 +279,9 @@ def get_supported_platform():
     'ResolutionError', 'VersionConflict', 'DistributionNotFound',
     'UnknownExtra', 'ExtractionError',
 
+    # Warnings
+    'PEP440Warning',
+
     # Parsing functions and string utilities
     'parse_requirements', 'parse_version', 'safe_name', 'safe_version',
     'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections',
@@ -2430,7 +2440,7 @@ def parsed_version(self):
                         "versions." % (
                             self.project_name, self.version,
                         ),
-                        RuntimeWarning,
+                        PEP440Warning,
                     )
 
         return self._parsed_version

From 4b6dba7625e98aa92cf2d1491379f82d51b46756 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 08:37:56 -0500
Subject: [PATCH 4513/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ab8b703d0b..9b27f3eae1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+---
+8.1
+---
+
+* Upgrade ``packaging`` to 14.5, giving preference to "rc" as designator for
+  release candidates over "c".
+* PEP-440 warnings are now raised as their own class,
+  ``pkg_resources.PEP440Warning``, instead of RuntimeWarning.
+* Disabled warnings on empty versions.
+
 -----
 8.0.4
 -----

From 9b3f3650b5619c89ded823dc84edb0cbad713bc6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 08:39:00 -0500
Subject: [PATCH 4514/8469] Bumped to 8.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6c77135b17..59cfada276 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.0.5"
+DEFAULT_VERSION = "8.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index d9d3601000..ab31fdd340 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.5'
+__version__ = '8.1'

From 9069f7532d3d732ae5b4b5614ba524a20b075fa2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 08:39:30 -0500
Subject: [PATCH 4515/8469] Added tag 8.1 for changeset 3f87370b6863

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fe834e483c..4ef0cc3d79 100644
--- a/.hgtags
+++ b/.hgtags
@@ -166,3 +166,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
 6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
 2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
+3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1

From 123ac3c8a389d3b9168abbb901c6507282b27dc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 08:40:04 -0500
Subject: [PATCH 4516/8469] Bumped to 8.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 59cfada276..969a073a77 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.1"
+DEFAULT_VERSION = "8.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index ab31fdd340..ad8076bac1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.1'
+__version__ = '8.2'

From db8bc5a383ea9913c0f297aff53b0f90cc98ced1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 09:07:20 -0500
Subject: [PATCH 4517/8469] Added tag 8.2 for changeset 995f6d965131

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c0ace198cd..8cb9c94004 100644
--- a/.hgtags
+++ b/.hgtags
@@ -168,3 +168,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
 2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
 3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1
+995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2

From 57e7ab8ebab9981efed9936ca11c939e34d52eec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 09:07:53 -0500
Subject: [PATCH 4518/8469] Bumped to 8.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 969a073a77..e22ab67449 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.2"
+DEFAULT_VERSION = "8.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index ad8076bac1..de8c596a80 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.2'
+__version__ = '8.3'

From 5df137548ceab35e51a53f12664df130bc8f2a5f Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Thu, 18 Dec 2014 12:29:36 -0500
Subject: [PATCH 4519/8469] Silence PEP440Warning by default unless invoking
 easy_install

---
 pkg_resources.py                   | 7 +++++++
 setuptools/command/easy_install.py | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/pkg_resources.py b/pkg_resources.py
index 87fd278209..3a8edca527 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2932,6 +2932,13 @@ def _mkstemp(*args,**kw):
         os.open = old_open
 
 
+# Silence the PEP440Warning by default, so that end users don't get hit by it
+# randomly just because they use pkg_resources. We want to append the rule
+# because we want earlier uses of filterwarnings to take precedence over this
+# one.
+warnings.filterwarnings("ignore", category=PEP440Warning, append=True)
+
+
 # Set up global resource manager (deliberately not state-saved)
 _manager = ResourceManager()
 def _initialize(g):
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2e00b99630..a71a7f363a 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -54,9 +54,14 @@
 import pkg_resources
 
 
+# Turn on PEP440Warnings
+warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
+
+
 sys_executable = os.environ.get('__PYVENV_LAUNCHER__',
                                 os.path.normpath(sys.executable))
 
+
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
     'main', 'get_exe_prefixes',

From ca30fc307416f7a73e927ca709e8426792bdc71c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 20:38:46 -0500
Subject: [PATCH 4520/8469] Update changelog; fixes #306.

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3621ed77bb..9d9b4d5237 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+-----
+8.2.1
+-----
+
+* Issue #306: Suppress warnings about Version format except in select scenarios
+  (such as installation).
+
 ---
 8.2
 ---

From ebb23247208e56ba422e7b80b4da813a8809ba02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 20:53:46 -0500
Subject: [PATCH 4521/8469] Bumped to 8.2.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e22ab67449..a3e13059e1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.3"
+DEFAULT_VERSION = "8.2.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index de8c596a80..7b2b8ec7c5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.3'
+__version__ = '8.2.1'

From d223ac7b55810245029f1af9cc06b1af0c6c7c51 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 20:53:48 -0500
Subject: [PATCH 4522/8469] Added tag 8.2.1 for changeset efbe39dae0ab

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8cb9c94004..e3f5e6a8a2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -169,3 +169,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
 3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1
 995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
+efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1

From 42ef8cbbb3e08a89e3513bfa16b61541df1d11fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 18 Dec 2014 20:54:27 -0500
Subject: [PATCH 4523/8469] Bumped to 8.2.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a3e13059e1..65337f67a0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.2.1"
+DEFAULT_VERSION = "8.2.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 7b2b8ec7c5..5adfd0a393 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.2.1'
+__version__ = '8.2.2'

From 8bedbb5ee574b2f005dd5f066638cb79dc90f0eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 09:27:21 -0500
Subject: [PATCH 4524/8469] Use hasattr per recommendation in docs for dl.

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

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 53bf9cd3ed..684200ad0d 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -33,10 +33,8 @@
     use_stubs = True
 elif os.name != 'nt':
     try:
-        from dl import RTLD_NOW
-
-        have_rtld = True
-        use_stubs = True
+        import dl
+        use_stubs = have_rtld = hasattr(dl, 'RTLD_NOW')
     except ImportError:
         pass
 

From 3b434b5bd5a1e5e04461302850d0e2248cc828b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 09:59:01 -0500
Subject: [PATCH 4525/8469] Define if_dl using simple lambda.

---
 setuptools/command/build_ext.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 684200ad0d..b30e6192e8 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -39,10 +39,7 @@
         pass
 
 
-def if_dl(s):
-    if have_rtld:
-        return s
-    return ''
+if_dl = lambda s: s if have_rtld else ''
 
 
 class build_ext(_build_ext):

From 956dce0ba58ab95298b872155543259467054557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:01:15 -0500
Subject: [PATCH 4526/8469] Extract variables for clarity and simpler
 indentation.

---
 setuptools/command/build_ext.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index b30e6192e8..be5e974cad 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -118,10 +118,10 @@ def finalize_options(self):
             # XXX what to do with conflicts?
             self.ext_map[fullname.split('.')[-1]] = ext
 
-            ltd = ext._links_to_dynamic = \
-                self.shlibs and self.links_to_dynamic(ext) or False
-            ext._needs_stub = ltd and use_stubs and not isinstance(ext,
-                                                                   Library)
+            ltd = self.shlibs and self.links_to_dynamic(ext) or False
+            ns = ltd and use_stubs and not isinstance(ext, Library)
+            ext._links_to_dynamic = ltd
+            ext._needs_stub = ns
             filename = ext._file_name = self.get_ext_filename(fullname)
             libdir = os.path.dirname(os.path.join(self.build_lib, filename))
             if ltd and libdir not in ext.library_dirs:

From 8f8ff1d8c42f1aeb371134abd9a96e3f876e09be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:02:30 -0500
Subject: [PATCH 4527/8469] Extract variable for simplicity of indentation.

---
 setuptools/command/build_ext.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index be5e974cad..b6eb89eb34 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -181,9 +181,8 @@ def build_extension(self, ext):
                 self.compiler = self.shlib_compiler
             _build_ext.build_extension(self, ext)
             if ext._needs_stub:
-                self.write_stub(
-                    self.get_finalized_command('build_py').build_lib, ext
-                )
+                cmd = self.get_finalized_command('build_py').build_lib
+                self.write_stub(cmd, ext)
         finally:
             self.compiler = _compiler
 

From d9de5582d21b62794bbdb39c0da11d711889c442 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:04:35 -0500
Subject: [PATCH 4528/8469] Rewrite short-circuit for/if/else loop as any on
 generator expression.

---
 setuptools/command/build_ext.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index b6eb89eb34..dae9c81e36 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -193,10 +193,7 @@ def links_to_dynamic(self, ext):
         # XXX static-compiled version
         libnames = dict.fromkeys([lib._full_name for lib in self.shlibs])
         pkg = '.'.join(ext._full_name.split('.')[:-1] + [''])
-        for libname in ext.libraries:
-            if pkg + libname in libnames:
-                return True
-        return False
+        return any(pkg + libname in libnames for libname in ext.libraries)
 
     def get_outputs(self):
         outputs = _build_ext.get_outputs(self)

From 7fe63f7e3e848af843baa909930c1a61dcc2fbdd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:06:35 -0500
Subject: [PATCH 4529/8469] Extract filtering of extensions that need stubs.

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

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index dae9c81e36..5327a03021 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -198,8 +198,8 @@ def links_to_dynamic(self, ext):
     def get_outputs(self):
         outputs = _build_ext.get_outputs(self)
         optimize = self.get_finalized_command('build_py').optimize
-        for ext in self.extensions:
-            if ext._needs_stub:
+        ns_ext = (ext for ext in self.extensions if ext._needs_stub)
+        for ext in ns_ext:
                 base = os.path.join(self.build_lib, *ext._full_name.split('.'))
                 outputs.append(base + '.py')
                 outputs.append(base + '.pyc')

From 0b538cb95cbaf496897fcffb3c67a217d56f2511 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:06:44 -0500
Subject: [PATCH 4530/8469] Reindent

---
 setuptools/command/build_ext.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 5327a03021..414ad1664a 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -200,11 +200,11 @@ def get_outputs(self):
         optimize = self.get_finalized_command('build_py').optimize
         ns_ext = (ext for ext in self.extensions if ext._needs_stub)
         for ext in ns_ext:
-                base = os.path.join(self.build_lib, *ext._full_name.split('.'))
-                outputs.append(base + '.py')
-                outputs.append(base + '.pyc')
-                if optimize:
-                    outputs.append(base + '.pyo')
+            base = os.path.join(self.build_lib, *ext._full_name.split('.'))
+            outputs.append(base + '.py')
+            outputs.append(base + '.pyc')
+            if optimize:
+                outputs.append(base + '.pyo')
         return outputs
 
     def write_stub(self, output_dir, ext, compile=False):

From 2050af11f662a28f9c2c834552c195d90a5ac73e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:11:47 -0500
Subject: [PATCH 4531/8469] Rewrite function to use extend and a generator
 expression.

---
 setuptools/command/build_ext.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 414ad1664a..b5c2738cb3 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -197,14 +197,13 @@ def links_to_dynamic(self, ext):
 
     def get_outputs(self):
         outputs = _build_ext.get_outputs(self)
-        optimize = self.get_finalized_command('build_py').optimize
+        fn_exts = ['.py', '.pyc']
+        if self.get_finalized_command('build_py').optimize:
+            fn_exts.append('.pyo')
         ns_ext = (ext for ext in self.extensions if ext._needs_stub)
         for ext in ns_ext:
             base = os.path.join(self.build_lib, *ext._full_name.split('.'))
-            outputs.append(base + '.py')
-            outputs.append(base + '.pyc')
-            if optimize:
-                outputs.append(base + '.pyo')
+            outputs.extend(base + fnext for fnext in fn_exts)
         return outputs
 
     def write_stub(self, output_dir, ext, compile=False):

From b19c06058c720418db8a4496410cb82cc3526d54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:16:45 -0500
Subject: [PATCH 4532/8469] Extract method for clarity.

---
 setuptools/command/build_ext.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index b5c2738cb3..c85351b4a8 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -196,7 +196,10 @@ def links_to_dynamic(self, ext):
         return any(pkg + libname in libnames for libname in ext.libraries)
 
     def get_outputs(self):
-        outputs = _build_ext.get_outputs(self)
+        return _build_ext.get_outputs(self) + self.__get_stubs_outputs()
+
+    def __get_stubs_outputs(self):
+        outputs = []
         fn_exts = ['.py', '.pyc']
         if self.get_finalized_command('build_py').optimize:
             fn_exts.append('.pyo')

From 2b880cc89d0ce6845c4bdd072ac518a7ed9baa08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:20:49 -0500
Subject: [PATCH 4533/8469] Use itertools.product to pair each base with each
 extension.

---
 setuptools/command/build_ext.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c85351b4a8..2651beae59 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -6,6 +6,7 @@
 from distutils import log
 import os
 import sys
+import itertools
 
 from setuptools.extension import Library
 
@@ -199,15 +200,16 @@ def get_outputs(self):
         return _build_ext.get_outputs(self) + self.__get_stubs_outputs()
 
     def __get_stubs_outputs(self):
-        outputs = []
         fn_exts = ['.py', '.pyc']
         if self.get_finalized_command('build_py').optimize:
             fn_exts.append('.pyo')
         ns_ext = (ext for ext in self.extensions if ext._needs_stub)
-        for ext in ns_ext:
-            base = os.path.join(self.build_lib, *ext._full_name.split('.'))
-            outputs.extend(base + fnext for fnext in fn_exts)
-        return outputs
+        ns_ext_bases = (
+            os.path.join(self.build_lib, *ext._full_name.split('.'))
+            for ext in ns_ext
+        )
+        pairs = itertools.product(ns_ext_bases, fn_exts)
+        return (base + fnext for base, fnext in pairs)
 
     def write_stub(self, output_dir, ext, compile=False):
         log.info("writing stub loader for %s to %s", ext._full_name,

From 3ade3c11402c161a623e54502472fdd6cc7bd0dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:21:19 -0500
Subject: [PATCH 4534/8469] Collapse two generator expressions.

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

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 2651beae59..7815522371 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -203,10 +203,10 @@ def __get_stubs_outputs(self):
         fn_exts = ['.py', '.pyc']
         if self.get_finalized_command('build_py').optimize:
             fn_exts.append('.pyo')
-        ns_ext = (ext for ext in self.extensions if ext._needs_stub)
         ns_ext_bases = (
             os.path.join(self.build_lib, *ext._full_name.split('.'))
-            for ext in ns_ext
+            for ext in self.extensions
+            if ext._needs_stub
         )
         pairs = itertools.product(ns_ext_bases, fn_exts)
         return (base + fnext for base, fnext in pairs)

From df765dcb6204366f4662004217997af35590fb9b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:24:46 -0500
Subject: [PATCH 4535/8469] Extract logic for getting the extensions for
 outputs.

---
 setuptools/command/build_ext.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 7815522371..2df3bc708b 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -200,17 +200,20 @@ def get_outputs(self):
         return _build_ext.get_outputs(self) + self.__get_stubs_outputs()
 
     def __get_stubs_outputs(self):
-        fn_exts = ['.py', '.pyc']
-        if self.get_finalized_command('build_py').optimize:
-            fn_exts.append('.pyo')
         ns_ext_bases = (
             os.path.join(self.build_lib, *ext._full_name.split('.'))
             for ext in self.extensions
             if ext._needs_stub
         )
-        pairs = itertools.product(ns_ext_bases, fn_exts)
+        pairs = itertools.product(ns_ext_bases, self.__get_output_extensions())
         return (base + fnext for base, fnext in pairs)
 
+    def __get_output_extensions(self):
+        yield '.py'
+        yield '.pyc'
+        if self.get_finalized_command('build_py').optimize:
+            yield '.pyo'
+
     def write_stub(self, output_dir, ext, compile=False):
         log.info("writing stub loader for %s to %s", ext._full_name,
                  output_dir)

From 82390398562436f2928083066d8b1d2e786643fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:28:35 -0500
Subject: [PATCH 4536/8469] Add comments for clarity.

---
 setuptools/command/build_ext.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 2df3bc708b..f0913115bb 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -200,11 +200,13 @@ def get_outputs(self):
         return _build_ext.get_outputs(self) + self.__get_stubs_outputs()
 
     def __get_stubs_outputs(self):
+        # assemble the base name for each extension that needs a stub
         ns_ext_bases = (
             os.path.join(self.build_lib, *ext._full_name.split('.'))
             for ext in self.extensions
             if ext._needs_stub
         )
+        # pair each base with the extension
         pairs = itertools.product(ns_ext_bases, self.__get_output_extensions())
         return (base + fnext for base, fnext in pairs)
 

From 7bcbb5cbc893e97109c15cba3ea561aa0d462148 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Dec 2014 10:29:02 -0500
Subject: [PATCH 4537/8469] Force list type for easy concatenation.

---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index f0913115bb..e4b2c593f3 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -208,7 +208,7 @@ def __get_stubs_outputs(self):
         )
         # pair each base with the extension
         pairs = itertools.product(ns_ext_bases, self.__get_output_extensions())
-        return (base + fnext for base, fnext in pairs)
+        return list(base + fnext for base, fnext in pairs)
 
     def __get_output_extensions(self):
         yield '.py'

From 9b13614de9c0728a3951f3be2e98b5d09e4314f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 16:45:17 -0500
Subject: [PATCH 4538/8469] Add test making explicit the expectation that
 pkg_resources shouldn't import setuptools (or be dependent on it in any way).
 Ref #311.

---
 tests/test_pkg_resources.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 11edfe851a..564d7cec4f 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -4,6 +4,7 @@
 import zipfile
 import datetime
 import time
+import subprocess
 
 import pkg_resources
 
@@ -89,3 +90,22 @@ def test_get_cache_path(self):
         type_ = str(type(path))
         message = "Unexpected type from get_cache_path: " + type_
         assert isinstance(path, (unicode, str)), message
+
+
+class TestIndependence:
+    """
+    Tests to ensure that pkg_resources runs independently from setuptools.
+    """
+    def test_setuptools_not_imported(self):
+        """
+        In a separate Python environment, import pkg_resources and assert
+        that action doesn't cause setuptools to be imported.
+        """
+        lines = (
+            'import pkg_resources',
+            'import sys',
+            'assert "setuptools" not in sys.modules, '
+                '"setuptools was imported"',
+        )
+        cmd = [sys.executable, '-c', '; '.join(lines)]
+        subprocess.check_call(cmd)

From 79a0c55d8c09d3fdd68157faa8658ecd85aa5d45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 16:51:28 -0500
Subject: [PATCH 4539/8469] Moved pkg_resources into its own package.

---
 MANIFEST.in                                   | 1 +
 pkg_resources.py => pkg_resources/__init__.py | 0
 setup.py                                      | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename pkg_resources.py => pkg_resources/__init__.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2c587d40f9..8916394a17 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ recursive-include setuptools/tests *.html entries*
 recursive-include setuptools/tests/svn_data *.zip
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
+recursive-include pkg_resources *.py
 include *.py
 include *.txt
 include MANIFEST.in
diff --git a/pkg_resources.py b/pkg_resources/__init__.py
similarity index 100%
rename from pkg_resources.py
rename to pkg_resources/__init__.py
diff --git a/setup.py b/setup.py
index bac4e29dbf..ff519e3e44 100755
--- a/setup.py
+++ b/setup.py
@@ -128,7 +128,7 @@ def _save_entry_points(self):
     packages=setuptools.find_packages(),
     package_data=package_data,
 
-    py_modules=['pkg_resources', 'easy_install'],
+    py_modules=['easy_install'],
 
     zip_safe=True,
 

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: [PATCH 4540/8469] Move vendored packaging module into
 pkg_resources._vendor, restoring independence of pkg_resources from
 setuptools. Fixes #311.

---
 pkg_resources/__init__.py                                   | 6 +++---
 {setuptools => pkg_resources}/_vendor/__init__.py           | 0
 .../_vendor/packaging/__about__.py                          | 0
 {setuptools => pkg_resources}/_vendor/packaging/__init__.py | 0
 {setuptools => pkg_resources}/_vendor/packaging/_compat.py  | 0
 .../_vendor/packaging/_structures.py                        | 0
 .../_vendor/packaging/specifiers.py                         | 0
 {setuptools => pkg_resources}/_vendor/packaging/version.py  | 0
 {setuptools => pkg_resources}/_vendor/vendored.txt          | 0
 setuptools/command/egg_info.py                              | 4 ++--
 setuptools/dist.py                                          | 4 ++--
 setuptools/tests/test_resources.py                          | 6 +++---
 12 files changed, 10 insertions(+), 10 deletions(-)
 rename {setuptools => pkg_resources}/_vendor/__init__.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/__about__.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/__init__.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/_compat.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/_structures.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/specifiers.py (100%)
 rename {setuptools => pkg_resources}/_vendor/packaging/version.py (100%)
 rename {setuptools => pkg_resources}/_vendor/vendored.txt (100%)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3a8edca527..699ac114a3 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,9 +75,9 @@
 except ImportError:
     pass
 
-import setuptools._vendor.packaging.version
-import setuptools._vendor.packaging.specifiers
-packaging = setuptools._vendor.packaging
+import pkg_resources._vendor.packaging.version
+import pkg_resources._vendor.packaging.specifiers
+packaging = pkg_resources._vendor.packaging
 
 
 class PEP440Warning(RuntimeWarning):
diff --git a/setuptools/_vendor/__init__.py b/pkg_resources/_vendor/__init__.py
similarity index 100%
rename from setuptools/_vendor/__init__.py
rename to pkg_resources/_vendor/__init__.py
diff --git a/setuptools/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
similarity index 100%
rename from setuptools/_vendor/packaging/__about__.py
rename to pkg_resources/_vendor/packaging/__about__.py
diff --git a/setuptools/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py
similarity index 100%
rename from setuptools/_vendor/packaging/__init__.py
rename to pkg_resources/_vendor/packaging/__init__.py
diff --git a/setuptools/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
similarity index 100%
rename from setuptools/_vendor/packaging/_compat.py
rename to pkg_resources/_vendor/packaging/_compat.py
diff --git a/setuptools/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
similarity index 100%
rename from setuptools/_vendor/packaging/_structures.py
rename to pkg_resources/_vendor/packaging/_structures.py
diff --git a/setuptools/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
similarity index 100%
rename from setuptools/_vendor/packaging/specifiers.py
rename to pkg_resources/_vendor/packaging/specifiers.py
diff --git a/setuptools/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
similarity index 100%
rename from setuptools/_vendor/packaging/version.py
rename to pkg_resources/_vendor/packaging/version.py
diff --git a/setuptools/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
similarity index 100%
rename from setuptools/_vendor/vendored.txt
rename to pkg_resources/_vendor/vendored.txt
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e132412707..dfbab0e9aa 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,8 +15,8 @@
     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 import Command
 from setuptools.command.sdist import sdist
diff --git a/setuptools/dist.py b/setuptools/dist.py
index e44796fd95..2daa283509 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -17,8 +17,8 @@
     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
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 1902fb2ce4..7cf2385b14 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,9 +8,9 @@
 import shutil
 from unittest import TestCase
 
-import setuptools._vendor.packaging.version
-import setuptools._vendor.packaging.specifiers
-packaging = setuptools._vendor.packaging
+import pkg_resources._vendor.packaging.version
+import pkg_resources._vendor.packaging.specifiers
+packaging = pkg_resources._vendor.packaging
 
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,

From 170657b68f4b92e7e1bf82f5e19a831f5744af67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:11:49 -0500
Subject: [PATCH 4541/8469] Setuptools now uses the 'packaging' package from
 pkg_resources, unifying the behavior around resolution of that package.

---
 pkg_resources/__init__.py          | 11 ++++++++---
 setuptools/command/egg_info.py     |  8 +-------
 setuptools/dist.py                 |  9 ++-------
 setuptools/tests/test_resources.py |  6 ++----
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 699ac114a3..a055cf1a32 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,9 +75,14 @@
 except ImportError:
     pass
 
-import pkg_resources._vendor.packaging.version
-import pkg_resources._vendor.packaging.specifiers
-packaging = pkg_resources._vendor.packaging
+try:
+    import packaging.version
+    import packaging.specifiers
+except ImportError:
+    # fallback to vendored version
+    import pkg_resources._vendor.packaging.version
+    import pkg_resources._vendor.packaging.specifiers
+    packaging = pkg_resources._vendor.packaging
 
 
 class PEP440Warning(RuntimeWarning):
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index dfbab0e9aa..88ab0b8292 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -11,13 +11,6 @@
 import re
 import sys
 
-try:
-    import packaging.version
-except ImportError:
-    # fallback to vendored version
-    import pkg_resources._vendor.packaging.version
-    packaging = pkg_resources._vendor.packaging
-
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
@@ -28,6 +21,7 @@
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 import setuptools.unicode_utils as unicode_utils
 
+from pkg_resources import packaging
 
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2daa283509..7a94d4b38e 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,18 +13,13 @@
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
-try:
-    import packaging.version
-except ImportError:
-    # fallback to vendored version
-    import pkg_resources._vendor.packaging.version
-    packaging = pkg_resources._vendor.packaging
-
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2
 from setuptools import windows_support
 import pkg_resources
 
+packaging = pkg_resources.packaging
+
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 7cf2385b14..f9f2e459ef 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,15 +8,13 @@
 import shutil
 from unittest import TestCase
 
-import pkg_resources._vendor.packaging.version
-import pkg_resources._vendor.packaging.specifiers
-packaging = pkg_resources._vendor.packaging
-
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
     WorkingSet)
 
+packaging = pkg_resources.packaging
+
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3

From 9b28468a92d73f2a76b2cfdaa4444f65acf49f1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:22:58 -0500
Subject: [PATCH 4542/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d9b4d5237..be20e66839 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+8.3
+---
+
+* Issue #311: Decoupled pkg_resources from setuptools once again.
+  ``pkg_resources`` is now a package instead of a module.
+
 -----
 8.2.1
 -----

From b22fd831fd0bf735beb1ea97f630d8fb1c4c5158 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:23:39 -0500
Subject: [PATCH 4543/8469] Bumped to 8.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 65337f67a0..e22ab67449 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.2.2"
+DEFAULT_VERSION = "8.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 5adfd0a393..de8c596a80 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.2.2'
+__version__ = '8.3'

From ab26e104c7a120e4d99142d39acfcf3e12c012b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:23:41 -0500
Subject: [PATCH 4544/8469] Added tag 8.3 for changeset cd14b2a72e51

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e3f5e6a8a2..4dccce7edd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -170,3 +170,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1
 995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
 efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
+cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3

From 21f753919f89bd6c7f3333a6b15f0d5515ecde64 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:24:44 -0500
Subject: [PATCH 4545/8469] Bumped to 8.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e22ab67449..513449f919 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.3"
+DEFAULT_VERSION = "8.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index de8c596a80..60a9e0b2a7 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.3'
+__version__ = '8.4'

From a7e5648bda737683c4ad220e61c44c1d17b73d87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 18:25:45 -0500
Subject: [PATCH 4546/8469] Removed svn support from setuptools. Ref #313.

---
 setup.py                          |   3 -
 setuptools/command/egg_info.py    |   8 +-
 setuptools/command/sdist.py       |  57 ---
 setuptools/svn_utils.py           | 585 ------------------------------
 setuptools/tests/environment.py   |  58 ---
 setuptools/tests/test_egg_info.py | 191 +---------
 setuptools/tests/test_sdist.py    | 134 +------
 setuptools/tests/test_svn.py      | 245 -------------
 8 files changed, 9 insertions(+), 1272 deletions(-)
 delete mode 100644 setuptools/svn_utils.py
 delete mode 100644 setuptools/tests/test_svn.py

diff --git a/setup.py b/setup.py
index ff519e3e44..ca0b6c4b53 100755
--- a/setup.py
+++ b/setup.py
@@ -172,9 +172,6 @@ def _save_entry_points(self):
         ],
         "console_scripts": console_scripts,
 
-        "setuptools.file_finders":
-            ["svn_cvs = setuptools.command.sdist:_default_revctrl"],
-
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 88ab0b8292..526e0a8f08 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -11,10 +11,14 @@
 import re
 import sys
 
+try:
+    from setuptools_svn import svn_utils
+except ImportError:
+    pass
+
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
-from setuptools import svn_utils
 from setuptools.command.sdist import walk_revctrl
 from pkg_resources import (
     parse_requirements, safe_name, parse_version,
@@ -190,6 +194,8 @@ def tags(self):
 
     @staticmethod
     def get_svn_revision():
+        if 'svn_utils' not in globals():
+            return "0"
         return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
 
     def find_sources(self):
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a77c39f298..371bf547ae 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,12 +1,9 @@
 from glob import glob
-from distutils.util import convert_path
 from distutils import log
 import distutils.command.sdist as orig
 import os
-import re
 import sys
 
-from setuptools import svn_utils
 from setuptools.compat import PY3
 from setuptools.utils import cs_path_exists
 
@@ -22,60 +19,6 @@ def walk_revctrl(dirname=''):
             yield item
 
 
-# TODO will need test case
-class re_finder(object):
-    """
-    Finder that locates files based on entries in a file matched by a
-    regular expression.
-    """
-
-    def __init__(self, path, pattern, postproc=lambda x: x):
-        self.pattern = pattern
-        self.postproc = postproc
-        self.entries_path = convert_path(path)
-
-    def _finder(self, dirname, filename):
-        f = open(filename, 'rU')
-        try:
-            data = f.read()
-        finally:
-            f.close()
-        for match in self.pattern.finditer(data):
-            path = match.group(1)
-            # postproc was formerly used when the svn finder
-            # was an re_finder for calling unescape
-            path = self.postproc(path)
-            yield svn_utils.joinpath(dirname, path)
-
-    def find(self, dirname=''):
-        path = svn_utils.joinpath(dirname, self.entries_path)
-
-        if not os.path.isfile(path):
-            # entries file doesn't exist
-            return
-        for path in self._finder(dirname, path):
-            if os.path.isfile(path):
-                yield path
-            elif os.path.isdir(path):
-                for item in self.find(path):
-                    yield item
-
-    __call__ = find
-
-
-def _default_revctrl(dirname=''):
-    'Primary svn_cvs entry point'
-    for finder in finders:
-        for item in finder(dirname):
-            yield item
-
-
-finders = [
-    re_finder('CVS/Entries', re.compile(r"^\w?/([^/]+)/", re.M)),
-    svn_utils.svn_finder,
-]
-
-
 class sdist(orig.sdist):
     """Smart sdist that finds anything supported by revision control"""
 
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py
deleted file mode 100644
index 6502fc98ea..0000000000
--- a/setuptools/svn_utils.py
+++ /dev/null
@@ -1,585 +0,0 @@
-from __future__ import absolute_import
-
-import os
-import re
-import sys
-from distutils import log
-import xml.dom.pulldom
-import shlex
-import locale
-import codecs
-import unicodedata
-import warnings
-from setuptools.compat import unicode, PY2
-from setuptools.py31compat import TemporaryDirectory
-from xml.sax.saxutils import unescape
-
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
-
-from subprocess import Popen as _Popen, PIPE as _PIPE
-
-#NOTE: Use of the command line options require SVN 1.3 or newer (December 2005)
-#      and SVN 1.3 hasn't been supported by the developers since mid 2008.
-
-#subprocess is called several times with shell=(sys.platform=='win32')
-#see the follow for more information:
-#       http://bugs.python.org/issue8557
-#       http://stackoverflow.com/questions/5658622/
-#              python-subprocess-popen-environment-path
-
-def _run_command(args, stdout=_PIPE, stderr=_PIPE, encoding=None, stream=0):
-    #regarding the shell argument, see: http://bugs.python.org/issue8557
-    try:
-        proc = _Popen(args, stdout=stdout, stderr=stderr,
-                      shell=(sys.platform == 'win32'))
-
-        data = proc.communicate()[stream]
-    except OSError:
-        return 1, ''
-
-    #doubled checked and
-    data = decode_as_string(data, encoding)
-
-    #communciate calls wait()
-    return proc.returncode, data
-
-
-def _get_entry_schedule(entry):
-    schedule = entry.getElementsByTagName('schedule')[0]
-    return "".join([t.nodeValue
-                    for t in schedule.childNodes
-                    if t.nodeType == t.TEXT_NODE])
-
-
-def _get_target_property(target):
-    property_text = target.getElementsByTagName('property')[0]
-    return "".join([t.nodeValue
-                    for t in property_text.childNodes
-                    if t.nodeType == t.TEXT_NODE])
-
-
-def _get_xml_data(decoded_str):
-    if PY2:
-        #old versions want an encoded string
-        data = decoded_str.encode('utf-8')
-    else:
-        data = decoded_str
-    return data
-
-
-def joinpath(prefix, *suffix):
-    if not prefix or prefix == '.':
-        return os.path.join(*suffix)
-    return os.path.join(prefix, *suffix)
-
-def determine_console_encoding():
-    try:
-        #try for the preferred encoding
-        encoding = locale.getpreferredencoding()
-
-        #see if the locale.getdefaultlocale returns null
-        #some versions of python\platforms return US-ASCII
-        #when it cannot determine an encoding
-        if not encoding or encoding == "US-ASCII":
-            encoding = locale.getdefaultlocale()[1]
-
-        if encoding:
-            codecs.lookup(encoding)  # make sure a lookup error is not made
-
-    except (locale.Error, LookupError):
-        encoding = None
-
-    is_osx = sys.platform == "darwin"
-    if not encoding:
-        return ["US-ASCII", "utf-8"][is_osx]
-    elif encoding.startswith("mac-") and is_osx:
-        #certain versions of python would return mac-roman as default
-        #OSX as a left over of earlier mac versions.
-        return "utf-8"
-    else:
-        return encoding
-
-_console_encoding = determine_console_encoding()
-
-def decode_as_string(text, encoding=None):
-    """
-    Decode the console or file output explicitly using getpreferredencoding.
-    The text paraemeter should be a encoded string, if not no decode occurs
-    If no encoding is given, getpreferredencoding is used.  If encoding is
-    specified, that is used instead.  This would be needed for SVN --xml
-    output.  Unicode is explicitly put in composed NFC form.
-
-    --xml should be UTF-8 (SVN Issue 2938) the discussion on the Subversion
-    DEV List from 2007 seems to indicate the same.
-    """
-    #text should be a byte string
-
-    if encoding is None:
-        encoding = _console_encoding
-
-    if not isinstance(text, unicode):
-        text = text.decode(encoding)
-
-    text = unicodedata.normalize('NFC', text)
-
-    return text
-
-
-def parse_dir_entries(decoded_str):
-    '''Parse the entries from a recursive info xml'''
-    doc = xml.dom.pulldom.parseString(_get_xml_data(decoded_str))
-    entries = list()
-
-    for event, node in doc:
-        if event == 'START_ELEMENT' and node.nodeName == 'entry':
-            doc.expandNode(node)
-            if not _get_entry_schedule(node).startswith('delete'):
-                entries.append((node.getAttribute('path'),
-                                node.getAttribute('kind')))
-
-    return entries[1:]  # do not want the root directory
-
-
-def parse_externals_xml(decoded_str, prefix=''):
-    '''Parse a propget svn:externals xml'''
-    prefix = os.path.normpath(prefix)
-    prefix = os.path.normcase(prefix)
-
-    doc = xml.dom.pulldom.parseString(_get_xml_data(decoded_str))
-    externals = list()
-
-    for event, node in doc:
-        if event == 'START_ELEMENT' and node.nodeName == 'target':
-            doc.expandNode(node)
-            path = os.path.normpath(node.getAttribute('path'))
-
-            if os.path.normcase(path).startswith(prefix):
-                path = path[len(prefix)+1:]
-
-            data = _get_target_property(node)
-            #data should be decoded already
-            for external in parse_external_prop(data):
-                externals.append(joinpath(path, external))
-
-    return externals  # do not want the root directory
-
-
-def parse_external_prop(lines):
-    """
-    Parse the value of a retrieved svn:externals entry.
-
-    possible token setups (with quotng and backscaping in laters versions)
-        URL[@#] EXT_FOLDERNAME
-        [-r#] URL EXT_FOLDERNAME
-        EXT_FOLDERNAME [-r#] URL
-    """
-    externals = []
-    for line in lines.splitlines():
-        line = line.lstrip()  # there might be a "\ "
-        if not line:
-            continue
-
-        if PY2:
-            #shlex handles NULLs just fine and shlex in 2.7 tries to encode
-            #as ascii automatiically
-            line = line.encode('utf-8')
-        line = shlex.split(line)
-        if PY2:
-            line = [x.decode('utf-8') for x in line]
-
-        #EXT_FOLDERNAME is either the first or last depending on where
-        #the URL falls
-        if urlparse.urlsplit(line[-1])[0]:
-            external = line[0]
-        else:
-            external = line[-1]
-
-        external = decode_as_string(external, encoding="utf-8")
-        externals.append(os.path.normpath(external))
-
-    return externals
-
-
-def parse_prop_file(filename, key):
-    found = False
-    f = open(filename, 'rt')
-    data = ''
-    try:
-        for line in iter(f.readline, ''):    # can't use direct iter!
-            parts = line.split()
-            if len(parts) == 2:
-                kind, length = parts
-                data = f.read(int(length))
-                if kind == 'K' and data == key:
-                    found = True
-                elif kind == 'V' and found:
-                    break
-    finally:
-        f.close()
-
-    return data
-
-
-class SvnInfo(object):
-    '''
-    Generic svn_info object.  No has little knowledge of how to extract
-    information.  Use cls.load to instatiate according svn version.
-
-    Paths are not filesystem encoded.
-    '''
-
-    @staticmethod
-    def get_svn_version():
-        # Temp config directory should be enough to check for repository
-        # This is needed because .svn always creates .subversion and
-        # some operating systems do not handle dot directory correctly.
-        # Real queries in real svn repos with be concerned with it creation
-        with TemporaryDirectory() as tempdir:
-            code, data = _run_command(['svn',
-                                       '--config-dir', tempdir,
-                                       '--version',
-                                       '--quiet'])
-
-        if code == 0 and data:
-            return data.strip()
-        else:
-            return ''
-
-    #svnversion return values (previous implementations return max revision)
-    #   4123:4168     mixed revision working copy
-    #   4168M         modified working copy
-    #   4123S         switched working copy
-    #   4123:4168MS   mixed revision, modified, switched working copy
-    revision_re = re.compile(r'(?:([\-0-9]+):)?(\d+)([a-z]*)\s*$', re.I)
-
-    @classmethod
-    def load(cls, dirname=''):
-        normdir = os.path.normpath(dirname)
-
-        # Temp config directory should be enough to check for repository
-        # This is needed because .svn always creates .subversion and
-        # some operating systems do not handle dot directory correctly.
-        # Real queries in real svn repos with be concerned with it creation
-        with TemporaryDirectory() as tempdir:
-            code, data = _run_command(['svn',
-                                       '--config-dir', tempdir,
-                                       'info', normdir])
-
-        # Must check for some contents, as some use empty directories
-        # in testcases, however only enteries is needed also the info
-        # command above MUST have worked
-        svn_dir = os.path.join(normdir, '.svn')
-        is_svn_wd = (not code or
-                     os.path.isfile(os.path.join(svn_dir, 'entries')))
-
-        svn_version = tuple(cls.get_svn_version().split('.'))
-
-        try:
-            base_svn_version = tuple(int(x) for x in svn_version[:2])
-        except ValueError:
-            base_svn_version = tuple()
-
-        if not is_svn_wd:
-            #return an instance of this NO-OP class
-            return SvnInfo(dirname)
-
-        if code or not base_svn_version or base_svn_version < (1, 3):
-            warnings.warn(("No SVN 1.3+ command found: falling back "
-                           "on pre 1.7 .svn parsing"), DeprecationWarning)
-            return SvnFileInfo(dirname)
-
-        if base_svn_version < (1, 5):
-            return Svn13Info(dirname)
-
-        return Svn15Info(dirname)
-
-    def __init__(self, path=''):
-        self.path = path
-        self._entries = None
-        self._externals = None
-
-    def get_revision(self):
-        'Retrieve the directory revision information using svnversion'
-        code, data = _run_command(['svnversion', '-c', self.path])
-        if code:
-            log.warn("svnversion failed")
-            return 0
-
-        parsed = self.revision_re.match(data)
-        if parsed:
-            return int(parsed.group(2))
-        else:
-            return 0
-
-    @property
-    def entries(self):
-        if self._entries is None:
-            self._entries = self.get_entries()
-        return self._entries
-
-    @property
-    def externals(self):
-        if self._externals is None:
-            self._externals = self.get_externals()
-        return self._externals
-
-    def iter_externals(self):
-        '''
-        Iterate over the svn:external references in the repository path.
-        '''
-        for item in self.externals:
-            yield item
-
-    def iter_files(self):
-        '''
-        Iterate over the non-deleted file entries in the repository path
-        '''
-        for item, kind in self.entries:
-            if kind.lower() == 'file':
-                yield item
-
-    def iter_dirs(self, include_root=True):
-        '''
-        Iterate over the non-deleted file entries in the repository path
-        '''
-        if include_root:
-            yield self.path
-        for item, kind in self.entries:
-            if kind.lower() == 'dir':
-                yield item
-
-    def get_entries(self):
-        return []
-
-    def get_externals(self):
-        return []
-
-
-class Svn13Info(SvnInfo):
-    def get_entries(self):
-        code, data = _run_command(['svn', 'info', '-R', '--xml', self.path],
-                                  encoding="utf-8")
-
-        if code:
-            log.debug("svn info failed")
-            return []
-
-        return parse_dir_entries(data)
-
-    def get_externals(self):
-        #Previous to 1.5 --xml was not supported for svn propget and the -R
-        #output format breaks the shlex compatible semantics.
-        cmd = ['svn', 'propget', 'svn:externals']
-        result = []
-        for folder in self.iter_dirs():
-            code, lines = _run_command(cmd + [folder], encoding="utf-8")
-            if code != 0:
-                log.warn("svn propget failed")
-                return []
-            #lines should a str
-            for external in parse_external_prop(lines):
-                if folder:
-                    external = os.path.join(folder, external)
-                result.append(os.path.normpath(external))
-
-        return result
-
-
-class Svn15Info(Svn13Info):
-    def get_externals(self):
-        cmd = ['svn', 'propget', 'svn:externals', self.path, '-R', '--xml']
-        code, lines = _run_command(cmd, encoding="utf-8")
-        if code:
-            log.debug("svn propget failed")
-            return []
-        return parse_externals_xml(lines, prefix=os.path.abspath(self.path))
-
-
-class SvnFileInfo(SvnInfo):
-
-    def __init__(self, path=''):
-        super(SvnFileInfo, self).__init__(path)
-        self._directories = None
-        self._revision = None
-
-    def _walk_svn(self, base):
-        entry_file = joinpath(base, '.svn', 'entries')
-        if os.path.isfile(entry_file):
-            entries = SVNEntriesFile.load(base)
-            yield (base, False, entries.parse_revision())
-            for path in entries.get_undeleted_records():
-                path = decode_as_string(path)
-                path = joinpath(base, path)
-                if os.path.isfile(path):
-                    yield (path, True, None)
-                elif os.path.isdir(path):
-                    for item in self._walk_svn(path):
-                        yield item
-
-    def _build_entries(self):
-        entries = list()
-
-        rev = 0
-        for path, isfile, dir_rev in self._walk_svn(self.path):
-            if isfile:
-                entries.append((path, 'file'))
-            else:
-                entries.append((path, 'dir'))
-                rev = max(rev, dir_rev)
-
-        self._entries = entries
-        self._revision = rev
-
-    def get_entries(self):
-        if self._entries is None:
-            self._build_entries()
-        return self._entries
-
-    def get_revision(self):
-        if self._revision is None:
-            self._build_entries()
-        return self._revision
-
-    def get_externals(self):
-        prop_files = [['.svn', 'dir-prop-base'],
-                      ['.svn', 'dir-props']]
-        externals = []
-
-        for dirname in self.iter_dirs():
-            prop_file = None
-            for rel_parts in prop_files:
-                filename = joinpath(dirname, *rel_parts)
-                if os.path.isfile(filename):
-                    prop_file = filename
-
-            if prop_file is not None:
-                ext_prop = parse_prop_file(prop_file, 'svn:externals')
-                #ext_prop should be utf-8 coming from svn:externals
-                ext_prop = decode_as_string(ext_prop, encoding="utf-8")
-                externals.extend(parse_external_prop(ext_prop))
-
-        return externals
-
-
-def svn_finder(dirname=''):
-    #combined externals due to common interface
-    #combined externals and entries due to lack of dir_props in 1.7
-    info = SvnInfo.load(dirname)
-    for path in info.iter_files():
-        yield path
-
-    for path in info.iter_externals():
-        sub_info = SvnInfo.load(path)
-        for sub_path in sub_info.iter_files():
-            yield sub_path
-
-
-class SVNEntriesFile(object):
-    def __init__(self, data):
-        self.data = data
-
-    @classmethod
-    def load(class_, base):
-        filename = os.path.join(base, '.svn', 'entries')
-        f = open(filename)
-        try:
-            result = SVNEntriesFile.read(f)
-        finally:
-            f.close()
-        return result
-
-    @classmethod
-    def read(class_, fileobj):
-        data = fileobj.read()
-        is_xml = data.startswith('<?xml')
-        class_ = [SVNEntriesFileText, SVNEntriesFileXML][is_xml]
-        return class_(data)
-
-    def parse_revision(self):
-        all_revs = self.parse_revision_numbers() + [0]
-        return max(all_revs)
-
-
-class SVNEntriesFileText(SVNEntriesFile):
-    known_svn_versions = {
-        '1.4.x': 8,
-        '1.5.x': 9,
-        '1.6.x': 10,
-    }
-
-    def __get_cached_sections(self):
-        return self.sections
-
-    def get_sections(self):
-        SECTION_DIVIDER = '\f\n'
-        sections = self.data.split(SECTION_DIVIDER)
-        sections = [x for x in map(str.splitlines, sections)]
-        try:
-            # remove the SVN version number from the first line
-            svn_version = int(sections[0].pop(0))
-            if not svn_version in self.known_svn_versions.values():
-                log.warn("Unknown subversion verson %d", svn_version)
-        except ValueError:
-            return
-        self.sections = sections
-        self.get_sections = self.__get_cached_sections
-        return self.sections
-
-    def is_valid(self):
-        return bool(self.get_sections())
-
-    def get_url(self):
-        return self.get_sections()[0][4]
-
-    def parse_revision_numbers(self):
-        revision_line_number = 9
-        rev_numbers = [
-            int(section[revision_line_number])
-            for section in self.get_sections()
-            if (len(section) > revision_line_number
-                and section[revision_line_number])
-        ]
-        return rev_numbers
-
-    def get_undeleted_records(self):
-        undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete')
-        result = [
-            section[0]
-            for section in self.get_sections()
-            if undeleted(section)
-        ]
-        return result
-
-
-class SVNEntriesFileXML(SVNEntriesFile):
-    def is_valid(self):
-        return True
-
-    def get_url(self):
-        "Get repository URL"
-        urlre = re.compile('url="([^"]+)"')
-        return urlre.search(self.data).group(1)
-
-    def parse_revision_numbers(self):
-        revre = re.compile(r'committed-rev="(\d+)"')
-        return [
-            int(m.group(1))
-            for m in revre.finditer(self.data)
-        ]
-
-    def get_undeleted_records(self):
-        entries_pattern = \
-            re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I)
-        results = [
-            unescape(match.group(1))
-            for match in entries_pattern.finditer(self.data)
-        ]
-        return results
-
-
-if __name__ == '__main__':
-    for name in svn_finder(sys.argv[1]):
-        print(name)
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index c8d0e66921..a23c0504e7 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -1,68 +1,10 @@
 import os
-import zipfile
 import sys
-import tempfile
-import unittest
-import shutil
-import stat
 import unicodedata
 
 from subprocess import Popen as _Popen, PIPE as _PIPE
 
 
-def _remove_dir(target):
-
-    #on windows this seems to a problem
-    for dir_path, dirs, files in os.walk(target):
-        os.chmod(dir_path, stat.S_IWRITE)
-        for filename in files:
-            os.chmod(os.path.join(dir_path, filename), stat.S_IWRITE)
-    shutil.rmtree(target)
-
-
-class ZippedEnvironment(unittest.TestCase):
-
-    datafile = None
-    dataname = None
-    old_cwd = None
-
-    def setUp(self):
-        if self.datafile is None or self.dataname is None:
-            return
-
-        if not os.path.isfile(self.datafile):
-            self.old_cwd = None
-            return
-
-        self.old_cwd = os.getcwd()
-
-        self.temp_dir = tempfile.mkdtemp()
-        zip_file, source, target = [None, None, None]
-        try:
-            zip_file = zipfile.ZipFile(self.datafile)
-            for files in zip_file.namelist():
-                zip_file.extract(files, self.temp_dir)
-        finally:
-            if zip_file:
-                zip_file.close()
-            del zip_file
-
-        os.chdir(os.path.join(self.temp_dir, self.dataname))
-
-    def tearDown(self):
-        #Assume setUp was never completed
-        if self.dataname is None or self.datafile is None:
-            return
-
-        try:
-            if self.old_cwd:
-                os.chdir(self.old_cwd)
-                _remove_dir(self.temp_dir)
-        except OSError:
-            #sigh?
-            pass
-
-
 def _which_dirs(cmd):
     result = set()
     for path in os.environ.get('PATH', '').split(os.pathsep):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index e80684205f..6b4d917f5a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,28 +1,16 @@
-
-import distutils.core
 import os
-import sys
 import tempfile
 import shutil
 import stat
 import unittest
 
-import pkg_resources
-import warnings
-from setuptools.command import egg_info
-from setuptools import svn_utils
-from setuptools.tests import environment, test_svn
-from setuptools.tests.py26compat import skipIf
-
-ENTRIES_V10 = pkg_resources.resource_string(__name__, 'entries-v10')
-"An entries file generated with svn 1.6.17 against the legacy Setuptools repo"
+from . import environment
 
 
 class TestEggInfo(unittest.TestCase):
 
     def setUp(self):
         self.test_dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(self.test_dir, '.svn'))
 
         self.old_cwd = os.getcwd()
         os.chdir(self.test_dir)
@@ -31,12 +19,6 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.test_dir)
 
-    def _write_entries(self, entries):
-        fn = os.path.join(self.test_dir, '.svn', 'entries')
-        entries_f = open(fn, 'wb')
-        entries_f.write(entries)
-        entries_f.close()
-
     def _create_project(self):
         with open('setup.py', 'w') as f:
             f.write('from setuptools import setup\n')
@@ -51,52 +33,6 @@ def _create_project(self):
             f.write('def run():\n')
             f.write("    print('hello')\n")
 
-    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
-    def test_version_10_format(self):
-        """
-        """
-        #keeping this set for 1.6 is a good check on the get_svn_revision
-        #to ensure I return using svnversion what would had been returned
-        version_str = svn_utils.SvnInfo.get_svn_version()
-        version = [int(x) for x in version_str.split('.')[:2]]
-        if version != [1, 6]:
-            if hasattr(self, 'skipTest'):
-                self.skipTest('')
-            else:
-                sys.stderr.write('\n   Skipping due to SVN Version\n')
-                return
-
-        self._write_entries(ENTRIES_V10)
-        rev = egg_info.egg_info.get_svn_revision()
-        self.assertEqual(rev, '89000')
-
-    def test_version_10_format_legacy_parser(self):
-        """
-        """
-        path_variable = None
-        for env in os.environ:
-            if env.lower() == 'path':
-                path_variable = env
-
-        if path_variable:
-            old_path = os.environ[path_variable]
-            os.environ[path_variable] = ''
-        #catch_warnings not available until py26
-        warning_filters = warnings.filters
-        warnings.filters = warning_filters[:]
-        try:
-            warnings.simplefilter("ignore", DeprecationWarning)
-            self._write_entries(ENTRIES_V10)
-            rev = egg_info.egg_info.get_svn_revision()
-        finally:
-            #restore the warning filters
-            warnings.filters = warning_filters
-            #restore the os path
-            if path_variable:
-                os.environ[path_variable] = old_path
-
-        self.assertEqual(rev, '89000')
-
     def test_egg_base_installed_egg_info(self):
         self._create_project()
         temp_dir = tempfile.mkdtemp(prefix='setuptools-test.')
@@ -139,130 +75,5 @@ def test_egg_base_installed_egg_info(self):
             shutil.rmtree(temp_dir)
 
 
-DUMMY_SOURCE_TXT = """CHANGES.txt
-CONTRIBUTORS.txt
-HISTORY.txt
-LICENSE
-MANIFEST.in
-README.txt
-setup.py
-dummy/__init__.py
-dummy/test.txt
-dummy.egg-info/PKG-INFO
-dummy.egg-info/SOURCES.txt
-dummy.egg-info/dependency_links.txt
-dummy.egg-info/top_level.txt"""
-
-
-class TestSvnDummy(environment.ZippedEnvironment):
-
-    def setUp(self):
-        version = svn_utils.SvnInfo.get_svn_version()
-        if not version:  # None or Empty
-            return None
-
-        self.base_version = tuple([int(x) for x in version.split('.')][:2])
-
-        if not self.base_version:
-            raise ValueError('No SVN tools installed')
-        elif self.base_version < (1, 3):
-            raise ValueError('Insufficient SVN Version %s' % version)
-        elif self.base_version >= (1, 9):
-            #trying the latest version
-            self.base_version = (1, 8)
-
-        self.dataname = "dummy%i%i" % self.base_version
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvnDummy, self).setUp()
-
-    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
-    def test_sources(self):
-        code, data = environment.run_setup_py(["sdist"],
-                                              pypath=self.old_cwd,
-                                              data_stream=1)
-        if code:
-            raise AssertionError(data)
-
-        sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
-        infile = open(sources, 'r')
-        try:
-            read_contents = infile.read()
-        finally:
-            infile.close()
-            del infile
-
-        self.assertEqual(DUMMY_SOURCE_TXT, read_contents)
-
-        return data
-
-    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
-    def test_svn_tags(self):
-        code, data = environment.run_setup_py(["egg_info",
-                                               "--tag-svn-revision"],
-                                              pypath=self.old_cwd,
-                                              data_stream=1)
-        if code:
-            raise AssertionError(data)
-
-        pkginfo = os.path.join('dummy.egg-info', 'PKG-INFO')
-        infile = open(pkginfo, 'r')
-        try:
-            read_contents = infile.readlines()
-        finally:
-            infile.close()
-            del infile
-
-        self.assertTrue("Version: 0.1.1.post1\n" in read_contents)
-
-    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
-    def test_no_tags(self):
-        code, data = environment.run_setup_py(["egg_info"],
-                                              pypath=self.old_cwd,
-                                              data_stream=1)
-        if code:
-            raise AssertionError(data)
-
-        pkginfo = os.path.join('dummy.egg-info', 'PKG-INFO')
-        infile = open(pkginfo, 'r')
-        try:
-            read_contents = infile.readlines()
-        finally:
-            infile.close()
-            del infile
-
-        self.assertTrue("Version: 0.1.1\n" in read_contents)
-
-
-class TestSvnDummyLegacy(environment.ZippedEnvironment):
-
-    def setUp(self):
-        self.base_version = (1, 6)
-        self.dataname = "dummy%i%i" % self.base_version
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvnDummyLegacy, self).setUp()
-
-    def test_sources(self):
-        code, data = environment.run_setup_py(["sdist"],
-                                              pypath=self.old_cwd,
-                                              path="",
-                                              data_stream=1)
-        if code:
-            raise AssertionError(data)
-
-        sources = os.path.join('dummy.egg-info', 'SOURCES.txt')
-        infile = open(sources, 'r')
-        try:
-            read_contents = infile.read()
-        finally:
-            infile.close()
-            del infile
-
-        self.assertEqual(DUMMY_SOURCE_TXT, read_contents)
-
-        return data
-
-
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 5f8a190f46..bece76d263 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -8,16 +8,13 @@
 import tempfile
 import unittest
 import unicodedata
-import re
 import contextlib
-from setuptools.tests import environment, test_svn
 from setuptools.tests.py26compat import skipIf
 
 from setuptools.compat import StringIO, unicode, PY3, PY2
-from setuptools.command.sdist import sdist, walk_revctrl
+from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
-from setuptools import svn_utils
 
 SETUP_ATTRS = {
     'name': 'sdist_test',
@@ -418,135 +415,6 @@ def test_sdist_with_latin1_encoded_filename(self):
             except UnicodeDecodeError:
                 self.assertFalse(filename in cmd.filelist.files)
 
-class TestDummyOutput(environment.ZippedEnvironment):
-
-    def setUp(self):
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', "dummy.zip")
-        self.dataname = "dummy"
-        super(TestDummyOutput, self).setUp()
-
-    def _run(self):
-        code, data = environment.run_setup_py(["sdist"],
-                                              pypath=self.old_cwd,
-                                              data_stream=0)
-        if code:
-            info = "DIR: " + os.path.abspath('.')
-            info += "\n  SDIST RETURNED: %i\n\n" % code
-            info += data
-            raise AssertionError(info)
-
-        datalines = data.splitlines()
-
-        possible = (
-            "running sdist",
-            "running egg_info",
-            "creating dummy\.egg-info",
-            "writing dummy\.egg-info",
-            "writing top-level names to dummy\.egg-info",
-            "writing dependency_links to dummy\.egg-info",
-            "writing manifest file 'dummy\.egg-info",
-            "reading manifest file 'dummy\.egg-info",
-            "reading manifest template 'MANIFEST\.in'",
-            "writing manifest file 'dummy\.egg-info",
-            "creating dummy-0.1.1",
-            "making hard links in dummy-0\.1\.1",
-            "copying files to dummy-0\.1\.1",
-            "copying \S+ -> dummy-0\.1\.1",
-            "copying dummy",
-            "copying dummy\.egg-info",
-            "hard linking \S+ -> dummy-0\.1\.1",
-            "hard linking dummy",
-            "hard linking dummy\.egg-info",
-            "Writing dummy-0\.1\.1",
-            "creating dist",
-            "creating 'dist",
-            "Creating tar archive",
-            "running check",
-            "adding 'dummy-0\.1\.1",
-            "tar .+ dist/dummy-0\.1\.1\.tar dummy-0\.1\.1",
-            "gzip .+ dist/dummy-0\.1\.1\.tar",
-            "removing 'dummy-0\.1\.1' \\(and everything under it\\)",
-        )
-
-        print("    DIR: " + os.path.abspath('.'))
-        for line in datalines:
-            found = False
-            for pattern in possible:
-                if re.match(pattern, line):
-                    print("   READ: " + line)
-                    found = True
-                    break
-            if not found:
-                raise AssertionError("Unexpexected: %s\n-in-\n%s"
-                                     % (line, data))
-
-        return data
-
-    def test_sources(self):
-        self._run()
-
-
-class TestSvn(environment.ZippedEnvironment):
-
-    def setUp(self):
-        version = svn_utils.SvnInfo.get_svn_version()
-        if not version:  # None or Empty
-            return
-
-        self.base_version = tuple([int(x) for x in version.split('.')][:2])
-
-        if not self.base_version:
-            raise ValueError('No SVN tools installed')
-        elif self.base_version < (1, 3):
-            raise ValueError('Insufficient SVN Version %s' % version)
-        elif self.base_version >= (1, 9):
-            # trying the latest version
-            self.base_version = (1, 8)
-
-        self.dataname = "svn%i%i_example" % self.base_version
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvn, self).setUp()
-
-    @skipIf(not test_svn._svn_check, "No SVN to text, in the first place")
-    def test_walksvn(self):
-        if self.base_version >= (1, 6):
-            folder2 = 'third party2'
-            folder3 = 'third party3'
-        else:
-            folder2 = 'third_party2'
-            folder3 = 'third_party3'
-
-        # TODO is this right
-        expected = set([
-            os.path.join('a file'),
-            os.path.join(folder2, 'Changes.txt'),
-            os.path.join(folder2, 'MD5SUMS'),
-            os.path.join(folder2, 'README.txt'),
-            os.path.join(folder3, 'Changes.txt'),
-            os.path.join(folder3, 'MD5SUMS'),
-            os.path.join(folder3, 'README.txt'),
-            os.path.join(folder3, 'TODO.txt'),
-            os.path.join(folder3, 'fin'),
-            os.path.join('third_party', 'README.txt'),
-            os.path.join('folder', folder2, 'Changes.txt'),
-            os.path.join('folder', folder2, 'MD5SUMS'),
-            os.path.join('folder', folder2, 'WatashiNiYomimasu.txt'),
-            os.path.join('folder', folder3, 'Changes.txt'),
-            os.path.join('folder', folder3, 'fin'),
-            os.path.join('folder', folder3, 'MD5SUMS'),
-            os.path.join('folder', folder3, 'oops'),
-            os.path.join('folder', folder3, 'WatashiNiYomimasu.txt'),
-            os.path.join('folder', folder3, 'ZuMachen.txt'),
-            os.path.join('folder', 'third_party', 'WatashiNiYomimasu.txt'),
-            os.path.join('folder', 'lalala.txt'),
-            os.path.join('folder', 'quest.txt'),
-            # The example will have a deleted file
-            #  (or should) but shouldn't return it
-        ])
-        self.assertEqual(set(x for x in walk_revctrl()), expected)
-
 
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py
deleted file mode 100644
index 3340036210..0000000000
--- a/setuptools/tests/test_svn.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# -*- coding: utf-8 -*-
-"""svn tests"""
-
-import io
-import os
-import subprocess
-import sys
-import unittest
-from setuptools.tests import environment
-from setuptools.compat import unicode, unichr
-
-from setuptools import svn_utils
-from setuptools.tests.py26compat import skipIf
-
-
-def _do_svn_check():
-    try:
-        subprocess.check_call(["svn", "--version"],
-                              shell=(sys.platform == 'win32'))
-        return True
-    except (OSError, subprocess.CalledProcessError):
-        return False
-_svn_check = _do_svn_check()
-
-
-class TestSvnVersion(unittest.TestCase):
-
-    def test_no_svn_found(self):
-        path_variable = None
-        for env in os.environ:
-            if env.lower() == 'path':
-                path_variable = env
-
-        if path_variable is None:
-            try:
-                self.skipTest('Cannot figure out how to modify path')
-            except AttributeError:  # PY26 doesn't have this
-                return
-
-        old_path = os.environ[path_variable]
-        os.environ[path_variable] = ''
-        try:
-            version = svn_utils.SvnInfo.get_svn_version()
-            self.assertEqual(version, '')
-        finally:
-            os.environ[path_variable] = old_path
-
-    @skipIf(not _svn_check, "No SVN to text, in the first place")
-    def test_svn_should_exist(self):
-        version = svn_utils.SvnInfo.get_svn_version()
-        self.assertNotEqual(version, '')
-
-def _read_utf8_file(path):
-    fileobj = None
-    try:
-        fileobj = io.open(path, 'r', encoding='utf-8')
-        data = fileobj.read()
-        return data
-    finally:
-        if fileobj:
-            fileobj.close()
-
-
-class ParserInfoXML(unittest.TestCase):
-
-    def parse_tester(self, svn_name, ext_spaces):
-        path = os.path.join('setuptools', 'tests',
-                            'svn_data', svn_name + '_info.xml')
-        #Remember these are pre-generated to test XML parsing
-        #  so these paths might not valid on your system
-        example_base = "%s_example" % svn_name
-
-        data = _read_utf8_file(path)
-
-        expected = set([
-            ("\\".join((example_base, 'a file')), 'file'),
-            ("\\".join((example_base, 'folder')), 'dir'),
-            ("\\".join((example_base, 'folder', 'lalala.txt')), 'file'),
-            ("\\".join((example_base, 'folder', 'quest.txt')), 'file'),
-            ])
-        self.assertEqual(set(x for x in svn_utils.parse_dir_entries(data)),
-                         expected)
-
-    def test_svn13(self):
-        self.parse_tester('svn13', False)
-
-    def test_svn14(self):
-        self.parse_tester('svn14', False)
-
-    def test_svn15(self):
-        self.parse_tester('svn15', False)
-
-    def test_svn16(self):
-        self.parse_tester('svn16', True)
-
-    def test_svn17(self):
-        self.parse_tester('svn17', True)
-
-    def test_svn18(self):
-        self.parse_tester('svn18', True)
-
-class ParserExternalXML(unittest.TestCase):
-
-    def parse_tester(self, svn_name, ext_spaces):
-        path = os.path.join('setuptools', 'tests',
-                            'svn_data', svn_name + '_ext_list.xml')
-        example_base = svn_name + '_example'
-        data = _read_utf8_file(path)
-
-        if ext_spaces:
-            folder2 = 'third party2'
-            folder3 = 'third party3'
-        else:
-            folder2 = 'third_party2'
-            folder3 = 'third_party3'
-
-        expected = set([
-            os.sep.join((example_base, folder2)),
-            os.sep.join((example_base, folder3)),
-            # folder is third_party大介
-            os.sep.join((example_base,
-                       unicode('third_party') +
-                       unichr(0x5927) + unichr(0x4ecb))),
-            os.sep.join((example_base, 'folder', folder2)),
-            os.sep.join((example_base, 'folder', folder3)),
-            os.sep.join((example_base, 'folder',
-                       unicode('third_party') +
-                       unichr(0x5927) + unichr(0x4ecb))),
-            ])
-
-        expected = set(os.path.normpath(x) for x in expected)
-        dir_base = os.sep.join(('C:', 'development', 'svn_example'))
-        self.assertEqual(set(x for x
-            in svn_utils.parse_externals_xml(data, dir_base)), expected)
-
-    def test_svn15(self):
-        self.parse_tester('svn15', False)
-
-    def test_svn16(self):
-        self.parse_tester('svn16', True)
-
-    def test_svn17(self):
-        self.parse_tester('svn17', True)
-
-    def test_svn18(self):
-        self.parse_tester('svn18', True)
-
-
-class ParseExternal(unittest.TestCase):
-
-    def parse_tester(self, svn_name, ext_spaces):
-        path = os.path.join('setuptools', 'tests',
-                            'svn_data', svn_name + '_ext_list.txt')
-        data = _read_utf8_file(path)
-
-        if ext_spaces:
-            expected = set(['third party2', 'third party3',
-                            'third party3b', 'third_party'])
-        else:
-            expected = set(['third_party2', 'third_party3', 'third_party'])
-
-        self.assertEqual(set(x for x in svn_utils.parse_external_prop(data)),
-                         expected)
-
-    def test_svn13(self):
-        self.parse_tester('svn13', False)
-
-    def test_svn14(self):
-        self.parse_tester('svn14', False)
-
-    def test_svn15(self):
-        self.parse_tester('svn15', False)
-
-    def test_svn16(self):
-        self.parse_tester('svn16', True)
-
-    def test_svn17(self):
-        self.parse_tester('svn17', True)
-
-    def test_svn18(self):
-        self.parse_tester('svn18', True)
-
-
-class TestSvn(environment.ZippedEnvironment):
-
-    def setUp(self):
-        version = svn_utils.SvnInfo.get_svn_version()
-        if not version:  # empty or null
-            self.dataname = None
-            self.datafile = None
-            return
-
-        self.base_version = tuple([int(x) for x in version.split('.')[:2]])
-
-        if self.base_version < (1,3):
-            raise ValueError('Insufficient SVN Version %s' % version)
-        elif self.base_version >= (1,9):
-            #trying the latest version
-            self.base_version = (1,8)
-
-        self.dataname = "svn%i%i_example" % self.base_version
-        self.datafile = os.path.join('setuptools', 'tests',
-                                     'svn_data', self.dataname + ".zip")
-        super(TestSvn, self).setUp()
-
-    @skipIf(not _svn_check, "No SVN to text, in the first place")
-    def test_revision(self):
-        rev = svn_utils.SvnInfo.load('.').get_revision()
-        self.assertEqual(rev, 6)
-
-    @skipIf(not _svn_check, "No SVN to text, in the first place")
-    def test_entries(self):
-        expected = set([
-            (os.path.join('a file'), 'file'),
-            (os.path.join('folder'), 'dir'),
-            (os.path.join('folder', 'lalala.txt'), 'file'),
-            (os.path.join('folder', 'quest.txt'), 'file'),
-            #The example will have a deleted file (or should)
-            #but shouldn't return it
-            ])
-        info = svn_utils.SvnInfo.load('.')
-        self.assertEqual(set(x for x in info.entries), expected)
-
-    @skipIf(not _svn_check, "No SVN to text, in the first place")
-    def test_externals(self):
-        if self.base_version >= (1,6):
-            folder2 = 'third party2'
-            folder3 = 'third party3'
-        else:
-            folder2 = 'third_party2'
-            folder3 = 'third_party3'
-
-        expected = set([
-            os.path.join(folder2),
-            os.path.join(folder3),
-            os.path.join('third_party'),
-            os.path.join('folder', folder2),
-            os.path.join('folder', folder3),
-            os.path.join('folder', 'third_party'),
-            ])
-        info = svn_utils.SvnInfo.load('.')
-        self.assertEqual(set([x for x in info.externals]), expected)
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)

From 34d86a4756527e546e6dfa3312548072109eb60d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 09:37:54 -0500
Subject: [PATCH 4547/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index be20e66839..c0ed23a2e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+---
+9.0
+---
+
+* Issue #313: Removed built-in support for subversion. Projects wishing to
+  retain support for subversion will need to use a third party library. The
+  extant implementation is being ported to setuptools_svn, to be announced.
+
 ---
 8.3
 ---

From 022f37cb1b0cb2e15dc59a723731f5e7f65ea6ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 09:50:31 -0500
Subject: [PATCH 4548/8469] Move api_tests to pkg_resources package. Fixes
 #312.

---
 {tests => pkg_resources}/api_tests.txt | 0
 setuptools/tests/__init__.py           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {tests => pkg_resources}/api_tests.txt (100%)

diff --git a/tests/api_tests.txt b/pkg_resources/api_tests.txt
similarity index 100%
rename from tests/api_tests.txt
rename to pkg_resources/api_tests.txt
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index d6a4542eca..48b29c4ced 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -20,7 +20,7 @@
 def additional_tests():
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
-            os.path.join('tests', 'api_tests.txt'),
+            'api_tests.txt',
             optionflags=doctest.ELLIPSIS, package='pkg_resources',
             ),
         ))

From 1d9a53fdf0f2815403bd27cde016ec388d0522f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 10:19:31 -0500
Subject: [PATCH 4549/8469] Update API docs to reflect relocation of
 pkg_resources from module to package.

---
 pkg_resources/api_tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 65dba76d0a..50e04b8737 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -171,7 +171,7 @@ You can append a path entry to a working set using ``add_entry()``::
     ['http://example.com/something']
     >>> ws.add_entry(pkg_resources.__file__)
     >>> ws.entries
-    ['http://example.com/something', '...pkg_resources.py...']
+    ['http://example.com/something', '...pkg_resources...']
 
 Multiple additions result in multiple entries, even if the entry is already in
 the working set (because ``sys.path`` can contain the same entry more than

From bcb22ab7ceda678893d8b1b6f1cce52cada7aad2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 10:27:47 -0500
Subject: [PATCH 4550/8469] Include api_tests.txt in pytest invocation. Ref
 #312. Ref #311.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 74a172a47a..24dd949d17 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,5 @@ formats = gztar zip
 universal=1
 
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=tests/api_tests.txt
 norecursedirs=dist build *.egg

From ca7a37ea113e71e32e32e9f0ed02371c7cf17da5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 10:45:27 -0500
Subject: [PATCH 4551/8469] Run bootstrap in order to purge the file finder
 from the egg_info (until travis is using Setuptoools 9.0).

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0b685c1ab5..5f644e00a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ python:
   - pypy
 # command to run tests
 script:
+ # invoke bootstrap and override egg_info based on setup.py in checkout
+ - python bootstrap.py
  - python setup.py egg_info
+
  - python setup.py ptr
  - python ez_setup.py --version 7.0

From 9dfcbd945d5d93f75a62228deabdf6c7eff02213 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 12:35:38 -0500
Subject: [PATCH 4552/8469] Removing test data

---
 setuptools/tests/entries-v10                 | 615 -------------------
 setuptools/tests/svn_data/dummy.zip          | Bin 1771 -> 0 bytes
 setuptools/tests/svn_data/dummy13.zip        | Bin 9243 -> 0 bytes
 setuptools/tests/svn_data/dummy14.zip        | Bin 7496 -> 0 bytes
 setuptools/tests/svn_data/dummy15.zip        | Bin 7506 -> 0 bytes
 setuptools/tests/svn_data/dummy16.zip        | Bin 7155 -> 0 bytes
 setuptools/tests/svn_data/dummy17.zip        | Bin 7512 -> 0 bytes
 setuptools/tests/svn_data/dummy18.zip        | Bin 7639 -> 0 bytes
 setuptools/tests/svn_data/svn13_example.zip  | Bin 48818 -> 0 bytes
 setuptools/tests/svn_data/svn13_ext_list.txt |   3 -
 setuptools/tests/svn_data/svn13_ext_list.xml |   0
 setuptools/tests/svn_data/svn13_info.xml     | 121 ----
 setuptools/tests/svn_data/svn14_example.zip  | Bin 31077 -> 0 bytes
 setuptools/tests/svn_data/svn14_ext_list.txt |   4 -
 setuptools/tests/svn_data/svn14_ext_list.xml |   0
 setuptools/tests/svn_data/svn14_info.xml     | 119 ----
 setuptools/tests/svn_data/svn15_example.zip  | Bin 31143 -> 0 bytes
 setuptools/tests/svn_data/svn15_ext_list.txt |   4 -
 setuptools/tests/svn_data/svn15_ext_list.xml |  19 -
 setuptools/tests/svn_data/svn15_info.xml     | 125 ----
 setuptools/tests/svn_data/svn16_example.zip  | Bin 29418 -> 0 bytes
 setuptools/tests/svn_data/svn16_ext_list.txt |   4 -
 setuptools/tests/svn_data/svn16_ext_list.xml |  19 -
 setuptools/tests/svn_data/svn16_info.xml     | 125 ----
 setuptools/tests/svn_data/svn17_example.zip  | Bin 46954 -> 0 bytes
 setuptools/tests/svn_data/svn17_ext_list.txt |   4 -
 setuptools/tests/svn_data/svn17_ext_list.xml |  19 -
 setuptools/tests/svn_data/svn17_info.xml     | 130 ----
 setuptools/tests/svn_data/svn18_example.zip  | Bin 47477 -> 0 bytes
 setuptools/tests/svn_data/svn18_ext_list.txt |   4 -
 setuptools/tests/svn_data/svn18_ext_list.xml |  19 -
 setuptools/tests/svn_data/svn18_info.xml     | 136 ----
 32 files changed, 1470 deletions(-)
 delete mode 100644 setuptools/tests/entries-v10
 delete mode 100644 setuptools/tests/svn_data/dummy.zip
 delete mode 100644 setuptools/tests/svn_data/dummy13.zip
 delete mode 100644 setuptools/tests/svn_data/dummy14.zip
 delete mode 100644 setuptools/tests/svn_data/dummy15.zip
 delete mode 100644 setuptools/tests/svn_data/dummy16.zip
 delete mode 100644 setuptools/tests/svn_data/dummy17.zip
 delete mode 100644 setuptools/tests/svn_data/dummy18.zip
 delete mode 100644 setuptools/tests/svn_data/svn13_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn13_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn13_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn13_info.xml
 delete mode 100644 setuptools/tests/svn_data/svn14_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn14_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn14_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn14_info.xml
 delete mode 100644 setuptools/tests/svn_data/svn15_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn15_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn15_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn15_info.xml
 delete mode 100644 setuptools/tests/svn_data/svn16_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn16_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn16_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn16_info.xml
 delete mode 100644 setuptools/tests/svn_data/svn17_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn17_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn17_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn17_info.xml
 delete mode 100644 setuptools/tests/svn_data/svn18_example.zip
 delete mode 100644 setuptools/tests/svn_data/svn18_ext_list.txt
 delete mode 100644 setuptools/tests/svn_data/svn18_ext_list.xml
 delete mode 100644 setuptools/tests/svn_data/svn18_info.xml

diff --git a/setuptools/tests/entries-v10 b/setuptools/tests/entries-v10
deleted file mode 100644
index 4446c50137..0000000000
--- a/setuptools/tests/entries-v10
+++ /dev/null
@@ -1,615 +0,0 @@
-10
-
-dir
-89001
-http://svn.python.org/projects/sandbox/branches/setuptools-0.6
-http://svn.python.org/projects
-
-
-
-2013-06-03T17:26:03.052972Z
-89000
-phillip.eby
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6015fed2-1504-0410-9fe1-9d1591cc4771
-
-api_tests.txt
-file
-
-
-
-
-2013-06-19T13:20:47.948712Z
-dec366372ca14fbeaeb26f492bcf5725
-2013-05-15T22:04:59.389374Z
-88997
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12312
-
-setuptools.egg-info
-dir
-
-README.txt
-file
-
-
-
-
-2013-06-19T13:20:47.948712Z
-26f0dd5d095522ba3ad999b6b6777b92
-2011-05-31T20:10:56.416725Z
-88846
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7615
-
-easy_install.py
-file
-
-
-
-
-2013-06-19T13:20:47.948712Z
-97b52fe7253bf4683f9f626f015eb72e
-2006-09-20T20:48:18.716070Z
-51935
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-126
-
-setuptools
-dir
-
-launcher.c
-file
-
-
-
-
-2013-06-19T13:20:47.924700Z
-e5a8e77de9022688b80f77fc6d742fee
-2009-10-19T21:03:29.785400Z
-75544
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7476
-
-ez_setup.py
-file
-
-
-
-
-2013-06-19T13:20:47.924700Z
-17e8ec5e08faccfcb08b5f8d5167ca14
-2011-01-20T18:50:00.815420Z
-88124
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8350
-
-version
-file
-
-
-
-
-2013-06-19T13:20:47.924700Z
-e456da09e0c9e224a56302f8316b6dbf
-2007-01-09T19:21:05.921317Z
-53317
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1143
-
-setup.py
-file
-
-
-
-
-2013-06-19T13:20:47.924700Z
-d4e5b3c16bd61bfef6c0bb9377a3a3ea
-2013-05-15T22:04:59.389374Z
-88997
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5228
-
-release.sh
-file
-
-
-
-
-2013-06-19T13:20:47.932704Z
-b1fd4054a1c107ff0f27baacd97be94c
-2009-10-28T17:12:45.227140Z
-75925
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1044
-
-pkg_resources.txt
-file
-
-
-
-
-2013-06-19T13:20:47.928702Z
-f497e7c92a4de207cbd9ab1943f93388
-2009-10-12T20:00:02.336146Z
-75385
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-94518
-
-site.py
-file
-
-
-
-
-2013-06-19T13:20:47.932704Z
-ebaac6fb6525f77ca950d22e6f8315df
-2006-03-11T00:39:09.666740Z
-42965
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2362
-
-version.dat
-file
-
-
-
-
-2013-06-19T13:20:47.932704Z
-8e14ecea32b9874cd7d29277494554c0
-2009-10-28T17:12:45.227140Z
-75925
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-80
-
-virtual-python.py
-file
-
-
-
-
-2013-06-19T13:20:47.932704Z
-aa857add3b5563238f0a904187f5ded9
-2005-10-17T02:26:39.000000Z
-41262
-pje
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3898
-
-setup.cfg
-file
-
-
-
-
-2013-06-19T13:20:47.932704Z
-eda883e744fce83f8107ad8dc8303536
-2006-09-21T22:26:48.050256Z
-51965
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-296
-
-setuptools.txt
-file
-
-
-
-
-2013-06-19T13:20:47.940708Z
-11926256f06046b196eaf814772504e7
-2013-05-15T22:04:59.389374Z
-88997
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-149832
-
-pkg_resources.py
-file
-
-
-
-
-2013-06-19T13:20:47.940708Z
-b63a30f5f0f0225a788c2c0e3430b3cf
-2013-05-15T22:04:59.389374Z
-88997
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-90397
-
-tests
-dir
-
-wikiup.cfg
-file
-
-
-
-
-2013-06-19T13:20:47.944710Z
-34ad845a5e0a0b46458557fa910bf429
-2008-08-21T17:23:50.797633Z
-65935
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-136
-
-EasyInstall.txt
-file
-
-
-
-
-2013-06-19T13:20:47.944710Z
-e97387c517f70fc18a377e42d19d64d4
-2013-05-15T22:04:59.389374Z
-88997
-phillip.eby
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-82495
-
diff --git a/setuptools/tests/svn_data/dummy.zip b/setuptools/tests/svn_data/dummy.zip
deleted file mode 100644
index 1347be53eb29eb8e4b9e0afe82372630708b3092..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1771
zcmWIWW@Zs#00GOn>CRvVlwbqWDW$o&mHGidHC$j(rCF$I1mS9&JskbqU4!*XDoSuG
z7egrb_X`Q~bP5ge4}$A~I3pU(89Z=3gd79X4^aalOHzwV@ViGGO-FouW?p7Ve7s&k
zC2mh3{OsWw40L}aemi*KcKCQYyZQyYf=mWEm4o3rFf^mW7Tt>n@;ZSSVY08IpQoE^
zaEM-JUTn`^t_B4O*Ybnq8GNr~fBp1WC~~DOtyn<mkjbmJn-3~Zx1LjMS#~`-!q;&{
zNQ}<b{kCqLTp7PO|E*Exm3By*V62*9ecUC@?H1$YhKa^jJ1)m9^ID~I>b>;$3WF*}
z-2N1RJ3PqM(Z$yl)tizaw{P54;Q~|z!hCSm#i=Ew1;7wYE6UGR0CP(6^K*(7GII;^
zi%K9Oyj)-jjl9I%R9kg$bgAnol%*CGXXfYGsvGDT>KUqQ@^S@uGcwsT;7Xq=Ks!MI
z<WdlTL^~IQ0+`3hAi=OEB5<SfopX#Znoa*~CWsF)7gw5wnF}%p#D<uQl){m%cy+Pc
zS^;Qe&^JG@RWKT#6=GmxL9SE);$R?#T7i};h_?q<-hp`q6h!TCdoTkkXj;j2P{6?G
zACrB+zQN}U5foo+L^B<h`>^=|W;%?<XNx$BEsxP`LCUd|S|o^Kkpv?wQjl^vHY;H9
z4Wse-g%`yNceoYMl7V>Rag`si=vDv*QxV*Fq|yZ0iVJgU*%Xm72P~7|^ML@04;YwW
zfrKa`kZpkF4VcL=8rcTSf&|$UdT<+H#R{_dRdK(JKzR>lE{qQFW(Cz=4BS9y&ceVj
J4`>Pl0|35xlF|SG

diff --git a/setuptools/tests/svn_data/dummy13.zip b/setuptools/tests/svn_data/dummy13.zip
deleted file mode 100644
index 47764342d7c76f44ef5f210abc609f4c6a268574..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9243
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
L$99AFwu1ix{F!sx

diff --git a/setuptools/tests/svn_data/dummy14.zip b/setuptools/tests/svn_data/dummy14.zip
deleted file mode 100644
index 02ed8cf08457e9183d39aadddf6688be2f728a52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7496
zcmc&(4Nz276y6mvTtN{HP*OofNVa7$)WjI&XAwhw<R?K*L|t@|WszM4$;=>?R0u;*
z)UqtGA2AhwDnr9e$r?m0NyR8DEzK~e)X34^ean6Kyu0^3n9-Tu%zAim@A>XI=Q}@l
zjf=AD+E;;|v9He!<9}%X$AOb`78;F<0|NcygjE&PDkrc?V_uXcEOk(nb4zzW`eS{P
zQlaSEmHW_3^;wo2gWg<Q_Epvqt+Vd-v*WgoE7dL?y1(Y_K;v3f<ajszmE*~wPF{nR
zbuCSElJ<q_%TtQIPX^yUF<V#EGSH!PSM@IU;)sE<$=5xa(=Ha@U2x#wW4q2J{CR(Q
zvZHUTZ}j-;mt3d2R!-WsRb3bzel#O?;i*x-?yt)K^j6*<H{v$Ee?4~OR#RC<>!JEr
zZx)zW#td^<<sGp~y<4-|`OAHF^S4!Oe!BF)ZyB}8ORFw^e67}{t*Ljp{f$7k(wfXZ
z%io*QF#l17+U}*P%6Zj|_TC$grhXpUx1g$EviDC~@8~Ao@Bdoj8>akHTL0yRyn9o3
zu8285D>w7><(y5GZlT-NC-a9jMFb6cx!ifL)4OBBw!hOoaCFJszciQU1f=?Jj~(=<
z{*jXxT5tWGdvxijH)2yyd>eG}?C2-7uFFqf+hZ4AK66j$w8V<a>4kGc3vUcGXY89D
z(V|aFDcLgjm&UroN)$1bHIiHy`cEj^--UZapFVUL(oH$WG|N*e5@ZDxWH)+Cc8)3g
ziCJl8y%2701+~cr2W>Kg4TvAyHsP^BvFP(G1jTC2;Em!<e%yA<Ql5WgQ&?n3%miJ6
z#*$}2f8jL|x6q2TGKykj65}U^CMCwkcUGIsu_7lXaEekoc`P64V@;YEri)3?iEKkT
z=AdZeoHX^>t>33|Z?AA4nbSmv#7vCPB_wJLS%RYH*3_z&dAjRz>vHGyygH!mpUAiR
zezPLo>^%5L;MMCjbzbYoZZ?lu)HE$QI^^BN>FRxlgCn}D=CyUdw_}Kt$N2QpC%xy5
zJszGOab8)rZ0(alADx*|_00R~6RjS%^R)SZnsf|?OB)-n3ki?bNjR+^vUm3<dEwlC
z^zoI}W7b<1W^1w+3&y7Bn2etMZ!IQMrrFbA%r@m%tiN$m@qh5mN;B$%eR!Jrs67|y
zbIb-)R<Ms&6QBw3dE5zP4$bM_HYYJ=gA|~1#)GxIGs$L~I~-0&3CBbu`6HbxFttIJ
zNpElmc7;*dM9R)Asvz_PyLjgV&(VDd9?7~EMOfHi?MB)jkG=dMr*sY1k^0*x=QrS<
z)DTi~MC)kZSo?+7<u1nSKfGmV2>9S!V&g~g;Tt20L$aS&sZ%~veRyb_f2~QmBzf6P
z$H~*r1kPx1xuPx`YP@UMxO4T-m3Jyz&dv-j+*@5VeD8~qCFcUZ&8**l_`ct|q^6iL
zK2!EMrVV=Wj}*=DsPo5f-g&LaKWX#IA(?NshN;fqUbyt;jf}W!+0$CxbJIsYU3Q?b
z_4lGYZT;z#qdRLxtf`3h8|2u$?3q(j{o8amyAjVLAHr(ik8P%H&8M9|fW47LMtZ9R
zW=C|CK<o@5HSEKZtror6B2hf(A{5Y(uGCaRmcf#m3abbqF<k**W&&bbM0J4npqIoM
z+LM|zMeFEBZ<q39Cu)KWGVvy%8|^$-n}cJ|OYgCz3-GY?Hkk3Cr%G?=1<uyqJJDix
z%Y@oNkNn?SqYF4Z>4n5tx&=Ce^|<FfoK~moGL9eRSvQ8E94dMcI(m4*bN2_8!jpej
zD%=$o*Y!0+nj4f@?x_CEgx=$#h-SLFJ1MYc<cDEEGhei!`bE86+=p`Nu(Varx|v}0
zi2jpl_3b?YqKrEBg&RV_vVYzI{@rSX)Zh(KzEcwS@J3imG6ca#rzP|hJwdn$o<cF`
z!43R420REU-wz7ZM+7vU1!NY*owfqMLu+h{Cw3XKW&sUCDiX8?#{^3;kkmB-10e=f
zNdtj#2RW3l#1Q=IsnugWIb!6;ujL7GtayzLG3cVH6<mqHTV=qh(Mk3MMT<A^$XG&Z
z(kJi}ogmnbVh!;#D73QRGrAV?;8@Cm`-s3-NQ2WC9+uxT{Z{e7SQ2)zu0=5DUr7Ul
z2Eeqsaq|n^ytttIZaLIxmk$?NZSE@Ra#HP?*qCsaE^L&<rkjJW2>YNkHtrlu<op?J
zBM{Ybo?*%pmn-=1fH+PIPj3MkCA7|-wwjwzU{nRwSE2@^aw|?{>+nNYKo1dwg$42O
zs-U>sR!f0BcqJ5Db%_N;vXtdQ>`Ji<+0~HLc26!!9^FWkK>33pn1ucJuH$<<mU3zD
zF2o6eOoAX(nPVa0=>bbfI(i)LDIg)z6#yjbKo0c>Wn5@R(+HMgORS8erxW5XG@b0U
z(T}o6L~A^oV2Qzq5v=<vELJUS5XPj^Jo|ILE?`-ptmEHdXpqCimqv(n>=6=waD%a(
zSJr)fk@p=fiCGE-9h(87*xYABvGWysjh1q7{X}p<+;`k~JOY+kFRF5^z>pA%o?XP2
zEnq{ja~8)6OEDZfXElOlXo%R+5gfjjF)KSxXN_A0&lM~oXXp_kK!ks%BYbehlRX0N
z<5<dhTwIJNbY}(^UA$pvv5&D7`<i{f_7ZGG1!aje5SzGke&Ba#n|z)el!p|z8?2s|
z5RN9V*uq=Va1W2bu7XoNIj4@~ST0UY%vcyaOjKN@v6Le!DFFz_V1omg`JhmwF(9Zn
z0Th^{Ss=KpVJT-%FOlC)0g(22x$^*0UxnaqfULL&0Ki-fLGU<?PmiUX6)qwxN_vp!
zlld27;K*a$SV9bX>~$7l90C}4&V>kgyv3TajEl18nlJiK246)N?)!bMBYOJ}lq+)w

diff --git a/setuptools/tests/svn_data/dummy15.zip b/setuptools/tests/svn_data/dummy15.zip
deleted file mode 100644
index ed8daeeba491cf3e4807d75c208392d4baf68fdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7506
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
K_(%6Zr+)#7&13)o

diff --git a/setuptools/tests/svn_data/dummy16.zip b/setuptools/tests/svn_data/dummy16.zip
deleted file mode 100644
index b6e98d6c40a392cfd9c3f5413f5b91193f5d8a32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7155
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
WiS0;tM09KKMfIcee=n_vqW%G27!pVT

diff --git a/setuptools/tests/svn_data/dummy17.zip b/setuptools/tests/svn_data/dummy17.zip
deleted file mode 100644
index d96e15133499e6e6606d2c5893cd230e9a5508bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7512
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

diff --git a/setuptools/tests/svn_data/dummy18.zip b/setuptools/tests/svn_data/dummy18.zip
deleted file mode 100644
index a72678384d629814afd32ae1afd2eb72631ac9b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7639
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
VVK)^a4`dvKzbab7-np@f{RgV$yHfxF

diff --git a/setuptools/tests/svn_data/svn13_example.zip b/setuptools/tests/svn_data/svn13_example.zip
deleted file mode 100644
index d85fb84f2ba03bc03ab2386b40e244924c614d36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48818
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

diff --git a/setuptools/tests/svn_data/svn13_ext_list.txt b/setuptools/tests/svn_data/svn13_ext_list.txt
deleted file mode 100644
index 0bb0f43809..0000000000
--- a/setuptools/tests/svn_data/svn13_ext_list.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party3 file:///C:/development/svn_example/repos/svn13/extra1
-third_party2 -r3 file:///C:/development/svn_example/repos/svn13/extra1
-third_party -r1 file:///C:/development/svn_example/repos/svn13/extra1
diff --git a/setuptools/tests/svn_data/svn13_ext_list.xml b/setuptools/tests/svn_data/svn13_ext_list.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setuptools/tests/svn_data/svn13_info.xml b/setuptools/tests/svn_data/svn13_info.xml
deleted file mode 100644
index 5c96520ab4..0000000000
--- a/setuptools/tests/svn_data/svn13_info.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<info>
-<entry
-   kind="dir"
-   path="svn13_example"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<prop-updated>2013-07-13T15:33:23.187500Z</prop-updated>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:33:28.359375Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn13_example\a file"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main/a%20file</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:33:21.109375Z</text-updated>
-<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:33:21.312500Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn13_example\to_delete"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main/to_delete</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>delete</schedule>
-<text-updated>2013-07-13T15:33:28.140625Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:33:28.359375Z</date>
-</commit>
-</entry>
-<entry
-   kind="dir"
-   path="svn13_example\folder"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main/folder</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<prop-updated>2013-07-13T15:33:26.187500Z</prop-updated>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:33:26.312500Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn13_example\folder\quest.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main/folder/quest.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:33:20.109375Z</text-updated>
-<checksum>795240c6a830c14f83961e57e07dad12</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:33:20.312500Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn13_example\folder\lalala.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn13/main/folder/lalala.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn13/main</root>
-<uuid>d2996769-47b0-9946-b618-da1aa3eceda3</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:33:19.375000Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:33:19.609375Z</date>
-</commit>
-</entry>
-</info>
diff --git a/setuptools/tests/svn_data/svn14_example.zip b/setuptools/tests/svn_data/svn14_example.zip
deleted file mode 100644
index 57093c0b7cc51ace56f71c7eadb4c450c6814493..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31077
zcmdsfd0b8T|Nl+2NQ)&)qN_qmi<TkE(vGP_L?lUaN1M78p@yhrFMA<N$T}M9Ae3du
zlI$Wwh6p2rvHQKxxxMdszu)KF)4B1-=leVJxL)@d=ly)G&-d%R&w1Y=gH;>15>dxM
z{}(Rwm%2Z6fQ(Cs>R}%oHZ>$NCL+vwh{Au{lJ#$`z@_pFG(;X?@ZnC2+#<n0d<i~c
z?h7VJVl880qhl<`hs1^Ly3nKP92-542gyE5wYvY_<6>4qqQ%Mb5skiX)C*nJ_)10l
zK9l#(d{q=Eag}Jd9-Y?sNz47)lTyqUXTJ%OW+iS)J6B@+@6Fi7`pNU`TpquUzjfEp
zd8FP-Y3s;CBOkt5zU|uJj^i>nMw`EhPL_(GZ5p&6j*C{@(NqzMR2qpy2HdKKMM+~N
zVR38yjzpE%G`l-*hFfy~=5Gr-@A)#<XH=t68;5Mlv>fTN<no?eodL6&x%blO-9o*x
zgJu8R5!GVv)oPbMoIPQ3&&>MoLI0kqi7YC+7d*I2(a=%PDx0qf{$hXpw4}42S(<ap
zXTw$vcsigu`;3o)Q_oIe6@QfmjJT2S|EoubUpCl$m~r=;^!}u^Gk5FSw>*9Rb&H}0
zm-W`^Cspk;EqQ)x`j!QYB3gCYJJ#K}AS<!=NtMr25>*#J$@kjVb(YWD$IXgb26?9C
zzCF|4e^OA!qch|DG@o7@To`+CyvdGxA)^mjuJl@c;K`-n_qH9c6rXJEd(HTc-dgXB
zO>Xy0#l6G3neGVl{r2ZOk>uRc8(&^(f2JMS6u3$x>H}hJ;F)~@_)bK9+JO(ANOW>c
zjE;>Ak@ji|JuedVCNi)C_l5EVk>?ltQU#dQrE$n*UcwNiVN<1aO466gtaJyL9;xi-
zp$(LzKHa&MWiAa7Pn1N2QKr*F8AnFPhKVP}M;VK?X&=ajB{j0HZ&+z`@Px34Fex)K
z<504s+b9?;G6wMp6+ZCq<VPp)jU#+ga1mD|$jcQ35nj$04IX61t(3Lg5us=eS6mhX
zmgi;s=SkSD&$@hKbi{<PSj1Iiu-H^lcL~9U6x0Z>=s%(W1jUA36+zM05u~`cX{t>t
zj|X4+x{uAf+a<wlRE19y&j8K$^IaA^=#o)%Y)V|~o2pMfSp@k7&OW`S)5#BR3vDm=
z{5xdX?u9<DM-(K#`R&5zy>~-qt*@H1<nRp35k1{?Tc2|5;C>vi;)T^V&pP$Aalg_=
z|Ks)GJ1Q`hG(?oCousb1YJe3#fDb!1sHu<~7vCFn%0_SQKk7!sZM^J0OwOwO*mUfR
zg%h$hTmK#z`LJ+t^pOnXR*f&;y`XCpzDU)ps;Tp%y=5mHQw*kVv{*jvaM`t~$9$}%
zS}XJQf+eeKiU2tl_o{VT=~k06<d!L5$Q7DzyI;tABc8C;>0Np5i4)}pN7K%)h#zZy
zB26cLL$9>ghyIgJ-siL7+9&(w`RC6Y-v8@n^W;{$Y6G)EUPh=6^XQt;x`*A47EApd
zr>=dVQrU0Yf!+7+IO`jJop+#R_40dP_f>i=+^g#o(yDi#zo!p4)8bC6tR<eW61@(m
z-*p;%tH%0jQMOvowPMNAF+W#^o%-F)yRuW#KV}oR=I6WKGV63vZNBwYUnWD{fD=(>
z6!XTNO_0>};1c;^3clePjs}6NI>`~l^^SlRD0wwMK39#BBlP6OXGVw!q5iXyPL;|D
z6nE>%r_Z|Rg2AZIPXY&>5+4>P#l|%DijJ5j_KXdYL_k`Wkpo%j9r+<JLM3fBtM^(V
zk*mk|b?nR+z54ZF{Es^u7$854z&FkuWI~2tj7CbK8|9%<7!i`L6%vwkk|cIQa7;+7
zbQ(h4<mJYS%s?);MXo0kLLr4?*Aw#qHOS$=E~T3TLJbD3l9eDO=s_UEE-m#bvC(t?
zZ$!V@Mqc9=uRnJnqI8Sct>+{|Uy0k;Oz-QL&lc#7zv6y6;&a)UwbR25LpO|GHR0^;
zty{Klj~v#d_pp8!RTmayKB--6)$4-uaIK5O#-z;IUY*r?PRjOJl{STc9ngC{s@h|F
znrpYoQT>eyS3Bn4&35q4EqL);%E*64d6#C)JX++jQEz_oFa2(>k8OP=bab1*gZ?A^
z|LC8!L8MV`{vzM+#7_~^i)&NIueN%+X4btorV|SCMHh9OIW^kQ=Ei|tf8E}C)n#C)
zYCxB3L+)#s4w5)L*)dgnS;3xFHtYV_`ZChs50$E$9cF~(289oOk~-PKw3npulCJws
z#`>;{6DOu#PEj{cet*RCSjz1e|Crp!>{H;hFK>ZEmpN5eMhzaMF<jmA<s$v4TRoX1
zq(YCfu%&RXvniR(qaMNs<EnCUI3;wWhC|Dp97+kzxayu7?nUy&_N{?|)W==8q0Dfu
zlR~1x!{Ttx9WY@+*aR{1zfkJc5K+K|?J6(L1%SoiGoT^B-fj-VhI<c_PaexJ?rmCZ
zqxb8BpjRDoJ3NY&#1%|V3}~+NsNC>C*}l`K%FhP8(KI~%_qTSbd4p`+g2F|HAMg0z
z@SAh~v|3KdUS~Vcp!nRCn}>y5s*&FGF1LNwX3NLloSLkz7`r9?@vz(Hlg}Qg^>_6?
zv+>}iJT?8y#sgGE+rRCZx!m}$kyS~gk89TFk3p4qN)9}DKanDJ>f_rG8v{b5A#sx=
zK9W(<k&?)exOm*nfTYE7(%AS=X*{^`2#J~?26r`Ku~8urapKr83F>qa-R=P$<c9_L
z#>w(*dZRjf$};Y*+CjO2gw%*KiOn%Bl69h_hD>tf;Y4diSQVocpkz&S6XeypBKRNA
zeT6L{mTH{IZmd*}lYtk~0@xv`-H;Z*&YGhIsQ$L6Y&vKGepeON0@Mv6ZvnicD!?+?
ze=a&#wEi?sFX<O~b=Q%B^EcjZ<r?d+wY>95|3*f~{l~Wr(wL>U+iP}oWlzI^;RVP2
zw><ket740!V?~!*3*D<T9#4_Hu6ducN4icu%F4-i+Oeg#Ud12Qn~`O%HOGJdZ~Oi4
z=SS%ua4{Ovw(Q~IIjdLZAMN&YPWU2c?cf_TH+--yUvl5aB<}oMo72ayr<9J`*#FAS
zK+oNl8+OkdzFj4&a9gUa#&uT*@3>^G;K;P4&+>-ccKF$4HMnhxcWJEmXQk$YV^y~t
z8<+O!J#AY@U;D2QW{lij+Sj6Sqb=fH3;i;OUX;u`f6KJYR5!WAT-U;U#QTXelO2aT
z)gE%)F>}`7u{xROrf(Xlx-8Z({?*W7qHx1Z?Z{a(&jpM-DoH7K`EV_zCdK>7*PlOx
z9S@!su=&oQCO+*n4Oc}J8pr50x)u5U^gZkQUryU6Pn!O1>*a;5|JiiCXGQIf<d0Kk
z+zEeUmRl@pUN$mx=(FD8mYbGUXIDJeefgyzr`8Cscx8Kvx-kBjo}z9rA$%!>jgaBK
zx2LEZN(fI1=_y#lA+#x<-i;OVr);T+EPZDI{K*2ID2b8-!U?Zo?Fwt?{{!s`@R<DQ
z3%=FY9k6VS2JI^5KPEKFwnD72IcEnsn9ym0Q7B!kW84-PNqsyTVr*c%cSz`@uqeDG
zGZzOY5y$tpVbB@h-G(6p3857sZ5S~mAGHW+!;s;G(2FqQL-<5l8tE)3H2`lYrVAmR
zoSpUmZYKvkAV0c*Z}rmx#RK?6ik82SZqUw}v);e2%!RDQ*jb}>ZLD-T3vm!v!<b;N
z`{_DxZX#$Jg(S6X4A?I&KIQ`!<>ySV={UPh%;(>y<Q~f3>f%zC7k^YktLxtJap$Y5
zj$}T}yz2dXzcovX+O^Y~5}rBpw40Ac?Q^$0yL?OQeIxuX)pYG}=#ks_tw)!adcK{#
z=#NdwHrF@jH?pz}c(r{&YURM&Cr#BO`x^Ybd;he+Gs}ODJM~6-d-R%j`oj*7weT}@
ziu_mi)7C4-Nx5C4F8q9Vd~~lCjd#b3D%$J1?zuhhSjg$u9fBWzI&i8<X>`Eiq{xz}
z@@~~?J3K0?$Nl1Ju%rKC8#C{9Woj1A)4Dk<O!V)ww;!HBXeY*gE?2ikj@(Yj{8N7;
zW+Nb>Wn&2;OyQbQqw#U2aJ>}KBwBJlf~{mm<19d>CtU8ec5~tS@XmSmN{u5Vf=c*Z
zz`}!a`Z2!8b03YQ!UrK}?sJAtD0j*tM!nquoGU-r&p}Z@IQfBAiny*l7y+L!kn8wX
z-^KhFQi&+PahE;IOw3QbX$I)iA1u4G*X}V``f5m?OP#6LJ?18ENUv@Zk-c%JQM7wj
zkHJ^1Mm4>&u_A9#=q-;WRRKD^TTS{^?Qc`fq|cQm$A;G0m=AriA$z-7=J4Tej)M~o
z7L{K<Eq!_aQSsRg+2fZzu(!1Knmgw4(%SXg{SB7b#<VNfTA}YZcS&}qfa1QZ+dX#t
zGH}f=2AdsY{yUVL9e8Hlk*7&D?hlv6Z+$%Mi`ffr*A~4(O?sPzi$gDGjq<cK&bYqf
zT590Tm~U3Y`UXFqtQKFAU7!~i`sI4|?onDdtH)dw|9ZX1&Gm-6%};6_lGSG~Y5A;0
z>)IA(e(QVs*1UL}yzR+P9{)5N7g-*Yx3@U$*_t&5vr|V8S)ct*^GLvZ?R&dR@6{yy
zr+#JY?XJyJXSF?%|L#UFo$B$E7S6AB&3RqX=iR%!BIIolD#j=uv*$dvv)N2cW(u1V
z*rRY&FgcD8ZAkVd#}J|mSG7{(psR%JyC}9z%s5D!%J8hh+g_?pWp81bYzWOr24@Gs
zr?-HzVGvn2r5F0>6x%ctm35fcM>?_prSuuMhCKbVI70LGyjdHx^%rh8G}81r@qR`6
znt@t-U-#|Y<S%J2v&p%a#|16wop9u9#;UO8wGO^R%^w!7$gyAZ*so~Fmh2JtH|u@s
zx;(x6r#sIQQfIw%R5u#1*WpJ0SeF|%Ij8iTKTiuzzxu)U^D|wB^(a4XX;ib3YMrSM
z`(~cck3-!DxOuzd_ho=C6fTw5y$lz}f1}2JI?JI0Hd~Qd#qK}3M-Y<bf-;n2hH9uz
zOwQm@LbJV|%0tpy@m&~qR<qY}G0(w!r~lFHW#2<$+B50OJ4JJ6DH%`R`Ic{~Tg*os
zb$8`(nwQPD2dY)hMu7R&0jzQJ&bM_}!}&I=lv><&|Ie-O#(v_-X?71?j~HJn*C^YZ
z6VbG9+Acr$*4;b3da`nms!9K5r~cgOH9P%@&cLnyl}5w2o=;v<6j@PGbn&%uNl4O)
zDUv5EYggtL|7-6xec4l+Jr-WOa#w_&upYYKUhFWg{btYSNgF%9O^Z+$`8r(K*FD}h
z?BleoeYzzF<HtxG7lo_}4&UUpF6Y6LuiF#zJ9KSfwC2Rd_Jz&7V+I(67KmrJjr6*=
z?d+!)UnV+Q?$O?+HS3V)UA<>f+WyArt&X%>n%T8xe)tQU!w>B?H-57rM}OkNO9{T2
zH>0+{e&^dZrF6#J{p)sFYzr-GVH}v#qEXuyy(ifIq?+@5|F=m^QWovJzq8-VqUglL
zn}dVQ9Q)L$n6zwZYBH;v$Drm%=MEm4m{xmy-<mVN5o7NEvE{;o+xgFfR5A=k9#wr+
zInaF3{^b@$=N8_HJd(ctNP5izm9~ZIqjP#hq<ZGe49U6jVQ6&47@OjDTY6R@_fS-x
z2%fX+0`{GAcHJmK*o>Dska5sECNlGR8L@5*AuPr_XS2pZNKL?;-4qlVyGLgC^aww&
z5V_Z=DQ^hw16X7Jf6)i9tYV0j35_y+023`!^UfJ2Aac~F5BMm&qhaab@9XA^cOvFu
zH%VM*bV69HSUM?8OurT-iH;J3Y7^Vren$@iu^ZllAR`E=T0s@}y*&t`laT7Ihe?of
zRosIxaR;H6A05Frp15O6z+^S@_AkuZ@BhXA#m<^3Go|_$#>;4RQ5DAHWmryNVYcB_
z#D2dK;ajf7Sv%va>6d|GRJX&MV8p6ykEl~(J@@JR(*JB?(=1hc%ls_Mt8NA5Zf(zG
z>EG~B+co3!Z#iAuGtG{#X?HQZ^5BBgVc{npcV61k#mTYx(?OEbHi0|LZoW;`NjW#~
zl+QGagIalcn_hlB?ms{4*D(e<@70dEO3M?rb>H^&*tti66~3Wk&b4a2zGGC}CQ0y2
z^Zz0{XU^SfIit|XZ-n~hD{*@UPO%S+jdrd*`ByWsWQb~E%jwSj`X0|cl5}l)lXvs8
z5=24KMay@t58XF$nT_O{SxNt~RrVpP9!+}mKD}?(cTMoVAMGW0`&&f|vE=m4eoDd$
ziV#i`pbIq&Un3zv6Gcpf-m^OKWwOjG%rHz1HEgPqE!vT<ukaRAoeI3O1^Y<^D=2W+
z2eX-mdjV01R|U)!0ySbhi>ECbAl@7LhOwGTqkbZp`Q$zw9r`6ekP;$2>JM<>EZ0;d
zrvFw2Jdl3=TqU|P<&ug<A3a)%VzS0j=R*c79>1l0{1#vw_Hzg-t*n&;;o9Oy`HVU`
zflm<l;6~6O*xnWtF~&J<GG&Hsw=7y_sYcL}F^g-b9*U>|_?H8*?#2?uf-Z!zc=S5N
zg|exKy{Qew8VFXAIk05+L@1PDQ64=sDH*fad)Ye3qeW%IY;Guq?oc?G45Z|PYlp!d
zQw$e}r3eWD&rv9na&XJua6>WGiCSix`X-Xjk2;CN$zsOdqKC%JT9q?q3>>jx4@FPN
z=>7|ZerxquT8@9}O-q@vGIY{dYq?*kdPu7eoxQIQRiJE2F>U_Q@+wTC-X>Y4ja&gL
zkFF|E0MIH51Zx6H+|M%lBDef?!hkdybNjiDzhzSa3aPVlHC-d5L~SD>@l5jMhr|;X
zRy!$CI5L*Fg|ijIG1-J#*pTFHC3mVAMDHXEQkJbK3QST`qK1(#!s*LV=$WSp8M?Y>
z=P1nVZ&7p#LTUKn{UmY%BK>C|hoL4QJ4G<8dFZQuMiezRoa}mes!MPz*$a61=1Nn5
zK^;`xP3FZ?I3105{Vjqn_<v8(GRtNyEg4^OZIMKQJE|%0C2b_ftaRqkWZG6Jaa&~^
zLv1ZXn`^P$uavE!>U@yw$tkNqllCSl86!m^ax<H$9Fa<xO}vQQa}>0Tlzga+ofPWd
z^`hbxPa?r{K1AG36AeDkau@wb)ibnrp~O*{cmjjuM^CwTsd$D7L}hl~QMpAEELyO6
zWqPzC3wqdMQf5A*2)a@4Crpt)1S%rm#mA|~yV`8bAx`@b(&uOxNaE-y*Mkat2Tk5E
z5K|c}Bq;F!$fhzfz0EMZQT5{exD>||ZoMGn?@x2w-Us!f{<u^(l6zVVBHI<DA>L5e
z%{)wQbEPy)Z7BItnn@)JaDpO0c@Cp^Fm*|ZrY<?P;yuG2MR@2vGYYxRdnP^2LJ6l^
zK1gG^PpN8oDFD(IYyQmEM$nj0Za(c#pQD&$g?5!=Qd7H?mV!7UX4=XY7f@rZT;l1u
z56Z&lqX}Tybc=7EMW@?1;lLboFT{m%;@)uxKJX(rsQ99Duch2@imRVC6KptpB8G6J
zMEy>tR}VQn73-h01;cYw7W6nN`BY#$K&dcSITdj3B4Ob<A3W}XGU4#tBnFcnN?Zjd
z2hf)q+~q-_a==JOa1a<3kcSSOv!+2p7@dljdjCR8c+Pl+YYz%q8mk(j7WvQ*tybx+
za9S1UDR?eZiSZQrYN9XZsTtsB8#w8nO%sf#IA2_BpwGB=yh5K*$*c|j5UL>2c0dk+
z5*9TRFd3Hs6#3yG_YMU<LOF2mf`+i9<WmE$r~>8Hz>AuMhUa`L;GTG|oC-{?py>)L
z2TEKGCSB3OW~faJ0y4O{kZeFI8HI<{K}yC8>;mp4&j$*Ary%&cibbKJ#jsG}xeS`I
z94%Dl7KDPH3MTdX>wvQ|xfFp4K*{)kT@!dSQ!79bJFJ;`B^pAr6qMqZPV_m7$=}TM
z06%kApYe51piyI!X2#IX43unOSu=xg1BUEFO(Y4zfjOEPhzli-&qQ5uGvll;*l>0;
zlQg6s?PpS=e&=syGKIr)b04&rlzb{M6;Dy{ZRJ$Jd5?sJ=X~%u^_qfT+z^;~+?)rK
z9!gvVCI?W?!<(77hNys0Am_wvrSC@PhLh7^TEcUgXBf3W1muUaoC~Sac-|1T(6^${
zO3g_0pw%EH6DT${55Uy%Y}0^1@%2^@Z+p=y!N9?DJ`eT9RI&h@R+Y{jY;!K^qHBc%
zXnjaY>Vr-pc(0e<5Pdjj6wZ`_v0Jgu8;d2WAikv+W!tvk$0L<?7`hQqkY0GI%T}Mr
z>BmAINQ#4&DWMn9gF@<u5-)!lILX0y=XFmx@E^y+I1$=_twlm(Q}=-B`?(nRM2d1M
z{5U>lW+XAlhH^n_AOwt7G2~lPl0^b=<VR<DGK#_9*@1V*>kkAVS`-$N7?iL^Ww2Bl
zviTKneG>%1a<sk>l9YTFcfl-nF%)7kMVzR~q=yypH_DfI%bg|&my;k-MWC-qNjd=K
zMJvn!-vlXw5+NTxbPN-F_B}Wg0BS8U6#SHIeJRIYN_?o6M0ej%F6oj$&kGE$toz3I
zRHO63R>8O&%{PRF5{G9x9JKlFE_XZC;hY8Uk_t1M-Fri{XBkszqv1JYJo`S&MvhKR
zIxWHbkHXNoDIX$|l1~H1eoBK7r8L0Vo<xP`eCW9SI|QS16Fpq6hZ5I-i9cHZKJo}q
z@&C{O4LI3=vn_F}Nuo0Y>IctJ50Pz&xm-UgKJ&yvGlY8k52XZH6Hwy5;qFT8G3+Z!
zVgI-c#dE|2gh^P9!1o`&KTB~xOi@Y$?o5S|hZ2tlccwCrg+U-hB|@~|OieT^U?xHd
z^+7X|d>@#3pM=WDKE`A`kY!{n1Mk}Rr(ffM^2FmF#A_Yw4LI$w42<K$!k?y1oMTN7
z4&{m|hAc3$)R-3?s2Ol4KNwZun0bSiq|$RAlx#%V+=p+5N9Vq00uVW7JqQTp*N>eM
zQ)RhC#SoqKn8}`Ey#SyEUQ<X6>z)|0=R1f)O1|8|*=(%<Ty7pAG2uBMHe)lDw|@)7
z#@PenkdhA<x49d5557KMb8`kvWhkKzGHfQ!=&};NIx$5lY~*%^b2b|pWJc#%Gh<6y
z!gIzKT$|w0gs)OcAHJ2F!sF(&4$wF7ob(O)mN~w*br@_P5gr$gT>&VqLU?X<xYr->
zcTk+czTJA&A*Ogp08ruyB10v~oVn|uiXufI>W?c*yf{jg!2kZj#BFbBCd}hMt~eP&
z5(D1{^W!7ch-MlrK2q`(A@gvD!adB7%W-=TvznBA#fC3vBzEKVHB(*6nOa}}P{jvp
zht1|rx&}0%KzU}YCVkHMm3;?|_Ya2VJT`JXxmr=0O!p5^vJqwd1HQQ*rPDwGh#dU`
z1cXw2QVTJanO79|4_aVXi$b!hGnL&xKpaw{E+**;rwcy;xZG3)ol8nSY^Gc(s$4A)
z8>cA}51#Yk;x^wCfXhu$FqNUiv6(n4?jJgXJzn+2nZZUFi?e^YHdl|%vxhs|&=Q`@
ze8K1goGm|?dmyTBU8$5liXKE+Rkxt=Ny)^dzCNZ#DLwf5n2bUCv@S44P$$wSiu;(8
z;J0jq$B1EC&JaO(7$SI1s)Ozm?jyftqeA3vt&BQw6EUYUFh8J=;5ic~HYMXt)kz`B
z5KR?iMJOR#p{OKF;f;l=jQ|(aJwIV@(1CcQ<ip1q!&eD>oUKSqc+Q87+rCmDHp3d|
zj1Q{-N*teI2$ZoHmKKBbtK!E;C<?`e=?*2#IGNoHE&z}p_#4j7;0Jnns*re81MMRv
z<7YMl;Z58$emssQj>LlJq>U)k;7wdlTV5L(YT<J&bTJ8wGKz_uQN+OAoA_ZNg`l7?
zexzjl%VrMd6?tkgNZpRdR`zocxOECj_EMLum&1R)0PW@6>IdX#<u<>bOZSiv_mZ|F
zJ)Mx=MO!&0sPs~heZ7XVJ2?nr7So4@gXgG!NseS5HR=KX=GG6(-N->GQu0AF7E{nw
z!k}?xB;nvWA1rQh7l(Qs%}t7M`4mb#w-|Cl3)e|rK~#(*m4Rl;m~&E|UG7YW9BKp4
zQAd#LtV}&q{(mJv8)8m|X%3|j?=uhdDbOC^mz@;yGxPfkKQ8C+;Li{a|NVJ~TV5gz
znmhMkbfLr@&z*Zr3nm7R*8#sVuGsNRvZ3@1(bzfG1nlz^iPFJ;HwK7A)2QDs7yUm=
CQJJFv

diff --git a/setuptools/tests/svn_data/svn14_ext_list.txt b/setuptools/tests/svn_data/svn14_ext_list.txt
deleted file mode 100644
index 800a09659d..0000000000
--- a/setuptools/tests/svn_data/svn14_ext_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-third_party3 file:///C:/development/svn_example/repos/svn13/extra1
-third_party2 -r3 file:///C:/development/svn_example/repos/svn13/extra1
-third_party -r1 file:///C:/development/svn_example/repos/svn13/extra1
-
diff --git a/setuptools/tests/svn_data/svn14_ext_list.xml b/setuptools/tests/svn_data/svn14_ext_list.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setuptools/tests/svn_data/svn14_info.xml b/setuptools/tests/svn_data/svn14_info.xml
deleted file mode 100644
index a896a77f74..0000000000
--- a/setuptools/tests/svn_data/svn14_info.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<info>
-<entry
-   kind="dir"
-   path="svn14_example"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:34:14.406250Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn14_example\a file"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main/a%20file</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:34:08.109375Z</text-updated>
-<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:34:08.390625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn14_example\to_delete"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main/to_delete</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>delete</schedule>
-<text-updated>2013-07-13T15:34:14.125000Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:34:14.406250Z</date>
-</commit>
-</entry>
-<entry
-   kind="dir"
-   path="svn14_example\folder"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main/folder</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:34:12.390625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn14_example\folder\quest.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main/folder/quest.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:34:07.109375Z</text-updated>
-<checksum>795240c6a830c14f83961e57e07dad12</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:34:07.390625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn14_example\folder\lalala.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn14/main/folder/lalala.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn14/main</root>
-<uuid>c75942e5-8b7a-354d-b1cf-73dee23fa94f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<text-updated>2013-07-13T15:34:06.250000Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:34:06.531250Z</date>
-</commit>
-</entry>
-</info>
diff --git a/setuptools/tests/svn_data/svn15_example.zip b/setuptools/tests/svn_data/svn15_example.zip
deleted file mode 100644
index 52a1d45bb7516bdf8acf951c5e6ccaa39c5de500..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31143
zcmds9d0b6f`#(rjO6HQQBhsij5fv#{g9@2aNJ1Lb$t*J=WJoXfQW<XMF}%rekx+CK
zuB*%;bj^tj*Kh4}T4xP=pMCbp`^WqKw$HKJwAc3;zt6MR-s=STG*W9VVveA|m+sOZ
z>i*IJW5U!JTgNfs(?g@<qQb2M6#i~2*6&(@OXU|d6%7ZIx7BL<VG8)gm*6AjzF>Sr
ze7Csx*tl-vLKDI_U$xa-WTU(IVUph(Ez2W=HY^U*+LJam!lFTjX}(_9zST98v-iDR
z_<dGdY0nE64EAa~+PC7y&cDCya7ZaVde*xv{^n|(B^$pl>17$0@UI803`17j^gBDh
zap<bbt!}eNjB`BoICPg)rM`<%Qv8tQ!V{T4LH(LaZ8806gI78YM4}!IMWXiH;)cga
z;v>QnHm|)pIbYm*@yF7o|7sU^@}K@kURp>Te>t0Pq3yUV-{wlit?i3T)_Oi4nf$X$
z+^eOlQf(~rQ+srY(hob(P3zO|4wWsk)6y<VE@m4hxE~w4rD*CoM}u!R-z<h0&-2mL
ze)4W*)v(>ea`$w1Z**t!nv?q<-)*-ky=Oc3$vNHhznsl3I(D&gdC}t`x9={}(;S%a
zy>C+R+J2gICjOchxF<O<=;k2ny_tRsmIbM0M}1Awe7yKmQTH~t)88L{S9tbv|NF^K
zcl2&N+k0#DLba;T^Y&MD8({ToZ*7Y`H3#pQxU@+>ddc~IqprcLt;W=}Hat+>eRkis
zW4}CzQhTPhGf4aQo-5|$csqP*QgcR<x-3ES-%<B>Z1QKUs0r*P68QnAkD8i%02olj
zeDuMGj3{Z8Oo)w-4wdxOgyxrB2!2<7`~-gDxKJJ`@<3x>ssNL@Gy%J8Bo+J$5GCQ$
zCDPcGUMkaa7`Qa=o?CxyASCm#<Q5iP8Y-R;5f#p;E}hCKIyOFBJRvd0NUSZjfoxh@
zB5P&SN@B;15046$pqY_D>D+FoV6x~q%qEQc!0*YAPT(gFFG#>eLOh|!q;;3`d4mTT
znH9wy?Gc9GNWo<;U|C*9gtX<`ur8kv8#O*W9y1kfUp8OVT|&{~2w>t1-ACs`S~O7v
zCB2T19hX^Z?P@#B;%w=#hOUE>ZG9I!dwH|Ctmf?ZQ$f!cl(x4#)=Z<=WOCY!xn`@^
zRfkB{estGfw>13enI|1BzP6mW=*q-fp$Q4qWBUe|9(~q4V?&RA)-y)zF3-*SIp4oJ
zq|@$AYjt2W$=ETZiC!Cq9c@5jv)zMh3rRB7$M3w2?vjt4b<Q^KuzJj)&E1BNy`Y}^
zc7(^jmn|E3vtph4c1^REEzdY5&Dj=P&?rA*amUj25f6TK)9zim_}$=Q2dB~2?=3>k
z=Z=45k+$Pr%%X>tHdlLh>sk8Qu=TM4t(RwoySr%Fo4QOY*AJZ;G5YsD5!(0M!^1<o
z8~;_3)wX?hs$uM`6WxO<Q>&6TEgKg;L;wE6Tb=K0Gy8Ss>(=(pEr$4Ij7asfJ8;my
zfByp^pKF)D5gBF#j=Hr!`nArgIpHQH7J0QnvD*s{HTQdHDv2-rxFE$i$JV1$^U#;o
zIz^{$pKp33_i@~)xtEh;ES4l&>mE&xNx5g7zs_Uey-qV<PxAHi@mYFs=zY6K1D?93
zWArf;gaA&GV%`v7b0u><xI}(*0Y8z!jyr=ZQRx}PN@u`xl}R=^IQW4dpDSHyd?#Lf
zG(%J<^T$duT_WdFk^{~@f6=u$n2h;!7dYvZ#P9?OF{jah*r*xepW{O#q98+aH%uM*
zAqZ}zbv9Lctq{*Cu{{UV(%w@p2eLmhHm!}JB5jb%(8Y`hxTh4FQSKUr9-*0AAu&lN
zMZ}LE6BimUnSrr5eYue$HL%O=u<Pk6ppeap>#35!OcKAx+{+e_>rOzfR)U0(P6C;B
zO<v5xKDwS?hPoQLiT=Lgnw1!oJ!PwD%+}Cp$%Aaf;tg(Yk-J-a9FE^}_gaVN!2``a
zqD-<pu1^ha<9TS$@=NVrEqQz8+u$qd|13Np>DbGvYsaOv-5U&flen?zcds3pYH42S
z^Jg{~VisbS9(f?m{$dw<E1xniU&qxQf?jlteeLo7#t^3iXSVb#9_h5m`mM$Im8DB;
zB4<b0waNLT>Ew-$I{j8|nOCx+$)R3@zF$r_9h`o2;a`$cSEsR-T}}3CY@8ftrIuQ{
z)hRPAanNJ~A4@0A+rb8nEl##AYc}rijBSgb4*7EDbo0s@-}fKCjow{dJfNaa*6_Be
zkzLzu-kZCj<?Yz%8-vRYB(2{ZPd|J)^80w517FV1>8f|Ob8Ug?s10Wi2DaEbUL$MD
zj>vN%Cik1Jci#0?gkq720Gy1w2{%5Qndxw{6+RhPveVP4AR99s&e`--DoDna{>*eQ
zldc-H1qw1BPvMH9>H19yjhPspKvHkt@#DkCi?RR08Mvv40gij-GJP=sJO@5~>jON{
z!*R&afkWgqB<<=U&2u)o^B#u0`RUi6y5u_K-Z+}Kr)iV;2%S-rO2>_RUSaWBZPopE
z-__>#?J+6;^eyk6Z-zM)ga)o$(Jg0b*tD+84;MOEd&L`@N1iS!h}ig8E81<Zzxvjg
z2VYa;caOUJ`ch8EeTR2yPp@zopj(h^J|I9d|NE`e@lWhh(%*K^ww*HLn^i0sl3vH}
zPh+^9`S{mI$Kj!p(1b}5ei0*Mqa&h26B0=?gMLArAc;>5lO%#$k<gg&VsM`m9v>4L
zl^~7}kHC%2UMH|nK_H?A(oyKB+C)NfM3unisE$7<AqsBNop`PY%VInORLlu8K~}9x
zg8%Z^SJ)X61(h?{jZ}(p+VMg<0s9~91njLjIsrS~Q*Ty+PQYDFSSL_73G4()ude#V
zMz_hEyra#pwG$Oo#O^PToOyfL(1cy;vnB;-Wd6SY-6zMMd(FEoD=EHw>}z^bjjygz
zV!Ke!@(;nohl0<t`~Nn~wr}p^ct-n7t#{?F$`|LZ_c&lu8aO+|YEg#o6Zh2JqTvHR
zglr0W9@H;l?7px9-=ejzAN#uacj)!v%-*VBpBDA`HoIK=N`%#C+ke`8Z!>aRPAAKt
zj52r6ms)GJTkkvnSEh;AvkU9=E=HVwc%geiy7@fMgw|d~kHa)iH=d;H(4@KUg37;U
zu3R<k)c9>;i!J^RUmxZM?=Ny~)_sxhN{Ll}joK>)yV4Rhat1ayfAQeq9o@a}o%?8;
zJThUnOF-|p2Q$KQ2l;jyaY6l>{)0)I#M)0Xj*ULAelfi)@=5#%w+GLz)Ou-M&3-lN
zV`T4X6E}_dm>2j)KkV1QXK87dwAcCQw2u*`ep^zszHEQiw$zUyh0C)o^*UNqFQ4~^
z?<&pL>%uzv7eCxHqjt*l+fB}PaakL?@^B}Q^O<XXe;0>UEr_g8&p&nC>+aG^2Wy@i
zk{qCFmr>`~|4f%rH<=Iy6~a&0bU)f<)J-LXIfZl?tm!Z!l^1*?g^bF*66Yd-QCYwf
zB4Xr#Oe8S3ko9X|SX2KGG%!F}`QZwF;#{D>NSvi(ENEZ}`ytn;+8nXw=ByWTFrkG5
z3A9wKW26U^WIp}tqij&(z|gQs;W1>BW-bnzNgY4lm_cLwaASr|B!pIkG-lM4eAFVO
zb;PC<LNCII591S6X~bAiXaL?&Ocz3WJA3Q@-rf#aKz?)uKPjgLh6l((il@Jj{?Oi<
zGv9wK&4nz|*jwXyZKQHK3o#H^3+Z3;<j!qi+|{6s6cW_3Iba95I?pfPM%Q!Jiq#LA
zba3msYI9C?;DF@lk}g}CYMC4wcciegBFghn<FZj#Q=Sf}tVyXoXn*0UZiKG;$!6!S
zr#;%xHfY7ATOZcx1P|_VXh_++8H4(l44QhQ`C!K&^9QBzjbjU&mFSG!bS&Y|OFn5{
zJ8onYHtTt<wT){=!j6bBwol8CwXD5T(S6Plx3k54A_LyvuHAV4hV!b)>t`RE+5Tw1
z#bt*~YF0IVKYY5jVR_58SKJ2nEZnD^7kTT%Z|ht}B!re^Y$z}<(Q)1p(Iw|z;hO$t
zj=6J(=CyjZ`<Ap<N0g0sW9;X5bqnZNeUjNoc{64sAgE<?2_a44k}<RK@uhIN6j3Ff
zc7B4jM6+=wp~^*<dm-LjxIDad&q1Ymgm_Q|y9-#3P)$B$d&LB*@F@u%`<$*5%AYci
zG0#1Laped5c_|JE3!q3uUuOVjAd3ce9pBQtnEyg15aqY?vIm}#Z_|uS0EKP_Yx3-c
zeF9c`H6+k$XPC#H>Tm8o>NI`6gX@>Sj~vN57S>KvOY2>RR^axC^&UeF4Uab(*L3g&
zr`sFco=<bO_Ha#cUr|#sWyq}$CwAFq<o443`Bmji=Z~*vYh28#nECjjL&%ulZ_M6!
zQS?13%~a#W+Q9iq4X#g$$_dKqH}L7cu}fxH&GpXSsP4D4#AWm!JFbQqo_IdBYUBIB
z#O!M0B;y{-3wrF1`Xw{I<F4gp$J%W5v}=0W)4F5+XZvcy-us>w&HkmY<))JT&Ghyx
z_qveT!$a(?u|20yzfZK8PtI+NGd8+=OPuWvua9lit^cmAGw!)YPc8pqYn9Wp*SnTR
zlW*9K)Y%z!!_3=1UZe9|n>SACS!1Uf9GQFf<?HnUzL&NPz7joPiSMvK_v{T?y0KeD
z$gI&#dxV(YM<L0$7^h=)*<;(9O~iDduqlB(3s(Zu^9YfKCSQ6EA+m5KD>DzibjZGu
zV(WzF!8%n$vkLEgnKW%GO}Dk`Z;j`Iv*Y07EFfzTBI~~N$|+`HUGxAftULF*^d#G>
zqU+IZE8fq)W1OuMZP|T&@6(z7C2vQ$-tY}dPWxzUF3QduHnL)N!>Yk0Sv{*w^1JLw
zc|Buoux`5J{T-zatKTi0Y_RJ|Kg~mP2PGB8TOR#;+F#c??<j5(5Vg`#cXO)am9BPb
z%?)0c$DIydI`>;+GQ@ssShbaDpP3K)hMv!mgFX9t4D=-L%>Z2}TtKgTdoF?hW{v&m
zmO}=jTG3&}?m@X{5EABsLX@LI)mJ7IG^CgCa95IgSbQtK6XOnR_UbNSIe7o{-x|K`
z8%aWZ6tBEBnmbHshw>I&z7=pWA9d8-n!`FTE4ZU4_B}Th6x@A{loZ^$t6{+{Et*^f
zSf=FEv!Cx69&}mTfA!^8r4oJ3IZ-FfW~P({+_F7nR{Pa_<a(<PHb3R0F6!^xdC8(n
zU$)t7{d?9uNyxOk=XP_a%++(7@vpq+k<*_H`P5<7t5v-_{`P*A!%rDc!&2v7*`3wr
zg?e!359=HZRwm}C@0<2?$GCzS`zKB=p3uJM%YNTq_dalYb_aL2kYSAywru(*)iwV>
z(|ev_CnKZ04!>Qre_7cE^=n)0O?Qcx8N8L8ITc%ZeYRO2%LOIJ%JfCkTNsZUaBaJ3
zVyBlob<M5US+DP8T%vXJSzDJE369fuO|Z?`wZ8nL&B?bp?)}CNJr%$d=;y)SEnjSL
zYI!tKzhuJToXj;ZpG0PL9dpZcsAKbK-;d|zeb6)XF22{|QgVC8E=3IzQ=C1;O?>n|
zoxN10xBk&@noAOwr`Ua2f4SYfouZAsMQbVpdz)X}Qx@GR(`f3b_n%JA3U0FNZu*NV
zs|&&IcE#hvy~2m;gWBED<C|ppX`MBrhZj1LX)CyX*SYQo>v!EOLWqr*M6h}An<qL4
zc*(JD4k3ibTfbTJVEiVaertksW4Fuf_8wyj79#hOHDe9IJppUZ{~tX8OD)8)$TzC=
z1jt=o%#D*f1J^O1Uf`qf?uI2ppudMd*_D`!Jt7jqVyA}3izSo7#nShuB4T62Al<|c
zc0bUMK<xVWBiIZ=(pFH){b)ae$s{Cwl~4(muZsH-<agj|`N4hzj!08tNtjMY-d+Z+
z1^-X>GWOOe&s6GVkeTuHVp5DJy<k3pmD>8J5&KO@%#~cLwTFK3X>lD0wg_}Syb(q(
z)5bLF1eR&nufEj$;5_}&<(|um90u)nXkoc9NAsSi*5R7>3qx|_LTiWFZ|hl_yDGIu
ztVgQD#18sluRE`pUT|_lE31_^-@jXt=a!Zdb^h?5MV_WhW|e<E68Oh_Ew9`x_arSx
zZ#`qfKBKmM@=rJ0_aUP=<>&*4FJEVF?6tD|QNpPht#NxD4qP|PU3R>yX}I>yh?X~;
zZ5#${Hl3%wt<S&JR-H^eP*Hxda>}GxdBeoh()u*_Hf;Uc`_F8>eN%$fQpL5~uPtoW
z*KdBW^LP8rd8Ou&UfV=*N5R|gDq5MPi#Yqy3Cl4;h)IAf%rt!MgaAnt(Gh+V+nX<%
zWmZAcpggKyy^^is(eJzRCRCjWyd{JEc!K2=MY~Pv;a@lvpK}CCge*&jE$$%RJN)`F
zTZ4vfB5qgcNZ%D?DvB=i7dS|!(-euN|JndNr51ZuEW9_jxPkYHPtq~|&csCKJitfs
z{H^5kw*>RBA51V|Wvv<r*Cs*6X3WtEd_us7R6+_uY>L4VqiVh9F=|M5&XkVu9I3^%
z&ksjz1~`}lvF=6_$0~UAKx#T@$}6suF%!zl4|_Kpjx`u8D|2AU?u>9KI5j;Ywb+~B
zev*5OiG~&2P>AkuI2a7{$OorSz!fNlOCUmohJfcd6#Zfzso6JfD3qPJW-kuET)@N!
z97#Bt&*+_GmU7LQi0sjb(`N{d+UbX*kLcEGE`#1)|7Yn4&t=NW&}n6@3G~&<(AgUT
zaRJ(AmPys8N8H*p!MBqOz{JrV1p)wy$AMr@lnyG+eE>8j?JT1&_Etlf8w^kjHEuiC
zHT<#-nK&ebphsLc8j_5p0Ded^aOqTp=Qteg%T9zTS15)<(S&OVgBFfZQ#^d=;B763
z6a%9cvLI#AilfvRXh?&T9{Ch&BS&Fer_q>pUERZU9LBG>zcdu#So7-E9AyQly&Q%q
zK)n^gu<FoX-V=#pSJ0q}!je7qAa`YU0T|4|WW9tJOJO+@SIwKxD7E10Vd)6ZkuAA4
zR^q_s>I!TrRg$ABebyZ))fJA9{A)2?WgNq7-NKja#B#ebx=w4t2gxo@5P=?%k|Ghk
zS*(j3kqMaNyolU23i^;9`B0Ib3~H@XR5Igln7)%*k{)qHdTSl2r&Cit%W@}u_2Yv{
zObEdd>MKJ<{saoi4=1^G8Gp_Yh>G^<F|j2jSUh0|C)-H{p+{U0dRt$2LXcvCg2?y$
zamw-6hOLA_k{mLn=eQf_8rD%R2jh5K4PG};r3@w#EM>_rYp{fpl`=ZKO$oecrFh&S
zPA3#R$2Fyq$$&c|2$>9Xh(eDzDjnvez8{pL3JY~80UlwrzJ_v3i-Bi*fqWnv>blB<
zVjB<XH&aE@(4j{hkPc}SN(|t1MS$`c#_^^uj+5fiBW_y$p5eSAJp7&+hdeesKw4(u
z2+J)Wq><dFOtv)CQeaaI(vE2UHfgv^G2xh$XD>a+G3g97kz+EY-CYnStIm(xG)!9i
zEOSbvT_+n@R&L3yws^T+Djb-j_CkC(KJ{?H6qj)|<6pe?c9Sd4aJ8DY5MxUfXBT1!
zM~}GO>F~0Z!!y1fBpjZbvY^H3kxv9<0Y-#O)kGk<i-v{geDI_Ns)WOHlNbzoIFcfu
z7{K3h@RU1&i2-LF!7+eDz@9vCR?R-yZbVMPb7UE=jVX9)9I203^rJtVnxKW?NQ#6k
zg}-&`Pgp7)e8~eR-4oO#%@$-S&NmtBX)~^kvCw8rFq?wEgbGNt9gss5bD2oG6&j$(
z4@bFm81N~ofpaHx$|GlK+|VP68@3o^M&+w62AR|}oxyWH5lBn4YN3)FP^@r;D|867
zh)fI=u6SZ2Y7+y8Ob{dnmdRZ3Fk9e=tiVoSGkH8P@D~Na*JZ45XrwuwsOT1ifnEoS
zy7D~W%uL~e$Xao_z>&>NGw`K#$^@||nwc&mZKVkS$H4v_v6{}k5KlHUzJf5NEQKq(
z|K=c~nPCIVni+DpFk~O5kgO37%+bt1d^n!`!vs?td0lZcGZ}n|mU3fD6=ydy5RM*E
zyelJ~<HF&&xer>L9{EH-8P8C#I{0P`ffisyAbF35h39<mB=rsw4$sYbFzDe(ihyDO
z=RC5R$*hkE7zJ_`=D78i(oig{v67DPTxJ<07Vv=laFKH%lN$Q%1Um*<27fmS&r}Fc
zkH}GMYVJ#jBdL!#e7zME1v(C%^I6E15NQP1$to~(k%fpIySRzk+L=o|MUS*RcnKkU
zy`1{U!&y;&D5S`JzBt=@f^VHv*<kqYz<S8VU4AU&j$}CKtO{~bJt(Ap*z)Y(DaJ|w
zcfBP$FHNw?N2pO0KG~s506a(erK}W$s4fP{#SoGn`9vTsu~#(_P)^}#1k)KhWL&f{
z<`6`DI3J^mBnHv&U62?U0pswHZ|RZFVt^w*jOD>72LCn|yi2Y;9stqeuuyAyM8;?H
zE7|&P69miA`qGf_oKNGfgvPNQglNnVC$2JWVR%mC;(STA+(!iAauQ^H1i^XHiZFmB
z_zqa*F2{*bI6gQ3AqOyPiKzncW$!8BxNXObl6K#4)xY67A1u=tTv_)`ZnVbh!41K<
z9L+a`ha(A(5*=^8$@dgKffq`ZnH_&`4p$zc(IZMYHsRXHoz4^;5AY78Fm&$Ln?{D`
zd=eo2841>^Bmv3x5RD%B&`JI82u9~7dbnH<M<@wj{`<*2z;w9gVxb;D5^%BsXIm2d
zVW2b}pnUKgw-CL=Z!VXQ@y`k2@=;w0%n3M>w&Ctd90=@&z(B&H6TU9Ue%%D3(j#sG
zdM$#CkwBHD`0*$u?XXoP2~eEiTtP<wv<F|LqQ}A@2t?IFq~HuqE;*n)aK!yVzb}g3
zCt)Ho%7~5%Y#EtY6WZBGPx?9s9IIVhNzeJP42THa&WA-kO}nEjoqSW>*u_%B0;5w6
zz39MHz`OilOo9{YB|RHYtUR$1Wwnpo9go*O1MpTbnP8YH?PO(#qv}CmIHnxcz*Lo0
zJ;sN4)kDP|gpp_|kU|+Sd#wrL&?BEeNjAGG0GGScLF3XRA2!mNiQ6{deRO3yvsagB
zJb2EBOX@sQ04_IYz<hxtiH-b>-^P%u6Im)@W4AM$)$D1zW<-j?b7TvyZSi=(w*uQX
zl=%SJf^X#pra81tpP4$GIe@=qPOfdeP)Qb!T>&_)LQ_Do;5jl4`xzMd4oVF8;tZvx
zp-Ma?0C=C9w5lOy1X+ov$sFBvFiCMxAS!oK(nJ8yajj{5GC97gfKQfnh((Wl*re_r
z;0xV_SR4f;?r|7++_vXVPDDszVEa^ld@LJrTo_^Wi1cPBA$qvO;J)C;<+#14vEaE3
z6X}X48@Zsd%Z%67D7#csmA#FZ>>t{g^T65@)x7ZXH|bUgIDS6%LVAwu%FbZ2fAHf6
zWAzV(oyQXW0~=A+KaiXKaXL*AfXLB5KwvnY+**UFirlHVfA|^fYEhUvb$dnG{R70I
zN8H5xbg@zZE;m&{<I*D^HcD59DsKwJCTWVsgXes>Bt`0XQ*LW+ih`jGM-m(PS#kdm
zsuDKFSe*Ss+{7<LiotW4Es#9G*zyD212KK;b(Q2%_#moI4u}s&<P$c9I?L}%7&%P9
z7s@D$f8-OsJ_ce#AHj3lCOEZ{eat^9$%2^nhg^j374AitW`VUTrhyxY1qsu(aV^GE
z+>4rIQ}vG!VW_4Gvf`4q*QIYql3639sp?}RzyyjP<J7Tn{aG?a1$>gNXiRvHGJ{=l
z$)@UtKx~v9c*TcV0Buj=BZj~k3$e5qWTqH=doE9AVid)N3-RGdXCVNPALJX(Gx>3;
zM>TMMdPH_+GZ5Lt9plI2XyRxrcuwnxGY#3qCED@Y7Ew!mOp7y0XE~#Yfw>>@!$Jzd
zK_QFMBeE~MnM1G0GmAl<_B^_>pM$`yQ}Av8-W?!7SuaO^g#q5nEl>`~(aJ$wIQnI^
z!R`Q2!r-kOaw=2GHaaL(l-<ce7<xqNvUvhMYGk^pd&*(C8#x*hp7TK?jTvZT@Qv6C
zDMIF2_Bs%Rp+`PgQsYU=VYx{WE}z1Yj4kA2JaK!=Gl=o=0ac(;8gmw9C<Q&@hM?D3
zQ9d*Fw*z0bq{RNr^8`GfVR*w4dI1Ne?;OwreFii^80dd4=1AwC77kBVWT+`U3fH_b
z_~vf`<`x!vPz)J7ckH1SObiSkzzdIp4R<#kTkt%<r!m;)36`(HpFjJGM0sFtk?8*b
DPBk<7

diff --git a/setuptools/tests/svn_data/svn15_ext_list.txt b/setuptools/tests/svn_data/svn15_ext_list.txt
deleted file mode 100644
index 75fde4e699..0000000000
--- a/setuptools/tests/svn_data/svn15_ext_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-third_party3 file:///C:/development/svn_example/repos/svn15/extra1
--r3 file:///C:/development/svn_example/repos/svn15/extra1 third_party2
-file:///C:/development/svn_example/repos/svn15/extra1@r1 third_party
-
diff --git a/setuptools/tests/svn_data/svn15_ext_list.xml b/setuptools/tests/svn_data/svn15_ext_list.xml
deleted file mode 100644
index 6950b3c5ce..0000000000
--- a/setuptools/tests/svn_data/svn15_ext_list.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-<target
-   path="C:/development/svn_example/svn15_example/folder">
-<property
-   name="svn:externals">third_party3 file:///C:/development/svn_example/repos/svn15/extra2
--r3 file:///C:/development/svn_example/repos/svn15/extra2 third_party2
-file:///C:/development/svn_example/repos/svn15/extra2@r1 third_party大介
-</property>
-</target>
-<target
-   path="C:/development/svn_example/svn15_example">
-<property
-   name="svn:externals">third_party3 file:///C:/development/svn_example/repos/svn15/extra1
--r3 file:///C:/development/svn_example/repos/svn15/extra1 third_party2
-file:///C:/development/svn_example/repos/svn15/extra1@r1 third_party大介
-</property>
-</target>
-</properties>
diff --git a/setuptools/tests/svn_data/svn15_info.xml b/setuptools/tests/svn_data/svn15_info.xml
deleted file mode 100644
index 0b3550afb8..0000000000
--- a/setuptools/tests/svn_data/svn15_info.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<info>
-<entry
-   kind="dir"
-   path="svn15_example"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:34:49.562500Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn15_example\a file"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main/a%20file</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:34:43.109375Z</text-updated>
-<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:34:43.484375Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn15_example\to_delete"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main/to_delete</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>delete</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:34:49.125000Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:34:49.562500Z</date>
-</commit>
-</entry>
-<entry
-   kind="dir"
-   path="svn15_example\folder"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main/folder</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:34:47.515625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn15_example\folder\quest.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main/folder/quest.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:34:42.109375Z</text-updated>
-<checksum>795240c6a830c14f83961e57e07dad12</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:34:42.484375Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn15_example\folder\lalala.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn15/main/folder/lalala.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn15/main</root>
-<uuid>4eab6983-54fe-384b-a282-9306f52d948f</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:34:41.375000Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:34:41.734375Z</date>
-</commit>
-</entry>
-</info>
diff --git a/setuptools/tests/svn_data/svn16_example.zip b/setuptools/tests/svn_data/svn16_example.zip
deleted file mode 100644
index e886b2afde2150efda58d1f7f999e43846ac721f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29418
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

diff --git a/setuptools/tests/svn_data/svn16_ext_list.txt b/setuptools/tests/svn_data/svn16_ext_list.txt
deleted file mode 100644
index 3ca54893cf..0000000000
--- a/setuptools/tests/svn_data/svn16_ext_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
-'third party3b' file:///C:/development/svn_example/repos/svn16/extra1 
--r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn16_ext_list.xml b/setuptools/tests/svn_data/svn16_ext_list.xml
deleted file mode 100644
index 8ddaed0a19..0000000000
--- a/setuptools/tests/svn_data/svn16_ext_list.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-<target
-   path="C:/development/svn_example/svn16_example/folder">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra2 
--r3 file:///C:/development/svn_example/repos/svn16/extra2 third\ party2
-file:///C:/development/svn_example/repos/svn16/extra2@r1 third_party大介
-</property>
-</target>
-<target
-   path="C:/development/svn_example/svn16_example">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
--r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
-</property>
-</target>
-</properties>
diff --git a/setuptools/tests/svn_data/svn16_info.xml b/setuptools/tests/svn_data/svn16_info.xml
deleted file mode 100644
index 745469c958..0000000000
--- a/setuptools/tests/svn_data/svn16_info.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<info>
-<entry
-   kind="dir"
-   path="svn16_example"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:17.390625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn16_example\a file"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main/a%20file</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:14.578125Z</text-updated>
-<checksum>a6166e5e98a5a503089cde9bc8031293</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:35:14.906250Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn16_example\to_delete"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main/to_delete</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>delete</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:17.046875Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:17.390625Z</date>
-</commit>
-</entry>
-<entry
-   kind="dir"
-   path="svn16_example\folder"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main/folder</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:35:16.406250Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn16_example\folder\quest.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main/folder/quest.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:14.078125Z</text-updated>
-<checksum>795240c6a830c14f83961e57e07dad12</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:35:14.421875Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn16_example\folder\lalala.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn16/main/folder/lalala.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn16/main</root>
-<uuid>bd8d2cfc-1a74-de45-b166-262010c17c0a</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:12.171875Z</text-updated>
-<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:35:13.906250Z</date>
-</commit>
-</entry>
-</info>
diff --git a/setuptools/tests/svn_data/svn17_example.zip b/setuptools/tests/svn_data/svn17_example.zip
deleted file mode 100644
index ba0e8823fe5849788881274d87ba878a6e52d43c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46954
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
PJB@s^JCA(!rcM6?#2I%_

diff --git a/setuptools/tests/svn_data/svn17_ext_list.txt b/setuptools/tests/svn_data/svn17_ext_list.txt
deleted file mode 100644
index a8b832a885..0000000000
--- a/setuptools/tests/svn_data/svn17_ext_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-"third party3" file:///C:/development/svn_example/repos/svn17/extra1 
-'third party3b' file:///C:/development/svn_example/repos/svn17/extra1 
--r3 file:///C:/development/svn_example/repos/svn17/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn17/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn17_ext_list.xml b/setuptools/tests/svn_data/svn17_ext_list.xml
deleted file mode 100644
index 2879bb6548..0000000000
--- a/setuptools/tests/svn_data/svn17_ext_list.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<properties>
-<target
-   path="C:/development/svn_example/svn17_example">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
--r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
-</property>
-</target>
-<target
-   path="C:/development/svn_example/svn17_example/folder">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn17/extra2 
--r3 file:///C:/development/svn_example/repos/svn17/extra2 third\ party2
-file:///C:/development/svn_example/repos/svn17/extra2@r1 third_party大介
-</property>
-</target>
-</properties>
diff --git a/setuptools/tests/svn_data/svn17_info.xml b/setuptools/tests/svn_data/svn17_info.xml
deleted file mode 100644
index 6cffeffd2e..0000000000
--- a/setuptools/tests/svn_data/svn17_info.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<info>
-<entry
-   kind="dir"
-   path="svn17_example"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn17/main</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:36.171875Z</date>
-</commit>
-</entry>
-<entry
-   path="svn17_example\folder"
-   revision="6"
-   kind="dir">
-<url>file:///C:/development/svn_example/repos/svn17/main/folder</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:35:34.859375Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn17_example\folder\quest.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn17/main/folder/quest.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:32.812500Z</text-updated>
-<checksum>bc80eba9e7a10c0a571a4678c520bc9683f3bac2</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:35:33.109375Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn17_example\folder\lalala.txt"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn17/main/folder/lalala.txt</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:32.343750Z</text-updated>
-<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:35:32.687500Z</date>
-</commit>
-</entry>
-<entry
-   path="svn17_example\a file"
-   revision="6"
-   kind="file">
-<url>file:///C:/development/svn_example/repos/svn17/main/a%20file</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:33.187500Z</text-updated>
-<checksum>43785ab4b1816b49f242990883292813cd4f486c</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:35:33.515625Z</date>
-</commit>
-</entry>
-<entry
-   path="svn17_example\to_delete"
-   revision="6"
-   kind="file">
-<url>file:///C:/development/svn_example/repos/svn17/main/to_delete</url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn17/main</root>
-<uuid>5ba45434-5197-164e-afab-81923f4744f5</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn17_example</wcroot-abspath>
-<schedule>delete</schedule>
-<depth>infinity</depth>
-<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:36.171875Z</date>
-</commit>
-</entry>
-</info>
diff --git a/setuptools/tests/svn_data/svn18_example.zip b/setuptools/tests/svn_data/svn18_example.zip
deleted file mode 100644
index 4362f8e9ea7416ab16ac73f9e49aae8374ccce06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47477
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
SiGZIY@ZTw5Rh`5K-TGgxyk=Yg

diff --git a/setuptools/tests/svn_data/svn18_ext_list.txt b/setuptools/tests/svn_data/svn18_ext_list.txt
deleted file mode 100644
index c90a5f1137..0000000000
--- a/setuptools/tests/svn_data/svn18_ext_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-"third party3" file:///C:/development/svn_example/repos/svn18/extra1 
-'third party3b' file:///C:/development/svn_example/repos/svn18/extra1 
--r3 file:///C:/development/svn_example/repos/svn18/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn18/extra1@r1 third_party
diff --git a/setuptools/tests/svn_data/svn18_ext_list.xml b/setuptools/tests/svn_data/svn18_ext_list.xml
deleted file mode 100644
index 9b5e9e96fa..0000000000
--- a/setuptools/tests/svn_data/svn18_ext_list.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<properties>
-<target
-   path="C:/development/svn_example/svn18_example">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn16/extra1 
--r3 file:///C:/development/svn_example/repos/svn16/extra1 third\ party2
-file:///C:/development/svn_example/repos/svn16/extra1@r1 third_party大介
-</property>
-</target>
-<target
-   path="C:/development/svn_example/svn18_example/folder">
-<property
-   name="svn:externals">"third party3" file:///C:/development/svn_example/repos/svn18/extra2 
--r3 file:///C:/development/svn_example/repos/svn18/extra2 third\ party2
-file:///C:/development/svn_example/repos/svn18/extra2@r1 third_party大介
-</property>
-</target>
-</properties>
diff --git a/setuptools/tests/svn_data/svn18_info.xml b/setuptools/tests/svn_data/svn18_info.xml
deleted file mode 100644
index 7ca55995d0..0000000000
--- a/setuptools/tests/svn_data/svn18_info.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<info>
-<entry
-   path="svn18_example"
-   revision="6"
-   kind="dir">
-<url>file:///C:/development/svn_example/repos/svn18/main</url>
-<relative-url>^/</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:57.796875Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn18_example\a file"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn18/main/a%20file</url>
-<relative-url>^/a%20file</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:54.906250Z</text-updated>
-<checksum>43785ab4b1816b49f242990883292813cd4f486c</checksum>
-</wc-info>
-<commit
-   revision="3">
-<author>ptt</author>
-<date>2013-07-13T15:35:55.265625Z</date>
-</commit>
-</entry>
-<entry
-   kind="file"
-   path="svn18_example\to_delete"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn18/main/to_delete</url>
-<relative-url>^/to_delete</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>delete</schedule>
-<depth>infinity</depth>
-<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
-</wc-info>
-<commit
-   revision="6">
-<author>ptt</author>
-<date>2013-07-13T15:35:57.796875Z</date>
-</commit>
-</entry>
-<entry
-   kind="dir"
-   path="svn18_example\folder"
-   revision="6">
-<url>file:///C:/development/svn_example/repos/svn18/main/folder</url>
-<relative-url>^/folder</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="5">
-<author>ptt</author>
-<date>2013-07-13T15:35:56.750000Z</date>
-</commit>
-</entry>
-<entry
-   path="svn18_example\folder\quest.txt"
-   revision="6"
-   kind="file">
-<url>file:///C:/development/svn_example/repos/svn18/main/folder/quest.txt</url>
-<relative-url>^/folder/quest.txt</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:54.484375Z</text-updated>
-<checksum>bc80eba9e7a10c0a571a4678c520bc9683f3bac2</checksum>
-</wc-info>
-<commit
-   revision="2">
-<author>ptt</author>
-<date>2013-07-13T15:35:54.843750Z</date>
-</commit>
-</entry>
-<entry
-   path="svn18_example\folder\lalala.txt"
-   revision="6"
-   kind="file">
-<url>file:///C:/development/svn_example/repos/svn18/main/folder/lalala.txt</url>
-<relative-url>^/folder/lalala.txt</relative-url>
-<repository>
-<root>file:///C:/development/svn_example/repos/svn18/main</root>
-<uuid>3c5e3929-c92b-7045-9ba9-5e65d3dd1ee9</uuid>
-</repository>
-<wc-info>
-<wcroot-abspath>C:/development/svn_example/svn18_example</wcroot-abspath>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-<text-updated>2013-07-13T15:35:54.015625Z</text-updated>
-<checksum>da39a3ee5e6b4b0d3255bfef95601890afd80709</checksum>
-</wc-info>
-<commit
-   revision="1">
-<author>ptt</author>
-<date>2013-07-13T15:35:54.375000Z</date>
-</commit>
-</entry>
-</info>

From 7648e18df3bb35335f455d6026252393a3e84a2d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 12:53:06 -0500
Subject: [PATCH 4553/8469] Update documentation on release frequency.

---
 docs/releases.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/releases.txt b/docs/releases.txt
index 66c0896f2d..4c8d6b8d6e 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -17,6 +17,25 @@ revision slated for release::
 
     python -m jaraco.packaging.release
 
+Release Frequency
+-----------------
+
+Some have asked why Setuptools is released so frequently. Because Setuptools
+uses a mechanical release process, it's very easy to make releases whenever the
+code is stable (tests are passing). As a result, the philosophy is to release
+early and often.
+
+While some find the frequent releases somewhat surprising, they only empower
+the user. Although releases are made frequently, users can choose the frequency
+at which they use those releases. If instead Setuptools contributions were only
+released in batches, the user would be constrained to only use Setuptools when
+those official releases were made. With frequent releases, the user can govern
+exactly how often he wishes to update.
+
+Frequent releases also then obviate the need for dev or beta releases in most
+cases. Because releases are made early and often, bugs are discovered and
+corrected quickly, in many cases before other users have yet to encounter them.
+
 Release Managers
 ----------------
 

From 886e99ae6c47087b29bc28e81cbd1d3dfec84b4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 19:02:33 -0500
Subject: [PATCH 4554/8469] Updated changelog to reference setuptools_svn as
 published.

---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c0ed23a2e2..3f5c442f5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,8 @@ CHANGES
 
 * Issue #313: Removed built-in support for subversion. Projects wishing to
   retain support for subversion will need to use a third party library. The
-  extant implementation is being ported to setuptools_svn, to be announced.
+  extant implementation is being ported to `setuptools_svn
+  <https://pypi.python.org/pypi/setuptools_svn>`_.
 
 ---
 8.3

From 4d121763d63948f4735249e7240b454a57b01159 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 23:45:53 -0500
Subject: [PATCH 4555/8469] Bumped to 9.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 513449f919..257ccd91c2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.4"
+DEFAULT_VERSION = "9.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 60a9e0b2a7..ecdc7c9268 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.4'
+__version__ = '9.0'

From 83f91c6774f526d4561b4e9fc22b7d00076217a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Dec 2014 23:47:50 -0500
Subject: [PATCH 4556/8469] Added tag 9.0b1 for changeset 0eee586a153f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4dccce7edd..188b83cb35 100644
--- a/.hgtags
+++ b/.hgtags
@@ -171,3 +171,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
 efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
 cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
+0eee586a153f068142c1a0df4bc2635ed2c1a1cc 9.0b1

From 6be9025c1da807ba629440e344816155c24fa3f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Dec 2014 13:22:57 -0500
Subject: [PATCH 4557/8469] Update docs to reflect new behavior.

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index a34ec30444..89c08e23f8 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -308,7 +308,7 @@ unless you need the associated ``setuptools`` feature.
 
     (Note: projects listed in ``setup_requires`` will NOT be automatically
     installed on the system where the setup script is being run.  They are
-    simply downloaded to the setup directory if they're not locally available
+    simply downloaded to the ./.eggs directory if they're not locally available
     already.  If you want them to be installed, as well as being available
     when the setup script is run, you should add them to ``install_requires``
     **and** ``setup_requires``.)

From c966002df7e3f142a9f47ed9695e1098f7f6b80a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Dec 2014 13:33:29 -0500
Subject: [PATCH 4558/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index be20e66839..004a16407b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+---
+8.4
+---
+
+* Pull Request #106: Now write ``setup_requires`` metadata.
+
 ---
 8.3
 ---

From 054a612792b4d66edb3112f5561c09d363a5f64b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Dec 2014 13:37:19 -0500
Subject: [PATCH 4559/8469] Update documentation to reflect new function.

---
 docs/formats.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/formats.txt b/docs/formats.txt
index 5c461ecb61..9e6fe72787 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -286,6 +286,12 @@ that can be used to obtain ``Requirement`` objects describing the
 project's core and optional dependencies.
 
 
+``setup_requires.txt``
+----------------------
+
+Much like ``requires.txt`` except represents the requirements
+specified by the ``setup_requires`` parameter to the Distribution.
+
 
 ``dependency_links.txt``
 ------------------------

From b0d85d1b085ca398ea95ba0ea1e071dbce70c9a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Dec 2014 13:42:57 -0500
Subject: [PATCH 4560/8469] Added tag 8.4 for changeset 921e60a0f906

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4dccce7edd..5604e4f90b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -171,3 +171,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
 efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
 cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
+921e60a0f9067311571fde9ccf2f35223159d9f6 8.4

From ec90f46ff647d73f0769d1d25259b21ae15c95b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Dec 2014 13:44:04 -0500
Subject: [PATCH 4561/8469] Bumped to 8.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 513449f919..1abb780dbc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.4"
+DEFAULT_VERSION = "8.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 60a9e0b2a7..dc4e8c6a7e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.4'
+__version__ = '8.5'

From 8aa6480a1242aaa658d4bd521ff04efd1663a459 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Dec 2014 11:07:39 -0500
Subject: [PATCH 4562/8469] Extract sandboxing context as a series of
 encapsulated contexts.

---
 setuptools/sandbox.py | 113 ++++++++++++++++++++++++++++++++----------
 1 file changed, 87 insertions(+), 26 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e79a13a8a1..131b704855 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -5,6 +5,7 @@
 import functools
 import itertools
 import re
+import contextlib
 
 import pkg_resources
 
@@ -42,20 +43,95 @@ def _execfile(filename, globals, locals=None):
     code = compile(script, filename, 'exec')
     exec(code, globals, locals)
 
+
+@contextlib.contextmanager
+def save_argv():
+    saved = sys.argv[:]
+    try:
+        yield saved
+    finally:
+        sys.argv[:] = saved
+
+
+@contextlib.contextmanager
+def save_path():
+    saved = sys.path[:]
+    try:
+        yield saved
+    finally:
+        sys.path[:] = saved
+
+
+@contextlib.contextmanager
+def override_temp(replacement):
+    """
+    Monkey-patch tempfile.tempdir with replacement, ensuring it exists
+    """
+    if not os.path.isdir(replacement):
+        os.makedirs(replacement)
+
+    saved = tempfile.tempdir
+
+    tempfile.tempdir = replacement
+
+    try:
+        yield
+    finally:
+        tempfile.tempdir = saved
+
+
+@contextlib.contextmanager
+def pushd(target):
+    saved = os.getcwd()
+    os.chdir(target)
+    try:
+        yield saved
+    finally:
+        os.chdir(saved)
+
+
+@contextlib.contextmanager
+def save_modules():
+    saved = sys.modules.copy()
+    try:
+        yield saved
+    finally:
+        sys.modules.update(saved)
+        # remove any modules imported since
+        del_modules = [
+            mod_name for mod_name in sys.modules
+            if mod_name not in saved
+            # exclude any encodings modules. See #285
+            and not mod_name.startswith('encodings.')
+        ]
+        list(map(sys.modules.__delitem__, del_modules))
+
+
+@contextlib.contextmanager
+def save_pkg_resources_state():
+    saved = pkg_resources.__getstate__()
+    try:
+        yield saved
+    finally:
+        pkg_resources.__setstate__(saved)
+
+
+@contextlib.contextmanager
+def setup_context(setup_dir):
+    temp_dir = os.path.join(setup_dir, 'temp')
+    with save_pkg_resources_state():
+        with save_modules():
+            with save_path():
+                with save_argv():
+                    with override_temp(temp_dir):
+                        with pushd(setup_dir):
+                            yield
+
+
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
-    old_dir = os.getcwd()
-    save_argv = sys.argv[:]
-    save_path = sys.path[:]
     setup_dir = os.path.abspath(os.path.dirname(setup_script))
-    temp_dir = os.path.join(setup_dir,'temp')
-    if not os.path.isdir(temp_dir): os.makedirs(temp_dir)
-    save_tmp = tempfile.tempdir
-    save_modules = sys.modules.copy()
-    pr_state = pkg_resources.__getstate__()
-    try:
-        tempfile.tempdir = temp_dir
-        os.chdir(setup_dir)
+    with setup_context(setup_dir):
         try:
             sys.argv[:] = [setup_script]+list(args)
             sys.path.insert(0, setup_dir)
@@ -71,21 +147,6 @@ def runner():
             if v.args and v.args[0]:
                 raise
             # Normal exit, just return
-    finally:
-        pkg_resources.__setstate__(pr_state)
-        sys.modules.update(save_modules)
-        # remove any modules imported within the sandbox
-        del_modules = [
-            mod_name for mod_name in sys.modules
-            if mod_name not in save_modules
-            # exclude any encodings modules. See #285
-            and not mod_name.startswith('encodings.')
-        ]
-        list(map(sys.modules.__delitem__, del_modules))
-        os.chdir(old_dir)
-        sys.path[:] = save_path
-        sys.argv[:] = save_argv
-        tempfile.tempdir = save_tmp
 
 
 class AbstractSandbox:

From 345daf03e205e6d363ee638b9d0e49b03fb27230 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 14:59:38 -0500
Subject: [PATCH 4563/8469] Update docs about bootstrap script.

---
 docs/releases.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/releases.txt b/docs/releases.txt
index 4c8d6b8d6e..a9742c2076 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -17,6 +17,24 @@ revision slated for release::
 
     python -m jaraco.packaging.release
 
+Bootstrap Bookmark
+------------------
+
+Setuptools has a bootstrap script (ez_setup.py) which is hosted in the
+repository and must be updated with each release (to bump the default version).
+The "published" version of the script is the one indicated by the ``bootstrap``
+bookmark (Mercurial) or branch (Git).
+
+Therefore, the latest bootstrap script can be retrieved by checking out the
+repository at that bookmark. It's also possible to get the bootstrap script for
+any particular release by grabbing the script from that tagged release.
+
+The officially-published location of the bootstrap script is hosted on Python
+infrastructure (#python-infra on freenode) at https://bootstrap.pypa.io and
+is updated every fifteen minutes from the bootstrap script. Sometimes,
+especially when the bootstrap script is rolled back, this
+process doesn't work as expected and requires manual intervention.
+
 Release Frequency
 -----------------
 

From 9c24e096d0a4b1a50148e2373a3fc18fa41eb69d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 15:05:21 -0500
Subject: [PATCH 4564/8469] Remove setup_requirements writer from metadata.
 Fixes #314.

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 56a071def7..ff519e3e44 100755
--- a/setup.py
+++ b/setup.py
@@ -163,7 +163,6 @@ def _save_entry_points(self):
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
-            "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements",
             "entry_points.txt = setuptools.command.egg_info:write_entries",
             "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
             "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",

From beef07b0dd8d538b638d8f604efd83aee14097e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 15:12:52 -0500
Subject: [PATCH 4565/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 004a16407b..463f45b837 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+9.0
+---
+
+* Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
+  where Setuptools was unable to upgrade over earlier versions.
+
 ---
 8.4
 ---

From 824cfa0bc32d500da6fd045147f752e8bf02f7b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 15:39:46 -0500
Subject: [PATCH 4566/8469] Remove setuptools modules from sys.modules before
 invoking setup script. Fixes #315.

---
 setuptools/sandbox.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 131b704855..e958f91233 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -121,6 +121,7 @@ def setup_context(setup_dir):
     temp_dir = os.path.join(setup_dir, 'temp')
     with save_pkg_resources_state():
         with save_modules():
+            hide_setuptools()
             with save_path():
                 with save_argv():
                     with override_temp(temp_dir):
@@ -128,6 +129,32 @@ def setup_context(setup_dir):
                             yield
 
 
+def _is_setuptools_module(mod_name):
+    """
+    >>> is_setuptools_module('setuptools')
+    True
+    >>> is_setuptools_module('pkg_resources')
+    True
+    >>> is_setuptools_module('setuptools_plugin')
+    False
+    >>> is_setuptools_module('setuptools.__init__')
+    True
+    """
+    pattern = re.compile('(setuptools|pkg_resources)(\.|$)')
+    return bool(pattern.match(mod_name))
+
+
+def hide_setuptools():
+    """
+    Remove references to setuptools' modules from sys.modules to allow the
+    invocation to import the most appropriate setuptools. This technique is
+    necessary to avoid issues such as #315 where setuptools upgrading itself
+    would fail to find a function declared in the metadata.
+    """
+    modules = list(filter(_is_setuptools_module, sys.modules))
+    list(map(sys.modules.__delitem__, modules))
+
+
 def run_setup(setup_script, args):
     """Run a distutils setup script, sandboxed in its directory"""
     setup_dir = os.path.abspath(os.path.dirname(setup_script))

From eb2fdc6f488d1a1d4b0cf02e9a8cf03ab33f9d23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 15:42:40 -0500
Subject: [PATCH 4567/8469] Extract function for _clear_modules, encapsulating
 the need for the module names to be greedily evaluated before removing them.

---
 setuptools/sandbox.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e958f91233..f4f9dfec99 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -98,13 +98,18 @@ def save_modules():
     finally:
         sys.modules.update(saved)
         # remove any modules imported since
-        del_modules = [
+        del_modules = (
             mod_name for mod_name in sys.modules
             if mod_name not in saved
             # exclude any encodings modules. See #285
             and not mod_name.startswith('encodings.')
-        ]
-        list(map(sys.modules.__delitem__, del_modules))
+        )
+        _clear_modules(del_modules)
+
+
+def _clear_modules(module_names):
+    for mod_name in list(module_names):
+        del sys.modules[mod_name]
 
 
 @contextlib.contextmanager
@@ -151,8 +156,8 @@ def hide_setuptools():
     necessary to avoid issues such as #315 where setuptools upgrading itself
     would fail to find a function declared in the metadata.
     """
-    modules = list(filter(_is_setuptools_module, sys.modules))
-    list(map(sys.modules.__delitem__, modules))
+    modules = filter(_is_setuptools_module, sys.modules)
+    _clear_modules(modules)
 
 
 def run_setup(setup_script, args):

From af34e901c35e5e453465c0c232eaa04d019a9852 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 15:49:10 -0500
Subject: [PATCH 4568/8469] Update changelog

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 463f45b837..d0b7e9b06e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@ CHANGES
 
 * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
   where Setuptools was unable to upgrade over earlier versions.
+* Issue #315: Updated setuptools to hide its own loaded modules during
+  installation of another package. This change will enable setuptools to
+  upgrade (or downgrade) itself even when its own metadata and implementation
+  change.
 
 ---
 8.4

From 15d7d87013e9c95f1e343ab7fee3d7f2bbd1d607 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 16:01:33 -0500
Subject: [PATCH 4569/8469] Include distutils in modules hidden

---
 setuptools/sandbox.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index f4f9dfec99..2216e9a6dc 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -144,8 +144,10 @@ def _is_setuptools_module(mod_name):
     False
     >>> is_setuptools_module('setuptools.__init__')
     True
+    >>> is_setuptools_module('distutils')
+    True
     """
-    pattern = re.compile('(setuptools|pkg_resources)(\.|$)')
+    pattern = re.compile('(setuptools|pkg_resources|distutils)(\.|$)')
     return bool(pattern.match(mod_name))
 
 

From b239a5f2ec3ef076bfe825db1a694f02351b281f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 16:01:43 -0500
Subject: [PATCH 4570/8469] Correct docstring

---
 setuptools/sandbox.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 2216e9a6dc..63760df4bf 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -136,15 +136,15 @@ def setup_context(setup_dir):
 
 def _is_setuptools_module(mod_name):
     """
-    >>> is_setuptools_module('setuptools')
+    >>> _is_setuptools_module('setuptools')
     True
-    >>> is_setuptools_module('pkg_resources')
+    >>> _is_setuptools_module('pkg_resources')
     True
-    >>> is_setuptools_module('setuptools_plugin')
+    >>> _is_setuptools_module('setuptools_plugin')
     False
-    >>> is_setuptools_module('setuptools.__init__')
+    >>> _is_setuptools_module('setuptools.__init__')
     True
-    >>> is_setuptools_module('distutils')
+    >>> _is_setuptools_module('distutils')
     True
     """
     pattern = re.compile('(setuptools|pkg_resources|distutils)(\.|$)')

From ee14a898847efe9d53f7dc57b872805753463eb5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 16:02:14 -0500
Subject: [PATCH 4571/8469] Rename function to match intention.

---
 setuptools/sandbox.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 63760df4bf..f1b60cc091 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -134,17 +134,17 @@ def setup_context(setup_dir):
                             yield
 
 
-def _is_setuptools_module(mod_name):
+def _needs_hiding(mod_name):
     """
-    >>> _is_setuptools_module('setuptools')
+    >>> _needs_hiding('setuptools')
     True
-    >>> _is_setuptools_module('pkg_resources')
+    >>> _needs_hiding('pkg_resources')
     True
-    >>> _is_setuptools_module('setuptools_plugin')
+    >>> _needs_hiding('setuptools_plugin')
     False
-    >>> _is_setuptools_module('setuptools.__init__')
+    >>> _needs_hiding('setuptools.__init__')
     True
-    >>> _is_setuptools_module('distutils')
+    >>> _needs_hiding('distutils')
     True
     """
     pattern = re.compile('(setuptools|pkg_resources|distutils)(\.|$)')
@@ -158,7 +158,7 @@ def hide_setuptools():
     necessary to avoid issues such as #315 where setuptools upgrading itself
     would fail to find a function declared in the metadata.
     """
-    modules = filter(_is_setuptools_module, sys.modules)
+    modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)
 
 

From 22715bcc472ac5b41cfcd94fa7ca26a5cef01eb9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 20:54:46 -0500
Subject: [PATCH 4572/8469] Disable purging of distutils/setuptools during
 sandbox operations. Ref #315.

---
 CHANGES.txt           | 4 ----
 setuptools/sandbox.py | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d0b7e9b06e..463f45b837 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,10 +8,6 @@ CHANGES
 
 * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
   where Setuptools was unable to upgrade over earlier versions.
-* Issue #315: Updated setuptools to hide its own loaded modules during
-  installation of another package. This change will enable setuptools to
-  upgrade (or downgrade) itself even when its own metadata and implementation
-  change.
 
 ---
 8.4
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index f1b60cc091..e3c18e39d2 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -126,7 +126,9 @@ def setup_context(setup_dir):
     temp_dir = os.path.join(setup_dir, 'temp')
     with save_pkg_resources_state():
         with save_modules():
-            hide_setuptools()
+            # Disabled per
+            # https://bitbucket.org/pypa/setuptools/issue/315/setuptools-should-always-use-its-own#comment-14512075
+            # hide_setuptools()
             with save_path():
                 with save_argv():
                     with override_temp(temp_dir):

From d01f1071facee9aecbf8e4c298b0ada9e2a86ff3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 20:57:13 -0500
Subject: [PATCH 4573/8469] Bumped to 9.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1abb780dbc..257ccd91c2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "8.5"
+DEFAULT_VERSION = "9.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index dc4e8c6a7e..ecdc7c9268 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.5'
+__version__ = '9.0'

From b3f62d9d1962f3a40f0f29dee24e43985a160372 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 20:57:34 -0500
Subject: [PATCH 4574/8469] Added tag 9.0 for changeset 0d7b9b63d06a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5604e4f90b..9f1a082e11 100644
--- a/.hgtags
+++ b/.hgtags
@@ -172,3 +172,4 @@ d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
 efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
 cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
 921e60a0f9067311571fde9ccf2f35223159d9f6 8.4
+0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0

From eba2f2e7cd3b4f6c83e20eb796dd4605135f25fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Dec 2014 20:58:04 -0500
Subject: [PATCH 4575/8469] Bumped to 9.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 257ccd91c2..45432ab0a3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.0"
+DEFAULT_VERSION = "9.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index ecdc7c9268..0c9cd65dbb 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.0'
+__version__ = '9.1'

From ce9d08f79a1e00070ffae5e9923495a63abee0ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 09:45:28 -0500
Subject: [PATCH 4576/8469] Include api_tests.txt in the sdist. Fixes #312.

---
 CHANGES.txt | 6 ++++++
 MANIFEST.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 463f45b837..39fbee7cfd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+-----
+9.0.1
+-----
+
+* Issue #312: Restored presence of pkg_resources API tests (doctest) to sdist.
+
 ---
 9.0
 ---
diff --git a/MANIFEST.in b/MANIFEST.in
index 8916394a17..f6caf61a99 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@ recursive-include setuptools/tests *.html entries*
 recursive-include setuptools/tests/svn_data *.zip
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
-recursive-include pkg_resources *.py
+recursive-include pkg_resources *.py *.txt
 include *.py
 include *.txt
 include MANIFEST.in

From fedce94aa39dc453dbab5b644e9d7a1904e1e838 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 09:47:38 -0500
Subject: [PATCH 4577/8469] Bumped to 9.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 45432ab0a3..44c6551a7b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.1"
+DEFAULT_VERSION = "9.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0c9cd65dbb..c81459c6c2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.1'
+__version__ = '9.0.1'

From 6ffe59f9d87f66c53c33e96d7206e91eebe3356f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 09:47:39 -0500
Subject: [PATCH 4578/8469] Added tag 9.0.1 for changeset fa069bf2411a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9f1a082e11..88e40e3504 100644
--- a/.hgtags
+++ b/.hgtags
@@ -173,3 +173,4 @@ efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
 cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
 921e60a0f9067311571fde9ccf2f35223159d9f6 8.4
 0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0
+fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1

From 2f970dc0ee4d4cef77d12901108944ae157391a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 09:48:10 -0500
Subject: [PATCH 4579/8469] Bumped to 9.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 44c6551a7b..85697d3e6c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.0.1"
+DEFAULT_VERSION = "9.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index c81459c6c2..51b5923d85 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.0.1'
+__version__ = '9.0.2'

From 03a6fe16d7de9ff44ca38f2c5beb807e4733e5a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:13:14 -0500
Subject: [PATCH 4580/8469] Prefer vendored packaging.

---
 CHANGES.txt               | 7 +++++++
 pkg_resources/__init__.py | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 39fbee7cfd..73ddaff754 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+---
+9.1
+---
+
+* Prefer vendored packaging library `as recommended
+  <https://github.com/jaraco/setuptools/commit/170657b68f4b92e7e1bf82f5e19a831f5744af67#commitcomment-9109448>`_.
+
 -----
 9.0.1
 -----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a055cf1a32..0664f66600 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -76,13 +76,14 @@
     pass
 
 try:
-    import packaging.version
-    import packaging.specifiers
-except ImportError:
-    # fallback to vendored version
     import pkg_resources._vendor.packaging.version
     import pkg_resources._vendor.packaging.specifiers
     packaging = pkg_resources._vendor.packaging
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import packaging.version
+    import packaging.specifiers
 
 
 class PEP440Warning(RuntimeWarning):

From a87a4245eca468d09b69ca078f7105c38e03405b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:15:00 -0500
Subject: [PATCH 4581/8469] Bumped to 9.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 85697d3e6c..45432ab0a3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.0.2"
+DEFAULT_VERSION = "9.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 51b5923d85..0c9cd65dbb 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.0.2'
+__version__ = '9.1'

From 4e4b8729bc355ce4cb09c75934cdb2824b882646 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:15:01 -0500
Subject: [PATCH 4582/8469] Added tag 9.1 for changeset 3ed27d68d3f4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 88e40e3504..5dd0807d1f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -174,3 +174,4 @@ cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
 921e60a0f9067311571fde9ccf2f35223159d9f6 8.4
 0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0
 fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
+3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1

From cd8a46e3c9f604bc2bd1ba769854cfa73f905d28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:15:31 -0500
Subject: [PATCH 4583/8469] Bumped to 9.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 45432ab0a3..0feb10558e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.1"
+DEFAULT_VERSION = "9.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0c9cd65dbb..465f8ef87c 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.1'
+__version__ = '9.2'

From 01ca6210955b4a0fcb1e887d7b156c923e5d3eff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:17:00 -0500
Subject: [PATCH 4584/8469] Remove unused import

---
 setuptools/tests/test_easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a44309530f..3659d53f9f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -23,7 +23,6 @@
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
 import pkg_resources
-from .py26compat import skipIf
 
 class FakeDist(object):
     def get_entry_map(self, group):

From 02b5adcc7ff26f6eaf024ec46f22b0c26c8f9c0b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 13:37:08 -0500
Subject: [PATCH 4585/8469] Remove duplicate import

---
 setuptools/tests/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 48b29c4ced..e5d6545ad0 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -11,7 +11,6 @@
 from distutils.version import LooseVersion
 from setuptools.compat import func_code
 
-from setuptools.compat import func_code
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools import Feature

From 42d0bc2269e6a1ddfb056e70b95712ad31401c89 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 14:06:05 -0500
Subject: [PATCH 4586/8469] Rename variable for clarity.

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3659d53f9f..6358c93457 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -435,10 +435,10 @@ def reset_setup_stop_context():
     within those tests, it's necessary to reset the global variable
     in distutils.core so that the setup() command will run naturally.
     """
-    setup_stop_after = distutils.core._setup_stop_after
+    saved = distutils.core._setup_stop_after
     distutils.core._setup_stop_after = None
     yield
-    distutils.core._setup_stop_after = setup_stop_after
+    distutils.core._setup_stop_after = saved
 
 
 @contextlib.contextmanager

From 4a7ea62f3efc4297bcc8c2a8094fa687474fb5f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 14:06:26 -0500
Subject: [PATCH 4587/8469] Reindent using textwrap

---
 setuptools/command/easy_install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a71a7f363a..d368e1a386 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2121,10 +2121,10 @@ def main(argv=None, **kw):
     from setuptools.dist import Distribution
     import distutils.core
 
-    USAGE = """\
-usage: %(script)s [options] requirement_or_url ...
-   or: %(script)s --help
-"""
+    USAGE = textwrap.dedent("""
+        usage: %(script)s [options] requirement_or_url ...
+           or: %(script)s --help
+        """).lstrip()
 
     def gen_usage(script_name):
         return USAGE % dict(

From 8826a85c8c2dd4b3b5080de725486b0b30e79e4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 14:29:09 -0500
Subject: [PATCH 4588/8469] Extract _patch_usage and re-implement as a context
 manager.

---
 setuptools/command/easy_install.py | 50 ++++++++++++++++--------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d368e1a386..125ceba2fa 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -34,6 +34,7 @@
 import warnings
 import site
 import struct
+import contextlib
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -2119,39 +2120,42 @@ def bootstrap():
 def main(argv=None, **kw):
     from setuptools import setup
     from setuptools.dist import Distribution
-    import distutils.core
-
-    USAGE = textwrap.dedent("""
-        usage: %(script)s [options] requirement_or_url ...
-           or: %(script)s --help
-        """).lstrip()
-
-    def gen_usage(script_name):
-        return USAGE % dict(
-            script=os.path.basename(script_name),
-        )
-
-    def with_ei_usage(f):
-        old_gen_usage = distutils.core.gen_usage
-        try:
-            distutils.core.gen_usage = gen_usage
-            return f()
-        finally:
-            distutils.core.gen_usage = old_gen_usage
 
     class DistributionWithoutHelpCommands(Distribution):
         common_usage = ""
 
         def _show_help(self, *args, **kw):
-            with_ei_usage(lambda: Distribution._show_help(self, *args, **kw))
+            with _patch_usage():
+                Distribution._show_help(self, *args, **kw)
 
     if argv is None:
         argv = sys.argv[1:]
 
-    with_ei_usage(
-        lambda: setup(
+    with _patch_usage():
+        setup(
             script_args=['-q', 'easy_install', '-v'] + argv,
             script_name=sys.argv[0] or 'easy_install',
             distclass=DistributionWithoutHelpCommands, **kw
         )
-    )
+
+
+@contextlib.contextmanager
+def _patch_usage():
+    import distutils.core
+    USAGE = textwrap.dedent("""
+        usage: %(script)s [options] requirement_or_url ...
+           or: %(script)s --help
+        """).lstrip()
+
+    def gen_usage(script_name):
+        return USAGE % dict(
+            script=os.path.basename(script_name),
+        )
+
+    saved = distutils.core.gen_usage
+    distutils.core.gen_usage = gen_usage
+    try:
+        yield
+    finally:
+        distutils.core.gen_usage = saved
+

From 195076859f1716ec22ea08dc1b29de47fca7af0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 14:39:00 -0500
Subject: [PATCH 4589/8469] Remove unused import

---
 setuptools/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ca025c305d..8188f12528 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,6 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
-import sys
 import distutils.core
 import distutils.filelist
 from distutils.core import Command as _Command

From 80561b7f0bb7cf8488e342ee853ac9aff107b021 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 14:49:47 -0500
Subject: [PATCH 4590/8469] Use pytest to capture exception

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6358c93457..530f89f34e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -12,6 +12,8 @@
 import logging
 import distutils.core
 
+import pytest
+
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
@@ -278,8 +280,8 @@ def test_setup_requires_honors_fetch_params(self):
                             with argv_context(['easy_install']):
                                 # attempt to install the dist. It should fail because
                                 #  it doesn't exist.
-                                self.assertRaises(SystemExit,
-                                    easy_install_pkg.main, ei_params)
+                                with pytest.raises(SystemExit):
+                                    easy_install_pkg.main(ei_params)
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
         self.assertTrue(2 <= len(p_index.requests) <= 3)

From 1e6095429693886831747050b38bad979eaaf966 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 22:17:26 -0500
Subject: [PATCH 4591/8469] Backed out changeset: 40cc1fbecb1c Restores purging
 of distutils/setuptools during sandbox operations. Ref #315.

---
 CHANGES.txt           | 4 ++++
 setuptools/sandbox.py | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 73ddaff754..bc257058bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,10 @@ CHANGES
 
 * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
   where Setuptools was unable to upgrade over earlier versions.
+* Issue #315: Updated setuptools to hide its own loaded modules during
+  installation of another package. This change will enable setuptools to
+  upgrade (or downgrade) itself even when its own metadata and implementation
+  change.
 
 ---
 8.4
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e3c18e39d2..f1b60cc091 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -126,9 +126,7 @@ def setup_context(setup_dir):
     temp_dir = os.path.join(setup_dir, 'temp')
     with save_pkg_resources_state():
         with save_modules():
-            # Disabled per
-            # https://bitbucket.org/pypa/setuptools/issue/315/setuptools-should-always-use-its-own#comment-14512075
-            # hide_setuptools()
+            hide_setuptools()
             with save_path():
                 with save_argv():
                     with override_temp(temp_dir):

From 5e3a3a9b69eaca2924d2e1ffdcb1ef076ce2c4ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 22:18:02 -0500
Subject: [PATCH 4592/8469] Move changelog entry

---
 CHANGES.txt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bc257058bd..acde954e42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+---
+future
+---
+
+* Issue #315: Updated setuptools to hide its own loaded modules during
+  installation of another package. This change will enable setuptools to
+  upgrade (or downgrade) itself even when its own metadata and implementation
+  change.
+
 ---
 9.1
 ---
@@ -21,10 +30,6 @@ CHANGES
 
 * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
   where Setuptools was unable to upgrade over earlier versions.
-* Issue #315: Updated setuptools to hide its own loaded modules during
-  installation of another package. This change will enable setuptools to
-  upgrade (or downgrade) itself even when its own metadata and implementation
-  change.
 
 ---
 8.4

From 12169497ccb2303474016e01933f52d7e4eab93a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 22:48:19 -0500
Subject: [PATCH 4593/8469] Catch, save, and restore any exceptions across the
 save_modules context. This corrects the latter of the two test failures. Ref
 #315.

---
 setuptools/sandbox.py | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index f1b60cc091..c6840ce4a8 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -6,6 +6,7 @@
 import itertools
 import re
 import contextlib
+import pickle
 
 import pkg_resources
 
@@ -21,6 +22,7 @@
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
+from setuptools import compat
 from setuptools.compat import builtins
 
 __all__ = [
@@ -92,19 +94,38 @@ def pushd(target):
 
 @contextlib.contextmanager
 def save_modules():
+    """
+    Context in which imported modules are saved.
+
+    Translates exceptions internal to the context into the equivalent exception
+    outside the context.
+    """
     saved = sys.modules.copy()
     try:
-        yield saved
-    finally:
-        sys.modules.update(saved)
-        # remove any modules imported since
-        del_modules = (
-            mod_name for mod_name in sys.modules
-            if mod_name not in saved
-            # exclude any encodings modules. See #285
-            and not mod_name.startswith('encodings.')
-        )
-        _clear_modules(del_modules)
+        try:
+            yield saved
+        except:
+            # dump any exception
+            class_, exc, tb = sys.exc_info()
+            saved_cls = pickle.dumps(class_)
+            saved_exc = pickle.dumps(exc)
+            raise
+        finally:
+            sys.modules.update(saved)
+            # remove any modules imported since
+            del_modules = (
+                mod_name for mod_name in sys.modules
+                if mod_name not in saved
+                # exclude any encodings modules. See #285
+                and not mod_name.startswith('encodings.')
+            )
+            _clear_modules(del_modules)
+    except:
+        # reload and re-raise any exception, using restored modules
+        class_, exc, tb = sys.exc_info()
+        new_cls = pickle.loads(saved_cls)
+        new_exc = pickle.loads(saved_exc)
+        compat.reraise(new_cls, new_exc, tb)
 
 
 def _clear_modules(module_names):

From dce270b4271ad6607c28103c9199303121b52015 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 23:40:30 -0500
Subject: [PATCH 4594/8469] Make sure to monkey-patch the easy_install module
 in the setup context. Fixes the other former test failure. Ref #315.

---
 setup.py                              |  1 +
 setuptools/tests/test_easy_install.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/setup.py b/setup.py
index ff519e3e44..937b5794b5 100755
--- a/setup.py
+++ b/setup.py
@@ -210,6 +210,7 @@ def _save_entry_points(self):
     tests_require=[
         'setuptools[ssl]',
         'pytest',
+        'mock',
     ],
     setup_requires=[
     ] + pytest_runner,
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 530f89f34e..546fa75082 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -13,7 +13,9 @@
 import distutils.core
 
 import pytest
+import mock
 
+from setuptools import sandbox
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
@@ -227,6 +229,27 @@ def test_local_index(self):
             else:
                 del os.environ['PYTHONPATH']
 
+    @contextlib.contextmanager
+    def user_install_setup_context(self, *args, **kwargs):
+        """
+        Wrap sandbox.setup_context to patch easy_install in that context to
+        appear as user-installed.
+        """
+        with self.orig_context(*args, **kwargs):
+            import setuptools.command.easy_install as ei
+            ei.__file__ = site.USER_SITE
+            yield
+
+
+    def patched_setup_context(self):
+        self.orig_context = sandbox.setup_context
+
+        return mock.patch(
+            'setuptools.sandbox.setup_context',
+            self.user_install_setup_context,
+        )
+
+
     def test_setup_requires(self):
         """Regression test for Distribute issue #318
 
@@ -241,6 +264,7 @@ def test_setup_requires(self):
         try:
             with quiet_context():
                 with reset_setup_stop_context():
+                  with self.patched_setup_context():
                     run_setup(test_setup_py, ['install'])
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')

From 457b0161e28614dec6b6ff0f1dbbc090d9e0c597 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Dec 2014 23:41:03 -0500
Subject: [PATCH 4595/8469] Reindent

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 546fa75082..38a49bf788 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -264,8 +264,8 @@ def test_setup_requires(self):
         try:
             with quiet_context():
                 with reset_setup_stop_context():
-                  with self.patched_setup_context():
-                    run_setup(test_setup_py, ['install'])
+                    with self.patched_setup_context():
+                        run_setup(test_setup_py, ['install'])
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
         except IndexError:

From dbab8ae868d8b15d7082ee19bbd577140dea9652 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 09:26:59 -0500
Subject: [PATCH 4596/8469] Indent script for clarity

---
 setuptools/tests/test_easy_install.py | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 530f89f34e..bb6b7fc57b 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -35,24 +35,24 @@ def get_entry_map(self, group):
     def as_requirement(self):
         return 'spec'
 
-WANTED = """\
-#!%s
-# EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-__requires__ = 'spec'
-import sys
-from pkg_resources import load_entry_point
-
-if __name__ == '__main__':
-    sys.exit(
-        load_entry_point('spec', 'console_scripts', 'name')()
-    )
-""" % nt_quote_arg(fix_jython_executable(sys.executable, ""))
-
-SETUP_PY = """\
-from setuptools import setup
-
-setup(name='foo')
-"""
+WANTED = textwrap.dedent("""
+    #!%s
+    # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
+    __requires__ = 'spec'
+    import sys
+    from pkg_resources import load_entry_point
+
+    if __name__ == '__main__':
+        sys.exit(
+            load_entry_point('spec', 'console_scripts', 'name')()
+        )
+    """).lstrip() % nt_quote_arg(fix_jython_executable(sys.executable, ""))
+
+SETUP_PY = textwrap.dedent("""
+    from setuptools import setup
+
+    setup(name='foo')
+    """).lstrip()
 
 class TestEasyInstallTest(unittest.TestCase):
 

From 10197f6d76a56d358236ceb35435d3789d0fd2b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 09:45:51 -0500
Subject: [PATCH 4597/8469] Extract variable for clarity of reading

---
 setuptools/command/easy_install.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 125ceba2fa..1a2f56ae60 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1549,10 +1549,14 @@ def save(self):
 
     def add(self, dist):
         """Add `dist` to the distribution map"""
-        if (dist.location not in self.paths and (
-            dist.location not in self.sitedirs or
-            dist.location == os.getcwd()  # account for '.' being in PYTHONPATH
-        )):
+        new_path = (
+            dist.location not in self.paths and (
+                dist.location not in self.sitedirs or
+                # account for '.' being in PYTHONPATH
+                dist.location == os.getcwd()
+            )
+        )
+        if new_path:
             self.paths.append(dist.location)
             self.dirty = True
         Environment.add(self, dist)

From 292d4db0eb5c7591eed972ed9085362167816de0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 09:48:55 -0500
Subject: [PATCH 4598/8469] Rewrite test to remove Windows-specific handling
 and instead capture the underlying expectation.

---
 setuptools/tests/test_easy_install.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index bb6b7fc57b..a8f274d5e3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -114,10 +114,9 @@ def test_add_from_cwd_site_sets_dirty(self):
         self.assertTrue(pth.dirty)
 
     def test_add_from_site_is_ignored(self):
-        if os.name != 'nt':
-            location = '/test/location/does-not-have-to-exist'
-        else:
-            location = 'c:\\does_not_exist'
+        location = '/test/location/does-not-have-to-exist'
+        # PthDistributions expects all locations to be normalized
+        location = pkg_resources.normalize_path(location)
         pth = PthDistributions('does-not_exist', [location, ])
         self.assertTrue(not pth.dirty)
         pth.add(PRDistribution(location))

From 470028e10ea01e57ece6df3c953a309e0017d068 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 09:51:57 -0500
Subject: [PATCH 4599/8469] Rewrite file operations using context managers.

---
 setuptools/tests/test_easy_install.py | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a8f274d5e3..0bb4c22f8d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -128,9 +128,8 @@ class TestUserInstallTest(unittest.TestCase):
     def setUp(self):
         self.dir = tempfile.mkdtemp()
         setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'w')
-        f.write(SETUP_PY)
-        f.close()
+        with open(setup, 'w') as f:
+            f.write(SETUP_PY)
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
 
@@ -191,11 +190,8 @@ def test_local_index(self):
         new_location = tempfile.mkdtemp()
         target = tempfile.mkdtemp()
         egg_file = os.path.join(new_location, 'foo-1.0.egg-info')
-        f = open(egg_file, 'w')
-        try:
+        with open(egg_file, 'w') as f:
             f.write('Name: foo\n')
-        finally:
-            f.close()
 
         sys.path.append(target)
         old_ppath = os.environ.get('PYTHONPATH')
@@ -358,12 +354,11 @@ def create_setup_requires_package(path):
     test_setup_py = os.path.join(test_pkg, 'setup.py')
     os.mkdir(test_pkg)
 
-    f = open(test_setup_py, 'w')
-    f.write(textwrap.dedent("""\
-        import setuptools
-        setuptools.setup(**%r)
-    """ % test_setup_attrs))
-    f.close()
+    with open(test_setup_py, 'w') as f:
+        f.write(textwrap.dedent("""\
+            import setuptools
+            setuptools.setup(**%r)
+        """ % test_setup_attrs))
 
     foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
     make_trivial_sdist(
@@ -392,11 +387,8 @@ def make_trivial_sdist(dist_path, setup_py):
         MemFile = StringIO
     setup_py_bytes = MemFile(setup_py.encode('utf-8'))
     setup_py_file.size = len(setup_py_bytes.getvalue())
-    dist = tarfile.open(dist_path, 'w:gz')
-    try:
+    with tarfile.open(dist_path, 'w:gz') as dist:
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
-    finally:
-        dist.close()
 
 
 @contextlib.contextmanager

From 7794b1b0348f2cb76317b40a5ec7931527501c94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:01:23 -0500
Subject: [PATCH 4600/8469] Add compatibility shim for tarfile.open

---
 setuptools/tests/py26compat.py        | 12 ++++++++++++
 setuptools/tests/test_easy_install.py |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index d4fb891af6..24e6dbe293 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -1,4 +1,6 @@
+import sys
 import unittest
+import tarfile
 
 try:
 	# provide skipIf for Python 2.4-2.6
@@ -12,3 +14,13 @@ def skip(*args, **kwargs):
 				return skip
 			return func
 		return skipper
+
+def _tarfile_open_ex(*args, **kwargs):
+	"""
+	Extend result with an __exit__ to close the file.
+	"""
+	res = tarfile.open(*args, **kwargs)
+	res.__exit__ = lambda self: self.close()
+	return res
+
+tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else  tarfile.open
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 0bb4c22f8d..1abb82fdfe 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -26,6 +26,8 @@
 import setuptools.tests.server
 import pkg_resources
 
+from .py26compat import tarfile_open
+
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -387,7 +389,7 @@ def make_trivial_sdist(dist_path, setup_py):
         MemFile = StringIO
     setup_py_bytes = MemFile(setup_py.encode('utf-8'))
     setup_py_file.size = len(setup_py_bytes.getvalue())
-    with tarfile.open(dist_path, 'w:gz') as dist:
+    with tarfile_open(dist_path, 'w:gz') as dist:
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
 
 

From cd4aab1dff5f40aeaa08174a05f15527f67f66d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:04:27 -0500
Subject: [PATCH 4601/8469] Include __enter__ in shim

---
 setuptools/tests/py26compat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index 24e6dbe293..ead72fa6b5 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -17,10 +17,11 @@ def skip(*args, **kwargs):
 
 def _tarfile_open_ex(*args, **kwargs):
 	"""
-	Extend result with an __exit__ to close the file.
+	Extend result as a context manager.
 	"""
 	res = tarfile.open(*args, **kwargs)
 	res.__exit__ = lambda self: self.close()
+	res.__enter__ = lambda self: self
 	return res
 
 tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else  tarfile.open

From 271734598e6c9fc50b4809ee223cc3281d54615c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:12:57 -0500
Subject: [PATCH 4602/8469] Try without self, as methods are set on the
 instance. Also include parameters to __exit__.

---
 setuptools/tests/py26compat.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index ead72fa6b5..efe2f95651 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -20,8 +20,9 @@ def _tarfile_open_ex(*args, **kwargs):
 	Extend result as a context manager.
 	"""
 	res = tarfile.open(*args, **kwargs)
-	res.__exit__ = lambda self: self.close()
-	res.__enter__ = lambda self: self
+	res.__exit__ = lambda exc_type, exc_value, traceback: self.close()
+	res.__enter__ = lambda: res
 	return res
 
-tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else  tarfile.open
+tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else tarfile.open
+tarfile_open = _tarfile_open_ex

From f678f5c1a197c504ae6703f3b4e5658f9e2db1f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:15:45 -0500
Subject: [PATCH 4603/8469] Remove spurious reference to self. Remove debugging
 code.

---
 setuptools/tests/py26compat.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index efe2f95651..e120e7447a 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -20,9 +20,8 @@ def _tarfile_open_ex(*args, **kwargs):
 	Extend result as a context manager.
 	"""
 	res = tarfile.open(*args, **kwargs)
-	res.__exit__ = lambda exc_type, exc_value, traceback: self.close()
+	res.__exit__ = lambda exc_type, exc_value, traceback: res.close()
 	res.__enter__ = lambda: res
 	return res
 
 tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else tarfile.open
-tarfile_open = _tarfile_open_ex

From de1af740bc79592faac63b3c0c8d50383b373dd4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:20:30 -0500
Subject: [PATCH 4604/8469] Extract common operation of dedent and left strip

---
 setuptools/tests/test_easy_install.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1abb82fdfe..d915f3c5b5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -28,6 +28,14 @@
 
 from .py26compat import tarfile_open
 
+
+def DALS(input):
+    """
+    Dedent and left-strip
+    """
+    return textwrap.dedent(input).lstrip()
+
+
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -37,7 +45,7 @@ def get_entry_map(self, group):
     def as_requirement(self):
         return 'spec'
 
-WANTED = textwrap.dedent("""
+WANTED = DALS("""
     #!%s
     # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
     __requires__ = 'spec'
@@ -48,13 +56,13 @@ def as_requirement(self):
         sys.exit(
             load_entry_point('spec', 'console_scripts', 'name')()
         )
-    """).lstrip() % nt_quote_arg(fix_jython_executable(sys.executable, ""))
+    """) % nt_quote_arg(fix_jython_executable(sys.executable, ""))
 
-SETUP_PY = textwrap.dedent("""
+SETUP_PY = DALS("""
     from setuptools import setup
 
     setup(name='foo')
-    """).lstrip()
+    """)
 
 class TestEasyInstallTest(unittest.TestCase):
 
@@ -295,14 +303,14 @@ def create_sdist():
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
             make_trivial_sdist(
                 dist_path,
-                textwrap.dedent("""
+                DALS("""
                     import setuptools
                     setuptools.setup(
                         name="setuptools-test-fetcher",
                         version="1.0",
                         setup_requires = ['does-not-exist'],
                     )
-                """).lstrip())
+                """))
             yield dist_path
 
     def test_setup_requires_overrides_version_conflict(self):
@@ -357,7 +365,7 @@ def create_setup_requires_package(path):
     os.mkdir(test_pkg)
 
     with open(test_setup_py, 'w') as f:
-        f.write(textwrap.dedent("""\
+        f.write(DALS("""
             import setuptools
             setuptools.setup(**%r)
         """ % test_setup_attrs))
@@ -365,7 +373,7 @@ def create_setup_requires_package(path):
     foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
     make_trivial_sdist(
         foobar_path,
-        textwrap.dedent("""\
+        DALS("""
             import setuptools
             setuptools.setup(
                 name='foobar',

From 1a0233012a7a800bf585f739c4121e2ee830436d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:21:10 -0500
Subject: [PATCH 4605/8469] Extract script variable for clarity

---
 setuptools/tests/test_easy_install.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index d915f3c5b5..050633319d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -301,16 +301,18 @@ def create_sdist():
         """
         with tempdir_context() as dir:
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
-            make_trivial_sdist(
-                dist_path,
-                DALS("""
+            script = DALS("""
                     import setuptools
                     setuptools.setup(
                         name="setuptools-test-fetcher",
                         version="1.0",
                         setup_requires = ['does-not-exist'],
                     )
-                """))
+                """)
+            make_trivial_sdist(
+                dist_path,
+                script,
+            )
             yield dist_path
 
     def test_setup_requires_overrides_version_conflict(self):

From ef6b79453e26811eb387a8252834bf1f990f2a8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:21:39 -0500
Subject: [PATCH 4606/8469] Reindent

---
 setuptools/tests/test_easy_install.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 050633319d..4ee5adbe37 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -302,17 +302,14 @@ def create_sdist():
         with tempdir_context() as dir:
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
             script = DALS("""
-                    import setuptools
-                    setuptools.setup(
-                        name="setuptools-test-fetcher",
-                        version="1.0",
-                        setup_requires = ['does-not-exist'],
-                    )
+                import setuptools
+                setuptools.setup(
+                    name="setuptools-test-fetcher",
+                    version="1.0",
+                    setup_requires = ['does-not-exist'],
+                )
                 """)
-            make_trivial_sdist(
-                dist_path,
-                script,
-            )
+            make_trivial_sdist(dist_path, script)
             yield dist_path
 
     def test_setup_requires_overrides_version_conflict(self):

From bf03c647971da1e3c5b69626fecf7f7be2830043 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:25:49 -0500
Subject: [PATCH 4607/8469] reset_setup_stop_context is apparently no longer
 needed.

---
 setuptools/tests/test_easy_install.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4ee5adbe37..dd1655d3a2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -245,7 +245,6 @@ def test_setup_requires(self):
 
         try:
             with quiet_context():
-                with reset_setup_stop_context():
                     run_setup(test_setup_py, ['install'])
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
@@ -281,8 +280,7 @@ def test_setup_requires_honors_fetch_params(self):
                             '--allow-hosts', p_index_loc,
                             '--exclude-scripts', '--install-dir', temp_install_dir,
                             dist_file]
-                        with reset_setup_stop_context():
-                            with argv_context(['easy_install']):
+                        with argv_context(['easy_install']):
                                 # attempt to install the dist. It should fail because
                                 #  it doesn't exist.
                                 with pytest.raises(SystemExit):
@@ -331,7 +329,6 @@ def test_setup_requires_overrides_version_conflict(self):
                 test_pkg = create_setup_requires_package(temp_dir)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with quiet_context() as (stdout, stderr):
-                    with reset_setup_stop_context():
                         try:
                             # Don't even need to install the package, just
                             # running the setup.py at all is sufficient
@@ -438,6 +435,8 @@ def reset_setup_stop_context():
     in distutils.core so that the setup() command will run naturally.
     """
     saved = distutils.core._setup_stop_after
+    if saved is None:
+        raise ValueError("Not Needed")
     distutils.core._setup_stop_after = None
     yield
     distutils.core._setup_stop_after = saved

From f3d7a63e56f7d0ba768a10a2787e25679869922f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:26:45 -0500
Subject: [PATCH 4608/8469] Remove reset_setup_stop_context and reindent.

---
 setuptools/tests/test_easy_install.py | 39 +++++++++------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index dd1655d3a2..4ca659d522 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -245,7 +245,7 @@ def test_setup_requires(self):
 
         try:
             with quiet_context():
-                    run_setup(test_setup_py, ['install'])
+                run_setup(test_setup_py, ['install'])
         except SandboxViolation:
             self.fail('Installation caused SandboxViolation')
         except IndexError:
@@ -281,10 +281,10 @@ def test_setup_requires_honors_fetch_params(self):
                             '--exclude-scripts', '--install-dir', temp_install_dir,
                             dist_file]
                         with argv_context(['easy_install']):
-                                # attempt to install the dist. It should fail because
-                                #  it doesn't exist.
-                                with pytest.raises(SystemExit):
-                                    easy_install_pkg.main(ei_params)
+                            # attempt to install the dist. It should fail because
+                            #  it doesn't exist.
+                            with pytest.raises(SystemExit):
+                                easy_install_pkg.main(ei_params)
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
         self.assertTrue(2 <= len(p_index.requests) <= 3)
@@ -329,13 +329,13 @@ def test_setup_requires_overrides_version_conflict(self):
                 test_pkg = create_setup_requires_package(temp_dir)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with quiet_context() as (stdout, stderr):
-                        try:
-                            # Don't even need to install the package, just
-                            # running the setup.py at all is sufficient
-                            run_setup(test_setup_py, ['--name'])
-                        except VersionConflict:
-                            self.fail('Installing setup.py requirements '
-                                'caused a VersionConflict')
+                    try:
+                        # Don't even need to install the package, just
+                        # running the setup.py at all is sufficient
+                        run_setup(test_setup_py, ['--name'])
+                    except VersionConflict:
+                        self.fail('Installing setup.py requirements '
+                            'caused a VersionConflict')
 
                 lines = stdout.readlines()
                 self.assertTrue(len(lines) > 0)
@@ -426,21 +426,6 @@ def argv_context(repl):
     yield
     sys.argv[:] = old_argv
 
-@contextlib.contextmanager
-def reset_setup_stop_context():
-    """
-    When the setuptools tests are run using setup.py test, and then
-    one wants to invoke another setup() command (such as easy_install)
-    within those tests, it's necessary to reset the global variable
-    in distutils.core so that the setup() command will run naturally.
-    """
-    saved = distutils.core._setup_stop_after
-    if saved is None:
-        raise ValueError("Not Needed")
-    distutils.core._setup_stop_after = None
-    yield
-    distutils.core._setup_stop_after = saved
-
 
 @contextlib.contextmanager
 def quiet_context():

From e3a4428d6a4e3889992ebb1765f27d9b9807325b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:28:40 -0500
Subject: [PATCH 4609/8469] Remove unused import

---
 setuptools/tests/test_easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4ca659d522..d4d29e2775 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -10,7 +10,6 @@
 import textwrap
 import tarfile
 import logging
-import distutils.core
 
 import pytest
 

From c2948e8c76a2778371b779d56682ec61d48dfbc3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:30:42 -0500
Subject: [PATCH 4610/8469] Reindent for clarity

---
 setuptools/tests/test_easy_install.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index d4d29e2775..ca943948d9 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -275,10 +275,13 @@ def test_setup_requires_honors_fetch_params(self):
             with TestSetupRequires.create_sdist() as dist_file:
                 with tempdir_context() as temp_install_dir:
                     with environment_context(PYTHONPATH=temp_install_dir):
-                        ei_params = ['--index-url', p_index.url,
+                        ei_params = [
+                            '--index-url', p_index.url,
                             '--allow-hosts', p_index_loc,
-                            '--exclude-scripts', '--install-dir', temp_install_dir,
-                            dist_file]
+                            '--exclude-scripts',
+                            '--install-dir', temp_install_dir,
+                            dist_file,
+                        ]
                         with argv_context(['easy_install']):
                             # attempt to install the dist. It should fail because
                             #  it doesn't exist.

From 2376cb11cd1383622c97e52006ccabf12c78fffe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:37:52 -0500
Subject: [PATCH 4611/8469] Slice the iterable rather than converting to a list
 and slicing that.

---
 setuptools/tests/test_easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ca943948d9..053b697166 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -10,6 +10,7 @@
 import textwrap
 import tarfile
 import logging
+import itertools
 
 import pytest
 
@@ -82,7 +83,8 @@ def test_get_script_args(self):
 
         old_platform = sys.platform
         try:
-            name, script = [i for i in next(get_script_args(dist))][0:2]
+            args = next(get_script_args(dist))
+            name, script = itertools.islice(args, 2)
         finally:
             sys.platform = old_platform
 

From 3967fa33dcd84a1ae365961774cd54848bb27900 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 10:39:34 -0500
Subject: [PATCH 4612/8469] Please don't feign a monkey patch when one isn't
 used.

---
 setuptools/tests/test_easy_install.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 053b697166..95b3fead48 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -81,12 +81,8 @@ def test_install_site_py(self):
     def test_get_script_args(self):
         dist = FakeDist()
 
-        old_platform = sys.platform
-        try:
-            args = next(get_script_args(dist))
-            name, script = itertools.islice(args, 2)
-        finally:
-            sys.platform = old_platform
+        args = next(get_script_args(dist))
+        name, script = itertools.islice(args, 2)
 
         self.assertEqual(script, WANTED)
 

From be743b272a20673a4bc6c472920009396c5aabe4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:00:16 -0500
Subject: [PATCH 4613/8469] Update changelog

---
 CHANGES.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d059e416b..59dd8842ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,11 +10,6 @@ CHANGES
   retain support for subversion will need to use a third party library. The
   extant implementation is being ported to `setuptools_svn
   <https://pypi.python.org/pypi/setuptools_svn>`_.
-
----
-future
----
-
 * Issue #315: Updated setuptools to hide its own loaded modules during
   installation of another package. This change will enable setuptools to
   upgrade (or downgrade) itself even when its own metadata and implementation

From 926b1c8c82655353b8b637c3abc2adc1285425c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:00:34 -0500
Subject: [PATCH 4614/8469] Bumped to 10.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0feb10558e..07c04ce8c7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "9.2"
+DEFAULT_VERSION = "10.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 465f8ef87c..b8a2473440 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '9.2'
+__version__ = '10.0'

From 7c528325aa4644e2bb94eef2de8783c709cb5d6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:05:21 -0500
Subject: [PATCH 4615/8469] Added tag 10.0 for changeset 0c4d18a747a6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 39cb4517b0..c186d2462f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -176,3 +176,4 @@ cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
 0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0
 fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1
+0c4d18a747a6d39bff8e194a58af949a960d674a 10.0

From b84228bc44ec5e26b576e1e74d1c95630189f9b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:05:51 -0500
Subject: [PATCH 4616/8469] Bumped to 10.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 07c04ce8c7..5d5a723a9b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.0"
+DEFAULT_VERSION = "10.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index b8a2473440..d5d41219b1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.0'
+__version__ = '10.1'

From a3203de1a3d8745b7431cd3ef4704f7eb3d6e529 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:21:44 -0500
Subject: [PATCH 4617/8469] Add change history to docs

---
 docs/history.txt | 8 ++++++++
 docs/index.txt   | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 docs/history.txt

diff --git a/docs/history.txt b/docs/history.txt
new file mode 100644
index 0000000000..268137cde2
--- /dev/null
+++ b/docs/history.txt
@@ -0,0 +1,8 @@
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES (links).txt
diff --git a/docs/index.txt b/docs/index.txt
index 53839beed9..d8eb968bc9 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,6 +16,7 @@ Documentation content:
 .. toctree::
    :maxdepth: 2
 
+   history
    roadmap
    python3
    using

From ede1df71401a16c74dea9c1962bd1085538ac3d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:22:57 -0500
Subject: [PATCH 4618/8469] Remove changes file from long_description.

---
 setup.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index f441815f28..544f18f5c2 100755
--- a/setup.py
+++ b/setup.py
@@ -90,15 +90,8 @@ def _save_entry_points(self):
 
 readme_file = io.open('README.txt', encoding='utf-8')
 
-# The release script adds hyperlinks to issues,
-# but if the release script has not run, fall back to the source file
-changes_names = 'CHANGES (links).txt', 'CHANGES.txt'
-changes_fn = next(iter(filter(os.path.exists, changes_names)))
-changes_file = io.open(changes_fn, encoding='utf-8')
-
 with readme_file:
-    with changes_file:
-        long_description = readme_file.read() + '\n' + changes_file.read()
+    long_description = readme_file.read()
 
 package_data = {
         'setuptools': ['script (dev).tmpl', 'script.tmpl', 'site-patch.py']}

From caea578cd02a7cb2f7cfa453dfabff66e56aff8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:39:07 -0500
Subject: [PATCH 4619/8469] Moved linkify logic to documentation builder as
 Sphinx extension.

---
 docs/conf.py |  2 +-
 linkify.py   | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 release.py   | 40 ----------------------------------------
 3 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 linkify.py

diff --git a/docs/conf.py b/docs/conf.py
index 8be5c3dd99..6cb8f6363c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,7 +28,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ['linkify']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/linkify.py b/linkify.py
new file mode 100644
index 0000000000..1d925abaa8
--- /dev/null
+++ b/linkify.py
@@ -0,0 +1,52 @@
+"""
+Sphinx plugin to add links to the changelog.
+"""
+
+import re
+import os
+
+
+link_patterns = [
+    r"(Issue )?#(?P<issue>\d+)",
+    r"Pull Request ?#(?P<pull_request>\d+)",
+    r"Distribute #(?P<distribute>\d+)",
+    r"Buildout #(?P<buildout>\d+)",
+    r"Old Setuptools #(?P<old_setuptools>\d+)",
+    r"Jython #(?P<jython>\d+)",
+    r"Python #(?P<python>\d+)",
+]
+
+issue_urls = dict(
+    pull_request='https://bitbucket.org'
+        '/pypa/setuptools/pull-request/{pull_request}',
+    issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
+    distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
+    buildout='https://github.com/buildout/buildout/issues/{buildout}',
+    old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
+    jython='http://bugs.jython.org/issue{jython}',
+    python='http://bugs.python.org/issue{python}',
+)
+
+
+def _linkify(source, dest):
+    pattern = '|'.join(link_patterns)
+    with open(source) as source:
+        out = re.sub(pattern, replacer, source.read())
+    with open(dest, 'w') as dest:
+        dest.write(out)
+
+
+def replacer(match):
+    text = match.group(0)
+    match_dict = match.groupdict()
+    for key in match_dict:
+        if match_dict[key]:
+            url = issue_urls[key].format(**match_dict)
+            return "`{text} <{url}>`_".format(text=text, url=url)
+
+def setup(app):
+    _linkify('CHANGES.txt', 'CHANGES (links).txt')
+    app.connect('build-finished', remove_file)
+
+def remove_file(app, exception):
+    os.remove('CHANGES (links).txt')
diff --git a/release.py b/release.py
index d2f82775b6..d067930b62 100644
--- a/release.py
+++ b/release.py
@@ -3,7 +3,6 @@
 install jaraco.packaging and run 'python -m jaraco.packaging.release'
 """
 
-import re
 import os
 import subprocess
 
@@ -14,7 +13,6 @@
 
 
 def before_upload():
-    _linkify('CHANGES.txt', 'CHANGES (links).txt')
     BootstrapBookmark.add()
 
 
@@ -33,44 +31,6 @@ def after_push():
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
-link_patterns = [
-    r"(Issue )?#(?P<issue>\d+)",
-    r"Pull Request ?#(?P<pull_request>\d+)",
-    r"Distribute #(?P<distribute>\d+)",
-    r"Buildout #(?P<buildout>\d+)",
-    r"Old Setuptools #(?P<old_setuptools>\d+)",
-    r"Jython #(?P<jython>\d+)",
-    r"Python #(?P<python>\d+)",
-]
-
-issue_urls = dict(
-    pull_request='https://bitbucket.org'
-        '/pypa/setuptools/pull-request/{pull_request}',
-    issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
-    distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
-    buildout='https://github.com/buildout/buildout/issues/{buildout}',
-    old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
-    jython='http://bugs.jython.org/issue{jython}',
-    python='http://bugs.python.org/issue{python}',
-)
-
-
-def _linkify(source, dest):
-    pattern = '|'.join(link_patterns)
-    with open(source) as source:
-        out = re.sub(pattern, replacer, source.read())
-    with open(dest, 'w') as dest:
-        dest.write(out)
-
-
-def replacer(match):
-    text = match.group(0)
-    match_dict = match.groupdict()
-    for key in match_dict:
-        if match_dict[key]:
-            url = issue_urls[key].format(**match_dict)
-            return "`{text} <{url}>`_".format(text=text, url=url)
-
 class BootstrapBookmark:
     name = 'bootstrap'
 

From 07be3d028d9026a858fe28b7fd64bba37b8ec457 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:52:21 -0500
Subject: [PATCH 4620/8469] Resave with excess whitespace removed

---
 README.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index c6973298ec..11a5d6df93 100755
--- a/README.txt
+++ b/README.txt
@@ -83,12 +83,12 @@ Alternatively, Setuptools may be installed to a user-local path::
 
     > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
 
-Note that on some older systems (noted on Debian 6 and CentOS 5 installations), 
-`wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net` 
+Note that on some older systems (noted on Debian 6 and CentOS 5 installations),
+`wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net`
 does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using
-`wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the 
-host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget` 
-(see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them, 
+`wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the
+host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget`
+(see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them,
 install Setuptools as follows::
 
     > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py

From 000d9ed18eb3849d2c825c043133891e2e6f6680 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 11:52:48 -0500
Subject: [PATCH 4621/8469] Add link to change history from readme.

---
 README.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.txt b/README.txt
index 11a5d6df93..e21c40697a 100755
--- a/README.txt
+++ b/README.txt
@@ -5,6 +5,8 @@ Installing and Using Setuptools
 .. contents:: **Table of Contents**
 
 
+`Change History <https://pythonhosted.org/setuptools/history.html>`_.
+
 -------------------------
 Installation Instructions
 -------------------------

From 9419ec6858f28bc23fde222c223cc20dc28a0874 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:35:21 -0500
Subject: [PATCH 4622/8469] Add test capturing failure. Ref #319.

---
 setuptools/tests/test_easy_install.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 590fce9bc8..46c2df2cad 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -275,6 +275,23 @@ def test_setup_requires(self):
             pass
 
 
+@pytest.yield_fixture
+def distutils_package():
+    distutils_setup_py = SETUP_PY.replace(
+        'from setuptools import setup',
+        'from distutils.core import setup',
+    )
+    with tempdir_context(cd=os.chdir):
+        with open('setup.py', 'w') as f:
+            f.write(distutils_setup_py)
+        yield
+
+
+class TestDistutilsPackage:
+    def test_bdist_egg_available_on_distutils_pkg(self, distutils_package):
+        run_setup('setup.py', ['bdist_egg'])
+
+
 class TestSetupRequires(unittest.TestCase):
 
     def test_setup_requires_honors_fetch_params(self):

From fddd230b60c17ca2100e41962de7b9e16ee85408 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:37:02 -0500
Subject: [PATCH 4623/8469] Ensure setuptools is present in the environment
 before invoking setup.py from easy_install. Fixes #319.

---
 setuptools/sandbox.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index c6840ce4a8..b90d1e1bb6 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -152,6 +152,8 @@ def setup_context(setup_dir):
                 with save_argv():
                     with override_temp(temp_dir):
                         with pushd(setup_dir):
+                            # ensure setuptools commands are available
+                            __import__('setuptools')
                             yield
 
 

From 2982a56628f1ca521b1335298f22a5c6e370e299 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:37:43 -0500
Subject: [PATCH 4624/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 59dd8842ab..5161fbe5e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+10.0.1
+------
+
+* Issue #319: Fixed issue installing pure distutils packages.
+
 ----
 10.0
 ----

From 8029be0e2f76eb600719f74271850327aa5c1463 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:40:16 -0500
Subject: [PATCH 4625/8469] Bumped to 10.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5d5a723a9b..d0174d9aa7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.1"
+DEFAULT_VERSION = "10.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index d5d41219b1..540d81da62 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.1'
+__version__ = '10.0.1'

From e1df3251967c41007f6159456eb19d5f66747a48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:40:17 -0500
Subject: [PATCH 4626/8469] Added tag 10.0.1 for changeset 4c41e2cdd70b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c186d2462f..fde652215a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -177,3 +177,4 @@ cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
 fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1
 0c4d18a747a6d39bff8e194a58af949a960d674a 10.0
+4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1

From d5f207d917ee1ad998545cc0cd86817a609754bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:40:47 -0500
Subject: [PATCH 4627/8469] Bumped to 10.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d0174d9aa7..97767f184c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.0.1"
+DEFAULT_VERSION = "10.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 540d81da62..63388b1fa2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.0.1'
+__version__ = '10.0.2'

From 65d8715705e07dc7f091e2da47a7ada923c6cfbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:42:58 -0500
Subject: [PATCH 4628/8469] Remove lingering reference to linked changelog.

---
 release.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/release.py b/release.py
index d067930b62..a76d2de489 100644
--- a/release.py
+++ b/release.py
@@ -17,7 +17,6 @@ def before_upload():
 
 
 def after_push():
-    os.remove('CHANGES (links).txt')
     BootstrapBookmark.push()
 
 files_with_versions = (

From c7de48c1f42611b25b0ab776ece87763515cc120 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:50:39 -0500
Subject: [PATCH 4629/8469] Update copyright

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6cb8f6363c..5ea2e05e8b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = 'Setuptools'
-copyright = '2009-2013, The fellowship of the packaging'
+copyright = '2009-2014, The fellowship of the packaging'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 9875a7b2586d737ac4d2294044187e17e5533e35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Dec 2014 12:57:30 -0500
Subject: [PATCH 4630/8469] Remove support for setup.py test. Use the
 recommended test runner (setup.py ptr).

---
 setup.py | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/setup.py b/setup.py
index 544f18f5c2..b4b93b38e3 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@
 import os
 import sys
 import textwrap
-import contextlib
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -27,7 +26,6 @@
 
 import setuptools
 from setuptools.command.build_py import build_py as _build_py
-from setuptools.command.test import test as _test
 
 scripts = []
 
@@ -61,32 +59,6 @@ def build_package_data(self):
                 outf, copied = self.copy_file(srcfile, target)
                 srcfile = os.path.abspath(srcfile)
 
-class test(_test):
-    """Specific test class to avoid rewriting the entry_points.txt"""
-    def run(self):
-        with self._save_entry_points():
-            _test.run(self)
-
-    @contextlib.contextmanager
-    def _save_entry_points(self):
-        entry_points = os.path.join('setuptools.egg-info', 'entry_points.txt')
-
-        if not os.path.exists(entry_points):
-            yield
-            return
-
-        # save the content
-        with open(entry_points, 'rb') as f:
-            ep_content = f.read()
-
-        # run the tests
-        try:
-            yield
-        finally:
-            # restore the file
-            with open(entry_points, 'wb') as f:
-                f.write(ep_content)
-
 
 readme_file = io.open('README.txt', encoding='utf-8')
 
@@ -116,7 +88,6 @@ def _save_entry_points(self):
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
     url="https://bitbucket.org/pypa/setuptools",
-    test_suite='setuptools.tests',
     src_root=src_root,
     packages=setuptools.find_packages(),
     package_data=package_data,
@@ -125,7 +96,6 @@ def _save_entry_points(self):
 
     zip_safe=True,
 
-    cmdclass={'test': test},
     entry_points={
         "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()

From 54e96d8d8a6e18901d8e3e708fd0e82bfaba9569 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 09:52:20 -0500
Subject: [PATCH 4631/8469] Add test capturing requirement. Ref #320.

---
 setuptools/tests/test_sdist.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index bece76d263..090e7304e4 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -11,6 +11,7 @@
 import contextlib
 from setuptools.tests.py26compat import skipIf
 
+import pkg_resources
 from setuptools.compat import StringIO, unicode, PY3, PY2
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
@@ -416,5 +417,22 @@ def test_sdist_with_latin1_encoded_filename(self):
                 self.assertFalse(filename in cmd.filelist.files)
 
 
+def test_default_revctrl():
+    """
+    When _default_revctrl was removed from the `setuptools.command.sdist`
+    module in 10.0, it broke some systems which keep an old install of
+    setuptools (Distribute) around. Those old versions require that the
+    setuptools package continue to implement that interface, so this
+    function provides that interface, stubbed. See #320 for details.
+
+    This interface must be maintained until Ubuntu 12.04 is no longer
+    supported (by Setuptools).
+    """
+    ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl'
+    ep = pkg_resources.EntryPoint.parse(ep_def)
+    res = ep.load(require=False)
+    assert hasattr(res, '__iter__')
+
+
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)

From 314d143ffcc838e1dbf7177b601c139f8d0b609f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:15:10 -0500
Subject: [PATCH 4632/8469] Restore _default_revctrl implementation (stubbed).
 Fixes #320.

---
 CHANGES.txt                 | 8 ++++++++
 setuptools/command/sdist.py | 1 +
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5161fbe5e4..9b8a81cbc5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+10.1
+----
+
+* Issue #320: Added a compatibility implementation of `sdist._default_revctrl`
+  so that systems relying on that interface do not fail (namely, Ubuntu 12.04
+  and similar Debian releases).
+
 ------
 10.0.1
 ------
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 371bf547ae..a4e8288aaa 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -11,6 +11,7 @@
 
 READMES = ('README', 'README.rst', 'README.txt')
 
+_default_revctrl = list
 
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""

From f9596f503713a3063396540e835080d0ba44b5e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:15:36 -0500
Subject: [PATCH 4633/8469] Fix syntax on changelog

---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9b8a81cbc5..a09ad310d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ CHANGES
 10.1
 ----
 
-* Issue #320: Added a compatibility implementation of `sdist._default_revctrl`
+* Issue #320: Added a compatibility implementation of
+  ``sdist._default_revctrl``
   so that systems relying on that interface do not fail (namely, Ubuntu 12.04
   and similar Debian releases).
 

From 1b2f562052873336769203c661a7a357dd5b5189 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:16:24 -0500
Subject: [PATCH 4634/8469] Bumped to 10.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 97767f184c..5d5a723a9b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.0.2"
+DEFAULT_VERSION = "10.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 63388b1fa2..d5d41219b1 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.0.2'
+__version__ = '10.1'

From 0f9c2c6ef32cc8c8d5e12a17e28f87942b755e2f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:16:47 -0500
Subject: [PATCH 4635/8469] Added tag 10.1 for changeset 26b00011ec65

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fde652215a..a4071fd761 100644
--- a/.hgtags
+++ b/.hgtags
@@ -178,3 +178,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1
 0c4d18a747a6d39bff8e194a58af949a960d674a 10.0
 4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1
+26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1

From f61070d6d216a3de70202b5c9cff9a125f1823b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:17:21 -0500
Subject: [PATCH 4636/8469] Bumped to 10.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5d5a723a9b..62ead23a01 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.1"
+DEFAULT_VERSION = "10.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index d5d41219b1..6b917706c0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.1'
+__version__ = '10.2'

From 7e6639875e34bd8150a2c430f4d214da9c197e94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:19:25 -0500
Subject: [PATCH 4637/8469] Remove superfluous parentheses

---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a4e8288aaa..3d33df80ee 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -9,7 +9,7 @@
 
 import pkg_resources
 
-READMES = ('README', 'README.rst', 'README.txt')
+READMES = 'README', 'README.rst', 'README.txt'
 
 _default_revctrl = list
 

From 032ff62dd86be10a2580389f4f91f82ec20fd47b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 10:24:29 -0500
Subject: [PATCH 4638/8469] Remove unnecessary branch

---
 pkg_resources/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0664f66600..8854de86f0 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2300,8 +2300,7 @@ def parse(cls, src, dist=None):
         except ValueError:
             msg = "EntryPoint must be in 'name=module:attrs [extras]' format"
             raise ValueError(msg, src)
-        else:
-            return cls(name.strip(), value.strip(), attrs, extras, dist)
+        return cls(name.strip(), value.strip(), attrs, extras, dist)
 
     @classmethod
     def parse_group(cls, group, lines, dist=None):

From 6deadf03439b91582206605f0ce3a35d9da46e09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 11:24:54 -0500
Subject: [PATCH 4639/8469] Extract pattern and entry point parsing from
 EntryPoint.parse.

---
 pkg_resources/__init__.py | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 8854de86f0..572f845961 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2272,6 +2272,14 @@ def require(self, env=None, installer=None):
         items = working_set.resolve(reqs, env, installer)
         list(map(working_set.add, items))
 
+    pattern = re.compile(
+        r'(?P<name>\w+)\s*'
+        r'=\s*'
+        r'(?P<module>[\w.]+)\s*'
+        r'(:\s*(?P<attr>[\w.]+))?\s*'
+        r'(?P<extras>\[.*\])?\s*$'
+    )
+
     @classmethod
     def parse(cls, src, dist=None):
         """Parse a single entry point from string `src`
@@ -2283,24 +2291,23 @@ def parse(cls, src, dist=None):
         The entry name and module name are required, but the ``:attrs`` and
         ``[extras]`` parts are optional
         """
-        try:
-            attrs = extras = ()
-            name, value = src.split('=', 1)
-            if '[' in value:
-                value, extras = value.split('[', 1)
-                req = Requirement.parse("x[" + extras)
-                if req.specs:
-                    raise ValueError
-                extras = req.extras
-            if ':' in value:
-                value, attrs = value.split(':', 1)
-                if not MODULE(attrs.rstrip()):
-                    raise ValueError
-                attrs = attrs.rstrip().split('.')
-        except ValueError:
+        m = cls.pattern.match(src)
+        if not m:
             msg = "EntryPoint must be in 'name=module:attrs [extras]' format"
             raise ValueError(msg, src)
-        return cls(name.strip(), value.strip(), attrs, extras, dist)
+        res = m.groupdict()
+        extras = cls._parse_extras(res['extras'])
+        attrs = (res['attr'] or '').split('.')
+        return cls(res['name'], res['module'], attrs, extras, dist)
+
+    @classmethod
+    def _parse_extras(cls, extras_spec):
+        if not extras_spec:
+            return ()
+        req = Requirement.parse('x' + extras_spec)
+        if req.specs:
+            raise ValueError()
+        return req.extras
 
     @classmethod
     def parse_group(cls, group, lines, dist=None):

From 5eb17624d427730b21ec5de800e4aae036014d01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 11:47:46 -0500
Subject: [PATCH 4640/8469] Correct implementation fixing failing tests

---
 pkg_resources/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 572f845961..dc69b72503 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2273,7 +2273,8 @@ def require(self, env=None, installer=None):
         list(map(working_set.add, items))
 
     pattern = re.compile(
-        r'(?P<name>\w+)\s*'
+        r'\s*'
+        r'(?P<name>[\w. -]+?)\s*'
         r'=\s*'
         r'(?P<module>[\w.]+)\s*'
         r'(:\s*(?P<attr>[\w.]+))?\s*'
@@ -2297,7 +2298,7 @@ def parse(cls, src, dist=None):
             raise ValueError(msg, src)
         res = m.groupdict()
         extras = cls._parse_extras(res['extras'])
-        attrs = (res['attr'] or '').split('.')
+        attrs = res['attr'].split('.') if res['attr'] else ()
         return cls(res['name'], res['module'], attrs, extras, dist)
 
     @classmethod

From d1ed7aca039caf079a97d3f47347439db6fd469d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 11:59:17 -0500
Subject: [PATCH 4641/8469] Use reduce to retrieve attributes. Reuse error from
 AttributeError when translating to ImportError.

---
 pkg_resources/__init__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index dc69b72503..f3f7bcc91e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2258,11 +2258,10 @@ def load(self, require=True, env=None, installer=None):
             self.require(env, installer)
         entry = __import__(self.module_name, globals(), globals(),
             ['__name__'])
-        for attr in self.attrs:
-            try:
-                entry = getattr(entry, attr)
-            except AttributeError:
-                raise ImportError("%r has no %r attribute" % (entry, attr))
+        try:
+            entry = functools.reduce(getattr, self.attrs, entry)
+        except AttributeError as exc:
+            raise ImportError(str(exc))
         return entry
 
     def require(self, env=None, installer=None):

From ca23023d779848dc68160d5ab1fa8d5eeca35b78 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 11:59:36 -0500
Subject: [PATCH 4642/8469] Return value directly

---
 pkg_resources/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f3f7bcc91e..f8f84a5f0a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2259,10 +2259,9 @@ def load(self, require=True, env=None, installer=None):
         entry = __import__(self.module_name, globals(), globals(),
             ['__name__'])
         try:
-            entry = functools.reduce(getattr, self.attrs, entry)
+            return functools.reduce(getattr, self.attrs, entry)
         except AttributeError as exc:
             raise ImportError(str(exc))
-        return entry
 
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:

From 83f82bb2eb0b21cfa9a3f299aa8560d600b5c5b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 12:00:14 -0500
Subject: [PATCH 4643/8469] Rename variable for clarity

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f8f84a5f0a..360f3e5543 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2256,10 +2256,10 @@ def __repr__(self):
     def load(self, require=True, env=None, installer=None):
         if require:
             self.require(env, installer)
-        entry = __import__(self.module_name, globals(), globals(),
+        module = __import__(self.module_name, globals(), globals(),
             ['__name__'])
         try:
-            return functools.reduce(getattr, self.attrs, entry)
+            return functools.reduce(getattr, self.attrs, module)
         except AttributeError as exc:
             raise ImportError(str(exc))
 

From 5e22ed05a7e1f3c787de06ef73b3facd1cdd1f7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 12:06:32 -0500
Subject: [PATCH 4644/8469] Extract _load method which is the same as calling
 .load(False).

---
 pkg_resources/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 360f3e5543..29b1f163f5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2256,6 +2256,9 @@ def __repr__(self):
     def load(self, require=True, env=None, installer=None):
         if require:
             self.require(env, installer)
+        return self._load()
+
+    def _load(self):
         module = __import__(self.module_name, globals(), globals(),
             ['__name__'])
         try:

From a8cc5bd6104fe69756ae188e1482eedd5840d34b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 12:07:33 -0500
Subject: [PATCH 4645/8469] Don't allow imports relative to the pkg_resources
 module.

---
 pkg_resources/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 29b1f163f5..f689b02918 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2259,8 +2259,7 @@ def load(self, require=True, env=None, installer=None):
         return self._load()
 
     def _load(self):
-        module = __import__(self.module_name, globals(), globals(),
-            ['__name__'])
+        module = __import__(self.module_name, fromlist=['__name__'], level=0)
         try:
             return functools.reduce(getattr, self.attrs, module)
         except AttributeError as exc:

From 80a28fa8c044ccb74e4ae54544be8c449ebd03e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 12:35:32 -0500
Subject: [PATCH 4646/8469] Use underlying invocation of ._load directly

---
 setuptools/command/test.py     | 2 +-
 setuptools/dist.py             | 3 ++-
 setuptools/tests/test_sdist.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 1038da71af..2bf5cb1605 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -172,4 +172,4 @@ def _resolve_as_ep(val):
         if val is None:
             return
         parsed = EntryPoint.parse("x=" + val)
-        return parsed.load(require=False)()
+        return parsed._load()()
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7a94d4b38e..eb14644488 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -434,7 +434,8 @@ def get_command_class(self, command):
     def print_commands(self):
         for ep in pkg_resources.iter_entry_points('distutils.commands'):
             if ep.name not in self.cmdclass:
-                cmdclass = ep.load(False) # don't require extras, we're not running
+                # don't require extras as the commands won't be invoked
+                cmdclass = ep._load()
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 090e7304e4..123e3ea9bd 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -430,7 +430,7 @@ def test_default_revctrl():
     """
     ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl'
     ep = pkg_resources.EntryPoint.parse(ep_def)
-    res = ep.load(require=False)
+    res = ep._load()
     assert hasattr(res, '__iter__')
 
 

From f7df5613b53aafe3204da22945b772ce1ffa937c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 12:38:57 -0500
Subject: [PATCH 4647/8469] Officially deprecated
 EntryPoint.load(require=False).

---
 CHANGES.txt               | 6 ++++++
 pkg_resources/__init__.py | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a09ad310d7..efbb43f8df 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----
+next
+----
+
+* Deprecated use of EntryPoint.load(require=False).
+
 ----
 10.1
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f689b02918..a0b354ff55 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2256,6 +2256,12 @@ def __repr__(self):
     def load(self, require=True, env=None, installer=None):
         if require:
             self.require(env, installer)
+        else:
+            warnings.warn(
+                "`require` parameter is deprecated. Use "
+                "EntryPoint._load instead.",
+                DeprecationWarning,
+            )
         return self._load()
 
     def _load(self):

From ec6e6fb1d2078c619e85fa2eb6290f0cee813e2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:22:53 -0500
Subject: [PATCH 4648/8469] Normalize indentation and whitespace

---
 setuptools/archive_util.py | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 67a67e2362..2cd5b34e80 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -64,20 +64,23 @@ def unpack_directory(filename, extract_dir, progress_filter=default_filter):
     Raises ``UnrecognizedFormat`` if `filename` is not a directory
     """
     if not os.path.isdir(filename):
-        raise UnrecognizedFormat("%s is not a directory" % (filename,))
+        raise UnrecognizedFormat("%s is not a directory" % filename)
 
-    paths = {filename:('',extract_dir)}
+    paths = {
+        filename: ('', extract_dir),
+    }
     for base, dirs, files in os.walk(filename):
-        src,dst = paths[base]
+        src, dst = paths[base]
         for d in dirs:
-            paths[os.path.join(base,d)] = src+d+'/', os.path.join(dst,d)
+            paths[os.path.join(base, d)] = src + d + '/', os.path.join(dst, d)
         for f in files:
-            target = os.path.join(dst,f)
-            target = progress_filter(src+f, target)
+            target = os.path.join(dst, f)
+            target = progress_filter(src + f, target)
             if not target:
-                continue    # skip non-files
+                # skip non-files
+                continue
             ensure_directory(target)
-            f = os.path.join(base,f)
+            f = os.path.join(base, f)
             shutil.copyfile(f, target)
             shutil.copystat(f, target)
 
@@ -112,7 +115,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
                 # file
                 ensure_directory(target)
                 data = z.read(info.filename)
-                f = open(target,'wb')
+                f = open(target, 'wb')
                 try:
                     f.write(data)
                 finally:
@@ -137,18 +140,21 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
             "%s is not a compressed or uncompressed tar file" % (filename,)
         )
     with contextlib.closing(tarobj):
-        tarobj.chown = lambda *args: None   # don't do any chowning!
+        # don't do any chowning!
+        tarobj.chown = lambda *args: None
         for member in tarobj:
             name = member.name
             # don't extract absolute paths or ones with .. in them
             if not name.startswith('/') and '..' not in name.split('/'):
                 prelim_dst = os.path.join(extract_dir, *name.split('/'))
 
-                # resolve any links and to extract the link targets as normal files
+                # resolve any links and to extract the link targets as normal
+                # files
                 while member is not None and (member.islnk() or member.issym()):
                     linkpath = member.linkname
                     if member.issym():
-                        linkpath = posixpath.join(posixpath.dirname(member.name), linkpath)
+                        base = posixpath.dirname(member.name)
+                        linkpath = posixpath.join(base, linkpath)
                         linkpath = posixpath.normpath(linkpath)
                     member = tarobj._getmember(linkpath)
 
@@ -158,9 +164,11 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                         if final_dst.endswith(os.sep):
                             final_dst = final_dst[:-1]
                         try:
-                            tarobj._extract_member(member, final_dst)  # XXX Ugh
+                            # XXX Ugh
+                            tarobj._extract_member(member, final_dst)
                         except tarfile.ExtractError:
-                            pass    # chown/chmod/mkfifo/mknode/makedev failed
+                            # chown/chmod/mkfifo/mknode/makedev failed
+                            pass
         return True
 
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile

From eb61e5c989cda3f5e021150f91561a88ba6db73e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:24:21 -0500
Subject: [PATCH 4649/8469] Use contextlib.closing on tarfile compat shim

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

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index e120e7447a..b1ffa87703 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -1,6 +1,7 @@
 import sys
 import unittest
 import tarfile
+import contextlib
 
 try:
 	# provide skipIf for Python 2.4-2.6
@@ -19,9 +20,6 @@ def _tarfile_open_ex(*args, **kwargs):
 	"""
 	Extend result as a context manager.
 	"""
-	res = tarfile.open(*args, **kwargs)
-	res.__exit__ = lambda exc_type, exc_value, traceback: res.close()
-	res.__enter__ = lambda: res
-	return res
+	return contextlib.closing(tarfile.open(*args, **kwargs))
 
 tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else tarfile.open

From 86a0dc8419a3649389bd7d58a1f7c79bae0baad6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:29:26 -0500
Subject: [PATCH 4650/8469] Use simple context manager; don't bother deleting
 the variable.

---
 setuptools/archive_util.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 2cd5b34e80..b3c9fa5690 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -115,12 +115,8 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
                 # file
                 ensure_directory(target)
                 data = z.read(info.filename)
-                f = open(target, 'wb')
-                try:
+                with open(target, 'wb') as f:
                     f.write(data)
-                finally:
-                    f.close()
-                    del data
             unix_attributes = info.external_attr >> 16
             if unix_attributes:
                 os.chmod(target, unix_attributes)

From 05dfef7ed54dba0f858115be441febc94b79010a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:45:33 -0500
Subject: [PATCH 4651/8469] Rewrite assert

---
 setuptools/tests/test_msvc9compiler.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 970f76793d..8567aa586c 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -7,12 +7,13 @@
 
 import os
 import shutil
-import sys
 import tempfile
 import unittest
 import distutils.errors
 import contextlib
 
+import pytest
+
 # importing only setuptools should apply the patch
 __import__('setuptools')
 
@@ -93,11 +94,8 @@ def test_find_vcvarsall_patch(self):
             # skip
             return
 
-        self.assertEqual(
-            "setuptools.msvc9_support",
-            distutils.msvc9compiler.find_vcvarsall.__module__,
-            "find_vcvarsall was not patched"
-        )
+        mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
+        assert mod_name == "setuptools.msvc9_support", "find_vcvarsall unpatched"
 
         find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
         query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
@@ -108,12 +106,10 @@ def test_find_vcvarsall_patch(self):
             with MockReg():
                 self.assertIsNone(find_vcvarsall(9.0))
 
-                try:
+                expected = distutils.errors.DistutilsPlatformError
+                with pytest.raises(expected) as exc:
                     query_vcvarsall(9.0)
-                    self.fail('Expected DistutilsPlatformError from query_vcvarsall()')
-                except distutils.errors.DistutilsPlatformError:
-                    exc_message = str(sys.exc_info()[1])
-                self.assertIn('aka.ms/vcpython27', exc_message)
+                assert 'aka.ms/vcpython27' in str(exc)
 
         key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
         key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'

From 04cf504041b38b85c8f2e9ffddda5897b2161e67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:48:52 -0500
Subject: [PATCH 4652/8469] Use pytest importorskip for skip logic

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

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 8567aa586c..2774751262 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -17,6 +17,8 @@
 # importing only setuptools should apply the patch
 __import__('setuptools')
 
+pytest.importorskip("distutils.msvc9compiler")
+
 class MockReg:
     """Mock for distutils.msvc9compiler.Reg. We patch it
     with an instance of this class that mocks out the
@@ -90,10 +92,6 @@ def patch_env(**replacements):
 class TestMSVC9Compiler(unittest.TestCase):
 
     def test_find_vcvarsall_patch(self):
-        if not hasattr(distutils, 'msvc9compiler'):
-            # skip
-            return
-
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
         assert mod_name == "setuptools.msvc9_support", "find_vcvarsall unpatched"
 

From 06b3378ac1263b3f284b45ca0dcbfe71e55e29fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 Dec 2014 14:51:55 -0500
Subject: [PATCH 4653/8469] Report skipped tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5f644e00a3..004a97ebdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,5 +12,5 @@ script:
  - python bootstrap.py
  - python setup.py egg_info
 
- - python setup.py ptr
+ - python setup.py ptr --addopts='-rs'
  - python ez_setup.py --version 7.0

From a75c16ed451046c6c642fb818fe96af55171355e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:00:30 -0500
Subject: [PATCH 4654/8469] Ported window wrapper tests from doctest to unit
 tests.

---
 setuptools/tests/test_windows_wrappers.py | 178 ++++++++++++++++++++++
 setuptools/tests/win_script_wrapper.txt   | 154 -------------------
 2 files changed, 178 insertions(+), 154 deletions(-)
 create mode 100644 setuptools/tests/test_windows_wrappers.py
 delete mode 100644 setuptools/tests/win_script_wrapper.txt

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
new file mode 100644
index 0000000000..910129179a
--- /dev/null
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -0,0 +1,178 @@
+"""
+Python Script Wrapper for Windows
+=================================
+
+setuptools includes wrappers for Python scripts that allows them to be
+executed like regular windows programs.  There are 2 wrappers, once
+for command-line programs, cli.exe, and one for graphical programs,
+gui.exe.  These programs are almost identical, function pretty much
+the same way, and are generated from the same source file.  The
+wrapper programs are used by copying them to the directory containing
+the script they are to wrap and with the same name as the script they
+are to wrap.
+"""
+
+import os, sys
+import textwrap
+import subprocess
+
+import pytest
+
+from setuptools.command.easy_install import nt_quote_arg
+import pkg_resources
+
+
+pytestmark = pytest.mark.skipif(sys.platform != 'win32', reason="Windows only")
+
+
+class WrapperTester:
+    @classmethod
+    def create_script(cls, tempdir):
+        """
+        Create a simple script, foo-script.py
+
+        Note that the script starts with a Unix-style '#!' line saying which
+        Python executable to run.  The wrapper will use this line to find the
+        correct Python executable.
+        """
+
+        sample_directory = tempdir
+        script = cls.script_tmpl % dict(python_exe=nt_quote_arg
+            (sys.executable))
+
+        f = open(os.path.join(sample_directory, cls.script_name), 'w')
+        f.write(script)
+        f.close()
+
+        # also copy cli.exe to the sample directory
+
+        f = open(os.path.join(sample_directory, cls.wrapper_name), 'wb')
+        f.write(
+            pkg_resources.resource_string('setuptools', cls.wrapper_source)
+            )
+        f.close()
+
+
+class TestCLI(WrapperTester):
+    script_name = 'foo-script.py'
+    wrapper_source = 'cli-32.exe'
+    wrapper_name = 'foo.exe'
+    script_tmpl = textwrap.dedent("""
+        #!%(python_exe)s
+        import sys
+        input = repr(sys.stdin.read())
+        print(sys.argv[0][-14:])
+        print(sys.argv[1:])
+        print(input)
+        if __debug__:
+            print('non-optimized')
+        """).lstrip()
+
+    def test_basic(self, tmpdir):
+        """
+        When the copy of cli.exe, foo.exe in this example, runs, it examines
+        the path name it was run with and computes a Python script path name
+        by removing the '.exe' suffix and adding the '-script.py' suffix. (For
+        GUI programs, the suffix '-script-pyw' is added.)  This is why we
+        named out script the way we did.  Now we can run out script by running
+        the wrapper:
+
+        This example was a little pathological in that it exercised windows
+        (MS C runtime) quoting rules:
+
+        - Strings containing spaces are surrounded by double quotes.
+
+        - Double quotes in strings need to be escaped by preceding them with
+          back slashes.
+
+        - One or more backslashes preceding double quotes need to be escaped
+          by preceding each of them with back slashes.
+        """
+        sample_directory = str(tmpdir)
+        self.create_script(sample_directory)
+        cmd = [os.path.join(sample_directory, 'foo.exe'), 'arg1', 'arg 2',
+            'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+        stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
+        actual = stdout.decode('ascii').replace('\r\n', '\n')
+        expected = textwrap.dedent(r"""
+            \foo-script.py
+            ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
+            'hello\nworld\n'
+            non-optimized
+            """).lstrip()
+        assert actual == expected
+
+    def test_with_options(self, tmpdir):
+        """
+        Specifying Python Command-line Options
+        --------------------------------------
+
+        You can specify a single argument on the '#!' line.  This can be used
+        to specify Python options like -O, to run in optimized mode or -i
+        to start the interactive interpreter.  You can combine multiple
+        options as usual. For example, to run in optimized mode and
+        enter the interpreter after running the script, you could use -Oi:
+        """
+        sample_directory = str(tmpdir)
+        self.create_script(sample_directory)
+        f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
+        f.write(textwrap.dedent("""
+            #!%(python_exe)s  -Oi
+            import sys
+            input = repr(sys.stdin.read())
+            print(sys.argv[0][-14:])
+            print(sys.argv[1:])
+            print(input)
+            if __debug__:
+                print('non-optimized')
+            sys.ps1 = '---'
+            """).lstrip() % dict(python_exe=nt_quote_arg(sys.executable)))
+        f.close()
+        cmd = [os.path.join(sample_directory, 'foo.exe')]
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout, stderr = proc.communicate()
+        actual = stdout.decode('ascii').replace('\r\n', '\n')
+        expected = textwrap.dedent(r"""
+            \foo-script.py
+            []
+            ''
+            ---
+            """).lstrip()
+        assert actual == expected
+
+
+class TestGUI(WrapperTester):
+    """
+    Testing the GUI Version
+    -----------------------
+    """
+    script_name = 'bar-script.pyw'
+    wrapper_source = 'gui-32.exe'
+    wrapper_name = 'bar.exe'
+
+    script_tmpl = textwrap.dedent("""
+        #!%(python_exe)s
+        import sys
+        f = open(sys.argv[1], 'wb')
+        bytes_written = f.write(repr(sys.argv[2]).encode('utf-8'))
+        f.close()
+        """).strip()
+
+    def test_basic(self, tmpdir):
+        """Test the GUI version with the simple scipt, bar-script.py"""
+        sample_directory = str(tmpdir)
+        self.create_script(sample_directory)
+
+        cmd = [
+            os.path.join(sample_directory, 'bar.exe'),
+            os.path.join(sample_directory, 'test_output.txt'),
+            'Test Argument',
+        ]
+        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout, stderr = proc.communicate()
+        assert not stdout
+        assert not stderr
+        f_out = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
+        assert f_out.read().decode('ascii') == repr('Test Argument')
+        f_out.close()
diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt
deleted file mode 100644
index b3a52e0abd..0000000000
--- a/setuptools/tests/win_script_wrapper.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-Python Script Wrapper for Windows
-=================================
-
-setuptools includes wrappers for Python scripts that allows them to be
-executed like regular windows programs.  There are 2 wrappers, once
-for command-line programs, cli.exe, and one for graphical programs,
-gui.exe.  These programs are almost identical, function pretty much
-the same way, and are generated from the same source file.  The
-wrapper programs are used by copying them to the directory containing
-the script they are to wrap and with the same name as the script they
-are to wrap.  In the rest of this document, we'll give an example that
-will illustrate this.
-
-Let's create a simple script, foo-script.py:
-
-    >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
-    >>> sample_directory = tempfile.mkdtemp()
-    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> bytes_written = f.write(
-    ... """#!%(python_exe)s
-    ... import sys
-    ... input = repr(sys.stdin.read())
-    ... print(sys.argv[0][-14:])
-    ... print(sys.argv[1:])
-    ... print(input)
-    ... if __debug__:
-    ...     print('non-optimized')
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-    >>> f.close()
-
-Note that the script starts with a Unix-style '#!' line saying which
-Python executable to run.  The wrapper will use this to find the
-correct Python executable.
-
-We'll also copy cli.exe to the sample-directory with the name foo.exe:
-
-    >>> import pkg_resources
-    >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb')
-    >>> bytes_written = f.write(
-    ...     pkg_resources.resource_string('setuptools', 'cli-32.exe')
-    ...     )
-    >>> f.close()
-
-When the copy of cli.exe, foo.exe in this example, runs, it examines
-the path name it was run with and computes a Python script path name
-by removing the '.exe' suffix and adding the '-script.py' suffix. (For
-GUI programs, the suffix '-script-pyw' is added.)  This is why we
-named out script the way we did.  Now we can run out script by running
-the wrapper:
-
-    >>> import subprocess
-    >>> cmd = [os.path.join(sample_directory, 'foo.exe'), 'arg1', 'arg 2',
-    ...     'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
-    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
-    >>> stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
-    >>> bytes = sys.stdout.write(stdout.decode('ascii').replace('\r\n', '\n'))
-    \foo-script.py
-    ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
-    'hello\nworld\n'
-    non-optimized
-
-This example was a little pathological in that it exercised windows
-(MS C runtime) quoting rules:
-
-- Strings containing spaces are surrounded by double quotes.
-
-- Double quotes in strings need to be escaped by preceding them with
-  back slashes.
-
-- One or more backslashes preceding double quotes need to be escaped
-  by preceding each of them with back slashes.
-
-
-Specifying Python Command-line Options
---------------------------------------
-
-You can specify a single argument on the '#!' line.  This can be used
-to specify Python options like -O, to run in optimized mode or -i
-to start the interactive interpreter.  You can combine multiple
-options as usual. For example, to run in optimized mode and
-enter the interpreter after running the script, you could use -Oi:
-
-    >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-    >>> bytes_written = f.write(
-    ... """#!%(python_exe)s  -Oi
-    ... import sys
-    ... input = repr(sys.stdin.read())
-    ... print(sys.argv[0][-14:])
-    ... print(sys.argv[1:])
-    ... print(input)
-    ... if __debug__:
-    ...     print('non-optimized')
-    ... sys.ps1 = '---'
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-    >>> f.close()
-    >>> cmd = [os.path.join(sample_directory, 'foo.exe')]
-    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
-    >>> stdout, stderr = proc.communicate()
-    >>> bytes = sys.stdout.write(stdout.decode('ascii').replace('\r\n', '\n'))
-    \foo-script.py
-    []
-    ''
-    ---
-
-Testing the GUI Version
------------------------
-
-Now let's test the GUI version with the simple scipt, bar-script.py:
-
-    >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
-    >>> sample_directory = tempfile.mkdtemp()
-    >>> f = open(os.path.join(sample_directory, 'bar-script.pyw'), 'w')
-    >>> bytes_written = f.write(
-    ... """#!%(python_exe)s
-    ... import sys
-    ... f = open(sys.argv[1], 'wb')
-    ... bytes_written = f.write(repr(sys.argv[2]).encode('utf-8'))
-    ... f.close()
-    ... """ % dict(python_exe=nt_quote_arg(sys.executable)))
-    >>> f.close()
-
-We'll also copy gui.exe to the sample-directory with the name bar.exe:
-
-    >>> import pkg_resources
-    >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb')
-    >>> bytes_written = f.write(
-    ...     pkg_resources.resource_string('setuptools', 'gui-32.exe')
-    ...     )
-    >>> f.close()
-
-Finally, we'll run the script and check the result:
-
-    >>> cmd = [
-    ...     os.path.join(sample_directory, 'bar.exe'),
-    ...     os.path.join(sample_directory, 'test_output.txt'),
-    ...     'Test Argument',
-    ... ]
-    >>> proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
-    >>> stdout, stderr = proc.communicate()
-    >>> print(stdout.decode('ascii'))
-    <BLANKLINE>
-    >>> f_out = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
-    >>> print(f_out.read().decode('ascii'))
-    'Test Argument'
-    >>> f_out.close()
-
-
-We're done with the sample_directory:
-
-    >>> import shutil
-    >>> shutil.rmtree(sample_directory)
-

From aee1868928e70bc6fdbd91649d596380646bf481 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:03:18 -0500
Subject: [PATCH 4655/8469] Simplify script creation with context managers and
 leveraging local variables for the template population.

---
 setuptools/tests/test_windows_wrappers.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 910129179a..92e9f88284 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -37,20 +37,16 @@ def create_script(cls, tempdir):
         """
 
         sample_directory = tempdir
-        script = cls.script_tmpl % dict(python_exe=nt_quote_arg
-            (sys.executable))
+        python_exe = nt_quote_arg(sys.executable)
+        script = cls.script_tmpl % locals()
 
-        f = open(os.path.join(sample_directory, cls.script_name), 'w')
-        f.write(script)
-        f.close()
+        with open(os.path.join(sample_directory, cls.script_name), 'w') as f:
+            f.write(script)
 
         # also copy cli.exe to the sample directory
-
-        f = open(os.path.join(sample_directory, cls.wrapper_name), 'wb')
-        f.write(
-            pkg_resources.resource_string('setuptools', cls.wrapper_source)
-            )
-        f.close()
+        with open(os.path.join(sample_directory, cls.wrapper_name), 'wb') as f:
+            w = pkg_resources.resource_string('setuptools', cls.wrapper_source)
+            f.write(w)
 
 
 class TestCLI(WrapperTester):

From 17f9e3abbd8b6ed2e1bb941f9f37659d9bf757f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:07:02 -0500
Subject: [PATCH 4656/8469] More context managers

---
 setuptools/tests/test_windows_wrappers.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 92e9f88284..29aa9c6d0c 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -112,8 +112,7 @@ def test_with_options(self, tmpdir):
         """
         sample_directory = str(tmpdir)
         self.create_script(sample_directory)
-        f = open(os.path.join(sample_directory, 'foo-script.py'), 'w')
-        f.write(textwrap.dedent("""
+        tmpl = textwrap.dedent("""
             #!%(python_exe)s  -Oi
             import sys
             input = repr(sys.stdin.read())
@@ -123,8 +122,9 @@ def test_with_options(self, tmpdir):
             if __debug__:
                 print('non-optimized')
             sys.ps1 = '---'
-            """).lstrip() % dict(python_exe=nt_quote_arg(sys.executable)))
-        f.close()
+            """).lstrip()
+        with open(os.path.join(sample_directory, 'foo-script.py'), 'w') as f:
+            f.write(tmpl % dict(python_exe=nt_quote_arg(sys.executable)))
         cmd = [os.path.join(sample_directory, 'foo.exe')]
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()
@@ -169,6 +169,6 @@ def test_basic(self, tmpdir):
         stdout, stderr = proc.communicate()
         assert not stdout
         assert not stderr
-        f_out = open(os.path.join(sample_directory, 'test_output.txt'), 'rb')
-        assert f_out.read().decode('ascii') == repr('Test Argument')
-        f_out.close()
+        with open(os.path.join(sample_directory, 'test_output.txt'), 'rb') as f_out:
+            actual = f_out.read().decode('ascii')
+        assert actual == repr('Test Argument')

From f43351575a3f92cd5422973a03c577f787c5898c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:09:10 -0500
Subject: [PATCH 4657/8469] Update docs

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

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 29aa9c6d0c..0e165bd929 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -3,7 +3,7 @@
 =================================
 
 setuptools includes wrappers for Python scripts that allows them to be
-executed like regular windows programs.  There are 2 wrappers, once
+executed like regular windows programs.  There are 2 wrappers, one
 for command-line programs, cli.exe, and one for graphical programs,
 gui.exe.  These programs are almost identical, function pretty much
 the same way, and are generated from the same source file.  The
@@ -69,7 +69,7 @@ def test_basic(self, tmpdir):
         When the copy of cli.exe, foo.exe in this example, runs, it examines
         the path name it was run with and computes a Python script path name
         by removing the '.exe' suffix and adding the '-script.py' suffix. (For
-        GUI programs, the suffix '-script-pyw' is added.)  This is why we
+        GUI programs, the suffix '-script.pyw' is added.)  This is why we
         named out script the way we did.  Now we can run out script by running
         the wrapper:
 

From 88b8ad6b797cb9dcd898fc1b125dc90cc35c565f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:13:58 -0500
Subject: [PATCH 4658/8469] Extract prep_script method

---
 setuptools/tests/test_windows_wrappers.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 0e165bd929..187177f76a 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -26,6 +26,12 @@
 
 
 class WrapperTester:
+
+    @classmethod
+    def prep_script(cls, template):
+        python_exe = nt_quote_arg(sys.executable)
+        return template % locals()
+
     @classmethod
     def create_script(cls, tempdir):
         """
@@ -37,8 +43,7 @@ def create_script(cls, tempdir):
         """
 
         sample_directory = tempdir
-        python_exe = nt_quote_arg(sys.executable)
-        script = cls.script_tmpl % locals()
+        script = cls.prep_script(cls.script_tmpl)
 
         with open(os.path.join(sample_directory, cls.script_name), 'w') as f:
             f.write(script)
@@ -124,7 +129,7 @@ def test_with_options(self, tmpdir):
             sys.ps1 = '---'
             """).lstrip()
         with open(os.path.join(sample_directory, 'foo-script.py'), 'w') as f:
-            f.write(tmpl % dict(python_exe=nt_quote_arg(sys.executable)))
+            f.write(self.prep_script(tmpl))
         cmd = [os.path.join(sample_directory, 'foo.exe')]
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()

From 506d6f75a02e7943efbada210798c4798fb89835 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:16:32 -0500
Subject: [PATCH 4659/8469] Leverage LocalPath characteristics of tmpdir.

---
 setuptools/tests/test_windows_wrappers.py | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 187177f76a..70e23a402d 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -12,7 +12,7 @@
 are to wrap.
 """
 
-import os, sys
+import sys
 import textwrap
 import subprocess
 
@@ -33,7 +33,7 @@ def prep_script(cls, template):
         return template % locals()
 
     @classmethod
-    def create_script(cls, tempdir):
+    def create_script(cls, tmpdir):
         """
         Create a simple script, foo-script.py
 
@@ -42,14 +42,13 @@ def create_script(cls, tempdir):
         correct Python executable.
         """
 
-        sample_directory = tempdir
         script = cls.prep_script(cls.script_tmpl)
 
-        with open(os.path.join(sample_directory, cls.script_name), 'w') as f:
+        with (tmpdir / cls.script_name).open('w') as f:
             f.write(script)
 
         # also copy cli.exe to the sample directory
-        with open(os.path.join(sample_directory, cls.wrapper_name), 'wb') as f:
+        with (tmpdir / cls.wrapper_name).open('wb') as f:
             w = pkg_resources.resource_string('setuptools', cls.wrapper_source)
             f.write(w)
 
@@ -89,9 +88,8 @@ def test_basic(self, tmpdir):
         - One or more backslashes preceding double quotes need to be escaped
           by preceding each of them with back slashes.
         """
-        sample_directory = str(tmpdir)
-        self.create_script(sample_directory)
-        cmd = [os.path.join(sample_directory, 'foo.exe'), 'arg1', 'arg 2',
+        self.create_script(tmpdir)
+        cmd = [str(tmpdir / 'foo.exe'), 'arg1', 'arg 2',
             'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
         stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
@@ -115,8 +113,7 @@ def test_with_options(self, tmpdir):
         options as usual. For example, to run in optimized mode and
         enter the interpreter after running the script, you could use -Oi:
         """
-        sample_directory = str(tmpdir)
-        self.create_script(sample_directory)
+        self.create_script(tmpdir)
         tmpl = textwrap.dedent("""
             #!%(python_exe)s  -Oi
             import sys
@@ -128,9 +125,9 @@ def test_with_options(self, tmpdir):
                 print('non-optimized')
             sys.ps1 = '---'
             """).lstrip()
-        with open(os.path.join(sample_directory, 'foo-script.py'), 'w') as f:
+        with (tmpdir / 'foo-script.py').open('w') as f:
             f.write(self.prep_script(tmpl))
-        cmd = [os.path.join(sample_directory, 'foo.exe')]
+        cmd = [str(tmpdir / 'foo.exe')]
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()
         actual = stdout.decode('ascii').replace('\r\n', '\n')
@@ -162,18 +159,17 @@ class TestGUI(WrapperTester):
 
     def test_basic(self, tmpdir):
         """Test the GUI version with the simple scipt, bar-script.py"""
-        sample_directory = str(tmpdir)
-        self.create_script(sample_directory)
+        self.create_script(tmpdir)
 
         cmd = [
-            os.path.join(sample_directory, 'bar.exe'),
-            os.path.join(sample_directory, 'test_output.txt'),
+            str(tmpdir / 'bar.exe'),
+            str(tmpdir / 'test_output.txt'),
             'Test Argument',
         ]
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()
         assert not stdout
         assert not stderr
-        with open(os.path.join(sample_directory, 'test_output.txt'), 'rb') as f_out:
+        with (tmpdir / 'test_output.txt').open('rb') as f_out:
             actual = f_out.read().decode('ascii')
         assert actual == repr('Test Argument')

From 64b8fc3f09adb0843bae6f118da8147b8697e4dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:23:57 -0500
Subject: [PATCH 4660/8469] Reindent for clarity

---
 setuptools/tests/test_windows_wrappers.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 70e23a402d..b6c1e573d1 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -89,8 +89,14 @@ def test_basic(self, tmpdir):
           by preceding each of them with back slashes.
         """
         self.create_script(tmpdir)
-        cmd = [str(tmpdir / 'foo.exe'), 'arg1', 'arg 2',
-            'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b']
+        cmd = [
+            str(tmpdir / 'foo.exe'),
+            'arg1',
+            'arg 2',
+            'arg "2\\"',
+            'arg 4\\',
+            'arg5 a\\\\b',
+        ]
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
         stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
         actual = stdout.decode('ascii').replace('\r\n', '\n')

From 0ede8363da2b989b2b498bf16eb6d30a6ae088ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:25:02 -0500
Subject: [PATCH 4661/8469] Remove additional tests, no longer relevant.

---
 setuptools/tests/__init__.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index e5d6545ad0..3aa5525dab 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -2,7 +2,6 @@
 import sys
 import os
 import unittest
-import doctest
 import distutils.core
 import distutils.cmd
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
@@ -16,17 +15,6 @@
 from setuptools import Feature
 from setuptools.depends import Require
 
-def additional_tests():
-    suite = unittest.TestSuite((
-        doctest.DocFileSuite(
-            'api_tests.txt',
-            optionflags=doctest.ELLIPSIS, package='pkg_resources',
-            ),
-        ))
-    if sys.platform == 'win32':
-        suite.addTest(doctest.DocFileSuite('win_script_wrapper.txt'))
-    return suite
-
 def makeSetup(**args):
     """Return distribution from 'setup(**args)', without executing commands"""
 

From 81c4405729df21fe5326df0bc2f2ed3e99d3e735 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:33:08 -0500
Subject: [PATCH 4662/8469] Convert DependsTests to pytest discovered tests.

---
 setuptools/tests/__init__.py | 77 ++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 3aa5525dab..bb3a0b3107 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -10,6 +10,8 @@
 from distutils.version import LooseVersion
 from setuptools.compat import func_code
 
+import pytest
+
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools import Feature
@@ -29,7 +31,7 @@ def makeSetup(**args):
         distutils.core._setup_stop_after = None
 
 
-class DependsTests(unittest.TestCase):
+class TestDepends:
 
     def testExtractConst(self):
         if not hasattr(dep, 'extract_constant'):
@@ -42,21 +44,24 @@ def f1():
             y = z
 
         fc = func_code(f1)
+
         # unrecognized name
-        self.assertEqual(dep.extract_constant(fc,'q', -1), None)
+        assert dep.extract_constant(fc,'q', -1) is None
 
         # constant assigned
-        self.assertEqual(dep.extract_constant(fc,'x', -1), "test")
+        dep.extract_constant(fc,'x', -1) == "test"
 
         # expression assigned
-        self.assertEqual(dep.extract_constant(fc,'y', -1), -1)
+        dep.extract_constant(fc,'y', -1) == -1
 
         # recognized name, not assigned
-        self.assertEqual(dep.extract_constant(fc,'z', -1), None)
+        dep.extract_constant(fc,'z', -1) is None
 
     def testFindModule(self):
-        self.assertRaises(ImportError, dep.find_module, 'no-such.-thing')
-        self.assertRaises(ImportError, dep.find_module, 'setuptools.non-existent')
+        with pytest.raises(ImportError):
+            dep.find_module('no-such.-thing')
+        with pytest.raises(ImportError):
+            dep.find_module('setuptools.non-existent')
         f,p,i = dep.find_module('setuptools.tests')
         f.close()
 
@@ -66,15 +71,9 @@ def testModuleExtract(self):
             return
 
         from email import __version__
-        self.assertEqual(
-            dep.get_module_constant('email','__version__'), __version__
-        )
-        self.assertEqual(
-            dep.get_module_constant('sys','version'), sys.version
-        )
-        self.assertEqual(
-            dep.get_module_constant('setuptools.tests','__doc__'),__doc__
-        )
+        assert dep.get_module_constant('email','__version__') == __version__
+        assert dep.get_module_constant('sys','version') == sys.version
+        assert dep.get_module_constant('setuptools.tests','__doc__') == __doc__
 
     def testRequire(self):
         if not hasattr(dep, 'extract_constant'):
@@ -83,40 +82,40 @@ def testRequire(self):
 
         req = Require('Email','1.0.3','email')
 
-        self.assertEqual(req.name, 'Email')
-        self.assertEqual(req.module, 'email')
-        self.assertEqual(req.requested_version, '1.0.3')
-        self.assertEqual(req.attribute, '__version__')
-        self.assertEqual(req.full_name(), 'Email-1.0.3')
+        assert req.name == 'Email'
+        assert req.module == 'email'
+        assert req.requested_version == '1.0.3'
+        assert req.attribute == '__version__'
+        assert req.full_name() == 'Email-1.0.3'
 
         from email import __version__
-        self.assertEqual(req.get_version(), __version__)
-        self.assertTrue(req.version_ok('1.0.9'))
-        self.assertTrue(not req.version_ok('0.9.1'))
-        self.assertTrue(not req.version_ok('unknown'))
+        assert req.get_version() == __version__
+        assert req.version_ok('1.0.9')
+        assert not req.version_ok('0.9.1')
+        assert not req.version_ok('unknown')
 
-        self.assertTrue(req.is_present())
-        self.assertTrue(req.is_current())
+        assert req.is_present()
+        assert req.is_current()
 
         req = Require('Email 3000','03000','email',format=LooseVersion)
-        self.assertTrue(req.is_present())
-        self.assertTrue(not req.is_current())
-        self.assertTrue(not req.version_ok('unknown'))
+        assert req.is_present()
+        assert not req.is_current()
+        assert not req.version_ok('unknown')
 
         req = Require('Do-what-I-mean','1.0','d-w-i-m')
-        self.assertTrue(not req.is_present())
-        self.assertTrue(not req.is_current())
+        assert not req.is_present()
+        assert not req.is_current()
 
         req = Require('Tests', None, 'tests', homepage="http://example.com")
-        self.assertEqual(req.format, None)
-        self.assertEqual(req.attribute, None)
-        self.assertEqual(req.requested_version, None)
-        self.assertEqual(req.full_name(), 'Tests')
-        self.assertEqual(req.homepage, 'http://example.com')
+        assert req.format is None
+        assert req.attribute is None
+        assert req.requested_version is None
+        assert req.full_name() == 'Tests'
+        assert req.homepage == 'http://example.com'
 
         paths = [os.path.dirname(p) for p in __path__]
-        self.assertTrue(req.is_present(paths))
-        self.assertTrue(req.is_current(paths))
+        assert req.is_present(paths)
+        assert req.is_current(paths)
 
 
 class DistroTests(unittest.TestCase):

From c10ab0661e13776146e2948c67593c65035ccf8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:36:43 -0500
Subject: [PATCH 4663/8469] Unify detection of bytecode

---
 setuptools/tests/__init__.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index bb3a0b3107..900b019956 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -31,6 +31,11 @@ def makeSetup(**args):
         distutils.core._setup_stop_after = None
 
 
+needs_bytecode = pytest.mark.skipif(
+    not hasattr(dep, 'get_module_constant'),
+    reason="bytecode support not available",
+)
+
 class TestDepends:
 
     def testExtractConst(self):
@@ -65,21 +70,15 @@ def testFindModule(self):
         f,p,i = dep.find_module('setuptools.tests')
         f.close()
 
+    @needs_bytecode
     def testModuleExtract(self):
-        if not hasattr(dep, 'get_module_constant'):
-            # skip on non-bytecode platforms
-            return
-
         from email import __version__
         assert dep.get_module_constant('email','__version__') == __version__
         assert dep.get_module_constant('sys','version') == sys.version
         assert dep.get_module_constant('setuptools.tests','__doc__') == __doc__
 
+    @needs_bytecode
     def testRequire(self):
-        if not hasattr(dep, 'extract_constant'):
-            # skip on non-bytecode platformsh
-            return
-
         req = Require('Email','1.0.3','email')
 
         assert req.name == 'Email'

From 5a2207aefc31c5cefc07d26957f8b1c23694d5f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 11:48:22 -0500
Subject: [PATCH 4664/8469] Removed remainder of unittest dependence in
 setuptools/tests/__init__.py

---
 setuptools/tests/__init__.py | 179 ++++++++++++++++-------------------
 1 file changed, 83 insertions(+), 96 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 900b019956..b8a29cbac2 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,7 +1,6 @@
 """Tests for the 'setuptools' package"""
 import sys
 import os
-import unittest
 import distutils.core
 import distutils.cmd
 from distutils.errors import DistutilsOptionError, DistutilsPlatformError
@@ -117,9 +116,9 @@ def testRequire(self):
         assert req.is_current(paths)
 
 
-class DistroTests(unittest.TestCase):
+class TestDistro:
 
-    def setUp(self):
+    def setup_method(self, method):
         self.e1 = Extension('bar.ext',['bar.c'])
         self.e2 = Extension('c.y', ['y.c'])
 
@@ -131,21 +130,21 @@ def setUp(self):
         )
 
     def testDistroType(self):
-        self.assertTrue(isinstance(self.dist,setuptools.dist.Distribution))
+        assert isinstance(self.dist,setuptools.dist.Distribution)
 
     def testExcludePackage(self):
         self.dist.exclude_package('a')
-        self.assertEqual(self.dist.packages, ['b','c'])
+        assert self.dist.packages == ['b','c']
 
         self.dist.exclude_package('b')
-        self.assertEqual(self.dist.packages, ['c'])
-        self.assertEqual(self.dist.py_modules, ['x'])
-        self.assertEqual(self.dist.ext_modules, [self.e1, self.e2])
+        assert self.dist.packages == ['c']
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1, self.e2]
 
         self.dist.exclude_package('c')
-        self.assertEqual(self.dist.packages, [])
-        self.assertEqual(self.dist.py_modules, ['x'])
-        self.assertEqual(self.dist.ext_modules, [self.e1])
+        assert self.dist.packages == []
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1]
 
         # test removals from unspecified options
         makeSetup().exclude_package('x')
@@ -153,21 +152,21 @@ def testExcludePackage(self):
     def testIncludeExclude(self):
         # remove an extension
         self.dist.exclude(ext_modules=[self.e1])
-        self.assertEqual(self.dist.ext_modules, [self.e2])
+        assert self.dist.ext_modules == [self.e2]
 
         # add it back in
         self.dist.include(ext_modules=[self.e1])
-        self.assertEqual(self.dist.ext_modules, [self.e2, self.e1])
+        assert self.dist.ext_modules == [self.e2, self.e1]
 
         # should not add duplicate
         self.dist.include(ext_modules=[self.e1])
-        self.assertEqual(self.dist.ext_modules, [self.e2, self.e1])
+        assert self.dist.ext_modules == [self.e2, self.e1]
 
     def testExcludePackages(self):
         self.dist.exclude(packages=['c','b','a'])
-        self.assertEqual(self.dist.packages, [])
-        self.assertEqual(self.dist.py_modules, ['x'])
-        self.assertEqual(self.dist.ext_modules, [self.e1])
+        assert self.dist.packages == []
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1]
 
     def testEmpty(self):
         dist = makeSetup()
@@ -176,49 +175,41 @@ def testEmpty(self):
         dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
 
     def testContents(self):
-        self.assertTrue(self.dist.has_contents_for('a'))
+        assert self.dist.has_contents_for('a')
         self.dist.exclude_package('a')
-        self.assertTrue(not self.dist.has_contents_for('a'))
+        assert not self.dist.has_contents_for('a')
 
-        self.assertTrue(self.dist.has_contents_for('b'))
+        assert self.dist.has_contents_for('b')
         self.dist.exclude_package('b')
-        self.assertTrue(not self.dist.has_contents_for('b'))
+        assert not self.dist.has_contents_for('b')
 
-        self.assertTrue(self.dist.has_contents_for('c'))
+        assert self.dist.has_contents_for('c')
         self.dist.exclude_package('c')
-        self.assertTrue(not self.dist.has_contents_for('c'))
+        assert not self.dist.has_contents_for('c')
 
     def testInvalidIncludeExclude(self):
-        self.assertRaises(DistutilsSetupError,
-            self.dist.include, nonexistent_option='x'
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.exclude, nonexistent_option='x'
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.include, packages={'x':'y'}
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.exclude, packages={'x':'y'}
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.include, ext_modules={'x':'y'}
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.exclude, ext_modules={'x':'y'}
-        )
-
-        self.assertRaises(DistutilsSetupError,
-            self.dist.include, package_dir=['q']
-        )
-        self.assertRaises(DistutilsSetupError,
-            self.dist.exclude, package_dir=['q']
-        )
-
-
-class FeatureTests(unittest.TestCase):
-
-    def setUp(self):
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(nonexistent_option='x')
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(nonexistent_option='x')
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(packages={'x':'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(packages={'x':'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(ext_modules={'x':'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(ext_modules={'x':'y'})
+
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(package_dir=['q'])
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(package_dir=['q'])
+
+
+class TestFeatures:
+
+    def setup_method(self, method):
         self.req = Require('Distutils','1.0.3','distutils')
         self.dist = makeSetup(
             features={
@@ -240,80 +231,75 @@ def setUp(self):
         )
 
     def testDefaults(self):
-        self.assertTrue(not
-            Feature(
-                "test",standard=True,remove='x',available=False
-            ).include_by_default()
-        )
-        self.assertTrue(
-            Feature("test",standard=True,remove='x').include_by_default()
-        )
+        assert not Feature(
+            "test",standard=True,remove='x',available=False
+        ).include_by_default()
+        assert Feature("test",standard=True,remove='x').include_by_default()
         # Feature must have either kwargs, removes, or require_features
-        self.assertRaises(DistutilsSetupError, Feature, "test")
+        with pytest.raises(DistutilsSetupError):
+            Feature("test")
 
     def testAvailability(self):
-        self.assertRaises(
-            DistutilsPlatformError,
-            self.dist.features['dwim'].include_in, self.dist
-        )
+        with pytest.raises(DistutilsPlatformError):
+            self.dist.features['dwim'].include_in(self.dist)
 
     def testFeatureOptions(self):
         dist = self.dist
-        self.assertTrue(
+        assert (
             ('with-dwim',None,'include DWIM') in dist.feature_options
         )
-        self.assertTrue(
+        assert (
             ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
         )
-        self.assertTrue(
+        assert (
             ('with-bar',None,'include bar (default)') in dist.feature_options
         )
-        self.assertTrue(
+        assert (
             ('without-bar',None,'exclude bar') in dist.feature_options
         )
-        self.assertEqual(dist.feature_negopt['without-foo'],'with-foo')
-        self.assertEqual(dist.feature_negopt['without-bar'],'with-bar')
-        self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim')
-        self.assertTrue(not 'without-baz' in dist.feature_negopt)
+        assert dist.feature_negopt['without-foo'] == 'with-foo'
+        assert dist.feature_negopt['without-bar'] == 'with-bar'
+        assert dist.feature_negopt['without-dwim'] == 'with-dwim'
+        assert (not 'without-baz' in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist
-        self.assertEqual(dist.with_foo,1)
-        self.assertEqual(dist.with_bar,0)
-        self.assertEqual(dist.with_baz,1)
-        self.assertTrue(not 'bar_et' in dist.py_modules)
-        self.assertTrue(not 'pkg.bar' in dist.packages)
-        self.assertTrue('pkg.baz' in dist.packages)
-        self.assertTrue('scripts/baz_it' in dist.scripts)
-        self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries)
-        self.assertEqual(dist.ext_modules,[])
-        self.assertEqual(dist.require_features, [self.req])
+        assert dist.with_foo == 1
+        assert dist.with_bar == 0
+        assert dist.with_baz == 1
+        assert (not 'bar_et' in dist.py_modules)
+        assert (not 'pkg.bar' in dist.packages)
+        assert ('pkg.baz' in dist.packages)
+        assert ('scripts/baz_it' in dist.scripts)
+        assert (('libfoo','foo/foofoo.c') in dist.libraries)
+        assert dist.ext_modules == []
+        assert dist.require_features == [self.req]
 
         # If we ask for bar, it should fail because we explicitly disabled
         # it on the command line
-        self.assertRaises(DistutilsOptionError, dist.include_feature, 'bar')
+        with pytest.raises(DistutilsOptionError):
+            dist.include_feature('bar')
 
     def testFeatureWithInvalidRemove(self):
-        self.assertRaises(
-            SystemExit, makeSetup, features = {'x':Feature('x', remove='y')}
-        )
+        with pytest.raises(SystemExit):
+            makeSetup(features={'x':Feature('x', remove='y')})
 
-class TestCommandTests(unittest.TestCase):
+class TestCommandTests:
 
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')
-        self.assertTrue(isinstance(test_cmd, distutils.cmd.Command))
+        assert (isinstance(test_cmd, distutils.cmd.Command))
 
     def testLongOptSuiteWNoDefault(self):
         ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite'])
         ts1 = ts1.get_command_obj('test')
         ts1.ensure_finalized()
-        self.assertEqual(ts1.test_suite, 'foo.tests.suite')
+        assert ts1.test_suite == 'foo.tests.suite'
 
     def testDefaultSuite(self):
         ts2 = makeSetup(test_suite='bar.tests.suite').get_command_obj('test')
         ts2.ensure_finalized()
-        self.assertEqual(ts2.test_suite, 'bar.tests.suite')
+        assert ts2.test_suite == 'bar.tests.suite'
 
     def testDefaultWModuleOnCmdLine(self):
         ts3 = makeSetup(
@@ -321,16 +307,17 @@ def testDefaultWModuleOnCmdLine(self):
             script_args=['test','-m','foo.tests']
         ).get_command_obj('test')
         ts3.ensure_finalized()
-        self.assertEqual(ts3.test_module, 'foo.tests')
-        self.assertEqual(ts3.test_suite,  'foo.tests.test_suite')
+        assert ts3.test_module == 'foo.tests'
+        assert ts3.test_suite == 'foo.tests.test_suite'
 
     def testConflictingOptions(self):
         ts4 = makeSetup(
             script_args=['test','-m','bar.tests', '-s','foo.tests.suite']
         ).get_command_obj('test')
-        self.assertRaises(DistutilsOptionError, ts4.ensure_finalized)
+        with pytest.raises(DistutilsOptionError):
+            ts4.ensure_finalized()
 
     def testNoSuite(self):
         ts5 = makeSetup().get_command_obj('test')
         ts5.ensure_finalized()
-        self.assertEqual(ts5.test_suite, None)
+        assert ts5.test_suite == None

From 8e8467a5abcaf920184dd07f6e0c092989aa12ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:23:39 -0500
Subject: [PATCH 4665/8469] Convert test_dist_info to pytest form

---
 setuptools/tests/test_dist_info.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index a8adb68c2d..5f3b595293 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,23 +3,17 @@
 import os
 import shutil
 import tempfile
-import unittest
 import textwrap
 
-try:
-    import ast
-except:
-    pass
+import pytest
 
 import pkg_resources
 
-from setuptools.tests.py26compat import skipIf
-
 def DALS(s):
     "dedent and left-strip"
     return textwrap.dedent(s).lstrip()
 
-class TestDistInfo(unittest.TestCase):
+class TestDistInfo:
 
     def test_distinfo(self):
         dists = {}
@@ -34,18 +28,17 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @skipIf('ast' not in globals(),
-        "ast is used to test conditional dependencies (Python >= 2.6)")
+    @pytest.mark.importorskip('ast')
     def test_conditional_dependencies(self):
         requires = [pkg_resources.Requirement.parse('splort==4'),
                     pkg_resources.Requirement.parse('quux>=1.1')]
 
         for d in pkg_resources.find_distributions(self.tmpdir):
-            self.assertEqual(d.requires(), requires[:1])
-            self.assertEqual(d.requires(extras=('baz',)), requires)
-            self.assertEqual(d.extras, ['baz'])
+            assert d.requires() == requires[:1]
+            assert d.requires(extras=('baz',)) == requires
+            assert d.extras == ['baz']
 
-    def setUp(self):
+    def setup_method(self, method):
         self.tmpdir = tempfile.mkdtemp()
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
@@ -79,5 +72,5 @@ def setUp(self):
         finally:
             metadata_file.close()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         shutil.rmtree(self.tmpdir)

From a476eca3548d454b7b9589f4e10c91c17e491c1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:26:19 -0500
Subject: [PATCH 4666/8469] Use contexts for opening files

---
 setuptools/tests/test_dist_info.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 5f3b595293..812e6c46f2 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -43,8 +43,7 @@ def setup_method(self, method):
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
-        metadata_file = open(os.path.join(versioned, 'METADATA'), 'w+')
-        try:
+        with open(os.path.join(versioned, 'METADATA'), 'w+') as metadata_file:
             metadata_file.write(DALS(
                 """
                 Metadata-Version: 1.2
@@ -53,13 +52,10 @@ def setup_method(self, method):
                 Provides-Extra: baz
                 Requires-Dist: quux (>=1.1); extra == 'baz'
                 """))
-        finally:
-            metadata_file.close()
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
-        metadata_file = open(os.path.join(unversioned, 'METADATA'), 'w+')
-        try:
+        with open(os.path.join(unversioned, 'METADATA'), 'w+') as metadata_file:
             metadata_file.write(DALS(
                 """
                 Metadata-Version: 1.2
@@ -69,8 +65,6 @@ def setup_method(self, method):
                 Provides-Extra: baz
                 Requires-Dist: quux (>=1.1); extra == 'baz'
                 """))
-        finally:
-            metadata_file.close()
 
     def teardown_method(self, method):
         shutil.rmtree(self.tmpdir)

From ef3ee2cfee65f99d320983cbf6e32448b2cefbbe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:34:23 -0500
Subject: [PATCH 4667/8469] Extract commonality of metadata template.

---
 setuptools/tests/test_dist_info.py | 37 ++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 812e6c46f2..91195c52b3 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -38,33 +38,36 @@ def test_conditional_dependencies(self):
             assert d.requires(extras=('baz',)) == requires
             assert d.extras == ['baz']
 
+    metadata_template = DALS("""
+        Metadata-Version: 1.2
+        Name: {name}
+        {version}
+        Requires-Dist: splort (==4)
+        Provides-Extra: baz
+        Requires-Dist: quux (>=1.1); extra == 'baz'
+        """)
+
     def setup_method(self, method):
         self.tmpdir = tempfile.mkdtemp()
         versioned = os.path.join(self.tmpdir,
                                  'VersionedDistribution-2.718.dist-info')
         os.mkdir(versioned)
         with open(os.path.join(versioned, 'METADATA'), 'w+') as metadata_file:
-            metadata_file.write(DALS(
-                """
-                Metadata-Version: 1.2
-                Name: VersionedDistribution
-                Requires-Dist: splort (4)
-                Provides-Extra: baz
-                Requires-Dist: quux (>=1.1); extra == 'baz'
-                """))
+            metadata = self.metadata_template.format(
+                name='VersionedDistribution',
+                version='',
+            ).replace('\n\n', '\n')
+            metadata = metadata.replace('==4', '4')
+            metadata_file.write(metadata)
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')
         os.mkdir(unversioned)
         with open(os.path.join(unversioned, 'METADATA'), 'w+') as metadata_file:
-            metadata_file.write(DALS(
-                """
-                Metadata-Version: 1.2
-                Name: UnversionedDistribution
-                Version: 0.3
-                Requires-Dist: splort (==4)
-                Provides-Extra: baz
-                Requires-Dist: quux (>=1.1); extra == 'baz'
-                """))
+            metadata = self.metadata_template.format(
+                name='UnversionedDistribution',
+                version='Version: 0.3',
+            )
+            metadata_file.write(metadata)
 
     def teardown_method(self, method):
         shutil.rmtree(self.tmpdir)

From 600992dff64b3aefe0061b9861a48cf3558adcdc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:34:47 -0500
Subject: [PATCH 4668/8469] I'm pretty sure this deviance was incidental.

---
 setuptools/tests/test_dist_info.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 91195c52b3..edf3ffff77 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -57,7 +57,6 @@ def setup_method(self, method):
                 name='VersionedDistribution',
                 version='',
             ).replace('\n\n', '\n')
-            metadata = metadata.replace('==4', '4')
             metadata_file.write(metadata)
         unversioned = os.path.join(self.tmpdir,
                                    'UnversionedDistribution.dist-info')

From 3d4e8cfb4339e641f65def5185bcc784f6190df5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:35:34 -0500
Subject: [PATCH 4669/8469] Extract variables to nicen indentation.

---
 setuptools/tests/test_dist_info.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index edf3ffff77..ed3f18867a 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -49,8 +49,8 @@ def test_conditional_dependencies(self):
 
     def setup_method(self, method):
         self.tmpdir = tempfile.mkdtemp()
-        versioned = os.path.join(self.tmpdir,
-                                 'VersionedDistribution-2.718.dist-info')
+        dist_info_name = 'VersionedDistribution-2.718.dist-info'
+        versioned = os.path.join(self.tmpdir, dist_info_name)
         os.mkdir(versioned)
         with open(os.path.join(versioned, 'METADATA'), 'w+') as metadata_file:
             metadata = self.metadata_template.format(
@@ -58,8 +58,8 @@ def setup_method(self, method):
                 version='',
             ).replace('\n\n', '\n')
             metadata_file.write(metadata)
-        unversioned = os.path.join(self.tmpdir,
-                                   'UnversionedDistribution.dist-info')
+        dist_info_name = 'UnversionedDistribution.dist-info'
+        unversioned = os.path.join(self.tmpdir, dist_info_name)
         os.mkdir(unversioned)
         with open(os.path.join(unversioned, 'METADATA'), 'w+') as metadata_file:
             metadata = self.metadata_template.format(

From 40fe6f7674b00bb6a8ed81185e938c105845a040 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:37:29 -0500
Subject: [PATCH 4670/8469] Build a dict in a generator expression.

---
 setuptools/tests/test_dist_info.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index ed3f18867a..7d1247b32d 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -16,9 +16,10 @@ def DALS(s):
 class TestDistInfo:
 
     def test_distinfo(self):
-        dists = {}
-        for d in pkg_resources.find_distributions(self.tmpdir):
-            dists[d.project_name] = d
+        dists = dict(
+            (d.project_name, d)
+            for d in pkg_resources.find_distributions(self.tmpdir)
+        )
 
         assert len(dists) == 2, dists
 

From c04985bc9b29c2e181697b10059e99fc77ef532d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:38:53 -0500
Subject: [PATCH 4671/8469] Build requires using map

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

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 7d1247b32d..eab173357c 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -31,8 +31,8 @@ def test_distinfo(self):
 
     @pytest.mark.importorskip('ast')
     def test_conditional_dependencies(self):
-        requires = [pkg_resources.Requirement.parse('splort==4'),
-                    pkg_resources.Requirement.parse('quux>=1.1')]
+        specs = 'splort==4', 'quux>=1.1'
+        requires = list(map(pkg_resources.Requirement.parse, specs))
 
         for d in pkg_resources.find_distributions(self.tmpdir):
             assert d.requires() == requires[:1]

From 4f9b50728ae8c5cf81b13b2d4fd3098b9f18dfb1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:48:11 -0500
Subject: [PATCH 4672/8469] Use pytest for skips

---
 setuptools/tests/py26compat.py         | 14 ----------
 setuptools/tests/test_find_packages.py |  5 ++--
 setuptools/tests/test_markerlib.py     | 36 ++++++++++++--------------
 setuptools/tests/test_resources.py     |  7 ++---
 setuptools/tests/test_sdist.py         |  8 +++---
 5 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index b1ffa87703..c53b480926 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -1,21 +1,7 @@
 import sys
-import unittest
 import tarfile
 import contextlib
 
-try:
-	# provide skipIf for Python 2.4-2.6
-	skipIf = unittest.skipIf
-except AttributeError:
-	def skipIf(condition, reason):
-		def skipper(func):
-			def skip(*args, **kwargs):
-				return
-			if condition:
-				return skip
-			return func
-		return skipper
-
 def _tarfile_open_ex(*args, **kwargs):
 	"""
 	Extend result as a context manager.
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index fe390728c9..50513a6963 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -6,9 +6,10 @@
 import unittest
 import platform
 
+import pytest
+
 import setuptools
 from setuptools import find_packages
-from setuptools.tests.py26compat import skipIf
 
 find_420_packages = setuptools.PEP420PackageFinder.find
 
@@ -123,7 +124,7 @@ def test_dir_with_packages_in_subdir_is_excluded(self):
         packages = find_packages(self.dist_dir)
         self.assertTrue('build.pkg' not in packages)
 
-    @skipIf(not has_symlink(), 'Symlink support required')
+    @pytest.mark.skipif(not has_symlink(), reason='Symlink support required')
     def test_symlinked_packages_are_included(self):
         """
         A symbolically-linked directory should be treated like any other
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index dae71cba46..0cb9e70add 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -1,23 +1,19 @@
 import os
 import unittest
-from setuptools.tests.py26compat import skipIf
 
-try:
-    import ast
-except ImportError:
-    pass
+import pytest
+
 
 class TestMarkerlib(unittest.TestCase):
 
-    @skipIf('ast' not in globals(),
-        "ast not available (Python < 2.6?)")
+    @pytest.mark.importorskip('ast')
     def test_markers(self):
         from _markerlib import interpret, default_environment, compile
-        
+
         os_name = os.name
-        
+
         self.assertTrue(interpret(""))
-        
+
         self.assertTrue(interpret("os.name != 'buuuu'"))
         self.assertTrue(interpret("os_name != 'buuuu'"))
         self.assertTrue(interpret("python_version > '1.0'"))
@@ -27,7 +23,7 @@ def test_markers(self):
         self.assertTrue(interpret("'%s' in os.name" % os_name))
         self.assertTrue(interpret("'%s' in os_name" % os_name))
         self.assertTrue(interpret("'buuuu' not in os.name"))
-        
+
         self.assertFalse(interpret("os.name == 'buuuu'"))
         self.assertFalse(interpret("os_name == 'buuuu'"))
         self.assertFalse(interpret("python_version < '1.0'"))
@@ -35,14 +31,14 @@ def test_markers(self):
         self.assertFalse(interpret("python_version >= '5.0'"))
         self.assertFalse(interpret("python_version <= '1.0'"))
         self.assertFalse(interpret("'%s' not in os.name" % os_name))
-        self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))    
-        self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'"))    
-        
+        self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))
+        self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'"))
+
         environment = default_environment()
         environment['extra'] = 'test'
         self.assertTrue(interpret("extra == 'test'", environment))
         self.assertFalse(interpret("extra == 'doc'", environment))
-        
+
         def raises_nameError():
             try:
                 interpret("python.version == '42'")
@@ -50,9 +46,9 @@ def raises_nameError():
                 pass
             else:
                 raise Exception("Expected NameError")
-        
+
         raises_nameError()
-        
+
         def raises_syntaxError():
             try:
                 interpret("(x for x in (4,))")
@@ -60,9 +56,9 @@ def raises_syntaxError():
                 pass
             else:
                 raise Exception("Expected SyntaxError")
-            
+
         raises_syntaxError()
-        
+
         statement = "python_version == '5'"
         self.assertEqual(compile(statement).__doc__, statement)
-        
+
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index f9f2e459ef..ba8835a946 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,6 +8,8 @@
 import shutil
 from unittest import TestCase
 
+import pytest
+
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
@@ -18,7 +20,6 @@
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3
-from .py26compat import skipIf
 
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
@@ -612,8 +613,8 @@ def tearDown(self):
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]
 
-    msg = "Test fails when /tmp is a symlink. See #231"
-    @skipIf(os.path.islink(tempfile.gettempdir()), msg)
+    @pytest.mark.skipif(os.path.islink(tempfile.gettempdir()),
+        reason="Test fails when /tmp is a symlink. See #231")
     def test_two_levels_deep(self):
         """
         Test nested namespace packages
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 123e3ea9bd..120911d25a 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,8 @@
 import unittest
 import unicodedata
 import contextlib
-from setuptools.tests.py26compat import skipIf
+
+import pytest
 
 import pkg_resources
 from setuptools.compat import StringIO, unicode, PY3, PY2
@@ -336,8 +337,9 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = filename.decode('latin-1')
             self.assertFalse(filename in cmd.filelist.files)
 
-    @skipIf(PY3 and locale.getpreferredencoding() != 'UTF-8',
-            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
+    @pytest.mark.skipif(PY3 and locale.getpreferredencoding() != 'UTF-8',
+        reason='Unittest fails if locale is not utf-8 but the manifests is '
+            'recorded correctly')
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From b2d5b933ca507817db94e58bf0fb3e7d20ae12f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 16:56:53 -0500
Subject: [PATCH 4673/8469] Remove unused imports

---
 setuptools/tests/test_packageindex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 664566a36c..d1d6ca8d93 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,7 +4,7 @@
 import os
 import unittest
 import pkg_resources
-from setuptools.compat import urllib2, httplib, HTTPError, unicode, pathname2url
+from setuptools.compat import httplib, HTTPError, unicode, pathname2url
 import distutils.errors
 import setuptools.package_index
 from setuptools.tests.server import IndexServer

From ed54215c1ca6be3874ad8d861b8514dc3009bbb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:02:09 -0500
Subject: [PATCH 4674/8469] Use serve_forever and shutdown, now available.

---
 setuptools/tests/server.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index ae2381e355..266ee5bdc3 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -23,12 +23,8 @@ def __init__(self, server_address=('', 0),
         HTTPServer.__init__(self, server_address, RequestHandlerClass)
         self._run = True
 
-    def serve(self):
-        while self._run:
-            self.handle_request()
-
     def start(self):
-        self.thread = threading.Thread(target=self.serve)
+        self.thread = threading.Thread(target=self.serve_forever)
         self.thread.start()
 
     def stop(self):
@@ -37,19 +33,7 @@ def stop(self):
         # Let the server finish the last request and wait for a new one.
         time.sleep(0.1)
 
-        # self.shutdown is not supported on python < 2.6, so just
-        #  set _run to false, and make a request, causing it to
-        #  terminate.
-        self._run = False
-        url = 'http://127.0.0.1:%(server_port)s/' % vars(self)
-        try:
-            if sys.version_info >= (2, 6):
-                urllib2.urlopen(url, timeout=5)
-            else:
-                urllib2.urlopen(url)
-        except URLError:
-            # ignore any errors; all that's important is the request
-            pass
+        self.shutdown()
         self.thread.join()
         self.socket.close()
 

From 9f6d874dfc15a4d695dbed3ffa9bd3ed56008350 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:03:21 -0500
Subject: [PATCH 4675/8469] Use property

---
 setuptools/tests/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 266ee5bdc3..b53168d1b5 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -61,6 +61,6 @@ def __init__(self, server_address=('', 0),
     def run(self):
         self.serve_forever()
 
+    @property
     def url(self):
         return 'http://localhost:%(server_port)s/' % vars(self)
-    url = property(url)

From d4411774ba9ee79480c8128b4e8f610481a65cf3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:03:42 -0500
Subject: [PATCH 4676/8469] Remove unused imports

---
 setuptools/tests/server.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index b53168d1b5..6b21427992 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -1,11 +1,10 @@
 """Basic http server for tests to simulate PyPI or custom indexes
 """
-import sys
+
 import time
 import threading
 from setuptools.compat import BaseHTTPRequestHandler
-from setuptools.compat import (urllib2, URLError, HTTPServer,
-                               SimpleHTTPRequestHandler)
+from setuptools.compat import HTTPServer, SimpleHTTPRequestHandler
 
 class IndexServer(HTTPServer):
     """Basic single-threaded http server simulating a package index

From 64a1da4d9c2e85d28e9c4040bcccb5abbdd689ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:05:55 -0500
Subject: [PATCH 4677/8469] Remove unused imports

---
 setuptools/tests/test_bdist_egg.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index cf4bcd1179..208f63dd8b 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -8,10 +8,7 @@
 import tempfile
 import unittest
 
-from distutils.errors import DistutilsError
 from setuptools.compat import StringIO
-from setuptools.command.bdist_egg import bdist_egg
-from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 
 SETUP_PY = """\
@@ -56,7 +53,7 @@ def test_bdist_egg(self):
             ))
         os.makedirs(os.path.join('build', 'src'))
         old_stdout = sys.stdout
-        sys.stdout = o = StringIO()
+        sys.stdout = StringIO()
         try:
             dist.parse_command_line()
             dist.run_commands()

From 189b1c027e626496b7b7bb1b5996123f54286075 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:06:47 -0500
Subject: [PATCH 4678/8469] Use context opener

---
 setuptools/tests/test_bdist_egg.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 208f63dd8b..58d25b7056 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -23,12 +23,10 @@ def setUp(self):
         self.dir = tempfile.mkdtemp()
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
-        f = open('setup.py', 'w')
-        f.write(SETUP_PY)
-        f.close()
-        f = open('hi.py', 'w')
-        f.write('1\n')
-        f.close()
+        with open('setup.py', 'w') as f:
+            f.write(SETUP_PY)
+        with open('hi.py', 'w') as f:
+            f.write('1\n')
         if sys.version >= "2.6":
             self.old_base = site.USER_BASE
             site.USER_BASE = tempfile.mkdtemp()

From 0bc8f31f5d694578cec3d0b8b4951db06fc921fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:10:57 -0500
Subject: [PATCH 4679/8469] Move contexts to their own module

---
 setuptools/tests/contexts.py          | 59 +++++++++++++++++++++++
 setuptools/tests/test_easy_install.py | 69 ++++-----------------------
 2 files changed, 69 insertions(+), 59 deletions(-)
 create mode 100644 setuptools/tests/contexts.py

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
new file mode 100644
index 0000000000..a9626ae67a
--- /dev/null
+++ b/setuptools/tests/contexts.py
@@ -0,0 +1,59 @@
+import tempfile
+import os
+import shutil
+import sys
+import contextlib
+
+from ..compat import StringIO
+
+
+@contextlib.contextmanager
+def tempdir(cd=lambda dir:None):
+    temp_dir = tempfile.mkdtemp()
+    orig_dir = os.getcwd()
+    try:
+        cd(temp_dir)
+        yield temp_dir
+    finally:
+        cd(orig_dir)
+        shutil.rmtree(temp_dir)
+
+
+@contextlib.contextmanager
+def environment(**updates):
+    old_env = os.environ.copy()
+    os.environ.update(updates)
+    try:
+        yield
+    finally:
+        for key in updates:
+            del os.environ[key]
+        os.environ.update(old_env)
+
+
+@contextlib.contextmanager
+def argv(repl):
+    old_argv = sys.argv[:]
+    sys.argv[:] = repl
+    yield
+    sys.argv[:] = old_argv
+
+
+@contextlib.contextmanager
+def quiet():
+    """
+    Redirect stdout/stderr to StringIO objects to prevent console output from
+    distutils commands.
+    """
+
+    old_stdout = sys.stdout
+    old_stderr = sys.stderr
+    new_stdout = sys.stdout = StringIO()
+    new_stderr = sys.stderr = StringIO()
+    try:
+        yield new_stdout, new_stderr
+    finally:
+        new_stdout.seek(0)
+        new_stderr.seek(0)
+        sys.stdout = old_stdout
+        sys.stderr = old_stderr
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 46c2df2cad..19e1674caa 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -29,6 +29,7 @@
 import pkg_resources
 
 from .py26compat import tarfile_open
+from . import contexts
 
 
 def DALS(input):
@@ -264,7 +265,7 @@ def test_setup_requires(self):
         test_setup_py = os.path.join(test_pkg, 'setup.py')
 
         try:
-            with quiet_context():
+            with contexts.quiet():
                 with self.patched_setup_context():
                     run_setup(test_setup_py, ['install'])
         except SandboxViolation:
@@ -281,7 +282,7 @@ def distutils_package():
         'from setuptools import setup',
         'from distutils.core import setup',
     )
-    with tempdir_context(cd=os.chdir):
+    with contexts.tempdir(cd=os.chdir):
         with open('setup.py', 'w') as f:
             f.write(distutils_setup_py)
         yield
@@ -309,11 +310,11 @@ def test_setup_requires_honors_fetch_params(self):
             # Some platforms (Jython) don't find a port to which to bind,
             #  so skip this test for them.
             return
-        with quiet_context():
+        with contexts.quiet():
             # create an sdist that has a build-time dependency.
             with TestSetupRequires.create_sdist() as dist_file:
-                with tempdir_context() as temp_install_dir:
-                    with environment_context(PYTHONPATH=temp_install_dir):
+                with contexts.tempdir() as temp_install_dir:
+                    with contexts.environment(PYTHONPATH=temp_install_dir):
                         ei_params = [
                             '--index-url', p_index.url,
                             '--allow-hosts', p_index_loc,
@@ -321,7 +322,7 @@ def test_setup_requires_honors_fetch_params(self):
                             '--install-dir', temp_install_dir,
                             dist_file,
                         ]
-                        with argv_context(['easy_install']):
+                        with contexts.argv(['easy_install']):
                             # attempt to install the dist. It should fail because
                             #  it doesn't exist.
                             with pytest.raises(SystemExit):
@@ -338,7 +339,7 @@ def create_sdist():
         Return an sdist with a setup_requires dependency (of something that
         doesn't exist)
         """
-        with tempdir_context() as dir:
+        with contexts.tempdir() as dir:
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
             script = DALS("""
                 import setuptools
@@ -366,10 +367,10 @@ def test_setup_requires_overrides_version_conflict(self):
         working_set.add(fake_dist)
 
         try:
-            with tempdir_context() as temp_dir:
+            with contexts.tempdir() as temp_dir:
                 test_pkg = create_setup_requires_package(temp_dir)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
-                with quiet_context() as (stdout, stderr):
+                with contexts.quiet() as (stdout, stderr):
                     try:
                         # Don't even need to install the package, just
                         # running the setup.py at all is sufficient
@@ -436,53 +437,3 @@ def make_trivial_sdist(dist_path, setup_py):
     setup_py_file.size = len(setup_py_bytes.getvalue())
     with tarfile_open(dist_path, 'w:gz') as dist:
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
-
-
-@contextlib.contextmanager
-def tempdir_context(cd=lambda dir:None):
-    temp_dir = tempfile.mkdtemp()
-    orig_dir = os.getcwd()
-    try:
-        cd(temp_dir)
-        yield temp_dir
-    finally:
-        cd(orig_dir)
-        shutil.rmtree(temp_dir)
-
-@contextlib.contextmanager
-def environment_context(**updates):
-    old_env = os.environ.copy()
-    os.environ.update(updates)
-    try:
-        yield
-    finally:
-        for key in updates:
-            del os.environ[key]
-        os.environ.update(old_env)
-
-@contextlib.contextmanager
-def argv_context(repl):
-    old_argv = sys.argv[:]
-    sys.argv[:] = repl
-    yield
-    sys.argv[:] = old_argv
-
-
-@contextlib.contextmanager
-def quiet_context():
-    """
-    Redirect stdout/stderr to StringIO objects to prevent console output from
-    distutils commands.
-    """
-
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    new_stdout = sys.stdout = StringIO()
-    new_stderr = sys.stderr = StringIO()
-    try:
-        yield new_stdout, new_stderr
-    finally:
-        new_stdout.seek(0)
-        new_stderr.seek(0)
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr

From 32f39a11f9196984c50b2193ca40c2472040ed96 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:14:19 -0500
Subject: [PATCH 4680/8469] Use quiet context instead of copy pasta.

---
 setuptools/tests/test_bdist_egg.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 58d25b7056..519f27c9d7 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -8,9 +8,11 @@
 import tempfile
 import unittest
 
-from setuptools.compat import StringIO
 from setuptools.dist import Distribution
 
+from . import contexts
+
+
 SETUP_PY = """\
 from setuptools import setup
 
@@ -50,13 +52,9 @@ def test_bdist_egg(self):
             py_modules=['hi']
             ))
         os.makedirs(os.path.join('build', 'src'))
-        old_stdout = sys.stdout
-        sys.stdout = StringIO()
-        try:
+        with contexts.quiet():
             dist.parse_command_line()
             dist.run_commands()
-        finally:
-            sys.stdout = old_stdout
 
         # let's see if we got our egg link at the right place
         [content] = os.listdir('dist')

From ae7007467caf6d29936c0e7ff9f9d92f610aeb98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:14:41 -0500
Subject: [PATCH 4681/8469] Python 2.6 is required

---
 setuptools/tests/test_bdist_egg.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 519f27c9d7..1b406f5ccc 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,7 +4,6 @@
 import re
 import shutil
 import site
-import sys
 import tempfile
 import unittest
 
@@ -29,20 +28,18 @@ def setUp(self):
             f.write(SETUP_PY)
         with open('hi.py', 'w') as f:
             f.write('1\n')
-        if sys.version >= "2.6":
-            self.old_base = site.USER_BASE
-            site.USER_BASE = tempfile.mkdtemp()
-            self.old_site = site.USER_SITE
-            site.USER_SITE = tempfile.mkdtemp()
+        self.old_base = site.USER_BASE
+        site.USER_BASE = tempfile.mkdtemp()
+        self.old_site = site.USER_SITE
+        site.USER_SITE = tempfile.mkdtemp()
 
     def tearDown(self):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
-        if sys.version >= "2.6":
-            shutil.rmtree(site.USER_BASE)
-            shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
+        shutil.rmtree(site.USER_BASE)
+        shutil.rmtree(site.USER_SITE)
+        site.USER_BASE = self.old_base
+        site.USER_SITE = self.old_site
 
     def test_bdist_egg(self):
         dist = Distribution(dict(

From 1cbdf581186e1f34f1e48673f5faf60922e66799 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:31:37 -0500
Subject: [PATCH 4682/8469] Replace setup and teardown with pytest fixtures.

---
 setuptools/tests/test_bdist_egg.py | 62 ++++++++++++++----------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 1b406f5ccc..d29ef4419d 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -2,10 +2,9 @@
 """
 import os
 import re
-import shutil
-import site
-import tempfile
-import unittest
+
+import pytest
+import mock
 
 from setuptools.dist import Distribution
 
@@ -18,30 +17,31 @@
 setup(name='foo', py_modules=['hi'])
 """
 
-class TestDevelopTest(unittest.TestCase):
-
-    def setUp(self):
-        self.dir = tempfile.mkdtemp()
-        self.old_cwd = os.getcwd()
-        os.chdir(self.dir)
-        with open('setup.py', 'w') as f:
-            f.write(SETUP_PY)
-        with open('hi.py', 'w') as f:
-            f.write('1\n')
-        self.old_base = site.USER_BASE
-        site.USER_BASE = tempfile.mkdtemp()
-        self.old_site = site.USER_SITE
-        site.USER_SITE = tempfile.mkdtemp()
-
-    def tearDown(self):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-        shutil.rmtree(site.USER_BASE)
-        shutil.rmtree(site.USER_SITE)
-        site.USER_BASE = self.old_base
-        site.USER_SITE = self.old_site
-
-    def test_bdist_egg(self):
+@pytest.yield_fixture
+def user_override():
+    """
+    Override site.USER_BASE and site.USER_SITE with temporary directories in
+    a context.
+    """
+    with contexts.tempdir() as user_base:
+        with mock.patch('site.USER_BASE', user_base):
+            with contexts.tempdir() as user_site:
+                with mock.patch('site.USER_SITE', user_site):
+                    yield
+
+
+@pytest.yield_fixture
+def setup_context(tmpdir):
+    with (tmpdir/'setup.py').open('w') as f:
+        f.write(SETUP_PY)
+    with (tmpdir/'hi.py').open('w') as f:
+        f.write('1\n')
+    with tmpdir.as_cwd():
+        yield tmpdir
+
+
+class TestDevelopTest:
+    def test_bdist_egg(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',
             script_args=['bdist_egg'],
@@ -55,8 +55,4 @@ def test_bdist_egg(self):
 
         # let's see if we got our egg link at the right place
         [content] = os.listdir('dist')
-        self.assertTrue(re.match('foo-0.0.0-py[23].\d.egg$', content))
-
-def test_suite():
-    return unittest.makeSuite(TestDevelopTest)
-
+        assert re.match('foo-0.0.0-py[23].\d.egg$', content)

From 0003313ff59f74efe21893a7278c5e89ba58afea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:33:02 -0500
Subject: [PATCH 4683/8469] Correct naming artifact.

---
 setuptools/tests/test_bdist_egg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index d29ef4419d..08bc75d7bc 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -40,7 +40,7 @@ def setup_context(tmpdir):
         yield tmpdir
 
 
-class TestDevelopTest:
+class Test:
     def test_bdist_egg(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',

From 903c0d6a3bda96a0b193cc6efd2f8e868d4d82e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:35:05 -0500
Subject: [PATCH 4684/8469] Use namespacing for easier reading

---
 setuptools/tests/test_build_ext.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index a92e53ae26..32e4ad403d 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,7 +1,8 @@
 """build_ext tests
 """
 import unittest
-from distutils.command.build_ext import build_ext as distutils_build_ext
+import distutils.command.build_ext as orig
+
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
 
@@ -15,5 +16,5 @@ def test_get_ext_filename(self):
         cmd = build_ext(dist)
         cmd.ext_map['foo/bar'] = ''
         res = cmd.get_ext_filename('foo')
-        wanted = distutils_build_ext.get_ext_filename(cmd, 'foo')
+        wanted = orig.build_ext.get_ext_filename(cmd, 'foo')
         assert res == wanted

From 615fc93eba554dba65b3545ead2405014e2a4af8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:35:37 -0500
Subject: [PATCH 4685/8469] Remodel comment as docstring.

---
 setuptools/tests/test_build_ext.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 32e4ad403d..cc8a35e55f 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -9,9 +9,11 @@
 class TestBuildExtTest(unittest.TestCase):
 
     def test_get_ext_filename(self):
-        # setuptools needs to give back the same
-        # result than distutils, even if the fullname
-        # is not in ext_map
+        """
+        Setuptools needs to give back the same
+        result as distutils, even if the fullname
+        is not in ext_map.
+        """
         dist = Distribution()
         cmd = build_ext(dist)
         cmd.ext_map['foo/bar'] = ''

From 359a80897decd64a0d997005dc7cb731fc294133 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:36:29 -0500
Subject: [PATCH 4686/8469] Use pytest for test discovery in build_ext

---
 setuptools/tests/test_build_ext.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index cc8a35e55f..3f356aca3c 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,12 +1,11 @@
 """build_ext tests
 """
-import unittest
 import distutils.command.build_ext as orig
 
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
 
-class TestBuildExtTest(unittest.TestCase):
+class TestBuildExt:
 
     def test_get_ext_filename(self):
         """

From 64a3d8b243a2c41dc43b29567652518f1b08992d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 17:36:49 -0500
Subject: [PATCH 4687/8469] Remove superfluous comment

---
 setuptools/tests/test_build_ext.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 3f356aca3c..0719ba44ae 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,12 +1,9 @@
-"""build_ext tests
-"""
 import distutils.command.build_ext as orig
 
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
 
 class TestBuildExt:
-
     def test_get_ext_filename(self):
         """
         Setuptools needs to give back the same

From 0ef90459f8c249a53a0c5e9daaa8a4cf407f7fe9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 18:09:36 -0500
Subject: [PATCH 4688/8469] Convert test_develop to use pytest

---
 setuptools/tests/test_develop.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 66d182eb46..9d8a56c330 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -5,7 +5,6 @@
 import site
 import sys
 import tempfile
-import unittest
 
 from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
@@ -23,9 +22,9 @@
 INIT_PY = """print "foo"
 """
 
-class TestDevelopTest(unittest.TestCase):
+class TestDevelopTest:
 
-    def setUp(self):
+    def setup_method(self, method):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
 
@@ -50,7 +49,7 @@ def setUp(self):
         self.old_site = site.USER_SITE
         site.USER_SITE = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
             return
 
@@ -86,7 +85,7 @@ def test_develop(self):
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
         content.sort()
-        self.assertEqual(content, ['easy-install.pth', 'foo.egg-link'])
+        assert content == ['easy-install.pth', 'foo.egg-link']
 
         # Check that we are using the right code.
         egg_link_file = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt')
@@ -100,9 +99,9 @@ def test_develop(self):
         finally:
             init_file.close()
         if sys.version < "3":
-            self.assertEqual(init, 'print "foo"')
+            assert init == 'print "foo"'
         else:
-            self.assertEqual(init, 'print("foo")')
+            assert init == 'print("foo")'
 
     def notest_develop_with_setup_requires(self):
 

From a5b9b91081943cb771a3fc7b5873410599513332 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 18:12:40 -0500
Subject: [PATCH 4689/8469] Remove consideration for older Pythons

---
 setuptools/tests/test_develop.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 9d8a56c330..890880dcb4 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -25,7 +25,7 @@
 class TestDevelopTest:
 
     def setup_method(self, method):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if hasattr(sys, 'real_prefix'):
             return
 
         # Directory structure
@@ -50,7 +50,7 @@ def setup_method(self, method):
         site.USER_SITE = tempfile.mkdtemp()
 
     def teardown_method(self, method):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
+        if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
             return
 
         os.chdir(self.old_cwd)
@@ -61,7 +61,7 @@ def teardown_method(self, method):
         site.USER_SITE = self.old_site
 
     def test_develop(self):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if hasattr(sys, 'real_prefix'):
             return
         dist = Distribution(
             dict(name='foo',

From c3319da5b2e4a8d597a5b27d4a034199eea78745 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 18:13:41 -0500
Subject: [PATCH 4690/8469] Remove apparently unused method.

---
 setuptools/tests/test_develop.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 890880dcb4..f18ddd6ef0 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -102,20 +102,3 @@ def test_develop(self):
             assert init == 'print "foo"'
         else:
             assert init == 'print("foo")'
-
-    def notest_develop_with_setup_requires(self):
-
-        wanted = ("Could not find suitable distribution for "
-                  "Requirement.parse('I-DONT-EXIST')")
-        old_dir = os.getcwd()
-        os.chdir(self.dir)
-        try:
-            try:
-                Distribution({'setup_requires': ['I_DONT_EXIST']})
-            except DistutilsError:
-                e = sys.exc_info()[1]
-                error = str(e)
-                if error == wanted:
-                    pass
-        finally:
-            os.chdir(old_dir)

From f8285cac4b95e6b43869e27093ef04552e665681 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 23:31:22 -0500
Subject: [PATCH 4691/8469] Move fixture to a fixtures module and make that
 fixture available globally.

---
 conftest.py                        |  1 +
 setuptools/tests/fixtures.py       | 16 ++++++++++++++++
 setuptools/tests/test_bdist_egg.py | 15 ---------------
 3 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 conftest.py
 create mode 100644 setuptools/tests/fixtures.py

diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000000..a513bb9e2b
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1 @@
+pytest_plugins = 'setuptools.tests.fixtures'
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
new file mode 100644
index 0000000000..6b0e53f395
--- /dev/null
+++ b/setuptools/tests/fixtures.py
@@ -0,0 +1,16 @@
+import mock
+import pytest
+
+from . import contexts
+
+@pytest.yield_fixture
+def user_override():
+    """
+    Override site.USER_BASE and site.USER_SITE with temporary directories in
+    a context.
+    """
+    with contexts.tempdir() as user_base:
+        with mock.patch('site.USER_BASE', user_base):
+            with contexts.tempdir() as user_site:
+                with mock.patch('site.USER_SITE', user_site):
+                    yield
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 08bc75d7bc..ccfb2ea76b 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,32 +4,17 @@
 import re
 
 import pytest
-import mock
 
 from setuptools.dist import Distribution
 
 from . import contexts
 
-
 SETUP_PY = """\
 from setuptools import setup
 
 setup(name='foo', py_modules=['hi'])
 """
 
-@pytest.yield_fixture
-def user_override():
-    """
-    Override site.USER_BASE and site.USER_SITE with temporary directories in
-    a context.
-    """
-    with contexts.tempdir() as user_base:
-        with mock.patch('site.USER_BASE', user_base):
-            with contexts.tempdir() as user_site:
-                with mock.patch('site.USER_SITE', user_site):
-                    yield
-
-
 @pytest.yield_fixture
 def setup_context(tmpdir):
     with (tmpdir/'setup.py').open('w') as f:

From 0b799319a7360bbf2497c037188217334346ba39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 23:38:02 -0500
Subject: [PATCH 4692/8469] Convert select tests to pytest model.

---
 setuptools/tests/test_easy_install.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 19e1674caa..61eb868fcb 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -133,9 +133,9 @@ def test_add_from_site_is_ignored(self):
         self.assertTrue(not pth.dirty)
 
 
-class TestUserInstallTest(unittest.TestCase):
+class TestUserInstallTest:
 
-    def setUp(self):
+    def setup_method(self, method):
         self.dir = tempfile.mkdtemp()
         setup = os.path.join(self.dir, 'setup.py')
         with open(setup, 'w') as f:
@@ -151,7 +151,7 @@ def setUp(self):
         site.USER_SITE = tempfile.mkdtemp()
         easy_install_pkg.__file__ = site.USER_SITE
 
-    def tearDown(self):
+    def teardown_method(self, method):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
 
@@ -170,7 +170,7 @@ def test_user_install_implied(self):
         cmd = easy_install(dist)
         cmd.args = ['py']
         cmd.ensure_finalized()
-        self.assertTrue(cmd.user, 'user should be implied')
+        assert cmd.user, 'user should be implied'
 
     def test_multiproc_atexit(self):
         try:
@@ -191,7 +191,7 @@ def test_user_install_not_implied_without_usersite_enabled(self):
         cmd = easy_install(dist)
         cmd.args = ['py']
         cmd.initialize_options()
-        self.assertFalse(cmd.user, 'NOT user should be implied')
+        assert not cmd.user, 'NOT user should be implied'
 
     def test_local_index(self):
         # make sure the local index is used
@@ -217,7 +217,7 @@ def test_local_index(self):
             res = cmd.easy_install('foo')
             actual = os.path.normcase(os.path.realpath(res.location))
             expected = os.path.normcase(os.path.realpath(new_location))
-            self.assertEqual(actual, expected)
+            assert actual == expected
         finally:
             sys.path.remove(target)
             for basedir in [new_location, target, ]:

From bb7a25abe65fba3fa3e8ae3973321f1fedab8e37 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 23:47:12 -0500
Subject: [PATCH 4693/8469] Also save the ENABLE_USER_SITE setting in the
 user_override.

---
 setuptools/tests/contexts.py | 10 ++++++++++
 setuptools/tests/fixtures.py |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index a9626ae67a..1620bdb305 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -3,6 +3,7 @@
 import shutil
 import sys
 import contextlib
+import site
 
 from ..compat import StringIO
 
@@ -57,3 +58,12 @@ def quiet():
         new_stderr.seek(0)
         sys.stdout = old_stdout
         sys.stderr = old_stderr
+
+
+@contextlib.contextmanager
+def save_user_site_setting():
+    saved = site.ENABLE_USER_SITE
+    try:
+        yield saved
+    finally:
+        site.ENABLE_USER_SITE = saved
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 6b0e53f395..225c2ea398 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -13,4 +13,5 @@ def user_override():
         with mock.patch('site.USER_BASE', user_base):
             with contexts.tempdir() as user_site:
                 with mock.patch('site.USER_SITE', user_site):
-                    yield
+                    with contexts.save_user_site_setting():
+                        yield

From 81be05c12fd45550981d1d2a8a4e452482389376 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 23:53:59 -0500
Subject: [PATCH 4694/8469] Replace some setup/teardown code with the fixture.

---
 setuptools/tests/test_easy_install.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 61eb868fcb..69f42d5626 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -133,6 +133,7 @@ def test_add_from_site_is_ignored(self):
         self.assertTrue(not pth.dirty)
 
 
+@pytest.mark.usefixtures("user_override")
 class TestUserInstallTest:
 
     def setup_method(self, method):
@@ -143,26 +144,17 @@ def setup_method(self, method):
         self.old_cwd = os.getcwd()
         os.chdir(self.dir)
 
-        self.old_enable_site = site.ENABLE_USER_SITE
         self.old_file = easy_install_pkg.__file__
-        self.old_base = site.USER_BASE
-        site.USER_BASE = tempfile.mkdtemp()
-        self.old_site = site.USER_SITE
-        site.USER_SITE = tempfile.mkdtemp()
         easy_install_pkg.__file__ = site.USER_SITE
 
     def teardown_method(self, method):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
 
-        shutil.rmtree(site.USER_BASE)
-        shutil.rmtree(site.USER_SITE)
-        site.USER_BASE = self.old_base
-        site.USER_SITE = self.old_site
-        site.ENABLE_USER_SITE = self.old_enable_site
         easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
+        easy_install_pkg.__file__ = site.USER_SITE
         site.ENABLE_USER_SITE = True # disabled sometimes
         #XXX: replace with something meaningfull
         dist = Distribution()

From e1df8f970338c1d20fca384c4258ebb01a5e6682 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jan 2015 23:54:42 -0500
Subject: [PATCH 4695/8469] Normalize whitespace

---
 setuptools/tests/test_easy_install.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 69f42d5626..9922716c29 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -235,7 +235,6 @@ def user_install_setup_context(self, *args, **kwargs):
             ei.__file__ = site.USER_SITE
             yield
 
-
     def patched_setup_context(self):
         self.orig_context = sandbox.setup_context
 
@@ -244,7 +243,6 @@ def patched_setup_context(self):
             self.user_install_setup_context,
         )
 
-
     def test_setup_requires(self):
         """Regression test for Distribute issue #318
 

From bc030aa9e1e5822524bb3ec9b8a0213f579b7b7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 00:02:30 -0500
Subject: [PATCH 4696/8469] Replace much of setup/teardown with another
 fixture.

---
 setuptools/tests/test_easy_install.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 9922716c29..04a362f5d3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -133,24 +133,23 @@ def test_add_from_site_is_ignored(self):
         self.assertTrue(not pth.dirty)
 
 
+@pytest.yield_fixture
+def setup_context(tmpdir):
+    with (tmpdir/'setup.py').open('w') as f:
+        f.write(SETUP_PY)
+    with tmpdir.as_cwd():
+        yield tmpdir
+
+
 @pytest.mark.usefixtures("user_override")
+@pytest.mark.usefixtures("setup_context")
 class TestUserInstallTest:
 
     def setup_method(self, method):
-        self.dir = tempfile.mkdtemp()
-        setup = os.path.join(self.dir, 'setup.py')
-        with open(setup, 'w') as f:
-            f.write(SETUP_PY)
-        self.old_cwd = os.getcwd()
-        os.chdir(self.dir)
-
         self.old_file = easy_install_pkg.__file__
         easy_install_pkg.__file__ = site.USER_SITE
 
     def teardown_method(self, method):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-
         easy_install_pkg.__file__ = self.old_file
 
     def test_user_install_implied(self):
@@ -251,7 +250,7 @@ def test_setup_requires(self):
         SandboxViolation.
         """
 
-        test_pkg = create_setup_requires_package(self.dir)
+        test_pkg = create_setup_requires_package(os.getcwd())
         test_setup_py = os.path.join(test_pkg, 'setup.py')
 
         try:

From 2a29b7359ccfa6c5dc99a08d0a19e1c3ba1dfa5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 00:09:56 -0500
Subject: [PATCH 4697/8469] Replace remaining setup/teardown with a simple
 mock.

---
 setuptools/tests/test_easy_install.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 04a362f5d3..e052ff1e60 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -145,13 +145,7 @@ def setup_context(tmpdir):
 @pytest.mark.usefixtures("setup_context")
 class TestUserInstallTest:
 
-    def setup_method(self, method):
-        self.old_file = easy_install_pkg.__file__
-        easy_install_pkg.__file__ = site.USER_SITE
-
-    def teardown_method(self, method):
-        easy_install_pkg.__file__ = self.old_file
-
+    @mock.patch('setuptools.command.easy_install.__file__', None)
     def test_user_install_implied(self):
         easy_install_pkg.__file__ = site.USER_SITE
         site.ENABLE_USER_SITE = True # disabled sometimes

From a73be3ae059fd1583f9930b76116ae977e29c174 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 00:12:02 -0500
Subject: [PATCH 4698/8469] Remove unused entries in manifest, fixing spurious
 warnings.

---
 MANIFEST.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index f6caf61a99..ed60948bf9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
-recursive-include setuptools *.py *.txt *.exe *.xml
-recursive-include tests *.py *.c *.pyx *.txt
-recursive-include setuptools/tests *.html entries*
-recursive-include setuptools/tests/svn_data *.zip
+recursive-include setuptools *.py *.exe *.xml
+recursive-include tests *.py *.c *.pyx
+recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py
 recursive-include pkg_resources *.py *.txt

From 943d583e1ec0d6e4a8a4f3be4361223c39e937d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 09:17:00 -0500
Subject: [PATCH 4699/8469] Remove unused import

---
 setuptools/tests/test_develop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index f18ddd6ef0..ed1b194a78 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -6,7 +6,6 @@
 import sys
 import tempfile
 
-from distutils.errors import DistutilsError
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
 

From b14ed9cb87ba7f9aff5baecceae9ca54351a6b4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 09:37:45 -0500
Subject: [PATCH 4700/8469] Convert remaining tests in test_easy_install to
 pytest.

---
 setuptools/tests/test_easy_install.py | 31 +++++++++++++--------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e052ff1e60..b3fa9cff80 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -4,7 +4,6 @@
 import os
 import shutil
 import tempfile
-import unittest
 import site
 import contextlib
 import textwrap
@@ -67,7 +66,7 @@ def as_requirement(self):
     setup(name='foo')
     """)
 
-class TestEasyInstallTest(unittest.TestCase):
+class TestEasyInstallTest:
 
     def test_install_site_py(self):
         dist = Distribution()
@@ -77,7 +76,7 @@ def test_install_site_py(self):
         try:
             cmd.install_site_py()
             sitepy = os.path.join(cmd.install_dir, 'site.py')
-            self.assertTrue(os.path.exists(sitepy))
+            assert os.path.exists(sitepy)
         finally:
             shutil.rmtree(cmd.install_dir)
 
@@ -87,7 +86,7 @@ def test_get_script_args(self):
         args = next(get_script_args(dist))
         name, script = itertools.islice(args, 2)
 
-        self.assertEqual(script, WANTED)
+        assert script == WANTED
 
     def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at
@@ -100,7 +99,7 @@ def test_no_find_links(self):
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
         cmd.args = ['ok']
         cmd.ensure_finalized()
-        self.assertEqual(cmd.package_index.scanned_urls, {})
+        assert cmd.package_index.scanned_urls == {}
 
         # let's try without it (default behavior)
         cmd = easy_install(dist)
@@ -110,27 +109,27 @@ def test_no_find_links(self):
         cmd.args = ['ok']
         cmd.ensure_finalized()
         keys = sorted(cmd.package_index.scanned_urls.keys())
-        self.assertEqual(keys, ['link1', 'link2'])
+        assert keys == ['link1', 'link2']
 
 
-class TestPTHFileWriter(unittest.TestCase):
+class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):
         '''a pth file manager should set dirty
         if a distribution is in site but also the cwd
         '''
         pth = PthDistributions('does-not_exist', [os.getcwd()])
-        self.assertTrue(not pth.dirty)
+        assert not pth.dirty
         pth.add(PRDistribution(os.getcwd()))
-        self.assertTrue(pth.dirty)
+        assert pth.dirty
 
     def test_add_from_site_is_ignored(self):
         location = '/test/location/does-not-have-to-exist'
         # PthDistributions expects all locations to be normalized
         location = pkg_resources.normalize_path(location)
         pth = PthDistributions('does-not_exist', [location, ])
-        self.assertTrue(not pth.dirty)
+        assert not pth.dirty
         pth.add(PRDistribution(location))
-        self.assertTrue(not pth.dirty)
+        assert not pth.dirty
 
 
 @pytest.yield_fixture
@@ -276,7 +275,7 @@ def test_bdist_egg_available_on_distutils_pkg(self, distutils_package):
         run_setup('setup.py', ['bdist_egg'])
 
 
-class TestSetupRequires(unittest.TestCase):
+class TestSetupRequires:
 
     def test_setup_requires_honors_fetch_params(self):
         """
@@ -312,8 +311,8 @@ def test_setup_requires_honors_fetch_params(self):
                                 easy_install_pkg.main(ei_params)
         # there should have been two or three requests to the server
         #  (three happens on Python 3.3a)
-        self.assertTrue(2 <= len(p_index.requests) <= 3)
-        self.assertEqual(p_index.requests[0].path, '/does-not-exist/')
+        assert 2 <= len(p_index.requests) <= 3
+        assert p_index.requests[0].path == '/does-not-exist/'
 
     @staticmethod
     @contextlib.contextmanager
@@ -363,8 +362,8 @@ def test_setup_requires_overrides_version_conflict(self):
                             'caused a VersionConflict')
 
                 lines = stdout.readlines()
-                self.assertTrue(len(lines) > 0)
-                self.assertTrue(lines[-1].strip(), 'test_pkg')
+                assert len(lines) > 0
+                assert lines[-1].strip(), 'test_pkg'
         finally:
             pkg_resources.__setstate__(pr_state)
 

From bbb68a8b848f9dbd4d44419fdae93b5e057763e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 09:49:58 -0500
Subject: [PATCH 4701/8469] Rewrite test using pytest.

---
 setuptools/tests/fixtures.py      |  7 ++++++
 setuptools/tests/test_egg_info.py | 39 +++++++++++--------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 225c2ea398..0b1eaf5f22 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -3,6 +3,7 @@
 
 from . import contexts
 
+
 @pytest.yield_fixture
 def user_override():
     """
@@ -15,3 +16,9 @@ def user_override():
                 with mock.patch('site.USER_SITE', user_site):
                     with contexts.save_user_site_setting():
                         yield
+
+
+@pytest.yield_fixture
+def tmpdir_cwd(tmpdir):
+    with tmpdir.as_cwd() as orig:
+        yield orig
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 6b4d917f5a..d8c3252e61 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -2,22 +2,11 @@
 import tempfile
 import shutil
 import stat
-import unittest
 
 from . import environment
 
 
-class TestEggInfo(unittest.TestCase):
-
-    def setUp(self):
-        self.test_dir = tempfile.mkdtemp()
-
-        self.old_cwd = os.getcwd()
-        os.chdir(self.test_dir)
-
-    def tearDown(self):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.test_dir)
+class TestEggInfo:
 
     def _create_project(self):
         with open('setup.py', 'w') as f:
@@ -33,7 +22,7 @@ def _create_project(self):
             f.write('def run():\n')
             f.write("    print('hello')\n")
 
-    def test_egg_base_installed_egg_info(self):
+    def test_egg_base_installed_egg_info(self, tmpdir_cwd):
         self._create_project()
         temp_dir = tempfile.mkdtemp(prefix='setuptools-test.')
         os.chmod(temp_dir, stat.S_IRWXU)
@@ -54,7 +43,7 @@ def test_egg_base_installed_egg_info(self):
                     '--install-lib', paths['lib'],
                     '--install-scripts', paths['scripts'],
                     '--install-data', paths['data']],
-                pypath=os.pathsep.join([paths['lib'], self.old_cwd]),
+                pypath=os.pathsep.join([paths['lib'], str(tmpdir_cwd)]),
                 data_stream=1,
                 env=environ)
             if code:
@@ -63,17 +52,15 @@ def test_egg_base_installed_egg_info(self):
             for dirpath, dirnames, filenames in os.walk(paths['lib']):
                 if os.path.basename(dirpath) == 'EGG-INFO':
                     egg_info = sorted(filenames)
-            self.assertEqual(
-                egg_info,
-                ['PKG-INFO',
-                 'SOURCES.txt',
-                 'dependency_links.txt',
-                 'entry_points.txt',
-                 'not-zip-safe',
-                 'top_level.txt'])
+
+            expected = [
+                'PKG-INFO',
+                'SOURCES.txt',
+                'dependency_links.txt',
+                'entry_points.txt',
+                'not-zip-safe',
+                'top_level.txt',
+            ]
+            assert egg_info == expected
         finally:
             shutil.rmtree(temp_dir)
-
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)

From b21f02bdaeab48de81c90142b5ff80c900739613 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 09:55:33 -0500
Subject: [PATCH 4702/8469] Combine DALS implementations in textwrap module.

---
 setuptools/tests/test_dist_info.py        |  5 +----
 setuptools/tests/test_easy_install.py     | 11 +++--------
 setuptools/tests/test_windows_wrappers.py |  2 ++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index eab173357c..6d0ab58792 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,15 +3,12 @@
 import os
 import shutil
 import tempfile
-import textwrap
 
 import pytest
 
 import pkg_resources
+from .textwrap import DALS
 
-def DALS(s):
-    "dedent and left-strip"
-    return textwrap.dedent(s).lstrip()
 
 class TestDistInfo:
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b3fa9cff80..30789e8397 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,12 +1,13 @@
 """Easy install Tests
 """
+from __future__ import absolute_import
+
 import sys
 import os
 import shutil
 import tempfile
 import site
 import contextlib
-import textwrap
 import tarfile
 import logging
 import itertools
@@ -29,13 +30,7 @@
 
 from .py26compat import tarfile_open
 from . import contexts
-
-
-def DALS(input):
-    """
-    Dedent and left-strip
-    """
-    return textwrap.dedent(input).lstrip()
+from .textwrap import DALS
 
 
 class FakeDist(object):
diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index b6c1e573d1..5b14d07b0e 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -12,6 +12,8 @@
 are to wrap.
 """
 
+from __future__ import absolute_import
+
 import sys
 import textwrap
 import subprocess

From e814d51b89cdfb3cd5ec567726c5756f6872041e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 09:59:44 -0500
Subject: [PATCH 4703/8469] Replace cluttered script generation with multiline
 strings

---
 setuptools/tests/test_egg_info.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d8c3252e61..6d51955cf0 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -4,23 +4,31 @@
 import stat
 
 from . import environment
+from .textwrap import DALS
 
 
 class TestEggInfo:
 
+    setup_script = DALS("""
+        from setuptools import setup
+
+        setup(
+            name='foo',
+            py_modules=['hello'],
+            entry_points={'console_scripts': ['hi = hello.run']},
+            zip_safe=False,
+        )
+        """)
+
     def _create_project(self):
         with open('setup.py', 'w') as f:
-            f.write('from setuptools import setup\n')
-            f.write('\n')
-            f.write('setup(\n')
-            f.write("    name='foo',\n")
-            f.write("    py_modules=['hello'],\n")
-            f.write("    entry_points={'console_scripts': ['hi = hello.run']},\n")
-            f.write('    zip_safe=False,\n')
-            f.write('    )\n')
+            f.write(self.setup_script)
+
         with open('hello.py', 'w') as f:
-            f.write('def run():\n')
-            f.write("    print('hello')\n")
+            f.write(DALS("""
+                def run():
+                    print('hello')
+                """))
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd):
         self._create_project()

From 66ed0829c7d9e59592d0d977ac7f51e772b666f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:03:30 -0500
Subject: [PATCH 4704/8469] Use contexts for tempdir generation

---
 setuptools/tests/contexts.py      |  4 ++--
 setuptools/tests/test_egg_info.py | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 1620bdb305..10691606eb 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -9,8 +9,8 @@
 
 
 @contextlib.contextmanager
-def tempdir(cd=lambda dir:None):
-    temp_dir = tempfile.mkdtemp()
+def tempdir(cd=lambda dir:None, **kwargs):
+    temp_dir = tempfile.mkdtemp(**kwargs)
     orig_dir = os.getcwd()
     try:
         cd(temp_dir)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 6d51955cf0..6d7ba3453d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,10 +1,9 @@
 import os
-import tempfile
-import shutil
 import stat
 
 from . import environment
 from .textwrap import DALS
+from . import contexts
 
 
 class TestEggInfo:
@@ -32,9 +31,8 @@ def run():
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd):
         self._create_project()
-        temp_dir = tempfile.mkdtemp(prefix='setuptools-test.')
-        os.chmod(temp_dir, stat.S_IRWXU)
-        try:
+        with contexts.tempdir(prefix='setuptools-test.') as temp_dir:
+            os.chmod(temp_dir, stat.S_IRWXU)
             paths = {}
             for dirname in ['home', 'lib', 'scripts', 'data', 'egg-base']:
                 paths[dirname] = os.path.join(temp_dir, dirname)
@@ -70,5 +68,3 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
                 'top_level.txt',
             ]
             assert egg_info == expected
-        finally:
-            shutil.rmtree(temp_dir)

From a0bfbbff64b076dab3d4c07b488043a42932bd3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:07:53 -0500
Subject: [PATCH 4705/8469] Rewrite paths construction as generator expression.

---
 setuptools/tests/test_egg_info.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 6d7ba3453d..a92779d513 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -33,10 +33,12 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
         self._create_project()
         with contexts.tempdir(prefix='setuptools-test.') as temp_dir:
             os.chmod(temp_dir, stat.S_IRWXU)
-            paths = {}
-            for dirname in ['home', 'lib', 'scripts', 'data', 'egg-base']:
-                paths[dirname] = os.path.join(temp_dir, dirname)
-                os.mkdir(paths[dirname])
+            subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
+            paths = dict(
+                (dirname, os.path.join(temp_dir, dirname))
+                for dirname in subs
+            )
+            list(map(os.mkdir, paths.values()))
             config = os.path.join(paths['home'], '.pydistutils.cfg')
             with open(config, 'w') as f:
                 f.write('[egg_info]\n')

From 0dc996c482a8ec3e248b57ed731ec24286e408e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:08:56 -0500
Subject: [PATCH 4706/8469] Rewrite config generation

---
 setuptools/tests/test_egg_info.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a92779d513..4a161c8b1c 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -41,8 +41,11 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
             list(map(os.mkdir, paths.values()))
             config = os.path.join(paths['home'], '.pydistutils.cfg')
             with open(config, 'w') as f:
-                f.write('[egg_info]\n')
-                f.write('egg-base = %s\n' % paths['egg-base'])
+                f.write(DALS("""
+                    [egg_info]
+                    egg-base = %(egg-base)s
+                    """ % paths
+                ))
             environ = os.environ.copy()
             environ['HOME'] = paths['home']
             code, data = environment.run_setup_py(

From 73124a8934cf152a0f853809bc78e5dd42d8b9c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:09:38 -0500
Subject: [PATCH 4707/8469] Rewrite command construction for clarity.

---
 setuptools/tests/test_egg_info.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4a161c8b1c..f20877a56a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -48,12 +48,15 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
                 ))
             environ = os.environ.copy()
             environ['HOME'] = paths['home']
+            cmd = [
+                'install',
+                '--home', paths['home'],
+                '--install-lib', paths['lib'],
+                '--install-scripts', paths['scripts'],
+                '--install-data', paths['data'],
+            ]
             code, data = environment.run_setup_py(
-                cmd=[
-                    'install', '--home', paths['home'],
-                    '--install-lib', paths['lib'],
-                    '--install-scripts', paths['scripts'],
-                    '--install-data', paths['data']],
+                cmd=cmd,
                 pypath=os.pathsep.join([paths['lib'], str(tmpdir_cwd)]),
                 data_stream=1,
                 env=environ)

From d7aa4bbad9497e548fd0c7b4f935fe1eb94ba613 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:09:53 -0500
Subject: [PATCH 4708/8469] Use trailing comma for consistency.

---
 setuptools/tests/test_egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index f20877a56a..efc66c937b 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -59,7 +59,8 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
                 cmd=cmd,
                 pypath=os.pathsep.join([paths['lib'], str(tmpdir_cwd)]),
                 data_stream=1,
-                env=environ)
+                env=environ,
+            )
             if code:
                 raise AssertionError(data)
             egg_info = None

From 0822c8ff070891e63471e63b67ea97ff9803c0f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:15:02 -0500
Subject: [PATCH 4709/8469] Extract method for _find_egg_info_files.

---
 setuptools/tests/test_egg_info.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index efc66c937b..450c898e6a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -63,10 +63,8 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
             )
             if code:
                 raise AssertionError(data)
-            egg_info = None
-            for dirpath, dirnames, filenames in os.walk(paths['lib']):
-                if os.path.basename(dirpath) == 'EGG-INFO':
-                    egg_info = sorted(filenames)
+
+            actual = self._find_egg_info_files(paths['lib'])
 
             expected = [
                 'PKG-INFO',
@@ -76,4 +74,14 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
                 'not-zip-safe',
                 'top_level.txt',
             ]
-            assert egg_info == expected
+            assert sorted(actual) == expected
+
+    def _find_egg_info_files(self, root):
+        results = (
+            filenames
+            for dirpath, dirnames, filenames in os.walk(root)
+            if os.path.basename(dirpath) == 'EGG-INFO'
+        )
+        # expect exactly one result
+        result, = results
+        return result

From deef22ce4589e31cc23c4e4d570ee6fab75bd06c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:16:54 -0500
Subject: [PATCH 4710/8469] Use update to set the home environment variable.

---
 setuptools/tests/test_egg_info.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 450c898e6a..77d2eee755 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -46,8 +46,9 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd):
                     egg-base = %(egg-base)s
                     """ % paths
                 ))
-            environ = os.environ.copy()
-            environ['HOME'] = paths['home']
+            environ = os.environ.copy().update(
+                HOME=paths['home'],
+            )
             cmd = [
                 'install',
                 '--home', paths['home'],

From 08bac0ab2f411b7d50d04d8df66d24d24de6644b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:25:29 -0500
Subject: [PATCH 4711/8469] Extract fixture for the environment.

---
 setuptools/tests/test_egg_info.py | 84 +++++++++++++++++--------------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 77d2eee755..a1caf9fd30 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,6 +1,8 @@
 import os
 import stat
 
+import pytest
+
 from . import environment
 from .textwrap import DALS
 from . import contexts
@@ -29,53 +31,61 @@ def run():
                     print('hello')
                 """))
 
-    def test_egg_base_installed_egg_info(self, tmpdir_cwd):
-        self._create_project()
-        with contexts.tempdir(prefix='setuptools-test.') as temp_dir:
-            os.chmod(temp_dir, stat.S_IRWXU)
+    @pytest.yield_fixture
+    def env(self):
+        class Environment(str): pass
+
+        with contexts.tempdir(prefix='setuptools-test.') as env_dir:
+            env = Environment(env_dir)
+            os.chmod(env_dir, stat.S_IRWXU)
             subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
-            paths = dict(
-                (dirname, os.path.join(temp_dir, dirname))
+            env.paths = dict(
+                (dirname, os.path.join(env_dir, dirname))
                 for dirname in subs
             )
-            list(map(os.mkdir, paths.values()))
-            config = os.path.join(paths['home'], '.pydistutils.cfg')
+            list(map(os.mkdir, env.paths.values()))
+            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
             with open(config, 'w') as f:
                 f.write(DALS("""
                     [egg_info]
                     egg-base = %(egg-base)s
-                    """ % paths
+                    """ % env.paths
                 ))
-            environ = os.environ.copy().update(
-                HOME=paths['home'],
-            )
-            cmd = [
-                'install',
-                '--home', paths['home'],
-                '--install-lib', paths['lib'],
-                '--install-scripts', paths['scripts'],
-                '--install-data', paths['data'],
-            ]
-            code, data = environment.run_setup_py(
-                cmd=cmd,
-                pypath=os.pathsep.join([paths['lib'], str(tmpdir_cwd)]),
-                data_stream=1,
-                env=environ,
-            )
-            if code:
-                raise AssertionError(data)
+            yield env
+
+    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
+        self._create_project()
+
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        cmd = [
+            'install',
+            '--home', env.paths['home'],
+            '--install-lib', env.paths['lib'],
+            '--install-scripts', env.paths['scripts'],
+            '--install-data', env.paths['data'],
+        ]
+        code, data = environment.run_setup_py(
+            cmd=cmd,
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        if code:
+            raise AssertionError(data)
 
-            actual = self._find_egg_info_files(paths['lib'])
+        actual = self._find_egg_info_files(env.paths['lib'])
 
-            expected = [
-                'PKG-INFO',
-                'SOURCES.txt',
-                'dependency_links.txt',
-                'entry_points.txt',
-                'not-zip-safe',
-                'top_level.txt',
-            ]
-            assert sorted(actual) == expected
+        expected = [
+            'PKG-INFO',
+            'SOURCES.txt',
+            'dependency_links.txt',
+            'entry_points.txt',
+            'not-zip-safe',
+            'top_level.txt',
+        ]
+        assert sorted(actual) == expected
 
     def _find_egg_info_files(self, root):
         results = (

From 8fdf776320fa82dfe4b5dc86f8986f6e22fa6ac2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:33:13 -0500
Subject: [PATCH 4712/8469] Update test_find_packages to use pytest

---
 setuptools/tests/test_find_packages.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 50513a6963..06a7c02e46 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -3,7 +3,6 @@
 import sys
 import shutil
 import tempfile
-import unittest
 import platform
 
 import pytest
@@ -34,13 +33,13 @@ def has_symlink():
     )
     return can_symlink() and not bad_symlink
 
-class TestFindPackages(unittest.TestCase):
+class TestFindPackages:
 
-    def setUp(self):
+    def setup_method(self, method):
         self.dist_dir = tempfile.mkdtemp()
         self._make_pkg_structure()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         shutil.rmtree(self.dist_dir)
 
     def _make_pkg_structure(self):
@@ -88,7 +87,7 @@ def _touch(self, path, dir_=None):
     def test_regular_package(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_packages(self.dist_dir)
-        self.assertEqual(packages, ['pkg', 'pkg.subpkg'])
+        assert packages == ['pkg', 'pkg.subpkg']
 
     def test_exclude(self):
         self._touch('__init__.py', self.pkg_dir)
@@ -103,7 +102,7 @@ def test_include_excludes_other(self):
         alt_dir = self._mkdir('other_pkg', self.dist_dir)
         self._touch('__init__.py', alt_dir)
         packages = find_packages(self.dist_dir, include=['other_pkg'])
-        self.assertEqual(packages, ['other_pkg'])
+        assert packages == ['other_pkg']
 
     def test_dir_with_dot_is_skipped(self):
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
@@ -111,7 +110,7 @@ def test_dir_with_dot_is_skipped(self):
         self._touch('__init__.py', data_dir)
         self._touch('file.dat', data_dir)
         packages = find_packages(self.dist_dir)
-        self.assertTrue('pkg.some.data' not in packages)
+        assert 'pkg.some.data' not in packages
 
     def test_dir_with_packages_in_subdir_is_excluded(self):
         """
@@ -122,7 +121,7 @@ def test_dir_with_packages_in_subdir_is_excluded(self):
         build_pkg_dir = self._mkdir('pkg', build_dir)
         self._touch('__init__.py', build_pkg_dir)
         packages = find_packages(self.dist_dir)
-        self.assertTrue('build.pkg' not in packages)
+        assert 'build.pkg' not in packages
 
     @pytest.mark.skipif(not has_symlink(), reason='Symlink support required')
     def test_symlinked_packages_are_included(self):
@@ -137,10 +136,10 @@ def test_symlinked_packages_are_included(self):
         os.symlink('pkg', linked_pkg)
         assert os.path.isdir(linked_pkg)
         packages = find_packages(self.dist_dir)
-        self.assertTrue('lpkg' in packages)
+        assert 'lpkg' in packages
 
     def _assert_packages(self, actual, expected):
-        self.assertEqual(set(actual), set(expected))
+        assert set(actual) == set(expected)
 
     def test_pep420_ns_package(self):
         packages = find_420_packages(

From 9534a401d57558cf469263beb0a35895dc81d043 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:41:10 -0500
Subject: [PATCH 4713/8469] Resave with excess whitespace removed

---
 setuptools/tests/test_integration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 8d6c1e55db..411203ff6d 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -27,7 +27,7 @@ def install_context(request, tmpdir, monkeypatch):
     def fin():
         # undo the monkeypatch, particularly needed under
         # windows because of kept handle on cwd
-        monkeypatch.undo() 
+        monkeypatch.undo()
         new_cwd.remove()
         user_base.remove()
         user_site.remove()

From cf66bbce25e2631bc36d6edfd609705a53b6ef61 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:41:41 -0500
Subject: [PATCH 4714/8469] Add omitted module.

---
 setuptools/tests/textwrap.py | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 setuptools/tests/textwrap.py

diff --git a/setuptools/tests/textwrap.py b/setuptools/tests/textwrap.py
new file mode 100644
index 0000000000..5cd9e5bca8
--- /dev/null
+++ b/setuptools/tests/textwrap.py
@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+
+import textwrap
+
+
+def DALS(s):
+    "dedent and left-strip"
+    return textwrap.dedent(s).lstrip()

From 30f3068b7429f401bcbf1955de8fa370f3f8c8b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:42:49 -0500
Subject: [PATCH 4715/8469] Remove expected failure from pbr package as it
 appears to be working now.

---
 setuptools/tests/test_integration.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 411203ff6d..3a6abeaa44 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -71,7 +71,6 @@ def test_virtualenvwrapper(install_context):
                  'virtualenvwrapper', 'hook_loader.py')
 
 
-@pytest.mark.xfail
 def test_pbr(install_context):
     _install_one('pbr', install_context,
                  'pbr', 'core.py')

From 6fbf8f8eb100b60155ace52aaad3eee076e690f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:50:17 -0500
Subject: [PATCH 4716/8469] Use simple assertions and pytest runner for
 test_markerlib.

---
 setuptools/tests/test_markerlib.py | 51 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
index 0cb9e70add..8197b49dc4 100644
--- a/setuptools/tests/test_markerlib.py
+++ b/setuptools/tests/test_markerlib.py
@@ -1,10 +1,9 @@
 import os
-import unittest
 
 import pytest
 
 
-class TestMarkerlib(unittest.TestCase):
+class TestMarkerlib:
 
     @pytest.mark.importorskip('ast')
     def test_markers(self):
@@ -12,32 +11,32 @@ def test_markers(self):
 
         os_name = os.name
 
-        self.assertTrue(interpret(""))
-
-        self.assertTrue(interpret("os.name != 'buuuu'"))
-        self.assertTrue(interpret("os_name != 'buuuu'"))
-        self.assertTrue(interpret("python_version > '1.0'"))
-        self.assertTrue(interpret("python_version < '5.0'"))
-        self.assertTrue(interpret("python_version <= '5.0'"))
-        self.assertTrue(interpret("python_version >= '1.0'"))
-        self.assertTrue(interpret("'%s' in os.name" % os_name))
-        self.assertTrue(interpret("'%s' in os_name" % os_name))
-        self.assertTrue(interpret("'buuuu' not in os.name"))
-
-        self.assertFalse(interpret("os.name == 'buuuu'"))
-        self.assertFalse(interpret("os_name == 'buuuu'"))
-        self.assertFalse(interpret("python_version < '1.0'"))
-        self.assertFalse(interpret("python_version > '5.0'"))
-        self.assertFalse(interpret("python_version >= '5.0'"))
-        self.assertFalse(interpret("python_version <= '1.0'"))
-        self.assertFalse(interpret("'%s' not in os.name" % os_name))
-        self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'"))
-        self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'"))
+        assert interpret("")
+
+        assert interpret("os.name != 'buuuu'")
+        assert interpret("os_name != 'buuuu'")
+        assert interpret("python_version > '1.0'")
+        assert interpret("python_version < '5.0'")
+        assert interpret("python_version <= '5.0'")
+        assert interpret("python_version >= '1.0'")
+        assert interpret("'%s' in os.name" % os_name)
+        assert interpret("'%s' in os_name" % os_name)
+        assert interpret("'buuuu' not in os.name")
+
+        assert not interpret("os.name == 'buuuu'")
+        assert not interpret("os_name == 'buuuu'")
+        assert not interpret("python_version < '1.0'")
+        assert not interpret("python_version > '5.0'")
+        assert not interpret("python_version >= '5.0'")
+        assert not interpret("python_version <= '1.0'")
+        assert not interpret("'%s' not in os.name" % os_name)
+        assert not interpret("'buuuu' in os.name and python_version >= '5.0'")
+        assert not interpret("'buuuu' in os_name and python_version >= '5.0'")
 
         environment = default_environment()
         environment['extra'] = 'test'
-        self.assertTrue(interpret("extra == 'test'", environment))
-        self.assertFalse(interpret("extra == 'doc'", environment))
+        assert interpret("extra == 'test'", environment)
+        assert not interpret("extra == 'doc'", environment)
 
         def raises_nameError():
             try:
@@ -60,5 +59,5 @@ def raises_syntaxError():
         raises_syntaxError()
 
         statement = "python_version == '5'"
-        self.assertEqual(compile(statement).__doc__, statement)
+        assert compile(statement).__doc__ == statement
 

From 7c075fcc356078930535230fbc975b76db9d68cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:55:40 -0500
Subject: [PATCH 4717/8469] Extend contexts environment patching logic based on
 context manager in test_msvc9compiler and use it.

---
 setuptools/tests/contexts.py           | 30 +++++++++++++++++++------
 setuptools/tests/test_msvc9compiler.py | 31 +++-----------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 10691606eb..a604cd415a 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -21,15 +21,31 @@ def tempdir(cd=lambda dir:None, **kwargs):
 
 
 @contextlib.contextmanager
-def environment(**updates):
-    old_env = os.environ.copy()
-    os.environ.update(updates)
+def environment(**replacements):
+    """
+    In a context, patch the environment with replacements. Pass None values
+    to clear the values.
+    """
+    saved = dict(
+        (key, os.environ['key'])
+        for key in replacements
+        if key in os.environ
+    )
+
+    # remove values that are null
+    remove = (key for (key, value) in replacements.items() if value is None)
+    for key in list(remove):
+        os.environ.pop(key, None)
+        replacements.pop(key)
+
+    os.environ.update(replacements)
+
     try:
-        yield
+        yield saved
     finally:
-        for key in updates:
-            del os.environ[key]
-        os.environ.update(old_env)
+        for key in replacements:
+            os.environ.pop(key, None)
+        os.environ.update(saved)
 
 
 @contextlib.contextmanager
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 2774751262..2a117dc94f 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -10,10 +10,11 @@
 import tempfile
 import unittest
 import distutils.errors
-import contextlib
 
 import pytest
 
+from . import contexts
+
 # importing only setuptools should apply the patch
 __import__('setuptools')
 
@@ -62,32 +63,6 @@ def __exit__(self, exc_type, exc_value, exc_tb):
         distutils.msvc9compiler.Reg.read_keys = self.original_read_keys
         distutils.msvc9compiler.Reg.read_values = self.original_read_values
 
-@contextlib.contextmanager
-def patch_env(**replacements):
-    """
-    In a context, patch the environment with replacements. Pass None values
-    to clear the values.
-    """
-    saved = dict(
-        (key, os.environ['key'])
-        for key in replacements
-        if key in os.environ
-    )
-
-    # remove values that are null
-    remove = (key for (key, value) in replacements.items() if value is None)
-    for key in list(remove):
-        os.environ.pop(key, None)
-        replacements.pop(key)
-
-    os.environ.update(replacements)
-
-    try:
-        yield saved
-    finally:
-        for key in replacements:
-            os.environ.pop(key, None)
-        os.environ.update(saved)
 
 class TestMSVC9Compiler(unittest.TestCase):
 
@@ -100,7 +75,7 @@ def test_find_vcvarsall_patch(self):
 
         # No registry entries or environment variable means we should
         # not find anything
-        with patch_env(VS90COMNTOOLS=None):
+        with contexts.environment(VS90COMNTOOLS=None):
             with MockReg():
                 self.assertIsNone(find_vcvarsall(9.0))
 

From 23d9089cb0e74b75ead48991509f9dff3fa5eff2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 10:58:16 -0500
Subject: [PATCH 4718/8469] Reorganize imports

---
 setuptools/tests/test_packageindex.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d1d6ca8d93..6aec44f93c 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,11 +1,11 @@
-"""Package Index Tests
-"""
 import sys
 import os
 import unittest
-import pkg_resources
-from setuptools.compat import httplib, HTTPError, unicode, pathname2url
 import distutils.errors
+
+from setuptools.compat import httplib, HTTPError, unicode, pathname2url
+
+import pkg_resources
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
 

From 58c0f87887ee451424da702bfd70c0332e28ac5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:05:52 -0500
Subject: [PATCH 4719/8469] Remove dependence on unittest in favor of pytest
 for test_packgeindex

---
 setuptools/tests/test_packageindex.py | 63 +++++++++++++++------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 6aec44f93c..5a46f6138e 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -9,7 +9,8 @@
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
 
-class TestPackageIndex(unittest.TestCase):
+
+class TestPackageIndex:
 
     def test_bad_url_bad_port(self):
         index = setuptools.package_index.PackageIndex()
@@ -18,9 +19,9 @@ def test_bad_url_bad_port(self):
             v = index.open_url(url)
         except Exception:
             v = sys.exc_info()[1]
-            self.assertTrue(url in str(v))
+            assert url in str(v)
         else:
-            self.assertTrue(isinstance(v, HTTPError))
+            assert isinstance(v, HTTPError)
 
     def test_bad_url_typo(self):
         # issue 16
@@ -35,9 +36,9 @@ def test_bad_url_typo(self):
             v = index.open_url(url)
         except Exception:
             v = sys.exc_info()[1]
-            self.assertTrue(url in str(v))
+            assert url in str(v)
         else:
-            self.assertTrue(isinstance(v, HTTPError))
+            assert isinstance(v, HTTPError)
 
     def test_bad_url_bad_status_line(self):
         index = setuptools.package_index.PackageIndex(
@@ -53,7 +54,7 @@ def _urlopen(*args):
             v = index.open_url(url)
         except Exception:
             v = sys.exc_info()[1]
-            self.assertTrue('line' in str(v))
+            assert 'line' in str(v)
         else:
             raise AssertionError('Should have raise here!')
 
@@ -94,7 +95,7 @@ def test_url_ok(self):
             hosts=('www.example.com',)
         )
         url = 'file:///tmp/test_package_index'
-        self.assertTrue(index.url_ok(url, True))
+        assert index.url_ok(url, True)
 
     def test_links_priority(self):
         """
@@ -127,21 +128,30 @@ def test_links_priority(self):
         server.stop()
 
         # the distribution has been found
-        self.assertTrue('foobar' in pi)
+        assert 'foobar' in pi
         # we have only one link, because links are compared without md5
-        self.assertTrue(len(pi['foobar'])==1)
+        assert len(pi['foobar'])==1
         # the link should be from the index
-        self.assertTrue('correct_md5' in pi['foobar'][0].location)
+        assert 'correct_md5' in pi['foobar'][0].location
 
     def test_parse_bdist_wininst(self):
-        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
-            'reportlab-2.5.win32-py2.4.exe'), ('reportlab-2.5', '2.4', 'win32'))
-        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
-            'reportlab-2.5.win32.exe'), ('reportlab-2.5', None, 'win32'))
-        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
-            'reportlab-2.5.win-amd64-py2.7.exe'), ('reportlab-2.5', '2.7', 'win-amd64'))
-        self.assertEqual(setuptools.package_index.parse_bdist_wininst(
-            'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64'))
+        parse = setuptools.package_index.parse_bdist_wininst
+
+        actual = parse('reportlab-2.5.win32-py2.4.exe')
+        expected = 'reportlab-2.5', '2.4', 'win32'
+        assert actual == expected
+
+        actual = parse('reportlab-2.5.win32.exe')
+        expected = 'reportlab-2.5', None, 'win32'
+        assert actual == expected
+
+        actual = parse('reportlab-2.5.win-amd64-py2.7.exe')
+        expected = 'reportlab-2.5', '2.7', 'win-amd64'
+        assert actual == expected
+
+        actual = parse('reportlab-2.5.win-amd64.exe')
+        expected = 'reportlab-2.5', None, 'win-amd64'
+        assert actual == expected
 
     def test__vcs_split_rev_from_url(self):
         """
@@ -149,8 +159,8 @@ def test__vcs_split_rev_from_url(self):
         """
         vsrfu = setuptools.package_index.PackageIndex._vcs_split_rev_from_url
         url, rev = vsrfu('https://example.com/bar@2995')
-        self.assertEqual(url, 'https://example.com/bar')
-        self.assertEqual(rev, '2995')
+        assert url == 'https://example.com/bar'
+        assert rev == '2995'
 
     def test_local_index(self):
         """
@@ -173,31 +183,30 @@ def test_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
         checker.feed('You should probably not be using MD5'.encode('ascii'))
-        self.assertEqual(checker.hash.hexdigest(),
-            'f12895fdffbd45007040d2e44df98478')
-        self.assertTrue(checker.is_valid())
+        assert checker.hash.hexdigest() == 'f12895fdffbd45007040d2e44df98478'
+        assert checker.is_valid()
 
     def test_other_fragment(self):
         "Content checks should succeed silently if no hash is present"
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#something%20completely%20different')
         checker.feed('anything'.encode('ascii'))
-        self.assertTrue(checker.is_valid())
+        assert checker.is_valid()
 
     def test_blank_md5(self):
         "Content checks should succeed if a hash is empty"
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=')
         checker.feed('anything'.encode('ascii'))
-        self.assertTrue(checker.is_valid())
+        assert checker.is_valid()
 
     def test_get_hash_name_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
-        self.assertEqual(checker.hash_name, 'md5')
+        assert checker.hash_name == 'md5'
 
     def test_report(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
         rep = checker.report(lambda x: x, 'My message about %s')
-        self.assertEqual(rep, 'My message about md5')
+        assert rep == 'My message about md5'

From 637da2c7c72edcc5582a4892ae7e18d76910fdf5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:13:12 -0500
Subject: [PATCH 4720/8469] Use tmpdir in test_local_index for brevity and
 isolation.

---
 setuptools/tests/test_packageindex.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 5a46f6138e..098d4e3faf 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -162,18 +162,15 @@ def test__vcs_split_rev_from_url(self):
         assert url == 'https://example.com/bar'
         assert rev == '2995'
 
-    def test_local_index(self):
+    def test_local_index(self, tmpdir):
         """
         local_open should be able to read an index from the file system.
         """
-        f = open('index.html', 'w')
-        f.write('<div>content</div>')
-        f.close()
-        try:
-            url = 'file:' + pathname2url(os.getcwd()) + '/'
-            res = setuptools.package_index.local_open(url)
-        finally:
-            os.remove('index.html')
+        index_file = tmpdir / 'index.html'
+        with index_file.open('w') as f:
+            f.write('<div>content</div>')
+        url = 'file:' + pathname2url(str(tmpdir)) + '/'
+        res = setuptools.package_index.local_open(url)
         assert 'content' in res.read()
 
 

From 9ed373760301e531de21009f26700e55177265e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:14:16 -0500
Subject: [PATCH 4721/8469] Remove additional references to unittest.

---
 setuptools/tests/test_packageindex.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 098d4e3faf..3e9d1d84e9 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,6 +1,4 @@
 import sys
-import os
-import unittest
 import distutils.errors
 
 from setuptools.compat import httplib, HTTPError, unicode, pathname2url
@@ -174,7 +172,7 @@ def test_local_index(self, tmpdir):
         assert 'content' in res.read()
 
 
-class TestContentCheckers(unittest.TestCase):
+class TestContentCheckers:
 
     def test_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(

From 3412dfc4261abb80dbbd4a17ae3b06308a4a0d95 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:41:30 -0500
Subject: [PATCH 4722/8469] Ported test_resources to pytest from unittest.

---
 setuptools/tests/test_resources.py | 383 +++++++++++++++--------------
 1 file changed, 200 insertions(+), 183 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index ba8835a946..ecd45bcad9 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -1,12 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-# NOTE: the shebang and encoding lines are for ScriptHeaderTests do not remove
+# NOTE: the shebang and encoding lines are for TestScriptHeader do not remove
 
 import os
 import sys
 import tempfile
 import shutil
-from unittest import TestCase
 
 import pytest
 
@@ -48,36 +47,32 @@ def get_metadata_lines(self,name):
 
 dist_from_fn = pkg_resources.Distribution.from_filename
 
-class DistroTests(TestCase):
+class TestDistro:
 
     def testCollection(self):
         # empty path should produce no distributions
         ad = pkg_resources.Environment([], platform=None, python=None)
-        self.assertEqual(list(ad), [])
-        self.assertEqual(ad['FooPkg'],[])
+        assert list(ad) == []
+        assert ad['FooPkg'] == []
         ad.add(dist_from_fn("FooPkg-1.3_1.egg"))
         ad.add(dist_from_fn("FooPkg-1.4-py2.4-win32.egg"))
         ad.add(dist_from_fn("FooPkg-1.2-py2.4.egg"))
 
         # Name is in there now
-        self.assertTrue(ad['FooPkg'])
+        assert ad['FooPkg']
         # But only 1 package
-        self.assertEqual(list(ad), ['foopkg'])
+        assert list(ad) == ['foopkg']
 
         # Distributions sort by version
-        self.assertEqual(
-            [dist.version for dist in ad['FooPkg']], ['1.4','1.3-1','1.2']
-        )
+        assert [dist.version for dist in ad['FooPkg']] == ['1.4','1.3-1','1.2']
+
         # Removing a distribution leaves sequence alone
         ad.remove(ad['FooPkg'][1])
-        self.assertEqual(
-            [dist.version for dist in ad['FooPkg']], ['1.4','1.2']
-        )
+        assert [dist.version for dist in ad['FooPkg']] == ['1.4','1.2']
+
         # And inserting adds them in order
         ad.add(dist_from_fn("FooPkg-1.9.egg"))
-        self.assertEqual(
-            [dist.version for dist in ad['FooPkg']], ['1.9','1.4','1.2']
-        )
+        assert [dist.version for dist in ad['FooPkg']] == ['1.9','1.4','1.2']
 
         ws = WorkingSet([])
         foo12 = dist_from_fn("FooPkg-1.2-py2.4.egg")
@@ -85,31 +80,32 @@ def testCollection(self):
         req, = parse_requirements("FooPkg>=1.3")
 
         # Nominal case: no distros on path, should yield all applicable
-        self.assertEqual(ad.best_match(req,ws).version, '1.9')
+        assert ad.best_match(req, ws).version == '1.9'
         # If a matching distro is already installed, should return only that
         ws.add(foo14)
-        self.assertEqual(ad.best_match(req,ws).version, '1.4')
+        assert ad.best_match(req, ws).version == '1.4'
 
         # If the first matching distro is unsuitable, it's a version conflict
         ws = WorkingSet([])
         ws.add(foo12)
         ws.add(foo14)
-        self.assertRaises(VersionConflict, ad.best_match, req, ws)
+        with pytest.raises(VersionConflict):
+            ad.best_match(req, ws)
 
         # If more than one match on the path, the first one takes precedence
         ws = WorkingSet([])
         ws.add(foo14)
         ws.add(foo12)
         ws.add(foo14)
-        self.assertEqual(ad.best_match(req,ws).version, '1.4')
+        assert ad.best_match(req, ws).version == '1.4'
 
     def checkFooPkg(self,d):
-        self.assertEqual(d.project_name, "FooPkg")
-        self.assertEqual(d.key, "foopkg")
-        self.assertEqual(d.version, "1.3.post1")
-        self.assertEqual(d.py_version, "2.4")
-        self.assertEqual(d.platform, "win32")
-        self.assertEqual(d.parsed_version, parse_version("1.3-1"))
+        assert d.project_name == "FooPkg"
+        assert d.key == "foopkg"
+        assert d.version == "1.3.post1"
+        assert d.py_version == "2.4"
+        assert d.platform == "win32"
+        assert d.parsed_version == parse_version("1.3-1")
 
     def testDistroBasics(self):
         d = Distribution(
@@ -119,8 +115,8 @@ def testDistroBasics(self):
         self.checkFooPkg(d)
 
         d = Distribution("/some/path")
-        self.assertEqual(d.py_version, sys.version[:3])
-        self.assertEqual(d.platform, None)
+        assert d.py_version == sys.version[:3]
+        assert d.platform == None
 
     def testDistroParse(self):
         d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg")
@@ -141,10 +137,7 @@ def distRequires(self, txt):
         return Distribution("/foo", metadata=Metadata(('depends.txt', txt)))
 
     def checkRequires(self, dist, txt, extras=()):
-        self.assertEqual(
-            list(dist.requires(extras)),
-            list(parse_requirements(txt))
-        )
+        assert list(dist.requires(extras)) == list(parse_requirements(txt))
 
     def testDistroDependsSimple(self):
         for v in "Twisted>=1.5", "Twisted>=1.5\nZConfig>=2.0":
@@ -154,11 +147,11 @@ def testResolve(self):
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
         # Resolving no requirements -> nothing to install
-        self.assertEqual(list(ws.resolve([],ad)), [])
+        assert list(ws.resolve([], ad)) == []
         # Request something not in the collection -> DistributionNotFound
-        self.assertRaises(
-            pkg_resources.DistributionNotFound, ws.resolve, parse_requirements("Foo"), ad
-        )
+        with pytest.raises(pkg_resources.DistributionNotFound):
+            ws.resolve(parse_requirements("Foo"), ad)
+
         Foo = Distribution.from_filename(
             "/foo_dir/Foo-1.2.egg",
             metadata=Metadata(('depends.txt', "[bar]\nBaz>=2.0"))
@@ -169,28 +162,25 @@ def testResolve(self):
         # Request thing(s) that are available -> list to activate
         for i in range(3):
             targets = list(ws.resolve(parse_requirements("Foo"), ad))
-            self.assertEqual(targets, [Foo])
+            assert targets == [Foo]
             list(map(ws.add,targets))
-        self.assertRaises(VersionConflict, ws.resolve,
-            parse_requirements("Foo==0.9"), ad)
+        with pytest.raises(VersionConflict):
+            ws.resolve(parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
 
         # Request an extra that causes an unresolved dependency for "Baz"
-        self.assertRaises(
-            pkg_resources.DistributionNotFound, ws.resolve,parse_requirements("Foo[bar]"), ad
-        )
+        with pytest.raises(pkg_resources.DistributionNotFound):
+            ws.resolve(parse_requirements("Foo[bar]"), ad)
         Baz = Distribution.from_filename(
             "/foo_dir/Baz-2.1.egg", metadata=Metadata(('depends.txt', "Foo"))
         )
         ad.add(Baz)
 
         # Activation list now includes resolved dependency
-        self.assertEqual(
-            list(ws.resolve(parse_requirements("Foo[bar]"), ad)), [Foo,Baz]
-        )
+        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) ==[Foo,Baz]
         # Requests for conflicting versions produce VersionConflict
-        self.assertRaises(VersionConflict,
-            ws.resolve, parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
+        with pytest.raises(VersionConflict):
+            ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
 
     def testDistroDependsOptions(self):
         d = self.distRequires("""
@@ -215,49 +205,50 @@ def testDistroDependsOptions(self):
             d,"Twisted>=1.5 fcgiapp>=0.1 ZConfig>=2.0 docutils>=0.3".split(),
             ["fastcgi", "docgen"]
         )
-        self.assertRaises(pkg_resources.UnknownExtra, d.requires, ["foo"])
+        with pytest.raises(pkg_resources.UnknownExtra):
+            d.requires(["foo"])
 
 
-class EntryPointTests(TestCase):
+class TestEntryPoints:
 
     def assertfields(self, ep):
-        self.assertEqual(ep.name,"foo")
-        self.assertEqual(ep.module_name,"setuptools.tests.test_resources")
-        self.assertEqual(ep.attrs, ("EntryPointTests",))
-        self.assertEqual(ep.extras, ("x",))
-        self.assertTrue(ep.load() is EntryPointTests)
-        self.assertEqual(
-            str(ep),
-            "foo = setuptools.tests.test_resources:EntryPointTests [x]"
+        assert ep.name == "foo"
+        assert ep.module_name == "setuptools.tests.test_resources"
+        assert ep.attrs == ("TestEntryPoints",)
+        assert ep.extras == ("x",)
+        assert ep.load() is TestEntryPoints
+        assert (
+            str(ep) ==
+            "foo = setuptools.tests.test_resources:TestEntryPoints [x]"
         )
 
-    def setUp(self):
+    def setup_method(self, method):
         self.dist = Distribution.from_filename(
             "FooPkg-1.2-py2.4.egg", metadata=Metadata(('requires.txt','[x]')))
 
     def testBasics(self):
         ep = EntryPoint(
-            "foo", "setuptools.tests.test_resources", ["EntryPointTests"],
+            "foo", "setuptools.tests.test_resources", ["TestEntryPoints"],
             ["x"], self.dist
         )
         self.assertfields(ep)
 
     def testParse(self):
-        s = "foo = setuptools.tests.test_resources:EntryPointTests [x]"
+        s = "foo = setuptools.tests.test_resources:TestEntryPoints [x]"
         ep = EntryPoint.parse(s, self.dist)
         self.assertfields(ep)
 
         ep = EntryPoint.parse("bar baz=  spammity[PING]")
-        self.assertEqual(ep.name,"bar baz")
-        self.assertEqual(ep.module_name,"spammity")
-        self.assertEqual(ep.attrs, ())
-        self.assertEqual(ep.extras, ("ping",))
+        assert ep.name == "bar baz"
+        assert ep.module_name == "spammity"
+        assert ep.attrs == ()
+        assert ep.extras == ("ping",)
 
         ep = EntryPoint.parse(" fizzly =  wocka:foo")
-        self.assertEqual(ep.name,"fizzly")
-        self.assertEqual(ep.module_name,"wocka")
-        self.assertEqual(ep.attrs, ("foo",))
-        self.assertEqual(ep.extras, ())
+        assert ep.name == "fizzly"
+        assert ep.module_name == "wocka"
+        assert ep.attrs == ("foo",)
+        assert ep.extras == ()
 
     def testRejects(self):
         for ep in [
@@ -268,9 +259,9 @@ def testRejects(self):
             else: raise AssertionError("Should've been bad", ep)
 
     def checkSubMap(self, m):
-        self.assertEqual(len(m), len(self.submap_expect))
+        assert len(m) == len(self.submap_expect)
         for key, ep in iteritems(self.submap_expect):
-            self.assertEqual(repr(m.get(key)), repr(ep))
+            assert repr(m.get(key)) == repr(ep)
 
     submap_expect = dict(
         feature1=EntryPoint('feature1', 'somemodule', ['somefunction']),
@@ -286,63 +277,71 @@ def checkSubMap(self, m):
 
     def testParseList(self):
         self.checkSubMap(EntryPoint.parse_group("xyz", self.submap_str))
-        self.assertRaises(ValueError, EntryPoint.parse_group, "x a", "foo=bar")
-        self.assertRaises(ValueError, EntryPoint.parse_group, "x",
-            ["foo=baz", "foo=bar"])
+        with pytest.raises(ValueError):
+            EntryPoint.parse_group("x a", "foo=bar")
+        with pytest.raises(ValueError):
+            EntryPoint.parse_group("x", ["foo=baz", "foo=bar"])
 
     def testParseMap(self):
         m = EntryPoint.parse_map({'xyz':self.submap_str})
         self.checkSubMap(m['xyz'])
-        self.assertEqual(list(m.keys()),['xyz'])
+        assert list(m.keys()) == ['xyz']
         m = EntryPoint.parse_map("[xyz]\n"+self.submap_str)
         self.checkSubMap(m['xyz'])
-        self.assertEqual(list(m.keys()),['xyz'])
-        self.assertRaises(ValueError, EntryPoint.parse_map, ["[xyz]", "[xyz]"])
-        self.assertRaises(ValueError, EntryPoint.parse_map, self.submap_str)
+        assert list(m.keys()) == ['xyz']
+        with pytest.raises(ValueError):
+            EntryPoint.parse_map(["[xyz]", "[xyz]"])
+        with pytest.raises(ValueError):
+            EntryPoint.parse_map(self.submap_str)
 
-class RequirementsTests(TestCase):
+class TestRequirements:
 
     def testBasics(self):
         r = Requirement.parse("Twisted>=1.2")
-        self.assertEqual(str(r),"Twisted>=1.2")
-        self.assertEqual(repr(r),"Requirement.parse('Twisted>=1.2')")
-        self.assertEqual(r, Requirement("Twisted", [('>=','1.2')], ()))
-        self.assertEqual(r, Requirement("twisTed", [('>=','1.2')], ()))
-        self.assertNotEqual(r, Requirement("Twisted", [('>=','2.0')], ()))
-        self.assertNotEqual(r, Requirement("Zope", [('>=','1.2')], ()))
-        self.assertNotEqual(r, Requirement("Zope", [('>=','3.0')], ()))
-        self.assertNotEqual(r, Requirement.parse("Twisted[extras]>=1.2"))
+        assert str(r) == "Twisted>=1.2"
+        assert repr(r) == "Requirement.parse('Twisted>=1.2')"
+        assert r == Requirement("Twisted", [('>=','1.2')], ())
+        assert r == Requirement("twisTed", [('>=','1.2')], ())
+        assert r != Requirement("Twisted", [('>=','2.0')], ())
+        assert r != Requirement("Zope", [('>=','1.2')], ())
+        assert r != Requirement("Zope", [('>=','3.0')], ())
+        assert r != Requirement.parse("Twisted[extras]>=1.2")
 
     def testOrdering(self):
         r1 = Requirement("Twisted", [('==','1.2c1'),('>=','1.2')], ())
         r2 = Requirement("Twisted", [('>=','1.2'),('==','1.2c1')], ())
-        self.assertEqual(r1,r2)
-        self.assertEqual(str(r1),str(r2))
-        self.assertEqual(str(r2),"Twisted==1.2c1,>=1.2")
+        assert r1 == r2
+        assert str(r1) == str(r2)
+        assert str(r2) == "Twisted==1.2c1,>=1.2"
 
     def testBasicContains(self):
         r = Requirement("Twisted", [('>=','1.2')], ())
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11 = Distribution.from_filename("Twisted-1.1.egg")
         twist12 = Distribution.from_filename("Twisted-1.2.egg")
-        self.assertTrue(parse_version('1.2') in r)
-        self.assertTrue(parse_version('1.1') not in r)
-        self.assertTrue('1.2' in r)
-        self.assertTrue('1.1' not in r)
-        self.assertTrue(foo_dist not in r)
-        self.assertTrue(twist11 not in r)
-        self.assertTrue(twist12 in r)
+        assert parse_version('1.2') in r
+        assert parse_version('1.1') not in r
+        assert '1.2' in r
+        assert '1.1' not in r
+        assert foo_dist not in r
+        assert twist11 not in r
+        assert twist12 in r
 
     def testOptionsAndHashing(self):
         r1 = Requirement.parse("Twisted[foo,bar]>=1.2")
         r2 = Requirement.parse("Twisted[bar,FOO]>=1.2")
-        self.assertEqual(r1,r2)
-        self.assertEqual(r1.extras, ("foo","bar"))
-        self.assertEqual(r2.extras, ("bar","foo"))  # extras are normalized
-        self.assertEqual(hash(r1), hash(r2))
-        self.assertEqual(
-            hash(r1), hash(("twisted", packaging.specifiers.SpecifierSet(">=1.2"),
-                            frozenset(["foo","bar"])))
+        assert r1 == r2
+        assert r1.extras == ("foo","bar")
+        assert r2.extras == ("bar","foo")  # extras are normalized
+        assert hash(r1) == hash(r2)
+        assert (
+            hash(r1)
+            ==
+            hash((
+                "twisted",
+                packaging.specifiers.SpecifierSet(">=1.2"),
+                frozenset(["foo","bar"]),
+            ))
         )
 
     def testVersionEquality(self):
@@ -350,42 +349,42 @@ def testVersionEquality(self):
         r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.assertTrue(d("foo-0.3a4.egg") not in r1)
-        self.assertTrue(d("foo-0.3a1.egg") not in r1)
-        self.assertTrue(d("foo-0.3a4.egg") not in r2)
+        assert d("foo-0.3a4.egg") not in r1
+        assert d("foo-0.3a1.egg") not in r1
+        assert d("foo-0.3a4.egg") not in r2
 
-        self.assertTrue(d("foo-0.3a2.egg") in r1)
-        self.assertTrue(d("foo-0.3a2.egg") in r2)
-        self.assertTrue(d("foo-0.3a3.egg") in r2)
-        self.assertTrue(d("foo-0.3a5.egg") in r2)
+        assert d("foo-0.3a2.egg") in r1
+        assert d("foo-0.3a2.egg") in r2
+        assert d("foo-0.3a3.egg") in r2
+        assert d("foo-0.3a5.egg") in r2
 
     def testSetuptoolsProjectName(self):
         """
         The setuptools project should implement the setuptools package.
         """
 
-        self.assertEqual(
-            Requirement.parse('setuptools').project_name, 'setuptools')
+        assert (
+            Requirement.parse('setuptools').project_name == 'setuptools')
         # setuptools 0.7 and higher means setuptools.
-        self.assertEqual(
-            Requirement.parse('setuptools == 0.7').project_name, 'setuptools')
-        self.assertEqual(
-            Requirement.parse('setuptools == 0.7a1').project_name, 'setuptools')
-        self.assertEqual(
-            Requirement.parse('setuptools >= 0.7').project_name, 'setuptools')
+        assert (
+            Requirement.parse('setuptools == 0.7').project_name == 'setuptools')
+        assert (
+            Requirement.parse('setuptools == 0.7a1').project_name == 'setuptools')
+        assert (
+            Requirement.parse('setuptools >= 0.7').project_name == 'setuptools')
 
 
-class ParseTests(TestCase):
+class TestParsing:
 
     def testEmptyParse(self):
-        self.assertEqual(list(parse_requirements('')), [])
+        assert list(parse_requirements('')) == []
 
     def testYielding(self):
         for inp,out in [
             ([], []), ('x',['x']), ([[]],[]), (' x\n y', ['x','y']),
             (['x\n\n','y'], ['x','y']),
         ]:
-            self.assertEqual(list(pkg_resources.yield_lines(inp)),out)
+            assert list(pkg_resources.yield_lines(inp)) == out
 
     def testSplitting(self):
         sample = """
@@ -401,48 +400,65 @@ def testSplitting(self):
                     [q]
                     v
                     """
-        self.assertEqual(list(pkg_resources.split_sections(sample)),
-            [(None,["x"]), ("Y",["z","a"]), ("b",["c"]), ("d",[]), ("q",["v"])]
+        assert (
+            list(pkg_resources.split_sections(sample))
+                ==
+            [
+                (None, ["x"]),
+                ("Y", ["z", "a"]),
+                ("b", ["c"]),
+                ("d", []),
+                ("q", ["v"]),
+            ]
         )
-        self.assertRaises(ValueError,list,pkg_resources.split_sections("[foo"))
+        with pytest.raises(ValueError):
+            list(pkg_resources.split_sections("[foo"))
 
     def testSafeName(self):
-        self.assertEqual(safe_name("adns-python"), "adns-python")
-        self.assertEqual(safe_name("WSGI Utils"),  "WSGI-Utils")
-        self.assertEqual(safe_name("WSGI  Utils"), "WSGI-Utils")
-        self.assertEqual(safe_name("Money$$$Maker"), "Money-Maker")
-        self.assertNotEqual(safe_name("peak.web"), "peak-web")
+        assert safe_name("adns-python") == "adns-python"
+        assert safe_name("WSGI Utils") == "WSGI-Utils"
+        assert safe_name("WSGI  Utils") == "WSGI-Utils"
+        assert safe_name("Money$$$Maker") == "Money-Maker"
+        assert safe_name("peak.web") != "peak-web"
 
     def testSafeVersion(self):
-        self.assertEqual(safe_version("1.2-1"), "1.2.post1")
-        self.assertEqual(safe_version("1.2 alpha"),  "1.2.alpha")
-        self.assertEqual(safe_version("2.3.4 20050521"), "2.3.4.20050521")
-        self.assertEqual(safe_version("Money$$$Maker"), "Money-Maker")
-        self.assertEqual(safe_version("peak.web"), "peak.web")
+        assert safe_version("1.2-1") == "1.2.post1"
+        assert safe_version("1.2 alpha") == "1.2.alpha"
+        assert safe_version("2.3.4 20050521") == "2.3.4.20050521"
+        assert safe_version("Money$$$Maker") == "Money-Maker"
+        assert safe_version("peak.web") == "peak.web"
 
     def testSimpleRequirements(self):
-        self.assertEqual(
-            list(parse_requirements('Twis-Ted>=1.2-1')),
+        assert (
+            list(parse_requirements('Twis-Ted>=1.2-1'))
+            ==
             [Requirement('Twis-Ted',[('>=','1.2-1')], ())]
         )
-        self.assertEqual(
-            list(parse_requirements('Twisted >=1.2, \ # more\n<2.0')),
+        assert (
+            list(parse_requirements('Twisted >=1.2, \ # more\n<2.0'))
+            ==
             [Requirement('Twisted',[('>=','1.2'),('<','2.0')], ())]
         )
-        self.assertEqual(
-            Requirement.parse("FooBar==1.99a3"),
+        assert (
+            Requirement.parse("FooBar==1.99a3")
+            ==
             Requirement("FooBar", [('==','1.99a3')], ())
         )
-        self.assertRaises(ValueError,Requirement.parse,">=2.3")
-        self.assertRaises(ValueError,Requirement.parse,"x\\")
-        self.assertRaises(ValueError,Requirement.parse,"x==2 q")
-        self.assertRaises(ValueError,Requirement.parse,"X==1\nY==2")
-        self.assertRaises(ValueError,Requirement.parse,"#")
+        with pytest.raises(ValueError):
+            Requirement.parse(">=2.3")
+        with pytest.raises(ValueError):
+            Requirement.parse("x\\")
+        with pytest.raises(ValueError):
+            Requirement.parse("x==2 q")
+        with pytest.raises(ValueError):
+            Requirement.parse("X==1\nY==2")
+        with pytest.raises(ValueError):
+            Requirement.parse("#")
 
     def testVersionEquality(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            self.assertEqual(p1,p2, (s1,s2,p1,p2))
+            assert p1 == p2, (s1,s2,p1,p2)
 
         c('1.2-rc1', '1.2rc1')
         c('0.4', '0.4.0')
@@ -458,7 +474,7 @@ def c(s1,s2):
     def testVersionOrdering(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            self.assertTrue(p1<p2, (s1,s2,p1,p2))
+            assert p1<p2, (s1,s2,p1,p2)
 
         c('2.1','2.1.1')
         c('2a1','2b0')
@@ -503,15 +519,15 @@ def _final_version(parsed_version):
                 return True
             return _final_version(parsed_version)
 
-        self.assertTrue(buildout(parse_version("1.0")))
-        self.assertFalse(buildout(parse_version("1.0a1")))
+        assert buildout(parse_version("1.0"))
+        assert not buildout(parse_version("1.0a1"))
 
     def testVersionIndexable(self):
         """
         Some projects were doing things like parse_version("v")[0], so we'll
         support indexing the same as we support iterating.
         """
-        self.assertEqual(parse_version("1.0")[0], "00000001")
+        assert parse_version("1.0")[0] == "00000001"
 
     def testVersionTupleSort(self):
         """
@@ -519,26 +535,27 @@ def testVersionTupleSort(self):
         value of parse_version. So again we'll add a warning enabled shim to
         make this possible.
         """
-        self.assertTrue(parse_version("1.0") < tuple(parse_version("2.0")))
-        self.assertTrue(parse_version("1.0") <= tuple(parse_version("2.0")))
-        self.assertTrue(parse_version("1.0") == tuple(parse_version("1.0")))
-        self.assertTrue(parse_version("3.0") > tuple(parse_version("2.0")))
-        self.assertTrue(parse_version("3.0") >= tuple(parse_version("2.0")))
-        self.assertTrue(parse_version("3.0") != tuple(parse_version("2.0")))
-        self.assertFalse(parse_version("3.0") != tuple(parse_version("3.0")))
+        assert parse_version("1.0") < tuple(parse_version("2.0"))
+        assert parse_version("1.0") <= tuple(parse_version("2.0"))
+        assert parse_version("1.0") == tuple(parse_version("1.0"))
+        assert parse_version("3.0") > tuple(parse_version("2.0"))
+        assert parse_version("3.0") >= tuple(parse_version("2.0"))
+        assert parse_version("3.0") != tuple(parse_version("2.0"))
+        assert not (parse_version("3.0") != tuple(parse_version("3.0")))
 
     def testVersionHashable(self):
         """
         Ensure that our versions stay hashable even though we've subclassed
         them and added some shim code to them.
         """
-        self.assertEqual(
-            hash(parse_version("1.0")),
-            hash(parse_version("1.0")),
+        assert (
+            hash(parse_version("1.0"))
+            ==
+            hash(parse_version("1.0"))
         )
 
 
-class ScriptHeaderTests(TestCase):
+class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
     exe_with_spaces = r'C:\Program Files\Python33\python.exe'
 
@@ -546,17 +563,15 @@ def test_get_script_header(self):
         if not sys.platform.startswith('java') or not is_sh(sys.executable):
             # This test is for non-Jython platforms
             expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            self.assertEqual(get_script_header('#!/usr/local/bin/python'),
-                expected)
+            assert get_script_header('#!/usr/local/bin/python') == expected
             expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            self.assertEqual(get_script_header('#!/usr/bin/python -x'),
-                expected)
-            self.assertEqual(get_script_header('#!/usr/bin/python',
-                                               executable=self.non_ascii_exe),
-                             '#!%s -x\n' % self.non_ascii_exe)
+            assert get_script_header('#!/usr/bin/python -x') == expected
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.non_ascii_exe)
+            assert candidate == '#!%s -x\n' % self.non_ascii_exe
             candidate = get_script_header('#!/usr/bin/python',
                 executable=self.exe_with_spaces)
-            self.assertEqual(candidate, '#!"%s"\n' % self.exe_with_spaces)
+            assert candidate == '#!"%s"\n' % self.exe_with_spaces
 
     def test_get_script_header_jython_workaround(self):
         # This test doesn't work with Python 3 in some locales
@@ -577,38 +592,40 @@ def getProperty(property):
         try:
             # A mock sys.executable that uses a shebang line (this file)
             exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
-            self.assertEqual(
-                get_script_header('#!/usr/local/bin/python', executable=exe),
-                '#!/usr/bin/env %s\n' % exe)
+            assert (
+                get_script_header('#!/usr/local/bin/python', executable=exe)
+                ==
+                '#!/usr/bin/env %s\n' % exe
+            )
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
             sys.stdout = sys.stderr = StringIO()
-            self.assertEqual(get_script_header('#!/usr/bin/python -x',
-                                               executable=exe),
-                             '#!%s  -x\n' % exe)
-            self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
+            candidate = get_script_header('#!/usr/bin/python -x',
+                executable=exe)
+            assert candidate == '#!%s  -x\n' % exe
+            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
             sys.stdout = sys.stderr = StringIO()
-            self.assertEqual(get_script_header('#!/usr/bin/python',
-                                               executable=self.non_ascii_exe),
-                             '#!%s -x\n' % self.non_ascii_exe)
-            self.assertTrue('Unable to adapt shebang line' in sys.stdout.getvalue())
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.non_ascii_exe)
+            assert candidate == '#!%s -x\n' % self.non_ascii_exe
+            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
         finally:
             del sys.modules["java"]
             sys.platform = platform
             sys.stdout, sys.stderr = stdout, stderr
 
 
-class NamespaceTests(TestCase):
+class TestNamespaces:
 
-    def setUp(self):
+    def setup_method(self, method):
         self._ns_pkgs = pkg_resources._namespace_packages.copy()
         self._tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
         os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
         self._prev_sys_path = sys.path[:]
         sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
 
-    def tearDown(self):
+    def teardown_method(self, method):
         shutil.rmtree(self._tmpdir)
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]

From c3e74e46e20ceb7cc126f28611d0b9c098a333f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:43:29 -0500
Subject: [PATCH 4723/8469] Ported test_sandbox to pytest from unittest.

---
 setuptools/tests/test_sandbox.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 6a890ebc97..138e7f87c0 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -3,7 +3,6 @@
 import sys
 import os
 import shutil
-import unittest
 import tempfile
 import types
 
@@ -24,12 +23,12 @@ def has_win32com():
         return False
     return True
 
-class TestSandbox(unittest.TestCase):
+class TestSandbox:
 
-    def setUp(self):
+    def setup_method(self, method):
         self.dir = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         shutil.rmtree(self.dir)
 
     def test_devnull(self):
@@ -78,6 +77,3 @@ def test_setup_py_with_CRLF(self):
         with open(setup_py, 'wb') as stream:
             stream.write(b'"degenerate script"\r\n')
         setuptools.sandbox._execfile(setup_py, globals())
-
-if __name__ == '__main__':
-    unittest.main()

From 4837776968b41fd22d74e560f07e554fcff47d72 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:45:35 -0500
Subject: [PATCH 4724/8469] Use importorskip to detect/load win32com

---
 setuptools/tests/test_sandbox.py | 45 ++++++++++++--------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 138e7f87c0..426c56145b 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -6,22 +6,12 @@
 import tempfile
 import types
 
+import pytest
+
 import pkg_resources
 import setuptools.sandbox
 from setuptools.sandbox import DirectorySandbox, SandboxViolation
 
-def has_win32com():
-    """
-    Run this to determine if the local machine has win32com, and if it
-    does, include additional tests.
-    """
-    if not sys.platform.startswith('win32'):
-        return False
-    try:
-        __import__('win32com')
-    except ImportError:
-        return False
-    return True
 
 class TestSandbox:
 
@@ -44,23 +34,22 @@ def do_write():
 
     _file_writer = staticmethod(_file_writer)
 
-    if has_win32com():
-        def test_win32com(self):
-            """
-            win32com should not be prevented from caching COM interfaces
-            in gen_py.
-            """
-            import win32com
-            gen_py = win32com.__gen_path__
-            target = os.path.join(gen_py, 'test_write')
-            sandbox = DirectorySandbox(self.dir)
+    def test_win32com(self):
+        """
+        win32com should not be prevented from caching COM interfaces
+        in gen_py.
+        """
+        win32com = pytest.importorskip('win32com')
+        gen_py = win32com.__gen_path__
+        target = os.path.join(gen_py, 'test_write')
+        sandbox = DirectorySandbox(self.dir)
+        try:
             try:
-                try:
-                    sandbox.run(self._file_writer(target))
-                except SandboxViolation:
-                    self.fail("Could not create gen_py file due to SandboxViolation")
-            finally:
-                if os.path.exists(target): os.remove(target)
+                sandbox.run(self._file_writer(target))
+            except SandboxViolation:
+                self.fail("Could not create gen_py file due to SandboxViolation")
+        finally:
+            if os.path.exists(target): os.remove(target)
 
     def test_setup_py_with_BOM(self):
         """

From b96f9cd4b2832c4b70b23473dfed1e6f291dd119 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:47:54 -0500
Subject: [PATCH 4725/8469] Minor cleanup

---
 setuptools/tests/test_sandbox.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 426c56145b..d09d164f63 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -1,6 +1,5 @@
 """develop tests
 """
-import sys
 import os
 import shutil
 import tempfile
@@ -25,15 +24,13 @@ def test_devnull(self):
         sandbox = DirectorySandbox(self.dir)
         sandbox.run(self._file_writer(os.devnull))
 
+    @staticmethod
     def _file_writer(path):
         def do_write():
-            f = open(path, 'w')
-            f.write('xxx')
-            f.close()
+            with open(path, 'w') as f:
+                f.write('xxx')
         return do_write
 
-    _file_writer = staticmethod(_file_writer)
-
     def test_win32com(self):
         """
         win32com should not be prevented from caching COM interfaces
@@ -49,7 +46,8 @@ def test_win32com(self):
             except SandboxViolation:
                 self.fail("Could not create gen_py file due to SandboxViolation")
         finally:
-            if os.path.exists(target): os.remove(target)
+            if os.path.exists(target):
+                os.remove(target)
 
     def test_setup_py_with_BOM(self):
         """

From 8b899dabec8d2f050e4a13dfc78ec4bcb5b620df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:50:29 -0500
Subject: [PATCH 4726/8469] Use tmpdir fixture

---
 setuptools/tests/test_sandbox.py | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index d09d164f63..6e5ce04a47 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -1,8 +1,6 @@
 """develop tests
 """
 import os
-import shutil
-import tempfile
 import types
 
 import pytest
@@ -14,14 +12,8 @@
 
 class TestSandbox:
 
-    def setup_method(self, method):
-        self.dir = tempfile.mkdtemp()
-
-    def teardown_method(self, method):
-        shutil.rmtree(self.dir)
-
-    def test_devnull(self):
-        sandbox = DirectorySandbox(self.dir)
+    def test_devnull(self, tmpdir):
+        sandbox = DirectorySandbox(str(tmpdir))
         sandbox.run(self._file_writer(os.devnull))
 
     @staticmethod
@@ -31,7 +23,7 @@ def do_write():
                 f.write('xxx')
         return do_write
 
-    def test_win32com(self):
+    def test_win32com(self, tmpdir):
         """
         win32com should not be prevented from caching COM interfaces
         in gen_py.
@@ -39,7 +31,7 @@ def test_win32com(self):
         win32com = pytest.importorskip('win32com')
         gen_py = win32com.__gen_path__
         target = os.path.join(gen_py, 'test_write')
-        sandbox = DirectorySandbox(self.dir)
+        sandbox = DirectorySandbox(str(tmpdir))
         try:
             try:
                 sandbox.run(self._file_writer(target))
@@ -59,8 +51,8 @@ def test_setup_py_with_BOM(self):
         setuptools.sandbox._execfile(target, vars(namespace))
         assert namespace.result == 'passed'
 
-    def test_setup_py_with_CRLF(self):
-        setup_py = os.path.join(self.dir, 'setup.py')
-        with open(setup_py, 'wb') as stream:
+    def test_setup_py_with_CRLF(self, tmpdir):
+        setup_py = tmpdir / 'setup.py'
+        with setup_py.open('wb') as stream:
             stream.write(b'"degenerate script"\r\n')
-        setuptools.sandbox._execfile(setup_py, globals())
+        setuptools.sandbox._execfile(str(setup_py), globals())

From a6cfae4a1d1a0fb1c71b6fe353b9d1030417811a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:58:30 -0500
Subject: [PATCH 4727/8469] Converted sdist tests to pytest

---
 setuptools/tests/test_sdist.py | 55 ++++++++++++++++------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 120911d25a..943a5deec5 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -6,7 +6,6 @@
 import shutil
 import sys
 import tempfile
-import unittest
 import unicodedata
 import contextlib
 
@@ -78,9 +77,9 @@ def decompose(path):
     return path
 
 
-class TestSdistTest(unittest.TestCase):
+class TestSdistTest:
 
-    def setUp(self):
+    def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
         f.write(SETUP_PY)
@@ -98,7 +97,7 @@ def setUp(self):
         self.old_cwd = os.getcwd()
         os.chdir(self.temp_dir)
 
-    def tearDown(self):
+    def teardown_method(self, method):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.temp_dir)
 
@@ -117,9 +116,9 @@ def test_package_data_in_sdist(self):
             cmd.run()
 
         manifest = cmd.filelist.files
-        self.assertTrue(os.path.join('sdist_test', 'a.txt') in manifest)
-        self.assertTrue(os.path.join('sdist_test', 'b.txt') in manifest)
-        self.assertTrue(os.path.join('sdist_test', 'c.rst') not in manifest)
+        assert os.path.join('sdist_test', 'a.txt') in manifest
+        assert os.path.join('sdist_test', 'b.txt') in manifest
+        assert os.path.join('sdist_test', 'c.rst') not in manifest
 
 
     def test_defaults_case_sensitivity(self):
@@ -144,9 +143,9 @@ def test_defaults_case_sensitivity(self):
 
         # lowercase all names so we can test in a case-insensitive way to make sure the files are not included
         manifest = map(lambda x: x.lower(), cmd.filelist.files)
-        self.assertFalse('readme.rst' in manifest, manifest)
-        self.assertFalse('setup.py' in manifest, manifest)
-        self.assertFalse('setup.cfg' in manifest, manifest)
+        assert 'readme.rst' not in manifest, manifest
+        assert 'setup.py' not in manifest, manifest
+        assert 'setup.cfg' not in manifest, manifest
 
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
@@ -184,7 +183,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
             fs_enc = sys.getfilesystemencoding()
             filename = filename.decode(fs_enc)
 
-        self.assertTrue(posix(filename) in u_contents)
+        assert posix(filename) in u_contents
 
     # Python 3 only
     if PY3:
@@ -223,10 +222,10 @@ def test_write_manifest_allows_utf8_filenames(self):
                 self.fail(e)
 
             # The manifest should contain the UTF-8 filename
-            self.assertTrue(posix(filename) in contents)
+            assert posix(filename) in contents
 
             # The filelist should have been updated as well
-            self.assertTrue(u_filename in mm.filelist.files)
+            assert u_filename in mm.filelist.files
 
         def test_write_manifest_skips_non_utf8_filenames(self):
             """
@@ -264,10 +263,10 @@ def test_write_manifest_skips_non_utf8_filenames(self):
                 self.fail(e)
 
             # The Latin-1 filename should have been skipped
-            self.assertFalse(posix(filename) in contents)
+            assert posix(filename) not in contents
 
             # The filelist should have been updated as well
-            self.assertFalse(u_filename in mm.filelist.files)
+            assert u_filename not in mm.filelist.files
 
     def test_manifest_is_read_with_utf8_encoding(self):
         # Test for #303.
@@ -298,7 +297,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
         # The filelist should contain the UTF-8 filename
         if PY3:
             filename = filename.decode('utf-8')
-        self.assertTrue(filename in cmd.filelist.files)
+        assert filename in cmd.filelist.files
 
     # Python 3 only
     if PY3:
@@ -335,7 +334,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
 
             # The Latin-1 filename should have been skipped
             filename = filename.decode('latin-1')
-            self.assertFalse(filename in cmd.filelist.files)
+            assert filename not in cmd.filelist.files
 
     @pytest.mark.skipif(PY3 and locale.getpreferredencoding() != 'UTF-8',
         reason='Unittest fails if locale is not utf-8 but the manifests is '
@@ -364,15 +363,15 @@ def test_sdist_with_utf8_encoded_filename(self):
                 if fs_enc == 'cp1252':
                     # Python 3 mangles the UTF-8 filename
                     filename = filename.decode('cp1252')
-                    self.assertTrue(filename in cmd.filelist.files)
+                    assert filename in cmd.filelist.files
                 else:
                     filename = filename.decode('mbcs')
-                    self.assertTrue(filename in cmd.filelist.files)
+                    assert filename in cmd.filelist.files
             else:
                 filename = filename.decode('utf-8')
-                self.assertTrue(filename in cmd.filelist.files)
+                assert filename in cmd.filelist.files
         else:
-            self.assertTrue(filename in cmd.filelist.files)
+            assert filename in cmd.filelist.files
 
     def test_sdist_with_latin1_encoded_filename(self):
         # Test for #303.
@@ -384,7 +383,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         # Latin-1 filename
         filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
         open(filename, 'w').close()
-        self.assertTrue(os.path.isfile(filename))
+        assert os.path.isfile(filename)
 
         with quiet():
             cmd.run()
@@ -400,11 +399,11 @@ def test_sdist_with_latin1_encoded_filename(self):
                 else:
                     filename = filename.decode('latin-1')
 
-                self.assertTrue(filename in cmd.filelist.files)
+                assert filename in cmd.filelist.files
             else:
                 # The Latin-1 filename should have been skipped
                 filename = filename.decode('latin-1')
-                self.assertFalse(filename in cmd.filelist.files)
+                filename not in cmd.filelist.files
         else:
             # Under Python 2 there seems to be no decoded string in the
             # filelist.  However, due to decode and encoding of the
@@ -414,9 +413,9 @@ def test_sdist_with_latin1_encoded_filename(self):
                 # be proformed for the manifest output.
                 fs_enc = sys.getfilesystemencoding()
                 filename.decode(fs_enc)
-                self.assertTrue(filename in cmd.filelist.files)
+                assert filename in cmd.filelist.files
             except UnicodeDecodeError:
-                self.assertFalse(filename in cmd.filelist.files)
+                filename not in cmd.filelist.files
 
 
 def test_default_revctrl():
@@ -434,7 +433,3 @@ def test_default_revctrl():
     ep = pkg_resources.EntryPoint.parse(ep_def)
     res = ep._load()
     assert hasattr(res, '__iter__')
-
-
-def test_suite():
-    return unittest.defaultTestLoader.loadTestsFromName(__name__)

From ee20548e4039df2a49157f5d85090286434ced5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 11:58:58 -0500
Subject: [PATCH 4728/8469] Remove unused imports

---
 setuptools/tests/test_test.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index df92085e5d..edd1769a3a 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -9,10 +9,8 @@
 import tempfile
 import unittest
 
-from distutils.errors import DistutilsError
 from setuptools.compat import StringIO, PY2
 from setuptools.command.test import test
-from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 
 SETUP_PY = """\

From a974f8c7b1b30bdb462531627a39255a0b82fdff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:00:11 -0500
Subject: [PATCH 4729/8469] Use DALS for nicer indentation

---
 setuptools/tests/test_test.py | 52 +++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index edd1769a3a..9a8f9313ed 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -13,37 +13,43 @@
 from setuptools.command.test import test
 from setuptools.dist import Distribution
 
-SETUP_PY = """\
-from setuptools import setup
-
-setup(name='foo',
-    packages=['name', 'name.space', 'name.space.tests'],
-    namespace_packages=['name'],
-    test_suite='name.space.tests.test_suite',
-)
-"""
+from .textwrap import DALS
+
+SETUP_PY = DALS("""
+    from setuptools import setup
+
+    setup(name='foo',
+        packages=['name', 'name.space', 'name.space.tests'],
+        namespace_packages=['name'],
+        test_suite='name.space.tests.test_suite',
+    )
+    """)
+
+NS_INIT = DALS("""
+    # -*- coding: Latin-1 -*-
+    # Söme Arbiträry Ünicode to test Issüé 310
+    try:
+        __import__('pkg_resources').declare_namespace(__name__)
+    except ImportError:
+        from pkgutil import extend_path
+        __path__ = extend_path(__path__, __name__)
+    """)
 
-NS_INIT = """# -*- coding: Latin-1 -*-
-# Söme Arbiträry Ünicode to test Issüé 310
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
-"""
 # Make sure this is Latin-1 binary, before writing:
 if PY2:
     NS_INIT = NS_INIT.decode('UTF-8')
 NS_INIT = NS_INIT.encode('Latin-1')
 
-TEST_PY = """import unittest
+TEST_PY = DALS("""
+    import unittest
 
-class TestTest(unittest.TestCase):
-    def test_test(self):
-        print "Foo" # Should fail under Python 3 unless 2to3 is used
+    class TestTest(unittest.TestCase):
+        def test_test(self):
+            print "Foo" # Should fail under Python 3 unless 2to3 is used
+
+    test_suite = unittest.makeSuite(TestTest)
+    """)
 
-test_suite = unittest.makeSuite(TestTest)
-"""
 
 class TestTestTest(unittest.TestCase):
 

From 14beff81f0f4369a3323a84f49d53747a38bccfd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:01:57 -0500
Subject: [PATCH 4730/8469] Port test_test to pytest

---
 setuptools/tests/test_test.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 9a8f9313ed..f527aa240a 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -7,7 +7,6 @@
 import site
 import sys
 import tempfile
-import unittest
 
 from setuptools.compat import StringIO, PY2
 from setuptools.command.test import test
@@ -51,9 +50,9 @@ def test_test(self):
     """)
 
 
-class TestTestTest(unittest.TestCase):
+class TestTestTest:
 
-    def setUp(self):
+    def setup_method(self, method):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
 
@@ -90,7 +89,7 @@ def setUp(self):
         self.old_site = site.USER_SITE
         site.USER_SITE = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
             return
 

From d66783b40a483c9edf6117d7ebbb49c18e00de17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:02:52 -0500
Subject: [PATCH 4731/8469] Python 2.6 can be assumed

---
 setuptools/tests/test_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index f527aa240a..abd0038b7e 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -53,7 +53,7 @@ def test_test(self):
 class TestTestTest:
 
     def setup_method(self, method):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if hasattr(sys, 'real_prefix'):
             return
 
         # Directory structure
@@ -90,7 +90,7 @@ def setup_method(self, method):
         site.USER_SITE = tempfile.mkdtemp()
 
     def teardown_method(self, method):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if hasattr(sys, 'real_prefix'):
             return
 
         os.chdir(self.old_cwd)
@@ -101,7 +101,7 @@ def teardown_method(self, method):
         site.USER_SITE = self.old_site
 
     def test_test(self):
-        if sys.version < "2.6" or hasattr(sys, 'real_prefix'):
+        if hasattr(sys, 'real_prefix'):
             return
 
         dist = Distribution(dict(

From f0eaf642ac52c02cc605ee1222bd143ef5f36623 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:06:51 -0500
Subject: [PATCH 4732/8469] Use skipif marker for real_prefix

---
 setuptools/tests/test_test.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index abd0038b7e..5d7b72ba6a 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -8,6 +8,8 @@
 import sys
 import tempfile
 
+import pytest
+
 from setuptools.compat import StringIO, PY2
 from setuptools.command.test import test
 from setuptools.dist import Distribution
@@ -50,12 +52,10 @@ def test_test(self):
     """)
 
 
+@pytest.mark.skipif('hasattr(sys, "real_prefix")')
 class TestTestTest:
 
     def setup_method(self, method):
-        if hasattr(sys, 'real_prefix'):
-            return
-
         # Directory structure
         self.dir = tempfile.mkdtemp()
         os.mkdir(os.path.join(self.dir, 'name'))
@@ -90,9 +90,6 @@ def setup_method(self, method):
         site.USER_SITE = tempfile.mkdtemp()
 
     def teardown_method(self, method):
-        if hasattr(sys, 'real_prefix'):
-            return
-
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         shutil.rmtree(site.USER_BASE)
@@ -101,9 +98,6 @@ def teardown_method(self, method):
         site.USER_SITE = self.old_site
 
     def test_test(self):
-        if hasattr(sys, 'real_prefix'):
-            return
-
         dist = Distribution(dict(
             name='foo',
             packages=['name', 'name.space', 'name.space.tests'],

From 6a5d120fa48b91f4e4cd78404f48daa8f97a2bc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:08:30 -0500
Subject: [PATCH 4733/8469] Use context opener

---
 setuptools/tests/test_test.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 5d7b72ba6a..aec9ec98ef 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -61,27 +61,27 @@ def setup_method(self, method):
         os.mkdir(os.path.join(self.dir, 'name'))
         os.mkdir(os.path.join(self.dir, 'name', 'space'))
         os.mkdir(os.path.join(self.dir, 'name', 'space', 'tests'))
+
         # setup.py
         setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'wt')
-        f.write(SETUP_PY)
-        f.close()
+        with open(setup, 'wt') as f:
+            f.write(SETUP_PY)
         self.old_cwd = os.getcwd()
+
         # name/__init__.py
         init = os.path.join(self.dir, 'name', '__init__.py')
-        f = open(init, 'wb')
-        f.write(NS_INIT)
-        f.close()
+        with open(init, 'wb') as f:
+            f.write(NS_INIT)
+
         # name/space/__init__.py
         init = os.path.join(self.dir, 'name', 'space', '__init__.py')
-        f = open(init, 'wt')
-        f.write('#empty\n')
-        f.close()
+        with open(init, 'wt') as f:
+            f.write('#empty\n')
+
         # name/space/tests/__init__.py
         init = os.path.join(self.dir, 'name', 'space', 'tests', '__init__.py')
-        f = open(init, 'wt')
-        f.write(TEST_PY)
-        f.close()
+        with open(init, 'wt') as f:
+            f.write(TEST_PY)
 
         os.chdir(self.dir)
         self.old_base = site.USER_BASE

From f6684c70f00276cc1ffa5225e543fbf7d7de6e71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:13:45 -0500
Subject: [PATCH 4734/8469] Use useroverride fixture

---
 setuptools/tests/test_test.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index aec9ec98ef..6d279e40d2 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -53,6 +53,7 @@ def test_test(self):
 
 
 @pytest.mark.skipif('hasattr(sys, "real_prefix")')
+@pytest.mark.usefixture('useroverride')
 class TestTestTest:
 
     def setup_method(self, method):
@@ -84,18 +85,10 @@ def setup_method(self, method):
             f.write(TEST_PY)
 
         os.chdir(self.dir)
-        self.old_base = site.USER_BASE
-        site.USER_BASE = tempfile.mkdtemp()
-        self.old_site = site.USER_SITE
-        site.USER_SITE = tempfile.mkdtemp()
 
     def teardown_method(self, method):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
-        shutil.rmtree(site.USER_BASE)
-        shutil.rmtree(site.USER_SITE)
-        site.USER_BASE = self.old_base
-        site.USER_SITE = self.old_site
 
     def test_test(self):
         dist = Distribution(dict(

From 2ebaaf2315395b99b6790717659cb26a25cb715f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:35:03 -0500
Subject: [PATCH 4735/8469] Replace setup/teardown with a shorter, more elegant
 fixture.

---
 setuptools/tests/test_test.py | 60 ++++++++++++++---------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 6d279e40d2..1f4a7dda5b 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -3,10 +3,8 @@
 """develop tests
 """
 import os
-import shutil
 import site
 import sys
-import tempfile
 
 import pytest
 
@@ -52,44 +50,32 @@ def test_test(self):
     """)
 
 
+@pytest.fixture
+def sample_test(tmpdir_cwd):
+    os.makedirs('name/space/tests')
+
+    # setup.py
+    with open('setup.py', 'wt') as f:
+        f.write(SETUP_PY)
+
+    # name/__init__.py
+    with open('name/__init__.py', 'wb') as f:
+        f.write(NS_INIT)
+
+    # name/space/__init__.py
+    with open('name/space/__init__.py', 'wt') as f:
+        f.write('#empty\n')
+
+    # name/space/tests/__init__.py
+    with open('name/space/tests/__init__.py', 'wt') as f:
+        f.write(TEST_PY)
+
+
 @pytest.mark.skipif('hasattr(sys, "real_prefix")')
-@pytest.mark.usefixture('useroverride')
+@pytest.mark.usefixtures('user_override')
+@pytest.mark.usefixtures('sample_test')
 class TestTestTest:
 
-    def setup_method(self, method):
-        # Directory structure
-        self.dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(self.dir, 'name'))
-        os.mkdir(os.path.join(self.dir, 'name', 'space'))
-        os.mkdir(os.path.join(self.dir, 'name', 'space', 'tests'))
-
-        # setup.py
-        setup = os.path.join(self.dir, 'setup.py')
-        with open(setup, 'wt') as f:
-            f.write(SETUP_PY)
-        self.old_cwd = os.getcwd()
-
-        # name/__init__.py
-        init = os.path.join(self.dir, 'name', '__init__.py')
-        with open(init, 'wb') as f:
-            f.write(NS_INIT)
-
-        # name/space/__init__.py
-        init = os.path.join(self.dir, 'name', 'space', '__init__.py')
-        with open(init, 'wt') as f:
-            f.write('#empty\n')
-
-        # name/space/tests/__init__.py
-        init = os.path.join(self.dir, 'name', 'space', 'tests', '__init__.py')
-        with open(init, 'wt') as f:
-            f.write(TEST_PY)
-
-        os.chdir(self.dir)
-
-    def teardown_method(self, method):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-
     def test_test(self):
         dist = Distribution(dict(
             name='foo',

From ea576715047f0b4356d2ee39ec7c603305db0e8a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:37:39 -0500
Subject: [PATCH 4736/8469] Use quiet context

---
 setuptools/tests/test_test.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 1f4a7dda5b..51c3a9b406 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -4,15 +4,15 @@
 """
 import os
 import site
-import sys
 
 import pytest
 
-from setuptools.compat import StringIO, PY2
+from setuptools.compat import PY2
 from setuptools.command.test import test
 from setuptools.dist import Distribution
 
 from .textwrap import DALS
+from . import contexts
 
 SETUP_PY = DALS("""
     from setuptools import setup
@@ -90,13 +90,10 @@ def test_test(self):
         cmd.ensure_finalized()
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
-        old_stdout = sys.stdout
-        sys.stdout = StringIO()
-        try:
-            try: # try/except/finally doesn't work in Python 2.4, so we need nested try-statements.
+        with contexts.quiet():
+            try:
                 cmd.run()
-            except SystemExit: # The test runner calls sys.exit, stop that making an error.
+            except SystemExit:
+                # The test runner calls sys.exit; suppress the exception
                 pass
-        finally:
-            sys.stdout = old_stdout
 

From 23c128e6ba47135134c317f42f1f42426eb9ae78 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:44:43 -0500
Subject: [PATCH 4737/8469] Suppress exceptions in a context for clarity,
 brevity, and reuse.

---
 setuptools/tests/contexts.py  | 8 ++++++++
 setuptools/tests/test_test.py | 7 ++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index a604cd415a..d06a333f08 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -83,3 +83,11 @@ def save_user_site_setting():
         yield saved
     finally:
         site.ENABLE_USER_SITE = saved
+
+
+@contextlib.contextmanager
+def suppress_exceptions(*excs):
+    try:
+        yield
+    except excs:
+        pass
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 51c3a9b406..41b7d07884 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -91,9 +91,6 @@ def test_test(self):
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
         with contexts.quiet():
-            try:
+            # The test runner calls sys.exit
+            with contexts.suppress_exceptions(SystemExit):
                 cmd.run()
-            except SystemExit:
-                # The test runner calls sys.exit; suppress the exception
-                pass
-

From adda5ac7b25a17843749f054e48bc36de4c54b72 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:45:38 -0500
Subject: [PATCH 4738/8469] Extract var

---
 setuptools/tests/test_test.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 41b7d07884..f2b444f7a7 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -77,13 +77,14 @@ def sample_test(tmpdir_cwd):
 class TestTestTest:
 
     def test_test(self):
-        dist = Distribution(dict(
+        params = dict(
             name='foo',
             packages=['name', 'name.space', 'name.space.tests'],
             namespace_packages=['name'],
             test_suite='name.space.tests.test_suite',
             use_2to3=True,
-            ))
+        )
+        dist = Distribution(params)
         dist.script_name = 'setup.py'
         cmd = test(dist)
         cmd.user = 1

From 69c864c159b9f960e8881f5a60d20453ad17a30f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:55:29 -0500
Subject: [PATCH 4739/8469] Use unicode literals to define files as text, and
 encode specifically when saving files.

---
 setuptools/tests/test_test.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index f2b444f7a7..4430e6eae4 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,13 +1,12 @@
 # -*- coding: UTF-8 -*-
 
-"""develop tests
-"""
+from __future__ import unicode_literals
+
 import os
 import site
 
 import pytest
 
-from setuptools.compat import PY2
 from setuptools.command.test import test
 from setuptools.dist import Distribution
 
@@ -34,11 +33,6 @@
         __path__ = extend_path(__path__, __name__)
     """)
 
-# Make sure this is Latin-1 binary, before writing:
-if PY2:
-    NS_INIT = NS_INIT.decode('UTF-8')
-NS_INIT = NS_INIT.encode('Latin-1')
-
 TEST_PY = DALS("""
     import unittest
 
@@ -60,7 +54,7 @@ def sample_test(tmpdir_cwd):
 
     # name/__init__.py
     with open('name/__init__.py', 'wb') as f:
-        f.write(NS_INIT)
+        f.write(NS_INIT.encode('Latin-1'))
 
     # name/space/__init__.py
     with open('name/space/__init__.py', 'wt') as f:

From 73dd2fa9592d68e037a27468c36fdf3b32e0e16f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:56:31 -0500
Subject: [PATCH 4740/8469] Update comment to reflect issue was reported in
 Distribute.

---
 setuptools/tests/test_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 4430e6eae4..a66294c951 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -25,7 +25,7 @@
 
 NS_INIT = DALS("""
     # -*- coding: Latin-1 -*-
-    # Söme Arbiträry Ünicode to test Issüé 310
+    # Söme Arbiträry Ünicode to test Distribute Issüé 310
     try:
         __import__('pkg_resources').declare_namespace(__name__)
     except ImportError:

From 6f3dd242a7856fb7d6be2a59fccbab449367285b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:57:07 -0500
Subject: [PATCH 4741/8469] Normalize imports

---
 setuptools/tests/test_upload_docs.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 769f16cc5a..a1bd835f49 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -1,6 +1,13 @@
 """build_ext tests
 """
-import sys, os, shutil, tempfile, unittest, site, zipfile
+import sys
+import os
+import shutil
+import tempfile
+import unittest
+import site
+import zipfile
+
 from setuptools.command.upload_docs import upload_docs
 from setuptools.dist import Distribution
 

From e97379a558d1134ae402a428cda975911ba7d9e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 12:58:14 -0500
Subject: [PATCH 4742/8469] Use DALS

---
 setuptools/tests/test_upload_docs.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index a1bd835f49..f4e43d7c4e 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -11,11 +11,16 @@
 from setuptools.command.upload_docs import upload_docs
 from setuptools.dist import Distribution
 
-SETUP_PY = """\
-from setuptools import setup
+from .textwrap import DALS
+
+
+SETUP_PY = DALS(
+    """
+    from setuptools import setup
+
+    setup(name='foo')
+    """)
 
-setup(name='foo')
-"""
 
 class TestUploadDocsTest(unittest.TestCase):
     def setUp(self):

From 3c40f86c2e1fac7707b6a7f2a25920fbb74ee270 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:00:18 -0500
Subject: [PATCH 4743/8469] Remove dependence on unittest in test_upload_docs

---
 setuptools/tests/test_upload_docs.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index f4e43d7c4e..2d478866c4 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -4,7 +4,6 @@
 import os
 import shutil
 import tempfile
-import unittest
 import site
 import zipfile
 
@@ -22,8 +21,8 @@
     """)
 
 
-class TestUploadDocsTest(unittest.TestCase):
-    def setUp(self):
+class TestUploadDocsTest:
+    def setup_method(self, method):
         self.dir = tempfile.mkdtemp()
         setup = os.path.join(self.dir, 'setup.py')
         f = open(setup, 'w')
@@ -49,7 +48,7 @@ def setUp(self):
             self.old_site = site.USER_SITE
             site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def teardown_method(self, method):
         os.chdir(self.old_cwd)
         shutil.rmtree(self.dir)
         if sys.version >= "2.6":

From ddbaa77c8f1ad3cbb42957f03707804b13863d18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:01:03 -0500
Subject: [PATCH 4744/8469] Remove copy pasta

---
 setuptools/tests/test_upload_docs.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 2d478866c4..f7052e6eac 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -1,5 +1,3 @@
-"""build_ext tests
-"""
 import sys
 import os
 import shutil

From 144cd7bb846c5bcbadf1676d5455a065de52419a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:06:33 -0500
Subject: [PATCH 4745/8469] Leverage fixtures for sample project and
 user_overrides.

---
 setuptools/tests/test_upload_docs.py | 53 ++++++++++------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index f7052e6eac..9e85f0d6cf 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -1,10 +1,10 @@
-import sys
 import os
 import shutil
 import tempfile
-import site
 import zipfile
 
+import pytest
+
 from setuptools.command.upload_docs import upload_docs
 from setuptools.dist import Distribution
 
@@ -19,41 +19,25 @@
     """)
 
 
-class TestUploadDocsTest:
-    def setup_method(self, method):
-        self.dir = tempfile.mkdtemp()
-        setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'w')
+@pytest.fixture
+def sample_project(tmpdir_cwd):
+    # setup.py
+    with open('setup.py', 'wt') as f:
         f.write(SETUP_PY)
-        f.close()
-        self.old_cwd = os.getcwd()
-        os.chdir(self.dir)
 
-        self.upload_dir = os.path.join(self.dir, 'build')
-        os.mkdir(self.upload_dir)
+    os.mkdir('build')
 
-        # A test document.
-        f = open(os.path.join(self.upload_dir, 'index.html'), 'w')
+    # A test document.
+    with open('build/index.html', 'w') as f:
         f.write("Hello world.")
-        f.close()
-
-        # An empty folder.
-        os.mkdir(os.path.join(self.upload_dir, 'empty'))
-
-        if sys.version >= "2.6":
-            self.old_base = site.USER_BASE
-            site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp()
-            self.old_site = site.USER_SITE
-            site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp()
-
-    def teardown_method(self, method):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-        if sys.version >= "2.6":
-            shutil.rmtree(site.USER_BASE)
-            shutil.rmtree(site.USER_SITE)
-            site.USER_BASE = self.old_base
-            site.USER_SITE = self.old_site
+
+    # An empty folder.
+    os.mkdir('build/empty')
+
+
+@pytest.mark.usefixtures('sample_project')
+@pytest.mark.usefixtures('user_override')
+class TestUploadDocsTest:
 
     def test_create_zipfile(self):
         # Test to make sure zipfile creation handles common cases.
@@ -62,8 +46,7 @@ def test_create_zipfile(self):
         dist = Distribution()
 
         cmd = upload_docs(dist)
-        cmd.upload_dir = self.upload_dir
-        cmd.target_dir = self.upload_dir
+        cmd.target_dir = cmd.upload_dir = 'build'
         tmp_dir = tempfile.mkdtemp()
         tmp_file = os.path.join(tmp_dir, 'foo.zip')
         try:

From b72261b9a0c9e45c730eff86fae594428f6f932a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:07:41 -0500
Subject: [PATCH 4746/8469] Replace comment with clearer docstring.

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

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 9e85f0d6cf..6fe9e051db 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -40,8 +40,10 @@ def sample_project(tmpdir_cwd):
 class TestUploadDocsTest:
 
     def test_create_zipfile(self):
-        # Test to make sure zipfile creation handles common cases.
-        # This explicitly includes a folder containing an empty folder.
+        """
+        Ensure zipfile creation handles common cases, including a folder
+        containing an empty folder.
+        """
 
         dist = Distribution()
 

From a87442aab8bd8779b562043540c467ffffb4d581 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:09:46 -0500
Subject: [PATCH 4747/8469] Use tempdir context

---
 setuptools/tests/test_upload_docs.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 6fe9e051db..66d06dc018 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -1,6 +1,4 @@
 import os
-import shutil
-import tempfile
 import zipfile
 
 import pytest
@@ -9,6 +7,7 @@
 from setuptools.dist import Distribution
 
 from .textwrap import DALS
+from . import contexts
 
 
 SETUP_PY = DALS(
@@ -49,9 +48,8 @@ def test_create_zipfile(self):
 
         cmd = upload_docs(dist)
         cmd.target_dir = cmd.upload_dir = 'build'
-        tmp_dir = tempfile.mkdtemp()
-        tmp_file = os.path.join(tmp_dir, 'foo.zip')
-        try:
+        with contexts.tempdir() as tmp_dir:
+            tmp_file = os.path.join(tmp_dir, 'foo.zip')
             zip_file = cmd.create_zipfile(tmp_file)
 
             assert zipfile.is_zipfile(tmp_file)
@@ -61,6 +59,3 @@ def test_create_zipfile(self):
             assert zip_file.namelist() == ['index.html']
 
             zip_file.close()
-        finally:
-            shutil.rmtree(tmp_dir)
-

From 8aee42417b6635979dc0da1beba3eae4fc6c3c7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:13:23 -0500
Subject: [PATCH 4748/8469] woh what?

---
 setuptools/tests/test_upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 66d06dc018..ea5c358765 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -54,7 +54,7 @@ def test_create_zipfile(self):
 
             assert zipfile.is_zipfile(tmp_file)
 
-            zip_file = zipfile.ZipFile(tmp_file) # woh...
+            zip_file = zipfile.ZipFile(tmp_file)
 
             assert zip_file.namelist() == ['index.html']
 

From afedfedb4669e8f4ab1677bdb71bb9895fb2dc13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:14:31 -0500
Subject: [PATCH 4749/8469] Open zip file in context

---
 setuptools/tests/test_upload_docs.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index ea5c358765..85f6d864fc 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -54,8 +54,5 @@ def test_create_zipfile(self):
 
             assert zipfile.is_zipfile(tmp_file)
 
-            zip_file = zipfile.ZipFile(tmp_file)
-
-            assert zip_file.namelist() == ['index.html']
-
-            zip_file.close()
+            with zipfile.ZipFile(tmp_file) as zip_file:
+                assert zip_file.namelist() == ['index.html']

From db80c8f857b0c4ff3a5ad02a59e6442629599914 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:19:13 -0500
Subject: [PATCH 4750/8469] Use closing for Python 2.6 compatibility

---
 setuptools/tests/test_upload_docs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 85f6d864fc..cc71cadb23 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -1,5 +1,6 @@
 import os
 import zipfile
+import contextlib
 
 import pytest
 
@@ -54,5 +55,5 @@ def test_create_zipfile(self):
 
             assert zipfile.is_zipfile(tmp_file)
 
-            with zipfile.ZipFile(tmp_file) as zip_file:
+            with contextlib.closing(zipfile.ZipFile(tmp_file)) as zip_file:
                 assert zip_file.namelist() == ['index.html']

From 398440e9a878ed9a6dbd8843151bc08e4ba5059a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:24:45 -0500
Subject: [PATCH 4751/8469] Remove unittest dependency from test_msvc9compiler.

---
 setuptools/tests/test_msvc9compiler.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 2a117dc94f..a1637941a1 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -8,7 +8,6 @@
 import os
 import shutil
 import tempfile
-import unittest
 import distutils.errors
 
 import pytest
@@ -64,7 +63,7 @@ def __exit__(self, exc_type, exc_value, exc_tb):
         distutils.msvc9compiler.Reg.read_values = self.original_read_values
 
 
-class TestMSVC9Compiler(unittest.TestCase):
+class TestMSVC9Compiler:
 
     def test_find_vcvarsall_patch(self):
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
@@ -77,7 +76,7 @@ def test_find_vcvarsall_patch(self):
         # not find anything
         with contexts.environment(VS90COMNTOOLS=None):
             with MockReg():
-                self.assertIsNone(find_vcvarsall(9.0))
+                assert find_vcvarsall(9.0) is None
 
                 expected = distutils.errors.DistutilsPlatformError
                 with pytest.raises(expected) as exc:
@@ -104,11 +103,11 @@ def test_find_vcvarsall_patch(self):
                     key_64: mock_installdir_2,
                 }
             ):
-                self.assertEqual(mock_vcvarsall_bat_1, find_vcvarsall(9.0))
+                assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
 
             # Ensure we get the local machine value if it's there
             with MockReg(hkey_local_machine={key_32: mock_installdir_2}):
-                self.assertEqual(mock_vcvarsall_bat_2, find_vcvarsall(9.0))
+                assert mock_vcvarsall_bat_2 == find_vcvarsall(9.0)
 
             # Ensure we prefer the 64-bit local machine key
             # (*not* the Wow6432Node key)
@@ -120,7 +119,7 @@ def test_find_vcvarsall_patch(self):
                     key_64: mock_installdir_2,
                 }
             ):
-                self.assertEqual(mock_vcvarsall_bat_1, find_vcvarsall(9.0))
+                assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
         finally:
             shutil.rmtree(mock_installdir_1)
             shutil.rmtree(mock_installdir_2)

From 56d5fbca3e587bf124d3a1a2a095cd29a9e7e375 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:26:15 -0500
Subject: [PATCH 4752/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index efbb43f8df..1fd1fd4ac8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ next
 ----
 
 * Deprecated use of EntryPoint.load(require=False).
+* Substantial refactoring of all unit tests. Tests are now much leaner and
+  re-use a lot of fixtures and contexts for better clarity of purpose.
 
 ----
 10.1

From ed24bfcd1c3b9b7d83e433152c85dd6400edb4e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:43:18 -0500
Subject: [PATCH 4753/8469] Use mock to patch msvc9compiler.Reg.

---
 setuptools/tests/test_msvc9compiler.py | 90 +++++++++++++-------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index a1637941a1..9ed23e3886 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -11,6 +11,7 @@
 import distutils.errors
 
 import pytest
+import mock
 
 from . import contexts
 
@@ -19,48 +20,41 @@
 
 pytest.importorskip("distutils.msvc9compiler")
 
-class MockReg:
-    """Mock for distutils.msvc9compiler.Reg. We patch it
-    with an instance of this class that mocks out the
-    functions that access the registry.
-    """
-
-    def __init__(self, hkey_local_machine={}, hkey_current_user={}):
-        self.hklm = hkey_local_machine
-        self.hkcu = hkey_current_user
-
-    def __enter__(self):
-        self.original_read_keys = distutils.msvc9compiler.Reg.read_keys
-        self.original_read_values = distutils.msvc9compiler.Reg.read_values
-
-        _winreg = getattr(distutils.msvc9compiler, '_winreg', None)
-        winreg = getattr(distutils.msvc9compiler, 'winreg', _winreg)
 
-        hives = {
-            winreg.HKEY_CURRENT_USER: self.hkcu,
-            winreg.HKEY_LOCAL_MACHINE: self.hklm,
-        }
+def mock_reg(hkcu=None, hklm=None):
+    """
+    Return a mock for distutils.msvc9compiler.Reg, patched
+    to mock out the functions that access the registry.
+    """
 
-        def read_keys(cls, base, key):
-            """Return list of registry keys."""
-            hive = hives.get(base, {})
-            return [k.rpartition('\\')[2]
-                    for k in hive if k.startswith(key.lower())]
+    _winreg = getattr(distutils.msvc9compiler, '_winreg', None)
+    winreg = getattr(distutils.msvc9compiler, 'winreg', _winreg)
 
-        def read_values(cls, base, key):
-            """Return dict of registry keys and values."""
-            hive = hives.get(base, {})
-            return dict((k.rpartition('\\')[2], hive[k])
-                        for k in hive if k.startswith(key.lower()))
+    hives = {
+        winreg.HKEY_CURRENT_USER: hkcu or {},
+        winreg.HKEY_LOCAL_MACHINE: hklm or {},
+    }
 
-        distutils.msvc9compiler.Reg.read_keys = classmethod(read_keys)
-        distutils.msvc9compiler.Reg.read_values = classmethod(read_values)
+    @classmethod
+    def read_keys(cls, base, key):
+        """Return list of registry keys."""
+        hive = hives.get(base, {})
+        return [
+            k.rpartition('\\')[2]
+            for k in hive if k.startswith(key.lower())
+        ]
 
-        return self
+    @classmethod
+    def read_values(cls, base, key):
+        """Return dict of registry keys and values."""
+        hive = hives.get(base, {})
+        return dict(
+            (k.rpartition('\\')[2], hive[k])
+            for k in hive if k.startswith(key.lower())
+        )
 
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        distutils.msvc9compiler.Reg.read_keys = self.original_read_keys
-        distutils.msvc9compiler.Reg.read_values = self.original_read_values
+    return mock.patch.multiple(distutils.msvc9compiler.Reg,
+        read_keys=read_keys, read_values=read_values)
 
 
 class TestMSVC9Compiler:
@@ -75,7 +69,7 @@ def test_find_vcvarsall_patch(self):
         # No registry entries or environment variable means we should
         # not find anything
         with contexts.environment(VS90COMNTOOLS=None):
-            with MockReg():
+            with mock_reg():
                 assert find_vcvarsall(9.0) is None
 
                 expected = distutils.errors.DistutilsPlatformError
@@ -96,29 +90,33 @@ def test_find_vcvarsall_patch(self):
         open(mock_vcvarsall_bat_2, 'w').close()
         try:
             # Ensure we get the current user's setting first
-            with MockReg(
-                hkey_current_user={key_32: mock_installdir_1},
-                hkey_local_machine={
+            reg = mock_reg(
+                hkcu={
+                    key_32: mock_installdir_1,
+                },
+                hklm={
                     key_32: mock_installdir_2,
                     key_64: mock_installdir_2,
-                }
-            ):
+                },
+            )
+            with reg:
                 assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
 
             # Ensure we get the local machine value if it's there
-            with MockReg(hkey_local_machine={key_32: mock_installdir_2}):
+            with mock_reg(hklm={key_32: mock_installdir_2}):
                 assert mock_vcvarsall_bat_2 == find_vcvarsall(9.0)
 
             # Ensure we prefer the 64-bit local machine key
             # (*not* the Wow6432Node key)
-            with MockReg(
-                hkey_local_machine={
+            reg = mock_reg(
+                hklm={
                     # This *should* only exist on 32-bit machines
                     key_32: mock_installdir_1,
                     # This *should* only exist on 64-bit machines
                     key_64: mock_installdir_2,
                 }
-            ):
+            )
+            with reg:
                 assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
         finally:
             shutil.rmtree(mock_installdir_1)

From fb125b61118422a32af19e8cc88eccd13aed14f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:46:30 -0500
Subject: [PATCH 4754/8469] Split test into two

---
 setuptools/tests/test_msvc9compiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 9ed23e3886..02790ae7c2 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -77,6 +77,8 @@ def test_find_vcvarsall_patch(self):
                     query_vcvarsall(9.0)
                 assert 'aka.ms/vcpython27' in str(exc)
 
+    def test_find_vcvarsall_patch_2(self):
+        find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
         key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
         key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
 

From 5485e8bacd95d03f1ee45343a1ae3afec2ecd882 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 13:49:15 -0500
Subject: [PATCH 4755/8469] Split the first test into two more tests.

---
 setuptools/tests/test_msvc9compiler.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 02790ae7c2..fd344678be 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -57,17 +57,21 @@ def read_values(cls, base, key):
         read_keys=read_keys, read_values=read_values)
 
 
-class TestMSVC9Compiler:
+class TestModulePatch:
 
-    def test_find_vcvarsall_patch(self):
+    def test_patched(self):
+        "Test the module is actually patched"
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
         assert mod_name == "setuptools.msvc9_support", "find_vcvarsall unpatched"
 
+    def test_no_registry_entryies_means_nothing_found(self):
+        """
+        No registry entries or environment variable should lead to an error
+        directing the user to download vcpython27.
+        """
         find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
         query_vcvarsall = distutils.msvc9compiler.query_vcvarsall
 
-        # No registry entries or environment variable means we should
-        # not find anything
         with contexts.environment(VS90COMNTOOLS=None):
             with mock_reg():
                 assert find_vcvarsall(9.0) is None

From 2604aac7bb9e9b38546557fc2baaec98057d5740 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 14:22:33 -0500
Subject: [PATCH 4756/8469] Extract three more tests, using fixtures to unify
 the common aspects.

---
 setuptools/tests/test_msvc9compiler.py | 124 +++++++++++++++++--------
 1 file changed, 83 insertions(+), 41 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index fd344678be..918f889848 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -6,8 +6,7 @@
 """
 
 import os
-import shutil
-import tempfile
+import contextlib
 import distutils.errors
 
 import pytest
@@ -59,6 +58,9 @@ def read_values(cls, base, key):
 
 class TestModulePatch:
 
+    key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
+    key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
+
     def test_patched(self):
         "Test the module is actually patched"
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
@@ -81,49 +83,89 @@ def test_no_registry_entryies_means_nothing_found(self):
                     query_vcvarsall(9.0)
                 assert 'aka.ms/vcpython27' in str(exc)
 
-    def test_find_vcvarsall_patch_2(self):
-        find_vcvarsall = distutils.msvc9compiler.find_vcvarsall
-        key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
-        key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
-
-        # Make two mock files so we can tell whether HCKU entries are
-        # preferred to HKLM entries.
-        mock_installdir_1 = tempfile.mkdtemp()
-        mock_vcvarsall_bat_1 = os.path.join(mock_installdir_1, 'vcvarsall.bat')
-        open(mock_vcvarsall_bat_1, 'w').close()
-        mock_installdir_2 = tempfile.mkdtemp()
-        mock_vcvarsall_bat_2 = os.path.join(mock_installdir_2, 'vcvarsall.bat')
-        open(mock_vcvarsall_bat_2, 'w').close()
-        try:
-            # Ensure we get the current user's setting first
+    @pytest.yield_fixture
+    def user_preferred_setting(self):
+        """
+        Set up environment with different install dirs for user vs. system
+        and yield the user_install_dir for the expected result.
+        """
+        with self.mock_install_dir() as user_install_dir:
+            with self.mock_install_dir() as system_install_dir:
+                reg = mock_reg(
+                    hkcu={
+                        self.key_32: user_install_dir,
+                    },
+                    hklm={
+                        self.key_32: system_install_dir,
+                        self.key_64: system_install_dir,
+                    },
+                )
+                with reg:
+                    yield user_install_dir
+
+    def test_prefer_current_user(self, user_preferred_setting):
+        """
+        Ensure user's settings are preferred.
+        """
+        result = distutils.msvc9compiler.find_vcvarsall(9.0)
+        assert user_preferred_setting == result
+
+    @pytest.yield_fixture
+    def local_machine_setting(self):
+        """
+        Set up environment with only the system environment configured.
+        """
+        with self.mock_install_dir() as system_install_dir:
             reg = mock_reg(
-                hkcu={
-                    key_32: mock_installdir_1,
-                },
                 hklm={
-                    key_32: mock_installdir_2,
-                    key_64: mock_installdir_2,
+                    self.key_32: system_install_dir,
                 },
             )
             with reg:
-                assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
+                yield system_install_dir
 
-            # Ensure we get the local machine value if it's there
-            with mock_reg(hklm={key_32: mock_installdir_2}):
-                assert mock_vcvarsall_bat_2 == find_vcvarsall(9.0)
+    def test_local_machine_recognized(self, local_machine_setting):
+        """
+        Ensure machine setting is honored if user settings are not present.
+        """
+        result = distutils.msvc9compiler.find_vcvarsall(9.0)
+        assert local_machine_setting == result
 
-            # Ensure we prefer the 64-bit local machine key
-            # (*not* the Wow6432Node key)
-            reg = mock_reg(
-                hklm={
-                    # This *should* only exist on 32-bit machines
-                    key_32: mock_installdir_1,
-                    # This *should* only exist on 64-bit machines
-                    key_64: mock_installdir_2,
-                }
-            )
-            with reg:
-                assert mock_vcvarsall_bat_1 == find_vcvarsall(9.0)
-        finally:
-            shutil.rmtree(mock_installdir_1)
-            shutil.rmtree(mock_installdir_2)
+    @pytest.yield_fixture
+    def x64_preferred_setting(self):
+        """
+        Set up environment with 64-bit and 32-bit system settings configured
+        and yield the 64-bit location.
+        """
+        with self.mock_install_dir() as x32_dir:
+            with self.mock_install_dir() as x64_dir:
+                reg = mock_reg(
+                    hklm={
+                        # This *should* only exist on 32-bit machines
+                        self.key_32: x32_dir,
+                        # This *should* only exist on 64-bit machines
+                        self.key_64: x64_dir,
+                    },
+                )
+                with reg:
+                    yield x64_dir
+
+    def test_ensure_64_bit_preferred(self, x64_preferred_setting):
+        """
+        Ensure 64-bit system key is preferred.
+        """
+        result = distutils.msvc9compiler.find_vcvarsall(9.0)
+        assert x64_preferred_setting == result
+
+    @staticmethod
+    @contextlib.contextmanager
+    def mock_install_dir():
+        """
+        Make a mock install dir in a unique location so that tests can
+        distinguish which dir was detected in a given scenario.
+        """
+        with contexts.tempdir() as result:
+            vcvarsall = os.path.join(result, 'vcvarsall.bat')
+            with open(vcvarsall, 'w'):
+                pass
+            yield

From 91754ae31f631bb8bf4e9717799730be07a6331b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 14:25:21 -0500
Subject: [PATCH 4757/8469] Move docstring to test class.

---
 setuptools/tests/test_msvc9compiler.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 918f889848..a0820fff91 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -1,8 +1,5 @@
-"""msvc9compiler monkey patch test
-
-This test ensures that importing setuptools is sufficient to replace
-the standard find_vcvarsall function with our patched version that
-finds the Visual C++ for Python package.
+"""
+Tests for msvc9compiler.
 """
 
 import os
@@ -57,6 +54,11 @@ def read_values(cls, base, key):
 
 
 class TestModulePatch:
+    """
+    Ensure that importing setuptools is sufficient to replace
+    the standard find_vcvarsall function with a version that
+    recognizes the "Visual C++ for Python" package.
+    """
 
     key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
     key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'

From 95c31ede51c28ffe8432a2a51c9879a5ae8bf259 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 14:27:24 -0500
Subject: [PATCH 4758/8469] Update changelog

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1fd1fd4ac8..54368f02b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@ CHANGES
 =======
 
 ----
-next
+10.2
 ----
 
 * Deprecated use of EntryPoint.load(require=False).

From 27e9015a7d5043290fb1f04f5ad0582a294ee43b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 14:29:00 -0500
Subject: [PATCH 4759/8469] Added tag 10.2 for changeset 651d41db5884

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a4071fd761..374a25bc1e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -179,3 +179,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 0c4d18a747a6d39bff8e194a58af949a960d674a 10.0
 4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1
 26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1
+651d41db58849d4fc50e466f4dc458d448480c4e 10.2

From 0c8f0cb4bfe39fd7840c0242dd059269c0266445 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 14:29:29 -0500
Subject: [PATCH 4760/8469] Bumped to 10.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 62ead23a01..82e7963e24 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.2"
+DEFAULT_VERSION = "10.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 6b917706c0..fb86d074b4 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.2'
+__version__ = '10.3'

From fb1b7680cee8b4e751b29f6d46a6fcedb51e4e31 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Fri, 2 Jan 2015 15:31:47 -0600
Subject: [PATCH 4761/8469] Fix regression in entry-point name parsing

See #323 for more details.
---
 pkg_resources/__init__.py   | 2 +-
 tests/test_pkg_resources.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a0b354ff55..ac3807d8a6 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2280,7 +2280,7 @@ def require(self, env=None, installer=None):
 
     pattern = re.compile(
         r'\s*'
-        r'(?P<name>[\w. -]+?)\s*'
+        r'(?P<name>[+\w. -]+?)\s*'
         r'=\s*'
         r'(?P<module>[\w.]+)\s*'
         r'(:\s*(?P<attr>[\w.]+))?\s*'
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 564d7cec4f..4dfd14b3be 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -109,3 +109,11 @@ def test_setuptools_not_imported(self):
         )
         cmd = [sys.executable, '-c', '; '.join(lines)]
         subprocess.check_call(cmd)
+
+
+class TestEntryPoint:
+    """Tests that ensure EntryPoint behaviour doesn't regress."""
+    def test_accepts_old_entry_points(self):
+        """https://bitbucket.org/pypa/setuptools/issue/323/install-issues-with-102"""
+        entry_point_string = 'html+mako = mako.ext.pygmentplugin:MakoHtmlLexer'
+        pkg_resources.EntryPoint.parse(entry_point_string)

From 1f953c4c2f954cc04df15a008cbd32e7bb1dfe04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 16:40:32 -0500
Subject: [PATCH 4762/8469] Update changelog. Fixes #323.

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 54368f02b3..18d664b513 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+10.2.1
+------
+
+* Issue #323: Fix regression in entry point name parsing.
+
 ----
 10.2
 ----

From ef428d7278002b558541300fb7b7a96c8dbac830 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 16:45:16 -0500
Subject: [PATCH 4763/8469] Move tests to be adjacent with other parsing tests.

---
 setuptools/tests/test_resources.py | 5 +++++
 tests/test_pkg_resources.py        | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index ecd45bcad9..94370ff1f6 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -250,6 +250,11 @@ def testParse(self):
         assert ep.attrs == ("foo",)
         assert ep.extras == ()
 
+        # plus in the name
+        spec = "html+mako = mako.ext.pygmentplugin:MakoHtmlLexer"
+        ep = EntryPoint.parse(spec)
+        assert ep.name == 'html+mako'
+
     def testRejects(self):
         for ep in [
             "foo", "x=1=2", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2",
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 4dfd14b3be..564d7cec4f 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -109,11 +109,3 @@ def test_setuptools_not_imported(self):
         )
         cmd = [sys.executable, '-c', '; '.join(lines)]
         subprocess.check_call(cmd)
-
-
-class TestEntryPoint:
-    """Tests that ensure EntryPoint behaviour doesn't regress."""
-    def test_accepts_old_entry_points(self):
-        """https://bitbucket.org/pypa/setuptools/issue/323/install-issues-with-102"""
-        entry_point_string = 'html+mako = mako.ext.pygmentplugin:MakoHtmlLexer'
-        pkg_resources.EntryPoint.parse(entry_point_string)

From a1fab3a5fd6bc0ed9b40885fbcfe7ba199f95493 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 16:45:48 -0500
Subject: [PATCH 4764/8469] Bumped to 10.2.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 82e7963e24..7ca120d305 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.3"
+DEFAULT_VERSION = "10.2.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index fb86d074b4..0e655f8acf 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.3'
+__version__ = '10.2.1'

From aeedadcf7c473f2f171dd9120d10996829144fe4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 16:46:00 -0500
Subject: [PATCH 4765/8469] Added tag 10.2.1 for changeset 1f5de53c079d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 374a25bc1e..388294a42e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -180,3 +180,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1
 26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1
 651d41db58849d4fc50e466f4dc458d448480c4e 10.2
+1f5de53c079d577ead9d80265c9e006503b16457 10.2.1

From 1ec7cafa9e8c8ea06adc582078444df886896830 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 16:46:29 -0500
Subject: [PATCH 4766/8469] Bumped to 10.2.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 7ca120d305..a9aae11f64 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.2.1"
+DEFAULT_VERSION = "10.2.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 0e655f8acf..addf63a642 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.2.1'
+__version__ = '10.2.2'

From 654c26f78a3031c34b81f338d3b6d1a3a87c34da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 17:39:01 -0500
Subject: [PATCH 4767/8469] Removing shlib_test (apparently unused and broken).

---
 tests/shlib_test/hello.c       | 168 ---------------------------------
 tests/shlib_test/hello.pyx     |   4 -
 tests/shlib_test/hellolib.c    |   3 -
 tests/shlib_test/setup.py      |  10 --
 tests/shlib_test/test_hello.py |   7 --
 5 files changed, 192 deletions(-)
 delete mode 100755 tests/shlib_test/hello.c
 delete mode 100755 tests/shlib_test/hello.pyx
 delete mode 100755 tests/shlib_test/hellolib.c
 delete mode 100755 tests/shlib_test/setup.py
 delete mode 100755 tests/shlib_test/test_hello.py

diff --git a/tests/shlib_test/hello.c b/tests/shlib_test/hello.c
deleted file mode 100755
index 9998372ccd..0000000000
--- a/tests/shlib_test/hello.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Generated by Pyrex 0.9.3 on Thu Jan 05 17:47:12 2006 */
-
-#include "Python.h"
-#include "structmember.h"
-#ifndef PY_LONG_LONG
-  #define PY_LONG_LONG LONG_LONG
-#endif
-
-
-typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
-typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
-static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/
-static int __Pyx_EndUnpack(PyObject *, int); /*proto*/
-static int __Pyx_PrintItem(PyObject *); /*proto*/
-static int __Pyx_PrintNewline(void); /*proto*/
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static void __Pyx_ReRaise(void); /*proto*/
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
-static PyObject *__Pyx_GetExcValue(void); /*proto*/
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/
-static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/
-static void __Pyx_WriteUnraisable(char *name); /*proto*/
-static void __Pyx_AddTraceback(char *funcname); /*proto*/
-static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
-static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/
-static int __Pyx_GetVtable(PyObject *dict, void *vtabptr); /*proto*/
-static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, char *modname); /*proto*/
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
-
-static PyObject *__pyx_m;
-static PyObject *__pyx_b;
-static int __pyx_lineno;
-static char *__pyx_filename;
-staticforward char **__pyx_f;
-
-/* Declarations from hello */
-
-char (*(get_hello_msg(void))); /*proto*/
-
-/* Implementation of hello */
-
-static PyObject *__pyx_n_hello;
-
-static PyObject *__pyx_f_5hello_hello(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static PyObject *__pyx_f_5hello_hello(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
-  static char *__pyx_argnames[] = {0};
-  if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
-
-  /* "C:\cygwin\home\pje\setuptools\tests\shlib_test\hello.pyx":4 */
-  __pyx_1 = PyString_FromString(get_hello_msg()); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; goto __pyx_L1;}
-  __pyx_r = __pyx_1;
-  __pyx_1 = 0;
-  goto __pyx_L0;
-
-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
-  goto __pyx_L0;
-  __pyx_L1:;
-  Py_XDECREF(__pyx_1);
-  __Pyx_AddTraceback("hello.hello");
-  __pyx_r = 0;
-  __pyx_L0:;
-  return __pyx_r;
-}
-
-static __Pyx_InternTabEntry __pyx_intern_tab[] = {
-  {&__pyx_n_hello, "hello"},
-  {0, 0}
-};
-
-static struct PyMethodDef __pyx_methods[] = {
-  {"hello", (PyCFunction)__pyx_f_5hello_hello, METH_VARARGS|METH_KEYWORDS, 0},
-  {0, 0, 0, 0}
-};
-
-DL_EXPORT(void) inithello(void); /*proto*/
-DL_EXPORT(void) inithello(void) {
-  __pyx_m = Py_InitModule4("hello", __pyx_methods, 0, 0, PYTHON_API_VERSION);
-  if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
-  __pyx_b = PyImport_AddModule("__builtin__");
-  if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
-  if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
-  if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
-
-  /* "C:\cygwin\home\pje\setuptools\tests\shlib_test\hello.pyx":3 */
-  return;
-  __pyx_L1:;
-  __Pyx_AddTraceback("hello");
-}
-
-static char *__pyx_filenames[] = {
-  "hello.pyx",
-};
-statichere char **__pyx_f = __pyx_filenames;
-
-/* Runtime support code */
-
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t) {
-    while (t->p) {
-        *t->p = PyString_InternFromString(t->s);
-        if (!*t->p)
-            return -1;
-        ++t;
-    }
-    return 0;
-}
-
-#include "compile.h"
-#include "frameobject.h"
-#include "traceback.h"
-
-static void __Pyx_AddTraceback(char *funcname) {
-    PyObject *py_srcfile = 0;
-    PyObject *py_funcname = 0;
-    PyObject *py_globals = 0;
-    PyObject *empty_tuple = 0;
-    PyObject *empty_string = 0;
-    PyCodeObject *py_code = 0;
-    PyFrameObject *py_frame = 0;
-    
-    py_srcfile = PyString_FromString(__pyx_filename);
-    if (!py_srcfile) goto bad;
-    py_funcname = PyString_FromString(funcname);
-    if (!py_funcname) goto bad;
-    py_globals = PyModule_GetDict(__pyx_m);
-    if (!py_globals) goto bad;
-    empty_tuple = PyTuple_New(0);
-    if (!empty_tuple) goto bad;
-    empty_string = PyString_FromString("");
-    if (!empty_string) goto bad;
-    py_code = PyCode_New(
-        0,            /*int argcount,*/
-        0,            /*int nlocals,*/
-        0,            /*int stacksize,*/
-        0,            /*int flags,*/
-        empty_string, /*PyObject *code,*/
-        empty_tuple,  /*PyObject *consts,*/
-        empty_tuple,  /*PyObject *names,*/
-        empty_tuple,  /*PyObject *varnames,*/
-        empty_tuple,  /*PyObject *freevars,*/
-        empty_tuple,  /*PyObject *cellvars,*/
-        py_srcfile,   /*PyObject *filename,*/
-        py_funcname,  /*PyObject *name,*/
-        __pyx_lineno,   /*int firstlineno,*/
-        empty_string  /*PyObject *lnotab*/
-    );
-    if (!py_code) goto bad;
-    py_frame = PyFrame_New(
-        PyThreadState_Get(), /*PyThreadState *tstate,*/
-        py_code,             /*PyCodeObject *code,*/
-        py_globals,          /*PyObject *globals,*/
-        0                    /*PyObject *locals*/
-    );
-    if (!py_frame) goto bad;
-    py_frame->f_lineno = __pyx_lineno;
-    PyTraceBack_Here(py_frame);
-bad:
-    Py_XDECREF(py_srcfile);
-    Py_XDECREF(py_funcname);
-    Py_XDECREF(empty_tuple);
-    Py_XDECREF(empty_string);
-    Py_XDECREF(py_code);
-    Py_XDECREF(py_frame);
-}
diff --git a/tests/shlib_test/hello.pyx b/tests/shlib_test/hello.pyx
deleted file mode 100755
index 58ce6919a2..0000000000
--- a/tests/shlib_test/hello.pyx
+++ /dev/null
@@ -1,4 +0,0 @@
-cdef extern char *get_hello_msg()
-
-def hello():
-    return get_hello_msg()
diff --git a/tests/shlib_test/hellolib.c b/tests/shlib_test/hellolib.c
deleted file mode 100755
index 88d65cee92..0000000000
--- a/tests/shlib_test/hellolib.c
+++ /dev/null
@@ -1,3 +0,0 @@
-extern char* get_hello_msg() {
-    return "Hello, world!";
-}
diff --git a/tests/shlib_test/setup.py b/tests/shlib_test/setup.py
deleted file mode 100755
index b0c93996f3..0000000000
--- a/tests/shlib_test/setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from setuptools import setup, Extension, Library
-
-setup(
-    name="shlib_test",
-    ext_modules = [
-        Library("hellolib", ["hellolib.c"]),
-        Extension("hello", ["hello.pyx"], libraries=["hellolib"])
-    ],
-    test_suite="test_hello.HelloWorldTest",
-)
diff --git a/tests/shlib_test/test_hello.py b/tests/shlib_test/test_hello.py
deleted file mode 100755
index 6da02e31d4..0000000000
--- a/tests/shlib_test/test_hello.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from unittest import TestCase
-
-class HelloWorldTest(TestCase):
-    def testHelloMsg(self):
-        from hello import hello
-        self.assertEqual(hello(), "Hello, world!")
-

From fef7cd3c41b12404da3790775474a5fef9a93fbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 17:45:02 -0500
Subject: [PATCH 4768/8469] Should be sufficient to invoke ./bootstrap.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 004a97ebdf..3650e6b6c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,8 @@ python:
   - pypy
 # command to run tests
 script:
- # invoke bootstrap and override egg_info based on setup.py in checkout
+ # update egg_info based on setup.py in checkout
  - python bootstrap.py
- - python setup.py egg_info
 
  - python setup.py ptr --addopts='-rs'
  - python ez_setup.py --version 7.0

From 41f2c5ec8dd669747f3cfd8d6b2ae9a40d219545 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 17:47:29 -0500
Subject: [PATCH 4769/8469] Bump version loaded by ez_setup.py

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3650e6b6c3..0e648b3869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,4 @@ script:
  - python bootstrap.py
 
  - python setup.py ptr --addopts='-rs'
- - python ez_setup.py --version 7.0
+ - python ez_setup.py --version 10.2.1

From 07e879f2f26d85bbb5c7437e7b1ff714774b3ed3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 21:49:37 -0500
Subject: [PATCH 4770/8469] Add output to determine if egg-info is being
 created.

---
 bootstrap.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index cbc1ca9d68..919594f74f 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -28,8 +28,10 @@
     """)
 
 def ensure_egg_info():
-    if not os.path.exists('setuptools.egg-info'):
-        build_egg_info()
+    if os.path.exists('setuptools.egg-info'):
+        return
+    print("adding minimal entry_points")
+    build_egg_info()
 
 
 def build_egg_info():

From e0d05d467ffaae3eae7d8f23c8eb58775a4e5afa Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Fri, 2 Jan 2015 21:51:55 -0500
Subject: [PATCH 4771/8469] Upgrade packaging lib to 15.0

---
 pkg_resources/_vendor/packaging/__about__.py  |  2 +-
 pkg_resources/_vendor/packaging/specifiers.py | 58 +++++++++++++++----
 pkg_resources/_vendor/packaging/version.py    | 25 ++++++++
 pkg_resources/_vendor/vendored.txt            |  2 +-
 4 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index d3e50f1e17..36f1a35c85 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "14.5"
+__version__ = "15.0"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 8022578621..9ad0a635ed 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -458,21 +458,59 @@ def _compare_greater_than_equal(self, prospective, spec):
 
     @_require_version_compare
     def _compare_less_than(self, prospective, spec):
-        # Less than are defined as exclusive operators, this implies that
-        # pre-releases do not match for the same series as the spec. This is
-        # implemented by making <V imply !=V.*.
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
         spec = Version(spec)
-        return (prospective < spec
-                and self._get_operator("!=")(prospective, str(spec) + ".*"))
+
+        # Check to see if the prospective version is less than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective < spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a pre-release version, that we do not accept pre-release
+        # versions for the version mentioned in the specifier (e.g. <3.1 should
+        # not match 3.1.dev0, but should match 3.0.dev0).
+        if not spec.is_prerelease and prospective.is_prerelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # less than the spec version *and* it's not a pre-release of the same
+        # version in the spec.
+        return True
 
     @_require_version_compare
     def _compare_greater_than(self, prospective, spec):
-        # Greater than are defined as exclusive operators, this implies that
-        # pre-releases do not match for the same series as the spec. This is
-        # implemented by making >V imply !=V.*.
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
         spec = Version(spec)
-        return (prospective > spec
-                and self._get_operator("!=")(prospective, str(spec) + ".*"))
+
+        # Check to see if the prospective version is greater than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective > spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a post-release version, that we do not accept
+        # post-release versions for the version mentioned in the specifier
+        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
+        if not spec.is_postrelease and prospective.is_postrelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # Ensure that we do not allow a local version of the version mentioned
+        # in the specifier, which is techincally greater than, to match.
+        if prospective.local is not None:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # greater than the spec version *and* it's not a pre-release of the
+        # same version in the spec.
+        return True
 
     def _compare_arbitrary(self, prospective, spec):
         return str(prospective).lower() == str(spec).lower()
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
index 8d779a48d7..cf8afb16d6 100644
--- a/pkg_resources/_vendor/packaging/version.py
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -95,6 +95,10 @@ def __repr__(self):
     def public(self):
         return self._version
 
+    @property
+    def base_version(self):
+        return self._version
+
     @property
     def local(self):
         return None
@@ -103,6 +107,10 @@ def local(self):
     def is_prerelease(self):
         return False
 
+    @property
+    def is_postrelease(self):
+        return False
+
 
 _legacy_version_component_re = re.compile(
     r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
@@ -269,6 +277,19 @@ def __str__(self):
     def public(self):
         return str(self).split("+", 1)[0]
 
+    @property
+    def base_version(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        return "".join(parts)
+
     @property
     def local(self):
         version_string = str(self)
@@ -279,6 +300,10 @@ def local(self):
     def is_prerelease(self):
         return bool(self._version.dev or self._version.pre)
 
+    @property
+    def is_postrelease(self):
+        return bool(self._version.post)
+
 
 def _parse_letter_version(letter, number):
     if letter:
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 723e026b61..75a31670c6 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==14.5
+packaging==15.0

From 44d61f17fe8c04fc6046fe04a88a076a49ce6c2e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 21:57:30 -0500
Subject: [PATCH 4772/8469] Also print a message here

---
 bootstrap.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.py b/bootstrap.py
index 919594f74f..60a1b88dad 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -45,6 +45,7 @@ def build_egg_info():
 
 
 def run_egg_info():
+    print("Regenerating egg_info")
     subprocess.check_call([sys.executable, 'setup.py', 'egg_info'])
 
 

From 685922ef03d8357a94624b799824bde61d27a9eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:02:21 -0500
Subject: [PATCH 4773/8469] Try generating egg_info twice.

---
 bootstrap.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap.py b/bootstrap.py
index 60a1b88dad..70f962583d 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -45,8 +45,11 @@ def build_egg_info():
 
 
 def run_egg_info():
+    cmd = [sys.executable, 'setup.py', 'egg_info']
     print("Regenerating egg_info")
-    subprocess.check_call([sys.executable, 'setup.py', 'egg_info'])
+    subprocess.check_call(cmd)
+    print("...and again.")
+    subprocess.check_call(cmd)
 
 
 if __name__ == '__main__':

From 20628e6bfa410188168a972e08671e58f01dc0d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:20:30 -0500
Subject: [PATCH 4774/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 18d664b513..62ab43014e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+11.0
+----
+
+* Interop #3: Upgrade to Packaging 15.0; updates to PEP 440 so that >1.7 does
+  not exclude 1.7.1 but does exclude 1.7.0 and 1.7.0.post1.
+
 ------
 10.2.1
 ------

From ae8816bb3febff152a08b7c80d0952059cd34b54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:23:34 -0500
Subject: [PATCH 4775/8469] Add link support for Interopability bugs.

---
 linkify.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linkify.py b/linkify.py
index 1d925abaa8..d845581ce0 100644
--- a/linkify.py
+++ b/linkify.py
@@ -14,6 +14,7 @@
     r"Old Setuptools #(?P<old_setuptools>\d+)",
     r"Jython #(?P<jython>\d+)",
     r"Python #(?P<python>\d+)",
+    r"Interop #(?P<interop>\d+)",
 ]
 
 issue_urls = dict(
@@ -25,6 +26,7 @@
     old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
     jython='http://bugs.jython.org/issue{jython}',
     python='http://bugs.python.org/issue{python}',
+    interop='https://github.com/pypa/interoperability/issues/{interop}',
 )
 
 

From 8217189c27787731912e8c8281a7d713e8682095 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:27:51 -0500
Subject: [PATCH 4776/8469] Bumped to 11.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a9aae11f64..0466a6509b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "10.2.2"
+DEFAULT_VERSION = "11.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index addf63a642..142093be57 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.2.2'
+__version__ = '11.0'

From 93c74ef3ff9d787ffff90d6aceb60fd6f334d618 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:27:52 -0500
Subject: [PATCH 4777/8469] Added tag 11.0 for changeset b4b92805bc0e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 388294a42e..8594f6ad38 100644
--- a/.hgtags
+++ b/.hgtags
@@ -181,3 +181,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1
 651d41db58849d4fc50e466f4dc458d448480c4e 10.2
 1f5de53c079d577ead9d80265c9e006503b16457 10.2.1
+b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0

From b76da40361a632e084ee556910fd392e679e31ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:28:31 -0500
Subject: [PATCH 4778/8469] Bumped to 11.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0466a6509b..740af722d5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.0"
+DEFAULT_VERSION = "11.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 142093be57..1b1703fdb9 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.0'
+__version__ = '11.1'

From cf269fdecffcf8dc2f07fa1f3da383be6a336587 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 2 Jan 2015 22:36:53 -0500
Subject: [PATCH 4779/8469] Correct project name

---
 linkify.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkify.py b/linkify.py
index d845581ce0..e7b3ca7be6 100644
--- a/linkify.py
+++ b/linkify.py
@@ -26,7 +26,7 @@
     old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
     jython='http://bugs.jython.org/issue{jython}',
     python='http://bugs.python.org/issue{python}',
-    interop='https://github.com/pypa/interoperability/issues/{interop}',
+    interop='https://github.com/pypa/interoperability-peps/issues/{interop}',
 )
 
 

From ba8336727d818011c3bdd19c02f0ad92f59a5c7a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 02:16:32 -0500
Subject: [PATCH 4780/8469] Moved TestScriptHeader tests to more appropriate
 module.

---
 setuptools/tests/test_easy_install.py | 70 ++++++++++++++++++++++++++-
 setuptools/tests/test_resources.py    | 69 +-------------------------
 2 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 30789e8397..b8918b1732 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,3 +1,7 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# NOTE: the shebang and encoding lines are for TestScriptHeader do not remove
+
 """Easy install Tests
 """
 from __future__ import absolute_import
@@ -16,10 +20,13 @@
 import mock
 
 from setuptools import sandbox
+from setuptools import compat
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
-    easy_install, fix_jython_executable, get_script_args, nt_quote_arg)
+    easy_install, fix_jython_executable, get_script_args, nt_quote_arg,
+    get_script_header,
+)
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -414,3 +421,64 @@ def make_trivial_sdist(dist_path, setup_py):
     setup_py_file.size = len(setup_py_bytes.getvalue())
     with tarfile_open(dist_path, 'w:gz') as dist:
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
+
+
+class TestScriptHeader:
+    non_ascii_exe = '/Users/José/bin/python'
+    exe_with_spaces = r'C:\Program Files\Python33\python.exe'
+
+    def test_get_script_header(self):
+        if not sys.platform.startswith('java') or not is_sh(sys.executable):
+            # This test is for non-Jython platforms
+            expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
+            assert get_script_header('#!/usr/local/bin/python') == expected
+            expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
+            assert get_script_header('#!/usr/bin/python -x') == expected
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.non_ascii_exe)
+            assert candidate == '#!%s -x\n' % self.non_ascii_exe
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.exe_with_spaces)
+            assert candidate == '#!"%s"\n' % self.exe_with_spaces
+
+    def test_get_script_header_jython_workaround(self):
+        # This test doesn't work with Python 3 in some locales
+        if compat.PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
+            return
+
+        class java:
+            class lang:
+                class System:
+                    @staticmethod
+                    def getProperty(property):
+                        return ""
+        sys.modules["java"] = java
+
+        platform = sys.platform
+        sys.platform = 'java1.5.0_13'
+        stdout, stderr = sys.stdout, sys.stderr
+        try:
+            # A mock sys.executable that uses a shebang line (this file)
+            exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
+            assert (
+                get_script_header('#!/usr/local/bin/python', executable=exe)
+                ==
+                '#!/usr/bin/env %s\n' % exe
+            )
+
+            # Ensure we generate what is basically a broken shebang line
+            # when there's options, with a warning emitted
+            sys.stdout = sys.stderr = StringIO()
+            candidate = get_script_header('#!/usr/bin/python -x',
+                executable=exe)
+            assert candidate == '#!%s  -x\n' % exe
+            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
+            sys.stdout = sys.stderr = StringIO()
+            candidate = get_script_header('#!/usr/bin/python',
+                executable=self.non_ascii_exe)
+            assert candidate == '#!%s -x\n' % self.non_ascii_exe
+            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
+        finally:
+            del sys.modules["java"]
+            sys.platform = platform
+            sys.stdout, sys.stderr = stdout, stderr
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 94370ff1f6..39d7ba4904 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -1,7 +1,3 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# NOTE: the shebang and encoding lines are for TestScriptHeader do not remove
-
 import os
 import sys
 import tempfile
@@ -16,9 +12,7 @@
 
 packaging = pkg_resources.packaging
 
-from setuptools.command.easy_install import (get_script_header, is_sh,
-    nt_quote_arg)
-from setuptools.compat import StringIO, iteritems, PY3
+from setuptools.compat import iteritems
 
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
@@ -560,67 +554,6 @@ def testVersionHashable(self):
         )
 
 
-class TestScriptHeader:
-    non_ascii_exe = '/Users/José/bin/python'
-    exe_with_spaces = r'C:\Program Files\Python33\python.exe'
-
-    def test_get_script_header(self):
-        if not sys.platform.startswith('java') or not is_sh(sys.executable):
-            # This test is for non-Jython platforms
-            expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            assert get_script_header('#!/usr/local/bin/python') == expected
-            expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            assert get_script_header('#!/usr/bin/python -x') == expected
-            candidate = get_script_header('#!/usr/bin/python',
-                executable=self.non_ascii_exe)
-            assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            candidate = get_script_header('#!/usr/bin/python',
-                executable=self.exe_with_spaces)
-            assert candidate == '#!"%s"\n' % self.exe_with_spaces
-
-    def test_get_script_header_jython_workaround(self):
-        # This test doesn't work with Python 3 in some locales
-        if PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
-            return
-
-        class java:
-            class lang:
-                class System:
-                    @staticmethod
-                    def getProperty(property):
-                        return ""
-        sys.modules["java"] = java
-
-        platform = sys.platform
-        sys.platform = 'java1.5.0_13'
-        stdout, stderr = sys.stdout, sys.stderr
-        try:
-            # A mock sys.executable that uses a shebang line (this file)
-            exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
-            assert (
-                get_script_header('#!/usr/local/bin/python', executable=exe)
-                ==
-                '#!/usr/bin/env %s\n' % exe
-            )
-
-            # Ensure we generate what is basically a broken shebang line
-            # when there's options, with a warning emitted
-            sys.stdout = sys.stderr = StringIO()
-            candidate = get_script_header('#!/usr/bin/python -x',
-                executable=exe)
-            assert candidate == '#!%s  -x\n' % exe
-            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
-            sys.stdout = sys.stderr = StringIO()
-            candidate = get_script_header('#!/usr/bin/python',
-                executable=self.non_ascii_exe)
-            assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
-        finally:
-            del sys.modules["java"]
-            sys.platform = platform
-            sys.stdout, sys.stderr = stdout, stderr
-
-
 class TestNamespaces:
 
     def setup_method(self, method):

From 26a1521e870855ef89e6481f94293cded8237571 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 02:21:13 -0500
Subject: [PATCH 4781/8469] Remove remaining reference to setuptools from
 test_resources

---
 pkg_resources/__init__.py          | 2 ++
 setuptools/tests/test_resources.py | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ac3807d8a6..f004315a6b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -52,6 +52,8 @@
 else:
     string_types = str, eval('unicode')
 
+iteritems = (lambda i: i.items()) if PY3 else lambda i: i.iteritems()
+
 # capture these to bypass sandboxing
 from os import utime
 try:
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 39d7ba4904..351549fab1 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -12,7 +12,6 @@
 
 packaging = pkg_resources.packaging
 
-from setuptools.compat import iteritems
 
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
@@ -259,7 +258,7 @@ def testRejects(self):
 
     def checkSubMap(self, m):
         assert len(m) == len(self.submap_expect)
-        for key, ep in iteritems(self.submap_expect):
+        for key, ep in pkg_resources.iteritems(self.submap_expect):
             assert repr(m.get(key)) == repr(ep)
 
     submap_expect = dict(

From d0a3a68d5192935730eeab840790f35af971086a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 02:29:01 -0500
Subject: [PATCH 4782/8469] Moved test_resources and test_pkg_resources to
 pkg_resources package.

---
 pkg_resources/tests/__init__.py                       | 0
 {tests => pkg_resources/tests}/test_pkg_resources.py  | 0
 {setuptools => pkg_resources}/tests/test_resources.py | 8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 pkg_resources/tests/__init__.py
 rename {tests => pkg_resources/tests}/test_pkg_resources.py (100%)
 rename {setuptools => pkg_resources}/tests/test_resources.py (98%)

diff --git a/pkg_resources/tests/__init__.py b/pkg_resources/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
similarity index 100%
rename from tests/test_pkg_resources.py
rename to pkg_resources/tests/test_pkg_resources.py
diff --git a/setuptools/tests/test_resources.py b/pkg_resources/tests/test_resources.py
similarity index 98%
rename from setuptools/tests/test_resources.py
rename to pkg_resources/tests/test_resources.py
index 351549fab1..6cc3de0b93 100644
--- a/setuptools/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -206,13 +206,13 @@ class TestEntryPoints:
 
     def assertfields(self, ep):
         assert ep.name == "foo"
-        assert ep.module_name == "setuptools.tests.test_resources"
+        assert ep.module_name == "pkg_resources.tests.test_resources"
         assert ep.attrs == ("TestEntryPoints",)
         assert ep.extras == ("x",)
         assert ep.load() is TestEntryPoints
         assert (
             str(ep) ==
-            "foo = setuptools.tests.test_resources:TestEntryPoints [x]"
+            "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]"
         )
 
     def setup_method(self, method):
@@ -221,13 +221,13 @@ def setup_method(self, method):
 
     def testBasics(self):
         ep = EntryPoint(
-            "foo", "setuptools.tests.test_resources", ["TestEntryPoints"],
+            "foo", "pkg_resources.tests.test_resources", ["TestEntryPoints"],
             ["x"], self.dist
         )
         self.assertfields(ep)
 
     def testParse(self):
-        s = "foo = setuptools.tests.test_resources:TestEntryPoints [x]"
+        s = "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]"
         ep = EntryPoint.parse(s, self.dist)
         self.assertfields(ep)
 

From 8c34127f5050967ef4da9be21d7bc717a3d5cdd3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 02:41:47 -0500
Subject: [PATCH 4783/8469] Restore missing import

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b8918b1732..fc1a26d065 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -25,7 +25,7 @@
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, get_script_args, nt_quote_arg,
-    get_script_header,
+    get_script_header, is_sh,
 )
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg

From 4af0a332c3d292932998f2ae550abc7af95f1ede Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 02:48:22 -0500
Subject: [PATCH 4784/8469] Rewrite skip/xfail

---
 setuptools/tests/test_easy_install.py | 36 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fc1a26d065..b364eca23a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -427,25 +427,27 @@ class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
     exe_with_spaces = r'C:\Program Files\Python33\python.exe'
 
+    @pytest.mark.skipif(
+        sys.platform.startswith('java') and is_sh(sys.executable),
+        reason="Test cannot run under java when executable is sh"
+    )
     def test_get_script_header(self):
-        if not sys.platform.startswith('java') or not is_sh(sys.executable):
-            # This test is for non-Jython platforms
-            expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            assert get_script_header('#!/usr/local/bin/python') == expected
-            expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
-            assert get_script_header('#!/usr/bin/python -x') == expected
-            candidate = get_script_header('#!/usr/bin/python',
-                executable=self.non_ascii_exe)
-            assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            candidate = get_script_header('#!/usr/bin/python',
-                executable=self.exe_with_spaces)
-            assert candidate == '#!"%s"\n' % self.exe_with_spaces
-
+        expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
+        assert get_script_header('#!/usr/local/bin/python') == expected
+        expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
+        assert get_script_header('#!/usr/bin/python -x') == expected
+        candidate = get_script_header('#!/usr/bin/python',
+            executable=self.non_ascii_exe)
+        assert candidate == '#!%s -x\n' % self.non_ascii_exe
+        candidate = get_script_header('#!/usr/bin/python',
+            executable=self.exe_with_spaces)
+        assert candidate == '#!"%s"\n' % self.exe_with_spaces
+
+    @pytest.mark.xfail(
+        compat.PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"),
+        reason="Test fails in this locale on Python 3"
+    )
     def test_get_script_header_jython_workaround(self):
-        # This test doesn't work with Python 3 in some locales
-        if compat.PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"):
-            return
-
         class java:
             class lang:
                 class System:

From f74153cd1cfee6bef9a8628937fa2eee7d2da4c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:01:02 -0500
Subject: [PATCH 4785/8469] Test is passing when LC_CTYPE isn't present.
 According to the original ticket, Distribute 103, this test was only failing
 for "C" and "POSIX", so only expect the failure there.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b364eca23a..834b83e4f7 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -444,7 +444,7 @@ def test_get_script_header(self):
         assert candidate == '#!"%s"\n' % self.exe_with_spaces
 
     @pytest.mark.xfail(
-        compat.PY3 and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"),
+        compat.PY3 and os.environ.get("LC_CTYPE") in ("C", "POSIX"),
         reason="Test fails in this locale on Python 3"
     )
     def test_get_script_header_jython_workaround(self):

From 1434374b64408c1a21ce75de662ca2a65e72ab1c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:07:13 -0500
Subject: [PATCH 4786/8469] Use mock to patch sys.modules

---
 setuptools/tests/test_easy_install.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 834b83e4f7..a27fef1313 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -447,15 +447,9 @@ def test_get_script_header(self):
         compat.PY3 and os.environ.get("LC_CTYPE") in ("C", "POSIX"),
         reason="Test fails in this locale on Python 3"
     )
+    @mock.patch.dict(sys.modules, java=mock.Mock(lang=mock.Mock(System=
+        mock.Mock(getProperty=mock.Mock(return_value="")))))
     def test_get_script_header_jython_workaround(self):
-        class java:
-            class lang:
-                class System:
-                    @staticmethod
-                    def getProperty(property):
-                        return ""
-        sys.modules["java"] = java
-
         platform = sys.platform
         sys.platform = 'java1.5.0_13'
         stdout, stderr = sys.stdout, sys.stderr
@@ -481,6 +475,5 @@ def getProperty(property):
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
             assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
         finally:
-            del sys.modules["java"]
             sys.platform = platform
             sys.stdout, sys.stderr = stdout, stderr

From f3875aa79c616d605b86a7c60c35c627401a4953 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:10:21 -0500
Subject: [PATCH 4787/8469] Use mock to patch sys.platform

---
 setuptools/tests/test_easy_install.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a27fef1313..cd02348001 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -449,9 +449,8 @@ def test_get_script_header(self):
     )
     @mock.patch.dict(sys.modules, java=mock.Mock(lang=mock.Mock(System=
         mock.Mock(getProperty=mock.Mock(return_value="")))))
+    @mock.patch('sys.platform', 'java1.5.0_13')
     def test_get_script_header_jython_workaround(self):
-        platform = sys.platform
-        sys.platform = 'java1.5.0_13'
         stdout, stderr = sys.stdout, sys.stderr
         try:
             # A mock sys.executable that uses a shebang line (this file)
@@ -475,5 +474,4 @@ def test_get_script_header_jython_workaround(self):
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
             assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
         finally:
-            sys.platform = platform
             sys.stdout, sys.stderr = stdout, stderr

From a1ef38f99bc7df9464c4a2bcb3c374a9c81da6d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:16:28 -0500
Subject: [PATCH 4788/8469] Use contexts.quiet for stdout/stderr trapping

---
 setuptools/tests/test_easy_install.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index cd02348001..f45e5c63ad 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -451,8 +451,7 @@ def test_get_script_header(self):
         mock.Mock(getProperty=mock.Mock(return_value="")))))
     @mock.patch('sys.platform', 'java1.5.0_13')
     def test_get_script_header_jython_workaround(self):
-        stdout, stderr = sys.stdout, sys.stderr
-        try:
+        with contexts.quiet() as (stdout, stderr):
             # A mock sys.executable that uses a shebang line (this file)
             exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
             assert (
@@ -463,15 +462,13 @@ def test_get_script_header_jython_workaround(self):
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted
-            sys.stdout = sys.stderr = StringIO()
             candidate = get_script_header('#!/usr/bin/python -x',
                 executable=exe)
             assert candidate == '#!%s  -x\n' % exe
-            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
-            sys.stdout = sys.stderr = StringIO()
+            assert 'Unable to adapt shebang line' in stderr.getvalue()
+
+        with contexts.quiet() as (stdout, stderr):
             candidate = get_script_header('#!/usr/bin/python',
                 executable=self.non_ascii_exe)
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            assert 'Unable to adapt shebang line' in sys.stdout.getvalue()
-        finally:
-            sys.stdout, sys.stderr = stdout, stderr
+            assert 'Unable to adapt shebang line' in stderr.getvalue()

From 75501354959789632a7f133edc1fc90decf061c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:18:01 -0500
Subject: [PATCH 4789/8469] Pull logic out of the context

---
 setuptools/tests/test_easy_install.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f45e5c63ad..fac13104d3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -451,14 +451,15 @@ def test_get_script_header(self):
         mock.Mock(getProperty=mock.Mock(return_value="")))))
     @mock.patch('sys.platform', 'java1.5.0_13')
     def test_get_script_header_jython_workaround(self):
+        # A mock sys.executable that uses a shebang line (this file)
+        exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
+        assert (
+            get_script_header('#!/usr/local/bin/python', executable=exe)
+            ==
+            '#!/usr/bin/env %s\n' % exe
+        )
+
         with contexts.quiet() as (stdout, stderr):
-            # A mock sys.executable that uses a shebang line (this file)
-            exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
-            assert (
-                get_script_header('#!/usr/local/bin/python', executable=exe)
-                ==
-                '#!/usr/bin/env %s\n' % exe
-            )
 
             # Ensure we generate what is basically a broken shebang line
             # when there's options, with a warning emitted

From 93847bd1cad5f5a058a18e06630ab0c22099677f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:19:39 -0500
Subject: [PATCH 4790/8469] Extract variable for clearer assertion.

---
 setuptools/tests/test_easy_install.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fac13104d3..befbd2fa60 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -453,11 +453,8 @@ def test_get_script_header(self):
     def test_get_script_header_jython_workaround(self):
         # A mock sys.executable that uses a shebang line (this file)
         exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
-        assert (
-            get_script_header('#!/usr/local/bin/python', executable=exe)
-            ==
-            '#!/usr/bin/env %s\n' % exe
-        )
+        header = get_script_header('#!/usr/local/bin/python', executable=exe)
+        assert header == '#!/usr/bin/env %s\n' % exe
 
         with contexts.quiet() as (stdout, stderr):
 

From 63c14c76f8976864b90263da26eaa09f531e61b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:23:26 -0500
Subject: [PATCH 4791/8469] Rewrite comment

---
 setuptools/tests/test_easy_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index befbd2fa60..f93dbd4cd8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -457,9 +457,8 @@ def test_get_script_header_jython_workaround(self):
         assert header == '#!/usr/bin/env %s\n' % exe
 
         with contexts.quiet() as (stdout, stderr):
-
-            # Ensure we generate what is basically a broken shebang line
-            # when there's options, with a warning emitted
+            # When options are included, generate a broken shebang line
+            # with a warning emitted
             candidate = get_script_header('#!/usr/bin/python -x',
                 executable=exe)
             assert candidate == '#!%s  -x\n' % exe

From 29f9540d973d5e2f5dbc5dd631287b6f059c8630 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:35:38 -0500
Subject: [PATCH 4792/8469] Remove dependence of the script on its own file,
 but instead generate the necessary file in a temporary directory.

---
 setuptools/tests/test_easy_install.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f93dbd4cd8..cfc4d6bf28 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# NOTE: the shebang and encoding lines are for TestScriptHeader do not remove
+#! -*- coding: utf-8 -*-
 
 """Easy install Tests
 """
@@ -450,9 +448,17 @@ def test_get_script_header(self):
     @mock.patch.dict(sys.modules, java=mock.Mock(lang=mock.Mock(System=
         mock.Mock(getProperty=mock.Mock(return_value="")))))
     @mock.patch('sys.platform', 'java1.5.0_13')
-    def test_get_script_header_jython_workaround(self):
-        # A mock sys.executable that uses a shebang line (this file)
-        exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py')
+    def test_get_script_header_jython_workaround(self, tmpdir):
+        # Create a mock sys.executable that uses a shebang line
+        header = DALS("""
+            #!/usr/bin/python
+            # -*- coding: utf-8 -*-
+            """)
+        exe = tmpdir / 'exe.py'
+        with exe.open('w') as f:
+            f.write(header)
+        exe = str(exe)
+
         header = get_script_header('#!/usr/local/bin/python', executable=exe)
         assert header == '#!/usr/bin/env %s\n' % exe
 

From a849ee957f3ba12945278f88e473eb3612faf4b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Jan 2015 03:39:21 -0500
Subject: [PATCH 4793/8469] It appears as if Python 2.6 gets its warnings on a
 different pipe.

---
 setuptools/tests/test_easy_install.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index cfc4d6bf28..042711786a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -462,16 +462,20 @@ def test_get_script_header_jython_workaround(self, tmpdir):
         header = get_script_header('#!/usr/local/bin/python', executable=exe)
         assert header == '#!/usr/bin/env %s\n' % exe
 
+        expect_out = 'stdout' if sys.version_info < (2,7) else 'stderr'
+
         with contexts.quiet() as (stdout, stderr):
             # When options are included, generate a broken shebang line
             # with a warning emitted
             candidate = get_script_header('#!/usr/bin/python -x',
                 executable=exe)
             assert candidate == '#!%s  -x\n' % exe
-            assert 'Unable to adapt shebang line' in stderr.getvalue()
+            output = locals()[expect_out]
+            assert 'Unable to adapt shebang line' in output.getvalue()
 
         with contexts.quiet() as (stdout, stderr):
             candidate = get_script_header('#!/usr/bin/python',
                 executable=self.non_ascii_exe)
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            assert 'Unable to adapt shebang line' in stderr.getvalue()
+            output = locals()[expect_out]
+            assert 'Unable to adapt shebang line' in output.getvalue()

From 9d6a6e5927ae0e67164383e419f3145fc154467e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 11:35:16 -0500
Subject: [PATCH 4794/8469] Use except/as, now supported by Python 2.6

---
 pkg_resources/__init__.py             | 10 ++++------
 setuptools/command/easy_install.py    | 12 ++++--------
 setuptools/command/sdist.py           |  3 ++-
 setuptools/command/upload_docs.py     |  3 +--
 setuptools/dist.py                    |  3 +--
 setuptools/msvc9_support.py           |  3 +--
 setuptools/package_index.py           | 15 +++++----------
 setuptools/sandbox.py                 |  3 +--
 setuptools/tests/test_packageindex.py | 12 ++++--------
 setuptools/tests/test_sdist.py        | 12 ++++--------
 10 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f004315a6b..41d3eb388a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -843,8 +843,7 @@ def find_plugins(self, plugin_env, full_env=None, installer=None,
                 try:
                     resolvees = shadow_set.resolve(req, env, installer)
 
-                except ResolutionError:
-                    v = sys.exc_info()[1]
+                except ResolutionError as v:
                     # save error info
                     error_info[dist] = v
                     if fallback:
@@ -1340,8 +1339,8 @@ def is_invalid_marker(cls, text):
         """
         try:
             cls.evaluate_marker(text)
-        except SyntaxError:
-            return cls.normalize_exception(sys.exc_info()[1])
+        except SyntaxError as e:
+            return cls.normalize_exception(e)
         return False
 
     @staticmethod
@@ -1456,8 +1455,7 @@ def _markerlib_evaluate(cls, text):
             env[new_key] = env.pop(key)
         try:
             result = _markerlib.interpret(text, env)
-        except NameError:
-            e = sys.exc_info()[1]
+        except NameError as e:
             raise SyntaxError(e.args[0])
         return result
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 1a2f56ae60..02ce7636dc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -698,13 +698,11 @@ def process_distribution(self, requirement, dist, deps=True, *info):
             distros = WorkingSet([]).resolve(
                 [requirement], self.local_index, self.easy_install
             )
-        except DistributionNotFound:
-            e = sys.exc_info()[1]
+        except DistributionNotFound as e:
             raise DistutilsError(
                 "Could not find required distribution %s" % e.args
             )
-        except VersionConflict:
-            e = sys.exc_info()[1]
+        except VersionConflict as e:
             raise DistutilsError(
                 "Installed distribution %s conflicts with requirement %s"
                 % e.args
@@ -1044,8 +1042,7 @@ def run_setup(self, setup_script, setup_base, args):
         )
         try:
             run_setup(setup_script, args)
-        except SystemExit:
-            v = sys.exc_info()[1]
+        except SystemExit as v:
             raise DistutilsError("Setup script exited with %s" % (v.args[0],))
 
     def build_and_install(self, setup_script, setup_base):
@@ -1889,8 +1886,7 @@ def chmod(path, mode):
     log.debug("changing mode of %s to %o", path, mode)
     try:
         _chmod(path, mode)
-    except os.error:
-        e = sys.exc_info()[1]
+    except os.error as e:
         log.debug("chmod failed: %s", e)
 
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 3d33df80ee..851a177524 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -70,7 +70,8 @@ def __read_template_hack(self):
         try:
             orig.sdist.read_template(self)
         except:
-            sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
+            _, _, tb = sys.exc_info()
+            tb.tb_next.tb_frame.f_locals['template'].close()
             raise
 
     # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index cd6c300c9f..001ee936e4 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -169,8 +169,7 @@ def upload_file(self, filename):
             conn.putheader('Authorization', auth)
             conn.endheaders()
             conn.send(body)
-        except socket.error:
-            e = sys.exc_info()[1]
+        except socket.error as e:
             self.announce(str(e), log.ERROR)
             return
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index eb14644488..1917a610e3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -131,8 +131,7 @@ def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:
         pkg_resources.EntryPoint.parse_map(value)
-    except ValueError:
-        e = sys.exc_info()[1]
+    except ValueError as e:
         raise DistutilsSetupError(e)
 
 def check_test_suite(dist, attr, value):
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index d0be70e2a9..e76d70f079 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -50,8 +50,7 @@ def find_vcvarsall(version):
 def query_vcvarsall(version, *args, **kwargs):
     try:
         return unpatched['query_vcvarsall'](version, *args, **kwargs)
-    except distutils.errors.DistutilsPlatformError:
-        exc = sys.exc_info()[1]
+    except distutils.errors.DistutilsPlatformError as exc:
         if exc and "vcvarsall.bat" in exc.args[0]:
             message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
             if int(version) == 9:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 58572ce663..5ed19130d7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -699,25 +699,21 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url, self.opener)
-        except (ValueError, httplib.InvalidURL):
-            v = sys.exc_info()[1]
+        except (ValueError, httplib.InvalidURL) as v:
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
             else:
                 raise DistutilsError('%s %s' % (url, msg))
-        except urllib2.HTTPError:
-            v = sys.exc_info()[1]
+        except urllib2.HTTPError as v:
             return v
-        except urllib2.URLError:
-            v = sys.exc_info()[1]
+        except urllib2.URLError as v:
             if warning:
                 self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason))
-        except httplib.BadStatusLine:
-            v = sys.exc_info()[1]
+        except httplib.BadStatusLine as v:
             if warning:
                 self.warn(warning, v.line)
             else:
@@ -726,8 +722,7 @@ def open_url(self, url, warning=None):
                     'down, %s' %
                     (url, v.line)
                 )
-        except httplib.HTTPException:
-            v = sys.exc_info()[1]
+        except httplib.HTTPException as v:
             if warning:
                 self.warn(warning, v)
             else:
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index b90d1e1bb6..7971f42c1c 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -199,8 +199,7 @@ def runner():
                 ns = dict(__file__=setup_script, __name__='__main__')
                 _execfile(setup_script, ns)
             DirectorySandbox(setup_dir).run(runner)
-        except SystemExit:
-            v = sys.exc_info()[1]
+        except SystemExit as v:
             if v.args and v.args[0]:
                 raise
             # Normal exit, just return
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 3e9d1d84e9..dcd90d6fe7 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -15,8 +15,7 @@ def test_bad_url_bad_port(self):
         url = 'http://127.0.0.1:0/nonesuch/test_package_index'
         try:
             v = index.open_url(url)
-        except Exception:
-            v = sys.exc_info()[1]
+        except Exception as v:
             assert url in str(v)
         else:
             assert isinstance(v, HTTPError)
@@ -32,8 +31,7 @@ def test_bad_url_typo(self):
         url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk'
         try:
             v = index.open_url(url)
-        except Exception:
-            v = sys.exc_info()[1]
+        except Exception as v:
             assert url in str(v)
         else:
             assert isinstance(v, HTTPError)
@@ -50,8 +48,7 @@ def _urlopen(*args):
         url = 'http://example.com'
         try:
             v = index.open_url(url)
-        except Exception:
-            v = sys.exc_info()[1]
+        except Exception as v:
             assert 'line' in str(v)
         else:
             raise AssertionError('Should have raise here!')
@@ -68,8 +65,7 @@ def test_bad_url_double_scheme(self):
         url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk'
         try:
             index.open_url(url)
-        except distutils.errors.DistutilsError:
-            error = sys.exc_info()[1]
+        except distutils.errors.DistutilsError as error:
             msg = unicode(error)
             assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
             return
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 943a5deec5..68f83ca79b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -174,8 +174,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # The manifest should be UTF-8 encoded
         try:
             u_contents = contents.decode('UTF-8')
-        except UnicodeDecodeError:
-            e = sys.exc_info()[1]
+        except UnicodeDecodeError as e:
             self.fail(e)
 
         # The manifest should contain the UTF-8 filename
@@ -217,8 +216,7 @@ def test_write_manifest_allows_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError:
-                e = sys.exc_info()[1]
+            except UnicodeDecodeError as e:
                 self.fail(e)
 
             # The manifest should contain the UTF-8 filename
@@ -258,8 +256,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             # The manifest should be UTF-8 encoded
             try:
                 contents.decode('UTF-8')
-            except UnicodeDecodeError:
-                e = sys.exc_info()[1]
+            except UnicodeDecodeError as e:
                 self.fail(e)
 
             # The Latin-1 filename should have been skipped
@@ -328,8 +325,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             with quiet():
                 try:
                     cmd.read_manifest()
-                except UnicodeDecodeError:
-                    e = sys.exc_info()[1]
+                except UnicodeDecodeError as e:
                     self.fail(e)
 
             # The Latin-1 filename should have been skipped

From 0a8b9a3152c736d8e2f8a01f5a9547546b907de7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 11:55:34 -0500
Subject: [PATCH 4795/8469] And again in doctest

---
 pkg_resources/api_tests.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 50e04b8737..a6c25a378f 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -210,8 +210,7 @@ working set triggers a ``pkg_resources.VersionConflict`` error:
 
     >>> try:
     ...     ws.find(Requirement.parse("Bar==1.0"))
-    ... except pkg_resources.VersionConflict:
-    ...     exc = sys.exc_info()[1]
+    ... except pkg_resources.VersionConflict as exc:
     ...     print(str(exc))
     ... else:
     ...     raise AssertionError("VersionConflict was not raised")

From 3593a64ed6755876702ce362e1dfc87849c0952b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 12:09:27 -0500
Subject: [PATCH 4796/8469] Skip integration tests when one of the packages
 under test is already installed, as the installation will fail in that case.

---
 setuptools/tests/test_integration.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 3a6abeaa44..92a27080f9 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -14,6 +14,17 @@
 from setuptools.dist import Distribution
 
 
+def setup_module(module):
+    packages = 'stevedore', 'virtualenvwrapper', 'pbr', 'novaclient'
+    for pkg in packages:
+        try:
+            __import__(pkg)
+            tmpl = "Integration tests cannot run when {pkg} is installed"
+            pytest.skip(tmpl.format(**locals()))
+        except ImportError:
+            pass
+
+
 @pytest.fixture
 def install_context(request, tmpdir, monkeypatch):
     """Fixture to set up temporary installation directory.

From fba8ee7abecb12726293438e8af19d7c3fa54bb8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 12:22:53 -0500
Subject: [PATCH 4797/8469] Remove try/except/fail - Exceptions are failures by
 default.

---
 pkg_resources/tests/test_resources.py |  6 ++----
 setuptools/tests/test_easy_install.py | 12 +++---------
 setuptools/tests/test_sandbox.py      |  6 ++----
 setuptools/tests/test_sdist.py        | 20 ++++----------------
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 6cc3de0b93..82a987b7a2 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -593,10 +593,8 @@ def test_two_levels_deep(self):
             pkg2_init.close()
         import pkg1
         assert "pkg1" in pkg_resources._namespace_packages
-        try:
-            import pkg1.pkg2
-        except ImportError:
-            self.fail("Setuptools tried to import the parent namespace package")
+        # attempt to import pkg2 from site-pkgs2
+        import pkg1.pkg2
         # check the _namespace_packages dict
         assert "pkg1.pkg2" in pkg_resources._namespace_packages
         assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 042711786a..7baa989a31 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -250,8 +250,6 @@ def test_setup_requires(self):
             with contexts.quiet():
                 with self.patched_setup_context():
                     run_setup(test_setup_py, ['install'])
-        except SandboxViolation:
-            self.fail('Installation caused SandboxViolation')
         except IndexError:
             # Test fails in some cases due to bugs in Python
             # See https://bitbucket.org/pypa/setuptools/issue/201
@@ -353,13 +351,9 @@ def test_setup_requires_overrides_version_conflict(self):
                 test_pkg = create_setup_requires_package(temp_dir)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with contexts.quiet() as (stdout, stderr):
-                    try:
-                        # Don't even need to install the package, just
-                        # running the setup.py at all is sufficient
-                        run_setup(test_setup_py, ['--name'])
-                    except VersionConflict:
-                        self.fail('Installing setup.py requirements '
-                            'caused a VersionConflict')
+                    # Don't even need to install the package, just
+                    # running the setup.py at all is sufficient
+                    run_setup(test_setup_py, ['--name'])
 
                 lines = stdout.readlines()
                 assert len(lines) > 0
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 6e5ce04a47..cadc4812a7 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -33,10 +33,8 @@ def test_win32com(self, tmpdir):
         target = os.path.join(gen_py, 'test_write')
         sandbox = DirectorySandbox(str(tmpdir))
         try:
-            try:
-                sandbox.run(self._file_writer(target))
-            except SandboxViolation:
-                self.fail("Could not create gen_py file due to SandboxViolation")
+            # attempt to create gen_py file
+            sandbox.run(self._file_writer(target))
         finally:
             if os.path.exists(target):
                 os.remove(target)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 68f83ca79b..d3494d7a69 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -172,10 +172,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         manifest.close()
 
         # The manifest should be UTF-8 encoded
-        try:
-            u_contents = contents.decode('UTF-8')
-        except UnicodeDecodeError as e:
-            self.fail(e)
+        u_contents = contents.decode('UTF-8')
 
         # The manifest should contain the UTF-8 filename
         if PY2:
@@ -214,10 +211,7 @@ def test_write_manifest_allows_utf8_filenames(self):
             manifest.close()
 
             # The manifest should be UTF-8 encoded
-            try:
-                contents.decode('UTF-8')
-            except UnicodeDecodeError as e:
-                self.fail(e)
+            contents.decode('UTF-8')
 
             # The manifest should contain the UTF-8 filename
             assert posix(filename) in contents
@@ -254,10 +248,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             manifest.close()
 
             # The manifest should be UTF-8 encoded
-            try:
-                contents.decode('UTF-8')
-            except UnicodeDecodeError as e:
-                self.fail(e)
+            contents.decode('UTF-8')
 
             # The Latin-1 filename should have been skipped
             assert posix(filename) not in contents
@@ -323,10 +314,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             # Re-read manifest
             cmd.filelist.files = []
             with quiet():
-                try:
-                    cmd.read_manifest()
-                except UnicodeDecodeError as e:
-                    self.fail(e)
+                cmd.read_manifest()
 
             # The Latin-1 filename should have been skipped
             filename = filename.decode('latin-1')

From db8efa2a8141205c405cd36f8c8a1aa0b1b7defa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 12:25:38 -0500
Subject: [PATCH 4798/8469] Extract variable

---
 pkg_resources/tests/test_resources.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 82a987b7a2..fbb9db62ea 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -210,10 +210,8 @@ def assertfields(self, ep):
         assert ep.attrs == ("TestEntryPoints",)
         assert ep.extras == ("x",)
         assert ep.load() is TestEntryPoints
-        assert (
-            str(ep) ==
-            "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]"
-        )
+        expect = "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]"
+        assert str(ep) == expect
 
     def setup_method(self, method):
         self.dist = Distribution.from_filename(

From d8de6c98d879adbe5b8df731a5b61c06a48b9a2f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 12:43:13 -0500
Subject: [PATCH 4799/8469] Add another assertion on the exception.

---
 pkg_resources/tests/test_resources.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index fbb9db62ea..cf16bf0359 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -172,9 +172,12 @@ def testResolve(self):
         # Activation list now includes resolved dependency
         assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) ==[Foo,Baz]
         # Requests for conflicting versions produce VersionConflict
-        with pytest.raises(VersionConflict):
+        with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
 
+        msg = 'Foo 0.9 is installed but Foo==1.2 is required by []'
+        assert str(vc).endswith(msg)
+
     def testDistroDependsOptions(self):
         d = self.distRequires("""
             Twisted>=1.5

From 06b95e98f06916ccbd04b60e9d3866e3d6bf7ae2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 12:44:16 -0500
Subject: [PATCH 4800/8469] Remove unreachable branch

---
 pkg_resources/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 41d3eb388a..bcee9d285c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -627,8 +627,7 @@ def find(self, req):
         if dist is not None and dist not in req:
             # XXX add more info
             raise VersionConflict(dist, req)
-        else:
-            return dist
+        return dist
 
     def iter_entry_points(self, group, name=None):
         """Yield entry point objects from `group` matching `name`

From 880ccea0220509bfaf483a50beefc128299a5b03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 13:00:50 -0500
Subject: [PATCH 4801/8469] Add test for WorkingSet.find() when a conflict
 occurs.

---
 pkg_resources/tests/test_resources.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index cf16bf0359..79961e6c32 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -205,6 +205,22 @@ def testDistroDependsOptions(self):
             d.requires(["foo"])
 
 
+class TestWorkingSet:
+    def test_find_conflicting(self):
+        ws = WorkingSet([])
+        Foo = Distribution.from_filename("/foo_dir/Foo-1.2.egg")
+        ws.add(Foo)
+
+        # create a requirement that conflicts with Foo 1.2
+        req = next(parse_requirements("Foo<1.2"))
+
+        with pytest.raises(VersionConflict) as vc:
+            ws.find(req)
+
+        msg = 'Foo 1.2 is installed but Foo<1.2 is required'
+        assert str(vc).endswith(msg)
+
+
 class TestEntryPoints:
 
     def assertfields(self, ep):

From 23d5e4a81a61c5e6617fa69fd0b2bc440fa20c45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 13:25:28 -0500
Subject: [PATCH 4802/8469] Test the report method

---
 pkg_resources/__init__.py             | 33 +++++++++++++++++++++++----
 pkg_resources/tests/test_resources.py |  6 ++---
 setuptools/command/easy_install.py    |  5 +---
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index bcee9d285c..0846c0acb8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -317,8 +317,34 @@ class ResolutionError(Exception):
     def __repr__(self):
         return self.__class__.__name__+repr(self.args)
 
+
 class VersionConflict(ResolutionError):
-    """An already-installed version conflicts with the requested version"""
+    """
+    An already-installed version conflicts with the requested version.
+
+    Should be initialized with the installed Distribution, the requested
+    Requirement, and optionally a list of dists that required the installed
+    Distribution.
+    """
+
+    @property
+    def dist(self):
+        return self.args[0]
+
+    @property
+    def req(self):
+        return self.args[1]
+
+    @property
+    def required_by(self):
+        return self.args[2] if len(self.args) > 2 else []
+
+    def report(self):
+        template = "{self.dist} is installed but {self.req} is required"
+        if self.required_by:
+            template += " by {self.required_by}"
+        return template.format(**locals())
+
 
 class DistributionNotFound(ResolutionError):
     """A requested distribution was not found"""
@@ -763,9 +789,8 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                tmpl = "%s is installed but %s is required by %s"
-                args = dist, req, list(required_by.get(req, []))
-                raise VersionConflict(tmpl % args)
+                dependent_req = list(required_by.get(req, []))
+                raise VersionConflict(dist, req, dependent_req)
 
             # push the new requirements onto the stack
             new_requirements = dist.requires(req.extras)[::-1]
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 79961e6c32..5cf3a6579f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -175,8 +175,8 @@ def testResolve(self):
         with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
 
-        msg = 'Foo 0.9 is installed but Foo==1.2 is required by []'
-        assert str(vc).endswith(msg)
+        msg = 'Foo 0.9 is installed but Foo==1.2 is required'
+        assert vc.value.report() == msg
 
     def testDistroDependsOptions(self):
         d = self.distRequires("""
@@ -218,7 +218,7 @@ def test_find_conflicting(self):
             ws.find(req)
 
         msg = 'Foo 1.2 is installed but Foo<1.2 is required'
-        assert str(vc).endswith(msg)
+        assert vc.value.report() == msg
 
 
 class TestEntryPoints:
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 02ce7636dc..d05f4c65af 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -703,10 +703,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
                 "Could not find required distribution %s" % e.args
             )
         except VersionConflict as e:
-            raise DistutilsError(
-                "Installed distribution %s conflicts with requirement %s"
-                % e.args
-            )
+            raise DistutilsError(e.report())
         if self.always_copy or self.always_copy_from:
             # Force all the relevant distros to be copied or activated
             for dist in distros:

From ddb012669aa26fffd6791283e6405fa34bf9f0e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 13:39:31 -0500
Subject: [PATCH 4803/8469] Split out ContextualVersionConflict

---
 pkg_resources/__init__.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0846c0acb8..277da3f948 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -322,11 +322,12 @@ class VersionConflict(ResolutionError):
     """
     An already-installed version conflicts with the requested version.
 
-    Should be initialized with the installed Distribution, the requested
-    Requirement, and optionally a list of dists that required the installed
-    Distribution.
+    Should be initialized with the installed Distribution and the requested
+    Requirement.
     """
 
+    _template = "{self.dist} is installed but {self.req} is required"
+
     @property
     def dist(self):
         return self.args[0]
@@ -335,15 +336,21 @@ def dist(self):
     def req(self):
         return self.args[1]
 
+    def report(self):
+        return self._template.format(**locals())
+
+
+class ContextualVersionConflict(VersionConflict):
+    """
+    A VersionConflict that accepts a third parameter, the list of the
+    requirements that required the installed Distribution.
+    """
+
+    _template = VersionConflict._template + ' by {self.required_by}'
+
     @property
     def required_by(self):
-        return self.args[2] if len(self.args) > 2 else []
-
-    def report(self):
-        template = "{self.dist} is installed but {self.req} is required"
-        if self.required_by:
-            template += " by {self.required_by}"
-        return template.format(**locals())
+        return self.args[2]
 
 
 class DistributionNotFound(ResolutionError):
@@ -790,7 +797,7 @@ def resolve(self, requirements, env=None, installer=None,
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
                 dependent_req = list(required_by.get(req, []))
-                raise VersionConflict(dist, req, dependent_req)
+                raise ContextualVersionConflict(dist, req, dependent_req)
 
             # push the new requirements onto the stack
             new_requirements = dist.requires(req.extras)[::-1]

From a7ae16215eab4487954d546f583e30869696adfc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 13:41:29 -0500
Subject: [PATCH 4804/8469] No need to mutate the set to a list; just use the
 set.

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 277da3f948..522247e06c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -342,7 +342,7 @@ def report(self):
 
 class ContextualVersionConflict(VersionConflict):
     """
-    A VersionConflict that accepts a third parameter, the list of the
+    A VersionConflict that accepts a third parameter, the set of the
     requirements that required the installed Distribution.
     """
 
@@ -796,7 +796,7 @@ def resolve(self, requirements, env=None, installer=None,
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
-                dependent_req = list(required_by.get(req, []))
+                dependent_req = required_by[req]
                 raise ContextualVersionConflict(dist, req, dependent_req)
 
             # push the new requirements onto the stack

From 0529be8ca5487513336da8fd35108c52aa95e582 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 13:58:33 -0500
Subject: [PATCH 4805/8469] Only raise a ContextualVersionConflict when
 dependent requirements are present.

---
 pkg_resources/__init__.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 522247e06c..d51f301bf3 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -339,6 +339,16 @@ def req(self):
     def report(self):
         return self._template.format(**locals())
 
+    def with_context(self, required_by):
+        """
+        If required_by is non-empty, return a version of self that is a
+        ContextualVersionConflict.
+        """
+        if not required_by:
+            return self
+        args = self.args + (required_by,)
+        return ContextualVersionConflict(*args)
+
 
 class ContextualVersionConflict(VersionConflict):
     """
@@ -797,7 +807,7 @@ def resolve(self, requirements, env=None, installer=None,
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
                 dependent_req = required_by[req]
-                raise ContextualVersionConflict(dist, req, dependent_req)
+                raise VersionConflict(dist, req).with_context(dependent_req)
 
             # push the new requirements onto the stack
             new_requirements = dist.requires(req.extras)[::-1]

From 72e3a1ce5986c54fed71da1f65aed4022008511f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:13:05 -0500
Subject: [PATCH 4806/8469] Normalize whitespace

---
 pkg_resources/tests/test_resources.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 5cf3a6579f..13ed4eb19e 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -23,21 +23,23 @@ def safe_repr(obj, short=False):
         return result
     return result[:pkg_resources._MAX_LENGTH] + ' [truncated]...'
 
+
 class Metadata(pkg_resources.EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 
-    def __init__(self,*pairs):
+    def __init__(self, *pairs):
         self.metadata = dict(pairs)
 
-    def has_metadata(self,name):
+    def has_metadata(self, name):
         return name in self.metadata
 
-    def get_metadata(self,name):
+    def get_metadata(self, name):
         return self.metadata[name]
 
-    def get_metadata_lines(self,name):
+    def get_metadata_lines(self, name):
         return pkg_resources.yield_lines(self.get_metadata(name))
 
+
 dist_from_fn = pkg_resources.Distribution.from_filename
 
 class TestDistro:

From cdb9797a1107afd4d7baf021b2af84946d349a2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:24:22 -0500
Subject: [PATCH 4807/8469] Add test capturing expectation when dependencies
 conflict during resolve. Fixes #281

---
 pkg_resources/tests/test_resources.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 13ed4eb19e..7ba65786ed 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -222,6 +222,31 @@ def test_find_conflicting(self):
         msg = 'Foo 1.2 is installed but Foo<1.2 is required'
         assert vc.value.report() == msg
 
+    def test_resolve_conflicts_with_prior(self):
+        """
+        A ContextualVersionConflict should be raised when a requirement
+        conflicts with a prior requirement for a different package.
+        """
+        # Create installation where Foo depends on Baz 1.0 and Bar depends on
+        # Baz 2.0.
+        ws = WorkingSet([])
+        md = Metadata(('depends.txt', "Baz==1.0"))
+        Foo = Distribution.from_filename("/foo_dir/Foo-1.0.egg", metadata=md)
+        ws.add(Foo)
+        md = Metadata(('depends.txt', "Baz==2.0"))
+        Bar = Distribution.from_filename("/foo_dir/Bar-1.0.egg", metadata=md)
+        ws.add(Bar)
+        Baz = Distribution.from_filename("/foo_dir/Baz-1.0.egg")
+        ws.add(Baz)
+        Baz = Distribution.from_filename("/foo_dir/Baz-2.0.egg")
+        ws.add(Baz)
+
+        with pytest.raises(VersionConflict) as vc:
+            ws.resolve(parse_requirements("Foo\nBar\n"))
+
+        msg = "Baz 1.0 is installed but Baz==2.0 is required by {'Bar'}"
+        assert vc.value.report() == msg
+
 
 class TestEntryPoints:
 

From 0b7d713f812e7d84f143bd84f0734ae77169bb68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:28:07 -0500
Subject: [PATCH 4808/8469] Fix test failure on Python 2

---
 pkg_resources/tests/test_resources.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7ba65786ed..f252ddff0e 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -245,6 +245,8 @@ def test_resolve_conflicts_with_prior(self):
             ws.resolve(parse_requirements("Foo\nBar\n"))
 
         msg = "Baz 1.0 is installed but Baz==2.0 is required by {'Bar'}"
+        if pkg_resources.PY2:
+            msg = msg.replace("{'Bar'}", "set(['Bar'])")
         assert vc.value.report() == msg
 
 

From 9974d0bd67352392328a3dda07699e80cc90596c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:35:30 -0500
Subject: [PATCH 4809/8469] Update changelog

---
 CHANGES.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 62ab43014e..8fc9e981ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,17 @@
 CHANGES
 =======
 
+----
+11.1
+----
+
+* Issue #281: Since Setuptools 6.1 (Issue #268), a ValueError would be raised
+  in certain cases where VersionConflict was raised with two arguments, which
+  occurred in ``pkg_resources.WorkingSet.find``. This release adds support
+  for indicating the dependent packages while maintaining support for
+  a VersionConflict when no dependent package context is known. New unit tests
+  now capture the expected interface.
+
 ----
 11.0
 ----

From 89591dcd22840ab6e38a484ca5864c8e1d728223 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:36:22 -0500
Subject: [PATCH 4810/8469] Added tag 11.1 for changeset 6cd2b18f4be2

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8594f6ad38..021c8ff463 100644
--- a/.hgtags
+++ b/.hgtags
@@ -182,3 +182,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 651d41db58849d4fc50e466f4dc458d448480c4e 10.2
 1f5de53c079d577ead9d80265c9e006503b16457 10.2.1
 b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
+6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1

From 3e33c18af2c26a9b01383647157f4c1da275f67f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:36:52 -0500
Subject: [PATCH 4811/8469] Bumped to 11.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 740af722d5..388ff490d7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.1"
+DEFAULT_VERSION = "11.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 1b1703fdb9..a6fd3e36a9 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.1'
+__version__ = '11.2'

From 371c355c4f8b406e0390bf964bb4d7f4266ba3e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 14:40:47 -0500
Subject: [PATCH 4812/8469] Remove references to removed files

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index ed60948bf9..428bbd1e15 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 recursive-include setuptools *.py *.exe *.xml
-recursive-include tests *.py *.c *.pyx
+recursive-include tests *.py
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include _markerlib *.py

From 76dd319a776b3fb7bc7836eb18429ab407379ea9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 15:35:24 -0500
Subject: [PATCH 4813/8469] Reuse list2cmdline for argument quoting.

---
 setuptools/command/easy_install.py | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d05f4c65af..c68fe7577b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -35,6 +35,7 @@
 import site
 import struct
 import contextlib
+import subprocess
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -1825,36 +1826,7 @@ def is_sh(executable):
 
 def nt_quote_arg(arg):
     """Quote a command line argument according to Windows parsing rules"""
-
-    result = []
-    needquote = False
-    nb = 0
-
-    needquote = (" " in arg) or ("\t" in arg)
-    if needquote:
-        result.append('"')
-
-    for c in arg:
-        if c == '\\':
-            nb += 1
-        elif c == '"':
-            # double preceding backslashes, then add a \"
-            result.append('\\' * (nb * 2) + '\\"')
-            nb = 0
-        else:
-            if nb:
-                result.append('\\' * nb)
-                nb = 0
-            result.append(c)
-
-    if nb:
-        result.append('\\' * nb)
-
-    if needquote:
-        result.append('\\' * nb)  # double the trailing backslashes
-        result.append('"')
-
-    return ''.join(result)
+    return subprocess.list2cmdline([arg])
 
 
 def is_python_script(script_text, filename):

From 4108a12a41f3c413f2ea5e8ede3075d67067cba5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 15:49:50 -0500
Subject: [PATCH 4814/8469] Extract method for getting script args

---
 setuptools/command/easy_install.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c68fe7577b..4e05d6707a 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1904,15 +1904,19 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         """
         Yield write_script() argument tuples for a distribution's entrypoints
         """
-        gen_class = cls.get_writer(wininst)
-        spec = str(dist.as_requirement())
+        writer = cls.get_writer(wininst)
         header = get_script_header("", executable, wininst)
+        return cls._gen_args(dist, writer, header)
+
+    @classmethod
+    def _gen_args(cls, dist, writer, header):
+        spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
             for name, ep in dist.get_entry_map(group).items():
-                script_text = gen_class.template % locals()
-                for res in gen_class._get_script_args(type_, name, header,
-                                                      script_text):
+                script_text = writer.template % locals()
+                for res in writer._get_script_args(type_, name, header,
+                        script_text):
                     yield res
 
     @classmethod

From d7cb597b9697e11d3f13e46d6af787ffc82571d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 15:56:19 -0500
Subject: [PATCH 4815/8469] No need to pass the writer - just invoke it
 directly.

---
 setuptools/command/easy_install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4e05d6707a..d5d518de1d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1906,16 +1906,16 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         """
         writer = cls.get_writer(wininst)
         header = get_script_header("", executable, wininst)
-        return cls._gen_args(dist, writer, header)
+        return writer._gen_args(dist, header)
 
     @classmethod
-    def _gen_args(cls, dist, writer, header):
+    def _gen_args(cls, dist, header):
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
             for name, ep in dist.get_entry_map(group).items():
-                script_text = writer.template % locals()
-                for res in writer._get_script_args(type_, name, header,
+                script_text = cls.template % locals()
+                for res in cls._get_script_args(type_, name, header,
                         script_text):
                     yield res
 

From aabff23148950b34d1f956e7d5a63c6cd098662e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 15:59:22 -0500
Subject: [PATCH 4816/8469] Move trailing comment

---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d5d518de1d..e52b47361d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -918,7 +918,8 @@ def install_exe(self, dist_filename, tmpdir):
                     f.write('%s: %s\n' % (k.replace('_', '-').title(), v))
             f.close()
         script_dir = os.path.join(_egg_info, 'scripts')
-        self.delete_blockers(  # delete entry-point scripts to avoid duping
+        # delete entry-point scripts to avoid duping
+        self.delete_blockers(
             [os.path.join(script_dir, args[0]) for args in
              get_script_args(dist)]
         )

From 2170df350911390a4a9a205763475dc7a7a2fb54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 16:21:11 -0500
Subject: [PATCH 4817/8469] Move decision logic about windows/header generation
 closer to install_scripts, as it doesn't appear to be used elsewhere.

---
 setuptools/command/easy_install.py    | 15 +++++++++------
 setuptools/command/install_scripts.py | 10 ++++++----
 setuptools/tests/test_easy_install.py |  6 +++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e52b47361d..d8d11d5030 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -745,7 +745,7 @@ def maybe_move(self, spec, dist_filename, setup_base):
 
     def install_wrapper_scripts(self, dist):
         if not self.exclude_scripts:
-            for args in get_script_args(dist):
+            for args in ScriptWriter._gen_args(dist):
                 self.write_script(*args)
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
@@ -921,7 +921,7 @@ def install_exe(self, dist_filename, tmpdir):
         # delete entry-point scripts to avoid duping
         self.delete_blockers(
             [os.path.join(script_dir, args[0]) for args in
-             get_script_args(dist)]
+             ScriptWriter._gen_args(dist)]
         )
         # Build .egg file from tmpdir
         bdist_egg.make_zipfile(
@@ -1902,15 +1902,18 @@ class ScriptWriter(object):
 
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):
-        """
-        Yield write_script() argument tuples for a distribution's entrypoints
-        """
+        # for backward compatibility
         writer = cls.get_writer(wininst)
         header = get_script_header("", executable, wininst)
         return writer._gen_args(dist, header)
 
     @classmethod
-    def _gen_args(cls, dist, header):
+    def _gen_args(cls, dist, header=None):
+        """
+        Yield write_script() argument tuples for a distribution's entrypoints
+        """
+        if header is None:
+            header = get_script_header("", sys_executable)
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index eb79fa3c73..eb5ed0f28d 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -13,9 +13,9 @@ def initialize_options(self):
         self.no_ep = False
 
     def run(self):
-        from setuptools.command.easy_install import get_script_args
-        from setuptools.command.easy_install import sys_executable
-
+        from setuptools.command.easy_install import (
+            ScriptWriter, sys_executable, get_script_header,
+        )
         self.run_command("egg_info")
         if self.distribution.scripts:
             orig.install_scripts.run(self)  # run first to set up self.outfiles
@@ -35,7 +35,9 @@ def run(self):
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
-        for args in get_script_args(dist, executable, is_wininst):
+        writer = ScriptWriter.get_writer(force_windows=is_wininst)
+        header = get_script_header("", executable, wininst=is_wininst)
+        for args in writer._gen_args(dist, header):
             self.write_script(*args)
 
     def write_script(self, script_name, contents, mode="t", *ignored):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7baa989a31..bc94b0c4ab 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -22,8 +22,8 @@
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup, SandboxViolation
 from setuptools.command.easy_install import (
-    easy_install, fix_jython_executable, get_script_args, nt_quote_arg,
-    get_script_header, is_sh,
+    easy_install, fix_jython_executable, nt_quote_arg,
+    get_script_header, is_sh, ScriptWriter,
 )
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -83,7 +83,7 @@ def test_install_site_py(self):
     def test_get_script_args(self):
         dist = FakeDist()
 
-        args = next(get_script_args(dist))
+        args = next(ScriptWriter._gen_args(dist))
         name, script = itertools.islice(args, 2)
 
         assert script == WANTED

From ef9c3db451e2f24fc8821287e79a1ef48e0c5cf5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 16:43:55 -0500
Subject: [PATCH 4818/8469] Move get_script_header into ScriptWriter

---
 setuptools/command/easy_install.py    | 50 ++++++++++++++-------------
 setuptools/command/install_scripts.py |  4 ++-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d8d11d5030..c2928c7769 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1593,30 +1593,8 @@ def _first_line_re():
 
 
 def get_script_header(script_text, executable=sys_executable, wininst=False):
-    """Create a #! line, getting options (if any) from script_text"""
-    first = (script_text + '\n').splitlines()[0]
-    match = _first_line_re().match(first)
-    options = ''
-    if match:
-        options = match.group(1) or ''
-        if options:
-            options = ' ' + options
-    if wininst:
-        executable = "python.exe"
-    else:
-        executable = nt_quote_arg(executable)
-    hdr = "#!%(executable)s%(options)s\n" % locals()
-    if not isascii(hdr):
-        # Non-ascii path to sys.executable, use -x to prevent warnings
-        if options:
-            if options.strip().startswith('-'):
-                options = ' -x' + options.strip()[1:]
-                # else: punt, we can't do it, let the warning happen anyway
-        else:
-            options = ' -x'
-    executable = fix_jython_executable(executable, options)
-    hdr = "#!%(executable)s%(options)s\n" % locals()
-    return hdr
+    executable = "python.exe" if wininst else nt_quote_arg(executable)
+    return ScriptWriter.get_header(script_text, executable)
 
 
 def auto_chmod(func, arg, exc):
@@ -1903,6 +1881,7 @@ class ScriptWriter(object):
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         # for backward compatibility
+        warnings.warn("Use _gen_args", DeprecationWarning)
         writer = cls.get_writer(wininst)
         header = get_script_header("", executable, wininst)
         return writer._gen_args(dist, header)
@@ -1934,6 +1913,29 @@ def _get_script_args(cls, type_, name, header, script_text):
         # Simply write the stub with no extension.
         yield (name, header + script_text)
 
+    @classmethod
+    def get_header(cls, script_text, executable):
+        """Create a #! line, getting options (if any) from script_text"""
+        first = (script_text + '\n').splitlines()[0]
+        match = _first_line_re().match(first)
+        options = ''
+        if match:
+            options = match.group(1) or ''
+            if options:
+                options = ' ' + options
+        hdr = "#!%(executable)s%(options)s\n" % locals()
+        if not isascii(hdr):
+            # Non-ascii path to sys.executable, use -x to prevent warnings
+            if options:
+                if options.strip().startswith('-'):
+                    options = ' -x' + options.strip()[1:]
+                    # else: punt, we can't do it, let the warning happen anyway
+            else:
+                options = ' -x'
+        executable = fix_jython_executable(executable, options)
+        hdr = "#!%(executable)s%(options)s\n" % locals()
+        return hdr
+
 
 class WindowsScriptWriter(ScriptWriter):
     @classmethod
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index eb5ed0f28d..de74145f40 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -35,8 +35,10 @@ def run(self):
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
+        if is_wininst:
+            executable = "python.exe"
         writer = ScriptWriter.get_writer(force_windows=is_wininst)
-        header = get_script_header("", executable, wininst=is_wininst)
+        header = get_script_header("", executable)
         for args in writer._gen_args(dist, header):
             self.write_script(*args)
 

From db3ee08fdba76c74e3f25ae7d7f56117e68223b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 16:44:19 -0500
Subject: [PATCH 4819/8469] Remove unused imports

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index bc94b0c4ab..b42d2c07c5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -20,7 +20,7 @@
 from setuptools import sandbox
 from setuptools import compat
 from setuptools.compat import StringIO, BytesIO, urlparse
-from setuptools.sandbox import run_setup, SandboxViolation
+from setuptools.sandbox import run_setup
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, nt_quote_arg,
     get_script_header, is_sh, ScriptWriter,
@@ -28,7 +28,7 @@
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
-from pkg_resources import working_set, VersionConflict
+from pkg_resources import working_set
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
 import pkg_resources

From 390e64c37fb7dcb57b8e6062192e4c4375be8b78 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 16:56:23 -0500
Subject: [PATCH 4820/8469] Moved get_script_header into ScriptWriter class

---
 setuptools/command/easy_install.py    | 11 ++++++-----
 setuptools/tests/test_easy_install.py | 28 +++++++++++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c2928c7769..bf64838467 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1592,11 +1592,6 @@ def _first_line_re():
     return re.compile(first_line_re.pattern.decode())
 
 
-def get_script_header(script_text, executable=sys_executable, wininst=False):
-    executable = "python.exe" if wininst else nt_quote_arg(executable)
-    return ScriptWriter.get_header(script_text, executable)
-
-
 def auto_chmod(func, arg, exc):
     if func is os.remove and os.name == 'nt':
         chmod(arg, stat.S_IWRITE)
@@ -1886,6 +1881,11 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         header = get_script_header("", executable, wininst)
         return writer._gen_args(dist, header)
 
+    @classmethod
+    def get_script_header(cls, script_text, executable=sys_executable, wininst=False):
+        executable = "python.exe" if wininst else nt_quote_arg(executable)
+        return cls.get_header(script_text, executable)
+
     @classmethod
     def _gen_args(cls, dist, header=None):
         """
@@ -2016,6 +2016,7 @@ def _get_script_args(cls, type_, name, header, script_text):
 
 # for backward-compatibility
 get_script_args = ScriptWriter.get_script_args
+get_script_header = ScriptWriter.get_script_header
 
 
 def get_win_launcher(type):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b42d2c07c5..5d1068ea3c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -23,7 +23,7 @@
 from setuptools.sandbox import run_setup
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, nt_quote_arg,
-    get_script_header, is_sh, ScriptWriter,
+    is_sh, ScriptWriter,
 )
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -425,15 +425,22 @@ class TestScriptHeader:
     )
     def test_get_script_header(self):
         expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
-        assert get_script_header('#!/usr/local/bin/python') == expected
+        actual = ScriptWriter.get_script_header('#!/usr/local/bin/python')
+        assert actual == expected
+
         expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
-        assert get_script_header('#!/usr/bin/python -x') == expected
-        candidate = get_script_header('#!/usr/bin/python',
+        actual = ScriptWriter.get_script_header('#!/usr/bin/python -x')
+        assert actual == expected
+
+        actual = ScriptWriter.get_script_header('#!/usr/bin/python',
             executable=self.non_ascii_exe)
-        assert candidate == '#!%s -x\n' % self.non_ascii_exe
-        candidate = get_script_header('#!/usr/bin/python',
+        expected = '#!%s -x\n' % self.non_ascii_exe
+        assert actual == expected
+
+        actual = ScriptWriter.get_script_header('#!/usr/bin/python',
             executable=self.exe_with_spaces)
-        assert candidate == '#!"%s"\n' % self.exe_with_spaces
+        expected = '#!"%s"\n' % self.exe_with_spaces
+        assert actual == expected
 
     @pytest.mark.xfail(
         compat.PY3 and os.environ.get("LC_CTYPE") in ("C", "POSIX"),
@@ -453,7 +460,8 @@ def test_get_script_header_jython_workaround(self, tmpdir):
             f.write(header)
         exe = str(exe)
 
-        header = get_script_header('#!/usr/local/bin/python', executable=exe)
+        header = ScriptWriter.get_script_header('#!/usr/local/bin/python',
+            executable=exe)
         assert header == '#!/usr/bin/env %s\n' % exe
 
         expect_out = 'stdout' if sys.version_info < (2,7) else 'stderr'
@@ -461,14 +469,14 @@ def test_get_script_header_jython_workaround(self, tmpdir):
         with contexts.quiet() as (stdout, stderr):
             # When options are included, generate a broken shebang line
             # with a warning emitted
-            candidate = get_script_header('#!/usr/bin/python -x',
+            candidate = ScriptWriter.get_script_header('#!/usr/bin/python -x',
                 executable=exe)
             assert candidate == '#!%s  -x\n' % exe
             output = locals()[expect_out]
             assert 'Unable to adapt shebang line' in output.getvalue()
 
         with contexts.quiet() as (stdout, stderr):
-            candidate = get_script_header('#!/usr/bin/python',
+            candidate = ScriptWriter.get_script_header('#!/usr/bin/python',
                 executable=self.non_ascii_exe)
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
             output = locals()[expect_out]

From c3beddd034239005c98f7285a2936c513c5a81be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 17:12:37 -0500
Subject: [PATCH 4821/8469] Deprecate and remove usage of
 easy_install.get_script_header.

---
 setuptools/command/easy_install.py    | 12 ++++++++----
 setuptools/command/install_scripts.py |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index bf64838467..9eb741591e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -754,7 +754,7 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         is_script = is_python_script(script_text, script_name)
 
         if is_script:
-            script_text = (get_script_header(script_text) +
+            script_text = (ScriptWriter.get_header(script_text) +
                            self._load_template(dev_path) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
@@ -1878,11 +1878,13 @@ def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         # for backward compatibility
         warnings.warn("Use _gen_args", DeprecationWarning)
         writer = cls.get_writer(wininst)
-        header = get_script_header("", executable, wininst)
+        header = cls.get_script_header("", executable, wininst)
         return writer._gen_args(dist, header)
 
     @classmethod
     def get_script_header(cls, script_text, executable=sys_executable, wininst=False):
+        # for backward compatibility
+        warnings.warn("Use get_header", DeprecationWarning)
         executable = "python.exe" if wininst else nt_quote_arg(executable)
         return cls.get_header(script_text, executable)
 
@@ -1892,7 +1894,7 @@ def _gen_args(cls, dist, header=None):
         Yield write_script() argument tuples for a distribution's entrypoints
         """
         if header is None:
-            header = get_script_header("", sys_executable)
+            header = cls.get_header()
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
@@ -1914,8 +1916,10 @@ def _get_script_args(cls, type_, name, header, script_text):
         yield (name, header + script_text)
 
     @classmethod
-    def get_header(cls, script_text, executable):
+    def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
+        if executable is None:
+            executable = nt_quote_arg(sys_executable)
         first = (script_text + '\n').splitlines()[0]
         match = _first_line_re().match(first)
         options = ''
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index de74145f40..138e4ea279 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -14,7 +14,7 @@ def initialize_options(self):
 
     def run(self):
         from setuptools.command.easy_install import (
-            ScriptWriter, sys_executable, get_script_header,
+            ScriptWriter, sys_executable, nt_quote_arg,
         )
         self.run_command("egg_info")
         if self.distribution.scripts:
@@ -38,7 +38,7 @@ def run(self):
         if is_wininst:
             executable = "python.exe"
         writer = ScriptWriter.get_writer(force_windows=is_wininst)
-        header = get_script_header("", executable)
+        header = ScriptWriter.get_header("", nt_quote_arg(executable))
         for args in writer._gen_args(dist, header):
             self.write_script(*args)
 

From 261d57232c74954468688a76aab2caea80ed42fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 17:14:11 -0500
Subject: [PATCH 4822/8469] Rename _gen_args to get_args (for consistency).

---
 setuptools/command/easy_install.py    | 10 +++++-----
 setuptools/command/install_scripts.py |  2 +-
 setuptools/tests/test_easy_install.py |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9eb741591e..5c50dbe285 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -745,7 +745,7 @@ def maybe_move(self, spec, dist_filename, setup_base):
 
     def install_wrapper_scripts(self, dist):
         if not self.exclude_scripts:
-            for args in ScriptWriter._gen_args(dist):
+            for args in ScriptWriter.get_args(dist):
                 self.write_script(*args)
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
@@ -921,7 +921,7 @@ def install_exe(self, dist_filename, tmpdir):
         # delete entry-point scripts to avoid duping
         self.delete_blockers(
             [os.path.join(script_dir, args[0]) for args in
-             ScriptWriter._gen_args(dist)]
+             ScriptWriter.get_args(dist)]
         )
         # Build .egg file from tmpdir
         bdist_egg.make_zipfile(
@@ -1876,10 +1876,10 @@ class ScriptWriter(object):
     @classmethod
     def get_script_args(cls, dist, executable=sys_executable, wininst=False):
         # for backward compatibility
-        warnings.warn("Use _gen_args", DeprecationWarning)
+        warnings.warn("Use get_args", DeprecationWarning)
         writer = cls.get_writer(wininst)
         header = cls.get_script_header("", executable, wininst)
-        return writer._gen_args(dist, header)
+        return writer.get_args(dist, header)
 
     @classmethod
     def get_script_header(cls, script_text, executable=sys_executable, wininst=False):
@@ -1889,7 +1889,7 @@ def get_script_header(cls, script_text, executable=sys_executable, wininst=False
         return cls.get_header(script_text, executable)
 
     @classmethod
-    def _gen_args(cls, dist, header=None):
+    def get_args(cls, dist, header=None):
         """
         Yield write_script() argument tuples for a distribution's entrypoints
         """
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 138e4ea279..1717e1cf56 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -39,7 +39,7 @@ def run(self):
             executable = "python.exe"
         writer = ScriptWriter.get_writer(force_windows=is_wininst)
         header = ScriptWriter.get_header("", nt_quote_arg(executable))
-        for args in writer._gen_args(dist, header):
+        for args in writer.get_args(dist, header):
             self.write_script(*args)
 
     def write_script(self, script_name, contents, mode="t", *ignored):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 5d1068ea3c..f919ae2010 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -83,7 +83,7 @@ def test_install_site_py(self):
     def test_get_script_args(self):
         dist = FakeDist()
 
-        args = next(ScriptWriter._gen_args(dist))
+        args = next(ScriptWriter.get_args(dist))
         name, script = itertools.islice(args, 2)
 
         assert script == WANTED

From 3c78eb2348dff5d493d0cd5a34aef812db8385ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 17:20:15 -0500
Subject: [PATCH 4823/8469] Extract method for parsing options.

---
 setuptools/command/easy_install.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5c50dbe285..6ec96564eb 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1920,13 +1920,9 @@ def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
         if executable is None:
             executable = nt_quote_arg(sys_executable)
-        first = (script_text + '\n').splitlines()[0]
-        match = _first_line_re().match(first)
-        options = ''
-        if match:
-            options = match.group(1) or ''
-            if options:
-                options = ' ' + options
+
+        options = cls._extract_options(script_text)
+
         hdr = "#!%(executable)s%(options)s\n" % locals()
         if not isascii(hdr):
             # Non-ascii path to sys.executable, use -x to prevent warnings
@@ -1940,6 +1936,20 @@ def get_header(cls, script_text="", executable=None):
         hdr = "#!%(executable)s%(options)s\n" % locals()
         return hdr
 
+    @classmethod
+    def _extract_options(cls, orig_script):
+        """
+        Extract any options from the first line of the script.
+        """
+        first = (orig_script + '\n').splitlines()[0]
+        match = _first_line_re().match(first)
+        options = ''
+        if match:
+            options = match.group(1) or ''
+            if options:
+                options = ' ' + options
+        return options
+
 
 class WindowsScriptWriter(ScriptWriter):
     @classmethod

From efba85513b5c11ddbddf785906b5b4e9b596771a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 17:49:21 -0500
Subject: [PATCH 4824/8469] Extract method for handling non-ascii exe. Strip
 out excess whitespace from option handling.

---
 setuptools/command/easy_install.py    | 37 +++++++++++++++------------
 setuptools/tests/test_easy_install.py |  4 +--
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6ec96564eb..61e242d671 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1922,19 +1922,11 @@ def get_header(cls, script_text="", executable=None):
             executable = nt_quote_arg(sys_executable)
 
         options = cls._extract_options(script_text)
+        options = cls._handle_non_ascii_exe(executable, options)
+        tmpl = '#!{executable} {options}\n' if options else '#!{executable}\n'
 
-        hdr = "#!%(executable)s%(options)s\n" % locals()
-        if not isascii(hdr):
-            # Non-ascii path to sys.executable, use -x to prevent warnings
-            if options:
-                if options.strip().startswith('-'):
-                    options = ' -x' + options.strip()[1:]
-                    # else: punt, we can't do it, let the warning happen anyway
-            else:
-                options = ' -x'
         executable = fix_jython_executable(executable, options)
-        hdr = "#!%(executable)s%(options)s\n" % locals()
-        return hdr
+        return tmpl.format(**locals())
 
     @classmethod
     def _extract_options(cls, orig_script):
@@ -1943,12 +1935,23 @@ def _extract_options(cls, orig_script):
         """
         first = (orig_script + '\n').splitlines()[0]
         match = _first_line_re().match(first)
-        options = ''
-        if match:
-            options = match.group(1) or ''
-            if options:
-                options = ' ' + options
-        return options
+        options = match.group(1) or '' if match else ''
+        return options.strip()
+
+    @classmethod
+    def _handle_non_ascii_exe(cls, executable, options):
+        if isascii(executable):
+            return options
+
+        # Non-ascii path to sys.executable, use -x to prevent warnings
+        if not options:
+            return '-x'
+
+        if not options.strip().startswith('-'):
+            # punt, we can't do it, let the warning happen anyway
+            return options
+
+        return '-x' + options.strip()[1:]
 
 
 class WindowsScriptWriter(ScriptWriter):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f919ae2010..8687086625 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -428,7 +428,7 @@ def test_get_script_header(self):
         actual = ScriptWriter.get_script_header('#!/usr/local/bin/python')
         assert actual == expected
 
-        expected = '#!%s  -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
+        expected = '#!%s -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
         actual = ScriptWriter.get_script_header('#!/usr/bin/python -x')
         assert actual == expected
 
@@ -471,7 +471,7 @@ def test_get_script_header_jython_workaround(self, tmpdir):
             # with a warning emitted
             candidate = ScriptWriter.get_script_header('#!/usr/bin/python -x',
                 executable=exe)
-            assert candidate == '#!%s  -x\n' % exe
+            assert candidate == '#!%s -x\n' % exe
             output = locals()[expect_out]
             assert 'Unable to adapt shebang line' in output.getvalue()
 

From bd9d38030cee59eb0e2ef9c8fb98fda5b1ff470f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 21:18:09 -0500
Subject: [PATCH 4825/8469] Added new class CommandSpec, which will be used for
 abstracting the command handling for script headers.

---
 setuptools/command/easy_install.py | 95 +++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 61e242d671..bb0d869483 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -60,10 +60,6 @@
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
 
-sys_executable = os.environ.get('__PYVENV_LAUNCHER__',
-                                os.path.normpath(sys.executable))
-
-
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
     'main', 'get_exe_prefixes',
@@ -1855,6 +1851,88 @@ def fix_jython_executable(executable, options):
     return executable
 
 
+class CommandSpec(list):
+    """
+    A command spec for a #! header, specified as a list of arguments akin to
+    those passed to Popen.
+    """
+
+    options = []
+    _default = os.path.normpath(sys.executable)
+    launcher = os.environ.get('__PYVENV_LAUNCHER__', _default)
+
+    @classmethod
+    def from_environment(cls):
+        return cls.from_string(cls.launcher)
+
+    @classmethod
+    def from_string(cls, string):
+        """
+        Construct a command spec from a simple string, assumed to represent
+        the full name to an executable.
+        """
+        return cls._for_jython(string) or cls([string])
+
+    def install_options(self, script_text):
+        self.options.extend(self._extract_options(script_text))
+        cmdline = subprocess.list2cmdline(self)
+        if not isascii(cmdline):
+            self.options[:0] = ['-x']
+
+    @staticmethod
+    def _extract_options(orig_script):
+        """
+        Extract any options from the first line of the script.
+        """
+        first = (orig_script + '\n').splitlines()[0]
+        match = _first_line_re().match(first)
+        options = match.group(1) or '' if match else ''
+        return options.strip()
+
+    def as_header(self):
+        return self._render(self + list(self.options))
+
+    @staticmethod
+    def _render(items):
+        cmdline = subprocess.list2cmdline(items)
+        return '#!' + cmdline + '\n'
+
+
+class JythonCommandSpec(CommandSpec):
+    @classmethod
+    def from_string(cls, string):
+        """
+        On Jython, construct an instance of this class.
+        On platforms other than Jython, return None.
+        """
+        needs_jython_spec = (
+            sys.platform.startswith('java')
+            and
+            __import__('java').lang.System.getProperty('os.name') != 'Linux'
+        )
+        return cls([string]) if needs_jython_spec else None
+
+    def as_header(self):
+        """
+        Workaround Jython's sys.executable being a .sh (an invalid
+        shebang line interpreter)
+        """
+        if not is_sh(self[0]):
+            return super(JythonCommandSpec, self).as_header()
+
+        if self.options:
+            # Can't apply the workaround, leave it broken
+            log.warn(
+                "WARNING: Unable to adapt shebang line for Jython,"
+                " the following script is NOT executable\n"
+                "         see http://bugs.jython.org/issue1112 for"
+                " more information.")
+            return super(JythonCommandSpec, self).as_header()
+
+        items = ['/usr/bin/env'] + self + list(self.options)
+        return self._render(items)
+
+
 class ScriptWriter(object):
     """
     Encapsulates behavior around writing entry point scripts for console and
@@ -1874,17 +1952,19 @@ class ScriptWriter(object):
     """).lstrip()
 
     @classmethod
-    def get_script_args(cls, dist, executable=sys_executable, wininst=False):
+    def get_script_args(cls, dist, executable=None, wininst=False):
         # for backward compatibility
         warnings.warn("Use get_args", DeprecationWarning)
+        executable = executable or CommandSpec.launcher
         writer = cls.get_writer(wininst)
         header = cls.get_script_header("", executable, wininst)
         return writer.get_args(dist, header)
 
     @classmethod
-    def get_script_header(cls, script_text, executable=sys_executable, wininst=False):
+    def get_script_header(cls, script_text, executable=None, wininst=False):
         # for backward compatibility
         warnings.warn("Use get_header", DeprecationWarning)
+        executable = executable or CommandSpec.launcher
         executable = "python.exe" if wininst else nt_quote_arg(executable)
         return cls.get_header(script_text, executable)
 
@@ -1918,8 +1998,7 @@ def _get_script_args(cls, type_, name, header, script_text):
     @classmethod
     def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
-        if executable is None:
-            executable = nt_quote_arg(sys_executable)
+        executable = executable or nt_quote_arg(CommandSpec.launcher)
 
         options = cls._extract_options(script_text)
         options = cls._handle_non_ascii_exe(executable, options)

From 3ababa264dc404e9f8eae01045a4531b0b5bd692 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 21:31:05 -0500
Subject: [PATCH 4826/8469] Update install_scripts to use CommandSpec for
 generating script headers.

---
 setuptools/command/easy_install.py    | 13 +++++++++++++
 setuptools/command/install_scripts.py | 12 +++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index bb0d869483..5667864b5d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1861,6 +1861,19 @@ class CommandSpec(list):
     _default = os.path.normpath(sys.executable)
     launcher = os.environ.get('__PYVENV_LAUNCHER__', _default)
 
+    @classmethod
+    def from_param(cls, param):
+        """
+        Construct a CommandSpec from a parameter to build_scripts, which may
+        be None.
+        """
+        if isinstance(param, cls):
+            return param
+        if param is None:
+            return cls.from_environment()
+        # otherwise, assume it's a string.
+        return cls.from_string(param)
+
     @classmethod
     def from_environment(cls):
         return cls.from_string(cls.launcher)
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 1717e1cf56..722b0566ea 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -13,9 +13,8 @@ def initialize_options(self):
         self.no_ep = False
 
     def run(self):
-        from setuptools.command.easy_install import (
-            ScriptWriter, sys_executable, nt_quote_arg,
-        )
+        from setuptools.command.easy_install import ScriptWriter, CommandSpec
+
         self.run_command("egg_info")
         if self.distribution.scripts:
             orig.install_scripts.run(self)  # run first to set up self.outfiles
@@ -31,15 +30,14 @@ def run(self):
             ei_cmd.egg_name, ei_cmd.egg_version,
         )
         bs_cmd = self.get_finalized_command('build_scripts')
-        executable = getattr(bs_cmd, 'executable', sys_executable)
+        cmd = CommandSpec.from_param(getattr(bs_cmd, 'executable', None))
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
         if is_wininst:
-            executable = "python.exe"
+            cmd = CommandSpec.from_string("python.exe")
         writer = ScriptWriter.get_writer(force_windows=is_wininst)
-        header = ScriptWriter.get_header("", nt_quote_arg(executable))
-        for args in writer.get_args(dist, header):
+        for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 
     def write_script(self, script_name, contents, mode="t", *ignored):

From 254c2f03c69fd6ae34e70c1f89cb7ccbc4b5fed3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 21:44:38 -0500
Subject: [PATCH 4827/8469] Use CommandSpec in get_script_header

---
 setuptools/command/easy_install.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5667864b5d..f075200c1d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -36,6 +36,7 @@
 import struct
 import contextlib
 import subprocess
+import shlex
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -1884,10 +1885,10 @@ def from_string(cls, string):
         Construct a command spec from a simple string, assumed to represent
         the full name to an executable.
         """
-        return cls._for_jython(string) or cls([string])
+        return JythonCommandSpec.from_string(string) or cls([string])
 
     def install_options(self, script_text):
-        self.options.extend(self._extract_options(script_text))
+        self.options = shlex.split(self._extract_options(script_text))
         cmdline = subprocess.list2cmdline(self)
         if not isascii(cmdline):
             self.options[:0] = ['-x']
@@ -1977,9 +1978,11 @@ def get_script_args(cls, dist, executable=None, wininst=False):
     def get_script_header(cls, script_text, executable=None, wininst=False):
         # for backward compatibility
         warnings.warn("Use get_header", DeprecationWarning)
-        executable = executable or CommandSpec.launcher
-        executable = "python.exe" if wininst else nt_quote_arg(executable)
-        return cls.get_header(script_text, executable)
+        if wininst:
+            executable = "python.exe"
+        cmd = CommandSpec.from_param(executable)
+        cmd.install_options(script_text)
+        return cmd.as_header()
 
     @classmethod
     def get_args(cls, dist, header=None):

From 126d971737a7b0fc89b0b84c2b48f6fd139df729 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 21:53:03 -0500
Subject: [PATCH 4828/8469] Use CommandSpec in ScriptWriter, removing now
 unused methods.

---
 setuptools/command/easy_install.py | 36 +++---------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f075200c1d..7f8a98003f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2014,39 +2014,9 @@ def _get_script_args(cls, type_, name, header, script_text):
     @classmethod
     def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
-        executable = executable or nt_quote_arg(CommandSpec.launcher)
-
-        options = cls._extract_options(script_text)
-        options = cls._handle_non_ascii_exe(executable, options)
-        tmpl = '#!{executable} {options}\n' if options else '#!{executable}\n'
-
-        executable = fix_jython_executable(executable, options)
-        return tmpl.format(**locals())
-
-    @classmethod
-    def _extract_options(cls, orig_script):
-        """
-        Extract any options from the first line of the script.
-        """
-        first = (orig_script + '\n').splitlines()[0]
-        match = _first_line_re().match(first)
-        options = match.group(1) or '' if match else ''
-        return options.strip()
-
-    @classmethod
-    def _handle_non_ascii_exe(cls, executable, options):
-        if isascii(executable):
-            return options
-
-        # Non-ascii path to sys.executable, use -x to prevent warnings
-        if not options:
-            return '-x'
-
-        if not options.strip().startswith('-'):
-            # punt, we can't do it, let the warning happen anyway
-            return options
-
-        return '-x' + options.strip()[1:]
+        cmd = CommandSpec.from_param(executable)
+        cmd.install_options(script_text)
+        return cmd.as_header()
 
 
 class WindowsScriptWriter(ScriptWriter):

From ab6887a55394c77982212c058c59addeb77736f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:02:56 -0500
Subject: [PATCH 4829/8469] Remove redundant line

---
 setuptools/command/easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7f8a98003f..0b24c8e3ab 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1969,7 +1969,6 @@ class ScriptWriter(object):
     def get_script_args(cls, dist, executable=None, wininst=False):
         # for backward compatibility
         warnings.warn("Use get_args", DeprecationWarning)
-        executable = executable or CommandSpec.launcher
         writer = cls.get_writer(wininst)
         header = cls.get_script_header("", executable, wininst)
         return writer.get_args(dist, header)

From 6ab7d6dbb13e0ef1f44bf0461f3ffdb06f07b3b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:11:08 -0500
Subject: [PATCH 4830/8469] Add test demonstrating how a custom launch command
 spec that could be passed as the script executable.

---
 setuptools/tests/test_easy_install.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 8687086625..3a8ddbfbcd 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -23,7 +23,7 @@
 from setuptools.sandbox import run_setup
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, nt_quote_arg,
-    is_sh, ScriptWriter,
+    is_sh, ScriptWriter, CommandSpec,
 )
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
@@ -481,3 +481,21 @@ def test_get_script_header_jython_workaround(self, tmpdir):
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
             output = locals()[expect_out]
             assert 'Unable to adapt shebang line' in output.getvalue()
+
+
+class TestCommandSpec:
+    def test_custom_launch_command(self):
+        """
+        Show how a custom CommandSpec could be used to specify a #! executable
+        which takes parameters.
+        """
+        cmd = CommandSpec(['/usr/bin/env', 'python3'])
+        assert cmd.as_header() == '#!/usr/bin/env python3\n'
+
+    def test_from_param_for_CommandSpec_is_passthrough(self):
+        """
+        from_param should return an instance of a CommandSpec
+        """
+        cmd = CommandSpec(['python'])
+        cmd_new = CommandSpec.from_param(cmd)
+        assert cmd is cmd_new

From 4356a2dc99a74be0d970f63e045eba40f463695d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:22:44 -0500
Subject: [PATCH 4831/8469] Allow CommandSpec to be constructed simply from a
 list.

---
 setuptools/command/easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0b24c8e3ab..fb953dbb2f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1870,6 +1870,8 @@ def from_param(cls, param):
         """
         if isinstance(param, cls):
             return param
+        if isinstance(param, list):
+            return cls(param)
         if param is None:
             return cls.from_environment()
         # otherwise, assume it's a string.

From 0ad48553589fc68faeb7a5fc2f76da128249ac86 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:29:37 -0500
Subject: [PATCH 4832/8469] Add test capturing expectation around
 sys.executable having spaces in the name.

---
 setuptools/command/easy_install.py    | 9 ++++++---
 setuptools/tests/test_easy_install.py | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fb953dbb2f..54a3bc3a03 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1859,8 +1859,11 @@ class CommandSpec(list):
     """
 
     options = []
-    _default = os.path.normpath(sys.executable)
-    launcher = os.environ.get('__PYVENV_LAUNCHER__', _default)
+
+    @classmethod
+    def _sys_executable(cls):
+        _default = os.path.normpath(sys.executable)
+        return os.environ.get('__PYVENV_LAUNCHER__', _default)
 
     @classmethod
     def from_param(cls, param):
@@ -1879,7 +1882,7 @@ def from_param(cls, param):
 
     @classmethod
     def from_environment(cls):
-        return cls.from_string(cls.launcher)
+        return cls.from_string(cls._sys_executable())
 
     @classmethod
     def from_string(cls, string):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3a8ddbfbcd..e1f0678816 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -499,3 +499,9 @@ def test_from_param_for_CommandSpec_is_passthrough(self):
         cmd = CommandSpec(['python'])
         cmd_new = CommandSpec.from_param(cmd)
         assert cmd is cmd_new
+
+    def test_from_environment_with_spaces_in_executable(self):
+        with mock.patch('sys.executable', TestScriptHeader.exe_with_spaces):
+            cmd = CommandSpec.from_environment()
+        assert len(cmd) == 1
+        assert cmd.as_header().startswith('#!"')

From 3b68368e30aa51d4a7f96053501c604a8cb6fe42 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:44:28 -0500
Subject: [PATCH 4833/8469] Change the way string values are interpreted from
 build.executable - now they must be quoted or otherwise escaped suitable for
 parsing by shlex.split.

---
 setuptools/command/easy_install.py    | 9 +++++----
 setuptools/tests/test_easy_install.py | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 54a3bc3a03..340b1fac93 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1882,15 +1882,16 @@ def from_param(cls, param):
 
     @classmethod
     def from_environment(cls):
-        return cls.from_string(cls._sys_executable())
+        return cls.from_string('"' + cls._sys_executable() + '"')
 
     @classmethod
     def from_string(cls, string):
         """
-        Construct a command spec from a simple string, assumed to represent
-        the full name to an executable.
+        Construct a command spec from a simple string representing a command
+        line parseable by shlex.split.
         """
-        return JythonCommandSpec.from_string(string) or cls([string])
+        items = shlex.split(string)
+        return JythonCommandSpec.from_string(string) or cls(items)
 
     def install_options(self, script_text):
         self.options = shlex.split(self._extract_options(script_text))
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e1f0678816..a3d5b0a951 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -505,3 +505,12 @@ def test_from_environment_with_spaces_in_executable(self):
             cmd = CommandSpec.from_environment()
         assert len(cmd) == 1
         assert cmd.as_header().startswith('#!"')
+
+    def test_from_simple_string_uses_shlex(self):
+        """
+        In order to support `executable = /usr/bin/env my-python`, make sure
+        from_param invokes shlex on that input.
+        """
+        cmd = CommandSpec.from_param('/usr/bin/env my-python')
+        assert len(cmd) == 2
+        assert '"' not in cmd.as_header()

From b2c646684986070b34b92aef52d2f57391c99626 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:45:56 -0500
Subject: [PATCH 4834/8469] Fix failing test (now that expectation is
 different).

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a3d5b0a951..72b040e1af 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -438,7 +438,7 @@ def test_get_script_header(self):
         assert actual == expected
 
         actual = ScriptWriter.get_script_header('#!/usr/bin/python',
-            executable=self.exe_with_spaces)
+            executable='"'+self.exe_with_spaces+'"')
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
 

From 81df10c70a695360683d76daa1737ba3feb56f6f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jan 2015 22:48:07 -0500
Subject: [PATCH 4835/8469] Update note in changelog

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8fc9e981ef..d6cf236a69 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+----
+12.0
+----
+
+* Issue #188: Setuptools now support multiple entities in the value for
+  ``build.executable``, such that an executable of "/usr/bin/env my-python" may
+  be specified. This means that systems with a specified executable whose name
+  has spaces in the path must be updated to escape or quote that value.
+
 ----
 11.1
 ----

From 3ba436a301a5e020de8c33fbeca016c205511f4a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 12:58:07 -0500
Subject: [PATCH 4836/8469] Bump stacklevel to 2 to inform the caller of the
 issue.

---
 pkg_resources/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a0b354ff55..0e6223de48 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2261,6 +2261,7 @@ def load(self, require=True, env=None, installer=None):
                 "`require` parameter is deprecated. Use "
                 "EntryPoint._load instead.",
                 DeprecationWarning,
+                stacklevel=2,
             )
         return self._load()
 

From 0a655117169b85d529c6f65c8895ad4bff824b6f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 13:00:26 -0500
Subject: [PATCH 4837/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8fc9e981ef..956b1ad406 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----
+11.2
+----
+
+* Pip #2326: Report deprecation warning at stacklevel 2 for easier diagnosis.
+
 ----
 11.1
 ----

From 85df7c83592f997764717253a5f7c23caaf7b966 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 13:03:22 -0500
Subject: [PATCH 4838/8469] Added tag 11.2 for changeset feb5971e7827

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 021c8ff463..c966497049 100644
--- a/.hgtags
+++ b/.hgtags
@@ -183,3 +183,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 1f5de53c079d577ead9d80265c9e006503b16457 10.2.1
 b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
 6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1
+feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2

From b38ede5b91f82c552f1d79a0346ea5f24b0b7d1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 13:03:59 -0500
Subject: [PATCH 4839/8469] Bumped to 11.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 388ff490d7..e3de282940 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.2"
+DEFAULT_VERSION = "11.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index a6fd3e36a9..b1a75f410f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.2'
+__version__ = '11.3'

From dd0ef1f363e42a8859889ba319b37a29c1f03855 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 13:07:42 -0500
Subject: [PATCH 4840/8469] Add support for linkifying pip issues.

---
 linkify.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linkify.py b/linkify.py
index e7b3ca7be6..5c6e16b443 100644
--- a/linkify.py
+++ b/linkify.py
@@ -15,6 +15,7 @@
     r"Jython #(?P<jython>\d+)",
     r"Python #(?P<python>\d+)",
     r"Interop #(?P<interop>\d+)",
+    r"Pip #(?P<pip>\d+)",
 ]
 
 issue_urls = dict(
@@ -27,6 +28,7 @@
     jython='http://bugs.jython.org/issue{jython}',
     python='http://bugs.python.org/issue{python}',
     interop='https://github.com/pypa/interoperability-peps/issues/{interop}',
+    pip='https://github.com/pypa/pip/issues/{pip}',
 )
 
 

From 7fa87f2fbdf84d414e069ca96f6c6d860d7e0505 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 13:12:16 -0500
Subject: [PATCH 4841/8469] Update changelog.

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 956b1ad406..9ebfb14542 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,7 +36,9 @@ CHANGES
 10.2
 ----
 
-* Deprecated use of EntryPoint.load(require=False).
+* Deprecated use of EntryPoint.load(require=False). Passing a boolean to a
+  function to select behavior is an anti-pattern. Instead use
+  ``Entrypoint._load()``.
 * Substantial refactoring of all unit tests. Tests are now much leaner and
   re-use a lot of fixtures and contexts for better clarity of purpose.
 

From 92a553d3adeb431cdf92b136ac9ccc3f2ef98bf1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 14:21:41 -0500
Subject: [PATCH 4842/8469] Add EntryPoint.resolve and deprecate most usage of
 EntryPoint.load. Removed EntryPoint._load.

---
 CHANGES.txt                    | 14 ++++++++++++++
 pkg_resources/__init__.py      | 22 ++++++++++++++--------
 setuptools/command/test.py     |  2 +-
 setuptools/dist.py             |  2 +-
 setuptools/tests/test_sdist.py |  2 +-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9ebfb14542..ab93a9c660 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,20 @@
 CHANGES
 =======
 
+----
+11.3
+----
+
+* Expose ``EntryPoint.resolve`` in place of EntryPoint._load, implementing the
+  simple, non-requiring load. Deprecated all uses of ``EntryPoint._load``
+  except for calling with no parameters, which is just a shortcut for
+  ``ep.require(); ep.resolve();``.
+
+  Apps currently invoking ``ep.load(require=False)`` should instead do the
+  following if wanting to avoid the deprecating warning::
+
+    getattr(ep, "resolve", lambda: ep.load(require=False))()
+
 ----
 11.2
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b31ae53204..fd8efaa8c5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2294,19 +2294,25 @@ def __str__(self):
     def __repr__(self):
         return "EntryPoint.parse(%r)" % str(self)
 
-    def load(self, require=True, env=None, installer=None):
-        if require:
-            self.require(env, installer)
-        else:
+    def load(self, require=True, *args, **kwargs):
+        """
+        Require packages for this EntryPoint, then resolve it.
+        """
+        if not require or args or kwargs:
             warnings.warn(
-                "`require` parameter is deprecated. Use "
-                "EntryPoint._load instead.",
+                "Parameters to load are deprecated.  Call .resolve and "
+                ".require separately.",
                 DeprecationWarning,
                 stacklevel=2,
             )
-        return self._load()
+        if require:
+            self.require(*args, **kwargs)
+        return self.resolve()
 
-    def _load(self):
+    def resolve(self):
+        """
+        Resolve the entry point from its module and attrs.
+        """
         module = __import__(self.module_name, fromlist=['__name__'], level=0)
         try:
             return functools.reduce(getattr, self.attrs, module)
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 2bf5cb1605..42689f7012 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -172,4 +172,4 @@ def _resolve_as_ep(val):
         if val is None:
             return
         parsed = EntryPoint.parse("x=" + val)
-        return parsed._load()()
+        return parsed.resolve()()
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1917a610e3..bc29b131b8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -434,7 +434,7 @@ def print_commands(self):
         for ep in pkg_resources.iter_entry_points('distutils.commands'):
             if ep.name not in self.cmdclass:
                 # don't require extras as the commands won't be invoked
-                cmdclass = ep._load()
+                cmdclass = ep.resolve()
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index d3494d7a69..9013b505db 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -415,5 +415,5 @@ def test_default_revctrl():
     """
     ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl'
     ep = pkg_resources.EntryPoint.parse(ep_def)
-    res = ep._load()
+    res = ep.resolve()
     assert hasattr(res, '__iter__')

From 94391e16a7c821df85a00c82a48b3326d7155fc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 14:23:33 -0500
Subject: [PATCH 4843/8469] Added tag 11.3 for changeset a1a6a1ac9113

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c966497049..cef45b3b5b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -184,3 +184,4 @@ fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
 b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
 6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1
 feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
+a1a6a1ac9113b90009052ca7263174a488434099 11.3

From 6fe9a6147ff850b64ffc241f65c2411f53fb34c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Jan 2015 14:24:10 -0500
Subject: [PATCH 4844/8469] Bumped to 11.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e3de282940..1b567ef740 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.3"
+DEFAULT_VERSION = "11.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index b1a75f410f..cef537ae73 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.3'
+__version__ = '11.4'

From 32ce474415accc4ad11fdbab57f7a65176d4197b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 09:48:30 -0500
Subject: [PATCH 4845/8469] Restore support for printable characters in the
 entry point name. Fixes #327.

---
 CHANGES.txt                           |  7 +++++++
 pkg_resources/__init__.py             |  2 +-
 pkg_resources/tests/test_resources.py | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ab93a9c660..5fce5d9cf0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+11.3.1
+------
+
+* Issue #327: Formalize and restore support for any printable character in an
+  entry point name.
+
 ----
 11.3
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index fd8efaa8c5..c0c095b253 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2328,7 +2328,7 @@ def require(self, env=None, installer=None):
 
     pattern = re.compile(
         r'\s*'
-        r'(?P<name>[+\w. -]+?)\s*'
+        r'(?P<name>.+?)\s*'
         r'=\s*'
         r'(?P<module>[\w.]+)\s*'
         r'(:\s*(?P<attr>[\w.]+))?\s*'
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index f252ddff0e..4a82167bf2 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -2,6 +2,7 @@
 import sys
 import tempfile
 import shutil
+import string
 
 import pytest
 
@@ -302,6 +303,16 @@ def testRejects(self):
             except ValueError: pass
             else: raise AssertionError("Should've been bad", ep)
 
+    def test_printable_name(self):
+        """
+        Allow any printable character in the name.
+        """
+        # Create a name with all printable characters; strip the whitespace.
+        name = string.printable.strip()
+        spec = "{name} = module:attr".format(**locals())
+        ep = EntryPoint.parse(spec)
+        assert ep.name == name
+
     def checkSubMap(self, m):
         assert len(m) == len(self.submap_expect)
         for key, ep in pkg_resources.iteritems(self.submap_expect):

From 1524a98d7e0e5344134ef51e77cfe5a04e582a8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:01:51 -0500
Subject: [PATCH 4846/8469] Equal signs are now allowed in entry point names.

---
 pkg_resources/tests/test_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4a82167bf2..00ba0cf565 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -297,7 +297,7 @@ def testParse(self):
 
     def testRejects(self):
         for ep in [
-            "foo", "x=1=2", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2",
+            "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2",
         ]:
             try: EntryPoint.parse(ep)
             except ValueError: pass

From de11e9e9b57db01e029657acb1148a9fd70581b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:02:44 -0500
Subject: [PATCH 4847/8469] Refactor for clarity

---
 pkg_resources/tests/test_resources.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 00ba0cf565..36cb64827f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -296,9 +296,8 @@ def testParse(self):
         assert ep.name == 'html+mako'
 
     def testRejects(self):
-        for ep in [
-            "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2",
-        ]:
+        specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2"
+        for ep in specs:
             try: EntryPoint.parse(ep)
             except ValueError: pass
             else: raise AssertionError("Should've been bad", ep)

From 9d04e13b60ccd4ec6058c31e219d6e7d124f9574 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:07:03 -0500
Subject: [PATCH 4848/8469] Use pytests parametrize to create separate tests
 for each spec

---
 pkg_resources/tests/test_resources.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 36cb64827f..9c1eaeec42 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -295,12 +295,12 @@ def testParse(self):
         ep = EntryPoint.parse(spec)
         assert ep.name == 'html+mako'
 
-    def testRejects(self):
-        specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2"
-        for ep in specs:
-            try: EntryPoint.parse(ep)
-            except ValueError: pass
-            else: raise AssertionError("Should've been bad", ep)
+    reject_specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2"
+    @pytest.mark.parametrize("reject_spec", reject_specs)
+    def test_reject_spec(self, reject_spec):
+        try: EntryPoint.parse(reject_spec)
+        except ValueError: pass
+        else: raise AssertionError("Should've been bad", reject_spec)
 
     def test_printable_name(self):
         """

From 7d4bd8dabb45242671527282474c84179c967ede Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:08:15 -0500
Subject: [PATCH 4849/8469] Use pytest.raises for brevity and clarity of
 purpose.

---
 pkg_resources/tests/test_resources.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 9c1eaeec42..a55478a249 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -298,9 +298,8 @@ def testParse(self):
     reject_specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2"
     @pytest.mark.parametrize("reject_spec", reject_specs)
     def test_reject_spec(self, reject_spec):
-        try: EntryPoint.parse(reject_spec)
-        except ValueError: pass
-        else: raise AssertionError("Should've been bad", reject_spec)
+        with pytest.raises(ValueError):
+            EntryPoint.parse(reject_spec)
 
     def test_printable_name(self):
         """

From 37c72186f7cd585a0ceab8d11c3baede009ca961 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:11:49 -0500
Subject: [PATCH 4850/8469] Bumped to 11.3.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1b567ef740..955a8008a3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.4"
+DEFAULT_VERSION = "11.3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index cef537ae73..6e50490aab 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.4'
+__version__ = '11.3.1'

From 6c02bf0985ae092a1ac94d8176b6e710675e9ccb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:11:53 -0500
Subject: [PATCH 4851/8469] Added tag 11.3.1 for changeset 1116e568f534

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cef45b3b5b..343bfa9e6b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -185,3 +185,4 @@ b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
 6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1
 feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
 a1a6a1ac9113b90009052ca7263174a488434099 11.3
+1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1

From a8f60a73238ae67e0c5a04e437fd9f4edf08bbd6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jan 2015 10:12:28 -0500
Subject: [PATCH 4852/8469] Bumped to 11.3.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 955a8008a3..f1e4aeaeb2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.3.1"
+DEFAULT_VERSION = "11.3.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 6e50490aab..1e71f92d11 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.3.1'
+__version__ = '11.3.2'

From 74637dd638a30c153d9af60688078c7e12d810d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:23:57 -0500
Subject: [PATCH 4853/8469] Extract Exception saving behavior.

---
 setuptools/sandbox.py | 70 +++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 7971f42c1c..37d89a2ae6 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -92,6 +92,37 @@ def pushd(target):
         os.chdir(saved)
 
 
+class ExceptionSaver:
+    """
+    A Context Manager that will save an exception, serialized, and restore it
+    later.
+    """
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, exc, tb):
+        if not exc:
+            return
+
+        # dump the exception
+        self.saved_type = pickle.dumps(type)
+        self.saved_exc = pickle.dumps(exc)
+        self.tb = tb
+
+        # suppress the exception
+        return True
+
+    def resume(self):
+        "restore and re-raise any exception"
+
+        if 'saved_exc' not in vars(self):
+            return
+
+        type = pickle.loads(self.saved_type)
+        exc = pickle.loads(self.saved_exc)
+        compat.reraise(type, exc, self.tb)
+
+
 @contextlib.contextmanager
 def save_modules():
     """
@@ -101,31 +132,20 @@ def save_modules():
     outside the context.
     """
     saved = sys.modules.copy()
-    try:
-        try:
-            yield saved
-        except:
-            # dump any exception
-            class_, exc, tb = sys.exc_info()
-            saved_cls = pickle.dumps(class_)
-            saved_exc = pickle.dumps(exc)
-            raise
-        finally:
-            sys.modules.update(saved)
-            # remove any modules imported since
-            del_modules = (
-                mod_name for mod_name in sys.modules
-                if mod_name not in saved
-                # exclude any encodings modules. See #285
-                and not mod_name.startswith('encodings.')
-            )
-            _clear_modules(del_modules)
-    except:
-        # reload and re-raise any exception, using restored modules
-        class_, exc, tb = sys.exc_info()
-        new_cls = pickle.loads(saved_cls)
-        new_exc = pickle.loads(saved_exc)
-        compat.reraise(new_cls, new_exc, tb)
+    with ExceptionSaver() as saved_exc:
+        yield saved
+
+    sys.modules.update(saved)
+    # remove any modules imported since
+    del_modules = (
+        mod_name for mod_name in sys.modules
+        if mod_name not in saved
+        # exclude any encodings modules. See #285
+        and not mod_name.startswith('encodings.')
+    )
+    _clear_modules(del_modules)
+
+    saved_exc.resume()
 
 
 def _clear_modules(module_names):

From 19c95d3ef6dba78bf6431b6b13d000bc19e84cd6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:24:17 -0500
Subject: [PATCH 4854/8469] Remove unused import

---
 setuptools/tests/test_sandbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index cadc4812a7..9a2a6b7b32 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -7,7 +7,7 @@
 
 import pkg_resources
 import setuptools.sandbox
-from setuptools.sandbox import DirectorySandbox, SandboxViolation
+from setuptools.sandbox import DirectorySandbox
 
 
 class TestSandbox:

From c10a38e97daf7aad2167b3b444be8542dccc652e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:32:39 -0500
Subject: [PATCH 4855/8469] Add tests for new ExceptionSaver

---
 setuptools/tests/test_sandbox.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 9a2a6b7b32..33fb3329c2 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -54,3 +54,31 @@ def test_setup_py_with_CRLF(self, tmpdir):
         with setup_py.open('wb') as stream:
             stream.write(b'"degenerate script"\r\n')
         setuptools.sandbox._execfile(str(setup_py), globals())
+
+
+class TestExceptionSaver:
+    def test_exception_trapped(self):
+        with setuptools.sandbox.ExceptionSaver():
+            raise ValueError("details")
+
+    def test_exception_resumed(self):
+        with setuptools.sandbox.ExceptionSaver() as saved_exc:
+            raise ValueError("details")
+
+        with pytest.raises(ValueError) as caught:
+            saved_exc.resume()
+
+        assert isinstance(caught.value, ValueError)
+        assert str(caught.value) == 'details'
+
+    def test_exception_reconstructed(self):
+        orig_exc = ValueError("details")
+
+        with setuptools.sandbox.ExceptionSaver() as saved_exc:
+            raise orig_exc
+
+        with pytest.raises(ValueError) as caught:
+            saved_exc.resume()
+
+        assert isinstance(caught.value, ValueError)
+        assert caught.value is not orig_exc

From a33a5ba6ed5be3affc10fd0e789799b7490d2053 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:38:25 -0500
Subject: [PATCH 4856/8469] Adding test for non-exceptional condition.

---
 setuptools/tests/test_sandbox.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 33fb3329c2..1340cecf13 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -82,3 +82,9 @@ def test_exception_reconstructed(self):
 
         assert isinstance(caught.value, ValueError)
         assert caught.value is not orig_exc
+
+    def test_no_exception_passes_quietly(self):
+        with setuptools.sandbox.ExceptionSaver() as saved_exc:
+            pass
+
+        saved_exc.resume()

From 9948d3c8a7880cbc13012e8a3fedda130614601d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:40:02 -0500
Subject: [PATCH 4857/8469] Make attributes private and remove redundant
 naming.

---
 setuptools/sandbox.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 37d89a2ae6..0847ef4118 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -105,9 +105,9 @@ def __exit__(self, type, exc, tb):
             return
 
         # dump the exception
-        self.saved_type = pickle.dumps(type)
-        self.saved_exc = pickle.dumps(exc)
-        self.tb = tb
+        self._type = pickle.dumps(type)
+        self._exc = pickle.dumps(exc)
+        self._tb = tb
 
         # suppress the exception
         return True
@@ -115,12 +115,12 @@ def __exit__(self, type, exc, tb):
     def resume(self):
         "restore and re-raise any exception"
 
-        if 'saved_exc' not in vars(self):
+        if '_exc' not in vars(self):
             return
 
-        type = pickle.loads(self.saved_type)
-        exc = pickle.loads(self.saved_exc)
-        compat.reraise(type, exc, self.tb)
+        type = pickle.loads(self._type)
+        exc = pickle.loads(self._exc)
+        compat.reraise(type, exc, self._tb)
 
 
 @contextlib.contextmanager

From 9c3d6750cbef8e0673e4123aa39149e28a8a098e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 21:49:12 -0500
Subject: [PATCH 4858/8469] Add test capturing failure when the Exception is
 not pickleable. Ref #329.

---
 setuptools/tests/test_sandbox.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 1340cecf13..6e1e9e1cd2 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -88,3 +88,15 @@ def test_no_exception_passes_quietly(self):
             pass
 
         saved_exc.resume()
+
+    def test_unpickleable_exception(self):
+        class CantPickleThis(Exception):
+            "This Exception is unpickleable because it's not in globals"
+
+        with setuptools.sandbox.ExceptionSaver() as saved_exc:
+            raise CantPickleThis('detail')
+
+        with pytest.raises(setuptools.sandbox.UnpickleableException) as caught:
+            saved_exc.resume()
+
+        assert str(caught.value) == "CantPickleThis('detail',)"

From 9cf04f13f2ff72a7befa15f8f4835d2c662508e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Jan 2015 22:06:09 -0500
Subject: [PATCH 4859/8469] Wrap unpickleable exceptions in another class.
 Fixes #329.

---
 setuptools/sandbox.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 0847ef4118..83283ca3dc 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -92,6 +92,22 @@ def pushd(target):
         os.chdir(saved)
 
 
+class UnpickleableException(Exception):
+    """
+    An exception representing another Exception that could not be pickled.
+    """
+    @classmethod
+    def dump(cls, type, exc):
+        """
+        Always return a dumped (pickled) type and exc. If exc can't be pickled,
+        wrap it in UnpickleableException first.
+        """
+        try:
+            return pickle.dumps(type), pickle.dumps(exc)
+        except Exception:
+            return cls.dump(cls, cls(repr(exc)))
+
+
 class ExceptionSaver:
     """
     A Context Manager that will save an exception, serialized, and restore it
@@ -105,8 +121,7 @@ def __exit__(self, type, exc, tb):
             return
 
         # dump the exception
-        self._type = pickle.dumps(type)
-        self._exc = pickle.dumps(exc)
+        self._saved = UnpickleableException.dump(type, exc)
         self._tb = tb
 
         # suppress the exception
@@ -115,11 +130,10 @@ def __exit__(self, type, exc, tb):
     def resume(self):
         "restore and re-raise any exception"
 
-        if '_exc' not in vars(self):
+        if '_saved' not in vars(self):
             return
 
-        type = pickle.loads(self._type)
-        exc = pickle.loads(self._exc)
+        type, exc = map(pickle.loads, self._saved)
         compat.reraise(type, exc, self._tb)
 
 

From 72d5cc0b9ea095437bf2796298dd3658624c081e Mon Sep 17 00:00:00 2001
From: Slavek Kabrda <slavek.kabrda@gmail.com>
Date: Fri, 9 Jan 2015 09:40:48 +0000
Subject: [PATCH 4860/8469] Access os.environ[key], not os.environ['key']

---
 setuptools/tests/contexts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index d06a333f08..4a46176557 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -27,7 +27,7 @@ def environment(**replacements):
     to clear the values.
     """
     saved = dict(
-        (key, os.environ['key'])
+        (key, os.environ[key])
         for key in replacements
         if key in os.environ
     )

From 35b0d82423b88702bbaaa20436b28720c70e3a6d Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Mon, 12 Jan 2015 17:31:44 -0500
Subject: [PATCH 4861/8469] Fix tox settings so they work

Update the dependency list to include the mock package.

Update the way py.test is called to only scan the setuptools directory,
to avoid scanning all of the packages installed in .tox and other
temporary directories.
---
 tox.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1ac4620277..7aeffdd8a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
 envlist = py26,py27,py31,py32,py33,py34
 [testenv]
-deps=pytest
-commands=py.test {posargs}
+deps=
+    pytest
+    mock
+commands=py.test setuptools {posargs}

From 3fcf597f4db0a82fabde4d06bc287b6573763496 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 13 Jan 2015 09:17:24 -0500
Subject: [PATCH 4862/8469] fix instances of consecutive articles (closes
 #23221)

Patch by Karan Goel.
---
 dir_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir_util.py b/dir_util.py
index 0924c9b0f7..d5cd8e3e24 100644
--- a/dir_util.py
+++ b/dir_util.py
@@ -81,7 +81,7 @@ def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0):
     """Create all the empty directories under 'base_dir' needed to put 'files'
     there.
 
-    'base_dir' is just the a name of a directory which doesn't necessarily
+    'base_dir' is just the name of a directory which doesn't necessarily
     exist yet; 'files' is a list of filenames to be interpreted relative to
     'base_dir'.  'base_dir' + the directory portion of every file in 'files'
     will be created if it doesn't already exist.  'mode', 'verbose' and

From 3789d73e316092bc2b65960f3fa8706bc0afa3c3 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Jan 2015 23:56:35 -0500
Subject: [PATCH 4863/8469] fix parsing reST with code or code-block directives
 (closes #23063)

Patch by Marc Abramowitz.
---
 command/check.py    |  8 ++++----
 tests/test_check.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/command/check.py b/command/check.py
index 22b9349dd6..7ebe707cff 100644
--- a/command/check.py
+++ b/command/check.py
@@ -122,7 +122,7 @@ def _check_rst_data(self, data):
         """Returns warnings when the provided data doesn't compile."""
         source_path = StringIO()
         parser = Parser()
-        settings = frontend.OptionParser().get_default_values()
+        settings = frontend.OptionParser(components=(Parser,)).get_default_values()
         settings.tab_width = 4
         settings.pep_references = None
         settings.rfc_references = None
@@ -138,8 +138,8 @@ def _check_rst_data(self, data):
         document.note_source(source_path, -1)
         try:
             parser.parse(data, document)
-        except AttributeError:
-            reporter.messages.append((-1, 'Could not finish the parsing.',
-                                      '', {}))
+        except AttributeError as e:
+            reporter.messages.append(
+                (-1, 'Could not finish the parsing: %s.' % e, '', {}))
 
         return reporter.messages
diff --git a/tests/test_check.py b/tests/test_check.py
index 601b68686b..959fa9085c 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.check."""
+import textwrap
 import unittest
 from test.support import run_unittest
 
@@ -92,6 +93,36 @@ def test_check_restructuredtext(self):
         cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEqual(cmd._warnings, 0)
 
+    @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
+    def test_check_restructuredtext_with_syntax_highlight(self):
+        # Don't fail if there is a `code` or `code-block` directive
+
+        example_rst_docs = []
+        example_rst_docs.append(textwrap.dedent("""\
+            Here's some code:
+
+            .. code:: python
+
+                def foo():
+                    pass
+            """))
+        example_rst_docs.append(textwrap.dedent("""\
+            Here's some code:
+
+            .. code-block:: python
+
+                def foo():
+                    pass
+            """))
+
+        for rest_with_code in example_rst_docs:
+            pkg_info, dist = self.create_dist(long_description=rest_with_code)
+            cmd = check(dist)
+            cmd.check_restructuredtext()
+            self.assertEqual(cmd._warnings, 0)
+            msgs = cmd._check_rst_data(rest_with_code)
+            self.assertEqual(len(msgs), 0)
+
     def test_check_all(self):
 
         metadata = {'url': 'xxx', 'author': 'xxx'}

From cde1eb84bd1813ff4425fe6f05cbdeba8e410c13 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 15 Jan 2015 23:25:04 +0100
Subject: [PATCH 4864/8469] Use unittest.mock from standard library instead of
 external mock with Python >=3.3.

---
 setup.py                               | 3 +--
 setuptools/tests/fixtures.py           | 5 ++++-
 setuptools/tests/test_easy_install.py  | 5 ++++-
 setuptools/tests/test_msvc9compiler.py | 5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index b4b93b38e3..63093917cd 100755
--- a/setup.py
+++ b/setup.py
@@ -170,8 +170,7 @@ def build_package_data(self):
     tests_require=[
         'setuptools[ssl]',
         'pytest',
-        'mock',
-    ],
+    ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner,
 )
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 0b1eaf5f22..c70c38cb71 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 
 from . import contexts
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 72b040e1af..689860c3a6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,7 +15,10 @@
 import itertools
 
 import pytest
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from setuptools import sandbox
 from setuptools import compat
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index a0820fff91..e54e7a6e18 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -7,7 +7,10 @@
 import distutils.errors
 
 import pytest
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from . import contexts
 

From 1cd6c9a1f6840ff82217a9e7059b8ec7049f3a32 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 19:41:04 -0500
Subject: [PATCH 4865/8469] Skip integration tests when SSL is broken. Ref
 #317.

---
 setuptools/tests/test_integration.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 92a27080f9..90bb43136c 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -12,6 +12,7 @@
 from setuptools.command.easy_install import easy_install
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
+from setuptools.compat import urlopen
 
 
 def setup_module(module):
@@ -24,6 +25,11 @@ def setup_module(module):
         except ImportError:
             pass
 
+    try:
+        urlopen('https://pypi.python.org/pypi')
+    except Exception as exc:
+        pytest.skip(reason=str(exc))
+
 
 @pytest.fixture
 def install_context(request, tmpdir, monkeypatch):

From 3558c1a03584064e9bb86d3886009902eec6832d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 19:53:25 -0500
Subject: [PATCH 4866/8469] Have mock_install_dir actually yield the file name.
 Ref #317.

---
 setuptools/tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index e54e7a6e18..82c4d521af 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -173,4 +173,4 @@ def mock_install_dir():
             vcvarsall = os.path.join(result, 'vcvarsall.bat')
             with open(vcvarsall, 'w'):
                 pass
-            yield
+            yield vcvarsall

From 903de3abdd20a96051cedad2f0f4287a3a4b11b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 20:48:10 -0500
Subject: [PATCH 4867/8469] Just the path is expected

---
 setuptools/tests/test_msvc9compiler.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 82c4d521af..0790e3d2e4 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -113,7 +113,8 @@ def test_prefer_current_user(self, user_preferred_setting):
         Ensure user's settings are preferred.
         """
         result = distutils.msvc9compiler.find_vcvarsall(9.0)
-        assert user_preferred_setting == result
+        expected = os.path.join(user_preferred_setting, 'vcvarsall.bat')
+        assert expected == result
 
     @pytest.yield_fixture
     def local_machine_setting(self):
@@ -134,7 +135,8 @@ def test_local_machine_recognized(self, local_machine_setting):
         Ensure machine setting is honored if user settings are not present.
         """
         result = distutils.msvc9compiler.find_vcvarsall(9.0)
-        assert local_machine_setting == result
+        expected = os.path.join(local_machine_setting, 'vcvarsall.bat')
+        assert expected == result
 
     @pytest.yield_fixture
     def x64_preferred_setting(self):
@@ -160,7 +162,8 @@ def test_ensure_64_bit_preferred(self, x64_preferred_setting):
         Ensure 64-bit system key is preferred.
         """
         result = distutils.msvc9compiler.find_vcvarsall(9.0)
-        assert x64_preferred_setting == result
+        expected = os.path.join(x64_preferred_setting, 'vcvarsall.bat')
+        assert expected == result
 
     @staticmethod
     @contextlib.contextmanager
@@ -173,4 +176,4 @@ def mock_install_dir():
             vcvarsall = os.path.join(result, 'vcvarsall.bat')
             with open(vcvarsall, 'w'):
                 pass
-            yield vcvarsall
+            yield result

From 07dac60e9e33d9d74232eab325a3a8ad6a05e50d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 19:57:21 -0500
Subject: [PATCH 4868/8469] Remove unused import

---
 setuptools/msvc9_support.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index e76d70f079..2e4032b145 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,5 +1,3 @@
-import sys
-
 try:
     import distutils.msvc9compiler
 except ImportError:

From 64f09ab5fb6c9c0a0344e50388022ee6e2e85d85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 20:28:02 -0500
Subject: [PATCH 4869/8469] Extract variables

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

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 2e4032b145..a69c7474c8 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -27,13 +27,15 @@ def patch_for_specialized_compiler():
 def find_vcvarsall(version):
     Reg = distutils.msvc9compiler.Reg
     VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
+    key = VC_BASE % ('', version)
     try:
         # Per-user installs register the compiler path here
-        productdir = Reg.get_value(VC_BASE % ('', version), "installdir")
+        productdir = Reg.get_value(key, "installdir")
     except KeyError:
         try:
             # All-user installs on a 64-bit system register here
-            productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir")
+            key = VC_BASE % ('Wow6432Node\\', version)
+            productdir = Reg.get_value(key, "installdir")
         except KeyError:
             productdir = None
 

From 21ebac859dff95cb593180f7fffdf74d8a5e5275 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Jan 2015 21:09:57 -0500
Subject: [PATCH 4870/8469] Fix failing test by reverting to author's original
 intent. Ref #317

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

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 0790e3d2e4..09e0460c56 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -142,7 +142,7 @@ def test_local_machine_recognized(self, local_machine_setting):
     def x64_preferred_setting(self):
         """
         Set up environment with 64-bit and 32-bit system settings configured
-        and yield the 64-bit location.
+        and yield the canonical location.
         """
         with self.mock_install_dir() as x32_dir:
             with self.mock_install_dir() as x64_dir:
@@ -155,7 +155,7 @@ def x64_preferred_setting(self):
                     },
                 )
                 with reg:
-                    yield x64_dir
+                    yield x32_dir
 
     def test_ensure_64_bit_preferred(self, x64_preferred_setting):
         """

From 921fc3e28378598912d69d3f2a6ebdd090ed3e4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 15:33:09 -0500
Subject: [PATCH 4871/8469] Renamed .get_writer to .best and removed boolean
 argument.

---
 CHANGES.txt                           |  2 ++
 setuptools/command/easy_install.py    | 25 +++++++++++++++++++------
 setuptools/command/install_scripts.py | 11 ++++++-----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index afec81561a..ad419d2539 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ CHANGES
   ``build.executable``, such that an executable of "/usr/bin/env my-python" may
   be specified. This means that systems with a specified executable whose name
   has spaces in the path must be updated to escape or quote that value.
+* Deprecated ``easy_install.ScriptWriter.get_writer``, replaced by ``.best()``
+  with slightly different semantics (no force_windows flag).
 
 ------
 11.3.1
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 340b1fac93..b61ab03494 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -742,7 +742,7 @@ def maybe_move(self, spec, dist_filename, setup_base):
 
     def install_wrapper_scripts(self, dist):
         if not self.exclude_scripts:
-            for args in ScriptWriter.get_args(dist):
+            for args in ScriptWriter.best().get_args(dist):
                 self.write_script(*args)
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
@@ -1975,7 +1975,7 @@ class ScriptWriter(object):
     def get_script_args(cls, dist, executable=None, wininst=False):
         # for backward compatibility
         warnings.warn("Use get_args", DeprecationWarning)
-        writer = cls.get_writer(wininst)
+        writer = (WindowsScriptWriter if wininst else ScriptWriter).best()
         header = cls.get_script_header("", executable, wininst)
         return writer.get_args(dist, header)
 
@@ -2007,9 +2007,16 @@ def get_args(cls, dist, header=None):
 
     @classmethod
     def get_writer(cls, force_windows):
-        if force_windows or sys.platform == 'win32':
-            return WindowsScriptWriter.get_writer()
-        return cls
+        # for backward compatibility
+        warnings.warn("Use best", DeprecationWarning)
+        return WindowsScriptWriter.best() if force_windows else cls.best()
+
+    @classmethod
+    def best(cls):
+        """
+        Select the best ScriptWriter for this environment.
+        """
+        return WindowsScriptWriter.best() if sys.platform == 'win32' else cls
 
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
@@ -2027,8 +2034,14 @@ def get_header(cls, script_text="", executable=None):
 class WindowsScriptWriter(ScriptWriter):
     @classmethod
     def get_writer(cls):
+        # for backward compatibility
+        warnings.warn("Use best", DeprecationWarning)
+        return cls.best()
+
+    @classmethod
+    def best(cls):
         """
-        Get a script writer suitable for Windows
+        Select the best ScriptWriter suitable for Windows
         """
         writer_lookup = dict(
             executable=WindowsExecutableLauncherWriter,
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 722b0566ea..ad89c5fd6f 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -13,7 +13,7 @@ def initialize_options(self):
         self.no_ep = False
 
     def run(self):
-        from setuptools.command.easy_install import ScriptWriter, CommandSpec
+        import setuptools.command.easy_install as ei
 
         self.run_command("egg_info")
         if self.distribution.scripts:
@@ -30,14 +30,15 @@ def run(self):
             ei_cmd.egg_name, ei_cmd.egg_version,
         )
         bs_cmd = self.get_finalized_command('build_scripts')
-        cmd = CommandSpec.from_param(getattr(bs_cmd, 'executable', None))
+        cmd = ei.CommandSpec.from_param(getattr(bs_cmd, 'executable', None))
         is_wininst = getattr(
             self.get_finalized_command("bdist_wininst"), '_is_running', False
         )
+        writer = ei.ScriptWriter
         if is_wininst:
-            cmd = CommandSpec.from_string("python.exe")
-        writer = ScriptWriter.get_writer(force_windows=is_wininst)
-        for args in writer.get_args(dist, cmd.as_header()):
+            cmd = ei.CommandSpec.from_string("python.exe")
+            writer = ei.WindowsScriptWriter
+        for args in writer.best().get_args(dist, cmd.as_header()):
             self.write_script(*args)
 
     def write_script(self, script_name, contents, mode="t", *ignored):

From 2e8bbf46b8fba71b22d20e69224d86e4750726c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 16:38:28 -0500
Subject: [PATCH 4872/8469] Bumped to 12.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f1e4aeaeb2..70d45e1598 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "11.3.2"
+DEFAULT_VERSION = "12.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 1e71f92d11..f4e58d4652 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '11.3.2'
+__version__ = '12.0'

From fd43bed470262e8bb2dc87b78886ccca52b8ce52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 16:38:31 -0500
Subject: [PATCH 4873/8469] Added tag 12.0 for changeset 55666947c9eb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 343bfa9e6b..4763ed8196 100644
--- a/.hgtags
+++ b/.hgtags
@@ -186,3 +186,4 @@ b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
 feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
 a1a6a1ac9113b90009052ca7263174a488434099 11.3
 1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1
+55666947c9eb7e3ba78081ad6ae004807c84aede 12.0

From cda3ccf5c2b87212ca53b91fb782e2b858686dd3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 16:39:06 -0500
Subject: [PATCH 4874/8469] Bumped to 12.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 70d45e1598..dd1fea71b0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0"
+DEFAULT_VERSION = "12.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index f4e58d4652..9e9002b4d2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0'
+__version__ = '12.1'

From 072653066beade0dc5fde02c26e747002ab80baa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 17:22:22 -0500
Subject: [PATCH 4875/8469] Restore
 setuptools.command.easy_install.sys_executable for pbr compatibility.

---
 CHANGES.txt                        | 8 ++++++++
 setuptools/command/easy_install.py | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ad419d2539..d67758763e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+------
+12.0.1
+------
+
+* Restore ``setuptools.command.easy_install.sys_executable`` for pbr
+  compatibility. For the future, tools should construct a CommandSpec
+  explicitly.
+
 ----
 12.0
 ----
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b61ab03494..adb18140cc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -56,7 +56,6 @@
 )
 import pkg_resources
 
-
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
@@ -1917,6 +1916,9 @@ def _render(items):
         cmdline = subprocess.list2cmdline(items)
         return '#!' + cmdline + '\n'
 
+# For pbr compat; will be removed in a future version.
+sys_executable = CommandSpec._sys_executable()
+
 
 class JythonCommandSpec(CommandSpec):
     @classmethod
@@ -2238,4 +2240,3 @@ def gen_usage(script_name):
         yield
     finally:
         distutils.core.gen_usage = saved
-

From 085191a65831a18f81bd654d2171bcb7b0b3381a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 17:37:36 -0500
Subject: [PATCH 4876/8469] Bumped to 12.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index dd1fea71b0..040a1c26b4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.1"
+DEFAULT_VERSION = "12.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 9e9002b4d2..06db60e2b6 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.1'
+__version__ = '12.0.1'

From f1c04084ce88023ead9ef12b1aa7756fb1cb94b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 17:37:38 -0500
Subject: [PATCH 4877/8469] Added tag 12.0.1 for changeset 747018b2e35a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4763ed8196..8e3336491a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -187,3 +187,4 @@ feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
 a1a6a1ac9113b90009052ca7263174a488434099 11.3
 1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1
 55666947c9eb7e3ba78081ad6ae004807c84aede 12.0
+747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1

From 57fb24d60656bc99192c9768ff04dd78de9ef695 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Jan 2015 17:38:07 -0500
Subject: [PATCH 4878/8469] Bumped to 12.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 040a1c26b4..d86456fe54 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.1"
+DEFAULT_VERSION = "12.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 06db60e2b6..dd108765cb 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.1'
+__version__ = '12.0.2'

From fd7fb7ade0fc879e24543f13c39b00de073004bc Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Sat, 17 Jan 2015 21:41:55 +0100
Subject: [PATCH 4879/8469] Fix "AttributeError: 'TarFile' object has no
 attribute '__exit__'" with Python 3.1.

---
 setuptools/tests/py26compat.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index c53b480926..c56808816e 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -8,4 +8,7 @@ def _tarfile_open_ex(*args, **kwargs):
 	"""
 	return contextlib.closing(tarfile.open(*args, **kwargs))
 
-tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else tarfile.open
+if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
+    tarfile_open = _tarfile_open_ex
+else:
+    tarfile_open = tarfile.open

From 49a3b4c156062e4212ed59e2061a178577196fb6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 15:51:42 -0500
Subject: [PATCH 4880/8469] Remove unintended shebang. Fixes #333.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 689860c3a6..5e36044d30 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,4 +1,4 @@
-#! -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 """Easy install Tests
 """

From f2685d1d9311fa2603ea069d4ed13a74624c8f8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:22:59 -0500
Subject: [PATCH 4881/8469] Extract messages as class attributes for nicer
 indentation.

---
 setuptools/command/easy_install.py | 161 ++++++++++++++++-------------
 1 file changed, 88 insertions(+), 73 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index adb18140cc..fcd96bea34 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -445,43 +445,49 @@ def check_site_dir(self):
             self.pth_file = None  # and don't create a .pth file
         self.install_dir = instdir
 
-    def cant_write_to_target(self):
-        template = """can't create or remove files in install directory
+    __cant_write_msg = textwrap.dedent("""
+        can't create or remove files in install directory
 
-The following error occurred while trying to add or remove files in the
-installation directory:
+        The following error occurred while trying to add or remove files in the
+        installation directory:
 
-    %s
+            %s
 
-The installation directory you specified (via --install-dir, --prefix, or
-the distutils default setting) was:
+        The installation directory you specified (via --install-dir, --prefix, or
+        the distutils default setting) was:
 
-    %s
-"""
-        msg = template % (sys.exc_info()[1], self.install_dir,)
+            %s
+        """).lstrip()
 
-        if not os.path.exists(self.install_dir):
-            msg += """
-This directory does not currently exist.  Please create it and try again, or
-choose a different installation directory (using the -d or --install-dir
-option).
-"""
-        else:
-            msg += """
-Perhaps your account does not have write access to this directory?  If the
-installation directory is a system-owned directory, you may need to sign in
-as the administrator or "root" account.  If you do not have administrative
-access to this machine, you may wish to choose a different installation
-directory, preferably one that is listed in your PYTHONPATH environment
-variable.
+    __not_exists_id = textwrap.dedent("""
+        This directory does not currently exist.  Please create it and try again, or
+        choose a different installation directory (using the -d or --install-dir
+        option).
+        """).lstrip()
 
-For information on other options, you may wish to consult the
-documentation at:
+    __access_msg = textwrap.dedent("""
+        Perhaps your account does not have write access to this directory?  If the
+        installation directory is a system-owned directory, you may need to sign in
+        as the administrator or "root" account.  If you do not have administrative
+        access to this machine, you may wish to choose a different installation
+        directory, preferably one that is listed in your PYTHONPATH environment
+        variable.
 
-  https://pythonhosted.org/setuptools/easy_install.html
+        For information on other options, you may wish to consult the
+        documentation at:
 
-Please make the appropriate changes for your system and try again.
-"""
+          https://pythonhosted.org/setuptools/easy_install.html
+
+        Please make the appropriate changes for your system and try again.
+        """).lstrip()
+
+    def cant_write_to_target(self):
+        msg = self._cant_write_msg % (sys.exc_info()[1], self.install_dir,)
+
+        if not os.path.exists(self.install_dir):
+            msg += '\n' + self.__not_exists_id
+        else:
+            msg += '\n' + self.__access_msg
         raise DistutilsError(msg)
 
     def check_pth_processing(self):
@@ -979,46 +985,52 @@ def process(src, dst):
                     f.write('\n'.join(locals()[name]) + '\n')
                     f.close()
 
+    __mv_warning = textwrap.dedent("""
+        Because this distribution was installed --multi-version, before you can
+        import modules from this package in an application, you will need to
+        'import pkg_resources' and then use a 'require()' call similar to one of
+        these examples, in order to select the desired version:
+
+            pkg_resources.require("%(name)s")  # latest installed version
+            pkg_resources.require("%(name)s==%(version)s")  # this exact version
+            pkg_resources.require("%(name)s>=%(version)s")  # this version or higher
+        """).lstrip()
+
+    __id_warning = textwrap.dedent("""
+        Note also that the installation directory must be on sys.path at runtime for
+        this to work.  (e.g. by being the application's script directory, by being on
+        PYTHONPATH, or by being added to sys.path by your code.)
+        """)
+
     def installation_report(self, req, dist, what="Installed"):
         """Helpful installation message for display to package users"""
         msg = "\n%(what)s %(eggloc)s%(extras)s"
         if self.multi_version and not self.no_report:
-            msg += """
-
-Because this distribution was installed --multi-version, before you can
-import modules from this package in an application, you will need to
-'import pkg_resources' and then use a 'require()' call similar to one of
-these examples, in order to select the desired version:
-
-    pkg_resources.require("%(name)s")  # latest installed version
-    pkg_resources.require("%(name)s==%(version)s")  # this exact version
-    pkg_resources.require("%(name)s>=%(version)s")  # this version or higher
-"""
+            msg += '\n' + self.__mv_warning
             if self.install_dir not in map(normalize_path, sys.path):
-                msg += """
+                msg += '\n' + self.__id_warning
 
-Note also that the installation directory must be on sys.path at runtime for
-this to work.  (e.g. by being the application's script directory, by being on
-PYTHONPATH, or by being added to sys.path by your code.)
-"""
         eggloc = dist.location
         name = dist.project_name
         version = dist.version
         extras = ''  # TODO: self.report_extras(req, dist)
         return msg % locals()
 
-    def report_editable(self, spec, setup_script):
-        dirname = os.path.dirname(setup_script)
-        python = sys.executable
-        return """\nExtracted editable version of %(spec)s to %(dirname)s
+    __editable_msg = textwrap.dedent("""
+        Extracted editable version of %(spec)s to %(dirname)s
 
-If it uses setuptools in its setup script, you can activate it in
-"development" mode by going to that directory and running::
+        If it uses setuptools in its setup script, you can activate it in
+        "development" mode by going to that directory and running::
 
-    %(python)s setup.py develop
+            %(python)s setup.py develop
 
-See the setuptools documentation for the "develop" command for more info.
-""" % locals()
+        See the setuptools documentation for the "develop" command for more info.
+        """).lstrip()
+
+    def report_editable(self, spec, setup_script):
+        dirname = os.path.dirname(setup_script)
+        python = sys.executable
+        return '\n' + self.__editable_msg % locals()
 
     def run_setup(self, setup_script, setup_base, args):
         sys.modules.setdefault('distutils.command.bdist_egg', bdist_egg)
@@ -1169,35 +1181,38 @@ def byte_compile(self, to_compile):
         finally:
             log.set_verbosity(self.verbose)  # restore original verbosity
 
-    def no_default_version_msg(self):
-        template = """bad install directory or PYTHONPATH
+    __no_default_msg = textwrap.dedent("""
+        bad install directory or PYTHONPATH
 
-You are attempting to install a package to a directory that is not
-on PYTHONPATH and which Python does not read ".pth" files from.  The
-installation directory you specified (via --install-dir, --prefix, or
-the distutils default setting) was:
+        You are attempting to install a package to a directory that is not
+        on PYTHONPATH and which Python does not read ".pth" files from.  The
+        installation directory you specified (via --install-dir, --prefix, or
+        the distutils default setting) was:
 
-    %s
+            %s
 
-and your PYTHONPATH environment variable currently contains:
+        and your PYTHONPATH environment variable currently contains:
 
-    %r
+            %r
 
-Here are some of your options for correcting the problem:
+        Here are some of your options for correcting the problem:
 
-* You can choose a different installation directory, i.e., one that is
-  on PYTHONPATH or supports .pth files
+        * You can choose a different installation directory, i.e., one that is
+          on PYTHONPATH or supports .pth files
 
-* You can add the installation directory to the PYTHONPATH environment
-  variable.  (It must then also be on PYTHONPATH whenever you run
-  Python and want to use the package(s) you are installing.)
+        * You can add the installation directory to the PYTHONPATH environment
+          variable.  (It must then also be on PYTHONPATH whenever you run
+          Python and want to use the package(s) you are installing.)
 
-* You can set up the installation directory to support ".pth" files by
-  using one of the approaches described here:
+        * You can set up the installation directory to support ".pth" files by
+          using one of the approaches described here:
 
-  https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
+          https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
 
-Please make the appropriate changes for your system and try again."""
+        Please make the appropriate changes for your system and try again.""").lstrip()
+
+    def no_default_version_msg(self):
+        template = self.__no_default_msg
         return template % (self.install_dir, os.environ.get('PYTHONPATH', ''))
 
     def install_site_py(self):

From 7cf2343ad9f5b77992422598d27d1f70e9473db0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:45:22 -0500
Subject: [PATCH 4882/8469] Extract variable for bdist_wininst command

---
 setuptools/command/install_scripts.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index ad89c5fd6f..cad524ec89 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -31,9 +31,8 @@ def run(self):
         )
         bs_cmd = self.get_finalized_command('build_scripts')
         cmd = ei.CommandSpec.from_param(getattr(bs_cmd, 'executable', None))
-        is_wininst = getattr(
-            self.get_finalized_command("bdist_wininst"), '_is_running', False
-        )
+        bw_cmd = self.get_finalized_command("bdist_wininst")
+        is_wininst = getattr(bw_cmd, '_is_running', False)
         writer = ei.ScriptWriter
         if is_wininst:
             cmd = ei.CommandSpec.from_string("python.exe")

From 0d32bf350dce5cf21c821b9216799fa53550c5c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:46:46 -0500
Subject: [PATCH 4883/8469] Extract variable for exec_param

---
 setuptools/command/install_scripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index cad524ec89..f85f452022 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -30,7 +30,8 @@ def run(self):
             ei_cmd.egg_name, ei_cmd.egg_version,
         )
         bs_cmd = self.get_finalized_command('build_scripts')
-        cmd = ei.CommandSpec.from_param(getattr(bs_cmd, 'executable', None))
+        exec_param = getattr(bs_cmd, 'executable', None)
+        cmd = ei.CommandSpec.from_param(exec_param)
         bw_cmd = self.get_finalized_command("bdist_wininst")
         is_wininst = getattr(bw_cmd, '_is_running', False)
         writer = ei.ScriptWriter

From 0a0f7d5816fa7e42fd787d4923265adc965e1360 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:54:01 -0500
Subject: [PATCH 4884/8469] Defer resolution of the CommandSpec and do it
 exactly once.

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

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index f85f452022..af079fbb15 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -31,13 +31,13 @@ def run(self):
         )
         bs_cmd = self.get_finalized_command('build_scripts')
         exec_param = getattr(bs_cmd, 'executable', None)
-        cmd = ei.CommandSpec.from_param(exec_param)
         bw_cmd = self.get_finalized_command("bdist_wininst")
         is_wininst = getattr(bw_cmd, '_is_running', False)
         writer = ei.ScriptWriter
         if is_wininst:
-            cmd = ei.CommandSpec.from_string("python.exe")
+            exec_param = "python.exe"
             writer = ei.WindowsScriptWriter
+        cmd = ei.CommandSpec.from_param(exec_param)
         for args in writer.best().get_args(dist, cmd.as_header()):
             self.write_script(*args)
 

From 97f96e8cd4d1938095101f26a28f17d6a3f97435 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:55:09 -0500
Subject: [PATCH 4885/8469] Extract writer resolution as a variable

---
 setuptools/command/install_scripts.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index af079fbb15..8d251ee724 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -37,8 +37,10 @@ def run(self):
         if is_wininst:
             exec_param = "python.exe"
             writer = ei.WindowsScriptWriter
+        # resolve the writer to the environment
+        writer = writer.best()
         cmd = ei.CommandSpec.from_param(exec_param)
-        for args in writer.best().get_args(dist, cmd.as_header()):
+        for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 
     def write_script(self, script_name, contents, mode="t", *ignored):

From 43ffa78752de38190b2480b68d9ad908cf1b7fa5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 19:57:02 -0500
Subject: [PATCH 4886/8469] Allow the CommandSpec class to be resolved by the
 writer.

---
 setuptools/command/easy_install.py    | 2 ++
 setuptools/command/install_scripts.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index fcd96bea34..9d25a1397b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1988,6 +1988,8 @@ class ScriptWriter(object):
             )
     """).lstrip()
 
+    command_spec_class = CommandSpec
+
     @classmethod
     def get_script_args(cls, dist, executable=None, wininst=False):
         # for backward compatibility
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 8d251ee724..9d4ac4207b 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -39,7 +39,7 @@ def run(self):
             writer = ei.WindowsScriptWriter
         # resolve the writer to the environment
         writer = writer.best()
-        cmd = ei.CommandSpec.from_param(exec_param)
+        cmd = writer.command_spec_cls.from_param(exec_param)
         for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 

From 659e2bd057382e4819f38c2c77ff3b7783d63c6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:11:29 -0500
Subject: [PATCH 4887/8469] Adding test capturing failure where sys.executable
 loses backslashes on Windows. Ref #331.

---
 setuptools/tests/test_easy_install.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 5e36044d30..914613647d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -517,3 +517,11 @@ def test_from_simple_string_uses_shlex(self):
         cmd = CommandSpec.from_param('/usr/bin/env my-python')
         assert len(cmd) == 2
         assert '"' not in cmd.as_header()
+
+    def test_sys_executable(self):
+        """
+        CommandSpec.from_string(sys.executable) should contain just that param.
+        """
+        cmd = CommandSpec.from_string(sys.executable)
+        assert len(cmd) == 1
+        assert cmd[0] == sys.executable

From 246a5982a37f38c70012326577278582f0b01ef2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:17:12 -0500
Subject: [PATCH 4888/8469] Use the command spec as resolved by the best
 ScriptWriter.

---
 setuptools/tests/test_easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 914613647d..cbbe99db6e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -522,6 +522,7 @@ def test_sys_executable(self):
         """
         CommandSpec.from_string(sys.executable) should contain just that param.
         """
-        cmd = CommandSpec.from_string(sys.executable)
+        writer = ScriptWriter.best()
+        cmd = writer.command_spec_class.from_string(sys.executable)
         assert len(cmd) == 1
         assert cmd[0] == sys.executable

From 8711abcb4bac42e771647718e6994c6847e0383a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:18:38 -0500
Subject: [PATCH 4889/8469] Also use command_spec_class in ScriptWriter.

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9d25a1397b..137193f139 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2004,7 +2004,7 @@ def get_script_header(cls, script_text, executable=None, wininst=False):
         warnings.warn("Use get_header", DeprecationWarning)
         if wininst:
             executable = "python.exe"
-        cmd = CommandSpec.from_param(executable)
+        cmd = cls.command_spec_class.from_param(executable)
         cmd.install_options(script_text)
         return cmd.as_header()
 
@@ -2045,7 +2045,7 @@ def _get_script_args(cls, type_, name, header, script_text):
     @classmethod
     def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
-        cmd = CommandSpec.from_param(executable)
+        cmd = cls.command_spec_class.from_param(executable)
         cmd.install_options(script_text)
         return cmd.as_header()
 

From 27ffea086d37a26dbac2ebbd8b1e0edb4c8a803e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:27:56 -0500
Subject: [PATCH 4890/8469] Use non-posix semantics in a WindowsCommandSpec and
 use that class in the Windows script writers. Fixes #331.

---
 setuptools/command/easy_install.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 137193f139..541666cee2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1873,6 +1873,7 @@ class CommandSpec(list):
     """
 
     options = []
+    split_args = dict()
 
     @classmethod
     def _sys_executable(cls):
@@ -1904,7 +1905,7 @@ def from_string(cls, string):
         Construct a command spec from a simple string representing a command
         line parseable by shlex.split.
         """
-        items = shlex.split(string)
+        items = shlex.split(string, **cls.split_args)
         return JythonCommandSpec.from_string(string) or cls(items)
 
     def install_options(self, script_text):
@@ -1935,6 +1936,10 @@ def _render(items):
 sys_executable = CommandSpec._sys_executable()
 
 
+class WindowsCommandSpec(CommandSpec):
+    split_args = dict(posix=False)
+
+
 class JythonCommandSpec(CommandSpec):
     @classmethod
     def from_string(cls, string):
@@ -2051,6 +2056,8 @@ def get_header(cls, script_text="", executable=None):
 
 
 class WindowsScriptWriter(ScriptWriter):
+    command_spec_class = WindowsCommandSpec
+
     @classmethod
     def get_writer(cls):
         # for backward compatibility

From 768ffcf6707173a6ca34e71ba8776d282ccd41bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:32:31 -0500
Subject: [PATCH 4891/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d67758763e..e9da34d2fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+12.0.2
+------
+
+* Issue #331: Fixed ``install_scripts`` command on Windows systems corrupting
+  the header.
+
 ------
 12.0.1
 ------

From 4fb993309210598e35e6db7bef9dcd6f19bb2117 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:34:55 -0500
Subject: [PATCH 4892/8469] Added tag 12.0.2 for changeset a177ea34bf81

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8e3336491a..7542030ccd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -188,3 +188,4 @@ a1a6a1ac9113b90009052ca7263174a488434099 11.3
 1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1
 55666947c9eb7e3ba78081ad6ae004807c84aede 12.0
 747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1
+a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2

From c1f5cdb9d49d2dc6872c1c51a94dbcc95526666a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:35:36 -0500
Subject: [PATCH 4893/8469] Bumped to 12.0.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d86456fe54..1a33e27645 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.2"
+DEFAULT_VERSION = "12.0.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index dd108765cb..410c5970ca 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.2'
+__version__ = '12.0.3'

From e584d52bc8080aa0e1dfec9514068bfef175b7fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:46:32 -0500
Subject: [PATCH 4894/8469] Correct command reference.

---
 setuptools/command/install_scripts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 9d4ac4207b..20c2cce9f7 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -39,7 +39,7 @@ def run(self):
             writer = ei.WindowsScriptWriter
         # resolve the writer to the environment
         writer = writer.best()
-        cmd = writer.command_spec_cls.from_param(exec_param)
+        cmd = writer.command_spec_class.from_param(exec_param)
         for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 

From 45ee5d3515f43c022ad4587f31325135c5ce4a3d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:48:20 -0500
Subject: [PATCH 4895/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index e9da34d2fb..80a9e9c9d0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+12.0.3
+------
+
+* Fixed incorrect class attribute in ``install_scripts``. Tests would be nice.
+
 ------
 12.0.2
 ------

From df3410f0134a756c9d8ef659694157985fa86aba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:48:32 -0500
Subject: [PATCH 4896/8469] Added tag 12.0.3 for changeset bf8c5bcacd49

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7542030ccd..dd756cbcb4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -189,3 +189,4 @@ a1a6a1ac9113b90009052ca7263174a488434099 11.3
 55666947c9eb7e3ba78081ad6ae004807c84aede 12.0
 747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1
 a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
+bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3

From c808d232427ed8072b3b46b9e1c03df9d4cf9f76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Jan 2015 20:49:13 -0500
Subject: [PATCH 4897/8469] Bumped to 12.0.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1a33e27645..2d7611c083 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.3"
+DEFAULT_VERSION = "12.0.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 410c5970ca..2527f6f75a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.3'
+__version__ = '12.0.4'

From ad794c2809cc2ad0a48a14129dca82996f14af28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 20:33:29 -0500
Subject: [PATCH 4898/8469] Use a .best classmethod to resolve
 JythonCommandSpec when relevant.

---
 setuptools/command/easy_install.py    | 35 +++++++++++++++++----------
 setuptools/command/install_scripts.py |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index dda183c817..9978c132dc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1875,6 +1875,13 @@ class CommandSpec(list):
     options = []
     split_args = dict()
 
+    @classmethod
+    def best(cls):
+        """
+        Choose the best CommandSpec class based on environmental conditions.
+        """
+        return cls if not JythonCommandSpec.relevant() else JythonCommandSpec
+
     @classmethod
     def _sys_executable(cls):
         _default = os.path.normpath(sys.executable)
@@ -1897,9 +1904,7 @@ def from_param(cls, param):
 
     @classmethod
     def from_environment(cls):
-        string = '"' + cls._sys_executable() + '"'
-        jython_spec = JythonCommandSpec.from_string(string)
-        return jython_spec or cls([cls._sys_executable()])
+        return cls([cls._sys_executable()])
 
     @classmethod
     def from_string(cls, string):
@@ -1908,7 +1913,7 @@ def from_string(cls, string):
         line parseable by shlex.split.
         """
         items = shlex.split(string, **cls.split_args)
-        return JythonCommandSpec.from_string(string) or cls(items)
+        return cls(items)
 
     def install_options(self, script_text):
         self.options = shlex.split(self._extract_options(script_text))
@@ -1944,17 +1949,21 @@ class WindowsCommandSpec(CommandSpec):
 
 class JythonCommandSpec(CommandSpec):
     @classmethod
-    def from_string(cls, string):
-        """
-        On Jython, construct an instance of this class.
-        On platforms other than Jython, return None.
-        """
-        needs_jython_spec = (
+    def relevant(cls):
+        return (
             sys.platform.startswith('java')
             and
             __import__('java').lang.System.getProperty('os.name') != 'Linux'
         )
-        return cls([string]) if needs_jython_spec else None
+
+    @classmethod
+    def from_environment(cls):
+        string = '"' + cls._sys_executable() + '"'
+        return cls.from_string(string)
+
+    @classmethod
+    def from_string(cls, string):
+        return cls([string])
 
     def as_header(self):
         """
@@ -2011,7 +2020,7 @@ def get_script_header(cls, script_text, executable=None, wininst=False):
         warnings.warn("Use get_header", DeprecationWarning)
         if wininst:
             executable = "python.exe"
-        cmd = cls.command_spec_class.from_param(executable)
+        cmd = cls.command_spec_class.best().from_param(executable)
         cmd.install_options(script_text)
         return cmd.as_header()
 
@@ -2052,7 +2061,7 @@ def _get_script_args(cls, type_, name, header, script_text):
     @classmethod
     def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
-        cmd = cls.command_spec_class.from_param(executable)
+        cmd = cls.command_spec_class.best().from_param(executable)
         cmd.install_options(script_text)
         return cmd.as_header()
 
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 20c2cce9f7..be66cb2252 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -39,7 +39,7 @@ def run(self):
             writer = ei.WindowsScriptWriter
         # resolve the writer to the environment
         writer = writer.best()
-        cmd = writer.command_spec_class.from_param(exec_param)
+        cmd = writer.command_spec_class.best().from_param(exec_param)
         for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 

From 9209b9f7ce6ecb4d9518037b2463bbedd544dcfc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 20:48:18 -0500
Subject: [PATCH 4899/8469] Decode file as latin-1 when opening to ensure
 decoding any bytes.

---
 setuptools/command/easy_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9978c132dc..5e25f2cd20 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1801,9 +1801,8 @@ def is_python(text, filename='<string>'):
 def is_sh(executable):
     """Determine if the specified executable is a .sh (contains a #! line)"""
     try:
-        fp = open(executable)
-        magic = fp.read(2)
-        fp.close()
+        with open(executable, encoding='latin-1') as fp:
+            magic = fp.read(2)
     except (OSError, IOError):
         return executable
     return magic == '#!'

From adbb4edde04b071e4b092b675bb0c2ffb66a0977 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 21:03:56 -0500
Subject: [PATCH 4900/8469] Deprecate fix_jython_executable and replace with
 JythonCommandSpec

---
 setuptools/command/easy_install.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5e25f2cd20..b8efff73f1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1844,25 +1844,14 @@ def chmod(path, mode):
 
 
 def fix_jython_executable(executable, options):
-    if sys.platform.startswith('java') and is_sh(executable):
-        # Workaround for Jython is not needed on Linux systems.
-        import java
+    warnings.warn("Use JythonCommandSpec", DeprecationWarning, stacklevel=2)
 
-        if java.lang.System.getProperty("os.name") == "Linux":
-            return executable
+    if not JythonCommandSpec.relevant():
+        return executable
 
-        # Workaround Jython's sys.executable being a .sh (an invalid
-        # shebang line interpreter)
-        if options:
-            # Can't apply the workaround, leave it broken
-            log.warn(
-                "WARNING: Unable to adapt shebang line for Jython,"
-                " the following script is NOT executable\n"
-                "         see http://bugs.jython.org/issue1112 for"
-                " more information.")
-        else:
-            return '/usr/bin/env %s' % executable
-    return executable
+    cmd = CommandSpec.best().from_param(executable)
+    cmd.install_options(options)
+    return cmd.as_header().lstrip('#!').rstrip('\n')
 
 
 class CommandSpec(list):

From 0a81b14fbfdf9b41bf128c99da42a374dff6122a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 21:05:41 -0500
Subject: [PATCH 4901/8469] Replace use of fix_jython_executable with
 CommandSpec invocation.

---
 setuptools/tests/test_easy_install.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a2f26e0885..3be829c56a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -26,7 +26,7 @@
 from setuptools.sandbox import run_setup
 import setuptools.command.easy_install as ei
 from setuptools.command.easy_install import (
-    easy_install, fix_jython_executable, nt_quote_arg,
+    easy_install, nt_quote_arg,
     is_sh, ScriptWriter, CommandSpec,
 )
 from setuptools.command.easy_install import PthDistributions
@@ -51,8 +51,7 @@ def get_entry_map(self, group):
     def as_requirement(self):
         return 'spec'
 
-WANTED = DALS("""
-    #!%s
+WANTED = ei.CommandSpec.best().from_environment().as_header() + DALS("""
     # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
     __requires__ = 'spec'
     import sys
@@ -62,7 +61,7 @@ def as_requirement(self):
         sys.exit(
             load_entry_point('spec', 'console_scripts', 'name')()
         )
-    """) % nt_quote_arg(fix_jython_executable(sys.executable, ""))
+    """)
 
 SETUP_PY = DALS("""
     from setuptools import setup

From 2554cbb108a56ab4932e7f1a773f5a57abdabcd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 21:09:10 -0500
Subject: [PATCH 4902/8469] Use module namespace.

---
 setuptools/tests/test_easy_install.py | 51 +++++++++++++--------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3be829c56a..51d6f09421 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -25,10 +25,6 @@
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup
 import setuptools.command.easy_install as ei
-from setuptools.command.easy_install import (
-    easy_install, nt_quote_arg,
-    is_sh, ScriptWriter, CommandSpec,
-)
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
@@ -73,7 +69,7 @@ class TestEasyInstallTest:
 
     def test_install_site_py(self):
         dist = Distribution()
-        cmd = easy_install(dist)
+        cmd = ei.easy_install(dist)
         cmd.sitepy_installed = False
         cmd.install_dir = tempfile.mkdtemp()
         try:
@@ -86,7 +82,7 @@ def test_install_site_py(self):
     def test_get_script_args(self):
         dist = FakeDist()
 
-        args = next(ScriptWriter.get_args(dist))
+        args = next(ei.ScriptWriter.get_args(dist))
         name, script = itertools.islice(args, 2)
 
         assert script == WANTED
@@ -95,7 +91,7 @@ def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at
         # the project level
         dist = Distribution()
-        cmd = easy_install(dist)
+        cmd = ei.easy_install(dist)
         cmd.check_pth_processing = lambda: True
         cmd.no_find_links = True
         cmd.find_links = ['link1', 'link2']
@@ -105,7 +101,7 @@ def test_no_find_links(self):
         assert cmd.package_index.scanned_urls == {}
 
         # let's try without it (default behavior)
-        cmd = easy_install(dist)
+        cmd = ei.easy_install(dist)
         cmd.check_pth_processing = lambda: True
         cmd.find_links = ['link1', 'link2']
         cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok')
@@ -154,7 +150,7 @@ def test_user_install_implied(self):
         #XXX: replace with something meaningfull
         dist = Distribution()
         dist.script_name = 'setup.py'
-        cmd = easy_install(dist)
+        cmd = ei.easy_install(dist)
         cmd.args = ['py']
         cmd.ensure_finalized()
         assert cmd.user, 'user should be implied'
@@ -175,7 +171,7 @@ def test_user_install_not_implied_without_usersite_enabled(self):
         #XXX: replace with something meaningfull
         dist = Distribution()
         dist.script_name = 'setup.py'
-        cmd = easy_install(dist)
+        cmd = ei.easy_install(dist)
         cmd.args = ['py']
         cmd.initialize_options()
         assert not cmd.user, 'NOT user should be implied'
@@ -196,7 +192,7 @@ def test_local_index(self):
         try:
             dist = Distribution()
             dist.script_name = 'setup.py'
-            cmd = easy_install(dist)
+            cmd = ei.easy_install(dist)
             cmd.install_dir = target
             cmd.args = ['foo']
             cmd.ensure_finalized()
@@ -423,24 +419,25 @@ class TestScriptHeader:
     exe_with_spaces = r'C:\Program Files\Python33\python.exe'
 
     @pytest.mark.skipif(
-        sys.platform.startswith('java') and is_sh(sys.executable),
+        sys.platform.startswith('java') and ei.is_sh(sys.executable),
         reason="Test cannot run under java when executable is sh"
     )
     def test_get_script_header(self):
-        expected = '#!%s\n' % nt_quote_arg(os.path.normpath(sys.executable))
-        actual = ScriptWriter.get_script_header('#!/usr/local/bin/python')
+        expected = '#!%s\n' % ei.nt_quote_arg(os.path.normpath(sys.executable))
+        actual = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python')
         assert actual == expected
 
-        expected = '#!%s -x\n' % nt_quote_arg(os.path.normpath(sys.executable))
-        actual = ScriptWriter.get_script_header('#!/usr/bin/python -x')
+        expected = '#!%s -x\n' % ei.nt_quote_arg(os.path.normpath
+            (sys.executable))
+        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x')
         assert actual == expected
 
-        actual = ScriptWriter.get_script_header('#!/usr/bin/python',
+        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
             executable=self.non_ascii_exe)
         expected = '#!%s -x\n' % self.non_ascii_exe
         assert actual == expected
 
-        actual = ScriptWriter.get_script_header('#!/usr/bin/python',
+        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
             executable='"'+self.exe_with_spaces+'"')
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
@@ -463,7 +460,7 @@ def test_get_script_header_jython_workaround(self, tmpdir):
             f.write(header)
         exe = str(exe)
 
-        header = ScriptWriter.get_script_header('#!/usr/local/bin/python',
+        header = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python',
             executable=exe)
         assert header == '#!/usr/bin/env %s\n' % exe
 
@@ -472,14 +469,14 @@ def test_get_script_header_jython_workaround(self, tmpdir):
         with contexts.quiet() as (stdout, stderr):
             # When options are included, generate a broken shebang line
             # with a warning emitted
-            candidate = ScriptWriter.get_script_header('#!/usr/bin/python -x',
+            candidate = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x',
                 executable=exe)
             assert candidate == '#!%s -x\n' % exe
             output = locals()[expect_out]
             assert 'Unable to adapt shebang line' in output.getvalue()
 
         with contexts.quiet() as (stdout, stderr):
-            candidate = ScriptWriter.get_script_header('#!/usr/bin/python',
+            candidate = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
                 executable=self.non_ascii_exe)
             assert candidate == '#!%s -x\n' % self.non_ascii_exe
             output = locals()[expect_out]
@@ -492,20 +489,20 @@ def test_custom_launch_command(self):
         Show how a custom CommandSpec could be used to specify a #! executable
         which takes parameters.
         """
-        cmd = CommandSpec(['/usr/bin/env', 'python3'])
+        cmd = ei.CommandSpec(['/usr/bin/env', 'python3'])
         assert cmd.as_header() == '#!/usr/bin/env python3\n'
 
     def test_from_param_for_CommandSpec_is_passthrough(self):
         """
         from_param should return an instance of a CommandSpec
         """
-        cmd = CommandSpec(['python'])
-        cmd_new = CommandSpec.from_param(cmd)
+        cmd = ei.CommandSpec(['python'])
+        cmd_new = ei.CommandSpec.from_param(cmd)
         assert cmd is cmd_new
 
     def test_from_environment_with_spaces_in_executable(self):
         with mock.patch('sys.executable', TestScriptHeader.exe_with_spaces):
-            cmd = CommandSpec.from_environment()
+            cmd = ei.CommandSpec.from_environment()
         assert len(cmd) == 1
         assert cmd.as_header().startswith('#!"')
 
@@ -514,7 +511,7 @@ def test_from_simple_string_uses_shlex(self):
         In order to support `executable = /usr/bin/env my-python`, make sure
         from_param invokes shlex on that input.
         """
-        cmd = CommandSpec.from_param('/usr/bin/env my-python')
+        cmd = ei.CommandSpec.from_param('/usr/bin/env my-python')
         assert len(cmd) == 2
         assert '"' not in cmd.as_header()
 
@@ -522,7 +519,7 @@ def test_sys_executable(self):
         """
         CommandSpec.from_string(sys.executable) should contain just that param.
         """
-        writer = ScriptWriter.best()
+        writer = ei.ScriptWriter.best()
         cmd = writer.command_spec_class.from_string(sys.executable)
         assert len(cmd) == 1
         assert cmd[0] == sys.executable

From 209fbc31d5df376de6db40bc6b1d1d50e87a0a83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 21:11:36 -0500
Subject: [PATCH 4903/8469] Move global into the only method where it's used.

---
 setuptools/tests/test_easy_install.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 51d6f09421..ab6a8f0dab 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -47,18 +47,6 @@ def get_entry_map(self, group):
     def as_requirement(self):
         return 'spec'
 
-WANTED = ei.CommandSpec.best().from_environment().as_header() + DALS("""
-    # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-    __requires__ = 'spec'
-    import sys
-    from pkg_resources import load_entry_point
-
-    if __name__ == '__main__':
-        sys.exit(
-            load_entry_point('spec', 'console_scripts', 'name')()
-        )
-    """)
-
 SETUP_PY = DALS("""
     from setuptools import setup
 
@@ -80,12 +68,24 @@ def test_install_site_py(self):
             shutil.rmtree(cmd.install_dir)
 
     def test_get_script_args(self):
+        header = ei.CommandSpec.best().from_environment().as_header()
+        expected = header + DALS("""
+            # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
+            __requires__ = 'spec'
+            import sys
+            from pkg_resources import load_entry_point
+
+            if __name__ == '__main__':
+                sys.exit(
+                    load_entry_point('spec', 'console_scripts', 'name')()
+                )
+            """)
         dist = FakeDist()
 
         args = next(ei.ScriptWriter.get_args(dist))
         name, script = itertools.islice(args, 2)
 
-        assert script == WANTED
+        assert script == expected
 
     def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at

From d66e85f360940a5e583ef6a363d20e8aa8cfd486 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 21:47:02 -0500
Subject: [PATCH 4904/8469] Use io module for Python 2 compatibility

---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b8efff73f1..206fc58dc6 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -37,6 +37,7 @@
 import contextlib
 import subprocess
 import shlex
+import io
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
@@ -1801,7 +1802,7 @@ def is_python(text, filename='<string>'):
 def is_sh(executable):
     """Determine if the specified executable is a .sh (contains a #! line)"""
     try:
-        with open(executable, encoding='latin-1') as fp:
+        with io.open(executable, encoding='latin-1') as fp:
             magic = fp.read(2)
     except (OSError, IOError):
         return executable

From d3e60f4d454d43f0b0bf3d5e0811bf5b8fbeb92d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 22:06:15 -0500
Subject: [PATCH 4905/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 80a9e9c9d0..97c16c5e22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+12.0.4
+------
+
+* Issue #335: Fix script header generation on Windows.
+
 ------
 12.0.3
 ------

From fe1968668732b7a60e94b311d59182a9d710cac7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 22:08:41 -0500
Subject: [PATCH 4906/8469] Added tag 12.0.4 for changeset 73dcfc90e3ee

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dd756cbcb4..99bd72930e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -190,3 +190,4 @@ a1a6a1ac9113b90009052ca7263174a488434099 11.3
 747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1
 a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
 bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
+73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4

From 71f6d20fcaa959ef429aa162d1f7c1fa73f52a44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 22:16:20 -0500
Subject: [PATCH 4907/8469] Bumped to 12.0.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2d7611c083..a720627825 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.4"
+DEFAULT_VERSION = "12.0.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index 2527f6f75a..8bb69c5f6d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.4'
+__version__ = '12.0.5'

From 2cf86e6e6e8f68370eb797eade989168b37edcf1 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Mon, 19 Jan 2015 21:11:33 +1100
Subject: [PATCH 4908/8469] pep8 and pep257 compliance

---
 ez_setup.py | 85 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 27 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a720627825..bbcef8c703 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-"""Bootstrap setuptools installation
+"""Bootstrap setuptools installation.
 
 To use setuptools in your package's setup.py, include this
 file in the same directory and add this to the top of your setup.py::
@@ -39,8 +39,11 @@
 DEFAULT_VERSION = "12.0.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
+
 def _python_cmd(*args):
     """
+    Execute a command.
+
     Return True if the command succeeded.
     """
     args = (sys.executable,) + args
@@ -48,6 +51,7 @@ def _python_cmd(*args):
 
 
 def _install(archive_filename, install_args=()):
+    """Install Setuptools."""
     with archive_context(archive_filename):
         # installing
         log.warn('Installing Setuptools')
@@ -59,6 +63,7 @@ def _install(archive_filename, install_args=()):
 
 
 def _build_egg(egg, archive_filename, to_dir):
+    """Build Setuptools egg."""
     with archive_context(archive_filename):
         # building an egg
         log.warn('Building a Setuptools egg in %s', to_dir)
@@ -70,20 +75,19 @@ def _build_egg(egg, archive_filename, to_dir):
 
 
 class ContextualZipFile(zipfile.ZipFile):
-    """
-    Supplement ZipFile class to support context manager for Python 2.6
-    """
+
+    """Supplement ZipFile class to support context manager for Python 2.6."""
 
     def __enter__(self):
+        """Context manager __enter__ hook."""
         return self
 
     def __exit__(self, type, value, traceback):
+        """Context manager __exit__ hook."""
         self.close()
 
     def __new__(cls, *args, **kwargs):
-        """
-        Construct a ZipFile or ContextualZipFile as appropriate
-        """
+        """Construct a ZipFile or ContextualZipFile as appropriate."""
         if hasattr(zipfile.ZipFile, '__exit__'):
             return zipfile.ZipFile(*args, **kwargs)
         return super(ContextualZipFile, cls).__new__(cls)
@@ -91,7 +95,7 @@ def __new__(cls, *args, **kwargs):
 
 @contextlib.contextmanager
 def archive_context(filename):
-    # extracting the archive
+    """Extract archive."""
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
@@ -112,6 +116,7 @@ def archive_context(filename):
 
 
 def _do_download(version, download_base, to_dir, download_delay):
+    """Download Setuptools."""
     egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg'
                        % (version, sys.version_info[0], sys.version_info[1]))
     if not os.path.exists(egg):
@@ -129,8 +134,10 @@ def _do_download(version, download_base, to_dir, download_delay):
     setuptools.bootstrap_install_from = egg
 
 
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+def use_setuptools(
+        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, download_delay=15):
+    """Download, install and use Setuptools."""
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
@@ -146,9 +153,9 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     except pkg_resources.VersionConflict as VC_err:
         if imported:
             msg = textwrap.dedent("""
-                The required version of setuptools (>={version}) is not available,
-                and can't be installed while this script is running. Please
-                install a more recent version first, using
+                The required version of setuptools (>={version}) is not
+                available, and can't be installed while this script is running.
+                Please install a more recent version first, using
                 'easy_install -U setuptools'.
 
                 (Currently using {VC_err.args[0]!r})
@@ -160,10 +167,12 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         del pkg_resources, sys.modules['pkg_resources']
         return _do_download(version, download_base, to_dir, download_delay)
 
+
 def _clean_check(cmd, target):
     """
-    Run the command to download target. If the command fails, clean up before
-    re-raising the error.
+    Run the command to download target.
+
+    If the command fails, clean up before re-raising the error.
     """
     try:
         subprocess.check_call(cmd)
@@ -172,10 +181,13 @@ def _clean_check(cmd, target):
             os.unlink(target)
         raise
 
+
 def download_file_powershell(url, target):
     """
-    Download the file at url to target using Powershell (which will validate
-    trust). Raise an exception if the command cannot complete.
+    Download the file at url to target using Powershell.
+    
+    Powershell will validate trust.
+    Raise an exception if the command cannot complete.
     """
     target = os.path.abspath(target)
     ps_cmd = (
@@ -191,7 +203,9 @@ def download_file_powershell(url, target):
     ]
     _clean_check(cmd, target)
 
+
 def has_powershell():
+    """Determine if Powershell is available."""
     if platform.system() != 'Windows':
         return False
     cmd = ['powershell', '-Command', 'echo test']
@@ -202,13 +216,18 @@ def has_powershell():
             return False
     return True
 
+
 download_file_powershell.viable = has_powershell
 
+
 def download_file_curl(url, target):
+    """Use curl to download the file."""
     cmd = ['curl', url, '--silent', '--output', target]
     _clean_check(cmd, target)
 
+
 def has_curl():
+    """Determine if curl is available."""
     cmd = ['curl', '--version']
     with open(os.path.devnull, 'wb') as devnull:
         try:
@@ -217,13 +236,18 @@ def has_curl():
             return False
     return True
 
+
 download_file_curl.viable = has_curl
 
+
 def download_file_wget(url, target):
+    """Use wget to download the file."""
     cmd = ['wget', url, '--quiet', '--output-document', target]
     _clean_check(cmd, target)
 
+
 def has_wget():
+    """Determine if wget is available."""
     cmd = ['wget', '--version']
     with open(os.path.devnull, 'wb') as devnull:
         try:
@@ -232,13 +256,12 @@ def has_wget():
             return False
     return True
 
+
 download_file_wget.viable = has_wget
 
+
 def download_file_insecure(url, target):
-    """
-    Use Python to download the file, even though it cannot authenticate the
-    connection.
-    """
+    """Use Python to download the file, without connection authentication."""
     src = urlopen(url)
     try:
         # Read all the data in one block.
@@ -250,9 +273,12 @@ def download_file_insecure(url, target):
     with open(target, "wb") as dst:
         dst.write(data)
 
+
 download_file_insecure.viable = lambda: True
 
+
 def get_best_downloader():
+    """Determine the best downloader."""
     downloaders = (
         download_file_powershell,
         download_file_curl,
@@ -262,10 +288,12 @@ def get_best_downloader():
     viable_downloaders = (dl for dl in downloaders if dl.viable())
     return next(viable_downloaders, None)
 
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+
+def download_setuptools(
+        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, delay=15, downloader_factory=get_best_downloader):
     """
-    Download setuptools from a specified location and return its filename
+    Download setuptools from a specified location and return its filename.
 
     `version` should be a valid setuptools version number that is available
     as an sdist for download under the `download_base` URL (which should end
@@ -287,16 +315,18 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         downloader(url, saveto)
     return os.path.realpath(saveto)
 
+
 def _build_install_args(options):
     """
-    Build the arguments to 'python setup.py install' on the setuptools package
+    Build the arguments to 'python setup.py install' on the setuptools package.
+
+    Returns list of command line arguments.
     """
     return ['--user'] if options.user_install else []
 
+
 def _parse_args():
-    """
-    Parse the command line for options
-    """
+    """Parse the command line for options."""
     parser = optparse.OptionParser()
     parser.add_option(
         '--user', dest='user_install', action='store_true', default=False,
@@ -318,8 +348,9 @@ def _parse_args():
     # positional arguments are ignored
     return options
 
+
 def main():
-    """Install or upgrade setuptools and EasyInstall"""
+    """Install or upgrade setuptools and EasyInstall."""
     options = _parse_args()
     archive = download_setuptools(
         version=options.version,

From dc1b07f1dfc92e097be704ad19824194a95317d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 09:40:43 -0500
Subject: [PATCH 4909/8469] Add test capturing regression in script creation in
 WindowsScriptWriter.

---
 setuptools/tests/test_easy_install.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index cbbe99db6e..a2f26e0885 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -24,6 +24,7 @@
 from setuptools import compat
 from setuptools.compat import StringIO, BytesIO, urlparse
 from setuptools.sandbox import run_setup
+import setuptools.command.easy_install as ei
 from setuptools.command.easy_install import (
     easy_install, fix_jython_executable, nt_quote_arg,
     is_sh, ScriptWriter, CommandSpec,
@@ -526,3 +527,14 @@ def test_sys_executable(self):
         cmd = writer.command_spec_class.from_string(sys.executable)
         assert len(cmd) == 1
         assert cmd[0] == sys.executable
+
+
+class TestWindowsScriptWriter:
+    def test_header(self):
+        hdr = ei.WindowsScriptWriter.get_script_header('')
+        assert hdr.startswith('#!')
+        assert hdr.endswith('\n')
+        hdr = hdr.lstrip('#!')
+        hdr = hdr.rstrip('\n')
+        # header should not start with an escaped quote
+        assert not hdr.startswith('\\"')

From c279903336c73f74c9c8df7aac1e43fb6046c34e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Jan 2015 09:56:16 -0500
Subject: [PATCH 4910/8469] Bypass string handling when default behavior of
 sys.executable is used.

---
 setuptools/command/easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 541666cee2..dda183c817 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1897,7 +1897,9 @@ def from_param(cls, param):
 
     @classmethod
     def from_environment(cls):
-        return cls.from_string('"' + cls._sys_executable() + '"')
+        string = '"' + cls._sys_executable() + '"'
+        jython_spec = JythonCommandSpec.from_string(string)
+        return jython_spec or cls([cls._sys_executable()])
 
     @classmethod
     def from_string(cls, string):

From 0478d8fa223ca94e5c9a3f42dd5f92ed8be1270f Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Tue, 20 Jan 2015 11:24:18 -0800
Subject: [PATCH 4911/8469] remove warning on normalization

It seems inappropriate to show a warning on schemes officially supported in PEP 440.

--HG--
branch : no-normalize-warning
---
 setuptools/dist.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index bc29b131b8..03d7852010 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -276,13 +276,6 @@ def __init__(self, attrs=None):
                 ver = packaging.version.Version(self.metadata.version)
                 normalized_version = str(ver)
                 if self.metadata.version != normalized_version:
-                    warnings.warn(
-                        "The version specified requires normalization, "
-                        "consider using '%s' instead of '%s'." % (
-                            normalized_version,
-                            self.metadata.version,
-                        )
-                    )
                     self.metadata.version = normalized_version
             except (packaging.version.InvalidVersion, TypeError):
                 warnings.warn(

From 3b71b0907d1b989a1a27fee8a7357ec361e08b71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Jan 2015 08:44:55 -0500
Subject: [PATCH 4912/8469] Backout some ugly docstrings from rigorous
 implementation of ill-conceived PEP-257.

---
 ez_setup.py | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bbcef8c703..90e3d82067 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 """Bootstrap setuptools installation.
 
 To use setuptools in your package's setup.py, include this
@@ -13,6 +14,7 @@
 
 This file can also be run as a script to install or upgrade setuptools.
 """
+
 import os
 import shutil
 import sys
@@ -79,11 +81,9 @@ class ContextualZipFile(zipfile.ZipFile):
     """Supplement ZipFile class to support context manager for Python 2.6."""
 
     def __enter__(self):
-        """Context manager __enter__ hook."""
         return self
 
     def __exit__(self, type, value, traceback):
-        """Context manager __exit__ hook."""
         self.close()
 
     def __new__(cls, *args, **kwargs):
@@ -95,7 +95,11 @@ def __new__(cls, *args, **kwargs):
 
 @contextlib.contextmanager
 def archive_context(filename):
-    """Extract archive."""
+    """
+    Unzip filename to a temporary directory, set to the cwd.
+
+    The unzipped target is cleaned up after.
+    """
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
@@ -137,10 +141,22 @@ def _do_download(version, download_base, to_dir, download_delay):
 def use_setuptools(
         version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, download_delay=15):
-    """Download, install and use Setuptools."""
+    """
+    Download, install, and import Setuptools.
+
+    Return None.
+    """
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
+    conflict_tmpl = textwrap.dedent("""
+        The required version of setuptools (>={version}) is not available,
+        and can't be installed while this script is running. Please
+        install a more recent version first, using
+        'easy_install -U setuptools'.
+
+        (Currently using {VC_err.args[0]!r})
+        """)
     try:
         import pkg_resources
     except ImportError:
@@ -152,14 +168,7 @@ def use_setuptools(
         return _do_download(version, download_base, to_dir, download_delay)
     except pkg_resources.VersionConflict as VC_err:
         if imported:
-            msg = textwrap.dedent("""
-                The required version of setuptools (>={version}) is not
-                available, and can't be installed while this script is running.
-                Please install a more recent version first, using
-                'easy_install -U setuptools'.
-
-                (Currently using {VC_err.args[0]!r})
-                """).format(VC_err=VC_err, version=version)
+            msg = conflict_tmpl.format(VC_err=VC_err, version=version)
             sys.stderr.write(msg)
             sys.exit(2)
 
@@ -185,7 +194,7 @@ def _clean_check(cmd, target):
 def download_file_powershell(url, target):
     """
     Download the file at url to target using Powershell.
-    
+
     Powershell will validate trust.
     Raise an exception if the command cannot complete.
     """
@@ -215,19 +224,15 @@ def has_powershell():
         except Exception:
             return False
     return True
-
-
 download_file_powershell.viable = has_powershell
 
 
 def download_file_curl(url, target):
-    """Use curl to download the file."""
     cmd = ['curl', url, '--silent', '--output', target]
     _clean_check(cmd, target)
 
 
 def has_curl():
-    """Determine if curl is available."""
     cmd = ['curl', '--version']
     with open(os.path.devnull, 'wb') as devnull:
         try:
@@ -235,19 +240,15 @@ def has_curl():
         except Exception:
             return False
     return True
-
-
 download_file_curl.viable = has_curl
 
 
 def download_file_wget(url, target):
-    """Use wget to download the file."""
     cmd = ['wget', url, '--quiet', '--output-document', target]
     _clean_check(cmd, target)
 
 
 def has_wget():
-    """Determine if wget is available."""
     cmd = ['wget', '--version']
     with open(os.path.devnull, 'wb') as devnull:
         try:
@@ -255,8 +256,6 @@ def has_wget():
         except Exception:
             return False
     return True
-
-
 download_file_wget.viable = has_wget
 
 
@@ -272,13 +271,10 @@ def download_file_insecure(url, target):
     # Write all the data in one block to avoid creating a partial file.
     with open(target, "wb") as dst:
         dst.write(data)
-
-
 download_file_insecure.viable = lambda: True
 
 
 def get_best_downloader():
-    """Determine the best downloader."""
     downloaders = (
         download_file_powershell,
         download_file_curl,

From 47236e6fff9884a1bb4a023a7c0a3ea56819f212 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Thu, 22 Jan 2015 14:01:28 +0000
Subject: [PATCH 4913/8469] Reintroduce use of setup_requirements writer

This was originally removed due to an underlying issue (#315)
with the upgrade code, which combined with this writer caused upgrades
to fail.

Issue #315 is resolved now so we can add this writer back.
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 63093917cd..d02b7875fb 100755
--- a/setup.py
+++ b/setup.py
@@ -126,6 +126,7 @@ def build_package_data(self):
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
+            "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements",
             "entry_points.txt = setuptools.command.egg_info:write_entries",
             "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
             "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",

From 2436fdf2b3b65073879366505925c0dc18132943 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Jan 2015 10:21:35 -0500
Subject: [PATCH 4914/8469] Remove docs on 'using', which only describe the no
 longer necessary bootstrapping technique. Ref #336.

---
 docs/index.txt |  1 -
 docs/using.txt | 13 -------------
 2 files changed, 14 deletions(-)
 delete mode 100644 docs/using.txt

diff --git a/docs/index.txt b/docs/index.txt
index d8eb968bc9..529f08f354 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -19,7 +19,6 @@ Documentation content:
    history
    roadmap
    python3
-   using
    setuptools
    easy_install
    pkg_resources
diff --git a/docs/using.txt b/docs/using.txt
deleted file mode 100644
index bd80893da2..0000000000
--- a/docs/using.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-================================
-Using Setuptools in your project
-================================
-
-To use Setuptools in your project, the recommended way is to ship
-`ez_setup.py` alongside your `setup.py` script and call
-it at the very beginning of `setup.py` like this::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-More info on `ez_setup.py` can be found at `the project home page
-<https://pypy.python.org/pypi/setuptools>`_.

From 57d6e0fc1ff66e5569296af5cf409cbbcf025148 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Jan 2015 10:25:38 -0500
Subject: [PATCH 4915/8469] Deprecated use_setuptools. Fixes #336.

---
 ez_setup.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 90e3d82067..45c924653a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,18 +1,9 @@
 #!/usr/bin/env python
 
-"""Bootstrap setuptools installation.
-
-To use setuptools in your package's setup.py, include this
-file in the same directory and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-To require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, simply supply
-the appropriate options to ``use_setuptools()``.
+"""
+Setuptools bootstrapping installer.
 
-This file can also be run as a script to install or upgrade setuptools.
+Run this script to install or upgrade setuptools.
 """
 
 import os
@@ -25,6 +16,7 @@
 import platform
 import textwrap
 import contextlib
+import warnings
 
 from distutils import log
 
@@ -142,10 +134,15 @@ def use_setuptools(
         version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, download_delay=15):
     """
-    Download, install, and import Setuptools.
+    *deprecated* Download, install, and import Setuptools.
 
     Return None.
     """
+    warnings.warn(
+        "`use_setuptools` is deprecated. To enforce a specific "
+        "version of setuptools, use `pkg_resources.require`.",
+        DeprecationWarning,
+    )
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)

From 732f5e89a8e417ff536d9a51a85d7b328e80dab1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Jan 2015 08:29:56 -0500
Subject: [PATCH 4916/8469] Add test capturing Attribute error. Ref #339.

---
 setuptools/tests/test_easy_install.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ab6a8f0dab..4331d30e68 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -13,6 +13,7 @@
 import tarfile
 import logging
 import itertools
+import distutils.errors
 
 import pytest
 try:
@@ -110,6 +111,16 @@ def test_no_find_links(self):
         keys = sorted(cmd.package_index.scanned_urls.keys())
         assert keys == ['link1', 'link2']
 
+    def test_write_exception(self):
+        """
+        Test that `cant_write_to_target` is rendered as a DistutilsError.
+        """
+        dist = Distribution()
+        cmd = ei.easy_install(dist)
+        cmd.install_dir = os.getcwd()
+        with pytest.raises(distutils.errors.DistutilsError):
+            cmd.cant_write_to_target()
+
 
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):

From 7824a2b4c6c53615feb18ff558a8a60b44e8fd41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Jan 2015 08:32:27 -0500
Subject: [PATCH 4917/8469] Reference the proper attribute. Fixes #339.

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 206fc58dc6..e057b508e9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -483,7 +483,7 @@ def check_site_dir(self):
         """).lstrip()
 
     def cant_write_to_target(self):
-        msg = self._cant_write_msg % (sys.exc_info()[1], self.install_dir,)
+        msg = self.__cant_write_msg % (sys.exc_info()[1], self.install_dir,)
 
         if not os.path.exists(self.install_dir):
             msg += '\n' + self.__not_exists_id

From 27416cfc54c46ab68e3fddd9c3312421b408b038 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Jan 2015 08:33:04 -0500
Subject: [PATCH 4918/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 97c16c5e22..183f973464 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+12.0.5
+------
+
+* Issue #339: Correct Attribute reference in ``cant_write_to_target``.
+
 ------
 12.0.4
 ------

From be6f94e2b60be95f9324ed24bc06190d5581e30a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Jan 2015 08:35:05 -0500
Subject: [PATCH 4919/8469] Added tag 12.0.5 for changeset 01fbfc9194a2

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 99bd72930e..7748122538 100644
--- a/.hgtags
+++ b/.hgtags
@@ -191,3 +191,4 @@ a1a6a1ac9113b90009052ca7263174a488434099 11.3
 a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
 bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
+01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5

From f5098c20ae773bff28ac809a6dea9459f24a27dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 26 Jan 2015 08:35:43 -0500
Subject: [PATCH 4920/8469] Bumped to 12.0.6 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 45c924653a..5a3f9d42e4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.5"
+DEFAULT_VERSION = "12.0.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 8bb69c5f6d..56d97f7fcc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.5'
+__version__ = '12.0.6'

From fae9ca36955cdaebb81936bb54c3e9e44b5e6928 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 29 Jan 2015 13:50:20 +0000
Subject: [PATCH 4921/8469] Update warning to clarify when and how the instance
 should be use directly or what to do otherwise.

---
 pkg_resources/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c0c095b253..2ce663d2ce 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -182,8 +182,10 @@ def old_parse_version(s):
             "You have iterated over the result of "
             "pkg_resources.parse_version. This is a legacy behavior which is "
             "inconsistent with the new version class introduced in setuptools "
-            "8.0. That class should be used directly instead of attempting to "
-            "iterate over the result.",
+            "8.0. In most cases, conversion to a tuple is unnecessary. For "
+            "comparison of versions, sort the Version instances directly. If "
+            "you have another use case requiring the tuple, please file a "
+            "bug with the setuptools project describing that need.",
             RuntimeWarning,
             stacklevel=1,
         )

From 78d6f0dc55852b9489a17c1e25e8215aef1c7df9 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 31 Jan 2015 12:05:05 +0200
Subject: [PATCH 4922/8469] Issue #23326: Removed __ne__ implementations. 
 Since fixing default __ne__ implementation in issue #21408 they are
 redundant.

---
 version.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/version.py b/version.py
index ebcab84e4e..af14cc1348 100644
--- a/version.py
+++ b/version.py
@@ -48,12 +48,6 @@ def __eq__(self, other):
             return c
         return c == 0
 
-    def __ne__(self, other):
-        c = self._cmp(other)
-        if c is NotImplemented:
-            return c
-        return c != 0
-
     def __lt__(self, other):
         c = self._cmp(other)
         if c is NotImplemented:

From 492758aff46622fb93845f96b9062dab029064f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Feb 2015 22:28:29 +0400
Subject: [PATCH 4923/8469] Re-use context available in sandbox.

---
 setuptools/sandbox.py                 | 4 +++-
 setuptools/tests/contexts.py          | 8 --------
 setuptools/tests/test_easy_install.py | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 83283ca3dc..6725512357 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -47,8 +47,10 @@ def _execfile(filename, globals, locals=None):
 
 
 @contextlib.contextmanager
-def save_argv():
+def save_argv(repl=None):
     saved = sys.argv[:]
+    if repl is not None:
+        sys.argv[:] = repl
     try:
         yield saved
     finally:
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 4a46176557..1d29284b46 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -48,14 +48,6 @@ def environment(**replacements):
         os.environ.update(saved)
 
 
-@contextlib.contextmanager
-def argv(repl):
-    old_argv = sys.argv[:]
-    sys.argv[:] = repl
-    yield
-    sys.argv[:] = old_argv
-
-
 @contextlib.contextmanager
 def quiet():
     """
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4331d30e68..b9b2e392ee 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -312,7 +312,7 @@ def test_setup_requires_honors_fetch_params(self):
                             '--install-dir', temp_install_dir,
                             dist_file,
                         ]
-                        with contexts.argv(['easy_install']):
+                        with sandbox.save_argv(['easy_install']):
                             # attempt to install the dist. It should fail because
                             #  it doesn't exist.
                             with pytest.raises(SystemExit):

From 88f62bfe62531bed69f871425d21d8c4e3203ecf Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 5 Feb 2015 12:11:23 -0800
Subject: [PATCH 4924/8469] soften normalized version warning

indicate that normalization is happening, but don't be pushy about changing valid versions.

--HG--
branch : no-normalize-warning
---
 setuptools/dist.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 03d7852010..ffbc7c4861 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -276,6 +276,12 @@ def __init__(self, attrs=None):
                 ver = packaging.version.Version(self.metadata.version)
                 normalized_version = str(ver)
                 if self.metadata.version != normalized_version:
+                    warnings.warn(
+                        "Normalizing '%s' to '%s'" % (
+                            self.metadata.version,
+                            normalized_version,
+                        )
+                    )
                     self.metadata.version = normalized_version
             except (packaging.version.InvalidVersion, TypeError):
                 warnings.warn(

From 0c2d002a26ac527938c56eccb5edf04591da33b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 10 Feb 2015 20:14:48 -0500
Subject: [PATCH 4925/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 183f973464..f77ab24b4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+12.1
+----
+
+* Pull Request #118: Soften warning for non-normalized versions in
+  Distribution.
+
 ------
 12.0.5
 ------

From f12a54d83140cb65a7a0098eeb20e469ce7fb5b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 10 Feb 2015 20:15:39 -0500
Subject: [PATCH 4926/8469] Bumped to 12.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5a3f9d42e4..b1d68cc88f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.0.6"
+DEFAULT_VERSION = "12.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 56d97f7fcc..9e9002b4d2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.0.6'
+__version__ = '12.1'

From d26bdb80a713fbd0080e94d0f5f6836afce87600 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 10 Feb 2015 20:15:43 -0500
Subject: [PATCH 4927/8469] Added tag 12.1 for changeset 7bca89384348

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7748122538..e9d7e3debe 100644
--- a/.hgtags
+++ b/.hgtags
@@ -192,3 +192,4 @@ a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
 bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
 01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
+7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1

From 5d2f77f308c8ccc89be855994da1b7503b5a4294 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 10 Feb 2015 20:17:22 -0500
Subject: [PATCH 4928/8469] Bumped to 12.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index b1d68cc88f..1a360cedd1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.1"
+DEFAULT_VERSION = "12.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 9e9002b4d2..c59a57778d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.1'
+__version__ = '12.2'

From cf6639df27879641b6ea561fa38ec52320b09780 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 09:42:21 -0500
Subject: [PATCH 4929/8469] Add comments

---
 ez_setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 1a360cedd1..154cae0abb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -160,16 +160,21 @@ def use_setuptools(
         return _do_download(version, download_base, to_dir, download_delay)
     try:
         pkg_resources.require("setuptools>=" + version)
+        # a suitable version is already installed
         return
     except pkg_resources.DistributionNotFound:
+        # no version of setuptools was found
         return _do_download(version, download_base, to_dir, download_delay)
     except pkg_resources.VersionConflict as VC_err:
         if imported:
+            # setuptools was imported prior to invocation of this function,
+            #  so it's not safe to unload it.
             msg = conflict_tmpl.format(VC_err=VC_err, version=version)
             sys.stderr.write(msg)
             sys.exit(2)
 
-        # otherwise, reload ok
+        # otherwise, unload pkg_resources to allow the downloaded version to
+        #  take precedence.
         del pkg_resources, sys.modules['pkg_resources']
         return _do_download(version, download_base, to_dir, download_delay)
 

From 4df44da1561f239f63ee24a44acfba06d3898de4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 09:49:33 -0500
Subject: [PATCH 4930/8469] Extract function for unloading pkg_resources. Ref
 #345.

---
 ez_setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 154cae0abb..4bffc14cac 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -175,10 +175,15 @@ def use_setuptools(
 
         # otherwise, unload pkg_resources to allow the downloaded version to
         #  take precedence.
-        del pkg_resources, sys.modules['pkg_resources']
+        del pkg_resources
+        _unload_pkg_resources()
         return _do_download(version, download_base, to_dir, download_delay)
 
 
+def _unload_pkg_resources():
+    del sys.modules['pkg_resources']
+
+
 def _clean_check(cmd, target):
     """
     Run the command to download target.

From e1bc6caa509afc1df671a21b94d33906a88930d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 09:51:51 -0500
Subject: [PATCH 4931/8469] Unload all pkg_resources modules and not just the
 main module. Fixes #345.

---
 ez_setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4bffc14cac..0734d6c547 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -181,7 +181,12 @@ def use_setuptools(
 
 
 def _unload_pkg_resources():
-    del sys.modules['pkg_resources']
+    del_modules = [
+        name for name in sys.modules
+        if name.startswith('pkg_resources')
+    ]
+    for mod_name in del_modules:
+        del sys.modules[mod_name]
 
 
 def _clean_check(cmd, target):

From cd6f8d58314ce146b18142f4be56fc2a18f977d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 09:53:52 -0500
Subject: [PATCH 4932/8469] Collapse common behavior

---
 ez_setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0734d6c547..a1c69d0b3c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -163,8 +163,8 @@ def use_setuptools(
         # a suitable version is already installed
         return
     except pkg_resources.DistributionNotFound:
-        # no version of setuptools was found
-        return _do_download(version, download_base, to_dir, download_delay)
+        # no version of setuptools was found; allow download
+        pass
     except pkg_resources.VersionConflict as VC_err:
         if imported:
             # setuptools was imported prior to invocation of this function,
@@ -177,7 +177,8 @@ def use_setuptools(
         #  take precedence.
         del pkg_resources
         _unload_pkg_resources()
-        return _do_download(version, download_base, to_dir, download_delay)
+
+    return _do_download(version, download_base, to_dir, download_delay)
 
 
 def _unload_pkg_resources():

From 947b300262d3415f4a1a073887973f2772792ae0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:02:04 -0500
Subject: [PATCH 4933/8469] Refactor behavior into a single try/except block
 with exactly one invocation of _do_download.

---
 ez_setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a1c69d0b3c..d8d2ad8bde 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -156,12 +156,12 @@ def use_setuptools(
         """)
     try:
         import pkg_resources
-    except ImportError:
-        return _do_download(version, download_base, to_dir, download_delay)
-    try:
         pkg_resources.require("setuptools>=" + version)
         # a suitable version is already installed
         return
+    except ImportError:
+        # pkg_resources not available; setuptools is not installed; download
+        pass
     except pkg_resources.DistributionNotFound:
         # no version of setuptools was found; allow download
         pass

From 1ba919120ead7b064e1b0b80e4174d7c4435e700 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:05:59 -0500
Subject: [PATCH 4934/8469] Extract _conflict_bail function

---
 ez_setup.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d8d2ad8bde..19af8969b3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -146,14 +146,6 @@ def use_setuptools(
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
-    conflict_tmpl = textwrap.dedent("""
-        The required version of setuptools (>={version}) is not available,
-        and can't be installed while this script is running. Please
-        install a more recent version first, using
-        'easy_install -U setuptools'.
-
-        (Currently using {VC_err.args[0]!r})
-        """)
     try:
         import pkg_resources
         pkg_resources.require("setuptools>=" + version)
@@ -167,11 +159,7 @@ def use_setuptools(
         pass
     except pkg_resources.VersionConflict as VC_err:
         if imported:
-            # setuptools was imported prior to invocation of this function,
-            #  so it's not safe to unload it.
-            msg = conflict_tmpl.format(VC_err=VC_err, version=version)
-            sys.stderr.write(msg)
-            sys.exit(2)
+            _conflict_bail(VC_err, version)
 
         # otherwise, unload pkg_resources to allow the downloaded version to
         #  take precedence.
@@ -181,6 +169,24 @@ def use_setuptools(
     return _do_download(version, download_base, to_dir, download_delay)
 
 
+def _conflict_bail(VC_err, version):
+    """
+    Setuptools was imported prior to invocation, so it is
+    unsafe to unload it. Bail out.
+    """
+    conflict_tmpl = textwrap.dedent("""
+        The required version of setuptools (>={version}) is not available,
+        and can't be installed while this script is running. Please
+        install a more recent version first, using
+        'easy_install -U setuptools'.
+
+        (Currently using {VC_err.args[0]!r})
+        """)
+    msg = conflict_tmpl.format(**locals())
+    sys.stderr.write(msg)
+    sys.exit(2)
+
+
 def _unload_pkg_resources():
     del_modules = [
         name for name in sys.modules

From bd6fbd3fd8d4e5346a3464898cd3e303bc58f552 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:07:26 -0500
Subject: [PATCH 4935/8469] Add comment

---
 ez_setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 19af8969b3..26e42998f8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -144,8 +144,12 @@ def use_setuptools(
         DeprecationWarning,
     )
     to_dir = os.path.abspath(to_dir)
+
+    # prior to importing, capture the module state for
+    # representative modules.
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
+
     try:
         import pkg_resources
         pkg_resources.require("setuptools>=" + version)

From 3735dd9e689cd98d6ee45fcdac21d1f41c952a76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:15:58 -0500
Subject: [PATCH 4936/8469] Update changelog

---
 CHANGES.txt | 11 +++++++++++
 ez_setup.py | 10 +++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f77ab24b4c..4e058be805 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+----
+12.2
+----
+
+* Issue #345: Unload all modules under pkg_resources during
+  ``ez_setup.use_setuptools()``.
+* Issue #336: Removed deprecation from ``ez_setup.use_setuptools``,
+  as it is clearly still used by buildout's bootstrap. ``ez_setup``
+  remains deprecated for use by individual packages.
+
 ----
 12.1
 ----
@@ -14,6 +24,7 @@ CHANGES
 ------
 
 * Issue #339: Correct Attribute reference in ``cant_write_to_target``.
+* Issue #336: Deprecated ``ez_setup.use_setuptools``.
 
 ------
 12.0.4
diff --git a/ez_setup.py b/ez_setup.py
index 26e42998f8..4bd83580f0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -134,15 +134,11 @@ def use_setuptools(
         version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         to_dir=os.curdir, download_delay=15):
     """
-    *deprecated* Download, install, and import Setuptools.
+    Ensure that a setuptools version is installed.
 
-    Return None.
+    Return None. Raise SystemExit if the requested version
+    or later cannot be installed.
     """
-    warnings.warn(
-        "`use_setuptools` is deprecated. To enforce a specific "
-        "version of setuptools, use `pkg_resources.require`.",
-        DeprecationWarning,
-    )
     to_dir = os.path.abspath(to_dir)
 
     # prior to importing, capture the module state for

From e69b9745ff0d8bd3ab134a80d1c91707377d06ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:19:24 -0500
Subject: [PATCH 4937/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e058be805..45658bb0e5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ CHANGES
 * Issue #336: Removed deprecation from ``ez_setup.use_setuptools``,
   as it is clearly still used by buildout's bootstrap. ``ez_setup``
   remains deprecated for use by individual packages.
+* Simplified implementation of ``ez_setup.use_setuptools``.
 
 ----
 12.1

From dcc413ea650eacd7c9fdcf824f65501dd39748ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:24:28 -0500
Subject: [PATCH 4938/8469] Added tag 12.2 for changeset 5ff5c804a8fa

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e9d7e3debe..1b63050d0c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -193,3 +193,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
 01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
 7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
+5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2

From 582d31e08ea15893f98deddfaa476cd294f1b5db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:25:13 -0500
Subject: [PATCH 4939/8469] Bumped to 12.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4bd83580f0..426a22c922 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.2"
+DEFAULT_VERSION = "12.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index c59a57778d..c2fa1dce56 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.2'
+__version__ = '12.3'

From c30d4387af485202103c76b13c2741b5bd78b410 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Feb 2015 10:32:17 -0500
Subject: [PATCH 4940/8469] Bump script used for ez_setup.py

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0e648b3869..16605597f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,4 @@ script:
  - python bootstrap.py
 
  - python setup.py ptr --addopts='-rs'
- - python ez_setup.py --version 10.2.1
+ - python ez_setup.py --version 12.2

From 47cbdc5228ca5a730518f1cca83df283c54f7249 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 18 Feb 2015 20:42:49 +0100
Subject: [PATCH 4941/8469] Fix
 setuptools.command.easy_install.extract_wininst_cfg() with Python 2.6 and
 2.7. It was broken since commit 3bbd42903af8, which changed chr(0) (which is
 '\x00') into bytes([0]). bytes([0]) is '[0]' in Python 2.6 and 2.7 and
 b'\x00' in Python 3.

---
 setuptools/command/easy_install.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e057b508e9..b039e2da6c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1413,13 +1413,8 @@ def extract_wininst_cfg(dist_filename):
             {'version': '', 'target_version': ''})
         try:
             part = f.read(cfglen)
-            # part is in bytes, but we need to read up to the first null
-            # byte.
-            if sys.version_info >= (2, 6):
-                null_byte = bytes([0])
-            else:
-                null_byte = chr(0)
-            config = part.split(null_byte, 1)[0]
+            # Read up to the first null byte.
+            config = part.split(b'\0', 1)[0]
             # Now the config is in bytes, but for RawConfigParser, it should
             #  be text, so decode it.
             config = config.decode(sys.getfilesystemencoding())

From b16a6dd269e4fd283a78834c7f379c977aad0f6e Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Wed, 18 Feb 2015 21:09:01 +0100
Subject: [PATCH 4942/8469] Delete some dead code.

---
 setuptools/command/bdist_egg.py | 13 ++-----------
 setuptools/command/build_py.py  | 17 +----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 34fdeec21f..87dce882e3 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -2,7 +2,6 @@
 
 Build .egg distributions"""
 
-# This module should be kept compatible with Python 2.3
 from distutils.errors import DistutilsSetupError
 from distutils.dir_util import remove_tree, mkpath
 from distutils import log
@@ -406,10 +405,6 @@ def scan_module(egg_dir, base, name, stubs):
             if bad in symbols:
                 log.warn("%s: module MAY be using inspect.%s", module, bad)
                 safe = False
-    if '__name__' in symbols and '__main__' in symbols and '.' not in module:
-        if sys.version[:3] == "2.4":  # -m works w/zipfiles in 2.5
-            log.warn("%s: top-level module may be 'python -m' script", module)
-            safe = False
     return safe
 
 
@@ -441,7 +436,7 @@ def can_scan():
 ]
 
 
-def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=None,
+def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=True,
                  mode='w'):
     """Create a zip file from all the files under 'base_dir'.  The output
     zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
@@ -463,11 +458,7 @@ def visit(z, dirname, names):
                     z.write(path, p)
                 log.debug("adding '%s'" % p)
 
-    if compress is None:
-        # avoid 2.3 zipimport bug when 64 bits
-        compress = (sys.version >= "2.4")
-
-    compression = [zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED][bool(compress)]
+    compression = zipfile.ZIP_DEFLATED if compress else zipfile.ZIP_STORED
     if not dry_run:
         z = zipfile.ZipFile(zip_filename, mode, compression=compression)
         for dirname, dirs, files in os.walk(base_dir):
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 98080694ad..a873d54b10 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -136,22 +136,7 @@ def analyze_manifest(self):
                 mf.setdefault(src_dirs[d], []).append(path)
 
     def get_data_files(self):
-        pass  # kludge 2.4 for lazy computation
-
-    if sys.version < "2.4":  # Python 2.4 already has this code
-        def get_outputs(self, include_bytecode=1):
-            """Return complete list of files copied to the build directory
-
-            This includes both '.py' files and data files, as well as '.pyc'
-            and '.pyo' files if 'include_bytecode' is true.  (This method is
-            needed for the 'install_lib' command to do its job properly, and to
-            generate a correct installation manifest.)
-            """
-            return orig.build_py.get_outputs(self, include_bytecode) + [
-                os.path.join(build_dir, filename)
-                for package, src_dir, build_dir, filenames in self.data_files
-                for filename in filenames
-            ]
+        pass  # Lazily compute data files in _get_data_files() function.
 
     def check_package(self, package, package_dir):
         """Check namespace packages' __init__ for declare_namespace"""

From 02fac66f96af6b6952d227809186db1c5ae628a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Feb 2015 22:36:06 -0600
Subject: [PATCH 4943/8469] Use rst.linker for generating linked changelog

---
 docs/conf.py | 49 ++++++++++++++++++++++++++++++++++++++++++++-
 linkify.py   | 56 ----------------------------------------------------
 setup.py     |  1 +
 3 files changed, 49 insertions(+), 57 deletions(-)
 delete mode 100644 linkify.py

diff --git a/docs/conf.py b/docs/conf.py
index 5ea2e05e8b..248309871d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,7 +28,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['linkify']
+extensions = ['rst.linker']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -198,3 +198,50 @@
 
 # If false, no module index is generated.
 #latex_use_modindex = True
+
+link_files = {
+	'CHANGES.txt': dict(
+		using=dict(
+			BB='https://bitbucket.org',
+			GH='https://github.com',
+		),
+		replace=[
+			dict(
+				pattern=r"(Issue )?#(?P<issue>\d+)",
+				url='{BB}/pypa/setuptools/issue/{issue}',
+			),
+			dict(
+				pattern=r"Pull Request ?#(?P<pull_request>\d+)",
+				url='{BB}/pypa/setuptools/pull-request/{pull_request}',
+			),
+			dict(
+				pattern=r"Distribute #(?P<distribute>\d+)",
+				url='{BB}/tarek/distribute/issue/{distribute}',
+			),
+			dict(
+				pattern=r"Buildout #(?P<buildout>\d+)",
+				url='{GH}/buildout/buildout/issues/{buildout}',
+			),
+			dict(
+				pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
+				url='http://bugs.python.org/setuptools/issue{old_setuptools}',
+			),
+			dict(
+				pattern=r"Jython #(?P<jython>\d+)",
+				url='http://bugs.jython.org/issue{jython}',
+			),
+			dict(
+				pattern=r"Python #(?P<python>\d+)",
+				url='http://bugs.python.org/issue{python}',
+			),
+			dict(
+				pattern=r"Interop #(?P<interop>\d+)",
+				url='{GH}/pypa/interoperability-peps/issues/{interop}',
+			),
+			dict(
+				pattern=r"Pip #(?P<pip>\d+)",
+				url='{GH}/pypa/pip/issues/{pip}',
+			),
+		],
+	),
+}
diff --git a/linkify.py b/linkify.py
deleted file mode 100644
index 5c6e16b443..0000000000
--- a/linkify.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-Sphinx plugin to add links to the changelog.
-"""
-
-import re
-import os
-
-
-link_patterns = [
-    r"(Issue )?#(?P<issue>\d+)",
-    r"Pull Request ?#(?P<pull_request>\d+)",
-    r"Distribute #(?P<distribute>\d+)",
-    r"Buildout #(?P<buildout>\d+)",
-    r"Old Setuptools #(?P<old_setuptools>\d+)",
-    r"Jython #(?P<jython>\d+)",
-    r"Python #(?P<python>\d+)",
-    r"Interop #(?P<interop>\d+)",
-    r"Pip #(?P<pip>\d+)",
-]
-
-issue_urls = dict(
-    pull_request='https://bitbucket.org'
-        '/pypa/setuptools/pull-request/{pull_request}',
-    issue='https://bitbucket.org/pypa/setuptools/issue/{issue}',
-    distribute='https://bitbucket.org/tarek/distribute/issue/{distribute}',
-    buildout='https://github.com/buildout/buildout/issues/{buildout}',
-    old_setuptools='http://bugs.python.org/setuptools/issue{old_setuptools}',
-    jython='http://bugs.jython.org/issue{jython}',
-    python='http://bugs.python.org/issue{python}',
-    interop='https://github.com/pypa/interoperability-peps/issues/{interop}',
-    pip='https://github.com/pypa/pip/issues/{pip}',
-)
-
-
-def _linkify(source, dest):
-    pattern = '|'.join(link_patterns)
-    with open(source) as source:
-        out = re.sub(pattern, replacer, source.read())
-    with open(dest, 'w') as dest:
-        dest.write(out)
-
-
-def replacer(match):
-    text = match.group(0)
-    match_dict = match.groupdict()
-    for key in match_dict:
-        if match_dict[key]:
-            url = issue_urls[key].format(**match_dict)
-            return "`{text} <{url}>`_".format(text=text, url=url)
-
-def setup(app):
-    _linkify('CHANGES.txt', 'CHANGES (links).txt')
-    app.connect('build-finished', remove_file)
-
-def remove_file(app, exception):
-    os.remove('CHANGES (links).txt')
diff --git a/setup.py b/setup.py
index 63093917cd..9d4330acad 100755
--- a/setup.py
+++ b/setup.py
@@ -172,6 +172,7 @@ def build_package_data(self):
         'pytest',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
+        'rst.linker',
     ] + pytest_runner,
 )
 

From 70b0594ff0d67dba65feb59a606007768eced05b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 08:51:24 -0500
Subject: [PATCH 4944/8469] Only require rst.linker when docs commands are
 invoked. Also specify sphinx dependency.

---
 setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 9d4330acad..807c0180df 100755
--- a/setup.py
+++ b/setup.py
@@ -76,6 +76,8 @@ def build_package_data(self):
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
 pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
+sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
 
 setup_params = dict(
     name="setuptools",
@@ -172,8 +174,7 @@ def build_package_data(self):
         'pytest',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-        'rst.linker',
-    ] + pytest_runner,
+    ] + sphinx + pytest_runner,
 )
 
 if __name__ == '__main__':

From 34bd844443954929c7199e772e715ed6f0669332 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 08:52:48 -0500
Subject: [PATCH 4945/8469] Update conditional setup-time dependency to also
 support pytest and test commands.

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 807c0180df..e1b302a36b 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,8 @@ def build_package_data(self):
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
-pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+needs_pytest = set(['ptr', 'pytest', 'test']) in sys.argv else []
+pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
 sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
 

From eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 08:54:00 -0500
Subject: [PATCH 4946/8469] Move pytest config to pytest.ini (as it conflicts
 with the pytest-runner pytest command).

---
 pytest.ini | 3 +++
 setup.cfg  | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100755 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100755
index 0000000000..91d64bb800
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
+norecursedirs=dist build *.egg
diff --git a/setup.cfg b/setup.cfg
index 5937edd035..a6da2c7771 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,6 +5,7 @@ tag_build = dev
 release = egg_info -RDb ''
 source = register sdist binary
 binary = bdist_egg upload --show-response
+test = pytest
 
 [build_sphinx]
 source-dir = docs/
@@ -19,7 +20,3 @@ formats = gztar zip
 
 [wheel]
 universal=1
-
-[pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
-norecursedirs=dist build *.egg

From d21b8dbfa1f0ad6f4c3f5b4101035c228bd6a6d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 08:54:29 -0500
Subject: [PATCH 4947/8469] Now tests may be invoked simply with setup.py test.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 16605597f3..45cace4be1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - python setup.py ptr --addopts='-rs'
+ - python setup.py test --addopts='-rs'
  - python ez_setup.py --version 12.2

From 3bf060e378ce5d942079452450864ef30bdaa44f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 09:03:49 -0500
Subject: [PATCH 4948/8469] Correct usage in needs_pytest

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e1b302a36b..438e512bde 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ def build_package_data(self):
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
-needs_pytest = set(['ptr', 'pytest', 'test']) in sys.argv else []
+needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
 sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []

From 0dc29630918288846f3a398d884de8ecd9db7ced Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 26 Feb 2015 13:59:06 -0500
Subject: [PATCH 4949/8469] Formally describe the supported documentation build
 process. Fixes #354.

---
 docs/developer-guide.txt | 17 +++++++++++++++++
 docs/development.txt     |  1 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 558d6ee76c..27c304e5cf 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -109,3 +109,20 @@ Setuptools follows ``semver`` with some exceptions:
 - Omits 'v' prefix for tags.
 
 .. explain value of reflecting meaning in versions.
+
+----------------------
+Building Documentation
+----------------------
+
+Setuptools relies on the Sphinx system for building documentation and in
+particular the ``build_sphinx`` distutils command. To build the
+documentation, invoke::
+
+    python setup.py build_sphinx
+
+from the root of the repository. Setuptools will download a compatible
+build of Sphinx and any requisite plugins and then build the
+documentation in the build/sphinx directory.
+
+Setuptools does not support invoking the doc builder from the docs/
+directory as some tools expect.
diff --git a/docs/development.txt b/docs/development.txt
index 6fe30f6eb1..455f038afa 100644
--- a/docs/development.txt
+++ b/docs/development.txt
@@ -33,4 +33,3 @@ setuptools changes.  You have been warned.
    developer-guide
    formats
    releases
-

From d98aadec63981a34eff17f502038e132fa131432 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 26 Feb 2015 14:13:50 -0500
Subject: [PATCH 4950/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 45658bb0e5..5be5471143 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+----
+12.3
+----
+
+* Documentation is now linked using the rst.linker package.
+* Fix ``setuptools.command.easy_install.extract_wininst_cfg()``
+  with Python 2.6 and 2.7.
+* Issue #354. Added documentation on building setuptools
+  documentation.
+
 ----
 12.2
 ----

From 89f72e5dc90554be4dddd09381150a67588266cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 26 Feb 2015 14:15:26 -0500
Subject: [PATCH 4951/8469] Added tag 12.3 for changeset 8d50aac3b207

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1b63050d0c..b0ab3b1630 100644
--- a/.hgtags
+++ b/.hgtags
@@ -194,3 +194,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
 7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
 5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2
+8d50aac3b20793954121edb300b477cc75f3ec96 12.3

From f8813bed5e035a4b7f3deba54949439e846c8125 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 26 Feb 2015 14:16:10 -0500
Subject: [PATCH 4952/8469] Bumped to 12.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 426a22c922..5221b4ffe8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.3"
+DEFAULT_VERSION = "12.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index c2fa1dce56..f64c79854e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.3'
+__version__ = '12.4'

From 5153b6f17cb2b6fac162a9ae1a989b976cc6d7de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 3 Mar 2015 17:50:32 -0500
Subject: [PATCH 4953/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5be5471143..82f4db61a0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+12.4
+----
+
+* Pull Request #119: Restore writing of ``setup_requires`` to metadata
+  (previously added in 8.4 and removed in 9.0).
+
 ----
 12.3
 ----

From fe899eef84b75a58aeb443e36904e9f4a5fd5c20 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 4 Mar 2015 10:10:44 -0500
Subject: [PATCH 4954/8469] Reindent header

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 021e7feeb4..7a404f82a7 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-"""Distutils setup file, used to install or test 'setuptools'"""
+"""
+Distutils setup file, used to install or test 'setuptools'
+"""
+
 import io
 import os
 import sys

From 7a410b2cafcbeac951d88e8070b378cfb1001de0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 4 Mar 2015 11:07:53 -0500
Subject: [PATCH 4955/8469] Added tag 12.4 for changeset 297931cb8cac

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b0ab3b1630..9a949af9cb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -195,3 +195,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
 5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2
 8d50aac3b20793954121edb300b477cc75f3ec96 12.3
+297931cb8cac7d44d970adb927efd6cb36ac3526 12.4

From 7aa02cb6109845a421aabdc366216dacfdf38d33 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 4 Mar 2015 11:09:37 -0500
Subject: [PATCH 4956/8469] Bumped to 12.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5221b4ffe8..6f6a83196f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.4"
+DEFAULT_VERSION = "12.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f64c79854e..e5fc9c8ca2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.4'
+__version__ = '12.5'

From ee36e46917421eb503f2e6d41f7421463564845b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 19:28:34 -0500
Subject: [PATCH 4957/8469] Backed out changeset: 8bff4399a7af; Fixes #356

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 7a404f82a7..5d98de0689 100755
--- a/setup.py
+++ b/setup.py
@@ -132,7 +132,6 @@ def build_package_data(self):
         "egg_info.writers": [
             "PKG-INFO = setuptools.command.egg_info:write_pkg_info",
             "requires.txt = setuptools.command.egg_info:write_requirements",
-            "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements",
             "entry_points.txt = setuptools.command.egg_info:write_entries",
             "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
             "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",

From 80df5396a629d49b826b7522f7a72c15b75b710a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 19:31:08 -0500
Subject: [PATCH 4958/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 82f4db61a0..78469cbdc1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+13.0
+----
+
+* Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later
+  as the source during an upgrade.
+
 ----
 12.4
 ----

From 4e0a8cd8f37e4f427a75cac454bea4aca0c4ea0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 19:37:20 -0500
Subject: [PATCH 4959/8469] Remove build_py (unused)

---
 CHANGES.txt |  1 +
 setup.py    | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 78469cbdc1..bf0acb1a85 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ CHANGES
 
 * Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later
   as the source during an upgrade.
+* Removed apparently unused build_py class in setup.py.
 
 ----
 12.4
diff --git a/setup.py b/setup.py
index 5d98de0689..234a78853d 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,6 @@
     exec(ver_file.read(), main_ns)
 
 import setuptools
-from setuptools.command.build_py import build_py as _build_py
 
 scripts = []
 
@@ -49,20 +48,6 @@ def _gen_console_scripts():
 
 console_scripts = list(_gen_console_scripts())
 
-
-# specific command that is used to generate windows .exe files
-class build_py(_build_py):
-    def build_package_data(self):
-        """Copy data files into build directory"""
-        for package, src_dir, build_dir, filenames in self.data_files:
-            for filename in filenames:
-                target = os.path.join(build_dir, filename)
-                self.mkpath(os.path.dirname(target))
-                srcfile = os.path.join(src_dir, filename)
-                outf, copied = self.copy_file(srcfile, target)
-                srcfile = os.path.abspath(srcfile)
-
-
 readme_file = io.open('README.txt', encoding='utf-8')
 
 with readme_file:

From 67aa21c88ef5e57d7a2d0f379c970e5987c14cd4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 19:51:32 -0500
Subject: [PATCH 4960/8469] Bumped to 13.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6f6a83196f..a709688f68 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "12.5"
+DEFAULT_VERSION = "13.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index e5fc9c8ca2..0a56eb68ae 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '12.5'
+__version__ = '13.0'

From 2168ff0927546296e304dc457d6a013edf0dfe7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:16:35 -0500
Subject: [PATCH 4961/8469] Update changelog

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bf0acb1a85..1b99e9c55f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,9 @@ CHANGES
 
 * Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later
   as the source during an upgrade.
-* Removed apparently unused build_py class in setup.py.
+* Removed build_py class from setup.py. According to 892f439d216e, this
+  functionality was added to support upgrades from old Distribute versions,
+  0.6.5 and 0.6.6.
 
 ----
 12.4

From 9f12c42238c20fa92efbc78a0762b57756c20d24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:37:51 -0500
Subject: [PATCH 4962/8469] Added tag 13.0 for changeset df34cc186242

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9a949af9cb..15190e1c00 100644
--- a/.hgtags
+++ b/.hgtags
@@ -196,3 +196,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2
 8d50aac3b20793954121edb300b477cc75f3ec96 12.3
 297931cb8cac7d44d970adb927efd6cb36ac3526 12.4
+df34cc18624279faffdbc729c0a11e6ab0f46572 13.0

From e556b07add2c521523bfd48f69397b0982bcc963 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:42:28 -0500
Subject: [PATCH 4963/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1b99e9c55f..cc9c393970 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+13.0.1
+------
+
+Re-release of 13.0. Intermittent connectivity issues caused the release
+process to fail and PyPI uploads no longer accept files for 13.0.
+
 ----
 13.0
 ----

From 1914157913c7e28c21ccb8fa5ffe7581721d5bad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:42:40 -0500
Subject: [PATCH 4964/8469] Bumped to 13.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a709688f68..0fd17a5c5f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "13.0"
+DEFAULT_VERSION = "13.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 0a56eb68ae..d1ff172762 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '13.0'
+__version__ = '13.0.1'

From 5a1ac91fede0884c66cb2008485c13020f831a10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:42:42 -0500
Subject: [PATCH 4965/8469] Added tag 13.0.1 for changeset ae1a5c5cf78f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 15190e1c00..0a790e0187 100644
--- a/.hgtags
+++ b/.hgtags
@@ -197,3 +197,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 8d50aac3b20793954121edb300b477cc75f3ec96 12.3
 297931cb8cac7d44d970adb927efd6cb36ac3526 12.4
 df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
+ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1

From 570305131f408b42522d1d7e87292ec752457e65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 20:43:59 -0500
Subject: [PATCH 4966/8469] Bumped to 13.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0fd17a5c5f..d0af7948d5 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "13.0.1"
+DEFAULT_VERSION = "13.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
 
diff --git a/setuptools/version.py b/setuptools/version.py
index d1ff172762..525a47ea0f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '13.0.1'
+__version__ = '13.0.2'

From 973df2da9c895ce58955121f6cf7cbde4b7fe0ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 21:30:58 -0500
Subject: [PATCH 4967/8469] Extract function for _download_args

---
 ez_setup.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d0af7948d5..e58f43d3ec 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -364,14 +364,19 @@ def _parse_args():
     return options
 
 
+def _download_args(options):
+	"""Return args for download_setuptools function from cmdline args."""
+	return dict(
+		version=options.version,
+		download_base=options.download_base,
+		downloader_factory=options.downloader_factory,
+	)
+
+
 def main():
     """Install or upgrade setuptools and EasyInstall."""
     options = _parse_args()
-    archive = download_setuptools(
-        version=options.version,
-        download_base=options.download_base,
-        downloader_factory=options.downloader_factory,
-    )
+    archive = download_setuptools(**_download_args(options))
     return _install(archive, _build_install_args(options))
 
 if __name__ == '__main__':

From 4368e4a2d3f1e0de7a29b909c2cff599b211a441 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 21:47:08 -0500
Subject: [PATCH 4968/8469] Add --to-dir to bootstrap script

---
 CHANGES.txt |  8 ++++++++
 ez_setup.py | 12 ++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cc9c393970..62272286ec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+13.1
+----
+
+Bootstrap script now accepts ``--to-dir`` to customize save directory or
+allow for re-use of existing repository of setuptools versions. See
+Pull Request #112 for an alternate implementation.
+
 ------
 13.0.1
 ------
diff --git a/ez_setup.py b/ez_setup.py
index e58f43d3ec..9ece89d7e7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -32,6 +32,7 @@
 
 DEFAULT_VERSION = "13.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
+DEFAULT_SAVE_DIR = os.curdir
 
 
 def _python_cmd(*args):
@@ -132,7 +133,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 def use_setuptools(
         version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=os.curdir, download_delay=15):
+        to_dir=DEFAULT_SAVE_DIR, download_delay=15):
     """
     Ensure that a setuptools version is installed.
 
@@ -306,7 +307,8 @@ def get_best_downloader():
 
 def download_setuptools(
         version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=os.curdir, delay=15, downloader_factory=get_best_downloader):
+        to_dir=DEFAULT_SAVE_DIR, delay=15,
+        downloader_factory=get_best_downloader):
     """
     Download setuptools from a specified location and return its filename.
 
@@ -359,6 +361,11 @@ def _parse_args():
         '--version', help="Specify which version to download",
         default=DEFAULT_VERSION,
     )
+    parser.add_option(
+    	'--to-dir',
+    	help="Directory to save (and re-use) package",
+    	default=DEFAULT_SAVE_DIR,
+    )
     options, args = parser.parse_args()
     # positional arguments are ignored
     return options
@@ -370,6 +377,7 @@ def _download_args(options):
 		version=options.version,
 		download_base=options.download_base,
 		downloader_factory=options.downloader_factory,
+		to_dir=options.to_dir,
 	)
 
 

From cf8edd7c24a6afdb81ac928f348faeaba77860bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 5 Mar 2015 22:28:53 -0500
Subject: [PATCH 4969/8469] Update changelog

---
 CHANGES.txt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 62272286ec..dfb7ba398d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,12 +3,20 @@ CHANGES
 =======
 
 ----
-13.1
+14.0
 ----
 
-Bootstrap script now accepts ``--to-dir`` to customize save directory or
-allow for re-use of existing repository of setuptools versions. See
-Pull Request #112 for an alternate implementation.
+* Bootstrap script now accepts ``--to-dir`` to customize save directory or
+  allow for re-use of existing repository of setuptools versions. See
+  Pull Request #112 for an alternate implementation.
+* Issue #285: ``easy_install`` no longer will default to installing
+  packages to the "user site packages" directory if it is itself installed
+  there. Instead, the user must pass ``--user`` in all cases to install
+  packages to the user site packages.
+  This behavior now matches that of "pip install". To configure
+  an environment to always install to the user site packages, consider
+  using the "install-dir" and "scripts-dir" parameters to easy_install
+  through an appropriate distutils config file.
 
 ------
 13.0.1

From 78337beb23e68b062f60f42e1f7baf1d51f2587d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 10:50:30 -0500
Subject: [PATCH 4970/8469] Include pytest.ini in MANIFEST.in. Fixes #359.

---
 CHANGES.txt | 7 +++++++
 MANIFEST.in | 1 +
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index cc9c393970..f7c56b4a9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+13.0.2
+------
+
+* Issue #359: Include pytest.ini in the sdist so invocation of py.test on the
+  sdist honors the pytest configuration.
+
 ------
 13.0.1
 ------
diff --git a/MANIFEST.in b/MANIFEST.in
index 428bbd1e15..8a4523a901 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ include *.txt
 include MANIFEST.in
 include launcher.c
 include msvc-build-launcher.cmd
+include pytest.ini

From 64297dfe3bf0088480b0499b6bb5dc7d5946938b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 10:56:46 -0500
Subject: [PATCH 4971/8469] Added tag 13.0.2 for changeset e22a1d613bdd

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0a790e0187..e21214e5c3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -198,3 +198,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 297931cb8cac7d44d970adb927efd6cb36ac3526 12.4
 df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
 ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
+e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2

From 01e38bed190a1278f231f101431e2d09071de678 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Fri, 6 Mar 2015 09:11:39 -0800
Subject: [PATCH 4972/8469] Add __ne__ method to Requirement class

It seems like if it has an `__eq__` method, it should probably have a `__ne__` method.

I ran into this while working on pip -- see https://github.com/pypa/pip/pull/2493#discussion_r25955295
---
 pkg_resources/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2ce663d2ce..7701292b4c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2907,6 +2907,9 @@ def __eq__(self, other):
             self.hashCmp == other.hashCmp
         )
 
+    def __ne__(self, other):
+        return not self == other
+
     def __contains__(self, item):
         if isinstance(item, Distribution):
             if item.key != self.key:

From d138579b07086630732fa949a947dfad34a241d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:46:27 -0500
Subject: [PATCH 4973/8469] Update test to match new expectation following pull
 request #109. Refs #285.

---
 setuptools/tests/test_easy_install.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b9b2e392ee..af09d6811a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -156,15 +156,17 @@ class TestUserInstallTest:
 
     @mock.patch('setuptools.command.easy_install.__file__', None)
     def test_user_install_implied(self):
+        # simulate setuptools installed in user site packages
         easy_install_pkg.__file__ = site.USER_SITE
-        site.ENABLE_USER_SITE = True # disabled sometimes
-        #XXX: replace with something meaningfull
+        site.ENABLE_USER_SITE = True
+
+        # create a finalized easy_install command
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = ei.easy_install(dist)
         cmd.args = ['py']
         cmd.ensure_finalized()
-        assert cmd.user, 'user should be implied'
+        assert not cmd.user, 'user should not be implied'
 
     def test_multiproc_atexit(self):
         try:

From c05957b09a66c4728c9a578e2e5f33fbd7b97977 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:48:40 -0500
Subject: [PATCH 4974/8469] Use pytest.importorskip.

---
 setuptools/tests/test_easy_install.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index af09d6811a..8ba0c49cb4 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -169,11 +169,7 @@ def test_user_install_implied(self):
         assert not cmd.user, 'user should not be implied'
 
     def test_multiproc_atexit(self):
-        try:
-            __import__('multiprocessing')
-        except ImportError:
-            # skip the test if multiprocessing is not available
-            return
+        pytest.importorskip('multiprocessing')
 
         log = logging.getLogger('test_easy_install')
         logging.basicConfig(level=logging.INFO, stream=sys.stderr)

From 1ea8018e5c3a8c7c8d980368efc5ac3b81df37e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:49:04 -0500
Subject: [PATCH 4975/8469] Rename test to reflect implementation.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 8ba0c49cb4..36d6642850 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -155,7 +155,7 @@ def setup_context(tmpdir):
 class TestUserInstallTest:
 
     @mock.patch('setuptools.command.easy_install.__file__', None)
-    def test_user_install_implied(self):
+    def test_user_install_not_implied(self):
         # simulate setuptools installed in user site packages
         easy_install_pkg.__file__ = site.USER_SITE
         site.ENABLE_USER_SITE = True

From 55f0838ddfdd301f6f69369f94a3b476b5591b71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:49:46 -0500
Subject: [PATCH 4976/8469] Move related tests into proximity

---
 setuptools/tests/test_easy_install.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 36d6642850..2f7b27c59f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -168,13 +168,6 @@ def test_user_install_not_implied(self):
         cmd.ensure_finalized()
         assert not cmd.user, 'user should not be implied'
 
-    def test_multiproc_atexit(self):
-        pytest.importorskip('multiprocessing')
-
-        log = logging.getLogger('test_easy_install')
-        logging.basicConfig(level=logging.INFO, stream=sys.stderr)
-        log.info('this should not break')
-
     def test_user_install_not_implied_without_usersite_enabled(self):
         site.ENABLE_USER_SITE = False # usually enabled
         #XXX: replace with something meaningfull
@@ -185,6 +178,13 @@ def test_user_install_not_implied_without_usersite_enabled(self):
         cmd.initialize_options()
         assert not cmd.user, 'NOT user should be implied'
 
+    def test_multiproc_atexit(self):
+        pytest.importorskip('multiprocessing')
+
+        log = logging.getLogger('test_easy_install')
+        logging.basicConfig(level=logging.INFO, stream=sys.stderr)
+        log.info('this should not break')
+
     def test_local_index(self):
         # make sure the local index is used
         # when easy_install looks for installed

From dc5ad278255437f54f3033e5c526d6f2d1d1f2e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:51:33 -0500
Subject: [PATCH 4977/8469] Functions now mirror each other.

---
 setuptools/tests/test_easy_install.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2f7b27c59f..ec5d5faa42 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -155,7 +155,7 @@ def setup_context(tmpdir):
 class TestUserInstallTest:
 
     @mock.patch('setuptools.command.easy_install.__file__', None)
-    def test_user_install_not_implied(self):
+    def test_user_install_not_implied_user_site_enabled(self):
         # simulate setuptools installed in user site packages
         easy_install_pkg.__file__ = site.USER_SITE
         site.ENABLE_USER_SITE = True
@@ -168,9 +168,11 @@ def test_user_install_not_implied(self):
         cmd.ensure_finalized()
         assert not cmd.user, 'user should not be implied'
 
-    def test_user_install_not_implied_without_usersite_enabled(self):
-        site.ENABLE_USER_SITE = False # usually enabled
-        #XXX: replace with something meaningfull
+    def test_user_install_not_implied_user_site_disabled(self):
+        # ensure user-site not enabled
+        site.ENABLE_USER_SITE = False
+
+        # create a finalized easy_install command
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = ei.easy_install(dist)

From 997f97fcf456e9f63664e356e5ed2838e33d4cba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:53:13 -0500
Subject: [PATCH 4978/8469] Extract method for common behavior.

---
 setuptools/tests/test_easy_install.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ec5d5faa42..eed3bdb51b 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -160,25 +160,23 @@ def test_user_install_not_implied_user_site_enabled(self):
         easy_install_pkg.__file__ = site.USER_SITE
         site.ENABLE_USER_SITE = True
 
-        # create a finalized easy_install command
-        dist = Distribution()
-        dist.script_name = 'setup.py'
-        cmd = ei.easy_install(dist)
-        cmd.args = ['py']
-        cmd.ensure_finalized()
-        assert not cmd.user, 'user should not be implied'
+        self.assert_not_user_site()
 
     def test_user_install_not_implied_user_site_disabled(self):
         # ensure user-site not enabled
         site.ENABLE_USER_SITE = False
 
+        self.assert_not_user_site()
+
+    @staticmethod
+    def assert_not_user_site():
         # create a finalized easy_install command
         dist = Distribution()
         dist.script_name = 'setup.py'
         cmd = ei.easy_install(dist)
         cmd.args = ['py']
-        cmd.initialize_options()
-        assert not cmd.user, 'NOT user should be implied'
+        cmd.ensure_finalized()
+        assert not cmd.user, 'user should not be implied'
 
     def test_multiproc_atexit(self):
         pytest.importorskip('multiprocessing')

From 52172aa131f643c83370aa36968fa3f279c53858 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 15:58:03 -0500
Subject: [PATCH 4979/8469] Move patching into the patch methods.

---
 setuptools/tests/test_easy_install.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index eed3bdb51b..773ca6b663 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -154,18 +154,14 @@ def setup_context(tmpdir):
 @pytest.mark.usefixtures("setup_context")
 class TestUserInstallTest:
 
-    @mock.patch('setuptools.command.easy_install.__file__', None)
+    # simulate setuptools installed in user site packages
+    @mock.patch('setuptools.command.easy_install.__file__', site.USER_SITE)
+    @mock.patch('site.ENABLE_USER_SITE', True)
     def test_user_install_not_implied_user_site_enabled(self):
-        # simulate setuptools installed in user site packages
-        easy_install_pkg.__file__ = site.USER_SITE
-        site.ENABLE_USER_SITE = True
-
         self.assert_not_user_site()
 
+    @mock.patch('site.ENABLE_USER_SITE', False)
     def test_user_install_not_implied_user_site_disabled(self):
-        # ensure user-site not enabled
-        site.ENABLE_USER_SITE = False
-
         self.assert_not_user_site()
 
     @staticmethod

From 85dd199e880fdf29a2dbe25bff944b5fc3b1081e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:00:56 -0500
Subject: [PATCH 4980/8469] Replace comment with docstring assertion.

---
 setuptools/tests/test_easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 773ca6b663..4942acbf75 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -182,9 +182,10 @@ def test_multiproc_atexit(self):
         log.info('this should not break')
 
     def test_local_index(self):
-        # make sure the local index is used
-        # when easy_install looks for installed
-        # packages
+        """
+        The local index must be used when easy_install locates installed
+        packages.
+        """
         new_location = tempfile.mkdtemp()
         target = tempfile.mkdtemp()
         egg_file = os.path.join(new_location, 'foo-1.0.egg-info')

From ac3e0877123c9cb1a4d53653e273dfb3f1d40ed3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:16:18 -0500
Subject: [PATCH 4981/8469] Extract fixture for foo_package.

---
 setuptools/tests/test_easy_install.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4942acbf75..791e303841 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -181,17 +181,19 @@ def test_multiproc_atexit(self):
         logging.basicConfig(level=logging.INFO, stream=sys.stderr)
         log.info('this should not break')
 
-    def test_local_index(self):
+    @pytest.fixture()
+    def foo_package(self, tmpdir):
+        egg_file = tmpdir / 'foo-1.0.egg-info'
+        with egg_file.open('w') as f:
+            f.write('Name: foo\n')
+        return str(tmpdir)
+
+    def test_local_index(self, foo_package):
         """
         The local index must be used when easy_install locates installed
         packages.
         """
-        new_location = tempfile.mkdtemp()
         target = tempfile.mkdtemp()
-        egg_file = os.path.join(new_location, 'foo-1.0.egg-info')
-        with open(egg_file, 'w') as f:
-            f.write('Name: foo\n')
-
         sys.path.append(target)
         old_ppath = os.environ.get('PYTHONPATH')
         os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
@@ -202,14 +204,14 @@ def test_local_index(self):
             cmd.install_dir = target
             cmd.args = ['foo']
             cmd.ensure_finalized()
-            cmd.local_index.scan([new_location])
+            cmd.local_index.scan([foo_package])
             res = cmd.easy_install('foo')
             actual = os.path.normcase(os.path.realpath(res.location))
-            expected = os.path.normcase(os.path.realpath(new_location))
+            expected = os.path.normcase(os.path.realpath(foo_package))
             assert actual == expected
         finally:
             sys.path.remove(target)
-            for basedir in [new_location, target, ]:
+            for basedir in [target, ]:
                 if not os.path.exists(basedir) or not os.path.isdir(basedir):
                     continue
                 try:

From a2719779b6604634f87aed64cf4413486ccca88c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:19:57 -0500
Subject: [PATCH 4982/8469] Extract install_target as fixture

---
 setuptools/tests/test_easy_install.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 791e303841..1acf08b50b 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -188,20 +188,23 @@ def foo_package(self, tmpdir):
             f.write('Name: foo\n')
         return str(tmpdir)
 
-    def test_local_index(self, foo_package):
+    @pytest.fixture()
+    def install_target(self, tmpdir):
+        return str(tmpdir)
+
+    def test_local_index(self, foo_package, install_target):
         """
         The local index must be used when easy_install locates installed
         packages.
         """
-        target = tempfile.mkdtemp()
-        sys.path.append(target)
+        sys.path.append(install_target)
         old_ppath = os.environ.get('PYTHONPATH')
         os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
         try:
             dist = Distribution()
             dist.script_name = 'setup.py'
             cmd = ei.easy_install(dist)
-            cmd.install_dir = target
+            cmd.install_dir = install_target
             cmd.args = ['foo']
             cmd.ensure_finalized()
             cmd.local_index.scan([foo_package])
@@ -210,14 +213,7 @@ def test_local_index(self, foo_package):
             expected = os.path.normcase(os.path.realpath(foo_package))
             assert actual == expected
         finally:
-            sys.path.remove(target)
-            for basedir in [target, ]:
-                if not os.path.exists(basedir) or not os.path.isdir(basedir):
-                    continue
-                try:
-                    shutil.rmtree(basedir)
-                except:
-                    pass
+            sys.path.remove(install_target)
             if old_ppath is not None:
                 os.environ['PYTHONPATH'] = old_ppath
             else:

From c3b4d4bc997f71943b29bb8dccbdfcbc72bd7488 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:33:25 -0500
Subject: [PATCH 4983/8469] Extract sys.path and os.environ patching into
 install_target fixture

---
 setuptools/tests/test_easy_install.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1acf08b50b..6e2b25ddde 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -188,18 +188,19 @@ def foo_package(self, tmpdir):
             f.write('Name: foo\n')
         return str(tmpdir)
 
-    @pytest.fixture()
+    @pytest.yield_fixture()
     def install_target(self, tmpdir):
-        return str(tmpdir)
+        target = str(tmpdir)
+        with mock.patch('sys.path', sys.path + [target]):
+            python_path = os.path.pathsep.join(sys.path)
+            with mock.patch.dict(os.environ, PYTHONPATH=python_path):
+                yield target
 
     def test_local_index(self, foo_package, install_target):
         """
         The local index must be used when easy_install locates installed
         packages.
         """
-        sys.path.append(install_target)
-        old_ppath = os.environ.get('PYTHONPATH')
-        os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
         try:
             dist = Distribution()
             dist.script_name = 'setup.py'
@@ -213,11 +214,7 @@ def test_local_index(self, foo_package, install_target):
             expected = os.path.normcase(os.path.realpath(foo_package))
             assert actual == expected
         finally:
-            sys.path.remove(install_target)
-            if old_ppath is not None:
-                os.environ['PYTHONPATH'] = old_ppath
-            else:
-                del os.environ['PYTHONPATH']
+            pass
 
     @contextlib.contextmanager
     def user_install_setup_context(self, *args, **kwargs):

From 427b3bf0f2ddc07cc01637605277ca555d5b26ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:34:34 -0500
Subject: [PATCH 4984/8469] Remove unnecessary block

---
 setuptools/tests/test_easy_install.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6e2b25ddde..7d61fb8333 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -201,20 +201,17 @@ def test_local_index(self, foo_package, install_target):
         The local index must be used when easy_install locates installed
         packages.
         """
-        try:
-            dist = Distribution()
-            dist.script_name = 'setup.py'
-            cmd = ei.easy_install(dist)
-            cmd.install_dir = install_target
-            cmd.args = ['foo']
-            cmd.ensure_finalized()
-            cmd.local_index.scan([foo_package])
-            res = cmd.easy_install('foo')
-            actual = os.path.normcase(os.path.realpath(res.location))
-            expected = os.path.normcase(os.path.realpath(foo_package))
-            assert actual == expected
-        finally:
-            pass
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        cmd = ei.easy_install(dist)
+        cmd.install_dir = install_target
+        cmd.args = ['foo']
+        cmd.ensure_finalized()
+        cmd.local_index.scan([foo_package])
+        res = cmd.easy_install('foo')
+        actual = os.path.normcase(os.path.realpath(res.location))
+        expected = os.path.normcase(os.path.realpath(foo_package))
+        assert actual == expected
 
     @contextlib.contextmanager
     def user_install_setup_context(self, *args, **kwargs):

From 47c3c95f074c8d10cf946511196a75d7e3a1738b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 16:59:43 -0500
Subject: [PATCH 4985/8469] Edit changelog

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 608dd77d02..611b0124ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,7 +8,7 @@ CHANGES
 
 * Bootstrap script now accepts ``--to-dir`` to customize save directory or
   allow for re-use of existing repository of setuptools versions. See
-  Pull Request #112 for an alternate implementation.
+  Pull Request #112 for background.
 * Issue #285: ``easy_install`` no longer will default to installing
   packages to the "user site packages" directory if it is itself installed
   there. Instead, the user must pass ``--user`` in all cases to install

From adbfaa73e54eef2a24673f49995c933eb0f88adf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 17:30:09 -0500
Subject: [PATCH 4986/8469] Bumped to 14.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 9ece89d7e7..a1d95ac215 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "13.0.2"
+DEFAULT_VERSION = "14.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 525a47ea0f..7720175dcc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '13.0.2'
+__version__ = '14.0'

From 761473c7f30b8df3872416357224174ba8b654a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 17:30:11 -0500
Subject: [PATCH 4987/8469] Added tag 14.0 for changeset a3a105f795f8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e21214e5c3..256a8171b9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -199,3 +199,4 @@ bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
 df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
 ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
 e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
+a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0

From 45bf0df21a53809a891ea5bb45e5407a2ebb5e02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 17:30:46 -0500
Subject: [PATCH 4988/8469] Bumped to 14.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a1d95ac215..3374c36f76 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.0"
+DEFAULT_VERSION = "14.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 7720175dcc..2ac79c2318 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.0'
+__version__ = '14.1'

From ab794ef306bcbe88c1fde6439ed02f889487c239 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 22:59:39 -0500
Subject: [PATCH 4989/8469] Use filter(None) for brevity

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4e84152018..81573fea80 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -435,7 +435,7 @@ def check_site_dir(self):
             self.pth_file = None
 
         PYTHONPATH = os.environ.get('PYTHONPATH', '').split(os.pathsep)
-        if instdir not in map(normalize_path, [_f for _f in PYTHONPATH if _f]):
+        if instdir not in map(normalize_path, filter(None, PYTHONPATH)):
             # only PYTHONPATH dirs need a site.py, so pretend it's there
             self.sitepy_installed = True
         elif self.multi_version and not os.path.exists(pth_file):

From 275336b8fb9171ba8bf7a7114a2d6ae41993848b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:11:45 -0500
Subject: [PATCH 4990/8469] Remove comment that references a setup command, but
 even at the time it was committed, it's not duplicate code from anything in
 setuptools, and I'm unaware of what a setup command is.

---
 setuptools/command/easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 81573fea80..c9e61d1310 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -238,7 +238,6 @@ def finalize_options(self):
             self.config_vars['usersite'] = self.install_usersite
 
         # fix the install_dir if "--user" was used
-        # XXX: duplicate of the code in the setup command
         if self.user and site.ENABLE_USER_SITE:
             self.create_home_path()
             if self.install_userbase is None:

From 126161426c858f6b3e73a330086d9bb0d2995a12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:16:27 -0500
Subject: [PATCH 4991/8469] Calculate scheme name directly.

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c9e61d1310..c35ae16cf3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -244,10 +244,8 @@ def finalize_options(self):
                 raise DistutilsPlatformError(
                     "User base directory is not specified")
             self.install_base = self.install_platbase = self.install_userbase
-            if os.name == 'posix':
-                self.select_scheme("unix_user")
-            else:
-                self.select_scheme(os.name + "_user")
+            scheme_name = os.name.replace('posix', 'unix') + '_user'
+            self.select_scheme(scheme_name)
 
         self.expand_basedirs()
         self.expand_dirs()

From 3a8d4728cbc3080a7a816f87dc20efafae6e28e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:19:23 -0500
Subject: [PATCH 4992/8469] Extract method for fixing install dir

---
 setuptools/command/easy_install.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c35ae16cf3..872f6bb896 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -237,15 +237,7 @@ def finalize_options(self):
             self.config_vars['userbase'] = self.install_userbase
             self.config_vars['usersite'] = self.install_usersite
 
-        # fix the install_dir if "--user" was used
-        if self.user and site.ENABLE_USER_SITE:
-            self.create_home_path()
-            if self.install_userbase is None:
-                raise DistutilsPlatformError(
-                    "User base directory is not specified")
-            self.install_base = self.install_platbase = self.install_userbase
-            scheme_name = os.name.replace('posix', 'unix') + '_user'
-            self.select_scheme(scheme_name)
+        self._fix_install_dir_for_user_site()
 
         self.expand_basedirs()
         self.expand_dirs()
@@ -340,6 +332,19 @@ def finalize_options(self):
 
         self.outputs = []
 
+    def _fix_install_dir_for_user_site(self):
+        """
+        Fix the install_dir if "--user" was used.
+        """
+        if self.user and site.ENABLE_USER_SITE:
+            self.create_home_path()
+            if self.install_userbase is None:
+                raise DistutilsPlatformError(
+                    "User base directory is not specified")
+            self.install_base = self.install_platbase = self.install_userbase
+            scheme_name = os.name.replace('posix', 'unix') + '_user'
+            self.select_scheme(scheme_name)
+
     def _expand_attrs(self, attrs):
         for attr in attrs:
             val = getattr(self, attr)

From 727f1668fc61f74867cc0cfdfabdd6d23699a6d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:21:01 -0500
Subject: [PATCH 4993/8469] Use short circuit instead of nesting functionality.

---
 setuptools/command/easy_install.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 872f6bb896..efe5f68b37 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -336,14 +336,16 @@ def _fix_install_dir_for_user_site(self):
         """
         Fix the install_dir if "--user" was used.
         """
-        if self.user and site.ENABLE_USER_SITE:
-            self.create_home_path()
-            if self.install_userbase is None:
-                raise DistutilsPlatformError(
-                    "User base directory is not specified")
-            self.install_base = self.install_platbase = self.install_userbase
-            scheme_name = os.name.replace('posix', 'unix') + '_user'
-            self.select_scheme(scheme_name)
+        if not self.user or not site.ENABLE_USER_SITE:
+            return
+
+        self.create_home_path()
+        if self.install_userbase is None:
+            raise DistutilsPlatformError(
+                "User base directory is not specified")
+        self.install_base = self.install_platbase = self.install_userbase
+        scheme_name = os.name.replace('posix', 'unix') + '_user'
+        self.select_scheme(scheme_name)
 
     def _expand_attrs(self, attrs):
         for attr in attrs:

From f922da30d3d4d6ef6ac99f65509cf243dcce1ea4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:22:40 -0500
Subject: [PATCH 4994/8469] Extract variable for error message.

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index efe5f68b37..9f480f053d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -341,8 +341,8 @@ def _fix_install_dir_for_user_site(self):
 
         self.create_home_path()
         if self.install_userbase is None:
-            raise DistutilsPlatformError(
-                "User base directory is not specified")
+            msg = "User base directory is not specified"
+            raise DistutilsPlatformError(msg)
         self.install_base = self.install_platbase = self.install_userbase
         scheme_name = os.name.replace('posix', 'unix') + '_user'
         self.select_scheme(scheme_name)

From 537c16561318df78f1a512101d0eca1b0593616e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:29:47 -0500
Subject: [PATCH 4995/8469] Filter blockers in the iterable

---
 setuptools/command/easy_install.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9f480f053d..531ac8ff87 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -200,8 +200,11 @@ def initialize_options(self):
         )
 
     def delete_blockers(self, blockers):
-        for filename in blockers:
-            if os.path.exists(filename) or os.path.islink(filename):
+        extant_blockers = (
+            filename for filename in blockers
+            if os.path.exists(filename) or os.path.islink(filename)
+        )
+        for filename in extant_blockers:
                 log.info("Deleting %s", filename)
                 if not self.dry_run:
                     if (os.path.isdir(filename) and

From f9fd181f25d50bd149c715c7ac52827da34d0e59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:31:49 -0500
Subject: [PATCH 4996/8469] Extract method for filename deletion.

---
 setuptools/command/easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 531ac8ff87..01c67ccc57 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -204,7 +204,9 @@ def delete_blockers(self, blockers):
             filename for filename in blockers
             if os.path.exists(filename) or os.path.islink(filename)
         )
-        for filename in extant_blockers:
+        list(map(self._delete_filename, extant_blockers))
+
+    def _delete_filename(self, filename):
                 log.info("Deleting %s", filename)
                 if not self.dry_run:
                     if (os.path.isdir(filename) and

From 7ab342a1ed684563ee7742fc3f7fd04fac5b7fc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:35:27 -0500
Subject: [PATCH 4997/8469] Remove excess indent

---
 setuptools/command/easy_install.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 01c67ccc57..7dbbc878a4 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -207,13 +207,13 @@ def delete_blockers(self, blockers):
         list(map(self._delete_filename, extant_blockers))
 
     def _delete_filename(self, filename):
-                log.info("Deleting %s", filename)
-                if not self.dry_run:
-                    if (os.path.isdir(filename) and
-                            not os.path.islink(filename)):
-                        rmtree(filename)
-                    else:
-                        os.unlink(filename)
+        log.info("Deleting %s", filename)
+        if not self.dry_run:
+            if (os.path.isdir(filename) and
+                    not os.path.islink(filename)):
+                rmtree(filename)
+            else:
+                os.unlink(filename)
 
     def finalize_options(self):
         if self.version:

From e4fe5c76f89d0249ff7035a38795fa5ae1e38f09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:36:10 -0500
Subject: [PATCH 4998/8469] Short circuit on dry run

---
 setuptools/command/easy_install.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7dbbc878a4..7f360e055e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -208,12 +208,14 @@ def delete_blockers(self, blockers):
 
     def _delete_filename(self, filename):
         log.info("Deleting %s", filename)
-        if not self.dry_run:
-            if (os.path.isdir(filename) and
-                    not os.path.islink(filename)):
-                rmtree(filename)
-            else:
-                os.unlink(filename)
+        if self.dry_run:
+            return
+
+        if (os.path.isdir(filename) and
+                not os.path.islink(filename)):
+            rmtree(filename)
+        else:
+            os.unlink(filename)
 
     def finalize_options(self):
         if self.version:

From 16060fd91b26126c6f1fce2c1dba4a79cf85177e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:36:45 -0500
Subject: [PATCH 4999/8469] Extract variable for is_tree

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7f360e055e..bf380f1313 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -211,8 +211,8 @@ def _delete_filename(self, filename):
         if self.dry_run:
             return
 
-        if (os.path.isdir(filename) and
-                not os.path.islink(filename)):
+        is_tree = os.path.isdir(filename) and not os.path.islink(filename)
+        if is_tree:
             rmtree(filename)
         else:
             os.unlink(filename)

From 16a4240286b5202e2a52c22efb63fc3c1ba7ab02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:39:36 -0500
Subject: [PATCH 5000/8469] More concisely describe the removal.

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index bf380f1313..0828be84cf 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -212,10 +212,8 @@ def _delete_filename(self, filename):
             return
 
         is_tree = os.path.isdir(filename) and not os.path.islink(filename)
-        if is_tree:
-            rmtree(filename)
-        else:
-            os.unlink(filename)
+        remover = rmtree if is_tree else os.unlink
+        remover(filename)
 
     def finalize_options(self):
         if self.version:

From cbc3c959feecae75c1ce7864543c7f3a14b65ab0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 Mar 2015 23:40:47 -0500
Subject: [PATCH 5001/8469] Use 'path' to describe a file or directory.

---
 setuptools/command/easy_install.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0828be84cf..276b6f99ba 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -204,16 +204,16 @@ def delete_blockers(self, blockers):
             filename for filename in blockers
             if os.path.exists(filename) or os.path.islink(filename)
         )
-        list(map(self._delete_filename, extant_blockers))
+        list(map(self._delete_path, extant_blockers))
 
-    def _delete_filename(self, filename):
-        log.info("Deleting %s", filename)
+    def _delete_path(self, path):
+        log.info("Deleting %s", path)
         if self.dry_run:
             return
 
-        is_tree = os.path.isdir(filename) and not os.path.islink(filename)
+        is_tree = os.path.isdir(path) and not os.path.islink(path)
         remover = rmtree if is_tree else os.unlink
-        remover(filename)
+        remover(path)
 
     def finalize_options(self):
         if self.version:

From 0721693f695db566cb7f8253cdcd50d21559ac94 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Mon, 9 Mar 2015 08:38:48 +0100
Subject: [PATCH 5002/8469] fix makefile s/setuptools/pkg_resources/

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ab60b882c3..37dd26eb91 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,6 @@ empty:
 	exit 1
 
 update-vendored:
-	rm -rf setuptools/_vendor/packaging
-	pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
-	rm -rf setuptools/_vendor/*.{egg,dist}-info
+	rm -rf pkg_resources/_vendor/packaging
+	pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	rm -rf pkg_resources/_vendor/*.{egg,dist}-info

From 170af2c8010aa7e7ff0d1c71d8ee6bcb2aea51cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 21:26:16 -0400
Subject: [PATCH 5003/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 611b0124ca..6c2ff946f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+14.1
+----
+
+* Pull Request #125: Add ``__ne__`` to Requirement class.
+* Various refactoring of easy_install.
+
 ----
 14.0
 ----

From 12a9c92696884ea7a3a63ac57abbe8fafdad501e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 21:31:11 -0400
Subject: [PATCH 5004/8469] Added tag 14.1 for changeset 9751a1671a12

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 256a8171b9..83bc4f5ae5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -200,3 +200,4 @@ df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
 ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
 e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
 a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
+9751a1671a124e30ae344d1510b9c1dbb14f2775 14.1

From 09c966b75de843ec24c6fbababdc19772b24268d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 21:31:50 -0400
Subject: [PATCH 5005/8469] Bumped to 14.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3374c36f76..913a4ceb54 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.1"
+DEFAULT_VERSION = "14.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 2ac79c2318..a52fd83269 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.1'
+__version__ = '14.2'

From 1919a4358eebcfd48e24756e0bb68035e8750800 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:09:26 -0400
Subject: [PATCH 5006/8469] Remove regression test for Distribute issue #318.
 The continuing relevance of this test is questionnaible, given that user
 installs of setuptools no longer imply user installs of other packages. Ref
 #360.

---
 setuptools/tests/test_easy_install.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7d61fb8333..c571499822 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -232,26 +232,6 @@ def patched_setup_context(self):
             self.user_install_setup_context,
         )
 
-    def test_setup_requires(self):
-        """Regression test for Distribute issue #318
-
-        Ensure that a package with setup_requires can be installed when
-        setuptools is installed in the user site-packages without causing a
-        SandboxViolation.
-        """
-
-        test_pkg = create_setup_requires_package(os.getcwd())
-        test_setup_py = os.path.join(test_pkg, 'setup.py')
-
-        try:
-            with contexts.quiet():
-                with self.patched_setup_context():
-                    run_setup(test_setup_py, ['install'])
-        except IndexError:
-            # Test fails in some cases due to bugs in Python
-            # See https://bitbucket.org/pypa/setuptools/issue/201
-            pass
-
 
 @pytest.yield_fixture
 def distutils_package():

From 24b1723a48ef5ba95afeabf96f8021b939d8391a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:40:27 -0400
Subject: [PATCH 5007/8469] Bypass the checking of site-packages when asserting
 not user install in site-packages. Fixes #360.

---
 setuptools/tests/test_easy_install.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c571499822..e71bbfc9e8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -154,13 +154,23 @@ def setup_context(tmpdir):
 @pytest.mark.usefixtures("setup_context")
 class TestUserInstallTest:
 
+    # prevent check that site-packages is writable. easy_install
+    # shouldn't be writing to system site-packages during finalize
+    # options, but while it does, bypass the behavior.
+    prev_sp_write = mock.patch(
+        'setuptools.command.easy_install.easy_install.check_site_dir',
+        mock.Mock(),
+    )
+
     # simulate setuptools installed in user site packages
     @mock.patch('setuptools.command.easy_install.__file__', site.USER_SITE)
     @mock.patch('site.ENABLE_USER_SITE', True)
+    @prev_sp_write
     def test_user_install_not_implied_user_site_enabled(self):
         self.assert_not_user_site()
 
     @mock.patch('site.ENABLE_USER_SITE', False)
+    @prev_sp_write
     def test_user_install_not_implied_user_site_disabled(self):
         self.assert_not_user_site()
 

From 6ef3f6262aac874f61483a3cc96da1e2a0b1a362 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:41:54 -0400
Subject: [PATCH 5008/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6c2ff946f3..3e72eaa1b5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+14.1.1
+------
+
+* Issue #360: Removed undesirable behavior from test runs, preventing
+  write tests and installation to system site packages.
+
 ----
 14.1
 ----

From aba25cd363c6f7dc9469f00a1c56ef8f4ffc6f17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:44:48 -0400
Subject: [PATCH 5009/8469] Bumped to 14.1.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 913a4ceb54..c5a256a7d2 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.2"
+DEFAULT_VERSION = "14.1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index a52fd83269..8800c2074d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.2'
+__version__ = '14.1.1'

From a9cb52adc1ce9337e4c5c2602c48ab6daba680a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:44:50 -0400
Subject: [PATCH 5010/8469] Added tag 14.1.1 for changeset 07fcc3226782

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 83bc4f5ae5..5990158081 100644
--- a/.hgtags
+++ b/.hgtags
@@ -201,3 +201,4 @@ ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
 e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
 a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
 9751a1671a124e30ae344d1510b9c1dbb14f2775 14.1
+07fcc3226782b979cedaaf456c7f1c5b2fdafd2c 14.1.1

From 0e0db0408fbcbb0a0a6de45a70dca32f5d91170b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Mar 2015 22:45:30 -0400
Subject: [PATCH 5011/8469] Bumped to 14.1.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c5a256a7d2..d4fd86c484 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.1.1"
+DEFAULT_VERSION = "14.1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 8800c2074d..134b5685f6 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.1.1'
+__version__ = '14.1.2'

From 4a4ca5aefb4d78046f16adbdcc2ce96f262522b2 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 5 Feb 2015 11:48:02 -0800
Subject: [PATCH 5012/8469] ensure py_version and platform are str in hashcmp

avoids unorderable None, str when sorting dists on Python 3
---
 pkg_resources/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7701292b4c..a1dce2d804 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2448,8 +2448,8 @@ def hashcmp(self):
             self.precedence,
             self.key,
             _remove_md5_fragment(self.location),
-            self.py_version,
-            self.platform,
+            self.py_version or '',
+            self.platform or '',
         )
 
     def __hash__(self):

From 3ccb5a4fba4eccdb22e325c82593b8e4e91a0354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <cf.natali@gmail.com>
Date: Sat, 7 Feb 2015 13:27:50 +0000
Subject: [PATCH 5013/8469] Issue #23285: PEP 475 -- Retry system calls failing
 with EINTR.

---
 spawn.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spawn.py b/spawn.py
index 22e87e8fdb..5dd415a283 100644
--- a/spawn.py
+++ b/spawn.py
@@ -137,9 +137,6 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
             try:
                 pid, status = os.waitpid(pid, 0)
             except OSError as exc:
-                import errno
-                if exc.errno == errno.EINTR:
-                    continue
                 if not DEBUG:
                     cmd = executable
                 raise DistutilsExecError(

From c14a53783773ecd520e998f72a2fd8fe4d58d8ca Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 7 Feb 2015 16:00:45 -0800
Subject: [PATCH 5014/8469] Version bump for 3.4.3rc1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index dfe62ffa4a..e8782819e1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.2"
+__version__ = "3.4.3rc1"
 #--end constants--

From 5bf2ae1154e0722c9de295d4ec9f9721b629af73 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 7 Feb 2015 16:00:55 -0800
Subject: [PATCH 5015/8469] Release bump for 3.5.0a1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 328bea6ffe..67ec78b295 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.5.0a0"
+__version__ = "3.5.0a1"
 #--end constants--

From 2f7d730baf32b841c1b99d58b8efe3f8ca0423b8 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 14 Feb 2015 09:50:59 -0800
Subject: [PATCH 5016/8469] Closes #23437: Make user scripts directory
 versioned on Windows (patch by pmoore)

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index d768dc5463..67db007a02 100644
--- a/command/install.py
+++ b/command/install.py
@@ -51,7 +51,7 @@
         'purelib': '$usersite',
         'platlib': '$usersite',
         'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
+        'scripts': '$userbase/Python$py_version_nodot/Scripts',
         'data'   : '$userbase',
         }
 

From 1f83754d9d44682de0958692d91f1ac4c9bdfec3 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 22 Feb 2015 23:55:39 -0800
Subject: [PATCH 5017/8469] Release bump for 3.4.3 final.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index e8782819e1..00a5859738 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.4.3rc1"
+__version__ = "3.4.3"
 #--end constants--

From 4ffb1b7d89010474216e3baabef175c139aa4522 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 08:15:36 -0400
Subject: [PATCH 5018/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e72eaa1b5..ca15f587f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+14.2
+----
+
+* Issue #137: Update ``Distribution.hashcmp`` so that Distributions with
+  None for pyversion or platform can be compared against Distributions
+  defining those attributes.
+
 ------
 14.1.1
 ------

From 6301007c244531948add7852db54045e9c3a11ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 08:18:41 -0400
Subject: [PATCH 5019/8469] Bumped to 14.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d4fd86c484..913a4ceb54 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.1.2"
+DEFAULT_VERSION = "14.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 134b5685f6..a52fd83269 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.1.2'
+__version__ = '14.2'

From dd8c2936e235a91a62f5ee3a8045614184f0c108 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 08:18:43 -0400
Subject: [PATCH 5020/8469] Added tag 14.2 for changeset d714fb731de7

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5990158081..8508404cd2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -202,3 +202,4 @@ e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
 a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
 9751a1671a124e30ae344d1510b9c1dbb14f2775 14.1
 07fcc3226782b979cedaaf456c7f1c5b2fdafd2c 14.1.1
+d714fb731de779a1337d2d78cd413931f1f06193 14.2

From 6d69e5a0d777c6a564ec32f9b726da64f2a5ad9c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 08:19:20 -0400
Subject: [PATCH 5021/8469] Bumped to 14.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 913a4ceb54..5428375062 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.2"
+DEFAULT_VERSION = "14.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index a52fd83269..89a024f067 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.2'
+__version__ = '14.3'

From e4a80d4fdf2871f538716034aa539014aea7abd9 Mon Sep 17 00:00:00 2001
From: Volker Braun <vbraun.name@gmail.com>
Date: Thu, 5 Mar 2015 01:42:38 +0100
Subject: [PATCH 5022/8469] Default to 755 permissions since checks later on
 test for non-group-writability

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a1dce2d804..0e32f45211 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2958,7 +2958,7 @@ def ensure_directory(path):
         os.makedirs(dirname)
 
 
-def _bypass_ensure_directory(path, mode=0o777):
+def _bypass_ensure_directory(path, mode=0o755):
     """Sandbox-bypassing version of ensure_directory()"""
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')

From 4b8f2273ff4fe2d8343d79d0ecb81db7a9ad323c Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 8 Mar 2015 00:24:34 -0800
Subject: [PATCH 5023/8469] Release bump for 3.5.0a2.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 67ec78b295..451c5fbebc 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.5.0a1"
+__version__ = "3.5.0a2"
 #--end constants--

From 729daffe61a5e6c5705ddf2aba36f9e0caf42f37 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 09:35:09 -0400
Subject: [PATCH 5024/8469] Remove unused parameter.

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0e32f45211..c3686f8897 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2958,14 +2958,14 @@ def ensure_directory(path):
         os.makedirs(dirname)
 
 
-def _bypass_ensure_directory(path, mode=0o755):
+def _bypass_ensure_directory(path):
     """Sandbox-bypassing version of ensure_directory()"""
     if not WRITE_SUPPORT:
         raise IOError('"os.mkdir" not supported on this platform.')
     dirname, filename = split(path)
     if dirname and filename and not isdir(dirname):
         _bypass_ensure_directory(dirname)
-        mkdir(dirname, mode)
+        mkdir(dirname, 0o755)
 
 
 def split_sections(s):

From 1a4c6632a304225cfd797d5a1d6881578cb81af1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 09:42:23 -0400
Subject: [PATCH 5025/8469] Update changelog. Fixes #254.

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ca15f587f2..fa161fc617 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+14.3
+----
+
+* Issue #254: When creating temporary egg cache on Unix, use mode 755
+  for creating the directory to avoid the subsequent warning if
+  the directory is group writable.
+
 ----
 14.2
 ----

From 482a2457aa5b28d1223cfb4f9130585bf8c9e8fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 09:47:06 -0400
Subject: [PATCH 5026/8469] Added tag 14.3 for changeset e3c635a7d463

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8508404cd2..ff5c6433f0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -203,3 +203,4 @@ a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
 9751a1671a124e30ae344d1510b9c1dbb14f2775 14.1
 07fcc3226782b979cedaaf456c7f1c5b2fdafd2c 14.1.1
 d714fb731de779a1337d2d78cd413931f1f06193 14.2
+e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3

From 1581c8404e12f32190d3bc29825b9910a46f2347 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2015 09:47:40 -0400
Subject: [PATCH 5027/8469] Bumped to 14.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 5428375062..c8549761be 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.3"
+DEFAULT_VERSION = "14.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 89a024f067..5b9a2bc63f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.3'
+__version__ = '14.4'

From 2283fc214217e5c3dca8cc65045271ab5d0ea522 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Thu, 19 Mar 2015 09:48:18 -0700
Subject: [PATCH 5028/8469] DistributionNotFound: Show requirers

It is very helpful to know who required the missing package. E.g.:

    pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution was not found and is required by smlib.log.

Note that there was a comment: "unfortunately, zc.buildout uses a str(err) to
get the name of the distribution here..", but I did a search in the `buildout`
code and I think that is no longer true, so I think that we're free to make the
exception message more helpful without risk of breaking buildout:

    # In clone from https://github.com/buildout/buildout
    $ ag DistributionNotFound
    src/zc/buildout/buildout.py
    686:        except (ImportError, pkg_resources.DistributionNotFound):

    $ pip install --download=. --no-install zc.buildout
    ...
      Saved ./zc.buildout-2.3.1.tar.gz
    ...
    $ tar xf zc.buildout-2.3.1.tar.gz
    $ ag DistributionNotFound zc.buildout-2.3.1
    zc.buildout-2.3.1/src/zc/buildout/buildout.py
    686:        except (ImportError, pkg_resources.DistributionNotFound):

--HG--
branch : DistributionNotFound_list_requirers
---
 pkg_resources/__init__.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c3686f8897..4e820c0973 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -798,13 +798,16 @@ def resolve(self, requirements, env=None, installer=None,
                             ws = WorkingSet([])
                     dist = best[req.key] = env.best_match(req, ws, installer)
                     if dist is None:
-                        #msg = ("The '%s' distribution was not found on this "
-                        #       "system, and is required by this application.")
-                        #raise DistributionNotFound(msg % req)
-
-                        # unfortunately, zc.buildout uses a str(err)
-                        # to get the name of the distribution here..
-                        raise DistributionNotFound(req)
+                        requirers = required_by.get(req, None)
+                        if requirers:
+                            requirers_str = ', '.join(requirers)
+                        else:
+                            requirers_str = 'this application'
+                        msg = ("The '%s' distribution was not found "
+                               "and is required by %s."
+                               % (req, requirers_str))
+                        warnings.warn(msg)
+                        raise DistributionNotFound(msg)
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency

From 3ff70513dceb10287c79ca9eb902e42b74f3e55f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 19 Mar 2015 14:10:49 -0400
Subject: [PATCH 5029/8469] Replace deprecated usage with preferred usage.
 Fixes #364.

---
 setuptools/command/egg_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a9940677ea..50f3d5c0c2 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -168,7 +168,8 @@ def run(self):
         self.mkpath(self.egg_info)
         installer = self.distribution.fetch_build_egg
         for ep in iter_entry_points('egg_info.writers'):
-            writer = ep.load(installer=installer)
+            ep.require(installer=installer)
+            writer = ep.resolve()
             writer(self, ep.name, os.path.join(self.egg_info, ep.name))
 
         # Get rid of native_libs.txt if it was put there by older bdist_egg

From a54a764326d516950861d2d317150e7e172bd99f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 11:26:02 -0400
Subject: [PATCH 5030/8469] Add test capturing failure to parse package names
 with hyphens. Ref #307

---
 pkg_resources/tests/test_resources.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index a55478a249..92f076a12b 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -207,6 +207,16 @@ def testDistroDependsOptions(self):
         with pytest.raises(pkg_resources.UnknownExtra):
             d.requires(["foo"])
 
+    def test_pkg_name_with_hyphen(self):
+        "Package names with hyphens are supported"
+        name = 'setuptools-markdown-1.0.egg'
+        dist = Distribution.from_filename(name)
+        assert dist.project_name == "setuptools-markdown"
+        assert dist.key == "setuptools-markdown"
+        assert dist.version == "1.0"
+        assert dist.py_version is None
+        assert dist.platform is None
+
 
 class TestWorkingSet:
     def test_find_conflicting(self):

From a074b625e3c765ac62cb4240d5c8d1d35152f8f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 12:34:02 -0400
Subject: [PATCH 5031/8469] Update EGG_NAME regular expression matcher to allow
 names to include dashes. Fixes failing test and fixes #307.

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c3686f8897..4cdb40dc35 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2267,8 +2267,8 @@ def yield_lines(strs):
 CBRACKET = re.compile(r"\s*\]").match
 MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
-    r"(?P<name>[^-]+)"
-    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?",
+    r"(?P<name>.*?)"
+    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?$",
     re.VERBOSE | re.IGNORECASE
 ).match
 

From e1c326e105c1bbd3585e5867973b8d54dc9d4929 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 12:41:00 -0400
Subject: [PATCH 5032/8469] Reindent EGG_NAME to reflect structure.

---
 pkg_resources/__init__.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4cdb40dc35..507bacc645 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2267,9 +2267,17 @@ def yield_lines(strs):
 CBRACKET = re.compile(r"\s*\]").match
 MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
-    r"(?P<name>.*?)"
-    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?$",
-    re.VERBOSE | re.IGNORECASE
+    r"""
+    (?P<name>.*?) (
+        -(?P<ver>[^-]+) (
+            -py(?P<pyver>[^-]+) (
+                -(?P<plat>.+)
+            )?
+        )?
+    )?
+    $
+    """,
+    re.VERBOSE | re.IGNORECASE,
 ).match
 
 

From a631a0700d2ebcc9ee98c91d474f351974cc0b92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 13:30:51 -0400
Subject: [PATCH 5033/8469] Match Python 3 for bdist_dumb.

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5ed19130d7..963b4b412a 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -140,8 +140,9 @@ def interpret_distro_name(
     parts = basename.split('-')
     if not py_version:
         for i,p in enumerate(parts[2:]):
-            if len(p)==5 and p.startswith('py2.'):
-                return # It's a bdist_dumb, not an sdist -- bail out
+            if p.match('py\d\.\d'):
+                # It's a bdist_dumb, not an sdist -- bail out
+                return
 
     for p in range(1,len(parts)+1):
         yield Distribution(

From 00477b5b3e1f42b5ad9cdc553652e04beb675dbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 13:31:38 -0400
Subject: [PATCH 5034/8469] Remove unused variable

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 963b4b412a..c117cb6206 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -139,7 +139,7 @@ def interpret_distro_name(
 
     parts = basename.split('-')
     if not py_version:
-        for i,p in enumerate(parts[2:]):
+        for p in parts[2:]:
             if p.match('py\d\.\d'):
                 # It's a bdist_dumb, not an sdist -- bail out
                 return

From edf097e299d4382700f819288cb08390c53e109d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 13:34:15 -0400
Subject: [PATCH 5035/8469] Flat is better than nested.

---
 setuptools/package_index.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index c117cb6206..51769cdfb4 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -138,11 +138,9 @@ def interpret_distro_name(
     # versions in distribution archive names (sdist and bdist).
 
     parts = basename.split('-')
-    if not py_version:
-        for p in parts[2:]:
-            if p.match('py\d\.\d'):
-                # It's a bdist_dumb, not an sdist -- bail out
-                return
+    if not py_version and any(p.match('py\d\.\d') for p in parts[2:]):
+        # it is a bdist_dumb, not an sdist -- bail out
+        return
 
     for p in range(1,len(parts)+1):
         yield Distribution(

From c21f34b66f67d7948d2f99143636cd1dab7734a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:29:44 -0400
Subject: [PATCH 5036/8469] Extract method for warning of legacy version

---
 pkg_resources/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 507bacc645..1bb67a71fa 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2500,6 +2500,11 @@ def key(self):
     def parsed_version(self):
         if not hasattr(self, "_parsed_version"):
             self._parsed_version = parse_version(self.version)
+            self._warn_legacy_version()
+
+        return self._parsed_version
+
+    def _warn_legacy_version(self):
             if isinstance(
                     self._parsed_version, packaging.version.LegacyVersion):
                 # While an empty version is techincally a legacy version and
@@ -2520,7 +2525,6 @@ def parsed_version(self):
                         PEP440Warning,
                     )
 
-        return self._parsed_version
 
     @property
     def version(self):

From acd20ca332bb3f0ad48c7d92f832bfb2121decc1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:34:18 -0400
Subject: [PATCH 5037/8469] Reindent warning and use short circuits for flatter
 implementation.

---
 pkg_resources/__init__.py | 42 +++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 1bb67a71fa..f76114727f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -36,6 +36,7 @@
 import plistlib
 import email.parser
 import tempfile
+import textwrap
 from pkgutil import get_importer
 
 PY3 = sys.version_info > (3,)
@@ -2505,26 +2506,29 @@ def parsed_version(self):
         return self._parsed_version
 
     def _warn_legacy_version(self):
-            if isinstance(
-                    self._parsed_version, packaging.version.LegacyVersion):
-                # While an empty version is techincally a legacy version and
-                # is not a valid PEP 440 version, it's also unlikely to
-                # actually come from someone and instead it is more likely that
-                # it comes from setuptools attempting to parse a filename and
-                # including it in the list. So for that we'll gate this warning
-                # on if the version is anything at all or not.
-                if self.version:
-                    warnings.warn(
-                        "'%s (%s)' is being parsed as a legacy, non PEP 440, "
-                        "version. You may find odd behavior and sort order. "
-                        "In particular it will be sorted as less than 0.0. It "
-                        "is recommend to migrate to PEP 440 compatible "
-                        "versions." % (
-                            self.project_name, self.version,
-                        ),
-                        PEP440Warning,
-                    )
+        LV = packaging.version.LegacyVersion
+        is_legacy = isinstance(self._parsed_version, LV)
+        if not is_legacy:
+            return
+
+        # While an empty version is techincally a legacy version and
+        # is not a valid PEP 440 version, it's also unlikely to
+        # actually come from someone and instead it is more likely that
+        # it comes from setuptools attempting to parse a filename and
+        # including it in the list. So for that we'll gate this warning
+        # on if the version is anything at all or not.
+        if not self.version:
+            return
+
+        tmpl = textwrap.dedent("""
+            '%s (%s)' is being parsed as a legacy, non PEP 440,
+            version. You may find odd behavior and sort order.
+            In particular it will be sorted as less than 0.0. It
+            is recommend to migrate to PEP 440 compatible
+            versions.
+            """).strip().replace('\n', ' ')
 
+        warnings.warn(tmpl % (self.project_name, self.version), PEP440Warning)
 
     @property
     def version(self):

From 80c6b750898c53a0f627c64a0b953ae0e5fdb9d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:38:04 -0400
Subject: [PATCH 5038/8469] Prefer new string formatting. Re-use variable
 names.

---
 pkg_resources/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f76114727f..607d0eece1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2521,14 +2521,15 @@ def _warn_legacy_version(self):
             return
 
         tmpl = textwrap.dedent("""
-            '%s (%s)' is being parsed as a legacy, non PEP 440,
+            '{project_name} ({version})' is being parsed as a legacy,
+            non PEP 440,
             version. You may find odd behavior and sort order.
             In particular it will be sorted as less than 0.0. It
             is recommend to migrate to PEP 440 compatible
             versions.
             """).strip().replace('\n', ' ')
 
-        warnings.warn(tmpl % (self.project_name, self.version), PEP440Warning)
+        warnings.warn(tmpl.format(**vars(self)), PEP440Warning)
 
     @property
     def version(self):

From 5e00a02ea1f7473c952d4d359891db4f53ac1778 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:48:38 -0400
Subject: [PATCH 5039/8469] Disable warning of LegacyVersion in parsed_version.
 This functionality should be called explicitly at whatever times are
 appropriate for the warning. Fixes #307.

---
 pkg_resources/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 607d0eece1..6aac82961c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2501,7 +2501,6 @@ def key(self):
     def parsed_version(self):
         if not hasattr(self, "_parsed_version"):
             self._parsed_version = parse_version(self.version)
-            self._warn_legacy_version()
 
         return self._parsed_version
 

From 8ae39ab3a0bb12f17d2cabfdc27725b0992ba3c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:53:44 -0400
Subject: [PATCH 5040/8469] Backed out changeset 6e045b2724d0 and 56d7ea3d42b2.
 Ref #307.

---
 pkg_resources/__init__.py             |  4 ++--
 pkg_resources/tests/test_resources.py | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4cdb40dc35..c3686f8897 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2267,8 +2267,8 @@ def yield_lines(strs):
 CBRACKET = re.compile(r"\s*\]").match
 MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
-    r"(?P<name>.*?)"
-    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?$",
+    r"(?P<name>[^-]+)"
+    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?",
     re.VERBOSE | re.IGNORECASE
 ).match
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 92f076a12b..a55478a249 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -207,16 +207,6 @@ def testDistroDependsOptions(self):
         with pytest.raises(pkg_resources.UnknownExtra):
             d.requires(["foo"])
 
-    def test_pkg_name_with_hyphen(self):
-        "Package names with hyphens are supported"
-        name = 'setuptools-markdown-1.0.egg'
-        dist = Distribution.from_filename(name)
-        assert dist.project_name == "setuptools-markdown"
-        assert dist.key == "setuptools-markdown"
-        assert dist.version == "1.0"
-        assert dist.py_version is None
-        assert dist.platform is None
-
 
 class TestWorkingSet:
     def test_find_conflicting(self):

From 01bb6e0e9217255cd835cefb8162463dac5d8e6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:58:37 -0400
Subject: [PATCH 5041/8469] Correct regex usage

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 963b4b412a..95eb1cf3c2 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -140,7 +140,7 @@ def interpret_distro_name(
     parts = basename.split('-')
     if not py_version:
         for i,p in enumerate(parts[2:]):
-            if p.match('py\d\.\d'):
+            if re.match('py\d\.\d$', p):
                 # It's a bdist_dumb, not an sdist -- bail out
                 return
 

From 94a92f47c4b323c3897a83dae6b91f524f0e2c25 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 16:02:05 -0400
Subject: [PATCH 5042/8469] Update changelog

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa161fc617..018407fae3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+------
+14.3.1
+------
+
+* Issue #307: Removed PEP-440 warning during parsing of versions
+  in ``pkg_resources.Distribution``.
+* Issue #364: Replace deprecated usage with recommended usage of
+  ``EntryPoint.load``.
+
 ----
 14.3
 ----

From fcb4bf6759c8fa674d749f2129f833195cd50431 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 16:08:27 -0400
Subject: [PATCH 5043/8469] Bumped to 14.3.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c8549761be..0dab29fcee 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.4"
+DEFAULT_VERSION = "14.3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 5b9a2bc63f..5fed68f1b5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.4'
+__version__ = '14.3.1'

From 6feb154a786c35872a90269990999fe140bc71a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 16:08:30 -0400
Subject: [PATCH 5044/8469] Added tag 14.3.1 for changeset 608948cef7e0

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ff5c6433f0..07885aa304 100644
--- a/.hgtags
+++ b/.hgtags
@@ -204,3 +204,4 @@ a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
 07fcc3226782b979cedaaf456c7f1c5b2fdafd2c 14.1.1
 d714fb731de779a1337d2d78cd413931f1f06193 14.2
 e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
+608948cef7e0ab8951691b149f5b6f0184a5635e 14.3.1

From f0b26583b2abdfba057dc199d31701497ad894c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 16:09:13 -0400
Subject: [PATCH 5045/8469] Bumped to 14.3.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 0dab29fcee..683aeef4fe 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.3.1"
+DEFAULT_VERSION = "14.3.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 5fed68f1b5..a2f34e924b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.3.1'
+__version__ = '14.3.2'

From e1f0b4019be6efa9c20f0f0dae13009f071ff2a0 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Tue, 24 Mar 2015 08:20:42 -0700
Subject: [PATCH 5046/8469] DistributionNotFound: Move message template to
 class

--HG--
branch : DistributionNotFound_list_requirers
---
 pkg_resources/__init__.py          | 34 ++++++++++++++++++++++--------
 setuptools/command/easy_install.py |  4 +---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4e820c0973..6f1ab9b7df 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -368,6 +368,30 @@ def required_by(self):
 class DistributionNotFound(ResolutionError):
     """A requested distribution was not found"""
 
+    _template = ("The '{self.req}' distribution was not found "
+                 "and is required by {self.requirers_str}")
+
+    @property
+    def req(self):
+        return self.args[0]
+
+    @property
+    def requirers(self):
+        return self.args[1]
+
+    @property
+    def requirers_str(self):
+        if not self.requirers:
+            return 'the application'
+        return ', '.join(self.requirers)
+
+    def report(self):
+        return self._template.format(**locals())
+
+    def __str__(self):
+        return self.report()
+
+
 class UnknownExtra(ResolutionError):
     """Distribution doesn't have an "extra feature" of the given name"""
 _provider_factories = {}
@@ -799,15 +823,7 @@ def resolve(self, requirements, env=None, installer=None,
                     dist = best[req.key] = env.best_match(req, ws, installer)
                     if dist is None:
                         requirers = required_by.get(req, None)
-                        if requirers:
-                            requirers_str = ', '.join(requirers)
-                        else:
-                            requirers_str = 'this application'
-                        msg = ("The '%s' distribution was not found "
-                               "and is required by %s."
-                               % (req, requirers_str))
-                        warnings.warn(msg)
-                        raise DistributionNotFound(msg)
+                        raise DistributionNotFound(req, requirers)
                 to_activate.append(dist)
             if dist not in req:
                 # Oops, the "best" so far conflicts with a dependency
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 276b6f99ba..f2bfa68d17 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -709,9 +709,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
                 [requirement], self.local_index, self.easy_install
             )
         except DistributionNotFound as e:
-            raise DistutilsError(
-                "Could not find required distribution %s" % e.args
-            )
+            raise DistutilsError(str(e))
         except VersionConflict as e:
             raise DistutilsError(e.report())
         if self.always_copy or self.always_copy_from:

From 34e0ed958b2a56ceb394e15f189ea9f932af0785 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Mar 2015 11:05:47 -0400
Subject: [PATCH 5047/8469] Update changelog

---
 CHANGES.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 018407fae3..61fd91df84 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,20 @@
 CHANGES
 =======
 
+----
+15.0
+----
+
+* Pull Request #126: DistributionNotFound message now lists the package or
+  packages that required it. E.g.::
+
+      pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution was not found and is required by smlib.log.
+
+  Note that zc.buildout once dependended on the string rendering of this
+  message to determine the package that was not found. This expectation
+  has since been changed, but older versions of buildout may experience
+  problems.
+
 ------
 14.3.1
 ------

From 9a33ea35df1a77e721ebeb1700acaa74ca28a430 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Mar 2015 11:07:10 -0400
Subject: [PATCH 5048/8469] Bumped to 15.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 683aeef4fe..a3e69dc102 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "14.3.2"
+DEFAULT_VERSION = "15.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index a2f34e924b..60d8514e11 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.3.2'
+__version__ = '15.0'

From 8cff8857708d580441192c02af9dab910ba11ebb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Mar 2015 11:07:31 -0400
Subject: [PATCH 5049/8469] Added tag 15.0b1 for changeset 617699fd3e44

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 07885aa304..778682e1a9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -205,3 +205,4 @@ a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
 d714fb731de779a1337d2d78cd413931f1f06193 14.2
 e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
 608948cef7e0ab8951691b149f5b6f0184a5635e 14.3.1
+617699fd3e44e54b6f95b80bfcf78164df37f266 15.0b1

From 95fd4bbb5ba5ce152673dcc1b03b370cea0fab89 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 29 Mar 2015 15:34:26 -0700
Subject: [PATCH 5050/8469] Release bump for Python 3.5.0a3.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 451c5fbebc..6b4287094b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.5.0a2"
+__version__ = "3.5.0a3"
 #--end constants--

From 933e26cd75231ba6402c38e4044e001a5d47fa3f Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 30 Mar 2015 03:40:43 +0200
Subject: [PATCH 5051/8469] Fix some typos.

---
 pkg_resources/__init__.py                     | 4 ++--
 pkg_resources/_vendor/packaging/specifiers.py | 2 +-
 setuptools/command/easy_install.py            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a8a1694288..f033c10ef1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2528,7 +2528,7 @@ def _warn_legacy_version(self):
         if not is_legacy:
             return
 
-        # While an empty version is techincally a legacy version and
+        # While an empty version is technically a legacy version and
         # is not a valid PEP 440 version, it's also unlikely to
         # actually come from someone and instead it is more likely that
         # it comes from setuptools attempting to parse a filename and
@@ -2542,7 +2542,7 @@ def _warn_legacy_version(self):
             non PEP 440,
             version. You may find odd behavior and sort order.
             In particular it will be sorted as less than 0.0. It
-            is recommend to migrate to PEP 440 compatible
+            is recommended to migrate to PEP 440 compatible
             versions.
             """).strip().replace('\n', ' ')
 
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 9ad0a635ed..77516cf47b 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -502,7 +502,7 @@ def _compare_greater_than(self, prospective, spec):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is techincally greater than, to match.
+        # in the specifier, which is technically greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f2bfa68d17..74803b59d2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -152,7 +152,7 @@ class easy_install(Command):
     create_index = PackageIndex
 
     def initialize_options(self):
-        # the --user option seemst to be an opt-in one,
+        # the --user option seems to be an opt-in one,
         # so the default should be False.
         self.user = 0
         self.zip_ok = self.local_snapshots_ok = None

From 8fe7605a2787648a23c28741e20ba403e95a357b Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Mon, 30 Mar 2015 04:26:56 +0200
Subject: [PATCH 5052/8469] Fix setuptools.sandbox._execfile() with Python 3.1.
 It fixes failure of
 setuptools.tests.test_sandbox.TestSandbox.test_setup_py_with_CRLF() with
 Python 3.1.

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

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 6725512357..31e3eb2d0a 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -34,12 +34,12 @@ def _execfile(filename, globals, locals=None):
     Python 3 implementation of execfile.
     """
     mode = 'rb'
-    # Python 2.6 compile requires LF for newlines, so use deprecated
-    #  Universal newlines support.
-    if sys.version_info < (2, 7):
-        mode += 'U'
     with open(filename, mode) as stream:
         script = stream.read()
+    # compile() function in Python 2.6 and 3.1 requires LF line endings.
+    if sys.version_info[:2] < (2, 7) or sys.version_info[:2] >= (3, 0) and sys.version_info[:2] < (3, 2):
+        script = script.replace(b'\r\n', b'\n')
+        script = script.replace(b'\r', b'\n')
     if locals is None:
         locals = globals
     code = compile(script, filename, 'exec')

From dface890cfe4a198b9271a5800e9d494f79e85b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Apr 2015 18:25:40 -0400
Subject: [PATCH 5053/8469] Update changelog.

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 61fd91df84..9670846f36 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,7 +14,7 @@ CHANGES
   Note that zc.buildout once dependended on the string rendering of this
   message to determine the package that was not found. This expectation
   has since been changed, but older versions of buildout may experience
-  problems.
+  problems. See Buildout #242 for details.
 
 ------
 14.3.1

From 9e41a767df241615b024236f579bb62673f9f4a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Apr 2015 18:26:05 -0400
Subject: [PATCH 5054/8469] Added tag 15.0 for changeset d2c4d8486715

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 778682e1a9..acdb85deea 100644
--- a/.hgtags
+++ b/.hgtags
@@ -206,3 +206,4 @@ d714fb731de779a1337d2d78cd413931f1f06193 14.2
 e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
 608948cef7e0ab8951691b149f5b6f0184a5635e 14.3.1
 617699fd3e44e54b6f95b80bfcf78164df37f266 15.0b1
+d2c4d84867154243993876d6248aafec1fd12679 15.0

From 56e49ec7d8b1c9fd7f2c36d041a87bb756baa2a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Apr 2015 18:26:41 -0400
Subject: [PATCH 5055/8469] Bumped to 15.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a3e69dc102..36ea3c2405 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "15.0"
+DEFAULT_VERSION = "15.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 60d8514e11..1b29a7b435 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '15.0'
+__version__ = '15.1'

From 1dd10a4945fc57b6a9e52d09b634c778fce44852 Mon Sep 17 00:00:00 2001
From: Tom Bechtold <thomasbechtold@jpberlin.de>
Date: Sun, 5 Apr 2015 06:35:14 +0000
Subject: [PATCH 5056/8469] Created new branch fix-type-error-skip-reason

--HG--
branch : fix-type-error-skip-reason

From 82d003629ef23fd7f0dc2fb71d5edc937271ffd8 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Sun, 5 Apr 2015 08:39:18 +0200
Subject: [PATCH 5057/8469] Fix TypeError for pytest.skip()

pytests skip() method doesn't have a 'reason' parameter.
This fixes:

  TypeError: skip() got an unexpected keyword argument 'reason'

--HG--
branch : fix-type-error-skip-reason
---
 setuptools/tests/test_integration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 90bb43136c..07f06db24f 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -28,7 +28,7 @@ def setup_module(module):
     try:
         urlopen('https://pypi.python.org/pypi')
     except Exception as exc:
-        pytest.skip(reason=str(exc))
+        pytest.skip(str(exc))
 
 
 @pytest.fixture

From 7fa0438c7f004f96a81f810fa44e9daddad233f2 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 10 Apr 2015 13:24:41 +0300
Subject: [PATCH 5058/8469] Issue #23865: close() methods in multiple modules
 now are idempotent and more robust at shutdown. If needs to release multiple
 resources, they are released even if errors are occured.

---
 text_file.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/text_file.py b/text_file.py
index 40b8484a68..478336f0d2 100644
--- a/text_file.py
+++ b/text_file.py
@@ -118,10 +118,11 @@ def open(self, filename):
     def close(self):
         """Close the current file and forget everything we know about it
            (filename, current line number)."""
-        self.file.close()
+        file = self.file
         self.file = None
         self.filename = None
         self.current_line = None
+        file.close()
 
     def gen_error(self, msg, line=None):
         outmsg = []

From 6b108b8442eba8295a12655281e1b32b85a94a7b Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Mon, 13 Apr 2015 14:21:02 -0400
Subject: [PATCH 5059/8469] Issue #23731: Implement PEP 488.

The concept of .pyo files no longer exists. Now .pyc files have an
optional `opt-` tag which specifies if any extra optimizations beyond
the peepholer were applied.
---
 command/build_py.py       |  4 ++--
 command/install_lib.py    | 16 ++++++++--------
 tests/test_build_py.py    |  4 ++--
 tests/test_install_lib.py | 13 ++++++-------
 util.py                   |  9 +++++----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index 9100b96a2a..cf0ca57c32 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -314,10 +314,10 @@ def get_outputs(self, include_bytecode=1):
             if include_bytecode:
                 if self.compile:
                     outputs.append(importlib.util.cache_from_source(
-                        filename, debug_override=True))
+                        filename, optimization=''))
                 if self.optimize > 0:
                     outputs.append(importlib.util.cache_from_source(
-                        filename, debug_override=False))
+                        filename, optimization=self.optimize))
 
         outputs += [
             os.path.join(build_dir, filename)
diff --git a/command/install_lib.py b/command/install_lib.py
index 215813ba97..6154cf0943 100644
--- a/command/install_lib.py
+++ b/command/install_lib.py
@@ -22,15 +22,15 @@ class install_lib(Command):
     # possible scenarios:
     #   1) no compilation at all (--no-compile --no-optimize)
     #   2) compile .pyc only (--compile --no-optimize; default)
-    #   3) compile .pyc and "level 1" .pyo (--compile --optimize)
-    #   4) compile "level 1" .pyo only (--no-compile --optimize)
-    #   5) compile .pyc and "level 2" .pyo (--compile --optimize-more)
-    #   6) compile "level 2" .pyo only (--no-compile --optimize-more)
+    #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+    #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
     #
-    # The UI for this is two option, 'compile' and 'optimize'.
+    # The UI for this is two options, 'compile' and 'optimize'.
     # 'compile' is strictly boolean, and only decides whether to
     # generate .pyc files.  'optimize' is three-way (0, 1, or 2), and
-    # decides both whether to generate .pyo files and what level of
+    # decides both whether to generate .pyc files and what level of
     # optimization to use.
 
     user_options = [
@@ -166,10 +166,10 @@ def _bytecode_filenames(self, py_filenames):
                 continue
             if self.compile:
                 bytecode_files.append(importlib.util.cache_from_source(
-                    py_file, debug_override=True))
+                    py_file, optimization=''))
             if self.optimize > 0:
                 bytecode_files.append(importlib.util.cache_from_source(
-                    py_file, debug_override=False))
+                    py_file, optimization=self.optimize))
 
         return bytecode_files
 
diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index c8f6b89919..18283dc722 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -120,8 +120,8 @@ def test_byte_compile_optimized(self):
         found = os.listdir(cmd.build_lib)
         self.assertEqual(sorted(found), ['__pycache__', 'boiledeggs.py'])
         found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
-        self.assertEqual(sorted(found),
-                         ['boiledeggs.%s.pyo' % sys.implementation.cache_tag])
+        expect = 'boiledeggs.{}.opt-1.pyc'.format(sys.implementation.cache_tag)
+        self.assertEqual(sorted(found), [expect])
 
     def test_dir_in_package_data(self):
         """
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 40dd1a95a6..5378aa8249 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -44,12 +44,11 @@ def test_byte_compile(self):
         f = os.path.join(project_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        pyc_file = importlib.util.cache_from_source('foo.py',
-                                                    debug_override=True)
-        pyo_file = importlib.util.cache_from_source('foo.py',
-                                                    debug_override=False)
+        pyc_file = importlib.util.cache_from_source('foo.py', optimization='')
+        pyc_opt_file = importlib.util.cache_from_source('foo.py',
+                                                    optimization=cmd.optimize)
         self.assertTrue(os.path.exists(pyc_file))
-        self.assertTrue(os.path.exists(pyo_file))
+        self.assertTrue(os.path.exists(pyc_opt_file))
 
     def test_get_outputs(self):
         project_dir, dist = self.create_dist()
@@ -66,8 +65,8 @@ def test_get_outputs(self):
         cmd.distribution.packages = ['spam']
         cmd.distribution.script_name = 'setup.py'
 
-        # get_outputs should return 4 elements: spam/__init__.py, .pyc and
-        # .pyo, foo.import-tag-abiflags.so / foo.pyd
+        # get_outputs should return 4 elements: spam/__init__.py and .pyc,
+        # foo.import-tag-abiflags.so / foo.pyd
         outputs = cmd.get_outputs()
         self.assertEqual(len(outputs), 4, outputs)
 
diff --git a/util.py b/util.py
index 5adcac5a95..e423325de4 100644
--- a/util.py
+++ b/util.py
@@ -322,11 +322,11 @@ def byte_compile (py_files,
                   prefix=None, base_dir=None,
                   verbose=1, dry_run=0,
                   direct=None):
-    """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in a __pycache__ subdirectory.  'py_files' is a list
+    """Byte-compile a collection of Python source files to .pyc
+    files in a __pycache__ subdirectory.  'py_files' is a list
     of files to compile; any files that don't end in ".py" are silently
     skipped.  'optimize' must be one of the following:
-      0 - don't optimize (generate .pyc)
+      0 - don't optimize
       1 - normal optimization (like "python -O")
       2 - extra optimization (like "python -OO")
     If 'force' is true, all files are recompiled regardless of
@@ -438,8 +438,9 @@ def byte_compile (py_files,
             #   cfile - byte-compiled file
             #   dfile - purported source filename (same as 'file' by default)
             if optimize >= 0:
+                opt = '' if optimize == 0 else optimize
                 cfile = importlib.util.cache_from_source(
-                    file, debug_override=not optimize)
+                    file, optimization=opt)
             else:
                 cfile = importlib.util.cache_from_source(file)
             dfile = file

From d8fda18abfeff18dd1b1588fbca707d1b2b14214 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 Apr 2015 08:58:22 -0400
Subject: [PATCH 5060/8469] Bump packaging version to 15.1

---
 CHANGES.txt                                   |  6 +++
 docs/conf.py                                  |  4 ++
 pkg_resources/_vendor/packaging/__about__.py  |  2 +-
 pkg_resources/_vendor/packaging/specifiers.py | 48 ++++++++-----------
 pkg_resources/_vendor/vendored.txt            |  2 +-
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9670846f36..012d859392 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----
+15.1
+----
+
+* Updated Packaging to 15.1 to address Packaging #28.
+
 ----
 15.0
 ----
diff --git a/docs/conf.py b/docs/conf.py
index 248309871d..ba3a35bc31 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -242,6 +242,10 @@
 				pattern=r"Pip #(?P<pip>\d+)",
 				url='{GH}/pypa/pip/issues/{pip}',
 			),
+			dict(
+				pattern=r"Packaging #(?P<packaging>\d+)",
+				url='{GH}/pypa/packaging/issues/{packaging}',
+			),
 		],
 	),
 }
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index 36f1a35c85..d524399519 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "15.0"
+__version__ = "15.1"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 77516cf47b..d5d8a95674 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -502,7 +502,7 @@ def _compare_greater_than(self, prospective, spec):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is technically greater than, to match.
+        # in the specifier, which is techincally greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
@@ -673,10 +673,14 @@ def prereleases(self):
         if self._prereleases is not None:
             return self._prereleases
 
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
         # Otherwise we'll see if any of the given specifiers accept
         # prereleases, if any of them do we'll return True, otherwise False.
-        # Note: The use of any() here means that an empty set of specifiers
-        #       will always return False, this is an explicit design decision.
         return any(s.prereleases for s in self._specs)
 
     @prereleases.setter
@@ -688,27 +692,21 @@ def contains(self, item, prereleases=None):
         if not isinstance(item, (LegacyVersion, Version)):
             item = parse(item)
 
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
         # We can determine if we're going to allow pre-releases by looking to
         # see if any of the underlying items supports them. If none of them do
         # and this item is a pre-release then we do not allow it and we can
         # short circuit that here.
         # Note: This means that 1.0.dev1 would not be contained in something
         #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
-        if (not (self.prereleases or prereleases)) and item.is_prerelease:
+        if not prereleases and item.is_prerelease:
             return False
 
-        # Determine if we're forcing a prerelease or not, we bypass
-        # self.prereleases here and use self._prereleases because we want to
-        # only take into consideration actual *forced* values. The underlying
-        # specifiers will handle the other logic.
-        # The logic here is: If prereleases is anything but None, we'll just
-        #                    go aheand and continue to use that. However if
-        #                    prereleases is None, then we'll use whatever the
-        #                    value of self._prereleases is as long as it is not
-        #                    None itself.
-        if prereleases is None and self._prereleases is not None:
-            prereleases = self._prereleases
-
         # We simply dispatch to the underlying specs here to make sure that the
         # given version is contained within all of them.
         # Note: This use of all() here means that an empty set of specifiers
@@ -719,24 +717,18 @@ def contains(self, item, prereleases=None):
         )
 
     def filter(self, iterable, prereleases=None):
-        # Determine if we're forcing a prerelease or not, we bypass
-        # self.prereleases here and use self._prereleases because we want to
-        # only take into consideration actual *forced* values. The underlying
-        # specifiers will handle the other logic.
-        # The logic here is: If prereleases is anything but None, we'll just
-        #                    go aheand and continue to use that. However if
-        #                    prereleases is None, then we'll use whatever the
-        #                    value of self._prereleases is as long as it is not
-        #                    None itself.
-        if prereleases is None and self._prereleases is not None:
-            prereleases = self._prereleases
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
 
         # If we have any specifiers, then we want to wrap our iterable in the
         # filter method for each one, this will act as a logical AND amongst
         # each specifier.
         if self._specs:
             for spec in self._specs:
-                iterable = spec.filter(iterable, prereleases=prereleases)
+                iterable = spec.filter(iterable, prereleases=bool(prereleases))
             return iterable
         # If we do not have any specifiers, then we need to have a rough filter
         # which will filter out any pre-releases, unless there are no final
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 75a31670c6..28da422673 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==15.0
+packaging==15.1

From 66ec87700c358bcce3805f6be6da3e7d71519e03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 Apr 2015 09:01:42 -0400
Subject: [PATCH 5061/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 012d859392..50064f6851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 ----
 
 * Updated Packaging to 15.1 to address Packaging #28.
+* Fix ``setuptools.sandbox._execfile()`` with Python 3.1.
 
 ----
 15.0

From 3da4cd143348c46a7fc5469bf3d4b4008201e5c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 Apr 2015 09:16:21 -0400
Subject: [PATCH 5062/8469] Added tag 15.1 for changeset 10fde952613b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index acdb85deea..75e65cd6d6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -207,3 +207,4 @@ e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
 608948cef7e0ab8951691b149f5b6f0184a5635e 14.3.1
 617699fd3e44e54b6f95b80bfcf78164df37f266 15.0b1
 d2c4d84867154243993876d6248aafec1fd12679 15.0
+10fde952613b7a3f650fb1f6b6ed58cbd232fa3c 15.1

From c2cc7435a96775ef4cd018930fdd83b8ba1dd45d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 15 Apr 2015 09:17:24 -0400
Subject: [PATCH 5063/8469] Bumped to 15.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 36ea3c2405..6804679b72 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "15.1"
+DEFAULT_VERSION = "15.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 1b29a7b435..2771d9394e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '15.1'
+__version__ = '15.2'

From 2ce0b4fac1ee4933717f90da0a0f78784194e681 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sun, 19 Apr 2015 13:51:40 -0700
Subject: [PATCH 5064/8469] Version number bump for Python 3.5.0a4.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6b4287094b..37bfd5a8f7 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.5.0a3"
+__version__ = "3.5.0a4"
 #--end constants--

From 2039b2aeba48685275bd2b341bf69d3f3f63786b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Tue, 21 Apr 2015 22:24:09 +0300
Subject: [PATCH 5065/8469] Check for Jython using sys.platform, not os.name

---
 setuptools/sandbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 31e3eb2d0a..213cebff25 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -10,7 +10,7 @@
 
 import pkg_resources
 
-if os.name == "java":
+if sys.platform.startswith('java'):
     import org.python.modules.posix.PosixModule as _os
 else:
     _os = sys.modules[os.name]

From 0e2d03c65eee67b2357069bd0de3eda453d8a319 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 10:14:37 -0400
Subject: [PATCH 5066/8469] Extract function for initializing the master
 working set. Fixes #373.

---
 pkg_resources/__init__.py | 48 +++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f033c10ef1..0721baa883 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3053,20 +3053,34 @@ def _initialize(g):
             g[name] = getattr(_manager, name)
 _initialize(globals())
 
-# Prepare the master working set and make the ``require()`` API available
-working_set = WorkingSet._build_master()
-_declare_state('object', working_set=working_set)
-
-require = working_set.require
-iter_entry_points = working_set.iter_entry_points
-add_activation_listener = working_set.subscribe
-run_script = working_set.run_script
-# backward compatibility
-run_main = run_script
-# Activate all distributions already on sys.path, and ensure that
-# all distributions added to the working set in the future (e.g. by
-# calling ``require()``) will get activated as well.
-add_activation_listener(lambda dist: dist.activate())
-working_set.entries=[]
-# match order
-list(map(working_set.add_entry, sys.path))
+
+def _initialize_master_working_set():
+    """
+    Prepare the master working set and make the ``require()``
+    API available.
+
+    This function has explicit effects on the global state
+    of pkg_resources. It is intended to be invoked once at
+    the initialization of this module.
+
+    Invocation by other packages is unsupported and done
+    at their own risk.
+    """
+    working_set = WorkingSet._build_master()
+    _declare_state('object', working_set=working_set)
+
+    require = working_set.require
+    iter_entry_points = working_set.iter_entry_points
+    add_activation_listener = working_set.subscribe
+    run_script = working_set.run_script
+    # backward compatibility
+    run_main = run_script
+    # Activate all distributions already on sys.path, and ensure that
+    # all distributions added to the working set in the future (e.g. by
+    # calling ``require()``) will get activated as well.
+    add_activation_listener(lambda dist: dist.activate())
+    working_set.entries=[]
+    # match order
+    list(map(working_set.add_entry, sys.path))
+    globals().update(locals())
+_initialize_master_working_set()

From a78cfe13a10e176f867d8a7b20f70ccfbbaa0d8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 10:44:13 -0400
Subject: [PATCH 5067/8469] Declare variables for nicer linting.

---
 pkg_resources/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0721baa883..17dcbe991a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -89,6 +89,12 @@
     import packaging.specifiers
 
 
+# declare some globals that will be defined later to
+# satisfy the linters.
+require = None
+working_set = None
+
+
 class PEP440Warning(RuntimeWarning):
     """
     Used when there is an issue with a version or specifier not complying with

From bb239c08fbfcb689ef743786c70f655d8a3f9035 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 10:46:47 -0400
Subject: [PATCH 5068/8469] Use _call_aside to signal early that the function
 is called immediately.

---
 pkg_resources/__init__.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 17dcbe991a..f2b13d9967 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3051,15 +3051,23 @@ def _mkstemp(*args,**kw):
 warnings.filterwarnings("ignore", category=PEP440Warning, append=True)
 
 
-# Set up global resource manager (deliberately not state-saved)
-_manager = ResourceManager()
+# from jaraco.functools 1.3
+def _call_aside(f, *args, **kwargs):
+    f(*args, **kwargs)
+    return f
+
+
+@functools.partial(_call_aside, globals())
 def _initialize(g):
-    for name in dir(_manager):
+    "Set up global resource manager (deliberately not state-saved)"
+    manager = ResourceManager()
+    g['_manager'] = manager
+    for name in dir(manager):
         if not name.startswith('_'):
-            g[name] = getattr(_manager, name)
-_initialize(globals())
+            g[name] = getattr(manager, name)
 
 
+@_call_aside
 def _initialize_master_working_set():
     """
     Prepare the master working set and make the ``require()``
@@ -3089,4 +3097,3 @@ def _initialize_master_working_set():
     # match order
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
-_initialize_master_working_set()

From ba2699fae236a351cc4d3acf7a7a7d50bb614722 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 10:50:53 -0400
Subject: [PATCH 5069/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 50064f6851..d10e218809 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+15.2
+----
+
+* Issue #373: Provisionally expose
+  ``pkg_resources._initialize_master_working_set``, allowing for
+  imperative re-initialization of the master working set.
+
 ----
 15.1
 ----

From f0f8bf5b6deedb85e7b4b120e30c6d90891c9baf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 10:58:40 -0400
Subject: [PATCH 5070/8469] Partial appears to behave differently on Python
 2.6. Also, this syntax is more congruent and easier to read.

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f2b13d9967..412e64c405 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3057,8 +3057,8 @@ def _call_aside(f, *args, **kwargs):
     return f
 
 
-@functools.partial(_call_aside, globals())
-def _initialize(g):
+@_call_aside
+def _initialize(g=globals()):
     "Set up global resource manager (deliberately not state-saved)"
     manager = ResourceManager()
     g['_manager'] = manager

From 11117b86c94d37c4cdc8607fa8aa125b51b9e9de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 11:02:09 -0400
Subject: [PATCH 5071/8469] Added tag 15.2 for changeset df5dc9c7aa75

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 75e65cd6d6..88e9fa67fa 100644
--- a/.hgtags
+++ b/.hgtags
@@ -208,3 +208,4 @@ e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
 617699fd3e44e54b6f95b80bfcf78164df37f266 15.0b1
 d2c4d84867154243993876d6248aafec1fd12679 15.0
 10fde952613b7a3f650fb1f6b6ed58cbd232fa3c 15.1
+df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2

From 42c62a7a344e2139f285c571930d179866167bd5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 11:02:44 -0400
Subject: [PATCH 5072/8469] Bumped to 15.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6804679b72..89970943af 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "15.2"
+DEFAULT_VERSION = "15.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 2771d9394e..f0d1b4d4b0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '15.2'
+__version__ = '15.3'

From 498414b82737a860bb94d787dd426a430ef9de1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 15:11:58 -0400
Subject: [PATCH 5073/8469] Remove use of deprecated imp module, avoiding
 deprecation warnings.

---
 pkg_resources/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 412e64c405..51c2bb008a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -21,7 +21,8 @@
 import io
 import time
 import re
-import imp
+import _imp
+import types
 import zipfile
 import zipimport
 import warnings
@@ -2163,7 +2164,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = imp.new_module(packageName)
+        module = sys.modules[packageName] = types.ModuleType(packageName)
         module.__path__ = []
         _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
@@ -2182,7 +2183,7 @@ def _handle_ns(packageName, path_item):
 def declare_namespace(packageName):
     """Declare that package 'packageName' is a namespace package"""
 
-    imp.acquire_lock()
+    _imp.acquire_lock()
     try:
         if packageName in _namespace_packages:
             return
@@ -2209,18 +2210,18 @@ def declare_namespace(packageName):
             _handle_ns(packageName, path_item)
 
     finally:
-        imp.release_lock()
+        _imp.release_lock()
 
 def fixup_namespace_packages(path_item, parent=None):
     """Ensure that previously-declared namespace packages include path_item"""
-    imp.acquire_lock()
+    _imp.acquire_lock()
     try:
         for package in _namespace_packages.get(parent,()):
             subpath = _handle_ns(package, path_item)
             if subpath:
                 fixup_namespace_packages(subpath, package)
     finally:
-        imp.release_lock()
+        _imp.release_lock()
 
 def file_ns_handler(importer, path_item, packageName, module):
     """Compute an ns-package subpath for a filesystem or zipfile importer"""

From cbb12f9391afee2012a22bb5a95027b09a5713bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Apr 2015 20:07:23 -0400
Subject: [PATCH 5074/8469] Restore compatibility for Python 3.2 and earlier.

---
 pkg_resources/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 51c2bb008a..79384174d7 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -21,7 +21,6 @@
 import io
 import time
 import re
-import _imp
 import types
 import zipfile
 import zipimport
@@ -40,6 +39,12 @@
 import textwrap
 from pkgutil import get_importer
 
+try:
+    import _imp
+except ImportError:
+    # Python 3.2 compatibility
+    import imp as _imp
+
 PY3 = sys.version_info > (3,)
 PY2 = not PY3
 

From 33544f0bf806d73495b00b9f8a0e45c25742fbc1 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Fri, 1 May 2015 08:23:57 -0700
Subject: [PATCH 5075/8469] Nicer error when problem in install_requires

Instead of:

    $ python setup.py egg_info
    error in adminweb setup command: 'install_requires' must be a string or list of strings containing valid project/version requirement specifiers

We now have the more helpful:

    $ python setup.py egg_info
    error in adminweb setup command: 'install_requires' must be a string or list of strings containing valid project/version requirement specifiers.
    Error: Expected version spec in smsdk.authsvc>=0.0.8,2.0 at 2.0

It took me longer than it should to find the problem with the old error
message. The new error message would've helped greatly.
---
 setuptools/dist.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ffbc7c4861..220bcf8c68 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -122,11 +122,15 @@ def check_requirements(dist, attr, value):
     """Verify that install_requires is a valid requirements list"""
     try:
         list(pkg_resources.parse_requirements(value))
-    except (TypeError,ValueError):
+    except (TypeError, ValueError) as e:
         raise DistutilsSetupError(
             "%r must be a string or list of strings "
-            "containing valid project/version requirement specifiers" % (attr,)
+            "containing valid project/version requirement specifiers.\n"
+            "Error: %s"
+            % (attr, ' '.join(e.args))
         )
+
+
 def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:

From fb27525a41a3f941aac906564d144d7177d35a79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 11:59:38 -0400
Subject: [PATCH 5076/8469] Let the exception render itself.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 220bcf8c68..892044dd3d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -126,8 +126,8 @@ def check_requirements(dist, attr, value):
         raise DistutilsSetupError(
             "%r must be a string or list of strings "
             "containing valid project/version requirement specifiers.\n"
-            "Error: %s"
-            % (attr, ' '.join(e.args))
+            "%s"
+            % (attr, e)
         )
 
 

From cd79379c95051b94a7facf56ac09c99f7cd31da0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 12:27:10 -0400
Subject: [PATCH 5077/8469] Replace ValueErrors containing implicit contract
 about the structure of the message with a RequirementParseError explicitly
 joining arguments for the string representation.

---
 pkg_resources/__init__.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 79384174d7..4ed713295f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -21,7 +21,7 @@
 import io
 import time
 import re
-import types
+import imp
 import zipfile
 import zipimport
 import warnings
@@ -39,12 +39,6 @@
 import textwrap
 from pkgutil import get_importer
 
-try:
-    import _imp
-except ImportError:
-    # Python 3.2 compatibility
-    import imp as _imp
-
 PY3 = sys.version_info > (3,)
 PY2 = not PY3
 
@@ -2169,7 +2163,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = types.ModuleType(packageName)
+        module = sys.modules[packageName] = imp.new_module(packageName)
         module.__path__ = []
         _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
@@ -2188,7 +2182,7 @@ def _handle_ns(packageName, path_item):
 def declare_namespace(packageName):
     """Declare that package 'packageName' is a namespace package"""
 
-    _imp.acquire_lock()
+    imp.acquire_lock()
     try:
         if packageName in _namespace_packages:
             return
@@ -2215,18 +2209,18 @@ def declare_namespace(packageName):
             _handle_ns(packageName, path_item)
 
     finally:
-        _imp.release_lock()
+        imp.release_lock()
 
 def fixup_namespace_packages(path_item, parent=None):
     """Ensure that previously-declared namespace packages include path_item"""
-    _imp.acquire_lock()
+    imp.acquire_lock()
     try:
         for package in _namespace_packages.get(parent,()):
             subpath = _handle_ns(package, path_item)
             if subpath:
                 fixup_namespace_packages(subpath, package)
     finally:
-        _imp.release_lock()
+        imp.release_lock()
 
 def file_ns_handler(importer, path_item, packageName, module):
     """Compute an ns-package subpath for a filesystem or zipfile importer"""
@@ -2859,6 +2853,11 @@ def issue_warning(*args,**kw):
     warnings.warn(stacklevel=level + 1, *args, **kw)
 
 
+class RequirementParseError(ValueError):
+    def __str__(self):
+        return ' '.join(self.args)
+
+
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
@@ -2877,14 +2876,14 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
                     line = next(lines)
                     p = 0
                 except StopIteration:
-                    raise ValueError(
+                    raise RequirementParseError(
                         "\\ must not appear on the last nonblank line"
                     )
 
             match = ITEM(line, p)
             if not match:
                 msg = "Expected " + item_name + " in"
-                raise ValueError(msg, line, "at", line[p:])
+                raise RequirementParseError(msg, line, "at", line[p:])
 
             items.append(match.group(*groups))
             p = match.end()
@@ -2895,7 +2894,7 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
                 p = match.end()
             elif not TERMINATOR(line, p):
                 msg = "Expected ',' or end-of-list in"
-                raise ValueError(msg, line, "at", line[p:])
+                raise RequirementParseError(msg, line, "at", line[p:])
 
         match = TERMINATOR(line, p)
         # skip the terminator, if any
@@ -2906,7 +2905,7 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
     for line in lines:
         match = DISTRO(line)
         if not match:
-            raise ValueError("Missing distribution spec", line)
+            raise RequirementParseError("Missing distribution spec", line)
         project_name = match.group(1)
         p = match.end()
         extras = []

From 95a68afdf62f63e044f600ab87a4410db6bdf128 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 12:34:02 -0400
Subject: [PATCH 5078/8469] Render the error message as a single line without a
 period (for consistency with other usage).

---
 setuptools/dist.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 892044dd3d..05669366f9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -123,13 +123,11 @@ def check_requirements(dist, attr, value):
     try:
         list(pkg_resources.parse_requirements(value))
     except (TypeError, ValueError) as e:
-        raise DistutilsSetupError(
+        tmpl = (
             "%r must be a string or list of strings "
-            "containing valid project/version requirement specifiers.\n"
-            "%s"
-            % (attr, e)
+            "containing valid project/version requirement specifiers; %s"
         )
-
+        raise DistutilsSetupError(tmpl % (attr, e))
 
 def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""

From e55483f33a61c302461ed480a3556d746b8aba40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 12:35:19 -0400
Subject: [PATCH 5079/8469] Extract variable for clarity.

---
 pkg_resources/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4ed713295f..779bd36723 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2876,9 +2876,8 @@ def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
                     line = next(lines)
                     p = 0
                 except StopIteration:
-                    raise RequirementParseError(
-                        "\\ must not appear on the last nonblank line"
-                    )
+                    msg = "\\ must not appear on the last nonblank line"
+                    raise RequirementParseError(msg)
 
             match = ITEM(line, p)
             if not match:

From 0cc8362038f6feb3ede00ee9ce8ba8c7d04940d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 12:39:16 -0400
Subject: [PATCH 5080/8469] Use new string formatting

---
 setuptools/dist.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 05669366f9..d7ad46552a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -115,19 +115,20 @@ def check_extras(dist, attr, value):
 def assert_bool(dist, attr, value):
     """Verify that value is True, False, 0, or 1"""
     if bool(value) != value:
-        raise DistutilsSetupError(
-            "%r must be a boolean value (got %r)" % (attr,value)
-        )
+        tmpl = "{attr!r} must be a boolean value (got {value!r})"
+        raise DistutilsSetupError(tmpl.format(attr=attr, value=value))
+
+
 def check_requirements(dist, attr, value):
     """Verify that install_requires is a valid requirements list"""
     try:
         list(pkg_resources.parse_requirements(value))
-    except (TypeError, ValueError) as e:
+    except (TypeError, ValueError) as error:
         tmpl = (
-            "%r must be a string or list of strings "
-            "containing valid project/version requirement specifiers; %s"
+            "{attr!r} must be a string or list of strings "
+            "containing valid project/version requirement specifiers; {error}"
         )
-        raise DistutilsSetupError(tmpl % (attr, e))
+        raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
 
 def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""

From 0e086ac6e1b12a1db040e1852ca524c625bc53fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2015 12:56:24 -0400
Subject: [PATCH 5081/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d10e218809..089077b44e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+15.3
+----
+
+* Pull Request #130: Better error messages for errors in
+  parsed requirements.
+
 ----
 15.2
 ----

From 8b78e4b3bb977323247073fa99de62fdf8571630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Sat, 16 May 2015 15:56:43 +0300
Subject: [PATCH 5082/8469] Don't install tests in site-packages

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 234a78853d..afaf9f6145 100755
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ def _gen_console_scripts():
     keywords="CPAN PyPI distutils eggs package management",
     url="https://bitbucket.org/pypa/setuptools",
     src_root=src_root,
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
 
     py_modules=['easy_install'],

From 766d1fbd091c92d68c85eae404aee1d792c815aa Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 16 May 2015 22:13:27 +0300
Subject: [PATCH 5083/8469] Issue #16314: Added support for the LZMA
 compression in distutils.

---
 archive_util.py            |  21 ++---
 command/bdist.py           |   3 +-
 command/bdist_dumb.py      |   3 +-
 tests/test_archive_util.py | 154 +++++++++++++++++++++++++------------
 tests/test_bdist.py        |   2 +-
 5 files changed, 121 insertions(+), 62 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 4470bb0222..bed1384900 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -57,26 +57,28 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
     """Create a (possibly compressed) tar file from all the files under
     'base_dir'.
 
-    'compress' must be "gzip" (the default), "compress", "bzip2", or None.
-    (compress will be deprecated in Python 3.2)
+    'compress' must be "gzip" (the default), "bzip2", "xz", "compress", or
+    None.  ("compress" will be deprecated in Python 3.2)
 
     'owner' and 'group' can be used to define an owner and a group for the
     archive that is being built. If not provided, the current owner and group
     will be used.
 
     The output tar file will be named 'base_dir' +  ".tar", possibly plus
-    the appropriate compression extension (".gz", ".bz2" or ".Z").
+    the appropriate compression extension (".gz", ".bz2", ".xz" or ".Z").
 
     Returns the output filename.
     """
-    tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', None: '', 'compress': ''}
-    compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'compress': '.Z'}
+    tar_compression = {'gzip': 'gz', 'bzip2': 'bz2', 'xz': 'xz', None: '',
+                       'compress': ''}
+    compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'xz': '.xz',
+                    'compress': '.Z'}
 
     # flags for compression program, each element of list will be an argument
     if compress is not None and compress not in compress_ext.keys():
         raise ValueError(
-              "bad value for 'compress': must be None, 'gzip', 'bzip2' "
-              "or 'compress'")
+              "bad value for 'compress': must be None, 'gzip', 'bzip2', "
+              "'xz' or 'compress'")
 
     archive_name = base_name + '.tar'
     if compress != 'compress':
@@ -177,6 +179,7 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
 ARCHIVE_FORMATS = {
     'gztar': (make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),
     'bztar': (make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),
+    'xztar': (make_tarball, [('compress', 'xz')], "xz'ed tar-file"),
     'ztar':  (make_tarball, [('compress', 'compress')], "compressed tar file"),
     'tar':   (make_tarball, [('compress', None)], "uncompressed tar file"),
     'zip':   (make_zipfile, [],"ZIP file")
@@ -197,8 +200,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     """Create an archive file (eg. zip or tar).
 
     'base_name' is the name of the file to create, minus any format-specific
-    extension; 'format' is the archive format: one of "zip", "tar", "ztar",
-    or "gztar".
+    extension; 'format' is the archive format: one of "zip", "tar", "gztar",
+    "bztar", "xztar", or "ztar".
 
     'root_dir' is a directory that will be the root directory of the
     archive; ie. we typically chdir into 'root_dir' before creating the
diff --git a/command/bdist.py b/command/bdist.py
index 6814a1c382..014871d280 100644
--- a/command/bdist.py
+++ b/command/bdist.py
@@ -61,13 +61,14 @@ class bdist(Command):
                       'nt': 'zip'}
 
     # Establish the preferred order (for the --help-formats option).
-    format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
+    format_commands = ['rpm', 'gztar', 'bztar', 'xztar', 'ztar', 'tar',
                        'wininst', 'zip', 'msi']
 
     # And the real information.
     format_command = {'rpm':   ('bdist_rpm',  "RPM distribution"),
                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
                       'bztar': ('bdist_dumb', "bzip2'ed tar file"),
+                      'xztar': ('bdist_dumb', "xz'ed tar file"),
                       'ztar':  ('bdist_dumb', "compressed tar file"),
                       'tar':   ('bdist_dumb', "tar file"),
                       'wininst': ('bdist_wininst',
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index 4405d12c05..f1bfb24923 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -22,7 +22,8 @@ class bdist_dumb(Command):
                      "platform name to embed in generated filenames "
                      "(default: %s)" % get_platform()),
                     ('format=', 'f',
-                     "archive format to create (tar, ztar, gztar, zip)"),
+                     "archive format to create (tar, gztar, bztar, xztar, "
+                     "ztar, zip)"),
                     ('keep-temp', 'k',
                      "keep the pseudo-installation tree around after " +
                      "creating the distribution archive"),
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 2d72af4aa6..81d4c74a7b 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -13,7 +13,7 @@
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings, run_unittest, patch
+from test.support import check_warnings, run_unittest, patch, change_cwd
 
 try:
     import grp
@@ -34,6 +34,16 @@
 except ImportError:
     ZLIB_SUPPORT = False
 
+try:
+    import bz2
+except ImportError:
+    bz2 = None
+
+try:
+    import lzma
+except ImportError:
+    lzma = None
+
 def can_fs_encode(filename):
     """
     Return True if the filename can be saved in the file system.
@@ -52,19 +62,36 @@ class ArchiveUtilTestCase(support.TempdirManager,
                           unittest.TestCase):
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
-    def test_make_tarball(self):
-        self._make_tarball('archive')
+    def test_make_tarball(self, name='archive'):
+        # creating something to tar
+        tmpdir = self._create_files()
+        self._make_tarball(tmpdir, name, '.tar.gz')
+        # trying an uncompressed one
+        self._make_tarball(tmpdir, name, '.tar', compress=None)
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    def test_make_tarball_gzip(self):
+        tmpdir = self._create_files()
+        self._make_tarball(tmpdir, 'archive', '.tar.gz', compress='gzip')
+
+    @unittest.skipUnless(bz2, 'Need bz2 support to run')
+    def test_make_tarball_bzip2(self):
+        tmpdir = self._create_files()
+        self._make_tarball(tmpdir, 'archive', '.tar.bz2', compress='bzip2')
+
+    @unittest.skipUnless(lzma, 'Need lzma support to run')
+    def test_make_tarball_xz(self):
+        tmpdir = self._create_files()
+        self._make_tarball(tmpdir, 'archive', '.tar.xz', compress='xz')
+
     @unittest.skipUnless(can_fs_encode('Ã¥rchiv'),
         'File system cannot handle this filename')
     def test_make_tarball_latin1(self):
         """
         Mirror test_make_tarball, except filename contains latin characters.
         """
-        self._make_tarball('Ã¥rchiv') # note this isn't a real word
+        self.test_make_tarball('Ã¥rchiv') # note this isn't a real word
 
-    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     @unittest.skipUnless(can_fs_encode('�アーカイブ'),
         'File system cannot handle this filename')
     def test_make_tarball_extended(self):
@@ -72,16 +99,9 @@ def test_make_tarball_extended(self):
         Mirror test_make_tarball, except filename contains extended
         characters outside the latin charset.
         """
-        self._make_tarball('�アーカイブ') # japanese for archive
-
-    def _make_tarball(self, target_name):
-        # creating something to tar
-        tmpdir = self.mkdtemp()
-        self.write_file([tmpdir, 'file1'], 'xxx')
-        self.write_file([tmpdir, 'file2'], 'xxx')
-        os.mkdir(os.path.join(tmpdir, 'sub'))
-        self.write_file([tmpdir, 'sub', 'file3'], 'xxx')
+        self.test_make_tarball('�アーカイブ') # japanese for archive
 
+    def _make_tarball(self, tmpdir, target_name, suffix, **kwargs):
         tmpdir2 = self.mkdtemp()
         unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
                             "source and target should be on same drive")
@@ -89,27 +109,13 @@ def _make_tarball(self, target_name):
         base_name = os.path.join(tmpdir2, target_name)
 
         # working with relative paths to avoid tar warnings
-        old_dir = os.getcwd()
-        os.chdir(tmpdir)
-        try:
-            make_tarball(splitdrive(base_name)[1], '.')
-        finally:
-            os.chdir(old_dir)
+        with change_cwd(tmpdir):
+            make_tarball(splitdrive(base_name)[1], 'dist', **kwargs)
 
         # check if the compressed tarball was created
-        tarball = base_name + '.tar.gz'
-        self.assertTrue(os.path.exists(tarball))
-
-        # trying an uncompressed one
-        base_name = os.path.join(tmpdir2, target_name)
-        old_dir = os.getcwd()
-        os.chdir(tmpdir)
-        try:
-            make_tarball(splitdrive(base_name)[1], '.', compress=None)
-        finally:
-            os.chdir(old_dir)
-        tarball = base_name + '.tar'
+        tarball = base_name + suffix
         self.assertTrue(os.path.exists(tarball))
+        self.assertEqual(self._tarinfo(tarball), self._created_files)
 
     def _tarinfo(self, path):
         tar = tarfile.open(path)
@@ -120,6 +126,9 @@ def _tarinfo(self, path):
         finally:
             tar.close()
 
+    _created_files = ('dist', 'dist/file1', 'dist/file2',
+                      'dist/sub', 'dist/sub/file3', 'dist/sub2')
+
     def _create_files(self):
         # creating something to tar
         tmpdir = self.mkdtemp()
@@ -130,15 +139,15 @@ def _create_files(self):
         os.mkdir(os.path.join(dist, 'sub'))
         self.write_file([dist, 'sub', 'file3'], 'xxx')
         os.mkdir(os.path.join(dist, 'sub2'))
-        tmpdir2 = self.mkdtemp()
-        base_name = os.path.join(tmpdir2, 'archive')
-        return tmpdir, tmpdir2, base_name
+        return tmpdir
 
     @unittest.skipUnless(find_executable('tar') and find_executable('gzip')
                          and ZLIB_SUPPORT,
                          'Need the tar, gzip and zlib command to run')
     def test_tarfile_vs_tar(self):
-        tmpdir, tmpdir2, base_name =  self._create_files()
+        tmpdir =  self._create_files()
+        tmpdir2 = self.mkdtemp()
+        base_name = os.path.join(tmpdir2, 'archive')
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
@@ -164,7 +173,8 @@ def test_tarfile_vs_tar(self):
 
         self.assertTrue(os.path.exists(tarball2))
         # let's compare both tarballs
-        self.assertEqual(self._tarinfo(tarball), self._tarinfo(tarball2))
+        self.assertEqual(self._tarinfo(tarball), self._created_files)
+        self.assertEqual(self._tarinfo(tarball2), self._created_files)
 
         # trying an uncompressed one
         base_name = os.path.join(tmpdir2, 'archive')
@@ -191,7 +201,8 @@ def test_tarfile_vs_tar(self):
     @unittest.skipUnless(find_executable('compress'),
                          'The compress program is required')
     def test_compress_deprecated(self):
-        tmpdir, tmpdir2, base_name =  self._create_files()
+        tmpdir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp(), 'archive')
 
         # using compress and testing the PendingDeprecationWarning
         old_dir = os.getcwd()
@@ -224,17 +235,17 @@ def test_compress_deprecated(self):
                          'Need zip and zlib support to run')
     def test_make_zipfile(self):
         # creating something to tar
-        tmpdir = self.mkdtemp()
-        self.write_file([tmpdir, 'file1'], 'xxx')
-        self.write_file([tmpdir, 'file2'], 'xxx')
-
-        tmpdir2 = self.mkdtemp()
-        base_name = os.path.join(tmpdir2, 'archive')
-        make_zipfile(base_name, tmpdir)
+        tmpdir = self._create_files()
+        base_name = os.path.join(self.mkdtemp(), 'archive')
+        with change_cwd(tmpdir):
+            make_zipfile(base_name, 'dist')
 
         # check if the compressed tarball was created
         tarball = base_name + '.zip'
         self.assertTrue(os.path.exists(tarball))
+        with zipfile.ZipFile(tarball) as zf:
+            self.assertEqual(sorted(zf.namelist()),
+                             ['dist/file1', 'dist/file2', 'dist/sub/file3'])
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile_no_zlib(self):
@@ -250,18 +261,24 @@ def fake_zipfile(*a, **kw):
         patch(self, archive_util.zipfile, 'ZipFile', fake_zipfile)
 
         # create something to tar and compress
-        tmpdir, tmpdir2, base_name = self._create_files()
-        make_zipfile(base_name, tmpdir)
+        tmpdir = self._create_files()
+        base_name = os.path.join(self.mkdtemp(), 'archive')
+        with change_cwd(tmpdir):
+            make_zipfile(base_name, 'dist')
 
         tarball = base_name + '.zip'
         self.assertEqual(called,
                          [((tarball, "w"), {'compression': zipfile.ZIP_STORED})])
         self.assertTrue(os.path.exists(tarball))
+        with zipfile.ZipFile(tarball) as zf:
+            self.assertEqual(sorted(zf.namelist()),
+                             ['dist/file1', 'dist/file2', 'dist/sub/file3'])
 
     def test_check_archive_formats(self):
         self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
                          'xxx')
-        self.assertEqual(check_archive_formats(['gztar', 'zip']), None)
+        self.assertIsNone(check_archive_formats(['gztar', 'bztar', 'xztar',
+                                                 'ztar', 'tar', 'zip']))
 
     def test_make_archive(self):
         tmpdir = self.mkdtemp()
@@ -282,6 +299,41 @@ def _breaks(*args, **kw):
         finally:
             del ARCHIVE_FORMATS['xxx']
 
+    def test_make_archive_tar(self):
+        base_dir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'tar', base_dir, 'dist')
+        self.assertTrue(os.path.exists(res))
+        self.assertEqual(os.path.basename(res), 'archive.tar')
+        self.assertEqual(self._tarinfo(res), self._created_files)
+
+    @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
+    def test_make_archive_gztar(self):
+        base_dir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'gztar', base_dir, 'dist')
+        self.assertTrue(os.path.exists(res))
+        self.assertEqual(os.path.basename(res), 'archive.tar.gz')
+        self.assertEqual(self._tarinfo(res), self._created_files)
+
+    @unittest.skipUnless(bz2, 'Need bz2 support to run')
+    def test_make_archive_bztar(self):
+        base_dir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'bztar', base_dir, 'dist')
+        self.assertTrue(os.path.exists(res))
+        self.assertEqual(os.path.basename(res), 'archive.tar.bz2')
+        self.assertEqual(self._tarinfo(res), self._created_files)
+
+    @unittest.skipUnless(bz2, 'Need xz support to run')
+    def test_make_archive_xztar(self):
+        base_dir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp() , 'archive')
+        res = make_archive(base_name, 'xztar', base_dir, 'dist')
+        self.assertTrue(os.path.exists(res))
+        self.assertEqual(os.path.basename(res), 'archive.tar.xz')
+        self.assertEqual(self._tarinfo(res), self._created_files)
+
     def test_make_archive_owner_group(self):
         # testing make_archive with owner and group, with various combinations
         # this works even if there's not gid/uid support
@@ -291,7 +343,8 @@ def test_make_archive_owner_group(self):
         else:
             group = owner = 'root'
 
-        base_dir, root_dir, base_name =  self._create_files()
+        base_dir =  self._create_files()
+        root_dir = self.mkdtemp()
         base_name = os.path.join(self.mkdtemp() , 'archive')
         res = make_archive(base_name, 'zip', root_dir, base_dir, owner=owner,
                            group=group)
@@ -311,7 +364,8 @@ def test_make_archive_owner_group(self):
     @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib")
     @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
     def test_tarfile_root_owner(self):
-        tmpdir, tmpdir2, base_name =  self._create_files()
+        tmpdir =  self._create_files()
+        base_name = os.path.join(self.mkdtemp(), 'archive')
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         group = grp.getgrgid(0)[0]
diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index 503a6e857d..f762f5d987 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -21,7 +21,7 @@ def test_formats(self):
 
         # what formats does bdist offer?
         formats = ['bztar', 'gztar', 'msi', 'rpm', 'tar',
-                   'wininst', 'zip', 'ztar']
+                   'wininst', 'xztar', 'zip', 'ztar']
         found = sorted(cmd.format_command)
         self.assertEqual(found, formats)
 

From a583aac0ebff225a9b138cda7d60047d7f7f462c Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 17 May 2015 02:23:02 +0300
Subject: [PATCH 5084/8469] Fixed issue #16314 test for the case when lzma is
 not available.

---
 tests/test_archive_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 81d4c74a7b..02fa1e27a4 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -325,7 +325,7 @@ def test_make_archive_bztar(self):
         self.assertEqual(os.path.basename(res), 'archive.tar.bz2')
         self.assertEqual(self._tarinfo(res), self._created_files)
 
-    @unittest.skipUnless(bz2, 'Need xz support to run')
+    @unittest.skipUnless(lzma, 'Need xz support to run')
     def test_make_archive_xztar(self):
         base_dir =  self._create_files()
         base_name = os.path.join(self.mkdtemp() , 'archive')

From bdb02cc81b0caee69db336b0093cbc7243a25879 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 May 2015 15:03:59 +0800
Subject: [PATCH 5085/8469] Update changelog

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 089077b44e..6d3466a9d6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,11 +3,13 @@ CHANGES
 =======
 
 ----
-15.3
+16.0
 ----
 
 * Pull Request #130: Better error messages for errors in
   parsed requirements.
+* Pull Request #133: Removed ``setuptools.tests`` from the
+  installed packages.
 
 ----
 15.2

From c7a68c40760615084c2f3cd4db4158cd248af3aa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 May 2015 15:07:22 +0800
Subject: [PATCH 5086/8469] Bumped to 16.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 89970943af..14aef949b3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "15.3"
+DEFAULT_VERSION = "16.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f0d1b4d4b0..fd4afc5ae6 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '15.3'
+__version__ = '16.0'

From d6edbf0cbf36901fea369cafa5c6c3577591eeb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 May 2015 15:08:31 +0800
Subject: [PATCH 5087/8469] Added tag 16.0 for changeset e0825f0c7d59

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 88e9fa67fa..86037d84f0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -209,3 +209,4 @@ e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
 d2c4d84867154243993876d6248aafec1fd12679 15.0
 10fde952613b7a3f650fb1f6b6ed58cbd232fa3c 15.1
 df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2
+e0825f0c7d5963c498266fe3c175220c695ae83b 16.0

From 1f7177fc0f54fac1d76ee8a1c77f93cb2f6f7dc1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 May 2015 15:09:52 +0800
Subject: [PATCH 5088/8469] Bumped to 16.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 14aef949b3..e2b35663f3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "16.0"
+DEFAULT_VERSION = "16.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index fd4afc5ae6..aeccd8e337 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '16.0'
+__version__ = '16.1'

From 37ec45e05a5c9b6dfccbfc97caf466496b727616 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 20 May 2015 16:10:04 +0300
Subject: [PATCH 5089/8469] Issue #24245: Eliminated senseless expect clauses
 that have no any effect. Patch by Martin Panter.

---
 core.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core.py b/core.py
index 2bfe66aa2f..f05b34b295 100644
--- a/core.py
+++ b/core.py
@@ -221,8 +221,6 @@ def run_setup (script_name, script_args=None, stop_after="run"):
         # Hmm, should we do something if exiting with a non-zero code
         # (ie. error)?
         pass
-    except:
-        raise
 
     if _setup_distribution is None:
         raise RuntimeError(("'distutils.core.setup()' was never called -- "

From 6debf8d3d7c4ad63d2aae277fc9b4581c851548e Mon Sep 17 00:00:00 2001
From: James Polley <jamezpolley@gmail.com>
Date: Fri, 22 May 2015 14:54:34 -0700
Subject: [PATCH 5090/8469] Expand the range of valid operators to include
 comparators

---
 pkg_resources/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 779bd36723..b4029c4a74 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1489,6 +1489,10 @@ def get_op(cls, op):
             'in': lambda x, y: x in y,
             '==': operator.eq,
             '!=': operator.ne,
+            '<':  operator.lt,
+            '>':  operator.gt,
+            '<=': operator.le,
+            '>=': operator.ge,
         }
         if hasattr(symbol, 'or_test'):
             ops[symbol.or_test] = cls.test

From d034a5ec7f707499139f90eb846b9e720923124c Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 23 May 2015 09:02:50 -0700
Subject: [PATCH 5091/8469] Issue #23970: Adds distutils._msvccompiler for new
 Visual Studio versions.

---
 _msvccompiler.py           | 561 +++++++++++++++++++++++++++++++++++++
 ccompiler.py               |   2 +-
 command/bdist_wininst.py   |  31 +-
 command/build_ext.py       |  36 +--
 tests/test_msvccompiler.py | 160 +++++++++++
 5 files changed, 752 insertions(+), 38 deletions(-)
 create mode 100644 _msvccompiler.py
 create mode 100644 tests/test_msvccompiler.py

diff --git a/_msvccompiler.py b/_msvccompiler.py
new file mode 100644
index 0000000000..896d9d927f
--- /dev/null
+++ b/_msvccompiler.py
@@ -0,0 +1,561 @@
+"""distutils._msvccompiler
+
+Contains MSVCCompiler, an implementation of the abstract CCompiler class
+for Microsoft Visual Studio 2015.
+
+The module is compatible with VS 2015 and later. You can find legacy support
+for older versions in distutils.msvc9compiler and distutils.msvccompiler.
+"""
+
+# Written by Perry Stoll
+# hacked by Robin Becker and Thomas Heller to do a better job of
+#   finding DevStudio (through the registry)
+# ported to VS 2005 and VS 2008 by Christian Heimes
+# ported to VS 2015 by Steve Dower
+
+import os
+import subprocess
+import re
+
+from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
+                             CompileError, LibError, LinkError
+from distutils.ccompiler import CCompiler, gen_lib_options
+from distutils import log
+from distutils.util import get_platform
+
+import winreg
+from itertools import count
+
+def _find_vcvarsall():
+    with winreg.OpenKeyEx(
+        winreg.HKEY_LOCAL_MACHINE,
+        r"Software\Microsoft\VisualStudio\SxS\VC7",
+        access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+    ) as key:
+        if not key:
+            log.debug("Visual C++ is not registered")
+            return None
+
+        best_version = 0
+        best_dir = None
+        for i in count():
+            try:
+                v, vc_dir, vt = winreg.EnumValue(key, i)
+            except OSError:
+                break
+            if v and vt == winreg.REG_SZ and os.path.isdir(vc_dir):
+                try:
+                    version = int(float(v))
+                except (ValueError, TypeError):
+                    continue
+                if version >= 14 and version > best_version:
+                    best_version, best_dir = version, vc_dir
+        if not best_version:
+            log.debug("No suitable Visual C++ version found")
+            return None
+
+        vcvarsall = os.path.join(best_dir, "vcvarsall.bat")
+        if not os.path.isfile(vcvarsall):
+            log.debug("%s cannot be found", vcvarsall)
+            return None
+
+        return vcvarsall
+
+def _get_vc_env(plat_spec):
+    if os.getenv("DISTUTILS_USE_SDK"):
+        return {
+            key.lower(): value
+            for key, value in os.environ.items()
+        }
+
+    vcvarsall = _find_vcvarsall()
+    if not vcvarsall:
+        raise DistutilsPlatformError("Unable to find vcvarsall.bat")
+
+    try:
+        out = subprocess.check_output(
+            '"{}" {} && set'.format(vcvarsall, plat_spec),
+            shell=True,
+            stderr=subprocess.STDOUT,
+            universal_newlines=True,
+        )
+    except subprocess.CalledProcessError as exc:
+        log.error(exc.output)
+        raise DistutilsPlatformError("Error executing {}"
+                .format(exc.cmd))
+
+    return {
+        key.lower(): value
+        for key, _, value in
+        (line.partition('=') for line in out.splitlines())
+        if key and value
+    }
+
+def _find_exe(exe, paths=None):
+    """Return path to an MSVC executable program.
+
+    Tries to find the program in several places: first, one of the
+    MSVC program search paths from the registry; next, the directories
+    in the PATH environment variable.  If any of those work, return an
+    absolute path that is known to exist.  If none of them work, just
+    return the original program name, 'exe'.
+    """
+    if not paths:
+        paths = os.getenv('path').split(os.pathsep)
+    for p in paths:
+        fn = os.path.join(os.path.abspath(p), exe)
+        if os.path.isfile(fn):
+            return fn
+    return exe
+
+# A map keyed by get_platform() return values to values accepted by
+# 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is
+# the param to cross-compile on x86 targetting amd64.)
+PLAT_TO_VCVARS = {
+    'win32' : 'x86',
+    'win-amd64' : 'amd64',
+}
+
+class MSVCCompiler(CCompiler) :
+    """Concrete class that implements an interface to Microsoft Visual C++,
+       as defined by the CCompiler abstract class."""
+
+    compiler_type = 'msvc'
+
+    # Just set this so CCompiler's constructor doesn't barf.  We currently
+    # don't use the 'set_executables()' bureaucracy provided by CCompiler,
+    # as it really isn't necessary for this sort of single-compiler class.
+    # Would be nice to have a consistent interface with UnixCCompiler,
+    # though, so it's worth thinking about.
+    executables = {}
+
+    # Private class data (need to distinguish C from C++ source for compiler)
+    _c_extensions = ['.c']
+    _cpp_extensions = ['.cc', '.cpp', '.cxx']
+    _rc_extensions = ['.rc']
+    _mc_extensions = ['.mc']
+
+    # Needed for the filename generation methods provided by the
+    # base class, CCompiler.
+    src_extensions = (_c_extensions + _cpp_extensions +
+                      _rc_extensions + _mc_extensions)
+    res_extension = '.res'
+    obj_extension = '.obj'
+    static_lib_extension = '.lib'
+    shared_lib_extension = '.dll'
+    static_lib_format = shared_lib_format = '%s%s'
+    exe_extension = '.exe'
+
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        CCompiler.__init__ (self, verbose, dry_run, force)
+        # target platform (.plat_name is consistent with 'bdist')
+        self.plat_name = None
+        self.initialized = False
+
+    def initialize(self, plat_name=None):
+        # multi-init means we would need to check platform same each time...
+        assert not self.initialized, "don't init multiple times"
+        if plat_name is None:
+            plat_name = get_platform()
+        # sanity check for platforms to prevent obscure errors later.
+        if plat_name not in PLAT_TO_VCVARS:
+            raise DistutilsPlatformError("--plat-name must be one of {}"
+                                         .format(tuple(PLAT_TO_VCVARS)))
+
+        # On x86, 'vcvarsall.bat amd64' creates an env that doesn't work;
+        # to cross compile, you use 'x86_amd64'.
+        # On AMD64, 'vcvarsall.bat amd64' is a native build env; to cross
+        # compile use 'x86' (ie, it runs the x86 compiler directly)
+        if plat_name == get_platform() or plat_name == 'win32':
+            # native build or cross-compile to win32
+            plat_spec = PLAT_TO_VCVARS[plat_name]
+        else:
+            # cross compile from win32 -> some 64bit
+            plat_spec = '{}_{}'.format(
+                PLAT_TO_VCVARS[get_platform()],
+                PLAT_TO_VCVARS[plat_name]
+            )
+
+        vc_env = _get_vc_env(plat_spec)
+        if not vc_env:
+            raise DistutilsPlatformError("Unable to find a compatible "
+                "Visual Studio installation.")
+
+        paths = vc_env.get('path', '').split(os.pathsep)
+        self.cc = _find_exe("cl.exe", paths)
+        self.linker = _find_exe("link.exe", paths)
+        self.lib = _find_exe("lib.exe", paths)
+        self.rc = _find_exe("rc.exe", paths)   # resource compiler
+        self.mc = _find_exe("mc.exe", paths)   # message compiler
+        self.mt = _find_exe("mt.exe", paths)   # message compiler
+
+        for dir in vc_env.get('include', '').split(os.pathsep):
+            if dir:
+                self.add_include_dir(dir)
+
+        for dir in vc_env.get('lib', '').split(os.pathsep):
+            if dir:
+                self.add_library_dir(dir)
+
+        self.preprocess_options = None
+        self.compile_options = [
+            '/nologo', '/Ox', '/MD', '/W3', '/GL', '/DNDEBUG'
+        ]
+        self.compile_options_debug = [
+            '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
+        ]
+
+        self.ldflags_shared = [
+            '/nologo', '/DLL', '/INCREMENTAL:NO'
+        ]
+        self.ldflags_shared_debug = [
+            '/nologo', '/DLL', '/INCREMENTAL:no', '/DEBUG:FULL'
+        ]
+        self.ldflags_static = [
+            '/nologo'
+        ]
+
+        self.initialized = True
+
+    # -- Worker methods ------------------------------------------------
+
+    def object_filenames(self,
+                         source_filenames,
+                         strip_dir=0,
+                         output_dir=''):
+        ext_map = {ext: self.obj_extension for ext in self.src_extensions}
+        ext_map.update((ext, self.res_extension)
+                for ext in self._rc_extensions + self._mc_extensions)
+
+        def make_out_path(p):
+            base, ext = os.path.splitext(p)
+            if strip_dir:
+                base = os.path.basename(base)
+            else:
+                _, base = os.path.splitdrive(base)
+                if base.startswith((os.path.sep, os.path.altsep)):
+                    base = base[1:]
+            try:
+                return base + ext_map[ext]
+            except LookupError:
+                # Better to raise an exception instead of silently continuing
+                # and later complain about sources and targets having
+                # different lengths
+                raise CompileError("Don't know how to compile {}".format(p))
+
+        output_dir = output_dir or ''
+        return [
+            os.path.join(output_dir, make_out_path(src_name))
+            for src_name in source_filenames
+        ]
+
+
+    def compile(self, sources,
+                output_dir=None, macros=None, include_dirs=None, debug=0,
+                extra_preargs=None, extra_postargs=None, depends=None):
+
+        if not self.initialized:
+            self.initialize()
+        compile_info = self._setup_compile(output_dir, macros, include_dirs,
+                                           sources, depends, extra_postargs)
+        macros, objects, extra_postargs, pp_opts, build = compile_info
+
+        compile_opts = extra_preargs or []
+        compile_opts.append('/c')
+        if debug:
+            compile_opts.extend(self.compile_options_debug)
+        else:
+            compile_opts.extend(self.compile_options)
+
+
+        add_cpp_opts = False
+
+        for obj in objects:
+            try:
+                src, ext = build[obj]
+            except KeyError:
+                continue
+            if debug:
+                # pass the full pathname to MSVC in debug mode,
+                # this allows the debugger to find the source file
+                # without asking the user to browse for it
+                src = os.path.abspath(src)
+
+            if ext in self._c_extensions:
+                input_opt = "/Tc" + src
+            elif ext in self._cpp_extensions:
+                input_opt = "/Tp" + src
+                add_cpp_opts = True
+            elif ext in self._rc_extensions:
+                # compile .RC to .RES file
+                input_opt = src
+                output_opt = "/fo" + obj
+                try:
+                    self.spawn([self.rc] + pp_opts + [output_opt, input_opt])
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            elif ext in self._mc_extensions:
+                # Compile .MC to .RC file to .RES file.
+                #   * '-h dir' specifies the directory for the
+                #     generated include file
+                #   * '-r dir' specifies the target directory of the
+                #     generated RC file and the binary message resource
+                #     it includes
+                #
+                # For now (since there are no options to change this),
+                # we use the source-directory for the include file and
+                # the build directory for the RC file and message
+                # resources. This works at least for win32all.
+                h_dir = os.path.dirname(src)
+                rc_dir = os.path.dirname(obj)
+                try:
+                    # first compile .MC to .RC and .H file
+                    self.spawn([self.mc, '-h', h_dir, '-r', rc_dir, src])
+                    base, _ = os.path.splitext(os.path.basename (src))
+                    rc_file = os.path.join(rc_dir, base + '.rc')
+                    # then compile .RC to .RES file
+                    self.spawn([self.rc, "/fo" + obj, rc_file])
+
+                except DistutilsExecError as msg:
+                    raise CompileError(msg)
+                continue
+            else:
+                # how to handle this file?
+                raise CompileError("Don't know how to compile {} to {}"
+                                   .format(src, obj))
+
+            args = [self.cc] + compile_opts + pp_opts
+            if add_cpp_opts:
+                args.append('/EHsc')
+            args.append(input_opt)
+            args.append("/Fo" + obj)
+            args.extend(extra_postargs)
+
+            try:
+                self.spawn(args)
+            except DistutilsExecError as msg:
+                raise CompileError(msg)
+
+        return objects
+
+
+    def create_static_lib(self,
+                          objects,
+                          output_libname,
+                          output_dir=None,
+                          debug=0,
+                          target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        objects, output_dir = self._fix_object_args(objects, output_dir)
+        output_filename = self.library_filename(output_libname,
+                                                output_dir=output_dir)
+
+        if self._need_link(objects, output_filename):
+            lib_args = objects + ['/OUT:' + output_filename]
+            if debug:
+                pass # XXX what goes here?
+            try:
+                self.spawn([self.lib] + lib_args)
+            except DistutilsExecError as msg:
+                raise LibError(msg)
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+
+    def link(self,
+             target_desc,
+             objects,
+             output_filename,
+             output_dir=None,
+             libraries=None,
+             library_dirs=None,
+             runtime_library_dirs=None,
+             export_symbols=None,
+             debug=0,
+             extra_preargs=None,
+             extra_postargs=None,
+             build_temp=None,
+             target_lang=None):
+
+        if not self.initialized:
+            self.initialize()
+        objects, output_dir = self._fix_object_args(objects, output_dir)
+        fixed_args = self._fix_lib_args(libraries, library_dirs,
+                                        runtime_library_dirs)
+        libraries, library_dirs, runtime_library_dirs = fixed_args
+
+        if runtime_library_dirs:
+            self.warn("I don't know what to do with 'runtime_library_dirs': "
+                       + str(runtime_library_dirs))
+
+        lib_opts = gen_lib_options(self,
+                                   library_dirs, runtime_library_dirs,
+                                   libraries)
+        if output_dir is not None:
+            output_filename = os.path.join(output_dir, output_filename)
+
+        if self._need_link(objects, output_filename):
+            ldflags = (self.ldflags_shared_debug if debug
+                       else self.ldflags_shared)
+            if target_desc == CCompiler.EXECUTABLE:
+                ldflags = ldflags[1:]
+
+            export_opts = []
+            for sym in (export_symbols or []):
+                export_opts.append("/EXPORT:" + sym)
+
+            ld_args = (ldflags + lib_opts + export_opts +
+                       objects + ['/OUT:' + output_filename])
+
+            # The MSVC linker generates .lib and .exp files, which cannot be
+            # suppressed by any linker switches. The .lib files may even be
+            # needed! Make sure they are generated in the temporary build
+            # directory. Since they have different names for debug and release
+            # builds, they can go into the same directory.
+            build_temp = os.path.dirname(objects[0])
+            if export_symbols is not None:
+                (dll_name, dll_ext) = os.path.splitext(
+                    os.path.basename(output_filename))
+                implib_file = os.path.join(
+                    build_temp,
+                    self.library_filename(dll_name))
+                ld_args.append ('/IMPLIB:' + implib_file)
+
+            self.manifest_setup_ldargs(output_filename, build_temp, ld_args)
+
+            if extra_preargs:
+                ld_args[:0] = extra_preargs
+            if extra_postargs:
+                ld_args.extend(extra_postargs)
+
+            self.mkpath(os.path.dirname(output_filename))
+            try:
+                self.spawn([self.linker] + ld_args)
+            except DistutilsExecError as msg:
+                raise LinkError(msg)
+
+            # embed the manifest
+            # XXX - this is somewhat fragile - if mt.exe fails, distutils
+            # will still consider the DLL up-to-date, but it will not have a
+            # manifest.  Maybe we should link to a temp file?  OTOH, that
+            # implies a build environment error that shouldn't go undetected.
+            mfinfo = self.manifest_get_embed_info(target_desc, ld_args)
+            if mfinfo is not None:
+                mffilename, mfid = mfinfo
+                out_arg = '-outputresource:{};{}'.format(output_filename, mfid)
+                try:
+                    self.spawn([self.mt, '-nologo', '-manifest',
+                                mffilename, out_arg])
+                except DistutilsExecError as msg:
+                    raise LinkError(msg)
+        else:
+            log.debug("skipping %s (up-to-date)", output_filename)
+
+    def manifest_setup_ldargs(self, output_filename, build_temp, ld_args):
+        # If we need a manifest at all, an embedded manifest is recommended.
+        # See MSDN article titled
+        # "How to: Embed a Manifest Inside a C/C++ Application"
+        # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
+        # Ask the linker to generate the manifest in the temp dir, so
+        # we can check it, and possibly embed it, later.
+        temp_manifest = os.path.join(
+                build_temp,
+                os.path.basename(output_filename) + ".manifest")
+        ld_args.append('/MANIFESTFILE:' + temp_manifest)
+
+    def manifest_get_embed_info(self, target_desc, ld_args):
+        # If a manifest should be embedded, return a tuple of
+        # (manifest_filename, resource_id).  Returns None if no manifest
+        # should be embedded.  See http://bugs.python.org/issue7833 for why
+        # we want to avoid any manifest for extension modules if we can)
+        for arg in ld_args:
+            if arg.startswith("/MANIFESTFILE:"):
+                temp_manifest = arg.split(":", 1)[1]
+                break
+        else:
+            # no /MANIFESTFILE so nothing to do.
+            return None
+        if target_desc == CCompiler.EXECUTABLE:
+            # by default, executables always get the manifest with the
+            # CRT referenced.
+            mfid = 1
+        else:
+            # Extension modules try and avoid any manifest if possible.
+            mfid = 2
+            temp_manifest = self._remove_visual_c_ref(temp_manifest)
+        if temp_manifest is None:
+            return None
+        return temp_manifest, mfid
+
+    def _remove_visual_c_ref(self, manifest_file):
+        try:
+            # Remove references to the Visual C runtime, so they will
+            # fall through to the Visual C dependency of Python.exe.
+            # This way, when installed for a restricted user (e.g.
+            # runtimes are not in WinSxS folder, but in Python's own
+            # folder), the runtimes do not need to be in every folder
+            # with .pyd's.
+            # Returns either the filename of the modified manifest or
+            # None if no manifest should be embedded.
+            manifest_f = open(manifest_file)
+            try:
+                manifest_buf = manifest_f.read()
+            finally:
+                manifest_f.close()
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
+                r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
+                re.DOTALL)
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            pattern = "<dependentAssembly>\s*</dependentAssembly>"
+            manifest_buf = re.sub(pattern, "", manifest_buf)
+            # Now see if any other assemblies are referenced - if not, we
+            # don't want a manifest embedded.
+            pattern = re.compile(
+                r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""
+                r""".*?(?:/>|</assemblyIdentity>)""", re.DOTALL)
+            if re.search(pattern, manifest_buf) is None:
+                return None
+
+            manifest_f = open(manifest_file, 'w')
+            try:
+                manifest_f.write(manifest_buf)
+                return manifest_file
+            finally:
+                manifest_f.close()
+        except OSError:
+            pass
+
+    # -- Miscellaneous methods -----------------------------------------
+    # These are all used by the 'gen_lib_options() function, in
+    # ccompiler.py.
+
+    def library_dir_option(self, dir):
+        return "/LIBPATH:" + dir
+
+    def runtime_library_dir_option(self, dir):
+        raise DistutilsPlatformError(
+              "don't know how to set runtime library search path for MSVC")
+
+    def library_option(self, lib):
+        return self.library_filename(lib)
+
+    def find_library_file(self, dirs, lib, debug=0):
+        # Prefer a debugging library if found (and requested), but deal
+        # with it if we don't have one.
+        if debug:
+            try_names = [lib + "_d", lib]
+        else:
+            try_names = [lib]
+        for dir in dirs:
+            for name in try_names:
+                libfile = os.path.join(dir, self.library_filename(name))
+                if os.path.isfile(libfile):
+                    return libfile
+        else:
+            # Oops, didn't find it in *any* of 'dirs'
+            return None
diff --git a/ccompiler.py b/ccompiler.py
index 911e84dd3b..b7df394ecc 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -959,7 +959,7 @@ def get_default_compiler(osname=None, platform=None):
 # is assumed to be in the 'distutils' package.)
 compiler_class = { 'unix':    ('unixccompiler', 'UnixCCompiler',
                                "standard UNIX-style compiler"),
-                   'msvc':    ('msvccompiler', 'MSVCCompiler',
+                   'msvc':    ('_msvccompiler', 'MSVCCompiler',
                                "Microsoft Visual C++"),
                    'cygwin':  ('cygwinccompiler', 'CygwinCCompiler',
                                "Cygwin port of GNU C Compiler for Win32"),
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 959a8bf62e..a3eff7e7cf 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -303,7 +303,6 @@ def get_installer_filename(self, fullname):
         return installer_name
 
     def get_exe_bytes(self):
-        from distutils.msvccompiler import get_build_version
         # If a target-version other than the current version has been
         # specified, then using the MSVC version from *this* build is no good.
         # Without actually finding and executing the target version and parsing
@@ -313,20 +312,28 @@ def get_exe_bytes(self):
         # We can then execute this program to obtain any info we need, such
         # as the real sys.version string for the build.
         cur_version = get_python_version()
-        if self.target_version and self.target_version != cur_version:
-            # If the target version is *later* than us, then we assume they
-            # use what we use
-            # string compares seem wrong, but are what sysconfig.py itself uses
-            if self.target_version > cur_version:
-                bv = get_build_version()
+
+        # If the target version is *later* than us, then we assume they
+        # use what we use
+        # string compares seem wrong, but are what sysconfig.py itself uses
+        if self.target_version and self.target_version < cur_version:
+            if self.target_version < "2.4":
+                bv = 6.0
+            elif self.target_version == "2.4":
+                bv = 7.1
+            elif self.target_version == "2.5":
+                bv = 8.0
+            elif self.target_version <= "3.2":
+                bv = 9.0
+            elif self.target_version <= "3.4":
+                bv = 10.0
             else:
-                if self.target_version < "2.4":
-                    bv = 6.0
-                else:
-                    bv = 7.1
+                bv = 14.0
         else:
             # for current version - use authoritative check.
-            bv = get_build_version()
+            from msvcrt import CRT_ASSEMBLY_VERSION
+            bv = float('.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]))
+
 
         # wininst-x.y.exe is in the same directory as this file
         directory = os.path.dirname(__file__)
diff --git a/command/build_ext.py b/command/build_ext.py
index c5a3ce1915..d4cb11e6db 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -19,10 +19,6 @@
 
 from site import USER_BASE
 
-if os.name == 'nt':
-    from distutils.msvccompiler import get_build_version
-    MSVC_VERSION = int(get_build_version())
-
 # An extension name is just a dot-separated list of Python NAMEs (ie.
 # the same as a fully-qualified module name).
 extension_name_re = re.compile \
@@ -206,27 +202,17 @@ def finalize_options(self):
             _sys_home = getattr(sys, '_home', None)
             if _sys_home:
                 self.library_dirs.append(_sys_home)
-            if MSVC_VERSION >= 9:
-                # Use the .lib files for the correct architecture
-                if self.plat_name == 'win32':
-                    suffix = 'win32'
-                else:
-                    # win-amd64 or win-ia64
-                    suffix = self.plat_name[4:]
-                new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
-                if suffix:
-                    new_lib = os.path.join(new_lib, suffix)
-                self.library_dirs.append(new_lib)
-
-            elif MSVC_VERSION == 8:
-                self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS8.0'))
-            elif MSVC_VERSION == 7:
-                self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VS7.1'))
+
+            # Use the .lib files for the correct architecture
+            if self.plat_name == 'win32':
+                suffix = 'win32'
             else:
-                self.library_dirs.append(os.path.join(sys.exec_prefix,
-                                         'PC', 'VC6'))
+                # win-amd64 or win-ia64
+                suffix = self.plat_name[4:]
+            new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
+            if suffix:
+                new_lib = os.path.join(new_lib, suffix)
+            self.library_dirs.append(new_lib)
 
         # for extensions under Cygwin and AtheOS Python's library directory must be
         # appended to library_dirs
@@ -716,7 +702,7 @@ def get_libraries(self, ext):
         # to need it mentioned explicitly, though, so that's what we do.
         # Append '_d' to the python import library on debug builds.
         if sys.platform == "win32":
-            from distutils.msvccompiler import MSVCCompiler
+            from distutils._msvccompiler import MSVCCompiler
             if not isinstance(self.compiler, MSVCCompiler):
                 template = "python%d%d"
                 if self.debug:
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
new file mode 100644
index 0000000000..b4407543b1
--- /dev/null
+++ b/tests/test_msvccompiler.py
@@ -0,0 +1,160 @@
+"""Tests for distutils._msvccompiler."""
+import sys
+import unittest
+import os
+
+from distutils.errors import DistutilsPlatformError
+from distutils.tests import support
+from test.support import run_unittest
+
+# A manifest with the only assembly reference being the msvcrt assembly, so
+# should have the assembly completely stripped.  Note that although the
+# assembly has a <security> reference the assembly is removed - that is
+# currently a "feature", not a bug :)
+_MANIFEST_WITH_ONLY_MSVC_REFERENCE = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+# A manifest with references to assemblies other than msvcrt.  When processed,
+# this assembly should be returned with just the msvcrt part removed.
+_MANIFEST_WITH_MULTIPLE_REFERENCES = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
+         version="9.0.21022.8" processorArchitecture="x86"
+         publicKeyToken="XXXX">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>
+"""
+
+_CLEANED_MANIFEST = """\
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
+        version="9.0.21022.8" processorArchitecture="x86"
+        publicKeyToken="XXXX"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+</assembly>"""
+
+SKIP_MESSAGE = (None if sys.platform == "win32" else
+                "These tests are only for win32")
+
+@unittest.skipUnless(SKIP_MESSAGE is None, SKIP_MESSAGE)
+class msvccompilerTestCase(support.TempdirManager,
+                            unittest.TestCase):
+
+    def test_no_compiler(self):
+        # makes sure query_vcvarsall raises
+        # a DistutilsPlatformError if the compiler
+        # is not found
+        from distutils._msvccompiler import _get_vc_env
+        def _find_vcvarsall():
+            return None
+
+        import distutils._msvccompiler as _msvccompiler
+        old_find_vcvarsall = _msvccompiler._find_vcvarsall
+        _msvccompiler._find_vcvarsall = _find_vcvarsall
+        try:
+            self.assertRaises(DistutilsPlatformError, _get_vc_env,
+                             'wont find this version')
+        finally:
+            _msvccompiler._find_vcvarsall = old_find_vcvarsall
+
+    def test_remove_visual_c_ref(self):
+        from distutils._msvccompiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        try:
+            f.write(_MANIFEST_WITH_MULTIPLE_REFERENCES)
+        finally:
+            f.close()
+
+        compiler = MSVCCompiler()
+        compiler._remove_visual_c_ref(manifest)
+
+        # see what we got
+        f = open(manifest)
+        try:
+            # removing trailing spaces
+            content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
+            f.close()
+
+        # makes sure the manifest was properly cleaned
+        self.assertEqual(content, _CLEANED_MANIFEST)
+
+    def test_remove_entire_manifest(self):
+        from distutils._msvccompiler import MSVCCompiler
+        tempdir = self.mkdtemp()
+        manifest = os.path.join(tempdir, 'manifest')
+        f = open(manifest, 'w')
+        try:
+            f.write(_MANIFEST_WITH_ONLY_MSVC_REFERENCE)
+        finally:
+            f.close()
+
+        compiler = MSVCCompiler()
+        got = compiler._remove_visual_c_ref(manifest)
+        self.assertIsNone(got)
+
+
+def test_suite():
+    return unittest.makeSuite(msvccompilerTestCase)
+
+if __name__ == "__main__":
+    run_unittest(test_suite())

From 739202377f34c4058ce96bafd0150c4299fa21c0 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 23 May 2015 12:15:57 -0700
Subject: [PATCH 5092/8469] Issue #23970: Fixes bdist_wininst not working on
 non-Windows platform.

---
 command/bdist_wininst.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index a3eff7e7cf..0c0e2c1a26 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -331,8 +331,13 @@ def get_exe_bytes(self):
                 bv = 14.0
         else:
             # for current version - use authoritative check.
-            from msvcrt import CRT_ASSEMBLY_VERSION
-            bv = float('.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]))
+            try:
+                from msvcrt import CRT_ASSEMBLY_VERSION
+            except ImportError:
+                # cross-building, so assume the latest version
+                bv = 14.0
+            else:
+                bv = float('.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]))
 
 
         # wininst-x.y.exe is in the same directory as this file

From 1ae0b75fb909b3fa1bd42702d4ab2a943a8f7155 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 23 May 2015 17:43:05 -0700
Subject: [PATCH 5093/8469] Version bump for 3.5.0b1.

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 37bfd5a8f7..686ca1de88 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.5.0a4"
+__version__ = "3.5.0b1"
 #--end constants--

From 0db81b9974abf772d40f64f77c9d7220f880b4e9 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 25 May 2015 21:24:00 -0500
Subject: [PATCH 5094/8469] keep distutils version in sync with python version
 automatically

---
 __init__.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/__init__.py b/__init__.py
index 6eb79cb639..d823d040a1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,10 +8,6 @@
    setup (...)
 """
 
-# Distutils version
-#
-# Updated automatically by the Python release process.
-#
-#--start constants--
-__version__ = "3.2.6"
-#--end constants--
+import sys
+
+__version__ = sys.version[:sys.version.index(' ')]

From 16da5eac3a04bc4224082ee54f5f0f5b1c8d92db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 May 2015 18:12:23 -0400
Subject: [PATCH 5095/8469] extract variable for nicer indentation

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 74803b59d2..515c89d595 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2024,8 +2024,8 @@ def get_args(cls, dist, header=None):
             group = type_ + '_scripts'
             for name, ep in dist.get_entry_map(group).items():
                 script_text = cls.template % locals()
-                for res in cls._get_script_args(type_, name, header,
-                        script_text):
+                args = cls._get_script_args(type_, name, header, script_text)
+                for res in args:
                     yield res
 
     @classmethod

From 7ee56c5270d979f73c248c3ef5bac48793cd77d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 May 2015 18:14:16 -0400
Subject: [PATCH 5096/8469] Update docstring to include the actual entry point
 names (for hits when grepping).

---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 515c89d595..2c127126ce 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2015,7 +2015,8 @@ def get_script_header(cls, script_text, executable=None, wininst=False):
     @classmethod
     def get_args(cls, dist, header=None):
         """
-        Yield write_script() argument tuples for a distribution's entrypoints
+        Yield write_script() argument tuples for a distribution's
+        console_scripts and gui_scripts entry points.
         """
         if header is None:
             header = cls.get_header()

From b2847255769f7e40fa757c830020cb2daad7860d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 May 2015 18:40:01 -0400
Subject: [PATCH 5097/8469] Disallow path separators in script names. Fixes
 #390

---
 setuptools/command/easy_install.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2c127126ce..1b32b1c821 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2024,11 +2024,21 @@ def get_args(cls, dist, header=None):
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
             for name, ep in dist.get_entry_map(group).items():
+                cls._ensure_safe_name(name)
                 script_text = cls.template % locals()
                 args = cls._get_script_args(type_, name, header, script_text)
                 for res in args:
                     yield res
 
+    @staticmethod
+    def _ensure_safe_name(name):
+        """
+        Prevent paths in *_scripts entry point names.
+        """
+        has_path_sep = re.search(r'[\\/]', name)
+        if has_path_sep:
+            raise ValueError("Path separators not allowed in script names")
+
     @classmethod
     def get_writer(cls, force_windows):
         # for backward compatibility

From c87fd7aa8017f31ccf42ed66bae1f31f1cfef642 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 May 2015 18:42:49 -0400
Subject: [PATCH 5098/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6d3466a9d6..4ea74081ba 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+17.0
+----
+
+* Issue #390: Disallow console scripts with path separators in
+  the name. Removes unintended functionality and brings behavior
+  into parity wih pip.
+
 ----
 16.0
 ----

From 75d108c95186aef502333c471ab103baa0602871 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>
Date: Thu, 28 May 2015 15:28:22 +0200
Subject: [PATCH 5099/8469] Issue #378: Do not use internal
 importlib._bootstrap module.

---
 CHANGES.txt               |  1 +
 pkg_resources/__init__.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4ea74081ba..08879612b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ CHANGES
 17.0
 ----
 
+* Issue #378: Do not use internal importlib._bootstrap module.
 * Issue #390: Disallow console scripts with path separators in
   the name. Removes unintended functionality and brings behavior
   into parity wih pip.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 779bd36723..7bb0bdb317 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -69,9 +69,9 @@
 
 # Avoid try/except due to potential problems with delayed import mechanisms.
 if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
-    import importlib._bootstrap as importlib_bootstrap
+    import importlib.machinery as importlib_machinery
 else:
-    importlib_bootstrap = None
+    importlib_machinery = None
 
 try:
     import parser
@@ -1720,8 +1720,8 @@ def _get(self, path):
 
 register_loader_type(type(None), DefaultProvider)
 
-if importlib_bootstrap is not None:
-    register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider)
+if importlib_machinery is not None:
+    register_loader_type(importlib_machinery.SourceFileLoader, DefaultProvider)
 
 
 class EmptyProvider(NullProvider):
@@ -2128,8 +2128,8 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(pkgutil.ImpImporter, find_on_path)
 
-if importlib_bootstrap is not None:
-    register_finder(importlib_bootstrap.FileFinder, find_on_path)
+if importlib_machinery is not None:
+    register_finder(importlib_machinery.FileFinder, find_on_path)
 
 _declare_state('dict', _namespace_handlers={})
 _declare_state('dict', _namespace_packages={})
@@ -2237,8 +2237,8 @@ def file_ns_handler(importer, path_item, packageName, module):
 register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
 
-if importlib_bootstrap is not None:
-    register_namespace_handler(importlib_bootstrap.FileFinder, file_ns_handler)
+if importlib_machinery is not None:
+    register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
 
 
 def null_ns_handler(importer, path_item, packageName, module):

From 13cf22d8341ebc19d4d43a2b66101192abdfd380 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2015 17:54:02 -0400
Subject: [PATCH 5100/8469] Correct typo

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 08879612b6..92cb6a4f7b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,7 @@ CHANGES
 * Issue #378: Do not use internal importlib._bootstrap module.
 * Issue #390: Disallow console scripts with path separators in
   the name. Removes unintended functionality and brings behavior
-  into parity wih pip.
+  into parity with pip.
 
 ----
 16.0

From 664646d91c8af89509193c747916eb3f4d920db8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2015 17:54:28 -0400
Subject: [PATCH 5101/8469] Bumped to 17.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e2b35663f3..ca42b878b3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "16.1"
+DEFAULT_VERSION = "17.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index aeccd8e337..f4fad79b07 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '16.1'
+__version__ = '17.0'

From f5e82ccfefafe8ab8373db980e47bc23f3b601dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2015 22:22:30 -0400
Subject: [PATCH 5102/8469] Added tag 17.0 for changeset 8e5624096101

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 86037d84f0..a797d4e66f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -210,3 +210,4 @@ d2c4d84867154243993876d6248aafec1fd12679 15.0
 10fde952613b7a3f650fb1f6b6ed58cbd232fa3c 15.1
 df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2
 e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
+8e56240961015347fed477f00ca6a0783e81d3a2 17.0

From 435745ff2ff4be11ba68c41f297fbcbc3ee1fed5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2015 22:23:34 -0400
Subject: [PATCH 5103/8469] Bumped to 17.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index ca42b878b3..7966a1da28 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "17.0"
+DEFAULT_VERSION = "17.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f4fad79b07..f57a6fba9d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '17.0'
+__version__ = '17.1'

From 90a3e3b896d4f86337692f361a5a1bdcbf310bf9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:05:00 -0400
Subject: [PATCH 5104/8469] Add tests capturing expectation for range
 comparison operators (Ref #380).

---
 pkg_resources/api_tests.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index a6c25a378f..fc645d4800 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -417,3 +417,9 @@ Environment Markers
 
     >>> em("'yx' in 'x'")
     False
+
+    >>> em("python_version >= '2.6'")
+    True
+
+    >>> em("python_version > '2.5'")
+    True

From c3bf0dd4521637a1301187af0aa8732613674561 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:22:01 -0400
Subject: [PATCH 5105/8469] Remove now deprecated test capturing failure of
 range comparison operators (Ref #380).

---
 pkg_resources/api_tests.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index fc645d4800..1c852e817c 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -364,9 +364,6 @@ Environment Markers
     >>> print(im("'x'=='x' or os.open('foo')=='y'"))   # no short-circuit!
     Language feature not supported in environment markers
 
-    >>> print(im("'x' < 'y'"))
-    '<' operator not allowed in environment markers
-
     >>> print(im("'x' < 'y' < 'z'"))
     Chained comparison not allowed in environment markers
 

From 208af4d231da879174ba189c2f756360ae6dca0a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:34:17 -0400
Subject: [PATCH 5106/8469] Add test capturing possible violation in
 expectation due to new Python 2.7.10 release. Ref #380.

---
 pkg_resources/tests/test_markers.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pkg_resources/tests/test_markers.py

diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
new file mode 100644
index 0000000000..d8844e74e3
--- /dev/null
+++ b/pkg_resources/tests/test_markers.py
@@ -0,0 +1,16 @@
+try:
+	import unittest.mock as mock
+except ImportError:
+	import mock
+
+from pkg_resources import evaluate_marker
+
+
+@mock.patch.dict('pkg_resources.MarkerEvaluation.values',
+	python_full_version=mock.Mock(return_value='2.7.10'))
+def test_lexicographic_ordering():
+	"""
+	Although one might like 2.7.10 to be greater than 2.7.3,
+	the marker spec only supports lexicographic ordering.
+	"""
+	assert evaluate_marker("python_full_version > '2.7.3'") is False

From 3ab82175e1d843d8f09f69f2d82ffc5d7d9a03df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:37:34 -0400
Subject: [PATCH 5107/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 92cb6a4f7b..4734ff049f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+17.1
+----
+
+* Issue #380: Add support for range operators on environment
+  marker evaluation.
+
 ----
 17.0
 ----

From f7a6205b6145e5ba29d3be6b05d923ea50bab9c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:38:05 -0400
Subject: [PATCH 5108/8469] Added tag 17.1 for changeset a37bcaaeab36

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a797d4e66f..d554dc6340 100644
--- a/.hgtags
+++ b/.hgtags
@@ -211,3 +211,4 @@ d2c4d84867154243993876d6248aafec1fd12679 15.0
 df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2
 e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
 8e56240961015347fed477f00ca6a0783e81d3a2 17.0
+a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1

From 77b0d0176a4c26de3121d135853b28c3f290c3c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jun 2015 10:39:14 -0400
Subject: [PATCH 5109/8469] Bumped to 17.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 7966a1da28..dd5bf5b950 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "17.1"
+DEFAULT_VERSION = "17.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f57a6fba9d..7da47b5e3b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '17.1'
+__version__ = '17.2'

From c1044e3706ed28a6913e0dfcb4f7eec713af34c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jun 2015 13:22:43 -0400
Subject: [PATCH 5110/8469] Backed out unintended changes made in f572ec9,
 restoring use of 'imp' module for dynamic module creation originally
 committed in 06ac3674 and 4c121bd24f.

---
 pkg_resources/__init__.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4ed713295f..c3b3d7af31 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -21,7 +21,7 @@
 import io
 import time
 import re
-import imp
+import types
 import zipfile
 import zipimport
 import warnings
@@ -39,6 +39,12 @@
 import textwrap
 from pkgutil import get_importer
 
+try:
+    import _imp
+except ImportError:
+    # Python 3.2 compatibility
+    import imp as _imp
+
 PY3 = sys.version_info > (3,)
 PY2 = not PY3
 
@@ -2163,7 +2169,7 @@ def _handle_ns(packageName, path_item):
         return None
     module = sys.modules.get(packageName)
     if module is None:
-        module = sys.modules[packageName] = imp.new_module(packageName)
+        module = sys.modules[packageName] = types.ModuleType(packageName)
         module.__path__ = []
         _set_parent_ns(packageName)
     elif not hasattr(module,'__path__'):
@@ -2182,7 +2188,7 @@ def _handle_ns(packageName, path_item):
 def declare_namespace(packageName):
     """Declare that package 'packageName' is a namespace package"""
 
-    imp.acquire_lock()
+    _imp.acquire_lock()
     try:
         if packageName in _namespace_packages:
             return
@@ -2209,18 +2215,18 @@ def declare_namespace(packageName):
             _handle_ns(packageName, path_item)
 
     finally:
-        imp.release_lock()
+        _imp.release_lock()
 
 def fixup_namespace_packages(path_item, parent=None):
     """Ensure that previously-declared namespace packages include path_item"""
-    imp.acquire_lock()
+    _imp.acquire_lock()
     try:
         for package in _namespace_packages.get(parent,()):
             subpath = _handle_ns(package, path_item)
             if subpath:
                 fixup_namespace_packages(subpath, package)
     finally:
-        imp.release_lock()
+        _imp.release_lock()
 
 def file_ns_handler(importer, path_item, packageName, module):
     """Compute an ns-package subpath for a filesystem or zipfile importer"""

From 9b9c404a50c48e9be857c8743f80c7f8398d9d85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jun 2015 13:29:05 -0400
Subject: [PATCH 5111/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4734ff049f..9ca376fae4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+------
+17.1.1
+------
+
+* Backed out unintended changes to pkg_resources, restoring removal of
+  deprecated imp module (`ref
+  <https://bitbucket.org/pypa/setuptools/commits/f572ec9563d647fa8d4ffc534f2af8070ea07a8b#comment-1881283>`_).
+
 ----
 17.1
 ----

From bcd3e0055d24ea0b0077a2d986f6c4090489a644 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jun 2015 13:36:25 -0400
Subject: [PATCH 5112/8469] Bumped to 17.1.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index dd5bf5b950..46cd2099ba 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "17.2"
+DEFAULT_VERSION = "17.1.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 7da47b5e3b..6c8b4c2be8 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '17.2'
+__version__ = '17.1.1'

From 805f39c73599c71536a8c62e5d67506d830c799a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jun 2015 13:36:26 -0400
Subject: [PATCH 5113/8469] Added tag 17.1.1 for changeset 4a0d01d690ff

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d554dc6340..ebbc6a12b9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -212,3 +212,4 @@ df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2
 e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
 8e56240961015347fed477f00ca6a0783e81d3a2 17.0
 a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
+4a0d01d690ff184904293e7a3244ac24ec060a73 17.1.1

From c1d71724e6f73eec022cb86161cf777ff37b009b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Jun 2015 13:37:34 -0400
Subject: [PATCH 5114/8469] Bumped to 17.1.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 46cd2099ba..07e4f6d851 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "17.1.1"
+DEFAULT_VERSION = "17.1.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 6c8b4c2be8..a9da9717b0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '17.1.1'
+__version__ = '17.1.2'

From a811c089a4362c0dc6c4a84b708953dde9ebdbf8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 Jun 2015 12:33:54 -0400
Subject: [PATCH 5115/8469] Detect Cython later in the build process, allowing
 the library to be specified in setup_requires. Fixes #288.

---
 CHANGES.txt                     | 24 ++++++++++++++++++++++++
 setuptools/command/build_ext.py | 15 +++------------
 setuptools/extension.py         | 21 ++++++++++-----------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9ca376fae4..5a1c7493f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,30 @@
 CHANGES
 =======
 
+----
+18.0
+----
+
+* Dropped support for builds with Pyrex. Only Cython is supported.
+* Issue #288: Detect Cython later in the build process, after
+  ``setup_requires`` dependencies are resolved.
+  Projects backed by Cython can now be readily built
+  with a ``setup_requires`` dependency. For example::
+
+    ext = setuptools.Extension('mylib', ['src/CythonStuff.pyx', 'src/CStuff.c'])
+    setuptools.setup(
+        ...
+        ext_modules=[ext],
+        setup_requires=['cython'],
+    )
+
+  For compatibility with older versions of setuptools, packagers should
+  still include ``src/CythonMod.c`` in the source distributions or
+  require that Cython be present before building source distributions.
+  However, for systems with this build of setuptools, Cython will be
+  downloaded on demand.
+
+
 ------
 17.1.1
 ------
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index e4b2c593f3..92e4a189b8 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -11,8 +11,8 @@
 from setuptools.extension import Library
 
 try:
-    # Attempt to use Pyrex for building extensions, if available
-    from Pyrex.Distutils.build_ext import build_ext as _build_ext
+    # Attempt to use Cython for building extensions, if available
+    from Cython.Distutils.build_ext import build_ext as _build_ext
 except ImportError:
     _build_ext = _du_build_ext
 
@@ -42,7 +42,6 @@
 
 if_dl = lambda s: s if have_rtld else ''
 
-
 class build_ext(_build_ext):
     def run(self):
         """Build extensions in build directory, then copy if --inplace"""
@@ -74,15 +73,6 @@ def copy_extensions_to_source(self):
             if ext._needs_stub:
                 self.write_stub(package_dir or os.curdir, ext, True)
 
-    if _build_ext is not _du_build_ext and not hasattr(_build_ext,
-                                                       'pyrex_sources'):
-        # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
-        def swig_sources(self, sources, *otherargs):
-            # first do any Pyrex processing
-            sources = _build_ext.swig_sources(self, sources) or sources
-            # Then do any actual SWIG stuff on the remainder
-            return _du_build_ext.swig_sources(self, sources, *otherargs)
-
     def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
@@ -176,6 +166,7 @@ def get_export_symbols(self, ext):
         return _build_ext.get_export_symbols(self, ext)
 
     def build_extension(self, ext):
+        ext._convert_pyx_sources_to_lang()
         _compiler = self.compiler
         try:
             if isinstance(ext, Library):
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 8178ed33d7..a7c40f8664 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -12,35 +12,34 @@
 
 msvc9_support.patch_for_specialized_compiler()
 
-def have_pyrex():
+def _have_cython():
     """
-    Return True if Cython or Pyrex can be imported.
+    Return True if Cython can be imported.
     """
-    pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext'
-    for pyrex_impl in pyrex_impls:
+    cython_impls = 'Cython.Distutils.build_ext',
+    for cython_impl in cython_impls:
         try:
-            # from (pyrex_impl) import build_ext
-            __import__(pyrex_impl, fromlist=['build_ext']).build_ext
+            # from (cython_impl) import build_ext
+            __import__(cython_impl, fromlist=['build_ext']).build_ext
             return True
         except Exception:
             pass
     return False
 
+# for compatibility
+have_pyrex = _have_cython
+
 
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
-    def __init__(self, *args, **kw):
-        _Extension.__init__(self, *args, **kw)
-        self._convert_pyx_sources_to_lang()
-
     def _convert_pyx_sources_to_lang(self):
         """
         Replace sources with .pyx extensions to sources with the target
         language extension. This mechanism allows language authors to supply
         pre-converted sources but to prefer the .pyx sources.
         """
-        if have_pyrex():
+        if _have_cython():
             # the build has Cython, so allow it to compile the .pyx files
             return
         lang = self.language or ''

From 7bbbe8f420a1d52652eca080b3302f2fa64d9c30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 Jun 2015 12:46:41 -0400
Subject: [PATCH 5116/8469] Bumped to 18.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 07e4f6d851..6db030d7c8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "17.1.2"
+DEFAULT_VERSION = "18.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index a9da9717b0..407a82bc46 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '17.1.2'
+__version__ = '18.0'

From 8c428b55cd4649bea3092f134bda8c919b96fe94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 Jun 2015 12:47:02 -0400
Subject: [PATCH 5117/8469] Added tag 18.0b1 for changeset fac98a49bd98

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ebbc6a12b9..1c413807d4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -213,3 +213,4 @@ e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
 8e56240961015347fed477f00ca6a0783e81d3a2 17.0
 a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
 4a0d01d690ff184904293e7a3244ac24ec060a73 17.1.1
+fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1

From 3c047624cfa74a42320334ed6ec0dd7b6bd789b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 10 Jun 2015 14:56:52 -0400
Subject: [PATCH 5118/8469] Remove loop, made unnecessary by removal of support
 for Pyrex

---
 setuptools/extension.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index a7c40f8664..35eb7c7c55 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -16,14 +16,13 @@ def _have_cython():
     """
     Return True if Cython can be imported.
     """
-    cython_impls = 'Cython.Distutils.build_ext',
-    for cython_impl in cython_impls:
-        try:
-            # from (cython_impl) import build_ext
-            __import__(cython_impl, fromlist=['build_ext']).build_ext
-            return True
-        except Exception:
-            pass
+    cython_impl = 'Cython.Distutils.build_ext',
+    try:
+        # from (cython_impl) import build_ext
+        __import__(cython_impl, fromlist=['build_ext']).build_ext
+        return True
+    except Exception:
+        pass
     return False
 
 # for compatibility

From e5588b705a2418bd7c46aeae4971f7ebe4bd6ead Mon Sep 17 00:00:00 2001
From: Stephen Drake <steve+bitbucket@synergyconsultingnz.com>
Date: Thu, 11 Jun 2015 03:22:51 +0000
Subject: [PATCH 5119/8469] Don't quote executable name twice in script headers

Don't quote the executable name in JythonCommandSpec.from_environment() since it is quoted if necessary in CommandSpec._render().

With the executable quoted on initialisation of JythonCommandSpec, the quotes get escaped in the resulting header, eg:

#!/usr/bin/env \"/path/to/jython\"
---
 setuptools/command/easy_install.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 1b32b1c821..df1655bfb0 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1944,15 +1944,6 @@ def relevant(cls):
             __import__('java').lang.System.getProperty('os.name') != 'Linux'
         )
 
-    @classmethod
-    def from_environment(cls):
-        string = '"' + cls._sys_executable() + '"'
-        return cls.from_string(string)
-
-    @classmethod
-    def from_string(cls, string):
-        return cls([string])
-
     def as_header(self):
         """
         Workaround Jython's sys.executable being a .sh (an invalid

From 79e447fcc29d4591f1a4b3403840357e8bccb234 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jun 2015 11:05:37 -0400
Subject: [PATCH 5120/8469] Fix test failure when __PYVENV_LAUNCHER__ is set.
 Fixes #396.

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

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e71bbfc9e8..a690315d16 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -488,9 +488,11 @@ def test_from_param_for_CommandSpec_is_passthrough(self):
         cmd_new = ei.CommandSpec.from_param(cmd)
         assert cmd is cmd_new
 
+    @mock.patch('sys.executable', TestScriptHeader.exe_with_spaces)
+    @mock.patch.dict(os.environ)
     def test_from_environment_with_spaces_in_executable(self):
-        with mock.patch('sys.executable', TestScriptHeader.exe_with_spaces):
-            cmd = ei.CommandSpec.from_environment()
+        del os.environ['__PYVENV_LAUNCHER__']
+        cmd = ei.CommandSpec.from_environment()
         assert len(cmd) == 1
         assert cmd.as_header().startswith('#!"')
 

From ca3a52c7b79fa6d8279c2c5eea739414dd481aee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Jun 2015 11:10:46 -0400
Subject: [PATCH 5121/8469] Update changelog

---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a1c7493f0..8b229910c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,7 +24,9 @@ CHANGES
   require that Cython be present before building source distributions.
   However, for systems with this build of setuptools, Cython will be
   downloaded on demand.
-
+* Issue #396: Fixed test failure on OS X.
+* Pull Request #136: Remove excessive quoting from shebang headers
+  for Jython.
 
 ------
 17.1.1

From 01c1e7b38b4017e705c8a42b72281b1048afeec2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Jun 2015 18:51:26 -0400
Subject: [PATCH 5122/8469] Added tag 18.0 for changeset 0a49ee524b0a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1c413807d4..5e08eb8add 100644
--- a/.hgtags
+++ b/.hgtags
@@ -214,3 +214,4 @@ e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
 a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
 4a0d01d690ff184904293e7a3244ac24ec060a73 17.1.1
 fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
+0a49ee524b0a1d67d2a11c8c22f082b57acd7ae1 18.0

From 47413a2792fb772f4bdcf7a61a843b495464feae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Jun 2015 18:52:38 -0400
Subject: [PATCH 5123/8469] Bumped to 18.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6db030d7c8..cc8da01ecb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.0"
+DEFAULT_VERSION = "18.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 407a82bc46..92f360079d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.0'
+__version__ = '18.1'

From ea96c15d03dea659cb3cd572e1246bb15ec68e1c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Jun 2015 20:20:13 -0400
Subject: [PATCH 5124/8469] Conditionally remove __PYVENV_LAUNCHER__

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a690315d16..66601bfe11 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -491,7 +491,7 @@ def test_from_param_for_CommandSpec_is_passthrough(self):
     @mock.patch('sys.executable', TestScriptHeader.exe_with_spaces)
     @mock.patch.dict(os.environ)
     def test_from_environment_with_spaces_in_executable(self):
-        del os.environ['__PYVENV_LAUNCHER__']
+        os.environ.pop('__PYVENV_LAUNCHER__', None)
         cmd = ei.CommandSpec.from_environment()
         assert len(cmd) == 1
         assert cmd.as_header().startswith('#!"')

From a23e95f499849815db5c852a4983388c8a27b0cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jun 2015 16:59:21 -0400
Subject: [PATCH 5125/8469] Update changelog. Along with f44e81f2f62f, fixes
 #401.

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8b229910c4..58c723124c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+18.0.1
+------
+
+* Issue #401: Fix failure in test suite.
+
 ----
 18.0
 ----

From fc350581c83b27d5846b192016f7525059790f5e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jun 2015 16:59:48 -0400
Subject: [PATCH 5126/8469] Bumped to 18.0.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index cc8da01ecb..3762bd80e6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.1"
+DEFAULT_VERSION = "18.0.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 92f360079d..0c6e893f6b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.1'
+__version__ = '18.0.1'

From bf0d9092a69ecbdcf5e5a768bdd892b616ce11bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jun 2015 16:59:50 -0400
Subject: [PATCH 5127/8469] Added tag 18.0.1 for changeset e364795c1b09

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5e08eb8add..2b76cd275e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -215,3 +215,4 @@ a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
 4a0d01d690ff184904293e7a3244ac24ec060a73 17.1.1
 fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
 0a49ee524b0a1d67d2a11c8c22f082b57acd7ae1 18.0
+e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1

From d215171466c4c7511044f92337e215ceda26d07f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Jun 2015 17:01:04 -0400
Subject: [PATCH 5128/8469] Bumped to 18.0.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 3762bd80e6..4fea4ec3e4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.0.1"
+DEFAULT_VERSION = "18.0.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 0c6e893f6b..0767a409a3 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.0.1'
+__version__ = '18.0.2'

From e0beae7ae0bea46e4af3892bd4d9298d256d3205 Mon Sep 17 00:00:00 2001
From: vrutsky <rutsky.vladimir@gmail.com>
Date: Thu, 2 Jul 2015 11:00:57 +0000
Subject: [PATCH 5129/8469] fix typo: "a a"

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 89c08e23f8..0feb09ea95 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1467,7 +1467,7 @@ are included in any source distribution you build.  This is a big improvement
 over having to manually write a ``MANIFEST.in`` file and try to keep it in
 sync with your project.  So, if you are using CVS or Subversion, and your
 source distributions only need to include files that you're tracking in
-revision control, don't create a a ``MANIFEST.in`` file for your project.
+revision control, don't create a ``MANIFEST.in`` file for your project.
 (And, if you already have one, you might consider deleting it the next time
 you would otherwise have to change it.)
 

From d51ba2d7a8850a7fb56a6572b372626dd1cd3631 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 20 Jul 2015 16:35:49 +0100
Subject: [PATCH 5130/8469] Big performance fix for find_packages by ignoring
 hidden dirs earlier

---
 setuptools/__init__.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8188f12528..f653635989 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -81,10 +81,20 @@ def _all_dirs(base_path):
             for dir in dirs:
                 yield os.path.relpath(os.path.join(root, dir), base_path)
 
+    @staticmethod
+    def _suitable_dirs(base_path):
+        """
+        Return all suitable package dirs in base_path, relative to base_path
+        """
+        for root, dirs, files in os.walk(base_path, followlinks=True):
+            # Mutate dirs to trim the search:
+            dirs[:] = filterfalse(lambda n: '.' in n, dirs)
+            for dir in dirs:
+                yield os.path.relpath(os.path.join(root, dir), base_path)
+
     @classmethod
     def _find_packages_iter(cls, base_path):
-        dirs = cls._all_dirs(base_path)
-        suitable = filterfalse(lambda n: '.' in n, dirs)
+        suitable = cls._suitable_dirs(base_path)
         return (
             path.replace(os.path.sep, '.')
             for path in suitable

From 7c42a077cf4a91e095a2bc4964927de32b5cab78 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Tue, 28 Jul 2015 15:55:07 +1200
Subject: [PATCH 5131/8469] Issue #23426: run_setup was broken in distutils.
 Patch from Alexander Belopolsky.

---
 core.py            |  5 ++---
 tests/test_core.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/core.py b/core.py
index f05b34b295..d603d4a45a 100644
--- a/core.py
+++ b/core.py
@@ -204,16 +204,15 @@ def run_setup (script_name, script_args=None, stop_after="run"):
     global _setup_stop_after, _setup_distribution
     _setup_stop_after = stop_after
 
-    save_argv = sys.argv
+    save_argv = sys.argv.copy()
     g = {'__file__': script_name}
-    l = {}
     try:
         try:
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
             with open(script_name, 'rb') as f:
-                exec(f.read(), g, l)
+                exec(f.read(), g)
         finally:
             sys.argv = save_argv
             _setup_stop_after = None
diff --git a/tests/test_core.py b/tests/test_core.py
index 41321f7db4..57856f19b6 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -28,6 +28,21 @@
 setup()
 """
 
+setup_does_nothing = """\
+from distutils.core import setup
+setup()
+"""
+
+
+setup_defines_subclass = """\
+from distutils.core import setup
+from distutils.command.install import install as _install
+
+class install(_install):
+    sub_commands = _install.sub_commands + ['cmd']
+
+setup(cmdclass={'install': install})
+"""
 
 class CoreTestCase(support.EnvironGuard, unittest.TestCase):
 
@@ -65,6 +80,21 @@ def test_run_setup_provides_file(self):
         distutils.core.run_setup(
             self.write_setup(setup_using___file__))
 
+    def test_run_setup_preserves_sys_argv(self):
+        # Make sure run_setup does not clobber sys.argv
+        argv_copy = sys.argv.copy()
+        distutils.core.run_setup(
+            self.write_setup(setup_does_nothing))
+        self.assertEqual(sys.argv, argv_copy)
+
+    def test_run_setup_defines_subclass(self):
+        # Make sure the script can use __file__; if that's missing, the test
+        # setup.py script will raise NameError.
+        dist = distutils.core.run_setup(
+            self.write_setup(setup_defines_subclass))
+        install = dist.get_command_obj('install')
+        self.assertIn('cmd', install.sub_commands)
+
     def test_run_setup_uses_current_dir(self):
         # This tests that the setup script is run with the current directory
         # as its own current directory; this was temporarily broken by a

From 84deb7074ef2c9086aeb440f84738fef0bc67f74 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 30 Jul 2015 11:51:06 -0700
Subject: [PATCH 5132/8469] Update default msvccompiler link options to match
 the options used for core builds. This ensures that wheels will work when
 moved to machines that have the same subset of the MSVC libraries as a
 regular CPython install. Specifically, vcruntime##0.dll may not be installed,
 and should not be a dependency.

---
 _msvccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 896d9d927f..4e2eed72a9 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -207,10 +207,10 @@ def initialize(self, plat_name=None):
         ]
 
         self.ldflags_shared = [
-            '/nologo', '/DLL', '/INCREMENTAL:NO'
+            '/nologo', '/DLL', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib'
         ]
         self.ldflags_shared_debug = [
-            '/nologo', '/DLL', '/INCREMENTAL:no', '/DEBUG:FULL'
+            '/nologo', '/DLL', '/INCREMENTAL:no', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib'
         ]
         self.ldflags_static = [
             '/nologo'

From e3886227ec1c8db491f79eaf46500d65b81b7d6d Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sat, 1 Aug 2015 20:13:21 -0400
Subject: [PATCH 5133/8469] Upgrade packaging to 15.3

---
 pkg_resources/_vendor/packaging/__about__.py  |  2 +-
 pkg_resources/_vendor/packaging/specifiers.py | 24 +++++++++++++++++--
 pkg_resources/_vendor/packaging/version.py    |  2 ++
 pkg_resources/_vendor/vendored.txt            |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index d524399519..eadb794eec 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -22,7 +22,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "15.1"
+__version__ = "15.3"
 
 __author__ = "Donald Stufft"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index d5d8a95674..891664f05c 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -151,6 +151,14 @@ def _coerce_version(self, version):
             version = parse(version)
         return version
 
+    @property
+    def operator(self):
+        return self._spec[0]
+
+    @property
+    def version(self):
+        return self._spec[1]
+
     @property
     def prereleases(self):
         return self._prereleases
@@ -159,6 +167,9 @@ def prereleases(self):
     def prereleases(self, value):
         self._prereleases = value
 
+    def __contains__(self, item):
+        return self.contains(item)
+
     def contains(self, item, prereleases=None):
         # Determine if prereleases are to be allowed or not.
         if prereleases is None:
@@ -176,7 +187,7 @@ def contains(self, item, prereleases=None):
 
         # Actually do the comparison to determine if this item is contained
         # within this Specifier or not.
-        return self._get_operator(self._spec[0])(item, self._spec[1])
+        return self._get_operator(self.operator)(item, self.version)
 
     def filter(self, iterable, prereleases=None):
         yielded = False
@@ -526,7 +537,7 @@ def prereleases(self):
         # operators, and if they are if they are including an explicit
         # prerelease.
         operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~="]:
+        if operator in ["==", ">=", "<=", "~=", "==="]:
             # The == specifier can include a trailing .*, if it does we
             # want to remove before parsing.
             if operator == "==" and version.endswith(".*"):
@@ -666,6 +677,12 @@ def __ne__(self, other):
 
         return self._specs != other._specs
 
+    def __len__(self):
+        return len(self._specs)
+
+    def __iter__(self):
+        return iter(self._specs)
+
     @property
     def prereleases(self):
         # If we have been given an explicit prerelease modifier, then we'll
@@ -687,6 +704,9 @@ def prereleases(self):
     def prereleases(self, value):
         self._prereleases = value
 
+    def __contains__(self, item):
+        return self.contains(item)
+
     def contains(self, item, prereleases=None):
         # Ensure that our item is a Version or LegacyVersion instance.
         if not isinstance(item, (LegacyVersion, Version)):
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
index cf8afb16d6..4ba574b9fa 100644
--- a/pkg_resources/_vendor/packaging/version.py
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -324,6 +324,8 @@ def _parse_letter_version(letter, number):
             letter = "b"
         elif letter in ["c", "pre", "preview"]:
             letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
 
         return letter, int(number)
     if not letter and number:
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 28da422673..4cf7664ec9 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1 +1 @@
-packaging==15.1
+packaging==15.3

From 8a65cea4898dcbdf26ac5b9488964b59a8724a5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2015 14:51:26 -0400
Subject: [PATCH 5134/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 58c723124c..6dda9dbb2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----
+18.1
+----
+
+* Upgrade to vendored packaging 15.3.
+
 ------
 18.0.1
 ------

From 35bd5713397e0a25eaf1d79230fd1f119838f109 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2015 14:51:39 -0400
Subject: [PATCH 5135/8469] Bumped to 18.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4fea4ec3e4..cc8da01ecb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.0.2"
+DEFAULT_VERSION = "18.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 0767a409a3..92f360079d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.0.2'
+__version__ = '18.1'

From cacab2e858037a14060925d3422bc32c152719b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2015 14:51:41 -0400
Subject: [PATCH 5136/8469] Added tag 18.1 for changeset c0395f556c35

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2b76cd275e..51ada8d776 100644
--- a/.hgtags
+++ b/.hgtags
@@ -216,3 +216,4 @@ a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
 fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
 0a49ee524b0a1d67d2a11c8c22f082b57acd7ae1 18.0
 e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1
+c0395f556c35d8311fdfe2bda6846b91149819cd 18.1

From 30ece5ff98b651251c491ecf9c7f8c12ebe0f6b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2015 14:52:45 -0400
Subject: [PATCH 5137/8469] Bumped to 18.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index cc8da01ecb..f46e986bc6 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.1"
+DEFAULT_VERSION = "18.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 92f360079d..715ea4a651 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.1'
+__version__ = '18.2'

From 8b68b23eea750175cdf4ee91547fac64434ce34c Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 5 Aug 2015 11:39:19 -0700
Subject: [PATCH 5138/8469] Issue #24798: _msvccompiler.py doesn't properly
 support manifests

---
 _msvccompiler.py           | 167 +++++++++++--------------------------
 tests/test_msvccompiler.py | 121 ---------------------------
 2 files changed, 50 insertions(+), 238 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 4e2eed72a9..b344616e60 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -15,7 +15,6 @@
 
 import os
 import subprocess
-import re
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -182,7 +181,8 @@ def initialize(self, plat_name=None):
             raise DistutilsPlatformError("Unable to find a compatible "
                 "Visual Studio installation.")
 
-        paths = vc_env.get('path', '').split(os.pathsep)
+        self._paths = vc_env.get('path', '')
+        paths = self._paths.split(os.pathsep)
         self.cc = _find_exe("cl.exe", paths)
         self.linker = _find_exe("link.exe", paths)
         self.lib = _find_exe("lib.exe", paths)
@@ -199,23 +199,41 @@ def initialize(self, plat_name=None):
                 self.add_library_dir(dir)
 
         self.preprocess_options = None
+        # Use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
+        # later to dynamically link to ucrtbase but not vcruntime.
         self.compile_options = [
-            '/nologo', '/Ox', '/MD', '/W3', '/GL', '/DNDEBUG'
+            '/nologo', '/Ox', '/MT', '/W3', '/GL', '/DNDEBUG'
         ]
         self.compile_options_debug = [
-            '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
+            '/nologo', '/Od', '/MTd', '/Zi', '/W3', '/D_DEBUG'
         ]
 
-        self.ldflags_shared = [
-            '/nologo', '/DLL', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib'
+        ldflags = [
+            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib',
         ]
-        self.ldflags_shared_debug = [
-            '/nologo', '/DLL', '/INCREMENTAL:no', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib'
-        ]
-        self.ldflags_static = [
-            '/nologo'
+        ldflags_debug = [
+            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib',
         ]
 
+        self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
+        self.ldflags_exe_debug = [*ldflags_debug, '/MANIFEST:EMBED,ID=1']
+        self.ldflags_shared = [*ldflags, '/DLL', '/MANIFEST:EMBED,ID=2', '/MANIFESTUAC:NO']
+        self.ldflags_shared_debug = [*ldflags_debug, '/DLL', '/MANIFEST:EMBED,ID=2', '/MANIFESTUAC:NO']
+        self.ldflags_static = [*ldflags]
+        self.ldflags_static_debug = [*ldflags_debug]
+
+        self._ldflags = {
+            (CCompiler.EXECUTABLE, None): self.ldflags_exe,
+            (CCompiler.EXECUTABLE, False): self.ldflags_exe,
+            (CCompiler.EXECUTABLE, True): self.ldflags_exe_debug,
+            (CCompiler.SHARED_OBJECT, None): self.ldflags_shared,
+            (CCompiler.SHARED_OBJECT, False): self.ldflags_shared,
+            (CCompiler.SHARED_OBJECT, True): self.ldflags_shared_debug,
+            (CCompiler.SHARED_LIBRARY, None): self.ldflags_static,
+            (CCompiler.SHARED_LIBRARY, False): self.ldflags_static,
+            (CCompiler.SHARED_LIBRARY, True): self.ldflags_static_debug,
+        }
+
         self.initialized = True
 
     # -- Worker methods ------------------------------------------------
@@ -224,9 +242,12 @@ def object_filenames(self,
                          source_filenames,
                          strip_dir=0,
                          output_dir=''):
-        ext_map = {ext: self.obj_extension for ext in self.src_extensions}
-        ext_map.update((ext, self.res_extension)
-                for ext in self._rc_extensions + self._mc_extensions)
+        ext_map = {
+            **{ext: self.obj_extension for ext in self.src_extensions},
+            **{ext: self.res_extension for ext in self._rc_extensions + self._mc_extensions},
+        }
+
+        output_dir = output_dir or ''
 
         def make_out_path(p):
             base, ext = os.path.splitext(p)
@@ -237,18 +258,17 @@ def make_out_path(p):
                 if base.startswith((os.path.sep, os.path.altsep)):
                     base = base[1:]
             try:
-                return base + ext_map[ext]
+                # XXX: This may produce absurdly long paths. We should check
+                # the length of the result and trim base until we fit within
+                # 260 characters.
+                return os.path.join(output_dir, base + ext_map[ext])
             except LookupError:
                 # Better to raise an exception instead of silently continuing
                 # and later complain about sources and targets having
                 # different lengths
                 raise CompileError("Don't know how to compile {}".format(p))
 
-        output_dir = output_dir or ''
-        return [
-            os.path.join(output_dir, make_out_path(src_name))
-            for src_name in source_filenames
-        ]
+        return list(map(make_out_path, source_filenames))
 
 
     def compile(self, sources,
@@ -359,6 +379,7 @@ def create_static_lib(self,
             if debug:
                 pass # XXX what goes here?
             try:
+                log.debug('Executing "%s" %s', self.lib, ' '.join(lib_args))
                 self.spawn([self.lib] + lib_args)
             except DistutilsExecError as msg:
                 raise LibError(msg)
@@ -399,14 +420,9 @@ def link(self,
             output_filename = os.path.join(output_dir, output_filename)
 
         if self._need_link(objects, output_filename):
-            ldflags = (self.ldflags_shared_debug if debug
-                       else self.ldflags_shared)
-            if target_desc == CCompiler.EXECUTABLE:
-                ldflags = ldflags[1:]
+            ldflags = self._ldflags[target_desc, debug]
 
-            export_opts = []
-            for sym in (export_symbols or []):
-                export_opts.append("/EXPORT:" + sym)
+            export_opts = ["/EXPORT:" + sym for sym in (export_symbols or [])]
 
             ld_args = (ldflags + lib_opts + export_opts +
                        objects + ['/OUT:' + output_filename])
@@ -425,8 +441,6 @@ def link(self,
                     self.library_filename(dll_name))
                 ld_args.append ('/IMPLIB:' + implib_file)
 
-            self.manifest_setup_ldargs(output_filename, build_temp, ld_args)
-
             if extra_preargs:
                 ld_args[:0] = extra_preargs
             if extra_postargs:
@@ -434,101 +448,20 @@ def link(self,
 
             self.mkpath(os.path.dirname(output_filename))
             try:
+                log.debug('Executing "%s" %s', self.linker, ' '.join(ld_args))
                 self.spawn([self.linker] + ld_args)
             except DistutilsExecError as msg:
                 raise LinkError(msg)
-
-            # embed the manifest
-            # XXX - this is somewhat fragile - if mt.exe fails, distutils
-            # will still consider the DLL up-to-date, but it will not have a
-            # manifest.  Maybe we should link to a temp file?  OTOH, that
-            # implies a build environment error that shouldn't go undetected.
-            mfinfo = self.manifest_get_embed_info(target_desc, ld_args)
-            if mfinfo is not None:
-                mffilename, mfid = mfinfo
-                out_arg = '-outputresource:{};{}'.format(output_filename, mfid)
-                try:
-                    self.spawn([self.mt, '-nologo', '-manifest',
-                                mffilename, out_arg])
-                except DistutilsExecError as msg:
-                    raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    def manifest_setup_ldargs(self, output_filename, build_temp, ld_args):
-        # If we need a manifest at all, an embedded manifest is recommended.
-        # See MSDN article titled
-        # "How to: Embed a Manifest Inside a C/C++ Application"
-        # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
-        # Ask the linker to generate the manifest in the temp dir, so
-        # we can check it, and possibly embed it, later.
-        temp_manifest = os.path.join(
-                build_temp,
-                os.path.basename(output_filename) + ".manifest")
-        ld_args.append('/MANIFESTFILE:' + temp_manifest)
-
-    def manifest_get_embed_info(self, target_desc, ld_args):
-        # If a manifest should be embedded, return a tuple of
-        # (manifest_filename, resource_id).  Returns None if no manifest
-        # should be embedded.  See http://bugs.python.org/issue7833 for why
-        # we want to avoid any manifest for extension modules if we can)
-        for arg in ld_args:
-            if arg.startswith("/MANIFESTFILE:"):
-                temp_manifest = arg.split(":", 1)[1]
-                break
-        else:
-            # no /MANIFESTFILE so nothing to do.
-            return None
-        if target_desc == CCompiler.EXECUTABLE:
-            # by default, executables always get the manifest with the
-            # CRT referenced.
-            mfid = 1
-        else:
-            # Extension modules try and avoid any manifest if possible.
-            mfid = 2
-            temp_manifest = self._remove_visual_c_ref(temp_manifest)
-        if temp_manifest is None:
-            return None
-        return temp_manifest, mfid
-
-    def _remove_visual_c_ref(self, manifest_file):
+    def spawn(self, cmd):
+        old_path = os.getenv('path')
         try:
-            # Remove references to the Visual C runtime, so they will
-            # fall through to the Visual C dependency of Python.exe.
-            # This way, when installed for a restricted user (e.g.
-            # runtimes are not in WinSxS folder, but in Python's own
-            # folder), the runtimes do not need to be in every folder
-            # with .pyd's.
-            # Returns either the filename of the modified manifest or
-            # None if no manifest should be embedded.
-            manifest_f = open(manifest_file)
-            try:
-                manifest_buf = manifest_f.read()
-            finally:
-                manifest_f.close()
-            pattern = re.compile(
-                r"""<assemblyIdentity.*?name=("|')Microsoft\."""\
-                r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
-                re.DOTALL)
-            manifest_buf = re.sub(pattern, "", manifest_buf)
-            pattern = "<dependentAssembly>\s*</dependentAssembly>"
-            manifest_buf = re.sub(pattern, "", manifest_buf)
-            # Now see if any other assemblies are referenced - if not, we
-            # don't want a manifest embedded.
-            pattern = re.compile(
-                r"""<assemblyIdentity.*?name=(?:"|')(.+?)(?:"|')"""
-                r""".*?(?:/>|</assemblyIdentity>)""", re.DOTALL)
-            if re.search(pattern, manifest_buf) is None:
-                return None
-
-            manifest_f = open(manifest_file, 'w')
-            try:
-                manifest_f.write(manifest_buf)
-                return manifest_file
-            finally:
-                manifest_f.close()
-        except OSError:
-            pass
+            os.environ['path'] = self._paths
+            return super().spawn(cmd)
+        finally:
+            os.environ['path'] = old_path
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index b4407543b1..1f8890792e 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -7,88 +7,6 @@
 from distutils.tests import support
 from test.support import run_unittest
 
-# A manifest with the only assembly reference being the msvcrt assembly, so
-# should have the assembly completely stripped.  Note that although the
-# assembly has a <security> reference the assembly is removed - that is
-# currently a "feature", not a bug :)
-_MANIFEST_WITH_ONLY_MSVC_REFERENCE = """\
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
-          manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false">
-        </requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
-         version="9.0.21022.8" processorArchitecture="x86"
-         publicKeyToken="XXXX">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>
-"""
-
-# A manifest with references to assemblies other than msvcrt.  When processed,
-# this assembly should be returned with just the msvcrt part removed.
-_MANIFEST_WITH_MULTIPLE_REFERENCES = """\
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
-          manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false">
-        </requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT"
-         version="9.0.21022.8" processorArchitecture="x86"
-         publicKeyToken="XXXX">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
-        version="9.0.21022.8" processorArchitecture="x86"
-        publicKeyToken="XXXX"></assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>
-"""
-
-_CLEANED_MANIFEST = """\
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
-          manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false">
-        </requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.VC90.MFC"
-        version="9.0.21022.8" processorArchitecture="x86"
-        publicKeyToken="XXXX"></assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>"""
 
 SKIP_MESSAGE = (None if sys.platform == "win32" else
                 "These tests are only for win32")
@@ -114,45 +32,6 @@ def _find_vcvarsall():
         finally:
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
-    def test_remove_visual_c_ref(self):
-        from distutils._msvccompiler import MSVCCompiler
-        tempdir = self.mkdtemp()
-        manifest = os.path.join(tempdir, 'manifest')
-        f = open(manifest, 'w')
-        try:
-            f.write(_MANIFEST_WITH_MULTIPLE_REFERENCES)
-        finally:
-            f.close()
-
-        compiler = MSVCCompiler()
-        compiler._remove_visual_c_ref(manifest)
-
-        # see what we got
-        f = open(manifest)
-        try:
-            # removing trailing spaces
-            content = '\n'.join([line.rstrip() for line in f.readlines()])
-        finally:
-            f.close()
-
-        # makes sure the manifest was properly cleaned
-        self.assertEqual(content, _CLEANED_MANIFEST)
-
-    def test_remove_entire_manifest(self):
-        from distutils._msvccompiler import MSVCCompiler
-        tempdir = self.mkdtemp()
-        manifest = os.path.join(tempdir, 'manifest')
-        f = open(manifest, 'w')
-        try:
-            f.write(_MANIFEST_WITH_ONLY_MSVC_REFERENCE)
-        finally:
-            f.close()
-
-        compiler = MSVCCompiler()
-        got = compiler._remove_visual_c_ref(manifest)
-        self.assertIsNone(got)
-
-
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 

From 8434fc905458f1fa6cadf7c52550b9fac80e2b7d Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 5 Aug 2015 11:48:14 -0700
Subject: [PATCH 5139/8469] Rebuild wininst-14.0[-amd64].exe with updated
 tools.

---
 command/wininst-14.0-amd64.exe | Bin 84480 -> 136192 bytes
 command/wininst-14.0.exe       | Bin 75264 -> 129024 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-14.0-amd64.exe b/command/wininst-14.0-amd64.exe
index 43b85b6d4f2dd93f4b77c4b904276293ff667054..7a5e78d52bcc5db0be1baff6cdad41e172a5b81f 100644
GIT binary patch
delta 78379
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

delta 27193
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%0D?ct8#tyV
zQTipA_cAQ*PkGCq@{*oU)#1Wh%W(_lPmR%E&H6SW&V@IF{LkXi?%D$Ne7c_Rq384T
ze5jsZuIGdF{3bmgqUY=MJiT6}zr%VSZ_fGOSuNk^Mqk@?hG3lmn+*>3xJWtKCRkja
z%UbTO-WsHmTmP=><;A`Jb9qpkMsMt^LEL=Z_7|a-dwTxI`YsluGYt8^G$85a3-t#6
zte|%o^Yr2H4x=~!{~ktsPI%im?tVN*NDy4%u>Ms%>9~>o3Gkac7%Kqo0sIxO11o|5
z4)_;XeIxL7fOUA@15WU3JO_y%Z~#WG1$Y!-7M|0<a{#yD`3(3Dz^iz^0{#==xKON_
zSCE+imspJFC*XO2JMjDt{4KzRa35d%dpQI*;t2-66YvV2aNq=|;8UF_;1b{^`fLaI
zSAZA_wh%bM!M$*?1RU09g?P$<7x%(G27h2{kRf<CF34(uV+a_=nbiY7324CGZ6k1B
zz~}ojb{6<f!1yS}+JRdDFAsup_^sj<z~h4%8v^_!;D<w?5b)E0ZwzIu82DQR@$t<X
z7czv5jlsns@Cksg<9P*m9boZDC_y}cb$C7_I$%%i7+(R80Ngwpeu&?}5}Ysw_sqZv
zrre4D^#ph-;MB4BxC^)hxCKuE@LE7uz&MzNDgb^s5oQ5?8gP07h5@(@@I0Ot;GY5Z
zo(d&^M*wa}#*hKu2-tHvdXHa*MgV5wp&yMBY{xSSIKeU-zG(+eaQ;l3H-_MfV<nIt
zccG^!2nQT83uXaM&@vmn15R)io;s=wxED`7@J7I^X&4&dKLPHXkD&oh@Tt3D75v<O
zGhop@ILQJp2BhE51p!Y3%*w*}hai)a#n?Y_PKp9<!`5>bVvY$!2Yl&1I1%u~`{B`e
z9KZ=aQvgMQ$6z;!F2n^T@F9T9DxoOw<$wq990q<6&{BoVOyC61;kgJr-Ssd`{Rqs6
zj05nm)$n%wD__3@Ry+z12YzuqmUlcB;Oue6y5q?K9s<~kXCd$_fGVCe;@QC1(|8hr
zZw7ox!Po=Gs~R?cBV#Lp<NXbD;&D|XvmD4;JoUiW0si;|W9xwb1nB=HoCSCg;AA`w
z;E8~9@iYS84EPG3i@*u)$8#2VJK&===rM5m1;Mv?JVXZ^x(R*(JZ2N-|5RiSBa;s3
z`xIl>fgc3S{44VKM=L4;k35ax0Nw)VzZpIPyc1w1o>9Py0e9lD0VjA7Pa1H7A<uvh
zIKlU}pfkWX*W!CwJZpyIg7`fky|=+TQ4j;T3eS4rc;&?}*f#+`0Guw$>!2LL>v$rE
z(|fP;HJ$$uKAQYEE|BRvE&VU<X-qG{n}bC*W9=~9%wOChu)A-`Teb<i`>Dd`cev`b
z|AA=db9K)(K6myxb`h7csF(MA@$)PK(+jv|hqNPgNBWM;9eF#7cP!sgwqwnXH80e@
zK>z*FLX^kU#?@MCrP|cm^xDkYyxQX0<+W#PJ+;?s{kMf|i`o{qP1=^eEpJ=hw)$-+
zx1HVAzU}(9pzR^sW46a_4@upgzP)(+^6h2Y*KA+Eebe^Z?K`*EZLi->+eM!6e*kZ<
B_80&F

diff --git a/command/wininst-14.0.exe b/command/wininst-14.0.exe
index 764524d746b35fe28228e41e8b75a6ed665d9228..cc43296b677a5b995899bb60bbe0e632163e64ae 100644
GIT binary patch
literal 129024
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

delta 26950
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


From 504d4012293d09847e02d5aa5b495db730077f4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Aug 2015 14:06:28 -0400
Subject: [PATCH 5140/8469] Remove unused _all_dirs. Prefer 'candidate' to
 'suitable'. Update documentation.

---
 setuptools/__init__.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index f653635989..2c492446a6 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -73,31 +73,24 @@ def require_parents(packages):
             yield pkg
 
     @staticmethod
-    def _all_dirs(base_path):
+    def _candidate_dirs(base_path):
         """
-        Return all dirs in base_path, relative to base_path
+        Return all dirs in base_path that might be packages.
         """
+        has_dot = lambda name: '.' in name
         for root, dirs, files in os.walk(base_path, followlinks=True):
-            for dir in dirs:
-                yield os.path.relpath(os.path.join(root, dir), base_path)
-
-    @staticmethod
-    def _suitable_dirs(base_path):
-        """
-        Return all suitable package dirs in base_path, relative to base_path
-        """
-        for root, dirs, files in os.walk(base_path, followlinks=True):
-            # Mutate dirs to trim the search:
-            dirs[:] = filterfalse(lambda n: '.' in n, dirs)
+            # Exclude directories that contain a period, as they cannot be
+            #  packages. Mutate the list to avoid traversal.
+            dirs[:] = filterfalse(has_dot, dirs)
             for dir in dirs:
                 yield os.path.relpath(os.path.join(root, dir), base_path)
 
     @classmethod
     def _find_packages_iter(cls, base_path):
-        suitable = cls._suitable_dirs(base_path)
+        candidates = cls._candidate_dirs(base_path)
         return (
             path.replace(os.path.sep, '.')
-            for path in suitable
+            for path in candidates
             if cls._looks_like_package(os.path.join(base_path, path))
         )
 

From e999c1c445b3891e972ad9353cca334e82621363 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Aug 2015 14:18:54 -0400
Subject: [PATCH 5141/8469] Update changelog. Fixes #412.

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6dda9dbb2d..e95f616bfb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+----
+18.2
+----
+
+* Issue #412: More efficient directory search in ``find_packages``.
+
 ----
 18.1
 ----

From 94e5864e4ff57bfb82bca76fe8d00e15b646fe98 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 7 Aug 2015 19:48:03 -0700
Subject: [PATCH 5142/8469] Issue #4214: Remove ineffectual /pdb:none option
 from msvc9compiler.py

---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 9688f20019..a5a5010053 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -413,7 +413,7 @@ def initialize(self, plat_name=None):
         self.ldflags_shared = ['/DLL', '/nologo', '/INCREMENTAL:NO']
         if self.__version >= 7:
             self.ldflags_shared_debug = [
-                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG', '/pdb:None'
+                '/DLL', '/nologo', '/INCREMENTAL:no', '/DEBUG'
                 ]
         self.ldflags_static = [ '/nologo']
 

From 2271e6d1d51c694a73a541b497fb26cc506516d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 17:43:21 +0100
Subject: [PATCH 5143/8469] Link packaging versions to CHANGELOG in packaging
 project. Fixes #416.

---
 docs/conf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index ba3a35bc31..c2a6387309 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -246,6 +246,10 @@
 				pattern=r"Packaging #(?P<packaging>\d+)",
 				url='{GH}/pypa/packaging/issues/{packaging}',
 			),
+			dict(
+				pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
+				url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
+			),
 		],
 	),
 }

From 595ed8baab48541dd1bbb2c6907c5463305b646b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 17:46:00 +0100
Subject: [PATCH 5144/8469] Rephrase to allow link

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e95f616bfb..10027a9048 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -91,7 +91,7 @@ CHANGES
 15.1
 ----
 
-* Updated Packaging to 15.1 to address Packaging #28.
+* Updated to Packaging 15.1 to address Packaging #28.
 * Fix ``setuptools.sandbox._execfile()`` with Python 3.1.
 
 ----

From 831d2feb383f0d1699582e265e931cf435421741 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 17:46:14 +0100
Subject: [PATCH 5145/8469] Added tag 18.2 for changeset 1a981f2e5031

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 51ada8d776..447b5cdb4d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -217,3 +217,4 @@ fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
 0a49ee524b0a1d67d2a11c8c22f082b57acd7ae1 18.0
 e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1
 c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
+1a981f2e5031f55267dc2a28fa1b42274a1b64b2 18.2

From 413d2abe55dc436b22516ac663f14dd85987d3d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 17:47:20 +0100
Subject: [PATCH 5146/8469] Bumped to 18.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f46e986bc6..a13ce1568a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.2"
+DEFAULT_VERSION = "18.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 715ea4a651..861921f0bf 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.2'
+__version__ = '18.3'

From 1f9c2b756ae6050e11d2dfde03a48df354fb0835 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 19:33:55 +0100
Subject: [PATCH 5147/8469] Extract variable

---
 setuptools/command/easy_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index df1655bfb0..dfdd757e7b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1530,7 +1530,8 @@ def save(self):
         if not self.dirty:
             return
 
-        data = '\n'.join(map(self.make_relative, self.paths))
+        rel_paths = map(self.make_relative, self.paths)
+        data = '\n'.join(rel_paths)
         if data:
             log.debug("Saving %s", self.filename)
             data = (

From 9dc51a56c6133f2b115bc8133236e25cd2bb0a31 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 19:36:06 +0100
Subject: [PATCH 5148/8469] Do join late

---
 setuptools/command/easy_install.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index dfdd757e7b..4688cc4293 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1530,9 +1530,8 @@ def save(self):
         if not self.dirty:
             return
 
-        rel_paths = map(self.make_relative, self.paths)
-        data = '\n'.join(rel_paths)
-        if data:
+        rel_paths = list(map(self.make_relative, self.paths))
+        if rel_paths:
             log.debug("Saving %s", self.filename)
             data = (
                 "import sys; sys.__plen = len(sys.path)\n"
@@ -1541,7 +1540,7 @@ def save(self):
                 " del sys.path[sys.__plen:];"
                 " p=getattr(sys,'__egginsert',0); sys.path[p:p]=new;"
                 " sys.__egginsert = p+len(new)\n"
-            ) % data
+            ) % '\n'.join(rel_paths)
 
             if os.path.islink(self.filename):
                 os.unlink(self.filename)

From 3f2ccea66a3deee1e4a4234d695dd94282ec3819 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 19:46:57 +0100
Subject: [PATCH 5149/8469] Extract method for wrapping lines

---
 setuptools/command/easy_install.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4688cc4293..15b260dd48 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1533,14 +1533,8 @@ def save(self):
         rel_paths = list(map(self.make_relative, self.paths))
         if rel_paths:
             log.debug("Saving %s", self.filename)
-            data = (
-                "import sys; sys.__plen = len(sys.path)\n"
-                "%s\n"
-                "import sys; new=sys.path[sys.__plen:];"
-                " del sys.path[sys.__plen:];"
-                " p=getattr(sys,'__egginsert',0); sys.path[p:p]=new;"
-                " sys.__egginsert = p+len(new)\n"
-            ) % '\n'.join(rel_paths)
+            lines = self._wrap_lines(rel_paths)
+            data = '\n'.join(lines) + '\n'
 
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
@@ -1554,6 +1548,26 @@ def save(self):
 
         self.dirty = False
 
+    def _wrap_lines(self, lines):
+        yield self._inline("""
+            import sys
+            sys.__plen = len(sys.path)
+            """)
+        for line in lines:
+            yield line
+        yield self._inline("""
+            import sys
+            new = sys.path[sys.__plen:]
+            del sys.path[sys.__plen:]
+            p = getattr(sys, '__egginsert', 0)
+            sys.path[p:p] = new
+            sys.__egginsert = p + len(new)
+            """)
+
+    @staticmethod
+    def _inline(text):
+        return textwrap.dedent(text).strip().replace('\n', '; ')
+
     def add(self, dist):
         """Add `dist` to the distribution map"""
         new_path = (

From 50aaf9938a4437db7f2949df6ecb6460c789ff28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 19:47:55 +0100
Subject: [PATCH 5150/8469] Open file in context manager

---
 setuptools/command/easy_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 15b260dd48..0e91215656 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1538,9 +1538,8 @@ def save(self):
 
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
-            f = open(self.filename, 'wt')
-            f.write(data)
-            f.close()
+            with open(self.filename, 'wt') as f:
+                f.write(data)
 
         elif os.path.exists(self.filename):
             log.debug("Deleting empty %s", self.filename)

From 5cbb2ada2e22f95b1dd0cd8ed14643a8cb3766cd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 19:58:12 +0100
Subject: [PATCH 5151/8469] Calculate prelude and postlude early

---
 setuptools/command/easy_install.py | 33 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0e91215656..b6b0cffd02 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1547,25 +1547,26 @@ def save(self):
 
         self.dirty = False
 
-    def _wrap_lines(self, lines):
-        yield self._inline("""
-            import sys
-            sys.__plen = len(sys.path)
-            """)
+    @classmethod
+    def _wrap_lines(cls, lines):
+        yield cls.prelude
         for line in lines:
             yield line
-        yield self._inline("""
-            import sys
-            new = sys.path[sys.__plen:]
-            del sys.path[sys.__plen:]
-            p = getattr(sys, '__egginsert', 0)
-            sys.path[p:p] = new
-            sys.__egginsert = p + len(new)
-            """)
+        yield cls.postlude
 
-    @staticmethod
-    def _inline(text):
-        return textwrap.dedent(text).strip().replace('\n', '; ')
+    _inline = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
+    prelude = _inline("""
+        import sys
+        sys.__plen = len(sys.path)
+        """)
+    postlude = _inline("""
+        import sys
+        new = sys.path[sys.__plen:]
+        del sys.path[sys.__plen:]
+        p = getattr(sys, '__egginsert', 0)
+        sys.path[p:p] = new
+        sys.__egginsert = p + len(new)
+        """)
 
     def add(self, dist):
         """Add `dist` to the distribution map"""

From e2124f4d4c74770ccc0b9fc5f0e17becda578063 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 20:29:08 +0100
Subject: [PATCH 5152/8469] Extract a class for the behavior that rewrites the
 sys.path

---
 setuptools/command/easy_install.py | 50 ++++++++++++++++++------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b6b0cffd02..2b639c1ba3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1547,26 +1547,9 @@ def save(self):
 
         self.dirty = False
 
-    @classmethod
-    def _wrap_lines(cls, lines):
-        yield cls.prelude
-        for line in lines:
-            yield line
-        yield cls.postlude
-
-    _inline = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
-    prelude = _inline("""
-        import sys
-        sys.__plen = len(sys.path)
-        """)
-    postlude = _inline("""
-        import sys
-        new = sys.path[sys.__plen:]
-        del sys.path[sys.__plen:]
-        p = getattr(sys, '__egginsert', 0)
-        sys.path[p:p] = new
-        sys.__egginsert = p + len(new)
-        """)
+    @staticmethod
+    def _wrap_lines(lines):
+        return lines
 
     def add(self, dist):
         """Add `dist` to the distribution map"""
@@ -1605,6 +1588,33 @@ def make_relative(self, path):
             return path
 
 
+class RewritePthDistributions(PthDistributions):
+
+    @classmethod
+    def _wrap_lines(cls, lines):
+        yield cls.prelude
+        for line in lines:
+            yield line
+        yield cls.postlude
+
+    _inline = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
+    prelude = _inline("""
+        import sys
+        sys.__plen = len(sys.path)
+        """)
+    postlude = _inline("""
+        import sys
+        new = sys.path[sys.__plen:]
+        del sys.path[sys.__plen:]
+        p = getattr(sys, '__egginsert', 0)
+        sys.path[p:p] = new
+        sys.__egginsert = p + len(new)
+        """)
+
+
+PthDistributions = RewritePthDistributions
+
+
 def _first_line_re():
     """
     Return a regular expression based on first_line_re suitable for matching

From b0b9dae622b4bcebf96555753d1310319a90bbbe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Aug 2015 20:47:45 +0100
Subject: [PATCH 5153/8469] Allow disabling of the sys.path rewrite technique
 using an environment variable.

---
 CHANGES.txt                        | 15 +++++++++++++++
 setuptools/command/easy_install.py |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 10027a9048..2ad565bc24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+----
+18.3
+----
+
+* Setuptools now allows disabling of the manipulation of the sys.path
+  during the processing of the easy-install.pth file. To do so, set
+  the environment variable ``SETUPTOOLS_SYS_PATH_TECHNIQUE`` to
+  anything but "rewrite" (consider "raw"). During any install operation
+  with manipulation disabled, setuptools packages will be appended to
+  sys.path naturally.
+
+  Future versions may change the default behavior to disable
+  manipulation. If so, the default behavior can be retained by setting
+  the variable to "rewrite".
+
 ----
 18.2
 ----
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2b639c1ba3..7c0dfa99c5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1612,7 +1612,8 @@ def _wrap_lines(cls, lines):
         """)
 
 
-PthDistributions = RewritePthDistributions
+if os.environ.get('SETUPTOOLS_SYS_PATH_TECHNIQUE', 'rewrite') == 'rewrite':
+    PthDistributions = RewritePthDistributions
 
 
 def _first_line_re():

From e5c83ccacb4e61147cb75f4edbe15d68b304b1c5 Mon Sep 17 00:00:00 2001
From: grizzlynyo <grizzly.nyo@gmail.com>
Date: Sat, 29 Aug 2015 17:29:49 +0300
Subject: [PATCH 5154/8469] update dependency links

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index afaf9f6145..4a48792489 100755
--- a/setup.py
+++ b/setup.py
@@ -151,10 +151,10 @@ def _gen_console_scripts():
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==1.0.1",
+        "certs": "certifi==2015.04.28",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz#md5=12c7c3a063b2ff97a0f8291d8de41e8c',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts=[],

From 4e854d1e6ffd5ee1adffd8750589b0a16517d67c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 11:12:58 -0400
Subject: [PATCH 5155/8469] Allow dict.update to do the iteration

---
 setuptools/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2c492446a6..f1798328e5 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -124,9 +124,8 @@ class Command(_Command):
 
     def __init__(self, dist, **kw):
         # Add support for keyword arguments
-        _Command.__init__(self,dist)
-        for k,v in kw.items():
-            setattr(self,k,v)
+        _Command.__init__(self, dist)
+        vars(self).update(kw)
 
     def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         cmd = _Command.reinitialize_command(self, command, reinit_subcommands)

From af9943a4906a808c8d7c2b5004ba48f32400f1d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 11:14:45 -0400
Subject: [PATCH 5156/8469] Replace comment with docstring. Fixes #423

---
 setuptools/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index f1798328e5..1f421da430 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -123,7 +123,10 @@ class Command(_Command):
     command_consumes_arguments = False
 
     def __init__(self, dist, **kw):
-        # Add support for keyword arguments
+        """
+        Construct the command for dist, updating
+        vars(self) with any keyword parameters.
+        """
         _Command.__init__(self, dist)
         vars(self).update(kw)
 

From 028ae1a595c08c581fff6ff52883d2719d8f8160 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 11:15:46 -0400
Subject: [PATCH 5157/8469] Allow dict.update to do the iteration

---
 setuptools/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 1f421da430..9e76ae11aa 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -132,8 +132,7 @@ def __init__(self, dist, **kw):
 
     def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         cmd = _Command.reinitialize_command(self, command, reinit_subcommands)
-        for k,v in kw.items():
-            setattr(cmd,k,v)    # update command with keywords
+        vars(cmd).update(kw)
         return cmd
 
 distutils.core.Command = Command    # we can't patch distutils.cmd, alas

From 29b422607f3083b9ffebba57fc255f45a20353f3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 11:16:34 -0400
Subject: [PATCH 5158/8469] Prefer preceding line comments

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

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9e76ae11aa..9bbc06bb36 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -135,7 +135,8 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         vars(cmd).update(kw)
         return cmd
 
-distutils.core.Command = Command    # we can't patch distutils.cmd, alas
+# we can't patch distutils.cmd, alas
+distutils.core.Command = Command
 
 def findall(dir = os.curdir):
     """Find all files under 'dir' and return the list of full filenames
@@ -150,4 +151,5 @@ def findall(dir = os.curdir):
         all_files.extend(filter(os.path.isfile, files))
     return all_files
 
-distutils.filelist.findall = findall    # fix findall bug in distutils.
+# fix findall bug in distutils.
+distutils.filelist.findall = findall

From e8ffa23f83d13de6ef3e4fe61b5e481c5e6c1d5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 11:34:32 -0400
Subject: [PATCH 5159/8469] Add reference to bug report

---
 setuptools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 9bbc06bb36..39dd60c662 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -151,5 +151,5 @@ def findall(dir = os.curdir):
         all_files.extend(filter(os.path.isfile, files))
     return all_files
 
-# fix findall bug in distutils.
+# fix findall bug in distutils (http://bugs.python.org/issue12885)
 distutils.filelist.findall = findall

From d7f14ca7b710fe301273909ea858fefbaa093e6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 13:13:11 -0400
Subject: [PATCH 5160/8469] Use modern mechanism for test discovery

---
 tests/test_filelist.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index e82bc3d2ed..278809c09b 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -7,7 +7,7 @@
 from distutils.errors import DistutilsTemplateError
 from distutils.filelist import glob_to_re, translate_pattern, FileList
 
-from test.support import captured_stdout, run_unittest
+from test.support import captured_stdout
 from distutils.tests import support
 
 MANIFEST_IN = """\
@@ -292,8 +292,5 @@ def test_process_template(self):
         self.assertWarnings()
 
 
-def test_suite():
-    return unittest.makeSuite(FileListTestCase)
-
 if __name__ == "__main__":
-    run_unittest(test_suite())
+    unittest.main()

From 2822a45bc27876169fd57bad2fdf2d9d5ae2aede Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 13:22:56 -0400
Subject: [PATCH 5161/8469] Issue #12285: Add test capturing failure.

---
 tests/test_filelist.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 278809c09b..6b3bde0d9b 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -6,7 +6,9 @@
 from distutils.log import WARN
 from distutils.errors import DistutilsTemplateError
 from distutils.filelist import glob_to_re, translate_pattern, FileList
+from distutils import filelist
 
+import test.support
 from test.support import captured_stdout
 from distutils.tests import support
 
@@ -292,5 +294,13 @@ def test_process_template(self):
         self.assertWarnings()
 
 
+class FindAllTestCase(unittest.TestCase):
+    @test.support.skip_unless_symlink
+    def test_missing_symlink(self):
+        with test.support.temp_cwd():
+            os.symlink('foo', 'bar')
+            self.assertEqual(filelist.findall(), [])
+
+
 if __name__ == "__main__":
     unittest.main()

From 3bf3f37dd03a1978f6c8386dd348f681241494a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 13:26:48 -0400
Subject: [PATCH 5162/8469] Add another test capturing the basic discovery
 expectation.

---
 tests/test_filelist.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 6b3bde0d9b..45ff565373 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -301,6 +301,17 @@ def test_missing_symlink(self):
             os.symlink('foo', 'bar')
             self.assertEqual(filelist.findall(), [])
 
+    def test_basic_discovery(self):
+        with test.support.temp_cwd():
+            os.mkdir('foo')
+            file1 = os.path.join('foo', 'file1.txt')
+            test.support.create_empty_file(file1)
+            os.mkdir('bar')
+            file2 = os.path.join('bar', 'file2.txt')
+            test.support.create_empty_file(file2)
+            expected = [file1, file2]
+            self.assertEqual(filelist.findall(), expected)
+
 
 if __name__ == "__main__":
     unittest.main()

From c05680c5d1b4f0a688a4e560fabde6aa3022596d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 13:53:14 -0400
Subject: [PATCH 5163/8469] Replace initialize/inject loop with a list
 comprehension

---
 setuptools/__init__.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 39dd60c662..a884d2d327 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,6 +1,7 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
+import functools
 import distutils.core
 import distutils.filelist
 from distutils.core import Command as _Command
@@ -138,18 +139,24 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
 # we can't patch distutils.cmd, alas
 distutils.core.Command = Command
 
-def findall(dir = os.curdir):
+def findall(dir=os.curdir):
     """Find all files under 'dir' and return the list of full filenames
     (relative to 'dir').
     """
-    all_files = []
-    for base, dirs, files in os.walk(dir, followlinks=True):
-        if base==os.curdir or base.startswith(os.curdir+os.sep):
-            base = base[2:]
-        if base:
-            files = [os.path.join(base, f) for f in files]
-        all_files.extend(filter(os.path.isfile, files))
-    return all_files
+    def _strip_leading_curdir(base):
+        do_strip = base == os.curdir or base.startswith(os.curdir + os.sep)
+        return base[2:] if do_strip else base
+
+    def _base_prepend(base):
+        base = _strip_leading_curdir(base)
+        return functools.partial(os.path.join, base)
+
+    return [
+        file
+        for base, dirs, files in os.walk(dir, followlinks=True)
+        for file in map(_base_prepend(base), files)
+        if os.path.isfile(file)
+    ]
 
 # fix findall bug in distutils (http://bugs.python.org/issue12885)
 distutils.filelist.findall = findall

From 8496cfb24aa20109e64a3b03c972792cd911c086 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 13:56:54 -0400
Subject: [PATCH 5164/8469] Use relpath to produce results relative to 'dir'

---
 setuptools/__init__.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a884d2d327..0d1994dc1f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -143,18 +143,13 @@ def findall(dir=os.curdir):
     """Find all files under 'dir' and return the list of full filenames
     (relative to 'dir').
     """
-    def _strip_leading_curdir(base):
-        do_strip = base == os.curdir or base.startswith(os.curdir + os.sep)
-        return base[2:] if do_strip else base
-
-    def _base_prepend(base):
-        base = _strip_leading_curdir(base)
-        return functools.partial(os.path.join, base)
+    def _prepend(base):
+        return functools.partial(os.path.join, os.path.relpath(base, dir))
 
     return [
         file
         for base, dirs, files in os.walk(dir, followlinks=True)
-        for file in map(_base_prepend(base), files)
+        for file in map(_prepend(base), files)
         if os.path.isfile(file)
     ]
 

From e54077ba1964fbb59f3f1df7b9290694a4dc964d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 17:32:51 +0200
Subject: [PATCH 5165/8469] Add docstring and additional test revealing nuances
 of the implementation as found in setuptools.

---
 tests/test_filelist.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 45ff565373..571acdbc08 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -302,6 +302,11 @@ def test_missing_symlink(self):
             self.assertEqual(filelist.findall(), [])
 
     def test_basic_discovery(self):
+        """
+        When findall is called with no parameters or with
+        '.' as the parameter, the dot should be omitted from
+        the results.
+        """
         with test.support.temp_cwd():
             os.mkdir('foo')
             file1 = os.path.join('foo', 'file1.txt')
@@ -312,6 +317,17 @@ def test_basic_discovery(self):
             expected = [file1, file2]
             self.assertEqual(filelist.findall(), expected)
 
+    def test_non_local_discovery(self):
+        """
+        When findall is called with another path, the full
+        path name should be returned.
+        """
+        with test.support.temp_dir() as temp_dir:
+            file1 = os.path.join(temp_dir, 'file1.txt')
+            test.support.create_empty_file(file1)
+            expected = [file1]
+            self.assertEqual(filelist.findall(temp_dir), expected)
+
 
 if __name__ == "__main__":
     unittest.main()

From 656ef5739b3f21070ed3a434ef4911a922b3cf5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2015 14:05:58 -0400
Subject: [PATCH 5166/8469] Sort result to avoid spurious errors due to order.

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

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 571acdbc08..e719198c6d 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -314,8 +314,8 @@ def test_basic_discovery(self):
             os.mkdir('bar')
             file2 = os.path.join('bar', 'file2.txt')
             test.support.create_empty_file(file2)
-            expected = [file1, file2]
-            self.assertEqual(filelist.findall(), expected)
+            expected = [file2, file1]
+            self.assertEqual(sorted(filelist.findall()), expected)
 
     def test_non_local_discovery(self):
         """

From 56afdde1131d3d67360c4032a518b59007255579 Mon Sep 17 00:00:00 2001
From: Ankur Dedania <AbsoluteMSTR@gmail.com>
Date: Mon, 31 Aug 2015 20:10:01 +0000
Subject: [PATCH 5167/8469] Adds #257, pip style version

--HG--
branch : AbsoluteMSTR/adds-257-pip-style-version-1441051798003
---
 setuptools/command/easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7c0dfa99c5..62c24d77ca 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -217,7 +217,9 @@ def _delete_path(self, path):
 
     def finalize_options(self):
         if self.version:
-            print('setuptools %s' % get_distribution('setuptools').version)
+            dist = get_distribution('setuptools')
+            print('setuptools %s from %s (python %s)' % (
+                dist.version, dist.location, sys.version[:3]))
             sys.exit()
 
         py_version = sys.version.split()[0]

From e2e71004c87d3afa3dc8692739b477d2d70aa2e6 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 1 Sep 2015 14:59:18 -0400
Subject: [PATCH 5168/8469] Look deeper at .egg-info files for package name and
 version information when available.

---
 pkg_resources/__init__.py | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d09e0b6f9a..938f481872 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2466,6 +2466,13 @@ def _remove_md5_fragment(location):
     return location
 
 
+def _version_from_file(fid):
+    for line in fid:
+        if line.lower().startswith('version:'):
+            version = safe_version(line.split(':', 1)[1].strip())
+            return version
+
+
 class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
@@ -2483,7 +2490,7 @@ def __init__(self, location=None, metadata=None, project_name=None,
         self._provider = metadata or empty_provider
 
     @classmethod
-    def from_location(cls, location, basename, metadata=None,**kw):
+    def from_location(cls, location, basename, metadata=None, **kw):
         project_name, version, py_version, platform = [None]*4
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
@@ -2491,9 +2498,25 @@ def from_location(cls, location, basename, metadata=None,**kw):
             match = EGG_NAME(basename)
             if match:
                 project_name, version, py_version, platform = match.group(
-                    'name','ver','pyver','plat'
+                    'name', 'ver', 'pyver', 'plat'
                 )
             cls = _distributionImpl[ext.lower()]
+
+            # Some packages e.g. numpy and scipy use distutils instead of
+            # setuptools, and their version numbers can get mangled when
+            # converted to filenames (e.g., 1.11.0.dev0+2329eae to
+            # 1.11.0.dev0_2329eae). These will not be parsed properly
+            # downstream by Distribution and safe_version, so we need to
+            # take an extra step and try to get the version number from
+            # the file itself instead of the filename.
+            if ext == '.egg-info':
+                full_name = os.path.join(location, basename + ext)
+                try:
+                    with open(full_name, 'r') as fid:
+                        version_ = _version_from_file(fid)
+                    version = version_ if version_ is not None else version
+                except IOError:
+                    pass
         return cls(
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
@@ -2584,13 +2607,11 @@ def version(self):
         try:
             return self._version
         except AttributeError:
-            for line in self._get_metadata(self.PKG_INFO):
-                if line.lower().startswith('version:'):
-                    self._version = safe_version(line.split(':',1)[1].strip())
-                    return self._version
-            else:
+            version = _version_from_file(self._get_metadata(self.PKG_INFO))
+            if version is None:
                 tmpl = "Missing 'Version:' header and/or %s file"
                 raise ValueError(tmpl % self.PKG_INFO, self)
+            return version
 
     @property
     def _dep_map(self):

From 7f8157b378c7e03ef332a59b63c08b375876b976 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 3 Sep 2015 09:46:44 -0400
Subject: [PATCH 5169/8469] Setuptools supports Python 3.5 and 3.6

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index 4a48792489..1a425747fa 100755
--- a/setup.py
+++ b/setup.py
@@ -144,6 +144,8 @@ def _gen_console_scripts():
         Programming Language :: Python :: 3.2
         Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
+        Programming Language :: Python :: 3.5
+        Programming Language :: Python :: 3.6
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration

From 41ec7a69440cf0dd489c57c015521503d797636e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2015 13:20:48 -0400
Subject: [PATCH 5170/8469] Update python3 docs to indicate that 2to3 is mildly
 deprecated, and removing legacy details.

---
 docs/python3.txt | 74 ++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 52 deletions(-)

diff --git a/docs/python3.txt b/docs/python3.txt
index df173000f2..d550cb68c1 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -5,16 +5,22 @@ Supporting both Python 2 and Python 3 with Setuptools
 Starting with Distribute version 0.6.2 and Setuptools 0.7, the Setuptools
 project supported Python 3. Installing and
 using setuptools for Python 3 code works exactly the same as for Python 2
-code, but Setuptools also helps you to support Python 2 and Python 3 from
-the same source code by letting you run 2to3 on the code as a part of the
-build process, by setting the keyword parameter ``use_2to3`` to True.
+code.
 
+Setuptools provides a facility to invoke 2to3 on the code as a part of the
+build process, by setting the keyword parameter ``use_2to3`` to True, but
+the Setuptools strongly recommends instead developing a unified codebase
+using `six <https://pypi.python.org/pypi/six>`_,
+`future <https://pypi.python.org/pypi/future>`_, or another compatibility
+library.
 
-Setuptools as help during porting
-=================================
 
-Setuptools can make the porting process much easier by automatically running
-2to3 as a part of the test running. To do this you need to configure the
+Using 2to3
+==========
+
+Setuptools attempts to make the porting process easier by automatically
+running
+2to3 as a part of running tests. To do so, you need to configure the
 setup.py so that you can run the unit tests with ``python setup.py test``.
 
 See :ref:`test` for more information on this.
@@ -37,23 +43,23 @@ to a list of names of packages containing fixers. To exclude fixers, the
 parameter ``use_2to3_exclude_fixers`` can be set to fixer names to be
 skipped.
 
-A typical setup.py can look something like this::
+An example setup.py might look something like this::
 
     from setuptools import setup
 
     setup(
         name='your.module',
-        version = '1.0',
+        version='1.0',
         description='This is your awesome module',
         author='You',
         author_email='your@email',
-        package_dir = {'': 'src'},
-        packages = ['your', 'you.module'],
-        test_suite = 'your.module.tests',
-        use_2to3 = True,
-        convert_2to3_doctests = ['src/your/module/README.txt'],
-        use_2to3_fixers = ['your.fixers'],
-        use_2to3_exclude_fixers = ['lib2to3.fixes.fix_import'],
+        package_dir={'': 'src'},
+        packages=['your', 'you.module'],
+        test_suite='your.module.tests',
+        use_2to3=True,
+        convert_2to3_doctests=['src/your/module/README.txt'],
+        use_2to3_fixers=['your.fixers'],
+        use_2to3_exclude_fixers=['lib2to3.fixes.fix_import'],
     )
 
 Differential conversion
@@ -86,39 +92,3 @@ Advanced features
 
 If you don't want to run the 2to3 conversion on the doctests in Python files,
 you can turn that off by setting ``setuptools.use_2to3_on_doctests = False``.
-
-Note on compatibility with older versions of setuptools
-=======================================================
-
-Setuptools earlier than 0.7 does not know about the new keyword parameters to
-support Python 3.
-As a result it will warn about the unknown keyword parameters if you use
-those versions of setuptools instead of Distribute under Python 2. This output
-is not an error, and
-install process will continue as normal, but if you want to get rid of that
-error this is easy. Simply conditionally add the new parameters into an extra
-dict and pass that dict into setup()::
-
-    from setuptools import setup
-    import sys
-
-    extra = {}
-    if sys.version_info >= (3,):
-        extra['use_2to3'] = True
-        extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
-        extra['use_2to3_fixers'] = ['your.fixers']
-
-    setup(
-        name='your.module',
-        version = '1.0',
-        description='This is your awesome module',
-        author='You',
-        author_email='your@email',
-        package_dir = {'': 'src'},
-        packages = ['your', 'you.module'],
-        test_suite = 'your.module.tests',
-        **extra
-    )
-
-This way the parameters will only be used under Python 3, where Distribute or
-Setuptools 0.7 or later is required.

From 0f3521f227793e2707b682d23f5cce36983e07a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2015 13:28:01 -0400
Subject: [PATCH 5171/8469] Remove documentation on merge, now relevant only
 for posterity (reference in the source tree).

---
 docs/index.txt     |   1 -
 docs/merge-faq.txt |  80 -----------------------------
 docs/merge.txt     | 122 ---------------------------------------------
 3 files changed, 203 deletions(-)
 delete mode 100644 docs/merge-faq.txt
 delete mode 100644 docs/merge.txt

diff --git a/docs/index.txt b/docs/index.txt
index 529f08f354..6ac3725269 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -23,4 +23,3 @@ Documentation content:
    easy_install
    pkg_resources
    development
-   merge
diff --git a/docs/merge-faq.txt b/docs/merge-faq.txt
deleted file mode 100644
index ea45f30cfa..0000000000
--- a/docs/merge-faq.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-Setuptools/Distribute Merge FAQ
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-How do I upgrade from Distribute?
-=================================
-
-Distribute specifically prohibits installation of Setuptools 0.7 from Distribute 0.6. There are then two options for upgrading.
-
-Note that after upgrading using either technique, the only option to downgrade to either version is to completely uninstall Distribute and Setuptools 0.7 versions before reinstalling an 0.6 release.
-
-Use Distribute 0.7
-------------------
-
-The PYPA has put together a compatibility wrapper, a new release of Distribute version 0.7. This package will install over Distribute 0.6.x installations and will replace Distribute with a simple wrapper that requires Setuptools 0.7 or later. This technique is experimental, but initial results indicate this technique is the easiest upgrade path.
-
-
-Uninstall
----------
-
-First, completely uninstall Distribute. Since Distribute does not have an automated installation routine, this process is manual. Follow the instructions in the README for uninstalling.
-
-
-How do I upgrade from Setuptools 0.6?
-=====================================
-
-There are no special instructions for upgrading over older versions of Setuptools. Simply use `easy_install -U` or run the latest `ez_setup.py`.
-
-Where does the merge occur?
-========================================================
-
-The merge is occurring between the heads of the default branch of Distribute and the setuptools-0.6 branch of Setuptools. The Setuptools SVN repo has been converted to a Mercurial repo hosted on Bitbucket. The work is still underway, so the exact changesets included may change, although the anticipated merge targets are Setuptools at 0.6c12 and Distribute at 0.6.35.
-
-What happens to other branches?
-========================================================
-
-Distribute 0.7 was abandoned long ago and won't be included in the resulting code tree, but may be retained for posterity in the original repo.
-
-Setuptools default branch (also 0.7 development) may also be abandoned or may be incorporated into the new merged line if desirable (and as resources allow).
-
-What history is lost/changed?
-========================================================
-
-As setuptools was not on Mercurial when the fork occurred and as Distribute did not include the full setuptools history (prior to the creation of the setuptools-0.6 branch), the two source trees were not compatible. In order to most effectively communicate the code history, the Distribute code was grafted onto the (originally private) setuptools Mercurial repo. Although this grafting maintained the full code history with names, dates, and changes, it did lose the original hashes of those changes. Therefore, references to changes by hash (including tags) are lost.
-
-Additionally, any heads that were not actively merged into the Distribute 0.6.35 release were also omitted. As a result, the changesets included in the merge repo are those from the original setuptools repo and all changesets ancestral to the Distribute 0.6.35 release.
-
-What features will be in the merged code base?
-========================================================
-
-In general, all "features" added in distribute will be included in setuptools. Where there exist conflicts or undesirable features, we will be explicit about what these limitations are. Changes that are  backward-incompatible from setuptools 0.6 to distribute will likely be  removed, and these also will be well documented.
-
-Bootstrapping scripts (ez_setup/distribute_setup) and docs, as with  distribute, will be maintained in the repository and built as part of  the release process. Documentation and bootstrapping scripts will be  hosted at python.org, as they are with distribute now. Documentation at  telecommunity will be updated to refer or redirect to the new, merged  docs.
-
-On  the whole, the merged setuptools should be largely compatible with the  latest releases of both setuptools and distribute and will be an easy  transition for users of either library.
-
-Who is invited to contribute? Who is excluded?
-========================================================
-
-While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the  community, especially those most familiar with Python packaging and its challenges to join us in the effort.
-
-We have lots of  ideas for how we'd like to improve the codebase, release process,  everything.  Like distribute, the post-merge setuptools will have its  source hosted on Bitbucket.  (So if you're currently a distribute  contributor, about the only thing that's going to change is the URL of  the repository you follow.)  Also like distribute, it'll support Python  3, and hopefully we'll soon merge Vinay Sajip's patches to make it run  on Python 3 without needing 2to3 to be run on the code first.
-
-While we've worked privately to initiate this merge due to the potential sensitivity of the topic, no one is excluded from this effort. We invite all members of the community, especially those most familiar with Python packaging and its challenges to join us in the effort.
-
-Why Setuptools and not Distribute or another name?
-========================================================
-
-We do, however,  understand that this announcement might be unsettling for some.  The  setuptools name has been subjected to a lot of deprecation in recent  years, so the idea that it will now be the preferred name instead of distribute might be somewhat difficult or disorienting for some.   We considered use of another name (Distribute or an entirely new name),  but that would serve to only complicate matters further. Instead, our goal is to simplify the packaging landscape but without losing any hard-won advancements.  We hope  that the people who worked to spread the first message will be equally  enthusiastic about spreading the new one, and we especially look forward to seeing the new posters and slogans celebrating setuptools.
-
-What is the timeframe of release?
-========================================================
-
-There are no hard timeframes for any of this effort, although progress is underway and a draft merge is underway and being tested privately.   As an unfunded volunteer effort, our time to put in on it is limited,  and we've both had some recent health and other challenges that have  made working on this difficult, which in part explains why we haven't met our original deadline of a completed merge before PyCon.
-
-The final Setuptools 0.7 was cut on June 1, 2013 and will be released to PyPI shortly thereafter.
-
-What version number can I expect for the new release?
-========================================================
-
-The new release will roughly follow the previous trend for setuptools and release the new release as 0.7. This number is somewhat arbitrary, but we wanted something other than 0.6 to distinguish it from its ancestor forks but not 1.0 to avoid putting too much emphasis on the release itself and to focus on merging the functionality. In the future, the project will likely adopt a versioning scheme similar to semver to convey semantic meaning about the release in the version number.
diff --git a/docs/merge.txt b/docs/merge.txt
deleted file mode 100644
index ba37d6e4ca..0000000000
--- a/docs/merge.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Merge with Distribute
-~~~~~~~~~~~~~~~~~~~~~
-
-In 2013, the fork of Distribute was merged back into Setuptools. This
-document describes some of the details of the merge.
-
-.. toctree::
-   :maxdepth: 2
-
-   merge-faq
-
-Process
-=======
-
-In order to try to accurately reflect the fork and then re-merge of the
-projects, the merge process brought both code trees together into one
-repository and grafted the Distribute fork onto the Setuptools development
-line (as if it had been created as a branch in the first place).
-
-The rebase to get distribute onto setuptools went something like this::
-
-    hg phase -d -f -r 26b4c29b62db
-    hg rebase -s 26b4c29b62db -d 7a5cf59c78d7
-
-The technique required a late version of mercurial (2.5) to work correctly.
-
-The only code that was included was the code that was ancestral to the public
-releases of Distribute 0.6. Additionally, because Setuptools was not hosted
-on Mercurial at the time of the fork and because the Distribute fork did not
-include a complete conversion of the Setuptools history, the Distribute
-changesets had to be re-applied to a new, different conversion of the
-Setuptools SVN repository. As a result, all of the hashes have changed.
-
-Distribute was grafted in a 'distribute' branch and the 'setuptools-0.6'
-branch was targeted for the merge. The 'setuptools' branch remains with
-unreleased code and may be incorporated in the future.
-
-Reconciling Differences
-=======================
-
-There were both technical and philosophical differences between Setuptools
-and Distribute. To reconcile these differences in a manageable way, the
-following technique was undertaken:
-
-Create a 'Setuptools-Distribute merge' branch, based on a late release of
-Distribute (0.6.35). This was done with a00b441856c4.
-
-In that branch, first remove code that is no longer relevant to
-Setuptools (such as the setuptools patching code).
-
-Next, in the the merge branch, create another base from at the point where the
-fork occurred (such that the code is still essentially an older but pristine
-setuptools). This base can be found as 955792b069d0. This creates two heads
-in the merge branch, each with a basis in the fork.
-
-Then, repeatedly copy changes for a
-single file or small group of files from a late revision of that file in the
-'setuptools-0.6' branch (1aae1efe5733 was used) and commit those changes on
-the setuptools-only head. That head is then merged with the head with
-Distribute changes. It is in this Mercurial
-merge operation that the fundamental differences between Distribute and
-Setuptools are reconciled, but since only a single file or small set of files
-are used, the scope is limited.
-
-Finally, once all the challenging files have been reconciled and merged, the
-remaining changes from the setuptools-0.6 branch are merged, deferring to the
-reconciled changes (a1fa855a5a62 and 160ccaa46be0).
-
-Originally, jaraco attempted all of this using anonymous heads in the
-Distribute branch, but later realized this technique made for a somewhat
-unclear merge process, so the changes were re-committed as described above
-for clarity. In this way, the "distribute" and "setuptools" branches can
-continue to track the official Distribute changesets.
-
-Concessions
-===========
-
-With the merge of Setuptools and Distribute, the following concessions were
-made:
-
-Differences from setuptools 0.6c12:
-
-Major Changes
--------------
-
-* Python 3 support.
-* Improved support for GAE.
-* Support `PEP-370 <http://www.python.org/dev/peps/pep-0370/>`_ per-user site
-  packages.
-* Sort order of Distributions in pkg_resources now prefers PyPI to external
-  links (Distribute issue 163).
-* Python 2.4 or greater is required (drop support for Python 2.3).
-
-Minor Changes
--------------
-
-* Wording of some output has changed to replace contractions with their
-  canonical form (i.e. prefer "could not" to "couldn't").
-* Manifest files are only written for 32-bit .exe launchers.
-
-Differences from Distribute 0.6.36:
-
-Major Changes
--------------
-
-* The _distribute property of the setuptools module has been removed.
-* Distributions are once again installed as zipped eggs by default, per the
-  rationale given in `the seminal bug report
-  <http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
-  should remain and no substantial justification was given in the `Distribute
-  report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
-
-Minor Changes
--------------
-
-* The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
-  has been rolled-back, as the comment on the ticket indicates that the patch
-  addressed a symptom and not the fundamental issue.
-* ``easy_install`` (the command) once again honors setup.cfg if found in the
-  current directory. The "mis-behavior" characterized in `#99
-  <https://bitbucket.org/tarek/distribute/issue/99>`_ is actually intended
-  behavior, and no substantial rationale was given for the deviation.

From ceb604c40ef9d095942952e7bb535bf8dd3295ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2015 13:36:04 -0400
Subject: [PATCH 5172/8469] Update documentation to reflect no integrated SCM
 support.

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 0feb09ea95..0646eff5ac 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2595,8 +2595,8 @@ those methods' docstrings for more details.
 Adding Support for Other Revision Control Systems
 -------------------------------------------------
 
-If you would like to create a plugin for ``setuptools`` to find files in other
-source control systems besides CVS and Subversion, you can do so by adding an
+If you would like to create a plugin for ``setuptools`` to find files in
+source control systems, you can do so by adding an
 entry point to the ``setuptools.file_finders`` group.  The entry point should
 be a function accepting a single directory name, and should yield
 all the filenames within that directory (and any subdirectories thereof) that

From 5fcd56e4962e04ba01c278f492f4a95e581d5882 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2015 13:37:35 -0400
Subject: [PATCH 5173/8469] Remove cruft from Subclassing section

---
 docs/setuptools.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 0646eff5ac..e2753cba50 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2652,9 +2652,7 @@ Subclassing ``Command``
 -----------------------
 
 Sorry, this section isn't written yet, and neither is a lot of what's below
-this point, except for the change log.  You might want to `subscribe to changes
-in this page <setuptools?action=subscribe>`_ to see when new documentation is
-added or updated.
+this point.
 
 XXX
 

From abf566993bb10869d6003279bff292e0e5044120 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 13:30:29 -0400
Subject: [PATCH 5174/8469] Update changelog

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2ad565bc24..bce05c5ef7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ CHANGES
   manipulation. If so, the default behavior can be retained by setting
   the variable to "rewrite".
 
+* Issue #257: ``easy_install --version`` now shows more detail
+  about the installation location and Python version.
+
 ----
 18.2
 ----

From bbb481088c030bed9c837068d0a3b956c2e26446 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 13:45:21 -0400
Subject: [PATCH 5175/8469] Extract version handling as a separate method

---
 setuptools/command/easy_install.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 62c24d77ca..45d180bb3c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -215,12 +215,19 @@ def _delete_path(self, path):
         remover = rmtree if is_tree else os.unlink
         remover(path)
 
+    @staticmethod
+    def _render_version():
+        """
+        Render the Setuptools version and installation details, then exit.
+        """
+        ver = sys.version[:3]
+        dist = get_distribution('setuptools')
+        tmpl = 'setuptools {dist.version} from {dist.location} (Python {ver})'
+        print(tmpl.format(**locals()))
+        raise SystemExit()
+
     def finalize_options(self):
-        if self.version:
-            dist = get_distribution('setuptools')
-            print('setuptools %s from %s (python %s)' % (
-                dist.version, dist.location, sys.version[:3]))
-            sys.exit()
+        self.version and self._render_version()
 
         py_version = sys.version.split()[0]
         prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')

From 421db46870409b6b0cf797dac8869fddc8156191 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 13:59:27 -0400
Subject: [PATCH 5176/8469] Python 3.6 isn't yet a thing, apparently.

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1a425747fa..2b367a6dda 100755
--- a/setup.py
+++ b/setup.py
@@ -145,7 +145,6 @@ def _gen_console_scripts():
         Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
-        Programming Language :: Python :: 3.6
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration

From aba8a0c034fb9a0917d5a7d3508c87a800666718 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 14:02:32 -0400
Subject: [PATCH 5177/8469] Added tag 18.3 for changeset b59320212c83

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 447b5cdb4d..40769986c1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -218,3 +218,4 @@ fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
 e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1
 c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
 1a981f2e5031f55267dc2a28fa1b42274a1b64b2 18.2
+b59320212c8371d0be9e5e6c5f7eec392124c009 18.3

From c8364b9cf2eeccf684777e53ae4abad2e4fc30b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 14:06:13 -0400
Subject: [PATCH 5178/8469] Bumped to 18.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a13ce1568a..53988038d1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.3"
+DEFAULT_VERSION = "18.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 861921f0bf..0cf7321a05 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.3'
+__version__ = '18.4'

From 9366bb0996cd7c8d3f77ee45f84ddd77f7ded8b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 22:30:23 -0400
Subject: [PATCH 5179/8469] Add tests capturing expected behavior, including
 failure to match expectation indicated in docstring.

---
 setuptools/tests/test_setuptools.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 setuptools/tests/test_setuptools.py

diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
new file mode 100644
index 0000000000..f6bec644d1
--- /dev/null
+++ b/setuptools/tests/test_setuptools.py
@@ -0,0 +1,24 @@
+import pytest
+
+import setuptools
+
+
+@pytest.fixture
+def example_source(tmpdir):
+    tmpdir.mkdir('foo')
+    (tmpdir / 'foo/bar.py').write('')
+    (tmpdir / 'readme.txt').write('')
+    return tmpdir
+
+
+def test_findall(example_source):
+    found = list(setuptools.findall(str(example_source)))
+    expected = ['readme.txt', 'foo/bar.py']
+    assert found == expected
+
+
+def test_findall_curdir(example_source):
+    with example_source.as_cwd():
+        found = list(setuptools.findall())
+    expected = ['readme.txt', 'foo/bar.py']
+    assert found == expected

From 3c0d3a91f64a9174f6e3473bbcea3be42045004a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 22:35:48 -0400
Subject: [PATCH 5180/8469] Update docstring and test to match long-standing
 expectation in behavior.

---
 setuptools/__init__.py              | 5 +++--
 setuptools/tests/test_setuptools.py | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2c492446a6..63ee15ed6e 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -137,8 +137,9 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
 distutils.core.Command = Command    # we can't patch distutils.cmd, alas
 
 def findall(dir = os.curdir):
-    """Find all files under 'dir' and return the list of full filenames
-    (relative to 'dir').
+    """
+    Find all files under 'dir' and return the list of full filenames.
+    Unless dir is '.', return full filenames with dir prepended.
     """
     all_files = []
     for base, dirs, files in os.walk(dir, followlinks=True):
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index f6bec644d1..e1a06c96da 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -14,6 +14,7 @@ def example_source(tmpdir):
 def test_findall(example_source):
     found = list(setuptools.findall(str(example_source)))
     expected = ['readme.txt', 'foo/bar.py']
+    expected = [example_source.join(fn) for fn in expected]
     assert found == expected
 
 

From 32a47417750420524e1270cc5e3fc749eb9e5a89 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Sep 2015 22:58:47 -0400
Subject: [PATCH 5181/8469] Restore old behavior for calculating the base.
 Fixes failing test and fixes #425.

---
 setuptools/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index e939033612..490026190f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -145,7 +145,9 @@ def findall(dir=os.curdir):
     Unless dir is '.', return full filenames with dir prepended.
     """
     def _prepend(base):
-        return functools.partial(os.path.join, os.path.relpath(base, dir))
+        if base == os.curdir or base.startswith(os.curdir + os.sep):
+            base = base[2:]
+        return functools.partial(os.path.join, base)
 
     return [
         file

From 38a40150670a18742a85435ed2baba422c002a68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Sep 2015 01:16:14 -0400
Subject: [PATCH 5182/8469] Another refactor of findall, this time separating
 the simple walk / join operation from the conditional relative path.

---
 setuptools/__init__.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 490026190f..a7d75ed44c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -139,22 +139,29 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
 # we can't patch distutils.cmd, alas
 distutils.core.Command = Command
 
+
+def _find_all_simple(path):
+    """
+    Find all files under 'path'
+    """
+    return (
+        os.path.join(base, file)
+        for base, dirs, files in os.walk(path, followlinks=True)
+        for file in files
+    )
+
+
 def findall(dir=os.curdir):
     """
     Find all files under 'dir' and return the list of full filenames.
     Unless dir is '.', return full filenames with dir prepended.
     """
-    def _prepend(base):
-        if base == os.curdir or base.startswith(os.curdir + os.sep):
-            base = base[2:]
-        return functools.partial(os.path.join, base)
-
-    return [
-        file
-        for base, dirs, files in os.walk(dir, followlinks=True)
-        for file in map(_prepend(base), files)
-        if os.path.isfile(file)
-    ]
+    files = _find_all_simple(dir)
+    if dir == os.curdir:
+        make_rel = functools.partial(os.path.relpath, start=dir)
+        files = map(make_rel, files)
+    return list(files)
+
 
 # fix findall bug in distutils (http://bugs.python.org/issue12885)
 distutils.filelist.findall = findall

From a56aee24962dea7f9d8b46fbedb79fec988ee246 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Sep 2015 02:23:09 -0400
Subject: [PATCH 5183/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bce05c5ef7..4700f0674d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+------
+18.3.1
+------
+
+* Issue #425: Correct regression in setuptools.findall.
+
 ----
 18.3
 ----

From 9aec33a0cf4a3bcd152d3d142946a98530588af4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Sep 2015 02:23:25 -0400
Subject: [PATCH 5184/8469] Bumped to 18.3.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 53988038d1..15104c59cb 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.4"
+DEFAULT_VERSION = "18.3.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 0cf7321a05..12568fa212 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.4'
+__version__ = '18.3.1'

From eb749460d656527d90322f380730e01362c254d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Sep 2015 09:15:48 +0200
Subject: [PATCH 5185/8469] Added tag 18.3.1 for changeset 7a705b610abb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 40769986c1..e225e3694d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -219,3 +219,4 @@ e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1
 c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
 1a981f2e5031f55267dc2a28fa1b42274a1b64b2 18.2
 b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
+7a705b610abb1177ca169311c4ee261f3e4f0957 18.3.1

From 0846f06f326b9f369772b6fe1c980434bc9b9c1b Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 8 Sep 2015 21:39:01 -0700
Subject: [PATCH 5186/8469] Issue #25027: Reverts partial-static build options
 and adds vcruntime140.dll to Windows installation.

---
 _msvccompiler.py           | 76 +++++++++++++++++++++++++++++++-------
 tests/test_msvccompiler.py | 58 ++++++++++++++++++++++++++---
 2 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index b344616e60..82b78a0ffe 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -14,6 +14,8 @@
 # ported to VS 2015 by Steve Dower
 
 import os
+import shutil
+import stat
 import subprocess
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
@@ -25,7 +27,7 @@
 import winreg
 from itertools import count
 
-def _find_vcvarsall():
+def _find_vcvarsall(plat_spec):
     with winreg.OpenKeyEx(
         winreg.HKEY_LOCAL_MACHINE,
         r"Software\Microsoft\VisualStudio\SxS\VC7",
@@ -33,7 +35,7 @@ def _find_vcvarsall():
     ) as key:
         if not key:
             log.debug("Visual C++ is not registered")
-            return None
+            return None, None
 
         best_version = 0
         best_dir = None
@@ -51,14 +53,23 @@ def _find_vcvarsall():
                     best_version, best_dir = version, vc_dir
         if not best_version:
             log.debug("No suitable Visual C++ version found")
-            return None
+            return None, None
 
         vcvarsall = os.path.join(best_dir, "vcvarsall.bat")
         if not os.path.isfile(vcvarsall):
             log.debug("%s cannot be found", vcvarsall)
-            return None
+            return None, None
 
-        return vcvarsall
+        vcruntime = None
+        vcruntime_spec = _VCVARS_PLAT_TO_VCRUNTIME_REDIST.get(plat_spec)
+        if vcruntime_spec:
+            vcruntime = os.path.join(best_dir,
+                vcruntime_spec.format(best_version))
+            if not os.path.isfile(vcruntime):
+                log.debug("%s cannot be found", vcruntime)
+                vcruntime = None
+
+        return vcvarsall, vcruntime
 
 def _get_vc_env(plat_spec):
     if os.getenv("DISTUTILS_USE_SDK"):
@@ -67,7 +78,7 @@ def _get_vc_env(plat_spec):
             for key, value in os.environ.items()
         }
 
-    vcvarsall = _find_vcvarsall()
+    vcvarsall, vcruntime = _find_vcvarsall(plat_spec)
     if not vcvarsall:
         raise DistutilsPlatformError("Unable to find vcvarsall.bat")
 
@@ -83,12 +94,16 @@ def _get_vc_env(plat_spec):
         raise DistutilsPlatformError("Error executing {}"
                 .format(exc.cmd))
 
-    return {
+    env = {
         key.lower(): value
         for key, _, value in
         (line.partition('=') for line in out.splitlines())
         if key and value
     }
+    
+    if vcruntime:
+        env['py_vcruntime_redist'] = vcruntime
+    return env
 
 def _find_exe(exe, paths=None):
     """Return path to an MSVC executable program.
@@ -115,6 +130,20 @@ def _find_exe(exe, paths=None):
     'win-amd64' : 'amd64',
 }
 
+# A map keyed by get_platform() return values to the file under
+# the VC install directory containing the vcruntime redistributable.
+_VCVARS_PLAT_TO_VCRUNTIME_REDIST = {
+    'x86' : 'redist\\x86\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
+    'amd64' : 'redist\\x64\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
+    'x86_amd64' : 'redist\\x64\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
+}
+
+# A set containing the DLLs that are guaranteed to be available for
+# all micro versions of this Python version. Known extension
+# dependencies that are not in this set will be copied to the output
+# path.
+_BUNDLED_DLLS = frozenset(['vcruntime140.dll'])
+
 class MSVCCompiler(CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
        as defined by the CCompiler abstract class."""
@@ -189,6 +218,7 @@ def initialize(self, plat_name=None):
         self.rc = _find_exe("rc.exe", paths)   # resource compiler
         self.mc = _find_exe("mc.exe", paths)   # message compiler
         self.mt = _find_exe("mt.exe", paths)   # message compiler
+        self._vcruntime_redist = vc_env.get('py_vcruntime_redist', '')
 
         for dir in vc_env.get('include', '').split(os.pathsep):
             if dir:
@@ -199,20 +229,26 @@ def initialize(self, plat_name=None):
                 self.add_library_dir(dir)
 
         self.preprocess_options = None
-        # Use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
+        # If vcruntime_redist is available, link against it dynamically. Otherwise,
+        # use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
         # later to dynamically link to ucrtbase but not vcruntime.
         self.compile_options = [
-            '/nologo', '/Ox', '/MT', '/W3', '/GL', '/DNDEBUG'
+            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
         ]
+        self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
+        
         self.compile_options_debug = [
-            '/nologo', '/Od', '/MTd', '/Zi', '/W3', '/D_DEBUG'
+            '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
         ]
 
         ldflags = [
-            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/nodefaultlib:libucrt.lib', 'ucrt.lib',
+            '/nologo', '/INCREMENTAL:NO', '/LTCG'
         ]
+        if not self._vcruntime_redist:
+            ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
+
         ldflags_debug = [
-            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL', '/nodefaultlib:libucrtd.lib', 'ucrtd.lib',
+            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
         ]
 
         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
@@ -446,15 +482,29 @@ def link(self,
             if extra_postargs:
                 ld_args.extend(extra_postargs)
 
-            self.mkpath(os.path.dirname(output_filename))
+            output_dir = os.path.dirname(os.path.abspath(output_filename))
+            self.mkpath(output_dir)
             try:
                 log.debug('Executing "%s" %s', self.linker, ' '.join(ld_args))
                 self.spawn([self.linker] + ld_args)
+                self._copy_vcruntime(output_dir)
             except DistutilsExecError as msg:
                 raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
+    def _copy_vcruntime(self, output_dir):
+        vcruntime = self._vcruntime_redist
+        if not vcruntime or not os.path.isfile(vcruntime):
+            return
+
+        if os.path.basename(vcruntime).lower() in _BUNDLED_DLLS:
+            return
+
+        log.debug('Copying "%s"', vcruntime)
+        vcruntime = shutil.copy(vcruntime, output_dir)
+        os.chmod(vcruntime, stat.S_IWRITE)
+
     def spawn(self, cmd):
         old_path = os.getenv('path')
         try:
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index 1f8890792e..0b8a69fa5a 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -3,6 +3,8 @@
 import unittest
 import os
 
+import distutils._msvccompiler as _msvccompiler
+
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
 from test.support import run_unittest
@@ -19,19 +21,65 @@ def test_no_compiler(self):
         # makes sure query_vcvarsall raises
         # a DistutilsPlatformError if the compiler
         # is not found
-        from distutils._msvccompiler import _get_vc_env
-        def _find_vcvarsall():
-            return None
+        def _find_vcvarsall(plat_spec):
+            return None, None
 
-        import distutils._msvccompiler as _msvccompiler
         old_find_vcvarsall = _msvccompiler._find_vcvarsall
         _msvccompiler._find_vcvarsall = _find_vcvarsall
         try:
-            self.assertRaises(DistutilsPlatformError, _get_vc_env,
+            self.assertRaises(DistutilsPlatformError,
+                              _msvccompiler._get_vc_env,
                              'wont find this version')
         finally:
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
+    def test_compiler_options(self):
+        # suppress path to vcruntime from _find_vcvarsall to
+        # check that /MT is added to compile options
+        old_find_vcvarsall = _msvccompiler._find_vcvarsall
+        def _find_vcvarsall(plat_spec):
+            return old_find_vcvarsall(plat_spec)[0], None
+        _msvccompiler._find_vcvarsall = _find_vcvarsall
+        try:
+            compiler = _msvccompiler.MSVCCompiler()
+            compiler.initialize()
+
+            self.assertIn('/MT', compiler.compile_options)
+            self.assertNotIn('/MD', compiler.compile_options)
+        finally:
+            _msvccompiler._find_vcvarsall = old_find_vcvarsall
+
+    def test_vcruntime_copy(self):
+        # force path to a known file - it doesn't matter
+        # what we copy as long as its name is not in
+        # _msvccompiler._BUNDLED_DLLS
+        old_find_vcvarsall = _msvccompiler._find_vcvarsall
+        def _find_vcvarsall(plat_spec):
+            return old_find_vcvarsall(plat_spec)[0], __file__
+        _msvccompiler._find_vcvarsall = _find_vcvarsall
+        try:
+            tempdir = self.mkdtemp()
+            compiler = _msvccompiler.MSVCCompiler()
+            compiler.initialize()
+            compiler._copy_vcruntime(tempdir)
+
+            self.assertTrue(os.path.isfile(os.path.join(
+                tempdir, os.path.basename(__file__))))
+        finally:
+            _msvccompiler._find_vcvarsall = old_find_vcvarsall
+
+    def test_vcruntime_skip_copy(self):
+        tempdir = self.mkdtemp()
+        compiler = _msvccompiler.MSVCCompiler()
+        compiler.initialize()
+        dll = compiler._vcruntime_redist
+        self.assertTrue(os.path.isfile(dll))
+        
+        compiler._copy_vcruntime(tempdir)
+
+        self.assertFalse(os.path.isfile(os.path.join(
+            tempdir, os.path.basename(dll))))
+
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 

From fd5d6fbed8f41d9ad678d2b2ace8c1d6564f00a3 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 8 Sep 2015 23:42:51 -0700
Subject: [PATCH 5187/8469] Moves distutils test import within skippable class.

---
 tests/test_msvccompiler.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index 0b8a69fa5a..874d6035e8 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -3,8 +3,6 @@
 import unittest
 import os
 
-import distutils._msvccompiler as _msvccompiler
-
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
 from test.support import run_unittest
@@ -18,6 +16,7 @@ class msvccompilerTestCase(support.TempdirManager,
                             unittest.TestCase):
 
     def test_no_compiler(self):
+        import distutils._msvccompiler as _msvccompiler
         # makes sure query_vcvarsall raises
         # a DistutilsPlatformError if the compiler
         # is not found
@@ -34,6 +33,7 @@ def _find_vcvarsall(plat_spec):
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_compiler_options(self):
+        import distutils._msvccompiler as _msvccompiler
         # suppress path to vcruntime from _find_vcvarsall to
         # check that /MT is added to compile options
         old_find_vcvarsall = _msvccompiler._find_vcvarsall
@@ -50,6 +50,7 @@ def _find_vcvarsall(plat_spec):
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_vcruntime_copy(self):
+        import distutils._msvccompiler as _msvccompiler
         # force path to a known file - it doesn't matter
         # what we copy as long as its name is not in
         # _msvccompiler._BUNDLED_DLLS
@@ -69,6 +70,8 @@ def _find_vcvarsall(plat_spec):
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_vcruntime_skip_copy(self):
+        import distutils._msvccompiler as _msvccompiler
+
         tempdir = self.mkdtemp()
         compiler = _msvccompiler.MSVCCompiler()
         compiler.initialize()

From 465364f3af646e6285e2c6fd461fd44113164ff7 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Wed, 9 Sep 2015 06:54:57 -0700
Subject: [PATCH 5188/8469] Whitespace fixes to make the commit hook on
 hg.python.org happy.

---
 _msvccompiler.py           | 4 ++--
 tests/test_msvccompiler.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 82b78a0ffe..03a5f10ee7 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -100,7 +100,7 @@ def _get_vc_env(plat_spec):
         (line.partition('=') for line in out.splitlines())
         if key and value
     }
-    
+
     if vcruntime:
         env['py_vcruntime_redist'] = vcruntime
     return env
@@ -236,7 +236,7 @@ def initialize(self, plat_name=None):
             '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
         ]
         self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
-        
+
         self.compile_options_debug = [
             '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
         ]
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index 874d6035e8..c4d911ff83 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -77,7 +77,7 @@ def test_vcruntime_skip_copy(self):
         compiler.initialize()
         dll = compiler._vcruntime_redist
         self.assertTrue(os.path.isfile(dll))
-        
+
         compiler._copy_vcruntime(tempdir)
 
         self.assertFalse(os.path.isfile(os.path.join(

From 94416707fd59a65f4a8f7f70541d6b3fc018b626 Mon Sep 17 00:00:00 2001
From: Andy Freeland <andy.freeland@redjack.com>
Date: Thu, 10 Sep 2015 01:03:42 -0400
Subject: [PATCH 5189/8469] Add support for python_platform_implementation
 environment marker

This patch adds support for the 'python_platform_implementation'
environment marker as defined by PEP-0426:
https://www.python.org/dev/peps/pep-0426/#environment-markers
---
 pkg_resources/__init__.py   | 1 +
 pkg_resources/api_tests.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 42ddcf7c17..639dc4a6ee 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1403,6 +1403,7 @@ class MarkerEvaluation(object):
         'python_version': lambda: platform.python_version()[:3],
         'platform_version': platform.version,
         'platform_machine': platform.machine,
+        'platform_python_implementation': platform.python_implementation,
         'python_implementation': platform.python_implementation,
     }
 
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 1c852e817c..d28db0f5f8 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -420,3 +420,6 @@ Environment Markers
 
     >>> em("python_version > '2.5'")
     True
+
+    >>> im("platform_python_implementation=='CPython'")
+    False

From 2509f6beef005a88eede79503086f8c0ba1b484c Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 12 Sep 2015 17:20:47 -0700
Subject: [PATCH 5190/8469] fix name of argument in docstring and the docs
 (closes #25076)

Patch by TAKASE Arihiro.
---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 911e84dd3b..e93a27363f 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -752,7 +752,7 @@ def runtime_library_dir_option(self, dir):
         raise NotImplementedError
 
     def library_option(self, lib):
-        """Return the compiler option to add 'dir' to the list of libraries
+        """Return the compiler option to add 'lib' to the list of libraries
         linked into the shared library or executable.
         """
         raise NotImplementedError

From 0c984fb56249c3d58cf1be3015e36afab77c184c Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sun, 13 Sep 2015 18:01:43 +0000
Subject: [PATCH 5191/8469] Add the PyPA Code of Conduct

---
 README.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.txt b/README.txt
index e21c40697a..799ad0088f 100755
--- a/README.txt
+++ b/README.txt
@@ -223,3 +223,14 @@ Credits
   the Python Packaging Authority (PyPA) and the larger Python community.
 
 .. _files:
+
+
+---------------
+Code of Conduct
+---------------
+
+Everyone interacting in the setuptools project's codebases, issue trackers,
+chat rooms, and mailing lists is expected to follow the
+`PyPA Code of Conduct`_.
+
+.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/

From 30a15dcce774cd9ed2a3f09644aea42fb9f1e819 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:00:22 +0200
Subject: [PATCH 5192/8469] Add another test capturing issue described in
 http://bugs.python.org/issue12885

---
 setuptools/tests/test_setuptools.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index f6bec644d1..83c42e3e84 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -1,3 +1,5 @@
+import os
+
 import pytest
 
 import setuptools
@@ -22,3 +24,24 @@ def test_findall_curdir(example_source):
         found = list(setuptools.findall())
     expected = ['readme.txt', 'foo/bar.py']
     assert found == expected
+
+
+@pytest.fixture
+def can_symlink(tmpdir):
+    """
+    Skip if cannot create a symbolic link
+    """
+    link_fn = 'link'
+    target_fn = 'target'
+    try:
+        os.symlink(target_fn, link_fn)
+    except (OSError, NotImplementedError, AttributeError):
+        pytest.skip("Cannot create symbolic links")
+    os.remove(link_fn)
+
+
+def test_findall_missing_symlink(tmpdir, can_symlink):
+    with tmpdir.as_cwd():
+        os.symlink('foo', 'bar')
+        found = list(setuptools.findall())
+        assert found == []

From 22a8ace27c7d7aadfa0fa9311686541a2169092c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:07:48 +0200
Subject: [PATCH 5193/8469] Only return results that are files. Fixes failing
 test and corrects additional regression in 18.3.

---
 setuptools/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a7d75ed44c..712ec082b0 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -144,11 +144,12 @@ def _find_all_simple(path):
     """
     Find all files under 'path'
     """
-    return (
+    results = (
         os.path.join(base, file)
         for base, dirs, files in os.walk(path, followlinks=True)
         for file in files
     )
+    return filter(os.path.isfile, results)
 
 
 def findall(dir=os.curdir):

From b7236c18f5a3b4f5f44d97eb67ce9e3cc56715f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:12:15 +0200
Subject: [PATCH 5194/8469] Issue #12285: Replace implementation of findall
 with implementation from Setuptools 7ce820d524db.

---
 filelist.py | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/filelist.py b/filelist.py
index db3f7a9680..6522e69f06 100644
--- a/filelist.py
+++ b/filelist.py
@@ -6,6 +6,7 @@
 
 import os, re
 import fnmatch
+import functools
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
@@ -242,35 +243,28 @@ def exclude_pattern (self, pattern,
 # ----------------------------------------------------------------------
 # Utility functions
 
+def _find_all_simple(path):
+    """
+    Find all files under 'path'
+    """
+    results = (
+        os.path.join(base, file)
+        for base, dirs, files in os.walk(path, followlinks=True)
+        for file in files
+    )
+    return filter(os.path.isfile, results)
+
+
 def findall(dir=os.curdir):
-    """Find all files under 'dir' and return the list of full filenames
-    (relative to 'dir').
     """
-    from stat import ST_MODE, S_ISREG, S_ISDIR, S_ISLNK
-
-    list = []
-    stack = [dir]
-    pop = stack.pop
-    push = stack.append
-
-    while stack:
-        dir = pop()
-        names = os.listdir(dir)
-
-        for name in names:
-            if dir != os.curdir:        # avoid the dreaded "./" syndrome
-                fullname = os.path.join(dir, name)
-            else:
-                fullname = name
-
-            # Avoid excess stat calls -- just one will do, thank you!
-            stat = os.stat(fullname)
-            mode = stat[ST_MODE]
-            if S_ISREG(mode):
-                list.append(fullname)
-            elif S_ISDIR(mode) and not S_ISLNK(mode):
-                push(fullname)
-    return list
+    Find all files under 'dir' and return the list of full filenames.
+    Unless dir is '.', return full filenames with dir prepended.
+    """
+    files = _find_all_simple(dir)
+    if dir == os.curdir:
+        make_rel = functools.partial(os.path.relpath, start=dir)
+        files = map(make_rel, files)
+    return list(files)
 
 
 def glob_to_re(pattern):

From 7e28912d0cfd017577df59c465bf770a8182d232 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:26:38 +0200
Subject: [PATCH 5195/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4700f0674d..32dd44860b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+------
+18.3.2
+------
+
+* Correct another regression in setuptools.findall
+  where the fix for Python #12885 was lost.
+
 ------
 18.3.1
 ------
@@ -26,6 +33,9 @@ CHANGES
 * Issue #257: ``easy_install --version`` now shows more detail
   about the installation location and Python version.
 
+* Refactor setuptools.findall in preparation for re-submission
+  back to distutils.
+
 ----
 18.2
 ----

From ec01ecef42dd6f9813a9beca71dfdb92fb539719 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:27:06 +0200
Subject: [PATCH 5196/8469] Bumped to 18.3.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 15104c59cb..a07dd4d5b1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.3.1"
+DEFAULT_VERSION = "18.3.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 12568fa212..787141c772 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.3.1'
+__version__ = '18.3.2'

From 2bec03891c629702face5f7f1cace2e73e6b8fe5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:27:10 +0200
Subject: [PATCH 5197/8469] Added tag 18.3.2 for changeset 1e120f04bcaa

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e225e3694d..c72034f40b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -220,3 +220,4 @@ c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
 1a981f2e5031f55267dc2a28fa1b42274a1b64b2 18.2
 b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 7a705b610abb1177ca169311c4ee261f3e4f0957 18.3.1
+1e120f04bcaa2421c4df0eb6678c3019ba4a82f6 18.3.2

From 351f51dcefd0fc260f005d30eb60f23a4fcd3ac1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 19 Sep 2015 18:33:23 +0200
Subject: [PATCH 5198/8469] Bumped to 18.3.3 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index a07dd4d5b1..2247dd7979 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.3.2"
+DEFAULT_VERSION = "18.3.3"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 787141c772..79dd2dabcd 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.3.2'
+__version__ = '18.3.3'

From 9f5f2ac2aa55dbac1dfe9da6c7a46d82355c75fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Sep 2015 07:29:18 -0400
Subject: [PATCH 5199/8469] Simplify implementation of Requirement.parse.

---
 pkg_resources/__init__.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 42ddcf7c17..ce8f2e98ec 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2983,12 +2983,8 @@ def __repr__(self): return "Requirement.parse(%r)" % str(self)
 
     @staticmethod
     def parse(s):
-        reqs = list(parse_requirements(s))
-        if reqs:
-            if len(reqs) == 1:
-                return reqs[0]
-            raise ValueError("Expected only one requirement", s)
-        raise ValueError("No requirements found", s)
+        req, = parse_requirements(s)
+        return req
 
 
 def _get_mro(cls):

From bc3389a6048b23871e50eaab20d8df06ba3ff53d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Sep 2015 07:50:30 -0400
Subject: [PATCH 5200/8469] Extract _requirement_spec method for rendering the
 requirement specification for scripts. Ref #439.

---
 setuptools/command/easy_install.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 45d180bb3c..2faff4c253 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -766,7 +766,7 @@ def install_wrapper_scripts(self, dist):
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""
-        spec = str(dist.as_requirement())
+        spec = self._requirement_spec(dist)
         is_script = is_python_script(script_text, script_name)
 
         if is_script:
@@ -774,6 +774,10 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
                            self._load_template(dev_path) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
+    @staticmethod
+    def _requirement_spec(dist):
+        return str(dist.as_requirement())
+
     @staticmethod
     def _load_template(dev_path):
         """

From b9e23adff55624ba2c3527c9f807ec7962b58c5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Sep 2015 08:07:30 -0400
Subject: [PATCH 5201/8469] Backed out changeset 38b415c244b8

---
 setuptools/command/easy_install.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2faff4c253..45d180bb3c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -766,7 +766,7 @@ def install_wrapper_scripts(self, dist):
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""
-        spec = self._requirement_spec(dist)
+        spec = str(dist.as_requirement())
         is_script = is_python_script(script_text, script_name)
 
         if is_script:
@@ -774,10 +774,6 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
                            self._load_template(dev_path) % locals())
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
-    @staticmethod
-    def _requirement_spec(dist):
-        return str(dist.as_requirement())
-
     @staticmethod
     def _load_template(dev_path):
         """

From f8a519501546f5d5f81ad00ecc7d160bd72e748e Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 5 Oct 2015 10:35:00 -0700
Subject: [PATCH 5202/8469] Issue #25316: distutils raises OSError instead of
 DistutilsPlatformError when MSVC is not installed.

---
 _msvccompiler.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 03a5f10ee7..10a9ffda24 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -28,15 +28,17 @@
 from itertools import count
 
 def _find_vcvarsall(plat_spec):
-    with winreg.OpenKeyEx(
-        winreg.HKEY_LOCAL_MACHINE,
-        r"Software\Microsoft\VisualStudio\SxS\VC7",
-        access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
-    ) as key:
-        if not key:
-            log.debug("Visual C++ is not registered")
-            return None, None
+    try:
+        key = winreg.OpenKeyEx(
+            winreg.HKEY_LOCAL_MACHINE,
+            r"Software\Microsoft\VisualStudio\SxS\VC7",
+            access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+        )
+    except OSError:
+        log.debug("Visual C++ is not registered")
+        return None, None
 
+    with key:
         best_version = 0
         best_dir = None
         for i in count():

From 0a30d49169f5e73c86f452f284d10ed4b1646ff4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 19:59:20 -0400
Subject: [PATCH 5203/8469] Calculate test_args on demand rather than setting
 an attribute.

---
 setuptools/command/test.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 42689f7012..a80d91adb2 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -72,10 +72,6 @@ def finalize_options(self):
                 "You may specify a module or a suite, but not both"
             )
 
-        self.test_args = [self.test_suite]
-
-        if self.verbose:
-            self.test_args.insert(0, '--verbose')
         if self.test_loader is None:
             self.test_loader = getattr(self.distribution, 'test_loader', None)
         if self.test_loader is None:
@@ -83,6 +79,11 @@ def finalize_options(self):
         if self.test_runner is None:
             self.test_runner = getattr(self.distribution, 'test_runner', None)
 
+    @property
+    def test_args(self):
+        verbose = ['--verbose'] if self.verbose else []
+        return verbose + [self.test_suite]
+
     def with_project_on_sys_path(self, func):
         with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)
 

From a33e201d1a86dd108e8641f641ff24c7f00ba054 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:03:33 -0400
Subject: [PATCH 5204/8469] Move value checking into its own block.

---
 setuptools/command/test.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index a80d91adb2..4d859808e7 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -62,15 +62,16 @@ def initialize_options(self):
 
     def finalize_options(self):
 
+        if self.test_suite and self.test_module:
+            raise DistutilsOptionError(
+                "You may specify a module or a suite, but not both"
+            )
+
         if self.test_suite is None:
             if self.test_module is None:
                 self.test_suite = self.distribution.test_suite
             else:
                 self.test_suite = self.test_module + ".test_suite"
-        elif self.test_module:
-            raise DistutilsOptionError(
-                "You may specify a module or a suite, but not both"
-            )
 
         if self.test_loader is None:
             self.test_loader = getattr(self.distribution, 'test_loader', None)

From 82f3e20506b4e2646880ec7ac5bb6b10e03e8c40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:03:59 -0400
Subject: [PATCH 5205/8469] Extract variable for nicer indentation

---
 setuptools/command/test.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 4d859808e7..225f4673ce 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -63,9 +63,8 @@ def initialize_options(self):
     def finalize_options(self):
 
         if self.test_suite and self.test_module:
-            raise DistutilsOptionError(
-                "You may specify a module or a suite, but not both"
-            )
+            msg = "You may specify a module or a suite, but not both"
+            raise DistutilsOptionError(msg)
 
         if self.test_suite is None:
             if self.test_module is None:

From 552ca4d4c712c68c90601ff3f70cf4115b1636ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:12:12 -0400
Subject: [PATCH 5206/8469] Resolve test_suite directly rather than referencing
 test_args

---
 setuptools/command/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 225f4673ce..3e9f5f72c4 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -147,7 +147,7 @@ def run_tests(self):
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
         if PY3 and getattr(self.distribution, 'use_2to3', False):
-            module = self.test_args[-1].split('.')[0]
+            module = self.test_suite.split('.')[0]
             if module in _namespace_packages:
                 del_modules = []
                 if module in sys.modules:

From 476381578991476afeca2e28a96b51fdbef50c13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:15:25 -0400
Subject: [PATCH 5207/8469] Just pass 'unittest' as argv[0] - the full path to
 the file shouldn't be relevant

---
 setuptools/command/test.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 3e9f5f72c4..5f93d92eeb 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,6 +1,5 @@
 from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
-import unittest
 import sys
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
@@ -159,7 +158,7 @@ def run_tests(self):
                 list(map(sys.modules.__delitem__, del_modules))
 
         unittest_main(
-            None, None, [unittest.__file__] + self.test_args,
+            None, None, ['unittest'] + self.test_args,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
         )

From 0f14cd9c52944d924c7d9ac350e4f904b0edb0af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:16:23 -0400
Subject: [PATCH 5208/8469] Extract _argv property.

---
 setuptools/command/test.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 5f93d92eeb..549cfb21e5 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -158,11 +158,15 @@ def run_tests(self):
                 list(map(sys.modules.__delitem__, del_modules))
 
         unittest_main(
-            None, None, ['unittest'] + self.test_args,
+            None, None, self._argv,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
         )
 
+    @property
+    def _argv(self):
+        return ['unittest'] + self.test_args
+
     @staticmethod
     def _resolve_as_ep(val):
         """

From 9c9bfb0fc0f1f667bdabf220e939349143e0d9ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:17:37 -0400
Subject: [PATCH 5209/8469] Re-use _argv for the announcement

---
 setuptools/command/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 549cfb21e5..75d55bad54 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -134,11 +134,11 @@ def run(self):
             self.distribution.fetch_build_eggs(self.distribution.tests_require)
 
         if self.test_suite:
-            cmd = ' '.join(self.test_args)
+            cmd = ' '.join(self._argv)
             if self.dry_run:
-                self.announce('skipping "unittest %s" (dry run)' % cmd)
+                self.announce('skipping "%s" (dry run)' % cmd)
             else:
-                self.announce('running "unittest %s"' % cmd)
+                self.announce('running "%s"' % cmd)
                 self.with_project_on_sys_path(self.run_tests)
 
     def run_tests(self):

From 8223f2804628034993247add70943888d96d6348 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:38:36 -0400
Subject: [PATCH 5210/8469] Only include test_suite in args if one is
 specified. Ref #446.

---
 setuptools/command/test.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 75d55bad54..11e4a019cf 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -80,8 +80,13 @@ def finalize_options(self):
 
     @property
     def test_args(self):
-        verbose = ['--verbose'] if self.verbose else []
-        return verbose + [self.test_suite]
+        return list(self._test_args())
+
+    def _test_args(self):
+        if self.verbose:
+            yield '--verbose'
+        if self.test_suite:
+            yield self.test_suite
 
     def with_project_on_sys_path(self, func):
         with_2to3 = PY3 and getattr(self.distribution, 'use_2to3', False)

From 5a9aed6e210628d16cd446c163fa50c9841dba34 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:40:47 -0400
Subject: [PATCH 5211/8469] Accept a pattern argument, supplied by later
 versions of unittest.

---
 setuptools/command/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 11e4a019cf..13b8b46b46 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -11,7 +11,7 @@
 
 
 class ScanningLoader(TestLoader):
-    def loadTestsFromModule(self, module):
+    def loadTestsFromModule(self, module, pattern=None):
         """Return a suite of all tests cases contained in the given module
 
         If the module is a package, load tests from all the modules in it.

From 34910765fbafb53bec6604b730875d010a863ae2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:41:25 -0400
Subject: [PATCH 5212/8469] Always execute tests, even if no test_suite is
 supplied. Fixes #446.

---
 setuptools/command/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 13b8b46b46..9c6a8e0477 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -138,7 +138,7 @@ def run(self):
         if self.distribution.tests_require:
             self.distribution.fetch_build_eggs(self.distribution.tests_require)
 
-        if self.test_suite:
+        if True:
             cmd = ' '.join(self._argv)
             if self.dry_run:
                 self.announce('skipping "%s" (dry run)' % cmd)

From 63140936955baeaf8390ddad115af1947787f37f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:41:50 -0400
Subject: [PATCH 5213/8469] Remove unreachable branch.

---
 setuptools/command/test.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 9c6a8e0477..160e21c95e 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -138,13 +138,12 @@ def run(self):
         if self.distribution.tests_require:
             self.distribution.fetch_build_eggs(self.distribution.tests_require)
 
-        if True:
-            cmd = ' '.join(self._argv)
-            if self.dry_run:
-                self.announce('skipping "%s" (dry run)' % cmd)
-            else:
-                self.announce('running "%s"' % cmd)
-                self.with_project_on_sys_path(self.run_tests)
+        cmd = ' '.join(self._argv)
+        if self.dry_run:
+            self.announce('skipping "%s" (dry run)' % cmd)
+        else:
+            self.announce('running "%s"' % cmd)
+            self.with_project_on_sys_path(self.run_tests)
 
     def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will

From d24ca2822867ef944f959ba420a1c4cf47bae859 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 20:43:46 -0400
Subject: [PATCH 5214/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 32dd44860b..d20077535e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+18.4
+----
+
+* Issue #446: Test command now always invokes unittest, even
+  if no test suite is supplied.
+
 ------
 18.3.2
 ------

From cab9d9c40afac011cc7e12989dc387094a4f1285 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 21:04:06 -0400
Subject: [PATCH 5215/8469] Bumped to 18.4 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2247dd7979..53988038d1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.3.3"
+DEFAULT_VERSION = "18.4"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 79dd2dabcd..0cf7321a05 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.3.3'
+__version__ = '18.4'

From 23391cf15730456b0e9aad8140cf26f699ecab76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 21:04:08 -0400
Subject: [PATCH 5216/8469] Added tag 18.4 for changeset 6203335278be

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c72034f40b..d7ea9e2e30 100644
--- a/.hgtags
+++ b/.hgtags
@@ -221,3 +221,4 @@ c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
 b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 7a705b610abb1177ca169311c4ee261f3e4f0957 18.3.1
 1e120f04bcaa2421c4df0eb6678c3019ba4a82f6 18.3.2
+6203335278be7543d31790d9fba55739469a4c6c 18.4

From 513c0d0f73951677f006cb43fcbc2127154ccbe7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Oct 2015 21:05:24 -0400
Subject: [PATCH 5217/8469] Bumped to 18.5 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 53988038d1..50e0dfc69a 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.4"
+DEFAULT_VERSION = "18.5"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 0cf7321a05..1be1f7ec20 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.4'
+__version__ = '18.5'

From d1b750124e38d63b26a96e8c0921c02de3b0869d Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 19 Oct 2015 10:56:35 +0100
Subject: [PATCH 5218/8469] Corrected instructions for running tests.

The package name from pypi is `pytest`,
and running raw `py.test` results in errors.
---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 27c304e5cf..87ddf28fb5 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -94,7 +94,7 @@ The primary tests are run using py.test. To run the tests::
 
     $ python setup.py ptr
 
-Or install py.test into your environment and run ``py.test``.
+Or install ``pytest`` into your environment and run ``py.test setuptools``.
 
 Under continuous integration, additional tests may be run. See the
 ``.travis.yml`` file for full details on the tests run under Travis-CI.

From bfc525457225a7c0a45553d0fcf29592230e9855 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 19 Oct 2015 12:06:08 +0100
Subject: [PATCH 5219/8469] Added test utility for building files quickly.

And made use of it in test_egg_info.
---
 setuptools/tests/files.py         | 32 +++++++++++++++++++++++++++++++
 setuptools/tests/test_egg_info.py | 23 +++++++++++-----------
 2 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 setuptools/tests/files.py

diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
new file mode 100644
index 0000000000..4364241baa
--- /dev/null
+++ b/setuptools/tests/files.py
@@ -0,0 +1,32 @@
+import os
+
+
+def build_files(file_defs, prefix=""):
+    """
+    Build a set of files/directories, as described by the file_defs dictionary.
+
+    Each key/value pair in the dictionary is interpreted as a filename/contents
+    pair. If the contents value is a dictionary, a directory is created, and the
+    dictionary interpreted as the files within it, recursively.
+
+    For example:
+
+    {"README.txt": "A README file",
+     "foo": {
+        "__init__.py": "",
+        "bar": {
+            "__init__.py": "",
+        },
+        "baz.py": "# Some code",
+     }
+    }
+    """
+    for name, contents in file_defs.items():
+        full_name = os.path.join(prefix, name)
+        if isinstance(contents, dict):
+            if not os.path.exists(full_name):
+                os.makedirs(full_name)
+            build_files(contents, prefix=full_name)
+        else:
+            with open(full_name, 'w') as f:
+                f.write(contents)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a1caf9fd30..8d831107e8 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -4,6 +4,7 @@
 import pytest
 
 from . import environment
+from .files import build_files
 from .textwrap import DALS
 from . import contexts
 
@@ -22,14 +23,13 @@ class TestEggInfo:
         """)
 
     def _create_project(self):
-        with open('setup.py', 'w') as f:
-            f.write(self.setup_script)
-
-        with open('hello.py', 'w') as f:
-            f.write(DALS("""
+        build_files({
+            'setup.py': self.setup_script,
+            'hello.py': DALS("""
                 def run():
                     print('hello')
-                """))
+                """)
+        })
 
     @pytest.yield_fixture
     def env(self):
@@ -44,13 +44,14 @@ class Environment(str): pass
                 for dirname in subs
             )
             list(map(os.mkdir, env.paths.values()))
-            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
-            with open(config, 'w') as f:
-                f.write(DALS("""
+            build_files({
+                env.paths['home']: {
+                    '.pydistutils.cfg': DALS("""
                     [egg_info]
                     egg-base = %(egg-base)s
-                    """ % env.paths
-                ))
+                    """ % env.paths)
+                }
+            })
             yield env
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):

From 0b9fa15f89c18733d3b17d147a64a72134e0d8a3 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 19 Oct 2015 11:49:29 +0100
Subject: [PATCH 5220/8469] Pulled out some test code for re-use.

---
 setuptools/tests/test_egg_info.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 8d831107e8..4977ea014c 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -57,6 +57,20 @@ class Environment(str): pass
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
+        self._run_install_command(tmpdir_cwd, env)
+        actual = self._find_egg_info_files(env.paths['lib'])
+
+        expected = [
+            'PKG-INFO',
+            'SOURCES.txt',
+            'dependency_links.txt',
+            'entry_points.txt',
+            'not-zip-safe',
+            'top_level.txt',
+        ]
+        assert sorted(actual) == expected
+
+    def _run_install_command(self, tmpdir_cwd, env):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
@@ -76,18 +90,6 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         if code:
             raise AssertionError(data)
 
-        actual = self._find_egg_info_files(env.paths['lib'])
-
-        expected = [
-            'PKG-INFO',
-            'SOURCES.txt',
-            'dependency_links.txt',
-            'entry_points.txt',
-            'not-zip-safe',
-            'top_level.txt',
-        ]
-        assert sorted(actual) == expected
-
     def _find_egg_info_files(self, root):
         results = (
             filenames

From a9c3739984908d8ed9e902e3a6efe21f031c2908 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 19 Oct 2015 12:04:26 +0100
Subject: [PATCH 5221/8469] Added test to ensure that egg_info applies
 MANIFEST.in

The 'self.read_template()' line of manifest_maker was previously uncovered
by any test, and the test suite passed if you commented it out.
---
 setuptools/tests/test_egg_info.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4977ea014c..8281fdc1a4 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -58,7 +58,7 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
         self._run_install_command(tmpdir_cwd, env)
-        actual = self._find_egg_info_files(env.paths['lib'])
+        _, actual = self._find_egg_info_files(env.paths['lib'])
 
         expected = [
             'PKG-INFO',
@@ -70,6 +70,21 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         ]
         assert sorted(actual) == expected
 
+    def test_manifest_template_is_read(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'MANIFEST.in': DALS("""
+                recursive-include docs *.rst
+            """),
+            'docs': {
+                'usage.rst': "Run 'hi'",
+            }
+        })
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir, _ = self._find_egg_info_files(env.paths['lib'])
+        sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
+        assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
+
     def _run_install_command(self, tmpdir_cwd, env):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
@@ -92,7 +107,7 @@ def _run_install_command(self, tmpdir_cwd, env):
 
     def _find_egg_info_files(self, root):
         results = (
-            filenames
+            (dirpath, filenames)
             for dirpath, dirnames, filenames in os.walk(root)
             if os.path.basename(dirpath) == 'EGG-INFO'
         )

From ae6c73f07680da77345f5ccfac4facde30ad4d7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Oct 2015 16:57:13 -0400
Subject: [PATCH 5222/8469] Dropping support for Python 3.2 and earlier Python
 3 versions. Currently only log a warning, but future versions will fail.

---
 .travis.yml               | 1 -
 CHANGES.txt               | 8 ++++++++
 pkg_resources/__init__.py | 7 +++++++
 setup.py                  | 2 --
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45cace4be1..0097ab8955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.2
   - 3.3
   - 3.4
   - pypy
diff --git a/CHANGES.txt b/CHANGES.txt
index d20077535e..6c7239d1a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+18.5
+----
+
+* In preparation for dropping support for Python 3.2, a warning is
+  now logged when pkg_resources is imported on Python 3.2 or earlier
+  Python 3 versions.
+
 ----
 18.4
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ce8f2e98ec..ae36375506 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -95,6 +95,13 @@
     import packaging.specifiers
 
 
+if (3, 0) < sys.version_info < (3, 3):
+    msg = (
+        "Support for Python 3.0-3.2 has been dropped. Future versions "
+        "will fail here."
+    )
+    warnings.warn(msg)
+
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None
diff --git a/setup.py b/setup.py
index 2b367a6dda..6226111d41 100755
--- a/setup.py
+++ b/setup.py
@@ -140,8 +140,6 @@ def _gen_console_scripts():
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
-        Programming Language :: Python :: 3.1
-        Programming Language :: Python :: 3.2
         Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5

From 03cc3be9da0f1d31a3e4f2272d3ebb28ed761b35 Mon Sep 17 00:00:00 2001
From: Dweep Shah <dweepcan1@msn.com>
Date: Mon, 26 Oct 2015 16:45:04 -0400
Subject: [PATCH 5223/8469] Unload all pkg_resources modules and not just the
 main module. Fixes #453.

---
 ez_setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 50e0dfc69a..bbfe0544c4 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -125,7 +125,12 @@ def _do_download(version, download_base, to_dir, download_delay):
     # Remove previously-imported pkg_resources if present (see
     # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details).
     if 'pkg_resources' in sys.modules:
-        del sys.modules['pkg_resources']
+        del_modules = [
+            name for name in sys.modules 
+            if name.startswith('pkg_resources')
+        ]
+        for mod_name in del_modules:
+            del sys.modules[mod_name]
 
     import setuptools
     setuptools.bootstrap_install_from = egg

From dca452f0ed773557f5a5013cd77f76edfcbbb74e Mon Sep 17 00:00:00 2001
From: Dweep Shah <dweepcan1@msn.com>
Date: Tue, 27 Oct 2015 16:35:06 -0400
Subject: [PATCH 5224/8469] Uses an existing method to delete pkg_resources

---
 ez_setup.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bbfe0544c4..a197715527 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -125,12 +125,7 @@ def _do_download(version, download_base, to_dir, download_delay):
     # Remove previously-imported pkg_resources if present (see
     # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details).
     if 'pkg_resources' in sys.modules:
-        del_modules = [
-            name for name in sys.modules 
-            if name.startswith('pkg_resources')
-        ]
-        for mod_name in del_modules:
-            del sys.modules[mod_name]
+        _unload_pkg_resources()
 
     import setuptools
     setuptools.bootstrap_install_from = egg

From 57ebfa41e0f96b97e599ecd931b7ae8a143e096e Mon Sep 17 00:00:00 2001
From: Vadim Markovtsev <v.markovtsev@samsung.com>
Date: Sun, 1 Nov 2015 12:35:38 +0300
Subject: [PATCH 5225/8469] Fix "dictionary changed size during iteration"

env is being modified at the same time as being iterated which leads to RuntimeError: dictionary changed size during iteration.
---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ae36375506..df662dfe4d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1536,7 +1536,7 @@ def _markerlib_evaluate(cls, text):
         # markerlib implements Metadata 1.2 (PEP 345) environment markers.
         # Translate the variables to Metadata 2.0 (PEP 426).
         env = _markerlib.default_environment()
-        for key in env.keys():
+        for key in tuple(env.keys()):
             new_key = key.replace('.', '_')
             env[new_key] = env.pop(key)
         try:

From 2e236152228a7d2aec383fcecd70731f96ad4de3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Nov 2015 12:07:00 -0500
Subject: [PATCH 5226/8469] Extract a a method to encapsulate behavior and
 documentation. Rewrite for loop as legacy-style dictionary comprehension.

---
 pkg_resources/__init__.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index df662dfe4d..fb8704fdf9 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1525,6 +1525,17 @@ def evaluate_marker(cls, text, extra=None):
         """
         return cls.interpret(parser.expr(text).totuple(1)[1])
 
+    @staticmethod
+    def _translate_metadata2(env):
+        """
+        Markerlib implements Metadata 1.2 (PEP 345) environment markers.
+        Translate the variables to Metadata 2.0 (PEP 426).
+        """
+        return dict(
+            (key.replace('.', '_'), value)
+            for key, value in env
+        )
+
     @classmethod
     def _markerlib_evaluate(cls, text):
         """
@@ -1533,12 +1544,8 @@ def _markerlib_evaluate(cls, text):
         Raise SyntaxError if marker is invalid.
         """
         import _markerlib
-        # markerlib implements Metadata 1.2 (PEP 345) environment markers.
-        # Translate the variables to Metadata 2.0 (PEP 426).
-        env = _markerlib.default_environment()
-        for key in tuple(env.keys()):
-            new_key = key.replace('.', '_')
-            env[new_key] = env.pop(key)
+
+        env = cls._translate_metadata2(_markerlib.default_environment())
         try:
             result = _markerlib.interpret(text, env)
         except NameError as e:

From d76ce5c06cb8c290e8f2cc803c85ae97543a3de2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Nov 2015 19:19:01 -0500
Subject: [PATCH 5227/8469] Update changelog

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6c7239d1a2..bd05b8bd18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,10 @@ CHANGES
 * In preparation for dropping support for Python 3.2, a warning is
   now logged when pkg_resources is imported on Python 3.2 or earlier
   Python 3 versions.
+* `Add support for python_platform_implementation environment marker
+  <https://github.com/jaraco/setuptools/pull/28>`_.
+* `Fix dictionary mutation during iteration
+  <https://github.com/jaraco/setuptools/pull/29>`_.
 
 ----
 18.4

From 260c08f4bacf1d2e0833f30522f5b55c7440ec7a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Nov 2015 19:19:41 -0500
Subject: [PATCH 5228/8469] Added tag 18.5 for changeset 31dc6d2ac0f5

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d7ea9e2e30..5729d664e1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -222,3 +222,4 @@ b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 7a705b610abb1177ca169311c4ee261f3e4f0957 18.3.1
 1e120f04bcaa2421c4df0eb6678c3019ba4a82f6 18.3.2
 6203335278be7543d31790d9fba55739469a4c6c 18.4
+31dc6d2ac0f5ab766652602fe6ca716fff7180e7 18.5

From 2ac80cd8a4ab5d9398c51fbfcc71489141f4f1c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Nov 2015 19:21:10 -0500
Subject: [PATCH 5229/8469] Bumped to 18.6 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 50e0dfc69a..c41c10e9cd 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.5"
+DEFAULT_VERSION = "18.6"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 1be1f7ec20..74e48b047d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.5'
+__version__ = '18.6'

From f06fb88362616b452cf6da3de78eb18a759526a5 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 2 Nov 2015 03:37:02 +0000
Subject: [PATCH 5230/8469] Issue #25523: Correct "a" article to "an" article

This changes the main documentation, doc strings, source code comments, and a
couple error messages in the test suite. In some cases the word was removed
or edited some other way to fix the grammar.
---
 cygwinccompiler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index d28b1b368a..c879646c0f 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -10,9 +10,9 @@
 #
 # * if you use a msvc compiled python version (1.5.2)
 #   1. you have to insert a __GNUC__ section in its config.h
-#   2. you have to generate a import library for its dll
+#   2. you have to generate an import library for its dll
 #      - create a def-file for python??.dll
-#      - create a import library using
+#      - create an import library using
 #             dlltool --dllname python15.dll --def python15.def \
 #                       --output-lib libpython15.a
 #
@@ -318,7 +318,7 @@ def __init__(self, verbose=0, dry_run=0, force=0):
         self.dll_libraries = get_msvcr()
 
 # Because these compilers aren't configured in Python's pyconfig.h file by
-# default, we should at least warn the user if he is using a unmodified
+# default, we should at least warn the user if he is using an unmodified
 # version.
 
 CONFIG_H_OK = "ok"

From 5b72c2587563f6190db732cb5b49e1868fa546e2 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Thu, 5 Nov 2015 11:37:38 +1300
Subject: [PATCH 5231/8469] Fix EBNF for package specifications.

---
 docs/pkg_resources.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 6c6405a82e..3d40a1a242 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -592,7 +592,7 @@ Requirements Parsing
 
     The syntax of a requirement specifier can be defined in EBNF as follows::
 
-        requirement  ::= project_name versionspec? extras?
+        requirement  ::= project_name extras? versionspec?
         versionspec  ::= comparison version (',' comparison version)*
         comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '==='
         extras       ::= '[' extralist? ']'

From 1b3e7be2deb5caf890dc7a53896357e4b938979e Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 12 Nov 2015 13:15:41 +0200
Subject: [PATCH 5232/8469] Restore old distutils logging threshold after
 running test_log.

---
 tests/test_log.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_log.py b/tests/test_log.py
index ce66ee51e7..0c2ad7a426 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -14,8 +14,8 @@ def test_non_ascii(self):
         # error handler)
         old_stdout = sys.stdout
         old_stderr = sys.stderr
+        old_threshold = log.set_threshold(log.DEBUG)
         try:
-            log.set_threshold(log.DEBUG)
             with NamedTemporaryFile(mode="w+", encoding='ascii') as stdout, \
                  NamedTemporaryFile(mode="w+", encoding='ascii') as stderr:
                 sys.stdout = stdout
@@ -27,6 +27,7 @@ def test_non_ascii(self):
                 stderr.seek(0)
                 self.assertEqual(stderr.read().rstrip(), "fatal:\\xe9")
         finally:
+            log.set_threshold(old_threshold)
             sys.stdout = old_stdout
             sys.stderr = old_stderr
 

From 4e0ac6d444c79d2858a6d3cb8b7b523ccf3f54e3 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 12 Nov 2015 19:46:23 +0200
Subject: [PATCH 5233/8469] Issue #25607: Restore old distutils logging
 threshold after running tests that parse command line arguments.

---
 tests/test_core.py | 2 ++
 tests/test_dist.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/test_core.py b/tests/test_core.py
index 41321f7db4..654227ca18 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -9,6 +9,7 @@
 from test.support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
+from distutils import log
 
 # setup script that uses __file__
 setup_using___file__ = """\
@@ -36,6 +37,7 @@ def setUp(self):
         self.old_stdout = sys.stdout
         self.cleanup_testfn()
         self.old_argv = sys.argv, sys.argv[:]
+        self.addCleanup(log.set_threshold, log._global_log.threshold)
 
     def tearDown(self):
         sys.stdout = self.old_stdout
diff --git a/tests/test_dist.py b/tests/test_dist.py
index b7fd3fbf90..1f104cef67 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -13,6 +13,7 @@
 
 from test.support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
+from distutils import log
 
 
 class test_dist(Command):
@@ -405,6 +406,7 @@ def test_fix_help_options(self):
 
     def test_show_help(self):
         # smoke test, just makes sure some help is displayed
+        self.addCleanup(log.set_threshold, log._global_log.threshold)
         dist = Distribution()
         sys.argv = []
         dist.help = 1

From a88effc90cdc99974ae65c008238566cdab4b98e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Nov 2015 10:42:48 -0500
Subject: [PATCH 5234/8469] Update docs to reflect preferred usage with latest
 pytest-runner.

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 27c304e5cf..b6f5bb9f97 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -92,7 +92,7 @@ Testing
 
 The primary tests are run using py.test. To run the tests::
 
-    $ python setup.py ptr
+    $ python setup.py test
 
 Or install py.test into your environment and run ``py.test``.
 

From b6a3ccf987ce2f8d13e1520563223bd76460744a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Nov 2015 19:16:09 -0500
Subject: [PATCH 5235/8469] Extract function for detecting unpacked egg. Ref
 #462.

---
 pkg_resources/__init__.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d09e0b6f9a..0c024f1b79 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1716,7 +1716,7 @@ def _setup_prefix(self):
         path = self.module_path
         old = None
         while path!=old:
-            if path.lower().endswith('.egg'):
+            if _is_unpacked_egg(path):
                 self.egg_name = os.path.basename(path)
                 self.egg_info = os.path.join(path, 'EGG-INFO')
                 self.egg_root = path
@@ -2099,7 +2099,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
         # don't yield nested distros
         return
     for subitem in metadata.resource_listdir('/'):
-        if subitem.endswith('.egg'):
+        if _is_unpacked_egg(subitem):
             subpath = os.path.join(path_item, subitem)
             for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
                 yield dist
@@ -2115,8 +2115,7 @@ def find_on_path(importer, path_item, only=False):
     path_item = _normalize_cached(path_item)
 
     if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
-        if path_item.lower().endswith('.egg'):
-            # unpacked egg
+        if _is_unpacked_egg(path_item):
             yield Distribution.from_filename(
                 path_item, metadata=PathMetadata(
                     path_item, os.path.join(path_item,'EGG-INFO')
@@ -2136,7 +2135,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 lower.endswith('.egg'):
+                elif not only and _is_unpacked_egg(entry):
                     dists = find_distributions(os.path.join(path_item, entry))
                     for dist in dists:
                         yield dist
@@ -2283,6 +2282,14 @@ def _normalize_cached(filename, _cache={}):
         _cache[filename] = result = normalize_path(filename)
         return result
 
+def _is_unpacked_egg(path):
+    """
+    Determine if given path appears to be an unpacked egg.
+    """
+    return (
+        path.lower().endswith('.egg')
+    )
+
 def _set_parent_ns(packageName):
     parts = packageName.split('.')
     name = parts.pop()

From 40436edb86b034979b716695ec68fe55bb656d79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 Nov 2015 19:18:37 -0500
Subject: [PATCH 5236/8469] Only detect a path as an unpacked egg if it also
 has an EGG-INFO directory. Fixes #462.

---
 CHANGES.txt               | 7 +++++++
 pkg_resources/__init__.py | 1 +
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bd05b8bd18..60d43fb287 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+----
+18.6
+----
+
+* Issue #462: Provide a more refined detection of unpacked egg
+  directories, avoiding detecting zc.recipe.egg wheel as an egg.
+
 ----
 18.5
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0c024f1b79..8841ee6321 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2288,6 +2288,7 @@ def _is_unpacked_egg(path):
     """
     return (
         path.lower().endswith('.egg')
+        and os.path.isdir(os.path.join(path, 'EGG-INFO'))
     )
 
 def _set_parent_ns(packageName):

From f05162f5583979a3cc56492b91211cbe54353efa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 10:54:46 -0500
Subject: [PATCH 5237/8469] Short circuit on skipped behavior, leaving main
 behavior in the body of the method.

---
 setuptools/command/easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 45d180bb3c..4fae256058 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -760,9 +760,10 @@ def maybe_move(self, spec, dist_filename, setup_base):
         return dst
 
     def install_wrapper_scripts(self, dist):
-        if not self.exclude_scripts:
-            for args in ScriptWriter.best().get_args(dist):
-                self.write_script(*args)
+        if self.exclude_scripts:
+            return
+        for args in ScriptWriter.best().get_args(dist):
+            self.write_script(*args)
 
     def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""

From 998ceceaeb3dfce1b2b05a82aaf356db54f46de6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:27:22 -0500
Subject: [PATCH 5238/8469] Back out 435b1b762fba. The change breaks detection
 of zip eggs. Reopens #462.

---
 CHANGES.txt               | 7 -------
 pkg_resources/__init__.py | 1 -
 2 files changed, 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 60d43fb287..bd05b8bd18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,13 +2,6 @@
 CHANGES
 =======
 
-----
-18.6
-----
-
-* Issue #462: Provide a more refined detection of unpacked egg
-  directories, avoiding detecting zc.recipe.egg wheel as an egg.
-
 ----
 18.5
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 8841ee6321..0c024f1b79 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2288,7 +2288,6 @@ def _is_unpacked_egg(path):
     """
     return (
         path.lower().endswith('.egg')
-        and os.path.isdir(os.path.join(path, 'EGG-INFO'))
     )
 
 def _set_parent_ns(packageName):

From f4576e373b51fab07eec7f6f2cde3ffa2e04f6c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:32:45 -0500
Subject: [PATCH 5239/8469] Add VersionlessRequirement adapter to suppress the
 version number in a Distribution. Ref #439.

---
 setuptools/command/develop.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 368b64fed7..0959d9378c 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -167,3 +167,26 @@ def install_egg_scripts(self, dist):
             script_text = f.read()
             f.close()
             self.install_script(dist, script_name, script_text, script_path)
+
+
+class VersionlessRequirement(object):
+    """
+    Adapt a pkg_resources.Distribution to simply return the project
+    name as the 'requirement' so that scripts will work across
+    multiple versions.
+
+    >>> dist = Distribution(project_name='foo', version='1.0')
+    >>> str(dist.as_requirement())
+    'foo==1.0'
+    >>> adapted_dist = VersionlessRequirement(dist)
+    >>> str(adapted_dist.as_requirement())
+    'foo'
+    """
+    def __init__(self, dist):
+        self.__dist = dist
+
+    def __getattr__(self, name):
+        return getattr(self.__dist, name)
+
+    def as_requirement(self):
+        return self.project_name

From c23be8f034d8600191decd7e843ae93619d15298 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:35:27 -0500
Subject: [PATCH 5240/8469] Adapt the dist to suppress the version in the
 requirement when installing scripts under the develop command. Fixes #439.

---
 setuptools/command/develop.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 0959d9378c..360872fce3 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -168,6 +168,10 @@ def install_egg_scripts(self, dist):
             f.close()
             self.install_script(dist, script_name, script_text, script_path)
 
+    def install_wrapper_scripts(self, dist):
+        dist = VersionlessRequirement(dist)
+        return super(develop, self).install_wrapper_scripts(dist)
+
 
 class VersionlessRequirement(object):
     """

From de6c530852988f412f7e546a5a60f02b6a2e06e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:36:46 -0500
Subject: [PATCH 5241/8469] Update changelog; ref #439.

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bd05b8bd18..c4b456f6d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+----
+18.6
+----
+
+* Issue #439: When installing entry_point scripts under development,
+  omit the version number of the package, allowing any version of the
+  package to be used.
+
 ----
 18.5
 ----

From 6e6872addad422b164c7a9a0e8711a7264978c58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:43:58 -0500
Subject: [PATCH 5242/8469] Added tag 18.6 for changeset dfe190b09908

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5729d664e1..d95f31dde4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -223,3 +223,4 @@ b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 1e120f04bcaa2421c4df0eb6678c3019ba4a82f6 18.3.2
 6203335278be7543d31790d9fba55739469a4c6c 18.4
 31dc6d2ac0f5ab766652602fe6ca716fff7180e7 18.5
+dfe190b09908f6b953209d13573063809de451b8 18.6

From 172bd064abe5a973f38ab9641a80b39782ad2cde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:46:14 -0500
Subject: [PATCH 5243/8469] Bumped to 18.7 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index c41c10e9cd..20d80e8ef1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.6"
+DEFAULT_VERSION = "18.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 74e48b047d..f6dc6bf473 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.6'
+__version__ = '18.7'

From f34cf8e9242d2b4c25b5a511f9f74fbffcb17c4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 11:58:35 -0500
Subject: [PATCH 5244/8469] Suppress testing of upload-releases-as-zip script

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 91d64bb800..351942f439 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py
 norecursedirs=dist build *.egg

From e311cafb5305a445def27fbc79fdc5f098c76728 Mon Sep 17 00:00:00 2001
From: Ryan Kelly <ryan@truveris.com>
Date: Tue, 24 Nov 2015 13:46:26 -0500
Subject: [PATCH 5245/8469] issue #464: don't crash using super() on a
 old-style class

---
 setuptools/command/develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 360872fce3..5ae25d71c4 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -170,7 +170,7 @@ def install_egg_scripts(self, dist):
 
     def install_wrapper_scripts(self, dist):
         dist = VersionlessRequirement(dist)
-        return super(develop, self).install_wrapper_scripts(dist)
+        return easy_install.install_wrapper_scripts(self, dist)
 
 
 class VersionlessRequirement(object):

From ea6c487fbfe70032a1dddb0b4501e66420eefeb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 18:51:29 -0500
Subject: [PATCH 5246/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c4b456f6d3..b14e910359 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+
+------
+18.6.1
+------
+
+* Issue #464: Correct regression in invocation of superclass on old-style
+  class on Python 2.
+
 ----
 18.6
 ----

From a84f4878c07509a79af863cabf29ce4de6f212c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 18:52:20 -0500
Subject: [PATCH 5247/8469] Bumped to 18.6.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 20d80e8ef1..06918e1b89 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.7"
+DEFAULT_VERSION = "18.6.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f6dc6bf473..9f17b0ab3e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.7'
+__version__ = '18.6.1'

From ceaafa112be304add1353435599df514dbcbe9ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 18:52:22 -0500
Subject: [PATCH 5248/8469] Added tag 18.6.1 for changeset 804f87045a90

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d95f31dde4..6ed522b450 100644
--- a/.hgtags
+++ b/.hgtags
@@ -224,3 +224,4 @@ b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 6203335278be7543d31790d9fba55739469a4c6c 18.4
 31dc6d2ac0f5ab766652602fe6ca716fff7180e7 18.5
 dfe190b09908f6b953209d13573063809de451b8 18.6
+804f87045a901f1dc121cf9149143d654228dc13 18.6.1

From cf39578632c13d49866fe924bf4c5f5ba48db554 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 18:54:16 -0500
Subject: [PATCH 5249/8469] Bumped to 18.6.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 06918e1b89..4740248f70 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.6.1"
+DEFAULT_VERSION = "18.6.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 9f17b0ab3e..86ad21c692 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.6.1'
+__version__ = '18.6.2'

From 3bcf6213d25381d9df9baa2b7a16c9449fbf78e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 18:55:48 -0500
Subject: [PATCH 5250/8469] Use context manager for opening file

---
 setuptools/tests/test_develop.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ed1b194a78..b920655d51 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -32,15 +32,13 @@ def setup_method(self, method):
         os.mkdir(os.path.join(self.dir, 'foo'))
         # setup.py
         setup = os.path.join(self.dir, 'setup.py')
-        f = open(setup, 'w')
-        f.write(SETUP_PY)
-        f.close()
+        with open(setup, 'w') as f:
+            f.write(SETUP_PY)
         self.old_cwd = os.getcwd()
         # foo/__init__.py
         init = os.path.join(self.dir, 'foo', '__init__.py')
-        f = open(init, 'w')
-        f.write(INIT_PY)
-        f.close()
+        with open(init, 'w') as f:
+            f.write(INIT_PY)
 
         os.chdir(self.dir)
         self.old_base = site.USER_BASE

From bc7f3b0a36a1c676809f89eae7299afbb7f70f32 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:32:13 -0500
Subject: [PATCH 5251/8469] Extract setup/teardown methods as proper fixtures.

---
 setuptools/tests/test_develop.py | 57 +++++++++++++++++---------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index b920655d51..96b9f4ef4f 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -6,8 +6,12 @@
 import sys
 import tempfile
 
+import pytest
+
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
+from . import contexts
+
 
 SETUP_PY = """\
 from setuptools import setup
@@ -21,43 +25,42 @@
 INIT_PY = """print "foo"
 """
 
+@pytest.yield_fixture
+def temp_user(monkeypatch):
+    with contexts.tempdir() as user_base:
+        with contexts.tempdir() as user_site:
+            monkeypatch.setattr('site.USER_BASE', user_base)
+            monkeypatch.setattr('site.USER_SITE', user_site)
+            yield
+
+
+@pytest.yield_fixture
+def test_env(tmpdir, temp_user):
+    target = tmpdir
+    foo = target.mkdir('foo')
+    setup = target / 'setup.py'
+    if setup.isfile():
+        raise ValueError(dir(target))
+    with setup.open('w') as f:
+        f.write(SETUP_PY)
+    init = foo / '__init__.py'
+    with init.open('w') as f:
+        f.write(INIT_PY)
+    with target.as_cwd():
+        yield target
+
+
 class TestDevelopTest:
 
     def setup_method(self, method):
         if hasattr(sys, 'real_prefix'):
             return
 
-        # Directory structure
-        self.dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(self.dir, 'foo'))
-        # setup.py
-        setup = os.path.join(self.dir, 'setup.py')
-        with open(setup, 'w') as f:
-            f.write(SETUP_PY)
-        self.old_cwd = os.getcwd()
-        # foo/__init__.py
-        init = os.path.join(self.dir, 'foo', '__init__.py')
-        with open(init, 'w') as f:
-            f.write(INIT_PY)
-
-        os.chdir(self.dir)
-        self.old_base = site.USER_BASE
-        site.USER_BASE = tempfile.mkdtemp()
-        self.old_site = site.USER_SITE
-        site.USER_SITE = tempfile.mkdtemp()
-
     def teardown_method(self, method):
         if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
             return
 
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.dir)
-        shutil.rmtree(site.USER_BASE)
-        shutil.rmtree(site.USER_SITE)
-        site.USER_BASE = self.old_base
-        site.USER_SITE = self.old_site
-
-    def test_develop(self):
+    def test_develop(self, test_env):
         if hasattr(sys, 'real_prefix'):
             return
         dist = Distribution(

From 448cfc53cd16fb11562def2ee8b9bf66ed178b21 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:37:11 -0500
Subject: [PATCH 5252/8469] Replace silent test acceptance with a proper skip
 check

---
 setuptools/tests/test_develop.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 96b9f4ef4f..2baf83bbad 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -51,18 +51,9 @@ def test_env(tmpdir, temp_user):
 
 
 class TestDevelopTest:
-
-    def setup_method(self, method):
-        if hasattr(sys, 'real_prefix'):
-            return
-
-    def teardown_method(self, method):
-        if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
-            return
-
+    @pytest.mark.skipif(hasattr(sys, 'real_prefix'),
+        reason="Cannot run when invoked in a virtualenv")
     def test_develop(self, test_env):
-        if hasattr(sys, 'real_prefix'):
-            return
         dist = Distribution(
             dict(name='foo',
                  packages=['foo'],

From e1e3570fb01aa4f1fe6d0e56cfb73d38b781a307 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:38:13 -0500
Subject: [PATCH 5253/8469] Extract variable

---
 setuptools/tests/test_develop.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 2baf83bbad..49e007e677 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -54,12 +54,13 @@ class TestDevelopTest:
     @pytest.mark.skipif(hasattr(sys, 'real_prefix'),
         reason="Cannot run when invoked in a virtualenv")
     def test_develop(self, test_env):
-        dist = Distribution(
-            dict(name='foo',
-                 packages=['foo'],
-                 use_2to3=True,
-                 version='0.0',
-                 ))
+        settings = dict(
+            name='foo',
+            packages=['foo'],
+            use_2to3=True,
+            version='0.0',
+        )
+        dist = Distribution(settings)
         dist.script_name = 'setup.py'
         cmd = develop(dist)
         cmd.user = 1

From 731c83fd5ebe79a7643465e68310c11387b427e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:41:32 -0500
Subject: [PATCH 5254/8469] Remove unused imports

---
 setuptools/tests/test_develop.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 49e007e677..962c4f3cf9 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,10 +1,8 @@
 """develop tests
 """
 import os
-import shutil
 import site
 import sys
-import tempfile
 
 import pytest
 

From 693f20d40fca6b41ac629665901c350cd3dcd4e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:45:12 -0500
Subject: [PATCH 5255/8469] Use quiet context to suppress stdout.

---
 setuptools/tests/test_develop.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 962c4f3cf9..f0adcb187c 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -65,12 +65,8 @@ def test_develop(self, test_env):
         cmd.ensure_finalized()
         cmd.install_dir = site.USER_SITE
         cmd.user = 1
-        old_stdout = sys.stdout
-        #sys.stdout = StringIO()
-        try:
+        with contexts.quiet():
             cmd.run()
-        finally:
-            sys.stdout = old_stdout
 
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)

From 0861296a63b3fafd059759840fb62ba12d4e6adc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 19:47:58 -0500
Subject: [PATCH 5256/8469] Use io.open and its context for simpler reading of
 a file

---
 setuptools/tests/test_develop.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index f0adcb187c..ec6554629c 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -3,6 +3,7 @@
 import os
 import site
 import sys
+import io
 
 import pytest
 
@@ -74,16 +75,12 @@ def test_develop(self, test_env):
         assert content == ['easy-install.pth', 'foo.egg-link']
 
         # Check that we are using the right code.
-        egg_link_file = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt')
-        try:
+        fn = os.path.join(site.USER_SITE, 'foo.egg-link')
+        with io.open(fn) as egg_link_file:
             path = egg_link_file.read().split()[0].strip()
-        finally:
-            egg_link_file.close()
-        init_file = open(os.path.join(path, 'foo', '__init__.py'), 'rt')
-        try:
+        fn = os.path.join(path, 'foo', '__init__.py')
+        with io.open(fn) as init_file:
             init = init_file.read().strip()
-        finally:
-            init_file.close()
         if sys.version < "3":
             assert init == 'print "foo"'
         else:

From 951a3b9df51c1c46a39753dc6f2854ea18f45729 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 20:01:32 -0500
Subject: [PATCH 5257/8469] Use if clause.

---
 setuptools/tests/test_develop.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ec6554629c..35f3ea256d 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -10,6 +10,7 @@
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
 from . import contexts
+from setuptools.compat import PY3
 
 
 SETUP_PY = """\
@@ -81,7 +82,6 @@ def test_develop(self, test_env):
         fn = os.path.join(path, 'foo', '__init__.py')
         with io.open(fn) as init_file:
             init = init_file.read().strip()
-        if sys.version < "3":
-            assert init == 'print "foo"'
-        else:
-            assert init == 'print("foo")'
+
+        expected = 'print("foo")' if PY3 else 'print "foo"'
+        assert init == expected

From 436be23a0ac5d7f21f261bdcd6fd9119a4f55346 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 20:38:52 -0500
Subject: [PATCH 5258/8469] Rename tests for clarity

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

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 35f3ea256d..725c4ce211 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -50,10 +50,10 @@ def test_env(tmpdir, temp_user):
         yield target
 
 
-class TestDevelopTest:
+class TestDevelop:
     @pytest.mark.skipif(hasattr(sys, 'real_prefix'),
         reason="Cannot run when invoked in a virtualenv")
-    def test_develop(self, test_env):
+    def test_2to3_user_mode(self, test_env):
         settings = dict(
             name='foo',
             packages=['foo'],

From 7bd76e0869310de9da5a32ca2c860f6a1fa461b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Nov 2015 21:21:09 -0500
Subject: [PATCH 5259/8469] Draft a test for testing the new expectation for
 develop command (and general functionality when console scripts are present).

---
 setuptools/tests/test_develop.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 725c4ce211..71f0d69aa0 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -85,3 +85,28 @@ def test_2to3_user_mode(self, test_env):
 
         expected = 'print("foo")' if PY3 else 'print "foo"'
         assert init == expected
+
+    def test_console_scripts(self, tmpdir):
+        """
+        Test that console scripts are installed and that they reference
+        only the project by name and not the current version.
+        """
+        pytest.skip("TODO: needs a fixture to cause 'develop' "
+            "to be invoked without mutating environment.")
+        settings = dict(
+            name='foo',
+            packages=['foo'],
+            version='0.0',
+            entry_points={
+                'console_scripts': [
+                    'foocmd = foo:foo',
+                ],
+            },
+        )
+        dist = Distribution(settings)
+        dist.script_name = 'setup.py'
+        cmd = develop(dist)
+        cmd.ensure_finalized()
+        cmd.install_dir = tmpdir
+        cmd.run()
+        #assert '0.0' not in foocmd_text

From adc0d911143caf6a174fed7b71b75249404d5eff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Nov 2015 09:43:50 -0500
Subject: [PATCH 5260/8469] No need for a separate DEVGUIDE

---
 DEVGUIDE.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 DEVGUIDE.txt

diff --git a/DEVGUIDE.txt b/DEVGUIDE.txt
deleted file mode 100644
index 066a3a6bfb..0000000000
--- a/DEVGUIDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-The canonical development guide can be found in docs/developer-guide.txt.

From 75a571e4d9d5f5c3fde661c54a368b533be1978b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Nov 2015 10:04:33 -0500
Subject: [PATCH 5261/8469] Skip the test when running under venv also

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

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 71f0d69aa0..ab5da00e87 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -51,8 +51,10 @@ def test_env(tmpdir, temp_user):
 
 
 class TestDevelop:
-    @pytest.mark.skipif(hasattr(sys, 'real_prefix'),
-        reason="Cannot run when invoked in a virtualenv")
+    in_virtualenv = hasattr(sys, 'real_prefix')
+    in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix
+    @pytest.mark.skipif(in_virtualenv or in_venv,
+        reason="Cannot run when invoked in a virtualenv or venv")
     def test_2to3_user_mode(self, test_env):
         settings = dict(
             name='foo',

From 63c3e2e1ba805f64ad251a90c1182bdd06e28a12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Nov 2015 10:44:07 -0500
Subject: [PATCH 5262/8469] Update tox tests so they run the full suite of
 tests using the canonical technique. Include .tox in norecursedirs to avoid
 testing all the dependencies and environment. Update docs to reflect findings
 (https://bitbucket.org/spookylukey/setuptools/commits/88339d2e4af661a60a42bc14c4ff3e68cd19fa21#comment-2558164).

---
 docs/developer-guide.txt | 3 ++-
 tox.ini                  | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index b6f5bb9f97..ae33649b59 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -94,7 +94,8 @@ The primary tests are run using py.test. To run the tests::
 
     $ python setup.py test
 
-Or install py.test into your environment and run ``py.test``.
+Or install py.test into your environment and run ``PYTHONPATH=. py.test``
+or ``python -m pytest``.
 
 Under continuous integration, additional tests may be run. See the
 ``.travis.yml`` file for full details on the tests run under Travis-CI.
diff --git a/tox.ini b/tox.ini
index 7aeffdd8a9..9061869fd2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,5 @@
 [tox]
 envlist = py26,py27,py31,py32,py33,py34
+
 [testenv]
-deps=
-    pytest
-    mock
-commands=py.test setuptools {posargs}
+commands=python setup.py test

From 9186dd6e15a7f7102ec4d3bf0f9c660ea6c7f082 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 12:43:20 -0500
Subject: [PATCH 5263/8469] Add a bit more detail about the setup script and
 what to expect. Fixes #466.

---
 docs/setuptools.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e2753cba50..d6a62de865 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -112,10 +112,16 @@ the distutils.  Here's a minimal setup script using setuptools::
     )
 
 As you can see, it doesn't take much to use setuptools in a project.
-Just by doing the above, this project will be able to produce eggs, upload to
+Run that script in your project folder, alongside the Python packages
+you have developed.
+
+Invoke that script to produce eggs, upload to
 PyPI, and automatically include all packages in the directory where the
 setup.py lives.  See the `Command Reference`_ section below to see what
-commands you can give to this setup script.
+commands you can give to this setup script. For example,
+to produce a source distribution, simply invoke::
+
+    python setup.py sdist
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your

From 08edac82f02e771ff82f01938208def8ef9991b0 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Fri, 13 Nov 2015 07:02:56 +1100
Subject: [PATCH 5264/8469] Fix docstring started with """" instead of """

---
 setuptools/py31compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index c487ac0439..8fe6dd9d70 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -20,7 +20,7 @@ def get_path(name):
     import shutil
     import tempfile
     class TemporaryDirectory(object):
-        """"
+        """
         Very simple temporary directory context manager.
         Will try to delete afterward, but will also ignore OS and similar
         errors on deletion.

From 03e7e8c23889bcac55d2cb563ad8deb172e77210 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Sun, 15 Nov 2015 22:30:46 -0500
Subject: [PATCH 5265/8469] Add tests ref #419.

---
 setuptools/tests/test_egg_info.py | 96 +++++++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a1caf9fd30..b4195e06e6 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,9 +6,14 @@
 from . import environment
 from .textwrap import DALS
 from . import contexts
+from pkg_resources import WorkingSet, Requirement
 
 
-class TestEggInfo:
+class Environment(str):
+    pass
+
+
+class TestEggInfo(object):
 
     setup_script = DALS("""
         from setuptools import setup
@@ -33,8 +38,6 @@ def run():
 
     @pytest.yield_fixture
     def env(self):
-        class Environment(str): pass
-
         with contexts.tempdir(prefix='setuptools-test.') as env_dir:
             env = Environment(env_dir)
             os.chmod(env_dir, stat.S_IRWXU)
@@ -49,8 +52,7 @@ class Environment(str): pass
                 f.write(DALS("""
                     [egg_info]
                     egg-base = %(egg-base)s
-                    """ % env.paths
-                ))
+                    """ % env.paths))
             yield env
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
@@ -96,3 +98,87 @@ def _find_egg_info_files(self, root):
         # expect exactly one result
         result, = results
         return result
+
+
+class TestEggInfoDistutils(object):
+
+    version = '1.11.0.dev0+2329eae'
+    setup_script = DALS("""
+        from distutils.core import setup
+
+        setup(
+            name='foo',
+            py_modules=['hello'],
+            version='%s',
+        )
+        """)
+
+    def _create_project(self):
+        with open('setup.py', 'w') as f:
+            f.write(self.setup_script % self.version)
+
+        with open('hello.py', 'w') as f:
+            f.write(DALS("""
+                def run():
+                    print('hello')
+                """))
+
+    @pytest.yield_fixture
+    def env(self):
+        with contexts.tempdir(prefix='setuptools-test.') as env_dir:
+            env = Environment(env_dir)
+            os.chmod(env_dir, stat.S_IRWXU)
+            subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
+            env.paths = dict(
+                (dirname, os.path.join(env_dir, dirname))
+                for dirname in subs
+            )
+            list(map(os.mkdir, env.paths.values()))
+            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
+            with open(config, 'w') as f:
+                f.write(DALS("""
+                    [egg_info]
+                    egg-base = %(egg-base)s
+                    """ % env.paths))
+            yield env
+
+    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
+        self._create_project()
+
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        cmd = [
+            'install',
+            '--home', env.paths['home'],
+            '--install-lib', env.paths['lib'],
+            '--install-scripts', env.paths['scripts'],
+            '--install-data', env.paths['data'],
+        ]
+        code, data = environment.run_setup_py(
+            cmd=cmd,
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        if code:
+            raise AssertionError(data)
+
+        actual = self._find_egg_info_file(env.paths['lib'])
+        # On Py3k it can be e.g. foo-1.11.0.dev0_2329eae-py3.4.egg-info
+        # but 2.7 doesn't add the Python version, so to be expedient we
+        # just check our start and end, omitting the potential version num
+        assert actual.startswith('foo-' + self.version.replace('+', '_'))
+        assert actual.endswith('.egg-info')
+        # this requirement parsing will raise a VersionConflict unless the
+        # .egg-info file is parsed (see #419 on BitBucket)
+        req = Requirement.parse('foo>=1.9')
+        dist = WorkingSet([env.paths['lib']]).find(req)
+        assert dist.version == self.version
+
+    def _find_egg_info_file(self, root):
+        # expect exactly one result
+        result = (filename for dirpath, dirnames, filenames in os.walk(root)
+                  for filename in filenames if filename.endswith('.egg-info'))
+        result, = result
+        return result

From 5681e303fca322007efd10a6004221795295414e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 16:53:27 -0500
Subject: [PATCH 5266/8469] Adding script from idg serpro. Ref #432.

---
 scripts/upload-old-releases-as-zip.py | 234 ++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 scripts/upload-old-releases-as-zip.py

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
new file mode 100644
index 0000000000..5349281911
--- /dev/null
+++ b/scripts/upload-old-releases-as-zip.py
@@ -0,0 +1,234 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import errno
+import glob
+import hashlib
+import json
+import os
+import shutil
+import tarfile
+import tempfile
+import urllib
+import urllib2
+
+from distutils.version import LooseVersion
+
+OK = '\033[92m'
+FAIL = '\033[91m'
+END = '\033[0m'
+DISTRIBUTION = "setuptools"
+
+
+class SetuptoolsOldReleasesWithoutZip(object):
+    """docstring for SetuptoolsOldReleases"""
+
+    def __init__(self):
+        super(SetuptoolsOldReleasesWithoutZip, self).__init__()
+        self.dirpath = tempfile.mkdtemp(prefix=DISTRIBUTION)
+        print "Downloading %s releases..." % DISTRIBUTION
+        print "All releases will be downloaded to %s" % self.dirpath
+        self.data_json_setuptools = self.get_json_data(DISTRIBUTION)
+        self.valid_releases_numbers = sorted([
+            release
+            for release in self.data_json_setuptools['releases']
+            # This condition is motivated by 13.0 release, which
+            # comes as "13.0": [], in the json
+            if self.data_json_setuptools['releases'][release]
+        ], key=LooseVersion)
+        self.total_downloaded_ok = 0
+
+    def get_json_data(self, package_name):
+        """
+        "releases": {
+            "0.7.2": [
+                {
+                    "has_sig": false,
+                    "upload_time": "2013-06-09T16:10:00",
+                    "comment_text": "",
+                    "python_version": "source",
+                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.7.2.tar.gz",  # NOQA
+                    "md5_digest": "de44cd90f8a1c713d6c2bff67bbca65d",
+                    "downloads": 159014,
+                    "filename": "setuptools-0.7.2.tar.gz",
+                    "packagetype": "sdist",
+                    "size": 633077
+                }
+            ],
+            "0.7.3": [
+                {
+                    "has_sig": false,
+                    "upload_time": "2013-06-18T21:08:56",
+                    "comment_text": "",
+                    "python_version": "source",
+                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.7.3.tar.gz",  # NOQA
+                    "md5_digest": "c854adacbf9067d330a847f06f7a8eba",
+                    "downloads": 30594,
+                    "filename": "setuptools-0.7.3.tar.gz",
+                    "packagetype": "sdist",
+                    "size": 751152
+                }
+            ],
+            "12.3": [
+                {
+                    "has_sig": false,
+                    "upload_time": "2015-02-26T19:15:51",
+                    "comment_text": "",
+                    "python_version": "3.4",
+                    "url": "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-12.3-py2.py3-none-any.whl",  # NOQA
+                    "md5_digest": "31f51a38497a70efadf5ce8d4c2211ab",
+                    "downloads": 288451,
+                    "filename": "setuptools-12.3-py2.py3-none-any.whl",
+                    "packagetype": "bdist_wheel",
+                    "size": 501904
+                },
+                {
+                    "has_sig": false,
+                    "upload_time": "2015-02-26T19:15:43",
+                    "comment_text": "",
+                    "python_version": "source",
+                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-12.3.tar.gz",  # NOQA
+                    "md5_digest": "67614b6d560fa4f240e99cd553ec7f32",
+                    "downloads": 110109,
+                    "filename": "setuptools-12.3.tar.gz",
+                    "packagetype": "sdist",
+                    "size": 635025
+                },
+                {
+                    "has_sig": false,
+                    "upload_time": "2015-02-26T19:15:47",
+                    "comment_text": "",
+                    "python_version": "source",
+                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-12.3.zip",  # NOQA
+                    "md5_digest": "abc799e7db6e7281535bf342bfc41a12",
+                    "downloads": 67539,
+                    "filename": "setuptools-12.3.zip",
+                    "packagetype": "sdist",
+                    "size": 678783
+                }
+            ],
+        """
+        url = "https://pypi.python.org/pypi/%s/json" % (package_name,)
+        data = json.load(urllib2.urlopen(urllib2.Request(url)))
+
+        # Mainly for debug.
+        json_filename = "%s/%s.json" % (self.dirpath, DISTRIBUTION)
+        with open(json_filename, 'w') as outfile:
+            json.dump(
+                data,
+                outfile,
+                sort_keys=True,
+                indent=4,
+                separators=(',', ': '),
+            )
+
+        return data
+
+    def get_setuptools_releases_without_zip_counterpart(self):
+        # Get set(all_valid_releases) - set(releases_with_zip), so now we have
+        # the releases without zip.
+        return set(self.valid_releases_numbers) - set([
+            release
+            for release in self.valid_releases_numbers
+                for same_version_release_dict in self.data_json_setuptools['releases'][release]  # NOQA
+                if 'zip' in same_version_release_dict['filename']
+       ])
+
+    def download_setuptools_releases_without_zip_counterpart(self):
+        try:
+            releases_without_zip = self.get_setuptools_releases_without_zip_counterpart()  # NOQA
+            failed_md5_releases = []
+            # This is a "strange" loop, going through all releases and
+            # testing only the release I need to download, but I thought it
+            # would be mouch more readable than trying to iterate through
+            # releases I need and get into traverse hell values inside dicts
+            # inside dicts of the json to get the distribution's url to
+            # download.
+            for release in self.valid_releases_numbers:
+                if release in releases_without_zip:
+                    for same_version_release_dict in self.data_json_setuptools['releases'][release]:  # NOQA
+                        if 'tar.gz' in same_version_release_dict['filename']:
+                            print "Downloading %s..." % release
+                            local_file = '%s/%s' % (
+                                self.dirpath,
+                                same_version_release_dict["filename"]
+                            )
+                            urllib.urlretrieve(
+                                same_version_release_dict["url"],
+                                local_file
+                            )
+                            targz = open(local_file, 'rb').read()
+                            hexdigest = hashlib.md5(targz).hexdigest()
+                            if (hexdigest != same_version_release_dict['md5_digest']):  # NOQA
+                                print FAIL + "FAIL: md5 for %s didn't match!" % release + END  # NOQA
+                                failed_md5_releases.append(release)
+                            else:
+                                self.total_downloaded_ok += 1
+            print 'Total releases without zip: %s' % len(releases_without_zip)
+            print 'Total downloaded: %s' % self.total_downloaded_ok
+            if failed_md5_releases:
+                raise(Exception(
+                    FAIL + (
+                        "FAIL: these releases %s failed the md5 check!" %
+                        ','.join(failed_md5_releases)
+                    ) + END
+                ))
+            elif self.total_downloaded_ok != len(releases_without_zip):
+                raise(Exception(
+                    FAIL + (
+                        "FAIL: Unknown error occured. Please check the logs."
+                    ) + END
+                ))
+            else:
+                print OK + "All releases downloaded and md5 checked." + END
+
+        except OSError as e:
+            if e.errno != errno.EEXIST:
+                raise e
+
+    def convert_targz_to_zip(self):
+        print "Converting the tar.gz to zip..."
+        files = glob.glob('%s/*.tar.gz' % self.dirpath)
+        total_converted = 0
+        for targz in sorted(files, key=LooseVersion):
+            # Extract and remove tar.
+            tar = tarfile.open(targz)
+            tar.extractall(path=self.dirpath)
+            tar.close()
+            os.remove(targz)
+
+            # Zip the extracted tar.
+            setuptools_folder_path = targz.replace('.tar.gz', '')
+            setuptools_folder_name = setuptools_folder_path.split("/")[-1]
+            print setuptools_folder_name
+            shutil.make_archive(
+                setuptools_folder_path,
+                'zip',
+                self.dirpath,
+                setuptools_folder_name
+            )
+            # Exclude extracted tar folder.
+            shutil.rmtree(setuptools_folder_path.replace('.zip', ''))
+            total_converted += 1
+        print 'Total converted: %s' % total_converted
+        if self.total_downloaded_ok != total_converted:
+            raise(Exception(
+                FAIL + (
+                    "FAIL: Total number of downloaded releases is different"
+                    " from converted ones. Please check the logs."
+                ) + END
+            ))
+        print "Done with the tar.gz->zip. Check folder %s." % main.dirpath
+
+    def upload_zips_to_pypi(self):
+        print 'Uploading to pypi...'
+        zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=LooseVersion)
+        for zips in glob.glob('%s/*.zip' % self.dirpath):
+            # Put the twine upload code here
+            pass
+
+
+main = SetuptoolsOldReleasesWithoutZip()
+main.download_setuptools_releases_without_zip_counterpart()
+main.convert_targz_to_zip()
+main.upload_zips_to_pypi()

From 34668623d92b950634a2fcf750d902fb34f321ae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 16:53:56 -0500
Subject: [PATCH 5267/8469] Only execute when invoked as script

---
 scripts/upload-old-releases-as-zip.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 5349281911..e08e4bb498 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -228,7 +228,8 @@ def upload_zips_to_pypi(self):
             pass
 
 
-main = SetuptoolsOldReleasesWithoutZip()
-main.download_setuptools_releases_without_zip_counterpart()
-main.convert_targz_to_zip()
-main.upload_zips_to_pypi()
+if __name__ == '__main__':
+    main = SetuptoolsOldReleasesWithoutZip()
+    main.download_setuptools_releases_without_zip_counterpart()
+    main.convert_targz_to_zip()
+    main.upload_zips_to_pypi()

From 2ac91b232f9f7061c53b51520353c31b12d576be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:00:39 -0500
Subject: [PATCH 5268/8469] Extract parameter to exceptions and remove
 superfluous parentheses

---
 scripts/upload-old-releases-as-zip.py | 31 ++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index e08e4bb498..f0ca41c370 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -167,18 +167,16 @@ def download_setuptools_releases_without_zip_counterpart(self):
             print 'Total releases without zip: %s' % len(releases_without_zip)
             print 'Total downloaded: %s' % self.total_downloaded_ok
             if failed_md5_releases:
-                raise(Exception(
-                    FAIL + (
-                        "FAIL: these releases %s failed the md5 check!" %
-                        ','.join(failed_md5_releases)
-                    ) + END
-                ))
+                msg = FAIL + (
+                    "FAIL: these releases %s failed the md5 check!" %
+                    ','.join(failed_md5_releases)
+                ) + END
+                raise Exception(msg)
             elif self.total_downloaded_ok != len(releases_without_zip):
-                raise(Exception(
-                    FAIL + (
-                        "FAIL: Unknown error occured. Please check the logs."
-                    ) + END
-                ))
+                msg = FAIL + (
+                    "FAIL: Unknown error occured. Please check the logs."
+                ) + END
+                raise Exception(msg)
             else:
                 print OK + "All releases downloaded and md5 checked." + END
 
@@ -212,12 +210,11 @@ def convert_targz_to_zip(self):
             total_converted += 1
         print 'Total converted: %s' % total_converted
         if self.total_downloaded_ok != total_converted:
-            raise(Exception(
-                FAIL + (
-                    "FAIL: Total number of downloaded releases is different"
-                    " from converted ones. Please check the logs."
-                ) + END
-            ))
+            msg = FAIL + (
+                "FAIL: Total number of downloaded releases is different"
+                " from converted ones. Please check the logs."
+            ) + END
+            raise Exception(msg)
         print "Done with the tar.gz->zip. Check folder %s." % main.dirpath
 
     def upload_zips_to_pypi(self):

From e30ea433fbfc1de15e23bcb4f2310c525fa5ea0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:01:26 -0500
Subject: [PATCH 5269/8469] Run 2to3 on script

---
 scripts/upload-old-releases-as-zip.py | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index f0ca41c370..33a3e29c75 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -9,8 +9,8 @@
 import shutil
 import tarfile
 import tempfile
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 
 from distutils.version import LooseVersion
 
@@ -26,8 +26,8 @@ class SetuptoolsOldReleasesWithoutZip(object):
     def __init__(self):
         super(SetuptoolsOldReleasesWithoutZip, self).__init__()
         self.dirpath = tempfile.mkdtemp(prefix=DISTRIBUTION)
-        print "Downloading %s releases..." % DISTRIBUTION
-        print "All releases will be downloaded to %s" % self.dirpath
+        print("Downloading %s releases..." % DISTRIBUTION)
+        print("All releases will be downloaded to %s" % self.dirpath)
         self.data_json_setuptools = self.get_json_data(DISTRIBUTION)
         self.valid_releases_numbers = sorted([
             release
@@ -109,7 +109,7 @@ def get_json_data(self, package_name):
             ],
         """
         url = "https://pypi.python.org/pypi/%s/json" % (package_name,)
-        data = json.load(urllib2.urlopen(urllib2.Request(url)))
+        data = json.load(urllib.request.urlopen(urllib.request.Request(url)))
 
         # Mainly for debug.
         json_filename = "%s/%s.json" % (self.dirpath, DISTRIBUTION)
@@ -148,24 +148,24 @@ def download_setuptools_releases_without_zip_counterpart(self):
                 if release in releases_without_zip:
                     for same_version_release_dict in self.data_json_setuptools['releases'][release]:  # NOQA
                         if 'tar.gz' in same_version_release_dict['filename']:
-                            print "Downloading %s..." % release
+                            print("Downloading %s..." % release)
                             local_file = '%s/%s' % (
                                 self.dirpath,
                                 same_version_release_dict["filename"]
                             )
-                            urllib.urlretrieve(
+                            urllib.request.urlretrieve(
                                 same_version_release_dict["url"],
                                 local_file
                             )
                             targz = open(local_file, 'rb').read()
                             hexdigest = hashlib.md5(targz).hexdigest()
                             if (hexdigest != same_version_release_dict['md5_digest']):  # NOQA
-                                print FAIL + "FAIL: md5 for %s didn't match!" % release + END  # NOQA
+                                print(FAIL + "FAIL: md5 for %s didn't match!" % release + END)  # NOQA
                                 failed_md5_releases.append(release)
                             else:
                                 self.total_downloaded_ok += 1
-            print 'Total releases without zip: %s' % len(releases_without_zip)
-            print 'Total downloaded: %s' % self.total_downloaded_ok
+            print('Total releases without zip: %s' % len(releases_without_zip))
+            print('Total downloaded: %s' % self.total_downloaded_ok)
             if failed_md5_releases:
                 msg = FAIL + (
                     "FAIL: these releases %s failed the md5 check!" %
@@ -178,14 +178,14 @@ def download_setuptools_releases_without_zip_counterpart(self):
                 ) + END
                 raise Exception(msg)
             else:
-                print OK + "All releases downloaded and md5 checked." + END
+                print(OK + "All releases downloaded and md5 checked." + END)
 
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise e
 
     def convert_targz_to_zip(self):
-        print "Converting the tar.gz to zip..."
+        print("Converting the tar.gz to zip...")
         files = glob.glob('%s/*.tar.gz' % self.dirpath)
         total_converted = 0
         for targz in sorted(files, key=LooseVersion):
@@ -198,7 +198,7 @@ def convert_targz_to_zip(self):
             # Zip the extracted tar.
             setuptools_folder_path = targz.replace('.tar.gz', '')
             setuptools_folder_name = setuptools_folder_path.split("/")[-1]
-            print setuptools_folder_name
+            print(setuptools_folder_name)
             shutil.make_archive(
                 setuptools_folder_path,
                 'zip',
@@ -208,17 +208,17 @@ def convert_targz_to_zip(self):
             # Exclude extracted tar folder.
             shutil.rmtree(setuptools_folder_path.replace('.zip', ''))
             total_converted += 1
-        print 'Total converted: %s' % total_converted
+        print('Total converted: %s' % total_converted)
         if self.total_downloaded_ok != total_converted:
             msg = FAIL + (
                 "FAIL: Total number of downloaded releases is different"
                 " from converted ones. Please check the logs."
             ) + END
             raise Exception(msg)
-        print "Done with the tar.gz->zip. Check folder %s." % main.dirpath
+        print("Done with the tar.gz->zip. Check folder %s." % main.dirpath)
 
     def upload_zips_to_pypi(self):
-        print 'Uploading to pypi...'
+        print('Uploading to pypi...')
         zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=LooseVersion)
         for zips in glob.glob('%s/*.zip' % self.dirpath):
             # Put the twine upload code here

From fac5dc448b0a4a451da001ab629c134623399cc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:07:42 -0500
Subject: [PATCH 5270/8469] Add twine implementation

---
 scripts/upload-old-releases-as-zip.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 33a3e29c75..c1ce41f59a 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+# declare and require dependencies
+__requires__ = [
+    'twine',
+]; __import__('pkg_resources')
+
 import errno
 import glob
 import hashlib
@@ -11,9 +16,11 @@
 import tempfile
 import urllib.request, urllib.parse, urllib.error
 import urllib.request, urllib.error, urllib.parse
-
 from distutils.version import LooseVersion
 
+from twine.commands import upload
+
+
 OK = '\033[92m'
 FAIL = '\033[91m'
 END = '\033[0m'
@@ -221,8 +228,8 @@ def upload_zips_to_pypi(self):
         print('Uploading to pypi...')
         zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=LooseVersion)
         for zips in glob.glob('%s/*.zip' % self.dirpath):
-            # Put the twine upload code here
-            pass
+            print("simulated upload of", zips); continue
+            upload.upload(dists=list(zips))
 
 
 if __name__ == '__main__':

From 8329fb1ab5832f6ab07ed03929814bc4a4aeecd8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:08:25 -0500
Subject: [PATCH 5271/8469] Remove repeat glob code

---
 scripts/upload-old-releases-as-zip.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index c1ce41f59a..0c722d4876 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -227,9 +227,8 @@ def convert_targz_to_zip(self):
     def upload_zips_to_pypi(self):
         print('Uploading to pypi...')
         zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=LooseVersion)
-        for zips in glob.glob('%s/*.zip' % self.dirpath):
-            print("simulated upload of", zips); continue
-            upload.upload(dists=list(zips))
+        print("simulated upload of", zips); return
+        upload.upload(dists=zips)
 
 
 if __name__ == '__main__':

From 1837b319518745e80e32a3ec23ccd28b7fec3634 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:14:23 -0500
Subject: [PATCH 5272/8469] Reorganize imports

---
 scripts/upload-old-releases-as-zip.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 0c722d4876..c7c89fa79a 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -14,8 +14,9 @@
 import shutil
 import tarfile
 import tempfile
-import urllib.request, urllib.parse, urllib.error
-import urllib.request, urllib.error, urllib.parse
+import urllib.request
+import urllib.parse
+import urllib.error
 from distutils.version import LooseVersion
 
 from twine.commands import upload

From 7ffe08ef8185d87c0dfff1d5567f9d84f8e47ba7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:19:48 -0500
Subject: [PATCH 5273/8469] Remove unnecessary __init__

---
 scripts/upload-old-releases-as-zip.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index c7c89fa79a..1a63872038 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -14,6 +14,7 @@
 import shutil
 import tarfile
 import tempfile
+import codecs
 import urllib.request
 import urllib.parse
 import urllib.error
@@ -32,7 +33,6 @@ class SetuptoolsOldReleasesWithoutZip(object):
     """docstring for SetuptoolsOldReleases"""
 
     def __init__(self):
-        super(SetuptoolsOldReleasesWithoutZip, self).__init__()
         self.dirpath = tempfile.mkdtemp(prefix=DISTRIBUTION)
         print("Downloading %s releases..." % DISTRIBUTION)
         print("All releases will be downloaded to %s" % self.dirpath)
@@ -117,7 +117,10 @@ def get_json_data(self, package_name):
             ],
         """
         url = "https://pypi.python.org/pypi/%s/json" % (package_name,)
-        data = json.load(urllib.request.urlopen(urllib.request.Request(url)))
+        resp = urllib.request.urlopen(urllib.request.Request(url))
+        charset = resp.info().get_content_charset()
+        reader = codecs.getreader(charset)(resp)
+        data = json.load(reader)
 
         # Mainly for debug.
         json_filename = "%s/%s.json" % (self.dirpath, DISTRIBUTION)

From fcdbdc6fa628daffb6e80d5f333311705f86207a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:20:07 -0500
Subject: [PATCH 5274/8469] Remove unnecessary superclass

---
 scripts/upload-old-releases-as-zip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 1a63872038..c4b1bfb5ff 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -29,7 +29,7 @@
 DISTRIBUTION = "setuptools"
 
 
-class SetuptoolsOldReleasesWithoutZip(object):
+class SetuptoolsOldReleasesWithoutZip:
     """docstring for SetuptoolsOldReleases"""
 
     def __init__(self):

From cff3a4820a926b379b5556ab28c9e5bd67152926 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Nov 2015 17:21:39 -0500
Subject: [PATCH 5275/8469] Use a local path rather than a tempdir that never
 gets cleaned up.

---
 scripts/upload-old-releases-as-zip.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index c4b1bfb5ff..38cfcd5544 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -13,7 +13,6 @@
 import os
 import shutil
 import tarfile
-import tempfile
 import codecs
 import urllib.request
 import urllib.parse
@@ -33,7 +32,8 @@ class SetuptoolsOldReleasesWithoutZip:
     """docstring for SetuptoolsOldReleases"""
 
     def __init__(self):
-        self.dirpath = tempfile.mkdtemp(prefix=DISTRIBUTION)
+        self.dirpath = './dist'
+        os.makedirs(self.dirpath, exist_ok=True)
         print("Downloading %s releases..." % DISTRIBUTION)
         print("All releases will be downloaded to %s" % self.dirpath)
         self.data_json_setuptools = self.get_json_data(DISTRIBUTION)

From 32237eae19b3722b2a1c87bc0a74613c5f12d6fd Mon Sep 17 00:00:00 2001
From: sunpoet <none@none>
Date: Fri, 20 Nov 2015 05:54:41 +0800
Subject: [PATCH 5276/8469] Fix package list inconsistency caused by namespace
 package on Python 3.5

namespace package will be skipped during installation. Since Python 3.5, .pyo files are removed and new .opt-1.pyc (and .opt-2.pyc) files are introduced [1]. However setuptools does not understand that new naming therefore the corresponding foo.opt-1.pyc is still added into package list (via --record). The inconsistency leads to a packaging error.

[1] https://www.python.org/dev/peps/pep-0488/
---
 setuptools/command/install_lib.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 9b7722276b..78fe689152 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -79,6 +79,8 @@ def _gen_exclusion_paths():
         base = os.path.join('__pycache__', '__init__.' + imp.get_tag())
         yield base + '.pyc'
         yield base + '.pyo'
+        yield base + '.opt-1.pyc'
+        yield base + '.opt-2.pyc'
 
     def copy_tree(
             self, infile, outfile,

From 68e4344ceaff4dd88ffbfbf5370639cc854a8af8 Mon Sep 17 00:00:00 2001
From: grizzlynyo <grizzly.nyo@gmail.com>
Date: Sat, 21 Nov 2015 14:13:19 +0200
Subject: [PATCH 5277/8469] update certifi to 2015.11.20

--HG--
branch : sync_certifi
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 6226111d41..9d7f228d21 100755
--- a/setup.py
+++ b/setup.py
@@ -150,10 +150,10 @@ def _gen_console_scripts():
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2015.04.28",
+        "certs": "certifi==2015.11.20",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz#md5=12c7c3a063b2ff97a0f8291d8de41e8c',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts=[],

From 864de11cf162c693fe248b609d73545cacb622df Mon Sep 17 00:00:00 2001
From: grizzlynyo <grizzly.nyo@gmail.com>
Date: Sat, 21 Nov 2015 15:15:23 +0200
Subject: [PATCH 5278/8469] fix an issue for bdist_wininst with gui_scripts:

The script header was always generated with non-gui executable.
This was caused by by adjust_header assuming the executable is always an
absolute path.

Fixed by using find_executables() from distutils.

--HG--
branch : bdist_wininst_gui_scripts
---
 setuptools/command/easy_install.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 45d180bb3c..7ceac03f68 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2137,10 +2137,13 @@ def _adjust_header(type_, orig_header):
             pattern, repl = repl, pattern
         pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
         new_header = pattern_ob.sub(string=orig_header, repl=repl)
-        clean_header = new_header[2:-1].strip('"')
-        if sys.platform == 'win32' and not os.path.exists(clean_header):
-            # the adjusted version doesn't exist, so return the original
-            return orig_header
+        if sys.platform == 'win32':
+            from distutils.spawn import find_executable
+
+            clean_header = new_header[2:-1].strip('"')
+            if not find_executable(clean_header):
+                # the adjusted version doesn't exist, so return the original
+                return orig_header
         return new_header
 
 

From aa8a6c90ac9b165ee1c6e6e3d72fff34adba2850 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 21:20:36 -0500
Subject: [PATCH 5279/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b14e910359..a6b9f72047 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,12 @@ CHANGES
 =======
 
 
+----
+18.7
+----
+
+* Update dependency on certify.
+
 ------
 18.6.1
 ------

From fb2860e63f463355aa3c9e824adff48dfeaad837 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 21:28:59 -0500
Subject: [PATCH 5280/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a6b9f72047..73855d1c2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 ----
 
 * Update dependency on certify.
+* Pull Request #160: Improve detection of gui script in
+  ``easy_install._adjust_header``.
 
 ------
 18.6.1

From a361ef49cda256e1f53894470cb921d19e04e853 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 21:35:51 -0500
Subject: [PATCH 5281/8469] Extract _use_header method

---
 setuptools/command/easy_install.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f3b5fa6201..9e9c5e544f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -20,6 +20,7 @@
 from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
 from distutils import log, dir_util
 from distutils.command.build_scripts import first_line_re
+from distutils.spawn import find_executable
 import sys
 import os
 import zipimport
@@ -2126,8 +2127,8 @@ def _get_script_args(cls, type_, name, header, script_text):
         blockers = [name + x for x in old]
         yield name + ext, header + script_text, 't', blockers
 
-    @staticmethod
-    def _adjust_header(type_, orig_header):
+    @classmethod
+    def _adjust_header(cls, type_, orig_header):
         """
         Make sure 'pythonw' is used for gui and and 'python' is used for
         console (regardless of what sys.executable is).
@@ -2138,14 +2139,19 @@ def _adjust_header(type_, orig_header):
             pattern, repl = repl, pattern
         pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
         new_header = pattern_ob.sub(string=orig_header, repl=repl)
-        if sys.platform == 'win32':
-            from distutils.spawn import find_executable
-
-            clean_header = new_header[2:-1].strip('"')
-            if not find_executable(clean_header):
-                # the adjusted version doesn't exist, so return the original
-                return orig_header
-        return new_header
+        return new_header if cls._use_header(new_header) else orig_header
+
+    @staticmethod
+    def _use_header(new_header):
+        """
+        Should _adjust_header use the replaced header?
+
+        On non-windows systems, always use. On
+        Windows systems, only use the replaced header if it resolves
+        to an executable on the system.
+        """
+        clean_header = new_header[2:-1].strip('"')
+        return sys.platform != 'win32' or find_executable(clean_header)
 
 
 class WindowsExecutableLauncherWriter(WindowsScriptWriter):

From a63119c9ebd8e7c578203628023877f7aa3f7e97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 22:41:52 -0500
Subject: [PATCH 5282/8469] Make test.test_args a non-data property per Pull
 Request #155.

---
 CHANGES.txt                |  2 ++
 setuptools/command/test.py | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 73855d1c2c..f399636ff4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,8 @@ CHANGES
 * Update dependency on certify.
 * Pull Request #160: Improve detection of gui script in
   ``easy_install._adjust_header``.
+* Made ``test.test_args`` a non-data property; alternate fix
+  for the issue reported in Pull Request #155.
 
 ------
 18.6.1
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 160e21c95e..c26f5fc939 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -41,6 +41,17 @@ def loadTestsFromModule(self, module, pattern=None):
             return tests[0]  # don't create a nested suite for only one return
 
 
+# adapted from jaraco.classes.properties:NonDataProperty
+class NonDataProperty(object):
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, obj, objtype=None):
+        if obj is None:
+            return self
+        return self.fget(obj)
+
+
 class test(Command):
     """Command to run unit tests after in-place build"""
 
@@ -78,7 +89,7 @@ def finalize_options(self):
         if self.test_runner is None:
             self.test_runner = getattr(self.distribution, 'test_runner', None)
 
-    @property
+    @NonDataProperty
     def test_args(self):
         return list(self._test_args())
 

From 1a5cecf5cf61861816a2e02e513256b614b492d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 22:55:03 -0500
Subject: [PATCH 5283/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index f399636ff4..ebe7643337 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,8 @@ CHANGES
   ``easy_install._adjust_header``.
 * Made ``test.test_args`` a non-data property; alternate fix
   for the issue reported in Pull Request #155.
+* Issue #453: In ``ez_setup`` bootstrap module, unload all
+  ``pkg_resources`` modules following download.
 
 ------
 18.6.1

From e99e20ceb50b6292be0d383ec67f2ca6692a6d70 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 27 Nov 2015 23:04:23 -0500
Subject: [PATCH 5284/8469] Update changelog

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ebe7643337..fa89b09bec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ CHANGES
   for the issue reported in Pull Request #155.
 * Issue #453: In ``ez_setup`` bootstrap module, unload all
   ``pkg_resources`` modules following download.
+* Pull Request #158: Honor `PEP-488
+  <https://www.python.org/dev/peps/pep-0488/>`_ when excluding
+  files for namespace packages.
 
 ------
 18.6.1

From 141d093b0e7f50459c8053ee4619c9991473be6e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 11:51:17 -0500
Subject: [PATCH 5285/8469] Move test into pkg_resources tests

---
 pkg_resources/tests/test_pkg_resources.py | 96 +++++++++++++++++++++++
 setuptools/tests/test_egg_info.py         | 85 --------------------
 2 files changed, 96 insertions(+), 85 deletions(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 564d7cec4f..257cbb5ba6 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -5,9 +5,17 @@
 import datetime
 import time
 import subprocess
+import stat
+
+import pytest
 
 import pkg_resources
 
+from setuptools.tests.textwrap import DALS
+from setuptools.tests import contexts
+from setuptools.tests import environment
+
+
 try:
     unicode
 except NameError:
@@ -109,3 +117,91 @@ def test_setuptools_not_imported(self):
         )
         cmd = [sys.executable, '-c', '; '.join(lines)]
         subprocess.check_call(cmd)
+
+
+
+class TestEggInfoDistutils(object):
+
+    version = '1.11.0.dev0+2329eae'
+    setup_script = DALS("""
+        from distutils.core import setup
+
+        setup(
+            name='foo',
+            py_modules=['hello'],
+            version='%s',
+        )
+        """)
+
+    def _create_project(self):
+        with open('setup.py', 'w') as f:
+            f.write(self.setup_script % self.version)
+
+        with open('hello.py', 'w') as f:
+            f.write(DALS("""
+                def run():
+                    print('hello')
+                """))
+
+    @pytest.yield_fixture
+    def env(self):
+        class Environment(str):
+            pass
+        with contexts.tempdir(prefix='setuptools-test.') as env_dir:
+            env = Environment(env_dir)
+            os.chmod(env_dir, stat.S_IRWXU)
+            subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
+            env.paths = dict(
+                (dirname, os.path.join(env_dir, dirname))
+                for dirname in subs
+            )
+            list(map(os.mkdir, env.paths.values()))
+            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
+            with open(config, 'w') as f:
+                f.write(DALS("""
+                    [egg_info]
+                    egg-base = %(egg-base)s
+                    """ % env.paths))
+            yield env
+
+    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
+        self._create_project()
+
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        cmd = [
+            'install',
+            '--home', env.paths['home'],
+            '--install-lib', env.paths['lib'],
+            '--install-scripts', env.paths['scripts'],
+            '--install-data', env.paths['data'],
+        ]
+        code, data = environment.run_setup_py(
+            cmd=cmd,
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        if code:
+            raise AssertionError(data)
+
+        actual = self._find_egg_info_file(env.paths['lib'])
+        # On Py3k it can be e.g. foo-1.11.0.dev0_2329eae-py3.4.egg-info
+        # but 2.7 doesn't add the Python version, so to be expedient we
+        # just check our start and end, omitting the potential version num
+        assert actual.startswith('foo-' + self.version.replace('+', '_'))
+        assert actual.endswith('.egg-info')
+        # this requirement parsing will raise a VersionConflict unless the
+        # .egg-info file is parsed (see #419 on BitBucket)
+        req = pkg_resources.Requirement.parse('foo>=1.9')
+        dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req)
+        assert dist.version == self.version
+
+    def _find_egg_info_file(self, root):
+        # expect exactly one result
+        result = (filename for dirpath, dirnames, filenames in os.walk(root)
+                  for filename in filenames if filename.endswith('.egg-info'))
+        result, = result
+        return result
+
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index b4195e06e6..645c379c6f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,7 +6,6 @@
 from . import environment
 from .textwrap import DALS
 from . import contexts
-from pkg_resources import WorkingSet, Requirement
 
 
 class Environment(str):
@@ -98,87 +97,3 @@ def _find_egg_info_files(self, root):
         # expect exactly one result
         result, = results
         return result
-
-
-class TestEggInfoDistutils(object):
-
-    version = '1.11.0.dev0+2329eae'
-    setup_script = DALS("""
-        from distutils.core import setup
-
-        setup(
-            name='foo',
-            py_modules=['hello'],
-            version='%s',
-        )
-        """)
-
-    def _create_project(self):
-        with open('setup.py', 'w') as f:
-            f.write(self.setup_script % self.version)
-
-        with open('hello.py', 'w') as f:
-            f.write(DALS("""
-                def run():
-                    print('hello')
-                """))
-
-    @pytest.yield_fixture
-    def env(self):
-        with contexts.tempdir(prefix='setuptools-test.') as env_dir:
-            env = Environment(env_dir)
-            os.chmod(env_dir, stat.S_IRWXU)
-            subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
-            env.paths = dict(
-                (dirname, os.path.join(env_dir, dirname))
-                for dirname in subs
-            )
-            list(map(os.mkdir, env.paths.values()))
-            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
-            with open(config, 'w') as f:
-                f.write(DALS("""
-                    [egg_info]
-                    egg-base = %(egg-base)s
-                    """ % env.paths))
-            yield env
-
-    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
-        self._create_project()
-
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        cmd = [
-            'install',
-            '--home', env.paths['home'],
-            '--install-lib', env.paths['lib'],
-            '--install-scripts', env.paths['scripts'],
-            '--install-data', env.paths['data'],
-        ]
-        code, data = environment.run_setup_py(
-            cmd=cmd,
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        if code:
-            raise AssertionError(data)
-
-        actual = self._find_egg_info_file(env.paths['lib'])
-        # On Py3k it can be e.g. foo-1.11.0.dev0_2329eae-py3.4.egg-info
-        # but 2.7 doesn't add the Python version, so to be expedient we
-        # just check our start and end, omitting the potential version num
-        assert actual.startswith('foo-' + self.version.replace('+', '_'))
-        assert actual.endswith('.egg-info')
-        # this requirement parsing will raise a VersionConflict unless the
-        # .egg-info file is parsed (see #419 on BitBucket)
-        req = Requirement.parse('foo>=1.9')
-        dist = WorkingSet([env.paths['lib']]).find(req)
-        assert dist.version == self.version
-
-    def _find_egg_info_file(self, root):
-        # expect exactly one result
-        result = (filename for dirpath, dirnames, filenames in os.walk(root)
-                  for filename in filenames if filename.endswith('.egg-info'))
-        result, = result
-        return result

From 25fc8c1d05c84ea9d6155be4326e837f90dd173d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 11:54:23 -0500
Subject: [PATCH 5286/8469] Rename test to match intention.

---
 pkg_resources/tests/test_pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 257cbb5ba6..698aefbd9f 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -164,7 +164,7 @@ class Environment(str):
                     """ % env.paths))
             yield env
 
-    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
+    def test_version_resolved_from_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
         environ = os.environ.copy().update(

From 41868fe7c4f75708b3cb663bf1b76405223869b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 12:54:28 -0500
Subject: [PATCH 5287/8469] Rewrite test to simply create the egg_info.

---
 pkg_resources/tests/test_pkg_resources.py | 115 +++++++---------------
 1 file changed, 35 insertions(+), 80 deletions(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 698aefbd9f..8b9a317a74 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -8,13 +8,10 @@
 import stat
 
 import pytest
+import py
 
 import pkg_resources
 
-from setuptools.tests.textwrap import DALS
-from setuptools.tests import contexts
-from setuptools.tests import environment
-
 
 try:
     unicode
@@ -120,88 +117,46 @@ def test_setuptools_not_imported(self):
 
 
 
-class TestEggInfoDistutils(object):
+class TestDeepVersionLookup(object):
 
-    version = '1.11.0.dev0+2329eae'
-    setup_script = DALS("""
-        from distutils.core import setup
+    @pytest.fixture
+    def env(self, tmpdir):
+        """
+        Create a package environment, similar to a virtualenv,
+        in which packages are installed.
+        """
+        class Environment(str):
+            pass
 
-        setup(
-            name='foo',
-            py_modules=['hello'],
-            version='%s',
+        env = Environment(tmpdir)
+        tmpdir.chmod(stat.S_IRWXU)
+        subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
+        env.paths = dict(
+            (dirname, str(tmpdir / dirname))
+            for dirname in subs
         )
-        """)
-
-    def _create_project(self):
-        with open('setup.py', 'w') as f:
-            f.write(self.setup_script % self.version)
+        list(map(os.mkdir, env.paths.values()))
+        return env
 
-        with open('hello.py', 'w') as f:
-            f.write(DALS("""
-                def run():
-                    print('hello')
-                """))
+    def create_foo_pkg(self, env, version):
+        """
+        Create a foo package installed to env.paths['lib']
+        as version.
+        """
+        safe_version = pkg_resources.safe_version(version)
+        lib = py.path.local(env.paths['lib'])
+        egg_info = lib / 'foo-' + safe_version + '.egg-info'
+        egg_info.mkdir()
+        pkg_info = egg_info / 'PKG_INFO'
+        with pkg_info.open('w') as strm:
+            strm.write('version: ' + version)
+
+    def test_version_resolved_from_egg_info(self, env):
+        version = '1.11.0.dev0+2329eae'
+        self.create_foo_pkg(env, version)
 
-    @pytest.yield_fixture
-    def env(self):
-        class Environment(str):
-            pass
-        with contexts.tempdir(prefix='setuptools-test.') as env_dir:
-            env = Environment(env_dir)
-            os.chmod(env_dir, stat.S_IRWXU)
-            subs = 'home', 'lib', 'scripts', 'data', 'egg-base'
-            env.paths = dict(
-                (dirname, os.path.join(env_dir, dirname))
-                for dirname in subs
-            )
-            list(map(os.mkdir, env.paths.values()))
-            config = os.path.join(env.paths['home'], '.pydistutils.cfg')
-            with open(config, 'w') as f:
-                f.write(DALS("""
-                    [egg_info]
-                    egg-base = %(egg-base)s
-                    """ % env.paths))
-            yield env
-
-    def test_version_resolved_from_egg_info(self, tmpdir_cwd, env):
-        self._create_project()
-
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        cmd = [
-            'install',
-            '--home', env.paths['home'],
-            '--install-lib', env.paths['lib'],
-            '--install-scripts', env.paths['scripts'],
-            '--install-data', env.paths['data'],
-        ]
-        code, data = environment.run_setup_py(
-            cmd=cmd,
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        if code:
-            raise AssertionError(data)
-
-        actual = self._find_egg_info_file(env.paths['lib'])
-        # On Py3k it can be e.g. foo-1.11.0.dev0_2329eae-py3.4.egg-info
-        # but 2.7 doesn't add the Python version, so to be expedient we
-        # just check our start and end, omitting the potential version num
-        assert actual.startswith('foo-' + self.version.replace('+', '_'))
-        assert actual.endswith('.egg-info')
         # this requirement parsing will raise a VersionConflict unless the
         # .egg-info file is parsed (see #419 on BitBucket)
         req = pkg_resources.Requirement.parse('foo>=1.9')
         dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req)
-        assert dist.version == self.version
-
-    def _find_egg_info_file(self, root):
-        # expect exactly one result
-        result = (filename for dirpath, dirnames, filenames in os.walk(root)
-                  for filename in filenames if filename.endswith('.egg-info'))
-        result, = result
-        return result
-
+        assert dist.version == version

From 9744cf2edf82eeda796ca22bf21ac0056c8aa925 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:00:32 -0500
Subject: [PATCH 5288/8469] Rewrite test to use distutils' install_egg_info to
 generate the metadata.

---
 pkg_resources/tests/test_pkg_resources.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 8b9a317a74..0a03dd9360 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -6,9 +6,10 @@
 import time
 import subprocess
 import stat
+import distutils.dist
+import distutils.command.install_egg_info
 
 import pytest
-import py
 
 import pkg_resources
 
@@ -117,7 +118,7 @@ def test_setuptools_not_imported(self):
 
 
 
-class TestDeepVersionLookup(object):
+class TestDeepVersionLookupDistutils(object):
 
     @pytest.fixture
     def env(self, tmpdir):
@@ -140,16 +141,16 @@ class Environment(str):
 
     def create_foo_pkg(self, env, version):
         """
-        Create a foo package installed to env.paths['lib']
+        Create a foo package installed (distutils-style) to env.paths['lib']
         as version.
         """
-        safe_version = pkg_resources.safe_version(version)
-        lib = py.path.local(env.paths['lib'])
-        egg_info = lib / 'foo-' + safe_version + '.egg-info'
-        egg_info.mkdir()
-        pkg_info = egg_info / 'PKG_INFO'
-        with pkg_info.open('w') as strm:
-            strm.write('version: ' + version)
+        attrs = dict(name='foo', version=version)
+        dist = distutils.dist.Distribution(attrs)
+        iei_cmd = distutils.command.install_egg_info.install_egg_info(dist)
+        iei_cmd.initialize_options()
+        iei_cmd.install_dir = env.paths['lib']
+        iei_cmd.finalize_options()
+        iei_cmd.run()
 
     def test_version_resolved_from_egg_info(self, env):
         version = '1.11.0.dev0+2329eae'

From 423ef416ff975934fc3a2166b7fec76b3861da65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:14:56 -0500
Subject: [PATCH 5289/8469] Rewrite _version_from_file using iterables and
 filters

---
 pkg_resources/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 938f481872..59787a954a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2466,11 +2466,11 @@ def _remove_md5_fragment(location):
     return location
 
 
-def _version_from_file(fid):
-    for line in fid:
-        if line.lower().startswith('version:'):
-            version = safe_version(line.split(':', 1)[1].strip())
-            return version
+def _version_from_file(lines):
+    is_version_line = lambda line: line.lower().startswith('version:')
+    version_lines = filter(is_version_line, lines)
+    line = next(iter(version_lines))
+    return safe_version(line.split(':', 1)[1].strip())
 
 
 class Distribution(object):

From 498e9d316fad24d848e80a7394c45f2740dd24bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:16:14 -0500
Subject: [PATCH 5290/8469] Use partition to avoid integer literals

---
 pkg_resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 59787a954a..c4071f11e4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2470,7 +2470,8 @@ def _version_from_file(lines):
     is_version_line = lambda line: line.lower().startswith('version:')
     version_lines = filter(is_version_line, lines)
     line = next(iter(version_lines))
-    return safe_version(line.split(':', 1)[1].strip())
+    _, _, value = line.partition(':')
+    return safe_version(value.strip())
 
 
 class Distribution(object):

From 653987e5827beb668a2b32d9512fc7b238576155 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:21:01 -0500
Subject: [PATCH 5291/8469] Return None when no version is encountered.

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c4071f11e4..9a3ca36c86 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2469,9 +2469,9 @@ def _remove_md5_fragment(location):
 def _version_from_file(lines):
     is_version_line = lambda line: line.lower().startswith('version:')
     version_lines = filter(is_version_line, lines)
-    line = next(iter(version_lines))
+    line = next(iter(version_lines), '')
     _, _, value = line.partition(':')
-    return safe_version(value.strip())
+    return safe_version(value.strip()) or None
 
 
 class Distribution(object):

From 87ceb61bbb4a668539111efd84c5e0de7649e097 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:21:54 -0500
Subject: [PATCH 5292/8469] Add docstring

---
 pkg_resources/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 9a3ca36c86..e4decac388 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2467,6 +2467,10 @@ def _remove_md5_fragment(location):
 
 
 def _version_from_file(lines):
+    """
+    Given an iterable of lines from a Metadata file, return
+    the value of the Version field, if present, or None otherwise.
+    """
     is_version_line = lambda line: line.lower().startswith('version:')
     version_lines = filter(is_version_line, lines)
     line = next(iter(version_lines), '')

From 78b89bdb89e27a165619496fc0b84979664784e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 13:46:53 -0500
Subject: [PATCH 5293/8469] Extract method for _version_from_egg_info.

---
 pkg_resources/__init__.py | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index e4decac388..3090dd8197 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2497,6 +2497,7 @@ def __init__(self, location=None, metadata=None, project_name=None,
     @classmethod
     def from_location(cls, location, basename, metadata=None, **kw):
         project_name, version, py_version, platform = [None]*4
+        dist_path = os.path.join(location, basename)
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
             # .dist-info gets much metadata differently
@@ -2507,26 +2508,34 @@ def from_location(cls, location, basename, metadata=None, **kw):
                 )
             cls = _distributionImpl[ext.lower()]
 
-            # Some packages e.g. numpy and scipy use distutils instead of
-            # setuptools, and their version numbers can get mangled when
-            # converted to filenames (e.g., 1.11.0.dev0+2329eae to
-            # 1.11.0.dev0_2329eae). These will not be parsed properly
-            # downstream by Distribution and safe_version, so we need to
-            # take an extra step and try to get the version number from
-            # the file itself instead of the filename.
-            if ext == '.egg-info':
-                full_name = os.path.join(location, basename + ext)
-                try:
-                    with open(full_name, 'r') as fid:
-                        version_ = _version_from_file(fid)
-                    version = version_ if version_ is not None else version
-                except IOError:
-                    pass
+            version = cls._version_from_egg_info(dist_path) or version
         return cls(
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
         )
 
+    @staticmethod
+    def _version_from_egg_info(dist_path):
+        """
+        Packages installed by distutils (e.g. numpy or scipy),
+        which uses an old safe_version, and so
+        their version numbers can get mangled when
+        converted to filenames (e.g., 1.11.0.dev0+2329eae to
+        1.11.0.dev0_2329eae). These distributions will not be
+        parsed properly
+        downstream by Distribution and safe_version, so
+        take an extra step and try to get the version number from
+        the metadata file itself instead of the filename.
+        """
+        _, ext = os.path.splitext(dist_path)
+        if ext != '.egg-info' or not os.path.isfile(dist_path):
+            return
+        try:
+            with open(dist_path) as strm:
+                return _version_from_file(strm)
+        except IOError:
+            pass
+
     @property
     def hashcmp(self):
         return (

From ca89b06983e1a099bab3a7fe540ef72d210484b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 14:00:30 -0500
Subject: [PATCH 5294/8469] Encapsulate egg-info special behavior in
 EggInfoDistribution class.

---
 pkg_resources/__init__.py | 46 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3090dd8197..631c85476b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2516,25 +2516,7 @@ def from_location(cls, location, basename, metadata=None, **kw):
 
     @staticmethod
     def _version_from_egg_info(dist_path):
-        """
-        Packages installed by distutils (e.g. numpy or scipy),
-        which uses an old safe_version, and so
-        their version numbers can get mangled when
-        converted to filenames (e.g., 1.11.0.dev0+2329eae to
-        1.11.0.dev0_2329eae). These distributions will not be
-        parsed properly
-        downstream by Distribution and safe_version, so
-        take an extra step and try to get the version number from
-        the metadata file itself instead of the filename.
-        """
-        _, ext = os.path.splitext(dist_path)
-        if ext != '.egg-info' or not os.path.isfile(dist_path):
-            return
-        try:
-            with open(dist_path) as strm:
-                return _version_from_file(strm)
-        except IOError:
-            pass
+        pass
 
     @property
     def hashcmp(self):
@@ -2830,6 +2812,30 @@ def extras(self):
         return [dep for dep in self._dep_map if dep]
 
 
+class EggInfoDistribution(Distribution):
+
+    @staticmethod
+    def _version_from_egg_info(dist_path):
+        """
+        Packages installed by distutils (e.g. numpy or scipy),
+        which uses an old safe_version, and so
+        their version numbers can get mangled when
+        converted to filenames (e.g., 1.11.0.dev0+2329eae to
+        1.11.0.dev0_2329eae). These distributions will not be
+        parsed properly
+        downstream by Distribution and safe_version, so
+        take an extra step and try to get the version number from
+        the metadata file itself instead of the filename.
+        """
+        if not os.path.isfile(dist_path):
+            return
+        try:
+            with open(dist_path) as strm:
+                return _version_from_file(strm)
+        except IOError:
+            pass
+
+
 class DistInfoDistribution(Distribution):
     """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
     PKG_INFO = 'METADATA'
@@ -2895,7 +2901,7 @@ def reqs_for_extra(extra):
 
 _distributionImpl = {
     '.egg': Distribution,
-    '.egg-info': Distribution,
+    '.egg-info': EggInfoDistribution,
     '.dist-info': DistInfoDistribution,
     }
 

From df5516526d165a13c50ef51a392b73955025e7fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 14:08:21 -0500
Subject: [PATCH 5295/8469] Rename method as _version_from_metadata.

---
 pkg_resources/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 631c85476b..7c3e18b433 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2500,22 +2500,22 @@ def from_location(cls, location, basename, metadata=None, **kw):
         dist_path = os.path.join(location, basename)
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
-            # .dist-info gets much metadata differently
+            cls = _distributionImpl[ext.lower()]
+
             match = EGG_NAME(basename)
             if match:
                 project_name, version, py_version, platform = match.group(
                     'name', 'ver', 'pyver', 'plat'
                 )
-            cls = _distributionImpl[ext.lower()]
 
-            version = cls._version_from_egg_info(dist_path) or version
+            version = cls._version_from_metadata(dist_path) or version
         return cls(
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
         )
 
     @staticmethod
-    def _version_from_egg_info(dist_path):
+    def _version_from_metadata(dist_path):
         pass
 
     @property
@@ -2815,7 +2815,7 @@ def extras(self):
 class EggInfoDistribution(Distribution):
 
     @staticmethod
-    def _version_from_egg_info(dist_path):
+    def _version_from_metadata(dist_path):
         """
         Packages installed by distutils (e.g. numpy or scipy),
         which uses an old safe_version, and so

From 65036cf1fd4454d09513482140f1a6524ca66100 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 14:18:09 -0500
Subject: [PATCH 5296/8469] Update changelog. Fixes #419.

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index fa89b09bec..32e516d5b4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ CHANGES
 * Pull Request #158: Honor `PEP-488
   <https://www.python.org/dev/peps/pep-0488/>`_ when excluding
   files for namespace packages.
+* Issue #419 and Pull Request #144: Add experimental support for
+  reading the version info from distutils-installed metadata rather
+  than using the version in the filename.
 
 ------
 18.6.1

From e79907fc0a582234cbddcdc964ebf8206120469d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 17:57:44 -0500
Subject: [PATCH 5297/8469] Bumped to 18.7 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 2f5e485632..762e26baff 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.6.2"
+DEFAULT_VERSION = "18.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 86ad21c692..f6dc6bf473 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.6.2'
+__version__ = '18.7'

From b7bdb8f00a99a430b4a2ca642978caee682d5911 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 17:57:45 -0500
Subject: [PATCH 5298/8469] Added tag 18.7 for changeset 67d07805606a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6ed522b450..075aca3008 100644
--- a/.hgtags
+++ b/.hgtags
@@ -225,3 +225,4 @@ b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 31dc6d2ac0f5ab766652602fe6ca716fff7180e7 18.5
 dfe190b09908f6b953209d13573063809de451b8 18.6
 804f87045a901f1dc121cf9149143d654228dc13 18.6.1
+67d07805606aead09349d5b91d7d26c68ddad2fc 18.7

From c11203148a150299fac498918b76c0dd83c3fd81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Nov 2015 17:59:46 -0500
Subject: [PATCH 5299/8469] Bumped to 18.8 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 762e26baff..e0cefe2d86 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.7"
+DEFAULT_VERSION = "18.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index f6dc6bf473..aeb7307bc5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.7'
+__version__ = '18.8'

From 07199bdc471d257822a56fb7c75bc1d4c7ccc36f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 30 Nov 2015 11:27:59 -0500
Subject: [PATCH 5300/8469] Always use Python 3 filter in pkg_resources

---
 pkg_resources/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 46f09a2d94..0bd27d46d2 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -37,6 +37,7 @@
 import email.parser
 import tempfile
 import textwrap
+import itertools
 from pkgutil import get_importer
 
 try:
@@ -53,6 +54,7 @@
 
 if PY2:
     from urlparse import urlparse, urlunparse
+    filter = itertools.ifilter
 
 if PY3:
     string_types = str,

From 7a37ebfae2843651e41d481794d19adff2eb110d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 30 Nov 2015 11:28:57 -0500
Subject: [PATCH 5301/8469] Always use Python 3 map in pkg_resources

---
 pkg_resources/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0bd27d46d2..eaebb2fa5b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -55,6 +55,7 @@
 if PY2:
     from urlparse import urlparse, urlunparse
     filter = itertools.ifilter
+    map = itertools.imap
 
 if PY3:
     string_types = str,

From dfbc96168d8b921bd6b02fe7aeceeeb930f68cfe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 09:24:52 -0500
Subject: [PATCH 5302/8469] Add test for regression on Python 3 when LANG=C and
 there is non-ascii in the metadata file before the version. Ref #469.

---
 pkg_resources/tests/test_pkg_resources.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 0a03dd9360..31eee63598 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -1,3 +1,6 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 import sys
 import tempfile
 import os
@@ -144,7 +147,8 @@ def create_foo_pkg(self, env, version):
         Create a foo package installed (distutils-style) to env.paths['lib']
         as version.
         """
-        attrs = dict(name='foo', version=version)
+        ld = "This package has unicode metadata! �"
+        attrs = dict(name='foo', version=version, long_description=ld)
         dist = distutils.dist.Distribution(attrs)
         iei_cmd = distutils.command.install_egg_info.install_egg_info(dist)
         iei_cmd.initialize_options()

From 18a329d0498b4f3bbe0b5dda8063d1a910cb6945 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 09:26:14 -0500
Subject: [PATCH 5303/8469] Also run the tests with LANG=C

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0097ab8955..c5ea081551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,5 @@ script:
  - python bootstrap.py
 
  - python setup.py test --addopts='-rs'
+ - LANG=C python setup.py test
  - python ez_setup.py --version 12.2

From 3c257e67279bdb82c2525515bb305816f70c1615 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 09:27:45 -0500
Subject: [PATCH 5304/8469] Always run tests with LANG=C to capture issues in
 that restrictive environment.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5ea081551..4bc6ebd61b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,5 @@ script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - python setup.py test --addopts='-rs'
- - LANG=C python setup.py test
+ - LANG=C python setup.py test --addopts='-rs'
  - python ez_setup.py --version 12.2

From e82b7d5a1f8d48f4b957888b6a2e345f06716aee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 09:29:24 -0500
Subject: [PATCH 5305/8469] Travis has 3.5 now also

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4bc6ebd61b..9afbf067c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.3
   - 3.4
+  - 3.5
   - pypy
 # command to run tests
 script:

From e5b87949322042b310e509c7d332a9beb708935d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 09:34:14 -0500
Subject: [PATCH 5306/8469] Force consistent ordering with PYTHONHASHSEED=0

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9afbf067c3..ac12cd7ea4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,12 @@ python:
   - 3.4
   - 3.5
   - pypy
-# command to run tests
+env:
+ - LANG=C
+ - PYTHONHASHSEED=0
 script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - LANG=C python setup.py test --addopts='-rs'
+ - python setup.py test --addopts='-rs'
  - python ez_setup.py --version 12.2

From edc8a0e1459cc9c8c08872f5c6262a7ab44dbb15 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 10:11:32 -0500
Subject: [PATCH 5307/8469] I meant for the variables to be defined together

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac12cd7ea4..3f7b14b498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,7 @@ python:
   - 3.5
   - pypy
 env:
- - LANG=C
- - PYTHONHASHSEED=0
+ - LANG=C PYTHONHASHSEED=0
 script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py

From 4660f43ea68a13ddba2de0cdf7da410ea2b3a576 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 10:25:02 -0500
Subject: [PATCH 5308/8469] Try LC_ALL

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3f7b14b498..88b9ed8621 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ python:
   - 3.5
   - pypy
 env:
- - LANG=C PYTHONHASHSEED=0
+ - LC_ALL=C PYTHONHASHSEED=0
 script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py

From e36ec568112d58b584383469392ce2e0b43f88e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 11:09:34 -0500
Subject: [PATCH 5309/8469] Bump version installed by bootstrap tester

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 88b9ed8621..cab7064016 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ script:
  - python bootstrap.py
 
  - python setup.py test --addopts='-rs'
- - python ez_setup.py --version 12.2
+ - python ez_setup.py --version 18.6.1

From 718c66c493beb2e24f7f84a423cec378b7d701a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 11:11:13 -0500
Subject: [PATCH 5310/8469] Re-use metadata loading functionality from
 Provider. Fixes #469.

---
 CHANGES.txt               |  7 +++++++
 pkg_resources/__init__.py | 23 +++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 32e516d5b4..7f7ab9bd93 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 
+------
+18.7.1
+------
+
+* Issue #469: Refactored logic for Issue #419 fix to re-use metadata
+  loading from Provider.
+
 ----
 18.7
 ----
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index eaebb2fa5b..fe5c644df3 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2507,7 +2507,6 @@ def __init__(self, location=None, metadata=None, project_name=None,
     @classmethod
     def from_location(cls, location, basename, metadata=None, **kw):
         project_name, version, py_version, platform = [None]*4
-        dist_path = os.path.join(location, basename)
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
             cls = _distributionImpl[ext.lower()]
@@ -2517,16 +2516,13 @@ def from_location(cls, location, basename, metadata=None, **kw):
                 project_name, version, py_version, platform = match.group(
                     'name', 'ver', 'pyver', 'plat'
                 )
-
-            version = cls._version_from_metadata(dist_path) or version
         return cls(
             location, metadata, project_name=project_name, version=version,
             py_version=py_version, platform=platform, **kw
-        )
+        )._reload_version()
 
-    @staticmethod
-    def _version_from_metadata(dist_path):
-        pass
+    def _reload_version(self):
+        return self
 
     @property
     def hashcmp(self):
@@ -2824,8 +2820,7 @@ def extras(self):
 
 class EggInfoDistribution(Distribution):
 
-    @staticmethod
-    def _version_from_metadata(dist_path):
+    def _reload_version(self):
         """
         Packages installed by distutils (e.g. numpy or scipy),
         which uses an old safe_version, and so
@@ -2837,13 +2832,9 @@ def _version_from_metadata(dist_path):
         take an extra step and try to get the version number from
         the metadata file itself instead of the filename.
         """
-        if not os.path.isfile(dist_path):
-            return
-        try:
-            with open(dist_path) as strm:
-                return _version_from_file(strm)
-        except IOError:
-            pass
+        md_version = _version_from_file(self._get_metadata(self.PKG_INFO))
+        self._version = md_version or self._version
+        return self
 
 
 class DistInfoDistribution(Distribution):

From d693850138a93b2e46262d33e8c1bc0b9b1a7312 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 11:25:18 -0500
Subject: [PATCH 5311/8469] Leave _version unset if no metadata version was
 found.

---
 pkg_resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index fe5c644df3..c53215c60c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2833,7 +2833,8 @@ def _reload_version(self):
         the metadata file itself instead of the filename.
         """
         md_version = _version_from_file(self._get_metadata(self.PKG_INFO))
-        self._version = md_version or self._version
+        if md_version:
+            self._version = md_version
         return self
 
 

From 6081eb70a20b2176386973720bbf6fd5d9846644 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 11:53:50 -0500
Subject: [PATCH 5312/8469] Read metadata as utf-8; Fixes failure when LC_ALL=C

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c53215c60c..3cd67fa05e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2021,7 +2021,7 @@ def has_metadata(self, name):
 
     def get_metadata(self, name):
         if name=='PKG-INFO':
-            with open(self.path,'rU') as f:
+            with io.open(self.path, 'rU', encoding='utf-8') as f:
                 metadata = f.read()
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")

From 5d6c6a9008fa15d8bd116ba61d968a744d85bda4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 12:24:54 -0500
Subject: [PATCH 5313/8469] Run tests with and without LC_ALL=C

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cab7064016..e32524ccd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ python:
   - 3.5
   - pypy
 env:
- - LC_ALL=C PYTHONHASHSEED=0
+ - LC_ALL=C
+ - ""
 script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py

From 81c103f75d22580b14f162103232632444c9ec6f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 12:27:21 -0500
Subject: [PATCH 5314/8469] Expect failure on LC_ALL=C also

---
 setuptools/tests/test_easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 66601bfe11..fa51009884 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -430,8 +430,10 @@ def test_get_script_header(self):
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
 
+    c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL"))
+    is_ascii = c_type in ("C", "POSIX")
     @pytest.mark.xfail(
-        compat.PY3 and os.environ.get("LC_CTYPE") in ("C", "POSIX"),
+        compat.PY3 and is_ascii,
         reason="Test fails in this locale on Python 3"
     )
     @mock.patch.dict(sys.modules, java=mock.Mock(lang=mock.Mock(System=

From efededd6aa8be5ab054037ee32680a772d06a3c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 12:41:58 -0500
Subject: [PATCH 5315/8469] Expect failures on these tests due to ASCII

---
 setuptools/tests/__init__.py          | 4 ++++
 setuptools/tests/test_easy_install.py | 4 +---
 setuptools/tests/test_sdist.py        | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b8a29cbac2..a93be13484 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -16,6 +16,10 @@
 from setuptools import Feature
 from setuptools.depends import Require
 
+c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL"))
+is_ascii = c_type in ("C", "POSIX")
+fail_on_ascii = pytest.mark.xfail(is_ascii, "Test fails in this locale")
+
 def makeSetup(**args):
     """Return distribution from 'setup(**args)', without executing commands"""
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fa51009884..00e16b63f5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -35,7 +35,7 @@
 import pkg_resources
 
 from .py26compat import tarfile_open
-from . import contexts
+from . import contexts, is_ascii
 from .textwrap import DALS
 
 
@@ -430,8 +430,6 @@ def test_get_script_header(self):
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
 
-    c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL"))
-    is_ascii = c_type in ("C", "POSIX")
     @pytest.mark.xfail(
         compat.PY3 and is_ascii,
         reason="Test fails in this locale on Python 3"
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 9013b505db..4313c456d5 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -16,6 +16,8 @@
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
+from setuptools.tests import fail_on_ascii
+
 
 SETUP_ATTRS = {
     'name': 'sdist_test',
@@ -147,6 +149,7 @@ def test_defaults_case_sensitivity(self):
         assert 'setup.py' not in manifest, manifest
         assert 'setup.cfg' not in manifest, manifest
 
+    @fail_on_ascii
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
@@ -256,6 +259,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             # The filelist should have been updated as well
             assert u_filename not in mm.filelist.files
 
+    @fail_on_ascii
     def test_manifest_is_read_with_utf8_encoding(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
@@ -320,9 +324,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             filename = filename.decode('latin-1')
             assert filename not in cmd.filelist.files
 
-    @pytest.mark.skipif(PY3 and locale.getpreferredencoding() != 'UTF-8',
-        reason='Unittest fails if locale is not utf-8 but the manifests is '
-            'recorded correctly')
+    @fail_on_ascii
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From df2fad0435a7875bbbb2f91240754d85a8aebc1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 12:45:10 -0500
Subject: [PATCH 5316/8469] Correct usage

---
 setuptools/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index a93be13484..fed076289b 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -18,7 +18,7 @@
 
 c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL"))
 is_ascii = c_type in ("C", "POSIX")
-fail_on_ascii = pytest.mark.xfail(is_ascii, "Test fails in this locale")
+fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
 
 def makeSetup(**args):
     """Return distribution from 'setup(**args)', without executing commands"""

From 7cb174c62560328ed051bb9596c4926c8577d3d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:06:48 -0500
Subject: [PATCH 5317/8469] Force later pytest

---
 .travis.yml | 3 +++
 setup.py    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e32524ccd1..537e17554d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ env:
  - LC_ALL=C
  - ""
 script:
+ # avoid VersionConflict when newer version is required
+ - python -m pip install -U pytest
+
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
diff --git a/setup.py b/setup.py
index 9d7f228d21..dfb578a152 100755
--- a/setup.py
+++ b/setup.py
@@ -159,7 +159,7 @@ def _gen_console_scripts():
     scripts=[],
     tests_require=[
         'setuptools[ssl]',
-        'pytest',
+        'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + sphinx + pytest_runner,

From a477a657941bed882db1eec1deb8339f0af2a14a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:09:03 -0500
Subject: [PATCH 5318/8469] Invoke old pip directly

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 537e17554d..e8cd2f9ac6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
  - ""
 script:
  # avoid VersionConflict when newer version is required
- - python -m pip install -U pytest
+ - pip install -U pytest
 
  # update egg_info based on setup.py in checkout
  - python bootstrap.py

From fac9d7a483ea00e7627a2890e4f5f5f95a7c975c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:10:53 -0500
Subject: [PATCH 5319/8469] Reorder tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e8cd2f9ac6..f8722567cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ python:
   - 3.5
   - pypy
 env:
- - LC_ALL=C
  - ""
+ - LC_ALL=C
 script:
  # avoid VersionConflict when newer version is required
  - pip install -U pytest

From e7fdbbf85712acea80a591d2ec079b5349a53129 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:14:18 -0500
Subject: [PATCH 5320/8469] Try inlining the xfail marker.

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

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 4313c456d5..cc7661e6ea 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -16,7 +16,7 @@
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
-from setuptools.tests import fail_on_ascii
+from setuptools.tests import fail_on_ascii, is_ascii
 
 
 SETUP_ATTRS = {
@@ -149,7 +149,7 @@ def test_defaults_case_sensitivity(self):
         assert 'setup.py' not in manifest, manifest
         assert 'setup.cfg' not in manifest, manifest
 
-    @fail_on_ascii
+    @pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From 2e46cd7f81c5cf46ae45f8d7687ed4a4f9132a76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:20:47 -0500
Subject: [PATCH 5321/8469] WTF

---
 setuptools/tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index cc7661e6ea..4d100fad4f 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -152,6 +152,7 @@ def test_defaults_case_sensitivity(self):
     @pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
+        assert not is_ascii
         dist = Distribution(SETUP_ATTRS)
         dist.script_name = 'setup.py'
         mm = manifest_maker(dist)

From b4724ffead99897ce9c1411ff59206977df64f5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:31:01 -0500
Subject: [PATCH 5322/8469] Try setting LC_CTYPE also

---
 .travis.yml                    | 2 +-
 setuptools/tests/test_sdist.py | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8722567cd..0a7981386f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - pypy
 env:
  - ""
- - LC_ALL=C
+ - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
  - pip install -U pytest
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 4d100fad4f..df46518b0a 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-import locale
 import os
 import shutil
 import sys
@@ -9,14 +8,12 @@
 import unicodedata
 import contextlib
 
-import pytest
-
 import pkg_resources
 from setuptools.compat import StringIO, unicode, PY3, PY2
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
-from setuptools.tests import fail_on_ascii, is_ascii
+from setuptools.tests import fail_on_ascii
 
 
 SETUP_ATTRS = {
@@ -149,10 +146,9 @@ def test_defaults_case_sensitivity(self):
         assert 'setup.py' not in manifest, manifest
         assert 'setup.cfg' not in manifest, manifest
 
-    @pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
+    @fail_on_ascii
     def test_manifest_is_written_with_utf8_encoding(self):
         # Test for #303.
-        assert not is_ascii
         dist = Distribution(SETUP_ATTRS)
         dist.script_name = 'setup.py'
         mm = manifest_maker(dist)

From adcf02655449638849df8a77064b030a22dd648f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 13:59:18 -0500
Subject: [PATCH 5323/8469] Output the env in the test run

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0a7981386f..0bfb11bb53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,9 @@ script:
  # avoid VersionConflict when newer version is required
  - pip install -U pytest
 
+ # Output the env, because the travis docs just can't be trusted
+ - env
+
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 

From 8e0ac92076007aa6e49f22029003b9618605c996 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 14:07:15 -0500
Subject: [PATCH 5324/8469] Expect failure running Python 3 only tests on
 Python 2

---
 setuptools/tests/__init__.py   |   1 +
 setuptools/tests/test_sdist.py | 210 +++++++++++++++++----------------
 2 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index fed076289b..f985a6e4cb 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -20,6 +20,7 @@
 is_ascii = c_type in ("C", "POSIX")
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
 
+
 def makeSetup(**args):
     """Return distribution from 'setup(**args)', without executing commands"""
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index df46518b0a..2b4d52070f 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -8,6 +8,8 @@
 import unicodedata
 import contextlib
 
+import pytest
+
 import pkg_resources
 from setuptools.compat import StringIO, unicode, PY3, PY2
 from setuptools.command.sdist import sdist
@@ -16,6 +18,9 @@
 from setuptools.tests import fail_on_ascii
 
 
+py3_only = pytest.mark.xfail(PY2, reason="Test runs on Python 3 only")
+
+
 SETUP_ATTRS = {
     'name': 'sdist_test',
     'version': '0.0',
@@ -181,80 +186,79 @@ def test_manifest_is_written_with_utf8_encoding(self):
 
         assert posix(filename) in u_contents
 
-    # Python 3 only
-    if PY3:
+    @py3_only
+    def test_write_manifest_allows_utf8_filenames(self):
+        # Test for #303.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        mm = manifest_maker(dist)
+        mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        os.mkdir('sdist_test.egg-info')
 
-        def test_write_manifest_allows_utf8_filenames(self):
-            # Test for #303.
-            dist = Distribution(SETUP_ATTRS)
-            dist.script_name = 'setup.py'
-            mm = manifest_maker(dist)
-            mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-            os.mkdir('sdist_test.egg-info')
-
-            # UTF-8 filename
-            filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
-
-            # Must touch the file or risk removal
-            open(filename, "w").close()
-
-            # Add filename and write manifest
-            with quiet():
-                mm.run()
-                u_filename = filename.decode('utf-8')
-                mm.filelist.files.append(u_filename)
-                # Re-write manifest
-                mm.write_manifest()
-
-            manifest = open(mm.manifest, 'rbU')
-            contents = manifest.read()
-            manifest.close()
-
-            # The manifest should be UTF-8 encoded
-            contents.decode('UTF-8')
-
-            # The manifest should contain the UTF-8 filename
-            assert posix(filename) in contents
-
-            # The filelist should have been updated as well
-            assert u_filename in mm.filelist.files
-
-        def test_write_manifest_skips_non_utf8_filenames(self):
-            """
-            Files that cannot be encoded to UTF-8 (specifically, those that
-            weren't originally successfully decoded and have surrogate
-            escapes) should be omitted from the manifest.
-            See https://bitbucket.org/tarek/distribute/issue/303 for history.
-            """
-            dist = Distribution(SETUP_ATTRS)
-            dist.script_name = 'setup.py'
-            mm = manifest_maker(dist)
-            mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-            os.mkdir('sdist_test.egg-info')
-
-            # Latin-1 filename
-            filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
-
-            # Add filename with surrogates and write manifest
-            with quiet():
-                mm.run()
-                u_filename = filename.decode('utf-8', 'surrogateescape')
-                mm.filelist.append(u_filename)
-                # Re-write manifest
-                mm.write_manifest()
-
-            manifest = open(mm.manifest, 'rbU')
-            contents = manifest.read()
-            manifest.close()
-
-            # The manifest should be UTF-8 encoded
-            contents.decode('UTF-8')
-
-            # The Latin-1 filename should have been skipped
-            assert posix(filename) not in contents
-
-            # The filelist should have been updated as well
-            assert u_filename not in mm.filelist.files
+        # UTF-8 filename
+        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+
+        # Must touch the file or risk removal
+        open(filename, "w").close()
+
+        # Add filename and write manifest
+        with quiet():
+            mm.run()
+            u_filename = filename.decode('utf-8')
+            mm.filelist.files.append(u_filename)
+            # Re-write manifest
+            mm.write_manifest()
+
+        manifest = open(mm.manifest, 'rbU')
+        contents = manifest.read()
+        manifest.close()
+
+        # The manifest should be UTF-8 encoded
+        contents.decode('UTF-8')
+
+        # The manifest should contain the UTF-8 filename
+        assert posix(filename) in contents
+
+        # The filelist should have been updated as well
+        assert u_filename in mm.filelist.files
+
+    @py3_only
+    def test_write_manifest_skips_non_utf8_filenames(self):
+        """
+        Files that cannot be encoded to UTF-8 (specifically, those that
+        weren't originally successfully decoded and have surrogate
+        escapes) should be omitted from the manifest.
+        See https://bitbucket.org/tarek/distribute/issue/303 for history.
+        """
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        mm = manifest_maker(dist)
+        mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        os.mkdir('sdist_test.egg-info')
+
+        # Latin-1 filename
+        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+
+        # Add filename with surrogates and write manifest
+        with quiet():
+            mm.run()
+            u_filename = filename.decode('utf-8', 'surrogateescape')
+            mm.filelist.append(u_filename)
+            # Re-write manifest
+            mm.write_manifest()
+
+        manifest = open(mm.manifest, 'rbU')
+        contents = manifest.read()
+        manifest.close()
+
+        # The manifest should be UTF-8 encoded
+        contents.decode('UTF-8')
+
+        # The Latin-1 filename should have been skipped
+        assert posix(filename) not in contents
+
+        # The filelist should have been updated as well
+        assert u_filename not in mm.filelist.files
 
     @fail_on_ascii
     def test_manifest_is_read_with_utf8_encoding(self):
@@ -288,38 +292,36 @@ def test_manifest_is_read_with_utf8_encoding(self):
             filename = filename.decode('utf-8')
         assert filename in cmd.filelist.files
 
-    # Python 3 only
-    if PY3:
+    @py3_only
+    def test_read_manifest_skips_non_utf8_filenames(self):
+        # Test for #303.
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        # Create manifest
+        with quiet():
+            cmd.run()
+
+        # Add Latin-1 filename to manifest
+        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
+        manifest = open(cmd.manifest, 'ab')
+        manifest.write(b('\n') + filename)
+        manifest.close()
+
+        # The file must exist to be included in the filelist
+        open(filename, 'w').close()
+
+        # Re-read manifest
+        cmd.filelist.files = []
+        with quiet():
+            cmd.read_manifest()
 
-        def test_read_manifest_skips_non_utf8_filenames(self):
-            # Test for #303.
-            dist = Distribution(SETUP_ATTRS)
-            dist.script_name = 'setup.py'
-            cmd = sdist(dist)
-            cmd.ensure_finalized()
-
-            # Create manifest
-            with quiet():
-                cmd.run()
-
-            # Add Latin-1 filename to manifest
-            filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
-            cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
-            manifest = open(cmd.manifest, 'ab')
-            manifest.write(b('\n') + filename)
-            manifest.close()
-
-            # The file must exist to be included in the filelist
-            open(filename, 'w').close()
-
-            # Re-read manifest
-            cmd.filelist.files = []
-            with quiet():
-                cmd.read_manifest()
-
-            # The Latin-1 filename should have been skipped
-            filename = filename.decode('latin-1')
-            assert filename not in cmd.filelist.files
+        # The Latin-1 filename should have been skipped
+        filename = filename.decode('latin-1')
+        assert filename not in cmd.filelist.files
 
     @fail_on_ascii
     def test_sdist_with_utf8_encoded_filename(self):

From dc67e7816dcc9f2f5d2056fe4b4613c74fe1e0d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 14:08:43 -0500
Subject: [PATCH 5325/8469] Expect fail when LC_ALL=C

---
 setuptools/tests/test_sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 2b4d52070f..ec3c8aa9a9 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -187,6 +187,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
         assert posix(filename) in u_contents
 
     @py3_only
+    @fail_on_ascii
     def test_write_manifest_allows_utf8_filenames(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From 42cba609fdb7b639b9fa6d48742afceb8b6e93ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 14:14:11 -0500
Subject: [PATCH 5326/8469] Bumped to 18.7.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e0cefe2d86..36a0975808 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.8"
+DEFAULT_VERSION = "18.7.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index aeb7307bc5..ac653aa16e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.8'
+__version__ = '18.7.1'

From 7e2d02ab43988a87ec5c2d443f900f382d731b6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 14:14:13 -0500
Subject: [PATCH 5327/8469] Added tag 18.7.1 for changeset 3041e1fc409b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 075aca3008..508adf5b97 100644
--- a/.hgtags
+++ b/.hgtags
@@ -226,3 +226,4 @@ b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
 dfe190b09908f6b953209d13573063809de451b8 18.6
 804f87045a901f1dc121cf9149143d654228dc13 18.6.1
 67d07805606aead09349d5b91d7d26c68ddad2fc 18.7
+3041e1fc409be90e885968b90faba405420fc161 18.7.1

From dadd14d82c5f1db83704eb1c6da0b62998cb25a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 14:15:38 -0500
Subject: [PATCH 5328/8469] Bumped to 18.7.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 36a0975808..975b45c56c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.7.1"
+DEFAULT_VERSION = "18.7.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index ac653aa16e..5e40c6584c 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.7.1'
+__version__ = '18.7.2'

From 98ea00965bed70ccf57eb58394d15739fb7372ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 21:59:33 -0500
Subject: [PATCH 5329/8469] Use context manager for opening file

---
 setuptools/command/easy_install.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9e9c5e544f..547a88428d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -805,9 +805,8 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
             ensure_directory(target)
             if os.path.exists(target):
                 os.unlink(target)
-            f = open(target, "w" + mode)
-            f.write(contents)
-            f.close()
+            with open(target, "w" + mode) as f:
+                f.write(contents)
             chmod(target, 0o777 - mask)
 
     def install_eggs(self, spec, dist_filename, tmpdir):

From 2086ae7b381287872add8fe9a91b74498d501679 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Dec 2015 22:00:45 -0500
Subject: [PATCH 5330/8469] Extract variable

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 547a88428d..79f068b1d0 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -772,8 +772,8 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         is_script = is_python_script(script_text, script_name)
 
         if is_script:
-            script_text = (ScriptWriter.get_header(script_text) +
-                           self._load_template(dev_path) % locals())
+            body = self._load_template(dev_path) % locals()
+            script_text = ScriptWriter.get_header(script_text) + body
         self.write_script(script_name, _to_ascii(script_text), 'b')
 
     @staticmethod

From 9a86e5c638a16afc092c9895ae24c4669248448e Mon Sep 17 00:00:00 2001
From: Stanislaw Pitucha <stanislaw.pitucha@hpe.com>
Date: Mon, 7 Dec 2015 16:13:26 +1100
Subject: [PATCH 5331/8469] Fix multiline strings with missing spaces

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d7ad46552a..03369da81c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -160,7 +160,7 @@ def check_packages(dist, attr, value):
     for pkgname in value:
         if not re.match(r'\w+(\.\w+)*', pkgname):
             distutils.log.warn(
-                "WARNING: %r not a valid package name; please use only"
+                "WARNING: %r not a valid package name; please use only "
                 ".-separated package names in setup.py", pkgname
             )
 
@@ -818,7 +818,7 @@ def include_in(self,dist):
 
         if not self.available:
             raise DistutilsPlatformError(
-                self.description+" is required,"
+                self.description+" is required, "
                 "but is not available on this platform"
             )
 

From b859bf9ded7c6d4fb056a0b47a11caea6321de60 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Mon, 7 Dec 2015 06:51:09 +0000
Subject: [PATCH 5332/8469] Created new branch get_command_list

--HG--
branch : get_command_list

From fc916c8ea1f7ac0ee5cc56dfaa0ab4ef6aee1cfb Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Mon, 7 Dec 2015 19:52:21 +1300
Subject: [PATCH 5333/8469] Add get_command_list to dist and process
 distutils.commands entry points

--HG--
branch : get_command_list
---
 setuptools/dist.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d7ad46552a..c5f04b33d1 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -440,6 +440,14 @@ def print_commands(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.print_commands(self)
 
+    def get_command_list(self):
+        for ep in pkg_resources.iter_entry_points('distutils.commands'):
+            if ep.name not in self.cmdclass:
+                # don't require extras as the commands won't be invoked
+                cmdclass = ep.resolve()
+                self.cmdclass[ep.name] = cmdclass
+        return _Distribution.get_command_list(self)
+
     def _set_feature(self,name,status):
         """Set feature's inclusion status"""
         setattr(self,self._feature_attrname(name),status)

From bb967deca4ff251c5aa8f0404b1223e94d9a301b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 19:04:13 -0500
Subject: [PATCH 5334/8469] Don't rely on repr for an HTML attribute value
 (could end up with 'u' prefix). Fixes #471.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cabf10392f..dd2df22987 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1037,7 +1037,7 @@ def local_open(url):
                 break
             elif os.path.isdir(os.path.join(filename,f)):
                 f+='/'
-            files.append("<a href=%r>%s</a>" % (f,f))
+            files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:
             body = ("<html><head><title>%s</title>" % url) + \
                 "</head><body>%s</body></html>" % '\n'.join(files)

From 59e47d76244bf25a9c385800328394e97be74b48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 19:06:03 -0500
Subject: [PATCH 5335/8469] Update syntax for modern style

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

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index dd2df22987..330b83919e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1031,12 +1031,12 @@ def local_open(url):
     elif path.endswith('/') and os.path.isdir(filename):
         files = []
         for f in os.listdir(filename):
-            if f=='index.html':
-                with open(os.path.join(filename,f),'r') as fp:
+            if f == 'index.html':
+                with open(os.path.join(filename, f), 'r') as fp:
                     body = fp.read()
                 break
-            elif os.path.isdir(os.path.join(filename,f)):
-                f+='/'
+            elif os.path.isdir(os.path.join(filename, f)):
+                f += '/'
             files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:
             body = ("<html><head><title>%s</title>" % url) + \

From 5a662289e866fb9bac77736ffede2fca05c79367 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 19:06:41 -0500
Subject: [PATCH 5336/8469] Extract variable

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 330b83919e..1c156f0753 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1031,11 +1031,12 @@ def local_open(url):
     elif path.endswith('/') and os.path.isdir(filename):
         files = []
         for f in os.listdir(filename):
+            filepath = os.path.join(filename, f)
             if f == 'index.html':
-                with open(os.path.join(filename, f), 'r') as fp:
+                with open(filepath, 'r') as fp:
                     body = fp.read()
                 break
-            elif os.path.isdir(os.path.join(filename, f)):
+            elif os.path.isdir(filepath):
                 f += '/'
             files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:

From 95ac77a928a08c836c6f4ccc066a797357207abc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 19:14:04 -0500
Subject: [PATCH 5337/8469] Use new string formatting here as well

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1c156f0753..525cb64578 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1040,8 +1040,9 @@ def local_open(url):
                 f += '/'
             files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:
-            body = ("<html><head><title>%s</title>" % url) + \
-                "</head><body>%s</body></html>" % '\n'.join(files)
+            tmpl = ("<html><head><title>{url}</title>"
+                "</head><body>{files}</body></html>")
+            body = tmpl.format(url=url, files='\n'.join(files))
         status, message = 200, "OK"
     else:
         status, message, body = 404, "Path not found", "Not found"

From 434d573a2d4d1c7b00d36f8c4f8b5c4b64b46e63 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 19:36:18 -0500
Subject: [PATCH 5338/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7f7ab9bd93..bacace8d33 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 
+------
+18.7.2
+------
+
+* Issue #471: Don't rely on repr for an HTML attribute value in
+  package_index.
+
 ------
 18.7.1
 ------

From 91afe3b30dd32d439ab8914ba3a80bbe2d9f293c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2015 21:24:40 -0500
Subject: [PATCH 5339/8469] Avoid errors when metadata directory is broken. Ref
 #419.

---
 CHANGES.txt               | 2 ++
 pkg_resources/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bacace8d33..a48cd3e10d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@ CHANGES
 
 * Issue #471: Don't rely on repr for an HTML attribute value in
   package_index.
+* Issue #419: Avoid errors in FileMetadata when the metadata directory
+  is broken.
 
 ------
 18.7.1
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3cd67fa05e..2cb851b102 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2017,7 +2017,7 @@ def __init__(self, path):
         self.path = path
 
     def has_metadata(self, name):
-        return name=='PKG-INFO'
+        return name=='PKG-INFO' and os.path.isfile(self.path)
 
     def get_metadata(self, name):
         if name=='PKG-INFO':

From a377c191b9394376988029934ec26f1edaab1812 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:45:38 -0500
Subject: [PATCH 5340/8469] Remove deprecated use of 'U' in io.open mode
 parameter. Fixes #472.

---
 CHANGES.txt               | 2 ++
 pkg_resources/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a48cd3e10d..0fcf4c6196 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ CHANGES
   package_index.
 * Issue #419: Avoid errors in FileMetadata when the metadata directory
   is broken.
+* Issue #472: Remove deprecated use of 'U' in mode parameter
+  when opening files.
 
 ------
 18.7.1
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2cb851b102..f65fef3eaf 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2021,7 +2021,7 @@ def has_metadata(self, name):
 
     def get_metadata(self, name):
         if name=='PKG-INFO':
-            with io.open(self.path, 'rU', encoding='utf-8') as f:
+            with io.open(self.path, encoding='utf-8') as f:
                 metadata = f.read()
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")

From e76a139ca4fad75c4ce8b3bc95e0009ea0823eb5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:48:31 -0500
Subject: [PATCH 5341/8469] Use io.open in build_py

---
 setuptools/command/build_py.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index a873d54b10..779adf2a92 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -5,6 +5,8 @@
 import sys
 import fnmatch
 import textwrap
+import io
+
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
@@ -157,7 +159,7 @@ def check_package(self, package, package_dir):
         else:
             return init_py
 
-        f = open(init_py, 'rbU')
+        f = io.open(init_py, 'rb')
         if 'declare_namespace'.encode() not in f.read():
             from distutils.errors import DistutilsError
 

From 2ef88b8e709f0c090a3f7f8c7f612aacbbcd648f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:49:48 -0500
Subject: [PATCH 5342/8469] Use context manager for closing file

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

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 779adf2a92..c971626c1a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -159,7 +159,8 @@ def check_package(self, package, package_dir):
         else:
             return init_py
 
-        f = io.open(init_py, 'rb')
+        with io.open(init_py, 'rb') as f:
+            contents = f.read()
         if 'declare_namespace'.encode() not in f.read():
             from distutils.errors import DistutilsError
 
@@ -169,7 +170,6 @@ def check_package(self, package, package_dir):
                 'fix it.\n(See the setuptools manual under '
                 '"Namespace Packages" for details.)\n"' % (package,)
             )
-        f.close()
         return init_py
 
     def initialize_options(self):

From d7b8b096a206b178d588049a396d5687dbe7235a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:50:30 -0500
Subject: [PATCH 5343/8469] Prefer bytes literal

---
 setuptools/command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index c971626c1a..f0d767054d 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -161,7 +161,7 @@ def check_package(self, package, package_dir):
 
         with io.open(init_py, 'rb') as f:
             contents = f.read()
-        if 'declare_namespace'.encode() not in f.read():
+        if b'declare_namespace' not in f.read():
             from distutils.errors import DistutilsError
 
             raise DistutilsError(

From 2b2c7c76e8eda4c608183c8e75d9eb0123724135 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:51:23 -0500
Subject: [PATCH 5344/8469] Move import to top

---
 setuptools/command/build_py.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index f0d767054d..43159c7c41 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -6,6 +6,7 @@
 import fnmatch
 import textwrap
 import io
+import distutils.errors
 
 
 try:
@@ -162,9 +163,7 @@ def check_package(self, package, package_dir):
         with io.open(init_py, 'rb') as f:
             contents = f.read()
         if b'declare_namespace' not in f.read():
-            from distutils.errors import DistutilsError
-
-            raise DistutilsError(
+            raise distutils.errors.DistutilsError(
                 "Namespace package problem: %s is a namespace package, but "
                 "its\n__init__.py does not call declare_namespace()! Please "
                 'fix it.\n(See the setuptools manual under '

From fc28df6ec826b3bd1ffa89d55d3674aa89d2f5fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:52:39 -0500
Subject: [PATCH 5345/8469] Remove hanging indent

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

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 43159c7c41..e729f71274 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -183,8 +183,10 @@ def get_package_dir(self, package):
 
     def exclude_data_files(self, package, src_dir, files):
         """Filter filenames for package's data files in 'src_dir'"""
-        globs = (self.exclude_package_data.get('', [])
-                 + self.exclude_package_data.get(package, []))
+        globs = (
+            self.exclude_package_data.get('', [])
+            + self.exclude_package_data.get(package, [])
+        )
         bad = []
         for pattern in globs:
             bad.extend(

From a0ad4c94c41a9af9f2479567139ba6489305b9cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 02:59:46 -0500
Subject: [PATCH 5346/8469] Rewrite init/loop/extend as dual-for generator
 expression.

---
 setuptools/command/build_py.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index e729f71274..5bbf087055 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -187,14 +187,14 @@ def exclude_data_files(self, package, src_dir, files):
             self.exclude_package_data.get('', [])
             + self.exclude_package_data.get(package, [])
         )
-        bad = []
-        for pattern in globs:
-            bad.extend(
-                fnmatch.filter(
-                    files, os.path.join(src_dir, convert_path(pattern))
-                )
+        bad = dict.fromkeys(
+            item
+            for pattern in globs
+            for item in fnmatch.filter(
+                files,
+                os.path.join(src_dir, convert_path(pattern)),
             )
-        bad = dict.fromkeys(bad)
+        )
         seen = {}
         return [
             f for f in files if f not in bad

From 4e960934f61c50b98953d6cd12b72b30e85bccf3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:00:28 -0500
Subject: [PATCH 5347/8469] Prefer set to dict.fromkeys

---
 setuptools/command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 5bbf087055..3ae331fd79 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -187,7 +187,7 @@ def exclude_data_files(self, package, src_dir, files):
             self.exclude_package_data.get('', [])
             + self.exclude_package_data.get(package, [])
         )
-        bad = dict.fromkeys(
+        bad = set(
             item
             for pattern in globs
             for item in fnmatch.filter(

From 3744e23d533ab5b0ebcb34f6d8792777c3433014 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:14:08 -0500
Subject: [PATCH 5348/8469] Reindent to remove trailing comment

---
 setuptools/command/build_py.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 3ae331fd79..55aed23069 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -197,8 +197,12 @@ def exclude_data_files(self, package, src_dir, files):
         )
         seen = {}
         return [
-            f for f in files if f not in bad
-            and f not in seen and seen.setdefault(f, 1)  # ditch dupes
+            fn
+            for fn in files
+            if fn not in bad
+            # ditch dupes
+            and fn not in seen
+            and seen.setdefault(fn, 1)
         ]
 
 

From a8d85057026bc070b2f73b57133f1910218ad815 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:20:12 -0500
Subject: [PATCH 5349/8469] Use a defaultdict and count to track seen items

---
 setuptools/command/build_py.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 55aed23069..317dbba4a6 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -7,6 +7,8 @@
 import textwrap
 import io
 import distutils.errors
+import collections
+import itertools
 
 
 try:
@@ -195,14 +197,13 @@ def exclude_data_files(self, package, src_dir, files):
                 os.path.join(src_dir, convert_path(pattern)),
             )
         )
-        seen = {}
+        seen = collections.defaultdict(itertools.count)
         return [
             fn
             for fn in files
             if fn not in bad
             # ditch dupes
-            and fn not in seen
-            and seen.setdefault(fn, 1)
+            and not next(seen[fn])
         ]
 
 

From 1c7e97f95ea74c241b91dfb975c709940ba00f47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:26:58 -0500
Subject: [PATCH 5350/8469] Remove unused import

---
 setuptools/command/build_py.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 317dbba4a6..b2dafec970 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -2,7 +2,6 @@
 from distutils.util import convert_path
 import distutils.command.build_py as orig
 import os
-import sys
 import fnmatch
 import textwrap
 import io

From 41112f5afd0d2b0c14899ab1cf2c27183e64d6ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:34:35 -0500
Subject: [PATCH 5351/8469] Use io.open for future compatibility and
 consistency

---
 setuptools/command/build_py.py |  2 +-
 setuptools/command/develop.py  |  6 +++---
 setuptools/command/egg_info.py |  4 ++--
 setuptools/command/sdist.py    |  6 ++----
 setuptools/tests/test_sdist.py | 18 +++++++++---------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b2dafec970..8a50f03261 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -163,7 +163,7 @@ def check_package(self, package, package_dir):
 
         with io.open(init_py, 'rb') as f:
             contents = f.read()
-        if b'declare_namespace' not in f.read():
+        if b'declare_namespace' not in contents:
             raise distutils.errors.DistutilsError(
                 "Namespace package problem: %s is a namespace package, but "
                 "its\n__init__.py does not call declare_namespace()! Please "
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 5ae25d71c4..3a16cdc79b 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -3,6 +3,7 @@
 from distutils.errors import DistutilsError, DistutilsOptionError
 import os
 import glob
+import io
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
@@ -163,9 +164,8 @@ def install_egg_scripts(self, dist):
         for script_name in self.distribution.scripts or []:
             script_path = os.path.abspath(convert_path(script_name))
             script_name = os.path.basename(script_path)
-            f = open(script_path, 'rU')
-            script_text = f.read()
-            f.close()
+            with io.open(script_path) as strm:
+                script_text = strm.read()
             self.install_script(dist, script_name, script_text, script_path)
 
     def install_wrapper_scripts(self, dist):
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 50f3d5c0c2..9a9193c136 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -10,6 +10,7 @@
 import os
 import re
 import sys
+import io
 
 try:
     from setuptools_svn import svn_utils
@@ -471,10 +472,9 @@ def get_pkg_info_revision():
     # a subversion revision
     #
     if os.path.exists('PKG-INFO'):
-        f = open('PKG-INFO', 'rU')
+      with io.open('PKG-INFO') as f:
         for line in f:
             match = re.match(r"Version:.*-r(\d+)\s*$", line)
             if match:
                 return int(match.group(1))
-        f.close()
     return 0
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 851a177524..71196512aa 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -3,6 +3,7 @@
 import distutils.command.sdist as orig
 import os
 import sys
+import io
 
 from setuptools.compat import PY3
 from setuptools.utils import cs_path_exists
@@ -166,11 +167,8 @@ def _manifest_is_not_generated(self):
         if not os.path.isfile(self.manifest):
             return False
 
-        fp = open(self.manifest, 'rbU')
-        try:
+        with io.open(self.manifest, 'rb') as fp:
             first_line = fp.readline()
-        finally:
-            fp.close()
         return (first_line !=
                 '# file GENERATED by distutils, do NOT edit\n'.encode())
 
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ec3c8aa9a9..8ec9a4cb7d 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -7,6 +7,7 @@
 import tempfile
 import unicodedata
 import contextlib
+import io
 
 import pytest
 
@@ -81,6 +82,11 @@ def decompose(path):
     return path
 
 
+def read_all_bytes(filename):
+    with io.open(filename, 'rb') as fp:
+        return fp.read()
+
+
 class TestSdistTest:
 
     def setup_method(self, method):
@@ -172,9 +178,7 @@ def test_manifest_is_written_with_utf8_encoding(self):
             mm.filelist.append(filename)
             mm.write_manifest()
 
-        manifest = open(mm.manifest, 'rbU')
-        contents = manifest.read()
-        manifest.close()
+        contents = read_all_bytes(mm.manifest)
 
         # The manifest should be UTF-8 encoded
         u_contents = contents.decode('UTF-8')
@@ -210,9 +214,7 @@ def test_write_manifest_allows_utf8_filenames(self):
             # Re-write manifest
             mm.write_manifest()
 
-        manifest = open(mm.manifest, 'rbU')
-        contents = manifest.read()
-        manifest.close()
+        contents = read_all_bytes(mm.manifest)
 
         # The manifest should be UTF-8 encoded
         contents.decode('UTF-8')
@@ -248,9 +250,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
             # Re-write manifest
             mm.write_manifest()
 
-        manifest = open(mm.manifest, 'rbU')
-        contents = manifest.read()
-        manifest.close()
+        contents = read_all_bytes(mm.manifest)
 
         # The manifest should be UTF-8 encoded
         contents.decode('UTF-8')

From 50d864aa0693530a70efd6ffc8007d8328bfea6d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:35:46 -0500
Subject: [PATCH 5352/8469] Reindent

---
 setuptools/command/egg_info.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 9a9193c136..fb94a04431 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -472,9 +472,9 @@ def get_pkg_info_revision():
     # a subversion revision
     #
     if os.path.exists('PKG-INFO'):
-      with io.open('PKG-INFO') as f:
-        for line in f:
-            match = re.match(r"Version:.*-r(\d+)\s*$", line)
-            if match:
-                return int(match.group(1))
+        with io.open('PKG-INFO') as f:
+            for line in f:
+                match = re.match(r"Version:.*-r(\d+)\s*$", line)
+                if match:
+                    return int(match.group(1))
     return 0

From 1265c31f954afe7a1e47edc6dddfe7a5d4c9aa2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:40:13 -0500
Subject: [PATCH 5353/8469] Replace comment with docstring

---
 setuptools/command/egg_info.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index fb94a04431..57e89c0707 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -468,9 +468,10 @@ def write_entries(cmd, basename, filename):
 
 
 def get_pkg_info_revision():
-    # See if we can get a -r### off of PKG-INFO, in case this is an sdist of
-    # a subversion revision
-    #
+    """
+    Get a -r### off of PKG-INFO Version in case this is an sdist of
+    a subversion revision.
+    """
     if os.path.exists('PKG-INFO'):
         with io.open('PKG-INFO') as f:
             for line in f:

From ebaf4f2547e71247248abc77f9899e2106482646 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:51:59 -0500
Subject: [PATCH 5354/8469] Deprecate get_pkg_info_revision

---
 CHANGES.txt                    | 7 ++++---
 setuptools/command/egg_info.py | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0fcf4c6196..cb9bb02d04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,10 +3,11 @@ CHANGES
 =======
 
 
-------
-18.7.2
-------
+----
+18.8
+----
 
+* Deprecated ``egg_info.get_pkg_info_revision``.
 * Issue #471: Don't rely on repr for an HTML attribute value in
   package_index.
 * Issue #419: Avoid errors in FileMetadata when the metadata directory
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 57e89c0707..3afd0a4528 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -11,6 +11,7 @@
 import re
 import sys
 import io
+import warnings
 
 try:
     from setuptools_svn import svn_utils
@@ -472,6 +473,7 @@ def get_pkg_info_revision():
     Get a -r### off of PKG-INFO Version in case this is an sdist of
     a subversion revision.
     """
+    warnings.warn("get_pkg_info_revision is deprecated.", DeprecationWarning)
     if os.path.exists('PKG-INFO'):
         with io.open('PKG-INFO') as f:
             for line in f:

From 6840f40ad0cc4df8c98cd8b78f4c86d6200c1b57 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:53:38 -0500
Subject: [PATCH 5355/8469] Remove check that would never succeed, because
 svn_utils always returns an integer and get_svn_revision always returns a
 non-empty string.

---
 setuptools/command/egg_info.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 3afd0a4528..28aa79941b 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -186,9 +186,7 @@ def tags(self):
         if self.tag_build:
             version += self.tag_build
         if self.tag_svn_revision:
-            rev = self.get_svn_revision()
-            if rev:     # is 0 if it's not an svn working copy
-                version += '-r%s' % rev
+            version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             import time
 

From 2a379eac97f2defcb828589ad5b46ace8a54d0f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:54:32 -0500
Subject: [PATCH 5356/8469] Reorganize imports

---
 setuptools/command/egg_info.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 28aa79941b..8b393a71ab 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -13,11 +13,6 @@
 import io
 import warnings
 
-try:
-    from setuptools_svn import svn_utils
-except ImportError:
-    pass
-
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
@@ -29,6 +24,12 @@
 
 from pkg_resources import packaging
 
+try:
+    from setuptools_svn import svn_utils
+except ImportError:
+    pass
+
+
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
 

From 81ca4fea9e4672f39864439f2049108ad731c8fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 9 Dec 2015 03:57:25 -0500
Subject: [PATCH 5357/8469] Move imports to top

---
 setuptools/command/egg_info.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8b393a71ab..1301bd84e1 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -12,11 +12,15 @@
 import sys
 import io
 import warnings
+import time
+
+from setuptools.compat import basestring, PY3, StringIO
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
-from setuptools.compat import basestring, PY3, StringIO
 from setuptools.command.sdist import walk_revctrl
+from setuptools.command.setopt import edit_config
+from setuptools.command import bdist_egg
 from pkg_resources import (
     parse_requirements, safe_name, parse_version,
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
@@ -61,8 +65,6 @@ def initialize_options(self):
         self.vtags = None
 
     def save_version_info(self, filename):
-        from setuptools.command.setopt import edit_config
-
         values = dict(
             egg_info=dict(
                 tag_svn_revision=0,
@@ -189,8 +191,6 @@ def tags(self):
         if self.tag_svn_revision:
             version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
-            import time
-
             version += time.strftime("-%Y%m%d")
         return version
 
@@ -391,7 +391,6 @@ def write_pkg_info(cmd, basename, filename):
             metadata.name, metadata.version = oldname, oldver
 
         safe = getattr(cmd.distribution, 'zip_safe', None)
-        from setuptools.command import bdist_egg
 
         bdist_egg.write_safety_flag(cmd.egg_info, safe)
 

From a718819d2849196e902808301c9a95724510c5c1 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 10 Dec 2015 11:35:41 +1300
Subject: [PATCH 5358/8469] First shot at removing usage of _markerlib and
 switching to the PEP 508 implementation in packaging.

---
 Makefile                                      |    3 +
 _markerlib/__init__.py                        |   16 -
 _markerlib/markers.py                         |  119 -
 pkg_resources/__init__.py                     |  158 +-
 pkg_resources/_vendor/packaging/__about__.py  |   24 +-
 pkg_resources/_vendor/packaging/__init__.py   |   16 +-
 pkg_resources/_vendor/packaging/_compat.py    |   16 +-
 .../_vendor/packaging/_structures.py          |   16 +-
 pkg_resources/_vendor/packaging/markers.py    |  249 ++
 .../_vendor/packaging/requirements.py         |  118 +
 pkg_resources/_vendor/packaging/specifiers.py |   38 +-
 pkg_resources/_vendor/packaging/version.py    |   16 +-
 pkg_resources/_vendor/pyparsing.py            | 3805 +++++++++++++++++
 pkg_resources/_vendor/vendored.txt            |    1 +
 pkg_resources/api_tests.txt                   |   64 +-
 pkg_resources/tests/test_markers.py           |    8 +-
 setuptools/tests/test_dist_info.py            |    1 -
 setuptools/tests/test_markerlib.py            |   63 -
 18 files changed, 4259 insertions(+), 472 deletions(-)
 delete mode 100644 _markerlib/__init__.py
 delete mode 100644 _markerlib/markers.py
 create mode 100644 pkg_resources/_vendor/packaging/markers.py
 create mode 100644 pkg_resources/_vendor/packaging/requirements.py
 create mode 100644 pkg_resources/_vendor/pyparsing.py
 delete mode 100644 setuptools/tests/test_markerlib.py

diff --git a/Makefile b/Makefile
index 37dd26eb91..c2295cda54 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,8 @@ empty:
 
 update-vendored:
 	rm -rf pkg_resources/_vendor/packaging
+	rm -rf pkg_resources/_vendor/pyparsing
 	pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	sed -i -e 's/ \(pyparsing\)/ pkg_resources._vendor.\1/' \
+		pkg_resources/_vendor/packaging/*.py
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
diff --git a/_markerlib/__init__.py b/_markerlib/__init__.py
deleted file mode 100644
index e2b237b1f6..0000000000
--- a/_markerlib/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-try:
-    import ast
-    from _markerlib.markers import default_environment, compile, interpret
-except ImportError:
-    if 'ast' in globals():
-        raise
-    def default_environment():
-        return {}
-    def compile(marker):
-        def marker_fn(environment=None, override=None):
-            # 'empty markers are True' heuristic won't install extra deps.
-            return not marker.strip()
-        marker_fn.__doc__ = marker
-        return marker_fn
-    def interpret(marker, environment=None, override=None):
-        return compile(marker)()
diff --git a/_markerlib/markers.py b/_markerlib/markers.py
deleted file mode 100644
index fa837061e0..0000000000
--- a/_markerlib/markers.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Interpret PEP 345 environment markers.
-
-EXPR [in|==|!=|not in] EXPR [or|and] ...
-
-where EXPR belongs to any of those:
-
-    python_version = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    python_full_version = sys.version.split()[0]
-    os.name = os.name
-    sys.platform = sys.platform
-    platform.version = platform.version()
-    platform.machine = platform.machine()
-    platform.python_implementation = platform.python_implementation()
-    a free string, like '2.6', or 'win32'
-"""
-
-__all__ = ['default_environment', 'compile', 'interpret']
-
-import ast
-import os
-import platform
-import sys
-import weakref
-
-_builtin_compile = compile
-
-try:
-    from platform import python_implementation
-except ImportError:
-    if os.name == "java":
-        # Jython 2.5 has ast module, but not platform.python_implementation() function.
-        def python_implementation():
-            return "Jython"
-    else:
-        raise
-
-
-# restricted set of variables
-_VARS = {'sys.platform': sys.platform,
-         'python_version': '%s.%s' % sys.version_info[:2],
-         # FIXME parsing sys.platform is not reliable, but there is no other
-         # way to get e.g. 2.7.2+, and the PEP is defined with sys.version
-         'python_full_version': sys.version.split(' ', 1)[0],
-         'os.name': os.name,
-         'platform.version': platform.version(),
-         'platform.machine': platform.machine(),
-         'platform.python_implementation': python_implementation(),
-         'extra': None # wheel extension
-        }
-
-for var in list(_VARS.keys()):
-    if '.' in var:
-        _VARS[var.replace('.', '_')] = _VARS[var]
-
-def default_environment():
-    """Return copy of default PEP 385 globals dictionary."""
-    return dict(_VARS)
-
-class ASTWhitelist(ast.NodeTransformer):
-    def __init__(self, statement):
-        self.statement = statement # for error messages
-
-    ALLOWED = (ast.Compare, ast.BoolOp, ast.Attribute, ast.Name, ast.Load, ast.Str)
-    # Bool operations
-    ALLOWED += (ast.And, ast.Or)
-    # Comparison operations
-    ALLOWED += (ast.Eq, ast.Gt, ast.GtE, ast.In, ast.Is, ast.IsNot, ast.Lt, ast.LtE, ast.NotEq, ast.NotIn)
-
-    def visit(self, node):
-        """Ensure statement only contains allowed nodes."""
-        if not isinstance(node, self.ALLOWED):
-            raise SyntaxError('Not allowed in environment markers.\n%s\n%s' %
-                               (self.statement,
-                               (' ' * node.col_offset) + '^'))
-        return ast.NodeTransformer.visit(self, node)
-
-    def visit_Attribute(self, node):
-        """Flatten one level of attribute access."""
-        new_node = ast.Name("%s.%s" % (node.value.id, node.attr), node.ctx)
-        return ast.copy_location(new_node, node)
-
-def parse_marker(marker):
-    tree = ast.parse(marker, mode='eval')
-    new_tree = ASTWhitelist(marker).generic_visit(tree)
-    return new_tree
-
-def compile_marker(parsed_marker):
-    return _builtin_compile(parsed_marker, '<environment marker>', 'eval',
-                   dont_inherit=True)
-
-_cache = weakref.WeakValueDictionary()
-
-def compile(marker):
-    """Return compiled marker as a function accepting an environment dict."""
-    try:
-        return _cache[marker]
-    except KeyError:
-        pass
-    if not marker.strip():
-        def marker_fn(environment=None, override=None):
-            """"""
-            return True
-    else:
-        compiled_marker = compile_marker(parse_marker(marker))
-        def marker_fn(environment=None, override=None):
-            """override updates environment"""
-            if override is None:
-                override = {}
-            if environment is None:
-                environment = default_environment()
-            environment.update(override)
-            return eval(compiled_marker, environment)
-    marker_fn.__doc__ = marker
-    _cache[marker] = marker_fn
-    return _cache[marker]
-
-def interpret(marker, environment=None):
-    return compile(marker)(environment)
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3cd67fa05e..82a357022b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -90,6 +90,8 @@
 try:
     import pkg_resources._vendor.packaging.version
     import pkg_resources._vendor.packaging.specifiers
+    import pkg_resources._vendor.packaging.requirements
+    import pkg_resources._vendor.packaging.markers
     packaging = pkg_resources._vendor.packaging
 except ImportError:
     # fallback to naturally-installed version; allows system packagers to
@@ -1420,13 +1422,15 @@ class MarkerEvaluation(object):
     @classmethod
     def is_invalid_marker(cls, text):
         """
-        Validate text as a PEP 426 environment marker; return an exception
+        Validate text as a PEP 508 environment marker; return an exception
         if invalid or False otherwise.
         """
         try:
             cls.evaluate_marker(text)
-        except SyntaxError as e:
-            return cls.normalize_exception(e)
+        except packaging.markers.InvalidMarker as e:
+            e.filename = None
+            e.lineno = None
+            return e
         return False
 
     @staticmethod
@@ -1518,48 +1522,14 @@ def get_op(cls, op):
     @classmethod
     def evaluate_marker(cls, text, extra=None):
         """
-        Evaluate a PEP 426 environment marker on CPython 2.4+.
+        Evaluate a PEP 508 environment marker on CPython 2.4+.
         Return a boolean indicating the marker result in this environment.
-        Raise SyntaxError if marker is invalid.
+        Raise InvalidMarker if marker is invalid.
 
-        This implementation uses the 'parser' module, which is not implemented
-        on
-        Jython and has been superseded by the 'ast' module in Python 2.6 and
-        later.
+        This implementation uses the 'pyparsing' module.
         """
-        return cls.interpret(parser.expr(text).totuple(1)[1])
-
-    @staticmethod
-    def _translate_metadata2(env):
-        """
-        Markerlib implements Metadata 1.2 (PEP 345) environment markers.
-        Translate the variables to Metadata 2.0 (PEP 426).
-        """
-        return dict(
-            (key.replace('.', '_'), value)
-            for key, value in env
-        )
-
-    @classmethod
-    def _markerlib_evaluate(cls, text):
-        """
-        Evaluate a PEP 426 environment marker using markerlib.
-        Return a boolean indicating the marker result in this environment.
-        Raise SyntaxError if marker is invalid.
-        """
-        import _markerlib
-
-        env = cls._translate_metadata2(_markerlib.default_environment())
-        try:
-            result = _markerlib.interpret(text, env)
-        except NameError as e:
-            raise SyntaxError(e.args[0])
-        return result
-
-    if 'parser' not in globals():
-        # Fall back to less-complete _markerlib implementation if 'parser' module
-        # is not available.
-        evaluate_marker = _markerlib_evaluate
+        marker = packaging.markers.Marker(text)
+        return marker.evaluate()
 
     @classmethod
     def interpret(cls, nodelist):
@@ -2314,18 +2284,6 @@ def yield_lines(strs):
             for s in yield_lines(ss):
                 yield s
 
-# whitespace and comment
-LINE_END = re.compile(r"\s*(#.*)?$").match
-# line continuation
-CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match
-# Distribution or extra
-DISTRO = re.compile(r"\s*((\w|[-.])+)").match
-# ver. info
-VERSION = re.compile(r"\s*(<=?|>=?|===?|!=|~=)\s*((\w|[-.*_!+])+)").match
-# comma between items
-COMMA = re.compile(r"\s*,").match
-OBRACKET = re.compile(r"\s*\[").match
-CBRACKET = re.compile(r"\s*\]").match
 MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
     r"""
@@ -2861,34 +2819,22 @@ def _dep_map(self):
             self.__dep_map = self._compute_dependencies()
             return self.__dep_map
 
-    def _preparse_requirement(self, requires_dist):
-        """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
-        Split environment marker, add == prefix to version specifiers as
-        necessary, and remove parenthesis.
-        """
-        parts = requires_dist.split(';', 1) + ['']
-        distvers = parts[0].strip()
-        mark = parts[1].strip()
-        distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
-        distvers = distvers.replace('(', '').replace(')', '')
-        return (distvers, mark)
-
     def _compute_dependencies(self):
         """Recompute this distribution's dependencies."""
-        from _markerlib import compile as compile_marker
         dm = self.__dep_map = {None: []}
 
         reqs = []
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
-            distvers, mark = self._preparse_requirement(req)
-            parsed = next(parse_requirements(distvers))
-            parsed.marker_fn = compile_marker(mark)
+            current_req = packaging.requirements.Requirement(req)
+            specs = _parse_requirement_specs(current_req)
+            parsed = Requirement(current_req.name, specs, current_req.extras)
+            parsed._marker = current_req.marker
             reqs.append(parsed)
 
         def reqs_for_extra(extra):
             for req in reqs:
-                if req.marker_fn(override={'extra':extra}):
+                if not req._marker or req._marker.evaluate({'extra': extra}):
                     yield req
 
         common = frozenset(reqs_for_extra(None))
@@ -2926,6 +2872,13 @@ def __str__(self):
         return ' '.join(self.args)
 
 
+def _parse_requirement_specs(req):
+    if req.specifier:
+        return [(spec.operator, spec.version) for spec in req.specifier]
+    else:
+        return []
+
+
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
@@ -2934,60 +2887,17 @@ def parse_requirements(strs):
     # create a steppable iterator, so we can handle \-continuations
     lines = iter(yield_lines(strs))
 
-    def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
-
-        items = []
-
-        while not TERMINATOR(line, p):
-            if CONTINUE(line, p):
-                try:
-                    line = next(lines)
-                    p = 0
-                except StopIteration:
-                    msg = "\\ must not appear on the last nonblank line"
-                    raise RequirementParseError(msg)
-
-            match = ITEM(line, p)
-            if not match:
-                msg = "Expected " + item_name + " in"
-                raise RequirementParseError(msg, line, "at", line[p:])
-
-            items.append(match.group(*groups))
-            p = match.end()
-
-            match = COMMA(line, p)
-            if match:
-                # skip the comma
-                p = match.end()
-            elif not TERMINATOR(line, p):
-                msg = "Expected ',' or end-of-list in"
-                raise RequirementParseError(msg, line, "at", line[p:])
-
-        match = TERMINATOR(line, p)
-        # skip the terminator, if any
-        if match:
-            p = match.end()
-        return line, p, items
-
     for line in lines:
-        match = DISTRO(line)
-        if not match:
-            raise RequirementParseError("Missing distribution spec", line)
-        project_name = match.group(1)
-        p = match.end()
-        extras = []
-
-        match = OBRACKET(line, p)
-        if match:
-            p = match.end()
-            line, p, extras = scan_list(
-                DISTRO, CBRACKET, line, p, (1,), "'extra' name"
-            )
-
-        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),
-            "version spec")
-        specs = [(op, val) for op, val in specs]
-        yield Requirement(project_name, specs, extras)
+        # Drop comments -- a hash without a space may be in a URL.
+        if ' #' in line:
+            line = line[:line.find(' #')]
+        # If there is a line continuation, drop it, and append the next line.
+        if line.endswith('\\'):
+            line = line[:-2].strip()
+            line += next(lines)
+        req = packaging.requirements.Requirement(line)
+        specs = _parse_requirement_specs(req)
+        yield Requirement(req.name, specs, req.extras)
 
 
 class Requirement:
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index eadb794eec..7058e69a47 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 __all__ = [
@@ -22,10 +12,10 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "15.3"
+__version__ = "15.4.dev0"
 
-__author__ = "Donald Stufft"
+__author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
-__license__ = "Apache License, Version 2.0"
-__copyright__ = "Copyright 2014 %s" % __author__
+__license__ = "BSD or Apache License, Version 2.0"
+__copyright__ = "Copyright 2014-2015 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py
index c39a8eab8e..5ee6220203 100644
--- a/pkg_resources/_vendor/packaging/__init__.py
+++ b/pkg_resources/_vendor/packaging/__init__.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 from .__about__ import (
diff --git a/pkg_resources/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
index 5c396ceac6..210bb80b7e 100644
--- a/pkg_resources/_vendor/packaging/_compat.py
+++ b/pkg_resources/_vendor/packaging/_compat.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import sys
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
index 0ae9bb52a2..ccc27861c3 100644
--- a/pkg_resources/_vendor/packaging/_structures.py
+++ b/pkg_resources/_vendor/packaging/_structures.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
new file mode 100644
index 0000000000..e9c6805ad8
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -0,0 +1,249 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import operator
+import os
+import platform
+import sys
+
+from pkg_resources._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources._vendor.pyparsing import Literal as L  # noqa
+
+from ._compat import string_types
+from .specifiers import Specifier, InvalidSpecifier
+
+
+__all__ = [
+    "InvalidMarker", "UndefinedComparison", "Marker", "default_environment",
+]
+
+
+class InvalidMarker(ValueError):
+    """
+    An invalid marker was found, users should refer to PEP 508.
+    """
+
+
+class UndefinedComparison(ValueError):
+    """
+    An invalid operation was attempted on a value that doesn't support it.
+    """
+
+
+class Node(object):
+
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
+
+
+class Variable(Node):
+    pass
+
+
+class Value(Node):
+    pass
+
+
+VARIABLE = (
+    L("implementation_version") |
+    L("python_implementation") |
+    L("implementation_name") |
+    L("python_full_version") |
+    L("platform_release") |
+    L("platform_version") |
+    L("platform_machine") |
+    L("platform_system") |
+    L("python_version") |
+    L("sys_platform") |
+    L("os_name") |
+    L("extra")
+)
+VARIABLE.setParseAction(lambda s, l, t: Variable(t[0]))
+
+VERSION_CMP = (
+    L("===") |
+    L("==") |
+    L(">=") |
+    L("<=") |
+    L("!=") |
+    L("~=") |
+    L(">") |
+    L("<")
+)
+
+MARKER_OP = VERSION_CMP | L("not in") | L("in")
+
+MARKER_VALUE = QuotedString("'") | QuotedString('"')
+MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
+
+BOOLOP = L("and") | L("or")
+
+MARKER_VAR = VARIABLE | MARKER_VALUE
+
+MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
+MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
+
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+
+MARKER_EXPR = Forward()
+MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
+MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
+
+MARKER = stringStart + MARKER_EXPR + stringEnd
+
+
+def _coerce_parse_result(results):
+    if isinstance(results, ParseResults):
+        return [_coerce_parse_result(i) for i in results]
+    else:
+        return results
+
+
+def _format_marker(marker, first=True):
+    assert isinstance(marker, (list, tuple, string_types))
+
+    # Sometimes we have a structure like [[...]] which is a single item list
+    # where the single item is itself it's own list. In that case we want skip
+    # the rest of this function so that we don't get extraneous () on the
+    # outside.
+    if (isinstance(marker, list) and len(marker) == 1
+            and isinstance(marker[0], (list, tuple))):
+        return _format_marker(marker[0])
+
+    if isinstance(marker, list):
+        inner = (_format_marker(m, first=False) for m in marker)
+        if first:
+            return " ".join(inner)
+        else:
+            return "(" + " ".join(inner) + ")"
+    elif isinstance(marker, tuple):
+        return '{0} {1} "{2}"'.format(*marker)
+    else:
+        return marker
+
+
+_operators = {
+    "in": lambda lhs, rhs: lhs in rhs,
+    "not in": lambda lhs, rhs: lhs not in rhs,
+    "<": operator.lt,
+    "<=": operator.le,
+    "==": operator.eq,
+    "!=": operator.ne,
+    ">=": operator.ge,
+    ">": operator.gt,
+}
+
+
+def _eval_op(lhs, op, rhs):
+    try:
+        spec = Specifier("".join([op, rhs]))
+    except InvalidSpecifier:
+        pass
+    else:
+        return spec.contains(lhs)
+
+    oper = _operators.get(op)
+    if oper is None:
+        raise UndefinedComparison(
+            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
+        )
+
+    return oper(lhs, rhs)
+
+
+def _evaluate_markers(markers, environment):
+    groups = [[]]
+
+    for marker in markers:
+        assert isinstance(marker, (list, tuple, string_types))
+
+        if isinstance(marker, list):
+            groups[-1].append(_evaluate_markers(marker, environment))
+        elif isinstance(marker, tuple):
+            lhs, op, rhs = marker
+            if isinstance(lhs, Variable):
+                value = _eval_op(environment[lhs.value], op, rhs.value)
+            else:
+                value = _eval_op(lhs.value, op, environment[rhs.value])
+            groups[-1].append(value)
+        else:
+            assert marker in ["and", "or"]
+            if marker == "or":
+                groups.append([])
+
+    return any(all(item) for item in groups)
+
+
+def format_full_version(info):
+    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    kind = info.releaselevel
+    if kind != 'final':
+        version += kind[0] + str(info.serial)
+    return version
+
+
+def default_environment():
+    if hasattr(sys, 'implementation'):
+        iver = format_full_version(sys.implementation.version)
+        implementation_name = sys.implementation.name
+    else:
+        iver = '0'
+        implementation_name = ''
+
+    return {
+        "implementation_name": implementation_name,
+        "implementation_version": iver,
+        "os_name": os.name,
+        "platform_machine": platform.machine(),
+        "platform_release": platform.release(),
+        "platform_system": platform.system(),
+        "platform_version": platform.version(),
+        "python_full_version": platform.python_version(),
+        "python_implementation": platform.python_implementation(),
+        "python_version": platform.python_version()[:3],
+        "sys_platform": sys.platform,
+    }
+
+
+class Marker(object):
+
+    def __init__(self, marker):
+        try:
+            self._markers = _coerce_parse_result(MARKER.parseString(marker))
+        except ParseException:
+            self._markers = None
+
+        # We do this because we can't do raise ... from None in Python 2.x
+        if self._markers is None:
+            raise InvalidMarker("Invalid marker: {0!r}".format(marker))
+
+    def __str__(self):
+        return _format_marker(self._markers)
+
+    def __repr__(self):
+        return "<Marker({0!r})>".format(str(self))
+
+    def evaluate(self, environment=None):
+        """Evaluate a marker.
+
+        Return the boolean from evaluating the given marker against the
+        environment. environment is an optional argument to override all or
+        part of the determined environment.
+
+        The environment is determined from the current Python process.
+        """
+        current_environment = default_environment()
+        if environment is not None:
+            current_environment.update(environment)
+
+        return _evaluate_markers(self._markers, current_environment)
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
new file mode 100644
index 0000000000..95b2d986cc
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -0,0 +1,118 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import string
+import re
+
+from pkg_resources._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources._vendor.pyparsing import Literal as L  # noqa
+from six.moves.urllib import parse as urlparse
+
+from .markers import MARKER_EXPR, Marker
+from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+
+
+class InvalidRequirement(ValueError):
+    """
+    An invalid requirement was found, users should refer to PEP 508.
+    """
+
+
+ALPHANUM = Word(string.ascii_letters + string.digits)
+
+LBRACKET = L("[").suppress()
+RBRACKET = L("]").suppress()
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+COMMA = L(",").suppress()
+SEMICOLON = L(";").suppress()
+AT = L("@").suppress()
+
+PUNCTUATION = Word("-_.")
+IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
+IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
+
+NAME = IDENTIFIER("name")
+EXTRA = IDENTIFIER
+
+URI = Regex(r'[^ ]+')("url")
+URL = (AT + URI)
+
+EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
+EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
+
+VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
+VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
+
+VERSION_ONE = VERSION_PEP440 | VERSION_LEGACY
+VERSION_MANY = VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE)
+VERSION_MANY.setParseAction(
+    lambda s, l, t: SpecifierSet(','.join(t.asList()))
+)
+VERSION_SPEC = ((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY)("specifier")
+
+MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+MARKER_EXPR.setParseAction(
+    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+)
+MARKER_SEPERATOR = SEMICOLON
+MARKER = MARKER_SEPERATOR + MARKER_EXPR
+
+VERSION_AND_MARKER = Optional(VERSION_SPEC) + Optional(MARKER)
+URL_AND_MARKER = URL + Optional(MARKER)
+
+NAMED_REQUIREMENT = \
+    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+
+REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+
+
+class Requirement(object):
+
+    # TODO: Can we test whether something is contained within a requirement?
+    #       If so how do we do that? Do we need to test against the _name_ of
+    #       the thing as well as the version? What about the markers?
+    # TODO: Can we normalize the name and extra name?
+
+    def __init__(self, requirement_string):
+        try:
+            req = REQUIREMENT.parseString(requirement_string)
+        except ParseException:
+            raise InvalidRequirement(
+                "Invalid requirement: {0!r}".format(requirement_string))
+
+        self.name = req.name
+        if req.url:
+            parsed_url = urlparse.urlparse(req.url)
+            if not (parsed_url.scheme and parsed_url.netloc) or (
+                    not parsed_url.scheme and not parsed_url.netloc):
+                raise InvalidRequirement("Invalid URL given")
+            self.url = req.url
+        else:
+            self.url = None
+        self.extras = req.extras.asList() if req.extras else []
+        self.specifier = req.specifier if req.specifier else None
+        self.marker = req.marker if req.marker else None
+
+    def __str__(self):
+        parts = [self.name]
+
+        if self.extras:
+            parts.append("[{0}]".format(",".join(sorted(self.extras))))
+
+        if self.specifier:
+            parts.append(str(self.specifier))
+
+        if self.url:
+            parts.append("@ {0}".format(self.url))
+
+        if self.marker:
+            parts.append("; {0}".format(self.marker))
+
+        return "".join(parts)
+
+    def __repr__(self):
+        return "<Requirement({0!r})>".format(str(self))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 891664f05c..b1fca708e9 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import abc
@@ -223,10 +213,8 @@ def filter(self, iterable, prereleases=None):
 
 class LegacySpecifier(_IndividualSpecifier):
 
-    _regex = re.compile(
+    _regex_str = (
         r"""
-        ^
-        \s*
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
@@ -234,12 +222,11 @@ class LegacySpecifier(_IndividualSpecifier):
                    # is a "legacy" specifier and the version string can be just
                    # about anything.
         )
-        \s*
-        $
-        """,
-        re.VERBOSE | re.IGNORECASE,
+        """
     )
 
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.X | re.I)
+
     _operators = {
         "==": "equal",
         "!=": "not_equal",
@@ -284,10 +271,8 @@ def wrapped(self, prospective, spec):
 
 class Specifier(_IndividualSpecifier):
 
-    _regex = re.compile(
+    _regex_str = (
         r"""
-        ^
-        \s*
         (?P<operator>(~=|==|!=|<=|>=|<|>|===))
         (?P<version>
             (?:
@@ -378,12 +363,11 @@ class Specifier(_IndividualSpecifier):
                 (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
             )
         )
-        \s*
-        $
-        """,
-        re.VERBOSE | re.IGNORECASE,
+        """
     )
 
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.X | re.I)
+
     _operators = {
         "~=": "compatible",
         "==": "equal",
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
index 4ba574b9fa..83b5ee8c5e 100644
--- a/pkg_resources/_vendor/packaging/version.py
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -1,16 +1,6 @@
-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import collections
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
new file mode 100644
index 0000000000..3e02dbee20
--- /dev/null
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -0,0 +1,3805 @@
+# module pyparsing.py
+#
+# Copyright (c) 2003-2015  Paul T. McGuire
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__doc__ = \
+"""
+pyparsing module - Classes and methods to define and execute parsing grammars
+
+The pyparsing module is an alternative approach to creating and executing simple grammars,
+vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
+don't need to learn a new syntax for defining grammars or matching expressions - the parsing module
+provides a library of classes that you use to construct the grammar directly in Python.
+
+Here is a program to parse "Hello, World!" (or any greeting of the form C{"<salutation>, <addressee>!"})::
+
+    from pyparsing import Word, alphas
+
+    # define grammar of a greeting
+    greet = Word( alphas ) + "," + Word( alphas ) + "!"
+
+    hello = "Hello, World!"
+    print (hello, "->", greet.parseString( hello ))
+
+The program outputs the following::
+
+    Hello, World! -> ['Hello', ',', 'World', '!']
+
+The Python representation of the grammar is quite readable, owing to the self-explanatory
+class names, and the use of '+', '|' and '^' operators.
+
+The parsed results returned from C{parseString()} can be accessed as a nested list, a dictionary, or an
+object with named attributes.
+
+The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
+ - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
+ - quoted strings
+ - embedded comments
+"""
+
+__version__ = "2.0.6"
+__versionTime__ = "9 Nov 2015 19:03"
+__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
+
+import string
+from weakref import ref as wkref
+import copy
+import sys
+import warnings
+import re
+import sre_constants
+import collections
+import pprint
+import functools
+import itertools
+
+#~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) )
+
+__all__ = [
+'And', 'CaselessKeyword', 'CaselessLiteral', 'CharsNotIn', 'Combine', 'Dict', 'Each', 'Empty',
+'FollowedBy', 'Forward', 'GoToColumn', 'Group', 'Keyword', 'LineEnd', 'LineStart', 'Literal',
+'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or',
+'ParseBaseException', 'ParseElementEnhance', 'ParseException', 'ParseExpression', 'ParseFatalException',
+'ParseResults', 'ParseSyntaxException', 'ParserElement', 'QuotedString', 'RecursiveGrammarException',
+'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 'Upcase',
+'White', 'Word', 'WordEnd', 'WordStart', 'ZeroOrMore',
+'alphanums', 'alphas', 'alphas8bit', 'anyCloseTag', 'anyOpenTag', 'cStyleComment', 'col',
+'commaSeparatedList', 'commonHTMLEntity', 'countedArray', 'cppStyleComment', 'dblQuotedString',
+'dblSlashComment', 'delimitedList', 'dictOf', 'downcaseTokens', 'empty', 'hexnums',
+'htmlComment', 'javaStyleComment', 'keepOriginalText', 'line', 'lineEnd', 'lineStart', 'lineno',
+'makeHTMLTags', 'makeXMLTags', 'matchOnlyAtCol', 'matchPreviousExpr', 'matchPreviousLiteral',
+'nestedExpr', 'nullDebugAction', 'nums', 'oneOf', 'opAssoc', 'operatorPrecedence', 'printables',
+'punc8bit', 'pythonStyleComment', 'quotedString', 'removeQuotes', 'replaceHTMLEntity', 
+'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
+'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
+'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
+]
+
+PY_3 = sys.version.startswith('3')
+if PY_3:
+    _MAX_INT = sys.maxsize
+    basestring = str
+    unichr = chr
+    _ustr = str
+
+    # build list of single arg builtins, that can be used as parse actions
+    singleArgBuiltins = [sum, len, sorted, reversed, list, tuple, set, any, all, min, max]
+
+else:
+    _MAX_INT = sys.maxint
+    range = xrange
+
+    def _ustr(obj):
+        """Drop-in replacement for str(obj) that tries to be Unicode friendly. It first tries
+           str(obj). If that fails with a UnicodeEncodeError, then it tries unicode(obj). It
+           then < returns the unicode object | encodes it with the default encoding | ... >.
+        """
+        if isinstance(obj,unicode):
+            return obj
+
+        try:
+            # If this works, then _ustr(obj) has the same behaviour as str(obj), so
+            # it won't break any existing code.
+            return str(obj)
+
+        except UnicodeEncodeError:
+            # The Python docs (http://docs.python.org/ref/customization.html#l2h-182)
+            # state that "The return value must be a string object". However, does a
+            # unicode object (being a subclass of basestring) count as a "string
+            # object"?
+            # If so, then return a unicode object:
+            return unicode(obj)
+            # Else encode it... but how? There are many choices... :)
+            # Replace unprintables with escape codes?
+            #return unicode(obj).encode(sys.getdefaultencoding(), 'backslashreplace_errors')
+            # Replace unprintables with question marks?
+            #return unicode(obj).encode(sys.getdefaultencoding(), 'replace')
+            # ...
+
+    # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
+    singleArgBuiltins = []
+    import __builtin__
+    for fname in "sum len sorted reversed list tuple set any all min max".split():
+        try:
+            singleArgBuiltins.append(getattr(__builtin__,fname))
+        except AttributeError:
+            continue
+            
+_generatorType = type((y for y in range(1)))
+ 
+def _xml_escape(data):
+    """Escape &, <, >, ", ', etc. in a string of data."""
+
+    # ampersand must be replaced first
+    from_symbols = '&><"\''
+    to_symbols = ('&'+s+';' for s in "amp gt lt quot apos".split())
+    for from_,to_ in zip(from_symbols, to_symbols):
+        data = data.replace(from_, to_)
+    return data
+
+class _Constants(object):
+    pass
+
+alphas = string.ascii_lowercase + string.ascii_uppercase
+nums       = "0123456789"
+hexnums    = nums + "ABCDEFabcdef"
+alphanums  = alphas + nums
+_bslash    = chr(92)
+printables = "".join(c for c in string.printable if c not in string.whitespace)
+
+class ParseBaseException(Exception):
+    """base exception class for all parsing runtime exceptions"""
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, pstr, loc=0, msg=None, elem=None ):
+        self.loc = loc
+        if msg is None:
+            self.msg = pstr
+            self.pstr = ""
+        else:
+            self.msg = msg
+            self.pstr = pstr
+        self.parserElement = elem
+
+    def __getattr__( self, aname ):
+        """supported attributes by name are:
+            - lineno - returns the line number of the exception text
+            - col - returns the column number of the exception text
+            - line - returns the line containing the exception text
+        """
+        if( aname == "lineno" ):
+            return lineno( self.loc, self.pstr )
+        elif( aname in ("col", "column") ):
+            return col( self.loc, self.pstr )
+        elif( aname == "line" ):
+            return line( self.loc, self.pstr )
+        else:
+            raise AttributeError(aname)
+
+    def __str__( self ):
+        return "%s (at char %d), (line:%d, col:%d)" % \
+                ( self.msg, self.loc, self.lineno, self.column )
+    def __repr__( self ):
+        return _ustr(self)
+    def markInputline( self, markerString = ">!<" ):
+        """Extracts the exception line from the input string, and marks
+           the location of the exception with a special symbol.
+        """
+        line_str = self.line
+        line_column = self.column - 1
+        if markerString:
+            line_str = "".join((line_str[:line_column],
+                                markerString, line_str[line_column:]))
+        return line_str.strip()
+    def __dir__(self):
+        return "loc msg pstr parserElement lineno col line " \
+               "markInputline __str__ __repr__".split()
+
+class ParseException(ParseBaseException):
+    """exception thrown when parse expressions don't match class;
+       supported attributes by name are:
+        - lineno - returns the line number of the exception text
+        - col - returns the column number of the exception text
+        - line - returns the line containing the exception text
+    """
+    pass
+
+class ParseFatalException(ParseBaseException):
+    """user-throwable exception thrown when inconsistent parse content
+       is found; stops all parsing immediately"""
+    pass
+
+class ParseSyntaxException(ParseFatalException):
+    """just like C{L{ParseFatalException}}, but thrown internally when an
+       C{L{ErrorStop<And._ErrorStop>}} ('-' operator) indicates that parsing is to stop immediately because
+       an unbacktrackable syntax error has been found"""
+    def __init__(self, pe):
+        super(ParseSyntaxException, self).__init__(
+                                    pe.pstr, pe.loc, pe.msg, pe.parserElement)
+
+#~ class ReparseException(ParseBaseException):
+    #~ """Experimental class - parse actions can raise this exception to cause
+       #~ pyparsing to reparse the input string:
+        #~ - with a modified input string, and/or
+        #~ - with a modified start location
+       #~ Set the values of the ReparseException in the constructor, and raise the
+       #~ exception in a parse action to cause pyparsing to use the new string/location.
+       #~ Setting the values as None causes no change to be made.
+       #~ """
+    #~ def __init_( self, newstring, restartLoc ):
+        #~ self.newParseText = newstring
+        #~ self.reparseLoc = restartLoc
+
+class RecursiveGrammarException(Exception):
+    """exception thrown by C{validate()} if the grammar could be improperly recursive"""
+    def __init__( self, parseElementList ):
+        self.parseElementTrace = parseElementList
+
+    def __str__( self ):
+        return "RecursiveGrammarException: %s" % self.parseElementTrace
+
+class _ParseResultsWithOffset(object):
+    def __init__(self,p1,p2):
+        self.tup = (p1,p2)
+    def __getitem__(self,i):
+        return self.tup[i]
+    def __repr__(self):
+        return repr(self.tup)
+    def setOffset(self,i):
+        self.tup = (self.tup[0],i)
+
+class ParseResults(object):
+    """Structured parse results, to provide multiple means of access to the parsed data:
+       - as a list (C{len(results)})
+       - by list index (C{results[0], results[1]}, etc.)
+       - by attribute (C{results.<resultsName>})
+       """
+    def __new__(cls, toklist, name=None, asList=True, modal=True ):
+        if isinstance(toklist, cls):
+            return toklist
+        retobj = object.__new__(cls)
+        retobj.__doinit = True
+        return retobj
+
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, toklist, name=None, asList=True, modal=True, isinstance=isinstance ):
+        if self.__doinit:
+            self.__doinit = False
+            self.__name = None
+            self.__parent = None
+            self.__accumNames = {}
+            if isinstance(toklist, list):
+                self.__toklist = toklist[:]
+            elif isinstance(toklist, _generatorType):
+                self.__toklist = list(toklist)
+            else:
+                self.__toklist = [toklist]
+            self.__tokdict = dict()
+
+        if name is not None and name:
+            if not modal:
+                self.__accumNames[name] = 0
+            if isinstance(name,int):
+                name = _ustr(name) # will always return a str, but use _ustr for consistency
+            self.__name = name
+            if not (isinstance(toklist, (type(None), basestring, list)) and toklist in (None,'',[])):
+                if isinstance(toklist,basestring):
+                    toklist = [ toklist ]
+                if asList:
+                    if isinstance(toklist,ParseResults):
+                        self[name] = _ParseResultsWithOffset(toklist.copy(),0)
+                    else:
+                        self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]),0)
+                    self[name].__name = name
+                else:
+                    try:
+                        self[name] = toklist[0]
+                    except (KeyError,TypeError,IndexError):
+                        self[name] = toklist
+
+    def __getitem__( self, i ):
+        if isinstance( i, (int,slice) ):
+            return self.__toklist[i]
+        else:
+            if i not in self.__accumNames:
+                return self.__tokdict[i][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[i] ])
+
+    def __setitem__( self, k, v, isinstance=isinstance ):
+        if isinstance(v,_ParseResultsWithOffset):
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [v]
+            sub = v[0]
+        elif isinstance(k,int):
+            self.__toklist[k] = v
+            sub = v
+        else:
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [_ParseResultsWithOffset(v,0)]
+            sub = v
+        if isinstance(sub,ParseResults):
+            sub.__parent = wkref(self)
+
+    def __delitem__( self, i ):
+        if isinstance(i,(int,slice)):
+            mylen = len( self.__toklist )
+            del self.__toklist[i]
+
+            # convert int to slice
+            if isinstance(i, int):
+                if i < 0:
+                    i += mylen
+                i = slice(i, i+1)
+            # get removed indices
+            removed = list(range(*i.indices(mylen)))
+            removed.reverse()
+            # fixup indices in token dictionary
+            #~ for name in self.__tokdict:
+                #~ occurrences = self.__tokdict[name]
+                #~ for j in removed:
+                    #~ for k, (value, position) in enumerate(occurrences):
+                        #~ occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
+            for name,occurrences in self.__tokdict.items():
+                for j in removed:
+                    for k, (value, position) in enumerate(occurrences):
+                        occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
+        else:
+            del self.__tokdict[i]
+
+    def __contains__( self, k ):
+        return k in self.__tokdict
+
+    def __len__( self ): return len( self.__toklist )
+    def __bool__(self): return len( self.__toklist ) > 0
+    __nonzero__ = __bool__
+    def __iter__( self ): return iter( self.__toklist )
+    def __reversed__( self ): return iter( self.__toklist[::-1] )
+    def iterkeys( self ):
+        """Returns all named result keys."""
+        if hasattr(self.__tokdict, "iterkeys"):
+            return self.__tokdict.iterkeys()
+        else:
+            return iter(self.__tokdict)
+
+    def itervalues( self ):
+        """Returns all named result values."""
+        return (self[k] for k in self.iterkeys())
+            
+    def iteritems( self ):
+        return ((k, self[k]) for k in self.iterkeys())
+
+    if PY_3:
+        keys = iterkeys
+        values = itervalues
+        items = iteritems
+    else:
+        def keys( self ):
+            """Returns all named result keys."""
+            return list(self.iterkeys())
+
+        def values( self ):
+            """Returns all named result values."""
+            return list(self.itervalues())
+                
+        def items( self ):
+            """Returns all named result keys and values as a list of tuples."""
+            return list(self.iteritems())
+
+    def haskeys( self ):
+        """Since keys() returns an iterator, this method is helpful in bypassing
+           code that looks for the existence of any defined results names."""
+        return bool(self.__tokdict)
+        
+    def pop( self, *args, **kwargs):
+        """Removes and returns item at specified index (default=last).
+           Supports both list and dict semantics for pop(). If passed no
+           argument or an integer argument, it will use list semantics
+           and pop tokens from the list of parsed tokens. If passed a 
+           non-integer argument (most likely a string), it will use dict
+           semantics and pop the corresponding value from any defined 
+           results names. A second default return value argument is 
+           supported, just as in dict.pop()."""
+        if not args:
+            args = [-1]
+        for k,v in kwargs.items():
+            if k == 'default':
+                args = (args[0], v)
+            else:
+                raise TypeError("pop() got an unexpected keyword argument '%s'" % k)
+        if (isinstance(args[0], int) or 
+                        len(args) == 1 or 
+                        args[0] in self):
+            index = args[0]
+            ret = self[index]
+            del self[index]
+            return ret
+        else:
+            defaultvalue = args[1]
+            return defaultvalue
+
+    def get(self, key, defaultValue=None):
+        """Returns named result matching the given key, or if there is no
+           such name, then returns the given C{defaultValue} or C{None} if no
+           C{defaultValue} is specified."""
+        if key in self:
+            return self[key]
+        else:
+            return defaultValue
+
+    def insert( self, index, insStr ):
+        """Inserts new element at location index in the list of parsed tokens."""
+        self.__toklist.insert(index, insStr)
+        # fixup indices in token dictionary
+        #~ for name in self.__tokdict:
+            #~ occurrences = self.__tokdict[name]
+            #~ for k, (value, position) in enumerate(occurrences):
+                #~ occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
+        for name,occurrences in self.__tokdict.items():
+            for k, (value, position) in enumerate(occurrences):
+                occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
+
+    def append( self, item ):
+        """Add single element to end of ParseResults list of elements."""
+        self.__toklist.append(item)
+
+    def extend( self, itemseq ):
+        """Add sequence of elements to end of ParseResults list of elements."""
+        if isinstance(itemseq, ParseResults):
+            self += itemseq
+        else:
+            self.__toklist.extend(itemseq)
+
+    def clear( self ):
+        """Clear all elements and results names."""
+        del self.__toklist[:]
+        self.__tokdict.clear()
+
+    def __getattr__( self, name ):
+        try:
+            return self[name]
+        except KeyError:
+            return ""
+            
+        if name in self.__tokdict:
+            if name not in self.__accumNames:
+                return self.__tokdict[name][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[name] ])
+        else:
+            return ""
+
+    def __add__( self, other ):
+        ret = self.copy()
+        ret += other
+        return ret
+
+    def __iadd__( self, other ):
+        if other.__tokdict:
+            offset = len(self.__toklist)
+            addoffset = lambda a: offset if a<0 else a+offset
+            otheritems = other.__tokdict.items()
+            otherdictitems = [(k, _ParseResultsWithOffset(v[0],addoffset(v[1])) )
+                                for (k,vlist) in otheritems for v in vlist]
+            for k,v in otherdictitems:
+                self[k] = v
+                if isinstance(v[0],ParseResults):
+                    v[0].__parent = wkref(self)
+            
+        self.__toklist += other.__toklist
+        self.__accumNames.update( other.__accumNames )
+        return self
+
+    def __radd__(self, other):
+        if isinstance(other,int) and other == 0:
+            return self.copy()
+        
+    def __repr__( self ):
+        return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) )
+
+    def __str__( self ):
+        return '[' + ', '.join(_ustr(i) if isinstance(i, ParseResults) else repr(i) for i in self.__toklist) + ']'
+
+    def _asStringList( self, sep='' ):
+        out = []
+        for item in self.__toklist:
+            if out and sep:
+                out.append(sep)
+            if isinstance( item, ParseResults ):
+                out += item._asStringList()
+            else:
+                out.append( _ustr(item) )
+        return out
+
+    def asList( self ):
+        """Returns the parse results as a nested list of matching tokens, all converted to strings."""
+        return [res.asList() if isinstance(res,ParseResults) else res for res in self.__toklist]
+
+    def asDict( self ):
+        """Returns the named parse results as dictionary."""
+        if PY_3:
+            return dict( self.items() )
+        else:
+            return dict( self.iteritems() )
+
+    def copy( self ):
+        """Returns a new copy of a C{ParseResults} object."""
+        ret = ParseResults( self.__toklist )
+        ret.__tokdict = self.__tokdict.copy()
+        ret.__parent = self.__parent
+        ret.__accumNames.update( self.__accumNames )
+        ret.__name = self.__name
+        return ret
+
+    def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ):
+        """Returns the parse results as XML. Tags are created for tokens and lists that have defined results names."""
+        nl = "\n"
+        out = []
+        namedItems = dict((v[1],k) for (k,vlist) in self.__tokdict.items()
+                                                            for v in vlist)
+        nextLevelIndent = indent + "  "
+
+        # collapse out indents if formatting is not desired
+        if not formatted:
+            indent = ""
+            nextLevelIndent = ""
+            nl = ""
+
+        selfTag = None
+        if doctag is not None:
+            selfTag = doctag
+        else:
+            if self.__name:
+                selfTag = self.__name
+
+        if not selfTag:
+            if namedItemsOnly:
+                return ""
+            else:
+                selfTag = "ITEM"
+
+        out += [ nl, indent, "<", selfTag, ">" ]
+
+        for i,res in enumerate(self.__toklist):
+            if isinstance(res,ParseResults):
+                if i in namedItems:
+                    out += [ res.asXML(namedItems[i],
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+                else:
+                    out += [ res.asXML(None,
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+            else:
+                # individual token, see if there is a name for it
+                resTag = None
+                if i in namedItems:
+                    resTag = namedItems[i]
+                if not resTag:
+                    if namedItemsOnly:
+                        continue
+                    else:
+                        resTag = "ITEM"
+                xmlBodyText = _xml_escape(_ustr(res))
+                out += [ nl, nextLevelIndent, "<", resTag, ">",
+                                                xmlBodyText,
+                                                "</", resTag, ">" ]
+
+        out += [ nl, indent, "</", selfTag, ">" ]
+        return "".join(out)
+
+    def __lookup(self,sub):
+        for k,vlist in self.__tokdict.items():
+            for v,loc in vlist:
+                if sub is v:
+                    return k
+        return None
+
+    def getName(self):
+        """Returns the results name for this token expression."""
+        if self.__name:
+            return self.__name
+        elif self.__parent:
+            par = self.__parent()
+            if par:
+                return par.__lookup(self)
+            else:
+                return None
+        elif (len(self) == 1 and
+               len(self.__tokdict) == 1 and
+               self.__tokdict.values()[0][0][1] in (0,-1)):
+            return self.__tokdict.keys()[0]
+        else:
+            return None
+
+    def dump(self,indent='',depth=0):
+        """Diagnostic method for listing out the contents of a C{ParseResults}.
+           Accepts an optional C{indent} argument so that this string can be embedded
+           in a nested display of other data."""
+        out = []
+        NL = '\n'
+        out.append( indent+_ustr(self.asList()) )
+        if self.haskeys():
+            items = sorted(self.items())
+            for k,v in items:
+                if out:
+                    out.append(NL)
+                out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
+                if isinstance(v,ParseResults):
+                    if v:
+                        out.append( v.dump(indent,depth+1) )
+                    else:
+                        out.append(_ustr(v))
+                else:
+                    out.append(_ustr(v))
+        elif any(isinstance(vv,ParseResults) for vv in self):
+            v = self
+            for i,vv in enumerate(v):
+                if isinstance(vv,ParseResults):
+                    out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
+                else:
+                    out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
+            
+        return "".join(out)
+
+    def pprint(self, *args, **kwargs):
+        """Pretty-printer for parsed results as a list, using the C{pprint} module.
+           Accepts additional positional or keyword args as defined for the 
+           C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})"""
+        pprint.pprint(self.asList(), *args, **kwargs)
+
+    # add support for pickle protocol
+    def __getstate__(self):
+        return ( self.__toklist,
+                 ( self.__tokdict.copy(),
+                   self.__parent is not None and self.__parent() or None,
+                   self.__accumNames,
+                   self.__name ) )
+
+    def __setstate__(self,state):
+        self.__toklist = state[0]
+        (self.__tokdict,
+         par,
+         inAccumNames,
+         self.__name) = state[1]
+        self.__accumNames = {}
+        self.__accumNames.update(inAccumNames)
+        if par is not None:
+            self.__parent = wkref(par)
+        else:
+            self.__parent = None
+
+    def __dir__(self):
+        return dir(super(ParseResults,self)) + list(self.keys())
+
+collections.MutableMapping.register(ParseResults)
+
+def col (loc,strg):
+    """Returns current column within a string, counting newlines as line separators.
+   The first column is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    s = strg
+    return 1 if loc<len(s) and s[loc] == '\n' else loc - s.rfind("\n", 0, loc)
+
+def lineno(loc,strg):
+    """Returns current line number within a string, counting newlines as line separators.
+   The first line is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    return strg.count("\n",0,loc) + 1
+
+def line( loc, strg ):
+    """Returns the line of text containing loc within a string, counting newlines as line separators.
+       """
+    lastCR = strg.rfind("\n", 0, loc)
+    nextCR = strg.find("\n", loc)
+    if nextCR >= 0:
+        return strg[lastCR+1:nextCR]
+    else:
+        return strg[lastCR+1:]
+
+def _defaultStartDebugAction( instring, loc, expr ):
+    print (("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )))
+
+def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ):
+    print ("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
+
+def _defaultExceptionDebugAction( instring, loc, expr, exc ):
+    print ("Exception raised:" + _ustr(exc))
+
+def nullDebugAction(*args):
+    """'Do-nothing' debug action, to suppress debugging output during parsing."""
+    pass
+
+# Only works on Python 3.x - nonlocal is toxic to Python 2 installs
+#~ 'decorator to trim function calls to match the arity of the target'
+#~ def _trim_arity(func, maxargs=3):
+    #~ if func in singleArgBuiltins:
+        #~ return lambda s,l,t: func(t)
+    #~ limit = 0
+    #~ foundArity = False
+    #~ def wrapper(*args):
+        #~ nonlocal limit,foundArity
+        #~ while 1:
+            #~ try:
+                #~ ret = func(*args[limit:])
+                #~ foundArity = True
+                #~ return ret
+            #~ except TypeError:
+                #~ if limit == maxargs or foundArity:
+                    #~ raise
+                #~ limit += 1
+                #~ continue
+    #~ return wrapper
+
+# this version is Python 2.x-3.x cross-compatible
+'decorator to trim function calls to match the arity of the target'
+def _trim_arity(func, maxargs=2):
+    if func in singleArgBuiltins:
+        return lambda s,l,t: func(t)
+    limit = [0]
+    foundArity = [False]
+    def wrapper(*args):
+        while 1:
+            try:
+                ret = func(*args[limit[0]:])
+                foundArity[0] = True
+                return ret
+            except TypeError:
+                if limit[0] <= maxargs and not foundArity[0]:
+                    limit[0] += 1
+                    continue
+                raise
+    return wrapper
+ 
+class ParserElement(object):
+    """Abstract base level parser element class."""
+    DEFAULT_WHITE_CHARS = " \n\t\r"
+    verbose_stacktrace = False
+
+    @staticmethod
+    def setDefaultWhitespaceChars( chars ):
+        """Overrides the default whitespace chars
+        """
+        ParserElement.DEFAULT_WHITE_CHARS = chars
+
+    @staticmethod
+    def inlineLiteralsUsing(cls):
+        """
+        Set class to be used for inclusion of string literals into a parser.
+        """
+        ParserElement.literalStringClass = cls
+
+    def __init__( self, savelist=False ):
+        self.parseAction = list()
+        self.failAction = None
+        #~ self.name = "<unknown>"  # don't define self.name, let subclasses try/except upcall
+        self.strRepr = None
+        self.resultsName = None
+        self.saveAsList = savelist
+        self.skipWhitespace = True
+        self.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        self.copyDefaultWhiteChars = True
+        self.mayReturnEmpty = False # used when checking for left-recursion
+        self.keepTabs = False
+        self.ignoreExprs = list()
+        self.debug = False
+        self.streamlined = False
+        self.mayIndexError = True # used to optimize exception handling for subclasses that don't advance parse index
+        self.errmsg = ""
+        self.modalResults = True # used to mark results names as modal (report only last) or cumulative (list all)
+        self.debugActions = ( None, None, None ) #custom debug actions
+        self.re = None
+        self.callPreparse = True # used to avoid redundant calls to preParse
+        self.callDuringTry = False
+
+    def copy( self ):
+        """Make a copy of this C{ParserElement}.  Useful for defining different parse actions
+           for the same parsing pattern, using copies of the original parse element."""
+        cpy = copy.copy( self )
+        cpy.parseAction = self.parseAction[:]
+        cpy.ignoreExprs = self.ignoreExprs[:]
+        if self.copyDefaultWhiteChars:
+            cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        return cpy
+
+    def setName( self, name ):
+        """Define name for this expression, for use in debugging."""
+        self.name = name
+        self.errmsg = "Expected " + self.name
+        if hasattr(self,"exception"):
+            self.exception.msg = self.errmsg
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        """Define name for referencing matching tokens as a nested attribute
+           of the returned parse results.
+           NOTE: this returns a *copy* of the original C{ParserElement} object;
+           this is so that the client can define a basic element, such as an
+           integer, and reference it in multiple places with different names.
+           
+           You can also set results names using the abbreviated syntax,
+           C{expr("name")} in place of C{expr.setResultsName("name")} - 
+           see L{I{__call__}<__call__>}.
+        """
+        newself = self.copy()
+        if name.endswith("*"):
+            name = name[:-1]
+            listAllMatches=True
+        newself.resultsName = name
+        newself.modalResults = not listAllMatches
+        return newself
+
+    def setBreak(self,breakFlag = True):
+        """Method to invoke the Python pdb debugger when this element is
+           about to be parsed. Set C{breakFlag} to True to enable, False to
+           disable.
+        """
+        if breakFlag:
+            _parseMethod = self._parse
+            def breaker(instring, loc, doActions=True, callPreParse=True):
+                import pdb
+                pdb.set_trace()
+                return _parseMethod( instring, loc, doActions, callPreParse )
+            breaker._originalParseMethod = _parseMethod
+            self._parse = breaker
+        else:
+            if hasattr(self._parse,"_originalParseMethod"):
+                self._parse = self._parse._originalParseMethod
+        return self
+
+    def setParseAction( self, *fns, **kwargs ):
+        """Define action to perform when successfully matching parse element definition.
+           Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
+           C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
+            - s   = the original string being parsed (see note below)
+            - loc = the location of the matching substring
+            - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
+           If the functions in fns modify the tokens, they can return them as the return
+           value from fn, and the modified list of tokens will replace the original.
+           Otherwise, fn does not need to return any value.
+
+           Note: the default parsing behavior is to expand tabs in the input string
+           before starting the parsing process.  See L{I{parseString}<parseString>} for more information
+           on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+           consistent view of the parsed string, the parse location, and line and column
+           positions within the parsed string.
+           """
+        self.parseAction = list(map(_trim_arity, list(fns)))
+        self.callDuringTry = kwargs.get("callDuringTry", False)
+        return self
+
+    def addParseAction( self, *fns, **kwargs ):
+        """Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}."""
+        self.parseAction += list(map(_trim_arity, list(fns)))
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def addCondition(self, *fns, **kwargs):
+        """Add a boolean predicate function to expression's list of parse actions. See 
+        L{I{setParseAction}<setParseAction>}. Optional keyword argument C{message} can
+        be used to define a custom message to be used in the raised exception."""
+        msg = kwargs.get("message") or "failed user-defined condition"
+        for fn in fns:
+            def pa(s,l,t):
+                if not bool(_trim_arity(fn)(s,l,t)):
+                    raise ParseException(s,l,msg)
+                return t
+            self.parseAction.append(pa)
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def setFailAction( self, fn ):
+        """Define action to perform if parsing fails at this expression.
+           Fail acton fn is a callable function that takes the arguments
+           C{fn(s,loc,expr,err)} where:
+            - s = string being parsed
+            - loc = location where expression match was attempted and failed
+            - expr = the parse expression that failed
+            - err = the exception thrown
+           The function returns no value.  It may throw C{L{ParseFatalException}}
+           if it is desired to stop parsing immediately."""
+        self.failAction = fn
+        return self
+
+    def _skipIgnorables( self, instring, loc ):
+        exprsFound = True
+        while exprsFound:
+            exprsFound = False
+            for e in self.ignoreExprs:
+                try:
+                    while 1:
+                        loc,dummy = e._parse( instring, loc )
+                        exprsFound = True
+                except ParseException:
+                    pass
+        return loc
+
+    def preParse( self, instring, loc ):
+        if self.ignoreExprs:
+            loc = self._skipIgnorables( instring, loc )
+
+        if self.skipWhitespace:
+            wt = self.whiteChars
+            instrlen = len(instring)
+            while loc < instrlen and instring[loc] in wt:
+                loc += 1
+
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        return loc, []
+
+    def postParse( self, instring, loc, tokenlist ):
+        return tokenlist
+
+    #~ @profile
+    def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
+        debugging = ( self.debug ) #and doActions )
+
+        if debugging or self.failAction:
+            #~ print ("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
+            if (self.debugActions[0] ):
+                self.debugActions[0]( instring, loc, self )
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            try:
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            except ParseBaseException as err:
+                #~ print ("Exception raised:", err)
+                if self.debugActions[2]:
+                    self.debugActions[2]( instring, tokensStart, self, err )
+                if self.failAction:
+                    self.failAction( instring, tokensStart, self, err )
+                raise
+        else:
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            if self.mayIndexError or loc >= len(instring):
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            else:
+                loc,tokens = self.parseImpl( instring, preloc, doActions )
+
+        tokens = self.postParse( instring, loc, tokens )
+
+        retTokens = ParseResults( tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults )
+        if self.parseAction and (doActions or self.callDuringTry):
+            if debugging:
+                try:
+                    for fn in self.parseAction:
+                        tokens = fn( instring, tokensStart, retTokens )
+                        if tokens is not None:
+                            retTokens = ParseResults( tokens,
+                                                      self.resultsName,
+                                                      asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                      modal=self.modalResults )
+                except ParseBaseException as err:
+                    #~ print "Exception raised in user parse action:", err
+                    if (self.debugActions[2] ):
+                        self.debugActions[2]( instring, tokensStart, self, err )
+                    raise
+            else:
+                for fn in self.parseAction:
+                    tokens = fn( instring, tokensStart, retTokens )
+                    if tokens is not None:
+                        retTokens = ParseResults( tokens,
+                                                  self.resultsName,
+                                                  asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                  modal=self.modalResults )
+
+        if debugging:
+            #~ print ("Matched",self,"->",retTokens.asList())
+            if (self.debugActions[1] ):
+                self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
+
+        return loc, retTokens
+
+    def tryParse( self, instring, loc ):
+        try:
+            return self._parse( instring, loc, doActions=False )[0]
+        except ParseFatalException:
+            raise ParseException( instring, loc, self.errmsg, self)
+
+    # this method gets repeatedly called during backtracking with the same arguments -
+    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
+    def _parseCache( self, instring, loc, doActions=True, callPreParse=True ):
+        lookup = (self,instring,loc,callPreParse,doActions)
+        if lookup in ParserElement._exprArgCache:
+            value = ParserElement._exprArgCache[ lookup ]
+            if isinstance(value, Exception):
+                raise value
+            return (value[0],value[1].copy())
+        else:
+            try:
+                value = self._parseNoCache( instring, loc, doActions, callPreParse )
+                ParserElement._exprArgCache[ lookup ] = (value[0],value[1].copy())
+                return value
+            except ParseBaseException as pe:
+                pe.__traceback__ = None
+                ParserElement._exprArgCache[ lookup ] = pe
+                raise
+
+    _parse = _parseNoCache
+
+    # argument cache for optimizing repeated calls when backtracking through recursive expressions
+    _exprArgCache = {}
+    @staticmethod
+    def resetCache():
+        ParserElement._exprArgCache.clear()
+
+    _packratEnabled = False
+    @staticmethod
+    def enablePackrat():
+        """Enables "packrat" parsing, which adds memoizing to the parsing logic.
+           Repeated parse attempts at the same string location (which happens
+           often in many complex grammars) can immediately return a cached value,
+           instead of re-executing parsing/validating code.  Memoizing is done of
+           both valid results and parsing exceptions.
+
+           This speedup may break existing programs that use parse actions that
+           have side-effects.  For this reason, packrat parsing is disabled when
+           you first import pyparsing.  To activate the packrat feature, your
+           program must call the class method C{ParserElement.enablePackrat()}.  If
+           your program uses C{psyco} to "compile as you go", you must call
+           C{enablePackrat} before calling C{psyco.full()}.  If you do not do this,
+           Python will crash.  For best results, call C{enablePackrat()} immediately
+           after importing pyparsing.
+        """
+        if not ParserElement._packratEnabled:
+            ParserElement._packratEnabled = True
+            ParserElement._parse = ParserElement._parseCache
+
+    def parseString( self, instring, parseAll=False ):
+        """Execute the parse expression with the given string.
+           This is the main interface to the client code, once the complete
+           expression has been built.
+
+           If you want the grammar to require that the entire input string be
+           successfully parsed, then set C{parseAll} to True (equivalent to ending
+           the grammar with C{L{StringEnd()}}).
+
+           Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
+           in order to report proper column numbers in parse actions.
+           If the input string contains tabs and
+           the grammar uses parse actions that use the C{loc} argument to index into the
+           string being parsed, you can ensure you have a consistent view of the input
+           string by:
+            - calling C{parseWithTabs} on your grammar before calling C{parseString}
+              (see L{I{parseWithTabs}<parseWithTabs>})
+            - define your parse action using the full C{(s,loc,toks)} signature, and
+              reference the input string using the parse action's C{s} argument
+            - explictly expand the tabs in your input string before calling
+              C{parseString}
+        """
+        ParserElement.resetCache()
+        if not self.streamlined:
+            self.streamline()
+            #~ self.saveAsList = True
+        for e in self.ignoreExprs:
+            e.streamline()
+        if not self.keepTabs:
+            instring = instring.expandtabs()
+        try:
+            loc, tokens = self._parse( instring, 0 )
+            if parseAll:
+                loc = self.preParse( instring, loc )
+                se = Empty() + StringEnd()
+                se._parse( instring, loc )
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+        else:
+            return tokens
+
+    def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
+        """Scan the input string for expression matches.  Each match will return the
+           matching tokens, start location, and end location.  May be called with optional
+           C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
+           C{overlap} is specified, then overlapping matches will be reported.
+
+           Note that the start and end locations are reported relative to the string
+           being parsed.  See L{I{parseString}<parseString>} for more information on parsing
+           strings with embedded tabs."""
+        if not self.streamlined:
+            self.streamline()
+        for e in self.ignoreExprs:
+            e.streamline()
+
+        if not self.keepTabs:
+            instring = _ustr(instring).expandtabs()
+        instrlen = len(instring)
+        loc = 0
+        preparseFn = self.preParse
+        parseFn = self._parse
+        ParserElement.resetCache()
+        matches = 0
+        try:
+            while loc <= instrlen and matches < maxMatches:
+                try:
+                    preloc = preparseFn( instring, loc )
+                    nextLoc,tokens = parseFn( instring, preloc, callPreParse=False )
+                except ParseException:
+                    loc = preloc+1
+                else:
+                    if nextLoc > loc:
+                        matches += 1
+                        yield tokens, preloc, nextLoc
+                        if overlap:
+                            nextloc = preparseFn( instring, loc )
+                            if nextloc > loc:
+                                loc = nextLoc
+                            else:
+                                loc += 1
+                        else:
+                            loc = nextLoc
+                    else:
+                        loc = preloc+1
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def transformString( self, instring ):
+        """Extension to C{L{scanString}}, to modify matching text with modified tokens that may
+           be returned from a parse action.  To use C{transformString}, define a grammar and
+           attach a parse action to it that modifies the returned token list.
+           Invoking C{transformString()} on a target string will then scan for matches,
+           and replace the matched text patterns according to the logic in the parse
+           action.  C{transformString()} returns the resulting transformed string."""
+        out = []
+        lastE = 0
+        # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
+        # keep string locs straight between transformString and scanString
+        self.keepTabs = True
+        try:
+            for t,s,e in self.scanString( instring ):
+                out.append( instring[lastE:s] )
+                if t:
+                    if isinstance(t,ParseResults):
+                        out += t.asList()
+                    elif isinstance(t,list):
+                        out += t
+                    else:
+                        out.append(t)
+                lastE = e
+            out.append(instring[lastE:])
+            out = [o for o in out if o]
+            return "".join(map(_ustr,_flatten(out)))
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def searchString( self, instring, maxMatches=_MAX_INT ):
+        """Another extension to C{L{scanString}}, simplifying the access to the tokens found
+           to match the given parse expression.  May be called with optional
+           C{maxMatches} argument, to clip searching after 'n' matches are found.
+        """
+        try:
+            return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def __add__(self, other ):
+        """Implementation of + operator - returns C{L{And}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, other ] )
+
+    def __radd__(self, other ):
+        """Implementation of + operator when left operand is not a C{L{ParserElement}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other + self
+
+    def __sub__(self, other):
+        """Implementation of - operator, returns C{L{And}} with error stop"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, And._ErrorStop(), other ] )
+
+    def __rsub__(self, other ):
+        """Implementation of - operator when left operand is not a C{L{ParserElement}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other - self
+
+    def __mul__(self,other):
+        """Implementation of * operator, allows use of C{expr * 3} in place of
+           C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
+           tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
+           may also include C{None} as in:
+            - C{expr*(n,None)} or C{expr*(n,)} is equivalent
+              to C{expr*n + L{ZeroOrMore}(expr)}
+              (read as "at least n instances of C{expr}")
+            - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
+              (read as "0 to n instances of C{expr}")
+            - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
+            - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
+
+           Note that C{expr*(None,n)} does not raise an exception if
+           more than n exprs exist in the input stream; that is,
+           C{expr*(None,n)} does not enforce a maximum number of expr
+           occurrences.  If this behavior is desired, then write
+           C{expr*(None,n) + ~expr}
+
+        """
+        if isinstance(other,int):
+            minElements, optElements = other,0
+        elif isinstance(other,tuple):
+            other = (other + (None, None))[:2]
+            if other[0] is None:
+                other = (0, other[1])
+            if isinstance(other[0],int) and other[1] is None:
+                if other[0] == 0:
+                    return ZeroOrMore(self)
+                if other[0] == 1:
+                    return OneOrMore(self)
+                else:
+                    return self*other[0] + ZeroOrMore(self)
+            elif isinstance(other[0],int) and isinstance(other[1],int):
+                minElements, optElements = other
+                optElements -= minElements
+            else:
+                raise TypeError("cannot multiply 'ParserElement' and ('%s','%s') objects", type(other[0]),type(other[1]))
+        else:
+            raise TypeError("cannot multiply 'ParserElement' and '%s' objects", type(other))
+
+        if minElements < 0:
+            raise ValueError("cannot multiply ParserElement by negative value")
+        if optElements < 0:
+            raise ValueError("second tuple value must be greater or equal to first tuple value")
+        if minElements == optElements == 0:
+            raise ValueError("cannot multiply ParserElement by 0 or (0,0)")
+
+        if (optElements):
+            def makeOptionalList(n):
+                if n>1:
+                    return Optional(self + makeOptionalList(n-1))
+                else:
+                    return Optional(self)
+            if minElements:
+                if minElements == 1:
+                    ret = self + makeOptionalList(optElements)
+                else:
+                    ret = And([self]*minElements) + makeOptionalList(optElements)
+            else:
+                ret = makeOptionalList(optElements)
+        else:
+            if minElements == 1:
+                ret = self
+            else:
+                ret = And([self]*minElements)
+        return ret
+
+    def __rmul__(self, other):
+        return self.__mul__(other)
+
+    def __or__(self, other ):
+        """Implementation of | operator - returns C{L{MatchFirst}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return MatchFirst( [ self, other ] )
+
+    def __ror__(self, other ):
+        """Implementation of | operator when left operand is not a C{L{ParserElement}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other | self
+
+    def __xor__(self, other ):
+        """Implementation of ^ operator - returns C{L{Or}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Or( [ self, other ] )
+
+    def __rxor__(self, other ):
+        """Implementation of ^ operator when left operand is not a C{L{ParserElement}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other ^ self
+
+    def __and__(self, other ):
+        """Implementation of & operator - returns C{L{Each}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Each( [ self, other ] )
+
+    def __rand__(self, other ):
+        """Implementation of & operator when left operand is not a C{L{ParserElement}}"""
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other & self
+
+    def __invert__( self ):
+        """Implementation of ~ operator - returns C{L{NotAny}}"""
+        return NotAny( self )
+
+    def __call__(self, name=None):
+        """Shortcut for C{L{setResultsName}}, with C{listAllMatches=default}::
+             userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
+           could be written as::
+             userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")
+             
+           If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
+           passed as C{True}.
+           
+           If C{name} is omitted, same as calling C{L{copy}}.
+           """
+        if name is not None:
+            return self.setResultsName(name)
+        else:
+            return self.copy()
+
+    def suppress( self ):
+        """Suppresses the output of this C{ParserElement}; useful to keep punctuation from
+           cluttering up returned output.
+        """
+        return Suppress( self )
+
+    def leaveWhitespace( self ):
+        """Disables the skipping of whitespace before matching the characters in the
+           C{ParserElement}'s defined pattern.  This is normally only used internally by
+           the pyparsing module, but may be needed in some whitespace-sensitive grammars.
+        """
+        self.skipWhitespace = False
+        return self
+
+    def setWhitespaceChars( self, chars ):
+        """Overrides the default whitespace chars
+        """
+        self.skipWhitespace = True
+        self.whiteChars = chars
+        self.copyDefaultWhiteChars = False
+        return self
+
+    def parseWithTabs( self ):
+        """Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
+           Must be called before C{parseString} when the input grammar contains elements that
+           match C{<TAB>} characters."""
+        self.keepTabs = True
+        return self
+
+    def ignore( self, other ):
+        """Define expression to be ignored (e.g., comments) while doing pattern
+           matching; may be called repeatedly, to define multiple comment or other
+           ignorable patterns.
+        """
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                self.ignoreExprs.append( other.copy() )
+        else:
+            self.ignoreExprs.append( Suppress( other.copy() ) )
+        return self
+
+    def setDebugActions( self, startAction, successAction, exceptionAction ):
+        """Enable display of debugging messages while doing pattern matching."""
+        self.debugActions = (startAction or _defaultStartDebugAction,
+                             successAction or _defaultSuccessDebugAction,
+                             exceptionAction or _defaultExceptionDebugAction)
+        self.debug = True
+        return self
+
+    def setDebug( self, flag=True ):
+        """Enable display of debugging messages while doing pattern matching.
+           Set C{flag} to True to enable, False to disable."""
+        if flag:
+            self.setDebugActions( _defaultStartDebugAction, _defaultSuccessDebugAction, _defaultExceptionDebugAction )
+        else:
+            self.debug = False
+        return self
+
+    def __str__( self ):
+        return self.name
+
+    def __repr__( self ):
+        return _ustr(self)
+
+    def streamline( self ):
+        self.streamlined = True
+        self.strRepr = None
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        pass
+
+    def validate( self, validateTrace=[] ):
+        """Check defined expressions for valid structure, check for infinite recursive definitions."""
+        self.checkRecursion( [] )
+
+    def parseFile( self, file_or_filename, parseAll=False ):
+        """Execute the parse expression on the given file or filename.
+           If a filename is specified (instead of a file object),
+           the entire file is opened, read, and closed before parsing.
+        """
+        try:
+            file_contents = file_or_filename.read()
+        except AttributeError:
+            f = open(file_or_filename, "r")
+            file_contents = f.read()
+            f.close()
+        try:
+            return self.parseString(file_contents, parseAll)
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def __eq__(self,other):
+        if isinstance(other, ParserElement):
+            return self is other or self.__dict__ == other.__dict__
+        elif isinstance(other, basestring):
+            try:
+                self.parseString(_ustr(other), parseAll=True)
+                return True
+            except ParseBaseException:
+                return False
+        else:
+            return super(ParserElement,self)==other
+
+    def __ne__(self,other):
+        return not (self == other)
+
+    def __hash__(self):
+        return hash(id(self))
+
+    def __req__(self,other):
+        return self == other
+
+    def __rne__(self,other):
+        return not (self == other)
+
+    def runTests(self, tests, parseAll=False):
+        """Execute the parse expression on a series of test strings, showing each
+           test, the parsed results or where the parse failed. Quick and easy way to
+           run a parse expression against a list of sample strings.
+           
+           Parameters:
+            - tests - a list of separate test strings, or a multiline string of test strings
+            - parseAll - (default=False) - flag to pass to C{L{parseString}} when running tests           
+        """
+        if isinstance(tests, basestring):
+            tests = map(str.strip, tests.splitlines())
+        for t in tests:
+            out = [t]
+            try:
+                out.append(self.parseString(t, parseAll=parseAll).dump())
+            except ParseException as pe:
+                if '\n' in t:
+                    out.append(line(pe.loc, t))
+                    out.append(' '*(col(pe.loc,t)-1) + '^')
+                else:
+                    out.append(' '*pe.loc + '^')
+                out.append(str(pe))
+            out.append('')
+            print('\n'.join(out))
+
+        
+class Token(ParserElement):
+    """Abstract C{ParserElement} subclass, for defining atomic matching patterns."""
+    def __init__( self ):
+        super(Token,self).__init__( savelist=False )
+
+
+class Empty(Token):
+    """An empty token, will always match."""
+    def __init__( self ):
+        super(Empty,self).__init__()
+        self.name = "Empty"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+
+class NoMatch(Token):
+    """A token that will never match."""
+    def __init__( self ):
+        super(NoMatch,self).__init__()
+        self.name = "NoMatch"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.errmsg = "Unmatchable token"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
+class Literal(Token):
+    """Token to exactly match a specified string."""
+    def __init__( self, matchString ):
+        super(Literal,self).__init__()
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Literal; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+            self.__class__ = Empty
+        self.name = '"%s"' % _ustr(self.match)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+
+    # Performance tuning: this routine gets called a *lot*
+    # if this is a single character match string  and the first character matches,
+    # short-circuit as quickly as possible, and avoid calling startswith
+    #~ @profile
+    def parseImpl( self, instring, loc, doActions=True ):
+        if (instring[loc] == self.firstMatchChar and
+            (self.matchLen==1 or instring.startswith(self.match,loc)) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+_L = Literal
+ParserElement.literalStringClass = Literal
+
+class Keyword(Token):
+    """Token to exactly match a specified string as a keyword, that is, it must be
+       immediately followed by a non-keyword character.  Compare with C{L{Literal}}::
+         Literal("if") will match the leading C{'if'} in C{'ifAndOnlyIf'}.
+         Keyword("if") will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
+       Accepts two optional constructor arguments in addition to the keyword string:
+       C{identChars} is a string of characters that would be valid identifier characters,
+       defaulting to all alphanumerics + "_" and "$"; C{caseless} allows case-insensitive
+       matching, default is C{False}.
+    """
+    DEFAULT_KEYWORD_CHARS = alphanums+"_$"
+
+    def __init__( self, matchString, identChars=DEFAULT_KEYWORD_CHARS, caseless=False ):
+        super(Keyword,self).__init__()
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Keyword; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+        self.name = '"%s"' % self.match
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+        self.caseless = caseless
+        if caseless:
+            self.caselessmatch = matchString.upper()
+            identChars = identChars.upper()
+        self.identChars = set(identChars)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.caseless:
+            if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+                 (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) and
+                 (loc == 0 or instring[loc-1].upper() not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        else:
+            if (instring[loc] == self.firstMatchChar and
+                (self.matchLen==1 or instring.startswith(self.match,loc)) and
+                (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) and
+                (loc == 0 or instring[loc-1] not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+    def copy(self):
+        c = super(Keyword,self).copy()
+        c.identChars = Keyword.DEFAULT_KEYWORD_CHARS
+        return c
+
+    @staticmethod
+    def setDefaultKeywordChars( chars ):
+        """Overrides the default Keyword chars
+        """
+        Keyword.DEFAULT_KEYWORD_CHARS = chars
+
+class CaselessLiteral(Literal):
+    """Token to match a specified string, ignoring case of letters.
+       Note: the matched results will always be in the case of the given
+       match string, NOT the case of the input text.
+    """
+    def __init__( self, matchString ):
+        super(CaselessLiteral,self).__init__( matchString.upper() )
+        # Preserve the defining literal.
+        self.returnString = matchString
+        self.name = "'%s'" % self.returnString
+        self.errmsg = "Expected " + self.name
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[ loc:loc+self.matchLen ].upper() == self.match:
+            return loc+self.matchLen, self.returnString
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class CaselessKeyword(Keyword):
+    def __init__( self, matchString, identChars=Keyword.DEFAULT_KEYWORD_CHARS ):
+        super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+             (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class Word(Token):
+    """Token for matching words composed of allowed character sets.
+       Defined with string containing all allowed initial characters,
+       an optional string containing allowed body characters (if omitted,
+       defaults to the initial character set), and an optional minimum,
+       maximum, and/or exact length.  The default value for C{min} is 1 (a
+       minimum value < 1 is not valid); the default values for C{max} and C{exact}
+       are 0, meaning no maximum or exact length restriction. An optional
+       C{exclude} parameter can list characters that might be found in 
+       the input C{bodyChars} string; useful to define a word of all printables
+       except for one or two characters, for instance.
+    """
+    def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False, excludeChars=None ):
+        super(Word,self).__init__()
+        if excludeChars:
+            initChars = ''.join(c for c in initChars if c not in excludeChars)
+            if bodyChars:
+                bodyChars = ''.join(c for c in bodyChars if c not in excludeChars)
+        self.initCharsOrig = initChars
+        self.initChars = set(initChars)
+        if bodyChars :
+            self.bodyCharsOrig = bodyChars
+            self.bodyChars = set(bodyChars)
+        else:
+            self.bodyCharsOrig = initChars
+            self.bodyChars = set(initChars)
+
+        self.maxSpecified = max > 0
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(Word()) if zero-length word is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.asKeyword = asKeyword
+
+        if ' ' not in self.initCharsOrig+self.bodyCharsOrig and (min==1 and max==0 and exact==0):
+            if self.bodyCharsOrig == self.initCharsOrig:
+                self.reString = "[%s]+" % _escapeRegexRangeChars(self.initCharsOrig)
+            elif len(self.initCharsOrig) == 1:
+                self.reString = "%s[%s]*" % \
+                                      (re.escape(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            else:
+                self.reString = "[%s][%s]*" % \
+                                      (_escapeRegexRangeChars(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            if self.asKeyword:
+                self.reString = r"\b"+self.reString+r"\b"
+            try:
+                self.re = re.compile( self.reString )
+            except:
+                self.re = None
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.re:
+            result = self.re.match(instring,loc)
+            if not result:
+                raise ParseException(instring, loc, self.errmsg, self)
+
+            loc = result.end()
+            return loc, result.group()
+
+        if not(instring[ loc ] in self.initChars):
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        instrlen = len(instring)
+        bodychars = self.bodyChars
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, instrlen )
+        while loc < maxloc and instring[loc] in bodychars:
+            loc += 1
+
+        throwException = False
+        if loc - start < self.minLen:
+            throwException = True
+        if self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
+            throwException = True
+        if self.asKeyword:
+            if (start>0 and instring[start-1] in bodychars) or (loc<instrlen and instring[loc] in bodychars):
+                throwException = True
+
+        if throwException:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(Word,self).__str__()
+        except:
+            pass
+
+
+        if self.strRepr is None:
+
+            def charsAsStr(s):
+                if len(s)>4:
+                    return s[:4]+"..."
+                else:
+                    return s
+
+            if ( self.initCharsOrig != self.bodyCharsOrig ):
+                self.strRepr = "W:(%s,%s)" % ( charsAsStr(self.initCharsOrig), charsAsStr(self.bodyCharsOrig) )
+            else:
+                self.strRepr = "W:(%s)" % charsAsStr(self.initCharsOrig)
+
+        return self.strRepr
+
+
+class Regex(Token):
+    """Token for matching strings that match a given regular expression.
+       Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
+    """
+    compiledREtype = type(re.compile("[A-Z]"))
+    def __init__( self, pattern, flags=0):
+        """The parameters C{pattern} and C{flags} are passed to the C{re.compile()} function as-is. See the Python C{re} module for an explanation of the acceptable patterns and flags."""
+        super(Regex,self).__init__()
+
+        if isinstance(pattern, basestring):
+            if len(pattern) == 0:
+                warnings.warn("null string passed to Regex; use Empty() instead",
+                        SyntaxWarning, stacklevel=2)
+
+            self.pattern = pattern
+            self.flags = flags
+
+            try:
+                self.re = re.compile(self.pattern, self.flags)
+                self.reString = self.pattern
+            except sre_constants.error:
+                warnings.warn("invalid pattern (%s) passed to Regex" % pattern,
+                    SyntaxWarning, stacklevel=2)
+                raise
+
+        elif isinstance(pattern, Regex.compiledREtype):
+            self.re = pattern
+            self.pattern = \
+            self.reString = str(pattern)
+            self.flags = flags
+            
+        else:
+            raise ValueError("Regex may only be constructed with a string or a compiled RE object")
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = self.re.match(instring,loc)
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        d = result.groupdict()
+        ret = ParseResults(result.group())
+        if d:
+            for k in d:
+                ret[k] = d[k]
+        return loc,ret
+
+    def __str__( self ):
+        try:
+            return super(Regex,self).__str__()
+        except:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "Re:(%s)" % repr(self.pattern)
+
+        return self.strRepr
+
+
+class QuotedString(Token):
+    """Token for matching strings that are delimited by quoting characters.
+    """
+    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None):
+        """
+           Defined with the following parameters:
+            - quoteChar - string of one or more characters defining the quote delimiting string
+            - escChar - character to escape quotes, typically backslash (default=None)
+            - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=None)
+            - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
+            - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
+            - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
+        """
+        super(QuotedString,self).__init__()
+
+        # remove white space from quote chars - wont work anyway
+        quoteChar = quoteChar.strip()
+        if len(quoteChar) == 0:
+            warnings.warn("quoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+            raise SyntaxError()
+
+        if endQuoteChar is None:
+            endQuoteChar = quoteChar
+        else:
+            endQuoteChar = endQuoteChar.strip()
+            if len(endQuoteChar) == 0:
+                warnings.warn("endQuoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+                raise SyntaxError()
+
+        self.quoteChar = quoteChar
+        self.quoteCharLen = len(quoteChar)
+        self.firstQuoteChar = quoteChar[0]
+        self.endQuoteChar = endQuoteChar
+        self.endQuoteCharLen = len(endQuoteChar)
+        self.escChar = escChar
+        self.escQuote = escQuote
+        self.unquoteResults = unquoteResults
+
+        if multiline:
+            self.flags = re.MULTILINE | re.DOTALL
+            self.pattern = r'%s(?:[^%s%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        else:
+            self.flags = 0
+            self.pattern = r'%s(?:[^%s\n\r%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        if len(self.endQuoteChar) > 1:
+            self.pattern += (
+                '|(?:' + ')|(?:'.join("%s[^%s]" % (re.escape(self.endQuoteChar[:i]),
+                                               _escapeRegexRangeChars(self.endQuoteChar[i]))
+                                    for i in range(len(self.endQuoteChar)-1,0,-1)) + ')'
+                )
+        if escQuote:
+            self.pattern += (r'|(?:%s)' % re.escape(escQuote))
+        if escChar:
+            self.pattern += (r'|(?:%s.)' % re.escape(escChar))
+            self.escCharReplacePattern = re.escape(self.escChar)+"(.)"
+        self.pattern += (r')*%s' % re.escape(self.endQuoteChar))
+
+        try:
+            self.re = re.compile(self.pattern, self.flags)
+            self.reString = self.pattern
+        except sre_constants.error:
+            warnings.warn("invalid pattern (%s) passed to Regex" % self.pattern,
+                SyntaxWarning, stacklevel=2)
+            raise
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = instring[loc] == self.firstQuoteChar and self.re.match(instring,loc) or None
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        ret = result.group()
+
+        if self.unquoteResults:
+
+            # strip off quotes
+            ret = ret[self.quoteCharLen:-self.endQuoteCharLen]
+
+            if isinstance(ret,basestring):
+                # replace escaped characters
+                if self.escChar:
+                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
+
+                # replace escaped quotes
+                if self.escQuote:
+                    ret = ret.replace(self.escQuote, self.endQuoteChar)
+
+        return loc, ret
+
+    def __str__( self ):
+        try:
+            return super(QuotedString,self).__str__()
+        except:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "quoted string, starting with %s ending with %s" % (self.quoteChar, self.endQuoteChar)
+
+        return self.strRepr
+
+
+class CharsNotIn(Token):
+    """Token for matching words composed of characters *not* in a given set.
+       Defined with string containing all disallowed characters, and an optional
+       minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
+       minimum value < 1 is not valid); the default values for C{max} and C{exact}
+       are 0, meaning no maximum or exact length restriction.
+    """
+    def __init__( self, notChars, min=1, max=0, exact=0 ):
+        super(CharsNotIn,self).__init__()
+        self.skipWhitespace = False
+        self.notChars = notChars
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(CharsNotIn()) if zero-length char group is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = ( self.minLen == 0 )
+        self.mayIndexError = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[loc] in self.notChars:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        notchars = self.notChars
+        maxlen = min( start+self.maxLen, len(instring) )
+        while loc < maxlen and \
+              (instring[loc] not in notchars):
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(CharsNotIn, self).__str__()
+        except:
+            pass
+
+        if self.strRepr is None:
+            if len(self.notChars) > 4:
+                self.strRepr = "!W:(%s...)" % self.notChars[:4]
+            else:
+                self.strRepr = "!W:(%s)" % self.notChars
+
+        return self.strRepr
+
+class White(Token):
+    """Special matching class for matching whitespace.  Normally, whitespace is ignored
+       by pyparsing grammars.  This class is included when some whitespace structures
+       are significant.  Define with a string containing the whitespace characters to be
+       matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
+       as defined for the C{L{Word}} class."""
+    whiteStrs = {
+        " " : "<SPC>",
+        "\t": "<TAB>",
+        "\n": "<LF>",
+        "\r": "<CR>",
+        "\f": "<FF>",
+        }
+    def __init__(self, ws=" \t\r\n", min=1, max=0, exact=0):
+        super(White,self).__init__()
+        self.matchWhite = ws
+        self.setWhitespaceChars( "".join(c for c in self.whiteChars if c not in self.matchWhite) )
+        #~ self.leaveWhitespace()
+        self.name = ("".join(White.whiteStrs[c] for c in self.matchWhite))
+        self.mayReturnEmpty = True
+        self.errmsg = "Expected " + self.name
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if not(instring[ loc ] in self.matchWhite):
+            raise ParseException(instring, loc, self.errmsg, self)
+        start = loc
+        loc += 1
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, len(instring) )
+        while loc < maxloc and instring[loc] in self.matchWhite:
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+
+class _PositionToken(Token):
+    def __init__( self ):
+        super(_PositionToken,self).__init__()
+        self.name=self.__class__.__name__
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+class GoToColumn(_PositionToken):
+    """Token to advance to a specific column of input text; useful for tabular report scraping."""
+    def __init__( self, colno ):
+        super(GoToColumn,self).__init__()
+        self.col = colno
+
+    def preParse( self, instring, loc ):
+        if col(loc,instring) != self.col:
+            instrlen = len(instring)
+            if self.ignoreExprs:
+                loc = self._skipIgnorables( instring, loc )
+            while loc < instrlen and instring[loc].isspace() and col( loc, instring ) != self.col :
+                loc += 1
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        thiscol = col( loc, instring )
+        if thiscol > self.col:
+            raise ParseException( instring, loc, "Text not in expected column", self )
+        newloc = loc + self.col - thiscol
+        ret = instring[ loc: newloc ]
+        return newloc, ret
+
+class LineStart(_PositionToken):
+    """Matches if current position is at the beginning of a line within the parse string"""
+    def __init__( self ):
+        super(LineStart,self).__init__()
+        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
+        self.errmsg = "Expected start of line"
+
+    def preParse( self, instring, loc ):
+        preloc = super(LineStart,self).preParse(instring,loc)
+        if instring[preloc] == "\n":
+            loc += 1
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if not( loc==0 or
+            (loc == self.preParse( instring, 0 )) or
+            (instring[loc-1] == "\n") ): #col(loc, instring) != 1:
+            raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class LineEnd(_PositionToken):
+    """Matches if current position is at the end of a line within the parse string"""
+    def __init__( self ):
+        super(LineEnd,self).__init__()
+        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
+        self.errmsg = "Expected end of line"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc<len(instring):
+            if instring[loc] == "\n":
+                return loc+1, "\n"
+            else:
+                raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class StringStart(_PositionToken):
+    """Matches if current position is at the beginning of the parse string"""
+    def __init__( self ):
+        super(StringStart,self).__init__()
+        self.errmsg = "Expected start of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc != 0:
+            # see if entire string up to here is just whitespace and ignoreables
+            if loc != self.preParse( instring, 0 ):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class StringEnd(_PositionToken):
+    """Matches if current position is at the end of the parse string"""
+    def __init__( self ):
+        super(StringEnd,self).__init__()
+        self.errmsg = "Expected end of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc < len(instring):
+            raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        elif loc > len(instring):
+            return loc, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class WordStart(_PositionToken):
+    """Matches if the current position is at the beginning of a Word, and
+       is not preceded by any character in a given set of C{wordChars}
+       (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+       use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
+       the string being parsed, or at the beginning of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordStart,self).__init__()
+        self.wordChars = set(wordChars)
+        self.errmsg = "Not at the start of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        if loc != 0:
+            if (instring[loc-1] in self.wordChars or
+                instring[loc] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class WordEnd(_PositionToken):
+    """Matches if the current position is at the end of a Word, and
+       is not followed by any character in a given set of C{wordChars}
+       (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+       use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
+       the string being parsed, or at the end of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordEnd,self).__init__()
+        self.wordChars = set(wordChars)
+        self.skipWhitespace = False
+        self.errmsg = "Not at the end of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        instrlen = len(instring)
+        if instrlen>0 and loc<instrlen:
+            if (instring[loc] in self.wordChars or
+                instring[loc-1] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+
+class ParseExpression(ParserElement):
+    """Abstract subclass of ParserElement, for combining and post-processing parsed tokens."""
+    def __init__( self, exprs, savelist = False ):
+        super(ParseExpression,self).__init__(savelist)
+        if isinstance( exprs, _generatorType ):
+            exprs = list(exprs)
+
+        if isinstance( exprs, basestring ):
+            self.exprs = [ Literal( exprs ) ]
+        elif isinstance( exprs, collections.Sequence ):
+            # if sequence of strings provided, wrap with Literal
+            if all(isinstance(expr, basestring) for expr in exprs):
+                exprs = map(Literal, exprs)
+            self.exprs = list(exprs)
+        else:
+            try:
+                self.exprs = list( exprs )
+            except TypeError:
+                self.exprs = [ exprs ]
+        self.callPreparse = False
+
+    def __getitem__( self, i ):
+        return self.exprs[i]
+
+    def append( self, other ):
+        self.exprs.append( other )
+        self.strRepr = None
+        return self
+
+    def leaveWhitespace( self ):
+        """Extends C{leaveWhitespace} defined in base class, and also invokes C{leaveWhitespace} on
+           all contained expressions."""
+        self.skipWhitespace = False
+        self.exprs = [ e.copy() for e in self.exprs ]
+        for e in self.exprs:
+            e.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseExpression, self).ignore( other )
+                for e in self.exprs:
+                    e.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseExpression, self).ignore( other )
+            for e in self.exprs:
+                e.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def __str__( self ):
+        try:
+            return super(ParseExpression,self).__str__()
+        except:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.exprs) )
+        return self.strRepr
+
+    def streamline( self ):
+        super(ParseExpression,self).streamline()
+
+        for e in self.exprs:
+            e.streamline()
+
+        # collapse nested And's of the form And( And( And( a,b), c), d) to And( a,b,c,d )
+        # but only if there are no parse actions or resultsNames on the nested And's
+        # (likewise for Or's and MatchFirst's)
+        if ( len(self.exprs) == 2 ):
+            other = self.exprs[0]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = other.exprs[:] + [ self.exprs[1] ]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+            other = self.exprs[-1]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = self.exprs[:-1] + other.exprs[:]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+        self.errmsg = "Expected " + str(self)
+        
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        ret = super(ParseExpression,self).setResultsName(name,listAllMatches)
+        return ret
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        for e in self.exprs:
+            e.validate(tmp)
+        self.checkRecursion( [] )
+        
+    def copy(self):
+        ret = super(ParseExpression,self).copy()
+        ret.exprs = [e.copy() for e in self.exprs]
+        return ret
+
+class And(ParseExpression):
+    """Requires all given C{ParseExpression}s to be found in the given order.
+       Expressions may be separated by whitespace.
+       May be constructed using the C{'+'} operator.
+    """
+
+    class _ErrorStop(Empty):
+        def __init__(self, *args, **kwargs):
+            super(And._ErrorStop,self).__init__(*args, **kwargs)
+            self.name = '-'
+            self.leaveWhitespace()
+
+    def __init__( self, exprs, savelist = True ):
+        super(And,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.setWhitespaceChars( self.exprs[0].whiteChars )
+        self.skipWhitespace = self.exprs[0].skipWhitespace
+        self.callPreparse = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        # pass False as last arg to _parse for first element, since we already
+        # pre-parsed the string as part of our And pre-parsing
+        loc, resultlist = self.exprs[0]._parse( instring, loc, doActions, callPreParse=False )
+        errorStop = False
+        for e in self.exprs[1:]:
+            if isinstance(e, And._ErrorStop):
+                errorStop = True
+                continue
+            if errorStop:
+                try:
+                    loc, exprtokens = e._parse( instring, loc, doActions )
+                except ParseSyntaxException:
+                    raise
+                except ParseBaseException as pe:
+                    pe.__traceback__ = None
+                    raise ParseSyntaxException(pe)
+                except IndexError:
+                    raise ParseSyntaxException( ParseException(instring, len(instring), self.errmsg, self) )
+            else:
+                loc, exprtokens = e._parse( instring, loc, doActions )
+            if exprtokens or exprtokens.haskeys():
+                resultlist += exprtokens
+        return loc, resultlist
+
+    def __iadd__(self, other ):
+        if isinstance( other, basestring ):
+            other = Literal( other )
+        return self.append( other ) #And( [ self, other ] )
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+            if not e.mayReturnEmpty:
+                break
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+
+class Or(ParseExpression):
+    """Requires that at least one C{ParseExpression} is found.
+       If two expressions match, the expression that matches the longest string will be used.
+       May be constructed using the C{'^'} operator.
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(Or,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        matches = []
+        for e in self.exprs:
+            try:
+                loc2 = e.tryParse( instring, loc )
+            except ParseException as err:
+                err.__traceback__ = None
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+            else:
+                # save match among all matches, to retry longest to shortest
+                matches.append((loc2, e))
+
+        if matches:
+            matches.sort(key=lambda x: -x[0])
+            for _,e in matches:
+                try:
+                    return e._parse( instring, loc, doActions )
+                except ParseException as err:
+                    err.__traceback__ = None
+                    if err.loc > maxExcLoc:
+                        maxException = err
+                        maxExcLoc = err.loc
+
+        if maxException is not None:
+            maxException.msg = self.errmsg
+            raise maxException
+        else:
+            raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+
+    def __ixor__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        return self.append( other ) #Or( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ^ ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class MatchFirst(ParseExpression):
+    """Requires that at least one C{ParseExpression} is found.
+       If two expressions match, the first one listed is the one that will match.
+       May be constructed using the C{'|'} operator.
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(MatchFirst,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        for e in self.exprs:
+            try:
+                ret = e._parse( instring, loc, doActions )
+                return ret
+            except ParseException as err:
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+
+        # only got here if no expression matched, raise exception for match that made it the furthest
+        else:
+            if maxException is not None:
+                maxException.msg = self.errmsg
+                raise maxException
+            else:
+                raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+    def __ior__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass( other )
+        return self.append( other ) #MatchFirst( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " | ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class Each(ParseExpression):
+    """Requires all given C{ParseExpression}s to be found, but in any order.
+       Expressions may be separated by whitespace.
+       May be constructed using the C{'&'} operator.
+    """
+    def __init__( self, exprs, savelist = True ):
+        super(Each,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.skipWhitespace = True
+        self.initExprGroups = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.initExprGroups:
+            self.opt1map = dict((id(e.expr),e) for e in self.exprs if isinstance(e,Optional))
+            opt1 = [ e.expr for e in self.exprs if isinstance(e,Optional) ]
+            opt2 = [ e for e in self.exprs if e.mayReturnEmpty and not isinstance(e,Optional)]
+            self.optionals = opt1 + opt2
+            self.multioptionals = [ e.expr for e in self.exprs if isinstance(e,ZeroOrMore) ]
+            self.multirequired = [ e.expr for e in self.exprs if isinstance(e,OneOrMore) ]
+            self.required = [ e for e in self.exprs if not isinstance(e,(Optional,ZeroOrMore,OneOrMore)) ]
+            self.required += self.multirequired
+            self.initExprGroups = False
+        tmpLoc = loc
+        tmpReqd = self.required[:]
+        tmpOpt  = self.optionals[:]
+        matchOrder = []
+
+        keepMatching = True
+        while keepMatching:
+            tmpExprs = tmpReqd + tmpOpt + self.multioptionals + self.multirequired
+            failed = []
+            for e in tmpExprs:
+                try:
+                    tmpLoc = e.tryParse( instring, tmpLoc )
+                except ParseException:
+                    failed.append(e)
+                else:
+                    matchOrder.append(self.opt1map.get(id(e),e))
+                    if e in tmpReqd:
+                        tmpReqd.remove(e)
+                    elif e in tmpOpt:
+                        tmpOpt.remove(e)
+            if len(failed) == len(tmpExprs):
+                keepMatching = False
+
+        if tmpReqd:
+            missing = ", ".join(_ustr(e) for e in tmpReqd)
+            raise ParseException(instring,loc,"Missing one or more required elements (%s)" % missing )
+
+        # add any unmatched Optionals, in case they have default values defined
+        matchOrder += [e for e in self.exprs if isinstance(e,Optional) and e.expr in tmpOpt]
+
+        resultlist = []
+        for e in matchOrder:
+            loc,results = e._parse(instring,loc,doActions)
+            resultlist.append(results)
+
+        finalResults = ParseResults([])
+        for r in resultlist:
+            dups = {}
+            for k in r.keys():
+                if k in finalResults:
+                    tmp = ParseResults(finalResults[k])
+                    tmp += ParseResults(r[k])
+                    dups[k] = tmp
+            finalResults += ParseResults(r)
+            for k,v in dups.items():
+                finalResults[k] = v
+        return loc, finalResults
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " & ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class ParseElementEnhance(ParserElement):
+    """Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens."""
+    def __init__( self, expr, savelist=False ):
+        super(ParseElementEnhance,self).__init__(savelist)
+        if isinstance( expr, basestring ):
+            expr = Literal(expr)
+        self.expr = expr
+        self.strRepr = None
+        if expr is not None:
+            self.mayIndexError = expr.mayIndexError
+            self.mayReturnEmpty = expr.mayReturnEmpty
+            self.setWhitespaceChars( expr.whiteChars )
+            self.skipWhitespace = expr.skipWhitespace
+            self.saveAsList = expr.saveAsList
+            self.callPreparse = expr.callPreparse
+            self.ignoreExprs.extend(expr.ignoreExprs)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.expr is not None:
+            return self.expr._parse( instring, loc, doActions, callPreParse=False )
+        else:
+            raise ParseException("",loc,self.errmsg,self)
+
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        self.expr = self.expr.copy()
+        if self.expr is not None:
+            self.expr.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseElementEnhance, self).ignore( other )
+                if self.expr is not None:
+                    self.expr.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseElementEnhance, self).ignore( other )
+            if self.expr is not None:
+                self.expr.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def streamline( self ):
+        super(ParseElementEnhance,self).streamline()
+        if self.expr is not None:
+            self.expr.streamline()
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        if self in parseElementList:
+            raise RecursiveGrammarException( parseElementList+[self] )
+        subRecCheckList = parseElementList[:] + [ self ]
+        if self.expr is not None:
+            self.expr.checkRecursion( subRecCheckList )
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        if self.expr is not None:
+            self.expr.validate(tmp)
+        self.checkRecursion( [] )
+
+    def __str__( self ):
+        try:
+            return super(ParseElementEnhance,self).__str__()
+        except:
+            pass
+
+        if self.strRepr is None and self.expr is not None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.expr) )
+        return self.strRepr
+
+
+class FollowedBy(ParseElementEnhance):
+    """Lookahead matching of the given parse expression.  C{FollowedBy}
+    does *not* advance the parsing position within the input string, it only
+    verifies that the specified parse expression matches at the current
+    position.  C{FollowedBy} always returns a null token list."""
+    def __init__( self, expr ):
+        super(FollowedBy,self).__init__(expr)
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        self.expr.tryParse( instring, loc )
+        return loc, []
+
+
+class NotAny(ParseElementEnhance):
+    """Lookahead to disallow matching with the given parse expression.  C{NotAny}
+    does *not* advance the parsing position within the input string, it only
+    verifies that the specified parse expression does *not* match at the current
+    position.  Also, C{NotAny} does *not* skip over leading whitespace. C{NotAny}
+    always returns a null token list.  May be constructed using the '~' operator."""
+    def __init__( self, expr ):
+        super(NotAny,self).__init__(expr)
+        #~ self.leaveWhitespace()
+        self.skipWhitespace = False  # do NOT use self.leaveWhitespace(), don't want to propagate to exprs
+        self.mayReturnEmpty = True
+        self.errmsg = "Found unwanted token, "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            self.expr.tryParse( instring, loc )
+        except (ParseException,IndexError):
+            pass
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "~{" + _ustr(self.expr) + "}"
+
+        return self.strRepr
+
+
+class ZeroOrMore(ParseElementEnhance):
+    """Optional repetition of zero or more of the given expression."""
+    def __init__( self, expr ):
+        super(ZeroOrMore,self).__init__(expr)
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        tokens = []
+        try:
+            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
+            hasIgnoreExprs = ( len(self.ignoreExprs) > 0 )
+            while 1:
+                if hasIgnoreExprs:
+                    preloc = self._skipIgnorables( instring, loc )
+                else:
+                    preloc = loc
+                loc, tmptokens = self.expr._parse( instring, preloc, doActions )
+                if tmptokens or tmptokens.haskeys():
+                    tokens += tmptokens
+        except (ParseException,IndexError):
+            pass
+
+        return loc, tokens
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]..."
+
+        return self.strRepr
+
+    def setResultsName( self, name, listAllMatches=False ):
+        ret = super(ZeroOrMore,self).setResultsName(name,listAllMatches)
+        ret.saveAsList = True
+        return ret
+
+
+class OneOrMore(ParseElementEnhance):
+    """Repetition of one or more of the given expression."""
+    def parseImpl( self, instring, loc, doActions=True ):
+        # must be at least one
+        loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
+        try:
+            hasIgnoreExprs = ( len(self.ignoreExprs) > 0 )
+            while 1:
+                if hasIgnoreExprs:
+                    preloc = self._skipIgnorables( instring, loc )
+                else:
+                    preloc = loc
+                loc, tmptokens = self.expr._parse( instring, preloc, doActions )
+                if tmptokens or tmptokens.haskeys():
+                    tokens += tmptokens
+        except (ParseException,IndexError):
+            pass
+
+        return loc, tokens
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + _ustr(self.expr) + "}..."
+
+        return self.strRepr
+
+    def setResultsName( self, name, listAllMatches=False ):
+        ret = super(OneOrMore,self).setResultsName(name,listAllMatches)
+        ret.saveAsList = True
+        return ret
+
+class _NullToken(object):
+    def __bool__(self):
+        return False
+    __nonzero__ = __bool__
+    def __str__(self):
+        return ""
+
+_optionalNotMatched = _NullToken()
+class Optional(ParseElementEnhance):
+    """Optional matching of the given expression.
+       A default return string can also be specified, if the optional expression
+       is not found.
+    """
+    def __init__( self, expr, default=_optionalNotMatched ):
+        super(Optional,self).__init__( expr, savelist=False )
+        self.defaultValue = default
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
+        except (ParseException,IndexError):
+            if self.defaultValue is not _optionalNotMatched:
+                if self.expr.resultsName:
+                    tokens = ParseResults([ self.defaultValue ])
+                    tokens[self.expr.resultsName] = self.defaultValue
+                else:
+                    tokens = [ self.defaultValue ]
+            else:
+                tokens = []
+        return loc, tokens
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]"
+
+        return self.strRepr
+
+
+class SkipTo(ParseElementEnhance):
+    """Token for skipping over all undefined text until the matched expression is found.
+       If C{include} is set to true, the matched expression is also parsed (the skipped text
+       and matched expression are returned as a 2-element list).  The C{ignore}
+       argument is used to define grammars (typically quoted strings and comments) that
+       might contain false matches.
+    """
+    def __init__( self, other, include=False, ignore=None, failOn=None ):
+        super( SkipTo, self ).__init__( other )
+        self.ignoreExpr = ignore
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.includeMatch = include
+        self.asList = False
+        if failOn is not None and isinstance(failOn, basestring):
+            self.failOn = Literal(failOn)
+        else:
+            self.failOn = failOn
+        self.errmsg = "No match found for "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        startLoc = loc
+        instrlen = len(instring)
+        expr = self.expr
+        failParse = False
+        while loc <= instrlen:
+            try:
+                if self.failOn:
+                    try:
+                        self.failOn.tryParse(instring, loc)
+                    except ParseBaseException:
+                        pass
+                    else:
+                        failParse = True
+                        raise ParseException(instring, loc, "Found expression " + str(self.failOn))
+                    failParse = False
+                if self.ignoreExpr is not None:
+                    while 1:
+                        try:
+                            loc = self.ignoreExpr.tryParse(instring,loc)
+                            # print("found ignoreExpr, advance to", loc)
+                        except ParseBaseException:
+                            break
+                expr._parse( instring, loc, doActions=False, callPreParse=False )
+                skipText = instring[startLoc:loc]
+                if self.includeMatch:
+                    loc,mat = expr._parse(instring,loc,doActions,callPreParse=False)
+                    if mat:
+                        skipRes = ParseResults( skipText )
+                        skipRes += mat
+                        return loc, [ skipRes ]
+                    else:
+                        return loc, [ skipText ]
+                else:
+                    return loc, [ skipText ]
+            except (ParseException,IndexError):
+                if failParse:
+                    raise
+                else:
+                    loc += 1
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class Forward(ParseElementEnhance):
+    """Forward declaration of an expression to be defined later -
+       used for recursive grammars, such as algebraic infix notation.
+       When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
+
+       Note: take care when assigning to C{Forward} not to overlook precedence of operators.
+       Specifically, '|' has a lower precedence than '<<', so that::
+          fwdExpr << a | b | c
+       will actually be evaluated as::
+          (fwdExpr << a) | b | c
+       thereby leaving b and c out as parseable alternatives.  It is recommended that you
+       explicitly group the values inserted into the C{Forward}::
+          fwdExpr << (a | b | c)
+       Converting to use the '<<=' operator instead will avoid this problem.
+    """
+    def __init__( self, other=None ):
+        super(Forward,self).__init__( other, savelist=False )
+
+    def __lshift__( self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement.literalStringClass(other)
+        self.expr = other
+        self.mayReturnEmpty = other.mayReturnEmpty
+        self.strRepr = None
+        self.mayIndexError = self.expr.mayIndexError
+        self.mayReturnEmpty = self.expr.mayReturnEmpty
+        self.setWhitespaceChars( self.expr.whiteChars )
+        self.skipWhitespace = self.expr.skipWhitespace
+        self.saveAsList = self.expr.saveAsList
+        self.ignoreExprs.extend(self.expr.ignoreExprs)
+        return self
+        
+    def __ilshift__(self, other):
+        return self << other
+    
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        return self
+
+    def streamline( self ):
+        if not self.streamlined:
+            self.streamlined = True
+            if self.expr is not None:
+                self.expr.streamline()
+        return self
+
+    def validate( self, validateTrace=[] ):
+        if self not in validateTrace:
+            tmp = validateTrace[:]+[self]
+            if self.expr is not None:
+                self.expr.validate(tmp)
+        self.checkRecursion([])
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        self._revertClass = self.__class__
+        self.__class__ = _ForwardNoRecurse
+        try:
+            if self.expr is not None:
+                retString = _ustr(self.expr)
+            else:
+                retString = "None"
+        finally:
+            self.__class__ = self._revertClass
+        return self.__class__.__name__ + ": " + retString
+
+    def copy(self):
+        if self.expr is not None:
+            return super(Forward,self).copy()
+        else:
+            ret = Forward()
+            ret <<= self
+            return ret
+
+class _ForwardNoRecurse(Forward):
+    def __str__( self ):
+        return "..."
+
+class TokenConverter(ParseElementEnhance):
+    """Abstract subclass of C{ParseExpression}, for converting parsed results."""
+    def __init__( self, expr, savelist=False ):
+        super(TokenConverter,self).__init__( expr )#, savelist )
+        self.saveAsList = False
+
+class Upcase(TokenConverter):
+    """Converter to upper case all matching tokens."""
+    def __init__(self, *args):
+        super(Upcase,self).__init__(*args)
+        warnings.warn("Upcase class is deprecated, use upcaseTokens parse action instead",
+                       DeprecationWarning,stacklevel=2)
+
+    def postParse( self, instring, loc, tokenlist ):
+        return list(map( str.upper, tokenlist ))
+
+
+class Combine(TokenConverter):
+    """Converter to concatenate all matching tokens to a single string.
+       By default, the matching patterns must also be contiguous in the input string;
+       this can be disabled by specifying C{'adjacent=False'} in the constructor.
+    """
+    def __init__( self, expr, joinString="", adjacent=True ):
+        super(Combine,self).__init__( expr )
+        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
+        if adjacent:
+            self.leaveWhitespace()
+        self.adjacent = adjacent
+        self.skipWhitespace = True
+        self.joinString = joinString
+        self.callPreparse = True
+
+    def ignore( self, other ):
+        if self.adjacent:
+            ParserElement.ignore(self, other)
+        else:
+            super( Combine, self).ignore( other )
+        return self
+
+    def postParse( self, instring, loc, tokenlist ):
+        retToks = tokenlist.copy()
+        del retToks[:]
+        retToks += ParseResults([ "".join(tokenlist._asStringList(self.joinString)) ], modal=self.modalResults)
+
+        if self.resultsName and retToks.haskeys():
+            return [ retToks ]
+        else:
+            return retToks
+
+class Group(TokenConverter):
+    """Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions."""
+    def __init__( self, expr ):
+        super(Group,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        return [ tokenlist ]
+
+class Dict(TokenConverter):
+    """Converter to return a repetitive expression as a list, but also as a dictionary.
+       Each element can also be referenced using the first token in the expression as its key.
+       Useful for tabular report scraping when the first column can be used as a item key.
+    """
+    def __init__( self, expr ):
+        super(Dict,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        for i,tok in enumerate(tokenlist):
+            if len(tok) == 0:
+                continue
+            ikey = tok[0]
+            if isinstance(ikey,int):
+                ikey = _ustr(tok[0]).strip()
+            if len(tok)==1:
+                tokenlist[ikey] = _ParseResultsWithOffset("",i)
+            elif len(tok)==2 and not isinstance(tok[1],ParseResults):
+                tokenlist[ikey] = _ParseResultsWithOffset(tok[1],i)
+            else:
+                dictvalue = tok.copy() #ParseResults(i)
+                del dictvalue[0]
+                if len(dictvalue)!= 1 or (isinstance(dictvalue,ParseResults) and dictvalue.haskeys()):
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue,i)
+                else:
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0],i)
+
+        if self.resultsName:
+            return [ tokenlist ]
+        else:
+            return tokenlist
+
+
+class Suppress(TokenConverter):
+    """Converter for ignoring the results of a parsed expression."""
+    def postParse( self, instring, loc, tokenlist ):
+        return []
+
+    def suppress( self ):
+        return self
+
+
+class OnlyOnce(object):
+    """Wrapper for parse actions, to ensure they are only called once."""
+    def __init__(self, methodCall):
+        self.callable = _trim_arity(methodCall)
+        self.called = False
+    def __call__(self,s,l,t):
+        if not self.called:
+            results = self.callable(s,l,t)
+            self.called = True
+            return results
+        raise ParseException(s,l,"")
+    def reset(self):
+        self.called = False
+
+def traceParseAction(f):
+    """Decorator for debugging parse actions."""
+    f = _trim_arity(f)
+    def z(*paArgs):
+        thisFunc = f.func_name
+        s,l,t = paArgs[-3:]
+        if len(paArgs)>3:
+            thisFunc = paArgs[0].__class__.__name__ + '.' + thisFunc
+        sys.stderr.write( ">>entering %s(line: '%s', %d, %s)\n" % (thisFunc,line(l,s),l,t) )
+        try:
+            ret = f(*paArgs)
+        except Exception as exc:
+            sys.stderr.write( "<<leaving %s (exception: %s)\n" % (thisFunc,exc) )
+            raise
+        sys.stderr.write( "<<leaving %s (ret: %s)\n" % (thisFunc,ret) )
+        return ret
+    try:
+        z.__name__ = f.__name__
+    except AttributeError:
+        pass
+    return z
+
+#
+# global helpers
+#
+def delimitedList( expr, delim=",", combine=False ):
+    """Helper to define a delimited list of expressions - the delimiter defaults to ','.
+       By default, the list elements and delimiters can have intervening whitespace, and
+       comments, but this can be overridden by passing C{combine=True} in the constructor.
+       If C{combine} is set to C{True}, the matching tokens are returned as a single token
+       string, with the delimiters included; otherwise, the matching tokens are returned
+       as a list of tokens, with the delimiters suppressed.
+    """
+    dlName = _ustr(expr)+" ["+_ustr(delim)+" "+_ustr(expr)+"]..."
+    if combine:
+        return Combine( expr + ZeroOrMore( delim + expr ) ).setName(dlName)
+    else:
+        return ( expr + ZeroOrMore( Suppress( delim ) + expr ) ).setName(dlName)
+
+def countedArray( expr, intExpr=None ):
+    """Helper to define a counted list of expressions.
+       This helper defines a pattern of the form::
+           integer expr expr expr...
+       where the leading integer tells how many expr expressions follow.
+       The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+    """
+    arrayExpr = Forward()
+    def countFieldParseAction(s,l,t):
+        n = t[0]
+        arrayExpr << (n and Group(And([expr]*n)) or Group(empty))
+        return []
+    if intExpr is None:
+        intExpr = Word(nums).setParseAction(lambda t:int(t[0]))
+    else:
+        intExpr = intExpr.copy()
+    intExpr.setName("arrayLen")
+    intExpr.addParseAction(countFieldParseAction, callDuringTry=True)
+    return ( intExpr + arrayExpr )
+
+def _flatten(L):
+    ret = []
+    for i in L:
+        if isinstance(i,list):
+            ret.extend(_flatten(i))
+        else:
+            ret.append(i)
+    return ret
+
+def matchPreviousLiteral(expr):
+    """Helper to define an expression that is indirectly defined from
+       the tokens matched in a previous expression, that is, it looks
+       for a 'repeat' of a previous expression.  For example::
+           first = Word(nums)
+           second = matchPreviousLiteral(first)
+           matchExpr = first + ":" + second
+       will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
+       previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
+       If this is not desired, use C{matchPreviousExpr}.
+       Do *not* use with packrat parsing enabled.
+    """
+    rep = Forward()
+    def copyTokenToRepeater(s,l,t):
+        if t:
+            if len(t) == 1:
+                rep << t[0]
+            else:
+                # flatten t tokens
+                tflat = _flatten(t.asList())
+                rep << And( [ Literal(tt) for tt in tflat ] )
+        else:
+            rep << Empty()
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    return rep
+
+def matchPreviousExpr(expr):
+    """Helper to define an expression that is indirectly defined from
+       the tokens matched in a previous expression, that is, it looks
+       for a 'repeat' of a previous expression.  For example::
+           first = Word(nums)
+           second = matchPreviousExpr(first)
+           matchExpr = first + ":" + second
+       will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
+       expressions, will *not* match the leading C{"1:1"} in C{"1:10"};
+       the expressions are evaluated first, and then compared, so
+       C{"1"} is compared with C{"10"}.
+       Do *not* use with packrat parsing enabled.
+    """
+    rep = Forward()
+    e2 = expr.copy()
+    rep <<= e2
+    def copyTokenToRepeater(s,l,t):
+        matchTokens = _flatten(t.asList())
+        def mustMatchTheseTokens(s,l,t):
+            theseTokens = _flatten(t.asList())
+            if  theseTokens != matchTokens:
+                raise ParseException("",0,"")
+        rep.setParseAction( mustMatchTheseTokens, callDuringTry=True )
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    return rep
+
+def _escapeRegexRangeChars(s):
+    #~  escape these chars: ^-]
+    for c in r"\^-]":
+        s = s.replace(c,_bslash+c)
+    s = s.replace("\n",r"\n")
+    s = s.replace("\t",r"\t")
+    return _ustr(s)
+
+def oneOf( strs, caseless=False, useRegex=True ):
+    """Helper to quickly define a set of alternative Literals, and makes sure to do
+       longest-first testing when there is a conflict, regardless of the input order,
+       but returns a C{L{MatchFirst}} for best performance.
+
+       Parameters:
+        - strs - a string of space-delimited literals, or a list of string literals
+        - caseless - (default=False) - treat all literals as caseless
+        - useRegex - (default=True) - as an optimization, will generate a Regex
+          object; otherwise, will generate a C{MatchFirst} object (if C{caseless=True}, or
+          if creating a C{Regex} raises an exception)
+    """
+    if caseless:
+        isequal = ( lambda a,b: a.upper() == b.upper() )
+        masks = ( lambda a,b: b.upper().startswith(a.upper()) )
+        parseElementClass = CaselessLiteral
+    else:
+        isequal = ( lambda a,b: a == b )
+        masks = ( lambda a,b: b.startswith(a) )
+        parseElementClass = Literal
+
+    symbols = []
+    if isinstance(strs,basestring):
+        symbols = strs.split()
+    elif isinstance(strs, collections.Sequence):
+        symbols = list(strs[:])
+    elif isinstance(strs, _generatorType):
+        symbols = list(strs)
+    else:
+        warnings.warn("Invalid argument to oneOf, expected string or list",
+                SyntaxWarning, stacklevel=2)
+    if not symbols:
+        return NoMatch()
+
+    i = 0
+    while i < len(symbols)-1:
+        cur = symbols[i]
+        for j,other in enumerate(symbols[i+1:]):
+            if ( isequal(other, cur) ):
+                del symbols[i+j+1]
+                break
+            elif ( masks(cur, other) ):
+                del symbols[i+j+1]
+                symbols.insert(i,other)
+                cur = other
+                break
+        else:
+            i += 1
+
+    if not caseless and useRegex:
+        #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
+        try:
+            if len(symbols)==len("".join(symbols)):
+                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) )
+            else:
+                return Regex( "|".join(re.escape(sym) for sym in symbols) )
+        except:
+            warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
+                    SyntaxWarning, stacklevel=2)
+
+
+    # last resort, just use MatchFirst
+    return MatchFirst( [ parseElementClass(sym) for sym in symbols ] )
+
+def dictOf( key, value ):
+    """Helper to easily and clearly define a dictionary by specifying the respective patterns
+       for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
+       in the proper order.  The key pattern can include delimiting markers or punctuation,
+       as long as they are suppressed, thereby leaving the significant key text.  The value
+       pattern can include named results, so that the C{Dict} results can include named token
+       fields.
+    """
+    return Dict( ZeroOrMore( Group ( key + value ) ) )
+
+def originalTextFor(expr, asString=True):
+    """Helper to return the original, untokenized text for a given expression.  Useful to
+       restore the parsed fields of an HTML start tag into the raw tag text itself, or to
+       revert separate tokens with intervening whitespace back to the original matching
+       input text. Simpler to use than the parse action C{L{keepOriginalText}}, and does not
+       require the inspect module to chase up the call stack.  By default, returns a 
+       string containing the original parsed text.  
+       
+       If the optional C{asString} argument is passed as C{False}, then the return value is a 
+       C{L{ParseResults}} containing any results names that were originally matched, and a 
+       single token containing the original matched text from the input string.  So if 
+       the expression passed to C{L{originalTextFor}} contains expressions with defined
+       results names, you must set C{asString} to C{False} if you want to preserve those
+       results name values."""
+    locMarker = Empty().setParseAction(lambda s,loc,t: loc)
+    endlocMarker = locMarker.copy()
+    endlocMarker.callPreparse = False
+    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
+    if asString:
+        extractText = lambda s,l,t: s[t._original_start:t._original_end]
+    else:
+        def extractText(s,l,t):
+            del t[:]
+            t.insert(0, s[t._original_start:t._original_end])
+            del t["_original_start"]
+            del t["_original_end"]
+    matchExpr.setParseAction(extractText)
+    return matchExpr
+
+def ungroup(expr): 
+    """Helper to undo pyparsing's default grouping of And expressions, even
+       if all but one are non-empty."""
+    return TokenConverter(expr).setParseAction(lambda t:t[0])
+
+def locatedExpr(expr):
+    """Helper to decorate a returned token with its starting and ending locations in the input string.
+       This helper adds the following results names:
+        - locn_start = location where matched expression begins
+        - locn_end = location where matched expression ends
+        - value = the actual parsed results
+
+       Be careful if the input text contains C{<TAB>} characters, you may want to call
+       C{L{ParserElement.parseWithTabs}}
+    """
+    locator = Empty().setParseAction(lambda s,l,t: l)
+    return Group(locator("locn_start") + expr("value") + locator.copy().leaveWhitespace()("locn_end"))
+
+
+# convenience constants for positional expressions
+empty       = Empty().setName("empty")
+lineStart   = LineStart().setName("lineStart")
+lineEnd     = LineEnd().setName("lineEnd")
+stringStart = StringStart().setName("stringStart")
+stringEnd   = StringEnd().setName("stringEnd")
+
+_escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
+_escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
+_escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
+_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
+_charRange = Group(_singleChar + Suppress("-") + _singleChar)
+_reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
+
+def srange(s):
+    r"""Helper to easily define string ranges for use in Word construction.  Borrows
+       syntax from regexp '[]' string range definitions::
+          srange("[0-9]")   -> "0123456789"
+          srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
+          srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
+       The input string must be enclosed in []'s, and the returned string is the expanded
+       character set joined into a single string.
+       The values enclosed in the []'s may be::
+          a single character
+          an escaped character with a leading backslash (such as \- or \])
+          an escaped hex character with a leading '\x' (\x21, which is a '!' character) 
+            (\0x## is also supported for backwards compatibility) 
+          an escaped octal character with a leading '\0' (\041, which is a '!' character)
+          a range of any of the above, separated by a dash ('a-z', etc.)
+          any combination of the above ('aeiouy', 'a-zA-Z0-9_$', etc.)
+    """
+    _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
+    try:
+        return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)
+    except:
+        return ""
+
+def matchOnlyAtCol(n):
+    """Helper method for defining parse actions that require matching at a specific
+       column in the input text.
+    """
+    def verifyCol(strg,locn,toks):
+        if col(locn,strg) != n:
+            raise ParseException(strg,locn,"matched token not at column %d" % n)
+    return verifyCol
+
+def replaceWith(replStr):
+    """Helper method for common parse actions that simply return a literal value.  Especially
+       useful when used with C{L{transformString<ParserElement.transformString>}()}.
+    """
+    #def _replFunc(*args):
+    #    return [replStr]
+    #return _replFunc
+    return functools.partial(next, itertools.repeat([replStr]))
+
+def removeQuotes(s,l,t):
+    """Helper parse action for removing quotation marks from parsed quoted strings.
+       To use, add this parse action to quoted string using::
+         quotedString.setParseAction( removeQuotes )
+    """
+    return t[0][1:-1]
+
+def upcaseTokens(s,l,t):
+    """Helper parse action to convert tokens to upper case."""
+    return [ tt.upper() for tt in map(_ustr,t) ]
+
+def downcaseTokens(s,l,t):
+    """Helper parse action to convert tokens to lower case."""
+    return [ tt.lower() for tt in map(_ustr,t) ]
+
+def keepOriginalText(s,startLoc,t):
+    """DEPRECATED - use new helper method C{L{originalTextFor}}.
+       Helper parse action to preserve original parsed text,
+       overriding any nested parse actions."""
+    try:
+        endloc = getTokensEndLoc()
+    except ParseException:
+        raise ParseFatalException("incorrect usage of keepOriginalText - may only be called as a parse action")
+    del t[:]
+    t += ParseResults(s[startLoc:endloc])
+    return t
+
+def getTokensEndLoc():
+    """Method to be called from within a parse action to determine the end
+       location of the parsed tokens."""
+    import inspect
+    fstack = inspect.stack()
+    try:
+        # search up the stack (through intervening argument normalizers) for correct calling routine
+        for f in fstack[2:]:
+            if f[3] == "_parseNoCache":
+                endloc = f[0].f_locals["loc"]
+                return endloc
+        else:
+            raise ParseFatalException("incorrect usage of getTokensEndLoc - may only be called from within a parse action")
+    finally:
+        del fstack
+
+def _makeTags(tagStr, xml):
+    """Internal helper to construct opening and closing tag expressions, given a tag name"""
+    if isinstance(tagStr,basestring):
+        resname = tagStr
+        tagStr = Keyword(tagStr, caseless=not xml)
+    else:
+        resname = tagStr.name
+
+    tagAttrName = Word(alphas,alphanums+"_-:")
+    if (xml):
+        tagAttrValue = dblQuotedString.copy().setParseAction( removeQuotes )
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName + Suppress("=") + tagAttrValue ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    else:
+        printablesLessRAbrack = "".join(c for c in printables if c not in ">")
+        tagAttrValue = quotedString.copy().setParseAction( removeQuotes ) | Word(printablesLessRAbrack)
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName.setParseAction(downcaseTokens) + \
+                Optional( Suppress("=") + tagAttrValue ) ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    closeTag = Combine(_L("</") + tagStr + ">")
+
+    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % tagStr)
+    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % tagStr)
+    openTag.tag = resname
+    closeTag.tag = resname
+    return openTag, closeTag
+
+def makeHTMLTags(tagStr):
+    """Helper to construct opening and closing tag expressions for HTML, given a tag name"""
+    return _makeTags( tagStr, False )
+
+def makeXMLTags(tagStr):
+    """Helper to construct opening and closing tag expressions for XML, given a tag name"""
+    return _makeTags( tagStr, True )
+
+def withAttribute(*args,**attrDict):
+    """Helper to create a validating parse action to be used with start tags created
+       with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
+       with a required attribute value, to avoid false matches on common tags such as
+       C{<TD>} or C{<DIV>}.
+
+       Call C{withAttribute} with a series of attribute names and values. Specify the list
+       of filter attributes names and values as:
+        - keyword arguments, as in C{(align="right")}, or
+        - as an explicit dict with C{**} operator, when an attribute name is also a Python
+          reserved word, as in C{**{"class":"Customer", "align":"right"}}
+        - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
+       For attribute names with a namespace prefix, you must use the second form.  Attribute
+       names are matched insensitive to upper/lower case.
+       
+       If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
+
+       To verify that the attribute exists, but without specifying a value, pass
+       C{withAttribute.ANY_VALUE} as the value.
+       """
+    if args:
+        attrs = args[:]
+    else:
+        attrs = attrDict.items()
+    attrs = [(k,v) for k,v in attrs]
+    def pa(s,l,tokens):
+        for attrName,attrValue in attrs:
+            if attrName not in tokens:
+                raise ParseException(s,l,"no matching attribute " + attrName)
+            if attrValue != withAttribute.ANY_VALUE and tokens[attrName] != attrValue:
+                raise ParseException(s,l,"attribute '%s' has value '%s', must be '%s'" %
+                                            (attrName, tokens[attrName], attrValue))
+    return pa
+withAttribute.ANY_VALUE = object()
+
+def withClass(classname, namespace=''):
+    """Simplified version of C{L{withAttribute}} when matching on a div class - made
+       difficult because C{class} is a reserved word in Python.
+       """
+    classattr = "%s:class" % namespace if namespace else "class"
+    return withAttribute(**{classattr : classname})        
+
+opAssoc = _Constants()
+opAssoc.LEFT = object()
+opAssoc.RIGHT = object()
+
+def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
+    """Helper method for constructing grammars of expressions made up of
+       operators working in a precedence hierarchy.  Operators may be unary or
+       binary, left- or right-associative.  Parse actions can also be attached
+       to operator expressions.
+
+       Parameters:
+        - baseExpr - expression representing the most basic element for the nested
+        - opList - list of tuples, one for each operator precedence level in the
+          expression grammar; each tuple is of the form
+          (opExpr, numTerms, rightLeftAssoc, parseAction), where:
+           - opExpr is the pyparsing expression for the operator;
+              may also be a string, which will be converted to a Literal;
+              if numTerms is 3, opExpr is a tuple of two expressions, for the
+              two operators separating the 3 terms
+           - numTerms is the number of terms for this operator (must
+              be 1, 2, or 3)
+           - rightLeftAssoc is the indicator whether the operator is
+              right or left associative, using the pyparsing-defined
+              constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
+           - parseAction is the parse action to be associated with
+              expressions matching this operator expression (the
+              parse action tuple member may be omitted)
+        - lpar - expression for matching left-parentheses (default=Suppress('('))
+        - rpar - expression for matching right-parentheses (default=Suppress(')'))
+    """
+    ret = Forward()
+    lastExpr = baseExpr | ( lpar + ret + rpar )
+    for i,operDef in enumerate(opList):
+        opExpr,arity,rightLeftAssoc,pa = (operDef + (None,))[:4]
+        if arity == 3:
+            if opExpr is None or len(opExpr) != 2:
+                raise ValueError("if numterms=3, opExpr must be a tuple or list of two expressions")
+            opExpr1, opExpr2 = opExpr
+        thisExpr = Forward()#.setName("expr%d" % i)
+        if rightLeftAssoc == opAssoc.LEFT:
+            if arity == 1:
+                matchExpr = FollowedBy(lastExpr + opExpr) + Group( lastExpr + OneOrMore( opExpr ) )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + lastExpr) + Group( lastExpr + OneOrMore( opExpr + lastExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr+lastExpr) + Group( lastExpr + OneOrMore(lastExpr) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr) + \
+                            Group( lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        elif rightLeftAssoc == opAssoc.RIGHT:
+            if arity == 1:
+                # try to avoid LR with this extra test
+                if not isinstance(opExpr, Optional):
+                    opExpr = Optional(opExpr)
+                matchExpr = FollowedBy(opExpr.expr + thisExpr) + Group( opExpr + thisExpr )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + thisExpr) + Group( lastExpr + OneOrMore( opExpr + thisExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr + thisExpr) + Group( lastExpr + OneOrMore( thisExpr ) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr) + \
+                            Group( lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        else:
+            raise ValueError("operator must indicate right or left associativity")
+        if pa:
+            matchExpr.setParseAction( pa )
+        thisExpr <<= ( matchExpr | lastExpr )
+        lastExpr = thisExpr
+    ret <<= lastExpr
+    return ret
+operatorPrecedence = infixNotation
+
+dblQuotedString = Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\x[0-9a-fA-F]+)|(?:\\.))*"').setName("string enclosed in double quotes")
+sglQuotedString = Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\x[0-9a-fA-F]+)|(?:\\.))*'").setName("string enclosed in single quotes")
+quotedString = Regex(r'''(?:"(?:[^"\n\r\\]|(?:"")|(?:\\x[0-9a-fA-F]+)|(?:\\.))*")|(?:'(?:[^'\n\r\\]|(?:'')|(?:\\x[0-9a-fA-F]+)|(?:\\.))*')''').setName("quotedString using single or double quotes")
+unicodeString = Combine(_L('u') + quotedString.copy())
+
+def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.copy()):
+    """Helper method for defining nested lists enclosed in opening and closing
+       delimiters ("(" and ")" are the default).
+
+       Parameters:
+        - opener - opening character for a nested list (default="("); can also be a pyparsing expression
+        - closer - closing character for a nested list (default=")"); can also be a pyparsing expression
+        - content - expression for items within the nested lists (default=None)
+        - ignoreExpr - expression for ignoring opening and closing delimiters (default=quotedString)
+
+       If an expression is not provided for the content argument, the nested
+       expression will capture all whitespace-delimited content between delimiters
+       as a list of separate values.
+
+       Use the C{ignoreExpr} argument to define expressions that may contain
+       opening or closing characters that should not be treated as opening
+       or closing characters for nesting, such as quotedString or a comment
+       expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
+       The default is L{quotedString}, but if no expressions are to be ignored,
+       then pass C{None} for this argument.
+    """
+    if opener == closer:
+        raise ValueError("opening and closing strings cannot be the same")
+    if content is None:
+        if isinstance(opener,basestring) and isinstance(closer,basestring):
+            if len(opener) == 1 and len(closer)==1:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr +
+                                    CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (empty.copy()+CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS
+                                ).setParseAction(lambda t:t[0].strip()))
+            else:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr + 
+                                    ~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (Combine(OneOrMore(~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+        else:
+            raise ValueError("opening and closing arguments must be strings if no content expression is given")
+    ret = Forward()
+    if ignoreExpr is not None:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ignoreExpr | ret | content ) + Suppress(closer) )
+    else:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ret | content )  + Suppress(closer) )
+    return ret
+
+def indentedBlock(blockStatementExpr, indentStack, indent=True):
+    """Helper method for defining space-delimited indentation blocks, such as
+       those used to define block statements in Python source code.
+
+       Parameters:
+        - blockStatementExpr - expression defining syntax of statement that
+            is repeated within the indented block
+        - indentStack - list created by caller to manage indentation stack
+            (multiple statementWithIndentedBlock expressions within a single grammar
+            should share a common indentStack)
+        - indent - boolean indicating whether block must be indented beyond the
+            the current level; set to False for block of left-most statements
+            (default=True)
+
+       A valid block must contain at least one C{blockStatement}.
+    """
+    def checkPeerIndent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if curCol != indentStack[-1]:
+            if curCol > indentStack[-1]:
+                raise ParseFatalException(s,l,"illegal nesting")
+            raise ParseException(s,l,"not a peer entry")
+
+    def checkSubIndent(s,l,t):
+        curCol = col(l,s)
+        if curCol > indentStack[-1]:
+            indentStack.append( curCol )
+        else:
+            raise ParseException(s,l,"not a subentry")
+
+    def checkUnindent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if not(indentStack and curCol < indentStack[-1] and curCol <= indentStack[-2]):
+            raise ParseException(s,l,"not an unindent")
+        indentStack.pop()
+
+    NL = OneOrMore(LineEnd().setWhitespaceChars("\t ").suppress())
+    INDENT = Empty() + Empty().setParseAction(checkSubIndent)
+    PEER   = Empty().setParseAction(checkPeerIndent)
+    UNDENT = Empty().setParseAction(checkUnindent)
+    if indent:
+        smExpr = Group( Optional(NL) +
+            #~ FollowedBy(blockStatementExpr) +
+            INDENT + (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) + UNDENT)
+    else:
+        smExpr = Group( Optional(NL) +
+            (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) )
+    blockStatementExpr.ignore(_bslash + LineEnd())
+    return smExpr
+
+alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
+punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
+
+anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:"))
+commonHTMLEntity = Combine(_L("&") + oneOf("gt lt amp nbsp quot").setResultsName("entity") +";").streamline()
+_htmlEntityMap = dict(zip("gt lt amp nbsp quot".split(),'><& "'))
+replaceHTMLEntity = lambda t : t.entity in _htmlEntityMap and _htmlEntityMap[t.entity] or None
+
+# it's easy to get these comment structures wrong - they're very common, so may as well make them available
+cStyleComment = Regex(r"/\*(?:[^*]*\*+)+?/").setName("C style comment")
+
+htmlComment = Regex(r"<!--[\s\S]*?-->")
+restOfLine = Regex(r".*").leaveWhitespace()
+dblSlashComment = Regex(r"\/\/(\\\n|.)*").setName("// comment")
+cppStyleComment = Regex(r"/(?:\*(?:[^*]*\*+)+?/|/[^\n]*(?:\n[^\n]*)*?(?:(?<!\\)|\Z))").setName("C++ style comment")
+
+javaStyleComment = cppStyleComment
+pythonStyleComment = Regex(r"#.*").setName("Python style comment")
+_commasepitem = Combine(OneOrMore(Word(printables, excludeChars=',') +
+                                  Optional( Word(" \t") +
+                                            ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
+commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
+
+
+if __name__ == "__main__":
+
+    selectToken    = CaselessLiteral( "select" )
+    fromToken      = CaselessLiteral( "from" )
+
+    ident          = Word( alphas, alphanums + "_$" )
+    columnName     = delimitedList( ident, ".", combine=True ).setParseAction( upcaseTokens )
+    columnNameList = Group( delimitedList( columnName ) ).setName("columns")
+    tableName      = delimitedList( ident, ".", combine=True ).setParseAction( upcaseTokens )
+    tableNameList  = Group( delimitedList( tableName ) ).setName("tables")
+    simpleSQL      = ( selectToken + \
+                     ( '*' | columnNameList ).setResultsName( "columns" ) + \
+                     fromToken + \
+                     tableNameList.setResultsName( "tables" ) )
+
+    simpleSQL.runTests("""\
+          SELECT * from XYZZY, ABC
+          select * from SYS.XYZZY
+          Select A from Sys.dual
+          Select AA,BB,CC from Sys.dual
+          Select A, B, C from Sys.dual
+          Select A, B, C from Sys.dual
+          Xelect A, B, C from Sys.dual
+          Select A, B, C frox Sys.dual
+          Select
+          Select ^^^ frox Sys.dual
+          Select A, B, C from Sys.dual, Table2""")
+    
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 4cf7664ec9..27bbc925eb 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1 +1,2 @@
 packaging==15.3
+pyparsing==2.0.6
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index d28db0f5f8..ccb4b5cdeb 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -338,88 +338,58 @@ Environment Markers
     >>> import os
 
     >>> print(im("sys_platform"))
-    Comparison or logical expression expected
+    Invalid marker: 'sys_platform'
 
     >>> print(im("sys_platform=="))
-    invalid syntax
+    Invalid marker: 'sys_platform=='
 
     >>> print(im("sys_platform=='win32'"))
     False
 
     >>> print(im("sys=='x'"))
-    Unknown name 'sys'
+    Invalid marker: "sys=='x'"
 
     >>> print(im("(extra)"))
-    Comparison or logical expression expected
+    Invalid marker: '(extra)'
 
     >>> print(im("(extra"))
-    invalid syntax
+    Invalid marker: '(extra'
 
     >>> print(im("os.open('foo')=='y'"))
-    Language feature not supported in environment markers
+    Invalid marker: "os.open('foo')=='y'"
 
     >>> print(im("'x'=='y' and os.open('foo')=='y'"))   # no short-circuit!
-    Language feature not supported in environment markers
+    Invalid marker: "'x'=='y' and os.open('foo')=='y'"
 
     >>> print(im("'x'=='x' or os.open('foo')=='y'"))   # no short-circuit!
-    Language feature not supported in environment markers
+    Invalid marker: "'x'=='x' or os.open('foo')=='y'"
 
     >>> print(im("'x' < 'y' < 'z'"))
-    Chained comparison not allowed in environment markers
+    Invalid marker: "'x' < 'y' < 'z'"
 
     >>> print(im("r'x'=='x'"))
-    Only plain strings allowed in environment markers
+    Invalid marker: "r'x'=='x'"
 
     >>> print(im("'''x'''=='x'"))
-    Only plain strings allowed in environment markers
+    Invalid marker: "'''x'''=='x'"
 
     >>> print(im('"""x"""=="x"'))
-    Only plain strings allowed in environment markers
+    Invalid marker: '"""x"""=="x"'
 
-    >>> print(im(r"'x\n'=='x'"))
-    Only plain strings allowed in environment markers
+    >>> print(im(r"x\n=='x'"))
+    Invalid marker: "x\\n=='x'"
 
     >>> print(im("os.open=='y'"))
-    Language feature not supported in environment markers
+    Invalid marker: "os.open=='y'"
 
-    >>> em('"x"=="x"')
+    >>> em("'linux' in sys_platform")
     True
 
-    >>> em('"x"=="y"')
-    False
-
-    >>> em('"x"=="y" and "x"=="x"')
-    False
-
-    >>> em('"x"=="y" or "x"=="x"')
-    True
-
-    >>> em('"x"=="y" and "x"=="q" or "z"=="z"')
-    True
-
-    >>> em('"x"=="y" and ("x"=="q" or "z"=="z")')
-    False
-
-    >>> em('"x"=="y" and "z"=="z" or "x"=="q"')
-    False
-
-    >>> em('"x"=="x" and "z"=="z" or "x"=="q"')
-    True
-
-    >>> em("sys_platform=='win32'") == (sys.platform=='win32')
-    True
-
-    >>> em("'x' in 'yx'")
-    True
-
-    >>> em("'yx' in 'x'")
-    False
-
     >>> em("python_version >= '2.6'")
     True
 
     >>> em("python_version > '2.5'")
     True
 
-    >>> im("platform_python_implementation=='CPython'")
+    >>> im("implementation_name=='CPython'")
     False
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index d8844e74e3..2f4b52c5f4 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -8,9 +8,5 @@
 
 @mock.patch.dict('pkg_resources.MarkerEvaluation.values',
 	python_full_version=mock.Mock(return_value='2.7.10'))
-def test_lexicographic_ordering():
-	"""
-	Although one might like 2.7.10 to be greater than 2.7.3,
-	the marker spec only supports lexicographic ordering.
-	"""
-	assert evaluate_marker("python_full_version > '2.7.3'") is False
+def test_ordering():
+	assert evaluate_marker("python_full_version > '2.7.3'") is True
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 6d0ab58792..47d7a4950e 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -26,7 +26,6 @@ def test_distinfo(self):
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @pytest.mark.importorskip('ast')
     def test_conditional_dependencies(self):
         specs = 'splort==4', 'quux>=1.1'
         requires = list(map(pkg_resources.Requirement.parse, specs))
diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py
deleted file mode 100644
index 8197b49dc4..0000000000
--- a/setuptools/tests/test_markerlib.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os
-
-import pytest
-
-
-class TestMarkerlib:
-
-    @pytest.mark.importorskip('ast')
-    def test_markers(self):
-        from _markerlib import interpret, default_environment, compile
-
-        os_name = os.name
-
-        assert interpret("")
-
-        assert interpret("os.name != 'buuuu'")
-        assert interpret("os_name != 'buuuu'")
-        assert interpret("python_version > '1.0'")
-        assert interpret("python_version < '5.0'")
-        assert interpret("python_version <= '5.0'")
-        assert interpret("python_version >= '1.0'")
-        assert interpret("'%s' in os.name" % os_name)
-        assert interpret("'%s' in os_name" % os_name)
-        assert interpret("'buuuu' not in os.name")
-
-        assert not interpret("os.name == 'buuuu'")
-        assert not interpret("os_name == 'buuuu'")
-        assert not interpret("python_version < '1.0'")
-        assert not interpret("python_version > '5.0'")
-        assert not interpret("python_version >= '5.0'")
-        assert not interpret("python_version <= '1.0'")
-        assert not interpret("'%s' not in os.name" % os_name)
-        assert not interpret("'buuuu' in os.name and python_version >= '5.0'")
-        assert not interpret("'buuuu' in os_name and python_version >= '5.0'")
-
-        environment = default_environment()
-        environment['extra'] = 'test'
-        assert interpret("extra == 'test'", environment)
-        assert not interpret("extra == 'doc'", environment)
-
-        def raises_nameError():
-            try:
-                interpret("python.version == '42'")
-            except NameError:
-                pass
-            else:
-                raise Exception("Expected NameError")
-
-        raises_nameError()
-
-        def raises_syntaxError():
-            try:
-                interpret("(x for x in (4,))")
-            except SyntaxError:
-                pass
-            else:
-                raise Exception("Expected SyntaxError")
-
-        raises_syntaxError()
-
-        statement = "python_version == '5'"
-        assert compile(statement).__doc__ == statement
-

From bca120fe59c78901914d837fd8dd9d0048196c87 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 10 Dec 2015 18:29:31 +1300
Subject: [PATCH 5359/8469] Update to the newest packaging, and collapse
 _parse_requirement_specs

---
 pkg_resources/__init__.py                       |  5 +----
 pkg_resources/_vendor/packaging/requirements.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d463945f88..d81430c7d4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2873,10 +2873,7 @@ def __str__(self):
 
 
 def _parse_requirement_specs(req):
-    if req.specifier:
-        return [(spec.operator, spec.version) for spec in req.specifier]
-    else:
-        return []
+    return [(spec.operator, spec.version) for spec in req.specifier]
 
 
 def parse_requirements(strs):
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 95b2d986cc..dc3672e7c8 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -48,11 +48,13 @@ class InvalidRequirement(ValueError):
 VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
 
 VERSION_ONE = VERSION_PEP440 | VERSION_LEGACY
-VERSION_MANY = VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE)
-VERSION_MANY.setParseAction(
-    lambda s, l, t: SpecifierSet(','.join(t.asList()))
-)
-VERSION_SPEC = ((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY)("specifier")
+VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
+                       joinString=",")("_raw_spec")
+_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+
+VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
+VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
 
 MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
 MARKER_EXPR.setParseAction(
@@ -61,7 +63,7 @@ class InvalidRequirement(ValueError):
 MARKER_SEPERATOR = SEMICOLON
 MARKER = MARKER_SEPERATOR + MARKER_EXPR
 
-VERSION_AND_MARKER = Optional(VERSION_SPEC) + Optional(MARKER)
+VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
 URL_AND_MARKER = URL + Optional(MARKER)
 
 NAMED_REQUIREMENT = \
@@ -94,7 +96,7 @@ def __init__(self, requirement_string):
         else:
             self.url = None
         self.extras = req.extras.asList() if req.extras else []
-        self.specifier = req.specifier if req.specifier else None
+        self.specifier = SpecifierSet(req.specifier)
         self.marker = req.marker if req.marker else None
 
     def __str__(self):

From 76ffa368456be9ecbcb81a8ba3196f1246e444c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:04:44 -0500
Subject: [PATCH 5360/8469] Use context manager for opening file

---
 setuptools/command/develop.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 3a16cdc79b..85118767ba 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -125,9 +125,8 @@ def install_for_development(self):
         # create an .egg-link in the installation dir, pointing to our egg
         log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
         if not self.dry_run:
-            f = open(self.egg_link, "w")
-            f.write(self.egg_path + "\n" + self.setup_path)
-            f.close()
+            with open(self.egg_link, "w") as f:
+                f.write(self.egg_path + "\n" + self.setup_path)
         # postprocess the installed distro, fixing up .pth, installing scripts,
         # and handling requirements
         self.process_distribution(None, self.dist, not self.no_deps)

From 07037d10760792ffe616349ab7642b2fce0a0527 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:07:13 -0500
Subject: [PATCH 5361/8469] Extract variable, avoiding hanging indent.

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

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 85118767ba..07b66ccb13 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -54,8 +54,8 @@ def finalize_options(self):
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
-        self.egg_link = os.path.join(self.install_dir, ei.egg_name +
-                                     '.egg-link')
+        egg_link_fn = ei.egg_name + '.egg-link'
+        self.egg_link = os.path.join(self.install_dir, egg_link_fn)
         self.egg_base = ei.egg_base
         if self.egg_path is None:
             self.egg_path = os.path.abspath(ei.egg_base)

From 5ba1d009e2c44b63fc2d2e1de09fd1d768c10fca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:13:30 -0500
Subject: [PATCH 5362/8469] Use context for opening file.

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 525cb64578..f81b8d78ea 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -359,8 +359,9 @@ def scan_egg_links(self, search_path):
                         self.scan_egg_link(item, entry)
 
     def scan_egg_link(self, path, entry):
-        lines = [_f for _f in map(str.strip,
-                                  open(os.path.join(path, entry))) if _f]
+        with open(os.path.join(path, entry)) as raw_lines:
+            # filter non-empty lines
+            lines = list(filter(None, map(str.strip, raw_lines)))
         if len(lines)==2:
             for dist in find_distributions(os.path.join(path, lines[0])):
                 dist.location = os.path.join(path, *lines)

From cd28f4e0eddf3f571cb0efe05a23fa4a7a254de7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:16:25 -0500
Subject: [PATCH 5363/8469] Replace nested code with short-circuit return.

---
 setuptools/package_index.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f81b8d78ea..5adb8c2b2f 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -362,11 +362,15 @@ def scan_egg_link(self, path, entry):
         with open(os.path.join(path, entry)) as raw_lines:
             # filter non-empty lines
             lines = list(filter(None, map(str.strip, raw_lines)))
-        if len(lines)==2:
-            for dist in find_distributions(os.path.join(path, lines[0])):
-                dist.location = os.path.join(path, *lines)
-                dist.precedence = SOURCE_DIST
-                self.add(dist)
+
+        if len(lines) != 2:
+            # format is not recognized; punt
+            return
+
+        for dist in find_distributions(os.path.join(path, lines[0])):
+            dist.location = os.path.join(path, *lines)
+            dist.precedence = SOURCE_DIST
+            self.add(dist)
 
     def process_index(self,url,page):
         """Process the contents of a PyPI page"""

From 2f7d95690e53fe92a82b055b82c4dc02b6a3339c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:18:38 -0500
Subject: [PATCH 5364/8469] Extract variables for improved documentation.

---
 setuptools/package_index.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5adb8c2b2f..36231f116e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -367,7 +367,9 @@ def scan_egg_link(self, path, entry):
             # format is not recognized; punt
             return
 
-        for dist in find_distributions(os.path.join(path, lines[0])):
+        egg_path, setup_path = lines
+
+        for dist in find_distributions(os.path.join(path, egg_path)):
             dist.location = os.path.join(path, *lines)
             dist.precedence = SOURCE_DIST
             self.add(dist)

From dacc24690e7c8503744ce433aae6dd74a50e2337 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:26:16 -0500
Subject: [PATCH 5365/8469] Extract if in for loop

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

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 36231f116e..00ce3ea5cb 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -352,8 +352,8 @@ def url_ok(self, url, fatal=False):
             self.warn(msg, url)
 
     def scan_egg_links(self, search_path):
-        for item in search_path:
-            if os.path.isdir(item):
+        dirs = filter(os.path.isdir, search_path)
+        for item in dirs:
                 for entry in os.listdir(item):
                     if entry.endswith('.egg-link'):
                         self.scan_egg_link(item, entry)

From 6b8c9181fbb0ef5b223ba45ed361991c601d1d13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:28:36 -0500
Subject: [PATCH 5366/8469] Get filter from the future

---
 setuptools/compat.py        | 4 ++++
 setuptools/package_index.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 73e6e4aa7e..68ec97d4f3 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -29,6 +29,8 @@
     from urllib2 import urlopen, HTTPError, URLError, unquote, splituser
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
     filterfalse = itertools.ifilterfalse
+    filter = itertools.ifilter
+    map = itertools.imap
 
     exec("""def reraise(tp, value, tb=None):
     raise tp, value, tb""")
@@ -59,6 +61,8 @@
         urlunsplit, splittag,
     )
     filterfalse = itertools.filterfalse
+    filter = filter
+    map = map
 
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 00ce3ea5cb..095688f9d7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -20,7 +20,7 @@
                                urlparse, urlunparse, unquote, splituser,
                                url2pathname, name2codepoint,
                                unichr, urljoin, urlsplit, urlunsplit,
-                               ConfigParser)
+                               ConfigParser, filter)
 from setuptools.compat import filterfalse
 from fnmatch import translate
 from setuptools.py26compat import strip_fragment

From 6667ea387d5694cf936644898acd20000ca7b1ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:34:36 -0500
Subject: [PATCH 5367/8469] Replace nested for loop with dual-for generator
 expression.

---
 setuptools/package_index.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 095688f9d7..3456f715fc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -6,6 +6,7 @@
 import socket
 import base64
 import hashlib
+import itertools
 from functools import wraps
 
 from pkg_resources import (
@@ -353,10 +354,13 @@ def url_ok(self, url, fatal=False):
 
     def scan_egg_links(self, search_path):
         dirs = filter(os.path.isdir, search_path)
-        for item in dirs:
-                for entry in os.listdir(item):
-                    if entry.endswith('.egg-link'):
-                        self.scan_egg_link(item, entry)
+        egg_links = (
+            (path, entry)
+            for path in dirs
+            for entry in os.listdir(path)
+            if entry.endswith('.egg-link')
+        )
+        list(itertools.starmap(self.scan_egg_link, egg_links))
 
     def scan_egg_link(self, path, entry):
         with open(os.path.join(path, entry)) as raw_lines:

From e99626c4eadf2e45ca5d729aaa3a5b4bb667536b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:36:25 -0500
Subject: [PATCH 5368/8469] Reclaim space from hanging indents

---
 setuptools/package_index.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3456f715fc..b0837628fe 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,11 +17,11 @@
 from setuptools import ssl_support
 from distutils import log
 from distutils.errors import DistutilsError
-from setuptools.compat import (urllib2, httplib, StringIO, HTTPError,
-                               urlparse, urlunparse, unquote, splituser,
-                               url2pathname, name2codepoint,
-                               unichr, urljoin, urlsplit, urlunsplit,
-                               ConfigParser, filter)
+from setuptools.compat import (
+    urllib2, httplib, StringIO, HTTPError, urlparse, urlunparse, unquote,
+    splituser, url2pathname, name2codepoint, unichr, urljoin, urlsplit,
+    urlunsplit, ConfigParser, filter,
+)
 from setuptools.compat import filterfalse
 from fnmatch import translate
 from setuptools.py26compat import strip_fragment

From 6a10b4afbad5dca346b7fc7a5d8bb6d08d3286b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 10:37:09 -0500
Subject: [PATCH 5369/8469] Also use map from the future

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b0837628fe..7c071457ef 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -20,7 +20,7 @@
 from setuptools.compat import (
     urllib2, httplib, StringIO, HTTPError, urlparse, urlunparse, unquote,
     splituser, url2pathname, name2codepoint, unichr, urljoin, urlsplit,
-    urlunsplit, ConfigParser, filter,
+    urlunsplit, ConfigParser, filter, map,
 )
 from setuptools.compat import filterfalse
 from fnmatch import translate

From f351891c97500738be1f23b5e83b955e2d5bdd23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 12:26:46 -0500
Subject: [PATCH 5370/8469] Bumped to 18.8 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 975b45c56c..e0cefe2d86 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.7.2"
+DEFAULT_VERSION = "18.8"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 5e40c6584c..aeb7307bc5 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.7.2'
+__version__ = '18.8'

From 6f9eccba4ca2404ad476ef121226489296171a03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 12:26:47 -0500
Subject: [PATCH 5371/8469] Added tag 18.8 for changeset c811801ffa1d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 508adf5b97..b34cd7fa0a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -227,3 +227,4 @@ dfe190b09908f6b953209d13573063809de451b8 18.6
 804f87045a901f1dc121cf9149143d654228dc13 18.6.1
 67d07805606aead09349d5b91d7d26c68ddad2fc 18.7
 3041e1fc409be90e885968b90faba405420fc161 18.7.1
+c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8

From 7fd5df90d1f251a22bdb74bed21cebf298b6a8e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 11 Dec 2015 12:28:10 -0500
Subject: [PATCH 5372/8469] Bumped to 18.9 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index e0cefe2d86..6b8696567b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.8"
+DEFAULT_VERSION = "18.9"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index aeb7307bc5..9c79593e15 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.8'
+__version__ = '18.9'

From a627cf9a72f8fca78b0520b72a5b44a0bbea9b8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 10:05:24 -0500
Subject: [PATCH 5373/8469] Add test capturing infinite recursion. Ref #440.

---
 setuptools/tests/test_sandbox.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 6e1e9e1cd2..624954df6a 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -100,3 +100,13 @@ class CantPickleThis(Exception):
             saved_exc.resume()
 
         assert str(caught.value) == "CantPickleThis('detail',)"
+
+    def test_unpickleable_exception_when_hiding_setuptools(self):
+        """
+        As revealed in #440, an infinite recursion can occur if an unpickleable
+        exception while setuptools is hidden. Ensure this doesn't happen.
+        """
+        sandbox = setuptools.sandbox
+        with sandbox.save_modules():
+            sandbox.hide_setuptools()
+            raise sandbox.SandboxViolation('test')

From bf8331685d1d5bb88cc6cf09236601f0dbe62330 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 10:45:04 -0500
Subject: [PATCH 5374/8469] Refine test to not make additional references to
 exceptions in setuptools.sandbox, but instead create a bespoke unpickleable
 exception. Ref #440.

---
 setuptools/tests/test_sandbox.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 624954df6a..a54c2fa076 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -106,7 +106,15 @@ def test_unpickleable_exception_when_hiding_setuptools(self):
         As revealed in #440, an infinite recursion can occur if an unpickleable
         exception while setuptools is hidden. Ensure this doesn't happen.
         """
-        sandbox = setuptools.sandbox
-        with sandbox.save_modules():
-            sandbox.hide_setuptools()
-            raise sandbox.SandboxViolation('test')
+        class ExceptionUnderTest(Exception):
+            """
+            An unpickleable exception (not in globals).
+            """
+
+        with pytest.raises(setuptools.sandbox.UnpickleableException) as exc:
+            with setuptools.sandbox.save_modules():
+                setuptools.sandbox.hide_setuptools()
+                raise ExceptionUnderTest()
+
+        msg, = exc.value.args
+        assert msg == 'ExceptionUnderTest()'

From 264b5dc6b9cf48b22bd2263d426026d7b8f45608 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 10:48:20 -0500
Subject: [PATCH 5375/8469] Prevent infinite recursion when
 UnpickleableException occurs in a sandbox context. Fixes #440.

---
 CHANGES.txt           | 9 +++++++++
 setuptools/sandbox.py | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cb9bb02d04..ff31275a17 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,15 @@ CHANGES
 =======
 
 
+------
+18.8.1
+------
+
+* Issue #440: Prevent infinite recursion when a SandboxViolation
+  or other UnpickleableException occurs in a sandbox context
+  with setuptools hidden. Fixes regression introduced in Setuptools
+  12.0.
+
 ----
 18.8
 ----
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 213cebff25..b8b1bac1b9 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -98,8 +98,8 @@ class UnpickleableException(Exception):
     """
     An exception representing another Exception that could not be pickled.
     """
-    @classmethod
-    def dump(cls, type, exc):
+    @staticmethod
+    def dump(type, exc):
         """
         Always return a dumped (pickled) type and exc. If exc can't be pickled,
         wrap it in UnpickleableException first.
@@ -107,6 +107,8 @@ def dump(cls, type, exc):
         try:
             return pickle.dumps(type), pickle.dumps(exc)
         except Exception:
+            # get UnpickleableException inside the sandbox
+            from setuptools.sandbox import UnpickleableException as cls
             return cls.dump(cls, cls(repr(exc)))
 
 

From ce481836f31142b939f4b93a6eba90630ba354fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:00:02 -0500
Subject: [PATCH 5376/8469] caught is a better name here

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

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index a54c2fa076..40bd2ebedd 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -111,10 +111,10 @@ class ExceptionUnderTest(Exception):
             An unpickleable exception (not in globals).
             """
 
-        with pytest.raises(setuptools.sandbox.UnpickleableException) as exc:
+        with pytest.raises(setuptools.sandbox.UnpickleableException) as caught:
             with setuptools.sandbox.save_modules():
                 setuptools.sandbox.hide_setuptools()
                 raise ExceptionUnderTest()
 
-        msg, = exc.value.args
+        msg, = caught.value.args
         assert msg == 'ExceptionUnderTest()'

From 3915be7722713c51aab291ed9720c7b83585d2b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:10:33 -0500
Subject: [PATCH 5377/8469] Add another test capturing violated expectation
 that SandboxViolation would be raised in a sandbox/hidden_setuptools context.
 Ref #440.

---
 setuptools/tests/test_sandbox.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 40bd2ebedd..fefd46f7e6 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -118,3 +118,24 @@ class ExceptionUnderTest(Exception):
 
         msg, = caught.value.args
         assert msg == 'ExceptionUnderTest()'
+
+    def test_sandbox_violation_raised_hiding_setuptools(self, tmpdir):
+        """
+        When in a sandbox with setuptools hidden, a SandboxViolation
+        should reflect a proper exception and not be wrapped in
+        an UnpickleableException.
+        """
+        def write_file():
+            "Trigger a SandboxViolation by writing outside the sandbox"
+            with open('/etc/foo', 'w'):
+                pass
+        sandbox = DirectorySandbox(str(tmpdir))
+        with pytest.raises(setuptools.sandbox.SandboxViolation) as caught:
+            with setuptools.sandbox.save_modules():
+                setuptools.sandbox.hide_setuptools()
+                sandbox.run(write_file)
+
+        cmd, args, kwargs = caught.value.args
+        assert cmd == 'open'
+        assert args == ('/etc/foo', 'w')
+        assert kwargs == {}

From 1d74aaab3372b6727158802c610043ca036ce5d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:29:01 -0500
Subject: [PATCH 5378/8469] Always import for SandboxViolation so it's
 pickleable. Ref #440.

---
 setuptools/sandbox.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index b8b1bac1b9..85de85ff9f 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -384,6 +384,7 @@ def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         AbstractSandbox.__init__(self)
 
     def _violation(self, operation, *args, **kw):
+        from setuptools.sandbox import SandboxViolation
         raise SandboxViolation(operation, args, kw)
 
     if _file:

From fa91749d1272c8a00c0c779a4ae9969ff277ee45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:57:40 -0500
Subject: [PATCH 5379/8469] Bumped to 18.8.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 6b8696567b..bbc4c92622 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.9"
+DEFAULT_VERSION = "18.8.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 9c79593e15..bd0d8b71ae 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.9'
+__version__ = '18.8.1'

From 54852faf6a8c5f1383ac59243dc1e9bcafbbcfc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:57:42 -0500
Subject: [PATCH 5380/8469] Added tag 18.8.1 for changeset fbf06fa35f93

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b34cd7fa0a..ee080d5da0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -228,3 +228,4 @@ dfe190b09908f6b953209d13573063809de451b8 18.6
 67d07805606aead09349d5b91d7d26c68ddad2fc 18.7
 3041e1fc409be90e885968b90faba405420fc161 18.7.1
 c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8
+fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1

From 17d7ac38c0570bee51f3f202138d522a4cdf5669 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2015 11:58:57 -0500
Subject: [PATCH 5381/8469] Bumped to 18.8.2 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bbc4c92622..bd2acccd25 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.8.1"
+DEFAULT_VERSION = "18.8.2"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index bd0d8b71ae..067c5e3743 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.8.1'
+__version__ = '18.8.2'

From 5eafe7644d18eddd77a5573ecc30b4c98efbb2c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 04:12:53 -0500
Subject: [PATCH 5382/8469] Prefer setdefault to hasattr/setattr

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d7ad46552a..b0c52838a9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -267,8 +267,7 @@ def __init__(self, attrs=None):
         if attrs and 'setup_requires' in attrs:
             self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
-            if not hasattr(self,ep.name):
-                setattr(self,ep.name,None)
+            vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self,attrs)
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)

From 2f0e172bdab76b0c972b5d1480bcccc88f63c7ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 04:48:26 -0500
Subject: [PATCH 5383/8469] Add test capturing InterpolationSyntaxError on
 Python 3 and KeyError on Python 2

---
 setuptools/tests/test_packageindex.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index dcd90d6fe7..897590e809 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,7 +1,11 @@
+from __future__ import absolute_import
+
 import sys
+import os
 import distutils.errors
 
 from setuptools.compat import httplib, HTTPError, unicode, pathname2url
+from .textwrap import DALS
 
 import pkg_resources
 import setuptools.package_index
@@ -201,3 +205,20 @@ def test_report(self):
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
         rep = checker.report(lambda x: x, 'My message about %s')
         assert rep == 'My message about md5'
+
+
+class TestPyPIConfig:
+    def test_percent_in_password(self, tmpdir, monkeypatch):
+        monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
+        pypirc = tmpdir / '.pypirc'
+        with pypirc.open('w') as strm:
+            strm.write(DALS("""
+                [pypi]
+                repository=https://pypi.python.org
+                username=jaraco
+                password=pity%
+            """))
+        cfg = setuptools.package_index.PyPIConfig()
+        cred = cfg.creds_by_repository['pypi']
+        assert cred.username == 'jaraco'
+        assert cred.password == 'pity%'

From 477fef2d71db14b82d74ea73f4f90e02876d1967 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 04:51:03 -0500
Subject: [PATCH 5384/8469] Add test capturing InterpolationSyntaxError on
 Python 3. Ref #442

---
 setuptools/tests/test_packageindex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 897590e809..746860d561 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -219,6 +219,6 @@ def test_percent_in_password(self, tmpdir, monkeypatch):
                 password=pity%
             """))
         cfg = setuptools.package_index.PyPIConfig()
-        cred = cfg.creds_by_repository['pypi']
+        cred = cfg.creds_by_repository['https://pypi.python.org']
         assert cred.username == 'jaraco'
         assert cred.password == 'pity%'

From ca4321bb5833e2daa7bee1a32a3dee37cb49f012 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 04:55:43 -0500
Subject: [PATCH 5385/8469] Use the modern name for the configparser module

---
 setuptools/command/easy_install.py | 8 ++++----
 setuptools/command/setopt.py       | 4 ++--
 setuptools/compat.py               | 4 ++--
 setuptools/package_index.py        | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 79f068b1d0..9ca3b5152d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1402,7 +1402,7 @@ def expand_paths(inputs):
 def extract_wininst_cfg(dist_filename):
     """Extract configuration data from a bdist_wininst .exe
 
-    Returns a ConfigParser.RawConfigParser, or None
+    Returns a configparser.RawConfigParser, or None
     """
     f = open(dist_filename, 'rb')
     try:
@@ -1415,7 +1415,7 @@ def extract_wininst_cfg(dist_filename):
             return None
         f.seek(prepended - 12)
 
-        from setuptools.compat import StringIO, ConfigParser
+        from setuptools.compat import StringIO, configparser
         import struct
 
         tag, cfglen, bmlen = struct.unpack("<iii", f.read(12))
@@ -1423,7 +1423,7 @@ def extract_wininst_cfg(dist_filename):
             return None  # not a valid tag
 
         f.seek(prepended - (12 + cfglen))
-        cfg = ConfigParser.RawConfigParser(
+        cfg = configparser.RawConfigParser(
             {'version': '', 'target_version': ''})
         try:
             part = f.read(cfglen)
@@ -1433,7 +1433,7 @@ def extract_wininst_cfg(dist_filename):
             #  be text, so decode it.
             config = config.decode(sys.getfilesystemencoding())
             cfg.readfp(StringIO(config))
-        except ConfigParser.Error:
+        except configparser.Error:
             return None
         if not cfg.has_section('metadata') or not cfg.has_section('Setup'):
             return None
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index a04d6032ad..74c7cad899 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -37,10 +37,10 @@ def edit_config(filename, settings, dry_run=False):
     while a dictionary lists settings to be changed or deleted in that section.
     A setting of ``None`` means to delete that setting.
     """
-    from setuptools.compat import ConfigParser
+    from setuptools.compat import configparser
 
     log.debug("Reading configuration from %s", filename)
-    opts = ConfigParser.RawConfigParser()
+    opts = configparser.RawConfigParser()
     opts.read([filename])
     for section, options in settings.items():
         if options is None:
diff --git a/setuptools/compat.py b/setuptools/compat.py
index 68ec97d4f3..f0175a5de8 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -7,7 +7,7 @@
 if PY2:
     basestring = basestring
     import __builtin__ as builtins
-    import ConfigParser
+    import ConfigParser as configparser
     from StringIO import StringIO
     BytesIO = StringIO
     func_code = lambda o: o.func_code
@@ -38,7 +38,7 @@
 if PY3:
     basestring = str
     import builtins
-    import configparser as ConfigParser
+    import configparser
     from io import StringIO, BytesIO
     func_code = lambda o: o.__code__
     func_globals = lambda o: o.__globals__
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 7c071457ef..a26b58bcb7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -20,7 +20,7 @@
 from setuptools.compat import (
     urllib2, httplib, StringIO, HTTPError, urlparse, urlunparse, unquote,
     splituser, url2pathname, name2codepoint, unichr, urljoin, urlsplit,
-    urlunsplit, ConfigParser, filter, map,
+    urlunsplit, configparser, filter, map,
 )
 from setuptools.compat import filterfalse
 from fnmatch import translate
@@ -945,14 +945,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPIConfig(ConfigParser.ConfigParser):
+class PyPIConfig(configparser.ConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        ConfigParser.ConfigParser.__init__(self, defaults)
+        configparser.ConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):

From 80adba1cb4b07f6d182c907b5c5f796eb7b6b93d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 05:31:46 -0500
Subject: [PATCH 5386/8469] Use SafeConfigParser in PyPIConfig file. Allows
 percent signs to be specified using two percent signs. Fixes #442.

---
 CHANGES.txt                           | 8 ++++++++
 setuptools/package_index.py           | 4 ++--
 setuptools/tests/test_packageindex.py | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ff31275a17..1396d5fec2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,14 @@ CHANGES
 =======
 
 
+----
+19.0
+----
+
+* Issue #442: Use SafeConfigParser for parsing .pypirc file. Now
+  fields containing the percent symbol (%) must have each percent
+  replaced with two percent symbols (%%).
+
 ------
 18.8.1
 ------
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a26b58bcb7..322f9a6140 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -945,14 +945,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPIConfig(configparser.ConfigParser):
+class PyPIConfig(configparser.SafeConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        configparser.ConfigParser.__init__(self, defaults)
+        configparser.SafeConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 746860d561..a3e45adcf6 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -216,7 +216,7 @@ def test_percent_in_password(self, tmpdir, monkeypatch):
                 [pypi]
                 repository=https://pypi.python.org
                 username=jaraco
-                password=pity%
+                password=pity%%
             """))
         cfg = setuptools.package_index.PyPIConfig()
         cred = cfg.creds_by_repository['https://pypi.python.org']

From fbcbb51009bc76df9f2c66547439474799b9ab15 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Dec 2015 05:38:30 -0500
Subject: [PATCH 5387/8469] Use RawConfigParser instead of SafeConfigParser in
 PyPIConfig class. Interpolated values are no longer supported. Since backward
 compatibility could not be retained in either case, prefer the simpler, more
 direct format. Ref #442.

---
 CHANGES.txt                           | 5 ++---
 setuptools/package_index.py           | 4 ++--
 setuptools/tests/test_packageindex.py | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1396d5fec2..355c75506e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,9 +7,8 @@ CHANGES
 19.0
 ----
 
-* Issue #442: Use SafeConfigParser for parsing .pypirc file. Now
-  fields containing the percent symbol (%) must have each percent
-  replaced with two percent symbols (%%).
+* Issue #442: Use RawConfigParser for parsing .pypirc file.
+  Interpolated values are no longer honored in .pypirc files.
 
 ------
 18.8.1
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 322f9a6140..2c565e88d2 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -945,14 +945,14 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
-class PyPIConfig(configparser.SafeConfigParser):
+class PyPIConfig(configparser.RawConfigParser):
 
     def __init__(self):
         """
         Load from ~/.pypirc
         """
         defaults = dict.fromkeys(['username', 'password', 'repository'], '')
-        configparser.SafeConfigParser.__init__(self, defaults)
+        configparser.RawConfigParser.__init__(self, defaults)
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index a3e45adcf6..746860d561 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -216,7 +216,7 @@ def test_percent_in_password(self, tmpdir, monkeypatch):
                 [pypi]
                 repository=https://pypi.python.org
                 username=jaraco
-                password=pity%%
+                password=pity%
             """))
         cfg = setuptools.package_index.PyPIConfig()
         cred = cfg.creds_by_repository['https://pypi.python.org']

From 4765b89927b56b4ae8758b18d8cdd822d9007dae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 19:47:38 -0500
Subject: [PATCH 5388/8469] Bumped to 19.0 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bd2acccd25..eacaff174f 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "18.8.2"
+DEFAULT_VERSION = "19.0"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 067c5e3743..3b7740f105 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.8.2'
+__version__ = '19.0'

From 2b175325dc6a0516dbfeb902d2fc15e2b5f240ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 19:47:40 -0500
Subject: [PATCH 5389/8469] Added tag 19.0 for changeset cc41477ecf92

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ee080d5da0..85ed009543 100644
--- a/.hgtags
+++ b/.hgtags
@@ -229,3 +229,4 @@ dfe190b09908f6b953209d13573063809de451b8 18.6
 3041e1fc409be90e885968b90faba405420fc161 18.7.1
 c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8
 fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
+cc41477ecf92f221c113736fac2830bf8079d40c 19.0

From 627d4b47c20ca79cd3ce1bb99d1b54ccf457a561 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 19:49:02 -0500
Subject: [PATCH 5390/8469] Bumped to 19.1 in preparation for next release.

---
 ez_setup.py           | 2 +-
 setuptools/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index eacaff174f..da0f034dfc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "19.0"
+DEFAULT_VERSION = "19.1"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
diff --git a/setuptools/version.py b/setuptools/version.py
index 3b7740f105..a4bfb3ca55 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.0'
+__version__ = '19.1'

From 8427babe8e6418012cec2c408fee0eb95b4564a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 20:57:20 -0500
Subject: [PATCH 5391/8469] ez_setup now loads latest version using metadata

---
 ez_setup.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index da0f034dfc..bd73ca9daa 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -16,7 +16,8 @@
 import platform
 import textwrap
 import contextlib
-import warnings
+import json
+import codecs
 
 from distutils import log
 
@@ -30,7 +31,8 @@
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "19.1"
+LATEST = object()
+DEFAULT_VERSION = LATEST
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
@@ -140,6 +142,7 @@ def use_setuptools(
     Return None. Raise SystemExit if the requested version
     or later cannot be installed.
     """
+    version = _resolve_version(version)
     to_dir = os.path.abspath(to_dir)
 
     # prior to importing, capture the module state for
@@ -321,6 +324,7 @@ def download_setuptools(
     ``downloader_factory`` should be a function taking no arguments and
     returning a function for downloading a URL to a target.
     """
+    version = _resolve_version(version)
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     zip_name = "setuptools-%s.zip" % version
@@ -333,6 +337,27 @@ def download_setuptools(
     return os.path.realpath(saveto)
 
 
+def _resolve_version(version):
+    """
+    Resolve LATEST version
+    """
+    if version is not LATEST:
+        return version
+
+    with urlopen('https://pypi.python.org/pypi/setuptools/json') as resp:
+        charset = resp.info().get_content_charset()
+        reader = codecs.getreader(charset)
+        doc = json.load(reader(resp))
+
+    def by_vals(ver_string):
+        try:
+            return tuple(map(int, ver_string.split('.')))
+        except Exception:
+            return (0,)
+
+    return max(doc['releases'], key=by_vals)
+
+
 def _build_install_args(options):
     """
     Build the arguments to 'python setup.py install' on the setuptools package.

From d150f9d4b67300a7f4c557a5c95252a947558201 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:10:43 -0500
Subject: [PATCH 5392/8469] Just use the indicated version directly.

---
 ez_setup.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index bd73ca9daa..c099186119 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -349,13 +349,7 @@ def _resolve_version(version):
         reader = codecs.getreader(charset)
         doc = json.load(reader(resp))
 
-    def by_vals(ver_string):
-        try:
-            return tuple(map(int, ver_string.split('.')))
-        except Exception:
-            return (0,)
-
-    return max(doc['releases'], key=by_vals)
+    return doc['info']['version']
 
 
 def _build_install_args(options):

From 5919897c159a1d5b093107dde380f3c1c81f356a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:26:21 -0500
Subject: [PATCH 5393/8469] Use contextlib.closing for the response

---
 ez_setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index c099186119..d8c3305e11 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -344,7 +344,8 @@ def _resolve_version(version):
     if version is not LATEST:
         return version
 
-    with urlopen('https://pypi.python.org/pypi/setuptools/json') as resp:
+    resp = urlopen('https://pypi.python.org/pypi/setuptools/json')
+    with contextlib.closing(resp):
         charset = resp.info().get_content_charset()
         reader = codecs.getreader(charset)
         doc = json.load(reader(resp))

From 70fb4bec6c4a8fd5cb82cab29efb4a2ce8d227b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:31:04 -0500
Subject: [PATCH 5394/8469] Restore Python 2.7 compatibility

---
 ez_setup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index d8c3305e11..1320ac9296 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -346,7 +346,11 @@ def _resolve_version(version):
 
     resp = urlopen('https://pypi.python.org/pypi/setuptools/json')
     with contextlib.closing(resp):
-        charset = resp.info().get_content_charset()
+        try:
+            charset = resp.info().get_content_charset()
+        except Exception:
+            # Python 2 compat; assume UTF-8
+            charset = 'UTF-8'
         reader = codecs.getreader(charset)
         doc = json.load(reader(resp))
 

From 7217bff3e01372a98ec19ad29079a8c1680b9500 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:31:49 -0500
Subject: [PATCH 5395/8469] release script no longer mutates ez_setup.py

---
 release.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/release.py b/release.py
index a76d2de489..22aeae0223 100644
--- a/release.py
+++ b/release.py
@@ -19,9 +19,7 @@ def before_upload():
 def after_push():
     BootstrapBookmark.push()
 
-files_with_versions = (
-    'ez_setup.py', 'setuptools/version.py',
-)
+files_with_versions = 'setuptools/version.py',
 
 # bdist_wheel must be included or pip will break
 dist_commands = 'sdist', 'bdist_wheel'

From 2fa748c3eb25908ff3fe6e3e256638562c614aed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:37:14 -0500
Subject: [PATCH 5396/8469] No longer need to specify a version in the test
 run.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0bfb11bb53..54d9c395bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,6 @@ script:
  - python bootstrap.py
 
  - python setup.py test --addopts='-rs'
- - python ez_setup.py --version 18.6.1
+
+ # test the bootstrap script
+ - python ez_setup.py

From 2a24c4c7f67090f4ea73d42a2442b5eaf55d4f39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Dec 2015 21:52:49 -0500
Subject: [PATCH 5397/8469] Update changelog

---
 CHANGES.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 355c75506e..4bd8c4a6aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,14 @@ CHANGES
 =======
 
 
+----
+19.1
+----
+
+* The bootstrap script ``ez_setup.py`` now automatically detects
+  the latest version of setuptools (using PyPI JSON API) rather
+  than hard-coding a particular value.
+
 ----
 19.0
 ----

From 6d8ecefd8e915a8ec4e73649b3e352b7d48931f2 Mon Sep 17 00:00:00 2001
From: lsenta <laurent.senta@gmail.com>
Date: Wed, 16 Dec 2015 12:15:53 +0100
Subject: [PATCH 5398/8469] Fixes #475: correct a typo in metadata environment
 marker evaluation

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f65fef3eaf..b55e4127b4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1537,7 +1537,7 @@ def _translate_metadata2(env):
         """
         return dict(
             (key.replace('.', '_'), value)
-            for key, value in env
+            for key, value in env.items()
         )
 
     @classmethod

From 1542dc13b25c29ae8ccdda47bc2260572c9d1327 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 08:02:19 -0500
Subject: [PATCH 5399/8469] Update changelog

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4bd8c4a6aa..f68cd4189b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ CHANGES
 * The bootstrap script ``ez_setup.py`` now automatically detects
   the latest version of setuptools (using PyPI JSON API) rather
   than hard-coding a particular value.
+* Issue #475: Fix incorrect usage in _translate_metadata2.
 
 ----
 19.0

From 89a239d8a2e2dc0dc42d717ad131957f1063a456 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 08:04:01 -0500
Subject: [PATCH 5400/8469] Now that bootstrap script automatically installs
 the latest published version, it's no longer necessary to track the _current_
 bootstrap version with a bookmark.

---
 release.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/release.py b/release.py
index 22aeae0223..dd1d6a1caf 100644
--- a/release.py
+++ b/release.py
@@ -4,21 +4,12 @@
 """
 
 import os
-import subprocess
 
 import pkg_resources
 
 pkg_resources.require('jaraco.packaging>=2.0')
 pkg_resources.require('wheel')
 
-
-def before_upload():
-    BootstrapBookmark.add()
-
-
-def after_push():
-    BootstrapBookmark.push()
-
 files_with_versions = 'setuptools/version.py',
 
 # bdist_wheel must be included or pip will break
@@ -27,22 +18,3 @@ def after_push():
 test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
-
-class BootstrapBookmark:
-    name = 'bootstrap'
-
-    @classmethod
-    def add(cls):
-        cmd = ['hg', 'bookmark', '-i', cls.name, '-f']
-        subprocess.Popen(cmd)
-
-    @classmethod
-    def push(cls):
-        """
-        Push the bootstrap bookmark
-        """
-        push_command = ['hg', 'push', '-B', cls.name]
-        # don't use check_call here because mercurial will return a non-zero
-        # code even if it succeeds at pushing the bookmark (because there are
-        # no changesets to be pushed). !dm mercurial
-        subprocess.call(push_command)

From 4e64dd995a2d3c07efb9472bbd2cd6045d515046 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 08:10:00 -0500
Subject: [PATCH 5401/8469] Update changelog to reference ticket

---
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f68cd4189b..4e71bd725e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,8 @@ CHANGES
 19.1
 ----
 
-* The bootstrap script ``ez_setup.py`` now automatically detects
+* Issue #215: The bootstrap script ``ez_setup.py`` now
+  automatically detects
   the latest version of setuptools (using PyPI JSON API) rather
   than hard-coding a particular value.
 * Issue #475: Fix incorrect usage in _translate_metadata2.

From 2776f28710f3a7e034bb5166e43e150275062c3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 08:18:05 -0500
Subject: [PATCH 5402/8469] Added tag 19.1 for changeset 834782ce4915

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 85ed009543..f8f7ee7c1a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -230,3 +230,4 @@ dfe190b09908f6b953209d13573063809de451b8 18.6
 c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8
 fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
 cc41477ecf92f221c113736fac2830bf8079d40c 19.0
+834782ce49154e9744e499e00eb392c347f9e034 19.1

From cfcfccb6c78490ed368fa08d7ee84418ac4706a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 08:19:26 -0500
Subject: [PATCH 5403/8469] Bumped to 19.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index a4bfb3ca55..16f3f6385f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.1'
+__version__ = '19.2'

From d8a425e00d05c0cd0896b6e684b18304c6bbf717 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:05:43 -0500
Subject: [PATCH 5404/8469] In resolve version, always cast to a string
 (avoiding Unicode on Python 2). Fixes #476.

---
 CHANGES.txt | 7 +++++++
 ez_setup.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4e71bd725e..3764d79989 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 
+------
+19.1.1
+------
+
+* Issue #476: Cast version to string (using default encoding)
+  to avoid creating Unicode types on Python 2 clients.
+
 ----
 19.1
 ----
diff --git a/ez_setup.py b/ez_setup.py
index 1320ac9296..39ea44bcf1 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -354,7 +354,7 @@ def _resolve_version(version):
         reader = codecs.getreader(charset)
         doc = json.load(reader(resp))
 
-    return doc['info']['version']
+    return str(doc['info']['version'])
 
 
 def _build_install_args(options):

From 156bf219d2e9c99b3a241fa59dd4c652cfa90a45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:10:07 -0500
Subject: [PATCH 5405/8469] Explicitly quote strings rather than relying on
 repr. Fixes #477.

---
 CHANGES.txt | 3 +++
 ez_setup.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3764d79989..48fc18a906 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,9 @@ CHANGES
 
 * Issue #476: Cast version to string (using default encoding)
   to avoid creating Unicode types on Python 2 clients.
+* Issue #477: In Powershell downloader, use explicit rendering
+  of strings, rather than rely on ``repr``, which can be
+  incorrect (especially on Python 2).
 
 ----
 19.1
diff --git a/ez_setup.py b/ez_setup.py
index 39ea44bcf1..16f707a655 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -225,7 +225,7 @@ def download_file_powershell(url, target):
     ps_cmd = (
         "[System.Net.WebRequest]::DefaultWebProxy.Credentials = "
         "[System.Net.CredentialCache]::DefaultCredentials; "
-        "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)"
+        '(new-object System.Net.WebClient).DownloadFile("%(url)s", "%(target)s")'
         % vars()
     )
     cmd = [

From 0923ea577d1374b39a4d5e57688c0c9739ed3734 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:10:27 -0500
Subject: [PATCH 5406/8469] Prefer locals to vars

---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index 16f707a655..9715bdc7b0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -226,7 +226,7 @@ def download_file_powershell(url, target):
         "[System.Net.WebRequest]::DefaultWebProxy.Credentials = "
         "[System.Net.CredentialCache]::DefaultCredentials; "
         '(new-object System.Net.WebClient).DownloadFile("%(url)s", "%(target)s")'
-        % vars()
+        % locals()
     )
     cmd = [
         'powershell',

From 79d6a93283b6fab9a1aa8f63a0024eff43f88716 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:27:29 -0500
Subject: [PATCH 5407/8469] Bumped to 19.1.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 16f3f6385f..1ed115074e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.2'
+__version__ = '19.1.1'

From 4e75ee7fc0fa6bc9ff00bbc338ca883f0f21f968 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:27:30 -0500
Subject: [PATCH 5408/8469] Added tag 19.1.1 for changeset 0a2a3d89416e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f8f7ee7c1a..eb98b62a26 100644
--- a/.hgtags
+++ b/.hgtags
@@ -231,3 +231,4 @@ c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8
 fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
 cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 834782ce49154e9744e499e00eb392c347f9e034 19.1
+0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1

From 8a91baa090870aa3e70ea26c716ccde955ec1381 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 Dec 2015 19:29:18 -0500
Subject: [PATCH 5409/8469] Bumped to 19.1.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 1ed115074e..961ff96e6b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.1.1'
+__version__ = '19.1.2'

From 3f4ef89512da6a3e89f27121446ec59773869017 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Wed, 23 Dec 2015 14:07:40 -0500
Subject: [PATCH 5410/8469] Fix failing test on Windows due to path separator

---
 setuptools/tests/test_setuptools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 8aca593ad9..e59800d2ec 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -23,7 +23,7 @@ def test_findall(example_source):
 def test_findall_curdir(example_source):
     with example_source.as_cwd():
         found = list(setuptools.findall())
-    expected = ['readme.txt', 'foo/bar.py']
+    expected = ['readme.txt', os.path.join('foo', 'bar.py')]
     assert found == expected
 
 

From 2f2011b3d9e21861f003181ab0c3abb9701df83b Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Thu, 24 Dec 2015 15:45:14 -0500
Subject: [PATCH 5411/8469] Fix failing test on Windows due to path formatting
 bugs

---
 setuptools/tests/test_easy_install.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 00e16b63f5..f0330f17e7 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -446,10 +446,15 @@ def test_get_script_header_jython_workaround(self, tmpdir):
         exe = tmpdir / 'exe.py'
         with exe.open('w') as f:
             f.write(header)
-        exe = str(exe)
+
+        exe = ei.nt_quote_arg(os.path.normpath(str(exe)))
+
+        # Make sure Windows paths are quoted properly before they're sent
+        # through shlex.split by get_script_header
+        executable = '"%s"' % exe if os.path.splitdrive(exe)[0] else exe
 
         header = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python',
-            executable=exe)
+            executable=executable)
         assert header == '#!/usr/bin/env %s\n' % exe
 
         expect_out = 'stdout' if sys.version_info < (2,7) else 'stderr'
@@ -458,7 +463,7 @@ def test_get_script_header_jython_workaround(self, tmpdir):
             # When options are included, generate a broken shebang line
             # with a warning emitted
             candidate = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x',
-                executable=exe)
+                executable=executable)
             assert candidate == '#!%s -x\n' % exe
             output = locals()[expect_out]
             assert 'Unable to adapt shebang line' in output.getvalue()

From 9578a0f640dac57f95a391c9f2a1ebdaba1a0846 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Thu, 24 Dec 2015 16:16:19 -0500
Subject: [PATCH 5412/8469] Prevent exception in atexit handlers when cert
 store's tempfile is already cleaned up by py.test.

---
 setuptools/ssl_support.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index cc7db067e9..7394f4f531 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -223,6 +223,12 @@ def __init__(self, stores=(), certs=()):
             self.addcerts(certs)
             atexit.register(self.close)
 
+        def close(self):
+            try:
+                super(MyCertFile, self).close()
+            except OSError:
+                pass
+
     _wincerts = MyCertFile(stores=['CA', 'ROOT'])
     return _wincerts.name
 

From 3172bf9505e5d6b6f95b8b6a7f3dbde9cfe4ce48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 09:56:47 -0500
Subject: [PATCH 5413/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 48fc18a906..005f2ce643 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,12 @@ CHANGES
 =======
 
 
+----
+19.2
+----
+
+* Pull Request #163: Add get_command_list method to Distribution.
+
 ------
 19.1.1
 ------

From 57809ecf386e1c87bfbed81baf4a3d7f9af9dbbe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:23:52 -0500
Subject: [PATCH 5414/8469] Separate _find_egg_info_files into two methods, one
 for each of the needed outputs.

---
 setuptools/tests/test_egg_info.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 74beb7f59a..e92ef920e9 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -60,7 +60,7 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
         self._run_install_command(tmpdir_cwd, env)
-        _, actual = self._find_egg_info_files(env.paths['lib'])
+        actual = self._find_egg_info_files(env.paths['lib'])
 
         expected = [
             'PKG-INFO',
@@ -83,7 +83,7 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
             }
         })
         self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir, _ = self._find_egg_info_files(env.paths['lib'])
+        egg_info_dir = self._find_egg_info_dir(env.paths['lib'])
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
 
@@ -107,12 +107,15 @@ def _run_install_command(self, tmpdir_cwd, env):
         if code:
             raise AssertionError(data)
 
-    def _find_egg_info_files(self, root):
+    def _find_egg_info_dir(self, root):
         results = (
-            (dirpath, filenames)
+            dirpath
             for dirpath, dirnames, filenames in os.walk(root)
             if os.path.basename(dirpath) == 'EGG-INFO'
         )
         # expect exactly one result
         result, = results
         return result
+
+    def _find_egg_info_files(self, root):
+        return os.listdir(self._find_egg_info_dir(root))

From f4ad85091ab6a78134de046ef5c7a57cffa273ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:28:25 -0500
Subject: [PATCH 5415/8469] Wrap the result in a DirList to avoid tuple
 unpacking and unused variables

---
 setuptools/tests/test_egg_info.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 74beb7f59a..333d11d6f4 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -60,7 +60,7 @@ def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
         self._run_install_command(tmpdir_cwd, env)
-        _, actual = self._find_egg_info_files(env.paths['lib'])
+        actual = self._find_egg_info_files(env.paths['lib'])
 
         expected = [
             'PKG-INFO',
@@ -83,7 +83,7 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
             }
         })
         self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir, _ = self._find_egg_info_files(env.paths['lib'])
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
 
@@ -108,8 +108,13 @@ def _run_install_command(self, tmpdir_cwd, env):
             raise AssertionError(data)
 
     def _find_egg_info_files(self, root):
+        class DirList(list):
+            def __init__(self, files, base):
+                super(DirList, self).__init__(files)
+                self.base = base
+
         results = (
-            (dirpath, filenames)
+            DirList(filenames, dirpath)
             for dirpath, dirnames, filenames in os.walk(root)
             if os.path.basename(dirpath) == 'EGG-INFO'
         )

From 81f26b644ab1bbb56eb0b2161a0aec752c51bf54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:49:28 -0500
Subject: [PATCH 5416/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 005f2ce643..7ed7434be1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 ----
 
 * Pull Request #163: Add get_command_list method to Distribution.
+* Pull Request #162: Add missing whitespace to multiline string
+  literals.
 
 ------
 19.1.1

From c8deca55f387fe2be58842a610aea761d642725c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:52:52 -0500
Subject: [PATCH 5417/8469] Bumped to 19.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 961ff96e6b..16f3f6385f 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.1.2'
+__version__ = '19.2'

From b5b4ff480354eb52f17835cad6c828f12d2d5b6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:52:54 -0500
Subject: [PATCH 5418/8469] Added tag 19.2 for changeset 5d24cf9d1ced

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index eb98b62a26..60ce3f9483 100644
--- a/.hgtags
+++ b/.hgtags
@@ -232,3 +232,4 @@ fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
 cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 834782ce49154e9744e499e00eb392c347f9e034 19.1
 0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1
+5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2

From 6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 10:54:28 -0500
Subject: [PATCH 5419/8469] Bumped to 19.3 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 16f3f6385f..09bbb730c0 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.2'
+__version__ = '19.3'

From 7d63ebffa598f12b55d9fd0a41768ec88ff70528 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Dec 2015 20:50:55 -0500
Subject: [PATCH 5420/8469] Add tests capturing platform_python_implementation
 and implementation_version

---
 pkg_resources/api_tests.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index ccb4b5cdeb..2458c32204 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -391,5 +391,11 @@ Environment Markers
     >>> em("python_version > '2.5'")
     True
 
-    >>> im("implementation_name=='CPython'")
+    >>> im("implementation_name=='cpython'")
+    False
+
+    >>> im("platform_python_implementation=='CPython'")
+    False
+
+    >>> im("implementation_version=='3.5.1'")
     False

From 06872bb0bbbeb953e90bd0941444b0d499056557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 11:51:01 -0500
Subject: [PATCH 5421/8469] Update vendoring technique to match that used for
 packaging. Ref #229.

--HG--
branch : feature/issue-229
---
 Makefile                              |   6 +-
 pkg_resources/tests/test_resources.py |   4 +-
 setup.py                              |   3 -
 setuptools/__init__.py                |   9 +-
 setuptools/_vendor/__init__.py        |   0
 setuptools/_vendor/six-1.7.3.egg      | Bin 8240 -> 0 bytes
 setuptools/_vendor/six.py             | 868 ++++++++++++++++++++++++++
 setuptools/_vendor/vendored.txt       |   1 +
 setuptools/bootstrap.py               |  27 -
 setuptools/command/bdist_egg.py       |   7 +-
 setuptools/command/develop.py         |   7 +-
 setuptools/command/easy_install.py    |  10 +-
 setuptools/command/egg_info.py        |   7 +-
 setuptools/command/rotate.py          |   7 +-
 setuptools/command/sdist.py           |   7 +-
 setuptools/command/setopt.py          |   7 +-
 setuptools/command/test.py            |   7 +-
 setuptools/command/upload_docs.py     |  10 +-
 setuptools/depends.py                 |   7 +-
 setuptools/dist.py                    |   7 +-
 setuptools/package_index.py           |  10 +-
 setuptools/sandbox.py                 |  10 +-
 setuptools/ssl_support.py             |   7 +-
 setuptools/tests/__init__.py          |   7 +-
 setuptools/tests/contexts.py          |   7 +-
 setuptools/tests/server.py            |   8 +-
 setuptools/tests/test_bdist_egg.py    |   1 -
 setuptools/tests/test_develop.py      |   7 +-
 setuptools/tests/test_easy_install.py |  11 +-
 setuptools/tests/test_integration.py  |   8 +-
 setuptools/tests/test_packageindex.py |  10 +-
 setuptools/tests/test_sdist.py        |   8 +-
 setuptools/tests/test_test.py         |   1 -
 setuptools/unicode_utils.py           |   8 +-
 34 files changed, 1036 insertions(+), 68 deletions(-)
 create mode 100644 setuptools/_vendor/__init__.py
 delete mode 100644 setuptools/_vendor/six-1.7.3.egg
 create mode 100644 setuptools/_vendor/six.py
 create mode 100644 setuptools/_vendor/vendored.txt
 delete mode 100644 setuptools/bootstrap.py

diff --git a/Makefile b/Makefile
index 37dd26eb91..54dad480fa 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,9 @@ empty:
 
 update-vendored:
 	rm -rf pkg_resources/_vendor/packaging
-	pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	python3.5 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
+
+	rm -rf setuptools/_vendor/six
+	python3.5 -m pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
+	rm -rf setuptools/_vendor/*.{egg,dist}-info
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 92d0e49c38..9fda892fb6 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -14,8 +14,6 @@
 packaging = pkg_resources.packaging
 
 
-import six
-
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
     try:
@@ -315,7 +313,7 @@ def test_printable_name(self):
 
     def checkSubMap(self, m):
         assert len(m) == len(self.submap_expect)
-        for key, ep in six.iteritems(self.submap_expect):
+        for key, ep in self.submap_expect.items():
             assert repr(m.get(key)) == repr(ep)
 
     submap_expect = dict(
diff --git a/setup.py b/setup.py
index a21e5025ad..dfb578a152 100755
--- a/setup.py
+++ b/setup.py
@@ -148,9 +148,6 @@ def _gen_console_scripts():
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
-    install_requires=[
-        'six>=1.5',
-    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2015.11.20",
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index fffcac76ea..6e1e5aa418 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,5 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
-__import__('setuptools.bootstrap').bootstrap.ensure_deps()
-
 import os
 import functools
 import distutils.core
@@ -10,7 +8,12 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from six.moves import filterfalse
+try:
+    from setuptools._vendor.six.moves import filterfalse
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import filterfalse
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/_vendor/__init__.py b/setuptools/_vendor/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/_vendor/six-1.7.3.egg b/setuptools/_vendor/six-1.7.3.egg
deleted file mode 100644
index fe3e82c69bba092242593de34724c5eea6644b06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8240
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
R0U!e+|5$nIpF077{|78O^Y{P&

diff --git a/setuptools/_vendor/six.py b/setuptools/_vendor/six.py
new file mode 100644
index 0000000000..190c0239cd
--- /dev/null
+++ b/setuptools/_vendor/six.py
@@ -0,0 +1,868 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2015 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from __future__ import absolute_import
+
+import functools
+import itertools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.10.0"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)  # Invokes __set__.
+        try:
+            # This is a bit ugly, but it avoids running this again by
+            # removing this descriptor.
+            delattr(obj.__class__, self.name)
+        except AttributeError:
+            pass
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("intern", "__builtin__", "sys"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
+    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+]
+# Add windows specific modules.
+if sys.platform == "win32":
+    _moved_attributes += [
+        MovedModule("winreg", "_winreg"),
+    ]
+
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+    MovedAttribute("splittag", "urllib", "urllib.parse"),
+    MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    def create_unbound_method(func, cls):
+        return func
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    def create_unbound_method(func, cls):
+        return types.MethodType(func, None, cls)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+
+    viewkeys = operator.methodcaller("keys")
+
+    viewvalues = operator.methodcaller("values")
+
+    viewitems = operator.methodcaller("items")
+else:
+    def iterkeys(d, **kw):
+        return d.iterkeys(**kw)
+
+    def itervalues(d, **kw):
+        return d.itervalues(**kw)
+
+    def iteritems(d, **kw):
+        return d.iteritems(**kw)
+
+    def iterlists(d, **kw):
+        return d.iterlists(**kw)
+
+    viewkeys = operator.methodcaller("viewkeys")
+
+    viewvalues = operator.methodcaller("viewvalues")
+
+    viewitems = operator.methodcaller("viewitems")
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+
+    def u(s):
+        return s
+    unichr = chr
+    import struct
+    int2byte = struct.Struct(">B").pack
+    del struct
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    _assertCountEqual = "assertCountEqual"
+    if sys.version_info[1] <= 1:
+        _assertRaisesRegex = "assertRaisesRegexp"
+        _assertRegex = "assertRegexpMatches"
+    else:
+        _assertRaisesRegex = "assertRaisesRegex"
+        _assertRegex = "assertRegex"
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+
+    def byte2int(bs):
+        return ord(bs[0])
+
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    iterbytes = functools.partial(itertools.imap, ord)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    _assertCountEqual = "assertItemsEqual"
+    _assertRaisesRegex = "assertRaisesRegexp"
+    _assertRegex = "assertRegexpMatches"
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
+def assertRaisesRegex(self, *args, **kwargs):
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+
+
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+    def reraise(tp, value, tb=None):
+        if value is None:
+            value = tp()
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+if sys.version_info[:2] == (3, 2):
+    exec_("""def raise_from(value, from_value):
+    if from_value is None:
+        raise value
+    raise value from from_value
+""")
+elif sys.version_info[:2] > (3, 2):
+    exec_("""def raise_from(value, from_value):
+    raise value from from_value
+""")
+else:
+    def raise_from(value, from_value):
+        raise value
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                    isinstance(data, unicode) and
+                    fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+if sys.version_info[:2] < (3, 3):
+    _print = print_
+
+    def print_(*args, **kwargs):
+        fp = kwargs.get("file", sys.stdout)
+        flush = kwargs.pop("flush", False)
+        _print(*args, **kwargs)
+        if flush and fp is not None:
+            fp.flush()
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
+        def wrapper(f):
+            f = functools.wraps(wrapped, assigned, updated)(f)
+            f.__wrapped__ = wrapped
+            return f
+        return wrapper
+else:
+    wraps = functools.wraps
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
+def python_2_unicode_compatible(klass):
+    """
+    A decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if PY2:
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+                importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
new file mode 100644
index 0000000000..b6e34eb294
--- /dev/null
+++ b/setuptools/_vendor/vendored.txt
@@ -0,0 +1 @@
+six==1.10.0
diff --git a/setuptools/bootstrap.py b/setuptools/bootstrap.py
deleted file mode 100644
index 0cd95778ef..0000000000
--- a/setuptools/bootstrap.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-When setuptools is installed in a clean environment, it doesn't have its
-dependencies, so it can't run to install its dependencies. This module
-checks those dependencies and if one or more are missing, it uses vendored
-versions.
-"""
-
-import os
-import sys
-import glob
-
-def ensure_deps():
-	"""
-	Detect if dependencies are installed and if not, use vendored versions.
-	"""
-	try:
-		__import__('six')
-	except ImportError:
-		use_vendor_deps()
-
-def use_vendor_deps():
-	"""
-	Use vendored versions
-	"""
-	here = os.path.dirname(__file__)
-	eggs = glob.glob(here + '/_vendor/*.egg')
-	sys.path.extend(eggs)
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 73f8e3f14b..7816481988 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,7 +11,12 @@
 import marshal
 import textwrap
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index ef9ac22d21..c401c8d4c5 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,7 +5,12 @@
 import glob
 import io
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6aab38c8de..51c38ddfa3 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,14 @@
 import shlex
 import io
 
-import six
-from six.moves import configparser
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import configparser
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import configparser
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 19849e66a5..5b996a11be 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -14,7 +14,12 @@
 import warnings
 import time
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 09eac496a4..1ee1c538e8 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -3,7 +3,12 @@
 from distutils.errors import DistutilsOptionError
 import os
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 3b9f7dd5eb..59990cd69a 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,12 @@
 import sys
 import io
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from setuptools.utils import cs_path_exists
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index f78e0cd50a..1441e51224 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,7 +4,12 @@
 import distutils
 import os
 
-from six.moves import configparser
+try:
+    from setuptools._vendor.six.moves import configparser
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 5f2e229956..32ff7f157c 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,7 +2,12 @@
 from unittest import TestLoader
 import sys
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 43b5d76ab8..60e9fb7efc 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,14 @@
 import sys
 import shutil
 
-from six.moves import http_client, urllib
-import six
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import http_client, urllib
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 43617e6d95..e633c05b76 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -4,7 +4,12 @@
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 from distutils.version import StrictVersion
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7335c9670e..11b42d19c3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,7 +13,12 @@
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 from setuptools.depends import Require
 from setuptools import windows_support
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 657b467f3a..08c368909a 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -14,8 +14,14 @@
 except ImportError:
     from urllib2 import splituser
 
-import six
-from six.moves import urllib, http_client, configparser
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import urllib, http_client, configparser
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import urllib, http_client, configparser
 
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 43b84791fd..47d7f40c80 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,8 +8,14 @@
 import contextlib
 import pickle
 
-import six
-from six.moves import builtins
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import builtins
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import builtins
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 8fd7836bf2..327c2fcb17 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,12 @@
 import atexit
 import re
 
-from six.moves import urllib, http_client
+try:
+    from setuptools._vendor.six.moves import urllib, http_client
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import urllib, http_client
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index b2c6894f0c..0a625993e6 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,7 +8,12 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index d9dcad84c5..3a0ce6b56d 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,7 +5,12 @@
 import contextlib
 import site
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 
 @contextlib.contextmanager
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 1fee0563a8..ef5c8f62df 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,7 +4,13 @@
 import time
 import threading
 
-from six.moves import BaseHTTPServer, SimpleHTTPServer
+try:
+    from setuptools._vendor.six.moves import BaseHTTPServer, SimpleHTTPServer
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import BaseHTTPServer, SimpleHTTPServer
+
 
 class IndexServer(BaseHTTPServer.HTTPServer):
     """Basic single-threaded http server simulating a package index
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index f8a68378eb..ccfb2ea76b 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -3,7 +3,6 @@
 import os
 import re
 
-import six
 import pytest
 
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 236b3aa605..71aaed6a78 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -5,7 +5,12 @@
 import sys
 import io
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 30220b7f23..de34ca2733 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,8 +16,15 @@
 import distutils.errors
 import io
 
-import six
-from six.moves import urllib
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import urllib
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import urllib
+
 import pytest
 try:
     from unittest import mock
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 11a6ff5a5f..1c57402008 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,7 +7,13 @@
 import os
 import sys
 
-from six.moves import urllib
+try:
+    from setuptools._vendor.six.moves import urllib
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    from six.moves import urllib
+
 
 import pytest
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index dca4c2aaf8..649e8a4ef1 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,14 @@
 import os
 import distutils.errors
 
-import six
-from six.moves import urllib, http_client
+try:
+    from setuptools._vendor import six
+    from setuptools._vendor.six.moves import urllib, http_client
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+    from six.moves import urllib, http_client
 
 from .textwrap import DALS
 import pkg_resources
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index c173d713a8..ea176733dc 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,7 +9,13 @@
 import contextlib
 import io
 
-import six
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
+
 import pytest
 
 import pkg_resources
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 6587dc40dd..4155a5b137 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -6,7 +6,6 @@
 import site
 from distutils.errors import DistutilsError
 
-import six
 import pytest
 
 from setuptools.command.test import test
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index f028589efb..1fdb0a9136 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,7 +1,13 @@
 import unicodedata
 import sys
 
-import six
+
+try:
+    from setuptools._vendor import six
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import six
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):

From e0e02ba96d8ee3b7be76adeec1ec9b9c3c004516 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Thu, 31 Dec 2015 13:36:36 -0500
Subject: [PATCH 5422/8469] Adds the regression test for distribute issue 323
 that I attached to #207.  This is to ensure that any fix to #207 does not
 introduce another regression.

---
 setuptools/tests/contexts.py          |  13 ++
 setuptools/tests/test_easy_install.py | 189 ++++++++++++++++++++++----
 2 files changed, 173 insertions(+), 29 deletions(-)

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 8c9a2d3ead..ae28c7c36e 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -6,6 +6,7 @@
 import site
 
 from setuptools.extern import six
+import pkg_resources
 
 
 @contextlib.contextmanager
@@ -77,6 +78,18 @@ def save_user_site_setting():
         site.ENABLE_USER_SITE = saved
 
 
+@contextlib.contextmanager
+def save_pkg_resources_state():
+    pr_state = pkg_resources.__getstate__()
+    # also save sys.path
+    sys_path = sys.path[:]
+    try:
+        yield pr_state, sys_path
+    finally:
+        sys.path[:] = sys_path
+        pkg_resources.__setstate__(pr_state)
+
+
 @contextlib.contextmanager
 def suppress_exceptions(*excs):
     try:
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 94e317b362..4f9e52d144 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -18,6 +18,7 @@
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
+import time
 
 import pytest
 try:
@@ -310,32 +311,32 @@ def create_sdist():
         """
         with contexts.tempdir() as dir:
             dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz')
-            script = DALS("""
-                import setuptools
-                setuptools.setup(
-                    name="setuptools-test-fetcher",
-                    version="1.0",
-                    setup_requires = ['does-not-exist'],
-                )
-                """)
-            make_trivial_sdist(dist_path, script)
+            make_sdist(dist_path, [
+                ('setup.py', DALS("""
+                    import setuptools
+                    setuptools.setup(
+                        name="setuptools-test-fetcher",
+                        version="1.0",
+                        setup_requires = ['does-not-exist'],
+                    )
+                """))])
             yield dist_path
 
     def test_setup_requires_overrides_version_conflict(self):
         """
-        Regression test for issue #323.
+        Regression test for distribution issue 323:
+        https://bitbucket.org/tarek/distribute/issues/323
 
         Ensures that a distribution's setup_requires requirements can still be
         installed and used locally even if a conflicting version of that
         requirement is already on the path.
         """
 
-        pr_state = pkg_resources.__getstate__()
         fake_dist = PRDistribution('does-not-matter', project_name='foobar',
                                    version='0.0')
         working_set.add(fake_dist)
 
-        try:
+        with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
                 test_pkg = create_setup_requires_package(temp_dir)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
@@ -347,19 +348,154 @@ def test_setup_requires_overrides_version_conflict(self):
                 lines = stdout.readlines()
                 assert len(lines) > 0
                 assert lines[-1].strip(), 'test_pkg'
-        finally:
-            pkg_resources.__setstate__(pr_state)
 
+    def test_setup_requires_override_nspkg(self):
+        """
+        Like ``test_setup_requires_overrides_version_conflict`` but where the
+        ``setup_requires`` package is part of a namespace package that has
+        *already* been imported.
+        """
+
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                foobar_1_archive = os.path.join(temp_dir, 'foo.bar-0.1.tar.gz')
+                make_nspkg_sdist(foobar_1_archive, 'foo.bar', '0.1')
+                # Now actually go ahead an extract to the temp dir and add the
+                # extracted path to sys.path so foo.bar v0.1 is importable
+                foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1')
+                os.mkdir(foobar_1_dir)
+                with tarfile.open(foobar_1_archive) as tf:
+                    tf.extractall(foobar_1_dir)
+                sys.path.insert(1, foobar_1_dir)
+
+                dist = PRDistribution(foobar_1_dir, project_name='foo.bar',
+                                      version='0.1')
+                working_set.add(dist)
+
+                template = DALS("""\
+                    import foo  # Even with foo imported first the
+                                # setup_requires package should override
+                    import setuptools
+                    setuptools.setup(**%r)
+
+                    if not (hasattr(foo, '__path__') and
+                            len(foo.__path__) == 2):
+                        print('FAIL')
+
+                    if 'foo.bar-0.2' not in foo.__path__[0]:
+                        print('FAIL')
+                """)
+
+                test_pkg = create_setup_requires_package(
+                    temp_dir, 'foo.bar', '0.2', make_nspkg_sdist, template)
+
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
 
-def create_setup_requires_package(path):
+                with contexts.quiet() as (stdout, stderr):
+                    try:
+                        # Don't even need to install the package, just
+                        # running the setup.py at all is sufficient
+                        run_setup(test_setup_py, ['--name'])
+                    except VersionConflict:
+                        self.fail('Installing setup.py requirements '
+                            'caused a VersionConflict')
+
+                assert 'FAIL' not in stdout.getvalue()
+                lines = stdout.readlines()
+                assert len(lines) > 0
+                assert lines[-1].strip() == 'test_pkg'
+
+
+def make_trivial_sdist(dist_path, distname, version):
+    """
+    Create a simple sdist tarball at dist_path, containing just a simple
+    setup.py.
+    """
+
+    make_sdist(dist_path, [
+        ('setup.py',
+         DALS("""\
+             import setuptools
+             setuptools.setup(
+                 name=%r,
+                 version=%r
+             )
+         """ % (distname, version)))])
+
+
+def make_nspkg_sdist(dist_path, distname, version):
+    """
+    Make an sdist tarball with distname and version which also contains one
+    package with the same name as distname.  The top-level package is
+    designated a namespace package).
+    """
+
+    parts = distname.split('.')
+    nspackage = parts[0]
+
+    packages = ['.'.join(parts[:idx]) for idx in range(1, len(parts) + 1)]
+
+    setup_py = DALS("""\
+        import setuptools
+        setuptools.setup(
+            name=%r,
+            version=%r,
+            packages=%r,
+            namespace_packages=[%r]
+        )
+    """ % (distname, version, packages, nspackage))
+
+    init = "__import__('pkg_resources').declare_namespace(__name__)"
+
+    files = [('setup.py', setup_py),
+             (os.path.join(nspackage, '__init__.py'), init)]
+    for package in packages[1:]:
+        filename = os.path.join(*(package.split('.') + ['__init__.py']))
+        files.append((filename, ''))
+
+    make_sdist(dist_path, files)
+
+
+def make_sdist(dist_path, files):
+    """
+    Create a simple sdist tarball at dist_path, containing the files
+    listed in ``files`` as ``(filename, content)`` tuples.
+    """
+
+    dist = tarfile.open(dist_path, 'w:gz')
+
+    try:
+        # Python 3 (StringIO gets converted to io module)
+        MemFile = BytesIO
+    except AttributeError:
+        MemFile = StringIO
+
+    try:
+        for filename, content in files:
+            file_bytes = MemFile(content.encode('utf-8'))
+            file_info = tarfile.TarInfo(name=filename)
+            file_info.size = len(file_bytes.getvalue())
+            file_info.mtime = int(time.time())
+            dist.addfile(file_info, fileobj=file_bytes)
+    finally:
+        dist.close()
+
+
+def create_setup_requires_package(path, distname='foobar', version='0.1',
+                                  make_package=make_trivial_sdist,
+                                  setup_py_template=None):
     """Creates a source tree under path for a trivial test package that has a
     single requirement in setup_requires--a tarball for that requirement is
     also created and added to the dependency_links argument.
+
+    ``distname`` and ``version`` refer to the name/version of the package that
+    the test package requires via ``setup_requires``.  The name of the test
+    package itself is just 'test_pkg'.
     """
 
     test_setup_attrs = {
         'name': 'test_pkg', 'version': '0.0',
-        'setup_requires': ['foobar==0.1'],
+        'setup_requires': ['%s==%s' % (distname, version)],
         'dependency_links': [os.path.abspath(path)]
     }
 
@@ -367,22 +503,17 @@ def create_setup_requires_package(path):
     test_setup_py = os.path.join(test_pkg, 'setup.py')
     os.mkdir(test_pkg)
 
-    with open(test_setup_py, 'w') as f:
-        f.write(DALS("""
+    if setup_py_template is None:
+        setup_py_template = DALS("""\
             import setuptools
             setuptools.setup(**%r)
-        """ % test_setup_attrs))
+        """)
 
-    foobar_path = os.path.join(path, 'foobar-0.1.tar.gz')
-    make_trivial_sdist(
-        foobar_path,
-        DALS("""
-            import setuptools
-            setuptools.setup(
-                name='foobar',
-                version='0.1'
-            )
-        """))
+    with open(test_setup_py, 'w') as f:
+        f.write(setup_py_template % test_setup_attrs)
+
+    foobar_path = os.path.join(path, '%s-%s.tar.gz' % (distname, version))
+    make_package(foobar_path, distname, version)
 
     return test_pkg
 

From d3de33538948081d9ef39168fde870c977e30115 Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Thu, 31 Dec 2015 14:17:41 -0500
Subject: [PATCH 5423/8469] Fixes the original root cause of #231, and
 re-enables the test when the tempdir is a symlink (this does not explicitly
 test that /tmp itself is a symlink, but the effect is the same--only one of
 the path levels needs to be a symlink to reproduce this isssue)

---
 pkg_resources/__init__.py             |  9 +++++++--
 pkg_resources/tests/test_resources.py | 26 ++++++++++++++++++++------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7becc9515a..7d2fa7e9b2 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2182,9 +2182,14 @@ def _handle_ns(packageName, path_item):
         path = module.__path__
         path.append(subpath)
         loader.load_module(packageName)
+
+        # Ensure that all paths on __path__ have been run through
+        # normalize_path
+        normalized_paths = set(_normalize_cached(p) for p in module.__path__)
         for path_item in path:
-            if path_item not in module.__path__:
-                module.__path__.append(path_item)
+            normalized = _normalize_cached(path_item)
+            if normalized not in normalized_paths:
+                module.__path__.append(normalized)
     return subpath
 
 def declare_namespace(packageName):
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4241765ade..ba12d85766 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -610,18 +610,32 @@ class TestNamespaces:
 
     def setup_method(self, method):
         self._ns_pkgs = pkg_resources._namespace_packages.copy()
-        self._tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
+
+        # Further, test case where the temp dir is a symlink, where applicable
+        # See #231
+        if hasattr(os, 'symlink'):
+            real_tmpdir = tempfile.mkdtemp(prefix="real-tests-setuptools-")
+            tmpdir_base, tmpdir_name = os.path.split(real_tmpdir)
+            tmpdir = os.path.join(tmpdir_base, tmpdir_name[5:])
+            os.symlink(real_tmpdir, tmpdir)
+            self._real_tmpdir = real_tmpdir
+            self._tmpdir = tmpdir
+        else:
+            tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
+            self._real_tmpdir = self._tmpdir = tmpdir
+
         os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
         self._prev_sys_path = sys.path[:]
         sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
 
     def teardown_method(self, method):
-        shutil.rmtree(self._tmpdir)
+        shutil.rmtree(self._real_tmpdir)
+        if os.path.islink(self._tmpdir):
+            os.unlink(self._tmpdir)
+
         pkg_resources._namespace_packages = self._ns_pkgs.copy()
         sys.path = self._prev_sys_path[:]
 
-    @pytest.mark.skipif(os.path.islink(tempfile.gettempdir()),
-        reason="Test fails when /tmp is a symlink. See #231")
     def test_two_levels_deep(self):
         """
         Test nested namespace packages
@@ -653,7 +667,7 @@ def test_two_levels_deep(self):
         assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]
         # check the __path__ attribute contains both paths
         expected = [
-            os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"),
-            os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2"),
+            os.path.join(self._real_tmpdir, "site-pkgs", "pkg1", "pkg2"),
+            os.path.join(self._real_tmpdir, "site-pkgs2", "pkg1", "pkg2"),
         ]
         assert pkg1.pkg2.__path__ == expected

From 952c1bafda1929c74c737646aa025e6ffad6632e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 16:30:47 -0500
Subject: [PATCH 5424/8469] Modeling after Astropy's technique for bundling
 libraries, the imports are now much cleaner. Thanks @embray. Ref #229.

--HG--
branch : feature/issue-229
---
 pytest.ini                            |  2 +-
 setuptools/__init__.py                |  7 +---
 setuptools/command/bdist_egg.py       |  7 +---
 setuptools/command/develop.py         |  7 +---
 setuptools/command/easy_install.py    | 10 ++----
 setuptools/command/egg_info.py        |  7 +---
 setuptools/command/rotate.py          |  7 +---
 setuptools/command/sdist.py           |  7 +---
 setuptools/command/setopt.py          |  7 +---
 setuptools/command/test.py            |  7 +---
 setuptools/command/upload_docs.py     | 10 ++----
 setuptools/depends.py                 |  7 +---
 setuptools/dist.py                    |  7 +---
 setuptools/extern/__init__.py         |  0
 setuptools/extern/six.py              | 46 +++++++++++++++++++++++++++
 setuptools/package_index.py           | 10 ++----
 setuptools/sandbox.py                 | 10 ++----
 setuptools/ssl_support.py             |  7 +---
 setuptools/tests/__init__.py          |  7 +---
 setuptools/tests/contexts.py          |  7 +---
 setuptools/tests/server.py            |  7 +---
 setuptools/tests/test_develop.py      |  7 +---
 setuptools/tests/test_easy_install.py | 10 ++----
 setuptools/tests/test_integration.py  |  9 +-----
 setuptools/tests/test_packageindex.py | 10 ++----
 setuptools/tests/test_sdist.py        |  7 +---
 setuptools/unicode_utils.py           |  8 +----
 27 files changed, 77 insertions(+), 160 deletions(-)
 create mode 100644 setuptools/extern/__init__.py
 create mode 100644 setuptools/extern/six.py

diff --git a/pytest.ini b/pytest.ini
index 351942f439..bfb4e4f8f2 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py
-norecursedirs=dist build *.egg
+norecursedirs=dist build *.egg setuptools/extern
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6e1e5aa418..ec0d5dc2a4 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,12 +8,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-try:
-    from setuptools._vendor.six.moves import filterfalse
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import filterfalse
+from setuptools.extern.six.moves import filterfalse
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 7816481988..9cebd7fa02 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,12 +11,7 @@
 import marshal
 import textwrap
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index c401c8d4c5..11b5df10a8 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,12 +5,7 @@
 import glob
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 51c38ddfa3..a11618d1a0 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,14 +40,8 @@
 import shlex
 import io
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import configparser
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import configparser
+from setuptools.extern import six
+from setuptools.extern.six.moves import configparser
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5b996a11be..cf46d24a85 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -14,12 +14,7 @@
 import warnings
 import time
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 1ee1c538e8..804f962a7b 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -3,12 +3,7 @@
 from distutils.errors import DistutilsOptionError
 import os
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 59990cd69a..6640d4e3c9 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,12 +5,7 @@
 import sys
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from setuptools.utils import cs_path_exists
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 1441e51224..7f332be5a4 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,12 +4,7 @@
 import distutils
 import os
 
-try:
-    from setuptools._vendor.six.moves import configparser
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import configparser
+from setuptools.extern.six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 32ff7f157c..3a2a9b933c 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,12 +2,7 @@
 from unittest import TestLoader
 import sys
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 60e9fb7efc..ca35a3ce1c 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,14 +16,8 @@
 import sys
 import shutil
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import http_client, urllib
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import http_client, urllib
+from setuptools.extern import six
+from setuptools.extern.six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index e633c05b76..9f7c9a3551 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -4,12 +4,7 @@
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 from distutils.version import StrictVersion
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 11b42d19c3..7073122560 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,12 +13,7 @@
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 from setuptools.depends import Require
 from setuptools import windows_support
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/extern/six.py b/setuptools/extern/six.py
new file mode 100644
index 0000000000..2685c5e6cd
--- /dev/null
+++ b/setuptools/extern/six.py
@@ -0,0 +1,46 @@
+"""
+Handle loading six package from system or from the bundled copy
+"""
+
+import imp
+
+
+_SIX_SEARCH_PATH = ['setuptools._vendor.six', 'six']
+
+
+def _find_module(name, path=None):
+    """
+    Alternative to `imp.find_module` that can also search in subpackages.
+    """
+
+    parts = name.split('.')
+
+    for part in parts:
+        if path is not None:
+            path = [path]
+
+        fh, path, descr = imp.find_module(part, path)
+
+    return fh, path, descr
+
+
+def _import_six(search_path=_SIX_SEARCH_PATH):
+    for mod_name in search_path:
+        try:
+            mod_info = _find_module(mod_name)
+        except ImportError:
+            continue
+
+        imp.load_module(__name__, *mod_info)
+
+        break
+
+    else:
+        raise ImportError(
+            "The 'six' module of minimum version {0} is required; "
+            "normally this is bundled with this package so if you get "
+            "this warning, consult the packager of your "
+            "distribution.")
+
+
+_import_six()
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 08c368909a..ea136c097c 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -14,14 +14,8 @@
 except ImportError:
     from urllib2 import splituser
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import urllib, http_client, configparser
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import urllib, http_client, configparser
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib, http_client, configparser
 
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 47d7f40c80..37035f3792 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,14 +8,8 @@
 import contextlib
 import pickle
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import builtins
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import builtins
+from setuptools.extern import six
+from setuptools.extern.six.moves import builtins
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 327c2fcb17..7baedd1977 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,12 +3,7 @@
 import atexit
 import re
 
-try:
-    from setuptools._vendor.six.moves import urllib, http_client
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import urllib, http_client
+from setuptools.extern.six.moves import urllib, http_client
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 0a625993e6..3244735600 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,12 +8,7 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 3a0ce6b56d..8c9a2d3ead 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,12 +5,7 @@
 import contextlib
 import site
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 
 @contextlib.contextmanager
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index ef5c8f62df..6a687937bb 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,12 +4,7 @@
 import time
 import threading
 
-try:
-    from setuptools._vendor.six.moves import BaseHTTPServer, SimpleHTTPServer
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import BaseHTTPServer, SimpleHTTPServer
+from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 71aaed6a78..1b84449995 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -5,12 +5,7 @@
 import sys
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index de34ca2733..94e317b362 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,14 +16,8 @@
 import distutils.errors
 import io
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import urllib
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import urllib
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib
 
 import pytest
 try:
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1c57402008..04772ba5eb 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,14 +7,7 @@
 import os
 import sys
 
-try:
-    from setuptools._vendor.six.moves import urllib
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    from six.moves import urllib
-
-
+from setuptools.extern.six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 649e8a4ef1..6a76b5fcff 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,14 +4,8 @@
 import os
 import distutils.errors
 
-try:
-    from setuptools._vendor import six
-    from setuptools._vendor.six.moves import urllib, http_client
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
-    from six.moves import urllib, http_client
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib, http_client
 
 from .textwrap import DALS
 import pkg_resources
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index ea176733dc..753b507df9 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,12 +9,7 @@
 import contextlib
 import io
 
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 import pytest
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 1fdb0a9136..18903d9ef9 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,13 +1,7 @@
 import unicodedata
 import sys
 
-
-try:
-    from setuptools._vendor import six
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import six
+from setuptools.extern import six
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):

From ddb91c20793d8e5e8a01e0302afeaaba76776741 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 16:38:40 -0500
Subject: [PATCH 5425/8469] Make the technique even more generic

--HG--
branch : feature/issue-229
---
 setuptools/extern/six.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/extern/six.py b/setuptools/extern/six.py
index 2685c5e6cd..6076c208dd 100644
--- a/setuptools/extern/six.py
+++ b/setuptools/extern/six.py
@@ -1,11 +1,11 @@
 """
-Handle loading six package from system or from the bundled copy
+Handle loading a package from system or from the bundled copy
 """
 
 import imp
 
 
-_SIX_SEARCH_PATH = ['setuptools._vendor.six', 'six']
+_SEARCH_PATH = ['setuptools._vendor.six', 'six']
 
 
 def _find_module(name, path=None):
@@ -24,7 +24,7 @@ def _find_module(name, path=None):
     return fh, path, descr
 
 
-def _import_six(search_path=_SIX_SEARCH_PATH):
+def _import_in_place(search_path=_SEARCH_PATH):
     for mod_name in search_path:
         try:
             mod_info = _find_module(mod_name)
@@ -32,15 +32,14 @@ def _import_six(search_path=_SIX_SEARCH_PATH):
             continue
 
         imp.load_module(__name__, *mod_info)
-
         break
 
     else:
         raise ImportError(
-            "The 'six' module of minimum version {0} is required; "
+            "The '{name}' package is required; "
             "normally this is bundled with this package so if you get "
             "this warning, consult the packager of your "
-            "distribution.")
+            "distribution.".format(name=_SEARCH_PATH[-1]))
 
 
-_import_six()
+_import_in_place()

From 9b985a9112d9be396adca6a1948076378c70cc34 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Dec 2015 16:47:55 -0500
Subject: [PATCH 5426/8469] Use the same technique in pkg_resources, relying on
 an 'extern' module to resolve the conditional import.

--HG--
branch : feature/issue-229
---
 pkg_resources/__init__.py             | 13 +++-----
 pkg_resources/extern/__init__.py      |  0
 pkg_resources/extern/packaging.py     | 45 +++++++++++++++++++++++++++
 pkg_resources/tests/test_resources.py |  3 +-
 pytest.ini                            |  2 +-
 setuptools/command/egg_info.py        |  2 +-
 setuptools/dist.py                    |  3 +-
 7 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 pkg_resources/extern/__init__.py
 create mode 100644 pkg_resources/extern/packaging.py

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b55e4127b4..82382962c6 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -87,15 +87,10 @@
 except ImportError:
     pass
 
-try:
-    import pkg_resources._vendor.packaging.version
-    import pkg_resources._vendor.packaging.specifiers
-    packaging = pkg_resources._vendor.packaging
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import packaging.version
-    import packaging.specifiers
+
+from pkg_resources.extern import packaging
+__import__('pkg_resources.extern.packaging.version')
+__import__('pkg_resources.extern.packaging.specifiers')
 
 
 if (3, 0) < sys.version_info < (3, 3):
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pkg_resources/extern/packaging.py b/pkg_resources/extern/packaging.py
new file mode 100644
index 0000000000..47f58eab21
--- /dev/null
+++ b/pkg_resources/extern/packaging.py
@@ -0,0 +1,45 @@
+"""
+Handle loading a package from system or from the bundled copy
+"""
+
+import imp
+
+
+_SEARCH_PATH = ['pkg_resources._vendor.packaging', 'packaging']
+
+
+def _find_module(name, path=None):
+    """
+    Alternative to `imp.find_module` that can also search in subpackages.
+    """
+
+    parts = name.split('.')
+
+    for part in parts:
+        if path is not None:
+            path = [path]
+
+        fh, path, descr = imp.find_module(part, path)
+
+    return fh, path, descr
+
+
+def _import_in_place(search_path=_SEARCH_PATH):
+    for mod_name in search_path:
+        try:
+            mod_info = _find_module(mod_name)
+        except ImportError:
+            continue
+
+        imp.load_module(__name__, *mod_info)
+        break
+
+    else:
+        raise ImportError(
+            "The '{name}' package is required; "
+            "normally this is bundled with this package so if you get "
+            "this warning, consult the packager of your "
+            "distribution.".format(name=_SEARCH_PATH[-1]))
+
+
+_import_in_place()
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 9fda892fb6..141d63ad51 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -5,14 +5,13 @@
 import string
 
 import pytest
+from pkg_resources.extern import packaging
 
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
     WorkingSet)
 
-packaging = pkg_resources.packaging
-
 
 def safe_repr(obj, short=False):
     """ copied from Python2.7"""
diff --git a/pytest.ini b/pytest.ini
index bfb4e4f8f2..ab4a6df381 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py
-norecursedirs=dist build *.egg setuptools/extern
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index cf46d24a85..18a3105fc3 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -26,7 +26,7 @@
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 import setuptools.unicode_utils as unicode_utils
 
-from pkg_resources import packaging
+from pkg_resources.extern import packaging
 
 try:
     from setuptools_svn import svn_utils
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7073122560..4964a9e8ab 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,13 +14,12 @@
     DistutilsSetupError)
 
 from setuptools.extern import six
+from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
 from setuptools import windows_support
 import pkg_resources
 
-packaging = pkg_resources.packaging
-
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded

From 9a531b50020849193a55262b3f9cfc375ad3f37c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Jan 2016 21:22:29 -0500
Subject: [PATCH 5427/8469] Move extern.packaging into a package to enable
 package-relative imports to resolve propertly. Ref #229.

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/{packaging.py => packaging/__init__.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkg_resources/extern/{packaging.py => packaging/__init__.py} (100%)

diff --git a/pkg_resources/extern/packaging.py b/pkg_resources/extern/packaging/__init__.py
similarity index 100%
rename from pkg_resources/extern/packaging.py
rename to pkg_resources/extern/packaging/__init__.py

From 9d9d74deb049ce7cf367a1baff5c6f13ea3b457e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 14:02:35 -0500
Subject: [PATCH 5428/8469] Create a PEP 302 importer for managing conditional
 import of vendored packages from the 'extern' namespace. This technique
 avoids the use of 'imp' and works even when setuptools is installed as a
 zipped egg. Ref #229.

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py           | 42 ++++++++++++++++++++
 pkg_resources/extern/packaging/__init__.py | 45 ----------------------
 setuptools/extern/__init__.py              | 42 ++++++++++++++++++++
 setuptools/extern/six.py                   | 45 ----------------------
 4 files changed, 84 insertions(+), 90 deletions(-)
 delete mode 100644 pkg_resources/extern/packaging/__init__.py
 delete mode 100644 setuptools/extern/six.py

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index e69de29bb2..3b3076c01b 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -0,0 +1,42 @@
+import sys
+
+_VENDORED_NAMES = 'packaging',
+_SEARCH_PATH = 'pkg_resources._vendor.', ''
+
+class VendorImporter:
+    """
+    A PEP 302 meta path importer for finding optionally-vendored
+    or otherwise naturally-installed packages from __name__.
+    """
+    def find_module(self, fullname, path=None):
+        root, base, target = fullname.partition(__name__ + '.')
+        if root:
+            return
+        if not any(map(target.startswith, _VENDORED_NAMES)):
+            return
+        return self
+
+    def load_module(self, fullname):
+        root, base, target = fullname.partition(__name__ + '.')
+        for prefix in _SEARCH_PATH:
+            try:
+                __import__(prefix + target)
+                mod = sys.modules[prefix + target]
+                sys.modules[fullname] = mod
+                return mod
+            except ImportError:
+                pass
+        else:
+            raise ImportError(
+                "The '{target}' package is required; "
+                "normally this is bundled with this package so if you get "
+                "this warning, consult the packager of your "
+                "distribution.".format(**locals())
+            )
+
+    @classmethod
+    def install(cls):
+        if not any(isinstance(imp, cls) for imp in sys.meta_path):
+            sys.meta_path.append(cls())
+
+VendorImporter.install()
diff --git a/pkg_resources/extern/packaging/__init__.py b/pkg_resources/extern/packaging/__init__.py
deleted file mode 100644
index 47f58eab21..0000000000
--- a/pkg_resources/extern/packaging/__init__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Handle loading a package from system or from the bundled copy
-"""
-
-import imp
-
-
-_SEARCH_PATH = ['pkg_resources._vendor.packaging', 'packaging']
-
-
-def _find_module(name, path=None):
-    """
-    Alternative to `imp.find_module` that can also search in subpackages.
-    """
-
-    parts = name.split('.')
-
-    for part in parts:
-        if path is not None:
-            path = [path]
-
-        fh, path, descr = imp.find_module(part, path)
-
-    return fh, path, descr
-
-
-def _import_in_place(search_path=_SEARCH_PATH):
-    for mod_name in search_path:
-        try:
-            mod_info = _find_module(mod_name)
-        except ImportError:
-            continue
-
-        imp.load_module(__name__, *mod_info)
-        break
-
-    else:
-        raise ImportError(
-            "The '{name}' package is required; "
-            "normally this is bundled with this package so if you get "
-            "this warning, consult the packager of your "
-            "distribution.".format(name=_SEARCH_PATH[-1]))
-
-
-_import_in_place()
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index e69de29bb2..803d9e9a4a 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -0,0 +1,42 @@
+import sys
+
+_VENDORED_NAMES = 'six',
+_SEARCH_PATH = 'setuptools._vendor.', ''
+
+class VendorImporter:
+    """
+    A PEP 302 meta path importer for finding optionally-vendored
+    or otherwise naturally-installed packages from __name__.
+    """
+    def find_module(self, fullname, path=None):
+        root, base, target = fullname.partition(__name__ + '.')
+        if root:
+            return
+        if not any(map(target.startswith, _VENDORED_NAMES)):
+            return
+        return self
+
+    def load_module(self, fullname):
+        root, base, target = fullname.partition(__name__ + '.')
+        for prefix in _SEARCH_PATH:
+            try:
+                __import__(prefix + target)
+                mod = sys.modules[prefix + target]
+                sys.modules[fullname] = mod
+                return mod
+            except ImportError:
+                pass
+        else:
+            raise ImportError(
+                "The '{target}' package is required; "
+                "normally this is bundled with this package so if you get "
+                "this warning, consult the packager of your "
+                "distribution.".format(**locals())
+            )
+
+    @classmethod
+    def install(cls):
+        if not any(isinstance(imp, cls) for imp in sys.meta_path):
+            sys.meta_path.append(cls())
+
+VendorImporter.install()
diff --git a/setuptools/extern/six.py b/setuptools/extern/six.py
deleted file mode 100644
index 6076c208dd..0000000000
--- a/setuptools/extern/six.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Handle loading a package from system or from the bundled copy
-"""
-
-import imp
-
-
-_SEARCH_PATH = ['setuptools._vendor.six', 'six']
-
-
-def _find_module(name, path=None):
-    """
-    Alternative to `imp.find_module` that can also search in subpackages.
-    """
-
-    parts = name.split('.')
-
-    for part in parts:
-        if path is not None:
-            path = [path]
-
-        fh, path, descr = imp.find_module(part, path)
-
-    return fh, path, descr
-
-
-def _import_in_place(search_path=_SEARCH_PATH):
-    for mod_name in search_path:
-        try:
-            mod_info = _find_module(mod_name)
-        except ImportError:
-            continue
-
-        imp.load_module(__name__, *mod_info)
-        break
-
-    else:
-        raise ImportError(
-            "The '{name}' package is required; "
-            "normally this is bundled with this package so if you get "
-            "this warning, consult the packager of your "
-            "distribution.".format(name=_SEARCH_PATH[-1]))
-
-
-_import_in_place()

From de5caaee3c9a23600b96f512ed2054b4e27357a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 14:31:19 -0500
Subject: [PATCH 5429/8469] Make VendorImporter more generic

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py | 33 +++++++++++++++++++-------------
 setuptools/extern/__init__.py    | 33 +++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 3b3076c01b..17a582ea50 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -1,24 +1,31 @@
 import sys
 
-_VENDORED_NAMES = 'packaging',
-_SEARCH_PATH = 'pkg_resources._vendor.', ''
-
 class VendorImporter:
     """
     A PEP 302 meta path importer for finding optionally-vendored
-    or otherwise naturally-installed packages from __name__.
+    or otherwise naturally-installed packages from root_name.
     """
+    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
+        self.root_name = root_name
+        self.vendored_names = set(vendored_names)
+        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
+
+    @property
+    def search_path(self):
+        yield self.vendor_pkg + '.'
+        yield ''
+
     def find_module(self, fullname, path=None):
-        root, base, target = fullname.partition(__name__ + '.')
+        root, base, target = fullname.partition(self.root_name + '.')
         if root:
             return
-        if not any(map(target.startswith, _VENDORED_NAMES)):
+        if not any(map(target.startswith, self.vendored_names)):
             return
         return self
 
     def load_module(self, fullname):
-        root, base, target = fullname.partition(__name__ + '.')
-        for prefix in _SEARCH_PATH:
+        root, base, target = fullname.partition(self.root_name + '.')
+        for prefix in self.search_path:
             try:
                 __import__(prefix + target)
                 mod = sys.modules[prefix + target]
@@ -34,9 +41,9 @@ def load_module(self, fullname):
                 "distribution.".format(**locals())
             )
 
-    @classmethod
-    def install(cls):
-        if not any(isinstance(imp, cls) for imp in sys.meta_path):
-            sys.meta_path.append(cls())
+    def install(self):
+        if self not in sys.meta_path:
+            sys.meta_path.append(self)
 
-VendorImporter.install()
+names = 'packaging',
+VendorImporter(__name__, names).install()
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 803d9e9a4a..1329285cf3 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,24 +1,31 @@
 import sys
 
-_VENDORED_NAMES = 'six',
-_SEARCH_PATH = 'setuptools._vendor.', ''
-
 class VendorImporter:
     """
     A PEP 302 meta path importer for finding optionally-vendored
-    or otherwise naturally-installed packages from __name__.
+    or otherwise naturally-installed packages from root_name.
     """
+    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
+        self.root_name = root_name
+        self.vendored_names = set(vendored_names)
+        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
+
+    @property
+    def search_path(self):
+        yield self.vendor_pkg + '.'
+        yield ''
+
     def find_module(self, fullname, path=None):
-        root, base, target = fullname.partition(__name__ + '.')
+        root, base, target = fullname.partition(self.root_name + '.')
         if root:
             return
-        if not any(map(target.startswith, _VENDORED_NAMES)):
+        if not any(map(target.startswith, self.vendored_names)):
             return
         return self
 
     def load_module(self, fullname):
-        root, base, target = fullname.partition(__name__ + '.')
-        for prefix in _SEARCH_PATH:
+        root, base, target = fullname.partition(self.root_name + '.')
+        for prefix in self.search_path:
             try:
                 __import__(prefix + target)
                 mod = sys.modules[prefix + target]
@@ -34,9 +41,9 @@ def load_module(self, fullname):
                 "distribution.".format(**locals())
             )
 
-    @classmethod
-    def install(cls):
-        if not any(isinstance(imp, cls) for imp in sys.meta_path):
-            sys.meta_path.append(cls())
+    def install(self):
+        if self not in sys.meta_path:
+            sys.meta_path.append(self)
 
-VendorImporter.install()
+names = 'six',
+VendorImporter(__name__, names).install()

From a76f5c03136f0c69e8c366bf4069ec8d89d85da7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 15:15:47 -0500
Subject: [PATCH 5430/8469] Pop the module off the stack, preventing the
 'Version' class from having a different manifestation in packaging than in
 pkg_resources.

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py | 3 +--
 setuptools/extern/__init__.py    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 17a582ea50..b7f87ee9ca 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -28,8 +28,7 @@ def load_module(self, fullname):
         for prefix in self.search_path:
             try:
                 __import__(prefix + target)
-                mod = sys.modules[prefix + target]
-                sys.modules[fullname] = mod
+                mod = sys.modules[fullname] = sys.modules.pop(prefix + target)
                 return mod
             except ImportError:
                 pass
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 1329285cf3..e1400238c7 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -28,8 +28,7 @@ def load_module(self, fullname):
         for prefix in self.search_path:
             try:
                 __import__(prefix + target)
-                mod = sys.modules[prefix + target]
-                sys.modules[fullname] = mod
+                mod = sys.modules[fullname] = sys.modules.pop(prefix + target)
                 return mod
             except ImportError:
                 pass

From 2dc55bc1a9904ffd44d4cd5a3c83c7a1f12c75ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 15:23:48 -0500
Subject: [PATCH 5431/8469] Combine separate VendorImporters into a single one
 in pkg_resources.extern

--HG--
branch : feature/issue-229
---
 pkg_resources/__init__.py        |  1 -
 pkg_resources/extern/__init__.py |  1 +
 setuptools/extern/__init__.py    | 45 +-------------------------------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 82382962c6..f55c8abe2e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -87,7 +87,6 @@
 except ImportError:
     pass
 
-
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
 __import__('pkg_resources.extern.packaging.specifiers')
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index b7f87ee9ca..944967c256 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -1,5 +1,6 @@
 import sys
 
+
 class VendorImporter:
     """
     A PEP 302 meta path importer for finding optionally-vendored
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index e1400238c7..7a0c578029 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,48 +1,5 @@
-import sys
+from pkg_resources.extern import VendorImporter
 
-class VendorImporter:
-    """
-    A PEP 302 meta path importer for finding optionally-vendored
-    or otherwise naturally-installed packages from root_name.
-    """
-    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
-        self.root_name = root_name
-        self.vendored_names = set(vendored_names)
-        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
-
-    @property
-    def search_path(self):
-        yield self.vendor_pkg + '.'
-        yield ''
-
-    def find_module(self, fullname, path=None):
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
-
-    def load_module(self, fullname):
-        root, base, target = fullname.partition(self.root_name + '.')
-        for prefix in self.search_path:
-            try:
-                __import__(prefix + target)
-                mod = sys.modules[fullname] = sys.modules.pop(prefix + target)
-                return mod
-            except ImportError:
-                pass
-        else:
-            raise ImportError(
-                "The '{target}' package is required; "
-                "normally this is bundled with this package so if you get "
-                "this warning, consult the packager of your "
-                "distribution.".format(**locals())
-            )
-
-    def install(self):
-        if self not in sys.meta_path:
-            sys.meta_path.append(self)
 
 names = 'six',
 VendorImporter(__name__, names).install()

From 6a5145a04f1c7f671620c0146a2ce0241afee60c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 16:14:44 -0500
Subject: [PATCH 5432/8469] Based on experimentation, the canonical module name
 needs to be in sys.modules on Python prior to 3.3, but must be omitted on
 Python 3.3 and later.

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 944967c256..9b1599f813 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -29,7 +29,10 @@ def load_module(self, fullname):
         for prefix in self.search_path:
             try:
                 __import__(prefix + target)
-                mod = sys.modules[fullname] = sys.modules.pop(prefix + target)
+                mod = sys.modules[prefix + target]
+                sys.modules[fullname] = mod
+                if sys.version_info > (3, 3):
+                    del sys.modules[prefix + target]
                 return mod
             except ImportError:
                 pass

From b875143b79b2e2ac6d87496d699e82e8123b6e5e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 16:20:14 -0500
Subject: [PATCH 5433/8469] Add some docstrings

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 9b1599f813..2d338426d8 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -13,10 +13,17 @@ def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
 
     @property
     def search_path(self):
+        """
+        Search first the vendor package then as a natural package.
+        """
         yield self.vendor_pkg + '.'
         yield ''
 
     def find_module(self, fullname, path=None):
+        """
+        Return self when fullname starts with root_name and the
+        target module is one vendored through this importer.
+        """
         root, base, target = fullname.partition(self.root_name + '.')
         if root:
             return
@@ -25,6 +32,9 @@ def find_module(self, fullname, path=None):
         return self
 
     def load_module(self, fullname):
+        """
+        Iterate over the search path to locate and load fullname.
+        """
         root, base, target = fullname.partition(self.root_name + '.')
         for prefix in self.search_path:
             try:
@@ -45,6 +55,9 @@ def load_module(self, fullname):
             )
 
     def install(self):
+        """
+        Install this importer into sys.meta_path if not already present.
+        """
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 

From f81c6c36c062d40834cee8add4947c211e5e152c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jan 2016 16:30:44 -0500
Subject: [PATCH 5434/8469] Extract variable for extant name. Add comment about
 the hack.

--HG--
branch : feature/issue-229
---
 pkg_resources/extern/__init__.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 2d338426d8..5e81c0bb94 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -38,11 +38,17 @@ def load_module(self, fullname):
         root, base, target = fullname.partition(self.root_name + '.')
         for prefix in self.search_path:
             try:
-                __import__(prefix + target)
-                mod = sys.modules[prefix + target]
+                extant = prefix + target
+                __import__(extant)
+                mod = sys.modules[extant]
                 sys.modules[fullname] = mod
+                # mysterious hack:
+                # Remove the reference to the extant package/module
+                # on later Python versions to cause relative imports
+                # in the vendor package to resolve the same modules
+                # as those going through this importer.
                 if sys.version_info > (3, 3):
-                    del sys.modules[prefix + target]
+                    del sys.modules[extant]
                 return mod
             except ImportError:
                 pass

From a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jan 2016 20:15:55 -0500
Subject: [PATCH 5435/8469] Move six to pkg_resources for use there.

--HG--
branch : feature/issue-229
---
 Makefile                                     | 9 +++------
 {setuptools => pkg_resources}/_vendor/six.py | 0
 pkg_resources/_vendor/vendored.txt           | 1 +
 pkg_resources/extern/__init__.py             | 2 +-
 setuptools/_vendor/__init__.py               | 0
 setuptools/_vendor/vendored.txt              | 1 -
 setuptools/extern/__init__.py                | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)
 rename {setuptools => pkg_resources}/_vendor/six.py (100%)
 delete mode 100644 setuptools/_vendor/__init__.py
 delete mode 100644 setuptools/_vendor/vendored.txt

diff --git a/Makefile b/Makefile
index 54dad480fa..353b987e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,7 @@ empty:
 	exit 1
 
 update-vendored:
-	rm -rf pkg_resources/_vendor/packaging
-	python3.5 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	rm -rf pkg_resources/_vendor/packaging*
+	rm -rf pkg_resources/_vendor/six*
+	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
-
-	rm -rf setuptools/_vendor/six
-	python3.5 -m pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
-	rm -rf setuptools/_vendor/*.{egg,dist}-info
diff --git a/setuptools/_vendor/six.py b/pkg_resources/_vendor/six.py
similarity index 100%
rename from setuptools/_vendor/six.py
rename to pkg_resources/_vendor/six.py
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 4cf7664ec9..eec98267a1 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1 +1,2 @@
 packaging==15.3
+six==1.10.0
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 5e81c0bb94..317f4b8d19 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -67,5 +67,5 @@ def install(self):
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 
-names = 'packaging',
+names = 'packaging', 'six'
 VendorImporter(__name__, names).install()
diff --git a/setuptools/_vendor/__init__.py b/setuptools/_vendor/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
deleted file mode 100644
index b6e34eb294..0000000000
--- a/setuptools/_vendor/vendored.txt
+++ /dev/null
@@ -1 +0,0 @@
-six==1.10.0
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 7a0c578029..6859aa5b5c 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -2,4 +2,4 @@
 
 
 names = 'six',
-VendorImporter(__name__, names).install()
+VendorImporter(__name__, names, 'pkg_resources._vendor').install()

From b639cf0fa905f6fda3879c991197b759aaa20091 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jan 2016 20:34:46 -0500
Subject: [PATCH 5436/8469] Use six in pkg_resources.

--HG--
branch : feature/issue-229
---
 pkg_resources/__init__.py             | 31 ++++++++-------------------
 pkg_resources/tests/test_resources.py |  5 ++---
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f55c8abe2e..7becc9515a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -37,7 +37,6 @@
 import email.parser
 import tempfile
 import textwrap
-import itertools
 from pkgutil import get_importer
 
 try:
@@ -46,23 +45,8 @@
     # Python 3.2 compatibility
     import imp as _imp
 
-PY3 = sys.version_info > (3,)
-PY2 = not PY3
-
-if PY3:
-    from urllib.parse import urlparse, urlunparse
-
-if PY2:
-    from urlparse import urlparse, urlunparse
-    filter = itertools.ifilter
-    map = itertools.imap
-
-if PY3:
-    string_types = str,
-else:
-    string_types = str, eval('unicode')
-
-iteritems = (lambda i: i.items()) if PY3 else lambda i: i.iteritems()
+from pkg_resources.extern import six
+from pkg_resources.extern.six.moves import urllib
 
 # capture these to bypass sandboxing
 from os import utime
@@ -92,6 +76,9 @@
 __import__('pkg_resources.extern.packaging.specifiers')
 
 
+filter = six.moves.filter
+map = six.moves.map
+
 if (3, 0) < sys.version_info < (3, 3):
     msg = (
         "Support for Python 3.0-3.2 has been dropped. Future versions "
@@ -549,7 +536,7 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist, string_types):
+    if isinstance(dist, six.string_types):
         dist = Requirement.parse(dist)
     if isinstance(dist, Requirement):
         dist = get_provider(dist)
@@ -2297,7 +2284,7 @@ def _set_parent_ns(packageName):
 
 def yield_lines(strs):
     """Yield non-empty/non-comment lines of a string or sequence"""
-    if isinstance(strs, string_types):
+    if isinstance(strs, six.string_types):
         for s in strs.splitlines():
             s = s.strip()
             # skip blank lines/comments
@@ -2464,9 +2451,9 @@ def parse_map(cls, data, dist=None):
 def _remove_md5_fragment(location):
     if not location:
         return ''
-    parsed = urlparse(location)
+    parsed = urllib.parse.urlparse(location)
     if parsed[-1].startswith('md5='):
-        return urlunparse(parsed[:-1] + ('',))
+        return urllib.parse.urlunparse(parsed[:-1] + ('',))
     return location
 
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 141d63ad51..4241765ade 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -244,9 +244,8 @@ def test_resolve_conflicts_with_prior(self):
         with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo\nBar\n"))
 
-        msg = "Baz 1.0 is installed but Baz==2.0 is required by {'Bar'}"
-        if pkg_resources.PY2:
-            msg = msg.replace("{'Bar'}", "set(['Bar'])")
+        msg = "Baz 1.0 is installed but Baz==2.0 is required by "
+        msg += repr(set(['Bar']))
         assert vc.value.report() == msg
 
 

From d49c41c6ebc16371efabe0b92b417457cf9c47d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jan 2016 21:01:29 -0500
Subject: [PATCH 5437/8469] Added tag 19.3b1 for changeset 66fa131a0d77

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 60ce3f9483..ab249d8fe0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -233,3 +233,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 834782ce49154e9744e499e00eb392c347f9e034 19.1
 0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1
 5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2
+66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1

From a1a4a1f1358f73ee58e8f068352903f42f88a27a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jan 2016 16:07:36 -0500
Subject: [PATCH 5438/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 339b137d15..e8106c4065 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -235,6 +235,8 @@ CHANGES
   parsed requirements.
 * Pull Request #133: Removed ``setuptools.tests`` from the
   installed packages.
+* Pull Request #129: Address deprecation warning due to usage
+  of imp module.
 
 ----
 15.2

From ebc54982b1085b05054a75dbcdd16008ac20a60e Mon Sep 17 00:00:00 2001
From: Erik Bray <embray@stsci.edu>
Date: Wed, 6 Jan 2016 17:08:56 -0500
Subject: [PATCH 5439/8469] Sort __path__ entries for namespace packages
 according to their order in sys.path.  This ensures that lookups in __path__
 will be the same as sys.path resolution.

This also adds a replace argument to Distribution.insert_on meant
to be used with the replace argumen to WorkingSet.add.  This ensures
that new sys.path entries added via WorkingSet.add are inserted at
the beginning, rather than appended to the end.  This is necessary
for consistency with the above change, and kind of makes more sense
anyways.  This means that if a Distribution is added to a WorkingSet,
that replaces a different version of that Distribution, the new version
of that Distribution will have its location first on sys.path.
---
 pkg_resources/__init__.py             | 28 +++++++++++++---------
 pkg_resources/tests/test_resources.py | 34 +++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7d2fa7e9b2..46db5cc79e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -755,7 +755,7 @@ def add(self, dist, entry=None, insert=True, replace=False):
         will be called.
         """
         if insert:
-            dist.insert_on(self.entries, entry)
+            dist.insert_on(self.entries, entry, replace=replace)
 
         if entry is None:
             entry = dist.location
@@ -2183,13 +2183,16 @@ def _handle_ns(packageName, path_item):
         path.append(subpath)
         loader.load_module(packageName)
 
-        # Ensure that all paths on __path__ have been run through
-        # normalize_path
-        normalized_paths = set(_normalize_cached(p) for p in module.__path__)
-        for path_item in path:
-            normalized = _normalize_cached(path_item)
-            if normalized not in normalized_paths:
-                module.__path__.append(normalized)
+        # Rebuild mod.__path__ ensuring that all entries are ordered
+        # corresponding to their sys.path order
+        sys_path= [(p and _normalize_cached(p) or p) for p in sys.path]
+        def sort_key(p):
+            parts = p.split(os.sep)
+            parts = parts[:-(packageName.count('.') + 1)]
+            return sys_path.index(_normalize_cached(os.sep.join(parts)))
+
+        path.sort(key=sort_key)
+        module.__path__[:] = [_normalize_cached(p) for p in path]
     return subpath
 
 def declare_namespace(packageName):
@@ -2644,7 +2647,7 @@ def activate(self, path=None):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None:
             path = sys.path
-        self.insert_on(path)
+        self.insert_on(path, replace=True)
         if path is sys.path:
             fixup_namespace_packages(self.location)
             for pkg in self._get_metadata('namespace_packages.txt'):
@@ -2721,7 +2724,7 @@ def get_entry_info(self, group, name):
         """Return the EntryPoint object for `group`+`name`, or ``None``"""
         return self.get_entry_map(group).get(name)
 
-    def insert_on(self, path, loc = None):
+    def insert_on(self, path, loc=None, replace=False):
         """Insert self.location in path before its nearest parent directory"""
 
         loc = loc or self.location
@@ -2745,7 +2748,10 @@ def insert_on(self, path, loc = None):
         else:
             if path is sys.path:
                 self.check_version_conflict()
-            path.append(loc)
+            if replace:
+                path.insert(0, loc)
+            else:
+                path.append(loc)
             return
 
         # p is the spot where we found or inserted loc; now remove duplicates
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index ba12d85766..7176cc7002 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -671,3 +671,37 @@ def test_two_levels_deep(self):
             os.path.join(self._real_tmpdir, "site-pkgs2", "pkg1", "pkg2"),
         ]
         assert pkg1.pkg2.__path__ == expected
+
+    def test_path_order(self):
+        """
+        Test that if multiple versions of the same namespace package subpackage
+        are on different sys.path entries, that only the one earliest on
+        sys.path is imported, and that the namespace package's __path__ is in
+        the correct order.
+
+        Regression test for https://bitbucket.org/pypa/setuptools/issues/207
+        """
+
+        site_pkgs = ["site-pkgs", "site-pkgs2", "site-pkgs3"]
+
+        ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
+        vers_str = "__version__ = %r"
+
+        for idx, site in enumerate(site_pkgs):
+            if idx > 0:
+                sys.path.append(os.path.join(self._tmpdir, site))
+            os.makedirs(os.path.join(self._tmpdir, site, "nspkg", "subpkg"))
+            with open(os.path.join(self._tmpdir, site, "nspkg",
+                                   "__init__.py"), "w") as f:
+                f.write(ns_str)
+
+            with open(os.path.join(self._tmpdir, site, "nspkg", "subpkg",
+                                   "__init__.py"), "w") as f:
+                f.write(vers_str % (idx + 1))
+
+        import nspkg.subpkg
+        import nspkg
+        assert nspkg.__path__ == [os.path.join(self._real_tmpdir, site,
+                                               "nspkg")
+                                  for site in site_pkgs]
+        assert nspkg.subpkg.__version__ == 1

From 3bd5118eaa87b4f6598e0a473fec3623b6579d3b Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 7 Jan 2016 14:04:36 +1100
Subject: [PATCH 5440/8469] Destroy MarkerEvaluation for being pointless, fix
 two silly mistakes in tests and update packaging changes.

---
 Makefile                                      |   2 +
 pkg_resources/__init__.py                     | 181 ++----------------
 pkg_resources/_vendor/packaging/markers.py    |   4 +-
 .../_vendor/packaging/requirements.py         |  13 +-
 pkg_resources/_vendor/packaging/specifiers.py |   6 +-
 pkg_resources/_vendor/vendored.txt            |   1 +
 pkg_resources/api_tests.txt                   |   2 +-
 pkg_resources/tests/test_markers.py           |  12 +-
 8 files changed, 46 insertions(+), 175 deletions(-)

diff --git a/Makefile b/Makefile
index c2295cda54..b2ba0be263 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,6 @@ update-vendored:
 	pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
 	sed -i -e 's/ \(pyparsing\)/ pkg_resources._vendor.\1/' \
 		pkg_resources/_vendor/packaging/*.py
+	sed -i -e 's/ \(six\)/ pkg_resources._vendor.\1/' \
+		pkg_resources/_vendor/packaging/*.py
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d81430c7d4..aa221347c5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1407,170 +1407,31 @@ def to_filename(name):
     return name.replace('-','_')
 
 
-class MarkerEvaluation(object):
-    values = {
-        'os_name': lambda: os.name,
-        'sys_platform': lambda: sys.platform,
-        'python_full_version': platform.python_version,
-        'python_version': lambda: platform.python_version()[:3],
-        'platform_version': platform.version,
-        'platform_machine': platform.machine,
-        'platform_python_implementation': platform.python_implementation,
-        'python_implementation': platform.python_implementation,
-    }
-
-    @classmethod
-    def is_invalid_marker(cls, text):
-        """
-        Validate text as a PEP 508 environment marker; return an exception
-        if invalid or False otherwise.
-        """
-        try:
-            cls.evaluate_marker(text)
-        except packaging.markers.InvalidMarker as e:
-            e.filename = None
-            e.lineno = None
-            return e
-        return False
-
-    @staticmethod
-    def normalize_exception(exc):
-        """
-        Given a SyntaxError from a marker evaluation, normalize the error
-        message:
-         - Remove indications of filename and line number.
-         - Replace platform-specific error messages with standard error
-           messages.
-        """
-        subs = {
-            'unexpected EOF while parsing': 'invalid syntax',
-            'parenthesis is never closed': 'invalid syntax',
-        }
-        exc.filename = None
-        exc.lineno = None
-        exc.msg = subs.get(exc.msg, exc.msg)
-        return exc
-
-    @classmethod
-    def and_test(cls, nodelist):
-        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        items = [
-            cls.interpret(nodelist[i])
-            for i in range(1, len(nodelist), 2)
-        ]
-        return functools.reduce(operator.and_, items)
-
-    @classmethod
-    def test(cls, nodelist):
-        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
-        items = [
-            cls.interpret(nodelist[i])
-            for i in range(1, len(nodelist), 2)
-        ]
-        return functools.reduce(operator.or_, items)
-
-    @classmethod
-    def atom(cls, nodelist):
-        t = nodelist[1][0]
-        if t == token.LPAR:
-            if nodelist[2][0] == token.RPAR:
-                raise SyntaxError("Empty parentheses")
-            return cls.interpret(nodelist[2])
-        msg = "Language feature not supported in environment markers"
-        raise SyntaxError(msg)
-
-    @classmethod
-    def comparison(cls, nodelist):
-        if len(nodelist) > 4:
-            msg = "Chained comparison not allowed in environment markers"
-            raise SyntaxError(msg)
-        comp = nodelist[2][1]
-        cop = comp[1]
-        if comp[0] == token.NAME:
-            if len(nodelist[2]) == 3:
-                if cop == 'not':
-                    cop = 'not in'
-                else:
-                    cop = 'is not'
-        try:
-            cop = cls.get_op(cop)
-        except KeyError:
-            msg = repr(cop) + " operator not allowed in environment markers"
-            raise SyntaxError(msg)
-        return cop(cls.evaluate(nodelist[1]), cls.evaluate(nodelist[3]))
-
-    @classmethod
-    def get_op(cls, op):
-        ops = {
-            symbol.test: cls.test,
-            symbol.and_test: cls.and_test,
-            symbol.atom: cls.atom,
-            symbol.comparison: cls.comparison,
-            'not in': lambda x, y: x not in y,
-            'in': lambda x, y: x in y,
-            '==': operator.eq,
-            '!=': operator.ne,
-            '<':  operator.lt,
-            '>':  operator.gt,
-            '<=': operator.le,
-            '>=': operator.ge,
-        }
-        if hasattr(symbol, 'or_test'):
-            ops[symbol.or_test] = cls.test
-        return ops[op]
-
-    @classmethod
-    def evaluate_marker(cls, text, extra=None):
-        """
-        Evaluate a PEP 508 environment marker on CPython 2.4+.
-        Return a boolean indicating the marker result in this environment.
-        Raise InvalidMarker if marker is invalid.
-
-        This implementation uses the 'pyparsing' module.
-        """
-        marker = packaging.markers.Marker(text)
-        return marker.evaluate()
+def invalid_marker(text):
+    """
+    Validate text as a PEP 508 environment marker; return an exception
+    if invalid or False otherwise.
+    """
+    try:
+        evaluate_marker(text)
+    except packaging.markers.InvalidMarker as e:
+        e.filename = None
+        e.lineno = None
+        return e
+    return False
 
-    @classmethod
-    def interpret(cls, nodelist):
-        while len(nodelist)==2: nodelist = nodelist[1]
-        try:
-            op = cls.get_op(nodelist[0])
-        except KeyError:
-            raise SyntaxError("Comparison or logical expression expected")
-        return op(nodelist)
 
-    @classmethod
-    def evaluate(cls, nodelist):
-        while len(nodelist)==2: nodelist = nodelist[1]
-        kind = nodelist[0]
-        name = nodelist[1]
-        if kind==token.NAME:
-            try:
-                op = cls.values[name]
-            except KeyError:
-                raise SyntaxError("Unknown name %r" % name)
-            return op()
-        if kind==token.STRING:
-            s = nodelist[1]
-            if not cls._safe_string(s):
-                raise SyntaxError(
-                    "Only plain strings allowed in environment markers")
-            return s[1:-1]
-        msg = "Language feature not supported in environment markers"
-        raise SyntaxError(msg)
+def evaluate_marker(text, extra=None):
+    """
+    Evaluate a PEP 508 environment marker.
+    Return a boolean indicating the marker result in this environment.
+    Raise InvalidMarker if marker is invalid.
 
-    @staticmethod
-    def _safe_string(cand):
-        return (
-            cand[:1] in "'\"" and
-            not cand.startswith('"""') and
-            not cand.startswith("'''") and
-            '\\' not in cand
-        )
+    This implementation uses the 'pyparsing' module.
+    """
+    marker = packaging.markers.Marker(text)
+    return marker.evaluate()
 
-invalid_marker = MarkerEvaluation.is_invalid_marker
-evaluate_marker = MarkerEvaluation.evaluate_marker
 
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index e9c6805ad8..db8f1c25e9 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -55,7 +55,7 @@ class Value(Node):
 
 VARIABLE = (
     L("implementation_version") |
-    L("python_implementation") |
+    L("platform_python_implementation") |
     L("implementation_name") |
     L("python_full_version") |
     L("platform_release") |
@@ -209,7 +209,7 @@ def default_environment():
         "platform_system": platform.system(),
         "platform_version": platform.version(),
         "python_full_version": platform.python_version(),
-        "python_implementation": platform.python_implementation(),
+        "platform_python_implementation": platform.python_implementation(),
         "python_version": platform.python_version()[:3],
         "sys_platform": sys.platform,
     }
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index dc3672e7c8..658716c6b6 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -9,7 +9,7 @@
 from pkg_resources._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
 from pkg_resources._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
 from pkg_resources._vendor.pyparsing import Literal as L  # noqa
-from six.moves.urllib import parse as urlparse
+from pkg_resources._vendor.six.moves.urllib import parse as urlparse
 
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
@@ -73,6 +73,12 @@ class InvalidRequirement(ValueError):
 
 
 class Requirement(object):
+    """Parse a requirement.
+
+    Parse a given requirement string into its parts, such as name, specifier,
+    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
+    string.
+    """
 
     # TODO: Can we test whether something is contained within a requirement?
     #       If so how do we do that? Do we need to test against the _name_ of
@@ -82,9 +88,10 @@ class Requirement(object):
     def __init__(self, requirement_string):
         try:
             req = REQUIREMENT.parseString(requirement_string)
-        except ParseException:
+        except ParseException as e:
             raise InvalidRequirement(
-                "Invalid requirement: {0!r}".format(requirement_string))
+                "Invalid requirement, parse error at \"{0!r}\"".format(
+                    requirement_string[e.loc:e.loc + 8]))
 
         self.name = req.name
         if req.url:
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index b1fca708e9..cef90084f8 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -225,7 +225,8 @@ class LegacySpecifier(_IndividualSpecifier):
         """
     )
 
-    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.X | re.I)
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "==": "equal",
@@ -366,7 +367,8 @@ class Specifier(_IndividualSpecifier):
         """
     )
 
-    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.X | re.I)
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "~=": "compatible",
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 27bbc925eb..fcb72075f3 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,2 +1,3 @@
 packaging==15.3
 pyparsing==2.0.6
+six==1.10.0
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 2458c32204..9df56b4b0a 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -382,7 +382,7 @@ Environment Markers
     >>> print(im("os.open=='y'"))
     Invalid marker: "os.open=='y'"
 
-    >>> em("'linux' in sys_platform")
+    >>> em("sys_platform=='win32'") == (sys.platform=='win32')
     True
 
     >>> em("python_version >= '2.6'")
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 2f4b52c5f4..0af3089e78 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,12 +1,10 @@
 try:
-	import unittest.mock as mock
+    import unitest.mock as mock
 except ImportError:
-	import mock
+    import mock
 
 from pkg_resources import evaluate_marker
 
-
-@mock.patch.dict('pkg_resources.MarkerEvaluation.values',
-	python_full_version=mock.Mock(return_value='2.7.10'))
-def test_ordering():
-	assert evaluate_marker("python_full_version > '2.7.3'") is True
+@mock.patch('platform.python_version', return_value='2.7.10')
+def test_ordering(python_version_mock):
+    assert evaluate_marker("python_full_version > '2.7.3'") is True

From 027ca18211667f9467319d8dc2f0ca1137f86474 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 7 Jan 2016 14:21:49 +1100
Subject: [PATCH 5441/8469] Properly merge from default.

---
 Makefile                  | 11 +++++----
 pkg_resources/__init__.py | 47 ++++++++++++---------------------------
 2 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index b2ba0be263..7574057c19 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,10 @@ empty:
 	exit 1
 
 update-vendored:
-	rm -rf pkg_resources/_vendor/packaging
-	rm -rf pkg_resources/_vendor/pyparsing
-	pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
-	sed -i -e 's/ \(pyparsing\)/ pkg_resources._vendor.\1/' \
-		pkg_resources/_vendor/packaging/*.py
-	sed -i -e 's/ \(six\)/ pkg_resources._vendor.\1/' \
+	rm -rf pkg_resources/_vendor/packaging*
+	rm -rf pkg_resources/_vendor/six*
+	rm -rf pkg_resources/_vendor/pyparsing*
+	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	sed -i -e 's/ \(pyparsing|six\)/ pkg_resources.extern.\1/' \
 		pkg_resources/_vendor/packaging/*.py
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index aa221347c5..4e3a25aeb3 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -37,7 +37,6 @@
 import email.parser
 import tempfile
 import textwrap
-import itertools
 from pkgutil import get_importer
 
 try:
@@ -46,23 +45,8 @@
     # Python 3.2 compatibility
     import imp as _imp
 
-PY3 = sys.version_info > (3,)
-PY2 = not PY3
-
-if PY3:
-    from urllib.parse import urlparse, urlunparse
-
-if PY2:
-    from urlparse import urlparse, urlunparse
-    filter = itertools.ifilter
-    map = itertools.imap
-
-if PY3:
-    string_types = str,
-else:
-    string_types = str, eval('unicode')
-
-iteritems = (lambda i: i.items()) if PY3 else lambda i: i.iteritems()
+from pkg_resources.extern import six
+from pkg_resources.extern.six.moves import urllib
 
 # capture these to bypass sandboxing
 from os import utime
@@ -87,18 +71,15 @@
 except ImportError:
     pass
 
-try:
-    import pkg_resources._vendor.packaging.version
-    import pkg_resources._vendor.packaging.specifiers
-    import pkg_resources._vendor.packaging.requirements
-    import pkg_resources._vendor.packaging.markers
-    packaging = pkg_resources._vendor.packaging
-except ImportError:
-    # fallback to naturally-installed version; allows system packagers to
-    #  omit vendored packages.
-    import packaging.version
-    import packaging.specifiers
+from pkg_resources.extern import packaging
+__import__('pkg_resources.extern.packaging.version')
+__import__('pkg_resources.extern.packaging.specifiers')
+__import__('pkg_resources._vendor.packaging.requirements')
+__import__('pkg_resources._vendor.packaging.markers')
+
 
+filter = six.moves.filter
+map = six.moves.map
 
 if (3, 0) < sys.version_info < (3, 3):
     msg = (
@@ -557,7 +538,7 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist, string_types):
+    if isinstance(dist, six.string_types):
         dist = Requirement.parse(dist)
     if isinstance(dist, Requirement):
         dist = get_provider(dist)
@@ -2134,7 +2115,7 @@ def _set_parent_ns(packageName):
 
 def yield_lines(strs):
     """Yield non-empty/non-comment lines of a string or sequence"""
-    if isinstance(strs, string_types):
+    if isinstance(strs, six.string_types):
         for s in strs.splitlines():
             s = s.strip()
             # skip blank lines/comments
@@ -2289,9 +2270,9 @@ def parse_map(cls, data, dist=None):
 def _remove_md5_fragment(location):
     if not location:
         return ''
-    parsed = urlparse(location)
+    parsed = urllib.parse.urlparse(location)
     if parsed[-1].startswith('md5='):
-        return urlunparse(parsed[:-1] + ('',))
+        return urllib.parse.urlunparse(parsed[:-1] + ('',))
     return location
 
 

From 7e1ca274068f946e5eb9cac457718ff37326d3a6 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 7 Jan 2016 15:04:10 +1100
Subject: [PATCH 5442/8469] Shift packaging to use shiny extern.

---
 pkg_resources/_vendor/packaging/markers.py      | 6 +++---
 pkg_resources/_vendor/packaging/requirements.py | 8 ++++----
 pkg_resources/extern/__init__.py                | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index db8f1c25e9..d5b6ddbea7 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -8,9 +8,9 @@
 import platform
 import sys
 
-from pkg_resources._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd
-from pkg_resources._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString
-from pkg_resources._vendor.pyparsing import Literal as L  # noqa
+from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
 from .specifiers import Specifier, InvalidSpecifier
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 658716c6b6..8a9cd195e2 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -6,10 +6,10 @@
 import string
 import re
 
-from pkg_resources._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
-from pkg_resources._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
-from pkg_resources._vendor.pyparsing import Literal as L  # noqa
-from pkg_resources._vendor.six.moves.urllib import parse as urlparse
+from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+from pkg_resources.extern.six.moves.urllib import parse as urlparse
 
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 317f4b8d19..6758d36f11 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -67,5 +67,5 @@ def install(self):
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 
-names = 'packaging', 'six'
+names = 'packaging', 'pyparsing', 'six'
 VendorImporter(__name__, names).install()

From 2b3cf9b12b23ac6beca6808c4c7620aa77f168e3 Mon Sep 17 00:00:00 2001
From: Darjus Loktevic <darjus@gmail.com>
Date: Mon, 11 Jan 2016 23:23:36 +1100
Subject: [PATCH 5443/8469] Remove JythonCommandSpec as it's not required on
 Jython 2.7 and setuptools no longer supports anything 2.5, but had to test
 for 'Jython on Windows' in two other places

---
 setup.py                              |  3 +-
 setuptools/command/easy_install.py    | 48 +++------------------------
 setuptools/tests/test_easy_install.py | 45 -------------------------
 3 files changed, 7 insertions(+), 89 deletions(-)

diff --git a/setup.py b/setup.py
index dfb578a152..5378e6c5d9 100755
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,8 @@ def _gen_console_scripts():
     os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
     not in (None, "", "0")
 )
-if sys.platform == 'win32' or force_windows_specific_files:
+if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
+        or force_windows_specific_files:
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a11618d1a0..fccfade29c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1876,17 +1876,6 @@ def chmod(path, mode):
         log.debug("chmod failed: %s", e)
 
 
-def fix_jython_executable(executable, options):
-    warnings.warn("Use JythonCommandSpec", DeprecationWarning, stacklevel=2)
-
-    if not JythonCommandSpec.relevant():
-        return executable
-
-    cmd = CommandSpec.best().from_param(executable)
-    cmd.install_options(options)
-    return cmd.as_header().lstrip('#!').rstrip('\n')
-
-
 class CommandSpec(list):
     """
     A command spec for a #! header, specified as a list of arguments akin to
@@ -1901,7 +1890,7 @@ def best(cls):
         """
         Choose the best CommandSpec class based on environmental conditions.
         """
-        return cls if not JythonCommandSpec.relevant() else JythonCommandSpec
+        return cls
 
     @classmethod
     def _sys_executable(cls):
@@ -1968,36 +1957,6 @@ class WindowsCommandSpec(CommandSpec):
     split_args = dict(posix=False)
 
 
-class JythonCommandSpec(CommandSpec):
-    @classmethod
-    def relevant(cls):
-        return (
-            sys.platform.startswith('java')
-            and
-            __import__('java').lang.System.getProperty('os.name') != 'Linux'
-        )
-
-    def as_header(self):
-        """
-        Workaround Jython's sys.executable being a .sh (an invalid
-        shebang line interpreter)
-        """
-        if not is_sh(self[0]):
-            return super(JythonCommandSpec, self).as_header()
-
-        if self.options:
-            # Can't apply the workaround, leave it broken
-            log.warn(
-                "WARNING: Unable to adapt shebang line for Jython,"
-                " the following script is NOT executable\n"
-                "         see http://bugs.jython.org/issue1112 for"
-                " more information.")
-            return super(JythonCommandSpec, self).as_header()
-
-        items = ['/usr/bin/env'] + self + list(self.options)
-        return self._render(items)
-
-
 class ScriptWriter(object):
     """
     Encapsulates behavior around writing entry point scripts for console and
@@ -2074,7 +2033,10 @@ def best(cls):
         """
         Select the best ScriptWriter for this environment.
         """
-        return WindowsScriptWriter.best() if sys.platform == 'win32' else cls
+        if sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt'):
+            return WindowsScriptWriter.best()
+        else:
+            return cls
 
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 94e317b362..93f94b85c8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -427,51 +427,6 @@ def test_get_script_header(self):
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
 
-    @pytest.mark.xfail(
-        six.PY3 and is_ascii,
-        reason="Test fails in this locale on Python 3"
-    )
-    @mock.patch.dict(sys.modules, java=mock.Mock(lang=mock.Mock(System=
-        mock.Mock(getProperty=mock.Mock(return_value="")))))
-    @mock.patch('sys.platform', 'java1.5.0_13')
-    def test_get_script_header_jython_workaround(self, tmpdir):
-        # Create a mock sys.executable that uses a shebang line
-        header = DALS("""
-            #!/usr/bin/python
-            # -*- coding: utf-8 -*-
-            """)
-        exe = tmpdir / 'exe.py'
-        with exe.open('w') as f:
-            f.write(header)
-
-        exe = ei.nt_quote_arg(os.path.normpath(str(exe)))
-
-        # Make sure Windows paths are quoted properly before they're sent
-        # through shlex.split by get_script_header
-        executable = '"%s"' % exe if os.path.splitdrive(exe)[0] else exe
-
-        header = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python',
-            executable=executable)
-        assert header == '#!/usr/bin/env %s\n' % exe
-
-        expect_out = 'stdout' if sys.version_info < (2,7) else 'stderr'
-
-        with contexts.quiet() as (stdout, stderr):
-            # When options are included, generate a broken shebang line
-            # with a warning emitted
-            candidate = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x',
-                executable=executable)
-            assert candidate == '#!%s -x\n' % exe
-            output = locals()[expect_out]
-            assert 'Unable to adapt shebang line' in output.getvalue()
-
-        with contexts.quiet() as (stdout, stderr):
-            candidate = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
-                executable=self.non_ascii_exe)
-            assert candidate == '#!%s -x\n' % self.non_ascii_exe
-            output = locals()[expect_out]
-            assert 'Unable to adapt shebang line' in output.getvalue()
-
 
 class TestCommandSpec:
     def test_custom_launch_command(self):

From d293e9bcca56765b0ec06d6d7f542cc2c71ad001 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Jan 2016 20:06:17 -0500
Subject: [PATCH 5444/8469] Added tag 19.3 for changeset 32bba9bf8cce

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ab249d8fe0..4f89a01a43 100644
--- a/.hgtags
+++ b/.hgtags
@@ -234,3 +234,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1
 5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2
 66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1
+32bba9bf8cce8350b560a7591c9ef5884a194211 19.3

From ecc8c659b45cec0b69335a74445de2be500c382a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Jan 2016 20:08:11 -0500
Subject: [PATCH 5445/8469] Bumped to 19.4 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 09bbb730c0..7ff48baa70 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.3'
+__version__ = '19.4'

From 434aef220e6ec7cfc609bce631ef8528c930c20c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:11:13 -0500
Subject: [PATCH 5446/8469] Move trailing comment to docstring

---
 setuptools/command/build_py.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 8a50f03261..32e37e52a3 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -59,7 +59,8 @@ def run(self):
         self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=0))
 
     def __getattr__(self, attr):
-        if attr == 'data_files':  # lazily compute data files
+        "lazily compute data files"
+        if attr == 'data_files':
             self.data_files = files = self._get_data_files()
             return files
         return orig.build_py.__getattr__(self, attr)

From f55db00043f3f47b7121c42d54433bc80a01c243 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:11:54 -0500
Subject: [PATCH 5447/8469] Remove superfluous local variable

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

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 32e37e52a3..c24646c398 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -61,8 +61,8 @@ def run(self):
     def __getattr__(self, attr):
         "lazily compute data files"
         if attr == 'data_files':
-            self.data_files = files = self._get_data_files()
-            return files
+            self.data_files = self._get_data_files()
+            return self.data_files
         return orig.build_py.__getattr__(self, attr)
 
     def build_module(self, module, module_file, package):

From 775cb73ed72e87951254bbbe373951be9caac4df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:16:11 -0500
Subject: [PATCH 5448/8469] Extract function for getting data files for
 package.

---
 setuptools/command/build_py.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index c24646c398..3ddc767311 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -75,8 +75,9 @@ def build_module(self, module, module_file, package):
     def _get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         self.analyze_manifest()
-        data = []
-        for package in self.packages or ():
+        return list(map(self._get_pkg_data_files, self.packages or ()))
+
+    def _get_pkg_data_files(self, package):
             # Locate package source directory
             src_dir = self.get_package_dir(package)
 
@@ -90,8 +91,7 @@ def _get_data_files(self):
             filenames = [
                 file[plen:] for file in self.find_data_files(package, src_dir)
             ]
-            data.append((package, src_dir, build_dir, filenames))
-        return data
+            return package, src_dir, build_dir, filenames
 
     def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""

From ddfbfa731e2cf73dc03b5a3345996afac843441e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:16:39 -0500
Subject: [PATCH 5449/8469] Reindent

---
 setuptools/command/build_py.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 3ddc767311..5021bd1f1e 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -78,20 +78,20 @@ def _get_data_files(self):
         return list(map(self._get_pkg_data_files, self.packages or ()))
 
     def _get_pkg_data_files(self, package):
-            # Locate package source directory
-            src_dir = self.get_package_dir(package)
+        # Locate package source directory
+        src_dir = self.get_package_dir(package)
 
-            # Compute package build directory
-            build_dir = os.path.join(*([self.build_lib] + package.split('.')))
+        # Compute package build directory
+        build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
-            # Length of path to strip from found files
-            plen = len(src_dir) + 1
+        # Length of path to strip from found files
+        plen = len(src_dir) + 1
 
-            # Strip directory from globbed filenames
-            filenames = [
-                file[plen:] for file in self.find_data_files(package, src_dir)
-            ]
-            return package, src_dir, build_dir, filenames
+        # Strip directory from globbed filenames
+        filenames = [
+            file[plen:] for file in self.find_data_files(package, src_dir)
+        ]
+        return package, src_dir, build_dir, filenames
 
     def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""

From 0f590c0d72709128f32c23437fe0183386c69d1c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:33:04 -0500
Subject: [PATCH 5450/8469] Prefer relpath to string slicing for computing a
 path relative to a base. Fixes #341.

---
 CHANGES.txt                    | 6 ++++++
 setuptools/command/build_py.py | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e8106c4065..c8a9f8ab3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+19.3.1
+------
+
+* Issue #341: Correct error in path handling of package data
+  files in ``build_py`` command when package is empty.
+
 ----
 19.3
 ----
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 5021bd1f1e..0c1026aad7 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -84,12 +84,10 @@ def _get_pkg_data_files(self, package):
         # Compute package build directory
         build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
-        # Length of path to strip from found files
-        plen = len(src_dir) + 1
-
         # Strip directory from globbed filenames
         filenames = [
-            file[plen:] for file in self.find_data_files(package, src_dir)
+            os.path.relpath(file, src_dir)
+            for file in self.find_data_files(package, src_dir)
         ]
         return package, src_dir, build_dir, filenames
 

From 8af3b6ef5b4173a0d0d6735147c98c882ae98344 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 06:54:00 -0500
Subject: [PATCH 5451/8469] Always use Python 3 version of map

---
 pkg_resources/__init__.py                 | 2 +-
 pkg_resources/tests/test_pkg_resources.py | 2 ++
 pkg_resources/tests/test_resources.py     | 4 +++-
 setuptools/__init__.py                    | 2 +-
 setuptools/command/alias.py               | 2 ++
 setuptools/command/build_py.py            | 1 +
 setuptools/command/easy_install.py        | 2 +-
 setuptools/command/egg_info.py            | 1 +
 setuptools/command/install_egg_info.py    | 2 ++
 setuptools/command/test.py                | 1 +
 setuptools/dist.py                        | 1 +
 setuptools/extension.py                   | 2 ++
 setuptools/package_index.py               | 2 +-
 setuptools/sandbox.py                     | 2 +-
 setuptools/ssl_support.py                 | 2 +-
 setuptools/tests/test_dist_info.py        | 2 ++
 setuptools/tests/test_egg_info.py         | 2 ++
 setuptools/tests/test_sdist.py            | 1 +
 18 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7becc9515a..8382571e6a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -46,7 +46,7 @@
     import imp as _imp
 
 from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib
+from pkg_resources.extern.six.moves import urllib, map
 
 # capture these to bypass sandboxing
 from os import utime
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 31eee63598..8b276ffcfd 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,6 +12,8 @@
 import distutils.dist
 import distutils.command.install_egg_info
 
+from pkg_resources.extern.six.moves import map
+
 import pytest
 
 import pkg_resources
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4241765ade..84133a326b 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -4,6 +4,8 @@
 import shutil
 import string
 
+from pkg_resources.extern.six.moves import map
+
 import pytest
 from pkg_resources.extern import packaging
 
@@ -158,7 +160,7 @@ def testResolve(self):
         for i in range(3):
             targets = list(ws.resolve(parse_requirements("Foo"), ad))
             assert targets == [Foo]
-            list(map(ws.add,targets))
+            list(map(ws.add, targets))
         with pytest.raises(VersionConflict):
             ws.resolve(parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ec0d5dc2a4..67b57e4f46 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filterfalse
+from setuptools.extern.six.moves import filterfalse, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 452a9244ea..4532b1cc0d 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,5 +1,7 @@
 from distutils.errors import DistutilsOptionError
 
+from setuptools.extern.six.moves import map
+
 from setuptools.command.setopt import edit_config, option_base, config_file
 
 
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 0c1026aad7..8623c777cf 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -9,6 +9,7 @@
 import collections
 import itertools
 
+from setuptools.extern.six.moves import map
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a11618d1a0..d3c0acfb4b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -41,7 +41,7 @@
 import io
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import configparser
+from setuptools.extern.six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 18a3105fc3..d1bd9b0406 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,6 +15,7 @@
 import time
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index fd0f118b33..f777538f0f 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,6 +1,8 @@
 from distutils import log, dir_util
 import os
 
+from setuptools.extern.six.moves import map
+
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 import pkg_resources
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 3a2a9b933c..371e913b6f 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,6 +3,7 @@
 import sys
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4964a9e8ab..7785541582 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,6 +14,7 @@
     DistutilsSetupError)
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 35eb7c7c55..d10609b699 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -5,6 +5,8 @@
 import distutils.errors
 import distutils.extension
 
+from setuptools.extern.six.moves import map
+
 from .dist import _get_unpatched
 from . import msvc9_support
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ea136c097c..c53343e4c8 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -15,7 +15,7 @@
     from urllib2 import splituser
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client, configparser
+from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 37035f3792..668bcac72c 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -9,7 +9,7 @@
 import pickle
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import builtins
+from setuptools.extern.six.moves import builtins, map
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 7baedd1977..511d2fa8cd 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,7 @@
 import atexit
 import re
 
-from setuptools.extern.six.moves import urllib, http_client
+from setuptools.extern.six.moves import urllib, http_client, map
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 6d0ab58792..abd0a76389 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -4,6 +4,8 @@
 import shutil
 import tempfile
 
+from setuptools.extern.six.moves import map
+
 import pytest
 
 import pkg_resources
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 333d11d6f4..7d51585b1f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,6 +1,8 @@
 import os
 import stat
 
+from setuptools.extern.six.moves import map
+
 import pytest
 
 from . import environment
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 753b507df9..d2a1f1bbfb 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -10,6 +10,7 @@
 import io
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 import pytest
 

From 71429b10081c7ae0ad596c33d95b735af80f9248 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 10:41:47 -0500
Subject: [PATCH 5452/8469] Fix two failures in sorting where filename parts
 became a factor in the version. Ref #432.

---
 scripts/upload-old-releases-as-zip.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 38cfcd5544..d718e3bbbe 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -195,11 +195,19 @@ def download_setuptools_releases_without_zip_counterpart(self):
             if e.errno != errno.EEXIST:
                 raise e
 
+    @staticmethod
+    def version_from_filename(filename):
+        basename = os.path.basename(filename)
+        name, ext = os.path.splitext(basename)
+        if name.endswith('.tar'):
+            name, ext2 = os.path.splitext(name)
+        return LooseVersion(name)
+
     def convert_targz_to_zip(self):
         print("Converting the tar.gz to zip...")
         files = glob.glob('%s/*.tar.gz' % self.dirpath)
         total_converted = 0
-        for targz in sorted(files, key=LooseVersion):
+        for targz in sorted(files, key=self.version_from_filename):
             # Extract and remove tar.
             tar = tarfile.open(targz)
             tar.extractall(path=self.dirpath)
@@ -230,8 +238,7 @@ def convert_targz_to_zip(self):
 
     def upload_zips_to_pypi(self):
         print('Uploading to pypi...')
-        zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=LooseVersion)
-        print("simulated upload of", zips); return
+        zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=self.version_from_filename)
         upload.upload(dists=zips)
 
 

From b6056e0aa0de04bc1fe702f299d8187a8c224a03 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 10:51:45 -0500
Subject: [PATCH 5453/8469] Copy all the defaults from twine.commands.upload,
 as they're not exposed in the API. Ref #432

---
 scripts/upload-old-releases-as-zip.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index d718e3bbbe..94fd1ce887 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -239,7 +239,20 @@ def convert_targz_to_zip(self):
     def upload_zips_to_pypi(self):
         print('Uploading to pypi...')
         zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=self.version_from_filename)
-        upload.upload(dists=zips)
+        upload.upload(
+            dists=zips,
+            repository='pypi',
+            sign=False,
+            identity=None,
+            username=None,
+            password=None,
+            comment=None,
+            sign_with='gpg',
+            config_file='~/.pypirc',
+            skip_existing=False,
+            cert=None,
+            client_cert=None,
+        )
 
 
 if __name__ == '__main__':

From 3f702d545e8fcb20d60224420b9c3b20a0700608 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 10:55:18 -0500
Subject: [PATCH 5454/8469] Omit cert and client_cert, the latest release of
 twine is different than what is seen in master.

---
 scripts/upload-old-releases-as-zip.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 94fd1ce887..9737337cff 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -250,8 +250,6 @@ def upload_zips_to_pypi(self):
             sign_with='gpg',
             config_file='~/.pypirc',
             skip_existing=False,
-            cert=None,
-            client_cert=None,
         )
 
 

From 3c6446900f27be1c954e0123a94d797bd6e70b83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 11:06:11 -0500
Subject: [PATCH 5455/8469] Pin to 1.6.4 due to
 https://github.com/pypa/twine/issues/158. Ref #432.

---
 scripts/upload-old-releases-as-zip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
index 9737337cff..e3047fdece 100644
--- a/scripts/upload-old-releases-as-zip.py
+++ b/scripts/upload-old-releases-as-zip.py
@@ -3,7 +3,7 @@
 
 # declare and require dependencies
 __requires__ = [
-    'twine',
+    'twine==1.6.4',
 ]; __import__('pkg_resources')
 
 import errno

From 70697b3a8c795a25de56a30d41cca76ad18d78fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 11:20:04 -0500
Subject: [PATCH 5456/8469] Remove script as it's no longer needed. Fixes #432.

---
 scripts/upload-old-releases-as-zip.py | 260 --------------------------
 1 file changed, 260 deletions(-)
 delete mode 100644 scripts/upload-old-releases-as-zip.py

diff --git a/scripts/upload-old-releases-as-zip.py b/scripts/upload-old-releases-as-zip.py
deleted file mode 100644
index e3047fdece..0000000000
--- a/scripts/upload-old-releases-as-zip.py
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# declare and require dependencies
-__requires__ = [
-    'twine==1.6.4',
-]; __import__('pkg_resources')
-
-import errno
-import glob
-import hashlib
-import json
-import os
-import shutil
-import tarfile
-import codecs
-import urllib.request
-import urllib.parse
-import urllib.error
-from distutils.version import LooseVersion
-
-from twine.commands import upload
-
-
-OK = '\033[92m'
-FAIL = '\033[91m'
-END = '\033[0m'
-DISTRIBUTION = "setuptools"
-
-
-class SetuptoolsOldReleasesWithoutZip:
-    """docstring for SetuptoolsOldReleases"""
-
-    def __init__(self):
-        self.dirpath = './dist'
-        os.makedirs(self.dirpath, exist_ok=True)
-        print("Downloading %s releases..." % DISTRIBUTION)
-        print("All releases will be downloaded to %s" % self.dirpath)
-        self.data_json_setuptools = self.get_json_data(DISTRIBUTION)
-        self.valid_releases_numbers = sorted([
-            release
-            for release in self.data_json_setuptools['releases']
-            # This condition is motivated by 13.0 release, which
-            # comes as "13.0": [], in the json
-            if self.data_json_setuptools['releases'][release]
-        ], key=LooseVersion)
-        self.total_downloaded_ok = 0
-
-    def get_json_data(self, package_name):
-        """
-        "releases": {
-            "0.7.2": [
-                {
-                    "has_sig": false,
-                    "upload_time": "2013-06-09T16:10:00",
-                    "comment_text": "",
-                    "python_version": "source",
-                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.7.2.tar.gz",  # NOQA
-                    "md5_digest": "de44cd90f8a1c713d6c2bff67bbca65d",
-                    "downloads": 159014,
-                    "filename": "setuptools-0.7.2.tar.gz",
-                    "packagetype": "sdist",
-                    "size": 633077
-                }
-            ],
-            "0.7.3": [
-                {
-                    "has_sig": false,
-                    "upload_time": "2013-06-18T21:08:56",
-                    "comment_text": "",
-                    "python_version": "source",
-                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.7.3.tar.gz",  # NOQA
-                    "md5_digest": "c854adacbf9067d330a847f06f7a8eba",
-                    "downloads": 30594,
-                    "filename": "setuptools-0.7.3.tar.gz",
-                    "packagetype": "sdist",
-                    "size": 751152
-                }
-            ],
-            "12.3": [
-                {
-                    "has_sig": false,
-                    "upload_time": "2015-02-26T19:15:51",
-                    "comment_text": "",
-                    "python_version": "3.4",
-                    "url": "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-12.3-py2.py3-none-any.whl",  # NOQA
-                    "md5_digest": "31f51a38497a70efadf5ce8d4c2211ab",
-                    "downloads": 288451,
-                    "filename": "setuptools-12.3-py2.py3-none-any.whl",
-                    "packagetype": "bdist_wheel",
-                    "size": 501904
-                },
-                {
-                    "has_sig": false,
-                    "upload_time": "2015-02-26T19:15:43",
-                    "comment_text": "",
-                    "python_version": "source",
-                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-12.3.tar.gz",  # NOQA
-                    "md5_digest": "67614b6d560fa4f240e99cd553ec7f32",
-                    "downloads": 110109,
-                    "filename": "setuptools-12.3.tar.gz",
-                    "packagetype": "sdist",
-                    "size": 635025
-                },
-                {
-                    "has_sig": false,
-                    "upload_time": "2015-02-26T19:15:47",
-                    "comment_text": "",
-                    "python_version": "source",
-                    "url": "https://pypi.python.org/packages/source/s/setuptools/setuptools-12.3.zip",  # NOQA
-                    "md5_digest": "abc799e7db6e7281535bf342bfc41a12",
-                    "downloads": 67539,
-                    "filename": "setuptools-12.3.zip",
-                    "packagetype": "sdist",
-                    "size": 678783
-                }
-            ],
-        """
-        url = "https://pypi.python.org/pypi/%s/json" % (package_name,)
-        resp = urllib.request.urlopen(urllib.request.Request(url))
-        charset = resp.info().get_content_charset()
-        reader = codecs.getreader(charset)(resp)
-        data = json.load(reader)
-
-        # Mainly for debug.
-        json_filename = "%s/%s.json" % (self.dirpath, DISTRIBUTION)
-        with open(json_filename, 'w') as outfile:
-            json.dump(
-                data,
-                outfile,
-                sort_keys=True,
-                indent=4,
-                separators=(',', ': '),
-            )
-
-        return data
-
-    def get_setuptools_releases_without_zip_counterpart(self):
-        # Get set(all_valid_releases) - set(releases_with_zip), so now we have
-        # the releases without zip.
-        return set(self.valid_releases_numbers) - set([
-            release
-            for release in self.valid_releases_numbers
-                for same_version_release_dict in self.data_json_setuptools['releases'][release]  # NOQA
-                if 'zip' in same_version_release_dict['filename']
-       ])
-
-    def download_setuptools_releases_without_zip_counterpart(self):
-        try:
-            releases_without_zip = self.get_setuptools_releases_without_zip_counterpart()  # NOQA
-            failed_md5_releases = []
-            # This is a "strange" loop, going through all releases and
-            # testing only the release I need to download, but I thought it
-            # would be mouch more readable than trying to iterate through
-            # releases I need and get into traverse hell values inside dicts
-            # inside dicts of the json to get the distribution's url to
-            # download.
-            for release in self.valid_releases_numbers:
-                if release in releases_without_zip:
-                    for same_version_release_dict in self.data_json_setuptools['releases'][release]:  # NOQA
-                        if 'tar.gz' in same_version_release_dict['filename']:
-                            print("Downloading %s..." % release)
-                            local_file = '%s/%s' % (
-                                self.dirpath,
-                                same_version_release_dict["filename"]
-                            )
-                            urllib.request.urlretrieve(
-                                same_version_release_dict["url"],
-                                local_file
-                            )
-                            targz = open(local_file, 'rb').read()
-                            hexdigest = hashlib.md5(targz).hexdigest()
-                            if (hexdigest != same_version_release_dict['md5_digest']):  # NOQA
-                                print(FAIL + "FAIL: md5 for %s didn't match!" % release + END)  # NOQA
-                                failed_md5_releases.append(release)
-                            else:
-                                self.total_downloaded_ok += 1
-            print('Total releases without zip: %s' % len(releases_without_zip))
-            print('Total downloaded: %s' % self.total_downloaded_ok)
-            if failed_md5_releases:
-                msg = FAIL + (
-                    "FAIL: these releases %s failed the md5 check!" %
-                    ','.join(failed_md5_releases)
-                ) + END
-                raise Exception(msg)
-            elif self.total_downloaded_ok != len(releases_without_zip):
-                msg = FAIL + (
-                    "FAIL: Unknown error occured. Please check the logs."
-                ) + END
-                raise Exception(msg)
-            else:
-                print(OK + "All releases downloaded and md5 checked." + END)
-
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                raise e
-
-    @staticmethod
-    def version_from_filename(filename):
-        basename = os.path.basename(filename)
-        name, ext = os.path.splitext(basename)
-        if name.endswith('.tar'):
-            name, ext2 = os.path.splitext(name)
-        return LooseVersion(name)
-
-    def convert_targz_to_zip(self):
-        print("Converting the tar.gz to zip...")
-        files = glob.glob('%s/*.tar.gz' % self.dirpath)
-        total_converted = 0
-        for targz in sorted(files, key=self.version_from_filename):
-            # Extract and remove tar.
-            tar = tarfile.open(targz)
-            tar.extractall(path=self.dirpath)
-            tar.close()
-            os.remove(targz)
-
-            # Zip the extracted tar.
-            setuptools_folder_path = targz.replace('.tar.gz', '')
-            setuptools_folder_name = setuptools_folder_path.split("/")[-1]
-            print(setuptools_folder_name)
-            shutil.make_archive(
-                setuptools_folder_path,
-                'zip',
-                self.dirpath,
-                setuptools_folder_name
-            )
-            # Exclude extracted tar folder.
-            shutil.rmtree(setuptools_folder_path.replace('.zip', ''))
-            total_converted += 1
-        print('Total converted: %s' % total_converted)
-        if self.total_downloaded_ok != total_converted:
-            msg = FAIL + (
-                "FAIL: Total number of downloaded releases is different"
-                " from converted ones. Please check the logs."
-            ) + END
-            raise Exception(msg)
-        print("Done with the tar.gz->zip. Check folder %s." % main.dirpath)
-
-    def upload_zips_to_pypi(self):
-        print('Uploading to pypi...')
-        zips = sorted(glob.glob('%s/*.zip' % self.dirpath), key=self.version_from_filename)
-        upload.upload(
-            dists=zips,
-            repository='pypi',
-            sign=False,
-            identity=None,
-            username=None,
-            password=None,
-            comment=None,
-            sign_with='gpg',
-            config_file='~/.pypirc',
-            skip_existing=False,
-        )
-
-
-if __name__ == '__main__':
-    main = SetuptoolsOldReleasesWithoutZip()
-    main.download_setuptools_releases_without_zip_counterpart()
-    main.convert_targz_to_zip()
-    main.upload_zips_to_pypi()

From bafe9fba05aefdd679770d54e3a74fc0cab538d5 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 16 Jan 2016 12:39:10 -0800
Subject: [PATCH 5457/8469] Issue #25850: Use cross-compilation by default for
 64-bit Windows.

---
 _msvccompiler.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 10a9ffda24..d0ba7d6d1e 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -125,11 +125,11 @@ def _find_exe(exe, paths=None):
     return exe
 
 # A map keyed by get_platform() return values to values accepted by
-# 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is
-# the param to cross-compile on x86 targetting amd64.)
+# 'vcvarsall.bat'. Always cross-compile from x86 to work with the
+# lighter-weight MSVC installs that do not include native 64-bit tools.
 PLAT_TO_VCVARS = {
     'win32' : 'x86',
-    'win-amd64' : 'amd64',
+    'win-amd64' : 'x86_amd64',
 }
 
 # A map keyed by get_platform() return values to the file under
@@ -193,19 +193,8 @@ def initialize(self, plat_name=None):
             raise DistutilsPlatformError("--plat-name must be one of {}"
                                          .format(tuple(PLAT_TO_VCVARS)))
 
-        # On x86, 'vcvarsall.bat amd64' creates an env that doesn't work;
-        # to cross compile, you use 'x86_amd64'.
-        # On AMD64, 'vcvarsall.bat amd64' is a native build env; to cross
-        # compile use 'x86' (ie, it runs the x86 compiler directly)
-        if plat_name == get_platform() or plat_name == 'win32':
-            # native build or cross-compile to win32
-            plat_spec = PLAT_TO_VCVARS[plat_name]
-        else:
-            # cross compile from win32 -> some 64bit
-            plat_spec = '{}_{}'.format(
-                PLAT_TO_VCVARS[get_platform()],
-                PLAT_TO_VCVARS[plat_name]
-            )
+        # Get the vcvarsall.bat spec for the requested platform.
+        plat_spec = PLAT_TO_VCVARS[plat_name]
 
         vc_env = _get_vc_env(plat_spec)
         if not vc_env:

From 7a7aaaf398456bb31074f4446d8c1290d9695019 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 16 Jan 2016 13:54:53 -0800
Subject: [PATCH 5458/8469] Issue #26071: bdist_wininst created binaries fail
 to start and find 32bit Python

---
 command/wininst-14.0-amd64.exe | Bin 136192 -> 589824 bytes
 command/wininst-14.0.exe       | Bin 129024 -> 460288 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-14.0-amd64.exe b/command/wininst-14.0-amd64.exe
index 7a5e78d52bcc5db0be1baff6cdad41e172a5b81f..22299543a97ffc1525a3b1c778cb158d6c6430ad 100644
GIT binary patch
literal 589824
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%0At6~df_XkQ&8xc5d#()sHQ3;A@42!_dF_La
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
aj)-4;0`MqdOb2TUxc%Ug|9|`k-hrP^2N)p$

delta 40845
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
D?R$@-

diff --git a/command/wininst-14.0.exe b/command/wininst-14.0.exe
index cc43296b677a5b995899bb60bbe0e632163e64ae..0dac1103d98db0af1e9027c41fe921136c5f6396 100644
GIT binary patch
literal 460288
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%0D$5P;I$Hd0dhI;(+2Nnt2fK0F+e{f
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%0D<>u;B-x=DWkUTmTZK`J
z7wBldjG4@b{smbaolFyCbgayn?14#gne0KZLu(n<9+(V=g~jA}Ow!Bb6Lj(heKKE%
z=)Ycm!dgl_&uV`?&uXq917y--CIe&=V<zWe;W8NktAC7U@nkgp)0&CoS4_Ih<al&a
zmaRFd?_)0NdFG1oBoAn4PJBai>Y-TZ%s%B#Jx?-8b}EpquUTK)u>WqT->?s6`gHP&
zdQ*~1(TtkHU}FX8H?~i5NFg7H7Sc{KI=Z`p+%owV8)-<MNU3M}NGE>kX_A>TsXLQ7
zvhrr~QznIHay?caOlHc?v@yA=0wD@AK_*RVm<Fc9{u`!&$w{a2^_9stS-5NsOl^^R
zA7M>QJk_dtp6WTX8^MRqXgZlE=qvfQ#`NR)F`UUxSvc0PXJbxpz7me6S6_kj)+^I@
zf_^O?n$rw|ngB&(!78XjP`997LDBcwdqa6Z$)N-{G-vjQN`hJql>=1_^%|-<>{&z6
zZM)G>swdS5fvVV4ev%CXd2F~1#kKMCf|de!UP$_CFiJqi)&JLO)zb~ARFcGy%!uwY
zvS?sH@vp6I#;1djfAa6K@PJ0|$b89g0b!mBjhS_rw9&hT(=CbLLF0}#)g6a24_LmC
zOW_gp8P=z#vA)1rJ2FbZ7qu#PGg*GUsKfWyR-bSALx20Bv$}`sEZ5E-o7R6y>ZLCE
zH~X(DSD*4x@^(#|l#RPu+4tX{SpI7It5ezzR;T3C{Z;uXgoiXyis(V=%6F6;of|fF
zzkxlkgS;`Ye{1WgpV9X3m7i2DD<w^2Ni<Nf2ivF)?#|puFK5mRYO05`V8SrJwzhvk
zM5oPnn_a4v2-IhlUqWtZ+iPp!26-rK3p1ti<%MLXy5MS<J<HQ-Rg8^Pb~5rAkzvp9
zg^(h~asn^pWu?koq%yCARAd6oQfo2W2j&C$C-w3xx2aGsgNAQ5fTCp_H{tcWf{roU
z)KoYN^|!7LQwAw;=ZjPsNzIp&hQ#uXTsbw4HEz=6pBEAdEq1>7JkiZ+GDBkecC^^8
zDSgGL;_&+MizH30|M{#FWj7QTcvfU9R!G`ET&AD&aUjfxEw;M5R?<!pv*Ctm|Djy|
zgtw)8G9{aEg~#X~rZ5jV|MtTciR8_!m%+B$Ft47_q4f^QJ>Tn+b|+fF{DS(@VZTV`
z-72~`{wBV@WPe87x6d9)N2juP_ol;r<{d?I%YBk*-g_+<y#^oj@_EN~`z6I=eL6@g
z5x;!dCsUJyl9k~<YNS3I0P}OH-IgDcyxtakb@y3(St<3|WM$LCl8xVQGQWPNHT)Zy
zo)~pRGCd~KxT=X6+&}TuyOS%K?e1ClD~I&hTXa6u_n4&r`0##;m$q=f!}svY<B|)W
z(<~+%b|1=BK2z`dd!FRV6|33ZZ~QTY%aor!H2kFGnMeBTX20SqPC--lH%&h!*^zi;
z^R~tK%9Ciwxu2u+CC(on{*^wf59R0XVFsrq*)Qf?abDPAC|4A3BFQ~1DXv}qvaOyP
zc(10PM;A!)6D{p^c7GniRo0kUzb%kBgtRlb@Wy&5=bhY4vEqy*G_GB;<Qdw3<{_W>
z?q?<aM&+H;xkmZ%`Gdvfvy#yfPlr2-tcG&dI>rgX=Op6RzZ`u20PeZJ+qHXjPSQd;
zOl(>$0l&1>=JfNDqBW~N_FD1h5Ufn)exeJKtG@QZSt5K9%iFAW<)I6bbA6XZ^io6m
zGOvYgmRyu<G@n23^m)-x2+H&g3ol9@WM1EN=rQuE=(p+z6D~=9t*o7{F0w#;ZjR{q
z?2<%e@k(yk7xlxw$)c?>mnAbN_B^`#kG^m}=G+nPibVNKsC#4$!c)AT@pQozNnB=9
zXY*R*m%Y`o$C`zb87IbGHMv6hCof*VtWXlS`{@do!-hk-r7fiYG`}j*Ta~@+UcYuj
zIipXzCTzSaQOZm5%)dkYf>Oo|ZFNoZWVzL=$n`dezj}GEwbvx`U(Q<k<`0-JT`|qC
z<8=wQwDs?Q?A1c}_d2Goxh{!V_3G{S%FalSj`Kv_BFW4yKIRjnkl$7R3`lh?lAJd_
zdUW{|)W@t&<80;^NwQy``u?sI@yngke(L!mNuSf!=_8*Zy;(P}mem$XQrExy+ps_C
zds4y4-u5>ni;i_3E*gUPERAftdio8?ngDU9<X5Qwe!H!w=iHE_q}2uwyN>+G9b|Iv
z#SO^=Lw$2AzivZ0*Wq4<U2jU>cid`elwtz^nr{ydz9}(ot8dkApYc!#e)6Yg+>|5_
z*swctAigk`syFTQ?VFNQ+RaW@{5}Zv;rNb&`nM!~N)NYP^Ap<hx5kqO;}PFQj8=_L
zDtu9OS3>#%R;Dsu!2FJk7clc=8E;>})JcpN(7Ora1r+Tp<?RbtIhOGPTGp2E<^l%o
zWxRkHfs7Zhs2Sr0Og(dlcQ0VpbjAx<WW#s?70++;_60QB!FT~JWsDcl-kk9Q7CkBE
z-3u7Bo$&%jL@{2#cfA-dVA7jgyn6vtk1<|AZVuxGeCNq{0h3y*+^bOW_$Et_3M&sV
zUck~6#tZ1`$#?;C+cRFkOw>=R4+1VY!*~G|s~9h!UnJuN%#|=+z)WMt3&=ey;{6w}
zw1Dvf+O1){fJREj3#f2oyny*#882W4$9MrN51~K6BVcMQ;{_D;V7!3&Pp<Ly1q|BA
zcmX+o#tXRAl<@*u-?_@W7chS{;|27dz<2>G+c93ipvQ&0djVf;WxRljXvPc3^=7<)
zsc*0F?gixX8DEE7r6gV&Lt+LFU#enr3t%7cG}WMK25E=L_^YqzJ52nC6T_sz{QM(2
zHZ+Xf%0t-{E--`{1V$t)Vlgubg9S1Vi&L2=TXTWQHc&BKASO5@j|z;z*Qlgncv+il
zLaqt*F_6hnxgaL<eF2`PH8sGFz@kVd11|-30`C{W_7pT=-vGQmkY?aP(5G2l1h6Tv
zCG=@sq5y9Uj0cK<NkH2Bm;t1{l{BCU@JArYcvk@10@nd)Phl&t4RANG74Q&{WaN3k
z&cL%kbKpfFtq}@=U4TWvuE0_t@|Vwd<S~!X#`9t(Lw>P<>1nl!7v`p1Dy?*ya9T)T
zN9=3N<Z8KEwb~}NTD8q;JJw3r?3?EH>QE#X{!i_{+XeY_EcSZwvATF!{Ts-ZU6kF)
z7pBj@iOp-(^SI*<-=Yc^F`MAVMamMr!s@MZHdcMCNS2QK!|C&KbO~J_)%OyWqArkb
zGW~{Hf}V3sXd`W2_K%4q=RJ0ev%A}HiW<%xI`|Up>g?d;JO=MuIF51i_671U;VT2k
zj+2A01EG6laDWmYCBz5e`0EnM)D2(1#D&}Z%jTjmyoAp_0nFjGZ2BOYA~}#Q=7#p*
z2DFt*Ph=U_t&6f7Wl|Sqmk<iWJ2|k?MSI|Jot}4GY&brv=gBT3gq}-e3|^t1E`$9s
z2{C~_{9EAcx<K*+H|z!CHbZtxA^GX0h>whheHXbjoOASXb8-)K^z!iV@(lFxbr|F8
z;p{mU<;3gPYcSry+gp_Zjodjo`;7AS@^*3?<Lv0`HHOye%=~MEM(%j;$9hv*nSQ-S
zBYWOsyhe<1@bIa#SFgeBxp;Y^oTxKV;+uH#zJ07h@v+#t`x@x_hX(J=`?%8WkP2A{
zJ{If}i(V(rTN)qXz{LpnLhyR5A_|{n<HJ$aO~(fJAF9f^7kkrRWS!Inx3VggGoVQ9
zg*!Z14d?3yUbX+0{m}`sxMcpKi7?zoVCjbY8Sv4&c&ho`8~RIykBC}!|CT2R3+BQH
zAaUKnx2?eruA$(sT2R6Ue?I|>HSgXHw<hq{LoyE<8I%9xW8<RGNbB15mtJr#e6^=L
z=R^1&K*WEDF9a84Q0*3p8-_?(M47~F1`0Out;qO5d`OXsCoqgJ3w#(jK7!Yei;ayB
zjEIua{!JJ%D3Cek$A`LmJQ`@?lah3wWnge@66Za^*VW6@)yu<qXcww0K3*=q;~mC0
z2Y4sr+m10R!0qL-fG(j{T|&Dk15{0#vYpxzZo5EB4rJgF8=Amhvf-V~8W*)rhxquo
z`nIRiM|Eqg?<ic`5a@|d4x>#DPr%(CxB(P5SW-ABqCjtHoKohSfEyj41wH4uxIlJI
zDdXL7fk>cBTx|3>+!^5=k8v*;p2SDS@M9|P7o5;Q>*d1;))%lEKzk96u?g}}{%#2V
zq76l?l3Y_4CT91Jh`K203;}u--0c}IV*Mcd5Mz%XJw)~H@nOYK5z9ppOzPt6jqeJ_
zbB@xOZt=LfqTUWJJi$dKGO;Q+kt#ULF6=@(N}%cy!j6xSHFUxHSd}x@)f!M#IWN?-
z*f7<%5HP62J$gHtNR<_wjkUGNLmG-trAEdLQl+mC^!Q=M5#Q!jY1Zj^O_RkX(znZ*
zft4be6Z{hHE(r+>XJ6=)hT}uCxSW^1(`kv@Lqx&&B4~VIA}&TnzQSpDE+sUfLB6Zn
zh;V-kyI_Q)3u%?2F}Oh_hT2?$f?aRRf5?^6$m?0jlBi<Tmx1ufbrFKY&AuZ3JCV#T
z(n;><@x_<4MdKr<<J-@$h_6EkMbJe_H=rcrLK*(^5eb+{S>c1Qk+_w_6H_a`MdL=5
z$e08f-I;?j4Ux%7m;ZDw6%QXRmETqrmQQS0d?GF|{<?ipeWoTS8b@6n5TRR!#p143
z#0LX4eQG`qx%FT95%6X6<k0S<F}T>pDVFLReWp`YC%Y+yWU_igpMa$Z;!(u|;Uiz-
za32cpOu_9tNFjZ5T%;P^t&ljm3}3ue<(A5uSW$vfM$+jze^6P3^a!5y5+z1N;<lkg
zDL!$Ffv7H-lxIRx`TWBDE~@A>3g%xrKpBvSD$8|osLNC8!zgYFKCjWAh4RB9=Q_%H
zLZG{sql0^(hl8W5o2N6*Rgj+J*fC?AJ$(bm`Z$jvhj=E$CWt~~`G})JM^k}ENT=cI
zn1ryf$dE|-h_*C@Zb}lxMTSSjD|Jzre9lEnabHmk-CrX_km)N`l>&a(*ImB<;X8E{
zY8RzgXfY(cq<wnW<@*p-d+FRo*_j`Ut#oyL*(XoX8ZgKpIAp3SL(mA3<<ih-G(S`)
z`cknKNBx#t!+9F|yEwYssmp}kU7~w;0pU8RiwE^$e1GD@->}5m{=k6)(JGPSqhvxi
z!6CAWWPY@0m>yL;*)YXf_pug@k%fz#hBKEFyC^47&nnbCDko~9PW-3IllhrlecmW#
zsLQfs(KLQ^u<lpq7vIGX62UiQ89c<Gri=IljKOzcrpdY}`5qz>iz8%LBhAhtae|06
z8|O4FIXJq-nI8gFgV<O36-K!k@h>y1agPy<mQ3}bu1r|NK?jZKiQK}dzd^%5B|<fc
z!<AXGMCx4d{amzT5q|{~ZzoP96e{xod4irOT-gh~9Q9DcF$ouXt8es7iF|*@w=ufQ
ziT_4UU8|`d-x`cas$lquzc8<-A&{mVN*V#{=Q#;6(<2p)qsQB#`arY&I%kwdi~%A1
z0P2p>kW5(HWMk^L?Z@(l!ca+N<Smy;@nP>oDZW{bz6F<Y#i>T<21B@NOeMzwY~bb>
zFnuxBVN6tw<$Ueo>mrpie8HEH`O;@2>mVcx;{cWy_0u*#)-=59Ckw*pEz}GvT~-OG
z*s(T2Z4m`0#K%*|@YQHhS2Au&x=P(4#(|nE(ulZ7Y0#?AXTG6|&<)c!s_X7S6IuGu
zjGwMiqvjun;WCasF-<cGen5gB@saWTBns<8+MeX+Nufw7acKQC-Bc~Y>iAgI8c8r$
z_3PNTSKR@R&w)#6&?o;?c^1er4STUjNg(SL;W2*;8HW)igvK0cLOdS_eA=8Jf?{J8
z{Mbx)zJ0@;s@2n)&?;C8SqSZc4jLm<V0F#+PoWrusXHVlGK}5I#%qYeW0Bo;HtYKn
zxS&tCtNNy|^jSB<iR1WQgzqow?VwZ|*L2kk47CU0<D1p2_Nb<h(Bj6&(Z|14b0V~R
zWH+B)F%F0Hu_BfRUK++oht45jJ<xbwia~%H)E9F**i*FwWN}zz933#h;}9p~I~659
zMDRuLLcOAH!%<xnhS_uDDGx8_LT}u#o9F%gKQRv0<<A!*A;N1oCB^sZ8&5|m0)k$n
z=_u20IJEE+J&HdYZd5}AbV;v4v*+!p{N;NqbhgxJ>Tc?b#0->Gflys&Gdt*-g*6tL
z*OyZ;wLHpSe!fv>|6luAKhCJS2w7;SFXsbvV?I7qLHFd5*Q&WIF8L$z2dg!>Hc^gi
z`Ghe%I9WCMRkF5EmnAaGs#^vr0n%u!2l;qX`t_r50%0fQdr)man*lAM?4X>W{GcMB
z$V_-vS!*Tsk{bSXY_!grwr8WYmefp9^xqcpY|F~f4Sg2eGu)b6p4{Qt?aBpZH&^#`
zKdf_N#{Lv7aqe%++Mik)YILOiE786wu2YY`u5dV+_I>f)c7Hs%A3Zv!xaPv#TXV)`
z$Xn!RMTJg(AN=Y0CD}r+0JWB7a?OyCq0K(LG0;xGD2f?8*(lQei9^usxT)crZ#-!-
zWJIyXs84eZZbs$kZu^jx(_fx(VECO&$M4y{&)fZ2UfL%i;DPgXgFEFDhThn<+q$gl
zAg*F`>gbY-t)xY#a%v8BGCzB8+?tigt~c9uB6mZsx~2Alrhx~_^v_#7)7w9PMr`lq
z?h$^w+DlIl6^9*O>QFvSbLu^{JkiaJ9!9sTf0(;}YR8<zn%kb7+Ss=^w`%hxt)zbM
zxn_&AbXK*=FnoC2V9HGK&}i+|^3Y{!0U=LoMn^>jOXX&z*0Q;tT=1(uS8B??+oooE
zx<-5U__NL4oG;ra^L}>3`1jnCi)Ji1`td>g`@wGFyC$z^-1<@GUi^=r^nk~;(K&<S
zxx6iptdAEvY<n=WWM%2l=(9Jr{!?@3)|6+Fjvvcn`nfC!-&2$ubXO_XaQd}<lfHrO
zy1!hSVQ_!Q)TZ9QIH-3sGSWLaPo#gTOHRc2gL7j=I>li}H$IVGGkjk$Ipb1U_s$tb
z`wnH5TxdP?;DlKQhpYw%oH(*aek@-!C-=|82T!fle{{IX+ME012adS?``*Nx>rJ}e
z)0oq$TxqNq@;Gg9=!#)eq7AbAr%czoZun$<t<Lgp*_`hF4O-tjEpPVX<`(Vw5wFxb
zd@j(8oHRc8?Uis@>Qq~K+ut;!Vy2lEf3EC#>j(eocZ~{1-Vcv`aP<BA>XVBdPabJ~
zd-1-Ysx5c!q%6O&>1;u%-I!Moyk3SMzY#t@Z~J}C9LXr#1Fm;_8kD-5>hAq}WE0z<
z=^74as)HVkeGr~iy*S1u`DCQaj|Zh!+RX{e%e)!e#r9Fen3ak8g-u529Y5Miy>sub
zO~;-beC(X1-iZT0`5)@3G38*uj@ps}o9jh6i#C+?YM)&(abH2`&s|@IJYTnEN`mh4
zX!V_%I_o61hJVZr*NST~o@+XL<f)Y{r{_M(?z#UvJJZAZKQF%dlflW`zaFVBpV8^T
zJ-y<ax8@ChRQ&SY!TS+0bMAJ$+Un%2iCvHW{V;J~Y~qL`ZJzpTFHlTrR(pA{W>|op
zTJzcsvL%t(!S8O>MoFEo%UdNq(#`zqra_7C91YKcgG~lXyN2(0+bXEYV??Cey~LPd
zBd6TRF89Av7N+;W{>9+Z0Y2GzJI`%6UNQ6fff3JYbF9r?oj9?u;MisB<p+JXZ#iVq
z)VAo@a?O&f-N#q>o(eBBx0)VyFn6T%th#B$q!m45dki?KcWBdM{WGQyn);_#tBa`*
zaIi6LJ3H96&lw+aPmOc(Q0JP&@8|9CA9rDugO~QgvWsrV3vMi|s{U}Ltmd)4SI%ya
zl<b_v;yD|xn`O)&ZCo(Y$h^$wmZB!<Cx>e3*ph6kmQQmAl;mWXtxB8IbV7#d>^3{O
zpYMGT?^}DtcITu?iBHYs^4bRyhvE%}{#Q3!q^*2xvhhce%Yhxz#GNO%KdgHBThZ$(
zi#Zi%WCzaO{Uv+Sq(3&gI9V1(#YTQoOv{e48CdP#L)1%0OE22a%=opf%Yy@2lg>}|
zRs3l!i>i71y2tUu1vZ-#mYMy~FH>vjKY1HlA4^X&Os?43#jg6mklN(e%9E~DQ@%Gn
z=P;y4g<n&z<QGmU!O!N4y$a5o`QB4oXtKioxMBL7D)a3HWp<|w&Sl!U*BtM(WXCGq
zYpc>*=x~Jrt~Mpki-JGIT=sdG=sW57F%x;_mOGO41*;8LE%VMOsc62l@WRax51%i;
z^5IQDNpM{Ir^!(jIllHA)4V4585_20Yi`o)uENgZX9x44JEA_xp87wX(M9LV_)xnd
z&n?-@)E;eI*rrqAj=n*k@_OujXtC$7BFQ1~9OI4h13L3|S-4*M-NdJ;yGzPH5s9)#
ze<w?NA91y?jW^Y4-@k{k#;ZJ^Q3umq$0#af$u`v~L7!hg{q0o2r_VE%72O`1d8P1!
z?ZP?7wU(_-^3B^nP_`p$RK}dax;ryEU;2=vv*1d$k=LZ^Ktp+r%T-BP^pA!G@s7s+
zuhq>Rem|{{pH6j1EFDo|yIS+9c=5R$Zd+QKX<oa94pS!{_m9Y^N^~qMllyn@5}O33
z*y^tnn|8Zz#tk#(GLHJ#%*k9DoW1CVPtH%R&ehx>UsHW{#g2mN+pEg{ewL?|ot18O
zB&xz@U61M>bN@_^y1d&}aVyqz(mSgjE)O5tR)l40otqirTjkqX_S)mu*9X+M7VI<)
zUzTRwHFIP4-0X8t-fyh<G^p_Po$o$XUC)c!nfl59z?xw?8xPF1OWU>2!mQUz6RrMz
zTzYg+CfaBndZ=)HQxrAYc8<&R!~>H;JWD=YY4-Ht&BC0*_vvXRl_QN;?bS0+KYUS<
zx&8--<7qCF%$sP*?b@A{nAprUG_)L^;T7Iwr*BIBhvc!dt^~VxJZCp+a*cV$`W=P`
z%U7BFV#@jc>Tl!qaZPY=NvTirwbot_-NvPS@Lnk{`L5WkFu29Sbn%$utNJagI^MCU
zEK~FO>y*iR3S=W<mbuD%XZj>m*%}Ypsik8+#n(c+r%clPN%D?W+g$UOgqbee+O5aJ
z6P0;aUTsP*`XjjFQ@(li)3Or}^ICo^+F>A>v#@K*fn}1T7DbA8CRZW{yF48}J@M1T
zoG4j&jep9y0XjZ^O|x@-yFXhe_r*rzO??X`3*$anET{HAU`l~nOmSM12`63D%d>Q}
z{wTPjd0<Am#@tq3O>;-LFkCYDMzcF}R~tO69;+YvzMYQG@=|SG@dn+YBLegkTe_N!
zxb&obhs4btySESOuv@RU>Ce(X+Z8<6)#go3WZR3c`Wx3~ylt_)>;C4;+?7Tx{fC&C
zTYqjjeQ|Cpk0;YxSGsuEmGoLNaPd!<1|NN=H)zOTP7=MedBesG${!;0Rv+ruda`Zo
z_v;4Op1Ip!ZD*T)X{W~99K5~K`uC_?eeSC@@4NKZD2p9Sc6Rw}Q{C;-L~&Plk6`of
zx@C6myymIM<h4a7%R@;$I#wL(=@Rs@`&8XwmNjNm#b>4+?6vmd8>>B=2lUQQU#ocg
zo8Q#z2_2Mc`j*F;by=R+(`)p!xR<TtoqxWakW~Idir3*$Gh1mJeBUYf`i!mdsmaSb
z3{Se8sWJW2<@4X|v&xgtcS?z__+S_NZ0Uy>`MjK{iO&<KsE@IU=x_HrQhVm!V2Md|
zNZ78P($S}%1r?WUmpwia8hWfr=dkq1%5c$@64%z7Ox!#>`ix3WST^!wNQKuG9W&3L
zj`+K8yPx5avG%OX-WQr9{`RzYK5a4E$*Ip(2c=&#`yNl-hPVH5k)wCSOW$zyzGH{w
zC5+d(b7b6)`R{y=|1xOIqn0zgZ>O9bT{ZBL{{tV<#Cd;)P1rwwt6#rme@trfPxk<S
z=h(^7z4rvBn)ZKqWa`_>zpn3pRJKj|IN;!rr%`2}f9n&T`)gB!=}+uNcCBtEdh*w}
z4V#}!Yl8lK@~C&!tp$HRTWGuMj}rlrzrV<B@#(_N8y`2wSAX8AIkvW!QM(VO(@Xyu
zes;tAgzSKKuFtsFGv^e%>N+&-Mf344FIPC|)NJW_<;{nc>2I&rdi@<VDXDDyfMcbG
zKYYA9@bR#Fd2gmxEZTVR!Oc!@?*BS!KzXTtR7rK%&O3)otBYqH5Z~6=8eG)(TIP)@
zil?_GwX?Ws^m+2RZY$QEP3dv>yqkTS3x(sx7yL71<(bX1Z=GIQ)jU6Iug8^*=a!(P
zE?s=tT<=o6mQ$f)^t`L>ZslJWA636*ziRKY#E;QSt%mpfsjcO+<?DuRU$x6OboHy>
zJFh&KTDjugg}jZ|_oQrC)xvJwrsNOnEn;&rS~N{uGxE62&)?s8z1F(_59wNgqkf$H
z&|q=oqU%eZuTNcg@9pqKv)wd)$T2^^U_t2GIj0Q$W<TB6A@#=H@>#xx%hN)(kDfcI
zP3!pvakuAX7CqXz`j{x|nnu_!?_;*^nvwKJ_9)}-dyRL;?&)%V&+ay}Uhe4qN8jz!
z#wKiakQ~`|w)?xx*N%fW{qkwXmi4PoZZ1-u&H1gZ=An~2><|BNb@mbcdshz(-rwwC
za5K04V`Yo>MRYDX9_VUvO!IG_T$^>vjviWAkvFH(?8M#4{-^%zmvNHXzbrg2chN<i
zU;f&gV?2I!@RB|+Dh8AXMs+!ASF*m^^3b`3UfSP>R-TAeo3B=qd+N@}`=wJ}^-X+G
zInF4=Z{zs3-XE;DRkhq`^kM3|-NP^DfA?U|jtk+A+Hnb8W3OFR%-plmq)l`2KS#Do
zHWam)->vF;yWvZen|F)O@4GZ&y7sWWeKIFrT-+une6Vg2H~&DSop*2jz~`$Uy_hg}
z{_0<c-k3j6cBpdDeSfbd*Cm#H6XzK{`TcRC-x!0^KkXw<jefW3UC$S1H?DT=Vcpr^
zYy5^sf5*DbT(14*!uLDuZ@0<+80}fKv477a=IQ6!tlF44vq!hKBR(CQA#zavX-SRI
z+bY+rp?)oY_LF3pA70wt=GNOyKTNqkt!1;U%ex<H%{-YFbVl>0B6ISQ)@Dy9<nF8)
z^1#G>?r#M*DpOM;4SQetF3L6W%;shWS1v^CS9ZUkA$8BpEqjv@>$J4?*2fg@u)j<P
z+#To9?Wm!pebd9|tM_f)vOwRg-M)LXW|o8xT$XgRXHCbL<xSpp9UQiF?VJUY-pl^<
zTi)F_$mx)c);s+NSsopZU4Oa#`GcQ6|A31x!(0FCtFGww{J86jsTIB5FIlI)zc=<b
z=a6-olBo9==G<x>VS75R*}~*2113Gm_I?;(U+e4HC8O$Z<$^`ot*QsKdS^ddV|}+_
zc@`a?b#h1=yJl}m<)X{`0{RX<JmJsDH+~(vFU5Pr?Y7Tr<(&ox>$uFn``fcV7iTYC
ztSH{_r{(_lqn8Gbdop{Fjo+X-I!ksujp^G_`}916=<S1Ywm!5!aeCgzroFqnwI1pD
zX7B51o%^h6zF}d~$(|YQ%T|j<U8+g4%684qSNn8xTbRQXv&pO8CJ*f4wR+XYNv~d-
z|Jt-|lt)lX$(zMDf`9wta7Eyl#X1E8p5;t0!!k9mQ(n>UHV+mo85d$LeSfF3#)c_t
zPi#M-ReD<Olx@tRJw7_xCTl(8+Shi!wypWR?~cSjywL1wnbA*KCwKR7Y2Mb(eA>3u
zgs}6aMrzZ8K4)K#`}vaca_5&@$B$Umrh4bVJ)a6EH+R<j%VS!|4==B!cXcYSa(EXy
zI=T1zejS!O+}+>R=hU6Ge>^+?{@{<Bob`eYU$oVVbl-Gx^v^@?*>+3ozvib^-k+_k
z)*SWi`mv&FgYnc!KPI+%*zcN^?ap0p3!6JXl{68}nsa>GvdYIT{tlS<X~HwNjA3J6
zcG8?Jcajb({^i=D^VfF{NU?L6d1q4BGcgB$m^S0iUzg9u-f2HUcmJk`Pdc=GJu5kD
zR7vEO76%LycLi)JI6ClridyRDo$G#GV`8Can`s*}+HCQTR$=oBrrsUat0K0S+tFJq
zUd+<aS@|?~|95T%TRK?nH+3C$(@{Jj=AScv-+Q)wS@`IVJNFe%zos9*LV7gprDoF#
zYX6B^)~o(9l=fPqGy0fT^x3wGDK$%;g>37;A#~*y!+Q(*B$wxIt-SrL!|I!53v>><
z_e|M8<HT>dVy&g8+AnK=#3*#iKGCb!N2j``oph*ZcenWa==)Fps431FJ?GZk3oYas
z<3gjd@;?Q?pT1Cb>3K`F0Iv{DdD(|%LqpQF4c-in5nXhTG@5)n$l=N6@TqY_nmoBN
zN~3thO@q0gw&~_X_0P%rF#JG<{NC|PcXsE!x9?Lbf9(7qAffz@!S!7?hEC{OX1#lK
z1vlto$>`KmMbcKC4%Ot0J9yUo`mvR3a!+h)W~rXLA+YHJ?eqF&2lnedv*;Z=W4>R6
zd-K!M_PY*;iHA-rcUY=+Z>na-O;KL;ZKEDj_s{)7^Keebji;V$tI93zo1}GVb2ILJ
zzg0R}iys<hw3#`@;J9}5Q1P-*`Rb=30cufEqif9Yb&9z%>(W=joTprK<)5Z%+rFEv
zU32<Pv$Nx6`^wH6A9?1z=w$BiACE4W5q!V>1CzUAw;ylKc>PbYyUgQ&)NfGE=xbZ@
zxcK7Z){jO$*yb>_bY;ob8)u_$-KqJ<G4k1zelcYq_k=HSxf_&Q<fI{1_HEMs*I#tq
z1MeHmxa8e*>X2^g4!@k#GcvlQFPb+#BBzTecJ9HWVZ}Pvq)#?Zu6S?Qz3fuPzM_oI
z7fP}YO*lBTwbdbmSw~I;49-6$-}7hg9MRfS2M;$n{7653|IM|(-ySh={msO^8uz-I
zD9c;Tc^sl=ydrdPnnCoGVbiDhXFV~zuD4vLcD*i_-R*m=4f|g-TkbSpd&|uZYOf+9
zH48q!4IV!!RTh4wt=x8MOqAwtpNmbW{cx*irP1B#{^9pW7QR3FAa?P|>i4aWoOBG@
zxA^v*J6ozY-B_MtS6Xn^>%prrH;#wD+@3c+T#}=C-}Qj)s8WNTclYX=y4yAx`L~0{
z^q>bp)n~H8AB?q$SzPTBc{2Hm^x%(qVRPDbiM^RQCgPE8p?>1Z<9Z{SbXIS5bZpbE
zz0VyReDc5vJ<Fbl{C^5KI7OqNq;^M6(RG_%Wg8YvtjKQvb7;Z7=OM4UCQR9~PCa_L
z?m8XKoqrhGO5(J_=QicWw^(^<<m^Ye(_4PGzh}1oVN<)GZZ7`$*V`uzW|UVS(YyDc
z)4W?Zi(eK$8Xj@~;Jc1@=fuo9+3M=wN4rjp-Iw^V&5;p_3$*>8);61>2-6&Vxw)EN
zz!KSp+IPX(k<zHzTdm~RoilYGC6yT5{L52gj_<%G2MczDca;_ewR-CoIl^ODOya%l
z8&gJ>-SIECf1npOpmgwyoq5?l6~{N68*$+JOzWK5XD3d)GP``NV4=^!<<=I5wroFE
zWZU#=iRN<Oit*je%fe3`44ZCsRys0wQiQ2`kJz3o4(Xj7a7KUeCjX`nOvUQe>D2z)
zn%X$@u??QxQ|xmlRDMq5`@|aOasE5zc{!}QaItKm_Kkw$ZXc?v7Cx>iyRtjSOFt(&
z#bd)9@#6UzX4gj+7?1WTGdD`AQQVSNJN#soT{3n+&eN7=8960Q=cKKgZJIIRXKrVk
zec})IcG_N9`!sRVq*}S$tk^;F;HtmjhLvd+n}6JB@_5Gq7tzU`iPD!<54TsnF8b|E
z#T<*f=MKmwP0Ieo$z|gou~CJV(-fZ~2iinsi+cE1>uKrqGB&e|e&AyJ`urrV1Ai)f
zr`ANttdIA2{dTiW!QmgwmL)9J%Iw#AW8Oc8Y3awh?5s#0a-iBy`8v6FN|ozLhjXUi
z`&IN9@*>%*>9gPzrvfkW{CmD;=U134R7*EJZol2UYR)OUvI4uza|WG`*SPDh+OecX
z`l@RIg`AFaiH&Q_hu}qt4}C5lJ3h&GOQzgpLAvD5vQ>twD@roFFBI-<{`}#Gn{Pf`
zSsoW$5)hUAw7tD=PQ?VTw2iF{js2RLn76gCQ`{YD?(nnhQ`C+b5CDw7qSM8*$SzcE
zS@xDT3pYOMyQ8pEkGxModn_LAJtQgmYoqZT@jRUa@=LB3yNY~Fe*Y)MrTZgUVnlCA
z^53==u1DJIn8s@u_vk;$C-2o5*YtzQvI<2|O0~^zPhWrj{Hfs7?V@Ef3a?}iowLyP
z!`fw9$M@&?CS~oA4IDftV^rsiow_<XA1)bXUs(`XJ;}?ZMs65gCb=44VEE%}e`Ckr
z9n95F%N3_f6CF}l+m?)2EPkrFjmtTgXPTBa)nQ?~2>;^~9TTfE{N-h3CStD+`nD;7
z-Au*nhH+;1k7jVjnR9G>7G(!7{VB)i#{HUet<F~0jIS=(vEuKtRkyRX@}3<rOV3(o
zQxP>60)Wd=$$#EbxbA*8$u#z%OAo8C3fqS>&uL|1`5)r(TGm<p!0TU4cNT25PFoh<
zePd?VC+D(rKUHjef9G}KpzBqizDwO1mAB@A|EB{Rb%yOqvzyt=%wk`EEt8iWdbsq_
zvPo3BDjpsh9aZ#Zy2~8fkVyv;uY4%+y!r5Hv-c1HRF<Tr?_Fg)@^HGj-ug_%#kAuN
zKQu9)<kHSgu4Q8)IcsTXI5*rYV|a@1&L(4%KjgayUzs(_?p((V^P0&A4R@^n#bj0a
zufCk=M=u-ylHlMq*OGlo-5z?i_WqDE?z<B4%HTq?VsZMy7X4NoAJg%8)iTY@vZBc;
zub+>Q73`6_E{jR<$?QGI*tW`CM{B3Hh3}N+5?RkxJCdI)$#dPdb(v|{iG@A7y}FWD
z`A1Ruru<J8!DUaY&0FR@JYle-=wsJ~b0m^w2T~M87Dpqmn7kYQ)MfC*Pl?mZWl=fj
zQv7TF^3fUa*41uWu1@y;O~xBvER+=XU2gG-wx>9?f++)<q!q`gyPTY$rIS^zd8ObF
zjr17@ntHXGYuI9RZnGPMml&*`dq;n4^+TO@??bgqm;2~$5bNp%j2LRxb&I0?lS?By
zZcgmbA*g+K)82Z!+x;p1xy`Nz1#Kg9-Wd0Pb+N_UjN0b=yKXm9x-T;s;@`66XKV9T
zxr?W_p8mwc&cmg0;F4Y?gD?HGc#z(^qY|gTh76mRrZ*&i(3qj>-ZI<Ct^Ee9`#!e+
z-7~iR+U!)b8GkCxdgbkdeQrhl-nY5heT%4Hmv-5?WJkAZo6lXv6EB$ud$@Pb?Dn1L
z>6*@+EMA-RNIGQM^H@d4?jM6(EQje%6;Cy*>2+}08LKxJ*Y+N;d5>akdj3?u-`*-a
zOvsKa@4F^(c^9*3qrG~@w|*IyaQkQHlpo5IW{x`S^}T_1s~OjWJ0+*aZ%rEBVfl28
z%*)@Mzx+v_XSFXn#c6)5-G_>p4@;j#<;;^$Nqjyr!e)$m<ZHYB!Fy+FheVr5q&;_q
z1wA`GTDHBUI5hOc<FL+6j)hl7rn{D05xJRcYCX!QqvyzF3CUg+As;=>bgsDjANk26
z<Nh|6vuiU(XujC%Z14HE)Bo4rn}FAJMg7Akqo^qeLeU@yHJtI@Gv7=iF$O6?5R#A(
z5=qReG1OdQ*47a7JkLXkp@vq8SxHIFDu@;}`~UX2_mbR}_8p$@dEf7OPo9;1_B^e%
z_F8N2v+oGseE~nQ!TzNpQv<_p)(x64u}Z|l`0&p-=N|3)?bh3FJ6E*L)2xZD<(0d_
zhk9LYwP)Db4p*hy9evtdY2W?c=*Y!mHgvi>g^#N9!liRkqYhoxH0=GW@Ns(XpMAGo
z-EiXmwbUg)-&8k6-Fp3VuN&KYu-6BdaC=aziFp6IPpQ0x^V;5ve$@4L!>iZt+#7rP
z?kdyx-x8v}dsTLO{>zi64!@q2IPcA8?kk>G@~rpb!r+ge%{v(QG-_?XKd3vQzwaOU
zMgAzQ*29o?r5_aynEv?3PZ$09)r{v)TE6+|=YgG~FYGk8yZCZk$xHe*>2lx4yRU4T
zKjD|h)lTJ@o8CCztN4X;E4n{8^WehPv-LL)&+fL^^<?I8?)1&%o~L{(b^5;ZYtMso
zrq@1nvF@<L-u_|x+qFG*V21i)-{}zxvr6Bd@niFK%YT^s{rn?Gha5Uutn|ZU!9~)3
z8r?hSMAqp_$DMc7pR#VIe@5?@1Ezi&*kIZnzlt-L>T_nrMy#4q{kPwz=ca!@fA`_1
z^M<WCF-I&rbMEs&3ubRg^8I>%TiI`!T}{6E<K*XGjT7jJO}iACRN~jplTS=Y7@s~j
zZ$jXom&Un<jTn2V#+H%a#Eu;iS#ocB)%7=r=UhBFYTB`gFIz2*8B@Vq9(^{Y#EPrg
znah24&RW^s_4umAeV(noJ8<Z_I%S%!Nm^ZI^_oL9mpvTry_CD#aB;uS`Y+jL3CMg}
z=imZ4=#NE1U#(oYXV%;;2UD{*yH~um)qmNZZ6kgfxACV-#W$7Oplk>$)ouNRxX*T-
zuO7d%Txgf=ZJxOAm@<dieR=%m?<(hx+}ok^#XYn6dxZYC@9q(|vgnZsWwxxlKe^ki
zcIM0ZY|UO>a^{{FcYMFu@4@FDEypK)mm7N?27o5#_HO^Z=Y?N#uMFTKV?5i2S8O-`
z_7eK}bI<u+fvcbPy)q>0NRPwI*7Qs92>R)GQmq+lzDTZL+Pj=(@wOLZytC(3I&r)9
z!qmxu>ks*?_88pwXePT(_nvg5<3~!5EgQ#B*$u<RgjsoAihtQY|EhLl)|j}_V^01e
z<I9xEEjtY0{4Bp+_Z;0ia=<nJdlyPPZM8Q(|I?=nLTAlC*r7UI_v*ZMEx!m$dUE)&
z$F#Hl%RcY@GRs?-pWWiC8rwddKhyjB+I7Fk-1(|;MdtvYp`MQ>PhB2*`_FH^BDEUJ
zEs;!>jIHAq{CV1||B0Tfe^_2>&lg30bw3b2s&i)YshgE6Y<sj~d;4bPuBa#X-}*9P
zSbFY|9~+iDFd($ok0nYiOx+NFxU1{oIzMmEY!;j}`|-=uZ!+$84<FX{qWR;JJ8C!I
z>gMmac>RMzm5YyEH2l)~N>Y#WUwnFM;FM{7K6#|n`qO3PHyPchG_;JZGcEGo=HTdv
z;!le(Rhuurvh?AJov)`}$qQ+)eO$!16?){=PIm5_AG+&kvxb*1Jxix!8r}M=mnCz~
z>5+$@?K8z!7&N|A%Joj>AESN^U)v($jsKI|vum!MFgCTk`9XQt5&lni>$T@ryYq?f
z*Pjgxn2>vZ9T&C!hkNa}Dxcjr*|~A}u=Q{9DxU48R7<=#CZy;Q_Rg*3Ns~tS-J5qN
zqt&wwBd)jYB1bavvdKk9e!}&+Sz`1)k1g`j-rxEEy4daI=zSH!>NH&UxJ47TdjCJh
z&nrE1_NRLW`po*d%D_iQn`VWsZE)(9Q&!J_?o0lh*|~Ddy3(Ld^JmVwQRCt7&3jdJ
zdwhOa^sR0uCv~~J_3r+nlUfhna>pD`h5Vci1HjlT%x`o|+sW0>J?r{S&v~vzU;x<b
zwC}>2&3#PeJc_odlG5UvCCBT$**0W!=~9P(O`GcZ^G|hG?^!NZEFF@*q<@VIhr0KR
z9_-|qa$@c4A5xEg+ivm0>JPkUHh#56TG6O<=VSew-*-R$a9m7IaILRmp9b81)^Jd(
zfN53vHnlcfy!*|$y_=pLx>Kytf{7LLOLkk(ETM?{ZL2+_YMU<2ocguUpuy|#S`j<G
zo_G85%ZZ)(mf?RbKVXHa!ST}L!&bRiZZ_IAa=6d6+$sG#Mm;GTcBlQTho9-Q6GymL
zJEM0EJ~ZL@%3<aeC(eBlAoe*>tJBc_<2D`q;r_YyRn8^-x?sace|S~B-gNn(;bnhJ
zIKOH@$&EYqFNks)c1W7D;&r-jxvy`SGEK!MRc_U1bocVh^oxD>*GsxwZ~EySVMSes
z=Wp14bH<_)VM9LN(4cD2DLwQ>pZ4|dTzYb#RgWo4kF8(vNm}vagS+qOI{mVn`@?AR
zJ--J&S@6K`K6|86Ws2ZSB9CMMjW3$BD9<7|iQ^Fs@PR)QE=ivb@P|Ja@$Pt!1mMe`
zq8U`#BDkr*V;}%uwiL~#N*BSGK^{14?%@ajdblXSV=N#P{(R(j#d`$6iz?@F4f#LC
zI}QeU@Q6Qx{3Y;?;|(6Z@Gpl;(vJcJ!+#t3NqP8K#iKI(vnj74ZSX!6pu&Fv{lOPV
z9*KZ@@Nb7(954~k4F0FckFS9|a5~hZ4C-Hm`tgO52gD)|7V!sBKfZkOz@bAA949Qg
z7_Kv51RxOp>&TA*^uWyw9+lvqj{1Y}J{W*=v_;RL{<3)Q3BZY>qMPB8@f;6m0{<iA
zcf)&IKzYg^T`60H!#hs1dzcV^4E2}7dv`!B_*cUv<2@P>0)HOz7sY#L0KVWVItTUR
zQyY(A03H4u)Q>O3Ja7Wd1IGo6?uJ_uFbU8C{+E<>{#(Ic8vP$>oBzJ>Gl<`h@=1Gf
zEX)Ik&x<aE>jW4M2!Q`8;z@h(g^Wi<_@~<DA73+gNbsMs%|E`1@WAQkq8s6o_KpLD
z!T&q*lljC4Iv(Y47rwKTb^dX5%0oc>54QQoVHuB_@UMhR#_LN!Blv$qelq`^09D}s
z#y0<-!;ep=i(a(Ne{cBf!@m<Q!KbeP&EbEJ{AB(K&Xh&}57_2E6@JV^(L=WRCu3Rz
z{-tn9`jLPj_-`UVng5OejC0YMw)r0dzXJa`+x+)}A9!7KD_nw4697%&e}ep^KkWb&
z3d}!F#d(+!f7~|zJ>ahm|5~`DzA=Et@ZU#%GM-%kpxdJJZ1evG{1*5x+vXof^gJ5E
zzXvYCr^$ep@V~ar|NH2FAIc~59}Vz9`UP+)Ksvx5{$CMK=06hP4gVC|{11d*g#V;%
z{^Q~IgMR~DGGAi>q3}OMelq{>qyM9}`Hw{!U!-3Fm!uyB2!{U-@{{tS0F~kY+BW|~
z;aB1R**5=)@YjQX2i)R-iGXJCKSO>ppYNmp?``wn4QZ+){Svs&fDwQ|_-`OTnU4;D
zO7PFH&HrHdW%$q9=D#QWb>ZIvmyG9lKoj^MBR`q{_tF1Pw)yXlG_{a^4O}wbqX8lC
z-$Q;f|D6F<;h$@p|6%a!@c&|)|32_Hfd4zVB>|HFE#QCk5A=Tk<&*Yy1yn=&MR1(}
z!vO*CUqd`;PkTT`_@_D0|7qL&Cm_BK;y1x1?HvaQgZ~fYC-eC}`v1{3|8YoD6X{pM
zCFAuapb`9ck)O<eCqNbWzqQT(=kROrU$V`AZ}{uOzYA^&z*m6g@V`KQGXL+R|HHQV
zk3pImNWTm&Nk0-01ph7MC-dJC@G<<eZ1X<^eg*#Xw)yV`|EKV8gIf$R0nilwKarpG
z=Y8~l!Z!askft`$uY*hK8v|$z{{!SF<7ub=`L_AD)BhFQ{3jtzL!{pew-jJ9pe6io
zC{H&hs)C!7Q(3pt)W>d4o~7N~sETe*uI1bUs48ww{+@0wl((CcvzJ>ns<NAtPZ_tO
zR3$ejkMeHADStHG)6E(Aha-PQlHa?uTM?4qy_{QDl0Vwh&6VVL@p5BGe!7fX36j5f
zdAEJm{P=RX3}GqwcDE?yPJM(gl8aHU`0m&R-z+=hPE;r3n`KXYu}uC-8|lm7uFtag
zCK@sW{>tO80{*=5R}p`e@b@wPD&wyT{`~Q0&u@20Irg&3parBndztofN!gyb4H%Sy
z*0`c&?r5b4+W8UMSOV=TjXV`l(<k_@`BU7Rso+lIHn?*u6?dO5q7G2kC})rhd7RJ}
zYZ;`UC6KcszR_lIXK+{Co4Jp2avJXB<m}|)<m%+^<l$7@$<xW($;XLy@^^|R`Eg9y
z_(<5t_-NRNeA#7upyI<wl2D(e84hP|Q+oLX#3sh2_>eQ)IQWd;p(Y<}kx!d&Ry_%y
zS*G}O!>0u(?=SH&NwIMS!V~d@SW4H#hWORy9%=D78jIM3J~2rt<fp}b;_=l1s)>n@
zBZb+&DJ6%_$xnlm51??KJf3{zZm(y6^&_rS@?Ebzy{#1Vt4At+yBR_szDc*0oD$=M
z-}J_>h{xcDK3iY98NVrQ{n*JKmWr=n;$nTQQP#$$l5$9Qjo;k1b-+04Ya5ExLA|>r
zCE^}8Te+lj_|0t6(YNie$92Ou3AQ3qj8p0;+a71+t6!fq6rZj4@QLe#pVjVO-)IYI
zgFRj0v9wlUkF(E@z2bLcY<z-e8(~tGee7+mvBmU>L+@h~V#p7Icf~Kh<HMjhoF+z7
ztlyJbKXkx%#I|tj7nHa=6KDPHaX97v?(3)CIGl`fx*-HJ9A{5Y>hF!ORuk|$>^^V5
z9w5EMH}$)}!2)LewmurJ>l$~;bsE+MJoY%Oy2c#_v51RxhyzEant`njMBG4I99H!I
z^y8Y1J8M^4?|(hBzfs|GZ1iXk^uL7rzE@%`wLK&{68>mg7>Tz(<X$ZD?hh!KhlE8U
zT}FX&oDr4@|LOu|ku>(|3zk(dA1Nyt>2e&(%7g!DfwD-NzbmU?K2p|Lr1M+#t`DSL
zBK*Msdml-fzbmU?K2p|Vq)T%sYZUw$1<E36{;sTo`AAs@kuJ-jtZevm3Y10C{9RcE
z^O3T0kgho9+y0O|mErfbg^_ssQ*hi#o(wF7ncw0Lir3Z@jUw97o_HNy(sk^oZsT`h
zIkY`KxR{UJiO@f(S6uV134PiobPZ}9K~*R3KGxva2GuF&5PaKVeDda0C~pH?l{_#Z
z?Jqf7+rIEAoYnbLs(C_8N)q|HumP&UB?<i#z;dzPI8{mwZ+T+eh{l_8b8a7X?Z4Bh
zb(`QerOxHxpx30(Nzv#2II0yZN5&vXjzYekVA!cq<U{wUAnO-;Q8Cu9w4xGm=>uUv
z{n8Q=Q=>rO;Fz&dVAbTim--CffNqc++s)|z3;ZWQp5FnDgCd$?aiqEcp&F#&gIa_|
zV<GpQ=VtZ$_U=Q{Qdw@)8ImS}a2#JKb-1^1zZ+IlgwZrUHO9Rkc0W4m8yOTp(&RXV
zk-*%-VGz1;&vl`&FeC46hcFVD=MV<zjmk$DnQJn@zL8-hh@uYI+GY(i>ToR-7H-tx
zfiS|;ta-yDNmj4I=^{x&@4{h5d6f%=S?}NQDI8{`qe<8;)R98Q4tJ`rbf=1wu{8X?
zDWp#S)d+)Y3rihnO-h9$+~}J%?O=k}Bz-i(2fRy9!lCF>)Om#0D;&;}a2N1or^4Y-
z?5#XL3q0Fa@8H3MW4mE0se|jm`;GKzF}`5|##kLG6xPA$+p&US5!Q6sg~F`qE+A}o
zG1Oyp%omC!?w#4~Zrsss!zrVkKHs?;>x(UnBk6dA6~H~7gn4ASQ#&zWwsbJE;K_EU
z{7D_QvGc#=ZrsUf_{lKmxKp_py$0P<4cP)hH}weF8sIyw*i>tq9w7``tvzfIDVFjn
zV%*EwASE>=#+Nq6nXXoZ@+*yW)-a>(Mp}n|uWf71F`G;Lfy4c&wgB?j<1ZA5pFhf<
z+6X8ZKeRwR3E%O`pEz&xJI1$oT{u45A^&q{V@luVcZ}cV^5OW>L~krm{~3q!Q~n`7
z>mTA>D}A{9O%*>JU-}>7yZu9alJ|$p&vJ-A;?V!=Okkn$ag1Ni7LIouzm?pF<5OZk
z9Dm>+;;V~RHfhH{$NCTcLwxE##Fvw-<zKgri(~m&y{+-f;cf@m+u=A)u6+x)vml+2
z0X{wKUEV7N-W}6@GVsIYtWEiFyp;Ok_^$tu|Di*?<9LLOFI>K3{487i-;Jj*C5Vy$
z<gt&VWBvg%J{%u1vv7PtenrY%J@3QuQS%GOJMt4c^TY8k9pWA9&)--$zhnOzZ~Jh(
za^S=9y?!bj@7R7mw{W~;{Yh5~#~*ay2i~@LGM0CLeTTD-<;=fcxEx13F7oWd@nxTW
zI6mzk;`chlJGQSF6HL1BUOY=<KOBERC>-xN&JE0k;~nwfhE_P<aeRC~D;)3G{yPzc
z;~n!abclD%f2dvI{EqRp+82&@>|fWOh2tIZWI%l3c*p)v=w3M9vHrv_3&%V5@B9~q
z;~n##T=e1iH9I~WUt(wBct?J|D$5#g=VO~4=;Xkj!tsv%-@L1E`Ht-$>QKMq_;>rc
zaDK=5s}Avw<ujKG=XZ=B{SWc{`48ux>=5tR|M*|6`3Vh%;Qf94{x@4Xd%R;gn{O0u
zha(<tyjeKjv7gTOKODc@*J`h^*Iy71hY5|SZvf=6$2+!<^Di9lSpRdqaJ=I@)--=O
zev3nV!S*HeX+#YLL__beKPKoK^`HZ16bN%Z;7&y$Y~tQ`>E<1Dry`+`CKgCn>w9-f
zL^`6!*q<K|Ms(^?1@hiTSUB=NEf7}skUMn{VSo3mJqCRTd0GRy0d@mc17-t81JVFA
zfIOAZexfsx#{*$c(9WBHi-6;RJ%E(}Z(I76`%oU>7$6t$1mM2kovH+=3lIUJfDVA}
zfHc5Zz)Zk$z)rw%z)ip$v~wb0C}1YaiG~{vPyv1bZvX|j{i8c|4zL@r5HJ%k9xxCP
z4~PT=189IRzzgv52h;(`2J8l;qx?RA&VVKW6Tk=H1xQ34u5j}(4i^CX0h<9!0U3aF
zKp#LiKm=ep$_s{@0e2vvGoTrO$DD)%`T#}%<^i??jsva(UIV-iqi+Bi&;rmCFaod=
zuoZ9+a0-wExDR*^D02j33kU>60(t_50>%Tr0W1e>2V4aF4tNbHe$<_+4yXsv0WAO>
z0Nnut0pkI40ILCe0LKB>0nY(m=t~2D3Lwt~+uYX$URMTq0>%R;1_Sy4q5+YBPyi3`
z15^SO2fRkwJitZ35x{1^JitW2P(U)E8=y5H1YiP?#}#8$9`MLk_b3XcuH?9sv_ZH(
z2iFsl9i<@S#>PV7;kYXUakw88_AA@9np812+^o~AYigSPB0S<JW;}9n9rclWB8=y-
zx+CA0ZlCq(UGOGXD%=^DAr{C>6F<pIE=WwkJwb7)$hWh=J+T3}oi->jDK#z>#x`67
zv#UUy?ao-_SYr!)dov}%Dmeuwr3T}+Akwagq_-{1aw&AXEEVobZiOPzxEqMH$9l6P
z2_S|^lvIxN5SJMy;Ud66wtM)Bl9WOHu)))Z+{sGrK%=rqSevw1TT`i}F65pk+!dRG
zy@o~uQBurb%g1J>K+2DZ$N0zEYoT7c+D0`z$+(3HzXgYOrsC>OYeMWvyerFEA<94L
z(!3uofeajkUMIDK2{b6aYYKIhq>PB`olGvWM5+?RZ)>}~v?T@GiZn%>f{mMkjLD&@
zlNJ`}*<4Zr>2^SDEZM`NsEx=Ug9}wt;^HWU#FC6{$o|z-w42=EQgCkOIgy06k-;x)
zzQsK<j;Q@>C+l68&Ed7;V6MFn1?FX%wG|2EN+>j@J8Hx|ssYs3e+{?ZXNHoSHfr6X
z(OX=;L*Z)RaG0cFkS$3ClKaYRz9r7B(SKaD6&yshbNMV8#;&+_#;zQG;l_#dzAKq}
zsuxaO$Mt&GPL;$3C-w-#t&S9R)EVQ3kxs=$oZIl;C-z;+lO)cTG6E*y0BWO=!WQ&4
zp~WQv7aOLMJCAK)*z>TBn6*U&wKA#Txb9Z3F)tJ~20b7*DaNH3D2u+gac+)zu=gUw
z*;ZU&67u`Fw24m|V2>N@G9WdX+}_zefLcj<glmM+q2_U*(iqHkk~6sh>}?Y%-sp7@
zRn?hbytTstR3HfrNs8%*96yqGYw@k)V$xtSB=_Bs4a;|>kc$WHT&At9hi#IuFB_QB
zkKAuv%7&A+%Z#aC$Os1Z0=>pj<z2`a;{H$c)71sx#2b{9NNzwi+qpwnU_u%g5=EUw
zPI9B8y(G<+A_Vt!1yGHH!)(n+A!FDG_gCT0KQhX_h~G*W#^p)@)F=|tGC8h~EyV)j
zNA*UuLGu|T#JJ?wmW7HUAwdSawdI;pIE|67D+#mKg;e;BZzC6Bh44}V!EFP=?aib(
zr-JvO1yF558#S{dc}v`^6o$*Pai1<BN5W5&$UT4WLMkD|+MF<QgBSL{F~f;*wlNq1
zE{+@dz<gsH4UCDy)o4k5K!m_6tPF%Nyf?b5TSQz6E_Ab!r@<nr-Y#LOHh!6u5`ufo
za8p+}SO}q|`mV+>;R0mbmxj%in7ANZ3Q8*ah){H4ZW|U$l`Ify<zon>&XG_nz7ozK
zkV-g)u{Jezc{dJint?Pz!Evb`Xi;!nw|+f(;3jBWOZFILkh>xKC5PdrxOP+z5@KB$
ztlSoSyB*3y>&QNPTx>W{v=MH58)TGBMHGw+NkpVIJhVU?g0P+>fN8b?CSp(n`oy-u
z9q2}%sZ_U!#MFR9l#LSu<Q>%;_(Sz4K0Ag{X~bu6-DL$ic%y-6-x}A}X^Efp8349L
z)pSDRzzPaiNl^=3n#JKp&%cDb*=Wr%;wLxzvJ#Q>cCDd~5b6%H?ua$Ry`KTpQHPLr
z)P6gSVLIATpOEnkPQeXd5x9=E9i<b$F;nDrRu@;oRmt)j8=e4vXSa6~8j%z+*totM
zH;@`@jxo2Lob1yak@PMtMg8j5j$GeMBB@qRWKYqCeN=bH88yaiF==-|P&h^1xAve<
zDoDX#F;ojfQV2>if-t_E3lJ#T7<{Us@ot^4vPR#4_0~lUDgPuPq@8a=rh(>gLLep1
zx-ucnOqXUskWAkCBS;>jgILuF3Q}pnRNz2DtTmK+Nm7uD6T$ksV%={R6b5y%F=o17
zZ|fLX6Q&~XJt9vu>eD{~H}drcv9;}*lF${W69TCF?}=$gnT$TQj<fbEr@(lS@%f(A
zZf&h~3aMxIUUtCshNR6PVuIKdb&b?vqu;l309xfja{Ntr7zq#QmzYQ-7J>#y8{!xS
zPXEjW96z}qE<OkSzFp&=|1}i(SG%>tm6@1;HaLBf7-wbujRsP;ZFp&ygyMloePRun
z6Tc5f-a`^ntoN}Se7TQf7|Q<K2qQNo6GVf|TFBpyO0mye5Y{RpRa2u$Z(25LPDXN*
zF|y%g#HiXNyudtJJ4I%2t|2r1UDQI7$A;DfBe5-OjJFk0gCLGuSyl?g8e>SB_*ULF
zu>LnI4#Zl2aDk#;5kKjQP5Q(zQB$1^Hbz1NjpHs@)pM=X^_C<=17i%akGe+cvP+$4
ze>LDGIRj)DXkSBODd_iiZQV5?HSX;i0}0;6ipBQp(rM1R0cof-|M%}dF#;PZ?hS5n
z(|;Gtfp46UpMc|Yp}^S?$GBA)d7Z0gZ46%W%d5UUtJf`Ok00}uzwt`SwTBVc$88!8
zy8iv+<n#C8{}k$se1F&Of0NJopAtF5ld}RiF-u*q7UB@|ztijV50A6M<6?X4y(Q!R
zp)quv|8(l3k8mOyzu9QTx7)t&&L|a}!-DVjx`^w4y70LFSN-;~eQ;rl{fVy~Lf!TY
zq3|mJ_MpGG>8C=d{Bt2VuZrKiM<1@*@FBcS#9z|>M*_lw|BLxCJ{f?5<6iLH$=Q{l
zFSXbOXIVxJ8d1&GxTRODFAJ7f-Qn|dUy?WfVd;ju9O?Hhy12;48vU35!)@ok{B7=*
zf0;hOmVPVJpICT(VI}Iu!rKcwzQ6oo3yd7C+$gHm#m*Ofs4f?KUi|AZkm08<T+V%l
z-;Nz-Z`ogp{0|0rzW1>f<n!L=KUmTK?Brd$#l*&S?-8HSvsYs8K1s=aAqn;CKVaaX
z!Pa&M1O^2+3TYe~)}(2(<}F%=w`$!c;<L8xBHJ6smi}k=?Z4Ez_o9cVwb=KfhtGeh
z+W#?`|Nns)gs0=EsR3kYy|6CO5B?dxusz;L&m;Z&fUGn2y*E-mS?3C_bp_u^e8IHD
z-)}bg|L*bZh4a^d$~M;*F1ee!9)Jh<+x+$%<?-T~X#G7pKe(0P7vU12EEFz5)_Azy
zaMR%yfjb*+1-Q%MlC?eyt{2>FxNm>c<?V6XD635`HOi*N*?xW`>g_K{7;DpiCLgM#
zruRYHtNOnkv&Hb=to+Wu8~zhM{>B+flKvR{X$9hQ;9pa~pAUaJ(%Z+Kj3*gCGM>c!
zr}2#KX_XNgSOVGx6TP$r6dHejs$e*Nz9PjITqr!bKt#dx$ps5S9}319QEk#-B}=sz
zStvfaYr@~wMZWqle&PUaEBLIAccG>LhRt)O+Rt*Oo=<h9%1m;lUiNh{z<aU_^?H&E
zRTb{XfE2(TK-MT%YA)?ejRLH??m~SANPpu(MF0{IKY5!gH4L!lz6;eIPzPbP06ng_
zP+pf^sCszML%H$0-a$0Jr4rqpsM*I{3c;T*T&SHXu2c>{Om(Hg0e1J?02k`k5?AWv
za#w1^I#=q{23IO{jVs0Ma;4luT&d}d8<m}l_l_>q#85Y?TbLWZKEjR%fZ%!~0L+#Y
z4<O<8IG7EoQGhW8+*Wu$4LQXQ@vaor1JE6i2<Qdq2}lMc0r~*?0nz|yGBpS=5HJ8x
z7G?d<dz=mW_5tZbyrM+7h1=*vkwfV)ygP)uQskQ`1g0m#1&d0@RtL2nE=hmHh{DU;
z$4YIvZ~gWcYk0oh`_{Elr=3V0!ad&;?t^f0UYL9`YJbE}i%^*b(qE`ogmQJZ$HIQm
zpa|8WfZv}fLU|QP?}wzMPvoq(6NQPylZj6V9UsWt)U8{$sLPixQ|Hc|qrUs@J8IOZ
zQB+`HAcfxzq8Nsu>eQ)2d3$?PkR0$?FU0c8Z>S|P){^f3=N{@mm+k)lwtNrXydgb>
zgO>vTiMMdL;eXpd#J@&7$@YdUt@i)qrEs|6x91}@Al|5mWGeVLhLdva`QB{ZOY*(h
zx^(H@H}Jq~eJ>ooltdTI_o8)2QpNMu0f8OxzkO@+KOnFp34eY6f$>g45L77N6Q5cn
z-x6@Pa_g3OdU=xn6jkdG!e8Gv!fP4-DdK<E&gcG3knKe)CLn<6&<eOo{s#nfC=lMk
zi1lnzDBly$a%lP!pK?o=c$PzTsL<0ZuHWdTp5;;A6CdN<h%H|z-*f-c=ou;fxqoB-
z5d1YpNI+nu(GC)8eSZdj!FE1DXQ*<dbkuD7BlLpzbr@I@i}&*A;$Q0vU`XktzR=c@
z*7`hAYlr9Xp+3AfdEV+T{qu^8^{k0rlKz!ny42`jEdEpFW+0rzqV5@<)Zf)-jG?X8
zP-ARS6Jw09b({kj$NGFo2aGu@w-j@R`84KosgD<Gw1$)aUJm_xK~TYpBOM5i01VuD
z0o1XF178B$IgBSk#-)2-+i?;vd+qOA4UDzoE&5%!e;|aHpa?rX+$TOekXPd!4w>PC
z^G8U*is@FD{I`QaBQ`(5<HGr@n1BDi)wT7pKtGK>6MtcPzi%(e>XQF9u#KzLk2V<9
z+3EKFeJkd_vAV{8E4JF_kzf*`8EbX#@;$*w;dyPi#((l=V5=2}-r;5e`g>cStyF7W
zR&2HXe}|ie@>wa6kUS^=^%!;8Y9h6kM?Y<IS16yA0^d9bv3Ib}lR<Ta3Je-)-0CfE
z7RqO(K;R(ZEw=jXR7dI~Jm7ux8JOR`71Pn^W#RftGjDOzp*}0^5#+~Q{iT0aZeX1}
zWPH1hJ@*fL`3zKUou|K!C+Oaen}1s$8OQQu91YxmH-F{Ukv9BYec&N>T5lcTS=!)b
z&;1MI%U|<7F(}?j>*dHhRg?7dE!|u3^RM}=6mO-24xoOJe<8ZJ(gW$5@w^=uE5#Fh
z2N3FCy4U({r+X6qwz_xYX(x5tYD;k3zVg0%x7Su+9^M80tGBo9{8y>pCHnt7pA)oL
zGF#;Fr?Nt=lHd@hjYdctDvnB{`r%ZLb+>?WYL0sid;nb`J*FCOanL&wsP0DkxBtRF
zhX(Q|wCmf@Gv2%zK}A5?PB3z`gF6`cQ>a+v9{^t>{(Rt)64MZ4_182~Cn3~_8bl?b
z6)AX&!CP;%ryo+1nj0W22ssiE(+lq{5IPWXK7b@!`aXCkrT0Ue4?;;fK}HW^5JKv<
zrX@KOY<c62wD0=wLltZ{v8=p%Ts_vKzn`GLBdJ$Le}}(|gbZHNnF`10S&YCU$_WEZ
z#^cQ!B7GNpoKeOilmYqKmWISS&JSYo{CCYy@wf9sdYTA`G5Vj35l=&Vt)pLfX1XFK
z!4_j3w|<zZI7&8JX8)J&F+6-PzJ%O@(`OGH$HYiP`a2FMm^?5R<QYMQ7pgTFwWQcu
zMCNReLk-wtcUpilyfJ1ysn<pwBkk22n>qhx+^y}LYqT@}z3rSw1r}&$SRqU;I3EAp
zX3VI6pi>cw#ke>d^PEnF7}!auA;}nZg4aI4Z1QJ+9P!}4lTM!ickOigAzJE&+2~=k
zl~9b8Lf(fPgf7Ft73{Q2D4p<(ca%xywm(XXLyVm&V^Atd)dQhE#@iqx?p--#WZqY&
zkAa7227Zz<QlZ@vj`5B=1fopBCmgxPzvBk)=Ky4u(t(R}sVA7%yTGH~sGZPKBHS+E
zS1Fj=9tJ+AB80>I<98k%LX8iD?Gp|ccf}Yq@&ve-XW-@tjA=nGSrGRe>nK2v|AGfO
z;uosJ^WVj1{vN;VIAq0tvO2_LzPcH_op2Vy`Tq@PCToa&MR`XtX#T(GH|eF7fBPBy
z+d9s}N$~$Y|C>etI<u=2?wz1F(7(}_nS0D)b_;uey}>?U6|NcAk6XxX<F0Y}+$+wL
zuf%`KD|{oqE&naQlRv`e^3Fmzp|Q|T=pqy|g_t5tcTAs}-<X5NCgKU{j+8I`DN%A|
zxwb6IfpS-Qu$&>!mb2u;@^A7(xsu|e)K@s=3uUSDgK}2+MY*N?uDnt_R4=uO`nft<
zoue*Px2k*9v+5-^Uwxq#(Mo9LwaQv`jn>SXs)cH;v~F5YEm`ZYjnkHBtF*1!_u6^w
zrk1Duu9ef9>238Wy_=q?FVpwwNA(l>&w9T8M)$D<SbAE%w(PfDvtY7(C~6MIz=JMH
zd(j#lO~=u_=xOvEdLzAq-b;T^pQO*zx9CUo8`_nr$<$*c#=?X$&6&2$8s-k;!FsaZ
zYz?*nE3!ds3${I*$*yI$vb)(s?2qhy_6hr%b>}|e8ggc?G1r>w#Km)|+%Rq&SCp^K
zv%JW+;8*hPgiZo}HdI(GoEB~f?xymlTBe4k#-`S$4yHI$vT2BEsVUd=o9Sb7HM7|q
zX^u7bGJk9S-h9toM64{TVyGA)4iXoOhr}H5wdf`llRlM(Nt2`%(mH96bWqBcZc2Yh
z&m||hgj`<^lRuNclBdZl<(-(1^YV515BZH;Oew9@QE0`ageq;6NF`oLQKl(dl^>Ny
z3Z<4%JFBs3Pqm*qSY4rRQunLp)ITvNr7<HWP1l-eEwwmpp!T^oS<BRxX&belwHw+i
zt%lC)t@L)7haP%wJyjp5kJQKOv-C~+PW^lRn0`lpt-D$REpe79mKBx_mhUV_EGH~y
zEqRt_7K+B57?>L$x;7n3C(=Xc)tHqd^l7>jQ{I@1rp!oY0h7h#G1b}ntjacLd$ax7
zA?yftIy;|T!ER!AuvzRmwl=48!Q2RL5x1P%!0qM^a6faGf!8lMXTA(yk*~(nyqOQ-
zqxl|uZ$5?pf}hOK;4}H9{9gVLf04h<-{W8N9|={3V4<ZDA+#5I3#r0D;d5c6FiV&#
ztP}Et`lfJGyeY{v)ilSn$h6+{z3G_gl<5Ly?Ul*dT-;pRT-jXTte88SmzocnkDE`M
ze>Pt?|7Lz{b`ssiVxm9jrkglG94d|wCyO)01>#cijF>C_COS(crLs~*sfOeyaZ<4K
znbcA0Bc)0sq=lH>qoB3>(j%#=++6M@_mdaNcjPB>aiyLTtb{2MN=K!uGEiBiY*fBe
zeo{^=xym2PQ>D1-qXw#7)dY2bI$oWrZU&_tQ_rZss(ETrt(4}i`DpbuQERL91#N8v
zWu4V7Y1cGYy{KMKZ=$!<<Mdwo68$Irlzv%%u9vk`wA8mKmMBY%<x9-vKFf8?A?VAW
zqM|T|rRj!rb9w^3fL=y#qIZI_vgu2ps|WNGx-8=ZnrhCpX4)}bm}F)EGlt1vHZk8b
zKQccvxy%jb59ST?5nGC_%=)nnS)P^HKsJ<Z$wsoB*jUVY3Oj)Pf*r+vg?ay)oyRU>
zSAmo5WcRX1*c0p-_Gk7t_7C<cTa60^4R+^xaecXgz=yB6Y20iBD>iY(`8wcl&G`0w
zPktDGiNDW3#f*Ckp9r4{lCV|SEgTk(3ulF2g@?jZ;f>&78fqG0`pPuj^sQ-`X`5*e
zX8gFRh?zB8%>B%}%qPr$n4e>AWw96LbEddR+$o+GcS$FtpQX#7#+OpOJW`%1Zw3{f
zkUvraly2aL^Od8DyIM&NP(#%&YIikRU8-(Sx2b#7BkC#jyy~X;X$>(ev085p!Vt9^
zL!3&l!ARbxpMyhHVSE{yk(mglBh!QF%S>RVGV_?_%zox5bC$WnJYy(~V?~x@Wj2Hj
zXOl5<BiYI9e)cGPmc7EhV%u`#xhdRSZW*_aJHnj-ojm2<aK-p?d_&&E2V#V}gGL7N
zBl)@fVtzgU9q8j%(8r&=r%*wtA=DS5g&v@e&xQFyb<+;{h<rxwtoBxYv<BK}y%qTG
zPXsTbt@|h+)AeYMj}dZ(i>9jPAoC>iMCn^;yW}RfkQ=K{wORUI3sI$)1BV*Z1DT;r
zIx~tH%S;4@OlM{@bC^tKG5WWfS<h@{wlllI4GuC#m}5*fbB4LV<N$xJGq=GZ@|j0M
zAI!`I^9=JftWK5X>aw5QK;~sx_LoECW^!veQtm9r%01;|xxYMA9wCpFC&|<0Z{$pQ
zsk~a=C~ued$Oq*g<ZStzoFiYAZ_D@PNAh!-Qrwl|N*TplsjB!Ybqy}6DuLjnEkJ=C
zlxU^9k_dh}P#LC-QpPJ8%1mXBvQSyBtW`EEJC!WukaA2prCd-hE7z6Zlzioh@=|eD
zJ=Bs|4=aIIYpL}>uT9mqYA39YBh_*0WOau6E!M~t>Usk|zBlMMN4<{K@|pTtb=69O
ziv2*tWThOXjn^`?nc5s}p|(O>uWi%zfToXWrwyvUt3A<PXij=Dy`1i+*ViNT4tliS
zT~E|g^g(*MK1QFU&(P=Si}Y3C+`IHc`j7fa{gUox@v^9vAj?>AZp>*q?x%uNhW4jh
z(QWCD^iX;@J&AU~O8Gq~Iggpb25>3Bt25j!?hnp|_u^%~B_xU{z7Ic;|CztZmw-&s
zKnNAWg?Qm>VY84WoDeQxP4qHVHfg3HQ<!PCX#wc%f@!3Ap?S6WJM%TrSRhuw4DoAm
zo_J6^D&7~Jq^eRhc;q-~x>Q51hdCZ1kC&%F_Q;lh!K^*Rj1^PLD%F*?>Nna3^u4Oy
zKo8OTVrAN?|Da#hOIR9OG|O@em4W-vfO~alh7O{q)4S>Cpr9>m1+FqTpL65A`3(M3
zK@&oR4p<ZJ3x9w&c$i9<%9yH~YMbhrR8s(Cqqe4wrf96={Y-;R<4u#nGZvdxnAU=4
z955XL&nRndY3^d~Zysh|j<w;m`3hF{QeueMQH;ZiFj|~|-W?Ku6tl&m###_0g-Xq(
ziP98lru3b3Ncs^g{3A$PZt_RKXj!(%!B`6h0EdUm8{{3p*^}}u`I+pd)KnNHR6PMM
z@1%XK1pzbKX^Glc?Hh3Uo!UX|ly*;ht$n1|(wpk7^^SUio~-xRC+joyx%xVNJLdhA
zejTfJXENWJlyR4oGkuEg!JK4nGUeDxY%R7PIJCkBV>NEgc3`8yVaBj~*wgGywiY*?
z>ks*HJ%7vKudn!O7`tG|kg-C4VW==gm?Nwd&InPEZw{C%h)cv~QU__E^p&(j9;U2R
z4k#CuCXg{MX{z1{czItRY}sh}k+fw!&U?UVOb?>>&?6aF_A{&k{@hw%*)#qVtkvHO
zHBH?x153cAbFeBuHMyI;%+<{e&6+vXJkq?={EPW6ICe3yqUbArCZ>zuqW&}DHDHss
zq)WY}snRTIk+f1eF8vC5>UZgx<SZAFtIB=kaq@CSP#dYk)LH6I^%ho8PpzC*8yru7
zq?)EJ1+C?1`I@_4Lif@?*2DBPeV9I0p9-2fqd(M(T6`=POEb$tD;;H7>8Kp!9tD!m
z=b)l5>2dT|^c1X|+4S%9c;*D|GR<J`u`Rd=NRx}u&yoBh{tvz^)+<F=A)FIjfPHJt
zx#rU1$08$!K|)+CekUFmZ;Q`FPe>EprD@W9X|r@zDlZR{r$RP=2>d9fNLYi`Dt>B+
z+6HpLcJ;XW9Jo?ZQ?x)WOq-$2)eb|x{u5Z@rWe;M>eWFv6ZH&zx;`7d$<!C?%k|Cr
zaoyJvYZ+ph4XN$|nV)Q&9fIRZe@s`S8_+y@76nPJ62pQ!{KRN%7%-(LJB9V*HgeT?
ze?FCeAjqaj$iCwtO&v15F?|Ax&jM|TVn1;+=sZWPD9KVQ$hotnW70+GI#vxAr8hY1
zTF5%bl{|3KvT9Y8S0f<1ra{g*0Qts63)Z3`s}2GO%rhvTgLImz57Ecz(}3ff^^5vb
z-NWJy`fp+R+_KVgnY2F_vM8J<bZM-ywV6iDU}iX0pqtE}Odzm4h8=_z^a5+*;xHFa
zI4?eePXeYt<BNfx1q)*#Kd|6l{Y@hwE99F>VHL_T&j80-CGHkaiZ?JT#lf?_lvYVU
zK|ZJ|*TEVz1XB76$mmz)2XZNeRa#>WnTnoWhOSf*YeJyfQH@iFs!>{3ZMZgHJFK4r
zPi_P$>~qUx=s4Rg=PkLG-z@o-7o-pQIJ*wVi7o}KT1>A4HXWdk(#4oMj6V~{Ok%cR
zChjwzU?v8!UvM+I%6xTjwkV;uX#%*`G}A1|I`bjjE;Fq%Z8H66$~F}@>*glrA?6><
z7a+~*z_Up4b8)P=514iXoVbS6Q1X}BOZ}y<r6tl<=^Uu0j;w%Y7RsxzlD?2#RZsO}
zwYJ(o<y1-4)nGMDZGjnU5BVoS9i*nKyw)E5>j8-;73<eg?LJnkmzuNgp)>k!y&B}s
zC6>L=8z3o=-obuEQT1tww$Lf`V7e`Mbys1CFkYA~EEd)admzPK6P^oIOspx?^qDEf
z)EAQ61yi1BfteGBLq^LHeWeJg6WV)KDke9SJIJTiSE?^$u5YwM+5@eDe$sM})P=(*
z#@QjdF5QCeKnE~QAj2l`{rMIACjJ#)MDQ1Alz0lGkS2W(#SwXYoQ(5xYiO2zz-<v2
zGs2>saN9CPRl!<zPuwkykas9Mp#?o4>64v|odj3fmo{Nd?FAV+lg<LieMA>!KE=Fs
zW73$J%qq;>RdBuX>>P2SxLjNd3fU=UVbwT>`Y(u=#f@5H@bs2?8)#!4^)7mh?qXSF
zS!P*fS!dZ~*=E^=F+_doPKHcrf`op6K1}~ep8%DfhpgV3xy9UN9zYiVlX(Go+y(qK
z2s&+3t|ixoYsYoux^U;XE_@7hs9wPRRDJ+I1RQCyFbz7=w~z)G3Co04LNn6?(;uck
zO)o&vF6JWUV&J`{#Ij-q@TpJ48e(nnQ^?8|DM)H8HI-UQZKQV4cV0^Kq1h}0&a9I+
z$=l>zGN<gtdT<!}=?Q2x=aowewcg1%*Y!kfqwK{M=2Vsw5s|6N^dR;IzunM;f51w4
zPRhZ|{wbA}E65+qpU5>}qxcl_%*ke8rbRBQe5u@3TBtv$v^GsErT5b>=n<Bk7#(MF
zE{fU-jY8yFaVwxlR)$Rc4Q9KTP*WHtd?UOPys^$tG+j4Q<`}H!=ghyGDNkpj%2Lae
zgOKe?s}<BLY7MoH+E5i#1(JSawK;fgoK_sNRR;q{oGD+VccPcmx8w?t42P+!)C+1|
ztrMg-e@H2a#MwJi=4jx<6ndtiSFM3&Wwlx4(N&m+%p;~3w-YN}6*FzdWedh#m%~Zk
zXl$;)dBl{2<wC<M-JczY+1$!zv)7;jl;P@e7Op+lha1a%%WZ)caFu(^mEt*m6kkQ$
zFKfzng;Uq6b+pCWC#1X#oCSoF%iZQ`@eTL|!2etP13nfK(MDmHz(EQc4le!z^IbwL
zC;CZ@6d`w#dnifD0%ZkkKR1;s;AS1w7|679)syN)wX{}A3)g%hjn>m?*bqcr)&2Eg
zJrr`OpQWCKw(u4avZuc#*b<7B6W1*mbTvYg^o8KrzglivsBCA-2kr9Zt_Uwof#$~M
zX67E|L~~#B3hlDxriIG2j&l{zRup%QzYA_xN0=Z^Q@({P{<HFi^ex|7?sm}JpY&^b
z3L$t3_qyYM5T7VimQ!HaS|P8O$Lo}*3sGyR`D`wGoxRQGvH9#HXq_)vigV@4Vx^Ac
zqPS=-7B-+nE}2V%4mt*-dyLD5M0|nE;c~g_7{ff+B~+|{!F(vRt#GU)k&uw1d3=^{
z^e0*ws-#1Y7^_T#CNW)^jTJ9bS*%dBi-Dhqp}7VLX~I_1Zqqe0FMcVW6IEz8PD%x6
zmsgZ2>N0gXba_^HhQ>b0LixK;&Cu@7^eor`cY?x0*#7)<eu;1gayM%VGLJEDHJ>rR
z5rd=@DMQ)?Yf)WjHr-&m`w=UVJNR`stekbgPpEJg0~gG64aUT5gZ@o)?-2B1H_w>k
z#3AAq$gw|*b)-m0Ajw#}XF%U0cB+HY4Jl80EPW(Paujs1{_;e5zI+jD-wU~fQc<Y}
z$)qzhr5}`R<(v`#E8$3Wl6pnGqdrg{tI=8lXk(3bMSG@E(Jo}Urrcm9x&^D|AJBR?
zzz%d68tx_b4y>EcSZ}T>=Lhc9f*a0_hOT>-yU4A^iuM>b%usV5v$sfNB}*3PirWqD
zc^!6`eDR4mOd1JkbgDF0S}tvoc1io7&!3g9Nv|Y#=#VW9IqHCX4EC3DN_*uiXm`h9
zZ*jvKR|~6KGwAc*sB6^SkiTC5$7{oK)(A3qELz`B8>~&x9%E%Isr$f6HUkp(GJQR4
zm#1MNvsjv7Rqtl$Z#f5j*oBHj|H{%n^k{l1cyuFX3bTaS$B1ky`yH^Yj;X6@27cyf
zrD=z0pXsRSIBZSV%y-PM%tavw_Jc%Q4SMcW=;nQuQkn@;{u=$Eg-W;1T_TeL9eXnK
zk|~c7i{xejGxNBeLOHRyn2ELJnK(omBTa@hoC&$>taM4bCl!J2{1P(CT5w}OtmGrm
z&wJ`fte8#puCNnr)9>lO!}?kbtF^x+)iS~|2D0Hi!{)c!unC+7&7xBo*1lDxYe3%$
zrO(p0X(z^$sn4`zJUCx|8-JGn1$ts0Br8f7jTL>humwEk2=v6Rru*P99Aw0^W*0F)
zY!6=W19X+akc6mA7lY@8!@gUYslayQ15JI*H28fBw7fs`q#XIF+)+tY76GSUDHT)=
znsh%{mX|`-_19nNA6s-wQ%hURddnly&h;)tHKZzncQmB?(VMYaIx$|50NOHrutJuC
zg{liIkZrgDTsrI|kNBd32;1Q>tc2@?lfosTqDe4)ZaQ!J$eeAi2waO1r-;iiGdgs;
z7+}~uVAw`jLiR~#q$?QVCsGxxRDzr;50b+{dqb4l%6%o%vej~wv?t5O(7j91ujnFZ
zM`NZ9EI^+_w*CQjpJ28rEYoqoj=Su)&=%J7l}wFHv5-Y?nIgn7urz)zw#7Wo$2zk~
zJq)UP2pd8Tt*&8f57Sy`%ONeF#0pg#{FntdZlZ_lNzh^jLkpV<$$t@~{x$k{`hNYe
zeqPVfe}z`_M1O(#_Oz6<)U?!vK5YT74zskkbcT&E)iMw=>Q|PjmRXQNRzvUEXE_8-
z?h@qH8<r<lc{SUGdIa5@qCM$ybR|ex4WTy#(_xUdI@2+9JUtM)(Fl4f_|_cQhBwe#
z=|iA~Y&w^|0Z#VZu-SVt6`86`1BPQn!*1Ui5>pQ*5tgLk%xFkX-@<~l9+K})jMNF(
zjLNZ9Fjfg{Iy;tK2mW;)YvMz;EcQcUxZd0sTn5&}Ol}GH9V}yIu==;*J45D)=O@Be
z`~!c2KZBL;8DCEDfkaSOXoNZM1>JUtkdB#OBJ2~6VfN1nkA&AkB~wjPUD)}fOzE&0
zFEgz+Z2+y_H9f&fNtu1IYPT@AhrKuk{CAFdJ2c`W=AX>BAyJfsj#?G6Qgc|0hl%6F
zN#ZndgLnWEcfR;od@g!RDx{}o(2Y`HC7uWVx>ni*z4Zom0E)|{<?^r*^fL5|bVyU@
zVgG*(&B;TlrL<J~Dl=e_x~#ZBCTCT%s;ccEg^z;8X%cLa`_-QeJLF@vqUNjBfrc9f
znS7bH8dj7au=|pu{R+*n95`5gJxFf>X)_WwqyhR+;K*+Mw*H4+#8TW++QMNMCft%{
z84V1`#M~c&mSxaYu9g0sXm{+#v;-}sGPT)1SsLr+5N<1X54K1F>)}RzKmU{P$TUgW
zs`k=H=^J31H~^c}1z4k>>6E1%aBP5OqU9JgpzD^$7AoI`ngdjFp^MQ6=~~crGGQ;=
zhy9!KY*m(FEs%R+xT4sH`CiBo+#r>fHdioLG1oA!F>f-TGFKPdh$ErXWI`J&g7r58
zcDkBsw)#^2NMkfvOVZLY4!>yEK_fo8j6IJ?{VRQ*z5}})=kzPO7iho&N#!$37t3(;
zc@A{_P1x-q+8H^#5{$O_b6;|+xRY4@+wi5ZvoJ&0k9~#muvEC1zY_O~ze}C4Cf<?f
ztBbILuTs~6R=26UR5v20c#_|J0ja=7MftcIvf&9x>3iA7Y#cwFzap)~N|~=xu<e&O
z>=JFXPM|+S=BHf^URIJ`NDqhp_XqQwsfrQ#hF!vLhGqC9G^je*!Me#+=V$X>1=YaR
z?XaS}GR2uk!DhSAya(2k60pE+7as!qYG9vYC9EVAFwF-NbtkNdkL9Y03e38Oy$3(o
zw6Cb1T0O0cHdLFZRe_bUBCLp0F&<<fT#dOph#j<<ute7YeSHb3at(NYag#UfYOKj*
z(oMmpCfIWs0Dbg?Db$>1&KA#$&!m#_Vs$m_7T*I?&#J$uH`M#ssd}Rp)5>Z!!Ouj^
z->`^w!0ur(cC4;opGpL-ZqxT-FUlR9inByoIst$BfJaRRe_8@PdXMFxb-ys&6(^ox
z_oDM452mui*e}@$7^wxuj>94LC-w#F0?C4gR568{2gzbL*9jWYQ1FMfkjs_|_k_nn
zL$k@;$@~bm8MAm;Op^vn737+7I_#5q%44Ov)>?~#J?<CH6L!c7mXVkzD%zDwN4>Ra
z0c-wr`VLl`H_VTa8lCy#{7n8Ze_L=i1)5r!x<H#9Wm;p}3~A<9>=;%zb_>(Y^UNEt
zE0JTa1P!Y#_{MZ`CHO_2s7m3|aL8XfBtK|C7T6qSU^l`GlDLch5!UW_y$``JeAp5J
zrz72)9*fm(KeWP|G|z-EU74@ILsv6<nU7!-brRfA?n#sy1M6!`@R)mYMeHVyRK8I*
zDEHI=tuf@AYC0rEib{8-hQf(~o<0gX%tmnTi}YPOpLPSUwxI0h;MDzL@&AgM#VkXA
z&Cpe1`6;0OZJ_^i*mro!`@w?P6nk>Rg)zcqp`59ysWa>=zUHRpndV-wwa>+fdc&>|
zt)_xr_NX6YB}b(hu7=E;&Wwi@rwr@Mny{nPflb7WX0Qu^_lIE3`Hii^l`%QNK3fy}
zu3_dc%}u~l+e=-g1Zj&rRnH*O80?_<E(uN-x-VKUGM=!WEMiYVN9+svemUpE2cVT-
z!#4bjxIwxlC1Gb_yK+zIq(%VutLb(1=HL>?bs3iQNyJ*V-j&*p^6FrgFEf5@B`zGc
zn7z;u?s7DLfv+zJ!WY6g;TJ)~9`R(@kq4R6u|`ZWe}lcnAIz`Kb;PEST}OytL6hDJ
ztKSLGWL+sl>IwT&hO}Ec5B>MCRLQW6w+40Yzz)<^xjc3+c-WZ8UPV917e7I=FM<7s
zk70{Bj$QcMkh9By!?%aMY%pwoJM>$672xI!V+Fqm9n96xPikVF7GQm8Nhi@OxaDGw
zJXNbna46f=uyfpoM)6SWE8Ug-p<{K#-Y?>ET@Aa<FOXkcVbNH|^kr#iKk2~j7kmTE
zaBtxzWF`sr8pb>rTxTt$yeno`v98!bj1|j(=QM-;Y@E~<note(F6cc8yk#A1+Gn*1
zuuE=%JW?D|H0sL7?`pvbVFZj~DN|8%C-ITxC1Tu+_HndK$8zoYuHbg_`Nd{YU93``
zZiY@i0DHq*vFCNmoFiTrKbERXwbfph6w4q>x&;?pP%6p|Wx|<jkhD5sU%$KXC2ZQM
zkmIJyUa&@z9rLjo8IJ({3;kR0ob&okUB_Oxn}I{CnO^KlHiR3%e~xnj>-p{cWxf*j
zA6sK(>J1ypRUrg6(Vo~p;LR6slEN9g_P*e&O_kNa^3G}oY{}R;2M=|lro-uoee-YW
z6_8H-ajqjCYfBk^5>GhA8q;CZ8I!Bo4-&J#xixTSli4gbgXO!ku?IZ{*fUSOC;CWX
zz?;vp+we0u`W@*ZEO-@QH5raG1PkOfz@49EAEgQKCJFnO6F}$lu)k0mJeJs4M?q?A
zuV?A~EO($Ay5VdRMY+@EA<J>t&mW3?yt&X^wlIg7daT*l)osO2!*0PfXlXCll3ac0
z%*n7p?BjmIo_!w9p@c%0Y|nS$_wXHIQ>|e75@T`JR9Ac|9)(>eQ63}Dg-o+cuBJBz
zAE%=68!D)C3`*F{|1Pu^+l!f4o6?oh(4MD4cb*4)S*fhYNr&Cae&q=CwKLdd$c0TJ
z54!DB<+b9fegyrkyjoeUj+Ltc?8&m~5BqpCwY3^)I~S3x_J<vIggO>d(sbxPnUIxM
zs~fQn?NJZHl9Y|}5;^Ks(9nJL5iIJI=B^dj%3z1CD&#04XPdB75QtH0p+#sNV4?1g
zeVG)jPs4Dc<t|QAe5^Or1$_WkNh;aR(DVDUlUNoSY&rfqc3;b3@Aag~!(0lx8s0c-
z;Di07UC@ONLTWr_u1AixrCWb@<sva0Ww;sq?<#g>e#1GH-*HmqInJs$bMD+nTuH7B
zSDvc`9l1JJi>u2u;8@PY$v8z3$c1oCP-kndE!TnT%uN$fRwnM=g)>4Pja{}$&?{$R
z&vYIvyi0M$WG(hhw_=ZbkGx+#1dH!+`4o0fFUps}ac%;G@5{gAyux!xputKz@STwg
zqs4=E)6n;!kgCq1=RUgC5`;>!+zcLbhRrEtVe#OKbDo?RN9DU2x_`J~ZAs@w!G<-F
zd&<9rw&*H&2*m|Y!3(?kl_8(|3VuR8ffjgZW-4s8!Ps|fhMmU<Ardz4XzWSF3yC<F
zlZM@+p^)E4!HPdo$PlK(k~~MqgzmW<+UI)gQf>z(W(fzOg&q^Kv43>|GGwlBUAPVT
zEg!P}Q{kmRnOsdCrs5_~lNV%|$|fI^ugMR4G_;8~iLj9QL!JpWHG@PG0Sb@8eqk)m
zlO)2Lm}VM?H9Z}xI{HuH9$@_EX^~d3&l(IJxfvZ!N6?YjPl={up%o?4$#fcYqoH&<
z*444}L^^|}JaJbr^7&zJE|?t%?Pe78n~7NKrn9rzIXJbnm|f1UX4hlo+m6#qw{be=
zDfg12cvs#75{4)CYAf?Tyf5#^*TZQU9w(QA3s|S}q2d0UQKo#{DR1a>G&H&YSP!Pt
zv!Uf>V&7spbiMVELAGNzHVe}H5&9S;hcomA`Z}xyd5|9-(NF1@G{v|w9!zmq54;#}
zrZP^M_%ePt!9_DX<O>zH^I&L%&A_cAm`EmyiDqJ%cxZ;nSbqi<I%z;-2U(O=oD&F^
zLvd0dT#kU%AWDvg6(wFy#Cd@<c_4OM)8$b(GcXY+-KJwdZ4S;2ES8t!<iL8I^4Ko#
zhVF0>HkV`Ag+3!+fW@J*4YM&ZH16-kxEz6<E!Ui9eu|aN6KA{pL>?!Dn!!F0ixqt+
zc2=gt2D2J+_Cf3h=U_MQkw{6!u|w%A(a`!rv2zhEC1THX6ju5<upw-gvS6jTfZeft
zSkXOXFG%F|(3@cNA_}cfL#rpEwTscp-DuqfoCnK?EyqLg!Wq4KiimSW;Yt+FgQdah
zI1wCkF}US!aLO~_l9g3ooJ`=MB?f~ZMyOHPX-mXj+fZnX6Tu1RVC`J3ZidC{;M?;F
zdEkIAaXz8A=7rN^zR&`A@V;QJ88}}QY+;F@{h?SnCTi26Q!R#Wxmnwdb^Mri2GYlM
z?AkqomCO~pk6wCZaE5xY538^ZH^aGwC_NUZ7Sf<^j)H_T9XpbX_0`zZ+pQnOX|pr1
zOkCIV^hf$j*wl*S^g?BeFRaNtEXl#JB1gc+7Hdg_UOLn=3fkjz=xK{#o!D&I4f+3=
z<%}iAIM-yA7ASwv6z0s8E)HF_GAu#$fYmB!vKi<x3bdFAIvffboCt}14ls8$uy!{v
z_871=2iTeiOnnJ?r#LXQGO)8AFjECqHUmaR0UHy6i9=zFn+O?o4$ir(hR(Vh=Ua}!
zPLYFiEqSo<zr?Ojan=iGqkN5>cNO&AjE!KUa55^9O=E|G(kFt-=YYajgSvOK2iarT
z!N`G)IuG{gm#iyzrx#>*U)cS5&Z-}UYmr!k;tdTc9TH21HXG;qmgD5eb}dUgqGf9r
zv|Q~r_OzdB6n5e~b#LIZA8hp^?DV0q4n@LJACJ=m17RT=i~Zr*kinM2p1B>;z!5zg
zntCqm0r}W#r7Rw>5_w|}+z)nr5%$4Q*ajjk(Uy2iGIX$Xta%x*7G~l+#(L;tS+Evl
zLr%_xjX&S=6mkXb#l}2Pv<ECj-mr@L(KNV=KX_v}_+m78Vlwz)I(T6QxJV{A$a-*(
zEO3r&aE)AWjeKwn3f#gIoWciOf(D212X_buXNU$@NCrnp$GM{noH@$Gd873>Ym|j^
zM%g%Hl#BC4`OH(C3$dOC^}#7M8s|a%p;3h6j9N4sk8@Up=Z*!xoef^Q9DH^=EYe4?
z<8lGJ1-G$N@Dz4i53FI{oR6VDikv@AtA#`UiN=0GGWH76v6f}vyjmu7iuK%fE(?1H
z+0X#Vz6;^j6gagfPNevNN7LZX{*aZz`QLC#;&;ft7@ug|BMv7IJmaP43a;TLRR-Uv
zC-LAM!H}OLq$nvC+#^jI3jQ$>r)TC!i>1}zA-iFpKPC}=hXRsuzdIaH(62Wr*atN1
z2P&pP$0FHx%f!9!aJ*!1@EXE13Ac;}ha|kw$`x0G6A~VHTh0Twc`AE?*Z4yF5FyJ3
zgWDu3$+kU?44jhM4t{eCcK<U<4o;)G;#`zBq%mJ`9cn%9l}BBK>l02-W5$v(OY1Q+
z`Ow5@<BVGd#ycBh><PU*9AlY*@yoWYaNfpB77a}!lh4AbW(tx4kp`l%;%8!2&&A5^
zgVi}2D{!VM3+Hh2AZ7VsmmuCe7Uy-2z#``XJ{>B?gF7!5kANq8;G|}#6fcbh|2-nz
z2G{k&x)G25F9(Oc4c_X9zJ{ZZ8Q`VakTmlZPnA}~u|F_T%^*rdHtwB=;|u&1nRK*2
z3q8n1A3Q*--k?^IQ*ov>)Yv=nlzcFcewaxbb17mr{V|{6n9oSeXf)<D9<!Q^mEa)S
za}0Z+XRspVNV!-Q9${5*g;mfCXSIC|jZih#E3#IRbt>0b4<6yfl&j*2HNjh{Y|ND(
d)&?5A@P~GvjJ>GE*xk%g(B%Jn{+Eov{{w)ezAgX&

delta 42184
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
S6d>Dln9>rmf#CI<Gyem$ZO0=3


From 38f276fb8b9ef77c7f34d11460f0ba072def3467 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:17:52 -0500
Subject: [PATCH 5459/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c8a9f8ab3d..06c6aad105 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,11 +2,17 @@
 CHANGES
 =======
 
-19.3.1
-------
+19.4
+----
 
 * Issue #341: Correct error in path handling of package data
   files in ``build_py`` command when package is empty.
+* Distribute #323, Issue #141, Issue #207, and
+  Pull Request #167: Another implementation of
+  ``pkg_resources.WorkingSet`` and ``pkg_resources.Distribution``
+  that supports replacing an extant package with a new one,
+  allowing for setup_requires dependencies to supersede installed
+  packages for the session.
 
 ----
 19.3

From efb37fc9c2e20f79f742e976e1bcd7fa2a27c5f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:23:18 -0500
Subject: [PATCH 5460/8469] Just use BytesIO

---
 setuptools/tests/test_easy_install.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 4f9e52d144..77cf8da108 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -464,15 +464,9 @@ def make_sdist(dist_path, files):
 
     dist = tarfile.open(dist_path, 'w:gz')
 
-    try:
-        # Python 3 (StringIO gets converted to io module)
-        MemFile = BytesIO
-    except AttributeError:
-        MemFile = StringIO
-
     try:
         for filename, content in files:
-            file_bytes = MemFile(content.encode('utf-8'))
+            file_bytes = io.BytesIO(content.encode('utf-8'))
             file_info = tarfile.TarInfo(name=filename)
             file_info.size = len(file_bytes.getvalue())
             file_info.mtime = int(time.time())

From d716b3c03b111512133126a5f42c7553bfb43174 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:32:19 -0500
Subject: [PATCH 5461/8469] Re-use tarfile_open for Python 2.6 compatibilty.

---
 setuptools/tests/test_easy_install.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 77cf8da108..895ce7aa18 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -364,7 +364,7 @@ def test_setup_requires_override_nspkg(self):
                 # extracted path to sys.path so foo.bar v0.1 is importable
                 foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1')
                 os.mkdir(foobar_1_dir)
-                with tarfile.open(foobar_1_archive) as tf:
+                with tarfile_open(foobar_1_archive) as tf:
                     tf.extractall(foobar_1_dir)
                 sys.path.insert(1, foobar_1_dir)
 
@@ -462,17 +462,13 @@ def make_sdist(dist_path, files):
     listed in ``files`` as ``(filename, content)`` tuples.
     """
 
-    dist = tarfile.open(dist_path, 'w:gz')
-
-    try:
+    with tarfile_open(dist_path, 'w:gz') as dist:
         for filename, content in files:
             file_bytes = io.BytesIO(content.encode('utf-8'))
             file_info = tarfile.TarInfo(name=filename)
             file_info.size = len(file_bytes.getvalue())
             file_info.mtime = int(time.time())
             dist.addfile(file_info, fileobj=file_bytes)
-    finally:
-        dist.close()
 
 
 def create_setup_requires_package(path, distname='foobar', version='0.1',

From 670a9c895e6180e72a069f5208f0ed2ae38b9728 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:38:00 -0500
Subject: [PATCH 5462/8469] Get VersionConflict from pkg_resources.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 895ce7aa18..99ac731741 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -396,7 +396,7 @@ def test_setup_requires_override_nspkg(self):
                         # Don't even need to install the package, just
                         # running the setup.py at all is sufficient
                         run_setup(test_setup_py, ['--name'])
-                    except VersionConflict:
+                    except pkg_resources.VersionConflict:
                         self.fail('Installing setup.py requirements '
                             'caused a VersionConflict')
 

From 400d10f9ed6d353fcd349727342c153839eb8a69 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:38:44 -0500
Subject: [PATCH 5463/8469] Added tag 19.4 for changeset f47f3671508b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4f89a01a43..1e7eeff0c4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -235,3 +235,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2
 66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1
 32bba9bf8cce8350b560a7591c9ef5884a194211 19.3
+f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4

From 7372d185e72fda6c8ad3eea6c5faac61eae602c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2016 17:39:54 -0500
Subject: [PATCH 5464/8469] Bumped to 19.5 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 7ff48baa70..59c4552914 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.4'
+__version__ = '19.5'

From e888c6cdacaa883214a06fad0ccd5789f2066b4f Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Mon, 18 Jan 2016 08:48:21 +0000
Subject: [PATCH 5465/8469] Make 19.4 same level header as other version
 numbers.

The problem was that restructured text considered 19.4 is a sibtitle to "CHANGES".

--HG--
branch : svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145
---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 06c6aad105..8992df6a89 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
 CHANGES
 =======
 
+----
 19.4
 ----
 

From 34941986add5899b43614e3cfc0f590eb9d1ca20 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 18 Jan 2016 12:15:08 +0100
Subject: [PATCH 5466/8469] subprocess._optim_args_from_interpreter_flags()

Issue #26100:

* Add subprocess._optim_args_from_interpreter_flags()
* Add test.support.optim_args_from_interpreter_flags()
* Use new functions in distutils, test_cmd_line_script, test_compileall and
  test_inspect

The change enables test_details() test of test_inspect when -O or -OO command
line option is used.
---
 util.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/util.py b/util.py
index e423325de4..fdcf6fabae 100644
--- a/util.py
+++ b/util.py
@@ -7,8 +7,8 @@
 import os
 import re
 import importlib.util
-import sys
 import string
+import sys
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -350,6 +350,11 @@ def byte_compile (py_files,
     generated in indirect mode; unless you know what you're doing, leave
     it set to None.
     """
+
+    # Late import to fix a bootstrap issue: _posixsubprocess is built by
+    # setup.py, but setup.py uses distutils.
+    import subprocess
+
     # nothing is done if sys.dont_write_bytecode is True
     if sys.dont_write_bytecode:
         raise DistutilsByteCompileError('byte-compiling is disabled.')
@@ -412,11 +417,9 @@ def byte_compile (py_files,
 
             script.close()
 
-        cmd = [sys.executable, script_name]
-        if optimize == 1:
-            cmd.insert(1, "-O")
-        elif optimize == 2:
-            cmd.insert(1, "-OO")
+        cmd = [sys.executable]
+        cmd.extend(subprocess._optim_args_from_interpreter_flags())
+        cmd.append(script_name)
         spawn(cmd, dry_run=dry_run)
         execute(os.remove, (script_name,), "removing %s" % script_name,
                 dry_run=dry_run)

From 0f0ca87e0b6fb7a9737962cf41d9d4ba81ff9c0f Mon Sep 17 00:00:00 2001
From: Alexander Artemenko <svetlyak.40wt@gmail.com>
Date: Tue, 19 Jan 2016 04:58:32 +0000
Subject: [PATCH 5467/8469] Make all headers on the same level in CHANGES.txt.

--HG--
branch : svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145
---
 CHANGES.txt | 232 +---------------------------------------------------
 1 file changed, 1 insertion(+), 231 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8992df6a89..5242f73169 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,6 @@
 CHANGES
 =======
 
-----
 19.4
 ----
 
@@ -15,7 +14,6 @@ CHANGES
   allowing for setup_requires dependencies to supersede installed
   packages for the session.
 
-----
 19.3
 ----
 
@@ -23,7 +21,6 @@ CHANGES
   dependencies conditionally from vendored copies or primary
   locations. Adds a new dependency on six.
 
-----
 19.2
 ----
 
@@ -31,7 +28,6 @@ CHANGES
 * Pull Request #162: Add missing whitespace to multiline string
   literals.
 
-------
 19.1.1
 ------
 
@@ -41,7 +37,6 @@ CHANGES
   of strings, rather than rely on ``repr``, which can be
   incorrect (especially on Python 2).
 
-----
 19.1
 ----
 
@@ -51,14 +46,12 @@ CHANGES
   than hard-coding a particular value.
 * Issue #475: Fix incorrect usage in _translate_metadata2.
 
-----
 19.0
 ----
 
 * Issue #442: Use RawConfigParser for parsing .pypirc file.
   Interpolated values are no longer honored in .pypirc files.
 
-------
 18.8.1
 ------
 
@@ -67,7 +60,6 @@ CHANGES
   with setuptools hidden. Fixes regression introduced in Setuptools
   12.0.
 
-----
 18.8
 ----
 
@@ -79,14 +71,12 @@ CHANGES
 * Issue #472: Remove deprecated use of 'U' in mode parameter
   when opening files.
 
-------
 18.7.1
 ------
 
 * Issue #469: Refactored logic for Issue #419 fix to re-use metadata
   loading from Provider.
 
-----
 18.7
 ----
 
@@ -104,14 +94,12 @@ CHANGES
   reading the version info from distutils-installed metadata rather
   than using the version in the filename.
 
-------
 18.6.1
 ------
 
 * Issue #464: Correct regression in invocation of superclass on old-style
   class on Python 2.
 
-----
 18.6
 ----
 
@@ -119,7 +107,6 @@ CHANGES
   omit the version number of the package, allowing any version of the
   package to be used.
 
-----
 18.5
 ----
 
@@ -131,27 +118,23 @@ CHANGES
 * `Fix dictionary mutation during iteration
   <https://github.com/jaraco/setuptools/pull/29>`_.
 
-----
 18.4
 ----
 
 * Issue #446: Test command now always invokes unittest, even
   if no test suite is supplied.
 
-------
 18.3.2
 ------
 
 * Correct another regression in setuptools.findall
   where the fix for Python #12885 was lost.
 
-------
 18.3.1
 ------
 
 * Issue #425: Correct regression in setuptools.findall.
 
-----
 18.3
 ----
 
@@ -172,25 +155,21 @@ CHANGES
 * Refactor setuptools.findall in preparation for re-submission
   back to distutils.
 
-----
 18.2
 ----
 
 * Issue #412: More efficient directory search in ``find_packages``.
 
-----
 18.1
 ----
 
 * Upgrade to vendored packaging 15.3.
 
-------
 18.0.1
 ------
 
 * Issue #401: Fix failure in test suite.
 
-----
 18.0
 ----
 
@@ -216,7 +195,6 @@ CHANGES
 * Pull Request #136: Remove excessive quoting from shebang headers
   for Jython.
 
-------
 17.1.1
 ------
 
@@ -224,14 +202,12 @@ CHANGES
   deprecated imp module (`ref
   <https://bitbucket.org/pypa/setuptools/commits/f572ec9563d647fa8d4ffc534f2af8070ea07a8b#comment-1881283>`_).
 
-----
 17.1
 ----
 
 * Issue #380: Add support for range operators on environment
   marker evaluation.
 
-----
 17.0
 ----
 
@@ -240,7 +216,6 @@ CHANGES
   the name. Removes unintended functionality and brings behavior
   into parity with pip.
 
-----
 16.0
 ----
 
@@ -251,7 +226,6 @@ CHANGES
 * Pull Request #129: Address deprecation warning due to usage
   of imp module.
 
-----
 15.2
 ----
 
@@ -259,14 +233,12 @@ CHANGES
   ``pkg_resources._initialize_master_working_set``, allowing for
   imperative re-initialization of the master working set.
 
-----
 15.1
 ----
 
 * Updated to Packaging 15.1 to address Packaging #28.
 * Fix ``setuptools.sandbox._execfile()`` with Python 3.1.
 
-----
 15.0
 ----
 
@@ -280,7 +252,6 @@ CHANGES
   has since been changed, but older versions of buildout may experience
   problems. See Buildout #242 for details.
 
-------
 14.3.1
 ------
 
@@ -289,7 +260,6 @@ CHANGES
 * Issue #364: Replace deprecated usage with recommended usage of
   ``EntryPoint.load``.
 
-----
 14.3
 ----
 
@@ -297,7 +267,6 @@ CHANGES
   for creating the directory to avoid the subsequent warning if
   the directory is group writable.
 
-----
 14.2
 ----
 
@@ -305,21 +274,18 @@ CHANGES
   None for pyversion or platform can be compared against Distributions
   defining those attributes.
 
-------
 14.1.1
 ------
 
 * Issue #360: Removed undesirable behavior from test runs, preventing
   write tests and installation to system site packages.
 
-----
 14.1
 ----
 
 * Pull Request #125: Add ``__ne__`` to Requirement class.
 * Various refactoring of easy_install.
 
-----
 14.0
 ----
 
@@ -335,21 +301,18 @@ CHANGES
   using the "install-dir" and "scripts-dir" parameters to easy_install
   through an appropriate distutils config file.
 
-------
 13.0.2
 ------
 
 * Issue #359: Include pytest.ini in the sdist so invocation of py.test on the
   sdist honors the pytest configuration.
 
-------
 13.0.1
 ------
 
 Re-release of 13.0. Intermittent connectivity issues caused the release
 process to fail and PyPI uploads no longer accept files for 13.0.
 
-----
 13.0
 ----
 
@@ -359,14 +322,12 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   functionality was added to support upgrades from old Distribute versions,
   0.6.5 and 0.6.6.
 
-----
 12.4
 ----
 
 * Pull Request #119: Restore writing of ``setup_requires`` to metadata
   (previously added in 8.4 and removed in 9.0).
 
-----
 12.3
 ----
 
@@ -376,7 +337,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #354. Added documentation on building setuptools
   documentation.
 
-----
 12.2
 ----
 
@@ -387,40 +347,34 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   remains deprecated for use by individual packages.
 * Simplified implementation of ``ez_setup.use_setuptools``.
 
-----
 12.1
 ----
 
 * Pull Request #118: Soften warning for non-normalized versions in
   Distribution.
 
-------
 12.0.5
 ------
 
 * Issue #339: Correct Attribute reference in ``cant_write_to_target``.
 * Issue #336: Deprecated ``ez_setup.use_setuptools``.
 
-------
 12.0.4
 ------
 
 * Issue #335: Fix script header generation on Windows.
 
-------
 12.0.3
 ------
 
 * Fixed incorrect class attribute in ``install_scripts``. Tests would be nice.
 
-------
 12.0.2
 ------
 
 * Issue #331: Fixed ``install_scripts`` command on Windows systems corrupting
   the header.
 
-------
 12.0.1
 ------
 
@@ -428,7 +382,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   compatibility. For the future, tools should construct a CommandSpec
   explicitly.
 
-----
 12.0
 ----
 
@@ -439,14 +392,12 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Deprecated ``easy_install.ScriptWriter.get_writer``, replaced by ``.best()``
   with slightly different semantics (no force_windows flag).
 
-------
 11.3.1
 ------
 
 * Issue #327: Formalize and restore support for any printable character in an
   entry point name.
 
-----
 11.3
 ----
 
@@ -460,13 +411,11 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 
     getattr(ep, "resolve", lambda: ep.load(require=False))()
 
-----
 11.2
 ----
 
 * Pip #2326: Report deprecation warning at stacklevel 2 for easier diagnosis.
 
-----
 11.1
 ----
 
@@ -477,20 +426,17 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   a VersionConflict when no dependent package context is known. New unit tests
   now capture the expected interface.
 
-----
 11.0
 ----
 
 * Interop #3: Upgrade to Packaging 15.0; updates to PEP 440 so that >1.7 does
   not exclude 1.7.1 but does exclude 1.7.0 and 1.7.0.post1.
 
-------
 10.2.1
 ------
 
 * Issue #323: Fix regression in entry point name parsing.
 
-----
 10.2
 ----
 
@@ -500,7 +446,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Substantial refactoring of all unit tests. Tests are now much leaner and
   re-use a lot of fixtures and contexts for better clarity of purpose.
 
-----
 10.1
 ----
 
@@ -509,13 +454,11 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   so that systems relying on that interface do not fail (namely, Ubuntu 12.04
   and similar Debian releases).
 
-------
 10.0.1
 ------
 
 * Issue #319: Fixed issue installing pure distutils packages.
 
-----
 10.0
 ----
 
@@ -528,53 +471,45 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   upgrade (or downgrade) itself even when its own metadata and implementation
   change.
 
----
 9.1
 ---
 
 * Prefer vendored packaging library `as recommended
   <https://github.com/jaraco/setuptools/commit/170657b68f4b92e7e1bf82f5e19a831f5744af67#commitcomment-9109448>`_.
 
------
 9.0.1
 -----
 
 * Issue #312: Restored presence of pkg_resources API tests (doctest) to sdist.
 
----
 9.0
 ---
 
 * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue
   where Setuptools was unable to upgrade over earlier versions.
 
----
 8.4
 ---
 
 * Pull Request #106: Now write ``setup_requires`` metadata.
 
----
 8.3
 ---
 
 * Issue #311: Decoupled pkg_resources from setuptools once again.
   ``pkg_resources`` is now a package instead of a module.
 
------
 8.2.1
 -----
 
 * Issue #306: Suppress warnings about Version format except in select scenarios
   (such as installation).
 
----
 8.2
 ---
 
 * Pull Request #85: Search egg-base when adding egg-info to manifest.
 
----
 8.1
 ---
 
@@ -584,7 +519,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   ``pkg_resources.PEP440Warning``, instead of RuntimeWarning.
 * Disabled warnings on empty versions.
 
------
 8.0.4
 -----
 
@@ -594,27 +528,23 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #296: Add warning when a version is parsed as legacy. This warning will
   make it easier for developers to recognize deprecated version numbers.
 
------
 8.0.3
 -----
 
 * Issue #296: Restored support for ``__hash__`` on parse_version results.
 
------
 8.0.2
 -----
 
 * Issue #296: Restored support for ``__getitem__`` and sort operations on
   parse_version result.
 
------
 8.0.1
 -----
 
 * Issue #296: Restore support for iteration over parse_version result, but
   deprecated that usage with a warning. Fixes failure with buildout.
 
----
 8.0
 ---
 
@@ -627,7 +557,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   supported. Setuptools now "vendors" the `packaging
   <https://github.com/pypa/packaging>`_ library.
 
----
 7.0
 ---
 
@@ -644,28 +573,24 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   adapted to ignore ``.eggs``. The files will need to be manually moved or
   will be retrieved again. Most use cases will require no attention.
 
----
 6.1
 ---
 
 * Issue #268: When resolving package versions, a VersionConflict now reports
   which package previously required the conflicting version.
 
------
 6.0.2
 -----
 
 * Issue #262: Fixed regression in pip install due to egg-info directories
   being omitted. Re-opens Issue #118.
 
------
 6.0.1
 -----
 
 * Issue #259: Fixed regression with namespace package handling on ``single
   version, externally managed`` installs.
 
----
 6.0
 ---
 
@@ -696,7 +621,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   recognize the specially-packaged compiler package for easy extension module
   support on Python 2.6, 2.7, and 3.2.
 
----
 5.8
 ---
 
@@ -704,7 +628,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   Python 3, supporting environments where builtins have been patched to make
   Python 3 look more like Python 2.
 
----
 5.7
 ---
 
@@ -715,20 +638,17 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   notes and detailed in Issue #154 was likely not an increase over the status
   quo, but rather only an increase over not storing the zip info at all.
 
----
 5.6
 ---
 
 * Issue #242: Use absolute imports in svn_utils to avoid issues if the
   installing package adds an xml module to the path.
 
------
 5.5.1
 -----
 
 * Issue #239: Fix typo in 5.5 such that fix did not take.
 
----
 5.5
 ---
 
@@ -736,20 +656,17 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   Distribution objects and validates the syntax just like install_requires
   and tests_require directives.
 
------
 5.4.2
 -----
 
 * Issue #236: Corrected regression in execfile implementation for Python 2.6.
 
------
 5.4.1
 -----
 
 * Python #7776: (ssl_support) Correct usage of host for validation when
   tunneling for HTTPS.
 
----
 5.4
 ---
 
@@ -760,7 +677,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   in startup time by enabling this feature. This feature is not enabled by
   default because it causes a substantial increase in memory usage.
 
----
 5.3
 ---
 
@@ -769,7 +685,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Prune revision control directories (e.g .svn) from base path
   as well as sub-directories.
 
----
 5.2
 ---
 
@@ -781,7 +696,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * During install_egg_info, the generated lines for namespace package .pth
   files are now processed even during a dry run.
 
----
 5.1
 ---
 
@@ -789,20 +703,17 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   building on the work in Issue #168. Special thanks to Jurko Gospodnetic and
   PJE.
 
------
 5.0.2
 -----
 
 * Issue #220: Restored script templates.
 
------
 5.0.1
 -----
 
 * Renamed script templates to end with .tmpl now that they no longer need
   to be processed by 2to3. Fixes spurious syntax errors during build/install.
 
----
 5.0
 ---
 
@@ -810,7 +721,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Incidentally, script templates were updated not to include the triple-quote
   escaping.
 
--------------------------
 3.7.1 and 3.8.1 and 4.0.1
 -------------------------
 
@@ -818,48 +728,41 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #218: Setuptools 3.8.1 superseded 4.0.1, and 4.x was removed
   from the available versions to install.
 
----
 4.0
 ---
 
 * Issue #210: ``setup.py develop`` now copies scripts in binary mode rather
   than text mode, matching the behavior of the ``install`` command.
 
----
 3.8
 ---
 
 * Extend Issue #197 workaround to include all Python 3 versions prior to
   3.2.2.
 
----
 3.7
 ---
 
 * Issue #193: Improved handling of Unicode filenames when building manifests.
 
----
 3.6
 ---
 
 * Issue #203: Honor proxy settings for Powershell downloader in the bootstrap
   routine.
 
------
 3.5.2
 -----
 
 * Issue #168: More robust handling of replaced zip files and stale caches.
   Fixes ZipImportError complaining about a 'bad local header'.
 
------
 3.5.1
 -----
 
 * Issue #199: Restored ``install._install`` for compatibility with earlier
   NumPy versions.
 
----
 3.5
 ---
 
@@ -870,32 +773,27 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #192: Preferred bootstrap location is now
   https://bootstrap.pypa.io/ez_setup.py (mirrored from former location).
 
------
 3.4.4
 -----
 
 * Issue #184: Correct failure where find_package over-matched packages
   when directory traversal isn't short-circuited.
 
------
 3.4.3
 -----
 
 * Issue #183: Really fix test command with Python 3.1.
 
------
 3.4.2
 -----
 
 * Issue #183: Fix additional regression in test command on Python 3.1.
 
------
 3.4.1
 -----
 
 * Issue #180: Fix regression in test command not caught by py.test-run tests.
 
----
 3.4
 ---
 
@@ -906,13 +804,11 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   now installs naturally on IronPython. Behavior on CPython should be
   unchanged.
 
----
 3.3
 ---
 
 * Add ``include`` parameter to ``setuptools.find_packages()``.
 
----
 3.2
 ---
 
@@ -920,27 +816,23 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #162: Update dependency on certifi to 1.0.1.
 * Issue #164: Update dependency on wincertstore to 0.2.
 
----
 3.1
 ---
 
 * Issue #161: Restore Features functionality to allow backward compatibility
   (for Features) until the uses of that functionality is sufficiently removed.
 
------
 3.0.2
 -----
 
 * Correct typo in previous bugfix.
 
------
 3.0.1
 -----
 
 * Issue #157: Restore support for Python 2.6 in bootstrap script where
   ``zipfile.ZipFile`` does not yet have support for context managers.
 
----
 3.0
 ---
 
@@ -968,7 +860,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   Python 3 environments.
 * Issue #156: Fix spelling of __PYVENV_LAUNCHER__ variable.
 
----
 2.2
 ---
 
@@ -977,21 +868,18 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #128: Fixed issue where only the first dependency link was honored
   in a distribution where multiple dependency links were supplied.
 
------
 2.1.2
 -----
 
 * Issue #144: Read long_description using codecs module to avoid errors
   installing on systems where LANG=C.
 
------
 2.1.1
 -----
 
 * Issue #139: Fix regression in re_finder for CVS repos (and maybe Git repos
   as well).
 
----
 2.1
 ---
 
@@ -999,7 +887,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   in a zip-imported file.
 * Issue #131: Fix RuntimeError when constructing an egg fetcher.
 
------
 2.0.2
 -----
 
@@ -1007,13 +894,11 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   not containing parser module.
 * Fix NameError in ``sdist:re_finder``.
 
------
 2.0.1
 -----
 
 * Issue #124: Fixed error in list detection in upload_docs.
 
----
 2.0
 ---
 
@@ -1026,14 +911,12 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Removed ``pkg_resources.ImpWrapper``. Clients that expected this class
   should use ``pkgutil.ImpImporter`` instead.
 
------
 1.4.2
 -----
 
 * Issue #116: Correct TypeError when reading a local package index on Python
   3.
 
------
 1.4.1
 -----
 
@@ -1063,7 +946,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
     for legacy SVN releases and support for SVN without the subprocess command
     would simple go away as support for the older SVNs does.
 
----
 1.4
 ---
 
@@ -1072,19 +954,16 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
   when the username/password pair length indicates wrapping.
 
------
 1.3.2
 -----
 
 * Issue #99: Fix filename encoding issues in SVN support.
 
------
 1.3.1
 -----
 
 * Remove exuberant warning in SVN support when SVN is not used.
 
----
 1.3
 ---
 
@@ -1095,7 +974,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   implementation if present.
 * Correct NameError in ``ssl_support`` module (``socket.error``).
 
----
 1.2
 ---
 
@@ -1108,7 +986,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Setuptools "natural" launcher support, introduced in 1.0, is now officially
   supported.
 
------
 1.1.7
 -----
 
@@ -1119,39 +996,33 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Distribute #363 and Issue #55: Skip an sdist test that fails on locales
   other than UTF-8.
 
------
 1.1.6
 -----
 
 * Distribute #349: ``sandbox.execfile`` now opens the target file in binary
   mode, thus honoring a BOM in the file when compiled.
 
------
 1.1.5
 -----
 
 * Issue #69: Second attempt at fix (logic was reversed).
 
------
 1.1.4
 -----
 
 * Issue #77: Fix error in upload command (Python 2.4).
 
------
 1.1.3
 -----
 
 * Fix NameError in previous patch.
 
------
 1.1.2
 -----
 
 * Issue #69: Correct issue where 404 errors are returned for URLs with
   fragments in them (such as #egg=).
 
------
 1.1.1
 -----
 
@@ -1159,7 +1030,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   environments where a trusted SSL connection cannot be validated.
 * Issue #76: Fix AttributeError in upload command with Python 2.4.
 
----
 1.1
 ---
 
@@ -1167,7 +1037,6 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   condition when a host is blocked via ``--allow-hosts``.
 * Issue #72: Restored Python 2.4 compatibility in ``ez_setup.py``.
 
----
 1.0
 ---
 
@@ -1204,13 +1073,11 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 * Removed ``--ignore-conflicts-at-my-risk`` and ``--delete-conflicting``
   options to easy_install. These options have been deprecated since 0.6a11.
 
------
 0.9.8
 -----
 
 * Issue #53: Fix NameErrors in `_vcs_split_rev_from_url`.
 
------
 0.9.7
 -----
 
@@ -1220,79 +1087,67 @@ not all users will find 1.0 a drop-in replacement for 0.9.
   referenced by bookmark.
 * Add underscore-separated keys to environment markers (markerlib).
 
------
 0.9.6
 -----
 
 * Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a `.name`
   attribute.
 
------
 0.9.5
 -----
 
 * Python #17980: Fix security vulnerability in SSL certificate validation.
 
------
 0.9.4
 -----
 
 * Issue #43: Fix issue (introduced in 0.9.1) with version resolution when
   upgrading over other releases of Setuptools.
 
------
 0.9.3
 -----
 
 * Issue #42: Fix new ``AttributeError`` introduced in last fix.
 
------
 0.9.2
 -----
 
 * Issue #42: Fix regression where blank checksums would trigger an
   ``AttributeError``.
 
------
 0.9.1
 -----
 
 * Distribute #386: Allow other positional and keyword arguments to os.open.
 * Corrected dependency on certifi mis-referenced in 0.9.
 
----
 0.9
 ---
 
 * `package_index` now validates hashes other than MD5 in download links.
 
----
 0.8
 ---
 
 * Code base now runs on Python 2.4 - Python 3.3 without Python 2to3
   conversion.
 
------
 0.7.8
 -----
 
 * Distribute #375: Yet another fix for yet another regression.
 
------
 0.7.7
 -----
 
 * Distribute #375: Repair AttributeError created in last release (redo).
 * Issue #30: Added test for get_cache_path.
 
------
 0.7.6
 -----
 
 * Distribute #375: Repair AttributeError created in last release.
 
------
 0.7.5
 -----
 
@@ -1302,33 +1157,28 @@ not all users will find 1.0 a drop-in replacement for 0.9.
   ``SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT`` in addition to the now
   deprecated ``DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT``.
 
------
 0.7.4
 -----
 
 * Issue #20: Fix comparison of parsed SVN version on Python 3.
 
------
 0.7.3
 -----
 
 * Issue #1: Disable installation of Windows-specific files on non-Windows systems.
 * Use new sysconfig module with Python 2.7 or >=3.2.
 
------
 0.7.2
 -----
 
 * Issue #14: Use markerlib when the `parser` module is not available.
 * Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
 
------
 0.7.1
 -----
 
 * Fix NameError (Issue #3) again - broken in bad merge.
 
----
 0.7
 ---
 
@@ -1346,13 +1196,11 @@ Added several features that were slated for setuptools 0.6c12:
 * Added support for SSL certificate validation when installing packages from
   an HTTPS service.
 
------
 0.7b4
 -----
 
 * Issue #3: Fixed NameError in SSL support.
 
-------
 0.6.49
 ------
 
@@ -1360,21 +1208,18 @@ Added several features that were slated for setuptools 0.6c12:
   to avoid errors when the cache path does not yet exist. Fixes the error
   reported in Distribute #375.
 
-------
 0.6.48
 ------
 
 * Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
   0.6.46 (redo).
 
-------
 0.6.47
 ------
 
 * Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
   0.6.46.
 
-------
 0.6.46
 ------
 
@@ -1382,27 +1227,23 @@ Added several features that were slated for setuptools 0.6c12:
   customized egg cache location specifies a directory that's group- or
   world-writable.
 
-------
 0.6.45
 ------
 
 * Distribute #379: ``distribute_setup.py`` now traps VersionConflict as well,
   restoring ability to upgrade from an older setuptools version.
 
-------
 0.6.44
 ------
 
 * ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to
   satisfy use_setuptools.
 
-------
 0.6.43
 ------
 
 * Distribute #378: Restore support for Python 2.4 Syntax (regression in 0.6.42).
 
-------
 0.6.42
 ------
 
@@ -1410,7 +1251,6 @@ Added several features that were slated for setuptools 0.6c12:
 * Distribute #337: Moved site.py to setuptools/site-patch.py (graft of very old
   patch from setuptools trunk which inspired PR #31).
 
-------
 0.6.41
 ------
 
@@ -1419,14 +1259,12 @@ Added several features that were slated for setuptools 0.6c12:
 * Added a new function ``easy_install.get_win_launcher`` which may be used by
   third-party libraries such as buildout to get a suitable script launcher.
 
-------
 0.6.40
 ------
 
 * Distribute #376: brought back cli.exe and gui.exe that were deleted in the
   previous release.
 
-------
 0.6.39
 ------
 
@@ -1438,13 +1276,11 @@ Added several features that were slated for setuptools 0.6c12:
   check the contents of the file against the zip contents during each
   invocation of get_resource_filename.
 
-------
 0.6.38
 ------
 
 * Distribute #371: The launcher manifest file is now installed properly.
 
-------
 0.6.37
 ------
 
@@ -1454,7 +1290,6 @@ Added several features that were slated for setuptools 0.6c12:
   in `this Microsoft article
   <http://technet.microsoft.com/en-us/library/cc709628%28WS.10%29.aspx>`_.
 
-------
 0.6.36
 ------
 
@@ -1464,7 +1299,6 @@ Added several features that were slated for setuptools 0.6c12:
   under Windows. Easy_install now skips all directories when processing
   metadata scripts.
 
-------
 0.6.35
 ------
 
@@ -1476,13 +1310,11 @@ how it parses version numbers.
   0.6. Updated the documentation to match more closely with the version
   parsing as intended in setuptools 0.6.
 
-------
 0.6.34
 ------
 
 * Distribute #341: 0.6.33 fails to build under Python 2.4.
 
-------
 0.6.33
 ------
 
@@ -1495,7 +1327,6 @@ how it parses version numbers.
   for details.
 * Distribute #341: Fix a ResourceWarning.
 
-------
 0.6.32
 ------
 
@@ -1504,7 +1335,6 @@ how it parses version numbers.
 * Distribute #335: Backed out `setup_requires` superceding installed requirements
   until regression can be addressed.
 
-------
 0.6.31
 ------
 
@@ -1529,14 +1359,12 @@ how it parses version numbers.
   would have been in had that egg been on the path when pkg_resources was
   first imported.
 
-------
 0.6.30
 ------
 
 * Distribute #328: Clean up temporary directories in distribute_setup.py.
 * Fix fatal bug in distribute_setup.py.
 
-------
 0.6.29
 ------
 
@@ -1568,7 +1396,6 @@ how it parses version numbers.
 * `distribute_setup.py` now allows a `--download-base` argument for retrieving
   distribute from a specified location.
 
-------
 0.6.28
 ------
 
@@ -1578,7 +1405,6 @@ how it parses version numbers.
 * Distribute #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
   Python 3.3.
 
-------
 0.6.27
 ------
 
@@ -1589,7 +1415,6 @@ how it parses version numbers.
 * Distribute #231: Don't fiddle with system python when used with buildout
   (bootstrap.py)
 
-------
 0.6.26
 ------
 
@@ -1598,7 +1423,6 @@ how it parses version numbers.
   installation of a source distribution; now fulfillment of setup_requires
   dependencies will honor the parameters passed to easy_install.
 
-------
 0.6.25
 ------
 
@@ -1614,13 +1438,11 @@ how it parses version numbers.
   449.
 * Distribute #273: Legacy script launchers now install with Python2/3 support.
 
-------
 0.6.24
 ------
 
 * Distribute #249: Added options to exclude 2to3 fixers
 
-------
 0.6.23
 ------
 
@@ -1636,13 +1458,11 @@ how it parses version numbers.
 * Distribute #227: easy_install now passes its arguments to setup.py bdist_egg
 * Distribute #225: Fixed a NameError on Python 2.5, 2.4
 
-------
 0.6.21
 ------
 
 * Distribute #225: FIxed a regression on py2.4
 
-------
 0.6.20
 ------
 
@@ -1650,19 +1470,16 @@ how it parses version numbers.
 * Distribute #212: Fix issue where easy_instal fails on Python 3 on windows installer.
 * Distribute #213: Fix typo in documentation.
 
-------
 0.6.19
 ------
 
 * Distribute #206: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
 
-------
 0.6.18
 ------
 
 * Distribute #210: Fixed a regression introduced by Distribute #204 fix.
 
-------
 0.6.17
 ------
 
@@ -1675,7 +1492,6 @@ how it parses version numbers.
 * Distribute #205: Sandboxing doesn't preserve working_set. Leads to setup_requires
   problems.
 
-------
 0.6.16
 ------
 
@@ -1685,7 +1501,6 @@ how it parses version numbers.
 * Distribute #195: Cython build support.
 * Distribute #200: Issues with recognizing 64-bit packages on Windows.
 
-------
 0.6.15
 ------
 
@@ -1693,7 +1508,6 @@ how it parses version numbers.
 * Several issues under Python 3 has been solved.
 * Distribute #146: Fixed missing DLL files after easy_install of windows exe package.
 
-------
 0.6.14
 ------
 
@@ -1703,7 +1517,6 @@ how it parses version numbers.
   Thanks to David and Zooko.
 * Distribute #174: Fixed the edit mode when its used with setuptools itself
 
-------
 0.6.13
 ------
 
@@ -1712,13 +1525,11 @@ how it parses version numbers.
 * Distribute #163: scan index links before external links, and don't use the md5 when
   comparing two distributions
 
-------
 0.6.12
 ------
 
 * Distribute #149: Fixed various failures on 2.3/2.4
 
-------
 0.6.11
 ------
 
@@ -1735,7 +1546,6 @@ how it parses version numbers.
 * Distribute #138: cant_write_to_target error when setup_requires is used.
 * Distribute #147: respect the sys.dont_write_bytecode flag
 
-------
 0.6.10
 ------
 
@@ -1743,7 +1553,6 @@ how it parses version numbers.
   zc.buildout uses the exception message to get the name of the
   distribution.
 
------
 0.6.9
 -----
 
@@ -1770,14 +1579,12 @@ how it parses version numbers.
 * Distribute #100: making sure there's no SandboxViolation when
   the setup script patches setuptools.
 
------
 0.6.8
 -----
 
 * Added "check_packages" in dist. (added in Setuptools 0.6c11)
 * Fixed the DONT_PATCH_SETUPTOOLS state.
 
------
 0.6.7
 -----
 
@@ -1802,14 +1609,12 @@ how it parses version numbers.
 * Distribute #74: no_fake should be True by default.
 * Distribute #72: avoid a bootstrapping issue with easy_install -U
 
------
 0.6.6
 -----
 
 * Unified the bootstrap file so it works on both py2.x and py3k without 2to3
   (patch by Holger Krekel)
 
------
 0.6.5
 -----
 
@@ -1828,7 +1633,6 @@ how it parses version numbers.
 * Fixed a hole in sandboxing allowing builtin file to write outside of
   the sandbox.
 
------
 0.6.4
 -----
 
@@ -1840,7 +1644,6 @@ how it parses version numbers.
 
 * Fixed a bootstrap bug on the use_setuptools() API.
 
------
 0.6.3
 -----
 
@@ -1854,7 +1657,6 @@ bootstrapping
 
 * Fixed a bug in sorting that caused bootstrap to fail on Python 3.
 
------
 0.6.2
 -----
 
@@ -1886,7 +1688,6 @@ bootstrapping
 * Make sure setuptools is patched when running through easy_install
   This closes Old Setuptools #40.
 
------
 0.6.1
 -----
 
@@ -1914,7 +1715,6 @@ bootstrapping
   and --root or --prefix is provided, but is not in the same location.
   This closes Distribute #10.
 
----
 0.6
 ---
 
@@ -1957,7 +1757,6 @@ easy_install
 
 * Immediately close all file handles. This closes Distribute #3.
 
------
 0.6c9
 -----
 
@@ -1998,7 +1797,6 @@ easy_install
    gracefully under Google App Engine (with an ``ImportError`` loading the
    C-based module, instead of getting a ``NameError``).
 
------
 0.6c7
 -----
 
@@ -2009,7 +1807,6 @@ easy_install
    ``--root`` or ``--single-version-externally-managed``, due to the
    parent package not having the child package as an attribute.
 
------
 0.6c6
 -----
 
@@ -2033,7 +1830,6 @@ easy_install
  * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
    their names as packages.
 
------
 0.6c5
 -----
 
@@ -2043,7 +1839,6 @@ easy_install
  * Fix uploaded ``bdist_wininst`` packages being described as suitable for
    "any" version by Python 2.5, even if a ``--target-version`` was specified.
 
------
 0.6c4
 -----
 
@@ -2073,13 +1868,11 @@ easy_install
    listed a namespace package ``foo.bar`` without explicitly listing ``foo``
    as a namespace package.
 
------
 0.6c3
 -----
 
  * Fixed breakages caused by Subversion 1.4's new "working copy" format
 
------
 0.6c2
 -----
 
@@ -2090,7 +1883,6 @@ easy_install
  * Running ``setup.py develop`` on a setuptools-using project will now install
    setuptools if needed, instead of only downloading the egg.
 
------
 0.6c1
 -----
 
@@ -2114,7 +1906,6 @@ easy_install
    the version was overridden on the command line that built the source
    distribution.)
 
------
 0.6b4
 -----
 
@@ -2127,7 +1918,6 @@ easy_install
  * Fixed redundant warnings about missing ``README`` file(s); it should now
    appear only if you are actually a source distribution.
 
------
 0.6b3
 -----
 
@@ -2138,7 +1928,6 @@ easy_install
    ``include_package_data`` and ``package_data`` are used to refer to the same
    files.
 
------
 0.6b1
 -----
 
@@ -2146,7 +1935,6 @@ easy_install
    the name of a ``.py`` loader/wrapper.  (Python's import machinery ignores
    this suffix when searching for an extension module.)
 
-------
 0.6a11
 ------
 
@@ -2180,13 +1968,11 @@ easy_install
    it.  Previously, the file could be left open and the actual error would be
    masked by problems trying to remove the open file on Windows systems.
 
-------
 0.6a10
 ------
 
  * Fixed the ``develop`` command ignoring ``--find-links``.
 
------
 0.6a9
 -----
 
@@ -2238,7 +2024,6 @@ easy_install
    back into an ``.egg`` file or directory and install it as such.
 
 
------
 0.6a8
 -----
 
@@ -2266,13 +2051,11 @@ easy_install
    metadata cache to pretend that the egg has valid version information, until
    it has a chance to make it actually be so (via the ``egg_info`` command).
 
------
 0.6a5
 -----
 
  * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
 
------
 0.6a3
 -----
 
@@ -2280,7 +2063,6 @@ easy_install
    on Windows and other platforms.  (The special handling is only for Windows;
    other platforms are treated the same as for ``console_scripts``.)
 
------
 0.6a2
 -----
 
@@ -2289,7 +2071,6 @@ easy_install
    scripts get an ``.exe`` wrapper so you can just type their name.  On other
    platforms, the scripts are written without a file extension.
 
------
 0.6a1
 -----
 
@@ -2335,7 +2116,6 @@ easy_install
    or documented, and never would have worked without EasyInstall - which it
    pre-dated and was never compatible with.
 
-------
 0.5a12
 ------
 
@@ -2343,14 +2123,12 @@ easy_install
    ``python -m``, and marks them as unsafe for zipping, since Python 2.4 can't
    handle ``-m`` on zipped modules.
 
-------
 0.5a11
 ------
 
  * Fix breakage of the "develop" command that was caused by the addition of
    ``--always-unzip`` to the ``easy_install`` command.
 
------
 0.5a9
 -----
 
@@ -2385,7 +2163,6 @@ easy_install
 
  * Fixed the swapped ``-d`` and ``-b`` options of ``bdist_egg``.
 
------
 0.5a8
 -----
 
@@ -2413,7 +2190,6 @@ easy_install
  * Added a "setopt" command that sets a single option in a specified distutils
    configuration file.
 
------
 0.5a7
 -----
 
@@ -2421,7 +2197,6 @@ easy_install
    fix for "upload" and a temporary workaround for lack of .egg support in
    PyPI.
 
------
 0.5a6
 -----
 
@@ -2440,7 +2215,6 @@ easy_install
    revisions compare *lower* than the version specified in setup.py (e.g. by
    using ``--tag-build=dev``).
 
------
 0.5a5
 -----
 
@@ -2468,7 +2242,6 @@ easy_install
    accordingly.  ``easy_install.py`` is still installed as a script, but not as
    a module.
 
------
 0.5a4
 -----
 
@@ -2484,7 +2257,6 @@ easy_install
  * Setup scripts using setuptools now always install using ``easy_install``
    internally, for ease of uninstallation and upgrading.
 
------
 0.5a1
 -----
 
@@ -2499,7 +2271,6 @@ easy_install
     from setuptools import setup
     # etc...
 
------
 0.4a2
 -----
 
@@ -2527,7 +2298,6 @@ easy_install
    their ``command_consumes_arguments`` attribute to ``True`` in order to
    receive an ``args`` option containing the rest of the command line.
 
------
 0.3a2
 -----
 
@@ -2537,8 +2307,8 @@ easy_install
 
  * Misc. bug fixes
 
------
 0.3a1
 -----
 
  * Initial release.
+

From e2f1814e0d3d8963cf3a1eb4dff6d400b58b4a52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 18:13:32 -0500
Subject: [PATCH 5468/8469] Invoke import on importlib.machinery directly.
 Access an attribute to force import in delayed-import environments. Fixes
 #487.

---
 CHANGES.txt               | 7 +++++++
 pkg_resources/__init__.py | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 06c6aad105..a6f58b2d8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+19.4.1
+------
+
+* Issue #487: Use direct invocation of ``importlib.machinery``
+  in ``pkg_resources`` to avoid missing detection on relevant
+  platforms.
+
 19.4
 ----
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 50b86cdbeb..3ecf4c6458 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -60,10 +60,11 @@
 from os import open as os_open
 from os.path import isdir, split
 
-# Avoid try/except due to potential problems with delayed import mechanisms.
-if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
+try:
     import importlib.machinery as importlib_machinery
-else:
+    # access attribute to force import under delayed import mechanisms.
+    importlib_machinery.__name__
+except ImportError:
     importlib_machinery = None
 
 try:

From dcfeab73aa5309b24c31d2d3f32073aad99ef05c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 18:37:25 -0500
Subject: [PATCH 5469/8469] Bumped to 19.4.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 59c4552914..3ee13bc90e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.5'
+__version__ = '19.4.1'

From 25a12d49012ef636eb5cc929163f89188b084c3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 18:37:27 -0500
Subject: [PATCH 5470/8469] Added tag 19.4.1 for changeset 0bda3291ac72

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1e7eeff0c4..f3337a205b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -236,3 +236,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1
 32bba9bf8cce8350b560a7591c9ef5884a194211 19.3
 f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
+0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1

From 9363ee420bd803f333b31466796ff00a183de66e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 18:49:52 -0500
Subject: [PATCH 5471/8469] Extract variable for candidate encodings

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

diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 18903d9ef9..6eee635167 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -22,11 +22,13 @@ def filesys_decode(path):
     NONE when no expected encoding works
     """
 
-    fs_enc = sys.getfilesystemencoding()
     if isinstance(path, six.text_type):
         return path
 
-    for enc in (fs_enc, "utf-8"):
+    fs_enc = sys.getfilesystemencoding()
+    candidates = fs_enc, 'utf-8'
+
+    for enc in candidates:
         try:
             return path.decode(enc)
         except UnicodeDecodeError:

From 3d018c03405ecb21dfb717311f176c6586df343a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 19:02:08 -0500
Subject: [PATCH 5472/8469] Add test capturing failure. Ref #486.

---
 setuptools/tests/test_unicode_utils.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 setuptools/tests/test_unicode_utils.py

diff --git a/setuptools/tests/test_unicode_utils.py b/setuptools/tests/test_unicode_utils.py
new file mode 100644
index 0000000000..a24a9bd530
--- /dev/null
+++ b/setuptools/tests/test_unicode_utils.py
@@ -0,0 +1,10 @@
+from setuptools import unicode_utils
+
+
+def test_filesys_decode_fs_encoding_is_None(monkeypatch):
+    """
+    Test filesys_decode does not raise TypeError when
+    getfilesystemencoding returns None.
+    """
+    monkeypatch.setattr('sys.getfilesystemencoding', lambda: None)
+    unicode_utils.filesys_decode(b'test')

From 3223234b137e9766a6f4e892a3369b13f57f878b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 19:08:57 -0500
Subject: [PATCH 5473/8469] Avoid TypeError when getfilesystemencoding returns
 None. Fixes #486.

---
 CHANGES.txt                 | 6 ++++++
 setuptools/unicode_utils.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c7f68ab449..11298b57d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+19.4.2
+------
+
+* Issue #486: Correct TypeError when getfilesystemencoding
+  returns None.
+
 19.4.1
 ------
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 6eee635167..ffab3e24ac 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -25,7 +25,7 @@ def filesys_decode(path):
     if isinstance(path, six.text_type):
         return path
 
-    fs_enc = sys.getfilesystemencoding()
+    fs_enc = sys.getfilesystemencoding() or 'utf-8'
     candidates = fs_enc, 'utf-8'
 
     for enc in candidates:

From d0bd7a5612088e5da516c0b183c2b8a04a0e5306 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 20:57:04 -0500
Subject: [PATCH 5474/8469] Relicense the package as MIT license. Drop
 licensing as PSF and Zope as neither of those licenses grant authority for
 use outside their respective projects. Vendored projects are licensed under
 their respective licenses, currently MIT for six and Apache v2 for packaging.
 Fixes #132.

---
 setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index dfb578a152..c7cd364bcc 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,6 @@ def _gen_console_scripts():
                 "Python packages",
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
-    license="PSF or ZPL",
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
     url="https://bitbucket.org/pypa/setuptools",
@@ -134,8 +133,7 @@ def _gen_console_scripts():
     classifiers=textwrap.dedent("""
         Development Status :: 5 - Production/Stable
         Intended Audience :: Developers
-        License :: OSI Approved :: Python Software Foundation License
-        License :: OSI Approved :: Zope Public License
+        License :: OSI Approved :: MIT License
         Operating System :: OS Independent
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7

From 589a2c0c319ba39ebcce7a64c36dc11aefd0ebc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 21:01:32 -0500
Subject: [PATCH 5475/8469] Update changelog.

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 11298b57d8..8177e5bf12 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ CHANGES
 
 * Issue #486: Correct TypeError when getfilesystemencoding
   returns None.
+* Issue #139: Clarified the license as MIT.
 
 19.4.1
 ------

From 5505c6a063f59d0025103a392be1efd067dc1781 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 21:26:06 -0500
Subject: [PATCH 5476/8469] Update changelog

---
 CHANGES.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8177e5bf12..0fbfc26d2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,14 @@
 CHANGES
 =======
 
-19.4.2
-------
+19.5
+----
 
 * Issue #486: Correct TypeError when getfilesystemencoding
   returns None.
 * Issue #139: Clarified the license as MIT.
+* Pull Request #169: Removed special handling of command
+  spec in scripts for Jython.
 
 19.4.1
 ------

From 520cf79afe622d6537c2f036f686350eb6722f04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 21:26:24 -0500
Subject: [PATCH 5477/8469] Bumped to 19.5 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 3ee13bc90e..59c4552914 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.4.1'
+__version__ = '19.5'

From d7b2598ff6d4709ec56be71ca80533ccb31a90ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 21:26:26 -0500
Subject: [PATCH 5478/8469] Added tag 19.5 for changeset 0a68cbab7258

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f3337a205b..dac6f5e3ae 100644
--- a/.hgtags
+++ b/.hgtags
@@ -237,3 +237,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 32bba9bf8cce8350b560a7591c9ef5884a194211 19.3
 f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1
+0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5

From 3b7b733ca9f2e3193426682ae6357b3f29307aa2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2016 21:28:03 -0500
Subject: [PATCH 5479/8469] Bumped to 19.6 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 59c4552914..74a70a41fe 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.5'
+__version__ = '19.6'

From e7f9dab06dc2515fe11e7f31ea948eed5e141470 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Jan 2016 10:07:40 -0500
Subject: [PATCH 5480/8469] Add 'launch' hook, based on
 pip.utils.setuptools_build

---
 CHANGES.txt          | 15 +++++++++++++++
 setuptools/launch.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 setuptools/launch.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 0fbfc26d2d..c82ec5a510 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+19.6
+----
+
+* Added a new entry script ``setuptools.launch``,
+  implementing the shim found in
+  ``pip.util.setuptools_build``. Use this command to launch
+  distutils-only packages under setuptools in the same way that
+  pip does, causing the setuptools monkeypatching of distutils
+  to be invoked prior to invoking a script. Useful for debugging
+  or otherwise installing a distutils-only package under
+  setuptools when pip isn't available or otherwise does not
+  expose the desired functionality. For example::
+
+    $ python -m setuptools.launch setup.py develop
+
 19.5
 ----
 
diff --git a/setuptools/launch.py b/setuptools/launch.py
new file mode 100644
index 0000000000..68cce68112
--- /dev/null
+++ b/setuptools/launch.py
@@ -0,0 +1,28 @@
+"""
+Launch the Python script on the command line after
+setuptools is bootstrapped via import.
+"""
+
+# Note that setuptools gets imported implicitly by the
+# invocation of this script using python -m setuptools.launch
+
+import tokenize
+import sys
+
+
+def load():
+	"""
+	Load the script in sys.argv[1] and run it as if it had
+	been invoked naturally.
+	"""
+	globals()['__file__'] = sys.argv[1]
+	sys.argv[:] = sys.argv[1:]
+
+	open_ = getattr(tokenize, 'open', open)
+	script = open_(__file__).read()
+	norm_script = script.replace('\\r\\n', '\\n')
+	return compile(norm_script, __file__, 'exec')
+
+
+if __name__ == '__main__':
+	exec(load())

From 57d450a4e0485c8c9db04a5b6d02615c3798f418 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Jan 2016 11:49:11 -0500
Subject: [PATCH 5481/8469] Also hide Cython when hiding setuptools, as
 setuptools will have imported Cython and Cython references the
 distutils.Extension. Fixes #488.

---
 CHANGES.txt           | 3 +++
 setuptools/sandbox.py | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c82ec5a510..28d2ef630a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,9 @@ CHANGES
   expose the desired functionality. For example::
 
     $ python -m setuptools.launch setup.py develop
+* Issue #488: Fix dual manifestation of Extension class in
+  extension packages installed as dependencies when Cython
+  is present.
 
 19.5
 ----
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 668bcac72c..23e296b18b 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -207,8 +207,12 @@ def _needs_hiding(mod_name):
     True
     >>> _needs_hiding('distutils')
     True
+    >>> _needs_hiding('os')
+    False
+    >>> _needs_hiding('Cython')
+    True
     """
-    pattern = re.compile('(setuptools|pkg_resources|distutils)(\.|$)')
+    pattern = re.compile('(setuptools|pkg_resources|distutils|Cython)(\.|$)')
     return bool(pattern.match(mod_name))
 
 

From 41b2ead9e312dbf88f86121c5eab1736972b352b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Jan 2016 12:04:35 -0500
Subject: [PATCH 5482/8469] Added tag 19.6b1 for changeset 34121bf49b1a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dac6f5e3ae..d6741a605f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -238,3 +238,4 @@ cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1
 0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5
+34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1

From c697d2a55a6c52564e1de9e066ebefacb15de4af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Jan 2016 19:52:16 -0500
Subject: [PATCH 5483/8469] Added tag 19.6 for changeset 3c2332e4ec72

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d6741a605f..4f9c3a8f2e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -239,3 +239,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1
 0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5
 34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1
+3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6

From bdd0e2d6a9bc38ae1c8b035364b7b23da0845233 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Jan 2016 19:53:32 -0500
Subject: [PATCH 5484/8469] Bumped to 19.7 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 74a70a41fe..2e0bba8709 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.6'
+__version__ = '19.7'

From 634b0aefca69d135dd5226a44fac4c44a47c328d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jan 2016 21:15:02 -0500
Subject: [PATCH 5485/8469] Rather than re-use globals of setuptools.launch,
 build a unique namespace in which to launch the script. Prevents imports from
 occuring relative to 'setuptools' on Python 2. Ref #490.

---
 setuptools/launch.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/setuptools/launch.py b/setuptools/launch.py
index 68cce68112..06e15e1e6e 100644
--- a/setuptools/launch.py
+++ b/setuptools/launch.py
@@ -10,19 +10,26 @@
 import sys
 
 
-def load():
+def run():
 	"""
-	Load the script in sys.argv[1] and run it as if it had
+	Run the script in sys.argv[1] as if it had
 	been invoked naturally.
 	"""
-	globals()['__file__'] = sys.argv[1]
+	__builtins__
+	script_name = sys.argv[1]
+	namespace = dict(
+		__file__ = script_name,
+		__name__ = '__main__',
+		__doc__ = None,
+	)
 	sys.argv[:] = sys.argv[1:]
 
 	open_ = getattr(tokenize, 'open', open)
-	script = open_(__file__).read()
+	script = open_(script_name).read()
 	norm_script = script.replace('\\r\\n', '\\n')
-	return compile(norm_script, __file__, 'exec')
+	code = compile(norm_script, script_name, 'exec')
+	exec(code, namespace)
 
 
 if __name__ == '__main__':
-	exec(load())
+	run()

From e01792ec62653b00b6d1c25e1ca0d10d22c1b6b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Jan 2016 14:30:34 -0500
Subject: [PATCH 5486/8469] Combine redundant imports of future functionality

---
 pkg_resources/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3ecf4c6458..2ba5ca4201 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -46,7 +46,7 @@
     import imp as _imp
 
 from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib, map
+from pkg_resources.extern.six.moves import urllib, map, filter
 
 # capture these to bypass sandboxing
 from os import utime
@@ -77,9 +77,6 @@
 __import__('pkg_resources.extern.packaging.specifiers')
 
 
-filter = six.moves.filter
-map = six.moves.map
-
 if (3, 0) < sys.version_info < (3, 3):
     msg = (
         "Support for Python 3.0-3.2 has been dropped. Future versions "

From 397d759e48bc93597c535c2335c9da37178721a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Jan 2016 14:34:31 -0500
Subject: [PATCH 5487/8469] Pull up DefaultProvider registration into a
 classmethod.

---
 pkg_resources/__init__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2ba5ca4201..b4f910c621 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1725,10 +1725,14 @@ def _get(self, path):
         with open(path, 'rb') as stream:
             return stream.read()
 
-register_loader_type(type(None), DefaultProvider)
+    @classmethod
+    def _register(cls):
+        register_loader_type(type(None), cls)
 
-if importlib_machinery is not None:
-    register_loader_type(importlib_machinery.SourceFileLoader, DefaultProvider)
+        if importlib_machinery is not None:
+            register_loader_type(importlib_machinery.SourceFileLoader, cls)
+
+DefaultProvider._register()
 
 
 class EmptyProvider(NullProvider):

From 66b3a623dd256def923ddde303b8c95592d0223b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Jan 2016 14:42:03 -0500
Subject: [PATCH 5488/8469] Adapt resolution of classes from
 importlib.machinery. Restores compatibility for PyPy3 where
 importlib.machinery exists but FileFinder and SourceFileLoader aren't
 implemented.

---
 pkg_resources/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b4f910c621..f15becbbcb 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1727,10 +1727,9 @@ def _get(self, path):
 
     @classmethod
     def _register(cls):
-        register_loader_type(type(None), cls)
-
-        if importlib_machinery is not None:
-            register_loader_type(importlib_machinery.SourceFileLoader, cls)
+        loader_cls = getattr(importlib_machinery, 'SourceFileLoader',
+            type(None))
+        register_loader_type(loader_cls, cls)
 
 DefaultProvider._register()
 
@@ -2138,7 +2137,7 @@ def find_on_path(importer, path_item, only=False):
                         break
 register_finder(pkgutil.ImpImporter, find_on_path)
 
-if importlib_machinery is not None:
+if hasattr(importlib_machinery, 'FileFinder'):
     register_finder(importlib_machinery.FileFinder, find_on_path)
 
 _declare_state('dict', _namespace_handlers={})
@@ -2255,7 +2254,7 @@ def file_ns_handler(importer, path_item, packageName, module):
 register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
 
-if importlib_machinery is not None:
+if hasattr(importlib_machinery, 'FileFinder'):
     register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
 
 

From 8a3d7feb9b044c9a51664eb3a91677240ed9ccf6 Mon Sep 17 00:00:00 2001
From: Matt Iversen <teh.ivo@gmail.com>
Date: Fri, 29 Jan 2016 00:45:29 +1100
Subject: [PATCH 5489/8469] Test on pypy3

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 54d9c395bc..6304d5e7f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - 3.4
   - 3.5
   - pypy
+  - pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From e2081731f4c41a1461c76c262ed020321c71549b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jan 2016 10:00:04 -0500
Subject: [PATCH 5490/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 28d2ef630a..90ae01a9ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+19.6.1
+------
+
+* Restore compatibility for PyPy 3 compatibility lost in
+  19.4.1 addressing Issue #487.
+* ``setuptools.launch`` shim now loads scripts in a new
+  namespace, avoiding getting relative imports from
+  the setuptools package on Python 2.
+
 19.6
 ----
 
@@ -16,6 +25,7 @@ CHANGES
   expose the desired functionality. For example::
 
     $ python -m setuptools.launch setup.py develop
+
 * Issue #488: Fix dual manifestation of Extension class in
   extension packages installed as dependencies when Cython
   is present.

From d6df1b3444cb487484ff8202cff121b147c0e1d5 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Fri, 29 Jan 2016 05:13:36 +1100
Subject: [PATCH 5491/8469] Allow failures with pypy3 for now

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6304d5e7f1..ae14639aeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ python:
   - 3.5
   - pypy
   - pypy3
+matrix:
+  allow_failures:
+    - python: pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From 7b4bb264a3f44b18db85d623e23451379518e12a Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Fri, 29 Jan 2016 05:15:41 +1100
Subject: [PATCH 5492/8469] Bumped to 19.6.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 2e0bba8709..41300aee69 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.7'
+__version__ = '19.6.1'

From 0ed59a4c02f32cd23699b95cc3c38775a19f7840 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Fri, 29 Jan 2016 05:16:00 +1100
Subject: [PATCH 5493/8469] Added tag 19.6.1 for changeset 35d9179d0439

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4f9c3a8f2e..2fd2cd338a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -240,3 +240,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5
 34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1
 3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6
+35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1

From eca386ea886913f115a4a4456702a838515a7e7e Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Fri, 29 Jan 2016 05:19:57 +1100
Subject: [PATCH 5494/8469] Bumped to 19.6.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 41300aee69..89a23e8bfc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.6.1'
+__version__ = '19.6.2'

From d16b24ef68298295224f078c96fcbf732aa0dacc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:24:04 -0500
Subject: [PATCH 5495/8469] Extract function _rebuild_mod_path

---
 pkg_resources/__init__.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f15becbbcb..3398a56b48 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2183,18 +2183,24 @@ def _handle_ns(packageName, path_item):
         path = module.__path__
         path.append(subpath)
         loader.load_module(packageName)
+        _rebuild_mod_path(path, packageName, module)
+    return subpath
 
-        # Rebuild mod.__path__ ensuring that all entries are ordered
-        # corresponding to their sys.path order
-        sys_path= [(p and _normalize_cached(p) or p) for p in sys.path]
-        def sort_key(p):
-            parts = p.split(os.sep)
-            parts = parts[:-(packageName.count('.') + 1)]
-            return sys_path.index(_normalize_cached(os.sep.join(parts)))
 
-        path.sort(key=sort_key)
-        module.__path__[:] = [_normalize_cached(p) for p in path]
-    return subpath
+def _rebuild_mod_path(orig_path, package_name, module):
+    """
+    Rebuild module.__path__ ensuring that all entries are ordered
+    corresponding to their sys.path order
+    """
+    sys_path= [(p and _normalize_cached(p) or p) for p in sys.path]
+    def sort_key(p):
+        parts = p.split(os.sep)
+        parts = parts[:-(package_name.count('.') + 1)]
+        return sys_path.index(_normalize_cached(os.sep.join(parts)))
+
+    orig_path.sort(key=sort_key)
+    module.__path__[:] = [_normalize_cached(p) for p in orig_path]
+
 
 def declare_namespace(packageName):
     """Declare that package 'packageName' is a namespace package"""

From c8a0d2d70aedf13382c6e0a506c04d449851ec45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:28:06 -0500
Subject: [PATCH 5496/8469] Rename inner function and add docstring

---
 pkg_resources/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3398a56b48..7065806234 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2192,13 +2192,16 @@ def _rebuild_mod_path(orig_path, package_name, module):
     Rebuild module.__path__ ensuring that all entries are ordered
     corresponding to their sys.path order
     """
-    sys_path= [(p and _normalize_cached(p) or p) for p in sys.path]
-    def sort_key(p):
+    sys_path = [(p and _normalize_cached(p) or p) for p in sys.path]
+    def position_in_sys_path(p):
+        """
+        Return the ordinal of the path based on its position in sys.path
+        """
         parts = p.split(os.sep)
         parts = parts[:-(package_name.count('.') + 1)]
         return sys_path.index(_normalize_cached(os.sep.join(parts)))
 
-    orig_path.sort(key=sort_key)
+    orig_path.sort(key=position_in_sys_path)
     module.__path__[:] = [_normalize_cached(p) for p in orig_path]
 
 

From 94e1f4c266b7fdde993c5fde05f87dcc0afd186e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:46:53 -0500
Subject: [PATCH 5497/8469] Normalize all paths, not excluding ''. Fixes #491.

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7065806234..7ba23bf588 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2192,7 +2192,7 @@ def _rebuild_mod_path(orig_path, package_name, module):
     Rebuild module.__path__ ensuring that all entries are ordered
     corresponding to their sys.path order
     """
-    sys_path = [(p and _normalize_cached(p) or p) for p in sys.path]
+    sys_path = [_normalize_cached(p) for p in sys.path]
     def position_in_sys_path(p):
         """
         Return the ordinal of the path based on its position in sys.path

From 584a30b2a7dd601ee46ff9746d9084e3a223ecc8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:50:26 -0500
Subject: [PATCH 5498/8469] Update changelog

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 90ae01a9ac..a158997401 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+19.6.2
+------
+
+* Issue #491: Correct regression incurred in 19.4 where
+  a double-namespace package installed using pip would
+  cause a TypeError.
+
 19.6.1
 ------
 

From 15d072b8ff76fa2c1e0895041a3ba736d0db048e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:50:55 -0500
Subject: [PATCH 5499/8469] Added tag 19.6.2 for changeset d2782cbb2f15

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2fd2cd338a..11c9451561 100644
--- a/.hgtags
+++ b/.hgtags
@@ -241,3 +241,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1
 3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6
 35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1
+d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2

From 783fe0bbcec577fcca5f5fbc247c2b0b86697721 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 04:52:13 -0500
Subject: [PATCH 5500/8469] Bumped to 19.6.3 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 89a23e8bfc..9228cbfb87 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.6.2'
+__version__ = '19.6.3'

From 0dcee791dfdcfacddaaec79b29f30a347a147413 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 21:35:13 -0500
Subject: [PATCH 5501/8469] Extract variable for template string

---
 pkg_resources/__init__.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7ba23bf588..4fdc5f91c5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1174,22 +1174,23 @@ def extraction_error(self):
         old_exc = sys.exc_info()[1]
         cache_path = self.extraction_path or get_default_cache()
 
-        err = ExtractionError("""Can't extract file(s) to egg cache
+        tmpl = textwrap.dedent("""
+            Can't extract file(s) to egg cache
 
-The following error occurred while trying to extract file(s) to the Python egg
-cache:
+            The following error occurred while trying to extract file(s) to the Python egg
+            cache:
 
-  %s
+              %s
 
-The Python egg cache directory is currently set to:
+            The Python egg cache directory is currently set to:
 
-  %s
+              %s
 
-Perhaps your account does not have write access to this directory?  You can
-change the cache directory by setting the PYTHON_EGG_CACHE environment
-variable to point to an accessible directory.
-""" % (old_exc, cache_path)
-        )
+            Perhaps your account does not have write access to this directory?  You can
+            change the cache directory by setting the PYTHON_EGG_CACHE environment
+            variable to point to an accessible directory.
+            """).lstrip()
+        err = ExtractionError(tmpl % (old_exc, cache_path))
         err.manager = self
         err.cache_path = cache_path
         err.original_error = old_exc

From f9bd9b9f5df54ef5a0bf8d16c3a889ab8c640580 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jan 2016 21:36:23 -0500
Subject: [PATCH 5502/8469] Use new style string formatting

---
 pkg_resources/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4fdc5f91c5..d04cd347d4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1180,17 +1180,17 @@ def extraction_error(self):
             The following error occurred while trying to extract file(s) to the Python egg
             cache:
 
-              %s
+              {old_exc}
 
             The Python egg cache directory is currently set to:
 
-              %s
+              {cache_path}
 
             Perhaps your account does not have write access to this directory?  You can
             change the cache directory by setting the PYTHON_EGG_CACHE environment
             variable to point to an accessible directory.
             """).lstrip()
-        err = ExtractionError(tmpl % (old_exc, cache_path))
+        err = ExtractionError(tmpl.format(**locals()))
         err.manager = self
         err.cache_path = cache_path
         err.original_error = old_exc

From 3ae46c30225eb46e1f5aada1a19e88b79f04dc72 Mon Sep 17 00:00:00 2001
From: Julien Cigar <julien.cigar@gmail.com>
Date: Wed, 3 Feb 2016 10:25:07 +0100
Subject: [PATCH 5503/8469] FreeBSD: Add root certificate from ca_root_nss.

On FreeBSD root certificates from certificate authorities included in the
Mozilla NSS library are provided by the ca_root_nss package:

jcigar@frodon:~/ > pkg info -l ca_root_nss-3.21
ca_root_nss-3.21:
    /usr/local/etc/ssl/cert.pem.sample
    /usr/local/openssl/cert.pem.sample
    /usr/local/share/certs/ca-root-nss.crt
    /usr/local/share/licenses/ca_root_nss-3.21/LICENSE
    /usr/local/share/licenses/ca_root_nss-3.21/MPL
    /usr/local/share/licenses/ca_root_nss-3.21/catalog.mk

On some machines there is no symbolic link (/etc/ssl/cert.pem) installed
---
 setuptools/ssl_support.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 511d2fa8cd..657197cfb1 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -25,6 +25,7 @@
 /usr/local/share/certs/ca-root.crt
 /etc/ssl/cert.pem
 /System/Library/OpenSSL/certs/cert.pem
+/usr/local/share/certs/ca-root-nss.crt
 """.strip().split()
 
 

From 725bf101f83f4a8f1bd3e11704664481d102775d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 08:20:09 -0500
Subject: [PATCH 5504/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index a158997401..50f1f8f1aa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+19.7
+----
+
+* `Off-project PR <https://github.com/jaraco/setuptools/pull/32>`_:
+  For FreeBSD, also honor root certificates from ca_root_nss.
+
 19.6.2
 ------
 

From 9221fdd1e7f04d257d5cf8af98e8f94bd73a4fec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 08:20:24 -0500
Subject: [PATCH 5505/8469] Bumped to 19.7 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 9228cbfb87..2e0bba8709 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.6.3'
+__version__ = '19.7'

From 0b07812cf5aeb88602502e8338cfbc660bc94ffe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 08:20:28 -0500
Subject: [PATCH 5506/8469] Added tag 19.7 for changeset c6e619ce910d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 11c9451561..0fa346ab48 100644
--- a/.hgtags
+++ b/.hgtags
@@ -242,3 +242,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6
 35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1
 d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
+c6e619ce910d1650cc2433f94e5594964085f973 19.7

From 53bef9f89286363756bc8efbbba243486897969a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 08:22:13 -0500
Subject: [PATCH 5507/8469] Bumped to 19.8 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 2e0bba8709..5d04285101 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.7'
+__version__ = '19.8'

From e3d7334022838f8153a06b0105c6b8f4a32762a2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 09:02:34 -0500
Subject: [PATCH 5508/8469] Rewrite setup/teardown methods as pytest fixtures,
 encapsulating concepts for clarity. Incidentally, this also fixes #231.

---
 pkg_resources/tests/test_resources.py | 94 +++++++++++++++------------
 1 file changed, 52 insertions(+), 42 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 6f68bf7763..49acd03693 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -610,35 +610,41 @@ def testVersionHashable(self):
 
 class TestNamespaces:
 
-    def setup_method(self, method):
-        self._ns_pkgs = pkg_resources._namespace_packages.copy()
-
-        # Further, test case where the temp dir is a symlink, where applicable
-        # See #231
-        if hasattr(os, 'symlink'):
-            real_tmpdir = tempfile.mkdtemp(prefix="real-tests-setuptools-")
-            tmpdir_base, tmpdir_name = os.path.split(real_tmpdir)
-            tmpdir = os.path.join(tmpdir_base, tmpdir_name[5:])
-            os.symlink(real_tmpdir, tmpdir)
-            self._real_tmpdir = real_tmpdir
-            self._tmpdir = tmpdir
-        else:
-            tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
-            self._real_tmpdir = self._tmpdir = tmpdir
-
-        os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
-        self._prev_sys_path = sys.path[:]
-        sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
-
-    def teardown_method(self, method):
-        shutil.rmtree(self._real_tmpdir)
-        if os.path.islink(self._tmpdir):
-            os.unlink(self._tmpdir)
-
-        pkg_resources._namespace_packages = self._ns_pkgs.copy()
-        sys.path = self._prev_sys_path[:]
-
-    def test_two_levels_deep(self):
+    @pytest.yield_fixture
+    def symlinked_tmpdir(self, tmpdir):
+        """
+        Where available, return the tempdir as a symlink,
+        which as revealed in #231 is more fragile than
+        a natural tempdir.
+        """
+        if not hasattr(os, 'symlink'):
+            return str(tmpdir)
+
+        link_name = str(tmpdir) + '-linked'
+        os.symlink(str(tmpdir), link_name)
+        try:
+            yield type(tmpdir)(link_name)
+        finally:
+            os.unlink(link_name)
+
+    @pytest.yield_fixture(autouse=True)
+    def patched_path(self, tmpdir):
+        """
+        Patch sys.path to include the 'site-pkgs' dir. Also
+        restore pkg_resources._namespace_packages to its
+        former state.
+        """
+        saved_ns_pkgs = pkg_resources._namespace_packages.copy()
+        saved_sys_path = sys.path[:]
+        site_pkgs = tmpdir.mkdir('site-pkgs')
+        sys.path.append(str(site_pkgs))
+        try:
+            yield
+        finally:
+            pkg_resources._namespace_packages = saved_ns_pkgs
+            sys.path = saved_sys_path
+
+    def test_two_levels_deep(self, symlinked_tmpdir):
         """
         Test nested namespace packages
         Create namespace packages in the following tree :
@@ -647,16 +653,18 @@ def test_two_levels_deep(self):
         Check both are in the _namespace_packages dict and that their __path__
         is correct
         """
-        sys.path.append(os.path.join(self._tmpdir, "site-pkgs2"))
-        os.makedirs(os.path.join(self._tmpdir, "site-pkgs", "pkg1", "pkg2"))
-        os.makedirs(os.path.join(self._tmpdir, "site-pkgs2", "pkg1", "pkg2"))
+        real_tmpdir = str(symlinked_tmpdir.realpath())
+        tmpdir = str(symlinked_tmpdir)
+        sys.path.append(os.path.join(tmpdir, "site-pkgs2"))
+        os.makedirs(os.path.join(tmpdir, "site-pkgs", "pkg1", "pkg2"))
+        os.makedirs(os.path.join(tmpdir, "site-pkgs2", "pkg1", "pkg2"))
         ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
         for site in ["site-pkgs", "site-pkgs2"]:
-            pkg1_init = open(os.path.join(self._tmpdir, site,
+            pkg1_init = open(os.path.join(tmpdir, site,
                              "pkg1", "__init__.py"), "w")
             pkg1_init.write(ns_str)
             pkg1_init.close()
-            pkg2_init = open(os.path.join(self._tmpdir, site,
+            pkg2_init = open(os.path.join(tmpdir, site,
                              "pkg1", "pkg2", "__init__.py"), "w")
             pkg2_init.write(ns_str)
             pkg2_init.close()
@@ -669,12 +677,12 @@ def test_two_levels_deep(self):
         assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]
         # check the __path__ attribute contains both paths
         expected = [
-            os.path.join(self._real_tmpdir, "site-pkgs", "pkg1", "pkg2"),
-            os.path.join(self._real_tmpdir, "site-pkgs2", "pkg1", "pkg2"),
+            os.path.join(real_tmpdir, "site-pkgs", "pkg1", "pkg2"),
+            os.path.join(real_tmpdir, "site-pkgs2", "pkg1", "pkg2"),
         ]
         assert pkg1.pkg2.__path__ == expected
 
-    def test_path_order(self):
+    def test_path_order(self, symlinked_tmpdir):
         """
         Test that if multiple versions of the same namespace package subpackage
         are on different sys.path entries, that only the one earliest on
@@ -684,6 +692,8 @@ def test_path_order(self):
         Regression test for https://bitbucket.org/pypa/setuptools/issues/207
         """
 
+        real_tmpdir = str(symlinked_tmpdir.realpath())
+        tmpdir = str(symlinked_tmpdir)
         site_pkgs = ["site-pkgs", "site-pkgs2", "site-pkgs3"]
 
         ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
@@ -691,19 +701,19 @@ def test_path_order(self):
 
         for idx, site in enumerate(site_pkgs):
             if idx > 0:
-                sys.path.append(os.path.join(self._tmpdir, site))
-            os.makedirs(os.path.join(self._tmpdir, site, "nspkg", "subpkg"))
-            with open(os.path.join(self._tmpdir, site, "nspkg",
+                sys.path.append(os.path.join(tmpdir, site))
+            os.makedirs(os.path.join(tmpdir, site, "nspkg", "subpkg"))
+            with open(os.path.join(tmpdir, site, "nspkg",
                                    "__init__.py"), "w") as f:
                 f.write(ns_str)
 
-            with open(os.path.join(self._tmpdir, site, "nspkg", "subpkg",
+            with open(os.path.join(tmpdir, site, "nspkg", "subpkg",
                                    "__init__.py"), "w") as f:
                 f.write(vers_str % (idx + 1))
 
         import nspkg.subpkg
         import nspkg
-        assert nspkg.__path__ == [os.path.join(self._real_tmpdir, site,
+        assert nspkg.__path__ == [os.path.join(real_tmpdir, site,
                                                "nspkg")
                                   for site in site_pkgs]
         assert nspkg.subpkg.__version__ == 1

From 397879392e928a873953bddd978dd87292211e62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:06:00 -0500
Subject: [PATCH 5509/8469] Use py.path objects for cleaner setup

---
 pkg_resources/tests/test_resources.py | 28 ++++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 49acd03693..00f0307d3e 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -653,21 +653,17 @@ def test_two_levels_deep(self, symlinked_tmpdir):
         Check both are in the _namespace_packages dict and that their __path__
         is correct
         """
-        real_tmpdir = str(symlinked_tmpdir.realpath())
-        tmpdir = str(symlinked_tmpdir)
-        sys.path.append(os.path.join(tmpdir, "site-pkgs2"))
-        os.makedirs(os.path.join(tmpdir, "site-pkgs", "pkg1", "pkg2"))
-        os.makedirs(os.path.join(tmpdir, "site-pkgs2", "pkg1", "pkg2"))
+        real_tmpdir = symlinked_tmpdir.realpath()
+        tmpdir = symlinked_tmpdir
+        sys.path.append(str(tmpdir / 'site-pkgs2'))
+        site_dirs = tmpdir / 'site-pkgs', tmpdir / 'site-pkgs2'
         ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
-        for site in ["site-pkgs", "site-pkgs2"]:
-            pkg1_init = open(os.path.join(tmpdir, site,
-                             "pkg1", "__init__.py"), "w")
-            pkg1_init.write(ns_str)
-            pkg1_init.close()
-            pkg2_init = open(os.path.join(tmpdir, site,
-                             "pkg1", "pkg2", "__init__.py"), "w")
-            pkg2_init.write(ns_str)
-            pkg2_init.close()
+        for site in site_dirs:
+            pkg1 = site / 'pkg1'
+            pkg2 = pkg1 / 'pkg2'
+            pkg2.ensure_dir()
+            (pkg1 / '__init__.py').write_text(ns_str, encoding='utf-8')
+            (pkg2 / '__init__.py').write_text(ns_str, encoding='utf-8')
         import pkg1
         assert "pkg1" in pkg_resources._namespace_packages
         # attempt to import pkg2 from site-pkgs2
@@ -677,8 +673,8 @@ def test_two_levels_deep(self, symlinked_tmpdir):
         assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]
         # check the __path__ attribute contains both paths
         expected = [
-            os.path.join(real_tmpdir, "site-pkgs", "pkg1", "pkg2"),
-            os.path.join(real_tmpdir, "site-pkgs2", "pkg1", "pkg2"),
+            str(real_tmpdir / "site-pkgs" / "pkg1" / "pkg2"),
+            str(real_tmpdir / "site-pkgs2" / "pkg1" / "pkg2"),
         ]
         assert pkg1.pkg2.__path__ == expected
 

From 656a5f3b9c4f289c28e2810ce10ca71b571d6a2c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:13:36 -0500
Subject: [PATCH 5510/8469] Extract variable for readability

---
 pkg_resources/tests/test_resources.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 00f0307d3e..c6ab6d0e67 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -709,7 +709,9 @@ def test_path_order(self, symlinked_tmpdir):
 
         import nspkg.subpkg
         import nspkg
-        assert nspkg.__path__ == [os.path.join(real_tmpdir, site,
-                                               "nspkg")
-                                  for site in site_pkgs]
+        expected = [
+            os.path.join(real_tmpdir, site, "nspkg")
+            for site in site_pkgs
+        ]
+        assert nspkg.__path__ == expected
         assert nspkg.subpkg.__version__ == 1

From 3ff6789b02e2543cb352c8c9f89ceda5c61ca74e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:16:32 -0500
Subject: [PATCH 5511/8469] Use py.path objects for cleaner setup

---
 pkg_resources/tests/test_resources.py | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index c6ab6d0e67..553eecb4b8 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -688,30 +688,30 @@ def test_path_order(self, symlinked_tmpdir):
         Regression test for https://bitbucket.org/pypa/setuptools/issues/207
         """
 
-        real_tmpdir = str(symlinked_tmpdir.realpath())
-        tmpdir = str(symlinked_tmpdir)
-        site_pkgs = ["site-pkgs", "site-pkgs2", "site-pkgs3"]
+        tmpdir = symlinked_tmpdir
+        site_dirs = (
+            tmpdir / "site-pkgs",
+            tmpdir / "site-pkgs2",
+            tmpdir / "site-pkgs3",
+        )
 
         ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
         vers_str = "__version__ = %r"
 
-        for idx, site in enumerate(site_pkgs):
+        for idx, site in enumerate(site_dirs):
             if idx > 0:
-                sys.path.append(os.path.join(tmpdir, site))
-            os.makedirs(os.path.join(tmpdir, site, "nspkg", "subpkg"))
-            with open(os.path.join(tmpdir, site, "nspkg",
-                                   "__init__.py"), "w") as f:
-                f.write(ns_str)
-
-            with open(os.path.join(tmpdir, site, "nspkg", "subpkg",
-                                   "__init__.py"), "w") as f:
-                f.write(vers_str % (idx + 1))
+                sys.path.append(str(site))
+            nspkg = site / 'nspkg'
+            subpkg = nspkg / 'subpkg'
+            subpkg.ensure_dir()
+            (nspkg / '__init__.py').write_text(ns_str, encoding='utf-8')
+            (subpkg / '__init__.py').write_text(vers_str % (idx + 1), encoding='utf-8')
 
         import nspkg.subpkg
         import nspkg
         expected = [
-            os.path.join(real_tmpdir, site, "nspkg")
-            for site in site_pkgs
+            str(site.realpath() / 'nspkg')
+            for site in site_dirs
         ]
         assert nspkg.__path__ == expected
         assert nspkg.subpkg.__version__ == 1

From a9a38182f64da197bd52efdf3c63d68448c80942 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:17:48 -0500
Subject: [PATCH 5512/8469] Use consistent numbering for clarity.

---
 pkg_resources/tests/test_resources.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 553eecb4b8..5b3ba5463b 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -698,14 +698,14 @@ def test_path_order(self, symlinked_tmpdir):
         ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
         vers_str = "__version__ = %r"
 
-        for idx, site in enumerate(site_dirs):
-            if idx > 0:
+        for number, site in enumerate(site_dirs, 1):
+            if number > 1:
                 sys.path.append(str(site))
             nspkg = site / 'nspkg'
             subpkg = nspkg / 'subpkg'
             subpkg.ensure_dir()
             (nspkg / '__init__.py').write_text(ns_str, encoding='utf-8')
-            (subpkg / '__init__.py').write_text(vers_str % (idx + 1), encoding='utf-8')
+            (subpkg / '__init__.py').write_text(vers_str % number, encoding='utf-8')
 
         import nspkg.subpkg
         import nspkg

From 20413e816e9c0809c97598b0a758120be6460f90 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:20:29 -0500
Subject: [PATCH 5513/8469] Extract ns_str as class attribute

---
 pkg_resources/tests/test_resources.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 5b3ba5463b..e25fbc780f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -610,6 +610,8 @@ def testVersionHashable(self):
 
 class TestNamespaces:
 
+    ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
+
     @pytest.yield_fixture
     def symlinked_tmpdir(self, tmpdir):
         """
@@ -657,13 +659,12 @@ def test_two_levels_deep(self, symlinked_tmpdir):
         tmpdir = symlinked_tmpdir
         sys.path.append(str(tmpdir / 'site-pkgs2'))
         site_dirs = tmpdir / 'site-pkgs', tmpdir / 'site-pkgs2'
-        ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
         for site in site_dirs:
             pkg1 = site / 'pkg1'
             pkg2 = pkg1 / 'pkg2'
             pkg2.ensure_dir()
-            (pkg1 / '__init__.py').write_text(ns_str, encoding='utf-8')
-            (pkg2 / '__init__.py').write_text(ns_str, encoding='utf-8')
+            (pkg1 / '__init__.py').write_text(self.ns_str, encoding='utf-8')
+            (pkg2 / '__init__.py').write_text(self.ns_str, encoding='utf-8')
         import pkg1
         assert "pkg1" in pkg_resources._namespace_packages
         # attempt to import pkg2 from site-pkgs2
@@ -695,7 +696,6 @@ def test_path_order(self, symlinked_tmpdir):
             tmpdir / "site-pkgs3",
         )
 
-        ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
         vers_str = "__version__ = %r"
 
         for number, site in enumerate(site_dirs, 1):
@@ -704,7 +704,7 @@ def test_path_order(self, symlinked_tmpdir):
             nspkg = site / 'nspkg'
             subpkg = nspkg / 'subpkg'
             subpkg.ensure_dir()
-            (nspkg / '__init__.py').write_text(ns_str, encoding='utf-8')
+            (nspkg / '__init__.py').write_text(self.ns_str, encoding='utf-8')
             (subpkg / '__init__.py').write_text(vers_str % number, encoding='utf-8')
 
         import nspkg.subpkg

From 8954900a7c88831cf96679f404c2e02e16cefda0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Feb 2016 10:22:24 -0500
Subject: [PATCH 5514/8469] Remove unused imports

---
 pkg_resources/tests/test_resources.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index e25fbc780f..542795cfaa 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -1,7 +1,5 @@
 import os
 import sys
-import tempfile
-import shutil
 import string
 
 from pkg_resources.extern.six.moves import map

From 0e689bb35e8af9f079f6985a11c80268575f786e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:25:06 -0500
Subject: [PATCH 5515/8469] Backout changeset
 1ae2a75724bbba56373784f185a7f235ed0f24a4

---
 setuptools/command/install_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index fd0f118b33..992709f19a 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -27,7 +27,7 @@ def finalize_options(self):
         ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs = [self.target]
+        self.outputs = []
 
     def run(self):
         self.run_command('egg_info')

From 64378483fd433d4c7ca6a50c588b9bcb297de392 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:31:49 -0500
Subject: [PATCH 5516/8469] Bumped to 20.0 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 5d04285101..b4d85e519c 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.8'
+__version__ = '20.0'

From bc9ec216eb133fd0b593dfd2661878f9c020bc7a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:38:18 -0500
Subject: [PATCH 5517/8469] Fix syntax errors on Python 2

---
 pkg_resources/tests/test_resources.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 542795cfaa..efaf8db4e6 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -618,7 +618,8 @@ def symlinked_tmpdir(self, tmpdir):
         a natural tempdir.
         """
         if not hasattr(os, 'symlink'):
-            return str(tmpdir)
+            yield str(tmpdir)
+            return
 
         link_name = str(tmpdir) + '-linked'
         os.symlink(str(tmpdir), link_name)

From b8d92af19e26efa9bf50c2d3e63618b0a6f09fa5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:38:50 -0500
Subject: [PATCH 5518/8469] Fix failing tests on Python 2

---
 pkg_resources/tests/test_resources.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index efaf8db4e6..f2afdf9527 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 import sys
 import string

From f15fef5e8c96e2d20ed2007fa7cacd9ef61c9313 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:40:56 -0500
Subject: [PATCH 5519/8469] Added tag 20.0 for changeset 2a60daeff0cd

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0fa346ab48..678b2e369f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -243,3 +243,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1
 d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
 c6e619ce910d1650cc2433f94e5594964085f973 19.7
+2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0

From 5375ca253fb968b9351658de2abc738f758071ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Feb 2016 09:42:10 -0500
Subject: [PATCH 5520/8469] Bumped to 20.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index b4d85e519c..0e828f12c8 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.0'
+__version__ = '20.1'

From ba5633b3c7b9317b87130a2ea671d8c008a673d6 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 8 Feb 2016 16:51:52 +1100
Subject: [PATCH 5521/8469] Switch back to SyntaxError for invalid markers,
 stops consumers having to import packaging themselves

---
 pkg_resources/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4e3a25aeb3..b0b04579c4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1395,7 +1395,7 @@ def invalid_marker(text):
     """
     try:
         evaluate_marker(text)
-    except packaging.markers.InvalidMarker as e:
+    except SyntaxError as e:
         e.filename = None
         e.lineno = None
         return e
@@ -1406,12 +1406,15 @@ def evaluate_marker(text, extra=None):
     """
     Evaluate a PEP 508 environment marker.
     Return a boolean indicating the marker result in this environment.
-    Raise InvalidMarker if marker is invalid.
+    Raise SyntaxError if marker is invalid.
 
     This implementation uses the 'pyparsing' module.
     """
     marker = packaging.markers.Marker(text)
-    return marker.evaluate()
+    try:
+        return marker.evaluate()
+    except packaging.marker.InvalidMarker as e:
+        raise SyntaxError(e)
 
 
 class NullProvider:

From cf9402a0d8b83b15353801b9a16e1330426a049c Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 8 Feb 2016 17:00:03 +1100
Subject: [PATCH 5522/8469] Update to packaging 16.1

---
 Makefile                                      |  2 +-
 pkg_resources/_vendor/packaging/__about__.py  |  4 +-
 pkg_resources/_vendor/packaging/markers.py    | 48 ++++++++++++++-----
 .../_vendor/packaging/requirements.py         |  2 +-
 pkg_resources/_vendor/packaging/specifiers.py | 18 +++----
 pkg_resources/_vendor/vendored.txt            |  2 +-
 6 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 7574057c19..e0aa419526 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,6 @@ update-vendored:
 	rm -rf pkg_resources/_vendor/six*
 	rm -rf pkg_resources/_vendor/pyparsing*
 	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
-	sed -i -e 's/ \(pyparsing|six\)/ pkg_resources.extern.\1/' \
+	sed -i 's/ \(pyparsing\|six\)/ pkg_resources.extern.\1/' \
 		pkg_resources/_vendor/packaging/*.py
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index 7058e69a47..313613b953 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,10 +12,10 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "15.4.dev0"
+__version__ = "16.1"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
 __license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2014-2015 %s" % __author__
+__copyright__ = "Copyright 2014-2016 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index d5b6ddbea7..9e906015f5 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -17,7 +17,8 @@
 
 
 __all__ = [
-    "InvalidMarker", "UndefinedComparison", "Marker", "default_environment",
+    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
+    "Marker", "default_environment",
 ]
 
 
@@ -33,6 +34,13 @@ class UndefinedComparison(ValueError):
     """
 
 
+class UndefinedEnvironmentName(ValueError):
+    """
+    A name was attempted to be used that does not exist inside of the
+    environment.
+    """
+
+
 class Node(object):
 
     def __init__(self, value):
@@ -116,8 +124,8 @@ def _format_marker(marker, first=True):
     # where the single item is itself it's own list. In that case we want skip
     # the rest of this function so that we don't get extraneous () on the
     # outside.
-    if (isinstance(marker, list) and len(marker) == 1
-            and isinstance(marker[0], (list, tuple))):
+    if (isinstance(marker, list) and len(marker) == 1 and
+            isinstance(marker[0], (list, tuple))):
         return _format_marker(marker[0])
 
     if isinstance(marker, list):
@@ -161,6 +169,20 @@ def _eval_op(lhs, op, rhs):
     return oper(lhs, rhs)
 
 
+_undefined = object()
+
+
+def _get_env(environment, name):
+    value = environment.get(name, _undefined)
+
+    if value is _undefined:
+        raise UndefinedEnvironmentName(
+            "{0!r} does not exist in evaluation environment.".format(name)
+        )
+
+    return value
+
+
 def _evaluate_markers(markers, environment):
     groups = [[]]
 
@@ -171,11 +193,15 @@ def _evaluate_markers(markers, environment):
             groups[-1].append(_evaluate_markers(marker, environment))
         elif isinstance(marker, tuple):
             lhs, op, rhs = marker
+
             if isinstance(lhs, Variable):
-                value = _eval_op(environment[lhs.value], op, rhs.value)
+                lhs_value = _get_env(environment, lhs.value)
+                rhs_value = rhs.value
             else:
-                value = _eval_op(lhs.value, op, environment[rhs.value])
-            groups[-1].append(value)
+                lhs_value = lhs.value
+                rhs_value = _get_env(environment, rhs.value)
+
+            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
         else:
             assert marker in ["and", "or"]
             if marker == "or":
@@ -220,12 +246,10 @@ class Marker(object):
     def __init__(self, marker):
         try:
             self._markers = _coerce_parse_result(MARKER.parseString(marker))
-        except ParseException:
-            self._markers = None
-
-        # We do this because we can't do raise ... from None in Python 2.x
-        if self._markers is None:
-            raise InvalidMarker("Invalid marker: {0!r}".format(marker))
+        except ParseException as e:
+            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
+                marker, marker[e.loc:e.loc + 8])
+            raise InvalidMarker(err_str)
 
     def __str__(self):
         return _format_marker(self._markers)
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 8a9cd195e2..16032ac6b2 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -102,7 +102,7 @@ def __init__(self, requirement_string):
             self.url = req.url
         else:
             self.url = None
-        self.extras = req.extras.asList() if req.extras else []
+        self.extras = set(req.extras.asList() if req.extras else [])
         self.specifier = SpecifierSet(req.specifier)
         self.marker = req.marker if req.marker else None
 
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index cef90084f8..31845c611a 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -194,8 +194,8 @@ def filter(self, iterable, prereleases=None):
                 # If our version is a prerelease, and we were not set to allow
                 # prereleases, then we'll store it for later incase nothing
                 # else matches this specifier.
-                if (parsed_version.is_prerelease
-                        and not (prereleases or self.prereleases)):
+                if (parsed_version.is_prerelease and not
+                        (prereleases or self.prereleases)):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
                 # accepting prereleases from the begining.
@@ -395,8 +395,8 @@ def _compare_compatible(self, prospective, spec):
         prefix = ".".join(
             list(
                 itertools.takewhile(
-                    lambda x: (not x.startswith("post")
-                               and not x.startswith("dev")),
+                    lambda x: (not x.startswith("post") and not
+                               x.startswith("dev")),
                     _version_split(spec),
                 )
             )[:-1]
@@ -405,13 +405,15 @@ def _compare_compatible(self, prospective, spec):
         # Add the prefix notation to the end of our string
         prefix += ".*"
 
-        return (self._get_operator(">=")(prospective, spec)
-                and self._get_operator("==")(prospective, prefix))
+        return (self._get_operator(">=")(prospective, spec) and
+                self._get_operator("==")(prospective, prefix))
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
+            # In the case of prefix matching we want to ignore local segment.
+            prospective = Version(prospective.public)
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
             spec = _version_split(spec[:-2])  # Remove the trailing .*
@@ -563,8 +565,8 @@ def _pad_version(left, right):
     right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
 
     # Get the rest of our versions
-    left_split.append(left[len(left_split):])
-    right_split.append(left[len(right_split):])
+    left_split.append(left[len(left_split[0]):])
+    right_split.append(right[len(right_split[0]):])
 
     # Insert our padding
     left_split.insert(
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index fcb72075f3..fbaaa5f186 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
-packaging==15.3
+packaging==16.1
 pyparsing==2.0.6
 six==1.10.0

From 43d0308ad6a8c83be645b09e8c1871b36ff3c4c9 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 9 Feb 2016 17:12:47 +1100
Subject: [PATCH 5523/8469] Correct tests after the move to packaging 16.1.

---
 pkg_resources/__init__.py             |  4 ++--
 pkg_resources/api_tests.txt           | 28 +++++++++++++--------------
 pkg_resources/tests/test_resources.py |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b0b04579c4..286c03ed04 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1410,10 +1410,10 @@ def evaluate_marker(text, extra=None):
 
     This implementation uses the 'pyparsing' module.
     """
-    marker = packaging.markers.Marker(text)
     try:
+        marker = packaging.markers.Marker(text)
         return marker.evaluate()
-    except packaging.marker.InvalidMarker as e:
+    except packaging.markers.InvalidMarker as e:
         raise SyntaxError(e)
 
 
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 9df56b4b0a..4fbd3d235d 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -338,49 +338,49 @@ Environment Markers
     >>> import os
 
     >>> print(im("sys_platform"))
-    Invalid marker: 'sys_platform'
+    Invalid marker: 'sys_platform', parse error at ''
 
     >>> print(im("sys_platform=="))
-    Invalid marker: 'sys_platform=='
+    Invalid marker: 'sys_platform==', parse error at ''
 
     >>> print(im("sys_platform=='win32'"))
     False
 
     >>> print(im("sys=='x'"))
-    Invalid marker: "sys=='x'"
+    Invalid marker: "sys=='x'", parse error at "sys=='x'"
 
     >>> print(im("(extra)"))
-    Invalid marker: '(extra)'
+    Invalid marker: '(extra)', parse error at ')'
 
     >>> print(im("(extra"))
-    Invalid marker: '(extra'
+    Invalid marker: '(extra', parse error at ''
 
     >>> print(im("os.open('foo')=='y'"))
-    Invalid marker: "os.open('foo')=='y'"
+    Invalid marker: "os.open('foo')=='y'", parse error at 'os.open('
 
     >>> print(im("'x'=='y' and os.open('foo')=='y'"))   # no short-circuit!
-    Invalid marker: "'x'=='y' and os.open('foo')=='y'"
+    Invalid marker: "'x'=='y' and os.open('foo')=='y'", parse error at 'and os.o'
 
     >>> print(im("'x'=='x' or os.open('foo')=='y'"))   # no short-circuit!
-    Invalid marker: "'x'=='x' or os.open('foo')=='y'"
+    Invalid marker: "'x'=='x' or os.open('foo')=='y'", parse error at 'or os.op'
 
     >>> print(im("'x' < 'y' < 'z'"))
-    Invalid marker: "'x' < 'y' < 'z'"
+    Invalid marker: "'x' < 'y' < 'z'", parse error at "< 'z'"
 
     >>> print(im("r'x'=='x'"))
-    Invalid marker: "r'x'=='x'"
+    Invalid marker: "r'x'=='x'", parse error at "r'x'=='x"
 
     >>> print(im("'''x'''=='x'"))
-    Invalid marker: "'''x'''=='x'"
+    Invalid marker: "'''x'''=='x'", parse error at "'x'''=='"
 
     >>> print(im('"""x"""=="x"'))
-    Invalid marker: '"""x"""=="x"'
+    Invalid marker: '"""x"""=="x"', parse error at '"x"""=="'
 
     >>> print(im(r"x\n=='x'"))
-    Invalid marker: "x\\n=='x'"
+    Invalid marker: "x\\n=='x'", parse error at "x\\n=='x'"
 
     >>> print(im("os.open=='y'"))
-    Invalid marker: "os.open=='y'"
+    Invalid marker: "os.open=='y'", parse error at 'os.open='
 
     >>> em("sys_platform=='win32'") == (sys.platform=='win32')
     True
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4241765ade..8066753bdd 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -383,7 +383,7 @@ def testOptionsAndHashing(self):
         r2 = Requirement.parse("Twisted[bar,FOO]>=1.2")
         assert r1 == r2
         assert r1.extras == ("foo","bar")
-        assert r2.extras == ("bar","foo")  # extras are normalized
+        assert r2.extras == ("foo","bar")
         assert hash(r1) == hash(r2)
         assert (
             hash(r1)

From 605d57a077d65dba6bc554426e50fe2ba04502af Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 11 Feb 2016 13:10:36 +0200
Subject: [PATCH 5524/8469] Issue #25985: sys.version_info is now used instead
 of sys.version to format short Python version.

---
 command/bdist_msi.py        | 2 +-
 command/bdist_wininst.py    | 2 +-
 command/build.py            | 4 ++--
 command/install.py          | 4 ++--
 command/install_egg_info.py | 4 ++--
 sysconfig.py                | 2 +-
 tests/test_build.py         | 5 +++--
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index b3cfe9ceff..f6c21aee44 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -199,7 +199,7 @@ def run(self):
             target_version = self.target_version
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
-                target_version = sys.version[0:3]
+                target_version = '%d.%d' % sys.version_info[:2]
             plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0c0e2c1a26..d3e1d3af22 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -141,7 +141,7 @@ def run(self):
             target_version = self.target_version
             if not target_version:
                 assert self.skip_build, "Should have already checked this"
-                target_version = sys.version[0:3]
+                target_version = '%d.%d' % sys.version_info[:2]
             plat_specifier = ".%s-%s" % (self.plat_name, target_version)
             build = self.get_finalized_command('build')
             build.build_lib = os.path.join(build.build_base,
diff --git a/command/build.py b/command/build.py
index 337dd0bfc1..c6f52e61e1 100644
--- a/command/build.py
+++ b/command/build.py
@@ -81,7 +81,7 @@ def finalize_options(self):
                             "--plat-name only supported on Windows (try "
                             "using './configure --help' on your platform)")
 
-        plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3])
+        plat_specifier = ".%s-%d.%d" % (self.plat_name, *sys.version_info[:2])
 
         # Make it so Python 2.x and Python 2.x with --with-pydebug don't
         # share the same build directories. Doing so confuses the build
@@ -114,7 +114,7 @@ def finalize_options(self):
                                            'temp' + plat_specifier)
         if self.build_scripts is None:
             self.build_scripts = os.path.join(self.build_base,
-                                              'scripts-' + sys.version[0:3])
+                                              'scripts-%d.%d' % sys.version_info[:2])
 
         if self.executable is None:
             self.executable = os.path.normpath(sys.executable)
diff --git a/command/install.py b/command/install.py
index 67db007a02..9474e9c599 100644
--- a/command/install.py
+++ b/command/install.py
@@ -290,8 +290,8 @@ def finalize_options(self):
                             'dist_version': self.distribution.get_version(),
                             'dist_fullname': self.distribution.get_fullname(),
                             'py_version': py_version,
-                            'py_version_short': py_version[0:3],
-                            'py_version_nodot': py_version[0] + py_version[2],
+                            'py_version_short': '%d.%d' % sys.version_info[:2],
+                            'py_version_nodot': '%d%d' % sys.version_info[:2],
                             'sys_prefix': prefix,
                             'prefix': prefix,
                             'sys_exec_prefix': exec_prefix,
diff --git a/command/install_egg_info.py b/command/install_egg_info.py
index c2a7d649c0..0ddc7367cc 100644
--- a/command/install_egg_info.py
+++ b/command/install_egg_info.py
@@ -21,10 +21,10 @@ def initialize_options(self):
 
     def finalize_options(self):
         self.set_undefined_options('install_lib',('install_dir','install_dir'))
-        basename = "%s-%s-py%s.egg-info" % (
+        basename = "%s-%s-py%d.%d.egg-info" % (
             to_filename(safe_name(self.distribution.get_name())),
             to_filename(safe_version(self.distribution.get_version())),
-            sys.version[:3]
+            *sys.version_info[:2]
         )
         self.target = os.path.join(self.install_dir, basename)
         self.outputs = [self.target]
diff --git a/sysconfig.py b/sysconfig.py
index 573724ddd7..d203f8e42b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -70,7 +70,7 @@ def get_python_version():
     leaving off the patchlevel.  Sample return values could be '1.5'
     or '2.2'.
     """
-    return sys.version[:3]
+    return '%d.%d' % sys.version_info[:2]
 
 
 def get_python_inc(plat_specific=0, prefix=None):
diff --git a/tests/test_build.py b/tests/test_build.py
index 3391f36d4b..b020a5ba35 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -27,7 +27,7 @@ def test_finalize_options(self):
         # build_platlib is 'build/lib.platform-x.x[-pydebug]'
         # examples:
         #   build/lib.macosx-10.3-i386-2.7
-        plat_spec = '.%s-%s' % (cmd.plat_name, sys.version[0:3])
+        plat_spec = '.%s-%d.%d' % (cmd.plat_name, *sys.version_info[:2])
         if hasattr(sys, 'gettotalrefcount'):
             self.assertTrue(cmd.build_platlib.endswith('-pydebug'))
             plat_spec += '-pydebug'
@@ -42,7 +42,8 @@ def test_finalize_options(self):
         self.assertEqual(cmd.build_temp, wanted)
 
         # build_scripts is build/scripts-x.x
-        wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])
+        wanted = os.path.join(cmd.build_base,
+                              'scripts-%d.%d' % sys.version_info[:2])
         self.assertEqual(cmd.build_scripts, wanted)
 
         # executable is os.path.normpath(sys.executable)

From 0975916c1436759b5e373733561142caf708def4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 Feb 2016 23:29:17 -0500
Subject: [PATCH 5525/8469] Replace upload docs with a reference to distutils
 docs, as setuptools no longer provides an upload command.

---
 docs/setuptools.txt | 51 +++------------------------------------------
 1 file changed, 3 insertions(+), 48 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d6a62de865..064acd5ffa 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2328,54 +2328,9 @@ available:
 ``upload`` - Upload source and/or egg distributions to PyPI
 ===========================================================
 
-PyPI now supports uploading project files for redistribution; uploaded files
-are easily found by EasyInstall, even if you don't have download links on your
-project's home page.
-
-Although Python 2.5 will support uploading all types of distributions to PyPI,
-setuptools only supports source distributions and eggs.  (This is partly
-because PyPI's upload support is currently broken for various other file
-types.)  To upload files, you must include the ``upload`` command *after* the
-``sdist`` or ``bdist_egg`` commands on the setup command line.  For example::
-
-    setup.py bdist_egg upload         # create an egg and upload it
-    setup.py sdist upload             # create a source distro and upload it
-    setup.py sdist bdist_egg upload   # create and upload both
-
-Note that to upload files for a project, the corresponding version must already
-be registered with PyPI, using the distutils ``register`` command.  It's
-usually a good idea to include the ``register`` command at the start of the
-command line, so that any registration problems can be found and fixed before
-building and uploading the distributions, e.g.::
-
-    setup.py register sdist bdist_egg upload
-
-This will update PyPI's listing for your project's current version.
-
-Note, by the way, that the metadata in your ``setup()`` call determines what
-will be listed in PyPI for your package.  Try to fill out as much of it as
-possible, as it will save you a lot of trouble manually adding and updating
-your PyPI listings.  Just put it in ``setup.py`` and use the ``register``
-command to keep PyPI up to date.
-
-The ``upload`` command has a few options worth noting:
-
-``--sign, -s``
-    Sign each uploaded file using GPG (GNU Privacy Guard).  The ``gpg`` program
-    must be available for execution on the system ``PATH``.
-
-``--identity=NAME, -i NAME``
-    Specify the identity or key name for GPG to use when signing.  The value of
-    this option will be passed through the ``--local-user`` option of the
-    ``gpg`` program.
-
-``--show-response``
-    Display the full response text from server; this is useful for debugging
-    PyPI problems.
-
-``--repository=URL, -r URL``
-    The URL of the repository to upload to.  Defaults to
-    https://pypi.python.org/pypi (i.e., the main PyPI installation).
+The ``upload`` command is implemented and `documented
+<https://docs.python.org/3.1/distutils/uploading.html>`_
+in distutils.
 
 .. _upload_docs:
 

From 5367a7399762a9098ea689c7cdcb54fb9748dd66 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 Feb 2016 23:47:28 -0500
Subject: [PATCH 5526/8469] Override upload command to load passwords from
 keyring when available and not otherwise specified.

---
 CHANGES.txt                    |  8 ++++++++
 docs/setuptools.txt            | 16 ++++++++++++++++
 setuptools/command/__init__.py |  2 +-
 setuptools/command/upload.py   | 23 +++++++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/command/upload.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 9089b4b891..a7a70ab7ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+20.1
+----
+
+Added support for using passwords from keyring in the upload
+command. See `the upload docs
+<http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
+for details.
+
 20.0
 ----
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 064acd5ffa..610a0e613d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2332,6 +2332,22 @@ The ``upload`` command is implemented and `documented
 <https://docs.python.org/3.1/distutils/uploading.html>`_
 in distutils.
 
+Setuptools augments the ``upload`` command with support
+for `keyring <https://pypi.python.org/pypi/keyring>`_,
+allowing the password to be stored in a secure
+location and not in plaintext in the .pypirc file. To use
+keyring, first install keyring and set the password for
+the relevant repository, e.g.::
+
+    python -m keyring set <repository> <username>
+    Password for '<username>' in '<repository>': ********
+
+Then, in .pypirc, set the repository configuration as normal,
+but omit the password. Thereafter, uploads will use the
+password from the keyring.
+
+New in 20.1: Added keyring support.
+
 .. _upload_docs:
 
 ``upload_docs`` - Upload package documentation to PyPI
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index f6dbc39c40..3fb2f6dfcb 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst', 'upload_docs',
+    'register', 'bdist_wininst', 'upload_docs', 'upload',
 ]
 
 from distutils.command.bdist import bdist
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
new file mode 100644
index 0000000000..08c20ba868
--- /dev/null
+++ b/setuptools/command/upload.py
@@ -0,0 +1,23 @@
+from distutils.command import upload as orig
+
+
+class upload(orig.upload):
+    """
+    Override default upload behavior to look up password
+    in the keyring if available.
+    """
+
+    def finalize_options(self):
+        orig.upload.finalize_options(self)
+        self.password or self._load_password_from_keyring()
+
+    def _load_password_from_keyring(self):
+        """
+        Attempt to load password from keyring. Suppress Exceptions.
+        """
+        try:
+            keyring = __import__('keyring')
+            self.password = keyring.get_password(self.repository,
+                self.username)
+        except Exception:
+            pass

From b70dc2865f85659d18a3b1e5445eda40c18f1479 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 Feb 2016 23:49:12 -0500
Subject: [PATCH 5527/8469] Added tag 20.1 for changeset 06c9d3ffae80

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 678b2e369f..4fa766d3e3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -244,3 +244,4 @@ f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
 d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
 c6e619ce910d1650cc2433f94e5594964085f973 19.7
 2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0
+06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1

From fdc4a82ac68ac18c10151546bc660f56dca131ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 Feb 2016 23:51:09 -0500
Subject: [PATCH 5528/8469] Bumped to 20.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 0e828f12c8..425e19d9a2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.1'
+__version__ = '20.2'

From 1e0ecae918c4c43f29b139b0dffa9d73b208e13b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:07:19 -0500
Subject: [PATCH 5529/8469] Remove unused import

---
 setuptools/command/upload_docs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ca35a3ce1c..0a57d5d31a 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -13,7 +13,6 @@
 import socket
 import zipfile
 import tempfile
-import sys
 import shutil
 
 from setuptools.extern import six

From 076e6b32c38a5bd6141bf533ff87eb23e54eca67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:10:53 -0500
Subject: [PATCH 5530/8469] Upload_docs should also resolve passwords from
 keyring same as upload command.

---
 CHANGES.txt                       | 8 +++++++-
 setuptools/command/upload_docs.py | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a7a70ab7ca..504281da83 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,10 +2,16 @@
 CHANGES
 =======
 
+20.1.1
+------
+
+* Update ``upload_docs`` command to also honor keyring
+  for password resolution.
+
 20.1
 ----
 
-Added support for using passwords from keyring in the upload
+* Added support for using passwords from keyring in the upload
 command. See `the upload docs
 <http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
 for details.
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 0a57d5d31a..f887b47e52 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -8,7 +8,6 @@
 from base64 import standard_b64encode
 from distutils import log
 from distutils.errors import DistutilsOptionError
-from distutils.command.upload import upload
 import os
 import socket
 import zipfile
@@ -19,6 +18,7 @@
 from setuptools.extern.six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
+from .upload import upload
 
 
 errors = 'surrogateescape' if six.PY3 else 'strict'

From f8b1293c408bbb652bec3f2ae6e5b4f33f3ca55e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:11:07 -0500
Subject: [PATCH 5531/8469] Bumped to 20.1.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 425e19d9a2..4494728457 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.2'
+__version__ = '20.1.1'

From 3a209fa2a09a19f0ba5ee9b708475de8b00dd54f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:11:08 -0500
Subject: [PATCH 5532/8469] Added tag 20.1.1 for changeset 919a40f18431

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4fa766d3e3..e2bfe097a0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -245,3 +245,4 @@ d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
 c6e619ce910d1650cc2433f94e5594964085f973 19.7
 2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0
 06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1
+919a40f1843131249f98104c73f3aee3fc835e67 20.1.1

From 236b0499acc167551df9553f7d20e8a5d0c010e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:13:37 -0500
Subject: [PATCH 5533/8469] Bumped to 20.1.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 4494728457..4211fc44be 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.1.1'
+__version__ = '20.1.2'

From 8ccd428cd2a733891bffce13e017774ea82bd8d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Feb 2016 11:15:03 -0500
Subject: [PATCH 5534/8469] Correct syntax in changelog

---
 CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 504281da83..75b13e46db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,9 +12,9 @@ CHANGES
 ----
 
 * Added support for using passwords from keyring in the upload
-command. See `the upload docs
-<http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
-for details.
+  command. See `the upload docs
+  <http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
+  for details.
 
 20.0
 ----

From e8f5160ce40e05753d29ced35cf9b246ef12eb2d Mon Sep 17 00:00:00 2001
From: JGoutin <ginnungagap@free.fr>
Date: Sun, 14 Feb 2016 20:15:36 +0000
Subject: [PATCH 5535/8469] Improve support for standalones MVC++ 9.0/10.0
 compilers by setting directly the environment if Vcvarsall.bat is missing or
 fail.

---
 setuptools/msvc9_support.py | 265 ++++++++++++++++++++++++++++++++++--
 1 file changed, 255 insertions(+), 10 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index a69c7474c8..5dad8db2fc 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -48,16 +48,261 @@ def find_vcvarsall(version):
     return unpatched['find_vcvarsall'](version)
 
 def query_vcvarsall(version, *args, **kwargs):
+    message = ''
+
+    # Try to get environement from vcvarsall.bat (Classical way)
     try:
         return unpatched['query_vcvarsall'](version, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError as exc:
-        if exc and "vcvarsall.bat" in exc.args[0]:
-            message = 'Microsoft Visual C++ %0.1f is required (%s).' % (version, exc.args[0])
-            if int(version) == 9:
-                # This redirection link is maintained by Microsoft.
-                # Contact vspython@microsoft.com if it needs updating.
-                raise distutils.errors.DistutilsPlatformError(
-                    message + ' Get it from http://aka.ms/vcpython27'
-                )
-            raise distutils.errors.DistutilsPlatformError(message)
-        raise
+        # Error if Vcvarsall.bat is missing
+        message = exc.args[0]
+    except ValueError as exc:
+        # Error if environment not set after executing vcvarsall.bat
+        message = exc.args[0]
+
+    # If vcvarsall.bat fail, try to set environment directly
+    try:
+        return setvcenv(version, *args, **kwargs)
+    except distutils.errors.DistutilsPlatformError as exc:
+        # Error if MSVC++ directory not found or environment not set
+        message = exc.args[0]
+
+    # Raise error
+    if message and "vcvarsall.bat" in message:
+        # Special error message if MSVC++ not installed
+        message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
+            (version, message)
+        if int(version) == 9:
+            # For VC++ 9.0 Redirect user to Vc++ for Python 2.7 :
+            # This redirection link is maintained by Microsoft.
+            # Contact vspython@microsoft.com if it needs updating.
+            message += r' Get it from http://aka.ms/vcpython27'
+        elif int(version) == 10:
+            # For VC++ 10.0 Redirect user to Windows SDK 7.1
+            message += ' Get it with "Microsoft Windows SDK for Windows 7": '
+            message += r'www.microsoft.com/download/details.aspx?id=8279'
+        raise distutils.errors.DistutilsPlatformError(message)
+    raise(message)
+
+def setvcenv(VcVer, arch):
+    """
+    Return environment variables for specified Microsoft Visual C++ version
+    and platform.
+    """
+    from os.path import join, isdir
+    from os import environ
+    from distutils.errors import DistutilsPlatformError
+
+    # Find current and target architecture
+    CurrentCpu = environ['processor_architecture'].lower()
+    TargetCpu = arch[arch.find('_') + 1:]
+
+    # Find "Windows" and "Program Files" system directories
+    WinDir = environ['WinDir']
+    ProgramFiles = environ['ProgramFiles']
+    if CurrentCpu != 'x86':
+        ProgramFilesX86 = environ['ProgramFiles(x86)']
+    else:
+        ProgramFilesX86 = ProgramFiles
+
+    # Set registry base paths
+    reg_value = distutils.msvc9compiler.Reg.get_value
+    if CurrentCpu != 'x86':
+        node = r'\Wow6432Node'
+    else:
+        node = ''
+    VsReg = r'Software%s\Microsoft\VisualStudio\SxS\VS7' % node
+    VcReg = r'Software%s\Microsoft\VisualStudio\SxS\VC7' % node
+    VcForPythonReg = r'Software%s\Microsoft\DevDiv\VCForPython\%0.1f' %\
+        (node, VcVer)
+    WindowsSdkReg = r'Software%s\Microsoft\Microsoft SDKs\Windows' % node
+
+    # Set Platform subdirectories
+    if TargetCpu == 'amd64':
+        pltsd1, pltsd2 = r'\amd64', r'\x64'
+        if CurrentCpu == 'amd64':
+            pltsd3 = r'\amd64'
+        else:
+            pltsd3 = r'\x86_amd64'
+    elif TargetCpu == 'ia64':
+        pltsd1, pltsd2 = r'\ia64', r'\ia64'
+        if CurrentCpu == 'ia64':
+            pltsd3 = r'\ia64'
+        else:
+            pltsd3 = r'\x86_ia64'
+    else:
+        pltsd1, pltsd2, pltsd3 = '', '', ''
+
+    # Find Microsoft Visual Studio directory
+    try:
+        # Try to get it from registry
+        VsInstallDir = reg_value(VsReg, '%0.1f' % VcVer)
+    except KeyError:
+        # If fail, use default path
+        VsInstallDir = join(ProgramFilesX86,
+                            'Microsoft Visual Studio %0.1f' % VcVer)
+
+    # Find Microsoft Visual C++ directory
+    try:
+        # Try to get it from registry
+        VcInstallDir = reg_value(VcReg, '%0.1f' % VcVer)
+    except KeyError:
+        try:
+            # Try to get "VC++ for Python" version from registry
+            VcInstallDir = join(reg_value(VcForPythonReg, 'installdir'), 'VC')
+        except KeyError:
+            # If fail, use default path
+            VcInstallDir = join(ProgramFilesX86,
+                                r'Microsoft Visual Studio %0.1f\VC' % VcVer)
+    if not isdir(VcInstallDir):
+        raise DistutilsPlatformError('vcvarsall.bat and Visual C++ '
+                                     'directory not found')
+
+    # Find Microsoft Windows SDK directory
+    WindowsSdkDir = ''
+    if VcVer == 9.0:
+        WindowsSdkVer = ('7.0', '6.1', '6.0a')
+    elif VcVer == 10.0:
+        WindowsSdkVer = ('7.1', '7.0a')
+    else:
+        WindowsSdkVer = ()
+    for ver in WindowsSdkVer:
+        # Try to get it from registry
+        try:
+            WindowsSdkDir = reg_value(join(WindowsSdkReg, 'v%s' % ver),
+                                      'installationfolder')
+            break
+        except KeyError:
+            pass
+    if not WindowsSdkDir or not isdir(WindowsSdkDir):
+        # Try to get "VC++ for Python" version from registry
+        try:
+            WindowsSdkDir = join(reg_value(VcForPythonReg, 'installdir'),
+                                 'WinSDK')
+        except:
+            pass
+    if not WindowsSdkDir or not isdir(WindowsSdkDir):
+        # If fail, use default path
+        for ver in WindowsSdkVer:
+            d = join(ProgramFiles, r'Microsoft SDKs\Windows\v%s' % ver)
+            if isdir(d):
+                WindowsSdkDir = d
+    if not WindowsSdkDir:
+        # If fail, use Platform SDK
+        WindowsSdkDir = join(VcInstallDir, 'PlatformSDK')
+
+    # Find Microsoft .NET Framework 32bit directory
+    try:
+        # Try to get it from registry
+        FrameworkDir32 = reg_value(VcReg, 'frameworkdir32')
+    except KeyError:
+        # If fail, use default path
+        FrameworkDir32 = join(WinDir, r'Microsoft.NET\Framework')
+
+    # Find Microsoft .NET Framework 64bit directory
+    try:
+        # Try to get it from registry
+        FrameworkDir64 = reg_value(VcReg, 'frameworkdir64')
+    except KeyError:
+        # If fail, use default path
+        FrameworkDir64 = join(WinDir, r'Microsoft.NET\Framework64')
+
+    # Find Microsoft .NET Framework Versions
+    if VcVer == 10.0:
+        try:
+            # Try to get v4 from registry
+            v4 = reg_value(VcReg, 'frameworkver32')
+            if v4.lower()[:2] != 'v4':
+                raise KeyError('Not the V4')
+        except KeyError:
+            # If fail, use last v4 version
+            v4 = 'v4.0.30319'
+        FrameworkVer = (v4, 'v3.5')
+    elif VcVer == 9.0:
+        FrameworkVer = ('v3.5', 'v2.0.50727')
+    elif VcVer == 8.0:
+        FrameworkVer = ('v3.0', 'v2.0.50727')
+
+    # Set Microsoft Visual Studio Tools
+    VSTools = [join(VsInstallDir, r'Common7\IDE'),
+               join(VsInstallDir, r'Common7\Tools')]
+
+    # Set Microsoft Visual C++ Includes
+    VCIncludes = join(VcInstallDir, 'Include')
+
+    # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
+    VCLibraries = [join(VcInstallDir, 'Lib' + pltsd1),
+                   join(VcInstallDir, r'ATLMFC\LIB' + pltsd1)]
+
+    # Set Microsoft Visual C++ Tools
+    VCTools = [join(VcInstallDir, 'VCPackages'),
+               join(VcInstallDir, 'Bin' + pltsd3)]
+    if pltsd3:
+        VCTools.append(join(VcInstallDir, 'Bin'))
+
+    # Set Microsoft Windows SDK Include
+    OSLibraries = join(WindowsSdkDir, 'Lib' + pltsd2)
+
+    # Set Microsoft Windows SDK Libraries
+    OSIncludes = [join(WindowsSdkDir, 'Include'),
+                  join(WindowsSdkDir, r'Include\gl')]
+
+    # Set Microsoft Windows SDK Tools
+    SdkTools = [join(WindowsSdkDir, 'Bin')]
+    if TargetCpu != 'x86':
+        SdkTools.append(join(WindowsSdkDir, 'Bin' + pltsd2))
+    if VcVer == 10.0:
+        SdkTools.append(join(WindowsSdkDir, r'Bin\NETFX 4.0 Tools' + pltsd2))
+
+    # Set Microsoft Windows SDK Setup
+    SdkSetup = join(WindowsSdkDir, 'Setup')
+
+    # Set Microsoft .NET Framework Tools
+    FxTools = []
+    for ver in FrameworkVer:
+        FxTools.append(join(FrameworkDir32, ver))
+    if TargetCpu != 'x86' and CurrentCpu != 'x86':
+        for ver in FrameworkVer:
+            FxTools.append(join(FrameworkDir64, ver))
+
+    # Set Microsoft Visual Studio Team System Database
+    VsTDb = join(VsInstallDir, r'VSTSDB\Deploy')
+
+    # Return Environment Variables
+    env = {}
+    env['include'] = [VCIncludes, OSIncludes]
+    env['lib'] = [VCLibraries, OSLibraries, FxTools]
+    env['libpath'] = [VCLibraries, FxTools]
+    env['path'] = [VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools]
+
+    def checkpath(path, varlist):
+        # Function that add valid paths in list in not already present
+        if isdir(path) and path not in varlist:
+            varlist.append(path)
+
+    for key in env.keys():
+        var = []
+        # Add valid paths
+        for val in env[key]:
+            if type(val) is str:
+                # Path
+                checkpath(val, var)
+            else:
+                # Paths list
+                for subval in val:
+                    checkpath(subval, var)
+
+        # Add values from actual environment
+        try:
+            for val in environ[key].split(';'):
+                checkpath(val, var)
+        except KeyError:
+            pass
+
+        # Format paths to Environment Variable string
+        if var:
+            env[key] = ';'.join(var)
+        else:
+            raise DistutilsPlatformError("%s environment variable is empty" %
+                                         key.upper())
+    return env

From 11e560431408ccab2ef5e35721ef61d664d13693 Mon Sep 17 00:00:00 2001
From: JGoutin <ginnungagap@free.fr>
Date: Thu, 18 Feb 2016 19:59:21 +0000
Subject: [PATCH 5536/8469] Update with comments.

---
 setuptools/msvc9_support.py | 76 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 5dad8db2fc..7e8a2a25d0 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -62,7 +62,11 @@ def query_vcvarsall(version, *args, **kwargs):
 
     # If vcvarsall.bat fail, try to set environment directly
     try:
-        return setvcenv(version, *args, **kwargs)
+        if not args:
+            arch = 'x86'
+        else:
+            arch = args[0]
+        return setvcenv(version, kwargs.get('arch', arch))
     except distutils.errors.DistutilsPlatformError as exc:
         # Error if MSVC++ directory not found or environment not set
         message = exc.args[0]
@@ -82,7 +86,7 @@ def query_vcvarsall(version, *args, **kwargs):
             message += ' Get it with "Microsoft Windows SDK for Windows 7": '
             message += r'www.microsoft.com/download/details.aspx?id=8279'
         raise distutils.errors.DistutilsPlatformError(message)
-    raise(message)
+    raise distutils.errors.DistutilsPlatformError(message)
 
 def setvcenv(VcVer, arch):
     """
@@ -96,21 +100,17 @@ def setvcenv(VcVer, arch):
     # Find current and target architecture
     CurrentCpu = environ['processor_architecture'].lower()
     TargetCpu = arch[arch.find('_') + 1:]
+    Tar_not_x86 = TargetCpu != 'x86'
+    Cur_not_x86 = CurrentCpu != 'x86'
 
     # Find "Windows" and "Program Files" system directories
     WinDir = environ['WinDir']
     ProgramFiles = environ['ProgramFiles']
-    if CurrentCpu != 'x86':
-        ProgramFilesX86 = environ['ProgramFiles(x86)']
-    else:
-        ProgramFilesX86 = ProgramFiles
+    ProgramFilesX86 = environ.get('ProgramFiles(x86)', ProgramFiles)
 
     # Set registry base paths
     reg_value = distutils.msvc9compiler.Reg.get_value
-    if CurrentCpu != 'x86':
-        node = r'\Wow6432Node'
-    else:
-        node = ''
+    node = r'\Wow6432Node' if Cur_not_x86 else ''
     VsReg = r'Software%s\Microsoft\VisualStudio\SxS\VS7' % node
     VcReg = r'Software%s\Microsoft\VisualStudio\SxS\VC7' % node
     VcForPythonReg = r'Software%s\Microsoft\DevDiv\VCForPython\%0.1f' %\
@@ -119,19 +119,23 @@ def setvcenv(VcVer, arch):
 
     # Set Platform subdirectories
     if TargetCpu == 'amd64':
-        pltsd1, pltsd2 = r'\amd64', r'\x64'
+        plt_subd_lib = r'\amd64'
+        plt_subd_sdk = r'\x64'
         if CurrentCpu == 'amd64':
-            pltsd3 = r'\amd64'
+            plt_subd_tools = r'\amd64'
         else:
-            pltsd3 = r'\x86_amd64'
+            plt_subd_tools = r'\x86_amd64'
     elif TargetCpu == 'ia64':
-        pltsd1, pltsd2 = r'\ia64', r'\ia64'
+        plt_subd_lib = r'\ia64'
+        plt_subd_sdk = r'\ia64'
         if CurrentCpu == 'ia64':
-            pltsd3 = r'\ia64'
+            plt_subd_tools = r'\ia64'
         else:
-            pltsd3 = r'\x86_ia64'
+            plt_subd_tools = r'\x86_ia64'
     else:
-        pltsd1, pltsd2, pltsd3 = '', '', ''
+        plt_subd_lib = ''
+        plt_subd_sdk = ''
+        plt_subd_tools = ''
 
     # Find Microsoft Visual Studio directory
     try:
@@ -228,20 +232,20 @@ def setvcenv(VcVer, arch):
                join(VsInstallDir, r'Common7\Tools')]
 
     # Set Microsoft Visual C++ Includes
-    VCIncludes = join(VcInstallDir, 'Include')
+    VCIncludes = [join(VcInstallDir, 'Include')]
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
-    VCLibraries = [join(VcInstallDir, 'Lib' + pltsd1),
-                   join(VcInstallDir, r'ATLMFC\LIB' + pltsd1)]
+    VCLibraries = [join(VcInstallDir, 'Lib' + plt_subd_lib),
+                   join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib)]
 
     # Set Microsoft Visual C++ Tools
     VCTools = [join(VcInstallDir, 'VCPackages'),
-               join(VcInstallDir, 'Bin' + pltsd3)]
-    if pltsd3:
+               join(VcInstallDir, 'Bin' + plt_subd_tools)]
+    if plt_subd_tools:
         VCTools.append(join(VcInstallDir, 'Bin'))
 
     # Set Microsoft Windows SDK Include
-    OSLibraries = join(WindowsSdkDir, 'Lib' + pltsd2)
+    OSLibraries = [join(WindowsSdkDir, 'Lib' + plt_subd_sdk)]
 
     # Set Microsoft Windows SDK Libraries
     OSIncludes = [join(WindowsSdkDir, 'Include'),
@@ -249,24 +253,23 @@ def setvcenv(VcVer, arch):
 
     # Set Microsoft Windows SDK Tools
     SdkTools = [join(WindowsSdkDir, 'Bin')]
-    if TargetCpu != 'x86':
-        SdkTools.append(join(WindowsSdkDir, 'Bin' + pltsd2))
+    if Tar_not_x86:
+        SdkTools.append(join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
     if VcVer == 10.0:
-        SdkTools.append(join(WindowsSdkDir, r'Bin\NETFX 4.0 Tools' + pltsd2))
+        SdkTools.append(join(WindowsSdkDir,
+                             r'Bin\NETFX 4.0 Tools' + plt_subd_sdk))
 
     # Set Microsoft Windows SDK Setup
-    SdkSetup = join(WindowsSdkDir, 'Setup')
+    SdkSetup = [join(WindowsSdkDir, 'Setup')]
 
     # Set Microsoft .NET Framework Tools
-    FxTools = []
-    for ver in FrameworkVer:
-        FxTools.append(join(FrameworkDir32, ver))
-    if TargetCpu != 'x86' and CurrentCpu != 'x86':
+    FxTools = [join(FrameworkDir32, ver) for ver in FrameworkVer]
+    if Tar_not_x86 and Cur_not_x86:
         for ver in FrameworkVer:
             FxTools.append(join(FrameworkDir64, ver))
 
     # Set Microsoft Visual Studio Team System Database
-    VsTDb = join(VsInstallDir, r'VSTSDB\Deploy')
+    VsTDb = [join(VsInstallDir, r'VSTSDB\Deploy')]
 
     # Return Environment Variables
     env = {}
@@ -284,13 +287,8 @@ def checkpath(path, varlist):
         var = []
         # Add valid paths
         for val in env[key]:
-            if type(val) is str:
-                # Path
-                checkpath(val, var)
-            else:
-                # Paths list
-                for subval in val:
-                    checkpath(subval, var)
+            for subval in val:
+                checkpath(subval, var)
 
         # Add values from actual environment
         try:

From 335aba6f265f694612e610c6acceb34c182a94c5 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Fri, 19 Feb 2016 14:20:30 +1100
Subject: [PATCH 5537/8469] Correct tests under both Python 2 and 3.

---
 pkg_resources/__init__.py             | 4 ++--
 pkg_resources/tests/test_resources.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 118cb63b12..5b68da154b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,8 +75,8 @@
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
 __import__('pkg_resources.extern.packaging.specifiers')
-__import__('pkg_resources._vendor.packaging.requirements')
-__import__('pkg_resources._vendor.packaging.markers')
+__import__('pkg_resources.extern.packaging.requirements')
+__import__('pkg_resources.extern.packaging.markers')
 
 
 if (3, 0) < sys.version_info < (3, 3):
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 909b29d395..7b98ae0d91 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -384,8 +384,8 @@ def testOptionsAndHashing(self):
         r1 = Requirement.parse("Twisted[foo,bar]>=1.2")
         r2 = Requirement.parse("Twisted[bar,FOO]>=1.2")
         assert r1 == r2
-        assert r1.extras == ("foo","bar")
-        assert r2.extras == ("foo","bar")
+        assert set(r1.extras) == set(("foo", "bar"))
+        assert set(r2.extras) == set(("foo", "bar"))
         assert hash(r1) == hash(r2)
         assert (
             hash(r1)

From e5f397829451be329a91838275977cebac45375d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 09:34:14 -0500
Subject: [PATCH 5538/8469] Use io module and text type in install_site_py

---
 setuptools/command/easy_install.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 46056173ec..08bc9c510b 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1239,17 +1239,14 @@ def install_site_py(self):
 
         sitepy = os.path.join(self.install_dir, "site.py")
         source = resource_string("setuptools", "site-patch.py")
+        source = source.decode('utf-8')
         current = ""
 
         if os.path.exists(sitepy):
             log.debug("Checking existing site.py in %s", self.install_dir)
-            f = open(sitepy, 'rb')
-            current = f.read()
-            # we want str, not bytes
-            if six.PY3:
-                current = current.decode()
+            with io.open(sitepy) as strm:
+                current = strm.read()
 
-            f.close()
             if not current.startswith('def __boot():'):
                 raise DistutilsError(
                     "%s is not a setuptools-generated site.py; please"
@@ -1260,9 +1257,8 @@ def install_site_py(self):
             log.info("Creating %s", sitepy)
             if not self.dry_run:
                 ensure_directory(sitepy)
-                f = open(sitepy, 'wb')
-                f.write(source)
-                f.close()
+                with io.open(sitepy, 'w', encoding='utf-8') as strm:
+                    strm.write(source)
             self.byte_compile([sitepy])
 
         self.sitepy_installed = True

From 24cc60e8ded40d5cdfedc79c85dc778d80f688a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 09:36:13 -0500
Subject: [PATCH 5539/8469] Use pytest tmpdir fixture for simplicity and
 clarity.

---
 setuptools/tests/test_easy_install.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 07d8a3c508..9dacd8e028 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -59,17 +59,13 @@ def as_requirement(self):
 
 class TestEasyInstallTest:
 
-    def test_install_site_py(self):
+    def test_install_site_py(self, tmpdir):
         dist = Distribution()
         cmd = ei.easy_install(dist)
         cmd.sitepy_installed = False
-        cmd.install_dir = tempfile.mkdtemp()
-        try:
-            cmd.install_site_py()
-            sitepy = os.path.join(cmd.install_dir, 'site.py')
-            assert os.path.exists(sitepy)
-        finally:
-            shutil.rmtree(cmd.install_dir)
+        cmd.install_dir = str(tmpdir)
+        cmd.install_site_py()
+        assert (tmpdir / 'site.py').exists()
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()

From bfd610e2b7f1ad369b75f777b3fa7472347b49c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 09:43:09 -0500
Subject: [PATCH 5540/8469] Remove unused imports

---
 setuptools/tests/test_easy_install.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 9dacd8e028..55b8b05af1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,7 +16,6 @@
 import distutils.errors
 import io
 
-from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
 import time
 
@@ -38,7 +37,7 @@
 import pkg_resources
 
 from .py26compat import tarfile_open
-from . import contexts, is_ascii
+from . import contexts
 from .textwrap import DALS
 
 

From 4f85ab4276a862467a927e2d1603e063728ba647 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 10:18:31 -0500
Subject: [PATCH 5541/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 75b13e46db..9209a1dbb0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+Next
+----
+
+* Pull Request #174: Add more aggressive support for
+  Windows SDK in msvc9compiler patch.
+
 20.1.1
 ------
 

From fe6891c949de75626396167a4aae78b276ed0223 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 10:56:53 -0500
Subject: [PATCH 5542/8469] Fix typo, correcting failures on late Pythons when
 mock is not already installed.

---
 pkg_resources/tests/test_markers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 0af3089e78..8d451de3c1 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,5 +1,5 @@
 try:
-    import unitest.mock as mock
+    import unittest.mock as mock
 except ImportError:
     import mock
 

From 54f5299b42541b8f2fc56fb24d2fde6fbd4f7078 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 10:58:10 -0500
Subject: [PATCH 5543/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 95d44e68fa..0ec49a674c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ CHANGES
 * Pull Request #173: Replace dual PEP 345 _markerlib implementation
   and PEP 426 implementation of environment marker support from
   packaging 16.1 and PEP 508. Fixes Issue #122.
+  See also Pull Request #175, Pull Request #168, and
+  Pull Request #164.
 
 20.1.1
 ------

From be18a01654d05ebfba04e713c20c1fbd4d170dc3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:10:17 -0500
Subject: [PATCH 5544/8469] Add hyperlinks to PEPs in changelog.

---
 docs/conf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index c2a6387309..155f83f3a4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -250,6 +250,10 @@
 				pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
 				url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
 			),
+			dict(
+				pattern=r"PEP[- ](?P<pep_number>\d+)",
+				url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+			),
 		],
 	),
 }

From 1b31a684e7198b9f46faaeddcae0cb94a0e43e84 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:12:13 -0500
Subject: [PATCH 5545/8469] Add timestamps to changelog.

---
 docs/conf.py | 4 ++++
 setup.py     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 155f83f3a4..1a4da380fe 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -254,6 +254,10 @@
 				pattern=r"PEP[- ](?P<pep_number>\d+)",
 				url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
 			),
+			dict(
+				pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n[-=]+\n",
+				with_scm="{text}\n{rev[timestamp]}\n",
+			),
 		],
 	),
 }
diff --git a/setup.py b/setup.py
index 2aedfc1237..a59d374d4f 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ def _gen_console_scripts():
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
+sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else []
 
 setup_params = dict(
     name="setuptools",

From d5bedd9e5ffd604476a9ee794ad744393c856aeb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:17:06 -0500
Subject: [PATCH 5546/8469] Remove explicit PEP links now that the linker
 handles it.

---
 CHANGES.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 75b13e46db..307803e3e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -165,8 +165,7 @@ CHANGES
   for the issue reported in Pull Request #155.
 * Issue #453: In ``ez_setup`` bootstrap module, unload all
   ``pkg_resources`` modules following download.
-* Pull Request #158: Honor `PEP-488
-  <https://www.python.org/dev/peps/pep-0488/>`_ when excluding
+* Pull Request #158: Honor PEP-488 when excluding
   files for namespace packages.
 * Issue #419 and Pull Request #144: Add experimental support for
   reading the version info from distutils-installed metadata rather
@@ -626,7 +625,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 8.0
 ---
 
-* Implement `PEP 440 <http://legacy.python.org/dev/peps/pep-0440/>`_ within
+* Implement PEP 440 within
   pkg_resources and setuptools. This change
   deprecates some version numbers such that they will no longer be installable
   without using the ``===`` escape hatch. See `the changes to test_resources
@@ -1699,7 +1698,7 @@ how it parses version numbers.
 * Distribute #65: cli.exe and gui.exe are now generated at build time,
   depending on the platform in use.
 
-* Distribute #67: Fixed doc typo (PEP 381/382)
+* Distribute #67: Fixed doc typo (PEP 381/PEP 382).
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
   setuptools.  And an error is raised when installing a 0.7 setuptools with

From 95c576ffedcf2312c24a7595a8f2da7f8994afcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:17:46 -0500
Subject: [PATCH 5547/8469] Update changelog

---
 CHANGES.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 307803e3e7..fca4406833 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+20.2
+----
+
+* Changelog now includes release dates and links to PEPs.
+
 20.1.1
 ------
 

From 2c460f86e5b8669168088d78fac563bad363c24d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:23:43 -0500
Subject: [PATCH 5548/8469] Bumped to 20.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 09bbb730c0..425e19d9a2 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '19.3'
+__version__ = '20.2'

From 707c631f8ff144fa76a37a38f6ab7ba0e03f9a9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:23:46 -0500
Subject: [PATCH 5549/8469] Added tag 20.2 for changeset 74c4ffbe1f39

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e2bfe097a0..f2b0e2b7b5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -246,3 +246,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0
 06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1
 919a40f1843131249f98104c73f3aee3fc835e67 20.1.1
+74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2

From 43ed305c15d7da6c5b0a1f42e0ded028105a05df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 11:44:29 -0500
Subject: [PATCH 5550/8469] Bumped to 20.3 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 425e19d9a2..7e20c8bf5a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.2'
+__version__ = '20.3'

From a8a49c4aab1410a11b8e75e5003b0df88875d2c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 16:08:32 -0500
Subject: [PATCH 5551/8469] Update changelog to reflect new findings.

---
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2bfec5fdf7..63ae24fd88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,7 +10,12 @@ CHANGES
   and PEP 426 implementation of environment marker support from
   packaging 16.1 and PEP 508. Fixes Issue #122.
   See also Pull Request #175, Pull Request #168, and
-  Pull Request #164.
+  Pull Request #164. Additionally:
+   - ``Requirement.parse`` no longer retains the order of extras.
+   - ``parse_requirements`` now requires that all versions be
+     PEP-440 compliant, as revealed in #499. Packages released
+     with invalid local versions should be re-released using
+     the proper local version syntax, e.g. ``mypkg-1.0+myorg.1``.
 
 20.1.1
 ------

From 2ac4408ba8b0d6203b9556fe819f393040230aaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Feb 2016 16:13:30 -0500
Subject: [PATCH 5552/8469] Add test capturing previously allowed usage. Ref
 #499.

---
 pkg_resources/tests/test_resources.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7b98ae0d91..a8bf35fc9c 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -508,6 +508,9 @@ def testSimpleRequirements(self):
         with pytest.raises(ValueError):
             Requirement.parse("#")
 
+    def test_local_version(self):
+        req, = parse_requirements('foo==1.0.org1')
+
     def testVersionEquality(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)

From b7292405eeb61fac73fb5507c30e169a47166723 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 23 Feb 2016 14:25:06 +1100
Subject: [PATCH 5553/8469] Update to packaging 16.4. Fixes #499.

---
 pkg_resources/_vendor/packaging/__about__.py    | 2 +-
 pkg_resources/_vendor/packaging/requirements.py | 2 +-
 pkg_resources/_vendor/packaging/specifiers.py   | 8 +++++---
 pkg_resources/_vendor/vendored.txt              | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index 313613b953..e4c32ea179 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,7 +12,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.1"
+__version__ = "16.4"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 16032ac6b2..361f157bbb 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -47,7 +47,7 @@ class InvalidRequirement(ValueError):
 VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
 VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
 
-VERSION_ONE = VERSION_PEP440 | VERSION_LEGACY
+VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
 VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
                        joinString=",")("_raw_spec")
 _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 31845c611a..5ee8f02339 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -218,9 +218,11 @@ class LegacySpecifier(_IndividualSpecifier):
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
-            [^\s]* # We just match everything, except for whitespace since this
-                   # is a "legacy" specifier and the version string can be just
-                   # about anything.
+            [^;\s)]* # We just match everything, except for whitespace,
+                     # a semi-colon for marker support, and closing paren
+                     # since versions can be enclosed in them. Since this is
+                     # a "legacy" specifier and the version string can be
+                     # just about anything.
         )
         """
     )
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index fbaaa5f186..002ef95556 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
-packaging==16.1
+packaging==16.4
 pyparsing==2.0.6
 six==1.10.0

From b165a8bec12ec7a7cf606ceb83e94e80f22445dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 11:01:28 -0400
Subject: [PATCH 5554/8469] Rename variable for consistency

---
 setuptools/msvc9_support.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 7e8a2a25d0..2524ec414c 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -88,7 +88,7 @@ def query_vcvarsall(version, *args, **kwargs):
         raise distutils.errors.DistutilsPlatformError(message)
     raise distutils.errors.DistutilsPlatformError(message)
 
-def setvcenv(VcVer, arch):
+def setvcenv(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.
@@ -114,7 +114,7 @@ def setvcenv(VcVer, arch):
     VsReg = r'Software%s\Microsoft\VisualStudio\SxS\VS7' % node
     VcReg = r'Software%s\Microsoft\VisualStudio\SxS\VC7' % node
     VcForPythonReg = r'Software%s\Microsoft\DevDiv\VCForPython\%0.1f' %\
-        (node, VcVer)
+        (node, version)
     WindowsSdkReg = r'Software%s\Microsoft\Microsoft SDKs\Windows' % node
 
     # Set Platform subdirectories
@@ -140,16 +140,16 @@ def setvcenv(VcVer, arch):
     # Find Microsoft Visual Studio directory
     try:
         # Try to get it from registry
-        VsInstallDir = reg_value(VsReg, '%0.1f' % VcVer)
+        VsInstallDir = reg_value(VsReg, '%0.1f' % version)
     except KeyError:
         # If fail, use default path
         VsInstallDir = join(ProgramFilesX86,
-                            'Microsoft Visual Studio %0.1f' % VcVer)
+                            'Microsoft Visual Studio %0.1f' % version)
 
     # Find Microsoft Visual C++ directory
     try:
         # Try to get it from registry
-        VcInstallDir = reg_value(VcReg, '%0.1f' % VcVer)
+        VcInstallDir = reg_value(VcReg, '%0.1f' % version)
     except KeyError:
         try:
             # Try to get "VC++ for Python" version from registry
@@ -157,16 +157,16 @@ def setvcenv(VcVer, arch):
         except KeyError:
             # If fail, use default path
             VcInstallDir = join(ProgramFilesX86,
-                                r'Microsoft Visual Studio %0.1f\VC' % VcVer)
+                                r'Microsoft Visual Studio %0.1f\VC' % version)
     if not isdir(VcInstallDir):
         raise DistutilsPlatformError('vcvarsall.bat and Visual C++ '
                                      'directory not found')
 
     # Find Microsoft Windows SDK directory
     WindowsSdkDir = ''
-    if VcVer == 9.0:
+    if version == 9.0:
         WindowsSdkVer = ('7.0', '6.1', '6.0a')
-    elif VcVer == 10.0:
+    elif version == 10.0:
         WindowsSdkVer = ('7.1', '7.0a')
     else:
         WindowsSdkVer = ()
@@ -212,7 +212,7 @@ def setvcenv(VcVer, arch):
         FrameworkDir64 = join(WinDir, r'Microsoft.NET\Framework64')
 
     # Find Microsoft .NET Framework Versions
-    if VcVer == 10.0:
+    if version == 10.0:
         try:
             # Try to get v4 from registry
             v4 = reg_value(VcReg, 'frameworkver32')
@@ -222,9 +222,9 @@ def setvcenv(VcVer, arch):
             # If fail, use last v4 version
             v4 = 'v4.0.30319'
         FrameworkVer = (v4, 'v3.5')
-    elif VcVer == 9.0:
+    elif version == 9.0:
         FrameworkVer = ('v3.5', 'v2.0.50727')
-    elif VcVer == 8.0:
+    elif version == 8.0:
         FrameworkVer = ('v3.0', 'v2.0.50727')
 
     # Set Microsoft Visual Studio Tools
@@ -255,7 +255,7 @@ def setvcenv(VcVer, arch):
     SdkTools = [join(WindowsSdkDir, 'Bin')]
     if Tar_not_x86:
         SdkTools.append(join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
-    if VcVer == 10.0:
+    if version == 10.0:
         SdkTools.append(join(WindowsSdkDir,
                              r'Bin\NETFX 4.0 Tools' + plt_subd_sdk))
 

From 17379ffe70c7d6c8c7de65013c91bc20c7b8b274 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 11:10:47 -0400
Subject: [PATCH 5555/8469] Include 'arch' in the function signature rather
 than processing arguments by hand.

---
 setuptools/msvc9_support.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 2524ec414c..fc8102c9c3 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -47,12 +47,12 @@ def find_vcvarsall(version):
 
     return unpatched['find_vcvarsall'](version)
 
-def query_vcvarsall(version, *args, **kwargs):
+def query_vcvarsall(version, arch='x86', *args, **kwargs):
     message = ''
 
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
-        return unpatched['query_vcvarsall'](version, *args, **kwargs)
+        return unpatched['query_vcvarsall'](version, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError as exc:
         # Error if Vcvarsall.bat is missing
         message = exc.args[0]
@@ -62,11 +62,7 @@ def query_vcvarsall(version, *args, **kwargs):
 
     # If vcvarsall.bat fail, try to set environment directly
     try:
-        if not args:
-            arch = 'x86'
-        else:
-            arch = args[0]
-        return setvcenv(version, kwargs.get('arch', arch))
+        return setvcenv(version, arch)
     except distutils.errors.DistutilsPlatformError as exc:
         # Error if MSVC++ directory not found or environment not set
         message = exc.args[0]

From 21480cfc6fbe1da481698484549ecb490f098994 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 11:14:33 -0400
Subject: [PATCH 5556/8469] Make function private and don't use a different
 name for it, as it performs the same purpose. Also, it doesn't set anything.

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

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index fc8102c9c3..3b5133c8a9 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -62,7 +62,7 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
 
     # If vcvarsall.bat fail, try to set environment directly
     try:
-        return setvcenv(version, arch)
+        return _query_vcvarsall(version, arch)
     except distutils.errors.DistutilsPlatformError as exc:
         # Error if MSVC++ directory not found or environment not set
         message = exc.args[0]
@@ -84,7 +84,7 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
         raise distutils.errors.DistutilsPlatformError(message)
     raise distutils.errors.DistutilsPlatformError(message)
 
-def setvcenv(version, arch):
+def _query_vcvarsall(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.

From 36ec20b295897ff953908af0fd2791e56ae3d0b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 13:41:06 -0400
Subject: [PATCH 5557/8469] Move imports to the top and normalize usage.

---
 setuptools/msvc9_support.py | 90 ++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 3b5133c8a9..2d5d2a8405 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,3 +1,6 @@
+import os
+import distutils.errors
+
 try:
     import distutils.msvc9compiler
 except ImportError:
@@ -40,8 +43,7 @@ def find_vcvarsall(version):
             productdir = None
 
     if productdir:
-        import os
-        vcvarsall = os.path.join(productdir, "vcvarsall.bat")
+        vcvarsall = os.path.os.path.join(productdir, "vcvarsall.bat")
         if os.path.isfile(vcvarsall):
             return vcvarsall
 
@@ -89,20 +91,16 @@ def _query_vcvarsall(version, arch):
     Return environment variables for specified Microsoft Visual C++ version
     and platform.
     """
-    from os.path import join, isdir
-    from os import environ
-    from distutils.errors import DistutilsPlatformError
-
     # Find current and target architecture
-    CurrentCpu = environ['processor_architecture'].lower()
+    CurrentCpu = os.environ['processor_architecture'].lower()
     TargetCpu = arch[arch.find('_') + 1:]
     Tar_not_x86 = TargetCpu != 'x86'
     Cur_not_x86 = CurrentCpu != 'x86'
 
     # Find "Windows" and "Program Files" system directories
-    WinDir = environ['WinDir']
-    ProgramFiles = environ['ProgramFiles']
-    ProgramFilesX86 = environ.get('ProgramFiles(x86)', ProgramFiles)
+    WinDir = os.environ['WinDir']
+    ProgramFiles = os.environ['ProgramFiles']
+    ProgramFilesX86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
 
     # Set registry base paths
     reg_value = distutils.msvc9compiler.Reg.get_value
@@ -139,7 +137,7 @@ def _query_vcvarsall(version, arch):
         VsInstallDir = reg_value(VsReg, '%0.1f' % version)
     except KeyError:
         # If fail, use default path
-        VsInstallDir = join(ProgramFilesX86,
+        VsInstallDir = os.path.join(ProgramFilesX86,
                             'Microsoft Visual Studio %0.1f' % version)
 
     # Find Microsoft Visual C++ directory
@@ -149,13 +147,13 @@ def _query_vcvarsall(version, arch):
     except KeyError:
         try:
             # Try to get "VC++ for Python" version from registry
-            VcInstallDir = join(reg_value(VcForPythonReg, 'installdir'), 'VC')
+            VcInstallDir = os.path.join(reg_value(VcForPythonReg, 'installdir'), 'VC')
         except KeyError:
             # If fail, use default path
-            VcInstallDir = join(ProgramFilesX86,
+            VcInstallDir = os.path.join(ProgramFilesX86,
                                 r'Microsoft Visual Studio %0.1f\VC' % version)
-    if not isdir(VcInstallDir):
-        raise DistutilsPlatformError('vcvarsall.bat and Visual C++ '
+    if not os.path.isdir(VcInstallDir):
+        raise distutils.errors.DistutilsPlatformError('vcvarsall.bat and Visual C++ '
                                      'directory not found')
 
     # Find Microsoft Windows SDK directory
@@ -169,27 +167,27 @@ def _query_vcvarsall(version, arch):
     for ver in WindowsSdkVer:
         # Try to get it from registry
         try:
-            WindowsSdkDir = reg_value(join(WindowsSdkReg, 'v%s' % ver),
+            WindowsSdkDir = reg_value(os.path.join(WindowsSdkReg, 'v%s' % ver),
                                       'installationfolder')
             break
         except KeyError:
             pass
-    if not WindowsSdkDir or not isdir(WindowsSdkDir):
+    if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # Try to get "VC++ for Python" version from registry
         try:
-            WindowsSdkDir = join(reg_value(VcForPythonReg, 'installdir'),
+            WindowsSdkDir = os.path.join(reg_value(VcForPythonReg, 'installdir'),
                                  'WinSDK')
         except:
             pass
-    if not WindowsSdkDir or not isdir(WindowsSdkDir):
+    if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # If fail, use default path
         for ver in WindowsSdkVer:
-            d = join(ProgramFiles, r'Microsoft SDKs\Windows\v%s' % ver)
-            if isdir(d):
+            d = os.path.join(ProgramFiles, r'Microsoft SDKs\Windows\v%s' % ver)
+            if os.path.isdir(d):
                 WindowsSdkDir = d
     if not WindowsSdkDir:
         # If fail, use Platform SDK
-        WindowsSdkDir = join(VcInstallDir, 'PlatformSDK')
+        WindowsSdkDir = os.path.join(VcInstallDir, 'PlatformSDK')
 
     # Find Microsoft .NET Framework 32bit directory
     try:
@@ -197,7 +195,7 @@ def _query_vcvarsall(version, arch):
         FrameworkDir32 = reg_value(VcReg, 'frameworkdir32')
     except KeyError:
         # If fail, use default path
-        FrameworkDir32 = join(WinDir, r'Microsoft.NET\Framework')
+        FrameworkDir32 = os.path.join(WinDir, r'Microsoft.NET\Framework')
 
     # Find Microsoft .NET Framework 64bit directory
     try:
@@ -205,7 +203,7 @@ def _query_vcvarsall(version, arch):
         FrameworkDir64 = reg_value(VcReg, 'frameworkdir64')
     except KeyError:
         # If fail, use default path
-        FrameworkDir64 = join(WinDir, r'Microsoft.NET\Framework64')
+        FrameworkDir64 = os.path.join(WinDir, r'Microsoft.NET\Framework64')
 
     # Find Microsoft .NET Framework Versions
     if version == 10.0:
@@ -224,48 +222,48 @@ def _query_vcvarsall(version, arch):
         FrameworkVer = ('v3.0', 'v2.0.50727')
 
     # Set Microsoft Visual Studio Tools
-    VSTools = [join(VsInstallDir, r'Common7\IDE'),
-               join(VsInstallDir, r'Common7\Tools')]
+    VSTools = [os.path.join(VsInstallDir, r'Common7\IDE'),
+               os.path.join(VsInstallDir, r'Common7\Tools')]
 
     # Set Microsoft Visual C++ Includes
-    VCIncludes = [join(VcInstallDir, 'Include')]
+    VCIncludes = [os.path.join(VcInstallDir, 'Include')]
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
-    VCLibraries = [join(VcInstallDir, 'Lib' + plt_subd_lib),
-                   join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib)]
+    VCLibraries = [os.path.join(VcInstallDir, 'Lib' + plt_subd_lib),
+                   os.path.join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib)]
 
     # Set Microsoft Visual C++ Tools
-    VCTools = [join(VcInstallDir, 'VCPackages'),
-               join(VcInstallDir, 'Bin' + plt_subd_tools)]
+    VCTools = [os.path.join(VcInstallDir, 'VCPackages'),
+               os.path.join(VcInstallDir, 'Bin' + plt_subd_tools)]
     if plt_subd_tools:
-        VCTools.append(join(VcInstallDir, 'Bin'))
+        VCTools.append(os.path.join(VcInstallDir, 'Bin'))
 
     # Set Microsoft Windows SDK Include
-    OSLibraries = [join(WindowsSdkDir, 'Lib' + plt_subd_sdk)]
+    OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + plt_subd_sdk)]
 
     # Set Microsoft Windows SDK Libraries
-    OSIncludes = [join(WindowsSdkDir, 'Include'),
-                  join(WindowsSdkDir, r'Include\gl')]
+    OSIncludes = [os.path.join(WindowsSdkDir, 'Include'),
+                  os.path.join(WindowsSdkDir, r'Include\gl')]
 
     # Set Microsoft Windows SDK Tools
-    SdkTools = [join(WindowsSdkDir, 'Bin')]
+    SdkTools = [os.path.join(WindowsSdkDir, 'Bin')]
     if Tar_not_x86:
-        SdkTools.append(join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
+        SdkTools.append(os.path.join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
     if version == 10.0:
-        SdkTools.append(join(WindowsSdkDir,
+        SdkTools.append(os.path.join(WindowsSdkDir,
                              r'Bin\NETFX 4.0 Tools' + plt_subd_sdk))
 
     # Set Microsoft Windows SDK Setup
-    SdkSetup = [join(WindowsSdkDir, 'Setup')]
+    SdkSetup = [os.path.join(WindowsSdkDir, 'Setup')]
 
     # Set Microsoft .NET Framework Tools
-    FxTools = [join(FrameworkDir32, ver) for ver in FrameworkVer]
+    FxTools = [os.path.join(FrameworkDir32, ver) for ver in FrameworkVer]
     if Tar_not_x86 and Cur_not_x86:
         for ver in FrameworkVer:
-            FxTools.append(join(FrameworkDir64, ver))
+            FxTools.append(os.path.join(FrameworkDir64, ver))
 
     # Set Microsoft Visual Studio Team System Database
-    VsTDb = [join(VsInstallDir, r'VSTSDB\Deploy')]
+    VsTDb = [os.path.join(VsInstallDir, r'VSTSDB\Deploy')]
 
     # Return Environment Variables
     env = {}
@@ -276,7 +274,7 @@ def _query_vcvarsall(version, arch):
 
     def checkpath(path, varlist):
         # Function that add valid paths in list in not already present
-        if isdir(path) and path not in varlist:
+        if os.path.isdir(path) and path not in varlist:
             varlist.append(path)
 
     for key in env.keys():
@@ -288,15 +286,15 @@ def checkpath(path, varlist):
 
         # Add values from actual environment
         try:
-            for val in environ[key].split(';'):
+            for val in os.environ[key].split(';'):
                 checkpath(val, var)
         except KeyError:
             pass
 
         # Format paths to Environment Variable string
         if var:
-            env[key] = ';'.join(var)
+            env[key] = ';'.os.path.join(var)
         else:
-            raise DistutilsPlatformError("%s environment variable is empty" %
+            raise distutils.errors.DistutilsPlatformError("%s environment variable is empty" %
                                          key.upper())
     return env

From d773b79ae2143f18c941179f1b4e39a3e5c460af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 13:50:28 -0400
Subject: [PATCH 5558/8469] Reindent to eliminate long lines and hanging
 indents.

---
 setuptools/msvc9_support.py | 52 +++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 2d5d2a8405..095957fa5e 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -137,8 +137,8 @@ def _query_vcvarsall(version, arch):
         VsInstallDir = reg_value(VsReg, '%0.1f' % version)
     except KeyError:
         # If fail, use default path
-        VsInstallDir = os.path.join(ProgramFilesX86,
-                            'Microsoft Visual Studio %0.1f' % version)
+        name = 'Microsoft Visual Studio %0.1f' % version
+        VsInstallDir = os.path.join(ProgramFilesX86, name)
 
     # Find Microsoft Visual C++ directory
     try:
@@ -147,14 +147,15 @@ def _query_vcvarsall(version, arch):
     except KeyError:
         try:
             # Try to get "VC++ for Python" version from registry
-            VcInstallDir = os.path.join(reg_value(VcForPythonReg, 'installdir'), 'VC')
+            install_base = reg_value(VcForPythonReg, 'installdir')
+            VcInstallDir = os.path.join(install_base, 'VC')
         except KeyError:
             # If fail, use default path
-            VcInstallDir = os.path.join(ProgramFilesX86,
-                                r'Microsoft Visual Studio %0.1f\VC' % version)
+            default = r'Microsoft Visual Studio %0.1f\VC' % version
+            VcInstallDir = os.path.join(ProgramFilesX86, default)
     if not os.path.isdir(VcInstallDir):
-        raise distutils.errors.DistutilsPlatformError('vcvarsall.bat and Visual C++ '
-                                     'directory not found')
+        msg = 'vcvarsall.bat and Visual C++ directory not found'
+        raise distutils.errors.DistutilsPlatformError(msg)
 
     # Find Microsoft Windows SDK directory
     WindowsSdkDir = ''
@@ -167,22 +168,23 @@ def _query_vcvarsall(version, arch):
     for ver in WindowsSdkVer:
         # Try to get it from registry
         try:
-            WindowsSdkDir = reg_value(os.path.join(WindowsSdkReg, 'v%s' % ver),
-                                      'installationfolder')
+            loc = os.path.join(WindowsSdkReg, 'v%s' % ver)
+            WindowsSdkDir = reg_value(loc, 'installationfolder')
             break
         except KeyError:
             pass
     if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # Try to get "VC++ for Python" version from registry
         try:
-            WindowsSdkDir = os.path.join(reg_value(VcForPythonReg, 'installdir'),
-                                 'WinSDK')
+            install_base = reg_value(VcForPythonReg, 'installdir')
+            WindowsSdkDir = os.path.join(install_base, 'WinSDK')
         except:
             pass
     if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # If fail, use default path
         for ver in WindowsSdkVer:
-            d = os.path.join(ProgramFiles, r'Microsoft SDKs\Windows\v%s' % ver)
+            path = r'Microsoft SDKs\Windows\v%s' % ver
+            d = os.path.join(ProgramFiles, path)
             if os.path.isdir(d):
                 WindowsSdkDir = d
     if not WindowsSdkDir:
@@ -229,12 +231,16 @@ def _query_vcvarsall(version, arch):
     VCIncludes = [os.path.join(VcInstallDir, 'Include')]
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
-    VCLibraries = [os.path.join(VcInstallDir, 'Lib' + plt_subd_lib),
-                   os.path.join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib)]
+    VCLibraries = [
+        os.path.join(VcInstallDir, 'Lib' + plt_subd_lib),
+        os.path.join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib),
+    ]
 
     # Set Microsoft Visual C++ Tools
-    VCTools = [os.path.join(VcInstallDir, 'VCPackages'),
-               os.path.join(VcInstallDir, 'Bin' + plt_subd_tools)]
+    VCTools = [
+        os.path.join(VcInstallDir, 'VCPackages'),
+        os.path.join(VcInstallDir, 'Bin' + plt_subd_tools),
+    ]
     if plt_subd_tools:
         VCTools.append(os.path.join(VcInstallDir, 'Bin'))
 
@@ -242,16 +248,18 @@ def _query_vcvarsall(version, arch):
     OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + plt_subd_sdk)]
 
     # Set Microsoft Windows SDK Libraries
-    OSIncludes = [os.path.join(WindowsSdkDir, 'Include'),
-                  os.path.join(WindowsSdkDir, r'Include\gl')]
+    OSIncludes = [
+        os.path.join(WindowsSdkDir, 'Include'),
+        os.path.join(WindowsSdkDir, r'Include\gl'),
+    ]
 
     # Set Microsoft Windows SDK Tools
     SdkTools = [os.path.join(WindowsSdkDir, 'Bin')]
     if Tar_not_x86:
         SdkTools.append(os.path.join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
     if version == 10.0:
-        SdkTools.append(os.path.join(WindowsSdkDir,
-                             r'Bin\NETFX 4.0 Tools' + plt_subd_sdk))
+        path = r'Bin\NETFX 4.0 Tools' + plt_subd_sdk
+        SdkTools.append(os.path.join(WindowsSdkDir, path))
 
     # Set Microsoft Windows SDK Setup
     SdkSetup = [os.path.join(WindowsSdkDir, 'Setup')]
@@ -295,6 +303,6 @@ def checkpath(path, varlist):
         if var:
             env[key] = ';'.os.path.join(var)
         else:
-            raise distutils.errors.DistutilsPlatformError("%s environment variable is empty" %
-                                         key.upper())
+            msg = "%s environment variable is empty" % key.upper()
+            raise distutils.errors.DistutilsPlatformError(msg)
     return env

From ad0bd62b505fedcfb0b18585bc8a9a3e55346c55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 13:51:23 -0400
Subject: [PATCH 5559/8469] Remove redundant call

---
 setuptools/msvc9_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 095957fa5e..4450338304 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -83,7 +83,7 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK for Windows 7": '
             message += r'www.microsoft.com/download/details.aspx?id=8279'
-        raise distutils.errors.DistutilsPlatformError(message)
+
     raise distutils.errors.DistutilsPlatformError(message)
 
 def _query_vcvarsall(version, arch):

From 3a122756eb4a75048e3778627bac6dd3590fbe5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:04:10 -0400
Subject: [PATCH 5560/8469] Extract PlatformInfo class for capturing some of
 the platform info calculations.

---
 setuptools/msvc9_support.py | 87 ++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 4450338304..2ef94ada17 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -86,16 +86,53 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
 
     raise distutils.errors.DistutilsPlatformError(message)
 
+
+class PlatformInfo:
+    current_cpu = os.environ['processor_architecture'].lower()
+
+    def __init__(self, arch):
+        self.arch = arch
+
+    @property
+    def target_cpu(self):
+        return self.arch[self.arch.find('_') + 1:]
+
+    def target_is_x86(self):
+        return self.target_cpu == 'x86'
+
+    def current_is_x86(self):
+        return self.current_cpu != 'x86'
+
+    @property
+    def lib_extra(self):
+        return (
+            r'\amd64' if self.target_cpu == 'amd64' else
+            r'\ia64' if self.target_cpu == 'ia64' else
+            ''
+        )
+
+    @property
+    def sdk_extra(self):
+        return (
+            r'\x64' if self.target_cpu == 'amd64' else
+            r'\ia64' if self.target_cpu == 'ia64' else
+            ''
+        )
+
+    @property
+    def tools_extra(self):
+        path = self.lib_extra
+        if self.target_cpu != self.current_cpu:
+            path = path.replace('\\', '\\x86_')
+        return path
+
+
 def _query_vcvarsall(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.
     """
-    # Find current and target architecture
-    CurrentCpu = os.environ['processor_architecture'].lower()
-    TargetCpu = arch[arch.find('_') + 1:]
-    Tar_not_x86 = TargetCpu != 'x86'
-    Cur_not_x86 = CurrentCpu != 'x86'
+    pi = PlatformInfo(arch)
 
     # Find "Windows" and "Program Files" system directories
     WinDir = os.environ['WinDir']
@@ -104,33 +141,13 @@ def _query_vcvarsall(version, arch):
 
     # Set registry base paths
     reg_value = distutils.msvc9compiler.Reg.get_value
-    node = r'\Wow6432Node' if Cur_not_x86 else ''
+    node = r'\Wow6432Node' if not pi.current_is_x86() else ''
     VsReg = r'Software%s\Microsoft\VisualStudio\SxS\VS7' % node
     VcReg = r'Software%s\Microsoft\VisualStudio\SxS\VC7' % node
     VcForPythonReg = r'Software%s\Microsoft\DevDiv\VCForPython\%0.1f' %\
         (node, version)
     WindowsSdkReg = r'Software%s\Microsoft\Microsoft SDKs\Windows' % node
 
-    # Set Platform subdirectories
-    if TargetCpu == 'amd64':
-        plt_subd_lib = r'\amd64'
-        plt_subd_sdk = r'\x64'
-        if CurrentCpu == 'amd64':
-            plt_subd_tools = r'\amd64'
-        else:
-            plt_subd_tools = r'\x86_amd64'
-    elif TargetCpu == 'ia64':
-        plt_subd_lib = r'\ia64'
-        plt_subd_sdk = r'\ia64'
-        if CurrentCpu == 'ia64':
-            plt_subd_tools = r'\ia64'
-        else:
-            plt_subd_tools = r'\x86_ia64'
-    else:
-        plt_subd_lib = ''
-        plt_subd_sdk = ''
-        plt_subd_tools = ''
-
     # Find Microsoft Visual Studio directory
     try:
         # Try to get it from registry
@@ -232,20 +249,20 @@ def _query_vcvarsall(version, arch):
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
     VCLibraries = [
-        os.path.join(VcInstallDir, 'Lib' + plt_subd_lib),
-        os.path.join(VcInstallDir, r'ATLMFC\LIB' + plt_subd_lib),
+        os.path.join(VcInstallDir, 'Lib' + pi.lib_extra),
+        os.path.join(VcInstallDir, r'ATLMFC\LIB' + pi.lib_extra),
     ]
 
     # Set Microsoft Visual C++ Tools
     VCTools = [
         os.path.join(VcInstallDir, 'VCPackages'),
-        os.path.join(VcInstallDir, 'Bin' + plt_subd_tools),
+        os.path.join(VcInstallDir, 'Bin' + pi.tools_extra),
     ]
-    if plt_subd_tools:
+    if pi.tools_extra:
         VCTools.append(os.path.join(VcInstallDir, 'Bin'))
 
     # Set Microsoft Windows SDK Include
-    OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + plt_subd_sdk)]
+    OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + pi.sdk_extra)]
 
     # Set Microsoft Windows SDK Libraries
     OSIncludes = [
@@ -255,10 +272,10 @@ def _query_vcvarsall(version, arch):
 
     # Set Microsoft Windows SDK Tools
     SdkTools = [os.path.join(WindowsSdkDir, 'Bin')]
-    if Tar_not_x86:
-        SdkTools.append(os.path.join(WindowsSdkDir, 'Bin' + plt_subd_sdk))
+    if not pi.target_is_x86():
+        SdkTools.append(os.path.join(WindowsSdkDir, 'Bin' + pi.sdk_extra))
     if version == 10.0:
-        path = r'Bin\NETFX 4.0 Tools' + plt_subd_sdk
+        path = r'Bin\NETFX 4.0 Tools' + pi.sdk_extra
         SdkTools.append(os.path.join(WindowsSdkDir, path))
 
     # Set Microsoft Windows SDK Setup
@@ -266,7 +283,7 @@ def _query_vcvarsall(version, arch):
 
     # Set Microsoft .NET Framework Tools
     FxTools = [os.path.join(FrameworkDir32, ver) for ver in FrameworkVer]
-    if Tar_not_x86 and Cur_not_x86:
+    if not pi.target_is_x86() and not pi.current_is_x86():
         for ver in FrameworkVer:
             FxTools.append(os.path.join(FrameworkDir64, ver))
 

From 9919fdfa31b19a1f9741dba6ba5ee94c0a4cbbae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:08:39 -0400
Subject: [PATCH 5561/8469] Pull program files and win dir resolution into
 PlatformInfo

---
 setuptools/msvc9_support.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 2ef94ada17..d1b7b11f84 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -89,6 +89,9 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
 
 class PlatformInfo:
     current_cpu = os.environ['processor_architecture'].lower()
+    win_dir = os.environ['WinDir']
+    program_files = os.environ['ProgramFiles']
+    program_files_x86 = os.environ.get('ProgramFiles(x86)', program_files)
 
     def __init__(self, arch):
         self.arch = arch
@@ -134,11 +137,6 @@ def _query_vcvarsall(version, arch):
     """
     pi = PlatformInfo(arch)
 
-    # Find "Windows" and "Program Files" system directories
-    WinDir = os.environ['WinDir']
-    ProgramFiles = os.environ['ProgramFiles']
-    ProgramFilesX86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
-
     # Set registry base paths
     reg_value = distutils.msvc9compiler.Reg.get_value
     node = r'\Wow6432Node' if not pi.current_is_x86() else ''
@@ -155,7 +153,7 @@ def _query_vcvarsall(version, arch):
     except KeyError:
         # If fail, use default path
         name = 'Microsoft Visual Studio %0.1f' % version
-        VsInstallDir = os.path.join(ProgramFilesX86, name)
+        VsInstallDir = os.path.join(pi.program_files_x86, name)
 
     # Find Microsoft Visual C++ directory
     try:
@@ -169,7 +167,7 @@ def _query_vcvarsall(version, arch):
         except KeyError:
             # If fail, use default path
             default = r'Microsoft Visual Studio %0.1f\VC' % version
-            VcInstallDir = os.path.join(ProgramFilesX86, default)
+            VcInstallDir = os.path.join(pi.program_files_x86, default)
     if not os.path.isdir(VcInstallDir):
         msg = 'vcvarsall.bat and Visual C++ directory not found'
         raise distutils.errors.DistutilsPlatformError(msg)
@@ -201,7 +199,7 @@ def _query_vcvarsall(version, arch):
         # If fail, use default path
         for ver in WindowsSdkVer:
             path = r'Microsoft SDKs\Windows\v%s' % ver
-            d = os.path.join(ProgramFiles, path)
+            d = os.path.join(pi.program_files, path)
             if os.path.isdir(d):
                 WindowsSdkDir = d
     if not WindowsSdkDir:
@@ -214,7 +212,7 @@ def _query_vcvarsall(version, arch):
         FrameworkDir32 = reg_value(VcReg, 'frameworkdir32')
     except KeyError:
         # If fail, use default path
-        FrameworkDir32 = os.path.join(WinDir, r'Microsoft.NET\Framework')
+        FrameworkDir32 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
 
     # Find Microsoft .NET Framework 64bit directory
     try:
@@ -222,7 +220,7 @@ def _query_vcvarsall(version, arch):
         FrameworkDir64 = reg_value(VcReg, 'frameworkdir64')
     except KeyError:
         # If fail, use default path
-        FrameworkDir64 = os.path.join(WinDir, r'Microsoft.NET\Framework64')
+        FrameworkDir64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
 
     # Find Microsoft .NET Framework Versions
     if version == 10.0:

From 6b07888982b459b98ef358e35f5cd28bd9e720f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:34:29 -0400
Subject: [PATCH 5562/8469] Extract resolution of registry paths into a
 RegistryInfo object.

---
 setuptools/msvc9_support.py | 65 +++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index d1b7b11f84..aac6ca1217 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -130,26 +130,57 @@ def tools_extra(self):
         return path
 
 
+class RegistryInfo:
+    def __init__(self, platform_info, version):
+        self.platform_info = platform_info
+        self.version = version
+
+    @property
+    def microsoft(self):
+        return os.path.join(
+            'Software',
+            '' if self.platform_info.current_is_x86() else 'Wow6432Node',
+            'Microsoft',
+        )
+
+    @property
+    def sxs(self):
+        return os.path.join(self.microsoft, r'VisualStudio\SxS')
+
+    @property
+    def vc(self):
+        return os.path.join(self.sxs, 'VC7')
+
+    @property
+    def vs(self):
+        return os.path.join(self.sxs, 'VS7')
+
+    @property
+    def vc_for_python(self):
+        path = r'DevDiv\VCForPython\%0.1f' % self.version
+        return os.path.join(self.microsoft, path)
+
+    @property
+    def windows_sdk(self):
+        return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
+
+    def lookup(self, base, key):
+        return distutils.msvc9compiler.Reg.get_value(base, key)
+
+
 def _query_vcvarsall(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.
     """
     pi = PlatformInfo(arch)
-
-    # Set registry base paths
-    reg_value = distutils.msvc9compiler.Reg.get_value
-    node = r'\Wow6432Node' if not pi.current_is_x86() else ''
-    VsReg = r'Software%s\Microsoft\VisualStudio\SxS\VS7' % node
-    VcReg = r'Software%s\Microsoft\VisualStudio\SxS\VC7' % node
-    VcForPythonReg = r'Software%s\Microsoft\DevDiv\VCForPython\%0.1f' %\
-        (node, version)
-    WindowsSdkReg = r'Software%s\Microsoft\Microsoft SDKs\Windows' % node
+    reg = RegistryInfo(pi, version)
+    reg_value = reg.lookup
 
     # Find Microsoft Visual Studio directory
     try:
         # Try to get it from registry
-        VsInstallDir = reg_value(VsReg, '%0.1f' % version)
+        VsInstallDir = reg_value(reg.vs, '%0.1f' % version)
     except KeyError:
         # If fail, use default path
         name = 'Microsoft Visual Studio %0.1f' % version
@@ -158,11 +189,11 @@ def _query_vcvarsall(version, arch):
     # Find Microsoft Visual C++ directory
     try:
         # Try to get it from registry
-        VcInstallDir = reg_value(VcReg, '%0.1f' % version)
+        VcInstallDir = reg_value(reg.vc, '%0.1f' % version)
     except KeyError:
         try:
             # Try to get "VC++ for Python" version from registry
-            install_base = reg_value(VcForPythonReg, 'installdir')
+            install_base = reg_value(reg.vc_for_python, 'installdir')
             VcInstallDir = os.path.join(install_base, 'VC')
         except KeyError:
             # If fail, use default path
@@ -183,7 +214,7 @@ def _query_vcvarsall(version, arch):
     for ver in WindowsSdkVer:
         # Try to get it from registry
         try:
-            loc = os.path.join(WindowsSdkReg, 'v%s' % ver)
+            loc = os.path.join(reg.windows_sdk, 'v%s' % ver)
             WindowsSdkDir = reg_value(loc, 'installationfolder')
             break
         except KeyError:
@@ -191,7 +222,7 @@ def _query_vcvarsall(version, arch):
     if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # Try to get "VC++ for Python" version from registry
         try:
-            install_base = reg_value(VcForPythonReg, 'installdir')
+            install_base = reg_value(reg.vc_for_python, 'installdir')
             WindowsSdkDir = os.path.join(install_base, 'WinSDK')
         except:
             pass
@@ -209,7 +240,7 @@ def _query_vcvarsall(version, arch):
     # Find Microsoft .NET Framework 32bit directory
     try:
         # Try to get it from registry
-        FrameworkDir32 = reg_value(VcReg, 'frameworkdir32')
+        FrameworkDir32 = reg_value(reg.vc, 'frameworkdir32')
     except KeyError:
         # If fail, use default path
         FrameworkDir32 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
@@ -217,7 +248,7 @@ def _query_vcvarsall(version, arch):
     # Find Microsoft .NET Framework 64bit directory
     try:
         # Try to get it from registry
-        FrameworkDir64 = reg_value(VcReg, 'frameworkdir64')
+        FrameworkDir64 = reg_value(reg.vc, 'frameworkdir64')
     except KeyError:
         # If fail, use default path
         FrameworkDir64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
@@ -226,7 +257,7 @@ def _query_vcvarsall(version, arch):
     if version == 10.0:
         try:
             # Try to get v4 from registry
-            v4 = reg_value(VcReg, 'frameworkver32')
+            v4 = reg_value(reg.vc, 'frameworkver32')
             if v4.lower()[:2] != 'v4':
                 raise KeyError('Not the V4')
         except KeyError:

From 5f174090a545e6a441d37f7fbe66153544d0e162 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:51:48 -0400
Subject: [PATCH 5563/8469] Have lookup return None when it fails, moving the
 moving much of the try/except logic into single-line fallback expressions.

---
 setuptools/msvc9_support.py | 73 ++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 41 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index aac6ca1217..6e86b14d40 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -165,7 +165,10 @@ def windows_sdk(self):
         return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
 
     def lookup(self, base, key):
-        return distutils.msvc9compiler.Reg.get_value(base, key)
+        try:
+            return distutils.msvc9compiler.Reg.get_value(base, key)
+        except KeyError:
+            pass
 
 
 def _query_vcvarsall(version, arch):
@@ -178,27 +181,22 @@ def _query_vcvarsall(version, arch):
     reg_value = reg.lookup
 
     # Find Microsoft Visual Studio directory
-    try:
-        # Try to get it from registry
-        VsInstallDir = reg_value(reg.vs, '%0.1f' % version)
-    except KeyError:
-        # If fail, use default path
-        name = 'Microsoft Visual Studio %0.1f' % version
-        VsInstallDir = os.path.join(pi.program_files_x86, name)
+    name = 'Microsoft Visual Studio %0.1f' % version
+    default_vs = os.path.join(pi.program_files_x86, name)
+    VsInstallDir = reg_value(reg.vs, '%0.1f' % version) or default_vs
 
     # Find Microsoft Visual C++ directory
-    try:
-        # Try to get it from registry
-        VcInstallDir = reg_value(reg.vc, '%0.1f' % version)
-    except KeyError:
-        try:
-            # Try to get "VC++ for Python" version from registry
-            install_base = reg_value(reg.vc_for_python, 'installdir')
-            VcInstallDir = os.path.join(install_base, 'VC')
-        except KeyError:
-            # If fail, use default path
-            default = r'Microsoft Visual Studio %0.1f\VC' % version
-            VcInstallDir = os.path.join(pi.program_files_x86, default)
+
+    # If fail, use default path
+    default = r'Microsoft Visual Studio %0.1f\VC' % version
+    guess_vc = os.path.join(pi.program_files_x86, default)
+
+    # Try to get "VC++ for Python" version from registry
+    install_base = reg_value(reg.vc_for_python, 'installdir')
+    default_vc = os.path.join(install_base, 'VC') if install_base else guess_vc
+
+    VcInstallDir = reg_value(reg.vc, '%0.1f' % version) or default_vc
+
     if not os.path.isdir(VcInstallDir):
         msg = 'vcvarsall.bat and Visual C++ directory not found'
         raise distutils.errors.DistutilsPlatformError(msg)
@@ -213,19 +211,15 @@ def _query_vcvarsall(version, arch):
         WindowsSdkVer = ()
     for ver in WindowsSdkVer:
         # Try to get it from registry
-        try:
-            loc = os.path.join(reg.windows_sdk, 'v%s' % ver)
-            WindowsSdkDir = reg_value(loc, 'installationfolder')
+        loc = os.path.join(reg.windows_sdk, 'v%s' % ver)
+        WindowsSdkDir = reg_value(loc, 'installationfolder')
+        if WindowsSdkDir:
             break
-        except KeyError:
-            pass
     if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # Try to get "VC++ for Python" version from registry
-        try:
-            install_base = reg_value(reg.vc_for_python, 'installdir')
+        install_base = reg_value(reg.vc_for_python, 'installdir')
+        if install_base:
             WindowsSdkDir = os.path.join(install_base, 'WinSDK')
-        except:
-            pass
     if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
         # If fail, use default path
         for ver in WindowsSdkVer:
@@ -238,23 +232,20 @@ def _query_vcvarsall(version, arch):
         WindowsSdkDir = os.path.join(VcInstallDir, 'PlatformSDK')
 
     # Find Microsoft .NET Framework 32bit directory
-    try:
-        # Try to get it from registry
-        FrameworkDir32 = reg_value(reg.vc, 'frameworkdir32')
-    except KeyError:
-        # If fail, use default path
-        FrameworkDir32 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
+    guess_fw = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
+    FrameworkDir32 = reg_value(reg.vc, 'frameworkdir32') or guess_fw
 
     # Find Microsoft .NET Framework 64bit directory
-    try:
-        # Try to get it from registry
-        FrameworkDir64 = reg_value(reg.vc, 'frameworkdir64')
-    except KeyError:
-        # If fail, use default path
-        FrameworkDir64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
+    guess_fw64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
+    FrameworkDir64 = reg_value(reg.vc, 'frameworkdir64') or guess_fw64
 
     # Find Microsoft .NET Framework Versions
     if version == 10.0:
+        v4 = reg_value(reg.vc, 'frameworkver32')
+        if v4 and v4.lower()[:2] != 'v4':
+            v4 = None
+        v4 = v4 or 'v4.0.30319'
+
         try:
             # Try to get v4 from registry
             v4 = reg_value(reg.vc, 'frameworkver32')

From 758b4249b82b63657fe1b31d59810b4ee098473c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:53:08 -0400
Subject: [PATCH 5564/8469] Remove another hanging indent

---
 setuptools/msvc9_support.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 6e86b14d40..fbf81bab6e 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -241,19 +241,11 @@ def _query_vcvarsall(version, arch):
 
     # Find Microsoft .NET Framework Versions
     if version == 10.0:
-        v4 = reg_value(reg.vc, 'frameworkver32')
-        if v4 and v4.lower()[:2] != 'v4':
+        v4 = reg_value(reg.vc, 'frameworkver32') or ''
+        if v4.lower()[:2] != 'v4':
             v4 = None
+        # default to last v4 version
         v4 = v4 or 'v4.0.30319'
-
-        try:
-            # Try to get v4 from registry
-            v4 = reg_value(reg.vc, 'frameworkver32')
-            if v4.lower()[:2] != 'v4':
-                raise KeyError('Not the V4')
-        except KeyError:
-            # If fail, use last v4 version
-            v4 = 'v4.0.30319'
         FrameworkVer = (v4, 'v3.5')
     elif version == 9.0:
         FrameworkVer = ('v3.5', 'v2.0.50727')
@@ -261,8 +253,10 @@ def _query_vcvarsall(version, arch):
         FrameworkVer = ('v3.0', 'v2.0.50727')
 
     # Set Microsoft Visual Studio Tools
-    VSTools = [os.path.join(VsInstallDir, r'Common7\IDE'),
-               os.path.join(VsInstallDir, r'Common7\Tools')]
+    VSTools = [
+        os.path.join(VsInstallDir, r'Common7\IDE'),
+        os.path.join(VsInstallDir, r'Common7\Tools'),
+    ]
 
     # Set Microsoft Visual C++ Includes
     VCIncludes = [os.path.join(VcInstallDir, 'Include')]

From 6d11de6d754a73307dd62c7ba499c3f14c5f675b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 15:56:47 -0400
Subject: [PATCH 5565/8469] Move finding of visual studio into RegistryInfo

---
 setuptools/msvc9_support.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index fbf81bab6e..7728eb79bb 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -164,6 +164,14 @@ def vc_for_python(self):
     def windows_sdk(self):
         return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
 
+    def find_visual_studio(self):
+        """
+        Find Microsoft Visual Studio directory
+        """
+        name = 'Microsoft Visual Studio %0.1f' % self.version
+        default = os.path.join(self.platform_info.program_files_x86, name)
+        return self.lookup(self.vs, '%0.1f' % self.version) or default
+
     def lookup(self, base, key):
         try:
             return distutils.msvc9compiler.Reg.get_value(base, key)
@@ -180,11 +188,6 @@ def _query_vcvarsall(version, arch):
     reg = RegistryInfo(pi, version)
     reg_value = reg.lookup
 
-    # Find Microsoft Visual Studio directory
-    name = 'Microsoft Visual Studio %0.1f' % version
-    default_vs = os.path.join(pi.program_files_x86, name)
-    VsInstallDir = reg_value(reg.vs, '%0.1f' % version) or default_vs
-
     # Find Microsoft Visual C++ directory
 
     # If fail, use default path
@@ -254,8 +257,8 @@ def _query_vcvarsall(version, arch):
 
     # Set Microsoft Visual Studio Tools
     VSTools = [
-        os.path.join(VsInstallDir, r'Common7\IDE'),
-        os.path.join(VsInstallDir, r'Common7\Tools'),
+        os.path.join(reg.find_visual_studio(), r'Common7\IDE'),
+        os.path.join(reg.find_visual_studio(), r'Common7\Tools'),
     ]
 
     # Set Microsoft Visual C++ Includes
@@ -302,7 +305,7 @@ def _query_vcvarsall(version, arch):
             FxTools.append(os.path.join(FrameworkDir64, ver))
 
     # Set Microsoft Visual Studio Team System Database
-    VsTDb = [os.path.join(VsInstallDir, r'VSTSDB\Deploy')]
+    VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]
 
     # Return Environment Variables
     env = {}

From 0dc21cb9a6a5195f1b7e6ae47901b32fb9b486eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:17:48 -0500
Subject: [PATCH 5566/8469] Extract find_visual_c method into RegistryInfo

---
 setuptools/msvc9_support.py | 50 ++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 7728eb79bb..4a1ec54ee7 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -172,6 +172,26 @@ def find_visual_studio(self):
         default = os.path.join(self.platform_info.program_files_x86, name)
         return self.lookup(self.vs, '%0.1f' % self.version) or default
 
+    def find_visual_c(self):
+        """
+        Find Microsoft Visual C++ directory
+        """
+        # If fail, use default path
+        default = r'Microsoft Visual Studio %0.1f\VC' % self.version
+        guess_vc = os.path.join(self.platform_info.program_files_x86, default)
+
+        # Try to get "VC++ for Python" version from registry
+        install_base = self.lookup(self.vc_for_python, 'installdir')
+        default_vc = os.path.join(install_base, 'VC') if install_base else guess_vc
+
+        result = self.lookup(self.vc, '%0.1f' % self.version) or default_vc
+
+        if not os.path.isdir(result):
+            msg = 'vcvarsall.bat and Visual C++ directory not found'
+            raise distutils.errors.DistutilsPlatformError(msg)
+
+        return result
+
     def lookup(self, base, key):
         try:
             return distutils.msvc9compiler.Reg.get_value(base, key)
@@ -188,22 +208,6 @@ def _query_vcvarsall(version, arch):
     reg = RegistryInfo(pi, version)
     reg_value = reg.lookup
 
-    # Find Microsoft Visual C++ directory
-
-    # If fail, use default path
-    default = r'Microsoft Visual Studio %0.1f\VC' % version
-    guess_vc = os.path.join(pi.program_files_x86, default)
-
-    # Try to get "VC++ for Python" version from registry
-    install_base = reg_value(reg.vc_for_python, 'installdir')
-    default_vc = os.path.join(install_base, 'VC') if install_base else guess_vc
-
-    VcInstallDir = reg_value(reg.vc, '%0.1f' % version) or default_vc
-
-    if not os.path.isdir(VcInstallDir):
-        msg = 'vcvarsall.bat and Visual C++ directory not found'
-        raise distutils.errors.DistutilsPlatformError(msg)
-
     # Find Microsoft Windows SDK directory
     WindowsSdkDir = ''
     if version == 9.0:
@@ -232,7 +236,7 @@ def _query_vcvarsall(version, arch):
                 WindowsSdkDir = d
     if not WindowsSdkDir:
         # If fail, use Platform SDK
-        WindowsSdkDir = os.path.join(VcInstallDir, 'PlatformSDK')
+        WindowsSdkDir = os.path.join(reg.find_visual_c(), 'PlatformSDK')
 
     # Find Microsoft .NET Framework 32bit directory
     guess_fw = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
@@ -262,21 +266,21 @@ def _query_vcvarsall(version, arch):
     ]
 
     # Set Microsoft Visual C++ Includes
-    VCIncludes = [os.path.join(VcInstallDir, 'Include')]
+    VCIncludes = [os.path.join(reg.find_visual_c(), 'Include')]
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
     VCLibraries = [
-        os.path.join(VcInstallDir, 'Lib' + pi.lib_extra),
-        os.path.join(VcInstallDir, r'ATLMFC\LIB' + pi.lib_extra),
+        os.path.join(reg.find_visual_c(), 'Lib' + pi.lib_extra),
+        os.path.join(reg.find_visual_c(), r'ATLMFC\LIB' + pi.lib_extra),
     ]
 
     # Set Microsoft Visual C++ Tools
     VCTools = [
-        os.path.join(VcInstallDir, 'VCPackages'),
-        os.path.join(VcInstallDir, 'Bin' + pi.tools_extra),
+        os.path.join(reg.find_visual_c(), 'VCPackages'),
+        os.path.join(reg.find_visual_c(), 'Bin' + pi.tools_extra),
     ]
     if pi.tools_extra:
-        VCTools.append(os.path.join(VcInstallDir, 'Bin'))
+        VCTools.append(os.path.join(reg.find_visual_c(), 'Bin'))
 
     # Set Microsoft Windows SDK Include
     OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + pi.sdk_extra)]

From 0a3b6506627f7caddc400ce779d9a9dc4b3505e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:22:12 -0500
Subject: [PATCH 5567/8469] Extract find_windows_sdk method in RegistryInfo.

---
 setuptools/msvc9_support.py | 78 +++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 4a1ec54ee7..8fb532e7b1 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -192,6 +192,40 @@ def find_visual_c(self):
 
         return result
 
+    def find_windows_sdk(self):
+        """
+        Find Microsoft Windows SDK directory
+        """
+        WindowsSdkDir = ''
+        if self.version == 9.0:
+            WindowsSdkVer = ('7.0', '6.1', '6.0a')
+        elif self.version == 10.0:
+            WindowsSdkVer = ('7.1', '7.0a')
+        else:
+            WindowsSdkVer = ()
+        for ver in WindowsSdkVer:
+            # Try to get it from registry
+            loc = os.path.join(self.windows_sdk, 'v%s' % ver)
+            WindowsSdkDir = self.lookup(loc, 'installationfolder')
+            if WindowsSdkDir:
+                break
+        if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
+            # Try to get "VC++ for Python" version from registry
+            install_base = self.lookup(self.vc_for_python, 'installdir')
+            if install_base:
+                WindowsSdkDir = os.path.join(install_base, 'WinSDK')
+        if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
+            # If fail, use default path
+            for ver in WindowsSdkVer:
+                path = r'Microsoft SDKs\Windows\v%s' % ver
+                d = os.path.join(self.platform_info.program_files, path)
+                if os.path.isdir(d):
+                    WindowsSdkDir = d
+        if not WindowsSdkDir:
+            # If fail, use Platform SDK
+            WindowsSdkDir = os.path.join(self.find_visual_c(), 'PlatformSDK')
+        return WindowsSdkDir
+
     def lookup(self, base, key):
         try:
             return distutils.msvc9compiler.Reg.get_value(base, key)
@@ -208,36 +242,6 @@ def _query_vcvarsall(version, arch):
     reg = RegistryInfo(pi, version)
     reg_value = reg.lookup
 
-    # Find Microsoft Windows SDK directory
-    WindowsSdkDir = ''
-    if version == 9.0:
-        WindowsSdkVer = ('7.0', '6.1', '6.0a')
-    elif version == 10.0:
-        WindowsSdkVer = ('7.1', '7.0a')
-    else:
-        WindowsSdkVer = ()
-    for ver in WindowsSdkVer:
-        # Try to get it from registry
-        loc = os.path.join(reg.windows_sdk, 'v%s' % ver)
-        WindowsSdkDir = reg_value(loc, 'installationfolder')
-        if WindowsSdkDir:
-            break
-    if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
-        # Try to get "VC++ for Python" version from registry
-        install_base = reg_value(reg.vc_for_python, 'installdir')
-        if install_base:
-            WindowsSdkDir = os.path.join(install_base, 'WinSDK')
-    if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
-        # If fail, use default path
-        for ver in WindowsSdkVer:
-            path = r'Microsoft SDKs\Windows\v%s' % ver
-            d = os.path.join(pi.program_files, path)
-            if os.path.isdir(d):
-                WindowsSdkDir = d
-    if not WindowsSdkDir:
-        # If fail, use Platform SDK
-        WindowsSdkDir = os.path.join(reg.find_visual_c(), 'PlatformSDK')
-
     # Find Microsoft .NET Framework 32bit directory
     guess_fw = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
     FrameworkDir32 = reg_value(reg.vc, 'frameworkdir32') or guess_fw
@@ -283,24 +287,24 @@ def _query_vcvarsall(version, arch):
         VCTools.append(os.path.join(reg.find_visual_c(), 'Bin'))
 
     # Set Microsoft Windows SDK Include
-    OSLibraries = [os.path.join(WindowsSdkDir, 'Lib' + pi.sdk_extra)]
+    OSLibraries = [os.path.join(reg.find_windows_sdk(), 'Lib' + pi.sdk_extra)]
 
     # Set Microsoft Windows SDK Libraries
     OSIncludes = [
-        os.path.join(WindowsSdkDir, 'Include'),
-        os.path.join(WindowsSdkDir, r'Include\gl'),
+        os.path.join(reg.find_windows_sdk(), 'Include'),
+        os.path.join(reg.find_windows_sdk(), r'Include\gl'),
     ]
 
     # Set Microsoft Windows SDK Tools
-    SdkTools = [os.path.join(WindowsSdkDir, 'Bin')]
+    SdkTools = [os.path.join(reg.find_windows_sdk(), 'Bin')]
     if not pi.target_is_x86():
-        SdkTools.append(os.path.join(WindowsSdkDir, 'Bin' + pi.sdk_extra))
+        SdkTools.append(os.path.join(reg.find_windows_sdk(), 'Bin' + pi.sdk_extra))
     if version == 10.0:
         path = r'Bin\NETFX 4.0 Tools' + pi.sdk_extra
-        SdkTools.append(os.path.join(WindowsSdkDir, path))
+        SdkTools.append(os.path.join(reg.find_windows_sdk(), path))
 
     # Set Microsoft Windows SDK Setup
-    SdkSetup = [os.path.join(WindowsSdkDir, 'Setup')]
+    SdkSetup = [os.path.join(reg.find_windows_sdk(), 'Setup')]
 
     # Set Microsoft .NET Framework Tools
     FxTools = [os.path.join(FrameworkDir32, ver) for ver in FrameworkVer]

From 22c3b2f50df1f0cadc39eb359037ca83e2689dcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:27:35 -0500
Subject: [PATCH 5568/8469] Extract find_dot_net_versions method in
 RegistryInfo.

---
 setuptools/msvc9_support.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 8fb532e7b1..ca71addbb5 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -226,6 +226,23 @@ def find_windows_sdk(self):
             WindowsSdkDir = os.path.join(self.find_visual_c(), 'PlatformSDK')
         return WindowsSdkDir
 
+    def find_dot_net_versions(self):
+        """
+        Find Microsoft .NET Framework Versions
+        """
+        if self.version == 10.0:
+            v4 = self.lookup(self.vc, 'frameworkver32') or ''
+            if v4.lower()[:2] != 'v4':
+                v4 = None
+            # default to last v4 version
+            v4 = v4 or 'v4.0.30319'
+            FrameworkVer = (v4, 'v3.5')
+        elif self.version == 9.0:
+            FrameworkVer = ('v3.5', 'v2.0.50727')
+        elif self.version == 8.0:
+            FrameworkVer = ('v3.0', 'v2.0.50727')
+        return FrameworkVer
+
     def lookup(self, base, key):
         try:
             return distutils.msvc9compiler.Reg.get_value(base, key)
@@ -250,19 +267,6 @@ def _query_vcvarsall(version, arch):
     guess_fw64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
     FrameworkDir64 = reg_value(reg.vc, 'frameworkdir64') or guess_fw64
 
-    # Find Microsoft .NET Framework Versions
-    if version == 10.0:
-        v4 = reg_value(reg.vc, 'frameworkver32') or ''
-        if v4.lower()[:2] != 'v4':
-            v4 = None
-        # default to last v4 version
-        v4 = v4 or 'v4.0.30319'
-        FrameworkVer = (v4, 'v3.5')
-    elif version == 9.0:
-        FrameworkVer = ('v3.5', 'v2.0.50727')
-    elif version == 8.0:
-        FrameworkVer = ('v3.0', 'v2.0.50727')
-
     # Set Microsoft Visual Studio Tools
     VSTools = [
         os.path.join(reg.find_visual_studio(), r'Common7\IDE'),
@@ -307,9 +311,9 @@ def _query_vcvarsall(version, arch):
     SdkSetup = [os.path.join(reg.find_windows_sdk(), 'Setup')]
 
     # Set Microsoft .NET Framework Tools
-    FxTools = [os.path.join(FrameworkDir32, ver) for ver in FrameworkVer]
+    FxTools = [os.path.join(FrameworkDir32, ver) for ver in reg.find_dot_net_versions()]
     if not pi.target_is_x86() and not pi.current_is_x86():
-        for ver in FrameworkVer:
+        for ver in reg.find_dot_net_versions():
             FxTools.append(os.path.join(FrameworkDir64, ver))
 
     # Set Microsoft Visual Studio Team System Database

From 904ecaa94be171a5d7750ea81e1327ab91d07057 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:34:51 -0500
Subject: [PATCH 5569/8469] Rewrite for/append loop as simple list
 comprehension on the product of roots and versions.

---
 setuptools/msvc9_support.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index ca71addbb5..b15ebeec0e 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,4 +1,5 @@
 import os
+import itertools
 import distutils.errors
 
 try:
@@ -311,10 +312,14 @@ def _query_vcvarsall(version, arch):
     SdkSetup = [os.path.join(reg.find_windows_sdk(), 'Setup')]
 
     # Set Microsoft .NET Framework Tools
-    FxTools = [os.path.join(FrameworkDir32, ver) for ver in reg.find_dot_net_versions()]
-    if not pi.target_is_x86() and not pi.current_is_x86():
-        for ver in reg.find_dot_net_versions():
-            FxTools.append(os.path.join(FrameworkDir64, ver))
+    roots = [FrameworkDir32]
+    include_64_framework = not pi.target_is_x86() and not pi.current_is_x86()
+    roots += [FrameworkDir64] if include_64_framework else []
+
+    FxTools = [
+        os.path.join(root, ver)
+        for root, ver in itertools.product(roots, reg.find_dot_net_versions())
+    ]
 
     # Set Microsoft Visual Studio Team System Database
     VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]

From 124b0d651e42aa93e4ef1735245cdbd76f3e86fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:36:17 -0500
Subject: [PATCH 5570/8469] Rewrite init/set with singular construction.

---
 setuptools/msvc9_support.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index b15ebeec0e..a82803e548 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -325,11 +325,12 @@ def _query_vcvarsall(version, arch):
     VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]
 
     # Return Environment Variables
-    env = {}
-    env['include'] = [VCIncludes, OSIncludes]
-    env['lib'] = [VCLibraries, OSLibraries, FxTools]
-    env['libpath'] = [VCLibraries, FxTools]
-    env['path'] = [VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools]
+    env = dict(
+        include=[VCIncludes, OSIncludes],
+        lib=[VCLibraries, OSLibraries, FxTools],
+        libpath=[VCLibraries, FxTools],
+        path=[VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools],
+    )
 
     def checkpath(path, varlist):
         # Function that add valid paths in list in not already present

From 5688d67516e28349157fa239dae102470da82ca3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:40:08 -0500
Subject: [PATCH 5571/8469] Replace last usage of reg_value

---
 setuptools/msvc9_support.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index a82803e548..25d8987558 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -258,15 +258,14 @@ def _query_vcvarsall(version, arch):
     """
     pi = PlatformInfo(arch)
     reg = RegistryInfo(pi, version)
-    reg_value = reg.lookup
 
     # Find Microsoft .NET Framework 32bit directory
     guess_fw = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
-    FrameworkDir32 = reg_value(reg.vc, 'frameworkdir32') or guess_fw
+    FrameworkDir32 = reg.lookup(reg.vc, 'frameworkdir32') or guess_fw
 
     # Find Microsoft .NET Framework 64bit directory
     guess_fw64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
-    FrameworkDir64 = reg_value(reg.vc, 'frameworkdir64') or guess_fw64
+    FrameworkDir64 = reg.lookup(reg.vc, 'frameworkdir64') or guess_fw64
 
     # Set Microsoft Visual Studio Tools
     VSTools = [

From 37bea1dab1aff98021a4d7bab986cafac1d2a537 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 19:42:50 -0500
Subject: [PATCH 5572/8469] Correct find/replace error

---
 setuptools/msvc9_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 25d8987558..855cdc8790 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -352,7 +352,7 @@ def checkpath(path, varlist):
 
         # Format paths to Environment Variable string
         if var:
-            env[key] = ';'.os.path.join(var)
+            env[key] = ';'.join(var)
         else:
             msg = "%s environment variable is empty" % key.upper()
             raise distutils.errors.DistutilsPlatformError(msg)

From 57f3b022aa3054e7ea281091d782292d5895086c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 20:50:51 -0500
Subject: [PATCH 5573/8469] Rewrite env builder routine to a simple function,
 _build_paths, using iterables and common recipes.

---
 setuptools/msvc9_support.py | 77 ++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 855cdc8790..85a8cf4497 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -7,6 +7,9 @@
 except ImportError:
     pass
 
+import six
+
+
 unpatched = dict()
 
 def patch_for_specialized_compiler():
@@ -323,37 +326,49 @@ def _query_vcvarsall(version, arch):
     # Set Microsoft Visual Studio Team System Database
     VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]
 
-    # Return Environment Variables
-    env = dict(
-        include=[VCIncludes, OSIncludes],
-        lib=[VCLibraries, OSLibraries, FxTools],
-        libpath=[VCLibraries, FxTools],
-        path=[VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools],
+    return dict(
+        include=_build_paths('include', [VCIncludes, OSIncludes]),
+        lib=_build_paths('lib', [VCLibraries, OSLibraries, FxTools]),
+        libpath=_build_paths('libpath', [VCLibraries, FxTools]),
+        path=_build_paths('path', [VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools]),
     )
 
-    def checkpath(path, varlist):
-        # Function that add valid paths in list in not already present
-        if os.path.isdir(path) and path not in varlist:
-            varlist.append(path)
-
-    for key in env.keys():
-        var = []
-        # Add valid paths
-        for val in env[key]:
-            for subval in val:
-                checkpath(subval, var)
 
-        # Add values from actual environment
-        try:
-            for val in os.environ[key].split(';'):
-                checkpath(val, var)
-        except KeyError:
-            pass
-
-        # Format paths to Environment Variable string
-        if var:
-            env[key] = ';'.join(var)
-        else:
-            msg = "%s environment variable is empty" % key.upper()
-            raise distutils.errors.DistutilsPlatformError(msg)
-    return env
+def _build_paths(name, spec_path_lists):
+    """
+    Given an environment variable name and specified paths,
+    return a pathsep-separated string of paths containing
+    unique, extant, directories from those paths and from
+    the environment variable. Raise an error if no paths
+    are resolved.
+    """
+    # flatten spec_path_lists
+    spec_paths = itertools.chain.from_iterable(spec_path_lists)
+    env_paths = os.environ.get(name, '').split(os.pathsep)
+    paths = itertools.chain(spec_paths, env_paths)
+    extant_paths = list(filter(os.path.isdir, paths))
+    if not extant_paths:
+        msg = "%s environment variable is empty" % name.upper()
+        raise distutils.errors.DistutilsPlatformError(msg)
+    unique_paths = unique_everseen(extant_paths)
+    return os.pathsep.join(unique_paths)
+
+
+# from Python docs
+def unique_everseen(iterable, key=None):
+    "List unique elements, preserving order. Remember all elements ever seen."
+    # unique_everseen('AAAABBBCCDAABBB') --> A B C D
+    # unique_everseen('ABBCcAD', str.lower) --> A B C D
+    seen = set()
+    seen_add = seen.add
+    filterfalse = six.moves.filterfalse
+    if key is None:
+        for element in filterfalse(seen.__contains__, iterable):
+            seen_add(element)
+            yield element
+    else:
+        for element in iterable:
+            k = key(element)
+            if k not in seen:
+                seen_add(k)
+                yield element

From 80ee0f54d4408fac616ae12b7dd60b6c514f98d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 21:10:07 -0500
Subject: [PATCH 5574/8469] Avoid setting a variable when the value is never
 used.

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

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 85a8cf4497..e1e0841457 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -59,12 +59,12 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
         return unpatched['query_vcvarsall'](version, arch, *args, **kwargs)
-    except distutils.errors.DistutilsPlatformError as exc:
+    except distutils.errors.DistutilsPlatformError:
         # Error if Vcvarsall.bat is missing
-        message = exc.args[0]
-    except ValueError as exc:
+        pass
+    except ValueError:
         # Error if environment not set after executing vcvarsall.bat
-        message = exc.args[0]
+        pass
 
     # If vcvarsall.bat fail, try to set environment directly
     try:

From b85f1ed5eaa2eca271b28a0aaddfebadfb8dedde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 21:11:35 -0500
Subject: [PATCH 5575/8469] Rename function again for clarity.

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

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index e1e0841457..c0587f3132 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -68,7 +68,7 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
 
     # If vcvarsall.bat fail, try to set environment directly
     try:
-        return _query_vcvarsall(version, arch)
+        return _compute_env(version, arch)
     except distutils.errors.DistutilsPlatformError as exc:
         # Error if MSVC++ directory not found or environment not set
         message = exc.args[0]
@@ -254,7 +254,7 @@ def lookup(self, base, key):
             pass
 
 
-def _query_vcvarsall(version, arch):
+def _compute_env(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.

From dd70b3b6f6c00d753d7ff80ed8cf74448606e266 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 21:19:37 -0500
Subject: [PATCH 5576/8469] Extract function for _augment_exception.

---
 setuptools/msvc9_support.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index c0587f3132..e80fb859c7 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -54,8 +54,6 @@ def find_vcvarsall(version):
     return unpatched['find_vcvarsall'](version)
 
 def query_vcvarsall(version, arch='x86', *args, **kwargs):
-    message = ''
-
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
         return unpatched['query_vcvarsall'](version, arch, *args, **kwargs)
@@ -70,10 +68,18 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
     try:
         return _compute_env(version, arch)
     except distutils.errors.DistutilsPlatformError as exc:
-        # Error if MSVC++ directory not found or environment not set
-        message = exc.args[0]
+        _augment_exception(exc, version)
+        raise
+
+
+def _augment_exception(exc, version):
+    """
+    Add details to the exception message to help guide the user
+    as to what action will resolve it.
+    """
+    # Error if MSVC++ directory not found or environment not set
+    message = exc.args[0]
 
-    # Raise error
     if message and "vcvarsall.bat" in message:
         # Special error message if MSVC++ not installed
         message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
@@ -88,7 +94,7 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
             message += ' Get it with "Microsoft Windows SDK for Windows 7": '
             message += r'www.microsoft.com/download/details.aspx?id=8279'
 
-    raise distutils.errors.DistutilsPlatformError(message)
+    exc.args[0] = message
 
 
 class PlatformInfo:

From a75fd253b2d77fb4896146c6dbf6d4aca0a756d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Feb 2016 21:20:29 -0500
Subject: [PATCH 5577/8469] I don't imagine message will ever resolve to False

---
 setuptools/msvc9_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index e80fb859c7..714035d382 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -80,7 +80,7 @@ def _augment_exception(exc, version):
     # Error if MSVC++ directory not found or environment not set
     message = exc.args[0]
 
-    if message and "vcvarsall.bat" in message:
+    if "vcvarsall.bat" in message:
         # Special error message if MSVC++ not installed
         message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
             (version, message)

From ef3d89d581b83fa214d5563d4e3a9e7c901746ab Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Thu, 25 Feb 2016 00:56:38 +1100
Subject: [PATCH 5578/8469] Issue #25136: Support Apple Xcode 7's new textual
 SDK stub libraries.

As of Xcode 7, SDKs for Apple platforms now include textual-format stub
libraries whose file names have a .tbd extension rather than the
standard OS X .dylib extension.  The Apple compiler tool chain handles
these stub libraries transparently and the installed system shared libraries
are still .dylibs.  However, the new stub libraries cause problems for
third-party programs that support building with Apple SDKs and make
build-time decisions based on the presence or paths of system-supplied
shared libraries in the SDK.  In particular, building Python itself with
an SDK fails to find system-supplied libraries during setup.py's build of
standard library extension modules.  The solution is to have
find_library_file() in Distutils search for .tbd files, along with
the existing types (.a, .so, and .dylib).  Patch by Tim Smith.
---
 ccompiler.py     |  4 ++--
 unixccompiler.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ccompiler.py b/ccompiler.py
index 82fd7d5c4d..b71d1d39bc 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -875,9 +875,9 @@ def executable_filename(self, basename, strip_dir=0, output_dir=''):
     def library_filename(self, libname, lib_type='static',     # or 'shared'
                          strip_dir=0, output_dir=''):
         assert output_dir is not None
-        if lib_type not in ("static", "shared", "dylib"):
+        if lib_type not in ("static", "shared", "dylib", "xcode_stub"):
             raise ValueError(
-                  "'lib_type' must be \"static\", \"shared\" or \"dylib\"")
+                  "'lib_type' must be \"static\", \"shared\", \"dylib\", or \"xcode_stub\"")
         fmt = getattr(self, lib_type + "_lib_format")
         ext = getattr(self, lib_type + "_lib_extension")
 
diff --git a/unixccompiler.py b/unixccompiler.py
index 094a2f0bd0..92d14dfee7 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -76,7 +76,9 @@ class UnixCCompiler(CCompiler):
     static_lib_extension = ".a"
     shared_lib_extension = ".so"
     dylib_lib_extension = ".dylib"
+    xcode_stub_lib_extension = ".tbd"
     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+    xcode_stub_lib_format = dylib_lib_format
     if sys.platform == "cygwin":
         exe_extension = ".exe"
 
@@ -255,12 +257,28 @@ def library_option(self, lib):
     def find_library_file(self, dirs, lib, debug=0):
         shared_f = self.library_filename(lib, lib_type='shared')
         dylib_f = self.library_filename(lib, lib_type='dylib')
+        xcode_stub_f = self.library_filename(lib, lib_type='xcode_stub')
         static_f = self.library_filename(lib, lib_type='static')
 
         if sys.platform == 'darwin':
             # On OSX users can specify an alternate SDK using
             # '-isysroot', calculate the SDK root if it is specified
             # (and use it further on)
+            #
+            # Note that, as of Xcode 7, Apple SDKs may contain textual stub
+            # libraries with .tbd extensions rather than the normal .dylib
+            # shared libraries installed in /.  The Apple compiler tool
+            # chain handles this transparently but it can cause problems
+            # for programs that are being built with an SDK and searching
+            # for specific libraries.  Callers of find_library_file need to
+            # keep in mind that the base filename of the returned SDK library
+            # file might have a different extension from that of the library
+            # file installed on the running system, for example:
+            #   /Applications/Xcode.app/Contents/Developer/Platforms/
+            #       MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/
+            #       usr/lib/libedit.tbd
+            # vs
+            #   /usr/lib/libedit.dylib
             cflags = sysconfig.get_config_var('CFLAGS')
             m = re.search(r'-isysroot\s+(\S+)', cflags)
             if m is None:
@@ -274,6 +292,7 @@ def find_library_file(self, dirs, lib, debug=0):
             shared = os.path.join(dir, shared_f)
             dylib = os.path.join(dir, dylib_f)
             static = os.path.join(dir, static_f)
+            xcode_stub = os.path.join(dir, xcode_stub_f)
 
             if sys.platform == 'darwin' and (
                 dir.startswith('/System/') or (
@@ -282,6 +301,7 @@ def find_library_file(self, dirs, lib, debug=0):
                 shared = os.path.join(sysroot, dir[1:], shared_f)
                 dylib = os.path.join(sysroot, dir[1:], dylib_f)
                 static = os.path.join(sysroot, dir[1:], static_f)
+                xcode_stub = os.path.join(sysroot, dir[1:], xcode_stub_f)
 
             # We're second-guessing the linker here, with not much hard
             # data to go on: GCC seems to prefer the shared library, so I'm
@@ -289,6 +309,8 @@ def find_library_file(self, dirs, lib, debug=0):
             # ignoring even GCC's "-static" option.  So sue me.
             if os.path.exists(dylib):
                 return dylib
+            elif os.path.exists(xcode_stub):
+                return xcode_stub
             elif os.path.exists(shared):
                 return shared
             elif os.path.exists(static):

From 28a36c91cddf2e318f189ef67aa390f1cc616df3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Feb 2016 21:52:35 -0500
Subject: [PATCH 5579/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 63ae24fd88..ad0e40c65d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+20.2.1
+------
+
+* Issue #499: Restore compatiblity for legacy versions
+  by bumping to packaging 16.4.
+
 20.2
 ----
 

From 7160fc64313e738cbd225232ccf9b3fbac1fba19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Feb 2016 22:00:55 -0500
Subject: [PATCH 5580/8469] Bumped to 20.2.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 7e20c8bf5a..acad2a445c 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.3'
+__version__ = '20.2.1'

From ac2ae5892db8d278331c6a4bcaa12b54eeed1157 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Feb 2016 22:01:00 -0500
Subject: [PATCH 5581/8469] Added tag 20.2.1 for changeset 1aacb05fbdfe

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f2b0e2b7b5..dd40a1e24f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -247,3 +247,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1
 919a40f1843131249f98104c73f3aee3fc835e67 20.1.1
 74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2
+1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1

From 97178b56f1bf760b1a300668282debc8f39ea6e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Feb 2016 22:04:29 -0500
Subject: [PATCH 5582/8469] Bumped to 20.2.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index acad2a445c..60fb638c23 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.2.1'
+__version__ = '20.2.2'

From 52cd445ed59b3ca3a31cb2426cbf90db04fbf41d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Feb 2016 08:48:22 -0500
Subject: [PATCH 5583/8469] Add test capturing expectation that spaces between
 version specifiers should be allowed. Ref #502.

---
 pkg_resources/tests/test_resources.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index a8bf35fc9c..7a4ecb38cc 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -511,6 +511,10 @@ def testSimpleRequirements(self):
     def test_local_version(self):
         req, = parse_requirements('foo==1.0.org1')
 
+    def test_spaces_between_multiple_versions(self):
+        req, = parse_requirements('foo>=1.0, <3')
+        req, = parse_requirements('foo >= 1.0, < 3')
+
     def testVersionEquality(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)

From 1edd380c867c08eedf5e396654b4ec3bed23e25d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:11:47 -0500
Subject: [PATCH 5584/8469] Replace makefile with pavement file, granting
 portability on OS X and Windows. Fixes #505.

---
 Makefile    | 11 -----------
 pavement.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 pavement.py

diff --git a/Makefile b/Makefile
deleted file mode 100644
index e0aa419526..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-empty:
-	exit 1
-
-update-vendored:
-	rm -rf pkg_resources/_vendor/packaging*
-	rm -rf pkg_resources/_vendor/six*
-	rm -rf pkg_resources/_vendor/pyparsing*
-	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
-	sed -i 's/ \(pyparsing\|six\)/ pkg_resources.extern.\1/' \
-		pkg_resources/_vendor/packaging/*.py
-	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
diff --git a/pavement.py b/pavement.py
new file mode 100644
index 0000000000..8d7574e296
--- /dev/null
+++ b/pavement.py
@@ -0,0 +1,28 @@
+import re
+
+from paver.easy import task, path as Path
+import pip
+
+def remove_all(paths):
+	for path in paths:
+		path.rmtree() if path.isdir() else path.remove()
+
+@task
+def update_vendored():
+	vendor = Path('pkg_resources/_vendor')
+	remove_all(vendor.glob('packaging*'))
+	remove_all(vendor.glob('six*'))
+	remove_all(vendor.glob('pyparsing*'))
+	install_args = [
+		'install',
+		'-r', str(vendor/'vendored.txt'),
+		'-t', str(vendor),
+	]
+	pip.main(install_args)
+	packaging = vendor / 'packaging'
+	for file in packaging.glob('*.py'):
+		text = file.text()
+		text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
+		file.write_text(text)
+	remove_all(vendor.glob('*.dist-info'))
+	remove_all(vendor.glob('*.egg-info'))

From 721536a8c21a0f6a0dcd0ca92b5e5a613fb42c5e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:19:56 -0500
Subject: [PATCH 5585/8469] Re-run vendoring on packaging 16.4 (adding utils.py
 module, apparently omitted).

---
 pkg_resources/_vendor/packaging/utils.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pkg_resources/_vendor/packaging/utils.py

diff --git a/pkg_resources/_vendor/packaging/utils.py b/pkg_resources/_vendor/packaging/utils.py
new file mode 100644
index 0000000000..942387cef5
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/utils.py
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+    # This is taken from PEP 503.
+    return _canonicalize_regex.sub("-", name).lower()

From 26f98e0a8cd1671520e3e8c64a4aa6400873ce9b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:20:52 -0500
Subject: [PATCH 5586/8469] Bump vendored packaging to 16.5. Fixes #502.

---
 pkg_resources/_vendor/packaging/__about__.py    |  2 +-
 pkg_resources/_vendor/packaging/requirements.py |  2 +-
 pkg_resources/_vendor/packaging/specifiers.py   | 10 +++++-----
 pkg_resources/_vendor/vendored.txt              |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index e4c32ea179..47e5a6f58c 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,7 +12,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.4"
+__version__ = "16.5"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 361f157bbb..0c8c4a3852 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -49,7 +49,7 @@ class InvalidRequirement(ValueError):
 
 VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
 VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
-                       joinString=",")("_raw_spec")
+                       joinString=",", adjacent=False)("_raw_spec")
 _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
 _VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
 
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 5ee8f02339..7f5a76cfd6 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -218,11 +218,11 @@ class LegacySpecifier(_IndividualSpecifier):
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
-            [^;\s)]* # We just match everything, except for whitespace,
-                     # a semi-colon for marker support, and closing paren
-                     # since versions can be enclosed in them. Since this is
-                     # a "legacy" specifier and the version string can be
-                     # just about anything.
+            [^,;\s)]* # Since this is a "legacy" specifier, and the version
+                      # string can be just about anything, we match everything
+                      # except for whitespace, a semi-colon for marker support,
+                      # a closing paren since versions can be enclosed in
+                      # them, and a comma since it's a version separator.
         )
         """
     )
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 002ef95556..aac1267c62 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
-packaging==16.4
+packaging==16.5
 pyparsing==2.0.6
 six==1.10.0

From 3855edb641a6895af3f8e3ce89e3fef012a883b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:24:21 -0500
Subject: [PATCH 5587/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ad0e40c65d..b7325031ee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+20.2.2
+------
+
+* Issue #502: Correct regression in parsing of multiple
+  version specifiers separated by commas and spaces.
+
 20.2.1
 ------
 

From 5f38188ed53f37a5a683cace20e73d6c8652518a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:28:19 -0500
Subject: [PATCH 5588/8469] Ignore pavement.py

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index ab4a6df381..2fa3a3ecc4 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern

From 52a14114ea81a2feeb6edcdc0754bfb8376c15ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:48:21 -0500
Subject: [PATCH 5589/8469] Added tag 20.2.2 for changeset 48aa5271ef1c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dd40a1e24f..0ab43c5805 100644
--- a/.hgtags
+++ b/.hgtags
@@ -248,3 +248,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 919a40f1843131249f98104c73f3aee3fc835e67 20.1.1
 74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2
 1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1
+48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2

From a46fd8327e5c13b45fcc92322b4fe00a76f307da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2016 09:50:45 -0500
Subject: [PATCH 5590/8469] Bumped to 20.2.3 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 60fb638c23..10f3ca212a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.2.2'
+__version__ = '20.2.3'

From 0ed33b7a4db605e4608f56d6bdb5efe81762b4cb Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 1 Mar 2016 16:07:42 +1100
Subject: [PATCH 5591/8469] Shift requirement parsing inside Requirement

---
 pkg_resources/__init__.py             | 42 ++++++++++++---------------
 pkg_resources/tests/test_resources.py | 25 ++++++++--------
 setuptools/command/easy_install.py    |  5 +---
 setuptools/tests/test_dist_info.py    |  4 ++-
 4 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 5b68da154b..2fb7bc5101 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2693,15 +2693,11 @@ def _compute_dependencies(self):
         reqs = []
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
-            current_req = packaging.requirements.Requirement(req)
-            specs = _parse_requirement_specs(current_req)
-            parsed = Requirement(current_req.name, specs, current_req.extras)
-            parsed._marker = current_req.marker
-            reqs.append(parsed)
+            reqs.extend(parse_requirements(req))
 
         def reqs_for_extra(extra):
             for req in reqs:
-                if not req._marker or req._marker.evaluate({'extra': extra}):
+                if not req.marker or req.marker.evaluate({'extra': extra}):
                     yield req
 
         common = frozenset(reqs_for_extra(None))
@@ -2739,10 +2735,6 @@ def __str__(self):
         return ' '.join(self.args)
 
 
-def _parse_requirement_specs(req):
-    return [(spec.operator, spec.version) for spec in req.specifier]
-
-
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
@@ -2759,33 +2751,35 @@ def parse_requirements(strs):
         if line.endswith('\\'):
             line = line[:-2].strip()
             line += next(lines)
-        req = packaging.requirements.Requirement(line)
-        specs = _parse_requirement_specs(req)
-        yield Requirement(req.name, specs, req.extras)
+        yield Requirement(line)
 
 
 class Requirement:
-    def __init__(self, project_name, specs, extras):
+    def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
-        self.unsafe_name, project_name = project_name, safe_name(project_name)
+        try:
+            self.req = packaging.requirements.Requirement(requirement_string)
+        except packaging.requirements.InvalidRequirement as e:
+            raise RequirementParseError(str(e))
+        self.unsafe_name = self.req.name
+        project_name = safe_name(self.req.name)
         self.project_name, self.key = project_name, project_name.lower()
-        self.specifier = packaging.specifiers.SpecifierSet(
-            ",".join(["".join([x, y]) for x, y in specs])
-        )
-        self.specs = specs
-        self.extras = tuple(map(safe_extra, extras))
+        self.specifier = self.req.specifier
+        self.specs = [
+            (spec.operator, spec.version) for spec in self.req.specifier]
+        self.extras = tuple(map(safe_extra, self.req.extras))
+        self.marker = self.req.marker
+        self.url = self.req.url
         self.hashCmp = (
             self.key,
             self.specifier,
             frozenset(self.extras),
+            str(self.marker)
         )
         self.__hash = hash(self.hashCmp)
 
     def __str__(self):
-        extras = ','.join(self.extras)
-        if extras:
-            extras = '[%s]' % extras
-        return '%s%s%s' % (self.project_name, extras, self.specifier)
+        return str(self.req)
 
     def __eq__(self, other):
         return (
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7a4ecb38cc..16fc319808 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -353,22 +353,22 @@ def testBasics(self):
         r = Requirement.parse("Twisted>=1.2")
         assert str(r) == "Twisted>=1.2"
         assert repr(r) == "Requirement.parse('Twisted>=1.2')"
-        assert r == Requirement("Twisted", [('>=','1.2')], ())
-        assert r == Requirement("twisTed", [('>=','1.2')], ())
-        assert r != Requirement("Twisted", [('>=','2.0')], ())
-        assert r != Requirement("Zope", [('>=','1.2')], ())
-        assert r != Requirement("Zope", [('>=','3.0')], ())
-        assert r != Requirement.parse("Twisted[extras]>=1.2")
+        assert r == Requirement("Twisted>=1.2")
+        assert r == Requirement("twisTed>=1.2")
+        assert r != Requirement("Twisted>=2.0")
+        assert r != Requirement("Zope>=1.2")
+        assert r != Requirement("Zope>=3.0")
+        assert r != Requirement("Twisted[extras]>=1.2")
 
     def testOrdering(self):
-        r1 = Requirement("Twisted", [('==','1.2c1'),('>=','1.2')], ())
-        r2 = Requirement("Twisted", [('>=','1.2'),('==','1.2c1')], ())
+        r1 = Requirement("Twisted==1.2c1,>=1.2")
+        r2 = Requirement("Twisted>=1.2,==1.2c1")
         assert r1 == r2
         assert str(r1) == str(r2)
         assert str(r2) == "Twisted==1.2c1,>=1.2"
 
     def testBasicContains(self):
-        r = Requirement("Twisted", [('>=','1.2')], ())
+        r = Requirement("Twisted>=1.2")
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11 = Distribution.from_filename("Twisted-1.1.egg")
         twist12 = Distribution.from_filename("Twisted-1.2.egg")
@@ -394,6 +394,7 @@ def testOptionsAndHashing(self):
                 "twisted",
                 packaging.specifiers.SpecifierSet(">=1.2"),
                 frozenset(["foo","bar"]),
+                'None'
             ))
         )
 
@@ -485,17 +486,17 @@ def testSimpleRequirements(self):
         assert (
             list(parse_requirements('Twis-Ted>=1.2-1'))
             ==
-            [Requirement('Twis-Ted',[('>=','1.2-1')], ())]
+            [Requirement('Twis-Ted>=1.2-1')]
         )
         assert (
             list(parse_requirements('Twisted >=1.2, \ # more\n<2.0'))
             ==
-            [Requirement('Twisted',[('>=','1.2'),('<','2.0')], ())]
+            [Requirement('Twisted>=1.2,<2.0')]
         )
         assert (
             Requirement.parse("FooBar==1.99a3")
             ==
-            Requirement("FooBar", [('==','1.99a3')], ())
+            Requirement("FooBar==1.99a3")
         )
         with pytest.raises(ValueError):
             Requirement.parse(">=2.3")
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 08bc9c510b..97de339544 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -710,10 +710,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         elif requirement is None or dist not in requirement:
             # if we wound up with a different version, resolve what we've got
             distreq = dist.as_requirement()
-            requirement = requirement or distreq
-            requirement = Requirement(
-                distreq.project_name, distreq.specs, requirement.extras
-            )
+            requirement = Requirement(str(distreq.req))
         log.info("Processing dependencies for %s", requirement)
         try:
             distros = WorkingSet([]).resolve(
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 002968a344..9f226a55fc 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -34,7 +34,9 @@ def test_conditional_dependencies(self):
 
         for d in pkg_resources.find_distributions(self.tmpdir):
             assert d.requires() == requires[:1]
-            assert d.requires(extras=('baz',)) == requires
+            assert d.requires(extras=('baz',)) == [
+                requires[0],
+                pkg_resources.Requirement.parse('quux>=1.1;extra=="baz"')]
             assert d.extras == ['baz']
 
     metadata_template = DALS("""

From 75282e5568039e3dae52ee41ada35baf56f0567c Mon Sep 17 00:00:00 2001
From: JGoutin <ginnungagap@free.fr>
Date: Wed, 2 Mar 2016 18:51:40 +0000
Subject: [PATCH 5592/8469] First, thanks for the review. This is very
 instructive for me and the code is clearer now.

I tested your reviewed version, and it work (Tested only on Windows x86, Python 3.4, Windows SDK 7.1 actually).

I did the following changes :

* Add many docstrings, and improve existing ones.
* Change some comments that was unclear.
* Move .NET Framework directory/version finders in "RegistryInfo", like others.
* Started to add support for the MSVC++14.0 standalone compiler. (Note that this is Work in progress). This also help me to find what fail in actual structure.
* Add "msvc9_" prefix to actual patch functions and unpatched dict for better readability.
* Add VCforPython27 alternative in _augment_exception for IA64 (Arch not supported by VCforPython27)
* Replace "lib_extra" and "sdk_extra" by more generic "ccpu_dir" and "tcpu_dir" functions (For better compatibility with MSVC++14)
* Changes some parts (like VSTools) for reduce line length, avoid repetitions and improve PEP8.
* Make "unique_everseen" and "lookup" private.


But, it is not finished, I need at least to do:

- Finish MSVC++14 support.
- Remove patch for "find_vcvarsall" for MSVC++9 ? (Now "query_vcvarsall" patch also support VC++ for Python 2.7)
- Make more tests with more compilers/platforms/Python combination.
- Check compatibility with MSVC++11 and 12.
- Rename the file in "msvc_support.py" ? (not MSVC9 only)
- Rename "RegistryInfo" ?
- Make compute_env a class ? for split subparts like you did it for "RegistryInfo" and "PlatformInfo"
---
 setuptools/msvc9_support.py | 421 ++++++++++++++++++++++++++++--------
 1 file changed, 334 insertions(+), 87 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 714035d382..a956a5b0d0 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,22 +1,45 @@
+"""
+This module improve support for Microsoft Visual C++ compilers. (Windows Only)
+"""
 import os
 import itertools
 import distutils.errors
 
 try:
-    import distutils.msvc9compiler
+    # Distutil file for MSVC++ 9.0 and upper
+    import distutils.msvc9compiler as msvc9compiler
+except ImportError:
+    pass
+
+try:
+    # Distutil file for MSVC++ 14.0 and upper
+    import distutils._msvccompiler as msvc14compiler
 except ImportError:
     pass
 
-import six
 
+import six
 
 unpatched = dict()
 
+
 def patch_for_specialized_compiler():
     """
-    Patch functions in distutils.msvc9compiler to use the standalone compiler
-    build for Python (Windows only). Fall back to original behavior when the
-    standalone compiler is not available.
+    Patch functions in distutils to use standalone Microsoft Visual C++
+    compilers.
+
+    Known supported compilers:
+    --------------------------
+        Microsoft Visual C++ 9.0:
+            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
+            Microsoft Windows SDK 7.0 (x86, x64, ia64);
+            Microsoft Windows SDK 6.1 (x86, x64, ia64)
+
+        Microsoft Visual C++ 10.0:
+            Microsoft Windows SDK 7.1 (x86, x64, ia64)
+
+        Microsoft Visual C++ 14.0:
+            Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
     if 'distutils' not in globals():
         # The module isn't available to be patched
@@ -26,13 +49,44 @@ def patch_for_specialized_compiler():
         # Already patched
         return
 
-    unpatched.update(vars(distutils.msvc9compiler))
+    try:
+        # Patch distutils.msvc9compiler
+        unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall
+        msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
+        unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
+        msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
+    except:
+        pass
+
+    try:
+        # Patch distutils._msvccompiler._get_vc_env
+        unpatched['msv14_get_vc_env'] = msvc14compiler._get_vc_env
+        msvc14compiler._get_vc_env = msvc14_get_vc_env
+    except:
+        pass
 
-    distutils.msvc9compiler.find_vcvarsall = find_vcvarsall
-    distutils.msvc9compiler.query_vcvarsall = query_vcvarsall
 
-def find_vcvarsall(version):
-    Reg = distutils.msvc9compiler.Reg
+def msvc9_find_vcvarsall(version):
+    """
+    Patched "distutils.msvc9compiler.find_vcvarsall" to use the standalone
+    compiler build for Python (VCForPython). Fall back to original behavior
+    when the standalone compiler is not available.
+
+    Known supported compilers
+    -------------------------
+        Microsoft Visual C++ 9.0:
+            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
+
+    Parameters
+    ----------
+    version: float
+        Required Microsoft Visual C++ version.
+
+    Return
+    ------
+    vcvarsall.bat path: str
+    """
+    Reg = msvc9compiler.Reg
     VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
     key = VC_BASE % ('', version)
     try:
@@ -51,12 +105,38 @@ def find_vcvarsall(version):
         if os.path.isfile(vcvarsall):
             return vcvarsall
 
-    return unpatched['find_vcvarsall'](version)
+    return unpatched['msvc9_find_vcvarsall'](version)
 
-def query_vcvarsall(version, arch='x86', *args, **kwargs):
+
+def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
+    """
+    Patched "distutils.msvc9compiler.query_vcvarsall" for support standalones
+    compilers.
+
+    Known supported compilers
+    -------------------------
+        Microsoft Visual C++ 9.0:
+            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
+            Microsoft Windows SDK 7.0 (x86, x64, ia64);
+            Microsoft Windows SDK 6.1 (x86, x64, ia64)
+
+        Microsoft Visual C++ 10.0:
+            Microsoft Windows SDK 7.1 (x86, x64, ia64)
+
+    Parameters
+    ----------
+    ver: float
+        Required Microsoft Visual C++ version.
+    arch: str
+        Target architecture.
+
+    Return
+    ------
+    environment: dict
+    """
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
-        return unpatched['query_vcvarsall'](version, arch, *args, **kwargs)
+        return unpatched['msvc9_query_vcvarsall'](ver, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError:
         # Error if Vcvarsall.bat is missing
         pass
@@ -66,13 +146,46 @@ def query_vcvarsall(version, arch='x86', *args, **kwargs):
 
     # If vcvarsall.bat fail, try to set environment directly
     try:
-        return _compute_env(version, arch)
+        return _compute_env(ver, arch)
     except distutils.errors.DistutilsPlatformError as exc:
-        _augment_exception(exc, version)
+        _augment_exception(exc, ver, arch)
         raise
 
 
-def _augment_exception(exc, version):
+def msvc14_get_vc_env(plat_spec):
+    """
+    Patched "distutils._msvccompiler._get_vc_env" for support standalones
+    compilers.
+
+    Known supported compilers
+    -------------------------
+        Microsoft Visual C++ 14.0:
+            Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+
+    Parameters
+    ----------
+    plat_spec: str
+        Target architecture.
+
+    Return
+    ------
+    environment: dict
+    """
+    try:
+        return unpatched['msv14_get_vc_env'](plat_spec)
+    except distutils.errors.DistutilsPlatformError:
+        # Error if Vcvarsall.bat is missing
+        pass
+
+    # If vcvarsall.bat fail, try to set environment directly
+    try:
+        return _compute_env(version, plat_spec)
+    except distutils.errors.DistutilsPlatformError as exc:
+        _augment_exception(exc, version, plat_spec)
+        raise
+
+
+def _augment_exception(exc, version, arch):
     """
     Add details to the exception message to help guide the user
     as to what action will resolve it.
@@ -85,26 +198,40 @@ def _augment_exception(exc, version):
         message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
             (version, message)
         if int(version) == 9:
-            # For VC++ 9.0 Redirect user to Vc++ for Python 2.7 :
-            # This redirection link is maintained by Microsoft.
-            # Contact vspython@microsoft.com if it needs updating.
-            message += r' Get it from http://aka.ms/vcpython27'
+            if arch.lower().find('ia64') > -1:
+                # For VC++ 9.0, if IA64 support is needed, redirect user
+                # to Windows SDK 7.0
+                message += ' Get it with "Microsoft Windows SDK 7.0": '
+                message += r'www.microsoft.com/download/details.aspx?id=3138'
+            else:
+                # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
+                # This redirection link is maintained by Microsoft.
+                # Contact vspython@microsoft.com if it needs updating.
+                message += r' Get it from http://aka.ms/vcpython27'
         elif int(version) == 10:
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
-            message += ' Get it with "Microsoft Windows SDK for Windows 7": '
+            message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += r'www.microsoft.com/download/details.aspx?id=8279'
 
     exc.args[0] = message
 
 
 class PlatformInfo:
+    """
+    Find architecture informations and system paths.
+
+    Parameters
+    ----------
+    arch: str
+        Target architecture.
+    """
     current_cpu = os.environ['processor_architecture'].lower()
     win_dir = os.environ['WinDir']
     program_files = os.environ['ProgramFiles']
     program_files_x86 = os.environ.get('ProgramFiles(x86)', program_files)
 
     def __init__(self, arch):
-        self.arch = arch
+        self.arch = arch.lower()
 
     @property
     def target_cpu(self):
@@ -116,85 +243,157 @@ def target_is_x86(self):
     def current_is_x86(self):
         return self.current_cpu != 'x86'
 
-    @property
-    def lib_extra(self):
+    def ccpu_dir(self, hidex86=False, x64=False):
+        """
+        Current platform specific subfolder.
+
+        Parameters
+        ----------
+        hidex86: bool
+            return '' and not '\x86' if architecture is x86.
+        x64: bool
+            return '\x64' and not '\amd64' if architecture is amd64.
+
+        Return
+        ------
+        subfolder: str (starting with'\')
+        """
         return (
-            r'\amd64' if self.target_cpu == 'amd64' else
-            r'\ia64' if self.target_cpu == 'ia64' else
-            ''
+            '' if (self.current_cpu == 'x86' and hidex86) else
+            r'\x64' if (self.current_cpu == 'amd64' and x64) else
+            r'\%s' % self.current_cpu
         )
 
-    @property
-    def sdk_extra(self):
+    def tcpu_dir(self, hidex86=False, x64=False):
+        """
+        Target platform specific subfolder.
+
+        Parameters
+        ----------
+        hidex86: bool
+            return '' and not '\x86' if architecture is x86.
+        x64: bool
+            return '\x64' and not '\amd64' if architecture is amd64.
+
+        Return
+        ------
+        subfolder: str (starting with'\')
+        """
         return (
-            r'\x64' if self.target_cpu == 'amd64' else
-            r'\ia64' if self.target_cpu == 'ia64' else
-            ''
+            '' if (self.target_cpu == 'x86' and hidex86) else
+            r'\x64' if (self.target_cpu == 'amd64' and x64) else
+            r'\%s' % self.target_cpu
         )
 
-    @property
-    def tools_extra(self):
-        path = self.lib_extra
+    def tools_extra(self, forcex86=False):
+        """
+        Platform specific subfolder for Visual C++ Tools.
+
+        Parameters
+        ----------
+        forcex86: bool
+            If cross compilation, return 'x86' as current architecture even
+            if current acritecture is not x86.
+
+        Return
+        ------
+        subfolder: str (starting with'\')
+        """
+        path = self.tcpu_dir(True)
         if self.target_cpu != self.current_cpu:
-            path = path.replace('\\', '\\x86_')
+            current = 'x86' if forcex86 else self.current_cpu
+            path = path.replace('\\', '\\%s_' % current)
         return path
 
 
 class RegistryInfo:
+    """
+    Find Microsoft Visual C++ compiler related paths using registry or
+    default paths.
+
+    Parameters
+    ----------
+    platform_info: platform_info
+        "platform_info" instance.
+    version: float
+        Required Microsoft Visual C++ version.
+    """
     def __init__(self, platform_info, version):
-        self.platform_info = platform_info
+        self.pi = platform_info
         self.version = version
 
     @property
     def microsoft(self):
+        """
+        Microsoft registry path.
+        """
         return os.path.join(
             'Software',
-            '' if self.platform_info.current_is_x86() else 'Wow6432Node',
+            '' if self.pi.current_is_x86() else 'Wow6432Node',
             'Microsoft',
         )
 
     @property
     def sxs(self):
+        """
+        Visual Studio SxS registry path.
+        """
         return os.path.join(self.microsoft, r'VisualStudio\SxS')
 
     @property
     def vc(self):
+        """
+        Visual C++ registry path.
+        """
         return os.path.join(self.sxs, 'VC7')
 
     @property
     def vs(self):
+        """
+        Visual Studio registry path.
+        """
         return os.path.join(self.sxs, 'VS7')
 
     @property
     def vc_for_python(self):
+        """
+        Visual C++ for Python.
+        """
         path = r'DevDiv\VCForPython\%0.1f' % self.version
         return os.path.join(self.microsoft, path)
 
     @property
     def windows_sdk(self):
+        """
+        Windows/Platform SDK registry path.
+        """
         return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
 
     def find_visual_studio(self):
         """
-        Find Microsoft Visual Studio directory
+        Find Microsoft Visual Studio directory.
         """
+        # Default path
         name = 'Microsoft Visual Studio %0.1f' % self.version
-        default = os.path.join(self.platform_info.program_files_x86, name)
-        return self.lookup(self.vs, '%0.1f' % self.version) or default
+        default = os.path.join(self.pi.program_files_x86, name)
+
+        # Try to get path from registry, if fail use default path
+        return self._lookup(self.vs, '%0.1f' % self.version) or default
 
     def find_visual_c(self):
         """
-        Find Microsoft Visual C++ directory
+        Find Microsoft Visual C++ directory.
         """
-        # If fail, use default path
+        # Default path
         default = r'Microsoft Visual Studio %0.1f\VC' % self.version
-        guess_vc = os.path.join(self.platform_info.program_files_x86, default)
+        guess_vc = os.path.join(self.pi.program_files_x86, default)
 
-        # Try to get "VC++ for Python" version from registry
-        install_base = self.lookup(self.vc_for_python, 'installdir')
-        default_vc = os.path.join(install_base, 'VC') if install_base else guess_vc
+        # Try to get "VC++ for Python" path from registry as default path
+        python_vc = self._lookup(self.vc_for_python, 'installdir')
+        default_vc = os.path.join(python_vc, 'VC') if python_vc else guess_vc
 
-        result = self.lookup(self.vc, '%0.1f' % self.version) or default_vc
+        # Try to get path from registry, if fail use default path
+        result = self._lookup(self.vc, '%0.1f' % self.version) or default_vc
 
         if not os.path.isdir(result):
             msg = 'vcvarsall.bat and Visual C++ directory not found'
@@ -204,7 +403,7 @@ def find_visual_c(self):
 
     def find_windows_sdk(self):
         """
-        Find Microsoft Windows SDK directory
+        Find Microsoft Windows SDK directory.
         """
         WindowsSdkDir = ''
         if self.version == 9.0:
@@ -216,19 +415,19 @@ def find_windows_sdk(self):
         for ver in WindowsSdkVer:
             # Try to get it from registry
             loc = os.path.join(self.windows_sdk, 'v%s' % ver)
-            WindowsSdkDir = self.lookup(loc, 'installationfolder')
+            WindowsSdkDir = self._lookup(loc, 'installationfolder')
             if WindowsSdkDir:
                 break
         if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
             # Try to get "VC++ for Python" version from registry
-            install_base = self.lookup(self.vc_for_python, 'installdir')
+            install_base = self._lookup(self.vc_for_python, 'installdir')
             if install_base:
                 WindowsSdkDir = os.path.join(install_base, 'WinSDK')
         if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
             # If fail, use default path
             for ver in WindowsSdkVer:
                 path = r'Microsoft SDKs\Windows\v%s' % ver
-                d = os.path.join(self.platform_info.program_files, path)
+                d = os.path.join(self.pi.program_files, path)
                 if os.path.isdir(d):
                     WindowsSdkDir = d
         if not WindowsSdkDir:
@@ -238,10 +437,10 @@ def find_windows_sdk(self):
 
     def find_dot_net_versions(self):
         """
-        Find Microsoft .NET Framework Versions
+        Find Microsoft .NET Framework Versions.
         """
         if self.version == 10.0:
-            v4 = self.lookup(self.vc, 'frameworkver32') or ''
+            v4 = self._lookup(self.vc, 'frameworkver32') or ''
             if v4.lower()[:2] != 'v4':
                 v4 = None
             # default to last v4 version
@@ -253,9 +452,29 @@ def find_dot_net_versions(self):
             FrameworkVer = ('v3.0', 'v2.0.50727')
         return FrameworkVer
 
-    def lookup(self, base, key):
+    def find_dot_net_32(self):
+        """
+        Find Microsoft .NET Framework 32bit directory.
+        """
+        # Default path
+        guess_fw = os.path.join(self.pi.win_dir, r'Microsoft.NET\Framework')
+
+        # Try to get path from registry, if fail use default path
+        return self._lookup(self.vc, 'frameworkdir32') or guess_fw
+
+    def find_dot_net_64(self):
+        """
+        Find Microsoft .NET Framework 64bit directory.
+        """
+        # Default path
+        guess_fw = os.path.join(self.pi.win_dir, r'Microsoft.NET\Framework64')
+
+        # Try to get path from registry, if fail use default path
+        return self._lookup(self.vc, 'frameworkdir64') or guess_fw
+
+    def _lookup(self, base, key):
         try:
-            return distutils.msvc9compiler.Reg.get_value(base, key)
+            return msvc9compiler.Reg.get_value(base, key)
         except KeyError:
             pass
 
@@ -264,45 +483,56 @@ def _compute_env(version, arch):
     """
     Return environment variables for specified Microsoft Visual C++ version
     and platform.
+
+    Microsoft Visual C++ known compatibles versions
+    -----------------------------------------------
+    9.0, 10.0, 14.0
     """
     pi = PlatformInfo(arch)
     reg = RegistryInfo(pi, version)
 
-    # Find Microsoft .NET Framework 32bit directory
-    guess_fw = os.path.join(pi.win_dir, r'Microsoft.NET\Framework')
-    FrameworkDir32 = reg.lookup(reg.vc, 'frameworkdir32') or guess_fw
-
-    # Find Microsoft .NET Framework 64bit directory
-    guess_fw64 = os.path.join(pi.win_dir, r'Microsoft.NET\Framework64')
-    FrameworkDir64 = reg.lookup(reg.vc, 'frameworkdir64') or guess_fw64
-
     # Set Microsoft Visual Studio Tools
-    VSTools = [
-        os.path.join(reg.find_visual_studio(), r'Common7\IDE'),
-        os.path.join(reg.find_visual_studio(), r'Common7\Tools'),
-    ]
+    paths = [r'Common7\IDE', r'Common7\Tools']
+    if version >= 14.0:
+        paths.append(r'Common7\IDE\CommonExtensions\Microsoft\TestWindow')
+        paths.append(r'Team Tools\Performance Tools')
+        paths.append(r'Team Tools\Performance Tools' + pi.ccpu_dir(True, True))
+    VSTools = [os.path.join(reg.find_visual_studio(), path) for path in paths]
 
-    # Set Microsoft Visual C++ Includes
-    VCIncludes = [os.path.join(reg.find_visual_c(), 'Include')]
+    # Set Microsoft Visual C++ & Microsoft Foundation Class Includes
+    VCIncludes = [os.path.join(reg.find_visual_c(), 'Include'),
+                  os.path.join(reg.find_visual_c(), 'ATLMFC\Include')]
 
     # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
-    VCLibraries = [
-        os.path.join(reg.find_visual_c(), 'Lib' + pi.lib_extra),
-        os.path.join(reg.find_visual_c(), r'ATLMFC\LIB' + pi.lib_extra),
-    ]
+    paths = ['Lib' + pi.tcpu_dir(True), r'ATLMFC\Lib' + pi.tcpu_dir(True)]
+    if version >= 14.0:
+        paths.append(r'Lib\store' + pi.tcpu_dir(True))
+    VCLibraries = [os.path.join(reg.find_visual_c(), path) for path in paths]
+
+    # Set Microsoft Visual C++ store references Libraries
+    if version >= 14.0:
+        path = r'Lib\store\references'
+        VCStoreRefs = [os.path.join(reg.find_visual_c(), path)]
+    else:
+        VCStoreRefs = []
 
     # Set Microsoft Visual C++ Tools
+    path = 'Bin' + pi.tools_extra(False if version >= 14.0 else True)
     VCTools = [
         os.path.join(reg.find_visual_c(), 'VCPackages'),
-        os.path.join(reg.find_visual_c(), 'Bin' + pi.tools_extra),
+        os.path.join(reg.find_visual_c(), path),
     ]
-    if pi.tools_extra:
+    if pi.tools_extra() and version >= 14.0:
+        path = 'Bin' + pi.ccpu_dir(True)
+        VCTools.append(os.path.join(reg.find_visual_c(), path))
+    else:
         VCTools.append(os.path.join(reg.find_visual_c(), 'Bin'))
 
-    # Set Microsoft Windows SDK Include
-    OSLibraries = [os.path.join(reg.find_windows_sdk(), 'Lib' + pi.sdk_extra)]
-
     # Set Microsoft Windows SDK Libraries
+    path = 'Lib' + pi.tcpu_dir(True, True)
+    OSLibraries = [os.path.join(reg.find_windows_sdk(), path)]
+
+    # Set Microsoft Windows SDK Include
     OSIncludes = [
         os.path.join(reg.find_windows_sdk(), 'Include'),
         os.path.join(reg.find_windows_sdk(), r'Include\gl'),
@@ -311,18 +541,19 @@ def _compute_env(version, arch):
     # Set Microsoft Windows SDK Tools
     SdkTools = [os.path.join(reg.find_windows_sdk(), 'Bin')]
     if not pi.target_is_x86():
-        SdkTools.append(os.path.join(reg.find_windows_sdk(), 'Bin' + pi.sdk_extra))
+        path = 'Bin' + pi.tcpu_dir(True, True)
+        SdkTools.append(os.path.join(reg.find_windows_sdk(), path))
     if version == 10.0:
-        path = r'Bin\NETFX 4.0 Tools' + pi.sdk_extra
+        path = r'Bin\NETFX 4.0 Tools' + pi.tcpu_dir(True, True)
         SdkTools.append(os.path.join(reg.find_windows_sdk(), path))
 
     # Set Microsoft Windows SDK Setup
     SdkSetup = [os.path.join(reg.find_windows_sdk(), 'Setup')]
 
     # Set Microsoft .NET Framework Tools
-    roots = [FrameworkDir32]
+    roots = [reg.find_dot_net_32()]
     include_64_framework = not pi.target_is_x86() and not pi.current_is_x86()
-    roots += [FrameworkDir64] if include_64_framework else []
+    roots += [reg.find_dot_net_64()] if include_64_framework else []
 
     FxTools = [
         os.path.join(root, ver)
@@ -332,11 +563,27 @@ def _compute_env(version, arch):
     # Set Microsoft Visual Studio Team System Database
     VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]
 
+    # Set Microsoft Build Engine
+    path = r'\MSBuild\%0.1f\bin%s' % (version, pi.ccpu_dir(True))
+    MSBuild = [
+        os.path.join(pi.program_files_x86, path),
+        os.path.join(pi.program_files, path)
+    ]
+
+    # Set Microsoft HTML Help Workshop
+    path = 'HTML Help Workshop'
+    HTMLWork = [
+        os.path.join(pi.program_files_x86, path),
+        os.path.join(pi.program_files, path)
+    ]
+
+    # Return environment
     return dict(
         include=_build_paths('include', [VCIncludes, OSIncludes]),
         lib=_build_paths('lib', [VCLibraries, OSLibraries, FxTools]),
-        libpath=_build_paths('libpath', [VCLibraries, FxTools]),
-        path=_build_paths('path', [VCTools, VSTools, VsTDb, SdkTools, SdkSetup, FxTools]),
+        libpath=_build_paths('libpath', [VCLibraries, FxTools, VCStoreRefs]),
+        path=_build_paths('path', [VCTools, VSTools, VsTDb, SdkTools, SdkSetup,
+                                   FxTools, MSBuild, HTMLWork]),
     )
 
 
@@ -356,12 +603,12 @@ def _build_paths(name, spec_path_lists):
     if not extant_paths:
         msg = "%s environment variable is empty" % name.upper()
         raise distutils.errors.DistutilsPlatformError(msg)
-    unique_paths = unique_everseen(extant_paths)
+    unique_paths = _unique_everseen(extant_paths)
     return os.pathsep.join(unique_paths)
 
 
 # from Python docs
-def unique_everseen(iterable, key=None):
+def _unique_everseen(iterable, key=None):
     "List unique elements, preserving order. Remember all elements ever seen."
     # unique_everseen('AAAABBBCCDAABBB') --> A B C D
     # unique_everseen('ABBCcAD', str.lower) --> A B C D

From 72db3cf5ff66ddab3f6e14880f5545d759938ae6 Mon Sep 17 00:00:00 2001
From: JGoutin <ginnungagap@free.fr>
Date: Thu, 3 Mar 2016 18:00:58 +0000
Subject: [PATCH 5593/8469] * Move non registry parts from RegistryInfo to
 SystemInfo. * Rename many variable to use the same names as in MSVC .bat
 files. This really help to compare the Python script with original sources. *
 Split compute_env to EnvironmentInfo class. * Continue to add support for
 MSVC14. * Some more little fixes.

---
 setuptools/msvc9_support.py | 775 +++++++++++++++++++++++-------------
 1 file changed, 509 insertions(+), 266 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index a956a5b0d0..8835c22d10 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -4,6 +4,7 @@
 import os
 import itertools
 import distutils.errors
+import winreg
 
 try:
     # Distutil file for MSVC++ 9.0 and upper
@@ -30,16 +31,16 @@ def patch_for_specialized_compiler():
 
     Known supported compilers:
     --------------------------
-        Microsoft Visual C++ 9.0:
-            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
-            Microsoft Windows SDK 7.0 (x86, x64, ia64);
-            Microsoft Windows SDK 6.1 (x86, x64, ia64)
+    Microsoft Visual C++ 9.0:
+        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
+        Microsoft Windows SDK 7.0 (x86, x64, ia64);
+        Microsoft Windows SDK 6.1 (x86, x64, ia64)
 
-        Microsoft Visual C++ 10.0:
-            Microsoft Windows SDK 7.1 (x86, x64, ia64)
+    Microsoft Visual C++ 10.0:
+        Microsoft Windows SDK 7.1 (x86, x64, ia64)
 
-        Microsoft Visual C++ 14.0:
-            Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+    Microsoft Visual C++ 14.0:
+        Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
     if 'distutils' not in globals():
         # The module isn't available to be patched
@@ -74,8 +75,8 @@ def msvc9_find_vcvarsall(version):
 
     Known supported compilers
     -------------------------
-        Microsoft Visual C++ 9.0:
-            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
+    Microsoft Visual C++ 9.0:
+        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
 
     Parameters
     ----------
@@ -115,13 +116,13 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
     Known supported compilers
     -------------------------
-        Microsoft Visual C++ 9.0:
-            Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
-            Microsoft Windows SDK 7.0 (x86, x64, ia64);
-            Microsoft Windows SDK 6.1 (x86, x64, ia64)
+    Microsoft Visual C++ 9.0:
+        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
+        Microsoft Windows SDK 7.0 (x86, x64, ia64);
+        Microsoft Windows SDK 6.1 (x86, x64, ia64)
 
-        Microsoft Visual C++ 10.0:
-            Microsoft Windows SDK 7.1 (x86, x64, ia64)
+    Microsoft Visual C++ 10.0:
+        Microsoft Windows SDK 7.1 (x86, x64, ia64)
 
     Parameters
     ----------
@@ -138,15 +139,15 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     try:
         return unpatched['msvc9_query_vcvarsall'](ver, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError:
-        # Error if Vcvarsall.bat is missing
+        # Pass error if Vcvarsall.bat is missing
         pass
     except ValueError:
-        # Error if environment not set after executing vcvarsall.bat
+        # Pass error if environment not set after executing vcvarsall.bat
         pass
 
-    # If vcvarsall.bat fail, try to set environment directly
+    # If error, try to set environment directly
     try:
-        return _compute_env(ver, arch)
+        return EnvironmentInfo(arch, ver).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, ver, arch)
         raise
@@ -159,8 +160,8 @@ def msvc14_get_vc_env(plat_spec):
 
     Known supported compilers
     -------------------------
-        Microsoft Visual C++ 14.0:
-            Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+    Microsoft Visual C++ 14.0:
+        Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
 
     Parameters
     ----------
@@ -171,21 +172,22 @@ def msvc14_get_vc_env(plat_spec):
     ------
     environment: dict
     """
+    # Try to get environement from vcvarsall.bat (Classical way)
     try:
         return unpatched['msv14_get_vc_env'](plat_spec)
     except distutils.errors.DistutilsPlatformError:
-        # Error if Vcvarsall.bat is missing
+        # Pass error Vcvarsall.bat is missing
         pass
 
-    # If vcvarsall.bat fail, try to set environment directly
+    # If error, try to set environment directly
     try:
-        return _compute_env(version, plat_spec)
+        return EnvironmentInfo(plat_spec, vcvermin=14.0).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
-        _augment_exception(exc, version, plat_spec)
+        _augment_exception(exc, 14.0)
         raise
 
 
-def _augment_exception(exc, version, arch):
+def _augment_exception(exc, version, arch=''):
     """
     Add details to the exception message to help guide the user
     as to what action will resolve it.
@@ -193,32 +195,33 @@ def _augment_exception(exc, version, arch):
     # Error if MSVC++ directory not found or environment not set
     message = exc.args[0]
 
-    if "vcvarsall.bat" in message:
+    if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
         message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
             (version, message)
-        if int(version) == 9:
+        msdownload = r'www.microsoft.com/download/details.aspx?id=%d'
+        if version == 9.0:
             if arch.lower().find('ia64') > -1:
                 # For VC++ 9.0, if IA64 support is needed, redirect user
                 # to Windows SDK 7.0
                 message += ' Get it with "Microsoft Windows SDK 7.0": '
-                message += r'www.microsoft.com/download/details.aspx?id=3138'
+                message += msdownload % 3138
             else:
                 # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
                 # This redirection link is maintained by Microsoft.
                 # Contact vspython@microsoft.com if it needs updating.
                 message += r' Get it from http://aka.ms/vcpython27'
-        elif int(version) == 10:
+        elif version == 10.0:
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK 7.1": '
-            message += r'www.microsoft.com/download/details.aspx?id=8279'
+            message += msdownload % 8279
 
     exc.args[0] = message
 
 
 class PlatformInfo:
     """
-    Find architecture informations and system paths.
+    Current and Target Architectures informations.
 
     Parameters
     ----------
@@ -226,9 +229,6 @@ class PlatformInfo:
         Target architecture.
     """
     current_cpu = os.environ['processor_architecture'].lower()
-    win_dir = os.environ['WinDir']
-    program_files = os.environ['ProgramFiles']
-    program_files_x86 = os.environ.get('ProgramFiles(x86)', program_files)
 
     def __init__(self, arch):
         self.arch = arch.lower()
@@ -241,9 +241,9 @@ def target_is_x86(self):
         return self.target_cpu == 'x86'
 
     def current_is_x86(self):
-        return self.current_cpu != 'x86'
+        return self.current_cpu == 'x86'
 
-    def ccpu_dir(self, hidex86=False, x64=False):
+    def current_dir(self, hidex86=False, x64=False):
         """
         Current platform specific subfolder.
 
@@ -256,7 +256,8 @@ def ccpu_dir(self, hidex86=False, x64=False):
 
         Return
         ------
-        subfolder: str (starting with'\')
+        subfolder: str
+            "\target"
         """
         return (
             '' if (self.current_cpu == 'x86' and hidex86) else
@@ -264,7 +265,7 @@ def ccpu_dir(self, hidex86=False, x64=False):
             r'\%s' % self.current_cpu
         )
 
-    def tcpu_dir(self, hidex86=False, x64=False):
+    def target_dir(self, hidex86=False, x64=False):
         """
         Target platform specific subfolder.
 
@@ -277,7 +278,8 @@ def tcpu_dir(self, hidex86=False, x64=False):
 
         Return
         ------
-        subfolder: str (starting with'\')
+        subfolder: str
+            "\current"
         """
         return (
             '' if (self.target_cpu == 'x86' and hidex86) else
@@ -285,9 +287,9 @@ def tcpu_dir(self, hidex86=False, x64=False):
             r'\%s' % self.target_cpu
         )
 
-    def tools_extra(self, forcex86=False):
+    def cross_dir(self, forcex86=False):
         """
-        Platform specific subfolder for Visual C++ Tools.
+        Cross platform specific subfolder.
 
         Parameters
         ----------
@@ -297,9 +299,11 @@ def tools_extra(self, forcex86=False):
 
         Return
         ------
-        subfolder: str (starting with'\')
+        subfolder: str
+            "\current" if target architecture is current architecture,
+            "\current_target" if not.
         """
-        path = self.tcpu_dir(True)
+        path = self.target_dir(True)
         if self.target_cpu != self.current_cpu:
             current = 'x86' if forcex86 else self.current_cpu
             path = path.replace('\\', '\\%s_' % current)
@@ -308,24 +312,25 @@ def tools_extra(self, forcex86=False):
 
 class RegistryInfo:
     """
-    Find Microsoft Visual C++ compiler related paths using registry or
-    default paths.
+    Microsoft Visual Studio related registry informations.
 
     Parameters
     ----------
-    platform_info: platform_info
-        "platform_info" instance.
-    version: float
-        Required Microsoft Visual C++ version.
+    platform_info: PlatformInfo
+        "PlatformInfo" instance.
     """
-    def __init__(self, platform_info, version):
+    HKEYS = (winreg.HKEY_USERS,
+             winreg.HKEY_CURRENT_USER,
+             winreg.HKEY_LOCAL_MACHINE,
+             winreg.HKEY_CLASSES_ROOT)
+
+    def __init__(self, platform_info):
         self.pi = platform_info
-        self.version = version
 
     @property
     def microsoft(self):
         """
-        Microsoft registry path.
+        Microsoft software registry key.
         """
         return os.path.join(
             'Software',
@@ -336,292 +341,530 @@ def microsoft(self):
     @property
     def sxs(self):
         """
-        Visual Studio SxS registry path.
+        Microsoft Visual Studio SxS registry key.
         """
         return os.path.join(self.microsoft, r'VisualStudio\SxS')
 
     @property
     def vc(self):
         """
-        Visual C++ registry path.
+        Microsoft Visual C++ registry key.
         """
         return os.path.join(self.sxs, 'VC7')
 
     @property
     def vs(self):
         """
-        Visual Studio registry path.
+        Microsoft Visual Studio registry key.
         """
         return os.path.join(self.sxs, 'VS7')
 
     @property
     def vc_for_python(self):
         """
-        Visual C++ for Python.
+        Microsoft Visual C++ for Python registry key.
         """
-        path = r'DevDiv\VCForPython\%0.1f' % self.version
+        path = r'DevDiv\VCForPython'
         return os.path.join(self.microsoft, path)
 
     @property
     def windows_sdk(self):
         """
-        Windows/Platform SDK registry path.
+        Microsoft Windows/Platform SDK registry key.
         """
         return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
 
-    def find_visual_studio(self):
+    def lookup(self, key, name):
+        """
+        Look for values in registry.
+
+        Parameters
+        ----------
+        key: str
+            Registry key path where look.
+        name: str
+            Value name to find.
+
+        Return
+        ------
+        str: value
+        """
+        for hkey in self.HKEYS:
+            try:
+                bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
+            except FileNotFoundError:
+                continue
+            try:
+                return winreg.QueryValueEx(bkey, name)[0]
+            except FileNotFoundError:
+                pass
+
+
+class SystemInfo:
+    """
+    Microsoft Windows and Visual Studio related system inormations.
+
+    Parameters
+    ----------
+    registry_info: RegistryInfo
+        "RegistryInfo" instance.
+    vcver: float
+        Required Microsoft Visual C++ version.
+    """
+    WinDir = os.environ['WinDir']
+    ProgramFiles = os.environ['ProgramFiles']
+    ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
+
+    def __init__(self, registry_info, vcver=None):
+        self.ri = registry_info
+        if vcver:
+            self.vcver = vcver
+        else:
+            try:
+                self.vcver = self.find_availables_vcver()[-1]
+            except IndexError:
+                err = 'No Microsoft Visual C++ version found'
+                raise distutils.errors.DistutilsPlatformError(err)
+
+    def find_availables_vcver(self):
+        """
+        Find all availables Microsoft Visual C++ versions.
+        """
+        vckeys = (self.ri.vc, self.ri.vc_for_python)
+        vsvers = []
+        for hkey in self.ri.HKEYS:
+            for key in vckeys:
+                try:
+                    bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
+                except FileNotFoundError:
+                    continue
+                subkeys, values, _ = winreg.QueryInfoKey(bkey)
+                for i in range(values):
+                    try:
+                        ver = float(winreg.EnumValue(bkey, i)[0])
+                        if ver not in vsvers:
+                            vsvers.append(ver)
+                    except ValueError:
+                        pass
+                for i in range(subkeys):
+                    try:
+                        ver = float(winreg.EnumKey(bkey, i))
+                        if ver not in vsvers:
+                            vsvers.append(ver)
+                    except ValueError:
+                        pass
+        return sorted(vsvers)
+
+    @property
+    def VSInstallDir(self):
         """
-        Find Microsoft Visual Studio directory.
+        Microsoft Visual Studio directory.
         """
         # Default path
-        name = 'Microsoft Visual Studio %0.1f' % self.version
-        default = os.path.join(self.pi.program_files_x86, name)
+        name = 'Microsoft Visual Studio %0.1f' % self.vcver
+        default = os.path.join(self.ProgramFilesx86, name)
 
         # Try to get path from registry, if fail use default path
-        return self._lookup(self.vs, '%0.1f' % self.version) or default
+        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vcver) or default
 
-    def find_visual_c(self):
+    @property
+    def VCInstallDir(self):
         """
-        Find Microsoft Visual C++ directory.
+        Microsoft Visual C++ directory.
         """
         # Default path
-        default = r'Microsoft Visual Studio %0.1f\VC' % self.version
-        guess_vc = os.path.join(self.pi.program_files_x86, default)
+        default = r'Microsoft Visual Studio %0.1f\VC' % self.vcver
+        guess_vc = os.path.join(self.ProgramFilesx86, default)
 
         # Try to get "VC++ for Python" path from registry as default path
-        python_vc = self._lookup(self.vc_for_python, 'installdir')
+        path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vcver)
+        python_vc = self.ri.lookup(path, 'installdir')
         default_vc = os.path.join(python_vc, 'VC') if python_vc else guess_vc
 
         # Try to get path from registry, if fail use default path
-        result = self._lookup(self.vc, '%0.1f' % self.version) or default_vc
+        result = self.ri.lookup(self.ri.vc, '%0.1f' % self.vcver) or default_vc
 
         if not os.path.isdir(result):
-            msg = 'vcvarsall.bat and Visual C++ directory not found'
+            msg = 'Microsoft Visual C++ directory not found'
             raise distutils.errors.DistutilsPlatformError(msg)
 
         return result
 
-    def find_windows_sdk(self):
+    @property
+    def WindowsSdkDir(self):
         """
-        Find Microsoft Windows SDK directory.
+        Microsoft Windows SDK directory.
         """
-        WindowsSdkDir = ''
-        if self.version == 9.0:
-            WindowsSdkVer = ('7.0', '6.1', '6.0a')
-        elif self.version == 10.0:
-            WindowsSdkVer = ('7.1', '7.0a')
+        sdkdir = ''
+        if self.vcver == 9.0:
+            sdkver = ('7.0', '6.1', '6.0a')
+        elif self.vcver == 10.0:
+            sdkver = ('7.1', '7.0a')
+        elif self.vcver == 14.0:
+            sdkver = ('10.0', '8.1', '8.1a')
         else:
-            WindowsSdkVer = ()
-        for ver in WindowsSdkVer:
+            sdkver = ()
+        for ver in sdkver:
             # Try to get it from registry
-            loc = os.path.join(self.windows_sdk, 'v%s' % ver)
-            WindowsSdkDir = self._lookup(loc, 'installationfolder')
-            if WindowsSdkDir:
+            loc = os.path.join(self.ri.windows_sdk, 'v%s' % ver)
+            sdkdir = self.ri.lookup(loc, 'installationfolder')
+            if sdkdir:
                 break
-        if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
+        if not sdkdir or not os.path.isdir(sdkdir):
             # Try to get "VC++ for Python" version from registry
-            install_base = self._lookup(self.vc_for_python, 'installdir')
+            path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vcver)
+            install_base = self.ri.lookup(path, 'installdir')
             if install_base:
-                WindowsSdkDir = os.path.join(install_base, 'WinSDK')
-        if not WindowsSdkDir or not os.path.isdir(WindowsSdkDir):
-            # If fail, use default path
-            for ver in WindowsSdkVer:
+                sdkdir = os.path.join(install_base, 'WinSDK')
+        if not sdkdir or not os.path.isdir(sdkdir):
+            # If fail, use default new path
+            for ver in sdkver:
+                intver = ver[:ver.rfind('.')]
+                path = r'Microsoft SDKs\Windows Kits\%s' % (intver)
+                d = os.path.join(self.ProgramFiles, path)
+                if os.path.isdir(d):
+                    sdkdir = d
+        if not sdkdir or not os.path.isdir(sdkdir):
+            # If fail, use default old path
+            for ver in sdkver:
                 path = r'Microsoft SDKs\Windows\v%s' % ver
-                d = os.path.join(self.pi.program_files, path)
+                d = os.path.join(self.ProgramFiles, path)
                 if os.path.isdir(d):
-                    WindowsSdkDir = d
-        if not WindowsSdkDir:
+                    sdkdir = d
+        if not sdkdir:
             # If fail, use Platform SDK
-            WindowsSdkDir = os.path.join(self.find_visual_c(), 'PlatformSDK')
-        return WindowsSdkDir
-
-    def find_dot_net_versions(self):
-        """
-        Find Microsoft .NET Framework Versions.
-        """
-        if self.version == 10.0:
-            v4 = self._lookup(self.vc, 'frameworkver32') or ''
-            if v4.lower()[:2] != 'v4':
-                v4 = None
-            # default to last v4 version
-            v4 = v4 or 'v4.0.30319'
-            FrameworkVer = (v4, 'v3.5')
-        elif self.version == 9.0:
-            FrameworkVer = ('v3.5', 'v2.0.50727')
-        elif self.version == 8.0:
-            FrameworkVer = ('v3.0', 'v2.0.50727')
-        return FrameworkVer
+            sdkdir = os.path.join(self.VCInstallDir, 'PlatformSDK')
+        return sdkdir
 
-    def find_dot_net_32(self):
+    @property
+    def FrameworkDir32(self):
         """
-        Find Microsoft .NET Framework 32bit directory.
+        Microsoft .NET Framework 32bit directory.
         """
         # Default path
-        guess_fw = os.path.join(self.pi.win_dir, r'Microsoft.NET\Framework')
+        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework')
 
         # Try to get path from registry, if fail use default path
-        return self._lookup(self.vc, 'frameworkdir32') or guess_fw
+        return self.ri.lookup(self.ri.vc, 'frameworkdir32') or guess_fw
 
-    def find_dot_net_64(self):
+    @property
+    def FrameworkDir64(self):
         """
-        Find Microsoft .NET Framework 64bit directory.
+        Microsoft .NET Framework 64bit directory.
         """
         # Default path
-        guess_fw = os.path.join(self.pi.win_dir, r'Microsoft.NET\Framework64')
+        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework64')
 
         # Try to get path from registry, if fail use default path
-        return self._lookup(self.vc, 'frameworkdir64') or guess_fw
+        return self.ri.lookup(self.ri.vc, 'frameworkdir64') or guess_fw
 
-    def _lookup(self, base, key):
-        try:
-            return msvc9compiler.Reg.get_value(base, key)
-        except KeyError:
-            pass
+    @property
+    def FrameworkVersion32(self):
+        """
+        Microsoft .NET Framework 32bit versions.
+        """
+        return self._find_dot_net_versions(32)
+
+    @property
+    def FrameworkVersion64(self):
+        """
+        Microsoft .NET Framework 64bit versions.
+        """
+        return self._find_dot_net_versions(64)
 
+    def _find_dot_net_versions(self, bits=32):
+        """
+        Find Microsoft .NET Framework versions.
 
-def _compute_env(version, arch):
+        Parameters
+        ----------
+        bits: int
+            Platform number of bits: 32 or 64.
+        """
+        # Find actual .NET version
+        ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
+
+        # Set .NET versions for specified MSVC++ version
+        if self.vcver >= 14.0:
+            frameworkver = (ver, 'v4.0')
+        elif self.vcver == 10.0:
+            if ver.lower()[:2] != 'v4':
+                ver = ''
+            ver = ver or 'v4.0.30319'
+            frameworkver = (ver, 'v3.5')
+        elif self.vcver == 9.0:
+            frameworkver = ('v3.5', 'v2.0.50727')
+        elif self.vcver == 8.0:
+            frameworkver = ('v3.0', 'v2.0.50727')
+        return frameworkver
+
+
+class EnvironmentInfo:
     """
     Return environment variables for specified Microsoft Visual C++ version
-    and platform.
+    and platform : Lib, Include, Path and libpath.
 
-    Microsoft Visual C++ known compatibles versions
-    -----------------------------------------------
-    9.0, 10.0, 14.0
-    """
-    pi = PlatformInfo(arch)
-    reg = RegistryInfo(pi, version)
-
-    # Set Microsoft Visual Studio Tools
-    paths = [r'Common7\IDE', r'Common7\Tools']
-    if version >= 14.0:
-        paths.append(r'Common7\IDE\CommonExtensions\Microsoft\TestWindow')
-        paths.append(r'Team Tools\Performance Tools')
-        paths.append(r'Team Tools\Performance Tools' + pi.ccpu_dir(True, True))
-    VSTools = [os.path.join(reg.find_visual_studio(), path) for path in paths]
-
-    # Set Microsoft Visual C++ & Microsoft Foundation Class Includes
-    VCIncludes = [os.path.join(reg.find_visual_c(), 'Include'),
-                  os.path.join(reg.find_visual_c(), 'ATLMFC\Include')]
-
-    # Set Microsoft Visual C++ & Microsoft Foundation Class Libraries
-    paths = ['Lib' + pi.tcpu_dir(True), r'ATLMFC\Lib' + pi.tcpu_dir(True)]
-    if version >= 14.0:
-        paths.append(r'Lib\store' + pi.tcpu_dir(True))
-    VCLibraries = [os.path.join(reg.find_visual_c(), path) for path in paths]
-
-    # Set Microsoft Visual C++ store references Libraries
-    if version >= 14.0:
-        path = r'Lib\store\references'
-        VCStoreRefs = [os.path.join(reg.find_visual_c(), path)]
-    else:
-        VCStoreRefs = []
-
-    # Set Microsoft Visual C++ Tools
-    path = 'Bin' + pi.tools_extra(False if version >= 14.0 else True)
-    VCTools = [
-        os.path.join(reg.find_visual_c(), 'VCPackages'),
-        os.path.join(reg.find_visual_c(), path),
-    ]
-    if pi.tools_extra() and version >= 14.0:
-        path = 'Bin' + pi.ccpu_dir(True)
-        VCTools.append(os.path.join(reg.find_visual_c(), path))
-    else:
-        VCTools.append(os.path.join(reg.find_visual_c(), 'Bin'))
-
-    # Set Microsoft Windows SDK Libraries
-    path = 'Lib' + pi.tcpu_dir(True, True)
-    OSLibraries = [os.path.join(reg.find_windows_sdk(), path)]
-
-    # Set Microsoft Windows SDK Include
-    OSIncludes = [
-        os.path.join(reg.find_windows_sdk(), 'Include'),
-        os.path.join(reg.find_windows_sdk(), r'Include\gl'),
-    ]
-
-    # Set Microsoft Windows SDK Tools
-    SdkTools = [os.path.join(reg.find_windows_sdk(), 'Bin')]
-    if not pi.target_is_x86():
-        path = 'Bin' + pi.tcpu_dir(True, True)
-        SdkTools.append(os.path.join(reg.find_windows_sdk(), path))
-    if version == 10.0:
-        path = r'Bin\NETFX 4.0 Tools' + pi.tcpu_dir(True, True)
-        SdkTools.append(os.path.join(reg.find_windows_sdk(), path))
-
-    # Set Microsoft Windows SDK Setup
-    SdkSetup = [os.path.join(reg.find_windows_sdk(), 'Setup')]
-
-    # Set Microsoft .NET Framework Tools
-    roots = [reg.find_dot_net_32()]
-    include_64_framework = not pi.target_is_x86() and not pi.current_is_x86()
-    roots += [reg.find_dot_net_64()] if include_64_framework else []
-
-    FxTools = [
-        os.path.join(root, ver)
-        for root, ver in itertools.product(roots, reg.find_dot_net_versions())
-    ]
-
-    # Set Microsoft Visual Studio Team System Database
-    VsTDb = [os.path.join(reg.find_visual_studio(), r'VSTSDB\Deploy')]
-
-    # Set Microsoft Build Engine
-    path = r'\MSBuild\%0.1f\bin%s' % (version, pi.ccpu_dir(True))
-    MSBuild = [
-        os.path.join(pi.program_files_x86, path),
-        os.path.join(pi.program_files, path)
-    ]
-
-    # Set Microsoft HTML Help Workshop
-    path = 'HTML Help Workshop'
-    HTMLWork = [
-        os.path.join(pi.program_files_x86, path),
-        os.path.join(pi.program_files, path)
-    ]
-
-    # Return environment
-    return dict(
-        include=_build_paths('include', [VCIncludes, OSIncludes]),
-        lib=_build_paths('lib', [VCLibraries, OSLibraries, FxTools]),
-        libpath=_build_paths('libpath', [VCLibraries, FxTools, VCStoreRefs]),
-        path=_build_paths('path', [VCTools, VSTools, VsTDb, SdkTools, SdkSetup,
-                                   FxTools, MSBuild, HTMLWork]),
-    )
-
-
-def _build_paths(name, spec_path_lists):
-    """
-    Given an environment variable name and specified paths,
-    return a pathsep-separated string of paths containing
-    unique, extant, directories from those paths and from
-    the environment variable. Raise an error if no paths
-    are resolved.
+    This function is compatible with Microsoft Visual C++ 9.0 to 14.0.
+
+    Parameters
+    ----------
+    arch: str
+        Target architecture.
+    vcver: float
+        Required Microsoft Visual C++ version. If not set, autodetect the last
+        version.
+    vcvermin: float
+        Minimum Microsoft Visual C++ version.
     """
-    # flatten spec_path_lists
-    spec_paths = itertools.chain.from_iterable(spec_path_lists)
-    env_paths = os.environ.get(name, '').split(os.pathsep)
-    paths = itertools.chain(spec_paths, env_paths)
-    extant_paths = list(filter(os.path.isdir, paths))
-    if not extant_paths:
-        msg = "%s environment variable is empty" % name.upper()
-        raise distutils.errors.DistutilsPlatformError(msg)
-    unique_paths = _unique_everseen(extant_paths)
-    return os.pathsep.join(unique_paths)
-
-
-# from Python docs
-def _unique_everseen(iterable, key=None):
-    "List unique elements, preserving order. Remember all elements ever seen."
-    # unique_everseen('AAAABBBCCDAABBB') --> A B C D
-    # unique_everseen('ABBCcAD', str.lower) --> A B C D
-    seen = set()
-    seen_add = seen.add
-    filterfalse = six.moves.filterfalse
-    if key is None:
-        for element in filterfalse(seen.__contains__, iterable):
-            seen_add(element)
-            yield element
-    else:
-        for element in iterable:
-            k = key(element)
-            if k not in seen:
-                seen_add(k)
+    def __init__(self, arch, vcver=None, vcvermin=None):
+        self.pi = PlatformInfo(arch)
+        self.ri = RegistryInfo(self.pi)
+        self.si = SystemInfo(self.ri, vcver)
+
+        if self.vcver < vcvermin:
+            err = 'No suitable Microsoft Visual C++ version found'
+            raise distutils.errors.DistutilsPlatformError(err)
+
+    @property
+    def vcver(self):
+        """
+        Microsoft Visual C++ version.
+        """
+        return self.si.vcver
+
+    @property
+    def VSTools(self):
+        """
+        Microsoft Visual Studio Tools
+        """
+        paths = [r'Common7\IDE', r'Common7\Tools']
+        if self.vcver >= 14.0:
+            arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
+            paths += [r'Common7\IDE\CommonExtensions\Microsoft\TestWindow']
+            paths += [r'Team Tools\Performance Tools']
+            paths += [r'Team Tools\Performance Tools%s' % arch_subdir]
+        return [os.path.join(self.si.VSInstallDir, path) for path in paths]
+
+    @property
+    def VCIncludes(self):
+        """
+        Microsoft Visual C++ & Microsoft Foundation Class Includes
+        """
+        return [os.path.join(self.si.VCInstallDir, 'Include'),
+                os.path.join(self.si.VCInstallDir, 'ATLMFC\Include')]
+
+    @property
+    def VCLibraries(self):
+        """
+        Microsoft Visual C++ & Microsoft Foundation Class Libraries
+        """
+        arch_subdir = self.pi.target_dir(hidex86=True)
+        paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
+        if self.vcver >= 14.0:
+            paths += [r'Lib\store%s' % arch_subdir]
+        return [os.path.join(self.si.VCInstallDir, path) for path in paths]
+
+    @property
+    def VCStoreRefs(self):
+        """
+        Microsoft Visual C++ store references Libraries
+        """
+        path = os.path.join(self.si.VCInstallDir, r'Lib\store\references')
+        return [path] if self.vcver >= 14.0 else []
+
+    @property
+    def VCTools(self):
+        """
+        Microsoft Visual C++ Tools
+        """
+        forcex86 = True if self.vcver <= 10.0 else False
+        arch_subdir = self.pi.cross_dir(forcex86)
+        tools = [
+            os.path.join(self.si.VCInstallDir, 'VCPackages'),
+            os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir),
+        ]
+        if self.pi.cross_dir() and self.vcver >= 14.0:
+            path = 'Bin%s' % self.pi.current_dir(hidex86=True)
+            tools += [os.path.join(self.si.VCInstallDir, path)]
+        else:
+            tools += [os.path.join(self.si.VCInstallDir, 'Bin')]
+        return tools
+
+    @property
+    def OSLibraries(self):
+        """
+        Microsoft Windows SDK Libraries
+        """
+        arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
+        return [os.path.join(self.si.WindowsSdkDir, 'Bin%s' % arch_subdir)]
+
+    @property
+    def OSIncludes(self):
+        """
+        Microsoft Windows SDK Include
+        """
+        return [
+            os.path.join(self.si.WindowsSdkDir, 'Include'),
+            os.path.join(self.si.WindowsSdkDir, r'Include\gl'),
+        ]
+
+    @property
+    def SdkTools(self):
+        """
+        Microsoft Windows SDK Tools
+        """
+        if self.vcver <= 10:
+            arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
+        else:
+            arch_subdir = self.pi.target_dir(x64=True)
+        tools = [os.path.join(self.si.WindowsSdkDir, 'Bin')]
+        if not self.pi.target_is_x86():
+            path = 'Bin%s' % arch_subdir
+            tools += [os.path.join(self.si.WindowsSdkDir, path)]
+        if self.vcver == 10.0:
+            path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
+            tools += [os.path.join(self.si.WindowsSdkDir, path)]
+        return tools
+
+    @property
+    def SdkSetup(self):
+        """
+        Microsoft Windows SDK Setup
+        """
+        return [os.path.join(self.si.WindowsSdkDir, 'Setup')]
+
+    @property
+    def FxTools(self):
+        """
+        Microsoft .NET Framework Tools
+        """
+        pi = self.pi
+        si = self.si
+        if self.vcver <= 10.0:
+            include32 = True
+            include64 = not pi.target_is_x86() and not pi.current_is_x86()
+        else:
+            include32 = pi.target_is_x86() or pi.current_is_x86()
+            include64 = pi.current_cpu == 'amd64' or pi.target_cpu == 'amd64'
+        tools = []
+        if include32:
+            tools += [
+                os.path.join(si.FrameworkDir32, ver)
+                for ver in si.FrameworkVersion32
+            ]
+        if include64:
+            tools += [
+                os.path.join(si.FrameworkDir64, ver)
+                for ver in si.FrameworkVersion64
+            ]
+        return tools
+
+    @property
+    def VsTDb(self):
+        """
+        Microsoft Visual Studio Team System Database
+        """
+        return [os.path.join(self.si.VSInstallDir, r'VSTSDB\Deploy')]
+
+    @property
+    def MSBuild(self):
+        """
+        Microsoft Build Engine
+        """
+        arch_subdir = self.pi.current_dir(hidex86=True)
+        path = r'\MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
+        return [
+            os.path.join(self.si.ProgramFilesx86, path),
+            os.path.join(self.si.ProgramFiles, path)
+        ]
+
+    @property
+    def HTMLWs(self):
+        """
+        Microsoft HTML Help Workshop
+        """
+        return [
+            os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop'),
+            os.path.join(self.si.ProgramFiles, 'HTML Help Workshop')
+        ]
+
+    @property
+    def VCRuntimeRedist(self):
+        """
+        Microsoft Visual C++ runtime redistribuable dll
+        """
+        arch_subdir = self.pi.target_dir(x64=True)
+        vcruntime = 'redist%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
+        vcruntime = vcruntime % (arch_subdir, self.vcver, self.vcver)
+        return os.path.join(self.si.VCInstallDir, vcruntime)
+
+    def return_env(self):
+        """
+        Return environment dict.
+        """
+        env = dict(
+            include=self._build_paths('include',
+                                      [self.VCIncludes,
+                                       self.OSIncludes]),
+            lib=self._build_paths('lib',
+                                  [self.VCLibraries,
+                                   self.OSLibraries,
+                                   self.FxTools]),
+            libpath=self._build_paths('libpath',
+                                      [self.VCLibraries,
+                                       self.FxTools,
+                                       self.VCStoreRefs]),
+            path=self._build_paths('path',
+                                   [self.VCTools,
+                                    self.VSTools,
+                                    self.VsTDb,
+                                    self.SdkTools,
+                                    self.SdkSetup,
+                                    self.FxTools,
+                                    self.MSBuild,
+                                    self.HTMLWs]),
+        )
+        if self.vcver >= 14 and os.path.isfile(self.VCRuntimeRedist):
+            env['py_vcruntime_redist'] = self.VCRuntimeRedist
+        return env
+
+    def _build_paths(self, name, spec_path_lists):
+        """
+        Given an environment variable name and specified paths,
+        return a pathsep-separated string of paths containing
+        unique, extant, directories from those paths and from
+        the environment variable. Raise an error if no paths
+        are resolved.
+        """
+        # flatten spec_path_lists
+        spec_paths = itertools.chain.from_iterable(spec_path_lists)
+        env_paths = os.environ.get(name, '').split(os.pathsep)
+        paths = itertools.chain(spec_paths, env_paths)
+        extant_paths = list(filter(os.path.isdir, paths))
+        if not extant_paths:
+            msg = "%s environment variable is empty" % name.upper()
+            raise distutils.errors.DistutilsPlatformError(msg)
+        unique_paths = self._unique_everseen(extant_paths)
+        return os.pathsep.join(unique_paths)
+
+    # from Python docs
+    def _unique_everseen(self, iterable, key=None):
+        """
+        List unique elements, preserving order.
+        Remember all elements ever seen.
+        """
+        # unique_everseen('AAAABBBCCDAABBB') --> A B C D
+        # unique_everseen('ABBCcAD', str.lower) --> A B C D
+        seen = set()
+        seen_add = seen.add
+        filterfalse = six.moves.filterfalse
+        if key is None:
+            for element in filterfalse(seen.__contains__, iterable):
+                seen_add(element)
                 yield element
+        else:
+            for element in iterable:
+                k = key(element)
+                if k not in seen:
+                    seen_add(k)
+                    yield element

From 321b27c9cc8e5a5e316488f457a890765a06f9ca Mon Sep 17 00:00:00 2001
From: JGoutin <ginnungagap@free.fr>
Date: Fri, 4 Mar 2016 15:54:44 +0000
Subject: [PATCH 5594/8469] * Continue do add support for MSVC14 (Still work in
 progress). * Add support for MSVC11 and 12 (Only few changes with actual code
 needed for them). * Python 2 compatibility for winreg.

---
 setuptools/msvc9_support.py | 150 ++++++++++++++++++++++++++++--------
 1 file changed, 119 insertions(+), 31 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 8835c22d10..0e144a8047 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -4,23 +4,22 @@
 import os
 import itertools
 import distutils.errors
-import winreg
+import six
+import six.moves.winreg as winreg
 
 try:
-    # Distutil file for MSVC++ 9.0 and upper
+    # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
     import distutils.msvc9compiler as msvc9compiler
 except ImportError:
     pass
 
 try:
-    # Distutil file for MSVC++ 14.0 and upper
+    # Distutil file for MSVC++ 14.0 and upper (Python 3.5)
     import distutils._msvccompiler as msvc14compiler
 except ImportError:
     pass
 
 
-import six
-
 unpatched = dict()
 
 
@@ -73,6 +72,8 @@ def msvc9_find_vcvarsall(version):
     compiler build for Python (VCForPython). Fall back to original behavior
     when the standalone compiler is not available.
 
+    Redirect the path of "vcvarsall.bat".
+
     Known supported compilers
     -------------------------
     Microsoft Visual C++ 9.0:
@@ -114,6 +115,8 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     Patched "distutils.msvc9compiler.query_vcvarsall" for support standalones
     compilers.
 
+    Set environment without use of "vcvarsall.bat".
+
     Known supported compilers
     -------------------------
     Microsoft Visual C++ 9.0:
@@ -158,6 +161,8 @@ def msvc14_get_vc_env(plat_spec):
     Patched "distutils._msvccompiler._get_vc_env" for support standalones
     compilers.
 
+    Set environment without use of "vcvarsall.bat".
+
     Known supported compilers
     -------------------------
     Microsoft Visual C++ 14.0:
@@ -338,24 +343,31 @@ def microsoft(self):
             'Microsoft',
         )
 
+    @property
+    def visualstudio(self):
+        """
+        Microsoft Visual Studio root registry key.
+        """
+        return os.path.join(self.microsoft, r'VisualStudio')
+
     @property
     def sxs(self):
         """
         Microsoft Visual Studio SxS registry key.
         """
-        return os.path.join(self.microsoft, r'VisualStudio\SxS')
+        return os.path.join(self.visualstudio, 'SxS')
 
     @property
     def vc(self):
         """
-        Microsoft Visual C++ registry key.
+        Microsoft Visual C++ VC7 registry key.
         """
         return os.path.join(self.sxs, 'VC7')
 
     @property
     def vs(self):
         """
-        Microsoft Visual Studio registry key.
+        Microsoft Visual Studio VS7 registry key.
         """
         return os.path.join(self.sxs, 'VS7')
 
@@ -496,14 +508,16 @@ def WindowsSdkDir(self):
         Microsoft Windows SDK directory.
         """
         sdkdir = ''
-        if self.vcver == 9.0:
+        if self.vcver <= 9.0:
             sdkver = ('7.0', '6.1', '6.0a')
         elif self.vcver == 10.0:
             sdkver = ('7.1', '7.0a')
-        elif self.vcver == 14.0:
-            sdkver = ('10.0', '8.1', '8.1a')
-        else:
-            sdkver = ()
+        elif self.vcver == 11.0:
+            sdkver = ('8.0', '8.0a')
+        elif self.vcver == 12.0:
+            sdkver = ('8.1', '8.1a')
+        elif self.vcver >= 14.0:
+            sdkver = ('10.0', '8.1')
         for ver in sdkver:
             # Try to get it from registry
             loc = os.path.join(self.ri.windows_sdk, 'v%s' % ver)
@@ -536,6 +550,15 @@ def WindowsSdkDir(self):
             sdkdir = os.path.join(self.VCInstallDir, 'PlatformSDK')
         return sdkdir
 
+    @property
+    def FSharpInstallDir(self):
+        """
+        Microsoft Visual F# directory.
+        """
+        path = r'%0.1f\Setup\F#' % self.vcver
+        path = os.path.join(self.ri.visualstudio, path)
+        return self.ri.lookup(path, 'productdir') or ''
+
     @property
     def FrameworkDir32(self):
         """
@@ -585,16 +608,16 @@ def _find_dot_net_versions(self, bits=32):
         ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
 
         # Set .NET versions for specified MSVC++ version
-        if self.vcver >= 14.0:
+        if self.vcver >= 12.0:
             frameworkver = (ver, 'v4.0')
-        elif self.vcver == 10.0:
+        elif self.vcver >= 10.0:
             if ver.lower()[:2] != 'v4':
                 ver = ''
             ver = ver or 'v4.0.30319'
             frameworkver = (ver, 'v3.5')
         elif self.vcver == 9.0:
             frameworkver = ('v3.5', 'v2.0.50727')
-        elif self.vcver == 8.0:
+        if self.vcver == 8.0:
             frameworkver = ('v3.0', 'v2.0.50727')
         return frameworkver
 
@@ -606,6 +629,9 @@ class EnvironmentInfo:
 
     This function is compatible with Microsoft Visual C++ 9.0 to 14.0.
 
+    Script created by analysing Microsoft environment configuration files like
+    "vcvars[...].bat", "SetEnv.Cmd", "vcbuildtools.bat", ...
+
     Parameters
     ----------
     arch: str
@@ -669,8 +695,9 @@ def VCStoreRefs(self):
         """
         Microsoft Visual C++ store references Libraries
         """
-        path = os.path.join(self.si.VCInstallDir, r'Lib\store\references')
-        return [path] if self.vcver >= 14.0 else []
+        if self.vcver < 14.0:
+            return []
+        return os.path.join(self.si.VCInstallDir, r'Lib\store\references')
 
     @property
     def VCTools(self):
@@ -703,25 +730,36 @@ def OSIncludes(self):
         """
         Microsoft Windows SDK Include
         """
-        return [
-            os.path.join(self.si.WindowsSdkDir, 'Include'),
-            os.path.join(self.si.WindowsSdkDir, r'Include\gl'),
-        ]
+        if self.vcver <= 10.0:
+            return [
+                os.path.join(self.si.WindowsSdkDir, 'Include'),
+                os.path.join(self.si.WindowsSdkDir, r'Include\gl')
+            ]
+        elif self.vcver <= 12.0:
+            return [
+                os.path.join(self.si.WindowsSdkDir, r'include\shared'),
+                os.path.join(self.si.WindowsSdkDir, r'include\um'),
+                os.path.join(self.si.WindowsSdkDir, r'include\winrt')
+            ]
 
     @property
     def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
-        if self.vcver <= 10:
-            arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
+        if self.vcver <= 11.0:
+            tools = [os.path.join(self.si.WindowsSdkDir, 'Bin')]
         else:
-            arch_subdir = self.pi.target_dir(x64=True)
-        tools = [os.path.join(self.si.WindowsSdkDir, 'Bin')]
-        if not self.pi.target_is_x86():
+            tools = [os.path.join(self.si.WindowsSdkDir, r'Bin\x86')]
+        if not self.pi.current_is_x86():
+            arch_subdir = self.pi.current_dir(x64=True)
             path = 'Bin%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
-        if self.vcver == 10.0:
+        if self.vcver == 10.0 or self.vcver == 11.0:
+            if self.pi.target_is_x86():
+                arch_subdir = ''
+            else:
+                arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
         return tools
@@ -759,6 +797,22 @@ def FxTools(self):
             ]
         return tools
 
+    @property
+    def NetFxSDKLibraries(self):
+        """
+        Microsoft .Net Framework SDK Libraries
+        """
+        if self.vcver < 14.0:
+            return []
+
+    @property
+    def NetFxSDKIncludes(self):
+        """
+        Microsoft .Net Framework SDK Includes
+        """
+        if self.vcver < 14.0:
+            return []
+
     @property
     def VsTDb(self):
         """
@@ -771,6 +825,8 @@ def MSBuild(self):
         """
         Microsoft Build Engine
         """
+        if self.vcver < 12.0:
+            return []
         arch_subdir = self.pi.current_dir(hidex86=True)
         path = r'\MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
         return [
@@ -783,11 +839,38 @@ def HTMLWs(self):
         """
         Microsoft HTML Help Workshop
         """
+        if self.vcver < 11.0:
+            return []
         return [
             os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop'),
             os.path.join(self.si.ProgramFiles, 'HTML Help Workshop')
         ]
 
+    @property
+    def UCRTLibraries(self):
+        """
+        Microsoft Universal CRT Libraries
+        """
+        if self.vcver < 14.0:
+            return []
+
+    @property
+    def UCRTIncludes(self):
+        """
+        Microsoft Universal CRT Include
+        """
+        if self.vcver < 14.0:
+            return []
+
+    @property
+    def FSharp(self):
+        """
+        Microsoft Visual F#
+        """
+        if self.vcver < 11.0 and self.vcver > 12.0:
+            return []
+        return self.si.FSharpInstallDir
+
     @property
     def VCRuntimeRedist(self):
         """
@@ -805,11 +888,15 @@ def return_env(self):
         env = dict(
             include=self._build_paths('include',
                                       [self.VCIncludes,
-                                       self.OSIncludes]),
+                                       self.OSIncludes,
+                                       self.UCRTIncludes,
+                                       self.NetFxSDKIncludes]),
             lib=self._build_paths('lib',
                                   [self.VCLibraries,
                                    self.OSLibraries,
-                                   self.FxTools]),
+                                   self.FxTools,
+                                   self.UCRTLibraries,
+                                   self.NetFxSDKLibraries]),
             libpath=self._build_paths('libpath',
                                       [self.VCLibraries,
                                        self.FxTools,
@@ -822,7 +909,8 @@ def return_env(self):
                                     self.SdkSetup,
                                     self.FxTools,
                                     self.MSBuild,
-                                    self.HTMLWs]),
+                                    self.HTMLWs,
+                                    self.FSharp]),
         )
         if self.vcver >= 14 and os.path.isfile(self.VCRuntimeRedist):
             env['py_vcruntime_redist'] = self.VCRuntimeRedist

From de4bdcffb9f11769465ba3b6bb67cfb8a5b196e2 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 7 Mar 2016 10:33:25 +1100
Subject: [PATCH 5595/8469] Change pkg_resources.Requirement to be a subclass
 of packaging

---
 pkg_resources/__init__.py             | 21 +++++++--------------
 pkg_resources/tests/test_resources.py |  2 +-
 setuptools/command/easy_install.py    |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2fb7bc5101..af336deb34 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2754,33 +2754,26 @@ def parse_requirements(strs):
         yield Requirement(line)
 
 
-class Requirement:
+class Requirement(packaging.requirements.Requirement):
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         try:
-            self.req = packaging.requirements.Requirement(requirement_string)
+            super(Requirement, self).__init__(requirement_string)
         except packaging.requirements.InvalidRequirement as e:
             raise RequirementParseError(str(e))
-        self.unsafe_name = self.req.name
-        project_name = safe_name(self.req.name)
-        self.project_name, self.key = project_name, project_name.lower()
-        self.specifier = self.req.specifier
+        self.unsafe_name = self.name
+        self.project_name, self.key = self.name, self.name.lower()
         self.specs = [
-            (spec.operator, spec.version) for spec in self.req.specifier]
-        self.extras = tuple(map(safe_extra, self.req.extras))
-        self.marker = self.req.marker
-        self.url = self.req.url
+            (spec.operator, spec.version) for spec in self.specifier]
+        self.extras = tuple(map(safe_extra, self.extras))
         self.hashCmp = (
             self.key,
             self.specifier,
             frozenset(self.extras),
-            str(self.marker)
+            str(self.marker) if self.marker else None,
         )
         self.__hash = hash(self.hashCmp)
 
-    def __str__(self):
-        return str(self.req)
-
     def __eq__(self, other):
         return (
             isinstance(other, Requirement) and
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 16fc319808..5f08400171 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -394,7 +394,7 @@ def testOptionsAndHashing(self):
                 "twisted",
                 packaging.specifiers.SpecifierSet(">=1.2"),
                 frozenset(["foo","bar"]),
-                'None'
+                None
             ))
         )
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 97de339544..0733065e19 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -710,7 +710,7 @@ def process_distribution(self, requirement, dist, deps=True, *info):
         elif requirement is None or dist not in requirement:
             # if we wound up with a different version, resolve what we've got
             distreq = dist.as_requirement()
-            requirement = Requirement(str(distreq.req))
+            requirement = Requirement(str(distreq))
         log.info("Processing dependencies for %s", requirement)
         try:
             distros = WorkingSet([]).resolve(

From bd090b8067e77d30325f5b8acc22f9b323c7c222 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 7 Mar 2016 14:41:53 +1100
Subject: [PATCH 5596/8469] Add in safe_name for project_name, which
 disappeared in my refactor.

---
 pkg_resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index af336deb34..03def160af 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2762,7 +2762,8 @@ def __init__(self, requirement_string):
         except packaging.requirements.InvalidRequirement as e:
             raise RequirementParseError(str(e))
         self.unsafe_name = self.name
-        self.project_name, self.key = self.name, self.name.lower()
+        project_name = safe_name(self.name)
+        self.project_name, self.key = project_name, project_name.lower()
         self.specs = [
             (spec.operator, spec.version) for spec in self.specifier]
         self.extras = tuple(map(safe_extra, self.extras))

From 280cce52534dc639fbb2064fa2e2d1e597901882 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 8 Mar 2016 10:38:59 +1100
Subject: [PATCH 5597/8469] Add in a test that checks comparsion of Requirement
 with markers

---
 pkg_resources/tests/test_resources.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 5f08400171..1444b9ba06 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -509,6 +509,28 @@ def testSimpleRequirements(self):
         with pytest.raises(ValueError):
             Requirement.parse("#")
 
+    def test_requirements_with_markers(self):
+        assert (
+            Requirement.parse("foobar;os_name=='a'")
+            ==
+            Requirement.parse("foobar;os_name=='a'")
+        )
+        assert (
+            Requirement.parse("name==1.1;python_version=='2.7'")
+            !=
+            Requirement.parse("name==1.1;python_version=='3.3'")
+        )
+        assert (
+            Requirement.parse("name==1.0;python_version=='2.7'")
+            !=
+            Requirement.parse("name==1.2;python_version=='2.7'")
+        )
+        assert (
+            Requirement.parse("name[foo]==1.0;python_version=='3.3'")
+            !=
+            Requirement.parse("name[foo,bar]==1.0;python_version=='3.3'")
+        )
+
     def test_local_version(self):
         req, = parse_requirements('foo==1.0.org1')
 

From 2ddbf6a51af22fafb50ed1e979413c4168bcff60 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2016 17:10:59 -0400
Subject: [PATCH 5598/8469] Update changelog

---
 CHANGES.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b7325031ee..630df9622d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+20.3
+----
+
+* Pull Request #179: ``pkg_resources.Requirement`` objects are
+  now a subclass of ``packaging.requirements.Requirement``,
+  allowing any environment markers and url (if any) to be
+  affiliated with the requirement
+* Pull Request #179: Restore use of RequirementParseError
+  exception unintentionally dropped in 20.2.
+
 20.2.2
 ------
 

From 8dec43f3a33ece894c182b1e681e5e205ba391f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2016 17:11:08 -0400
Subject: [PATCH 5599/8469] Bumped to 20.3 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 10f3ca212a..7e20c8bf5a 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.2.3'
+__version__ = '20.3'

From 5029eaeaaaa4dba80111db659618024603dda41e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2016 17:11:10 -0400
Subject: [PATCH 5600/8469] Added tag 20.3 for changeset 9c55a3a1268a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0ab43c5805..d195692d92 100644
--- a/.hgtags
+++ b/.hgtags
@@ -249,3 +249,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2
 1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1
 48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2
+9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3

From e570a849413f3325c3583afa1fe4f083c9302f92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Mar 2016 17:13:38 -0400
Subject: [PATCH 5601/8469] Bumped to 20.4 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 7e20c8bf5a..ae23d3a2fc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.3'
+__version__ = '20.4'

From ae6ebd7837573c7f86b07b14725937b3f9d43d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Thu, 17 Mar 2016 01:10:15 +0000
Subject: [PATCH 5602/8469] Remove the import hook when unloading the old
 pkg_resources modules

--HG--
branch : agronholm/remove-the-import-hook-when-unloading-th-1458177009332
---
 ez_setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 9715bdc7b0..4faa52183c 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -192,6 +192,11 @@ def _conflict_bail(VC_err, version):
 
 
 def _unload_pkg_resources():
+    from pkg_resources.extern import VendorImporter
+    sys.meta_path = [importer for importer in sys.meta_path if
+                     not isinstance(importer, VendorImporter)]
+    del VendorImporter
+
     del_modules = [
         name for name in sys.modules
         if name.startswith('pkg_resources')

From bc618da735a02a1cebb85fd979ccdd317b308276 Mon Sep 17 00:00:00 2001
From: Alexey Kotlyarov <a@koterpillar.com>
Date: Thu, 17 Mar 2016 16:06:41 +1100
Subject: [PATCH 5603/8469] Remove CVS and Subversion references in
 include_package_data docs

---
 docs/setuptools.txt | 96 +++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 61 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 610a0e613d..d267bf2914 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -258,10 +258,9 @@ unless you need the associated ``setuptools`` feature.
 
 ``include_package_data``
     If set to ``True``, this tells ``setuptools`` to automatically include any
-    data files it finds inside your package directories, that are either under
-    CVS or Subversion control, or which are specified by your ``MANIFEST.in``
-    file.  For more information, see the section below on `Including Data
-    Files`_.
+    data files it finds inside your package directories that are specified by
+    your ``MANIFEST.in`` file.  For more information, see the section below on
+    `Including Data Files`_.
 
 ``exclude_package_data``
     A dictionary mapping package names to lists of glob patterns that should
@@ -785,17 +784,15 @@ e.g.::
     )
 
 This tells setuptools to install any data files it finds in your packages.
-The data files must be under CVS or Subversion control, or else they must be
-specified via the distutils' ``MANIFEST.in`` file.  (They can also be tracked
-by another revision control system, using an appropriate plugin.  See the
-section below on `Adding Support for Other Revision Control Systems`_ for
-information on how to write such plugins.)
-
-If the data files are not under version control, or are not in a supported
-version control system, or if you want finer-grained control over what files
-are included (for example, if you have documentation files in your package
-directories and want to exclude them from installation), then you can also use
-the ``package_data`` keyword, e.g.::
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+(They can also be tracked by a revision control system, using an appropriate
+plugin.  See the section below on `Adding Support for Revision Control
+Systems`_ for information on how to write such plugins.)
+
+If you want finer-grained control over what files are included (for example,
+if you have documentation files in your package directories and want to exclude
+them from installation), then you can also use the ``package_data`` keyword,
+e.g.::
 
     from setuptools import setup, find_packages
     setup(
@@ -853,8 +850,7 @@ converts slashes to appropriate platform-specific separators at build time.
 Python 2.4; there is `some documentation for the feature`__ available on the
 python.org website.  If using the setuptools-specific ``include_package_data``
 argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are tracked by a supported version control
-system, or are listed in the MANIFEST.in file.)
+added to the manifest unless they are listed in the MANIFEST.in file.)
 
 __ http://docs.python.org/dist/node11.html
 
@@ -887,8 +883,7 @@ included as a result of using ``include_package_data``.
 In summary, the three options allow you to:
 
 ``include_package_data``
-    Accept all data files and directories matched by ``MANIFEST.in`` or found
-    in source control.
+    Accept all data files and directories matched by ``MANIFEST.in``.
 
 ``package_data``
     Specify additional patterns to match files and directories that may or may
@@ -1231,15 +1226,14 @@ Your Project's Dependencies
     target audience isn't able to compile packages (e.g. most Windows users)
     and your package or some of its dependencies include C code.
 
-Subversion or CVS Users and Co-Developers
+Revision Control System Users and Co-Developers
     Users and co-developers who are tracking your in-development code using
-    CVS, Subversion, or some other revision control system should probably read
-    this manual's sections regarding such development.  Alternately, you may
-    wish to create a quick-reference guide containing the tips from this manual
-    that apply to your particular situation.  For example, if you recommend
-    that people use ``setup.py develop`` when tracking your in-development
-    code, you should let them know that this needs to be run after every update
-    or commit.
+    a revision control system should probably read this manual's sections
+    regarding such development.  Alternately, you may wish to create a
+    quick-reference guide containing the tips from this manual that apply to
+    your particular situation.  For example, if you recommend that people use
+    ``setup.py develop`` when tracking your in-development code, you should let
+    them know that this needs to be run after every update or commit.
 
     Similarly, if you remove modules or data files from your project, you
     should remind them to run ``setup.py clean --all`` and delete any obsolete
@@ -1467,25 +1461,10 @@ use the appropriate defaults.)
 Generating Source Distributions
 -------------------------------
 
-``setuptools`` enhances the distutils' default algorithm for source file
-selection, so that all files managed by CVS or Subversion in your project tree
-are included in any source distribution you build.  This is a big improvement
-over having to manually write a ``MANIFEST.in`` file and try to keep it in
-sync with your project.  So, if you are using CVS or Subversion, and your
-source distributions only need to include files that you're tracking in
-revision control, don't create a ``MANIFEST.in`` file for your project.
-(And, if you already have one, you might consider deleting it the next time
-you would otherwise have to change it.)
-
-(NOTE: other revision control systems besides CVS and Subversion can be
-supported using plugins; see the section below on `Adding Support for Other
-Revision Control Systems`_ for information on how to write such plugins.)
-
-If you need to include automatically generated files, or files that are kept in
-an unsupported revision control system, you'll need to create a ``MANIFEST.in``
-file to specify any files that the default file location algorithm doesn't
-catch.  See the distutils documentation for more information on the format of
-the ``MANIFEST.in`` file.
+If you need to include automatically generated files, you'll need to create a
+``MANIFEST.in`` file to specify any files that the default file location
+algorithm doesn't catch.  See the distutils documentation for more information
+on the format of the ``MANIFEST.in`` file.
 
 But, be sure to ignore any part of the distutils documentation that deals with
 ``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
@@ -1501,12 +1480,6 @@ the options that the distutils' more complex ``sdist`` process requires.  For
 all practical purposes, you'll probably use only the ``--formats`` option, if
 you use any option at all.
 
-(By the way, if you're using some other revision control system, you might
-consider creating and publishing a `revision control plugin for setuptools`_.)
-
-
-.. _revision control plugin for setuptools: `Adding Support for Other Revision Control Systems`_
-
 
 Making your package available for EasyInstall
 ---------------------------------------------
@@ -1687,9 +1660,10 @@ Of course, for this to work, your source distributions must include the C
 code generated by Pyrex, as well as your original ``.pyx`` files.  This means
 that you will probably want to include current ``.c`` files in your revision
 control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files.  This will ensure that people tracking your project in CVS or
-Subversion will be able to build it even if they don't have Pyrex installed,
-and that your source releases will be similarly usable with or without Pyrex.
+source files.  This will ensure that people tracking your project in a revision
+control system will be able to build it even if they don't have Pyrex
+installed, and that your source releases will be similarly usable with or
+without Pyrex.
 
 
 -----------------
@@ -2569,15 +2543,15 @@ the ``cmd`` object's ``write_file()``, ``delete_file()``, and
 those methods' docstrings for more details.
 
 
-Adding Support for Other Revision Control Systems
+Adding Support for Revision Control Systems
 -------------------------------------------------
 
 If you would like to create a plugin for ``setuptools`` to find files in
-source control systems, you can do so by adding an
-entry point to the ``setuptools.file_finders`` group.  The entry point should
-be a function accepting a single directory name, and should yield
-all the filenames within that directory (and any subdirectories thereof) that
-are under revision control.
+source control systems, you can do so by adding an entry point to the
+``setuptools.file_finders`` group.  The entry point should be a function
+accepting a single directory name, and should yield all the filenames within
+that directory (and any subdirectories thereof) that are under revision
+control.
 
 For example, if you were going to create a plugin for a revision control system
 called "foobar", you would write a function something like this:

From 071e0ed8fea0ab719a9b4a7d1f71c27a5754b819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Thu, 17 Mar 2016 05:56:44 +0000
Subject: [PATCH 5604/8469] Safer way to remove the import hook

--HG--
branch : agronholm/remove-the-import-hook-when-unloading-th-1458177009332
---
 ez_setup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index 4faa52183c..d6f4b78cb7 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -192,11 +192,8 @@ def _conflict_bail(VC_err, version):
 
 
 def _unload_pkg_resources():
-    from pkg_resources.extern import VendorImporter
     sys.meta_path = [importer for importer in sys.meta_path if
-                     not isinstance(importer, VendorImporter)]
-    del VendorImporter
-
+                     importer.__class__.__module__ != 'pkg_resources.extern']
     del_modules = [
         name for name in sys.modules
         if name.startswith('pkg_resources')

From db587f4f8c93b6630f6a07f984ce68d0918b929f Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Fri, 18 Mar 2016 15:33:08 +1100
Subject: [PATCH 5605/8469] Update documentation for ``Requirement``.

---
 docs/pkg_resources.txt | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 3d40a1a242..7b979ec303 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -590,20 +590,7 @@ Requirements Parsing
     parse multiple specifiers from a string or iterable of strings, use
     ``parse_requirements()`` instead.)
 
-    The syntax of a requirement specifier can be defined in EBNF as follows::
-
-        requirement  ::= project_name extras? versionspec?
-        versionspec  ::= comparison version (',' comparison version)*
-        comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '==='
-        extras       ::= '[' extralist? ']'
-        extralist    ::= identifier (',' identifier)*
-        project_name ::= identifier
-        identifier   ::= [-A-Za-z0-9_]+
-        version      ::= [-A-Za-z0-9_.]+
-
-    Tokens can be separated by whitespace, and a requirement can be continued
-    over multiple lines using a backslash (``\\``).  Line-end comments (using
-    ``#``) are also allowed.
+    The syntax of a requirement specifier is defined in full in PEP 508.
 
     Some examples of valid requirement specifiers::
 
@@ -611,6 +598,7 @@ Requirements Parsing
         Fizzy [foo, bar]
         PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1
         SomethingWhoseVersionIDontCareAbout
+        SomethingWithMarker[foo]>1.0;python_version<"2.7"
 
     The project name is the only required portion of a requirement string, and
     if it's the only thing supplied, the requirement will accept any version
@@ -631,6 +619,11 @@ Requirements Parsing
     ``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary
     distributions to sys.path at runtime.
 
+    The "markers" in a requirement are used to specify when a requirement
+    should be installed -- the requirement will be installed if the marker
+    evaluates as true in the current environment. For example, specifying
+    ``argparse;python_version<"2.7"`` will not install in an Python 2.7 or 3.3
+    environment, but will in a Python 2.6 environment.
 
 ``Requirement`` Methods and Attributes
 --------------------------------------
@@ -680,6 +673,12 @@ Requirements Parsing
     order.  The `op` in each tuple is a comparison operator, represented as
     a string.  The `version` is the (unparsed) version number.
 
+``marker``
+    An instance of ``packaging.markers.Marker`` that allows evaluation
+    against the current environment. May be None if no marker specified.
+
+``url``
+    The location to download the requirement from if specified.
 
 Entry Points
 ============

From dc04903df2b3820d11e3600bf52d1aa457044e35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2016 10:43:13 -0400
Subject: [PATCH 5606/8469] Update changelog

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 630df9622d..755c7ab6b2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+20.3.1
+------
+
+* Issue #519: Remove import hook when reloading the
+  ``pkg_resources`` module.
+
 20.3
 ----
 

From d8d4272a7ead62a39679b1beb599d3d1d72a6bfa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2016 10:49:00 -0400
Subject: [PATCH 5607/8469] Update changelog

---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 755c7ab6b2..c01c6e7749 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ CHANGES
 
 * Issue #519: Remove import hook when reloading the
   ``pkg_resources`` module.
+* Pull Request #184: Update documentation in ``pkg_resources``
+  around new ``Requirement`` implementation.
 
 20.3
 ----

From 42b002c05ca3ea382cd2ee90563556c9efd3b5e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2016 11:14:00 -0400
Subject: [PATCH 5608/8469] Bumped to 20.3.1 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index ae23d3a2fc..16d59e449d 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.4'
+__version__ = '20.3.1'

From af0a412ebc9f8e58941883f81522d5ff4c808067 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2016 11:14:01 -0400
Subject: [PATCH 5609/8469] Added tag 20.3.1 for changeset 3e87e975a95c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d195692d92..49c22e51a3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -250,3 +250,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1
 48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2
 9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3
+3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1

From 11fef28599ccefe77ae61c47c7b2ee183e267508 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Mar 2016 11:16:38 -0400
Subject: [PATCH 5610/8469] Bumped to 20.3.2 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 16d59e449d..a92101a109 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.3.1'
+__version__ = '20.3.2'

From 741f3bbcbbbd73076a44100a0e112f6dd86864b6 Mon Sep 17 00:00:00 2001
From: Alexey Kotlyarov <a@koterpillar.com>
Date: Sun, 20 Mar 2016 20:27:59 +1100
Subject: [PATCH 5611/8469] Point towards SCM plugins for including source
 files

---
 docs/setuptools.txt | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d267bf2914..886216ea37 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1461,10 +1461,18 @@ use the appropriate defaults.)
 Generating Source Distributions
 -------------------------------
 
-If you need to include automatically generated files, you'll need to create a
-``MANIFEST.in`` file to specify any files that the default file location
-algorithm doesn't catch.  See the distutils documentation for more information
-on the format of the ``MANIFEST.in`` file.
+``setuptools`` enhances the distutils' default algorithm for source file
+selection with pluggable endpoints for looking up files to include. If you are
+using a revision control system, and your source distributions only need to
+include files that you're tracking in revision control, use a corresponding
+plugin instead of writing a ``MANIFEST.in`` file. See the section below on
+`Adding Support for Revision Control Systems`_ for information on plugins.
+
+If you need to include automatically generated files, or files that are kept in
+an unsupported revision control system, you'll need to create a ``MANIFEST.in``
+file to specify any files that the default file location algorithm doesn't
+catch.  See the distutils documentation for more information on the format of
+the ``MANIFEST.in`` file.
 
 But, be sure to ignore any part of the distutils documentation that deals with
 ``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
@@ -2546,9 +2554,15 @@ those methods' docstrings for more details.
 Adding Support for Revision Control Systems
 -------------------------------------------------
 
-If you would like to create a plugin for ``setuptools`` to find files in
-source control systems, you can do so by adding an entry point to the
-``setuptools.file_finders`` group.  The entry point should be a function
+If the files you want to include in the source distribution are tracked using
+Git, Mercurial or SVN, you can use the following packages to achieve that:
+
+- Git and Mercurial: `setuptools_scm <https://pypi.python.org/pypi/setuptools_scm>`_
+- SVN: `setuptools_svn <https://pypi.python.org/pypi/setuptools_svn>`_
+
+If you would like to create a plugin for ``setuptools`` to find files tracked
+by another revision control system, you can do so by adding an entry point to
+the ``setuptools.file_finders`` group.  The entry point should be a function
 accepting a single directory name, and should yield all the filenames within
 that directory (and any subdirectories thereof) that are under revision
 control.

From 07a1c6988ad6b270a29b1059b7ec71191d67c9bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Mar 2016 15:12:30 -0400
Subject: [PATCH 5612/8469] Rename variables for clarity and easier
 troubleshooting (avoid masking intermediate 'parts' value).

---
 pkg_resources/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 03def160af..0534f54fca 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2028,12 +2028,13 @@ def _rebuild_mod_path(orig_path, package_name, module):
     corresponding to their sys.path order
     """
     sys_path = [_normalize_cached(p) for p in sys.path]
-    def position_in_sys_path(p):
+    def position_in_sys_path(path):
         """
         Return the ordinal of the path based on its position in sys.path
         """
-        parts = p.split(os.sep)
-        parts = parts[:-(package_name.count('.') + 1)]
+        path_parts = path.split(os.sep)
+        module_parts = package_name.count('.') + 1
+        parts = path_parts[:-module_parts]
         return sys_path.index(_normalize_cached(os.sep.join(parts)))
 
     orig_path.sort(key=position_in_sys_path)

From 2d8cb89459af1d68f7efd7da902c9e6954504740 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Thu, 24 Mar 2016 11:37:38 +1100
Subject: [PATCH 5613/8469] Support environment markers in *_requires, via
 WorkingSet.

---
 pkg_resources/__init__.py             |  4 ++
 pkg_resources/tests/test_resources.py |  5 +++
 setuptools/tests/test_egg_info.py     | 63 +++++++++++++++++++++++----
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0534f54fca..bb69b60744 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -809,6 +809,10 @@ def resolve(self, requirements, env=None, installer=None,
             if req in processed:
                 # Ignore cyclic or redundant dependencies
                 continue
+            # If the req has a marker, evaluate it -- skipping the req if
+            # it evaluates to False.
+            if req.marker and not req.marker.evaluate():
+                continue
             dist = best.get(req.key)
             if dist is None:
                 # Find the best distribution and add it to the map
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 1444b9ba06..1d3d5315ea 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -182,6 +182,11 @@ def testResolve(self):
         msg = 'Foo 0.9 is installed but Foo==1.2 is required'
         assert vc.value.report() == msg
 
+        ws = WorkingSet([]) # reset
+        # Environment markers are evaluated at resolution time
+        res = ws.resolve(parse_requirements("Foo;python_version<'2'"), ad)
+        assert list(res) == []
+
     def testDistroDependsOptions(self):
         d = self.distRequires("""
             Twisted>=1.5
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7d51585b1f..6aed315ff7 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,4 +1,5 @@
 import os
+import glob
 import stat
 
 from setuptools.extern.six.moves import map
@@ -89,17 +90,61 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
 
-    def _run_install_command(self, tmpdir_cwd, env):
+    def _setup_script_with_requires(self, requires_line):
+        setup_script = DALS("""
+            from setuptools import setup
+
+            setup(
+                name='foo',
+                %s
+                zip_safe=False,
+            )
+            """ % requires_line)
+        build_files({
+            'setup.py': setup_script,
+            })
+
+    def test_install_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """install_requires=["barbazquux;python_version<'2'"],""")
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        assert "barbazquux;python_version<'2'" in open(
+            requires_txt).read().split('\n')
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_setup_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """setup_requires=["barbazquux;python_version<'2'"],""")
+        self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_tests_require_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """tests_require=["barbazquux;python_version<'2'"],""")
+        data = self._run_install_command(
+            tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extra_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """extra_requires={":python_version<'2'": ["barbazquux"]},""")
+        self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
-        cmd = [
-            'install',
-            '--home', env.paths['home'],
-            '--install-lib', env.paths['lib'],
-            '--install-scripts', env.paths['scripts'],
-            '--install-data', env.paths['data'],
-        ]
+        if cmd is None:
+            cmd = [
+                'install',
+                '--home', env.paths['home'],
+                '--install-lib', env.paths['lib'],
+                '--install-scripts', env.paths['scripts'],
+                '--install-data', env.paths['data'],
+            ]
         code, data = environment.run_setup_py(
             cmd=cmd,
             pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
@@ -108,6 +153,8 @@ def _run_install_command(self, tmpdir_cwd, env):
         )
         if code:
             raise AssertionError(data)
+        if output:
+            assert output in data   
 
     def _find_egg_info_files(self, root):
         class DirList(list):

From 0f147d3f3cffda76b6be0fa3e5b396ede7f3bbf2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Mar 2016 09:42:35 -0400
Subject: [PATCH 5614/8469] Extract decision point into a variable

---
 tests/manual_test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index af4ec09bea..808fa55ae0 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -43,10 +43,8 @@ def _tempdir(*args, **kwargs):
 _VARS = {'base': '.',
          'py_version_short': PYVER}
 
-if sys.platform == 'win32':
-    PURELIB = INSTALL_SCHEMES['nt']['purelib']
-else:
-    PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
+scheme = 'nt' if sys.platform == 'win32' else 'unix_prefix'
+PURELIB = INSTALL_SCHEMES[scheme]['purelib']
 
 
 @tempdir

From 7fc3b347bce66eaed9bae410338f6a9f3108a970 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Wed, 30 Mar 2016 02:43:44 +1100
Subject: [PATCH 5615/8469] Update vendored packaging to 16.6

Closes #503
---
 pkg_resources/_vendor/packaging/__about__.py | 2 +-
 pkg_resources/_vendor/packaging/markers.py   | 7 ++++++-
 pkg_resources/_vendor/vendored.txt           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index 47e5a6f58c..baa907556c 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,7 +12,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.5"
+__version__ = "16.6"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index 9e906015f5..bac852df23 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -73,9 +73,14 @@ class Value(Node):
     L("python_version") |
     L("sys_platform") |
     L("os_name") |
+    L("os.name") |  # PEP-345
+    L("sys.platform") |  # PEP-345
+    L("platform.version") |  # PEP-345
+    L("platform.machine") |  # PEP-345
+    L("platform.python_implementation") |  # PEP-345
     L("extra")
 )
-VARIABLE.setParseAction(lambda s, l, t: Variable(t[0]))
+VARIABLE.setParseAction(lambda s, l, t: Variable(t[0].replace('.', '_')))
 
 VERSION_CMP = (
     L("===") |
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index aac1267c62..1d03759ff0 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
-packaging==16.5
+packaging==16.6
 pyparsing==2.0.6
 six==1.10.0

From 3b90be7bb6323eb44d0f28864509c1d47aa098de Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 12:17:06 -0400
Subject: [PATCH 5616/8469] Update most bitbucket references to point to Github
 now. Fixes #422.

---
 CHANGES.txt                           | 79 ++++++++++++++++-----------
 README.txt                            |  4 +-
 docs/conf.py                          |  6 +-
 docs/developer-guide.txt              | 29 +++++-----
 docs/setuptools.txt                   |  2 +-
 pkg_resources/tests/test_resources.py |  2 +-
 release.py                            |  2 +-
 setup.py                              |  2 +-
 setuptools/command/easy_install.py    |  4 +-
 setuptools/command/install.py         |  2 +-
 setuptools/dist.py                    |  4 +-
 11 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c01c6e7749..f44a39841d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,22 +2,35 @@
 CHANGES
 =======
 
+20.4
+----
+
+* Issue #422: Moved hosting to `Github
+  <https://github.com/pypa/setuptools>`_
+  from `Bitbucket <https://bitbucket.org/pypa/setuptools>`_.
+  Issues have been migrated, though all issues and comments
+  are attributed to bb-migration. So if you have a particular
+  issue or issues to which you've been subscribed, you will
+  want to "watch" the equivalent issue in Github.
+  The Bitbucket project will be retained for the indefinite
+  future, but Github now hosts the canonical project repository.
+
 20.3.1
 ------
 
 * Issue #519: Remove import hook when reloading the
   ``pkg_resources`` module.
-* Pull Request #184: Update documentation in ``pkg_resources``
+* BB Pull Request #184: Update documentation in ``pkg_resources``
   around new ``Requirement`` implementation.
 
 20.3
 ----
 
-* Pull Request #179: ``pkg_resources.Requirement`` objects are
+* BB Pull Request #179: ``pkg_resources.Requirement`` objects are
   now a subclass of ``packaging.requirements.Requirement``,
   allowing any environment markers and url (if any) to be
   affiliated with the requirement
-* Pull Request #179: Restore use of RequirementParseError
+* BB Pull Request #179: Restore use of RequirementParseError
   exception unintentionally dropped in 20.2.
 
 20.2.2
@@ -36,11 +49,11 @@ CHANGES
 ----
 
 * Changelog now includes release dates and links to PEPs.
-* Pull Request #173: Replace dual PEP 345 _markerlib implementation
+* BB Pull Request #173: Replace dual PEP 345 _markerlib implementation
   and PEP 426 implementation of environment marker support from
   packaging 16.1 and PEP 508. Fixes Issue #122.
-  See also Pull Request #175, Pull Request #168, and
-  Pull Request #164. Additionally:
+  See also BB Pull Request #175, BB Pull Request #168, and
+  BB Pull Request #164. Additionally:
    - ``Requirement.parse`` no longer retains the order of extras.
    - ``parse_requirements`` now requires that all versions be
      PEP-440 compliant, as revealed in #499. Packages released
@@ -115,7 +128,7 @@ CHANGES
 * Issue #486: Correct TypeError when getfilesystemencoding
   returns None.
 * Issue #139: Clarified the license as MIT.
-* Pull Request #169: Removed special handling of command
+* BB Pull Request #169: Removed special handling of command
   spec in scripts for Jython.
 
 19.4.1
@@ -131,7 +144,7 @@ CHANGES
 * Issue #341: Correct error in path handling of package data
   files in ``build_py`` command when package is empty.
 * Distribute #323, Issue #141, Issue #207, and
-  Pull Request #167: Another implementation of
+  BB Pull Request #167: Another implementation of
   ``pkg_resources.WorkingSet`` and ``pkg_resources.Distribution``
   that supports replacing an extant package with a new one,
   allowing for setup_requires dependencies to supersede installed
@@ -147,8 +160,8 @@ CHANGES
 19.2
 ----
 
-* Pull Request #163: Add get_command_list method to Distribution.
-* Pull Request #162: Add missing whitespace to multiline string
+* BB Pull Request #163: Add get_command_list method to Distribution.
+* BB Pull Request #162: Add missing whitespace to multiline string
   literals.
 
 19.1.1
@@ -204,15 +217,15 @@ CHANGES
 ----
 
 * Update dependency on certify.
-* Pull Request #160: Improve detection of gui script in
+* BB Pull Request #160: Improve detection of gui script in
   ``easy_install._adjust_header``.
 * Made ``test.test_args`` a non-data property; alternate fix
-  for the issue reported in Pull Request #155.
+  for the issue reported in BB Pull Request #155.
 * Issue #453: In ``ez_setup`` bootstrap module, unload all
   ``pkg_resources`` modules following download.
-* Pull Request #158: Honor PEP-488 when excluding
+* BB Pull Request #158: Honor PEP-488 when excluding
   files for namespace packages.
-* Issue #419 and Pull Request #144: Add experimental support for
+* Issue #419 and BB Pull Request #144: Add experimental support for
   reading the version info from distutils-installed metadata rather
   than using the version in the filename.
 
@@ -314,7 +327,7 @@ CHANGES
   However, for systems with this build of setuptools, Cython will be
   downloaded on demand.
 * Issue #396: Fixed test failure on OS X.
-* Pull Request #136: Remove excessive quoting from shebang headers
+* BB Pull Request #136: Remove excessive quoting from shebang headers
   for Jython.
 
 17.1.1
@@ -341,11 +354,11 @@ CHANGES
 16.0
 ----
 
-* Pull Request #130: Better error messages for errors in
+* BB Pull Request #130: Better error messages for errors in
   parsed requirements.
-* Pull Request #133: Removed ``setuptools.tests`` from the
+* BB Pull Request #133: Removed ``setuptools.tests`` from the
   installed packages.
-* Pull Request #129: Address deprecation warning due to usage
+* BB Pull Request #129: Address deprecation warning due to usage
   of imp module.
 
 15.2
@@ -364,7 +377,7 @@ CHANGES
 15.0
 ----
 
-* Pull Request #126: DistributionNotFound message now lists the package or
+* BB Pull Request #126: DistributionNotFound message now lists the package or
   packages that required it. E.g.::
 
       pkg_resources.DistributionNotFound: The 'colorama>=0.3.1' distribution was not found and is required by smlib.log.
@@ -405,7 +418,7 @@ CHANGES
 14.1
 ----
 
-* Pull Request #125: Add ``__ne__`` to Requirement class.
+* BB Pull Request #125: Add ``__ne__`` to Requirement class.
 * Various refactoring of easy_install.
 
 14.0
@@ -413,7 +426,7 @@ CHANGES
 
 * Bootstrap script now accepts ``--to-dir`` to customize save directory or
   allow for re-use of existing repository of setuptools versions. See
-  Pull Request #112 for background.
+  BB Pull Request #112 for background.
 * Issue #285: ``easy_install`` no longer will default to installing
   packages to the "user site packages" directory if it is itself installed
   there. Instead, the user must pass ``--user`` in all cases to install
@@ -438,7 +451,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 13.0
 ----
 
-* Issue #356: Back out Pull Request #119 as it requires Setuptools 10 or later
+* Issue #356: Back out BB Pull Request #119 as it requires Setuptools 10 or later
   as the source during an upgrade.
 * Removed build_py class from setup.py. According to 892f439d216e, this
   functionality was added to support upgrades from old Distribute versions,
@@ -447,7 +460,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 12.4
 ----
 
-* Pull Request #119: Restore writing of ``setup_requires`` to metadata
+* BB Pull Request #119: Restore writing of ``setup_requires`` to metadata
   (previously added in 8.4 and removed in 9.0).
 
 12.3
@@ -472,7 +485,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 12.1
 ----
 
-* Pull Request #118: Soften warning for non-normalized versions in
+* BB Pull Request #118: Soften warning for non-normalized versions in
   Distribution.
 
 12.0.5
@@ -613,7 +626,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 8.4
 ---
 
-* Pull Request #106: Now write ``setup_requires`` metadata.
+* BB Pull Request #106: Now write ``setup_requires`` metadata.
 
 8.3
 ---
@@ -630,7 +643,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 8.2
 ---
 
-* Pull Request #85: Search egg-base when adding egg-info to manifest.
+* BB Pull Request #85: Search egg-base when adding egg-info to manifest.
 
 8.1
 ---
@@ -733,9 +746,9 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   Any users producing distributions with filenames that match those above
   case-insensitively, but not case-sensitively, should rename those files in
   their repository for better portability.
-* Pull Request #72: When using ``single_version_externally_managed``, the
+* BB Pull Request #72: When using ``single_version_externally_managed``, the
   exclusion list now includes Python 3.2 ``__pycache__`` entries.
-* Pull Request #76 and Pull Request #78: lines in top_level.txt are now
+* BB Pull Request #76 and BB Pull Request #78: lines in top_level.txt are now
   ordered deterministically.
 * Issue #118: The egg-info directory is now no longer included in the list
   of outputs.
@@ -934,7 +947,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 3.2
 ---
 
-* Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
+* BB Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files.
 * Issue #162: Update dependency on certifi to 1.0.1.
 * Issue #164: Update dependency on wincertstore to 0.2.
 
@@ -977,7 +990,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   security vulnerabilities presented by use of tar archives in ez_setup.py.
   It also leverages the security features added to ZipFile.extract in Python 2.7.4.
 * Issue #65: Removed deprecated Features functionality.
-* Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
+* BB Pull Request #28: Remove backport of ``_bytecode_filenames`` which is
   available in Python 2.6 and later, but also has better compatibility with
   Python 3 environments.
 * Issue #156: Fix spelling of __PYVENV_LAUNCHER__ variable.
@@ -1073,7 +1086,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 
 * Issue #27: ``easy_install`` will now use credentials from .pypirc if
   present for connecting to the package index.
-* Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
+* BB Pull Request #21: Omit unwanted newlines in ``package_index._encode_auth``
   when the username/password pair length indicates wrapping.
 
 1.3.2
@@ -1415,7 +1428,7 @@ Added several features that were slated for setuptools 0.6c12:
 0.6.36
 ------
 
-* Pull Request #35: In Buildout #64, it was reported that
+* BB Pull Request #35: In Buildout #64, it was reported that
   under Python 3, installation of distutils scripts could attempt to copy
   the ``__pycache__`` directory as a file, causing an error, apparently only
   under Windows. Easy_install now skips all directories when processing
@@ -1490,7 +1503,7 @@ how it parses version numbers.
 0.6.29
 ------
 
-* Pull Request #14: Honor file permissions in zip files.
+* BB Pull Request #14: Honor file permissions in zip files.
 * Distribute #327: Merged pull request #24 to fix a dependency problem with pip.
 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
diff --git a/README.txt b/README.txt
index 799ad0088f..f94c6fcb46 100755
--- a/README.txt
+++ b/README.txt
@@ -18,7 +18,7 @@ basic routine, so below are some examples to get you started.
 
 Setuptools requires Python 2.6 or later. To install setuptools
 on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
-<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
 
 The link provided to ez_setup.py is a bookmark to bootstrap script for the
 latest known stable release.
@@ -176,7 +176,7 @@ them there, so this reference list can be updated.  If you have working,
 *tested* patches to correct problems or add features, you may submit them to
 the `setuptools bug tracker`_.
 
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
 .. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
 .. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
 .. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html
diff --git a/docs/conf.py b/docs/conf.py
index 1a4da380fe..6570f66129 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -208,11 +208,11 @@
 		replace=[
 			dict(
 				pattern=r"(Issue )?#(?P<issue>\d+)",
-				url='{BB}/pypa/setuptools/issue/{issue}',
+				url='{GH}/pypa/setuptools/issues/{issue}',
 			),
 			dict(
-				pattern=r"Pull Request ?#(?P<pull_request>\d+)",
-				url='{BB}/pypa/setuptools/pull-request/{pull_request}',
+				pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
+				url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
 			),
 			dict(
 				pattern=r"Distribute #(?P<distribute>\d+)",
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index ae33649b59..688300dcea 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -23,10 +23,10 @@ quality of contribution.
 Project Management
 ------------------
 
-Setuptools is maintained primarily in Bitbucket at `this home
-<https://bitbucket.org/pypa/setuptools>`_. Setuptools is maintained under the
+Setuptools is maintained primarily in Github at `this home
+<https://github.com/pypa/setuptools>`_. Setuptools is maintained under the
 Python Packaging Authority (PyPA) with several core contributors. All bugs
-for Setuptools are filed and the canonical source is maintained in Bitbucket.
+for Setuptools are filed and the canonical source is maintained in Github.
 
 User support and discussions are done through the issue tracker (for specific)
 issues, through the distutils-sig mailing list, or on IRC (Freenode) at
@@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a
 ticket already exists for your issue. If not, create one. Try to think from
 the perspective of the reader. Explain what behavior you expected, what you
 got instead, and what factors might have contributed to the unexpected
-behavior. In Bitbucket, surround a block of code or traceback with the triple
+behavior. In Github, surround a block of code or traceback with the triple
 backtick "\`\`\`" so that it is formatted nicely.
 
 Filing a ticket provides a forum for justification, discussion, and
@@ -61,17 +61,17 @@ jump to the in-depth discussion about any subject referenced.
 Source Code
 -----------
 
-Grab the code at Bitbucket::
+Grab the code at Github::
 
-    $ hg clone https://bitbucket.org/pypa/setuptools
+    $ git checkout https://github.com/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
-Bitbucket, commit the changes to your repository, and then make a pull request
-on Bitbucket. If you make some changes, don't forget to:
+Github, commit the changes to your repository, and then make a pull request
+on Github. If you make some changes, don't forget to:
 
 - add a note in CHANGES.txt
 
-Please commit all changes in the 'default' branch against the latest available
+Please commit all changes in the 'master' branch against the latest available
 commit or for bug-fixes, against an earlier commit or release in which the
 bug occurred.
 
@@ -79,12 +79,11 @@ If you find yourself working on more than one issue at a time, Setuptools
 generally prefers Git-style branches, so use Mercurial bookmarks or Git
 branches or multiple forks to maintain separate efforts.
 
-Setuptools also maintains an unofficial `Git mirror in Github
-<https://github.com/jaraco/setuptools>`_. Contributors are welcome to submit
-pull requests here, but because they are not integrated with the Bitbucket
-Issue tracker, linking pull requests to tickets is more difficult. The
-Continuous Integration tests that validate every release are run from this
-mirror.
+The Continuous Integration tests that validate every release are run
+from this repository.
+
+For posterity, the old `Bitbucket mirror
+<https://bitbucket.org/pypa/setuptools>`_ is available.
 
 -------
 Testing
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 886216ea37..eeeab93737 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2658,5 +2658,5 @@ confirmed via the list are actual bugs, and which you have reduced to a minimal
 set of steps to reproduce.
 
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 1444b9ba06..f59d55d5f6 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -717,7 +717,7 @@ def test_path_order(self, symlinked_tmpdir):
         sys.path is imported, and that the namespace package's __path__ is in
         the correct order.
 
-        Regression test for https://bitbucket.org/pypa/setuptools/issues/207
+        Regression test for https://github.com/pypa/setuptools/issues/207
         """
 
         tmpdir = symlinked_tmpdir
diff --git a/release.py b/release.py
index dd1d6a1caf..a55643838c 100644
--- a/release.py
+++ b/release.py
@@ -15,6 +15,6 @@
 # bdist_wheel must be included or pip will break
 dist_commands = 'sdist', 'bdist_wheel'
 
-test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
+test_info = "Travis-CI tests: http://travis-ci.org/#!/pypa/setuptools"
 
 os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
diff --git a/setup.py b/setup.py
index a59d374d4f..b26190ff50 100755
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,7 @@ def _gen_console_scripts():
     author_email="distutils-sig@python.org",
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
-    url="https://bitbucket.org/pypa/setuptools",
+    url="https://github.com/pypa/setuptools",
     src_root=src_root,
     packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0733065e19..ea5cb028a5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -780,7 +780,7 @@ def _load_template(dev_path):
         There are a couple of template scripts in the package. This
         function loads one of them and prepares it for use.
         """
-        # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+        # See https://github.com/pypa/setuptools/issues/134 for info
         # on script file naming and downstream issues with SVR4
         name = 'script.tmpl'
         if dev_path:
@@ -1762,7 +1762,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
         #  * Does not support the dict.pop() method, forcing us to use the
         #    get/del patterns instead. For more detailed information see the
         #    following links:
-        #      https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+        #      https://github.com/pypa/setuptools/issues/202#issuecomment-202913420
         #      https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
         old_entry = cache[p]
         del cache[p]
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index d2bca2ec59..31a5ddb577 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -8,7 +8,7 @@
 import setuptools
 
 # Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
-# now. See https://bitbucket.org/pypa/setuptools/issue/199/
+# now. See https://github.com/pypa/setuptools/issues/199/
 _install = orig.install
 
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7785541582..086e0a587f 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -720,7 +720,7 @@ class Feature:
     """
     **deprecated** -- The `Feature` facility was never completely implemented
     or supported, `has reported issues
-    <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
+    <https://github.com/pypa/setuptools/issues/58>`_ and will be removed in
     a future version.
 
     A subset of the distribution that can be excluded if unneeded/wanted
@@ -777,7 +777,7 @@ class Feature:
     def warn_deprecated():
         warnings.warn(
             "Features are deprecated and will be removed in a future "
-                "version. See http://bitbucket.org/pypa/setuptools/65.",
+                "version. See https://github.com/pypa/setuptools/issues/65.",
             DeprecationWarning,
             stacklevel=3,
         )

From 05a9f1d0e3d8cceb95a7c8345ee4fa2ae804280e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 12:29:03 -0400
Subject: [PATCH 5617/8469] Bumped to 20.4 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index a92101a109..ae23d3a2fc 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.3.2'
+__version__ = '20.4'

From 5fcd3ff51a0fee030e74a6b96ea688ae537a281d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 12:29:05 -0400
Subject: [PATCH 5618/8469] Added tag 20.4 for changeset 06692c64fb9b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 49c22e51a3..cf8443bbc1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -251,3 +251,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2
 9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3
 3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1
+06692c64fb9b5843331a918ab7093f151412ec8e 20.4

From 87e29214dcffdd456bafa4f7ba5174fe383c01b2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 12:31:47 -0400
Subject: [PATCH 5619/8469] Bumped to 20.5 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index ae23d3a2fc..b70b51e35b 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.4'
+__version__ = '20.5'

From 2f95af84d585c19a8eb6a8e6d437acdbe3c3d2ae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 13:02:42 -0400
Subject: [PATCH 5620/8469] Use jaraco.packaging 2.11 for better support for
 bookmarks and thus Git push targets.

---
 release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.py b/release.py
index a55643838c..cd4848f014 100644
--- a/release.py
+++ b/release.py
@@ -7,7 +7,7 @@
 
 import pkg_resources
 
-pkg_resources.require('jaraco.packaging>=2.0')
+pkg_resources.require('jaraco.packaging>=2.11')
 pkg_resources.require('wheel')
 
 files_with_versions = 'setuptools/version.py',

From dd0c78d26b7510481bc4587c9bb5a6fbfd2b5c8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 13:13:18 -0400
Subject: [PATCH 5621/8469] Just render the date and not the time of tagged
 releases in the changelog.

---
 docs/conf.py | 2 +-
 setup.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6570f66129..1bf9c33489 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -256,7 +256,7 @@
 			),
 			dict(
 				pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n[-=]+\n",
-				with_scm="{text}\n{rev[timestamp]}\n",
+				with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
 			),
 		],
 	),
diff --git a/setup.py b/setup.py
index b26190ff50..7986906d7c 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ def _gen_console_scripts():
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else []
+sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
 
 setup_params = dict(
     name="setuptools",

From 378a5bb49a004ee34a446e208a3bcbb4e9d732ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 13:13:38 -0400
Subject: [PATCH 5622/8469] Added tag 20.5 for changeset f8174392e9e9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cf8443bbc1..06e21d5121 100644
--- a/.hgtags
+++ b/.hgtags
@@ -252,3 +252,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3
 3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1
 06692c64fb9b5843331a918ab7093f151412ec8e 20.4
+f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5

From ca90f3cf6b2604f49256f04ff8147dfee707ce59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 13:16:16 -0400
Subject: [PATCH 5623/8469] Bumped to 20.6 in preparation for next release.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index b70b51e35b..6496a76f28 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '20.5'
+__version__ = '20.6'

From a04851c3e7b7e2b87f62d2de7e54c97c87881fcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:12:30 -0400
Subject: [PATCH 5624/8469] Attempting a new streamlined, Travis-powered
 release process.

---
 .travis.yml           | 10 ++++++++++
 CHANGES.txt           |  7 +++++++
 docs/releases.txt     | 27 ++++++++++-----------------
 release.py            | 20 --------------------
 setup.cfg             | 17 +++++++++++++++--
 setup.py              | 11 ++++-------
 setuptools/version.py |  4 +++-
 7 files changed, 49 insertions(+), 47 deletions(-)
 delete mode 100644 release.py

diff --git a/.travis.yml b/.travis.yml
index ae14639aeb..e93c3750d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,3 +27,13 @@ script:
 
  # test the bootstrap script
  - python ez_setup.py
+before_deploy:
+  - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
+deploy:
+  provider: pypi
+  on:
+    tags: true
+  user: jaraco
+  password:
+    secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
+  distributions: release
diff --git a/CHANGES.txt b/CHANGES.txt
index a784c33cc9..c95017d91c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+20.6
+----
+
+* New release process that relies on
+  `bumpversion <https://github.com/peritus/bumpversion>`_
+  and Travis CI for continuous deployment.
+
 20.5
 ----
 
diff --git a/docs/releases.txt b/docs/releases.txt
index a9742c2076..3f29334a99 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -3,19 +3,14 @@ Release Process
 ===============
 
 In order to allow for rapid, predictable releases, Setuptools uses a
-mechanical technique for releases. The release script, ``release.py`` in the
-repository, defines the details of the releases, and is executed by the
-`jaraco.packaging <https://bitbucket.org/jaraco/jaraco.packaging>`_ release
-module. The script does some checks (some interactive) and fully automates
-the release process.
+mechanical technique for releases, enacted by Travis following a
+successful build of a tagged release per
+`PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
 
-A Setuptools release manager must have maintainer access on PyPI to the
-project and administrative access to the Bitbucket project.
-
-To make a release, run the following from a Mercurial checkout at the
-revision slated for release::
-
-    python -m jaraco.packaging.release
+To cut a release, install and run ``bumpversion {part}`` where ``part``
+is major, minor, or patch based on the scope of the changes in the
+release. Then, push the commits to the master branch. If tests pass,
+the release will be uploaded to PyPI.
 
 Bootstrap Bookmark
 ------------------
@@ -23,7 +18,7 @@ Bootstrap Bookmark
 Setuptools has a bootstrap script (ez_setup.py) which is hosted in the
 repository and must be updated with each release (to bump the default version).
 The "published" version of the script is the one indicated by the ``bootstrap``
-bookmark (Mercurial) or branch (Git).
+branch.
 
 Therefore, the latest bootstrap script can be retrieved by checking out the
 repository at that bookmark. It's also possible to get the bootstrap script for
@@ -57,7 +52,5 @@ corrected quickly, in many cases before other users have yet to encounter them.
 Release Managers
 ----------------
 
-Jason R. Coombs is the primary release manager. Additionally, the following
-people have access to create releases:
-
-- Matthew Iversen (Ivoz)
+Additionally, anyone with push access to the master branch has access to cut
+releases.
diff --git a/release.py b/release.py
deleted file mode 100644
index cd4848f014..0000000000
--- a/release.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Setuptools is released using 'jaraco.packaging.release'. To make a release,
-install jaraco.packaging and run 'python -m jaraco.packaging.release'
-"""
-
-import os
-
-import pkg_resources
-
-pkg_resources.require('jaraco.packaging>=2.11')
-pkg_resources.require('wheel')
-
-files_with_versions = 'setuptools/version.py',
-
-# bdist_wheel must be included or pip will break
-dist_commands = 'sdist', 'bdist_wheel'
-
-test_info = "Travis-CI tests: http://travis-ci.org/#!/pypa/setuptools"
-
-os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
diff --git a/setup.cfg b/setup.cfg
index a6da2c7771..72967fa40a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,10 @@
 [egg_info]
-tag_build = dev
+tag_build = .post
+tag_date = 1
 
 [aliases]
-release = egg_info -RDb ''
+clean_egg_info = egg_info -RDb ''
+release = clean_egg_info build_sphinx sdist bdist_wheel upload_docs
 source = register sdist binary
 binary = bdist_egg upload --show-response
 test = pytest
@@ -20,3 +22,14 @@ formats = gztar zip
 
 [wheel]
 universal=1
+
+[bumpversion]
+current_version = 20.5
+commit = True
+tag = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?
+serialize=
+  {major}.{minor}.{patch}
+  {major}.{minor}
+
+[bumpversion:file:setup.py]
diff --git a/setup.py b/setup.py
index 7986906d7c..021edab3a5 100755
--- a/setup.py
+++ b/setup.py
@@ -22,11 +22,6 @@
 
 SETUP_COMMANDS = command_ns['__all__']
 
-main_ns = {}
-ver_path = convert_path('setuptools/version.py')
-with open(ver_path) as ver_file:
-    exec(ver_file.read(), main_ns)
-
 import setuptools
 
 scripts = []
@@ -68,10 +63,12 @@ def _gen_console_scripts():
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
 sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
+needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
+wheel = ['wheel'] if needs_wheel else []
 
 setup_params = dict(
     name="setuptools",
-    version=main_ns['__version__'],
+    version="20.5",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",
@@ -161,7 +158,7 @@ def _gen_console_scripts():
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-    ] + sphinx + pytest_runner,
+    ] + sphinx + pytest_runner + wheel,
 )
 
 if __name__ == '__main__':
diff --git a/setuptools/version.py b/setuptools/version.py
index 6496a76f28..2f94302727 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1,3 @@
-__version__ = '20.6'
+import pkg_resources
+
+__version__ = pkg_resources.require('setuptools')[0].version

From af4b8f9370b9e18a9f5fe43e17161533e1a31646 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:18:14 -0400
Subject: [PATCH 5625/8469] Follow semver to the letter for simplicity.

---
 CHANGES.txt              | 6 ++++--
 docs/developer-guide.txt | 5 +----
 setup.cfg                | 6 +-----
 setup.py                 | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c95017d91c..abd5f24b04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,12 +2,14 @@
 CHANGES
 =======
 
-20.6
-----
+v20.6.0
+-------
 
 * New release process that relies on
   `bumpversion <https://github.com/peritus/bumpversion>`_
   and Travis CI for continuous deployment.
+* Project versioning semantics now follow
+  `semver <https://semver.org>`_ precisely.
 
 20.5
 ----
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 688300dcea..c82adbb93d 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -103,10 +103,7 @@ Under continuous integration, additional tests may be run. See the
 Semantic Versioning
 -------------------
 
-Setuptools follows ``semver`` with some exceptions:
-
-- Uses two-segment version when three segment version ends in zero
-- Omits 'v' prefix for tags.
+Setuptools follows ``semver``.
 
 .. explain value of reflecting meaning in versions.
 
diff --git a/setup.cfg b/setup.cfg
index 72967fa40a..6112885dce 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,12 +24,8 @@ formats = gztar zip
 universal=1
 
 [bumpversion]
-current_version = 20.5
+current_version = 20.5.0
 commit = True
 tag = True
-parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?
-serialize=
-  {major}.{minor}.{patch}
-  {major}.{minor}
 
 [bumpversion:file:setup.py]
diff --git a/setup.py b/setup.py
index 021edab3a5..3e50cf5cf8 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.5",
+    version="20.5.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 1627f58f4ca1d03bfc53d918373cb681a57d661d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:19:54 -0400
Subject: [PATCH 5626/8469] =?UTF-8?q?Bump=20version:=2020.5.0=20=E2=86=92?=
 =?UTF-8?q?=2020.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 13 +++++++------
 setup.py  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6112885dce..a671f6511d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,8 @@
+[bumpversion]
+current_version = 20.6.0
+commit = True
+tag = True
+
 [egg_info]
 tag_build = .post
 tag_date = 1
@@ -21,11 +26,7 @@ upload-dir = docs/build/html
 formats = gztar zip
 
 [wheel]
-universal=1
-
-[bumpversion]
-current_version = 20.5.0
-commit = True
-tag = True
+universal = 1
 
 [bumpversion:file:setup.py]
+
diff --git a/setup.py b/setup.py
index 3e50cf5cf8..32d965bfd4 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.5.0",
+    version="20.6.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From dc1ae6511bb84838d62a02b0ca0b03e16bf7379c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:19:54 -0400
Subject: [PATCH 5627/8469] Added tag v20.6.0 for changeset 114f3dbc8a73

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 06e21d5121..11c59b33ac 100644
--- a/.hgtags
+++ b/.hgtags
@@ -253,3 +253,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1
 06692c64fb9b5843331a918ab7093f151412ec8e 20.4
 f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
+114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0

From aed09e8a3b4af5472f893a5f702e739a61d94153 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:31:04 -0400
Subject: [PATCH 5628/8469] Add fallback version to enable egg_info bootstrap

---
 setuptools/version.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index 2f94302727..049e7febcf 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1,3 +1,6 @@
 import pkg_resources
 
-__version__ = pkg_resources.require('setuptools')[0].version
+try:
+	__version__ = pkg_resources.require('setuptools')[0].version
+except Exception:
+	__version__ = 'unknown'

From 763d5ef1c8d382c6cd6f0dd247d7c6c9e3447a11 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:31:17 -0400
Subject: [PATCH 5629/8469] =?UTF-8?q?Bump=20version:=2020.6.0=20=E2=86=92?=
 =?UTF-8?q?=2020.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a671f6511d..abb03906b0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.0
+current_version = 20.6.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 32d965bfd4..a07b803fa3 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.0",
+    version="20.6.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 3e7bd668b6b2fa22fa46af7a43af9804fe12dbc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:31:17 -0400
Subject: [PATCH 5630/8469] Added tag v20.6.1 for changeset a3d4006688fe

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 11c59b33ac..42eb27b191 100644
--- a/.hgtags
+++ b/.hgtags
@@ -254,3 +254,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 06692c64fb9b5843331a918ab7093f151412ec8e 20.4
 f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
 114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0
+a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1

From 06a1e422cbed7a9bc0aadca7ba2fe9c5bf88d3c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:45:31 -0400
Subject: [PATCH 5631/8469] Try setting Python version and all_branches: true
 per https://github.com/travis-ci/dpl/issues/166

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e93c3750d4..5504751af3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,10 @@ deploy:
   provider: pypi
   on:
     tags: true
+    all_branches: true
   user: jaraco
   password:
     secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
   distributions: release
+  python: 3.5
+  env: ""

From 125066cb8dd2d44cc2ed9bded916840a59d4f1ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:45:37 -0400
Subject: [PATCH 5632/8469] =?UTF-8?q?Bump=20version:=2020.6.1=20=E2=86=92?=
 =?UTF-8?q?=2020.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index abb03906b0..2d0cb18510 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.1
+current_version = 20.6.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a07b803fa3..e96c4a0dcc 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.1",
+    version="20.6.2",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 26b8954244aae8cb16b4ff6079c7db8c13cc45b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:45:37 -0400
Subject: [PATCH 5633/8469] Added tag v20.6.2 for changeset 283150971260

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 42eb27b191..03048e9790 100644
--- a/.hgtags
+++ b/.hgtags
@@ -255,3 +255,4 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
 114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0
 a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
+2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2

From 7feff474ea6fb05b0c369557e72dfc3b4385fb58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:52:05 -0400
Subject: [PATCH 5634/8469] Took a chance on 'env:' and lost

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5504751af3..26f53311da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,4 +39,3 @@ deploy:
     secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
   distributions: release
   python: 3.5
-  env: ""

From 9bc17cf4cd018979b1d56bf3e2b14651bc451bcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:52:13 -0400
Subject: [PATCH 5635/8469] =?UTF-8?q?Bump=20version:=2020.6.2=20=E2=86=92?=
 =?UTF-8?q?=2020.6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2d0cb18510..ac29c73b0d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.2
+current_version = 20.6.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index e96c4a0dcc..202da4496e 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.2",
+    version="20.6.3",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 9aa3b8e064da93f1f156c97b84db0fdbdd2dcb6f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 14:52:14 -0400
Subject: [PATCH 5636/8469] Added tag v20.6.3 for changeset 8b46dc41cb23

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 03048e9790..37e6114169 100644
--- a/.hgtags
+++ b/.hgtags
@@ -256,3 +256,4 @@ f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
 114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0
 a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2
+8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3

From 4c7ee26f9b2d2a04ba853bd55b63e2776277a539 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 15:00:09 -0400
Subject: [PATCH 5637/8469] Ignore doc building during release; rely on
 separate dpl step.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index ac29c73b0d..adfdf5ae9a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ tag_date = 1
 
 [aliases]
 clean_egg_info = egg_info -RDb ''
-release = clean_egg_info build_sphinx sdist bdist_wheel upload_docs
+release = clean_egg_info sdist bdist_wheel
 source = register sdist binary
 binary = bdist_egg upload --show-response
 test = pytest

From 26004981b800a24654a43d88fc0d609d247ca9b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 15:00:19 -0400
Subject: [PATCH 5638/8469] =?UTF-8?q?Bump=20version:=2020.6.3=20=E2=86=92?=
 =?UTF-8?q?=2020.6.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index adfdf5ae9a..64fc368de0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.3
+current_version = 20.6.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 202da4496e..a16dafe6ff 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.3",
+    version="20.6.4",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 1cbd2d0255b30c5093721ddd4d330509726b53d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 15:00:19 -0400
Subject: [PATCH 5639/8469] Added tag v20.6.4 for changeset 7258be20fe93

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 37e6114169..b241a81386 100644
--- a/.hgtags
+++ b/.hgtags
@@ -257,3 +257,4 @@ f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
 a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2
 8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3
+7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4

From eae952e4f29f58e39be1a0a28cf5a5793f79e906 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 16:18:46 -0400
Subject: [PATCH 5640/8469] Logic in upload_docs will only trigger docs build
 if no docs dir was specified, so explicitly build during release. Fixes #524.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 64fc368de0..1d9dda37fb 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ tag_date = 1
 
 [aliases]
 clean_egg_info = egg_info -RDb ''
-release = clean_egg_info sdist bdist_wheel
+release = clean_egg_info sdist bdist_wheel build_sphinx
 source = register sdist binary
 binary = bdist_egg upload --show-response
 test = pytest

From fbbeb19d4c7662844e7af5cb1fea4d7cc95ff146 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 16:18:51 -0400
Subject: [PATCH 5641/8469] =?UTF-8?q?Bump=20version:=2020.6.4=20=E2=86=92?=
 =?UTF-8?q?=2020.6.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1d9dda37fb..eda6916dfc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.4
+current_version = 20.6.5
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a16dafe6ff..14219945ff 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.4",
+    version="20.6.5",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 767651439daaec3cc1092d915248c2e179a85e38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 16:18:51 -0400
Subject: [PATCH 5642/8469] Added tag v20.6.5 for changeset 7e0ab283db4e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b241a81386..475de904f1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -258,3 +258,4 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2
 8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3
 7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4
+7e0ab283db4e6f780777f7f06af475f044631fa1 v20.6.5

From e7d3147949379b607ff1168feb5962836f637ede Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 16:27:09 -0400
Subject: [PATCH 5643/8469] Don't test the bootstrap script. It fails when
 deploys are happening, which is common when releases are being made.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26f53311da..2611f02a89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,6 @@ script:
 
  - python setup.py test --addopts='-rs'
 
- # test the bootstrap script
- - python ez_setup.py
 before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
 deploy:

From fd4f10290ea64f72a139fe23b811b40bc1f48f17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Mar 2016 16:32:01 -0400
Subject: [PATCH 5644/8469] Recognize semver versions with v prefix in
 rst.linker config

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 1bf9c33489..6877c5c062 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -255,7 +255,7 @@
 				url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
 			),
 			dict(
-				pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n[-=]+\n",
+				pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
 				with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
 			),
 		],

From 506821451fce2c2e877b44b42a99ace5afdbcb81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 09:43:26 -0400
Subject: [PATCH 5645/8469] Update changelog

---
 CHANGES.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index abd5f24b04..bdffa06d01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v20.6.6
+-------
+
+* Issue #503: Restore support for PEP 345 environment
+  markers by updating to Packaging 16.6.
+
 v20.6.0
 -------
 
@@ -10,6 +16,9 @@ v20.6.0
   and Travis CI for continuous deployment.
 * Project versioning semantics now follow
   `semver <https://semver.org>`_ precisely.
+  The 'v' prefix on version numbers now also allows
+  version numbers to be referenced in the changelog,
+  e.g. https://pythonhosted.org/setuptools/history.html#v20-6-0.
 
 20.5
 ----

From 37b75145ea308e1d4db0eabe587d4f64bda991e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 16:32:24 -0400
Subject: [PATCH 5646/8469] Update tags for rebase to 'distribute' branch
 (Mercurial)

--HG--
branch : distribute
---
 .hgtags | 92 +++++++++++++++++++++++++--------------------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/.hgtags b/.hgtags
index c42cee41a9..2d0c400688 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,55 +1,43 @@
-1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6
-4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1
-41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2
-e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
-e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
-2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5
-f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
-71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7
-445547a5729ed5517cf1a9baad595420a8831ef8 0.6.8
-669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
-669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
-ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
-0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
-0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
-f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
-e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
-48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12
-dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
-2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14
-51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15
-3f1ff138e947bfc1c9bcfe0037030b7bfb4ab3a5 0.6.16
-9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
-9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
-4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
-4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
-0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
-74108d7f07343556a8db94e8122221a43243f586 0.6.18
-611910892a0421633d72677979f94a25ef590d54 0.6.19
-a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
-c4a375336d552129aef174486018ed09c212d684 0.6.20
-de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
-1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
-1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
-9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
-7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
-6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25
-b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
-469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27
-fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
-4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29
-7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30
-17bc972d67edd96c7748061910172e1200a73efe 0.6.31
-b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
-6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33
-23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
-2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35
-c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
-be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
-2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
-f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
-d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
-0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
+7e9441311eb21dd1fbc32cfbad58168e46c5450e 0.6
+26f429772565f69d1f6d21adf57c3d8c40197129 0.6.1
+6f46749a7454be6e044a54cd73c51318b74bdee8 0.6.2
+34b80fb58862d18f8f957f98a883ed4a72d06f8e 0.6.3
+fb04abddb50d82a9005c9082c94d5eb983be1d79 0.6.4
+8ae0bd250b4a0d58cbaf16b4354ad60f73f24a01 0.6.5
+88847883dfed39829d3a5ed292ad540723ad31cc 0.6.6
+fcbef325349ada38f6c674eb92db82664cf6437c 0.6.7
+3af7f2b8270b9bb34fb65f08ee567bfe8e2a6a5a 0.6.8
+669725d03fd1e345ea47590e9b14cb19742b96a2 0.6.9
+eff3ca9c2d8d39e24c221816c52a37f964535336 0.6.10
+88710e34b91c98c9348749722cce3acd574d177d 0.6.11
+5ce754773a43ac21f7bd13872f45c75e27b593f8 0.6.12
+de36566d35e51bee7cfc86ffa694795e52f4147c 0.6.13
+e5f3f0ffe9e1a243d49a06f26c79dd160f521483 0.6.14
+dc03a300ec7a89ad773047172d43e52b34e7cd1e 0.6.15
+e620fb4ee8ba17debadb614fb583c6dfac229dea 0.6.16
+21df276275b5a47c6a994927d69ad3d90cf62b5d 0.6.17
+e9264ca4ba8c24239c36a8426a0394f7c7d5dd83 0.6.18
+aed31b1fa47ed1f39e55c75b76bbbdb80775b7f1 0.6.19
+c6e6273587816c3e486ef7739e53c864a0145251 0.6.20
+7afdf4c84a713fe151e6163ab25d45e8727ce653 0.6.21
+105066342777cd1319a95d7ae0271a2ea1ac33fe 0.6.23
+7b5ef4e6c80e82541dffb5a9a130d81550d5a835 0.6.24
+9c014a80f32e532371826ed1dc3236975f37f371 0.6.25
+ff8c4d6c8e5d2093750a58a3d43b76556570007c 0.6.26
+2a5c42ed097a195e398b97261c40cd66c8da8913 0.6.27
+4ed34b38851f90278cfe2bff75784f7e32883725 0.6.28
+acecfa2cfb6fca207dd2f4e025c695def3bb6b40 0.6.29
+e950f50addff150859f5990b9df2a33c691b6354 0.6.30
+06dae3faee2de50ff17b90719df410b2ebc5b71e 0.6.31
+1f4f79258ed5b418f680a55d3006f41aa6a56d2b 0.6.32
+89f57bf1406a5e745470af35446902c21ac9b6f6 0.6.33
+3c8f9fc13862124cf20ef2ff2140254fb272bb94 0.6.34
+7c3f8b9eb7cfa17481c835d5caaa918d337c7a83 0.6.35
+192094c0d1e2e5d2cb5c718f84a36c9de04b314b 0.6.36
+66d4e3b8899166e4c04189ee1831c649b7ff38bf 0.6.37
+398d58aa8bba33778c30ce72055a27d4b425809c 0.6.38
+f457fc2a3ebe609d8ca7a869eb65b7506ecf49ef 0.6.39
+9089a40343981baa593b9bb5953f9088e9507099 0.6.40
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43

From c2f0ac786148d7614a7c8591c6ae56ea710e5453 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 17:26:01 -0400
Subject: [PATCH 5647/8469] Fix error in docs build

---
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index bdffa06d01..8bc59a1bbb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -80,6 +80,7 @@ v20.6.0
   packaging 16.1 and PEP 508. Fixes Issue #122.
   See also BB Pull Request #175, BB Pull Request #168, and
   BB Pull Request #164. Additionally:
+
    - ``Requirement.parse`` no longer retains the order of extras.
    - ``parse_requirements`` now requires that all versions be
      PEP-440 compliant, as revealed in #499. Packages released

From 53a9c83a227c1277165a1bdec013bbb4465edd8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 21:58:23 -0400
Subject: [PATCH 5648/8469] =?UTF-8?q?Bump=20version:=2020.6.5=20=E2=86=92?=
 =?UTF-8?q?=2020.6.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index eda6916dfc..07d2bd2835 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.5
+current_version = 20.6.6
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 14219945ff..c559befaea 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.5",
+    version="20.6.6",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From d198cbc480ceb09d5c7e35b5aaee7eeb87cab767 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 21:58:23 -0400
Subject: [PATCH 5649/8469] Added tag v20.6.6 for changeset 57d63b38e855

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8ef51c93af..ecb71c8b14 100644
--- a/.hgtags
+++ b/.hgtags
@@ -247,3 +247,4 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3
 7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4
 7e0ab283db4e6f780777f7f06af475f044631fa1 v20.6.5
+57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6

From 11f68796ae1fb41a1318b58b89868a933e3b4c74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 22:09:19 -0400
Subject: [PATCH 5650/8469] Ensure sphinx is present for building docs

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c559befaea..1aa31687d4 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ def _gen_console_scripts():
 
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
+needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv)
 sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []

From 3acfce0f3cd74981bb7690fedd5f26690278ce38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Mar 2016 22:09:39 -0400
Subject: [PATCH 5651/8469] Added tag v20.6.6 for changeset b04dbdd161d7

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index ecb71c8b14..03747dc713 100644
--- a/.hgtags
+++ b/.hgtags
@@ -248,3 +248,5 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4
 7e0ab283db4e6f780777f7f06af475f044631fa1 v20.6.5
 57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
+57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
+b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6

From 9332edbf23be5d38488957bc8043ada2f1baddaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Mar 2016 09:03:50 -0400
Subject: [PATCH 5652/8469] Remove unused imports

---
 pkg_resources/__init__.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index bb69b60744..2f35b34d55 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -28,8 +28,6 @@
 import stat
 import functools
 import pkgutil
-import token
-import symbol
 import operator
 import platform
 import collections
@@ -67,11 +65,6 @@
 except ImportError:
     importlib_machinery = None
 
-try:
-    import parser
-except ImportError:
-    pass
-
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
 __import__('pkg_resources.extern.packaging.specifiers')

From e7a27ca0a3ba06f69836872342089e7333f24a3a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Mar 2016 10:40:36 -0400
Subject: [PATCH 5653/8469] Extract separate test for test_environment_markers
 in test_resources. Remove unused variable.

---
 pkg_resources/tests/test_resources.py | 8 ++++++--
 setuptools/tests/test_egg_info.py     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 1e1767710f..3a8c8e548a 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -182,8 +182,12 @@ def testResolve(self):
         msg = 'Foo 0.9 is installed but Foo==1.2 is required'
         assert vc.value.report() == msg
 
-        ws = WorkingSet([]) # reset
-        # Environment markers are evaluated at resolution time
+    def test_environment_markers(self):
+        """
+        Environment markers are evaluated at resolution time.
+        """
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
         res = ws.resolve(parse_requirements("Foo;python_version<'2'"), ad)
         assert list(res) == []
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 6aed315ff7..fd5f26fc2d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -123,7 +123,7 @@ def test_setup_requires_with_markers(self, tmpdir_cwd, env):
     def test_tests_require_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """tests_require=["barbazquux;python_version<'2'"],""")
-        data = self._run_install_command(
+        self._run_install_command(
             tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
@@ -154,7 +154,7 @@ def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
         if code:
             raise AssertionError(data)
         if output:
-            assert output in data   
+            assert output in data
 
     def _find_egg_info_files(self, root):
         class DirList(list):

From 04d10ff025e1cbef7ec93a2008c930e856045c8a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Mar 2016 10:25:44 -0400
Subject: [PATCH 5654/8469] Bypass environment marker evaluation in
 requirements resolution. Ref #523.

---
 CHANGES.txt                           | 6 ++++++
 pkg_resources/__init__.py             | 6 ++++--
 pkg_resources/tests/test_resources.py | 1 +
 setuptools/tests/test_egg_info.py     | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8bc59a1bbb..dee622ac53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v20.6.7
+-------
+
+* Issue #523: Disabled support for environment markers
+  introduced in v20.5.
+
 v20.6.6
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2f35b34d55..eb84f4ba1b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -804,8 +804,10 @@ def resolve(self, requirements, env=None, installer=None,
                 continue
             # If the req has a marker, evaluate it -- skipping the req if
             # it evaluates to False.
-            if req.marker and not req.marker.evaluate():
-                continue
+            # https://github.com/pypa/setuptools/issues/523
+            _issue_523_bypass = True
+            if not _issue_523_bypass and req.marker and not req.marker.evaluate():
+                    continue
             dist = best.get(req.key)
             if dist is None:
                 # Find the best distribution and add it to the map
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 3a8c8e548a..791d8ee399 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -182,6 +182,7 @@ def testResolve(self):
         msg = 'Foo 0.9 is installed but Foo==1.2 is required'
         assert vc.value.report() == msg
 
+    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_environment_markers(self):
         """
         Environment markers are evaluated at resolution time.
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index fd5f26fc2d..d37567b48f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -104,6 +104,7 @@ def _setup_script_with_requires(self, requires_line):
             'setup.py': setup_script,
             })
 
+    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_install_requires_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """install_requires=["barbazquux;python_version<'2'"],""")
@@ -114,12 +115,14 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
             requires_txt).read().split('\n')
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """setup_requires=["barbazquux;python_version<'2'"],""")
         self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_tests_require_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """tests_require=["barbazquux;python_version<'2'"],""")

From d48e839e34b1dc4f64707935f58e4bc0824457c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Mar 2016 10:47:10 -0400
Subject: [PATCH 5655/8469] =?UTF-8?q?Bump=20version:=2020.6.6=20=E2=86=92?=
 =?UTF-8?q?=2020.6.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 07d2bd2835..31fa0d34f2 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.6
+current_version = 20.6.7
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 1aa31687d4..9067abe2a3 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.6",
+    version="20.6.7",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 3484b70027caa26648d7d7270bef827629d633a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Mar 2016 10:47:10 -0400
Subject: [PATCH 5656/8469] Added tag v20.6.7 for changeset 0804d30b6ead

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 03747dc713..95b15456ea 100644
--- a/.hgtags
+++ b/.hgtags
@@ -250,3 +250,4 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
 57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
 b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
+0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7

From f4c7a06cc90bed1e1feadd343e5a9fec3433e004 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Fri, 1 Apr 2016 14:43:06 +1100
Subject: [PATCH 5657/8469] Drop unused safe_repr function

When _assertIn was removed from test_resources, the safe_repr
function was not dropped, leaving it with no callers, so drop it.
---
 pkg_resources/tests/test_resources.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 791d8ee399..98b8dcd7b3 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -15,17 +15,6 @@
     WorkingSet)
 
 
-def safe_repr(obj, short=False):
-    """ copied from Python2.7"""
-    try:
-        result = repr(obj)
-    except Exception:
-        result = object.__repr__(obj)
-    if not short or len(result) < pkg_resources._MAX_LENGTH:
-        return result
-    return result[:pkg_resources._MAX_LENGTH] + ' [truncated]...'
-
-
 class Metadata(pkg_resources.EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 

From c5189c3992f32dcabf5cb294340bf4cad294de23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 1 Apr 2016 17:01:51 -0400
Subject: [PATCH 5658/8469] Rename CHANGES and README files for nicer rendering
 on Github.

---
 .gitignore                 | 1 -
 .hgignore                  | 1 -
 CHANGES.txt => CHANGES.rst | 0
 README.txt => README.rst   | 0
 docs/conf.py               | 2 +-
 docs/developer-guide.txt   | 2 +-
 docs/history.txt           | 2 +-
 setup.py                   | 2 +-
 8 files changed, 4 insertions(+), 6 deletions(-)
 rename CHANGES.txt => CHANGES.rst (100%)
 rename README.txt => README.rst (100%)

diff --git a/.gitignore b/.gitignore
index 05c0808d6c..4d77520f68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ distribute.egg-info
 setuptools.egg-info
 .coverage
 .tox
-CHANGES (links).txt
 *.egg
 *.py[cod]
 *.swp
diff --git a/.hgignore b/.hgignore
index d70c9a7c48..ebc53b33d5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,7 +8,6 @@ distribute.egg-info
 setuptools.egg-info
 .coverage
 .tox
-CHANGES (links).txt
 *.egg
 *.py[cod]
 *.swp
diff --git a/CHANGES.txt b/CHANGES.rst
similarity index 100%
rename from CHANGES.txt
rename to CHANGES.rst
diff --git a/README.txt b/README.rst
similarity index 100%
rename from README.txt
rename to README.rst
diff --git a/docs/conf.py b/docs/conf.py
index 6877c5c062..f315e2b720 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -200,7 +200,7 @@
 #latex_use_modindex = True
 
 link_files = {
-	'CHANGES.txt': dict(
+	'CHANGES.rst': dict(
 		using=dict(
 			BB='https://bitbucket.org',
 			GH='https://github.com',
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index c82adbb93d..7cd3c6d2dc 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -69,7 +69,7 @@ If you want to contribute changes, we recommend you fork the repository on
 Github, commit the changes to your repository, and then make a pull request
 on Github. If you make some changes, don't forget to:
 
-- add a note in CHANGES.txt
+- add a note in CHANGES.rst
 
 Please commit all changes in the 'master' branch against the latest available
 commit or for bug-fixes, against an earlier commit or release in which the
diff --git a/docs/history.txt b/docs/history.txt
index 268137cde2..8e217503ba 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -5,4 +5,4 @@
 History
 *******
 
-.. include:: ../CHANGES (links).txt
+.. include:: ../CHANGES (links).rst
diff --git a/setup.py b/setup.py
index 1aa31687d4..573fb595f7 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def _gen_console_scripts():
 
 console_scripts = list(_gen_console_scripts())
 
-readme_file = io.open('README.txt', encoding='utf-8')
+readme_file = io.open('README.rst', encoding='utf-8')
 
 with readme_file:
     long_description = readme_file.read()

From 1cdd940877e158f2b748f67f09d1f1321a113998 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Mon, 4 Apr 2016 16:27:32 +1000
Subject: [PATCH 5659/8469] Restore evaluating environment markers in
 WorkingSet

Correctly deal with parsed requirements that include extras as a
marker inside WorkingSet that are populated from METADATA inside
wheels, like we get from pip>=7.

This partially reverts commit 04d10ff025e1cbef7ec93a2008c930e856045c8a.

Closes: #523
---
 pkg_resources/__init__.py             | 14 ++++-
 pkg_resources/tests/test_resources.py | 79 +++++++++++++++++++++++++--
 setuptools/tests/test_egg_info.py     |  3 -
 3 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index eb84f4ba1b..4f0a487e01 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -791,6 +791,8 @@ def resolve(self, requirements, env=None, installer=None,
         # key -> dist
         best = {}
         to_activate = []
+        # Map requirement to the extras that require it
+        extra_req_mapping = {}
 
         # Mapping of requirement to set of distributions that required it;
         # useful for reporting info about conflicts.
@@ -804,9 +806,14 @@ def resolve(self, requirements, env=None, installer=None,
                 continue
             # If the req has a marker, evaluate it -- skipping the req if
             # it evaluates to False.
-            # https://github.com/pypa/setuptools/issues/523
-            _issue_523_bypass = True
-            if not _issue_523_bypass and req.marker and not req.marker.evaluate():
+            if req.marker:
+                result = []
+                if req in extra_req_mapping:
+                    for extra in extra_req_mapping[req] or ['']:
+                        result.append(req.marker.evaluate({'extra': extra}))
+                else:
+                    result.append(req.marker.evaluate())
+                if not any(result):
                     continue
             dist = best.get(req.key)
             if dist is None:
@@ -840,6 +847,7 @@ def resolve(self, requirements, env=None, installer=None,
             # Register the new requirements needed by req
             for new_requirement in new_requirements:
                 required_by[new_requirement].add(req.project_name)
+                extra_req_mapping[new_requirement] = req.extras
 
             processed[req] = True
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 98b8dcd7b3..7f86c79786 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -171,16 +171,85 @@ def testResolve(self):
         msg = 'Foo 0.9 is installed but Foo==1.2 is required'
         assert vc.value.report() == msg
 
-    @pytest.mark.xfail(reason="Functionality disabled; see #523")
-    def test_environment_markers(self):
-        """
-        Environment markers are evaluated at resolution time.
-        """
+    def test_environment_marker_evaluation_negative(self):
+        """Environment markers are evaluated at resolution time."""
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
         res = ws.resolve(parse_requirements("Foo;python_version<'2'"), ad)
         assert list(res) == []
 
+    def test_environment_marker_evaluation_positive(self):
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
+        Foo = Distribution.from_filename("/foo_dir/Foo-1.2.dist-info")
+        ad.add(Foo)
+        res = ws.resolve(parse_requirements("Foo;python_version>='2'"), ad)
+        assert list(res) == [Foo]
+
+    def test_marker_evaluation_with_extras(self):
+        """Extras are also evaluated as markers at resolution time."""
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
+        # Metadata needs to be native strings due to cStringIO behaviour in
+        # 2.6, so use str().
+        Foo = Distribution.from_filename(
+            "/foo_dir/Foo-1.2.dist-info",
+            metadata=Metadata(("METADATA", str("Provides-Extra: baz\n"
+                               "Requires-Dist: quux; extra=='baz'")))
+        )
+        ad.add(Foo)
+        assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo]
+        quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info")
+        ad.add(quux)
+        res = list(ws.resolve(parse_requirements("Foo[baz]"), ad))
+        assert res == [Foo,quux]
+
+    def test_marker_evaluation_with_multiple_extras(self):
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
+        # Metadata needs to be native strings due to cStringIO behaviour in
+        # 2.6, so use str().
+        Foo = Distribution.from_filename(
+            "/foo_dir/Foo-1.2.dist-info",
+            metadata=Metadata(("METADATA", str("Provides-Extra: baz\n"
+                               "Requires-Dist: quux; extra=='baz'\n"
+                               "Provides-Extra: bar\n"
+                               "Requires-Dist: fred; extra=='bar'\n")))
+        )
+        ad.add(Foo)
+        quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info")
+        ad.add(quux)
+        fred = Distribution.from_filename("/foo_dir/fred-0.1.dist-info")
+        ad.add(fred)
+        res = list(ws.resolve(parse_requirements("Foo[baz,bar]"), ad))
+        assert sorted(res) == [fred,quux,Foo]
+
+    def test_marker_evaluation_with_extras_loop(self):
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
+        # Metadata needs to be native strings due to cStringIO behaviour in
+        # 2.6, so use str().
+        a = Distribution.from_filename(
+            "/foo_dir/a-0.2.dist-info",
+            metadata=Metadata(("METADATA", str("Requires-Dist: c[a]")))
+        )
+        b = Distribution.from_filename(
+            "/foo_dir/b-0.3.dist-info",
+            metadata=Metadata(("METADATA", str("Requires-Dist: c[b]")))
+        )
+        c = Distribution.from_filename(
+            "/foo_dir/c-1.0.dist-info",
+            metadata=Metadata(("METADATA", str("Provides-Extra: a\n"
+                               "Requires-Dist: b;extra=='a'\n"
+                               "Provides-Extra: b\n"
+                               "Requires-Dist: foo;extra=='b'")))
+        )
+        foo = Distribution.from_filename("/foo_dir/foo-0.1.dist-info")
+        for dist in (a, b, c, foo):
+            ad.add(dist)
+        res = list(ws.resolve(parse_requirements("a"), ad))
+        assert res == [a, c, b, foo]
+
     def testDistroDependsOptions(self):
         d = self.distRequires("""
             Twisted>=1.5
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d37567b48f..fd5f26fc2d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -104,7 +104,6 @@ def _setup_script_with_requires(self, requires_line):
             'setup.py': setup_script,
             })
 
-    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_install_requires_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """install_requires=["barbazquux;python_version<'2'"],""")
@@ -115,14 +114,12 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
             requires_txt).read().split('\n')
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """setup_requires=["barbazquux;python_version<'2'"],""")
         self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    @pytest.mark.xfail(reason="Functionality disabled; see #523")
     def test_tests_require_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """tests_require=["barbazquux;python_version<'2'"],""")

From 01a84af28027f666c5aabc76b33312fc52378348 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Apr 2016 11:45:47 +0100
Subject: [PATCH 5660/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index dee622ac53..cf18b7f71e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v20.6.8
+-------
+
+* Issue #523: Restored support for environment markers,
+  now honoring 'extra' environment markers.
+
 v20.6.7
 -------
 

From 19fd04bae3809caf61208e3d085491990222aca8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Apr 2016 11:45:53 +0100
Subject: [PATCH 5661/8469] Added tag v20.6.8 for changeset a00910db03ec

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 95b15456ea..3bafe1a96e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -251,3 +251,4 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
 b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
 0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
+a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8

From 5c36cd3890dad731a0e3d9764345377406770c31 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Apr 2016 11:59:18 +0100
Subject: [PATCH 5662/8469] Extract method for testing marker evaluation

---
 pkg_resources/__init__.py | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4f0a487e01..c3e3e96ca4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -804,17 +804,10 @@ def resolve(self, requirements, env=None, installer=None,
             if req in processed:
                 # Ignore cyclic or redundant dependencies
                 continue
-            # If the req has a marker, evaluate it -- skipping the req if
-            # it evaluates to False.
-            if req.marker:
-                result = []
-                if req in extra_req_mapping:
-                    for extra in extra_req_mapping[req] or ['']:
-                        result.append(req.marker.evaluate({'extra': extra}))
-                else:
-                    result.append(req.marker.evaluate())
-                if not any(result):
-                    continue
+
+            if not self._markers_pass(req, extra_req_mapping):
+                continue
+
             dist = best.get(req.key)
             if dist is None:
                 # Find the best distribution and add it to the map
@@ -854,6 +847,26 @@ def resolve(self, requirements, env=None, installer=None,
         # return list of distros to activate
         return to_activate
 
+    @staticmethod
+    def _markers_pass(req, extra_req_mapping):
+        """
+        Return False if the req has a marker and fails
+        evaluation. Otherwise, return True.
+
+        extra_req_mapping is a map of requirements to
+        extras.
+        """
+        if not req.marker:
+            return True
+
+        result = []
+        if req in extra_req_mapping:
+            for extra in extra_req_mapping[req] or ['']:
+                result.append(req.marker.evaluate({'extra': extra}))
+        else:
+            result.append(req.marker.evaluate())
+        return any(result)
+
     def find_plugins(self, plugin_env, full_env=None, installer=None,
             fallback=True):
         """Find all activatable distributions in `plugin_env`

From a31716f5a86061d7409b8c08154d3b52ff324efd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 5 Apr 2016 13:36:59 +0100
Subject: [PATCH 5663/8469] Remove fallback value until there's something that
 explains or requires it.

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c3e3e96ca4..0867771989 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -861,7 +861,7 @@ def _markers_pass(req, extra_req_mapping):
 
         result = []
         if req in extra_req_mapping:
-            for extra in extra_req_mapping[req] or ['']:
+            for extra in extra_req_mapping[req]:
                 result.append(req.marker.evaluate({'extra': extra}))
         else:
             result.append(req.marker.evaluate())

From 3d8c2245cb09e0db917648f2cf57f99fd10caca1 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Wed, 6 Apr 2016 14:49:02 +1000
Subject: [PATCH 5664/8469] Reinstate the or guard in WorkingSet._markers_pass

---
 pkg_resources/__init__.py             | 2 +-
 pkg_resources/tests/test_resources.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0867771989..c3e3e96ca4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -861,7 +861,7 @@ def _markers_pass(req, extra_req_mapping):
 
         result = []
         if req in extra_req_mapping:
-            for extra in extra_req_mapping[req]:
+            for extra in extra_req_mapping[req] or ['']:
                 result.append(req.marker.evaluate({'extra': extra}))
         else:
             result.append(req.marker.evaluate())
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7f86c79786..7907224ee7 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -186,6 +186,12 @@ def test_environment_marker_evaluation_positive(self):
         res = ws.resolve(parse_requirements("Foo;python_version>='2'"), ad)
         assert list(res) == [Foo]
 
+    def test_environment_marker_evaluation_called(self):
+        ws = WorkingSet([])
+        req, = parse_requirements("bar;python_version<'4'")
+        extra_req_mapping = {req: ()}
+        assert ws._markers_pass(req, extra_req_mapping) == True
+
     def test_marker_evaluation_with_extras(self):
         """Extras are also evaluated as markers at resolution time."""
         ad = pkg_resources.Environment([])

From b1eeba1cd70d6735578cab5e2363c8de653de022 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Wed, 6 Apr 2016 16:30:08 +1000
Subject: [PATCH 5665/8469] Stop comparing repr()'s in TestEntryPoint

In Python 3, the default order of iterables can not determined,
so comparing the repr of objects that include tuples is not static
like it is under Python 2. Compare the attributes of EntryPoint
instead, making sure to sort .attrs and .extras.

Closes: #526
---
 pkg_resources/tests/test_resources.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7f86c79786..f7ddef55e0 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -382,7 +382,10 @@ def test_printable_name(self):
     def checkSubMap(self, m):
         assert len(m) == len(self.submap_expect)
         for key, ep in self.submap_expect.items():
-            assert repr(m.get(key)) == repr(ep)
+            assert m.get(key).name == ep.name
+            assert m.get(key).module_name == ep.module_name
+            assert sorted(m.get(key).attrs) == sorted(ep.attrs)
+            assert sorted(m.get(key).extras) == sorted(ep.extras)
 
     submap_expect = dict(
         feature1=EntryPoint('feature1', 'somemodule', ['somefunction']),

From c7873d38c4478f86864666cd1231877d1183b820 Mon Sep 17 00:00:00 2001
From: riot <riot@hackerfleet.org>
Date: Thu, 7 Apr 2016 14:39:32 +0200
Subject: [PATCH 5666/8469] This helps finding packages with bad utf

Checking hundreds of possibly installed packages manually should NOT be expected of the user ;)
---
 pkg_resources/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0867771989..8eb697f4d1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1859,7 +1859,10 @@ def has_metadata(self, name):
     def get_metadata(self, name):
         if name=='PKG-INFO':
             with io.open(self.path, encoding='utf-8') as f:
-                metadata = f.read()
+                try:
+                    metadata = f.read()
+                except UnicodeDecodeError as e:
+                    raise Exception("Bad utf in package: %s - %s" % (self.path, e))
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")
 

From be663b8596fc3e3d02cb5716db1d638788a0230e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 22:05:20 +0100
Subject: [PATCH 5667/8469] Extract _ReqExtras to encapsulate that
 functionality and decouple it from WorkingSet.

---
 pkg_resources/__init__.py             | 53 +++++++++++++++------------
 pkg_resources/tests/test_resources.py | 23 ++++++++++--
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c3e3e96ca4..d0ba515993 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -791,8 +791,8 @@ def resolve(self, requirements, env=None, installer=None,
         # key -> dist
         best = {}
         to_activate = []
-        # Map requirement to the extras that require it
-        extra_req_mapping = {}
+
+        req_extras = _ReqExtras()
 
         # Mapping of requirement to set of distributions that required it;
         # useful for reporting info about conflicts.
@@ -805,7 +805,7 @@ def resolve(self, requirements, env=None, installer=None,
                 # Ignore cyclic or redundant dependencies
                 continue
 
-            if not self._markers_pass(req, extra_req_mapping):
+            if not req_extras.markers_pass(req):
                 continue
 
             dist = best.get(req.key)
@@ -840,33 +840,13 @@ def resolve(self, requirements, env=None, installer=None,
             # Register the new requirements needed by req
             for new_requirement in new_requirements:
                 required_by[new_requirement].add(req.project_name)
-                extra_req_mapping[new_requirement] = req.extras
+                req_extras[new_requirement] = req.extras
 
             processed[req] = True
 
         # return list of distros to activate
         return to_activate
 
-    @staticmethod
-    def _markers_pass(req, extra_req_mapping):
-        """
-        Return False if the req has a marker and fails
-        evaluation. Otherwise, return True.
-
-        extra_req_mapping is a map of requirements to
-        extras.
-        """
-        if not req.marker:
-            return True
-
-        result = []
-        if req in extra_req_mapping:
-            for extra in extra_req_mapping[req] or ['']:
-                result.append(req.marker.evaluate({'extra': extra}))
-        else:
-            result.append(req.marker.evaluate())
-        return any(result)
-
     def find_plugins(self, plugin_env, full_env=None, installer=None,
             fallback=True):
         """Find all activatable distributions in `plugin_env`
@@ -993,6 +973,31 @@ def __setstate__(self, e_k_b_c):
         self.callbacks = callbacks[:]
 
 
+class _ReqExtras(dict):
+    """
+    Map each requirement to the extras that demanded it.
+    """
+
+    def markers_pass(self, req):
+        """
+        Evaluate markers for req against each extra that
+        demanded it.
+
+        Return False if the req has a marker and fails
+        evaluation. Otherwise, return True.
+        """
+        if not req.marker:
+            return True
+
+        result = []
+        if req in self:
+            for extra in self[req] or ['']:
+                result.append(req.marker.evaluate({'extra': extra}))
+        else:
+            result.append(req.marker.evaluate())
+        return any(result)
+
+
 class Environment(object):
     """Searchable snapshot of distributions on a search path"""
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 7907224ee7..acc8dc1e15 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -187,10 +187,25 @@ def test_environment_marker_evaluation_positive(self):
         assert list(res) == [Foo]
 
     def test_environment_marker_evaluation_called(self):
-        ws = WorkingSet([])
-        req, = parse_requirements("bar;python_version<'4'")
-        extra_req_mapping = {req: ()}
-        assert ws._markers_pass(req, extra_req_mapping) == True
+        """
+        If one package foo requires bar without any extras,
+        markers should pass for bar.
+        """
+        parent_req, = parse_requirements("foo")
+        req, = parse_requirements("bar;python_version>='2'")
+        req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
+        assert req_extras.markers_pass(req)
+
+        parent_req, = parse_requirements("foo[]")
+        req, = parse_requirements("bar;python_version>='2'")
+        req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
+        assert req_extras.markers_pass(req)
+
+        # this is a little awkward; I would want this to fail
+        parent_req, = parse_requirements("foo")
+        req, = parse_requirements("bar;python_version>='2' and extra==''")
+        req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
+        assert req_extras.markers_pass(req)
 
     def test_marker_evaluation_with_extras(self):
         """Extras are also evaluated as markers at resolution time."""

From f664385be2051cd135ad52e1563993945e0abe10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 22:22:58 +0100
Subject: [PATCH 5668/8469] Adjust expectation that 'extra' is not in the
 marker evaluation if no extras demanded the requirement.

---
 pkg_resources/__init__.py             | 22 ++++++++++++----------
 pkg_resources/tests/test_resources.py |  8 +++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d0ba515993..04064d5a10 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -35,6 +35,7 @@
 import email.parser
 import tempfile
 import textwrap
+import itertools
 from pkgutil import get_importer
 
 try:
@@ -986,16 +987,17 @@ def markers_pass(self, req):
         Return False if the req has a marker and fails
         evaluation. Otherwise, return True.
         """
-        if not req.marker:
-            return True
-
-        result = []
-        if req in self:
-            for extra in self[req] or ['']:
-                result.append(req.marker.evaluate({'extra': extra}))
-        else:
-            result.append(req.marker.evaluate())
-        return any(result)
+        extra_evals = (
+            req.marker.evaluate({'extra': extra})
+            for extra in self.get(req, ())
+        )
+        # set up a late-evaluated simple marker evaluation.
+        simple_eval = (
+            req.marker.evaluate()
+            for _ in (None,)
+        )
+        evals = itertools.chain(extra_evals, simple_eval)
+        return not req.marker or any(evals)
 
 
 class Environment(object):
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index acc8dc1e15..bd074f2234 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -201,11 +201,13 @@ def test_environment_marker_evaluation_called(self):
         req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
         assert req_extras.markers_pass(req)
 
-        # this is a little awkward; I would want this to fail
+        # extra should not be present in the marker namespace if
+        # no markers were supplied
         parent_req, = parse_requirements("foo")
-        req, = parse_requirements("bar;python_version>='2' and extra==''")
+        req, = parse_requirements("bar;extra==''")
         req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
-        assert req_extras.markers_pass(req)
+        with pytest.raises(packaging.markers.UndefinedEnvironmentName):
+            req_extras.markers_pass(req)
 
     def test_marker_evaluation_with_extras(self):
         """Extras are also evaluated as markers at resolution time."""

From 8ce73d4450eb646b80c004e57b82ed9eabe24f35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 22:24:53 +0100
Subject: [PATCH 5669/8469] Rely on short-circuit in 'or' rather than building
 a separate iterable.

---
 pkg_resources/__init__.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 04064d5a10..ab48cf7ab3 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -35,7 +35,6 @@
 import email.parser
 import tempfile
 import textwrap
-import itertools
 from pkgutil import get_importer
 
 try:
@@ -991,13 +990,7 @@ def markers_pass(self, req):
             req.marker.evaluate({'extra': extra})
             for extra in self.get(req, ())
         )
-        # set up a late-evaluated simple marker evaluation.
-        simple_eval = (
-            req.marker.evaluate()
-            for _ in (None,)
-        )
-        evals = itertools.chain(extra_evals, simple_eval)
-        return not req.marker or any(evals)
+        return not req.marker or any(extra_evals) or req.marker.evaluate()
 
 
 class Environment(object):

From 6462571024e69a285a17c8f790ad13774790990a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 23:08:32 +0100
Subject: [PATCH 5670/8469] Trap additional exceptions. Fixes #536.

---
 CHANGES.rst                 | 7 +++++++
 setuptools/msvc9_support.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cf18b7f71e..b29977ce82 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v20.7
+-----
+
+* Issue #536: In msvc9_support, trap additional exceptions
+  that might occur when importing
+  ``distutils.msvc9compiler`` in mingw environments.
+
 v20.6.8
 -------
 
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index a69c7474c8..9d869580ec 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1,6 +1,6 @@
 try:
     import distutils.msvc9compiler
-except ImportError:
+except Exception:
     pass
 
 unpatched = dict()

From f9f7277f7caac4e6946217c3cd221cb1a82b8982 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 23:12:02 +0100
Subject: [PATCH 5671/8469] Update changelog

---
 CHANGES.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b29977ce82..248c32fa53 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,12 +2,17 @@
 CHANGES
 =======
 
-v20.7
------
+v20.7.0
+-------
 
+* Refactored extra enviroment marker processing
+  in WorkingSet.
+* Issue #533: Fixed intermittent test failures.
 * Issue #536: In msvc9_support, trap additional exceptions
   that might occur when importing
   ``distutils.msvc9compiler`` in mingw environments.
+* Issue #537: Provide better context when package
+  metadata fails to decode in UTF-8.
 
 v20.6.8
 -------

From 84f1525334eb3e6757ee692767301f62536da260 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 7 Apr 2016 23:42:02 +0100
Subject: [PATCH 5672/8469] Instead of reasing a new exception, just augment
 the existing exception, avoiding any concerns about exception type, but still
 communicating the context necessary to trace the issue. Ref #537.

---
 pkg_resources/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index be215ccf7c..ce4e775567 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1861,8 +1861,11 @@ def get_metadata(self, name):
             with io.open(self.path, encoding='utf-8') as f:
                 try:
                     metadata = f.read()
-                except UnicodeDecodeError as e:
-                    raise Exception("Bad utf in package: %s - %s" % (self.path, e))
+                except UnicodeDecodeError as exc:
+                    # add path context to error message
+                    tmpl = " in {self.path}"
+                    exc.reason += tmpl.format(self=self)
+                    raise
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")
 

From 7aff0f9f743263c7f223b45f79c106eb2a72345c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Apr 2016 21:17:35 +0200
Subject: [PATCH 5673/8469] =?UTF-8?q?Bump=20version:=2020.6.7=20=E2=86=92?=
 =?UTF-8?q?=2020.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 31fa0d34f2..6ec7f46477 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.7
+current_version = 20.7.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 25726da1a1..1de76ce986 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.7",
+    version="20.7.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From a1d3c39f9f282360cbe2978df5240808cb55c347 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 Apr 2016 21:17:36 +0200
Subject: [PATCH 5674/8469] Added tag v20.7.0 for changeset 0262ab29fc24

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3bafe1a96e..f3b82ececd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -252,3 +252,4 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
 0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
 a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
+0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0

From 5253f7fbcea33e28af6348c3cc0f65334cad5623 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 10 Apr 2016 18:39:35 -0400
Subject: [PATCH 5675/8469] Swap out hard tabs for spaces

---
 setuptools/launch.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/setuptools/launch.py b/setuptools/launch.py
index 06e15e1e6e..b05cbd2cfe 100644
--- a/setuptools/launch.py
+++ b/setuptools/launch.py
@@ -11,25 +11,25 @@
 
 
 def run():
-	"""
-	Run the script in sys.argv[1] as if it had
-	been invoked naturally.
-	"""
-	__builtins__
-	script_name = sys.argv[1]
-	namespace = dict(
-		__file__ = script_name,
-		__name__ = '__main__',
-		__doc__ = None,
-	)
-	sys.argv[:] = sys.argv[1:]
+    """
+    Run the script in sys.argv[1] as if it had
+    been invoked naturally.
+    """
+    __builtins__
+    script_name = sys.argv[1]
+    namespace = dict(
+        __file__ = script_name,
+        __name__ = '__main__',
+        __doc__ = None,
+    )
+    sys.argv[:] = sys.argv[1:]
 
-	open_ = getattr(tokenize, 'open', open)
-	script = open_(script_name).read()
-	norm_script = script.replace('\\r\\n', '\\n')
-	code = compile(norm_script, script_name, 'exec')
-	exec(code, namespace)
+    open_ = getattr(tokenize, 'open', open)
+    script = open_(script_name).read()
+    norm_script = script.replace('\\r\\n', '\\n')
+    code = compile(norm_script, script_name, 'exec')
+    exec(code, namespace)
 
 
 if __name__ == '__main__':
-	run()
+    run()

From 52d420e6309d2be19e848cfb32a43191e4623e6b Mon Sep 17 00:00:00 2001
From: ncoghlan <ncoghlan@gmail.com>
Date: Tue, 12 Apr 2016 00:10:49 +1000
Subject: [PATCH 5676/8469] Update rationale for the zip_safe flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Importing from a zip file no longer significantly reduces the number
of stat calls during import, and may even slow imports down if
too many archives are added to sys.path.

The outdated rationale was noted by Thomas Güttler on distutils-sig
---
 docs/setuptools.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index eeeab93737..57818281b8 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1270,7 +1270,8 @@ Creating System Packages
 Setting the ``zip_safe`` flag
 -----------------------------
 
-For maximum performance, Python packages are best installed as zip files.
+For some use cases (such as bundling as part of a larger application), Python
+packages may be run directly from a zip file.
 Not all packages, however, are capable of running in compressed form, because
 they may expect to be able to access either source code or data files as
 normal operating system files.  So, ``setuptools`` can install your project

From e5822f0d5be6386bf86cde03988bfdf1bfc2e935 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 08:37:57 +0200
Subject: [PATCH 5677/8469] Update changelog. Fixes #543.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 248c32fa53..40cab4fb76 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v20.8.0
+-------
+
+* Issue #543: Re-release so that latest release doesn't
+  cause déjà vu with distribute and setuptools 0.7 in
+  older environments.
+
 v20.7.0
 -------
 

From f676f1a8e36d4a887a81aba3cba64f2bec850ec7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 08:39:13 +0200
Subject: [PATCH 5678/8469] =?UTF-8?q?Bump=20version:=2020.7.0=20=E2=86=92?=
 =?UTF-8?q?=2020.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6ec7f46477..9940bbc3e9 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.7.0
+current_version = 20.8.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 1de76ce986..08720fb581 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.7.0",
+    version="20.8.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From bc35160987a7dda23de0c898a7e8ae4363504cde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 08:39:14 +0200
Subject: [PATCH 5679/8469] Added tag v20.8.0 for changeset 7f56b6f40de3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f3b82ececd..9348b875e5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -253,3 +253,4 @@ b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
 0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
 a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0
+7f56b6f40de39456c78507a14c288709712881cb v20.8.0

From dd5caefb987dbd15495047fc653fa71d4667eb43 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 09:03:49 +0200
Subject: [PATCH 5680/8469] Always inject extra into the environment when
 evaluating markers. Fixes #544.

---
 CHANGES.rst                           |  6 ++++++
 pkg_resources/__init__.py             |  4 ++--
 pkg_resources/tests/test_resources.py | 10 +---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 40cab4fb76..acfe3df3a6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v20.8.1
+-------
+
+* Issue #544: Fix issue with extra environment marker
+  processing in WorkingSet due to refactor in v20.7.0.
+
 v20.8.0
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ce4e775567..2eab823047 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -988,9 +988,9 @@ def markers_pass(self, req):
         """
         extra_evals = (
             req.marker.evaluate({'extra': extra})
-            for extra in self.get(req, ())
+            for extra in self.get(req, ()) + (None,)
         )
-        return not req.marker or any(extra_evals) or req.marker.evaluate()
+        return not req.marker or any(extra_evals)
 
 
 class Environment(object):
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 0a72d94144..31847dc842 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -189,7 +189,7 @@ def test_environment_marker_evaluation_positive(self):
     def test_environment_marker_evaluation_called(self):
         """
         If one package foo requires bar without any extras,
-        markers should pass for bar.
+        markers should pass for bar without extras.
         """
         parent_req, = parse_requirements("foo")
         req, = parse_requirements("bar;python_version>='2'")
@@ -201,14 +201,6 @@ def test_environment_marker_evaluation_called(self):
         req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
         assert req_extras.markers_pass(req)
 
-        # extra should not be present in the marker namespace if
-        # no markers were supplied
-        parent_req, = parse_requirements("foo")
-        req, = parse_requirements("bar;extra==''")
-        req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
-        with pytest.raises(packaging.markers.UndefinedEnvironmentName):
-            req_extras.markers_pass(req)
-
     def test_marker_evaluation_with_extras(self):
         """Extras are also evaluated as markers at resolution time."""
         ad = pkg_resources.Environment([])

From 8b62ac49a915ab16bde75635bd6c58d2ec66b19c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 09:03:55 +0200
Subject: [PATCH 5681/8469] =?UTF-8?q?Bump=20version:=2020.8.0=20=E2=86=92?=
 =?UTF-8?q?=2020.8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9940bbc3e9..565ed00986 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.8.0
+current_version = 20.8.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 08720fb581..834fdeee06 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.8.0",
+    version="20.8.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 4950c05901da4382741cc8ce22a12da50436e2cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Apr 2016 09:03:55 +0200
Subject: [PATCH 5682/8469] Added tag v20.8.1 for changeset 8cf9340669ae

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9348b875e5..8a522a5333 100644
--- a/.hgtags
+++ b/.hgtags
@@ -254,3 +254,4 @@ b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
 a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0
 7f56b6f40de39456c78507a14c288709712881cb v20.8.0
+8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1

From 18b7ab638a52b1dc2899f2e32b33f41d931ce2f4 Mon Sep 17 00:00:00 2001
From: Rick Liu <rickliu@fortinet.com>
Date: Fri, 15 Apr 2016 12:19:52 -0700
Subject: [PATCH 5683/8469] Handle not-zip-safe egg (folder) deletion in rotate
 command

---
 setuptools/command/rotate.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 804f962a7b..b89353f529 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -2,6 +2,7 @@
 from distutils import log
 from distutils.errors import DistutilsOptionError
 import os
+import shutil
 
 from setuptools.extern import six
 
@@ -59,4 +60,7 @@ def run(self):
             for (t, f) in files:
                 log.info("Deleting %s", f)
                 if not self.dry_run:
-                    os.unlink(f)
+                    if os.path.isdir(f):
+                        shutil.rmtree(f)
+                    else:
+                        os.unlink(f)

From c949b7d6f0f28461a15237ac9d54ad0b2db4c439 Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Fri, 18 Mar 2016 10:06:38 +0200
Subject: [PATCH 5684/8469] remove _markerlib from manifest

Signed-off-by: Gabi Davar <grizzly.nyo@gmail.com>
---
 MANIFEST.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index dfea20495c..668e13ce06 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,6 @@ recursive-include setuptools *.py *.exe *.xml
 recursive-include tests *.py
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
-recursive-include _markerlib *.py
 recursive-include setuptools/_vendor *
 recursive-include pkg_resources *.py *.txt
 include *.py

From fb5f96f0b3d145a1d874f4fedfb8a746c2e3be49 Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Wed, 2 Dec 2015 20:14:54 +0200
Subject: [PATCH 5685/8469] bump certifi to 2016.2.28

Signed-off-by: Gabi Davar <grizzly.nyo@gmail.com>
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 834fdeee06..50565c9d47 100755
--- a/setup.py
+++ b/setup.py
@@ -146,10 +146,10 @@ def _gen_console_scripts():
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2015.11.20",
+        "certs": "certifi==2016.2.28",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts=[],

From 614e827135daf7b7b6e19d5711de46982327423e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Apr 2016 10:52:28 +0200
Subject: [PATCH 5686/8469] update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index acfe3df3a6..7d3ce2fce6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v20.9.0
+-------
+
+* #548: Update certify version to 2016.2.28
+* #545: Safely handle deletion of non-zip eggs in rotate
+  command.
+
 v20.8.1
 -------
 

From c748a49baec0df9e94adcb59443a756af7e902ad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Apr 2016 10:54:30 +0200
Subject: [PATCH 5687/8469] =?UTF-8?q?Bump=20version:=2020.8.1=20=E2=86=92?=
 =?UTF-8?q?=2020.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 565ed00986..f2b8d25496 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.8.1
+current_version = 20.9.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 50565c9d47..a29f0a1708 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.8.1",
+    version="20.9.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From dc1100855f390dc6f7a85a85e3e209e01d46f114 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Apr 2016 10:54:31 +0200
Subject: [PATCH 5688/8469] Added tag v20.9.0 for changeset 8bf8aaa139bb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8a522a5333..e1c9258e38 100644
--- a/.hgtags
+++ b/.hgtags
@@ -255,3 +255,4 @@ a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0
 7f56b6f40de39456c78507a14c288709712881cb v20.8.0
 8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
+8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0

From fc6aec49d66daaf28d0c1a5ddb31766a056599f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Apr 2016 17:00:33 +0100
Subject: [PATCH 5689/8469] Limit deploys to Python 3.5 and only the standard
 run. Ref #549.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2611f02a89..fdb4d5530c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,9 @@ deploy:
   on:
     tags: true
     all_branches: true
+    python: 3.5
+    condition: -z $LC_ALL
   user: jaraco
   password:
     secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
   distributions: release
-  python: 3.5

From 2fbcd3426032bd175fbab63a7e26fba76369eeb9 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 17 Apr 2016 18:07:20 +0200
Subject: [PATCH 5690/8469] Feature/msvc discovery

It's finished !! Now, it fully support MSVC from 9.0 to 14.0, and all theses standalone distributions:
- Microsoft Visual C++ Compiler for Python 2.7 (MSVC++9.0, x86, amd64)
- Microsoft Windows SDK 6.1 (MSVC++9.0, x86, x64, ia64)
- Microsoft Windows SDK 7.0 (MSVC++9.0, x86, x64, ia64)
- Microsoft Windows SDK 7.1 (MSVC++10.0, x86, x64, ia64)
- Microsoft Visual C++ Build Tools 2015 (MSVC++14.0, x86, x64, arm)

Next step:
- Code review.
- Test it with some MSVC versions/Architectures/Python versions combinations.

I have also some comments on the global implementation:
- I think `msvc9_find_vcvarsall` can now be deleted.
- Maybe rename the file, by example "msvc_support.py".
- Maybe Implementing it (And other distutils patchs) for not be only called by "setuptools", but also by "pkg_resources": This will automatically activate patchs for some externals packages like "Cython" transparently.
---
 setuptools/msvc9_support.py | 301 ++++++++++++++++++++++++++++--------
 1 file changed, 239 insertions(+), 62 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 0e144a8047..860ab9f51c 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -379,12 +379,33 @@ def vc_for_python(self):
         path = r'DevDiv\VCForPython'
         return os.path.join(self.microsoft, path)
 
+    @property
+    def microsoft_sdk(self):
+        """
+        Microsoft SDK registry key.
+        """
+        return os.path.join(self.microsoft, 'Microsoft SDKs')
+
     @property
     def windows_sdk(self):
         """
         Microsoft Windows/Platform SDK registry key.
         """
-        return os.path.join(self.microsoft, r'Microsoft SDKs\Windows')
+        return os.path.join(self.microsoft_sdk, 'Windows')
+
+    @property
+    def netfx_sdk(self):
+        """
+        Microsoft .NET Framework SDK registry key.
+        """
+        return os.path.join(self.microsoft_sdk, 'NETFXSDK')
+
+    @property
+    def windows_kits_roots(self):
+        """
+        Microsoft Windows Kits Roots registry key.
+        """
+        return os.path.join(self.microsoft, r'Windows Kits\Installed Roots')
 
     def lookup(self, key, name):
         """
@@ -429,6 +450,7 @@ class SystemInfo:
 
     def __init__(self, registry_info, vcver=None):
         self.ri = registry_info
+        self.pi = self.ri.pi
         if vcver:
             self.vcver = vcver
         else:
@@ -503,22 +525,29 @@ def VCInstallDir(self):
         return result
 
     @property
-    def WindowsSdkDir(self):
+    def WindowsSdkVersion(self):
         """
-        Microsoft Windows SDK directory.
+        Microsoft Windows SDK versions.
         """
-        sdkdir = ''
+        # Set Windows SDK versions for specified MSVC++ version
         if self.vcver <= 9.0:
-            sdkver = ('7.0', '6.1', '6.0a')
+            return ('7.0', '6.1', '6.0a')
         elif self.vcver == 10.0:
-            sdkver = ('7.1', '7.0a')
+            return ('7.1', '7.0a')
         elif self.vcver == 11.0:
-            sdkver = ('8.0', '8.0a')
+            return ('8.0', '8.0a')
         elif self.vcver == 12.0:
-            sdkver = ('8.1', '8.1a')
+            return ('8.1', '8.1a')
         elif self.vcver >= 14.0:
-            sdkver = ('10.0', '8.1')
-        for ver in sdkver:
+            return ('10.0', '8.1')
+
+    @property
+    def WindowsSdkDir(self):
+        """
+        Microsoft Windows SDK directory.
+        """
+        sdkdir = ''
+        for ver in self.WindowsSdkVersion:
             # Try to get it from registry
             loc = os.path.join(self.ri.windows_sdk, 'v%s' % ver)
             sdkdir = self.ri.lookup(loc, 'installationfolder')
@@ -532,7 +561,7 @@ def WindowsSdkDir(self):
                 sdkdir = os.path.join(install_base, 'WinSDK')
         if not sdkdir or not os.path.isdir(sdkdir):
             # If fail, use default new path
-            for ver in sdkver:
+            for ver in self.WindowsSdkVersion:
                 intver = ver[:ver.rfind('.')]
                 path = r'Microsoft SDKs\Windows Kits\%s' % (intver)
                 d = os.path.join(self.ProgramFiles, path)
@@ -540,7 +569,7 @@ def WindowsSdkDir(self):
                     sdkdir = d
         if not sdkdir or not os.path.isdir(sdkdir):
             # If fail, use default old path
-            for ver in sdkver:
+            for ver in self.WindowsSdkVersion:
                 path = r'Microsoft SDKs\Windows\v%s' % ver
                 d = os.path.join(self.ProgramFiles, path)
                 if os.path.isdir(d):
@@ -550,6 +579,37 @@ def WindowsSdkDir(self):
             sdkdir = os.path.join(self.VCInstallDir, 'PlatformSDK')
         return sdkdir
 
+    @property
+    def WindowsSDKExecutablePath(self):
+        """
+        Microsoft Windows SDK executable directory.
+        """
+        # Find WinSDK NetFx Tools registry dir name
+        if self.vcver <= 11.0:
+            netfxver = 35
+            arch = ''
+        else:
+            netfxver = 40
+            hidex86 = True if self.vcver <= 12.0 else False
+            arch = self.pi.current_dir(x64=True, hidex86=hidex86)
+        fx = 'WinSDK-NetFx%dTools%s' % (netfxver, arch.replace('\\', '-'))
+
+        # liste all possibles registry paths
+        regpaths = []
+        if self.vcver >= 14.0:
+            for ver in self.NetFxSdkVersion:
+                regpaths += [os.path.join(self.ri.netfx_sdk, ver, fx)]
+
+        for ver in self.WindowsSdkVersion:
+            regpaths += [os.path.join(self.ri.windows_sdk, 'v%sA' % ver, fx)]
+
+        # Return installation folder from the more recent path
+        for path in regpaths:
+            execpath = self.ri.lookup(path, 'installationfolder')
+            if execpath:
+                break
+        return execpath
+
     @property
     def FSharpInstallDir(self):
         """
@@ -559,6 +619,48 @@ def FSharpInstallDir(self):
         path = os.path.join(self.ri.visualstudio, path)
         return self.ri.lookup(path, 'productdir') or ''
 
+    @property
+    def UniversalCRTSdkDir(self):
+        """
+        Microsoft Universal CRT SDK directory.
+        """
+        # Set Kit Roots versions for specified MSVC++ version
+        if self.vcver >= 14.0:
+            vers = ('10', '81')
+        else:
+            vers = ()
+
+        # Find path of the more recent Kit
+        for ver in vers:
+            sdkdir = self.ri.lookup(self.ri.windows_kits_roots,
+                                    'kitsroot%s' % ver)
+            if sdkdir:
+                break
+        return sdkdir or ''
+
+    @property
+    def NetFxSdkVersion(self):
+        """
+        Microsoft .NET Framework SDK versions.
+        """
+        # Set FxSdk versions for specified MSVC++ version
+        if self.vcver >= 14.0:
+            return ('4.6.1', '4.6')
+        else:
+            return ()
+
+    @property
+    def NetFxSdkDir(self):
+        """
+        Microsoft .NET Framework SDK directory.
+        """
+        for ver in self.NetFxSdkVersion:
+            loc = os.path.join(self.ri.netfx_sdk, ver)
+            sdkdir = self.ri.lookup(loc, 'kitsinstallationfolder')
+            if sdkdir:
+                break
+        return sdkdir or ''
+
     @property
     def FrameworkDir32(self):
         """
@@ -611,10 +713,8 @@ def _find_dot_net_versions(self, bits=32):
         if self.vcver >= 12.0:
             frameworkver = (ver, 'v4.0')
         elif self.vcver >= 10.0:
-            if ver.lower()[:2] != 'v4':
-                ver = ''
-            ver = ver or 'v4.0.30319'
-            frameworkver = (ver, 'v3.5')
+            frameworkver = ('v4.0.30319' if ver.lower()[:2] != 'v4' else ver,
+                            'v3.5')
         elif self.vcver == 9.0:
             frameworkver = ('v3.5', 'v2.0.50727')
         if self.vcver == 8.0:
@@ -647,9 +747,10 @@ def __init__(self, arch, vcver=None, vcvermin=None):
         self.ri = RegistryInfo(self.pi)
         self.si = SystemInfo(self.ri, vcver)
 
-        if self.vcver < vcvermin:
-            err = 'No suitable Microsoft Visual C++ version found'
-            raise distutils.errors.DistutilsPlatformError(err)
+        if vcvermin:
+            if self.vcver < vcvermin:
+                err = 'No suitable Microsoft Visual C++ version found'
+                raise distutils.errors.DistutilsPlatformError(err)
 
     @property
     def vcver(self):
@@ -664,11 +765,13 @@ def VSTools(self):
         Microsoft Visual Studio Tools
         """
         paths = [r'Common7\IDE', r'Common7\Tools']
+
         if self.vcver >= 14.0:
             arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             paths += [r'Common7\IDE\CommonExtensions\Microsoft\TestWindow']
             paths += [r'Team Tools\Performance Tools']
             paths += [r'Team Tools\Performance Tools%s' % arch_subdir]
+
         return [os.path.join(self.si.VSInstallDir, path) for path in paths]
 
     @property
@@ -686,8 +789,10 @@ def VCLibraries(self):
         """
         arch_subdir = self.pi.target_dir(hidex86=True)
         paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
+
         if self.vcver >= 14.0:
             paths += [r'Lib\store%s' % arch_subdir]
+
         return [os.path.join(self.si.VCInstallDir, path) for path in paths]
 
     @property
@@ -706,15 +811,16 @@ def VCTools(self):
         """
         forcex86 = True if self.vcver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
-        tools = [
-            os.path.join(self.si.VCInstallDir, 'VCPackages'),
-            os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir),
-        ]
+        tools = [os.path.join(self.si.VCInstallDir, 'VCPackages'),
+                 os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir)]
+
         if self.pi.cross_dir() and self.vcver >= 14.0:
             path = 'Bin%s' % self.pi.current_dir(hidex86=True)
             tools += [os.path.join(self.si.VCInstallDir, path)]
+
         else:
             tools += [os.path.join(self.si.VCInstallDir, 'Bin')]
+
         return tools
 
     @property
@@ -722,39 +828,71 @@ def OSLibraries(self):
         """
         Microsoft Windows SDK Libraries
         """
-        arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
-        return [os.path.join(self.si.WindowsSdkDir, 'Bin%s' % arch_subdir)]
+        if self.vcver <= 10.0:
+            arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
+            return [os.path.join(self.si.WindowsSdkDir, 'Bin%s' % arch_subdir)]
+
+        else:
+            arch_subdir = self.pi.target_dir(x64=True)
+            lib = os.path.join(self.si.WindowsSdkDir, 'lib')
+            libver = self._get_content_dirname(lib)
+            return [os.path.join(lib, r'%sum%s' % (libver, arch_subdir))]
 
     @property
     def OSIncludes(self):
         """
         Microsoft Windows SDK Include
         """
+        include = os.path.join(self.si.WindowsSdkDir, 'include')
+
         if self.vcver <= 10.0:
-            return [
-                os.path.join(self.si.WindowsSdkDir, 'Include'),
-                os.path.join(self.si.WindowsSdkDir, r'Include\gl')
-            ]
-        elif self.vcver <= 12.0:
-            return [
-                os.path.join(self.si.WindowsSdkDir, r'include\shared'),
-                os.path.join(self.si.WindowsSdkDir, r'include\um'),
-                os.path.join(self.si.WindowsSdkDir, r'include\winrt')
-            ]
+            return [include, os.path.join(include, 'gl')]
+
+        else:
+            if self.vcver >= 14.0:
+                sdkver = self._get_content_dirname(include)
+            else:
+                sdkver = ''
+            return [os.path.join(include, '%sshared' % sdkver),
+                    os.path.join(include, '%sum' % sdkver),
+                    os.path.join(include, '%swinrt' % sdkver)]
+
+    @property
+    def OSLibpath(self):
+        """
+        Microsoft Windows SDK Libraries Paths
+        """
+        ref = os.path.join(self.si.WindowsSdkDir, 'References')
+        libpath = [os.path.join(ref, r'CommonConfiguration\Neutral')]
+
+        if self.vcver >= 14.0:
+            libpath += [ref,
+                        os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
+                        os.path.join(ref, r'Windows.Foundation.'
+                                     r'UniversalApiContract\1.0.0.0'),
+                        os.path.join(ref, r'Windows.Foundation.'
+                                     r'FoundationContract\1.0.0.0'),
+                        os.path.join(ref, r'Windows.Networking.Connectivity.'
+                                     r'WwanContract\1.0.0.0'),
+                        os.path.join(self.si.WindowsSdkDir, r'ExtensionSDKs'
+                                     r'\Microsoft.VCLibs\%0.1f\References'
+                                     r'\CommonConfiguration\neutral' %
+                                     self.vcver)]
+        return libpath
 
     @property
     def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
-        if self.vcver <= 11.0:
-            tools = [os.path.join(self.si.WindowsSdkDir, 'Bin')]
-        else:
-            tools = [os.path.join(self.si.WindowsSdkDir, r'Bin\x86')]
+        tools = [os.path.join(self.si.WindowsSdkDir,
+                              'Bin' if self.vcver <= 11.0 else r'Bin\x86')]
+
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
             path = 'Bin%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
+
         if self.vcver == 10.0 or self.vcver == 11.0:
             if self.pi.target_is_x86():
                 arch_subdir = ''
@@ -762,6 +900,10 @@ def SdkTools(self):
                 arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
+
+        if self.si.WindowsSDKExecutablePath:
+            tools += [self.si.WindowsSDKExecutablePath]
+
         return tools
 
     @property
@@ -778,23 +920,21 @@ def FxTools(self):
         """
         pi = self.pi
         si = self.si
+
         if self.vcver <= 10.0:
             include32 = True
             include64 = not pi.target_is_x86() and not pi.current_is_x86()
         else:
             include32 = pi.target_is_x86() or pi.current_is_x86()
             include64 = pi.current_cpu == 'amd64' or pi.target_cpu == 'amd64'
+
         tools = []
         if include32:
-            tools += [
-                os.path.join(si.FrameworkDir32, ver)
-                for ver in si.FrameworkVersion32
-            ]
+            tools += [os.path.join(si.FrameworkDir32, ver)
+                      for ver in si.FrameworkVersion32]
         if include64:
-            tools += [
-                os.path.join(si.FrameworkDir64, ver)
-                for ver in si.FrameworkVersion64
-            ]
+            tools += [os.path.join(si.FrameworkDir64, ver)
+                      for ver in si.FrameworkVersion64]
         return tools
 
     @property
@@ -802,17 +942,22 @@ def NetFxSDKLibraries(self):
         """
         Microsoft .Net Framework SDK Libraries
         """
-        if self.vcver < 14.0:
+        if self.vcver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
+        arch_subdir = self.pi.target_dir(x64=True)
+        return [os.path.join(self.si.NetFxSdkDir, r'lib\um%s' % arch_subdir)]
+
     @property
     def NetFxSDKIncludes(self):
         """
         Microsoft .Net Framework SDK Includes
         """
-        if self.vcver < 14.0:
+        if self.vcver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
+        return [os.path.join(self.si.NetFxSdkDir, r'include\um')]
+
     @property
     def VsTDb(self):
         """
@@ -827,24 +972,22 @@ def MSBuild(self):
         """
         if self.vcver < 12.0:
             return []
+
         arch_subdir = self.pi.current_dir(hidex86=True)
         path = r'\MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
-        return [
-            os.path.join(self.si.ProgramFilesx86, path),
-            os.path.join(self.si.ProgramFiles, path)
-        ]
+        return [os.path.join(self.si.ProgramFilesx86, path),
+                os.path.join(self.si.ProgramFiles, path)]
 
     @property
-    def HTMLWs(self):
+    def HTMLHelpWorkshop(self):
         """
         Microsoft HTML Help Workshop
         """
         if self.vcver < 11.0:
             return []
-        return [
-            os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop'),
-            os.path.join(self.si.ProgramFiles, 'HTML Help Workshop')
-        ]
+
+        return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop'),
+                os.path.join(self.si.ProgramFiles, 'HTML Help Workshop')]
 
     @property
     def UCRTLibraries(self):
@@ -854,6 +997,11 @@ def UCRTLibraries(self):
         if self.vcver < 14.0:
             return []
 
+        arch_subdir = self.pi.target_dir(x64=True)
+        lib = os.path.join(self.si.UniversalCRTSdkDir, 'lib')
+        ucrtver = self._get_content_dirname(lib)
+        return [os.path.join(lib, '%sucrt%s' % (ucrtver, arch_subdir))]
+
     @property
     def UCRTIncludes(self):
         """
@@ -862,6 +1010,10 @@ def UCRTIncludes(self):
         if self.vcver < 14.0:
             return []
 
+        include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
+        ucrtver = self._get_content_dirname(include)
+        return [os.path.join(include, '%sucrt' % ucrtver)]
+
     @property
     def FSharp(self):
         """
@@ -869,6 +1021,7 @@ def FSharp(self):
         """
         if self.vcver < 11.0 and self.vcver > 12.0:
             return []
+
         return self.si.FSharpInstallDir
 
     @property
@@ -900,7 +1053,8 @@ def return_env(self):
             libpath=self._build_paths('libpath',
                                       [self.VCLibraries,
                                        self.FxTools,
-                                       self.VCStoreRefs]),
+                                       self.VCStoreRefs,
+                                       self.OSLibpath]),
             path=self._build_paths('path',
                                    [self.VCTools,
                                     self.VSTools,
@@ -909,7 +1063,7 @@ def return_env(self):
                                     self.SdkSetup,
                                     self.FxTools,
                                     self.MSBuild,
-                                    self.HTMLWs,
+                                    self.HTMLHelpWorkshop,
                                     self.FSharp]),
         )
         if self.vcver >= 14 and os.path.isfile(self.VCRuntimeRedist):
@@ -940,9 +1094,11 @@ def _unique_everseen(self, iterable, key=None):
         """
         List unique elements, preserving order.
         Remember all elements ever seen.
+
+        _unique_everseen('AAAABBBCCDAABBB') --> A B C D
+
+        _unique_everseen('ABBCcAD', str.lower) --> A B C D
         """
-        # unique_everseen('AAAABBBCCDAABBB') --> A B C D
-        # unique_everseen('ABBCcAD', str.lower) --> A B C D
         seen = set()
         seen_add = seen.add
         filterfalse = six.moves.filterfalse
@@ -956,3 +1112,24 @@ def _unique_everseen(self, iterable, key=None):
                 if k not in seen:
                     seen_add(k)
                     yield element
+
+    def _get_content_dirname(self, path):
+        """
+        Return name of the first dir in path or '' if no dir found.
+
+        Parameters
+        ----------
+        path: str
+            Path where search dir.
+
+        Return
+        ------
+        foldername: str
+            "name\" or ""
+        """
+        try:
+            name = os.listdir(path)
+            if name:
+                return '%s\\' % name[0]
+        except FileNotFoundError:
+            return ''

From d8587a79301f6eba5334f9e365188b9a9af1d2ac Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 17 Apr 2016 18:46:24 +0200
Subject: [PATCH 5691/8469] Update msvc9_support.py

---
 setuptools/msvc9_support.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 860ab9f51c..38acc43f45 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -1131,5 +1131,6 @@ def _get_content_dirname(self, path):
             name = os.listdir(path)
             if name:
                 return '%s\\' % name[0]
+            return ''
         except FileNotFoundError:
             return ''

From df05ebf3e88858ae7ac74071bd20c86782e1415d Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Mon, 18 Apr 2016 15:08:49 -0400
Subject: [PATCH 5692/8469] Preserve order of egg_info section in setup.cfg

egg_info is the dictionary with information that is injected
into setup.cfg. edit_config uses RawConfigParser which uses
collections.OrderedDict for all the data. When we use a
simple dict(), when we loop through items in edit_config, we
see random behavior as a result the fields
tag_svn_revision/tag_date/tag_build are added to the setup.cfg
randomly. So if we sort the items by key when we traverse items
we will get deterministic output as RawConfigParser uses
OrderedDict internally by default.
---
 setuptools/command/setopt.py      |  7 +++-
 setuptools/tests/test_egg_info.py | 62 +++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 7f332be5a4..912da78254 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -2,6 +2,7 @@
 from distutils import log
 from distutils.errors import DistutilsOptionError
 import distutils
+import operator
 import os
 
 from setuptools.extern.six.moves import configparser
@@ -42,7 +43,8 @@ def edit_config(filename, settings, dry_run=False):
     log.debug("Reading configuration from %s", filename)
     opts = configparser.RawConfigParser()
     opts.read([filename])
-    for section, options in settings.items():
+    for section, options in sorted(settings.items(),
+                                   key=operator.itemgetter(0)):
         if options is None:
             log.info("Deleting section [%s] from %s", section, filename)
             opts.remove_section(section)
@@ -50,7 +52,8 @@ def edit_config(filename, settings, dry_run=False):
             if not opts.has_section(section):
                 log.debug("Adding new section [%s] to %s", section, filename)
                 opts.add_section(section)
-            for option, value in options.items():
+            for option, value in sorted(options.items(),
+                                        key=operator.itemgetter(0)):
                 if value is None:
                     log.debug(
                         "Deleting %s.%s from %s",
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index fd5f26fc2d..d37b127e77 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,7 +1,16 @@
 import os
 import glob
+import re
 import stat
+import sys
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+from setuptools.command.egg_info import egg_info
+from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map
 
 import pytest
@@ -59,6 +68,59 @@ def env(self):
             })
             yield env
 
+    def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
+        setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
+        build_files({
+            setup_cfg: DALS("""
+            [egg_info]
+            """),
+        })
+        dist = Distribution()
+        ei = egg_info(dist)
+        ei.initialize_options()
+        ei.save_version_info(setup_cfg)
+
+        with open(setup_cfg, 'r') as f:
+            content = f.read()
+
+            assert '[egg_info]' in content
+            assert 'tag_build =' in content
+            assert 'tag_date = 0' in content
+            assert 'tag_svn_revision = 0' in content
+
+            if sys.version_info[0:2] >= (2, 7):
+                assert re.search('tag_build.*tag_date.*tag_svn_revision',
+                                 content,
+                                 re.MULTILINE | re.DOTALL) is not None
+
+    def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
+        setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
+        build_files({
+            setup_cfg: DALS("""
+            [egg_info]
+            tag_build =
+            tag_date = 0
+            tag_svn_revision = 0
+            """),
+        })
+        dist = Distribution()
+        ei = egg_info(dist)
+        ei.initialize_options()
+        ei.save_version_info(setup_cfg)
+
+        with open(setup_cfg, 'r') as f:
+            content = f.read()
+
+            assert '[egg_info]' in content
+            assert 'tag_build =' in content
+            assert 'tag_date = 0' in content
+            assert 'tag_svn_revision = 0' in content
+
+            if sys.version_info[0:2] >= (2, 7):
+                assert re.search('tag_build.*tag_date.*tag_svn_revision',
+                                 content,
+                                 re.MULTILINE | re.DOTALL) is not None
+
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 

From 085247fa441f9b0fac05117ca1a3283e3510fb32 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:25:21 -0400
Subject: [PATCH 5693/8469] Use OrderedDict to retain deterministic ordering of
 version info in egg_info command. Remove lexicographic ordering in
 setopt.edit_config. Ref #553

---
 setuptools/command/egg_info.py    | 23 +++++++++++++++--------
 setuptools/command/setopt.py      |  7 ++-----
 setuptools/tests/test_egg_info.py |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index d1bd9b0406..3c033300e8 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -13,6 +13,7 @@
 import io
 import warnings
 import time
+import collections
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map
@@ -66,14 +67,20 @@ def initialize_options(self):
         self.vtags = None
 
     def save_version_info(self, filename):
-        values = dict(
-            egg_info=dict(
-                tag_svn_revision=0,
-                tag_date=0,
-                tag_build=self.tags(),
-            )
-        )
-        edit_config(filename, values)
+        """
+        Materialize the values of svn_revision and date into the
+        build tag. Install these keys in a deterministic order
+        to avoid arbitrary reordering on subsequent builds.
+        """
+        # python 2.6 compatibility
+        odict = getattr(collections, 'OrderedDict', dict)
+        egg_info = odict()
+        # follow the order these keys would have been added
+        # when PYTHONHASHSEED=0
+        egg_info['tag_date'] = 0
+        egg_info['tag_svn_revision'] = 0
+        egg_info['tag_build'] = self.tags()
+        edit_config(filename, dict(egg_info=egg_info))
 
     def finalize_options(self):
         self.egg_name = safe_name(self.distribution.get_name())
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 912da78254..7f332be5a4 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -2,7 +2,6 @@
 from distutils import log
 from distutils.errors import DistutilsOptionError
 import distutils
-import operator
 import os
 
 from setuptools.extern.six.moves import configparser
@@ -43,8 +42,7 @@ def edit_config(filename, settings, dry_run=False):
     log.debug("Reading configuration from %s", filename)
     opts = configparser.RawConfigParser()
     opts.read([filename])
-    for section, options in sorted(settings.items(),
-                                   key=operator.itemgetter(0)):
+    for section, options in settings.items():
         if options is None:
             log.info("Deleting section [%s] from %s", section, filename)
             opts.remove_section(section)
@@ -52,8 +50,7 @@ def edit_config(filename, settings, dry_run=False):
             if not opts.has_section(section):
                 log.debug("Adding new section [%s] to %s", section, filename)
                 opts.add_section(section)
-            for option, value in sorted(options.items(),
-                                        key=operator.itemgetter(0)):
+            for option, value in options.items():
                 if value is None:
                     log.debug(
                         "Deleting %s.%s from %s",
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d37b127e77..7e7dd4a974 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -89,7 +89,7 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
             assert 'tag_svn_revision = 0' in content
 
             if sys.version_info[0:2] >= (2, 7):
-                assert re.search('tag_build.*tag_date.*tag_svn_revision',
+                assert re.search('tag_date.*tag_svn_revision.*tag_build',
                                  content,
                                  re.MULTILINE | re.DOTALL) is not None
 

From d1f96eed5e4a7e2346521a4666cb2678c155634e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:25:42 -0400
Subject: [PATCH 5694/8469] Remove unused import

---
 setuptools/tests/test_egg_info.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7e7dd4a974..ec000126a7 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -4,11 +4,6 @@
 import stat
 import sys
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
 from setuptools.command.egg_info import egg_info
 from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map

From 90fb7be170b825f1db84c338829806144838cdc8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:26:45 -0400
Subject: [PATCH 5695/8469] Dedent

---
 setuptools/tests/test_egg_info.py | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index ec000126a7..1e447b08c6 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -78,15 +78,15 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         with open(setup_cfg, 'r') as f:
             content = f.read()
 
-            assert '[egg_info]' in content
-            assert 'tag_build =' in content
-            assert 'tag_date = 0' in content
-            assert 'tag_svn_revision = 0' in content
+        assert '[egg_info]' in content
+        assert 'tag_build =' in content
+        assert 'tag_date = 0' in content
+        assert 'tag_svn_revision = 0' in content
 
-            if sys.version_info[0:2] >= (2, 7):
-                assert re.search('tag_date.*tag_svn_revision.*tag_build',
-                                 content,
-                                 re.MULTILINE | re.DOTALL) is not None
+        if sys.version_info[0:2] >= (2, 7):
+            assert re.search('tag_date.*tag_svn_revision.*tag_build',
+                             content,
+                             re.MULTILINE | re.DOTALL) is not None
 
     def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
@@ -106,15 +106,15 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         with open(setup_cfg, 'r') as f:
             content = f.read()
 
-            assert '[egg_info]' in content
-            assert 'tag_build =' in content
-            assert 'tag_date = 0' in content
-            assert 'tag_svn_revision = 0' in content
+        assert '[egg_info]' in content
+        assert 'tag_build =' in content
+        assert 'tag_date = 0' in content
+        assert 'tag_svn_revision = 0' in content
 
-            if sys.version_info[0:2] >= (2, 7):
-                assert re.search('tag_build.*tag_date.*tag_svn_revision',
-                                 content,
-                                 re.MULTILINE | re.DOTALL) is not None
+        if sys.version_info[0:2] >= (2, 7):
+            assert re.search('tag_build.*tag_date.*tag_svn_revision',
+                             content,
+                             re.MULTILINE | re.DOTALL) is not None
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()

From c4d546e69bf43a57d13be83a4fe5119af8704388 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:28:12 -0400
Subject: [PATCH 5696/8469] Remove superfluous slice

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

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1e447b08c6..7f52fe22b5 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -83,7 +83,7 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         assert 'tag_date = 0' in content
         assert 'tag_svn_revision = 0' in content
 
-        if sys.version_info[0:2] >= (2, 7):
+        if sys.version_info >= (2, 7):
             assert re.search('tag_date.*tag_svn_revision.*tag_build',
                              content,
                              re.MULTILINE | re.DOTALL) is not None
@@ -111,7 +111,7 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         assert 'tag_date = 0' in content
         assert 'tag_svn_revision = 0' in content
 
-        if sys.version_info[0:2] >= (2, 7):
+        if sys.version_info >= (2, 7):
             assert re.search('tag_build.*tag_date.*tag_svn_revision',
                              content,
                              re.MULTILINE | re.DOTALL) is not None

From 46b76edc1e451276e1fb9e31c90c311898486de3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:32:34 -0400
Subject: [PATCH 5697/8469] Extract method for validating the order.

---
 setuptools/tests/test_egg_info.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7f52fe22b5..efe61eea6b 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -83,10 +83,18 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         assert 'tag_date = 0' in content
         assert 'tag_svn_revision = 0' in content
 
-        if sys.version_info >= (2, 7):
-            assert re.search('tag_date.*tag_svn_revision.*tag_build',
-                             content,
-                             re.MULTILINE | re.DOTALL) is not None
+        expected_order = 'tag_date', 'tag_svn_revision', 'tag_build'
+        self._validate_content_order(content, expected_order)
+
+    @staticmethod
+    def _validate_content_order(content, expected_order):
+        if sys.version_info < (2, 7):
+            # order cannot be guaranteed on Python 2.6
+            return
+
+        pattern = '.*'.join(expected_order)
+        flags = re.MULTILINE | re.DOTALL
+        assert re.search(pattern, content, flags)
 
     def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
@@ -111,10 +119,8 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         assert 'tag_date = 0' in content
         assert 'tag_svn_revision = 0' in content
 
-        if sys.version_info >= (2, 7):
-            assert re.search('tag_build.*tag_date.*tag_svn_revision',
-                             content,
-                             re.MULTILINE | re.DOTALL) is not None
+        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+        self._validate_content_order(content, expected_order)
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()

From 66932720c96591ea74015844d713cd5724f4e8af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:47:13 -0400
Subject: [PATCH 5698/8469] Move Python 2.6 exception into specific test,
 capturing that the expected order is different on Python 2.6, not because of
 the lack of OrderedDict, but because of different behavior in
 RawConfigParser. Ref #553.

---
 setuptools/tests/test_egg_info.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index efe61eea6b..76569c3080 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -87,12 +87,12 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         self._validate_content_order(content, expected_order)
 
     @staticmethod
-    def _validate_content_order(content, expected_order):
-        if sys.version_info < (2, 7):
-            # order cannot be guaranteed on Python 2.6
-            return
-
-        pattern = '.*'.join(expected_order)
+    def _validate_content_order(content, expected):
+        """
+        Assert that the strings in expected appear in content
+        in order.
+        """
+        pattern = '.*'.join(expected)
         flags = re.MULTILINE | re.DOTALL
         assert re.search(pattern, content, flags)
 
@@ -120,6 +120,12 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         assert 'tag_svn_revision = 0' in content
 
         expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+
+        if sys.version_info < (2, 7):
+            # On Python 2.6, config gets overridden, retaining order
+            # from the dict.
+            expected_order = dict.fromkeys(expected_order).keys()
+
         self._validate_content_order(content, expected_order)
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):

From 25b2a2d2d586fa80df71e73adb98ab472d97eb10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:48:39 -0400
Subject: [PATCH 5699/8469] It's not necessary to build a file with an empty
 egg_info.

---
 setuptools/tests/test_egg_info.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 76569c3080..7b4f708f53 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -65,11 +65,6 @@ def env(self):
 
     def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
-        build_files({
-            setup_cfg: DALS("""
-            [egg_info]
-            """),
-        })
         dist = Distribution()
         ei = egg_info(dist)
         ei.initialize_options()

From ae8574c0652f2f25c84521dd26af0688f9882fa2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:52:13 -0400
Subject: [PATCH 5700/8469] Add docstrings explaining the intention of the
 test. Ref #553.

---
 setuptools/tests/test_egg_info.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7b4f708f53..8fbf132354 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -64,6 +64,12 @@ def env(self):
             yield env
 
     def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
+        """
+        When the egg_info section is empty or not present, running
+        save_version_info should add the settings to the setup.cfg
+        in a deterministic order, consistent with the ordering found
+        on Python 2.6 and 2.7 with PYTHONHASHSEED=0.
+        """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
         dist = Distribution()
         ei = egg_info(dist)
@@ -92,6 +98,13 @@ def _validate_content_order(content, expected):
         assert re.search(pattern, content, flags)
 
     def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
+        """
+        When running save_version_info on an existing setup.cfg
+        with the 'default' values present from a previous run,
+        the file should remain unchanged, except on Python 2.6,
+        where the order of the keys will be changed to match the
+        order as found in a dictionary of those keys.
+        """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
         build_files({
             setup_cfg: DALS("""

From 7ec2dd5ec7eb6ff7c2bc7f4aedd21a73c5d399a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 09:55:04 -0400
Subject: [PATCH 5701/8469] Update changelog. Closes #553.

---
 CHANGES.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7d3ce2fce6..e0e3828dde 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v20.10.0
+--------
+
+* #553: egg_info section is now generated in a
+  deterministic order, matching the order generated
+  by earlier versions of Python. Except on Python 2.6,
+  order is preserved when existing settings are present.
+
 v20.9.0
 -------
 

From 3ea245437c2094a5eae415732c7b349606fd111f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 10:16:37 -0400
Subject: [PATCH 5702/8469] Correction for expected dict order when
 PYTHONHASHSEED=0

---
 setuptools/command/egg_info.py    |  2 +-
 setuptools/tests/test_egg_info.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 3c033300e8..8e1502a5ff 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -77,9 +77,9 @@ def save_version_info(self, filename):
         egg_info = odict()
         # follow the order these keys would have been added
         # when PYTHONHASHSEED=0
+        egg_info['tag_build'] = self.tags()
         egg_info['tag_date'] = 0
         egg_info['tag_svn_revision'] = 0
-        egg_info['tag_build'] = self.tags()
         edit_config(filename, dict(egg_info=egg_info))
 
     def finalize_options(self):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 8fbf132354..3a0db58f9d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -84,7 +84,8 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         assert 'tag_date = 0' in content
         assert 'tag_svn_revision = 0' in content
 
-        expected_order = 'tag_date', 'tag_svn_revision', 'tag_build'
+        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+
         self._validate_content_order(content, expected_order)
 
     @staticmethod
@@ -93,6 +94,10 @@ def _validate_content_order(content, expected):
         Assert that the strings in expected appear in content
         in order.
         """
+        if sys.version_info < (2, 7):
+            # On Python 2.6, expect dict key order.
+            expected = dict.fromkeys(expected).keys()
+
         pattern = '.*'.join(expected)
         flags = re.MULTILINE | re.DOTALL
         assert re.search(pattern, content, flags)
@@ -129,11 +134,6 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
 
         expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
 
-        if sys.version_info < (2, 7):
-            # On Python 2.6, config gets overridden, retaining order
-            # from the dict.
-            expected_order = dict.fromkeys(expected_order).keys()
-
         self._validate_content_order(content, expected_order)
 
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):

From 5cc432e39c4e8689d117ccc9001d03e47ac5a902 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Apr 2016 10:25:09 -0400
Subject: [PATCH 5703/8469] Support pypy3 also

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fdb4d5530c..0cb6263acc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,6 @@ python:
   - 3.5
   - pypy
   - pypy3
-matrix:
-  allow_failures:
-    - python: pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From f9e6b8fd2d46a2a4efabffaf51151652ef06e55b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Fri, 22 Apr 2016 07:52:42 +0200
Subject: [PATCH 5704/8469] Fix six import

---
 setuptools/msvc9_support.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 38acc43f45..58e34204fc 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -4,8 +4,7 @@
 import os
 import itertools
 import distutils.errors
-import six
-import six.moves.winreg as winreg
+from setuptools.extern.six.moves import winreg, filterfalse
 
 try:
     # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
@@ -1101,7 +1100,6 @@ def _unique_everseen(self, iterable, key=None):
         """
         seen = set()
         seen_add = seen.add
-        filterfalse = six.moves.filterfalse
         if key is None:
             for element in filterfalse(seen.__contains__, iterable):
                 seen_add(element)

From 6c9c3c7e4d53394149c82637f18c0e55d4baca65 Mon Sep 17 00:00:00 2001
From: Brooks Kindle <brooks.kindle@wsu.edu>
Date: Sat, 23 Apr 2016 11:01:39 -0700
Subject: [PATCH 5705/8469] Prompt for password on upload.

The upload command wasn't prompting for a password. If there was no
password specified in ~/.pypirc, the upload command,
    python setup.py sdist upload
would fail and raise a TypeError. The workaround for this was to use
    python setup.py sdist register upload
since the register command does prompt for a password.

This commit ensures that the upload command prompts for a password
if not given one by ~/.pypirc or the register command.
---
 setuptools/command/upload.py | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 08c20ba868..43c0b0d7ef 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -3,13 +3,18 @@
 
 class upload(orig.upload):
     """
-    Override default upload behavior to look up password
-    in the keyring if available.
+    Override default upload behavior to obtain password
+    in a variety of different ways.
     """
 
     def finalize_options(self):
         orig.upload.finalize_options(self)
-        self.password or self._load_password_from_keyring()
+        # Attempt to obtain password. Short circuit evaluation at the first
+        # sign of success.
+        self.password = (
+            self.password or self._load_password_from_keyring() or
+            self._prompt_for_password()
+        )
 
     def _load_password_from_keyring(self):
         """
@@ -17,7 +22,22 @@ def _load_password_from_keyring(self):
         """
         try:
             keyring = __import__('keyring')
-            self.password = keyring.get_password(self.repository,
-                self.username)
+            password = keyring.get_password(self.repository, self.username)
         except Exception:
-            pass
+            password = None
+        finally:
+            return password
+
+    def _prompt_for_password(self):
+        """
+        Prompt for a password on the tty. Suppress Exceptions.
+        """
+        password = None
+        try:
+            import getpass
+            while not password:
+                password = getpass.getpass()
+        except (Exception, KeyboardInterrupt):
+            password = None
+        finally:
+            return password

From fc2afb512cd077a64b008470e213e624495d6efe Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <me@gsnedders.com>
Date: Sat, 23 Apr 2016 23:44:24 +0100
Subject: [PATCH 5706/8469] Update packaging to 16.7

This adds support for the deprecated python_implementation marker
which was an undocumented setuptools marker prior to 20.2 in
addition to the newer markers.
---
 pkg_resources/_vendor/packaging/__about__.py |  2 +-
 pkg_resources/_vendor/packaging/markers.py   | 11 ++++++++++-
 pkg_resources/_vendor/vendored.txt           |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index baa907556c..c21a758b82 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,7 +12,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.6"
+__version__ = "16.7"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index bac852df23..c5d29cd99a 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -78,9 +78,18 @@ class Value(Node):
     L("platform.version") |  # PEP-345
     L("platform.machine") |  # PEP-345
     L("platform.python_implementation") |  # PEP-345
+    L("python_implementation") |  # undocumented setuptools legacy
     L("extra")
 )
-VARIABLE.setParseAction(lambda s, l, t: Variable(t[0].replace('.', '_')))
+ALIASES = {
+    'os.name': 'os_name',
+    'sys.platform': 'sys_platform',
+    'platform.version': 'platform_version',
+    'platform.machine': 'platform_machine',
+    'platform.python_implementation': 'platform_python_implementation',
+    'python_implementation': 'platform_python_implementation'
+}
+VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
 
 VERSION_CMP = (
     L("===") |
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 1d03759ff0..46532c0a34 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
-packaging==16.6
+packaging==16.7
 pyparsing==2.0.6
 six==1.10.0

From 39b80901d20354b093e8220c137ce971c35c20c5 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 24 Apr 2016 01:55:09 +0300
Subject: [PATCH 5707/8469] Issue #26089: Remove duplicate field 'license' from
 DistributionMetadata

It was renamed to 'license' in 178d19cff163.

Patch by Augustin Laville.
---
 dist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist.py b/dist.py
index ffb33ff645..62a24516cf 100644
--- a/dist.py
+++ b/dist.py
@@ -1018,8 +1018,7 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "license", "classifiers",
-                         "download_url",
+                         "contact_email", "classifiers", "download_url",
                          # PEP 314
                          "provides", "requires", "obsoletes",
                          )

From 95f6afb74ad25d2b616ed44499035595fe945fc5 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 24 Apr 2016 13:25:01 +0300
Subject: [PATCH 5708/8469] Issue #23277: Remove more unused sys and os
 imports.

---
 tests/test_clean.py           | 1 -
 tests/test_config.py          | 1 -
 tests/test_install_data.py    | 1 -
 tests/test_install_headers.py | 1 -
 tests/test_unixccompiler.py   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/tests/test_clean.py b/tests/test_clean.py
index b64f300a04..df88ec1e34 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.clean."""
-import sys
 import os
 import unittest
 import getpass
diff --git a/tests/test_config.py b/tests/test_config.py
index 4de825a81e..0929f8a47d 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,5 +1,4 @@
 """Tests for distutils.pypirc.pypirc."""
-import sys
 import os
 import unittest
 import tempfile
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index 4d8c00acb9..d73624d00b 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.install_data."""
-import sys
 import os
 import unittest
 import getpass
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index d953157bb7..d9ed6b7fd2 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -1,5 +1,4 @@
 """Tests for distutils.command.install_headers."""
-import sys
 import os
 import unittest
 import getpass
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 3d14e12aa9..7c95be56d3 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,5 +1,4 @@
 """Tests for distutils.unixccompiler."""
-import os
 import sys
 import unittest
 from test.support import EnvironmentVarGuard, run_unittest

From 905adfca47183d923e35135c4795a3b0439c6104 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 24 Apr 2016 21:41:02 +0300
Subject: [PATCH 5709/8469] Issue #23277: Remove unused imports in tests.

---
 tests/test_bdist_rpm.py       | 4 ----
 tests/test_build_ext.py       | 1 -
 tests/test_clean.py           | 1 -
 tests/test_config.py          | 1 -
 tests/test_cygwinccompiler.py | 3 +--
 tests/test_dep_util.py        | 1 -
 tests/test_file_util.py       | 1 -
 tests/test_install_data.py    | 1 -
 tests/test_install_headers.py | 1 -
 tests/test_spawn.py           | 5 ++---
 10 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 25c14abd32..c1a2a041ee 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -3,16 +3,12 @@
 import unittest
 import sys
 import os
-import tempfile
-import shutil
 from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
 from distutils.tests import support
 from distutils.spawn import find_executable
-from distutils import spawn
-from distutils.errors import DistutilsExecError
 
 SETUP_PY = """\
 from distutils.core import setup
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 366ffbec9f..3d84f8b1d7 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -166,7 +166,6 @@ def test_finalize_options(self):
         cmd = self.build_ext(dist)
         cmd.finalize_options()
 
-        from distutils import sysconfig
         py_include = sysconfig.get_python_inc()
         self.assertIn(py_include, cmd.include_dirs)
 
diff --git a/tests/test_clean.py b/tests/test_clean.py
index df88ec1e34..c605afd860 100644
--- a/tests/test_clean.py
+++ b/tests/test_clean.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.clean."""
 import os
 import unittest
-import getpass
 
 from distutils.command.clean import clean
 from distutils.tests import support
diff --git a/tests/test_config.py b/tests/test_config.py
index 0929f8a47d..d91dedd3a8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,7 +1,6 @@
 """Tests for distutils.pypirc.pypirc."""
 import os
 import unittest
-import tempfile
 
 from distutils.core import PyPIRCCommand
 from distutils.core import Distribution
diff --git a/tests/test_cygwinccompiler.py b/tests/test_cygwinccompiler.py
index 856921679d..9dc869de4c 100644
--- a/tests/test_cygwinccompiler.py
+++ b/tests/test_cygwinccompiler.py
@@ -3,11 +3,10 @@
 import sys
 import os
 from io import BytesIO
-import subprocess
 from test.support import run_unittest
 
 from distutils import cygwinccompiler
-from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
+from distutils.cygwinccompiler import (check_config_h,
                                        CONFIG_H_OK, CONFIG_H_NOTOK,
                                        CONFIG_H_UNCERTAIN, get_versions,
                                        get_msvcr)
diff --git a/tests/test_dep_util.py b/tests/test_dep_util.py
index 3e1c366892..c6fae39cfb 100644
--- a/tests/test_dep_util.py
+++ b/tests/test_dep_util.py
@@ -1,7 +1,6 @@
 """Tests for distutils.dep_util."""
 import unittest
 import os
-import time
 
 from distutils.dep_util import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index a6d04f065d..03040afc79 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -1,7 +1,6 @@
 """Tests for distutils.file_util."""
 import unittest
 import os
-import shutil
 import errno
 from unittest.mock import patch
 
diff --git a/tests/test_install_data.py b/tests/test_install_data.py
index d73624d00b..32ab296a32 100644
--- a/tests/test_install_data.py
+++ b/tests/test_install_data.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.install_data."""
 import os
 import unittest
-import getpass
 
 from distutils.command.install_data import install_data
 from distutils.tests import support
diff --git a/tests/test_install_headers.py b/tests/test_install_headers.py
index d9ed6b7fd2..2217b321e6 100644
--- a/tests/test_install_headers.py
+++ b/tests/test_install_headers.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.install_headers."""
 import os
 import unittest
-import getpass
 
 from distutils.command.install_headers import install_headers
 from distutils.tests import support
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 6c7eb20c47..f507ef7750 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -1,11 +1,10 @@
 """Tests for distutils.spawn."""
 import unittest
 import os
-import time
-from test.support import captured_stdout, run_unittest
+from test.support import run_unittest
 
 from distutils.spawn import _nt_quote_args
-from distutils.spawn import spawn, find_executable
+from distutils.spawn import spawn
 from distutils.errors import DistutilsExecError
 from distutils.tests import support
 

From 1746f3caf7a6a71c04f79da2b89c888cb5daadec Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 25 Apr 2016 00:12:32 +0300
Subject: [PATCH 5710/8469] Removed unused imports.

---
 command/config.py   | 2 +-
 command/register.py | 2 +-
 command/sdist.py    | 1 -
 extension.py        | 1 -
 text_file.py        | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/command/config.py b/command/config.py
index 847e858160..b1fd09e016 100644
--- a/command/config.py
+++ b/command/config.py
@@ -9,7 +9,7 @@
 this header file lives".
 """
 
-import sys, os, re
+import os, re
 
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
diff --git a/command/register.py b/command/register.py
index b49f86fe58..a3e0893a0b 100644
--- a/command/register.py
+++ b/command/register.py
@@ -5,7 +5,7 @@
 
 # created 2002/10/21, Richard Jones
 
-import os, string, getpass
+import getpass
 import io
 import urllib.parse, urllib.request
 from warnings import warn
diff --git a/command/sdist.py b/command/sdist.py
index 7ea3d5fa27..35a06eb09b 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -3,7 +3,6 @@
 Implements the Distutils 'sdist' command (create a source distribution)."""
 
 import os
-import string
 import sys
 from types import *
 from glob import glob
diff --git a/extension.py b/extension.py
index 7efbb74f89..c507da360a 100644
--- a/extension.py
+++ b/extension.py
@@ -4,7 +4,6 @@
 modules in setup scripts."""
 
 import os
-import sys
 import warnings
 
 # This class is really only used by the "build_ext" command, so it might
diff --git a/text_file.py b/text_file.py
index 478336f0d2..93abad38f4 100644
--- a/text_file.py
+++ b/text_file.py
@@ -4,7 +4,7 @@
 that (optionally) takes care of stripping comments, ignoring blank
 lines, and joining lines with backslashes."""
 
-import sys, os, io
+import sys, io
 
 
 class TextFile:

From 89509b570ffeed71361942b5f13fb07b1e6abf6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:09:49 -0500
Subject: [PATCH 5711/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e0e3828dde..aee09f1460 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,8 @@ v20.10.0
   deterministic order, matching the order generated
   by earlier versions of Python. Except on Python 2.6,
   order is preserved when existing settings are present.
+* #556: Update to Packaging 16.7, restoring support
+  for deprecated ``python_implmentation`` marker.
 
 v20.9.0
 -------

From b663992a4864dffd1ee29e2c7d735c795acfd4a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:18:14 -0500
Subject: [PATCH 5712/8469] Update changelog

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index aee09f1460..be3d2ca493 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,9 @@ v20.10.0
   order is preserved when existing settings are present.
 * #556: Update to Packaging 16.7, restoring support
   for deprecated ``python_implmentation`` marker.
+* #555: Upload command now prompts for a password
+  when uploading to PyPI (or other repository) if no
+  password is present in .pypirc or in the keyring.
 
 v20.9.0
 -------

From 9b53df4becddd3efe5d8a2f15273ca6ce9fdb843 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:19:28 -0500
Subject: [PATCH 5713/8469] Move import to header

---
 setuptools/command/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 43c0b0d7ef..0e8bbea382 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -1,3 +1,4 @@
+import getpass
 from distutils.command import upload as orig
 
 
@@ -34,7 +35,6 @@ def _prompt_for_password(self):
         """
         password = None
         try:
-            import getpass
             while not password:
                 password = getpass.getpass()
         except (Exception, KeyboardInterrupt):

From a3b119e14df4aff213231492470587f88457a241 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:20:51 -0500
Subject: [PATCH 5714/8469] Add carriage return for symmetry

---
 setuptools/command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 0e8bbea382..a001d461a4 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -13,7 +13,8 @@ def finalize_options(self):
         # Attempt to obtain password. Short circuit evaluation at the first
         # sign of success.
         self.password = (
-            self.password or self._load_password_from_keyring() or
+            self.password or
+            self._load_password_from_keyring() or
             self._prompt_for_password()
         )
 

From c105d6f18a5a17b0a47fda5a2df2f8f47352b037 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:25:33 -0500
Subject: [PATCH 5715/8469] Simplify logic by eliminating retries in password
 prompt and returning results directly.

---
 setuptools/command/upload.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index a001d461a4..484baa5a53 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -24,21 +24,15 @@ def _load_password_from_keyring(self):
         """
         try:
             keyring = __import__('keyring')
-            password = keyring.get_password(self.repository, self.username)
+            return keyring.get_password(self.repository, self.username)
         except Exception:
-            password = None
-        finally:
-            return password
+            pass
 
     def _prompt_for_password(self):
         """
         Prompt for a password on the tty. Suppress Exceptions.
         """
-        password = None
         try:
-            while not password:
-                password = getpass.getpass()
+            return getpass.getpass()
         except (Exception, KeyboardInterrupt):
-            password = None
-        finally:
-            return password
+            pass

From b97d31d00919dfac4c378d14555e25e24f42a00f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 Apr 2016 23:26:16 -0500
Subject: [PATCH 5716/8469] Added tag v20.10.0 for changeset 98779f519092

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e1c9258e38..ff12f86d96 100644
--- a/.hgtags
+++ b/.hgtags
@@ -256,3 +256,4 @@ a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 7f56b6f40de39456c78507a14c288709712881cb v20.8.0
 8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
 8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
+98779f519092c6c766878b38705ef6e70249126c v20.10.0

From 9ad12ecb7c605cafbfa27e5eb6a1990b7afaf3a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Apr 2016 09:15:29 -0500
Subject: [PATCH 5717/8469] =?UTF-8?q?Bump=20version:=2020.9.0=20=E2=86=92?=
 =?UTF-8?q?=2020.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f2b8d25496..676c80b8eb 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.9.0
+current_version = 20.10.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a29f0a1708..439f6206d1 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.9.0",
+    version="20.10.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 8910c6e28c248f614d4043d4acb7ca5058b79507 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Apr 2016 09:16:27 -0500
Subject: [PATCH 5718/8469] Added tag v20.10.0 for changeset c72faa468919

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index e1c9258e38..1c05264d17 100644
--- a/.hgtags
+++ b/.hgtags
@@ -256,3 +256,4 @@ a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 7f56b6f40de39456c78507a14c288709712881cb v20.8.0
 8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
 8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
+c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0

From a02ea2f44be9a7d2f1697e5ed962ad82d10a7f72 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Apr 2016 09:24:09 -0500
Subject: [PATCH 5719/8469] Try comparing eq

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0cb6263acc..feeb039fcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ deploy:
     tags: true
     all_branches: true
     python: 3.5
-    condition: -z $LC_ALL
+    condition: $LC_ALL != "C"
   user: jaraco
   password:
     secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=

From a144fab84b5d49fe8cfa1c504b7af4740f7dfd59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Apr 2016 09:24:38 -0500
Subject: [PATCH 5720/8469] =?UTF-8?q?Bump=20version:=2020.10.0=20=E2=86=92?=
 =?UTF-8?q?=2020.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 676c80b8eb..775dbda27e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.10.0
+current_version = 20.10.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 439f6206d1..f72ed3a16a 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.10.0",
+    version="20.10.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 005cb1dd7e423160a3af26a41281dbf8ea2cd5b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Apr 2016 09:24:39 -0500
Subject: [PATCH 5721/8469] Added tag v20.10.1 for changeset 3b5fdd077c7d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1c05264d17..61bd9da643 100644
--- a/.hgtags
+++ b/.hgtags
@@ -257,3 +257,4 @@ a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
 8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
 c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
+3b5fdd077c7d83d02c4979ad69cc0bf199b47587 v20.10.1

From cf470e31326312d68b84b81501b0eb91389042d9 Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@aledade.com>
Date: Mon, 25 Apr 2016 15:18:27 -0400
Subject: [PATCH 5722/8469] Fix setuptools url and curl wants --location to
 follow redirects

This change also removes:

    sys.meta_path = [importer for importer in sys.meta_path if
                     importer.__class__.__module__ != 'pkg_resources.extern']

from _unload_pkg_resources.

These lines were removed from the version at: https://bootstrap.pypa.io/ez_setup.py

I don't know why the code there and here differs.
---
 ez_setup.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index d6f4b78cb7..46184871bd 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -33,7 +33,7 @@
 
 LATEST = object()
 DEFAULT_VERSION = LATEST
-DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
+DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 
 
@@ -192,8 +192,6 @@ def _conflict_bail(VC_err, version):
 
 
 def _unload_pkg_resources():
-    sys.meta_path = [importer for importer in sys.meta_path if
-                     importer.__class__.__module__ != 'pkg_resources.extern']
     del_modules = [
         name for name in sys.modules
         if name.startswith('pkg_resources')
@@ -253,7 +251,7 @@ def has_powershell():
 
 
 def download_file_curl(url, target):
-    cmd = ['curl', url, '--silent', '--output', target]
+    cmd = ['curl', url, '--location', '--silent', '--output', target]
     _clean_check(cmd, target)
 
 

From 3728c541b655efb91a14868d93a38216149e6757 Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@aledade.com>
Date: Mon, 25 Apr 2016 16:59:19 -0400
Subject: [PATCH 5723/8469] restore previous fix that was never deployed.

---
 ez_setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ez_setup.py b/ez_setup.py
index 46184871bd..a39054bf98 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -192,6 +192,8 @@ def _conflict_bail(VC_err, version):
 
 
 def _unload_pkg_resources():
+    sys.meta_path = [importer for importer in sys.meta_path if
+                     importer.__class__.__module__ != 'pkg_resources.extern']
     del_modules = [
         name for name in sys.modules
         if name.startswith('pkg_resources')

From e0dcf2ea12f26ed859606bed54fb4b2ede9b0d28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Apr 2016 09:49:23 -0400
Subject: [PATCH 5724/8469] Remove unnecessary mention of Python 2.6, now
 required.

---
 ez_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ez_setup.py b/ez_setup.py
index a39054bf98..f2487fe8b3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -373,7 +373,7 @@ def _parse_args():
     parser = optparse.OptionParser()
     parser.add_option(
         '--user', dest='user_install', action='store_true', default=False,
-        help='install in user site package (requires Python 2.6 or later)')
+        help='install in user site package')
     parser.add_option(
         '--download-base', dest='download_base', metavar="URL",
         default=DEFAULT_URL,

From 661440a9248792656455022b6fba51343e58cd50 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Apr 2016 10:00:01 -0400
Subject: [PATCH 5725/8469] Separate clauses onto different lines for clarity
 and consistency.

---
 ez_setup.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ez_setup.py b/ez_setup.py
index f2487fe8b3..e3dd140f11 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -192,8 +192,11 @@ def _conflict_bail(VC_err, version):
 
 
 def _unload_pkg_resources():
-    sys.meta_path = [importer for importer in sys.meta_path if
-                     importer.__class__.__module__ != 'pkg_resources.extern']
+    sys.meta_path = [
+        importer
+        for importer in sys.meta_path
+        if importer.__class__.__module__ != 'pkg_resources.extern'
+    ]
     del_modules = [
         name for name in sys.modules
         if name.startswith('pkg_resources')

From a73118b9e3c125910ce3a50ab1e676632b4c12d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 Apr 2016 12:01:09 -0400
Subject: [PATCH 5726/8469] Remove ez_setup.py from master branch (and packaged
 sdist releases).

---
 CHANGES.rst       |   9 +
 docs/releases.txt |  19 +--
 ez_setup.py       | 420 ----------------------------------------------
 3 files changed, 17 insertions(+), 431 deletions(-)
 delete mode 100644 ez_setup.py

diff --git a/CHANGES.rst b/CHANGES.rst
index be3d2ca493..c8bfe2d3eb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+v21.0.0
+-------
+
+* Removed ez_setup.py from Setuptools sdist. The
+  bootstrap script will be maintained in its own
+  branch and should be generally be retrieved from
+  its canonical location at
+  https://bootstrap.pypa.io/ez_setup.py.
+
 v20.10.0
 --------
 
diff --git a/docs/releases.txt b/docs/releases.txt
index 3f29334a99..c84ddd75e4 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -10,23 +10,20 @@ successful build of a tagged release per
 To cut a release, install and run ``bumpversion {part}`` where ``part``
 is major, minor, or patch based on the scope of the changes in the
 release. Then, push the commits to the master branch. If tests pass,
-the release will be uploaded to PyPI.
+the release will be uploaded to PyPI (from the Python 3.5 tests).
 
-Bootstrap Bookmark
-------------------
+Bootstrap Branch
+----------------
 
-Setuptools has a bootstrap script (ez_setup.py) which is hosted in the
-repository and must be updated with each release (to bump the default version).
-The "published" version of the script is the one indicated by the ``bootstrap``
-branch.
+Setuptools has a bootstrap script (ez_setup.py), which is hosted in the
+repository in the ``bootstrap`` branch.
 
-Therefore, the latest bootstrap script can be retrieved by checking out the
-repository at that bookmark. It's also possible to get the bootstrap script for
-any particular release by grabbing the script from that tagged release.
+Therefore, the latest bootstrap script can be retrieved by checking out
+that branch.
 
 The officially-published location of the bootstrap script is hosted on Python
 infrastructure (#python-infra on freenode) at https://bootstrap.pypa.io and
-is updated every fifteen minutes from the bootstrap script. Sometimes,
+is updated every fifteen minutes from the bootstrap branch. Sometimes,
 especially when the bootstrap script is rolled back, this
 process doesn't work as expected and requires manual intervention.
 
diff --git a/ez_setup.py b/ez_setup.py
deleted file mode 100644
index e3dd140f11..0000000000
--- a/ez_setup.py
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Setuptools bootstrapping installer.
-
-Run this script to install or upgrade setuptools.
-"""
-
-import os
-import shutil
-import sys
-import tempfile
-import zipfile
-import optparse
-import subprocess
-import platform
-import textwrap
-import contextlib
-import json
-import codecs
-
-from distutils import log
-
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
-
-try:
-    from site import USER_SITE
-except ImportError:
-    USER_SITE = None
-
-LATEST = object()
-DEFAULT_VERSION = LATEST
-DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
-DEFAULT_SAVE_DIR = os.curdir
-
-
-def _python_cmd(*args):
-    """
-    Execute a command.
-
-    Return True if the command succeeded.
-    """
-    args = (sys.executable,) + args
-    return subprocess.call(args) == 0
-
-
-def _install(archive_filename, install_args=()):
-    """Install Setuptools."""
-    with archive_context(archive_filename):
-        # installing
-        log.warn('Installing Setuptools')
-        if not _python_cmd('setup.py', 'install', *install_args):
-            log.warn('Something went wrong during the installation.')
-            log.warn('See the error message above.')
-            # exitcode will be 2
-            return 2
-
-
-def _build_egg(egg, archive_filename, to_dir):
-    """Build Setuptools egg."""
-    with archive_context(archive_filename):
-        # building an egg
-        log.warn('Building a Setuptools egg in %s', to_dir)
-        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
-    # returning the result
-    log.warn(egg)
-    if not os.path.exists(egg):
-        raise IOError('Could not build the egg.')
-
-
-class ContextualZipFile(zipfile.ZipFile):
-
-    """Supplement ZipFile class to support context manager for Python 2.6."""
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.close()
-
-    def __new__(cls, *args, **kwargs):
-        """Construct a ZipFile or ContextualZipFile as appropriate."""
-        if hasattr(zipfile.ZipFile, '__exit__'):
-            return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls)
-
-
-@contextlib.contextmanager
-def archive_context(filename):
-    """
-    Unzip filename to a temporary directory, set to the cwd.
-
-    The unzipped target is cleaned up after.
-    """
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        with ContextualZipFile(filename) as archive:
-            archive.extractall()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
-        yield
-
-    finally:
-        os.chdir(old_wd)
-        shutil.rmtree(tmpdir)
-
-
-def _do_download(version, download_base, to_dir, download_delay):
-    """Download Setuptools."""
-    egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg'
-                       % (version, sys.version_info[0], sys.version_info[1]))
-    if not os.path.exists(egg):
-        archive = download_setuptools(version, download_base,
-                                      to_dir, download_delay)
-        _build_egg(egg, archive, to_dir)
-    sys.path.insert(0, egg)
-
-    # Remove previously-imported pkg_resources if present (see
-    # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details).
-    if 'pkg_resources' in sys.modules:
-        _unload_pkg_resources()
-
-    import setuptools
-    setuptools.bootstrap_install_from = egg
-
-
-def use_setuptools(
-        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=DEFAULT_SAVE_DIR, download_delay=15):
-    """
-    Ensure that a setuptools version is installed.
-
-    Return None. Raise SystemExit if the requested version
-    or later cannot be installed.
-    """
-    version = _resolve_version(version)
-    to_dir = os.path.abspath(to_dir)
-
-    # prior to importing, capture the module state for
-    # representative modules.
-    rep_modules = 'pkg_resources', 'setuptools'
-    imported = set(sys.modules).intersection(rep_modules)
-
-    try:
-        import pkg_resources
-        pkg_resources.require("setuptools>=" + version)
-        # a suitable version is already installed
-        return
-    except ImportError:
-        # pkg_resources not available; setuptools is not installed; download
-        pass
-    except pkg_resources.DistributionNotFound:
-        # no version of setuptools was found; allow download
-        pass
-    except pkg_resources.VersionConflict as VC_err:
-        if imported:
-            _conflict_bail(VC_err, version)
-
-        # otherwise, unload pkg_resources to allow the downloaded version to
-        #  take precedence.
-        del pkg_resources
-        _unload_pkg_resources()
-
-    return _do_download(version, download_base, to_dir, download_delay)
-
-
-def _conflict_bail(VC_err, version):
-    """
-    Setuptools was imported prior to invocation, so it is
-    unsafe to unload it. Bail out.
-    """
-    conflict_tmpl = textwrap.dedent("""
-        The required version of setuptools (>={version}) is not available,
-        and can't be installed while this script is running. Please
-        install a more recent version first, using
-        'easy_install -U setuptools'.
-
-        (Currently using {VC_err.args[0]!r})
-        """)
-    msg = conflict_tmpl.format(**locals())
-    sys.stderr.write(msg)
-    sys.exit(2)
-
-
-def _unload_pkg_resources():
-    sys.meta_path = [
-        importer
-        for importer in sys.meta_path
-        if importer.__class__.__module__ != 'pkg_resources.extern'
-    ]
-    del_modules = [
-        name for name in sys.modules
-        if name.startswith('pkg_resources')
-    ]
-    for mod_name in del_modules:
-        del sys.modules[mod_name]
-
-
-def _clean_check(cmd, target):
-    """
-    Run the command to download target.
-
-    If the command fails, clean up before re-raising the error.
-    """
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError:
-        if os.access(target, os.F_OK):
-            os.unlink(target)
-        raise
-
-
-def download_file_powershell(url, target):
-    """
-    Download the file at url to target using Powershell.
-
-    Powershell will validate trust.
-    Raise an exception if the command cannot complete.
-    """
-    target = os.path.abspath(target)
-    ps_cmd = (
-        "[System.Net.WebRequest]::DefaultWebProxy.Credentials = "
-        "[System.Net.CredentialCache]::DefaultCredentials; "
-        '(new-object System.Net.WebClient).DownloadFile("%(url)s", "%(target)s")'
-        % locals()
-    )
-    cmd = [
-        'powershell',
-        '-Command',
-        ps_cmd,
-    ]
-    _clean_check(cmd, target)
-
-
-def has_powershell():
-    """Determine if Powershell is available."""
-    if platform.system() != 'Windows':
-        return False
-    cmd = ['powershell', '-Command', 'echo test']
-    with open(os.path.devnull, 'wb') as devnull:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except Exception:
-            return False
-    return True
-download_file_powershell.viable = has_powershell
-
-
-def download_file_curl(url, target):
-    cmd = ['curl', url, '--location', '--silent', '--output', target]
-    _clean_check(cmd, target)
-
-
-def has_curl():
-    cmd = ['curl', '--version']
-    with open(os.path.devnull, 'wb') as devnull:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except Exception:
-            return False
-    return True
-download_file_curl.viable = has_curl
-
-
-def download_file_wget(url, target):
-    cmd = ['wget', url, '--quiet', '--output-document', target]
-    _clean_check(cmd, target)
-
-
-def has_wget():
-    cmd = ['wget', '--version']
-    with open(os.path.devnull, 'wb') as devnull:
-        try:
-            subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except Exception:
-            return False
-    return True
-download_file_wget.viable = has_wget
-
-
-def download_file_insecure(url, target):
-    """Use Python to download the file, without connection authentication."""
-    src = urlopen(url)
-    try:
-        # Read all the data in one block.
-        data = src.read()
-    finally:
-        src.close()
-
-    # Write all the data in one block to avoid creating a partial file.
-    with open(target, "wb") as dst:
-        dst.write(data)
-download_file_insecure.viable = lambda: True
-
-
-def get_best_downloader():
-    downloaders = (
-        download_file_powershell,
-        download_file_curl,
-        download_file_wget,
-        download_file_insecure,
-    )
-    viable_downloaders = (dl for dl in downloaders if dl.viable())
-    return next(viable_downloaders, None)
-
-
-def download_setuptools(
-        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=DEFAULT_SAVE_DIR, delay=15,
-        downloader_factory=get_best_downloader):
-    """
-    Download setuptools from a specified location and return its filename.
-
-    `version` should be a valid setuptools version number that is available
-    as an sdist for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download
-    attempt.
-
-    ``downloader_factory`` should be a function taking no arguments and
-    returning a function for downloading a URL to a target.
-    """
-    version = _resolve_version(version)
-    # making sure we use the absolute path
-    to_dir = os.path.abspath(to_dir)
-    zip_name = "setuptools-%s.zip" % version
-    url = download_base + zip_name
-    saveto = os.path.join(to_dir, zip_name)
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        log.warn("Downloading %s", url)
-        downloader = downloader_factory()
-        downloader(url, saveto)
-    return os.path.realpath(saveto)
-
-
-def _resolve_version(version):
-    """
-    Resolve LATEST version
-    """
-    if version is not LATEST:
-        return version
-
-    resp = urlopen('https://pypi.python.org/pypi/setuptools/json')
-    with contextlib.closing(resp):
-        try:
-            charset = resp.info().get_content_charset()
-        except Exception:
-            # Python 2 compat; assume UTF-8
-            charset = 'UTF-8'
-        reader = codecs.getreader(charset)
-        doc = json.load(reader(resp))
-
-    return str(doc['info']['version'])
-
-
-def _build_install_args(options):
-    """
-    Build the arguments to 'python setup.py install' on the setuptools package.
-
-    Returns list of command line arguments.
-    """
-    return ['--user'] if options.user_install else []
-
-
-def _parse_args():
-    """Parse the command line for options."""
-    parser = optparse.OptionParser()
-    parser.add_option(
-        '--user', dest='user_install', action='store_true', default=False,
-        help='install in user site package')
-    parser.add_option(
-        '--download-base', dest='download_base', metavar="URL",
-        default=DEFAULT_URL,
-        help='alternative URL from where to download the setuptools package')
-    parser.add_option(
-        '--insecure', dest='downloader_factory', action='store_const',
-        const=lambda: download_file_insecure, default=get_best_downloader,
-        help='Use internal, non-validating downloader'
-    )
-    parser.add_option(
-        '--version', help="Specify which version to download",
-        default=DEFAULT_VERSION,
-    )
-    parser.add_option(
-    	'--to-dir',
-    	help="Directory to save (and re-use) package",
-    	default=DEFAULT_SAVE_DIR,
-    )
-    options, args = parser.parse_args()
-    # positional arguments are ignored
-    return options
-
-
-def _download_args(options):
-	"""Return args for download_setuptools function from cmdline args."""
-	return dict(
-		version=options.version,
-		download_base=options.download_base,
-		downloader_factory=options.downloader_factory,
-		to_dir=options.to_dir,
-	)
-
-
-def main():
-    """Install or upgrade setuptools and EasyInstall."""
-    options = _parse_args()
-    archive = download_setuptools(**_download_args(options))
-    return _install(archive, _build_install_args(options))
-
-if __name__ == '__main__':
-    sys.exit(main())

From 11cd038b9bf7231b2007c8accb406062965fa8a0 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Fri, 29 Apr 2016 18:11:51 +0200
Subject: [PATCH 5727/8469] Tests and fixes

Tests advancement:

I tested WinSDK 7.1, WinSDK 7.0, WinSDK 6.1, VC for Python 2.7 with current arch as X86 and all possible target architecture. Environment generated from script is good for all (With some little fixes in this commit), some path are add on some case, I will look if I need to remove them. I need also to check .Net Framework 64bit in this case.

I need also to do test for sames compilers on X64 architecture, I will also test MSVC++ 2015 Build tools on X64.

I looked for create automated test on AppVeyor for this, but it is impossible to only have one of theses compilers only installed... So I did all test manually.
---
 setuptools/msvc9_support.py | 40 +++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 58e34204fc..94de6fd19f 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -235,7 +235,7 @@ class PlatformInfo:
     current_cpu = os.environ['processor_architecture'].lower()
 
     def __init__(self, arch):
-        self.arch = arch.lower()
+        self.arch = arch.lower().replace('x64', 'amd64')
 
     @property
     def target_cpu(self):
@@ -810,7 +810,7 @@ def VCTools(self):
         """
         forcex86 = True if self.vcver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
-        tools = [os.path.join(self.si.VCInstallDir, 'VCPackages'),
+        tools = [os.path.join(self.si.VCInstallDir, r'VCPackages'),
                  os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
         if self.pi.cross_dir() and self.vcver >= 14.0:
@@ -829,7 +829,7 @@ def OSLibraries(self):
         """
         if self.vcver <= 10.0:
             arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
-            return [os.path.join(self.si.WindowsSdkDir, 'Bin%s' % arch_subdir)]
+            return [os.path.join(self.si.WindowsSdkDir, 'Lib%s' % arch_subdir)]
 
         else:
             arch_subdir = self.pi.target_dir(x64=True)
@@ -862,7 +862,13 @@ def OSLibpath(self):
         Microsoft Windows SDK Libraries Paths
         """
         ref = os.path.join(self.si.WindowsSdkDir, 'References')
-        libpath = [os.path.join(ref, r'CommonConfiguration\Neutral')]
+        libpath = []
+
+        if self.vcver <= 9.0:
+            libpath += self.OSLibraries
+
+        if self.vcver >= 11.0:
+            libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')]
 
         if self.vcver >= 14.0:
             libpath += [ref,
@@ -910,6 +916,9 @@ def SdkSetup(self):
         """
         Microsoft Windows SDK Setup
         """
+        if self.vcver > 9.0:
+            return []
+
         return [os.path.join(self.si.WindowsSdkDir, 'Setup')]
 
     @property
@@ -1033,27 +1042,35 @@ def VCRuntimeRedist(self):
         vcruntime = vcruntime % (arch_subdir, self.vcver, self.vcver)
         return os.path.join(self.si.VCInstallDir, vcruntime)
 
-    def return_env(self):
+    def return_env(self, exists=True):
         """
         Return environment dict.
+
+        Parameters
+        ----------
+        exists: bool
+            It True, only return existing paths.
         """
         env = dict(
             include=self._build_paths('include',
                                       [self.VCIncludes,
                                        self.OSIncludes,
                                        self.UCRTIncludes,
-                                       self.NetFxSDKIncludes]),
+                                       self.NetFxSDKIncludes],
+                                      exists),
             lib=self._build_paths('lib',
                                   [self.VCLibraries,
                                    self.OSLibraries,
                                    self.FxTools,
                                    self.UCRTLibraries,
-                                   self.NetFxSDKLibraries]),
+                                   self.NetFxSDKLibraries],
+                                  exists),
             libpath=self._build_paths('libpath',
                                       [self.VCLibraries,
                                        self.FxTools,
                                        self.VCStoreRefs,
-                                       self.OSLibpath]),
+                                       self.OSLibpath],
+                                      exists),
             path=self._build_paths('path',
                                    [self.VCTools,
                                     self.VSTools,
@@ -1063,13 +1080,14 @@ def return_env(self):
                                     self.FxTools,
                                     self.MSBuild,
                                     self.HTMLHelpWorkshop,
-                                    self.FSharp]),
+                                    self.FSharp],
+                                   exists),
         )
         if self.vcver >= 14 and os.path.isfile(self.VCRuntimeRedist):
             env['py_vcruntime_redist'] = self.VCRuntimeRedist
         return env
 
-    def _build_paths(self, name, spec_path_lists):
+    def _build_paths(self, name, spec_path_lists, exists):
         """
         Given an environment variable name and specified paths,
         return a pathsep-separated string of paths containing
@@ -1081,7 +1099,7 @@ def _build_paths(self, name, spec_path_lists):
         spec_paths = itertools.chain.from_iterable(spec_path_lists)
         env_paths = os.environ.get(name, '').split(os.pathsep)
         paths = itertools.chain(spec_paths, env_paths)
-        extant_paths = list(filter(os.path.isdir, paths))
+        extant_paths = list(filter(os.path.isdir, paths)) if exists else paths
         if not extant_paths:
             msg = "%s environment variable is empty" % name.upper()
             raise distutils.errors.DistutilsPlatformError(msg)

From d4486dc692f07db138a129d08803ceb8f55ae4b8 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Fri, 29 Apr 2016 18:25:50 +0200
Subject: [PATCH 5728/8469] useless 'r' before str

---
 setuptools/msvc9_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 94de6fd19f..dba7c39299 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -810,7 +810,7 @@ def VCTools(self):
         """
         forcex86 = True if self.vcver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
-        tools = [os.path.join(self.si.VCInstallDir, r'VCPackages'),
+        tools = [os.path.join(self.si.VCInstallDir, 'VCPackages'),
                  os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
         if self.pi.cross_dir() and self.vcver >= 14.0:

From 01e1189c7156de07fb9f8646fb2282379ddbc5b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 May 2016 09:37:01 -0400
Subject: [PATCH 5729/8469] =?UTF-8?q?Bump=20version:=2020.10.1=20=E2=86=92?=
 =?UTF-8?q?=2021.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 775dbda27e..d0c301b3b3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.10.1
+current_version = 21.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index f72ed3a16a..58c707853e 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.10.1",
+    version="21.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 30837057ae74a38e29b67c62adb8e6d5be44b97c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 May 2016 09:37:02 -0400
Subject: [PATCH 5730/8469] Added tag v21.0.0 for changeset ddd3f81eb9e0

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 61bd9da643..d907c1f6c5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -258,3 +258,4 @@ a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
 8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
 c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
 3b5fdd077c7d83d02c4979ad69cc0bf199b47587 v20.10.1
+ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0

From 28ef4014b03a6d1b2428def3bb78e665679a5b12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 May 2016 10:06:01 -0400
Subject: [PATCH 5731/8469] Restore ability for msvc9_support to be imported on
 non-Windows platforms.

---
 setuptools/msvc9_support.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index dba7c39299..1737cc217f 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -2,9 +2,26 @@
 This module improve support for Microsoft Visual C++ compilers. (Windows Only)
 """
 import os
+import collections
 import itertools
 import distutils.errors
-from setuptools.extern.six.moves import winreg, filterfalse
+from setuptools.extern.six.moves import filterfalse
+
+try:
+    from setuptools.extern.six.moves import winreg
+    safe_env = os.environ
+except ImportError:
+    """
+    Mock winreg and environ so the module can be imported
+    on this platform.
+    """
+    class winreg:
+        HKEY_USERS = None
+        HKEY_CURRENT_USER = None
+        HKEY_LOCAL_MACHINE = None
+        HKEY_CLASSES_ROOT = None
+    safe_env = collections.defaultdict(lambda: '')
+
 
 try:
     # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
@@ -232,7 +249,7 @@ class PlatformInfo:
     arch: str
         Target architecture.
     """
-    current_cpu = os.environ['processor_architecture'].lower()
+    current_cpu = safe_env['processor_architecture'].lower()
 
     def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
@@ -443,8 +460,8 @@ class SystemInfo:
     vcver: float
         Required Microsoft Visual C++ version.
     """
-    WinDir = os.environ['WinDir']
-    ProgramFiles = os.environ['ProgramFiles']
+    WinDir = safe_env['WinDir']
+    ProgramFiles = safe_env['ProgramFiles']
     ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
 
     def __init__(self, registry_info, vcver=None):

From 0d3a896695ae028eca50330490f6ea2811450e0e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 May 2016 10:18:57 -0400
Subject: [PATCH 5732/8469] Convert tabs to spaces. Fixes #489.

---
 docs/conf.py                   | 120 ++++++++++++++++-----------------
 setuptools/py26compat.py       |  20 +++---
 setuptools/py27compat.py       |  12 ++--
 setuptools/tests/py26compat.py |   8 +--
 4 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index f315e2b720..604e7138e5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -200,64 +200,64 @@
 #latex_use_modindex = True
 
 link_files = {
-	'CHANGES.rst': dict(
-		using=dict(
-			BB='https://bitbucket.org',
-			GH='https://github.com',
-		),
-		replace=[
-			dict(
-				pattern=r"(Issue )?#(?P<issue>\d+)",
-				url='{GH}/pypa/setuptools/issues/{issue}',
-			),
-			dict(
-				pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
-				url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
-			),
-			dict(
-				pattern=r"Distribute #(?P<distribute>\d+)",
-				url='{BB}/tarek/distribute/issue/{distribute}',
-			),
-			dict(
-				pattern=r"Buildout #(?P<buildout>\d+)",
-				url='{GH}/buildout/buildout/issues/{buildout}',
-			),
-			dict(
-				pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
-				url='http://bugs.python.org/setuptools/issue{old_setuptools}',
-			),
-			dict(
-				pattern=r"Jython #(?P<jython>\d+)",
-				url='http://bugs.jython.org/issue{jython}',
-			),
-			dict(
-				pattern=r"Python #(?P<python>\d+)",
-				url='http://bugs.python.org/issue{python}',
-			),
-			dict(
-				pattern=r"Interop #(?P<interop>\d+)",
-				url='{GH}/pypa/interoperability-peps/issues/{interop}',
-			),
-			dict(
-				pattern=r"Pip #(?P<pip>\d+)",
-				url='{GH}/pypa/pip/issues/{pip}',
-			),
-			dict(
-				pattern=r"Packaging #(?P<packaging>\d+)",
-				url='{GH}/pypa/packaging/issues/{packaging}',
-			),
-			dict(
-				pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
-				url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
-			),
-			dict(
-				pattern=r"PEP[- ](?P<pep_number>\d+)",
-				url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
-			),
-			dict(
-				pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
-				with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
-			),
-		],
-	),
+    'CHANGES.rst': dict(
+        using=dict(
+            BB='https://bitbucket.org',
+            GH='https://github.com',
+        ),
+        replace=[
+            dict(
+                pattern=r"(Issue )?#(?P<issue>\d+)",
+                url='{GH}/pypa/setuptools/issues/{issue}',
+            ),
+            dict(
+                pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
+                url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
+            ),
+            dict(
+                pattern=r"Distribute #(?P<distribute>\d+)",
+                url='{BB}/tarek/distribute/issue/{distribute}',
+            ),
+            dict(
+                pattern=r"Buildout #(?P<buildout>\d+)",
+                url='{GH}/buildout/buildout/issues/{buildout}',
+            ),
+            dict(
+                pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
+                url='http://bugs.python.org/setuptools/issue{old_setuptools}',
+            ),
+            dict(
+                pattern=r"Jython #(?P<jython>\d+)",
+                url='http://bugs.jython.org/issue{jython}',
+            ),
+            dict(
+                pattern=r"Python #(?P<python>\d+)",
+                url='http://bugs.python.org/issue{python}',
+            ),
+            dict(
+                pattern=r"Interop #(?P<interop>\d+)",
+                url='{GH}/pypa/interoperability-peps/issues/{interop}',
+            ),
+            dict(
+                pattern=r"Pip #(?P<pip>\d+)",
+                url='{GH}/pypa/pip/issues/{pip}',
+            ),
+            dict(
+                pattern=r"Packaging #(?P<packaging>\d+)",
+                url='{GH}/pypa/packaging/issues/{packaging}',
+            ),
+            dict(
+                pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
+                url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
+            ),
+            dict(
+                pattern=r"PEP[- ](?P<pep_number>\d+)",
+                url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+            ),
+            dict(
+                pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
+                with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+            ),
+        ],
+    ),
 }
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index e52bd85b36..40cbb88e67 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -5,18 +5,18 @@
 import sys
 
 try:
-	from urllib.parse import splittag
+    from urllib.parse import splittag
 except ImportError:
-	from urllib import splittag
+    from urllib import splittag
 
 def strip_fragment(url):
-	"""
-	In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
-	later was patched to disregard the fragment when making URL requests.
-	Do the same for Python 2.6 and earlier.
-	"""
-	url, fragment = splittag(url)
-	return url
+    """
+    In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
+    later was patched to disregard the fragment when making URL requests.
+    Do the same for Python 2.6 and earlier.
+    """
+    url, fragment = splittag(url)
+    return url
 
 if sys.version_info >= (2,7):
-	strip_fragment = lambda x: x
+    strip_fragment = lambda x: x
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 9d2886db99..702f7d65b6 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -5,11 +5,11 @@
 import sys
 
 def get_all_headers(message, key):
-	"""
-	Given an HTTPMessage, return all headers matching a given key.
-	"""
-	return message.get_all(key)
+    """
+    Given an HTTPMessage, return all headers matching a given key.
+    """
+    return message.get_all(key)
 
 if sys.version_info < (3,):
-	def get_all_headers(message, key):
-		return message.getheaders(key)
+    def get_all_headers(message, key):
+        return message.getheaders(key)
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index c56808816e..7211f2757e 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -3,10 +3,10 @@
 import contextlib
 
 def _tarfile_open_ex(*args, **kwargs):
-	"""
-	Extend result as a context manager.
-	"""
-	return contextlib.closing(tarfile.open(*args, **kwargs))
+    """
+    Extend result as a context manager.
+    """
+    return contextlib.closing(tarfile.open(*args, **kwargs))
 
 if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
     tarfile_open = _tarfile_open_ex

From c0f5771495dea58b07f4a1d36badd4cef08aa687 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 May 2016 10:20:04 -0400
Subject: [PATCH 5733/8469] Tabs to spaces in two more files. Ref #489.

---
 pavement.py           | 38 +++++++++++++++++++-------------------
 setuptools/version.py |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pavement.py b/pavement.py
index 8d7574e296..303e9bac4f 100644
--- a/pavement.py
+++ b/pavement.py
@@ -4,25 +4,25 @@
 import pip
 
 def remove_all(paths):
-	for path in paths:
-		path.rmtree() if path.isdir() else path.remove()
+    for path in paths:
+        path.rmtree() if path.isdir() else path.remove()
 
 @task
 def update_vendored():
-	vendor = Path('pkg_resources/_vendor')
-	remove_all(vendor.glob('packaging*'))
-	remove_all(vendor.glob('six*'))
-	remove_all(vendor.glob('pyparsing*'))
-	install_args = [
-		'install',
-		'-r', str(vendor/'vendored.txt'),
-		'-t', str(vendor),
-	]
-	pip.main(install_args)
-	packaging = vendor / 'packaging'
-	for file in packaging.glob('*.py'):
-		text = file.text()
-		text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
-		file.write_text(text)
-	remove_all(vendor.glob('*.dist-info'))
-	remove_all(vendor.glob('*.egg-info'))
+    vendor = Path('pkg_resources/_vendor')
+    remove_all(vendor.glob('packaging*'))
+    remove_all(vendor.glob('six*'))
+    remove_all(vendor.glob('pyparsing*'))
+    install_args = [
+        'install',
+        '-r', str(vendor/'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    packaging = vendor / 'packaging'
+    for file in packaging.glob('*.py'):
+        text = file.text()
+        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
+        file.write_text(text)
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))
diff --git a/setuptools/version.py b/setuptools/version.py
index 049e7febcf..f2b407228e 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1,6 +1,6 @@
 import pkg_resources
 
 try:
-	__version__ = pkg_resources.require('setuptools')[0].version
+    __version__ = pkg_resources.require('setuptools')[0].version
 except Exception:
-	__version__ = 'unknown'
+    __version__ = 'unknown'

From 144f72286d67f8e0368333bf1c3115ebce18c374 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Mon, 2 May 2016 20:21:49 +0200
Subject: [PATCH 5734/8469] Some fixes

After testing VC Builds Tools 2015 with current = Amd64 and target = Amd64, x86, Arm
---
 setuptools/msvc9_support.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 1737cc217f..7cafd062e2 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -324,11 +324,11 @@ def cross_dir(self, forcex86=False):
             "\current" if target architecture is current architecture,
             "\current_target" if not.
         """
-        path = self.target_dir(True)
-        if self.target_cpu != self.current_cpu:
-            current = 'x86' if forcex86 else self.current_cpu
-            path = path.replace('\\', '\\%s_' % current)
-        return path
+        current = 'x86' if forcex86 else self.current_cpu
+        if self.target_cpu != current:
+            return self.target_dir().replace('\\', '\\%s_' % current)
+        else:
+            return ''
 
 
 class RegistryInfo:
@@ -818,24 +818,27 @@ def VCStoreRefs(self):
         """
         if self.vcver < 14.0:
             return []
-        return os.path.join(self.si.VCInstallDir, r'Lib\store\references')
+        return [os.path.join(self.si.VCInstallDir, r'Lib\store\references')]
 
     @property
     def VCTools(self):
         """
         Microsoft Visual C++ Tools
         """
+        si = self.si
+        tools = [os.path.join(si.VCInstallDir, 'VCPackages')]
+
         forcex86 = True if self.vcver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
-        tools = [os.path.join(self.si.VCInstallDir, 'VCPackages'),
-                 os.path.join(self.si.VCInstallDir, 'Bin%s' % arch_subdir)]
+        if arch_subdir:
+            tools += [os.path.join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
-        if self.pi.cross_dir() and self.vcver >= 14.0:
+        if self.vcver >= 14.0:
             path = 'Bin%s' % self.pi.current_dir(hidex86=True)
-            tools += [os.path.join(self.si.VCInstallDir, path)]
+            tools += [os.path.join(si.VCInstallDir, path)]
 
         else:
-            tools += [os.path.join(self.si.VCInstallDir, 'Bin')]
+            tools += [os.path.join(si.VCInstallDir, 'Bin')]
 
         return tools
 
@@ -999,9 +1002,8 @@ def MSBuild(self):
             return []
 
         arch_subdir = self.pi.current_dir(hidex86=True)
-        path = r'\MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
-        return [os.path.join(self.si.ProgramFilesx86, path),
-                os.path.join(self.si.ProgramFiles, path)]
+        path = r'MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
+        return [os.path.join(self.si.ProgramFilesx86, path)]
 
     @property
     def HTMLHelpWorkshop(self):
@@ -1011,8 +1013,7 @@ def HTMLHelpWorkshop(self):
         if self.vcver < 11.0:
             return []
 
-        return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop'),
-                os.path.join(self.si.ProgramFiles, 'HTML Help Workshop')]
+        return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
 
     @property
     def UCRTLibraries(self):

From 0f476502ecbaf05870a9126e9b1caee9d95b7792 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo.lupo@daltonmaag.com>
Date: Tue, 3 May 2016 14:38:52 +0100
Subject: [PATCH 5735/8469] build_ext: always import _CONFIG_VARS from
 distutils.sysconfig instead of sysconfig

otherwise `distutils.sysconfig.customize_compiler` does not configure OSX compiler for -dynamiclib

See https://github.com/pypa/setuptools/issues/571
---
 setuptools/command/build_ext.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 92e4a189b8..f331f3a03e 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -16,15 +16,11 @@
 except ImportError:
     _build_ext = _du_build_ext
 
-try:
-    # Python 2.7 or >=3.2
-    from sysconfig import _CONFIG_VARS
-except ImportError:
-    from distutils.sysconfig import get_config_var
+from distutils.sysconfig import get_config_var
 
-    get_config_var("LDSHARED")  # make sure _config_vars is initialized
-    del get_config_var
-    from distutils.sysconfig import _config_vars as _CONFIG_VARS
+get_config_var("LDSHARED")  # make sure _config_vars is initialized
+del get_config_var
+from distutils.sysconfig import _config_vars as _CONFIG_VARS
 
 have_rtld = False
 use_stubs = False

From a1b5cdeacee878322b0aa52af208a2f826b4b800 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 4 May 2016 11:57:32 -0400
Subject: [PATCH 5736/8469] Issue #20120: Use RawConfigParser for .pypirc
 parsing, removing support for interpolation unintentionally added with move
 to Python 3. Behavior no longer does any interpolation in .pypirc files,
 matching behavior in Python 2.7 and Setuptools 19.0.

---
 config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index 382aca8fc1..f0c7373171 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,7 @@
 that uses .pypirc in the distutils.command package.
 """
 import os
-from configparser import ConfigParser
+from configparser import RawConfigParser
 
 from distutils.cmd import Command
 
@@ -53,7 +53,7 @@ def _read_pypirc(self):
             repository = self.repository or self.DEFAULT_REPOSITORY
             realm = self.realm or self.DEFAULT_REALM
 
-            config = ConfigParser()
+            config = RawConfigParser()
             config.read(rc)
             sections = config.sections()
             if 'distutils' in sections:

From d7dc0fde71d3ff0090222419b973df0c5a73802c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 6 May 2016 09:29:56 -0400
Subject: [PATCH 5737/8469] README and CHANGES were renamed. Update MANIFEST.in
 to include them once again in the source distributions. Fixes #575.

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 668e13ce06..cfd1b00108 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,7 +5,7 @@ recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.htm
 recursive-include setuptools/_vendor *
 recursive-include pkg_resources *.py *.txt
 include *.py
-include *.txt
+include *.rst
 include MANIFEST.in
 include launcher.c
 include msvc-build-launcher.cmd

From 08bcd16f9f4aaa13f7af7aa146fa2af8964f364b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 May 2016 17:05:27 -0400
Subject: [PATCH 5738/8469] =?UTF-8?q?Bump=20version:=2020.6.7=20=E2=86=92?=
 =?UTF-8?q?=2020.6.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 31fa0d34f2..65358f404a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.6.7
+current_version = 20.6.8
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 25726da1a1..8ed134fbc6 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="20.6.7",
+    version="20.6.8",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 46a816272d42694a0529c60a4d28ca948074bdce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 May 2016 17:05:53 -0400
Subject: [PATCH 5739/8469] Added tag v20.6.8 for changeset 018e4a727cf6

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 3bafe1a96e..f19b6eb897 100644
--- a/.hgtags
+++ b/.hgtags
@@ -252,3 +252,5 @@ a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
 b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
 0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
 a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
+a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
+018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8

From 59b774b0c33c7351c83ac86a2ebd64e27cacc381 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo.lupo@daltonmaag.com>
Date: Wed, 18 May 2016 13:03:33 +0100
Subject: [PATCH 5740/8469] build_ext: move block customizing compiler for
 shared lib into a function

---
 setuptools/command/build_ext.py | 36 ++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index f331f3a03e..1caf8c818b 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -22,6 +22,27 @@
 del get_config_var
 from distutils.sysconfig import _config_vars as _CONFIG_VARS
 
+
+def _customize_compiler_for_shlib(compiler):
+    if sys.platform == "darwin":
+        # building .dylib requires additional compiler flags on OSX; here we
+        # temporarily substitute the pyconfig.h variables so that distutils'
+        # 'customize_compiler' uses them before we build the shared libraries.
+        tmp = _CONFIG_VARS.copy()
+        try:
+            # XXX Help!  I don't have any idea whether these are right...
+            _CONFIG_VARS['LDSHARED'] = (
+                "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup")
+            _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
+            _CONFIG_VARS['SO'] = ".dylib"
+            customize_compiler(compiler)
+        finally:
+            _CONFIG_VARS.clear()
+            _CONFIG_VARS.update(tmp)
+    else:
+        customize_compiler(compiler)
+
+
 have_rtld = False
 use_stubs = False
 libtype = 'shared'
@@ -120,20 +141,7 @@ def setup_shlib_compiler(self):
         compiler = self.shlib_compiler = new_compiler(
             compiler=self.compiler, dry_run=self.dry_run, force=self.force
         )
-        if sys.platform == "darwin":
-            tmp = _CONFIG_VARS.copy()
-            try:
-                # XXX Help!  I don't have any idea whether these are right...
-                _CONFIG_VARS['LDSHARED'] = (
-                    "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup")
-                _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
-                _CONFIG_VARS['SO'] = ".dylib"
-                customize_compiler(compiler)
-            finally:
-                _CONFIG_VARS.clear()
-                _CONFIG_VARS.update(tmp)
-        else:
-            customize_compiler(compiler)
+        _customize_compiler_for_shlib(compiler)
 
         if self.include_dirs is not None:
             compiler.set_include_dirs(self.include_dirs)

From c8f9fd8c0d61f74fdcf10d96cf7608a256ecbe40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 May 2016 20:04:59 -0400
Subject: [PATCH 5741/8469] Update changelog. Ref #572.

---
 CHANGES.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index c8bfe2d3eb..dd2e2c73a0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v21.1.0
+-------
+
+* #572: In build_ext, now always import ``_CONFIG_VARS``
+  from ``distutils`` rather than from ``sysconfig``
+  to allow ``distutils.sysconfig.customize_compiler``
+  configure the OS X compiler for ``-dynamiclib``.
+
 v21.0.0
 -------
 

From 77e39c4c3f4cde33cb8d84f78a1bf6a1bb6ba659 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 May 2016 20:18:09 -0400
Subject: [PATCH 5742/8469] =?UTF-8?q?Bump=20version:=2021.0.0=20=E2=86=92?=
 =?UTF-8?q?=2021.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d0c301b3b3..764cab0bdf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.0.0
+current_version = 21.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 58c707853e..65568b8078 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="21.0.0",
+    version="21.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From a0fc5c1ebb910f7ab01f8a86f0fb6cc4d61db66a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 18 May 2016 20:18:10 -0400
Subject: [PATCH 5743/8469] Added tag v21.1.0 for changeset 02643fe95030

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 79d527ad80..8140911a1e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -260,3 +260,4 @@ c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
 3b5fdd077c7d83d02c4979ad69cc0bf199b47587 v20.10.1
 ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8
+02643fe9503033edd2fc5a54c8d4361a6c185be4 v21.1.0

From 6437f524bd60e943be9415818f1554bfda56920f Mon Sep 17 00:00:00 2001
From: Last G <last_g@hackerdom.ru>
Date: Thu, 19 May 2016 11:35:18 +0200
Subject: [PATCH 5744/8469] Get site-packages dirs from site.py too

---
 setuptools/command/easy_install.py    | 5 +++++
 setuptools/tests/test_easy_install.py | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ea5cb028a5..0bd3ea45d9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1347,6 +1347,11 @@ def get_site_dirs():
     if site.ENABLE_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
+    try:
+        sitedirs.extend(site.getsitepackages())
+    except AttributeError:
+        pass
+
     sitedirs = list(map(normalize_path, sitedirs))
 
     return sitedirs
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 55b8b05af1..b9f820d809 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -119,6 +119,10 @@ def test_write_exception(self):
         with pytest.raises(distutils.errors.DistutilsError):
             cmd.cant_write_to_target()
 
+    @mock.patch('site.getsitepackages', lambda: ['/setuptools/test/site-packages'])
+    def test_all_site_dirs(self):
+        assert '/setuptools/test/site-packages' in ei.get_site_dirs()
+
 
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):

From 61143d61e148ea2d3efa61df1c459c55cdb35739 Mon Sep 17 00:00:00 2001
From: Last G <last_g@hackerdom.ru>
Date: Thu, 19 May 2016 17:21:32 +0200
Subject: [PATCH 5745/8469] Fix tests for working in environment without
 site.getsitepakages

---
 setuptools/tests/test_easy_install.py | 29 ++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b9f820d809..aec65a1173 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -41,6 +41,22 @@
 from .textwrap import DALS
 
 
+@contextlib.contextmanager
+def _mark_removing_patcher(obj, attr, newval):
+    setattr(obj, attr, newval)
+    try:
+        yield
+    finally:
+        delattr(obj, attr)
+
+
+def magic_patch_object(obj, attr, newval):
+    if hasattr(obj, attr):
+        return mock.patch.object(obj, attr, newval)
+    else:
+        return _mark_removing_patcher(obj, attr, newval)
+
+
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -119,10 +135,21 @@ def test_write_exception(self):
         with pytest.raises(distutils.errors.DistutilsError):
             cmd.cant_write_to_target()
 
-    @mock.patch('site.getsitepackages', lambda: ['/setuptools/test/site-packages'])
+    @magic_patch_object(site, 'getsitepackages', lambda: ['/setuptools/test/site-packages'])
     def test_all_site_dirs(self):
         assert '/setuptools/test/site-packages' in ei.get_site_dirs()
 
+    def test_all_site_dirs_works_without_getsitepackages(self):
+        getsitepackages_old = None
+        if hasattr(site, 'getsitepackages'):
+            getsitepackages_old = site.getsitepackages
+            del site.getsitepackages
+        try:
+            assert ei.get_site_dirs()
+        finally:
+            if getsitepackages_old is not None:
+                site.getsitepackages = getsitepackages_old
+
 
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):

From 99fb3277660297459fbc080a8c6def98a8c52421 Mon Sep 17 00:00:00 2001
From: Last G <last_g@hackerdom.ru>
Date: Thu, 19 May 2016 17:31:24 +0200
Subject: [PATCH 5746/8469] Replace contextlib with decorator

---
 setuptools/tests/test_easy_install.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aec65a1173..a4fd39fe57 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -10,6 +10,7 @@
 import tempfile
 import site
 import contextlib
+import functools
 import tarfile
 import logging
 import itertools
@@ -41,20 +42,24 @@
 from .textwrap import DALS
 
 
-@contextlib.contextmanager
-def _mark_removing_patcher(obj, attr, newval):
-    setattr(obj, attr, newval)
-    try:
-        yield
-    finally:
-        delattr(obj, attr)
+def _mock_removing_patcher(obj, attr, newval):
+    def decorator(fn):
+        @functools.wraps(fn)
+        def wrapper(*args, **kwargs):
+            setattr(obj, attr, newval)
+            try:
+                return fn(*args, **kwargs)
+            finally:
+                delattr(obj, attr)
+        return wrapper
+    return decorator
 
 
 def magic_patch_object(obj, attr, newval):
     if hasattr(obj, attr):
         return mock.patch.object(obj, attr, newval)
     else:
-        return _mark_removing_patcher(obj, attr, newval)
+        return _mock_removing_patcher(obj, attr, newval)
 
 
 class FakeDist(object):

From beddb52c98e81a191e04d61e020aca238d46b57b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Thu, 19 May 2016 18:06:49 +0200
Subject: [PATCH 5747/8469] Update msvc9_support.py

---
 setuptools/msvc9_support.py | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 7cafd062e2..8cfba11ecb 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -4,6 +4,7 @@
 import os
 import collections
 import itertools
+import platform
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
@@ -57,6 +58,10 @@ def patch_for_specialized_compiler():
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
+    if platform.system() != 'Windows':
+        # Don't need to patch if not on Windows
+        return
+
     if 'distutils' not in globals():
         # The module isn't available to be patched
         return
@@ -71,14 +76,14 @@ def patch_for_specialized_compiler():
         msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
         unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
         msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
-    except:
+    except Exception:
         pass
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
         unpatched['msv14_get_vc_env'] = msvc14compiler._get_vc_env
         msvc14compiler._get_vc_env = msvc14_get_vc_env
-    except:
+    except Exception:
         pass
 
 
@@ -193,7 +198,7 @@ def msvc14_get_vc_env(plat_spec):
     ------
     environment: dict
     """
-    # Try to get environement from vcvarsall.bat (Classical way)
+    # Try to get environment from vcvarsall.bat (Classical way)
     try:
         return unpatched['msv14_get_vc_env'](plat_spec)
     except distutils.errors.DistutilsPlatformError:
@@ -278,7 +283,7 @@ def current_dir(self, hidex86=False, x64=False):
         Return
         ------
         subfolder: str
-            "\target"
+            '\target', or '' (see hidex86 parameter)
         """
         return (
             '' if (self.current_cpu == 'x86' and hidex86) else
@@ -300,7 +305,7 @@ def target_dir(self, hidex86=False, x64=False):
         Return
         ------
         subfolder: str
-            "\current"
+            '\current', or '' (see hidex86 parameter)
         """
         return (
             '' if (self.target_cpu == 'x86' and hidex86) else
@@ -315,20 +320,20 @@ def cross_dir(self, forcex86=False):
         Parameters
         ----------
         forcex86: bool
-            If cross compilation, return 'x86' as current architecture even
-            if current acritecture is not x86.
+            Use 'x86' as current architecture even if current acritecture is
+            not x86.
 
         Return
         ------
         subfolder: str
-            "\current" if target architecture is current architecture,
-            "\current_target" if not.
+            '' if target architecture is current architecture,
+            '\current_target' if not.
         """
         current = 'x86' if forcex86 else self.current_cpu
-        if self.target_cpu != current:
-            return self.target_dir().replace('\\', '\\%s_' % current)
-        else:
-            return ''
+        return (
+            '' if self.target_cpu == current else
+            self.target_dir().replace('\\', '\\%s_' % current)
+        )
 
 
 class RegistryInfo:

From 2e3b0c3f3285fcf18de4dd6f5593c48084ace283 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:20:47 -0400
Subject: [PATCH 5748/8469] Remove unused import

---
 setuptools/tests/test_easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a4fd39fe57..39afaf97a1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -6,7 +6,6 @@
 
 import sys
 import os
-import shutil
 import tempfile
 import site
 import contextlib

From 6d83e28f216e750b7c20d6c1f9df4529565e9ee9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:25:40 -0400
Subject: [PATCH 5749/8469] Prefer the amazing monkeypatch fixture from pytest
 to bespoke inline implementations.

---
 setuptools/tests/test_easy_install.py | 43 +++++++--------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 39afaf97a1..ecfda5d224 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -9,7 +9,6 @@
 import tempfile
 import site
 import contextlib
-import functools
 import tarfile
 import logging
 import itertools
@@ -41,26 +40,6 @@
 from .textwrap import DALS
 
 
-def _mock_removing_patcher(obj, attr, newval):
-    def decorator(fn):
-        @functools.wraps(fn)
-        def wrapper(*args, **kwargs):
-            setattr(obj, attr, newval)
-            try:
-                return fn(*args, **kwargs)
-            finally:
-                delattr(obj, attr)
-        return wrapper
-    return decorator
-
-
-def magic_patch_object(obj, attr, newval):
-    if hasattr(obj, attr):
-        return mock.patch.object(obj, attr, newval)
-    else:
-        return _mock_removing_patcher(obj, attr, newval)
-
-
 class FakeDist(object):
     def get_entry_map(self, group):
         if group != 'console_scripts':
@@ -139,20 +118,18 @@ def test_write_exception(self):
         with pytest.raises(distutils.errors.DistutilsError):
             cmd.cant_write_to_target()
 
-    @magic_patch_object(site, 'getsitepackages', lambda: ['/setuptools/test/site-packages'])
-    def test_all_site_dirs(self):
+    def test_all_site_dirs(self, monkeypatch):
+        """
+        get_site_dirs should always return site dirs reported by
+        site.getsitepackages.
+        """
+        mock_gsp = lambda: ['/setuptools/test/site-packages']
+        monkeypatch.setattr(site, 'getsitepackages', mock_gsp)
         assert '/setuptools/test/site-packages' in ei.get_site_dirs()
 
-    def test_all_site_dirs_works_without_getsitepackages(self):
-        getsitepackages_old = None
-        if hasattr(site, 'getsitepackages'):
-            getsitepackages_old = site.getsitepackages
-            del site.getsitepackages
-        try:
-            assert ei.get_site_dirs()
-        finally:
-            if getsitepackages_old is not None:
-                site.getsitepackages = getsitepackages_old
+    def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch):
+        monkeypatch.delattr(site, 'getsitepackages', raising=False)
+        assert ei.get_site_dirs()
 
 
 class TestPTHFileWriter:

From b0c4ff4663183745aeb761dab6dc89740dd39b08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:28:49 -0400
Subject: [PATCH 5750/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index dd2e2c73a0..98ec904072 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v21.2.0
+-------
+
+* #539: In the easy_install get_site_dirs, honor all
+  paths found in ``site.getsitepackages``.
+
 v21.1.0
 -------
 

From c3a21a08b16af1eb1e2b47972ecdab6df3d79b7b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:30:11 -0400
Subject: [PATCH 5751/8469] Normalize imports

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

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0bd3ea45d9..39afb65387 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -15,8 +15,10 @@
 from glob import glob
 from distutils.util import get_platform
 from distutils.util import convert_path, subst_vars
-from distutils.errors import DistutilsArgError, DistutilsOptionError, \
-    DistutilsError, DistutilsPlatformError
+from distutils.errors import (
+    DistutilsArgError, DistutilsOptionError,
+    DistutilsError, DistutilsPlatformError,
+)
 from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS
 from distutils import log, dir_util
 from distutils.command.build_scripts import first_line_re

From c18482b4a81e6bd7b46290688451d7b7bcead99c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:34:46 -0400
Subject: [PATCH 5752/8469] Add docstring

---
 setuptools/command/easy_install.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 39afb65387..774f0f21f1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -76,6 +76,12 @@ def is_64bit():
 
 
 def samefile(p1, p2):
+    """
+    Determine if two paths reference the same file.
+
+    Augments os.path.samefile to work on Windows and
+    suppresses errors if the path doesn't exist.
+    """
     both_exist = os.path.exists(p1) and os.path.exists(p2)
     use_samefile = hasattr(os.path, 'samefile') and both_exist
     if use_samefile:

From 0ffc51a989d34ecaf072169db60988c30ec1686f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:55:14 -0400
Subject: [PATCH 5753/8469] Reindent for clarity and to remove hanging indents.

---
 setuptools/command/easy_install.py | 146 ++++++++++++++++++-----------
 1 file changed, 92 insertions(+), 54 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 774f0f21f1..e9ba5956b1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -266,8 +266,10 @@ def finalize_options(self):
         self.expand_basedirs()
         self.expand_dirs()
 
-        self._expand('install_dir', 'script_dir', 'build_directory',
-                     'site_dirs')
+        self._expand(
+            'install_dir', 'script_dir', 'build_directory',
+            'site_dirs',
+        )
         # If a non-default installation directory was specified, default the
         # script directory to match it.
         if self.script_dir is None:
@@ -387,9 +389,15 @@ def expand_basedirs(self):
 
     def expand_dirs(self):
         """Calls `os.path.expanduser` on install dirs."""
-        self._expand_attrs(['install_purelib', 'install_platlib',
-                            'install_lib', 'install_headers',
-                            'install_scripts', 'install_data', ])
+        dirs = [
+            'install_purelib',
+            'install_platlib',
+            'install_lib',
+            'install_headers',
+            'install_scripts',
+            'install_data',
+        ]
+        self._expand_attrs(dirs)
 
     def run(self):
         if self.verbose != self.distribution.verbose:
@@ -523,6 +531,12 @@ def check_pth_processing(self):
         pth_file = self.pseudo_tempname() + ".pth"
         ok_file = pth_file + '.ok'
         ok_exists = os.path.exists(ok_file)
+        doc = "; ".join([
+            "import os",
+            "f = open({ok_file!r}, 'w')",
+            "f.write('OK')",
+            "f.close()\n",
+        ]).format(**locals())
         try:
             if ok_exists:
                 os.unlink(ok_file)
@@ -534,16 +548,18 @@ def check_pth_processing(self):
             self.cant_write_to_target()
         else:
             try:
-                f.write("import os; f = open(%r, 'w'); f.write('OK'); "
-                        "f.close()\n" % (ok_file,))
+                f.write(doc)
                 f.close()
                 f = None
                 executable = sys.executable
                 if os.name == 'nt':
                     dirname, basename = os.path.split(executable)
                     alt = os.path.join(dirname, 'pythonw.exe')
-                    if (basename.lower() == 'python.exe' and
-                            os.path.exists(alt)):
+                    use_alt = (
+                        basename.lower() == 'python.exe' and
+                        os.path.exists(alt)
+                    )
+                    if use_alt:
                         # use pythonw.exe to avoid opening a console window
                         executable = alt
 
@@ -610,7 +626,6 @@ def check_editable(self, spec):
 
     def easy_install(self, spec, deps=False):
         tmpdir = tempfile.mkdtemp(prefix="easy_install-")
-        download = None
         if not self.editable:
             self.install_site_py()
 
@@ -619,9 +634,8 @@ def easy_install(self, spec, deps=False):
                 if URL_SCHEME(spec):
                     # It's a url, download it to tmpdir and process
                     self.not_editable(spec)
-                    download = self.package_index.download(spec, tmpdir)
-                    return self.install_item(None, download, tmpdir, deps,
-                                             True)
+                    dl = self.package_index.download(spec, tmpdir)
+                    return self.install_item(None, dl, tmpdir, deps, True)
 
                 elif os.path.exists(spec):
                     # Existing file or directory, just process it directly
@@ -747,8 +761,9 @@ def should_unzip(self, dist):
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)
         if os.path.exists(dst):
-            msg = ("%r already exists in %s; build directory %s will not be "
-                   "kept")
+            msg = (
+                "%r already exists in %s; build directory %s will not be kept"
+            )
             log.warn(msg, spec.key, self.build_directory, setup_base)
             return setup_base
         if os.path.isdir(dist_filename):
@@ -866,8 +881,10 @@ def egg_distribution(self, egg_path):
         return Distribution.from_filename(egg_path, metadata=metadata)
 
     def install_egg(self, egg_path, tmpdir):
-        destination = os.path.join(self.install_dir,
-                                   os.path.basename(egg_path))
+        destination = os.path.join(
+            self.install_dir,
+            os.path.basename(egg_path),
+        )
         destination = os.path.abspath(destination)
         if not self.dry_run:
             ensure_directory(destination)
@@ -877,8 +894,11 @@ def install_egg(self, egg_path, tmpdir):
             if os.path.isdir(destination) and not os.path.islink(destination):
                 dir_util.remove_tree(destination, dry_run=self.dry_run)
             elif os.path.exists(destination):
-                self.execute(os.unlink, (destination,), "Removing " +
-                             destination)
+                self.execute(
+                    os.unlink,
+                    (destination,),
+                    "Removing " + destination,
+                )
             try:
                 new_dist_is_zipped = False
                 if os.path.isdir(egg_path):
@@ -895,12 +915,18 @@ def install_egg(self, egg_path, tmpdir):
                         f, m = shutil.move, "Moving"
                     else:
                         f, m = shutil.copy2, "Copying"
-                self.execute(f, (egg_path, destination),
-                             (m + " %s to %s") %
-                             (os.path.basename(egg_path),
-                              os.path.dirname(destination)))
-                update_dist_caches(destination,
-                                   fix_zipimporter_caches=new_dist_is_zipped)
+                self.execute(
+                    f,
+                    (egg_path, destination),
+                    (m + " %s to %s") % (
+                        os.path.basename(egg_path),
+                        os.path.dirname(destination)
+                    ),
+                )
+                update_dist_caches(
+                    destination,
+                    fix_zipimporter_caches=new_dist_is_zipped,
+                )
             except:
                 update_dist_caches(destination, fix_zipimporter_caches=False)
                 raise
@@ -923,8 +949,8 @@ def install_exe(self, dist_filename, tmpdir):
         )
 
         # Convert the .exe to an unpacked egg
-        egg_path = dist.location = os.path.join(tmpdir, dist.egg_name() +
-                                                '.egg')
+        egg_path = os.path.join(tmpdir, dist.egg_name() + '.egg')
+        dist.location = egg_path
         egg_tmp = egg_path + '.tmp'
         _egg_info = os.path.join(egg_tmp, 'EGG-INFO')
         pkg_inf = os.path.join(_egg_info, 'PKG-INFO')
@@ -942,13 +968,13 @@ def install_exe(self, dist_filename, tmpdir):
             f.close()
         script_dir = os.path.join(_egg_info, 'scripts')
         # delete entry-point scripts to avoid duping
-        self.delete_blockers(
-            [os.path.join(script_dir, args[0]) for args in
-             ScriptWriter.get_args(dist)]
-        )
+        self.delete_blockers([
+            os.path.join(script_dir, args[0])
+            for args in ScriptWriter.get_args(dist)
+        ])
         # Build .egg file from tmpdir
         bdist_egg.make_zipfile(
-            egg_path, egg_tmp, verbose=self.verbose, dry_run=self.dry_run
+            egg_path, egg_tmp, verbose=self.verbose, dry_run=self.dry_run,
         )
         # install the .egg
         return self.install_egg(egg_path, tmpdir)
@@ -1136,7 +1162,7 @@ def update_pth(self, dist):
             if dist.location in self.pth_file.paths:
                 log.info(
                     "%s is already the active version in easy-install.pth",
-                    dist
+                    dist,
                 )
             else:
                 log.info("Adding %s to easy-install.pth file", dist)
@@ -1197,7 +1223,7 @@ def byte_compile(self, to_compile):
             if self.optimize:
                 byte_compile(
                     to_compile, optimize=self.optimize, force=1,
-                    dry_run=self.dry_run
+                    dry_run=self.dry_run,
                 )
         finally:
             log.set_verbosity(self.verbose)  # restore original verbosity
@@ -1325,15 +1351,20 @@ def get_site_dirs():
             if sys.platform in ('os2emx', 'riscos'):
                 sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
             elif os.sep == '/':
-                sitedirs.extend([os.path.join(prefix,
-                                              "lib",
-                                              "python" + sys.version[:3],
-                                              "site-packages"),
-                                 os.path.join(prefix, "lib", "site-python")])
+                sitedirs.extend([
+                    os.path.join(
+                        prefix,
+                        "lib",
+                        "python" + sys.version[:3],
+                        "site-packages",
+                    ),
+                    os.path.join(prefix, "lib", "site-python"),
+                ])
             else:
-                sitedirs.extend(
-                    [prefix, os.path.join(prefix, "lib", "site-packages")]
-                )
+                sitedirs.extend([
+                    prefix,
+                    os.path.join(prefix, "lib", "site-packages"),
+                ])
             if sys.platform == 'darwin':
                 # for framework builds *only* we add the standard Apple
                 # locations. Currently only per-user, but /Library and
@@ -1341,12 +1372,14 @@ def get_site_dirs():
                 if 'Python.framework' in prefix:
                     home = os.environ.get('HOME')
                     if home:
-                        sitedirs.append(
-                            os.path.join(home,
-                                         'Library',
-                                         'Python',
-                                         sys.version[:3],
-                                         'site-packages'))
+                        home_sp = os.path.join(
+                            home,
+                            'Library',
+                            'Python',
+                            sys.version[:3],
+                            'site-packages',
+                        )
+                        sitedirs.append(home_sp)
     lib_paths = get_path('purelib'), get_path('platlib')
     for site_lib in lib_paths:
         if site_lib not in sitedirs:
@@ -1427,8 +1460,8 @@ def extract_wininst_cfg(dist_filename):
             return None  # not a valid tag
 
         f.seek(prepended - (12 + cfglen))
-        cfg = configparser.RawConfigParser(
-            {'version': '', 'target_version': ''})
+        init = {'version': '', 'target_version': ''}
+        cfg = configparser.RawConfigParser(init)
         try:
             part = f.read(cfglen)
             # Read up to the first null byte.
@@ -1451,7 +1484,8 @@ def get_exe_prefixes(exe_filename):
     """Get exe->egg path translations for a given .exe file"""
 
     prefixes = [
-        ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''),
+        ('PURELIB/', ''),
+        ('PLATLIB/pywin32_system32', ''),
         ('PLATLIB/', ''),
         ('SCRIPTS/', 'EGG-INFO/scripts/'),
         ('DATA/lib/site-packages', ''),
@@ -2084,8 +2118,11 @@ def _get_script_args(cls, type_, name, header, script_text):
         "For Windows, add a .py extension"
         ext = dict(console='.pya', gui='.pyw')[type_]
         if ext not in os.environ['PATHEXT'].lower().split(';'):
-            warnings.warn("%s not listed in PATHEXT; scripts will not be "
-                          "recognized as executables." % ext, UserWarning)
+            msg = (
+                "{ext} not listed in PATHEXT; scripts will not be "
+                "recognized as executables."
+            ).format(**locals())
+            warnings.warn(msg, UserWarning)
         old = ['.pya', '.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)
@@ -2251,7 +2288,8 @@ def _show_help(self, *args, **kw):
         setup(
             script_args=['-q', 'easy_install', '-v'] + argv,
             script_name=sys.argv[0] or 'easy_install',
-            distclass=DistributionWithoutHelpCommands, **kw
+            distclass=DistributionWithoutHelpCommands,
+            **kw
         )
 
 

From e92023ee5ebf949082c2db0bb446ba52b1ba8ff4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:58:15 -0400
Subject: [PATCH 5754/8469] Re-use _inline for nicer one-line scripts.

---
 setuptools/command/easy_install.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e9ba5956b1..ccc66cf719 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -113,6 +113,9 @@ def isascii(s):
             return False
 
 
+_one_liner = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
+
+
 class easy_install(Command):
     """Manage a download/build/install process"""
     description = "Find/get/install Python packages"
@@ -531,12 +534,12 @@ def check_pth_processing(self):
         pth_file = self.pseudo_tempname() + ".pth"
         ok_file = pth_file + '.ok'
         ok_exists = os.path.exists(ok_file)
-        doc = "; ".join([
-            "import os",
-            "f = open({ok_file!r}, 'w')",
-            "f.write('OK')",
-            "f.close()\n",
-        ]).format(**locals())
+        tmpl = _one_liner("""
+            import os
+            f = open({ok_file!r}, 'w')
+            f.write('OK')
+            f.close()
+            """) + '\n'
         try:
             if ok_exists:
                 os.unlink(ok_file)
@@ -548,7 +551,7 @@ def check_pth_processing(self):
             self.cant_write_to_target()
         else:
             try:
-                f.write(doc)
+                f.write(tmpl.format(**locals()))
                 f.close()
                 f = None
                 executable = sys.executable
@@ -1645,12 +1648,11 @@ def _wrap_lines(cls, lines):
             yield line
         yield cls.postlude
 
-    _inline = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
-    prelude = _inline("""
+    prelude = _one_liner("""
         import sys
         sys.__plen = len(sys.path)
         """)
-    postlude = _inline("""
+    postlude = _one_liner("""
         import sys
         new = sys.path[sys.__plen:]
         del sys.path[sys.__plen:]

From 731214ec6fc486e9a26f0ec83dd2434f346e6b4a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:59:43 -0400
Subject: [PATCH 5755/8469] =?UTF-8?q?Bump=20version:=2021.1.0=20=E2=86=92?=
 =?UTF-8?q?=2021.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 764cab0bdf..e13f8c64e9 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.1.0
+current_version = 21.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 65568b8078..c497e6a980 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="21.1.0",
+    version="21.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From a048b0ab8aa0eb9307bea33a043c10ff487975a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 10:59:44 -0400
Subject: [PATCH 5756/8469] Added tag v21.2.0 for changeset 40b8fac6db11

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8140911a1e..1d9db8cfc9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -261,3 +261,4 @@ c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
 ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8
 02643fe9503033edd2fc5a54c8d4361a6c185be4 v21.1.0
+40b8fac6db119aca9c462993d01908492769fc4f v21.2.0

From 9c4f8ecbcec6d2107e2fbfca69faec9dec358dad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 11:40:46 -0400
Subject: [PATCH 5757/8469] getsitepackages may not be present

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index ecfda5d224..fd06b6efc8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -124,7 +124,7 @@ def test_all_site_dirs(self, monkeypatch):
         site.getsitepackages.
         """
         mock_gsp = lambda: ['/setuptools/test/site-packages']
-        monkeypatch.setattr(site, 'getsitepackages', mock_gsp)
+        monkeypatch.setattr(site, 'getsitepackages', mock_gsp, raising=False)
         assert '/setuptools/test/site-packages' in ei.get_site_dirs()
 
     def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch):

From de5db9dbd9da6802219fe1b70ba84207f60470dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 May 2016 11:41:37 -0400
Subject: [PATCH 5758/8469] Added tag v21.2.0 for changeset 9959424676a4

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 1d9db8cfc9..257ff80e45 100644
--- a/.hgtags
+++ b/.hgtags
@@ -262,3 +262,5 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8
 02643fe9503033edd2fc5a54c8d4361a6c185be4 v21.1.0
 40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
+40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
+9959424676a4aac1c14e430ff6f4210fdb0442d9 v21.2.0

From 6e11e32e4ac8afc30bf3a85d8e583ba55b1a1848 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 13:29:58 -0400
Subject: [PATCH 5759/8469] Remove extra redundant work. Patch the module so
 behavior is the same on Unix systems even if not invoked. Tests still pass on
 Linux due to import protections.

---
 setuptools/msvc9_support.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 8cfba11ecb..d1f1a7a0d1 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -4,7 +4,6 @@
 import os
 import collections
 import itertools
-import platform
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
@@ -58,10 +57,6 @@ def patch_for_specialized_compiler():
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
-    if platform.system() != 'Windows':
-        # Don't need to patch if not on Windows
-        return
-
     if 'distutils' not in globals():
         # The module isn't available to be patched
         return

From 81cbfafddd92b39a6598ad3372e33eb28fadaf7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 13:32:58 -0400
Subject: [PATCH 5760/8469] Add missing C for consistency.

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

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index d1f1a7a0d1..995828833b 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -76,7 +76,7 @@ def patch_for_specialized_compiler():
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
-        unpatched['msv14_get_vc_env'] = msvc14compiler._get_vc_env
+        unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
         msvc14compiler._get_vc_env = msvc14_get_vc_env
     except Exception:
         pass
@@ -195,7 +195,7 @@ def msvc14_get_vc_env(plat_spec):
     """
     # Try to get environment from vcvarsall.bat (Classical way)
     try:
-        return unpatched['msv14_get_vc_env'](plat_spec)
+        return unpatched['msvc14_get_vc_env'](plat_spec)
     except distutils.errors.DistutilsPlatformError:
         # Pass error Vcvarsall.bat is missing
         pass

From b83cf1a68091b8de46f0ba19f1ce2f031d9cdc94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 13:41:32 -0400
Subject: [PATCH 5761/8469] Use underscore to separate words (or acronyms) for
 clarity (vc_ver).

---
 setuptools/msvc9_support.py | 120 ++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index 995828833b..d4b7521a58 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -457,28 +457,28 @@ class SystemInfo:
     ----------
     registry_info: RegistryInfo
         "RegistryInfo" instance.
-    vcver: float
+    vc_ver: float
         Required Microsoft Visual C++ version.
     """
     WinDir = safe_env['WinDir']
     ProgramFiles = safe_env['ProgramFiles']
     ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
 
-    def __init__(self, registry_info, vcver=None):
+    def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info
         self.pi = self.ri.pi
-        if vcver:
-            self.vcver = vcver
+        if vc_ver:
+            self.vc_ver = vc_ver
         else:
             try:
-                self.vcver = self.find_availables_vcver()[-1]
+                self.vc_ver = self.find_available_vc_vers()[-1]
             except IndexError:
                 err = 'No Microsoft Visual C++ version found'
                 raise distutils.errors.DistutilsPlatformError(err)
 
-    def find_availables_vcver(self):
+    def find_available_vc_vers(self):
         """
-        Find all availables Microsoft Visual C++ versions.
+        Find all available Microsoft Visual C++ versions.
         """
         vckeys = (self.ri.vc, self.ri.vc_for_python)
         vsvers = []
@@ -511,11 +511,11 @@ def VSInstallDir(self):
         Microsoft Visual Studio directory.
         """
         # Default path
-        name = 'Microsoft Visual Studio %0.1f' % self.vcver
+        name = 'Microsoft Visual Studio %0.1f' % self.vc_ver
         default = os.path.join(self.ProgramFilesx86, name)
 
         # Try to get path from registry, if fail use default path
-        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vcver) or default
+        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vc_ver) or default
 
     @property
     def VCInstallDir(self):
@@ -523,16 +523,16 @@ def VCInstallDir(self):
         Microsoft Visual C++ directory.
         """
         # Default path
-        default = r'Microsoft Visual Studio %0.1f\VC' % self.vcver
+        default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
         guess_vc = os.path.join(self.ProgramFilesx86, default)
 
         # Try to get "VC++ for Python" path from registry as default path
-        path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vcver)
+        path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
         python_vc = self.ri.lookup(path, 'installdir')
         default_vc = os.path.join(python_vc, 'VC') if python_vc else guess_vc
 
         # Try to get path from registry, if fail use default path
-        result = self.ri.lookup(self.ri.vc, '%0.1f' % self.vcver) or default_vc
+        result = self.ri.lookup(self.ri.vc, '%0.1f' % self.vc_ver) or default_vc
 
         if not os.path.isdir(result):
             msg = 'Microsoft Visual C++ directory not found'
@@ -546,15 +546,15 @@ def WindowsSdkVersion(self):
         Microsoft Windows SDK versions.
         """
         # Set Windows SDK versions for specified MSVC++ version
-        if self.vcver <= 9.0:
+        if self.vc_ver <= 9.0:
             return ('7.0', '6.1', '6.0a')
-        elif self.vcver == 10.0:
+        elif self.vc_ver == 10.0:
             return ('7.1', '7.0a')
-        elif self.vcver == 11.0:
+        elif self.vc_ver == 11.0:
             return ('8.0', '8.0a')
-        elif self.vcver == 12.0:
+        elif self.vc_ver == 12.0:
             return ('8.1', '8.1a')
-        elif self.vcver >= 14.0:
+        elif self.vc_ver >= 14.0:
             return ('10.0', '8.1')
 
     @property
@@ -571,7 +571,7 @@ def WindowsSdkDir(self):
                 break
         if not sdkdir or not os.path.isdir(sdkdir):
             # Try to get "VC++ for Python" version from registry
-            path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vcver)
+            path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
             install_base = self.ri.lookup(path, 'installdir')
             if install_base:
                 sdkdir = os.path.join(install_base, 'WinSDK')
@@ -601,18 +601,18 @@ def WindowsSDKExecutablePath(self):
         Microsoft Windows SDK executable directory.
         """
         # Find WinSDK NetFx Tools registry dir name
-        if self.vcver <= 11.0:
+        if self.vc_ver <= 11.0:
             netfxver = 35
             arch = ''
         else:
             netfxver = 40
-            hidex86 = True if self.vcver <= 12.0 else False
+            hidex86 = True if self.vc_ver <= 12.0 else False
             arch = self.pi.current_dir(x64=True, hidex86=hidex86)
         fx = 'WinSDK-NetFx%dTools%s' % (netfxver, arch.replace('\\', '-'))
 
         # liste all possibles registry paths
         regpaths = []
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             for ver in self.NetFxSdkVersion:
                 regpaths += [os.path.join(self.ri.netfx_sdk, ver, fx)]
 
@@ -631,7 +631,7 @@ def FSharpInstallDir(self):
         """
         Microsoft Visual F# directory.
         """
-        path = r'%0.1f\Setup\F#' % self.vcver
+        path = r'%0.1f\Setup\F#' % self.vc_ver
         path = os.path.join(self.ri.visualstudio, path)
         return self.ri.lookup(path, 'productdir') or ''
 
@@ -641,7 +641,7 @@ def UniversalCRTSdkDir(self):
         Microsoft Universal CRT SDK directory.
         """
         # Set Kit Roots versions for specified MSVC++ version
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             vers = ('10', '81')
         else:
             vers = ()
@@ -660,7 +660,7 @@ def NetFxSdkVersion(self):
         Microsoft .NET Framework SDK versions.
         """
         # Set FxSdk versions for specified MSVC++ version
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             return ('4.6.1', '4.6')
         else:
             return ()
@@ -726,14 +726,14 @@ def _find_dot_net_versions(self, bits=32):
         ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
 
         # Set .NET versions for specified MSVC++ version
-        if self.vcver >= 12.0:
+        if self.vc_ver >= 12.0:
             frameworkver = (ver, 'v4.0')
-        elif self.vcver >= 10.0:
+        elif self.vc_ver >= 10.0:
             frameworkver = ('v4.0.30319' if ver.lower()[:2] != 'v4' else ver,
                             'v3.5')
-        elif self.vcver == 9.0:
+        elif self.vc_ver == 9.0:
             frameworkver = ('v3.5', 'v2.0.50727')
-        if self.vcver == 8.0:
+        if self.vc_ver == 8.0:
             frameworkver = ('v3.0', 'v2.0.50727')
         return frameworkver
 
@@ -752,24 +752,24 @@ class EnvironmentInfo:
     ----------
     arch: str
         Target architecture.
-    vcver: float
+    vc_ver: float
         Required Microsoft Visual C++ version. If not set, autodetect the last
         version.
-    vcvermin: float
+    vc_min_ver: float
         Minimum Microsoft Visual C++ version.
     """
-    def __init__(self, arch, vcver=None, vcvermin=None):
+    def __init__(self, arch, vc_ver=None, vc_min_ver=None):
         self.pi = PlatformInfo(arch)
         self.ri = RegistryInfo(self.pi)
-        self.si = SystemInfo(self.ri, vcver)
+        self.si = SystemInfo(self.ri, vc_ver)
 
-        if vcvermin:
-            if self.vcver < vcvermin:
+        if vc_min_ver:
+            if self.vc_ver < vc_min_ver:
                 err = 'No suitable Microsoft Visual C++ version found'
                 raise distutils.errors.DistutilsPlatformError(err)
 
     @property
-    def vcver(self):
+    def vc_ver(self):
         """
         Microsoft Visual C++ version.
         """
@@ -782,7 +782,7 @@ def VSTools(self):
         """
         paths = [r'Common7\IDE', r'Common7\Tools']
 
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             paths += [r'Common7\IDE\CommonExtensions\Microsoft\TestWindow']
             paths += [r'Team Tools\Performance Tools']
@@ -806,7 +806,7 @@ def VCLibraries(self):
         arch_subdir = self.pi.target_dir(hidex86=True)
         paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
 
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             paths += [r'Lib\store%s' % arch_subdir]
 
         return [os.path.join(self.si.VCInstallDir, path) for path in paths]
@@ -816,7 +816,7 @@ def VCStoreRefs(self):
         """
         Microsoft Visual C++ store references Libraries
         """
-        if self.vcver < 14.0:
+        if self.vc_ver < 14.0:
             return []
         return [os.path.join(self.si.VCInstallDir, r'Lib\store\references')]
 
@@ -828,12 +828,12 @@ def VCTools(self):
         si = self.si
         tools = [os.path.join(si.VCInstallDir, 'VCPackages')]
 
-        forcex86 = True if self.vcver <= 10.0 else False
+        forcex86 = True if self.vc_ver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
         if arch_subdir:
             tools += [os.path.join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             path = 'Bin%s' % self.pi.current_dir(hidex86=True)
             tools += [os.path.join(si.VCInstallDir, path)]
 
@@ -847,7 +847,7 @@ def OSLibraries(self):
         """
         Microsoft Windows SDK Libraries
         """
-        if self.vcver <= 10.0:
+        if self.vc_ver <= 10.0:
             arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
             return [os.path.join(self.si.WindowsSdkDir, 'Lib%s' % arch_subdir)]
 
@@ -864,11 +864,11 @@ def OSIncludes(self):
         """
         include = os.path.join(self.si.WindowsSdkDir, 'include')
 
-        if self.vcver <= 10.0:
+        if self.vc_ver <= 10.0:
             return [include, os.path.join(include, 'gl')]
 
         else:
-            if self.vcver >= 14.0:
+            if self.vc_ver >= 14.0:
                 sdkver = self._get_content_dirname(include)
             else:
                 sdkver = ''
@@ -884,13 +884,13 @@ def OSLibpath(self):
         ref = os.path.join(self.si.WindowsSdkDir, 'References')
         libpath = []
 
-        if self.vcver <= 9.0:
+        if self.vc_ver <= 9.0:
             libpath += self.OSLibraries
 
-        if self.vcver >= 11.0:
+        if self.vc_ver >= 11.0:
             libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')]
 
-        if self.vcver >= 14.0:
+        if self.vc_ver >= 14.0:
             libpath += [ref,
                         os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
                         os.path.join(ref, r'Windows.Foundation.'
@@ -902,7 +902,7 @@ def OSLibpath(self):
                         os.path.join(self.si.WindowsSdkDir, r'ExtensionSDKs'
                                      r'\Microsoft.VCLibs\%0.1f\References'
                                      r'\CommonConfiguration\neutral' %
-                                     self.vcver)]
+                                     self.vc_ver)]
         return libpath
 
     @property
@@ -911,14 +911,14 @@ def SdkTools(self):
         Microsoft Windows SDK Tools
         """
         tools = [os.path.join(self.si.WindowsSdkDir,
-                              'Bin' if self.vcver <= 11.0 else r'Bin\x86')]
+                              'Bin' if self.vc_ver <= 11.0 else r'Bin\x86')]
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
             path = 'Bin%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
 
-        if self.vcver == 10.0 or self.vcver == 11.0:
+        if self.vc_ver == 10.0 or self.vc_ver == 11.0:
             if self.pi.target_is_x86():
                 arch_subdir = ''
             else:
@@ -936,7 +936,7 @@ def SdkSetup(self):
         """
         Microsoft Windows SDK Setup
         """
-        if self.vcver > 9.0:
+        if self.vc_ver > 9.0:
             return []
 
         return [os.path.join(self.si.WindowsSdkDir, 'Setup')]
@@ -949,7 +949,7 @@ def FxTools(self):
         pi = self.pi
         si = self.si
 
-        if self.vcver <= 10.0:
+        if self.vc_ver <= 10.0:
             include32 = True
             include64 = not pi.target_is_x86() and not pi.current_is_x86()
         else:
@@ -970,7 +970,7 @@ def NetFxSDKLibraries(self):
         """
         Microsoft .Net Framework SDK Libraries
         """
-        if self.vcver < 14.0 or not self.si.NetFxSdkDir:
+        if self.vc_ver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
@@ -981,7 +981,7 @@ def NetFxSDKIncludes(self):
         """
         Microsoft .Net Framework SDK Includes
         """
-        if self.vcver < 14.0 or not self.si.NetFxSdkDir:
+        if self.vc_ver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
         return [os.path.join(self.si.NetFxSdkDir, r'include\um')]
@@ -998,11 +998,11 @@ def MSBuild(self):
         """
         Microsoft Build Engine
         """
-        if self.vcver < 12.0:
+        if self.vc_ver < 12.0:
             return []
 
         arch_subdir = self.pi.current_dir(hidex86=True)
-        path = r'MSBuild\%0.1f\bin%s' % (self.vcver, arch_subdir)
+        path = r'MSBuild\%0.1f\bin%s' % (self.vc_ver, arch_subdir)
         return [os.path.join(self.si.ProgramFilesx86, path)]
 
     @property
@@ -1010,7 +1010,7 @@ def HTMLHelpWorkshop(self):
         """
         Microsoft HTML Help Workshop
         """
-        if self.vcver < 11.0:
+        if self.vc_ver < 11.0:
             return []
 
         return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
@@ -1020,7 +1020,7 @@ def UCRTLibraries(self):
         """
         Microsoft Universal CRT Libraries
         """
-        if self.vcver < 14.0:
+        if self.vc_ver < 14.0:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
@@ -1033,7 +1033,7 @@ def UCRTIncludes(self):
         """
         Microsoft Universal CRT Include
         """
-        if self.vcver < 14.0:
+        if self.vc_ver < 14.0:
             return []
 
         include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
@@ -1045,7 +1045,7 @@ def FSharp(self):
         """
         Microsoft Visual F#
         """
-        if self.vcver < 11.0 and self.vcver > 12.0:
+        if self.vc_ver < 11.0 and self.vc_ver > 12.0:
             return []
 
         return self.si.FSharpInstallDir
@@ -1057,7 +1057,7 @@ def VCRuntimeRedist(self):
         """
         arch_subdir = self.pi.target_dir(x64=True)
         vcruntime = 'redist%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
-        vcruntime = vcruntime % (arch_subdir, self.vcver, self.vcver)
+        vcruntime = vcruntime % (arch_subdir, self.vc_ver, self.vc_ver)
         return os.path.join(self.si.VCInstallDir, vcruntime)
 
     def return_env(self, exists=True):

From 4f6fc8537842c14b03c4a1ffd25b88f2f4c276c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 14:55:31 -0400
Subject: [PATCH 5762/8469] Use itertools.chain for more lenient support of any
 iterable types and also more uniform indentation.

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

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 8623c777cf..3849b6ad6e 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -94,8 +94,10 @@ def _get_pkg_data_files(self, package):
 
     def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""
-        globs = (self.package_data.get('', [])
-                 + self.package_data.get(package, []))
+        globs = itertools.chain(
+            self.package_data.get('', []),
+            self.package_data.get(package, []),
+        )
         files = self.manifest_files.get(package, [])[:]
         for pattern in globs:
             # Each pattern has to be converted to a platform-specific path

From efecaf8cdb7ca4623d2efd53590adf976fd36954 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:06:59 -0400
Subject: [PATCH 5763/8469] Add test ref #261.

---
 setuptools/tests/test_build_py.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 setuptools/tests/test_build_py.py

diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
new file mode 100644
index 0000000000..ed1703accd
--- /dev/null
+++ b/setuptools/tests/test_build_py.py
@@ -0,0 +1,31 @@
+import os
+
+import pytest
+
+from setuptools.dist import Distribution
+
+
+@pytest.yield_fixture
+def tmpdir_as_cwd(tmpdir):
+    with tmpdir.as_cwd():
+        yield tmpdir
+
+
+def test_directories_in_package_data_glob(tmpdir_as_cwd):
+    """
+    Directories matching the glob in package_data should
+    not be included in the package data.
+
+    Regression test for #261.
+    """
+    dist = Distribution(dict(
+        script_name='setup.py',
+        script_args=['build_py'],
+        packages=[''],
+        name='foo',
+        package_data={'': ['path/*']},
+    ))
+    os.makedirs('path/subpath')
+    #with contexts.quiet():
+    dist.parse_command_line()
+    dist.run_commands()

From 2d765a69b19bb92882582249942d607684dd14eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:18:04 -0400
Subject: [PATCH 5764/8469] Refactor build_py.find_data_files to use iterables,
 constructing the files list directly. Ref #261.

---
 setuptools/command/build_py.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 3849b6ad6e..34f3903729 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -98,10 +98,18 @@ def find_data_files(self, package, src_dir):
             self.package_data.get('', []),
             self.package_data.get(package, []),
         )
-        files = self.manifest_files.get(package, [])[:]
-        for pattern in globs:
+        globs_expanded = (
             # Each pattern has to be converted to a platform-specific path
-            files.extend(glob(os.path.join(src_dir, convert_path(pattern))))
+            glob(os.path.join(src_dir, convert_path(pattern)))
+            for pattern in globs
+        )
+        # flatten the expanded globs into an iterable of matches
+        globs_matches = itertools.chain.from_iterable(globs_expanded)
+        glob_files = globs_matches
+        files = list(itertools.chain(
+            self.manifest_files.get(package, []),
+            glob_files,
+        ))
         return self.exclude_data_files(package, src_dir, files)
 
     def build_package_data(self):

From 8f0ac47db9fe2934725aa9c8a7b0089451ed033d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:18:32 -0400
Subject: [PATCH 5765/8469] Filter non-files in find_data_files. Fixes #261.

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

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 34f3903729..23e8b31c35 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -9,7 +9,7 @@
 import collections
 import itertools
 
-from setuptools.extern.six.moves import map
+from setuptools.extern.six.moves import map, filter
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
@@ -105,7 +105,7 @@ def find_data_files(self, package, src_dir):
         )
         # flatten the expanded globs into an iterable of matches
         globs_matches = itertools.chain.from_iterable(globs_expanded)
-        glob_files = globs_matches
+        glob_files = filter(os.path.isfile, globs_matches)
         files = list(itertools.chain(
             self.manifest_files.get(package, []),
             glob_files,

From dde1bfbf9aca70f4d78c349059ba43b3d40eb0e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:21:28 -0400
Subject: [PATCH 5766/8469] Rewrite globs as chain of iterables.

---
 setuptools/command/build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 23e8b31c35..4ce353142a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -194,9 +194,9 @@ def get_package_dir(self, package):
 
     def exclude_data_files(self, package, src_dir, files):
         """Filter filenames for package's data files in 'src_dir'"""
-        globs = (
-            self.exclude_package_data.get('', [])
-            + self.exclude_package_data.get(package, [])
+        globs = itertools.chain(
+            self.exclude_package_data.get('', []),
+            self.exclude_package_data.get(package, []),
         )
         bad = set(
             item

From ba0b4d2eb91961a2237064850deca9e711ee4368 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:22:09 -0400
Subject: [PATCH 5767/8469] Allow files to be iterable in exclude_data_files

---
 setuptools/command/build_py.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 4ce353142a..41b2660c20 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -106,10 +106,10 @@ def find_data_files(self, package, src_dir):
         # flatten the expanded globs into an iterable of matches
         globs_matches = itertools.chain.from_iterable(globs_expanded)
         glob_files = filter(os.path.isfile, globs_matches)
-        files = list(itertools.chain(
+        files = itertools.chain(
             self.manifest_files.get(package, []),
             glob_files,
-        ))
+        )
         return self.exclude_data_files(package, src_dir, files)
 
     def build_package_data(self):
@@ -198,6 +198,7 @@ def exclude_data_files(self, package, src_dir, files):
             self.exclude_package_data.get('', []),
             self.exclude_package_data.get(package, []),
         )
+        files = list(files)
         bad = set(
             item
             for pattern in globs

From c05fd0799bb2a83ab877f317e8630a403a3514f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:40:01 -0400
Subject: [PATCH 5768/8469] Rewrite find_data_files and exclude_data_files to
 follow the same pattern for building platform_patterns.

---
 setuptools/command/build_py.py | 41 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 41b2660c20..cd91a85e7e 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -94,15 +94,17 @@ def _get_pkg_data_files(self, package):
 
     def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""
-        globs = itertools.chain(
-            self.package_data.get('', []),
-            self.package_data.get(package, []),
+        spec = self.package_data
+        raw_patterns = itertools.chain(
+            spec.get('', []),
+            spec.get(package, []),
         )
-        globs_expanded = (
+        platform_patterns = (
             # Each pattern has to be converted to a platform-specific path
-            glob(os.path.join(src_dir, convert_path(pattern)))
-            for pattern in globs
+            os.path.join(src_dir, convert_path(pattern))
+            for pattern in raw_patterns
         )
+        globs_expanded = map(glob, platform_patterns)
         # flatten the expanded globs into an iterable of matches
         globs_matches = itertools.chain.from_iterable(globs_expanded)
         glob_files = filter(os.path.isfile, globs_matches)
@@ -194,19 +196,24 @@ def get_package_dir(self, package):
 
     def exclude_data_files(self, package, src_dir, files):
         """Filter filenames for package's data files in 'src_dir'"""
-        globs = itertools.chain(
-            self.exclude_package_data.get('', []),
-            self.exclude_package_data.get(package, []),
-        )
         files = list(files)
-        bad = set(
-            item
-            for pattern in globs
-            for item in fnmatch.filter(
-                files,
-                os.path.join(src_dir, convert_path(pattern)),
-            )
+        spec = self.exclude_package_data
+        raw_patterns = itertools.chain(
+            spec.get('', []),
+            spec.get(package, []),
+        )
+        platform_patterns = (
+            # Each pattern has to be converted to a platform-specific path
+            os.path.join(src_dir, convert_path(pattern))
+            for pattern in raw_patterns
+        )
+        match_groups = (
+            fnmatch.filter(files, pattern)
+            for pattern in platform_patterns
         )
+        # flatten the groups of matches into an iterable of matches
+        matches = itertools.chain.from_iterable(match_groups)
+        bad = set(matches)
         seen = collections.defaultdict(itertools.count)
         return [
             fn

From 1af011b1f1dac17485c0cf8fe9eb08c43b5b6f2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:53:06 -0400
Subject: [PATCH 5769/8469] Extract duplicate code into a single method.

---
 setuptools/command/build_py.py | 48 ++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index cd91a85e7e..1db0acb953 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -94,17 +94,12 @@ def _get_pkg_data_files(self, package):
 
     def find_data_files(self, package, src_dir):
         """Return filenames for package's data files in 'src_dir'"""
-        spec = self.package_data
-        raw_patterns = itertools.chain(
-            spec.get('', []),
-            spec.get(package, []),
-        )
-        platform_patterns = (
-            # Each pattern has to be converted to a platform-specific path
-            os.path.join(src_dir, convert_path(pattern))
-            for pattern in raw_patterns
+        patterns = self._get_platform_patterns(
+            self.package_data,
+            package,
+            src_dir,
         )
-        globs_expanded = map(glob, platform_patterns)
+        globs_expanded = map(glob, patterns)
         # flatten the expanded globs into an iterable of matches
         globs_matches = itertools.chain.from_iterable(globs_expanded)
         glob_files = filter(os.path.isfile, globs_matches)
@@ -197,19 +192,14 @@ def get_package_dir(self, package):
     def exclude_data_files(self, package, src_dir, files):
         """Filter filenames for package's data files in 'src_dir'"""
         files = list(files)
-        spec = self.exclude_package_data
-        raw_patterns = itertools.chain(
-            spec.get('', []),
-            spec.get(package, []),
-        )
-        platform_patterns = (
-            # Each pattern has to be converted to a platform-specific path
-            os.path.join(src_dir, convert_path(pattern))
-            for pattern in raw_patterns
+        patterns = self._get_platform_patterns(
+            self.exclude_package_data,
+            package,
+            src_dir,
         )
         match_groups = (
             fnmatch.filter(files, pattern)
-            for pattern in platform_patterns
+            for pattern in patterns
         )
         # flatten the groups of matches into an iterable of matches
         matches = itertools.chain.from_iterable(match_groups)
@@ -223,6 +213,24 @@ def exclude_data_files(self, package, src_dir, files):
             and not next(seen[fn])
         ]
 
+    @staticmethod
+    def _get_platform_patterns(spec, package, src_dir):
+        """
+        yield platfrom-specific path patterns (suitable for glob
+        or fn_match) from a glob-based spec (such as
+        self.package_data or self.exclude_package_data)
+        matching package in src_dir.
+        """
+        raw_patterns = itertools.chain(
+            spec.get('', []),
+            spec.get(package, []),
+        )
+        return (
+            # Each pattern has to be converted to a platform-specific path
+            os.path.join(src_dir, convert_path(pattern))
+            for pattern in raw_patterns
+        )
+
 
 def assert_relative(path):
     if not os.path.isabs(path):

From e75bb0594bad10cb307620359abcd3b5779ecfd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 15:59:45 -0400
Subject: [PATCH 5770/8469] Re-use unique_everseen from itertools recipes.

---
 setuptools/command/build_py.py | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 1db0acb953..758a3fdfe8 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -6,10 +6,9 @@
 import textwrap
 import io
 import distutils.errors
-import collections
 import itertools
 
-from setuptools.extern.six.moves import map, filter
+from setuptools.extern.six.moves import map, filter, filterfalse
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
@@ -204,14 +203,13 @@ def exclude_data_files(self, package, src_dir, files):
         # flatten the groups of matches into an iterable of matches
         matches = itertools.chain.from_iterable(match_groups)
         bad = set(matches)
-        seen = collections.defaultdict(itertools.count)
-        return [
+        keepers = (
             fn
             for fn in files
             if fn not in bad
-            # ditch dupes
-            and not next(seen[fn])
-        ]
+        )
+        # ditch dupes
+        return list(_unique_everseen(keepers))
 
     @staticmethod
     def _get_platform_patterns(spec, package, src_dir):
@@ -232,6 +230,25 @@ def _get_platform_patterns(spec, package, src_dir):
         )
 
 
+# from Python docs
+def _unique_everseen(iterable, key=None):
+    "List unique elements, preserving order. Remember all elements ever seen."
+    # unique_everseen('AAAABBBCCDAABBB') --> A B C D
+    # unique_everseen('ABBCcAD', str.lower) --> A B C D
+    seen = set()
+    seen_add = seen.add
+    if key is None:
+        for element in filterfalse(seen.__contains__, iterable):
+            seen_add(element)
+            yield element
+    else:
+        for element in iterable:
+            k = key(element)
+            if k not in seen:
+                seen_add(k)
+                yield element
+
+
 def assert_relative(path):
     if not os.path.isabs(path):
         return path

From 24cd05319842f1c3a06d4266ea1c13f8a621ac3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 16:08:16 -0400
Subject: [PATCH 5771/8469] Update changelog. Ref #261.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 98ec904072..b6a7ba0f73 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v21.2.1
+-------
+
+* #261: Exclude directories when resolving globs in
+  package_data.
+
 v21.2.0
 -------
 

From 5be89b652f6d9daf19183019ac84d6c737430022 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 16:08:27 -0400
Subject: [PATCH 5772/8469] =?UTF-8?q?Bump=20version:=2021.2.0=20=E2=86=92?=
 =?UTF-8?q?=2021.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e13f8c64e9..e9f13074ef 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.2.0
+current_version = 21.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c497e6a980..4ee0ac323e 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="21.2.0",
+    version="21.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 29bef0ef4c71c0e9a88f1db889b47310568cc160 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 22 May 2016 16:08:28 -0400
Subject: [PATCH 5773/8469] Added tag v21.2.1 for changeset 694111eadb10

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 257ff80e45..400e6e899a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -264,3 +264,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
 40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
 9959424676a4aac1c14e430ff6f4210fdb0442d9 v21.2.0
+694111eadb10fe6003078895a2cbb803ce514ef2 v21.2.1

From 30a0d1c5414ec93ffd4f83cfcc67d426847ce30d Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 26 May 2016 05:35:26 +0000
Subject: [PATCH 5774/8469] Issue #27076: Doc, comment and tests spelling fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most fixes to Doc/ and Lib/ directories by Ville Skyttä.
---
 msvc9compiler.py            | 2 +-
 tests/test_unixccompiler.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index da4b21d22a..0b1fd19ff6 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -51,7 +51,7 @@
 
 # A map keyed by get_platform() return values to values accepted by
 # 'vcvarsall.bat'.  Note a cross-compile may combine these (eg, 'x86_amd64' is
-# the param to cross-compile on x86 targetting amd64.)
+# the param to cross-compile on x86 targeting amd64.)
 PLAT_TO_VCVARS = {
     'win32' : 'x86',
     'win-amd64' : 'amd64',
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 3d14e12aa9..e171ee9c4d 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -127,7 +127,7 @@ def gcv(v):
         self.assertEqual(self.cc.linker_so[0], 'my_cc')
 
     @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X')
-    def test_osx_explict_ldshared(self):
+    def test_osx_explicit_ldshared(self):
         # Issue #18080:
         # ensure that setting CC env variable does not change
         #   explicit LDSHARED setting for linker

From df04790b5ca3705a327321916aeceee5dd469a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= <juanlu001@gmail.com>
Date: Thu, 26 May 2016 14:13:46 +0200
Subject: [PATCH 5775/8469] Fix broken link

---
 docs/easy_install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 8dd176fdfb..a66909b121 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -677,7 +677,7 @@ locations, build options, etc., EasyInstall will respect your existing settings
 until and unless you override them explicitly in an ``[easy_install]`` section.
 
 For more information, see also the current Python documentation on the `use and
-location of distutils configuration files <http://docs.python.org/inst/config-syntax.html>`_.
+location of distutils configuration files <https://docs.python.org/install/index.html#inst-config-files>`_.
 
 Notice that ``easy_install`` will use the ``setup.cfg`` from the current
 working directory only if it was triggered from ``setup.py`` through the

From ab46f6f3f562ac966896d310c4bfed176762a6c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 May 2016 12:17:32 -0400
Subject: [PATCH 5776/8469] Add reference to issue 470 in changelog for 20.5.
 Fixes #470.

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b6a7ba0f73..4cf780aeec 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -109,7 +109,7 @@ v20.6.0
 20.5
 ----
 
-* BB Pull Request #185: Add support for environment markers
+* BB Pull Request #185, #470: Add support for environment markers
   in requirements in install_requires, setup_requires,
   tests_require as well as adding a test for the existing
   extra_requires machinery.

From b1446e0a5342bc1843cb38495ae84a6ca27c8a9e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 May 2016 12:18:59 -0400
Subject: [PATCH 5777/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4cf780aeec..bceb8a2797 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v21.2.2
+-------
+
+* Minor fixes to changelog and docs.
+
 v21.2.1
 -------
 

From 15cec8c321f1f77b4331363ec3fbed87ea00ab64 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 May 2016 12:19:08 -0400
Subject: [PATCH 5778/8469] =?UTF-8?q?Bump=20version:=2021.2.1=20=E2=86=92?=
 =?UTF-8?q?=2021.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e9f13074ef..ad8e1292de 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.2.1
+current_version = 21.2.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 4ee0ac323e..391cacae76 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="21.2.1",
+    version="21.2.2",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 6e248ac4d9920b6f173c1184335448121db5bfb3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 May 2016 12:19:09 -0400
Subject: [PATCH 5779/8469] Added tag v21.2.2 for changeset 274f33435e9c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 400e6e899a..5f9296f389 100644
--- a/.hgtags
+++ b/.hgtags
@@ -265,3 +265,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
 9959424676a4aac1c14e430ff6f4210fdb0442d9 v21.2.0
 694111eadb10fe6003078895a2cbb803ce514ef2 v21.2.1
+274f33435e9c3ba5019f2a2bfe478fa2db0da41d v21.2.2

From a797c9be8e5cc015127c4dd82c545ad2fe6655ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:01:46 -0400
Subject: [PATCH 5780/8469] Use context for closing file

---
 setuptools/command/upload_docs.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index f887b47e52..133fd323c9 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -102,9 +102,8 @@ def run(self):
             shutil.rmtree(tmp_dir)
 
     def upload_file(self, filename):
-        f = open(filename, 'rb')
-        content = f.read()
-        f.close()
+        with open(filename, 'rb') as f:
+            content = f.read()
         meta = self.distribution.metadata
         data = {
             ':action': 'doc_upload',

From daf695c9c05db4f64d0c7d977054cf0a450d4839 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:34:47 -0400
Subject: [PATCH 5781/8469] Use bytes literals and simpler encoding logic when
 constructing multipart post

---
 setuptools/command/upload_docs.py | 34 +++++++++++++------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 133fd323c9..638a1f6df4 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -21,15 +21,9 @@
 from .upload import upload
 
 
-errors = 'surrogateescape' if six.PY3 else 'strict'
-
-
-# This is not just a replacement for byte literals
-# but works as a general purpose encoder
-def b(s, encoding='utf-8'):
-    if isinstance(s, six.text_type):
-        return s.encode(encoding, errors)
-    return s
+def _encode(s):
+    errors = 'surrogateescape' if six.PY3 else 'strict'
+    return s.encode('utf-8', errors)
 
 
 class upload_docs(upload):
@@ -111,16 +105,16 @@ def upload_file(self, filename):
             'content': (os.path.basename(filename), content),
         }
         # set up the authentication
-        credentials = b(self.username + ':' + self.password)
+        credentials = _encode(self.username + ':' + self.password)
         credentials = standard_b64encode(credentials)
         if six.PY3:
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 
         # Build up the MIME payload for the POST data
-        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = b('\n--') + b(boundary)
-        end_boundary = sep_boundary + b('--')
+        boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = b'\n--' + boundary
+        end_boundary = sep_boundary + b'--'
         body = []
         for key, values in six.iteritems(data):
             title = '\nContent-Disposition: form-data; name="%s"' % key
@@ -132,16 +126,16 @@ def upload_file(self, filename):
                     title += '; filename="%s"' % value[0]
                     value = value[1]
                 else:
-                    value = b(value)
+                    value = _encode(value)
                 body.append(sep_boundary)
-                body.append(b(title))
-                body.append(b("\n\n"))
+                body.append(_encode(title))
+                body.append(b"\n\n")
                 body.append(value)
-                if value and value[-1:] == b('\r'):
-                    body.append(b('\n'))  # write an extra newline (lurve Macs)
+                if value and value[-1:] == b'\r':
+                    body.append(b'\n')  # write an extra newline (lurve Macs)
         body.append(end_boundary)
-        body.append(b("\n"))
-        body = b('').join(body)
+        body.append(b"\n")
+        body = b''.join(body)
 
         self.announce("Submitting documentation to %s" % (self.repository),
                       log.INFO)

From 81d8a9560f4a14fe5376f4d86643aa6bdf361869 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:45:38 -0400
Subject: [PATCH 5782/8469] Extract method for _build_parts.

---
 setuptools/command/upload_docs.py | 48 +++++++++++++++++--------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 638a1f6df4..7136fea041 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -13,6 +13,7 @@
 import zipfile
 import tempfile
 import shutil
+import itertools
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import http_client, urllib
@@ -95,6 +96,26 @@ def run(self):
         finally:
             shutil.rmtree(tmp_dir)
 
+    @staticmethod
+    def _build_parts(data, sep_boundary):
+        for key, values in six.iteritems(data):
+            title = '\nContent-Disposition: form-data; name="%s"' % key
+            # handle multiple entries for the same name
+            if not isinstance(values, list):
+                values = [values]
+            for value in values:
+                if type(value) is tuple:
+                    title += '; filename="%s"' % value[0]
+                    value = value[1]
+                else:
+                    value = _encode(value)
+                yield sep_boundary
+                yield _encode(title)
+                yield b"\n\n"
+                yield value
+                if value and value[-1:] == b'\r':
+                    yield b'\n'  # write an extra newline (lurve Macs)
+
     def upload_file(self, filename):
         with open(filename, 'rb') as f:
             content = f.read()
@@ -115,27 +136,12 @@ def upload_file(self, filename):
         boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
         sep_boundary = b'\n--' + boundary
         end_boundary = sep_boundary + b'--'
-        body = []
-        for key, values in six.iteritems(data):
-            title = '\nContent-Disposition: form-data; name="%s"' % key
-            # handle multiple entries for the same name
-            if not isinstance(values, list):
-                values = [values]
-            for value in values:
-                if type(value) is tuple:
-                    title += '; filename="%s"' % value[0]
-                    value = value[1]
-                else:
-                    value = _encode(value)
-                body.append(sep_boundary)
-                body.append(_encode(title))
-                body.append(b"\n\n")
-                body.append(value)
-                if value and value[-1:] == b'\r':
-                    body.append(b'\n')  # write an extra newline (lurve Macs)
-        body.append(end_boundary)
-        body.append(b"\n")
-        body = b''.join(body)
+        end_items = end_boundary, b"\n",
+        body_items = itertools.chain(
+            self._build_parts(data, sep_boundary),
+            end_items,
+        )
+        body = b''.join(body_items)
 
         self.announce("Submitting documentation to %s" % (self.repository),
                       log.INFO)

From 5e9c9d2fc751749e9ced584a548b197a552179bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:52:19 -0400
Subject: [PATCH 5783/8469] Extract method for _build_multipart

---
 setuptools/command/upload_docs.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 7136fea041..de38e8aff0 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -116,6 +116,21 @@ def _build_parts(data, sep_boundary):
                 if value and value[-1:] == b'\r':
                     yield b'\n'  # write an extra newline (lurve Macs)
 
+    @classmethod
+    def _build_multipart(cls, data):
+        """
+        Build up the MIME payload for the POST data
+        """
+        boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = b'\n--' + boundary
+        end_boundary = sep_boundary + b'--'
+        end_items = end_boundary, b"\n",
+        body_items = itertools.chain(
+            cls._build_parts(data, sep_boundary),
+            end_items,
+        )
+        return b''.join(body_items)
+
     def upload_file(self, filename):
         with open(filename, 'rb') as f:
             content = f.read()
@@ -132,16 +147,7 @@ def upload_file(self, filename):
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 
-        # Build up the MIME payload for the POST data
-        boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = b'\n--' + boundary
-        end_boundary = sep_boundary + b'--'
-        end_items = end_boundary, b"\n",
-        body_items = itertools.chain(
-            self._build_parts(data, sep_boundary),
-            end_items,
-        )
-        body = b''.join(body_items)
+        body = self._build_multipart(data)
 
         self.announce("Submitting documentation to %s" % (self.repository),
                       log.INFO)

From 0e17685d76ce5b7f28b3396e362e3f960c912a37 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:55:31 -0400
Subject: [PATCH 5784/8469] Extract method for _build_part

---
 setuptools/command/upload_docs.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index de38e8aff0..86a7146844 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -96,9 +96,14 @@ def run(self):
         finally:
             shutil.rmtree(tmp_dir)
 
-    @staticmethod
-    def _build_parts(data, sep_boundary):
+    @classmethod
+    def _build_parts(cls, data, sep_boundary):
         for key, values in six.iteritems(data):
+            for part in cls._build_part(key, values):
+                yield part
+
+    @staticmethod
+    def _build_part(key, values, sep_boundary):
             title = '\nContent-Disposition: form-data; name="%s"' % key
             # handle multiple entries for the same name
             if not isinstance(values, list):

From 4b0aaa921e46afbfa2f98069ea016f80c3ab1c84 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 21:55:48 -0400
Subject: [PATCH 5785/8469] Normalize indent

---
 setuptools/command/upload_docs.py | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 86a7146844..4ad66c293b 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -104,22 +104,22 @@ def _build_parts(cls, data, sep_boundary):
 
     @staticmethod
     def _build_part(key, values, sep_boundary):
-            title = '\nContent-Disposition: form-data; name="%s"' % key
-            # handle multiple entries for the same name
-            if not isinstance(values, list):
-                values = [values]
-            for value in values:
-                if type(value) is tuple:
-                    title += '; filename="%s"' % value[0]
-                    value = value[1]
-                else:
-                    value = _encode(value)
-                yield sep_boundary
-                yield _encode(title)
-                yield b"\n\n"
-                yield value
-                if value and value[-1:] == b'\r':
-                    yield b'\n'  # write an extra newline (lurve Macs)
+        title = '\nContent-Disposition: form-data; name="%s"' % key
+        # handle multiple entries for the same name
+        if not isinstance(values, list):
+            values = [values]
+        for value in values:
+            if type(value) is tuple:
+                title += '; filename="%s"' % value[0]
+                value = value[1]
+            else:
+                value = _encode(value)
+            yield sep_boundary
+            yield _encode(title)
+            yield b"\n\n"
+            yield value
+            if value and value[-1:] == b'\r':
+                yield b'\n'  # write an extra newline (lurve Macs)
 
     @classmethod
     def _build_multipart(cls, data):

From f84edd610dbc12497a79b172312e2061979f5523 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 22:05:47 -0400
Subject: [PATCH 5786/8469] Replace _build_parts with map and flatten.

---
 setuptools/command/upload_docs.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 4ad66c293b..3158c43584 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -14,6 +14,7 @@
 import tempfile
 import shutil
 import itertools
+import functools
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import http_client, urllib
@@ -96,14 +97,9 @@ def run(self):
         finally:
             shutil.rmtree(tmp_dir)
 
-    @classmethod
-    def _build_parts(cls, data, sep_boundary):
-        for key, values in six.iteritems(data):
-            for part in cls._build_part(key, values):
-                yield part
-
     @staticmethod
-    def _build_part(key, values, sep_boundary):
+    def _build_part(item, sep_boundary):
+        key, values = item
         title = '\nContent-Disposition: form-data; name="%s"' % key
         # handle multiple entries for the same name
         if not isinstance(values, list):
@@ -130,10 +126,13 @@ def _build_multipart(cls, data):
         sep_boundary = b'\n--' + boundary
         end_boundary = sep_boundary + b'--'
         end_items = end_boundary, b"\n",
-        body_items = itertools.chain(
-            cls._build_parts(data, sep_boundary),
-            end_items,
+        builder = functools.partial(
+            cls._build_part,
+            sep_boundary=sep_boundary,
         )
+        part_groups = map(builder, data.items())
+        parts = itertools.chain.from_iterable(part_groups)
+        body_items = itertools.chain(parts, end_items)
         return b''.join(body_items)
 
     def upload_file(self, filename):

From 1f1601d16b93b12451363b46b4b0725300f9b21b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 22:26:29 -0400
Subject: [PATCH 5787/8469] Return content type in _build_multipart

---
 setuptools/command/upload_docs.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 3158c43584..01b4904616 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -133,7 +133,8 @@ def _build_multipart(cls, data):
         part_groups = map(builder, data.items())
         parts = itertools.chain.from_iterable(part_groups)
         body_items = itertools.chain(parts, end_items)
-        return b''.join(body_items)
+        content_type = 'multipart/form-data; boundary=%s' % boundary
+        return b''.join(body_items), content_type
 
     def upload_file(self, filename):
         with open(filename, 'rb') as f:
@@ -151,7 +152,7 @@ def upload_file(self, filename):
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 
-        body = self._build_multipart(data)
+        body, ct = self._build_multipart(data)
 
         self.announce("Submitting documentation to %s" % (self.repository),
                       log.INFO)
@@ -173,7 +174,7 @@ def upload_file(self, filename):
         try:
             conn.connect()
             conn.putrequest("POST", url)
-            content_type = 'multipart/form-data; boundary=%s' % boundary
+            content_type = ct
             conn.putheader('Content-type', content_type)
             conn.putheader('Content-length', str(len(body)))
             conn.putheader('Authorization', auth)

From f0a0f6f4ac7bbe405d29c9312956ce973b3e4be0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 May 2016 22:35:19 -0400
Subject: [PATCH 5788/8469] Add test for build_multipart

---
 setuptools/tests/test_upload_docs.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index cc71cadb23..d3dee61664 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -57,3 +57,15 @@ def test_create_zipfile(self):
 
             with contextlib.closing(zipfile.ZipFile(tmp_file)) as zip_file:
                 assert zip_file.namelist() == ['index.html']
+
+    def test_build_multipart(self):
+        data = dict(
+            a="foo",
+            b="bar",
+            file=('file.txt', b'content'),
+        )
+        body, content_type = upload_docs._build_multipart(data)
+        assert 'form-data' in content_type
+        assert isinstance(body, bytes)
+        assert b'foo' in body
+        assert b'content' in body

From 094a51dd604d96656ab68f0f64e3169ceebab59c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jun 2016 08:59:16 -0400
Subject: [PATCH 5789/8469] Move setuptools to beginning of user-agent header.
 Fixes #598.

---
 CHANGES.rst                 | 8 ++++++++
 setuptools/package_index.py | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index bceb8a2797..1eba41b1db 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v21.3.0
+-------
+
+* #598: Setuptools now lists itself first in the User-Agent
+  for web requests, better following the guidelines in
+  `RFC 7231
+  <https://tools.ietf.org/html/rfc7231#section-5.5.3>`_.
+
 v21.2.2
 -------
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index c53343e4c8..567ab53afc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -202,8 +202,8 @@ def find_external_links(url, page):
             if match:
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
-user_agent = "Python-urllib/%s setuptools/%s" % (
-    sys.version[:3], require('setuptools')[0].version
+user_agent = "setuptools/%s Python-urllib/%s" % (
+    require('setuptools')[0].version, sys.version[:3],
 )
 
 class ContentChecker(object):

From e53e6ea4b46eb0a746fc1549be5ba90c0d3bc7dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jun 2016 09:06:09 -0400
Subject: [PATCH 5790/8469] Use newer string formatting for rendering user
 agent. Re-use __version__ from main package.

---
 setuptools/package_index.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 567ab53afc..e87504db66 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,6 +17,7 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
+import setuptools
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     require, Environment, find_distributions, safe_name, safe_version,
@@ -46,6 +47,11 @@
 
 _SOCKET_TIMEOUT = 15
 
+
+_tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
+user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
+
+
 def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
@@ -202,9 +208,6 @@ def find_external_links(url, page):
             if match:
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
-user_agent = "setuptools/%s Python-urllib/%s" % (
-    require('setuptools')[0].version, sys.version[:3],
-)
 
 class ContentChecker(object):
     """

From 7851c724c3a0d8529fb3b03b938b173083d62dac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jun 2016 09:07:44 -0400
Subject: [PATCH 5791/8469] =?UTF-8?q?Bump=20version:=2021.2.2=20=E2=86=92?=
 =?UTF-8?q?=2022.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ad8e1292de..e094371798 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.2.2
+current_version = 22.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 391cacae76..cc4909505b 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="21.2.2",
+    version="22.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 031e535529afe83cf47463ca3866f3cf8513ee34 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jun 2016 09:07:44 -0400
Subject: [PATCH 5792/8469] Added tag v22.0.0 for changeset 451fbedb4c22

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f9296f389..d89ecbb2e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -266,3 +266,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 9959424676a4aac1c14e430ff6f4210fdb0442d9 v21.2.0
 694111eadb10fe6003078895a2cbb803ce514ef2 v21.2.1
 274f33435e9c3ba5019f2a2bfe478fa2db0da41d v21.2.2
+451fbedb4c226d8ea5b6eab1e21679c9a4ec4a93 v22.0.0

From 7dadb206287fccf173e9e3f7eaed8b79fe03dae4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jun 2016 09:26:35 -0400
Subject: [PATCH 5793/8469] Update changelog to reflect unintended bumpversion

---
 CHANGES.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1eba41b1db..77edc67ba6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,9 +2,12 @@
 CHANGES
 =======
 
-v21.3.0
+v22.0.0
 -------
 
+Intended to be v21.3.0, but jaraco accidentally released as
+a major bump.
+
 * #598: Setuptools now lists itself first in the User-Agent
   for web requests, better following the guidelines in
   `RFC 7231

From 11d5bb9e47754f0f4ded5379450e83e29d3661fb Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjaoming@gmail.com>
Date: Thu, 2 Jun 2016 11:58:43 +0200
Subject: [PATCH 5794/8469] Fixing #190 following proposal by @jaraco

---
 setuptools/command/build_py.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 758a3fdfe8..0bad829525 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -8,6 +8,7 @@
 import distutils.errors
 import itertools
 
+from setuptools.extern import six
 from setuptools.extern.six.moves import map, filter, filterfalse
 
 try:
@@ -66,6 +67,9 @@ def __getattr__(self, attr):
         return orig.build_py.__getattr__(self, attr)
 
     def build_module(self, module, module_file, package):
+        if six.PY2 and isinstance(package, six.string_types):
+            # avoid errors on Python 2 when unicode is passed (#190)
+            package = package.split('.')
         outfile, copied = orig.build_py.build_module(self, module, module_file,
                                                      package)
         if copied:

From 3f054be58270984d4c8e5b1e499f573dbae02975 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 2 Jun 2016 10:07:09 +0000
Subject: [PATCH 5795/8469] Issue #27171: Fix typos in documentation, comments,
 and test function names

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 366ffbec9f..8f62b1a848 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -279,7 +279,7 @@ def test_get_source_files(self):
 
     def test_compiler_option(self):
         # cmd.compiler is an option and
-        # should not be overriden by a compiler instance
+        # should not be overridden by a compiler instance
         # when the command is run
         dist = Distribution()
         cmd = self.build_ext(dist)

From 29389166af9931b6a533a60556d9c6e6929b71b1 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 2 Jun 2016 13:45:53 -0700
Subject: [PATCH 5796/8469] Issue #21776: distutils.upload now correctly
 handles HTTPError

Initial patch by Claudiu Popa.
---
 command/upload.py    | 14 +++++++-------
 tests/test_upload.py | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 1c4fc48a12..0afcbf233e 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -181,21 +181,21 @@ def upload_file(self, command, pyversion, filename):
             result = urlopen(request)
             status = result.getcode()
             reason = result.msg
-        except OSError as e:
-            self.announce(str(e), log.ERROR)
-            raise
         except HTTPError as e:
             status = e.code
             reason = e.msg
+        except OSError as e:
+            self.announce(str(e), log.ERROR)
+            raise
 
         if status == 200:
             self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
+            if self.show_response:
+                text = self._read_pypi_response(result)
+                msg = '\n'.join(('-' * 75, text, '-' * 75))
+                self.announce(msg, log.INFO)
         else:
             msg = 'Upload failed (%s): %s' % (status, reason)
             self.announce(msg, log.ERROR)
             raise DistutilsError(msg)
-        if self.show_response:
-            text = self._read_pypi_response(result)
-            msg = '\n'.join(('-' * 75, text, '-' * 75))
-            self.announce(msg, log.INFO)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index dccaf77e3e..19193d5b05 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -1,13 +1,16 @@
 """Tests for distutils.command.upload."""
 import os
 import unittest
+import unittest.mock as mock
+from urllib.request import HTTPError
+
 from test.support import run_unittest
 
 from distutils.command import upload as upload_mod
 from distutils.command.upload import upload
 from distutils.core import Distribution
 from distutils.errors import DistutilsError
-from distutils.log import INFO
+from distutils.log import ERROR, INFO
 
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
@@ -144,6 +147,32 @@ def test_upload_fails(self):
         self.next_code = 404
         self.assertRaises(DistutilsError, self.test_upload)
 
+    def test_wrong_exception_order(self):
+        tmp = self.mkdtemp()
+        path = os.path.join(tmp, 'xxx')
+        self.write_file(path)
+        dist_files = [('xxx', '2.6', path)]  # command, pyversion, filename
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
+
+        pkg_dir, dist = self.create_dist(dist_files=dist_files)
+        tests = [
+            (OSError('oserror'), 'oserror', OSError),
+            (HTTPError('url', 400, 'httperror', {}, None),
+             'Upload failed (400): httperror', DistutilsError),
+        ]
+        for exception, expected, raised_exception in tests:
+            with self.subTest(exception=type(exception).__name__):
+                with mock.patch('distutils.command.upload.urlopen',
+                                new=mock.Mock(side_effect=exception)):
+                    with self.assertRaises(raised_exception):
+                        cmd = upload(dist)
+                        cmd.ensure_finalized()
+                        cmd.run()
+                    results = self.get_logs(ERROR)
+                    self.assertIn(expected, results[-1])
+                    self.clear_logs()
+
+
 def test_suite():
     return unittest.makeSuite(uploadTestCase)
 

From aa96da3cae9512054399bb99ed7ecd098f8d671e Mon Sep 17 00:00:00 2001
From: Michael Klich <michal@michalklich.com>
Date: Thu, 2 Jun 2016 22:02:30 +0100
Subject: [PATCH 5797/8469] Update link to Resource Management API

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 57818281b8..807a2722eb 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -917,7 +917,7 @@ use its resource management API.  See also `Accessing Package Resources`_ for
 a quick example of converting code that uses ``__file__`` to use
 ``pkg_resources`` instead.
 
-.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PythonEggs#resource-management
+.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PkgResources#resourcemanager-api
 .. _Accessing Package Resources: http://peak.telecommunity.com/DevCenter/PythonEggs#accessing-package-resources
 
 

From e72668091ee1b8e4358a84260ac0cf0ea06b4dea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 09:10:19 -0400
Subject: [PATCH 5798/8469] Extract context manager for project_on_sys_path in
 test command

---
 setuptools/command/test.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 371e913b6f..39746a02bf 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,6 +1,7 @@
+import sys
+import contextlib
 from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
-import sys
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map
@@ -102,6 +103,14 @@ def _test_args(self):
             yield self.test_suite
 
     def with_project_on_sys_path(self, func):
+        """
+        Backward compatibility for project_on_sys_path context.
+        """
+        with self.project_on_sys_path():
+            func()
+
+    @contextlib.contextmanager
+    def project_on_sys_path(self):
         with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
@@ -137,7 +146,7 @@ def with_project_on_sys_path(self, func):
             working_set.__init__()
             add_activation_listener(lambda dist: dist.activate())
             require('%s==%s' % (ei_cmd.egg_name, ei_cmd.egg_version))
-            func()
+            yield
         finally:
             sys.path[:] = old_path
             sys.modules.clear()
@@ -154,9 +163,11 @@ def run(self):
         cmd = ' '.join(self._argv)
         if self.dry_run:
             self.announce('skipping "%s" (dry run)' % cmd)
-        else:
-            self.announce('running "%s"' % cmd)
-            self.with_project_on_sys_path(self.run_tests)
+            return
+
+        self.announce('running "%s"' % cmd)
+        with self.project_on_sys_path():
+            self.run_tests()
 
     def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will

From 2c937bc53f208ab7b604f83c0c349b3ff9c6e5bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 09:52:52 -0400
Subject: [PATCH 5799/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 77edc67ba6..93447eb5c3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v22.0.1
+-------
+
+* #190: On Python 2, if unicode is passed for packages to
+  ``build_py`` command, it will be handled just as with
+  text on Python 3.
+
 v22.0.0
 -------
 

From 6e927802f1a25c83cf4055c4880804a349419dfb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 09:54:13 -0400
Subject: [PATCH 5800/8469] =?UTF-8?q?Bump=20version:=2022.0.0=20=E2=86=92?=
 =?UTF-8?q?=2022.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e094371798..89a7024ee6 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.0
+current_version = 22.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index cc4909505b..9c296f9d99 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.0",
+    version="22.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 62edd467886ff9dd1b67fd213b2aab98af55eb0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 09:54:14 -0400
Subject: [PATCH 5801/8469] Added tag v22.0.1 for changeset f5c4923b0400

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d89ecbb2e6..69687f0eb5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -267,3 +267,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 694111eadb10fe6003078895a2cbb803ce514ef2 v21.2.1
 274f33435e9c3ba5019f2a2bfe478fa2db0da41d v21.2.2
 451fbedb4c226d8ea5b6eab1e21679c9a4ec4a93 v22.0.0
+f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1

From f1c0149b8f25325e2f75367289ee2732396b85f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:00:37 -0400
Subject: [PATCH 5802/8469] Upload setuptools releases to pypi.io (Warehouse).
 Fixes #589 (presumably).

---
 CHANGES.rst | 5 +++++
 setup.cfg   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 93447eb5c3..b74c21897d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v22.0.2
+-------
+
+* #589: Releases are now uploaded to pypi.io (Warehouse).
+
 v22.0.1
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 89a7024ee6..33519ff2c5 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,9 @@ source-dir = docs/
 build-dir = docs/build
 all_files = 1
 
+[upload]
+repository = https://pypi.io/pypi
+
 [upload_docs]
 upload-dir = docs/build/html
 

From 6ce8d8325e807dab5d8e3c91b275c9edecf28735 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:00:45 -0400
Subject: [PATCH 5803/8469] =?UTF-8?q?Bump=20version:=2022.0.1=20=E2=86=92?=
 =?UTF-8?q?=2022.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 33519ff2c5..613f38d31e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.1
+current_version = 22.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9c296f9d99..23966bd249 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.1",
+    version="22.0.2",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 0cb7d00601c451faca392b652273dadfd85ca6fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:00:45 -0400
Subject: [PATCH 5804/8469] Added tag v22.0.2 for changeset 8610a8b9635f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 69687f0eb5..7a9528868a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -268,3 +268,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 274f33435e9c3ba5019f2a2bfe478fa2db0da41d v21.2.2
 451fbedb4c226d8ea5b6eab1e21679c9a4ec4a93 v22.0.0
 f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
+8610a8b9635f15d33f94fccb295fd34aa6fbddee v22.0.2

From 108198edebeb655c6ad04ebefd6af9208a7ff863 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:30:03 -0400
Subject: [PATCH 5805/8469] Specify the repository URL in Travis config also.
 Fixes #589.

---
 .travis.yml | 1 +
 CHANGES.rst | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index feeb039fcd..de2bd43c06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
 deploy:
   provider: pypi
+  server: https://pypi.io/pypi
   on:
     tags: true
     all_branches: true
diff --git a/CHANGES.rst b/CHANGES.rst
index b74c21897d..3f17c5da78 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v22.0.3
+-------
+
+* #589: Releases are now uploaded to pypi.io (Warehouse)
+  even when releases are made on Twine via Travis.
+
 v22.0.2
 -------
 

From ffe7c1a456338ae5db59e1bfaa4bd10bc8c3fec8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:30:10 -0400
Subject: [PATCH 5806/8469] =?UTF-8?q?Bump=20version:=2022.0.2=20=E2=86=92?=
 =?UTF-8?q?=2022.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 613f38d31e..db9b1e3b6c 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.2
+current_version = 22.0.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 23966bd249..8a54b28100 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.2",
+    version="22.0.3",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 64ff31db2f1edf67ae8f1039531de80ce82eff0f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 10:30:10 -0400
Subject: [PATCH 5807/8469] Added tag v22.0.3 for changeset efee7d74a847

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 7a9528868a..15c155a2bc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -269,3 +269,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 451fbedb4c226d8ea5b6eab1e21679c9a4ec4a93 v22.0.0
 f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
 8610a8b9635f15d33f94fccb295fd34aa6fbddee v22.0.2
+efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3

From 8e3d9f9642b83da914bc3c752fcb229a3d552a3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:22:44 -0400
Subject: [PATCH 5808/8469] Update the upload endpoint to use a different
 hostname and path. Ref #589.

---
 .travis.yml | 3 ++-
 CHANGES.rst | 6 ++++++
 setup.cfg   | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index de2bd43c06..e91f7e783f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,8 @@ before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
 deploy:
   provider: pypi
-  server: https://pypi.io/pypi
+  # Also update server in setup.cfg
+  server: https://upload.pypi.io/legacy/
   on:
     tags: true
     all_branches: true
diff --git a/CHANGES.rst b/CHANGES.rst
index 3f17c5da78..df0c9824bf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v22.0.4
+-------
+
+* #589: Upload releases to pypi.io using the upload
+  hostname and legacy path.
+
 v22.0.3
 -------
 
diff --git a/setup.cfg b/setup.cfg
index db9b1e3b6c..bca1dae28d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,7 +20,8 @@ build-dir = docs/build
 all_files = 1
 
 [upload]
-repository = https://pypi.io/pypi
+# also update in .travis.yml
+repository = https://upload.pypi.io/legacy/
 
 [upload_docs]
 upload-dir = docs/build/html

From 6c4b4d0bf6ae8ee190ef9be7d80c2c11a6be0e3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:22:51 -0400
Subject: [PATCH 5809/8469] =?UTF-8?q?Bump=20version:=2022.0.3=20=E2=86=92?=
 =?UTF-8?q?=2022.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 3 +--
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index bca1dae28d..82a735888c 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.3
+current_version = 22.0.4
 commit = True
 tag = True
 
@@ -20,7 +20,6 @@ build-dir = docs/build
 all_files = 1
 
 [upload]
-# also update in .travis.yml
 repository = https://upload.pypi.io/legacy/
 
 [upload_docs]
diff --git a/setup.py b/setup.py
index 8a54b28100..7baa60b9b1 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.3",
+    version="22.0.4",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 68a155efd0441f6ba87e4327b7a08fb22f5912af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:22:51 -0400
Subject: [PATCH 5810/8469] Added tag v22.0.4 for changeset 77b20c09b047

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 15c155a2bc..6f1f50329e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -270,3 +270,4 @@ ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
 f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
 8610a8b9635f15d33f94fccb295fd34aa6fbddee v22.0.2
 efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
+77b20c09b04775cc936ab5d16cbc46ff05fc7080 v22.0.4

From 9be2402fe54f0fff1af9e0d2c420c18e62a318af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:29:36 -0400
Subject: [PATCH 5811/8469] Try semicolon for comment

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 82a735888c..47248a67d8 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ build-dir = docs/build
 all_files = 1
 
 [upload]
+; also update .travis.yml
 repository = https://upload.pypi.io/legacy/
 
 [upload_docs]

From 01e1054c171649eb7d29659855a6879197de1c6e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:42:30 -0400
Subject: [PATCH 5812/8469] Override the repository for uploading docs (back to
 default). Fixes #604.

---
 CHANGES.rst | 6 ++++++
 setup.cfg   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index df0c9824bf..b763607c7f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v22.0.5
+-------
+
+* #604: Restore repository for upload_docs command
+  to restore publishing of docs during release.
+
 v22.0.4
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 47248a67d8..e34ebee731 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,7 @@ repository = https://upload.pypi.io/legacy/
 
 [upload_docs]
 upload-dir = docs/build/html
+repository = https://pypi.python.org/pypi
 
 [sdist]
 formats = gztar zip

From 3b3b06f8da98aa888d99bdcca91a627f3baf2a5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:42:38 -0400
Subject: [PATCH 5813/8469] =?UTF-8?q?Bump=20version:=2022.0.4=20=E2=86=92?=
 =?UTF-8?q?=2022.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 3 +--
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e34ebee731..4d0b30ff38 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.4
+current_version = 22.0.5
 commit = True
 tag = True
 
@@ -20,7 +20,6 @@ build-dir = docs/build
 all_files = 1
 
 [upload]
-; also update .travis.yml
 repository = https://upload.pypi.io/legacy/
 
 [upload_docs]
diff --git a/setup.py b/setup.py
index 7baa60b9b1..6cde31f798 100755
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.4",
+    version="22.0.5",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From f12843c138838ec8b42faa092c40afb709b63e25 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 11:42:39 -0400
Subject: [PATCH 5814/8469] Added tag v22.0.5 for changeset d5832e5deb77

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6f1f50329e..86954cd885 100644
--- a/.hgtags
+++ b/.hgtags
@@ -271,3 +271,4 @@ f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
 8610a8b9635f15d33f94fccb295fd34aa6fbddee v22.0.2
 efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
 77b20c09b04775cc936ab5d16cbc46ff05fc7080 v22.0.4
+d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5

From ffddefca6a6974f8f02a992f132e3e7a1feadcea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 13:38:40 -0400
Subject: [PATCH 5815/8469] Add rst.linker to docs requirements.

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/requirements.txt

diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000000..442df9fad8
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+rst.linker

From 8fea56035d22fc46e8237fa8f6b1b548fd0105d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 14:15:57 -0400
Subject: [PATCH 5816/8469] Patch changelog relative to 'docs' now that docs
 are built in RTD

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 604e7138e5..07d6ad41ca 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -200,7 +200,7 @@
 #latex_use_modindex = True
 
 link_files = {
-    'CHANGES.rst': dict(
+    '../CHANGES.rst': dict(
         using=dict(
             BB='https://bitbucket.org',
             GH='https://github.com',

From a99a2b3ef7bc932d561a622fde9f5f81aaf2bada Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 21:20:48 -0400
Subject: [PATCH 5817/8469] Bump rst.linker for RTD support

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 442df9fad8..0871ed76ae 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1 @@
-rst.linker
+rst.linker>=1.6.1

From 12e8b4c7d283cfbe4432703ee9698ef7232fdd77 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jun 2016 21:31:16 -0400
Subject: [PATCH 5818/8469] No longer build docs using 'build_sphinx' command
 and instead rely on RTD. Ref #604.

---
 setup.cfg | 11 +----------
 setup.py  |  4 +---
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4d0b30ff38..0d1ea3acb7 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,23 +9,14 @@ tag_date = 1
 
 [aliases]
 clean_egg_info = egg_info -RDb ''
-release = clean_egg_info sdist bdist_wheel build_sphinx
+release = clean_egg_info sdist bdist_wheel
 source = register sdist binary
 binary = bdist_egg upload --show-response
 test = pytest
 
-[build_sphinx]
-source-dir = docs/
-build-dir = docs/build
-all_files = 1
-
 [upload]
 repository = https://upload.pypi.io/legacy/
 
-[upload_docs]
-upload-dir = docs/build/html
-repository = https://pypi.python.org/pypi
-
 [sdist]
 formats = gztar zip
 
diff --git a/setup.py b/setup.py
index 6cde31f798..98b046f822 100755
--- a/setup.py
+++ b/setup.py
@@ -61,8 +61,6 @@ def _gen_console_scripts():
 
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
@@ -158,7 +156,7 @@ def _gen_console_scripts():
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-    ] + sphinx + pytest_runner + wheel,
+    ] + pytest_runner + wheel,
 )
 
 if __name__ == '__main__':

From f43c0f0651edfe1f52b0a178cfe2a5234a008af0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jun 2016 09:15:26 -0400
Subject: [PATCH 5819/8469] Add badge for docs

---
 README.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index f94c6fcb46..4f833ecfc4 100755
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,8 @@ Installing and Using Setuptools
 .. contents:: **Table of Contents**
 
 
-`Change History <https://pythonhosted.org/setuptools/history.html>`_.
+.. image:: https://setuptools.readthedocs.io/en/latest/?badge=latest
+    :target: https://setuptools.readthedocs.io
 
 -------------------------
 Installation Instructions

From f1c18134f23f8ad7cbf624097e242939bb540fa2 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Sun, 5 Jun 2016 00:41:58 +0200
Subject: [PATCH 5820/8469] - Issue #26884: Fix linking extension modules for
 cross builds.   Patch by Xavier de Gaye.

---
 command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index d4cb11e6db..f03a4e31d8 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -748,7 +748,7 @@ def get_libraries(self, ext):
             if sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 pythonlib = 'python{}.{}{}'.format(
                     sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff,
-                    sys.abiflags)
+                    sysconfig.get_config_var('ABIFLAGS'))
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries

From 5b8e477917ada86de6f23ffe5ba9831b258e9329 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Sun, 5 Jun 2016 01:17:57 +0200
Subject: [PATCH 5821/8469] - Issue #21272: Use _sysconfigdata.py to initialize
 distutils.sysconfig.

---
 sysconfig.py | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index d203f8e42b..f205dcadeb 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -415,38 +415,11 @@ def expand_makefile_vars(s, vars):
 
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
-    g = {}
-    # load the installed Makefile:
-    try:
-        filename = get_makefile_filename()
-        parse_makefile(filename, g)
-    except OSError as msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # load the installed pyconfig.h:
-    try:
-        filename = get_config_h_filename()
-        with open(filename) as file:
-            parse_config_h(file, g)
-    except OSError as msg:
-        my_msg = "invalid Python installation: unable to open %s" % filename
-        if hasattr(msg, "strerror"):
-            my_msg = my_msg + " (%s)" % msg.strerror
-
-        raise DistutilsPlatformError(my_msg)
-
-    # On AIX, there are wrong paths to the linker scripts in the Makefile
-    # -- these paths are relative to the Python source, but when installed
-    # the scripts are in another directory.
-    if python_build:
-        g['LDSHARED'] = g['BLDSHARED']
-
+    # _sysconfigdata is generated at build time, see the sysconfig module
+    from _sysconfigdata import build_time_vars
     global _config_vars
-    _config_vars = g
+    _config_vars = {}
+    _config_vars.update(build_time_vars)
 
 
 def _init_nt():

From 16361e51b834153f2e0e96897ebf33163c18016b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Jun 2016 15:14:16 -0400
Subject: [PATCH 5822/8469] Remove ARM launchers. Fixes #611.

---
 CHANGES.rst                        |   7 +++++++
 msvc-build-launcher.cmd            |  16 ----------------
 setuptools/cli-arm-32.exe          | Bin 69120 -> 0 bytes
 setuptools/command/easy_install.py |   3 ---
 setuptools/gui-arm-32.exe          | Bin 69120 -> 0 bytes
 5 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 setuptools/cli-arm-32.exe
 delete mode 100644 setuptools/gui-arm-32.exe

diff --git a/CHANGES.rst b/CHANGES.rst
index b763607c7f..f13e8c6225 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v23.0.0
+-------
+
+* #611: Removed ARM executables for CLI and GUI script
+  launchers on Windows. If this was a feature you cared
+  about, please comment in the ticket.
+
 v22.0.5
 -------
 
diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index e54c4f6c33..92da290ed1 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -35,21 +35,5 @@ if "%ERRORLEVEL%"=="0" (
   echo Windows SDK 6.1 not found to build Windows 64-bit version
 )
 
-REM Windows RT ARM build requires both freeware
-REM "Visual Studio Express 2012 for Windows 8" and
-REM "Visual Studio Express 2012 for Windows Desktop" to be installed from
-REM http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products
-set PATH=%PATH_OLD%
-set PATH=C:\Program Files\Microsoft Visual Studio 11.0\VC;%PATH%
-set PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC;%PATH%
-call VCVARSALL x86_arm >nul 2>&1
-if "%ERRORLEVEL%"=="0" (
-  echo Building Windows RT Version ...
-  cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:CONSOLE /out:setuptools/cli-arm-32.exe
-  cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" /D _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE launcher.c /O2 /link /MACHINE:ARM /SUBSYSTEM:WINDOWS /out:setuptools/gui-arm-32.exe
-) else (
-  echo Visual Studio ^(Express^) 2012 not found to build Windows RT Version
-)
-
 set PATH=%PATH_OLD%
 
diff --git a/setuptools/cli-arm-32.exe b/setuptools/cli-arm-32.exe
deleted file mode 100644
index 2f40402d4370fd0b032331896762593dd75b5ae0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69120
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
J|K&OGe*tckh(rJY

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ccc66cf719..9ca1554ebe 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -32,7 +32,6 @@
 import re
 import stat
 import random
-import platform
 import textwrap
 import warnings
 import site
@@ -2203,8 +2202,6 @@ def get_win_launcher(type):
     Returns the executable as a byte string.
     """
     launcher_fn = '%s.exe' % type
-    if platform.machine().lower() == 'arm':
-        launcher_fn = launcher_fn.replace(".", "-arm.")
     if is_64bit():
         launcher_fn = launcher_fn.replace(".", "-64.")
     else:
diff --git a/setuptools/gui-arm-32.exe b/setuptools/gui-arm-32.exe
deleted file mode 100644
index 537aff3774ecd62f4c26c55d0cc12f85c8a20a1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69120
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


From dac38d28df3cfa1afb4370e2303c87822f1ffb86 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Jun 2016 15:16:24 -0400
Subject: [PATCH 5823/8469] Update changelog

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f13e8c6225..a645529280 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,9 @@ v23.0.0
 * #611: Removed ARM executables for CLI and GUI script
   launchers on Windows. If this was a feature you cared
   about, please comment in the ticket.
+* #604: Removed docs building support. The project
+  now relies on documentation hosted at
+  https://setuptools.readthedocs.io/.
 
 v22.0.5
 -------

From cb0a2aeb86953d6b3cf6f039bb887fb8c7e8d1e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Jun 2016 15:18:34 -0400
Subject: [PATCH 5824/8469] =?UTF-8?q?Bump=20version:=2022.0.5=20=E2=86=92?=
 =?UTF-8?q?=2023.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 0d1ea3acb7..e21e1c2b97 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 22.0.5
+current_version = 23.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 98b046f822..8642ea34eb 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="22.0.5",
+    version="23.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From a73ca4fdcd1ba386159eb6ceb66d40af674a034c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Jun 2016 15:18:34 -0400
Subject: [PATCH 5825/8469] Added tag v23.0.0 for changeset 8664c631bf3a

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 86954cd885..d43b8997d8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -272,3 +272,4 @@ f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
 efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
 77b20c09b04775cc936ab5d16cbc46ff05fc7080 v22.0.4
 d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
+8664c631bf3a817a7deba86c13b67eccc1f81091 v23.0.0

From 7c3fafbc0017fa29a42d0eda69b37b37c4b465c2 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 10 Jun 2016 23:00:52 +0300
Subject: [PATCH 5826/8469] Issue #20900: distutils register command now
 decodes HTTP responses correctly

Initial patch by ingrid.
---
 command/register.py    |  6 +++---
 tests/test_register.py | 14 ++++++++++++++
 tests/test_upload.py   |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/command/register.py b/command/register.py
index b49f86fe58..86343c8017 100644
--- a/command/register.py
+++ b/command/register.py
@@ -296,9 +296,9 @@ def post_to_server(self, data, auth=None):
             result = 500, str(e)
         else:
             if self.show_response:
-                data = result.read()
+                data = self._read_pypi_response(result)
             result = 200, 'OK'
         if self.show_response:
-            dashes = '-' * 75
-            self.announce('%s%r%s' % (dashes, data, dashes))
+            msg = '\n'.join(('-' * 75, data, '-' * 75))
+            self.announce(msg, log.INFO)
         return result
diff --git a/tests/test_register.py b/tests/test_register.py
index 6180133994..01acf2375f 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -301,6 +301,20 @@ def test_list_classifiers(self):
         results = self.get_logs(INFO)
         self.assertEqual(results, ['running check', 'xxx'])
 
+    def test_show_response(self):
+        # test that the --show-response option return a well formatted response
+        cmd = self._get_cmd()
+        inputs = Inputs('1', 'tarek', 'y')
+        register_module.input = inputs.__call__
+        cmd.show_response = 1
+        try:
+            cmd.run()
+        finally:
+            del register_module.input
+
+        results = self.get_logs(INFO)
+        self.assertEqual(results[3], 75 * '-' + '\nxxx\n' + 75 * '-')
+
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 19193d5b05..964aac7e80 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -140,7 +140,7 @@ def test_upload(self):
 
         # The PyPI response body was echoed
         results = self.get_logs(INFO)
-        self.assertIn('xyzzy\n', results[-1])
+        self.assertEqual(results[-1], 75 * '-' + '\nxyzzy\n' + 75 * '-')
 
     def test_upload_fails(self):
         self.next_msg = "Not Found"

From 9070733b989cf7350ff11aab41f0d6f541700f84 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Tue, 14 Jun 2016 08:55:19 +0200
Subject: [PATCH 5827/8469] - Issue #23968: Rename the platform directory from
 plat-$(MACHDEP) to   plat-$(PLATFORM_TRIPLET).   Rename the config directory
 (LIBPL) from config-$(LDVERSION) to  
 config-$(LDVERSION)-$(PLATFORM_TRIPLET).   Install the platform specifc
 _sysconfigdata module into the platform   directory and rename it to include
 the ABIFLAGS.

---
 sysconfig.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sysconfig.py b/sysconfig.py
index f205dcadeb..e9cc4a95d4 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -242,6 +242,8 @@ def get_makefile_filename():
         return os.path.join(_sys_home or project_base, "Makefile")
     lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
     config_file = 'config-{}{}'.format(get_python_version(), build_flags)
+    if hasattr(sys.implementation, '_multiarch'):
+        config_file += '-%s' % sys.implementation._multiarch
     return os.path.join(lib_dir, config_file, 'Makefile')
 
 

From 089c6f4fa347563cf9753ea0370723ed1b00bc89 Mon Sep 17 00:00:00 2001
From: "doko@ubuntu.com" <doko@ubuntu.com>
Date: Tue, 14 Jun 2016 09:22:16 +0200
Subject: [PATCH 5828/8469]  - Issue #23968: Update distutils/sysconfig.py to
 look for the renamed    _sysconfigdata module too.

---
 sysconfig.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index e9cc4a95d4..f72b7f5a19 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -418,7 +418,9 @@ def expand_makefile_vars(s, vars):
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     # _sysconfigdata is generated at build time, see the sysconfig module
-    from _sysconfigdata import build_time_vars
+    name = '_sysconfigdata_' + sys.abiflags
+    _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    build_time_vars = _temp.build_time_vars
     global _config_vars
     _config_vars = {}
     _config_vars.update(build_time_vars)

From 9abc044eeb7c6c4acc72c0f537cc249e817b83e3 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 14 Jun 2016 20:01:41 +0200
Subject: [PATCH 5829/8469] Some fixes

- Fix issue #593
- Fix some forgotten "vcver" => "vc_ver" renames in previous commit.
- Add comment on why I didn't followed PEP8 for some variables names.
---
 setuptools/msvc9_support.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py
index d4b7521a58..d1ed2edc93 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc9_support.py
@@ -202,7 +202,7 @@ def msvc14_get_vc_env(plat_spec):
 
     # If error, try to set environment directly
     try:
-        return EnvironmentInfo(plat_spec, vcvermin=14.0).return_env()
+        return EnvironmentInfo(plat_spec, vc_ver_min=14.0).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, 14.0)
         raise
@@ -237,7 +237,7 @@ def _augment_exception(exc, version, arch=''):
             message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += msdownload % 8279
 
-    exc.args[0] = message
+    exc.args = (message, )
 
 
 class PlatformInfo:
@@ -460,6 +460,8 @@ class SystemInfo:
     vc_ver: float
         Required Microsoft Visual C++ version.
     """
+    # Variables and properties in this class use originals CamelCase variables
+    # names from Microsoft source files for more easy comparaison.
     WinDir = safe_env['WinDir']
     ProgramFiles = safe_env['ProgramFiles']
     ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
@@ -481,7 +483,7 @@ def find_available_vc_vers(self):
         Find all available Microsoft Visual C++ versions.
         """
         vckeys = (self.ri.vc, self.ri.vc_for_python)
-        vsvers = []
+        vc_vers = []
         for hkey in self.ri.HKEYS:
             for key in vckeys:
                 try:
@@ -492,18 +494,18 @@ def find_available_vc_vers(self):
                 for i in range(values):
                     try:
                         ver = float(winreg.EnumValue(bkey, i)[0])
-                        if ver not in vsvers:
-                            vsvers.append(ver)
+                        if ver not in vc_vers:
+                            vc_vers.append(ver)
                     except ValueError:
                         pass
                 for i in range(subkeys):
                     try:
                         ver = float(winreg.EnumKey(bkey, i))
-                        if ver not in vsvers:
-                            vsvers.append(ver)
+                        if ver not in vc_vers:
+                            vc_vers.append(ver)
                     except ValueError:
                         pass
-        return sorted(vsvers)
+        return sorted(vc_vers)
 
     @property
     def VSInstallDir(self):
@@ -527,18 +529,18 @@ def VCInstallDir(self):
         guess_vc = os.path.join(self.ProgramFilesx86, default)
 
         # Try to get "VC++ for Python" path from registry as default path
-        path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
-        python_vc = self.ri.lookup(path, 'installdir')
+        reg_path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
+        python_vc = self.ri.lookup(reg_path, 'installdir')
         default_vc = os.path.join(python_vc, 'VC') if python_vc else guess_vc
 
         # Try to get path from registry, if fail use default path
-        result = self.ri.lookup(self.ri.vc, '%0.1f' % self.vc_ver) or default_vc
+        path = self.ri.lookup(self.ri.vc, '%0.1f' % self.vc_ver) or default_vc
 
-        if not os.path.isdir(result):
+        if not os.path.isdir(path):
             msg = 'Microsoft Visual C++ directory not found'
             raise distutils.errors.DistutilsPlatformError(msg)
 
-        return result
+        return path
 
     @property
     def WindowsSdkVersion(self):
@@ -758,6 +760,8 @@ class EnvironmentInfo:
     vc_min_ver: float
         Minimum Microsoft Visual C++ version.
     """
+    # Variables and properties in this class use originals CamelCase variables
+    # names from Microsoft source files for more easy comparaison.
     def __init__(self, arch, vc_ver=None, vc_min_ver=None):
         self.pi = PlatformInfo(arch)
         self.ri = RegistryInfo(self.pi)
@@ -773,7 +777,7 @@ def vc_ver(self):
         """
         Microsoft Visual C++ version.
         """
-        return self.si.vcver
+        return self.si.vc_ver
 
     @property
     def VSTools(self):
@@ -1101,7 +1105,7 @@ def return_env(self, exists=True):
                                     self.FSharp],
                                    exists),
         )
-        if self.vcver >= 14 and os.path.isfile(self.VCRuntimeRedist):
+        if self.vc_ver >= 14 and os.path.isfile(self.VCRuntimeRedist):
             env['py_vcruntime_redist'] = self.VCRuntimeRedist
         return env
 

From 7b9d0828be06389c7e81946ba049231396eb9f3d Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 17 Jun 2016 09:32:38 -0700
Subject: [PATCH 5830/8469] Issue #27048: Prevents distutils failing on Windows
 when environment variables contain non-ASCII characters

---
 _msvccompiler.py           |  6 ++----
 tests/test_msvccompiler.py | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index d0ba7d6d1e..b120273fe9 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -86,11 +86,9 @@ def _get_vc_env(plat_spec):
 
     try:
         out = subprocess.check_output(
-            '"{}" {} && set'.format(vcvarsall, plat_spec),
-            shell=True,
+            'cmd /u /c "{}" {} && set'.format(vcvarsall, plat_spec),
             stderr=subprocess.STDOUT,
-            universal_newlines=True,
-        )
+        ).decode('utf-16le', errors='replace')
     except subprocess.CalledProcessError as exc:
         log.error(exc.output)
         raise DistutilsPlatformError("Error executing {}"
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index c4d911ff83..4dc24886c8 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -83,6 +83,24 @@ def test_vcruntime_skip_copy(self):
         self.assertFalse(os.path.isfile(os.path.join(
             tempdir, os.path.basename(dll))))
 
+    def test_get_vc_env_unicode(self):
+        import distutils._msvccompiler as _msvccompiler
+
+        test_var = 'ṰḖṤṪ┅ṼẨṜ'
+        test_value = '₃�₅'
+
+        # Ensure we don't early exit from _get_vc_env
+        old_distutils_use_sdk = os.environ.pop('DISTUTILS_USE_SDK', None)
+        os.environ[test_var] = test_value
+        try:
+            env = _msvccompiler._get_vc_env('x86')
+            self.assertIn(test_var.lower(), env)
+            self.assertEqual(test_value, env[test_var.lower()])
+        finally:
+            os.environ.pop(test_var)
+            if old_distutils_use_sdk:
+                os.environ['DISTUTILS_USE_SDK'] = old_distutils_use_sdk
+
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 

From 574bde6ee98b09b974ac5e0adbe46eeebc5173b6 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 18 Jun 2016 21:42:37 +0300
Subject: [PATCH 5831/8469] Issue #27349: Fix typo in distutils upload command

---
 command/upload.py    | 2 +-
 tests/test_upload.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 0afcbf233e..1fd574a9f1 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -91,7 +91,7 @@ def upload_file(self, command, pyversion, filename):
         data = {
             # action
             ':action': 'file_upload',
-            'protcol_version': '1',
+            'protocol_version': '1',
 
             # identify release
             'name': meta.get_name(),
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 964aac7e80..3eecf8afd4 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -130,13 +130,14 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.last_open.req.headers)
-        self.assertEqual(headers['Content-length'], '2161')
+        self.assertEqual(headers['Content-length'], '2162')
         content_type = headers['Content-type']
         self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         expected_url = 'https://pypi.python.org/pypi'
         self.assertEqual(self.last_open.req.get_full_url(), expected_url)
         self.assertTrue(b'xxx' in self.last_open.req.data)
+        self.assertIn(b'protocol_version', self.last_open.req.data)
 
         # The PyPI response body was echoed
         results = self.get_logs(INFO)

From 32821f0c7684148df899f79932c2e138c3ace6f5 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 20 Jun 2016 21:41:34 +0300
Subject: [PATCH 5832/8469] Issue #20120: Add a test case to verify the % char
 can be used in .pypirc

I noticed that there is no test for this feature while doing
triaging work on pypa/pypi-legacy.
---
 tests/test_config.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/test_config.py b/tests/test_config.py
index 4de825a81e..0b91d19a54 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -18,6 +18,7 @@
 index-servers =
     server1
     server2
+    server3
 
 [server1]
 username:me
@@ -28,6 +29,10 @@
 password: secret
 realm:acme
 repository:http://another.pypi/
+
+[server3]
+username:cbiggles
+password:yh^%#rest-of-my-password
 """
 
 PYPIRC_OLD = """\
@@ -113,6 +118,20 @@ def test_server_empty_registration(self):
         finally:
             f.close()
 
+    def test_config_interpolation(self):
+        # using the % character in .pypirc should not raise an error (#20120)
+        self.write_file(self.rc, PYPIRC)
+        cmd = self._cmd(self.dist)
+        cmd.repository = 'server3'
+        config = cmd._read_pypirc()
+
+        config = list(sorted(config.items()))
+        waited = [('password', 'yh^%#rest-of-my-password'), ('realm', 'pypi'),
+                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('server', 'server3'), ('username', 'cbiggles')]
+        self.assertEqual(config, waited)
+
+
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)
 

From c986bbf7359a5db45a6e96689729b2f04d2bd3e8 Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Thu, 23 Jun 2016 14:37:14 +0000
Subject: [PATCH 5833/8469] Add Gitter badge

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index 4f833ecfc4..1c6a0b8675 100755
--- a/README.rst
+++ b/README.rst
@@ -37,6 +37,10 @@ Powershell command. Start up Powershell and paste this command::
 
     > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python -
 
+.. image:: https://badges.gitter.im/pypa/setuptools.svg
+   :alt: Join the chat at https://gitter.im/pypa/setuptools
+   :target: https://gitter.im/pypa/setuptools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
 You must start the Powershell with Administrative privileges or you may choose
 to install a user-local installation::
 

From 90d7e0e1b1e1da326f73d4dbdc81e9a4e72daa5c Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 24 Jun 2016 08:48:27 +0300
Subject: [PATCH 5834/8469] Make PyPIRCCommandTestCase derive from a base class

Several test cases in distutils use PyPIRCCommandTestCase as
their base class and as a result of that the following tests
were ran more than once:

* test_server_registration
* test_server_empty_registration
* test_config_interpolation

This commit moves the infrastructure used by other tests
into a new BasePyPIRCCommandTestCase class.
---
 tests/test_config.py   | 9 ++++++---
 tests/test_register.py | 4 ++--
 tests/test_sdist.py    | 4 ++--
 tests/test_upload.py   | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 0b91d19a54..3dd92d6166 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -52,14 +52,14 @@
 """
 
 
-class PyPIRCCommandTestCase(support.TempdirManager,
+class BasePyPIRCCommandTestCase(support.TempdirManager,
                             support.LoggingSilencer,
                             support.EnvironGuard,
                             unittest.TestCase):
 
     def setUp(self):
         """Patches the environment."""
-        super(PyPIRCCommandTestCase, self).setUp()
+        super(BasePyPIRCCommandTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
         os.environ['HOME'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
@@ -78,7 +78,10 @@ def initialize_options(self):
     def tearDown(self):
         """Removes the patch."""
         set_threshold(self.old_threshold)
-        super(PyPIRCCommandTestCase, self).tearDown()
+        super(BasePyPIRCCommandTestCase, self).tearDown()
+
+
+class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
 
     def test_server_registration(self):
         # This test makes sure PyPIRCCommand knows how to:
diff --git a/tests/test_register.py b/tests/test_register.py
index 01acf2375f..e68b0af3ce 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -12,7 +12,7 @@
 from distutils.errors import DistutilsSetupError
 from distutils.log import INFO
 
-from distutils.tests.test_config import PyPIRCCommandTestCase
+from distutils.tests.test_config import BasePyPIRCCommandTestCase
 
 try:
     import docutils
@@ -72,7 +72,7 @@ def getheader(self, name, default=None):
             }.get(name.lower(), default)
 
 
-class RegisterTestCase(PyPIRCCommandTestCase):
+class RegisterTestCase(BasePyPIRCCommandTestCase):
 
     def setUp(self):
         super(RegisterTestCase, self).setUp()
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 5a04e0ddd0..5444b815a8 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -23,7 +23,7 @@
 
 from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
-from distutils.tests.test_config import PyPIRCCommandTestCase
+from distutils.tests.test_config import BasePyPIRCCommandTestCase
 from distutils.errors import DistutilsOptionError
 from distutils.spawn import find_executable
 from distutils.log import WARN
@@ -52,7 +52,7 @@
 somecode%(sep)sdoc.txt
 """
 
-class SDistTestCase(PyPIRCCommandTestCase):
+class SDistTestCase(BasePyPIRCCommandTestCase):
 
     def setUp(self):
         # PyPIRCCommandTestCase creates a temp dir already
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 3eecf8afd4..e836cc4947 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -12,7 +12,7 @@
 from distutils.errors import DistutilsError
 from distutils.log import ERROR, INFO
 
-from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+from distutils.tests.test_config import PYPIRC, BasePyPIRCCommandTestCase
 
 PYPIRC_LONG_PASSWORD = """\
 [distutils]
@@ -66,7 +66,7 @@ def getcode(self):
         return self.code
 
 
-class uploadTestCase(PyPIRCCommandTestCase):
+class uploadTestCase(BasePyPIRCCommandTestCase):
 
     def setUp(self):
         super(uploadTestCase, self).setUp()

From 3cee4d8f79a20f1d67b194ee383dddd826695e0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jun 2016 09:44:52 -0400
Subject: [PATCH 5835/8469] Nicer indentation

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8e1502a5ff..829f03f96e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -52,8 +52,10 @@ class egg_info(Command):
     ]
 
     boolean_options = ['tag-date', 'tag-svn-revision']
-    negative_opt = {'no-svn-revision': 'tag-svn-revision',
-                    'no-date': 'tag-date'}
+    negative_opt = {
+        'no-svn-revision': 'tag-svn-revision',
+        'no-date': 'tag-date',
+    }
 
     def initialize_options(self):
         self.egg_name = None

From 542a921bb6943feb1c90874ba5151c94622b52b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jun 2016 10:17:41 -0400
Subject: [PATCH 5836/8469] Mark tag_svn_revision as deprecated. Ref #619.

---
 CHANGES.rst                    | 6 ++++++
 setuptools/command/egg_info.py | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index a645529280..055d7aa9fb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v23.1.0
+-------
+
+* #619: Deprecated ``tag_svn_revision`` distribution
+  option.
+
 v23.0.0
 -------
 
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 829f03f96e..5183eedc8e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -199,6 +199,10 @@ def tags(self):
         if self.tag_build:
             version += self.tag_build
         if self.tag_svn_revision:
+            warnings.warn(
+                "tag_svn_revision is deprecated and will not be honored "
+                "in a future release"
+            )
             version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             version += time.strftime("-%Y%m%d")

From 6c1cc9fa3acfa32571e5e10c76c8a87f993adb8e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jun 2016 10:17:52 -0400
Subject: [PATCH 5837/8469] =?UTF-8?q?Bump=20version:=2023.0.0=20=E2=86=92?=
 =?UTF-8?q?=2023.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e21e1c2b97..d371955f77 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 23.0.0
+current_version = 23.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 8642ea34eb..558bd34542 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="23.0.0",
+    version="23.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From ce3ad9e1927faff667ad2bf2fec43a0e5254bdf4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jun 2016 10:17:52 -0400
Subject: [PATCH 5838/8469] Added tag v23.1.0 for changeset 6c74559c732c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d43b8997d8..b27122d0da 100644
--- a/.hgtags
+++ b/.hgtags
@@ -273,3 +273,4 @@ efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
 77b20c09b04775cc936ab5d16cbc46ff05fc7080 v22.0.4
 d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
 8664c631bf3a817a7deba86c13b67eccc1f81091 v23.0.0
+6c74559c732c56f61b465d613458ec1a930884b6 v23.1.0

From 5d8c17c312e4586ea7a37673f147f9e9622617c7 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 25 Jun 2016 14:38:28 +0200
Subject: [PATCH 5839/8469] readme: update links to documentation

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 1c6a0b8675..d8d8a6e53b 100755
--- a/README.rst
+++ b/README.rst
@@ -182,10 +182,10 @@ them there, so this reference list can be updated.  If you have working,
 the `setuptools bug tracker`_.
 
 .. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
-.. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
-.. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
-.. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html
-.. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html
+.. _The Internal Structure of Python Eggs: https://setuptools.readthedocs.io/en/latest/formats.html
+.. _The setuptools Developer's Guide: https://setuptools.readthedocs.io/en/latest/developer-guide.html
+.. _The pkg_resources API reference: https://setuptools.readthedocs.io/en/latest/pkg_resources.html
+.. _The EasyInstall user's guide and reference manual: https://setuptools.readthedocs.io/en/latest/easy_install.html
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
 
 

From bba4b3975c834655df6e97f89ed099ab21594d1c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 26 Jun 2016 01:33:23 +0700
Subject: [PATCH 5840/8469] Fix misspellings

---
 CHANGES.rst                                   | 4 ++--
 docs/easy_install.txt                         | 4 ++--
 pkg_resources/__init__.py                     | 2 +-
 pkg_resources/_vendor/packaging/specifiers.py | 2 +-
 pkg_resources/_vendor/pyparsing.py            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 055d7aa9fb..482059b39f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -129,7 +129,7 @@ v20.8.0
 v20.7.0
 -------
 
-* Refactored extra enviroment marker processing
+* Refactored extra environment marker processing
   in WorkingSet.
 * Issue #533: Fixed intermittent test failures.
 * Issue #536: In msvc9_support, trap additional exceptions
@@ -216,7 +216,7 @@ v20.6.0
 20.2.1
 ------
 
-* Issue #499: Restore compatiblity for legacy versions
+* Issue #499: Restore compatibility for legacy versions
   by bumping to packaging 16.4.
 
 20.2
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index a66909b121..591589fb2d 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -577,7 +577,7 @@ activated or deactivated.
 As a result, if you are using EasyInstall to upgrade an existing package, or
 to install a package with the same name as an existing package, EasyInstall
 will warn you of the conflict.  (This is an improvement over ``setup.py
-install``, becuase the ``distutils`` just install new packages on top of old
+install``, because the ``distutils`` just install new packages on top of old
 ones, possibly combining two unrelated packages or leaving behind modules that
 have been deleted in the newer version of the package.)
 
@@ -606,7 +606,7 @@ can be safely installed as a zipfile, and then acts on its analysis.  (Previous
 versions would not install a package as a zipfile unless you used the
 ``--zip-ok`` option.)
 
-The current analysis approach is fairly conservative; it currenly looks for:
+The current analysis approach is fairly conservative; it currently looks for:
 
  * Any use of the ``__file__`` or ``__path__`` variables (which should be
    replaced with ``pkg_resources`` API calls)
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2eab823047..15cb93fdc4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1367,7 +1367,7 @@ def get_default_cache():
             return os.path.join(dirname, 'Python-Eggs')
     else:
         raise RuntimeError(
-            "Please set the PYTHON_EGG_CACHE enviroment variable"
+            "Please set the PYTHON_EGG_CACHE environment variable"
         )
 
 def safe_name(name):
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 7f5a76cfd6..9b6353f052 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -198,7 +198,7 @@ def filter(self, iterable, prereleases=None):
                         (prereleases or self.prereleases)):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the begining.
+                # accepting prereleases from the beginning.
                 else:
                     yielded = True
                     yield version
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
index 3e02dbee20..2284cadcd9 100644
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -1112,7 +1112,7 @@ def parseString( self, instring, parseAll=False ):
               (see L{I{parseWithTabs}<parseWithTabs>})
             - define your parse action using the full C{(s,loc,toks)} signature, and
               reference the input string using the parse action's C{s} argument
-            - explictly expand the tabs in your input string before calling
+            - explicitly expand the tabs in your input string before calling
               C{parseString}
         """
         ParserElement.resetCache()

From 45597769a552c9bf9f7e425a6a9d3c26064841cf Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Sat, 25 Jun 2016 18:41:51 +0200
Subject: [PATCH 5841/8469] Fix test_all_site_dirs on Windows.

---
 setuptools/tests/test_easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fd06b6efc8..c903d2bd69 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -30,7 +30,7 @@
 from setuptools.command.easy_install import PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
-from pkg_resources import working_set
+from pkg_resources import normalize_path, working_set
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
 import pkg_resources
@@ -123,9 +123,10 @@ def test_all_site_dirs(self, monkeypatch):
         get_site_dirs should always return site dirs reported by
         site.getsitepackages.
         """
-        mock_gsp = lambda: ['/setuptools/test/site-packages']
+        path = normalize_path('/setuptools/test/site-packages')
+        mock_gsp = lambda: [path]
         monkeypatch.setattr(site, 'getsitepackages', mock_gsp, raising=False)
-        assert '/setuptools/test/site-packages' in ei.get_site_dirs()
+        assert path in ei.get_site_dirs()
 
     def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch):
         monkeypatch.delattr(site, 'getsitepackages', raising=False)

From 6baa4a140f77d17e131febb3d76d0dae3ca4dfc9 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Sat, 25 Jun 2016 22:44:05 +0200
Subject: [PATCH 5842/8469] Remove CommandSpec.from_param test using
 sys.executable.

It was based on the assumption that CommandSpec.from_param(sys.executable)
should always return a 1-element list. Since from_param parses the argument
and sys.executable may contain unquoted spaces, this simply can't be
guaranteed.
---
 setuptools/tests/test_easy_install.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c903d2bd69..7e77e819a1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -591,15 +591,6 @@ def test_from_simple_string_uses_shlex(self):
         assert len(cmd) == 2
         assert '"' not in cmd.as_header()
 
-    def test_sys_executable(self):
-        """
-        CommandSpec.from_string(sys.executable) should contain just that param.
-        """
-        writer = ei.ScriptWriter.best()
-        cmd = writer.command_spec_class.from_string(sys.executable)
-        assert len(cmd) == 1
-        assert cmd[0] == sys.executable
-
 
 class TestWindowsScriptWriter:
     def test_header(self):

From 9c3cdde0ddbae5684bfec874e6d8ca239ffb6379 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Sun, 26 Jun 2016 00:53:14 +0200
Subject: [PATCH 5843/8469] Split up single TestScriptHeader test into multiple
 tests.

---
 setuptools/tests/test_easy_install.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7e77e819a1..02f2705983 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -528,29 +528,32 @@ def make_trivial_sdist(dist_path, setup_py):
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
 
 
+@pytest.mark.skipif(
+    sys.platform.startswith('java') and ei.is_sh(sys.executable),
+    reason="Test cannot run under java when executable is sh"
+)
 class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
     exe_with_spaces = r'C:\Program Files\Python33\python.exe'
 
-    @pytest.mark.skipif(
-        sys.platform.startswith('java') and ei.is_sh(sys.executable),
-        reason="Test cannot run under java when executable is sh"
-    )
     def test_get_script_header(self):
         expected = '#!%s\n' % ei.nt_quote_arg(os.path.normpath(sys.executable))
         actual = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python')
         assert actual == expected
 
+    def test_get_script_header_args(self):
         expected = '#!%s -x\n' % ei.nt_quote_arg(os.path.normpath
             (sys.executable))
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x')
         assert actual == expected
 
+    def test_get_script_header_non_ascii_exe(self):
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
             executable=self.non_ascii_exe)
         expected = '#!%s -x\n' % self.non_ascii_exe
         assert actual == expected
 
+    def test_get_script_header_exe_with_spaces(self):
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
             executable='"'+self.exe_with_spaces+'"')
         expected = '#!"%s"\n' % self.exe_with_spaces

From 6f79ca2b726b2b92d007d09fb855f19ede5a1921 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Wed, 22 Jun 2016 17:42:32 +0200
Subject: [PATCH 5844/8469] Test quoting of shebang lines.

See issues #188 and #398; on Windows, the launcher executables support shebangs
that use quotes to escape spaces, so these should be used when necessary. On
the other hand, Unix systems don't support shebangs with quotes so they should
never have quotes.
---
 setuptools/tests/test_install_scripts.py | 88 ++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 setuptools/tests/test_install_scripts.py

diff --git a/setuptools/tests/test_install_scripts.py b/setuptools/tests/test_install_scripts.py
new file mode 100644
index 0000000000..7393241f84
--- /dev/null
+++ b/setuptools/tests/test_install_scripts.py
@@ -0,0 +1,88 @@
+"""install_scripts tests
+"""
+
+import io
+import sys
+
+import pytest
+
+from setuptools.command.install_scripts import install_scripts
+from setuptools.dist import Distribution
+from . import contexts
+
+
+class TestInstallScripts:
+    settings = dict(
+        name='foo',
+        entry_points={'console_scripts': ['foo=foo:foo']},
+        version='0.0',
+    )
+    unix_exe = '/usr/dummy-test-path/local/bin/python'
+    unix_spaces_exe = '/usr/bin/env dummy-test-python'
+    win32_exe = 'C:\\Dummy Test Path\\Program Files\\Python 3.3\\python.exe'
+
+    def _run_install_scripts(self, install_dir, executable=None):
+        dist = Distribution(self.settings)
+        dist.script_name = 'setup.py'
+        cmd = install_scripts(dist)
+        cmd.install_dir = install_dir
+        if executable is not None:
+            bs = cmd.get_finalized_command('build_scripts')
+            bs.executable = executable
+        cmd.ensure_finalized()
+        with contexts.quiet():
+            cmd.run()
+
+    @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only')
+    def test_sys_executable_escaping_unix(self, tmpdir, monkeypatch):
+        """
+        Ensure that shebang is not quoted on Unix when getting the Python exe
+        from sys.executable.
+        """
+        expected = '#!%s\n' % self.unix_exe
+        monkeypatch.setattr('sys.executable', self.unix_exe)
+        with tmpdir.as_cwd():
+            self._run_install_scripts(str(tmpdir))
+            with io.open(str(tmpdir.join('foo')), 'r') as f:
+                actual = f.readline()
+        assert actual == expected
+
+    @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only')
+    def test_sys_executable_escaping_win32(self, tmpdir, monkeypatch):
+        """
+        Ensure that shebang is quoted on Windows when getting the Python exe
+        from sys.executable and it contains a space.
+        """
+        expected = '#!"%s"\n' % self.win32_exe
+        monkeypatch.setattr('sys.executable', self.win32_exe)
+        with tmpdir.as_cwd():
+            self._run_install_scripts(str(tmpdir))
+            with io.open(str(tmpdir.join('foo-script.py')), 'r') as f:
+                actual = f.readline()
+        assert actual == expected
+
+    @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only')
+    def test_executable_with_spaces_escaping_unix(self, tmpdir):
+        """
+        Ensure that shebang on Unix is not quoted, even when a value with spaces
+        is specified using --executable.
+        """
+        expected = '#!%s\n' % self.unix_spaces_exe
+        with tmpdir.as_cwd():
+            self._run_install_scripts(str(tmpdir), self.unix_spaces_exe)
+            with io.open(str(tmpdir.join('foo')), 'r') as f:
+                actual = f.readline()
+        assert actual == expected
+
+    @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only')
+    def test_executable_arg_escaping_win32(self, tmpdir):
+        """
+        Ensure that shebang on Windows is quoted when getting a path with spaces
+        from --executable, that is itself properly quoted.
+        """
+        expected = '#!"%s"\n' % self.win32_exe
+        with tmpdir.as_cwd():
+            self._run_install_scripts(str(tmpdir), '"' + self.win32_exe + '"')
+            with io.open(str(tmpdir.join('foo-script.py')), 'r') as f:
+                actual = f.readline()
+        assert actual == expected

From 3132833570c90d52f6c2a422506732e82d772cdd Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Sun, 26 Jun 2016 01:48:30 +0200
Subject: [PATCH 5845/8469] Ensure shebang lines are correctly quoted if
 sys.executable contains spaces.

Fixes issue #398. This only special-cases sys.executable; if the --executable
parameter is used, paths with spaces have to be quoted there explicitly. While
this change also applies to Unix platforms, if sys.executable contains spaces
on Unix, any shebang lines created with it aren't going to work either way,
whether they are quoted or not.
---
 setuptools/command/easy_install.py    | 11 ++++++++++-
 setuptools/command/install_scripts.py |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9ca1554ebe..d63fb529be 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1985,9 +1985,18 @@ def _extract_options(orig_script):
     def as_header(self):
         return self._render(self + list(self.options))
 
+    @staticmethod
+    def _strip_quotes(item):
+        _QUOTES = '"\''
+        for q in _QUOTES:
+            if item.startswith(q) and item.endswith(q):
+                return item[1:-1]
+        return item
+
     @staticmethod
     def _render(items):
-        cmdline = subprocess.list2cmdline(items)
+        cmdline = subprocess.list2cmdline(
+            CommandSpec._strip_quotes(item.strip()) for item in items)
         return '#!' + cmdline + '\n'
 
 # For pbr compat; will be removed in a future version.
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index be66cb2252..16234273a2 100755
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,6 +1,7 @@
 from distutils import log
 import distutils.command.install_scripts as orig
 import os
+import sys
 
 from pkg_resources import Distribution, PathMetadata, ensure_directory
 
@@ -37,6 +38,10 @@ def run(self):
         if is_wininst:
             exec_param = "python.exe"
             writer = ei.WindowsScriptWriter
+        if exec_param == sys.executable:
+            # In case the path to the Python executable contains a space, wrap
+            # it so it's not split up.
+            exec_param = [exec_param]
         # resolve the writer to the environment
         writer = writer.best()
         cmd = writer.command_spec_class.best().from_param(exec_param)

From 4720c481c62d5cc0a40dd212a32c641125be8e9c Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 29 Jun 2016 10:22:12 +0200
Subject: [PATCH 5846/8469] Don't use deprecated 'U' flag to read manifest

The universal newlines mode ('U' flag) is deprecated since Python
3.4. It only replaces "\r\n" with "\n", but it doesn't split lines at
"\r" (Mac newline). In practice, the flag was useless, the
sdist.read_manifest() method already uses line.strip() and so removes
newline characters.
---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 6640d4e3c9..f200b9469a 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -179,7 +179,7 @@ def read_manifest(self):
         distribution.
         """
         log.info("reading manifest file '%s'", self.manifest)
-        manifest = open(self.manifest, 'rbU')
+        manifest = open(self.manifest, 'rb')
         for line in manifest:
             # The manifest must contain UTF-8. See #303.
             if six.PY3:

From cb88c78645a37ff81efa440f82e3df234bf2c9cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 10:17:26 -0400
Subject: [PATCH 5847/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 055d7aa9fb..a529514dbb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v23.2.0
+-------
+
+* #623: Remove used of deprecated 'U' flag when reading
+  manifests.
+
 v23.1.0
 -------
 

From 54325a753f688285c71a6db0a062116e6dc6976c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:06:19 -0400
Subject: [PATCH 5848/8469] Rename msvc9_support to simply msvc.

---
 CHANGES.rst                              | 2 ++
 setuptools/extension.py                  | 4 ++--
 setuptools/{msvc9_support.py => msvc.py} | 5 +++--
 setuptools/tests/test_msvc9compiler.py   | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename setuptools/{msvc9_support.py => msvc.py} (99%)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4ee60250e6..7a1be7324c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,8 @@ Next
 
 * Pull Request #174: Add more aggressive support for
   Windows SDK in msvc9compiler patch.
+* Renamed ``setuptools.msvc9_support`` to
+  ``setuptools.msvc``.
 
 v21.2.0
 -------
diff --git a/setuptools/extension.py b/setuptools/extension.py
index d10609b699..b9d68178a1 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -8,11 +8,11 @@
 from setuptools.extern.six.moves import map
 
 from .dist import _get_unpatched
-from . import msvc9_support
+from . import msvc
 
 _Extension = _get_unpatched(distutils.core.Extension)
 
-msvc9_support.patch_for_specialized_compiler()
+msvc.patch_for_specialized_compiler()
 
 def _have_cython():
     """
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc.py
similarity index 99%
rename from setuptools/msvc9_support.py
rename to setuptools/msvc.py
index d1ed2edc93..63031ac235 100644
--- a/setuptools/msvc9_support.py
+++ b/setuptools/msvc.py
@@ -1,6 +1,7 @@
 """
-This module improve support for Microsoft Visual C++ compilers. (Windows Only)
+This module adds improved support for Microsoft Visual C++ compilers.
 """
+
 import os
 import collections
 import itertools
@@ -30,7 +31,7 @@ class winreg:
     pass
 
 try:
-    # Distutil file for MSVC++ 14.0 and upper (Python 3.5)
+    # Distutil file for MSVC++ 14.0 and upper (Python 3.5+)
     import distutils._msvccompiler as msvc14compiler
 except ImportError:
     pass
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index 09e0460c56..86475834c4 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -69,7 +69,7 @@ class TestModulePatch:
     def test_patched(self):
         "Test the module is actually patched"
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
-        assert mod_name == "setuptools.msvc9_support", "find_vcvarsall unpatched"
+        assert mod_name == "setuptools.msvc", "find_vcvarsall unpatched"
 
     def test_no_registry_entryies_means_nothing_found(self):
         """

From 22da89cd92578bc5af6375276a6b3f2c5bd98fb1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:09:58 -0400
Subject: [PATCH 5849/8469] =?UTF-8?q?Bump=20version:=2023.1.0=20=E2=86=92?=
 =?UTF-8?q?=2023.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d371955f77..609fdd9812 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 23.1.0
+current_version = 23.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 558bd34542..764b5f87e3 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="23.1.0",
+    version="23.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 2370ce3abb2f92e84948aaafa398ce56587d7bb2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:09:58 -0400
Subject: [PATCH 5850/8469] Added tag v23.2.0 for changeset 65b3fe899db4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b27122d0da..07723c39c7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -274,3 +274,4 @@ efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
 d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
 8664c631bf3a817a7deba86c13b67eccc1f81091 v23.0.0
 6c74559c732c56f61b465d613458ec1a930884b6 v23.1.0
+65b3fe899db4086e66afa067a1311eea2a88d5e2 v23.2.0

From cbc3e03505a6c2a1893312c0ec555b2dec615000 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:16:19 -0400
Subject: [PATCH 5851/8469] Update changelog

---
 CHANGES.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a529514dbb..0ecdf45414 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,9 +2,12 @@
 CHANGES
 =======
 
-v23.2.0
+v23.2.1
 -------
 
+Re-release of v23.2.0, which was missing the intended
+commits.
+
 * #623: Remove used of deprecated 'U' flag when reading
   manifests.
 

From fece3b75874e79f01cecedd41eb035f180400a18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:21:44 -0400
Subject: [PATCH 5852/8469] =?UTF-8?q?Bump=20version:=2023.2.0=20=E2=86=92?=
 =?UTF-8?q?=2023.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 609fdd9812..9d7689895f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 23.2.0
+current_version = 23.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 764b5f87e3..6963334ab8 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="23.2.0",
+    version="23.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 94d97d07df600cca0d51703b13297b73f5b1d9d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:21:51 -0400
Subject: [PATCH 5853/8469] Added tag v23.2.1 for changeset a011298221c3

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 07723c39c7..11d64b6c3b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -275,3 +275,5 @@ d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
 8664c631bf3a817a7deba86c13b67eccc1f81091 v23.0.0
 6c74559c732c56f61b465d613458ec1a930884b6 v23.1.0
 65b3fe899db4086e66afa067a1311eea2a88d5e2 v23.2.0
+e10c848a82ffb925741c65dd8a8fc8b50b3c3e14 v23.2.1
+a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1

From 349e33139adf073c3b55065b1de658868622ccdd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:27:59 -0400
Subject: [PATCH 5854/8469] Rename test for msvc module as well

---
 setuptools/tests/{test_msvc9compiler.py => test_msvc.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename setuptools/tests/{test_msvc9compiler.py => test_msvc.py} (100%)

diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc.py
similarity index 100%
rename from setuptools/tests/test_msvc9compiler.py
rename to setuptools/tests/test_msvc.py

From f2a0b309367cfdade3c0c18d8c69612010351120 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:38:21 -0400
Subject: [PATCH 5855/8469] Extract template as variable to avoid line
 continuation.

---
 setuptools/msvc.py            | 4 ++--
 setuptools/tests/test_msvc.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 63031ac235..500a00f9ef 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -219,8 +219,8 @@ def _augment_exception(exc, version, arch=''):
 
     if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
-        message = 'Microsoft Visual C++ %0.1f is required (%s).' %\
-            (version, message)
+        tmpl = 'Microsoft Visual C++ %0.1f is required (%s).'
+        message = tmpl % version, message
         msdownload = r'www.microsoft.com/download/details.aspx?id=%d'
         if version == 9.0:
             if arch.lower().find('ia64') > -1:
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 86475834c4..2fbd56bf4f 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -1,5 +1,5 @@
 """
-Tests for msvc9compiler.
+Tests for msvc support module.
 """
 
 import os

From 0746957d513d74e6a9f5e2375a10d1d4a0a5108c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:41:20 -0400
Subject: [PATCH 5856/8469] Remove superfluous raw strings

---
 setuptools/msvc.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 500a00f9ef..27118ed9d1 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -219,9 +219,9 @@ def _augment_exception(exc, version, arch=''):
 
     if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
-        tmpl = 'Microsoft Visual C++ %0.1f is required (%s).'
-        message = tmpl % version, message
-        msdownload = r'www.microsoft.com/download/details.aspx?id=%d'
+        tmpl = 'Microsoft Visual C++ {version:0.1f} is required {message}.'
+        message = tmpl.format(**locals())
+        msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
         if version == 9.0:
             if arch.lower().find('ia64') > -1:
                 # For VC++ 9.0, if IA64 support is needed, redirect user
@@ -232,7 +232,7 @@ def _augment_exception(exc, version, arch=''):
                 # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
                 # This redirection link is maintained by Microsoft.
                 # Contact vspython@microsoft.com if it needs updating.
-                message += r' Get it from http://aka.ms/vcpython27'
+                message += ' Get it from http://aka.ms/vcpython27'
         elif version == 10.0:
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK 7.1": '
@@ -365,7 +365,7 @@ def visualstudio(self):
         """
         Microsoft Visual Studio root registry key.
         """
-        return os.path.join(self.microsoft, r'VisualStudio')
+        return os.path.join(self.microsoft, 'VisualStudio')
 
     @property
     def sxs(self):
@@ -860,7 +860,7 @@ def OSLibraries(self):
             arch_subdir = self.pi.target_dir(x64=True)
             lib = os.path.join(self.si.WindowsSdkDir, 'lib')
             libver = self._get_content_dirname(lib)
-            return [os.path.join(lib, r'%sum%s' % (libver, arch_subdir))]
+            return [os.path.join(lib, '%sum%s' % (libver, arch_subdir))]
 
     @property
     def OSIncludes(self):
@@ -898,13 +898,13 @@ def OSLibpath(self):
         if self.vc_ver >= 14.0:
             libpath += [ref,
                         os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                        os.path.join(ref, r'Windows.Foundation.'
+                        os.path.join(ref, 'Windows.Foundation.'
                                      r'UniversalApiContract\1.0.0.0'),
-                        os.path.join(ref, r'Windows.Foundation.'
+                        os.path.join(ref, 'Windows.Foundation.'
                                      r'FoundationContract\1.0.0.0'),
-                        os.path.join(ref, r'Windows.Networking.Connectivity.'
+                        os.path.join(ref, 'Windows.Networking.Connectivity.'
                                      r'WwanContract\1.0.0.0'),
-                        os.path.join(self.si.WindowsSdkDir, r'ExtensionSDKs'
+                        os.path.join(self.si.WindowsSdkDir, 'ExtensionSDKs'
                                      r'\Microsoft.VCLibs\%0.1f\References'
                                      r'\CommonConfiguration\neutral' %
                                      self.vc_ver)]

From e404a4aa3b3aa62c5f2c956f3076ddb9155a6829 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:47:53 -0400
Subject: [PATCH 5857/8469] Reindent to avoid raw strings and hanging indents.
 Let os.path.join provide the backslash characters.

---
 setuptools/msvc.py | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 27118ed9d1..0b483ea303 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -896,18 +896,34 @@ def OSLibpath(self):
             libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')]
 
         if self.vc_ver >= 14.0:
-            libpath += [ref,
-                        os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                        os.path.join(ref, 'Windows.Foundation.'
-                                     r'UniversalApiContract\1.0.0.0'),
-                        os.path.join(ref, 'Windows.Foundation.'
-                                     r'FoundationContract\1.0.0.0'),
-                        os.path.join(ref, 'Windows.Networking.Connectivity.'
-                                     r'WwanContract\1.0.0.0'),
-                        os.path.join(self.si.WindowsSdkDir, 'ExtensionSDKs'
-                                     r'\Microsoft.VCLibs\%0.1f\References'
-                                     r'\CommonConfiguration\neutral' %
-                                     self.vc_ver)]
+            libpath += [
+                ref,
+                os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
+                os.path.join(
+                    ref,
+                    'Windows.Foundation.UniversalApiContract'
+                    '1.0.0.0',
+                ),
+                os.path.join(
+                    ref,
+                    'Windows.Foundation.FoundationContract',
+                    '1.0.0.0',
+                ),
+                os.path.join(
+                    ref,
+                    'Windows.Networking.Connectivity.WwanContract'
+                    '1.0.0.0',
+                ),
+                os.path.join(
+                    self.si.WindowsSdkDir,
+                    'ExtensionSDKs',
+                    'Microsoft.VCLibs',
+                    '%0.1f' % self.vc_ver,
+                    'References',
+                    'CommonConfiguration',
+                    'neutral',
+                ),
+            ]
         return libpath
 
     @property

From 4742d661ab7b6ca643610b2b1f5100cd582d75b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 12:48:31 -0400
Subject: [PATCH 5858/8469] Extract variable for bin_dir

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 0b483ea303..bbf66570a6 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -931,8 +931,8 @@ def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
-        tools = [os.path.join(self.si.WindowsSdkDir,
-                              'Bin' if self.vc_ver <= 11.0 else r'Bin\x86')]
+        bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
+        tools = [os.path.join(self.si.WindowsSdkDir, bin_dir)]
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)

From 590ae3ae964c201fb58273e074b10c4d432592bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 13:31:12 -0400
Subject: [PATCH 5859/8469] Update changelog

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cf81d58778..d94da2dcdc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,8 +2,8 @@
 CHANGES
 =======
 
-Next
-----
+v24.0.0
+-------
 
 * Pull Request #174: Add more aggressive support for
   Windows SDK in msvc9compiler patch.

From f26b15fb8296d0d008b9cf857cf33eb049a95ff2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 13:32:36 -0400
Subject: [PATCH 5860/8469] =?UTF-8?q?Bump=20version:=2023.2.1=20=E2=86=92?=
 =?UTF-8?q?=2024.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9d7689895f..e35e1b8ffc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 23.2.1
+current_version = 24.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6963334ab8..5602989275 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="23.2.1",
+    version="24.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From ca2c0f9aae22081a458848e9ca6baf71f54b88e2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jul 2016 13:32:36 -0400
Subject: [PATCH 5861/8469] Added tag v24.0.0 for changeset 8d37b17a93ec

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 11d64b6c3b..ccf6efff9c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -277,3 +277,4 @@ d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
 65b3fe899db4086e66afa067a1311eea2a88d5e2 v23.2.0
 e10c848a82ffb925741c65dd8a8fc8b50b3c3e14 v23.2.1
 a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
+8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0

From 79d1fc0d9f50af9f51a3c7a7188e4afc644a4aac Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 14:04:06 +0200
Subject: [PATCH 5862/8469] msvc fixe

Fixes :
- Bad argument name
- Better Python 2 compatibility
---
 setuptools/msvc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index bbf66570a6..a03f4fe3b7 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -203,7 +203,7 @@ def msvc14_get_vc_env(plat_spec):
 
     # If error, try to set environment directly
     try:
-        return EnvironmentInfo(plat_spec, vc_ver_min=14.0).return_env()
+        return EnvironmentInfo(plat_spec, vc_min_ver=14.0).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, 14.0)
         raise
@@ -442,11 +442,11 @@ def lookup(self, key, name):
         for hkey in self.HKEYS:
             try:
                 bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
-            except FileNotFoundError:
+            except IOError:
                 continue
             try:
                 return winreg.QueryValueEx(bkey, name)[0]
-            except FileNotFoundError:
+            except IOError:
                 pass
 
 
@@ -489,7 +489,7 @@ def find_available_vc_vers(self):
             for key in vckeys:
                 try:
                     bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
-                except FileNotFoundError:
+                except IOError:
                     continue
                 subkeys, values, _ = winreg.QueryInfoKey(bkey)
                 for i in range(values):
@@ -1187,5 +1187,5 @@ def _get_content_dirname(self, path):
             if name:
                 return '%s\\' % name[0]
             return ''
-        except FileNotFoundError:
+        except IOError:
             return ''

From b90df6ddf053d18c32c72502521eecb36bc454a6 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 14:06:54 +0200
Subject: [PATCH 5863/8469] Update msvc.py

---
 setuptools/msvc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index a03f4fe3b7..d5a48dce02 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -237,6 +237,10 @@ def _augment_exception(exc, version, arch=''):
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += msdownload % 8279
+        elif version >= 14.0:
+            # For VC++ 14.0 Redirect user to Visual C++ Build Tools
+            message += ' Get it with "Visual C++ Build Tools": '
+            r'http://landinghub.visualstudio.com/visual-cpp-build-tools'
 
     exc.args = (message, )
 

From 4751aeef452878881a2b0d81a2624c1c5e72b911 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 14:33:36 +0200
Subject: [PATCH 5864/8469] Update msvc.py

---
 setuptools/msvc.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index d5a48dce02..b85d66e084 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -3,7 +3,6 @@
 """
 
 import os
-import collections
 import itertools
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
@@ -21,7 +20,7 @@ class winreg:
         HKEY_CURRENT_USER = None
         HKEY_LOCAL_MACHINE = None
         HKEY_CLASSES_ROOT = None
-    safe_env = collections.defaultdict(lambda: '')
+    safe_env = dict()
 
 
 try:
@@ -36,7 +35,7 @@ class winreg:
 except ImportError:
     pass
 
-
+	
 unpatched = dict()
 
 
@@ -237,10 +236,6 @@ def _augment_exception(exc, version, arch=''):
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += msdownload % 8279
-        elif version >= 14.0:
-            # For VC++ 14.0 Redirect user to Visual C++ Build Tools
-            message += ' Get it with "Visual C++ Build Tools": '
-            r'http://landinghub.visualstudio.com/visual-cpp-build-tools'
 
     exc.args = (message, )
 
@@ -254,7 +249,7 @@ class PlatformInfo:
     arch: str
         Target architecture.
     """
-    current_cpu = safe_env['processor_architecture'].lower()
+    current_cpu = safe_env.get('processor_architecture', '').lower()
 
     def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
@@ -467,9 +462,9 @@ class SystemInfo:
     """
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
-    WinDir = safe_env['WinDir']
-    ProgramFiles = safe_env['ProgramFiles']
-    ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
+    WinDir = safe_env.get('WinDir', '')
+    ProgramFiles = safe_env.get('ProgramFiles', '')
+    ProgramFilesx86 = safe_env.get('ProgramFiles(x86)', ProgramFiles)
 
     def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info

From 2d0a77530153a53e3a9a00ae1f7d0d800d6af604 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:06:11 +0200
Subject: [PATCH 5865/8469] Update CHANGES.rst

---
 CHANGES.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d94da2dcdc..2f2d689f06 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,11 @@ v24.0.0
 -------
 
 * Pull Request #174: Add more aggressive support for
-  Windows SDK in msvc9compiler patch.
+  standalone Microsoft Visual C++ compilers in
+  msvc9compiler patch.
+  Particularly : Windows SDK 6.0 and 6.1
+  (MSVC++ 9.0), Windows SDK 7.0 (MSVC++ 10.0),
+  Visual C++ Build Tools 2015 (MSVC++14)
 * Renamed ``setuptools.msvc9_support`` to
   ``setuptools.msvc``.
 

From 7b9290771ec850cf7f5e21e168048b12e1e59cf4 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:17:08 +0200
Subject: [PATCH 5866/8469] Update msvc.py

---
 setuptools/msvc.py | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index b85d66e084..8216e94a8d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -1,27 +1,16 @@
 """
 This module adds improved support for Microsoft Visual C++ compilers.
 """
-
 import os
+import platform
 import itertools
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
 try:
     from setuptools.extern.six.moves import winreg
-    safe_env = os.environ
 except ImportError:
-    """
-    Mock winreg and environ so the module can be imported
-    on this platform.
-    """
-    class winreg:
-        HKEY_USERS = None
-        HKEY_CURRENT_USER = None
-        HKEY_LOCAL_MACHINE = None
-        HKEY_CLASSES_ROOT = None
-    safe_env = dict()
-
+    pass
 
 try:
     # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
@@ -35,7 +24,7 @@ class winreg:
 except ImportError:
     pass
 
-	
+
 unpatched = dict()
 
 
@@ -57,6 +46,10 @@ def patch_for_specialized_compiler():
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
+    if platform.system() != Windows:
+        # Compilers only availables on Microsoft Windows
+        return
+
     if 'distutils' not in globals():
         # The module isn't available to be patched
         return
@@ -249,7 +242,7 @@ class PlatformInfo:
     arch: str
         Target architecture.
     """
-    current_cpu = safe_env.get('processor_architecture', '').lower()
+    current_cpu = os.environ.get('processor_architecture', '').lower()
 
     def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
@@ -462,9 +455,9 @@ class SystemInfo:
     """
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
-    WinDir = safe_env.get('WinDir', '')
-    ProgramFiles = safe_env.get('ProgramFiles', '')
-    ProgramFilesx86 = safe_env.get('ProgramFiles(x86)', ProgramFiles)
+    WinDir = os.environ.get('WinDir', '')
+    ProgramFiles = os.environ.get('ProgramFiles', '')
+    ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
 
     def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info

From b4b913b18c07a9d2bce8ae57da7e8c45bf17c28b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:22:40 +0200
Subject: [PATCH 5867/8469] Update msvc.py

---
 setuptools/msvc.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 8216e94a8d..5e6c1c2580 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -9,8 +9,18 @@
 
 try:
     from setuptools.extern.six.moves import winreg
+    safe_env = os.environ
 except ImportError:
-    pass
+    """
+    Mock winreg and environ so the module can be imported
+    on this platform.
+    """
+    class winreg:
+        HKEY_USERS = None
+        HKEY_CURRENT_USER = None
+        HKEY_LOCAL_MACHINE = None
+        HKEY_CLASSES_ROOT = None
+    safe_env = collections.defaultdict(lambda: '')
 
 try:
     # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
@@ -242,7 +252,7 @@ class PlatformInfo:
     arch: str
         Target architecture.
     """
-    current_cpu = os.environ.get('processor_architecture', '').lower()
+    current_cpu = safe_env.get('processor_architecture', '').lower()
 
     def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
@@ -455,9 +465,9 @@ class SystemInfo:
     """
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
-    WinDir = os.environ.get('WinDir', '')
-    ProgramFiles = os.environ.get('ProgramFiles', '')
-    ProgramFilesx86 = os.environ.get('ProgramFiles(x86)', ProgramFiles)
+    WinDir = safe_env.get('WinDir', '')
+    ProgramFiles = safe_env.get('ProgramFiles', '')
+    ProgramFilesx86 = safe_env.get('ProgramFiles(x86)', ProgramFiles)
 
     def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info
@@ -1128,7 +1138,7 @@ def _build_paths(self, name, spec_path_lists, exists):
         """
         # flatten spec_path_lists
         spec_paths = itertools.chain.from_iterable(spec_path_lists)
-        env_paths = os.environ.get(name, '').split(os.pathsep)
+        env_paths = safe_env.get(name, '').split(os.pathsep)
         paths = itertools.chain(spec_paths, env_paths)
         extant_paths = list(filter(os.path.isdir, paths)) if exists else paths
         if not extant_paths:

From 2aa04076e57845abdf9e0cc5238bdcc23ae5e58e Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:26:20 +0200
Subject: [PATCH 5868/8469] Update msvc.py

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 5e6c1c2580..0851b19333 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -7,10 +7,10 @@
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
-try:
+if platform.system() == Windows:
     from setuptools.extern.six.moves import winreg
     safe_env = os.environ
-except ImportError:
+else:
     """
     Mock winreg and environ so the module can be imported
     on this platform.

From a0bc231f8fee1f2df0c04b92eb070e66536d622e Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:28:12 +0200
Subject: [PATCH 5869/8469] Update msvc.py

---
 setuptools/msvc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 0851b19333..f1213f3296 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -4,6 +4,7 @@
 import os
 import platform
 import itertools
+import collections
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 

From c12e784cce4104244353e18e73dedbb588061de7 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:31:18 +0200
Subject: [PATCH 5870/8469] Update msvc.py

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index f1213f3296..990382c0f4 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -8,7 +8,7 @@
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
-if platform.system() == Windows:
+if platform.system() == 'Windows':
     from setuptools.extern.six.moves import winreg
     safe_env = os.environ
 else:
@@ -57,7 +57,7 @@ def patch_for_specialized_compiler():
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
     """
-    if platform.system() != Windows:
+    if platform.system() != 'Windows':
         # Compilers only availables on Microsoft Windows
         return
 

From fb2673566eb04bcf315a5dc28193a59c1dce902b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 15:42:45 +0200
Subject: [PATCH 5871/8469] Update msvc.py

---
 setuptools/msvc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 990382c0f4..8c612129d5 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -4,7 +4,6 @@
 import os
 import platform
 import itertools
-import collections
 import distutils.errors
 from setuptools.extern.six.moves import filterfalse
 
@@ -21,7 +20,7 @@ class winreg:
         HKEY_CURRENT_USER = None
         HKEY_LOCAL_MACHINE = None
         HKEY_CLASSES_ROOT = None
-    safe_env = collections.defaultdict(lambda: '')
+    safe_env = dict()
 
 try:
     # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)

From a2ce15c43be744cbf0cbf8763950f5f5d566625f Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 16:00:49 +0200
Subject: [PATCH 5872/8469] Update CHANGES.rst

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2f2d689f06..a3599f2719 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v24.0.1
+-------
+
+* Fixes on ``setuptools.msvc`` mainly for Python 2
+  and Linux.
+
 v24.0.0
 -------
 

From 8932c2d04e6c4258093cf919e525c61c7663250e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jul 2016 12:19:18 -0400
Subject: [PATCH 5873/8469] Update changelog to reference issues

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a3599f2719..5f2b60764e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,8 @@ CHANGES
 v24.0.1
 -------
 
-* Fixes on ``setuptools.msvc`` mainly for Python 2
-  and Linux.
+* #625 and #626: Fixes on ``setuptools.msvc`` mainly
+  for Python 2 and Linux.
 
 v24.0.0
 -------

From 6e405e85df9f7694f549bb98f4c6a080e86d79e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jul 2016 12:19:26 -0400
Subject: [PATCH 5874/8469] =?UTF-8?q?Bump=20version:=2024.0.0=20=E2=86=92?=
 =?UTF-8?q?=2024.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e35e1b8ffc..d7eff8d1f2 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.0.0
+current_version = 24.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 5602989275..fde901a512 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.0.0",
+    version="24.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 6be486070f5badd8e8d954977cc673714256568f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jul 2016 12:19:26 -0400
Subject: [PATCH 5875/8469] Added tag v24.0.1 for changeset 130a58f9503f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ccf6efff9c..f430934b38 100644
--- a/.hgtags
+++ b/.hgtags
@@ -278,3 +278,4 @@ d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
 e10c848a82ffb925741c65dd8a8fc8b50b3c3e14 v23.2.1
 a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0
+130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1

From 7b303ef300faad048b21005e17d1ca83e4ad3a18 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 19:04:03 +0200
Subject: [PATCH 5876/8469] Minor change : Link to MSVC14 Standalone

Add the new link to "Microsoft Visual C++ Build Tools" if MSVC14 is not installed.
---
 setuptools/msvc.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 8c612129d5..b543c568fb 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -221,7 +221,7 @@ def _augment_exception(exc, version, arch=''):
 
     if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
-        tmpl = 'Microsoft Visual C++ {version:0.1f} is required {message}.'
+        tmpl = 'Microsoft Visual C++ {version:0.1f} is required.'
         message = tmpl.format(**locals())
         msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
         if version == 9.0:
@@ -239,6 +239,10 @@ def _augment_exception(exc, version, arch=''):
             # For VC++ 10.0 Redirect user to Windows SDK 7.1
             message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += msdownload % 8279
+        elif version >= 14.0:
+            # For VC++ 14.0 Redirect user to Visual C++ Build Tools
+            message += (' Get it with "Microsoft Visual C++ Build Tools": '
+                r'http://landinghub.visualstudio.com/visual-cpp-build-tools')
 
     exc.args = (message, )
 

From 46aa62fb47f569ce1e3f5eb9ae83f9b363f9da81 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 19:13:00 +0200
Subject: [PATCH 5877/8469] Update CHANGES.rst

---
 CHANGES.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 94d99fda58..23e85a7b2a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v24.0.2
+-------
+
+* If MSVC14 is needed ``setuptools.msvc`` no redirect
+  user to Visual C++ Build Tools web page.
+
 v24.0.1
 -------
 
@@ -14,8 +20,8 @@ v24.0.0
 * Pull Request #174: Add more aggressive support for
   standalone Microsoft Visual C++ compilers in
   msvc9compiler patch.
-  Particularly : Windows SDK 6.0 and 6.1
-  (MSVC++ 9.0), Windows SDK 7.0 (MSVC++ 10.0),
+  Particularly : Windows SDK 6.1 and 7.0
+  (MSVC++ 9.0), Windows SDK 7.1 (MSVC++ 10.0),
   Visual C++ Build Tools 2015 (MSVC++14)
 * Renamed ``setuptools.msvc9_support`` to
   ``setuptools.msvc``.

From 2a835337bfe7d4831b59c448e729e6a609c2c38f Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 19:13:31 +0200
Subject: [PATCH 5878/8469] Update CHANGES.rst

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 23e85a7b2a..2b01135d08 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ CHANGES
 v24.0.2
 -------
 
-* If MSVC14 is needed ``setuptools.msvc`` no redirect
+* If MSVC++14 is needed ``setuptools.msvc`` no redirect
   user to Visual C++ Build Tools web page.
 
 v24.0.1

From cb29ee77631530b6e15bc84ba8762bcda0ad4467 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sun, 3 Jul 2016 21:28:19 +0200
Subject: [PATCH 5879/8469] Update CHANGES.rst

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2b01135d08..e04bdf05d7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ CHANGES
 v24.0.2
 -------
 
-* If MSVC++14 is needed ``setuptools.msvc`` no redirect
+* If MSVC++14 is needed ``setuptools.msvc`` now redirect
   user to Visual C++ Build Tools web page.
 
 v24.0.1

From 7ef0e255cd8ed3f99058e8c3c11fd8b537d5fcd0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jul 2016 11:22:36 -0400
Subject: [PATCH 5880/8469] =?UTF-8?q?Bump=20version:=2024.0.1=20=E2=86=92?=
 =?UTF-8?q?=2024.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d7eff8d1f2..303569f6dd 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.0.1
+current_version = 24.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index fde901a512..798d4db467 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.0.1",
+    version="24.0.2",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From e3e21fd3d608d72ebe1ba2e4d2b3a59fbca76554 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jul 2016 11:22:36 -0400
Subject: [PATCH 5881/8469] Added tag v24.0.2 for changeset 7996c56bf6a2

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f430934b38..afb158b1ff 100644
--- a/.hgtags
+++ b/.hgtags
@@ -279,3 +279,4 @@ e10c848a82ffb925741c65dd8a8fc8b50b3c3e14 v23.2.1
 a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0
 130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1
+7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2

From 1b228fa0e3f07c73de0053985565293b795e6e96 Mon Sep 17 00:00:00 2001
From: Tim Savannah <kata198@gmail.com>
Date: Tue, 5 Jul 2016 16:35:17 -0400
Subject: [PATCH 5882/8469] Skip empty egg directories, which may be leftover
 from previous installations

---
 pkg_resources/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 15cb93fdc4..35725c06c5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1975,6 +1975,9 @@ def find_on_path(importer, path_item, only=False):
                     fullpath = os.path.join(path_item, entry)
                     if os.path.isdir(fullpath):
                         # egg-info directory, allow getting metadata
+                        if len(os.listdir(fullpath)) == 0:
+                            # Empty egg directory, skip.
+                            continue
                         metadata = PathMetadata(path_item, fullpath)
                     else:
                         metadata = FileMetadata(fullpath)

From fb1867e305660161c2960dfcfc5a95d41310e19d Mon Sep 17 00:00:00 2001
From: Tim Savannah <kata198@gmail.com>
Date: Tue, 5 Jul 2016 16:37:26 -0400
Subject: [PATCH 5883/8469] Scan for distributions in reverse order, so we find
 the newest version of a distribution (instead of the oldest)

---
 pkg_resources/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 35725c06c5..645eda813c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1969,7 +1969,11 @@ def find_on_path(importer, path_item, only=False):
             )
         else:
             # scan for .egg and .egg-info in directory
-            for entry in os.listdir(path_item):
+
+            path_item_entries = os.listdir(path_item)
+            # Reverse so we find the newest version of a distribution,
+            path_item_entries.reverse()
+            for entry in path_item_entries:
                 lower = entry.lower()
                 if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
                     fullpath = os.path.join(path_item, entry)

From e0805ec6a33ff22977723258a99f0184a508bef2 Mon Sep 17 00:00:00 2001
From: Tim Savannah <kata198@gmail.com>
Date: Tue, 5 Jul 2016 18:47:53 -0400
Subject: [PATCH 5884/8469] Ammend: fb1867e305660161c2960dfcfc5a95d41310e19d
 add missing sort

---
 pkg_resources/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 645eda813c..72b03bc1f8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1972,6 +1972,7 @@ def find_on_path(importer, path_item, only=False):
 
             path_item_entries = os.listdir(path_item)
             # Reverse so we find the newest version of a distribution,
+            path_item_entries.sort()
             path_item_entries.reverse()
             for entry in path_item_entries:
                 lower = entry.lower()

From eb17f80c10c171808db4f6d81709dc3c9ebf27d6 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 6 Jul 2016 15:27:35 -0400
Subject: [PATCH 5885/8469] Switch to the new upload url for PyPI

---
 config.py            | 2 +-
 tests/test_config.py | 4 ++--
 tests/test_upload.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.py b/config.py
index 106e146598..9b06d7699e 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
     """Base command that knows how to handle the .pypirc file
     """
-    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://upload.pypi.io/legacy/'
     DEFAULT_REALM = 'pypi'
     repository = None
     realm = None
diff --git a/tests/test_config.py b/tests/test_config.py
index 4de825a81e..c37381550d 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -87,7 +87,7 @@ def test_server_registration(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('repository', 'https://upload.pypi.io/legacy/'),
                   ('server', 'server1'), ('username', 'me')]
         self.assertEqual(config, waited)
 
@@ -96,7 +96,7 @@ def test_server_registration(self):
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('repository', 'https://upload.pypi.io/legacy/'),
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEqual(config, waited)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 8532369aa5..5a462e5a94 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -127,7 +127,7 @@ def test_upload(self):
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         self.assertEqual(self.last_open.req.get_full_url(),
-                         'https://pypi.python.org/pypi')
+                         'https://upload.pypi.io/legacy/')
         self.assertIn(b'xxx', self.last_open.req.data)
 
         # The PyPI response body was echoed

From cbbadc228b01710721939a776b4f2dd008e9c322 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 6 Jul 2016 16:18:39 -0400
Subject: [PATCH 5886/8469] Switch to the new upload url for PyPI

---
 config.py            | 2 +-
 tests/test_config.py | 4 ++--
 tests/test_upload.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.py b/config.py
index 382aca8fc1..2d5770c618 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
     """Base command that knows how to handle the .pypirc file
     """
-    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
+    DEFAULT_REPOSITORY = 'https://upload.pypi.io/legacy/'
     DEFAULT_REALM = 'pypi'
     repository = None
     realm = None
diff --git a/tests/test_config.py b/tests/test_config.py
index 4de825a81e..c37381550d 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -87,7 +87,7 @@ def test_server_registration(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('repository', 'https://upload.pypi.io/legacy/'),
                   ('server', 'server1'), ('username', 'me')]
         self.assertEqual(config, waited)
 
@@ -96,7 +96,7 @@ def test_server_registration(self):
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('repository', 'https://upload.pypi.io/legacy/'),
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEqual(config, waited)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index dccaf77e3e..bf4d558bf7 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -90,7 +90,7 @@ def test_finalize_options(self):
         cmd.finalize_options()
         for attr, waited in (('username', 'me'), ('password', 'secret'),
                              ('realm', 'pypi'),
-                             ('repository', 'https://pypi.python.org/pypi')):
+                             ('repository', 'https://upload.pypi.io/legacy/')):
             self.assertEqual(getattr(cmd, attr), waited)
 
     def test_saved_password(self):
@@ -131,7 +131,7 @@ def test_upload(self):
         content_type = headers['Content-type']
         self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
-        expected_url = 'https://pypi.python.org/pypi'
+        expected_url = 'https://upload.pypi.io/legacy/'
         self.assertEqual(self.last_open.req.get_full_url(), expected_url)
         self.assertTrue(b'xxx' in self.last_open.req.data)
 

From f568a513f3be48c8f778da29719b7573b869e6c0 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 6 Jul 2016 17:46:37 -0400
Subject: [PATCH 5887/8469] Fix a test with the new upload URL

---
 tests/test_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 6763f57388..c7bbd6d108 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -130,7 +130,7 @@ def test_config_interpolation(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'yh^%#rest-of-my-password'), ('realm', 'pypi'),
-                  ('repository', 'https://pypi.python.org/pypi'),
+                  ('repository', 'https://upload.pypi.io/legacy/'),
                   ('server', 'server3'), ('username', 'cbiggles')]
         self.assertEqual(config, waited)
 

From f11c5c1af6806da60cedfdbc94b4548fefec73bb Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 11 Jul 2016 07:51:37 +0000
Subject: [PATCH 5888/8469] English spelling and grammar fixes

---
 tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 8f62b1a848..4e397ea4c9 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -243,7 +243,7 @@ def test_check_extensions_list(self):
         self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
 
         # second element of each tuple in 'ext_modules'
-        # must be a ary (build info)
+        # must be a dictionary (build info)
         exts = [('foo.bar', '')]
         self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts)
 

From 843988ea2e4e4df34abf343e05fa1bac17680f5c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Tue, 12 Jul 2016 22:28:51 +0700
Subject: [PATCH 5889/8469] Remove trailing whitespace

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

diff --git a/setuptools/utils.py b/setuptools/utils.py
index 91e4b87f65..080b9a8e23 100644
--- a/setuptools/utils.py
+++ b/setuptools/utils.py
@@ -3,9 +3,9 @@
 
 
 def cs_path_exists(fspath):
-    if not os.path.exists(fspath): 
+    if not os.path.exists(fspath):
         return False
     # make absolute so we always have a directory
     abspath = os.path.abspath(fspath)
     directory, filename = os.path.split(abspath)
-    return filename in os.listdir(directory)
\ No newline at end of file
+    return filename in os.listdir(directory)

From 6d11e88f938f09ef16db4c6064b6e74acba4db1d Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Tue, 12 Jul 2016 22:00:43 +0700
Subject: [PATCH 5890/8469] Fix quantity of blank lines after code object.

---
 bootstrap.py                           |  1 +
 pavement.py                            |  2 ++
 setup.py                               |  1 +
 setuptools/__init__.py                 |  4 +++
 setuptools/archive_util.py             |  2 ++
 setuptools/command/bdist_wininst.py    |  1 +
 setuptools/command/build_ext.py        |  2 ++
 setuptools/command/build_py.py         |  1 +
 setuptools/command/develop.py          |  1 +
 setuptools/command/easy_install.py     |  1 +
 setuptools/command/install_lib.py      |  1 +
 setuptools/command/sdist.py            |  1 +
 setuptools/command/test.py             |  2 ++
 setuptools/depends.py                  |  4 +--
 setuptools/dist.py                     | 13 +++++++---
 setuptools/extension.py                |  2 ++
 setuptools/lib2to3_ex.py               |  4 +++
 setuptools/msvc.py                     |  1 +
 setuptools/package_index.py            | 17 +++++++++++++
 setuptools/py26compat.py               |  1 +
 setuptools/py27compat.py               |  1 +
 setuptools/py31compat.py               |  3 +++
 setuptools/sandbox.py                  | 34 +++++++-------------------
 setuptools/ssl_support.py              |  4 +++
 setuptools/tests/__init__.py           |  2 ++
 setuptools/tests/py26compat.py         |  1 +
 setuptools/tests/server.py             |  5 ++++
 setuptools/tests/test_bdist_egg.py     |  1 +
 setuptools/tests/test_build_ext.py     |  2 ++
 setuptools/tests/test_develop.py       |  2 ++
 setuptools/tests/test_easy_install.py  |  6 +++++
 setuptools/tests/test_egg_info.py      |  1 +
 setuptools/tests/test_find_packages.py |  4 +++
 setuptools/tests/test_packageindex.py  |  1 +
 setuptools/tests/test_sandbox.py       |  1 +
 setuptools/tests/test_sdist.py         |  1 -
 tests/manual_test.py                   |  3 +++
 37 files changed, 102 insertions(+), 32 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 70f962583d..bf7fb431e8 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -27,6 +27,7 @@
     requires.txt = setuptools.command.egg_info:write_requirements
     """)
 
+
 def ensure_egg_info():
     if os.path.exists('setuptools.egg-info'):
         return
diff --git a/pavement.py b/pavement.py
index 303e9bac4f..f620c790d8 100644
--- a/pavement.py
+++ b/pavement.py
@@ -3,10 +3,12 @@
 from paver.easy import task, path as Path
 import pip
 
+
 def remove_all(paths):
     for path in paths:
         path.rmtree() if path.isdir() else path.remove()
 
+
 @task
 def update_vendored():
     vendor = Path('pkg_resources/_vendor')
diff --git a/setup.py b/setup.py
index 798d4db467..bac726bf66 100755
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@
 
 scripts = []
 
+
 def _gen_console_scripts():
     yield "easy_install = setuptools.command.easy_install:main"
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 67b57e4f46..2523ccc78f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -32,6 +32,7 @@
 
 
 class PackageFinder(object):
+
     @classmethod
     def find(cls, where='.', exclude=(), include=('*',)):
         """Return a list all Python packages found within directory 'where'
@@ -108,7 +109,9 @@ def _build_filter(*patterns):
         """
         return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
 
+
 class PEP420PackageFinder(PackageFinder):
+
     @staticmethod
     def _looks_like_package(path):
         return True
@@ -119,6 +122,7 @@ def _looks_like_package(path):
 
 _Command = _get_unpatched(_Command)
 
+
 class Command(_Command):
     __doc__ = _Command.__doc__
 
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index b3c9fa5690..4da24ec20d 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -15,9 +15,11 @@
 from pkg_resources import ensure_directory, ContextualZipFile
 from distutils.errors import DistutilsError
 
+
 class UnrecognizedFormat(DistutilsError):
     """Couldn't recognize the archive type"""
 
+
 def default_filter(src,dst):
     """The default progress/filter callback; returns True for all files"""
     return dst
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 073de97b46..8243c917ee 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -2,6 +2,7 @@
 
 
 class bdist_wininst(orig.bdist_wininst):
+
     def reinitialize_command(self, command, reinit_subcommands=0):
         """
         Supplement reinitialize_command to work around
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 1caf8c818b..e6db0764e8 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -59,7 +59,9 @@ def _customize_compiler_for_shlib(compiler):
 
 if_dl = lambda s: s if have_rtld else ''
 
+
 class build_ext(_build_ext):
+
     def run(self):
         """Build extensions in build directory, then copy if --inplace"""
         old_inplace, self.inplace = self.inplace, 0
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 0bad829525..b5de9bda52 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -15,6 +15,7 @@
     from setuptools.lib2to3_ex import Mixin2to3
 except ImportError:
     class Mixin2to3:
+
         def run_2to3(self, files, doctests=True):
             "do nothing"
 
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 11b5df10a8..3eb8612054 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -186,6 +186,7 @@ class VersionlessRequirement(object):
     >>> str(adapted_dist.as_requirement())
     'foo'
     """
+
     def __init__(self, dist):
         self.__dist = dist
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9ca1554ebe..73bdb0cb4c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2158,6 +2158,7 @@ def _use_header(new_header):
 
 
 class WindowsExecutableLauncherWriter(WindowsScriptWriter):
+
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         """
diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 78fe689152..2b31c3e38b 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -3,6 +3,7 @@
 from itertools import product, starmap
 import distutils.command.install_lib as orig
 
+
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index f200b9469a..041ee42e2f 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -15,6 +15,7 @@
 
 _default_revctrl = list
 
+
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""
     for ep in pkg_resources.iter_entry_points('setuptools.file_finders'):
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 39746a02bf..2d1adba85a 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -14,6 +14,7 @@
 
 
 class ScanningLoader(TestLoader):
+
     def loadTestsFromModule(self, module, pattern=None):
         """Return a suite of all tests cases contained in the given module
 
@@ -46,6 +47,7 @@ def loadTestsFromModule(self, module, pattern=None):
 
 # adapted from jaraco.classes.properties:NonDataProperty
 class NonDataProperty(object):
+
     def __init__(self, fget):
         self.fget = fget
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 9f7c9a3551..ef3dbb916a 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -10,6 +10,7 @@
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
 ]
 
+
 class Require:
     """A prerequisite to building or installing a distribution"""
 
@@ -39,7 +40,6 @@ def version_ok(self, version):
             str(version) != "unknown" and version >= self.requested_version
 
     def get_version(self, paths=None, default="unknown"):
-
         """Get version number of installed module, 'None', or 'default'
 
         Search 'paths' for module.  If not found, return 'None'.  If found,
@@ -78,7 +78,6 @@ def is_current(self, paths=None):
 
 
 def _iter_code(code):
-
     """Yield '(op,arg)' pair for each operation in code object 'code'"""
 
     from array import array
@@ -131,7 +130,6 @@ def find_module(module, paths=None):
 
 
 def get_module_constant(module, symbol, default=-1, paths=None):
-
     """Find 'module' by searching 'paths', and extract 'symbol'
 
     Return 'None' if 'module' does not exist on 'paths', or it does not define
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 086e0a587f..ee85cf5276 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -38,6 +38,7 @@ def _get_unpatched(cls):
 
 _Distribution = _get_unpatched(_Distribution)
 
+
 def _patch_distribution_metadata_write_pkg_info():
     """
     Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
@@ -61,6 +62,7 @@ def write_pkg_info(self, base_dir):
 
 sequence = tuple, list
 
+
 def check_importable(dist, attr, value):
     try:
         ep = pkg_resources.EntryPoint.parse('x='+value)
@@ -80,6 +82,8 @@ def assert_string_list(dist, attr, value):
         raise DistutilsSetupError(
             "%r must be a list of strings (got %r)" % (attr,value)
         )
+
+
 def check_nsp(dist, attr, value):
     """Verify that namespace packages are valid"""
     assert_string_list(dist,attr,value)
@@ -97,6 +101,7 @@ def check_nsp(dist, attr, value):
                     " is not: please correct this in setup.py", nsp, parent
                 )
 
+
 def check_extras(dist, attr, value):
     """Verify that extras_require mapping is valid"""
     try:
@@ -113,6 +118,7 @@ def check_extras(dist, attr, value):
             "requirement specifiers."
         )
 
+
 def assert_bool(dist, attr, value):
     """Verify that value is True, False, 0, or 1"""
     if bool(value) != value:
@@ -131,6 +137,7 @@ def check_requirements(dist, attr, value):
         )
         raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
 
+
 def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:
@@ -138,10 +145,12 @@ def check_entry_points(dist, attr, value):
     except ValueError as e:
         raise DistutilsSetupError(e)
 
+
 def check_test_suite(dist, attr, value):
     if not isinstance(value, six.string_types):
         raise DistutilsSetupError("test_suite must be a string")
 
+
 def check_package_data(dist, attr, value):
     """Verify that value is a dictionary of package names to glob lists"""
     if isinstance(value,dict):
@@ -157,6 +166,7 @@ def check_package_data(dist, attr, value):
         "wildcard patterns"
     )
 
+
 def check_packages(dist, attr, value):
     for pkgname in value:
         if not re.match(r'\w+(\.\w+)*', pkgname):
@@ -815,7 +825,6 @@ def include_by_default(self):
         return self.available and self.standard
 
     def include_in(self,dist):
-
         """Ensure feature and its requirements are included in distribution
 
         You may override this in a subclass to perform additional operations on
@@ -836,7 +845,6 @@ def include_in(self,dist):
             dist.include_feature(f)
 
     def exclude_from(self,dist):
-
         """Ensure feature is excluded from distribution
 
         You may override this in a subclass to perform additional operations on
@@ -852,7 +860,6 @@ def exclude_from(self,dist):
                 dist.exclude_package(item)
 
     def validate(self,dist):
-
         """Verify that feature makes sense in context of distribution
 
         This method is called by the distribution just before it parses its
diff --git a/setuptools/extension.py b/setuptools/extension.py
index b9d68178a1..d265b7a354 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -14,6 +14,7 @@
 
 msvc.patch_for_specialized_compiler()
 
+
 def _have_cython():
     """
     Return True if Cython can be imported.
@@ -48,6 +49,7 @@ def _convert_pyx_sources_to_lang(self):
         sub = functools.partial(re.sub, '.pyx$', target_ext)
         self.sources = list(map(sub, self.sources))
 
+
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
 
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index feef591a88..f7296786ea 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -12,7 +12,9 @@
 from lib2to3.refactor import RefactoringTool, get_fixers_from_package
 import setuptools
 
+
 class DistutilsRefactoringTool(RefactoringTool):
+
     def log_error(self, msg, *args, **kw):
         log.error(msg, *args)
 
@@ -22,7 +24,9 @@ def log_message(self, msg, *args):
     def log_debug(self, msg, *args):
         log.debug(msg, *args)
 
+
 class Mixin2to3(_Mixin2to3):
+
     def run_2to3(self, files, doctests = False):
         # See of the distribution option has been set, otherwise check the
         # setuptools default.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index b543c568fb..012ab32c74 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -769,6 +769,7 @@ class EnvironmentInfo:
     """
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
+
     def __init__(self, arch, vc_ver=None, vc_min_ver=None):
         self.pi = PlatformInfo(arch)
         self.ri = RegistryInfo(self.pi)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e87504db66..e9b304b19d 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -85,6 +85,7 @@ def egg_info_for_url(url):
     if '#' in base: base, fragment = base.split('#',1)
     return base,fragment
 
+
 def distros_for_url(url, metadata=None):
     """Yield egg or source distribution objects that might be found at a URL"""
     base, fragment = egg_info_for_url(url)
@@ -97,6 +98,7 @@ def distros_for_url(url, metadata=None):
             ):
                 yield dist
 
+
 def distros_for_location(location, basename, metadata=None):
     """Yield egg or source distribution objects based on basename"""
     if basename.endswith('.egg.zip'):
@@ -118,6 +120,7 @@ def distros_for_location(location, basename, metadata=None):
             return interpret_distro_name(location, basename, metadata)
     return []  # no extension matched
 
+
 def distros_for_filename(filename, metadata=None):
     """Yield possible egg or source distribution objects based on a filename"""
     return distros_for_location(
@@ -177,6 +180,7 @@ def unique_everseen(iterable, key=None):
                 seen_add(k)
                 yield element
 
+
 def unique_values(func):
     """
     Wrap a function returning an iterable such that the resulting iterable
@@ -190,6 +194,7 @@ def wrapper(*args, **kwargs):
 REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
 # this line is here to fix emacs' cruddy broken syntax highlighting
 
+
 @unique_values
 def find_external_links(url, page):
     """Find rel="homepage" and rel="download" links in `page`, yielding URLs"""
@@ -213,6 +218,7 @@ class ContentChecker(object):
     """
     A null content checker that defines the interface for checking content
     """
+
     def feed(self, block):
         """
         Feed a block of data to the hash.
@@ -232,6 +238,7 @@ def report(self, reporter, template):
         """
         return
 
+
 class HashChecker(ContentChecker):
     pattern = re.compile(
         r'(?P<hash_name>sha1|sha224|sha384|sha256|sha512|md5)='
@@ -672,6 +679,7 @@ def gen_setup(self, filename, fragment, tmpdir):
             )
 
     dl_blocksize = 8192
+
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
         # Download the file
@@ -883,12 +891,14 @@ def warn(self, msg, *args):
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
 
+
 def uchr(c):
     if not isinstance(c, int):
         return c
     if c>255: return six.unichr(c)
     return chr(c)
 
+
 def decode_entity(match):
     what = match.group(1)
     if what.startswith('#x'):
@@ -899,10 +909,12 @@ def decode_entity(match):
         what = six.moves.html_entities.name2codepoint.get(what, match.group(0))
     return uchr(what)
 
+
 def htmldecode(text):
     """Decode HTML entities in the given text."""
     return entity_sub(decode_entity, text)
 
+
 def socket_timeout(timeout=15):
     def _socket_timeout(func):
         def _socket_timeout(*args, **kwargs):
@@ -915,6 +927,7 @@ def _socket_timeout(*args, **kwargs):
         return _socket_timeout
     return _socket_timeout
 
+
 def _encode_auth(auth):
     """
     A function compatible with Python 2.3-3.3 that will encode
@@ -937,10 +950,12 @@ def _encode_auth(auth):
     # strip the trailing carriage return
     return encoded.replace('\n','')
 
+
 class Credential(object):
     """
     A username/password pair. Use like a namedtuple.
     """
+
     def __init__(self, username, password):
         self.username = username
         self.password = password
@@ -952,6 +967,7 @@ def __iter__(self):
     def __str__(self):
         return '%(username)s:%(password)s' % vars(self)
 
+
 class PyPIConfig(configparser.RawConfigParser):
 
     def __init__(self):
@@ -1042,6 +1058,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 def fix_sf_url(url):
     return url      # backward compatibility
 
+
 def local_open(url):
     """Read a local path, with special support for directories"""
     scheme, server, path, param, query, frag = urllib.parse.urlparse(url)
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 40cbb88e67..74ec3980e1 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -9,6 +9,7 @@
 except ImportError:
     from urllib import splittag
 
+
 def strip_fragment(url):
     """
     In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 702f7d65b6..66aecc2a0a 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -4,6 +4,7 @@
 
 import sys
 
+
 def get_all_headers(message, key):
     """
     Given an HTTPMessage, return all headers matching a given key.
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 8fe6dd9d70..04a314ef61 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -8,6 +8,7 @@
     from sysconfig import get_config_vars, get_path
 except ImportError:
     from distutils.sysconfig import get_config_vars, get_python_lib
+
     def get_path(name):
         if name not in ('platlib', 'purelib'):
             raise ValueError("Name must be purelib or platlib")
@@ -19,12 +20,14 @@ def get_path(name):
 except ImportError:
     import shutil
     import tempfile
+
     class TemporaryDirectory(object):
         """
         Very simple temporary directory context manager.
         Will try to delete afterward, but will also ignore OS and similar
         errors on deletion.
         """
+
         def __init__(self):
             self.name = None # Handle mkdtemp raising an exception
             self.name = tempfile.mkdtemp()
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 23e296b18b..83c3afdb36 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -29,6 +29,7 @@
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
 
+
 def _execfile(filename, globals, locals=None):
     """
     Python 3 implementation of execfile.
@@ -117,6 +118,7 @@ class ExceptionSaver:
     A Context Manager that will save an exception, serialized, and restore it
     later.
     """
+
     def __enter__(self):
         return self
 
@@ -237,6 +239,7 @@ def run_setup(setup_script, args):
             # reset to include setup dir, w/clean callback list
             working_set.__init__()
             working_set.callbacks.append(lambda dist:dist.activate())
+
             def runner():
                 ns = dict(__file__=setup_script, __name__='__main__')
                 _execfile(setup_script, ns)
@@ -280,6 +283,7 @@ def run(self, func):
 
     def _mk_dual_path_wrapper(name):
         original = getattr(_os,name)
+
         def wrap(self,src,dst,*args,**kw):
             if self._active:
                 src,dst = self._remap_pair(name,src,dst,*args,**kw)
@@ -291,6 +295,7 @@ def wrap(self,src,dst,*args,**kw):
 
     def _mk_single_path_wrapper(name, original=None):
         original = original or getattr(_os,name)
+
         def wrap(self,path,*args,**kw):
             if self._active:
                 path = self._remap_input(name,path,*args,**kw)
@@ -309,6 +314,7 @@ def wrap(self,path,*args,**kw):
 
     def _mk_single_with_return(name):
         original = getattr(_os,name)
+
         def wrap(self,path,*args,**kw):
             if self._active:
                 path = self._remap_input(name,path,*args,**kw)
@@ -321,6 +327,7 @@ def wrap(self,path,*args,**kw):
 
     def _mk_query(name):
         original = getattr(_os,name)
+
         def wrap(self,*args,**kw):
             retval = original(*args,**kw)
             if self._active:
@@ -364,6 +371,7 @@ def _remap_pair(self,operation,src,dst,*args,**kw):
     # it appears pywin32 is not installed, so no need to exclude.
     pass
 
+
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
 
@@ -453,6 +461,7 @@ def open(self, file, flags, mode=0o777, *args, **kw):
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
 )
 
+
 class SandboxViolation(DistutilsError):
     """A setup script attempted to modify the filesystem outside the sandbox"""
 
@@ -468,29 +477,4 @@ def __str__(self):
 maintainers to find out if a fix or workaround is available.""" % self.args
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 657197cfb1..ecede5092a 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -161,6 +161,7 @@ def https_open(self, req):
 
 class VerifyingHTTPSConn(HTTPSConnection):
     """Simple verifying connection: no auth, subclasses, timeouts, etc."""
+
     def __init__(self, host, ca_bundle, **kw):
         HTTPSConnection.__init__(self, host, **kw)
         self.ca_bundle = ca_bundle
@@ -192,6 +193,7 @@ def connect(self):
             self.sock.close()
             raise
 
+
 def opener_for(ca_bundle=None):
     """Get a urlopen() replacement that uses ca_bundle for verification"""
     return urllib.request.build_opener(
@@ -201,6 +203,7 @@ def opener_for(ca_bundle=None):
 
 _wincerts = None
 
+
 def get_win_certfile():
     global _wincerts
     if _wincerts is not None:
@@ -212,6 +215,7 @@ def get_win_certfile():
         return None
 
     class MyCertFile(CertFile):
+
         def __init__(self, stores=(), certs=()):
             CertFile.__init__(self)
             for store in stores:
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 3244735600..569b060f09 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -40,6 +40,7 @@ def makeSetup(**args):
     reason="bytecode support not available",
 )
 
+
 class TestDepends:
 
     def testExtractConst(self):
@@ -289,6 +290,7 @@ def testFeatureWithInvalidRemove(self):
         with pytest.raises(SystemExit):
             makeSetup(features={'x':Feature('x', remove='y')})
 
+
 class TestCommandTests:
 
     def testTestIsCommand(self):
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index 7211f2757e..5325dad6e0 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -2,6 +2,7 @@
 import tarfile
 import contextlib
 
+
 def _tarfile_open_ex(*args, **kwargs):
     """
     Extend result as a context manager.
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 6a687937bb..9e5fefb76c 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -18,6 +18,7 @@ class IndexServer(BaseHTTPServer.HTTPServer):
         # The index files should be located in setuptools/tests/indexes
         s.stop()
     """
+
     def __init__(self, server_address=('', 0),
             RequestHandlerClass=SimpleHTTPServer.SimpleHTTPRequestHandler):
         BaseHTTPServer.HTTPServer.__init__(self, server_address,
@@ -42,16 +43,20 @@ def base_url(self):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
+
 class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)
         self.send_response(200, 'OK')
 
+
 class MockServer(BaseHTTPServer.HTTPServer, threading.Thread):
     """
     A simple HTTP Server that records the requests made to it.
     """
+
     def __init__(self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
         BaseHTTPServer.HTTPServer.__init__(self, server_address,
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index ccfb2ea76b..a7ceac8696 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -15,6 +15,7 @@
 setup(name='foo', py_modules=['hi'])
 """
 
+
 @pytest.yield_fixture
 def setup_context(tmpdir):
     with (tmpdir/'setup.py').open('w') as f:
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 0719ba44ae..5168ebf05b 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -3,7 +3,9 @@
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
 
+
 class TestBuildExt:
+
     def test_get_ext_filename(self):
         """
         Setuptools needs to give back the same
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 1b84449995..d22e5e4a3f 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -26,6 +26,7 @@
 INIT_PY = """print "foo"
 """
 
+
 @pytest.yield_fixture
 def temp_user(monkeypatch):
     with contexts.tempdir() as user_base:
@@ -54,6 +55,7 @@ def test_env(tmpdir, temp_user):
 class TestDevelop:
     in_virtualenv = hasattr(sys, 'real_prefix')
     in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix
+
     @pytest.mark.skipif(in_virtualenv or in_venv,
         reason="Cannot run when invoked in a virtualenv or venv")
     def test_2to3_user_mode(self, test_env):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fd06b6efc8..894c4fd8b5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -41,6 +41,7 @@
 
 
 class FakeDist(object):
+
     def get_entry_map(self, group):
         if group != 'console_scripts':
             return {}
@@ -55,6 +56,7 @@ def as_requirement(self):
     setup(name='foo')
     """)
 
+
 class TestEasyInstallTest:
 
     def test_install_site_py(self, tmpdir):
@@ -133,6 +135,7 @@ def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch):
 
 
 class TestPTHFileWriter:
+
     def test_add_from_cwd_site_sets_dirty(self):
         '''a pth file manager should set dirty
         if a distribution is in site but also the cwd
@@ -266,6 +269,7 @@ def distutils_package():
 
 
 class TestDistutilsPackage:
+
     def test_bdist_egg_available_on_distutils_pkg(self, distutils_package):
         run_setup('setup.py', ['bdist_egg'])
 
@@ -557,6 +561,7 @@ def test_get_script_header(self):
 
 
 class TestCommandSpec:
+
     def test_custom_launch_command(self):
         """
         Show how a custom CommandSpec could be used to specify a #! executable
@@ -601,6 +606,7 @@ def test_sys_executable(self):
 
 
 class TestWindowsScriptWriter:
+
     def test_header(self):
         hdr = ei.WindowsScriptWriter.get_script_header('')
         assert hdr.startswith('#!')
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 3a0db58f9d..afbda2cc9e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -235,6 +235,7 @@ def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
 
     def _find_egg_info_files(self, root):
         class DirList(list):
+
             def __init__(self, files, base):
                 super(DirList, self).__init__(files)
                 self.base = base
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 06a7c02e46..65e7243d65 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -13,6 +13,8 @@
 find_420_packages = setuptools.PEP420PackageFinder.find
 
 # modeled after CPython's test.support.can_symlink
+
+
 def can_symlink():
     TESTFN = tempfile.mktemp()
     symlink_path = TESTFN + "can_symlink"
@@ -26,6 +28,7 @@ def can_symlink():
     globals().update(can_symlink=lambda: can)
     return can
 
+
 def has_symlink():
     bad_symlink = (
         # Windows symlink directory detection is broken on Python 3.2
@@ -33,6 +36,7 @@ def has_symlink():
     )
     return can_symlink() and not bad_symlink
 
+
 class TestFindPackages:
 
     def setup_method(self, method):
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 6a76b5fcff..61f5909b83 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -209,6 +209,7 @@ def test_report(self):
 
 
 class TestPyPIConfig:
+
     def test_percent_in_password(self, tmpdir, monkeypatch):
         monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
         pypirc = tmpdir / '.pypirc'
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index fefd46f7e6..aa6138e49b 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -57,6 +57,7 @@ def test_setup_py_with_CRLF(self, tmpdir):
 
 
 class TestExceptionSaver:
+
     def test_exception_trapped(self):
         with setuptools.sandbox.ExceptionSaver():
             raise ValueError("details")
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index d2a1f1bbfb..16d0eb07dc 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -132,7 +132,6 @@ def test_package_data_in_sdist(self):
         assert os.path.join('sdist_test', 'b.txt') in manifest
         assert os.path.join('sdist_test', 'c.rst') not in manifest
 
-
     def test_defaults_case_sensitivity(self):
         """
             Make sure default files (README.*, etc.) are added in a case-sensitive
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 808fa55ae0..0904b607e0 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -10,9 +10,11 @@
 
 from six.moves import urllib
 
+
 def _system_call(*args):
     assert subprocess.call(args) == 0
 
+
 def tempdir(func):
     def _tempdir(*args, **kwargs):
         test_dir = tempfile.mkdtemp()
@@ -62,6 +64,7 @@ def test_virtualenv():
         res = f.read()
     assert 'setuptools' in res
 
+
 @tempdir
 def test_full():
     """virtualenv + pip + buildout"""

From 7ba7d1b9737c95e7dc77c0379a81f886d23653a4 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Wed, 13 Jul 2016 11:53:42 +0700
Subject: [PATCH 5891/8469] Fix comparison with None.

---
 setuptools/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 3244735600..87dc8f5412 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -325,4 +325,4 @@ def testConflictingOptions(self):
     def testNoSuite(self):
         ts5 = makeSetup().get_command_obj('test')
         ts5.ensure_finalized()
-        assert ts5.test_suite == None
+        assert ts5.test_suite is None

From f1e3a3fc4199c80e1eca7af0d1bd10544faf1542 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Wed, 13 Jul 2016 14:49:35 +0700
Subject: [PATCH 5892/8469] Format block comments.

---
 setuptools/site-patch.py          | 4 ++--
 setuptools/tests/environment.py   | 8 ++++----
 setuptools/tests/test_build_py.py | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index c2168019ad..bb887ad05a 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -10,7 +10,7 @@ def __boot():
     pic = getattr(sys,'path_importer_cache',{})
     stdpath = sys.path[len(PYTHONPATH):]
     mydir = os.path.dirname(__file__)
-    #print "searching",stdpath,sys.path
+    # print "searching",stdpath,sys.path
 
     for item in stdpath:
         if item==mydir or not item:
@@ -39,7 +39,7 @@ def __boot():
     else:
         raise ImportError("Couldn't find the real 'site' module")
 
-    #print "loaded", __file__
+    # print "loaded", __file__
 
     known_paths = dict([(makepath(item)[1],1) for item in sys.path]) # 2.2 comp
 
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index a23c0504e7..e523772184 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -25,11 +25,11 @@ def run_setup_py(cmd, pypath=None, path=None,
         for envname in os.environ:
             env[envname] = os.environ[envname]
 
-    #override the python path if needed
+    # override the python path if needed
     if pypath is not None:
         env["PYTHONPATH"] = pypath
 
-    #overide the execution path if needed
+    # overide the execution path if needed
     if path is not None:
         env["PATH"] = path
     if not env.get("PATH", ""):
@@ -50,11 +50,11 @@ def run_setup_py(cmd, pypath=None, path=None,
     except OSError:
         return 1, ''
 
-    #decode the console string if needed
+    # decode the console string if needed
     if hasattr(data,  "decode"):
         # use the default encoding
         data = data.decode()
         data = unicodedata.normalize('NFC', data)
 
-    #communciate calls wait()
+    # communciate calls wait()
     return proc.returncode, data
diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index ed1703accd..860c569c2e 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -26,6 +26,6 @@ def test_directories_in_package_data_glob(tmpdir_as_cwd):
         package_data={'': ['path/*']},
     ))
     os.makedirs('path/subpath')
-    #with contexts.quiet():
+    # with contexts.quiet():
     dist.parse_command_line()
     dist.run_commands()

From c064f573cd7dcfd684afe9fb6d827afb6c3bd363 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Wed, 13 Jul 2016 15:16:47 +0700
Subject: [PATCH 5893/8469] tests: match closing bracket for visual identation

---
 setuptools/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 3244735600..02e5b9bcb7 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -221,7 +221,7 @@ def setup_method(self, method):
                 'foo': Feature("foo",standard=True,require_features=['baz',self.req]),
                 'bar': Feature("bar",  standard=True, packages=['pkg.bar'],
                                py_modules=['bar_et'], remove=['bar.ext'],
-                       ),
+                               ),
                 'baz': Feature(
                         "baz", optional=False, packages=['pkg.baz'],
                         scripts = ['scripts/baz_it'],

From 053a3a12cf0cc902e0f869b8cc4cff997f73fc84 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 06:59:30 +0700
Subject: [PATCH 5894/8469] Add missing blank line.

---
 setuptools/package_index.py | 1 +
 setuptools/unicode_utils.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e9b304b19d..7fb8b95495 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -162,6 +162,7 @@ def interpret_distro_name(
             platform = platform
         )
 
+
 # From Python 2.7 docs
 def unique_everseen(iterable, key=None):
     "List unique elements, preserving order. Remember all elements ever seen."
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index ffab3e24ac..7c63efd20b 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -3,6 +3,7 @@
 
 from setuptools.extern import six
 
+
 # HFS Plus uses decomposed UTF-8
 def decompose(path):
     if isinstance(path, six.text_type):

From f749ccab1e55723848946c9aba5c3eddebe0b24e Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 09:26:06 +0700
Subject: [PATCH 5895/8469] Add missing whitespace.

---
 setuptools/archive_util.py             |   2 +-
 setuptools/depends.py                  |  12 +--
 setuptools/dist.py                     | 136 ++++++++++++-------------
 setuptools/package_index.py            |  74 +++++++-------
 setuptools/py26compat.py               |   2 +-
 setuptools/sandbox.py                  |  68 ++++++-------
 setuptools/site-patch.py               |  10 +-
 setuptools/tests/__init__.py           |  72 ++++++-------
 setuptools/tests/contexts.py           |   2 +-
 setuptools/tests/test_find_packages.py |   2 +-
 10 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 4da24ec20d..d195063815 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -20,7 +20,7 @@ class UnrecognizedFormat(DistutilsError):
     """Couldn't recognize the archive type"""
 
 
-def default_filter(src,dst):
+def default_filter(src, dst):
     """The default progress/filter callback; returns True for all files"""
     return dst
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index ef3dbb916a..eb1d7b13ff 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -31,7 +31,7 @@ def __init__(self, name, requested_version, module, homepage='',
     def full_name(self):
         """Return full package/distribution name, w/version"""
         if self.requested_version is not None:
-            return '%s-%s' % (self.name,self.requested_version)
+            return '%s-%s' % (self.name, self.requested_version)
         return self.name
 
     def version_ok(self, version):
@@ -52,7 +52,7 @@ def get_version(self, paths=None, default="unknown"):
 
         if self.attribute is None:
             try:
-                f,p,i = find_module(self.module,paths)
+                f, p, i = find_module(self.module, paths)
                 if f: f.close()
                 return default
             except ImportError:
@@ -83,7 +83,7 @@ def _iter_code(code):
     from array import array
     from dis import HAVE_ARGUMENT, EXTENDED_ARG
 
-    bytes = array('b',code.co_code)
+    bytes = array('b', code.co_code)
     eof = len(code.co_code)
 
     ptr = 0
@@ -107,7 +107,7 @@ def _iter_code(code):
             arg = None
             ptr += 1
 
-        yield op,arg
+        yield op, arg
 
 
 def find_module(module, paths=None):
@@ -117,14 +117,14 @@ def find_module(module, paths=None):
 
     while parts:
         part = parts.pop(0)
-        f, path, (suffix,mode,kind) = info = imp.find_module(part, paths)
+        f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
 
         if kind==PKG_DIRECTORY:
             parts = parts or ['__init__']
             paths = [path]
 
         elif parts:
-            raise ImportError("Can't find %r in %s" % (parts,module))
+            raise ImportError("Can't find %r in %s" % (parts, module))
 
     return info
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index ee85cf5276..f229d726f4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -67,10 +67,10 @@ def check_importable(dist, attr, value):
     try:
         ep = pkg_resources.EntryPoint.parse('x='+value)
         assert not ep.extras
-    except (TypeError,ValueError,AttributeError,AssertionError):
+    except (TypeError, ValueError, AttributeError, AssertionError):
         raise DistutilsSetupError(
             "%r must be importable 'module:attrs' string (got %r)"
-            % (attr,value)
+            % (attr, value)
         )
 
 
@@ -78,15 +78,15 @@ def assert_string_list(dist, attr, value):
     """Verify that value is a string list or None"""
     try:
         assert ''.join(value)!=value
-    except (TypeError,ValueError,AttributeError,AssertionError):
+    except (TypeError, ValueError, AttributeError, AssertionError):
         raise DistutilsSetupError(
-            "%r must be a list of strings (got %r)" % (attr,value)
+            "%r must be a list of strings (got %r)" % (attr, value)
         )
 
 
 def check_nsp(dist, attr, value):
     """Verify that namespace packages are valid"""
-    assert_string_list(dist,attr,value)
+    assert_string_list(dist, attr, value)
     for nsp in value:
         if not dist.has_contents_for(nsp):
             raise DistutilsSetupError(
@@ -105,13 +105,13 @@ def check_nsp(dist, attr, value):
 def check_extras(dist, attr, value):
     """Verify that extras_require mapping is valid"""
     try:
-        for k,v in value.items():
+        for k, v in value.items():
             if ':' in k:
-                k,m = k.split(':',1)
+                k, m = k.split(':', 1)
                 if pkg_resources.invalid_marker(m):
                     raise DistutilsSetupError("Invalid environment marker: "+m)
             list(pkg_resources.parse_requirements(v))
-    except (TypeError,ValueError,AttributeError):
+    except (TypeError, ValueError, AttributeError):
         raise DistutilsSetupError(
             "'extras_require' must be a dictionary whose values are "
             "strings or lists of strings containing valid project/version "
@@ -153,9 +153,9 @@ def check_test_suite(dist, attr, value):
 
 def check_package_data(dist, attr, value):
     """Verify that value is a dictionary of package names to glob lists"""
-    if isinstance(value,dict):
-        for k,v in value.items():
-            if not isinstance(k,str): break
+    if isinstance(value, dict):
+        for k, v in value.items():
+            if not isinstance(k, str): break
             try: iter(v)
             except TypeError:
                 break
@@ -274,12 +274,12 @@ def __init__(self, attrs=None):
         # Make sure we have any eggs needed to interpret 'attrs'
         if attrs is not None:
             self.dependency_links = attrs.pop('dependency_links', [])
-            assert_string_list(self,'dependency_links',self.dependency_links)
+            assert_string_list(self, 'dependency_links', self.dependency_links)
         if attrs and 'setup_requires' in attrs:
             self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
-        _Distribution.__init__(self,attrs)
+        _Distribution.__init__(self, attrs)
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
@@ -311,9 +311,9 @@ def parse_command_line(self):
             self._finalize_features()
         return result
 
-    def _feature_attrname(self,name):
+    def _feature_attrname(self, name):
         """Convert feature name to corresponding option attribute name"""
-        return 'with_'+name.replace('-','_')
+        return 'with_'+name.replace('-', '_')
 
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
@@ -331,7 +331,7 @@ def finalize_options(self):
             self._set_global_opts_from_features()
 
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
-            value = getattr(self,ep.name,None)
+            value = getattr(self, ep.name, None)
             if value is not None:
                 ep.require(installer=self.fetch_build_egg)
                 ep.load()(self, ep.name, value)
@@ -364,7 +364,7 @@ def fetch_build_egg(self, req):
             cmd.package_index.to_scan = []
         except AttributeError:
             from setuptools.command.easy_install import easy_install
-            dist = self.__class__({'script_args':['easy_install']})
+            dist = self.__class__({'script_args': ['easy_install']})
             dist.parse_config_files()
             opts = dist.get_option_dict('easy_install')
             keep = (
@@ -395,8 +395,8 @@ def _set_global_opts_from_features(self):
         go = []
         no = self.negative_opt.copy()
 
-        for name,feature in self.features.items():
-            self._set_feature(name,None)
+        for name, feature in self.features.items():
+            self._set_feature(name, None)
             feature.validate(self)
 
             if feature.optional:
@@ -417,25 +417,25 @@ def _finalize_features(self):
         """Add/remove features and resolve dependencies between them"""
 
         # First, flag all the enabled items (and thus their dependencies)
-        for name,feature in self.features.items():
+        for name, feature in self.features.items():
             enabled = self.feature_is_included(name)
             if enabled or (enabled is None and feature.include_by_default()):
                 feature.include_in(self)
-                self._set_feature(name,1)
+                self._set_feature(name, 1)
 
         # Then disable the rest, so that off-by-default features don't
         # get flagged as errors when they're required by an enabled feature
-        for name,feature in self.features.items():
+        for name, feature in self.features.items():
             if not self.feature_is_included(name):
                 feature.exclude_from(self)
-                self._set_feature(name,0)
+                self._set_feature(name, 0)
 
     def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
             return self.cmdclass[command]
 
-        for ep in pkg_resources.iter_entry_points('distutils.commands',command):
+        for ep in pkg_resources.iter_entry_points('distutils.commands', command):
             ep.require(installer=self.fetch_build_egg)
             self.cmdclass[command] = cmdclass = ep.load()
             return cmdclass
@@ -458,15 +458,15 @@ def get_command_list(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.get_command_list(self)
 
-    def _set_feature(self,name,status):
+    def _set_feature(self, name, status):
         """Set feature's inclusion status"""
-        setattr(self,self._feature_attrname(name),status)
+        setattr(self, self._feature_attrname(name), status)
 
-    def feature_is_included(self,name):
+    def feature_is_included(self, name):
         """Return 1 if feature is included, 0 if excluded, 'None' if unknown"""
-        return getattr(self,self._feature_attrname(name))
+        return getattr(self, self._feature_attrname(name))
 
-    def include_feature(self,name):
+    def include_feature(self, name):
         """Request inclusion of feature named 'name'"""
 
         if self.feature_is_included(name)==0:
@@ -475,9 +475,9 @@ def include_feature(self,name):
                 descr + " is required, but was excluded or is not available"
             )
         self.features[name].include_in(self)
-        self._set_feature(name,1)
+        self._set_feature(name, 1)
 
-    def include(self,**attrs):
+    def include(self, **attrs):
         """Add items to distribution that are named in keyword arguments
 
         For example, 'dist.exclude(py_modules=["x"])' would add 'x' to
@@ -492,14 +492,14 @@ def include(self,**attrs):
         will try to call 'dist._include_foo({"bar":"baz"})', which can then
         handle whatever special inclusion logic is needed.
         """
-        for k,v in attrs.items():
+        for k, v in attrs.items():
             include = getattr(self, '_include_'+k, None)
             if include:
                 include(v)
             else:
-                self._include_misc(k,v)
+                self._include_misc(k, v)
 
-    def exclude_package(self,package):
+    def exclude_package(self, package):
         """Remove packages, modules, and extensions in named package"""
 
         pfx = package+'.'
@@ -521,7 +521,7 @@ def exclude_package(self,package):
                     if p.name != package and not p.name.startswith(pfx)
             ]
 
-    def has_contents_for(self,package):
+    def has_contents_for(self, package):
         """Return true if 'exclude_package(package)' would do something"""
 
         pfx = package+'.'
@@ -530,48 +530,48 @@ def has_contents_for(self,package):
             if p==package or p.startswith(pfx):
                 return True
 
-    def _exclude_misc(self,name,value):
+    def _exclude_misc(self, name, value):
         """Handle 'exclude()' for list/tuple attrs without a special handler"""
-        if not isinstance(value,sequence):
+        if not isinstance(value, sequence):
             raise DistutilsSetupError(
                 "%s: setting must be a list or tuple (%r)" % (name, value)
             )
         try:
-            old = getattr(self,name)
+            old = getattr(self, name)
         except AttributeError:
             raise DistutilsSetupError(
                 "%s: No such distribution setting" % name
             )
-        if old is not None and not isinstance(old,sequence):
+        if old is not None and not isinstance(old, sequence):
             raise DistutilsSetupError(
                 name+": this setting cannot be changed via include/exclude"
             )
         elif old:
-            setattr(self,name,[item for item in old if item not in value])
+            setattr(self, name, [item for item in old if item not in value])
 
-    def _include_misc(self,name,value):
+    def _include_misc(self, name, value):
         """Handle 'include()' for list/tuple attrs without a special handler"""
 
-        if not isinstance(value,sequence):
+        if not isinstance(value, sequence):
             raise DistutilsSetupError(
                 "%s: setting must be a list (%r)" % (name, value)
             )
         try:
-            old = getattr(self,name)
+            old = getattr(self, name)
         except AttributeError:
             raise DistutilsSetupError(
                 "%s: No such distribution setting" % name
             )
         if old is None:
-            setattr(self,name,value)
-        elif not isinstance(old,sequence):
+            setattr(self, name, value)
+        elif not isinstance(old, sequence):
             raise DistutilsSetupError(
                 name+": this setting cannot be changed via include/exclude"
             )
         else:
-            setattr(self,name,old+[item for item in value if item not in old])
+            setattr(self, name, old+[item for item in value if item not in old])
 
-    def exclude(self,**attrs):
+    def exclude(self, **attrs):
         """Remove items from distribution that are named in keyword arguments
 
         For example, 'dist.exclude(py_modules=["x"])' would remove 'x' from
@@ -587,15 +587,15 @@ def exclude(self,**attrs):
         will try to call 'dist._exclude_foo({"bar":"baz"})', which can then
         handle whatever special exclusion logic is needed.
         """
-        for k,v in attrs.items():
+        for k, v in attrs.items():
             exclude = getattr(self, '_exclude_'+k, None)
             if exclude:
                 exclude(v)
             else:
-                self._exclude_misc(k,v)
+                self._exclude_misc(k, v)
 
-    def _exclude_packages(self,packages):
-        if not isinstance(packages,sequence):
+    def _exclude_packages(self, packages):
+        if not isinstance(packages, sequence):
             raise DistutilsSetupError(
                 "packages: setting must be a list or tuple (%r)" % (packages,)
             )
@@ -610,17 +610,17 @@ def _parse_command_opts(self, parser, args):
         command = args[0]
         aliases = self.get_option_dict('aliases')
         while command in aliases:
-            src,alias = aliases[command]
+            src, alias = aliases[command]
             del aliases[command]    # ensure each alias can expand only once!
             import shlex
-            args[:1] = shlex.split(alias,True)
+            args[:1] = shlex.split(alias, True)
             command = args[0]
 
         nargs = _Distribution._parse_command_opts(self, parser, args)
 
         # Handle commands that want to consume all remaining arguments
         cmd_class = self.get_command_class(command)
-        if getattr(cmd_class,'command_consumes_arguments',None):
+        if getattr(cmd_class, 'command_consumes_arguments', None):
             self.get_option_dict(command)['args'] = ("command line", nargs)
             if nargs is not None:
                 return []
@@ -639,20 +639,20 @@ def get_cmdline_options(self):
 
         d = {}
 
-        for cmd,opts in self.command_options.items():
+        for cmd, opts in self.command_options.items():
 
-            for opt,(src,val) in opts.items():
+            for opt, (src, val) in opts.items():
 
                 if src != "command line":
                     continue
 
-                opt = opt.replace('_','-')
+                opt = opt.replace('_', '-')
 
                 if val==0:
                     cmdobj = self.get_command_obj(cmd)
                     neg_opt = self.negative_opt.copy()
-                    neg_opt.update(getattr(cmdobj,'negative_opt',{}))
-                    for neg,pos in neg_opt.items():
+                    neg_opt.update(getattr(cmdobj, 'negative_opt', {}))
+                    for neg, pos in neg_opt.items():
                         if pos==opt:
                             opt=neg
                             val=None
@@ -663,7 +663,7 @@ def get_cmdline_options(self):
                 elif val==1:
                     val = None
 
-                d.setdefault(cmd,{})[opt] = val
+                d.setdefault(cmd, {})[opt] = val
 
         return d
 
@@ -677,7 +677,7 @@ def iter_distribution_names(self):
             yield module
 
         for ext in self.ext_modules or ():
-            if isinstance(ext,tuple):
+            if isinstance(ext, tuple):
                 name, buildinfo = ext
             else:
                 name = ext.name
@@ -800,16 +800,16 @@ def __init__(self, description, standard=False, available=True,
         self.standard = standard
         self.available = available
         self.optional = optional
-        if isinstance(require_features,(str,Require)):
+        if isinstance(require_features, (str, Require)):
             require_features = require_features,
 
         self.require_features = [
-            r for r in require_features if isinstance(r,str)
+            r for r in require_features if isinstance(r, str)
         ]
-        er = [r for r in require_features if not isinstance(r,str)]
+        er = [r for r in require_features if not isinstance(r, str)]
         if er: extras['require_features'] = er
 
-        if isinstance(remove,str):
+        if isinstance(remove, str):
             remove = remove,
         self.remove = remove
         self.extras = extras
@@ -824,7 +824,7 @@ def include_by_default(self):
         """Should this feature be included by default?"""
         return self.available and self.standard
 
-    def include_in(self,dist):
+    def include_in(self, dist):
         """Ensure feature and its requirements are included in distribution
 
         You may override this in a subclass to perform additional operations on
@@ -844,7 +844,7 @@ def include_in(self,dist):
         for f in self.require_features:
             dist.include_feature(f)
 
-    def exclude_from(self,dist):
+    def exclude_from(self, dist):
         """Ensure feature is excluded from distribution
 
         You may override this in a subclass to perform additional operations on
@@ -859,7 +859,7 @@ def exclude_from(self,dist):
             for item in self.remove:
                 dist.exclude_package(item)
 
-    def validate(self,dist):
+    def validate(self, dist):
         """Verify that feature makes sense in context of distribution
 
         This method is called by the distribution just before it parses its
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e9b304b19d..f3ee5ec0a1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -37,7 +37,7 @@
     '<a href="([^"#]+)">([^<]+)</a>\n\s+\\(<a (?:title="MD5 hash"\n\s+)'
     'href="[^?]+\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\\)'
 )
-URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match
+URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):', re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
 
 __all__ = [
@@ -62,18 +62,18 @@ def parse_bdist_wininst(name):
         if lower.endswith('.win32.exe'):
             base = name[:-10]
             plat = 'win32'
-        elif lower.startswith('.win32-py',-16):
+        elif lower.startswith('.win32-py', -16):
             py_ver = name[-7:-4]
             base = name[:-16]
             plat = 'win32'
         elif lower.endswith('.win-amd64.exe'):
             base = name[:-14]
             plat = 'win-amd64'
-        elif lower.startswith('.win-amd64-py',-20):
+        elif lower.startswith('.win-amd64-py', -20):
             py_ver = name[-7:-4]
             base = name[:-20]
             plat = 'win-amd64'
-    return base,py_ver,plat
+    return base, py_ver, plat
 
 
 def egg_info_for_url(url):
@@ -82,8 +82,8 @@ def egg_info_for_url(url):
     base = urllib.parse.unquote(path.split('/')[-1])
     if server=='sourceforge.net' and base=='download':    # XXX Yuck
         base = urllib.parse.unquote(path.split('/')[-2])
-    if '#' in base: base, fragment = base.split('#',1)
-    return base,fragment
+    if '#' in base: base, fragment = base.split('#', 1)
+    return base, fragment
 
 
 def distros_for_url(url, metadata=None):
@@ -155,7 +155,7 @@ def interpret_distro_name(
         # it is a bdist_dumb, not an sdist -- bail out
         return
 
-    for p in range(1,len(parts)+1):
+    for p in range(1, len(parts)+1):
         yield Distribution(
             location, metadata, '-'.join(parts[:p]), '-'.join(parts[p:]),
             py_version=py_version, precedence = precedence,
@@ -209,7 +209,7 @@ def find_external_links(url, page):
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
         if pos!=-1:
-            match = HREF.search(page,pos)
+            match = HREF.search(page, pos)
             if match:
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
@@ -279,12 +279,12 @@ def __init__(
             self, index_url="https://pypi.python.org/simple", hosts=('*',),
             ca_bundle=None, verify_ssl=True, *args, **kw
             ):
-        Environment.__init__(self,*args,**kw)
+        Environment.__init__(self, *args, **kw)
         self.index_url = index_url + "/"[:not index_url.endswith('/')]
         self.scanned_urls = {}
         self.fetched_urls = {}
         self.package_pages = {}
-        self.allows = re.compile('|'.join(map(translate,hosts))).match
+        self.allows = re.compile('|'.join(map(translate, hosts))).match
         self.to_scan = []
         if verify_ssl and ssl_support.is_available and (ca_bundle or ssl_support.find_ca_bundle()):
             self.opener = ssl_support.opener_for(ca_bundle)
@@ -335,7 +335,7 @@ def process_url(self, url, retrieve=False):
         for match in HREF.finditer(page):
             link = urllib.parse.urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
-        if url.startswith(self.index_url) and getattr(f,'code',None)!=404:
+        if url.startswith(self.index_url) and getattr(f, 'code', None)!=404:
             page = self.process_index(url, page)
 
     def process_filename(self, fn, nested=False):
@@ -347,7 +347,7 @@ def process_filename(self, fn, nested=False):
         if os.path.isdir(fn) and not nested:
             path = os.path.realpath(fn)
             for item in os.listdir(path):
-                self.process_filename(os.path.join(path,item), True)
+                self.process_filename(os.path.join(path, item), True)
 
         dists = distros_for_filename(fn)
         if dists:
@@ -391,7 +391,7 @@ def scan_egg_link(self, path, entry):
             dist.precedence = SOURCE_DIST
             self.add(dist)
 
-    def process_index(self,url,page):
+    def process_index(self, url, page):
         """Process the contents of a PyPI page"""
         def scan(link):
             # Process a URL to see if it's for a package page
@@ -403,7 +403,7 @@ def scan(link):
                     # it's a package page, sanitize and index it
                     pkg = safe_name(parts[0])
                     ver = safe_version(parts[1])
-                    self.package_pages.setdefault(pkg.lower(),{})[link] = True
+                    self.package_pages.setdefault(pkg.lower(), {})[link] = True
                     return to_filename(pkg), to_filename(ver)
             return None, None
 
@@ -422,13 +422,13 @@ def scan(link):
                 base, frag = egg_info_for_url(new_url)
                 if base.endswith('.py') and not frag:
                     if ver:
-                        new_url+='#egg=%s-%s' % (pkg,ver)
+                        new_url+='#egg=%s-%s' % (pkg, ver)
                     else:
                         self.need_version_info(url)
                 self.scan_url(new_url)
 
             return PYPI_MD5.sub(
-                lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1,3,2), page
+                lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1, 3, 2), page
             )
         else:
             return ""   # no sense double-scanning non-package pages
@@ -441,7 +441,7 @@ def need_version_info(self, url):
 
     def scan_all(self, msg=None, *args):
         if self.index_url not in self.fetched_urls:
-            if msg: self.warn(msg,*args)
+            if msg: self.warn(msg, *args)
             self.info(
                 "Scanning index of all packages (this may take a while)"
             )
@@ -458,7 +458,7 @@ def find_packages(self, requirement):
             # We couldn't find the target package, so search the index page too
             self.not_found_in_index(requirement)
 
-        for url in list(self.package_pages.get(requirement.key,())):
+        for url in list(self.package_pages.get(requirement.key, ())):
             # scan each page that might be related to the desired package
             self.scan_url(url)
 
@@ -469,7 +469,7 @@ def obtain(self, requirement, installer=None):
             if dist in requirement:
                 return dist
             self.debug("%s does not match %s", requirement, dist)
-        return super(PackageIndex, self).obtain(requirement,installer)
+        return super(PackageIndex, self).obtain(requirement, installer)
 
     def check_hash(self, checker, filename, tfp):
         """
@@ -534,14 +534,14 @@ def download(self, spec, tmpdir):
         of `tmpdir`, and the local filename is returned.  Various errors may be
         raised if a problem occurs during downloading.
         """
-        if not isinstance(spec,Requirement):
+        if not isinstance(spec, Requirement):
             scheme = URL_SCHEME(spec)
             if scheme:
                 # It's a url, download it to tmpdir
                 found = self._download_url(scheme.group(1), spec, tmpdir)
                 base, fragment = egg_info_for_url(spec)
                 if base.endswith('.py'):
-                    found = self.gen_setup(found,fragment,tmpdir)
+                    found = self.gen_setup(found, fragment, tmpdir)
                 return found
             elif os.path.exists(spec):
                 # Existing file or directory, just return it
@@ -554,7 +554,7 @@ def download(self, spec, tmpdir):
                         "Not a URL, existing file, or requirement spec: %r" %
                         (spec,)
                     )
-        return getattr(self.fetch_distribution(spec, tmpdir),'location',None)
+        return getattr(self.fetch_distribution(spec, tmpdir), 'location', None)
 
     def fetch_distribution(
             self, requirement, tmpdir, force_scan=False, source=False,
@@ -590,7 +590,7 @@ def find(req, env=None):
 
                 if dist.precedence==DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
-                        self.warn("Skipping development or system egg: %s",dist)
+                        self.warn("Skipping development or system egg: %s", dist)
                         skipped[dist] = 1
                     continue
 
@@ -632,7 +632,7 @@ def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         ``location`` of the downloaded distribution instead of a distribution
         object.
         """
-        dist = self.fetch_distribution(requirement,tmpdir,force_scan,source)
+        dist = self.fetch_distribution(requirement, tmpdir, force_scan, source)
         if dist is not None:
             return dist.location
         return None
@@ -670,7 +670,7 @@ def gen_setup(self, filename, fragment, tmpdir):
             raise DistutilsError(
                 "Can't unambiguously interpret project/version identifier %r; "
                 "any dashes in the name or version should be escaped using "
-                "underscores. %r" % (fragment,dists)
+                "underscores. %r" % (fragment, dists)
             )
         else:
             raise DistutilsError(
@@ -689,7 +689,7 @@ def _download_to(self, url, filename):
             fp = self.open_url(strip_fragment(url))
             if isinstance(fp, urllib.error.HTTPError):
                 raise DistutilsError(
-                    "Can't download %s: %s %s" % (url, fp.code,fp.msg)
+                    "Can't download %s: %s %s" % (url, fp.code, fp.msg)
                 )
             headers = fp.info()
             blocknum = 0
@@ -700,7 +700,7 @@ def _download_to(self, url, filename):
                 sizes = get_all_headers(headers, 'Content-Length')
                 size = max(map(int, sizes))
                 self.reporthook(url, filename, blocknum, bs, size)
-            with open(filename,'wb') as tfp:
+            with open(filename, 'wb') as tfp:
                 while True:
                     block = fp.read(bs)
                     if block:
@@ -759,14 +759,14 @@ def _download_url(self, scheme, url, tmpdir):
         name, fragment = egg_info_for_url(url)
         if name:
             while '..' in name:
-                name = name.replace('..','.').replace('\\','_')
+                name = name.replace('..', '.').replace('\\', '_')
         else:
             name = "__downloaded__"    # default if URL has no path contents
 
         if name.endswith('.egg.zip'):
             name = name[:-4]    # strip the extra .zip before download
 
-        filename = os.path.join(tmpdir,name)
+        filename = os.path.join(tmpdir, name)
 
         # Download the file
         #
@@ -787,7 +787,7 @@ def scan_url(self, url):
 
     def _attempt_download(self, url, filename):
         headers = self._download_to(url, filename)
-        if 'html' in headers.get('content-type','').lower():
+        if 'html' in headers.get('content-type', '').lower():
             return self._download_html(url, headers, filename)
         else:
             return filename
@@ -808,16 +808,16 @@ def _download_html(self, url, headers, filename):
         raise DistutilsError("Unexpected HTML page found at "+url)
 
     def _download_svn(self, url, filename):
-        url = url.split('#',1)[0]   # remove any fragment for svn's sake
+        url = url.split('#', 1)[0]   # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
             scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
-                netloc, path = path[2:].split('/',1)
+                netloc, path = path[2:].split('/', 1)
                 auth, host = splituser(netloc)
                 if auth:
                     if ':' in auth:
-                        user, pw = auth.split(':',1)
+                        user, pw = auth.split(':', 1)
                         creds = " --username=%s --password=%s" % (user, pw)
                     else:
                         creds = " --username="+auth
@@ -835,7 +835,7 @@ def _vcs_split_rev_from_url(url, pop_prefix=False):
         scheme = scheme.split('+', 1)[-1]
 
         # Some fragment identification fails
-        path = path.split('#',1)[0]
+        path = path.split('#', 1)[0]
 
         rev = None
         if '@' in path:
@@ -847,7 +847,7 @@ def _vcs_split_rev_from_url(url, pop_prefix=False):
         return url, rev
 
     def _download_git(self, url, filename):
-        filename = filename.split('#',1)[0]
+        filename = filename.split('#', 1)[0]
         url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
 
         self.info("Doing git clone from %s to %s", url, filename)
@@ -863,7 +863,7 @@ def _download_git(self, url, filename):
         return filename
 
     def _download_hg(self, url, filename):
-        filename = filename.split('#',1)[0]
+        filename = filename.split('#', 1)[0]
         url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
 
         self.info("Doing hg clone from %s to %s", url, filename)
@@ -948,7 +948,7 @@ def _encode_auth(auth):
     # convert back to a string
     encoded = encoded_bytes.decode()
     # strip the trailing carriage return
-    return encoded.replace('\n','')
+    return encoded.replace('\n', '')
 
 
 class Credential(object):
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 74ec3980e1..7c60c90ea5 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -19,5 +19,5 @@ def strip_fragment(url):
     url, fragment = splittag(url)
     return url
 
-if sys.version_info >= (2,7):
+if sys.version_info >= (2, 7):
     strip_fragment = lambda x: x
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 83c3afdb36..c6bab096d0 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -238,7 +238,7 @@ def run_setup(setup_script, args):
             sys.path.insert(0, setup_dir)
             # reset to include setup dir, w/clean callback list
             working_set.__init__()
-            working_set.callbacks.append(lambda dist:dist.activate())
+            working_set.callbacks.append(lambda dist: dist.activate())
 
             def runner():
                 ns = dict(__file__=setup_script, __name__='__main__')
@@ -258,12 +258,12 @@ class AbstractSandbox:
     def __init__(self):
         self._attrs = [
             name for name in dir(_os)
-                if not name.startswith('_') and hasattr(self,name)
+                if not name.startswith('_') and hasattr(self, name)
         ]
 
     def _copy(self, source):
         for name in self._attrs:
-            setattr(os, name, getattr(source,name))
+            setattr(os, name, getattr(source, name))
 
     def run(self, func):
         """Run 'func' under os sandboxing"""
@@ -282,24 +282,24 @@ def run(self, func):
             self._copy(_os)
 
     def _mk_dual_path_wrapper(name):
-        original = getattr(_os,name)
+        original = getattr(_os, name)
 
-        def wrap(self,src,dst,*args,**kw):
+        def wrap(self, src, dst, *args, **kw):
             if self._active:
-                src,dst = self._remap_pair(name,src,dst,*args,**kw)
-            return original(src,dst,*args,**kw)
+                src, dst = self._remap_pair(name, src, dst, *args, **kw)
+            return original(src, dst, *args, **kw)
         return wrap
 
     for name in ["rename", "link", "symlink"]:
-        if hasattr(_os,name): locals()[name] = _mk_dual_path_wrapper(name)
+        if hasattr(_os, name): locals()[name] = _mk_dual_path_wrapper(name)
 
     def _mk_single_path_wrapper(name, original=None):
-        original = original or getattr(_os,name)
+        original = original or getattr(_os, name)
 
-        def wrap(self,path,*args,**kw):
+        def wrap(self, path, *args, **kw):
             if self._active:
-                path = self._remap_input(name,path,*args,**kw)
-            return original(path,*args,**kw)
+                path = self._remap_input(name, path, *args, **kw)
+            return original(path, *args, **kw)
         return wrap
 
     if _file:
@@ -310,51 +310,51 @@ def wrap(self,path,*args,**kw):
         "remove", "unlink", "rmdir", "utime", "lchown", "chroot", "lstat",
         "startfile", "mkfifo", "mknod", "pathconf", "access"
     ]:
-        if hasattr(_os,name): locals()[name] = _mk_single_path_wrapper(name)
+        if hasattr(_os, name): locals()[name] = _mk_single_path_wrapper(name)
 
     def _mk_single_with_return(name):
-        original = getattr(_os,name)
+        original = getattr(_os, name)
 
-        def wrap(self,path,*args,**kw):
+        def wrap(self, path, *args, **kw):
             if self._active:
-                path = self._remap_input(name,path,*args,**kw)
-                return self._remap_output(name, original(path,*args,**kw))
-            return original(path,*args,**kw)
+                path = self._remap_input(name, path, *args, **kw)
+                return self._remap_output(name, original(path, *args, **kw))
+            return original(path, *args, **kw)
         return wrap
 
     for name in ['readlink', 'tempnam']:
-        if hasattr(_os,name): locals()[name] = _mk_single_with_return(name)
+        if hasattr(_os, name): locals()[name] = _mk_single_with_return(name)
 
     def _mk_query(name):
-        original = getattr(_os,name)
+        original = getattr(_os, name)
 
-        def wrap(self,*args,**kw):
-            retval = original(*args,**kw)
+        def wrap(self, *args, **kw):
+            retval = original(*args, **kw)
             if self._active:
                 return self._remap_output(name, retval)
             return retval
         return wrap
 
     for name in ['getcwd', 'tmpnam']:
-        if hasattr(_os,name): locals()[name] = _mk_query(name)
+        if hasattr(_os, name): locals()[name] = _mk_query(name)
 
-    def _validate_path(self,path):
+    def _validate_path(self, path):
         """Called to remap or validate any path, whether input or output"""
         return path
 
-    def _remap_input(self,operation,path,*args,**kw):
+    def _remap_input(self, operation, path, *args, **kw):
         """Called for path inputs"""
         return self._validate_path(path)
 
-    def _remap_output(self,operation,path):
+    def _remap_output(self, operation, path):
         """Called for path outputs"""
         return self._validate_path(path)
 
-    def _remap_pair(self,operation,src,dst,*args,**kw):
+    def _remap_pair(self, operation, src, dst, *args, **kw):
         """Called for path pairs like rename, link, and symlink operations"""
         return (
-            self._remap_input(operation+'-from',src,*args,**kw),
-            self._remap_input(operation+'-to',dst,*args,**kw)
+            self._remap_input(operation+'-from', src, *args, **kw),
+            self._remap_input(operation+'-to', dst, *args, **kw)
         )
 
 
@@ -388,7 +388,7 @@ class DirectorySandbox(AbstractSandbox):
 
     def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
-        self._prefix = os.path.join(self._sandbox,'')
+        self._prefix = os.path.join(self._sandbox, '')
         self._exceptions = [
             os.path.normcase(os.path.realpath(path))
             for path in exceptions
@@ -403,12 +403,12 @@ def _violation(self, operation, *args, **kw):
         def _file(self, path, mode='r', *args, **kw):
             if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
                 self._violation("file", path, mode, *args, **kw)
-            return _file(path,mode,*args,**kw)
+            return _file(path, mode, *args, **kw)
 
     def _open(self, path, mode='r', *args, **kw):
         if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
             self._violation("open", path, mode, *args, **kw)
-        return _open(path,mode,*args,**kw)
+        return _open(path, mode, *args, **kw)
 
     def tmpnam(self):
         self._violation("tmpnam")
@@ -448,13 +448,13 @@ def _remap_pair(self, operation, src, dst, *args, **kw):
         """Called for path pairs like rename, link, and symlink operations"""
         if not self._ok(src) or not self._ok(dst):
             self._violation(operation, src, dst, *args, **kw)
-        return (src,dst)
+        return (src, dst)
 
     def open(self, file, flags, mode=0o777, *args, **kw):
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode, *args, **kw)
-        return _os.open(file,flags,mode, *args, **kw)
+        return _os.open(file, flags, mode, *args, **kw)
 
 WRITE_FLAGS = functools.reduce(
     operator.or_, [getattr(_os, a, 0) for a in
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index c2168019ad..159d254e3b 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -7,7 +7,7 @@ def __boot():
     else:
         PYTHONPATH = PYTHONPATH.split(os.pathsep)
 
-    pic = getattr(sys,'path_importer_cache',{})
+    pic = getattr(sys, 'path_importer_cache', {})
     stdpath = sys.path[len(PYTHONPATH):]
     mydir = os.path.dirname(__file__)
     #print "searching",stdpath,sys.path
@@ -25,14 +25,14 @@ def __boot():
         else:
             try:
                 import imp # Avoid import loop in Python >= 3.3
-                stream, path, descr = imp.find_module('site',[item])
+                stream, path, descr = imp.find_module('site', [item])
             except ImportError:
                 continue
             if stream is None:
                 continue
             try:
                 # This should actually reload the current module
-                imp.load_module('site',stream,path,descr)
+                imp.load_module('site', stream, path, descr)
             finally:
                 stream.close()
             break
@@ -41,9 +41,9 @@ def __boot():
 
     #print "loaded", __file__
 
-    known_paths = dict([(makepath(item)[1],1) for item in sys.path]) # 2.2 comp
+    known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp
 
-    oldpos = getattr(sys,'__egginsert',0)   # save old insertion position
+    oldpos = getattr(sys, '__egginsert', 0)   # save old insertion position
     sys.__egginsert = 0                     # and reset the current one
 
     for item in PYTHONPATH:
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 569b060f09..50a4fff80a 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -27,7 +27,7 @@ def makeSetup(**args):
     distutils.core._setup_stop_after = "commandline"
 
     # Don't let system command line leak into tests!
-    args.setdefault('script_args',['install'])
+    args.setdefault('script_args', ['install'])
 
     try:
         return setuptools.setup(**args)
@@ -56,35 +56,35 @@ def f1():
         fc = six.get_function_code(f1)
 
         # unrecognized name
-        assert dep.extract_constant(fc,'q', -1) is None
+        assert dep.extract_constant(fc, 'q', -1) is None
 
         # constant assigned
-        dep.extract_constant(fc,'x', -1) == "test"
+        dep.extract_constant(fc, 'x', -1) == "test"
 
         # expression assigned
-        dep.extract_constant(fc,'y', -1) == -1
+        dep.extract_constant(fc, 'y', -1) == -1
 
         # recognized name, not assigned
-        dep.extract_constant(fc,'z', -1) is None
+        dep.extract_constant(fc, 'z', -1) is None
 
     def testFindModule(self):
         with pytest.raises(ImportError):
             dep.find_module('no-such.-thing')
         with pytest.raises(ImportError):
             dep.find_module('setuptools.non-existent')
-        f,p,i = dep.find_module('setuptools.tests')
+        f, p, i = dep.find_module('setuptools.tests')
         f.close()
 
     @needs_bytecode
     def testModuleExtract(self):
         from email import __version__
-        assert dep.get_module_constant('email','__version__') == __version__
-        assert dep.get_module_constant('sys','version') == sys.version
-        assert dep.get_module_constant('setuptools.tests','__doc__') == __doc__
+        assert dep.get_module_constant('email', '__version__') == __version__
+        assert dep.get_module_constant('sys', 'version') == sys.version
+        assert dep.get_module_constant('setuptools.tests', '__doc__') == __doc__
 
     @needs_bytecode
     def testRequire(self):
-        req = Require('Email','1.0.3','email')
+        req = Require('Email', '1.0.3', 'email')
 
         assert req.name == 'Email'
         assert req.module == 'email'
@@ -101,12 +101,12 @@ def testRequire(self):
         assert req.is_present()
         assert req.is_current()
 
-        req = Require('Email 3000','03000','email',format=LooseVersion)
+        req = Require('Email 3000', '03000', 'email', format=LooseVersion)
         assert req.is_present()
         assert not req.is_current()
         assert not req.version_ok('unknown')
 
-        req = Require('Do-what-I-mean','1.0','d-w-i-m')
+        req = Require('Do-what-I-mean', '1.0', 'd-w-i-m')
         assert not req.is_present()
         assert not req.is_current()
 
@@ -125,22 +125,22 @@ def testRequire(self):
 class TestDistro:
 
     def setup_method(self, method):
-        self.e1 = Extension('bar.ext',['bar.c'])
+        self.e1 = Extension('bar.ext', ['bar.c'])
         self.e2 = Extension('c.y', ['y.c'])
 
         self.dist = makeSetup(
             packages=['a', 'a.b', 'a.b.c', 'b', 'c'],
-            py_modules=['b.d','x'],
+            py_modules=['b.d', 'x'],
             ext_modules = (self.e1, self.e2),
             package_dir = {},
         )
 
     def testDistroType(self):
-        assert isinstance(self.dist,setuptools.dist.Distribution)
+        assert isinstance(self.dist, setuptools.dist.Distribution)
 
     def testExcludePackage(self):
         self.dist.exclude_package('a')
-        assert self.dist.packages == ['b','c']
+        assert self.dist.packages == ['b', 'c']
 
         self.dist.exclude_package('b')
         assert self.dist.packages == ['c']
@@ -169,7 +169,7 @@ def testIncludeExclude(self):
         assert self.dist.ext_modules == [self.e2, self.e1]
 
     def testExcludePackages(self):
-        self.dist.exclude(packages=['c','b','a'])
+        self.dist.exclude(packages=['c', 'b', 'a'])
         assert self.dist.packages == []
         assert self.dist.py_modules == ['x']
         assert self.dist.ext_modules == [self.e1]
@@ -199,13 +199,13 @@ def testInvalidIncludeExclude(self):
         with pytest.raises(DistutilsSetupError):
             self.dist.exclude(nonexistent_option='x')
         with pytest.raises(DistutilsSetupError):
-            self.dist.include(packages={'x':'y'})
+            self.dist.include(packages={'x': 'y'})
         with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(packages={'x':'y'})
+            self.dist.exclude(packages={'x': 'y'})
         with pytest.raises(DistutilsSetupError):
-            self.dist.include(ext_modules={'x':'y'})
+            self.dist.include(ext_modules={'x': 'y'})
         with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(ext_modules={'x':'y'})
+            self.dist.exclude(ext_modules={'x': 'y'})
 
         with pytest.raises(DistutilsSetupError):
             self.dist.include(package_dir=['q'])
@@ -216,31 +216,31 @@ def testInvalidIncludeExclude(self):
 class TestFeatures:
 
     def setup_method(self, method):
-        self.req = Require('Distutils','1.0.3','distutils')
+        self.req = Require('Distutils', '1.0.3', 'distutils')
         self.dist = makeSetup(
             features={
-                'foo': Feature("foo",standard=True,require_features=['baz',self.req]),
+                'foo': Feature("foo", standard=True, require_features=['baz', self.req]),
                 'bar': Feature("bar",  standard=True, packages=['pkg.bar'],
                                py_modules=['bar_et'], remove=['bar.ext'],
                        ),
                 'baz': Feature(
                         "baz", optional=False, packages=['pkg.baz'],
                         scripts = ['scripts/baz_it'],
-                        libraries=[('libfoo','foo/foofoo.c')]
+                        libraries=[('libfoo', 'foo/foofoo.c')]
                        ),
                 'dwim': Feature("DWIM", available=False, remove='bazish'),
             },
             script_args=['--without-bar', 'install'],
             packages = ['pkg.bar', 'pkg.foo'],
             py_modules = ['bar_et', 'bazish'],
-            ext_modules = [Extension('bar.ext',['bar.c'])]
+            ext_modules = [Extension('bar.ext', ['bar.c'])]
         )
 
     def testDefaults(self):
         assert not Feature(
-            "test",standard=True,remove='x',available=False
+            "test", standard=True, remove='x', available=False
         ).include_by_default()
-        assert Feature("test",standard=True,remove='x').include_by_default()
+        assert Feature("test", standard=True, remove='x').include_by_default()
         # Feature must have either kwargs, removes, or require_features
         with pytest.raises(DistutilsSetupError):
             Feature("test")
@@ -252,16 +252,16 @@ def testAvailability(self):
     def testFeatureOptions(self):
         dist = self.dist
         assert (
-            ('with-dwim',None,'include DWIM') in dist.feature_options
+            ('with-dwim', None, 'include DWIM') in dist.feature_options
         )
         assert (
-            ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
+            ('without-dwim', None, 'exclude DWIM (default)') in dist.feature_options
         )
         assert (
-            ('with-bar',None,'include bar (default)') in dist.feature_options
+            ('with-bar', None, 'include bar (default)') in dist.feature_options
         )
         assert (
-            ('without-bar',None,'exclude bar') in dist.feature_options
+            ('without-bar', None, 'exclude bar') in dist.feature_options
         )
         assert dist.feature_negopt['without-foo'] == 'with-foo'
         assert dist.feature_negopt['without-bar'] == 'with-bar'
@@ -277,7 +277,7 @@ def testUseFeatures(self):
         assert (not 'pkg.bar' in dist.packages)
         assert ('pkg.baz' in dist.packages)
         assert ('scripts/baz_it' in dist.scripts)
-        assert (('libfoo','foo/foofoo.c') in dist.libraries)
+        assert (('libfoo', 'foo/foofoo.c') in dist.libraries)
         assert dist.ext_modules == []
         assert dist.require_features == [self.req]
 
@@ -288,7 +288,7 @@ def testUseFeatures(self):
 
     def testFeatureWithInvalidRemove(self):
         with pytest.raises(SystemExit):
-            makeSetup(features={'x':Feature('x', remove='y')})
+            makeSetup(features={'x': Feature('x', remove='y')})
 
 
 class TestCommandTests:
@@ -298,7 +298,7 @@ def testTestIsCommand(self):
         assert (isinstance(test_cmd, distutils.cmd.Command))
 
     def testLongOptSuiteWNoDefault(self):
-        ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite'])
+        ts1 = makeSetup(script_args=['test', '--test-suite=foo.tests.suite'])
         ts1 = ts1.get_command_obj('test')
         ts1.ensure_finalized()
         assert ts1.test_suite == 'foo.tests.suite'
@@ -311,7 +311,7 @@ def testDefaultSuite(self):
     def testDefaultWModuleOnCmdLine(self):
         ts3 = makeSetup(
             test_suite='bar.tests',
-            script_args=['test','-m','foo.tests']
+            script_args=['test', '-m', 'foo.tests']
         ).get_command_obj('test')
         ts3.ensure_finalized()
         assert ts3.test_module == 'foo.tests'
@@ -319,7 +319,7 @@ def testDefaultWModuleOnCmdLine(self):
 
     def testConflictingOptions(self):
         ts4 = makeSetup(
-            script_args=['test','-m','bar.tests', '-s','foo.tests.suite']
+            script_args=['test', '-m', 'bar.tests', '-s', 'foo.tests.suite']
         ).get_command_obj('test')
         with pytest.raises(DistutilsOptionError):
             ts4.ensure_finalized()
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index ae28c7c36e..535ae10766 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -10,7 +10,7 @@
 
 
 @contextlib.contextmanager
-def tempdir(cd=lambda dir:None, **kwargs):
+def tempdir(cd=lambda dir: None, **kwargs):
     temp_dir = tempfile.mkdtemp(**kwargs)
     orig_dir = os.getcwd()
     try:
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 65e7243d65..df51b04fd1 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -32,7 +32,7 @@ def can_symlink():
 def has_symlink():
     bad_symlink = (
         # Windows symlink directory detection is broken on Python 3.2
-        platform.system() == 'Windows' and sys.version_info[:2] == (3,2)
+        platform.system() == 'Windows' and sys.version_info[:2] == (3, 2)
     )
     return can_symlink() and not bad_symlink
 

From 39bcc16e47957bea4178a27f2ef872a78276ff40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Jul 2016 00:58:42 -0400
Subject: [PATCH 5896/8469] Remove commented code

---
 setuptools/site-patch.py          | 3 ---
 setuptools/tests/test_build_py.py | 1 -
 2 files changed, 4 deletions(-)

diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 680e93551d..3e89ef2fea 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -10,7 +10,6 @@ def __boot():
     pic = getattr(sys, 'path_importer_cache', {})
     stdpath = sys.path[len(PYTHONPATH):]
     mydir = os.path.dirname(__file__)
-    # print "searching",stdpath,sys.path
 
     for item in stdpath:
         if item==mydir or not item:
@@ -39,8 +38,6 @@ def __boot():
     else:
         raise ImportError("Couldn't find the real 'site' module")
 
-    # print "loaded", __file__
-
     known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp
 
     oldpos = getattr(sys, '__egginsert', 0)   # save old insertion position
diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index 860c569c2e..cc701ae67f 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -26,6 +26,5 @@ def test_directories_in_package_data_glob(tmpdir_as_cwd):
         package_data={'': ['path/*']},
     ))
     os.makedirs('path/subpath')
-    # with contexts.quiet():
     dist.parse_command_line()
     dist.run_commands()

From dc2d1dc249bec8e3a864e2aa6002a8e27adc4b7c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 12:11:49 +0700
Subject: [PATCH 5897/8469] Fix missing whitespace around operator.

---
 pavement.py                           |  2 +-
 setuptools/depends.py                 | 20 +++++------
 setuptools/dist.py                    | 48 +++++++++++++--------------
 setuptools/lib2to3_ex.py              |  2 +-
 setuptools/package_index.py           | 40 +++++++++++-----------
 setuptools/py31compat.py              |  2 +-
 setuptools/sandbox.py                 |  6 ++--
 setuptools/site-patch.py              |  8 ++---
 setuptools/ssl_support.py             |  2 +-
 setuptools/tests/test_bdist_egg.py    |  4 +--
 setuptools/tests/test_easy_install.py |  4 +--
 setuptools/tests/test_packageindex.py |  2 +-
 12 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/pavement.py b/pavement.py
index f620c790d8..3d8400865f 100644
--- a/pavement.py
+++ b/pavement.py
@@ -17,7 +17,7 @@ def update_vendored():
     remove_all(vendor.glob('pyparsing*'))
     install_args = [
         'install',
-        '-r', str(vendor/'vendored.txt'),
+        '-r', str(vendor / 'vendored.txt'),
         '-t', str(vendor),
     ]
     pip.main(install_args)
diff --git a/setuptools/depends.py b/setuptools/depends.py
index eb1d7b13ff..01f4a23a02 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -89,16 +89,16 @@ def _iter_code(code):
     ptr = 0
     extended_arg = 0
 
-    while ptr<eof:
+    while ptr < eof:
 
         op = bytes[ptr]
 
-        if op>=HAVE_ARGUMENT:
+        if op >= HAVE_ARGUMENT:
 
-            arg = bytes[ptr+1] + bytes[ptr+2]*256 + extended_arg
+            arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
             ptr += 3
 
-            if op==EXTENDED_ARG:
+            if op == EXTENDED_ARG:
                 long_type = six.integer_types[-1]
                 extended_arg = arg * long_type(65536)
                 continue
@@ -119,7 +119,7 @@ def find_module(module, paths=None):
         part = parts.pop(0)
         f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
 
-        if kind==PKG_DIRECTORY:
+        if kind == PKG_DIRECTORY:
             parts = parts or ['__init__']
             paths = [path]
 
@@ -143,12 +143,12 @@ def get_module_constant(module, symbol, default=-1, paths=None):
         return None
 
     try:
-        if kind==PY_COMPILED:
+        if kind == PY_COMPILED:
             f.read(8)   # skip magic & date
             code = marshal.load(f)
-        elif kind==PY_FROZEN:
+        elif kind == PY_FROZEN:
             code = imp.get_frozen_object(module)
-        elif kind==PY_SOURCE:
+        elif kind == PY_SOURCE:
             code = compile(f.read(), path, 'exec')
         else:
             # Not something we can parse; we'll have to import it.  :(
@@ -190,9 +190,9 @@ def extract_constant(code, symbol, default=-1):
 
     for op, arg in _iter_code(code):
 
-        if op==LOAD_CONST:
+        if op == LOAD_CONST:
             const = code.co_consts[arg]
-        elif arg==name_idx and (op==STORE_NAME or op==STORE_GLOBAL):
+        elif arg == name_idx and (op == STORE_NAME or op == STORE_GLOBAL):
             return const
         else:
             const = default
diff --git a/setuptools/dist.py b/setuptools/dist.py
index f229d726f4..b4ff3861fe 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -65,7 +65,7 @@ def write_pkg_info(self, base_dir):
 
 def check_importable(dist, attr, value):
     try:
-        ep = pkg_resources.EntryPoint.parse('x='+value)
+        ep = pkg_resources.EntryPoint.parse('x=' + value)
         assert not ep.extras
     except (TypeError, ValueError, AttributeError, AssertionError):
         raise DistutilsSetupError(
@@ -77,7 +77,7 @@ def check_importable(dist, attr, value):
 def assert_string_list(dist, attr, value):
     """Verify that value is a string list or None"""
     try:
-        assert ''.join(value)!=value
+        assert ''.join(value) != value
     except (TypeError, ValueError, AttributeError, AssertionError):
         raise DistutilsSetupError(
             "%r must be a list of strings (got %r)" % (attr, value)
@@ -109,7 +109,7 @@ def check_extras(dist, attr, value):
             if ':' in k:
                 k, m = k.split(':', 1)
                 if pkg_resources.invalid_marker(m):
-                    raise DistutilsSetupError("Invalid environment marker: "+m)
+                    raise DistutilsSetupError("Invalid environment marker: " + m)
             list(pkg_resources.parse_requirements(v))
     except (TypeError, ValueError, AttributeError):
         raise DistutilsSetupError(
@@ -162,7 +162,7 @@ def check_package_data(dist, attr, value):
         else:
             return
     raise DistutilsSetupError(
-        attr+" must be a dictionary mapping package names to lists of "
+        attr + " must be a dictionary mapping package names to lists of "
         "wildcard patterns"
     )
 
@@ -313,7 +313,7 @@ def parse_command_line(self):
 
     def _feature_attrname(self, name):
         """Convert feature name to corresponding option attribute name"""
-        return 'with_'+name.replace('-', '_')
+        return 'with_' + name.replace('-', '_')
 
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
@@ -402,13 +402,13 @@ def _set_global_opts_from_features(self):
             if feature.optional:
                 descr = feature.description
                 incdef = ' (default)'
-                excdef=''
+                excdef = ''
                 if not feature.include_by_default():
                     excdef, incdef = incdef, excdef
 
-                go.append(('with-'+name, None, 'include '+descr+incdef))
-                go.append(('without-'+name, None, 'exclude '+descr+excdef))
-                no['without-'+name] = 'with-'+name
+                go.append(('with-' + name, None, 'include ' + descr + incdef))
+                go.append(('without-' + name, None, 'exclude ' + descr + excdef))
+                no['without-' + name] = 'with-' + name
 
         self.global_options = self.feature_options = go + self.global_options
         self.negative_opt = self.feature_negopt = no
@@ -469,7 +469,7 @@ def feature_is_included(self, name):
     def include_feature(self, name):
         """Request inclusion of feature named 'name'"""
 
-        if self.feature_is_included(name)==0:
+        if self.feature_is_included(name) == 0:
             descr = self.features[name].description
             raise DistutilsOptionError(
                 descr + " is required, but was excluded or is not available"
@@ -493,7 +493,7 @@ def include(self, **attrs):
         handle whatever special inclusion logic is needed.
         """
         for k, v in attrs.items():
-            include = getattr(self, '_include_'+k, None)
+            include = getattr(self, '_include_' + k, None)
             if include:
                 include(v)
             else:
@@ -502,7 +502,7 @@ def include(self, **attrs):
     def exclude_package(self, package):
         """Remove packages, modules, and extensions in named package"""
 
-        pfx = package+'.'
+        pfx = package + '.'
         if self.packages:
             self.packages = [
                 p for p in self.packages
@@ -524,10 +524,10 @@ def exclude_package(self, package):
     def has_contents_for(self, package):
         """Return true if 'exclude_package(package)' would do something"""
 
-        pfx = package+'.'
+        pfx = package + '.'
 
         for p in self.iter_distribution_names():
-            if p==package or p.startswith(pfx):
+            if p == package or p.startswith(pfx):
                 return True
 
     def _exclude_misc(self, name, value):
@@ -544,7 +544,7 @@ def _exclude_misc(self, name, value):
             )
         if old is not None and not isinstance(old, sequence):
             raise DistutilsSetupError(
-                name+": this setting cannot be changed via include/exclude"
+                name + ": this setting cannot be changed via include/exclude"
             )
         elif old:
             setattr(self, name, [item for item in old if item not in value])
@@ -566,10 +566,10 @@ def _include_misc(self, name, value):
             setattr(self, name, value)
         elif not isinstance(old, sequence):
             raise DistutilsSetupError(
-                name+": this setting cannot be changed via include/exclude"
+                name + ": this setting cannot be changed via include/exclude"
             )
         else:
-            setattr(self, name, old+[item for item in value if item not in old])
+            setattr(self, name, old + [item for item in value if item not in old])
 
     def exclude(self, **attrs):
         """Remove items from distribution that are named in keyword arguments
@@ -588,7 +588,7 @@ def exclude(self, **attrs):
         handle whatever special exclusion logic is needed.
         """
         for k, v in attrs.items():
-            exclude = getattr(self, '_exclude_'+k, None)
+            exclude = getattr(self, '_exclude_' + k, None)
             if exclude:
                 exclude(v)
             else:
@@ -648,19 +648,19 @@ def get_cmdline_options(self):
 
                 opt = opt.replace('_', '-')
 
-                if val==0:
+                if val == 0:
                     cmdobj = self.get_command_obj(cmd)
                     neg_opt = self.negative_opt.copy()
                     neg_opt.update(getattr(cmdobj, 'negative_opt', {}))
                     for neg, pos in neg_opt.items():
-                        if pos==opt:
-                            opt=neg
-                            val=None
+                        if pos == opt:
+                            opt = neg
+                            val = None
                             break
                     else:
                         raise AssertionError("Shouldn't be able to get here")
 
-                elif val==1:
+                elif val == 1:
                     val = None
 
                 d.setdefault(cmd, {})[opt] = val
@@ -835,7 +835,7 @@ def include_in(self, dist):
 
         if not self.available:
             raise DistutilsPlatformError(
-                self.description+" is required, "
+                self.description + " is required, "
                 "but is not available on this platform"
             )
 
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index f7296786ea..ac5f8096a9 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -34,7 +34,7 @@ def run_2to3(self, files, doctests = False):
             return
         if not files:
             return
-        log.info("Fixing "+" ".join(files))
+        log.info("Fixing " + " ".join(files))
         self.__build_fixer_names()
         self.__exclude_fixers()
         if doctests:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cdedef8341..4590e93f74 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -80,7 +80,7 @@ def egg_info_for_url(url):
     parts = urllib.parse.urlparse(url)
     scheme, server, path, parameters, query, fragment = parts
     base = urllib.parse.unquote(path.split('/')[-1])
-    if server=='sourceforge.net' and base=='download':    # XXX Yuck
+    if server == 'sourceforge.net' and base == 'download':    # XXX Yuck
         base = urllib.parse.unquote(path.split('/')[-2])
     if '#' in base: base, fragment = base.split('#', 1)
     return base, fragment
@@ -155,7 +155,7 @@ def interpret_distro_name(
         # it is a bdist_dumb, not an sdist -- bail out
         return
 
-    for p in range(1, len(parts)+1):
+    for p in range(1, len(parts) + 1):
         yield Distribution(
             location, metadata, '-'.join(parts[:p]), '-'.join(parts[p:]),
             py_version=py_version, precedence = precedence,
@@ -209,7 +209,7 @@ def find_external_links(url, page):
 
     for tag in ("<th>Home Page", "<th>Download URL"):
         pos = page.find(tag)
-        if pos!=-1:
+        if pos != -1:
             match = HREF.search(page, pos)
             if match:
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
@@ -336,7 +336,7 @@ def process_url(self, url, retrieve=False):
         for match in HREF.finditer(page):
             link = urllib.parse.urljoin(base, htmldecode(match.group(1)))
             self.process_url(link)
-        if url.startswith(self.index_url) and getattr(f, 'code', None)!=404:
+        if url.startswith(self.index_url) and getattr(f, 'code', None) != 404:
             page = self.process_index(url, page)
 
     def process_filename(self, fn, nested=False):
@@ -357,7 +357,7 @@ def process_filename(self, fn, nested=False):
 
     def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
-        if (s and s.group(1).lower()=='file') or self.allows(urllib.parse.urlparse(url)[1]):
+        if (s and s.group(1).lower() == 'file') or self.allows(urllib.parse.urlparse(url)[1]):
             return True
         msg = ("\nNote: Bypassing %s (disallowed host; see "
             "http://bit.ly/1dg9ijs for details).\n")
@@ -400,7 +400,7 @@ def scan(link):
                 parts = list(map(
                     urllib.parse.unquote, link[len(self.index_url):].split('/')
                 ))
-                if len(parts)==2 and '#' not in parts[1]:
+                if len(parts) == 2 and '#' not in parts[1]:
                     # it's a package page, sanitize and index it
                     pkg = safe_name(parts[0])
                     ver = safe_version(parts[1])
@@ -423,7 +423,7 @@ def scan(link):
                 base, frag = egg_info_for_url(new_url)
                 if base.endswith('.py') and not frag:
                     if ver:
-                        new_url+='#egg=%s-%s' % (pkg, ver)
+                        new_url += '#egg=%s-%s' % (pkg, ver)
                     else:
                         self.need_version_info(url)
                 self.scan_url(new_url)
@@ -449,11 +449,11 @@ def scan_all(self, msg=None, *args):
         self.scan_url(self.index_url)
 
     def find_packages(self, requirement):
-        self.scan_url(self.index_url + requirement.unsafe_name+'/')
+        self.scan_url(self.index_url + requirement.unsafe_name + '/')
 
         if not self.package_pages.get(requirement.key):
             # Fall back to safe version of the name
-            self.scan_url(self.index_url + requirement.project_name+'/')
+            self.scan_url(self.index_url + requirement.project_name + '/')
 
         if not self.package_pages.get(requirement.key):
             # We couldn't find the target package, so search the index page too
@@ -589,13 +589,13 @@ def find(req, env=None):
 
             for dist in env[req.key]:
 
-                if dist.precedence==DEVELOP_DIST and not develop_ok:
+                if dist.precedence == DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
                         self.warn("Skipping development or system egg: %s", dist)
                         skipped[dist] = 1
                     continue
 
-                if dist in req and (dist.precedence<=SOURCE_DIST or not source):
+                if dist in req and (dist.precedence <= SOURCE_DIST or not source):
                     return dist
 
         if force_scan:
@@ -645,7 +645,7 @@ def gen_setup(self, filename, fragment, tmpdir):
             interpret_distro_name(filename, match.group(1), None) if d.version
         ] or []
 
-        if len(dists)==1:   # unambiguous ``#egg`` fragment
+        if len(dists) == 1:   # unambiguous ``#egg`` fragment
             basename = os.path.basename(filename)
 
             # Make sure the file has been downloaded to the temp dir.
@@ -654,7 +654,7 @@ def gen_setup(self, filename, fragment, tmpdir):
                 from setuptools.command.easy_install import samefile
                 if not samefile(filename, dst):
                     shutil.copy2(filename, dst)
-                    filename=dst
+                    filename = dst
 
             with open(os.path.join(tmpdir, 'setup.py'), 'w') as file:
                 file.write(
@@ -771,13 +771,13 @@ def _download_url(self, scheme, url, tmpdir):
 
         # Download the file
         #
-        if scheme=='svn' or scheme.startswith('svn+'):
+        if scheme == 'svn' or scheme.startswith('svn+'):
             return self._download_svn(url, filename)
-        elif scheme=='git' or scheme.startswith('git+'):
+        elif scheme == 'git' or scheme.startswith('git+'):
             return self._download_git(url, filename)
         elif scheme.startswith('hg+'):
             return self._download_hg(url, filename)
-        elif scheme=='file':
+        elif scheme == 'file':
             return urllib.request.url2pathname(urllib.parse.urlparse(url)[2])
         else:
             self.url_ok(url, True)   # raises error if not allowed
@@ -806,7 +806,7 @@ def _download_html(self, url, headers, filename):
                 break   # not an index page
         file.close()
         os.unlink(filename)
-        raise DistutilsError("Unexpected HTML page found at "+url)
+        raise DistutilsError("Unexpected HTML page found at " + url)
 
     def _download_svn(self, url, filename):
         url = url.split('#', 1)[0]   # remove any fragment for svn's sake
@@ -821,7 +821,7 @@ def _download_svn(self, url, filename):
                         user, pw = auth.split(':', 1)
                         creds = " --username=%s --password=%s" % (user, pw)
                     else:
-                        creds = " --username="+auth
+                        creds = " --username=" + auth
                     netloc = host
                     parts = scheme, netloc, url, p, q, f
                     url = urllib.parse.urlunparse(parts)
@@ -896,7 +896,7 @@ def warn(self, msg, *args):
 def uchr(c):
     if not isinstance(c, int):
         return c
-    if c>255: return six.unichr(c)
+    if c > 255: return six.unichr(c)
     return chr(c)
 
 
@@ -1046,7 +1046,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
         s2, h2, path2, param2, query2, frag2 = urllib.parse.urlparse(fp.url)
-        if s2==scheme and h2==host:
+        if s2 == scheme and h2 == host:
             parts = s2, netloc, path2, param2, query2, frag2
             fp.url = urllib.parse.urlunparse(parts)
 
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 04a314ef61..414b377b59 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -12,7 +12,7 @@
     def get_path(name):
         if name not in ('platlib', 'purelib'):
             raise ValueError("Name must be purelib or platlib")
-        return get_python_lib(name=='platlib')
+        return get_python_lib(name == 'platlib')
 
 try:
     # Python >=3.2
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index c6bab096d0..5ed45f8459 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -234,7 +234,7 @@ def run_setup(setup_script, args):
     setup_dir = os.path.abspath(os.path.dirname(setup_script))
     with setup_context(setup_dir):
         try:
-            sys.argv[:] = [setup_script]+list(args)
+            sys.argv[:] = [setup_script] + list(args)
             sys.path.insert(0, setup_dir)
             # reset to include setup dir, w/clean callback list
             working_set.__init__()
@@ -353,8 +353,8 @@ def _remap_output(self, operation, path):
     def _remap_pair(self, operation, src, dst, *args, **kw):
         """Called for path pairs like rename, link, and symlink operations"""
         return (
-            self._remap_input(operation+'-from', src, *args, **kw),
-            self._remap_input(operation+'-to', dst, *args, **kw)
+            self._remap_input(operation + '-from', src, *args, **kw),
+            self._remap_input(operation + '-to', dst, *args, **kw)
         )
 
 
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 3e89ef2fea..6cfac4d62b 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -2,7 +2,7 @@ def __boot():
     import sys
     import os
     PYTHONPATH = os.environ.get('PYTHONPATH')
-    if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH):
+    if PYTHONPATH is None or (sys.platform == 'win32' and not PYTHONPATH):
         PYTHONPATH = []
     else:
         PYTHONPATH = PYTHONPATH.split(os.pathsep)
@@ -12,7 +12,7 @@ def __boot():
     mydir = os.path.dirname(__file__)
 
     for item in stdpath:
-        if item==mydir or not item:
+        if item == mydir or not item:
             continue    # skip if current dir. on Windows, or my own directory
         importer = pic.get(item)
         if importer is not None:
@@ -55,7 +55,7 @@ def __boot():
     for item in sys.path:
         p, np = makepath(item)
 
-        if np==nd and insert_at is None:
+        if np == nd and insert_at is None:
             # We've hit the first 'system' path entry, so added entries go here
             insert_at = len(new_path)
 
@@ -68,6 +68,6 @@ def __boot():
 
     sys.path[:] = new_path
 
-if __name__=='site':
+if __name__ == 'site':
     __boot()
     del __boot
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index ecede5092a..f4ba8a92d6 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -235,7 +235,7 @@ def close(self):
 
 def find_ca_bundle():
     """Return an existing CA bundle path, or None"""
-    if os.name=='nt':
+    if os.name == 'nt':
         return get_win_certfile()
     else:
         for cert_path in cert_paths:
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index a7ceac8696..42c44edfca 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -18,9 +18,9 @@
 
 @pytest.yield_fixture
 def setup_context(tmpdir):
-    with (tmpdir/'setup.py').open('w') as f:
+    with (tmpdir / 'setup.py').open('w') as f:
         f.write(SETUP_PY)
-    with (tmpdir/'hi.py').open('w') as f:
+    with (tmpdir / 'hi.py').open('w') as f:
         f.write('1\n')
     with tmpdir.as_cwd():
         yield tmpdir
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 894c4fd8b5..821e6fb2c6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -157,7 +157,7 @@ def test_add_from_site_is_ignored(self):
 
 @pytest.yield_fixture
 def setup_context(tmpdir):
-    with (tmpdir/'setup.py').open('w') as f:
+    with (tmpdir / 'setup.py').open('w') as f:
         f.write(SETUP_PY)
     with tmpdir.as_cwd():
         yield tmpdir
@@ -555,7 +555,7 @@ def test_get_script_header(self):
         assert actual == expected
 
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
-            executable='"'+self.exe_with_spaces+'"')
+            executable='"' + self.exe_with_spaces + '"')
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 61f5909b83..dda5538283 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -129,7 +129,7 @@ def test_links_priority(self):
         # the distribution has been found
         assert 'foobar' in pi
         # we have only one link, because links are compared without md5
-        assert len(pi['foobar'])==1
+        assert len(pi['foobar']) == 1
         # the link should be from the index
         assert 'correct_md5' in pi['foobar'][0].location
 

From a0d8df6b769dd6d83dd88d9f4f9aa6234b9bcbc2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Jul 2016 01:12:04 -0400
Subject: [PATCH 5898/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e04bdf05d7..925c05be8a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v24.0.3
+-------
+
+* Updated style in much of the codebase to match
+  community expectations. See #632, #633, #634,
+  #637, #639, #638, #642, #648.
+
 v24.0.2
 -------
 

From c24033af6c965481b34296180d7daef749daf179 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Jul 2016 01:12:14 -0400
Subject: [PATCH 5899/8469] =?UTF-8?q?Bump=20version:=2024.0.2=20=E2=86=92?=
 =?UTF-8?q?=2024.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 303569f6dd..5ded051df9 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.0.2
+current_version = 24.0.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index bac726bf66..1d742addd6 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.0.2",
+    version="24.0.3",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 8e80ee745b620086bea2111236f85fa2376d748f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Jul 2016 01:12:15 -0400
Subject: [PATCH 5900/8469] Added tag v24.0.3 for changeset d425bd1ee620

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index afb158b1ff..17e1c0a467 100644
--- a/.hgtags
+++ b/.hgtags
@@ -280,3 +280,4 @@ a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0
 130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1
 7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2
+d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3

From 93612718350a0dd0bb09d21986ef9333a6f5cb1f Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 12:32:22 +0700
Subject: [PATCH 5901/8469] Fix spacing after comment hash.

---
 setuptools/package_index.py        | 2 +-
 setuptools/py31compat.py           | 4 ++--
 setuptools/site-patch.py           | 4 ++--
 setuptools/tests/test_dist_info.py | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cdedef8341..4606c5aed5 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -325,7 +325,7 @@ def process_url(self, url, retrieve=False):
 
         base = f.url     # handle redirects
         page = f.read()
-        if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
+        if not isinstance(page, str):  # We are in Python 3 and got bytes. We want str.
             if isinstance(f, urllib.error.HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 04a314ef61..c2c4eed848 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -29,7 +29,7 @@ class TemporaryDirectory(object):
         """
 
         def __init__(self):
-            self.name = None # Handle mkdtemp raising an exception
+            self.name = None  # Handle mkdtemp raising an exception
             self.name = tempfile.mkdtemp()
 
         def __enter__(self):
@@ -38,7 +38,7 @@ def __enter__(self):
         def __exit__(self, exctype, excvalue, exctrace):
             try:
                 shutil.rmtree(self.name, True)
-            except OSError: #removal errors are not the only possible
+            except OSError:  # removal errors are not the only possible
                 pass
             self.name = None
 
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 3e89ef2fea..9af7c6905d 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -23,7 +23,7 @@ def __boot():
                 break
         else:
             try:
-                import imp # Avoid import loop in Python >= 3.3
+                import imp  # Avoid import loop in Python >= 3.3
                 stream, path, descr = imp.find_module('site', [item])
             except ImportError:
                 continue
@@ -38,7 +38,7 @@ def __boot():
     else:
         raise ImportError("Couldn't find the real 'site' module")
 
-    known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp
+    known_paths = dict([(makepath(item)[1], 1) for item in sys.path])  # 2.2 comp
 
     oldpos = getattr(sys, '__egginsert', 0)   # save old insertion position
     sys.__egginsert = 0                     # and reset the current one
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 9f226a55fc..db3cb2e740 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -25,8 +25,8 @@ def test_distinfo(self):
         unversioned = dists['UnversionedDistribution']
         versioned = dists['VersionedDistribution']
 
-        assert versioned.version == '2.718' # from filename
-        assert unversioned.version == '0.3' # from METADATA
+        assert versioned.version == '2.718'  # from filename
+        assert unversioned.version == '0.3'  # from METADATA
 
     def test_conditional_dependencies(self):
         specs = 'splort==4', 'quux>=1.1'

From c72c5966e23de51fc7ab460faad5a6d3d20531c9 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 12:37:39 +0700
Subject: [PATCH 5902/8469] Make exactly one space after comma.

---
 setuptools/tests/__init__.py    | 2 +-
 setuptools/tests/environment.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 915196823e..ad7d7ee512 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -220,7 +220,7 @@ def setup_method(self, method):
         self.dist = makeSetup(
             features={
                 'foo': Feature("foo", standard=True, require_features=['baz', self.req]),
-                'bar': Feature("bar",  standard=True, packages=['pkg.bar'],
+                'bar': Feature("bar", standard=True, packages=['pkg.bar'],
                                py_modules=['bar_et'], remove=['bar.ext'],
                                ),
                 'baz': Feature(
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index e523772184..b0e3bd36a8 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -51,7 +51,7 @@ def run_setup_py(cmd, pypath=None, path=None,
         return 1, ''
 
     # decode the console string if needed
-    if hasattr(data,  "decode"):
+    if hasattr(data, "decode"):
         # use the default encoding
         data = data.decode()
         data = unicodedata.normalize('NFC', data)

From a4190dd14802db1017f67332919377c9e14f95ad Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 08:58:30 +0700
Subject: [PATCH 5903/8469] Match closing bracket identation of opening
 bracket's line.

---
 setuptools/tests/test_bdist_egg.py | 2 +-
 setuptools/tests/test_egg_info.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index a7ceac8696..4cbfdb649a 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -33,7 +33,7 @@ def test_bdist_egg(self, setup_context, user_override):
             script_args=['bdist_egg'],
             name='foo',
             py_modules=['hi']
-            ))
+        ))
         os.makedirs(os.path.join('build', 'src'))
         with contexts.quiet():
             dist.parse_command_line()
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index afbda2cc9e..dea7f9928f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -179,7 +179,7 @@ def _setup_script_with_requires(self, requires_line):
             """ % requires_line)
         build_files({
             'setup.py': setup_script,
-            })
+        })
 
     def test_install_requires_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(

From 2e1ca9656b566b57c7736ef229e9d46c0aa7216c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 12:47:40 +0700
Subject: [PATCH 5904/8469] Remove whitespace around parameter '=' sign.

---
 setuptools/launch.py         |  6 +++---
 setuptools/lib2to3_ex.py     |  2 +-
 setuptools/package_index.py  |  6 +++---
 setuptools/tests/__init__.py | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/setuptools/launch.py b/setuptools/launch.py
index b05cbd2cfe..308283ea93 100644
--- a/setuptools/launch.py
+++ b/setuptools/launch.py
@@ -18,9 +18,9 @@ def run():
     __builtins__
     script_name = sys.argv[1]
     namespace = dict(
-        __file__ = script_name,
-        __name__ = '__main__',
-        __doc__ = None,
+        __file__=script_name,
+        __name__='__main__',
+        __doc__=None,
     )
     sys.argv[:] = sys.argv[1:]
 
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index f7296786ea..308086bcd4 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -27,7 +27,7 @@ def log_debug(self, msg, *args):
 
 class Mixin2to3(_Mixin2to3):
 
-    def run_2to3(self, files, doctests = False):
+    def run_2to3(self, files, doctests=False):
         # See of the distribution option has been set, otherwise check the
         # setuptools default.
         if self.distribution.use_2to3 is not True:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cdedef8341..45ea49ad35 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -94,7 +94,7 @@ def distros_for_url(url, metadata=None):
         match = EGG_FRAGMENT.match(fragment)
         if match:
             for dist in interpret_distro_name(
-                url, match.group(1), metadata, precedence = CHECKOUT_DIST
+                url, match.group(1), metadata, precedence=CHECKOUT_DIST
             ):
                 yield dist
 
@@ -158,8 +158,8 @@ def interpret_distro_name(
     for p in range(1, len(parts)+1):
         yield Distribution(
             location, metadata, '-'.join(parts[:p]), '-'.join(parts[p:]),
-            py_version=py_version, precedence = precedence,
-            platform = platform
+            py_version=py_version, precedence=precedence,
+            platform=platform
         )
 
 
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 915196823e..c059b1783e 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -131,8 +131,8 @@ def setup_method(self, method):
         self.dist = makeSetup(
             packages=['a', 'a.b', 'a.b.c', 'b', 'c'],
             py_modules=['b.d', 'x'],
-            ext_modules = (self.e1, self.e2),
-            package_dir = {},
+            ext_modules=(self.e1, self.e2),
+            package_dir={},
         )
 
     def testDistroType(self):
@@ -225,15 +225,15 @@ def setup_method(self, method):
                                ),
                 'baz': Feature(
                         "baz", optional=False, packages=['pkg.baz'],
-                        scripts = ['scripts/baz_it'],
+                        scripts=['scripts/baz_it'],
                         libraries=[('libfoo', 'foo/foofoo.c')]
                        ),
                 'dwim': Feature("DWIM", available=False, remove='bazish'),
             },
             script_args=['--without-bar', 'install'],
-            packages = ['pkg.bar', 'pkg.foo'],
-            py_modules = ['bar_et', 'bazish'],
-            ext_modules = [Extension('bar.ext', ['bar.c'])]
+            packages=['pkg.bar', 'pkg.foo'],
+            py_modules=['bar_et', 'bazish'],
+            ext_modules=[Extension('bar.ext', ['bar.c'])]
         )
 
     def testDefaults(self):

From 98477464ed0d9ffd0b39e8baac15dfcd568dcb22 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Fri, 8 Jul 2016 20:39:10 +0200
Subject: [PATCH 5905/8469] Add python/external_requires keywords to setup

This should allow setuptools to write the metadata Requires-Python and
Requires-External from PEP345 to the PKGINFO file
---
 setup.py           |  2 ++
 setuptools/dist.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/setup.py b/setup.py
index 1d742addd6..1960f653b1 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,8 @@ def _gen_console_scripts():
             "install_requires       = setuptools.dist:check_requirements",
             "tests_require          = setuptools.dist:check_requirements",
             "setup_requires         = setuptools.dist:check_requirements",
+            "python_requires        = setuptools.dist:check_specifier",
+            "external_requires      = setuptools.dist:assert_string_list",
             "entry_points           = setuptools.dist:check_entry_points",
             "test_suite             = setuptools.dist:check_test_suite",
             "zip_safe               = setuptools.dist:assert_bool",
diff --git a/setuptools/dist.py b/setuptools/dist.py
index f229d726f4..29b0f2662b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -39,6 +39,22 @@ def _get_unpatched(cls):
 _Distribution = _get_unpatched(_Distribution)
 
 
+def _patch_distribution_metadata_write_pkg_file():
+    """Patch write_pkg_file to also write Requires-Python/Requires-External"""
+    original_write = distutils.dist.DistributionMetadata.write_pkg_file
+    def write_pkg_file(self, file):
+        """Write the PKG-INFO format data to a file object.
+        """
+        original_write(self, file)
+        if hasattr(self, 'python_requires'):
+            file.write('Requires-Python: %s\n' % self.python_requires)
+        if getattr(self, 'external_requires', []):
+            self._write_list(file, 'Requires-External', self.external_requires)
+
+    distutils.dist.DistributionMetadata.write_pkg_file = write_pkg_file
+_patch_distribution_metadata_write_pkg_file()
+
+
 def _patch_distribution_metadata_write_pkg_info():
     """
     Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
@@ -138,6 +154,18 @@ def check_requirements(dist, attr, value):
         raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
 
 
+def check_specifier(dist, attr, value):
+    """Verify that value is a valid version specifier"""
+    try:
+        packaging.specifiers.SpecifierSet(value)
+    except packaging.specifiers.InvalidSpecifier as error:
+        tmpl = (
+            "{attr!r} must be a string or list of strings "
+            "containing valid version specifiers; {error}"
+        )
+        raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
+
+
 def check_entry_points(dist, attr, value):
     """Verify that entry_points map is parseable"""
     try:
@@ -303,6 +331,10 @@ def __init__(self, attrs=None):
                     "setuptools, pip, and PyPI. Please see PEP 440 for more "
                     "details." % self.metadata.version
                 )
+        if getattr(self, 'python_requires', None):
+            self.metadata.python_requires = self.python_requires
+        if getattr(self, 'external_requires', None):
+            self.metadata.external_requires = self.external_requires
 
     def parse_command_line(self):
         """Process features after parsing command line options"""

From d9a251b704b87e9a0e5090213e7799c468c4bbf5 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Sun, 10 Jul 2016 20:51:37 +0200
Subject: [PATCH 5906/8469] Drop external_requires keyword

---
 setup.py           | 1 -
 setuptools/dist.py | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/setup.py b/setup.py
index 1960f653b1..0a031b0552 100755
--- a/setup.py
+++ b/setup.py
@@ -96,7 +96,6 @@ def _gen_console_scripts():
             "tests_require          = setuptools.dist:check_requirements",
             "setup_requires         = setuptools.dist:check_requirements",
             "python_requires        = setuptools.dist:check_specifier",
-            "external_requires      = setuptools.dist:assert_string_list",
             "entry_points           = setuptools.dist:check_entry_points",
             "test_suite             = setuptools.dist:check_test_suite",
             "zip_safe               = setuptools.dist:assert_bool",
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 29b0f2662b..27cf85017c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -48,8 +48,6 @@ def write_pkg_file(self, file):
         original_write(self, file)
         if hasattr(self, 'python_requires'):
             file.write('Requires-Python: %s\n' % self.python_requires)
-        if getattr(self, 'external_requires', []):
-            self._write_list(file, 'Requires-External', self.external_requires)
 
     distutils.dist.DistributionMetadata.write_pkg_file = write_pkg_file
 _patch_distribution_metadata_write_pkg_file()
@@ -333,8 +331,6 @@ def __init__(self, attrs=None):
                 )
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
-        if getattr(self, 'external_requires', None):
-            self.metadata.external_requires = self.external_requires
 
     def parse_command_line(self):
         """Process features after parsing command line options"""

From 020771f5e631741de31255283aa81adc05a26a9d Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Mon, 11 Jul 2016 11:30:11 +0200
Subject: [PATCH 5907/8469] Add basic tests and docs for python_requires

---
 docs/setuptools.txt               |  4 ++++
 setuptools/tests/test_egg_info.py | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 807a2722eb..0f9556636a 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -302,6 +302,10 @@ unless you need the associated ``setuptools`` feature.
     installed to support those features.  See the section below on `Declaring
     Dependencies`_ for details and examples of the format of this argument.
 
+``python_requires``
+    A string corresponding to a version specifier (as defined in PEP 440) for
+    the Python version, used to specify the Requires-Python defined in PEP 345.
+
 ``setup_requires``
     A string or list of strings specifying what other distributions need to
     be present in order for the *setup script* to run.  ``setuptools`` will
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index afbda2cc9e..d758ff903e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -210,6 +210,30 @@ def test_extra_requires_with_markers(self, tmpdir_cwd, env):
         self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_python_requires_egg_info(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """python_requires='>=2.7.12',""")
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        code, data = environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
+        assert 'Requires-Python: >=2.7.12' in open(pkginfo).read().split('\n')
+
+    def test_python_requires_install(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """python_requires='>=1.2.3',""")
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
+        assert 'Requires-Python: >=1.2.3' in open(pkginfo).read().split('\n')
+
     def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],

From 01de794bc829cc9eb0c1512b3570acec970e1acf Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 21:45:22 +0700
Subject: [PATCH 5908/8469] Put imports in same block alphabeticaly.

---
 setuptools/archive_util.py            | 2 +-
 setuptools/command/bdist_egg.py       | 2 +-
 setuptools/depends.py                 | 2 +-
 setuptools/tests/test_easy_install.py | 2 +-
 setuptools/tests/test_packageindex.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index d195063815..3b41db1529 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -12,8 +12,8 @@
 import shutil
 import posixpath
 import contextlib
-from pkg_resources import ensure_directory, ContextualZipFile
 from distutils.errors import DistutilsError
+from pkg_resources import ensure_directory, ContextualZipFile
 
 
 class UnrecognizedFormat(DistutilsError):
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9cebd7fa02..c40022a164 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -8,8 +8,8 @@
 from types import CodeType
 import sys
 import os
-import marshal
 import textwrap
+import marshal
 
 from setuptools.extern import six
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index eb1d7b13ff..865d41517e 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,8 +1,8 @@
 import sys
 import imp
 import marshal
-from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 from distutils.version import StrictVersion
+from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 
 from setuptools.extern import six
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 894c4fd8b5..94b25f2ebd 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,8 +15,8 @@
 import distutils.errors
 import io
 
-from setuptools.extern.six.moves import urllib
 import time
+from setuptools.extern.six.moves import urllib
 
 import pytest
 try:
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 61f5909b83..877f304988 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -7,10 +7,10 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client
 
-from .textwrap import DALS
 import pkg_resources
 import setuptools.package_index
 from setuptools.tests.server import IndexServer
+from .textwrap import DALS
 
 
 class TestPackageIndex:

From c07d0df02c9a22838099e1d86f31015d19c92a87 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 14 Jul 2016 21:52:34 +0700
Subject: [PATCH 5909/8469] Use isinstance() instead of type() for a typecheck.

---
 setuptools/command/upload_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 01b4904616..ccc1c76ffc 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -105,7 +105,7 @@ def _build_part(item, sep_boundary):
         if not isinstance(values, list):
             values = [values]
         for value in values:
-            if type(value) is tuple:
+            if isinstance(value, tuple):
                 title += '; filename="%s"' % value[0]
                 value = value[1]
             else:

From 80a2ff9e3055e216a5238e81a6933f6a342b17fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 11:10:01 -0400
Subject: [PATCH 5910/8469] Add safeguard against improper installs when using
 a clean repository checkout. Fixes #659.

---
 CHANGES.rst | 6 ++++++
 setup.py    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 925c05be8a..aa1d1b83c1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v24.1.0
+-------
+
+* #659: ``setup.py`` now will fail fast and with a helpful
+  error message when the necessary metadata is missing.
+
 v24.0.3
 -------
 
diff --git a/setup.py b/setup.py
index 1d742addd6..69c55417a1 100755
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,11 @@
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
+# Prevent improper installs without necessary metadata. See #659
+if not os.path.exists('setuptools.egg-info'):
+    msg = "Cannot build setuptools without metadata. Run bootstrap.py"
+    raise RuntimeError(msg)
+
 src_root = None
 
 from distutils.util import convert_path

From 39374cb5747b8cc18240f474d10d17913f203b67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 11:43:04 -0400
Subject: [PATCH 5911/8469] Add test capturing expectation of PYPI_MD5 pattern

---
 setuptools/tests/test_packageindex.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index dda5538283..b2b0d537fe 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -15,6 +15,16 @@
 
 class TestPackageIndex:
 
+    def test_regex(self):
+        hash_url = 'http://other_url?:action=show_md5&amp;'
+        hash_url += 'digest=0123456789abcdef0123456789abcdef'
+        doc = """
+            <a href="http://some_url">Name</a>
+            (<a title="MD5 hash"
+            href="{hash_url}">md5</a>)
+        """.lstrip().format(**locals())
+        assert setuptools.package_index.PYPI_MD5.match(doc)
+
     def test_bad_url_bad_port(self):
         index = setuptools.package_index.PackageIndex()
         url = 'http://127.0.0.1:0/nonesuch/test_package_index'

From 9879ab252e02c3c482536e31067a567df223dd28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 11:55:29 -0400
Subject: [PATCH 5912/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index aa1d1b83c1..f28164d636 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,8 @@ v24.1.0
 
 * #659: ``setup.py`` now will fail fast and with a helpful
   error message when the necessary metadata is missing.
+* More style updates. See #656, #635, #640,
+  #644, #650, #652, and #655.
 
 v24.0.3
 -------

From ad2b148e4c07c7d0195d4265d6bb144ef6465065 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 11:55:34 -0400
Subject: [PATCH 5913/8469] =?UTF-8?q?Bump=20version:=2024.0.3=20=E2=86=92?=
 =?UTF-8?q?=2024.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5ded051df9..2e0cc2674f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.0.3
+current_version = 24.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 69c55417a1..48a20b81bb 100755
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.0.3",
+    version="24.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From e6d6f7bd99d7329a5689980ac74c9e227bd0f503 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 11:55:35 -0400
Subject: [PATCH 5914/8469] Added tag v24.1.0 for changeset a7d2f79f0996

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 17e1c0a467..812b7a3fcc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -281,3 +281,4 @@ a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1
 7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2
 d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3
+a7d2f79f0996d881794af0f87595032098202811 v24.1.0

From 0ef2f3616fd1e19ef2fafeebbc7f904a1fefcd51 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 04:07:20 +0700
Subject: [PATCH 5915/8469] Test for membership should be 'not in'.

---
 setuptools/tests/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 66f238546e..53bd836cad 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -266,15 +266,15 @@ def testFeatureOptions(self):
         assert dist.feature_negopt['without-foo'] == 'with-foo'
         assert dist.feature_negopt['without-bar'] == 'with-bar'
         assert dist.feature_negopt['without-dwim'] == 'with-dwim'
-        assert (not 'without-baz' in dist.feature_negopt)
+        assert ('without-baz' not in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist
         assert dist.with_foo == 1
         assert dist.with_bar == 0
         assert dist.with_baz == 1
-        assert (not 'bar_et' in dist.py_modules)
-        assert (not 'pkg.bar' in dist.packages)
+        assert ('bar_et' not in dist.py_modules)
+        assert ('pkg.bar' not in dist.packages)
         assert ('pkg.baz' in dist.packages)
         assert ('scripts/baz_it' in dist.scripts)
         assert (('libfoo', 'foo/foofoo.c') in dist.libraries)

From f2bf9162c26ee17cef89425135d2c684d6e8ce98 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 04:25:53 +0700
Subject: [PATCH 5916/8469] Format block comment.

---
 setuptools/tests/test_develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index d22e5e4a3f..f1580785b5 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -114,4 +114,4 @@ def test_console_scripts(self, tmpdir):
         cmd.ensure_finalized()
         cmd.install_dir = tmpdir
         cmd.run()
-        #assert '0.0' not in foocmd_text
+        # assert '0.0' not in foocmd_text

From 64335b63f9e03e71d0acd885b8bfd0b4b7a60aa8 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 04:13:28 +0700
Subject: [PATCH 5917/8469] Put colon-separated compound statement on separate
 lines.

---
 pkg_resources/__init__.py   |  3 ++-
 setuptools/depends.py       |  3 ++-
 setuptools/dist.py          |  9 ++++++---
 setuptools/lib2to3_ex.py    |  3 ++-
 setuptools/package_index.py | 21 ++++++++++++++-------
 setuptools/sandbox.py       | 12 ++++++++----
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 15cb93fdc4..6337db9921 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2837,7 +2837,8 @@ def parse(s):
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
     if not isinstance(cls, type):
-        class cls(cls, object): pass
+        class cls(cls, object):
+            pass
         return cls.__mro__[1:]
     return cls.__mro__
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 48c2015636..7534459001 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -53,7 +53,8 @@ def get_version(self, paths=None, default="unknown"):
         if self.attribute is None:
             try:
                 f, p, i = find_module(self.module, paths)
-                if f: f.close()
+                if f:
+                    f.close()
                 return default
             except ImportError:
                 return None
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b4ff3861fe..b8ada9b98b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -155,8 +155,10 @@ def check_package_data(dist, attr, value):
     """Verify that value is a dictionary of package names to glob lists"""
     if isinstance(value, dict):
         for k, v in value.items():
-            if not isinstance(k, str): break
-            try: iter(v)
+            if not isinstance(k, str):
+                break
+            try:
+                iter(v)
             except TypeError:
                 break
         else:
@@ -807,7 +809,8 @@ def __init__(self, description, standard=False, available=True,
             r for r in require_features if isinstance(r, str)
         ]
         er = [r for r in require_features if not isinstance(r, str)]
-        if er: extras['require_features'] = er
+        if er:
+            extras['require_features'] = er
 
         if isinstance(remove, str):
             remove = remove,
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index c58d840740..467e57d2c6 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -45,7 +45,8 @@ def run_2to3(self, files, doctests=False):
             _Mixin2to3.run_2to3(self, files)
 
     def __build_fixer_names(self):
-        if self.fixer_names: return
+        if self.fixer_names:
+            return
         self.fixer_names = []
         for p in setuptools.lib2to3_fixer_packages:
             self.fixer_names.extend(get_fixers_from_package(p))
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8764faa620..77f5f96efe 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -82,14 +82,16 @@ def egg_info_for_url(url):
     base = urllib.parse.unquote(path.split('/')[-1])
     if server == 'sourceforge.net' and base == 'download':    # XXX Yuck
         base = urllib.parse.unquote(path.split('/')[-2])
-    if '#' in base: base, fragment = base.split('#', 1)
+    if '#' in base:
+        base, fragment = base.split('#', 1)
     return base, fragment
 
 
 def distros_for_url(url, metadata=None):
     """Yield egg or source distribution objects that might be found at a URL"""
     base, fragment = egg_info_for_url(url)
-    for dist in distros_for_location(url, base, metadata): yield dist
+    for dist in distros_for_location(url, base, metadata):
+        yield dist
     if fragment:
         match = EGG_FRAGMENT.match(fragment)
         if match:
@@ -289,7 +291,8 @@ def __init__(
         self.to_scan = []
         if verify_ssl and ssl_support.is_available and (ca_bundle or ssl_support.find_ca_bundle()):
             self.opener = ssl_support.opener_for(ca_bundle)
-        else: self.opener = urllib.request.urlopen
+        else:
+            self.opener = urllib.request.urlopen
 
     def process_url(self, url, retrieve=False):
         """Evaluate a URL as a possible download, and maybe retrieve it"""
@@ -317,7 +320,8 @@ def process_url(self, url, retrieve=False):
         self.info("Reading %s", url)
         self.fetched_urls[url] = True   # prevent multiple fetch attempts
         f = self.open_url(url, "Download error on %s: %%s -- Some packages may not be found!" % url)
-        if f is None: return
+        if f is None:
+            return
         self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
             f.close()   # not html, we can't process it
@@ -442,7 +446,8 @@ def need_version_info(self, url):
 
     def scan_all(self, msg=None, *args):
         if self.index_url not in self.fetched_urls:
-            if msg: self.warn(msg, *args)
+            if msg:
+                self.warn(msg, *args)
             self.info(
                 "Scanning index of all packages (this may take a while)"
             )
@@ -714,7 +719,8 @@ def _download_to(self, url, filename):
                 self.check_hash(checker, filename, tfp)
             return headers
         finally:
-            if fp: fp.close()
+            if fp:
+                fp.close()
 
     def reporthook(self, url, filename, blocknum, blksize, size):
         pass    # no-op
@@ -896,7 +902,8 @@ def warn(self, msg, *args):
 def uchr(c):
     if not isinstance(c, int):
         return c
-    if c > 255: return six.unichr(c)
+    if c > 255:
+        return six.unichr(c)
     return chr(c)
 
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 5ed45f8459..c89593b180 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -291,7 +291,8 @@ def wrap(self, src, dst, *args, **kw):
         return wrap
 
     for name in ["rename", "link", "symlink"]:
-        if hasattr(_os, name): locals()[name] = _mk_dual_path_wrapper(name)
+        if hasattr(_os, name):
+            locals()[name] = _mk_dual_path_wrapper(name)
 
     def _mk_single_path_wrapper(name, original=None):
         original = original or getattr(_os, name)
@@ -310,7 +311,8 @@ def wrap(self, path, *args, **kw):
         "remove", "unlink", "rmdir", "utime", "lchown", "chroot", "lstat",
         "startfile", "mkfifo", "mknod", "pathconf", "access"
     ]:
-        if hasattr(_os, name): locals()[name] = _mk_single_path_wrapper(name)
+        if hasattr(_os, name):
+            locals()[name] = _mk_single_path_wrapper(name)
 
     def _mk_single_with_return(name):
         original = getattr(_os, name)
@@ -323,7 +325,8 @@ def wrap(self, path, *args, **kw):
         return wrap
 
     for name in ['readlink', 'tempnam']:
-        if hasattr(_os, name): locals()[name] = _mk_single_with_return(name)
+        if hasattr(_os, name):
+            locals()[name] = _mk_single_with_return(name)
 
     def _mk_query(name):
         original = getattr(_os, name)
@@ -336,7 +339,8 @@ def wrap(self, *args, **kw):
         return wrap
 
     for name in ['getcwd', 'tmpnam']:
-        if hasattr(_os, name): locals()[name] = _mk_query(name)
+        if hasattr(_os, name):
+            locals()[name] = _mk_query(name)
 
     def _validate_path(self, path):
         """Called to remap or validate any path, whether input or output"""

From 82b908759cddf344274f8c9360eaef79517e9c7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:26:20 -0400
Subject: [PATCH 5918/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f28164d636..2946fc6d51 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v24.1.1
+-------
+
+* More style updates. See #660, #661, #641.
+
 v24.1.0
 -------
 

From 01463e00ca98f74f1e0d5923a0d16c635be4f94c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:27:44 -0400
Subject: [PATCH 5919/8469] =?UTF-8?q?Bump=20version:=2024.1.0=20=E2=86=92?=
 =?UTF-8?q?=2024.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2e0cc2674f..87265c01dc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.1.0
+current_version = 24.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 48a20b81bb..2de0a13562 100755
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.1.0",
+    version="24.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 18f760aa07da104d7ed156b7f085bd05fb0c964d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:27:44 -0400
Subject: [PATCH 5920/8469] Added tag v24.1.1 for changeset d29075e7f879

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 812b7a3fcc..5cc35326cb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -282,3 +282,4 @@ a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2
 d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3
 a7d2f79f0996d881794af0f87595032098202811 v24.1.0
+d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1

From b4e1b1f67d9cd50086c7acafcdff8c02b41988b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:30:22 -0400
Subject: [PATCH 5921/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2946fc6d51..28924a9745 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v24.2.0
+-------
+
+* #631: Add support for ``python_requires`` keyword.
+
 v24.1.1
 -------
 

From 587fef5c66600232a290ce71c2e1ddf2727d3b41 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:30:28 -0400
Subject: [PATCH 5922/8469] =?UTF-8?q?Bump=20version:=2024.1.1=20=E2=86=92?=
 =?UTF-8?q?=2024.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 87265c01dc..f94f03c8cf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.1.1
+current_version = 24.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 67407c746c..e9aa97a9dd 100755
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.1.1",
+    version="24.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 966e2fa4118277ed4551aa2215ac6ebac34b37e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jul 2016 19:30:28 -0400
Subject: [PATCH 5923/8469] Added tag v24.2.0 for changeset ed9e7bd8caf9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5cc35326cb..85c47bdbba 100644
--- a/.hgtags
+++ b/.hgtags
@@ -283,3 +283,4 @@ a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
 d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3
 a7d2f79f0996d881794af0f87595032098202811 v24.1.0
 d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1
+ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0

From 39bf3155d47c0024240be414a611dcb6d549f53c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 09:37:34 +0700
Subject: [PATCH 5924/8469] Add missing blank lines after class or function
 definition.

---
 setup.py                              | 1 +
 setuptools/__init__.py                | 2 ++
 setuptools/archive_util.py            | 1 +
 setuptools/command/bdist_egg.py       | 1 +
 setuptools/command/easy_install.py    | 2 ++
 setuptools/depends.py                 | 1 +
 setuptools/dist.py                    | 6 ++++++
 setuptools/extension.py               | 2 ++
 setuptools/package_index.py           | 3 +++
 setuptools/py26compat.py              | 1 +
 setuptools/py27compat.py              | 1 +
 setuptools/sandbox.py                 | 1 +
 setuptools/site-patch.py              | 1 +
 setuptools/tests/py26compat.py        | 1 +
 setuptools/tests/test_easy_install.py | 1 +
 tests/manual_test.py                  | 2 ++
 16 files changed, 27 insertions(+)

diff --git a/setup.py b/setup.py
index e9aa97a9dd..7bd3a079f3 100755
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ def _gen_console_scripts():
     yield ("easy_install-{shortver} = setuptools.command.easy_install:main"
         .format(shortver=sys.version[:3]))
 
+
 console_scripts = list(_gen_console_scripts())
 
 readme_file = io.open('README.rst', encoding='utf-8')
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2523ccc78f..cf0c39f2f8 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -116,6 +116,7 @@ class PEP420PackageFinder(PackageFinder):
     def _looks_like_package(path):
         return True
 
+
 find_packages = PackageFinder.find
 
 setup = distutils.core.setup
@@ -141,6 +142,7 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         vars(cmd).update(kw)
         return cmd
 
+
 # we can't patch distutils.cmd, alas
 distutils.core.Command = Command
 
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 3b41db1529..24d4e7bbb5 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -169,4 +169,5 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                             pass
         return True
 
+
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index c40022a164..50744b87d4 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -432,6 +432,7 @@ def can_scan():
 # Attribute names of options for commands that might need to be convinced to
 # install to the egg build directory
 
+
 INSTALL_DIRECTORY_ATTRS = [
     'install_lib', 'install_dir', 'install_data', 'install_base'
 ]
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 73bdb0cb4c..5ce529b2d6 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1831,6 +1831,7 @@ def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
         normalized_path, zipimport._zip_directory_cache,
         updater=clear_and_remove_cached_zip_archive_directory_data)
 
+
 # PyPy Python implementation does not allow directly writing to the
 # zipimport._zip_directory_cache and so prevents us from attempting to correct
 # its content. The best we can do there is clear the problematic cache content
@@ -1990,6 +1991,7 @@ def _render(items):
         cmdline = subprocess.list2cmdline(items)
         return '#!' + cmdline + '\n'
 
+
 # For pbr compat; will be removed in a future version.
 sys_executable = CommandSpec._sys_executable()
 
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 7534459001..d5a344ada7 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -213,4 +213,5 @@ def _update_globals():
         del globals()[name]
         __all__.remove(name)
 
+
 _update_globals()
diff --git a/setuptools/dist.py b/setuptools/dist.py
index bfdbb3b5fe..0a19255313 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -36,12 +36,14 @@ def _get_unpatched(cls):
         )
     return cls
 
+
 _Distribution = _get_unpatched(_Distribution)
 
 
 def _patch_distribution_metadata_write_pkg_file():
     """Patch write_pkg_file to also write Requires-Python/Requires-External"""
     original_write = distutils.dist.DistributionMetadata.write_pkg_file
+
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
@@ -50,6 +52,8 @@ def write_pkg_file(self, file):
             file.write('Requires-Python: %s\n' % self.python_requires)
 
     distutils.dist.DistributionMetadata.write_pkg_file = write_pkg_file
+
+
 _patch_distribution_metadata_write_pkg_file()
 
 
@@ -72,6 +76,8 @@ def write_pkg_info(self, base_dir):
             self.write_pkg_file(pkg_info)
 
     distutils.dist.DistributionMetadata.write_pkg_info = write_pkg_info
+
+
 _patch_distribution_metadata_write_pkg_info()
 
 sequence = tuple, list
diff --git a/setuptools/extension.py b/setuptools/extension.py
index d265b7a354..5ea72c060d 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -28,6 +28,7 @@ def _have_cython():
         pass
     return False
 
+
 # for compatibility
 have_pyrex = _have_cython
 
@@ -53,6 +54,7 @@ def _convert_pyx_sources_to_lang(self):
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
 
+
 distutils.core.Extension = Extension
 distutils.extension.Extension = Extension
 if 'distutils.command.build_ext' in sys.modules:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 77f5f96efe..0ea09bd6fe 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -194,6 +194,7 @@ def wrapper(*args, **kwargs):
         return unique_everseen(func(*args, **kwargs))
     return wrapper
 
+
 REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
 # this line is here to fix emacs' cruddy broken syntax highlighting
 
@@ -894,6 +895,7 @@ def info(self, msg, *args):
     def warn(self, msg, *args):
         log.warn(msg, *args)
 
+
 # This pattern matches a character entity reference (a decimal numeric
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
@@ -1059,6 +1061,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
     return fp
 
+
 # adding a timeout to avoid freezing package_index
 open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
 
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 7c60c90ea5..90cd695a35 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -19,5 +19,6 @@ def strip_fragment(url):
     url, fragment = splittag(url)
     return url
 
+
 if sys.version_info >= (2, 7):
     strip_fragment = lambda x: x
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 66aecc2a0a..57eb150b47 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -11,6 +11,7 @@ def get_all_headers(message, key):
     """
     return message.get_all(key)
 
+
 if sys.version_info < (3,):
     def get_all_headers(message, key):
         return message.getheaders(key)
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index c89593b180..df630d3eec 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -460,6 +460,7 @@ def open(self, file, flags, mode=0o777, *args, **kw):
             self._violation("os.open", file, flags, mode, *args, **kw)
         return _os.open(file, flags, mode, *args, **kw)
 
+
 WRITE_FLAGS = functools.reduce(
     operator.or_, [getattr(_os, a, 0) for a in
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index a7d13fcd8d..f09ab52252 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -68,6 +68,7 @@ def __boot():
 
     sys.path[:] = new_path
 
+
 if __name__ == 'site':
     __boot()
     del __boot
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index 5325dad6e0..18cece051c 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -9,6 +9,7 @@ def _tarfile_open_ex(*args, **kwargs):
     """
     return contextlib.closing(tarfile.open(*args, **kwargs))
 
+
 if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
     tarfile_open = _tarfile_open_ex
 else:
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aa905f5ac0..2c17ac7614 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -50,6 +50,7 @@ def get_entry_map(self, group):
     def as_requirement(self):
         return 'spec'
 
+
 SETUP_PY = DALS("""
     from setuptools import setup
 
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 0904b607e0..9987e6629a 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -27,6 +27,7 @@ def _tempdir(*args, **kwargs):
             shutil.rmtree(test_dir)
     return _tempdir
 
+
 SIMPLE_BUILDOUT = """\
 [buildout]
 
@@ -90,6 +91,7 @@ def test_full():
     assert eggs == ['extensions-0.3-py2.6.egg',
         'zc.recipe.egg-1.2.2-py2.6.egg']
 
+
 if __name__ == '__main__':
     test_virtualenv()
     test_full()

From 789462de79c5f51ba24256d80ad2dac2e4fe2888 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 10:23:29 +0700
Subject: [PATCH 5925/8469] Add missing blank line.

---
 setuptools/lib2to3_ex.py           | 1 +
 setuptools/msvc.py                 | 1 +
 setuptools/tests/test_bdist_egg.py | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index 467e57d2c6..c8632bc5f6 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -10,6 +10,7 @@
 from distutils.util import Mixin2to3 as _Mixin2to3
 from distutils import log
 from lib2to3.refactor import RefactoringTool, get_fixers_from_package
+
 import setuptools
 
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 012ab32c74..2a665c9290 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -5,6 +5,7 @@
 import platform
 import itertools
 import distutils.errors
+
 from setuptools.extern.six.moves import filterfalse
 
 if platform.system() == 'Windows':
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 5aabf404fd..c77aa226ed 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -9,6 +9,7 @@
 
 from . import contexts
 
+
 SETUP_PY = """\
 from setuptools import setup
 
@@ -27,6 +28,7 @@ def setup_context(tmpdir):
 
 
 class Test:
+
     def test_bdist_egg(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',

From d079163e74166860fedbfe0abcfcb820507368fd Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Sun, 17 Jul 2016 14:52:16 +0200
Subject: [PATCH 5926/8469] Also update the Metadata-Version when adding
 Requires-Python

---
 setuptools/dist.py                | 38 ++++++++++++++++++++++++++++++-
 setuptools/tests/test_egg_info.py |  6 +++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0a19255313..705ce9a3d3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -12,6 +12,7 @@
 from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
+from distutils.util import rfc822_escape
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map
@@ -44,10 +45,45 @@ def _patch_distribution_metadata_write_pkg_file():
     """Patch write_pkg_file to also write Requires-Python/Requires-External"""
     original_write = distutils.dist.DistributionMetadata.write_pkg_file
 
+    # Based on Python 3.5 version
     def write_pkg_file(self, file):
         """Write the PKG-INFO format data to a file object.
         """
-        original_write(self, file)
+        version = '1.0'
+        if (self.provides or self.requires or self.obsoletes or
+                self.classifiers or self.download_url):
+            version = '1.1'
+        # Setuptools specific for PEP 345
+        if hasattr(self, 'python_requires'):
+            version = '1.2'
+
+        file.write('Metadata-Version: %s\n' % version)
+        file.write('Name: %s\n' % self.get_name())
+        file.write('Version: %s\n' % self.get_version())
+        file.write('Summary: %s\n' % self.get_description())
+        file.write('Home-page: %s\n' % self.get_url())
+        file.write('Author: %s\n' % self.get_contact())
+        file.write('Author-email: %s\n' % self.get_contact_email())
+        file.write('License: %s\n' % self.get_license())
+        if self.download_url:
+            file.write('Download-URL: %s\n' % self.download_url)
+
+        long_desc = rfc822_escape(self.get_long_description())
+        file.write('Description: %s\n' % long_desc)
+
+        keywords = ','.join(self.get_keywords())
+        if keywords:
+            file.write('Keywords: %s\n' % keywords)
+
+        self._write_list(file, 'Platform', self.get_platforms())
+        self._write_list(file, 'Classifier', self.get_classifiers())
+
+        # PEP 314
+        self._write_list(file, 'Requires', self.get_requires())
+        self._write_list(file, 'Provides', self.get_provides())
+        self._write_list(file, 'Obsoletes', self.get_obsoletes())
+
+        # Setuptools specific for PEP 345
         if hasattr(self, 'python_requires'):
             file.write('Requires-Python: %s\n' % self.python_requires)
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 0b9da53810..dff2a8c8ec 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -223,8 +223,10 @@ def test_python_requires_egg_info(self, tmpdir_cwd, env):
             env=environ,
         )
         egg_info_dir = os.path.join('.', 'foo.egg-info')
-        pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
-        assert 'Requires-Python: >=2.7.12' in open(pkginfo).read().split('\n')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        assert 'Requires-Python: >=2.7.12' in pkg_info_lines
+        assert 'Metadata-Version: 1.2' in pkg_info_lines
 
     def test_python_requires_install(self, tmpdir_cwd, env):
         self._setup_script_with_requires(

From 6a628a665c968ea0b5d08cd4f769436e0aba15f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 07:26:52 -0400
Subject: [PATCH 5927/8469] Remove unused variable

---
 setuptools/dist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 705ce9a3d3..59a5ecf238 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -43,7 +43,6 @@ def _get_unpatched(cls):
 
 def _patch_distribution_metadata_write_pkg_file():
     """Patch write_pkg_file to also write Requires-Python/Requires-External"""
-    original_write = distutils.dist.DistributionMetadata.write_pkg_file
 
     # Based on Python 3.5 version
     def write_pkg_file(self, file):

From b8d3bf71fae4829eceda274ccd322a8536bf3743 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 07:37:02 -0400
Subject: [PATCH 5928/8469] Adding preliminary support for enforcing style
 rules

---
 pytest.ini | 3 +++
 setup.py   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 2fa3a3ecc4..c693a4c342 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
+flake8-ignore =
+    setuptools/site-patch.py F821
+    setuptools/py*compat.py F811
diff --git a/setup.py b/setup.py
index 7bd3a079f3..0aa394fb31 100755
--- a/setup.py
+++ b/setup.py
@@ -161,6 +161,9 @@ def _gen_console_scripts():
     scripts=[],
     tests_require=[
         'setuptools[ssl]',
+        'pytest-flake8',
+        # workaround for pytest-flake8 #7
+        'flake8<3dev',
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[

From c9a8458db8e767c833d881f1ed42118eed7ffed9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 07:40:43 -0400
Subject: [PATCH 5929/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 28924a9745..63a634fb1c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v24.2.1
+-------
+
+* #667: Update Metadata-Version to 1.2 when
+  ``python_requires`` is supplied.
+
 v24.2.0
 -------
 

From 2f33817e85c57237457159c65b77b7a1626d062f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 08:03:39 -0400
Subject: [PATCH 5930/8469] =?UTF-8?q?Bump=20version:=2024.2.0=20=E2=86=92?=
 =?UTF-8?q?=2024.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f94f03c8cf..8b067cdc43 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.2.0
+current_version = 24.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0aa394fb31..73809f4c05 100755
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.2.0",
+    version="24.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From be2684d801b99757d35345809d6a0343ce863d75 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 08:03:40 -0400
Subject: [PATCH 5931/8469] Added tag v24.2.1 for changeset 5b577d179a7e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 85c47bdbba..a05be9a89d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -284,3 +284,4 @@ d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3
 a7d2f79f0996d881794af0f87595032098202811 v24.1.0
 d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1
 ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
+5b577d179a7e2f3020712c376c0200901e5c93c1 v24.2.1

From 9f77a068c02a3937762b8292c20e06d072247825 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 12:14:42 -0400
Subject: [PATCH 5932/8469] Disable os.link during make_distribution. Fixes
 #516.

Note that better would be if sdist provided some sort of hooks to better control the file copying, but since it does not, this technique will suffice for now.
---
 CHANGES.rst                 |  8 ++++++++
 setuptools/command/sdist.py | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 63a634fb1c..b01a6fadb7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v24.3.0
+-------
+
+* #516: Disable ``os.link`` to avoid hard linking
+  in ``sdist.make_distribution``, avoiding errors on
+  systems that support hard links but not on the
+  file system in which the build is occurring.
+
 v24.2.1
 -------
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 041ee42e2f..b86aae50f8 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,6 +4,7 @@
 import os
 import sys
 import io
+import contextlib
 
 from setuptools.extern import six
 
@@ -65,6 +66,32 @@ def run(self):
             if data not in dist_files:
                 dist_files.append(data)
 
+    def make_distribution(self):
+        """
+        Workaround for #516
+        """
+        with self._remove_os_link():
+            orig.sdist.make_distribution(self)
+
+    @staticmethod
+    @contextlib.contextmanager
+    def _remove_os_link():
+        """
+        In a context, remove and restore os.link if it exists
+        """
+        class NoValue:
+            pass
+        orig_val = getattr(os, 'link', NoValue)
+        try:
+            del os.link
+        except Exception:
+            pass
+        try:
+            yield
+        finally:
+            if orig_val is not NoValue:
+                setattr(os, 'link', orig_val)
+
     def __read_template_hack(self):
         # This grody hack closes the template file (MANIFEST.in) if an
         #  exception occurs during read_template.

From 48f4155552b31928ef88b68e25e78db330b8b919 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 12:15:22 -0400
Subject: [PATCH 5933/8469] =?UTF-8?q?Bump=20version:=2024.2.1=20=E2=86=92?=
 =?UTF-8?q?=2024.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8b067cdc43..50dee23b36 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.2.1
+current_version = 24.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 73809f4c05..d05ec7419c 100755
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.2.1",
+    version="24.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From e8d8a79224dd0e3b2af8a1f5708b06cc62e2b61a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 21 Jul 2016 12:15:23 -0400
Subject: [PATCH 5934/8469] Added tag v24.3.0 for changeset 83ca05973c16

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a05be9a89d..53264d8520 100644
--- a/.hgtags
+++ b/.hgtags
@@ -285,3 +285,4 @@ a7d2f79f0996d881794af0f87595032098202811 v24.1.0
 d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1
 ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
 5b577d179a7e2f3020712c376c0200901e5c93c1 v24.2.1
+83ca05973c16102145b339aec7e170d94966a2ba v24.3.0

From 7f118aaae6a49171a91248cc413dc78eb497a054 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 21 Jul 2016 10:17:11 +0700
Subject: [PATCH 5935/8469] Fix continuation line unaligned for hanging indent.

---
 setuptools/dist.py    | 6 +++---
 setuptools/sandbox.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0a19255313..c539f6efbc 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -542,19 +542,19 @@ def exclude_package(self, package):
         if self.packages:
             self.packages = [
                 p for p in self.packages
-                    if p != package and not p.startswith(pfx)
+                if p != package and not p.startswith(pfx)
             ]
 
         if self.py_modules:
             self.py_modules = [
                 p for p in self.py_modules
-                    if p != package and not p.startswith(pfx)
+                if p != package and not p.startswith(pfx)
             ]
 
         if self.ext_modules:
             self.ext_modules = [
                 p for p in self.ext_modules
-                    if p.name != package and not p.name.startswith(pfx)
+                if p.name != package and not p.name.startswith(pfx)
             ]
 
     def has_contents_for(self, package):
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index df630d3eec..2babb63654 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -258,7 +258,7 @@ class AbstractSandbox:
     def __init__(self):
         self._attrs = [
             name for name in dir(_os)
-                if not name.startswith('_') and hasattr(self, name)
+            if not name.startswith('_') and hasattr(self, name)
         ]
 
     def _copy(self, source):

From b3b8a8d106ecf9dbdb933f4f2a09ec65003b7d05 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Fri, 22 Jul 2016 12:56:21 +0700
Subject: [PATCH 5936/8469] Use 'except Exception:' instead of 'except:'.

---
 setuptools/command/easy_install.py | 4 ++--
 setuptools/command/sdist.py        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5ce529b2d6..468b9be726 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -431,7 +431,7 @@ def pseudo_tempname(self):
         """
         try:
             pid = os.getpid()
-        except:
+        except Exception:
             pid = random.randint(0, sys.maxsize)
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
@@ -929,7 +929,7 @@ def install_egg(self, egg_path, tmpdir):
                     destination,
                     fix_zipimporter_caches=new_dist_is_zipped,
                 )
-            except:
+            except Exception:
                 update_dist_caches(destination, fix_zipimporter_caches=False)
                 raise
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index b86aae50f8..b6125f5888 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -99,7 +99,7 @@ def __read_template_hack(self):
         #  file.
         try:
             orig.sdist.read_template(self)
-        except:
+        except Exception:
             _, _, tb = sys.exc_info()
             tb.tb_next.tb_frame.f_locals['template'].close()
             raise

From 7c0cfe7a3e4123bbb66f540e829e98673ca1ed7f Mon Sep 17 00:00:00 2001
From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Fri, 22 Jul 2016 12:15:29 +0200
Subject: [PATCH 5937/8469] Issue #27472: Add test.support.unix_shell as the
 path to the default shell.

---
 tests/test_spawn.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index f507ef7750..5edc24a3a1 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -1,7 +1,8 @@
 """Tests for distutils.spawn."""
 import unittest
+import sys
 import os
-from test.support import run_unittest
+from test.support import run_unittest, unix_shell
 
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn
@@ -29,9 +30,9 @@ def test_spawn(self):
 
         # creating something executable
         # through the shell that returns 1
-        if os.name == 'posix':
+        if sys.platform != 'win32':
             exe = os.path.join(tmpdir, 'foo.sh')
-            self.write_file(exe, '#!/bin/sh\nexit 1')
+            self.write_file(exe, '#!%s\nexit 1' % unix_shell)
         else:
             exe = os.path.join(tmpdir, 'foo.bat')
             self.write_file(exe, 'exit 1')
@@ -40,9 +41,9 @@ def test_spawn(self):
         self.assertRaises(DistutilsExecError, spawn, [exe])
 
         # now something that works
-        if os.name == 'posix':
+        if sys.platform != 'win32':
             exe = os.path.join(tmpdir, 'foo.sh')
-            self.write_file(exe, '#!/bin/sh\nexit 0')
+            self.write_file(exe, '#!%s\nexit 0' % unix_shell)
         else:
             exe = os.path.join(tmpdir, 'foo.bat')
             self.write_file(exe, 'exit 0')

From 4df6b3592b3a8e21006ee5d5b8e96ca685748954 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 14:50:42 -0400
Subject: [PATCH 5938/8469] Adding simple appveyor config

---
 appveyor.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..bd43fb2d8d
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,14 @@
+environment:
+
+  matrix:
+    - PYTHON: "C:\\Python35-x64"
+
+install:
+  - "mklink /s /d \"C:\\Program Files\\Python\" %PYTHON%"
+  - "SET PYTHON=\"C:\\Program Files\\Python\""
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+build: off
+
+test_script:
+  - "%PYTHON%\\python setup.py test"

From b1781f2786d062c6c4678f18b9355421297c6d47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 14:53:18 -0400
Subject: [PATCH 5939/8469] Correct mklink usage. Symlink is the default.

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index bd43fb2d8d..35938480bb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,8 @@ environment:
     - PYTHON: "C:\\Python35-x64"
 
 install:
-  - "mklink /s /d \"C:\\Program Files\\Python\" %PYTHON%"
+  # symlink python from a directory with a space
+  - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
   - "SET PYTHON=\"C:\\Program Files\\Python\""
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 

From 299aaee1b09372f1735a640a849082cd8abda979 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 14:55:03 -0400
Subject: [PATCH 5940/8469] Need to bootstrap egg_info.

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 35938480bb..4fdef703f9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,4 +12,5 @@ install:
 build: off
 
 test_script:
+  - "%PYTHON%\\python bootstrap.py"
   - "%PYTHON%\\python setup.py test"

From 0f6fa71ca87f0a849455fbffd18ec30081317a98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 14:58:36 -0400
Subject: [PATCH 5941/8469] Should be able to execute without specifying the
 full path.

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4fdef703f9..4ae6c791d1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,5 +12,5 @@ install:
 build: off
 
 test_script:
-  - "%PYTHON%\\python bootstrap.py"
-  - "%PYTHON%\\python setup.py test"
+  - "python bootstrap.py"
+  - "python setup.py test"

From 2dff41bc302204b1a30af94f40650da4aa23e063 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 15:06:50 -0400
Subject: [PATCH 5942/8469] Docs must be built from docs directory and not from
 root now.

---
 docs/developer-guide.txt | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 7cd3c6d2dc..ad47cafd8b 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -111,15 +111,5 @@ Setuptools follows ``semver``.
 Building Documentation
 ----------------------
 
-Setuptools relies on the Sphinx system for building documentation and in
-particular the ``build_sphinx`` distutils command. To build the
-documentation, invoke::
-
-    python setup.py build_sphinx
-
-from the root of the repository. Setuptools will download a compatible
-build of Sphinx and any requisite plugins and then build the
-documentation in the build/sphinx directory.
-
-Setuptools does not support invoking the doc builder from the docs/
-directory as some tools expect.
+Setuptools relies on the Sphinx system for building documentation.
+To accommodate RTD, docs must be built from the docs/ directory.

From b594b7c00dd43d3ae2b1a0b349cd0436fb8232d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 15:09:05 -0400
Subject: [PATCH 5943/8469] Reference gitter in dev guide

---
 docs/developer-guide.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index ad47cafd8b..3ff77c25d9 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -32,8 +32,8 @@ User support and discussions are done through the issue tracker (for specific)
 issues, through the distutils-sig mailing list, or on IRC (Freenode) at
 #pypa.
 
-Discussions about development happen on the pypa-dev mailing list or on IRC
-(Freenode) at #pypa-dev.
+Discussions about development happen on the pypa-dev mailing list or on
+`Gitter <https://gitter.im/pypa/setuptools>`_.
 
 -----------------
 Authoring Tickets

From 451b84a0c56e23eea5396981747d570c80aef773 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Jul 2016 15:16:19 -0400
Subject: [PATCH 5944/8469] Correct spelling

---
 setuptools/tests/test_msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 2fbd56bf4f..9b5ffba01a 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -71,7 +71,7 @@ def test_patched(self):
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
         assert mod_name == "setuptools.msvc", "find_vcvarsall unpatched"
 
-    def test_no_registry_entryies_means_nothing_found(self):
+    def test_no_registry_entries_means_nothing_found(self):
         """
         No registry entries or environment variable should lead to an error
         directing the user to download vcpython27.

From 9fff1f8cdf26b67e8b5299f5295112c5ca5aa40b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:00:54 -0400
Subject: [PATCH 5945/8469] Add reference to pull request for functionality
 added in 18.3.

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b01a6fadb7..c65bbce3fc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -520,7 +520,8 @@ v20.6.0
 18.3
 ----
 
-* Setuptools now allows disabling of the manipulation of the sys.path
+* BB Pull Request #135: Setuptools now allows disabling of
+  the manipulation of the sys.path
   during the processing of the easy-install.pth file. To do so, set
   the environment variable ``SETUPTOOLS_SYS_PATH_TECHNIQUE`` to
   anything but "rewrite" (consider "raw"). During any install operation

From 8b693597c1bbe6effb24ba209f1f36fd17ee9e90 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:11:35 -0400
Subject: [PATCH 5946/8469] Add docs on building docs

---
 docs/developer-guide.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 3ff77c25d9..70e7f1cd0a 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -113,3 +113,8 @@ Building Documentation
 
 Setuptools relies on the Sphinx system for building documentation.
 To accommodate RTD, docs must be built from the docs/ directory.
+
+To build them, you need to have installed the requirements specified
+in docs/requirements.txt. One way to do this is to use rwt:
+
+    setuptools/docs$ python -m rwt -r requirements.txt -- -m sphinx . html

From 3c9a71fa4e161500d45b64590274007871303280 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:28:50 -0400
Subject: [PATCH 5947/8469] Update changelog

---
 CHANGES.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index c65bbce3fc..97f4638628 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+v24.3.1
+-------
+
+* #398: Fix shebang handling on Windows in script
+  headers where spaces in ``sys.executable`` would
+  produce an improperly-formatted shebang header,
+  introduced in 12.0 with the fix for #188.
+
+* #663, #670: More style updates.
+
 v24.3.0
 -------
 

From 0b10bf4ecc20b8a2ad033af53bd17d37b85ab60e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:29:11 -0400
Subject: [PATCH 5948/8469] =?UTF-8?q?Bump=20version:=2024.3.0=20=E2=86=92?=
 =?UTF-8?q?=2024.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 50dee23b36..52edb99c32 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.3.0
+current_version = 24.3.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d05ec7419c..6863a900a6 100755
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.3.0",
+    version="24.3.1",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 9b058f7a10a4cca6541ef9f02b5a3a2703aacaea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:29:11 -0400
Subject: [PATCH 5949/8469] Added tag v24.3.1 for changeset e14229dd2abc

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 53264d8520..f8d0ce84ff 100644
--- a/.hgtags
+++ b/.hgtags
@@ -286,3 +286,4 @@ d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1
 ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
 5b577d179a7e2f3020712c376c0200901e5c93c1 v24.2.1
 83ca05973c16102145b339aec7e170d94966a2ba v24.3.0
+e14229dd2abc034530447d64ed87fddb944347bd v24.3.1

From e211f4584ac59f404a3e1a17c6b54dff18468cf6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:17:27 -0400
Subject: [PATCH 5950/8469] Set sys path technique to raw by default. Fixes
 #674.

---
 CHANGES.rst                        | 19 +++++++++++++++++++
 setuptools/command/easy_install.py |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 97f4638628..83c10ce7b5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,25 @@
 CHANGES
 =======
 
+v25.0.0
+-------
+
+* #674: Default ``sys.path`` manipulation by easy-install.pth
+  is now "raw", meaning that when writing easy-install.pth
+  during any install operation, the ``sys.path`` will not be
+  rewritten, giving preference to easy_installed packages.
+
+  To retain the old behavior when using any easy_install
+  operation (including ``setup.py install`` when setuptools is
+  present), set the environment variable:
+
+    SETUPTOOLS_SYS_PATH_TECHNIQUE=rewrite
+
+  This project hopes that that few if any environments find it
+  necessary to retain the old behavior, and intends to drop
+  support for it altogether in a future release. Please report
+  any relevant concerns in the ticket for this change.
+
 v24.3.1
 -------
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 19f8286b2e..0e0dc2c4f4 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1661,7 +1661,7 @@ def _wrap_lines(cls, lines):
         """)
 
 
-if os.environ.get('SETUPTOOLS_SYS_PATH_TECHNIQUE', 'rewrite') == 'rewrite':
+if os.environ.get('SETUPTOOLS_SYS_PATH_TECHNIQUE', 'raw') == 'rewrite':
     PthDistributions = RewritePthDistributions
 
 

From 2473c6f91d52699c050f83b8b68224e0ded581d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:30:31 -0400
Subject: [PATCH 5951/8469] =?UTF-8?q?Bump=20version:=2024.3.1=20=E2=86=92?=
 =?UTF-8?q?=2025.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 52edb99c32..1c72e12472 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 24.3.1
+current_version = 25.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6863a900a6..14b1b78dbe 100755
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ def _gen_console_scripts():
 
 setup_params = dict(
     name="setuptools",
-    version="24.3.1",
+    version="25.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",

From 8a133bd9d91d7c40dabac05ad64f8a008f552f7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 04:30:33 -0400
Subject: [PATCH 5952/8469] Added tag v25.0.0 for changeset 58e92028ab00

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f8d0ce84ff..4b814cda7f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -287,3 +287,4 @@ ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
 5b577d179a7e2f3020712c376c0200901e5c93c1 v24.2.1
 83ca05973c16102145b339aec7e170d94966a2ba v24.3.0
 e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
+58e92028ab0061f1f80d98e769c9143305275242 v25.0.0

From 2b8cf28f3be32903b79e5b5b579fab38105791dd Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sat, 23 Jul 2016 12:56:52 +0200
Subject: [PATCH 5953/8469] Exception will not raise

because MSVC9 may be find by new behavior at setuptools/msvc.py line 171.
---
 setuptools/tests/test_msvc.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 9b5ffba01a..ad96752d94 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -83,10 +83,12 @@ def test_no_registry_entries_means_nothing_found(self):
             with mock_reg():
                 assert find_vcvarsall(9.0) is None
 
-                expected = distutils.errors.DistutilsPlatformError
-                with pytest.raises(expected) as exc:
+                try:
                     query_vcvarsall(9.0)
-                assert 'aka.ms/vcpython27' in str(exc)
+                except Exception as exc:
+                    expected = distutils.errors.DistutilsPlatformError
+                    assert isinstance(expected, exc)
+                    assert 'aka.ms/vcpython27' in str(exc)
 
     @pytest.yield_fixture
     def user_preferred_setting(self):

From 1a0644e065bfe2f05a64d92b4abd31392d471751 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Sat, 23 Jul 2016 13:01:13 +0200
Subject: [PATCH 5954/8469] Update test_msvc.py

---
 setuptools/tests/test_msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index ad96752d94..a0c76ea0da 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -87,7 +87,7 @@ def test_no_registry_entries_means_nothing_found(self):
                     query_vcvarsall(9.0)
                 except Exception as exc:
                     expected = distutils.errors.DistutilsPlatformError
-                    assert isinstance(expected, exc)
+                    assert isinstance(exc, expected)
                     assert 'aka.ms/vcpython27' in str(exc)
 
     @pytest.yield_fixture

From 145acd3ccfb7aac2b9658ce8ef4f5cb3fa265d94 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:03:13 -0400
Subject: [PATCH 5955/8469] Only require the metadata when setup is invoked,
 not on import. Fixes #676.

---
 setup.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 14b1b78dbe..880d3f81b7 100755
--- a/setup.py
+++ b/setup.py
@@ -11,10 +11,11 @@
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
-# Prevent improper installs without necessary metadata. See #659
-if not os.path.exists('setuptools.egg-info'):
-    msg = "Cannot build setuptools without metadata. Run bootstrap.py"
-    raise RuntimeError(msg)
+def require_metadata():
+    "Prevent improper installs without necessary metadata. See #659"
+    if not os.path.exists('setuptools.egg-info'):
+        msg = "Cannot build setuptools without metadata. Run bootstrap.py"
+        raise RuntimeError(msg)
 
 src_root = None
 
@@ -171,4 +172,5 @@ def _gen_console_scripts():
 )
 
 if __name__ == '__main__':
+    require_metadata()
     dist = setuptools.setup(**setup_params)

From 09ca40cc931c611952d344b96d1d6a5bfd6b502c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:22:14 -0400
Subject: [PATCH 5956/8469] Refactor setup script for nicer indentation and
 readability.

---
 setup.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 880d3f81b7..017a4119e1 100755
--- a/setup.py
+++ b/setup.py
@@ -56,14 +56,22 @@ def _gen_console_scripts():
 with readme_file:
     long_description = readme_file.read()
 
-package_data = {
-        'setuptools': ['script (dev).tmpl', 'script.tmpl', 'site-patch.py']}
+package_data = dict(
+    setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
+)
+
 force_windows_specific_files = (
     os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
     not in (None, "", "0")
 )
-if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
-        or force_windows_specific_files:
+
+include_windows_files = (
+    sys.platform == 'win32' or
+    os.name == 'java' and os._name == 'nt' or
+    force_windows_specific_files
+)
+
+if include_windows_files:
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
@@ -76,7 +84,7 @@ def _gen_console_scripts():
     name="setuptools",
     version="25.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
-                "Python packages",
+        "Python packages",
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     long_description=long_description,

From cc5004500ea05e868f9a661500f3fd29a4d05037 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:26:53 -0400
Subject: [PATCH 5957/8469] Move imports to the top

---
 setup.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 017a4119e1..a162872d10 100755
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,9 @@
 import os
 import sys
 import textwrap
+from distutils.util import convert_path
+
+import setuptools
 
 # Allow to run setup.py from another directory.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -19,16 +22,13 @@ def require_metadata():
 
 src_root = None
 
-from distutils.util import convert_path
+def read_commands():
+    command_ns = {}
+    init_path = convert_path('setuptools/command/__init__.py')
+    with open(init_path) as init_file:
+        exec(init_file.read(), command_ns)
+    return command_ns['__all__']
 
-command_ns = {}
-init_path = convert_path('setuptools/command/__init__.py')
-with open(init_path) as init_file:
-    exec(init_file.read(), command_ns)
-
-SETUP_COMMANDS = command_ns['__all__']
-
-import setuptools
 
 scripts = []
 
@@ -101,7 +101,7 @@ def _gen_console_scripts():
     entry_points={
         "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
-            for cmd in SETUP_COMMANDS
+            for cmd in read_commands()
         ],
         "distutils.setup_keywords": [
             "eager_resources        = setuptools.dist:assert_string_list",

From 4842be2133a0438524cab3b8e2abada6df9e7c5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:32:23 -0400
Subject: [PATCH 5958/8469] Compute dependency links, enabling short lines and
 codifying the path resolution.

---
 setup.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index a162872d10..cff9088807 100755
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,16 @@ def _gen_console_scripts():
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
+def pypi_link(pkg_filename):
+    """
+    Given the filename, including md5 fragment, construct the
+    dependency link for PyPI.
+    """
+    root = 'https://pypi.python.org/packages/source'
+    name, sep, rest = pkg_filename.partition('-')
+    parts = root, name[0], name, pkg_filename
+    return '/'.join(parts)
+
 setup_params = dict(
     name="setuptools",
     version="25.0.0",
@@ -164,8 +174,12 @@ def _gen_console_scripts():
         "certs": "certifi==2016.2.28",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
-        'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
+        pypi_link(
+            'certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
+        ),
+        pypi_link(
+            'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
+        ),
     ],
     scripts=[],
     tests_require=[

From 2eb1007f8d1a2cf6b60f19df665c5dade3d7c8da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:35:41 -0400
Subject: [PATCH 5959/8469] Remove unused variable

---
 setup.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index cff9088807..6065321603 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,6 @@ def require_metadata():
         msg = "Cannot build setuptools without metadata. Run bootstrap.py"
         raise RuntimeError(msg)
 
-src_root = None
 
 def read_commands():
     command_ns = {}
@@ -30,9 +29,6 @@ def read_commands():
     return command_ns['__all__']
 
 
-scripts = []
-
-
 def _gen_console_scripts():
     yield "easy_install = setuptools.command.easy_install:main"
 
@@ -49,11 +45,7 @@ def _gen_console_scripts():
         .format(shortver=sys.version[:3]))
 
 
-console_scripts = list(_gen_console_scripts())
-
-readme_file = io.open('README.rst', encoding='utf-8')
-
-with readme_file:
+with io.open('README.rst', encoding='utf-8') as readme_file:
     long_description = readme_file.read()
 
 package_data = dict(
@@ -100,7 +92,7 @@ def pypi_link(pkg_filename):
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
     url="https://github.com/pypa/setuptools",
-    src_root=src_root,
+    src_root=None,
     packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
 
@@ -146,7 +138,7 @@ def pypi_link(pkg_filename):
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
-        "console_scripts": console_scripts,
+        "console_scripts": list(_gen_console_scripts()),
 
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],

From bf866865418c7c58970b9f8da9151f7df3cba6af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:44:59 -0400
Subject: [PATCH 5960/8469] Eliminate dependence on convert_path. Windows
 allows forward slashes, so just use them.

---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 6065321603..4eb3f78ed4 100755
--- a/setup.py
+++ b/setup.py
@@ -7,12 +7,13 @@
 import os
 import sys
 import textwrap
-from distutils.util import convert_path
 
 import setuptools
 
+here = os.path.dirname(__file__)
+
 # Allow to run setup.py from another directory.
-os.chdir(os.path.dirname(os.path.abspath(__file__)))
+here and os.chdir(here)
 
 def require_metadata():
     "Prevent improper installs without necessary metadata. See #659"
@@ -23,7 +24,8 @@ def require_metadata():
 
 def read_commands():
     command_ns = {}
-    init_path = convert_path('setuptools/command/__init__.py')
+    cmd_module_path = 'setuptools/command/__init__.py'
+    init_path = os.path.join(here, cmd_module_path)
     with open(init_path) as init_file:
         exec(init_file.read(), command_ns)
     return command_ns['__all__']

From 5a63f386217cae916c60cc8a89ae1115df9ea7f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:51:20 -0400
Subject: [PATCH 5961/8469] Only chdir when executed, which may be unnecessary,
 but keeping it for compatibility.

---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 4eb3f78ed4..355b0aaa45 100755
--- a/setup.py
+++ b/setup.py
@@ -10,10 +10,9 @@
 
 import setuptools
 
+
 here = os.path.dirname(__file__)
 
-# Allow to run setup.py from another directory.
-here and os.chdir(here)
 
 def require_metadata():
     "Prevent improper installs without necessary metadata. See #659"
@@ -47,7 +46,8 @@ def _gen_console_scripts():
         .format(shortver=sys.version[:3]))
 
 
-with io.open('README.rst', encoding='utf-8') as readme_file:
+readme_path = os.path.join(here, 'README.rst')
+with io.open(readme_path, encoding='utf-8') as readme_file:
     long_description = readme_file.read()
 
 package_data = dict(
@@ -188,5 +188,7 @@ def pypi_link(pkg_filename):
 )
 
 if __name__ == '__main__':
+    # allow setup.py to run from another directory
+    here and os.path.chdir(here)
     require_metadata()
     dist = setuptools.setup(**setup_params)

From 8dea0697aa3089de31f96c02d734d9ed05d3dac9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jul 2016 13:56:57 -0400
Subject: [PATCH 5962/8469] Mark failing tests as xfail until they can be
 resolved. Ref #591.

---
 pkg_resources/tests/test_resources.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 31847dc842..e0dbb65279 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import string
+import platform
 
 from pkg_resources.extern.six.moves import map
 
@@ -763,6 +764,9 @@ def patched_path(self, tmpdir):
             pkg_resources._namespace_packages = saved_ns_pkgs
             sys.path = saved_sys_path
 
+    issue591 = pytest.mark.xfail(platform.system()=='Windows', reason="#591")
+
+    @issue591
     def test_two_levels_deep(self, symlinked_tmpdir):
         """
         Test nested namespace packages
@@ -796,6 +800,7 @@ def test_two_levels_deep(self, symlinked_tmpdir):
         ]
         assert pkg1.pkg2.__path__ == expected
 
+    @issue591
     def test_path_order(self, symlinked_tmpdir):
         """
         Test that if multiple versions of the same namespace package subpackage

From 52e41435776bf0d07de4e14a51944085b2235609 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 24 Jul 2016 09:33:26 +0700
Subject: [PATCH 5963/8469] setup.py: add missing blank line.

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index 355b0aaa45..9df3da1616 100755
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ def _gen_console_scripts():
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
+
 def pypi_link(pkg_filename):
     """
     Given the filename, including md5 fragment, construct the
@@ -84,6 +85,7 @@ def pypi_link(pkg_filename):
     parts = root, name[0], name, pkg_filename
     return '/'.join(parts)
 
+
 setup_params = dict(
     name="setuptools",
     version="25.0.0",

From 86689c912fe8d7c0c468e177f0f1f8b9260d4924 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 24 Jul 2016 17:59:53 +0700
Subject: [PATCH 5964/8469] docs/conf.py: split multiple imports on one line.

---
 docs/conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 07d6ad41ca..be0101521d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
 # Allow Sphinx to find the setup command that is imported below, as referenced above.
-import sys, os
+import os
+import sys
 sys.path.append(os.path.abspath('..'))
 
 import setup as setup_script

From a8026f2911ed96c6a8f9a91e297e09af40bbce8c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 24 Jul 2016 19:40:17 +0700
Subject: [PATCH 5965/8469] README: make exactly one space after period.

---
 README.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index d8d8a6e53b..2cf762d7d6 100755
--- a/README.rst
+++ b/README.rst
@@ -57,7 +57,7 @@ The recommended way to install setuptools on Windows is to download
 distribution file and install it for you.
 
 Once installation is complete, you will find an ``easy_install`` program in
-your Python ``Scripts`` subdirectory.  For simple invocation and best results,
+your Python ``Scripts`` subdirectory. For simple invocation and best results,
 add this directory to your ``PATH`` environment variable, if it is not already
 present. If you did a user-local install, the ``Scripts`` subdirectory is
 ``$env:APPDATA\Python\Scripts``.
@@ -134,7 +134,7 @@ Downloads
 =========
 
 All setuptools downloads can be found at `the project's home page in the Python
-Package Index`_.  Scroll to the very bottom of the page to find the links.
+Package Index`_. Scroll to the very bottom of the page to find the links.
 
 .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools
 
@@ -175,9 +175,9 @@ learning about Setuptools, Python Eggs, and EasyInstall:
 * `The Internal Structure of Python Eggs`_
 
 Questions, comments, and bug reports should be directed to the `distutils-sig
-mailing list`_.  If you have written (or know of) any tutorials, documentation,
+mailing list`_. If you have written (or know of) any tutorials, documentation,
 plug-ins, or other resources for setuptools users, please let us know about
-them there, so this reference list can be updated.  If you have working,
+them there, so this reference list can be updated. If you have working,
 *tested* patches to correct problems or add features, you may submit them to
 the `setuptools bug tracker`_.
 
@@ -194,13 +194,13 @@ Credits
 -------
 
 * The original design for the ``.egg`` format and the ``pkg_resources`` API was
-  co-created by Phillip Eby and Bob Ippolito.  Bob also implemented the first
+  co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
   version of ``pkg_resources``, and supplied the OS X operating system version
   compatibility algorithm.
 
 * Ian Bicking implemented many early "creature comfort" features of
   easy_install, including support for downloading via Sourceforge and
-  Subversion repositories.  Ian's comments on the Web-SIG about WSGI
+  Subversion repositories. Ian's comments on the Web-SIG about WSGI
   application deployment also inspired the concept of "entry points" in eggs,
   and he has given talks at PyCon and elsewhere to inform and educate the
   community about eggs and setuptools.
@@ -215,7 +215,7 @@ Credits
 
 * Significant parts of the implementation of setuptools were funded by the Open
   Source Applications Foundation, to provide a plug-in infrastructure for the
-  Chandler PIM application.  In addition, many OSAF staffers (such as Mike
+  Chandler PIM application. In addition, many OSAF staffers (such as Mike
   "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
   use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
 
@@ -224,7 +224,7 @@ Credits
   and addressed many defects.
 
 * Since the merge with Distribute, Jason R. Coombs is the
-  maintainer of setuptools.  The project is maintained in coordination with
+  maintainer of setuptools. The project is maintained in coordination with
   the Python Packaging Authority (PyPA) and the larger Python community.
 
 .. _files:

From 6156244cdeb74e39538516c9889596cbf994b68e Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 24 Jul 2016 21:44:15 +0700
Subject: [PATCH 5966/8469] CHANGES: make exactly one space after period.

---
 CHANGES.rst | 74 ++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 83c10ce7b5..5442f2a601 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1250,12 +1250,12 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 
 * Issue #125: Prevent Subversion support from creating a ~/.subversion
   directory just for checking the presence of a Subversion repository.
-* Issue #12: Namespace packages are now imported lazily.  That is, the mere
+* Issue #12: Namespace packages are now imported lazily. That is, the mere
   declaration of a namespace package in an egg on ``sys.path`` no longer
-  causes it to be imported when ``pkg_resources`` is imported.  Note that this
+  causes it to be imported when ``pkg_resources`` is imported. Note that this
   change means that all of a namespace package's ``__init__.py`` files must
   include a ``declare_namespace()`` call in order to ensure that they will be
-  handled properly at runtime.  In 2.x it was possible to get away without
+  handled properly at runtime. In 2.x it was possible to get away without
   including the declaration, but only at the cost of forcing namespace
   packages to be imported early, which 3.0 no longer does.
 * Issue #148: When building (bdist_egg), setuptools no longer adds
@@ -2036,7 +2036,7 @@ how it parses version numbers.
 * Distribute #67: Fixed doc typo (PEP 381/PEP 382).
 
 * Distribute no longer shadows setuptools if we require a 0.7-series
-  setuptools.  And an error is raised when installing a 0.7 setuptools with
+  setuptools. And an error is raised when installing a 0.7 setuptools with
   distribute.
 
 * When run from within buildout, no attempt is made to modify an existing
@@ -2336,7 +2336,7 @@ easy_install
  * Fix ``bdist_egg`` not including files in subdirectories of ``.egg-info``.
 
  * Allow ``.py`` files found by the ``include_package_data`` option to be
-   automatically included.  Remove duplicate data file matches if both
+   automatically included. Remove duplicate data file matches if both
    ``include_package_data`` and ``package_data`` are used to refer to the same
    files.
 
@@ -2377,7 +2377,7 @@ easy_install
    directory doesn't need to support .pth files.
 
  * ``MANIFEST.in`` is now forcibly closed when any errors occur while reading
-   it.  Previously, the file could be left open and the actual error would be
+   it. Previously, the file could be left open and the actual error would be
    masked by problems trying to remove the open file on Windows systems.
 
 0.6a10
@@ -2390,7 +2390,7 @@ easy_install
 
  * The ``sdist`` command no longer uses the traditional ``MANIFEST`` file to
    create source distributions.  ``MANIFEST.in`` is still read and processed,
-   as are the standard defaults and pruning.  But the manifest is built inside
+   as are the standard defaults and pruning. But the manifest is built inside
    the project's ``.egg-info`` directory as ``SOURCES.txt``, and it is rebuilt
    every time the ``egg_info`` command is run.
 
@@ -2426,11 +2426,11 @@ easy_install
    command so that you can more easily wrap a "flat" egg in a system package.
 
  * Enhanced ``bdist_rpm`` so that it installs single-version eggs that
-   don't rely on a ``.pth`` file.  The ``--no-egg`` option has been removed,
+   don't rely on a ``.pth`` file. The ``--no-egg`` option has been removed,
    since all RPMs are now built in a more backwards-compatible format.
 
  * Support full roundtrip translation of eggs to and from ``bdist_wininst``
-   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
+   format. Running ``bdist_wininst`` on a setuptools-based package wraps the
    egg in an .exe that will safely install it as an egg (i.e., with metadata
    and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
    back into an ``.egg`` file or directory and install it as such.
@@ -2454,19 +2454,19 @@ easy_install
 
  * Fixed some problems with fresh checkouts of projects that don't include
    ``.egg-info/PKG-INFO`` under revision control and put the project's source
-   code directly in the project directory.  If such a package had any
+   code directly in the project directory. If such a package had any
    requirements that get processed before the ``egg_info`` command can be run,
    the setup scripts would fail with a "Missing 'Version:' header and/or
    PKG-INFO file" error, because the egg runtime interpreted the unbuilt
    metadata in a directory on ``sys.path`` (i.e. the current directory) as
-   being a corrupted egg.  Setuptools now monkeypatches the distribution
+   being a corrupted egg. Setuptools now monkeypatches the distribution
    metadata cache to pretend that the egg has valid version information, until
    it has a chance to make it actually be so (via the ``egg_info`` command).
 
 0.6a5
 -----
 
- * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
+ * Fixed missing gui/cli .exe files in distribution. Fixed bugs in tests.
 
 0.6a3
 -----
@@ -2479,8 +2479,8 @@ easy_install
 -----
 
  * Added ``console_scripts`` entry point group to allow installing scripts
-   without the need to create separate script files.  On Windows, console
-   scripts get an ``.exe`` wrapper so you can just type their name.  On other
+   without the need to create separate script files. On Windows, console
+   scripts get an ``.exe`` wrapper so you can just type their name. On other
    platforms, the scripts are written without a file extension.
 
 0.6a1
@@ -2490,7 +2490,7 @@ easy_install
    the target package, using a ``--no-egg`` option.
 
  * The ``build_ext`` command now works better when using the ``--inplace``
-   option and multiple Python versions.  It now makes sure that all extensions
+   option and multiple Python versions. It now makes sure that all extensions
    match the current Python version, even if newer copies were built for a
    different Python version.
 
@@ -2520,11 +2520,11 @@ easy_install
 
  * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
    metadata writers using entry points, so that they can be extended by
-   third-party packages.  See `Creating distutils Extensions
+   third-party packages. See `Creating distutils Extensions
    <http://pythonhosted.org/setuptools/setuptools.html#creating-distutils-extensions>`_
    for more details.
 
- * The vestigial ``depends`` command has been removed.  It was never finished
+ * The vestigial ``depends`` command has been removed. It was never finished
    or documented, and never would have worked without EasyInstall - which it
    pre-dated and was never compatible with.
 
@@ -2558,9 +2558,9 @@ easy_install
 
  * ``setup.py install`` now automatically detects when an "unmanaged" package
    or module is going to be on ``sys.path`` ahead of a package being installed,
-   thereby preventing the newer version from being imported.  If this occurs,
+   thereby preventing the newer version from being imported. If this occurs,
    a warning message is output to ``sys.stderr``, but installation proceeds
-   anyway.  The warning message informs the user what files or directories
+   anyway. The warning message informs the user what files or directories
    need deleting, and advises them they can also use EasyInstall (with the
    ``--delete-conflicting`` option) to do it automatically.
 
@@ -2581,14 +2581,14 @@ easy_install
  * The "egg_info" command now always sets the distribution metadata to "safe"
    forms of the distribution name and version, so that distribution files will
    be generated with parseable names (i.e., ones that don't include '-' in the
-   name or version).  Also, this means that if you use the various ``--tag``
+   name or version). Also, this means that if you use the various ``--tag``
    options of "egg_info", any distributions generated will use the tags in the
    version, not just egg distributions.
 
  * Added support for defining command aliases in distutils configuration files,
-   under the "[aliases]" section.  To prevent recursion and to allow aliases to
+   under the "[aliases]" section. To prevent recursion and to allow aliases to
    call the command of the same name, a given alias can be expanded only once
-   per command-line invocation.  You can define new aliases with the "alias"
+   per command-line invocation. You can define new aliases with the "alias"
    command, either for the local, global, or per-user configuration.
 
  * Added "rotate" command to delete old distribution files, given a set of
@@ -2596,7 +2596,7 @@ easy_install
    recently-modified distribution files matching each pattern.)
 
  * Added "saveopts" command that saves all command-line options for the current
-   invocation to the local, global, or per-user configuration file.  Useful for
+   invocation to the local, global, or per-user configuration file. Useful for
    setting defaults without having to hand-edit a configuration file.
 
  * Added a "setopt" command that sets a single option in a specified distutils
@@ -2615,7 +2615,7 @@ easy_install
  * Beefed up the "sdist" command so that if you don't have a MANIFEST.in, it
    will include all files under revision control (CVS or Subversion) in the
    current directory, and it will regenerate the list every time you create a
-   source distribution, not just when you tell it to.  This should make the
+   source distribution, not just when you tell it to. This should make the
    default "do what you mean" more often than the distutils' default behavior
    did, while still retaining the old behavior in the presence of MANIFEST.in.
 
@@ -2630,14 +2630,14 @@ easy_install
 0.5a5
 -----
 
- * Added ``develop`` command to ``setuptools``-based packages.  This command
+ * Added ``develop`` command to ``setuptools``-based packages. This command
    installs an ``.egg-link`` pointing to the package's source directory, and
    script wrappers that ``execfile()`` the source versions of the package's
-   scripts.  This lets you put your development checkout(s) on sys.path without
+   scripts. This lets you put your development checkout(s) on sys.path without
    having to actually install them.  (To uninstall the link, use
    use ``setup.py develop --uninstall``.)
 
- * Added ``egg_info`` command to ``setuptools``-based packages.  This command
+ * Added ``egg_info`` command to ``setuptools``-based packages. This command
    just creates or updates the "projectname.egg-info" directory, without
    building an egg.  (It's used by the ``bdist_egg``, ``test``, and ``develop``
    commands.)
@@ -2645,11 +2645,11 @@ easy_install
  * Enhanced the ``test`` command so that it doesn't install the package, but
    instead builds any C extensions in-place, updates the ``.egg-info``
    metadata, adds the source directory to ``sys.path``, and runs the tests
-   directly on the source.  This avoids an "unmanaged" installation of the
+   directly on the source. This avoids an "unmanaged" installation of the
    package to ``site-packages`` or elsewhere.
 
  * Made ``easy_install`` a standard ``setuptools`` command, moving it from
-   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
+   the ``easy_install`` module to ``setuptools.command.easy_install``. Note
    that if you were importing or extending it, you must now change your imports
    accordingly.  ``easy_install.py`` is still installed as a script, but not as
    a module.
@@ -2660,10 +2660,10 @@ easy_install
  * Setup scripts using setuptools can now list their dependencies directly in
    the setup.py file, without having to manually create a ``depends.txt`` file.
    The ``install_requires`` and ``extras_require`` arguments to ``setup()``
-   are used to create a dependencies file automatically.  If you are manually
+   are used to create a dependencies file automatically. If you are manually
    creating ``depends.txt`` right now, please switch to using these setup
    arguments as soon as practical, because ``depends.txt`` support will be
-   removed in the 0.6 release cycle.  For documentation on the new arguments,
+   removed in the 0.6 release cycle. For documentation on the new arguments,
    see the ``setuptools.dist.Distribution`` class.
 
  * Setup scripts using setuptools now always install using ``easy_install``
@@ -2672,7 +2672,7 @@ easy_install
 0.5a1
 -----
 
- * Added support for "self-installation" bootstrapping.  Packages can now
+ * Added support for "self-installation" bootstrapping. Packages can now
    include ``ez_setup.py`` in their source distribution, and add the following
    to their ``setup.py``, in order to automatically bootstrap installation of
    setuptools as part of their setup process::
@@ -2692,21 +2692,21 @@ easy_install
 
  * All downloads are now managed by the ``PackageIndex`` class (which is now
    subclassable and replaceable), so that embedders can more easily override
-   download logic, give download progress reports, etc.  The class has also
+   download logic, give download progress reports, etc. The class has also
    been moved to the new ``setuptools.package_index`` module.
 
  * The ``Installer`` class no longer handles downloading, manages a temporary
-   directory, or tracks the ``zip_ok`` option.  Downloading is now handled
+   directory, or tracks the ``zip_ok`` option. Downloading is now handled
    by ``PackageIndex``, and ``Installer`` has become an ``easy_install``
    command class based on ``setuptools.Command``.
 
  * There is a new ``setuptools.sandbox.run_setup()`` API to invoke a setup
    script in a directory sandbox, and a new ``setuptools.archive_util`` module
-   with an ``unpack_archive()`` API.  These were split out of EasyInstall to
+   with an ``unpack_archive()`` API. These were split out of EasyInstall to
    allow reuse by other tools and applications.
 
  * ``setuptools.Command`` now supports reinitializing commands using keyword
-   arguments to set/reset options.  Also, ``Command`` subclasses can now set
+   arguments to set/reset options. Also, ``Command`` subclasses can now set
    their ``command_consumes_arguments`` attribute to ``True`` in order to
    receive an ``args`` option containing the rest of the command line.
 
@@ -2715,7 +2715,7 @@ easy_install
 
  * Added new options to ``bdist_egg`` to allow tagging the egg's version number
    with a subversion revision number, the current date, or an explicit tag
-   value.  Run ``setup.py bdist_egg --help`` to get more information.
+   value. Run ``setup.py bdist_egg --help`` to get more information.
 
  * Misc. bug fixes
 

From cfaab99763f94c1e73f8bc4c1a61648b70ecae72 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Mon, 25 Jul 2016 01:24:33 +0700
Subject: [PATCH 5967/8469] docs/conf.py: remove unused boilerplate.

---
 docs/conf.py | 97 ----------------------------------------------------
 1 file changed, 97 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index be0101521d..dc0d8faec7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -37,9 +37,6 @@
 # The suffix of source filenames.
 source_suffix = '.txt'
 
-# The encoding of source files.
-#source_encoding = 'utf-8'
-
 # The master toctree document.
 master_doc = 'index'
 
@@ -56,43 +53,13 @@
 # The full version, including alpha/beta/rc tags.
 release = setup_script.setup_params['version']
 
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = []
 
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -100,11 +67,6 @@
 # Sphinx are currently 'default' and 'sphinxdoc'.
 html_theme = 'nature'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['_theme']
 
@@ -115,24 +77,6 @@
 # A shorter title for the navigation bar.  Default is the same as html_title.
 html_short_title = "Setuptools"
 
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 html_use_smartypants = True
@@ -140,42 +84,18 @@
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {'index': 'indexsidebar.html'}
 
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
 # If false, no module index is generated.
 html_use_modindex = False
 
 # If false, no index is generated.
 html_use_index = False
 
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Setuptoolsdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
@@ -183,23 +103,6 @@
    'The fellowship of the packaging', 'manual'),
 ]
 
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_use_modindex = True
-
 link_files = {
     '../CHANGES.rst': dict(
         using=dict(

From 4d82b38241d6edc2dcc4264a9d474fc6aba8f61e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 08:50:38 -0400
Subject: [PATCH 5968/8469] Update changelog to more clearly indicate the
 effect of the change.

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5442f2a601..acbd206bf1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,7 +8,8 @@ v25.0.0
 * #674: Default ``sys.path`` manipulation by easy-install.pth
   is now "raw", meaning that when writing easy-install.pth
   during any install operation, the ``sys.path`` will not be
-  rewritten, giving preference to easy_installed packages.
+  rewritten and will no longer give preference to easy_installed
+  packages.
 
   To retain the old behavior when using any easy_install
   operation (including ``setup.py install`` when setuptools is

From d70b7b47644c2436a50f9d8dc8627dc5809fb5b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 08:54:19 -0400
Subject: [PATCH 5969/8469] Update changelog

---
 CHANGES.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index acbd206bf1..54b35023b3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,17 @@
 CHANGES
 =======
 
+v25.0.1
+-------
+
+* Cleanup of setup.py script.
+
+* Fixed documentation builders by allowing setup.py
+  to be imported without having bootstrapped the
+  metadata.
+
+* More style cleanup. See #677, #678, #679, #681, #685.
+
 v25.0.0
 -------
 

From 5bff01fe9b15cbec748d83f6c229a2b66b096729 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 08:54:25 -0400
Subject: [PATCH 5970/8469] =?UTF-8?q?Bump=20version:=2025.0.0=20=E2=86=92?=
 =?UTF-8?q?=2025.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1c72e12472..881d2d1a01 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.0.0
+current_version = 25.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9df3da1616..af5e3ac418 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.0.0",
+    version="25.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 21ab99e53f0c263a2210cf51525d6edcae1ae9a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 08:54:26 -0400
Subject: [PATCH 5971/8469] Added tag v25.0.1 for changeset 0591bce16c7f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4b814cda7f..f75b16d264 100644
--- a/.hgtags
+++ b/.hgtags
@@ -288,3 +288,4 @@ ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
 83ca05973c16102145b339aec7e170d94966a2ba v24.3.0
 e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
 58e92028ab0061f1f80d98e769c9143305275242 v25.0.0
+0591bce16c7f94191cea925929cc8b0ce6baca09 v25.0.1

From 0c1f6b6a53368a4b39f6617e13f50e11eac5bae1 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Mon, 25 Jul 2016 20:19:47 +0700
Subject: [PATCH 5972/8469] docs/easy_install.txt: remove repeated word.

---
 docs/easy_install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 591589fb2d..bd9f0e863d 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -768,7 +768,7 @@ Command-Line Options
     run by scripts that are already installed.
 
 ``--user`` (New in 0.6.11)
-    Use the the user-site-packages as specified in :pep:`370`
+    Use the user-site-packages as specified in :pep:`370`
     instead of the global site-packages.
 
 ``--always-copy, -a``   (New in 0.5a4)

From 1918a41831fbef6d4b67dc484c647d56658bae1d Mon Sep 17 00:00:00 2001
From: Elias Dorneles <eliasdorneles@gmail.com>
Date: Mon, 25 Jul 2016 10:38:51 -0300
Subject: [PATCH 5973/8469] fix: use os.chdir to change directory

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index af5e3ac418..e4d85b0b3f 100755
--- a/setup.py
+++ b/setup.py
@@ -191,6 +191,6 @@ def pypi_link(pkg_filename):
 
 if __name__ == '__main__':
     # allow setup.py to run from another directory
-    here and os.path.chdir(here)
+    here and os.chdir(here)
     require_metadata()
     dist = setuptools.setup(**setup_params)

From 3fcd44be1e8d3d8b9f229333e8f43d4893658183 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Wed, 8 Jun 2016 16:56:06 +0200
Subject: [PATCH 5974/8469] check if a download is successfull before deciding
 not to try the next possible dist

---
 setuptools/package_index.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0ea09bd6fe..8f8bf6ed66 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -602,24 +602,26 @@ def find(req, env=None):
                     continue
 
                 if dist in req and (dist.precedence <= SOURCE_DIST or not source):
-                    return dist
+                    mylocation = self.download(dist.location, tmpdir)
+                    if os.path.exists(mylocation):
+                        return dist, mylocation
 
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
-            dist = find(requirement)
+            dist, mylocation = find(requirement)
 
         if local_index is not None:
-            dist = dist or find(requirement, local_index)
+            dist, mylocation = dist, mylocation if dist else  find(requirement, local_index)
 
         if dist is None:
             if self.to_scan is not None:
                 self.prescan()
-            dist = find(requirement)
+            dist, mylocation = find(requirement)
 
         if dist is None and not force_scan:
             self.find_packages(requirement)
-            dist = find(requirement)
+            dist, mylocation = find(requirement)
 
         if dist is None:
             self.warn(
@@ -629,7 +631,7 @@ def find(req, env=None):
             )
         else:
             self.info("Best match: %s", dist)
-            return dist.clone(location=self.download(dist.location, tmpdir))
+            return dist.clone(location=mylocation)
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`

From 1e5bb5e680d00fcfc74078d0ea2d12760879b3c7 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Wed, 8 Jun 2016 18:04:00 +0200
Subject: [PATCH 5975/8469] addressed remarks,  None, None since a tuple is
 expected

---
 setuptools/package_index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8f8bf6ed66..a6918123dd 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -605,14 +605,15 @@ def find(req, env=None):
                     mylocation = self.download(dist.location, tmpdir)
                     if os.path.exists(mylocation):
                         return dist, mylocation
+            return None, None
 
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
             dist, mylocation = find(requirement)
 
-        if local_index is not None:
-            dist, mylocation = dist, mylocation if dist else  find(requirement, local_index)
+        if not dist and local_index is not None:
+            dist, mylocation = find(requirement, local_index)
 
         if dist is None:
             if self.to_scan is not None:

From c4ef24f6bac7b4c12b3cfc71258524185d220fc7 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Fri, 24 Jun 2016 17:25:02 +0200
Subject: [PATCH 5976/8469] don't return a tuple, add a new attribute to
 current returnvalue

---
 setuptools/package_index.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a6918123dd..b7247120f3 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -604,25 +604,25 @@ def find(req, env=None):
                 if dist in req and (dist.precedence <= SOURCE_DIST or not source):
                     mylocation = self.download(dist.location, tmpdir)
                     if os.path.exists(mylocation):
-                        return dist, mylocation
-            return None, None
+                        dist._location = mylocation
+                        return dist
 
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
-            dist, mylocation = find(requirement)
+            dist = find(requirement)
 
         if not dist and local_index is not None:
-            dist, mylocation = find(requirement, local_index)
+            dist = find(requirement, local_index)
 
         if dist is None:
             if self.to_scan is not None:
                 self.prescan()
-            dist, mylocation = find(requirement)
+            dist = find(requirement)
 
         if dist is None and not force_scan:
             self.find_packages(requirement)
-            dist, mylocation = find(requirement)
+            dist = find(requirement)
 
         if dist is None:
             self.warn(
@@ -632,7 +632,7 @@ def find(req, env=None):
             )
         else:
             self.info("Best match: %s", dist)
-            return dist.clone(location=mylocation)
+            return dist.clone(location=dist._location)
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`

From e2124c84b83e8ad6adb3dd8e8ed846eea4f7601f Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Fri, 24 Jun 2016 17:30:02 +0200
Subject: [PATCH 5977/8469] pick better names for variables

---
 setuptools/package_index.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b7247120f3..89eb578641 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -602,9 +602,8 @@ def find(req, env=None):
                     continue
 
                 if dist in req and (dist.precedence <= SOURCE_DIST or not source):
-                    mylocation = self.download(dist.location, tmpdir)
-                    if os.path.exists(mylocation):
-                        dist._location = mylocation
+                    dist.download_location = self.download(dist.location, tmpdir)
+                    if os.path.exists(dist.download_location):
                         return dist
 
         if force_scan:
@@ -632,7 +631,7 @@ def find(req, env=None):
             )
         else:
             self.info("Best match: %s", dist)
-            return dist.clone(location=dist._location)
+            return dist.clone(location=dist.download_location)
 
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`

From e2af2337adc2996e8aabaef2780dea8ac3e88487 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Fri, 24 Jun 2016 17:45:31 +0200
Subject: [PATCH 5978/8469] specify that no 'working' links were found,
 previous behaviour didn't check if downloads could succeed

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 89eb578641..8d965f4902 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -625,7 +625,7 @@ def find(req, env=None):
 
         if dist is None:
             self.warn(
-                "No local packages or download links found for %s%s",
+                "No local packages or working download links found for %s%s",
                 (source and "a source distribution of " or ""),
                 requirement,
             )

From 87c776227a5bf3443cddc9f26255ff7ab90d9829 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@ugent.be>
Date: Mon, 25 Jul 2016 13:43:01 +0200
Subject: [PATCH 5979/8469] added changes to changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 54b35023b3..3a61f240fd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,6 +13,11 @@ v25.0.1
 
 * More style cleanup. See #677, #678, #679, #681, #685.
 
+* #609: setuptools will now try to download a distribution from
+  the next possible download location if the first download fails.
+  This means you can now specify multiple links as ``dependency_links``
+  and all links will be tried until a working download link is encountered.
+
 v25.0.0
 -------
 

From 8009a4a87261708de5cdc2dada1508d9fcf51a35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:39:32 -0400
Subject: [PATCH 5980/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 54b35023b3..a1ef21c2d0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v25.0.2
+-------
+
+* #688: Fix AttributeError in setup.py when invoked not from
+  the current directory.
+
 v25.0.1
 -------
 

From 192d3cb295be20ff3c28a79fb16210e024f23dd0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:39:39 -0400
Subject: [PATCH 5981/8469] =?UTF-8?q?Bump=20version:=2025.0.1=20=E2=86=92?=
 =?UTF-8?q?=2025.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 881d2d1a01..164ce51398 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.0.1
+current_version = 25.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index af5e3ac418..c0c166ea81 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.0.1",
+    version="25.0.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b15b40d3fdd88e6206de5d29c09fcc7e84779f8a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:39:40 -0400
Subject: [PATCH 5982/8469] Added tag v25.0.2 for changeset dc92db3e29a4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f75b16d264..4d75d103fa 100644
--- a/.hgtags
+++ b/.hgtags
@@ -289,3 +289,4 @@ ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
 e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
 58e92028ab0061f1f80d98e769c9143305275242 v25.0.0
 0591bce16c7f94191cea925929cc8b0ce6baca09 v25.0.1
+dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2

From a4b7c659a63c924040fc03e96bf4befe4f11979d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:41:33 -0400
Subject: [PATCH 5983/8469] Added tag v25.0.2 for changeset 91eeaf2f33db

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 4d75d103fa..2acb78355a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -290,3 +290,5 @@ e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
 58e92028ab0061f1f80d98e769c9143305275242 v25.0.0
 0591bce16c7f94191cea925929cc8b0ce6baca09 v25.0.1
 dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
+dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
+91eeaf2f33db99d8f78f8261931a1aea8fe8d952 v25.0.2

From 76a3d326724eb0157e7a3c67c38139639c78e9ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:48:05 -0400
Subject: [PATCH 5984/8469] Update changelog

---
 CHANGES.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4f366f7480..5aa2733c98 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v25.1.0
+-------
+
+* #609: Setuptools will now try to download a distribution from
+  the next possible download location if the first download fails.
+  This means you can now specify multiple links as ``dependency_links``
+  and all links will be tried until a working download link is encountered.
+
 v25.0.2
 -------
 
@@ -19,11 +27,6 @@ v25.0.1
 
 * More style cleanup. See #677, #678, #679, #681, #685.
 
-* #609: setuptools will now try to download a distribution from
-  the next possible download location if the first download fails.
-  This means you can now specify multiple links as ``dependency_links``
-  and all links will be tried until a working download link is encountered.
-
 v25.0.0
 -------
 

From 168970b89c9ac421b153981f4ded731bf376a5cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:48:10 -0400
Subject: [PATCH 5985/8469] =?UTF-8?q?Bump=20version:=2025.0.2=20=E2=86=92?=
 =?UTF-8?q?=2025.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 164ce51398..a9f2e021a3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.0.2
+current_version = 25.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b03fd40a5c..be86c29c91 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.0.2",
+    version="25.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 29016f7e696cdefba227ab761929698b4c636cb7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 Jul 2016 10:48:11 -0400
Subject: [PATCH 5986/8469] Added tag v25.1.0 for changeset 529a76a860c5

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2acb78355a..0e5e1b78f2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -292,3 +292,4 @@ e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
 dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 91eeaf2f33db99d8f78f8261931a1aea8fe8d952 v25.0.2
+529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0

From d506d3d7411e890028092b72f1005d487a5398f1 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Wed, 27 Jul 2016 19:13:51 +0200
Subject: [PATCH 5987/8469] Fix regression in commit #e404a4a

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 2a665c9290..c762c28fd8 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -909,7 +909,7 @@ def OSLibpath(self):
                 os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
                 os.path.join(
                     ref,
-                    'Windows.Foundation.UniversalApiContract'
+                    'Windows.Foundation.UniversalApiContract',
                     '1.0.0.0',
                 ),
                 os.path.join(
@@ -919,7 +919,7 @@ def OSLibpath(self):
                 ),
                 os.path.join(
                     ref,
-                    'Windows.Networking.Connectivity.WwanContract'
+                    'Windows.Networking.Connectivity.WwanContract',
                     '1.0.0.0',
                 ),
                 os.path.join(

From 6e0a29decbf6395e35f4b352e6d75d46b523727d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jul 2016 10:17:35 -0400
Subject: [PATCH 5988/8469] Also force newer version of flake8, required by
 pytest-flake8 0.6.

---
 .travis.yml  | 2 +-
 appveyor.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e91f7e783f..e275605b65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
  - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
- - pip install -U pytest
+ - pip install -U pytest flake8
 
  # Output the env, because the travis docs just can't be trusted
  - env
diff --git a/appveyor.yml b/appveyor.yml
index 4ae6c791d1..144568136c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,5 +12,6 @@ install:
 build: off
 
 test_script:
+  - "python -m pip install -U flake8"
   - "python bootstrap.py"
   - "python setup.py test"

From 93c69277ef3519239857263d8c996fce23335d38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jul 2016 10:24:58 -0400
Subject: [PATCH 5989/8469] Maybe just the pin needs to be removed

---
 .travis.yml  | 2 +-
 appveyor.yml | 1 -
 setup.py     | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e275605b65..e91f7e783f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
  - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
- - pip install -U pytest flake8
+ - pip install -U pytest
 
  # Output the env, because the travis docs just can't be trusted
  - env
diff --git a/appveyor.yml b/appveyor.yml
index 144568136c..4ae6c791d1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,6 +12,5 @@ install:
 build: off
 
 test_script:
-  - "python -m pip install -U flake8"
   - "python bootstrap.py"
   - "python setup.py test"
diff --git a/setup.py b/setup.py
index be86c29c91..0cf1d0b207 100755
--- a/setup.py
+++ b/setup.py
@@ -181,8 +181,6 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        # workaround for pytest-flake8 #7
-        'flake8<3dev',
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[

From 10e1523a77919e0fd65098946aa1f6dcbceca087 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 27 Jul 2016 11:45:36 +0200
Subject: [PATCH 5990/8469] ignore .tox in pytest

avoids errors in setup.py test if tox has been run
---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index c693a4c342..640716a648 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .tox
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811

From 279e625938d7991755c0aeba63f4293d9b67fa0f Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 27 Jul 2016 13:35:44 +0200
Subject: [PATCH 5991/8469] only insert eggs ahead of parent if not already on
 path

in `insert_on(replace=False)`

and set `replace=False` by default in `activate()`

Fixes pkg_resources modifying sys.path for all eggs
with SETUPTOOLS_SYS_PATH_TECHINQUE=raw
---
 pkg_resources/__init__.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6337db9921..602549bec9 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2503,11 +2503,11 @@ def _get_metadata(self, name):
             for line in self.get_metadata_lines(name):
                 yield line
 
-    def activate(self, path=None):
+    def activate(self, path=None, replace=False):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None:
             path = sys.path
-        self.insert_on(path, replace=True)
+        self.insert_on(path, replace=replace)
         if path is sys.path:
             fixup_namespace_packages(self.location)
             for pkg in self._get_metadata('namespace_packages.txt'):
@@ -2585,7 +2585,24 @@ def get_entry_info(self, group, name):
         return self.get_entry_map(group).get(name)
 
     def insert_on(self, path, loc=None, replace=False):
-        """Insert self.location in path before its nearest parent directory"""
+        """Ensure self.location is on path
+
+        If replace=False (default):
+            - If location is already in path anywhere, do nothing.
+            - Else:
+              - If it's an egg and its parent directory is on path,
+                insert just ahead of the parent.
+              - Else: add to the end of path.
+        If replace=True:
+            - If location is already on path anywhere (not eggs)
+              or higher priority than its parent (eggs)
+              do nothing.
+            - Else:
+              - If it's an egg and its parent directory is on path,
+                insert just ahead of the parent,
+                removing any lower-priority entries.
+              - Else: add it to the front of path.
+        """
 
         loc = loc or self.location
         if not loc:
@@ -2600,6 +2617,9 @@ def insert_on(self, path, loc=None, replace=False):
                 break
             elif item == bdir and self.precedence == EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
+                # UNLESS it's already been added to sys.path and replace=False
+                if (not replace) and nloc in npath[p:]:
+                    return
                 if path is sys.path:
                     self.check_version_conflict()
                 path.insert(p, loc)

From 4d158f842cbadb0d4b3bbeee3a8488f5f9a3dee4 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 27 Jul 2016 14:42:38 +0200
Subject: [PATCH 5992/8469] only call `dist.activate(True)` for *new* dists,
 not those loaded by default.

---
 pkg_resources/__init__.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 602549bec9..6aabd4c5c1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -947,11 +947,17 @@ def require(self, *requirements):
 
         return needed
 
-    def subscribe(self, callback):
-        """Invoke `callback` for all distributions (including existing ones)"""
+    def subscribe(self, callback, existing=True):
+        """Invoke `callback` for all distributions
+
+        If `existing=True` (default),
+        call on all existing ones, as well.
+        """
         if callback in self.callbacks:
             return
         self.callbacks.append(callback)
+        if not existing:
+            return
         for dist in self:
             callback(dist)
 
@@ -2967,10 +2973,14 @@ def _initialize_master_working_set():
     run_script = working_set.run_script
     # backward compatibility
     run_main = run_script
-    # Activate all distributions already on sys.path, and ensure that
-    # all distributions added to the working set in the future (e.g. by
-    # calling ``require()``) will get activated as well.
-    add_activation_listener(lambda dist: dist.activate())
+    # Activate all distributions already on sys.path with replace=False and
+    # ensure that all distributions added to the working set in the future
+    # (e.g. by calling ``require()``) will get activated as well,
+    # with higher priority (replace=True).
+    for dist in working_set:
+        dist.activate(replace=False)
+    del dist
+    add_activation_listener(lambda dist: dist.activate(replace=True), existing=False)
     working_set.entries=[]
     # match order
     list(map(working_set.add_entry, sys.path))

From 58c02d28c216d4195429b220d14ba7326e93a62b Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 27 Jul 2016 15:10:53 +0200
Subject: [PATCH 5993/8469] insert(replace=False) should really be a no-op if
 path is found

that includes removing duplicates.
---
 pkg_resources/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6aabd4c5c1..6d4727348f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2620,7 +2620,11 @@ def insert_on(self, path, loc=None, replace=False):
 
         for p, item in enumerate(npath):
             if item == nloc:
-                break
+                if replace:
+                    break
+                else:
+                    # don't modify path (even removing duplicates) if found and not replace
+                    return
             elif item == bdir and self.precedence == EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
                 # UNLESS it's already been added to sys.path and replace=False

From 9e3f3cb5f58caf69e003023d724a8793e8d1c184 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jul 2016 15:00:01 -0400
Subject: [PATCH 5994/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5aa2733c98..77bd1c7951 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v25.1.1
+-------
+
+* #686: Fix issue in sys.path ordering by pkg_resources when
+  rewrite technique is "raw".
+* #699: Fix typo in msvc support.
+
 v25.1.0
 -------
 

From ced5db7822ece3d4e4822b12dde5a67a6a60e90b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jul 2016 15:00:06 -0400
Subject: [PATCH 5995/8469] =?UTF-8?q?Bump=20version:=2025.1.0=20=E2=86=92?=
 =?UTF-8?q?=2025.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a9f2e021a3..25d403eea5 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.0
+current_version = 25.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0cf1d0b207..1b18ab9296 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.0",
+    version="25.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 7cb842e1e81cbff7e1a0e04a46e1da96113f9a15 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 Jul 2016 15:00:06 -0400
Subject: [PATCH 5996/8469] Added tag v25.1.1 for changeset 392ee093902e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0e5e1b78f2..cf704a4367 100644
--- a/.hgtags
+++ b/.hgtags
@@ -293,3 +293,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 91eeaf2f33db99d8f78f8261931a1aea8fe8d952 v25.0.2
 529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0
+392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1

From ba535ea4958e17a2cb2e79df093f50d057c07562 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Thu, 28 Jul 2016 23:03:45 +0200
Subject: [PATCH 5997/8469] Fix for #646

---
 setuptools/msvc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index c762c28fd8..6fb3300b06 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -449,10 +449,14 @@ def lookup(self, key, name):
         for hkey in self.HKEYS:
             try:
                 bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
+            except OSError:
+                continue
             except IOError:
                 continue
             try:
                 return winreg.QueryValueEx(bkey, name)[0]
+            except OSError:
+                pass
             except IOError:
                 pass
 

From ca9749b3c9b6ec565686347db0e47cd272a4c524 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 29 Jul 2016 10:09:43 +0200
Subject: [PATCH 5998/8469] fix NameError when initial working_set is empty

by defining dist so there's something to delete
---
 pkg_resources/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6d4727348f..9f0ea6ec5c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2981,6 +2981,7 @@ def _initialize_master_working_set():
     # ensure that all distributions added to the working set in the future
     # (e.g. by calling ``require()``) will get activated as well,
     # with higher priority (replace=True).
+    dist = None # ensure dist is defined for del dist below
     for dist in working_set:
         dist.activate(replace=False)
     del dist

From 15e0f14c1a7275a944c8c0c3f0f0e4badefa646a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 29 Jul 2016 23:54:30 -0400
Subject: [PATCH 5999/8469] Remove copy of rmtree, as Python 2.3 is no longer
 supported.

---
 setuptools/command/easy_install.py | 34 +-----------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0e0dc2c4f4..ae9079d80c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2230,39 +2230,7 @@ def load_launcher_manifest(name):
 
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
-    """Recursively delete a directory tree.
-
-    This code is taken from the Python 2.4 version of 'shutil', because
-    the 2.3 version doesn't really work right.
-    """
-    if ignore_errors:
-        def onerror(*args):
-            pass
-    elif onerror is None:
-        def onerror(*args):
-            raise
-    names = []
-    try:
-        names = os.listdir(path)
-    except os.error:
-        onerror(os.listdir, path, sys.exc_info())
-    for name in names:
-        fullname = os.path.join(path, name)
-        try:
-            mode = os.lstat(fullname).st_mode
-        except os.error:
-            mode = 0
-        if stat.S_ISDIR(mode):
-            rmtree(fullname, ignore_errors, onerror)
-        else:
-            try:
-                os.remove(fullname)
-            except os.error:
-                onerror(os.remove, fullname, sys.exc_info())
-    try:
-        os.rmdir(path)
-    except os.error:
-        onerror(os.rmdir, path, sys.exc_info())
+    return shutil.rmtree(path, ignore_errors, onerror)
 
 
 def current_umask():

From 849b034ac5440def5327172fa799fbbb3d40db98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 08:11:33 -0400
Subject: [PATCH 6000/8469] Don't rely on mock in the plugin

---
 setuptools/tests/fixtures.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index c70c38cb71..1e81ee2620 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,22 +1,18 @@
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 import pytest
 
 from . import contexts
 
 
 @pytest.yield_fixture
-def user_override():
+def user_override(monkeypatch):
     """
     Override site.USER_BASE and site.USER_SITE with temporary directories in
     a context.
     """
     with contexts.tempdir() as user_base:
-        with mock.patch('site.USER_BASE', user_base):
+            monkeypatch.setattr('site.USER_BASE', user_base)
             with contexts.tempdir() as user_site:
-                with mock.patch('site.USER_SITE', user_site):
+                    monkeypatch.setattr('site.USER_SITE', user_site)
                     with contexts.save_user_site_setting():
                         yield
 

From 1074affc4a94224f30692db4ab0d45ed29ac8c8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 08:12:18 -0400
Subject: [PATCH 6001/8469] Reindent

---
 setuptools/tests/fixtures.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 1e81ee2620..5204c8d126 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -10,11 +10,11 @@ def user_override(monkeypatch):
     a context.
     """
     with contexts.tempdir() as user_base:
-            monkeypatch.setattr('site.USER_BASE', user_base)
-            with contexts.tempdir() as user_site:
-                    monkeypatch.setattr('site.USER_SITE', user_site)
-                    with contexts.save_user_site_setting():
-                        yield
+        monkeypatch.setattr('site.USER_BASE', user_base)
+        with contexts.tempdir() as user_site:
+            monkeypatch.setattr('site.USER_SITE', user_site)
+            with contexts.save_user_site_setting():
+                yield
 
 
 @pytest.yield_fixture

From 7317122ae9092ab72d1ae82bad1afc887fca6508 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 10:42:13 -0400
Subject: [PATCH 6002/8469] Add test capturing undesirable behavior when
 unicode characters appear in the filename of a zip sdist. Ref #704.

---
 setuptools/tests/test_easy_install.py | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 11299c7c60..b7429d49bd 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -135,6 +135,57 @@ def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch):
         monkeypatch.delattr(site, 'getsitepackages', raising=False)
         assert ei.get_site_dirs()
 
+    @pytest.fixture
+    def sdist_unicode(self, tmpdir):
+        files = [
+            (
+                'setup.py',
+                DALS("""
+                    import setuptools
+                    setuptools.setup(
+                        name="setuptools-test-unicode",
+                        version="1.0",
+                        packages=["mypkg"],
+                        include_package_data=True,
+                    )
+                    """),
+            ),
+            (
+                'mypkg/__init__.py',
+                "",
+            ),
+            (
+                u'mypkg/\u2603.txt',
+                "",
+            ),
+        ]
+        sdist_name = 'setuptools-test-unicode-1.0.zip'
+        sdist = tmpdir / sdist_name
+        import zipfile
+        # can't use make_sdist, because the issue only occurs
+        #  with zip sdists.
+        sdist_zip = zipfile.ZipFile(str(sdist), 'w')
+        for filename, content in files:
+            sdist_zip.writestr(filename, content)
+        sdist_zip.close()
+        return str(sdist)
+
+    def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
+        """
+        The install command should execute correctly even if
+        the package has unicode filenames.
+        """
+        dist = Distribution({'script_args': ['easy_install']})
+        target = (tmpdir / 'target').ensure_dir()
+        cmd = ei.easy_install(
+            dist,
+            install_dir=str(target),
+            args=['x'],
+        )
+        monkeypatch.setitem(os.environ, 'PYTHONPATH', str(target))
+        cmd.ensure_finalized()
+        cmd.easy_install(sdist_unicode)
+
 
 class TestPTHFileWriter:
 

From 3f6926a9b069f48f22dd74d80733d62433e54162 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 10:44:45 -0400
Subject: [PATCH 6003/8469] Include Python 2.7 in the appveyor matrix to
 capture failures on older Pythons. Ref #704.

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 4ae6c791d1..f3d22f0982 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,7 @@ environment:
 
   matrix:
     - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python27-x64"
 
 install:
   # symlink python from a directory with a space

From 2e8a63bd67e3f7261a5999503269465c58611f48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 10:52:32 -0400
Subject: [PATCH 6004/8469] Mark test as xfail. Ref #706.

---
 setuptools/tests/test_easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b7429d49bd..161c673ffa 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -170,6 +170,8 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
+    @pytest.mark.xfail(os.environ.get('LANG') == 'C',
+        reason="https://github.com/pypa/setuptools/issues/706")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 5ef93a05518c3cc6b48f45d1a7213fcb69df90b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 10:53:05 -0400
Subject: [PATCH 6005/8469] Move import to top

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 161c673ffa..0f1ab2539c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,6 +14,7 @@
 import itertools
 import distutils.errors
 import io
+import zipfile
 
 import time
 from setuptools.extern.six.moves import urllib
@@ -161,7 +162,6 @@ def sdist_unicode(self, tmpdir):
         ]
         sdist_name = 'setuptools-test-unicode-1.0.zip'
         sdist = tmpdir / sdist_name
-        import zipfile
         # can't use make_sdist, because the issue only occurs
         #  with zip sdists.
         sdist_zip = zipfile.ZipFile(str(sdist), 'w')

From 857949575022946cc60c7cd1d0d088246d3f7540 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:05:33 -0400
Subject: [PATCH 6006/8469] Ensure that tmpdir is unicode. Fixes #704.

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ae9079d80c..4783ce48dc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -627,7 +627,7 @@ def check_editable(self, spec):
             )
 
     def easy_install(self, spec, deps=False):
-        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        tmpdir = tempfile.mkdtemp(prefix=six.u("easy_install-"))
         if not self.editable:
             self.install_site_py()
 

From 82d6b404903bebabb8ae3df2453001d0fb086e6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:07:48 -0400
Subject: [PATCH 6007/8469] Use the logic already vetted for determining ascii
 context.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 0f1ab2539c..b209490142 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -170,7 +170,7 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
-    @pytest.mark.xfail(os.environ.get('LANG') == 'C',
+    @pytest.mark.xfail(setuptools.tests.is_ascii,
         reason="https://github.com/pypa/setuptools/issues/706")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """

From d38321d4bbb2f04de89706cd7274397cbfc879fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:12:31 -0400
Subject: [PATCH 6008/8469] For now mark test as xfail until the issue can be
 diagnosed and resolved. Ref #707.

---
 setuptools/tests/test_msvc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index a0c76ea0da..0d0a90f54e 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -6,6 +6,8 @@
 import contextlib
 import distutils.errors
 
+import six
+
 import pytest
 try:
     from unittest import mock
@@ -71,6 +73,8 @@ def test_patched(self):
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
         assert mod_name == "setuptools.msvc", "find_vcvarsall unpatched"
 
+    @pytest.mark.xfail(six.PY2,
+        reason="https://github.com/pypa/setuptools/issues/707")
     def test_no_registry_entries_means_nothing_found(self):
         """
         No registry entries or environment variable should lead to an error

From 0e4c33da98882fee354d21082103392b26af3615 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:15:19 -0400
Subject: [PATCH 6009/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 77bd1c7951..13ffe9e76a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v25.1.2
+-------
+
+* #704: Fix errors when installing a zip sdist which contained
+  files named with non-ascii characters on Windows would
+  crash the install when it attempted to clean up the build.
+
 v25.1.1
 -------
 

From 6571ce8b2152c0c6e1e7012fe07970e96484a1a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:17:13 -0400
Subject: [PATCH 6010/8469] Report skips and xfails on CI builds

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e91f7e783f..32b664d878 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - python setup.py test --addopts='-rs'
+ - python setup.py test --addopts='-rsx'
 
 before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
diff --git a/appveyor.yml b/appveyor.yml
index f3d22f0982..ebf446bf18 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,4 +14,4 @@ build: off
 
 test_script:
   - "python bootstrap.py"
-  - "python setup.py test"
+  - "python setup.py test --addopts='-rsx'"

From 09234d3084739075e0aba59002419c341a59a47e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:19:38 -0400
Subject: [PATCH 6011/8469] Correct import

---
 setuptools/tests/test_msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 0d0a90f54e..8c7e17d3c1 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -6,7 +6,7 @@
 import contextlib
 import distutils.errors
 
-import six
+from setuptools.extern import six
 
 import pytest
 try:

From 39912c7e8c5160a9805ca5f55ff671ffe2e521cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:27:14 -0400
Subject: [PATCH 6012/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 13ffe9e76a..bc2bf5b5d3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,8 @@ v25.1.2
 * #704: Fix errors when installing a zip sdist which contained
   files named with non-ascii characters on Windows would
   crash the install when it attempted to clean up the build.
+* #646: MSVC compatibility - catch errors properly in
+  RegistryInfo.lookup.
 
 v25.1.1
 -------

From 6d37deba69a8483f0591594081429d67d68f6ff1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:28:56 -0400
Subject: [PATCH 6013/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bc2bf5b5d3..de70d0413a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,8 @@ v25.1.2
   crash the install when it attempted to clean up the build.
 * #646: MSVC compatibility - catch errors properly in
   RegistryInfo.lookup.
+* #702: Prevent UnboundLocalError when initial working_set
+  is empty.
 
 v25.1.1
 -------

From 573a34e3ab68a73ba2407d4990e68eba43c964ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Jul 2016 11:30:19 -0400
Subject: [PATCH 6014/8469] Added tag v25.1.2 for changeset 1cbb29c23543

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index cf704a4367..597d07da47 100644
--- a/.hgtags
+++ b/.hgtags
@@ -294,3 +294,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 91eeaf2f33db99d8f78f8261931a1aea8fe8d952 v25.0.2
 529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0
 392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1
+1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2

From 6c93713d75f5888cc9654ec23fc05f5b7772b51a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jul 2016 20:39:07 -0400
Subject: [PATCH 6015/8469] Rewrite test_dist_info using pytest fixtures.

---
 setuptools/tests/test_dist_info.py | 81 ++++++++++++++++--------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index db3cb2e740..92ef6e8c9c 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -14,10 +14,47 @@
 
 class TestDistInfo:
 
-    def test_distinfo(self):
+    metadata_template = DALS("""
+        Metadata-Version: 1.2
+        Name: {name}
+        {version}
+        Requires-Dist: splort (==4)
+        Provides-Extra: baz
+        Requires-Dist: quux (>=1.1); extra == 'baz'
+        """)
+
+    @pytest.fixture
+    def metadata(self, tmpdir):
+        dist_info_name = 'VersionedDistribution-2.718.dist-info'
+        versioned = tmpdir / dist_info_name
+        versioned.mkdir()
+        filename = versioned / 'METADATA'
+        filename.write_text(
+            self.metadata_template.format(
+                name='VersionedDistribution',
+                version='',
+            ).replace('\n\n', '\n'),
+            encoding='utf-8',
+        )
+
+        dist_info_name = 'UnversionedDistribution.dist-info'
+        unversioned = tmpdir / dist_info_name
+        unversioned.mkdir()
+        filename = unversioned / 'METADATA'
+        filename.write_text(
+            self.metadata_template.format(
+                name='UnversionedDistribution',
+                version='Version: 0.3',
+            ),
+            encoding='utf-8',
+        )
+
+        return str(tmpdir)
+
+    def test_distinfo(self, metadata):
         dists = dict(
             (d.project_name, d)
-            for d in pkg_resources.find_distributions(self.tmpdir)
+            for d in pkg_resources.find_distributions(metadata)
         )
 
         assert len(dists) == 2, dists
@@ -28,46 +65,14 @@ def test_distinfo(self):
         assert versioned.version == '2.718'  # from filename
         assert unversioned.version == '0.3'  # from METADATA
 
-    def test_conditional_dependencies(self):
+    def test_conditional_dependencies(self, metadata):
         specs = 'splort==4', 'quux>=1.1'
         requires = list(map(pkg_resources.Requirement.parse, specs))
 
-        for d in pkg_resources.find_distributions(self.tmpdir):
+        for d in pkg_resources.find_distributions(metadata):
             assert d.requires() == requires[:1]
             assert d.requires(extras=('baz',)) == [
                 requires[0],
-                pkg_resources.Requirement.parse('quux>=1.1;extra=="baz"')]
+                pkg_resources.Requirement.parse('quux>=1.1;extra=="baz"'),
+            ]
             assert d.extras == ['baz']
-
-    metadata_template = DALS("""
-        Metadata-Version: 1.2
-        Name: {name}
-        {version}
-        Requires-Dist: splort (==4)
-        Provides-Extra: baz
-        Requires-Dist: quux (>=1.1); extra == 'baz'
-        """)
-
-    def setup_method(self, method):
-        self.tmpdir = tempfile.mkdtemp()
-        dist_info_name = 'VersionedDistribution-2.718.dist-info'
-        versioned = os.path.join(self.tmpdir, dist_info_name)
-        os.mkdir(versioned)
-        with open(os.path.join(versioned, 'METADATA'), 'w+') as metadata_file:
-            metadata = self.metadata_template.format(
-                name='VersionedDistribution',
-                version='',
-            ).replace('\n\n', '\n')
-            metadata_file.write(metadata)
-        dist_info_name = 'UnversionedDistribution.dist-info'
-        unversioned = os.path.join(self.tmpdir, dist_info_name)
-        os.mkdir(unversioned)
-        with open(os.path.join(unversioned, 'METADATA'), 'w+') as metadata_file:
-            metadata = self.metadata_template.format(
-                name='UnversionedDistribution',
-                version='Version: 0.3',
-            )
-            metadata_file.write(metadata)
-
-    def teardown_method(self, method):
-        shutil.rmtree(self.tmpdir)

From 52f72bb8d233ca518f4782c5dd9569c6764c53ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jul 2016 20:44:13 -0400
Subject: [PATCH 6016/8469] Extract variable for content

---
 setuptools/tests/test_dist_info.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 92ef6e8c9c..122d94a065 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -29,25 +29,21 @@ def metadata(self, tmpdir):
         versioned = tmpdir / dist_info_name
         versioned.mkdir()
         filename = versioned / 'METADATA'
-        filename.write_text(
-            self.metadata_template.format(
-                name='VersionedDistribution',
-                version='',
-            ).replace('\n\n', '\n'),
-            encoding='utf-8',
-        )
+        content = self.metadata_template.format(
+            name='VersionedDistribution',
+            version='',
+        ).replace('\n\n', '\n')
+        filename.write_text(content, encoding='utf-8')
 
         dist_info_name = 'UnversionedDistribution.dist-info'
         unversioned = tmpdir / dist_info_name
         unversioned.mkdir()
         filename = unversioned / 'METADATA'
-        filename.write_text(
-            self.metadata_template.format(
-                name='UnversionedDistribution',
-                version='Version: 0.3',
-            ),
-            encoding='utf-8',
+        content = self.metadata_template.format(
+            name='UnversionedDistribution',
+            version='Version: 0.3',
         )
+        filename.write_text(content, encoding='utf-8')
 
         return str(tmpdir)
 

From 8cc9cd3c76ee2ab313163cf2bee54e5ba31f9f6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 Jul 2016 20:56:26 -0400
Subject: [PATCH 6017/8469] Build metadata programmatically to avoid weird
 double-newline removal.

---
 setuptools/tests/test_dist_info.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 122d94a065..0d1aed0317 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -14,34 +14,39 @@
 
 class TestDistInfo:
 
-    metadata_template = DALS("""
+    metadata_base = DALS("""
         Metadata-Version: 1.2
-        Name: {name}
-        {version}
         Requires-Dist: splort (==4)
         Provides-Extra: baz
         Requires-Dist: quux (>=1.1); extra == 'baz'
         """)
 
+    @classmethod
+    def build_metadata(cls, **kwargs):
+        lines = (
+            '{key}: {value}\n'.format(**locals())
+            for key, value in kwargs.items()
+        )
+        return cls.metadata_base + ''.join(lines)
+
     @pytest.fixture
     def metadata(self, tmpdir):
         dist_info_name = 'VersionedDistribution-2.718.dist-info'
         versioned = tmpdir / dist_info_name
         versioned.mkdir()
         filename = versioned / 'METADATA'
-        content = self.metadata_template.format(
-            name='VersionedDistribution',
-            version='',
-        ).replace('\n\n', '\n')
+        content = self.build_metadata(
+            Name='VersionedDistribution',
+        )
         filename.write_text(content, encoding='utf-8')
 
         dist_info_name = 'UnversionedDistribution.dist-info'
         unversioned = tmpdir / dist_info_name
         unversioned.mkdir()
         filename = unversioned / 'METADATA'
-        content = self.metadata_template.format(
-            name='UnversionedDistribution',
-            version='Version: 0.3',
+        content = self.build_metadata(
+            Name='UnversionedDistribution',
+            Version='0.3',
         )
         filename.write_text(content, encoding='utf-8')
 

From ffce5a1fb043e4b17666fca6919cd94fabb3536a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 16:20:03 -0400
Subject: [PATCH 6018/8469] Remove unused imports

---
 setuptools/tests/test_dist_info.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 0d1aed0317..094a97ea65 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -1,9 +1,5 @@
 """Test .dist-info style distributions.
 """
-import os
-import shutil
-import tempfile
-
 from setuptools.extern.six.moves import map
 
 import pytest

From 477ee99aa7229bdce83ca80049359284c6332f2d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 16:22:05 -0400
Subject: [PATCH 6019/8469] The future is here! (Fix test failures on Python
 2.7 introduced in 8cc9cd3c76).

---
 setuptools/tests/test_dist_info.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 094a97ea65..f7e7d2bf0a 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -1,5 +1,8 @@
 """Test .dist-info style distributions.
 """
+
+from __future__ import unicode_literals
+
 from setuptools.extern.six.moves import map
 
 import pytest

From f60a5de47aa0a821ad1175b4c54f71b65ed05d72 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 16:31:55 -0400
Subject: [PATCH 6020/8469] =?UTF-8?q?Bump=20version:=2025.1.1=20=E2=86=92?=
 =?UTF-8?q?=2025.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 25d403eea5..b34560df5d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.1
+current_version = 25.1.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 1b18ab9296..202077d1fc 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.1",
+    version="25.1.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a509a879308ccf0937d20751665aaf8cdb0d27f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 16:32:19 -0400
Subject: [PATCH 6021/8469] Added tag 25.1.2 for changeset c350190e7bbf

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 597d07da47..fb280fed3e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -295,3 +295,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0
 392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1
 1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2
+c350190e7bbf274e6728f14af7451b1fd3aaeba2 25.1.2

From 315cd94d90349748016c842a3d7f851c631b76b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 21:23:21 -0400
Subject: [PATCH 6022/8469] Reorganize imports

---
 setuptools/archive_util.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 24d4e7bbb5..b6411cc548 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -1,11 +1,5 @@
 """Utilities for extracting common archive formats"""
 
-
-__all__ = [
-    "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
-    "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
-]
-
 import zipfile
 import tarfile
 import os
@@ -13,9 +7,16 @@
 import posixpath
 import contextlib
 from distutils.errors import DistutilsError
+
 from pkg_resources import ensure_directory, ContextualZipFile
 
 
+__all__ = [
+    "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
+    "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
+]
+
+
 class UnrecognizedFormat(DistutilsError):
     """Couldn't recognize the archive type"""
 

From 4b1f577d73bc9d66a82e6e5ad84af89c9dca5c49 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 22:06:49 -0400
Subject: [PATCH 6023/8469] Add test capturing #709.

---
 setuptools/tests/test_archive_util.py | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 setuptools/tests/test_archive_util.py

diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
new file mode 100644
index 0000000000..0c282b738e
--- /dev/null
+++ b/setuptools/tests/test_archive_util.py
@@ -0,0 +1,52 @@
+import six
+
+import pytest
+
+from setuptools import archive_util
+
+@pytest.fixture
+def tarfile_with_unicode(tmpdir):
+    """
+    Create a tarfile containing only a file whose name is
+    a zero byte file called testimäge.png.
+
+    TODO: Is it possible to generate this file programmatically?
+    """
+    data = (
+        b'\x1f\x8b\x08\x00R\xfe\x9fW\x00\x03\xed\xd6AO\x13A\x14\x00'
+        b'\xe0\x11b\x8c\x8d\' z\xf02\x07=x\xd9\xce\xcc\xce\xec\xd4\xc3'
+        b'&\xa21\xb4X\\lI\xa3r0\xc3v\xc1\x8a\xec6\xcbbz3\x1cH\x80x\x93'
+        b'x\xeaQ\x12\x13\x0f$z\xd5\x13\x17\xa9U\x8e&\xfc\x06\x13\xff'
+        b'\x82\xb3\xa5\n\xb6J!\x16\x8c\xf0\xbed2\x9d\xd7\xe9v\xba\xb3'
+        b'\xafo\x8c\xe4\xa8\xaa\xa4=U\xf4\xc2\xa4\xf1 \xf2f\xa3\xd2\xcc'
+        b'\xfa\xcb)\xcf(\xfbS\xa8K\x08!\x16\xe78\xee\xa5%\x1a=a\xdb'
+        b'\xe3\x06FLL\x99\xe4R#\x9cbB%\xa5\x1c\xe1J\xb7\x16\xb0\x97'
+        b'\xb9\xd9H\x85z)\x8fT\xa8\xdc\xe0\xcf\xf3\xf4\xb4\xc9\xc9=\xae'
+        b'\xb3\xfdS\xf0\xcf\xfe?\xc1$.\xab\xe8\xa1m\xb4\xed~\x82\x11'
+        b'\xec\xea\xb1gS.\t%&e,\x8e\xa9\xdd1"S\tf\xe2\xfc\x8dt&{\xcf(zO'
+        b'lj\xe9]d\x8c\xec\n\x97\xfc\xc0\xe6\xdc\x12\x84\x9a2AS?\xc2\xfe'
+        b'\xe3\x92?m\xd3\xc4\xbf\xbe\x05\'Z\xfb\xbew\xff;:\xe5\xbf)dK\xfe'
+        b'\x0b*\x04\xc2\xa4\xfbKiw\xc2\xf3\x1f\x9d>\x7f\x06\xf5 4\xa2\\'
+        b'\xec\xe4\xf1]\xdc\x14\xc7\xd0Y\xdd\x98n\xefu\x8b\xc7\xdf\xf6w'
+        b'\xc9\xc1\xb1\xb1\\\xf3e\xfc\x89\xaan\xf9\x96)\xa7v\xe2\x17\xdc'
+        b'`\xc6(\x86Ay"\xa8\x18*\x8a\xc2\xd2\xc4\x9c~"\xf5\x9b\x95\xea'
+        b'\xeb\xc2\xf0\x95Z2][[t>\xd63\x9f\xb2K\x9b\x1b\xce\xed\xfa\x9d7'
+        b'\xb9W\x85\xdaH\xf6\xf3\x87z\xef\xd2\xe5\x17+\x03\xf3\x0b\xb9'
+        b'\xbe[}\xf3\xe7V\xab+h\xa8w\xbd\xecl\x86\xfd\xce\xf3\x9e/\xd7'
+        b'\x9e\xbe}\xb6|ih||uk\xeb>z\xb7v\xf1\xeb\xdf\xdf\xafcf\xa7\xfa'
+        b'\x1f\xde\xbf@\xc7\xfa\xcfEK\xfe[B\x10\xa8\xffGAW\xe9F\xfd\xefP'
+        b'\xfb\x894\x7f[\xfb\xcd\x14\xcef\xae\x0f\xe6tE/\xdc4\xdc\xd0'
+        b'\xd33\x02\xbf9\xcbJq}f\xe0t\xdf\'\x04~\x95\xeb0\x9c\x10\x8e'
+        b'\xd0a\xd7\xfeX\xa7\xfc\x8f\xf3\xe5\xd7\xfc\xe7\xc2\xe2P\xff'
+        b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+        b'\x008\xa8\xef\xb1g\xe1Z\x00(\x00\x00'
+    )
+    target = tmpdir / 'unicode-pkg-1.0.tar.gz'
+    with open(str(target), mode='wb') as tf:
+        tf.write(data)
+    return str(target)
+
+
+def test_unicode_files(tarfile_with_unicode, tmpdir):
+    target = tmpdir / 'out'
+    archive_util.unpack_archive(tarfile_with_unicode, six.text_type(target))

From 96159fc86c3ae19afe63e4699430f600c407f4d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 22:17:36 -0400
Subject: [PATCH 6024/8469] Add coding header

---
 setuptools/tests/test_archive_util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index 0c282b738e..1936d2a572 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import six
 
 import pytest

From 1b8dc8c7ac45662f7719b1bd531d0575e7fb1f02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 22:30:09 -0400
Subject: [PATCH 6025/8469] Fix UnicodeDecodeError when tarfile names have
 non-ascii characters. Fixes #709.

---
 setuptools/archive_util.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index b6411cc548..a1960be880 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -143,6 +143,8 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         tarobj.chown = lambda *args: None
         for member in tarobj:
             name = member.name
+            if isinstance(name, bytes):
+                name = name.decode(tarfile.ENCODING)
             # don't extract absolute paths or ones with .. in them
             if not name.startswith('/') and '..' not in name.split('/'):
                 prelim_dst = os.path.join(extract_dir, *name.split('/'))

From 406885845bdb94abe7c6c63df1f1874e09a36d9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 22:31:54 -0400
Subject: [PATCH 6026/8469] Update changelog. Ref #709.

---
 CHANGES.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index de70d0413a..9c85be311f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,10 +2,16 @@
 CHANGES
 =======
 
+v25.1.3
+-------
+
+* #709: Fix errors when installing a tar.gz sdist that contained
+  files named with non-ascii characters on Python 2.7.
+
 v25.1.2
 -------
 
-* #704: Fix errors when installing a zip sdist which contained
+* #704: Fix errors when installing a zip sdist that contained
   files named with non-ascii characters on Windows would
   crash the install when it attempted to clean up the build.
 * #646: MSVC compatibility - catch errors properly in

From 12dc2c65240bb6d609db30a56dbb1fe217771a17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 22:44:45 -0400
Subject: [PATCH 6027/8469] Get six from extern

---
 setuptools/tests/test_archive_util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index 1936d2a572..3f67b2d479 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -1,11 +1,12 @@
 # coding: utf-8
 
-import six
+from setuptools.extern import six
 
 import pytest
 
 from setuptools import archive_util
 
+
 @pytest.fixture
 def tarfile_with_unicode(tmpdir):
     """

From f9b2902f312834ca6676f0b79bedf845c2bc42c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Aug 2016 23:02:27 -0400
Subject: [PATCH 6028/8469] _extract_member needs final_dst to be a native
 string. Ref #710.

---
 setuptools/archive_util.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index a1960be880..6493b448e4 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -8,6 +8,8 @@
 import contextlib
 from distutils.errors import DistutilsError
 
+from setuptools.extern import six
+
 from pkg_resources import ensure_directory, ContextualZipFile
 
 
@@ -164,6 +166,8 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                     if final_dst:
                         if final_dst.endswith(os.sep):
                             final_dst = final_dst[:-1]
+                        if six.PY2:
+                            final_dst = final_dst.encode(tarfile.ENCODING)
                         try:
                             # XXX Ugh
                             tarobj._extract_member(member, final_dst)

From b822e86d4b41cd54c12e6d5fdf3f7d00e89bb4d4 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Tue, 2 Aug 2016 13:31:38 +0200
Subject: [PATCH 6029/8469] Revert "Ensure that tmpdir is unicode. Fixes #704."

This reverts commit 857949575022946cc60c7cd1d0d088246d3f7540.

As we can see on https://github.com/pypa/setuptools/issues/709,
this breaks many things (easy_install C extensions, all py3.5 tests,
run with LANG=C).

So instead of fixing in a hurry all new bugs due to this, I propose to
revert this commit until all downsides of this change have been
investigated.

Related bug: https://github.com/pypa/setuptools/issues/709
Related bug: https://github.com/pypa/setuptools/issues/710
Related bug: https://github.com/pypa/setuptools/issues/712
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4783ce48dc..ae9079d80c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -627,7 +627,7 @@ def check_editable(self, spec):
             )
 
     def easy_install(self, spec, deps=False):
-        tmpdir = tempfile.mkdtemp(prefix=six.u("easy_install-"))
+        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
         if not self.editable:
             self.install_site_py()
 

From d12b01679cb0e2e6a3ea1832891614c6ee86095c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 08:54:51 -0400
Subject: [PATCH 6030/8469] Backout 1b8dc8c7ac. Reopens #709.

---
 setuptools/archive_util.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 6493b448e4..163550927c 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -145,8 +145,6 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         tarobj.chown = lambda *args: None
         for member in tarobj:
             name = member.name
-            if isinstance(name, bytes):
-                name = name.decode(tarfile.ENCODING)
             # don't extract absolute paths or ones with .. in them
             if not name.startswith('/') and '..' not in name.split('/'):
                 prelim_dst = os.path.join(extract_dir, *name.split('/'))

From 27e455c506748ad119813f2f8a23d1cc13726100 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 08:55:32 -0400
Subject: [PATCH 6031/8469] Backout f9b2902f312. Reopens #710.

---
 setuptools/archive_util.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 163550927c..b6411cc548 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -8,8 +8,6 @@
 import contextlib
 from distutils.errors import DistutilsError
 
-from setuptools.extern import six
-
 from pkg_resources import ensure_directory, ContextualZipFile
 
 
@@ -164,8 +162,6 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
                     if final_dst:
                         if final_dst.endswith(os.sep):
                             final_dst = final_dst[:-1]
-                        if six.PY2:
-                            final_dst = final_dst.encode(tarfile.ENCODING)
                         try:
                             # XXX Ugh
                             tarobj._extract_member(member, final_dst)

From 0d0bc3003b3613318a382ff14917060cda43c9f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 09:25:55 -0400
Subject: [PATCH 6032/8469] Mark tests as xfail. Ref #704 Ref #709 Ref #710.

---
 setuptools/tests/test_archive_util.py | 1 +
 setuptools/tests/test_easy_install.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index 3f67b2d479..3e679c115f 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -50,6 +50,7 @@ def tarfile_with_unicode(tmpdir):
     return str(target)
 
 
+@pytest.mark.xfail(reason="#710 and #712")
 def test_unicode_files(tarfile_with_unicode, tmpdir):
     target = tmpdir / 'out'
     archive_util.unpack_archive(tarfile_with_unicode, six.text_type(target))
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b209490142..9b10c42877 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -172,6 +172,7 @@ def sdist_unicode(self, tmpdir):
 
     @pytest.mark.xfail(setuptools.tests.is_ascii,
         reason="https://github.com/pypa/setuptools/issues/706")
+    @pytest.mark.xfail(reason="#709 and #710")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 1559cabbaf0bd537767bd0c13d875dc05a13720f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 09:27:50 -0400
Subject: [PATCH 6033/8469] Update changelog

---
 CHANGES.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9c85be311f..5a2b992885 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,9 @@ CHANGES
 v25.1.3
 -------
 
-* #709: Fix errors when installing a tar.gz sdist that contained
-  files named with non-ascii characters on Python 2.7.
+* #714 and #704: Revert fix as it breaks other components
+  downstream that can't handle unicode. See #709, #710,
+  and #712.
 
 v25.1.2
 -------

From ebe606c6b7925823ac98c7014f1fc61de3274b48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 09:36:46 -0400
Subject: [PATCH 6034/8469] =?UTF-8?q?Bump=20version:=2025.1.2=20=E2=86=92?=
 =?UTF-8?q?=2025.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b34560df5d..4f08b809b6 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.2
+current_version = 25.1.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 202077d1fc..2309b7d2ee 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.2",
+    version="25.1.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b0d667dbaedf16e77da46f420827d7493ed66d10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 09:36:47 -0400
Subject: [PATCH 6035/8469] Added tag v25.1.3 for changeset 86e668badaf4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fb280fed3e..1b83318553 100644
--- a/.hgtags
+++ b/.hgtags
@@ -296,3 +296,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1
 1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2
 c350190e7bbf274e6728f14af7451b1fd3aaeba2 25.1.2
+86e668badaf45315bb8506ac2312665d129a0322 v25.1.3

From 3f54d45ad832984b0601efe6ff62f6d16a4de2a5 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 2 Aug 2016 18:26:02 +0200
Subject: [PATCH 6036/8469] Patch distutils._msvccompiler.library_dir_option

Try to fix #694.
---
 setuptools/msvc.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 6fb3300b06..419b2292c9 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -85,6 +85,11 @@ def patch_for_specialized_compiler():
     except Exception:
         pass
 
+    try:
+        # Patch distutils._msvccompiler.library_dir_option
+        unpatched['msvc14_library_dir_option'] = msvc14compiler.library_dir_option
+        msvc14compiler.library_dir_option = msvc14_library_dir_option
+
 
 def msvc9_find_vcvarsall(version):
     """
@@ -212,6 +217,12 @@ def msvc14_get_vc_env(plat_spec):
         raise
 
 
+def msvc14_library_dir_option(dir):
+    if ' ' in dir:
+        dir = '"%s"' % dir
+    return unpatched['msvc14_library_dir_option'](dir)
+
+
 def _augment_exception(exc, version, arch=''):
     """
     Add details to the exception message to help guide the user

From 2214dbbd6fb407cf2313dba44558557072cf0974 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 2 Aug 2016 18:29:53 +0200
Subject: [PATCH 6037/8469] Update msvc.py

---
 setuptools/msvc.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 419b2292c9..2a746332e7 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -89,6 +89,8 @@ def patch_for_specialized_compiler():
         # Patch distutils._msvccompiler.library_dir_option
         unpatched['msvc14_library_dir_option'] = msvc14compiler.library_dir_option
         msvc14compiler.library_dir_option = msvc14_library_dir_option
+    except Exception:
+        pass
 
 
 def msvc9_find_vcvarsall(version):

From 2c4346bcc47ec1fd6fc77bd5bb4f760ed7c6667c Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 2 Aug 2016 18:42:24 +0200
Subject: [PATCH 6038/8469] Update msvc.py

---
 setuptools/msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 2a746332e7..785d879bf8 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -220,7 +220,7 @@ def msvc14_get_vc_env(plat_spec):
 
 
 def msvc14_library_dir_option(dir):
-    if ' ' in dir:
+    if ' ' in dir and '"' not in dir:
         dir = '"%s"' % dir
     return unpatched['msvc14_library_dir_option'](dir)
 

From 8d1349a2291054d1048c0f1a7180a96817c5f427 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 12:47:41 -0400
Subject: [PATCH 6039/8469] Change order of xfail, giving the unfiltered one
 precedence.

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 9b10c42877..27d703f5f2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -170,9 +170,9 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
+    @pytest.mark.xfail(reason="#709 and #710")
     @pytest.mark.xfail(setuptools.tests.is_ascii,
         reason="https://github.com/pypa/setuptools/issues/706")
-    @pytest.mark.xfail(reason="#709 and #710")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 6a4e5446c941291ec5e7c56cee1d5a872300c955 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 2 Aug 2016 13:10:24 -0400
Subject: [PATCH 6040/8469] Try only applying one xfail.

---
 setuptools/tests/test_easy_install.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 27d703f5f2..da0a355c41 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -171,8 +171,9 @@ def sdist_unicode(self, tmpdir):
         return str(sdist)
 
     @pytest.mark.xfail(reason="#709 and #710")
-    @pytest.mark.xfail(setuptools.tests.is_ascii,
-        reason="https://github.com/pypa/setuptools/issues/706")
+    # also
+    #@pytest.mark.xfail(setuptools.tests.is_ascii,
+    #    reason="https://github.com/pypa/setuptools/issues/706")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 4732c1eb7830b7970ad545f3a4630a824650331b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 2 Aug 2016 20:09:53 +0200
Subject: [PATCH 6041/8469] Fix #707 MSVC patch and Python 2

#707
Fix Python 2 Compatibility, and improve registry lookup (Key may not always be in 64bit registry node).
---
 setuptools/msvc.py | 67 +++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 6fb3300b06..4616d4beb4 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -356,23 +356,12 @@ class RegistryInfo:
     def __init__(self, platform_info):
         self.pi = platform_info
 
-    @property
-    def microsoft(self):
-        """
-        Microsoft software registry key.
-        """
-        return os.path.join(
-            'Software',
-            '' if self.pi.current_is_x86() else 'Wow6432Node',
-            'Microsoft',
-        )
-
     @property
     def visualstudio(self):
         """
         Microsoft Visual Studio root registry key.
         """
-        return os.path.join(self.microsoft, 'VisualStudio')
+        return 'VisualStudio'
 
     @property
     def sxs(self):
@@ -400,15 +389,14 @@ def vc_for_python(self):
         """
         Microsoft Visual C++ for Python registry key.
         """
-        path = r'DevDiv\VCForPython'
-        return os.path.join(self.microsoft, path)
+        return r'DevDiv\VCForPython'
 
     @property
     def microsoft_sdk(self):
         """
         Microsoft SDK registry key.
         """
-        return os.path.join(self.microsoft, 'Microsoft SDKs')
+        return 'Microsoft SDKs'
 
     @property
     def windows_sdk(self):
@@ -429,11 +417,29 @@ def windows_kits_roots(self):
         """
         Microsoft Windows Kits Roots registry key.
         """
-        return os.path.join(self.microsoft, r'Windows Kits\Installed Roots')
+        return r'Windows Kits\Installed Roots'
+
+    def microsoft(self, key, x86=False):
+        """
+        Return key in Microsoft software registry.
+
+        Parameters
+        ----------
+        key: str
+            Registry key path where look.
+        x86: str
+            Force x86 software registry.
+
+        Return
+        ------
+        str: value
+        """
+        node64 = '' if self.pi.current_is_x86() or x86 else r'\Wow6432Node'
+        return os.path.join('Software', node64, 'Microsoft', key)
 
     def lookup(self, key, name):
         """
-        Look for values in registry.
+        Look for values in registry in Microsoft software registry.
 
         Parameters
         ----------
@@ -446,18 +452,23 @@ def lookup(self, key, name):
         ------
         str: value
         """
+        KEY_READ = winreg.KEY_READ
+        openkey = winreg.OpenKey
+        ms = self.microsoft
         for hkey in self.HKEYS:
             try:
-                bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
-            except OSError:
-                continue
-            except IOError:
-                continue
+                bkey = openkey(hkey, ms(key), 0, KEY_READ)
+            except (OSError, IOError):
+                if not self.pi.current_is_x86():
+                    try:
+                        bkey = openkey(hkey, ms(key, True), 0, KEY_READ)
+                    except (OSError, IOError):
+                        continue
+                else:
+                    continue
             try:
                 return winreg.QueryValueEx(bkey, name)[0]
-            except OSError:
-                pass
-            except IOError:
+            except (OSError, IOError):
                 pass
 
 
@@ -500,7 +511,7 @@ def find_available_vc_vers(self):
             for key in vckeys:
                 try:
                     bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
-                except IOError:
+                except (OSError, IOError):
                     continue
                 subkeys, values, _ = winreg.QueryInfoKey(bkey)
                 for i in range(values):
@@ -813,7 +824,7 @@ def VCIncludes(self):
         Microsoft Visual C++ & Microsoft Foundation Class Includes
         """
         return [os.path.join(self.si.VCInstallDir, 'Include'),
-                os.path.join(self.si.VCInstallDir, 'ATLMFC\Include')]
+                os.path.join(self.si.VCInstallDir, r'ATLMFC\Include')]
 
     @property
     def VCLibraries(self):
@@ -1199,5 +1210,5 @@ def _get_content_dirname(self, path):
             if name:
                 return '%s\\' % name[0]
             return ''
-        except IOError:
+        except (OSError, IOError):
             return ''

From 3ebd9363b715b4dd1a0aa1d89a596d08e4b41d84 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 2 Aug 2016 20:11:25 +0200
Subject: [PATCH 6042/8469] Update test_msvc.py

---
 setuptools/tests/test_msvc.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 8c7e17d3c1..14e0f208aa 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -73,8 +73,6 @@ def test_patched(self):
         mod_name = distutils.msvc9compiler.find_vcvarsall.__module__
         assert mod_name == "setuptools.msvc", "find_vcvarsall unpatched"
 
-    @pytest.mark.xfail(six.PY2,
-        reason="https://github.com/pypa/setuptools/issues/707")
     def test_no_registry_entries_means_nothing_found(self):
         """
         No registry entries or environment variable should lead to an error

From c3f23f70001777fd66c7c33b9101bb114540a53a Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 3 Aug 2016 11:18:26 +0200
Subject: [PATCH 6043/8469] Issue #20767: Fix -R option for FreeBSD/clang.

---
 unixccompiler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unixccompiler.py b/unixccompiler.py
index 92d14dfee7..3f321c28dc 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -227,6 +227,8 @@ def runtime_library_dir_option(self, dir):
         if sys.platform[:6] == "darwin":
             # MacOSX's linker doesn't understand the -R flag at all
             return "-L" + dir
+        elif sys.platform[:7] == "freebsd":
+            return "-Wl,-rpath=" + dir
         elif sys.platform[:5] == "hp-ux":
             if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]

From de46545db087dc81ea24d2a8695f8fe6ff6a0c78 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Tue, 2 Aug 2016 12:13:41 +0200
Subject: [PATCH 6044/8469] Fix _have_cython

In 3c047624, we remove the loop, but we miss to convert the tuple
to a string. Because the exception is just ignored, we don't see
that __import__ won't works
---
 setuptools/extension.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index 5ea72c060d..6b9c19f8b6 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -19,7 +19,7 @@ def _have_cython():
     """
     Return True if Cython can be imported.
     """
-    cython_impl = 'Cython.Distutils.build_ext',
+    cython_impl = 'Cython.Distutils.build_ext'
     try:
         # from (cython_impl) import build_ext
         __import__(cython_impl, fromlist=['build_ext']).build_ext

From 18c0fdab26ba13a9cf142408d7f1f2566be21fa7 Mon Sep 17 00:00:00 2001
From: Valentin Valls <valentin.valls@esrf.fr>
Date: Wed, 3 Aug 2016 13:55:56 +0200
Subject: [PATCH 6045/8469] Fix logging using arguments instead of formatter

---
 setuptools/command/bdist_egg.py | 14 +++++++-------
 setuptools/package_index.py     |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 50744b87d4..cbea7537e2 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -129,7 +129,7 @@ def do_install_data(self):
             self.distribution.data_files.append(item)
 
         try:
-            log.info("installing package data to %s" % self.bdist_dir)
+            log.info("installing package data to %s", self.bdist_dir)
             self.call_command('install_data', force=0, root=None)
         finally:
             self.distribution.data_files = old
@@ -152,7 +152,7 @@ def run(self):
         self.run_command("egg_info")
         # We run install_lib before install_data, because some data hacks
         # pull their data path from the install_lib command.
-        log.info("installing library code to %s" % self.bdist_dir)
+        log.info("installing library code to %s", self.bdist_dir)
         instcmd = self.get_finalized_command('install')
         old_root = instcmd.root
         instcmd.root = None
@@ -169,7 +169,7 @@ def run(self):
             pyfile = os.path.join(self.bdist_dir, strip_module(filename) +
                                   '.py')
             self.stubs.append(pyfile)
-            log.info("creating stub loader for %s" % ext_name)
+            log.info("creating stub loader for %s", ext_name)
             if not self.dry_run:
                 write_stub(os.path.basename(ext_name), pyfile)
             to_compile.append(pyfile)
@@ -186,14 +186,14 @@ def run(self):
         self.mkpath(egg_info)
         if self.distribution.scripts:
             script_dir = os.path.join(egg_info, 'scripts')
-            log.info("installing scripts to %s" % script_dir)
+            log.info("installing scripts to %s", script_dir)
             self.call_command('install_scripts', install_dir=script_dir,
                               no_ep=1)
 
         self.copy_metadata_to(egg_info)
         native_libs = os.path.join(egg_info, "native_libs.txt")
         if all_outputs:
-            log.info("writing %s" % native_libs)
+            log.info("writing %s", native_libs)
             if not self.dry_run:
                 ensure_directory(native_libs)
                 libs_file = open(native_libs, 'wt')
@@ -201,7 +201,7 @@ def run(self):
                 libs_file.write('\n')
                 libs_file.close()
         elif os.path.isfile(native_libs):
-            log.info("removing %s" % native_libs)
+            log.info("removing %s", native_libs)
             if not self.dry_run:
                 os.unlink(native_libs)
 
@@ -458,7 +458,7 @@ def visit(z, dirname, names):
                 p = path[len(base_dir) + 1:]
                 if not dry_run:
                     z.write(path, p)
-                log.debug("adding '%s'" % p)
+                log.debug("adding '%s'", p)
 
     compression = zipfile.ZIP_DEFLATED if compress else zipfile.ZIP_STORED
     if not dry_run:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 8d965f4902..9ef782cbc6 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1038,8 +1038,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         cred = PyPIConfig().find_credential(url)
         if cred:
             auth = str(cred)
-            info = cred.username, url
-            log.info('Authenticating as %s for %s (from .pypirc)' % info)
+            log.info('Authenticating as %s for %s (from .pypirc)', cred.username, url)
 
     if auth:
         auth = "Basic " + _encode_auth(auth)

From 651e3ffacb4208469e97a4eeaba623f5413daa7d Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Wed, 3 Aug 2016 20:15:55 +0200
Subject: [PATCH 6046/8469] Fix from @vallsv

Fix from @vallsv
---
 setuptools/msvc.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 785d879bf8..3e2472a281 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -87,8 +87,8 @@ def patch_for_specialized_compiler():
 
     try:
         # Patch distutils._msvccompiler.library_dir_option
-        unpatched['msvc14_library_dir_option'] = msvc14compiler.library_dir_option
-        msvc14compiler.library_dir_option = msvc14_library_dir_option
+        unpatched['msvc14_library_dir_option'] = msvc14compiler.MSVCCompiler.library_dir_option
+        msvc14compiler.MSVCCompiler.library_dir_option = msvc14_library_dir_option
     except Exception:
         pass
 
@@ -219,10 +219,10 @@ def msvc14_get_vc_env(plat_spec):
         raise
 
 
-def msvc14_library_dir_option(dir):
+def msvc14_library_dir_option(self, dir):
     if ' ' in dir and '"' not in dir:
         dir = '"%s"' % dir
-    return unpatched['msvc14_library_dir_option'](dir)
+    return unpatched['msvc14_library_dir_option'](self, dir)
 
 
 def _augment_exception(exc, version, arch=''):

From e639c9f681154bb0e5530543beefd015040406ac Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Wed, 3 Aug 2016 18:43:38 -0400
Subject: [PATCH 6047/8469] Switch upload.pypi.io to upload.pypi.org

---
 config.py            | 2 +-
 tests/test_config.py | 4 ++--
 tests/test_upload.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.py b/config.py
index 9b06d7699e..96469ca91c 100644
--- a/config.py
+++ b/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
     """Base command that knows how to handle the .pypirc file
     """
-    DEFAULT_REPOSITORY = 'https://upload.pypi.io/legacy/'
+    DEFAULT_REPOSITORY = 'https://upload.pypi.org/legacy/'
     DEFAULT_REALM = 'pypi'
     repository = None
     realm = None
diff --git a/tests/test_config.py b/tests/test_config.py
index c37381550d..8286e1d9ac 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -87,7 +87,7 @@ def test_server_registration(self):
 
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://upload.pypi.io/legacy/'),
+                  ('repository', 'https://upload.pypi.org/legacy/'),
                   ('server', 'server1'), ('username', 'me')]
         self.assertEqual(config, waited)
 
@@ -96,7 +96,7 @@ def test_server_registration(self):
         config = cmd._read_pypirc()
         config = list(sorted(config.items()))
         waited = [('password', 'secret'), ('realm', 'pypi'),
-                  ('repository', 'https://upload.pypi.io/legacy/'),
+                  ('repository', 'https://upload.pypi.org/legacy/'),
                   ('server', 'server-login'), ('username', 'tarek')]
         self.assertEqual(config, waited)
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 5a462e5a94..1402343e0a 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -127,7 +127,7 @@ def test_upload(self):
         self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         self.assertEqual(self.last_open.req.get_full_url(),
-                         'https://upload.pypi.io/legacy/')
+                         'https://upload.pypi.org/legacy/')
         self.assertIn(b'xxx', self.last_open.req.data)
 
         # The PyPI response body was echoed

From a2605b297c147a1ad54078181d32fe369fa4f37d Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Wed, 3 Aug 2016 21:55:39 -0400
Subject: [PATCH 6048/8469] use abi3 extension if Extension().is_abi3

---
 setuptools/command/build_ext.py    | 13 +++++++++++++
 setuptools/extension.py            |  4 ++++
 setuptools/tests/test_build_ext.py | 20 +++++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index e6db0764e8..dad2899913 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -59,6 +59,14 @@ def _customize_compiler_for_shlib(compiler):
 
 if_dl = lambda s: s if have_rtld else ''
 
+def get_abi3_suffix():
+    """Return the file extension for an abi3-compliant Extension()"""
+    import imp
+    for suffix, _, _ in (s for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION):
+        if '.abi3' in suffix:   # Unix
+            return suffix
+        elif suffix == '.pyd':  # Windows
+            return suffix
 
 class build_ext(_build_ext):
 
@@ -96,6 +104,11 @@ def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
+            if sys.version_info[0] != 2 and getattr(ext, 'is_abi3'):
+                from distutils.sysconfig import get_config_var
+                so_ext = get_config_var('SO')
+                filename = filename[:-len(so_ext)]
+                filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):
                 fn, ext = os.path.splitext(filename)
                 return self.shlib_compiler.library_filename(fn, libtype)
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 5ea72c060d..a6cc091512 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -36,6 +36,10 @@ def _have_cython():
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
+    def __init__(self, name, sources, is_abi3=False, **kw):
+        self.is_abi3 = is_abi3
+        _Extension.__init__(self, name, sources, **kw)
+
     def _convert_pyx_sources_to_lang(self):
         """
         Replace sources with .pyx extensions to sources with the target
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 5168ebf05b..e0f2e73b20 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,8 +1,10 @@
+import sys
 import distutils.command.build_ext as orig
 
+from distutils.sysconfig import get_config_var
 from setuptools.command.build_ext import build_ext
 from setuptools.dist import Distribution
-
+from setuptools.extension import Extension
 
 class TestBuildExt:
 
@@ -18,3 +20,19 @@ def test_get_ext_filename(self):
         res = cmd.get_ext_filename('foo')
         wanted = orig.build_ext.get_ext_filename(cmd, 'foo')
         assert res == wanted
+
+    def test_abi3_filename(self):
+        """
+        Filename needs to be loadable by several versions
+        of Python 3 if 'is_abi3' is truthy on Extension()
+        """
+        dist = Distribution(dict(ext_modules=[Extension('spam.eggs', [], is_abi3=True)]))
+        cmd = build_ext(dist)
+        res = cmd.get_ext_filename('spam.eggs')
+
+        if sys.version_info[0] == 2:
+            assert res.endswith(get_config_var('SO'))
+        elif sys.platform == 'win32':
+            assert res.endswith('eggs.pyd')
+        else:
+            assert 'abi3' in res
\ No newline at end of file

From 5f3dac49084b38a248682475635f866e795f484c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 3 Aug 2016 22:08:08 -0400
Subject: [PATCH 6049/8469] In package_index, reindent long lines.

---
 setuptools/package_index.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9ef782cbc6..82cd608f55 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -290,7 +290,12 @@ def __init__(
         self.package_pages = {}
         self.allows = re.compile('|'.join(map(translate, hosts))).match
         self.to_scan = []
-        if verify_ssl and ssl_support.is_available and (ca_bundle or ssl_support.find_ca_bundle()):
+        use_ssl = (
+            verify_ssl
+            and ssl_support.is_available
+            and (ca_bundle or ssl_support.find_ca_bundle())
+        )
+        if use_ssl:
             self.opener = ssl_support.opener_for(ca_bundle)
         else:
             self.opener = urllib.request.urlopen
@@ -320,7 +325,8 @@ def process_url(self, url, retrieve=False):
 
         self.info("Reading %s", url)
         self.fetched_urls[url] = True   # prevent multiple fetch attempts
-        f = self.open_url(url, "Download error on %s: %%s -- Some packages may not be found!" % url)
+        tmpl = "Download error on %s: %%s -- Some packages may not be found!"
+        f = self.open_url(url, tmpl % url)
         if f is None:
             return
         self.fetched_urls[f.url] = True
@@ -362,7 +368,8 @@ def process_filename(self, fn, nested=False):
 
     def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
-        if (s and s.group(1).lower() == 'file') or self.allows(urllib.parse.urlparse(url)[1]):
+        is_file = s and s.group(1).lower() == 'file'
+        if is_file or self.allows(urllib.parse.urlparse(url)[1]):
             return True
         msg = ("\nNote: Bypassing %s (disallowed host; see "
             "http://bit.ly/1dg9ijs for details).\n")
@@ -1038,7 +1045,8 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         cred = PyPIConfig().find_credential(url)
         if cred:
             auth = str(cred)
-            log.info('Authenticating as %s for %s (from .pypirc)', cred.username, url)
+            info = cred.username, url
+            log.info('Authenticating as %s for %s (from .pypirc)', *info)
 
     if auth:
         auth = "Basic " + _encode_auth(auth)

From 7b1fa7643e2599f24956323a2066a6e26dc57b82 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Thu, 4 Aug 2016 12:22:54 +0200
Subject: [PATCH 6050/8469] doc for msvc14_library_dir_option

---
 setuptools/msvc.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 3e2472a281..da26371ca3 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -86,7 +86,7 @@ def patch_for_specialized_compiler():
         pass
 
     try:
-        # Patch distutils._msvccompiler.library_dir_option
+        # Patch distutils._msvccompiler.MSVCCompiler.library_dir_option
         unpatched['msvc14_library_dir_option'] = msvc14compiler.MSVCCompiler.library_dir_option
         msvc14compiler.MSVCCompiler.library_dir_option = msvc14_library_dir_option
     except Exception:
@@ -220,7 +220,21 @@ def msvc14_get_vc_env(plat_spec):
 
 
 def msvc14_library_dir_option(self, dir):
+    """
+    Patched "distutils._msvccompiler.MSVCCompiler.library_dir_option"
+    to fix unquoted path in "\LIBPATH" argument when a space is on path.
+
+    Parameters
+    ----------
+    dir: str
+        Path to convert in "\LIBPATH" argument.
+
+    Return
+    ------
+    "\LIBPATH" argument: str
+    """
     if ' ' in dir and '"' not in dir:
+        # Quote if space and not already quoted
         dir = '"%s"' % dir
     return unpatched['msvc14_library_dir_option'](self, dir)
 

From a60816441e9b185a09f1dacdb2d5612d9a324787 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Aug 2016 07:11:07 -0400
Subject: [PATCH 6051/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5a2b992885..eda524766c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v25.1.4
+-------
+
+* #717
+* #713
+* #707 via #715
+
 v25.1.3
 -------
 

From b8bb34bbe89baec3dee225eeb7e17951578f5368 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Aug 2016 07:11:14 -0400
Subject: [PATCH 6052/8469] =?UTF-8?q?Bump=20version:=2025.1.3=20=E2=86=92?=
 =?UTF-8?q?=2025.1.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4f08b809b6..ae67632a0b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.3
+current_version = 25.1.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 2309b7d2ee..d7933ab34d 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.3",
+    version="25.1.4",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From eb4a2e50b292fc9ce1cc2a55bf3a18fc303b4c24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Aug 2016 07:11:15 -0400
Subject: [PATCH 6053/8469] Added tag v25.1.4 for changeset 6f55250b9c58

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1b83318553..9eb5938644 100644
--- a/.hgtags
+++ b/.hgtags
@@ -297,3 +297,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2
 c350190e7bbf274e6728f14af7451b1fd3aaeba2 25.1.2
 86e668badaf45315bb8506ac2312665d129a0322 v25.1.3
+6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4

From aa835dcab3b98944c928a73eab8b091479514155 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Aug 2016 13:13:37 -0400
Subject: [PATCH 6054/8469] Collapse two functions into one.

---
 pkg_resources/__init__.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 9f0ea6ec5c..2a053b509e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1468,16 +1468,11 @@ def has_resource(self, resource_name):
     def has_metadata(self, name):
         return self.egg_info and self._has(self._fn(self.egg_info, name))
 
-    if sys.version_info <= (3,):
-        def get_metadata(self, name):
-            if not self.egg_info:
-                return ""
-            return self._get(self._fn(self.egg_info, name))
-    else:
-        def get_metadata(self, name):
-            if not self.egg_info:
-                return ""
-            return self._get(self._fn(self.egg_info, name)).decode("utf-8")
+    def get_metadata(self, name):
+        if not self.egg_info:
+            return ""
+        value = self._get(self._fn(self.egg_info, name))
+        return value.decode('utf-8') if six.PY3 else value
 
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))

From 21efdb5615f98a60cfa0b6130a1c2d93e5faa28e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Aug 2016 13:14:45 -0400
Subject: [PATCH 6055/8469] Allow an environment to suppress errors when
 reading metadata by setting PKG_RESOURCES_METADATA_ERRORS='replace'. Ref
 #719.

---
 pkg_resources/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2a053b509e..b402ddd693 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1859,7 +1859,9 @@ def has_metadata(self, name):
 
     def get_metadata(self, name):
         if name=='PKG-INFO':
-            with io.open(self.path, encoding='utf-8') as f:
+            env_key = 'PKG_RESOURCES_METADATA_ERRORS'
+            errors = os.environ.get(env_key, 'strict')
+            with io.open(self.path, encoding='utf-8', errors=errors) as f:
                 try:
                     metadata = f.read()
                 except UnicodeDecodeError as exc:

From dcf1cef2ed47f923c873cef9ea42727cfb819c7d Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Thu, 4 Aug 2016 18:46:15 -0400
Subject: [PATCH 6056/8469] setup.py: Bump `certifi` to version `2016.8.2`.

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index d7933ab34d..ca3cf4058a 100755
--- a/setup.py
+++ b/setup.py
@@ -167,11 +167,11 @@ def pypi_link(pkg_filename):
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2016.2.28",
+        "certs": "certifi==2016.8.2",
     },
     dependency_links=[
         pypi_link(
-            'certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
+            'certifi-2016.8.2.tar.gz#md5=004ae166985d3a684bcac5368e22ed63',
         ),
         pypi_link(
             'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',

From e3805614a5ed770d3ba86acd339a24947c19a65b Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Fri, 5 Aug 2016 12:58:47 +0200
Subject: [PATCH 6057/8469] quote library_dir_option after calling unpatched
 version

avoids double-quotes if the calling function does the quoting correctly.
---
 setuptools/msvc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 2700a2b066..97dd441c5c 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -233,10 +233,11 @@ def msvc14_library_dir_option(self, dir):
     ------
     "\LIBPATH" argument: str
     """
-    if ' ' in dir and '"' not in dir:
+    opt = unpatched['msvc14_library_dir_option'](self, dir)
+    if ' ' in opt and '"' not in opt:
         # Quote if space and not already quoted
-        dir = '"%s"' % dir
-    return unpatched['msvc14_library_dir_option'](self, dir)
+        opt = '"%s"' % opt
+    return opt
 
 
 def _augment_exception(exc, version, arch=''):

From dab253cb72eb7c098393f985e32585e079607f66 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 5 Aug 2016 07:45:09 -0400
Subject: [PATCH 6058/8469] call finalize_options in test

---
 setuptools/tests/test_build_ext.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index e0f2e73b20..c71aadca8f 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,7 +2,7 @@
 import distutils.command.build_ext as orig
 
 from distutils.sysconfig import get_config_var
-from setuptools.command.build_ext import build_ext
+from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
 
@@ -26,8 +26,13 @@ def test_abi3_filename(self):
         Filename needs to be loadable by several versions
         of Python 3 if 'is_abi3' is truthy on Extension()
         """
-        dist = Distribution(dict(ext_modules=[Extension('spam.eggs', [], is_abi3=True)]))
+        print(get_abi3_suffix())
+        
+        extension = Extension('spam.eggs', ['eggs.c'], is_abi3=True)
+        dist = Distribution(dict(ext_modules=[extension]))
         cmd = build_ext(dist)
+        cmd.finalize_options()
+        assert 'spam.eggs' in cmd.ext_map
         res = cmd.get_ext_filename('spam.eggs')
 
         if sys.version_info[0] == 2:

From 702a4277768f0781e3d0a4cf770d29621f7f2cc3 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 5 Aug 2016 07:55:57 -0400
Subject: [PATCH 6059/8469] rename is_abi3 to py_limited_api

---
 setuptools/command/build_ext.py    | 4 +++-
 setuptools/extension.py            | 4 ++--
 setuptools/tests/test_build_ext.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index dad2899913..7bb4d24c8c 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -104,7 +104,9 @@ def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            if sys.version_info[0] != 2 and getattr(ext, 'is_abi3'):
+            if (sys.version_info[0] != 2 
+                and getattr(ext, 'py_limited_api')
+                and get_abi3_suffix()):
                 from distutils.sysconfig import get_config_var
                 so_ext = get_config_var('SO')
                 filename = filename[:-len(so_ext)]
diff --git a/setuptools/extension.py b/setuptools/extension.py
index a6cc091512..c8e9bc7db6 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -36,8 +36,8 @@ def _have_cython():
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
-    def __init__(self, name, sources, is_abi3=False, **kw):
-        self.is_abi3 = is_abi3
+    def __init__(self, name, sources, py_limited_api=False, **kw):
+        self.py_limited_api = py_limited_api
         _Extension.__init__(self, name, sources, **kw)
 
     def _convert_pyx_sources_to_lang(self):
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index c71aadca8f..100869f6a2 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -28,7 +28,7 @@ def test_abi3_filename(self):
         """
         print(get_abi3_suffix())
         
-        extension = Extension('spam.eggs', ['eggs.c'], is_abi3=True)
+        extension = Extension('spam.eggs', ['eggs.c'], py_limited_api=True)
         dist = Distribution(dict(ext_modules=[extension]))
         cmd = build_ext(dist)
         cmd.finalize_options()

From 0a3f850b3bc6c888f0f8810e453e664f9fd320f6 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 5 Aug 2016 08:01:58 -0400
Subject: [PATCH 6060/8469] gate test against get_abi3_suffix()

---
 setuptools/tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 100869f6a2..f2e1f59dbc 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -35,7 +35,7 @@ def test_abi3_filename(self):
         assert 'spam.eggs' in cmd.ext_map
         res = cmd.get_ext_filename('spam.eggs')
 
-        if sys.version_info[0] == 2:
+        if sys.version_info[0] == 2 or not get_abi3_suffix():
             assert res.endswith(get_config_var('SO'))
         elif sys.platform == 'win32':
             assert res.endswith('eggs.pyd')

From 9d60e5d491298f36a5de33c60c462d1a900844e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 10:30:46 -0400
Subject: [PATCH 6061/8469] Forget the environment variable, and just log a
 warning when a metadata can't be decoded. Ref #719.

---
 pkg_resources/__init__.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b402ddd693..7dbd13a679 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 """
 Package resource API
 --------------------
@@ -1859,19 +1861,19 @@ def has_metadata(self, name):
 
     def get_metadata(self, name):
         if name=='PKG-INFO':
-            env_key = 'PKG_RESOURCES_METADATA_ERRORS'
-            errors = os.environ.get(env_key, 'strict')
-            with io.open(self.path, encoding='utf-8', errors=errors) as f:
-                try:
-                    metadata = f.read()
-                except UnicodeDecodeError as exc:
-                    # add path context to error message
-                    tmpl = " in {self.path}"
-                    exc.reason += tmpl.format(self=self)
-                    raise
+            with io.open(self.path, encoding='utf-8', errors="replace") as f:
+                metadata = f.read()
+            self._warn_on_replacement(metadata)
             return metadata
         raise KeyError("No metadata except PKG-INFO is available")
 
+    def _warn_on_replacement(self, metadata):
+        replacement_char = '�'
+        if replacement_char in metadata:
+            tmpl = "{self.path} could not be properly decoded in UTF-8"
+            msg = tmpl.format(**locals())
+            warnings.warn(msg)
+
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
 

From 09cbf5e63f5c9e84438cf69711a7a6b767106506 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 10:41:12 -0400
Subject: [PATCH 6062/8469] Restore Python 2 compatibility. Ref #719.

---
 pkg_resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7dbd13a679..94afaaf74d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1868,7 +1868,8 @@ def get_metadata(self, name):
         raise KeyError("No metadata except PKG-INFO is available")
 
     def _warn_on_replacement(self, metadata):
-        replacement_char = '�'
+        # Python 2.6 and 3.2 compat for: replacement_char = '�'
+        replacement_char = b'\xef\xbf\xbd'.decode('utf-8')
         if replacement_char in metadata:
             tmpl = "{self.path} could not be properly decoded in UTF-8"
             msg = tmpl.format(**locals())

From cadadb03546aced58233be95683a2674627ca899 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 10:43:58 -0400
Subject: [PATCH 6063/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index eda524766c..07f0d191d9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v25.1.5
+-------
+
+* #720
+* #723
+
 v25.1.4
 -------
 

From cf36cf1e47f4a4dda14297ce8612d19faade4ccb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 11:09:33 -0400
Subject: [PATCH 6064/8469] Correct tag for v25.1.2

---
 .hgtags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.hgtags b/.hgtags
index 9eb5938644..4eaae61de9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -295,6 +295,6 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0
 392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1
 1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2
-c350190e7bbf274e6728f14af7451b1fd3aaeba2 25.1.2
+c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 86e668badaf45315bb8506ac2312665d129a0322 v25.1.3
 6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4

From 0fc25ba55daa069374812e33897c712553fdc3f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 11:12:50 -0400
Subject: [PATCH 6065/8469] =?UTF-8?q?Bump=20version:=2025.1.4=20=E2=86=92?=
 =?UTF-8?q?=2025.1.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ae67632a0b..3fad1dbca2 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.4
+current_version = 25.1.5
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ca3cf4058a..67891be2e0 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.4",
+    version="25.1.5",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 409e1383315ef3f5f2f074b5d95a0bd9c2d66cdf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 11:12:51 -0400
Subject: [PATCH 6066/8469] Added tag v25.1.5 for changeset 76143bb477b5

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4eaae61de9..bff7e77e4d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -298,3 +298,4 @@ dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
 c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 86e668badaf45315bb8506ac2312665d129a0322 v25.1.3
 6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4
+76143bb477b50314ab6f4ccc4ced80ee43f0dc94 v25.1.5

From a5791ac002d9d00759b63727f9c930a2acba7d9f Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Fri, 5 Aug 2016 17:44:26 +0200
Subject: [PATCH 6067/8469] revert `library_dir_option` patch.

Revert patch on `distutils._msvccompiler.MSVCCompiler.library_dir_option`

See comments on #694.
---
 setuptools/msvc.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 97dd441c5c..4616d4beb4 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -85,13 +85,6 @@ def patch_for_specialized_compiler():
     except Exception:
         pass
 
-    try:
-        # Patch distutils._msvccompiler.MSVCCompiler.library_dir_option
-        unpatched['msvc14_library_dir_option'] = msvc14compiler.MSVCCompiler.library_dir_option
-        msvc14compiler.MSVCCompiler.library_dir_option = msvc14_library_dir_option
-    except Exception:
-        pass
-
 
 def msvc9_find_vcvarsall(version):
     """
@@ -219,27 +212,6 @@ def msvc14_get_vc_env(plat_spec):
         raise
 
 
-def msvc14_library_dir_option(self, dir):
-    """
-    Patched "distutils._msvccompiler.MSVCCompiler.library_dir_option"
-    to fix unquoted path in "\LIBPATH" argument when a space is on path.
-
-    Parameters
-    ----------
-    dir: str
-        Path to convert in "\LIBPATH" argument.
-
-    Return
-    ------
-    "\LIBPATH" argument: str
-    """
-    opt = unpatched['msvc14_library_dir_option'](self, dir)
-    if ' ' in opt and '"' not in opt:
-        # Quote if space and not already quoted
-        opt = '"%s"' % opt
-    return opt
-
-
 def _augment_exception(exc, version, arch=''):
     """
     Add details to the exception message to help guide the user

From 79d4a0c6ef679e0b29e00ed854d06deb355c89e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 12:07:32 -0400
Subject: [PATCH 6068/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 07f0d191d9..3077f39dcc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v25.1.6
+-------
+
+* #725
+
 v25.1.5
 -------
 

From 38fce51e389f9e7872f4e8062f854e442ef4d75f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 12:07:38 -0400
Subject: [PATCH 6069/8469] =?UTF-8?q?Bump=20version:=2025.1.5=20=E2=86=92?=
 =?UTF-8?q?=2025.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3fad1dbca2..ae2125f852 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.5
+current_version = 25.1.6
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 67891be2e0..d0c50bd663 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.5",
+    version="25.1.6",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 1b2e94943653960347936bba0eff54cb8dbfc638 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Aug 2016 12:07:39 -0400
Subject: [PATCH 6070/8469] Added tag v25.1.6 for changeset 2db4c66aeae4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bff7e77e4d..19ccb0e4e4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -299,3 +299,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 86e668badaf45315bb8506ac2312665d129a0322 v25.1.3
 6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4
 76143bb477b50314ab6f4ccc4ced80ee43f0dc94 v25.1.5
+2db4c66aeae47217aaf92099a9875e9e810c9cbb v25.1.6

From 29c8385814335e91538d76b68578b6c0ab483c1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 8 Aug 2016 14:39:07 -0400
Subject: [PATCH 6071/8469] Update upload target

---
 .travis.yml | 2 +-
 setup.cfg   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32b664d878..ed077d9460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_deploy:
 deploy:
   provider: pypi
   # Also update server in setup.cfg
-  server: https://upload.pypi.io/legacy/
+  server: https://upload.pypi.org/legacy/
   on:
     tags: true
     all_branches: true
diff --git a/setup.cfg b/setup.cfg
index ae2125f852..77b731d937 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,7 @@ binary = bdist_egg upload --show-response
 test = pytest
 
 [upload]
-repository = https://upload.pypi.io/legacy/
+repository = https://upload.pypi.org/legacy/
 
 [sdist]
 formats = gztar zip

From 838395475ceafc0287b49b1b6d00cd589417acb0 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Fri, 12 Aug 2016 07:44:46 -0500
Subject: [PATCH 6072/8469] Add LICENSE file for expectant auditors

The classifier in setup.py should be enough for most auditors, but some
have automated tooling that checks for LICENSE files and reads those.
This helps all auditors (downstream redistributors and users) who can
not just rely on the classifier.

Related to #612
---
 CHANGES.rst |  6 ++++++
 LICENSE     | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 LICENSE

diff --git a/CHANGES.rst b/CHANGES.rst
index 3077f39dcc..f52053399b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v25.2.0
+-------
+
+* #612 via #730: Add a LICENSE file which needs to be provided by the terms of
+  the MIT license.
+
 v25.1.6
 -------
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..6e0693b4b0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2016 Jason R Coombs <jaraco@jaraco.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 043bf1e726b8a59f88c6d3120c350b9d31677876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Aug 2016 15:05:16 -0400
Subject: [PATCH 6073/8469] =?UTF-8?q?Bump=20version:=2025.1.6=20=E2=86=92?=
 =?UTF-8?q?=2025.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 77b731d937..92fd835400 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.1.6
+current_version = 25.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d0c50bd663..fa82f3609b 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.1.6",
+    version="25.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From c5d5d63262ad9e44b6d51a0b486c7d288c65b2ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Aug 2016 15:05:17 -0400
Subject: [PATCH 6074/8469] Added tag v25.2.0 for changeset 2083d7c3fadc

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 19ccb0e4e4..75a9fb0899 100644
--- a/.hgtags
+++ b/.hgtags
@@ -300,3 +300,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4
 76143bb477b50314ab6f4ccc4ced80ee43f0dc94 v25.1.5
 2db4c66aeae47217aaf92099a9875e9e810c9cbb v25.1.6
+2083d7c3fadcf15b3bc07f7532440efbcf8fd18d v25.2.0

From c3b6f615a61533779754c014b71f4db4761574fa Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Sat, 13 Aug 2016 10:59:01 +0300
Subject: [PATCH 6075/8469] bump certifi to 2016.8.8

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index fa82f3609b..5fa237d575 100755
--- a/setup.py
+++ b/setup.py
@@ -167,11 +167,11 @@ def pypi_link(pkg_filename):
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2016.8.2",
+        "certs": "certifi==2016.8.8",
     },
     dependency_links=[
         pypi_link(
-            'certifi-2016.8.2.tar.gz#md5=004ae166985d3a684bcac5368e22ed63',
+            'certifi-2016.8.8.tar.gz#md5=b57513f7670482da45bb350b792f659e',
         ),
         pypi_link(
             'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',

From 7c7a24d130ee00344a41115cbacd1b0d2147d983 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 13 Aug 2016 11:22:08 -0400
Subject: [PATCH 6076/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f52053399b..bffad4c570 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v25.3.0
+-------
+
+#731: Bump certifi.
+
 v25.2.0
 -------
 

From b432bcae27cadc91a7df4ee4851a41ccb0674bf9 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Sun, 14 Aug 2016 08:06:59 +0200
Subject: [PATCH 6077/8469] Update tox.ini envlist to match supported Pythons

Pythons 3.1, 3.2 are no longer supported, but Python 3.5, Pypy, and
Pypy3 are.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 9061869fd2..8c09e7df18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py31,py32,py33,py34
+envlist = py26,py27,py33,py34,py35,pypy,pypy3
 
 [testenv]
 commands=python setup.py test

From f47bc22fc59d6262ece42722e3a502c672f0558f Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Sun, 14 Aug 2016 20:40:18 -0400
Subject: [PATCH 6078/8469] Include the license in sdists and similar
 packagings.

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index cfd1b00108..e25a5ea577 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,6 +7,7 @@ recursive-include pkg_resources *.py *.txt
 include *.py
 include *.rst
 include MANIFEST.in
+include LICENSE
 include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini

From 853a9df48cc056a07e17511a2b65918af9605bbc Mon Sep 17 00:00:00 2001
From: Ofekmeister <ofekmeister@gmail.com>
Date: Tue, 16 Aug 2016 02:12:38 -0400
Subject: [PATCH 6079/8469] Fix issue #459

Patched sys.argv[0] before loading entry point
---
 setuptools/command/easy_install.py    | 2 ++
 setuptools/tests/test_easy_install.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ae9079d80c..e2a7dc46c9 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2022,6 +2022,8 @@ class ScriptWriter(object):
         from pkg_resources import load_entry_point
 
         if __name__ == '__main__':
+            import re
+            sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
             sys.exit(
                 load_entry_point(%(spec)r, %(group)r, %(name)r)()
             )
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index da0a355c41..a4b1dfd528 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -78,6 +78,8 @@ def test_get_script_args(self):
             from pkg_resources import load_entry_point
 
             if __name__ == '__main__':
+                import re
+                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
                 sys.exit(
                     load_entry_point('spec', 'console_scripts', 'name')()
                 )

From 5e1693d225b2416712e11da591f60c085ce62957 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 16 Aug 2016 12:43:16 +0200
Subject: [PATCH 6080/8469] numpy.distutils and distutils._msvccompiler
 compatibility

- Fix compatibility between `numpy.distutils` and `distutils._msvccompiler`. See #728 : Setuptools 24 `msvc.py` improvement import `distutils._msvccompiler` (New Python 3.5 C compiler for MSVC >= 14), but this one is not compatible with `numpy.distutils` (because not patched with `numpy.distutils.ccompiler.gen_lib_options`) and return unquoted libpaths when linking. The problem was patched in Numpy, but need to be patched also in Setuptools for compatibility between older versions of Numpy and `distutils._msvccompiler` (and indirectly Setuptools > 24).
- Replace some residuals `except Exception`.
---
 setuptools/msvc.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 4616d4beb4..bd486fa12f 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -75,14 +75,23 @@ def patch_for_specialized_compiler():
         msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
         unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
         msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
-    except Exception:
+    except NameError:
         pass
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
         unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
         msvc14compiler._get_vc_env = msvc14_get_vc_env
-    except Exception:
+    except NameError:
+        pass
+
+    try:
+        # Apply "gen_lib_options" patch from Numpy to "distutils._msvccompiler"
+        # to fix compatibility between "numpy.distutils" and
+        # "distutils._msvccompiler" (for Numpy < 1.11.2)
+        import numpy.distutils as np_distutils
+        msvc14compiler.gen_lib_options = np_distutils.ccompiler.gen_lib_options
+    except (ImportError, NameError):
         pass
 
 
@@ -243,7 +252,8 @@ def _augment_exception(exc, version, arch=''):
         elif version >= 14.0:
             # For VC++ 14.0 Redirect user to Visual C++ Build Tools
             message += (' Get it with "Microsoft Visual C++ Build Tools": '
-                r'http://landinghub.visualstudio.com/visual-cpp-build-tools')
+                        r'http://landinghub.visualstudio.com/'
+                        'visual-cpp-build-tools')
 
     exc.args = (message, )
 

From 4c2b0a2d9c19218086b5a6ecb837403bd5bb8135 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 16 Aug 2016 12:55:19 +0200
Subject: [PATCH 6081/8469] Add history for unquoted libpaths problem

---
 CHANGES.rst | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index bffad4c570..9f098df907 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v25.3.1
+-------
+
+* #739 Fix unquoted libpaths by fixing compatibility between `numpy.distutils` and `distutils._msvccompiler` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
+
 v25.3.0
 -------
 
@@ -16,20 +21,21 @@ v25.2.0
 v25.1.6
 -------
 
-* #725
+* #725: revert `library_dir_option` patch (Error is related to `numpy.distutils` and make errors on non Numpy users).
 
 v25.1.5
 -------
 
 * #720
-* #723
+* #723: Improve patch for `library_dir_option`.
 
 v25.1.4
 -------
 
 * #717
 * #713
-* #707 via #715
+* #707: Fix Python 2 compatibility for MSVC by catching errors properly.
+* #715: Fix unquoted libpaths by patching `library_dir_option`.
 
 v25.1.3
 -------

From 38d6743427f0aa31eaf2eb07df5cd11b6526d036 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 16 Aug 2016 19:12:42 +0200
Subject: [PATCH 6082/8469] Patch with numpy at execution time and not at
 import time

---
 setuptools/msvc.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index bd486fa12f..4646d83f95 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -79,19 +79,17 @@ def patch_for_specialized_compiler():
         pass
 
     try:
-        # Patch distutils._msvccompiler._get_vc_env
+        # Patch distutils._msvccompiler._get_vc_env for numpy compatibility
         unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
         msvc14compiler._get_vc_env = msvc14_get_vc_env
     except NameError:
         pass
 
     try:
-        # Apply "gen_lib_options" patch from Numpy to "distutils._msvccompiler"
-        # to fix compatibility between "numpy.distutils" and
-        # "distutils._msvccompiler" (for Numpy < 1.11.2)
-        import numpy.distutils as np_distutils
-        msvc14compiler.gen_lib_options = np_distutils.ccompiler.gen_lib_options
-    except (ImportError, NameError):
+        # Patch distutils._msvccompiler.gen_lib_options
+        unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
+        msvc14compiler.gen_lib_options = msvc14_gen_lib_options
+    except NameError:
         pass
 
 
@@ -221,6 +219,19 @@ def msvc14_get_vc_env(plat_spec):
         raise
 
 
+def msvc14_gen_lib_options(*args, **kwargs):
+    """
+    Patched "distutils._msvccompiler.gen_lib_options" for fix 
+    compatibility between "numpy.distutils" and "distutils._msvccompiler"
+    (for Numpy < 1.11.2)
+    """
+    if "numpy" in distutils.ccompiler.CCompiler.spawn.__module__:
+        import numpy as np
+        return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
+    else:
+        return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
+
+
 def _augment_exception(exc, version, arch=''):
     """
     Add details to the exception message to help guide the user

From f5802f369d5b7b76a7feb4c49e2e49840058bf3b Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 16 Aug 2016 19:33:07 +0200
Subject: [PATCH 6083/8469] Improve numpy.distutils detection

Agree with @pitrou comment.
---
 setuptools/msvc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 4646d83f95..57153d8a4b 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -2,6 +2,7 @@
 This module adds improved support for Microsoft Visual C++ compilers.
 """
 import os
+import sys
 import platform
 import itertools
 import distutils.errors
@@ -225,7 +226,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
     compatibility between "numpy.distutils" and "distutils._msvccompiler"
     (for Numpy < 1.11.2)
     """
-    if "numpy" in distutils.ccompiler.CCompiler.spawn.__module__:
+    if "numpy.distutils" in sys.modules:
         import numpy as np
         return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
     else:

From 21be70b60cfea8da91df4687a21f262a59809073 Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Tue, 16 Aug 2016 19:34:48 +0200
Subject: [PATCH 6084/8469] Wrong line for comment

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 57153d8a4b..360c1a68de 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -80,14 +80,14 @@ def patch_for_specialized_compiler():
         pass
 
     try:
-        # Patch distutils._msvccompiler._get_vc_env for numpy compatibility
+        # Patch distutils._msvccompiler._get_vc_env
         unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
         msvc14compiler._get_vc_env = msvc14_get_vc_env
     except NameError:
         pass
 
     try:
-        # Patch distutils._msvccompiler.gen_lib_options
+        # Patch distutils._msvccompiler.gen_lib_options for Numpy
         unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
         msvc14compiler.gen_lib_options = msvc14_gen_lib_options
     except NameError:

From fadf148e520e84cdd23856457040799dfe9fa592 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Tue, 16 Aug 2016 15:59:17 +1000
Subject: [PATCH 6085/8469] Add tests for MANIFEST.in

---
 setuptools/tests/test_manifest.py | 210 ++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 setuptools/tests/test_manifest.py

diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
new file mode 100644
index 0000000000..abee5128e7
--- /dev/null
+++ b/setuptools/tests/test_manifest.py
@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+"""sdist tests"""
+
+import contextlib
+import os
+import shutil
+import sys
+import tempfile
+
+from setuptools.command.egg_info import egg_info
+from setuptools.dist import Distribution
+from setuptools.extern import six
+from setuptools.tests.textwrap import DALS
+
+import pytest
+
+py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
+
+
+def make_local_path(s):
+    """Converts '/' in a string to os.sep"""
+    return s.replace('/', os.sep)
+
+
+SETUP_ATTRS = {
+    'name': 'app',
+    'version': '0.0',
+    'packages': ['app'],
+}
+
+
+SETUP_PY = """\
+from setuptools import setup
+
+setup(**%r)
+""" % SETUP_ATTRS
+
+
+@contextlib.contextmanager
+def quiet():
+    old_stdout, old_stderr = sys.stdout, sys.stderr
+    sys.stdout, sys.stderr = six.StringIO(), six.StringIO()
+    try:
+        yield
+    finally:
+        sys.stdout, sys.stderr = old_stdout, old_stderr
+
+
+def touch(filename):
+    open(filename, 'w').close()
+
+# The set of files always in the manifest, including all files in the
+# .egg-info directory
+default_files = frozenset(map(make_local_path, [
+    'README.rst',
+    'MANIFEST.in',
+    'setup.py',
+    'app.egg-info/PKG-INFO',
+    'app.egg-info/SOURCES.txt',
+    'app.egg-info/dependency_links.txt',
+    'app.egg-info/top_level.txt',
+    'app/__init__.py',
+]))
+
+
+class TestManifestTest:
+
+    def setup_method(self, method):
+        self.temp_dir = tempfile.mkdtemp()
+        f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
+        f.write(SETUP_PY)
+        f.close()
+
+        """
+        Create a file tree like:
+        - LICENSE
+        - README.rst
+        - testing.rst
+        - .hidden.rst
+        - app/
+            - __init__.py
+            - a.txt
+            - b.txt
+            - c.rst
+            - static/
+                - app.js
+                - app.js.map
+                - app.css
+                - app.css.map
+        """
+
+        for fname in ['README.rst', '.hidden.rst', 'testing.rst', 'LICENSE']:
+            touch(os.path.join(self.temp_dir, fname))
+
+        # Set up the rest of the test package
+        test_pkg = os.path.join(self.temp_dir, 'app')
+        os.mkdir(test_pkg)
+        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']:
+            touch(os.path.join(test_pkg, fname))
+
+        # Some compiled front-end assets to include
+        static = os.path.join(test_pkg, 'static')
+        os.mkdir(static)
+        for fname in ['app.js', 'app.js.map', 'app.css', 'app.css.map']:
+            touch(os.path.join(static, fname))
+
+        self.old_cwd = os.getcwd()
+        os.chdir(self.temp_dir)
+
+    def teardown_method(self, method):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.temp_dir)
+
+    def make_manifest(self, contents):
+        """Write a MANIFEST.in."""
+        with open(os.path.join(self.temp_dir, 'MANIFEST.in'), 'w') as f:
+            f.write(DALS(contents))
+
+    def get_files(self):
+        """Run egg_info and get all the files to include, as a set"""
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = egg_info(dist)
+        cmd.ensure_finalized()
+
+        cmd.run()
+
+        return set(cmd.filelist.files)
+
+    def test_no_manifest(self):
+        """Check a missing MANIFEST.in includes only the standard files."""
+        assert (default_files - set(['MANIFEST.in'])) == self.get_files()
+
+    def test_empty_files(self):
+        """Check an empty MANIFEST.in includes only the standard files."""
+        self.make_manifest("")
+        assert default_files == self.get_files()
+
+    def test_include(self):
+        """Include extra rst files in the project root."""
+        self.make_manifest("include *.rst")
+        files = default_files | set([
+            'testing.rst', '.hidden.rst'])
+        assert files == self.get_files()
+
+    def test_exclude(self):
+        """Include everything in app/ except the text files"""
+        l = make_local_path
+        self.make_manifest(
+            """
+            include app/*
+            exclude app/*.txt
+            """)
+        files = default_files | set([l('app/c.rst')])
+        assert files == self.get_files()
+
+    def test_include_multiple(self):
+        """Include with multiple patterns."""
+        l = make_local_path
+        self.make_manifest("include app/*.txt app/static/*")
+        files = default_files | set([
+            l('app/a.txt'), l('app/b.txt'),
+            l('app/static/app.js'), l('app/static/app.js.map'),
+            l('app/static/app.css'), l('app/static/app.css.map')])
+        assert files == self.get_files()
+
+    def test_graft(self):
+        """Include the whole app/static/ directory."""
+        l = make_local_path
+        self.make_manifest("graft app/static")
+        files = default_files | set([
+            l('app/static/app.js'), l('app/static/app.js.map'),
+            l('app/static/app.css'), l('app/static/app.css.map')])
+        assert files == self.get_files()
+
+    def test_graft_global_exclude(self):
+        """Exclude all *.map files in the project."""
+        l = make_local_path
+        self.make_manifest(
+            """
+            graft app/static
+            global-exclude *.map
+            """)
+        files = default_files | set([
+            l('app/static/app.js'), l('app/static/app.css')])
+        assert files == self.get_files()
+
+    def test_global_include(self):
+        """Include all *.rst, *.js, and *.css files in the whole tree."""
+        l = make_local_path
+        self.make_manifest(
+            """
+            global-include *.rst *.js *.css
+            """)
+        files = default_files | set([
+            '.hidden.rst', 'testing.rst', l('app/c.rst'),
+            l('app/static/app.js'), l('app/static/app.css')])
+        assert files == self.get_files()
+
+    def test_graft_prune(self):
+        """Include all files in app/, except for the whole app/static/ dir."""
+        l = make_local_path
+        self.make_manifest(
+            """
+            graft app
+            prune app/static
+            """)
+        files = default_files | set([
+            l('app/a.txt'), l('app/b.txt'), l('app/c.rst')])
+        assert files == self.get_files()

From 498f86b8979b644234e8cfebfa990385504e926f Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Tue, 16 Aug 2016 16:36:58 +1000
Subject: [PATCH 6086/8469] Copy FileList tests from distutils

---
 setuptools/tests/test_manifest.py | 283 +++++++++++++++++++++++++++++-
 1 file changed, 274 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index abee5128e7..6e67ca6146 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -6,8 +6,10 @@
 import shutil
 import sys
 import tempfile
+from distutils import log
+from distutils.errors import DistutilsTemplateError
 
-from setuptools.command.egg_info import egg_info
+from setuptools.command.egg_info import FileList, egg_info
 from setuptools.dist import Distribution
 from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
@@ -63,10 +65,23 @@ def touch(filename):
 ]))
 
 
-class TestManifestTest:
+class TempDirTestCase(object):
 
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
+        self.old_cwd = os.getcwd()
+        os.chdir(self.temp_dir)
+
+    def teardown_method(self, method):
+        os.chdir(self.old_cwd)
+        shutil.rmtree(self.temp_dir)
+
+
+class TestManifestTest(TempDirTestCase):
+
+    def setup_method(self, method):
+        super(TestManifestTest, self).setup_method(method)
+
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
         f.write(SETUP_PY)
         f.close()
@@ -104,13 +119,6 @@ def setup_method(self, method):
         for fname in ['app.js', 'app.js.map', 'app.css', 'app.css.map']:
             touch(os.path.join(static, fname))
 
-        self.old_cwd = os.getcwd()
-        os.chdir(self.temp_dir)
-
-    def teardown_method(self, method):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.temp_dir)
-
     def make_manifest(self, contents):
         """Write a MANIFEST.in."""
         with open(os.path.join(self.temp_dir, 'MANIFEST.in'), 'w') as f:
@@ -208,3 +216,260 @@ def test_graft_prune(self):
         files = default_files | set([
             l('app/a.txt'), l('app/b.txt'), l('app/c.rst')])
         assert files == self.get_files()
+
+
+class TestFileListTest(TempDirTestCase):
+    """
+    A copy of the relevant bits of distutils/tests/test_filelist.py,
+    to ensure setuptools' version of FileList keeps parity with distutils.
+    """
+
+    def setup_method(self, method):
+        super(TestFileListTest, self).setup_method(method)
+        self.threshold = log.set_threshold(log.FATAL)
+        self._old_log = log.Log._log
+        log.Log._log = self._log
+        self.logs = []
+
+    def teardown_method(self, method):
+        log.set_threshold(self.threshold)
+        log.Log._log = self._old_log
+        super(TestFileListTest, self).teardown_method(method)
+
+    def _log(self, level, msg, args):
+        if level not in (log.DEBUG, log.INFO, log.WARN, log.ERROR, log.FATAL):
+            raise ValueError('%s wrong log level' % str(level))
+        self.logs.append((level, msg, args))
+
+    def get_logs(self, *levels):
+        def _format(msg, args):
+            if len(args) == 0:
+                return msg
+            return msg % args
+        return [_format(msg, args) for level, msg, args
+                in self.logs if level in levels]
+
+    def clear_logs(self):
+        self.logs = []
+
+    def assertNoWarnings(self):
+        assert self.get_logs(log.WARN) == []
+        self.clear_logs()
+
+    def assertWarnings(self):
+        assert len(self.get_logs(log.WARN)) > 0
+        self.clear_logs()
+
+    def make_files(self, files):
+        for file in files:
+            file = os.path.join(self.temp_dir, file)
+            dirname, basename = os.path.split(file)
+            if not os.path.exists(dirname):
+                os.makedirs(dirname)
+            open(file, 'w').close()
+
+    def test_process_template_line(self):
+        # testing  all MANIFEST.in template patterns
+        file_list = FileList()
+        l = make_local_path
+
+        # simulated file list
+        self.make_files([
+            'foo.tmp', 'ok', 'xo', 'four.txt',
+            'buildout.cfg',
+            # filelist does not filter out VCS directories,
+            # it's sdist that does
+            l('.hg/last-message.txt'),
+            l('global/one.txt'),
+            l('global/two.txt'),
+            l('global/files.x'),
+            l('global/here.tmp'),
+            l('f/o/f.oo'),
+            l('dir/graft-one'),
+            l('dir/dir2/graft2'),
+            l('dir3/ok'),
+            l('dir3/sub/ok.txt'),
+        ])
+
+        MANIFEST_IN = DALS("""\
+        include ok
+        include xo
+        exclude xo
+        include foo.tmp
+        include buildout.cfg
+        global-include *.x
+        global-include *.txt
+        global-exclude *.tmp
+        recursive-include f *.oo
+        recursive-exclude global *.x
+        graft dir
+        prune dir3
+        """)
+
+        for line in MANIFEST_IN.split('\n'):
+            if not line:
+                continue
+            file_list.process_template_line(line)
+
+        wanted = [
+            'buildout.cfg',
+            'four.txt',
+            'ok',
+            l('.hg/last-message.txt'),
+            l('dir/graft-one'),
+            l('dir/dir2/graft2'),
+            l('f/o/f.oo'),
+            l('global/one.txt'),
+            l('global/two.txt'),
+        ]
+        file_list.sort()
+
+        assert file_list.files == wanted
+
+    def test_exclude_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        assert not file_list.exclude_pattern('*.py')
+
+        # return True if files match
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.py']
+        assert file_list.exclude_pattern('*.py')
+
+        # test excludes
+        file_list = FileList()
+        file_list.files = ['a.py', 'a.txt']
+        file_list.exclude_pattern('*.py')
+        assert file_list.files == ['a.txt']
+
+    def test_include_pattern(self):
+        # return False if no match
+        file_list = FileList()
+        file_list.set_allfiles([])
+        assert not file_list.include_pattern('*.py')
+
+        # return True if files match
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        assert file_list.include_pattern('*.py')
+
+        # test * matches all files
+        file_list = FileList()
+        assert file_list.allfiles is None
+        file_list.set_allfiles(['a.py', 'b.txt'])
+        file_list.include_pattern('*')
+        assert file_list.allfiles == ['a.py', 'b.txt']
+
+    def test_process_template(self):
+        l = make_local_path
+        # invalid lines
+        file_list = FileList()
+        for action in ('include', 'exclude', 'global-include',
+                       'global-exclude', 'recursive-include',
+                       'recursive-exclude', 'graft', 'prune', 'blarg'):
+            try:
+                file_list.process_template_line(action)
+            except DistutilsTemplateError:
+                pass
+            except Exception:
+                assert False, "Incorrect error thrown"
+            else:
+                assert False, "Should have thrown an error"
+
+        # include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
+
+        file_list.process_template_line('include *.py')
+        assert file_list.files == ['a.py']
+        self.assertNoWarnings()
+
+        file_list.process_template_line('include *.rb')
+        assert file_list.files == ['a.py']
+        self.assertWarnings()
+
+        # exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
+
+        file_list.process_template_line('exclude *.py')
+        assert file_list.files == ['b.txt', l('d/c.py')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('exclude *.rb')
+        assert file_list.files == ['b.txt', l('d/c.py')]
+        self.assertWarnings()
+
+        # global-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
+
+        file_list.process_template_line('global-include *.py')
+        assert file_list.files == ['a.py', l('d/c.py')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-include *.rb')
+        assert file_list.files == ['a.py', l('d/c.py')]
+        self.assertWarnings()
+
+        # global-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
+
+        file_list.process_template_line('global-exclude *.py')
+        assert file_list.files == ['b.txt']
+        self.assertNoWarnings()
+
+        file_list.process_template_line('global-exclude *.rb')
+        assert file_list.files == ['b.txt']
+        self.assertWarnings()
+
+        # recursive-include
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/c.txt'),
+                                l('d/d/e.py')])
+
+        file_list.process_template_line('recursive-include d *.py')
+        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-include e *.py')
+        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        self.assertWarnings()
+
+        # recursive-exclude
+        file_list = FileList()
+        file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
+
+        file_list.process_template_line('recursive-exclude d *.py')
+        assert file_list.files == ['a.py', l('d/c.txt')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('recursive-exclude e *.py')
+        assert file_list.files == ['a.py', l('d/c.txt')]
+        self.assertWarnings()
+
+        # graft
+        file_list = FileList()
+        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/d/e.py'),
+                                l('f/f.py')])
+
+        file_list.process_template_line('graft d')
+        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('graft e')
+        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        self.assertWarnings()
+
+        # prune
+        file_list = FileList()
+        file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
+
+        file_list.process_template_line('prune d')
+        assert file_list.files == ['a.py', l('f/f.py')]
+        self.assertNoWarnings()
+
+        file_list.process_template_line('prune e')
+        assert file_list.files == ['a.py', l('f/f.py')]
+        self.assertWarnings()

From d806e4cf59b252eb2120483347c4f3772f4ca386 Mon Sep 17 00:00:00 2001
From: insiv <insiv@openmailbox.org>
Date: Wed, 17 Aug 2016 22:07:48 +0700
Subject: [PATCH 6087/8469] Remove whitespace around parameter = sign.

---
 pkg_resources/__init__.py             | 2 +-
 pkg_resources/tests/test_resources.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2a053b509e..8d967c0749 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1913,7 +1913,7 @@ def __init__(self, importer):
             self.module_path = importer.archive
         self._setup_prefix()
 
-_declare_state('dict', _distribution_finders = {})
+_declare_state('dict', _distribution_finders={})
 
 def register_finder(importer_type, distribution_finder):
     """Register `distribution_finder` to find distributions in sys.path items
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index e0dbb65279..e4827fa598 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -114,7 +114,7 @@ def testDistroParse(self):
     def testDistroMetadata(self):
         d = Distribution(
             "/some/path", project_name="FooPkg", py_version="2.4", platform="win32",
-            metadata = Metadata(
+            metadata=Metadata(
                 ('PKG-INFO',"Metadata-Version: 1.0\nVersion: 1.3-1\n")
             )
         )

From 37f1dd197243d18667b1d7fee489013d53b3bd06 Mon Sep 17 00:00:00 2001
From: insiv <insiv@openmailbox.org>
Date: Wed, 17 Aug 2016 22:24:43 +0700
Subject: [PATCH 6088/8469] Add missing whitespace around operators.

---
 pkg_resources/__init__.py             | 56 +++++++++++++--------------
 pkg_resources/tests/test_resources.py | 12 +++---
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2a053b509e..a4704c7298 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -155,7 +155,7 @@ def _parse_version_parts(s):
                     # pad for numeric comparison
                     yield part.zfill(8)
                 else:
-                    yield '*'+part
+                    yield '*' + part
 
             # ensure that alpha/beta/candidate are before final
             yield '*final'
@@ -217,13 +217,13 @@ def __getstate__():
     state = {}
     g = globals()
     for k, v in _state_vars.items():
-        state[k] = g['_sget_'+v](g[k])
+        state[k] = g['_sget_' + v](g[k])
     return state
 
 def __setstate__(state):
     g = globals()
     for k, v in state.items():
-        g['_sset_'+_state_vars[k]](k, g[k], v)
+        g['_sset_' + _state_vars[k]](k, g[k], v)
     return state
 
 def _sget_dict(val):
@@ -314,7 +314,7 @@ def get_supported_platform():
 class ResolutionError(Exception):
     """Abstract base for dependency resolution errors"""
     def __repr__(self):
-        return self.__class__.__name__+repr(self.args)
+        return self.__class__.__name__ + repr(self.args)
 
 
 class VersionConflict(ResolutionError):
@@ -477,7 +477,7 @@ def compatible_platforms(provided, required):
 
     XXX Needs compatibility checks for Linux and other unixy OSes.
     """
-    if provided is None or required is None or provided==required:
+    if provided is None or required is None or provided == required:
         # easy case
         return True
 
@@ -732,7 +732,7 @@ def __iter__(self):
 
             for key in self.entry_keys[item]:
                 if key not in seen:
-                    seen[key]=1
+                    seen[key] = 1
                     yield self.by_key[key]
 
     def add(self, dist, entry=None, insert=True, replace=False):
@@ -1033,7 +1033,7 @@ def can_add(self, dist):
         is returned.
         """
         return (self.python is None or dist.py_version is None
-            or dist.py_version==self.python) \
+            or dist.py_version == self.python) \
             and compatible_platforms(dist.platform, self.platform)
 
     def remove(self, dist):
@@ -1238,7 +1238,7 @@ def get_cache_path(self, archive_name, names=()):
         extract, as it tracks the generated names for possible cleanup later.
         """
         extract_path = self.extraction_path or get_default_cache()
-        target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
+        target_path = os.path.join(extract_path, archive_name + '-tmp', *names)
         try:
             _bypass_ensure_directory(target_path)
         except:
@@ -1344,7 +1344,7 @@ def get_default_cache():
     except KeyError:
         pass
 
-    if os.name!='nt':
+    if os.name != 'nt':
         return os.path.expanduser('~/.python-eggs')
 
     # XXX this may be locale-specific!
@@ -1492,7 +1492,7 @@ def metadata_listdir(self, name):
         return []
 
     def run_script(self, script_name, namespace):
-        script = 'scripts/'+script_name
+        script = 'scripts/' + script_name
         if not self.has_metadata(script):
             raise ResolutionError("No script named %r" % script_name)
         script_text = self.get_metadata(script).replace('\r\n', '\n')
@@ -1553,7 +1553,7 @@ def _setup_prefix(self):
         # of multiple eggs; that's why we use module_path instead of .archive
         path = self.module_path
         old = None
-        while path!=old:
+        while path != old:
             if _is_unpacked_egg(path):
                 self.egg_name = os.path.basename(path)
                 self.egg_info = os.path.join(path, 'EGG-INFO')
@@ -1679,7 +1679,7 @@ class ZipProvider(EggProvider):
 
     def __init__(self, module):
         EggProvider.__init__(self, module)
-        self.zip_pre = self.loader.archive+os.sep
+        self.zip_pre = self.loader.archive + os.sep
 
     def _zipinfo_name(self, fspath):
         # Convert a virtual filename (full path to file) into a zipfile subpath
@@ -1693,9 +1693,9 @@ def _zipinfo_name(self, fspath):
     def _parts(self, zip_path):
         # Convert a zipfile subpath into an egg-relative path part list.
         # pseudo-fs path
-        fspath = self.zip_pre+zip_path
-        if fspath.startswith(self.egg_root+os.sep):
-            return fspath[len(self.egg_root)+1:].split(os.sep)
+        fspath = self.zip_pre + zip_path
+        if fspath.startswith(self.egg_root + os.sep):
+            return fspath[len(self.egg_root) + 1:].split(os.sep)
         raise AssertionError(
             "%s is not a subpath of %s" % (fspath, self.egg_root)
         )
@@ -1766,7 +1766,7 @@ def _extract_resource(self, manager, zip_path):
                         #  so proceed.
                         return real_path
                     # Windows, del old file and retry
-                    elif os.name=='nt':
+                    elif os.name == 'nt':
                         unlink(real_path)
                         rename(tmpnam, real_path)
                         return real_path
@@ -1786,7 +1786,7 @@ def _is_current(self, file_path, zip_path):
         if not os.path.isfile(file_path):
             return False
         stat = os.stat(file_path)
-        if stat.st_size!=size or stat.st_mtime!=timestamp:
+        if stat.st_size != size or stat.st_mtime != timestamp:
             return False
         # check that the contents match
         zip_contents = self.loader.get_data(zip_path)
@@ -1855,10 +1855,10 @@ def __init__(self, path):
         self.path = path
 
     def has_metadata(self, name):
-        return name=='PKG-INFO' and os.path.isfile(self.path)
+        return name == 'PKG-INFO' and os.path.isfile(self.path)
 
     def get_metadata(self, name):
-        if name=='PKG-INFO':
+        if name == 'PKG-INFO':
             with io.open(self.path, encoding='utf-8') as f:
                 try:
                     metadata = f.read()
@@ -1905,7 +1905,7 @@ class EggMetadata(ZipProvider):
     def __init__(self, importer):
         """Create a metadata provider from a zipimporter"""
 
-        self.zip_pre = importer.archive+os.sep
+        self.zip_pre = importer.archive + os.sep
         self.loader = importer
         if importer.prefix:
             self.module_path = os.path.join(importer.archive, importer.prefix)
@@ -2117,7 +2117,7 @@ def file_ns_handler(importer, path_item, packageName, module):
     subpath = os.path.join(path_item, packageName.split('.')[-1])
     normalized = _normalize_cached(subpath)
     for item in module.__path__:
-        if _normalize_cached(item)==normalized:
+        if _normalize_cached(item) == normalized:
             break
     else:
         # Only return the path if it's not already there
@@ -2294,7 +2294,7 @@ def parse_group(cls, group, lines, dist=None):
             ep = cls.parse(line, dist)
             if ep.name in this:
                 raise ValueError("Duplicate entry point", group, ep.name)
-            this[ep.name]=ep
+            this[ep.name] = ep
         return this
 
     @classmethod
@@ -2356,7 +2356,7 @@ def __init__(self, location=None, metadata=None, project_name=None,
 
     @classmethod
     def from_location(cls, location, basename, metadata=None, **kw):
-        project_name, version, py_version, platform = [None]*4
+        project_name, version, py_version, platform = [None] * 4
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
             cls = _distributionImpl[ext.lower()]
@@ -2478,9 +2478,9 @@ def _dep_map(self):
                             extra, marker = extra.split(':', 1)
                             if invalid_marker(marker):
                                 # XXX warn
-                                reqs=[]
+                                reqs = []
                             elif not evaluate_marker(marker):
-                                reqs=[]
+                                reqs = []
                         extra = safe_extra(extra) or None
                     dm.setdefault(extra,[]).extend(parse_requirements(reqs))
             return dm
@@ -2611,7 +2611,7 @@ def insert_on(self, path, loc=None, replace=False):
 
         nloc = _normalize_cached(loc)
         bdir = os.path.dirname(nloc)
-        npath= [(p and _normalize_cached(p) or p) for p in path]
+        npath = [(p and _normalize_cached(p) or p) for p in path]
 
         for p, item in enumerate(npath):
             if item == nloc:
@@ -2642,7 +2642,7 @@ def insert_on(self, path, loc=None, replace=False):
         # p is the spot where we found or inserted loc; now remove duplicates
         while True:
             try:
-                np = npath.index(nloc, p+1)
+                np = npath.index(nloc, p + 1)
             except ValueError:
                 break
             else:
@@ -2981,7 +2981,7 @@ def _initialize_master_working_set():
         dist.activate(replace=False)
     del dist
     add_activation_listener(lambda dist: dist.activate(replace=True), existing=False)
-    working_set.entries=[]
+    working_set.entries = []
     # match order
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index e0dbb65279..3649a30a48 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -164,7 +164,7 @@ def testResolve(self):
         ad.add(Baz)
 
         # Activation list now includes resolved dependency
-        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) ==[Foo,Baz]
+        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) == [Foo,Baz]
         # Requests for conflicting versions produce VersionConflict
         with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
@@ -426,7 +426,7 @@ def testParseMap(self):
         m = EntryPoint.parse_map({'xyz':self.submap_str})
         self.checkSubMap(m['xyz'])
         assert list(m.keys()) == ['xyz']
-        m = EntryPoint.parse_map("[xyz]\n"+self.submap_str)
+        m = EntryPoint.parse_map("[xyz]\n" + self.submap_str)
         self.checkSubMap(m['xyz'])
         assert list(m.keys()) == ['xyz']
         with pytest.raises(ValueError):
@@ -644,7 +644,7 @@ def c(s1,s2):
     def testVersionOrdering(self):
         def c(s1,s2):
             p1, p2 = parse_version(s1),parse_version(s2)
-            assert p1<p2, (s1,s2,p1,p2)
+            assert p1 < p2, (s1,s2,p1,p2)
 
         c('2.1','2.1.1')
         c('2a1','2b0')
@@ -663,14 +663,14 @@ def c(s1,s2):
         c('2.1.0-rc1','2.1.0')
         c('2.1dev','2.1a0')
 
-        torture ="""
+        torture = """
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1
         0.79.9999+0.80.0pre2-3 0.79.9999+0.80.0pre2-2
         0.77.2-1 0.77.1-1 0.77.0-1
         """.split()
 
         for p,v1 in enumerate(torture):
-            for v2 in torture[p+1:]:
+            for v2 in torture[p + 1:]:
                 c(v2,v1)
 
     def testVersionBuildout(self):
@@ -764,7 +764,7 @@ def patched_path(self, tmpdir):
             pkg_resources._namespace_packages = saved_ns_pkgs
             sys.path = saved_sys_path
 
-    issue591 = pytest.mark.xfail(platform.system()=='Windows', reason="#591")
+    issue591 = pytest.mark.xfail(platform.system() == 'Windows', reason="#591")
 
     @issue591
     def test_two_levels_deep(self, symlinked_tmpdir):

From bcddf126ec2f52fab767d611c67701512e046110 Mon Sep 17 00:00:00 2001
From: insiv <nessento@openmailbox.org>
Date: Wed, 17 Aug 2016 22:47:37 +0700
Subject: [PATCH 6089/8469] Fix spacing after comment hash.

---
 pkg_resources/tests/test_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index e0dbb65279..854bc327b5 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -153,7 +153,7 @@ def testResolve(self):
             list(map(ws.add, targets))
         with pytest.raises(VersionConflict):
             ws.resolve(parse_requirements("Foo==0.9"), ad)
-        ws = WorkingSet([]) # reset
+        ws = WorkingSet([])  # reset
 
         # Request an extra that causes an unresolved dependency for "Baz"
         with pytest.raises(pkg_resources.DistributionNotFound):

From bbfaa7817d92bc2e04e4b4fa89d2b9a783f053cd Mon Sep 17 00:00:00 2001
From: insiv <nessento@openmailbox.org>
Date: Wed, 17 Aug 2016 22:51:31 +0700
Subject: [PATCH 6090/8469] Fix comparison with None.

---
 pkg_resources/tests/test_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index e0dbb65279..963308b23f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -103,7 +103,7 @@ def testDistroBasics(self):
 
         d = Distribution("/some/path")
         assert d.py_version == sys.version[:3]
-        assert d.platform == None
+        assert d.platform is None
 
     def testDistroParse(self):
         d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg")

From 84aec138dc4311c3f23ff78e9916e00b457a1896 Mon Sep 17 00:00:00 2001
From: insiv <nessento@openmailbox.org>
Date: Wed, 17 Aug 2016 23:05:38 +0700
Subject: [PATCH 6091/8469] Upgrade pyparsing to version 2.1.8

---
 pkg_resources/_vendor/pyparsing.py | 3358 +++++++++++++++++++++-------
 pkg_resources/_vendor/vendored.txt |    2 +-
 2 files changed, 2565 insertions(+), 795 deletions(-)

diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
index 2284cadcd9..89cffc10b8 100644
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -48,7 +48,7 @@
 The Python representation of the grammar is quite readable, owing to the self-explanatory
 class names, and the use of '+', '|' and '^' operators.
 
-The parsed results returned from C{parseString()} can be accessed as a nested list, a dictionary, or an
+The parsed results returned from L{I{ParserElement.parseString}<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
 object with named attributes.
 
 The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
@@ -57,8 +57,8 @@ class names, and the use of '+', '|' and '^' operators.
  - embedded comments
 """
 
-__version__ = "2.0.6"
-__versionTime__ = "9 Nov 2015 19:03"
+__version__ = "2.1.8"
+__versionTime__ = "14 Aug 2016 08:43 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -70,8 +70,22 @@ class names, and the use of '+', '|' and '^' operators.
 import sre_constants
 import collections
 import pprint
-import functools
-import itertools
+import traceback
+import types
+from datetime import datetime
+
+try:
+    from _thread import RLock
+except ImportError:
+    from threading import RLock
+
+try:
+    from collections import OrderedDict as _OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict as _OrderedDict
+    except ImportError:
+        _OrderedDict = None
 
 #~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) )
 
@@ -81,21 +95,23 @@ class names, and the use of '+', '|' and '^' operators.
 'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or',
 'ParseBaseException', 'ParseElementEnhance', 'ParseException', 'ParseExpression', 'ParseFatalException',
 'ParseResults', 'ParseSyntaxException', 'ParserElement', 'QuotedString', 'RecursiveGrammarException',
-'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 'Upcase',
+'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 
 'White', 'Word', 'WordEnd', 'WordStart', 'ZeroOrMore',
 'alphanums', 'alphas', 'alphas8bit', 'anyCloseTag', 'anyOpenTag', 'cStyleComment', 'col',
 'commaSeparatedList', 'commonHTMLEntity', 'countedArray', 'cppStyleComment', 'dblQuotedString',
 'dblSlashComment', 'delimitedList', 'dictOf', 'downcaseTokens', 'empty', 'hexnums',
-'htmlComment', 'javaStyleComment', 'keepOriginalText', 'line', 'lineEnd', 'lineStart', 'lineno',
+'htmlComment', 'javaStyleComment', 'line', 'lineEnd', 'lineStart', 'lineno',
 'makeHTMLTags', 'makeXMLTags', 'matchOnlyAtCol', 'matchPreviousExpr', 'matchPreviousLiteral',
 'nestedExpr', 'nullDebugAction', 'nums', 'oneOf', 'opAssoc', 'operatorPrecedence', 'printables',
 'punc8bit', 'pythonStyleComment', 'quotedString', 'removeQuotes', 'replaceHTMLEntity', 
 'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
 'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
 'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
+'tokenMap', 'pyparsing_common',
 ]
 
-PY_3 = sys.version.startswith('3')
+system_version = tuple(sys.version_info)[:3]
+PY_3 = system_version[0] == 3
 if PY_3:
     _MAX_INT = sys.maxsize
     basestring = str
@@ -123,18 +139,11 @@ def _ustr(obj):
             return str(obj)
 
         except UnicodeEncodeError:
-            # The Python docs (http://docs.python.org/ref/customization.html#l2h-182)
-            # state that "The return value must be a string object". However, does a
-            # unicode object (being a subclass of basestring) count as a "string
-            # object"?
-            # If so, then return a unicode object:
-            return unicode(obj)
-            # Else encode it... but how? There are many choices... :)
-            # Replace unprintables with escape codes?
-            #return unicode(obj).encode(sys.getdefaultencoding(), 'backslashreplace_errors')
-            # Replace unprintables with question marks?
-            #return unicode(obj).encode(sys.getdefaultencoding(), 'replace')
-            # ...
+            # Else encode it
+            ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
+            xmlcharref = Regex('&#\d+;')
+            xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
+            return xmlcharref.transformString(ret)
 
     # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
     singleArgBuiltins = []
@@ -160,7 +169,7 @@ def _xml_escape(data):
 class _Constants(object):
     pass
 
-alphas = string.ascii_lowercase + string.ascii_uppercase
+alphas     = string.ascii_uppercase + string.ascii_lowercase
 nums       = "0123456789"
 hexnums    = nums + "ABCDEFabcdef"
 alphanums  = alphas + nums
@@ -180,6 +189,15 @@ def __init__( self, pstr, loc=0, msg=None, elem=None ):
             self.msg = msg
             self.pstr = pstr
         self.parserElement = elem
+        self.args = (pstr, loc, msg)
+
+    @classmethod
+    def _from_exception(cls, pe):
+        """
+        internal factory method to simplify creating one type of ParseException 
+        from another - avoids having __init__ signature conflicts among subclasses
+        """
+        return cls(pe.pstr, pe.loc, pe.msg, pe.parserElement)
 
     def __getattr__( self, aname ):
         """supported attributes by name are:
@@ -212,15 +230,26 @@ def markInputline( self, markerString = ">!<" ):
                                 markerString, line_str[line_column:]))
         return line_str.strip()
     def __dir__(self):
-        return "loc msg pstr parserElement lineno col line " \
-               "markInputline __str__ __repr__".split()
+        return "lineno col line".split() + dir(type(self))
 
 class ParseException(ParseBaseException):
-    """exception thrown when parse expressions don't match class;
-       supported attributes by name are:
-        - lineno - returns the line number of the exception text
-        - col - returns the column number of the exception text
-        - line - returns the line containing the exception text
+    """
+    Exception thrown when parse expressions don't match class;
+    supported attributes by name are:
+     - lineno - returns the line number of the exception text
+     - col - returns the column number of the exception text
+     - line - returns the line containing the exception text
+        
+    Example::
+        try:
+            Word(nums).setName("integer").parseString("ABC")
+        except ParseException as pe:
+            print(pe)
+            print("column: {}".format(pe.col))
+            
+    prints::
+       Expected integer (at char 0), (line:1, col:1)
+        column: 1
     """
     pass
 
@@ -230,12 +259,10 @@ class ParseFatalException(ParseBaseException):
     pass
 
 class ParseSyntaxException(ParseFatalException):
-    """just like C{L{ParseFatalException}}, but thrown internally when an
-       C{L{ErrorStop<And._ErrorStop>}} ('-' operator) indicates that parsing is to stop immediately because
-       an unbacktrackable syntax error has been found"""
-    def __init__(self, pe):
-        super(ParseSyntaxException, self).__init__(
-                                    pe.pstr, pe.loc, pe.msg, pe.parserElement)
+    """just like L{ParseFatalException}, but thrown internally when an
+       L{ErrorStop<And._ErrorStop>} ('-' operator) indicates that parsing is to stop 
+       immediately because an unbacktrackable syntax error has been found"""
+    pass
 
 #~ class ReparseException(ParseBaseException):
     #~ """Experimental class - parse actions can raise this exception to cause
@@ -251,7 +278,7 @@ def __init__(self, pe):
         #~ self.reparseLoc = restartLoc
 
 class RecursiveGrammarException(Exception):
-    """exception thrown by C{validate()} if the grammar could be improperly recursive"""
+    """exception thrown by L{ParserElement.validate} if the grammar could be improperly recursive"""
     def __init__( self, parseElementList ):
         self.parseElementTrace = parseElementList
 
@@ -269,12 +296,44 @@ def setOffset(self,i):
         self.tup = (self.tup[0],i)
 
 class ParseResults(object):
-    """Structured parse results, to provide multiple means of access to the parsed data:
+    """
+    Structured parse results, to provide multiple means of access to the parsed data:
        - as a list (C{len(results)})
        - by list index (C{results[0], results[1]}, etc.)
-       - by attribute (C{results.<resultsName>})
-       """
-    def __new__(cls, toklist, name=None, asList=True, modal=True ):
+       - by attribute (C{results.<resultsName>} - see L{ParserElement.setResultsName})
+
+    Example::
+        integer = Word(nums)
+        date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+        # equivalent form:
+        # date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+
+        result = date_str.parseString("1999/12/31")
+
+        def test(s, fn=repr):
+            print("%s -> %s" % (s, fn(eval(s))))
+        test("list(result)")
+        test("result[0]")
+        test("result['month']")
+        test("result.day")
+        test("'month' in result")
+        test("'minutes' in result")
+        test("result.dump()", str)
+    prints::
+        list(result) -> ['1999', '/', '12', '/', '31']
+        result[0] -> '1999'
+        result['month'] -> '12'
+        result.day -> '31'
+        'month' in result -> True
+        'minutes' in result -> False
+        result.dump() -> ['1999', '/', '12', '/', '31']
+        - day: 31
+        - month: 12
+        - year: 1999
+    """
+    def __new__(cls, toklist=None, name=None, asList=True, modal=True ):
         if isinstance(toklist, cls):
             return toklist
         retobj = object.__new__(cls)
@@ -283,12 +342,16 @@ def __new__(cls, toklist, name=None, asList=True, modal=True ):
 
     # Performance tuning: we construct a *lot* of these, so keep this
     # constructor as small and fast as possible
-    def __init__( self, toklist, name=None, asList=True, modal=True, isinstance=isinstance ):
+    def __init__( self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance ):
         if self.__doinit:
             self.__doinit = False
             self.__name = None
             self.__parent = None
             self.__accumNames = {}
+            self.__asList = asList
+            self.__modal = modal
+            if toklist is None:
+                toklist = []
             if isinstance(toklist, list):
                 self.__toklist = toklist[:]
             elif isinstance(toklist, _generatorType):
@@ -331,7 +394,7 @@ def __setitem__( self, k, v, isinstance=isinstance ):
         if isinstance(v,_ParseResultsWithOffset):
             self.__tokdict[k] = self.__tokdict.get(k,list()) + [v]
             sub = v[0]
-        elif isinstance(k,int):
+        elif isinstance(k,(int,slice)):
             self.__toklist[k] = v
             sub = v
         else:
@@ -354,11 +417,6 @@ def __delitem__( self, i ):
             removed = list(range(*i.indices(mylen)))
             removed.reverse()
             # fixup indices in token dictionary
-            #~ for name in self.__tokdict:
-                #~ occurrences = self.__tokdict[name]
-                #~ for j in removed:
-                    #~ for k, (value, position) in enumerate(occurrences):
-                        #~ occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
             for name,occurrences in self.__tokdict.items():
                 for j in removed:
                     for k, (value, position) in enumerate(occurrences):
@@ -370,39 +428,52 @@ def __contains__( self, k ):
         return k in self.__tokdict
 
     def __len__( self ): return len( self.__toklist )
-    def __bool__(self): return len( self.__toklist ) > 0
+    def __bool__(self): return ( not not self.__toklist )
     __nonzero__ = __bool__
     def __iter__( self ): return iter( self.__toklist )
     def __reversed__( self ): return iter( self.__toklist[::-1] )
-    def iterkeys( self ):
-        """Returns all named result keys."""
+    def _iterkeys( self ):
         if hasattr(self.__tokdict, "iterkeys"):
             return self.__tokdict.iterkeys()
         else:
             return iter(self.__tokdict)
 
-    def itervalues( self ):
-        """Returns all named result values."""
-        return (self[k] for k in self.iterkeys())
+    def _itervalues( self ):
+        return (self[k] for k in self._iterkeys())
             
-    def iteritems( self ):
-        return ((k, self[k]) for k in self.iterkeys())
+    def _iteritems( self ):
+        return ((k, self[k]) for k in self._iterkeys())
 
     if PY_3:
-        keys = iterkeys
-        values = itervalues
-        items = iteritems
+        keys = _iterkeys       
+        """Returns an iterator of all named result keys (Python 3.x only)."""
+
+        values = _itervalues
+        """Returns an iterator of all named result values (Python 3.x only)."""
+
+        items = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 3.x only)."""
+
     else:
+        iterkeys = _iterkeys
+        """Returns an iterator of all named result keys (Python 2.x only)."""
+
+        itervalues = _itervalues
+        """Returns an iterator of all named result values (Python 2.x only)."""
+
+        iteritems = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 2.x only)."""
+
         def keys( self ):
-            """Returns all named result keys."""
+            """Returns all named result keys (as a list in Python 2.x, as an iterator in Python 3.x)."""
             return list(self.iterkeys())
 
         def values( self ):
-            """Returns all named result values."""
+            """Returns all named result values (as a list in Python 2.x, as an iterator in Python 3.x)."""
             return list(self.itervalues())
                 
         def items( self ):
-            """Returns all named result keys and values as a list of tuples."""
+            """Returns all named result key-values (as a list of tuples in Python 2.x, as an iterator in Python 3.x)."""
             return list(self.iteritems())
 
     def haskeys( self ):
@@ -411,14 +482,39 @@ def haskeys( self ):
         return bool(self.__tokdict)
         
     def pop( self, *args, **kwargs):
-        """Removes and returns item at specified index (default=last).
-           Supports both list and dict semantics for pop(). If passed no
-           argument or an integer argument, it will use list semantics
-           and pop tokens from the list of parsed tokens. If passed a 
-           non-integer argument (most likely a string), it will use dict
-           semantics and pop the corresponding value from any defined 
-           results names. A second default return value argument is 
-           supported, just as in dict.pop()."""
+        """
+        Removes and returns item at specified index (default=C{last}).
+        Supports both C{list} and C{dict} semantics for C{pop()}. If passed no
+        argument or an integer argument, it will use C{list} semantics
+        and pop tokens from the list of parsed tokens. If passed a 
+        non-integer argument (most likely a string), it will use C{dict}
+        semantics and pop the corresponding value from any defined 
+        results names. A second default return value argument is 
+        supported, just as in C{dict.pop()}.
+
+        Example::
+            def remove_first(tokens):
+                tokens.pop(0)
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            print(OneOrMore(Word(nums)).addParseAction(remove_first).parseString("0 123 321")) # -> ['123', '321']
+
+            label = Word(alphas)
+            patt = label("LABEL") + OneOrMore(Word(nums))
+            print(patt.parseString("AAB 123 321").dump())
+
+            # Use pop() in a parse action to remove named result (note that corresponding value is not
+            # removed from list form of results)
+            def remove_LABEL(tokens):
+                tokens.pop("LABEL")
+                return tokens
+            patt.addParseAction(remove_LABEL)
+            print(patt.parseString("AAB 123 321").dump())
+        prints::
+            ['AAB', '123', '321']
+            - LABEL: AAB
+
+            ['AAB', '123', '321']
+        """
         if not args:
             args = [-1]
         for k,v in kwargs.items():
@@ -438,39 +534,83 @@ def pop( self, *args, **kwargs):
             return defaultvalue
 
     def get(self, key, defaultValue=None):
-        """Returns named result matching the given key, or if there is no
-           such name, then returns the given C{defaultValue} or C{None} if no
-           C{defaultValue} is specified."""
+        """
+        Returns named result matching the given key, or if there is no
+        such name, then returns the given C{defaultValue} or C{None} if no
+        C{defaultValue} is specified.
+
+        Similar to C{dict.get()}.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            result = date_str.parseString("1999/12/31")
+            print(result.get("year")) # -> '1999'
+            print(result.get("hour", "not specified")) # -> 'not specified'
+            print(result.get("hour")) # -> None
+        """
         if key in self:
             return self[key]
         else:
             return defaultValue
 
     def insert( self, index, insStr ):
-        """Inserts new element at location index in the list of parsed tokens."""
+        """
+        Inserts new element at location index in the list of parsed tokens.
+        
+        Similar to C{list.insert()}.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+
+            # use a parse action to insert the parse location in the front of the parsed results
+            def insert_locn(locn, tokens):
+                tokens.insert(0, locn)
+            print(OneOrMore(Word(nums)).addParseAction(insert_locn).parseString("0 123 321")) # -> [0, '0', '123', '321']
+        """
         self.__toklist.insert(index, insStr)
         # fixup indices in token dictionary
-        #~ for name in self.__tokdict:
-            #~ occurrences = self.__tokdict[name]
-            #~ for k, (value, position) in enumerate(occurrences):
-                #~ occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
         for name,occurrences in self.__tokdict.items():
             for k, (value, position) in enumerate(occurrences):
                 occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
 
     def append( self, item ):
-        """Add single element to end of ParseResults list of elements."""
+        """
+        Add single element to end of ParseResults list of elements.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            
+            # use a parse action to compute the sum of the parsed integers, and add it to the end
+            def append_sum(tokens):
+                tokens.append(sum(map(int, tokens)))
+            print(OneOrMore(Word(nums)).addParseAction(append_sum).parseString("0 123 321")) # -> ['0', '123', '321', 444]
+        """
         self.__toklist.append(item)
 
     def extend( self, itemseq ):
-        """Add sequence of elements to end of ParseResults list of elements."""
+        """
+        Add sequence of elements to end of ParseResults list of elements.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            
+            # use a parse action to append the reverse of the matched strings, to make a palindrome
+            def make_palindrome(tokens):
+                tokens.extend(reversed([t[::-1] for t in tokens]))
+                return ''.join(tokens)
+            print(patt.addParseAction(make_palindrome).parseString("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
+        """
         if isinstance(itemseq, ParseResults):
             self += itemseq
         else:
             self.__toklist.extend(itemseq)
 
     def clear( self ):
-        """Clear all elements and results names."""
+        """
+        Clear all elements and results names.
+        """
         del self.__toklist[:]
         self.__tokdict.clear()
 
@@ -511,7 +651,11 @@ def __iadd__( self, other ):
 
     def __radd__(self, other):
         if isinstance(other,int) and other == 0:
+            # useful for merging many ParseResults using sum() builtin
             return self.copy()
+        else:
+            # this may raise a TypeError - so be it
+            return other + self
         
     def __repr__( self ):
         return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) )
@@ -531,18 +675,60 @@ def _asStringList( self, sep='' ):
         return out
 
     def asList( self ):
-        """Returns the parse results as a nested list of matching tokens, all converted to strings."""
+        """
+        Returns the parse results as a nested list of matching tokens, all converted to strings.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            result = patt.parseString("sldkj lsdkj sldkj")
+            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
+            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
+            
+            # Use asList() to create an actual list
+            result_list = result.asList()
+            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
+        """
         return [res.asList() if isinstance(res,ParseResults) else res for res in self.__toklist]
 
     def asDict( self ):
-        """Returns the named parse results as dictionary."""
+        """
+        Returns the named parse results as a nested dictionary.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
+            
+            result_dict = result.asDict()
+            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
+
+            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
+            import json
+            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
+            print(json.dumps(result.asDict())) # -> {"month": "31", "day": "1999", "year": "12"}
+        """
         if PY_3:
-            return dict( self.items() )
+            item_fn = self.items
         else:
-            return dict( self.iteritems() )
+            item_fn = self.iteritems
+            
+        def toItem(obj):
+            if isinstance(obj, ParseResults):
+                if obj.haskeys():
+                    return obj.asDict()
+                else:
+                    return [toItem(v) for v in obj]
+            else:
+                return obj
+                
+        return dict((k,toItem(v)) for k,v in item_fn())
 
     def copy( self ):
-        """Returns a new copy of a C{ParseResults} object."""
+        """
+        Returns a new copy of a C{ParseResults} object.
+        """
         ret = ParseResults( self.__toklist )
         ret.__tokdict = self.__tokdict.copy()
         ret.__parent = self.__parent
@@ -551,7 +737,9 @@ def copy( self ):
         return ret
 
     def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ):
-        """Returns the parse results as XML. Tags are created for tokens and lists that have defined results names."""
+        """
+        (Deprecated) Returns the parse results as XML. Tags are created for tokens and lists that have defined results names.
+        """
         nl = "\n"
         out = []
         namedItems = dict((v[1],k) for (k,vlist) in self.__tokdict.items()
@@ -617,7 +805,27 @@ def __lookup(self,sub):
         return None
 
     def getName(self):
-        """Returns the results name for this token expression."""
+        """
+        Returns the results name for this token expression. Useful when several 
+        different expressions might match at a particular location.
+
+        Example::
+            integer = Word(nums)
+            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
+            house_number_expr = Suppress('#') + Word(nums, alphanums)
+            user_data = (Group(house_number_expr)("house_number") 
+                        | Group(ssn_expr)("ssn")
+                        | Group(integer)("age"))
+            user_info = OneOrMore(user_data)
+            
+            result = user_info.parseString("22 111-22-3333 #221B")
+            for item in result:
+                print(item.getName(), ':', item[0])
+        prints::
+            age : 22
+            ssn : 111-22-3333
+            house_number : 221B
+        """
         if self.__name:
             return self.__name
         elif self.__parent:
@@ -633,40 +841,72 @@ def getName(self):
         else:
             return None
 
-    def dump(self,indent='',depth=0):
-        """Diagnostic method for listing out the contents of a C{ParseResults}.
-           Accepts an optional C{indent} argument so that this string can be embedded
-           in a nested display of other data."""
+    def dump(self, indent='', depth=0, full=True):
+        """
+        Diagnostic method for listing out the contents of a C{ParseResults}.
+        Accepts an optional C{indent} argument so that this string can be embedded
+        in a nested display of other data.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(result.dump())
+        prints::
+            ['12', '/', '31', '/', '1999']
+            - day: 1999
+            - month: 31
+            - year: 12
+        """
         out = []
         NL = '\n'
         out.append( indent+_ustr(self.asList()) )
-        if self.haskeys():
-            items = sorted(self.items())
-            for k,v in items:
-                if out:
-                    out.append(NL)
-                out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
-                if isinstance(v,ParseResults):
-                    if v:
-                        out.append( v.dump(indent,depth+1) )
+        if full:
+            if self.haskeys():
+                items = sorted(self.items())
+                for k,v in items:
+                    if out:
+                        out.append(NL)
+                    out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
+                    if isinstance(v,ParseResults):
+                        if v:
+                            out.append( v.dump(indent,depth+1) )
+                        else:
+                            out.append(_ustr(v))
                     else:
                         out.append(_ustr(v))
-                else:
-                    out.append(_ustr(v))
-        elif any(isinstance(vv,ParseResults) for vv in self):
-            v = self
-            for i,vv in enumerate(v):
-                if isinstance(vv,ParseResults):
-                    out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
-                else:
-                    out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
+            elif any(isinstance(vv,ParseResults) for vv in self):
+                v = self
+                for i,vv in enumerate(v):
+                    if isinstance(vv,ParseResults):
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
+                    else:
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
             
         return "".join(out)
 
     def pprint(self, *args, **kwargs):
-        """Pretty-printer for parsed results as a list, using the C{pprint} module.
-           Accepts additional positional or keyword args as defined for the 
-           C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})"""
+        """
+        Pretty-printer for parsed results as a list, using the C{pprint} module.
+        Accepts additional positional or keyword args as defined for the 
+        C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})
+
+        Example::
+            ident = Word(alphas, alphanums)
+            num = Word(nums)
+            func = Forward()
+            term = ident | num | Group('(' + func + ')')
+            func <<= ident + Group(Optional(delimitedList(term)))
+            result = func.parseString("fna a,b,(fnb c,d,200),100")
+            result.pprint(width=40)
+        prints::
+            ['fna',
+             ['a',
+              'b',
+              ['(', 'fnb', ['c', 'd', '200'], ')'],
+              '100']]
+        """
         pprint.pprint(self.asList(), *args, **kwargs)
 
     # add support for pickle protocol
@@ -690,8 +930,11 @@ def __setstate__(self,state):
         else:
             self.__parent = None
 
+    def __getnewargs__(self):
+        return self.__toklist, self.__name, self.__asList, self.__modal
+
     def __dir__(self):
-        return dir(super(ParseResults,self)) + list(self.keys())
+        return (dir(type(self)) + list(self.keys()))
 
 collections.MutableMapping.register(ParseResults)
 
@@ -771,6 +1014,31 @@ def _trim_arity(func, maxargs=2):
         return lambda s,l,t: func(t)
     limit = [0]
     foundArity = [False]
+    
+    # traceback return data structure changed in Py3.5 - normalize back to plain tuples
+    if system_version[:2] >= (3,5):
+        def extract_stack(limit=0):
+            # special handling for Python 3.5.0 - extra deep call stack by 1
+            offset = -3 if system_version == (3,5,0) else -2
+            frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
+            return [(frame_summary.filename, frame_summary.lineno)]
+        def extract_tb(tb, limit=0):
+            frames = traceback.extract_tb(tb, limit=limit)
+            frame_summary = frames[-1]
+            return [(frame_summary.filename, frame_summary.lineno)]
+    else:
+        extract_stack = traceback.extract_stack
+        extract_tb = traceback.extract_tb
+    
+    # synthesize what would be returned by traceback.extract_stack at the call to 
+    # user's parse action 'func', so that we don't incur call penalty at parse time
+    
+    LINE_DIFF = 6
+    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND 
+    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
+    this_line = extract_stack(limit=2)[-1]
+    pa_call_line_synth = (this_line[0], this_line[1]+LINE_DIFF)
+
     def wrapper(*args):
         while 1:
             try:
@@ -778,12 +1046,33 @@ def wrapper(*args):
                 foundArity[0] = True
                 return ret
             except TypeError:
-                if limit[0] <= maxargs and not foundArity[0]:
+                # re-raise TypeErrors if they did not come from our arity testing
+                if foundArity[0]:
+                    raise
+                else:
+                    try:
+                        tb = sys.exc_info()[-1]
+                        if not extract_tb(tb, limit=2)[-1][:2] == pa_call_line_synth:
+                            raise
+                    finally:
+                        del tb
+
+                if limit[0] <= maxargs:
                     limit[0] += 1
                     continue
                 raise
+
+    # copy func name to wrapper for sensible debug output
+    func_name = "<parse action>"
+    try:
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    wrapper.__name__ = func_name
+
     return wrapper
- 
+
 class ParserElement(object):
     """Abstract base level parser element class."""
     DEFAULT_WHITE_CHARS = " \n\t\r"
@@ -791,7 +1080,16 @@ class ParserElement(object):
 
     @staticmethod
     def setDefaultWhitespaceChars( chars ):
-        """Overrides the default whitespace chars
+        r"""
+        Overrides the default whitespace chars
+
+        Example::
+            # default whitespace chars are space, <TAB> and newline
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
+            
+            # change to just treat newline as significant
+            ParserElement.setDefaultWhitespaceChars(" \t")
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def']
         """
         ParserElement.DEFAULT_WHITE_CHARS = chars
 
@@ -799,8 +1097,22 @@ def setDefaultWhitespaceChars( chars ):
     def inlineLiteralsUsing(cls):
         """
         Set class to be used for inclusion of string literals into a parser.
+        
+        Example::
+            # default literal class used is Literal
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+
+            # change to Suppress
+            ParserElement.inlineLiteralsUsing(Suppress)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '12', '31']
         """
-        ParserElement.literalStringClass = cls
+        ParserElement._literalStringClass = cls
 
     def __init__( self, savelist=False ):
         self.parseAction = list()
@@ -826,8 +1138,21 @@ def __init__( self, savelist=False ):
         self.callDuringTry = False
 
     def copy( self ):
-        """Make a copy of this C{ParserElement}.  Useful for defining different parse actions
-           for the same parsing pattern, using copies of the original parse element."""
+        """
+        Make a copy of this C{ParserElement}.  Useful for defining different parse actions
+        for the same parsing pattern, using copies of the original parse element.
+        
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            integerK = integer.copy().addParseAction(lambda toks: toks[0]*1024) + Suppress("K")
+            integerM = integer.copy().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+            
+            print(OneOrMore(integerK | integerM | integer).parseString("5K 100 640K 256M"))
+        prints::
+            [5120, 100, 655360, 268435456]
+        Equivalent form of C{expr.copy()} is just C{expr()}::
+            integerM = integer().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+        """
         cpy = copy.copy( self )
         cpy.parseAction = self.parseAction[:]
         cpy.ignoreExprs = self.ignoreExprs[:]
@@ -836,7 +1161,13 @@ def copy( self ):
         return cpy
 
     def setName( self, name ):
-        """Define name for this expression, for use in debugging."""
+        """
+        Define name for this expression, makes debugging and exception messages clearer.
+        
+        Example::
+            Word(nums).parseString("ABC")  # -> Exception: Expected W:(0123...) (at char 0), (line:1, col:1)
+            Word(nums).setName("integer").parseString("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+        """
         self.name = name
         self.errmsg = "Expected " + self.name
         if hasattr(self,"exception"):
@@ -844,15 +1175,24 @@ def setName( self, name ):
         return self
 
     def setResultsName( self, name, listAllMatches=False ):
-        """Define name for referencing matching tokens as a nested attribute
-           of the returned parse results.
-           NOTE: this returns a *copy* of the original C{ParserElement} object;
-           this is so that the client can define a basic element, such as an
-           integer, and reference it in multiple places with different names.
-           
-           You can also set results names using the abbreviated syntax,
-           C{expr("name")} in place of C{expr.setResultsName("name")} - 
-           see L{I{__call__}<__call__>}.
+        """
+        Define name for referencing matching tokens as a nested attribute
+        of the returned parse results.
+        NOTE: this returns a *copy* of the original C{ParserElement} object;
+        this is so that the client can define a basic element, such as an
+        integer, and reference it in multiple places with different names.
+
+        You can also set results names using the abbreviated syntax,
+        C{expr("name")} in place of C{expr.setResultsName("name")} - 
+        see L{I{__call__}<__call__>}.
+
+        Example::
+            date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+
+            # equivalent form:
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
         """
         newself = self.copy()
         if name.endswith("*"):
@@ -881,42 +1221,76 @@ def breaker(instring, loc, doActions=True, callPreParse=True):
         return self
 
     def setParseAction( self, *fns, **kwargs ):
-        """Define action to perform when successfully matching parse element definition.
-           Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
-           C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
-            - s   = the original string being parsed (see note below)
-            - loc = the location of the matching substring
-            - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
-           If the functions in fns modify the tokens, they can return them as the return
-           value from fn, and the modified list of tokens will replace the original.
-           Otherwise, fn does not need to return any value.
-
-           Note: the default parsing behavior is to expand tabs in the input string
-           before starting the parsing process.  See L{I{parseString}<parseString>} for more information
-           on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
-           consistent view of the parsed string, the parse location, and line and column
-           positions within the parsed string.
-           """
+        """
+        Define action to perform when successfully matching parse element definition.
+        Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
+        C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
+         - s   = the original string being parsed (see note below)
+         - loc = the location of the matching substring
+         - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
+        If the functions in fns modify the tokens, they can return them as the return
+        value from fn, and the modified list of tokens will replace the original.
+        Otherwise, fn does not need to return any value.
+
+        Optional keyword arguments:
+         - callDuringTry = (default=C{False}) indicate if parse action should be run during lookaheads and alternate testing
+
+        Note: the default parsing behavior is to expand tabs in the input string
+        before starting the parsing process.  See L{I{parseString}<parseString>} for more information
+        on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+        consistent view of the parsed string, the parse location, and line and column
+        positions within the parsed string.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer + '/' + integer + '/' + integer
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+            # use parse action to convert to ints at parse time
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            date_str = integer + '/' + integer + '/' + integer
+
+            # note that integer fields are now ints, not strings
+            date_str.parseString("1999/12/31")  # -> [1999, '/', 12, '/', 31]
+        """
         self.parseAction = list(map(_trim_arity, list(fns)))
         self.callDuringTry = kwargs.get("callDuringTry", False)
         return self
 
     def addParseAction( self, *fns, **kwargs ):
-        """Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}."""
+        """
+        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
+        
+        See examples in L{I{copy}<copy>}.
+        """
         self.parseAction += list(map(_trim_arity, list(fns)))
         self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
         return self
 
     def addCondition(self, *fns, **kwargs):
         """Add a boolean predicate function to expression's list of parse actions. See 
-        L{I{setParseAction}<setParseAction>}. Optional keyword argument C{message} can
-        be used to define a custom message to be used in the raised exception."""
-        msg = kwargs.get("message") or "failed user-defined condition"
+        L{I{setParseAction}<setParseAction>} for function call signatures. Unlike C{setParseAction}, 
+        functions passed to C{addCondition} need to return boolean success/fail of the condition.
+
+        Optional keyword arguments:
+         - message = define a custom message to be used in the raised exception
+         - fatal   = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise ParseException
+         
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            year_int = integer.copy()
+            year_int.addCondition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
+            date_str = year_int + '/' + integer + '/' + integer
+
+            result = date_str.parseString("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0), (line:1, col:1)
+        """
+        msg = kwargs.get("message", "failed user-defined condition")
+        exc_type = ParseFatalException if kwargs.get("fatal", False) else ParseException
         for fn in fns:
             def pa(s,l,t):
                 if not bool(_trim_arity(fn)(s,l,t)):
-                    raise ParseException(s,l,msg)
-                return t
+                    raise exc_type(s,l,msg)
             self.parseAction.append(pa)
         self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
         return self
@@ -1043,43 +1417,132 @@ def tryParse( self, instring, loc ):
             return self._parse( instring, loc, doActions=False )[0]
         except ParseFatalException:
             raise ParseException( instring, loc, self.errmsg, self)
+    
+    def canParseNext(self, instring, loc):
+        try:
+            self.tryParse(instring, loc)
+        except (ParseException, IndexError):
+            return False
+        else:
+            return True
+
+    class _UnboundedCache(object):
+        def __init__(self):
+            cache = {}
+            self.not_in_cache = not_in_cache = object()
+
+            def get(self, key):
+                return cache.get(key, not_in_cache)
+
+            def set(self, key, value):
+                cache[key] = value
+
+            def clear(self):
+                cache.clear()
+
+            self.get = types.MethodType(get, self)
+            self.set = types.MethodType(set, self)
+            self.clear = types.MethodType(clear, self)
+
+    if _OrderedDict is not None:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = _OrderedDict()
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.popitem(False)
+
+                def clear(self):
+                    cache.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    else:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = {}
+                key_fifo = collections.deque([], size)
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.pop(key_fifo.popleft(), None)
+                    key_fifo.append(key)
+
+                def clear(self):
+                    cache.clear()
+                    key_fifo.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    # argument cache for optimizing repeated calls when backtracking through recursive expressions
+    packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
+    packrat_cache_lock = RLock()
+    packrat_cache_stats = [0, 0]
 
     # this method gets repeatedly called during backtracking with the same arguments -
     # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
     def _parseCache( self, instring, loc, doActions=True, callPreParse=True ):
-        lookup = (self,instring,loc,callPreParse,doActions)
-        if lookup in ParserElement._exprArgCache:
-            value = ParserElement._exprArgCache[ lookup ]
-            if isinstance(value, Exception):
-                raise value
-            return (value[0],value[1].copy())
-        else:
-            try:
-                value = self._parseNoCache( instring, loc, doActions, callPreParse )
-                ParserElement._exprArgCache[ lookup ] = (value[0],value[1].copy())
-                return value
-            except ParseBaseException as pe:
-                pe.__traceback__ = None
-                ParserElement._exprArgCache[ lookup ] = pe
-                raise
+        HIT, MISS = 0, 1
+        lookup = (self, instring, loc, callPreParse, doActions)
+        with ParserElement.packrat_cache_lock:
+            cache = ParserElement.packrat_cache
+            value = cache.get(lookup)
+            if value is cache.not_in_cache:
+                ParserElement.packrat_cache_stats[MISS] += 1
+                try:
+                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
+                except ParseBaseException as pe:
+                    # cache a copy of the exception, without the traceback
+                    cache.set(lookup, pe.__class__(*pe.args))
+                    raise
+                else:
+                    cache.set(lookup, (value[0], value[1].copy()))
+                    return value
+            else:
+                ParserElement.packrat_cache_stats[HIT] += 1
+                if isinstance(value, Exception):
+                    raise value
+                return (value[0], value[1].copy())
 
     _parse = _parseNoCache
 
-    # argument cache for optimizing repeated calls when backtracking through recursive expressions
-    _exprArgCache = {}
     @staticmethod
     def resetCache():
-        ParserElement._exprArgCache.clear()
+        ParserElement.packrat_cache.clear()
+        ParserElement.packrat_cache_stats[:] = [0] * len(ParserElement.packrat_cache_stats)
 
     _packratEnabled = False
     @staticmethod
-    def enablePackrat():
+    def enablePackrat(cache_size_limit=128):
         """Enables "packrat" parsing, which adds memoizing to the parsing logic.
            Repeated parse attempts at the same string location (which happens
            often in many complex grammars) can immediately return a cached value,
            instead of re-executing parsing/validating code.  Memoizing is done of
            both valid results and parsing exceptions.
-
+           
+           Parameters:
+            - cache_size_limit - (default=C{128}) - if an integer value is provided
+              will limit the size of the packrat cache; if None is passed, then
+              the cache size will be unbounded; if 0 is passed, the cache will
+              be effectively disabled.
+            
            This speedup may break existing programs that use parse actions that
            have side-effects.  For this reason, packrat parsing is disabled when
            you first import pyparsing.  To activate the packrat feature, your
@@ -1088,32 +1551,45 @@ def enablePackrat():
            C{enablePackrat} before calling C{psyco.full()}.  If you do not do this,
            Python will crash.  For best results, call C{enablePackrat()} immediately
            after importing pyparsing.
+           
+           Example::
+               import pyparsing
+               pyparsing.ParserElement.enablePackrat()
         """
         if not ParserElement._packratEnabled:
             ParserElement._packratEnabled = True
+            if cache_size_limit is None:
+                ParserElement.packrat_cache = ParserElement._UnboundedCache()
+            else:
+                ParserElement.packrat_cache = ParserElement._FifoCache(cache_size_limit)
             ParserElement._parse = ParserElement._parseCache
 
     def parseString( self, instring, parseAll=False ):
-        """Execute the parse expression with the given string.
-           This is the main interface to the client code, once the complete
-           expression has been built.
-
-           If you want the grammar to require that the entire input string be
-           successfully parsed, then set C{parseAll} to True (equivalent to ending
-           the grammar with C{L{StringEnd()}}).
-
-           Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
-           in order to report proper column numbers in parse actions.
-           If the input string contains tabs and
-           the grammar uses parse actions that use the C{loc} argument to index into the
-           string being parsed, you can ensure you have a consistent view of the input
-           string by:
-            - calling C{parseWithTabs} on your grammar before calling C{parseString}
-              (see L{I{parseWithTabs}<parseWithTabs>})
-            - define your parse action using the full C{(s,loc,toks)} signature, and
-              reference the input string using the parse action's C{s} argument
-            - explicitly expand the tabs in your input string before calling
-              C{parseString}
+        """
+        Execute the parse expression with the given string.
+        This is the main interface to the client code, once the complete
+        expression has been built.
+
+        If you want the grammar to require that the entire input string be
+        successfully parsed, then set C{parseAll} to True (equivalent to ending
+        the grammar with C{L{StringEnd()}}).
+
+        Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
+        in order to report proper column numbers in parse actions.
+        If the input string contains tabs and
+        the grammar uses parse actions that use the C{loc} argument to index into the
+        string being parsed, you can ensure you have a consistent view of the input
+        string by:
+         - calling C{parseWithTabs} on your grammar before calling C{parseString}
+           (see L{I{parseWithTabs}<parseWithTabs>})
+         - define your parse action using the full C{(s,loc,toks)} signature, and
+           reference the input string using the parse action's C{s} argument
+         - explictly expand the tabs in your input string before calling
+           C{parseString}
+        
+        Example::
+            Word('a').parseString('aaaaabaaa')  # -> ['aaaaa']
+            Word('a').parseString('aaaaabaaa', parseAll=True)  # -> Exception: Expected end of text
         """
         ParserElement.resetCache()
         if not self.streamlined:
@@ -1139,14 +1615,35 @@ def parseString( self, instring, parseAll=False ):
             return tokens
 
     def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
-        """Scan the input string for expression matches.  Each match will return the
-           matching tokens, start location, and end location.  May be called with optional
-           C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
-           C{overlap} is specified, then overlapping matches will be reported.
-
-           Note that the start and end locations are reported relative to the string
-           being parsed.  See L{I{parseString}<parseString>} for more information on parsing
-           strings with embedded tabs."""
+        """
+        Scan the input string for expression matches.  Each match will return the
+        matching tokens, start location, and end location.  May be called with optional
+        C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
+        C{overlap} is specified, then overlapping matches will be reported.
+
+        Note that the start and end locations are reported relative to the string
+        being parsed.  See L{I{parseString}<parseString>} for more information on parsing
+        strings with embedded tabs.
+
+        Example::
+            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
+            print(source)
+            for tokens,start,end in Word(alphas).scanString(source):
+                print(' '*start + '^'*(end-start))
+                print(' '*start + tokens[0])
+        
+        prints::
+        
+            sldjf123lsdjjkf345sldkjf879lkjsfd987
+            ^^^^^
+            sldjf
+                    ^^^^^^^
+                    lsdjjkf
+                              ^^^^^^
+                              sldkjf
+                                       ^^^^^^
+                                       lkjsfd
+        """
         if not self.streamlined:
             self.streamline()
         for e in self.ignoreExprs:
@@ -1189,12 +1686,22 @@ def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
                 raise exc
 
     def transformString( self, instring ):
-        """Extension to C{L{scanString}}, to modify matching text with modified tokens that may
-           be returned from a parse action.  To use C{transformString}, define a grammar and
-           attach a parse action to it that modifies the returned token list.
-           Invoking C{transformString()} on a target string will then scan for matches,
-           and replace the matched text patterns according to the logic in the parse
-           action.  C{transformString()} returns the resulting transformed string."""
+        """
+        Extension to C{L{scanString}}, to modify matching text with modified tokens that may
+        be returned from a parse action.  To use C{transformString}, define a grammar and
+        attach a parse action to it that modifies the returned token list.
+        Invoking C{transformString()} on a target string will then scan for matches,
+        and replace the matched text patterns according to the logic in the parse
+        action.  C{transformString()} returns the resulting transformed string.
+        
+        Example::
+            wd = Word(alphas)
+            wd.setParseAction(lambda toks: toks[0].title())
+            
+            print(wd.transformString("now is the winter of our discontent made glorious summer by this sun of york."))
+        Prints::
+            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
+        """
         out = []
         lastE = 0
         # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
@@ -1222,9 +1729,18 @@ def transformString( self, instring ):
                 raise exc
 
     def searchString( self, instring, maxMatches=_MAX_INT ):
-        """Another extension to C{L{scanString}}, simplifying the access to the tokens found
-           to match the given parse expression.  May be called with optional
-           C{maxMatches} argument, to clip searching after 'n' matches are found.
+        """
+        Another extension to C{L{scanString}}, simplifying the access to the tokens found
+        to match the given parse expression.  May be called with optional
+        C{maxMatches} argument, to clip searching after 'n' matches are found.
+        
+        Example::
+            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
+            cap_word = Word(alphas.upper(), alphas.lower())
+            
+            print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
+        prints::
+            ['More', 'Iron', 'Lead', 'Gold', 'I']
         """
         try:
             return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
@@ -1235,10 +1751,34 @@ def searchString( self, instring, maxMatches=_MAX_INT ):
                 # catch and re-raise exception from here, clears out pyparsing internal stack trace
                 raise exc
 
+    def split(self, instring, maxsplit=_MAX_INT, includeSeparators=False):
+        """
+        Generator method to split a string using the given expression as a separator.
+        May be called with optional C{maxsplit} argument, to limit the number of splits;
+        and the optional C{includeSeparators} argument (default=C{False}), if the separating
+        matching text should be included in the split results.
+        
+        Example::        
+            punc = oneOf(list(".,;:/-!?"))
+            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
+        prints::
+            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
+        """
+        splits = 0
+        last = 0
+        for t,s,e in self.scanString(instring, maxMatches=maxsplit):
+            yield instring[last:s]
+            if includeSeparators:
+                yield t[0]
+            last = e
+        yield instring[last:]
+
     def __add__(self, other ):
-        """Implementation of + operator - returns C{L{And}}"""
+        """
+        Implementation of + operator - returns C{L{And}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1246,9 +1786,11 @@ def __add__(self, other ):
         return And( [ self, other ] )
 
     def __radd__(self, other ):
-        """Implementation of + operator when left operand is not a C{L{ParserElement}}"""
+        """
+        Implementation of + operator when left operand is not a C{L{ParserElement}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1256,9 +1798,11 @@ def __radd__(self, other ):
         return other + self
 
     def __sub__(self, other):
-        """Implementation of - operator, returns C{L{And}} with error stop"""
+        """
+        Implementation of - operator, returns C{L{And}} with error stop
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1266,9 +1810,11 @@ def __sub__(self, other):
         return And( [ self, And._ErrorStop(), other ] )
 
     def __rsub__(self, other ):
-        """Implementation of - operator when left operand is not a C{L{ParserElement}}"""
+        """
+        Implementation of - operator when left operand is not a C{L{ParserElement}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1276,24 +1822,24 @@ def __rsub__(self, other ):
         return other - self
 
     def __mul__(self,other):
-        """Implementation of * operator, allows use of C{expr * 3} in place of
-           C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
-           tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
-           may also include C{None} as in:
-            - C{expr*(n,None)} or C{expr*(n,)} is equivalent
+        """
+        Implementation of * operator, allows use of C{expr * 3} in place of
+        C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
+        tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
+        may also include C{None} as in:
+         - C{expr*(n,None)} or C{expr*(n,)} is equivalent
               to C{expr*n + L{ZeroOrMore}(expr)}
               (read as "at least n instances of C{expr}")
-            - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
+         - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
               (read as "0 to n instances of C{expr}")
-            - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
-            - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
-
-           Note that C{expr*(None,n)} does not raise an exception if
-           more than n exprs exist in the input stream; that is,
-           C{expr*(None,n)} does not enforce a maximum number of expr
-           occurrences.  If this behavior is desired, then write
-           C{expr*(None,n) + ~expr}
-
+         - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
+         - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
+
+        Note that C{expr*(None,n)} does not raise an exception if
+        more than n exprs exist in the input stream; that is,
+        C{expr*(None,n)} does not enforce a maximum number of expr
+        occurrences.  If this behavior is desired, then write
+        C{expr*(None,n) + ~expr}
         """
         if isinstance(other,int):
             minElements, optElements = other,0
@@ -1347,9 +1893,11 @@ def __rmul__(self, other):
         return self.__mul__(other)
 
     def __or__(self, other ):
-        """Implementation of | operator - returns C{L{MatchFirst}}"""
+        """
+        Implementation of | operator - returns C{L{MatchFirst}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1357,9 +1905,11 @@ def __or__(self, other ):
         return MatchFirst( [ self, other ] )
 
     def __ror__(self, other ):
-        """Implementation of | operator when left operand is not a C{L{ParserElement}}"""
+        """
+        Implementation of | operator when left operand is not a C{L{ParserElement}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1367,9 +1917,11 @@ def __ror__(self, other ):
         return other | self
 
     def __xor__(self, other ):
-        """Implementation of ^ operator - returns C{L{Or}}"""
+        """
+        Implementation of ^ operator - returns C{L{Or}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1377,9 +1929,11 @@ def __xor__(self, other ):
         return Or( [ self, other ] )
 
     def __rxor__(self, other ):
-        """Implementation of ^ operator when left operand is not a C{L{ParserElement}}"""
+        """
+        Implementation of ^ operator when left operand is not a C{L{ParserElement}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1387,9 +1941,11 @@ def __rxor__(self, other ):
         return other ^ self
 
     def __and__(self, other ):
-        """Implementation of & operator - returns C{L{Each}}"""
+        """
+        Implementation of & operator - returns C{L{Each}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1397,9 +1953,11 @@ def __and__(self, other ):
         return Each( [ self, other ] )
 
     def __rand__(self, other ):
-        """Implementation of & operator when left operand is not a C{L{ParserElement}}"""
+        """
+        Implementation of & operator when left operand is not a C{L{ParserElement}}
+        """
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         if not isinstance( other, ParserElement ):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
@@ -1407,41 +1965,49 @@ def __rand__(self, other ):
         return other & self
 
     def __invert__( self ):
-        """Implementation of ~ operator - returns C{L{NotAny}}"""
+        """
+        Implementation of ~ operator - returns C{L{NotAny}}
+        """
         return NotAny( self )
 
     def __call__(self, name=None):
-        """Shortcut for C{L{setResultsName}}, with C{listAllMatches=default}::
-             userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
-           could be written as::
-             userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")
-             
-           If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
-           passed as C{True}.
+        """
+        Shortcut for C{L{setResultsName}}, with C{listAllMatches=default}.
+        
+        If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
+        passed as C{True}.
            
-           If C{name} is omitted, same as calling C{L{copy}}.
-           """
+        If C{name} is omitted, same as calling C{L{copy}}.
+
+        Example::
+            # these are equivalent
+            userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
+            userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")             
+        """
         if name is not None:
             return self.setResultsName(name)
         else:
             return self.copy()
 
     def suppress( self ):
-        """Suppresses the output of this C{ParserElement}; useful to keep punctuation from
-           cluttering up returned output.
+        """
+        Suppresses the output of this C{ParserElement}; useful to keep punctuation from
+        cluttering up returned output.
         """
         return Suppress( self )
 
     def leaveWhitespace( self ):
-        """Disables the skipping of whitespace before matching the characters in the
-           C{ParserElement}'s defined pattern.  This is normally only used internally by
-           the pyparsing module, but may be needed in some whitespace-sensitive grammars.
+        """
+        Disables the skipping of whitespace before matching the characters in the
+        C{ParserElement}'s defined pattern.  This is normally only used internally by
+        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
         """
         self.skipWhitespace = False
         return self
 
     def setWhitespaceChars( self, chars ):
-        """Overrides the default whitespace chars
+        """
+        Overrides the default whitespace chars
         """
         self.skipWhitespace = True
         self.whiteChars = chars
@@ -1449,26 +2015,41 @@ def setWhitespaceChars( self, chars ):
         return self
 
     def parseWithTabs( self ):
-        """Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
-           Must be called before C{parseString} when the input grammar contains elements that
-           match C{<TAB>} characters."""
+        """
+        Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
+        Must be called before C{parseString} when the input grammar contains elements that
+        match C{<TAB>} characters.
+        """
         self.keepTabs = True
         return self
 
     def ignore( self, other ):
-        """Define expression to be ignored (e.g., comments) while doing pattern
-           matching; may be called repeatedly, to define multiple comment or other
-           ignorable patterns.
         """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        
+        Example::
+            patt = OneOrMore(Word(alphas))
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj']
+            
+            patt.ignore(cStyleComment)
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj', 'lskjd']
+        """
+        if isinstance(other, basestring):
+            other = Suppress(other)
+
         if isinstance( other, Suppress ):
             if other not in self.ignoreExprs:
-                self.ignoreExprs.append( other.copy() )
+                self.ignoreExprs.append(other)
         else:
             self.ignoreExprs.append( Suppress( other.copy() ) )
         return self
 
     def setDebugActions( self, startAction, successAction, exceptionAction ):
-        """Enable display of debugging messages while doing pattern matching."""
+        """
+        Enable display of debugging messages while doing pattern matching.
+        """
         self.debugActions = (startAction or _defaultStartDebugAction,
                              successAction or _defaultSuccessDebugAction,
                              exceptionAction or _defaultExceptionDebugAction)
@@ -1476,8 +2057,39 @@ def setDebugActions( self, startAction, successAction, exceptionAction ):
         return self
 
     def setDebug( self, flag=True ):
-        """Enable display of debugging messages while doing pattern matching.
-           Set C{flag} to True to enable, False to disable."""
+        """
+        Enable display of debugging messages while doing pattern matching.
+        Set C{flag} to True to enable, False to disable.
+
+        Example::
+            wd = Word(alphas).setName("alphaword")
+            integer = Word(nums).setName("numword")
+            term = wd | integer
+            
+            # turn on debugging for wd
+            wd.setDebug()
+
+            OneOrMore(term).parseString("abc 123 xyz 890")
+        
+        prints::
+            Match alphaword at loc 0(1,1)
+            Matched alphaword -> ['abc']
+            Match alphaword at loc 3(1,4)
+            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
+            Match alphaword at loc 7(1,8)
+            Matched alphaword -> ['xyz']
+            Match alphaword at loc 11(1,12)
+            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
+            Match alphaword at loc 15(1,16)
+            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
+
+        The output shown is that produced by the default debug actions. Prior to attempting
+        to match the C{wd} expression, the debugging message C{"Match <exprname> at loc <n>(<line>,<col>)"}
+        is shown. Then if the parse succeeds, a C{"Matched"} message is shown, or an C{"Exception raised"}
+        message is shown. Also note the use of L{setName} to assign a human-readable name to the expression,
+        which makes debugging and exception messages easier to understand - for instance, the default
+        name created for the C{Word} expression without calling C{setName} is C{"W:(ABCD...)"}.
+        """
         if flag:
             self.setDebugActions( _defaultStartDebugAction, _defaultSuccessDebugAction, _defaultExceptionDebugAction )
         else:
@@ -1499,20 +2111,22 @@ def checkRecursion( self, parseElementList ):
         pass
 
     def validate( self, validateTrace=[] ):
-        """Check defined expressions for valid structure, check for infinite recursive definitions."""
+        """
+        Check defined expressions for valid structure, check for infinite recursive definitions.
+        """
         self.checkRecursion( [] )
 
     def parseFile( self, file_or_filename, parseAll=False ):
-        """Execute the parse expression on the given file or filename.
-           If a filename is specified (instead of a file object),
-           the entire file is opened, read, and closed before parsing.
+        """
+        Execute the parse expression on the given file or filename.
+        If a filename is specified (instead of a file object),
+        the entire file is opened, read, and closed before parsing.
         """
         try:
             file_contents = file_or_filename.read()
         except AttributeError:
-            f = open(file_or_filename, "r")
-            file_contents = f.read()
-            f.close()
+            with open(file_or_filename, "r") as f:
+                file_contents = f.read()
         try:
             return self.parseString(file_contents, parseAll)
         except ParseBaseException as exc:
@@ -1524,13 +2138,9 @@ def parseFile( self, file_or_filename, parseAll=False ):
 
     def __eq__(self,other):
         if isinstance(other, ParserElement):
-            return self is other or self.__dict__ == other.__dict__
+            return self is other or vars(self) == vars(other)
         elif isinstance(other, basestring):
-            try:
-                self.parseString(_ustr(other), parseAll=True)
-                return True
-            except ParseBaseException:
-                return False
+            return self.matches(other)
         else:
             return super(ParserElement,self)==other
 
@@ -1546,40 +2156,161 @@ def __req__(self,other):
     def __rne__(self,other):
         return not (self == other)
 
-    def runTests(self, tests, parseAll=False):
-        """Execute the parse expression on a series of test strings, showing each
-           test, the parsed results or where the parse failed. Quick and easy way to
-           run a parse expression against a list of sample strings.
+    def matches(self, testString, parseAll=True):
+        """
+        Method for quick testing of a parser against a test string. Good for simple 
+        inline microtests of sub expressions while building up larger parser.0
            
-           Parameters:
-            - tests - a list of separate test strings, or a multiline string of test strings
-            - parseAll - (default=False) - flag to pass to C{L{parseString}} when running tests           
+        Parameters:
+         - testString - to test against this expression for a match
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests
+            
+        Example::
+            expr = Word(nums)
+            assert expr.matches("100")
+        """
+        try:
+            self.parseString(_ustr(testString), parseAll=parseAll)
+            return True
+        except ParseBaseException:
+            return False
+                
+    def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResults=True, failureTests=False):
+        """
+        Execute the parse expression on a series of test strings, showing each
+        test, the parsed results or where the parse failed. Quick and easy way to
+        run a parse expression against a list of sample strings.
+           
+        Parameters:
+         - tests - a list of separate test strings, or a multiline string of test strings
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests           
+         - comment - (default=C{'#'}) - expression for indicating embedded comments in the test 
+              string; pass None to disable comment filtering
+         - fullDump - (default=C{True}) - dump results as list followed by results names in nested outline;
+              if False, only dump nested list
+         - printResults - (default=C{True}) prints test output to stdout
+         - failureTests - (default=C{False}) indicates if these tests are expected to fail parsing
+
+        Returns: a (success, results) tuple, where success indicates that all tests succeeded
+        (or failed if C{failureTests} is True), and the results contain a list of lines of each 
+        test's output
+        
+        Example::
+            number_expr = pyparsing_common.number.copy()
+
+            result = number_expr.runTests('''
+                # unsigned integer
+                100
+                # negative integer
+                -100
+                # float with scientific notation
+                6.02e23
+                # integer with scientific notation
+                1e-12
+                ''')
+            print("Success" if result[0] else "Failed!")
+
+            result = number_expr.runTests('''
+                # stray character
+                100Z
+                # missing leading digit before '.'
+                -.100
+                # too many '.'
+                3.14.159
+                ''', failureTests=True)
+            print("Success" if result[0] else "Failed!")
+        prints::
+            # unsigned integer
+            100
+            [100]
+
+            # negative integer
+            -100
+            [-100]
+
+            # float with scientific notation
+            6.02e23
+            [6.02e+23]
+
+            # integer with scientific notation
+            1e-12
+            [1e-12]
+
+            Success
+            
+            # stray character
+            100Z
+               ^
+            FAIL: Expected end of text (at char 3), (line:1, col:4)
+
+            # missing leading digit before '.'
+            -.100
+            ^
+            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
+
+            # too many '.'
+            3.14.159
+                ^
+            FAIL: Expected end of text (at char 4), (line:1, col:5)
+
+            Success
         """
         if isinstance(tests, basestring):
-            tests = map(str.strip, tests.splitlines())
+            tests = list(map(str.strip, tests.rstrip().splitlines()))
+        if isinstance(comment, basestring):
+            comment = Literal(comment)
+        allResults = []
+        comments = []
+        success = True
         for t in tests:
-            out = [t]
+            if comment is not None and comment.matches(t, False) or comments and not t:
+                comments.append(t)
+                continue
+            if not t:
+                continue
+            out = ['\n'.join(comments), t]
+            comments = []
             try:
-                out.append(self.parseString(t, parseAll=parseAll).dump())
-            except ParseException as pe:
+                result = self.parseString(t, parseAll=parseAll)
+                out.append(result.dump(full=fullDump))
+                success = success and not failureTests
+            except ParseBaseException as pe:
+                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
                 if '\n' in t:
                     out.append(line(pe.loc, t))
-                    out.append(' '*(col(pe.loc,t)-1) + '^')
+                    out.append(' '*(col(pe.loc,t)-1) + '^' + fatal)
                 else:
-                    out.append(' '*pe.loc + '^')
-                out.append(str(pe))
-            out.append('')
-            print('\n'.join(out))
+                    out.append(' '*pe.loc + '^' + fatal)
+                out.append("FAIL: " + str(pe))
+                success = success and failureTests
+                result = pe
+            except Exception as exc:
+                out.append("FAIL-EXCEPTION: " + str(exc))
+                success = success and failureTests
+                result = exc
+
+            if printResults:
+                if fullDump:
+                    out.append('')
+                print('\n'.join(out))
+
+            allResults.append((t, result))
+        
+        return success, allResults
 
         
 class Token(ParserElement):
-    """Abstract C{ParserElement} subclass, for defining atomic matching patterns."""
+    """
+    Abstract C{ParserElement} subclass, for defining atomic matching patterns.
+    """
     def __init__( self ):
         super(Token,self).__init__( savelist=False )
 
 
 class Empty(Token):
-    """An empty token, will always match."""
+    """
+    An empty token, will always match.
+    """
     def __init__( self ):
         super(Empty,self).__init__()
         self.name = "Empty"
@@ -1588,7 +2319,9 @@ def __init__( self ):
 
 
 class NoMatch(Token):
-    """A token that will never match."""
+    """
+    A token that will never match.
+    """
     def __init__( self ):
         super(NoMatch,self).__init__()
         self.name = "NoMatch"
@@ -1601,7 +2334,19 @@ def parseImpl( self, instring, loc, doActions=True ):
 
 
 class Literal(Token):
-    """Token to exactly match a specified string."""
+    """
+    Token to exactly match a specified string.
+    
+    Example::
+        Literal('blah').parseString('blah')  # -> ['blah']
+        Literal('blah').parseString('blahfooblah')  # -> ['blah']
+        Literal('blah').parseString('bla')  # -> Exception: Expected "blah"
+    
+    For case-insensitive matching, use L{CaselessLiteral}.
+    
+    For keyword matching (force word break before and after the matched string),
+    use L{Keyword} or L{CaselessKeyword}.
+    """
     def __init__( self, matchString ):
         super(Literal,self).__init__()
         self.match = matchString
@@ -1627,17 +2372,24 @@ def parseImpl( self, instring, loc, doActions=True ):
             return loc+self.matchLen, self.match
         raise ParseException(instring, loc, self.errmsg, self)
 _L = Literal
-ParserElement.literalStringClass = Literal
+ParserElement._literalStringClass = Literal
 
 class Keyword(Token):
-    """Token to exactly match a specified string as a keyword, that is, it must be
-       immediately followed by a non-keyword character.  Compare with C{L{Literal}}::
-         Literal("if") will match the leading C{'if'} in C{'ifAndOnlyIf'}.
-         Keyword("if") will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
-       Accepts two optional constructor arguments in addition to the keyword string:
-       C{identChars} is a string of characters that would be valid identifier characters,
-       defaulting to all alphanumerics + "_" and "$"; C{caseless} allows case-insensitive
-       matching, default is C{False}.
+    """
+    Token to exactly match a specified string as a keyword, that is, it must be
+    immediately followed by a non-keyword character.  Compare with C{L{Literal}}:
+     - C{Literal("if")} will match the leading C{'if'} in C{'ifAndOnlyIf'}.
+     - C{Keyword("if")} will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
+    Accepts two optional constructor arguments in addition to the keyword string:
+     - C{identChars} is a string of characters that would be valid identifier characters,
+          defaulting to all alphanumerics + "_" and "$"
+     - C{caseless} allows case-insensitive matching, default is C{False}.
+       
+    Example::
+        Keyword("start").parseString("start")  # -> ['start']
+        Keyword("start").parseString("starting")  # -> Exception
+
+    For case-insensitive matching, use L{CaselessKeyword}.
     """
     DEFAULT_KEYWORD_CHARS = alphanums+"_$"
 
@@ -1686,9 +2438,15 @@ def setDefaultKeywordChars( chars ):
         Keyword.DEFAULT_KEYWORD_CHARS = chars
 
 class CaselessLiteral(Literal):
-    """Token to match a specified string, ignoring case of letters.
-       Note: the matched results will always be in the case of the given
-       match string, NOT the case of the input text.
+    """
+    Token to match a specified string, ignoring case of letters.
+    Note: the matched results will always be in the case of the given
+    match string, NOT the case of the input text.
+
+    Example::
+        OneOrMore(CaselessLiteral("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessKeyword}.)
     """
     def __init__( self, matchString ):
         super(CaselessLiteral,self).__init__( matchString.upper() )
@@ -1703,6 +2461,14 @@ def parseImpl( self, instring, loc, doActions=True ):
         raise ParseException(instring, loc, self.errmsg, self)
 
 class CaselessKeyword(Keyword):
+    """
+    Caseless version of L{Keyword}.
+
+    Example::
+        OneOrMore(CaselessKeyword("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessLiteral}.)
+    """
     def __init__( self, matchString, identChars=Keyword.DEFAULT_KEYWORD_CHARS ):
         super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
 
@@ -1713,16 +2479,51 @@ def parseImpl( self, instring, loc, doActions=True ):
         raise ParseException(instring, loc, self.errmsg, self)
 
 class Word(Token):
-    """Token for matching words composed of allowed character sets.
-       Defined with string containing all allowed initial characters,
-       an optional string containing allowed body characters (if omitted,
-       defaults to the initial character set), and an optional minimum,
-       maximum, and/or exact length.  The default value for C{min} is 1 (a
-       minimum value < 1 is not valid); the default values for C{max} and C{exact}
-       are 0, meaning no maximum or exact length restriction. An optional
-       C{exclude} parameter can list characters that might be found in 
-       the input C{bodyChars} string; useful to define a word of all printables
-       except for one or two characters, for instance.
+    """
+    Token for matching words composed of allowed character sets.
+    Defined with string containing all allowed initial characters,
+    an optional string containing allowed body characters (if omitted,
+    defaults to the initial character set), and an optional minimum,
+    maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction. An optional
+    C{excludeChars} parameter can list characters that might be found in 
+    the input C{bodyChars} string; useful to define a word of all printables
+    except for one or two characters, for instance.
+    
+    L{srange} is useful for defining custom character set strings for defining 
+    C{Word} expressions, using range notation from regular expression character sets.
+    
+    A common mistake is to use C{Word} to match a specific literal string, as in 
+    C{Word("Address")}. Remember that C{Word} uses the string argument to define
+    I{sets} of matchable characters. This expression would match "Add", "AAA",
+    "dAred", or any other word made up of the characters 'A', 'd', 'r', 'e', and 's'.
+    To match an exact literal string, use L{Literal} or L{Keyword}.
+
+    pyparsing includes helper strings for building Words:
+     - L{alphas}
+     - L{nums}
+     - L{alphanums}
+     - L{hexnums}
+     - L{alphas8bit} (alphabetic characters in ASCII range 128-255 - accented, tilded, umlauted, etc.)
+     - L{punc8bit} (non-alphabetic characters in ASCII range 128-255 - currency, symbols, superscripts, diacriticals, etc.)
+     - L{printables} (any non-whitespace character)
+
+    Example::
+        # a word composed of digits
+        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
+        
+        # a word with a leading capital, and zero or more lowercase
+        capital_word = Word(alphas.upper(), alphas.lower())
+
+        # hostnames are alphanumeric, with leading alpha, and '-'
+        hostname = Word(alphas, alphanums+'-')
+        
+        # roman numeral (not a strict parser, accepts invalid mix of characters)
+        roman = Word("IVXLCDM")
+        
+        # any string of non-whitespace characters, except for ','
+        csv_value = Word(printables, excludeChars=",")
     """
     def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False, excludeChars=None ):
         super(Word,self).__init__()
@@ -1837,8 +2638,17 @@ def charsAsStr(s):
 
 
 class Regex(Token):
-    """Token for matching strings that match a given regular expression.
-       Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
+    """
+    Token for matching strings that match a given regular expression.
+    Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
+    If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
+    named parse results.
+
+    Example::
+        realnum = Regex(r"[+-]?\d+\.\d*")
+        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)')
+        # ref: http://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
+        roman = Regex(r"M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
     """
     compiledREtype = type(re.compile("[A-Z]"))
     def __init__( self, pattern, flags=0):
@@ -1846,7 +2656,7 @@ def __init__( self, pattern, flags=0):
         super(Regex,self).__init__()
 
         if isinstance(pattern, basestring):
-            if len(pattern) == 0:
+            if not pattern:
                 warnings.warn("null string passed to Regex; use Empty() instead",
                         SyntaxWarning, stacklevel=2)
 
@@ -1901,23 +2711,36 @@ def __str__( self ):
 
 
 class QuotedString(Token):
-    """Token for matching strings that are delimited by quoting characters.
+    r"""
+    Token for matching strings that are delimited by quoting characters.
+    
+    Defined with the following parameters:
+        - quoteChar - string of one or more characters defining the quote delimiting string
+        - escChar - character to escape quotes, typically backslash (default=C{None})
+        - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=C{None})
+        - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
+        - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
+        - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
+        - convertWhitespaceEscapes - convert escaped whitespace (C{'\t'}, C{'\n'}, etc.) to actual whitespace (default=C{True})
+
+    Example::
+        qs = QuotedString('"')
+        print(qs.searchString('lsjdf "This is the quote" sldjf'))
+        complex_qs = QuotedString('{{', endQuoteChar='}}')
+        print(complex_qs.searchString('lsjdf {{This is the "quote"}} sldjf'))
+        sql_qs = QuotedString('"', escQuote='""')
+        print(sql_qs.searchString('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
+    prints::
+        [['This is the quote']]
+        [['This is the "quote"']]
+        [['This is the quote with "embedded" quotes']]
     """
-    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None):
-        """
-           Defined with the following parameters:
-            - quoteChar - string of one or more characters defining the quote delimiting string
-            - escChar - character to escape quotes, typically backslash (default=None)
-            - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=None)
-            - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
-            - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
-            - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
-        """
+    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None, convertWhitespaceEscapes=True):
         super(QuotedString,self).__init__()
 
         # remove white space from quote chars - wont work anyway
         quoteChar = quoteChar.strip()
-        if len(quoteChar) == 0:
+        if not quoteChar:
             warnings.warn("quoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
             raise SyntaxError()
 
@@ -1925,7 +2748,7 @@ def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unq
             endQuoteChar = quoteChar
         else:
             endQuoteChar = endQuoteChar.strip()
-            if len(endQuoteChar) == 0:
+            if not endQuoteChar:
                 warnings.warn("endQuoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
                 raise SyntaxError()
 
@@ -1937,6 +2760,7 @@ def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unq
         self.escChar = escChar
         self.escQuote = escQuote
         self.unquoteResults = unquoteResults
+        self.convertWhitespaceEscapes = convertWhitespaceEscapes
 
         if multiline:
             self.flags = re.MULTILINE | re.DOTALL
@@ -1990,6 +2814,17 @@ def parseImpl( self, instring, loc, doActions=True ):
             ret = ret[self.quoteCharLen:-self.endQuoteCharLen]
 
             if isinstance(ret,basestring):
+                # replace escaped whitespace
+                if '\\' in ret and self.convertWhitespaceEscapes:
+                    ws_map = {
+                        r'\t' : '\t',
+                        r'\n' : '\n',
+                        r'\f' : '\f',
+                        r'\r' : '\r',
+                    }
+                    for wslit,wschar in ws_map.items():
+                        ret = ret.replace(wslit, wschar)
+
                 # replace escaped characters
                 if self.escChar:
                     ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
@@ -2013,11 +2848,20 @@ def __str__( self ):
 
 
 class CharsNotIn(Token):
-    """Token for matching words composed of characters *not* in a given set.
-       Defined with string containing all disallowed characters, and an optional
-       minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
-       minimum value < 1 is not valid); the default values for C{max} and C{exact}
-       are 0, meaning no maximum or exact length restriction.
+    """
+    Token for matching words composed of characters I{not} in a given set (will
+    include whitespace in matched characters if not listed in the provided exclusion set - see example).
+    Defined with string containing all disallowed characters, and an optional
+    minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction.
+
+    Example::
+        # define a comma-separated-value as anything that is not a ','
+        csv_value = CharsNotIn(',')
+        print(delimitedList(csv_value).parseString("dkls,lsdkjf,s12 34,@!#,213"))
+    prints::
+        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
     """
     def __init__( self, notChars, min=1, max=0, exact=0 ):
         super(CharsNotIn,self).__init__()
@@ -2075,11 +2919,13 @@ def __str__( self ):
         return self.strRepr
 
 class White(Token):
-    """Special matching class for matching whitespace.  Normally, whitespace is ignored
-       by pyparsing grammars.  This class is included when some whitespace structures
-       are significant.  Define with a string containing the whitespace characters to be
-       matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
-       as defined for the C{L{Word}} class."""
+    """
+    Special matching class for matching whitespace.  Normally, whitespace is ignored
+    by pyparsing grammars.  This class is included when some whitespace structures
+    are significant.  Define with a string containing the whitespace characters to be
+    matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
+    as defined for the C{L{Word}} class.
+    """
     whiteStrs = {
         " " : "<SPC>",
         "\t": "<TAB>",
@@ -2131,7 +2977,9 @@ def __init__( self ):
         self.mayIndexError = False
 
 class GoToColumn(_PositionToken):
-    """Token to advance to a specific column of input text; useful for tabular report scraping."""
+    """
+    Token to advance to a specific column of input text; useful for tabular report scraping.
+    """
     def __init__( self, colno ):
         super(GoToColumn,self).__init__()
         self.col = colno
@@ -2154,7 +3002,9 @@ def parseImpl( self, instring, loc, doActions=True ):
         return newloc, ret
 
 class LineStart(_PositionToken):
-    """Matches if current position is at the beginning of a line within the parse string"""
+    """
+    Matches if current position is at the beginning of a line within the parse string
+    """
     def __init__( self ):
         super(LineStart,self).__init__()
         self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
@@ -2174,7 +3024,9 @@ def parseImpl( self, instring, loc, doActions=True ):
         return loc, []
 
 class LineEnd(_PositionToken):
-    """Matches if current position is at the end of a line within the parse string"""
+    """
+    Matches if current position is at the end of a line within the parse string
+    """
     def __init__( self ):
         super(LineEnd,self).__init__()
         self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
@@ -2192,7 +3044,9 @@ def parseImpl( self, instring, loc, doActions=True ):
             raise ParseException(instring, loc, self.errmsg, self)
 
 class StringStart(_PositionToken):
-    """Matches if current position is at the beginning of the parse string"""
+    """
+    Matches if current position is at the beginning of the parse string
+    """
     def __init__( self ):
         super(StringStart,self).__init__()
         self.errmsg = "Expected start of text"
@@ -2205,7 +3059,9 @@ def parseImpl( self, instring, loc, doActions=True ):
         return loc, []
 
 class StringEnd(_PositionToken):
-    """Matches if current position is at the end of the parse string"""
+    """
+    Matches if current position is at the end of the parse string
+    """
     def __init__( self ):
         super(StringEnd,self).__init__()
         self.errmsg = "Expected end of text"
@@ -2221,11 +3077,12 @@ def parseImpl( self, instring, loc, doActions=True ):
             raise ParseException(instring, loc, self.errmsg, self)
 
 class WordStart(_PositionToken):
-    """Matches if the current position is at the beginning of a Word, and
-       is not preceded by any character in a given set of C{wordChars}
-       (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
-       use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
-       the string being parsed, or at the beginning of a line.
+    """
+    Matches if the current position is at the beginning of a Word, and
+    is not preceded by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
+    the string being parsed, or at the beginning of a line.
     """
     def __init__(self, wordChars = printables):
         super(WordStart,self).__init__()
@@ -2240,11 +3097,12 @@ def parseImpl(self, instring, loc, doActions=True ):
         return loc, []
 
 class WordEnd(_PositionToken):
-    """Matches if the current position is at the end of a Word, and
-       is not followed by any character in a given set of C{wordChars}
-       (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
-       use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
-       the string being parsed, or at the end of a line.
+    """
+    Matches if the current position is at the end of a Word, and
+    is not followed by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
+    the string being parsed, or at the end of a line.
     """
     def __init__(self, wordChars = printables):
         super(WordEnd,self).__init__()
@@ -2262,18 +3120,21 @@ def parseImpl(self, instring, loc, doActions=True ):
 
 
 class ParseExpression(ParserElement):
-    """Abstract subclass of ParserElement, for combining and post-processing parsed tokens."""
+    """
+    Abstract subclass of ParserElement, for combining and post-processing parsed tokens.
+    """
     def __init__( self, exprs, savelist = False ):
         super(ParseExpression,self).__init__(savelist)
         if isinstance( exprs, _generatorType ):
             exprs = list(exprs)
 
         if isinstance( exprs, basestring ):
-            self.exprs = [ Literal( exprs ) ]
-        elif isinstance( exprs, collections.Sequence ):
+            self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+        elif isinstance( exprs, collections.Iterable ):
+            exprs = list(exprs)
             # if sequence of strings provided, wrap with Literal
             if all(isinstance(expr, basestring) for expr in exprs):
-                exprs = map(Literal, exprs)
+                exprs = map(ParserElement._literalStringClass, exprs)
             self.exprs = list(exprs)
         else:
             try:
@@ -2351,7 +3212,7 @@ def streamline( self ):
                 self.mayReturnEmpty |= other.mayReturnEmpty
                 self.mayIndexError  |= other.mayIndexError
 
-        self.errmsg = "Expected " + str(self)
+        self.errmsg = "Expected " + _ustr(self)
         
         return self
 
@@ -2371,9 +3232,19 @@ def copy(self):
         return ret
 
 class And(ParseExpression):
-    """Requires all given C{ParseExpression}s to be found in the given order.
-       Expressions may be separated by whitespace.
-       May be constructed using the C{'+'} operator.
+    """
+    Requires all given C{ParseExpression}s to be found in the given order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'+'} operator.
+    May also be constructed using the C{'-'} operator, which will suppress backtracking.
+
+    Example::
+        integer = Word(nums)
+        name_expr = OneOrMore(Word(alphas))
+
+        expr = And([integer("id"),name_expr("name"),integer("age")])
+        # more easily written as:
+        expr = integer("id") + name_expr("name") + integer("age")
     """
 
     class _ErrorStop(Empty):
@@ -2405,9 +3276,9 @@ def parseImpl( self, instring, loc, doActions=True ):
                     raise
                 except ParseBaseException as pe:
                     pe.__traceback__ = None
-                    raise ParseSyntaxException(pe)
+                    raise ParseSyntaxException._from_exception(pe)
                 except IndexError:
-                    raise ParseSyntaxException( ParseException(instring, len(instring), self.errmsg, self) )
+                    raise ParseSyntaxException(instring, len(instring), self.errmsg, self)
             else:
                 loc, exprtokens = e._parse( instring, loc, doActions )
             if exprtokens or exprtokens.haskeys():
@@ -2416,7 +3287,7 @@ def parseImpl( self, instring, loc, doActions=True ):
 
     def __iadd__(self, other ):
         if isinstance( other, basestring ):
-            other = Literal( other )
+            other = ParserElement._literalStringClass( other )
         return self.append( other ) #And( [ self, other ] )
 
     def checkRecursion( self, parseElementList ):
@@ -2437,9 +3308,18 @@ def __str__( self ):
 
 
 class Or(ParseExpression):
-    """Requires that at least one C{ParseExpression} is found.
-       If two expressions match, the expression that matches the longest string will be used.
-       May be constructed using the C{'^'} operator.
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the expression that matches the longest string will be used.
+    May be constructed using the C{'^'} operator.
+
+    Example::
+        # construct Or using '^' operator
+        
+        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789"))
+    prints::
+        [['123'], ['3.1416'], ['789']]
     """
     def __init__( self, exprs, savelist = False ):
         super(Or,self).__init__(exprs, savelist)
@@ -2488,7 +3368,7 @@ def parseImpl( self, instring, loc, doActions=True ):
 
     def __ixor__(self, other ):
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         return self.append( other ) #Or( [ self, other ] )
 
     def __str__( self ):
@@ -2507,9 +3387,21 @@ def checkRecursion( self, parseElementList ):
 
 
 class MatchFirst(ParseExpression):
-    """Requires that at least one C{ParseExpression} is found.
-       If two expressions match, the first one listed is the one that will match.
-       May be constructed using the C{'|'} operator.
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the first one listed is the one that will match.
+    May be constructed using the C{'|'} operator.
+
+    Example::
+        # construct MatchFirst using '|' operator
+        
+        # watch the order of expressions to match
+        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
+
+        # put more selective expression first
+        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
+        print(number.searchString("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
     """
     def __init__( self, exprs, savelist = False ):
         super(MatchFirst,self).__init__(exprs, savelist)
@@ -2544,7 +3436,7 @@ def parseImpl( self, instring, loc, doActions=True ):
 
     def __ior__(self, other ):
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass( other )
+            other = ParserElement._literalStringClass( other )
         return self.append( other ) #MatchFirst( [ self, other ] )
 
     def __str__( self ):
@@ -2563,9 +3455,58 @@ def checkRecursion( self, parseElementList ):
 
 
 class Each(ParseExpression):
-    """Requires all given C{ParseExpression}s to be found, but in any order.
-       Expressions may be separated by whitespace.
-       May be constructed using the C{'&'} operator.
+    """
+    Requires all given C{ParseExpression}s to be found, but in any order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'&'} operator.
+
+    Example::
+        color = oneOf("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
+        shape_type = oneOf("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
+        integer = Word(nums)
+        shape_attr = "shape:" + shape_type("shape")
+        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
+        color_attr = "color:" + color("color")
+        size_attr = "size:" + integer("size")
+
+        # use Each (using operator '&') to accept attributes in any order 
+        # (shape and posn are required, color and size are optional)
+        shape_spec = shape_attr & posn_attr & Optional(color_attr) & Optional(size_attr)
+
+        shape_spec.runTests('''
+            shape: SQUARE color: BLACK posn: 100, 120
+            shape: CIRCLE size: 50 color: BLUE posn: 50,80
+            color:GREEN size:20 shape:TRIANGLE posn:20,40
+            '''
+            )
+    prints::
+        shape: SQUARE color: BLACK posn: 100, 120
+        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
+        - color: BLACK
+        - posn: ['100', ',', '120']
+          - x: 100
+          - y: 120
+        - shape: SQUARE
+
+
+        shape: CIRCLE size: 50 color: BLUE posn: 50,80
+        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
+        - color: BLUE
+        - posn: ['50', ',', '80']
+          - x: 50
+          - y: 80
+        - shape: CIRCLE
+        - size: 50
+
+
+        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
+        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
+        - color: GREEN
+        - posn: ['20', ',', '40']
+          - x: 20
+          - y: 40
+        - shape: TRIANGLE
+        - size: 20
     """
     def __init__( self, exprs, savelist = True ):
         super(Each,self).__init__(exprs, savelist)
@@ -2619,17 +3560,7 @@ def parseImpl( self, instring, loc, doActions=True ):
             loc,results = e._parse(instring,loc,doActions)
             resultlist.append(results)
 
-        finalResults = ParseResults([])
-        for r in resultlist:
-            dups = {}
-            for k in r.keys():
-                if k in finalResults:
-                    tmp = ParseResults(finalResults[k])
-                    tmp += ParseResults(r[k])
-                    dups[k] = tmp
-            finalResults += ParseResults(r)
-            for k,v in dups.items():
-                finalResults[k] = v
+        finalResults = sum(resultlist, ParseResults([]))
         return loc, finalResults
 
     def __str__( self ):
@@ -2648,11 +3579,16 @@ def checkRecursion( self, parseElementList ):
 
 
 class ParseElementEnhance(ParserElement):
-    """Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens."""
+    """
+    Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens.
+    """
     def __init__( self, expr, savelist=False ):
         super(ParseElementEnhance,self).__init__(savelist)
         if isinstance( expr, basestring ):
-            expr = Literal(expr)
+            if issubclass(ParserElement._literalStringClass, Token):
+                expr = ParserElement._literalStringClass(expr)
+            else:
+                expr = ParserElement._literalStringClass(Literal(expr))
         self.expr = expr
         self.strRepr = None
         if expr is not None:
@@ -2720,10 +3656,22 @@ def __str__( self ):
 
 
 class FollowedBy(ParseElementEnhance):
-    """Lookahead matching of the given parse expression.  C{FollowedBy}
-    does *not* advance the parsing position within the input string, it only
+    """
+    Lookahead matching of the given parse expression.  C{FollowedBy}
+    does I{not} advance the parsing position within the input string, it only
     verifies that the specified parse expression matches at the current
-    position.  C{FollowedBy} always returns a null token list."""
+    position.  C{FollowedBy} always returns a null token list.
+
+    Example::
+        # use FollowedBy to match a label only if it is followed by a ':'
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        OneOrMore(attr_expr).parseString("shape: SQUARE color: BLACK posn: upper left").pprint()
+    prints::
+        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
+    """
     def __init__( self, expr ):
         super(FollowedBy,self).__init__(expr)
         self.mayReturnEmpty = True
@@ -2734,11 +3682,16 @@ def parseImpl( self, instring, loc, doActions=True ):
 
 
 class NotAny(ParseElementEnhance):
-    """Lookahead to disallow matching with the given parse expression.  C{NotAny}
-    does *not* advance the parsing position within the input string, it only
-    verifies that the specified parse expression does *not* match at the current
-    position.  Also, C{NotAny} does *not* skip over leading whitespace. C{NotAny}
-    always returns a null token list.  May be constructed using the '~' operator."""
+    """
+    Lookahead to disallow matching with the given parse expression.  C{NotAny}
+    does I{not} advance the parsing position within the input string, it only
+    verifies that the specified parse expression does I{not} match at the current
+    position.  Also, C{NotAny} does I{not} skip over leading whitespace. C{NotAny}
+    always returns a null token list.  May be constructed using the '~' operator.
+
+    Example::
+        
+    """
     def __init__( self, expr ):
         super(NotAny,self).__init__(expr)
         #~ self.leaveWhitespace()
@@ -2747,11 +3700,7 @@ def __init__( self, expr ):
         self.errmsg = "Found unwanted token, "+_ustr(self.expr)
 
     def parseImpl( self, instring, loc, doActions=True ):
-        try:
-            self.expr.tryParse( instring, loc )
-        except (ParseException,IndexError):
-            pass
-        else:
+        if self.expr.canParseNext(instring, loc):
             raise ParseException(instring, loc, self.errmsg, self)
         return loc, []
 
@@ -2764,80 +3713,114 @@ def __str__( self ):
 
         return self.strRepr
 
-
-class ZeroOrMore(ParseElementEnhance):
-    """Optional repetition of zero or more of the given expression."""
-    def __init__( self, expr ):
-        super(ZeroOrMore,self).__init__(expr)
-        self.mayReturnEmpty = True
+class _MultipleMatch(ParseElementEnhance):
+    def __init__( self, expr, stopOn=None):
+        super(_MultipleMatch, self).__init__(expr)
+        ender = stopOn
+        if isinstance(ender, basestring):
+            ender = ParserElement._literalStringClass(ender)
+        self.not_ender = ~ender if ender is not None else None
 
     def parseImpl( self, instring, loc, doActions=True ):
-        tokens = []
+        self_expr_parse = self.expr._parse
+        self_skip_ignorables = self._skipIgnorables
+        check_ender = self.not_ender is not None
+        if check_ender:
+            try_not_ender = self.not_ender.tryParse
+        
+        # must be at least one (but first see if we are the stopOn sentinel;
+        # if so, fail)
+        if check_ender:
+            try_not_ender(instring, loc)
+        loc, tokens = self_expr_parse( instring, loc, doActions, callPreParse=False )
         try:
-            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
-            hasIgnoreExprs = ( len(self.ignoreExprs) > 0 )
+            hasIgnoreExprs = (not not self.ignoreExprs)
             while 1:
+                if check_ender:
+                    try_not_ender(instring, loc)
                 if hasIgnoreExprs:
-                    preloc = self._skipIgnorables( instring, loc )
+                    preloc = self_skip_ignorables( instring, loc )
                 else:
                     preloc = loc
-                loc, tmptokens = self.expr._parse( instring, preloc, doActions )
+                loc, tmptokens = self_expr_parse( instring, preloc, doActions )
                 if tmptokens or tmptokens.haskeys():
                     tokens += tmptokens
         except (ParseException,IndexError):
             pass
 
         return loc, tokens
+        
+class OneOrMore(_MultipleMatch):
+    """
+    Repetition of one or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match one or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: BLACK"
+        OneOrMore(attr_expr).parseString(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
+
+        # use stopOn attribute for OneOrMore to avoid reading label string as part of the data
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        OneOrMore(attr_expr).parseString(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
+        
+        # could also be written as
+        (attr_expr * (1,)).parseString(text).pprint()
+    """
 
     def __str__( self ):
         if hasattr(self,"name"):
             return self.name
 
         if self.strRepr is None:
-            self.strRepr = "[" + _ustr(self.expr) + "]..."
+            self.strRepr = "{" + _ustr(self.expr) + "}..."
 
         return self.strRepr
 
     def setResultsName( self, name, listAllMatches=False ):
-        ret = super(ZeroOrMore,self).setResultsName(name,listAllMatches)
+        ret = super(OneOrMore,self).setResultsName(name,listAllMatches)
         ret.saveAsList = True
         return ret
 
+class ZeroOrMore(_MultipleMatch):
+    """
+    Optional repetition of zero or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match zero or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
 
-class OneOrMore(ParseElementEnhance):
-    """Repetition of one or more of the given expression."""
+    Example: similar to L{OneOrMore}
+    """
+    def __init__( self, expr, stopOn=None):
+        super(ZeroOrMore,self).__init__(expr, stopOn=stopOn)
+        self.mayReturnEmpty = True
+        
     def parseImpl( self, instring, loc, doActions=True ):
-        # must be at least one
-        loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
         try:
-            hasIgnoreExprs = ( len(self.ignoreExprs) > 0 )
-            while 1:
-                if hasIgnoreExprs:
-                    preloc = self._skipIgnorables( instring, loc )
-                else:
-                    preloc = loc
-                loc, tmptokens = self.expr._parse( instring, preloc, doActions )
-                if tmptokens or tmptokens.haskeys():
-                    tokens += tmptokens
+            return super(ZeroOrMore, self).parseImpl(instring, loc, doActions)
         except (ParseException,IndexError):
-            pass
-
-        return loc, tokens
+            return loc, []
 
     def __str__( self ):
         if hasattr(self,"name"):
             return self.name
 
         if self.strRepr is None:
-            self.strRepr = "{" + _ustr(self.expr) + "}..."
+            self.strRepr = "[" + _ustr(self.expr) + "]..."
 
         return self.strRepr
 
-    def setResultsName( self, name, listAllMatches=False ):
-        ret = super(OneOrMore,self).setResultsName(name,listAllMatches)
-        ret.saveAsList = True
-        return ret
-
 class _NullToken(object):
     def __bool__(self):
         return False
@@ -2847,9 +3830,39 @@ def __str__(self):
 
 _optionalNotMatched = _NullToken()
 class Optional(ParseElementEnhance):
-    """Optional matching of the given expression.
-       A default return string can also be specified, if the optional expression
-       is not found.
+    """
+    Optional matching of the given expression.
+
+    Parameters:
+     - expr - expression that must match zero or more times
+     - default (optional) - value to be returned if the optional expression is not found.
+
+    Example::
+        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
+        zip = Combine(Word(nums, exact=5) + Optional('-' + Word(nums, exact=4)))
+        zip.runTests('''
+            # traditional ZIP code
+            12345
+            
+            # ZIP+4 form
+            12101-0001
+            
+            # invalid ZIP
+            98765-
+            ''')
+    prints::
+        # traditional ZIP code
+        12345
+        ['12345']
+
+        # ZIP+4 form
+        12101-0001
+        ['12101-0001']
+
+        # invalid ZIP
+        98765-
+             ^
+        FAIL: Expected end of text (at char 5), (line:1, col:6)
     """
     def __init__( self, expr, default=_optionalNotMatched ):
         super(Optional,self).__init__( expr, savelist=False )
@@ -2879,13 +3892,60 @@ def __str__( self ):
 
         return self.strRepr
 
-
 class SkipTo(ParseElementEnhance):
-    """Token for skipping over all undefined text until the matched expression is found.
-       If C{include} is set to true, the matched expression is also parsed (the skipped text
-       and matched expression are returned as a 2-element list).  The C{ignore}
-       argument is used to define grammars (typically quoted strings and comments) that
-       might contain false matches.
+    """
+    Token for skipping over all undefined text until the matched expression is found.
+
+    Parameters:
+     - expr - target expression marking the end of the data to be skipped
+     - include - (default=C{False}) if True, the target expression is also parsed 
+          (the skipped text and target expression are returned as a 2-element list).
+     - ignore - (default=C{None}) used to define grammars (typically quoted strings and 
+          comments) that might contain false matches to the target expression
+     - failOn - (default=C{None}) define expressions that are not allowed to be 
+          included in the skipped test; if found before the target expression is found, 
+          the SkipTo is not a match
+
+    Example::
+        report = '''
+            Outstanding Issues Report - 1 Jan 2000
+
+               # | Severity | Description                               |  Days Open
+            -----+----------+-------------------------------------------+-----------
+             101 | Critical | Intermittent system crash                 |          6
+              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
+              79 | Minor    | System slow when running too many reports |         47
+            '''
+        integer = Word(nums)
+        SEP = Suppress('|')
+        # use SkipTo to simply match everything up until the next SEP
+        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
+        # - parse action will call token.strip() for each matched token, i.e., the description body
+        string_data = SkipTo(SEP, ignore=quotedString)
+        string_data.setParseAction(tokenMap(str.strip))
+        ticket_expr = (integer("issue_num") + SEP 
+                      + string_data("sev") + SEP 
+                      + string_data("desc") + SEP 
+                      + integer("days_open"))
+        
+        for tkt in ticket_expr.searchString(report):
+            print tkt.dump()
+    prints::
+        ['101', 'Critical', 'Intermittent system crash', '6']
+        - days_open: 6
+        - desc: Intermittent system crash
+        - issue_num: 101
+        - sev: Critical
+        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
+        - days_open: 14
+        - desc: Spelling error on Login ('log|n')
+        - issue_num: 94
+        - sev: Cosmetic
+        ['79', 'Minor', 'System slow when running too many reports', '47']
+        - days_open: 47
+        - desc: System slow when running too many reports
+        - issue_num: 79
+        - sev: Minor
     """
     def __init__( self, other, include=False, ignore=None, failOn=None ):
         super( SkipTo, self ).__init__( other )
@@ -2894,77 +3954,85 @@ def __init__( self, other, include=False, ignore=None, failOn=None ):
         self.mayIndexError = False
         self.includeMatch = include
         self.asList = False
-        if failOn is not None and isinstance(failOn, basestring):
-            self.failOn = Literal(failOn)
+        if isinstance(failOn, basestring):
+            self.failOn = ParserElement._literalStringClass(failOn)
         else:
             self.failOn = failOn
         self.errmsg = "No match found for "+_ustr(self.expr)
 
     def parseImpl( self, instring, loc, doActions=True ):
-        startLoc = loc
+        startloc = loc
         instrlen = len(instring)
         expr = self.expr
-        failParse = False
-        while loc <= instrlen:
-            try:
-                if self.failOn:
+        expr_parse = self.expr._parse
+        self_failOn_canParseNext = self.failOn.canParseNext if self.failOn is not None else None
+        self_ignoreExpr_tryParse = self.ignoreExpr.tryParse if self.ignoreExpr is not None else None
+        
+        tmploc = loc
+        while tmploc <= instrlen:
+            if self_failOn_canParseNext is not None:
+                # break if failOn expression matches
+                if self_failOn_canParseNext(instring, tmploc):
+                    break
+                    
+            if self_ignoreExpr_tryParse is not None:
+                # advance past ignore expressions
+                while 1:
                     try:
-                        self.failOn.tryParse(instring, loc)
+                        tmploc = self_ignoreExpr_tryParse(instring, tmploc)
                     except ParseBaseException:
-                        pass
-                    else:
-                        failParse = True
-                        raise ParseException(instring, loc, "Found expression " + str(self.failOn))
-                    failParse = False
-                if self.ignoreExpr is not None:
-                    while 1:
-                        try:
-                            loc = self.ignoreExpr.tryParse(instring,loc)
-                            # print("found ignoreExpr, advance to", loc)
-                        except ParseBaseException:
-                            break
-                expr._parse( instring, loc, doActions=False, callPreParse=False )
-                skipText = instring[startLoc:loc]
-                if self.includeMatch:
-                    loc,mat = expr._parse(instring,loc,doActions,callPreParse=False)
-                    if mat:
-                        skipRes = ParseResults( skipText )
-                        skipRes += mat
-                        return loc, [ skipRes ]
-                    else:
-                        return loc, [ skipText ]
-                else:
-                    return loc, [ skipText ]
-            except (ParseException,IndexError):
-                if failParse:
-                    raise
-                else:
-                    loc += 1
-        raise ParseException(instring, loc, self.errmsg, self)
+                        break
+            
+            try:
+                expr_parse(instring, tmploc, doActions=False, callPreParse=False)
+            except (ParseException, IndexError):
+                # no match, advance loc in string
+                tmploc += 1
+            else:
+                # matched skipto expr, done
+                break
+
+        else:
+            # ran off the end of the input string without matching skipto expr, fail
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        # build up return values
+        loc = tmploc
+        skiptext = instring[startloc:loc]
+        skipresult = ParseResults(skiptext)
+        
+        if self.includeMatch:
+            loc, mat = expr_parse(instring,loc,doActions,callPreParse=False)
+            skipresult += mat
+
+        return loc, skipresult
 
 class Forward(ParseElementEnhance):
-    """Forward declaration of an expression to be defined later -
-       used for recursive grammars, such as algebraic infix notation.
-       When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
-
-       Note: take care when assigning to C{Forward} not to overlook precedence of operators.
-       Specifically, '|' has a lower precedence than '<<', so that::
-          fwdExpr << a | b | c
-       will actually be evaluated as::
-          (fwdExpr << a) | b | c
-       thereby leaving b and c out as parseable alternatives.  It is recommended that you
-       explicitly group the values inserted into the C{Forward}::
-          fwdExpr << (a | b | c)
-       Converting to use the '<<=' operator instead will avoid this problem.
+    """
+    Forward declaration of an expression to be defined later -
+    used for recursive grammars, such as algebraic infix notation.
+    When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
+
+    Note: take care when assigning to C{Forward} not to overlook precedence of operators.
+    Specifically, '|' has a lower precedence than '<<', so that::
+        fwdExpr << a | b | c
+    will actually be evaluated as::
+        (fwdExpr << a) | b | c
+    thereby leaving b and c out as parseable alternatives.  It is recommended that you
+    explicitly group the values inserted into the C{Forward}::
+        fwdExpr << (a | b | c)
+    Converting to use the '<<=' operator instead will avoid this problem.
+
+    See L{ParseResults.pprint} for an example of a recursive parser created using
+    C{Forward}.
     """
     def __init__( self, other=None ):
         super(Forward,self).__init__( other, savelist=False )
 
     def __lshift__( self, other ):
         if isinstance( other, basestring ):
-            other = ParserElement.literalStringClass(other)
+            other = ParserElement._literalStringClass(other)
         self.expr = other
-        self.mayReturnEmpty = other.mayReturnEmpty
         self.strRepr = None
         self.mayIndexError = self.expr.mayIndexError
         self.mayReturnEmpty = self.expr.mayReturnEmpty
@@ -2998,7 +4066,9 @@ def validate( self, validateTrace=[] ):
     def __str__( self ):
         if hasattr(self,"name"):
             return self.name
+        return self.__class__.__name__ + ": ..."
 
+        # stubbed out for now - creates awful memory and perf issues
         self._revertClass = self.__class__
         self.__class__ = _ForwardNoRecurse
         try:
@@ -3023,26 +4093,29 @@ def __str__( self ):
         return "..."
 
 class TokenConverter(ParseElementEnhance):
-    """Abstract subclass of C{ParseExpression}, for converting parsed results."""
+    """
+    Abstract subclass of C{ParseExpression}, for converting parsed results.
+    """
     def __init__( self, expr, savelist=False ):
         super(TokenConverter,self).__init__( expr )#, savelist )
         self.saveAsList = False
 
-class Upcase(TokenConverter):
-    """Converter to upper case all matching tokens."""
-    def __init__(self, *args):
-        super(Upcase,self).__init__(*args)
-        warnings.warn("Upcase class is deprecated, use upcaseTokens parse action instead",
-                       DeprecationWarning,stacklevel=2)
-
-    def postParse( self, instring, loc, tokenlist ):
-        return list(map( str.upper, tokenlist ))
-
-
 class Combine(TokenConverter):
-    """Converter to concatenate all matching tokens to a single string.
-       By default, the matching patterns must also be contiguous in the input string;
-       this can be disabled by specifying C{'adjacent=False'} in the constructor.
+    """
+    Converter to concatenate all matching tokens to a single string.
+    By default, the matching patterns must also be contiguous in the input string;
+    this can be disabled by specifying C{'adjacent=False'} in the constructor.
+
+    Example::
+        real = Word(nums) + '.' + Word(nums)
+        print(real.parseString('3.1416')) # -> ['3', '.', '1416']
+        # will also erroneously match the following
+        print(real.parseString('3. 1416')) # -> ['3', '.', '1416']
+
+        real = Combine(Word(nums) + '.' + Word(nums))
+        print(real.parseString('3.1416')) # -> ['3.1416']
+        # no match when there are internal spaces
+        print(real.parseString('3. 1416')) # -> Exception: Expected W:(0123...)
     """
     def __init__( self, expr, joinString="", adjacent=True ):
         super(Combine,self).__init__( expr )
@@ -3072,7 +4145,19 @@ def postParse( self, instring, loc, tokenlist ):
             return retToks
 
 class Group(TokenConverter):
-    """Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions."""
+    """
+    Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions.
+
+    Example::
+        ident = Word(alphas)
+        num = Word(nums)
+        term = ident | num
+        func = ident + Optional(delimitedList(term))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', 'a', 'b', '100']
+
+        func = ident + Group(Optional(delimitedList(term)))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', ['a', 'b', '100']]
+    """
     def __init__( self, expr ):
         super(Group,self).__init__( expr )
         self.saveAsList = True
@@ -3081,9 +4166,40 @@ def postParse( self, instring, loc, tokenlist ):
         return [ tokenlist ]
 
 class Dict(TokenConverter):
-    """Converter to return a repetitive expression as a list, but also as a dictionary.
-       Each element can also be referenced using the first token in the expression as its key.
-       Useful for tabular report scraping when the first column can be used as a item key.
+    """
+    Converter to return a repetitive expression as a list, but also as a dictionary.
+    Each element can also be referenced using the first token in the expression as its key.
+    Useful for tabular report scraping when the first column can be used as a item key.
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        # print attributes as plain groups
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        # instead of OneOrMore(expr), parse using Dict(OneOrMore(Group(expr))) - Dict will auto-assign names
+        result = Dict(OneOrMore(Group(attr_expr))).parseString(text)
+        print(result.dump())
+        
+        # access named fields as dict entries, or output as dict
+        print(result['shape'])        
+        print(result.asDict())
+    prints::
+        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
+
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
+    See more examples at L{ParseResults} of accessing fields by results name.
     """
     def __init__( self, expr ):
         super(Dict,self).__init__( expr )
@@ -3115,7 +4231,24 @@ def postParse( self, instring, loc, tokenlist ):
 
 
 class Suppress(TokenConverter):
-    """Converter for ignoring the results of a parsed expression."""
+    """
+    Converter for ignoring the results of a parsed expression.
+
+    Example::
+        source = "a, b, c,d"
+        wd = Word(alphas)
+        wd_list1 = wd + ZeroOrMore(',' + wd)
+        print(wd_list1.parseString(source))
+
+        # often, delimiters that are useful during parsing are just in the
+        # way afterward - use Suppress to keep them out of the parsed output
+        wd_list2 = wd + ZeroOrMore(Suppress(',') + wd)
+        print(wd_list2.parseString(source))
+    prints::
+        ['a', ',', 'b', ',', 'c', ',', 'd']
+        ['a', 'b', 'c', 'd']
+    (See also L{delimitedList}.)
+    """
     def postParse( self, instring, loc, tokenlist ):
         return []
 
@@ -3124,7 +4257,9 @@ def suppress( self ):
 
 
 class OnlyOnce(object):
-    """Wrapper for parse actions, to ensure they are only called once."""
+    """
+    Wrapper for parse actions, to ensure they are only called once.
+    """
     def __init__(self, methodCall):
         self.callable = _trim_arity(methodCall)
         self.called = False
@@ -3138,20 +4273,36 @@ def reset(self):
         self.called = False
 
 def traceParseAction(f):
-    """Decorator for debugging parse actions."""
+    """
+    Decorator for debugging parse actions.
+
+    Example::
+        wd = Word(alphas)
+
+        @traceParseAction
+        def remove_duplicate_chars(tokens):
+            return ''.join(sorted(set(''.join(tokens)))
+
+        wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
+        print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
+    prints::
+        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
+        <<leaving remove_duplicate_chars (ret: 'dfjkls')
+        ['dfjkls']
+    """
     f = _trim_arity(f)
     def z(*paArgs):
-        thisFunc = f.func_name
+        thisFunc = f.__name__
         s,l,t = paArgs[-3:]
         if len(paArgs)>3:
             thisFunc = paArgs[0].__class__.__name__ + '.' + thisFunc
-        sys.stderr.write( ">>entering %s(line: '%s', %d, %s)\n" % (thisFunc,line(l,s),l,t) )
+        sys.stderr.write( ">>entering %s(line: '%s', %d, %r)\n" % (thisFunc,line(l,s),l,t) )
         try:
             ret = f(*paArgs)
         except Exception as exc:
             sys.stderr.write( "<<leaving %s (exception: %s)\n" % (thisFunc,exc) )
             raise
-        sys.stderr.write( "<<leaving %s (ret: %s)\n" % (thisFunc,ret) )
+        sys.stderr.write( "<<leaving %s (ret: %r)\n" % (thisFunc,ret) )
         return ret
     try:
         z.__name__ = f.__name__
@@ -3163,12 +4314,17 @@ def z(*paArgs):
 # global helpers
 #
 def delimitedList( expr, delim=",", combine=False ):
-    """Helper to define a delimited list of expressions - the delimiter defaults to ','.
-       By default, the list elements and delimiters can have intervening whitespace, and
-       comments, but this can be overridden by passing C{combine=True} in the constructor.
-       If C{combine} is set to C{True}, the matching tokens are returned as a single token
-       string, with the delimiters included; otherwise, the matching tokens are returned
-       as a list of tokens, with the delimiters suppressed.
+    """
+    Helper to define a delimited list of expressions - the delimiter defaults to ','.
+    By default, the list elements and delimiters can have intervening whitespace, and
+    comments, but this can be overridden by passing C{combine=True} in the constructor.
+    If C{combine} is set to C{True}, the matching tokens are returned as a single token
+    string, with the delimiters included; otherwise, the matching tokens are returned
+    as a list of tokens, with the delimiters suppressed.
+
+    Example::
+        delimitedList(Word(alphas)).parseString("aa,bb,cc") # -> ['aa', 'bb', 'cc']
+        delimitedList(Word(hexnums), delim=':', combine=True).parseString("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
     """
     dlName = _ustr(expr)+" ["+_ustr(delim)+" "+_ustr(expr)+"]..."
     if combine:
@@ -3177,11 +4333,15 @@ def delimitedList( expr, delim=",", combine=False ):
         return ( expr + ZeroOrMore( Suppress( delim ) + expr ) ).setName(dlName)
 
 def countedArray( expr, intExpr=None ):
-    """Helper to define a counted list of expressions.
-       This helper defines a pattern of the form::
-           integer expr expr expr...
-       where the leading integer tells how many expr expressions follow.
-       The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+    """
+    Helper to define a counted list of expressions.
+    This helper defines a pattern of the form::
+        integer expr expr expr...
+    where the leading integer tells how many expr expressions follow.
+    The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+
+    Example::
+        countedArray(Word(alphas)).parseString('2 ab cd ef')  # -> ['ab', 'cd']
     """
     arrayExpr = Forward()
     def countFieldParseAction(s,l,t):
@@ -3194,7 +4354,7 @@ def countFieldParseAction(s,l,t):
         intExpr = intExpr.copy()
     intExpr.setName("arrayLen")
     intExpr.addParseAction(countFieldParseAction, callDuringTry=True)
-    return ( intExpr + arrayExpr )
+    return ( intExpr + arrayExpr ).setName('(len) ' + _ustr(expr) + '...')
 
 def _flatten(L):
     ret = []
@@ -3206,16 +4366,17 @@ def _flatten(L):
     return ret
 
 def matchPreviousLiteral(expr):
-    """Helper to define an expression that is indirectly defined from
-       the tokens matched in a previous expression, that is, it looks
-       for a 'repeat' of a previous expression.  For example::
-           first = Word(nums)
-           second = matchPreviousLiteral(first)
-           matchExpr = first + ":" + second
-       will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
-       previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
-       If this is not desired, use C{matchPreviousExpr}.
-       Do *not* use with packrat parsing enabled.
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousLiteral(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
+    previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
+    If this is not desired, use C{matchPreviousExpr}.
+    Do I{not} use with packrat parsing enabled.
     """
     rep = Forward()
     def copyTokenToRepeater(s,l,t):
@@ -3225,24 +4386,26 @@ def copyTokenToRepeater(s,l,t):
             else:
                 # flatten t tokens
                 tflat = _flatten(t.asList())
-                rep << And( [ Literal(tt) for tt in tflat ] )
+                rep << And(Literal(tt) for tt in tflat)
         else:
             rep << Empty()
     expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
     return rep
 
 def matchPreviousExpr(expr):
-    """Helper to define an expression that is indirectly defined from
-       the tokens matched in a previous expression, that is, it looks
-       for a 'repeat' of a previous expression.  For example::
-           first = Word(nums)
-           second = matchPreviousExpr(first)
-           matchExpr = first + ":" + second
-       will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
-       expressions, will *not* match the leading C{"1:1"} in C{"1:10"};
-       the expressions are evaluated first, and then compared, so
-       C{"1"} is compared with C{"10"}.
-       Do *not* use with packrat parsing enabled.
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousExpr(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
+    expressions, will I{not} match the leading C{"1:1"} in C{"1:10"};
+    the expressions are evaluated first, and then compared, so
+    C{"1"} is compared with C{"10"}.
+    Do I{not} use with packrat parsing enabled.
     """
     rep = Forward()
     e2 = expr.copy()
@@ -3255,6 +4418,7 @@ def mustMatchTheseTokens(s,l,t):
                 raise ParseException("",0,"")
         rep.setParseAction( mustMatchTheseTokens, callDuringTry=True )
     expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
     return rep
 
 def _escapeRegexRangeChars(s):
@@ -3266,16 +4430,27 @@ def _escapeRegexRangeChars(s):
     return _ustr(s)
 
 def oneOf( strs, caseless=False, useRegex=True ):
-    """Helper to quickly define a set of alternative Literals, and makes sure to do
-       longest-first testing when there is a conflict, regardless of the input order,
-       but returns a C{L{MatchFirst}} for best performance.
-
-       Parameters:
-        - strs - a string of space-delimited literals, or a list of string literals
-        - caseless - (default=False) - treat all literals as caseless
-        - useRegex - (default=True) - as an optimization, will generate a Regex
+    """
+    Helper to quickly define a set of alternative Literals, and makes sure to do
+    longest-first testing when there is a conflict, regardless of the input order,
+    but returns a C{L{MatchFirst}} for best performance.
+
+    Parameters:
+     - strs - a string of space-delimited literals, or a collection of string literals
+     - caseless - (default=C{False}) - treat all literals as caseless
+     - useRegex - (default=C{True}) - as an optimization, will generate a Regex
           object; otherwise, will generate a C{MatchFirst} object (if C{caseless=True}, or
           if creating a C{Regex} raises an exception)
+
+    Example::
+        comp_oper = oneOf("< = > <= >= !=")
+        var = Word(alphas)
+        number = Word(nums)
+        term = var | number
+        comparison_expr = term + comp_oper + term
+        print(comparison_expr.searchString("B = 12  AA=23 B<=AA AA>12"))
+    prints::
+        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
     """
     if caseless:
         isequal = ( lambda a,b: a.upper() == b.upper() )
@@ -3289,12 +4464,10 @@ def oneOf( strs, caseless=False, useRegex=True ):
     symbols = []
     if isinstance(strs,basestring):
         symbols = strs.split()
-    elif isinstance(strs, collections.Sequence):
-        symbols = list(strs[:])
-    elif isinstance(strs, _generatorType):
+    elif isinstance(strs, collections.Iterable):
         symbols = list(strs)
     else:
-        warnings.warn("Invalid argument to oneOf, expected string or list",
+        warnings.warn("Invalid argument to oneOf, expected string or iterable",
                 SyntaxWarning, stacklevel=2)
     if not symbols:
         return NoMatch()
@@ -3318,41 +4491,76 @@ def oneOf( strs, caseless=False, useRegex=True ):
         #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
         try:
             if len(symbols)==len("".join(symbols)):
-                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) )
+                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) ).setName(' | '.join(symbols))
             else:
-                return Regex( "|".join(re.escape(sym) for sym in symbols) )
+                return Regex( "|".join(re.escape(sym) for sym in symbols) ).setName(' | '.join(symbols))
         except:
             warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
                     SyntaxWarning, stacklevel=2)
 
 
     # last resort, just use MatchFirst
-    return MatchFirst( [ parseElementClass(sym) for sym in symbols ] )
+    return MatchFirst(parseElementClass(sym) for sym in symbols).setName(' | '.join(symbols))
 
 def dictOf( key, value ):
-    """Helper to easily and clearly define a dictionary by specifying the respective patterns
-       for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
-       in the proper order.  The key pattern can include delimiting markers or punctuation,
-       as long as they are suppressed, thereby leaving the significant key text.  The value
-       pattern can include named results, so that the C{Dict} results can include named token
-       fields.
+    """
+    Helper to easily and clearly define a dictionary by specifying the respective patterns
+    for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
+    in the proper order.  The key pattern can include delimiting markers or punctuation,
+    as long as they are suppressed, thereby leaving the significant key text.  The value
+    pattern can include named results, so that the C{Dict} results can include named token
+    fields.
+
+    Example::
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        attr_label = label
+        attr_value = Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join)
+
+        # similar to Dict, but simpler call format
+        result = dictOf(attr_label, attr_value).parseString(text)
+        print(result.dump())
+        print(result['shape'])
+        print(result.shape)  # object attribute access works too
+        print(result.asDict())
+    prints::
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        SQUARE
+        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
     """
     return Dict( ZeroOrMore( Group ( key + value ) ) )
 
 def originalTextFor(expr, asString=True):
-    """Helper to return the original, untokenized text for a given expression.  Useful to
-       restore the parsed fields of an HTML start tag into the raw tag text itself, or to
-       revert separate tokens with intervening whitespace back to the original matching
-       input text. Simpler to use than the parse action C{L{keepOriginalText}}, and does not
-       require the inspect module to chase up the call stack.  By default, returns a 
-       string containing the original parsed text.  
+    """
+    Helper to return the original, untokenized text for a given expression.  Useful to
+    restore the parsed fields of an HTML start tag into the raw tag text itself, or to
+    revert separate tokens with intervening whitespace back to the original matching
+    input text. By default, returns astring containing the original parsed text.  
        
-       If the optional C{asString} argument is passed as C{False}, then the return value is a 
-       C{L{ParseResults}} containing any results names that were originally matched, and a 
-       single token containing the original matched text from the input string.  So if 
-       the expression passed to C{L{originalTextFor}} contains expressions with defined
-       results names, you must set C{asString} to C{False} if you want to preserve those
-       results name values."""
+    If the optional C{asString} argument is passed as C{False}, then the return value is a 
+    C{L{ParseResults}} containing any results names that were originally matched, and a 
+    single token containing the original matched text from the input string.  So if 
+    the expression passed to C{L{originalTextFor}} contains expressions with defined
+    results names, you must set C{asString} to C{False} if you want to preserve those
+    results name values.
+
+    Example::
+        src = "this is test <b> bold <i>text</i> </b> normal text "
+        for tag in ("b","i"):
+            opener,closer = makeHTMLTags(tag)
+            patt = originalTextFor(opener + SkipTo(closer) + closer)
+            print(patt.searchString(src)[0])
+    prints::
+        ['<b> bold <i>text</i> </b>']
+        ['<i>text</i>']
+    """
     locMarker = Empty().setParseAction(lambda s,loc,t: loc)
     endlocMarker = locMarker.copy()
     endlocMarker.callPreparse = False
@@ -3361,27 +4569,37 @@ def originalTextFor(expr, asString=True):
         extractText = lambda s,l,t: s[t._original_start:t._original_end]
     else:
         def extractText(s,l,t):
-            del t[:]
-            t.insert(0, s[t._original_start:t._original_end])
-            del t["_original_start"]
-            del t["_original_end"]
+            t[:] = [s[t.pop('_original_start'):t.pop('_original_end')]]
     matchExpr.setParseAction(extractText)
+    matchExpr.ignoreExprs = expr.ignoreExprs
     return matchExpr
 
 def ungroup(expr): 
-    """Helper to undo pyparsing's default grouping of And expressions, even
-       if all but one are non-empty."""
+    """
+    Helper to undo pyparsing's default grouping of And expressions, even
+    if all but one are non-empty.
+    """
     return TokenConverter(expr).setParseAction(lambda t:t[0])
 
 def locatedExpr(expr):
-    """Helper to decorate a returned token with its starting and ending locations in the input string.
-       This helper adds the following results names:
-        - locn_start = location where matched expression begins
-        - locn_end = location where matched expression ends
-        - value = the actual parsed results
-
-       Be careful if the input text contains C{<TAB>} characters, you may want to call
-       C{L{ParserElement.parseWithTabs}}
+    """
+    Helper to decorate a returned token with its starting and ending locations in the input string.
+    This helper adds the following results names:
+     - locn_start = location where matched expression begins
+     - locn_end = location where matched expression ends
+     - value = the actual parsed results
+
+    Be careful if the input text contains C{<TAB>} characters, you may want to call
+    C{L{ParserElement.parseWithTabs}}
+
+    Example::
+        wd = Word(alphas)
+        for match in locatedExpr(wd).searchString("ljsdf123lksdjjf123lkkjj1222"):
+            print(match)
+    prints::
+        [[0, 'ljsdf', 5]]
+        [[8, 'lksdjjf', 15]]
+        [[18, 'lkkjj', 23]]
     """
     locator = Empty().setParseAction(lambda s,l,t: l)
     return Group(locator("locn_start") + expr("value") + locator.copy().leaveWhitespace()("locn_end"))
@@ -3402,21 +4620,22 @@ def locatedExpr(expr):
 _reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
 
 def srange(s):
-    r"""Helper to easily define string ranges for use in Word construction.  Borrows
-       syntax from regexp '[]' string range definitions::
-          srange("[0-9]")   -> "0123456789"
-          srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
-          srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
-       The input string must be enclosed in []'s, and the returned string is the expanded
-       character set joined into a single string.
-       The values enclosed in the []'s may be::
-          a single character
-          an escaped character with a leading backslash (such as \- or \])
-          an escaped hex character with a leading '\x' (\x21, which is a '!' character) 
-            (\0x## is also supported for backwards compatibility) 
-          an escaped octal character with a leading '\0' (\041, which is a '!' character)
-          a range of any of the above, separated by a dash ('a-z', etc.)
-          any combination of the above ('aeiouy', 'a-zA-Z0-9_$', etc.)
+    r"""
+    Helper to easily define string ranges for use in Word construction.  Borrows
+    syntax from regexp '[]' string range definitions::
+        srange("[0-9]")   -> "0123456789"
+        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
+        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
+    The input string must be enclosed in []'s, and the returned string is the expanded
+    character set joined into a single string.
+    The values enclosed in the []'s may be:
+     - a single character
+     - an escaped character with a leading backslash (such as C{\-} or C{\]})
+     - an escaped hex character with a leading C{'\x'} (C{\x21}, which is a C{'!'} character) 
+         (C{\0x##} is also supported for backwards compatibility) 
+     - an escaped octal character with a leading C{'\0'} (C{\041}, which is a C{'!'} character)
+     - a range of any of the above, separated by a dash (C{'a-z'}, etc.)
+     - any combination of the above (C{'aeiouy'}, C{'a-zA-Z0-9_$'}, etc.)
     """
     _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
     try:
@@ -3425,8 +4644,9 @@ def srange(s):
         return ""
 
 def matchOnlyAtCol(n):
-    """Helper method for defining parse actions that require matching at a specific
-       column in the input text.
+    """
+    Helper method for defining parse actions that require matching at a specific
+    column in the input text.
     """
     def verifyCol(strg,locn,toks):
         if col(locn,strg) != n:
@@ -3434,57 +4654,83 @@ def verifyCol(strg,locn,toks):
     return verifyCol
 
 def replaceWith(replStr):
-    """Helper method for common parse actions that simply return a literal value.  Especially
-       useful when used with C{L{transformString<ParserElement.transformString>}()}.
     """
-    #def _replFunc(*args):
-    #    return [replStr]
-    #return _replFunc
-    return functools.partial(next, itertools.repeat([replStr]))
+    Helper method for common parse actions that simply return a literal value.  Especially
+    useful when used with C{L{transformString<ParserElement.transformString>}()}.
+
+    Example::
+        num = Word(nums).setParseAction(lambda toks: int(toks[0]))
+        na = oneOf("N/A NA").setParseAction(replaceWith(math.nan))
+        term = na | num
+        
+        OneOrMore(term).parseString("324 234 N/A 234") # -> [324, 234, nan, 234]
+    """
+    return lambda s,l,t: [replStr]
 
 def removeQuotes(s,l,t):
-    """Helper parse action for removing quotation marks from parsed quoted strings.
-       To use, add this parse action to quoted string using::
-         quotedString.setParseAction( removeQuotes )
     """
-    return t[0][1:-1]
+    Helper parse action for removing quotation marks from parsed quoted strings.
 
-def upcaseTokens(s,l,t):
-    """Helper parse action to convert tokens to upper case."""
-    return [ tt.upper() for tt in map(_ustr,t) ]
+    Example::
+        # by default, quotation marks are included in parsed results
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
 
-def downcaseTokens(s,l,t):
-    """Helper parse action to convert tokens to lower case."""
-    return [ tt.lower() for tt in map(_ustr,t) ]
+        # use removeQuotes to strip quotation marks from parsed results
+        quotedString.setParseAction(removeQuotes)
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
+    """
+    return t[0][1:-1]
+
+def tokenMap(func, *args):
+    """
+    Helper to define a parse action by mapping a function to all elements of a ParseResults list.If any additional 
+    args are passed, they are forwarded to the given function as additional arguments after
+    the token, as in C{hex_integer = Word(hexnums).setParseAction(tokenMap(int, 16))}, which will convert the
+    parsed data to an integer using base 16.
+
+    Example (compare the last to example in L{ParserElement.transformString}::
+        hex_ints = OneOrMore(Word(hexnums)).setParseAction(tokenMap(int, 16))
+        hex_ints.runTests('''
+            00 11 22 aa FF 0a 0d 1a
+            ''')
+        
+        upperword = Word(alphas).setParseAction(tokenMap(str.upper))
+        OneOrMore(upperword).runTests('''
+            my kingdom for a horse
+            ''')
+
+        wd = Word(alphas).setParseAction(tokenMap(str.title))
+        OneOrMore(wd).setParseAction(' '.join).runTests('''
+            now is the winter of our discontent made glorious summer by this sun of york
+            ''')
+    prints::
+        00 11 22 aa FF 0a 0d 1a
+        [0, 17, 34, 170, 255, 10, 13, 26]
+
+        my kingdom for a horse
+        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
+
+        now is the winter of our discontent made glorious summer by this sun of york
+        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
+    """
+    def pa(s,l,t):
+        return [func(tokn, *args) for tokn in t]
 
-def keepOriginalText(s,startLoc,t):
-    """DEPRECATED - use new helper method C{L{originalTextFor}}.
-       Helper parse action to preserve original parsed text,
-       overriding any nested parse actions."""
-    try:
-        endloc = getTokensEndLoc()
-    except ParseException:
-        raise ParseFatalException("incorrect usage of keepOriginalText - may only be called as a parse action")
-    del t[:]
-    t += ParseResults(s[startLoc:endloc])
-    return t
-
-def getTokensEndLoc():
-    """Method to be called from within a parse action to determine the end
-       location of the parsed tokens."""
-    import inspect
-    fstack = inspect.stack()
     try:
-        # search up the stack (through intervening argument normalizers) for correct calling routine
-        for f in fstack[2:]:
-            if f[3] == "_parseNoCache":
-                endloc = f[0].f_locals["loc"]
-                return endloc
-        else:
-            raise ParseFatalException("incorrect usage of getTokensEndLoc - may only be called from within a parse action")
-    finally:
-        del fstack
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    pa.__name__ = func_name
 
+    return pa
+
+upcaseTokens = tokenMap(lambda t: _ustr(t).upper())
+"""Helper parse action to convert tokens to upper case."""
+
+downcaseTokens = tokenMap(lambda t: _ustr(t).lower())
+"""Helper parse action to convert tokens to lower case."""
+    
 def _makeTags(tagStr, xml):
     """Internal helper to construct opening and closing tag expressions, given a tag name"""
     if isinstance(tagStr,basestring):
@@ -3508,40 +4754,90 @@ def _makeTags(tagStr, xml):
                 Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
     closeTag = Combine(_L("</") + tagStr + ">")
 
-    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % tagStr)
-    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % tagStr)
+    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % resname)
+    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % resname)
     openTag.tag = resname
     closeTag.tag = resname
     return openTag, closeTag
 
 def makeHTMLTags(tagStr):
-    """Helper to construct opening and closing tag expressions for HTML, given a tag name"""
+    """
+    Helper to construct opening and closing tag expressions for HTML, given a tag name. Matches
+    tags in either upper or lower case, attributes with namespaces and with quoted or unquoted values.
+
+    Example::
+        text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+        # makeHTMLTags returns pyparsing expressions for the opening and closing tags as a 2-tuple
+        a,a_end = makeHTMLTags("A")
+        link_expr = a + SkipTo(a_end)("link_text") + a_end
+        
+        for link in link_expr.searchString(text):
+            # attributes in the <A> tag (like "href" shown here) are also accessible as named results
+            print(link.link_text, '->', link.href)
+    prints::
+        pyparsing -> http://pyparsing.wikispaces.com
+    """
     return _makeTags( tagStr, False )
 
 def makeXMLTags(tagStr):
-    """Helper to construct opening and closing tag expressions for XML, given a tag name"""
+    """
+    Helper to construct opening and closing tag expressions for XML, given a tag name. Matches
+    tags only in the given upper/lower case.
+
+    Example: similar to L{makeHTMLTags}
+    """
     return _makeTags( tagStr, True )
 
 def withAttribute(*args,**attrDict):
-    """Helper to create a validating parse action to be used with start tags created
-       with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
-       with a required attribute value, to avoid false matches on common tags such as
-       C{<TD>} or C{<DIV>}.
-
-       Call C{withAttribute} with a series of attribute names and values. Specify the list
-       of filter attributes names and values as:
-        - keyword arguments, as in C{(align="right")}, or
-        - as an explicit dict with C{**} operator, when an attribute name is also a Python
+    """
+    Helper to create a validating parse action to be used with start tags created
+    with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
+    with a required attribute value, to avoid false matches on common tags such as
+    C{<TD>} or C{<DIV>}.
+
+    Call C{withAttribute} with a series of attribute names and values. Specify the list
+    of filter attributes names and values as:
+     - keyword arguments, as in C{(align="right")}, or
+     - as an explicit dict with C{**} operator, when an attribute name is also a Python
           reserved word, as in C{**{"class":"Customer", "align":"right"}}
-        - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
-       For attribute names with a namespace prefix, you must use the second form.  Attribute
-       names are matched insensitive to upper/lower case.
+     - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
+    For attribute names with a namespace prefix, you must use the second form.  Attribute
+    names are matched insensitive to upper/lower case.
        
-       If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
-
-       To verify that the attribute exists, but without specifying a value, pass
-       C{withAttribute.ANY_VALUE} as the value.
-       """
+    If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
+
+    To verify that the attribute exists, but without specifying a value, pass
+    C{withAttribute.ANY_VALUE} as the value.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div type="grid">1 4 0 1 0</div>
+            <div type="graph">1,3 2,3 1,1</div>
+            <div>this has no type</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+
+        # only match div tag having a type attribute with value "grid"
+        div_grid = div().setParseAction(withAttribute(type="grid"))
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        # construct a match with any div tag having a type attribute, regardless of the value
+        div_any_type = div().setParseAction(withAttribute(type=withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
     if args:
         attrs = args[:]
     else:
@@ -3558,9 +4854,37 @@ def pa(s,l,tokens):
 withAttribute.ANY_VALUE = object()
 
 def withClass(classname, namespace=''):
-    """Simplified version of C{L{withAttribute}} when matching on a div class - made
-       difficult because C{class} is a reserved word in Python.
-       """
+    """
+    Simplified version of C{L{withAttribute}} when matching on a div class - made
+    difficult because C{class} is a reserved word in Python.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div class="grid">1 4 0 1 0</div>
+            <div class="graph">1,3 2,3 1,1</div>
+            <div>this &lt;div&gt; has no class</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+        div_grid = div().setParseAction(withClass("grid"))
+        
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        div_any_type = div().setParseAction(withClass(withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
     classattr = "%s:class" % namespace if namespace else "class"
     return withAttribute(**{classattr : classname})        
 
@@ -3569,40 +4893,69 @@ def withClass(classname, namespace=''):
 opAssoc.RIGHT = object()
 
 def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
-    """Helper method for constructing grammars of expressions made up of
-       operators working in a precedence hierarchy.  Operators may be unary or
-       binary, left- or right-associative.  Parse actions can also be attached
-       to operator expressions.
-
-       Parameters:
-        - baseExpr - expression representing the most basic element for the nested
-        - opList - list of tuples, one for each operator precedence level in the
-          expression grammar; each tuple is of the form
-          (opExpr, numTerms, rightLeftAssoc, parseAction), where:
-           - opExpr is the pyparsing expression for the operator;
-              may also be a string, which will be converted to a Literal;
-              if numTerms is 3, opExpr is a tuple of two expressions, for the
-              two operators separating the 3 terms
-           - numTerms is the number of terms for this operator (must
-              be 1, 2, or 3)
-           - rightLeftAssoc is the indicator whether the operator is
-              right or left associative, using the pyparsing-defined
-              constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
-           - parseAction is the parse action to be associated with
-              expressions matching this operator expression (the
-              parse action tuple member may be omitted)
-        - lpar - expression for matching left-parentheses (default=Suppress('('))
-        - rpar - expression for matching right-parentheses (default=Suppress(')'))
+    """
+    Helper method for constructing grammars of expressions made up of
+    operators working in a precedence hierarchy.  Operators may be unary or
+    binary, left- or right-associative.  Parse actions can also be attached
+    to operator expressions.
+
+    Parameters:
+     - baseExpr - expression representing the most basic element for the nested
+     - opList - list of tuples, one for each operator precedence level in the
+      expression grammar; each tuple is of the form
+      (opExpr, numTerms, rightLeftAssoc, parseAction), where:
+       - opExpr is the pyparsing expression for the operator;
+          may also be a string, which will be converted to a Literal;
+          if numTerms is 3, opExpr is a tuple of two expressions, for the
+          two operators separating the 3 terms
+       - numTerms is the number of terms for this operator (must
+          be 1, 2, or 3)
+       - rightLeftAssoc is the indicator whether the operator is
+          right or left associative, using the pyparsing-defined
+          constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
+       - parseAction is the parse action to be associated with
+          expressions matching this operator expression (the
+          parse action tuple member may be omitted)
+     - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
+     - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
+
+    Example::
+        # simple example of four-function arithmetic with ints and variable names
+        integer = pyparsing_common.signedInteger
+        varname = pyparsing_common.identifier 
+        
+        arith_expr = infixNotation(integer | varname,
+            [
+            ('-', 1, opAssoc.RIGHT),
+            (oneOf('* /'), 2, opAssoc.LEFT),
+            (oneOf('+ -'), 2, opAssoc.LEFT),
+            ])
+        
+        arith_expr.runTests('''
+            5+3*6
+            (5+3)*6
+            -2--11
+            ''', fullDump=False)
+    prints::
+        5+3*6
+        [[5, '+', [3, '*', 6]]]
+
+        (5+3)*6
+        [[[5, '+', 3], '*', 6]]
+
+        -2--11
+        [[['-', 2], '-', ['-', 11]]]
     """
     ret = Forward()
     lastExpr = baseExpr | ( lpar + ret + rpar )
     for i,operDef in enumerate(opList):
         opExpr,arity,rightLeftAssoc,pa = (operDef + (None,))[:4]
+        termName = "%s term" % opExpr if arity < 3 else "%s%s term" % opExpr
         if arity == 3:
             if opExpr is None or len(opExpr) != 2:
                 raise ValueError("if numterms=3, opExpr must be a tuple or list of two expressions")
             opExpr1, opExpr2 = opExpr
-        thisExpr = Forward()#.setName("expr%d" % i)
+        thisExpr = Forward().setName(termName)
         if rightLeftAssoc == opAssoc.LEFT:
             if arity == 1:
                 matchExpr = FollowedBy(lastExpr + opExpr) + Group( lastExpr + OneOrMore( opExpr ) )
@@ -3636,37 +4989,77 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
             raise ValueError("operator must indicate right or left associativity")
         if pa:
             matchExpr.setParseAction( pa )
-        thisExpr <<= ( matchExpr | lastExpr )
+        thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
         lastExpr = thisExpr
     ret <<= lastExpr
     return ret
+
 operatorPrecedence = infixNotation
+"""(Deprecated) Former name of C{L{infixNotation}}, will be dropped in a future release."""
 
-dblQuotedString = Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\x[0-9a-fA-F]+)|(?:\\.))*"').setName("string enclosed in double quotes")
-sglQuotedString = Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\x[0-9a-fA-F]+)|(?:\\.))*'").setName("string enclosed in single quotes")
-quotedString = Regex(r'''(?:"(?:[^"\n\r\\]|(?:"")|(?:\\x[0-9a-fA-F]+)|(?:\\.))*")|(?:'(?:[^'\n\r\\]|(?:'')|(?:\\x[0-9a-fA-F]+)|(?:\\.))*')''').setName("quotedString using single or double quotes")
-unicodeString = Combine(_L('u') + quotedString.copy())
+dblQuotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"').setName("string enclosed in double quotes")
+sglQuotedString = Combine(Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("string enclosed in single quotes")
+quotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"'|
+                       Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("quotedString using single or double quotes")
+unicodeString = Combine(_L('u') + quotedString.copy()).setName("unicode string literal")
 
 def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.copy()):
-    """Helper method for defining nested lists enclosed in opening and closing
-       delimiters ("(" and ")" are the default).
-
-       Parameters:
-        - opener - opening character for a nested list (default="("); can also be a pyparsing expression
-        - closer - closing character for a nested list (default=")"); can also be a pyparsing expression
-        - content - expression for items within the nested lists (default=None)
-        - ignoreExpr - expression for ignoring opening and closing delimiters (default=quotedString)
-
-       If an expression is not provided for the content argument, the nested
-       expression will capture all whitespace-delimited content between delimiters
-       as a list of separate values.
-
-       Use the C{ignoreExpr} argument to define expressions that may contain
-       opening or closing characters that should not be treated as opening
-       or closing characters for nesting, such as quotedString or a comment
-       expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
-       The default is L{quotedString}, but if no expressions are to be ignored,
-       then pass C{None} for this argument.
+    """
+    Helper method for defining nested lists enclosed in opening and closing
+    delimiters ("(" and ")" are the default).
+
+    Parameters:
+     - opener - opening character for a nested list (default=C{"("}); can also be a pyparsing expression
+     - closer - closing character for a nested list (default=C{")"}); can also be a pyparsing expression
+     - content - expression for items within the nested lists (default=C{None})
+     - ignoreExpr - expression for ignoring opening and closing delimiters (default=C{quotedString})
+
+    If an expression is not provided for the content argument, the nested
+    expression will capture all whitespace-delimited content between delimiters
+    as a list of separate values.
+
+    Use the C{ignoreExpr} argument to define expressions that may contain
+    opening or closing characters that should not be treated as opening
+    or closing characters for nesting, such as quotedString or a comment
+    expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
+    The default is L{quotedString}, but if no expressions are to be ignored,
+    then pass C{None} for this argument.
+
+    Example::
+        data_type = oneOf("void int short long char float double")
+        decl_data_type = Combine(data_type + Optional(Word('*')))
+        ident = Word(alphas+'_', alphanums+'_')
+        number = pyparsing_common.number
+        arg = Group(decl_data_type + ident)
+        LPAR,RPAR = map(Suppress, "()")
+
+        code_body = nestedExpr('{', '}', ignoreExpr=(quotedString | cStyleComment))
+
+        c_function = (decl_data_type("type") 
+                      + ident("name")
+                      + LPAR + Optional(delimitedList(arg), [])("args") + RPAR 
+                      + code_body("body"))
+        c_function.ignore(cStyleComment)
+        
+        source_code = '''
+            int is_odd(int x) { 
+                return (x%2); 
+            }
+                
+            int dec_to_hex(char hchar) { 
+                if (hchar >= '0' && hchar <= '9') { 
+                    return (ord(hchar)-ord('0')); 
+                } else { 
+                    return (10+ord(hchar)-ord('A'));
+                } 
+            }
+        '''
+        for func in c_function.searchString(source_code):
+            print("%(name)s (%(type)s) args: %(args)s" % func)
+
+    prints::
+        is_odd (int) args: [['int', 'x']]
+        dec_to_hex (int) args: [['char', 'hchar']]
     """
     if opener == closer:
         raise ValueError("opening and closing strings cannot be the same")
@@ -3697,23 +5090,86 @@ def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.cop
         ret <<= Group( Suppress(opener) + ZeroOrMore( ignoreExpr | ret | content ) + Suppress(closer) )
     else:
         ret <<= Group( Suppress(opener) + ZeroOrMore( ret | content )  + Suppress(closer) )
+    ret.setName('nested %s%s expression' % (opener,closer))
     return ret
 
 def indentedBlock(blockStatementExpr, indentStack, indent=True):
-    """Helper method for defining space-delimited indentation blocks, such as
-       those used to define block statements in Python source code.
+    """
+    Helper method for defining space-delimited indentation blocks, such as
+    those used to define block statements in Python source code.
 
-       Parameters:
-        - blockStatementExpr - expression defining syntax of statement that
+    Parameters:
+     - blockStatementExpr - expression defining syntax of statement that
             is repeated within the indented block
-        - indentStack - list created by caller to manage indentation stack
+     - indentStack - list created by caller to manage indentation stack
             (multiple statementWithIndentedBlock expressions within a single grammar
             should share a common indentStack)
-        - indent - boolean indicating whether block must be indented beyond the
+     - indent - boolean indicating whether block must be indented beyond the
             the current level; set to False for block of left-most statements
-            (default=True)
-
-       A valid block must contain at least one C{blockStatement}.
+            (default=C{True})
+
+    A valid block must contain at least one C{blockStatement}.
+
+    Example::
+        data = '''
+        def A(z):
+          A1
+          B = 100
+          G = A2
+          A2
+          A3
+        B
+        def BB(a,b,c):
+          BB1
+          def BBA():
+            bba1
+            bba2
+            bba3
+        C
+        D
+        def spam(x,y):
+             def eggs(z):
+                 pass
+        '''
+
+
+        indentStack = [1]
+        stmt = Forward()
+
+        identifier = Word(alphas, alphanums)
+        funcDecl = ("def" + identifier + Group( "(" + Optional( delimitedList(identifier) ) + ")" ) + ":")
+        func_body = indentedBlock(stmt, indentStack)
+        funcDef = Group( funcDecl + func_body )
+
+        rvalue = Forward()
+        funcCall = Group(identifier + "(" + Optional(delimitedList(rvalue)) + ")")
+        rvalue << (funcCall | identifier | Word(nums))
+        assignment = Group(identifier + "=" + rvalue)
+        stmt << ( funcDef | assignment | identifier )
+
+        module_body = OneOrMore(stmt)
+
+        parseTree = module_body.parseString(data)
+        parseTree.pprint()
+    prints::
+        [['def',
+          'A',
+          ['(', 'z', ')'],
+          ':',
+          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
+         'B',
+         ['def',
+          'BB',
+          ['(', 'a', 'b', 'c', ')'],
+          ':',
+          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
+         'C',
+         'D',
+         ['def',
+          'spam',
+          ['(', 'x', 'y', ')'],
+          ':',
+          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]] 
     """
     def checkPeerIndent(s,l,t):
         if l >= len(s): return
@@ -3738,9 +5194,9 @@ def checkUnindent(s,l,t):
         indentStack.pop()
 
     NL = OneOrMore(LineEnd().setWhitespaceChars("\t ").suppress())
-    INDENT = Empty() + Empty().setParseAction(checkSubIndent)
-    PEER   = Empty().setParseAction(checkPeerIndent)
-    UNDENT = Empty().setParseAction(checkUnindent)
+    INDENT = (Empty() + Empty().setParseAction(checkSubIndent)).setName('INDENT')
+    PEER   = Empty().setParseAction(checkPeerIndent).setName('')
+    UNDENT = Empty().setParseAction(checkUnindent).setName('UNINDENT')
     if indent:
         smExpr = Group( Optional(NL) +
             #~ FollowedBy(blockStatementExpr) +
@@ -3749,57 +5205,371 @@ def checkUnindent(s,l,t):
         smExpr = Group( Optional(NL) +
             (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) )
     blockStatementExpr.ignore(_bslash + LineEnd())
-    return smExpr
+    return smExpr.setName('indented block')
 
 alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
 punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
 
-anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:"))
-commonHTMLEntity = Combine(_L("&") + oneOf("gt lt amp nbsp quot").setResultsName("entity") +";").streamline()
-_htmlEntityMap = dict(zip("gt lt amp nbsp quot".split(),'><& "'))
-replaceHTMLEntity = lambda t : t.entity in _htmlEntityMap and _htmlEntityMap[t.entity] or None
+anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:").setName('any tag'))
+_htmlEntityMap = dict(zip("gt lt amp nbsp quot apos".split(),'><& "\''))
+commonHTMLEntity = Regex('&(?P<entity>' + '|'.join(_htmlEntityMap.keys()) +");").setName("common HTML entity")
+def replaceHTMLEntity(t):
+    """Helper parser action to replace common HTML entities with their special characters"""
+    return _htmlEntityMap.get(t.entity)
 
 # it's easy to get these comment structures wrong - they're very common, so may as well make them available
-cStyleComment = Regex(r"/\*(?:[^*]*\*+)+?/").setName("C style comment")
+cStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/').setName("C style comment")
+"Comment of the form C{/* ... */}"
 
-htmlComment = Regex(r"<!--[\s\S]*?-->")
-restOfLine = Regex(r".*").leaveWhitespace()
-dblSlashComment = Regex(r"\/\/(\\\n|.)*").setName("// comment")
-cppStyleComment = Regex(r"/(?:\*(?:[^*]*\*+)+?/|/[^\n]*(?:\n[^\n]*)*?(?:(?<!\\)|\Z))").setName("C++ style comment")
+htmlComment = Regex(r"<!--[\s\S]*?-->").setName("HTML comment")
+"Comment of the form C{<!-- ... -->}"
+
+restOfLine = Regex(r".*").leaveWhitespace().setName("rest of line")
+dblSlashComment = Regex(r"//(?:\\\n|[^\n])*").setName("// comment")
+"Comment of the form C{// ... (to end of line)}"
+
+cppStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/'| dblSlashComment).setName("C++ style comment")
+"Comment of either form C{L{cStyleComment}} or C{L{dblSlashComment}}"
 
 javaStyleComment = cppStyleComment
+"Same as C{L{cppStyleComment}}"
+
 pythonStyleComment = Regex(r"#.*").setName("Python style comment")
+"Comment of the form C{# ... (to end of line)}"
+
 _commasepitem = Combine(OneOrMore(Word(printables, excludeChars=',') +
                                   Optional( Word(" \t") +
                                             ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
 commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
+"""Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
+
+# some other useful expressions - using lower-case class name since we are really using this as a namespace
+class pyparsing_common:
+    """
+    Here are some common low-level expressions that may be useful in jump-starting parser development:
+     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sciReal>})
+     - common L{programming identifiers<identifier>}
+     - network addresses (L{MAC<mac_address>}, L{IPv4<ipv4_address>}, L{IPv6<ipv6_address>})
+     - ISO8601 L{dates<iso8601_date>} and L{datetime<iso8601_datetime>}
+     - L{UUID<uuid>}
+    Parse actions:
+     - C{L{convertToInteger}}
+     - C{L{convertToFloat}}
+     - C{L{convertToDate}}
+     - C{L{convertToDatetime}}
+     - C{L{stripHTMLTags}}
+
+    Example::
+        pyparsing_common.number.runTests('''
+            # any int or real number, returned as the appropriate type
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.fnumber.runTests('''
+            # any int or real number, returned as float
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.hex_integer.runTests('''
+            # hex numbers
+            100
+            FF
+            ''')
+
+        pyparsing_common.fraction.runTests('''
+            # fractions
+            1/2
+            -3/4
+            ''')
+
+        pyparsing_common.mixed_integer.runTests('''
+            # mixed fractions
+            1
+            1/2
+            -3/4
+            1-3/4
+            ''')
+
+        import uuid
+        pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+        pyparsing_common.uuid.runTests('''
+            # uuid
+            12345678-1234-5678-1234-567812345678
+            ''')
+    prints::
+        # any int or real number, returned as the appropriate type
+        100
+        [100]
+
+        -100
+        [-100]
+
+        +100
+        [100]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # any int or real number, returned as float
+        100
+        [100.0]
+
+        -100
+        [-100.0]
+
+        +100
+        [100.0]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # hex numbers
+        100
+        [256]
+
+        FF
+        [255]
+
+        # fractions
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        # mixed fractions
+        1
+        [1]
+
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        1-3/4
+        [1.75]
+
+        # uuid
+        12345678-1234-5678-1234-567812345678
+        [UUID('12345678-1234-5678-1234-567812345678')]
+    """
+
+    convertToInteger = tokenMap(int)
+    """
+    Parse action for converting parsed integers to Python int
+    """
+
+    convertToFloat = tokenMap(float)
+    """
+    Parse action for converting parsed numbers to Python float
+    """
+
+    integer = Word(nums).setName("integer").setParseAction(convertToInteger)
+    """expression that parses an unsigned integer, returns an int"""
+
+    hex_integer = Word(hexnums).setName("hex integer").setParseAction(tokenMap(int,16))
+    """expression that parses a hexadecimal integer, returns an int"""
+
+    signedInteger = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
+    """expression that parses an integer with optional leading sign, returns an int"""
+
+    fraction = (signedInteger().setParseAction(convertToFloat) + '/' + signedInteger().setParseAction(convertToFloat)).setName("fraction")
+    """fractional expression of an integer divided by an integer, returns a float"""
+    fraction.addParseAction(lambda t: t[0]/t[-1])
+
+    mixed_integer = (fraction | signedInteger + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
+    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
+    mixed_integer.addParseAction(sum)
+
+    real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
+    """expression that parses a floating point number and returns a float"""
 
+    sciReal = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
+    """expression that parses a floating point number with optional scientific notation and returns a float"""
+
+    # streamlining this expression makes the docs nicer-looking
+    number = (sciReal | real | signedInteger).streamline()
+    """any numeric expression, returns the corresponding Python type"""
+
+    fnumber = Regex(r'[+-]?\d+\.?\d*([eE][+-]?\d+)?').setName("fnumber").setParseAction(convertToFloat)
+    """any int or real number, returned as float"""
+    
+    identifier = Word(alphas+'_', alphanums+'_').setName("identifier")
+    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
+    
+    ipv4_address = Regex(r'(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}').setName("IPv4 address")
+    "IPv4 address (C{0.0.0.0 - 255.255.255.255})"
+
+    _ipv6_part = Regex(r'[0-9a-fA-F]{1,4}').setName("hex_integer")
+    _full_ipv6_address = (_ipv6_part + (':' + _ipv6_part)*7).setName("full IPv6 address")
+    _short_ipv6_address = (Optional(_ipv6_part + (':' + _ipv6_part)*(0,6)) + "::" + Optional(_ipv6_part + (':' + _ipv6_part)*(0,6))).setName("short IPv6 address")
+    _short_ipv6_address.addCondition(lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8)
+    _mixed_ipv6_address = ("::ffff:" + ipv4_address).setName("mixed IPv6 address")
+    ipv6_address = Combine((_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).setName("IPv6 address")).setName("IPv6 address")
+    "IPv6 address (long, short, or mixed form)"
+    
+    mac_address = Regex(r'[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}').setName("MAC address")
+    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
+
+    @staticmethod
+    def convertToDate(fmt="%Y-%m-%d"):
+        """
+        Helper to create a parse action for converting parsed date string to Python datetime.date
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%d"})
+
+        Example::
+            date_expr = pyparsing_common.iso8601_date.copy()
+            date_expr.setParseAction(pyparsing_common.convertToDate())
+            print(date_expr.parseString("1999-12-31"))
+        prints::
+            [datetime.date(1999, 12, 31)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt).date()
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    @staticmethod
+    def convertToDatetime(fmt="%Y-%m-%dT%H:%M:%S.%f"):
+        """
+        Helper to create a parse action for converting parsed datetime string to Python datetime.datetime
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%dT%H:%M:%S.%f"})
+
+        Example::
+            dt_expr = pyparsing_common.iso8601_datetime.copy()
+            dt_expr.setParseAction(pyparsing_common.convertToDatetime())
+            print(dt_expr.parseString("1999-12-31T23:59:59.999"))
+        prints::
+            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt)
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    iso8601_date = Regex(r'(?P<year>\d{4})(?:-(?P<month>\d\d)(?:-(?P<day>\d\d))?)?').setName("ISO8601 date")
+    "ISO8601 date (C{yyyy-mm-dd})"
+
+    iso8601_datetime = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)[T ](?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d(\.\d*)?)?)?(?P<tz>Z|[+-]\d\d:?\d\d)?').setName("ISO8601 datetime")
+    "ISO8601 datetime (C{yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)}) - trailing seconds, milliseconds, and timezone optional; accepts separating C{'T'} or C{' '}"
+
+    uuid = Regex(r'[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}').setName("UUID")
+    "UUID (C{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx})"
+
+    _html_stripper = anyOpenTag.suppress() | anyCloseTag.suppress()
+    @staticmethod
+    def stripHTMLTags(s, l, tokens):
+        """
+        Parse action to remove HTML tags from web page HTML source
+
+        Example::
+            # strip HTML links from normal text 
+            text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+            td,td_end = makeHTMLTags("TD")
+            table_text = td + SkipTo(td_end).setParseAction(pyparsing_common.stripHTMLTags)("body") + td_end
+            
+            print(table_text.parseString(text).body) # -> 'More info at the pyparsing wiki page'
+        """
+        return pyparsing_common._html_stripper.transformString(tokens[0])
 
 if __name__ == "__main__":
 
-    selectToken    = CaselessLiteral( "select" )
-    fromToken      = CaselessLiteral( "from" )
-
-    ident          = Word( alphas, alphanums + "_$" )
-    columnName     = delimitedList( ident, ".", combine=True ).setParseAction( upcaseTokens )
-    columnNameList = Group( delimitedList( columnName ) ).setName("columns")
-    tableName      = delimitedList( ident, ".", combine=True ).setParseAction( upcaseTokens )
-    tableNameList  = Group( delimitedList( tableName ) ).setName("tables")
-    simpleSQL      = ( selectToken + \
-                     ( '*' | columnNameList ).setResultsName( "columns" ) + \
-                     fromToken + \
-                     tableNameList.setResultsName( "tables" ) )
-
-    simpleSQL.runTests("""\
-          SELECT * from XYZZY, ABC
-          select * from SYS.XYZZY
-          Select A from Sys.dual
-          Select AA,BB,CC from Sys.dual
-          Select A, B, C from Sys.dual
-          Select A, B, C from Sys.dual
-          Xelect A, B, C from Sys.dual
-          Select A, B, C frox Sys.dual
-          Select
-          Select ^^^ frox Sys.dual
-          Select A, B, C from Sys.dual, Table2""")
+    selectToken    = CaselessLiteral("select")
+    fromToken      = CaselessLiteral("from")
+
+    ident          = Word(alphas, alphanums + "_$")
+
+    columnName     = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    columnNameList = Group(delimitedList(columnName)).setName("columns")
+    columnSpec     = ('*' | columnNameList)
+
+    tableName      = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    tableNameList  = Group(delimitedList(tableName)).setName("tables")
     
+    simpleSQL      = selectToken("command") + columnSpec("columns") + fromToken + tableNameList("tables")
+
+    # demo runTests method, including embedded comments in test string
+    simpleSQL.runTests("""
+        # '*' as column list and dotted table name
+        select * from SYS.XYZZY
+
+        # caseless match on "SELECT", and casts back to "select"
+        SELECT * from XYZZY, ABC
+
+        # list of column names, and mixed case SELECT keyword
+        Select AA,BB,CC from Sys.dual
+
+        # multiple tables
+        Select A, B, C from Sys.dual, Table2
+
+        # invalid SELECT keyword - should fail
+        Xelect A, B, C from Sys.dual
+
+        # incomplete command - should fail
+        Select
+
+        # invalid column name - should fail
+        Select ^^^ frox Sys.dual
+
+        """)
+
+    pyparsing_common.number.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    # any int or real number, returned as float
+    pyparsing_common.fnumber.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    pyparsing_common.hex_integer.runTests("""
+        100
+        FF
+        """)
+
+    import uuid
+    pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+    pyparsing_common.uuid.runTests("""
+        12345678-1234-5678-1234-567812345678
+        """)
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 46532c0a34..a30a409d48 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,3 @@
 packaging==16.7
-pyparsing==2.0.6
+pyparsing==2.1.8
 six==1.10.0

From a527fa46a1bb7829af90a3bea544709995c4f1ea Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 18 Aug 2016 08:42:56 +0700
Subject: [PATCH 6092/8469] Add missing whitespace after comma.

---
 pkg_resources/__init__.py             | 34 ++++++-------
 pkg_resources/tests/test_resources.py | 70 +++++++++++++--------------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 5821429206..d94e63392d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -752,8 +752,8 @@ def add(self, dist, entry=None, insert=True, replace=False):
 
         if entry is None:
             entry = dist.location
-        keys = self.entry_keys.setdefault(entry,[])
-        keys2 = self.entry_keys.setdefault(dist.location,[])
+        keys = self.entry_keys.setdefault(entry, [])
+        keys2 = self.entry_keys.setdefault(dist.location, [])
         if not replace and dist.key in self.by_key:
             # ignore hidden distros
             return
@@ -1353,7 +1353,7 @@ def get_default_cache():
         # best option, should be locale-safe
         (('APPDATA',), None),
         (('USERPROFILE',), app_data),
-        (('HOMEDRIVE','HOMEPATH'), app_data),
+        (('HOMEDRIVE', 'HOMEPATH'), app_data),
         (('HOMEPATH',), app_data),
         (('HOME',), None),
         # 95/98/ME
@@ -1392,7 +1392,7 @@ def safe_version(version):
         # normalize the version
         return str(packaging.version.Version(version))
     except packaging.version.InvalidVersion:
-        version = version.replace(' ','.')
+        version = version.replace(' ', '.')
         return re.sub('[^A-Za-z0-9.]+', '-', version)
 
 
@@ -1410,7 +1410,7 @@ def to_filename(name):
 
     Any '-' characters are currently replaced with '_'.
     """
-    return name.replace('-','_')
+    return name.replace('-', '_')
 
 
 def invalid_marker(text):
@@ -1508,7 +1508,7 @@ def run_script(self, script_name, namespace):
             cache[script_filename] = (
                 len(script_text), 0, script_text.split('\n'), script_filename
             )
-            script_code = compile(script_text, script_filename,'exec')
+            script_code = compile(script_text, script_filename, 'exec')
             exec(script_code, namespace, namespace)
 
     def _has(self, path):
@@ -1965,7 +1965,7 @@ def find_on_path(importer, path_item, only=False):
         if _is_unpacked_egg(path_item):
             yield Distribution.from_filename(
                 path_item, metadata=PathMetadata(
-                    path_item, os.path.join(path_item,'EGG-INFO')
+                    path_item, os.path.join(path_item, 'EGG-INFO')
                 )
             )
         else:
@@ -2037,7 +2037,7 @@ def _handle_ns(packageName, path_item):
         module = sys.modules[packageName] = types.ModuleType(packageName)
         module.__path__ = []
         _set_parent_ns(packageName)
-    elif not hasattr(module,'__path__'):
+    elif not hasattr(module, '__path__'):
         raise TypeError("Not a package:", packageName)
     handler = _find_adapter(_namespace_handlers, importer)
     subpath = handler(importer, path_item, packageName, module)
@@ -2089,8 +2089,8 @@ def declare_namespace(packageName):
 
         # Track what packages are namespaces, so when new path items are added,
         # they can be updated
-        _namespace_packages.setdefault(parent,[]).append(packageName)
-        _namespace_packages.setdefault(packageName,[])
+        _namespace_packages.setdefault(parent, []).append(packageName)
+        _namespace_packages.setdefault(packageName, [])
 
         for path_item in path:
             # Ensure all the parent's path items are reflected in the child,
@@ -2104,7 +2104,7 @@ def fixup_namespace_packages(path_item, parent=None):
     """Ensure that previously-declared namespace packages include path_item"""
     _imp.acquire_lock()
     try:
-        for package in _namespace_packages.get(parent,()):
+        for package in _namespace_packages.get(parent, ()):
             subpath = _handle_ns(package, path_item)
             if subpath:
                 fixup_namespace_packages(subpath, package)
@@ -2482,7 +2482,7 @@ def _dep_map(self):
                             elif not evaluate_marker(marker):
                                 reqs = []
                         extra = safe_extra(extra) or None
-                    dm.setdefault(extra,[]).extend(parse_requirements(reqs))
+                    dm.setdefault(extra, []).extend(parse_requirements(reqs))
             return dm
 
     def requires(self, extras=()):
@@ -2578,7 +2578,7 @@ def get_entry_map(self, group=None):
                 self._get_metadata('entry_points.txt'), self
             )
         if group is not None:
-            return ep_map.get(group,{})
+            return ep_map.get(group, {})
         return ep_map
 
     def get_entry_info(self, group, name):
@@ -2682,7 +2682,7 @@ def has_version(self):
             return False
         return True
 
-    def clone(self,**kw):
+    def clone(self, **kw):
         """Copy this distribution, substituting in any changed keyword args"""
         names = 'project_name version py_version platform location precedence'
         for attr in names.split():
@@ -2769,7 +2769,7 @@ def reqs_for_extra(extra):
     }
 
 
-def issue_warning(*args,**kw):
+def issue_warning(*args, **kw):
     level = 1
     g = globals()
     try:
@@ -2916,12 +2916,12 @@ def split_sections(s):
     # wrap up last segment
     yield section, content
 
-def _mkstemp(*args,**kw):
+def _mkstemp(*args, **kw):
     old_open = os.open
     try:
         # temporarily bypass sandboxing
         os.open = os_open
-        return tempfile.mkstemp(*args,**kw)
+        return tempfile.mkstemp(*args, **kw)
     finally:
         # and then put it back
         os.open = old_open
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4e7652e3d1..1d663b83b5 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -51,15 +51,15 @@ def testCollection(self):
         assert list(ad) == ['foopkg']
 
         # Distributions sort by version
-        assert [dist.version for dist in ad['FooPkg']] == ['1.4','1.3-1','1.2']
+        assert [dist.version for dist in ad['FooPkg']] == ['1.4', '1.3-1', '1.2']
 
         # Removing a distribution leaves sequence alone
         ad.remove(ad['FooPkg'][1])
-        assert [dist.version for dist in ad['FooPkg']] == ['1.4','1.2']
+        assert [dist.version for dist in ad['FooPkg']] == ['1.4', '1.2']
 
         # And inserting adds them in order
         ad.add(dist_from_fn("FooPkg-1.9.egg"))
-        assert [dist.version for dist in ad['FooPkg']] == ['1.9','1.4','1.2']
+        assert [dist.version for dist in ad['FooPkg']] == ['1.9', '1.4', '1.2']
 
         ws = WorkingSet([])
         foo12 = dist_from_fn("FooPkg-1.2-py2.4.egg")
@@ -86,7 +86,7 @@ def testCollection(self):
         ws.add(foo14)
         assert ad.best_match(req, ws).version == '1.4'
 
-    def checkFooPkg(self,d):
+    def checkFooPkg(self, d):
         assert d.project_name == "FooPkg"
         assert d.key == "foopkg"
         assert d.version == "1.3.post1"
@@ -97,7 +97,7 @@ def checkFooPkg(self,d):
     def testDistroBasics(self):
         d = Distribution(
             "/some/path",
-            project_name="FooPkg",version="1.3-1",py_version="2.4",platform="win32"
+            project_name="FooPkg", version="1.3-1", py_version="2.4", platform="win32"
         )
         self.checkFooPkg(d)
 
@@ -115,7 +115,7 @@ def testDistroMetadata(self):
         d = Distribution(
             "/some/path", project_name="FooPkg", py_version="2.4", platform="win32",
             metadata=Metadata(
-                ('PKG-INFO',"Metadata-Version: 1.0\nVersion: 1.3-1\n")
+                ('PKG-INFO', "Metadata-Version: 1.0\nVersion: 1.3-1\n")
             )
         )
         self.checkFooPkg(d)
@@ -164,7 +164,7 @@ def testResolve(self):
         ad.add(Baz)
 
         # Activation list now includes resolved dependency
-        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) == [Foo,Baz]
+        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) == [Foo, Baz]
         # Requests for conflicting versions produce VersionConflict
         with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
@@ -218,7 +218,7 @@ def test_marker_evaluation_with_extras(self):
         quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info")
         ad.add(quux)
         res = list(ws.resolve(parse_requirements("Foo[baz]"), ad))
-        assert res == [Foo,quux]
+        assert res == [Foo, quux]
 
     def test_marker_evaluation_with_multiple_extras(self):
         ad = pkg_resources.Environment([])
@@ -238,7 +238,7 @@ def test_marker_evaluation_with_multiple_extras(self):
         fred = Distribution.from_filename("/foo_dir/fred-0.1.dist-info")
         ad.add(fred)
         res = list(ws.resolve(parse_requirements("Foo[baz,bar]"), ad))
-        assert sorted(res) == [fred,quux,Foo]
+        assert sorted(res) == [fred, quux, Foo]
 
     def test_marker_evaluation_with_extras_loop(self):
         ad = pkg_resources.Environment([])
@@ -274,19 +274,19 @@ def testDistroDependsOptions(self):
             docutils>=0.3
             [fastcgi]
             fcgiapp>=0.1""")
-        self.checkRequires(d,"Twisted>=1.5")
+        self.checkRequires(d, "Twisted>=1.5")
         self.checkRequires(
-            d,"Twisted>=1.5 ZConfig>=2.0 docutils>=0.3".split(), ["docgen"]
+            d, "Twisted>=1.5 ZConfig>=2.0 docutils>=0.3".split(), ["docgen"]
         )
         self.checkRequires(
-            d,"Twisted>=1.5 fcgiapp>=0.1".split(), ["fastcgi"]
+            d, "Twisted>=1.5 fcgiapp>=0.1".split(), ["fastcgi"]
         )
         self.checkRequires(
-            d,"Twisted>=1.5 ZConfig>=2.0 docutils>=0.3 fcgiapp>=0.1".split(),
-            ["docgen","fastcgi"]
+            d, "Twisted>=1.5 ZConfig>=2.0 docutils>=0.3 fcgiapp>=0.1".split(),
+            ["docgen", "fastcgi"]
         )
         self.checkRequires(
-            d,"Twisted>=1.5 fcgiapp>=0.1 ZConfig>=2.0 docutils>=0.3".split(),
+            d, "Twisted>=1.5 fcgiapp>=0.1 ZConfig>=2.0 docutils>=0.3".split(),
             ["fastcgi", "docgen"]
         )
         with pytest.raises(pkg_resources.UnknownExtra):
@@ -348,7 +348,7 @@ def assertfields(self, ep):
 
     def setup_method(self, method):
         self.dist = Distribution.from_filename(
-            "FooPkg-1.2-py2.4.egg", metadata=Metadata(('requires.txt','[x]')))
+            "FooPkg-1.2-py2.4.egg", metadata=Metadata(('requires.txt', '[x]')))
 
     def testBasics(self):
         ep = EntryPoint(
@@ -405,7 +405,7 @@ def checkSubMap(self, m):
 
     submap_expect = dict(
         feature1=EntryPoint('feature1', 'somemodule', ['somefunction']),
-        feature2=EntryPoint('feature2', 'another.module', ['SomeClass'], ['extra1','extra2']),
+        feature2=EntryPoint('feature2', 'another.module', ['SomeClass'], ['extra1', 'extra2']),
         feature3=EntryPoint('feature3', 'this.module', extras=['something'])
     )
     submap_str = """
@@ -423,7 +423,7 @@ def testParseList(self):
             EntryPoint.parse_group("x", ["foo=baz", "foo=bar"])
 
     def testParseMap(self):
-        m = EntryPoint.parse_map({'xyz':self.submap_str})
+        m = EntryPoint.parse_map({'xyz': self.submap_str})
         self.checkSubMap(m['xyz'])
         assert list(m.keys()) == ['xyz']
         m = EntryPoint.parse_map("[xyz]\n" + self.submap_str)
@@ -480,7 +480,7 @@ def testOptionsAndHashing(self):
             hash((
                 "twisted",
                 packaging.specifiers.SpecifierSet(">=1.2"),
-                frozenset(["foo","bar"]),
+                frozenset(["foo", "bar"]),
                 None
             ))
         )
@@ -521,9 +521,9 @@ def testEmptyParse(self):
         assert list(parse_requirements('')) == []
 
     def testYielding(self):
-        for inp,out in [
-            ([], []), ('x',['x']), ([[]],[]), (' x\n y', ['x','y']),
-            (['x\n\n','y'], ['x','y']),
+        for inp, out in [
+            ([], []), ('x', ['x']), ([[]], []), (' x\n y', ['x', 'y']),
+            (['x\n\n', 'y'], ['x', 'y']),
         ]:
             assert list(pkg_resources.yield_lines(inp)) == out
 
@@ -626,9 +626,9 @@ def test_spaces_between_multiple_versions(self):
         req, = parse_requirements('foo >= 1.0, < 3')
 
     def testVersionEquality(self):
-        def c(s1,s2):
-            p1, p2 = parse_version(s1),parse_version(s2)
-            assert p1 == p2, (s1,s2,p1,p2)
+        def c(s1, s2):
+            p1, p2 = parse_version(s1), parse_version(s2)
+            assert p1 == p2, (s1, s2, p1, p2)
 
         c('1.2-rc1', '1.2rc1')
         c('0.4', '0.4.0')
@@ -642,13 +642,13 @@ def c(s1,s2):
         c('1.2.a', '1.2a')
 
     def testVersionOrdering(self):
-        def c(s1,s2):
-            p1, p2 = parse_version(s1),parse_version(s2)
-            assert p1 < p2, (s1,s2,p1,p2)
+        def c(s1, s2):
+            p1, p2 = parse_version(s1), parse_version(s2)
+            assert p1 < p2, (s1, s2, p1, p2)
 
-        c('2.1','2.1.1')
-        c('2a1','2b0')
-        c('2a1','2.1')
+        c('2.1', '2.1.1')
+        c('2a1', '2b0')
+        c('2a1', '2.1')
         c('2.3a1', '2.3')
         c('2.1-1', '2.1-2')
         c('2.1-1', '2.1.1')
@@ -660,8 +660,8 @@ def c(s1,s2):
         c('0.4', '4.0')
         c('0.0.4', '0.4.0')
         c('0post1', '0.4post1')
-        c('2.1.0-rc1','2.1.0')
-        c('2.1dev','2.1a0')
+        c('2.1.0-rc1', '2.1.0')
+        c('2.1dev', '2.1a0')
 
         torture = """
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1
@@ -669,9 +669,9 @@ def c(s1,s2):
         0.77.2-1 0.77.1-1 0.77.0-1
         """.split()
 
-        for p,v1 in enumerate(torture):
+        for p, v1 in enumerate(torture):
             for v2 in torture[p + 1:]:
-                c(v2,v1)
+                c(v2, v1)
 
     def testVersionBuildout(self):
         """

From 10bf8e72f80925d924abfa6d635ad738233ae79c Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Thu, 18 Aug 2016 09:12:15 +0700
Subject: [PATCH 6093/8469] Fix spacing after comment hash.

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 5821429206..17b69727bd 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2976,7 +2976,7 @@ def _initialize_master_working_set():
     # ensure that all distributions added to the working set in the future
     # (e.g. by calling ``require()``) will get activated as well,
     # with higher priority (replace=True).
-    dist = None # ensure dist is defined for del dist below
+    dist = None  # ensure dist is defined for del dist below
     for dist in working_set:
         dist.activate(replace=False)
     del dist

From 8d1eecaef52a1baf2b9fc6c772880d8c537b562f Mon Sep 17 00:00:00 2001
From: "J. Goutin" <JGoutin@users.noreply.github.com>
Date: Thu, 18 Aug 2016 13:42:07 +0200
Subject: [PATCH 6094/8469] Add numpy version check

---
 setuptools/msvc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 360c1a68de..bffaa6aa40 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -6,6 +6,7 @@
 import platform
 import itertools
 import distutils.errors
+from distutils.version import StrictVersion
 
 from setuptools.extern.six.moves import filterfalse
 
@@ -228,9 +229,9 @@ def msvc14_gen_lib_options(*args, **kwargs):
     """
     if "numpy.distutils" in sys.modules:
         import numpy as np
-        return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
-    else:
-        return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
+        if StrictVersion(np.__version__) < StrictVersion('1.11.2'):
+            return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
+    return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
 
 
 def _augment_exception(exc, version, arch=''):

From 643f0ae4b4330f0cacec3654a7cb1e94a9316618 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 15:57:20 -0400
Subject: [PATCH 6095/8469] Update changelog

---
 CHANGES.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9f098df907..b47465debb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,15 +2,16 @@
 CHANGES
 =======
 
-v25.3.1
+v25.3.0
 -------
 
 * #739 Fix unquoted libpaths by fixing compatibility between `numpy.distutils` and `distutils._msvccompiler` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
 
-v25.3.0
--------
+* #731: Bump certifi.
+
+* Style updates. See #740, #741, #743, #744, #742, #747.
 
-#731: Bump certifi.
+* #735: include license file.
 
 v25.2.0
 -------

From 787383732d45e6565f0e68e268a7157e3198cd8c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 15:57:32 -0400
Subject: [PATCH 6096/8469] =?UTF-8?q?Bump=20version:=2025.2.0=20=E2=86=92?=
 =?UTF-8?q?=2025.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 92fd835400..6e543e94ad 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.2.0
+current_version = 25.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 5fa237d575..4b3bf3fefd 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.2.0",
+    version="25.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 7c32dac163b1d8f1256caf0a4e42ed19ff74d150 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 15:57:32 -0400
Subject: [PATCH 6097/8469] Added tag v25.3.0 for changeset 2371456ae99d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 75a9fb0899..ccc770e240 100644
--- a/.hgtags
+++ b/.hgtags
@@ -301,3 +301,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 76143bb477b50314ab6f4ccc4ced80ee43f0dc94 v25.1.5
 2db4c66aeae47217aaf92099a9875e9e810c9cbb v25.1.6
 2083d7c3fadcf15b3bc07f7532440efbcf8fd18d v25.2.0
+2371456ae99d11187c33deacf1308aded31081d9 v25.3.0

From fc6050ad4c1481be0a1aba1f056e76aa8be50039 Mon Sep 17 00:00:00 2001
From: Daniel Holth <dholth@fastmail.fm>
Date: Fri, 19 Aug 2016 15:58:00 -0400
Subject: [PATCH 6098/8469] changelog

---
 CHANGES.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5a2b992885..3c4b118e70 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,14 @@ v25.1.3
 * #714 and #704: Revert fix as it breaks other components
   downstream that can't handle unicode. See #709, #710,
   and #712.
+* Add Extension(py_limited_api=True). When set to a truthy value,
+  that extension gets a filename apropriate for code using Py_LIMITED_API.
+  When used correctly this allows a single compiled extension to work on
+  all future versions of CPython 3.
+  The py_limited_api argument only controls the filename. To be
+  compatible with multiple versions of Python 3, the C extension
+  will also need to set -DPy_LIMITED_API=... and be modified to use
+  only the functions in the limited API.
 
 v25.1.2
 -------

From c6d604f053b12920d774324b9fa36211fa9e2eaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:01:42 -0400
Subject: [PATCH 6099/8469] Move changelog into a new release

---
 CHANGES.rst | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 10be582143..cd20395205 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,18 @@
 CHANGES
 =======
 
+v25.4.0
+-------
+
+* Add Extension(py_limited_api=True). When set to a truthy value,
+  that extension gets a filename apropriate for code using Py_LIMITED_API.
+  When used correctly this allows a single compiled extension to work on
+  all future versions of CPython 3.
+  The py_limited_api argument only controls the filename. To be
+  compatible with multiple versions of Python 3, the C extension
+  will also need to set -DPy_LIMITED_API=... and be modified to use
+  only the functions in the limited API.
+
 v25.3.0
 -------
 
@@ -44,14 +56,6 @@ v25.1.3
 * #714 and #704: Revert fix as it breaks other components
   downstream that can't handle unicode. See #709, #710,
   and #712.
-* Add Extension(py_limited_api=True). When set to a truthy value,
-  that extension gets a filename apropriate for code using Py_LIMITED_API.
-  When used correctly this allows a single compiled extension to work on
-  all future versions of CPython 3.
-  The py_limited_api argument only controls the filename. To be
-  compatible with multiple versions of Python 3, the C extension
-  will also need to set -DPy_LIMITED_API=... and be modified to use
-  only the functions in the limited API.
 
 v25.1.2
 -------

From c7ee084a4e94b2061f50b7a6633f814cf3caf615 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:02:23 -0400
Subject: [PATCH 6100/8469] Reorganize imports

---
 setuptools/command/build_ext.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 7bb4d24c8c..81d0c32cf3 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -1,12 +1,12 @@
+import os
+import sys
+import itertools
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file
 from distutils.ccompiler import new_compiler
 from distutils.sysconfig import customize_compiler
 from distutils.errors import DistutilsError
 from distutils import log
-import os
-import sys
-import itertools
 
 from setuptools.extension import Library
 
@@ -104,7 +104,7 @@ def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            if (sys.version_info[0] != 2 
+            if (sys.version_info[0] != 2
                 and getattr(ext, 'py_limited_api')
                 and get_abi3_suffix()):
                 from distutils.sysconfig import get_config_var

From a3a04186f0b0b8fb9206f2813a768d655a7acc04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:02:39 -0400
Subject: [PATCH 6101/8469] Move import to top

---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 81d0c32cf3..df8f03fc30 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import itertools
+import imp
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file
 from distutils.ccompiler import new_compiler
@@ -61,7 +62,6 @@ def _customize_compiler_for_shlib(compiler):
 
 def get_abi3_suffix():
     """Return the file extension for an abi3-compliant Extension()"""
-    import imp
     for suffix, _, _ in (s for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION):
         if '.abi3' in suffix:   # Unix
             return suffix

From e3b053192c96cc247c3e12dae78923631397dce7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:05:04 -0400
Subject: [PATCH 6102/8469] Move import to the top

---
 setuptools/command/build_ext.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index df8f03fc30..ca46b22a40 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -5,7 +5,7 @@
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file
 from distutils.ccompiler import new_compiler
-from distutils.sysconfig import customize_compiler
+from distutils.sysconfig import customize_compiler, get_config_var
 from distutils.errors import DistutilsError
 from distutils import log
 
@@ -17,10 +17,8 @@
 except ImportError:
     _build_ext = _du_build_ext
 
-from distutils.sysconfig import get_config_var
-
-get_config_var("LDSHARED")  # make sure _config_vars is initialized
-del get_config_var
+# make sure _config_vars is initialized
+get_config_var("LDSHARED")
 from distutils.sysconfig import _config_vars as _CONFIG_VARS
 
 
@@ -107,7 +105,6 @@ def get_ext_filename(self, fullname):
             if (sys.version_info[0] != 2
                 and getattr(ext, 'py_limited_api')
                 and get_abi3_suffix()):
-                from distutils.sysconfig import get_config_var
                 so_ext = get_config_var('SO')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()

From 097e92abaa7b72815a5eb9c232293ef4bbc1b626 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:06:58 -0400
Subject: [PATCH 6103/8469] Extract variable for boolean expression for nicer
 indentation.

---
 setuptools/command/build_ext.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index ca46b22a40..9caabfd534 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -10,6 +10,7 @@
 from distutils import log
 
 from setuptools.extension import Library
+from setuptools.extern import six
 
 try:
     # Attempt to use Cython for building extensions, if available
@@ -102,9 +103,12 @@ def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            if (sys.version_info[0] != 2
+            use_abi3 = (
+                six.PY3
                 and getattr(ext, 'py_limited_api')
-                and get_abi3_suffix()):
+                and get_abi3_suffix()
+            )
+            if use_abi3:
                 so_ext = get_config_var('SO')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()

From 2cde914c7bc8c8e5a59f937317d47898b38426e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:09:06 -0400
Subject: [PATCH 6104/8469] Use six for python major version detection

---
 setuptools/tests/test_build_ext.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index f2e1f59dbc..0edc92ec7c 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -1,7 +1,9 @@
 import sys
 import distutils.command.build_ext as orig
-
 from distutils.sysconfig import get_config_var
+
+from setuptools.extern import six
+
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
@@ -27,7 +29,7 @@ def test_abi3_filename(self):
         of Python 3 if 'is_abi3' is truthy on Extension()
         """
         print(get_abi3_suffix())
-        
+
         extension = Extension('spam.eggs', ['eggs.c'], py_limited_api=True)
         dist = Distribution(dict(ext_modules=[extension]))
         cmd = build_ext(dist)
@@ -35,9 +37,9 @@ def test_abi3_filename(self):
         assert 'spam.eggs' in cmd.ext_map
         res = cmd.get_ext_filename('spam.eggs')
 
-        if sys.version_info[0] == 2 or not get_abi3_suffix():
+        if six.PY2 or not get_abi3_suffix():
             assert res.endswith(get_config_var('SO'))
         elif sys.platform == 'win32':
             assert res.endswith('eggs.pyd')
         else:
-            assert 'abi3' in res
\ No newline at end of file
+            assert 'abi3' in res

From cea7420c9417f14f6c069dabf1df23055f681af1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:10:05 -0400
Subject: [PATCH 6105/8469] =?UTF-8?q?Bump=20version:=2025.3.0=20=E2=86=92?=
 =?UTF-8?q?=2025.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6e543e94ad..b089c68d3c 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.3.0
+current_version = 25.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 4b3bf3fefd..cd4353d00b 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.3.0",
+    version="25.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 8aae14c12ea79b6d293e40db02c027e1279a46a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:10:05 -0400
Subject: [PATCH 6106/8469] Added tag v25.4.0 for changeset f713f9faaaa3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ccc770e240..06083e1c43 100644
--- a/.hgtags
+++ b/.hgtags
@@ -302,3 +302,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 2db4c66aeae47217aaf92099a9875e9e810c9cbb v25.1.6
 2083d7c3fadcf15b3bc07f7532440efbcf8fd18d v25.2.0
 2371456ae99d11187c33deacf1308aded31081d9 v25.3.0
+f713f9faaaa33c0e9a628dc9322ef8d1fbeb8319 v25.4.0

From a7931d03be180878538bae00c78d93304e5ca09b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:26:18 -0400
Subject: [PATCH 6107/8469] Rewrite test, dynamically generating the .tar.gz
 file, with help from dstufft in #748.

---
 setuptools/tests/test_archive_util.py | 50 ++++++++++-----------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index 3e679c115f..b789e9acef 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -1,5 +1,8 @@
 # coding: utf-8
 
+import tarfile
+import io
+
 from setuptools.extern import six
 
 import pytest
@@ -12,41 +15,24 @@ def tarfile_with_unicode(tmpdir):
     """
     Create a tarfile containing only a file whose name is
     a zero byte file called testimäge.png.
-
-    TODO: Is it possible to generate this file programmatically?
     """
-    data = (
-        b'\x1f\x8b\x08\x00R\xfe\x9fW\x00\x03\xed\xd6AO\x13A\x14\x00'
-        b'\xe0\x11b\x8c\x8d\' z\xf02\x07=x\xd9\xce\xcc\xce\xec\xd4\xc3'
-        b'&\xa21\xb4X\\lI\xa3r0\xc3v\xc1\x8a\xec6\xcbbz3\x1cH\x80x\x93'
-        b'x\xeaQ\x12\x13\x0f$z\xd5\x13\x17\xa9U\x8e&\xfc\x06\x13\xff'
-        b'\x82\xb3\xa5\n\xb6J!\x16\x8c\xf0\xbed2\x9d\xd7\xe9v\xba\xb3'
-        b'\xafo\x8c\xe4\xa8\xaa\xa4=U\xf4\xc2\xa4\xf1 \xf2f\xa3\xd2\xcc'
-        b'\xfa\xcb)\xcf(\xfbS\xa8K\x08!\x16\xe78\xee\xa5%\x1a=a\xdb'
-        b'\xe3\x06FLL\x99\xe4R#\x9cbB%\xa5\x1c\xe1J\xb7\x16\xb0\x97'
-        b'\xb9\xd9H\x85z)\x8fT\xa8\xdc\xe0\xcf\xf3\xf4\xb4\xc9\xc9=\xae'
-        b'\xb3\xfdS\xf0\xcf\xfe?\xc1$.\xab\xe8\xa1m\xb4\xed~\x82\x11'
-        b'\xec\xea\xb1gS.\t%&e,\x8e\xa9\xdd1"S\tf\xe2\xfc\x8dt&{\xcf(zO'
-        b'lj\xe9]d\x8c\xec\n\x97\xfc\xc0\xe6\xdc\x12\x84\x9a2AS?\xc2\xfe'
-        b'\xe3\x92?m\xd3\xc4\xbf\xbe\x05\'Z\xfb\xbew\xff;:\xe5\xbf)dK\xfe'
-        b'\x0b*\x04\xc2\xa4\xfbKiw\xc2\xf3\x1f\x9d>\x7f\x06\xf5 4\xa2\\'
-        b'\xec\xe4\xf1]\xdc\x14\xc7\xd0Y\xdd\x98n\xefu\x8b\xc7\xdf\xf6w'
-        b'\xc9\xc1\xb1\xb1\\\xf3e\xfc\x89\xaan\xf9\x96)\xa7v\xe2\x17\xdc'
-        b'`\xc6(\x86Ay"\xa8\x18*\x8a\xc2\xd2\xc4\x9c~"\xf5\x9b\x95\xea'
-        b'\xeb\xc2\xf0\x95Z2][[t>\xd63\x9f\xb2K\x9b\x1b\xce\xed\xfa\x9d7'
-        b'\xb9W\x85\xdaH\xf6\xf3\x87z\xef\xd2\xe5\x17+\x03\xf3\x0b\xb9'
-        b'\xbe[}\xf3\xe7V\xab+h\xa8w\xbd\xecl\x86\xfd\xce\xf3\x9e/\xd7'
-        b'\x9e\xbe}\xb6|ih||uk\xeb>z\xb7v\xf1\xeb\xdf\xdf\xafcf\xa7\xfa'
-        b'\x1f\xde\xbf@\xc7\xfa\xcfEK\xfe[B\x10\xa8\xffGAW\xe9F\xfd\xefP'
-        b'\xfb\x894\x7f[\xfb\xcd\x14\xcef\xae\x0f\xe6tE/\xdc4\xdc\xd0'
-        b'\xd33\x02\xbf9\xcbJq}f\xe0t\xdf\'\x04~\x95\xeb0\x9c\x10\x8e'
-        b'\xd0a\xd7\xfeX\xa7\xfc\x8f\xf3\xe5\xd7\xfc\xe7\xc2\xe2P\xff'
-        b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-        b'\x008\xa8\xef\xb1g\xe1Z\x00(\x00\x00'
-    )
+    tarobj = io.BytesIO()
+
+    with tarfile.open(fileobj=tarobj, mode="w:gz") as tgz:
+        data = b""
+
+        filename = "testimäge.png"
+        if six.PY2:
+            filename = filename.decode('utf-8')
+
+        t = tarfile.TarInfo(filename)
+        t.size = len(data)
+
+        tgz.addfile(t, io.BytesIO(data))
+
     target = tmpdir / 'unicode-pkg-1.0.tar.gz'
     with open(str(target), mode='wb') as tf:
-        tf.write(data)
+        tf.write(tarobj.getvalue())
     return str(target)
 
 

From c296634d44de4a9715d09e4773b73b2d233fbbc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 19 Aug 2016 16:50:58 -0400
Subject: [PATCH 6108/8469] Pin to pytest < 3 until skip errors can be
 resolved.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index cd4353d00b..db61973500 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=2.8',
+        'pytest>=2.8,<3.0dev',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,

From 08511f5fdfe04a8ea6e3ae73e086e8a29a0a5cd1 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sat, 20 Aug 2016 04:37:32 +0700
Subject: [PATCH 6109/8469] Fix quantity of blank lines after code object,
 class of function definition.

---
 pkg_resources/__init__.py                 | 55 +++++++++++++++++++++++
 pkg_resources/extern/__init__.py          |  2 +
 pkg_resources/tests/test_markers.py       |  1 +
 pkg_resources/tests/test_pkg_resources.py |  8 +++-
 pkg_resources/tests/test_resources.py     |  4 ++
 setuptools/command/build_ext.py           |  2 +
 setuptools/tests/test_build_ext.py        |  1 +
 setuptools/tests/test_manifest.py         |  1 +
 8 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 87455a0d57..033fc8aaef 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -209,10 +209,12 @@ def parse_version(v):
 
 _state_vars = {}
 
+
 def _declare_state(vartype, **kw):
     globals().update(kw)
     _state_vars.update(dict.fromkeys(kw, vartype))
 
+
 def __getstate__():
     state = {}
     g = globals()
@@ -220,25 +222,31 @@ def __getstate__():
         state[k] = g['_sget_' + v](g[k])
     return state
 
+
 def __setstate__(state):
     g = globals()
     for k, v in state.items():
         g['_sset_' + _state_vars[k]](k, g[k], v)
     return state
 
+
 def _sget_dict(val):
     return val.copy()
 
+
 def _sset_dict(key, ob, state):
     ob.clear()
     ob.update(state)
 
+
 def _sget_object(val):
     return val.__getstate__()
 
+
 def _sset_object(key, ob, state):
     ob.__setstate__(state)
 
+
 _sget_none = _sset_none = lambda *args: None
 
 
@@ -265,6 +273,7 @@ def get_supported_platform():
             pass
     return plat
 
+
 __all__ = [
     # Basic resource access and distribution/entry point discovery
     'require', 'run_script', 'get_provider',  'get_distribution',
@@ -311,8 +320,10 @@ def get_supported_platform():
     'run_main', 'AvailableDistributions',
 ]
 
+
 class ResolutionError(Exception):
     """Abstract base for dependency resolution errors"""
+
     def __repr__(self):
         return self.__class__.__name__ + repr(self.args)
 
@@ -391,6 +402,8 @@ def __str__(self):
 
 class UnknownExtra(ResolutionError):
     """Distribution doesn't have an "extra feature" of the given name"""
+
+
 _provider_factories = {}
 
 PY_MAJOR = sys.version[:3]
@@ -400,6 +413,7 @@ class UnknownExtra(ResolutionError):
 CHECKOUT_DIST = 0
 DEVELOP_DIST = -1
 
+
 def register_loader_type(loader_type, provider_factory):
     """Register `provider_factory` to make providers for `loader_type`
 
@@ -409,6 +423,7 @@ def register_loader_type(loader_type, provider_factory):
     """
     _provider_factories[loader_type] = provider_factory
 
+
 def get_provider(moduleOrReq):
     """Return an IResourceProvider for the named module or requirement"""
     if isinstance(moduleOrReq, Requirement):
@@ -421,6 +436,7 @@ def get_provider(moduleOrReq):
     loader = getattr(module, '__loader__', None)
     return _find_adapter(_provider_factories, loader)(module)
 
+
 def _macosx_vers(_cache=[]):
     if not _cache:
         version = platform.mac_ver()[0]
@@ -436,9 +452,11 @@ def _macosx_vers(_cache=[]):
         _cache.append(version.split('.'))
     return _cache[0]
 
+
 def _macosx_arch(machine):
     return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
 
+
 def get_build_platform():
     """Return this platform's string for platform-specific distributions
 
@@ -464,6 +482,7 @@ def get_build_platform():
             pass
     return plat
 
+
 macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)")
 darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)")
 # XXX backward compat
@@ -524,9 +543,11 @@ def run_script(dist_spec, script_name):
     ns['__name__'] = name
     require(dist_spec)[0].run_script(script_name, ns)
 
+
 # backward compatibility
 run_main = run_script
 
+
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
     if isinstance(dist, six.string_types):
@@ -537,14 +558,17 @@ def get_distribution(dist):
         raise TypeError("Expected string, Requirement, or Distribution", dist)
     return dist
 
+
 def load_entry_point(dist, group, name):
     """Return `name` entry point of `group` for `dist` or raise ImportError"""
     return get_distribution(dist).load_entry_point(group, name)
 
+
 def get_entry_map(dist, group=None):
     """Return the entry point map for `group`, or the full entry map"""
     return get_distribution(dist).get_entry_map(group)
 
+
 def get_entry_info(dist, group, name):
     """Return the EntryPoint object for `group`+`name`, or ``None``"""
     return get_distribution(dist).get_entry_info(group, name)
@@ -1332,6 +1356,7 @@ def cleanup_resources(self, force=False):
         """
         # XXX
 
+
 def get_default_cache():
     """Determine the default cache location
 
@@ -1376,6 +1401,7 @@ def get_default_cache():
             "Please set the PYTHON_EGG_CACHE environment variable"
         )
 
+
 def safe_name(name):
     """Convert an arbitrary string to a standard distribution name
 
@@ -1538,6 +1564,7 @@ def _get(self, path):
             "Can't perform this operation for loaders without 'get_data()'"
         )
 
+
 register_loader_type(object, NullProvider)
 
 
@@ -1562,6 +1589,7 @@ def _setup_prefix(self):
             old = path
             path, base = os.path.split(path)
 
+
 class DefaultProvider(EggProvider):
     """Provides access to package resources in the filesystem"""
 
@@ -1587,6 +1615,7 @@ def _register(cls):
             type(None))
         register_loader_type(loader_cls, cls)
 
+
 DefaultProvider._register()
 
 
@@ -1601,6 +1630,7 @@ class EmptyProvider(NullProvider):
     def __init__(self):
         pass
 
+
 empty_provider = EmptyProvider()
 
 
@@ -1836,6 +1866,7 @@ def _eager_to_zip(self, resource_name):
     def _resource_to_zip(self, resource_name):
         return self._zipinfo_name(self._fn(self.module_path, resource_name))
 
+
 register_loader_type(zipimport.zipimporter, ZipProvider)
 
 
@@ -1913,8 +1944,10 @@ def __init__(self, importer):
             self.module_path = importer.archive
         self._setup_prefix()
 
+
 _declare_state('dict', _distribution_finders={})
 
+
 def register_finder(importer_type, distribution_finder):
     """Register `distribution_finder` to find distributions in sys.path items
 
@@ -1931,6 +1964,7 @@ def find_distributions(path_item, only=False):
     finder = _find_adapter(_distribution_finders, importer)
     return finder(importer, path_item, only)
 
+
 def find_eggs_in_zip(importer, path_item, only=False):
     """
     Find eggs in zip files; possibly multiple nested eggs.
@@ -1951,12 +1985,17 @@ def find_eggs_in_zip(importer, path_item, only=False):
             for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
                 yield dist
 
+
 register_finder(zipimport.zipimporter, find_eggs_in_zip)
 
+
 def find_nothing(importer, path_item, only=False):
     return ()
+
+
 register_finder(object, find_nothing)
 
+
 def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
@@ -1997,6 +2036,8 @@ def find_on_path(importer, path_item, only=False):
                         for item in dists:
                             yield item
                         break
+
+
 register_finder(pkgutil.ImpImporter, find_on_path)
 
 if hasattr(importlib_machinery, 'FileFinder'):
@@ -2023,6 +2064,7 @@ def namespace_handler(importer, path_entry, moduleName, module):
     """
     _namespace_handlers[importer_type] = namespace_handler
 
+
 def _handle_ns(packageName, path_item):
     """Ensure that named package includes a subpath of path_item (if needed)"""
 
@@ -2055,6 +2097,7 @@ def _rebuild_mod_path(orig_path, package_name, module):
     corresponding to their sys.path order
     """
     sys_path = [_normalize_cached(p) for p in sys.path]
+
     def position_in_sys_path(path):
         """
         Return the ordinal of the path based on its position in sys.path
@@ -2100,6 +2143,7 @@ def declare_namespace(packageName):
     finally:
         _imp.release_lock()
 
+
 def fixup_namespace_packages(path_item, parent=None):
     """Ensure that previously-declared namespace packages include path_item"""
     _imp.acquire_lock()
@@ -2111,6 +2155,7 @@ def fixup_namespace_packages(path_item, parent=None):
     finally:
         _imp.release_lock()
 
+
 def file_ns_handler(importer, path_item, packageName, module):
     """Compute an ns-package subpath for a filesystem or zipfile importer"""
 
@@ -2123,6 +2168,7 @@ def file_ns_handler(importer, path_item, packageName, module):
         # Only return the path if it's not already there
         return subpath
 
+
 register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
 
@@ -2133,6 +2179,7 @@ def file_ns_handler(importer, path_item, packageName, module):
 def null_ns_handler(importer, path_item, packageName, module):
     return None
 
+
 register_namespace_handler(object, null_ns_handler)
 
 
@@ -2140,6 +2187,7 @@ def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
     return os.path.normcase(os.path.realpath(filename))
 
+
 def _normalize_cached(filename, _cache={}):
     try:
         return _cache[filename]
@@ -2147,6 +2195,7 @@ def _normalize_cached(filename, _cache={}):
         _cache[filename] = result = normalize_path(filename)
         return result
 
+
 def _is_unpacked_egg(path):
     """
     Determine if given path appears to be an unpacked egg.
@@ -2155,6 +2204,7 @@ def _is_unpacked_egg(path):
         path.lower().endswith('.egg')
     )
 
+
 def _set_parent_ns(packageName):
     parts = packageName.split('.')
     name = parts.pop()
@@ -2176,6 +2226,7 @@ def yield_lines(strs):
             for s in yield_lines(ss):
                 yield s
 
+
 MODULE = re.compile(r"\w+(\.\w+)*$").match
 EGG_NAME = re.compile(
     r"""
@@ -2783,6 +2834,7 @@ def issue_warning(*args, **kw):
 
 
 class RequirementParseError(ValueError):
+
     def __str__(self):
         return ' '.join(self.args)
 
@@ -2807,6 +2859,7 @@ def parse_requirements(strs):
 
 
 class Requirement(packaging.requirements.Requirement):
+
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         try:
@@ -2867,6 +2920,7 @@ class cls(cls, object):
         return cls.__mro__[1:]
     return cls.__mro__
 
+
 def _find_adapter(registry, ob):
     """Return an adapter factory for `ob` from `registry`"""
     for t in _get_mro(getattr(ob, '__class__', type(ob))):
@@ -2916,6 +2970,7 @@ def split_sections(s):
     # wrap up last segment
     yield section, content
 
+
 def _mkstemp(*args, **kw):
     old_open = os.open
     try:
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 6758d36f11..492f66f10d 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -6,6 +6,7 @@ class VendorImporter:
     A PEP 302 meta path importer for finding optionally-vendored
     or otherwise naturally-installed packages from root_name.
     """
+
     def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
         self.root_name = root_name
         self.vendored_names = set(vendored_names)
@@ -67,5 +68,6 @@ def install(self):
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 
+
 names = 'packaging', 'pyparsing', 'six'
 VendorImporter(__name__, names).install()
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 8d451de3c1..78810b6ef6 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -5,6 +5,7 @@
 
 from pkg_resources import evaluate_marker
 
+
 @mock.patch('platform.python_version', return_value='2.7.10')
 def test_ordering(python_version_mock):
     assert evaluate_marker("python_full_version > '2.7.3'") is True
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 8b276ffcfd..361fe65767 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -24,6 +24,7 @@
 except NameError:
     unicode = str
 
+
 def timestamp(dt):
     """
     Return a timestamp for a local, naive datetime instance.
@@ -34,13 +35,16 @@ def timestamp(dt):
         # Python 3.2 and earlier
         return time.mktime(dt.timetuple())
 
+
 class EggRemover(unicode):
+
     def __call__(self):
         if self in sys.path:
             sys.path.remove(self)
         if os.path.exists(self):
             os.remove(self)
 
+
 class TestZipProvider(object):
     finalizers = []
 
@@ -94,7 +98,9 @@ def test_resource_filename_rewrites_on_change(self):
         assert f.read() == 'hello, world!'
         manager.cleanup_resources()
 
+
 class TestResourceManager(object):
+
     def test_get_cache_path(self):
         mgr = pkg_resources.ResourceManager()
         path = mgr.get_cache_path('foo')
@@ -107,6 +113,7 @@ class TestIndependence:
     """
     Tests to ensure that pkg_resources runs independently from setuptools.
     """
+
     def test_setuptools_not_imported(self):
         """
         In a separate Python environment, import pkg_resources and assert
@@ -122,7 +129,6 @@ def test_setuptools_not_imported(self):
         subprocess.check_call(cmd)
 
 
-
 class TestDeepVersionLookupDistutils(object):
 
     @pytest.fixture
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 1d663b83b5..2ed5623359 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -34,6 +34,7 @@ def get_metadata_lines(self, name):
 
 dist_from_fn = pkg_resources.Distribution.from_filename
 
+
 class TestDistro:
 
     def testCollection(self):
@@ -294,6 +295,7 @@ def testDistroDependsOptions(self):
 
 
 class TestWorkingSet:
+
     def test_find_conflicting(self):
         ws = WorkingSet([])
         Foo = Distribution.from_filename("/foo_dir/Foo-1.2.egg")
@@ -380,6 +382,7 @@ def testParse(self):
         assert ep.name == 'html+mako'
 
     reject_specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2"
+
     @pytest.mark.parametrize("reject_spec", reject_specs)
     def test_reject_spec(self, reject_spec):
         with pytest.raises(ValueError):
@@ -434,6 +437,7 @@ def testParseMap(self):
         with pytest.raises(ValueError):
             EntryPoint.parse_map(self.submap_str)
 
+
 class TestRequirements:
 
     def testBasics(self):
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 9caabfd534..f994b62654 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -59,6 +59,7 @@ def _customize_compiler_for_shlib(compiler):
 
 if_dl = lambda s: s if have_rtld else ''
 
+
 def get_abi3_suffix():
     """Return the file extension for an abi3-compliant Extension()"""
     for suffix, _, _ in (s for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION):
@@ -67,6 +68,7 @@ def get_abi3_suffix():
         elif suffix == '.pyd':  # Windows
             return suffix
 
+
 class build_ext(_build_ext):
 
     def run(self):
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 0edc92ec7c..ac002f44ec 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -8,6 +8,7 @@
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
 
+
 class TestBuildExt:
 
     def test_get_ext_filename(self):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 6e67ca6146..6360270d5b 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -51,6 +51,7 @@ def quiet():
 def touch(filename):
     open(filename, 'w').close()
 
+
 # The set of files always in the manifest, including all files in the
 # .egg-info directory
 default_files = frozenset(map(make_local_path, [

From e3ffde678c36ca778476574194cdc6d436d82263 Mon Sep 17 00:00:00 2001
From: stepshal <stepshal@users.noreply.github.com>
Date: Sat, 20 Aug 2016 08:15:52 +0700
Subject: [PATCH 6110/8469] Remove trailing whitespace. (#751)

---
 setuptools/msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index bffaa6aa40..26e399cc1c 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -223,7 +223,7 @@ def msvc14_get_vc_env(plat_spec):
 
 def msvc14_gen_lib_options(*args, **kwargs):
     """
-    Patched "distutils._msvccompiler.gen_lib_options" for fix 
+    Patched "distutils._msvccompiler.gen_lib_options" for fix
     compatibility between "numpy.distutils" and "distutils._msvccompiler"
     (for Numpy < 1.11.2)
     """

From d687531884ee25d5a517d529b2fd535831b70115 Mon Sep 17 00:00:00 2001
From: Torsten Landschoff <torsten.landschoff@scale.eu>
Date: Sat, 20 Aug 2016 09:23:24 +0200
Subject: [PATCH 6111/8469] Make Extension accept positional arguments again
 (fixes #752).

As a side effect, py_limited_api may now only be passed as keyword
argument. I think it is early enough for this feature to change this
and enforce the flag to be passed as a keyword...
---
 setuptools/extension.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/extension.py b/setuptools/extension.py
index da94c3fa6c..f8058b729f 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -36,9 +36,11 @@ def _have_cython():
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
-    def __init__(self, name, sources, py_limited_api=False, **kw):
-        self.py_limited_api = py_limited_api
-        _Extension.__init__(self, name, sources, **kw)
+    def __init__(self, name, sources, *args, **kw):
+        # The *args is needed for compatibility as calls may use positional
+        # arguments. py_limited_api may be set only via keyword.
+        self.py_limited_api = kw.pop("py_limited_api", False)
+        _Extension.__init__(self, name, sources, *args, **kw)
 
     def _convert_pyx_sources_to_lang(self):
         """

From 06df852e7cda567b6f8ab6831486285f0e2989a4 Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Sat, 20 Aug 2016 15:10:57 +0300
Subject: [PATCH 6112/8469] fix tests on windows (#754)

- have tox pass env variables used by setuptools on windows.
---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 8c09e7df18..7ce7ce4152 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,4 +2,5 @@
 envlist = py26,py27,py33,py34,py35,pypy,pypy3
 
 [testenv]
+passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
 commands=python setup.py test

From 735a66a5588aadcf02a10b58338d476803916b99 Mon Sep 17 00:00:00 2001
From: Ofekmeister <ofekmeister@gmail.com>
Date: Sat, 20 Aug 2016 13:37:33 -0400
Subject: [PATCH 6113/8469] Make import unconditional

Put import on top and updated CHANGES.rst
---
 CHANGES.rst                           | 3 +++
 setuptools/command/easy_install.py    | 2 +-
 setuptools/tests/test_easy_install.py | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cd20395205..cc027f4118 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ CHANGES
 v25.4.0
 -------
 
+* #459 via #736: On Windows systems, sys.argv[0] now correctly becomes the
+  name of entry point.
+
 * Add Extension(py_limited_api=True). When set to a truthy value,
   that extension gets a filename apropriate for code using Py_LIMITED_API.
   When used correctly this allows a single compiled extension to work on
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e2a7dc46c9..5065661fa7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2018,11 +2018,11 @@ class ScriptWriter(object):
     template = textwrap.dedent("""
         # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
         __requires__ = %(spec)r
+        import re
         import sys
         from pkg_resources import load_entry_point
 
         if __name__ == '__main__':
-            import re
             sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
             sys.exit(
                 load_entry_point(%(spec)r, %(group)r, %(name)r)()
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index a4b1dfd528..82e1d7e8b8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -74,11 +74,11 @@ def test_get_script_args(self):
         expected = header + DALS("""
             # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
             __requires__ = 'spec'
+            import re
             import sys
             from pkg_resources import load_entry_point
 
             if __name__ == '__main__':
-                import re
                 sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
                 sys.exit(
                     load_entry_point('spec', 'console_scripts', 'name')()

From 774707dce2a31748382aaa019848014a17d0a04a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 17:31:07 -0400
Subject: [PATCH 6114/8469] Issue #27819: Simply default to gztar for sdist
 formats by default on all platforms.

---
 command/sdist.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 35a06eb09b..f1b8d91977 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -91,9 +91,6 @@ def checking_metadata(self):
     negative_opt = {'no-defaults': 'use-defaults',
                     'no-prune': 'prune' }
 
-    default_format = {'posix': 'gztar',
-                      'nt': 'zip' }
-
     sub_commands = [('check', checking_metadata)]
 
     def initialize_options(self):
@@ -110,7 +107,7 @@ def initialize_options(self):
         self.manifest_only = 0
         self.force_manifest = 0
 
-        self.formats = None
+        self.formats = ['gztar']
         self.keep_temp = 0
         self.dist_dir = None
 
@@ -126,13 +123,6 @@ def finalize_options(self):
             self.template = "MANIFEST.in"
 
         self.ensure_string_list('formats')
-        if self.formats is None:
-            try:
-                self.formats = [self.default_format[os.name]]
-            except KeyError:
-                raise DistutilsPlatformError(
-                      "don't know how to create source distributions "
-                      "on platform %s" % os.name)
 
         bad_format = archive_util.check_archive_formats(self.formats)
         if bad_format:

From b9baa94e18e91671f9acde4e0e033be1391a7fde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 17:44:54 -0400
Subject: [PATCH 6115/8469] Default to gztar for sdists on all platforms. Ref
 #748.

---
 CHANGES.rst                 |  7 +++++++
 setuptools/command/sdist.py | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index cd20395205..c6839a0d54 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v26.0.0
+-------
+
+* #748: By default, sdists are now produced in gzipped tarfile
+  format by default on all platforms, adding forward compatibility
+  for the same behavior in Python 3.6 (See Python #27819).
+
 v25.4.0
 -------
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index b6125f5888..1d4f5d5489 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -66,6 +66,17 @@ def run(self):
             if data not in dist_files:
                 dist_files.append(data)
 
+    def initialize_options(self):
+        orig.sdist.initialize_options(self)
+
+        self._default_to_gztar()
+
+    def _default_to_gztar(self):
+        # only needed on Python prior to 3.6.
+        if sys.version_info >= (3, 6, 0, 'beta', 1):
+            return
+        self.formats = ['gztar']
+
     def make_distribution(self):
         """
         Workaround for #516

From 0a603394831bbd9d837994aea5fa0342cc7b0291 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 17:50:41 -0400
Subject: [PATCH 6116/8469] Update changelog

---
 CHANGES.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 065c77baa0..e23c4e94b6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,12 +9,14 @@ v26.0.0
   format by default on all platforms, adding forward compatibility
   for the same behavior in Python 3.6 (See Python #27819).
 
+* #459 via #736: On Windows with script launchers,
+  sys.argv[0] now reflects
+  the name of the entry point, consistent with the behavior in
+  distlib and pip wrappers.
+
 v25.4.0
 -------
 
-* #459 via #736: On Windows systems, sys.argv[0] now correctly becomes the
-  name of entry point.
-
 * Add Extension(py_limited_api=True). When set to a truthy value,
   that extension gets a filename apropriate for code using Py_LIMITED_API.
   When used correctly this allows a single compiled extension to work on

From 6883ff3b2832a0197d52d3d8f0640ae41f52b312 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 18:27:10 -0400
Subject: [PATCH 6117/8469] Update changelog

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e23c4e94b6..5e5bd61406 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,9 @@ v26.0.0
   the name of the entry point, consistent with the behavior in
   distlib and pip wrappers.
 
+* #752 via #753: When indicating ``py_limited_api`` to Extension,
+  it must be passed as a keyword argument.
+
 v25.4.0
 -------
 

From 22501ae355cbefcea9a58fe7c4ac4395250c1aca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 18:27:14 -0400
Subject: [PATCH 6118/8469] =?UTF-8?q?Bump=20version:=2025.4.0=20=E2=86=92?=
 =?UTF-8?q?=2026.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b089c68d3c..cf5d01a8d8 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 25.4.0
+current_version = 26.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index db61973500..16d752feac 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="25.4.0",
+    version="26.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b51be80bd1496a2c5338f41dc7c663409c1b53a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 18:27:14 -0400
Subject: [PATCH 6119/8469] Added tag v26.0.0 for changeset 7cb13a0cd176

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 06083e1c43..6e59e31847 100644
--- a/.hgtags
+++ b/.hgtags
@@ -303,3 +303,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 2083d7c3fadcf15b3bc07f7532440efbcf8fd18d v25.2.0
 2371456ae99d11187c33deacf1308aded31081d9 v25.3.0
 f713f9faaaa33c0e9a628dc9322ef8d1fbeb8319 v25.4.0
+7cb13a0cd176f39500701b24dbfec603ead5110c v26.0.0

From 64727bb4d1eb2a44d2b9a67be8d7c613fe78ccef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Aug 2016 20:21:01 -0400
Subject: [PATCH 6120/8469] Issue is fixed, so just exclude the offending
 version.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 16d752feac..f3084a4e04 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=2.8,<3.0dev',
+        'pytest>=2.8,!=3.0.0',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,

From 1aa71905fc9bd9a13f2b0c371e869ae8eb27308c Mon Sep 17 00:00:00 2001
From: stepshal <stepshal@users.noreply.github.com>
Date: Mon, 22 Aug 2016 19:25:13 +0700
Subject: [PATCH 6121/8469] Make exactly one space after comma. (#756)

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 033fc8aaef..27d70a60a4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -276,7 +276,7 @@ def get_supported_platform():
 
 __all__ = [
     # Basic resource access and distribution/entry point discovery
-    'require', 'run_script', 'get_provider',  'get_distribution',
+    'require', 'run_script', 'get_provider', 'get_distribution',
     'load_entry_point', 'get_entry_map', 'get_entry_info',
     'iter_entry_points',
     'resource_string', 'resource_stream', 'resource_filename',

From 452e13ce06ca0cdebebc61c9326a2db184095353 Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Sat, 30 Jul 2016 16:52:11 +0300
Subject: [PATCH 6122/8469] fix for extra names containing '-'

---
 pkg_resources/__init__.py             |  6 +++---
 pkg_resources/tests/test_resources.py | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 27d70a60a4..80da5c1879 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1428,7 +1428,7 @@ def safe_extra(extra):
     Any runs of non-alphanumeric characters are replaced with a single '_',
     and the result is always lowercased.
     """
-    return re.sub('[^A-Za-z0-9.]+', '_', extra).lower()
+    return re.sub('[^A-Za-z0-9.-]+', '_', extra).lower()
 
 
 def to_filename(name):
@@ -2807,8 +2807,8 @@ def reqs_for_extra(extra):
         dm[None].extend(common)
 
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
-            extra = safe_extra(extra.strip())
-            dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
+            s_extra = safe_extra(extra.strip())
+            dm[s_extra] = list(frozenset(reqs_for_extra(extra)) - common)
 
         return dm
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 2ed5623359..3b13884b94 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -221,6 +221,24 @@ def test_marker_evaluation_with_extras(self):
         res = list(ws.resolve(parse_requirements("Foo[baz]"), ad))
         assert res == [Foo, quux]
 
+    def test_marker_evaluation_with_extras_normlized(self):
+        """Extras are also evaluated as markers at resolution time."""
+        ad = pkg_resources.Environment([])
+        ws = WorkingSet([])
+        # Metadata needs to be native strings due to cStringIO behaviour in
+        # 2.6, so use str().
+        Foo = Distribution.from_filename(
+            "/foo_dir/Foo-1.2.dist-info",
+            metadata=Metadata(("METADATA", str("Provides-Extra: baz-lightyear\n"
+                               "Requires-Dist: quux; extra=='baz-lightyear'")))
+        )
+        ad.add(Foo)
+        assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo]
+        quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info")
+        ad.add(quux)
+        res = list(ws.resolve(parse_requirements("Foo[baz-lightyear]"), ad))
+        assert res == [Foo, quux]
+
     def test_marker_evaluation_with_multiple_extras(self):
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])

From 96ec2c80e6e7943e8413c07e487ee1eed7d135e7 Mon Sep 17 00:00:00 2001
From: matejcik <jmatejek@suse.com>
Date: Wed, 24 Aug 2016 18:12:02 +0200
Subject: [PATCH 6123/8469] add SUSE cert bundle location

---
 setuptools/ssl_support.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index f4ba8a92d6..e95dc071dc 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -26,6 +26,7 @@
 /etc/ssl/cert.pem
 /System/Library/OpenSSL/certs/cert.pem
 /usr/local/share/certs/ca-root-nss.crt
+/etc/ssl/ca-bundle.pem
 """.strip().split()
 
 

From 7576d32d009142030ae64a867d407c536bad9752 Mon Sep 17 00:00:00 2001
From: matejcik <jmatejek@suse.com>
Date: Wed, 24 Aug 2016 18:12:32 +0200
Subject: [PATCH 6124/8469] reference certifi pem bundle properly

---
 setuptools/ssl_support.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index e95dc071dc..1627263027 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -243,6 +243,7 @@ def find_ca_bundle():
             if os.path.isfile(cert_path):
                 return cert_path
     try:
-        return pkg_resources.resource_filename('certifi', 'cacert.pem')
+        import certifi
+        return certifi.where()
     except (ImportError, ResolutionError, ExtractionError):
         return None

From 691e6ac03339d6aef045e05872b286d91e9f49b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Aug 2016 08:45:33 -0400
Subject: [PATCH 6125/8469] Add appdirs as vendored package. Ref #763.

---
 pavement.py                                   |   2 +
 pkg_resources/_vendor/appdirs.py              | 552 ++++++++++++++++++
 pkg_resources/_vendor/packaging/specifiers.py |   2 +-
 pkg_resources/_vendor/vendored.txt            |   1 +
 pkg_resources/extern/__init__.py              |   2 +-
 5 files changed, 557 insertions(+), 2 deletions(-)
 create mode 100644 pkg_resources/_vendor/appdirs.py

diff --git a/pavement.py b/pavement.py
index 3d8400865f..f85617d4fe 100644
--- a/pavement.py
+++ b/pavement.py
@@ -12,9 +12,11 @@ def remove_all(paths):
 @task
 def update_vendored():
     vendor = Path('pkg_resources/_vendor')
+    # pip uninstall doesn't support -t, so do it manually
     remove_all(vendor.glob('packaging*'))
     remove_all(vendor.glob('six*'))
     remove_all(vendor.glob('pyparsing*'))
+    remove_all(vendor.glob('appdirs*'))
     install_args = [
         'install',
         '-r', str(vendor / 'vendored.txt'),
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
new file mode 100644
index 0000000000..f4dba0953c
--- /dev/null
+++ b/pkg_resources/_vendor/appdirs.py
@@ -0,0 +1,552 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2010 ActiveState Software Inc.
+# Copyright (c) 2013 Eddy Petrișor
+
+"""Utilities for determining application-specific dirs.
+
+See <http://github.com/ActiveState/appdirs> for details and usage.
+"""
+# Dev Notes:
+# - MSDN on where to store app data files:
+#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
+# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
+# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+__version_info__ = (1, 4, 0)
+__version__ = '.'.join(map(str, __version_info__))
+
+
+import sys
+import os
+
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    unicode = str
+
+if sys.platform.startswith('java'):
+    import platform
+    os_name = platform.java_ver()[3][0]
+    if os_name.startswith('Windows'): # "Windows XP", "Windows 7", etc.
+        system = 'win32'
+    elif os_name.startswith('Mac'): # "Mac OS X", etc.
+        system = 'darwin'
+    else: # "Linux", "SunOS", "FreeBSD", etc.
+        # Setting this to "linux2" is not ideal, but only Windows or Mac
+        # are actually checked for and the rest of the module expects
+        # *sys.platform* style strings.
+        system = 'linux2'
+else:
+    system = sys.platform
+
+
+
+def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
+    r"""Return full path to the user-specific data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "roaming" (boolean, default False) can be set True to use the Windows
+            roaming appdata directory. That means that for users on a Windows
+            network setup for roaming profiles, this user data will be
+            sync'd on login. See
+            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
+            for a discussion of issues.
+
+    Typical user data directories are:
+        Mac OS X:               ~/Library/Application Support/<AppName>
+        Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
+        Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
+        Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
+        Win 7  (not roaming):   C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>
+        Win 7  (roaming):       C:\Users\<username>\AppData\Roaming\<AppAuthor>\<AppName>
+
+    For Unix, we follow the XDG spec and support $XDG_DATA_HOME.
+    That means, by default "~/.local/share/<AppName>".
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
+        path = os.path.normpath(_get_win_folder(const))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+    elif system == 'darwin':
+        path = os.path.expanduser('~/Library/Application Support/')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        path = os.getenv('XDG_DATA_HOME', os.path.expanduser("~/.local/share"))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
+    """Return full path to the user-shared data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "multipath" is an optional parameter only applicable to *nix
+            which indicates that the entire list of data dirs should be
+            returned. By default, the first item from XDG_DATA_DIRS is
+            returned, or '/usr/local/share/<AppName>',
+            if XDG_DATA_DIRS is not set
+
+    Typical user data directories are:
+        Mac OS X:   /Library/Application Support/<AppName>
+        Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
+        Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
+        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
+        Win 7:      C:\ProgramData\<AppAuthor>\<AppName>   # Hidden, but writeable on Win 7.
+
+    For Unix, this is using the $XDG_DATA_DIRS[0] default.
+
+    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        path = os.path.normpath(_get_win_folder("CSIDL_COMMON_APPDATA"))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+    elif system == 'darwin':
+        path = os.path.expanduser('/Library/Application Support')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        # XDG default for $XDG_DATA_DIRS
+        # only first, if multipath is False
+        path = os.getenv('XDG_DATA_DIRS',
+                         os.pathsep.join(['/usr/local/share', '/usr/share']))
+        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
+        if appname:
+            if version:
+                appname = os.path.join(appname, version)
+            pathlist = [os.sep.join([x, appname]) for x in pathlist]
+
+        if multipath:
+            path = os.pathsep.join(pathlist)
+        else:
+            path = pathlist[0]
+        return path
+
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
+    r"""Return full path to the user-specific config dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "roaming" (boolean, default False) can be set True to use the Windows
+            roaming appdata directory. That means that for users on a Windows
+            network setup for roaming profiles, this user data will be
+            sync'd on login. See
+            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
+            for a discussion of issues.
+
+    Typical user data directories are:
+        Mac OS X:               same as user_data_dir
+        Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
+        Win *:                  same as user_data_dir
+
+    For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME.
+    That means, by deafult "~/.config/<AppName>".
+    """
+    if system in ["win32", "darwin"]:
+        path = user_data_dir(appname, appauthor, None, roaming)
+    else:
+        path = os.getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config"))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def site_config_dir(appname=None, appauthor=None, version=None, multipath=False):
+    """Return full path to the user-shared data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "multipath" is an optional parameter only applicable to *nix
+            which indicates that the entire list of config dirs should be
+            returned. By default, the first item from XDG_CONFIG_DIRS is
+            returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
+
+    Typical user data directories are:
+        Mac OS X:   same as site_data_dir
+        Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
+                    $XDG_CONFIG_DIRS
+        Win *:      same as site_data_dir
+        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
+
+    For Unix, this is using the $XDG_CONFIG_DIRS[0] default, if multipath=False
+
+    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
+    """
+    if system in ["win32", "darwin"]:
+        path = site_data_dir(appname, appauthor)
+        if appname and version:
+            path = os.path.join(path, version)
+    else:
+        # XDG default for $XDG_CONFIG_DIRS
+        # only first, if multipath is False
+        path = os.getenv('XDG_CONFIG_DIRS', '/etc/xdg')
+        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
+        if appname:
+            if version:
+                appname = os.path.join(appname, version)
+            pathlist = [os.sep.join([x, appname]) for x in pathlist]
+
+        if multipath:
+            path = os.pathsep.join(pathlist)
+        else:
+            path = pathlist[0]
+    return path
+
+
+def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
+    r"""Return full path to the user-specific cache dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "opinion" (boolean) can be False to disable the appending of
+            "Cache" to the base app data dir for Windows. See
+            discussion below.
+
+    Typical user cache directories are:
+        Mac OS X:   ~/Library/Caches/<AppName>
+        Unix:       ~/.cache/<AppName> (XDG default)
+        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
+        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
+
+    On Windows the only suggestion in the MSDN docs is that local settings go in
+    the `CSIDL_LOCAL_APPDATA` directory. This is identical to the non-roaming
+    app data dir (the default returned by `user_data_dir` above). Apps typically
+    put cache data somewhere *under* the given dir here. Some examples:
+        ...\Mozilla\Firefox\Profiles\<ProfileName>\Cache
+        ...\Acme\SuperApp\Cache\1.0
+    OPINION: This function appends "Cache" to the `CSIDL_LOCAL_APPDATA` value.
+    This can be disabled with the `opinion=False` option.
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        path = os.path.normpath(_get_win_folder("CSIDL_LOCAL_APPDATA"))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+            if opinion:
+                path = os.path.join(path, "Cache")
+    elif system == 'darwin':
+        path = os.path.expanduser('~/Library/Caches')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        path = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
+    r"""Return full path to the user-specific log dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "opinion" (boolean) can be False to disable the appending of
+            "Logs" to the base app data dir for Windows, and "log" to the
+            base cache dir for Unix. See discussion below.
+
+    Typical user cache directories are:
+        Mac OS X:   ~/Library/Logs/<AppName>
+        Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
+        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
+        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
+
+    On Windows the only suggestion in the MSDN docs is that local settings
+    go in the `CSIDL_LOCAL_APPDATA` directory. (Note: I'm interested in
+    examples of what some windows apps use for a logs dir.)
+
+    OPINION: This function appends "Logs" to the `CSIDL_LOCAL_APPDATA`
+    value for Windows and appends "log" to the user cache dir for Unix.
+    This can be disabled with the `opinion=False` option.
+    """
+    if system == "darwin":
+        path = os.path.join(
+            os.path.expanduser('~/Library/Logs'),
+            appname)
+    elif system == "win32":
+        path = user_data_dir(appname, appauthor, version)
+        version = False
+        if opinion:
+            path = os.path.join(path, "Logs")
+    else:
+        path = user_cache_dir(appname, appauthor, version)
+        version = False
+        if opinion:
+            path = os.path.join(path, "log")
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+class AppDirs(object):
+    """Convenience wrapper for getting application dirs."""
+    def __init__(self, appname, appauthor=None, version=None, roaming=False,
+                 multipath=False):
+        self.appname = appname
+        self.appauthor = appauthor
+        self.version = version
+        self.roaming = roaming
+        self.multipath = multipath
+
+    @property
+    def user_data_dir(self):
+        return user_data_dir(self.appname, self.appauthor,
+                             version=self.version, roaming=self.roaming)
+
+    @property
+    def site_data_dir(self):
+        return site_data_dir(self.appname, self.appauthor,
+                             version=self.version, multipath=self.multipath)
+
+    @property
+    def user_config_dir(self):
+        return user_config_dir(self.appname, self.appauthor,
+                               version=self.version, roaming=self.roaming)
+
+    @property
+    def site_config_dir(self):
+        return site_config_dir(self.appname, self.appauthor,
+                             version=self.version, multipath=self.multipath)
+
+    @property
+    def user_cache_dir(self):
+        return user_cache_dir(self.appname, self.appauthor,
+                              version=self.version)
+
+    @property
+    def user_log_dir(self):
+        return user_log_dir(self.appname, self.appauthor,
+                            version=self.version)
+
+
+#---- internal support stuff
+
+def _get_win_folder_from_registry(csidl_name):
+    """This is a fallback technique at best. I'm not sure if using the
+    registry for this guarantees us the correct answer for all CSIDL_*
+    names.
+    """
+    import _winreg
+
+    shell_folder_name = {
+        "CSIDL_APPDATA": "AppData",
+        "CSIDL_COMMON_APPDATA": "Common AppData",
+        "CSIDL_LOCAL_APPDATA": "Local AppData",
+    }[csidl_name]
+
+    key = _winreg.OpenKey(
+        _winreg.HKEY_CURRENT_USER,
+        r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
+    )
+    dir, type = _winreg.QueryValueEx(key, shell_folder_name)
+    return dir
+
+
+def _get_win_folder_with_pywin32(csidl_name):
+    from win32com.shell import shellcon, shell
+    dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
+    # Try to make this a unicode path because SHGetFolderPath does
+    # not return unicode strings when there is unicode data in the
+    # path.
+    try:
+        dir = unicode(dir)
+
+        # Downgrade to short path name if have highbit chars. See
+        # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+        has_high_char = False
+        for c in dir:
+            if ord(c) > 255:
+                has_high_char = True
+                break
+        if has_high_char:
+            try:
+                import win32api
+                dir = win32api.GetShortPathName(dir)
+            except ImportError:
+                pass
+    except UnicodeError:
+        pass
+    return dir
+
+
+def _get_win_folder_with_ctypes(csidl_name):
+    import ctypes
+
+    csidl_const = {
+        "CSIDL_APPDATA": 26,
+        "CSIDL_COMMON_APPDATA": 35,
+        "CSIDL_LOCAL_APPDATA": 28,
+    }[csidl_name]
+
+    buf = ctypes.create_unicode_buffer(1024)
+    ctypes.windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
+
+    # Downgrade to short path name if have highbit chars. See
+    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+    has_high_char = False
+    for c in buf:
+        if ord(c) > 255:
+            has_high_char = True
+            break
+    if has_high_char:
+        buf2 = ctypes.create_unicode_buffer(1024)
+        if ctypes.windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
+            buf = buf2
+
+    return buf.value
+
+def _get_win_folder_with_jna(csidl_name):
+    import array
+    from com.sun import jna
+    from com.sun.jna.platform import win32
+
+    buf_size = win32.WinDef.MAX_PATH * 2
+    buf = array.zeros('c', buf_size)
+    shell = win32.Shell32.INSTANCE
+    shell.SHGetFolderPath(None, getattr(win32.ShlObj, csidl_name), None, win32.ShlObj.SHGFP_TYPE_CURRENT, buf)
+    dir = jna.Native.toString(buf.tostring()).rstrip("\0")
+
+    # Downgrade to short path name if have highbit chars. See
+    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+    has_high_char = False
+    for c in dir:
+        if ord(c) > 255:
+            has_high_char = True
+            break
+    if has_high_char:
+        buf = array.zeros('c', buf_size)
+        kernel = win32.Kernel32.INSTANCE
+        if kernal.GetShortPathName(dir, buf, buf_size):
+            dir = jna.Native.toString(buf.tostring()).rstrip("\0")
+
+    return dir
+
+if system == "win32":
+    try:
+        import win32com.shell
+        _get_win_folder = _get_win_folder_with_pywin32
+    except ImportError:
+        try:
+            from ctypes import windll
+            _get_win_folder = _get_win_folder_with_ctypes
+        except ImportError:
+            try:
+                import com.sun.jna
+                _get_win_folder = _get_win_folder_with_jna
+            except ImportError:
+                _get_win_folder = _get_win_folder_from_registry
+
+
+#---- self test code
+
+if __name__ == "__main__":
+    appname = "MyApp"
+    appauthor = "MyCompany"
+
+    props = ("user_data_dir", "site_data_dir",
+             "user_config_dir", "site_config_dir",
+             "user_cache_dir", "user_log_dir")
+
+    print("-- app dirs (with optional 'version')")
+    dirs = AppDirs(appname, appauthor, version="1.0")
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (without optional 'version')")
+    dirs = AppDirs(appname, appauthor)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (without optional 'appauthor')")
+    dirs = AppDirs(appname)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (with disabled 'appauthor')")
+    dirs = AppDirs(appname, appauthor=False)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 9b6353f052..7f5a76cfd6 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -198,7 +198,7 @@ def filter(self, iterable, prereleases=None):
                         (prereleases or self.prereleases)):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning.
+                # accepting prereleases from the begining.
                 else:
                     yielded = True
                     yield version
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index a30a409d48..2b51c5474f 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,3 +1,4 @@
 packaging==16.7
 pyparsing==2.1.8
 six==1.10.0
+appdirs==1.4.0
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 492f66f10d..b4156fec20 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -69,5 +69,5 @@ def install(self):
             sys.meta_path.append(self)
 
 
-names = 'packaging', 'pyparsing', 'six'
+names = 'packaging', 'pyparsing', 'six', 'appdirs'
 VendorImporter(__name__, names).install()

From beec7ff9b0e301e6fffb21f9a8d999829eb8e678 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Aug 2016 08:55:25 -0400
Subject: [PATCH 6126/8469] Rely on appdirs for resolving a cache dir for
 Python-Eggs. Fixes #763.

---
 CHANGES.rst               |  8 +++++++
 pkg_resources/__init__.py | 50 +++++++--------------------------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5e5bd61406..78cea8079f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v26.1.0
+-------
+
+* #763: ``pkg_resources.get_default_cache`` now defers to the
+  `appdirs project <https://pypi.org/project/appdirs>`_ to
+  resolve the cache directory. Adds a vendored dependency on
+  appdirs to pkg_resources.
+
 v26.0.0
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 27d70a60a4..a93a3da7af 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -65,6 +65,7 @@
 except ImportError:
     importlib_machinery = None
 
+from pkg_resources.extern import appdirs
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
 __import__('pkg_resources.extern.packaging.specifiers')
@@ -1358,48 +1359,15 @@ def cleanup_resources(self, force=False):
 
 
 def get_default_cache():
-    """Determine the default cache location
-
-    This returns the ``PYTHON_EGG_CACHE`` environment variable, if set.
-    Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of the
-    "Application Data" directory.  On all other systems, it's "~/.python-eggs".
     """
-    try:
-        return os.environ['PYTHON_EGG_CACHE']
-    except KeyError:
-        pass
-
-    if os.name != 'nt':
-        return os.path.expanduser('~/.python-eggs')
-
-    # XXX this may be locale-specific!
-    app_data = 'Application Data'
-    app_homes = [
-        # best option, should be locale-safe
-        (('APPDATA',), None),
-        (('USERPROFILE',), app_data),
-        (('HOMEDRIVE', 'HOMEPATH'), app_data),
-        (('HOMEPATH',), app_data),
-        (('HOME',), None),
-        # 95/98/ME
-        (('WINDIR',), app_data),
-    ]
-
-    for keys, subdir in app_homes:
-        dirname = ''
-        for key in keys:
-            if key in os.environ:
-                dirname = os.path.join(dirname, os.environ[key])
-            else:
-                break
-        else:
-            if subdir:
-                dirname = os.path.join(dirname, subdir)
-            return os.path.join(dirname, 'Python-Eggs')
-    else:
-        raise RuntimeError(
-            "Please set the PYTHON_EGG_CACHE environment variable"
-        )
+    Return the ``PYTHON_EGG_CACHE`` environment variable
+    or a platform-relevant user cache dir for an app
+    named "Python-Eggs".
+    """
+    return (
+        os.environ.get('PYTHON_EGG_CACHE')
+        or appdirs.user_cache_dir(appname='Python-Eggs')
+    )
 
 
 def safe_name(name):

From 495bb634f8cb450ee11130917de1c1b85486071f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Aug 2016 10:04:07 -0400
Subject: [PATCH 6127/8469] =?UTF-8?q?Bump=20version:=2026.0.0=20=E2=86=92?=
 =?UTF-8?q?=2026.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index cf5d01a8d8..eea97c9bb0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 26.0.0
+current_version = 26.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index f3084a4e04..c37c998022 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="26.0.0",
+    version="26.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f455ee4f5881fa549c2dc864efc9848e170de6ef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Aug 2016 10:04:08 -0400
Subject: [PATCH 6128/8469] Added tag v26.1.0 for changeset b299cfc9d7d8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6e59e31847..9977a89680 100644
--- a/.hgtags
+++ b/.hgtags
@@ -304,3 +304,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 2371456ae99d11187c33deacf1308aded31081d9 v25.3.0
 f713f9faaaa33c0e9a628dc9322ef8d1fbeb8319 v25.4.0
 7cb13a0cd176f39500701b24dbfec603ead5110c v26.0.0
+b299cfc9d7d89070e8eec9751a8be72c8a75506b v26.1.0

From c7c6522000dc6a32f5933dc837b188b612744b3b Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Mon, 29 Aug 2016 16:20:54 +1000
Subject: [PATCH 6129/8469] Install py.test>=2.8,<3

The 3.x series is currently broken. Until py.test works again, 3.x
should not be used by anything.
---
 .travis.yml | 2 +-
 setup.py    | 2 +-
 tox.ini     | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed077d9460..81d1f170f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
  - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
- - pip install -U pytest
+ - pip install -U 'pytest>=2.8,<3'
 
  # Output the env, because the travis docs just can't be trusted
  - env
diff --git a/setup.py b/setup.py
index c37c998022..3b7ab31bf8 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=2.8,!=3.0.0',
+        'pytest>=2.8,<3',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,
diff --git a/tox.ini b/tox.ini
index 7ce7ce4152..868ba317e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,5 +2,8 @@
 envlist = py26,py27,py33,py34,py35,pypy,pypy3
 
 [testenv]
+deps=
+	pytest-flake8
+	pytest>=2.8,<3
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
-commands=python setup.py test
+commands=python setup.py test --addopts='-rsx'

From a3a7cac18c91f953957cb5fa440f203ed1f2b5fd Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 29 Aug 2016 10:28:29 +0200
Subject: [PATCH 6130/8469] easy_install: update links to documentation

---
 setuptools/command/easy_install.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5065661fa7..e8b90c704e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -8,7 +8,7 @@
 packages.  For detailed documentation, see the accompanying EasyInstall.txt
 file, or visit the `EasyInstall home page`__.
 
-__ https://pythonhosted.org/setuptools/easy_install.html
+__ https://setuptools.readthedocs.io/en/latest/easy_install.html
 
 """
 
@@ -512,7 +512,7 @@ def check_site_dir(self):
         For information on other options, you may wish to consult the
         documentation at:
 
-          https://pythonhosted.org/setuptools/easy_install.html
+          https://setuptools.readthedocs.io/en/latest/easy_install.html
 
         Please make the appropriate changes for your system and try again.
         """).lstrip()
@@ -1256,7 +1256,8 @@ def byte_compile(self, to_compile):
         * You can set up the installation directory to support ".pth" files by
           using one of the approaches described here:
 
-          https://pythonhosted.org/setuptools/easy_install.html#custom-installation-locations
+          https://setuptools.readthedocs.io/en/latest/easy_install.html#custom-installation-locations
+
 
         Please make the appropriate changes for your system and try again.""").lstrip()
 

From 367b540c62c522fde1f8f048cfb75a6af32fc318 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Aug 2016 16:46:55 -0400
Subject: [PATCH 6131/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 78cea8079f..be52f56f95 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v26.1.1
+-------
+
+* Re-release of 26.1.0 with pytest pinned to allow for automated
+  deployement and thus proper packaging environment variables,
+  fixing issues with missing executable launchers.
+
 v26.1.0
 -------
 

From e4ba41ec7f54370a030fb09f9f0a334396f38489 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Aug 2016 16:47:02 -0400
Subject: [PATCH 6132/8469] =?UTF-8?q?Bump=20version:=2026.1.0=20=E2=86=92?=
 =?UTF-8?q?=2026.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index eea97c9bb0..3bcd66a972 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 26.1.0
+current_version = 26.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 3b7ab31bf8..9263c5b74a 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="26.1.0",
+    version="26.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 336258f31655704751d1d0d0b9381d5b4e55b659 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 29 Aug 2016 16:47:02 -0400
Subject: [PATCH 6133/8469] Added tag v26.1.1 for changeset e1d057e23b2f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9977a89680..88f2dc60ae 100644
--- a/.hgtags
+++ b/.hgtags
@@ -305,3 +305,4 @@ c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
 f713f9faaaa33c0e9a628dc9322ef8d1fbeb8319 v25.4.0
 7cb13a0cd176f39500701b24dbfec603ead5110c v26.0.0
 b299cfc9d7d89070e8eec9751a8be72c8a75506b v26.1.0
+e1d057e23b2fec5991084744c356a6c7e05b219d v26.1.1

From f3f736a749a120d124e54e325875775c9e124ee0 Mon Sep 17 00:00:00 2001
From: Raymond Hettinger <python@rcn.com>
Date: Tue, 30 Aug 2016 10:47:49 -0700
Subject: [PATCH 6134/8469] =?UTF-8?q?Issue=20#27895:=20=20Spelling=20fixes?=
 =?UTF-8?q?=20(Contributed=20by=20Ville=20Skytt=C3=A4).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 5e18c61360..77a07ef39d 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -125,7 +125,7 @@ def test_reg_class(self):
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
 
         # looking for values that should exist on all
-        # windows registeries versions.
+        # windows registry versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
         self.assertIn(v, ('0', '1', '2'))

From 3ac5842595463683cbc1d980a8b770d84cef84f9 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 31 Aug 2016 08:22:29 +0100
Subject: [PATCH 6135/8469] Closes #27904: Improved logging statements to defer
 formatting until needed.

---
 archive_util.py       | 2 +-
 cmd.py                | 3 +--
 command/bdist_dumb.py | 2 +-
 command/build_ext.py  | 6 +++---
 command/config.py     | 2 +-
 command/install.py    | 2 +-
 command/register.py   | 6 +++---
 command/sdist.py      | 2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index bed1384900..78ae5757c3 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -171,7 +171,7 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
                     path = os.path.normpath(os.path.join(dirpath, name))
                     if os.path.isfile(path):
                         zip.write(path, path)
-                        log.info("adding '%s'" % path)
+                        log.info("adding '%s'", path)
             zip.close()
 
     return zip_filename
diff --git a/cmd.py b/cmd.py
index c89d5efc45..b5d9dc387d 100644
--- a/cmd.py
+++ b/cmd.py
@@ -329,8 +329,7 @@ def get_sub_commands(self):
     # -- External world manipulation -----------------------------------
 
     def warn(self, msg):
-        log.warn("warning: %s: %s\n" %
-                (self.get_command_name(), msg))
+        log.warn("warning: %s: %s\n", self.get_command_name(), msg)
 
     def execute(self, func, args, msg=None, level=1):
         util.execute(func, args, msg, dry_run=self.dry_run)
diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index f1bfb24923..e9274d925a 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -85,7 +85,7 @@ def run(self):
         install.skip_build = self.skip_build
         install.warn_dir = 0
 
-        log.info("installing to %s" % self.bdist_dir)
+        log.info("installing to %s", self.bdist_dir)
         self.run_command('install')
 
         # And make an archive relative to the root of the
diff --git a/command/build_ext.py b/command/build_ext.py
index f03a4e31d8..5e51ae4ba1 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -363,9 +363,9 @@ def check_extensions_list(self, extensions):
 
             ext_name, build_info = ext
 
-            log.warn(("old-style (ext_name, build_info) tuple found in "
-                      "ext_modules for extension '%s'"
-                      "-- please convert to Extension instance" % ext_name))
+            log.warn("old-style (ext_name, build_info) tuple found in "
+                     "ext_modules for extension '%s'"
+                     "-- please convert to Extension instance", ext_name)
 
             if not (isinstance(ext_name, str) and
                     extension_name_re.match(ext_name)):
diff --git a/command/config.py b/command/config.py
index b1fd09e016..4ae153d194 100644
--- a/command/config.py
+++ b/command/config.py
@@ -337,7 +337,7 @@ def dump_file(filename, head=None):
     If head is not None, will be dumped before the file content.
     """
     if head is None:
-        log.info('%s' % filename)
+        log.info('%s', filename)
     else:
         log.info(head)
     file = open(filename)
diff --git a/command/install.py b/command/install.py
index 9474e9c599..fca05d69c6 100644
--- a/command/install.py
+++ b/command/install.py
@@ -385,7 +385,7 @@ def dump_dirs(self, msg):
             else:
                 opt_name = opt_name.translate(longopt_xlate)
                 val = getattr(self, opt_name)
-            log.debug("  %s: %s" % (opt_name, val))
+            log.debug("  %s: %s", opt_name, val)
 
     def finalize_unix(self):
         """Finalizes options for posix platforms."""
diff --git a/command/register.py b/command/register.py
index 456d50d519..0fac94e9e5 100644
--- a/command/register.py
+++ b/command/register.py
@@ -94,7 +94,7 @@ def verify_metadata(self):
         '''
         # send the info to the server and report the result
         (code, result) = self.post_to_server(self.build_post_data('verify'))
-        log.info('Server response (%s): %s' % (code, result))
+        log.info('Server response (%s): %s', code, result)
 
     def send_metadata(self):
         ''' Send the metadata to the package index server.
@@ -205,7 +205,7 @@ def send_metadata(self):
                 data['email'] = input('   EMail: ')
             code, result = self.post_to_server(data)
             if code != 200:
-                log.info('Server response (%s): %s' % (code, result))
+                log.info('Server response (%s): %s', code, result)
             else:
                 log.info('You will receive an email shortly.')
                 log.info(('Follow the instructions in it to '
@@ -216,7 +216,7 @@ def send_metadata(self):
             while not data['email']:
                 data['email'] = input('Your email address: ')
             code, result = self.post_to_server(data)
-            log.info('Server response (%s): %s' % (code, result))
+            log.info('Server response (%s): %s', code, result)
 
     def build_post_data(self, action):
         # figure the data to send - the metadata plus some additional
diff --git a/command/sdist.py b/command/sdist.py
index f1b8d91977..4fd1d4715d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -412,7 +412,7 @@ def make_release_tree(self, base_dir, files):
             log.info(msg)
         for file in files:
             if not os.path.isfile(file):
-                log.warn("'%s' not a regular file -- skipping" % file)
+                log.warn("'%s' not a regular file -- skipping", file)
             else:
                 dest = os.path.join(base_dir, file)
                 self.copy_file(file, dest, link=link)

From 0685847e2065e046808e038fd50d3368be24541f Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 31 Aug 2016 11:39:35 -0400
Subject: [PATCH 6136/8469] #27904: fix distutils tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Ville Skyttä.
---
 tests/test_build_py.py    | 3 ++-
 tests/test_install_lib.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_build_py.py b/tests/test_build_py.py
index 18283dc722..0712e92c6a 100644
--- a/tests/test_build_py.py
+++ b/tests/test_build_py.py
@@ -168,7 +168,8 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertIn('byte-compiling is disabled', self.logs[0][1])
+        self.assertIn('byte-compiling is disabled',
+                      self.logs[0][1] % self.logs[0][2])
 
 
 def test_suite():
diff --git a/tests/test_install_lib.py b/tests/test_install_lib.py
index 5378aa8249..fda6315bbc 100644
--- a/tests/test_install_lib.py
+++ b/tests/test_install_lib.py
@@ -104,7 +104,8 @@ def test_dont_write_bytecode(self):
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertIn('byte-compiling is disabled', self.logs[0][1])
+        self.assertIn('byte-compiling is disabled',
+                      self.logs[0][1] % self.logs[0][2])
 
 
 def test_suite():

From ac97b020927d8c00d43595afe46749ef6cab7159 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Sep 2016 13:55:33 -0400
Subject: [PATCH 6137/8469] Issue #27919: Deprecate extra_path option in
 distutils.

---
 command/install.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/command/install.py b/command/install.py
index fca05d69c6..0258d3deae 100644
--- a/command/install.py
+++ b/command/install.py
@@ -175,6 +175,7 @@ def initialize_options(self):
         self.compile = None
         self.optimize = None
 
+        # Deprecated
         # These two are for putting non-packagized distributions into their
         # own directory and creating a .pth file if it makes sense.
         # 'extra_path' comes from the setup file; 'install_path_file' can
@@ -344,6 +345,7 @@ def finalize_options(self):
                            'scripts', 'data', 'headers',
                            'userbase', 'usersite')
 
+        # Deprecated
         # Well, we're not actually fully completely finalized yet: we still
         # have to deal with 'extra_path', which is the hack for allowing
         # non-packagized module distributions (hello, Numerical Python!) to
@@ -490,6 +492,10 @@ def handle_extra_path(self):
             self.extra_path = self.distribution.extra_path
 
         if self.extra_path is not None:
+            log.warn(
+                "Distribution option extra_path is deprecated. "
+                "See issue27919 for details."
+            )
             if isinstance(self.extra_path, str):
                 self.extra_path = self.extra_path.split(',')
 

From 4d035167b3b441e86d58e4d865b8b2c2dd5407a7 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 1 Sep 2016 21:42:30 -0300
Subject: [PATCH 6138/8469] Use pytest>=3.0.2

The bug that lead to pin it (pytest-dev/pytest#1888) was fixed in 3.0.2
---
 .travis.yml | 2 +-
 setup.py    | 2 +-
 tox.ini     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81d1f170f3..b8bca7cc7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
  - LC_ALL=C LC_CTYPE=C
 script:
  # avoid VersionConflict when newer version is required
- - pip install -U 'pytest>=2.8,<3'
+ - pip install -U 'pytest>=3.0.2'
 
  # Output the env, because the travis docs just can't be trusted
  - env
diff --git a/setup.py b/setup.py
index 9263c5b74a..90702c1d7d 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=2.8,<3',
+        'pytest>=3.0.2',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,
diff --git a/tox.ini b/tox.ini
index 868ba317e7..806e6ed26f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,6 @@ envlist = py26,py27,py33,py34,py35,pypy,pypy3
 [testenv]
 deps=
 	pytest-flake8
-	pytest>=2.8,<3
+	pytest>=3.0.2
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
 commands=python setup.py test --addopts='-rsx'

From b15f55c3838ea7dd2719178b3c8ca995b4e9e2e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Sep 2016 21:55:22 -0400
Subject: [PATCH 6139/8469] Backed out changeset cc86e9e102e8

---
 tests/test_filelist.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index e719198c6d..391af3cba2 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -9,7 +9,7 @@
 from distutils import filelist
 
 import test.support
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
 MANIFEST_IN = """\
@@ -329,5 +329,12 @@ def test_non_local_discovery(self):
             self.assertEqual(filelist.findall(temp_dir), expected)
 
 
+def test_suite():
+    return unittest.TestSuite([
+        unittest.makeSuite(FileListTestCase),
+        unittest.makeSuite(FindAllTestCase),
+    ])
+
+
 if __name__ == "__main__":
-    unittest.main()
+    run_unittest(test_suite())

From 1bab356fbc59272d9e17f03e52930cd4574ffa0a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Sep 2016 22:28:51 -0400
Subject: [PATCH 6140/8469] Only apply findall patch on affected Pythons.

---
 setuptools/__init__.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index cf0c39f2f8..4270394744 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,6 +1,7 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
+import sys
 import functools
 import distutils.core
 import distutils.filelist
@@ -17,7 +18,7 @@
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
-    'find_packages'
+    'find_packages',
 ]
 
 __version__ = setuptools.version.__version__
@@ -171,5 +172,14 @@ def findall(dir=os.curdir):
     return list(files)
 
 
-# fix findall bug in distutils (http://bugs.python.org/issue12885)
-distutils.filelist.findall = findall
+has_issue_12885 = (
+    sys.version_info < (3, 4, 6)
+    or
+    (3, 5) < sys.version_info <= (3, 5, 3)
+    or
+    (3, 6) < sys.version_info
+)
+
+if has_issue_12885:
+    # fix findall bug in distutils (http://bugs.python.org/issue12885)
+    distutils.filelist.findall = findall

From 7f8144544f23f4fd84d339d846b91d4e3b703dd4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Sep 2016 22:58:56 -0400
Subject: [PATCH 6141/8469] Provide forward compatibility for Warehouse as the
 default repository for the upload command.

---
 CHANGES.rst                       | 22 ++++++++++++++++++++++
 setuptools/__init__.py            | 17 +++++++++++++++++
 setuptools/command/upload_docs.py |  5 +++++
 3 files changed, 44 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index be52f56f95..a45575ac17 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,28 @@
 CHANGES
 =======
 
+v27.0.0
+-------
+
+* Now use Warehouse by default for
+  ``upload``, patching ``distutils.config.PyPIRCCommand`` to
+  affect default behavior.
+
+  Any config in .pypirc should be updated to replace
+
+    https://pypi.python.org/pypi/
+
+  with
+
+    https://upload.pypi.org/legacy/
+
+  Similarly, any passwords stored in the keyring should be
+  updated to use this new value for "system".
+
+  The ``upload_docs`` command will continue to use the python.org
+  site, but the command is now deprecated. Users are urged to use
+  Read The Docs instead.
+
 v26.1.1
 -------
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 4270394744..2ca971038b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -183,3 +183,20 @@ def findall(dir=os.curdir):
 if has_issue_12885:
     # fix findall bug in distutils (http://bugs.python.org/issue12885)
     distutils.filelist.findall = findall
+
+
+needs_warehouse = (
+    sys.version_info < (2, 7, 13)
+    or
+    (3, 0) < sys.version_info < (3, 3, 7)
+    or
+    (3, 4) < sys.version_info < (3, 4, 6)
+    or
+    (3, 5) < sys.version_info <= (3, 5, 3)
+    or
+    (3, 6) < sys.version_info
+)
+
+if needs_warehouse:
+    warehouse = 'https://upload.pypi.org/legacy/'
+    distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ccc1c76ffc..269dc2d503 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -29,6 +29,10 @@ def _encode(s):
 
 
 class upload_docs(upload):
+    # override the default repository as upload_docs isn't
+    # supported by Warehouse (and won't be).
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi/'
+
     description = 'Upload documentation to PyPI'
 
     user_options = [
@@ -53,6 +57,7 @@ def initialize_options(self):
         self.target_dir = None
 
     def finalize_options(self):
+        log.warn("Upload_docs command is deprecated. Use RTD instead.")
         upload.finalize_options(self)
         if self.upload_dir is None:
             if self.has_sphinx():

From bfef652ebcddc99c4b891f96f3d42a3c51bfcccc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Sep 2016 23:27:45 -0400
Subject: [PATCH 6142/8469] Issue #12885: Revert commits in 3.4 branch which is
 security-only fixes.

---
 filelist.py            | 48 ++++++++++++++++++++++++------------------
 tests/test_filelist.py | 48 ++----------------------------------------
 2 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/filelist.py b/filelist.py
index 6522e69f06..db3f7a9680 100644
--- a/filelist.py
+++ b/filelist.py
@@ -6,7 +6,6 @@
 
 import os, re
 import fnmatch
-import functools
 from distutils.util import convert_path
 from distutils.errors import DistutilsTemplateError, DistutilsInternalError
 from distutils import log
@@ -243,28 +242,35 @@ def exclude_pattern (self, pattern,
 # ----------------------------------------------------------------------
 # Utility functions
 
-def _find_all_simple(path):
-    """
-    Find all files under 'path'
-    """
-    results = (
-        os.path.join(base, file)
-        for base, dirs, files in os.walk(path, followlinks=True)
-        for file in files
-    )
-    return filter(os.path.isfile, results)
-
-
 def findall(dir=os.curdir):
+    """Find all files under 'dir' and return the list of full filenames
+    (relative to 'dir').
     """
-    Find all files under 'dir' and return the list of full filenames.
-    Unless dir is '.', return full filenames with dir prepended.
-    """
-    files = _find_all_simple(dir)
-    if dir == os.curdir:
-        make_rel = functools.partial(os.path.relpath, start=dir)
-        files = map(make_rel, files)
-    return list(files)
+    from stat import ST_MODE, S_ISREG, S_ISDIR, S_ISLNK
+
+    list = []
+    stack = [dir]
+    pop = stack.pop
+    push = stack.append
+
+    while stack:
+        dir = pop()
+        names = os.listdir(dir)
+
+        for name in names:
+            if dir != os.curdir:        # avoid the dreaded "./" syndrome
+                fullname = os.path.join(dir, name)
+            else:
+                fullname = name
+
+            # Avoid excess stat calls -- just one will do, thank you!
+            stat = os.stat(fullname)
+            mode = stat[ST_MODE]
+            if S_ISREG(mode):
+                list.append(fullname)
+            elif S_ISDIR(mode) and not S_ISLNK(mode):
+                push(fullname)
+    return list
 
 
 def glob_to_re(pattern):
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 391af3cba2..278809c09b 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -6,10 +6,8 @@
 from distutils.log import WARN
 from distutils.errors import DistutilsTemplateError
 from distutils.filelist import glob_to_re, translate_pattern, FileList
-from distutils import filelist
 
-import test.support
-from test.support import captured_stdout, run_unittest
+from test.support import captured_stdout
 from distutils.tests import support
 
 MANIFEST_IN = """\
@@ -294,47 +292,5 @@ def test_process_template(self):
         self.assertWarnings()
 
 
-class FindAllTestCase(unittest.TestCase):
-    @test.support.skip_unless_symlink
-    def test_missing_symlink(self):
-        with test.support.temp_cwd():
-            os.symlink('foo', 'bar')
-            self.assertEqual(filelist.findall(), [])
-
-    def test_basic_discovery(self):
-        """
-        When findall is called with no parameters or with
-        '.' as the parameter, the dot should be omitted from
-        the results.
-        """
-        with test.support.temp_cwd():
-            os.mkdir('foo')
-            file1 = os.path.join('foo', 'file1.txt')
-            test.support.create_empty_file(file1)
-            os.mkdir('bar')
-            file2 = os.path.join('bar', 'file2.txt')
-            test.support.create_empty_file(file2)
-            expected = [file2, file1]
-            self.assertEqual(sorted(filelist.findall()), expected)
-
-    def test_non_local_discovery(self):
-        """
-        When findall is called with another path, the full
-        path name should be returned.
-        """
-        with test.support.temp_dir() as temp_dir:
-            file1 = os.path.join(temp_dir, 'file1.txt')
-            test.support.create_empty_file(file1)
-            expected = [file1]
-            self.assertEqual(filelist.findall(temp_dir), expected)
-
-
-def test_suite():
-    return unittest.TestSuite([
-        unittest.makeSuite(FileListTestCase),
-        unittest.makeSuite(FindAllTestCase),
-    ])
-
-
 if __name__ == "__main__":
-    run_unittest(test_suite())
+    unittest.main()

From d6efc9424328b42a3c7aeae758bab35bc7df5014 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 19:09:42 -0400
Subject: [PATCH 6143/8469] Introduce a new monkey module to encapsulate the
 monkeypatching.

---
 setuptools/__init__.py  |  6 +++---
 setuptools/dist.py      | 19 ++-----------------
 setuptools/extension.py |  2 +-
 setuptools/monkey.py    | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 setuptools/monkey.py

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2ca971038b..4038ee83af 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -5,7 +5,6 @@
 import functools
 import distutils.core
 import distutils.filelist
-from distutils.core import Command as _Command
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
@@ -13,7 +12,8 @@
 
 import setuptools.version
 from setuptools.extension import Extension
-from setuptools.dist import Distribution, Feature, _get_unpatched
+from setuptools.dist import Distribution, Feature
+from setuptools.monkey import _get_unpatched
 from setuptools.depends import Require
 
 __all__ = [
@@ -122,7 +122,7 @@ def _looks_like_package(path):
 
 setup = distutils.core.setup
 
-_Command = _get_unpatched(_Command)
+_Command = _get_unpatched(distutils.core.Command)
 
 
 class Command(_Command):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 820df6d5d6..380b9436fd 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -9,7 +9,6 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
-from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 from distutils.util import rfc822_escape
@@ -20,25 +19,11 @@
 
 from setuptools.depends import Require
 from setuptools import windows_support
+from setuptools.monkey import _get_unpatched
 import pkg_resources
 
 
-def _get_unpatched(cls):
-    """Protect against re-patching the distutils if reloaded
-
-    Also ensures that no other distutils extension monkeypatched the distutils
-    first.
-    """
-    while cls.__module__.startswith('setuptools'):
-        cls, = cls.__bases__
-    if not cls.__module__.startswith('distutils'):
-        raise AssertionError(
-            "distutils has already been patched by %r" % cls
-        )
-    return cls
-
-
-_Distribution = _get_unpatched(_Distribution)
+_Distribution = _get_unpatched(distutils.core.Distribution)
 
 
 def _patch_distribution_metadata_write_pkg_file():
diff --git a/setuptools/extension.py b/setuptools/extension.py
index f8058b729f..7ef3fad27b 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -7,7 +7,7 @@
 
 from setuptools.extern.six.moves import map
 
-from .dist import _get_unpatched
+from .monkey import _get_unpatched
 from . import msvc
 
 _Extension = _get_unpatched(distutils.core.Extension)
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
new file mode 100644
index 0000000000..b6baf49d68
--- /dev/null
+++ b/setuptools/monkey.py
@@ -0,0 +1,22 @@
+"""
+Monkey patching of distutils.
+"""
+
+
+__all__ = []
+"everything is private"
+
+
+def _get_unpatched(cls):
+    """Protect against re-patching the distutils if reloaded
+
+    Also ensures that no other distutils extension monkeypatched the distutils
+    first.
+    """
+    while cls.__module__.startswith('setuptools'):
+        cls, = cls.__bases__
+    if not cls.__module__.startswith('distutils'):
+        raise AssertionError(
+            "distutils has already been patched by %r" % cls
+        )
+    return cls

From 57a5c05e6f460260f1339dce37407c724ad4c5e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 19:28:08 -0400
Subject: [PATCH 6144/8469] Move monkeypatching in package module into monkey.

---
 setuptools/__init__.py | 38 +++-----------------------------------
 setuptools/monkey.py   | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 4038ee83af..0129658a40 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,6 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
-import sys
 import functools
 import distutils.core
 import distutils.filelist
@@ -13,8 +12,8 @@
 import setuptools.version
 from setuptools.extension import Extension
 from setuptools.dist import Distribution, Feature
-from setuptools.monkey import _get_unpatched
 from setuptools.depends import Require
+from . import monkey
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
@@ -122,7 +121,7 @@ def _looks_like_package(path):
 
 setup = distutils.core.setup
 
-_Command = _get_unpatched(distutils.core.Command)
+_Command = monkey._get_unpatched(distutils.core.Command)
 
 
 class Command(_Command):
@@ -144,10 +143,6 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         return cmd
 
 
-# we can't patch distutils.cmd, alas
-distutils.core.Command = Command
-
-
 def _find_all_simple(path):
     """
     Find all files under 'path'
@@ -172,31 +167,4 @@ def findall(dir=os.curdir):
     return list(files)
 
 
-has_issue_12885 = (
-    sys.version_info < (3, 4, 6)
-    or
-    (3, 5) < sys.version_info <= (3, 5, 3)
-    or
-    (3, 6) < sys.version_info
-)
-
-if has_issue_12885:
-    # fix findall bug in distutils (http://bugs.python.org/issue12885)
-    distutils.filelist.findall = findall
-
-
-needs_warehouse = (
-    sys.version_info < (2, 7, 13)
-    or
-    (3, 0) < sys.version_info < (3, 3, 7)
-    or
-    (3, 4) < sys.version_info < (3, 4, 6)
-    or
-    (3, 5) < sys.version_info <= (3, 5, 3)
-    or
-    (3, 6) < sys.version_info
-)
-
-if needs_warehouse:
-    warehouse = 'https://upload.pypi.org/legacy/'
-    distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
+monkey.patch_all()
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index b6baf49d68..189fa4e032 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -2,6 +2,11 @@
 Monkey patching of distutils.
 """
 
+import sys
+import distutils.filelist
+
+import setuptools
+
 
 __all__ = []
 "everything is private"
@@ -20,3 +25,36 @@ def _get_unpatched(cls):
             "distutils has already been patched by %r" % cls
         )
     return cls
+
+
+def patch_all():
+    # we can't patch distutils.cmd, alas
+    distutils.core.Command = setuptools.Command
+
+    has_issue_12885 = (
+        sys.version_info < (3, 4, 6)
+        or
+        (3, 5) < sys.version_info <= (3, 5, 3)
+        or
+        (3, 6) < sys.version_info
+    )
+
+    if has_issue_12885:
+        # fix findall bug in distutils (http://bugs.python.org/issue12885)
+        distutils.filelist.findall = setuptools.findall
+
+    needs_warehouse = (
+        sys.version_info < (2, 7, 13)
+        or
+        (3, 0) < sys.version_info < (3, 3, 7)
+        or
+        (3, 4) < sys.version_info < (3, 4, 6)
+        or
+        (3, 5) < sys.version_info <= (3, 5, 3)
+        or
+        (3, 6) < sys.version_info
+    )
+
+    if needs_warehouse:
+        warehouse = 'https://upload.pypi.org/legacy/'
+        distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse

From 443cabec148460b3a688923df1a63f689d1164c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 19:30:10 -0400
Subject: [PATCH 6145/8469] Remove private prefix from monkey as monkey module
 explicitly declares that all functions are private.

---
 setuptools/__init__.py  | 2 +-
 setuptools/dist.py      | 4 ++--
 setuptools/extension.py | 4 ++--
 setuptools/monkey.py    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 0129658a40..41b590d7b5 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -121,7 +121,7 @@ def _looks_like_package(path):
 
 setup = distutils.core.setup
 
-_Command = monkey._get_unpatched(distutils.core.Command)
+_Command = monkey.get_unpatched(distutils.core.Command)
 
 
 class Command(_Command):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 380b9436fd..7a4249f1a1 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -19,11 +19,11 @@
 
 from setuptools.depends import Require
 from setuptools import windows_support
-from setuptools.monkey import _get_unpatched
+from setuptools.monkey import get_unpatched
 import pkg_resources
 
 
-_Distribution = _get_unpatched(distutils.core.Distribution)
+_Distribution = get_unpatched(distutils.core.Distribution)
 
 
 def _patch_distribution_metadata_write_pkg_file():
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 7ef3fad27b..073d9459a9 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -7,10 +7,10 @@
 
 from setuptools.extern.six.moves import map
 
-from .monkey import _get_unpatched
+from .monkey import get_unpatched
 from . import msvc
 
-_Extension = _get_unpatched(distutils.core.Extension)
+_Extension = get_unpatched(distutils.core.Extension)
 
 msvc.patch_for_specialized_compiler()
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 189fa4e032..1961dfbaa6 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -12,7 +12,7 @@
 "everything is private"
 
 
-def _get_unpatched(cls):
+def get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
 
     Also ensures that no other distutils extension monkeypatched the distutils

From cd22ba427f9b201d6bc48586ddf4595312b9e19e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 19:50:27 -0400
Subject: [PATCH 6146/8469] Move (much of?) the rest of the monkey patching
 into the monkey module

---
 setuptools/dist.py      | 129 ++++++++++++++++------------------------
 setuptools/extension.py |  15 +----
 setuptools/monkey.py    |  41 +++++++++++++
 3 files changed, 95 insertions(+), 90 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7a4249f1a1..d321e6c537 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -23,83 +23,58 @@
 import pkg_resources
 
 
-_Distribution = get_unpatched(distutils.core.Distribution)
-
-
-def _patch_distribution_metadata_write_pkg_file():
-    """Patch write_pkg_file to also write Requires-Python/Requires-External"""
-
-    # Based on Python 3.5 version
-    def write_pkg_file(self, file):
-        """Write the PKG-INFO format data to a file object.
-        """
-        version = '1.0'
-        if (self.provides or self.requires or self.obsoletes or
-                self.classifiers or self.download_url):
-            version = '1.1'
-        # Setuptools specific for PEP 345
-        if hasattr(self, 'python_requires'):
-            version = '1.2'
-
-        file.write('Metadata-Version: %s\n' % version)
-        file.write('Name: %s\n' % self.get_name())
-        file.write('Version: %s\n' % self.get_version())
-        file.write('Summary: %s\n' % self.get_description())
-        file.write('Home-page: %s\n' % self.get_url())
-        file.write('Author: %s\n' % self.get_contact())
-        file.write('Author-email: %s\n' % self.get_contact_email())
-        file.write('License: %s\n' % self.get_license())
-        if self.download_url:
-            file.write('Download-URL: %s\n' % self.download_url)
-
-        long_desc = rfc822_escape(self.get_long_description())
-        file.write('Description: %s\n' % long_desc)
-
-        keywords = ','.join(self.get_keywords())
-        if keywords:
-            file.write('Keywords: %s\n' % keywords)
-
-        self._write_list(file, 'Platform', self.get_platforms())
-        self._write_list(file, 'Classifier', self.get_classifiers())
-
-        # PEP 314
-        self._write_list(file, 'Requires', self.get_requires())
-        self._write_list(file, 'Provides', self.get_provides())
-        self._write_list(file, 'Obsoletes', self.get_obsoletes())
-
-        # Setuptools specific for PEP 345
-        if hasattr(self, 'python_requires'):
-            file.write('Requires-Python: %s\n' % self.python_requires)
-
-    distutils.dist.DistributionMetadata.write_pkg_file = write_pkg_file
-
-
-_patch_distribution_metadata_write_pkg_file()
-
-
-def _patch_distribution_metadata_write_pkg_info():
+# Based on Python 3.5 version
+def write_pkg_file(self, file):
+    """Write the PKG-INFO format data to a file object.
     """
-    Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
-    encoding to save the pkg_info. Monkey-patch its write_pkg_info method to
-    correct this undesirable behavior.
+    version = '1.0'
+    if (self.provides or self.requires or self.obsoletes or
+            self.classifiers or self.download_url):
+        version = '1.1'
+    # Setuptools specific for PEP 345
+    if hasattr(self, 'python_requires'):
+        version = '1.2'
+
+    file.write('Metadata-Version: %s\n' % version)
+    file.write('Name: %s\n' % self.get_name())
+    file.write('Version: %s\n' % self.get_version())
+    file.write('Summary: %s\n' % self.get_description())
+    file.write('Home-page: %s\n' % self.get_url())
+    file.write('Author: %s\n' % self.get_contact())
+    file.write('Author-email: %s\n' % self.get_contact_email())
+    file.write('License: %s\n' % self.get_license())
+    if self.download_url:
+        file.write('Download-URL: %s\n' % self.download_url)
+
+    long_desc = rfc822_escape(self.get_long_description())
+    file.write('Description: %s\n' % long_desc)
+
+    keywords = ','.join(self.get_keywords())
+    if keywords:
+        file.write('Keywords: %s\n' % keywords)
+
+    self._write_list(file, 'Platform', self.get_platforms())
+    self._write_list(file, 'Classifier', self.get_classifiers())
+
+    # PEP 314
+    self._write_list(file, 'Requires', self.get_requires())
+    self._write_list(file, 'Provides', self.get_provides())
+    self._write_list(file, 'Obsoletes', self.get_obsoletes())
+
+    # Setuptools specific for PEP 345
+    if hasattr(self, 'python_requires'):
+        file.write('Requires-Python: %s\n' % self.python_requires)
+
+
+# from Python 3.4
+def write_pkg_info(self, base_dir):
+    """Write the PKG-INFO file into the release tree.
     """
-    environment_local = (3,) <= sys.version_info[:3] < (3, 2, 2)
-    if not environment_local:
-        return
-
-    # from Python 3.4
-    def write_pkg_info(self, base_dir):
-        """Write the PKG-INFO file into the release tree.
-        """
-        with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
-                  encoding='UTF-8') as pkg_info:
-            self.write_pkg_file(pkg_info)
-
-    distutils.dist.DistributionMetadata.write_pkg_info = write_pkg_info
+    with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
+              encoding='UTF-8') as pkg_info:
+        self.write_pkg_file(pkg_info)
 
 
-_patch_distribution_metadata_write_pkg_info()
-
 sequence = tuple, list
 
 
@@ -230,6 +205,9 @@ def check_packages(dist, attr, value):
             )
 
 
+_Distribution = get_unpatched(distutils.core.Distribution)
+
+
 class Distribution(_Distribution):
     """Distribution with support for features, tests, and package data
 
@@ -777,11 +755,6 @@ def handle_display_options(self, option_order):
                 sys.stdout.detach(), encoding, errors, newline, line_buffering)
 
 
-# Install it throughout the distutils
-for module in distutils.dist, distutils.core, distutils.cmd:
-    module.Distribution = Distribution
-
-
 class Feature:
     """
     **deprecated** -- The `Feature` facility was never completely implemented
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 073d9459a9..03068d35bb 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -1,4 +1,3 @@
-import sys
 import re
 import functools
 import distutils.core
@@ -8,11 +7,6 @@
 from setuptools.extern.six.moves import map
 
 from .monkey import get_unpatched
-from . import msvc
-
-_Extension = get_unpatched(distutils.core.Extension)
-
-msvc.patch_for_specialized_compiler()
 
 
 def _have_cython():
@@ -33,6 +27,9 @@ def _have_cython():
 have_pyrex = _have_cython
 
 
+_Extension = get_unpatched(distutils.core.Extension)
+
+
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
@@ -59,9 +56,3 @@ def _convert_pyx_sources_to_lang(self):
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
-
-
-distutils.core.Extension = Extension
-distutils.extension.Extension = Extension
-if 'distutils.command.build_ext' in sys.modules:
-    sys.modules['distutils.command.build_ext'].Extension = Extension
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 1961dfbaa6..a2cac0e06a 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -58,3 +58,44 @@ def patch_all():
     if needs_warehouse:
         warehouse = 'https://upload.pypi.org/legacy/'
         distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
+
+    _patch_distribution_metadata_write_pkg_file()
+    _patch_distribution_metadata_write_pkg_info()
+
+    # Install Distribution throughout the distutils
+    for module in distutils.dist, distutils.core, distutils.cmd:
+        module.Distribution = setuptools.dist.Distribution
+
+    # Install the patched Extension
+    distutils.core.Extension = setuptools.extension.Extension
+    distutils.extension.Extension = setuptools.extension.Extension
+    if 'distutils.command.build_ext' in sys.modules:
+        sys.modules['distutils.command.build_ext'].Extension = (
+            setuptools.extension.Extension
+        )
+
+    # patch MSVC
+    __import__('setuptools.msvc')
+    setuptools.msvc.patch_for_specialized_compiler()
+
+
+def _patch_distribution_metadata_write_pkg_file():
+    """Patch write_pkg_file to also write Requires-Python/Requires-External"""
+    distutils.dist.DistributionMetadata.write_pkg_file = (
+        setuptools.dist.write_pkg_file
+    )
+
+
+def _patch_distribution_metadata_write_pkg_info():
+    """
+    Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
+    encoding to save the pkg_info. Monkey-patch its write_pkg_info method to
+    correct this undesirable behavior.
+    """
+    environment_local = (3,) <= sys.version_info[:3] < (3, 2, 2)
+    if not environment_local:
+        return
+
+    distutils.dist.DistributionMetadata.write_pkg_info = (
+        setuptools.dist.write_pkg_info
+    )

From 6a74dc955603fb6dcdaa2877b332c7ff1c55dfad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 20:05:03 -0400
Subject: [PATCH 6147/8469] distutils will always be in globals

---
 setuptools/msvc.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 26e399cc1c..d7c8895502 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -63,10 +63,6 @@ def patch_for_specialized_compiler():
         # Compilers only availables on Microsoft Windows
         return
 
-    if 'distutils' not in globals():
-        # The module isn't available to be patched
-        return
-
     if unpatched:
         # Already patched
         return

From 3c5cf653dbc0ab10d08738ee4e4db26710903466 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 20:29:14 -0400
Subject: [PATCH 6148/8469] Move msvc patch logic into monkey module.

---
 setuptools/monkey.py | 59 +++++++++++++++++++++++++++--
 setuptools/msvc.py   | 90 +++++++++++---------------------------------
 2 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index a2cac0e06a..6d341b4333 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -4,6 +4,7 @@
 
 import sys
 import distutils.filelist
+import platform
 
 import setuptools
 
@@ -74,9 +75,7 @@ def patch_all():
             setuptools.extension.Extension
         )
 
-    # patch MSVC
-    __import__('setuptools.msvc')
-    setuptools.msvc.patch_for_specialized_compiler()
+    patch_for_msvc_specialized_compiler()
 
 
 def _patch_distribution_metadata_write_pkg_file():
@@ -99,3 +98,57 @@ def _patch_distribution_metadata_write_pkg_info():
     distutils.dist.DistributionMetadata.write_pkg_info = (
         setuptools.dist.write_pkg_info
     )
+
+
+unpatched = dict()
+
+
+def patch_for_msvc_specialized_compiler():
+    """
+    Patch functions in distutils to use standalone Microsoft Visual C++
+    compilers.
+    """
+    try:
+        # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
+        import distutils.msvc9compiler as msvc9compiler
+    except ImportError:
+        pass
+
+    try:
+        # Distutil file for MSVC++ 14.0 and upper (Python 3.5+)
+        import distutils._msvccompiler as msvc14compiler
+    except ImportError:
+        pass
+
+    if platform.system() != 'Windows':
+        # Compilers only availables on Microsoft Windows
+        return
+
+    unpatched = __import__('setuptools.msvc').msvc.unpatched
+
+    if unpatched:
+        # Already patched
+        return
+
+    try:
+        # Patch distutils.msvc9compiler
+        unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall
+        msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
+        unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
+        msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
+    except NameError:
+        pass
+
+    try:
+        # Patch distutils._msvccompiler._get_vc_env
+        unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
+        msvc14compiler._get_vc_env = msvc14_get_vc_env
+    except NameError:
+        pass
+
+    try:
+        # Patch distutils._msvccompiler.gen_lib_options for Numpy
+        unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
+        msvc14compiler.gen_lib_options = msvc14_gen_lib_options
+    except NameError:
+        pass
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index d7c8895502..10507ab231 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -1,6 +1,20 @@
 """
-This module adds improved support for Microsoft Visual C++ compilers.
+Improved support for Microsoft Visual C++ compilers.
+
+Known supported compilers:
+--------------------------
+Microsoft Visual C++ 9.0:
+    Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
+    Microsoft Windows SDK 7.0 (x86, x64, ia64);
+    Microsoft Windows SDK 6.1 (x86, x64, ia64)
+
+Microsoft Visual C++ 10.0:
+    Microsoft Windows SDK 7.1 (x86, x64, ia64)
+
+Microsoft Visual C++ 14.0:
+    Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
 """
+
 import os
 import sys
 import platform
@@ -10,6 +24,8 @@
 
 from setuptools.extern.six.moves import filterfalse
 
+from . import monkey
+
 if platform.system() == 'Windows':
     from setuptools.extern.six.moves import winreg
     safe_env = os.environ
@@ -26,70 +42,10 @@ class winreg:
     safe_env = dict()
 
 try:
-    # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
-    import distutils.msvc9compiler as msvc9compiler
+    from distutils.msvc9compiler import Reg
 except ImportError:
     pass
 
-try:
-    # Distutil file for MSVC++ 14.0 and upper (Python 3.5+)
-    import distutils._msvccompiler as msvc14compiler
-except ImportError:
-    pass
-
-
-unpatched = dict()
-
-
-def patch_for_specialized_compiler():
-    """
-    Patch functions in distutils to use standalone Microsoft Visual C++
-    compilers.
-
-    Known supported compilers:
-    --------------------------
-    Microsoft Visual C++ 9.0:
-        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
-        Microsoft Windows SDK 7.0 (x86, x64, ia64);
-        Microsoft Windows SDK 6.1 (x86, x64, ia64)
-
-    Microsoft Visual C++ 10.0:
-        Microsoft Windows SDK 7.1 (x86, x64, ia64)
-
-    Microsoft Visual C++ 14.0:
-        Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
-    """
-    if platform.system() != 'Windows':
-        # Compilers only availables on Microsoft Windows
-        return
-
-    if unpatched:
-        # Already patched
-        return
-
-    try:
-        # Patch distutils.msvc9compiler
-        unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall
-        msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
-        unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
-        msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
-    except NameError:
-        pass
-
-    try:
-        # Patch distutils._msvccompiler._get_vc_env
-        unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
-        msvc14compiler._get_vc_env = msvc14_get_vc_env
-    except NameError:
-        pass
-
-    try:
-        # Patch distutils._msvccompiler.gen_lib_options for Numpy
-        unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
-        msvc14compiler.gen_lib_options = msvc14_gen_lib_options
-    except NameError:
-        pass
-
 
 def msvc9_find_vcvarsall(version):
     """
@@ -113,7 +69,6 @@ def msvc9_find_vcvarsall(version):
     ------
     vcvarsall.bat path: str
     """
-    Reg = msvc9compiler.Reg
     VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
     key = VC_BASE % ('', version)
     try:
@@ -132,7 +87,7 @@ def msvc9_find_vcvarsall(version):
         if os.path.isfile(vcvarsall):
             return vcvarsall
 
-    return unpatched['msvc9_find_vcvarsall'](version)
+    return monkey.unpatched['msvc9_find_vcvarsall'](version)
 
 
 def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
@@ -165,7 +120,8 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     """
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
-        return unpatched['msvc9_query_vcvarsall'](ver, arch, *args, **kwargs)
+        orig = monkey.unpatched['msvc9_query_vcvarsall']
+        return orig(ver, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError:
         # Pass error if Vcvarsall.bat is missing
         pass
@@ -204,7 +160,7 @@ def msvc14_get_vc_env(plat_spec):
     """
     # Try to get environment from vcvarsall.bat (Classical way)
     try:
-        return unpatched['msvc14_get_vc_env'](plat_spec)
+        return monkey.unpatched['msvc14_get_vc_env'](plat_spec)
     except distutils.errors.DistutilsPlatformError:
         # Pass error Vcvarsall.bat is missing
         pass
@@ -227,7 +183,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
         import numpy as np
         if StrictVersion(np.__version__) < StrictVersion('1.11.2'):
             return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
-    return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
+    return monkey.unpatched['msvc14_gen_lib_options'](*args, **kwargs)
 
 
 def _augment_exception(exc, version, arch=''):

From 634a3c9e360812480646dc0baa1035bfc75137f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 20:31:42 -0400
Subject: [PATCH 6149/8469] Update changelog

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index a45575ac17..385fd07f71 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,6 +24,9 @@ v27.0.0
   site, but the command is now deprecated. Users are urged to use
   Read The Docs instead.
 
+* Introduce the ``monkey`` module to encapsulate the distutils
+  monkeypatching behavior.
+
 v26.1.1
 -------
 

From 9915760daaffca6d14444f83929a8cf25bdf1f7b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Sep 2016 20:38:39 -0400
Subject: [PATCH 6150/8469] Use unpatched locally

---
 setuptools/monkey.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 6d341b4333..3e4f49e1af 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -124,8 +124,6 @@ def patch_for_msvc_specialized_compiler():
         # Compilers only availables on Microsoft Windows
         return
 
-    unpatched = __import__('setuptools.msvc').msvc.unpatched
-
     if unpatched:
         # Already patched
         return

From fa187c39baf5fa0fee1feb3568177afb244ac30b Mon Sep 17 00:00:00 2001
From: Valentin Valls <valentin.valls@esrf.fr>
Date: Mon, 5 Sep 2016 09:34:22 +0200
Subject: [PATCH 6151/8469] Use LooseVersion instread of StrictVersion

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

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 26e399cc1c..c7dd797605 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -6,7 +6,7 @@
 import platform
 import itertools
 import distutils.errors
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 
 from setuptools.extern.six.moves import filterfalse
 
@@ -229,7 +229,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
     """
     if "numpy.distutils" in sys.modules:
         import numpy as np
-        if StrictVersion(np.__version__) < StrictVersion('1.11.2'):
+        if LooseVersion(np.__version__) < LooseVersion('1.11.2'):
             return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
     return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
 

From 175d71c6352e17dc2b752160ec78d2cb90e7c271 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Sep 2016 22:24:01 -0400
Subject: [PATCH 6152/8469] Issue #27960: Revert state to 675e20c38fdac6,
 backing out all changes by developed for Issue #12885.

---
 tests/test_filelist.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 278809c09b..e82bc3d2ed 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -7,7 +7,7 @@
 from distutils.errors import DistutilsTemplateError
 from distutils.filelist import glob_to_re, translate_pattern, FileList
 
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
 MANIFEST_IN = """\
@@ -292,5 +292,8 @@ def test_process_template(self):
         self.assertWarnings()
 
 
+def test_suite():
+    return unittest.makeSuite(FileListTestCase)
+
 if __name__ == "__main__":
-    unittest.main()
+    run_unittest(test_suite())

From 54343cdaee7de324b15f3ace93657f34a53c5e34 Mon Sep 17 00:00:00 2001
From: Valentin Valls <valentin.valls@esrf.fr>
Date: Tue, 6 Sep 2016 11:10:34 +0200
Subject: [PATCH 6153/8469] Use LegacyVersion instead of LooseVersion

- Also apply the patch for numpy 1.11.2 pre release
---
 setuptools/msvc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index c7dd797605..ecbea81849 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -6,7 +6,7 @@
 import platform
 import itertools
 import distutils.errors
-from distutils.version import LooseVersion
+from pkg_resources.extern.packaging.version import LegacyVersion
 
 from setuptools.extern.six.moves import filterfalse
 
@@ -229,7 +229,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
     """
     if "numpy.distutils" in sys.modules:
         import numpy as np
-        if LooseVersion(np.__version__) < LooseVersion('1.11.2'):
+        if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'):
             return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
     return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
 

From 84f35582fc98b213e51d9924ae9f726212069560 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Wed, 7 Sep 2016 12:03:06 +0000
Subject: [PATCH 6154/8469] =?UTF-8?q?Issue=20#27895:=20=20Spelling=20fixes?=
 =?UTF-8?q?=20(Contributed=20by=20Ville=20Skytt=C3=A4).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/test_msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_msvc9compiler.py b/tests/test_msvc9compiler.py
index 5e18c61360..77a07ef39d 100644
--- a/tests/test_msvc9compiler.py
+++ b/tests/test_msvc9compiler.py
@@ -125,7 +125,7 @@ def test_reg_class(self):
         self.assertRaises(KeyError, Reg.get_value, 'xxx', 'xxx')
 
         # looking for values that should exist on all
-        # windows registeries versions.
+        # windows registry versions.
         path = r'Control Panel\Desktop'
         v = Reg.get_value(path, 'dragfullwindows')
         self.assertIn(v, ('0', '1', '2'))

From dd0f44984d23f8953affce76fed4735a04c60803 Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leorochael@gmail.com>
Date: Thu, 8 Sep 2016 11:54:38 -0300
Subject: [PATCH 6155/8469] pytest: ignore all .* directories

In Cloud9 a .c9 directory is created. Other IDEs like to add .directories as well
---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 640716a648..b35abfa908 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .tox
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811

From fe41e077426b41fee85c7bd5800029796fb4b8c9 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 8 Sep 2016 13:59:53 -0400
Subject: [PATCH 6156/8469] #27364: fix "incorrect" uses of escape character in
 the stdlib.

And most of the tools.

Patch by Emanual Barry, reviewed by me, Serhiy Storchaka, and
Martin Panter.
---
 cmd.py                   | 2 +-
 command/bdist_msi.py     | 4 ++--
 command/build_scripts.py | 2 +-
 cygwinccompiler.py       | 2 +-
 msvc9compiler.py         | 2 +-
 sysconfig.py             | 2 +-
 versionpredicate.py      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd.py b/cmd.py
index b5d9dc387d..939f795945 100644
--- a/cmd.py
+++ b/cmd.py
@@ -221,7 +221,7 @@ def ensure_string(self, option, default=None):
         self._ensure_stringlike(option, "string", default)
 
     def ensure_string_list(self, option):
-        """Ensure that 'option' is a list of strings.  If 'option' is
+        r"""Ensure that 'option' is a list of strings.  If 'option' is
         currently a string, we split it either on /,\s*/ or /\s+/, so
         "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
         ["foo", "bar", "baz"].
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f6c21aee44..a4bd5a589d 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -623,7 +623,7 @@ def add_ui(self):
         cost = PyDialog(db, "DiskCostDlg", x, y, w, h, modal, title,
                         "OK", "OK", "OK", bitmap=False)
         cost.text("Title", 15, 6, 200, 15, 0x30003,
-                  "{\DlgFontBold8}Disk Space Requirements")
+                 r"{\DlgFontBold8}Disk Space Requirements")
         cost.text("Description", 20, 20, 280, 20, 0x30003,
                   "The disk space required for the installation of the selected features.")
         cost.text("Text", 20, 53, 330, 60, 3,
@@ -670,7 +670,7 @@ def add_ui(self):
         progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title,
                             "Cancel", "Cancel", "Cancel", bitmap=False)
         progress.text("Title", 20, 15, 200, 15, 0x30003,
-                      "{\DlgFontBold8}[Progress1] [ProductName]")
+                     r"{\DlgFontBold8}[Progress1] [ProductName]")
         progress.text("Text", 35, 65, 300, 30, 3,
                       "Please wait while the Installer [Progress2] [ProductName]. "
                       "This may take several minutes.")
diff --git a/command/build_scripts.py b/command/build_scripts.py
index 90a8380a04..ccc70e6465 100644
--- a/command/build_scripts.py
+++ b/command/build_scripts.py
@@ -51,7 +51,7 @@ def run(self):
 
 
     def copy_scripts(self):
-        """Copy each script listed in 'self.scripts'; if it's marked as a
+        r"""Copy each script listed in 'self.scripts'; if it's marked as a
         Python script in the Unix way (first line matches 'first_line_re',
         ie. starts with "\#!" and contains "python"), then adjust the first
         line to refer to the current Python interpreter as we copy.
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index c879646c0f..1c36990347 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -368,7 +368,7 @@ def check_config_h():
         return (CONFIG_H_UNCERTAIN,
                 "couldn't read '%s': %s" % (fn, exc.strerror))
 
-RE_VERSION = re.compile(b'(\d+\.\d+(\.\d+)*)')
+RE_VERSION = re.compile(br'(\d+\.\d+(\.\d+)*)')
 
 def _find_exe_version(cmd):
     """Find the version of an executable by running `cmd` in the shell.
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 0b1fd19ff6..2119127622 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -716,7 +716,7 @@ def _remove_visual_c_ref(self, manifest_file):
                 r"""VC\d{2}\.CRT("|').*?(/>|</assemblyIdentity>)""",
                 re.DOTALL)
             manifest_buf = re.sub(pattern, "", manifest_buf)
-            pattern = "<dependentAssembly>\s*</dependentAssembly>"
+            pattern = r"<dependentAssembly>\s*</dependentAssembly>"
             manifest_buf = re.sub(pattern, "", manifest_buf)
             # Now see if any other assemblies are referenced - if not, we
             # don't want a manifest embedded.
diff --git a/sysconfig.py b/sysconfig.py
index f72b7f5a19..681359870c 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -278,7 +278,7 @@ def parse_config_h(fp, g=None):
 
 # Regexes needed for parsing Makefile (and similar syntaxes,
 # like old-style Setup files).
-_variable_rx = re.compile("([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
+_variable_rx = re.compile(r"([a-zA-Z][a-zA-Z0-9_]+)\s*=\s*(.*)")
 _findvar1_rx = re.compile(r"\$\(([A-Za-z][A-Za-z0-9_]*)\)")
 _findvar2_rx = re.compile(r"\${([A-Za-z][A-Za-z0-9_]*)}")
 
diff --git a/versionpredicate.py b/versionpredicate.py
index b0dd9f45bf..062c98f248 100644
--- a/versionpredicate.py
+++ b/versionpredicate.py
@@ -154,7 +154,7 @@ def split_provision(value):
     global _provision_rx
     if _provision_rx is None:
         _provision_rx = re.compile(
-            "([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$",
+            r"([a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*)(?:\s*\(\s*([^)\s]+)\s*\))?$",
             re.ASCII)
     value = value.strip()
     m = _provision_rx.match(value)

From 00ac09a54693e77cbe791d0f8ca85db20a547e14 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Fri, 9 Sep 2016 07:20:49 -0400
Subject: [PATCH 6157/8469] Use EXT_SUFFIX instead of SO for py_limited_api
 renaming

---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index f994b62654..454c91fbf0 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -111,7 +111,7 @@ def get_ext_filename(self, fullname):
                 and get_abi3_suffix()
             )
             if use_abi3:
-                so_ext = get_config_var('SO')
+                so_ext = get_config_var('EXT_SUFFIX')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):

From 18f4f4f56e4dfeeb152e86b4a84f84256ff0b57a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 09:57:04 -0400
Subject: [PATCH 6158/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index a45575ac17..9a48c1cb40 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,7 @@
 CHANGES
 =======
 
+
 v27.0.0
 -------
 
@@ -24,6 +25,11 @@ v27.0.0
   site, but the command is now deprecated. Users are urged to use
   Read The Docs instead.
 
+* #776: Use EXT_SUFFIX for py_limited_api renaming.
+
+* #774 and #775: Use LegacyVersion from packaging when
+  detecting numpy versions.
+
 v26.1.1
 -------
 

From c550d2d91f19e42257926f108bc269a759a2a13e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 10:04:29 -0400
Subject: [PATCH 6159/8469] =?UTF-8?q?Bump=20version:=2026.1.1=20=E2=86=92?=
 =?UTF-8?q?=2027.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3bcd66a972..655b8f2127 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 26.1.1
+current_version = 27.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 90702c1d7d..40977fe470 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="26.1.1",
+    version="27.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From c5645385252c45575569a01622405115d49cd1b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 10:13:36 -0400
Subject: [PATCH 6160/8469] Remove unused import

---
 setuptools/dist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d321e6c537..2f7bb59adf 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -2,7 +2,6 @@
 
 import re
 import os
-import sys
 import warnings
 import numbers
 import distutils.log

From 20a2f628283a0af476020cc394e4dca1dcdeaadd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 10:27:32 -0400
Subject: [PATCH 6161/8469] Add Deprecation warning for _get_unpatched.

---
 setuptools/dist.py   | 5 +++++
 setuptools/monkey.py | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2f7bb59adf..b004f9287c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -22,6 +22,11 @@
 import pkg_resources
 
 
+def _get_unpatched(cls):
+    warnings.warn("Do not call this function", DeprecationWarning)
+    return get_unpatched(cls)
+
+
 # Based on Python 3.5 version
 def write_pkg_file(self, file):
     """Write the PKG-INFO format data to a file object.
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 3e4f49e1af..5a0cf43bfd 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -10,7 +10,10 @@
 
 
 __all__ = []
-"everything is private"
+"""
+Everything is private. Contact the project team
+if you think you need this functionality.
+"""
 
 
 def get_unpatched(cls):

From 857c16bbb93e0293a21a8c00a421cc6ebe63614d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 10:28:21 -0400
Subject: [PATCH 6162/8469] Move changelog following v27 release

---
 CHANGES.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 385fd07f71..4fec8a9601 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v27.1.0
+-------
+
+* Introduce the (private) ``monkey`` module to encapsulate
+  the distutils monkeypatching behavior.
+
 v27.0.0
 -------
 
@@ -24,9 +30,6 @@ v27.0.0
   site, but the command is now deprecated. Users are urged to use
   Read The Docs instead.
 
-* Introduce the ``monkey`` module to encapsulate the distutils
-  monkeypatching behavior.
-
 v26.1.1
 -------
 

From 1aa1d6c94b108147030fdf11057df3251b7eefda Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 10:51:34 -0400
Subject: [PATCH 6163/8469] =?UTF-8?q?Bump=20version:=2027.0.0=20=E2=86=92?=
 =?UTF-8?q?=2027.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 655b8f2127..15570e34d1 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.0.0
+current_version = 27.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 40977fe470..a4d5f60705 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.0.0",
+    version="27.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a343901877cfe4fa922c40076f3c16aa59d4b265 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 11:05:18 -0400
Subject: [PATCH 6164/8469] Remove unused import

---
 setuptools/tests/test_msvc.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 14e0f208aa..a0c76ea0da 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -6,8 +6,6 @@
 import contextlib
 import distutils.errors
 
-from setuptools.extern import six
-
 import pytest
 try:
     from unittest import mock

From 602dc92bd696ad292b4ab44638a01d0035d560ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 11:24:34 -0400
Subject: [PATCH 6165/8469] Fix msvc monkeypatching, revealed by Appveyor
 tests. Fixes #778.

---
 CHANGES.rst          | 5 +++++
 setuptools/monkey.py | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 35e69661b8..58a36db73b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v27.1.1
+-------
+
+* #778: Fix MSVC monkeypatching.
+
 v27.1.0
 -------
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 5a0cf43bfd..63891e7476 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -7,6 +7,7 @@
 import platform
 
 import setuptools
+from . import msvc
 
 
 __all__ = []
@@ -134,22 +135,22 @@ def patch_for_msvc_specialized_compiler():
     try:
         # Patch distutils.msvc9compiler
         unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall
-        msvc9compiler.find_vcvarsall = msvc9_find_vcvarsall
+        msvc9compiler.find_vcvarsall = msvc.msvc9_find_vcvarsall
         unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
-        msvc9compiler.query_vcvarsall = msvc9_query_vcvarsall
+        msvc9compiler.query_vcvarsall = msvc.msvc9_query_vcvarsall
     except NameError:
         pass
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
         unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
-        msvc14compiler._get_vc_env = msvc14_get_vc_env
+        msvc14compiler._get_vc_env = msvc.msvc14_get_vc_env
     except NameError:
         pass
 
     try:
         # Patch distutils._msvccompiler.gen_lib_options for Numpy
         unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
-        msvc14compiler.gen_lib_options = msvc14_gen_lib_options
+        msvc14compiler.gen_lib_options = msvc.msvc14_gen_lib_options
     except NameError:
         pass

From a5eba2162977f28450bbc7c53b09f2272d7c118a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 11:24:44 -0400
Subject: [PATCH 6166/8469] =?UTF-8?q?Bump=20version:=2027.1.0=20=E2=86=92?=
 =?UTF-8?q?=2027.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 15570e34d1..cb99a56ecf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.1.0
+current_version = 27.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a4d5f60705..c81ddaf192 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.1.0",
+    version="27.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a6524a5c0d40aedbaa06eb41c70990c44a1dfd15 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Fri, 9 Sep 2016 11:50:41 -0400
Subject: [PATCH 6167/8469] Move msvc import to avoid a circular import

---
 setuptools/monkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 63891e7476..3308383162 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -7,7 +7,6 @@
 import platform
 
 import setuptools
-from . import msvc
 
 
 __all__ = []
@@ -112,6 +111,8 @@ def patch_for_msvc_specialized_compiler():
     Patch functions in distutils to use standalone Microsoft Visual C++
     compilers.
     """
+    from . import msvc
+
     try:
         # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
         import distutils.msvc9compiler as msvc9compiler

From 93443d79b18d4c318de366dc6ba585b2e9476d04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 11:56:44 -0400
Subject: [PATCH 6168/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 58a36db73b..99de268426 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v27.1.2
+-------
+
+* #779 via #781: Fix circular import.
+
 v27.1.1
 -------
 

From 5cc0ec25c0ef816de01b7416aa6bef172f91566d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 11:57:25 -0400
Subject: [PATCH 6169/8469] =?UTF-8?q?Bump=20version:=2027.1.1=20=E2=86=92?=
 =?UTF-8?q?=2027.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index cb99a56ecf..69dd615105 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.1.1
+current_version = 27.1.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c81ddaf192..b2b1a0e12f 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.1.1",
+    version="27.1.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b6f2fee975c570d2beadb9007e6302411f91ab4b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 12:39:43 -0400
Subject: [PATCH 6170/8469] Consolidate function patching and resolution of
 unpatched function, aligning pattern with the patched classes.

---
 setuptools/monkey.py     | 33 ++++++++++++++++++++-------------
 setuptools/msvc.py       | 10 +++++-----
 setuptools/py26compat.py |  7 +++++++
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 3308383162..24739d97f8 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -6,6 +6,8 @@
 import distutils.filelist
 import platform
 
+from .py26compat import import_module
+
 import setuptools
 
 
@@ -103,7 +105,20 @@ def _patch_distribution_metadata_write_pkg_info():
     )
 
 
-unpatched = dict()
+def patch_func(replacement, original):
+    # first set the 'unpatched' attribute on the replacement to
+    # point to the original.
+    vars(replacement).setdefault('unpatched', original)
+
+    # next resolve the module in which the original func resides
+    target_mod = import_module(original.__module__)
+
+    # finally replace the function in the original module
+    setattr(target_mod, original.__name__, replacement)
+
+
+def get_unpatched_func(candidate):
+    return getattr(candidate, 'unpatched')
 
 
 def patch_for_msvc_specialized_compiler():
@@ -129,29 +144,21 @@ def patch_for_msvc_specialized_compiler():
         # Compilers only availables on Microsoft Windows
         return
 
-    if unpatched:
-        # Already patched
-        return
-
     try:
         # Patch distutils.msvc9compiler
-        unpatched['msvc9_find_vcvarsall'] = msvc9compiler.find_vcvarsall
-        msvc9compiler.find_vcvarsall = msvc.msvc9_find_vcvarsall
-        unpatched['msvc9_query_vcvarsall'] = msvc9compiler.query_vcvarsall
-        msvc9compiler.query_vcvarsall = msvc.msvc9_query_vcvarsall
+        patch_func(msvc.msvc9_find_vcvarsall, msvc9compiler.find_vcvarsall)
+        patch_func(msvc.msvc9_query_vcvarsall, msvc9compiler.query_vcvarsall)
     except NameError:
         pass
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
-        unpatched['msvc14_get_vc_env'] = msvc14compiler._get_vc_env
-        msvc14compiler._get_vc_env = msvc.msvc14_get_vc_env
+        patch_func(msvc.msvc14_get_vc_env, msvc14compiler._get_vc_env)
     except NameError:
         pass
 
     try:
         # Patch distutils._msvccompiler.gen_lib_options for Numpy
-        unpatched['msvc14_gen_lib_options'] = msvc14compiler.gen_lib_options
-        msvc14compiler.gen_lib_options = msvc.msvc14_gen_lib_options
+        patch_func(msvc.msvc14_gen_lib_options, msvc14compiler.gen_lib_options)
     except NameError:
         pass
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index a902a4a768..ae5a2b6aa9 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -24,7 +24,7 @@
 
 from setuptools.extern.six.moves import filterfalse
 
-from . import monkey
+from .monkey import get_unpatched_func
 
 if platform.system() == 'Windows':
     from setuptools.extern.six.moves import winreg
@@ -87,7 +87,7 @@ def msvc9_find_vcvarsall(version):
         if os.path.isfile(vcvarsall):
             return vcvarsall
 
-    return monkey.unpatched['msvc9_find_vcvarsall'](version)
+    return get_unpatched_func(msvc9_find_vcvarsall)(version)
 
 
 def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
@@ -120,7 +120,7 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     """
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
-        orig = monkey.unpatched['msvc9_query_vcvarsall']
+        orig = get_unpatched_func(msvc9_query_vcvarsall)
         return orig(ver, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError:
         # Pass error if Vcvarsall.bat is missing
@@ -160,7 +160,7 @@ def msvc14_get_vc_env(plat_spec):
     """
     # Try to get environment from vcvarsall.bat (Classical way)
     try:
-        return monkey.unpatched['msvc14_get_vc_env'](plat_spec)
+        return get_unpatched_func(msvc14_get_vc_env)(plat_spec)
     except distutils.errors.DistutilsPlatformError:
         # Pass error Vcvarsall.bat is missing
         pass
@@ -183,7 +183,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
         import numpy as np
         if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'):
             return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
-    return monkey.unpatched['msvc14_gen_lib_options'](*args, **kwargs)
+    return get_unpatched_func(msvc14_gen_lib_options)(*args, **kwargs)
 
 
 def _augment_exception(exc, version, arch=''):
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 90cd695a35..5778cdf1ba 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -22,3 +22,10 @@ def strip_fragment(url):
 
 if sys.version_info >= (2, 7):
     strip_fragment = lambda x: x
+
+
+try:
+    from importlib import import_module
+except ImportError:
+    def import_module(module_name):
+        return __import__(module_name, fromlist=['__name__'])

From b7b9cb23f217095e79c618c0e3196712d2d9a285 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 12:45:21 -0400
Subject: [PATCH 6171/8469] Use programmatic import and add comment explaining
 purpose.

---
 setuptools/monkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 24739d97f8..5f098986b1 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -126,7 +126,8 @@ def patch_for_msvc_specialized_compiler():
     Patch functions in distutils to use standalone Microsoft Visual C++
     compilers.
     """
-    from . import msvc
+    # import late to avoid circular imports on Python < 3.5
+    msvc = import_module('setuptools.msvc')
 
     try:
         # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)

From 7756f651df47dc870e886c1b13c5b48068c2dd5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 12:54:34 -0400
Subject: [PATCH 6172/8469] Allow get_unpatched to be called to get unpatched
 version of a class or function, further harmonizing the interfaces.

---
 setuptools/monkey.py | 14 ++++++++++++--
 setuptools/msvc.py   | 10 +++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 5f098986b1..7a23641c8d 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -5,6 +5,7 @@
 import sys
 import distutils.filelist
 import platform
+import types
 
 from .py26compat import import_module
 
@@ -18,7 +19,16 @@
 """
 
 
-def get_unpatched(cls):
+def get_unpatched(item):
+    lookup = (
+        get_unpatched_class if isinstance(item, type) else
+        get_unpatched_function if isinstance(item, types.FunctionType) else
+        lambda item: None
+    )
+    return lookup(item)
+
+
+def get_unpatched_class(cls):
     """Protect against re-patching the distutils if reloaded
 
     Also ensures that no other distutils extension monkeypatched the distutils
@@ -117,7 +127,7 @@ def patch_func(replacement, original):
     setattr(target_mod, original.__name__, replacement)
 
 
-def get_unpatched_func(candidate):
+def get_unpatched_function(candidate):
     return getattr(candidate, 'unpatched')
 
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index ae5a2b6aa9..e9665e10cb 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -24,7 +24,7 @@
 
 from setuptools.extern.six.moves import filterfalse
 
-from .monkey import get_unpatched_func
+from .monkey import get_unpatched
 
 if platform.system() == 'Windows':
     from setuptools.extern.six.moves import winreg
@@ -87,7 +87,7 @@ def msvc9_find_vcvarsall(version):
         if os.path.isfile(vcvarsall):
             return vcvarsall
 
-    return get_unpatched_func(msvc9_find_vcvarsall)(version)
+    return get_unpatched(msvc9_find_vcvarsall)(version)
 
 
 def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
@@ -120,7 +120,7 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     """
     # Try to get environement from vcvarsall.bat (Classical way)
     try:
-        orig = get_unpatched_func(msvc9_query_vcvarsall)
+        orig = get_unpatched(msvc9_query_vcvarsall)
         return orig(ver, arch, *args, **kwargs)
     except distutils.errors.DistutilsPlatformError:
         # Pass error if Vcvarsall.bat is missing
@@ -160,7 +160,7 @@ def msvc14_get_vc_env(plat_spec):
     """
     # Try to get environment from vcvarsall.bat (Classical way)
     try:
-        return get_unpatched_func(msvc14_get_vc_env)(plat_spec)
+        return get_unpatched(msvc14_get_vc_env)(plat_spec)
     except distutils.errors.DistutilsPlatformError:
         # Pass error Vcvarsall.bat is missing
         pass
@@ -183,7 +183,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
         import numpy as np
         if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'):
             return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
-    return get_unpatched_func(msvc14_gen_lib_options)(*args, **kwargs)
+    return get_unpatched(msvc14_gen_lib_options)(*args, **kwargs)
 
 
 def _augment_exception(exc, version, arch=''):

From c49d0a044c0483f956902068a87f732b38cbbf6e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 12:55:28 -0400
Subject: [PATCH 6173/8469] Extract a variable for nicer indentation.

---
 setuptools/monkey.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 7a23641c8d..c9a52c610b 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -37,9 +37,8 @@ def get_unpatched_class(cls):
     while cls.__module__.startswith('setuptools'):
         cls, = cls.__bases__
     if not cls.__module__.startswith('distutils'):
-        raise AssertionError(
-            "distutils has already been patched by %r" % cls
-        )
+        msg = "distutils has already been patched by %r" % cls
+        raise AssertionError(msg)
     return cls
 
 

From 2a7a7179ca18b1c97e435726e62c3ab0227fb20e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 12:57:02 -0400
Subject: [PATCH 6174/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 99de268426..da6322a2e7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v27.2.0
+-------
+
+* Nicer, more consistent interfaces for msvc monkeypatching.
+
 v27.1.2
 -------
 

From b700b3611d39d28a64973ec6abd006fc75af5df0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Sep 2016 13:04:26 -0400
Subject: [PATCH 6175/8469] Account for the class might be old style on Python
 2.

---
 setuptools/monkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index c9a52c610b..c4289762db 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -8,6 +8,7 @@
 import types
 
 from .py26compat import import_module
+from setuptools.extern import six
 
 import setuptools
 
@@ -21,7 +22,7 @@
 
 def get_unpatched(item):
     lookup = (
-        get_unpatched_class if isinstance(item, type) else
+        get_unpatched_class if isinstance(item, six.class_types) else
         get_unpatched_function if isinstance(item, types.FunctionType) else
         lambda item: None
     )

From d0f84684de3a4c3d9dbb1602f9810d9688847e09 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 9 Sep 2016 18:29:10 -0700
Subject: [PATCH 6176/8469] Issue #28046: Fix distutils

Why do we have two sysconfig modules again?
---
 sysconfig.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 681359870c..229626e1b4 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -418,7 +418,11 @@ def expand_makefile_vars(s, vars):
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     # _sysconfigdata is generated at build time, see the sysconfig module
-    name = '_sysconfigdata_' + sys.abiflags
+    name = '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
+        abi=sys.abiflags,
+        platform=sys.platform,
+        multiarch=getattr(sys.implementation, '_multiarch', ''),
+    )
     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
     build_time_vars = _temp.build_time_vars
     global _config_vars

From ba17bdeda7e2d5c1ac05be611569785b3aec20bd Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 11 Sep 2016 12:50:02 +0300
Subject: [PATCH 6177/8469] Issue #22493: Inline flags now should be used only
 at the start of the regular expression.  Deprecation warning is emitted if
 uses them in the middle of the regular expression.

---
 filelist.py            | 15 ++++++++++-----
 tests/test_filelist.py | 14 +++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/filelist.py b/filelist.py
index 6522e69f06..c92d5fdba3 100644
--- a/filelist.py
+++ b/filelist.py
@@ -302,21 +302,26 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
         else:
             return pattern
 
+    # ditch start and end characters
+    start, _, end = glob_to_re('_').partition('_')
+
     if pattern:
         pattern_re = glob_to_re(pattern)
+        assert pattern_re.startswith(start) and pattern_re.endswith(end)
     else:
         pattern_re = ''
 
     if prefix is not None:
-        # ditch end of pattern character
-        empty_pattern = glob_to_re('')
-        prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
+        prefix_re = glob_to_re(prefix)
+        assert prefix_re.startswith(start) and prefix_re.endswith(end)
+        prefix_re = prefix_re[len(start): len(prefix_re) - len(end)]
         sep = os.sep
         if os.sep == '\\':
             sep = r'\\'
-        pattern_re = "^" + sep.join((prefix_re, ".*" + pattern_re))
+        pattern_re = pattern_re[len(start): len(pattern_re) - len(end)]
+        pattern_re = r'%s\A%s%s.*%s%s' % (start, prefix_re, sep, pattern_re, end)
     else:                               # no prefix -- respect anchor flag
         if anchor:
-            pattern_re = "^" + pattern_re
+            pattern_re = r'%s\A%s' % (start, pattern_re[len(start):])
 
     return re.compile(pattern_re)
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 391af3cba2..c71342d0dc 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -51,14 +51,14 @@ def test_glob_to_re(self):
 
         for glob, regex in (
             # simple cases
-            ('foo*', r'foo[^%(sep)s]*\Z(?ms)'),
-            ('foo?', r'foo[^%(sep)s]\Z(?ms)'),
-            ('foo??', r'foo[^%(sep)s][^%(sep)s]\Z(?ms)'),
+            ('foo*', r'(?s:foo[^%(sep)s]*)\Z'),
+            ('foo?', r'(?s:foo[^%(sep)s])\Z'),
+            ('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])\Z'),
             # special cases
-            (r'foo\\*', r'foo\\\\[^%(sep)s]*\Z(?ms)'),
-            (r'foo\\\*', r'foo\\\\\\[^%(sep)s]*\Z(?ms)'),
-            ('foo????', r'foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s]\Z(?ms)'),
-            (r'foo\\??', r'foo\\\\[^%(sep)s][^%(sep)s]\Z(?ms)')):
+            (r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)\Z'),
+            (r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)\Z'),
+            ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'),
+            (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z')):
             regex = regex % {'sep': sep}
             self.assertEqual(glob_to_re(glob), regex)
 

From 8a0f7a5412ea23ca0a9a2f9ef9352879b11909d1 Mon Sep 17 00:00:00 2001
From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Sun, 11 Sep 2016 22:22:24 +0200
Subject: [PATCH 6178/8469] Issue #28046: get_sysconfigdata_name() uses the
 _PYTHON_SYSCONFIGDATA_NAME environment variable that is defined when
 cross-compiling.

---
 sysconfig.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 229626e1b4..8bf1a7016b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -418,11 +418,12 @@ def expand_makefile_vars(s, vars):
 def _init_posix():
     """Initialize the module as appropriate for POSIX systems."""
     # _sysconfigdata is generated at build time, see the sysconfig module
-    name = '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
+    name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
+        '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
         abi=sys.abiflags,
         platform=sys.platform,
         multiarch=getattr(sys.implementation, '_multiarch', ''),
-    )
+    ))
     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
     build_time_vars = _temp.build_time_vars
     global _config_vars

From 1f23f9a25e6c91554954185e84497056062093be Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven@wedontsleep.org>
Date: Tue, 13 Sep 2016 10:54:45 +1200
Subject: [PATCH 6179/8469] Don't duplicate error case in package_index

easy_install has code to handle parsing a requirement, catching the
ValueError and then raising a DistUtilsError. This code was entirely
duplicated in package_index, so I've slightly refactored to remove
the duplication.
---
 setuptools/command/easy_install.py | 14 +++-----------
 setuptools/package_index.py        | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e8b90c704e..a3792ce223 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -49,8 +49,9 @@
 from setuptools.py31compat import get_path, get_config_vars
 from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
-from setuptools.package_index import PackageIndex
-from setuptools.package_index import URL_SCHEME
+from setuptools.package_index import (
+    PackageIndex, parse_requirement_arg, URL_SCHEME,
+)
 from setuptools.command import bdist_egg, egg_info
 from pkg_resources import (
     yield_lines, normalize_path, resource_string, ensure_directory,
@@ -1522,15 +1523,6 @@ def get_exe_prefixes(exe_filename):
     return prefixes
 
 
-def parse_requirement_arg(spec):
-    try:
-        return Requirement.parse(spec)
-    except ValueError:
-        raise DistutilsError(
-            "Not a URL, existing file, or requirement spec: %r" % (spec,)
-        )
-
-
 class PthDistributions(Environment):
     """A .pth file with Distribution paths in it"""
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 82cd608f55..3fb39269e1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -52,6 +52,15 @@
 user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
 
 
+def parse_requirement_arg(spec):
+    try:
+        return Requirement.parse(spec)
+    except ValueError:
+        raise DistutilsError(
+            "Not a URL, existing file, or requirement spec: %r" % (spec,)
+        )
+
+
 def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
@@ -561,13 +570,7 @@ def download(self, spec, tmpdir):
                 # Existing file or directory, just return it
                 return spec
             else:
-                try:
-                    spec = Requirement.parse(spec)
-                except ValueError:
-                    raise DistutilsError(
-                        "Not a URL, existing file, or requirement spec: %r" %
-                        (spec,)
-                    )
+                spec = parse_requirement_arg(spec)
         return getattr(self.fetch_distribution(spec, tmpdir), 'location', None)
 
     def fetch_distribution(

From 11ef9a98f1da8c883fc346ce78afbad78d5eff83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Sep 2016 13:54:26 -0400
Subject: [PATCH 6180/8469] Suppress ValueError in fixup_namespace_packages.
 Fixes #520. Fixes #513.

---
 CHANGES.rst               |  3 +++
 pkg_resources/__init__.py | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index da6322a2e7..af25cc4a2e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,9 @@ CHANGES
 v27.2.0
 -------
 
+* #520 and #513: Suppress ValueErrors in fixup_namespace_packages
+  when lookup fails.
+
 * Nicer, more consistent interfaces for msvc monkeypatching.
 
 v27.1.2
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a93a3da7af..4208c4ec47 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2066,6 +2066,15 @@ def _rebuild_mod_path(orig_path, package_name, module):
     """
     sys_path = [_normalize_cached(p) for p in sys.path]
 
+    def safe_sys_path_index(entry):
+        """
+        Workaround for #520 and #513.
+        """
+        try:
+            return sys_path.index(entry)
+        except ValueError:
+            return float('inf')
+
     def position_in_sys_path(path):
         """
         Return the ordinal of the path based on its position in sys.path
@@ -2073,7 +2082,7 @@ def position_in_sys_path(path):
         path_parts = path.split(os.sep)
         module_parts = package_name.count('.') + 1
         parts = path_parts[:-module_parts]
-        return sys_path.index(_normalize_cached(os.sep.join(parts)))
+        return safe_sys_path_index(_normalize_cached(os.sep.join(parts)))
 
     orig_path.sort(key=position_in_sys_path)
     module.__path__[:] = [_normalize_cached(p) for p in orig_path]

From 629ad3da717eb360eda53874e590b48f0a5acd2e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Sep 2016 14:00:36 -0400
Subject: [PATCH 6181/8469] =?UTF-8?q?Bump=20version:=2027.1.2=20=E2=86=92?=
 =?UTF-8?q?=2027.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 69dd615105..ce161ffe44 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.1.2
+current_version = 27.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b2b1a0e12f..d04d9b5bd5 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.1.2",
+    version="27.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 53d8b6b69d9a24e53bf25d830124c4698fe44ce3 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 18 Sep 2016 03:52:48 +0700
Subject: [PATCH 6182/8469] Upgrade pyparsing to version 2.1.9

---
 pkg_resources/_vendor/pyparsing.py | 158 ++++++++++++++++++++++++-----
 pkg_resources/_vendor/vendored.txt |   2 +-
 2 files changed, 131 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 pkg_resources/_vendor/pyparsing.py

diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
old mode 100644
new mode 100755
index 89cffc10b8..d602a35af7
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -1,6 +1,6 @@
 # module pyparsing.py
 #
-# Copyright (c) 2003-2015  Paul T. McGuire
+# Copyright (c) 2003-2016  Paul T. McGuire
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,15 +31,18 @@
 don't need to learn a new syntax for defining grammars or matching expressions - the parsing module
 provides a library of classes that you use to construct the grammar directly in Python.
 
-Here is a program to parse "Hello, World!" (or any greeting of the form C{"<salutation>, <addressee>!"})::
+Here is a program to parse "Hello, World!" (or any greeting of the form 
+C{"<salutation>, <addressee>!"}), built up using L{Word}, L{Literal}, and L{And} elements 
+(L{'+'<ParserElement.__add__>} operator gives L{And} expressions, strings are auto-converted to
+L{Literal} expressions)::
 
     from pyparsing import Word, alphas
 
     # define grammar of a greeting
-    greet = Word( alphas ) + "," + Word( alphas ) + "!"
+    greet = Word(alphas) + "," + Word(alphas) + "!"
 
     hello = "Hello, World!"
-    print (hello, "->", greet.parseString( hello ))
+    print (hello, "->", greet.parseString(hello))
 
 The program outputs the following::
 
@@ -48,7 +51,7 @@
 The Python representation of the grammar is quite readable, owing to the self-explanatory
 class names, and the use of '+', '|' and '^' operators.
 
-The parsed results returned from L{I{ParserElement.parseString}<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
+The L{ParseResults} object returned from L{ParserElement.parseString<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
 object with named attributes.
 
 The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
@@ -57,8 +60,8 @@ class names, and the use of '+', '|' and '^' operators.
  - embedded comments
 """
 
-__version__ = "2.1.8"
-__versionTime__ = "14 Aug 2016 08:43 UTC"
+__version__ = "2.1.9"
+__versionTime__ = "10 Sep 2016 15:10 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -107,7 +110,7 @@ class names, and the use of '+', '|' and '^' operators.
 'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
 'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
 'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
-'tokenMap', 'pyparsing_common',
+'CloseMatch', 'tokenMap', 'pyparsing_common',
 ]
 
 system_version = tuple(sys.version_info)[:3]
@@ -291,7 +294,7 @@ def __init__(self,p1,p2):
     def __getitem__(self,i):
         return self.tup[i]
     def __repr__(self):
-        return repr(self.tup)
+        return repr(self.tup[0])
     def setOffset(self,i):
         self.tup = (self.tup[0],i)
 
@@ -310,6 +313,7 @@ class ParseResults(object):
         # equivalent form:
         # date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
 
+        # parseString returns a ParseResults object
         result = date_str.parseString("1999/12/31")
 
         def test(s, fn=repr):
@@ -836,8 +840,8 @@ def getName(self):
                 return None
         elif (len(self) == 1 and
                len(self.__tokdict) == 1 and
-               self.__tokdict.values()[0][0][1] in (0,-1)):
-            return self.__tokdict.keys()[0]
+               next(iter(self.__tokdict.values()))[0][1] in (0,-1)):
+            return next(iter(self.__tokdict.keys()))
         else:
             return None
 
@@ -1775,7 +1779,15 @@ def split(self, instring, maxsplit=_MAX_INT, includeSeparators=False):
 
     def __add__(self, other ):
         """
-        Implementation of + operator - returns C{L{And}}
+        Implementation of + operator - returns C{L{And}}. Adding strings to a ParserElement
+        converts them to L{Literal}s by default.
+        
+        Example::
+            greet = Word(alphas) + "," + Word(alphas) + "!"
+            hello = "Hello, World!"
+            print (hello, "->", greet.parseString(hello))
+        Prints::
+            Hello, World! -> ['Hello', ',', 'World', '!']
         """
         if isinstance( other, basestring ):
             other = ParserElement._literalStringClass( other )
@@ -1972,7 +1984,7 @@ def __invert__( self ):
 
     def __call__(self, name=None):
         """
-        Shortcut for C{L{setResultsName}}, with C{listAllMatches=default}.
+        Shortcut for C{L{setResultsName}}, with C{listAllMatches=False}.
         
         If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
         passed as C{True}.
@@ -2083,7 +2095,8 @@ def setDebug( self, flag=True ):
             Match alphaword at loc 15(1,16)
             Exception raised:Expected alphaword (at char 15), (line:1, col:16)
 
-        The output shown is that produced by the default debug actions. Prior to attempting
+        The output shown is that produced by the default debug actions - custom debug actions can be
+        specified using L{setDebugActions}. Prior to attempting
         to match the C{wd} expression, the debugging message C{"Match <exprname> at loc <n>(<line>,<col>)"}
         is shown. Then if the parse succeeds, a C{"Matched"} message is shown, or an C{"Exception raised"}
         message is shown. Also note the use of L{setName} to assign a human-readable name to the expression,
@@ -2393,8 +2406,10 @@ class Keyword(Token):
     """
     DEFAULT_KEYWORD_CHARS = alphanums+"_$"
 
-    def __init__( self, matchString, identChars=DEFAULT_KEYWORD_CHARS, caseless=False ):
+    def __init__( self, matchString, identChars=None, caseless=False ):
         super(Keyword,self).__init__()
+        if identChars is None:
+            identChars = Keyword.DEFAULT_KEYWORD_CHARS
         self.match = matchString
         self.matchLen = len(matchString)
         try:
@@ -2469,7 +2484,7 @@ class CaselessKeyword(Keyword):
         
     (Contrast with example for L{CaselessLiteral}.)
     """
-    def __init__( self, matchString, identChars=Keyword.DEFAULT_KEYWORD_CHARS ):
+    def __init__( self, matchString, identChars=None ):
         super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
 
     def parseImpl( self, instring, loc, doActions=True ):
@@ -2478,6 +2493,67 @@ def parseImpl( self, instring, loc, doActions=True ):
             return loc+self.matchLen, self.match
         raise ParseException(instring, loc, self.errmsg, self)
 
+class CloseMatch(Token):
+    """
+    A variation on L{Literal} which matches "close" matches, that is, 
+    strings with at most 'n' mismatching characters. C{CloseMatch} takes parameters:
+     - C{match_string} - string to be matched
+     - C{maxMismatches} - (C{default=1}) maximum number of mismatches allowed to count as a match
+    
+    The results from a successful parse will contain the matched text from the input string and the following named results:
+     - C{mismatches} - a list of the positions within the match_string where mismatches were found
+     - C{original} - the original match_string used to compare against the input string
+    
+    If C{mismatches} is an empty list, then the match was an exact match.
+    
+    Example::
+        patt = CloseMatch("ATCATCGAATGGA")
+        patt.parseString("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
+        patt.parseString("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
+
+        # exact match
+        patt.parseString("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
+
+        # close match allowing up to 2 mismatches
+        patt = CloseMatch("ATCATCGAATGGA", maxMismatches=2)
+        patt.parseString("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
+    """
+    def __init__(self, match_string, maxMismatches=1):
+        super(CloseMatch,self).__init__()
+        self.name = match_string
+        self.match_string = match_string
+        self.maxMismatches = maxMismatches
+        self.errmsg = "Expected %r (with up to %d mismatches)" % (self.match_string, self.maxMismatches)
+        self.mayIndexError = False
+        self.mayReturnEmpty = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        start = loc
+        instrlen = len(instring)
+        maxloc = start + len(self.match_string)
+
+        if maxloc <= instrlen:
+            match_string = self.match_string
+            match_stringloc = 0
+            mismatches = []
+            maxMismatches = self.maxMismatches
+
+            for match_stringloc,s_m in enumerate(zip(instring[loc:maxloc], self.match_string)):
+                src,mat = s_m
+                if src != mat:
+                    mismatches.append(match_stringloc)
+                    if len(mismatches) > maxMismatches:
+                        break
+            else:
+                loc = match_stringloc + 1
+                results = ParseResults([instring[start:loc]])
+                results['original'] = self.match_string
+                results['mismatches'] = mismatches
+                return loc, results
+
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
 class Word(Token):
     """
     Token for matching words composed of allowed character sets.
@@ -2646,7 +2722,7 @@ class Regex(Token):
 
     Example::
         realnum = Regex(r"[+-]?\d+\.\d*")
-        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)')
+        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
         # ref: http://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
         roman = Regex(r"M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
     """
@@ -4274,7 +4350,10 @@ def reset(self):
 
 def traceParseAction(f):
     """
-    Decorator for debugging parse actions.
+    Decorator for debugging parse actions. 
+    
+    When the parse action is called, this decorator will print C{">> entering I{method-name}(line:I{current_source_line}, I{parse_location}, I{matched_tokens})".}
+    When the parse action completes, the decorator will print C{"<<"} followed by the returned value, or any exception that the parse action raised.
 
     Example::
         wd = Word(alphas)
@@ -4339,9 +4418,16 @@ def countedArray( expr, intExpr=None ):
         integer expr expr expr...
     where the leading integer tells how many expr expressions follow.
     The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+    
+    If C{intExpr} is specified, it should be a pyparsing expression that produces an integer value.
 
     Example::
         countedArray(Word(alphas)).parseString('2 ab cd ef')  # -> ['ab', 'cd']
+
+        # in this parser, the leading integer value is given in binary,
+        # '10' indicating that 2 values are in the array
+        binaryConstant = Word('01').setParseAction(lambda t: int(t[0], 2))
+        countedArray(Word(alphas), intExpr=binaryConstant).parseString('10 ab cd ef')  # -> ['ab', 'cd']
     """
     arrayExpr = Forward()
     def countFieldParseAction(s,l,t):
@@ -4726,10 +4812,10 @@ def pa(s,l,t):
     return pa
 
 upcaseTokens = tokenMap(lambda t: _ustr(t).upper())
-"""Helper parse action to convert tokens to upper case."""
+"""(Deprecated) Helper parse action to convert tokens to upper case. Deprecated in favor of L{pyparsing_common.upcaseTokens}"""
 
 downcaseTokens = tokenMap(lambda t: _ustr(t).lower())
-"""Helper parse action to convert tokens to lower case."""
+"""(Deprecated) Helper parse action to convert tokens to lower case. Deprecated in favor of L{pyparsing_common.downcaseTokens}"""
     
 def _makeTags(tagStr, xml):
     """Internal helper to construct opening and closing tag expressions, given a tag name"""
@@ -4921,7 +5007,7 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
 
     Example::
         # simple example of four-function arithmetic with ints and variable names
-        integer = pyparsing_common.signedInteger
+        integer = pyparsing_common.signed_integer
         varname = pyparsing_common.identifier 
         
         arith_expr = infixNotation(integer | varname,
@@ -5241,23 +5327,27 @@ def replaceHTMLEntity(t):
                                   Optional( Word(" \t") +
                                             ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
 commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
-"""Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
+"""(Deprecated) Predefined expression of 1 or more printable words or quoted strings, separated by commas.
+   This expression is deprecated in favor of L{pyparsing_common.comma_separated_list}."""
 
 # some other useful expressions - using lower-case class name since we are really using this as a namespace
 class pyparsing_common:
     """
     Here are some common low-level expressions that may be useful in jump-starting parser development:
-     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sciReal>})
+     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sci_real>})
      - common L{programming identifiers<identifier>}
      - network addresses (L{MAC<mac_address>}, L{IPv4<ipv4_address>}, L{IPv6<ipv6_address>})
      - ISO8601 L{dates<iso8601_date>} and L{datetime<iso8601_datetime>}
      - L{UUID<uuid>}
+     - L{comma-separated list<comma_separated_list>}
     Parse actions:
      - C{L{convertToInteger}}
      - C{L{convertToFloat}}
      - C{L{convertToDate}}
      - C{L{convertToDatetime}}
      - C{L{stripHTMLTags}}
+     - C{L{upcaseTokens}}
+     - C{L{downcaseTokens}}
 
     Example::
         pyparsing_common.number.runTests('''
@@ -5393,25 +5483,25 @@ class pyparsing_common:
     hex_integer = Word(hexnums).setName("hex integer").setParseAction(tokenMap(int,16))
     """expression that parses a hexadecimal integer, returns an int"""
 
-    signedInteger = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
+    signed_integer = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
     """expression that parses an integer with optional leading sign, returns an int"""
 
-    fraction = (signedInteger().setParseAction(convertToFloat) + '/' + signedInteger().setParseAction(convertToFloat)).setName("fraction")
+    fraction = (signed_integer().setParseAction(convertToFloat) + '/' + signed_integer().setParseAction(convertToFloat)).setName("fraction")
     """fractional expression of an integer divided by an integer, returns a float"""
     fraction.addParseAction(lambda t: t[0]/t[-1])
 
-    mixed_integer = (fraction | signedInteger + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
+    mixed_integer = (fraction | signed_integer + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
     """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
     mixed_integer.addParseAction(sum)
 
     real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
     """expression that parses a floating point number and returns a float"""
 
-    sciReal = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
+    sci_real = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
     """expression that parses a floating point number with optional scientific notation and returns a float"""
 
     # streamlining this expression makes the docs nicer-looking
-    number = (sciReal | real | signedInteger).streamline()
+    number = (sci_real | real | signed_integer).streamline()
     """any numeric expression, returns the corresponding Python type"""
 
     fnumber = Regex(r'[+-]?\d+\.?\d*([eE][+-]?\d+)?').setName("fnumber").setParseAction(convertToFloat)
@@ -5503,6 +5593,18 @@ def stripHTMLTags(s, l, tokens):
         """
         return pyparsing_common._html_stripper.transformString(tokens[0])
 
+    _commasepitem = Combine(OneOrMore(~Literal(",") + ~LineEnd() + Word(printables, excludeChars=',') 
+                                        + Optional( White(" \t") ) ) ).streamline().setName("commaItem")
+    comma_separated_list = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("comma separated list")
+    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
+
+    upcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).upper()))
+    """Parse action to convert tokens to upper case."""
+
+    downcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).lower()))
+    """Parse action to convert tokens to lower case."""
+
+
 if __name__ == "__main__":
 
     selectToken    = CaselessLiteral("select")
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 2b51c5474f..22e1309c8a 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
 packaging==16.7
-pyparsing==2.1.8
+pyparsing==2.1.9
 six==1.10.0
 appdirs==1.4.0

From 5e4eea7d600f44321e76689890f9f885669f34c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Sep 2016 17:05:07 -0400
Subject: [PATCH 6183/8469] In test command, add installed eggs to PYTHONPATH
 when invoking tests so that subprocesses will also have the dependencies
 available. Fixes #794.

---
 CHANGES.rst                |  7 +++++
 setuptools/command/test.py | 57 ++++++++++++++++++++++++++++++++------
 setuptools/dist.py         |  1 +
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index af25cc4a2e..54a4d52a56 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v27.3.0
+-------
+
+* #794: In test command, add installed eggs to PYTHONPATH
+  when invoking tests so that subprocesses will also have the
+  dependencies available.
+
 v27.2.0
 -------
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 2d1adba85a..e0650d27f4 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -1,10 +1,12 @@
+import os
+import operator
 import sys
 import contextlib
 from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import map
+from setuptools.extern.six.moves import map, filter
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
@@ -112,7 +114,7 @@ def with_project_on_sys_path(self, func):
             func()
 
     @contextlib.contextmanager
-    def project_on_sys_path(self):
+    def project_on_sys_path(self, include_dists=[]):
         with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
@@ -144,23 +146,57 @@ def project_on_sys_path(self):
         old_modules = sys.modules.copy()
 
         try:
-            sys.path.insert(0, normalize_path(ei_cmd.egg_base))
+            project_path = normalize_path(ei_cmd.egg_base)
+            sys.path.insert(0, project_path)
             working_set.__init__()
             add_activation_listener(lambda dist: dist.activate())
             require('%s==%s' % (ei_cmd.egg_name, ei_cmd.egg_version))
-            yield
+            with self.paths_on_pythonpath([project_path]):
+                yield
         finally:
             sys.path[:] = old_path
             sys.modules.clear()
             sys.modules.update(old_modules)
             working_set.__init__()
 
+    @staticmethod
+    @contextlib.contextmanager
+    def paths_on_pythonpath(paths):
+        """
+        Add the indicated paths to the head of the PYTHONPATH environment
+        variable so that subprocesses will also see the packages at
+        these paths.
+
+        Do this in a context that restores the value on exit.
+        """
+        nothing = object()
+        orig_pythonpath = os.environ.get('PYTHONPATH', nothing)
+        current_pythonpath = os.environ.get('PYTHONPATH', '')
+        try:
+            prefix = os.pathsep.join(paths)
+            to_join = filter(None, [prefix, current_pythonpath])
+            new_path = os.pathsep.join(to_join)
+            if new_path:
+                os.environ['PYTHONPATH'] = new_path
+            yield
+        finally:
+            if orig_pythonpath is nothing:
+                os.environ.pop('PYTHONPATH', None)
+            else:
+                os.environ['PYTHONPATH'] = orig_pythonpath
+
     def run(self):
+        installed_dists = []
         if self.distribution.install_requires:
-            self.distribution.fetch_build_eggs(
-                self.distribution.install_requires)
+            installed_dists.extend(
+                self.distribution.fetch_build_eggs(
+                    self.distribution.install_requires,
+                ))
         if self.distribution.tests_require:
-            self.distribution.fetch_build_eggs(self.distribution.tests_require)
+            installed_dists.extend(
+                    self.distribution.fetch_build_eggs(
+                            self.distribution.tests_require,
+                ))
 
         cmd = ' '.join(self._argv)
         if self.dry_run:
@@ -168,8 +204,11 @@ def run(self):
             return
 
         self.announce('running "%s"' % cmd)
-        with self.project_on_sys_path():
-            self.run_tests()
+
+        paths = map(operator.attrgetter('location'), installed_dists)
+        with self.paths_on_pythonpath(paths):
+            with self.project_on_sys_path():
+                self.run_tests()
 
     def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b004f9287c..364f2b4d37 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -362,6 +362,7 @@ def fetch_build_eggs(self, requires):
         )
         for dist in resolved_dists:
             pkg_resources.working_set.add(dist, replace=True)
+        return resolved_dists
 
     def finalize_options(self):
         _Distribution.finalize_options(self)

From 55c36fdfa8fdc3b4581e0331cc91a069a001da51 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sun, 18 Sep 2016 04:25:06 +0700
Subject: [PATCH 6184/8469] Add missing whitespace.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3fb39269e1..3e8d6818f7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -293,7 +293,7 @@ def __init__(
             ca_bundle=None, verify_ssl=True, *args, **kw
             ):
         Environment.__init__(self, *args, **kw)
-        self.index_url = index_url + "/"[:not index_url.endswith('/')]
+        self.index_url = index_url + "/" [:not index_url.endswith('/')]
         self.scanned_urls = {}
         self.fetched_urls = {}
         self.package_pages = {}

From 2f3b7b204187a1c93c391ffac96a9220cbb57f91 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Sep 2016 09:20:17 -0400
Subject: [PATCH 6185/8469] Extract test.install_dists and distill it with a
 variable extraction and fallback variables.

---
 CHANGES.rst                |  3 ++-
 setuptools/command/test.py | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 54a4d52a56..8af3b938ab 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,7 +7,8 @@ v27.3.0
 
 * #794: In test command, add installed eggs to PYTHONPATH
   when invoking tests so that subprocesses will also have the
-  dependencies available.
+  dependencies available. Fixes `tox 330
+  <https://github.com/tox-dev/tox/issues/330>`_.
 
 v27.2.0
 -------
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e0650d27f4..48d5b5e104 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -2,6 +2,7 @@
 import operator
 import sys
 import contextlib
+import itertools
 from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
 
@@ -185,18 +186,18 @@ def paths_on_pythonpath(paths):
             else:
                 os.environ['PYTHONPATH'] = orig_pythonpath
 
+    def install_dists(self):
+        """
+        Install the requirements indicated by self.distribution and
+        return an iterable of the dists that were built.
+        """
+        dist = self.distribution
+        ir_d = dist.fetch_build_eggs(dist.install_requires or [])
+        tr_d = dist.fetch_build_eggs(dist.tests_require or [])
+        return itertools.chain(ir_d, tr_d)
+
     def run(self):
-        installed_dists = []
-        if self.distribution.install_requires:
-            installed_dists.extend(
-                self.distribution.fetch_build_eggs(
-                    self.distribution.install_requires,
-                ))
-        if self.distribution.tests_require:
-            installed_dists.extend(
-                    self.distribution.fetch_build_eggs(
-                            self.distribution.tests_require,
-                ))
+        installed_dists = self.install_dists()
 
         cmd = ' '.join(self._argv)
         if self.dry_run:

From 2148592395ef4da0d408be26bf5839117ee0e5fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Sep 2016 09:27:23 -0400
Subject: [PATCH 6186/8469] Even better, use a static method

---
 setuptools/command/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 48d5b5e104..38bbcd8bc8 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -186,18 +186,18 @@ def paths_on_pythonpath(paths):
             else:
                 os.environ['PYTHONPATH'] = orig_pythonpath
 
-    def install_dists(self):
+    @staticmethod
+    def install_dists(dist):
         """
         Install the requirements indicated by self.distribution and
         return an iterable of the dists that were built.
         """
-        dist = self.distribution
         ir_d = dist.fetch_build_eggs(dist.install_requires or [])
         tr_d = dist.fetch_build_eggs(dist.tests_require or [])
         return itertools.chain(ir_d, tr_d)
 
     def run(self):
-        installed_dists = self.install_dists()
+        installed_dists = self.install_dists(self.distribution)
 
         cmd = ' '.join(self._argv)
         if self.dry_run:

From 560e787eec3b5801de158eccd492f26d2440051e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Sep 2016 21:18:44 -0400
Subject: [PATCH 6187/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8af3b938ab..19452d4ffd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,8 @@ v27.3.0
   dependencies available. Fixes `tox 330
   <https://github.com/tox-dev/tox/issues/330>`_.
 
+* #795: Update vendored pyparsing 2.1.9.
+
 v27.2.0
 -------
 

From f773e19f4f85fae7312de57d6995fcb7c4795a30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Sep 2016 21:18:51 -0400
Subject: [PATCH 6188/8469] =?UTF-8?q?Bump=20version:=2027.2.0=20=E2=86=92?=
 =?UTF-8?q?=2027.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ce161ffe44..2c6fa292e5 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.2.0
+current_version = 27.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d04d9b5bd5..b16cef30f1 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.2.0",
+    version="27.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From aac208c1c711c5819024f88890e244dd18801feb Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Sun, 14 Aug 2016 05:59:35 +0200
Subject: [PATCH 6189/8469] Do not search excluded directories for packages

Previously, PackageFinder.find would search the whole directory tree
looking for packages, then remove excluded packages from this list. This
made building a package very slow under some circumstances where the
file tree was large.

This change stops PackageFinder.find from descending in to directories
that will never be included.
---
 setuptools/__init__.py | 83 ++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 48 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 41b590d7b5..892626e6a6 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filterfalse, map
+from setuptools.extern.six.moves import filter, filterfalse, map
 
 import setuptools.version
 from setuptools.extension import Extension
@@ -32,13 +32,18 @@
 
 
 class PackageFinder(object):
+    """
+    Generate a list of all Python packages found within a directory
+    """
 
     @classmethod
     def find(cls, where='.', exclude=(), include=('*',)):
         """Return a list all Python packages found within directory 'where'
 
-        'where' should be supplied as a "cross-platform" (i.e. URL-style)
-        path; it will be converted to the appropriate local path syntax.
+        'where' is the root directory which will be searched for packages.  It
+        should be supplied as a "cross-platform" (i.e. URL-style) path; it will
+        be converted to the appropriate local path syntax.
+
         'exclude' is a sequence of package names to exclude; '*' can be used
         as a wildcard in the names, such that 'foo.*' will exclude all
         subpackages of 'foo' (but not 'foo' itself).
@@ -47,65 +52,47 @@ def find(cls, where='.', exclude=(), include=('*',)):
         specified, only the named packages will be included.  If it's not
         specified, all found packages will be included.  'include' can contain
         shell style wildcard patterns just like 'exclude'.
-
-        The list of included packages is built up first and then any
-        explicitly excluded packages are removed from it.
-        """
-        out = cls._find_packages_iter(convert_path(where))
-        out = cls.require_parents(out)
-        includes = cls._build_filter(*include)
-        excludes = cls._build_filter('ez_setup', '*__pycache__', *exclude)
-        out = filter(includes, out)
-        out = filterfalse(excludes, out)
-        return list(out)
-
-    @staticmethod
-    def require_parents(packages):
         """
-        Exclude any apparent package that apparently doesn't include its
-        parent.
 
-        For example, exclude 'foo.bar' if 'foo' is not present.
-        """
-        found = []
-        for pkg in packages:
-            base, sep, child = pkg.rpartition('.')
-            if base and base not in found:
-                continue
-            found.append(pkg)
-            yield pkg
+        return list(cls._find_packages_iter(
+            convert_path(where),
+            cls._build_filter('ez_setup', '*__pycache__', *exclude),
+            cls._build_filter(*include)))
 
-    @staticmethod
-    def _candidate_dirs(base_path):
+    @classmethod
+    def _find_packages_iter(cls, where, exclude, include):
         """
-        Return all dirs in base_path that might be packages.
+        All the packages found in 'where' that pass the 'include' filter, but
+        not the 'exclude' filter.
         """
-        has_dot = lambda name: '.' in name
-        for root, dirs, files in os.walk(base_path, followlinks=True):
-            # Exclude directories that contain a period, as they cannot be
-            #  packages. Mutate the list to avoid traversal.
-            dirs[:] = filterfalse(has_dot, dirs)
-            for dir in dirs:
-                yield os.path.relpath(os.path.join(root, dir), base_path)
-
-    @classmethod
-    def _find_packages_iter(cls, base_path):
-        candidates = cls._candidate_dirs(base_path)
-        return (
-            path.replace(os.path.sep, '.')
-            for path in candidates
-            if cls._looks_like_package(os.path.join(base_path, path))
-        )
+        for root, dirs, files in os.walk(where, followlinks=True):
+            # Copy dirs to iterate over it, then empty dirs.
+            all_dirs = dirs[:]
+            dirs[:] = []
+
+            for dir in all_dirs:
+                full_path = os.path.join(root, dir)
+                rel_path = os.path.relpath(full_path, where)
+                package = rel_path.replace(os.path.sep, '.')
+
+                # Check if the directory is a package and passes the filters
+                if ('.' not in dir
+                        and include(package)
+                        and not exclude(package)
+                        and cls._looks_like_package(full_path)):
+                    yield package
+                    dirs.append(dir)
 
     @staticmethod
     def _looks_like_package(path):
+        """Does a directory look like a package?"""
         return os.path.isfile(os.path.join(path, '__init__.py'))
 
     @staticmethod
     def _build_filter(*patterns):
         """
         Given a list of patterns, return a callable that will be true only if
-        the input matches one of the patterns.
+        the input matches at least one of the patterns.
         """
         return lambda name: any(fnmatchcase(name, pat=pat) for pat in patterns)
 

From 75a78dc2feedb9287155f146d0b855ea46924961 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Thu, 22 Sep 2016 10:16:40 +1000
Subject: [PATCH 6190/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 19452d4ffd..d115533a8a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+In development
+--------------
+
+* #733: Do not search excluded directories for packages.
+
 v27.3.0
 -------
 

From 0e1b6fe0004764dcc4adc45bc0bb2665f5bedd04 Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Sat, 24 Sep 2016 16:24:37 +0300
Subject: [PATCH 6191/8469] certifi 2016.8.31 (#797)

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index b16cef30f1..22bdae1088 100755
--- a/setup.py
+++ b/setup.py
@@ -167,11 +167,11 @@ def pypi_link(pkg_filename):
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2016.8.8",
+        "certs": "certifi==2016.8.31",
     },
     dependency_links=[
         pypi_link(
-            'certifi-2016.8.8.tar.gz#md5=b57513f7670482da45bb350b792f659e',
+            'certifi-2016.8.31.tar.gz#md5=2f22d484a36d38d98be74f9eeb2846ec',
         ),
         pypi_link(
             'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',

From 992adf2f5684e6660335d616149e050b3eaaed17 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Mon, 26 Sep 2016 14:00:00 +1000
Subject: [PATCH 6192/8469] Note find_packages backwards incompatible change

Also add a test for the new behaviour.
---
 CHANGES.rst                            | 4 ++++
 setuptools/tests/test_find_packages.py | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d115533a8a..cf8bcaf90a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,10 @@ In development
 --------------
 
 * #733: Do not search excluded directories for packages.
+  This introduced a backwards incompatible change in ``find_packages()``
+  so that ``find_packages(exclude=['foo']) == []``, excluding subpackages of ``foo``.
+  Previously, ``find_packages(exclude=['foo']) == ['foo.bar']``,
+  even though the parent ``foo`` package was excluded.
 
 v27.3.0
 -------
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index df51b04fd1..9d31ccd7a2 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -98,6 +98,15 @@ def test_exclude(self):
         packages = find_packages(self.dist_dir, exclude=('pkg.*',))
         assert packages == ['pkg']
 
+    def test_exclude_recursive(self):
+        """
+        Excluding a parent package should exclude all child packages as well.
+        """
+        self._touch('__init__.py', self.pkg_dir)
+        self._touch('__init__.py', self.sub_pkg_dir)
+        packages = find_packages(self.dist_dir, exclude=('pkg',))
+        assert packages == []
+
     def test_include_excludes_other(self):
         """
         If include is specified, other packages should be excluded.

From 44a670456c81f844cad1d5aa713cd304ed80fc09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 13:34:36 -0500
Subject: [PATCH 6193/8469] Patch MSVC functions by name. Fixes #790.

---
 CHANGES.rst          |  9 +++++++
 setuptools/monkey.py | 64 ++++++++++++++++++++++++++------------------
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 19452d4ffd..0246c461cb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+v27.3.1
+-------
+
+* #790: In MSVC monkeypatching, explicitly patch each
+  function by name in the target module instead of inferring
+  the module from the function's ``__module__``. Improves
+  compatibility with other packages that might have previously
+  patched distutils functions (i.e. NumPy).
+
 v27.3.0
 -------
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index c4289762db..43b97b4d95 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -6,6 +6,7 @@
 import distutils.filelist
 import platform
 import types
+import functools
 
 from .py26compat import import_module
 from setuptools.extern import six
@@ -115,16 +116,21 @@ def _patch_distribution_metadata_write_pkg_info():
     )
 
 
-def patch_func(replacement, original):
-    # first set the 'unpatched' attribute on the replacement to
+def patch_func(replacement, target_mod, func_name):
+    """
+    Patch func_name in target_mod with replacement
+
+    Important - original must be resolved by name to avoid
+    patching an already patched function.
+    """
+    original = getattr(target_mod, func_name)
+
+    # set the 'unpatched' attribute on the replacement to
     # point to the original.
     vars(replacement).setdefault('unpatched', original)
 
-    # next resolve the module in which the original func resides
-    target_mod = import_module(original.__module__)
-
-    # finally replace the function in the original module
-    setattr(target_mod, original.__name__, replacement)
+    # replace the function in the original module
+    setattr(target_mod, func_name, replacement)
 
 
 def get_unpatched_function(candidate):
@@ -139,37 +145,43 @@ def patch_for_msvc_specialized_compiler():
     # import late to avoid circular imports on Python < 3.5
     msvc = import_module('setuptools.msvc')
 
-    try:
-        # Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
-        import distutils.msvc9compiler as msvc9compiler
-    except ImportError:
-        pass
-
-    try:
-        # Distutil file for MSVC++ 14.0 and upper (Python 3.5+)
-        import distutils._msvccompiler as msvc14compiler
-    except ImportError:
-        pass
-
     if platform.system() != 'Windows':
         # Compilers only availables on Microsoft Windows
         return
 
+    def patch_params(mod_name, func_name):
+        """
+        Prepare the parameters for patch_func to patch indicated function.
+        """
+        repl_prefix = 'msvc9_' if 'msvc9' in mod_name else 'msvc14_'
+        repl_name = repl_prefix + func_name.lstrip('_')
+        repl = getattr(msvc, repl_name)
+        mod = import_module(mod_name)
+        if not hasattr(mod, func_name):
+            raise ImportError(func_name)
+        return repl, mod, func_name
+
+    # Python 2.7 to 3.4
+    msvc9 = functools.partial(patch_params, 'distutils.msvc9compiler')
+
+    # Python 3.5+
+    msvc14 = functools.partial(patch_params, 'distutils._msvccompiler')
+
     try:
         # Patch distutils.msvc9compiler
-        patch_func(msvc.msvc9_find_vcvarsall, msvc9compiler.find_vcvarsall)
-        patch_func(msvc.msvc9_query_vcvarsall, msvc9compiler.query_vcvarsall)
-    except NameError:
+        patch_func(*msvc9('find_vcvarsall'))
+        patch_func(*msvc9('query_vcvarsall'))
+    except ImportError:
         pass
 
     try:
         # Patch distutils._msvccompiler._get_vc_env
-        patch_func(msvc.msvc14_get_vc_env, msvc14compiler._get_vc_env)
-    except NameError:
+        patch_func(*msvc14('_get_vc_env'))
+    except ImportError:
         pass
 
     try:
         # Patch distutils._msvccompiler.gen_lib_options for Numpy
-        patch_func(msvc.msvc14_gen_lib_options, msvc14compiler.gen_lib_options)
-    except NameError:
+        patch_func(*msvc14('gen_lib_options'))
+    except ImportError:
         pass

From e91f0b18021ba6ba073d9db19d4b5afb91f3f55e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 13:45:29 -0500
Subject: [PATCH 6194/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d115533a8a..1861cb6b2c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,8 @@ In development
 
 * #733: Do not search excluded directories for packages.
 
+* #795: Bump certifi.
+
 v27.3.0
 -------
 

From 394318306bac8e5cab251ca4cb099c40aebc97fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 13:46:49 -0500
Subject: [PATCH 6195/8469] =?UTF-8?q?Bump=20version:=2027.3.0=20=E2=86=92?=
 =?UTF-8?q?=2027.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2c6fa292e5..549aff1605 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.3.0
+current_version = 27.3.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b16cef30f1..67c66b3ccb 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.3.0",
+    version="27.3.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 441e50c2eb29078d5b42046e14834837ffac9c9f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 13:57:39 -0500
Subject: [PATCH 6196/8469] Define version in changelog

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 11d9ca9329..0ce8e52b89 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,8 +2,8 @@
 CHANGES
 =======
 
-In development
---------------
+v28.0.0
+-------
 
 * #733: Do not search excluded directories for packages.
   This introduced a backwards incompatible change in ``find_packages()``

From 2b5937f56b9b1d8d91c1247540f41437ba99016e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 13:58:38 -0500
Subject: [PATCH 6197/8469] Remove Mercurial metadata

---
 .hgignore |  15 ---
 .hgtags   | 308 ------------------------------------------------------
 2 files changed, 323 deletions(-)
 delete mode 100644 .hgignore
 delete mode 100644 .hgtags

diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index ebc53b33d5..0000000000
--- a/.hgignore
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax: glob
-bin
-build
-dist
-include
-lib
-distribute.egg-info
-setuptools.egg-info
-.coverage
-.tox
-*.egg
-*.py[cod]
-*.swp
-*~
-.git*
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index 88f2dc60ae..0000000000
--- a/.hgtags
+++ /dev/null
@@ -1,308 +0,0 @@
-7e9441311eb21dd1fbc32cfbad58168e46c5450e 0.6
-26f429772565f69d1f6d21adf57c3d8c40197129 0.6.1
-6f46749a7454be6e044a54cd73c51318b74bdee8 0.6.2
-34b80fb58862d18f8f957f98a883ed4a72d06f8e 0.6.3
-fb04abddb50d82a9005c9082c94d5eb983be1d79 0.6.4
-8ae0bd250b4a0d58cbaf16b4354ad60f73f24a01 0.6.5
-88847883dfed39829d3a5ed292ad540723ad31cc 0.6.6
-fcbef325349ada38f6c674eb92db82664cf6437c 0.6.7
-3af7f2b8270b9bb34fb65f08ee567bfe8e2a6a5a 0.6.8
-669725d03fd1e345ea47590e9b14cb19742b96a2 0.6.9
-eff3ca9c2d8d39e24c221816c52a37f964535336 0.6.10
-88710e34b91c98c9348749722cce3acd574d177d 0.6.11
-5ce754773a43ac21f7bd13872f45c75e27b593f8 0.6.12
-de36566d35e51bee7cfc86ffa694795e52f4147c 0.6.13
-e5f3f0ffe9e1a243d49a06f26c79dd160f521483 0.6.14
-dc03a300ec7a89ad773047172d43e52b34e7cd1e 0.6.15
-e620fb4ee8ba17debadb614fb583c6dfac229dea 0.6.16
-21df276275b5a47c6a994927d69ad3d90cf62b5d 0.6.17
-e9264ca4ba8c24239c36a8426a0394f7c7d5dd83 0.6.18
-aed31b1fa47ed1f39e55c75b76bbbdb80775b7f1 0.6.19
-c6e6273587816c3e486ef7739e53c864a0145251 0.6.20
-7afdf4c84a713fe151e6163ab25d45e8727ce653 0.6.21
-105066342777cd1319a95d7ae0271a2ea1ac33fe 0.6.23
-7b5ef4e6c80e82541dffb5a9a130d81550d5a835 0.6.24
-9c014a80f32e532371826ed1dc3236975f37f371 0.6.25
-ff8c4d6c8e5d2093750a58a3d43b76556570007c 0.6.26
-2a5c42ed097a195e398b97261c40cd66c8da8913 0.6.27
-4ed34b38851f90278cfe2bff75784f7e32883725 0.6.28
-acecfa2cfb6fca207dd2f4e025c695def3bb6b40 0.6.29
-e950f50addff150859f5990b9df2a33c691b6354 0.6.30
-06dae3faee2de50ff17b90719df410b2ebc5b71e 0.6.31
-1f4f79258ed5b418f680a55d3006f41aa6a56d2b 0.6.32
-89f57bf1406a5e745470af35446902c21ac9b6f6 0.6.33
-3c8f9fc13862124cf20ef2ff2140254fb272bb94 0.6.34
-7c3f8b9eb7cfa17481c835d5caaa918d337c7a83 0.6.35
-192094c0d1e2e5d2cb5c718f84a36c9de04b314b 0.6.36
-66d4e3b8899166e4c04189ee1831c649b7ff38bf 0.6.37
-398d58aa8bba33778c30ce72055a27d4b425809c 0.6.38
-f457fc2a3ebe609d8ca7a869eb65b7506ecf49ef 0.6.39
-9b2e2aa06e058c63e06c5e42a7f279ddae2dfb7d 0.7b1
-9089a40343981baa593b9bb5953f9088e9507099 0.6.40
-ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
-f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
-8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2
-35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
-63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
-73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
-53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
-ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
-7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
-024dd30ed702135f5328975042566e48cc479d7d 0.7.1
-d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
-d212e48e0cef689acba57ed017289c027660b23c 0.7.3
-74c6c12268059986f9cc0b535399594f1d131201 0.8b1
-85640475dda0621f20e11db0995fa07f51744a98 0.7.4
-b57e5ba934767dd498669b17551678081b3047b5 0.6.46
-dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
-512744f3f306aea0fdde4cfd600af8b2d6e773e7 0.8b2
-8af9839a76407eebf3610fcd3e7973f1625abaa2 0.8b3
-ee2c967017024197b38e39ced852808265387a4b 0.6.47
-48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
-5b3c7981a02b4a86af1b10ae16492899b515d485 0.8b4
-cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
-1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
-5679393794978a1d3e1e087472b8a0fdf3d8423c 0.8b5
-26f59ec0f0f69714d28a891aaad048e3b9fcd6f7 0.8b6
-f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
-236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
-979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7
-e3d70539e79f39a97f69674ab038661961a1eb43 0.8
-3078b1e566399bf0c5590f3528df03d0c23a0777 0.9
-9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1
-37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2
-3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3
-1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4
-88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5
-acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
-19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7
-e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
-7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1
-aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
-8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3
-c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
-d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
-2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1
-462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2
-ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
-f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
-d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
-5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
-cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
-4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1
-77921bbe3931caf40474dc36e55d3d541981c749 1.2
-19873119647deae8a68e9ed683317b9ee170a8d8 1.3
-a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
-076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
-0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1
-a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
-9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1
-274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2
-0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0
-bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
-5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
-c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
-b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
-ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1
-caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
-39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2
-faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
-8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0
-cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
-bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
-47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1
-07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2
-b306e681a945406833fb297ae10241e2241fc22b 3.3
-78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1
-5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4
-e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
-369f6f90f69683702cc0b72827ccf949977808b0 3.4.2
-06a56e063c327b0606f9e9690764279d424646b2 3.4.3
-0917d575d26091a184796624743825914994bf95 3.4.4
-98f29d521c3a57bae0090d2bc5597d93db95b108 3.5
-254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1
-572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2
-e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
-292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
-49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
-2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8
-9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
-40744de29b848f0e88139ba91d645c08a56855e9 3.8.1
-84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0
-871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1
-95996b713722376679c3168b15ab12ea8360dd5f 5.0.2
-3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1
-f493e6c4ffd88951871110858c141385305e0077 5.2
-1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3
-baae103e80c307008b156e426a07eb9f486eb4f0 5.4
-ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
-7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2
-68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5
-949a66af4f03521e1404deda940aa951418a13d2 5.5.1
-a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
-37ed55fd310d0cd32009dc5676121e86b404a23d 5.7
-67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
-755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
-bc6655b4acf205dd9f25c702955645656077398a 6.0.1
-1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1
-01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2
-7ea80190d494a766c6356fce85c844703964b6cc 6.1
-df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
-850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
-7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
-1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1
-d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
-1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
-6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
-2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
-3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1
-995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
-efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
-cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
-0eee586a153f068142c1a0df4bc2635ed2c1a1cc 9.0b1
-921e60a0f9067311571fde9ccf2f35223159d9f6 8.4
-0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0
-fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
-3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1
-0c4d18a747a6d39bff8e194a58af949a960d674a 10.0
-4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1
-26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1
-651d41db58849d4fc50e466f4dc458d448480c4e 10.2
-1f5de53c079d577ead9d80265c9e006503b16457 10.2.1
-b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
-6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1
-feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
-a1a6a1ac9113b90009052ca7263174a488434099 11.3
-1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1
-55666947c9eb7e3ba78081ad6ae004807c84aede 12.0
-747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1
-a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
-bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
-73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
-01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
-7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
-5ff5c804a8fa580cff499ba0025ff2e6a5474fd0 12.2
-8d50aac3b20793954121edb300b477cc75f3ec96 12.3
-297931cb8cac7d44d970adb927efd6cb36ac3526 12.4
-df34cc18624279faffdbc729c0a11e6ab0f46572 13.0
-ae1a5c5cf78f4f9f98c054f1c8cec6168d1d19b4 13.0.1
-e22a1d613bddf311e125eecd9c1e1cad02ab5063 13.0.2
-a3a105f795f8362f26e84e9acbc237ee2d6bcca4 14.0
-9751a1671a124e30ae344d1510b9c1dbb14f2775 14.1
-07fcc3226782b979cedaaf456c7f1c5b2fdafd2c 14.1.1
-d714fb731de779a1337d2d78cd413931f1f06193 14.2
-e3c635a7d463c7713c647d1aa560f83fd8e27ef0 14.3
-608948cef7e0ab8951691b149f5b6f0184a5635e 14.3.1
-617699fd3e44e54b6f95b80bfcf78164df37f266 15.0b1
-d2c4d84867154243993876d6248aafec1fd12679 15.0
-10fde952613b7a3f650fb1f6b6ed58cbd232fa3c 15.1
-df5dc9c7aa7521f552824dee1ed1315cfe180844 15.2
-e0825f0c7d5963c498266fe3c175220c695ae83b 16.0
-8e56240961015347fed477f00ca6a0783e81d3a2 17.0
-a37bcaaeab367f2364ed8c070659d52a4c0ae38e 17.1
-4a0d01d690ff184904293e7a3244ac24ec060a73 17.1.1
-fac98a49bd984ef5accf7177674d693277bfbaef 18.0b1
-0a49ee524b0a1d67d2a11c8c22f082b57acd7ae1 18.0
-e364795c1b09c70b6abb53770e09763b52bf807d 18.0.1
-c0395f556c35d8311fdfe2bda6846b91149819cd 18.1
-1a981f2e5031f55267dc2a28fa1b42274a1b64b2 18.2
-b59320212c8371d0be9e5e6c5f7eec392124c009 18.3
-7a705b610abb1177ca169311c4ee261f3e4f0957 18.3.1
-1e120f04bcaa2421c4df0eb6678c3019ba4a82f6 18.3.2
-6203335278be7543d31790d9fba55739469a4c6c 18.4
-31dc6d2ac0f5ab766652602fe6ca716fff7180e7 18.5
-dfe190b09908f6b953209d13573063809de451b8 18.6
-804f87045a901f1dc121cf9149143d654228dc13 18.6.1
-67d07805606aead09349d5b91d7d26c68ddad2fc 18.7
-3041e1fc409be90e885968b90faba405420fc161 18.7.1
-c811801ffa1de758cf01fbf6a86e4c04ff0c0935 18.8
-fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
-cc41477ecf92f221c113736fac2830bf8079d40c 19.0
-834782ce49154e9744e499e00eb392c347f9e034 19.1
-0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1
-5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2
-66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1
-32bba9bf8cce8350b560a7591c9ef5884a194211 19.3
-f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
-0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1
-0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5
-34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1
-3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6
-35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1
-d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
-c6e619ce910d1650cc2433f94e5594964085f973 19.7
-2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0
-06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1
-919a40f1843131249f98104c73f3aee3fc835e67 20.1.1
-74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2
-1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1
-48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2
-9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3
-3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1
-06692c64fb9b5843331a918ab7093f151412ec8e 20.4
-f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
-114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0
-a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
-2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2
-8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3
-7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4
-7e0ab283db4e6f780777f7f06af475f044631fa1 v20.6.5
-57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
-57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
-b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
-0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
-a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
-0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0
-7f56b6f40de39456c78507a14c288709712881cb v20.8.0
-8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
-8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
-c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
-3b5fdd077c7d83d02c4979ad69cc0bf199b47587 v20.10.1
-ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
-018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8
-02643fe9503033edd2fc5a54c8d4361a6c185be4 v21.1.0
-40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
-40b8fac6db119aca9c462993d01908492769fc4f v21.2.0
-9959424676a4aac1c14e430ff6f4210fdb0442d9 v21.2.0
-694111eadb10fe6003078895a2cbb803ce514ef2 v21.2.1
-274f33435e9c3ba5019f2a2bfe478fa2db0da41d v21.2.2
-451fbedb4c226d8ea5b6eab1e21679c9a4ec4a93 v22.0.0
-f5c4923b0400d61f67699c2d54388878f9e0c8bd v22.0.1
-8610a8b9635f15d33f94fccb295fd34aa6fbddee v22.0.2
-efee7d74a8478c0d08c801fb520e41b6e04d0dda v22.0.3
-77b20c09b04775cc936ab5d16cbc46ff05fc7080 v22.0.4
-d5832e5deb77027da474e79e5f047e9a81f7edf8 v22.0.5
-8664c631bf3a817a7deba86c13b67eccc1f81091 v23.0.0
-6c74559c732c56f61b465d613458ec1a930884b6 v23.1.0
-65b3fe899db4086e66afa067a1311eea2a88d5e2 v23.2.0
-e10c848a82ffb925741c65dd8a8fc8b50b3c3e14 v23.2.1
-a011298221c3d47aa539ae4c119c51861caf6438 v23.2.1
-8d37b17a93ec3e5fff9e040fc3f14ab7b7b24b2c v24.0.0
-130a58f9503fe07ca8c7a34675b7d3a976f163d7 v24.0.1
-7996c56bf6a2f81427b2f91eb11e64d690353493 v24.0.2
-d425bd1ee620772fe90e0dd2a7530b0d6a642601 v24.0.3
-a7d2f79f0996d881794af0f87595032098202811 v24.1.0
-d29075e7f8797891e8c59fb58c4d8d1b79954b34 v24.1.1
-ed9e7bd8caf95261d528ee3db117611dc42814eb v24.2.0
-5b577d179a7e2f3020712c376c0200901e5c93c1 v24.2.1
-83ca05973c16102145b339aec7e170d94966a2ba v24.3.0
-e14229dd2abc034530447d64ed87fddb944347bd v24.3.1
-58e92028ab0061f1f80d98e769c9143305275242 v25.0.0
-0591bce16c7f94191cea925929cc8b0ce6baca09 v25.0.1
-dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
-dc92db3e29a4d1ac57d383091e6cf734d04ed54b v25.0.2
-91eeaf2f33db99d8f78f8261931a1aea8fe8d952 v25.0.2
-529a76a860c50d3cc262759b5b9ce28f171236f9 v25.1.0
-392ee093902e14a1d2a6eefc389a7b9ac78b3f9e v25.1.1
-1cbb29c235439331a76c7b6b5cf8701f763478d3 v25.1.2
-c350190e7bbf274e6728f14af7451b1fd3aaeba2 v25.1.2
-86e668badaf45315bb8506ac2312665d129a0322 v25.1.3
-6f55250b9c5856557ac669d1f966bba8be9eb1d2 v25.1.4
-76143bb477b50314ab6f4ccc4ced80ee43f0dc94 v25.1.5
-2db4c66aeae47217aaf92099a9875e9e810c9cbb v25.1.6
-2083d7c3fadcf15b3bc07f7532440efbcf8fd18d v25.2.0
-2371456ae99d11187c33deacf1308aded31081d9 v25.3.0
-f713f9faaaa33c0e9a628dc9322ef8d1fbeb8319 v25.4.0
-7cb13a0cd176f39500701b24dbfec603ead5110c v26.0.0
-b299cfc9d7d89070e8eec9751a8be72c8a75506b v26.1.0
-e1d057e23b2fec5991084744c356a6c7e05b219d v26.1.1

From 69061481e345bfd1f1d07795b3541c07e498d2df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 14:13:03 -0500
Subject: [PATCH 6198/8469] Add changelog entry. Ref #719.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index eda524766c..b69ac26c2a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,9 @@
 CHANGES
 =======
 
+* #719: Suppress decoding errors and instead log a warning
+  when metadata cannot be decoded.
+
 v25.1.4
 -------
 

From 35ea365b50bd1a64375fdbcce187affab22af3b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 14:17:34 -0500
Subject: [PATCH 6199/8469] Put main logic in the top-level body of the
 function.

---
 pkg_resources/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index af986ac316..37bf1482af 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1859,12 +1859,13 @@ def has_metadata(self, name):
         return name == 'PKG-INFO' and os.path.isfile(self.path)
 
     def get_metadata(self, name):
-        if name == 'PKG-INFO':
-            with io.open(self.path, encoding='utf-8', errors="replace") as f:
-                metadata = f.read()
-            self._warn_on_replacement(metadata)
-            return metadata
-        raise KeyError("No metadata except PKG-INFO is available")
+        if name != 'PKG-INFO':
+            raise KeyError("No metadata except PKG-INFO is available")
+
+        with io.open(self.path, encoding='utf-8', errors="replace") as f:
+            metadata = f.read()
+        self._warn_on_replacement(metadata)
+        return metadata
 
     def _warn_on_replacement(self, metadata):
         # Python 2.6 and 3.2 compat for: replacement_char = '�'

From ae50b560c46773697f0f3894ac34de37fda2fadd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 27 Sep 2016 14:52:00 -0500
Subject: [PATCH 6200/8469] =?UTF-8?q?Bump=20version:=2027.3.1=20=E2=86=92?=
 =?UTF-8?q?=2028.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 549aff1605..ec0baddc18 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 27.3.1
+current_version = 28.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 96dcbecc11..1be4e11c15 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="27.3.1",
+    version="28.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 0c6f3d33cd15a4558e437b70b0507f221f00e3eb Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 28 Sep 2016 23:13:58 -0700
Subject: [PATCH 6201/8469] build_ext: correctly parse the link_objects user
 option (closes #1703178)

Patch by Valerie Lambert.
---
 command/build_ext.py    | 1 +
 tests/test_build_ext.py | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index f03a4e31d8..7c278ef0af 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -166,6 +166,7 @@ def finalize_options(self):
             self.include_dirs.append(plat_py_include)
 
         self.ensure_string_list('libraries')
+        self.ensure_string_list('link_objects')
 
         # Life is easier if we're not forever checking for None, so
         # simplify these options to empty lists if unset
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 4e397ea4c9..f3df564e37 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -195,6 +195,13 @@ def test_finalize_options(self):
         cmd.finalize_options()
         self.assertEqual(cmd.rpath, ['one', 'two'])
 
+        # make sure cmd.link_objects is turned into a list
+        # if it's a string
+        cmd = build_ext(dist)
+        cmd.link_objects = 'one two,three'
+        cmd.finalize_options()
+        self.assertEqual(cmd.link_objects, ['one', 'two', 'three'])
+
         # XXX more tests to perform for win32
 
         # make sure define is turned into 2-tuples

From 910aa9da283c16facdc4b150b6aa7d65ec11d94c Mon Sep 17 00:00:00 2001
From: Gabi Davar <grizzly.nyo@gmail.com>
Date: Wed, 28 Sep 2016 09:37:15 +0300
Subject: [PATCH 6202/8469] certifi-2016.9.26

---
 CHANGES.rst | 5 +++++
 setup.py    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c4ff8138c..57dc798579 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v28.0.1
+-------
+
+* #803: Bump certifi to 2016.9.26.
+
 v28.0.0
 -------
 
diff --git a/setup.py b/setup.py
index 1be4e11c15..198112010e 100755
--- a/setup.py
+++ b/setup.py
@@ -167,11 +167,11 @@ def pypi_link(pkg_filename):
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2016.8.31",
+        "certs": "certifi==2016.9.26",
     },
     dependency_links=[
         pypi_link(
-            'certifi-2016.8.31.tar.gz#md5=2f22d484a36d38d98be74f9eeb2846ec',
+            'certifi-2016.9.26.tar.gz#md5=baa81e951a29958563689d868ef1064d',
         ),
         pypi_link(
             'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',

From 31360f268321ea2018758a497c17e923a7585610 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sat, 1 Oct 2016 21:15:35 +0700
Subject: [PATCH 6203/8469] Fix misspellings in changelog.

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c4ff8138c..dd421776c1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -90,7 +90,7 @@ v26.1.1
 -------
 
 * Re-release of 26.1.0 with pytest pinned to allow for automated
-  deployement and thus proper packaging environment variables,
+  deployment and thus proper packaging environment variables,
   fixing issues with missing executable launchers.
 
 v26.1.0
@@ -120,7 +120,7 @@ v25.4.0
 -------
 
 * Add Extension(py_limited_api=True). When set to a truthy value,
-  that extension gets a filename apropriate for code using Py_LIMITED_API.
+  that extension gets a filename appropriate for code using Py_LIMITED_API.
   When used correctly this allows a single compiled extension to work on
   all future versions of CPython 3.
   The py_limited_api argument only controls the filename. To be

From e6d7c40652743005e70ddec1a3e5c7466e52a313 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Oct 2016 11:59:36 -0400
Subject: [PATCH 6204/8469] Disable nspkg.pth behavior on Python 3.3+. Fixes
 #805 and fixes pypa/pip#1924.

---
 CHANGES.rst                            | 6 ++++++
 setuptools/command/install_egg_info.py | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c4ff8138c..c536a7bea4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v28.1.0
+-------
+
+* #805: Disable ``-nspkg.pth`` behavior on Python 3.3+ where
+  PEP-420 functionality is adequate. Fixes pip #1924.
+
 v28.0.0
 -------
 
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 60b615d2b9..7834e1070d 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -82,9 +82,10 @@ def install_namespaces(self):
 
     _nspkg_tmpl = (
         "import sys, types, os",
+        "pep420 = sys.version_info > (3, 3)",
         "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
-        "m = not ie and "
+        "m = not ie and not pep420 and "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From 67487d66104dc9382e6c11a5cb317c0a079672fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Oct 2016 14:36:28 -0400
Subject: [PATCH 6205/8469] =?UTF-8?q?Bump=20version:=2028.0.0=20=E2=86=92?=
 =?UTF-8?q?=2028.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ec0baddc18..c0e3edba2e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.0.0
+current_version = 28.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 1be4e11c15..b97088d73b 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.0.0",
+    version="28.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b8032e136b864af0607c781371ee6a8730f67efc Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 1 Oct 2016 16:15:09 -0500
Subject: [PATCH 6206/8469] Issue #13756: Fix building extensions modules on
 Cygwin

Patch by Roumen Petrov, based on original patch by Jason Tishler.
---
 command/build_ext.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 74de782d8a..9155626a47 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -715,13 +715,6 @@ def get_libraries(self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-        elif sys.platform[:6] == "cygwin":
-            template = "python%d.%d"
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "atheos":
             from distutils import sysconfig
 

From fedef1341c3b5610e75fcd1fbdefa383cafe7565 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Oct 2016 17:31:29 -0400
Subject: [PATCH 6207/8469] =?UTF-8?q?Bump=20version:=2028.0.0=20=E2=86=92?=
 =?UTF-8?q?=2028.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ec0baddc18..c0e3edba2e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.0.0
+current_version = 28.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 198112010e..6ef0226a4e 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.0.0",
+    version="28.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From cf469bf239cc6c0d4ebb766c5e2b6c6098e2b28b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 1 Oct 2016 17:40:19 -0400
Subject: [PATCH 6208/8469] Pin to Pytest 3.0.2 as it appears 3.0.3
 re-introduces pytest-dev/pytest#1888.

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6ef0226a4e..ff6809ed0b 100755
--- a/setup.py
+++ b/setup.py
@@ -181,7 +181,8 @@ def pypi_link(pkg_filename):
     tests_require=[
         'setuptools[ssl]',
         'pytest-flake8',
-        'pytest>=3.0.2',
+        # pin pytest to 3.0.2 for pytest-dev/pytest#1888
+        'pytest==3.0.2',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
     ] + pytest_runner + wheel,

From 4893826a79d5155205fb557ab032fc989629db6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Oct 2016 09:22:27 -0500
Subject: [PATCH 6209/8469] =?UTF-8?q?Bump=20version:=2028.1.0=20=E2=86=92?=
 =?UTF-8?q?=2028.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c0e3edba2e..4177952cae 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.1.0
+current_version = 28.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ff6809ed0b..dabfe4fd28 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.1.0",
+    version="28.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 06e8590eef402ebcb2a179875572549b5fe8d946 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 4 Oct 2016 20:54:44 +0300
Subject: [PATCH 6210/8469] Issue #28222: Don't fail if pygments is not
 available

We can't just skip the test if docutils is available,
but pygments is not because the purpose of the test
was testing a bug in _check_rst_data().
---
 tests/test_check.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/test_check.py b/tests/test_check.py
index 959fa9085c..3d22868e31 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -7,6 +7,12 @@
 from distutils.tests import support
 from distutils.errors import DistutilsSetupError
 
+try:
+    import pygments
+except ImportError:
+    pygments = None
+
+
 class CheckTestCase(support.LoggingSilencer,
                     support.TempdirManager,
                     unittest.TestCase):
@@ -119,9 +125,15 @@ def foo():
             pkg_info, dist = self.create_dist(long_description=rest_with_code)
             cmd = check(dist)
             cmd.check_restructuredtext()
-            self.assertEqual(cmd._warnings, 0)
             msgs = cmd._check_rst_data(rest_with_code)
-            self.assertEqual(len(msgs), 0)
+            if pygments is not None:
+                self.assertEqual(len(msgs), 0)
+            else:
+                self.assertEqual(len(msgs), 1)
+                self.assertEqual(
+                    str(msgs[0][1]),
+                    'Cannot analyze code. Pygments package not found.'
+                )
 
     def test_check_all(self):
 

From 2ecc8a4428dbc75bdfd96681283c7235b120f4bd Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Thu, 22 Sep 2016 13:44:01 +1000
Subject: [PATCH 6211/8469] Find nested packages with excluded parent

`find_packages(exclude=['pkg'])` should still find and include the
`pkg.subpkg` package.

Fixes #808
---
 setuptools/__init__.py                 | 16 ++++++++++------
 setuptools/tests/test_find_packages.py |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 892626e6a6..baec38849e 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -75,13 +75,17 @@ def _find_packages_iter(cls, where, exclude, include):
                 rel_path = os.path.relpath(full_path, where)
                 package = rel_path.replace(os.path.sep, '.')
 
-                # Check if the directory is a package and passes the filters
-                if ('.' not in dir
-                        and include(package)
-                        and not exclude(package)
-                        and cls._looks_like_package(full_path)):
+                # Skip directory trees that are not valid packages
+                if ('.' in dir or not cls._looks_like_package(full_path)):
+                    continue
+
+                # Should this package be included?
+                if include(package) and not exclude(package):
                     yield package
-                    dirs.append(dir)
+
+                # Keep searching subdirectories, as there may be more packages
+                # down there, even if the parent was excluded.
+                dirs.append(dir)
 
     @staticmethod
     def _looks_like_package(path):
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 9d31ccd7a2..6dc1b3ac72 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -100,12 +100,12 @@ def test_exclude(self):
 
     def test_exclude_recursive(self):
         """
-        Excluding a parent package should exclude all child packages as well.
+        Excluding a parent package should not exclude child packages as well.
         """
         self._touch('__init__.py', self.pkg_dir)
         self._touch('__init__.py', self.sub_pkg_dir)
         packages = find_packages(self.dist_dir, exclude=('pkg',))
-        assert packages == []
+        assert packages == ['pkg.subpkg']
 
     def test_include_excludes_other(self):
         """

From 6e61c13148641c695c53434654be7d9f09a04e65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Oct 2016 08:22:01 -0700
Subject: [PATCH 6212/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 13ad781485..983f51c2ac 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v28.2.0
+-------
+
+* #809: In ``find_packages()``, restore support for excluding
+  a parent package without excluding a child package.
+
 v28.1.0
 -------
 

From 1e311f519afaf3f5d00538ff64b50bd8c15eef02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Oct 2016 08:23:14 -0700
Subject: [PATCH 6213/8469] =?UTF-8?q?Bump=20version:=2028.2.0=20=E2=86=92?=
 =?UTF-8?q?=2028.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4177952cae..810b75102e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.2.0
+current_version = 28.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index dabfe4fd28..7e7d181550 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.2.0",
+    version="28.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 802caebb62fda50adb23250fcf9bf4c559d3ea65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Oct 2016 12:22:55 -0700
Subject: [PATCH 6214/8469] Update changelog to match actual release

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cec3c3b50c..32ccfcaa1e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-v28.2.0
+v28.3.0
 -------
 
 * #809: In ``find_packages()``, restore support for excluding

From 76fd560cde2b43e9afb42f988e0537547ae22afc Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Sat, 8 Oct 2016 16:56:25 +0700
Subject: [PATCH 6215/8469]  Upgrade pyparsing to version 2.1.10

---
 pkg_resources/_vendor/pyparsing.py | 85 ++++++++++++++++++------------
 pkg_resources/_vendor/vendored.txt |  2 +-
 2 files changed, 53 insertions(+), 34 deletions(-)
 mode change 100755 => 100644 pkg_resources/_vendor/pyparsing.py

diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
old mode 100755
new mode 100644
index d602a35af7..a21224359e
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -60,8 +60,8 @@ class names, and the use of '+', '|' and '^' operators.
  - embedded comments
 """
 
-__version__ = "2.1.9"
-__versionTime__ = "10 Sep 2016 15:10 UTC"
+__version__ = "2.1.10"
+__versionTime__ = "07 Oct 2016 01:31 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -868,7 +868,7 @@ def dump(self, indent='', depth=0, full=True):
         out.append( indent+_ustr(self.asList()) )
         if full:
             if self.haskeys():
-                items = sorted(self.items())
+                items = sorted((str(k), v) for k,v in self.items())
                 for k,v in items:
                     if out:
                         out.append(NL)
@@ -879,7 +879,7 @@ def dump(self, indent='', depth=0, full=True):
                         else:
                             out.append(_ustr(v))
                     else:
-                        out.append(_ustr(v))
+                        out.append(repr(v))
             elif any(isinstance(vv,ParseResults) for vv in self):
                 v = self
                 for i,vv in enumerate(v):
@@ -953,7 +953,7 @@ def col (loc,strg):
    positions within the parsed string.
    """
     s = strg
-    return 1 if loc<len(s) and s[loc] == '\n' else loc - s.rfind("\n", 0, loc)
+    return 1 if 0<loc<len(s) and s[loc-1] == '\n' else loc - s.rfind("\n", 0, loc)
 
 def lineno(loc,strg):
     """Returns current line number within a string, counting newlines as line separators.
@@ -2172,7 +2172,7 @@ def __rne__(self,other):
     def matches(self, testString, parseAll=True):
         """
         Method for quick testing of a parser against a test string. Good for simple 
-        inline microtests of sub expressions while building up larger parser.0
+        inline microtests of sub expressions while building up larger parser.
            
         Parameters:
          - testString - to test against this expression for a match
@@ -2267,6 +2267,13 @@ def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResult
             FAIL: Expected end of text (at char 4), (line:1, col:5)
 
             Success
+
+        Each test string must be on a single line. If you want to test a string that spans multiple
+        lines, create a test like this::
+
+            expr.runTest(r"this is a test\\n of strings that spans \\n 3 lines")
+        
+        (Note that this is a raw string literal, you must include the leading 'r'.)
         """
         if isinstance(tests, basestring):
             tests = list(map(str.strip, tests.rstrip().splitlines()))
@@ -2284,6 +2291,7 @@ def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResult
             out = ['\n'.join(comments), t]
             comments = []
             try:
+                t = t.replace(r'\n','\n')
                 result = self.parseString(t, parseAll=parseAll)
                 out.append(result.dump(full=fullDump))
                 success = success and not failureTests
@@ -2652,7 +2660,7 @@ def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=
                 self.reString = r"\b"+self.reString+r"\b"
             try:
                 self.re = re.compile( self.reString )
-            except:
+            except Exception:
                 self.re = None
 
     def parseImpl( self, instring, loc, doActions=True ):
@@ -2693,7 +2701,7 @@ def parseImpl( self, instring, loc, doActions=True ):
     def __str__( self ):
         try:
             return super(Word,self).__str__()
-        except:
+        except Exception:
             pass
 
 
@@ -2777,7 +2785,7 @@ def parseImpl( self, instring, loc, doActions=True ):
     def __str__( self ):
         try:
             return super(Regex,self).__str__()
-        except:
+        except Exception:
             pass
 
         if self.strRepr is None:
@@ -2914,7 +2922,7 @@ def parseImpl( self, instring, loc, doActions=True ):
     def __str__( self ):
         try:
             return super(QuotedString,self).__str__()
-        except:
+        except Exception:
             pass
 
         if self.strRepr is None:
@@ -2983,7 +2991,7 @@ def parseImpl( self, instring, loc, doActions=True ):
     def __str__( self ):
         try:
             return super(CharsNotIn, self).__str__()
-        except:
+        except Exception:
             pass
 
         if self.strRepr is None:
@@ -3077,27 +3085,36 @@ def parseImpl( self, instring, loc, doActions=True ):
         ret = instring[ loc: newloc ]
         return newloc, ret
 
+
 class LineStart(_PositionToken):
     """
     Matches if current position is at the beginning of a line within the parse string
+    
+    Example::
+    
+        test = '''\
+        AAA this line
+        AAA and this line
+          AAA but not this one
+        B AAA and definitely not this one
+        '''
+
+        for t in (LineStart() + 'AAA' + restOfLine).searchString(test):
+            print(t)
+    
+    Prints::
+        ['AAA', ' this line']
+        ['AAA', ' and this line']    
+
     """
     def __init__( self ):
         super(LineStart,self).__init__()
-        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
         self.errmsg = "Expected start of line"
 
-    def preParse( self, instring, loc ):
-        preloc = super(LineStart,self).preParse(instring,loc)
-        if instring[preloc] == "\n":
-            loc += 1
-        return loc
-
     def parseImpl( self, instring, loc, doActions=True ):
-        if not( loc==0 or
-            (loc == self.preParse( instring, 0 )) or
-            (instring[loc-1] == "\n") ): #col(loc, instring) != 1:
-            raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
+        if col(loc, instring) == 1:
+            return loc, []
+        raise ParseException(instring, loc, self.errmsg, self)
 
 class LineEnd(_PositionToken):
     """
@@ -3251,7 +3268,7 @@ def ignore( self, other ):
     def __str__( self ):
         try:
             return super(ParseExpression,self).__str__()
-        except:
+        except Exception:
             pass
 
         if self.strRepr is None:
@@ -3723,7 +3740,7 @@ def validate( self, validateTrace=[] ):
     def __str__( self ):
         try:
             return super(ParseElementEnhance,self).__str__()
-        except:
+        except Exception:
             pass
 
         if self.strRepr is None and self.expr is not None:
@@ -3792,6 +3809,7 @@ def __str__( self ):
 class _MultipleMatch(ParseElementEnhance):
     def __init__( self, expr, stopOn=None):
         super(_MultipleMatch, self).__init__(expr)
+        self.saveAsList = True
         ender = stopOn
         if isinstance(ender, basestring):
             ender = ParserElement._literalStringClass(ender)
@@ -3861,11 +3879,6 @@ def __str__( self ):
 
         return self.strRepr
 
-    def setResultsName( self, name, listAllMatches=False ):
-        ret = super(OneOrMore,self).setResultsName(name,listAllMatches)
-        ret.saveAsList = True
-        return ret
-
 class ZeroOrMore(_MultipleMatch):
     """
     Optional repetition of zero or more of the given expression.
@@ -3942,6 +3955,7 @@ class Optional(ParseElementEnhance):
     """
     def __init__( self, expr, default=_optionalNotMatched ):
         super(Optional,self).__init__( expr, savelist=False )
+        self.saveAsList = self.expr.saveAsList
         self.defaultValue = default
         self.mayReturnEmpty = True
 
@@ -4580,7 +4594,7 @@ def oneOf( strs, caseless=False, useRegex=True ):
                 return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) ).setName(' | '.join(symbols))
             else:
                 return Regex( "|".join(re.escape(sym) for sym in symbols) ).setName(' | '.join(symbols))
-        except:
+        except Exception:
             warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
                     SyntaxWarning, stacklevel=2)
 
@@ -4726,7 +4740,7 @@ def srange(s):
     _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
     try:
         return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)
-    except:
+    except Exception:
         return ""
 
 def matchOnlyAtCol(n):
@@ -4983,7 +4997,12 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
     Helper method for constructing grammars of expressions made up of
     operators working in a precedence hierarchy.  Operators may be unary or
     binary, left- or right-associative.  Parse actions can also be attached
-    to operator expressions.
+    to operator expressions. The generated parser will also recognize the use 
+    of parentheses to override operator precedences (see example below).
+    
+    Note: if you define a deep operator list, you may see performance issues
+    when using infixNotation. See L{ParserElement.enablePackrat} for a
+    mechanism to potentially improve your parser performance.
 
     Parameters:
      - baseExpr - expression representing the most basic element for the nested
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 22e1309c8a..6b5eb450ff 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
 packaging==16.7
-pyparsing==2.1.9
+pyparsing==2.1.10
 six==1.10.0
 appdirs==1.4.0

From 9485bee16d3631378491dfcc252ddd5b6c9a6e16 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Fri, 14 Oct 2016 08:09:25 +0200
Subject: [PATCH 6216/8469] Follow PEP8 for keyword arguments syntax in setup

---
 docs/setuptools.txt | 89 ++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 0f9556636a..5ce2c7b1ea 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -106,9 +106,9 @@ the distutils.  Here's a minimal setup script using setuptools::
 
     from setuptools import setup, find_packages
     setup(
-        name = "HelloWorld",
-        version = "0.1",
-        packages = find_packages(),
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages(),
     )
 
 As you can see, it doesn't take much to use setuptools in a project.
@@ -130,16 +130,16 @@ dependencies, and perhaps some data files and scripts::
 
     from setuptools import setup, find_packages
     setup(
-        name = "HelloWorld",
-        version = "0.1",
-        packages = find_packages(),
-        scripts = ['say_hello.py'],
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages(),
+        scripts=['say_hello.py'],
 
         # Project uses reStructuredText, so ensure that the docutils get
         # installed or upgraded on the target machine
-        install_requires = ['docutils>=0.3'],
+        install_requires=['docutils>=0.3'],
 
-        package_data = {
+        package_data={
             # If any package contains *.txt or *.rst files, include them:
             '': ['*.txt', '*.rst'],
             # And include any *.msg files found in the 'hello' package, too:
@@ -147,12 +147,12 @@ dependencies, and perhaps some data files and scripts::
         },
 
         # metadata for upload to PyPI
-        author = "Me",
-        author_email = "me@example.com",
-        description = "This is an Example Package",
-        license = "PSF",
-        keywords = "hello world example examples",
-        url = "http://example.com/HelloWorld/",   # project home page, if any
+        author="Me",
+        author_email="me@example.com",
+        description="This is an Example Package",
+        license="PSF",
+        keywords="hello world example examples",
+        url="http://example.com/HelloWorld/",   # project home page, if any
 
         # could also include long_description, download_url, classifiers, etc.
     )
@@ -431,7 +431,7 @@ the same
 directory as the setup script.  Some projects use a ``src`` or ``lib``
 directory as the root of their source tree, and those projects would of course
 use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir = {'':'src'}`` in their
+such projects also need something like ``package_dir={'':'src'}`` in their
 ``setup()`` arguments, but that's just a normal distutils thing.)
 
 Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
@@ -522,7 +522,7 @@ as the following::
 
     setup(
         # other arguments here...
-        entry_points = {
+        entry_points={
             'setuptools.installation': [
                 'eggsecutable = my_package.some_module:main_func',
             ]
@@ -674,7 +674,7 @@ installed::
 
     setup(
         ...
-        dependency_links = [
+        dependency_links=[
             "http://peak.telecommunity.com/snapshots/"
         ],
     )
@@ -699,7 +699,7 @@ For example, let's say that Project A offers optional PDF and reST support::
     setup(
         name="Project-A",
         ...
-        extras_require = {
+        extras_require={
             'PDF':  ["ReportLab>=1.2", "RXP"],
             'reST': ["docutils>=0.3"],
         }
@@ -721,7 +721,7 @@ declare it like this, so that the "PDF" requirements are only resolved if the
     setup(
         name="Project-A",
         ...
-        entry_points = {
+        entry_points={
             'console_scripts': [
                 'rst2pdf = project_a.tools.pdfgen [PDF]',
                 'rst2html = project_a.tools.htmlgen',
@@ -736,7 +736,7 @@ might declare the dependency like this::
 
     setup(
         name="Project-B",
-        install_requires = ["Project-A[PDF]"],
+        install_requires=["Project-A[PDF]"],
         ...
     )
 
@@ -759,7 +759,7 @@ setup to this::
     setup(
         name="Project-A",
         ...
-        extras_require = {
+        extras_require={
             'PDF':  [],
             'reST': ["docutils>=0.3"],
         }
@@ -784,7 +784,7 @@ e.g.::
     from setuptools import setup, find_packages
     setup(
         ...
-        include_package_data = True
+        include_package_data=True
     )
 
 This tells setuptools to install any data files it finds in your packages.
@@ -801,7 +801,7 @@ e.g.::
     from setuptools import setup, find_packages
     setup(
         ...
-        package_data = {
+        package_data={
             # If any package contains *.txt or *.rst files, include them:
             '': ['*.txt', '*.rst'],
             # And include any *.msg files found in the 'hello' package, too:
@@ -828,10 +828,10 @@ The setuptools setup file might look like this::
     from setuptools import setup, find_packages
     setup(
         ...
-        packages = find_packages('src'),  # include all packages under src
-        package_dir = {'':'src'},   # tell distutils packages are under src
+        packages=find_packages('src'),  # include all packages under src
+        package_dir={'':'src'},   # tell distutils packages are under src
 
-        package_data = {
+        package_data={
             # If any package contains *.txt files, include them:
             '': ['*.txt'],
             # And include any *.dat files found in the 'data' subdirectory
@@ -868,13 +868,13 @@ to do things like this::
     from setuptools import setup, find_packages
     setup(
         ...
-        packages = find_packages('src'),  # include all packages under src
-        package_dir = {'':'src'},   # tell distutils packages are under src
+        packages=find_packages('src'),  # include all packages under src
+        package_dir={'':'src'},   # tell distutils packages are under src
 
-        include_package_data = True,    # include everything in source control
+        include_package_data=True,    # include everything in source control
 
         # ...but exclude README.txt from all packages
-        exclude_package_data = { '': ['README.txt'] },
+        exclude_package_data={'': ['README.txt']},
     )
 
 The ``exclude_package_data`` option is a dictionary mapping package names to
@@ -1035,21 +1035,21 @@ for our hypothetical blogging tool::
 
     setup(
         # ...
-        entry_points = {'blogtool.parsers': '.rst = some_module:SomeClass'}
+        entry_points={'blogtool.parsers': '.rst = some_module:SomeClass'}
     )
 
     setup(
         # ...
-        entry_points = {'blogtool.parsers': ['.rst = some_module:a_func']}
+        entry_points={'blogtool.parsers': ['.rst = some_module:a_func']}
     )
 
     setup(
         # ...
-        entry_points = """
+        entry_points="""
             [blogtool.parsers]
             .rst = some.nested.module:SomeClass.some_classmethod [reST]
         """,
-        extras_require = dict(reST = "Docutils>=0.3.5")
+        extras_require=dict(reST="Docutils>=0.3.5")
     )
 
 The ``entry_points`` argument to ``setup()`` accepts either a string with
@@ -1343,7 +1343,7 @@ participates in.  For example, the ZopeInterface project might do this::
 
     setup(
         # ...
-        namespace_packages = ['zope']
+        namespace_packages=['zope']
     )
 
 because it contains a ``zope.interface`` package that lives in the ``zope``
@@ -1599,7 +1599,7 @@ to specify your ``install_requires`` (or other requirements) to include
 
 .. code-block:: python
 
-    install_requires = ["OtherProject>=0.2a1.dev-r143,==dev"]
+    install_requires=["OtherProject>=0.2a1.dev-r143,==dev"]
 
 The above example says, "I really want at least this particular development
 revision number, but feel free to follow and use an ``#egg=OtherProject-dev``
@@ -2303,7 +2303,7 @@ available:
 
         setup(
             # ...
-            test_suite = "my_package.tests.test_all"
+            test_suite="my_package.tests.test_all"
         )
 
     If you did not set a ``test_suite`` in your ``setup()`` call, and do not
@@ -2427,7 +2427,7 @@ project's setup script::
 
     setup(
         # ...
-        entry_points = {
+        entry_points={
             "distutils.commands": [
                 "foo = mypackage.some_module:foo",
             ],
@@ -2459,7 +2459,7 @@ distutils extension project's setup script::
 
     setup(
         # ...
-        entry_points = {
+        entry_points={
             "distutils.commands": [
                 "foo = mypackage.some_module:foo",
             ],
@@ -2521,7 +2521,7 @@ project that uses the argument::
 
     setup(
         # ...
-        entry_points = {
+        entry_points={
             "distutils.setup_keywords": [
                 "foo_bar = setuptools.dist:assert_string_list",
             ],
@@ -2540,7 +2540,7 @@ a file.  Here's what the writer utility looks like::
         argname = os.path.splitext(basename)[0]
         value = getattr(cmd.distribution, argname, None)
         if value is not None:
-            value = '\n'.join(value)+'\n'
+            value = '\n'.join(value) + '\n'
         cmd.write_or_delete_file(argname, filename, value)
 
 As you can see, ``egg_info.writers`` entry points must be a function taking
@@ -2582,9 +2582,9 @@ called "foobar", you would write a function something like this:
 
 And you would register it in a setup script using something like this::
 
-    entry_points = {
+    entry_points={
         "setuptools.file_finders": [
-            "foobar = my_foobar_module:find_files_for_foobar"
+            "foobar = my_foobar_module:find_files_for_foobar",
         ]
     }
 
@@ -2664,4 +2664,3 @@ set of steps to reproduce.
 
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
 .. _setuptools bug tracker: https://github.com/pypa/setuptools/
-

From edeee301585be35f764b27ea2a77d54e5b8aedfd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 13:56:43 -0400
Subject: [PATCH 6217/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 32ccfcaa1e..49b1c34b2c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v28.4.0
+-------
+
+* #732: Now extras with a hyphen are honored per PEP 426.
+* #811: Update to pyparsing 2.1.10.
+
 v28.3.0
 -------
 

From 45112961a7fa764f5a26663563da5ff84abb4dc1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:06:28 -0400
Subject: [PATCH 6218/8469] Remove wildcard imports from
 distutils.command.sdist

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

diff --git a/command/sdist.py b/command/sdist.py
index 4fd1d4715d..690bd66f2c 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -4,17 +4,17 @@
 
 import os
 import sys
-from types import *
 from glob import glob
 from warnings import warn
 
 from distutils.core import Command
 from distutils import dir_util, dep_util, file_util, archive_util
 from distutils.text_file import TextFile
-from distutils.errors import *
 from distutils.filelist import FileList
 from distutils import log
 from distutils.util import convert_path
+from distutils.errors import DistutilsTemplateError, DistutilsOptionError
+
 
 def show_formats():
     """Print all possible values for the 'formats' option (used by

From dcbe64d83ff6c6f60e0fc5756f91c966da930b84 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:08:28 -0400
Subject: [PATCH 6219/8469] Remove unused import and reorganize imports of
 modules.

---
 command/sdist.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 690bd66f2c..c13dbbf895 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -8,7 +8,9 @@
 from warnings import warn
 
 from distutils.core import Command
-from distutils import dir_util, dep_util, file_util, archive_util
+from distutils import dir_util
+from distutils import file_util
+from distutils import archive_util
 from distutils.text_file import TextFile
 from distutils.filelist import FileList
 from distutils import log

From 03f46fcf082aa89ab4dbb516d333918429f6e4e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:10:07 -0400
Subject: [PATCH 6220/8469] Replace trailing comments with block-level comments

---
 command/sdist.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index c13dbbf895..28cd0d9ef1 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -261,11 +261,13 @@ def add_defaults(self):
         # getting distribution.data_files
         if self.distribution.has_data_files():
             for item in self.distribution.data_files:
-                if isinstance(item, str): # plain file
+                if isinstance(item, str):
+                    # plain file
                     item = convert_path(item)
                     if os.path.isfile(item):
                         self.filelist.append(item)
-                else:    # a (dirname, filenames) tuple
+                else:
+                    # a (dirname, filenames) tuple
                     dirname, filenames = item
                     for f in filenames:
                         f = convert_path(f)

From e50f854c4a6d2641aaad5421268fb6f717984e21 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:13:51 -0400
Subject: [PATCH 6221/8469] Rely on degenerate behavior in list.extend, as
 found in distutils.

---
 setuptools/command/sdist.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 1d4f5d5489..52c5805547 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -150,9 +150,8 @@ def add_defaults(self):
 
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
-            files = list(filter(cs_path_exists, glob(pattern)))
-            if files:
-                self.filelist.extend(files)
+            files = filter(cs_path_exists, glob(pattern))
+            self.filelist.extend(files)
 
         # getting python files
         if self.distribution.has_pure_modules():

From a0fe4c8e9be2a490db4bcbaf3ffe634623ea31cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:14:42 -0400
Subject: [PATCH 6222/8469] Always use iterator-based filter

---
 setuptools/command/sdist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 52c5805547..546c96d15e 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -7,6 +7,7 @@
 import contextlib
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import filter
 
 from setuptools.utils import cs_path_exists
 

From c6f609397210c4fab5163aaa8eddf16dc0bee370 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:44:11 -0400
Subject: [PATCH 6223/8469] Get names for README files from class attribute,
 allowing subclass to override.

---
 command/sdist.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 28cd0d9ef1..e5121666b8 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -95,6 +95,8 @@ def checking_metadata(self):
 
     sub_commands = [('check', checking_metadata)]
 
+    READMES = 'README', 'README.txt'
+
     def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of
         # the manifest template and manifest file.
@@ -218,7 +220,7 @@ def add_defaults(self):
         Warns if (README or README.txt) or setup.py are missing; everything
         else is optional.
         """
-        standards = [('README', 'README.txt'), self.distribution.script_name]
+        standards = [self.READMES, self.distribution.script_name]
         for fn in standards:
             if isinstance(fn, tuple):
                 alts = fn

From 8ed698da6784b13344a63c9988faa00d281bc6d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:53:32 -0400
Subject: [PATCH 6224/8469] Extract methods from sdist.add_defaults, allowing
 subclasses to override or inject different behaviors.

---
 command/sdist.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/command/sdist.py b/command/sdist.py
index e5121666b8..c66d82713d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -220,6 +220,15 @@ def add_defaults(self):
         Warns if (README or README.txt) or setup.py are missing; everything
         else is optional.
         """
+        self._add_defaults_standards()
+        self._add_defaults_optional()
+        self._add_defaults_python()
+        self._add_defaults_data_files()
+        self._add_defaults_ext()
+        self._add_defaults_c_libs()
+        self._add_defaults_scripts()
+
+    def _add_defaults_standards(self):
         standards = [self.READMES, self.distribution.script_name]
         for fn in standards:
             if isinstance(fn, tuple):
@@ -240,11 +249,13 @@ def add_defaults(self):
                 else:
                     self.warn("standard file '%s' not found" % fn)
 
+    def _add_defaults_optional(self):
         optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
             files = filter(os.path.isfile, glob(pattern))
             self.filelist.extend(files)
 
+    def _add_defaults_python(self):
         # build_py is used to get:
         #  - python modules
         #  - files defined in package_data
@@ -260,6 +271,7 @@ def add_defaults(self):
             for filename in filenames:
                 self.filelist.append(os.path.join(src_dir, filename))
 
+    def _add_defaults_data_files(self):
         # getting distribution.data_files
         if self.distribution.has_data_files():
             for item in self.distribution.data_files:
@@ -276,14 +288,17 @@ def add_defaults(self):
                         if os.path.isfile(f):
                             self.filelist.append(f)
 
+    def _add_defaults_ext(self):
         if self.distribution.has_ext_modules():
             build_ext = self.get_finalized_command('build_ext')
             self.filelist.extend(build_ext.get_source_files())
 
+    def _add_defaults_c_libs(self):
         if self.distribution.has_c_libraries():
             build_clib = self.get_finalized_command('build_clib')
             self.filelist.extend(build_clib.get_source_files())
 
+    def _add_defaults_scripts(self):
         if self.distribution.has_scripts():
             build_scripts = self.get_finalized_command('build_scripts')
             self.filelist.extend(build_scripts.get_source_files())

From 252ee6f45e0c90a21ec951cb8d024c81ab4e2b73 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 14:55:42 -0400
Subject: [PATCH 6225/8469] Move READMES definition into class attribute.

---
 setuptools/command/sdist.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 546c96d15e..addc6a56bb 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -13,8 +13,6 @@
 
 import pkg_resources
 
-READMES = 'README', 'README.rst', 'README.txt'
-
 _default_revctrl = list
 
 
@@ -41,6 +39,8 @@ class sdist(orig.sdist):
 
     negative_opt = {}
 
+    READMES = 'README', 'README.rst', 'README.txt'
+
     def run(self):
         self.run_command('egg_info')
         ei_cmd = self.get_finalized_command('egg_info')
@@ -128,7 +128,7 @@ def __read_template_hack(self):
         read_template = __read_template_hack
 
     def add_defaults(self):
-        standards = [READMES,
+        standards = [self.READMES,
                      self.distribution.script_name]
         for fn in standards:
             if isinstance(fn, tuple):
@@ -180,13 +180,13 @@ def add_defaults(self):
             self.filelist.extend(build_scripts.get_source_files())
 
     def check_readme(self):
-        for f in READMES:
+        for f in self.READMES:
             if os.path.exists(f):
                 return
         else:
             self.warn(
                 "standard file not found: should have one of " +
-                ', '.join(READMES)
+                ', '.join(self.READMES)
             )
 
     def make_release_tree(self, base_dir, files):

From 57b4b8456508a65861aaf46e8a17c2d7361daed7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:11:24 -0400
Subject: [PATCH 6226/8469] Adding setuptools.command.py36compat module with
 functionality copied from distutils.command.sdist in 6d5603e41569

---
 setuptools/command/py36compat.py | 114 +++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 setuptools/command/py36compat.py

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
new file mode 100644
index 0000000000..d92b9d487d
--- /dev/null
+++ b/setuptools/command/py36compat.py
@@ -0,0 +1,114 @@
+import os
+from glob import glob
+from distutils.util import convert_path
+from distutils.command import sdist
+
+
+class sdist_add_defaults:
+    """
+    Mix-in providing forward-compatibility for functionality as found in
+    distutils on Python 3.7.
+    """
+
+    def add_defaults(self):
+        """Add all the default files to self.filelist:
+          - README or README.txt
+          - setup.py
+          - test/test*.py
+          - all pure Python modules mentioned in setup script
+          - all files pointed by package_data (build_py)
+          - all files defined in data_files.
+          - all files defined as scripts.
+          - all C sources listed as part of extensions or C libraries
+            in the setup script (doesn't catch C headers!)
+        Warns if (README or README.txt) or setup.py are missing; everything
+        else is optional.
+        """
+        self._add_defaults_standards()
+        self._add_defaults_optional()
+        self._add_defaults_python()
+        self._add_defaults_data_files()
+        self._add_defaults_ext()
+        self._add_defaults_c_libs()
+        self._add_defaults_scripts()
+
+    def _add_defaults_standards(self):
+        standards = [self.READMES, self.distribution.script_name]
+        for fn in standards:
+            if isinstance(fn, tuple):
+                alts = fn
+                got_it = False
+                for fn in alts:
+                    if os.path.exists(fn):
+                        got_it = True
+                        self.filelist.append(fn)
+                        break
+
+                if not got_it:
+                    self.warn("standard file not found: should have one of " +
+                              ', '.join(alts))
+            else:
+                if os.path.exists(fn):
+                    self.filelist.append(fn)
+                else:
+                    self.warn("standard file '%s' not found" % fn)
+
+    def _add_defaults_optional(self):
+        optional = ['test/test*.py', 'setup.cfg']
+        for pattern in optional:
+            files = filter(os.path.isfile, glob(pattern))
+            self.filelist.extend(files)
+
+    def _add_defaults_python(self):
+        # build_py is used to get:
+        #  - python modules
+        #  - files defined in package_data
+        build_py = self.get_finalized_command('build_py')
+
+        # getting python files
+        if self.distribution.has_pure_modules():
+            self.filelist.extend(build_py.get_source_files())
+
+        # getting package_data files
+        # (computed in build_py.data_files by build_py.finalize_options)
+        for pkg, src_dir, build_dir, filenames in build_py.data_files:
+            for filename in filenames:
+                self.filelist.append(os.path.join(src_dir, filename))
+
+    def _add_defaults_data_files(self):
+        # getting distribution.data_files
+        if self.distribution.has_data_files():
+            for item in self.distribution.data_files:
+                if isinstance(item, str):
+                    # plain file
+                    item = convert_path(item)
+                    if os.path.isfile(item):
+                        self.filelist.append(item)
+                else:
+                    # a (dirname, filenames) tuple
+                    dirname, filenames = item
+                    for f in filenames:
+                        f = convert_path(f)
+                        if os.path.isfile(f):
+                            self.filelist.append(f)
+
+    def _add_defaults_ext(self):
+        if self.distribution.has_ext_modules():
+            build_ext = self.get_finalized_command('build_ext')
+            self.filelist.extend(build_ext.get_source_files())
+
+    def _add_defaults_c_libs(self):
+        if self.distribution.has_c_libraries():
+            build_clib = self.get_finalized_command('build_clib')
+            self.filelist.extend(build_clib.get_source_files())
+
+    def _add_defaults_scripts(self):
+        if self.distribution.has_scripts():
+            build_scripts = self.get_finalized_command('build_scripts')
+            self.filelist.extend(build_scripts.get_source_files())
+
+
+if hasattr(sdist.sdist, '_add_defaults_standards'):
+    # disable the functionality already available upstream
+    class sdist_add_defaults:
+        pass

From 3b05fac47289e9835e5bd6f2efb130df59a73ffb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:39:01 -0400
Subject: [PATCH 6227/8469] Add case-sensitive file comparison for
 detecting/adding standard default files.

---
 command/sdist.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index c66d82713d..0cc01192f3 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -32,6 +32,24 @@ def show_formats():
     FancyGetopt(formats).print_help(
         "List of available source distribution formats:")
 
+
+def cs_path_exists(fspath):
+    """
+    Case-sensitive path existence check
+
+    >>> cs_path_exists(__file__)
+    True
+    >>> cs_path_exists(__file__.upper())
+    False
+    """
+    if not os.path.exists(fspath):
+        return False
+    # make absolute so we always have a directory
+    abspath = os.path.abspath(fspath)
+    directory, filename = os.path.split(abspath)
+    return filename in os.listdir(directory)
+
+
 class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
@@ -235,7 +253,7 @@ def _add_defaults_standards(self):
                 alts = fn
                 got_it = False
                 for fn in alts:
-                    if os.path.exists(fn):
+                    if cs_path_exists(fn):
                         got_it = True
                         self.filelist.append(fn)
                         break
@@ -244,7 +262,7 @@ def _add_defaults_standards(self):
                     self.warn("standard file not found: should have one of " +
                               ', '.join(alts))
             else:
-                if os.path.exists(fn):
+                if cs_path_exists(fn):
                     self.filelist.append(fn)
                 else:
                     self.warn("standard file '%s' not found" % fn)

From ed0dd7aea6253700672dc87b3abe63b3b52b63e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:41:42 -0400
Subject: [PATCH 6228/8469] Make cs_path_exists a protected, static method

---
 command/sdist.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/command/sdist.py b/command/sdist.py
index 0cc01192f3..180e28626d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -33,23 +33,6 @@ def show_formats():
         "List of available source distribution formats:")
 
 
-def cs_path_exists(fspath):
-    """
-    Case-sensitive path existence check
-
-    >>> cs_path_exists(__file__)
-    True
-    >>> cs_path_exists(__file__.upper())
-    False
-    """
-    if not os.path.exists(fspath):
-        return False
-    # make absolute so we always have a directory
-    abspath = os.path.abspath(fspath)
-    directory, filename = os.path.split(abspath)
-    return filename in os.listdir(directory)
-
-
 class sdist(Command):
 
     description = "create a source distribution (tarball, zip file, etc.)"
@@ -246,6 +229,23 @@ def add_defaults(self):
         self._add_defaults_c_libs()
         self._add_defaults_scripts()
 
+    @staticmethod
+    def _cs_path_exists(fspath):
+        """
+        Case-sensitive path existence check
+
+        >>> sdist._cs_path_exists(__file__)
+        True
+        >>> sdist._cs_path_exists(__file__.upper())
+        False
+        """
+        if not os.path.exists(fspath):
+            return False
+        # make absolute so we always have a directory
+        abspath = os.path.abspath(fspath)
+        directory, filename = os.path.split(abspath)
+        return filename in os.listdir(directory)
+
     def _add_defaults_standards(self):
         standards = [self.READMES, self.distribution.script_name]
         for fn in standards:
@@ -253,7 +253,7 @@ def _add_defaults_standards(self):
                 alts = fn
                 got_it = False
                 for fn in alts:
-                    if cs_path_exists(fn):
+                    if self._cs_path_exists(fn):
                         got_it = True
                         self.filelist.append(fn)
                         break
@@ -262,7 +262,7 @@ def _add_defaults_standards(self):
                     self.warn("standard file not found: should have one of " +
                               ', '.join(alts))
             else:
-                if cs_path_exists(fn):
+                if self._cs_path_exists(fn):
                     self.filelist.append(fn)
                 else:
                     self.warn("standard file '%s' not found" % fn)

From 36bcc35f0cf0d99d20fe9610f4001c513d851cfd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:43:01 -0400
Subject: [PATCH 6229/8469] Update sdist_add_defaults to match CPython
 db8bb1bd6ac5

---
 setuptools/command/py36compat.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index d92b9d487d..883221da9b 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -3,6 +3,8 @@
 from distutils.util import convert_path
 from distutils.command import sdist
 
+from setuptools.extern.six.moves import filter
+
 
 class sdist_add_defaults:
     """
@@ -32,6 +34,23 @@ def add_defaults(self):
         self._add_defaults_c_libs()
         self._add_defaults_scripts()
 
+    @staticmethod
+    def _cs_path_exists(fspath):
+        """
+        Case-sensitive path existence check
+
+        >>> sdist._cs_path_exists(__file__)
+        True
+        >>> sdist._cs_path_exists(__file__.upper())
+        False
+        """
+        if not os.path.exists(fspath):
+            return False
+        # make absolute so we always have a directory
+        abspath = os.path.abspath(fspath)
+        directory, filename = os.path.split(abspath)
+        return filename in os.listdir(directory)
+
     def _add_defaults_standards(self):
         standards = [self.READMES, self.distribution.script_name]
         for fn in standards:
@@ -39,7 +58,7 @@ def _add_defaults_standards(self):
                 alts = fn
                 got_it = False
                 for fn in alts:
-                    if os.path.exists(fn):
+                    if self._cs_path_exists(fn):
                         got_it = True
                         self.filelist.append(fn)
                         break
@@ -48,7 +67,7 @@ def _add_defaults_standards(self):
                     self.warn("standard file not found: should have one of " +
                               ', '.join(alts))
             else:
-                if os.path.exists(fn):
+                if self._cs_path_exists(fn):
                     self.filelist.append(fn)
                 else:
                     self.warn("standard file '%s' not found" % fn)

From e704747721609fcb25267041292c14493751b61c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:49:20 -0400
Subject: [PATCH 6230/8469] Update doctest to pass

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

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 883221da9b..def5906ab7 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -39,9 +39,9 @@ def _cs_path_exists(fspath):
         """
         Case-sensitive path existence check
 
-        >>> sdist._cs_path_exists(__file__)
+        >>> sdist_add_defaults._cs_path_exists(__file__)
         True
-        >>> sdist._cs_path_exists(__file__.upper())
+        >>> sdist_add_defaults._cs_path_exists(__file__.upper())
         False
         """
         if not os.path.exists(fspath):

From 6b175fcf513fa98f03b4c529cccfa3d256e91e19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:52:50 -0400
Subject: [PATCH 6231/8469] Add note about editing the code

---
 setuptools/command/py36compat.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index def5906ab7..61063e7542 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -10,6 +10,9 @@ class sdist_add_defaults:
     """
     Mix-in providing forward-compatibility for functionality as found in
     distutils on Python 3.7.
+
+    Do not edit the code in this class except to update functionality
+    as implemented in distutils. Instead, override in the subclass.
     """
 
     def add_defaults(self):

From 17f89f4ffca731f1ee3d49aad717415013d047d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 15:53:16 -0400
Subject: [PATCH 6232/8469] Update sdist to use sdist_add_defaults forward
 compatibility.

---
 setuptools/command/sdist.py | 51 ++++++-------------------------------
 setuptools/utils.py         | 11 --------
 2 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 setuptools/utils.py

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index addc6a56bb..b85d7d03ee 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -1,4 +1,3 @@
-from glob import glob
 from distutils import log
 import distutils.command.sdist as orig
 import os
@@ -7,9 +6,8 @@
 import contextlib
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import filter
 
-from setuptools.utils import cs_path_exists
+from .py36compat import sdist_add_defaults
 
 import pkg_resources
 
@@ -23,7 +21,7 @@ def walk_revctrl(dirname=''):
             yield item
 
 
-class sdist(orig.sdist):
+class sdist(sdist_add_defaults, orig.sdist):
     """Smart sdist that finds anything supported by revision control"""
 
     user_options = [
@@ -127,34 +125,8 @@ def __read_template_hack(self):
     if has_leaky_handle:
         read_template = __read_template_hack
 
-    def add_defaults(self):
-        standards = [self.READMES,
-                     self.distribution.script_name]
-        for fn in standards:
-            if isinstance(fn, tuple):
-                alts = fn
-                got_it = 0
-                for fn in alts:
-                    if cs_path_exists(fn):
-                        got_it = 1
-                        self.filelist.append(fn)
-                        break
-
-                if not got_it:
-                    self.warn("standard file not found: should have one of " +
-                              ', '.join(alts))
-            else:
-                if cs_path_exists(fn):
-                    self.filelist.append(fn)
-                else:
-                    self.warn("standard file '%s' not found" % fn)
-
-        optional = ['test/test*.py', 'setup.cfg']
-        for pattern in optional:
-            files = filter(cs_path_exists, glob(pattern))
-            self.filelist.extend(files)
-
-        # getting python files
+    def _add_defaults_python(self):
+        """getting python files"""
         if self.distribution.has_pure_modules():
             build_py = self.get_finalized_command('build_py')
             self.filelist.extend(build_py.get_source_files())
@@ -167,17 +139,10 @@ def add_defaults(self):
                     self.filelist.extend([os.path.join(src_dir, filename)
                                           for filename in filenames])
 
-        if self.distribution.has_ext_modules():
-            build_ext = self.get_finalized_command('build_ext')
-            self.filelist.extend(build_ext.get_source_files())
-
-        if self.distribution.has_c_libraries():
-            build_clib = self.get_finalized_command('build_clib')
-            self.filelist.extend(build_clib.get_source_files())
-
-        if self.distribution.has_scripts():
-            build_scripts = self.get_finalized_command('build_scripts')
-            self.filelist.extend(build_scripts.get_source_files())
+    def _add_defaults_data_files(self):
+        """
+        Don't add any data files, but why?
+        """
 
     def check_readme(self):
         for f in self.READMES:
diff --git a/setuptools/utils.py b/setuptools/utils.py
deleted file mode 100644
index 080b9a8e23..0000000000
--- a/setuptools/utils.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os
-import os.path
-
-
-def cs_path_exists(fspath):
-    if not os.path.exists(fspath):
-        return False
-    # make absolute so we always have a directory
-    abspath = os.path.abspath(fspath)
-    directory, filename = os.path.split(abspath)
-    return filename in os.listdir(directory)

From f1cf491f360110af0b580758418c1a8ae7ae658b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 16:00:00 -0400
Subject: [PATCH 6233/8469] Update changelog

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 49b1c34b2c..69f966d73b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,10 @@ v28.4.0
 
 * #732: Now extras with a hyphen are honored per PEP 426.
 * #811: Update to pyparsing 2.1.10.
+* Updated ``setuptools.command.sdist`` to re-use most of
+  the functionality directly from ``distutils.command.sdist``
+  for the ``add_defaults`` method with strategic overrides.
+  See #750 for rationale.
 
 v28.3.0
 -------

From a3104077dddc72c3b34ba83c46edded1ebd99d3c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 16:13:40 -0400
Subject: [PATCH 6234/8469] Update changelog. Ref #762.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 69f966d73b..5521c72fc1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,9 @@ v28.4.0
   the functionality directly from ``distutils.command.sdist``
   for the ``add_defaults`` method with strategic overrides.
   See #750 for rationale.
+* #760 via #762: Look for certificate bundle where SUSE
+  Linux typically presents it. Use ``certifi.where()`` to locate
+  the bundle.
 
 v28.3.0
 -------

From 7edbffcc92c89b96f37e9e007e0f7f9490c49232 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 16:43:02 -0400
Subject: [PATCH 6235/8469] =?UTF-8?q?Bump=20version:=2028.3.0=20=E2=86=92?=
 =?UTF-8?q?=2028.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 810b75102e..95879c2135 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.3.0
+current_version = 28.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 7e7d181550..c3b556d5c3 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.3.0",
+    version="28.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 8810250b5ad5df929b0d4db37d676e6f494cbda5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 18:56:12 -0400
Subject: [PATCH 6236/8469] Run tests with tox

---
 .travis.yml              |  4 ++--
 docs/developer-guide.txt |  8 +++-----
 setup.py                 | 10 +---------
 tox.ini                  |  8 ++++----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b8bca7cc7f..45be20a18d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,13 @@ script:
  # avoid VersionConflict when newer version is required
  - pip install -U 'pytest>=3.0.2'
 
- # Output the env, because the travis docs just can't be trusted
+ # Output the env, to verify behavior
  - env
 
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - python setup.py test --addopts='-rsx'
+ - python -m tox
 
 before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 70e7f1cd0a..c8f51b0208 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -89,12 +89,10 @@ For posterity, the old `Bitbucket mirror
 Testing
 -------
 
-The primary tests are run using py.test. To run the tests::
+The primary tests are run using tox. To run the tests, first make
+sure you have tox installed, then invoke it::
 
-    $ python setup.py test
-
-Or install py.test into your environment and run ``PYTHONPATH=. py.test``
-or ``python -m pytest``.
+    $ tox
 
 Under continuous integration, additional tests may be run. See the
 ``.travis.yml`` file for full details on the tests run under Travis-CI.
diff --git a/setup.py b/setup.py
index c3b556d5c3..2948e5152f 100755
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,6 @@ def _gen_console_scripts():
     package_data.setdefault('setuptools', []).extend(['*.exe'])
     package_data.setdefault('setuptools.command', []).extend(['*.xml'])
 
-needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
-pytest_runner = ['pytest-runner'] if needs_pytest else []
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
@@ -178,14 +176,8 @@ def pypi_link(pkg_filename):
         ),
     ],
     scripts=[],
-    tests_require=[
-        'setuptools[ssl]',
-        'pytest-flake8',
-        # pin pytest to 3.0.2 for pytest-dev/pytest#1888
-        'pytest==3.0.2',
-    ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-    ] + pytest_runner + wheel,
+    ] + wheel,
 )
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index 806e6ed26f..770fbd8608 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
-[tox]
-envlist = py26,py27,py33,py34,py35,pypy,pypy3
-
 [testenv]
 deps=
 	pytest-flake8
 	pytest>=3.0.2
+	setuptools[ssl]
+	py{26,27,32}: mock
+
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
-commands=python setup.py test --addopts='-rsx'
+commands=python -m pytest -rsx

From 839c5f11bf01d66d5dde6efdf0874b7773aa0161 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 20:02:14 -0400
Subject: [PATCH 6237/8469] Install tox and not pytest. tox will install
 pytest.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45be20a18d..76fd04b994 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,7 @@ env:
  - ""
  - LC_ALL=C LC_CTYPE=C
 script:
- # avoid VersionConflict when newer version is required
- - pip install -U 'pytest>=3.0.2'
+ - pip install tox
 
  # Output the env, to verify behavior
  - env

From bb45468d27615c2ce9f9c9757a367c44d6ee80d2 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Tue, 16 Aug 2016 16:40:10 +1000
Subject: [PATCH 6238/8469] Much faster implementation of FileList, for big
 egg_info speedups

---
 setuptools/command/egg_info.py    | 262 ++++++++++++++++++++++++++----
 setuptools/glob.py                | 165 +++++++++++++++++++
 setuptools/tests/test_manifest.py |  68 ++++++--
 3 files changed, 451 insertions(+), 44 deletions(-)
 create mode 100644 setuptools/glob.py

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5183eedc8e..6cc8f4c45e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -3,6 +3,7 @@
 Create a distribution's .egg-info directory and contents"""
 
 from distutils.filelist import FileList as _FileList
+from distutils.errors import DistutilsInternalError
 from distutils.util import convert_path
 from distutils import log
 import distutils.errors
@@ -27,6 +28,7 @@
     parse_requirements, safe_name, parse_version,
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 import setuptools.unicode_utils as unicode_utils
+from setuptools.glob import glob
 
 from pkg_resources.extern import packaging
 
@@ -36,6 +38,88 @@
     pass
 
 
+def translate_pattern(glob):
+    """
+    Translate a file path glob like '*.txt' in to a regular expression.
+    This differs from fnmatch.translate which allows wildcards to match
+    directory separators. It also knows about '**/' which matches any number of
+    directories.
+    """
+    pat = ''
+
+    # This will split on '/' within [character classes]. This is deliberate.
+    chunks = glob.split(os.path.sep)
+
+    sep = re.escape(os.sep)
+    valid_char = '[^%s]' % (sep,)
+
+    for c, chunk in enumerate(chunks):
+        last_chunk = c == len(chunks) - 1
+
+        # Chunks that are a literal ** are globstars. They match anything.
+        if chunk == '**':
+            if last_chunk:
+                # Match anything if this is the last component
+                pat += '.*'
+            else:
+                # Match '(name/)*'
+                pat += '(?:%s+%s)*' % (valid_char, sep)
+            continue  # Break here as the whole path component has been handled
+
+        # Find any special characters in the remainder
+        i = 0
+        chunk_len = len(chunk)
+        while i < chunk_len:
+            char = chunk[i]
+            if char == '*':
+                # Match any number of name characters
+                pat += valid_char + '*'
+            elif char == '?':
+                # Match a name character
+                pat += valid_char
+            elif char == '[':
+                # Character class
+                inner_i = i + 1
+                # Skip initial !/] chars
+                if inner_i < chunk_len and chunk[inner_i] == '!':
+                    inner_i = inner_i + 1
+                if inner_i < chunk_len and chunk[inner_i] == ']':
+                    inner_i = inner_i + 1
+
+                # Loop till the closing ] is found
+                while inner_i < chunk_len and chunk[inner_i] != ']':
+                    inner_i = inner_i + 1
+
+                if inner_i >= chunk_len:
+                    # Got to the end of the string without finding a closing ]
+                    # Do not treat this as a matching group, but as a literal [
+                    pat += re.escape(char)
+                else:
+                    # Grab the insides of the [brackets]
+                    inner = chunk[i + 1:inner_i]
+                    char_class = ''
+
+                    # Class negation
+                    if inner[0] == '!':
+                        char_class = '^'
+                        inner = inner[1:]
+
+                    char_class += re.escape(inner)
+                    pat += '[%s]' % (char_class,)
+
+                    # Skip to the end ]
+                    i = inner_i
+            else:
+                pat += re.escape(char)
+            i += 1
+
+        # Join each chunk with the dir separator
+        if not last_chunk:
+            pat += sep
+
+    return re.compile(pat + r'\Z(?ms)')
+
+
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
 
@@ -239,7 +323,151 @@ def check_broken_egg_info(self):
 
 
 class FileList(_FileList):
-    """File list that accepts only existing, platform-independent paths"""
+    # Implementations of the various MANIFEST.in commands
+
+    def process_template_line(self, line):
+        # Parse the line: split it up, make sure the right number of words
+        # is there, and return the relevant words.  'action' is always
+        # defined: it's the first word of the line.  Which of the other
+        # three are defined depends on the action; it'll be either
+        # patterns, (dir and patterns), or (dir_pattern).
+        (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
+
+        # OK, now we know that the action is valid and we have the
+        # right number of words on the line for that action -- so we
+        # can proceed with minimal error-checking.
+        if action == 'include':
+            self.debug_print("include " + ' '.join(patterns))
+            for pattern in patterns:
+                if not self.include(pattern):
+                    log.warn("warning: no files found matching '%s'", pattern)
+
+        elif action == 'exclude':
+            self.debug_print("exclude " + ' '.join(patterns))
+            for pattern in patterns:
+                if not self.exclude(pattern):
+                    log.warn(("warning: no previously-included files "
+                              "found matching '%s'"), pattern)
+
+        elif action == 'global-include':
+            self.debug_print("global-include " + ' '.join(patterns))
+            for pattern in patterns:
+                if not self.global_include(pattern):
+                    log.warn(("warning: no files found matching '%s' "
+                              "anywhere in distribution"), pattern)
+
+        elif action == 'global-exclude':
+            self.debug_print("global-exclude " + ' '.join(patterns))
+            for pattern in patterns:
+                if not self.global_exclude(pattern):
+                    log.warn(("warning: no previously-included files matching "
+                              "'%s' found anywhere in distribution"),
+                             pattern)
+
+        elif action == 'recursive-include':
+            self.debug_print("recursive-include %s %s" %
+                             (dir, ' '.join(patterns)))
+            for pattern in patterns:
+                if not self.recursive_include(dir, pattern):
+                    log.warn(("warning: no files found matching '%s' "
+                              "under directory '%s'"),
+                             pattern, dir)
+
+        elif action == 'recursive-exclude':
+            self.debug_print("recursive-exclude %s %s" %
+                             (dir, ' '.join(patterns)))
+            for pattern in patterns:
+                if not self.recursive_exclude(dir, pattern):
+                    log.warn(("warning: no previously-included files matching "
+                              "'%s' found under directory '%s'"),
+                             pattern, dir)
+
+        elif action == 'graft':
+            self.debug_print("graft " + dir_pattern)
+            if not self.graft(dir_pattern):
+                log.warn("warning: no directories found matching '%s'",
+                         dir_pattern)
+
+        elif action == 'prune':
+            self.debug_print("prune " + dir_pattern)
+            if not self.prune(dir_pattern):
+                log.warn(("no previously-included directories found "
+                          "matching '%s'"), dir_pattern)
+
+        else:
+            raise DistutilsInternalError(
+                "this cannot happen: invalid action '%s'" % action)
+
+    def _remove_files(self, predicate):
+        """
+        Remove all files from the file list that match the predicate.
+        Return True if any matching files were removed
+        """
+        found = False
+        for i in range(len(self.files) - 1, -1, -1):
+            if predicate(self.files[i]):
+                self.debug_print(" removing " + self.files[i])
+                del self.files[i]
+                found = True
+        return found
+
+    def include(self, pattern):
+        """Include files that match 'pattern'."""
+        found = [f for f in glob(pattern) if not os.path.isdir(f)]
+        self.extend(found)
+        return bool(found)
+
+    def exclude(self, pattern):
+        """Exclude files that match 'pattern'."""
+        match = translate_pattern(pattern)
+        return self._remove_files(match.match)
+
+    def recursive_include(self, dir, pattern):
+        """
+        Include all files anywhere in 'dir/' that match the pattern.
+        """
+        full_pattern = os.path.join(dir, '**', pattern)
+        found = [f for f in glob(full_pattern, recursive=True)
+                 if not os.path.isdir(f)]
+        self.extend(found)
+        return bool(found)
+
+    def recursive_exclude(self, dir, pattern):
+        """
+        Exclude any file anywhere in 'dir/' that match the pattern.
+        """
+        match = translate_pattern(os.path.join(dir, '**', pattern))
+        return self._remove_files(match.match)
+
+    def graft(self, dir):
+        """Include all files from 'dir/'."""
+        found = distutils.filelist.findall(dir)
+        self.extend(found)
+        return bool(found)
+
+    def prune(self, dir):
+        """Filter out files from 'dir/'."""
+        match = translate_pattern(os.path.join(dir, '**'))
+        return self._remove_files(match.match)
+
+    def global_include(self, pattern):
+        """
+        Include all files anywhere in the current directory that match the
+        pattern. This is very inefficient on large file trees.
+        """
+        if self.allfiles is None:
+            self.findall()
+        match = translate_pattern(os.path.join('**', pattern))
+        found = [f for f in self.allfiles if match.match(f)]
+        self.extend(found)
+        return bool(found)
+
+    def global_exclude(self, pattern):
+        """
+        Exclude all files anywhere that match the pattern.
+        """
+        match = translate_pattern(os.path.join('**', pattern))
+        return self._remove_files(match.match)
 
     def append(self, item):
         if item.endswith('\r'):  # Fix older sdists built on Windows
@@ -302,7 +530,6 @@ def run(self):
         self.filelist = FileList()
         if not os.path.exists(self.manifest):
             self.write_manifest()  # it must exist so it'll get in the list
-        self.filelist.findall()
         self.add_defaults()
         if os.path.exists(self.template):
             self.read_template()
@@ -341,38 +568,13 @@ def add_defaults(self):
         elif os.path.exists(self.manifest):
             self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
-        self._add_egg_info(cmd=ei_cmd)
-        self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
-
-    def _add_egg_info(self, cmd):
-        """
-        Add paths for egg-info files for an external egg-base.
-
-        The egg-info files are written to egg-base. If egg-base is
-        outside the current working directory, this method
-        searchs the egg-base directory for files to include
-        in the manifest. Uses distutils.filelist.findall (which is
-        really the version monkeypatched in by setuptools/__init__.py)
-        to perform the search.
-
-        Since findall records relative paths, prefix the returned
-        paths with cmd.egg_base, so add_default's include_pattern call
-        (which is looking for the absolute cmd.egg_info) will match
-        them.
-        """
-        if cmd.egg_base == os.curdir:
-            # egg-info files were already added by something else
-            return
-
-        discovered = distutils.filelist.findall(cmd.egg_base)
-        resolved = (os.path.join(cmd.egg_base, path) for path in discovered)
-        self.filelist.allfiles.extend(resolved)
+        self.filelist.graft(ei_cmd.egg_info)
 
     def prune_file_list(self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
-        self.filelist.exclude_pattern(None, prefix=build.build_base)
-        self.filelist.exclude_pattern(None, prefix=base_dir)
+        self.filelist.prune(build.build_base)
+        self.filelist.prune(base_dir)
         sep = re.escape(os.sep)
         self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep,
                                       is_regex=1)
diff --git a/setuptools/glob.py b/setuptools/glob.py
new file mode 100644
index 0000000000..f51b9c8363
--- /dev/null
+++ b/setuptools/glob.py
@@ -0,0 +1,165 @@
+"""
+Filename globbing utility. Mostly a copy of `glob` from Python 3.5.
+
+Changes include:
+ * `yield from` and PEP3102 `*` removed.
+ * `bytes` changed to `six.binary_type`.
+ * Hidden files are not ignored.
+"""
+
+import os
+import re
+import fnmatch
+from setuptools.extern.six import binary_type
+
+__all__ = ["glob", "iglob", "escape"]
+
+def glob(pathname, recursive=False):
+    """Return a list of paths matching a pathname pattern.
+
+    The pattern may contain simple shell-style wildcards a la
+    fnmatch. However, unlike fnmatch, filenames starting with a
+    dot are special cases that are not matched by '*' and '?'
+    patterns.
+
+    If recursive is true, the pattern '**' will match any files and
+    zero or more directories and subdirectories.
+    """
+    return list(iglob(pathname, recursive=recursive))
+
+def iglob(pathname, recursive=False):
+    """Return an iterator which yields the paths matching a pathname pattern.
+
+    The pattern may contain simple shell-style wildcards a la
+    fnmatch. However, unlike fnmatch, filenames starting with a
+    dot are special cases that are not matched by '*' and '?'
+    patterns.
+
+    If recursive is true, the pattern '**' will match any files and
+    zero or more directories and subdirectories.
+    """
+    it = _iglob(pathname, recursive)
+    if recursive and _isrecursive(pathname):
+        s = next(it)  # skip empty string
+        assert not s
+    return it
+
+def _iglob(pathname, recursive):
+    dirname, basename = os.path.split(pathname)
+    if not has_magic(pathname):
+        if basename:
+            if os.path.lexists(pathname):
+                yield pathname
+        else:
+            # Patterns ending with a slash should match only directories
+            if os.path.isdir(dirname):
+                yield pathname
+        return
+    if not dirname:
+        if recursive and _isrecursive(basename):
+            for x in glob2(dirname, basename):
+                yield x
+        else:
+            for x in glob1(dirname, basename):
+                yield x
+        return
+    # `os.path.split()` returns the argument itself as a dirname if it is a
+    # drive or UNC path.  Prevent an infinite recursion if a drive or UNC path
+    # contains magic characters (i.e. r'\\?\C:').
+    if dirname != pathname and has_magic(dirname):
+        dirs = _iglob(dirname, recursive)
+    else:
+        dirs = [dirname]
+    if has_magic(basename):
+        if recursive and _isrecursive(basename):
+            glob_in_dir = glob2
+        else:
+            glob_in_dir = glob1
+    else:
+        glob_in_dir = glob0
+    for dirname in dirs:
+        for name in glob_in_dir(dirname, basename):
+            yield os.path.join(dirname, name)
+
+# These 2 helper functions non-recursively glob inside a literal directory.
+# They return a list of basenames. `glob1` accepts a pattern while `glob0`
+# takes a literal basename (so it only has to check for its existence).
+
+def glob1(dirname, pattern):
+    if not dirname:
+        if isinstance(pattern, binary_type):
+            dirname = os.curdir.encode('ASCII')
+        else:
+            dirname = os.curdir
+    try:
+        names = os.listdir(dirname)
+    except OSError:
+        return []
+    return fnmatch.filter(names, pattern)
+
+def glob0(dirname, basename):
+    if not basename:
+        # `os.path.split()` returns an empty basename for paths ending with a
+        # directory separator.  'q*x/' should match only directories.
+        if os.path.isdir(dirname):
+            return [basename]
+    else:
+        if os.path.lexists(os.path.join(dirname, basename)):
+            return [basename]
+    return []
+
+# This helper function recursively yields relative pathnames inside a literal
+# directory.
+
+def glob2(dirname, pattern):
+    assert _isrecursive(pattern)
+    yield pattern[:0]
+    for x in _rlistdir(dirname):
+        yield x
+
+
+# Recursively yields relative pathnames inside a literal directory.
+def _rlistdir(dirname):
+    if not dirname:
+        if isinstance(dirname, binary_type):
+            dirname = binary_type(os.curdir, 'ASCII')
+        else:
+            dirname = os.curdir
+    try:
+        names = os.listdir(dirname)
+    except os.error:
+        return
+    for x in names:
+        yield x
+        path = os.path.join(dirname, x) if dirname else x
+        for y in _rlistdir(path):
+            yield os.path.join(x, y)
+
+
+magic_check = re.compile('([*?[])')
+magic_check_bytes = re.compile(b'([*?[])')
+
+def has_magic(s):
+    if isinstance(s, binary_type):
+        match = magic_check_bytes.search(s)
+    else:
+        match = magic_check.search(s)
+    return match is not None
+
+def _isrecursive(pattern):
+    if isinstance(pattern, binary_type):
+        return pattern == b'**'
+    else:
+        return pattern == '**'
+
+def escape(pathname):
+    """Escape all special characters.
+    """
+    # Escaping is done by wrapping any of "*?[" between square brackets.
+    # Metacharacters do not work in the drive part and shouldn't be escaped.
+    drive, pathname = os.path.splitdrive(pathname)
+    if isinstance(pathname, binary_type):
+        pathname = magic_check_bytes.sub(br'[\1]', pathname)
+    else:
+        pathname = magic_check.sub(r'[\1]', pathname)
+    return drive + pathname
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 6360270d5b..558de2c775 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -9,7 +9,7 @@
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
-from setuptools.command.egg_info import FileList, egg_info
+from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
 from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
@@ -66,6 +66,34 @@ def touch(filename):
 ]))
 
 
+def get_pattern(glob):
+    return translate_pattern(make_local_path(glob)).pattern
+
+
+def test_translated_pattern_test():
+    l = make_local_path
+    assert get_pattern('foo') == r'foo\Z(?ms)'
+    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z(?ms)')
+
+    # Glob matching
+    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z(?ms)')
+    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z(?ms)')
+    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z(?ms)')
+    assert get_pattern('docs/page-?.txt') \
+        == l(r'docs\/page\-[^\/]\.txt\Z(?ms)')
+
+    # Globstars change what they mean depending upon where they are
+    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z(?ms)')
+    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z(?ms)')
+    assert get_pattern(l('**')) == r'.*\Z(?ms)'
+
+    # Character classes
+    assert get_pattern('pre[one]post') == r'pre[one]post\Z(?ms)'
+    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z(?ms)'
+    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z(?ms)'
+    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z(?ms)'
+
+
 class TempDirTestCase(object):
 
     def setup_method(self, method):
@@ -346,23 +374,21 @@ def test_exclude_pattern(self):
     def test_include_pattern(self):
         # return False if no match
         file_list = FileList()
-        file_list.set_allfiles([])
+        self.make_files([])
         assert not file_list.include_pattern('*.py')
 
         # return True if files match
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt'])
+        self.make_files(['a.py', 'b.txt'])
         assert file_list.include_pattern('*.py')
 
         # test * matches all files
         file_list = FileList()
-        assert file_list.allfiles is None
-        file_list.set_allfiles(['a.py', 'b.txt'])
+        self.make_files(['a.py', 'b.txt'])
         file_list.include_pattern('*')
-        assert file_list.allfiles == ['a.py', 'b.txt']
+        assert file_list.files == ['a.py', 'b.txt']
 
-    def test_process_template(self):
-        l = make_local_path
+    def test_process_template_line_invalid(self):
         # invalid lines
         file_list = FileList()
         for action in ('include', 'exclude', 'global-include',
@@ -377,9 +403,11 @@ def test_process_template(self):
             else:
                 assert False, "Should have thrown an error"
 
+    def test_include(self):
+        l = make_local_path
         # include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
+        self.make_files(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('include *.py')
         assert file_list.files == ['a.py']
@@ -389,6 +417,8 @@ def test_process_template(self):
         assert file_list.files == ['a.py']
         self.assertWarnings()
 
+    def test_exclude(self):
+        l = make_local_path
         # exclude
         file_list = FileList()
         file_list.files = ['a.py', 'b.txt', l('d/c.py')]
@@ -401,9 +431,11 @@ def test_process_template(self):
         assert file_list.files == ['b.txt', l('d/c.py')]
         self.assertWarnings()
 
+    def test_global_include(self):
+        l = make_local_path
         # global-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', 'b.txt', l('d/c.py')])
+        self.make_files(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
         assert file_list.files == ['a.py', l('d/c.py')]
@@ -413,6 +445,8 @@ def test_process_template(self):
         assert file_list.files == ['a.py', l('d/c.py')]
         self.assertWarnings()
 
+    def test_global_exclude(self):
+        l = make_local_path
         # global-exclude
         file_list = FileList()
         file_list.files = ['a.py', 'b.txt', l('d/c.py')]
@@ -425,10 +459,11 @@ def test_process_template(self):
         assert file_list.files == ['b.txt']
         self.assertWarnings()
 
+    def test_recursive_include(self):
+        l = make_local_path
         # recursive-include
         file_list = FileList()
-        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/c.txt'),
-                                l('d/d/e.py')])
+        self.make_files(['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
@@ -438,6 +473,8 @@ def test_process_template(self):
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertWarnings()
 
+    def test_recursive_exclude(self):
+        l = make_local_path
         # recursive-exclude
         file_list = FileList()
         file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
@@ -450,10 +487,11 @@ def test_process_template(self):
         assert file_list.files == ['a.py', l('d/c.txt')]
         self.assertWarnings()
 
+    def test_graft(self):
+        l = make_local_path
         # graft
         file_list = FileList()
-        file_list.set_allfiles(['a.py', l('d/b.py'), l('d/d/e.py'),
-                                l('f/f.py')])
+        self.make_files(['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')])
 
         file_list.process_template_line('graft d')
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
@@ -463,6 +501,8 @@ def test_process_template(self):
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertWarnings()
 
+    def test_prune(self):
+        l = make_local_path
         # prune
         file_list = FileList()
         file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]

From 96171b18a802fbc566b328000d5b22c8f5ce40e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 20:35:56 -0400
Subject: [PATCH 6239/8469] Just use backports.unittest_mock so that tox can be
 invoked naturally (without having to specify an env).

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 770fbd8608..3ed74117c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ deps=
 	pytest-flake8
 	pytest>=3.0.2
 	setuptools[ssl]
-	py{26,27,32}: mock
+	backports.unittest_mock
 
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
 commands=python -m pytest -rsx

From eb4646dd4fa237916330384f1deec6596df37102 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 20:49:59 -0400
Subject: [PATCH 6240/8469] Simply invoke tox for Python 2.6 compatibility

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 76fd04b994..0da450da76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,8 @@ script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
- - python -m tox
+ #- python -m tox
+ - tox
 
 before_deploy:
   - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1

From f42292cbc6d9448ab4f0e27f7b6f90ed8f1ea8a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 22:14:29 -0400
Subject: [PATCH 6241/8469] Use backports.unittest_mock 1.2 for Python 3.2 and
 2.6 compatibility.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 3ed74117c0..6305ed2eb6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ deps=
 	pytest-flake8
 	pytest>=3.0.2
 	setuptools[ssl]
-	backports.unittest_mock
+	backports.unittest_mock>=1.2
 
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
 commands=python -m pytest -rsx

From d644c2076cff008da8a36afbf3a6a0b24c766956 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 22:19:58 -0400
Subject: [PATCH 6242/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5521c72fc1..d69f556319 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v28.5.0
+-------
+
+* #810: Tests are now invoked with tox and not setup.py test.
+
 v28.4.0
 -------
 

From 07abd732f9a9d40da8ae59a3dfd213bea4f39aff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 22:24:55 -0400
Subject: [PATCH 6243/8469] Install and invoke tox in appveyor

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index ebf446bf18..299c35b7c2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,4 +14,5 @@ build: off
 
 test_script:
   - "python bootstrap.py"
-  - "python setup.py test --addopts='-rsx'"
+  - "python -m pip install tox"
+  - "tox"

From 3e3d83ad49e7f45cc8d2f343590f774c41069b74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 22:32:26 -0400
Subject: [PATCH 6244/8469] Update changelog. Fixes #249. Fixes #450

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d69f556319..3482b760d0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,8 @@ v28.5.0
 -------
 
 * #810: Tests are now invoked with tox and not setup.py test.
+* #249 and #450 via #764: Avoid scanning the whole tree
+  when building the manifest.
 
 v28.4.0
 -------

From 15d10c3655c441beb50fef522b4959fbab4fc3d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 22:43:35 -0400
Subject: [PATCH 6245/8469] Now running under tox, Python 2.6 gets a non-zero
 PYTHONHASHSEED, so tests are simpler.

---
 setuptools/tests/test_egg_info.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index dff2a8c8ec..240385a25c 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -94,10 +94,6 @@ def _validate_content_order(content, expected):
         Assert that the strings in expected appear in content
         in order.
         """
-        if sys.version_info < (2, 7):
-            # On Python 2.6, expect dict key order.
-            expected = dict.fromkeys(expected).keys()
-
         pattern = '.*'.join(expected)
         flags = re.MULTILINE | re.DOTALL
         assert re.search(pattern, content, flags)

From 6ef8ff56dfdba9a51ce55b9a6cd8ff922d786ac1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 23:03:21 -0400
Subject: [PATCH 6246/8469] Allow passing posargs

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6305ed2eb6..7e2c804992 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,4 +6,4 @@ deps=
 	backports.unittest_mock>=1.2
 
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
-commands=python -m pytest -rsx
+commands=python -m pytest {posargs:-rsx}

From c52797512e98c12a383c41697deda0f563b452a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 23:10:15 -0400
Subject: [PATCH 6247/8469] Just skip these tests on Python 2.6.

---
 setuptools/tests/test_egg_info.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 240385a25c..4c76782639 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -63,12 +63,18 @@ def env(self):
             })
             yield env
 
+    dict_order_fails = pytest.mark.skipif(
+        sys.version_info < (2,7),
+        reason="Intermittent failures on Python 2.6",
+    )
+
+    @dict_order_fails
     def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         """
         When the egg_info section is empty or not present, running
         save_version_info should add the settings to the setup.cfg
         in a deterministic order, consistent with the ordering found
-        on Python 2.6 and 2.7 with PYTHONHASHSEED=0.
+        on Python 2.7 with PYTHONHASHSEED=0.
         """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
         dist = Distribution()
@@ -98,13 +104,12 @@ def _validate_content_order(content, expected):
         flags = re.MULTILINE | re.DOTALL
         assert re.search(pattern, content, flags)
 
+    @dict_order_fails
     def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         """
         When running save_version_info on an existing setup.cfg
         with the 'default' values present from a previous run,
-        the file should remain unchanged, except on Python 2.6,
-        where the order of the keys will be changed to match the
-        order as found in a dictionary of those keys.
+        the file should remain unchanged.
         """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
         build_files({

From 5af3d094d1d26f06d9e7f3fbf6f1cd55a2e51d8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Oct 2016 23:12:21 -0400
Subject: [PATCH 6248/8469] =?UTF-8?q?Bump=20version:=2028.4.0=20=E2=86=92?=
 =?UTF-8?q?=2028.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 95879c2135..c2b34b33b3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.4.0
+current_version = 28.5.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 2948e5152f..3ae7a09f3c 100755
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.4.0",
+    version="28.5.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 736017394379b33b7526de38a9a5bbad57fce8e6 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Sat, 15 Oct 2016 23:32:09 +0200
Subject: [PATCH 6249/8469] Add 3.6-dev and nightly to travis configuration

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0da450da76..f39673fda1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,14 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - "3.6-dev"
+  - nightly
   - pypy
-  - pypy3
+matrix:
+  fast_finish: true
+  allow_failures:
+    - python: "3.6-dev"
+    - python: nightly
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From 1d9870bf54159a0d2b0a70505c740e8e43a7ae6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Oct 2016 19:00:50 -0400
Subject: [PATCH 6250/8469] Restore pypy3 tests. Ref #815.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f39673fda1..e5e5e6f213 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
   - "3.6-dev"
   - nightly
   - pypy
+  - pypy3
 matrix:
   fast_finish: true
   allow_failures:

From 48317edf59bc1e1067df6d2a22898a083d4f226a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Oct 2016 19:06:00 -0400
Subject: [PATCH 6251/8469] No need to allow failures, as there are no known
 failures.

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5e5e6f213..006316d16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,6 @@ python:
   - nightly
   - pypy
   - pypy3
-matrix:
-  fast_finish: true
-  allow_failures:
-    - python: "3.6-dev"
-    - python: nightly
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From 772773cd3b61f9773f571a63cd8a73dd8f9049f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Oct 2016 12:35:48 -0400
Subject: [PATCH 6252/8469] Update changelog

---
 CHANGES.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3482b760d0..bcb507980d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+v28.6.0
+-------
+
+* #629: When scanning for packages, ``pkg_resources`` now
+  ignores empty egg-info directories and gives precedence to
+  packages whose versions are lexicographically greatest,
+  a rough approximation for preferring the latest available
+  version.
+
 v28.5.0
 -------
 

From 9b92671faddc36f754ec2f67bd25f9e8ae66311b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Oct 2016 12:35:57 -0400
Subject: [PATCH 6253/8469] =?UTF-8?q?Bump=20version:=2028.5.0=20=E2=86=92?=
 =?UTF-8?q?=2028.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c2b34b33b3..1cafb9ae7f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.5.0
+current_version = 28.6.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 3ae7a09f3c..eb8df62a41 100755
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.5.0",
+    version="28.6.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From d7523602f9fd7d81b19a6526221875fcb5a258eb Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Tue, 18 Oct 2016 09:51:58 +1100
Subject: [PATCH 6254/8469] Sort manifest file list in tests

Different OS's and file systems return lists of files in different
orders, not always creation order. This caused intermittent test
failures.

The file list is now sorted prior to being checked to ensure a
consistent order across all systems.

Fixes #816
---
 setuptools/tests/test_manifest.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 558de2c775..8bcf4f5cbc 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -351,8 +351,8 @@ def test_process_template_line(self):
             l('global/one.txt'),
             l('global/two.txt'),
         ]
-        file_list.sort()
 
+        file_list.sort()
         assert file_list.files == wanted
 
     def test_exclude_pattern(self):
@@ -369,6 +369,7 @@ def test_exclude_pattern(self):
         file_list = FileList()
         file_list.files = ['a.py', 'a.txt']
         file_list.exclude_pattern('*.py')
+        file_list.sort()
         assert file_list.files == ['a.txt']
 
     def test_include_pattern(self):
@@ -386,6 +387,7 @@ def test_include_pattern(self):
         file_list = FileList()
         self.make_files(['a.py', 'b.txt'])
         file_list.include_pattern('*')
+        file_list.sort()
         assert file_list.files == ['a.py', 'b.txt']
 
     def test_process_template_line_invalid(self):
@@ -410,10 +412,12 @@ def test_include(self):
         self.make_files(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('include *.py')
+        file_list.sort()
         assert file_list.files == ['a.py']
         self.assertNoWarnings()
 
         file_list.process_template_line('include *.rb')
+        file_list.sort()
         assert file_list.files == ['a.py']
         self.assertWarnings()
 
@@ -424,10 +428,12 @@ def test_exclude(self):
         file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('exclude *.py')
+        file_list.sort()
         assert file_list.files == ['b.txt', l('d/c.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('exclude *.rb')
+        file_list.sort()
         assert file_list.files == ['b.txt', l('d/c.py')]
         self.assertWarnings()
 
@@ -438,10 +444,12 @@ def test_global_include(self):
         self.make_files(['a.py', 'b.txt', l('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
+        file_list.sort()
         assert file_list.files == ['a.py', l('d/c.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('global-include *.rb')
+        file_list.sort()
         assert file_list.files == ['a.py', l('d/c.py')]
         self.assertWarnings()
 
@@ -452,10 +460,12 @@ def test_global_exclude(self):
         file_list.files = ['a.py', 'b.txt', l('d/c.py')]
 
         file_list.process_template_line('global-exclude *.py')
+        file_list.sort()
         assert file_list.files == ['b.txt']
         self.assertNoWarnings()
 
         file_list.process_template_line('global-exclude *.rb')
+        file_list.sort()
         assert file_list.files == ['b.txt']
         self.assertWarnings()
 
@@ -466,10 +476,12 @@ def test_recursive_include(self):
         self.make_files(['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
+        file_list.sort()
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-include e *.py')
+        file_list.sort()
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertWarnings()
 
@@ -480,10 +492,12 @@ def test_recursive_exclude(self):
         file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
 
         file_list.process_template_line('recursive-exclude d *.py')
+        file_list.sort()
         assert file_list.files == ['a.py', l('d/c.txt')]
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-exclude e *.py')
+        file_list.sort()
         assert file_list.files == ['a.py', l('d/c.txt')]
         self.assertWarnings()
 
@@ -494,10 +508,12 @@ def test_graft(self):
         self.make_files(['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')])
 
         file_list.process_template_line('graft d')
+        file_list.sort()
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('graft e')
+        file_list.sort()
         assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
         self.assertWarnings()
 
@@ -508,9 +524,11 @@ def test_prune(self):
         file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
 
         file_list.process_template_line('prune d')
+        file_list.sort()
         assert file_list.files == ['a.py', l('f/f.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('prune e')
+        file_list.sort()
         assert file_list.files == ['a.py', l('f/f.py')]
         self.assertWarnings()

From 31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Tue, 18 Oct 2016 20:24:35 +0700
Subject: [PATCH 6255/8469] Fix quantity of blank lines.

---
 bootstrap.py                              |  1 -
 docs/conf.py                              |  2 --
 pkg_resources/__init__.py                 |  9 ++-------
 pkg_resources/tests/test_pkg_resources.py |  5 +----
 pkg_resources/tests/test_resources.py     |  7 ++-----
 setup.py                                  |  7 -------
 setuptools/__init__.py                    |  1 -
 setuptools/archive_util.py                |  1 -
 setuptools/command/__init__.py            |  1 -
 setuptools/command/bdist_egg.py           |  2 +-
 setuptools/command/bdist_wininst.py       |  1 -
 setuptools/command/build_ext.py           |  2 --
 setuptools/command/easy_install.py        |  7 +++----
 setuptools/command/sdist.py               |  2 ++
 setuptools/command/setopt.py              |  1 -
 setuptools/command/test.py                |  2 --
 setuptools/extension.py                   |  1 -
 setuptools/extern/__init__.py             |  1 -
 setuptools/glob.py                        | 11 +++++++++++
 setuptools/lib2to3_ex.py                  |  2 --
 setuptools/monkey.py                      |  1 -
 setuptools/msvc.py                        |  3 +++
 setuptools/package_index.py               |  7 +++++--
 setuptools/py26compat.py                  |  2 +-
 setuptools/py27compat.py                  |  1 +
 setuptools/py31compat.py                  |  1 +
 setuptools/sandbox.py                     |  6 ++++++
 setuptools/ssl_support.py                 |  5 +++--
 setuptools/tests/__init__.py              |  4 ----
 setuptools/tests/server.py                |  1 -
 setuptools/tests/test_bdist_egg.py        |  2 --
 setuptools/tests/test_build_ext.py        |  1 -
 setuptools/tests/test_develop.py          |  1 -
 setuptools/tests/test_easy_install.py     |  8 --------
 setuptools/tests/test_egg_info.py         |  1 -
 setuptools/tests/test_find_packages.py    |  1 -
 setuptools/tests/test_integration.py      |  1 +
 setuptools/tests/test_manifest.py         |  4 ----
 setuptools/tests/test_packageindex.py     |  3 ---
 setuptools/tests/test_sandbox.py          |  6 ++++--
 setuptools/tests/test_sdist.py            |  5 -----
 setuptools/tests/test_test.py             |  1 -
 setuptools/tests/test_upload_docs.py      |  2 --
 setuptools/tests/test_windows_wrappers.py |  2 --
 tests/manual_test.py                      |  1 +
 45 files changed, 48 insertions(+), 88 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index bf7fb431e8..c5f470a4fa 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -10,7 +10,6 @@
 import textwrap
 import subprocess
 
-
 minimal_egg_info = textwrap.dedent("""
     [distutils.commands]
     egg_info = setuptools.command.egg_info:egg_info
diff --git a/docs/conf.py b/docs/conf.py
index dc0d8faec7..fae8e63255 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,7 +60,6 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
@@ -93,7 +92,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Setuptoolsdoc'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 33b3f56c9d..12226d4bd1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1,5 +1,4 @@
 # coding: utf-8
-
 """
 Package resource API
 --------------------
@@ -74,7 +73,6 @@
 __import__('pkg_resources.extern.packaging.requirements')
 __import__('pkg_resources.extern.packaging.markers')
 
-
 if (3, 0) < sys.version_info < (3, 3):
     msg = (
         "Support for Python 3.0-3.2 has been dropped. Future versions "
@@ -96,7 +94,6 @@ class PEP440Warning(RuntimeWarning):
 
 
 class _SetuptoolsVersionMixin(object):
-
     def __hash__(self):
         return super(_SetuptoolsVersionMixin, self).__hash__()
 
@@ -578,7 +575,6 @@ def get_entry_info(dist, group, name):
 
 
 class IMetadataProvider:
-
     def has_metadata(name):
         """Does the package's distribution contain the named metadata?"""
 
@@ -2738,7 +2734,6 @@ def extras(self):
 
 
 class EggInfoDistribution(Distribution):
-
     def _reload_version(self):
         """
         Packages installed by distutils (e.g. numpy or scipy),
@@ -2825,7 +2820,6 @@ def issue_warning(*args, **kw):
 
 
 class RequirementParseError(ValueError):
-
     def __str__(self):
         return ' '.join(self.args)
 
@@ -2850,7 +2844,6 @@ def parse_requirements(strs):
 
 
 class Requirement(packaging.requirements.Requirement):
-
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         try:
@@ -2906,8 +2899,10 @@ def parse(s):
 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__
 
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 361fe65767..49bf7a04b8 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -18,7 +18,6 @@
 
 import pkg_resources
 
-
 try:
     unicode
 except NameError:
@@ -37,7 +36,6 @@ def timestamp(dt):
 
 
 class EggRemover(unicode):
-
     def __call__(self):
         if self in sys.path:
             sys.path.remove(self)
@@ -100,7 +98,6 @@ def test_resource_filename_rewrites_on_change(self):
 
 
 class TestResourceManager(object):
-
     def test_get_cache_path(self):
         mgr = pkg_resources.ResourceManager()
         path = mgr.get_cache_path('foo')
@@ -130,13 +127,13 @@ def test_setuptools_not_imported(self):
 
 
 class TestDeepVersionLookupDistutils(object):
-
     @pytest.fixture
     def env(self, tmpdir):
         """
         Create a package environment, similar to a virtualenv,
         in which packages are installed.
         """
+
         class Environment(str):
             pass
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 3b13884b94..00ca74262a 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -36,7 +36,6 @@ def get_metadata_lines(self, name):
 
 
 class TestDistro:
-
     def testCollection(self):
         # empty path should produce no distributions
         ad = pkg_resources.Environment([], platform=None, python=None)
@@ -313,7 +312,6 @@ def testDistroDependsOptions(self):
 
 
 class TestWorkingSet:
-
     def test_find_conflicting(self):
         ws = WorkingSet([])
         Foo = Distribution.from_filename("/foo_dir/Foo-1.2.egg")
@@ -356,7 +354,6 @@ def test_resolve_conflicts_with_prior(self):
 
 
 class TestEntryPoints:
-
     def assertfields(self, ep):
         assert ep.name == "foo"
         assert ep.module_name == "pkg_resources.tests.test_resources"
@@ -457,7 +454,6 @@ def testParseMap(self):
 
 
 class TestRequirements:
-
     def testBasics(self):
         r = Requirement.parse("Twisted>=1.2")
         assert str(r) == "Twisted>=1.2"
@@ -538,7 +534,6 @@ def testSetuptoolsProjectName(self):
 
 
 class TestParsing:
-
     def testEmptyParse(self):
         assert list(parse_requirements('')) == []
 
@@ -701,6 +696,7 @@ def testVersionBuildout(self):
         value of parse_version. The new parse_version returns a Version class
         which needs to support this behavior, at least for now.
         """
+
         def buildout(parsed_version):
             _final_parts = '*final-', '*final'
 
@@ -709,6 +705,7 @@ def _final_version(parsed_version):
                     if (part[:1] == '*') and (part not in _final_parts):
                         return False
                 return True
+
             return _final_version(parsed_version)
 
         assert buildout(parse_version("1.0"))
diff --git a/setup.py b/setup.py
index eb8df62a41..6cb140977b 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,6 @@
 
 import setuptools
 
-
 here = os.path.dirname(__file__)
 
 
@@ -97,11 +96,8 @@ def pypi_link(pkg_filename):
     src_root=None,
     packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
-
     py_modules=['easy_install'],
-
     zip_safe=True,
-
     entry_points={
         "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
@@ -141,12 +137,9 @@ def pypi_link(pkg_filename):
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
         "console_scripts": list(_gen_console_scripts()),
-
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
-
-
     classifiers=textwrap.dedent("""
         Development Status :: 5 - Production/Stable
         Intended Audience :: Developers
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index baec38849e..54577ceded 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -102,7 +102,6 @@ def _build_filter(*patterns):
 
 
 class PEP420PackageFinder(PackageFinder):
-
     @staticmethod
     def _looks_like_package(path):
         return True
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index b6411cc548..cc82b3da36 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -10,7 +10,6 @@
 
 from pkg_resources import ensure_directory, ContextualZipFile
 
-
 __all__ = [
     "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
     "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 3fb2f6dfcb..efbe9411c1 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -10,7 +10,6 @@
 
 from setuptools.command import install_scripts
 
-
 if 'egg' not in bdist.format_commands:
     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
     bdist.format_commands.append('egg')
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index cbea7537e2..8cd9dfefe2 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -429,10 +429,10 @@ def can_scan():
     log.warn("Please ask the author to include a 'zip_safe'"
              " setting (either True or False) in the package's setup.py")
 
+
 # Attribute names of options for commands that might need to be convinced to
 # install to the egg build directory
 
-
 INSTALL_DIRECTORY_ATTRS = [
     'install_lib', 'install_dir', 'install_data', 'install_base'
 ]
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 8243c917ee..073de97b46 100755
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -2,7 +2,6 @@
 
 
 class bdist_wininst(orig.bdist_wininst):
-
     def reinitialize_command(self, command, reinit_subcommands=0):
         """
         Supplement reinitialize_command to work around
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 454c91fbf0..12dc88cdbf 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -56,7 +56,6 @@ def _customize_compiler_for_shlib(compiler):
     except ImportError:
         pass
 
-
 if_dl = lambda s: s if have_rtld else ''
 
 
@@ -70,7 +69,6 @@ def get_abi3_suffix():
 
 
 class build_ext(_build_ext):
-
     def run(self):
         """Build extensions in build directory, then copy if --inplace"""
         old_inplace, self.inplace = self.inplace, 0
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a3792ce223..03dd6768d5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 """
 Easy Install
 ------------
@@ -64,7 +63,6 @@
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
-
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
     'main', 'get_exe_prefixes',
@@ -92,6 +90,7 @@ def samefile(p1, p2):
 
 
 if six.PY2:
+
     def _to_ascii(s):
         return s
 
@@ -102,6 +101,7 @@ def isascii(s):
         except UnicodeError:
             return False
 else:
+
     def _to_ascii(s):
         return s.encode('ascii')
 
@@ -1632,7 +1632,6 @@ def make_relative(self, path):
 
 
 class RewritePthDistributions(PthDistributions):
-
     @classmethod
     def _wrap_lines(cls, lines):
         yield cls.prelude
@@ -1837,6 +1836,7 @@ def clear_and_remove_cached_zip_archive_directory_data(path, old_entry):
     _replace_zip_directory_cache_data = \
         _remove_and_clear_zip_directory_cache_data
 else:
+
     def _replace_zip_directory_cache_data(normalized_path):
         def replace_cached_zip_archive_directory_data(path, old_entry):
             # N.B. In theory, we could load the zip directory information just
@@ -2164,7 +2164,6 @@ def _use_header(new_header):
 
 
 class WindowsExecutableLauncherWriter(WindowsScriptWriter):
-
     @classmethod
     def _get_script_args(cls, type_, name, header, script_text):
         """
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index b85d7d03ee..9975753d9f 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -89,8 +89,10 @@ def _remove_os_link():
         """
         In a context, remove and restore os.link if it exists
         """
+
         class NoValue:
             pass
+
         orig_val = getattr(os, 'link', NoValue)
         try:
             del os.link
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 7f332be5a4..7e57cc0262 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -8,7 +8,6 @@
 
 from setuptools import Command
 
-
 __all__ = ['config_file', 'edit_config', 'option_base', 'setopt']
 
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 38bbcd8bc8..270674e21e 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -17,7 +17,6 @@
 
 
 class ScanningLoader(TestLoader):
-
     def loadTestsFromModule(self, module, pattern=None):
         """Return a suite of all tests cases contained in the given module
 
@@ -50,7 +49,6 @@ def loadTestsFromModule(self, module, pattern=None):
 
 # adapted from jaraco.classes.properties:NonDataProperty
 class NonDataProperty(object):
-
     def __init__(self, fget):
         self.fget = fget
 
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 03068d35bb..29468894f8 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -26,7 +26,6 @@ def _have_cython():
 # for compatibility
 have_pyrex = _have_cython
 
-
 _Extension = get_unpatched(distutils.core.Extension)
 
 
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 6859aa5b5c..2cd08b7ed9 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,5 +1,4 @@
 from pkg_resources.extern import VendorImporter
 
-
 names = 'six',
 VendorImporter(__name__, names, 'pkg_resources._vendor').install()
diff --git a/setuptools/glob.py b/setuptools/glob.py
index f51b9c8363..6c781de349 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -14,6 +14,7 @@
 
 __all__ = ["glob", "iglob", "escape"]
 
+
 def glob(pathname, recursive=False):
     """Return a list of paths matching a pathname pattern.
 
@@ -27,6 +28,7 @@ def glob(pathname, recursive=False):
     """
     return list(iglob(pathname, recursive=recursive))
 
+
 def iglob(pathname, recursive=False):
     """Return an iterator which yields the paths matching a pathname pattern.
 
@@ -44,6 +46,7 @@ def iglob(pathname, recursive=False):
         assert not s
     return it
 
+
 def _iglob(pathname, recursive):
     dirname, basename = os.path.split(pathname)
     if not has_magic(pathname):
@@ -81,10 +84,12 @@ def _iglob(pathname, recursive):
         for name in glob_in_dir(dirname, basename):
             yield os.path.join(dirname, name)
 
+
 # These 2 helper functions non-recursively glob inside a literal directory.
 # They return a list of basenames. `glob1` accepts a pattern while `glob0`
 # takes a literal basename (so it only has to check for its existence).
 
+
 def glob1(dirname, pattern):
     if not dirname:
         if isinstance(pattern, binary_type):
@@ -97,6 +102,7 @@ def glob1(dirname, pattern):
         return []
     return fnmatch.filter(names, pattern)
 
+
 def glob0(dirname, basename):
     if not basename:
         # `os.path.split()` returns an empty basename for paths ending with a
@@ -108,9 +114,11 @@ def glob0(dirname, basename):
             return [basename]
     return []
 
+
 # This helper function recursively yields relative pathnames inside a literal
 # directory.
 
+
 def glob2(dirname, pattern):
     assert _isrecursive(pattern)
     yield pattern[:0]
@@ -139,6 +147,7 @@ def _rlistdir(dirname):
 magic_check = re.compile('([*?[])')
 magic_check_bytes = re.compile(b'([*?[])')
 
+
 def has_magic(s):
     if isinstance(s, binary_type):
         match = magic_check_bytes.search(s)
@@ -146,12 +155,14 @@ def has_magic(s):
         match = magic_check.search(s)
     return match is not None
 
+
 def _isrecursive(pattern):
     if isinstance(pattern, binary_type):
         return pattern == b'**'
     else:
         return pattern == '**'
 
+
 def escape(pathname):
     """Escape all special characters.
     """
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index c8632bc5f6..4b1a73feb2 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -15,7 +15,6 @@
 
 
 class DistutilsRefactoringTool(RefactoringTool):
-
     def log_error(self, msg, *args, **kw):
         log.error(msg, *args)
 
@@ -27,7 +26,6 @@ def log_debug(self, msg, *args):
 
 
 class Mixin2to3(_Mixin2to3):
-
     def run_2to3(self, files, doctests=False):
         # See of the distribution option has been set, otherwise check the
         # setuptools default.
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 43b97b4d95..aabc280f6b 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -13,7 +13,6 @@
 
 import setuptools
 
-
 __all__ = []
 """
 Everything is private. Contact the project team
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index e9665e10cb..ef85f64a48 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -34,11 +34,13 @@
     Mock winreg and environ so the module can be imported
     on this platform.
     """
+
     class winreg:
         HKEY_USERS = None
         HKEY_CURRENT_USER = None
         HKEY_LOCAL_MACHINE = None
         HKEY_CLASSES_ROOT = None
+
     safe_env = dict()
 
 try:
@@ -458,6 +460,7 @@ class SystemInfo:
     vc_ver: float
         Required Microsoft Visual C++ version.
     """
+
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
     WinDir = safe_env.get('WinDir', '')
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3e8d6818f7..3bb97154c1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -47,7 +47,6 @@
 
 _SOCKET_TIMEOUT = 15
 
-
 _tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
 user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
 
@@ -198,9 +197,11 @@ def unique_values(func):
     Wrap a function returning an iterable such that the resulting iterable
     only ever yields unique items.
     """
+
     @wraps(func)
     def wrapper(*args, **kwargs):
         return unique_everseen(func(*args, **kwargs))
+
     return wrapper
 
 
@@ -415,6 +416,7 @@ def scan_egg_link(self, path, entry):
 
     def process_index(self, url, page):
         """Process the contents of a PyPI page"""
+
         def scan(link):
             # Process a URL to see if it's for a package page
             if link.startswith(self.index_url):
@@ -946,7 +948,9 @@ def _socket_timeout(*args, **kwargs):
                 return func(*args, **kwargs)
             finally:
                 socket.setdefaulttimeout(old_timeout)
+
         return _socket_timeout
+
     return _socket_timeout
 
 
@@ -991,7 +995,6 @@ def __str__(self):
 
 
 class PyPIConfig(configparser.RawConfigParser):
-
     def __init__(self):
         """
         Load from ~/.pypirc
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 5778cdf1ba..4d3add8ca8 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -23,9 +23,9 @@ def strip_fragment(url):
 if sys.version_info >= (2, 7):
     strip_fragment = lambda x: x
 
-
 try:
     from importlib import import_module
 except ImportError:
+
     def import_module(module_name):
         return __import__(module_name, fromlist=['__name__'])
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 57eb150b47..4e3e4ab34f 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -13,5 +13,6 @@ def get_all_headers(message, key):
 
 
 if sys.version_info < (3,):
+
     def get_all_headers(message, key):
         return message.getheaders(key)
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 1e959e281f..44b025d4b2 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -14,6 +14,7 @@ def get_path(name):
             raise ValueError("Name must be purelib or platlib")
         return get_python_lib(name == 'platlib')
 
+
 try:
     # Python >=3.2
     from tempfile import TemporaryDirectory
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 2babb63654..53ce155131 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -99,6 +99,7 @@ class UnpickleableException(Exception):
     """
     An exception representing another Exception that could not be pickled.
     """
+
     @staticmethod
     def dump(type, exc):
         """
@@ -243,6 +244,7 @@ def run_setup(setup_script, args):
             def runner():
                 ns = dict(__file__=setup_script, __name__='__main__')
                 _execfile(setup_script, ns)
+
             DirectorySandbox(setup_dir).run(runner)
         except SystemExit as v:
             if v.args and v.args[0]:
@@ -301,6 +303,7 @@ def wrap(self, path, *args, **kw):
             if self._active:
                 path = self._remap_input(name, path, *args, **kw)
             return original(path, *args, **kw)
+
         return wrap
 
     if _file:
@@ -322,6 +325,7 @@ def wrap(self, path, *args, **kw):
                 path = self._remap_input(name, path, *args, **kw)
                 return self._remap_output(name, original(path, *args, **kw))
             return original(path, *args, **kw)
+
         return wrap
 
     for name in ['readlink', 'tempnam']:
@@ -336,6 +340,7 @@ def wrap(self, *args, **kw):
             if self._active:
                 return self._remap_output(name, retval)
             return retval
+
         return wrap
 
     for name in ['getcwd', 'tmpnam']:
@@ -404,6 +409,7 @@ def _violation(self, operation, *args, **kw):
         raise SandboxViolation(operation, args, kw)
 
     if _file:
+
         def _file(self, path, mode='r', *args, **kw):
             if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
                 self._violation("file", path, mode, *args, **kw)
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 1627263027..82f8870ab8 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -29,7 +29,6 @@
 /etc/ssl/ca-bundle.pem
 """.strip().split()
 
-
 try:
     HTTPSHandler = urllib.request.HTTPSHandler
     HTTPSConnection = http_client.HTTPSConnection
@@ -50,10 +49,13 @@
         match_hostname = None
 
 if not CertificateError:
+
     class CertificateError(ValueError):
         pass
 
+
 if not match_hostname:
+
     def _dnsname_match(dn, hostname, max_wildcards=1):
         """Matching according to RFC 6125, section 6.4.3
 
@@ -216,7 +218,6 @@ def get_win_certfile():
         return None
 
     class MyCertFile(CertFile):
-
         def __init__(self, stores=(), certs=()):
             CertFile.__init__(self)
             for store in stores:
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 53bd836cad..dbf1620108 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -42,7 +42,6 @@ def makeSetup(**args):
 
 
 class TestDepends:
-
     def testExtractConst(self):
         if not hasattr(dep, 'extract_constant'):
             # skip on non-bytecode platforms
@@ -123,7 +122,6 @@ def testRequire(self):
 
 
 class TestDistro:
-
     def setup_method(self, method):
         self.e1 = Extension('bar.ext', ['bar.c'])
         self.e2 = Extension('c.y', ['y.c'])
@@ -214,7 +212,6 @@ def testInvalidIncludeExclude(self):
 
 
 class TestFeatures:
-
     def setup_method(self, method):
         self.req = Require('Distutils', '1.0.3', 'distutils')
         self.dist = makeSetup(
@@ -292,7 +289,6 @@ def testFeatureWithInvalidRemove(self):
 
 
 class TestCommandTests:
-
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')
         assert (isinstance(test_cmd, distutils.cmd.Command))
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 9e5fefb76c..35312120bb 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -45,7 +45,6 @@ def base_url(self):
 
 
 class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
-
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index c77aa226ed..5aabf404fd 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -9,7 +9,6 @@
 
 from . import contexts
 
-
 SETUP_PY = """\
 from setuptools import setup
 
@@ -28,7 +27,6 @@ def setup_context(tmpdir):
 
 
 class Test:
-
     def test_bdist_egg(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index ac002f44ec..602571540f 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -10,7 +10,6 @@
 
 
 class TestBuildExt:
-
     def test_get_ext_filename(self):
         """
         Setuptools needs to give back the same
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index f1580785b5..4cf483f281 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -13,7 +13,6 @@
 from setuptools.dist import Distribution
 from . import contexts
 
-
 SETUP_PY = """\
 from setuptools import setup
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 82e1d7e8b8..209e6b78ff 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 """Easy install Tests
 """
 from __future__ import absolute_import
@@ -42,7 +41,6 @@
 
 
 class FakeDist(object):
-
     def get_entry_map(self, group):
         if group != 'console_scripts':
             return {}
@@ -60,7 +58,6 @@ def as_requirement(self):
 
 
 class TestEasyInstallTest:
-
     def test_install_site_py(self, tmpdir):
         dist = Distribution()
         cmd = ei.easy_install(dist)
@@ -194,7 +191,6 @@ def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
 
 
 class TestPTHFileWriter:
-
     def test_add_from_cwd_site_sets_dirty(self):
         '''a pth file manager should set dirty
         if a distribution is in site but also the cwd
@@ -328,13 +324,11 @@ def distutils_package():
 
 
 class TestDistutilsPackage:
-
     def test_bdist_egg_available_on_distutils_pkg(self, distutils_package):
         run_setup('setup.py', ['bdist_egg'])
 
 
 class TestSetupRequires:
-
     def test_setup_requires_honors_fetch_params(self):
         """
         When easy_install installs a source distribution which specifies
@@ -623,7 +617,6 @@ def test_get_script_header_exe_with_spaces(self):
 
 
 class TestCommandSpec:
-
     def test_custom_launch_command(self):
         """
         Show how a custom CommandSpec could be used to specify a #! executable
@@ -659,7 +652,6 @@ def test_from_simple_string_uses_shlex(self):
 
 
 class TestWindowsScriptWriter:
-
     def test_header(self):
         hdr = ei.WindowsScriptWriter.get_script_header('')
         assert hdr.startswith('#!')
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4c76782639..12c104972e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -262,7 +262,6 @@ def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
 
     def _find_egg_info_files(self, root):
         class DirList(list):
-
             def __init__(self, files, base):
                 super(DirList, self).__init__(files)
                 self.base = base
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 6dc1b3ac72..a6023de9d5 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -38,7 +38,6 @@ def has_symlink():
 
 
 class TestFindPackages:
-
     def setup_method(self, method):
         self.dist_dir = tempfile.mkdtemp()
         self._make_pkg_structure()
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 04772ba5eb..78fb0627b0 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -49,6 +49,7 @@ def fin():
         user_base.remove()
         user_site.remove()
         install_dir.remove()
+
     request.addfinalizer(fin)
 
     # Change the environment and site settings to control where the
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 8bcf4f5cbc..602c43a274 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -30,7 +30,6 @@ def make_local_path(s):
     'packages': ['app'],
 }
 
-
 SETUP_PY = """\
 from setuptools import setup
 
@@ -95,7 +94,6 @@ def test_translated_pattern_test():
 
 
 class TempDirTestCase(object):
-
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
         self.old_cwd = os.getcwd()
@@ -107,14 +105,12 @@ def teardown_method(self, method):
 
 
 class TestManifestTest(TempDirTestCase):
-
     def setup_method(self, method):
         super(TestManifestTest, self).setup_method(method)
 
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
         f.write(SETUP_PY)
         f.close()
-
         """
         Create a file tree like:
         - LICENSE
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index f9bf895b5e..f09dd78c31 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -14,7 +14,6 @@
 
 
 class TestPackageIndex:
-
     def test_regex(self):
         hash_url = 'http://other_url?:action=show_md5&amp;'
         hash_url += 'digest=0123456789abcdef0123456789abcdef'
@@ -184,7 +183,6 @@ def test_local_index(self, tmpdir):
 
 
 class TestContentCheckers:
-
     def test_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(
             'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478')
@@ -219,7 +217,6 @@ def test_report(self):
 
 
 class TestPyPIConfig:
-
     def test_percent_in_password(self, tmpdir, monkeypatch):
         monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
         pypirc = tmpdir / '.pypirc'
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index aa6138e49b..b92a477a2f 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -11,7 +11,6 @@
 
 
 class TestSandbox:
-
     def test_devnull(self, tmpdir):
         sandbox = DirectorySandbox(str(tmpdir))
         sandbox.run(self._file_writer(os.devnull))
@@ -21,6 +20,7 @@ def _file_writer(path):
         def do_write():
             with open(path, 'w') as f:
                 f.write('xxx')
+
         return do_write
 
     def test_win32com(self, tmpdir):
@@ -57,7 +57,6 @@ def test_setup_py_with_CRLF(self, tmpdir):
 
 
 class TestExceptionSaver:
-
     def test_exception_trapped(self):
         with setuptools.sandbox.ExceptionSaver():
             raise ValueError("details")
@@ -107,6 +106,7 @@ def test_unpickleable_exception_when_hiding_setuptools(self):
         As revealed in #440, an infinite recursion can occur if an unpickleable
         exception while setuptools is hidden. Ensure this doesn't happen.
         """
+
         class ExceptionUnderTest(Exception):
             """
             An unpickleable exception (not in globals).
@@ -126,10 +126,12 @@ def test_sandbox_violation_raised_hiding_setuptools(self, tmpdir):
         should reflect a proper exception and not be wrapped in
         an UnpickleableException.
         """
+
         def write_file():
             "Trigger a SandboxViolation by writing outside the sandbox"
             with open('/etc/foo', 'w'):
                 pass
+
         sandbox = DirectorySandbox(str(tmpdir))
         with pytest.raises(setuptools.sandbox.SandboxViolation) as caught:
             with setuptools.sandbox.save_modules():
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 16d0eb07dc..609c7830f2 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -20,10 +20,8 @@
 from setuptools.dist import Distribution
 from setuptools.tests import fail_on_ascii
 
-
 py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
 
-
 SETUP_ATTRS = {
     'name': 'sdist_test',
     'version': '0.0',
@@ -31,14 +29,12 @@
     'package_data': {'sdist_test': ['*.txt']}
 }
 
-
 SETUP_PY = """\
 from setuptools import setup
 
 setup(**%r)
 """ % SETUP_ATTRS
 
-
 if six.PY3:
     LATIN1_FILENAME = 'smörbröd.py'.encode('latin-1')
 else:
@@ -90,7 +86,6 @@ def read_all_bytes(filename):
 
 
 class TestSdistTest:
-
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
         f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 4155a5b137..7ea43c5797 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -70,7 +70,6 @@ def sample_test(tmpdir_cwd):
 @pytest.mark.usefixtures('user_override')
 @pytest.mark.usefixtures('sample_test')
 class TestTestTest:
-
     def test_test(self):
         params = dict(
             name='foo',
diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index d3dee61664..5d50bb0b2f 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -10,7 +10,6 @@
 from .textwrap import DALS
 from . import contexts
 
-
 SETUP_PY = DALS(
     """
     from setuptools import setup
@@ -38,7 +37,6 @@ def sample_project(tmpdir_cwd):
 @pytest.mark.usefixtures('sample_project')
 @pytest.mark.usefixtures('user_override')
 class TestUploadDocsTest:
-
     def test_create_zipfile(self):
         """
         Ensure zipfile creation handles common cases, including a folder
diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 5b14d07b0e..d2871c0f40 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -23,12 +23,10 @@
 from setuptools.command.easy_install import nt_quote_arg
 import pkg_resources
 
-
 pytestmark = pytest.mark.skipif(sys.platform != 'win32', reason="Windows only")
 
 
 class WrapperTester:
-
     @classmethod
     def prep_script(cls, template):
         python_exe = nt_quote_arg(sys.executable)
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 9987e6629a..e5aaf179c6 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -25,6 +25,7 @@ def _tempdir(*args, **kwargs):
         finally:
             os.chdir(old_dir)
             shutil.rmtree(test_dir)
+
     return _tempdir
 
 

From df1bd4e17a082b9b634f62d799807a18e526a7c0 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Wed, 19 Oct 2016 00:10:40 +0700
Subject: [PATCH 6256/8469] Fix spacing after comment hash.

---
 setuptools/depends.py       |  2 +-
 setuptools/dist.py          |  4 ++--
 setuptools/package_index.py | 36 ++++++++++++++++++------------------
 setuptools/site-patch.py    |  6 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index d5a344ada7..89d39a50a1 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -145,7 +145,7 @@ def get_module_constant(module, symbol, default=-1, paths=None):
 
     try:
         if kind == PY_COMPILED:
-            f.read(8)   # skip magic & date
+            f.read(8)  # skip magic & date
             code = marshal.load(f)
         elif kind == PY_FROZEN:
             code = imp.get_frozen_object(module)
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 364f2b4d37..367c26eaca 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -412,7 +412,7 @@ def fetch_build_egg(self, req):
             )
             for key in list(opts):
                 if key not in keep:
-                    del opts[key]   # don't use any other settings
+                    del opts[key]  # don't use any other settings
             if self.dependency_links:
                 links = self.dependency_links[:]
                 if 'find_links' in opts:
@@ -650,7 +650,7 @@ def _parse_command_opts(self, parser, args):
         aliases = self.get_option_dict('aliases')
         while command in aliases:
             src, alias = aliases[command]
-            del aliases[command]    # ensure each alias can expand only once!
+            del aliases[command]  # ensure each alias can expand only once!
             import shlex
             args[:1] = shlex.split(alias, True)
             command = args[0]
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3bb97154c1..e5249b27f0 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -88,7 +88,7 @@ def egg_info_for_url(url):
     parts = urllib.parse.urlparse(url)
     scheme, server, path, parameters, query, fragment = parts
     base = urllib.parse.unquote(path.split('/')[-1])
-    if server == 'sourceforge.net' and base == 'download':    # XXX Yuck
+    if server == 'sourceforge.net' and base == 'download':  # XXX Yuck
         base = urllib.parse.unquote(path.split('/')[-2])
     if '#' in base:
         base, fragment = base.split('#', 1)
@@ -112,7 +112,7 @@ def distros_for_url(url, metadata=None):
 def distros_for_location(location, basename, metadata=None):
     """Yield egg or source distribution objects based on basename"""
     if basename.endswith('.egg.zip'):
-        basename = basename[:-4]    # strip the .zip
+        basename = basename[:-4]  # strip the .zip
     if basename.endswith('.egg') and '-' in basename:
         # only one, unambiguous interpretation
         return [Distribution.from_location(location, basename, metadata)]
@@ -334,17 +334,17 @@ def process_url(self, url, retrieve=False):
             return
 
         self.info("Reading %s", url)
-        self.fetched_urls[url] = True   # prevent multiple fetch attempts
+        self.fetched_urls[url] = True  # prevent multiple fetch attempts
         tmpl = "Download error on %s: %%s -- Some packages may not be found!"
         f = self.open_url(url, tmpl % url)
         if f is None:
             return
         self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
-            f.close()   # not html, we can't process it
+            f.close()  # not html, we can't process it
             return
 
-        base = f.url     # handle redirects
+        base = f.url  # handle redirects
         page = f.read()
         if not isinstance(page, str):  # We are in Python 3 and got bytes. We want str.
             if isinstance(f, urllib.error.HTTPError):
@@ -438,7 +438,7 @@ def scan(link):
             except ValueError:
                 pass
 
-        pkg, ver = scan(url)   # ensure this page is in the page index
+        pkg, ver = scan(url)  # ensure this page is in the page index
         if pkg:
             # process individual package page
             for new_url in find_external_links(url, page):
@@ -455,7 +455,7 @@ def scan(link):
                 lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1, 3, 2), page
             )
         else:
-            return ""   # no sense double-scanning non-package pages
+            return ""  # no sense double-scanning non-package pages
 
     def need_version_info(self, url):
         self.scan_all(
@@ -530,12 +530,12 @@ def prescan(self):
         """Scan urls scheduled for prescanning (e.g. --find-links)"""
         if self.to_scan:
             list(map(self.scan_url, self.to_scan))
-        self.to_scan = None     # from now on, go ahead and process immediately
+        self.to_scan = None  # from now on, go ahead and process immediately
 
     def not_found_in_index(self, requirement):
-        if self[requirement.key]:   # we've seen at least one distro
+        if self[requirement.key]:  # we've seen at least one distro
             meth, msg = self.info, "Couldn't retrieve index page for %r"
-        else:   # no distros seen for this name, might be misspelled
+        else:  # no distros seen for this name, might be misspelled
             meth, msg = (self.warn,
                 "Couldn't find index page for %r (maybe misspelled?)")
         meth(msg, requirement.unsafe_name)
@@ -665,7 +665,7 @@ def gen_setup(self, filename, fragment, tmpdir):
             interpret_distro_name(filename, match.group(1), None) if d.version
         ] or []
 
-        if len(dists) == 1:   # unambiguous ``#egg`` fragment
+        if len(dists) == 1:  # unambiguous ``#egg`` fragment
             basename = os.path.basename(filename)
 
             # Make sure the file has been downloaded to the temp dir.
@@ -738,7 +738,7 @@ def _download_to(self, url, filename):
                 fp.close()
 
     def reporthook(self, url, filename, blocknum, blksize, size):
-        pass    # no-op
+        pass  # no-op
 
     def open_url(self, url, warning=None):
         if url.startswith('file:'):
@@ -783,10 +783,10 @@ def _download_url(self, scheme, url, tmpdir):
             while '..' in name:
                 name = name.replace('..', '.').replace('\\', '_')
         else:
-            name = "__downloaded__"    # default if URL has no path contents
+            name = "__downloaded__"  # default if URL has no path contents
 
         if name.endswith('.egg.zip'):
-            name = name[:-4]    # strip the extra .zip before download
+            name = name[:-4]  # strip the extra .zip before download
 
         filename = os.path.join(tmpdir, name)
 
@@ -801,7 +801,7 @@ def _download_url(self, scheme, url, tmpdir):
         elif scheme == 'file':
             return urllib.request.url2pathname(urllib.parse.urlparse(url)[2])
         else:
-            self.url_ok(url, True)   # raises error if not allowed
+            self.url_ok(url, True)  # raises error if not allowed
             return self._attempt_download(url, filename)
 
     def scan_url(self, url):
@@ -824,13 +824,13 @@ def _download_html(self, url, headers, filename):
                     file.close()
                     os.unlink(filename)
                     return self._download_svn(url, filename)
-                break   # not an index page
+                break  # not an index page
         file.close()
         os.unlink(filename)
         raise DistutilsError("Unexpected HTML page found at " + url)
 
     def _download_svn(self, url, filename):
-        url = url.split('#', 1)[0]   # remove any fragment for svn's sake
+        url = url.split('#', 1)[0]  # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
             scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
@@ -1082,7 +1082,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
 
 def fix_sf_url(url):
-    return url      # backward compatibility
+    return url  # backward compatibility
 
 
 def local_open(url):
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index f09ab52252..92194abda4 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -40,13 +40,13 @@ def __boot():
 
     known_paths = dict([(makepath(item)[1], 1) for item in sys.path])  # 2.2 comp
 
-    oldpos = getattr(sys, '__egginsert', 0)   # save old insertion position
-    sys.__egginsert = 0                     # and reset the current one
+    oldpos = getattr(sys, '__egginsert', 0)  # save old insertion position
+    sys.__egginsert = 0  # and reset the current one
 
     for item in PYTHONPATH:
         addsitedir(item)
 
-    sys.__egginsert += oldpos           # restore effective old position
+    sys.__egginsert += oldpos  # restore effective old position
 
     d, nd = makepath(stdpath[0])
     insert_at = None

From ed3fac3741f01ce05c139216e5af58c238c63f29 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Wed, 19 Oct 2016 00:23:56 +0700
Subject: [PATCH 6257/8469] Fix quantity of blank lines.

---
 setuptools/command/build_py.py | 2 +-
 setuptools/msvc.py             | 1 +
 setuptools/sandbox.py          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b5de9bda52..289e6fb81b 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -14,8 +14,8 @@
 try:
     from setuptools.lib2to3_ex import Mixin2to3
 except ImportError:
-    class Mixin2to3:
 
+    class Mixin2to3:
         def run_2to3(self, files, doctests=True):
             "do nothing"
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index ef85f64a48..447ddb3822 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -761,6 +761,7 @@ class EnvironmentInfo:
     vc_min_ver: float
         Minimum Microsoft Visual C++ version.
     """
+
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 53ce155131..39afd57ed6 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -290,6 +290,7 @@ def wrap(self, src, dst, *args, **kw):
             if self._active:
                 src, dst = self._remap_pair(name, src, dst, *args, **kw)
             return original(src, dst, *args, **kw)
+
         return wrap
 
     for name in ["rename", "link", "symlink"]:

From fd4e8e7d33c701bc904f8063d1ee91c436f904f0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Oct 2016 11:32:44 -0400
Subject: [PATCH 6258/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bcb507980d..47164e095d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+v28.6.1
+-------
+
+* #816: Fix manifest file list order in tests.
+
 v28.6.0
 -------
 

From d7c802d072989f6543f584fa6dfdd57b140ca43e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Oct 2016 11:32:51 -0400
Subject: [PATCH 6259/8469] =?UTF-8?q?Bump=20version:=2028.6.0=20=E2=86=92?=
 =?UTF-8?q?=2028.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1cafb9ae7f..d27005858f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.6.0
+current_version = 28.6.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6cb140977b..ef007d931c 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.6.0",
+    version="28.6.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f19e5732da07d22ea0d7c7a64ba7e736ba2d1a52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Oct 2016 14:02:08 -0400
Subject: [PATCH 6260/8469] Use rpartition for simplicity

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 367c26eaca..a3099fcd92 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -112,9 +112,8 @@ def check_nsp(dist, attr, value):
                 "Distribution contains no modules or packages for " +
                 "namespace package %r" % nsp
             )
-        if '.' in nsp:
-            parent = '.'.join(nsp.split('.')[:-1])
-            if parent not in value:
+        parent, sep, child = nsp.rpartition('.')
+        if parent and parent not in value:
                 distutils.log.warn(
                     "WARNING: %r is declared as a package namespace, but %r"
                     " is not: please correct this in setup.py", nsp, parent

From b5299c316942b61cbc98750c0ed93f3a4c69b16a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Oct 2016 14:02:16 -0400
Subject: [PATCH 6261/8469] Reindent

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index a3099fcd92..dbb083bb79 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -114,10 +114,10 @@ def check_nsp(dist, attr, value):
             )
         parent, sep, child = nsp.rpartition('.')
         if parent and parent not in value:
-                distutils.log.warn(
-                    "WARNING: %r is declared as a package namespace, but %r"
-                    " is not: please correct this in setup.py", nsp, parent
-                )
+            distutils.log.warn(
+                "WARNING: %r is declared as a package namespace, but %r"
+                " is not: please correct this in setup.py", nsp, parent
+            )
 
 
 def check_extras(dist, attr, value):

From d382def1367e9d9b288e9b04b6f2da5987052b5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 19 Oct 2016 14:03:56 -0400
Subject: [PATCH 6262/8469] Use a meaningful variable name

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index dbb083bb79..612040c855 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -105,15 +105,16 @@ def assert_string_list(dist, attr, value):
 
 def check_nsp(dist, attr, value):
     """Verify that namespace packages are valid"""
-    assert_string_list(dist, attr, value)
-    for nsp in value:
+    ns_packages = value
+    assert_string_list(dist, attr, ns_packages)
+    for nsp in ns_packages:
         if not dist.has_contents_for(nsp):
             raise DistutilsSetupError(
                 "Distribution contains no modules or packages for " +
                 "namespace package %r" % nsp
             )
         parent, sep, child = nsp.rpartition('.')
-        if parent and parent not in value:
+        if parent and parent not in ns_packages:
             distutils.log.warn(
                 "WARNING: %r is declared as a package namespace, but %r"
                 " is not: please correct this in setup.py", nsp, parent

From d5494571842c63e4b1903d8f455727e408464ff5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:25:03 -0400
Subject: [PATCH 6263/8469] Extract namespace handling into a separate module
 and mix-in class.

---
 setuptools/command/install_egg_info.py | 61 +------------------------
 setuptools/namespaces.py               | 63 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 59 deletions(-)
 create mode 100755 setuptools/namespaces.py

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 7834e1070d..edc4718b68 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,14 +1,13 @@
 from distutils import log, dir_util
 import os
 
-from setuptools.extern.six.moves import map
-
 from setuptools import Command
+from setuptools import namespaces
 from setuptools.archive_util import unpack_archive
 import pkg_resources
 
 
-class install_egg_info(Command):
+class install_egg_info(namespaces.Installer, Command):
     """Install an .egg-info directory for the package"""
 
     description = "Install an .egg-info directory for the package"
@@ -61,59 +60,3 @@ def skimmer(src, dst):
             return dst
 
         unpack_archive(self.source, self.target, skimmer)
-
-    def install_namespaces(self):
-        nsp = self._get_all_ns_packages()
-        if not nsp:
-            return
-        filename, ext = os.path.splitext(self.target)
-        filename += '-nspkg.pth'
-        self.outputs.append(filename)
-        log.info("Installing %s", filename)
-        lines = map(self._gen_nspkg_line, nsp)
-
-        if self.dry_run:
-            # always generate the lines, even in dry run
-            list(lines)
-            return
-
-        with open(filename, 'wt') as f:
-            f.writelines(lines)
-
-    _nspkg_tmpl = (
-        "import sys, types, os",
-        "pep420 = sys.version_info > (3, 3)",
-        "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
-        "ie = os.path.exists(os.path.join(p,'__init__.py'))",
-        "m = not ie and not pep420 and "
-            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
-        "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
-        "(p not in mp) and mp.append(p)",
-    )
-    "lines for the namespace installer"
-
-    _nspkg_tmpl_multi = (
-        'm and setattr(sys.modules[%(parent)r], %(child)r, m)',
-    )
-    "additional line(s) when a parent package is indicated"
-
-    @classmethod
-    def _gen_nspkg_line(cls, pkg):
-        # ensure pkg is not a unicode string under Python 2.7
-        pkg = str(pkg)
-        pth = tuple(pkg.split('.'))
-        tmpl_lines = cls._nspkg_tmpl
-        parent, sep, child = pkg.rpartition('.')
-        if parent:
-            tmpl_lines += cls._nspkg_tmpl_multi
-        return ';'.join(tmpl_lines) % locals() + '\n'
-
-    def _get_all_ns_packages(self):
-        """Return sorted list of all package namespaces"""
-        nsp = set()
-        for pkg in self.distribution.namespace_packages or []:
-            pkg = pkg.split('.')
-            while pkg:
-                nsp.add('.'.join(pkg))
-                pkg.pop()
-        return sorted(nsp)
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
new file mode 100755
index 0000000000..13829521bc
--- /dev/null
+++ b/setuptools/namespaces.py
@@ -0,0 +1,63 @@
+import os
+from distutils import log
+
+from setuptools.extern.six.moves import map
+
+
+class Installer:
+
+    def install_namespaces(self):
+        nsp = self._get_all_ns_packages()
+        if not nsp:
+            return
+        filename, ext = os.path.splitext(self.target)
+        filename += '-nspkg.pth'
+        self.outputs.append(filename)
+        log.info("Installing %s", filename)
+        lines = map(self._gen_nspkg_line, nsp)
+
+        if self.dry_run:
+            # always generate the lines, even in dry run
+            list(lines)
+            return
+
+        with open(filename, 'wt') as f:
+            f.writelines(lines)
+
+    _nspkg_tmpl = (
+        "import sys, types, os",
+        "pep420 = sys.version_info > (3, 3)",
+        "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
+        "ie = os.path.exists(os.path.join(p,'__init__.py'))",
+        "m = not ie and not pep420 and "
+            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
+        "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
+        "(p not in mp) and mp.append(p)",
+    )
+    "lines for the namespace installer"
+
+    _nspkg_tmpl_multi = (
+        'm and setattr(sys.modules[%(parent)r], %(child)r, m)',
+    )
+    "additional line(s) when a parent package is indicated"
+
+    @classmethod
+    def _gen_nspkg_line(cls, pkg):
+        # ensure pkg is not a unicode string under Python 2.7
+        pkg = str(pkg)
+        pth = tuple(pkg.split('.'))
+        tmpl_lines = cls._nspkg_tmpl
+        parent, sep, child = pkg.rpartition('.')
+        if parent:
+            tmpl_lines += cls._nspkg_tmpl_multi
+        return ';'.join(tmpl_lines) % locals() + '\n'
+
+    def _get_all_ns_packages(self):
+        """Return sorted list of all package namespaces"""
+        nsp = set()
+        for pkg in self.distribution.namespace_packages or []:
+            pkg = pkg.split('.')
+            while pkg:
+                nsp.add('.'.join(pkg))
+                pkg.pop()
+        return sorted(nsp)

From c50d4e37edb96b7e4d63101139591a007e5e7241 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:29:16 -0400
Subject: [PATCH 6264/8469] Extract variable

---
 setuptools/namespaces.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 13829521bc..4248d1fc2c 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -55,7 +55,8 @@ def _gen_nspkg_line(cls, pkg):
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""
         nsp = set()
-        for pkg in self.distribution.namespace_packages or []:
+        pkgs = self.distribution.namespace_packages or []
+        for pkg in pkgs:
             pkg = pkg.split('.')
             while pkg:
                 nsp.add('.'.join(pkg))

From 11a55e9c6849f9215ddc714d2ae41d47c34d4f46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:36:11 -0400
Subject: [PATCH 6265/8469] Extract _pkg_names function and add test.

---
 setuptools/namespaces.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 4248d1fc2c..6a766eda77 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -1,9 +1,13 @@
 import os
 from distutils import log
+import itertools
 
 from setuptools.extern.six.moves import map
 
 
+flatten = itertools.chain.from_iterable
+
+
 class Installer:
 
     def install_namespaces(self):
@@ -54,11 +58,20 @@ def _gen_nspkg_line(cls, pkg):
 
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""
-        nsp = set()
         pkgs = self.distribution.namespace_packages or []
-        for pkg in pkgs:
-            pkg = pkg.split('.')
-            while pkg:
-                nsp.add('.'.join(pkg))
-                pkg.pop()
-        return sorted(nsp)
+        return sorted(flatten(map(self._pkg_names, pkgs)))
+
+    @staticmethod
+    def _pkg_names(pkg):
+        """
+        Given a namespace package, yield the components of that
+        package.
+
+        >>> names = Installer._pkg_names('a.b.c')
+        >>> set(names) == set(['a', 'a.b', 'a.b.c'])
+        True
+        """
+        parts = pkg.split('.')
+        while parts:
+            yield '.'.join(parts)
+            parts.pop()

From 3617c2b2626d6d02df40436e788becb088e6b0e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:42:00 -0400
Subject: [PATCH 6266/8469] Allow the extension to be overridden.

---
 setuptools/namespaces.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 6a766eda77..40938d60ad 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -10,12 +10,14 @@
 
 class Installer:
 
+    nspkg_ext = '-nspkg.pth'
+
     def install_namespaces(self):
         nsp = self._get_all_ns_packages()
         if not nsp:
             return
         filename, ext = os.path.splitext(self.target)
-        filename += '-nspkg.pth'
+        filename += self.nspkg_ext
         self.outputs.append(filename)
         log.info("Installing %s", filename)
         lines = map(self._gen_nspkg_line, nsp)

From 3d71f8b9ce3f8d48a9f63a095a54088828d39950 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:49:13 -0400
Subject: [PATCH 6267/8469] Allow the root to be overridden

---
 setuptools/namespaces.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 40938d60ad..9389dc69d3 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -33,7 +33,7 @@ def install_namespaces(self):
     _nspkg_tmpl = (
         "import sys, types, os",
         "pep420 = sys.version_info > (3, 3)",
-        "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)",
+        "p = os.path.join(%(root)s, *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
         "m = not ie and not pep420 and "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
@@ -47,15 +47,18 @@ def install_namespaces(self):
     )
     "additional line(s) when a parent package is indicated"
 
-    @classmethod
-    def _gen_nspkg_line(cls, pkg):
+    def _get_root(self):
+        return "sys._getframe(1).f_locals['sitedir']"
+
+    def _gen_nspkg_line(self, pkg):
         # ensure pkg is not a unicode string under Python 2.7
         pkg = str(pkg)
         pth = tuple(pkg.split('.'))
-        tmpl_lines = cls._nspkg_tmpl
+        root = self._get_root()
+        tmpl_lines = self._nspkg_tmpl
         parent, sep, child = pkg.rpartition('.')
         if parent:
-            tmpl_lines += cls._nspkg_tmpl_multi
+            tmpl_lines += self._nspkg_tmpl_multi
         return ';'.join(tmpl_lines) % locals() + '\n'
 
     def _get_all_ns_packages(self):

From 5951f62664b85b4bd751e955c16ea06ff6931701 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:49:49 -0400
Subject: [PATCH 6268/8469] Also allow the target to be overridden.

---
 setuptools/namespaces.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 9389dc69d3..8451a06c4c 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -16,7 +16,7 @@ def install_namespaces(self):
         nsp = self._get_all_ns_packages()
         if not nsp:
             return
-        filename, ext = os.path.splitext(self.target)
+        filename, ext = os.path.splitext(self._get_target())
         filename += self.nspkg_ext
         self.outputs.append(filename)
         log.info("Installing %s", filename)
@@ -30,6 +30,9 @@ def install_namespaces(self):
         with open(filename, 'wt') as f:
             f.writelines(lines)
 
+    def _get_target(self):
+        return self.target
+
     _nspkg_tmpl = (
         "import sys, types, os",
         "pep420 = sys.version_info > (3, 3)",

From 12eba181398860ae741eda4affadcd4d75f11ae3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:53:45 -0400
Subject: [PATCH 6269/8469] Create DevelopInstaller, inspired by the code in
 #789.

---
 setuptools/namespaces.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 8451a06c4c..cc934b7ee5 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -83,3 +83,11 @@ def _pkg_names(pkg):
         while parts:
             yield '.'.join(parts)
             parts.pop()
+
+
+class DevelopInstaller(Installer):
+    def _get_root(self):
+        return repr(str(self.egg_path))
+
+    def _get_target(self):
+        return self.egg_link

From 2e8ebcb618abb60af83a7155f6a0aad4ecfc10a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Oct 2016 09:58:06 -0400
Subject: [PATCH 6270/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 47164e095d..9dba9db657 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v28.7.0
+-------
+
+* Moved much of the namespace package handling functionality
+  into a separate module for re-use in something like #789.
+
 v28.6.1
 -------
 

From 2a8668d01cd6c522ce9b7af402bbd7e32a926cc3 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 23 Oct 2016 22:56:14 +0300
Subject: [PATCH 6271/8469] Some distutils tests require zlib for creating
 tar.gz source distribution.

---
 tests/test_bdist_rpm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index 25c14abd32..e9795ee4b2 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -3,9 +3,7 @@
 import unittest
 import sys
 import os
-import tempfile
-import shutil
-from test.support import run_unittest
+from test.support import run_unittest, requires_zlib
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
@@ -48,6 +46,7 @@ def tearDown(self):
     # spurious sdtout/stderr output under Mac OS X
     @unittest.skipUnless(sys.platform.startswith('linux'),
                          'spurious sdtout/stderr output under Mac OS X')
+    @requires_zlib
     @unittest.skipIf(find_executable('rpm') is None,
                      'the rpm command is not found')
     @unittest.skipIf(find_executable('rpmbuild') is None,
@@ -90,6 +89,7 @@ def test_quiet(self):
     # spurious sdtout/stderr output under Mac OS X
     @unittest.skipUnless(sys.platform.startswith('linux'),
                          'spurious sdtout/stderr output under Mac OS X')
+    @requires_zlib
     # http://bugs.python.org/issue1533164
     @unittest.skipIf(find_executable('rpm') is None,
                      'the rpm command is not found')

From dd25d1f858cd02211f4d105ab19d6c3ce90d4048 Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Tue, 25 Oct 2016 08:37:18 +0700
Subject: [PATCH 6272/8469] Fix spacing after comment hash.

---
 setuptools/command/build_ext.py | 2 +-
 setuptools/package_index.py     | 6 +++---
 setuptools/site-patch.py        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 12dc88cdbf..a66e0bf369 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -62,7 +62,7 @@ def _customize_compiler_for_shlib(compiler):
 def get_abi3_suffix():
     """Return the file extension for an abi3-compliant Extension()"""
     for suffix, _, _ in (s for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION):
-        if '.abi3' in suffix:   # Unix
+        if '.abi3' in suffix:  # Unix
             return suffix
         elif suffix == '.pyd':  # Windows
             return suffix
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e5249b27f0..024fab98cc 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -515,10 +515,10 @@ def add_find_links(self, urls):
         """Add `urls` to the list that will be prescanned for searches"""
         for url in urls:
             if (
-                self.to_scan is None        # if we have already "gone online"
-                or not URL_SCHEME(url)      # or it's a local file/directory
+                self.to_scan is None  # if we have already "gone online"
+                or not URL_SCHEME(url)  # or it's a local file/directory
                 or url.startswith('file:')
-                or list(distros_for_url(url))   # or a direct package link
+                or list(distros_for_url(url))  # or a direct package link
             ):
                 # then go ahead and process it now
                 self.scan_url(url)
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 92194abda4..0d2d2ff8da 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -13,7 +13,7 @@ def __boot():
 
     for item in stdpath:
         if item == mydir or not item:
-            continue    # skip if current dir. on Windows, or my own directory
+            continue  # skip if current dir. on Windows, or my own directory
         importer = pic.get(item)
         if importer is not None:
             loader = importer.find_module('site')

From e12256c4d32ebf59791d56576ec328131f58357a Mon Sep 17 00:00:00 2001
From: Thiebaud Weksteen <tweek@google.com>
Date: Wed, 26 Oct 2016 16:36:54 +1100
Subject: [PATCH 6273/8469] Remove _add_defaults_data_files override

---
 setuptools/command/sdist.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 9975753d9f..d4ac9efa97 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -141,11 +141,6 @@ def _add_defaults_python(self):
                     self.filelist.extend([os.path.join(src_dir, filename)
                                           for filename in filenames])
 
-    def _add_defaults_data_files(self):
-        """
-        Don't add any data files, but why?
-        """
-
     def check_readme(self):
         for f in self.READMES:
             if os.path.exists(f):

From 5ff345e1fe7639d5add42d60044fd10f7a85bd48 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 28 Oct 2016 13:47:10 -0400
Subject: [PATCH 6274/8469] Update changelog

---
 CHANGES.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9dba9db657..abfbaede8e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,12 @@ CHANGES
 v28.7.0
 -------
 
-* Moved much of the namespace package handling functionality
-  into a separate module for re-use in something like #789.
+* #832: Moved much of the namespace package handling
+  functionality into a separate module for re-use in something
+  like #789.
+* #830: ``sdist`` command no longer suppresses the inclusion
+  of data files, re-aligning with the expectation of distutils
+  and addressing #274 and #521.
 
 v28.6.1
 -------

From 6d05b8dce90985455dce0649e04955985f336b04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 28 Oct 2016 13:47:38 -0400
Subject: [PATCH 6275/8469] =?UTF-8?q?Bump=20version:=2028.6.1=20=E2=86=92?=
 =?UTF-8?q?=2028.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d27005858f..8e1b66dd16 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.6.1
+current_version = 28.7.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ef007d931c..265cdb3054 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.6.1",
+    version="28.7.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b18391c74e190b99cc358997f30907a5c4d78b00 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Oct 2016 22:28:17 -0400
Subject: [PATCH 6276/8469] Backed out changeset e12256c4d32e. Fixes #833.
 Reopens #274 and reopens #521.

---
 CHANGES.rst                 | 6 ++++++
 setuptools/command/sdist.py | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index abfbaede8e..2011b3cacd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v28.7.1
+-------
+
+* #833: Backed out changes from #830 as the implementation
+  seems to have problems in some cases.
+
 v28.7.0
 -------
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d4ac9efa97..9975753d9f 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -141,6 +141,11 @@ def _add_defaults_python(self):
                     self.filelist.extend([os.path.join(src_dir, filename)
                                           for filename in filenames])
 
+    def _add_defaults_data_files(self):
+        """
+        Don't add any data files, but why?
+        """
+
     def check_readme(self):
         for f in self.READMES:
             if os.path.exists(f):

From 107a253e31134f1c824cf82680ab69d83e3ddbd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Oct 2016 22:35:17 -0400
Subject: [PATCH 6277/8469] Update PyPI root for dependency links. Fixes #827.

---
 CHANGES.rst | 2 ++
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2011b3cacd..3ef933e5f7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@ CHANGES
 v28.7.1
 -------
 
+* #827: Update PyPI root for dependency links.
+
 * #833: Backed out changes from #830 as the implementation
   seems to have problems in some cases.
 
diff --git a/setup.py b/setup.py
index 265cdb3054..12cbbe8c89 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def pypi_link(pkg_filename):
     Given the filename, including md5 fragment, construct the
     dependency link for PyPI.
     """
-    root = 'https://pypi.python.org/packages/source'
+    root = 'https://files.pythonhosted.org/packages/source'
     name, sep, rest = pkg_filename.partition('-')
     parts = root, name[0], name, pkg_filename
     return '/'.join(parts)

From 721dc0b80fa56b0032f99b56f5bc63a65f828f4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Oct 2016 22:36:13 -0400
Subject: [PATCH 6278/8469] =?UTF-8?q?Bump=20version:=2028.7.0=20=E2=86=92?=
 =?UTF-8?q?=2028.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8e1b66dd16..6745cf1415 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.7.0
+current_version = 28.7.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 12cbbe8c89..ca802e7457 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.7.0",
+    version="28.7.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 4027f8fd1f0382586f26fb864f660b5e13f092f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Oct 2016 09:15:43 -0400
Subject: [PATCH 6279/8469] Move test requirements into another file so they
 might be referenced manually.

---
 tests/requirements.txt | 4 ++++
 tox.ini                | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 tests/requirements.txt

diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000000..d07e9cdeb7
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,4 @@
+pytest-flake8
+pytest>=3.0.2
+setuptools[ssl]
+backports.unittest_mock>=1.2
diff --git a/tox.ini b/tox.ini
index 7e2c804992..6e03aef21c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,4 @@
 [testenv]
-deps=
-	pytest-flake8
-	pytest>=3.0.2
-	setuptools[ssl]
-	backports.unittest_mock>=1.2
-
+deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
 commands=python -m pytest {posargs:-rsx}

From 0f9232cdd78d0e8dc1ed155541d6c732a1b026e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Oct 2016 13:14:40 -0400
Subject: [PATCH 6280/8469] Acknowledge that tests now fail on Python 3.6. Ref
 #836.

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 006316d16d..7268aca824 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,11 @@ python:
   - nightly
   - pypy
   - pypy3
+matrix:
+  allow_failures:
+    # pypa/setuptools#836
+    - "3.6-dev"
+    - nightly
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From 1bbacb74a51c30cdf3effecbef01c533995e0f7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Oct 2016 13:15:51 -0400
Subject: [PATCH 6281/8469] Correct syntax

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7268aca824..6b9b29244d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ python:
 matrix:
   allow_failures:
     # pypa/setuptools#836
-    - "3.6-dev"
-    - nightly
+    - python: "3.6-dev"
+    - python: nightly
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From 74da9afb4dae6ad548895da2169a4f2cd76617dd Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 3 Nov 2016 09:10:25 +0800
Subject: [PATCH 6282/8469] Support Python 3.3.0 for extension suffix

In setuptools 27.0+ extension building fails on Python 3.3.0 because the extension suffix is obtained using `SO` and not `EXT_SUFFIX` (which is used in 3.3.1 and above). See: https://hg.python.org/cpython/file/v3.3.0/Lib/distutils/command/build_ext.py#l673

This patch tries `EXT_SUFFIX` and falls back to `SO` if `EXT_SUFFIX` is falsey.
---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index a66e0bf369..aae02b0a31 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -109,7 +109,7 @@ def get_ext_filename(self, fullname):
                 and get_abi3_suffix()
             )
             if use_abi3:
-                so_ext = get_config_var('EXT_SUFFIX')
+                so_ext = get_config_var("EXT_SUFFIX") or get_config_var("SO")
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):

From a811607a23f9e2ab05c071b03d59f55951860b6c Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 3 Nov 2016 09:12:07 +0800
Subject: [PATCH 6283/8469] use consistent quotes

---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index aae02b0a31..66ed285e9d 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -109,7 +109,7 @@ def get_ext_filename(self, fullname):
                 and get_abi3_suffix()
             )
             if use_abi3:
-                so_ext = get_config_var("EXT_SUFFIX") or get_config_var("SO")
+                so_ext = get_config_var('EXT_SUFFIX') or get_config_var('SO')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):

From cbd6a5bedbabb4d5dfa93e1b5fa297fe3df4528d Mon Sep 17 00:00:00 2001
From: Thiebaud Weksteen <tweek@google.com>
Date: Fri, 4 Nov 2016 09:43:26 +1100
Subject: [PATCH 6284/8469] Add test to verify the install of Pypi top packages

---
 conftest.py        |  7 ++++
 pytest.ini         |  2 +-
 tests/test_pypi.py | 82 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_pypi.py

diff --git a/conftest.py b/conftest.py
index a513bb9e2b..47a5d888c9 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1 +1,8 @@
+import pytest
+
 pytest_plugins = 'setuptools.tests.fixtures'
+
+def pytest_addoption(parser):
+      parser.addoption("--package_name", action="append", default=[],
+                       help="list of package_name to pass to test functions")
+
diff --git a/pytest.ini b/pytest.ini
index b35abfa908..c814b316cf 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
diff --git a/tests/test_pypi.py b/tests/test_pypi.py
new file mode 100644
index 0000000000..b3425e53bc
--- /dev/null
+++ b/tests/test_pypi.py
@@ -0,0 +1,82 @@
+import os
+import subprocess
+
+import virtualenv
+from setuptools.extern.six.moves import http_client
+from setuptools.extern.six.moves import xmlrpc_client
+
+TOP = 200
+PYPI_HOSTNAME = 'pypi.python.org'
+
+
+def rpc_pypi(method, *args):
+    """Call an XML-RPC method on the Pypi server."""
+    conn = http_client.HTTPSConnection(PYPI_HOSTNAME)
+    headers = {'Content-Type': 'text/xml'}
+    payload = xmlrpc_client.dumps(args, method)
+
+    conn.request("POST", "/pypi", payload, headers)
+    response = conn.getresponse()
+    if response.status == 200:
+        result = xmlrpc_client.loads(response.read())[0][0]
+        return result
+    else:
+        raise RuntimeError("Unable to download the list of top "
+                           "packages from Pypi.")
+
+
+def get_top_packages(limit):
+    """Collect the name of the top packages on Pypi."""
+    packages = rpc_pypi('top_packages')
+    return packages[:limit]
+
+
+def _package_install(package_name, tmp_dir=None, local_setuptools=True):
+    """Try to install a package and return the exit status.
+
+    This function creates a virtual environment, install setuptools using pip
+    and then install the required package. If local_setuptools is True, it
+    will install the local version of setuptools.
+    """
+    package_dir = os.path.join(tmp_dir, "test_%s" % package_name)
+    if not local_setuptools:
+        package_dir = package_dir + "_baseline"
+
+    virtualenv.create_environment(package_dir)
+
+    pip_path = os.path.join(package_dir, "bin", "pip")
+    if local_setuptools:
+        subprocess.check_call([pip_path, "install", "."])
+    returncode = subprocess.call([pip_path, "install", package_name])
+    return returncode
+
+
+def test_package_install(package_name, tmpdir):
+    """Test to verify the outcome of installing a package.
+
+    This test compare that the return code when installing a package is the
+    same as with the current stable version of setuptools.
+    """
+    new_exit_status = _package_install(package_name, tmp_dir=str(tmpdir))
+    if new_exit_status:
+        print("Installation failed, testing against stable setuptools",
+              package_name)
+        old_exit_status = _package_install(package_name, tmp_dir=str(tmpdir),
+                                           local_setuptools=False)
+        assert new_exit_status == old_exit_status
+
+
+def pytest_generate_tests(metafunc):
+    """Generator function for test_package_install.
+
+    This function will generate calls to test_package_install. If a package
+    list has been specified on the command line, it will be used. Otherwise,
+    Pypi will be queried to get the current list of top packages.
+    """
+    if "package_name" in metafunc.fixturenames:
+        if not metafunc.config.option.package_name:
+            packages = get_top_packages(TOP)
+            packages = [name for name, downloads in packages]
+        else:
+            packages = metafunc.config.option.package_name
+        metafunc.parametrize("package_name", packages)

From 51b10c39c0f55aaa34697b16d4b6b04805a4c8ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2016 14:28:02 -0400
Subject: [PATCH 6285/8469] Tests pass again. Fixes #836.

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b9b29244d..006316d16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,6 @@ python:
   - nightly
   - pypy
   - pypy3
-matrix:
-  allow_failures:
-    # pypa/setuptools#836
-    - python: "3.6-dev"
-    - python: nightly
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From b163acc7a885419dbdcaf12623abd2d7065d4621 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2016 15:11:53 -0400
Subject: [PATCH 6286/8469] Use packaging.version.Version to sort filenames by
 the version of the package they represent. Alternate implementation of that
 proposed in #829. Also ref #629.

---
 CHANGES.rst               |  8 ++++++++
 pkg_resources/__init__.py | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3ef933e5f7..8caa21383f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+v28.8.0
+-------
+
+* #629: Per the discussion, refine the sorting to use version
+  value order for more accurate detection of the latest
+  available version when scanning for packages. See also
+  #829.
+
 v28.7.1
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 12226d4bd1..a323857cc9 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -36,6 +36,7 @@
 import email.parser
 import tempfile
 import textwrap
+import itertools
 from pkgutil import get_importer
 
 try:
@@ -1966,6 +1967,32 @@ def find_nothing(importer, path_item, only=False):
 register_finder(object, find_nothing)
 
 
+def _by_version_descending(names):
+    """
+    Given a list of filenames, return them in descending order
+    by version number.
+
+    >>> names = 'bar', 'foo', 'Python-2.7.10.egg', 'Python-2.7.2.egg'
+    >>> _by_version_descending(names)
+    ['Python-2.7.10.egg', 'Python-2.7.2.egg', 'foo', 'bar']
+    >>> names = 'Setuptools-1.2.3b1.egg', 'Setuptools-1.2.3.egg'
+    >>> _by_version_descending(names)
+    ['Setuptools-1.2.3.egg', 'Setuptools-1.2.3b1.egg']
+    >>> names = 'Setuptools-1.2.3b1.egg', 'Setuptools-1.2.3.post1.egg'
+    >>> _by_version_descending(names)
+    ['Setuptools-1.2.3.post1.egg', 'Setuptools-1.2.3b1.egg']
+    """
+    def _by_version(name):
+        """
+        Parse each component of the filename
+        """
+        name, ext = os.path.splitext(name)
+        parts = itertools.chain(name.split('-'), [ext])
+        return [packaging.version.parse(part) for part in parts]
+
+    return sorted(names, key=_by_version, reverse=True)
+
+
 def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
@@ -1979,11 +2006,7 @@ def find_on_path(importer, path_item, only=False):
             )
         else:
             # scan for .egg and .egg-info in directory
-
-            path_item_entries = os.listdir(path_item)
-            # Reverse so we find the newest version of a distribution,
-            path_item_entries.sort()
-            path_item_entries.reverse()
+            path_item_entries = _by_version_descending(os.listdir(path_item))
             for entry in path_item_entries:
                 lower = entry.lower()
                 if lower.endswith('.egg-info') or lower.endswith('.dist-info'):

From 9fe9bb2536967161cebf3b4a71e34cd0699f37c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2016 15:23:59 -0400
Subject: [PATCH 6287/8469] Update changelog. Ref #837.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8caa21383f..2dc68e712a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,9 @@ v28.8.0
   available version when scanning for packages. See also
   #829.
 
+* #837: Rely on the config var "SO" for Python 3.3.0 only
+  when determining the ext filename.
+
 v28.7.1
 -------
 

From 9e50e2e2e8920e31bab36855b5ddc48d4c474e95 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2016 15:30:27 -0400
Subject: [PATCH 6288/8469] Extract a helper to capture the temporary
 workaround. Ref #837.

---
 setuptools/command/build_ext.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 66ed285e9d..36f53f0dd4 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -109,7 +109,7 @@ def get_ext_filename(self, fullname):
                 and get_abi3_suffix()
             )
             if use_abi3:
-                so_ext = get_config_var('EXT_SUFFIX') or get_config_var('SO')
+                so_ext = _get_config_var_837('EXT_SUFFIX')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):
@@ -316,3 +316,13 @@ def link_shared_object(
         self.create_static_lib(
             objects, basename, output_dir, debug, target_lang
         )
+
+
+def _get_config_var_837(name):
+    """
+    In https://github.com/pypa/setuptools/pull/837, we discovered
+    Python 3.3.0 exposes the extension suffix under the name 'SO'.
+    """
+    if sys.version_info < (3, 3, 1):
+        name = 'SO'
+    return get_config_var(name)

From a64fcd4860742158669474a9107921345bbc65c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2016 15:35:49 -0400
Subject: [PATCH 6289/8469] =?UTF-8?q?Bump=20version:=2028.7.1=20=E2=86=92?=
 =?UTF-8?q?=2028.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6745cf1415..34c1884c1b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.7.1
+current_version = 28.8.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ca802e7457..fc51401aeb 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.7.1",
+    version="28.8.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 14827711f669a830190313951ab5aef7b71ab2c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Nov 2016 15:54:07 -0500
Subject: [PATCH 6290/8469] Install -nspkg.pth under develop command. Fixes
 namespace package support as long as __init__.py is omitted.

---
 setuptools/command/develop.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 3eb8612054..8de24fd7cc 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -9,10 +9,11 @@
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
+from setuptools import namespaces
 import setuptools
 
 
-class develop(easy_install):
+class develop(namespaces.DevelopInstaller, easy_install):
     """Set up package for development"""
 
     description = "install package in 'development mode'"
@@ -123,6 +124,8 @@ def install_for_development(self):
             self.easy_install(setuptools.bootstrap_install_from)
             setuptools.bootstrap_install_from = None
 
+        self.install_namespaces()
+
         # create an .egg-link in the installation dir, pointing to our egg
         log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
         if not self.dry_run:

From 355603259aa37e424cf7466c3de6518375a935e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Nov 2016 16:41:23 -0500
Subject: [PATCH 6291/8469] Add uninstall support for namespace packages

---
 setuptools/command/develop.py | 1 +
 setuptools/namespaces.py      | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 8de24fd7cc..aa82f95920 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -31,6 +31,7 @@ def run(self):
         if self.uninstall:
             self.multi_version = True
             self.uninstall_link()
+            self.uninstall_namespaces()
         else:
             self.install_for_development()
         self.warn_deprecated_options()
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index cc934b7ee5..a6371c99ed 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -30,6 +30,14 @@ def install_namespaces(self):
         with open(filename, 'wt') as f:
             f.writelines(lines)
 
+    def uninstall_namespaces(self):
+        filename, ext = os.path.splitext(self._get_target())
+        filename += self.nspkg_ext
+        if not os.path.exists(filename):
+            return
+        log.info("Removing %s", filename)
+        os.remove(filename)
+
     def _get_target(self):
         return self.target
 

From bcddc3dd9aa2b436a4260d4345d4ab1c6d4363ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Nov 2016 03:53:32 -0500
Subject: [PATCH 6292/8469] Add test capturing expectation for #250.

---
 setuptools/tests/test_develop.py | 73 ++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 4cf483f281..bf162d8d7a 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -114,3 +114,76 @@ def test_console_scripts(self, tmpdir):
         cmd.install_dir = tmpdir
         cmd.run()
         # assert '0.0' not in foocmd_text
+
+
+import textwrap
+import subprocess
+
+
+class TestNamespaces:
+    @staticmethod
+    def build_namespace_package(tmpdir, name):
+        src_dir = tmpdir / name
+        src_dir.mkdir()
+        setup_py = src_dir / 'setup.py'
+        namespace, sep, rest = name.partition('.')
+        script = textwrap.dedent("""
+            import setuptools
+            setuptools.setup(
+                name={name!r},
+                version="1.0",
+                namespace_packages=[{namespace!r}],
+                packages=[{namespace!r}],
+            )
+            """).format(**locals())
+        setup_py.write_text(script, encoding='utf-8')
+        ns_pkg_dir = src_dir / namespace
+        ns_pkg_dir.mkdir()
+        pkg_init = ns_pkg_dir / '__init__.py'
+        tmpl = '__import__("pkg_resources").declare_namespace({namespace!r})'
+        decl = tmpl.format(**locals())
+        pkg_init.write_text(decl, encoding='utf-8')
+        pkg_mod = ns_pkg_dir / (rest + '.py')
+        some_functionality = 'name = {rest!r}'.format(**locals())
+        pkg_mod.write_text(some_functionality, encoding='utf-8')
+        return src_dir
+
+    @staticmethod
+    def make_site_dir(target):
+        """
+        Add a sitecustomize.py module in target to cause
+        target to be added to site dirs such that .pth files
+        are processed there.
+        """
+        sc = target / 'sitecustomize.py'
+        target_str = str(target)
+        tmpl = '__import__("site").addsitedir({target_str!r})'
+        sc.write_text(tmpl.format(**locals()), encoding='utf-8')
+
+    def test_namespace_package_importable(self, tmpdir):
+        """
+        Installing two packages sharing the same namespace, one installed
+        naturally using pip or `--single-version-externally-managed`
+        and the other installed using `develop` should leave the namespace
+        in tact and both packages reachable by import.
+        """
+        pkg_A = self.build_namespace_package(tmpdir, 'myns.pkgA')
+        pkg_B = self.build_namespace_package(tmpdir, 'myns.pkgB')
+        target = tmpdir / 'packages'
+        # use pip to install to the target directory
+        install_cmd = [
+            'pip',
+            'install',
+            '-e', str(pkg_B),
+            str(pkg_A),
+            '-t', str(target),
+        ]
+        subprocess.check_call(install_cmd)
+        self.make_site_dir(target)
+        try_import = [
+            sys.executable,
+            '-c', 'import myns.pkgA; import myns.pkgB',
+        ]
+        env = dict(PYTHONPATH=str(target))
+        subprocess.check_call(try_import, env=env)
+

From fd623755cad7ee9fc1492029f4ebdde8ae6b1c1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Nov 2016 04:03:42 -0500
Subject: [PATCH 6293/8469] pip can't accept -e and -t

---
 setuptools/tests/test_develop.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index bf162d8d7a..8e905357a0 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -160,6 +160,19 @@ def make_site_dir(target):
         tmpl = '__import__("site").addsitedir({target_str!r})'
         sc.write_text(tmpl.format(**locals()), encoding='utf-8')
 
+    @staticmethod
+    def install_develop(src_dir, target):
+
+        develop_cmd = [
+            sys.executable,
+            'setup.py',
+            'develop',
+            '--install-dir', str(target),
+        ]
+        env = dict(PYTHONPATH=str(target))
+        with src_dir.as_cwd():
+            subprocess.check_call(develop_cmd, env=env)
+
     def test_namespace_package_importable(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed
@@ -174,11 +187,11 @@ def test_namespace_package_importable(self, tmpdir):
         install_cmd = [
             'pip',
             'install',
-            '-e', str(pkg_B),
             str(pkg_A),
             '-t', str(target),
         ]
         subprocess.check_call(install_cmd)
+        self.install_develop(pkg_B, target)
         self.make_site_dir(target)
         try_import = [
             sys.executable,

From 3caf0231808268654570492a0623e72b22988243 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Nov 2016 04:08:04 -0500
Subject: [PATCH 6294/8469] Move imports to top and use absolute_import for
 Python 2.7 compatibility

---
 setuptools/tests/test_develop.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 8e905357a0..d6c242191a 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,9 +1,14 @@
 """develop tests
 """
+
+from __future__ import absolute_import
+
 import os
 import site
 import sys
 import io
+import textwrap
+import subprocess
 
 from setuptools.extern import six
 
@@ -116,10 +121,6 @@ def test_console_scripts(self, tmpdir):
         # assert '0.0' not in foocmd_text
 
 
-import textwrap
-import subprocess
-
-
 class TestNamespaces:
     @staticmethod
     def build_namespace_package(tmpdir, name):

From d580f089b95b58a9a414faa8ed35419e71c995e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Nov 2016 04:08:49 -0500
Subject: [PATCH 6295/8469] Use unicode literals for Python 2.7 compatibility

---
 setuptools/tests/test_develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index d6c242191a..fb8e0e3f09 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,7 +1,7 @@
 """develop tests
 """
 
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os
 import site

From 712a6d85e47979ac50a1fb32d2cc76dc61acade8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Nov 2016 04:18:56 -0500
Subject: [PATCH 6296/8469] In -nspkg.pth, always add the path to the namespace
 package, even if a __init__ exists, allowing for better cooperation between
 PEP 420 packages and older, __init__ namespace packages.

---
 setuptools/namespaces.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index a6371c99ed..93d358a292 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -45,8 +45,7 @@ def _get_target(self):
         "import sys, types, os",
         "pep420 = sys.version_info > (3, 3)",
         "p = os.path.join(%(root)s, *%(pth)r)",
-        "ie = os.path.exists(os.path.join(p,'__init__.py'))",
-        "m = not ie and not pep420 and "
+        "m = not pep420 and "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From ed5f934e0a49253d645b66dad65fd5b616133d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Bouchard-L=C3=A9gar=C3=A9?= <cblegare.atl@ntis.ca>
Date: Mon, 7 Nov 2016 22:07:29 -0500
Subject: [PATCH 6297/8469] Also suppress warning for a single file missing

---
 setuptools/command/egg_info.py    | 11 +++++++++--
 setuptools/tests/test_egg_info.py | 11 ++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6cc8f4c45e..6f8fd87449 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -554,10 +554,17 @@ def write_manifest(self):
         msg = "writing manifest file '%s'" % self.manifest
         self.execute(write_file, (self.manifest, files), msg)
 
-    def warn(self, msg):  # suppress missing-file warnings from sdist
-        if not msg.startswith("standard file not found:"):
+    def warn(self, msg):
+        if not self._should_suppress_warning(msg):
             sdist.warn(self, msg)
 
+    @staticmethod
+    def _should_suppress_warning(msg):
+        """
+        suppress missing-file warnings from sdist
+        """
+        return re.match(r"standard file .*not found", msg)
+
     def add_defaults(self):
         sdist.add_defaults(self)
         self.filelist.append(self.template)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 12c104972e..dc41bc1f2e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -4,7 +4,7 @@
 import stat
 import sys
 
-from setuptools.command.egg_info import egg_info
+from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map
 
@@ -237,6 +237,15 @@ def test_python_requires_install(self, tmpdir_cwd, env):
         pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
         assert 'Requires-Python: >=1.2.3' in open(pkginfo).read().split('\n')
 
+    def test_manifest_maker_warning_suppresion(self):
+        fixtures = [
+            "standard file not found: should have one of foo.py, bar.py",
+            "standard file 'setup.py' not found"
+        ]
+
+        for msg in fixtures:
+            assert manifest_maker._should_suppress_warning(msg)
+
     def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],

From 2268fb9887cfea2e28e156bd2c8314132261402f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Nov 2016 09:21:40 -0500
Subject: [PATCH 6298/8469] Provisionally revert the -nspkg.pth suppression on
 PEP 420 Pythons. Ref #250.

---
 setuptools/namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 93d358a292..9c1f02439b 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -45,7 +45,7 @@ def _get_target(self):
         "import sys, types, os",
         "pep420 = sys.version_info > (3, 3)",
         "p = os.path.join(%(root)s, *%(pth)r)",
-        "m = not pep420 and "
+        "m = "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From cb75964e09d2441e0d00ee3b5861f8412a3a672d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Nov 2016 10:53:34 -0500
Subject: [PATCH 6299/8469] Add test capturing (failing) expectation. Ref #805.

---
 setuptools/tests/test_namespaces.py | 83 +++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 setuptools/tests/test_namespaces.py

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
new file mode 100644
index 0000000000..f90c25cfd4
--- /dev/null
+++ b/setuptools/tests/test_namespaces.py
@@ -0,0 +1,83 @@
+from __future__ import absolute_import
+
+import os
+import textwrap
+import sys
+import subprocess
+
+
+class TestNamespaces:
+    @staticmethod
+    def build_namespace_package(tmpdir, name):
+        src_dir = tmpdir / name
+        src_dir.mkdir()
+        setup_py = src_dir / 'setup.py'
+        namespace, sep, rest = name.partition('.')
+        script = textwrap.dedent("""
+            import setuptools
+            setuptools.setup(
+                name={name!r},
+                version="1.0",
+                namespace_packages=[{namespace!r}],
+                packages=[{namespace!r}],
+            )
+            """).format(**locals())
+        setup_py.write_text(script, encoding='utf-8')
+        ns_pkg_dir = src_dir / namespace
+        ns_pkg_dir.mkdir()
+        pkg_init = ns_pkg_dir / '__init__.py'
+        tmpl = '__import__("pkg_resources").declare_namespace({namespace!r})'
+        decl = tmpl.format(**locals())
+        pkg_init.write_text(decl, encoding='utf-8')
+        pkg_mod = ns_pkg_dir / (rest + '.py')
+        some_functionality = 'name = {rest!r}'.format(**locals())
+        pkg_mod.write_text(some_functionality, encoding='utf-8')
+        return src_dir
+
+    @staticmethod
+    def make_site_dir(target):
+        """
+        Add a sitecustomize.py module in target to cause
+        target to be added to site dirs such that .pth files
+        are processed there.
+        """
+        sc = target / 'sitecustomize.py'
+        target_str = str(target)
+        tmpl = '__import__("site").addsitedir({target_str!r})'
+        sc.write_text(tmpl.format(**locals()), encoding='utf-8')
+
+    def test_mixed_site_and_non_site(self, tmpdir):
+        """
+        Installing two packages sharing the same namespace, one installed
+        to a site dir and the other installed just to a path on PYTHONPATH
+        should leave the namespace in tact and both packages reachable by
+        import.
+        """
+        pkg_A = self.build_namespace_package(tmpdir, 'myns.pkgA')
+        pkg_B = self.build_namespace_package(tmpdir, 'myns.pkgB')
+        site_packages = tmpdir / 'site-packages'
+        path_packages = tmpdir / 'path-packages'
+        targets = site_packages, path_packages
+        python_path = os.pathsep.join(map(str, targets))
+        # use pip to install to the target directory
+        install_cmd = [
+            'pip',
+            'install',
+            str(pkg_A),
+            '-t', str(site_packages),
+        ]
+        subprocess.check_call(install_cmd)
+        self.make_site_dir(site_packages)
+        install_cmd = [
+            'pip',
+            'install',
+            str(pkg_B),
+            '-t', str(path_packages),
+        ]
+        subprocess.check_call(install_cmd)
+        try_import = [
+            sys.executable,
+            '-c', 'import myns.pkgA; import myns.pkgB',
+        ]
+        env = dict(PYTHONPATH=python_path)
+        subprocess.check_call(try_import, env=env)

From 5d78aeb98a5d2b1c366421e68162d9d46de45502 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Nov 2016 11:33:00 -0500
Subject: [PATCH 6300/8469] Fix test failures on Python 2 and suppress test
 failures when PEP 420 is not available. Ref #805.

---
 setuptools/tests/test_namespaces.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index f90c25cfd4..ad3c78b880 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -1,10 +1,12 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os
 import textwrap
 import sys
 import subprocess
 
+import pytest
+
 
 class TestNamespaces:
     @staticmethod
@@ -46,6 +48,8 @@ def make_site_dir(target):
         tmpl = '__import__("site").addsitedir({target_str!r})'
         sc.write_text(tmpl.format(**locals()), encoding='utf-8')
 
+    @pytest.mark.xfail(sys.version_info < (3, 3),
+        reason="Requires PEP 420")
     def test_mixed_site_and_non_site(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed

From ed765324e72e7e6be1f84778eaa7496df0e7a381 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Nov 2016 11:39:11 -0500
Subject: [PATCH 6301/8469] Extract namespace support functionality into a
 separate module.

---
 setuptools/tests/namespaces.py      | 42 ++++++++++++++++++++++++++
 setuptools/tests/test_namespaces.py | 47 +++--------------------------
 2 files changed, 47 insertions(+), 42 deletions(-)
 create mode 100644 setuptools/tests/namespaces.py

diff --git a/setuptools/tests/namespaces.py b/setuptools/tests/namespaces.py
new file mode 100644
index 0000000000..ef5ecdadac
--- /dev/null
+++ b/setuptools/tests/namespaces.py
@@ -0,0 +1,42 @@
+from __future__ import absolute_import, unicode_literals
+
+import textwrap
+
+
+def build_namespace_package(tmpdir, name):
+    src_dir = tmpdir / name
+    src_dir.mkdir()
+    setup_py = src_dir / 'setup.py'
+    namespace, sep, rest = name.partition('.')
+    script = textwrap.dedent("""
+        import setuptools
+        setuptools.setup(
+            name={name!r},
+            version="1.0",
+            namespace_packages=[{namespace!r}],
+            packages=[{namespace!r}],
+        )
+        """).format(**locals())
+    setup_py.write_text(script, encoding='utf-8')
+    ns_pkg_dir = src_dir / namespace
+    ns_pkg_dir.mkdir()
+    pkg_init = ns_pkg_dir / '__init__.py'
+    tmpl = '__import__("pkg_resources").declare_namespace({namespace!r})'
+    decl = tmpl.format(**locals())
+    pkg_init.write_text(decl, encoding='utf-8')
+    pkg_mod = ns_pkg_dir / (rest + '.py')
+    some_functionality = 'name = {rest!r}'.format(**locals())
+    pkg_mod.write_text(some_functionality, encoding='utf-8')
+    return src_dir
+
+
+def make_site_dir(target):
+    """
+    Add a sitecustomize.py module in target to cause
+    target to be added to site dirs such that .pth files
+    are processed there.
+    """
+    sc = target / 'sitecustomize.py'
+    target_str = str(target)
+    tmpl = '__import__("site").addsitedir({target_str!r})'
+    sc.write_text(tmpl.format(**locals()), encoding='utf-8')
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index ad3c78b880..c148577dfd 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -1,52 +1,15 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
-import textwrap
 import sys
 import subprocess
 
 import pytest
 
+from . import namespaces
 
-class TestNamespaces:
-    @staticmethod
-    def build_namespace_package(tmpdir, name):
-        src_dir = tmpdir / name
-        src_dir.mkdir()
-        setup_py = src_dir / 'setup.py'
-        namespace, sep, rest = name.partition('.')
-        script = textwrap.dedent("""
-            import setuptools
-            setuptools.setup(
-                name={name!r},
-                version="1.0",
-                namespace_packages=[{namespace!r}],
-                packages=[{namespace!r}],
-            )
-            """).format(**locals())
-        setup_py.write_text(script, encoding='utf-8')
-        ns_pkg_dir = src_dir / namespace
-        ns_pkg_dir.mkdir()
-        pkg_init = ns_pkg_dir / '__init__.py'
-        tmpl = '__import__("pkg_resources").declare_namespace({namespace!r})'
-        decl = tmpl.format(**locals())
-        pkg_init.write_text(decl, encoding='utf-8')
-        pkg_mod = ns_pkg_dir / (rest + '.py')
-        some_functionality = 'name = {rest!r}'.format(**locals())
-        pkg_mod.write_text(some_functionality, encoding='utf-8')
-        return src_dir
 
-    @staticmethod
-    def make_site_dir(target):
-        """
-        Add a sitecustomize.py module in target to cause
-        target to be added to site dirs such that .pth files
-        are processed there.
-        """
-        sc = target / 'sitecustomize.py'
-        target_str = str(target)
-        tmpl = '__import__("site").addsitedir({target_str!r})'
-        sc.write_text(tmpl.format(**locals()), encoding='utf-8')
+class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 3),
         reason="Requires PEP 420")
@@ -57,8 +20,8 @@ def test_mixed_site_and_non_site(self, tmpdir):
         should leave the namespace in tact and both packages reachable by
         import.
         """
-        pkg_A = self.build_namespace_package(tmpdir, 'myns.pkgA')
-        pkg_B = self.build_namespace_package(tmpdir, 'myns.pkgB')
+        pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
+        pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB')
         site_packages = tmpdir / 'site-packages'
         path_packages = tmpdir / 'path-packages'
         targets = site_packages, path_packages
@@ -71,7 +34,7 @@ def test_mixed_site_and_non_site(self, tmpdir):
             '-t', str(site_packages),
         ]
         subprocess.check_call(install_cmd)
-        self.make_site_dir(site_packages)
+        namespaces.make_site_dir(site_packages)
         install_cmd = [
             'pip',
             'install',

From 161c0a5072f6049f6e4790969a387e9aae41ad52 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Mon, 14 Nov 2016 00:25:57 +0100
Subject: [PATCH 6302/8469] package_index: fix bug not catching some network
 timeouts

There are already so many exceptions catched, like socket errors (e.g. failure
in name resolution) or HTTP errors. Depending on when a timeout occurs, it is
either catched (URLError during the SSL handshake) or not (socket.error while
getting a HTTP response).

When used by buildout, this fixes random failures when running in newest mode
(which is the default case), or when the requested version is available in the
download-cache.
---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 024fab98cc..d80d43bc79 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -768,7 +768,7 @@ def open_url(self, url, warning=None):
                     'down, %s' %
                     (url, v.line)
                 )
-        except http_client.HTTPException as v:
+        except (http_client.HTTPException, socket.error) as v:
             if warning:
                 self.warn(warning, v)
             else:

From 874f6ddbb74da00b9b323721cd79509fc1d5487b Mon Sep 17 00:00:00 2001
From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Thu, 17 Nov 2016 09:00:19 +0100
Subject: [PATCH 6303/8469] Issue 26931: Skip the test_distutils tests using a
 compiler executable that is not found

---
 tests/test_build_clib.py | 20 ++++++--------------
 tests/test_build_ext.py  |  6 ++++++
 tests/test_config_cmd.py |  5 ++++-
 tests/test_install.py    |  4 ++++
 tests/test_sysconfig.py  |  9 ---------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index acc99e78c1..85d09906f2 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from test.support import run_unittest
+from test.support import run_unittest, missing_compiler_executable
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
@@ -116,19 +116,11 @@ def test_run(self):
         cmd.build_temp = build_temp
         cmd.build_clib = build_temp
 
-        # before we run the command, we want to make sure
-        # all commands are present on the system
-        # by creating a compiler and checking its executables
-        from distutils.ccompiler import new_compiler
-        from distutils.sysconfig import customize_compiler
-
-        compiler = new_compiler()
-        customize_compiler(compiler)
-        for ccmd in compiler.executables.values():
-            if ccmd is None:
-                continue
-            if find_executable(ccmd[0]) is None:
-                self.skipTest('The %r command is not found' % ccmd[0])
+        # Before we run the command, we want to make sure
+        # all commands are present on the system.
+        ccmd = missing_compiler_executable()
+        if ccmd is not None:
+            self.skipTest('The %r command is not found' % ccmd)
 
         # this should work
         cmd.run()
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 6be0ca233b..be7f5f38aa 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -41,6 +41,9 @@ def build_ext(self, *args, **kwargs):
         return build_ext(*args, **kwargs)
 
     def test_build_ext(self):
+        cmd = support.missing_compiler_executable()
+        if cmd is not None:
+            self.skipTest('The %r command is not found' % cmd)
         global ALREADY_TESTED
         copy_xxmodule_c(self.tmp_dir)
         xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
@@ -295,6 +298,9 @@ def test_compiler_option(self):
         self.assertEqual(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
+        cmd = support.missing_compiler_executable()
+        if cmd is not None:
+            self.skipTest('The %r command is not found' % cmd)
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
         self.write_file(c_file, 'void PyInit_foo(void) {}\n')
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 0c8dbd8269..6e566e7915 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -2,7 +2,7 @@
 import unittest
 import os
 import sys
-from test.support import run_unittest
+from test.support import run_unittest, missing_compiler_executable
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -39,6 +39,9 @@ def test_dump_file(self):
 
     @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_search_cpp(self):
+        cmd = missing_compiler_executable(['preprocessor'])
+        if cmd is not None:
+            self.skipTest('The %r command is not found' % cmd)
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
 
diff --git a/tests/test_install.py b/tests/test_install.py
index 9313330e2b..287ab1989e 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -17,6 +17,7 @@
 from distutils.extension import Extension
 
 from distutils.tests import support
+from test import support as test_support
 
 
 def _make_ext_name(modname):
@@ -196,6 +197,9 @@ def test_record(self):
         self.assertEqual(found, expected)
 
     def test_record_extensions(self):
+        cmd = test_support.missing_compiler_executable()
+        if cmd is not None:
+            self.skipTest('The %r command is not found' % cmd)
         install_dir = self.mkdtemp()
         project_dir, dist = self.create_dist(ext_modules=[
             Extension('xx', ['xxmodule.c'])])
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index fc4d1de185..fe4a2994e3 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -39,15 +39,6 @@ def test_get_python_lib(self):
         self.assertNotEqual(sysconfig.get_python_lib(),
                             sysconfig.get_python_lib(prefix=TESTFN))
 
-    def test_get_python_inc(self):
-        inc_dir = sysconfig.get_python_inc()
-        # This is not much of a test.  We make sure Python.h exists
-        # in the directory returned by get_python_inc() but we don't know
-        # it is the correct file.
-        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
-        python_h = os.path.join(inc_dir, "Python.h")
-        self.assertTrue(os.path.isfile(python_h), python_h)
-
     def test_get_config_vars(self):
         cvars = sysconfig.get_config_vars()
         self.assertIsInstance(cvars, dict)

From 7daf18ff0aaa6e9c9f5078ed1880512dbf8e497a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Nov 2016 15:19:12 -0500
Subject: [PATCH 6304/8469] Drop exception support for packages triggering
 win32com cache generation during build/install. Fixes #841

---
 CHANGES.rst                      |  7 +++++++
 setuptools/sandbox.py            |  8 --------
 setuptools/tests/test_sandbox.py | 16 ----------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2dc68e712a..3b9f0894b0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+v29.0.0
+-------
+
+* #841: Drop special exception for packages invoking
+  win32com during the build/install process. See
+  Distribute #118 for history.
+
 v28.8.0
 -------
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 39afd57ed6..d882d71539 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -373,14 +373,6 @@ def _remap_pair(self, operation, src, dst, *args, **kw):
 else:
     _EXCEPTIONS = []
 
-try:
-    from win32com.client.gencache import GetGeneratePath
-    _EXCEPTIONS.append(GetGeneratePath())
-    del GetGeneratePath
-except ImportError:
-    # it appears pywin32 is not installed, so no need to exclude.
-    pass
-
 
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index b92a477a2f..929f0a5be8 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -23,22 +23,6 @@ def do_write():
 
         return do_write
 
-    def test_win32com(self, tmpdir):
-        """
-        win32com should not be prevented from caching COM interfaces
-        in gen_py.
-        """
-        win32com = pytest.importorskip('win32com')
-        gen_py = win32com.__gen_path__
-        target = os.path.join(gen_py, 'test_write')
-        sandbox = DirectorySandbox(str(tmpdir))
-        try:
-            # attempt to create gen_py file
-            sandbox.run(self._file_writer(target))
-        finally:
-            if os.path.exists(target):
-                os.remove(target)
-
     def test_setup_py_with_BOM(self):
         """
         It should be possible to execute a setup.py with a Byte Order Mark

From b4d77154138d7fb7042153491e9b5c1af534eb4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Nov 2016 15:57:01 -0500
Subject: [PATCH 6305/8469] Add environment variable to detect APPVEYOR. Ref
 #851.

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 299c35b7c2..9313a48207 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,7 @@
 environment:
 
+  APPVEYOR: true
+
   matrix:
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python27-x64"

From e8d53c0b830744a3cec9c0080293c39dfbf5ac72 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Nov 2016 16:07:10 -0500
Subject: [PATCH 6306/8469] Skip failing test on appveyor until the cause can
 be uncovered. Ref #851.

---
 setuptools/tests/test_namespaces.py | 2 ++
 tox.ini                             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index c148577dfd..21fd69e702 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -13,6 +13,8 @@ class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 3),
         reason="Requires PEP 420")
+    @pytest.mark.skipif('os.environ.get("APPVEYOR")',
+        reason="https://github.com/pypa/setuptools/issues/851")
     def test_mixed_site_and_non_site(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed
diff --git a/tox.ini b/tox.ini
index 6e03aef21c..cfb682ee37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,4 @@
 [testenv]
 deps=-rtests/requirements.txt
-passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
+passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
 commands=python -m pytest {posargs:-rsx}

From 23aba916e1070d3cf9723af85a6ce07c89053931 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Mon, 21 Nov 2016 01:44:22 +0200
Subject: [PATCH 6307/8469] Fix #849 global-exclude globbing

After #764, `global-exclude .pyc` no longer excluded `.pyc` files.
This fixes that regression, and adds a test for this behaviour.
---
 setuptools/command/egg_info.py    |  4 ++--
 setuptools/tests/test_manifest.py | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6cc8f4c45e..c4555b3e51 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -457,7 +457,7 @@ def global_include(self, pattern):
         """
         if self.allfiles is None:
             self.findall()
-        match = translate_pattern(os.path.join('**', pattern))
+        match = translate_pattern(os.path.join('**', '*' + pattern))
         found = [f for f in self.allfiles if match.match(f)]
         self.extend(found)
         return bool(found)
@@ -466,7 +466,7 @@ def global_exclude(self, pattern):
         """
         Exclude all files anywhere that match the pattern.
         """
-        match = translate_pattern(os.path.join('**', pattern))
+        match = translate_pattern(os.path.join('**', '*' + pattern))
         return self._remove_files(match.match)
 
     def append(self, item):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 602c43a274..62b6d708c1 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -449,6 +449,11 @@ def test_global_include(self):
         assert file_list.files == ['a.py', l('d/c.py')]
         self.assertWarnings()
 
+        file_list.process_template_line('global-include .txt')
+        file_list.sort()
+        assert file_list.files == ['a.py', 'b.txt', l('d/c.py')]
+        self.assertNoWarnings()
+
     def test_global_exclude(self):
         l = make_local_path
         # global-exclude
@@ -465,6 +470,13 @@ def test_global_exclude(self):
         assert file_list.files == ['b.txt']
         self.assertWarnings()
 
+        file_list = FileList()
+        file_list.files = ['a.py', 'b.txt', l('d/c.pyc'), 'e.pyo']
+        file_list.process_template_line('global-exclude .py[co]')
+        file_list.sort()
+        assert file_list.files == ['a.py', 'b.txt']
+        self.assertNoWarnings()
+
     def test_recursive_include(self):
         l = make_local_path
         # recursive-include

From 11b921f2e17586e394639e7ddbcaeae727ece4d0 Mon Sep 17 00:00:00 2001
From: Thiebaud Weksteen <tweek@google.com>
Date: Tue, 1 Nov 2016 15:54:23 +1100
Subject: [PATCH 6308/8469] Change _add_defaults_data_files override and add
 unittest

---
 setuptools/command/sdist.py    | 7 ++++---
 setuptools/tests/test_sdist.py | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 9975753d9f..ba980622af 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -142,9 +142,10 @@ def _add_defaults_python(self):
                                           for filename in filenames])
 
     def _add_defaults_data_files(self):
-        """
-        Don't add any data files, but why?
-        """
+        try:
+            sdist_add_defaults._add_defaults_data_files(self)
+        except TypeError:
+            log.warn("data_files contains unexpected objects")
 
     def check_readme(self):
         for f in self.READMES:
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 609c7830f2..f34068dcd3 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -26,7 +26,8 @@
     'name': 'sdist_test',
     'version': '0.0',
     'packages': ['sdist_test'],
-    'package_data': {'sdist_test': ['*.txt']}
+    'package_data': {'sdist_test': ['*.txt']},
+    'data_files': [("data", [os.path.join("d", "e.dat")])],
 }
 
 SETUP_PY = """\
@@ -95,9 +96,12 @@ def setup_method(self, method):
         # Set up the rest of the test package
         test_pkg = os.path.join(self.temp_dir, 'sdist_test')
         os.mkdir(test_pkg)
+        data_folder = os.path.join(self.temp_dir, "d")
+        os.mkdir(data_folder)
         # *.rst was not included in package_data, so c.rst should not be
         # automatically added to the manifest when not under version control
-        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']:
+        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst',
+                      os.path.join(data_folder, "e.dat")]:
             # Just touch the files; their contents are irrelevant
             open(os.path.join(test_pkg, fname), 'w').close()
 
@@ -126,6 +130,7 @@ def test_package_data_in_sdist(self):
         assert os.path.join('sdist_test', 'a.txt') in manifest
         assert os.path.join('sdist_test', 'b.txt') in manifest
         assert os.path.join('sdist_test', 'c.rst') not in manifest
+        assert os.path.join('d', 'e.dat') in manifest
 
     def test_defaults_case_sensitivity(self):
         """

From 959e12ca13a0a006100c2fe5284f69ee0d5b6fbb Mon Sep 17 00:00:00 2001
From: Liao Penghui <liaoishere@gmail.com>
Date: Fri, 25 Nov 2016 12:41:53 +0800
Subject: [PATCH 6309/8469] Make Entrypoint methods docs up to date.

Entrypoint.load() is deprecated and it's recommend to use `require` and
`resolve` separately.
---
 docs/pkg_resources.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 7b979ec303..9a45b9e317 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -835,6 +835,8 @@ addition, the following methods are provided:
     Load the entry point, returning the advertised Python object, or raise
     ``ImportError`` if it cannot be obtained.  If `require` is a true value,
     then ``require(env, installer)`` is called before attempting the import.
+    Parameters to load are deprecated.  Call ``require`` and ``resolve``
+    separately.
 
 ``require(env=None, installer=None)``
     Ensure that any "extras" needed by the entry point are available on
@@ -846,6 +848,10 @@ addition, the following methods are provided:
     taking a ``Requirement`` instance and returning a matching importable
     ``Distribution`` instance or None.
 
+``resolve()``
+    Resolve the entry point from its module and attrs, returning the advertised
+    Python object.
+
 ``__str__()``
     The string form of an ``EntryPoint`` is a string that could be passed to
     ``EntryPoint.parse()`` to produce an equivalent ``EntryPoint``.

From 175171116dc40af5274c88ec461dd2e94c1dabc5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Nov 2016 22:36:44 -0600
Subject: [PATCH 6310/8469] =?UTF-8?q?Bump=20version:=2028.8.0=20=E2=86=92?=
 =?UTF-8?q?=2029.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 34c1884c1b..589df541d3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 28.8.0
+current_version = 29.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index fc51401aeb..6286af632d 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="28.8.0",
+    version="29.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 7df349d07e6441a33427ad5c371f12bf6bedc529 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 26 Nov 2016 21:36:35 +0700
Subject: [PATCH 6311/8469] Added config module.

---
 setuptools/config.py | 367 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 367 insertions(+)
 create mode 100644 setuptools/config.py

diff --git a/setuptools/config.py b/setuptools/config.py
new file mode 100644
index 0000000000..94b2ab17a5
--- /dev/null
+++ b/setuptools/config.py
@@ -0,0 +1,367 @@
+import io
+import os
+import sys
+from functools import partial
+
+from distutils.errors import DistutilsOptionError
+from setuptools.py26compat import import_module
+from setuptools.extern.six import string_types
+
+
+class ConfigHandler(object):
+    """Handles metadata supplied in configuration files."""
+
+    section_prefix = None
+
+    def __init__(self, target_obj, options):
+        sections = {}
+
+        section_prefix = self.section_prefix
+        for section_name, section_options in options.items():
+            if not section_name.startswith(section_prefix):
+                continue
+
+            section_name = section_name.replace(section_prefix, '').strip(':')
+            sections[section_name] = section_options
+
+        self.target_obj = target_obj
+        self.sections = sections
+
+    @property
+    def parsers(self):
+        """Metadata item name to parser function mapping."""
+        raise NotImplementedError(
+            '%s must provide .parsers property' % self.__class__.__name__)
+
+    def __setitem__(self, option_name, value):
+        unknown = tuple()
+        target_obj = self.target_obj
+
+        current_value = getattr(target_obj, option_name, unknown)
+
+        if current_value is unknown:
+            raise KeyError(option_name)
+
+        if current_value:
+            # Already inhabited. Skipping.
+            return
+
+        parser = self.parsers.get(option_name)
+        if parser:
+            value = parser(value)
+
+        setter = getattr(target_obj, 'set_%s' % option_name, None)
+        if setter is None:
+            setattr(target_obj, option_name, value)
+        else:
+            setter(value)
+
+    @classmethod
+    def _parse_list(cls, value, separator=','):
+        """Represents value as a list.
+
+        Value is split either by comma or by lines.
+
+        :param value:
+        :param separator: List items separator character.
+        :rtype: list
+        """
+        if isinstance(value, list):  # _parse_complex case
+            return value
+
+        if '\n' in value:
+            value = value.splitlines()
+        else:
+            value = value.split(separator)
+
+        return [chunk.strip() for chunk in value]
+
+    @classmethod
+    def _parse_dict(cls, value):
+        """Represents value as a dict.
+
+        :param value:
+        :rtype: dict
+        """
+        separator = '='
+        result = {}
+        for line in cls._parse_list(value):
+            key, sep, val = line.partition(separator)
+            if sep != separator:
+                raise DistutilsOptionError(
+                    'Unable to parse option value to dict: %s' % value)
+            result[key.strip()] = val.strip()
+
+        return result
+
+    @classmethod
+    def _parse_bool(cls, value):
+        """Represents value as boolean.
+
+        :param value:
+        :rtype: bool
+        """
+        value = value.lower()
+        return value in ('1', 'true', 'yes')
+
+    @classmethod
+    def _parse_file(cls, value):
+        """Represents value as a string, allowing including text
+        from nearest files using include().
+
+        Examples:
+            include: LICENSE
+            include: src/file.txt
+
+        :param str value:
+        :rtype: str
+        """
+        if not isinstance(value, string_types):
+            return value
+
+        include_directive = 'file:'
+        if not value.startswith(include_directive):
+            return value
+
+        filepath = value.replace(include_directive, '').strip()
+
+        if os.path.isfile(filepath):
+            with io.open(filepath, encoding='utf-8') as f:
+                value = f.read()
+
+        return value
+
+    @classmethod
+    def _get_parser_compound(cls, *parse_methods):
+        """Returns parser function to represents value as a list.
+
+        Parses a value applying given methods one after another.
+
+        :param parse_methods:
+        :rtype: callable
+        """
+        def parse(value):
+            parsed = value
+
+            for method in parse_methods:
+                parsed = method(parsed)
+
+            return parsed
+
+        return parse
+
+    @classmethod
+    def _parse_section_to_dict(cls, section_options, values_parser=None):
+        """Parses section options into a dictionary.
+
+        Optionally applies a given parser to values.
+
+        :param dict section_options:
+        :param callable values_parser:
+        :rtype: dict
+        """
+        value = {}
+        values_parser = values_parser or (lambda val: val)
+        for key, (_, val) in section_options.items():
+            value[key] = values_parser(val)
+        return value
+
+    def parse_section(self, section_options):
+        """Parses configuration file section.
+
+        :param dict section_options:
+        """
+        for (name, (_, value)) in section_options.items():
+            try:
+                self[name] = value
+            except KeyError:
+                raise DistutilsOptionError(
+                    'Unknown distribution option: %s' % name)
+
+    def parse(self):
+        """Parses configuration file items from one
+        or more related sections.
+
+        """
+        for section_name, section_options in self.sections.items():
+
+            method_postfix = ''
+            if section_name:  # [section:option] variant
+                method_postfix = '_%s' % section_name
+
+            section_parser_method = getattr(
+                self, 'parse_section%s' % method_postfix, None)
+
+            if section_parser_method is None:
+                raise DistutilsOptionError(
+                    'Unsupported distribution option section: [%s:%s]' % (
+                        self.section_prefix, section_name))
+
+            section_parser_method(section_options)
+
+
+class ConfigMetadataHandler(ConfigHandler):
+
+    section_prefix = 'metadata'
+
+    @property
+    def parsers(self):
+        """Metadata item name to parser function mapping."""
+        parse_list = self._parse_list
+        parse_file = self._parse_file
+
+        return {
+            'platforms': parse_list,
+            'keywords': parse_list,
+            'provides': parse_list,
+            'requires': parse_list,
+            'obsoletes': parse_list,
+            'classifiers': self._get_parser_compound(parse_file, parse_list),
+            'license': parse_file,
+            'description': parse_file,
+            'long_description': parse_file,
+            'version': self._parse_version,
+        }
+
+    def parse_section_classifiers(self, section_options):
+        """Parses configuration file section.
+
+        :param dict section_options:
+        """
+        classifiers = []
+        for begin, (_, rest) in section_options.items():
+            classifiers.append('%s :%s' % (begin.title(), rest))
+
+        self['classifiers'] = classifiers
+
+    def _parse_version(self, value):
+        """Parses `version` option value.
+
+        :param value:
+        :rtype: str
+
+        """
+        attr_directive = 'attr:'
+        if not value.startswith(attr_directive):
+            return value
+
+        attrs_path = value.replace(attr_directive, '').strip().split('.')
+        attr_name = attrs_path.pop()
+
+        module_name = '.'.join(attrs_path)
+        module_name = module_name or '__init__'
+
+        sys.path.insert(0, os.getcwd())
+        try:
+            module = import_module(module_name)
+            version = getattr(module, attr_name)
+
+            if callable(version):
+                version = version()
+
+            if not isinstance(version, string_types):
+                if hasattr(version, '__iter__'):
+                    version = '.'.join(map(str, version))
+                else:
+                    version = '%s' % version
+
+        finally:
+            sys.path = sys.path[1:]
+
+        return version
+
+
+class ConfigOptionsHandler(ConfigHandler):
+
+    section_prefix = 'options'
+
+    @property
+    def parsers(self):
+        """Metadata item name to parser function mapping."""
+        parse_list = self._parse_list
+        parse_list_semicolon = partial(self._parse_list, separator=';')
+        parse_bool = self._parse_bool
+        parse_dict = self._parse_dict
+
+        return {
+            'zip_safe': parse_bool,
+            'use_2to3': parse_bool,
+            'include_package_data': parse_bool,
+            'package_dir': parse_dict,
+            'use_2to3_fixers': parse_list,
+            'use_2to3_exclude_fixers': parse_list,
+            'convert_2to3_doctests': parse_list,
+            'scripts': parse_list,
+            'eager_resources': parse_list,
+            'dependency_links': parse_list,
+            'namespace_packages': parse_list,
+            'install_requires': parse_list_semicolon,
+            'setup_requires': parse_list_semicolon,
+            'tests_require': parse_list_semicolon,
+            'packages': self._parse_packages,
+            'entry_points': self._parse_file,
+        }
+
+    def _parse_packages(self, value):
+        """Parses `packages` option value.
+
+        :param value:
+        :rtype: list
+        """
+        find_directive = 'find:'
+
+        if not value.startswith(find_directive):
+            return self._parse_list(value)
+
+        from setuptools import find_packages
+        return find_packages()
+
+    def parse_section_dependency_links(self, section_options):
+        """Parses `dependency_links` configuration file section.
+
+        :param dict section_options:
+        """
+        parsed = self._parse_section_to_dict(section_options)
+        self['dependency_links'] = list(parsed.values())
+
+    def parse_section_entry_points(self, section_options):
+        """Parses `entry_points` configuration file section.
+
+        :param dict section_options:
+        """
+        parsed = self._parse_section_to_dict(section_options, self._parse_list)
+        self['entry_points'] = parsed
+
+    def _parse_package_data(self, section_options):
+        parsed = self._parse_section_to_dict(section_options, self._parse_list)
+
+        root = parsed.get('*')
+        if root:
+            parsed[''] = root
+            del parsed['*']
+
+        return parsed
+
+    def parse_section_package_data(self, section_options):
+        """Parses `package_data` configuration file section.
+
+        :param dict section_options:
+        """
+        self['package_data'] = self._parse_package_data(section_options)
+
+    def parse_section_exclude_package_data(self, section_options):
+        """Parses `exclude_package_data` configuration file section.
+
+        :param dict section_options:
+        """
+        self['exclude_package_data'] = self._parse_package_data(
+            section_options)
+
+    def parse_section_extras_require(self, section_options):
+        """Parses `extras_require` configuration file section.
+
+        :param dict section_options:
+        """
+        parse_list = partial(self._parse_list, separator=';')
+        self['extras_require'] = self._parse_section_to_dict(
+            section_options, parse_list)

From 69130241500d78735375e36eca1b3dc6a7048dd6 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 26 Nov 2016 21:42:08 +0700
Subject: [PATCH 6312/8469] Metadata and options are now could be set in
 setup.cfg (see #394).

---
 setuptools/dist.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 612040c855..c975abe00b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -19,6 +19,7 @@
 from setuptools.depends import Require
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
+from setuptools.config import ConfigMetadataHandler, ConfigOptionsHandler
 import pkg_resources
 
 
@@ -342,6 +343,16 @@ def __init__(self, attrs=None):
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
 
+    def parse_config_files(self, filenames=None):
+        """Parses configuration files from various levels
+        and loads configuration.
+
+        """
+        _Distribution.parse_config_files(self, filenames=filenames)
+
+        ConfigMetadataHandler(self.metadata, self.command_options).parse()
+        ConfigOptionsHandler(self, self.command_options).parse()
+
     def parse_command_line(self):
         """Process features after parsing command line options"""
         result = _Distribution.parse_command_line(self)

From 58a5c4ff662a19d07b81da4c7b08e851dc2f65c8 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 26 Nov 2016 21:42:27 +0700
Subject: [PATCH 6313/8469] Added tests for config module.

---
 setuptools/tests/test_config.py | 339 ++++++++++++++++++++++++++++++++
 1 file changed, 339 insertions(+)
 create mode 100644 setuptools/tests/test_config.py

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
new file mode 100644
index 0000000000..0ef7a9946a
--- /dev/null
+++ b/setuptools/tests/test_config.py
@@ -0,0 +1,339 @@
+import contextlib
+import pytest
+from distutils.errors import DistutilsOptionError
+from setuptools.dist import Distribution
+from setuptools.config import ConfigHandler
+
+
+class ErrConfigHandler(ConfigHandler):
+    """Erroneous handler. Fails to implement required methods."""
+
+
+def fake_env(tmpdir, setup_cfg, setup_py=None):
+
+    if setup_py is None:
+        setup_py = (
+            'from setuptools import setup\n'
+            'setup()\n'
+        )
+
+    tmpdir.join('setup.py').write(setup_py)
+    tmpdir.join('setup.cfg').write(setup_cfg)
+
+    package_name = 'fake_package'
+    dir_package = tmpdir.mkdir(package_name)
+    dir_package.join('__init__.py').write(
+        'VERSION = (1, 2, 3)\n'
+        '\n'
+        'VERSION_MAJOR = 1'
+        '\n'
+        'def get_version():\n'
+        '    return [3, 4, 5, "dev"]\n'
+        '\n'
+    )
+
+
+@contextlib.contextmanager
+def get_dist(tmpdir, kwargs_initial=None, parse=True):
+    kwargs_initial = kwargs_initial or {}
+
+    with tmpdir.as_cwd():
+        dist = Distribution(kwargs_initial)
+        dist.script_name = 'setup.py'
+        parse and dist.parse_config_files()
+
+        yield dist
+
+
+def test_parsers_implemented():
+
+    with pytest.raises(NotImplementedError):
+        handler = ErrConfigHandler(None, {})
+        handler.parsers
+
+
+class TestMetadata:
+
+    def test_basic(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = 10.1.1\n'
+            'description = Some description\n'
+            'long_description = file: README\n'
+            'name = fake_name\n'
+            'keywords = one, two\n'
+            'provides = package, package.sub\n'
+            'license = otherlic\n'
+        )
+
+        tmpdir.join('README').write('readme contents\nline2')
+
+        meta_initial = {
+            # This will be used so `otherlic` won't replace it.
+            'license': 'BSD 3-Clause License',
+        }
+
+        with get_dist(tmpdir, meta_initial) as dist:
+            metadata = dist.metadata
+
+            assert metadata.version == '10.1.1'
+            assert metadata.description == 'Some description'
+            assert metadata.long_description == 'readme contents\nline2'
+            assert metadata.provides == ['package', 'package.sub']
+            assert metadata.license == 'BSD 3-Clause License'
+            assert metadata.name == 'fake_name'
+            assert metadata.keywords == ['one', 'two']
+
+    def test_version(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = attr: fake_package.VERSION\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
+        tmpdir.join('setup.cfg').write(
+            '[metadata]\n'
+            'version = attr: fake_package.get_version\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '3.4.5.dev'
+
+        tmpdir.join('setup.cfg').write(
+            '[metadata]\n'
+            'version = attr: fake_package.VERSION_MAJOR\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1'
+
+        subpack = tmpdir.join('fake_package').mkdir('subpackage')
+        subpack.join('__init__.py').write('')
+        subpack.join('submodule.py').write('VERSION = (2016, 11, 26)')
+
+        tmpdir.join('setup.cfg').write(
+            '[metadata]\n'
+            'version = attr: fake_package.subpackage.submodule.VERSION\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '2016.11.26'
+
+    def test_unknown_meta_item(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'name = fake_name\n'
+            'unknown = some\n'
+        )
+        with get_dist(tmpdir, parse=False) as dist:
+            with pytest.raises(DistutilsOptionError):
+                dist.parse_config_files()
+
+    def test_usupported_section(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata:some]\n'
+            'key = val\n'
+        )
+        with get_dist(tmpdir, parse=False) as dist:
+            with pytest.raises(DistutilsOptionError):
+                dist.parse_config_files()
+
+    def test_classifiers(self, tmpdir):
+        expected = {
+            'Framework :: Django',
+            'Programming Language :: Python :: 3.5',
+        }
+
+        # From file.
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'classifiers = file: classifiers\n'
+        )
+
+        tmpdir.join('classifiers').write(
+            'Framework :: Django\n'
+            'Programming Language :: Python :: 3.5\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert set(dist.metadata.classifiers) == expected
+
+        # From section.
+        tmpdir.join('setup.cfg').write(
+            '[metadata:classifiers]\n'
+            'Framework :: Django\n'
+            'Programming Language :: Python :: 3.5\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert set(dist.metadata.classifiers) == expected
+
+
+class TestOptions:
+
+    def test_basic(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'zip_safe = True\n'
+            'use_2to3 = 1\n'
+            'include_package_data = yes\n'
+            'package_dir = b=c, =src\n'
+            'packages = pack_a, pack_b.subpack\n'
+            'namespace_packages = pack1, pack2\n'
+            'use_2to3_fixers = your.fixers, or.here\n'
+            'use_2to3_exclude_fixers = one.here, two.there\n'
+            'convert_2to3_doctests = src/tests/one.txt, src/two.txt\n'
+            'scripts = bin/one.py, bin/two.py\n'
+            'eager_resources = bin/one.py, bin/two.py\n'
+            'install_requires = docutils>=0.3; pack ==1.1, ==1.3; hey\n'
+            'tests_require = mock==0.7.2; pytest\n'
+            'setup_requires = docutils>=0.3; spack ==1.1, ==1.3; there\n'
+            'dependency_links = http://some.com/here/1, '
+                'http://some.com/there/2\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.zip_safe
+            assert dist.use_2to3
+            assert dist.include_package_data
+            assert dist.package_dir == {'': 'src', 'b': 'c'}
+            assert set(dist.packages) == {'pack_a', 'pack_b.subpack'}
+            assert set(dist.namespace_packages) == {'pack1', 'pack2'}
+            assert set(dist.use_2to3_fixers) == {'your.fixers', 'or.here'}
+            assert set(dist.use_2to3_exclude_fixers) == {
+                'one.here', 'two.there'}
+            assert set(dist.convert_2to3_doctests) == {
+                'src/tests/one.txt', 'src/two.txt'}
+            assert set(dist.scripts) == {'bin/one.py', 'bin/two.py'}
+            assert set(dist.dependency_links) == {
+                'http://some.com/here/1',
+                'http://some.com/there/2'
+            }
+            assert set(dist.install_requires) == {
+                'docutils>=0.3',
+                'pack ==1.1, ==1.3',
+                'hey'
+            }
+            assert set(dist.setup_requires) == {
+                'docutils>=0.3',
+                'spack ==1.1, ==1.3',
+                'there'
+            }
+            assert set(dist.tests_require) == {
+                'mock==0.7.2',
+                'pytest'
+            }
+
+    def test_package_dir_fail(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'package_dir = a b\n'
+        )
+        with get_dist(tmpdir, parse=False) as dist:
+            with pytest.raises(DistutilsOptionError):
+                dist.parse_config_files()
+
+    def test_package_data(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options:package_data]\n'
+            '* = *.txt, *.rst\n'
+            'hello = *.msg\n'
+            '\n'
+            '[options:exclude_package_data]\n'
+            '* = fake1.txt, fake2.txt\n'
+            'hello = *.dat\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.package_data == {
+                '': ['*.txt', '*.rst'],
+                'hello': ['*.msg'],
+            }
+            assert dist.exclude_package_data == {
+                '': ['fake1.txt', 'fake2.txt'],
+                'hello': ['*.dat'],
+            }
+
+    def test_packages(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'packages = find:\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.packages == ['fake_package']
+
+    def test_extras_require(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options:extras_require]\n'
+            'pdf = ReportLab>=1.2; RXP\n'
+            'rest = docutils>=0.3; pack ==1.1, ==1.3\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.extras_require == {
+                'pdf': ['ReportLab>=1.2', 'RXP'],
+                'rest': ['docutils>=0.3', 'pack ==1.1, ==1.3']
+            }
+
+    def test_entry_points(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options:entry_points]\n'
+            'group1 = point1 = pack.module:func, '
+                '.point2 = pack.module2:func_rest [rest]\n'
+            'group2 = point3 = pack.module:func2\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.entry_points == {
+                'group1': [
+                    'point1 = pack.module:func',
+                    '.point2 = pack.module2:func_rest [rest]',
+                ],
+                'group2': ['point3 = pack.module:func2']
+            }
+
+        expected = (
+            '[blogtool.parsers]\n'
+            '.rst = some.nested.module:SomeClass.some_classmethod[reST]\n'
+        )
+
+        tmpdir.join('entry_points').write(expected)
+
+        # From file.
+        tmpdir.join('setup.cfg').write(
+            '[options]\n'
+            'entry_points = file: entry_points\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.entry_points == expected
+
+    def test_dependency_links(self, tmpdir):
+        expected = {
+            'http://some.com/here/1',
+            'http://some.com/there/2'
+        }
+        # From section.
+        fake_env(
+            tmpdir,
+            '[options:dependency_links]\n'
+            '1 = http://some.com/here/1\n'
+            '2 = http://some.com/there/2\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert set(dist.dependency_links) == expected

From 280d8e98ba0c3c4e37e38dff79aaf6e9efaf4175 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 26 Nov 2016 22:21:38 +0700
Subject: [PATCH 6314/8469] Tests for config module 2.6 compatible.

---
 setuptools/tests/test_config.py | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 0ef7a9946a..d044cbac82 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -145,10 +145,10 @@ def test_usupported_section(self, tmpdir):
                 dist.parse_config_files()
 
     def test_classifiers(self, tmpdir):
-        expected = {
+        expected = set([
             'Framework :: Django',
             'Programming Language :: Python :: 3.5',
-        }
+        ])
 
         # From file.
         fake_env(
@@ -205,32 +205,32 @@ def test_basic(self, tmpdir):
             assert dist.use_2to3
             assert dist.include_package_data
             assert dist.package_dir == {'': 'src', 'b': 'c'}
-            assert set(dist.packages) == {'pack_a', 'pack_b.subpack'}
-            assert set(dist.namespace_packages) == {'pack1', 'pack2'}
-            assert set(dist.use_2to3_fixers) == {'your.fixers', 'or.here'}
-            assert set(dist.use_2to3_exclude_fixers) == {
-                'one.here', 'two.there'}
-            assert set(dist.convert_2to3_doctests) == {
-                'src/tests/one.txt', 'src/two.txt'}
-            assert set(dist.scripts) == {'bin/one.py', 'bin/two.py'}
-            assert set(dist.dependency_links) == {
+            assert set(dist.packages) == set(['pack_a', 'pack_b.subpack'])
+            assert set(dist.namespace_packages) == set(['pack1', 'pack2'])
+            assert set(dist.use_2to3_fixers) == set(['your.fixers', 'or.here'])
+            assert set(dist.use_2to3_exclude_fixers) == set([
+                'one.here', 'two.there'])
+            assert set(dist.convert_2to3_doctests) == set([
+                'src/tests/one.txt', 'src/two.txt'])
+            assert set(dist.scripts) == set(['bin/one.py', 'bin/two.py'])
+            assert set(dist.dependency_links) == set([
                 'http://some.com/here/1',
                 'http://some.com/there/2'
-            }
-            assert set(dist.install_requires) == {
+            ])
+            assert set(dist.install_requires) == set([
                 'docutils>=0.3',
                 'pack ==1.1, ==1.3',
                 'hey'
-            }
-            assert set(dist.setup_requires) == {
+            ])
+            assert set(dist.setup_requires) == set([
                 'docutils>=0.3',
                 'spack ==1.1, ==1.3',
                 'there'
-            }
-            assert set(dist.tests_require) == {
+            ])
+            assert set(dist.tests_require) == set([
                 'mock==0.7.2',
                 'pytest'
-            }
+            ])
 
     def test_package_dir_fail(self, tmpdir):
         fake_env(
@@ -323,10 +323,10 @@ def test_entry_points(self, tmpdir):
             assert dist.entry_points == expected
 
     def test_dependency_links(self, tmpdir):
-        expected = {
+        expected = set([
             'http://some.com/here/1',
             'http://some.com/there/2'
-        }
+        ])
         # From section.
         fake_env(
             tmpdir,

From de11b125f7a94a13aff478482e3a83a30176f7b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Nov 2016 21:24:11 -0600
Subject: [PATCH 6315/8469] Now by default include the windows script
 launchers. Fixes #861 by addressing the underlying cause.

---
 .travis.yml |  2 --
 CHANGES.rst | 10 ++++++++++
 setup.py    |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 006316d16d..30b69a69fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,6 @@ script:
  #- python -m tox
  - tox
 
-before_deploy:
-  - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
 deploy:
   provider: pypi
   # Also update server in setup.cfg
diff --git a/CHANGES.rst b/CHANGES.rst
index 3b9f0894b0..99041cde6b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+v29.0.1
+-------
+
+* #861: Re-release of v29.0.1 with the executable script
+  launchers bundled. Now, launchers are included by default
+  and users that want to disable this behavior must set the
+  environment variable
+  'SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES' to
+  a false value like "false" or "0".
+
 v29.0.0
 -------
 
diff --git a/setup.py b/setup.py
index 6286af632d..30c19d6638 100755
--- a/setup.py
+++ b/setup.py
@@ -54,8 +54,8 @@ def _gen_console_scripts():
 )
 
 force_windows_specific_files = (
-    os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
-    not in (None, "", "0")
+    os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "1").lower()
+    not in ("", "0", "false", "no")
 )
 
 include_windows_files = (

From 0be2dfcfd85044932127ee47ad5d16e5069d3b3a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Nov 2016 21:28:45 -0600
Subject: [PATCH 6316/8469] =?UTF-8?q?Bump=20version:=2029.0.0=20=E2=86=92?=
 =?UTF-8?q?=2029.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 589df541d3..4e59c74efb 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 29.0.0
+current_version = 29.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 30c19d6638..79d303088a 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="29.0.0",
+    version="29.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a83ae992278916ade263379f2d7adc56a4539ff4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Nov 2016 18:20:05 -0600
Subject: [PATCH 6317/8469] Evaluate the expression directly. Workaround for
 #860.

---
 setuptools/tests/test_namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 21fd69e702..2d44ad863a 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -13,7 +13,7 @@ class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 3),
         reason="Requires PEP 420")
-    @pytest.mark.skipif('os.environ.get("APPVEYOR")',
+    @pytest.mark.skipif(os.environ.get("APPVEYOR"),
         reason="https://github.com/pypa/setuptools/issues/851")
     def test_mixed_site_and_non_site(self, tmpdir):
         """

From b890d3d27602b6c18985c735a0ba0933232deb82 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 09:54:40 -0500
Subject: [PATCH 6318/8469] Clean up conftest.py

---
 conftest.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/conftest.py b/conftest.py
index 47a5d888c9..ec8ddd8b4e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,8 +1,7 @@
-import pytest
-
 pytest_plugins = 'setuptools.tests.fixtures'
 
 def pytest_addoption(parser):
-      parser.addoption("--package_name", action="append", default=[],
-                       help="list of package_name to pass to test functions")
-
+    parser.addoption(
+        "--package_name", action="append", default=[],
+        help="list of package_name to pass to test functions",
+    )

From 413c234459de94766c8c57f10d11ef1599ae6ac0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 09:59:21 -0500
Subject: [PATCH 6319/8469] Monkeypatch the 'setuptools.__file__' attribute in
 test setup to be absolute. Workaround for #852.

---
 conftest.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/conftest.py b/conftest.py
index ec8ddd8b4e..0da92be9ad 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,7 +1,25 @@
+import os
+
+
 pytest_plugins = 'setuptools.tests.fixtures'
 
+
 def pytest_addoption(parser):
     parser.addoption(
         "--package_name", action="append", default=[],
         help="list of package_name to pass to test functions",
     )
+
+
+def pytest_configure():
+    _issue_852_workaround()
+
+
+def _issue_852_workaround():
+    """
+    Patch 'setuptools.__file__' with an absolute path
+    for forward compatibility with Python 3.
+    Workaround for https://github.com/pypa/setuptools/issues/852
+    """
+    setuptools = __import__('setuptools')
+    setuptools.__file__ = os.path.abspath(setuptools.__file__)

From 2c1ea18266b558cb208c070eed7de60e922aa91a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 10:55:55 -0500
Subject: [PATCH 6320/8469] Stop testing on pypy3 until Travis gets pypy 5.5 or
 later. Ref #864.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 30b69a69fe..2f9b6a7a06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ python:
   - "3.6-dev"
   - nightly
   - pypy
-  - pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C

From b47fe15b9039a165589353a1a43f6dfe3bbe3a8e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 10:56:39 -0500
Subject: [PATCH 6321/8469] Hard fail on Python 3 prior to 3.3. Fixes #864.

---
 CHANGES.rst               | 6 ++++++
 pkg_resources/__init__.py | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 99041cde6b..e6fa0d66ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+v30.0.0
+-------
+
+* #864: Drop support for Python 3.2. Systems requiring
+  Python 3.2 support must use 'setuptools < 30'.
+
 v29.0.1
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a323857cc9..dd561d2bef 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,11 +75,7 @@
 __import__('pkg_resources.extern.packaging.markers')
 
 if (3, 0) < sys.version_info < (3, 3):
-    msg = (
-        "Support for Python 3.0-3.2 has been dropped. Future versions "
-        "will fail here."
-    )
-    warnings.warn(msg)
+    raise RuntimeError("Python 3.3 or later is required")
 
 # declare some globals that will be defined later to
 # satisfy the linters.

From d2287000895d403fd50c8c5777e9c67f22268d8b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:06:39 -0500
Subject: [PATCH 6322/8469] Update changelog. Ref #840.

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e6fa0d66ef..16cc06be18 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,7 @@ v30.0.0
 
 * #864: Drop support for Python 3.2. Systems requiring
   Python 3.2 support must use 'setuptools < 30'.
+* #825: Suppress warnings for single files.
 
 v29.0.1
 -------

From 7924b1ff5eb7b11299cb8fa469e1b74c13d86f3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:15:23 -0500
Subject: [PATCH 6323/8469] Update changelog. Ref #843.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 16cc06be18..2d48c7dab1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,8 +7,13 @@ v30.0.0
 
 * #864: Drop support for Python 3.2. Systems requiring
   Python 3.2 support must use 'setuptools < 30'.
+
 * #825: Suppress warnings for single files.
 
+* #830 via #843: Once again restored inclusion of data
+  files to sdists, but now trap TypeError caused by
+  techniques employed rjsmin and similar.
+
 v29.0.1
 -------
 

From 5cfce47ddb304fc95660c1086f3230fc8fdead61 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:23:45 -0500
Subject: [PATCH 6324/8469] Use super to resolve the superclass, but fall back
 to direct access on Python 2 where old style classes are used. Ref #843.

---
 setuptools/command/sdist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index ba980622af..84e29a1b7d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -143,7 +143,10 @@ def _add_defaults_python(self):
 
     def _add_defaults_data_files(self):
         try:
-            sdist_add_defaults._add_defaults_data_files(self)
+            if six.PY2:
+                sdist_add_defaults._add_defaults_data_files(self)
+            else:
+                super()._add_defaults_data_files()
         except TypeError:
             log.warn("data_files contains unexpected objects")
 

From d42c2ace9c89dccf0076c17d33f7202e05f97bc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:30:26 -0500
Subject: [PATCH 6325/8469] cast the value to a bool so pytest doesn't try to
 eval it

---
 setuptools/tests/test_namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 2d44ad863a..28c5e9de99 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -13,7 +13,7 @@ class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 3),
         reason="Requires PEP 420")
-    @pytest.mark.skipif(os.environ.get("APPVEYOR"),
+    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
         reason="https://github.com/pypa/setuptools/issues/851")
     def test_mixed_site_and_non_site(self, tmpdir):
         """

From d64cca85dc48306a7745de4ae5224d29f5e58003 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:35:47 -0500
Subject: [PATCH 6326/8469] =?UTF-8?q?Bump=20version:=2029.0.1=20=E2=86=92?=
 =?UTF-8?q?=2030.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4e59c74efb..55c86a3cef 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 29.0.1
+current_version = 30.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 79d303088a..26aaec6b4f 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="29.0.1",
+    version="30.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 5ff82539955b291be7b638a38ed4775960417681 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Dec 2016 11:38:36 -0500
Subject: [PATCH 6327/8469] Remove superfluous heading in changelog

---
 CHANGES.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2d48c7dab1..7daf81b236 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,3 @@
-=======
-CHANGES
-=======
-
 v30.0.0
 -------
 

From bce931606700438765f63d7b0784122506619061 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Fri, 2 Dec 2016 11:20:18 +0100
Subject: [PATCH 6328/8469] Add python_requires to setup.py

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 26aaec6b4f..eda59c8ce3 100755
--- a/setup.py
+++ b/setup.py
@@ -156,6 +156,7 @@ def pypi_link(pkg_filename):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
+    python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*',
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2016.9.26",

From 2e0b4d41da9042cf658499c95ec506a3b38734d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Dec 2016 09:11:01 -0500
Subject: [PATCH 6329/8469] Update changelog. Ref #846.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7daf81b236..494c84892f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v30.1.0
+-------
+
+* #846: Also trap 'socket.error' when opening URLs in
+  package_index.
+
 v30.0.0
 -------
 

From 03083d6f1596aaee9c7c46e58e57e8127b17dd2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Dec 2016 09:22:53 -0500
Subject: [PATCH 6330/8469] Update changelog. Ref #853.

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 494c84892f..096d77bf82 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,10 @@ v30.1.0
 * #846: Also trap 'socket.error' when opening URLs in
   package_index.
 
+* #849: Manifest processing now matches the filename
+  pattern anywhere in the filename and not just at the
+  start. Restores behavior found prior to 28.5.0.
+
 v30.0.0
 -------
 

From aac9f9f31c0fdb97c52e343be6b8a641b2341232 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Dec 2016 09:38:25 -0500
Subject: [PATCH 6331/8469] Update docs to reflect supported interface. Ref
 #859.

---
 docs/pkg_resources.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 9a45b9e317..e8412b3371 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -831,12 +831,9 @@ correspond exactly to the constructor argument names: ``name``,
 ``module_name``, ``attrs``, ``extras``, and ``dist`` are all available.  In
 addition, the following methods are provided:
 
-``load(require=True, env=None, installer=None)``
-    Load the entry point, returning the advertised Python object, or raise
-    ``ImportError`` if it cannot be obtained.  If `require` is a true value,
-    then ``require(env, installer)`` is called before attempting the import.
-    Parameters to load are deprecated.  Call ``require`` and ``resolve``
-    separately.
+``load()``
+    Load the entry point, returning the advertised Python object.  Effectively
+    calls ``self.require()`` then returns ``self.resolve()``.
 
 ``require(env=None, installer=None)``
     Ensure that any "extras" needed by the entry point are available on
@@ -850,7 +847,7 @@ addition, the following methods are provided:
 
 ``resolve()``
     Resolve the entry point from its module and attrs, returning the advertised
-    Python object.
+    Python object. Raises ``ImportError`` if it cannot be obtained.
 
 ``__str__()``
     The string form of an ``EntryPoint`` is a string that could be passed to

From 6608d8f7e0522b75445a984693da65005155895c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Dec 2016 10:14:19 -0500
Subject: [PATCH 6332/8469] =?UTF-8?q?Bump=20version:=2030.0.0=20=E2=86=92?=
 =?UTF-8?q?=2030.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 55c86a3cef..666881387c 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.0.0
+current_version = 30.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 26aaec6b4f..103c87e8a2 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.0.0",
+    version="30.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 03b00c2b81142b9b329d23fe3d055a14c8698daf Mon Sep 17 00:00:00 2001
From: stepshal <nessento@openmailbox.org>
Date: Mon, 21 Nov 2016 23:02:21 +0700
Subject: [PATCH 6333/8469] Upgrade packaging to 16.8

---
 pkg_resources/_vendor/packaging/__about__.py |  2 +-
 pkg_resources/_vendor/packaging/markers.py   | 24 ++++++++++++++++----
 pkg_resources/_vendor/vendored.txt           |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index c21a758b82..95d330ef82 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -12,7 +12,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.7"
+__version__ = "16.8"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index c5d29cd99a..892e578edd 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -52,13 +52,26 @@ def __str__(self):
     def __repr__(self):
         return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
 
+    def serialize(self):
+        raise NotImplementedError
+
 
 class Variable(Node):
-    pass
+
+    def serialize(self):
+        return str(self)
 
 
 class Value(Node):
-    pass
+
+    def serialize(self):
+        return '"{0}"'.format(self)
+
+
+class Op(Node):
+
+    def serialize(self):
+        return str(self)
 
 
 VARIABLE = (
@@ -103,6 +116,7 @@ class Value(Node):
 )
 
 MARKER_OP = VERSION_CMP | L("not in") | L("in")
+MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
 
 MARKER_VALUE = QuotedString("'") | QuotedString('"')
 MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
@@ -149,7 +163,7 @@ def _format_marker(marker, first=True):
         else:
             return "(" + " ".join(inner) + ")"
     elif isinstance(marker, tuple):
-        return '{0} {1} "{2}"'.format(*marker)
+        return " ".join([m.serialize() for m in marker])
     else:
         return marker
 
@@ -168,13 +182,13 @@ def _format_marker(marker, first=True):
 
 def _eval_op(lhs, op, rhs):
     try:
-        spec = Specifier("".join([op, rhs]))
+        spec = Specifier("".join([op.serialize(), rhs]))
     except InvalidSpecifier:
         pass
     else:
         return spec.contains(lhs)
 
-    oper = _operators.get(op)
+    oper = _operators.get(op.serialize())
     if oper is None:
         raise UndefinedComparison(
             "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 6b5eb450ff..9a94c5bcc2 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==16.7
+packaging==16.8
 pyparsing==2.1.10
 six==1.10.0
 appdirs==1.4.0

From 810eb439a629e1b2bc2d078f138126356e95a9bc Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 10:41:54 +0700
Subject: [PATCH 6334/8469] Added ConfigHandler.strict_mode.

---
 setuptools/config.py            | 21 +++++++++++++++++++--
 setuptools/tests/test_config.py | 15 +++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 94b2ab17a5..3546ace997 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -12,6 +12,16 @@ class ConfigHandler(object):
     """Handles metadata supplied in configuration files."""
 
     section_prefix = None
+    """Prefix for config sections handled by this handler.
+    Must be provided by class heirs.
+
+    """
+
+    strict_mode = True
+    """Flag. Whether unknown options in config should
+    raise DistutilsOptionError exception, or pass silently.
+
+    """
 
     def __init__(self, target_obj, options):
         sections = {}
@@ -174,9 +184,11 @@ def parse_section(self, section_options):
         for (name, (_, value)) in section_options.items():
             try:
                 self[name] = value
+
             except KeyError:
-                raise DistutilsOptionError(
-                    'Unknown distribution option: %s' % name)
+                if self.strict_mode:
+                    raise DistutilsOptionError(
+                        'Unknown distribution option: %s' % name)
 
     def parse(self):
         """Parses configuration file items from one
@@ -203,6 +215,11 @@ def parse(self):
 class ConfigMetadataHandler(ConfigHandler):
 
     section_prefix = 'metadata'
+    strict_mode = False
+    """We need to keep it loose, to be compatible with `pbr` package
+    which also uses `metadata` section.
+
+    """
 
     @property
     def parsers(self):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index d044cbac82..f1b1aa3f42 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -130,8 +130,7 @@ def test_unknown_meta_item(self, tmpdir):
             'unknown = some\n'
         )
         with get_dist(tmpdir, parse=False) as dist:
-            with pytest.raises(DistutilsOptionError):
-                dist.parse_config_files()
+            dist.parse_config_files()  # Skip unknown.
 
     def test_usupported_section(self, tmpdir):
 
@@ -274,6 +273,18 @@ def test_packages(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.packages == ['fake_package']
 
+    def test_unknown_options_item(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'zip_safe = True\n'
+            'usr_2to3 = 1\n'
+        )
+        with get_dist(tmpdir, parse=False) as dist:
+            with pytest.raises(DistutilsOptionError):
+                dist.parse_config_files()
+
     def test_extras_require(self, tmpdir):
         fake_env(
             tmpdir,

From a5567b762cfe48a8e5a4aada5a997e5fd8072420 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 11:05:11 +0700
Subject: [PATCH 6335/8469] Implemented proper dangling option values support.

---
 setuptools/config.py            |   4 +-
 setuptools/tests/test_config.py | 111 ++++++++++++++++++++++++++++----
 2 files changed, 100 insertions(+), 15 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 3546ace997..ef4169955d 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -70,7 +70,7 @@ def __setitem__(self, option_name, value):
     def _parse_list(cls, value, separator=','):
         """Represents value as a list.
 
-        Value is split either by comma or by lines.
+        Value is split either by separator (defaults to comma) or by lines.
 
         :param value:
         :param separator: List items separator character.
@@ -84,7 +84,7 @@ def _parse_list(cls, value, separator=','):
         else:
             value = value.split(separator)
 
-        return [chunk.strip() for chunk in value]
+        return [chunk.strip() for chunk in value if chunk.strip()]
 
     @classmethod
     def _parse_dict(cls, value):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index f1b1aa3f42..b4bd089c52 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -86,6 +86,27 @@ def test_basic(self, tmpdir):
             assert metadata.name == 'fake_name'
             assert metadata.keywords == ['one', 'two']
 
+    def test_multiline(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'name = fake_name\n'
+            'keywords =\n'
+            '  one\n'
+            '  two\n'
+            'classifiers =\n'
+            '  Framework :: Django\n'
+            '  Programming Language :: Python :: 3.5\n'
+        )
+        with get_dist(tmpdir) as dist:
+            metadata = dist.metadata
+            assert metadata.keywords == ['one', 'two']
+            assert metadata.classifiers == [
+                'Framework :: Django',
+                'Programming Language :: Python :: 3.5',
+            ]
+
     def test_version(self, tmpdir):
 
         fake_env(
@@ -204,32 +225,96 @@ def test_basic(self, tmpdir):
             assert dist.use_2to3
             assert dist.include_package_data
             assert dist.package_dir == {'': 'src', 'b': 'c'}
-            assert set(dist.packages) == set(['pack_a', 'pack_b.subpack'])
-            assert set(dist.namespace_packages) == set(['pack1', 'pack2'])
-            assert set(dist.use_2to3_fixers) == set(['your.fixers', 'or.here'])
-            assert set(dist.use_2to3_exclude_fixers) == set([
-                'one.here', 'two.there'])
-            assert set(dist.convert_2to3_doctests) == set([
+            assert dist.packages == ['pack_a', 'pack_b.subpack']
+            assert dist.namespace_packages == ['pack1', 'pack2']
+            assert dist.use_2to3_fixers == ['your.fixers', 'or.here']
+            assert dist.use_2to3_exclude_fixers == ['one.here', 'two.there']
+            assert dist.convert_2to3_doctests == ([
                 'src/tests/one.txt', 'src/two.txt'])
-            assert set(dist.scripts) == set(['bin/one.py', 'bin/two.py'])
-            assert set(dist.dependency_links) == set([
+            assert dist.scripts == ['bin/one.py', 'bin/two.py']
+            assert dist.dependency_links == ([
                 'http://some.com/here/1',
                 'http://some.com/there/2'
             ])
-            assert set(dist.install_requires) == set([
+            assert dist.install_requires == ([
                 'docutils>=0.3',
                 'pack ==1.1, ==1.3',
                 'hey'
             ])
-            assert set(dist.setup_requires) == set([
+            assert dist.setup_requires == ([
                 'docutils>=0.3',
                 'spack ==1.1, ==1.3',
                 'there'
             ])
-            assert set(dist.tests_require) == set([
-                'mock==0.7.2',
-                'pytest'
+            assert dist.tests_require == ['mock==0.7.2', 'pytest']
+
+    def test_multiline(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'package_dir = \n'
+            '  b=c\n'
+            '  =src\n'
+            'packages = \n'
+            '  pack_a\n'
+            '  pack_b.subpack\n'
+            'namespace_packages = \n'
+            '  pack1\n'
+            '  pack2\n'
+            'use_2to3_fixers = \n'
+            '  your.fixers\n'
+            '  or.here\n'
+            'use_2to3_exclude_fixers = \n'
+            '  one.here\n'
+            '  two.there\n'
+            'convert_2to3_doctests = \n'
+            '  src/tests/one.txt\n'
+            '  src/two.txt\n'
+            'scripts = \n'
+            '  bin/one.py\n'
+            '  bin/two.py\n'
+            'eager_resources = \n'
+            '  bin/one.py\n'
+            '  bin/two.py\n'
+            'install_requires = \n'
+            '  docutils>=0.3\n'
+            '  pack ==1.1, ==1.3\n'
+            '  hey\n'
+            'tests_require = \n'
+            '  mock==0.7.2\n'
+            '  pytest\n'
+            'setup_requires = \n'
+            '  docutils>=0.3\n'
+            '  spack ==1.1, ==1.3\n'
+            '  there\n'
+            'dependency_links = \n'
+            '  http://some.com/here/1\n'
+            '  http://some.com/there/2\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.package_dir == {'': 'src', 'b': 'c'}
+            assert dist.packages == ['pack_a', 'pack_b.subpack']
+            assert dist.namespace_packages == ['pack1', 'pack2']
+            assert dist.use_2to3_fixers == ['your.fixers', 'or.here']
+            assert dist.use_2to3_exclude_fixers == ['one.here', 'two.there']
+            assert dist.convert_2to3_doctests == (
+                ['src/tests/one.txt', 'src/two.txt'])
+            assert dist.scripts == ['bin/one.py', 'bin/two.py']
+            assert dist.dependency_links == ([
+                'http://some.com/here/1',
+                'http://some.com/there/2'
+            ])
+            assert dist.install_requires == ([
+                'docutils>=0.3',
+                'pack ==1.1, ==1.3',
+                'hey'
+            ])
+            assert dist.setup_requires == ([
+                'docutils>=0.3',
+                'spack ==1.1, ==1.3',
+                'there'
             ])
+            assert dist.tests_require == ['mock==0.7.2', 'pytest']
 
     def test_package_dir_fail(self, tmpdir):
         fake_env(

From 49fc619dd4bc059ae823054f586753ebf35edeee Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 11:25:48 +0700
Subject: [PATCH 6336/8469] `dependency_links` as section not supported.

---
 setuptools/config.py            |  8 --------
 setuptools/tests/test_config.py | 16 ----------------
 2 files changed, 24 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index ef4169955d..9319f78f27 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -333,14 +333,6 @@ def _parse_packages(self, value):
         from setuptools import find_packages
         return find_packages()
 
-    def parse_section_dependency_links(self, section_options):
-        """Parses `dependency_links` configuration file section.
-
-        :param dict section_options:
-        """
-        parsed = self._parse_section_to_dict(section_options)
-        self['dependency_links'] = list(parsed.values())
-
     def parse_section_entry_points(self, section_options):
         """Parses `entry_points` configuration file section.
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index b4bd089c52..bfc863ec68 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -417,19 +417,3 @@ def test_entry_points(self, tmpdir):
 
         with get_dist(tmpdir) as dist:
             assert dist.entry_points == expected
-
-    def test_dependency_links(self, tmpdir):
-        expected = set([
-            'http://some.com/here/1',
-            'http://some.com/there/2'
-        ])
-        # From section.
-        fake_env(
-            tmpdir,
-            '[options:dependency_links]\n'
-            '1 = http://some.com/here/1\n'
-            '2 = http://some.com/there/2\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert set(dist.dependency_links) == expected

From 566e9aee17dbe2cec92b9d793f2466681f2b1a7f Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 11:27:42 +0700
Subject: [PATCH 6337/8469] Future package imported.

---
 setuptools/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/config.py b/setuptools/config.py
index 9319f78f27..5c73ca62c6 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, unicode_literals
 import io
 import os
 import sys

From 68c03bee07c55a9c337f1cb98fc102a3710add4b Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 16:22:07 +0700
Subject: [PATCH 6338/8469] Section names now dot-separated to mimic .toml
 table names.

---
 setuptools/config.py            |  2 +-
 setuptools/tests/test_config.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 5c73ca62c6..a04c3ce830 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -32,7 +32,7 @@ def __init__(self, target_obj, options):
             if not section_name.startswith(section_prefix):
                 continue
 
-            section_name = section_name.replace(section_prefix, '').strip(':')
+            section_name = section_name.replace(section_prefix, '').strip('.')
             sections[section_name] = section_options
 
         self.target_obj = target_obj
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index bfc863ec68..e53b5ffd02 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -157,7 +157,7 @@ def test_usupported_section(self, tmpdir):
 
         fake_env(
             tmpdir,
-            '[metadata:some]\n'
+            '[metadata.some]\n'
             'key = val\n'
         )
         with get_dist(tmpdir, parse=False) as dist:
@@ -187,7 +187,7 @@ def test_classifiers(self, tmpdir):
 
         # From section.
         tmpdir.join('setup.cfg').write(
-            '[metadata:classifiers]\n'
+            '[metadata.classifiers]\n'
             'Framework :: Django\n'
             'Programming Language :: Python :: 3.5\n'
         )
@@ -329,11 +329,11 @@ def test_package_dir_fail(self, tmpdir):
     def test_package_data(self, tmpdir):
         fake_env(
             tmpdir,
-            '[options:package_data]\n'
+            '[options.package_data]\n'
             '* = *.txt, *.rst\n'
             'hello = *.msg\n'
             '\n'
-            '[options:exclude_package_data]\n'
+            '[options.exclude_package_data]\n'
             '* = fake1.txt, fake2.txt\n'
             'hello = *.dat\n'
         )
@@ -373,9 +373,11 @@ def test_unknown_options_item(self, tmpdir):
     def test_extras_require(self, tmpdir):
         fake_env(
             tmpdir,
-            '[options:extras_require]\n'
+            '[options.extras_require]\n'
             'pdf = ReportLab>=1.2; RXP\n'
-            'rest = docutils>=0.3; pack ==1.1, ==1.3\n'
+            'rest = \n'
+            '  docutils>=0.3\n'
+            '  pack ==1.1, ==1.3\n'
         )
 
         with get_dist(tmpdir) as dist:
@@ -387,7 +389,7 @@ def test_extras_require(self, tmpdir):
     def test_entry_points(self, tmpdir):
         fake_env(
             tmpdir,
-            '[options:entry_points]\n'
+            '[options.entry_points]\n'
             'group1 = point1 = pack.module:func, '
                 '.point2 = pack.module2:func_rest [rest]\n'
             'group2 = point3 = pack.module:func2\n'

From 21333fe86db1888dbee134043ea8a2f85b69d439 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 17:11:37 +0700
Subject: [PATCH 6339/8469] Added `metadata` section aliases.

---
 setuptools/config.py            | 22 ++++++++++++++++++++--
 setuptools/tests/test_config.py | 25 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index a04c3ce830..0c88df798f 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -18,6 +18,12 @@ class ConfigHandler(object):
 
     """
 
+    aliases = {}
+    """Options aliases.
+    For compatibility with various packages. E.g.: d2to1 and pbr.
+
+    """
+
     strict_mode = True
     """Flag. Whether unknown options in config should
     raise DistutilsOptionError exception, or pass silently.
@@ -48,6 +54,9 @@ def __setitem__(self, option_name, value):
         unknown = tuple()
         target_obj = self.target_obj
 
+        # Translate alias into real name.
+        option_name = self.aliases.get(option_name, option_name)
+
         current_value = getattr(target_obj, option_name, unknown)
 
         if current_value is unknown:
@@ -216,9 +225,18 @@ def parse(self):
 class ConfigMetadataHandler(ConfigHandler):
 
     section_prefix = 'metadata'
+
+    aliases = {
+        'author-email': 'author_email',
+        'home_page': 'url',
+        'summary': 'description',
+        'classifier': 'classifiers',
+        'platform': 'platforms',
+    }
+
     strict_mode = False
-    """We need to keep it loose, to be compatible with `pbr` package
-    which also uses `metadata` section.
+    """We need to keep it loose, to be partially compatible with
+    `pbr` and `d2to1` packages which also uses `metadata` section.
 
     """
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index e53b5ffd02..3fabfb9490 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -86,6 +86,31 @@ def test_basic(self, tmpdir):
             assert metadata.name == 'fake_name'
             assert metadata.keywords == ['one', 'two']
 
+    def test_aliases(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'author-email = test@test.com\n'
+            'home_page = http://test.test.com/test/\n'
+            'summary = Short summary\n'
+            'platform = a, b\n'
+            'classifier =\n'
+            '  Framework :: Django\n'
+            '  Programming Language :: Python :: 3.5\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            metadata = dist.metadata
+            assert metadata.author_email == 'test@test.com'
+            assert metadata.url == 'http://test.test.com/test/'
+            assert metadata.description == 'Short summary'
+            assert metadata.platforms == ['a', 'b']
+            assert metadata.classifiers == [
+                'Framework :: Django',
+                'Programming Language :: Python :: 3.5',
+            ]
+
     def test_multiline(self, tmpdir):
 
         fake_env(

From 8998172299cd562c937e83383e9fb666e6209b30 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 17:24:05 +0700
Subject: [PATCH 6340/8469] `metadata` aliases update.

---
 setuptools/config.py            | 2 +-
 setuptools/tests/test_config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 0c88df798f..c6b93c4eab 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -21,6 +21,7 @@ class ConfigHandler(object):
     aliases = {}
     """Options aliases.
     For compatibility with various packages. E.g.: d2to1 and pbr.
+    Note: `-` in keys is replaced with `_` by config parser.
 
     """
 
@@ -227,7 +228,6 @@ class ConfigMetadataHandler(ConfigHandler):
     section_prefix = 'metadata'
 
     aliases = {
-        'author-email': 'author_email',
         'home_page': 'url',
         'summary': 'description',
         'classifier': 'classifiers',
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 3fabfb9490..08c5bd19f6 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -92,7 +92,7 @@ def test_aliases(self, tmpdir):
             tmpdir,
             '[metadata]\n'
             'author-email = test@test.com\n'
-            'home_page = http://test.test.com/test/\n'
+            'home-page = http://test.test.com/test/\n'
             'summary = Short summary\n'
             'platform = a, b\n'
             'classifier =\n'

From a5dadcf0eea5bda6991a77546787d1e657ae0411 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sun, 4 Dec 2016 17:35:44 +0700
Subject: [PATCH 6341/8469] _parse_attr() factored out.

---
 setuptools/config.py | 63 +++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index c6b93c4eab..d8513a72db 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -152,6 +152,37 @@ def _parse_file(cls, value):
 
         return value
 
+    @classmethod
+    def _parse_attr(cls, value):
+        """Represents value as a module attribute.
+
+        Examples:
+            attr: package.attr
+            attr: package.module.attr
+
+        :param str value:
+        :rtype: str
+        """
+        attr_directive = 'attr:'
+        if not value.startswith(attr_directive):
+            return value
+
+        attrs_path = value.replace(attr_directive, '').strip().split('.')
+        attr_name = attrs_path.pop()
+
+        module_name = '.'.join(attrs_path)
+        module_name = module_name or '__init__'
+
+        sys.path.insert(0, os.getcwd())
+        try:
+            module = import_module(module_name)
+            value = getattr(module, attr_name)
+
+        finally:
+            sys.path = sys.path[1:]
+
+        return value
+
     @classmethod
     def _get_parser_compound(cls, *parse_methods):
         """Returns parser function to represents value as a list.
@@ -277,32 +308,16 @@ def _parse_version(self, value):
         :rtype: str
 
         """
-        attr_directive = 'attr:'
-        if not value.startswith(attr_directive):
-            return value
+        version = self._parse_attr(value)
 
-        attrs_path = value.replace(attr_directive, '').strip().split('.')
-        attr_name = attrs_path.pop()
+        if callable(version):
+            version = version()
 
-        module_name = '.'.join(attrs_path)
-        module_name = module_name or '__init__'
-
-        sys.path.insert(0, os.getcwd())
-        try:
-            module = import_module(module_name)
-            version = getattr(module, attr_name)
-
-            if callable(version):
-                version = version()
-
-            if not isinstance(version, string_types):
-                if hasattr(version, '__iter__'):
-                    version = '.'.join(map(str, version))
-                else:
-                    version = '%s' % version
-
-        finally:
-            sys.path = sys.path[1:]
+        if not isinstance(version, string_types):
+            if hasattr(version, '__iter__'):
+                version = '.'.join(map(str, version))
+            else:
+                version = '%s' % version
 
         return version
 

From 2cdc411bf1bab8635da22e15850a93023977cf53 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Dec 2016 10:44:07 -0500
Subject: [PATCH 6342/8469] Update changelog. Ref #854.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 096d77bf82..d100bdcfa5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v30.2.0
+-------
+
+* #854: Bump to vendored Packaging 16.8.
+
 v30.1.0
 -------
 

From c4df6d7197a0e56ead10a1b1c0dbc81ea4a36615 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Dec 2016 10:49:17 -0500
Subject: [PATCH 6343/8469] =?UTF-8?q?Bump=20version:=2030.1.0=20=E2=86=92?=
 =?UTF-8?q?=2030.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 666881387c..b234d0bd4a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.1.0
+current_version = 30.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 83d85e6053..e088928cdf 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.1.0",
+    version="30.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 24e0c48846956d55af3a191bed02e3ac84595fb2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Dec 2016 10:59:11 -0500
Subject: [PATCH 6344/8469] Prefer update and generator expression to for/if
 loop

---
 pkg_resources/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index dd561d2bef..3be4175286 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3005,9 +3005,11 @@ def _initialize(g=globals()):
     "Set up global resource manager (deliberately not state-saved)"
     manager = ResourceManager()
     g['_manager'] = manager
-    for name in dir(manager):
-        if not name.startswith('_'):
-            g[name] = getattr(manager, name)
+    g.update(
+        (name, getattr(manager, name))
+        for name in dir(manager)
+        if not name.startswith('_')
+    )
 
 
 @_call_aside

From f783aa36971d78b293fb5d627d1aacd6dbd49afc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Dec 2016 11:04:10 -0500
Subject: [PATCH 6345/8469] Use generator expression to manage the scope of
 'dist'

---
 pkg_resources/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3be4175286..92503288e7 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3038,10 +3038,10 @@ def _initialize_master_working_set():
     # ensure that all distributions added to the working set in the future
     # (e.g. by calling ``require()``) will get activated as well,
     # with higher priority (replace=True).
-    dist = None  # ensure dist is defined for del dist below
-    for dist in working_set:
+    tuple(
         dist.activate(replace=False)
-    del dist
+        for dist in working_set
+    )
     add_activation_listener(lambda dist: dist.activate(replace=True), existing=False)
     working_set.entries = []
     # match order

From 1474cf0f7e2b973eb102aef311939228b83e31b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Dec 2016 11:37:49 -0500
Subject: [PATCH 6346/8469] Use get_distribution to resolve version. Ref
 testing-cabal/mock#385.

---
 setuptools/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/version.py b/setuptools/version.py
index f2b407228e..95e1869658 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1,6 +1,6 @@
 import pkg_resources
 
 try:
-    __version__ = pkg_resources.require('setuptools')[0].version
+    __version__ = pkg_resources.get_distribution('setuptools').version
 except Exception:
     __version__ = 'unknown'

From be09553790c866134411ce504d9bdaf4a924bf5a Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Mon, 5 Dec 2016 08:11:32 +0000
Subject: [PATCH 6347/8469] docs: update stray links to Bitbucket repo

---
 README.rst                        | 4 ++--
 docs/_templates/indexsidebar.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 2cf762d7d6..50774ff767 100755
--- a/README.rst
+++ b/README.rst
@@ -139,10 +139,10 @@ Package Index`_. Scroll to the very bottom of the page to find the links.
 .. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools
 
 In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `Bitbucket repo`_, and in-development versions of the
+is available from the `GitHub repo`_, and in-development versions of the
 `0.6 branch`_ are available as well.
 
-.. _Bitbucket repo: https://bitbucket.org/pypa/setuptools/get/default.tar.gz#egg=setuptools-dev
+.. _GitHub repo: https://github.com/pypa/setuptools/archive/master.tar.gz#egg=setuptools-dev
 .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
 
 Uninstalling
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index a27c85fefd..3b127602ec 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -5,4 +5,4 @@ <h3>Download</h3>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="https://bitbucket.org/pypa/setuptools">Setuptools project page</a> </p>
+<p>Visit the <a href="https://github.com/pypa/setuptools">Setuptools project page</a> </p>

From 7ab3af3cf7f8ffa512ff74cd24f1b833decdef6f Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Mon, 5 Dec 2016 08:13:43 +0000
Subject: [PATCH 6348/8469] docs: reorder table of contents
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“Building and Distributing Packages with Setuptools� is a better entry
point to the documentation than the changelog.
---
 docs/index.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 6ac3725269..74aabb5e68 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,10 +16,10 @@ Documentation content:
 .. toctree::
    :maxdepth: 2
 
-   history
-   roadmap
-   python3
    setuptools
    easy_install
    pkg_resources
+   python3
    development
+   roadmap
+   history

From af321fc6ad82c54a78e7c1a74601e0a6b34997da Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Mon, 5 Dec 2016 21:55:48 +0700
Subject: [PATCH 6349/8469] `file:` directive sandboxed.

---
 setuptools/config.py            | 12 +++++++++++-
 setuptools/tests/test_config.py | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index d8513a72db..c2319ed593 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -128,7 +128,10 @@ def _parse_bool(cls, value):
     @classmethod
     def _parse_file(cls, value):
         """Represents value as a string, allowing including text
-        from nearest files using include().
+        from nearest files using `file:` directive.
+
+        Directive is sandboxed and won't reach anything outside
+        directory with setup.py.
 
         Examples:
             include: LICENSE
@@ -144,7 +147,14 @@ def _parse_file(cls, value):
         if not value.startswith(include_directive):
             return value
 
+        current_directory = os.getcwd()
+
         filepath = value.replace(include_directive, '').strip()
+        filepath = os.path.abspath(filepath)
+
+        if not filepath.startswith(current_directory):
+            raise DistutilsOptionError(
+                '`file:` directive can not access %s' % filepath)
 
         if os.path.isfile(filepath):
             with io.open(filepath, encoding='utf-8') as f:
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 08c5bd19f6..9fb55b060f 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -86,6 +86,18 @@ def test_basic(self, tmpdir):
             assert metadata.name == 'fake_name'
             assert metadata.keywords == ['one', 'two']
 
+    def test_file_sandboxed(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'long_description = file: ../../README\n'
+        )
+
+        with get_dist(tmpdir, parse=False) as dist:
+            with pytest.raises(DistutilsOptionError):
+                dist.parse_config_files()  # file: out of sandbox
+
     def test_aliases(self, tmpdir):
 
         fake_env(

From acaece809ee3592c0d135a9a0a8e556db0a9e587 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Mon, 5 Dec 2016 22:07:16 +0700
Subject: [PATCH 6350/8469] Tests and docstrings update.

---
 setuptools/config.py            | 6 +++---
 setuptools/tests/test_config.py | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index c2319ed593..2dd42893ba 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -87,7 +87,7 @@ def _parse_list(cls, value, separator=','):
         :param separator: List items separator character.
         :rtype: list
         """
-        if isinstance(value, list):  # _parse_complex case
+        if isinstance(value, list):  # _get_parser_compound case
             return value
 
         if '\n' in value:
@@ -250,7 +250,7 @@ def parse(self):
         for section_name, section_options in self.sections.items():
 
             method_postfix = ''
-            if section_name:  # [section:option] variant
+            if section_name:  # [section.option] variant
                 method_postfix = '_%s' % section_name
 
             section_parser_method = getattr(
@@ -258,7 +258,7 @@ def parse(self):
 
             if section_parser_method is None:
                 raise DistutilsOptionError(
-                    'Unsupported distribution option section: [%s:%s]' % (
+                    'Unsupported distribution option section: [%s.%s]' % (
                         self.section_prefix, section_name))
 
             section_parser_method(section_options)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 9fb55b060f..259a396a0a 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -66,6 +66,8 @@ def test_basic(self, tmpdir):
             'keywords = one, two\n'
             'provides = package, package.sub\n'
             'license = otherlic\n'
+            'download_url = http://test.test.com/test/\n'
+            'maintainer_email = test@test.com\n'
         )
 
         tmpdir.join('README').write('readme contents\nline2')
@@ -85,6 +87,8 @@ def test_basic(self, tmpdir):
             assert metadata.license == 'BSD 3-Clause License'
             assert metadata.name == 'fake_name'
             assert metadata.keywords == ['one', 'two']
+            assert metadata.download_url == 'http://test.test.com/test/'
+            assert metadata.maintainer_email == 'test@test.com'
 
     def test_file_sandboxed(self, tmpdir):
 

From 163f36449c2b8c19c272414bff0bf80c9f3f2c7d Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Mon, 5 Dec 2016 23:13:35 +0700
Subject: [PATCH 6351/8469] Added API functions.

---
 setuptools/config.py            | 78 +++++++++++++++++++++++++++++++++
 setuptools/dist.py              |  5 +--
 setuptools/tests/test_config.py | 20 ++++++++-
 3 files changed, 99 insertions(+), 4 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 2dd42893ba..6459e1de06 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -2,6 +2,7 @@
 import io
 import os
 import sys
+from collections import defaultdict
 from functools import partial
 
 from distutils.errors import DistutilsOptionError
@@ -9,6 +10,80 @@
 from setuptools.extern.six import string_types
 
 
+def read_configuration(filepath, find_others=False):
+    """Read given configuration file and returns options from it as a dict.
+
+    :param str|unicode filepath: Path to configuration file
+        to get options from.
+
+    :param bool find_others: Whether to search for other configuration files
+        which could be on in various places.
+
+    :rtype: dict
+    """
+    from setuptools.dist import Distribution, _Distribution
+
+    dist = Distribution()
+
+    filenames = dist.find_config_files() if find_others else []
+    if filepath not in filenames:
+        filenames.append(filepath)
+
+    _Distribution.parse_config_files(dist, filenames=filenames)
+
+    handlers = parse_configuration(dist, dist.command_options)
+
+    return configuration_to_dict(handlers)
+
+
+def configuration_to_dict(handlers):
+    """Returns configuration data gathered by given handlers as a dict.
+
+    :param list[ConfigHandler] handlers: Handlers list,
+        usually from parse_configuration()
+
+    :rtype: dict
+    """
+    config_dict = defaultdict(dict)
+
+    for handler in handlers:
+
+        obj_alias = handler.section_prefix
+        target_obj = handler.target_obj
+
+        for option in handler.set_options:
+            getter = getattr(target_obj, 'get_%s' % option, None)
+
+            if getter is None:
+                value = getattr(target_obj, option)
+
+            else:
+                value = getter()
+
+            config_dict[obj_alias][option] = value
+
+    return config_dict
+
+
+def parse_configuration(distribution, command_options):
+    """Performs additional parsing of configuration options
+    for a distribution.
+
+    Returns a list of used option handlers.
+
+    :param Distribution distribution:
+    :param dict command_options:
+    :rtype: list
+    """
+    meta = ConfigMetadataHandler(distribution.metadata, command_options)
+    meta.parse()
+
+    options = ConfigOptionsHandler(distribution, command_options)
+    options.parse()
+
+    return [meta, options]
+
+
 class ConfigHandler(object):
     """Handles metadata supplied in configuration files."""
 
@@ -44,6 +119,7 @@ def __init__(self, target_obj, options):
 
         self.target_obj = target_obj
         self.sections = sections
+        self.set_options = []
 
     @property
     def parsers(self):
@@ -77,6 +153,8 @@ def __setitem__(self, option_name, value):
         else:
             setter(value)
 
+        self.set_options.append(option_name)
+
     @classmethod
     def _parse_list(cls, value, separator=','):
         """Represents value as a list.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index c975abe00b..c04e64268b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -19,7 +19,7 @@
 from setuptools.depends import Require
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
-from setuptools.config import ConfigMetadataHandler, ConfigOptionsHandler
+from setuptools.config import parse_configuration
 import pkg_resources
 
 
@@ -350,8 +350,7 @@ def parse_config_files(self, filenames=None):
         """
         _Distribution.parse_config_files(self, filenames=filenames)
 
-        ConfigMetadataHandler(self.metadata, self.command_options).parse()
-        ConfigOptionsHandler(self, self.command_options).parse()
+        parse_configuration(self, self.command_options)
 
     def parse_command_line(self):
         """Process features after parsing command line options"""
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 259a396a0a..cd646dbaaf 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -2,7 +2,7 @@
 import pytest
 from distutils.errors import DistutilsOptionError
 from setuptools.dist import Distribution
-from setuptools.config import ConfigHandler
+from setuptools.config import ConfigHandler, read_configuration
 
 
 class ErrConfigHandler(ConfigHandler):
@@ -52,6 +52,24 @@ def test_parsers_implemented():
         handler.parsers
 
 
+class TestConfigurationReader:
+
+    def test_basic(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = 10.1.1\n'
+            'keywords = one, two\n'
+            '\n'
+            '[options]\n'
+            'scripts = bin/a.py, bin/b.py\n'
+        )
+        config_dict = read_configuration('%s' % tmpdir.join('setup.cfg'))
+        assert config_dict['metadata']['version'] == '10.1.1'
+        assert config_dict['metadata']['keywords'] == ['one', 'two']
+        assert config_dict['options']['scripts'] == ['bin/a.py', 'bin/b.py']
+
+
 class TestMetadata:
 
     def test_basic(self, tmpdir):

From 6aae9fb3f2bf222466fc2fd0db5e22760c6239c6 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Mon, 5 Dec 2016 23:15:36 +0700
Subject: [PATCH 6352/8469] `strict_mode` removed to improve forward
 compatibility.

---
 setuptools/config.py            | 10 +---------
 setuptools/tests/test_config.py | 12 ------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 6459e1de06..b2c0cea325 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -100,12 +100,6 @@ class ConfigHandler(object):
 
     """
 
-    strict_mode = True
-    """Flag. Whether unknown options in config should
-    raise DistutilsOptionError exception, or pass silently.
-
-    """
-
     def __init__(self, target_obj, options):
         sections = {}
 
@@ -316,9 +310,7 @@ def parse_section(self, section_options):
                 self[name] = value
 
             except KeyError:
-                if self.strict_mode:
-                    raise DistutilsOptionError(
-                        'Unknown distribution option: %s' % name)
+                pass  # Keep silent for a new option may appear anytime.
 
     def parse(self):
         """Parses configuration file items from one
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index cd646dbaaf..2e8510be51 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -417,18 +417,6 @@ def test_packages(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.packages == ['fake_package']
 
-    def test_unknown_options_item(self, tmpdir):
-
-        fake_env(
-            tmpdir,
-            '[options]\n'
-            'zip_safe = True\n'
-            'usr_2to3 = 1\n'
-        )
-        with get_dist(tmpdir, parse=False) as dist:
-            with pytest.raises(DistutilsOptionError):
-                dist.parse_config_files()
-
     def test_extras_require(self, tmpdir):
         fake_env(
             tmpdir,

From 43af23dcff02695ef77b862d2266d10019b7c67c Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Mon, 5 Dec 2016 23:25:33 +0700
Subject: [PATCH 6353/8469] Docs update.

---
 docs/setuptools.txt | 185 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5ce2c7b1ea..77de255b90 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2398,6 +2398,191 @@ The ``upload_docs`` command has the following options:
     https://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 
+-----------------------------------------
+Configuring setup() using setup.cfg files
+-----------------------------------------
+
+``Setuptools`` allows using configuration files (usually `setup.cfg`)
+to define package’s metadata and other options which are normally supplied
+to ``setup()`` function.
+
+This approach not only allows automation scenarios, but also reduces
+boilerplate code in some cases.
+
+.. note::
+    Implementation presents limited compatibility with distutils2-like
+    ``setup.cfg`` sections (used by ``pbr`` and ``d2to1`` packages).
+
+    Namely: only metadata related keys from ``metadata`` section are supported
+    (except for ``description-file``); keys from ``files``, ``entry_points``
+    and ``backwards_compat`` are not supported.
+
+
+.. code-block:: ini
+
+    [metadata]
+    name = my_package
+    version = attr: src.VERSION
+    description = My package description
+    long_description = file: README.rst
+    keywords = one, two
+    license = BSD 3-Clause License
+
+    [metadata.classifiers]
+    Framework :: Django
+    Programming Language :: Python :: 3.5
+
+    [options]
+    zip_safe = False
+    include_package_data = True
+    packages = find:
+    scripts =
+      bin/first.py
+      bin/second.py
+
+    [options.package_data]
+    * = *.txt, *.rst
+    hello = *.msg
+
+    [options.extras_require]
+    pdf = ReportLab>=1.2; RXP
+    rest = docutils>=0.3; pack ==1.1, ==1.3
+
+
+Metadata and options could be set in sections with the same names.
+
+* Keys are the same as keyword arguments one provides to ``setup()`` function.
+
+* Complex values could be placed comma-separated or one per line
+  in *dangling* sections. The following are the same:
+
+  .. code-block:: ini
+
+      [metadata]
+      keywords = one, two
+
+      [metadata]
+      keywords =
+        one
+        two
+
+* In some cases complex values could be provided in subsections for clarity.
+
+* Some keys allow ``file:``, ``attr:`` and ``find:`` directives to cover
+  common usecases.
+
+* Unknown keys are ignored.
+
+
+Specifying values
+=================
+
+Some values are treated as simple strings, some allow more logic.
+
+Type names used below:
+
+* ``str`` - simple string
+* ``list-comma`` - dangling list or comma-separated values string
+* ``list-semi`` - dangling list or semicolon-separated values string
+* ``bool`` -  ``True`` is 1, yes, true
+* ``dict`` - list-comma where keys from values are separated by =
+
+
+Special directives:
+
+* ``attr:`` - value could be read from module attribute
+* ``file:`` - value could be read from a file
+* ``section:`` - values could be read from a dedicated (sub)section
+
+
+.. note::
+    ``file:`` directive is sandboxed and won't reach anything outside
+    directory with ``setup.py``.
+
+
+Metadata
+--------
+
+.. note::
+    Aliases given below are supported for compatibility reasons,
+    but not advised.
+
+=================  =================  =====
+Key                Aliases            Accepted value type
+=================  =================  =====
+name                                  str
+version                               attr:, str
+url                home-page          str
+download_url       download-url       str
+author                                str
+author_email       author-email       str
+maintainer                            str
+maintainer_email   maintainer-email   str
+classifiers        classifier         file:, section, list-comma
+license                               file:, str
+description        summary            file:, str
+long_description   long-description   file:, str
+keywords                              list-comma
+platforms          platform           list-comma
+provides                              list-comma
+requires                              list-comma
+obsoletes                             list-comma
+=================  =================  =====
+
+**version** - ``attr:`` supports callables; supports iterables;
+unsupported types are casted using ``str()``.
+
+
+Options
+-------
+
+=======================  =====
+Key                      Accepted value type
+=======================  =====
+zip_safe                 bool
+setup_requires           list-semi
+install_requires         list-semi
+extras_require           section
+entry_points             file, section
+use_2to3                 bool
+use_2to3_fixers          list-comma
+use_2to3_exclude_fixers  list-comma
+convert_2to3_doctests    list-comma
+scripts                  list-comma
+eager_resources          list-comma
+dependency_links         list-comma
+tests_require            list-semi
+include_package_data     bool
+packages                 find:, list-comma
+package_dir              dict
+package_data             section
+exclude_package_data     section
+namespace_packages       list-comma
+=======================  =====
+
+
+Configuration API
+=================
+
+Some automation tools may wish to access data from a configuration file.
+
+``Setuptools`` exposes ``read_configuration()`` function allowing
+parsing ``metadata`` and ``options`` sections into a dictionary.
+
+
+.. code-block:: python
+
+    from setuptools.config import read_configuration
+
+    conf_dict = read_configuration('/home/user/dev/package/setup.cfg')
+
+
+By default ``read_configuration()`` will read only file provided
+in the first argument. To include values from other configuration files
+which could be in various places set `find_others` function argument
+to ``True``.
+
+
 --------------------------------
 Extending and Reusing Setuptools
 --------------------------------

From 1ca6f3bf272d8ba2c0d4161cc56a74c63c8afb82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 7 Dec 2016 14:59:34 +0200
Subject: [PATCH 6354/8469] Spelling fixes

---
 setuptools/command/build_py.py    | 2 +-
 setuptools/tests/environment.py   | 2 +-
 setuptools/tests/test_egg_info.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 289e6fb81b..b0314fd413 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -219,7 +219,7 @@ def exclude_data_files(self, package, src_dir, files):
     @staticmethod
     def _get_platform_patterns(spec, package, src_dir):
         """
-        yield platfrom-specific path patterns (suitable for glob
+        yield platform-specific path patterns (suitable for glob
         or fn_match) from a glob-based spec (such as
         self.package_data or self.exclude_package_data)
         matching package in src_dir.
diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index b0e3bd36a8..c67898ca79 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -56,5 +56,5 @@ def run_setup_py(cmd, pypath=None, path=None,
         data = data.decode()
         data = unicodedata.normalize('NFC', data)
 
-    # communciate calls wait()
+    # communicate calls wait()
     return proc.returncode, data
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index dc41bc1f2e..75ae18dffd 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -237,7 +237,7 @@ def test_python_requires_install(self, tmpdir_cwd, env):
         pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
         assert 'Requires-Python: >=1.2.3' in open(pkginfo).read().split('\n')
 
-    def test_manifest_maker_warning_suppresion(self):
+    def test_manifest_maker_warning_suppression(self):
         fixtures = [
             "standard file not found: should have one of foo.py, bar.py",
             "standard file 'setup.py' not found"

From a9350f32d3eeef3a1c53b243e763e60e211b72f6 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Wed, 7 Dec 2016 20:21:31 +0700
Subject: [PATCH 6355/8469] `read_configuration` now chdirs and tests for file.

---
 setuptools/config.py            | 13 ++++++++++++-
 setuptools/tests/test_config.py |  6 +++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index b2c0cea325..889dc683d3 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -5,7 +5,7 @@
 from collections import defaultdict
 from functools import partial
 
-from distutils.errors import DistutilsOptionError
+from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.py26compat import import_module
 from setuptools.extern.six import string_types
 
@@ -23,6 +23,15 @@ def read_configuration(filepath, find_others=False):
     """
     from setuptools.dist import Distribution, _Distribution
 
+    filepath = os.path.abspath(filepath)
+
+    if not os.path.isfile(filepath):
+        raise DistutilsFileError(
+            'Configuration file %s does not exist.' % filepath)
+
+    current_directory = os.getcwd()
+    os.chdir(os.path.dirname(filepath))
+
     dist = Distribution()
 
     filenames = dist.find_config_files() if find_others else []
@@ -33,6 +42,8 @@ def read_configuration(filepath, find_others=False):
 
     handlers = parse_configuration(dist, dist.command_options)
 
+    os.chdir(current_directory)
+
     return configuration_to_dict(handlers)
 
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 2e8510be51..2148772095 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,6 +1,6 @@
 import contextlib
 import pytest
-from distutils.errors import DistutilsOptionError
+from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.dist import Distribution
 from setuptools.config import ConfigHandler, read_configuration
 
@@ -69,6 +69,10 @@ def test_basic(self, tmpdir):
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert config_dict['options']['scripts'] == ['bin/a.py', 'bin/b.py']
 
+    def test_no_config(self, tmpdir):
+        with pytest.raises(DistutilsFileError):
+            read_configuration('%s' % tmpdir.join('setup.cfg'))
+
 
 class TestMetadata:
 

From 53b47e1dfa9dfb1e8b94172a4650409fc03d4048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 7 Dec 2016 15:00:43 +0200
Subject: [PATCH 6356/8469] Tell unittest.main not to exit, fixes #850.

---
 setuptools/command/test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 270674e21e..9a5117be00 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -225,10 +225,12 @@ def run_tests(self):
                         del_modules.append(name)
                 list(map(sys.modules.__delitem__, del_modules))
 
+        exit_kwarg = {} if sys.version_info < (2, 7) else {"exit": False}
         unittest_main(
             None, None, self._argv,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
+            **exit_kwarg
         )
 
     @property

From 7e25fd910d1ff5259c0768d3b54a9bf03bce4279 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Dec 2016 20:51:36 -0500
Subject: [PATCH 6357/8469] Consider using module_from_spec to create the
 module.

---
 setuptools/namespaces.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index cc934b7ee5..b6720609e1 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -34,12 +34,15 @@ def _get_target(self):
         return self.target
 
     _nspkg_tmpl = (
-        "import sys, types, os",
+        "import sys, types, os, importlib.util, importlib.machinery",
         "pep420 = sys.version_info > (3, 3)",
         "p = os.path.join(%(root)s, *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
         "m = not ie and not pep420 and "
-            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
+            "sys.modules.setdefault(%(pkg)r, "
+                "importlib.util.module_from_spec("
+                    "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
+                        "[os.path.dirname(p)])))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",
     )

From 41a9da1833b1f55b4a3da0d427e9b569075f0cc7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Dec 2016 20:57:11 -0500
Subject: [PATCH 6358/8469] module_from_spec is only available on Python 3.5

---
 setuptools/namespaces.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index b6720609e1..9266860fc6 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -1,4 +1,5 @@
 import os
+import sys
 from distutils import log
 import itertools
 
@@ -42,7 +43,10 @@ def _get_target(self):
             "sys.modules.setdefault(%(pkg)r, "
                 "importlib.util.module_from_spec("
                     "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
-                        "[os.path.dirname(p)])))",
+                        "[os.path.dirname(p)])))"
+        if sys.version_info >= (3, 5) else
+        "m = not ie and not pep420 and "
+            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",
     )

From 17f72f5bc7031accc037b377ced5a0b411520bfb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Dec 2016 21:24:21 -0500
Subject: [PATCH 6359/8469] Always check at run time as some builds share files
 across Python versions.

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

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 9266860fc6..2399dae556 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -37,15 +37,15 @@ def _get_target(self):
     _nspkg_tmpl = (
         "import sys, types, os, importlib.util, importlib.machinery",
         "pep420 = sys.version_info > (3, 3)",
+        "has_mfs = sys.version_info > (3, 5)",
         "p = os.path.join(%(root)s, *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",
-        "m = not ie and not pep420 and "
+        "m = not ie and not pep420 and has_mfs and "
             "sys.modules.setdefault(%(pkg)r, "
                 "importlib.util.module_from_spec("
                     "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
-                        "[os.path.dirname(p)])))"
-        if sys.version_info >= (3, 5) else
-        "m = not ie and not pep420 and "
+                        "[os.path.dirname(p)])))",
+        "m = not ie and not pep420 and not has_mfs and "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From 27b7d4e47a4d80f5f377cefb87f91aa0e0110246 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 7 Dec 2016 21:38:16 -0500
Subject: [PATCH 6360/8469] Only rely on pep420 for Python 3.3 and 3.4 where
 method_from_spec isn't available.

---
 setuptools/namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 2399dae556..ce16286faf 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -36,7 +36,7 @@ def _get_target(self):
 
     _nspkg_tmpl = (
         "import sys, types, os, importlib.util, importlib.machinery",
-        "pep420 = sys.version_info > (3, 3)",
+        "pep420 = (3, 3) < sys.version_info < (3, 5)",
         "has_mfs = sys.version_info > (3, 5)",
         "p = os.path.join(%(root)s, *%(pth)r)",
         "ie = os.path.exists(os.path.join(p,'__init__.py'))",

From e1c0fa4e8358ce25ff9c3678c4f8261339f1896f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Dec 2016 09:53:50 -0500
Subject: [PATCH 6361/8469] Update changelog. Ref #873.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d100bdcfa5..e442e286cb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v30.2.1
+-------
+
+* #850: In test command, invoke unittest.main with
+  indication not to exit the process.
+
 v30.2.0
 -------
 

From 17f752d3be0b2f89b405976364653f081f522fb3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Dec 2016 09:54:03 -0500
Subject: [PATCH 6362/8469] =?UTF-8?q?Bump=20version:=2030.2.0=20=E2=86=92?=
 =?UTF-8?q?=2030.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b234d0bd4a..f101a990a4 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.2.0
+current_version = 30.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index e088928cdf..a12d898486 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.2.0",
+    version="30.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 9c81a2f62b8d160d2a6c3b2d6595b849fdf60c52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Dec 2016 10:02:50 -0500
Subject: [PATCH 6363/8469] Update changelog; ref #862.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e442e286cb..248a52c6ac 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v30.3.0
+-------
+
+* #394 via #862: Added support for `declarative package
+  config in a setup.cfg file
+  <http://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files>`_.
+
 v30.2.1
 -------
 

From ac9997648d89131412eacbb198e2d3a7c97f69e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Dec 2016 10:05:07 -0500
Subject: [PATCH 6364/8469] =?UTF-8?q?Bump=20version:=2030.2.1=20=E2=86=92?=
 =?UTF-8?q?=2030.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f101a990a4..950924b179 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.2.1
+current_version = 30.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a12d898486..da2c6473b6 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.2.1",
+    version="30.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f14930e66601b462699c44384c482cd966f53b8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 9 Dec 2016 08:16:33 -0500
Subject: [PATCH 6365/8469] Drop support for Python 2.6, removing lots of
 compatibility code for a leaner, cleaner codebase. Fixes #878.

---
 .travis.yml                           |  1 -
 CHANGES.rst                           |  6 ++++++
 README.rst                            |  4 +---
 docs/easy_install.txt                 | 12 +++++------
 docs/formats.txt                      |  2 +-
 docs/pkg_resources.txt                | 18 +++-------------
 docs/setuptools.txt                   |  2 +-
 pkg_resources/__init__.py             | 24 ++-------------------
 pkg_resources/api_tests.txt           |  4 ++--
 pkg_resources/tests/test_resources.py | 28 +++++++++---------------
 setup.py                              |  3 +--
 setuptools/archive_util.py            |  4 ++--
 setuptools/command/egg_info.py        |  4 +---
 setuptools/command/sdist.py           |  7 ------
 setuptools/command/test.py            |  7 +++---
 setuptools/config.py                  |  2 +-
 setuptools/monkey.py                  |  2 +-
 setuptools/package_index.py           |  3 +--
 setuptools/py26compat.py              | 31 ---------------------------
 setuptools/py31compat.py              | 15 -------------
 setuptools/sandbox.py                 |  4 ----
 setuptools/tests/py26compat.py        | 16 --------------
 setuptools/tests/test_easy_install.py |  7 +++---
 setuptools/tests/test_egg_info.py     |  8 -------
 24 files changed, 44 insertions(+), 170 deletions(-)
 delete mode 100644 setuptools/py26compat.py
 delete mode 100644 setuptools/tests/py26compat.py

diff --git a/.travis.yml b/.travis.yml
index 2f9b6a7a06..9277af80d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.3
   - 3.4
diff --git a/CHANGES.rst b/CHANGES.rst
index 248a52c6ac..50bdd3ab18 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v31.0.0
+-------
+
+* #878: Drop support for Python 2.6. Python 2.6 users should
+  rely on 'setuptools < 31dev'.
+
 v30.3.0
 -------
 
diff --git a/README.rst b/README.rst
index 2cf762d7d6..85b1a9932b 100755
--- a/README.rst
+++ b/README.rst
@@ -17,9 +17,7 @@ The recommended way to bootstrap setuptools on any system is to download
 operating systems have different recommended techniques to accomplish this
 basic routine, so below are some examples to get you started.
 
-Setuptools requires Python 2.6 or later. To install setuptools
-on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
-<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
+Setuptools requires Python 3.3 or later (or Python 2.7).
 
 The link provided to ez_setup.py is a bookmark to bootstrap script for the
 latest known stable release.
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index bd9f0e863d..56b1667226 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
-You will need at least Python 2.6.  An ``easy_install`` script will be
+You will need at least Python 3.3 or 2.7.  An ``easy_install`` script will be
 installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
@@ -305,8 +305,7 @@ Regardless of the technique used, the script(s) will be installed to a Scripts
 directory (by default in the Python installation directory). It is recommended
 for EasyInstall that you ensure this directory is in the PATH environment
 variable. The easiest way to ensure the Scripts directory is in the PATH is
-to run ``Tools\Scripts\win_add2path.py`` from the Python directory (requires
-Python 2.6 or later).
+to run ``Tools\Scripts\win_add2path.py`` from the Python directory.
 
 Note that instead of changing your ``PATH`` to include the Python scripts
 directory, you can also retarget the installation location for scripts so they
@@ -987,21 +986,20 @@ The following section lists only the easiest and most relevant approaches [1]_.
 
 `Use "virtualenv"`_
 
-.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_ in Python 2.6.
+.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_.
 
 .. _PEP-370: http://www.python.org/dev/peps/pep-0370/
 
 
 Use the "--user" option
 ~~~~~~~~~~~~~~~~~~~~~~~
-With Python 2.6 came the User scheme for installation, which means that all
-python distributions support an alternative install location that is specific to a user [2]_ [3]_.
+Python provides a User scheme for installation, which means that all
+python distributions support an alternative install location that is specific to a user [3]_.
 The Default location for each OS is explained in the python documentation
 for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
 specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
 This approach serves the need to have a user-specific stash of packages.
 
-.. [2] Prior to Python2.6, Mac OS X offered a form of the User scheme. That is now subsumed into the User scheme introduced in Python 2.6.
 .. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
 
 Use the "--user" option and customize "PYTHONUSERBASE"
diff --git a/docs/formats.txt b/docs/formats.txt
index 9e6fe72787..a182eb99fc 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -110,7 +110,7 @@ the need to create a directory just to store one file.  This option is
 other metadata.  (In fact, setuptools itself never generates
 ``.egg-info`` files, either; the support for using files was added so
 that the requirement could easily be satisfied by other tools, such
-as the distutils in Python 2.5).
+as distutils).
 
 In addition to the ``PKG-INFO`` file, an egg's metadata directory may
 also include files and directories representing various forms of
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index e8412b3371..c504412d8b 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -622,8 +622,8 @@ Requirements Parsing
     The "markers" in a requirement are used to specify when a requirement
     should be installed -- the requirement will be installed if the marker
     evaluates as true in the current environment. For example, specifying
-    ``argparse;python_version<"2.7"`` will not install in an Python 2.7 or 3.3
-    environment, but will in a Python 2.6 environment.
+    ``argparse;python_version<"3.0"`` will not install in an Python 3
+    environment, but will in a Python 2 environment.
 
 ``Requirement`` Methods and Attributes
 --------------------------------------
@@ -1660,19 +1660,7 @@ PEP 302 Utilities
 -----------------
 
 ``get_importer(path_item)``
-    Retrieve a PEP 302 "importer" for the given path item (which need not
-    actually be on ``sys.path``).  This routine simulates the PEP 302 protocol
-    for obtaining an "importer" object.  It first checks for an importer for
-    the path item in ``sys.path_importer_cache``, and if not found it calls
-    each of the ``sys.path_hooks`` and caches the result if a good importer is
-    found.  If no importer is found, this routine returns an ``ImpWrapper``
-    instance that wraps the builtin import machinery as a PEP 302-compliant
-    "importer" object.  This ``ImpWrapper`` is *not* cached; instead a new
-    instance is returned each time.
-
-    (Note: When run under Python 2.5, this function is simply an alias for
-    ``pkgutil.get_importer()``, and instead of ``pkg_resources.ImpWrapper``
-    instances, it may return ``pkgutil.ImpImporter`` instances.)
+    A deprecated alias for ``pkgutil.get_importer()``
 
 
 File/Path Utilities
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 77de255b90..1b0be77d8e 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -3,7 +3,7 @@ Building and Distributing Packages with Setuptools
 ==================================================
 
 ``Setuptools`` is a collection of enhancements to the Python ``distutils``
-(for Python 2.6 and up) that allow developers to more easily build and
+that allow developers to more easily build and
 distribute Python packages, especially ones that have dependencies on other
 packages.
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 92503288e7..d8000b001a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1611,7 +1611,7 @@ def build(cls, path):
         Use a platform-specific path separator (os.sep) for the path keys
         for compatibility with pypy on Windows.
         """
-        with ContextualZipFile(path) as zfile:
+        with zipfile.ZipFile(path) as zfile:
             items = (
                 (
                     name.replace('/', os.sep),
@@ -1644,26 +1644,6 @@ def load(self, path):
         return self[path].manifest
 
 
-class ContextualZipFile(zipfile.ZipFile):
-    """
-    Supplement ZipFile class to support context manager for Python 2.6
-    """
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.close()
-
-    def __new__(cls, *args, **kwargs):
-        """
-        Construct a ZipFile or ContextualZipFile as appropriate
-        """
-        if hasattr(zipfile.ZipFile, '__exit__'):
-            return zipfile.ZipFile(*args, **kwargs)
-        return super(ContextualZipFile, cls).__new__(cls)
-
-
 class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 
@@ -1861,7 +1841,7 @@ def get_metadata(self, name):
         return metadata
 
     def _warn_on_replacement(self, metadata):
-        # Python 2.6 and 3.2 compat for: replacement_char = '�'
+        # Python 2.7 compat for: replacement_char = '�'
         replacement_char = b'\xef\xbf\xbd'.decode('utf-8')
         if replacement_char in metadata:
             tmpl = "{self.path} could not be properly decoded in UTF-8"
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 4fbd3d235d..0a75170e4f 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -385,10 +385,10 @@ Environment Markers
     >>> em("sys_platform=='win32'") == (sys.platform=='win32')
     True
 
-    >>> em("python_version >= '2.6'")
+    >>> em("python_version >= '2.7'")
     True
 
-    >>> em("python_version > '2.5'")
+    >>> em("python_version > '2.6'")
     True
 
     >>> im("implementation_name=='cpython'")
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 00ca74262a..8223963ced 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -206,12 +206,10 @@ def test_marker_evaluation_with_extras(self):
         """Extras are also evaluated as markers at resolution time."""
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
-        # Metadata needs to be native strings due to cStringIO behaviour in
-        # 2.6, so use str().
         Foo = Distribution.from_filename(
             "/foo_dir/Foo-1.2.dist-info",
-            metadata=Metadata(("METADATA", str("Provides-Extra: baz\n"
-                               "Requires-Dist: quux; extra=='baz'")))
+            metadata=Metadata(("METADATA", "Provides-Extra: baz\n"
+                               "Requires-Dist: quux; extra=='baz'"))
         )
         ad.add(Foo)
         assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo]
@@ -224,12 +222,10 @@ def test_marker_evaluation_with_extras_normlized(self):
         """Extras are also evaluated as markers at resolution time."""
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
-        # Metadata needs to be native strings due to cStringIO behaviour in
-        # 2.6, so use str().
         Foo = Distribution.from_filename(
             "/foo_dir/Foo-1.2.dist-info",
-            metadata=Metadata(("METADATA", str("Provides-Extra: baz-lightyear\n"
-                               "Requires-Dist: quux; extra=='baz-lightyear'")))
+            metadata=Metadata(("METADATA", "Provides-Extra: baz-lightyear\n"
+                               "Requires-Dist: quux; extra=='baz-lightyear'"))
         )
         ad.add(Foo)
         assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo]
@@ -241,14 +237,12 @@ def test_marker_evaluation_with_extras_normlized(self):
     def test_marker_evaluation_with_multiple_extras(self):
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
-        # Metadata needs to be native strings due to cStringIO behaviour in
-        # 2.6, so use str().
         Foo = Distribution.from_filename(
             "/foo_dir/Foo-1.2.dist-info",
-            metadata=Metadata(("METADATA", str("Provides-Extra: baz\n"
+            metadata=Metadata(("METADATA", "Provides-Extra: baz\n"
                                "Requires-Dist: quux; extra=='baz'\n"
                                "Provides-Extra: bar\n"
-                               "Requires-Dist: fred; extra=='bar'\n")))
+                               "Requires-Dist: fred; extra=='bar'\n"))
         )
         ad.add(Foo)
         quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info")
@@ -261,22 +255,20 @@ def test_marker_evaluation_with_multiple_extras(self):
     def test_marker_evaluation_with_extras_loop(self):
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])
-        # Metadata needs to be native strings due to cStringIO behaviour in
-        # 2.6, so use str().
         a = Distribution.from_filename(
             "/foo_dir/a-0.2.dist-info",
-            metadata=Metadata(("METADATA", str("Requires-Dist: c[a]")))
+            metadata=Metadata(("METADATA", "Requires-Dist: c[a]"))
         )
         b = Distribution.from_filename(
             "/foo_dir/b-0.3.dist-info",
-            metadata=Metadata(("METADATA", str("Requires-Dist: c[b]")))
+            metadata=Metadata(("METADATA", "Requires-Dist: c[b]"))
         )
         c = Distribution.from_filename(
             "/foo_dir/c-1.0.dist-info",
-            metadata=Metadata(("METADATA", str("Provides-Extra: a\n"
+            metadata=Metadata(("METADATA", "Provides-Extra: a\n"
                                "Requires-Dist: b;extra=='a'\n"
                                "Provides-Extra: b\n"
-                               "Requires-Dist: foo;extra=='b'")))
+                               "Requires-Dist: foo;extra=='b'"))
         )
         foo = Distribution.from_filename("/foo_dir/foo-0.1.dist-info")
         for dist in (a, b, c, foo):
diff --git a/setup.py b/setup.py
index da2c6473b6..5b2e8a5b3e 100755
--- a/setup.py
+++ b/setup.py
@@ -145,7 +145,6 @@ def pypi_link(pkg_filename):
         Intended Audience :: Developers
         License :: OSI Approved :: MIT License
         Operating System :: OS Independent
-        Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.3
@@ -156,7 +155,7 @@ def pypi_link(pkg_filename):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
-    python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2016.9.26",
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index cc82b3da36..81436044d9 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -8,7 +8,7 @@
 import contextlib
 from distutils.errors import DistutilsError
 
-from pkg_resources import ensure_directory, ContextualZipFile
+from pkg_resources import ensure_directory
 
 __all__ = [
     "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
@@ -98,7 +98,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
     if not zipfile.is_zipfile(filename):
         raise UnrecognizedFormat("%s is not a zip file" % (filename,))
 
-    with ContextualZipFile(filename) as z:
+    with zipfile.ZipFile(filename) as z:
         for info in z.infolist():
             name = info.filename
 
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8a06e496d7..40cea9bf44 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -158,9 +158,7 @@ def save_version_info(self, filename):
         build tag. Install these keys in a deterministic order
         to avoid arbitrary reordering on subsequent builds.
         """
-        # python 2.6 compatibility
-        odict = getattr(collections, 'OrderedDict', dict)
-        egg_info = odict()
+        egg_info = collections.OrderedDict()
         # follow the order these keys would have been added
         # when PYTHONHASHSEED=0
         egg_info['tag_build'] = self.tags()
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 84e29a1b7d..39e29d7316 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -50,13 +50,6 @@ def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
 
-        # Call check_metadata only if no 'check' command
-        # (distutils <= 2.6)
-        import distutils.command
-
-        if 'check' not in distutils.command.__all__:
-            self.check_metadata()
-
         self.make_distribution()
 
         dist_files = getattr(self.distribution, 'dist_files', [])
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 9a5117be00..9931565be6 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,6 +3,7 @@
 import sys
 import contextlib
 import itertools
+import unittest
 from distutils.errors import DistutilsOptionError
 from unittest import TestLoader
 
@@ -13,7 +14,6 @@
                            working_set, _namespace_packages,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
-from setuptools.py31compat import unittest_main
 
 
 class ScanningLoader(TestLoader):
@@ -225,12 +225,11 @@ def run_tests(self):
                         del_modules.append(name)
                 list(map(sys.modules.__delitem__, del_modules))
 
-        exit_kwarg = {} if sys.version_info < (2, 7) else {"exit": False}
-        unittest_main(
+        unittest.main(
             None, None, self._argv,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
-            **exit_kwarg
+            exit=False,
         )
 
     @property
diff --git a/setuptools/config.py b/setuptools/config.py
index 889dc683d3..eb19c895a7 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -4,9 +4,9 @@
 import sys
 from collections import defaultdict
 from functools import partial
+from importlib import import_module
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
-from setuptools.py26compat import import_module
 from setuptools.extern.six import string_types
 
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index aabc280f6b..09f208b189 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -7,8 +7,8 @@
 import platform
 import types
 import functools
+from importlib import import_module
 
-from .py26compat import import_module
 from setuptools.extern import six
 
 import setuptools
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d80d43bc79..d2f27ca6a0 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -27,7 +27,6 @@
 from distutils import log
 from distutils.errors import DistutilsError
 from fnmatch import translate
-from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
@@ -707,7 +706,7 @@ def _download_to(self, url, filename):
         fp, info = None, None
         try:
             checker = HashChecker.from_url(url)
-            fp = self.open_url(strip_fragment(url))
+            fp = self.open_url(url)
             if isinstance(fp, urllib.error.HTTPError):
                 raise DistutilsError(
                     "Can't download %s: %s %s" % (url, fp.code, fp.msg)
diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
deleted file mode 100644
index 4d3add8ca8..0000000000
--- a/setuptools/py26compat.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-Compatibility Support for Python 2.6 and earlier
-"""
-
-import sys
-
-try:
-    from urllib.parse import splittag
-except ImportError:
-    from urllib import splittag
-
-
-def strip_fragment(url):
-    """
-    In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
-    later was patched to disregard the fragment when making URL requests.
-    Do the same for Python 2.6 and earlier.
-    """
-    url, fragment = splittag(url)
-    return url
-
-
-if sys.version_info >= (2, 7):
-    strip_fragment = lambda x: x
-
-try:
-    from importlib import import_module
-except ImportError:
-
-    def import_module(module_name):
-        return __import__(module_name, fromlist=['__name__'])
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 44b025d4b2..4ea953201f 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -1,6 +1,3 @@
-import sys
-import unittest
-
 __all__ = ['get_config_vars', 'get_path']
 
 try:
@@ -42,15 +39,3 @@ def __exit__(self, exctype, excvalue, exctrace):
             except OSError:  # removal errors are not the only possible
                 pass
             self.name = None
-
-
-unittest_main = unittest.main
-
-_PY31 = (3, 1) <= sys.version_info[:2] < (3, 2)
-if _PY31:
-    # on Python 3.1, translate testRunner==None to TextTestRunner
-    # for compatibility with Python 2.6, 2.7, and 3.2+
-    def unittest_main(*args, **kwargs):
-        if 'testRunner' in kwargs and kwargs['testRunner'] is None:
-            kwargs['testRunner'] = unittest.TextTestRunner
-        return unittest.main(*args, **kwargs)
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index d882d71539..640691d853 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -37,10 +37,6 @@ def _execfile(filename, globals, locals=None):
     mode = 'rb'
     with open(filename, mode) as stream:
         script = stream.read()
-    # compile() function in Python 2.6 and 3.1 requires LF line endings.
-    if sys.version_info[:2] < (2, 7) or sys.version_info[:2] >= (3, 0) and sys.version_info[:2] < (3, 2):
-        script = script.replace(b'\r\n', b'\n')
-        script = script.replace(b'\r', b'\n')
     if locals is None:
         locals = globals
     code = compile(script, filename, 'exec')
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
deleted file mode 100644
index 18cece051c..0000000000
--- a/setuptools/tests/py26compat.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import sys
-import tarfile
-import contextlib
-
-
-def _tarfile_open_ex(*args, **kwargs):
-    """
-    Extend result as a context manager.
-    """
-    return contextlib.closing(tarfile.open(*args, **kwargs))
-
-
-if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
-    tarfile_open = _tarfile_open_ex
-else:
-    tarfile_open = tarfile.open
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 209e6b78ff..6f9bc8e103 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -35,7 +35,6 @@
 import setuptools.tests.server
 import pkg_resources
 
-from .py26compat import tarfile_open
 from . import contexts
 from .textwrap import DALS
 
@@ -428,7 +427,7 @@ def test_setup_requires_override_nspkg(self):
                 # extracted path to sys.path so foo.bar v0.1 is importable
                 foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1')
                 os.mkdir(foobar_1_dir)
-                with tarfile_open(foobar_1_archive) as tf:
+                with tarfile.open(foobar_1_archive) as tf:
                     tf.extractall(foobar_1_dir)
                 sys.path.insert(1, foobar_1_dir)
 
@@ -526,7 +525,7 @@ def make_sdist(dist_path, files):
     listed in ``files`` as ``(filename, content)`` tuples.
     """
 
-    with tarfile_open(dist_path, 'w:gz') as dist:
+    with tarfile.open(dist_path, 'w:gz') as dist:
         for filename, content in files:
             file_bytes = io.BytesIO(content.encode('utf-8'))
             file_info = tarfile.TarInfo(name=filename)
@@ -580,7 +579,7 @@ def make_trivial_sdist(dist_path, setup_py):
     setup_py_file = tarfile.TarInfo(name='setup.py')
     setup_py_bytes = io.BytesIO(setup_py.encode('utf-8'))
     setup_py_file.size = len(setup_py_bytes.getvalue())
-    with tarfile_open(dist_path, 'w:gz') as dist:
+    with tarfile.open(dist_path, 'w:gz') as dist:
         dist.addfile(setup_py_file, fileobj=setup_py_bytes)
 
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 75ae18dffd..7bf6b68a93 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -2,7 +2,6 @@
 import glob
 import re
 import stat
-import sys
 
 from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
@@ -63,12 +62,6 @@ def env(self):
             })
             yield env
 
-    dict_order_fails = pytest.mark.skipif(
-        sys.version_info < (2,7),
-        reason="Intermittent failures on Python 2.6",
-    )
-
-    @dict_order_fails
     def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         """
         When the egg_info section is empty or not present, running
@@ -104,7 +97,6 @@ def _validate_content_order(content, expected):
         flags = re.MULTILINE | re.DOTALL
         assert re.search(pattern, content, flags)
 
-    @dict_order_fails
     def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         """
         When running save_version_info on an existing setup.cfg

From 56dea7f0334f60603d4ca6a884ca523fe3389ef3 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 12:06:26 +0700
Subject: [PATCH 6366/8469] `read_configuration()` now accepts
 `ignore_option_errors`.

---
 docs/setuptools.txt             |  8 ++++++-
 setuptools/config.py            | 40 +++++++++++++++++++++++++++------
 setuptools/tests/test_config.py | 16 +++++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 77de255b90..1721edaf36 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2543,7 +2543,7 @@ zip_safe                 bool
 setup_requires           list-semi
 install_requires         list-semi
 extras_require           section
-entry_points             file, section
+entry_points             file:, section
 use_2to3                 bool
 use_2to3_fixers          list-comma
 use_2to3_exclude_fixers  list-comma
@@ -2582,6 +2582,12 @@ in the first argument. To include values from other configuration files
 which could be in various places set `find_others` function argument
 to ``True``.
 
+If you have only a configuration file but not the whole package you can still
+try to get data out of it with the help of `ignore_option_errors` function
+argument. When it is set to ``True`` all options with errors possibly produced
+by directives, such as ``attr:`` and others will be silently ignored.
+As a consequence the resulting dictionary will include no such options.
+
 
 --------------------------------
 Extending and Reusing Setuptools
diff --git a/setuptools/config.py b/setuptools/config.py
index 889dc683d3..007d24e284 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -10,7 +10,8 @@
 from setuptools.extern.six import string_types
 
 
-def read_configuration(filepath, find_others=False):
+def read_configuration(
+        filepath, find_others=False, ignore_option_errors=False):
     """Read given configuration file and returns options from it as a dict.
 
     :param str|unicode filepath: Path to configuration file
@@ -19,6 +20,11 @@ def read_configuration(filepath, find_others=False):
     :param bool find_others: Whether to search for other configuration files
         which could be on in various places.
 
+    :param bool ignore_option_errors: Whether to silently ignore
+        options, values of which could not be resolved (e.g. due to exceptions
+        in directives such as file:, attr:, etc.).
+        If False exceptions are propagated as expected.
+
     :rtype: dict
     """
     from setuptools.dist import Distribution, _Distribution
@@ -40,7 +46,9 @@ def read_configuration(filepath, find_others=False):
 
     _Distribution.parse_config_files(dist, filenames=filenames)
 
-    handlers = parse_configuration(dist, dist.command_options)
+    handlers = parse_configuration(
+        dist, dist.command_options,
+        ignore_option_errors=ignore_option_errors)
 
     os.chdir(current_directory)
 
@@ -76,7 +84,8 @@ def configuration_to_dict(handlers):
     return config_dict
 
 
-def parse_configuration(distribution, command_options):
+def parse_configuration(
+        distribution, command_options, ignore_option_errors=False):
     """Performs additional parsing of configuration options
     for a distribution.
 
@@ -84,12 +93,18 @@ def parse_configuration(distribution, command_options):
 
     :param Distribution distribution:
     :param dict command_options:
+    :param bool ignore_option_errors: Whether to silently ignore
+        options, values of which could not be resolved (e.g. due to exceptions
+        in directives such as file:, attr:, etc.).
+        If False exceptions are propagated as expected.
     :rtype: list
     """
-    meta = ConfigMetadataHandler(distribution.metadata, command_options)
+    meta = ConfigMetadataHandler(
+        distribution.metadata, command_options, ignore_option_errors)
     meta.parse()
 
-    options = ConfigOptionsHandler(distribution, command_options)
+    options = ConfigOptionsHandler(
+        distribution, command_options, ignore_option_errors)
     options.parse()
 
     return [meta, options]
@@ -111,7 +126,7 @@ class ConfigHandler(object):
 
     """
 
-    def __init__(self, target_obj, options):
+    def __init__(self, target_obj, options, ignore_option_errors=False):
         sections = {}
 
         section_prefix = self.section_prefix
@@ -122,6 +137,7 @@ def __init__(self, target_obj, options):
             section_name = section_name.replace(section_prefix, '').strip('.')
             sections[section_name] = section_options
 
+        self.ignore_option_errors = ignore_option_errors
         self.target_obj = target_obj
         self.sections = sections
         self.set_options = []
@@ -148,9 +164,19 @@ def __setitem__(self, option_name, value):
             # Already inhabited. Skipping.
             return
 
+        skip_option = False
         parser = self.parsers.get(option_name)
         if parser:
-            value = parser(value)
+            try:
+                value = parser(value)
+
+            except Exception:
+                skip_option = True
+                if not self.ignore_option_errors:
+                    raise
+
+        if skip_option:
+            return
 
         setter = getattr(target_obj, 'set_%s' % option_name, None)
         if setter is None:
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 2148772095..aaf78aefed 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -73,6 +73,22 @@ def test_no_config(self, tmpdir):
         with pytest.raises(DistutilsFileError):
             read_configuration('%s' % tmpdir.join('setup.cfg'))
 
+    def test_ignore_errors(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = attr: none.VERSION\n'
+            'keywords = one, two\n'
+        )
+        with pytest.raises(ImportError):
+            read_configuration('%s' % tmpdir.join('setup.cfg'))
+
+        config_dict = read_configuration(
+            '%s' % tmpdir.join('setup.cfg'), ignore_option_errors=True)
+
+        assert config_dict['metadata']['keywords'] == ['one', 'two']
+        assert 'version' not in config_dict['metadata']
+
 
 class TestMetadata:
 

From b73891f82d5f1a353a2ad0090b1f5edece921508 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 12:30:24 +0700
Subject: [PATCH 6367/8469] config tests refactored.

---
 setuptools/tests/test_config.py | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index aaf78aefed..35bdbad108 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -9,6 +9,13 @@ class ErrConfigHandler(ConfigHandler):
     """Erroneous handler. Fails to implement required methods."""
 
 
+def make_package_dir(name, base_dir):
+    dir_package = base_dir.mkdir(name)
+    init_file = dir_package.join('__init__.py')
+    init_file.write('')
+    return dir_package, init_file
+
+
 def fake_env(tmpdir, setup_cfg, setup_py=None):
 
     if setup_py is None:
@@ -18,11 +25,12 @@ def fake_env(tmpdir, setup_cfg, setup_py=None):
         )
 
     tmpdir.join('setup.py').write(setup_py)
-    tmpdir.join('setup.cfg').write(setup_cfg)
+    config = tmpdir.join('setup.cfg')
+    config.write(setup_cfg)
+
+    package_dir, init_file = make_package_dir('fake_package', tmpdir)
 
-    package_name = 'fake_package'
-    dir_package = tmpdir.mkdir(package_name)
-    dir_package.join('__init__.py').write(
+    init_file.write(
         'VERSION = (1, 2, 3)\n'
         '\n'
         'VERSION_MAJOR = 1'
@@ -31,6 +39,7 @@ def fake_env(tmpdir, setup_cfg, setup_py=None):
         '    return [3, 4, 5, "dev"]\n'
         '\n'
     )
+    return package_dir, config
 
 
 @contextlib.contextmanager
@@ -55,7 +64,7 @@ def test_parsers_implemented():
 class TestConfigurationReader:
 
     def test_basic(self, tmpdir):
-        fake_env(
+        _, config = fake_env(
             tmpdir,
             '[metadata]\n'
             'version = 10.1.1\n'
@@ -64,7 +73,7 @@ def test_basic(self, tmpdir):
             '[options]\n'
             'scripts = bin/a.py, bin/b.py\n'
         )
-        config_dict = read_configuration('%s' % tmpdir.join('setup.cfg'))
+        config_dict = read_configuration('%s' % config)
         assert config_dict['metadata']['version'] == '10.1.1'
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert config_dict['options']['scripts'] == ['bin/a.py', 'bin/b.py']
@@ -74,17 +83,17 @@ def test_no_config(self, tmpdir):
             read_configuration('%s' % tmpdir.join('setup.cfg'))
 
     def test_ignore_errors(self, tmpdir):
-        fake_env(
+        _, config = fake_env(
             tmpdir,
             '[metadata]\n'
             'version = attr: none.VERSION\n'
             'keywords = one, two\n'
         )
         with pytest.raises(ImportError):
-            read_configuration('%s' % tmpdir.join('setup.cfg'))
+            read_configuration('%s' % config)
 
         config_dict = read_configuration(
-            '%s' % tmpdir.join('setup.cfg'), ignore_option_errors=True)
+            '%s' % config, ignore_option_errors=True)
 
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert 'version' not in config_dict['metadata']
@@ -188,7 +197,7 @@ def test_multiline(self, tmpdir):
 
     def test_version(self, tmpdir):
 
-        fake_env(
+        _, config = fake_env(
             tmpdir,
             '[metadata]\n'
             'version = attr: fake_package.VERSION\n'
@@ -196,14 +205,14 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
-        tmpdir.join('setup.cfg').write(
+        config.write(
             '[metadata]\n'
             'version = attr: fake_package.get_version\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '3.4.5.dev'
 
-        tmpdir.join('setup.cfg').write(
+        config.write(
             '[metadata]\n'
             'version = attr: fake_package.VERSION_MAJOR\n'
         )
@@ -214,7 +223,7 @@ def test_version(self, tmpdir):
         subpack.join('__init__.py').write('')
         subpack.join('submodule.py').write('VERSION = (2016, 11, 26)')
 
-        tmpdir.join('setup.cfg').write(
+        config.write(
             '[metadata]\n'
             'version = attr: fake_package.subpackage.submodule.VERSION\n'
         )
@@ -250,7 +259,7 @@ def test_classifiers(self, tmpdir):
         ])
 
         # From file.
-        fake_env(
+        _, config = fake_env(
             tmpdir,
             '[metadata]\n'
             'classifiers = file: classifiers\n'
@@ -265,7 +274,7 @@ def test_classifiers(self, tmpdir):
             assert set(dist.metadata.classifiers) == expected
 
         # From section.
-        tmpdir.join('setup.cfg').write(
+        config.write(
             '[metadata.classifiers]\n'
             'Framework :: Django\n'
             'Programming Language :: Python :: 3.5\n'
@@ -454,7 +463,7 @@ def test_extras_require(self, tmpdir):
             }
 
     def test_entry_points(self, tmpdir):
-        fake_env(
+        _, config = fake_env(
             tmpdir,
             '[options.entry_points]\n'
             'group1 = point1 = pack.module:func, '
@@ -479,7 +488,7 @@ def test_entry_points(self, tmpdir):
         tmpdir.join('entry_points').write(expected)
 
         # From file.
-        tmpdir.join('setup.cfg').write(
+        config.write(
             '[options]\n'
             'entry_points = file: entry_points\n'
         )

From a262947e39e6125ee15d3752a2124acf0c62bda6 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 13:33:57 +0700
Subject: [PATCH 6368/8469] Implemented find() configuration support for
 `packages`.

---
 docs/setuptools.txt             | 20 ++++++++++++++---
 setuptools/config.py            | 33 ++++++++++++++++++++++++++--
 setuptools/tests/test_config.py | 38 +++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 1721edaf36..2f78b133de 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2448,6 +2448,11 @@ boilerplate code in some cases.
     pdf = ReportLab>=1.2; RXP
     rest = docutils>=0.3; pack ==1.1, ==1.3
 
+    [options.packages.find]
+    exclude =
+        src.subpackage1
+        src.subpackage2
+
 
 Metadata and options could be set in sections with the same names.
 
@@ -2486,13 +2491,13 @@ Type names used below:
 * ``list-semi`` - dangling list or semicolon-separated values string
 * ``bool`` -  ``True`` is 1, yes, true
 * ``dict`` - list-comma where keys from values are separated by =
+* ``section`` - values could be read from a dedicated (sub)section
 
 
 Special directives:
 
 * ``attr:`` - value could be read from module attribute
 * ``file:`` - value could be read from a file
-* ``section:`` - values could be read from a dedicated (sub)section
 
 
 .. note::
@@ -2529,8 +2534,10 @@ requires                              list-comma
 obsoletes                             list-comma
 =================  =================  =====
 
-**version** - ``attr:`` supports callables; supports iterables;
-unsupported types are casted using ``str()``.
+.. note::
+
+    **version** - ``attr:`` supports callables; supports iterables;
+    unsupported types are casted using ``str()``.
 
 
 Options
@@ -2560,6 +2567,13 @@ exclude_package_data     section
 namespace_packages       list-comma
 =======================  =====
 
+.. note::
+
+    **packages** - ``find:`` directive can be further configured
+    in a dedicated subsection `options.packages.find`. This subsection
+    accepts the same keys as `setuptools.find` function:
+    `where`, `include`, `exclude`.
+
 
 Configuration API
 =================
diff --git a/setuptools/config.py b/setuptools/config.py
index 007d24e284..743575f049 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -361,7 +361,10 @@ def parse(self):
                 method_postfix = '_%s' % section_name
 
             section_parser_method = getattr(
-                self, 'parse_section%s' % method_postfix, None)
+                self,
+                # Dots in section names are tranlsated into dunderscores.
+                ('parse_section%s' % method_postfix).replace('.', '__'),
+                None)
 
             if section_parser_method is None:
                 raise DistutilsOptionError(
@@ -481,8 +484,34 @@ def _parse_packages(self, value):
         if not value.startswith(find_directive):
             return self._parse_list(value)
 
+        # Read function arguments from a dedicated section.
+        find_kwargs = self.parse_section_packages__find(
+            self.sections.get('packages.find', {}))
+
         from setuptools import find_packages
-        return find_packages()
+
+        return find_packages(**find_kwargs)
+
+    def parse_section_packages__find(self, section_options):
+        """Parses `packages.find` configuration file section.
+
+        To be used in conjunction with _parse_packages().
+
+        :param dict section_options:
+        """
+        section_data = self._parse_section_to_dict(
+            section_options, self._parse_list)
+
+        valid_keys = ['where', 'include', 'exclude']
+
+        find_kwargs = dict(
+            [(k, v) for k, v in section_data.items() if k in valid_keys and v])
+
+        where = find_kwargs.get('where')
+        if where is not None:
+            find_kwargs['where'] = where[0]  # cast list to single val
+
+        return find_kwargs
 
     def parse_section_entry_points(self, section_options):
         """Parses `entry_points` configuration file section.
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 35bdbad108..08e398b3de 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -446,6 +446,44 @@ def test_packages(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.packages == ['fake_package']
 
+    def test_find_directive(self, tmpdir):
+        dir_package, config = fake_env(
+            tmpdir,
+            '[options]\n'
+            'packages = find:\n'
+        )
+
+        dir_sub_one, _ = make_package_dir('sub_one', dir_package)
+        dir_sub_two, _ = make_package_dir('sub_two', dir_package)
+
+        with get_dist(tmpdir) as dist:
+            assert dist.packages == [
+                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one']
+
+        config.write(
+            '[options]\n'
+            'packages = find:\n'
+            '\n'
+            '[options.packages.find]\n'
+            'where = .\n'
+            'include =\n'
+            '    fake_package.sub_one\n'
+            '    two\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.packages == ['fake_package.sub_one']
+
+        config.write(
+            '[options]\n'
+            'packages = find:\n'
+            '\n'
+            '[options.packages.find]\n'
+            'exclude =\n'
+            '    fake_package.sub_one\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.packages == ['fake_package',  'fake_package.sub_two']
+
     def test_extras_require(self, tmpdir):
         fake_env(
             tmpdir,

From f85a821b039a03eb0231e6bd0fc925a4e37f3911 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 13:48:03 +0700
Subject: [PATCH 6369/8469] Fixed test for `find()` results.

---
 setuptools/tests/test_config.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 08e398b3de..677ccf2c03 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -457,8 +457,9 @@ def test_find_directive(self, tmpdir):
         dir_sub_two, _ = make_package_dir('sub_two', dir_package)
 
         with get_dist(tmpdir) as dist:
-            assert dist.packages == [
-                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one']
+            assert set(dist.packages) == set([
+                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one'
+            ])
 
         config.write(
             '[options]\n'
@@ -482,7 +483,8 @@ def test_find_directive(self, tmpdir):
             '    fake_package.sub_one\n'
         )
         with get_dist(tmpdir) as dist:
-            assert dist.packages == ['fake_package',  'fake_package.sub_two']
+            assert set(dist.packages) == set(
+                ['fake_package',  'fake_package.sub_two'])
 
     def test_extras_require(self, tmpdir):
         fake_env(

From 35f3d1f37fdb137d5f5316058d49c96b9f28ca2d Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 15:23:49 +0700
Subject: [PATCH 6370/8469] `test_ignore_errors` side effect mitigated.

---
 setuptools/tests/test_config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 677ccf2c03..fa8d523b47 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -98,6 +98,8 @@ def test_ignore_errors(self, tmpdir):
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert 'version' not in config_dict['metadata']
 
+        config.remove()
+
 
 class TestMetadata:
 

From c471788dbccf4fcf669d141e6f1325c1b43b8b94 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 10 Dec 2016 22:24:01 +0700
Subject: [PATCH 6371/8469] Proper finalization for `read_configuration()`.

---
 setuptools/config.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 743575f049..d71ff028da 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -38,19 +38,21 @@ def read_configuration(
     current_directory = os.getcwd()
     os.chdir(os.path.dirname(filepath))
 
-    dist = Distribution()
+    try:
+        dist = Distribution()
 
-    filenames = dist.find_config_files() if find_others else []
-    if filepath not in filenames:
-        filenames.append(filepath)
+        filenames = dist.find_config_files() if find_others else []
+        if filepath not in filenames:
+            filenames.append(filepath)
 
-    _Distribution.parse_config_files(dist, filenames=filenames)
+        _Distribution.parse_config_files(dist, filenames=filenames)
 
-    handlers = parse_configuration(
-        dist, dist.command_options,
-        ignore_option_errors=ignore_option_errors)
+        handlers = parse_configuration(
+            dist, dist.command_options,
+            ignore_option_errors=ignore_option_errors)
 
-    os.chdir(current_directory)
+    finally:
+        os.chdir(current_directory)
 
     return configuration_to_dict(handlers)
 

From e9f06d225b9a58807e4fc6c9f3219a6c7b460d17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Dec 2016 11:34:19 -0500
Subject: [PATCH 6372/8469] Update changelog. Ref #879.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 248a52c6ac..a61ea855aa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v30.4.0
+-------
+
+* #879: For declarative config:
+  - read_configuration() now accepts ignore_option_errors argument. This allows scraping tools to read metadata without a need to download entire packages. E.g. we can gather some stats right from GitHub repos just by downloading setup.cfg.
+  - packages find: directive now supports fine tuning from a subsection. The same arguments as for find() are accepted.
+
 v30.3.0
 -------
 

From e48430161fd59169cbe38c372d79a9c16e041d39 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Dec 2016 11:34:29 -0500
Subject: [PATCH 6373/8469] =?UTF-8?q?Bump=20version:=2030.3.0=20=E2=86=92?=
 =?UTF-8?q?=2030.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 950924b179..08e51b5b22 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.3.0
+current_version = 30.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index da2c6473b6..d6dc048f8f 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.3.0",
+    version="30.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 1a273f3d9d3a110361a6db6db1afaf704a031acb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Dec 2016 11:40:04 -0500
Subject: [PATCH 6374/8469] Reformat changelog for better RST formatting

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index a61ea855aa..1efdb4982f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,9 @@ v30.4.0
 -------
 
 * #879: For declarative config:
+
   - read_configuration() now accepts ignore_option_errors argument. This allows scraping tools to read metadata without a need to download entire packages. E.g. we can gather some stats right from GitHub repos just by downloading setup.cfg.
+
   - packages find: directive now supports fine tuning from a subsection. The same arguments as for find() are accepted.
 
 v30.3.0

From 5c9406987aacf17d9c004aa1456797e0044306e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Dec 2016 14:20:23 -0500
Subject: [PATCH 6375/8469] Use py.test to launch pytest, rather than python -m
 test, preventing the empty path from being added to sys.path per
 pytest-dev/pytest#2104. Fixes #852. Also use 'usedevelop' as the
 setuptools.tests.fixtures aren't available in a standard install.

---
 conftest.py | 17 -----------------
 tox.ini     |  3 ++-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/conftest.py b/conftest.py
index 0da92be9ad..3cccfe1abd 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,6 +1,3 @@
-import os
-
-
 pytest_plugins = 'setuptools.tests.fixtures'
 
 
@@ -9,17 +6,3 @@ def pytest_addoption(parser):
         "--package_name", action="append", default=[],
         help="list of package_name to pass to test functions",
     )
-
-
-def pytest_configure():
-    _issue_852_workaround()
-
-
-def _issue_852_workaround():
-    """
-    Patch 'setuptools.__file__' with an absolute path
-    for forward compatibility with Python 3.
-    Workaround for https://github.com/pypa/setuptools/issues/852
-    """
-    setuptools = __import__('setuptools')
-    setuptools.__file__ = os.path.abspath(setuptools.__file__)
diff --git a/tox.ini b/tox.ini
index cfb682ee37..cae9c745c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,5 @@
 [testenv]
 deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=python -m pytest {posargs:-rsx}
+commands=py.test {posargs:-rsx}
+usedevelop=True

From 6070cc15ed234a71777747c4cdd55f228f3d7b90 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 15:58:49 -0500
Subject: [PATCH 6376/8469] Don't nullify module when has_mfs

---
 setuptools/namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 96aa20e773..69debe4beb 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -51,7 +51,7 @@ def _get_target(self):
                 "importlib.util.module_from_spec("
                     "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
                         "[os.path.dirname(p)])))",
-        "m = not has_mfs and "
+        "m = m or not has_mfs and "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From 8fa9a8640eb85e7250b8e3ca15124e74ce6014e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 16:02:14 -0500
Subject: [PATCH 6377/8469] Only import modules when they're expected to be
 present

---
 setuptools/namespaces.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 69debe4beb..0a889f224a 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -43,9 +43,11 @@ def _get_target(self):
         return self.target
 
     _nspkg_tmpl = (
-        "import sys, types, os, importlib.util, importlib.machinery",
+        "import sys, types, os",
         "has_mfs = sys.version_info > (3, 5)",
         "p = os.path.join(%(root)s, *%(pth)r)",
+        "importlib = has_mfs and __import__('importlib.util')",
+        "has_mfs and __import__('importlib.machinery')",
         "m = has_mfs and "
             "sys.modules.setdefault(%(pkg)r, "
                 "importlib.util.module_from_spec("

From 230ffaafd061b42f8674b6b6b75ed8133e8d6934 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 16:18:29 -0500
Subject: [PATCH 6378/8469] Expect failure on Python 3.4 and earlier as
 module_from_spec isn't available. Ref #250.

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

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 28c5e9de99..e7fa4ee629 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -11,8 +11,8 @@
 
 class TestNamespaces:
 
-    @pytest.mark.xfail(sys.version_info < (3, 3),
-        reason="Requires PEP 420")
+    @pytest.mark.xfail(sys.version_info < (3, 5),
+        reason="Requires importlib.util.module_from_spec")
     @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
         reason="https://github.com/pypa/setuptools/issues/851")
     def test_mixed_site_and_non_site(self, tmpdir):

From 6f5dc38012824dc3d104356d023ec3c959bbb586 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 16:41:11 -0500
Subject: [PATCH 6379/8469] Update changelog. Fixes #250. Fixes #870. Ref #805.
 Ref pypa/pip#1924. Ref #845.

---
 CHANGES.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1efdb4982f..cbb913fb79 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v31.0.0
+-------
+
+* #250: Install '-nspkg.pth' files for packages installed
+  with 'setup.py develop'. These .pth files allow
+  namespace packages installed by pip or develop to
+  co-mingle. This change required the removal of the
+  change for #805, introduced in 28.3.0 and implicated
+  in #870, but means that namespace packages not in a
+  site packages directory will no longer work on Python
+  earlier than 3.5, whereas before they would work on
+  Python not earlier than 3.3.
+
 v30.4.0
 -------
 

From fe695061d3509bf7396d5c691342e6c6d4b6c3b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 18:31:09 -0500
Subject: [PATCH 6380/8469] =?UTF-8?q?Bump=20version:=2030.4.0=20=E2=86=92?=
 =?UTF-8?q?=2031.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 08e51b5b22..486ee0d13b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 30.4.0
+current_version = 31.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d6dc048f8f..dc846acf14 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="30.4.0",
+    version="31.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a5b81d8ea0b6aeba1a59e77d4d3783db4b9e23c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 18:42:28 -0500
Subject: [PATCH 6381/8469] Add final intended changes for changelog entry.

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cbb913fb79..1638c40704 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ v31.0.0
   with 'setup.py develop'. These .pth files allow
   namespace packages installed by pip or develop to
   co-mingle. This change required the removal of the
-  change for #805, introduced in 28.3.0 and implicated
+  change for #805 and pip #1924, introduced in 28.3.0 and implicated
   in #870, but means that namespace packages not in a
   site packages directory will no longer work on Python
   earlier than 3.5, whereas before they would work on

From 8c055ff64792c23e80f85f4c127d003fd2ae4b7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Dec 2016 20:48:07 -0500
Subject: [PATCH 6382/8469] Mark another test to fail. Ref #851

---
 setuptools/tests/test_develop.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index e0227453be..d1e40929e5 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -136,6 +136,8 @@ def install_develop(src_dir, target):
         with src_dir.as_cwd():
             subprocess.check_call(develop_cmd, env=env)
 
+    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
+        reason="https://github.com/pypa/setuptools/issues/851")
     def test_namespace_package_importable(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed

From 357b7c659b6893dec4145d492084217b9317bca1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 12 Dec 2016 19:45:51 -0500
Subject: [PATCH 6383/8469] Add test attempting to capture failure, but it
 passes. Ref #885.

---
 setuptools/tests/test_namespaces.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index e7fa4ee629..2aefb4876a 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -50,3 +50,26 @@ def test_mixed_site_and_non_site(self, tmpdir):
         ]
         env = dict(PYTHONPATH=python_path)
         subprocess.check_call(try_import, env=env)
+
+    def test_pkg_resources_import(self, tmpdir):
+        """
+        Ensure that a namespace package doesn't break on import
+        of pkg_resources.
+        """
+        pkg = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
+        target = tmpdir / 'packages'
+        target.mkdir()
+        env = dict(PYTHONPATH=str(target))
+        install_cmd = [
+            sys.executable,
+            '-m', 'easy_install',
+            '-d', str(target),
+            str(pkg),
+        ]
+        subprocess.check_call(install_cmd, env=env)
+        namespaces.make_site_dir(target)
+        try_import = [
+            sys.executable,
+            '-c', 'import pkg_resources',
+        ]
+        subprocess.check_call(try_import, env=env)

From d9c9284e19ce475c2366b279dd4db82a2751a571 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 12 Dec 2016 21:14:34 -0500
Subject: [PATCH 6384/8469] Additionally, in test_develop, ensure that
 pkg_resources is importable. Ref #885.

---
 setuptools/tests/test_develop.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index d1e40929e5..430a07e6c2 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -165,3 +165,9 @@ def test_namespace_package_importable(self, tmpdir):
         env = dict(PYTHONPATH=str(target))
         subprocess.check_call(try_import, env=env)
 
+        # additionally ensure that pkg_resources import works
+        pkg_resources_imp = [
+            sys.executable,
+            '-c', 'import pkg_resources',
+        ]
+        subprocess.check_call(pkg_resources_imp, env=env)

From f63a2b9c7a165de24a4a5b4b8c88a298d45dddad Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 13 Dec 2016 09:06:24 -0800
Subject: [PATCH 6385/8469] Issue #26071: Fixes preprocessor definition and
 rebuilds wininst-14.0[-amd64].exe

---
 command/wininst-14.0-amd64.exe | Bin 589824 -> 587776 bytes
 command/wininst-14.0.exe       | Bin 460288 -> 458240 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/command/wininst-14.0-amd64.exe b/command/wininst-14.0-amd64.exe
index 22299543a97ffc1525a3b1c778cb158d6c6430ad..253c2e2eccefa79393827f44f85680536906574a 100644
GIT binary patch
delta 117970
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%0D11>V
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
Q;XT#&G~W}hI31h(Fa4nPXaE2J

delta 119901
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

diff --git a/command/wininst-14.0.exe b/command/wininst-14.0.exe
index 0dac1103d98db0af1e9027c41fe921136c5f6396..46f5f356676c800f99742deb6bf4c0a96aa166c0 100644
GIT binary patch
delta 106589
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
PbvTlc6Ei(6uJ-=`aIvLo

delta 108230
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
NJZtwyr$W*L{tts%cS-;N


From bffd26f485964e1cfb881ccf85179b2947d5e734 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Dec 2016 21:06:00 -0500
Subject: [PATCH 6386/8469] Add test capturing expectation when a package is
 both installed and in the current working directory. Ref #885.

---
 setuptools/tests/test_namespaces.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 2aefb4876a..5199129e31 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -73,3 +73,30 @@ def test_pkg_resources_import(self, tmpdir):
             '-c', 'import pkg_resources',
         ]
         subprocess.check_call(try_import, env=env)
+
+    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
+        reason="https://github.com/pypa/setuptools/issues/851")
+    def test_namespace_package_installed_and_cwd(self, tmpdir):
+        """
+        Installing a namespace packages but also having it in the current
+        working directory, only one version should take precedence.
+        """
+        pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
+        target = tmpdir / 'packages'
+        # use pip to install to the target directory
+        install_cmd = [
+            'pip',
+            'install',
+            str(pkg_A),
+            '-t', str(target),
+        ]
+        subprocess.check_call(install_cmd)
+        namespaces.make_site_dir(target)
+
+        # ensure that package imports and pkg_resources imports
+        pkg_resources_imp = [
+            sys.executable,
+            '-c', 'import pkg_resources; import myns.pkgA',
+        ]
+        env = dict(PYTHONPATH=str(target))
+        subprocess.check_call(pkg_resources_imp, env=env, cwd=str(pkg_A))

From d9125bcb60fa2e1a5270259dad6b6a94c8f61cde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Dec 2016 21:09:49 -0500
Subject: [PATCH 6387/8469] As sometimes orig_path may be something other than
 a list (i.e. _NamespacePath), use iterator tools to sort the items in place.
 Fixes #885.

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 92503288e7..d0f66274fd 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2113,7 +2113,7 @@ def position_in_sys_path(path):
         parts = path_parts[:-module_parts]
         return safe_sys_path_index(_normalize_cached(os.sep.join(parts)))
 
-    orig_path.sort(key=position_in_sys_path)
+    orig_path[:] = sorted(orig_path, key=position_in_sys_path)
     module.__path__[:] = [_normalize_cached(p) for p in orig_path]
 
 

From 3943cf41ef2477fa85189e4bf8341fb618cac7c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Dec 2016 21:11:50 -0500
Subject: [PATCH 6388/8469] Update changelog following fix for #885.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1638c40704..7d6386c2f2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v31.0.1
+-------
+
+* #885: Fix regression where 'pkg_resources._rebuild_mod_path'
+  would fail when a namespace package's '__path__' was not
+  a list with a sort attribute.
+
 v31.0.0
 -------
 

From 3e05a9630ff0e0596a539d4b6d24f97d3fb987f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Dec 2016 21:17:10 -0500
Subject: [PATCH 6389/8469] Skip again on appveyor

---
 setuptools/tests/test_namespaces.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 5199129e31..451df3c489 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -51,6 +51,8 @@ def test_mixed_site_and_non_site(self, tmpdir):
         env = dict(PYTHONPATH=python_path)
         subprocess.check_call(try_import, env=env)
 
+    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
+        reason="https://github.com/pypa/setuptools/issues/851")
     def test_pkg_resources_import(self, tmpdir):
         """
         Ensure that a namespace package doesn't break on import

From 7c0c39ef1f60571709e5a8e6680f2147c38cd4ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Dec 2016 21:38:48 -0500
Subject: [PATCH 6390/8469] Bypass sort behavior altogether when
 module.__path__ isn't a list. Fixes #885.

---
 pkg_resources/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d0f66274fd..4c9868c769 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2113,7 +2113,11 @@ def position_in_sys_path(path):
         parts = path_parts[:-module_parts]
         return safe_sys_path_index(_normalize_cached(os.sep.join(parts)))
 
-    orig_path[:] = sorted(orig_path, key=position_in_sys_path)
+    if not isinstance(orig_path, list):
+        # Is this behavior useful when module.__path__ is not a list?
+        return
+
+    orig_path.sort(key=position_in_sys_path)
     module.__path__[:] = [_normalize_cached(p) for p in orig_path]
 
 

From 5c5d40c367a1d32fdb0379e5961abd659f67a01f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 08:35:13 -0500
Subject: [PATCH 6391/8469] =?UTF-8?q?Bump=20version:=2031.0.0=20=E2=86=92?=
 =?UTF-8?q?=2031.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 486ee0d13b..a793bf238f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 31.0.0
+current_version = 31.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index dc846acf14..d88b1048a4 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="31.0.0",
+    version="31.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e066c97f828ec5ab8be4dde6e340dbfdcd312ec0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 10:47:11 -0500
Subject: [PATCH 6392/8469] Backport config file parsing behavior from Python
 3.7. Ref #889.

---
 setuptools/dist.py       |  3 +-
 setuptools/py36compat.py | 82 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/py36compat.py

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c04e64268b..159464be23 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -21,6 +21,7 @@
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
 import pkg_resources
+from .py36compat import Distribution_parse_config_files
 
 
 def _get_unpatched(cls):
@@ -213,7 +214,7 @@ def check_packages(dist, attr, value):
 _Distribution = get_unpatched(distutils.core.Distribution)
 
 
-class Distribution(_Distribution):
+class Distribution(Distribution_parse_config_files, _Distribution):
     """Distribution with support for features, tests, and package data
 
     This is an enhanced version of 'distutils.dist.Distribution' that
diff --git a/setuptools/py36compat.py b/setuptools/py36compat.py
new file mode 100644
index 0000000000..5bad963025
--- /dev/null
+++ b/setuptools/py36compat.py
@@ -0,0 +1,82 @@
+import sys
+from distutils.errors import DistutilsOptionError
+from distutils.util import strtobool
+from distutils.debug import DEBUG
+
+
+class Distribution_parse_config_files:
+    """
+    Mix-in providing forward-compatibility for functionality to be
+    included by default on Python 3.7.
+
+    Do not edit the code in this class except to update functionality
+    as implemented in distutils.
+    """
+    def parse_config_files(self, filenames=None):
+        from configparser import ConfigParser
+
+        # Ignore install directory options if we have a venv
+        if sys.prefix != sys.base_prefix:
+            ignore_options = [
+                'install-base', 'install-platbase', 'install-lib',
+                'install-platlib', 'install-purelib', 'install-headers',
+                'install-scripts', 'install-data', 'prefix', 'exec-prefix',
+                'home', 'user', 'root']
+        else:
+            ignore_options = []
+
+        ignore_options = frozenset(ignore_options)
+
+        if filenames is None:
+            filenames = self.find_config_files()
+
+        if DEBUG:
+            self.announce("Distribution.parse_config_files():")
+
+        parser = ConfigParser()
+        for filename in filenames:
+            if DEBUG:
+                self.announce("  reading %s" % filename)
+            parser.read(filename)
+            for section in parser.sections():
+                options = parser.options(section)
+                opt_dict = self.get_option_dict(section)
+
+                for opt in options:
+                    if opt != '__name__' and opt not in ignore_options:
+                        val = parser.get(section,opt)
+                        opt = opt.replace('-', '_')
+                        opt_dict[opt] = (filename, val)
+
+            # Make the ConfigParser forget everything (so we retain
+            # the original filenames that options come from)
+            parser.__init__()
+
+        # If there was a "global" section in the config file, use it
+        # to set Distribution options.
+
+        if 'global' in self.command_options:
+            for (opt, (src, val)) in self.command_options['global'].items():
+                alias = self.negative_opt.get(opt)
+                try:
+                    if alias:
+                        setattr(self, alias, not strtobool(val))
+                    elif opt in ('verbose', 'dry_run'): # ugh!
+                        setattr(self, opt, strtobool(val))
+                    else:
+                        setattr(self, opt, val)
+                except ValueError as msg:
+                    raise DistutilsOptionError(msg)
+
+
+if sys.version_info < (3,):
+    # Python 2 behavior is sufficient
+    class Distribution_parse_config_files:
+        pass
+
+
+if False:
+    # When updated behavior is available upstream,
+    # disable override here.
+    class Distribution_parse_config_files:
+        pass

From 1802d1322ccffcd0b79c63aa7ce9d22e0106015c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 11:00:45 -0500
Subject: [PATCH 6393/8469] Apply patch, disabling interpolation. Fixes #889.

---
 setuptools/py36compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py36compat.py b/setuptools/py36compat.py
index 5bad963025..f527969645 100644
--- a/setuptools/py36compat.py
+++ b/setuptools/py36compat.py
@@ -33,7 +33,7 @@ def parse_config_files(self, filenames=None):
         if DEBUG:
             self.announce("Distribution.parse_config_files():")
 
-        parser = ConfigParser()
+        parser = ConfigParser(interpolation=None)
         for filename in filenames:
             if DEBUG:
                 self.announce("  reading %s" % filename)

From e2acd39745b32fb34ca4832377839448bcaa260b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 11:03:06 -0500
Subject: [PATCH 6394/8469] Update changelog. Ref #889.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7d6386c2f2..852947fd71 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v31.1.0
+-------
+
+* #889: Backport proposed fix for disabling interpolation in
+  distutils.Distribution.parse_config_files.
+
 v31.0.1
 -------
 

From 980c2c5afd20fb9f7e50cb8ec0c42abc664da352 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Thu, 15 Dec 2016 10:11:37 +1100
Subject: [PATCH 6395/8469] Revert "Fix #849 global-exclude globbing"

This reverts commit 23aba916e1070d3cf9723af85a6ce07c89053931.
---
 setuptools/command/egg_info.py    |  4 ++--
 setuptools/tests/test_manifest.py | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8a06e496d7..6f8fd87449 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -457,7 +457,7 @@ def global_include(self, pattern):
         """
         if self.allfiles is None:
             self.findall()
-        match = translate_pattern(os.path.join('**', '*' + pattern))
+        match = translate_pattern(os.path.join('**', pattern))
         found = [f for f in self.allfiles if match.match(f)]
         self.extend(found)
         return bool(found)
@@ -466,7 +466,7 @@ def global_exclude(self, pattern):
         """
         Exclude all files anywhere that match the pattern.
         """
-        match = translate_pattern(os.path.join('**', '*' + pattern))
+        match = translate_pattern(os.path.join('**', pattern))
         return self._remove_files(match.match)
 
     def append(self, item):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 62b6d708c1..602c43a274 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -449,11 +449,6 @@ def test_global_include(self):
         assert file_list.files == ['a.py', l('d/c.py')]
         self.assertWarnings()
 
-        file_list.process_template_line('global-include .txt')
-        file_list.sort()
-        assert file_list.files == ['a.py', 'b.txt', l('d/c.py')]
-        self.assertNoWarnings()
-
     def test_global_exclude(self):
         l = make_local_path
         # global-exclude
@@ -470,13 +465,6 @@ def test_global_exclude(self):
         assert file_list.files == ['b.txt']
         self.assertWarnings()
 
-        file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', l('d/c.pyc'), 'e.pyo']
-        file_list.process_template_line('global-exclude .py[co]')
-        file_list.sort()
-        assert file_list.files == ['a.py', 'b.txt']
-        self.assertNoWarnings()
-
     def test_recursive_include(self):
         l = make_local_path
         # recursive-include

From b92763bc598c489ea4e5c04dd9713bf7583fd546 Mon Sep 17 00:00:00 2001
From: Tim Heap <tim@timheap.me>
Date: Thu, 15 Dec 2016 10:24:12 +1100
Subject: [PATCH 6396/8469] Update changelog, ref #890

---
 CHANGES.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7d6386c2f2..50c505a8dc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+In development
+--------------
+
+* #890: Revert #849. ``global-exclude .foo`` will not match all
+  ``*.foo`` files any more. Package authors must add an explicit
+  wildcard, such as ``global-exclude *.foo``, to match all
+  ``.foo`` files. See #886, #849.
+
 v31.0.1
 -------
 
@@ -132,7 +140,11 @@ v28.5.0
 
 * #810: Tests are now invoked with tox and not setup.py test.
 * #249 and #450 via #764: Avoid scanning the whole tree
-  when building the manifest.
+  when building the manifest. Also fixes a long-standing bug
+  where patterns in ``MANIFEST.in`` had implicit wildcard
+  matching. This caused ``global-exclude .foo`` to exclude
+  all ``*.foo`` files, but also ``global-exclude bar.py`` to
+  exclude ``foo_bar.py``.
 
 v28.4.0
 -------

From 8d6a16a454fc6c35bd8ef57ec86a6ff6d0e8d25a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 20:48:39 -0500
Subject: [PATCH 6397/8469] Update changelog. Ref #890.

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 50c505a8dc..1d6ac12389 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,5 @@
-In development
---------------
+v32.0.0
+-------
 
 * #890: Revert #849. ``global-exclude .foo`` will not match all
   ``*.foo`` files any more. Package authors must add an explicit

From 083929cf87fe74e21a1a37afcb300ae73652b136 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Dec 2016 20:48:51 -0500
Subject: [PATCH 6398/8469] =?UTF-8?q?Bump=20version:=2031.0.1=20=E2=86=92?=
 =?UTF-8?q?=2032.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a793bf238f..fa6b4deb01 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 31.0.1
+current_version = 32.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d88b1048a4..a6a062f52b 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="31.0.1",
+    version="32.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 9f37eb817df5d9453e49edbcf2760832f333af68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 16 Dec 2016 15:32:16 +0100
Subject: [PATCH 6399/8469] Exit on test failure

When test fails, it should not continue to run other commands.
Fixes #891
---
 setuptools/command/test.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 9a5117be00..60ba2354a5 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -226,12 +226,14 @@ def run_tests(self):
                 list(map(sys.modules.__delitem__, del_modules))
 
         exit_kwarg = {} if sys.version_info < (2, 7) else {"exit": False}
-        unittest_main(
+        test = unittest_main(
             None, None, self._argv,
             testLoader=self._resolve_as_ep(self.test_loader),
             testRunner=self._resolve_as_ep(self.test_runner),
             **exit_kwarg
         )
+        if not test.result.wasSuccessful():
+            sys.exit(1)
 
     @property
     def _argv(self):

From 2c4fd43277fc477d85b50e15c37b176136676270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 16 Dec 2016 16:15:04 +0100
Subject: [PATCH 6400/8469] Raise DistutilsError and log result

---
 setuptools/command/test.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 60ba2354a5..ef0af12f12 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,7 +3,8 @@
 import sys
 import contextlib
 import itertools
-from distutils.errors import DistutilsOptionError
+from distutils.errors import DistutilsError, DistutilsOptionError
+from distutils import log
 from unittest import TestLoader
 
 from setuptools.extern import six
@@ -233,7 +234,9 @@ def run_tests(self):
             **exit_kwarg
         )
         if not test.result.wasSuccessful():
-            sys.exit(1)
+            msg = 'Test failed: %s' % test.result
+            self.announce(msg, log.ERROR)
+            raise DistutilsError(msg)
 
     @property
     def _argv(self):

From f4801b43459a2e4b38e78ccf946a39642a72803c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Dec 2016 10:25:11 -0500
Subject: [PATCH 6401/8469] Update changelog. Ref #892.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1d6ac12389..c3fff5236b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v32.1.0
+-------
+
+* #891: In 'test' command on test failure, raise DistutilsError,
+  suppression invocation of subsequent commands.
+
 v32.0.0
 -------
 

From bf665ffb84aa72010240d735b5f45db32d60bdde Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Dec 2016 10:25:24 -0500
Subject: [PATCH 6402/8469] =?UTF-8?q?Bump=20version:=2032.0.0=20=E2=86=92?=
 =?UTF-8?q?=2032.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fa6b4deb01..fe2e678c17 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.0.0
+current_version = 32.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a6a062f52b..683a852697 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.0.0",
+    version="32.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 127dcab577c72c85dc27dfb29701b67aaa41dd68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 16 Dec 2016 13:14:57 -0500
Subject: [PATCH 6403/8469] Disable upload docs

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 2f9b6a7a06..b402cf6d9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,3 +36,4 @@ deploy:
   password:
     secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
   distributions: release
+  skip_upload_docs: true

From 5b38d9b863e3a86202da4816f7ef9b67b871a3a3 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium+py@gmail.com>
Date: Sun, 18 Dec 2016 01:23:09 +0000
Subject: [PATCH 6404/8469] Fix spelling and grammar in code comments and
 documentation

---
 tests/test_bdist_rpm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_bdist_rpm.py b/tests/test_bdist_rpm.py
index e9795ee4b2..c5962dddd2 100644
--- a/tests/test_bdist_rpm.py
+++ b/tests/test_bdist_rpm.py
@@ -96,7 +96,7 @@ def test_quiet(self):
     @unittest.skipIf(find_executable('rpmbuild') is None,
                      'the rpmbuild command is not found')
     def test_no_optimize_flag(self):
-        # let's create a package that brakes bdist_rpm
+        # let's create a package that breaks bdist_rpm
         tmp_dir = self.mkdtemp()
         os.environ['HOME'] = tmp_dir   # to confine dir '.rpmdb' creation
         pkg_dir = os.path.join(tmp_dir, 'foo')

From 53e5575e11a35aaf761da56aa6728cdcd7c04ec0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 08:38:56 -0500
Subject: [PATCH 6405/8469] When invoking rmtree, ensure the parameter is
 unicode to avoid errors when the tree contains Unicode filenames. Fixes #704.

---
 setuptools/command/easy_install.py    | 3 +++
 setuptools/tests/test_easy_install.py | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 03dd6768d5..7d982d898f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -666,6 +666,9 @@ def easy_install(self, spec, deps=False):
 
         finally:
             if os.path.exists(tmpdir):
+                # workaround for http://bugs.python.org/issue24672
+                if six.PY2:
+                    tmpdir = six.u(tmpdir)
                 rmtree(tmpdir)
 
     def install_item(self, spec, download, tmpdir, deps, install_needed=False):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 209e6b78ff..08138efc66 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -169,10 +169,8 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
-    @pytest.mark.xfail(reason="#709 and #710")
-    # also
-    #@pytest.mark.xfail(setuptools.tests.is_ascii,
-    #    reason="https://github.com/pypa/setuptools/issues/706")
+    @pytest.mark.xfail(setuptools.tests.is_ascii,
+        reason="https://github.com/pypa/setuptools/issues/706")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 7f89e790d228aeece7df1fda8eb6c762d772c450 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 09:30:21 -0500
Subject: [PATCH 6406/8469] Can't use six.u as 'c:\users' triggers
 unicode_escape and fails. Ref #704.

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 7d982d898f..e3b7161a9d 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -668,7 +668,7 @@ def easy_install(self, spec, deps=False):
             if os.path.exists(tmpdir):
                 # workaround for http://bugs.python.org/issue24672
                 if six.PY2:
-                    tmpdir = six.u(tmpdir)
+                    tmpdir = tmpdir.decode('ascii')
                 rmtree(tmpdir)
 
     def install_item(self, spec, download, tmpdir, deps, install_needed=False):

From 674d5ecb1695de056226d1ad65c5d8b48ca99f3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 09:45:13 -0500
Subject: [PATCH 6407/8469] Extract tmpdir as a context manager

---
 setuptools/command/easy_install.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e3b7161a9d..b9d41cb027 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -627,12 +627,24 @@ def check_editable(self, spec):
                 (spec.key, self.build_directory)
             )
 
-    def easy_install(self, spec, deps=False):
+    @contextlib.contextmanager
+    def _tmpdir(self):
         tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        try:
+            yield tmpdir
+        finally:
+            if not os.path.exists(tmpdir):
+                return
+            # workaround for http://bugs.python.org/issue24672
+            if six.PY2:
+                tmpdir = tmpdir.decode('ascii')
+            rmtree(tmpdir)
+
+    def easy_install(self, spec, deps=False):
         if not self.editable:
             self.install_site_py()
 
-        try:
+        with self._tmpdir() as tmpdir:
             if not isinstance(spec, Requirement):
                 if URL_SCHEME(spec):
                     # It's a url, download it to tmpdir and process
@@ -664,13 +676,6 @@ def easy_install(self, spec, deps=False):
             else:
                 return self.install_item(spec, dist.location, tmpdir, deps)
 
-        finally:
-            if os.path.exists(tmpdir):
-                # workaround for http://bugs.python.org/issue24672
-                if six.PY2:
-                    tmpdir = tmpdir.decode('ascii')
-                rmtree(tmpdir)
-
     def install_item(self, spec, download, tmpdir, deps, install_needed=False):
 
         # Installation is also needed if file in tmpdir or is not an egg

From 6c6f4caa4bacce4b719b1e03fb02fdb857b1a135 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 10:07:11 -0500
Subject: [PATCH 6408/8469] Move toward future compatibility using unicode
 strings, but cast to native str as workaround for #709, #710, and #712.

---
 setuptools/command/easy_install.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b9d41cb027..14ad25c228 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -629,16 +629,12 @@ def check_editable(self, spec):
 
     @contextlib.contextmanager
     def _tmpdir(self):
-        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        tmpdir = tempfile.mkdtemp(prefix=six.u("easy_install-"))
         try:
-            yield tmpdir
+            # cast to str as workaround for #709 and #710 and #712
+            yield str(tmpdir)
         finally:
-            if not os.path.exists(tmpdir):
-                return
-            # workaround for http://bugs.python.org/issue24672
-            if six.PY2:
-                tmpdir = tmpdir.decode('ascii')
-            rmtree(tmpdir)
+            os.path.exists(tmpdir) and rmtree(tmpdir)
 
     def easy_install(self, spec, deps=False):
         if not self.editable:

From cd2a519c6592d90e8658a5e90d8b0342d08b9ae9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 11:51:19 -0500
Subject: [PATCH 6409/8469] In sandbox.run_setup, always ensure that __file__
 is str. Fixes #712.

---
 setuptools/sandbox.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index d882d71539..817a3afaae 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -241,8 +241,15 @@ def run_setup(setup_script, args):
             working_set.__init__()
             working_set.callbacks.append(lambda dist: dist.activate())
 
+            # __file__ should be a byte string on Python 2 (#712)
+            dunder_file = (
+                setup_script
+                if isinstance(setup_script, str) else
+                setup_script.encode(sys.getfilesystemencoding())
+            )
+
             def runner():
-                ns = dict(__file__=setup_script, __name__='__main__')
+                ns = dict(__file__=dunder_file, __name__='__main__')
                 _execfile(setup_script, ns)
 
             DirectorySandbox(setup_dir).run(runner)

From daead4eef50198b1aae7f4ca856608eb9f112792 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 11:55:40 -0500
Subject: [PATCH 6410/8469] Update changelog

---
 CHANGES.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index c3fff5236b..3dbd49aed4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v32.1.1
+-------
+
+* #704: More selectively ensure that 'rmtree' is not invoked with
+  a byte string, enabling it to remove files that are non-ascii,
+  even on Python 2.
+
+* #712: In 'sandbox.run_setup', ensure that ``__file__`` is
+  always a ``str``, modeling the behavior observed by the
+  interpreter when invoking scripts and modules.
+
 v32.1.0
 -------
 

From 25c339402f908200c939ffdec9987bf7598a3328 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 11:55:47 -0500
Subject: [PATCH 6411/8469] =?UTF-8?q?Bump=20version:=2032.1.0=20=E2=86=92?=
 =?UTF-8?q?=2032.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fe2e678c17..f327fa302a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.1.0
+current_version = 32.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 683a852697..2ffeb89722 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.1.0",
+    version="32.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From d5ed18ef5f7c2472578a2b5015a09df1fd05e8bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 17:01:14 -0500
Subject: [PATCH 6412/8469] No longer release tarballs due to new restrictions
 on Warehouse. Fixes #893.

---
 CHANGES.rst | 6 ++++++
 setup.cfg   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3dbd49aed4..410825fa76 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v32.1.2
+-------
+
+* #893: Only release sdist in zip format as warehouse now
+  disallows releasing two different formats.
+
 v32.1.1
 -------
 
diff --git a/setup.cfg b/setup.cfg
index f327fa302a..46540b202a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,7 @@ test = pytest
 repository = https://upload.pypi.org/legacy/
 
 [sdist]
-formats = gztar zip
+formats = zip
 
 [wheel]
 universal = 1

From a17fa50d2675d89077be09d668a073c751b76e0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Dec 2016 17:02:10 -0500
Subject: [PATCH 6413/8469] =?UTF-8?q?Bump=20version:=2032.1.1=20=E2=86=92?=
 =?UTF-8?q?=2032.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 46540b202a..e9f778a643 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.1.1
+current_version = 32.1.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 2ffeb89722..a44a4de431 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.1.1",
+    version="32.1.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 5ad13718686bee04a93b4e86929c1bb170f14a52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Dec 2016 14:15:37 -0500
Subject: [PATCH 6414/8469] Cast the value to rmtree to bytes on Linux and
 Python 2 when the filesystemencoding is ascii, and let posixpath work its
 voodoo. Fixes #706.

---
 setuptools/command/easy_install.py    |  3 ++-
 setuptools/py27compat.py              | 11 +++++++++++
 setuptools/tests/test_easy_install.py |  2 --
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 14ad25c228..36e7f3598f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -46,6 +46,7 @@
 from setuptools import Command
 from setuptools.sandbox import run_setup
 from setuptools.py31compat import get_path, get_config_vars
+from setuptools.py27compat import rmtree_safe
 from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
 from setuptools.package_index import (
@@ -634,7 +635,7 @@ def _tmpdir(self):
             # cast to str as workaround for #709 and #710 and #712
             yield str(tmpdir)
         finally:
-            os.path.exists(tmpdir) and rmtree(tmpdir)
+            os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
 
     def easy_install(self, spec, deps=False):
         if not self.editable:
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 4e3e4ab34f..a71a936e10 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -3,6 +3,7 @@
 """
 
 import sys
+import platform
 
 
 def get_all_headers(message, key):
@@ -16,3 +17,13 @@ def get_all_headers(message, key):
 
     def get_all_headers(message, key):
         return message.getheaders(key)
+
+
+linux_py2_ascii = (
+	platform.system() == 'Linux' and
+	sys.getfilesystemencoding() == 'ascii' and
+	sys.version_info < (3,)
+)
+
+rmtree_safe = str if linux_py2_ascii else lambda x: x
+"""Workaround for http://bugs.python.org/issue24672"""
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 08138efc66..1ea33b0890 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -169,8 +169,6 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
-    @pytest.mark.xfail(setuptools.tests.is_ascii,
-        reason="https://github.com/pypa/setuptools/issues/706")
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From adf6cc7f043355444e0da30d26da78042d06ade9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Dec 2016 14:47:19 -0500
Subject: [PATCH 6415/8469] Update changelog. Ref #706.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 410825fa76..1a57ad5524 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v32.1.3
+-------
+
+* #706: Add rmtree compatibility shim for environments where
+  rmtree fails when passed a unicode string.
+
 v32.1.2
 -------
 

From 5d4b2b691fea992ec47132ba2b01ebd396fe7216 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Dec 2016 14:47:24 -0500
Subject: [PATCH 6416/8469] =?UTF-8?q?Bump=20version:=2032.1.2=20=E2=86=92?=
 =?UTF-8?q?=2032.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e9f778a643..2b6d2736f0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.1.2
+current_version = 32.1.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a44a4de431..c2dcf336c0 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.1.2",
+    version="32.1.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 7a1c700e16523ad07532bea2ed87718fe29d3595 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Dec 2016 09:31:40 -0500
Subject: [PATCH 6417/8469] Re-use test.paths_on_pythonpath to extend the
 PYTHONPATH variable rather than erasing it. When tests are run under
 pytest-runner (or other setup.py test invocations), the PYTHONPATH is
 carefully curated to include dependencies and the project under test.
 Overwriting PYTHONPATH will break tests in those environments. Fixes #884.

---
 CHANGES.rst                         |  8 ++++++++
 setuptools/tests/test_develop.py    | 12 +++++++-----
 setuptools/tests/test_namespaces.py | 17 +++++++++--------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1a57ad5524..793c4c333c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v32.1.4
+-------
+
+* #884: Restore support for running the tests under
+  `pytest-runner <https://github.com/pytest-dev/pytest-runner>`_
+  by ensuring that PYTHONPATH is honored in tests invoking
+  a subprocess.
+
 v32.1.3
 -------
 
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 430a07e6c2..5dd72aaee8 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -10,6 +10,7 @@
 import subprocess
 
 from setuptools.extern import six
+from setuptools.command import test
 
 import pytest
 
@@ -132,9 +133,9 @@ def install_develop(src_dir, target):
             'develop',
             '--install-dir', str(target),
         ]
-        env = dict(PYTHONPATH=str(target))
         with src_dir.as_cwd():
-            subprocess.check_call(develop_cmd, env=env)
+            with test.test.paths_on_pythonpath([str(target)]):
+                subprocess.check_call(develop_cmd)
 
     @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
         reason="https://github.com/pypa/setuptools/issues/851")
@@ -162,12 +163,13 @@ def test_namespace_package_importable(self, tmpdir):
             sys.executable,
             '-c', 'import myns.pkgA; import myns.pkgB',
         ]
-        env = dict(PYTHONPATH=str(target))
-        subprocess.check_call(try_import, env=env)
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(try_import)
 
         # additionally ensure that pkg_resources import works
         pkg_resources_imp = [
             sys.executable,
             '-c', 'import pkg_resources',
         ]
-        subprocess.check_call(pkg_resources_imp, env=env)
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(pkg_resources_imp)
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 451df3c489..721cad1e63 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -7,6 +7,7 @@
 import pytest
 
 from . import namespaces
+from setuptools.command import test
 
 
 class TestNamespaces:
@@ -27,7 +28,6 @@ def test_mixed_site_and_non_site(self, tmpdir):
         site_packages = tmpdir / 'site-packages'
         path_packages = tmpdir / 'path-packages'
         targets = site_packages, path_packages
-        python_path = os.pathsep.join(map(str, targets))
         # use pip to install to the target directory
         install_cmd = [
             'pip',
@@ -48,8 +48,8 @@ def test_mixed_site_and_non_site(self, tmpdir):
             sys.executable,
             '-c', 'import myns.pkgA; import myns.pkgB',
         ]
-        env = dict(PYTHONPATH=python_path)
-        subprocess.check_call(try_import, env=env)
+        with test.test.paths_on_pythonpath(map(str, targets)):
+            subprocess.check_call(try_import)
 
     @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
         reason="https://github.com/pypa/setuptools/issues/851")
@@ -61,20 +61,21 @@ def test_pkg_resources_import(self, tmpdir):
         pkg = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
         target = tmpdir / 'packages'
         target.mkdir()
-        env = dict(PYTHONPATH=str(target))
         install_cmd = [
             sys.executable,
             '-m', 'easy_install',
             '-d', str(target),
             str(pkg),
         ]
-        subprocess.check_call(install_cmd, env=env)
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(install_cmd)
         namespaces.make_site_dir(target)
         try_import = [
             sys.executable,
             '-c', 'import pkg_resources',
         ]
-        subprocess.check_call(try_import, env=env)
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(try_import)
 
     @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
         reason="https://github.com/pypa/setuptools/issues/851")
@@ -100,5 +101,5 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
             sys.executable,
             '-c', 'import pkg_resources; import myns.pkgA',
         ]
-        env = dict(PYTHONPATH=str(target))
-        subprocess.check_call(pkg_resources_imp, env=env, cwd=str(pkg_A))
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A))

From 32fcec8584ee643105854358a15953f8e9c5df17 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Dec 2016 09:33:00 -0500
Subject: [PATCH 6418/8469] =?UTF-8?q?Bump=20version:=2032.1.3=20=E2=86=92?=
 =?UTF-8?q?=2032.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2b6d2736f0..6f18445ecc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.1.3
+current_version = 32.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c2dcf336c0..a1440a26e4 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.1.3",
+    version="32.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 3bc56c2c4374b1ef6edcfcc2ae6fa1280ffe151c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Dec 2016 09:50:27 -0500
Subject: [PATCH 6419/8469] Intended for release to be 32.1.4, but I typed
 'bumpversion minor --no-tags' instead of 'bumpversion patch --no-tags' by
 mistake, then tagged with what I thought I'd just bumped to.

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 793c4c333c..489d971efa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-v32.1.4
+v32.2.0
 -------
 
 * #884: Restore support for running the tests under

From f1f9200d18fff71c5ec53e0269150da6858e51d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Dec 2016 13:59:31 -0500
Subject: [PATCH 6420/8469] =?UTF-8?q?Bump=20version:=2032.2.0=20=E2=86=92?=
 =?UTF-8?q?=2032.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 6f18445ecc..2dde1d4d8f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.2.0
+current_version = 32.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a1440a26e4..9eea915c1a 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.2.0",
+    version="32.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 07a7b06dd8c6dc08c789505f263986e5f084f802 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 24 Dec 2016 14:21:02 -0500
Subject: [PATCH 6421/8469] Traverse the class hierarchy when searching for the
 unpatched class. Ref #889.

---
 setuptools/monkey.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index aabc280f6b..dbe9a6176d 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -7,6 +7,7 @@
 import platform
 import types
 import functools
+import inspect
 
 from .py26compat import import_module
 from setuptools.extern import six
@@ -35,12 +36,16 @@ def get_unpatched_class(cls):
     Also ensures that no other distutils extension monkeypatched the distutils
     first.
     """
-    while cls.__module__.startswith('setuptools'):
-        cls, = cls.__bases__
-    if not cls.__module__.startswith('distutils'):
+    external_bases = (
+        cls
+        for cls in inspect.getmro(cls)
+        if not cls.__module__.startswith('setuptools')
+    )
+    base = next(external_bases)
+    if not base.__module__.startswith('distutils'):
         msg = "distutils has already been patched by %r" % cls
         raise AssertionError(msg)
-    return cls
+    return base
 
 
 def patch_all():

From 6d69dd73b900cff84ee142ad82967dd025a75b72 Mon Sep 17 00:00:00 2001
From: Joshua Root <jmr@macports.org>
Date: Tue, 27 Dec 2016 13:11:42 +1100
Subject: [PATCH 6422/8469] Fix image URL for readthedocs link

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 50774ff767..9cb8758fb5 100755
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ Installing and Using Setuptools
 .. contents:: **Table of Contents**
 
 
-.. image:: https://setuptools.readthedocs.io/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/setuptools/badge/?version=latest
     :target: https://setuptools.readthedocs.io
 
 -------------------------

From 1bd827efdf08b77f8a0a29c58dfc805368466964 Mon Sep 17 00:00:00 2001
From: Preston Landers <planders@utexas.edu>
Date: Wed, 28 Dec 2016 13:14:53 -0600
Subject: [PATCH 6423/8469] Attempt to fix issue #866 by iterating over code
 with `dis.Bytecode` instead of the internal `_iter_code`.

The `dis` module was already used in `_iter_code` so I figured it was safe to use `Bytecode` from it. Not sure how this assumption holds up across all supported Python releases. I can only assume `Bytecode` wasn't there before when `_iter_code` was originally written?

Note that `_iter_code` doesn't appear to be called anywhere in light of this change so I removed it.

I should also note that `get_module_constant` has never worked with `setuptools.__version__` (returns -1) because it's not a string literal; it gets that attribute from another module.  But this change does work in cases where a string literal is requested.

https://github.com/pypa/setuptools/issues/866
---
 setuptools/depends.py | 43 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index 89d39a50a1..d8496ef8ee 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -4,7 +4,6 @@
 from distutils.version import StrictVersion
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 
-from setuptools.extern import six
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -78,39 +77,6 @@ def is_current(self, paths=None):
         return self.version_ok(version)
 
 
-def _iter_code(code):
-    """Yield '(op,arg)' pair for each operation in code object 'code'"""
-
-    from array import array
-    from dis import HAVE_ARGUMENT, EXTENDED_ARG
-
-    bytes = array('b', code.co_code)
-    eof = len(code.co_code)
-
-    ptr = 0
-    extended_arg = 0
-
-    while ptr < eof:
-
-        op = bytes[ptr]
-
-        if op >= HAVE_ARGUMENT:
-
-            arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
-            ptr += 3
-
-            if op == EXTENDED_ARG:
-                long_type = six.integer_types[-1]
-                extended_arg = arg * long_type(65536)
-                continue
-
-        else:
-            arg = None
-            ptr += 1
-
-        yield op, arg
-
-
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
 
@@ -176,11 +142,12 @@ def extract_constant(code, symbol, default=-1):
     only 'STORE_NAME' and 'STORE_GLOBAL' opcodes are checked, and 'symbol'
     must be present in 'code.co_names'.
     """
-
     if symbol not in code.co_names:
-        # name's not there, can't possibly be an assigment
+        # name's not there, can't possibly be an assignment
         return None
 
+    from dis import Bytecode
+
     name_idx = list(code.co_names).index(symbol)
 
     STORE_NAME = 90
@@ -189,7 +156,9 @@ def extract_constant(code, symbol, default=-1):
 
     const = default
 
-    for op, arg in _iter_code(code):
+    for byte_code in Bytecode(code):
+        op = byte_code.opcode
+        arg = byte_code.arg
 
         if op == LOAD_CONST:
             const = code.co_consts[arg]

From 6a960cb9e8cf17385e3b8a52d46cf71a9747e19d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 17:03:33 -0500
Subject: [PATCH 6424/8469] Add tests capturing failure of
 depends.get_module_constant on Python 3.6. Ref #866.

---
 pytest.ini                            |  2 +-
 setuptools/tests/mod_with_constant.py |  1 +
 setuptools/tests/test_depends.py      | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/tests/mod_with_constant.py
 create mode 100644 setuptools/tests/test_depends.py

diff --git a/pytest.ini b/pytest.ini
index c814b316cf..11a213db2b 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
diff --git a/setuptools/tests/mod_with_constant.py b/setuptools/tests/mod_with_constant.py
new file mode 100644
index 0000000000..ef755dd1c7
--- /dev/null
+++ b/setuptools/tests/mod_with_constant.py
@@ -0,0 +1 @@
+value = 'three, sir!'
diff --git a/setuptools/tests/test_depends.py b/setuptools/tests/test_depends.py
new file mode 100644
index 0000000000..e0cfa88049
--- /dev/null
+++ b/setuptools/tests/test_depends.py
@@ -0,0 +1,16 @@
+import sys
+
+from setuptools import depends
+
+
+class TestGetModuleConstant:
+
+	def test_basic(self):
+		"""
+		Invoke get_module_constant on a module in
+		the test package.
+		"""
+		mod_name = 'setuptools.tests.mod_with_constant'
+		val = depends.get_module_constant(mod_name, 'value')
+		assert val == 'three, sir!'
+		assert 'setuptools.tests.mod_with_constant' not in sys.modules

From b911a237e03a3892f423f3d5e2ec0caad1986b8d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 17:19:50 -0500
Subject: [PATCH 6425/8469] Add two more tests for _iter_code per #866,
 capturing the apparent expectation in the byte-code processing that's now
 failing on Python 3.6.

---
 setuptools/tests/test_depends.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_depends.py b/setuptools/tests/test_depends.py
index e0cfa88049..fcf2a636a4 100644
--- a/setuptools/tests/test_depends.py
+++ b/setuptools/tests/test_depends.py
@@ -14,3 +14,15 @@ def test_basic(self):
 		val = depends.get_module_constant(mod_name, 'value')
 		assert val == 'three, sir!'
 		assert 'setuptools.tests.mod_with_constant' not in sys.modules
+
+
+class TestIterCode:
+	def test_empty(self):
+		code = compile('', '<string>', mode='exec')
+		expected = (100, 0), (83, None)
+		assert tuple(depends._iter_code(code)) == expected
+
+	def test_constant(self):
+		code = compile('value = "three, sir!"', '<string>', mode='exec')
+		expected = (100, 0), (90, 0), (100, 1), (83, None)
+		assert tuple(depends._iter_code(code)) == expected

From a29c9a4de0c8cf75b89582a0bf718056d58b0c10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 20:10:39 -0500
Subject: [PATCH 6426/8469] Use dis module rather than manually disassembling
 the bytecode. Fixes #866.

---
 setuptools/depends.py | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index 89d39a50a1..c150c52b81 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,11 +1,10 @@
 import sys
 import imp
 import marshal
+import dis
 from distutils.version import StrictVersion
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 
-from setuptools.extern import six
-
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
 ]
@@ -80,35 +79,10 @@ def is_current(self, paths=None):
 
 def _iter_code(code):
     """Yield '(op,arg)' pair for each operation in code object 'code'"""
-
-    from array import array
-    from dis import HAVE_ARGUMENT, EXTENDED_ARG
-
-    bytes = array('b', code.co_code)
-    eof = len(code.co_code)
-
-    ptr = 0
-    extended_arg = 0
-
-    while ptr < eof:
-
-        op = bytes[ptr]
-
-        if op >= HAVE_ARGUMENT:
-
-            arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
-            ptr += 3
-
-            if op == EXTENDED_ARG:
-                long_type = six.integer_types[-1]
-                extended_arg = arg * long_type(65536)
-                continue
-
-        else:
-            arg = None
-            ptr += 1
-
-        yield op, arg
+    return (
+        (op.opcode, op.arg)
+        for op in dis.Bytecode(code)
+    )
 
 
 def find_module(module, paths=None):

From 3000d975dbb11430be5c79498a461d33a5522a40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 20:52:09 -0500
Subject: [PATCH 6427/8469] Re-introduce _iter_code functionality as a Bytecode
 backport. Fixes failing tests. Ref #866.

---
 setuptools/depends.py    |  5 +++--
 setuptools/py33compat.py | 46 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/py33compat.py

diff --git a/setuptools/depends.py b/setuptools/depends.py
index d417fa32ea..45e7052d8d 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,10 +1,11 @@
 import sys
 import imp
 import marshal
-import dis
 from distutils.version import StrictVersion
 from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
 
+from .py33compat import Bytecode
+
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -155,7 +156,7 @@ def extract_constant(code, symbol, default=-1):
 
     const = default
 
-    for byte_code in dis.Bytecode(code):
+    for byte_code in Bytecode(code):
         op = byte_code.opcode
         arg = byte_code.arg
 
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
new file mode 100644
index 0000000000..2588d680cd
--- /dev/null
+++ b/setuptools/py33compat.py
@@ -0,0 +1,46 @@
+import dis
+import code
+import array
+import collections
+
+from setuptools.extern import six
+
+
+OpArg = collections.namedtuple('OpArg', 'opcode arg')
+
+
+class Bytecode_compat(object):
+    def __init__(self, code):
+        self.code = code
+
+    def __iter__(self):
+        """Yield '(op,arg)' pair for each operation in code object 'code'"""
+
+        bytes = array.array('b', self.code.co_code)
+        eof = len(self.code.co_code)
+
+        ptr = 0
+        extended_arg = 0
+
+        while ptr < eof:
+
+            op = bytes[ptr]
+
+            if op >= dis.HAVE_ARGUMENT:
+
+                arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
+                ptr += 3
+
+                if op == dis.EXTENDED_ARG:
+                    long_type = six.integer_types[-1]
+                    extended_arg = arg * long_type(65536)
+                    continue
+
+            else:
+                arg = None
+                ptr += 1
+
+            yield OpArg(op, arg)
+
+
+Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)

From 15576a166203b81cd5fcda68a4cdb11e76194986 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 20:57:40 -0500
Subject: [PATCH 6428/8469] Update changelog. Ref #866.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 80b243c841..149d270f7b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v32.3.1
+-------
+
+* #866: Use ``dis.Bytecode`` on Python 3.4 and later in
+  ``setuptools.depends``.
+
 v32.3.0
 -------
 

From ca8f8ca70d8f335f70ffe4023369523c8b61adca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 28 Dec 2016 20:59:46 -0500
Subject: [PATCH 6429/8469] =?UTF-8?q?Bump=20version:=2032.3.0=20=E2=86=92?=
 =?UTF-8?q?=2032.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2dde1d4d8f..20370e9e65 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.3.0
+current_version = 32.3.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9eea915c1a..3c4faa321f 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.3.0",
+    version="32.3.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 8c1f489f09434f42080397367b6491e75f64d838 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporter@mozilla.com>
Date: Sun, 11 Dec 2016 18:59:34 -0600
Subject: [PATCH 6430/8469] Fix usage of extras when installing via Wheels;
 resolves #882

When resolving requirements, we now pass the list of extras we're using along
to Marker.evaluate, since we want to include the extra's requirements in our
list of required packages. This is sort of papering over the underlying issue;
namely, that the dependency map for dist-info distributions looks like:

  { None      : ['common_dep'],
    'my_extra': ['extra_dep; extra = "my_extra"'] }

If we eliminated 'extra = "my_extra"' when creating this map, the problem
would go away because the WorkingSet would no longer treat `extra_dep` as a
purely optional dependency. However, this would require copying and
manipulating Requirement objects, which is somewhat more complicated than the
current solution.
---
 pkg_resources/__init__.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 92503288e7..ebc6268d44 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -786,7 +786,7 @@ def add(self, dist, entry=None, insert=True, replace=False):
         self._added_new(dist)
 
     def resolve(self, requirements, env=None, installer=None,
-            replace_conflicting=False):
+                replace_conflicting=False, extras=None):
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -802,6 +802,12 @@ def resolve(self, requirements, env=None, installer=None,
         the wrong version.  Otherwise, if an `installer` is supplied it will be
         invoked to obtain the correct version of the requirement and activate
         it.
+
+        `extras` is a list of the extras to be used with these requirements.
+        This is important because extra requirements may look like `my_req;
+        extra = "my_extra"`, which would otherwise be interpreted as a purely
+        optional requirement.  Instead, we want to be able to assert that these
+        requirements are truly required.
         """
 
         # set up the stack
@@ -825,7 +831,7 @@ def resolve(self, requirements, env=None, installer=None,
                 # Ignore cyclic or redundant dependencies
                 continue
 
-            if not req_extras.markers_pass(req):
+            if not req_extras.markers_pass(req, extras):
                 continue
 
             dist = best.get(req.key)
@@ -1004,7 +1010,7 @@ class _ReqExtras(dict):
     Map each requirement to the extras that demanded it.
     """
 
-    def markers_pass(self, req):
+    def markers_pass(self, req, extras=None):
         """
         Evaluate markers for req against each extra that
         demanded it.
@@ -1014,7 +1020,7 @@ def markers_pass(self, req):
         """
         extra_evals = (
             req.marker.evaluate({'extra': extra})
-            for extra in self.get(req, ()) + (None,)
+            for extra in self.get(req, ()) + (extras or (None,))
         )
         return not req.marker or any(extra_evals)
 
@@ -2299,8 +2305,14 @@ def resolve(self):
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
             raise UnknownExtra("Can't require() without a distribution", self)
+
+        # Get the requirements for this entry point with all its extras and
+        # then resolve them. We have to pass `extras` along when resolving so
+        # that the working set knows what extras we want. Otherwise, for
+        # dist-info distributions, the working set will assume that the
+        # requirements for that extra are purely optional and skip over them.
         reqs = self.dist.requires(self.extras)
-        items = working_set.resolve(reqs, env, installer)
+        items = working_set.resolve(reqs, env, installer, extras=self.extras)
         list(map(working_set.add, items))
 
     pattern = re.compile(

From 249f870f2c6fb60734e9db34e44f7e44cd35c914 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 10:08:00 -0500
Subject: [PATCH 6431/8469] Drop support for 'tag_svn_version' distribution
 option. Fixes #619.

---
 CHANGES.rst                       |  8 ++++++++
 docs/conf.py                      |  4 ++++
 setuptools/command/egg_info.py    | 19 -------------------
 setuptools/tests/test_egg_info.py |  7 ++-----
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 149d270f7b..264b939ad8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v33.0.0
+-------
+
+* #619: Removed support for the ``tag_svn_revision``
+  distribution option. If Subversion tagging support is
+  still desired, consider adding the functionality to
+  setuptools_svn in setuptools_svn #2.
+
 v32.3.1
 -------
 
diff --git a/docs/conf.py b/docs/conf.py
index fae8e63255..c1854ed8a2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -156,6 +156,10 @@
                 pattern=r"PEP[- ](?P<pep_number>\d+)",
                 url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
             ),
+            dict(
+                pattern=r"setuptools_svn #(?P<setuptools_svn>\d+)",
+                url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}',
+            ),
             dict(
                 pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
                 with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6f8fd87449..98a8730008 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -32,11 +32,6 @@
 
 from pkg_resources.extern import packaging
 
-try:
-    from setuptools_svn import svn_utils
-except ImportError:
-    pass
-
 
 def translate_pattern(glob):
     """
@@ -147,7 +142,6 @@ def initialize_options(self):
         self.egg_base = None
         self.egg_info = None
         self.tag_build = None
-        self.tag_svn_revision = 0
         self.tag_date = 0
         self.broken_egg_info = False
         self.vtags = None
@@ -165,7 +159,6 @@ def save_version_info(self, filename):
         # when PYTHONHASHSEED=0
         egg_info['tag_build'] = self.tags()
         egg_info['tag_date'] = 0
-        egg_info['tag_svn_revision'] = 0
         edit_config(filename, dict(egg_info=egg_info))
 
     def finalize_options(self):
@@ -282,22 +275,10 @@ def tags(self):
         version = ''
         if self.tag_build:
             version += self.tag_build
-        if self.tag_svn_revision:
-            warnings.warn(
-                "tag_svn_revision is deprecated and will not be honored "
-                "in a future release"
-            )
-            version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             version += time.strftime("-%Y%m%d")
         return version
 
-    @staticmethod
-    def get_svn_revision():
-        if 'svn_utils' not in globals():
-            return "0"
-        return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info, "SOURCES.txt")
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 75ae18dffd..a32b981d67 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -88,9 +88,8 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         assert '[egg_info]' in content
         assert 'tag_build =' in content
         assert 'tag_date = 0' in content
-        assert 'tag_svn_revision = 0' in content
 
-        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+        expected_order = 'tag_build', 'tag_date',
 
         self._validate_content_order(content, expected_order)
 
@@ -117,7 +116,6 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
             [egg_info]
             tag_build =
             tag_date = 0
-            tag_svn_revision = 0
             """),
         })
         dist = Distribution()
@@ -131,9 +129,8 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         assert '[egg_info]' in content
         assert 'tag_build =' in content
         assert 'tag_date = 0' in content
-        assert 'tag_svn_revision = 0' in content
 
-        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+        expected_order = 'tag_build', 'tag_date',
 
         self._validate_content_order(content, expected_order)
 

From 1397064fe7bf88947d00b91a8441234152ba195c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 13:14:06 -0500
Subject: [PATCH 6432/8469] =?UTF-8?q?Bump=20version:=2032.3.1=20=E2=86=92?=
 =?UTF-8?q?=2033.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 20370e9e65..e46be52a14 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 32.3.1
+current_version = 33.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 3c4faa321f..8e125fc18e 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="32.3.1",
+    version="33.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 4c2dc87f5c63333a6f83be217c86f387f9ecd02a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 22:24:22 -0500
Subject: [PATCH 6433/8469] Use the 'extras' feature of tox

---
 tests/requirements.txt | 1 -
 tox.ini                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index d07e9cdeb7..88a36c635c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,3 @@
 pytest-flake8
 pytest>=3.0.2
-setuptools[ssl]
 backports.unittest_mock>=1.2
diff --git a/tox.ini b/tox.ini
index cae9c745c2..3c222bf7fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,3 +3,4 @@ deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
 commands=py.test {posargs:-rsx}
 usedevelop=True
+extras=ssl

From ff371f18f0076bc63da05334f7e551c1cc29e10d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 22:34:28 -0500
Subject: [PATCH 6434/8469] Strip out vendored packages and require them
 instead. Ref #581.

---
 .travis.yml                                   |    6 +-
 bootstrap.py                                  |    2 +
 pavement.py                                   |   32 -
 pkg_resources/__init__.py                     |   15 +-
 pkg_resources/_vendor/__init__.py             |    0
 pkg_resources/_vendor/appdirs.py              |  552 --
 pkg_resources/_vendor/packaging/__about__.py  |   21 -
 pkg_resources/_vendor/packaging/__init__.py   |   14 -
 pkg_resources/_vendor/packaging/_compat.py    |   30 -
 .../_vendor/packaging/_structures.py          |   68 -
 pkg_resources/_vendor/packaging/markers.py    |  301 -
 .../_vendor/packaging/requirements.py         |  127 -
 pkg_resources/_vendor/packaging/specifiers.py |  774 ---
 pkg_resources/_vendor/packaging/utils.py      |   14 -
 pkg_resources/_vendor/packaging/version.py    |  393 --
 pkg_resources/_vendor/pyparsing.py            | 5696 -----------------
 pkg_resources/_vendor/six.py                  |  868 ---
 pkg_resources/_vendor/vendored.txt            |    4 -
 pkg_resources/extern/__init__.py              |   73 -
 pkg_resources/tests/test_pkg_resources.py     |    2 +-
 pkg_resources/tests/test_resources.py         |    4 +-
 setup.py                                      |   10 +-
 setuptools/__init__.py                        |    2 +-
 setuptools/command/alias.py                   |    2 +-
 setuptools/command/bdist_egg.py               |    2 +-
 setuptools/command/build_ext.py               |    2 +-
 setuptools/command/build_py.py                |    4 +-
 setuptools/command/develop.py                 |    2 +-
 setuptools/command/easy_install.py            |    4 +-
 setuptools/command/egg_info.py                |    6 +-
 setuptools/command/py36compat.py              |    2 +-
 setuptools/command/rotate.py                  |    2 +-
 setuptools/command/sdist.py                   |    2 +-
 setuptools/command/setopt.py                  |    2 +-
 setuptools/command/test.py                    |    4 +-
 setuptools/command/upload_docs.py             |    4 +-
 setuptools/config.py                          |    2 +-
 setuptools/dist.py                            |    6 +-
 setuptools/extension.py                       |    2 +-
 setuptools/extern/__init__.py                 |    4 -
 setuptools/glob.py                            |    2 +-
 setuptools/monkey.py                          |    2 +-
 setuptools/msvc.py                            |    6 +-
 setuptools/namespaces.py                      |    2 +-
 setuptools/package_index.py                   |    4 +-
 setuptools/py33compat.py                      |    2 +-
 setuptools/sandbox.py                         |    4 +-
 setuptools/ssl_support.py                     |    2 +-
 setuptools/tests/__init__.py                  |    2 +-
 setuptools/tests/contexts.py                  |    2 +-
 setuptools/tests/server.py                    |    2 +-
 setuptools/tests/test_archive_util.py         |    2 +-
 setuptools/tests/test_build_ext.py            |    2 +-
 setuptools/tests/test_develop.py              |    2 +-
 setuptools/tests/test_dist_info.py            |    2 +-
 setuptools/tests/test_easy_install.py         |    2 +-
 setuptools/tests/test_egg_info.py             |    2 +-
 setuptools/tests/test_integration.py          |    2 +-
 setuptools/tests/test_manifest.py             |    2 +-
 setuptools/tests/test_packageindex.py         |    4 +-
 setuptools/tests/test_sdist.py                |    4 +-
 setuptools/unicode_utils.py                   |    2 +-
 tests/test_pypi.py                            |    4 +-
 tox.ini                                       |    6 +-
 64 files changed, 84 insertions(+), 9042 deletions(-)
 delete mode 100644 pavement.py
 delete mode 100644 pkg_resources/_vendor/__init__.py
 delete mode 100644 pkg_resources/_vendor/appdirs.py
 delete mode 100644 pkg_resources/_vendor/packaging/__about__.py
 delete mode 100644 pkg_resources/_vendor/packaging/__init__.py
 delete mode 100644 pkg_resources/_vendor/packaging/_compat.py
 delete mode 100644 pkg_resources/_vendor/packaging/_structures.py
 delete mode 100644 pkg_resources/_vendor/packaging/markers.py
 delete mode 100644 pkg_resources/_vendor/packaging/requirements.py
 delete mode 100644 pkg_resources/_vendor/packaging/specifiers.py
 delete mode 100644 pkg_resources/_vendor/packaging/utils.py
 delete mode 100644 pkg_resources/_vendor/packaging/version.py
 delete mode 100644 pkg_resources/_vendor/pyparsing.py
 delete mode 100644 pkg_resources/_vendor/six.py
 delete mode 100644 pkg_resources/_vendor/vendored.txt
 delete mode 100644 pkg_resources/extern/__init__.py
 delete mode 100644 setuptools/extern/__init__.py

diff --git a/.travis.yml b/.travis.yml
index b402cf6d9f..cb8cae908d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,15 @@ env:
  - ""
  - LC_ALL=C LC_CTYPE=C
 script:
- - pip install tox
+ # need tox and rwt to get started
+ - pip install tox rwt
 
  # Output the env, to verify behavior
  - env
 
  # update egg_info based on setup.py in checkout
- - python bootstrap.py
+ - rwt -- bootstrap.py
 
- #- python -m tox
  - tox
 
 deploy:
diff --git a/bootstrap.py b/bootstrap.py
index c5f470a4fa..761b8dfcd2 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,6 +5,8 @@
 egg-info command to flesh out the egg-info directory.
 """
 
+__requires__ = ['packaging', 'six', 'appdirs']
+
 import os
 import sys
 import textwrap
diff --git a/pavement.py b/pavement.py
deleted file mode 100644
index f85617d4fe..0000000000
--- a/pavement.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import re
-
-from paver.easy import task, path as Path
-import pip
-
-
-def remove_all(paths):
-    for path in paths:
-        path.rmtree() if path.isdir() else path.remove()
-
-
-@task
-def update_vendored():
-    vendor = Path('pkg_resources/_vendor')
-    # pip uninstall doesn't support -t, so do it manually
-    remove_all(vendor.glob('packaging*'))
-    remove_all(vendor.glob('six*'))
-    remove_all(vendor.glob('pyparsing*'))
-    remove_all(vendor.glob('appdirs*'))
-    install_args = [
-        'install',
-        '-r', str(vendor / 'vendored.txt'),
-        '-t', str(vendor),
-    ]
-    pip.main(install_args)
-    packaging = vendor / 'packaging'
-    for file in packaging.glob('*.py'):
-        text = file.text()
-        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
-        file.write_text(text)
-    remove_all(vendor.glob('*.dist-info'))
-    remove_all(vendor.glob('*.egg-info'))
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4c9868c769..55c91595d4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -45,8 +45,8 @@
     # Python 3.2 compatibility
     import imp as _imp
 
-from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib, map, filter
+import six
+from six.moves import urllib, map, filter
 
 # capture these to bypass sandboxing
 from os import utime
@@ -67,12 +67,11 @@
 except ImportError:
     importlib_machinery = None
 
-from pkg_resources.extern import appdirs
-from pkg_resources.extern import packaging
-__import__('pkg_resources.extern.packaging.version')
-__import__('pkg_resources.extern.packaging.specifiers')
-__import__('pkg_resources.extern.packaging.requirements')
-__import__('pkg_resources.extern.packaging.markers')
+import packaging.version
+import packaging.specifiers
+import packaging.requirements
+import packaging.markers
+import appdirs
 
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")
diff --git a/pkg_resources/_vendor/__init__.py b/pkg_resources/_vendor/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
deleted file mode 100644
index f4dba0953c..0000000000
--- a/pkg_resources/_vendor/appdirs.py
+++ /dev/null
@@ -1,552 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005-2010 ActiveState Software Inc.
-# Copyright (c) 2013 Eddy Petrișor
-
-"""Utilities for determining application-specific dirs.
-
-See <http://github.com/ActiveState/appdirs> for details and usage.
-"""
-# Dev Notes:
-# - MSDN on where to store app data files:
-#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
-# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-__version_info__ = (1, 4, 0)
-__version__ = '.'.join(map(str, __version_info__))
-
-
-import sys
-import os
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    unicode = str
-
-if sys.platform.startswith('java'):
-    import platform
-    os_name = platform.java_ver()[3][0]
-    if os_name.startswith('Windows'): # "Windows XP", "Windows 7", etc.
-        system = 'win32'
-    elif os_name.startswith('Mac'): # "Mac OS X", etc.
-        system = 'darwin'
-    else: # "Linux", "SunOS", "FreeBSD", etc.
-        # Setting this to "linux2" is not ideal, but only Windows or Mac
-        # are actually checked for and the rest of the module expects
-        # *sys.platform* style strings.
-        system = 'linux2'
-else:
-    system = sys.platform
-
-
-
-def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
-    r"""Return full path to the user-specific data dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "roaming" (boolean, default False) can be set True to use the Windows
-            roaming appdata directory. That means that for users on a Windows
-            network setup for roaming profiles, this user data will be
-            sync'd on login. See
-            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
-            for a discussion of issues.
-
-    Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
-        Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
-        Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
-        Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
-        Win 7  (not roaming):   C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>
-        Win 7  (roaming):       C:\Users\<username>\AppData\Roaming\<AppAuthor>\<AppName>
-
-    For Unix, we follow the XDG spec and support $XDG_DATA_HOME.
-    That means, by default "~/.local/share/<AppName>".
-    """
-    if system == "win32":
-        if appauthor is None:
-            appauthor = appname
-        const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
-        path = os.path.normpath(_get_win_folder(const))
-        if appname:
-            if appauthor is not False:
-                path = os.path.join(path, appauthor, appname)
-            else:
-                path = os.path.join(path, appname)
-    elif system == 'darwin':
-        path = os.path.expanduser('~/Library/Application Support/')
-        if appname:
-            path = os.path.join(path, appname)
-    else:
-        path = os.getenv('XDG_DATA_HOME', os.path.expanduser("~/.local/share"))
-        if appname:
-            path = os.path.join(path, appname)
-    if appname and version:
-        path = os.path.join(path, version)
-    return path
-
-
-def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
-    """Return full path to the user-shared data dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "multipath" is an optional parameter only applicable to *nix
-            which indicates that the entire list of data dirs should be
-            returned. By default, the first item from XDG_DATA_DIRS is
-            returned, or '/usr/local/share/<AppName>',
-            if XDG_DATA_DIRS is not set
-
-    Typical user data directories are:
-        Mac OS X:   /Library/Application Support/<AppName>
-        Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
-        Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
-        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
-        Win 7:      C:\ProgramData\<AppAuthor>\<AppName>   # Hidden, but writeable on Win 7.
-
-    For Unix, this is using the $XDG_DATA_DIRS[0] default.
-
-    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
-    """
-    if system == "win32":
-        if appauthor is None:
-            appauthor = appname
-        path = os.path.normpath(_get_win_folder("CSIDL_COMMON_APPDATA"))
-        if appname:
-            if appauthor is not False:
-                path = os.path.join(path, appauthor, appname)
-            else:
-                path = os.path.join(path, appname)
-    elif system == 'darwin':
-        path = os.path.expanduser('/Library/Application Support')
-        if appname:
-            path = os.path.join(path, appname)
-    else:
-        # XDG default for $XDG_DATA_DIRS
-        # only first, if multipath is False
-        path = os.getenv('XDG_DATA_DIRS',
-                         os.pathsep.join(['/usr/local/share', '/usr/share']))
-        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
-        if appname:
-            if version:
-                appname = os.path.join(appname, version)
-            pathlist = [os.sep.join([x, appname]) for x in pathlist]
-
-        if multipath:
-            path = os.pathsep.join(pathlist)
-        else:
-            path = pathlist[0]
-        return path
-
-    if appname and version:
-        path = os.path.join(path, version)
-    return path
-
-
-def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
-    r"""Return full path to the user-specific config dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "roaming" (boolean, default False) can be set True to use the Windows
-            roaming appdata directory. That means that for users on a Windows
-            network setup for roaming profiles, this user data will be
-            sync'd on login. See
-            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
-            for a discussion of issues.
-
-    Typical user data directories are:
-        Mac OS X:               same as user_data_dir
-        Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
-        Win *:                  same as user_data_dir
-
-    For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME.
-    That means, by deafult "~/.config/<AppName>".
-    """
-    if system in ["win32", "darwin"]:
-        path = user_data_dir(appname, appauthor, None, roaming)
-    else:
-        path = os.getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config"))
-        if appname:
-            path = os.path.join(path, appname)
-    if appname and version:
-        path = os.path.join(path, version)
-    return path
-
-
-def site_config_dir(appname=None, appauthor=None, version=None, multipath=False):
-    """Return full path to the user-shared data dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "multipath" is an optional parameter only applicable to *nix
-            which indicates that the entire list of config dirs should be
-            returned. By default, the first item from XDG_CONFIG_DIRS is
-            returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
-
-    Typical user data directories are:
-        Mac OS X:   same as site_data_dir
-        Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
-                    $XDG_CONFIG_DIRS
-        Win *:      same as site_data_dir
-        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
-
-    For Unix, this is using the $XDG_CONFIG_DIRS[0] default, if multipath=False
-
-    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
-    """
-    if system in ["win32", "darwin"]:
-        path = site_data_dir(appname, appauthor)
-        if appname and version:
-            path = os.path.join(path, version)
-    else:
-        # XDG default for $XDG_CONFIG_DIRS
-        # only first, if multipath is False
-        path = os.getenv('XDG_CONFIG_DIRS', '/etc/xdg')
-        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
-        if appname:
-            if version:
-                appname = os.path.join(appname, version)
-            pathlist = [os.sep.join([x, appname]) for x in pathlist]
-
-        if multipath:
-            path = os.pathsep.join(pathlist)
-        else:
-            path = pathlist[0]
-    return path
-
-
-def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
-    r"""Return full path to the user-specific cache dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "opinion" (boolean) can be False to disable the appending of
-            "Cache" to the base app data dir for Windows. See
-            discussion below.
-
-    Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
-        Unix:       ~/.cache/<AppName> (XDG default)
-        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
-        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
-
-    On Windows the only suggestion in the MSDN docs is that local settings go in
-    the `CSIDL_LOCAL_APPDATA` directory. This is identical to the non-roaming
-    app data dir (the default returned by `user_data_dir` above). Apps typically
-    put cache data somewhere *under* the given dir here. Some examples:
-        ...\Mozilla\Firefox\Profiles\<ProfileName>\Cache
-        ...\Acme\SuperApp\Cache\1.0
-    OPINION: This function appends "Cache" to the `CSIDL_LOCAL_APPDATA` value.
-    This can be disabled with the `opinion=False` option.
-    """
-    if system == "win32":
-        if appauthor is None:
-            appauthor = appname
-        path = os.path.normpath(_get_win_folder("CSIDL_LOCAL_APPDATA"))
-        if appname:
-            if appauthor is not False:
-                path = os.path.join(path, appauthor, appname)
-            else:
-                path = os.path.join(path, appname)
-            if opinion:
-                path = os.path.join(path, "Cache")
-    elif system == 'darwin':
-        path = os.path.expanduser('~/Library/Caches')
-        if appname:
-            path = os.path.join(path, appname)
-    else:
-        path = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
-        if appname:
-            path = os.path.join(path, appname)
-    if appname and version:
-        path = os.path.join(path, version)
-    return path
-
-
-def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
-    r"""Return full path to the user-specific log dir for this application.
-
-        "appname" is the name of application.
-            If None, just the system directory is returned.
-        "appauthor" (only used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name. This falls back to appname. You may
-            pass False to disable it.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-            Only applied when appname is present.
-        "opinion" (boolean) can be False to disable the appending of
-            "Logs" to the base app data dir for Windows, and "log" to the
-            base cache dir for Unix. See discussion below.
-
-    Typical user cache directories are:
-        Mac OS X:   ~/Library/Logs/<AppName>
-        Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
-        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
-        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
-
-    On Windows the only suggestion in the MSDN docs is that local settings
-    go in the `CSIDL_LOCAL_APPDATA` directory. (Note: I'm interested in
-    examples of what some windows apps use for a logs dir.)
-
-    OPINION: This function appends "Logs" to the `CSIDL_LOCAL_APPDATA`
-    value for Windows and appends "log" to the user cache dir for Unix.
-    This can be disabled with the `opinion=False` option.
-    """
-    if system == "darwin":
-        path = os.path.join(
-            os.path.expanduser('~/Library/Logs'),
-            appname)
-    elif system == "win32":
-        path = user_data_dir(appname, appauthor, version)
-        version = False
-        if opinion:
-            path = os.path.join(path, "Logs")
-    else:
-        path = user_cache_dir(appname, appauthor, version)
-        version = False
-        if opinion:
-            path = os.path.join(path, "log")
-    if appname and version:
-        path = os.path.join(path, version)
-    return path
-
-
-class AppDirs(object):
-    """Convenience wrapper for getting application dirs."""
-    def __init__(self, appname, appauthor=None, version=None, roaming=False,
-                 multipath=False):
-        self.appname = appname
-        self.appauthor = appauthor
-        self.version = version
-        self.roaming = roaming
-        self.multipath = multipath
-
-    @property
-    def user_data_dir(self):
-        return user_data_dir(self.appname, self.appauthor,
-                             version=self.version, roaming=self.roaming)
-
-    @property
-    def site_data_dir(self):
-        return site_data_dir(self.appname, self.appauthor,
-                             version=self.version, multipath=self.multipath)
-
-    @property
-    def user_config_dir(self):
-        return user_config_dir(self.appname, self.appauthor,
-                               version=self.version, roaming=self.roaming)
-
-    @property
-    def site_config_dir(self):
-        return site_config_dir(self.appname, self.appauthor,
-                             version=self.version, multipath=self.multipath)
-
-    @property
-    def user_cache_dir(self):
-        return user_cache_dir(self.appname, self.appauthor,
-                              version=self.version)
-
-    @property
-    def user_log_dir(self):
-        return user_log_dir(self.appname, self.appauthor,
-                            version=self.version)
-
-
-#---- internal support stuff
-
-def _get_win_folder_from_registry(csidl_name):
-    """This is a fallback technique at best. I'm not sure if using the
-    registry for this guarantees us the correct answer for all CSIDL_*
-    names.
-    """
-    import _winreg
-
-    shell_folder_name = {
-        "CSIDL_APPDATA": "AppData",
-        "CSIDL_COMMON_APPDATA": "Common AppData",
-        "CSIDL_LOCAL_APPDATA": "Local AppData",
-    }[csidl_name]
-
-    key = _winreg.OpenKey(
-        _winreg.HKEY_CURRENT_USER,
-        r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-    )
-    dir, type = _winreg.QueryValueEx(key, shell_folder_name)
-    return dir
-
-
-def _get_win_folder_with_pywin32(csidl_name):
-    from win32com.shell import shellcon, shell
-    dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
-    # Try to make this a unicode path because SHGetFolderPath does
-    # not return unicode strings when there is unicode data in the
-    # path.
-    try:
-        dir = unicode(dir)
-
-        # Downgrade to short path name if have highbit chars. See
-        # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
-        has_high_char = False
-        for c in dir:
-            if ord(c) > 255:
-                has_high_char = True
-                break
-        if has_high_char:
-            try:
-                import win32api
-                dir = win32api.GetShortPathName(dir)
-            except ImportError:
-                pass
-    except UnicodeError:
-        pass
-    return dir
-
-
-def _get_win_folder_with_ctypes(csidl_name):
-    import ctypes
-
-    csidl_const = {
-        "CSIDL_APPDATA": 26,
-        "CSIDL_COMMON_APPDATA": 35,
-        "CSIDL_LOCAL_APPDATA": 28,
-    }[csidl_name]
-
-    buf = ctypes.create_unicode_buffer(1024)
-    ctypes.windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
-
-    # Downgrade to short path name if have highbit chars. See
-    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
-    has_high_char = False
-    for c in buf:
-        if ord(c) > 255:
-            has_high_char = True
-            break
-    if has_high_char:
-        buf2 = ctypes.create_unicode_buffer(1024)
-        if ctypes.windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
-            buf = buf2
-
-    return buf.value
-
-def _get_win_folder_with_jna(csidl_name):
-    import array
-    from com.sun import jna
-    from com.sun.jna.platform import win32
-
-    buf_size = win32.WinDef.MAX_PATH * 2
-    buf = array.zeros('c', buf_size)
-    shell = win32.Shell32.INSTANCE
-    shell.SHGetFolderPath(None, getattr(win32.ShlObj, csidl_name), None, win32.ShlObj.SHGFP_TYPE_CURRENT, buf)
-    dir = jna.Native.toString(buf.tostring()).rstrip("\0")
-
-    # Downgrade to short path name if have highbit chars. See
-    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
-    has_high_char = False
-    for c in dir:
-        if ord(c) > 255:
-            has_high_char = True
-            break
-    if has_high_char:
-        buf = array.zeros('c', buf_size)
-        kernel = win32.Kernel32.INSTANCE
-        if kernal.GetShortPathName(dir, buf, buf_size):
-            dir = jna.Native.toString(buf.tostring()).rstrip("\0")
-
-    return dir
-
-if system == "win32":
-    try:
-        import win32com.shell
-        _get_win_folder = _get_win_folder_with_pywin32
-    except ImportError:
-        try:
-            from ctypes import windll
-            _get_win_folder = _get_win_folder_with_ctypes
-        except ImportError:
-            try:
-                import com.sun.jna
-                _get_win_folder = _get_win_folder_with_jna
-            except ImportError:
-                _get_win_folder = _get_win_folder_from_registry
-
-
-#---- self test code
-
-if __name__ == "__main__":
-    appname = "MyApp"
-    appauthor = "MyCompany"
-
-    props = ("user_data_dir", "site_data_dir",
-             "user_config_dir", "site_config_dir",
-             "user_cache_dir", "user_log_dir")
-
-    print("-- app dirs (with optional 'version')")
-    dirs = AppDirs(appname, appauthor, version="1.0")
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))
-
-    print("\n-- app dirs (without optional 'version')")
-    dirs = AppDirs(appname, appauthor)
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))
-
-    print("\n-- app dirs (without optional 'appauthor')")
-    dirs = AppDirs(appname)
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))
-
-    print("\n-- app dirs (with disabled 'appauthor')")
-    dirs = AppDirs(appname, appauthor=False)
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
deleted file mode 100644
index 95d330ef82..0000000000
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-__all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
-]
-
-__title__ = "packaging"
-__summary__ = "Core utilities for Python packages"
-__uri__ = "https://github.com/pypa/packaging"
-
-__version__ = "16.8"
-
-__author__ = "Donald Stufft and individual contributors"
-__email__ = "donald@stufft.io"
-
-__license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2014-2016 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py
deleted file mode 100644
index 5ee6220203..0000000000
--- a/pkg_resources/_vendor/packaging/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-from .__about__ import (
-    __author__, __copyright__, __email__, __license__, __summary__, __title__,
-    __uri__, __version__
-)
-
-__all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
-]
diff --git a/pkg_resources/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
deleted file mode 100644
index 210bb80b7e..0000000000
--- a/pkg_resources/_vendor/packaging/_compat.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import sys
-
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-# flake8: noqa
-
-if PY3:
-    string_types = str,
-else:
-    string_types = basestring,
-
-
-def with_metaclass(meta, *bases):
-    """
-    Create a base class with a metaclass.
-    """
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
deleted file mode 100644
index ccc27861c3..0000000000
--- a/pkg_resources/_vendor/packaging/_structures.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-
-class Infinity(object):
-
-    def __repr__(self):
-        return "Infinity"
-
-    def __hash__(self):
-        return hash(repr(self))
-
-    def __lt__(self, other):
-        return False
-
-    def __le__(self, other):
-        return False
-
-    def __eq__(self, other):
-        return isinstance(other, self.__class__)
-
-    def __ne__(self, other):
-        return not isinstance(other, self.__class__)
-
-    def __gt__(self, other):
-        return True
-
-    def __ge__(self, other):
-        return True
-
-    def __neg__(self):
-        return NegativeInfinity
-
-Infinity = Infinity()
-
-
-class NegativeInfinity(object):
-
-    def __repr__(self):
-        return "-Infinity"
-
-    def __hash__(self):
-        return hash(repr(self))
-
-    def __lt__(self, other):
-        return True
-
-    def __le__(self, other):
-        return True
-
-    def __eq__(self, other):
-        return isinstance(other, self.__class__)
-
-    def __ne__(self, other):
-        return not isinstance(other, self.__class__)
-
-    def __gt__(self, other):
-        return False
-
-    def __ge__(self, other):
-        return False
-
-    def __neg__(self):
-        return Infinity
-
-NegativeInfinity = NegativeInfinity()
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
deleted file mode 100644
index 892e578edd..0000000000
--- a/pkg_resources/_vendor/packaging/markers.py
+++ /dev/null
@@ -1,301 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import operator
-import os
-import platform
-import sys
-
-from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
-from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
-from pkg_resources.extern.pyparsing import Literal as L  # noqa
-
-from ._compat import string_types
-from .specifiers import Specifier, InvalidSpecifier
-
-
-__all__ = [
-    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
-    "Marker", "default_environment",
-]
-
-
-class InvalidMarker(ValueError):
-    """
-    An invalid marker was found, users should refer to PEP 508.
-    """
-
-
-class UndefinedComparison(ValueError):
-    """
-    An invalid operation was attempted on a value that doesn't support it.
-    """
-
-
-class UndefinedEnvironmentName(ValueError):
-    """
-    A name was attempted to be used that does not exist inside of the
-    environment.
-    """
-
-
-class Node(object):
-
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return str(self.value)
-
-    def __repr__(self):
-        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
-
-    def serialize(self):
-        raise NotImplementedError
-
-
-class Variable(Node):
-
-    def serialize(self):
-        return str(self)
-
-
-class Value(Node):
-
-    def serialize(self):
-        return '"{0}"'.format(self)
-
-
-class Op(Node):
-
-    def serialize(self):
-        return str(self)
-
-
-VARIABLE = (
-    L("implementation_version") |
-    L("platform_python_implementation") |
-    L("implementation_name") |
-    L("python_full_version") |
-    L("platform_release") |
-    L("platform_version") |
-    L("platform_machine") |
-    L("platform_system") |
-    L("python_version") |
-    L("sys_platform") |
-    L("os_name") |
-    L("os.name") |  # PEP-345
-    L("sys.platform") |  # PEP-345
-    L("platform.version") |  # PEP-345
-    L("platform.machine") |  # PEP-345
-    L("platform.python_implementation") |  # PEP-345
-    L("python_implementation") |  # undocumented setuptools legacy
-    L("extra")
-)
-ALIASES = {
-    'os.name': 'os_name',
-    'sys.platform': 'sys_platform',
-    'platform.version': 'platform_version',
-    'platform.machine': 'platform_machine',
-    'platform.python_implementation': 'platform_python_implementation',
-    'python_implementation': 'platform_python_implementation'
-}
-VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
-
-VERSION_CMP = (
-    L("===") |
-    L("==") |
-    L(">=") |
-    L("<=") |
-    L("!=") |
-    L("~=") |
-    L(">") |
-    L("<")
-)
-
-MARKER_OP = VERSION_CMP | L("not in") | L("in")
-MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
-
-MARKER_VALUE = QuotedString("'") | QuotedString('"')
-MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
-
-BOOLOP = L("and") | L("or")
-
-MARKER_VAR = VARIABLE | MARKER_VALUE
-
-MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
-MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
-
-LPAREN = L("(").suppress()
-RPAREN = L(")").suppress()
-
-MARKER_EXPR = Forward()
-MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
-MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
-
-MARKER = stringStart + MARKER_EXPR + stringEnd
-
-
-def _coerce_parse_result(results):
-    if isinstance(results, ParseResults):
-        return [_coerce_parse_result(i) for i in results]
-    else:
-        return results
-
-
-def _format_marker(marker, first=True):
-    assert isinstance(marker, (list, tuple, string_types))
-
-    # Sometimes we have a structure like [[...]] which is a single item list
-    # where the single item is itself it's own list. In that case we want skip
-    # the rest of this function so that we don't get extraneous () on the
-    # outside.
-    if (isinstance(marker, list) and len(marker) == 1 and
-            isinstance(marker[0], (list, tuple))):
-        return _format_marker(marker[0])
-
-    if isinstance(marker, list):
-        inner = (_format_marker(m, first=False) for m in marker)
-        if first:
-            return " ".join(inner)
-        else:
-            return "(" + " ".join(inner) + ")"
-    elif isinstance(marker, tuple):
-        return " ".join([m.serialize() for m in marker])
-    else:
-        return marker
-
-
-_operators = {
-    "in": lambda lhs, rhs: lhs in rhs,
-    "not in": lambda lhs, rhs: lhs not in rhs,
-    "<": operator.lt,
-    "<=": operator.le,
-    "==": operator.eq,
-    "!=": operator.ne,
-    ">=": operator.ge,
-    ">": operator.gt,
-}
-
-
-def _eval_op(lhs, op, rhs):
-    try:
-        spec = Specifier("".join([op.serialize(), rhs]))
-    except InvalidSpecifier:
-        pass
-    else:
-        return spec.contains(lhs)
-
-    oper = _operators.get(op.serialize())
-    if oper is None:
-        raise UndefinedComparison(
-            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
-        )
-
-    return oper(lhs, rhs)
-
-
-_undefined = object()
-
-
-def _get_env(environment, name):
-    value = environment.get(name, _undefined)
-
-    if value is _undefined:
-        raise UndefinedEnvironmentName(
-            "{0!r} does not exist in evaluation environment.".format(name)
-        )
-
-    return value
-
-
-def _evaluate_markers(markers, environment):
-    groups = [[]]
-
-    for marker in markers:
-        assert isinstance(marker, (list, tuple, string_types))
-
-        if isinstance(marker, list):
-            groups[-1].append(_evaluate_markers(marker, environment))
-        elif isinstance(marker, tuple):
-            lhs, op, rhs = marker
-
-            if isinstance(lhs, Variable):
-                lhs_value = _get_env(environment, lhs.value)
-                rhs_value = rhs.value
-            else:
-                lhs_value = lhs.value
-                rhs_value = _get_env(environment, rhs.value)
-
-            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
-        else:
-            assert marker in ["and", "or"]
-            if marker == "or":
-                groups.append([])
-
-    return any(all(item) for item in groups)
-
-
-def format_full_version(info):
-    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
-    kind = info.releaselevel
-    if kind != 'final':
-        version += kind[0] + str(info.serial)
-    return version
-
-
-def default_environment():
-    if hasattr(sys, 'implementation'):
-        iver = format_full_version(sys.implementation.version)
-        implementation_name = sys.implementation.name
-    else:
-        iver = '0'
-        implementation_name = ''
-
-    return {
-        "implementation_name": implementation_name,
-        "implementation_version": iver,
-        "os_name": os.name,
-        "platform_machine": platform.machine(),
-        "platform_release": platform.release(),
-        "platform_system": platform.system(),
-        "platform_version": platform.version(),
-        "python_full_version": platform.python_version(),
-        "platform_python_implementation": platform.python_implementation(),
-        "python_version": platform.python_version()[:3],
-        "sys_platform": sys.platform,
-    }
-
-
-class Marker(object):
-
-    def __init__(self, marker):
-        try:
-            self._markers = _coerce_parse_result(MARKER.parseString(marker))
-        except ParseException as e:
-            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
-                marker, marker[e.loc:e.loc + 8])
-            raise InvalidMarker(err_str)
-
-    def __str__(self):
-        return _format_marker(self._markers)
-
-    def __repr__(self):
-        return "<Marker({0!r})>".format(str(self))
-
-    def evaluate(self, environment=None):
-        """Evaluate a marker.
-
-        Return the boolean from evaluating the given marker against the
-        environment. environment is an optional argument to override all or
-        part of the determined environment.
-
-        The environment is determined from the current Python process.
-        """
-        current_environment = default_environment()
-        if environment is not None:
-            current_environment.update(environment)
-
-        return _evaluate_markers(self._markers, current_environment)
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
deleted file mode 100644
index 0c8c4a3852..0000000000
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import string
-import re
-
-from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
-from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
-from pkg_resources.extern.pyparsing import Literal as L  # noqa
-from pkg_resources.extern.six.moves.urllib import parse as urlparse
-
-from .markers import MARKER_EXPR, Marker
-from .specifiers import LegacySpecifier, Specifier, SpecifierSet
-
-
-class InvalidRequirement(ValueError):
-    """
-    An invalid requirement was found, users should refer to PEP 508.
-    """
-
-
-ALPHANUM = Word(string.ascii_letters + string.digits)
-
-LBRACKET = L("[").suppress()
-RBRACKET = L("]").suppress()
-LPAREN = L("(").suppress()
-RPAREN = L(")").suppress()
-COMMA = L(",").suppress()
-SEMICOLON = L(";").suppress()
-AT = L("@").suppress()
-
-PUNCTUATION = Word("-_.")
-IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
-IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
-
-NAME = IDENTIFIER("name")
-EXTRA = IDENTIFIER
-
-URI = Regex(r'[^ ]+')("url")
-URL = (AT + URI)
-
-EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
-EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
-
-VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
-VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
-
-VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
-VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
-                       joinString=",", adjacent=False)("_raw_spec")
-_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
-_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
-
-VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
-VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
-
-MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
-MARKER_EXPR.setParseAction(
-    lambda s, l, t: Marker(s[t._original_start:t._original_end])
-)
-MARKER_SEPERATOR = SEMICOLON
-MARKER = MARKER_SEPERATOR + MARKER_EXPR
-
-VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
-URL_AND_MARKER = URL + Optional(MARKER)
-
-NAMED_REQUIREMENT = \
-    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
-
-REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
-
-
-class Requirement(object):
-    """Parse a requirement.
-
-    Parse a given requirement string into its parts, such as name, specifier,
-    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
-    string.
-    """
-
-    # TODO: Can we test whether something is contained within a requirement?
-    #       If so how do we do that? Do we need to test against the _name_ of
-    #       the thing as well as the version? What about the markers?
-    # TODO: Can we normalize the name and extra name?
-
-    def __init__(self, requirement_string):
-        try:
-            req = REQUIREMENT.parseString(requirement_string)
-        except ParseException as e:
-            raise InvalidRequirement(
-                "Invalid requirement, parse error at \"{0!r}\"".format(
-                    requirement_string[e.loc:e.loc + 8]))
-
-        self.name = req.name
-        if req.url:
-            parsed_url = urlparse.urlparse(req.url)
-            if not (parsed_url.scheme and parsed_url.netloc) or (
-                    not parsed_url.scheme and not parsed_url.netloc):
-                raise InvalidRequirement("Invalid URL given")
-            self.url = req.url
-        else:
-            self.url = None
-        self.extras = set(req.extras.asList() if req.extras else [])
-        self.specifier = SpecifierSet(req.specifier)
-        self.marker = req.marker if req.marker else None
-
-    def __str__(self):
-        parts = [self.name]
-
-        if self.extras:
-            parts.append("[{0}]".format(",".join(sorted(self.extras))))
-
-        if self.specifier:
-            parts.append(str(self.specifier))
-
-        if self.url:
-            parts.append("@ {0}".format(self.url))
-
-        if self.marker:
-            parts.append("; {0}".format(self.marker))
-
-        return "".join(parts)
-
-    def __repr__(self):
-        return "<Requirement({0!r})>".format(str(self))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
deleted file mode 100644
index 7f5a76cfd6..0000000000
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ /dev/null
@@ -1,774 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import abc
-import functools
-import itertools
-import re
-
-from ._compat import string_types, with_metaclass
-from .version import Version, LegacyVersion, parse
-
-
-class InvalidSpecifier(ValueError):
-    """
-    An invalid specifier was found, users should refer to PEP 440.
-    """
-
-
-class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
-
-    @abc.abstractmethod
-    def __str__(self):
-        """
-        Returns the str representation of this Specifier like object. This
-        should be representative of the Specifier itself.
-        """
-
-    @abc.abstractmethod
-    def __hash__(self):
-        """
-        Returns a hash value for this Specifier like object.
-        """
-
-    @abc.abstractmethod
-    def __eq__(self, other):
-        """
-        Returns a boolean representing whether or not the two Specifier like
-        objects are equal.
-        """
-
-    @abc.abstractmethod
-    def __ne__(self, other):
-        """
-        Returns a boolean representing whether or not the two Specifier like
-        objects are not equal.
-        """
-
-    @abc.abstractproperty
-    def prereleases(self):
-        """
-        Returns whether or not pre-releases as a whole are allowed by this
-        specifier.
-        """
-
-    @prereleases.setter
-    def prereleases(self, value):
-        """
-        Sets whether or not pre-releases as a whole are allowed by this
-        specifier.
-        """
-
-    @abc.abstractmethod
-    def contains(self, item, prereleases=None):
-        """
-        Determines if the given item is contained within this specifier.
-        """
-
-    @abc.abstractmethod
-    def filter(self, iterable, prereleases=None):
-        """
-        Takes an iterable of items and filters them so that only items which
-        are contained within this specifier are allowed in it.
-        """
-
-
-class _IndividualSpecifier(BaseSpecifier):
-
-    _operators = {}
-
-    def __init__(self, spec="", prereleases=None):
-        match = self._regex.search(spec)
-        if not match:
-            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
-
-        self._spec = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
-
-        # Store whether or not this Specifier should accept prereleases
-        self._prereleases = prereleases
-
-    def __repr__(self):
-        pre = (
-            ", prereleases={0!r}".format(self.prereleases)
-            if self._prereleases is not None
-            else ""
-        )
-
-        return "<{0}({1!r}{2})>".format(
-            self.__class__.__name__,
-            str(self),
-            pre,
-        )
-
-    def __str__(self):
-        return "{0}{1}".format(*self._spec)
-
-    def __hash__(self):
-        return hash(self._spec)
-
-    def __eq__(self, other):
-        if isinstance(other, string_types):
-            try:
-                other = self.__class__(other)
-            except InvalidSpecifier:
-                return NotImplemented
-        elif not isinstance(other, self.__class__):
-            return NotImplemented
-
-        return self._spec == other._spec
-
-    def __ne__(self, other):
-        if isinstance(other, string_types):
-            try:
-                other = self.__class__(other)
-            except InvalidSpecifier:
-                return NotImplemented
-        elif not isinstance(other, self.__class__):
-            return NotImplemented
-
-        return self._spec != other._spec
-
-    def _get_operator(self, op):
-        return getattr(self, "_compare_{0}".format(self._operators[op]))
-
-    def _coerce_version(self, version):
-        if not isinstance(version, (LegacyVersion, Version)):
-            version = parse(version)
-        return version
-
-    @property
-    def operator(self):
-        return self._spec[0]
-
-    @property
-    def version(self):
-        return self._spec[1]
-
-    @property
-    def prereleases(self):
-        return self._prereleases
-
-    @prereleases.setter
-    def prereleases(self, value):
-        self._prereleases = value
-
-    def __contains__(self, item):
-        return self.contains(item)
-
-    def contains(self, item, prereleases=None):
-        # Determine if prereleases are to be allowed or not.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # Normalize item to a Version or LegacyVersion, this allows us to have
-        # a shortcut for ``"2.0" in Specifier(">=2")
-        item = self._coerce_version(item)
-
-        # Determine if we should be supporting prereleases in this specifier
-        # or not, if we do not support prereleases than we can short circuit
-        # logic if this version is a prereleases.
-        if item.is_prerelease and not prereleases:
-            return False
-
-        # Actually do the comparison to determine if this item is contained
-        # within this Specifier or not.
-        return self._get_operator(self.operator)(item, self.version)
-
-    def filter(self, iterable, prereleases=None):
-        yielded = False
-        found_prereleases = []
-
-        kw = {"prereleases": prereleases if prereleases is not None else True}
-
-        # Attempt to iterate over all the values in the iterable and if any of
-        # them match, yield them.
-        for version in iterable:
-            parsed_version = self._coerce_version(version)
-
-            if self.contains(parsed_version, **kw):
-                # If our version is a prerelease, and we were not set to allow
-                # prereleases, then we'll store it for later incase nothing
-                # else matches this specifier.
-                if (parsed_version.is_prerelease and not
-                        (prereleases or self.prereleases)):
-                    found_prereleases.append(version)
-                # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the begining.
-                else:
-                    yielded = True
-                    yield version
-
-        # Now that we've iterated over everything, determine if we've yielded
-        # any values, and if we have not and we have any prereleases stored up
-        # then we will go ahead and yield the prereleases.
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
-
-
-class LegacySpecifier(_IndividualSpecifier):
-
-    _regex_str = (
-        r"""
-        (?P<operator>(==|!=|<=|>=|<|>))
-        \s*
-        (?P<version>
-            [^,;\s)]* # Since this is a "legacy" specifier, and the version
-                      # string can be just about anything, we match everything
-                      # except for whitespace, a semi-colon for marker support,
-                      # a closing paren since versions can be enclosed in
-                      # them, and a comma since it's a version separator.
-        )
-        """
-    )
-
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
-
-    _operators = {
-        "==": "equal",
-        "!=": "not_equal",
-        "<=": "less_than_equal",
-        ">=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-    }
-
-    def _coerce_version(self, version):
-        if not isinstance(version, LegacyVersion):
-            version = LegacyVersion(str(version))
-        return version
-
-    def _compare_equal(self, prospective, spec):
-        return prospective == self._coerce_version(spec)
-
-    def _compare_not_equal(self, prospective, spec):
-        return prospective != self._coerce_version(spec)
-
-    def _compare_less_than_equal(self, prospective, spec):
-        return prospective <= self._coerce_version(spec)
-
-    def _compare_greater_than_equal(self, prospective, spec):
-        return prospective >= self._coerce_version(spec)
-
-    def _compare_less_than(self, prospective, spec):
-        return prospective < self._coerce_version(spec)
-
-    def _compare_greater_than(self, prospective, spec):
-        return prospective > self._coerce_version(spec)
-
-
-def _require_version_compare(fn):
-    @functools.wraps(fn)
-    def wrapped(self, prospective, spec):
-        if not isinstance(prospective, Version):
-            return False
-        return fn(self, prospective, spec)
-    return wrapped
-
-
-class Specifier(_IndividualSpecifier):
-
-    _regex_str = (
-        r"""
-        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
-        (?P<version>
-            (?:
-                # The identity operators allow for an escape hatch that will
-                # do an exact string match of the version you wish to install.
-                # This will not be parsed by PEP 440 and we cannot determine
-                # any semantic meaning from it. This operator is discouraged
-                # but included entirely as an escape hatch.
-                (?<====)  # Only match for the identity operator
-                \s*
-                [^\s]*    # We just match everything, except for whitespace
-                          # since we are only testing for strict identity.
-            )
-            |
-            (?:
-                # The (non)equality operators allow for wild card and local
-                # versions to be specified so we have to define these two
-                # operators separately to enable that.
-                (?<===|!=)            # Only match for equals and not equals
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-
-                # You cannot use a wild card and a dev or local version
-                # together so group them with a | and make them optional.
-                (?:
-                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
-                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
-                    |
-                    \.\*  # Wild card syntax of .*
-                )?
-            )
-            |
-            (?:
-                # The compatible operator requires at least two digits in the
-                # release segment.
-                (?<=~=)               # Only match for the compatible operator
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-            |
-            (?:
-                # All other operators only allow a sub set of what the
-                # (non)equality operators do. Specifically they do not allow
-                # local versions to be specified nor do they allow the prefix
-                # matching wild cards.
-                (?<!==|!=|~=)         # We have special cases for these
-                                      # operators so we want to make sure they
-                                      # don't match here.
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-        )
-        """
-    )
-
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
-
-    _operators = {
-        "~=": "compatible",
-        "==": "equal",
-        "!=": "not_equal",
-        "<=": "less_than_equal",
-        ">=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-        "===": "arbitrary",
-    }
-
-    @_require_version_compare
-    def _compare_compatible(self, prospective, spec):
-        # Compatible releases have an equivalent combination of >= and ==. That
-        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
-        # implement this in terms of the other specifiers instead of
-        # implementing it ourselves. The only thing we need to do is construct
-        # the other specifiers.
-
-        # We want everything but the last item in the version, but we want to
-        # ignore post and dev releases and we want to treat the pre-release as
-        # it's own separate segment.
-        prefix = ".".join(
-            list(
-                itertools.takewhile(
-                    lambda x: (not x.startswith("post") and not
-                               x.startswith("dev")),
-                    _version_split(spec),
-                )
-            )[:-1]
-        )
-
-        # Add the prefix notation to the end of our string
-        prefix += ".*"
-
-        return (self._get_operator(">=")(prospective, spec) and
-                self._get_operator("==")(prospective, prefix))
-
-    @_require_version_compare
-    def _compare_equal(self, prospective, spec):
-        # We need special logic to handle prefix matching
-        if spec.endswith(".*"):
-            # In the case of prefix matching we want to ignore local segment.
-            prospective = Version(prospective.public)
-            # Split the spec out by dots, and pretend that there is an implicit
-            # dot in between a release segment and a pre-release segment.
-            spec = _version_split(spec[:-2])  # Remove the trailing .*
-
-            # Split the prospective version out by dots, and pretend that there
-            # is an implicit dot in between a release segment and a pre-release
-            # segment.
-            prospective = _version_split(str(prospective))
-
-            # Shorten the prospective version to be the same length as the spec
-            # so that we can determine if the specifier is a prefix of the
-            # prospective version or not.
-            prospective = prospective[:len(spec)]
-
-            # Pad out our two sides with zeros so that they both equal the same
-            # length.
-            spec, prospective = _pad_version(spec, prospective)
-        else:
-            # Convert our spec string into a Version
-            spec = Version(spec)
-
-            # If the specifier does not have a local segment, then we want to
-            # act as if the prospective version also does not have a local
-            # segment.
-            if not spec.local:
-                prospective = Version(prospective.public)
-
-        return prospective == spec
-
-    @_require_version_compare
-    def _compare_not_equal(self, prospective, spec):
-        return not self._compare_equal(prospective, spec)
-
-    @_require_version_compare
-    def _compare_less_than_equal(self, prospective, spec):
-        return prospective <= Version(spec)
-
-    @_require_version_compare
-    def _compare_greater_than_equal(self, prospective, spec):
-        return prospective >= Version(spec)
-
-    @_require_version_compare
-    def _compare_less_than(self, prospective, spec):
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec)
-
-        # Check to see if the prospective version is less than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective < spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a pre-release version, that we do not accept pre-release
-        # versions for the version mentioned in the specifier (e.g. <3.1 should
-        # not match 3.1.dev0, but should match 3.0.dev0).
-        if not spec.is_prerelease and prospective.is_prerelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # less than the spec version *and* it's not a pre-release of the same
-        # version in the spec.
-        return True
-
-    @_require_version_compare
-    def _compare_greater_than(self, prospective, spec):
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec)
-
-        # Check to see if the prospective version is greater than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective > spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a post-release version, that we do not accept
-        # post-release versions for the version mentioned in the specifier
-        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
-        if not spec.is_postrelease and prospective.is_postrelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is techincally greater than, to match.
-        if prospective.local is not None:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # greater than the spec version *and* it's not a pre-release of the
-        # same version in the spec.
-        return True
-
-    def _compare_arbitrary(self, prospective, spec):
-        return str(prospective).lower() == str(spec).lower()
-
-    @property
-    def prereleases(self):
-        # If there is an explicit prereleases set for this, then we'll just
-        # blindly use that.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # Look at all of our specifiers and determine if they are inclusive
-        # operators, and if they are if they are including an explicit
-        # prerelease.
-        operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~=", "==="]:
-            # The == specifier can include a trailing .*, if it does we
-            # want to remove before parsing.
-            if operator == "==" and version.endswith(".*"):
-                version = version[:-2]
-
-            # Parse the version, and if it is a pre-release than this
-            # specifier allows pre-releases.
-            if parse(version).is_prerelease:
-                return True
-
-        return False
-
-    @prereleases.setter
-    def prereleases(self, value):
-        self._prereleases = value
-
-
-_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
-
-
-def _version_split(version):
-    result = []
-    for item in version.split("."):
-        match = _prefix_regex.search(item)
-        if match:
-            result.extend(match.groups())
-        else:
-            result.append(item)
-    return result
-
-
-def _pad_version(left, right):
-    left_split, right_split = [], []
-
-    # Get the release segment of our versions
-    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
-    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
-
-    # Get the rest of our versions
-    left_split.append(left[len(left_split[0]):])
-    right_split.append(right[len(right_split[0]):])
-
-    # Insert our padding
-    left_split.insert(
-        1,
-        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
-    )
-    right_split.insert(
-        1,
-        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
-    )
-
-    return (
-        list(itertools.chain(*left_split)),
-        list(itertools.chain(*right_split)),
-    )
-
-
-class SpecifierSet(BaseSpecifier):
-
-    def __init__(self, specifiers="", prereleases=None):
-        # Split on , to break each indidivual specifier into it's own item, and
-        # strip each item to remove leading/trailing whitespace.
-        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
-
-        # Parsed each individual specifier, attempting first to make it a
-        # Specifier and falling back to a LegacySpecifier.
-        parsed = set()
-        for specifier in specifiers:
-            try:
-                parsed.add(Specifier(specifier))
-            except InvalidSpecifier:
-                parsed.add(LegacySpecifier(specifier))
-
-        # Turn our parsed specifiers into a frozen set and save them for later.
-        self._specs = frozenset(parsed)
-
-        # Store our prereleases value so we can use it later to determine if
-        # we accept prereleases or not.
-        self._prereleases = prereleases
-
-    def __repr__(self):
-        pre = (
-            ", prereleases={0!r}".format(self.prereleases)
-            if self._prereleases is not None
-            else ""
-        )
-
-        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
-
-    def __str__(self):
-        return ",".join(sorted(str(s) for s in self._specs))
-
-    def __hash__(self):
-        return hash(self._specs)
-
-    def __and__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        specifier = SpecifierSet()
-        specifier._specs = frozenset(self._specs | other._specs)
-
-        if self._prereleases is None and other._prereleases is not None:
-            specifier._prereleases = other._prereleases
-        elif self._prereleases is not None and other._prereleases is None:
-            specifier._prereleases = self._prereleases
-        elif self._prereleases == other._prereleases:
-            specifier._prereleases = self._prereleases
-        else:
-            raise ValueError(
-                "Cannot combine SpecifierSets with True and False prerelease "
-                "overrides."
-            )
-
-        return specifier
-
-    def __eq__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
-            other = SpecifierSet(str(other))
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        return self._specs == other._specs
-
-    def __ne__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
-            other = SpecifierSet(str(other))
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        return self._specs != other._specs
-
-    def __len__(self):
-        return len(self._specs)
-
-    def __iter__(self):
-        return iter(self._specs)
-
-    @property
-    def prereleases(self):
-        # If we have been given an explicit prerelease modifier, then we'll
-        # pass that through here.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # If we don't have any specifiers, and we don't have a forced value,
-        # then we'll just return None since we don't know if this should have
-        # pre-releases or not.
-        if not self._specs:
-            return None
-
-        # Otherwise we'll see if any of the given specifiers accept
-        # prereleases, if any of them do we'll return True, otherwise False.
-        return any(s.prereleases for s in self._specs)
-
-    @prereleases.setter
-    def prereleases(self, value):
-        self._prereleases = value
-
-    def __contains__(self, item):
-        return self.contains(item)
-
-    def contains(self, item, prereleases=None):
-        # Ensure that our item is a Version or LegacyVersion instance.
-        if not isinstance(item, (LegacyVersion, Version)):
-            item = parse(item)
-
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # We can determine if we're going to allow pre-releases by looking to
-        # see if any of the underlying items supports them. If none of them do
-        # and this item is a pre-release then we do not allow it and we can
-        # short circuit that here.
-        # Note: This means that 1.0.dev1 would not be contained in something
-        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
-        if not prereleases and item.is_prerelease:
-            return False
-
-        # We simply dispatch to the underlying specs here to make sure that the
-        # given version is contained within all of them.
-        # Note: This use of all() here means that an empty set of specifiers
-        #       will always return True, this is an explicit design decision.
-        return all(
-            s.contains(item, prereleases=prereleases)
-            for s in self._specs
-        )
-
-    def filter(self, iterable, prereleases=None):
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # If we have any specifiers, then we want to wrap our iterable in the
-        # filter method for each one, this will act as a logical AND amongst
-        # each specifier.
-        if self._specs:
-            for spec in self._specs:
-                iterable = spec.filter(iterable, prereleases=bool(prereleases))
-            return iterable
-        # If we do not have any specifiers, then we need to have a rough filter
-        # which will filter out any pre-releases, unless there are no final
-        # releases, and which will filter out LegacyVersion in general.
-        else:
-            filtered = []
-            found_prereleases = []
-
-            for item in iterable:
-                # Ensure that we some kind of Version class for this item.
-                if not isinstance(item, (LegacyVersion, Version)):
-                    parsed_version = parse(item)
-                else:
-                    parsed_version = item
-
-                # Filter out any item which is parsed as a LegacyVersion
-                if isinstance(parsed_version, LegacyVersion):
-                    continue
-
-                # Store any item which is a pre-release for later unless we've
-                # already found a final version or we are accepting prereleases
-                if parsed_version.is_prerelease and not prereleases:
-                    if not filtered:
-                        found_prereleases.append(item)
-                else:
-                    filtered.append(item)
-
-            # If we've found no items except for pre-releases, then we'll go
-            # ahead and use the pre-releases
-            if not filtered and found_prereleases and prereleases is None:
-                return found_prereleases
-
-            return filtered
diff --git a/pkg_resources/_vendor/packaging/utils.py b/pkg_resources/_vendor/packaging/utils.py
deleted file mode 100644
index 942387cef5..0000000000
--- a/pkg_resources/_vendor/packaging/utils.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import re
-
-
-_canonicalize_regex = re.compile(r"[-_.]+")
-
-
-def canonicalize_name(name):
-    # This is taken from PEP 503.
-    return _canonicalize_regex.sub("-", name).lower()
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
deleted file mode 100644
index 83b5ee8c5e..0000000000
--- a/pkg_resources/_vendor/packaging/version.py
+++ /dev/null
@@ -1,393 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import absolute_import, division, print_function
-
-import collections
-import itertools
-import re
-
-from ._structures import Infinity
-
-
-__all__ = [
-    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
-]
-
-
-_Version = collections.namedtuple(
-    "_Version",
-    ["epoch", "release", "dev", "pre", "post", "local"],
-)
-
-
-def parse(version):
-    """
-    Parse the given version string and return either a :class:`Version` object
-    or a :class:`LegacyVersion` object depending on if the given version is
-    a valid PEP 440 version or a legacy version.
-    """
-    try:
-        return Version(version)
-    except InvalidVersion:
-        return LegacyVersion(version)
-
-
-class InvalidVersion(ValueError):
-    """
-    An invalid version was found, users should refer to PEP 440.
-    """
-
-
-class _BaseVersion(object):
-
-    def __hash__(self):
-        return hash(self._key)
-
-    def __lt__(self, other):
-        return self._compare(other, lambda s, o: s < o)
-
-    def __le__(self, other):
-        return self._compare(other, lambda s, o: s <= o)
-
-    def __eq__(self, other):
-        return self._compare(other, lambda s, o: s == o)
-
-    def __ge__(self, other):
-        return self._compare(other, lambda s, o: s >= o)
-
-    def __gt__(self, other):
-        return self._compare(other, lambda s, o: s > o)
-
-    def __ne__(self, other):
-        return self._compare(other, lambda s, o: s != o)
-
-    def _compare(self, other, method):
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return method(self._key, other._key)
-
-
-class LegacyVersion(_BaseVersion):
-
-    def __init__(self, version):
-        self._version = str(version)
-        self._key = _legacy_cmpkey(self._version)
-
-    def __str__(self):
-        return self._version
-
-    def __repr__(self):
-        return "<LegacyVersion({0})>".format(repr(str(self)))
-
-    @property
-    def public(self):
-        return self._version
-
-    @property
-    def base_version(self):
-        return self._version
-
-    @property
-    def local(self):
-        return None
-
-    @property
-    def is_prerelease(self):
-        return False
-
-    @property
-    def is_postrelease(self):
-        return False
-
-
-_legacy_version_component_re = re.compile(
-    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
-)
-
-_legacy_version_replacement_map = {
-    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
-}
-
-
-def _parse_version_parts(s):
-    for part in _legacy_version_component_re.split(s):
-        part = _legacy_version_replacement_map.get(part, part)
-
-        if not part or part == ".":
-            continue
-
-        if part[:1] in "0123456789":
-            # pad for numeric comparison
-            yield part.zfill(8)
-        else:
-            yield "*" + part
-
-    # ensure that alpha/beta/candidate are before final
-    yield "*final"
-
-
-def _legacy_cmpkey(version):
-    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
-    # greater than or equal to 0. This will effectively put the LegacyVersion,
-    # which uses the defacto standard originally implemented by setuptools,
-    # as before all PEP 440 versions.
-    epoch = -1
-
-    # This scheme is taken from pkg_resources.parse_version setuptools prior to
-    # it's adoption of the packaging library.
-    parts = []
-    for part in _parse_version_parts(version.lower()):
-        if part.startswith("*"):
-            # remove "-" before a prerelease tag
-            if part < "*final":
-                while parts and parts[-1] == "*final-":
-                    parts.pop()
-
-            # remove trailing zeros from each series of numeric parts
-            while parts and parts[-1] == "00000000":
-                parts.pop()
-
-        parts.append(part)
-    parts = tuple(parts)
-
-    return epoch, parts
-
-# Deliberately not anchored to the start and end of the string, to make it
-# easier for 3rd party code to reuse
-VERSION_PATTERN = r"""
-    v?
-    (?:
-        (?:(?P<epoch>[0-9]+)!)?                           # epoch
-        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
-        (?P<pre>                                          # pre-release
-            [-_\.]?
-            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
-            [-_\.]?
-            (?P<pre_n>[0-9]+)?
-        )?
-        (?P<post>                                         # post release
-            (?:-(?P<post_n1>[0-9]+))
-            |
-            (?:
-                [-_\.]?
-                (?P<post_l>post|rev|r)
-                [-_\.]?
-                (?P<post_n2>[0-9]+)?
-            )
-        )?
-        (?P<dev>                                          # dev release
-            [-_\.]?
-            (?P<dev_l>dev)
-            [-_\.]?
-            (?P<dev_n>[0-9]+)?
-        )?
-    )
-    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-"""
-
-
-class Version(_BaseVersion):
-
-    _regex = re.compile(
-        r"^\s*" + VERSION_PATTERN + r"\s*$",
-        re.VERBOSE | re.IGNORECASE,
-    )
-
-    def __init__(self, version):
-        # Validate the version and parse it into pieces
-        match = self._regex.search(version)
-        if not match:
-            raise InvalidVersion("Invalid version: '{0}'".format(version))
-
-        # Store the parsed out pieces of the version
-        self._version = _Version(
-            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
-            release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(
-                match.group("pre_l"),
-                match.group("pre_n"),
-            ),
-            post=_parse_letter_version(
-                match.group("post_l"),
-                match.group("post_n1") or match.group("post_n2"),
-            ),
-            dev=_parse_letter_version(
-                match.group("dev_l"),
-                match.group("dev_n"),
-            ),
-            local=_parse_local_version(match.group("local")),
-        )
-
-        # Generate a key which will be used for sorting
-        self._key = _cmpkey(
-            self._version.epoch,
-            self._version.release,
-            self._version.pre,
-            self._version.post,
-            self._version.dev,
-            self._version.local,
-        )
-
-    def __repr__(self):
-        return "<Version({0})>".format(repr(str(self)))
-
-    def __str__(self):
-        parts = []
-
-        # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
-
-        # Pre-release
-        if self._version.pre is not None:
-            parts.append("".join(str(x) for x in self._version.pre))
-
-        # Post-release
-        if self._version.post is not None:
-            parts.append(".post{0}".format(self._version.post[1]))
-
-        # Development release
-        if self._version.dev is not None:
-            parts.append(".dev{0}".format(self._version.dev[1]))
-
-        # Local version segment
-        if self._version.local is not None:
-            parts.append(
-                "+{0}".format(".".join(str(x) for x in self._version.local))
-            )
-
-        return "".join(parts)
-
-    @property
-    def public(self):
-        return str(self).split("+", 1)[0]
-
-    @property
-    def base_version(self):
-        parts = []
-
-        # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
-
-        return "".join(parts)
-
-    @property
-    def local(self):
-        version_string = str(self)
-        if "+" in version_string:
-            return version_string.split("+", 1)[1]
-
-    @property
-    def is_prerelease(self):
-        return bool(self._version.dev or self._version.pre)
-
-    @property
-    def is_postrelease(self):
-        return bool(self._version.post)
-
-
-def _parse_letter_version(letter, number):
-    if letter:
-        # We consider there to be an implicit 0 in a pre-release if there is
-        # not a numeral associated with it.
-        if number is None:
-            number = 0
-
-        # We normalize any letters to their lower case form
-        letter = letter.lower()
-
-        # We consider some words to be alternate spellings of other words and
-        # in those cases we want to normalize the spellings to our preferred
-        # spelling.
-        if letter == "alpha":
-            letter = "a"
-        elif letter == "beta":
-            letter = "b"
-        elif letter in ["c", "pre", "preview"]:
-            letter = "rc"
-        elif letter in ["rev", "r"]:
-            letter = "post"
-
-        return letter, int(number)
-    if not letter and number:
-        # We assume if we are given a number, but we are not given a letter
-        # then this is using the implicit post release syntax (e.g. 1.0-1)
-        letter = "post"
-
-        return letter, int(number)
-
-
-_local_version_seperators = re.compile(r"[\._-]")
-
-
-def _parse_local_version(local):
-    """
-    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
-    """
-    if local is not None:
-        return tuple(
-            part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_seperators.split(local)
-        )
-
-
-def _cmpkey(epoch, release, pre, post, dev, local):
-    # When we compare a release version, we want to compare it with all of the
-    # trailing zeros removed. So we'll use a reverse the list, drop all the now
-    # leading zeros until we come to something non zero, then take the rest
-    # re-reverse it back into the correct order and make it a tuple and use
-    # that for our sorting key.
-    release = tuple(
-        reversed(list(
-            itertools.dropwhile(
-                lambda x: x == 0,
-                reversed(release),
-            )
-        ))
-    )
-
-    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
-    # We'll do this by abusing the pre segment, but we _only_ want to do this
-    # if there is not a pre or a post segment. If we have one of those then
-    # the normal sorting rules will handle this case correctly.
-    if pre is None and post is None and dev is not None:
-        pre = -Infinity
-    # Versions without a pre-release (except as noted above) should sort after
-    # those with one.
-    elif pre is None:
-        pre = Infinity
-
-    # Versions without a post segment should sort before those with one.
-    if post is None:
-        post = -Infinity
-
-    # Versions without a development segment should sort after those with one.
-    if dev is None:
-        dev = Infinity
-
-    if local is None:
-        # Versions without a local segment should sort before those with one.
-        local = -Infinity
-    else:
-        # Versions with a local segment need that segment parsed to implement
-        # the sorting rules in PEP440.
-        # - Alpha numeric segments sort before numeric segments
-        # - Alpha numeric segments sort lexicographically
-        # - Numeric segments sort numerically
-        # - Shorter versions sort before longer versions when the prefixes
-        #   match exactly
-        local = tuple(
-            (i, "") if isinstance(i, int) else (-Infinity, i)
-            for i in local
-        )
-
-    return epoch, release, pre, post, dev, local
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
deleted file mode 100644
index a21224359e..0000000000
--- a/pkg_resources/_vendor/pyparsing.py
+++ /dev/null
@@ -1,5696 +0,0 @@
-# module pyparsing.py
-#
-# Copyright (c) 2003-2016  Paul T. McGuire
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__doc__ = \
-"""
-pyparsing module - Classes and methods to define and execute parsing grammars
-
-The pyparsing module is an alternative approach to creating and executing simple grammars,
-vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
-don't need to learn a new syntax for defining grammars or matching expressions - the parsing module
-provides a library of classes that you use to construct the grammar directly in Python.
-
-Here is a program to parse "Hello, World!" (or any greeting of the form 
-C{"<salutation>, <addressee>!"}), built up using L{Word}, L{Literal}, and L{And} elements 
-(L{'+'<ParserElement.__add__>} operator gives L{And} expressions, strings are auto-converted to
-L{Literal} expressions)::
-
-    from pyparsing import Word, alphas
-
-    # define grammar of a greeting
-    greet = Word(alphas) + "," + Word(alphas) + "!"
-
-    hello = "Hello, World!"
-    print (hello, "->", greet.parseString(hello))
-
-The program outputs the following::
-
-    Hello, World! -> ['Hello', ',', 'World', '!']
-
-The Python representation of the grammar is quite readable, owing to the self-explanatory
-class names, and the use of '+', '|' and '^' operators.
-
-The L{ParseResults} object returned from L{ParserElement.parseString<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
-object with named attributes.
-
-The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
- - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
- - quoted strings
- - embedded comments
-"""
-
-__version__ = "2.1.10"
-__versionTime__ = "07 Oct 2016 01:31 UTC"
-__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
-
-import string
-from weakref import ref as wkref
-import copy
-import sys
-import warnings
-import re
-import sre_constants
-import collections
-import pprint
-import traceback
-import types
-from datetime import datetime
-
-try:
-    from _thread import RLock
-except ImportError:
-    from threading import RLock
-
-try:
-    from collections import OrderedDict as _OrderedDict
-except ImportError:
-    try:
-        from ordereddict import OrderedDict as _OrderedDict
-    except ImportError:
-        _OrderedDict = None
-
-#~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) )
-
-__all__ = [
-'And', 'CaselessKeyword', 'CaselessLiteral', 'CharsNotIn', 'Combine', 'Dict', 'Each', 'Empty',
-'FollowedBy', 'Forward', 'GoToColumn', 'Group', 'Keyword', 'LineEnd', 'LineStart', 'Literal',
-'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or',
-'ParseBaseException', 'ParseElementEnhance', 'ParseException', 'ParseExpression', 'ParseFatalException',
-'ParseResults', 'ParseSyntaxException', 'ParserElement', 'QuotedString', 'RecursiveGrammarException',
-'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 
-'White', 'Word', 'WordEnd', 'WordStart', 'ZeroOrMore',
-'alphanums', 'alphas', 'alphas8bit', 'anyCloseTag', 'anyOpenTag', 'cStyleComment', 'col',
-'commaSeparatedList', 'commonHTMLEntity', 'countedArray', 'cppStyleComment', 'dblQuotedString',
-'dblSlashComment', 'delimitedList', 'dictOf', 'downcaseTokens', 'empty', 'hexnums',
-'htmlComment', 'javaStyleComment', 'line', 'lineEnd', 'lineStart', 'lineno',
-'makeHTMLTags', 'makeXMLTags', 'matchOnlyAtCol', 'matchPreviousExpr', 'matchPreviousLiteral',
-'nestedExpr', 'nullDebugAction', 'nums', 'oneOf', 'opAssoc', 'operatorPrecedence', 'printables',
-'punc8bit', 'pythonStyleComment', 'quotedString', 'removeQuotes', 'replaceHTMLEntity', 
-'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
-'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
-'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
-'CloseMatch', 'tokenMap', 'pyparsing_common',
-]
-
-system_version = tuple(sys.version_info)[:3]
-PY_3 = system_version[0] == 3
-if PY_3:
-    _MAX_INT = sys.maxsize
-    basestring = str
-    unichr = chr
-    _ustr = str
-
-    # build list of single arg builtins, that can be used as parse actions
-    singleArgBuiltins = [sum, len, sorted, reversed, list, tuple, set, any, all, min, max]
-
-else:
-    _MAX_INT = sys.maxint
-    range = xrange
-
-    def _ustr(obj):
-        """Drop-in replacement for str(obj) that tries to be Unicode friendly. It first tries
-           str(obj). If that fails with a UnicodeEncodeError, then it tries unicode(obj). It
-           then < returns the unicode object | encodes it with the default encoding | ... >.
-        """
-        if isinstance(obj,unicode):
-            return obj
-
-        try:
-            # If this works, then _ustr(obj) has the same behaviour as str(obj), so
-            # it won't break any existing code.
-            return str(obj)
-
-        except UnicodeEncodeError:
-            # Else encode it
-            ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
-            xmlcharref = Regex('&#\d+;')
-            xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
-            return xmlcharref.transformString(ret)
-
-    # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
-    singleArgBuiltins = []
-    import __builtin__
-    for fname in "sum len sorted reversed list tuple set any all min max".split():
-        try:
-            singleArgBuiltins.append(getattr(__builtin__,fname))
-        except AttributeError:
-            continue
-            
-_generatorType = type((y for y in range(1)))
- 
-def _xml_escape(data):
-    """Escape &, <, >, ", ', etc. in a string of data."""
-
-    # ampersand must be replaced first
-    from_symbols = '&><"\''
-    to_symbols = ('&'+s+';' for s in "amp gt lt quot apos".split())
-    for from_,to_ in zip(from_symbols, to_symbols):
-        data = data.replace(from_, to_)
-    return data
-
-class _Constants(object):
-    pass
-
-alphas     = string.ascii_uppercase + string.ascii_lowercase
-nums       = "0123456789"
-hexnums    = nums + "ABCDEFabcdef"
-alphanums  = alphas + nums
-_bslash    = chr(92)
-printables = "".join(c for c in string.printable if c not in string.whitespace)
-
-class ParseBaseException(Exception):
-    """base exception class for all parsing runtime exceptions"""
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__( self, pstr, loc=0, msg=None, elem=None ):
-        self.loc = loc
-        if msg is None:
-            self.msg = pstr
-            self.pstr = ""
-        else:
-            self.msg = msg
-            self.pstr = pstr
-        self.parserElement = elem
-        self.args = (pstr, loc, msg)
-
-    @classmethod
-    def _from_exception(cls, pe):
-        """
-        internal factory method to simplify creating one type of ParseException 
-        from another - avoids having __init__ signature conflicts among subclasses
-        """
-        return cls(pe.pstr, pe.loc, pe.msg, pe.parserElement)
-
-    def __getattr__( self, aname ):
-        """supported attributes by name are:
-            - lineno - returns the line number of the exception text
-            - col - returns the column number of the exception text
-            - line - returns the line containing the exception text
-        """
-        if( aname == "lineno" ):
-            return lineno( self.loc, self.pstr )
-        elif( aname in ("col", "column") ):
-            return col( self.loc, self.pstr )
-        elif( aname == "line" ):
-            return line( self.loc, self.pstr )
-        else:
-            raise AttributeError(aname)
-
-    def __str__( self ):
-        return "%s (at char %d), (line:%d, col:%d)" % \
-                ( self.msg, self.loc, self.lineno, self.column )
-    def __repr__( self ):
-        return _ustr(self)
-    def markInputline( self, markerString = ">!<" ):
-        """Extracts the exception line from the input string, and marks
-           the location of the exception with a special symbol.
-        """
-        line_str = self.line
-        line_column = self.column - 1
-        if markerString:
-            line_str = "".join((line_str[:line_column],
-                                markerString, line_str[line_column:]))
-        return line_str.strip()
-    def __dir__(self):
-        return "lineno col line".split() + dir(type(self))
-
-class ParseException(ParseBaseException):
-    """
-    Exception thrown when parse expressions don't match class;
-    supported attributes by name are:
-     - lineno - returns the line number of the exception text
-     - col - returns the column number of the exception text
-     - line - returns the line containing the exception text
-        
-    Example::
-        try:
-            Word(nums).setName("integer").parseString("ABC")
-        except ParseException as pe:
-            print(pe)
-            print("column: {}".format(pe.col))
-            
-    prints::
-       Expected integer (at char 0), (line:1, col:1)
-        column: 1
-    """
-    pass
-
-class ParseFatalException(ParseBaseException):
-    """user-throwable exception thrown when inconsistent parse content
-       is found; stops all parsing immediately"""
-    pass
-
-class ParseSyntaxException(ParseFatalException):
-    """just like L{ParseFatalException}, but thrown internally when an
-       L{ErrorStop<And._ErrorStop>} ('-' operator) indicates that parsing is to stop 
-       immediately because an unbacktrackable syntax error has been found"""
-    pass
-
-#~ class ReparseException(ParseBaseException):
-    #~ """Experimental class - parse actions can raise this exception to cause
-       #~ pyparsing to reparse the input string:
-        #~ - with a modified input string, and/or
-        #~ - with a modified start location
-       #~ Set the values of the ReparseException in the constructor, and raise the
-       #~ exception in a parse action to cause pyparsing to use the new string/location.
-       #~ Setting the values as None causes no change to be made.
-       #~ """
-    #~ def __init_( self, newstring, restartLoc ):
-        #~ self.newParseText = newstring
-        #~ self.reparseLoc = restartLoc
-
-class RecursiveGrammarException(Exception):
-    """exception thrown by L{ParserElement.validate} if the grammar could be improperly recursive"""
-    def __init__( self, parseElementList ):
-        self.parseElementTrace = parseElementList
-
-    def __str__( self ):
-        return "RecursiveGrammarException: %s" % self.parseElementTrace
-
-class _ParseResultsWithOffset(object):
-    def __init__(self,p1,p2):
-        self.tup = (p1,p2)
-    def __getitem__(self,i):
-        return self.tup[i]
-    def __repr__(self):
-        return repr(self.tup[0])
-    def setOffset(self,i):
-        self.tup = (self.tup[0],i)
-
-class ParseResults(object):
-    """
-    Structured parse results, to provide multiple means of access to the parsed data:
-       - as a list (C{len(results)})
-       - by list index (C{results[0], results[1]}, etc.)
-       - by attribute (C{results.<resultsName>} - see L{ParserElement.setResultsName})
-
-    Example::
-        integer = Word(nums)
-        date_str = (integer.setResultsName("year") + '/' 
-                        + integer.setResultsName("month") + '/' 
-                        + integer.setResultsName("day"))
-        # equivalent form:
-        # date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-        # parseString returns a ParseResults object
-        result = date_str.parseString("1999/12/31")
-
-        def test(s, fn=repr):
-            print("%s -> %s" % (s, fn(eval(s))))
-        test("list(result)")
-        test("result[0]")
-        test("result['month']")
-        test("result.day")
-        test("'month' in result")
-        test("'minutes' in result")
-        test("result.dump()", str)
-    prints::
-        list(result) -> ['1999', '/', '12', '/', '31']
-        result[0] -> '1999'
-        result['month'] -> '12'
-        result.day -> '31'
-        'month' in result -> True
-        'minutes' in result -> False
-        result.dump() -> ['1999', '/', '12', '/', '31']
-        - day: 31
-        - month: 12
-        - year: 1999
-    """
-    def __new__(cls, toklist=None, name=None, asList=True, modal=True ):
-        if isinstance(toklist, cls):
-            return toklist
-        retobj = object.__new__(cls)
-        retobj.__doinit = True
-        return retobj
-
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__( self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance ):
-        if self.__doinit:
-            self.__doinit = False
-            self.__name = None
-            self.__parent = None
-            self.__accumNames = {}
-            self.__asList = asList
-            self.__modal = modal
-            if toklist is None:
-                toklist = []
-            if isinstance(toklist, list):
-                self.__toklist = toklist[:]
-            elif isinstance(toklist, _generatorType):
-                self.__toklist = list(toklist)
-            else:
-                self.__toklist = [toklist]
-            self.__tokdict = dict()
-
-        if name is not None and name:
-            if not modal:
-                self.__accumNames[name] = 0
-            if isinstance(name,int):
-                name = _ustr(name) # will always return a str, but use _ustr for consistency
-            self.__name = name
-            if not (isinstance(toklist, (type(None), basestring, list)) and toklist in (None,'',[])):
-                if isinstance(toklist,basestring):
-                    toklist = [ toklist ]
-                if asList:
-                    if isinstance(toklist,ParseResults):
-                        self[name] = _ParseResultsWithOffset(toklist.copy(),0)
-                    else:
-                        self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]),0)
-                    self[name].__name = name
-                else:
-                    try:
-                        self[name] = toklist[0]
-                    except (KeyError,TypeError,IndexError):
-                        self[name] = toklist
-
-    def __getitem__( self, i ):
-        if isinstance( i, (int,slice) ):
-            return self.__toklist[i]
-        else:
-            if i not in self.__accumNames:
-                return self.__tokdict[i][-1][0]
-            else:
-                return ParseResults([ v[0] for v in self.__tokdict[i] ])
-
-    def __setitem__( self, k, v, isinstance=isinstance ):
-        if isinstance(v,_ParseResultsWithOffset):
-            self.__tokdict[k] = self.__tokdict.get(k,list()) + [v]
-            sub = v[0]
-        elif isinstance(k,(int,slice)):
-            self.__toklist[k] = v
-            sub = v
-        else:
-            self.__tokdict[k] = self.__tokdict.get(k,list()) + [_ParseResultsWithOffset(v,0)]
-            sub = v
-        if isinstance(sub,ParseResults):
-            sub.__parent = wkref(self)
-
-    def __delitem__( self, i ):
-        if isinstance(i,(int,slice)):
-            mylen = len( self.__toklist )
-            del self.__toklist[i]
-
-            # convert int to slice
-            if isinstance(i, int):
-                if i < 0:
-                    i += mylen
-                i = slice(i, i+1)
-            # get removed indices
-            removed = list(range(*i.indices(mylen)))
-            removed.reverse()
-            # fixup indices in token dictionary
-            for name,occurrences in self.__tokdict.items():
-                for j in removed:
-                    for k, (value, position) in enumerate(occurrences):
-                        occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
-        else:
-            del self.__tokdict[i]
-
-    def __contains__( self, k ):
-        return k in self.__tokdict
-
-    def __len__( self ): return len( self.__toklist )
-    def __bool__(self): return ( not not self.__toklist )
-    __nonzero__ = __bool__
-    def __iter__( self ): return iter( self.__toklist )
-    def __reversed__( self ): return iter( self.__toklist[::-1] )
-    def _iterkeys( self ):
-        if hasattr(self.__tokdict, "iterkeys"):
-            return self.__tokdict.iterkeys()
-        else:
-            return iter(self.__tokdict)
-
-    def _itervalues( self ):
-        return (self[k] for k in self._iterkeys())
-            
-    def _iteritems( self ):
-        return ((k, self[k]) for k in self._iterkeys())
-
-    if PY_3:
-        keys = _iterkeys       
-        """Returns an iterator of all named result keys (Python 3.x only)."""
-
-        values = _itervalues
-        """Returns an iterator of all named result values (Python 3.x only)."""
-
-        items = _iteritems
-        """Returns an iterator of all named result key-value tuples (Python 3.x only)."""
-
-    else:
-        iterkeys = _iterkeys
-        """Returns an iterator of all named result keys (Python 2.x only)."""
-
-        itervalues = _itervalues
-        """Returns an iterator of all named result values (Python 2.x only)."""
-
-        iteritems = _iteritems
-        """Returns an iterator of all named result key-value tuples (Python 2.x only)."""
-
-        def keys( self ):
-            """Returns all named result keys (as a list in Python 2.x, as an iterator in Python 3.x)."""
-            return list(self.iterkeys())
-
-        def values( self ):
-            """Returns all named result values (as a list in Python 2.x, as an iterator in Python 3.x)."""
-            return list(self.itervalues())
-                
-        def items( self ):
-            """Returns all named result key-values (as a list of tuples in Python 2.x, as an iterator in Python 3.x)."""
-            return list(self.iteritems())
-
-    def haskeys( self ):
-        """Since keys() returns an iterator, this method is helpful in bypassing
-           code that looks for the existence of any defined results names."""
-        return bool(self.__tokdict)
-        
-    def pop( self, *args, **kwargs):
-        """
-        Removes and returns item at specified index (default=C{last}).
-        Supports both C{list} and C{dict} semantics for C{pop()}. If passed no
-        argument or an integer argument, it will use C{list} semantics
-        and pop tokens from the list of parsed tokens. If passed a 
-        non-integer argument (most likely a string), it will use C{dict}
-        semantics and pop the corresponding value from any defined 
-        results names. A second default return value argument is 
-        supported, just as in C{dict.pop()}.
-
-        Example::
-            def remove_first(tokens):
-                tokens.pop(0)
-            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
-            print(OneOrMore(Word(nums)).addParseAction(remove_first).parseString("0 123 321")) # -> ['123', '321']
-
-            label = Word(alphas)
-            patt = label("LABEL") + OneOrMore(Word(nums))
-            print(patt.parseString("AAB 123 321").dump())
-
-            # Use pop() in a parse action to remove named result (note that corresponding value is not
-            # removed from list form of results)
-            def remove_LABEL(tokens):
-                tokens.pop("LABEL")
-                return tokens
-            patt.addParseAction(remove_LABEL)
-            print(patt.parseString("AAB 123 321").dump())
-        prints::
-            ['AAB', '123', '321']
-            - LABEL: AAB
-
-            ['AAB', '123', '321']
-        """
-        if not args:
-            args = [-1]
-        for k,v in kwargs.items():
-            if k == 'default':
-                args = (args[0], v)
-            else:
-                raise TypeError("pop() got an unexpected keyword argument '%s'" % k)
-        if (isinstance(args[0], int) or 
-                        len(args) == 1 or 
-                        args[0] in self):
-            index = args[0]
-            ret = self[index]
-            del self[index]
-            return ret
-        else:
-            defaultvalue = args[1]
-            return defaultvalue
-
-    def get(self, key, defaultValue=None):
-        """
-        Returns named result matching the given key, or if there is no
-        such name, then returns the given C{defaultValue} or C{None} if no
-        C{defaultValue} is specified.
-
-        Similar to C{dict.get()}.
-        
-        Example::
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
-
-            result = date_str.parseString("1999/12/31")
-            print(result.get("year")) # -> '1999'
-            print(result.get("hour", "not specified")) # -> 'not specified'
-            print(result.get("hour")) # -> None
-        """
-        if key in self:
-            return self[key]
-        else:
-            return defaultValue
-
-    def insert( self, index, insStr ):
-        """
-        Inserts new element at location index in the list of parsed tokens.
-        
-        Similar to C{list.insert()}.
-
-        Example::
-            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
-
-            # use a parse action to insert the parse location in the front of the parsed results
-            def insert_locn(locn, tokens):
-                tokens.insert(0, locn)
-            print(OneOrMore(Word(nums)).addParseAction(insert_locn).parseString("0 123 321")) # -> [0, '0', '123', '321']
-        """
-        self.__toklist.insert(index, insStr)
-        # fixup indices in token dictionary
-        for name,occurrences in self.__tokdict.items():
-            for k, (value, position) in enumerate(occurrences):
-                occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
-
-    def append( self, item ):
-        """
-        Add single element to end of ParseResults list of elements.
-
-        Example::
-            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
-            
-            # use a parse action to compute the sum of the parsed integers, and add it to the end
-            def append_sum(tokens):
-                tokens.append(sum(map(int, tokens)))
-            print(OneOrMore(Word(nums)).addParseAction(append_sum).parseString("0 123 321")) # -> ['0', '123', '321', 444]
-        """
-        self.__toklist.append(item)
-
-    def extend( self, itemseq ):
-        """
-        Add sequence of elements to end of ParseResults list of elements.
-
-        Example::
-            patt = OneOrMore(Word(alphas))
-            
-            # use a parse action to append the reverse of the matched strings, to make a palindrome
-            def make_palindrome(tokens):
-                tokens.extend(reversed([t[::-1] for t in tokens]))
-                return ''.join(tokens)
-            print(patt.addParseAction(make_palindrome).parseString("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
-        """
-        if isinstance(itemseq, ParseResults):
-            self += itemseq
-        else:
-            self.__toklist.extend(itemseq)
-
-    def clear( self ):
-        """
-        Clear all elements and results names.
-        """
-        del self.__toklist[:]
-        self.__tokdict.clear()
-
-    def __getattr__( self, name ):
-        try:
-            return self[name]
-        except KeyError:
-            return ""
-            
-        if name in self.__tokdict:
-            if name not in self.__accumNames:
-                return self.__tokdict[name][-1][0]
-            else:
-                return ParseResults([ v[0] for v in self.__tokdict[name] ])
-        else:
-            return ""
-
-    def __add__( self, other ):
-        ret = self.copy()
-        ret += other
-        return ret
-
-    def __iadd__( self, other ):
-        if other.__tokdict:
-            offset = len(self.__toklist)
-            addoffset = lambda a: offset if a<0 else a+offset
-            otheritems = other.__tokdict.items()
-            otherdictitems = [(k, _ParseResultsWithOffset(v[0],addoffset(v[1])) )
-                                for (k,vlist) in otheritems for v in vlist]
-            for k,v in otherdictitems:
-                self[k] = v
-                if isinstance(v[0],ParseResults):
-                    v[0].__parent = wkref(self)
-            
-        self.__toklist += other.__toklist
-        self.__accumNames.update( other.__accumNames )
-        return self
-
-    def __radd__(self, other):
-        if isinstance(other,int) and other == 0:
-            # useful for merging many ParseResults using sum() builtin
-            return self.copy()
-        else:
-            # this may raise a TypeError - so be it
-            return other + self
-        
-    def __repr__( self ):
-        return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) )
-
-    def __str__( self ):
-        return '[' + ', '.join(_ustr(i) if isinstance(i, ParseResults) else repr(i) for i in self.__toklist) + ']'
-
-    def _asStringList( self, sep='' ):
-        out = []
-        for item in self.__toklist:
-            if out and sep:
-                out.append(sep)
-            if isinstance( item, ParseResults ):
-                out += item._asStringList()
-            else:
-                out.append( _ustr(item) )
-        return out
-
-    def asList( self ):
-        """
-        Returns the parse results as a nested list of matching tokens, all converted to strings.
-
-        Example::
-            patt = OneOrMore(Word(alphas))
-            result = patt.parseString("sldkj lsdkj sldkj")
-            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
-            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
-            
-            # Use asList() to create an actual list
-            result_list = result.asList()
-            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
-        """
-        return [res.asList() if isinstance(res,ParseResults) else res for res in self.__toklist]
-
-    def asDict( self ):
-        """
-        Returns the named parse results as a nested dictionary.
-
-        Example::
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-            
-            result = date_str.parseString('12/31/1999')
-            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
-            
-            result_dict = result.asDict()
-            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
-
-            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
-            import json
-            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
-            print(json.dumps(result.asDict())) # -> {"month": "31", "day": "1999", "year": "12"}
-        """
-        if PY_3:
-            item_fn = self.items
-        else:
-            item_fn = self.iteritems
-            
-        def toItem(obj):
-            if isinstance(obj, ParseResults):
-                if obj.haskeys():
-                    return obj.asDict()
-                else:
-                    return [toItem(v) for v in obj]
-            else:
-                return obj
-                
-        return dict((k,toItem(v)) for k,v in item_fn())
-
-    def copy( self ):
-        """
-        Returns a new copy of a C{ParseResults} object.
-        """
-        ret = ParseResults( self.__toklist )
-        ret.__tokdict = self.__tokdict.copy()
-        ret.__parent = self.__parent
-        ret.__accumNames.update( self.__accumNames )
-        ret.__name = self.__name
-        return ret
-
-    def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ):
-        """
-        (Deprecated) Returns the parse results as XML. Tags are created for tokens and lists that have defined results names.
-        """
-        nl = "\n"
-        out = []
-        namedItems = dict((v[1],k) for (k,vlist) in self.__tokdict.items()
-                                                            for v in vlist)
-        nextLevelIndent = indent + "  "
-
-        # collapse out indents if formatting is not desired
-        if not formatted:
-            indent = ""
-            nextLevelIndent = ""
-            nl = ""
-
-        selfTag = None
-        if doctag is not None:
-            selfTag = doctag
-        else:
-            if self.__name:
-                selfTag = self.__name
-
-        if not selfTag:
-            if namedItemsOnly:
-                return ""
-            else:
-                selfTag = "ITEM"
-
-        out += [ nl, indent, "<", selfTag, ">" ]
-
-        for i,res in enumerate(self.__toklist):
-            if isinstance(res,ParseResults):
-                if i in namedItems:
-                    out += [ res.asXML(namedItems[i],
-                                        namedItemsOnly and doctag is None,
-                                        nextLevelIndent,
-                                        formatted)]
-                else:
-                    out += [ res.asXML(None,
-                                        namedItemsOnly and doctag is None,
-                                        nextLevelIndent,
-                                        formatted)]
-            else:
-                # individual token, see if there is a name for it
-                resTag = None
-                if i in namedItems:
-                    resTag = namedItems[i]
-                if not resTag:
-                    if namedItemsOnly:
-                        continue
-                    else:
-                        resTag = "ITEM"
-                xmlBodyText = _xml_escape(_ustr(res))
-                out += [ nl, nextLevelIndent, "<", resTag, ">",
-                                                xmlBodyText,
-                                                "</", resTag, ">" ]
-
-        out += [ nl, indent, "</", selfTag, ">" ]
-        return "".join(out)
-
-    def __lookup(self,sub):
-        for k,vlist in self.__tokdict.items():
-            for v,loc in vlist:
-                if sub is v:
-                    return k
-        return None
-
-    def getName(self):
-        """
-        Returns the results name for this token expression. Useful when several 
-        different expressions might match at a particular location.
-
-        Example::
-            integer = Word(nums)
-            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
-            house_number_expr = Suppress('#') + Word(nums, alphanums)
-            user_data = (Group(house_number_expr)("house_number") 
-                        | Group(ssn_expr)("ssn")
-                        | Group(integer)("age"))
-            user_info = OneOrMore(user_data)
-            
-            result = user_info.parseString("22 111-22-3333 #221B")
-            for item in result:
-                print(item.getName(), ':', item[0])
-        prints::
-            age : 22
-            ssn : 111-22-3333
-            house_number : 221B
-        """
-        if self.__name:
-            return self.__name
-        elif self.__parent:
-            par = self.__parent()
-            if par:
-                return par.__lookup(self)
-            else:
-                return None
-        elif (len(self) == 1 and
-               len(self.__tokdict) == 1 and
-               next(iter(self.__tokdict.values()))[0][1] in (0,-1)):
-            return next(iter(self.__tokdict.keys()))
-        else:
-            return None
-
-    def dump(self, indent='', depth=0, full=True):
-        """
-        Diagnostic method for listing out the contents of a C{ParseResults}.
-        Accepts an optional C{indent} argument so that this string can be embedded
-        in a nested display of other data.
-
-        Example::
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-            
-            result = date_str.parseString('12/31/1999')
-            print(result.dump())
-        prints::
-            ['12', '/', '31', '/', '1999']
-            - day: 1999
-            - month: 31
-            - year: 12
-        """
-        out = []
-        NL = '\n'
-        out.append( indent+_ustr(self.asList()) )
-        if full:
-            if self.haskeys():
-                items = sorted((str(k), v) for k,v in self.items())
-                for k,v in items:
-                    if out:
-                        out.append(NL)
-                    out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
-                    if isinstance(v,ParseResults):
-                        if v:
-                            out.append( v.dump(indent,depth+1) )
-                        else:
-                            out.append(_ustr(v))
-                    else:
-                        out.append(repr(v))
-            elif any(isinstance(vv,ParseResults) for vv in self):
-                v = self
-                for i,vv in enumerate(v):
-                    if isinstance(vv,ParseResults):
-                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
-                    else:
-                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
-            
-        return "".join(out)
-
-    def pprint(self, *args, **kwargs):
-        """
-        Pretty-printer for parsed results as a list, using the C{pprint} module.
-        Accepts additional positional or keyword args as defined for the 
-        C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})
-
-        Example::
-            ident = Word(alphas, alphanums)
-            num = Word(nums)
-            func = Forward()
-            term = ident | num | Group('(' + func + ')')
-            func <<= ident + Group(Optional(delimitedList(term)))
-            result = func.parseString("fna a,b,(fnb c,d,200),100")
-            result.pprint(width=40)
-        prints::
-            ['fna',
-             ['a',
-              'b',
-              ['(', 'fnb', ['c', 'd', '200'], ')'],
-              '100']]
-        """
-        pprint.pprint(self.asList(), *args, **kwargs)
-
-    # add support for pickle protocol
-    def __getstate__(self):
-        return ( self.__toklist,
-                 ( self.__tokdict.copy(),
-                   self.__parent is not None and self.__parent() or None,
-                   self.__accumNames,
-                   self.__name ) )
-
-    def __setstate__(self,state):
-        self.__toklist = state[0]
-        (self.__tokdict,
-         par,
-         inAccumNames,
-         self.__name) = state[1]
-        self.__accumNames = {}
-        self.__accumNames.update(inAccumNames)
-        if par is not None:
-            self.__parent = wkref(par)
-        else:
-            self.__parent = None
-
-    def __getnewargs__(self):
-        return self.__toklist, self.__name, self.__asList, self.__modal
-
-    def __dir__(self):
-        return (dir(type(self)) + list(self.keys()))
-
-collections.MutableMapping.register(ParseResults)
-
-def col (loc,strg):
-    """Returns current column within a string, counting newlines as line separators.
-   The first column is number 1.
-
-   Note: the default parsing behavior is to expand tabs in the input string
-   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
-   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
-   consistent view of the parsed string, the parse location, and line and column
-   positions within the parsed string.
-   """
-    s = strg
-    return 1 if 0<loc<len(s) and s[loc-1] == '\n' else loc - s.rfind("\n", 0, loc)
-
-def lineno(loc,strg):
-    """Returns current line number within a string, counting newlines as line separators.
-   The first line is number 1.
-
-   Note: the default parsing behavior is to expand tabs in the input string
-   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
-   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
-   consistent view of the parsed string, the parse location, and line and column
-   positions within the parsed string.
-   """
-    return strg.count("\n",0,loc) + 1
-
-def line( loc, strg ):
-    """Returns the line of text containing loc within a string, counting newlines as line separators.
-       """
-    lastCR = strg.rfind("\n", 0, loc)
-    nextCR = strg.find("\n", loc)
-    if nextCR >= 0:
-        return strg[lastCR+1:nextCR]
-    else:
-        return strg[lastCR+1:]
-
-def _defaultStartDebugAction( instring, loc, expr ):
-    print (("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )))
-
-def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ):
-    print ("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
-
-def _defaultExceptionDebugAction( instring, loc, expr, exc ):
-    print ("Exception raised:" + _ustr(exc))
-
-def nullDebugAction(*args):
-    """'Do-nothing' debug action, to suppress debugging output during parsing."""
-    pass
-
-# Only works on Python 3.x - nonlocal is toxic to Python 2 installs
-#~ 'decorator to trim function calls to match the arity of the target'
-#~ def _trim_arity(func, maxargs=3):
-    #~ if func in singleArgBuiltins:
-        #~ return lambda s,l,t: func(t)
-    #~ limit = 0
-    #~ foundArity = False
-    #~ def wrapper(*args):
-        #~ nonlocal limit,foundArity
-        #~ while 1:
-            #~ try:
-                #~ ret = func(*args[limit:])
-                #~ foundArity = True
-                #~ return ret
-            #~ except TypeError:
-                #~ if limit == maxargs or foundArity:
-                    #~ raise
-                #~ limit += 1
-                #~ continue
-    #~ return wrapper
-
-# this version is Python 2.x-3.x cross-compatible
-'decorator to trim function calls to match the arity of the target'
-def _trim_arity(func, maxargs=2):
-    if func in singleArgBuiltins:
-        return lambda s,l,t: func(t)
-    limit = [0]
-    foundArity = [False]
-    
-    # traceback return data structure changed in Py3.5 - normalize back to plain tuples
-    if system_version[:2] >= (3,5):
-        def extract_stack(limit=0):
-            # special handling for Python 3.5.0 - extra deep call stack by 1
-            offset = -3 if system_version == (3,5,0) else -2
-            frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
-            return [(frame_summary.filename, frame_summary.lineno)]
-        def extract_tb(tb, limit=0):
-            frames = traceback.extract_tb(tb, limit=limit)
-            frame_summary = frames[-1]
-            return [(frame_summary.filename, frame_summary.lineno)]
-    else:
-        extract_stack = traceback.extract_stack
-        extract_tb = traceback.extract_tb
-    
-    # synthesize what would be returned by traceback.extract_stack at the call to 
-    # user's parse action 'func', so that we don't incur call penalty at parse time
-    
-    LINE_DIFF = 6
-    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND 
-    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
-    this_line = extract_stack(limit=2)[-1]
-    pa_call_line_synth = (this_line[0], this_line[1]+LINE_DIFF)
-
-    def wrapper(*args):
-        while 1:
-            try:
-                ret = func(*args[limit[0]:])
-                foundArity[0] = True
-                return ret
-            except TypeError:
-                # re-raise TypeErrors if they did not come from our arity testing
-                if foundArity[0]:
-                    raise
-                else:
-                    try:
-                        tb = sys.exc_info()[-1]
-                        if not extract_tb(tb, limit=2)[-1][:2] == pa_call_line_synth:
-                            raise
-                    finally:
-                        del tb
-
-                if limit[0] <= maxargs:
-                    limit[0] += 1
-                    continue
-                raise
-
-    # copy func name to wrapper for sensible debug output
-    func_name = "<parse action>"
-    try:
-        func_name = getattr(func, '__name__', 
-                            getattr(func, '__class__').__name__)
-    except Exception:
-        func_name = str(func)
-    wrapper.__name__ = func_name
-
-    return wrapper
-
-class ParserElement(object):
-    """Abstract base level parser element class."""
-    DEFAULT_WHITE_CHARS = " \n\t\r"
-    verbose_stacktrace = False
-
-    @staticmethod
-    def setDefaultWhitespaceChars( chars ):
-        r"""
-        Overrides the default whitespace chars
-
-        Example::
-            # default whitespace chars are space, <TAB> and newline
-            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
-            
-            # change to just treat newline as significant
-            ParserElement.setDefaultWhitespaceChars(" \t")
-            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def']
-        """
-        ParserElement.DEFAULT_WHITE_CHARS = chars
-
-    @staticmethod
-    def inlineLiteralsUsing(cls):
-        """
-        Set class to be used for inclusion of string literals into a parser.
-        
-        Example::
-            # default literal class used is Literal
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
-
-            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
-
-
-            # change to Suppress
-            ParserElement.inlineLiteralsUsing(Suppress)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
-
-            date_str.parseString("1999/12/31")  # -> ['1999', '12', '31']
-        """
-        ParserElement._literalStringClass = cls
-
-    def __init__( self, savelist=False ):
-        self.parseAction = list()
-        self.failAction = None
-        #~ self.name = "<unknown>"  # don't define self.name, let subclasses try/except upcall
-        self.strRepr = None
-        self.resultsName = None
-        self.saveAsList = savelist
-        self.skipWhitespace = True
-        self.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
-        self.copyDefaultWhiteChars = True
-        self.mayReturnEmpty = False # used when checking for left-recursion
-        self.keepTabs = False
-        self.ignoreExprs = list()
-        self.debug = False
-        self.streamlined = False
-        self.mayIndexError = True # used to optimize exception handling for subclasses that don't advance parse index
-        self.errmsg = ""
-        self.modalResults = True # used to mark results names as modal (report only last) or cumulative (list all)
-        self.debugActions = ( None, None, None ) #custom debug actions
-        self.re = None
-        self.callPreparse = True # used to avoid redundant calls to preParse
-        self.callDuringTry = False
-
-    def copy( self ):
-        """
-        Make a copy of this C{ParserElement}.  Useful for defining different parse actions
-        for the same parsing pattern, using copies of the original parse element.
-        
-        Example::
-            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
-            integerK = integer.copy().addParseAction(lambda toks: toks[0]*1024) + Suppress("K")
-            integerM = integer.copy().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
-            
-            print(OneOrMore(integerK | integerM | integer).parseString("5K 100 640K 256M"))
-        prints::
-            [5120, 100, 655360, 268435456]
-        Equivalent form of C{expr.copy()} is just C{expr()}::
-            integerM = integer().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
-        """
-        cpy = copy.copy( self )
-        cpy.parseAction = self.parseAction[:]
-        cpy.ignoreExprs = self.ignoreExprs[:]
-        if self.copyDefaultWhiteChars:
-            cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
-        return cpy
-
-    def setName( self, name ):
-        """
-        Define name for this expression, makes debugging and exception messages clearer.
-        
-        Example::
-            Word(nums).parseString("ABC")  # -> Exception: Expected W:(0123...) (at char 0), (line:1, col:1)
-            Word(nums).setName("integer").parseString("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
-        """
-        self.name = name
-        self.errmsg = "Expected " + self.name
-        if hasattr(self,"exception"):
-            self.exception.msg = self.errmsg
-        return self
-
-    def setResultsName( self, name, listAllMatches=False ):
-        """
-        Define name for referencing matching tokens as a nested attribute
-        of the returned parse results.
-        NOTE: this returns a *copy* of the original C{ParserElement} object;
-        this is so that the client can define a basic element, such as an
-        integer, and reference it in multiple places with different names.
-
-        You can also set results names using the abbreviated syntax,
-        C{expr("name")} in place of C{expr.setResultsName("name")} - 
-        see L{I{__call__}<__call__>}.
-
-        Example::
-            date_str = (integer.setResultsName("year") + '/' 
-                        + integer.setResultsName("month") + '/' 
-                        + integer.setResultsName("day"))
-
-            # equivalent form:
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-        """
-        newself = self.copy()
-        if name.endswith("*"):
-            name = name[:-1]
-            listAllMatches=True
-        newself.resultsName = name
-        newself.modalResults = not listAllMatches
-        return newself
-
-    def setBreak(self,breakFlag = True):
-        """Method to invoke the Python pdb debugger when this element is
-           about to be parsed. Set C{breakFlag} to True to enable, False to
-           disable.
-        """
-        if breakFlag:
-            _parseMethod = self._parse
-            def breaker(instring, loc, doActions=True, callPreParse=True):
-                import pdb
-                pdb.set_trace()
-                return _parseMethod( instring, loc, doActions, callPreParse )
-            breaker._originalParseMethod = _parseMethod
-            self._parse = breaker
-        else:
-            if hasattr(self._parse,"_originalParseMethod"):
-                self._parse = self._parse._originalParseMethod
-        return self
-
-    def setParseAction( self, *fns, **kwargs ):
-        """
-        Define action to perform when successfully matching parse element definition.
-        Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
-        C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
-         - s   = the original string being parsed (see note below)
-         - loc = the location of the matching substring
-         - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
-        If the functions in fns modify the tokens, they can return them as the return
-        value from fn, and the modified list of tokens will replace the original.
-        Otherwise, fn does not need to return any value.
-
-        Optional keyword arguments:
-         - callDuringTry = (default=C{False}) indicate if parse action should be run during lookaheads and alternate testing
-
-        Note: the default parsing behavior is to expand tabs in the input string
-        before starting the parsing process.  See L{I{parseString}<parseString>} for more information
-        on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
-        consistent view of the parsed string, the parse location, and line and column
-        positions within the parsed string.
-        
-        Example::
-            integer = Word(nums)
-            date_str = integer + '/' + integer + '/' + integer
-
-            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
-
-            # use parse action to convert to ints at parse time
-            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
-            date_str = integer + '/' + integer + '/' + integer
-
-            # note that integer fields are now ints, not strings
-            date_str.parseString("1999/12/31")  # -> [1999, '/', 12, '/', 31]
-        """
-        self.parseAction = list(map(_trim_arity, list(fns)))
-        self.callDuringTry = kwargs.get("callDuringTry", False)
-        return self
-
-    def addParseAction( self, *fns, **kwargs ):
-        """
-        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
-        
-        See examples in L{I{copy}<copy>}.
-        """
-        self.parseAction += list(map(_trim_arity, list(fns)))
-        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
-        return self
-
-    def addCondition(self, *fns, **kwargs):
-        """Add a boolean predicate function to expression's list of parse actions. See 
-        L{I{setParseAction}<setParseAction>} for function call signatures. Unlike C{setParseAction}, 
-        functions passed to C{addCondition} need to return boolean success/fail of the condition.
-
-        Optional keyword arguments:
-         - message = define a custom message to be used in the raised exception
-         - fatal   = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise ParseException
-         
-        Example::
-            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
-            year_int = integer.copy()
-            year_int.addCondition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
-            date_str = year_int + '/' + integer + '/' + integer
-
-            result = date_str.parseString("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0), (line:1, col:1)
-        """
-        msg = kwargs.get("message", "failed user-defined condition")
-        exc_type = ParseFatalException if kwargs.get("fatal", False) else ParseException
-        for fn in fns:
-            def pa(s,l,t):
-                if not bool(_trim_arity(fn)(s,l,t)):
-                    raise exc_type(s,l,msg)
-            self.parseAction.append(pa)
-        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
-        return self
-
-    def setFailAction( self, fn ):
-        """Define action to perform if parsing fails at this expression.
-           Fail acton fn is a callable function that takes the arguments
-           C{fn(s,loc,expr,err)} where:
-            - s = string being parsed
-            - loc = location where expression match was attempted and failed
-            - expr = the parse expression that failed
-            - err = the exception thrown
-           The function returns no value.  It may throw C{L{ParseFatalException}}
-           if it is desired to stop parsing immediately."""
-        self.failAction = fn
-        return self
-
-    def _skipIgnorables( self, instring, loc ):
-        exprsFound = True
-        while exprsFound:
-            exprsFound = False
-            for e in self.ignoreExprs:
-                try:
-                    while 1:
-                        loc,dummy = e._parse( instring, loc )
-                        exprsFound = True
-                except ParseException:
-                    pass
-        return loc
-
-    def preParse( self, instring, loc ):
-        if self.ignoreExprs:
-            loc = self._skipIgnorables( instring, loc )
-
-        if self.skipWhitespace:
-            wt = self.whiteChars
-            instrlen = len(instring)
-            while loc < instrlen and instring[loc] in wt:
-                loc += 1
-
-        return loc
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        return loc, []
-
-    def postParse( self, instring, loc, tokenlist ):
-        return tokenlist
-
-    #~ @profile
-    def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
-        debugging = ( self.debug ) #and doActions )
-
-        if debugging or self.failAction:
-            #~ print ("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
-            if (self.debugActions[0] ):
-                self.debugActions[0]( instring, loc, self )
-            if callPreParse and self.callPreparse:
-                preloc = self.preParse( instring, loc )
-            else:
-                preloc = loc
-            tokensStart = preloc
-            try:
-                try:
-                    loc,tokens = self.parseImpl( instring, preloc, doActions )
-                except IndexError:
-                    raise ParseException( instring, len(instring), self.errmsg, self )
-            except ParseBaseException as err:
-                #~ print ("Exception raised:", err)
-                if self.debugActions[2]:
-                    self.debugActions[2]( instring, tokensStart, self, err )
-                if self.failAction:
-                    self.failAction( instring, tokensStart, self, err )
-                raise
-        else:
-            if callPreParse and self.callPreparse:
-                preloc = self.preParse( instring, loc )
-            else:
-                preloc = loc
-            tokensStart = preloc
-            if self.mayIndexError or loc >= len(instring):
-                try:
-                    loc,tokens = self.parseImpl( instring, preloc, doActions )
-                except IndexError:
-                    raise ParseException( instring, len(instring), self.errmsg, self )
-            else:
-                loc,tokens = self.parseImpl( instring, preloc, doActions )
-
-        tokens = self.postParse( instring, loc, tokens )
-
-        retTokens = ParseResults( tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults )
-        if self.parseAction and (doActions or self.callDuringTry):
-            if debugging:
-                try:
-                    for fn in self.parseAction:
-                        tokens = fn( instring, tokensStart, retTokens )
-                        if tokens is not None:
-                            retTokens = ParseResults( tokens,
-                                                      self.resultsName,
-                                                      asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
-                                                      modal=self.modalResults )
-                except ParseBaseException as err:
-                    #~ print "Exception raised in user parse action:", err
-                    if (self.debugActions[2] ):
-                        self.debugActions[2]( instring, tokensStart, self, err )
-                    raise
-            else:
-                for fn in self.parseAction:
-                    tokens = fn( instring, tokensStart, retTokens )
-                    if tokens is not None:
-                        retTokens = ParseResults( tokens,
-                                                  self.resultsName,
-                                                  asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
-                                                  modal=self.modalResults )
-
-        if debugging:
-            #~ print ("Matched",self,"->",retTokens.asList())
-            if (self.debugActions[1] ):
-                self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
-
-        return loc, retTokens
-
-    def tryParse( self, instring, loc ):
-        try:
-            return self._parse( instring, loc, doActions=False )[0]
-        except ParseFatalException:
-            raise ParseException( instring, loc, self.errmsg, self)
-    
-    def canParseNext(self, instring, loc):
-        try:
-            self.tryParse(instring, loc)
-        except (ParseException, IndexError):
-            return False
-        else:
-            return True
-
-    class _UnboundedCache(object):
-        def __init__(self):
-            cache = {}
-            self.not_in_cache = not_in_cache = object()
-
-            def get(self, key):
-                return cache.get(key, not_in_cache)
-
-            def set(self, key, value):
-                cache[key] = value
-
-            def clear(self):
-                cache.clear()
-
-            self.get = types.MethodType(get, self)
-            self.set = types.MethodType(set, self)
-            self.clear = types.MethodType(clear, self)
-
-    if _OrderedDict is not None:
-        class _FifoCache(object):
-            def __init__(self, size):
-                self.not_in_cache = not_in_cache = object()
-
-                cache = _OrderedDict()
-
-                def get(self, key):
-                    return cache.get(key, not_in_cache)
-
-                def set(self, key, value):
-                    cache[key] = value
-                    if len(cache) > size:
-                        cache.popitem(False)
-
-                def clear(self):
-                    cache.clear()
-
-                self.get = types.MethodType(get, self)
-                self.set = types.MethodType(set, self)
-                self.clear = types.MethodType(clear, self)
-
-    else:
-        class _FifoCache(object):
-            def __init__(self, size):
-                self.not_in_cache = not_in_cache = object()
-
-                cache = {}
-                key_fifo = collections.deque([], size)
-
-                def get(self, key):
-                    return cache.get(key, not_in_cache)
-
-                def set(self, key, value):
-                    cache[key] = value
-                    if len(cache) > size:
-                        cache.pop(key_fifo.popleft(), None)
-                    key_fifo.append(key)
-
-                def clear(self):
-                    cache.clear()
-                    key_fifo.clear()
-
-                self.get = types.MethodType(get, self)
-                self.set = types.MethodType(set, self)
-                self.clear = types.MethodType(clear, self)
-
-    # argument cache for optimizing repeated calls when backtracking through recursive expressions
-    packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
-    packrat_cache_lock = RLock()
-    packrat_cache_stats = [0, 0]
-
-    # this method gets repeatedly called during backtracking with the same arguments -
-    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
-    def _parseCache( self, instring, loc, doActions=True, callPreParse=True ):
-        HIT, MISS = 0, 1
-        lookup = (self, instring, loc, callPreParse, doActions)
-        with ParserElement.packrat_cache_lock:
-            cache = ParserElement.packrat_cache
-            value = cache.get(lookup)
-            if value is cache.not_in_cache:
-                ParserElement.packrat_cache_stats[MISS] += 1
-                try:
-                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
-                except ParseBaseException as pe:
-                    # cache a copy of the exception, without the traceback
-                    cache.set(lookup, pe.__class__(*pe.args))
-                    raise
-                else:
-                    cache.set(lookup, (value[0], value[1].copy()))
-                    return value
-            else:
-                ParserElement.packrat_cache_stats[HIT] += 1
-                if isinstance(value, Exception):
-                    raise value
-                return (value[0], value[1].copy())
-
-    _parse = _parseNoCache
-
-    @staticmethod
-    def resetCache():
-        ParserElement.packrat_cache.clear()
-        ParserElement.packrat_cache_stats[:] = [0] * len(ParserElement.packrat_cache_stats)
-
-    _packratEnabled = False
-    @staticmethod
-    def enablePackrat(cache_size_limit=128):
-        """Enables "packrat" parsing, which adds memoizing to the parsing logic.
-           Repeated parse attempts at the same string location (which happens
-           often in many complex grammars) can immediately return a cached value,
-           instead of re-executing parsing/validating code.  Memoizing is done of
-           both valid results and parsing exceptions.
-           
-           Parameters:
-            - cache_size_limit - (default=C{128}) - if an integer value is provided
-              will limit the size of the packrat cache; if None is passed, then
-              the cache size will be unbounded; if 0 is passed, the cache will
-              be effectively disabled.
-            
-           This speedup may break existing programs that use parse actions that
-           have side-effects.  For this reason, packrat parsing is disabled when
-           you first import pyparsing.  To activate the packrat feature, your
-           program must call the class method C{ParserElement.enablePackrat()}.  If
-           your program uses C{psyco} to "compile as you go", you must call
-           C{enablePackrat} before calling C{psyco.full()}.  If you do not do this,
-           Python will crash.  For best results, call C{enablePackrat()} immediately
-           after importing pyparsing.
-           
-           Example::
-               import pyparsing
-               pyparsing.ParserElement.enablePackrat()
-        """
-        if not ParserElement._packratEnabled:
-            ParserElement._packratEnabled = True
-            if cache_size_limit is None:
-                ParserElement.packrat_cache = ParserElement._UnboundedCache()
-            else:
-                ParserElement.packrat_cache = ParserElement._FifoCache(cache_size_limit)
-            ParserElement._parse = ParserElement._parseCache
-
-    def parseString( self, instring, parseAll=False ):
-        """
-        Execute the parse expression with the given string.
-        This is the main interface to the client code, once the complete
-        expression has been built.
-
-        If you want the grammar to require that the entire input string be
-        successfully parsed, then set C{parseAll} to True (equivalent to ending
-        the grammar with C{L{StringEnd()}}).
-
-        Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
-        in order to report proper column numbers in parse actions.
-        If the input string contains tabs and
-        the grammar uses parse actions that use the C{loc} argument to index into the
-        string being parsed, you can ensure you have a consistent view of the input
-        string by:
-         - calling C{parseWithTabs} on your grammar before calling C{parseString}
-           (see L{I{parseWithTabs}<parseWithTabs>})
-         - define your parse action using the full C{(s,loc,toks)} signature, and
-           reference the input string using the parse action's C{s} argument
-         - explictly expand the tabs in your input string before calling
-           C{parseString}
-        
-        Example::
-            Word('a').parseString('aaaaabaaa')  # -> ['aaaaa']
-            Word('a').parseString('aaaaabaaa', parseAll=True)  # -> Exception: Expected end of text
-        """
-        ParserElement.resetCache()
-        if not self.streamlined:
-            self.streamline()
-            #~ self.saveAsList = True
-        for e in self.ignoreExprs:
-            e.streamline()
-        if not self.keepTabs:
-            instring = instring.expandtabs()
-        try:
-            loc, tokens = self._parse( instring, 0 )
-            if parseAll:
-                loc = self.preParse( instring, loc )
-                se = Empty() + StringEnd()
-                se._parse( instring, loc )
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc
-        else:
-            return tokens
-
-    def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
-        """
-        Scan the input string for expression matches.  Each match will return the
-        matching tokens, start location, and end location.  May be called with optional
-        C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
-        C{overlap} is specified, then overlapping matches will be reported.
-
-        Note that the start and end locations are reported relative to the string
-        being parsed.  See L{I{parseString}<parseString>} for more information on parsing
-        strings with embedded tabs.
-
-        Example::
-            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
-            print(source)
-            for tokens,start,end in Word(alphas).scanString(source):
-                print(' '*start + '^'*(end-start))
-                print(' '*start + tokens[0])
-        
-        prints::
-        
-            sldjf123lsdjjkf345sldkjf879lkjsfd987
-            ^^^^^
-            sldjf
-                    ^^^^^^^
-                    lsdjjkf
-                              ^^^^^^
-                              sldkjf
-                                       ^^^^^^
-                                       lkjsfd
-        """
-        if not self.streamlined:
-            self.streamline()
-        for e in self.ignoreExprs:
-            e.streamline()
-
-        if not self.keepTabs:
-            instring = _ustr(instring).expandtabs()
-        instrlen = len(instring)
-        loc = 0
-        preparseFn = self.preParse
-        parseFn = self._parse
-        ParserElement.resetCache()
-        matches = 0
-        try:
-            while loc <= instrlen and matches < maxMatches:
-                try:
-                    preloc = preparseFn( instring, loc )
-                    nextLoc,tokens = parseFn( instring, preloc, callPreParse=False )
-                except ParseException:
-                    loc = preloc+1
-                else:
-                    if nextLoc > loc:
-                        matches += 1
-                        yield tokens, preloc, nextLoc
-                        if overlap:
-                            nextloc = preparseFn( instring, loc )
-                            if nextloc > loc:
-                                loc = nextLoc
-                            else:
-                                loc += 1
-                        else:
-                            loc = nextLoc
-                    else:
-                        loc = preloc+1
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc
-
-    def transformString( self, instring ):
-        """
-        Extension to C{L{scanString}}, to modify matching text with modified tokens that may
-        be returned from a parse action.  To use C{transformString}, define a grammar and
-        attach a parse action to it that modifies the returned token list.
-        Invoking C{transformString()} on a target string will then scan for matches,
-        and replace the matched text patterns according to the logic in the parse
-        action.  C{transformString()} returns the resulting transformed string.
-        
-        Example::
-            wd = Word(alphas)
-            wd.setParseAction(lambda toks: toks[0].title())
-            
-            print(wd.transformString("now is the winter of our discontent made glorious summer by this sun of york."))
-        Prints::
-            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
-        """
-        out = []
-        lastE = 0
-        # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
-        # keep string locs straight between transformString and scanString
-        self.keepTabs = True
-        try:
-            for t,s,e in self.scanString( instring ):
-                out.append( instring[lastE:s] )
-                if t:
-                    if isinstance(t,ParseResults):
-                        out += t.asList()
-                    elif isinstance(t,list):
-                        out += t
-                    else:
-                        out.append(t)
-                lastE = e
-            out.append(instring[lastE:])
-            out = [o for o in out if o]
-            return "".join(map(_ustr,_flatten(out)))
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc
-
-    def searchString( self, instring, maxMatches=_MAX_INT ):
-        """
-        Another extension to C{L{scanString}}, simplifying the access to the tokens found
-        to match the given parse expression.  May be called with optional
-        C{maxMatches} argument, to clip searching after 'n' matches are found.
-        
-        Example::
-            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
-            cap_word = Word(alphas.upper(), alphas.lower())
-            
-            print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
-        prints::
-            ['More', 'Iron', 'Lead', 'Gold', 'I']
-        """
-        try:
-            return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc
-
-    def split(self, instring, maxsplit=_MAX_INT, includeSeparators=False):
-        """
-        Generator method to split a string using the given expression as a separator.
-        May be called with optional C{maxsplit} argument, to limit the number of splits;
-        and the optional C{includeSeparators} argument (default=C{False}), if the separating
-        matching text should be included in the split results.
-        
-        Example::        
-            punc = oneOf(list(".,;:/-!?"))
-            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
-        prints::
-            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
-        """
-        splits = 0
-        last = 0
-        for t,s,e in self.scanString(instring, maxMatches=maxsplit):
-            yield instring[last:s]
-            if includeSeparators:
-                yield t[0]
-            last = e
-        yield instring[last:]
-
-    def __add__(self, other ):
-        """
-        Implementation of + operator - returns C{L{And}}. Adding strings to a ParserElement
-        converts them to L{Literal}s by default.
-        
-        Example::
-            greet = Word(alphas) + "," + Word(alphas) + "!"
-            hello = "Hello, World!"
-            print (hello, "->", greet.parseString(hello))
-        Prints::
-            Hello, World! -> ['Hello', ',', 'World', '!']
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return And( [ self, other ] )
-
-    def __radd__(self, other ):
-        """
-        Implementation of + operator when left operand is not a C{L{ParserElement}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return other + self
-
-    def __sub__(self, other):
-        """
-        Implementation of - operator, returns C{L{And}} with error stop
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return And( [ self, And._ErrorStop(), other ] )
-
-    def __rsub__(self, other ):
-        """
-        Implementation of - operator when left operand is not a C{L{ParserElement}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return other - self
-
-    def __mul__(self,other):
-        """
-        Implementation of * operator, allows use of C{expr * 3} in place of
-        C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
-        tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
-        may also include C{None} as in:
-         - C{expr*(n,None)} or C{expr*(n,)} is equivalent
-              to C{expr*n + L{ZeroOrMore}(expr)}
-              (read as "at least n instances of C{expr}")
-         - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
-              (read as "0 to n instances of C{expr}")
-         - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
-         - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
-
-        Note that C{expr*(None,n)} does not raise an exception if
-        more than n exprs exist in the input stream; that is,
-        C{expr*(None,n)} does not enforce a maximum number of expr
-        occurrences.  If this behavior is desired, then write
-        C{expr*(None,n) + ~expr}
-        """
-        if isinstance(other,int):
-            minElements, optElements = other,0
-        elif isinstance(other,tuple):
-            other = (other + (None, None))[:2]
-            if other[0] is None:
-                other = (0, other[1])
-            if isinstance(other[0],int) and other[1] is None:
-                if other[0] == 0:
-                    return ZeroOrMore(self)
-                if other[0] == 1:
-                    return OneOrMore(self)
-                else:
-                    return self*other[0] + ZeroOrMore(self)
-            elif isinstance(other[0],int) and isinstance(other[1],int):
-                minElements, optElements = other
-                optElements -= minElements
-            else:
-                raise TypeError("cannot multiply 'ParserElement' and ('%s','%s') objects", type(other[0]),type(other[1]))
-        else:
-            raise TypeError("cannot multiply 'ParserElement' and '%s' objects", type(other))
-
-        if minElements < 0:
-            raise ValueError("cannot multiply ParserElement by negative value")
-        if optElements < 0:
-            raise ValueError("second tuple value must be greater or equal to first tuple value")
-        if minElements == optElements == 0:
-            raise ValueError("cannot multiply ParserElement by 0 or (0,0)")
-
-        if (optElements):
-            def makeOptionalList(n):
-                if n>1:
-                    return Optional(self + makeOptionalList(n-1))
-                else:
-                    return Optional(self)
-            if minElements:
-                if minElements == 1:
-                    ret = self + makeOptionalList(optElements)
-                else:
-                    ret = And([self]*minElements) + makeOptionalList(optElements)
-            else:
-                ret = makeOptionalList(optElements)
-        else:
-            if minElements == 1:
-                ret = self
-            else:
-                ret = And([self]*minElements)
-        return ret
-
-    def __rmul__(self, other):
-        return self.__mul__(other)
-
-    def __or__(self, other ):
-        """
-        Implementation of | operator - returns C{L{MatchFirst}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return MatchFirst( [ self, other ] )
-
-    def __ror__(self, other ):
-        """
-        Implementation of | operator when left operand is not a C{L{ParserElement}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return other | self
-
-    def __xor__(self, other ):
-        """
-        Implementation of ^ operator - returns C{L{Or}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return Or( [ self, other ] )
-
-    def __rxor__(self, other ):
-        """
-        Implementation of ^ operator when left operand is not a C{L{ParserElement}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return other ^ self
-
-    def __and__(self, other ):
-        """
-        Implementation of & operator - returns C{L{Each}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return Each( [ self, other ] )
-
-    def __rand__(self, other ):
-        """
-        Implementation of & operator when left operand is not a C{L{ParserElement}}
-        """
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        if not isinstance( other, ParserElement ):
-            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
-                    SyntaxWarning, stacklevel=2)
-            return None
-        return other & self
-
-    def __invert__( self ):
-        """
-        Implementation of ~ operator - returns C{L{NotAny}}
-        """
-        return NotAny( self )
-
-    def __call__(self, name=None):
-        """
-        Shortcut for C{L{setResultsName}}, with C{listAllMatches=False}.
-        
-        If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
-        passed as C{True}.
-           
-        If C{name} is omitted, same as calling C{L{copy}}.
-
-        Example::
-            # these are equivalent
-            userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
-            userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")             
-        """
-        if name is not None:
-            return self.setResultsName(name)
-        else:
-            return self.copy()
-
-    def suppress( self ):
-        """
-        Suppresses the output of this C{ParserElement}; useful to keep punctuation from
-        cluttering up returned output.
-        """
-        return Suppress( self )
-
-    def leaveWhitespace( self ):
-        """
-        Disables the skipping of whitespace before matching the characters in the
-        C{ParserElement}'s defined pattern.  This is normally only used internally by
-        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
-        """
-        self.skipWhitespace = False
-        return self
-
-    def setWhitespaceChars( self, chars ):
-        """
-        Overrides the default whitespace chars
-        """
-        self.skipWhitespace = True
-        self.whiteChars = chars
-        self.copyDefaultWhiteChars = False
-        return self
-
-    def parseWithTabs( self ):
-        """
-        Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
-        Must be called before C{parseString} when the input grammar contains elements that
-        match C{<TAB>} characters.
-        """
-        self.keepTabs = True
-        return self
-
-    def ignore( self, other ):
-        """
-        Define expression to be ignored (e.g., comments) while doing pattern
-        matching; may be called repeatedly, to define multiple comment or other
-        ignorable patterns.
-        
-        Example::
-            patt = OneOrMore(Word(alphas))
-            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj']
-            
-            patt.ignore(cStyleComment)
-            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj', 'lskjd']
-        """
-        if isinstance(other, basestring):
-            other = Suppress(other)
-
-        if isinstance( other, Suppress ):
-            if other not in self.ignoreExprs:
-                self.ignoreExprs.append(other)
-        else:
-            self.ignoreExprs.append( Suppress( other.copy() ) )
-        return self
-
-    def setDebugActions( self, startAction, successAction, exceptionAction ):
-        """
-        Enable display of debugging messages while doing pattern matching.
-        """
-        self.debugActions = (startAction or _defaultStartDebugAction,
-                             successAction or _defaultSuccessDebugAction,
-                             exceptionAction or _defaultExceptionDebugAction)
-        self.debug = True
-        return self
-
-    def setDebug( self, flag=True ):
-        """
-        Enable display of debugging messages while doing pattern matching.
-        Set C{flag} to True to enable, False to disable.
-
-        Example::
-            wd = Word(alphas).setName("alphaword")
-            integer = Word(nums).setName("numword")
-            term = wd | integer
-            
-            # turn on debugging for wd
-            wd.setDebug()
-
-            OneOrMore(term).parseString("abc 123 xyz 890")
-        
-        prints::
-            Match alphaword at loc 0(1,1)
-            Matched alphaword -> ['abc']
-            Match alphaword at loc 3(1,4)
-            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
-            Match alphaword at loc 7(1,8)
-            Matched alphaword -> ['xyz']
-            Match alphaword at loc 11(1,12)
-            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
-            Match alphaword at loc 15(1,16)
-            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
-
-        The output shown is that produced by the default debug actions - custom debug actions can be
-        specified using L{setDebugActions}. Prior to attempting
-        to match the C{wd} expression, the debugging message C{"Match <exprname> at loc <n>(<line>,<col>)"}
-        is shown. Then if the parse succeeds, a C{"Matched"} message is shown, or an C{"Exception raised"}
-        message is shown. Also note the use of L{setName} to assign a human-readable name to the expression,
-        which makes debugging and exception messages easier to understand - for instance, the default
-        name created for the C{Word} expression without calling C{setName} is C{"W:(ABCD...)"}.
-        """
-        if flag:
-            self.setDebugActions( _defaultStartDebugAction, _defaultSuccessDebugAction, _defaultExceptionDebugAction )
-        else:
-            self.debug = False
-        return self
-
-    def __str__( self ):
-        return self.name
-
-    def __repr__( self ):
-        return _ustr(self)
-
-    def streamline( self ):
-        self.streamlined = True
-        self.strRepr = None
-        return self
-
-    def checkRecursion( self, parseElementList ):
-        pass
-
-    def validate( self, validateTrace=[] ):
-        """
-        Check defined expressions for valid structure, check for infinite recursive definitions.
-        """
-        self.checkRecursion( [] )
-
-    def parseFile( self, file_or_filename, parseAll=False ):
-        """
-        Execute the parse expression on the given file or filename.
-        If a filename is specified (instead of a file object),
-        the entire file is opened, read, and closed before parsing.
-        """
-        try:
-            file_contents = file_or_filename.read()
-        except AttributeError:
-            with open(file_or_filename, "r") as f:
-                file_contents = f.read()
-        try:
-            return self.parseString(file_contents, parseAll)
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc
-
-    def __eq__(self,other):
-        if isinstance(other, ParserElement):
-            return self is other or vars(self) == vars(other)
-        elif isinstance(other, basestring):
-            return self.matches(other)
-        else:
-            return super(ParserElement,self)==other
-
-    def __ne__(self,other):
-        return not (self == other)
-
-    def __hash__(self):
-        return hash(id(self))
-
-    def __req__(self,other):
-        return self == other
-
-    def __rne__(self,other):
-        return not (self == other)
-
-    def matches(self, testString, parseAll=True):
-        """
-        Method for quick testing of a parser against a test string. Good for simple 
-        inline microtests of sub expressions while building up larger parser.
-           
-        Parameters:
-         - testString - to test against this expression for a match
-         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests
-            
-        Example::
-            expr = Word(nums)
-            assert expr.matches("100")
-        """
-        try:
-            self.parseString(_ustr(testString), parseAll=parseAll)
-            return True
-        except ParseBaseException:
-            return False
-                
-    def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResults=True, failureTests=False):
-        """
-        Execute the parse expression on a series of test strings, showing each
-        test, the parsed results or where the parse failed. Quick and easy way to
-        run a parse expression against a list of sample strings.
-           
-        Parameters:
-         - tests - a list of separate test strings, or a multiline string of test strings
-         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests           
-         - comment - (default=C{'#'}) - expression for indicating embedded comments in the test 
-              string; pass None to disable comment filtering
-         - fullDump - (default=C{True}) - dump results as list followed by results names in nested outline;
-              if False, only dump nested list
-         - printResults - (default=C{True}) prints test output to stdout
-         - failureTests - (default=C{False}) indicates if these tests are expected to fail parsing
-
-        Returns: a (success, results) tuple, where success indicates that all tests succeeded
-        (or failed if C{failureTests} is True), and the results contain a list of lines of each 
-        test's output
-        
-        Example::
-            number_expr = pyparsing_common.number.copy()
-
-            result = number_expr.runTests('''
-                # unsigned integer
-                100
-                # negative integer
-                -100
-                # float with scientific notation
-                6.02e23
-                # integer with scientific notation
-                1e-12
-                ''')
-            print("Success" if result[0] else "Failed!")
-
-            result = number_expr.runTests('''
-                # stray character
-                100Z
-                # missing leading digit before '.'
-                -.100
-                # too many '.'
-                3.14.159
-                ''', failureTests=True)
-            print("Success" if result[0] else "Failed!")
-        prints::
-            # unsigned integer
-            100
-            [100]
-
-            # negative integer
-            -100
-            [-100]
-
-            # float with scientific notation
-            6.02e23
-            [6.02e+23]
-
-            # integer with scientific notation
-            1e-12
-            [1e-12]
-
-            Success
-            
-            # stray character
-            100Z
-               ^
-            FAIL: Expected end of text (at char 3), (line:1, col:4)
-
-            # missing leading digit before '.'
-            -.100
-            ^
-            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
-
-            # too many '.'
-            3.14.159
-                ^
-            FAIL: Expected end of text (at char 4), (line:1, col:5)
-
-            Success
-
-        Each test string must be on a single line. If you want to test a string that spans multiple
-        lines, create a test like this::
-
-            expr.runTest(r"this is a test\\n of strings that spans \\n 3 lines")
-        
-        (Note that this is a raw string literal, you must include the leading 'r'.)
-        """
-        if isinstance(tests, basestring):
-            tests = list(map(str.strip, tests.rstrip().splitlines()))
-        if isinstance(comment, basestring):
-            comment = Literal(comment)
-        allResults = []
-        comments = []
-        success = True
-        for t in tests:
-            if comment is not None and comment.matches(t, False) or comments and not t:
-                comments.append(t)
-                continue
-            if not t:
-                continue
-            out = ['\n'.join(comments), t]
-            comments = []
-            try:
-                t = t.replace(r'\n','\n')
-                result = self.parseString(t, parseAll=parseAll)
-                out.append(result.dump(full=fullDump))
-                success = success and not failureTests
-            except ParseBaseException as pe:
-                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
-                if '\n' in t:
-                    out.append(line(pe.loc, t))
-                    out.append(' '*(col(pe.loc,t)-1) + '^' + fatal)
-                else:
-                    out.append(' '*pe.loc + '^' + fatal)
-                out.append("FAIL: " + str(pe))
-                success = success and failureTests
-                result = pe
-            except Exception as exc:
-                out.append("FAIL-EXCEPTION: " + str(exc))
-                success = success and failureTests
-                result = exc
-
-            if printResults:
-                if fullDump:
-                    out.append('')
-                print('\n'.join(out))
-
-            allResults.append((t, result))
-        
-        return success, allResults
-
-        
-class Token(ParserElement):
-    """
-    Abstract C{ParserElement} subclass, for defining atomic matching patterns.
-    """
-    def __init__( self ):
-        super(Token,self).__init__( savelist=False )
-
-
-class Empty(Token):
-    """
-    An empty token, will always match.
-    """
-    def __init__( self ):
-        super(Empty,self).__init__()
-        self.name = "Empty"
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-
-class NoMatch(Token):
-    """
-    A token that will never match.
-    """
-    def __init__( self ):
-        super(NoMatch,self).__init__()
-        self.name = "NoMatch"
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.errmsg = "Unmatchable token"
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Literal(Token):
-    """
-    Token to exactly match a specified string.
-    
-    Example::
-        Literal('blah').parseString('blah')  # -> ['blah']
-        Literal('blah').parseString('blahfooblah')  # -> ['blah']
-        Literal('blah').parseString('bla')  # -> Exception: Expected "blah"
-    
-    For case-insensitive matching, use L{CaselessLiteral}.
-    
-    For keyword matching (force word break before and after the matched string),
-    use L{Keyword} or L{CaselessKeyword}.
-    """
-    def __init__( self, matchString ):
-        super(Literal,self).__init__()
-        self.match = matchString
-        self.matchLen = len(matchString)
-        try:
-            self.firstMatchChar = matchString[0]
-        except IndexError:
-            warnings.warn("null string passed to Literal; use Empty() instead",
-                            SyntaxWarning, stacklevel=2)
-            self.__class__ = Empty
-        self.name = '"%s"' % _ustr(self.match)
-        self.errmsg = "Expected " + self.name
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-
-    # Performance tuning: this routine gets called a *lot*
-    # if this is a single character match string  and the first character matches,
-    # short-circuit as quickly as possible, and avoid calling startswith
-    #~ @profile
-    def parseImpl( self, instring, loc, doActions=True ):
-        if (instring[loc] == self.firstMatchChar and
-            (self.matchLen==1 or instring.startswith(self.match,loc)) ):
-            return loc+self.matchLen, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-_L = Literal
-ParserElement._literalStringClass = Literal
-
-class Keyword(Token):
-    """
-    Token to exactly match a specified string as a keyword, that is, it must be
-    immediately followed by a non-keyword character.  Compare with C{L{Literal}}:
-     - C{Literal("if")} will match the leading C{'if'} in C{'ifAndOnlyIf'}.
-     - C{Keyword("if")} will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
-    Accepts two optional constructor arguments in addition to the keyword string:
-     - C{identChars} is a string of characters that would be valid identifier characters,
-          defaulting to all alphanumerics + "_" and "$"
-     - C{caseless} allows case-insensitive matching, default is C{False}.
-       
-    Example::
-        Keyword("start").parseString("start")  # -> ['start']
-        Keyword("start").parseString("starting")  # -> Exception
-
-    For case-insensitive matching, use L{CaselessKeyword}.
-    """
-    DEFAULT_KEYWORD_CHARS = alphanums+"_$"
-
-    def __init__( self, matchString, identChars=None, caseless=False ):
-        super(Keyword,self).__init__()
-        if identChars is None:
-            identChars = Keyword.DEFAULT_KEYWORD_CHARS
-        self.match = matchString
-        self.matchLen = len(matchString)
-        try:
-            self.firstMatchChar = matchString[0]
-        except IndexError:
-            warnings.warn("null string passed to Keyword; use Empty() instead",
-                            SyntaxWarning, stacklevel=2)
-        self.name = '"%s"' % self.match
-        self.errmsg = "Expected " + self.name
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-        self.caseless = caseless
-        if caseless:
-            self.caselessmatch = matchString.upper()
-            identChars = identChars.upper()
-        self.identChars = set(identChars)
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if self.caseless:
-            if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
-                 (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) and
-                 (loc == 0 or instring[loc-1].upper() not in self.identChars) ):
-                return loc+self.matchLen, self.match
-        else:
-            if (instring[loc] == self.firstMatchChar and
-                (self.matchLen==1 or instring.startswith(self.match,loc)) and
-                (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) and
-                (loc == 0 or instring[loc-1] not in self.identChars) ):
-                return loc+self.matchLen, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-    def copy(self):
-        c = super(Keyword,self).copy()
-        c.identChars = Keyword.DEFAULT_KEYWORD_CHARS
-        return c
-
-    @staticmethod
-    def setDefaultKeywordChars( chars ):
-        """Overrides the default Keyword chars
-        """
-        Keyword.DEFAULT_KEYWORD_CHARS = chars
-
-class CaselessLiteral(Literal):
-    """
-    Token to match a specified string, ignoring case of letters.
-    Note: the matched results will always be in the case of the given
-    match string, NOT the case of the input text.
-
-    Example::
-        OneOrMore(CaselessLiteral("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD', 'CMD']
-        
-    (Contrast with example for L{CaselessKeyword}.)
-    """
-    def __init__( self, matchString ):
-        super(CaselessLiteral,self).__init__( matchString.upper() )
-        # Preserve the defining literal.
-        self.returnString = matchString
-        self.name = "'%s'" % self.returnString
-        self.errmsg = "Expected " + self.name
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if instring[ loc:loc+self.matchLen ].upper() == self.match:
-            return loc+self.matchLen, self.returnString
-        raise ParseException(instring, loc, self.errmsg, self)
-
-class CaselessKeyword(Keyword):
-    """
-    Caseless version of L{Keyword}.
-
-    Example::
-        OneOrMore(CaselessKeyword("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD']
-        
-    (Contrast with example for L{CaselessLiteral}.)
-    """
-    def __init__( self, matchString, identChars=None ):
-        super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
-             (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ):
-            return loc+self.matchLen, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-class CloseMatch(Token):
-    """
-    A variation on L{Literal} which matches "close" matches, that is, 
-    strings with at most 'n' mismatching characters. C{CloseMatch} takes parameters:
-     - C{match_string} - string to be matched
-     - C{maxMismatches} - (C{default=1}) maximum number of mismatches allowed to count as a match
-    
-    The results from a successful parse will contain the matched text from the input string and the following named results:
-     - C{mismatches} - a list of the positions within the match_string where mismatches were found
-     - C{original} - the original match_string used to compare against the input string
-    
-    If C{mismatches} is an empty list, then the match was an exact match.
-    
-    Example::
-        patt = CloseMatch("ATCATCGAATGGA")
-        patt.parseString("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
-        patt.parseString("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
-
-        # exact match
-        patt.parseString("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
-
-        # close match allowing up to 2 mismatches
-        patt = CloseMatch("ATCATCGAATGGA", maxMismatches=2)
-        patt.parseString("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
-    """
-    def __init__(self, match_string, maxMismatches=1):
-        super(CloseMatch,self).__init__()
-        self.name = match_string
-        self.match_string = match_string
-        self.maxMismatches = maxMismatches
-        self.errmsg = "Expected %r (with up to %d mismatches)" % (self.match_string, self.maxMismatches)
-        self.mayIndexError = False
-        self.mayReturnEmpty = False
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        start = loc
-        instrlen = len(instring)
-        maxloc = start + len(self.match_string)
-
-        if maxloc <= instrlen:
-            match_string = self.match_string
-            match_stringloc = 0
-            mismatches = []
-            maxMismatches = self.maxMismatches
-
-            for match_stringloc,s_m in enumerate(zip(instring[loc:maxloc], self.match_string)):
-                src,mat = s_m
-                if src != mat:
-                    mismatches.append(match_stringloc)
-                    if len(mismatches) > maxMismatches:
-                        break
-            else:
-                loc = match_stringloc + 1
-                results = ParseResults([instring[start:loc]])
-                results['original'] = self.match_string
-                results['mismatches'] = mismatches
-                return loc, results
-
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Word(Token):
-    """
-    Token for matching words composed of allowed character sets.
-    Defined with string containing all allowed initial characters,
-    an optional string containing allowed body characters (if omitted,
-    defaults to the initial character set), and an optional minimum,
-    maximum, and/or exact length.  The default value for C{min} is 1 (a
-    minimum value < 1 is not valid); the default values for C{max} and C{exact}
-    are 0, meaning no maximum or exact length restriction. An optional
-    C{excludeChars} parameter can list characters that might be found in 
-    the input C{bodyChars} string; useful to define a word of all printables
-    except for one or two characters, for instance.
-    
-    L{srange} is useful for defining custom character set strings for defining 
-    C{Word} expressions, using range notation from regular expression character sets.
-    
-    A common mistake is to use C{Word} to match a specific literal string, as in 
-    C{Word("Address")}. Remember that C{Word} uses the string argument to define
-    I{sets} of matchable characters. This expression would match "Add", "AAA",
-    "dAred", or any other word made up of the characters 'A', 'd', 'r', 'e', and 's'.
-    To match an exact literal string, use L{Literal} or L{Keyword}.
-
-    pyparsing includes helper strings for building Words:
-     - L{alphas}
-     - L{nums}
-     - L{alphanums}
-     - L{hexnums}
-     - L{alphas8bit} (alphabetic characters in ASCII range 128-255 - accented, tilded, umlauted, etc.)
-     - L{punc8bit} (non-alphabetic characters in ASCII range 128-255 - currency, symbols, superscripts, diacriticals, etc.)
-     - L{printables} (any non-whitespace character)
-
-    Example::
-        # a word composed of digits
-        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
-        
-        # a word with a leading capital, and zero or more lowercase
-        capital_word = Word(alphas.upper(), alphas.lower())
-
-        # hostnames are alphanumeric, with leading alpha, and '-'
-        hostname = Word(alphas, alphanums+'-')
-        
-        # roman numeral (not a strict parser, accepts invalid mix of characters)
-        roman = Word("IVXLCDM")
-        
-        # any string of non-whitespace characters, except for ','
-        csv_value = Word(printables, excludeChars=",")
-    """
-    def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False, excludeChars=None ):
-        super(Word,self).__init__()
-        if excludeChars:
-            initChars = ''.join(c for c in initChars if c not in excludeChars)
-            if bodyChars:
-                bodyChars = ''.join(c for c in bodyChars if c not in excludeChars)
-        self.initCharsOrig = initChars
-        self.initChars = set(initChars)
-        if bodyChars :
-            self.bodyCharsOrig = bodyChars
-            self.bodyChars = set(bodyChars)
-        else:
-            self.bodyCharsOrig = initChars
-            self.bodyChars = set(initChars)
-
-        self.maxSpecified = max > 0
-
-        if min < 1:
-            raise ValueError("cannot specify a minimum length < 1; use Optional(Word()) if zero-length word is permitted")
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.name = _ustr(self)
-        self.errmsg = "Expected " + self.name
-        self.mayIndexError = False
-        self.asKeyword = asKeyword
-
-        if ' ' not in self.initCharsOrig+self.bodyCharsOrig and (min==1 and max==0 and exact==0):
-            if self.bodyCharsOrig == self.initCharsOrig:
-                self.reString = "[%s]+" % _escapeRegexRangeChars(self.initCharsOrig)
-            elif len(self.initCharsOrig) == 1:
-                self.reString = "%s[%s]*" % \
-                                      (re.escape(self.initCharsOrig),
-                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
-            else:
-                self.reString = "[%s][%s]*" % \
-                                      (_escapeRegexRangeChars(self.initCharsOrig),
-                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
-            if self.asKeyword:
-                self.reString = r"\b"+self.reString+r"\b"
-            try:
-                self.re = re.compile( self.reString )
-            except Exception:
-                self.re = None
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if self.re:
-            result = self.re.match(instring,loc)
-            if not result:
-                raise ParseException(instring, loc, self.errmsg, self)
-
-            loc = result.end()
-            return loc, result.group()
-
-        if not(instring[ loc ] in self.initChars):
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        instrlen = len(instring)
-        bodychars = self.bodyChars
-        maxloc = start + self.maxLen
-        maxloc = min( maxloc, instrlen )
-        while loc < maxloc and instring[loc] in bodychars:
-            loc += 1
-
-        throwException = False
-        if loc - start < self.minLen:
-            throwException = True
-        if self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
-            throwException = True
-        if self.asKeyword:
-            if (start>0 and instring[start-1] in bodychars) or (loc<instrlen and instring[loc] in bodychars):
-                throwException = True
-
-        if throwException:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-    def __str__( self ):
-        try:
-            return super(Word,self).__str__()
-        except Exception:
-            pass
-
-
-        if self.strRepr is None:
-
-            def charsAsStr(s):
-                if len(s)>4:
-                    return s[:4]+"..."
-                else:
-                    return s
-
-            if ( self.initCharsOrig != self.bodyCharsOrig ):
-                self.strRepr = "W:(%s,%s)" % ( charsAsStr(self.initCharsOrig), charsAsStr(self.bodyCharsOrig) )
-            else:
-                self.strRepr = "W:(%s)" % charsAsStr(self.initCharsOrig)
-
-        return self.strRepr
-
-
-class Regex(Token):
-    """
-    Token for matching strings that match a given regular expression.
-    Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
-    If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
-    named parse results.
-
-    Example::
-        realnum = Regex(r"[+-]?\d+\.\d*")
-        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
-        # ref: http://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
-        roman = Regex(r"M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
-    """
-    compiledREtype = type(re.compile("[A-Z]"))
-    def __init__( self, pattern, flags=0):
-        """The parameters C{pattern} and C{flags} are passed to the C{re.compile()} function as-is. See the Python C{re} module for an explanation of the acceptable patterns and flags."""
-        super(Regex,self).__init__()
-
-        if isinstance(pattern, basestring):
-            if not pattern:
-                warnings.warn("null string passed to Regex; use Empty() instead",
-                        SyntaxWarning, stacklevel=2)
-
-            self.pattern = pattern
-            self.flags = flags
-
-            try:
-                self.re = re.compile(self.pattern, self.flags)
-                self.reString = self.pattern
-            except sre_constants.error:
-                warnings.warn("invalid pattern (%s) passed to Regex" % pattern,
-                    SyntaxWarning, stacklevel=2)
-                raise
-
-        elif isinstance(pattern, Regex.compiledREtype):
-            self.re = pattern
-            self.pattern = \
-            self.reString = str(pattern)
-            self.flags = flags
-            
-        else:
-            raise ValueError("Regex may only be constructed with a string or a compiled RE object")
-
-        self.name = _ustr(self)
-        self.errmsg = "Expected " + self.name
-        self.mayIndexError = False
-        self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        result = self.re.match(instring,loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        d = result.groupdict()
-        ret = ParseResults(result.group())
-        if d:
-            for k in d:
-                ret[k] = d[k]
-        return loc,ret
-
-    def __str__( self ):
-        try:
-            return super(Regex,self).__str__()
-        except Exception:
-            pass
-
-        if self.strRepr is None:
-            self.strRepr = "Re:(%s)" % repr(self.pattern)
-
-        return self.strRepr
-
-
-class QuotedString(Token):
-    r"""
-    Token for matching strings that are delimited by quoting characters.
-    
-    Defined with the following parameters:
-        - quoteChar - string of one or more characters defining the quote delimiting string
-        - escChar - character to escape quotes, typically backslash (default=C{None})
-        - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=C{None})
-        - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
-        - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
-        - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
-        - convertWhitespaceEscapes - convert escaped whitespace (C{'\t'}, C{'\n'}, etc.) to actual whitespace (default=C{True})
-
-    Example::
-        qs = QuotedString('"')
-        print(qs.searchString('lsjdf "This is the quote" sldjf'))
-        complex_qs = QuotedString('{{', endQuoteChar='}}')
-        print(complex_qs.searchString('lsjdf {{This is the "quote"}} sldjf'))
-        sql_qs = QuotedString('"', escQuote='""')
-        print(sql_qs.searchString('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
-    prints::
-        [['This is the quote']]
-        [['This is the "quote"']]
-        [['This is the quote with "embedded" quotes']]
-    """
-    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None, convertWhitespaceEscapes=True):
-        super(QuotedString,self).__init__()
-
-        # remove white space from quote chars - wont work anyway
-        quoteChar = quoteChar.strip()
-        if not quoteChar:
-            warnings.warn("quoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
-            raise SyntaxError()
-
-        if endQuoteChar is None:
-            endQuoteChar = quoteChar
-        else:
-            endQuoteChar = endQuoteChar.strip()
-            if not endQuoteChar:
-                warnings.warn("endQuoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
-                raise SyntaxError()
-
-        self.quoteChar = quoteChar
-        self.quoteCharLen = len(quoteChar)
-        self.firstQuoteChar = quoteChar[0]
-        self.endQuoteChar = endQuoteChar
-        self.endQuoteCharLen = len(endQuoteChar)
-        self.escChar = escChar
-        self.escQuote = escQuote
-        self.unquoteResults = unquoteResults
-        self.convertWhitespaceEscapes = convertWhitespaceEscapes
-
-        if multiline:
-            self.flags = re.MULTILINE | re.DOTALL
-            self.pattern = r'%s(?:[^%s%s]' % \
-                ( re.escape(self.quoteChar),
-                  _escapeRegexRangeChars(self.endQuoteChar[0]),
-                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
-        else:
-            self.flags = 0
-            self.pattern = r'%s(?:[^%s\n\r%s]' % \
-                ( re.escape(self.quoteChar),
-                  _escapeRegexRangeChars(self.endQuoteChar[0]),
-                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
-        if len(self.endQuoteChar) > 1:
-            self.pattern += (
-                '|(?:' + ')|(?:'.join("%s[^%s]" % (re.escape(self.endQuoteChar[:i]),
-                                               _escapeRegexRangeChars(self.endQuoteChar[i]))
-                                    for i in range(len(self.endQuoteChar)-1,0,-1)) + ')'
-                )
-        if escQuote:
-            self.pattern += (r'|(?:%s)' % re.escape(escQuote))
-        if escChar:
-            self.pattern += (r'|(?:%s.)' % re.escape(escChar))
-            self.escCharReplacePattern = re.escape(self.escChar)+"(.)"
-        self.pattern += (r')*%s' % re.escape(self.endQuoteChar))
-
-        try:
-            self.re = re.compile(self.pattern, self.flags)
-            self.reString = self.pattern
-        except sre_constants.error:
-            warnings.warn("invalid pattern (%s) passed to Regex" % self.pattern,
-                SyntaxWarning, stacklevel=2)
-            raise
-
-        self.name = _ustr(self)
-        self.errmsg = "Expected " + self.name
-        self.mayIndexError = False
-        self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        result = instring[loc] == self.firstQuoteChar and self.re.match(instring,loc) or None
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = result.group()
-
-        if self.unquoteResults:
-
-            # strip off quotes
-            ret = ret[self.quoteCharLen:-self.endQuoteCharLen]
-
-            if isinstance(ret,basestring):
-                # replace escaped whitespace
-                if '\\' in ret and self.convertWhitespaceEscapes:
-                    ws_map = {
-                        r'\t' : '\t',
-                        r'\n' : '\n',
-                        r'\f' : '\f',
-                        r'\r' : '\r',
-                    }
-                    for wslit,wschar in ws_map.items():
-                        ret = ret.replace(wslit, wschar)
-
-                # replace escaped characters
-                if self.escChar:
-                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
-
-                # replace escaped quotes
-                if self.escQuote:
-                    ret = ret.replace(self.escQuote, self.endQuoteChar)
-
-        return loc, ret
-
-    def __str__( self ):
-        try:
-            return super(QuotedString,self).__str__()
-        except Exception:
-            pass
-
-        if self.strRepr is None:
-            self.strRepr = "quoted string, starting with %s ending with %s" % (self.quoteChar, self.endQuoteChar)
-
-        return self.strRepr
-
-
-class CharsNotIn(Token):
-    """
-    Token for matching words composed of characters I{not} in a given set (will
-    include whitespace in matched characters if not listed in the provided exclusion set - see example).
-    Defined with string containing all disallowed characters, and an optional
-    minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
-    minimum value < 1 is not valid); the default values for C{max} and C{exact}
-    are 0, meaning no maximum or exact length restriction.
-
-    Example::
-        # define a comma-separated-value as anything that is not a ','
-        csv_value = CharsNotIn(',')
-        print(delimitedList(csv_value).parseString("dkls,lsdkjf,s12 34,@!#,213"))
-    prints::
-        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
-    """
-    def __init__( self, notChars, min=1, max=0, exact=0 ):
-        super(CharsNotIn,self).__init__()
-        self.skipWhitespace = False
-        self.notChars = notChars
-
-        if min < 1:
-            raise ValueError("cannot specify a minimum length < 1; use Optional(CharsNotIn()) if zero-length char group is permitted")
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.name = _ustr(self)
-        self.errmsg = "Expected " + self.name
-        self.mayReturnEmpty = ( self.minLen == 0 )
-        self.mayIndexError = False
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if instring[loc] in self.notChars:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        notchars = self.notChars
-        maxlen = min( start+self.maxLen, len(instring) )
-        while loc < maxlen and \
-              (instring[loc] not in notchars):
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-    def __str__( self ):
-        try:
-            return super(CharsNotIn, self).__str__()
-        except Exception:
-            pass
-
-        if self.strRepr is None:
-            if len(self.notChars) > 4:
-                self.strRepr = "!W:(%s...)" % self.notChars[:4]
-            else:
-                self.strRepr = "!W:(%s)" % self.notChars
-
-        return self.strRepr
-
-class White(Token):
-    """
-    Special matching class for matching whitespace.  Normally, whitespace is ignored
-    by pyparsing grammars.  This class is included when some whitespace structures
-    are significant.  Define with a string containing the whitespace characters to be
-    matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
-    as defined for the C{L{Word}} class.
-    """
-    whiteStrs = {
-        " " : "<SPC>",
-        "\t": "<TAB>",
-        "\n": "<LF>",
-        "\r": "<CR>",
-        "\f": "<FF>",
-        }
-    def __init__(self, ws=" \t\r\n", min=1, max=0, exact=0):
-        super(White,self).__init__()
-        self.matchWhite = ws
-        self.setWhitespaceChars( "".join(c for c in self.whiteChars if c not in self.matchWhite) )
-        #~ self.leaveWhitespace()
-        self.name = ("".join(White.whiteStrs[c] for c in self.matchWhite))
-        self.mayReturnEmpty = True
-        self.errmsg = "Expected " + self.name
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if not(instring[ loc ] in self.matchWhite):
-            raise ParseException(instring, loc, self.errmsg, self)
-        start = loc
-        loc += 1
-        maxloc = start + self.maxLen
-        maxloc = min( maxloc, len(instring) )
-        while loc < maxloc and instring[loc] in self.matchWhite:
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-
-class _PositionToken(Token):
-    def __init__( self ):
-        super(_PositionToken,self).__init__()
-        self.name=self.__class__.__name__
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-class GoToColumn(_PositionToken):
-    """
-    Token to advance to a specific column of input text; useful for tabular report scraping.
-    """
-    def __init__( self, colno ):
-        super(GoToColumn,self).__init__()
-        self.col = colno
-
-    def preParse( self, instring, loc ):
-        if col(loc,instring) != self.col:
-            instrlen = len(instring)
-            if self.ignoreExprs:
-                loc = self._skipIgnorables( instring, loc )
-            while loc < instrlen and instring[loc].isspace() and col( loc, instring ) != self.col :
-                loc += 1
-        return loc
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        thiscol = col( loc, instring )
-        if thiscol > self.col:
-            raise ParseException( instring, loc, "Text not in expected column", self )
-        newloc = loc + self.col - thiscol
-        ret = instring[ loc: newloc ]
-        return newloc, ret
-
-
-class LineStart(_PositionToken):
-    """
-    Matches if current position is at the beginning of a line within the parse string
-    
-    Example::
-    
-        test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
-        '''
-
-        for t in (LineStart() + 'AAA' + restOfLine).searchString(test):
-            print(t)
-    
-    Prints::
-        ['AAA', ' this line']
-        ['AAA', ' and this line']    
-
-    """
-    def __init__( self ):
-        super(LineStart,self).__init__()
-        self.errmsg = "Expected start of line"
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if col(loc, instring) == 1:
-            return loc, []
-        raise ParseException(instring, loc, self.errmsg, self)
-
-class LineEnd(_PositionToken):
-    """
-    Matches if current position is at the end of a line within the parse string
-    """
-    def __init__( self ):
-        super(LineEnd,self).__init__()
-        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
-        self.errmsg = "Expected end of line"
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if loc<len(instring):
-            if instring[loc] == "\n":
-                return loc+1, "\n"
-            else:
-                raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
-            return loc+1, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-class StringStart(_PositionToken):
-    """
-    Matches if current position is at the beginning of the parse string
-    """
-    def __init__( self ):
-        super(StringStart,self).__init__()
-        self.errmsg = "Expected start of text"
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if loc != 0:
-            # see if entire string up to here is just whitespace and ignoreables
-            if loc != self.preParse( instring, 0 ):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-class StringEnd(_PositionToken):
-    """
-    Matches if current position is at the end of the parse string
-    """
-    def __init__( self ):
-        super(StringEnd,self).__init__()
-        self.errmsg = "Expected end of text"
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if loc < len(instring):
-            raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
-            return loc+1, []
-        elif loc > len(instring):
-            return loc, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-class WordStart(_PositionToken):
-    """
-    Matches if the current position is at the beginning of a Word, and
-    is not preceded by any character in a given set of C{wordChars}
-    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
-    use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
-    the string being parsed, or at the beginning of a line.
-    """
-    def __init__(self, wordChars = printables):
-        super(WordStart,self).__init__()
-        self.wordChars = set(wordChars)
-        self.errmsg = "Not at the start of a word"
-
-    def parseImpl(self, instring, loc, doActions=True ):
-        if loc != 0:
-            if (instring[loc-1] in self.wordChars or
-                instring[loc] not in self.wordChars):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-class WordEnd(_PositionToken):
-    """
-    Matches if the current position is at the end of a Word, and
-    is not followed by any character in a given set of C{wordChars}
-    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
-    use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
-    the string being parsed, or at the end of a line.
-    """
-    def __init__(self, wordChars = printables):
-        super(WordEnd,self).__init__()
-        self.wordChars = set(wordChars)
-        self.skipWhitespace = False
-        self.errmsg = "Not at the end of a word"
-
-    def parseImpl(self, instring, loc, doActions=True ):
-        instrlen = len(instring)
-        if instrlen>0 and loc<instrlen:
-            if (instring[loc] in self.wordChars or
-                instring[loc-1] not in self.wordChars):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-
-class ParseExpression(ParserElement):
-    """
-    Abstract subclass of ParserElement, for combining and post-processing parsed tokens.
-    """
-    def __init__( self, exprs, savelist = False ):
-        super(ParseExpression,self).__init__(savelist)
-        if isinstance( exprs, _generatorType ):
-            exprs = list(exprs)
-
-        if isinstance( exprs, basestring ):
-            self.exprs = [ ParserElement._literalStringClass( exprs ) ]
-        elif isinstance( exprs, collections.Iterable ):
-            exprs = list(exprs)
-            # if sequence of strings provided, wrap with Literal
-            if all(isinstance(expr, basestring) for expr in exprs):
-                exprs = map(ParserElement._literalStringClass, exprs)
-            self.exprs = list(exprs)
-        else:
-            try:
-                self.exprs = list( exprs )
-            except TypeError:
-                self.exprs = [ exprs ]
-        self.callPreparse = False
-
-    def __getitem__( self, i ):
-        return self.exprs[i]
-
-    def append( self, other ):
-        self.exprs.append( other )
-        self.strRepr = None
-        return self
-
-    def leaveWhitespace( self ):
-        """Extends C{leaveWhitespace} defined in base class, and also invokes C{leaveWhitespace} on
-           all contained expressions."""
-        self.skipWhitespace = False
-        self.exprs = [ e.copy() for e in self.exprs ]
-        for e in self.exprs:
-            e.leaveWhitespace()
-        return self
-
-    def ignore( self, other ):
-        if isinstance( other, Suppress ):
-            if other not in self.ignoreExprs:
-                super( ParseExpression, self).ignore( other )
-                for e in self.exprs:
-                    e.ignore( self.ignoreExprs[-1] )
-        else:
-            super( ParseExpression, self).ignore( other )
-            for e in self.exprs:
-                e.ignore( self.ignoreExprs[-1] )
-        return self
-
-    def __str__( self ):
-        try:
-            return super(ParseExpression,self).__str__()
-        except Exception:
-            pass
-
-        if self.strRepr is None:
-            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.exprs) )
-        return self.strRepr
-
-    def streamline( self ):
-        super(ParseExpression,self).streamline()
-
-        for e in self.exprs:
-            e.streamline()
-
-        # collapse nested And's of the form And( And( And( a,b), c), d) to And( a,b,c,d )
-        # but only if there are no parse actions or resultsNames on the nested And's
-        # (likewise for Or's and MatchFirst's)
-        if ( len(self.exprs) == 2 ):
-            other = self.exprs[0]
-            if ( isinstance( other, self.__class__ ) and
-                  not(other.parseAction) and
-                  other.resultsName is None and
-                  not other.debug ):
-                self.exprs = other.exprs[:] + [ self.exprs[1] ]
-                self.strRepr = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError  |= other.mayIndexError
-
-            other = self.exprs[-1]
-            if ( isinstance( other, self.__class__ ) and
-                  not(other.parseAction) and
-                  other.resultsName is None and
-                  not other.debug ):
-                self.exprs = self.exprs[:-1] + other.exprs[:]
-                self.strRepr = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError  |= other.mayIndexError
-
-        self.errmsg = "Expected " + _ustr(self)
-        
-        return self
-
-    def setResultsName( self, name, listAllMatches=False ):
-        ret = super(ParseExpression,self).setResultsName(name,listAllMatches)
-        return ret
-
-    def validate( self, validateTrace=[] ):
-        tmp = validateTrace[:]+[self]
-        for e in self.exprs:
-            e.validate(tmp)
-        self.checkRecursion( [] )
-        
-    def copy(self):
-        ret = super(ParseExpression,self).copy()
-        ret.exprs = [e.copy() for e in self.exprs]
-        return ret
-
-class And(ParseExpression):
-    """
-    Requires all given C{ParseExpression}s to be found in the given order.
-    Expressions may be separated by whitespace.
-    May be constructed using the C{'+'} operator.
-    May also be constructed using the C{'-'} operator, which will suppress backtracking.
-
-    Example::
-        integer = Word(nums)
-        name_expr = OneOrMore(Word(alphas))
-
-        expr = And([integer("id"),name_expr("name"),integer("age")])
-        # more easily written as:
-        expr = integer("id") + name_expr("name") + integer("age")
-    """
-
-    class _ErrorStop(Empty):
-        def __init__(self, *args, **kwargs):
-            super(And._ErrorStop,self).__init__(*args, **kwargs)
-            self.name = '-'
-            self.leaveWhitespace()
-
-    def __init__( self, exprs, savelist = True ):
-        super(And,self).__init__(exprs, savelist)
-        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        self.setWhitespaceChars( self.exprs[0].whiteChars )
-        self.skipWhitespace = self.exprs[0].skipWhitespace
-        self.callPreparse = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        # pass False as last arg to _parse for first element, since we already
-        # pre-parsed the string as part of our And pre-parsing
-        loc, resultlist = self.exprs[0]._parse( instring, loc, doActions, callPreParse=False )
-        errorStop = False
-        for e in self.exprs[1:]:
-            if isinstance(e, And._ErrorStop):
-                errorStop = True
-                continue
-            if errorStop:
-                try:
-                    loc, exprtokens = e._parse( instring, loc, doActions )
-                except ParseSyntaxException:
-                    raise
-                except ParseBaseException as pe:
-                    pe.__traceback__ = None
-                    raise ParseSyntaxException._from_exception(pe)
-                except IndexError:
-                    raise ParseSyntaxException(instring, len(instring), self.errmsg, self)
-            else:
-                loc, exprtokens = e._parse( instring, loc, doActions )
-            if exprtokens or exprtokens.haskeys():
-                resultlist += exprtokens
-        return loc, resultlist
-
-    def __iadd__(self, other ):
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        return self.append( other ) #And( [ self, other ] )
-
-    def checkRecursion( self, parseElementList ):
-        subRecCheckList = parseElementList[:] + [ self ]
-        for e in self.exprs:
-            e.checkRecursion( subRecCheckList )
-            if not e.mayReturnEmpty:
-                break
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "{" + " ".join(_ustr(e) for e in self.exprs) + "}"
-
-        return self.strRepr
-
-
-class Or(ParseExpression):
-    """
-    Requires that at least one C{ParseExpression} is found.
-    If two expressions match, the expression that matches the longest string will be used.
-    May be constructed using the C{'^'} operator.
-
-    Example::
-        # construct Or using '^' operator
-        
-        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
-        print(number.searchString("123 3.1416 789"))
-    prints::
-        [['123'], ['3.1416'], ['789']]
-    """
-    def __init__( self, exprs, savelist = False ):
-        super(Or,self).__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        maxExcLoc = -1
-        maxException = None
-        matches = []
-        for e in self.exprs:
-            try:
-                loc2 = e.tryParse( instring, loc )
-            except ParseException as err:
-                err.__traceback__ = None
-                if err.loc > maxExcLoc:
-                    maxException = err
-                    maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(instring,len(instring),e.errmsg,self)
-                    maxExcLoc = len(instring)
-            else:
-                # save match among all matches, to retry longest to shortest
-                matches.append((loc2, e))
-
-        if matches:
-            matches.sort(key=lambda x: -x[0])
-            for _,e in matches:
-                try:
-                    return e._parse( instring, loc, doActions )
-                except ParseException as err:
-                    err.__traceback__ = None
-                    if err.loc > maxExcLoc:
-                        maxException = err
-                        maxExcLoc = err.loc
-
-        if maxException is not None:
-            maxException.msg = self.errmsg
-            raise maxException
-        else:
-            raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-
-    def __ixor__(self, other ):
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        return self.append( other ) #Or( [ self, other ] )
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "{" + " ^ ".join(_ustr(e) for e in self.exprs) + "}"
-
-        return self.strRepr
-
-    def checkRecursion( self, parseElementList ):
-        subRecCheckList = parseElementList[:] + [ self ]
-        for e in self.exprs:
-            e.checkRecursion( subRecCheckList )
-
-
-class MatchFirst(ParseExpression):
-    """
-    Requires that at least one C{ParseExpression} is found.
-    If two expressions match, the first one listed is the one that will match.
-    May be constructed using the C{'|'} operator.
-
-    Example::
-        # construct MatchFirst using '|' operator
-        
-        # watch the order of expressions to match
-        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
-        print(number.searchString("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
-
-        # put more selective expression first
-        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
-        print(number.searchString("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
-    """
-    def __init__( self, exprs, savelist = False ):
-        super(MatchFirst,self).__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        maxExcLoc = -1
-        maxException = None
-        for e in self.exprs:
-            try:
-                ret = e._parse( instring, loc, doActions )
-                return ret
-            except ParseException as err:
-                if err.loc > maxExcLoc:
-                    maxException = err
-                    maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(instring,len(instring),e.errmsg,self)
-                    maxExcLoc = len(instring)
-
-        # only got here if no expression matched, raise exception for match that made it the furthest
-        else:
-            if maxException is not None:
-                maxException.msg = self.errmsg
-                raise maxException
-            else:
-                raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-    def __ior__(self, other ):
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass( other )
-        return self.append( other ) #MatchFirst( [ self, other ] )
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "{" + " | ".join(_ustr(e) for e in self.exprs) + "}"
-
-        return self.strRepr
-
-    def checkRecursion( self, parseElementList ):
-        subRecCheckList = parseElementList[:] + [ self ]
-        for e in self.exprs:
-            e.checkRecursion( subRecCheckList )
-
-
-class Each(ParseExpression):
-    """
-    Requires all given C{ParseExpression}s to be found, but in any order.
-    Expressions may be separated by whitespace.
-    May be constructed using the C{'&'} operator.
-
-    Example::
-        color = oneOf("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
-        shape_type = oneOf("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
-        integer = Word(nums)
-        shape_attr = "shape:" + shape_type("shape")
-        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
-        color_attr = "color:" + color("color")
-        size_attr = "size:" + integer("size")
-
-        # use Each (using operator '&') to accept attributes in any order 
-        # (shape and posn are required, color and size are optional)
-        shape_spec = shape_attr & posn_attr & Optional(color_attr) & Optional(size_attr)
-
-        shape_spec.runTests('''
-            shape: SQUARE color: BLACK posn: 100, 120
-            shape: CIRCLE size: 50 color: BLUE posn: 50,80
-            color:GREEN size:20 shape:TRIANGLE posn:20,40
-            '''
-            )
-    prints::
-        shape: SQUARE color: BLACK posn: 100, 120
-        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
-        - color: BLACK
-        - posn: ['100', ',', '120']
-          - x: 100
-          - y: 120
-        - shape: SQUARE
-
-
-        shape: CIRCLE size: 50 color: BLUE posn: 50,80
-        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
-        - color: BLUE
-        - posn: ['50', ',', '80']
-          - x: 50
-          - y: 80
-        - shape: CIRCLE
-        - size: 50
-
-
-        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
-        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
-        - color: GREEN
-        - posn: ['20', ',', '40']
-          - x: 20
-          - y: 40
-        - shape: TRIANGLE
-        - size: 20
-    """
-    def __init__( self, exprs, savelist = True ):
-        super(Each,self).__init__(exprs, savelist)
-        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        self.skipWhitespace = True
-        self.initExprGroups = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if self.initExprGroups:
-            self.opt1map = dict((id(e.expr),e) for e in self.exprs if isinstance(e,Optional))
-            opt1 = [ e.expr for e in self.exprs if isinstance(e,Optional) ]
-            opt2 = [ e for e in self.exprs if e.mayReturnEmpty and not isinstance(e,Optional)]
-            self.optionals = opt1 + opt2
-            self.multioptionals = [ e.expr for e in self.exprs if isinstance(e,ZeroOrMore) ]
-            self.multirequired = [ e.expr for e in self.exprs if isinstance(e,OneOrMore) ]
-            self.required = [ e for e in self.exprs if not isinstance(e,(Optional,ZeroOrMore,OneOrMore)) ]
-            self.required += self.multirequired
-            self.initExprGroups = False
-        tmpLoc = loc
-        tmpReqd = self.required[:]
-        tmpOpt  = self.optionals[:]
-        matchOrder = []
-
-        keepMatching = True
-        while keepMatching:
-            tmpExprs = tmpReqd + tmpOpt + self.multioptionals + self.multirequired
-            failed = []
-            for e in tmpExprs:
-                try:
-                    tmpLoc = e.tryParse( instring, tmpLoc )
-                except ParseException:
-                    failed.append(e)
-                else:
-                    matchOrder.append(self.opt1map.get(id(e),e))
-                    if e in tmpReqd:
-                        tmpReqd.remove(e)
-                    elif e in tmpOpt:
-                        tmpOpt.remove(e)
-            if len(failed) == len(tmpExprs):
-                keepMatching = False
-
-        if tmpReqd:
-            missing = ", ".join(_ustr(e) for e in tmpReqd)
-            raise ParseException(instring,loc,"Missing one or more required elements (%s)" % missing )
-
-        # add any unmatched Optionals, in case they have default values defined
-        matchOrder += [e for e in self.exprs if isinstance(e,Optional) and e.expr in tmpOpt]
-
-        resultlist = []
-        for e in matchOrder:
-            loc,results = e._parse(instring,loc,doActions)
-            resultlist.append(results)
-
-        finalResults = sum(resultlist, ParseResults([]))
-        return loc, finalResults
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "{" + " & ".join(_ustr(e) for e in self.exprs) + "}"
-
-        return self.strRepr
-
-    def checkRecursion( self, parseElementList ):
-        subRecCheckList = parseElementList[:] + [ self ]
-        for e in self.exprs:
-            e.checkRecursion( subRecCheckList )
-
-
-class ParseElementEnhance(ParserElement):
-    """
-    Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens.
-    """
-    def __init__( self, expr, savelist=False ):
-        super(ParseElementEnhance,self).__init__(savelist)
-        if isinstance( expr, basestring ):
-            if issubclass(ParserElement._literalStringClass, Token):
-                expr = ParserElement._literalStringClass(expr)
-            else:
-                expr = ParserElement._literalStringClass(Literal(expr))
-        self.expr = expr
-        self.strRepr = None
-        if expr is not None:
-            self.mayIndexError = expr.mayIndexError
-            self.mayReturnEmpty = expr.mayReturnEmpty
-            self.setWhitespaceChars( expr.whiteChars )
-            self.skipWhitespace = expr.skipWhitespace
-            self.saveAsList = expr.saveAsList
-            self.callPreparse = expr.callPreparse
-            self.ignoreExprs.extend(expr.ignoreExprs)
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if self.expr is not None:
-            return self.expr._parse( instring, loc, doActions, callPreParse=False )
-        else:
-            raise ParseException("",loc,self.errmsg,self)
-
-    def leaveWhitespace( self ):
-        self.skipWhitespace = False
-        self.expr = self.expr.copy()
-        if self.expr is not None:
-            self.expr.leaveWhitespace()
-        return self
-
-    def ignore( self, other ):
-        if isinstance( other, Suppress ):
-            if other not in self.ignoreExprs:
-                super( ParseElementEnhance, self).ignore( other )
-                if self.expr is not None:
-                    self.expr.ignore( self.ignoreExprs[-1] )
-        else:
-            super( ParseElementEnhance, self).ignore( other )
-            if self.expr is not None:
-                self.expr.ignore( self.ignoreExprs[-1] )
-        return self
-
-    def streamline( self ):
-        super(ParseElementEnhance,self).streamline()
-        if self.expr is not None:
-            self.expr.streamline()
-        return self
-
-    def checkRecursion( self, parseElementList ):
-        if self in parseElementList:
-            raise RecursiveGrammarException( parseElementList+[self] )
-        subRecCheckList = parseElementList[:] + [ self ]
-        if self.expr is not None:
-            self.expr.checkRecursion( subRecCheckList )
-
-    def validate( self, validateTrace=[] ):
-        tmp = validateTrace[:]+[self]
-        if self.expr is not None:
-            self.expr.validate(tmp)
-        self.checkRecursion( [] )
-
-    def __str__( self ):
-        try:
-            return super(ParseElementEnhance,self).__str__()
-        except Exception:
-            pass
-
-        if self.strRepr is None and self.expr is not None:
-            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.expr) )
-        return self.strRepr
-
-
-class FollowedBy(ParseElementEnhance):
-    """
-    Lookahead matching of the given parse expression.  C{FollowedBy}
-    does I{not} advance the parsing position within the input string, it only
-    verifies that the specified parse expression matches at the current
-    position.  C{FollowedBy} always returns a null token list.
-
-    Example::
-        # use FollowedBy to match a label only if it is followed by a ':'
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
-        
-        OneOrMore(attr_expr).parseString("shape: SQUARE color: BLACK posn: upper left").pprint()
-    prints::
-        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
-    """
-    def __init__( self, expr ):
-        super(FollowedBy,self).__init__(expr)
-        self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        self.expr.tryParse( instring, loc )
-        return loc, []
-
-
-class NotAny(ParseElementEnhance):
-    """
-    Lookahead to disallow matching with the given parse expression.  C{NotAny}
-    does I{not} advance the parsing position within the input string, it only
-    verifies that the specified parse expression does I{not} match at the current
-    position.  Also, C{NotAny} does I{not} skip over leading whitespace. C{NotAny}
-    always returns a null token list.  May be constructed using the '~' operator.
-
-    Example::
-        
-    """
-    def __init__( self, expr ):
-        super(NotAny,self).__init__(expr)
-        #~ self.leaveWhitespace()
-        self.skipWhitespace = False  # do NOT use self.leaveWhitespace(), don't want to propagate to exprs
-        self.mayReturnEmpty = True
-        self.errmsg = "Found unwanted token, "+_ustr(self.expr)
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        if self.expr.canParseNext(instring, loc):
-            raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "~{" + _ustr(self.expr) + "}"
-
-        return self.strRepr
-
-class _MultipleMatch(ParseElementEnhance):
-    def __init__( self, expr, stopOn=None):
-        super(_MultipleMatch, self).__init__(expr)
-        self.saveAsList = True
-        ender = stopOn
-        if isinstance(ender, basestring):
-            ender = ParserElement._literalStringClass(ender)
-        self.not_ender = ~ender if ender is not None else None
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        self_expr_parse = self.expr._parse
-        self_skip_ignorables = self._skipIgnorables
-        check_ender = self.not_ender is not None
-        if check_ender:
-            try_not_ender = self.not_ender.tryParse
-        
-        # must be at least one (but first see if we are the stopOn sentinel;
-        # if so, fail)
-        if check_ender:
-            try_not_ender(instring, loc)
-        loc, tokens = self_expr_parse( instring, loc, doActions, callPreParse=False )
-        try:
-            hasIgnoreExprs = (not not self.ignoreExprs)
-            while 1:
-                if check_ender:
-                    try_not_ender(instring, loc)
-                if hasIgnoreExprs:
-                    preloc = self_skip_ignorables( instring, loc )
-                else:
-                    preloc = loc
-                loc, tmptokens = self_expr_parse( instring, preloc, doActions )
-                if tmptokens or tmptokens.haskeys():
-                    tokens += tmptokens
-        except (ParseException,IndexError):
-            pass
-
-        return loc, tokens
-        
-class OneOrMore(_MultipleMatch):
-    """
-    Repetition of one or more of the given expression.
-    
-    Parameters:
-     - expr - expression that must match one or more times
-     - stopOn - (default=C{None}) - expression for a terminating sentinel
-          (only required if the sentinel would ordinarily match the repetition 
-          expression)          
-
-    Example::
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
-
-        text = "shape: SQUARE posn: upper left color: BLACK"
-        OneOrMore(attr_expr).parseString(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
-
-        # use stopOn attribute for OneOrMore to avoid reading label string as part of the data
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
-        OneOrMore(attr_expr).parseString(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
-        
-        # could also be written as
-        (attr_expr * (1,)).parseString(text).pprint()
-    """
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "{" + _ustr(self.expr) + "}..."
-
-        return self.strRepr
-
-class ZeroOrMore(_MultipleMatch):
-    """
-    Optional repetition of zero or more of the given expression.
-    
-    Parameters:
-     - expr - expression that must match zero or more times
-     - stopOn - (default=C{None}) - expression for a terminating sentinel
-          (only required if the sentinel would ordinarily match the repetition 
-          expression)          
-
-    Example: similar to L{OneOrMore}
-    """
-    def __init__( self, expr, stopOn=None):
-        super(ZeroOrMore,self).__init__(expr, stopOn=stopOn)
-        self.mayReturnEmpty = True
-        
-    def parseImpl( self, instring, loc, doActions=True ):
-        try:
-            return super(ZeroOrMore, self).parseImpl(instring, loc, doActions)
-        except (ParseException,IndexError):
-            return loc, []
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "[" + _ustr(self.expr) + "]..."
-
-        return self.strRepr
-
-class _NullToken(object):
-    def __bool__(self):
-        return False
-    __nonzero__ = __bool__
-    def __str__(self):
-        return ""
-
-_optionalNotMatched = _NullToken()
-class Optional(ParseElementEnhance):
-    """
-    Optional matching of the given expression.
-
-    Parameters:
-     - expr - expression that must match zero or more times
-     - default (optional) - value to be returned if the optional expression is not found.
-
-    Example::
-        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
-        zip = Combine(Word(nums, exact=5) + Optional('-' + Word(nums, exact=4)))
-        zip.runTests('''
-            # traditional ZIP code
-            12345
-            
-            # ZIP+4 form
-            12101-0001
-            
-            # invalid ZIP
-            98765-
-            ''')
-    prints::
-        # traditional ZIP code
-        12345
-        ['12345']
-
-        # ZIP+4 form
-        12101-0001
-        ['12101-0001']
-
-        # invalid ZIP
-        98765-
-             ^
-        FAIL: Expected end of text (at char 5), (line:1, col:6)
-    """
-    def __init__( self, expr, default=_optionalNotMatched ):
-        super(Optional,self).__init__( expr, savelist=False )
-        self.saveAsList = self.expr.saveAsList
-        self.defaultValue = default
-        self.mayReturnEmpty = True
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        try:
-            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
-        except (ParseException,IndexError):
-            if self.defaultValue is not _optionalNotMatched:
-                if self.expr.resultsName:
-                    tokens = ParseResults([ self.defaultValue ])
-                    tokens[self.expr.resultsName] = self.defaultValue
-                else:
-                    tokens = [ self.defaultValue ]
-            else:
-                tokens = []
-        return loc, tokens
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-
-        if self.strRepr is None:
-            self.strRepr = "[" + _ustr(self.expr) + "]"
-
-        return self.strRepr
-
-class SkipTo(ParseElementEnhance):
-    """
-    Token for skipping over all undefined text until the matched expression is found.
-
-    Parameters:
-     - expr - target expression marking the end of the data to be skipped
-     - include - (default=C{False}) if True, the target expression is also parsed 
-          (the skipped text and target expression are returned as a 2-element list).
-     - ignore - (default=C{None}) used to define grammars (typically quoted strings and 
-          comments) that might contain false matches to the target expression
-     - failOn - (default=C{None}) define expressions that are not allowed to be 
-          included in the skipped test; if found before the target expression is found, 
-          the SkipTo is not a match
-
-    Example::
-        report = '''
-            Outstanding Issues Report - 1 Jan 2000
-
-               # | Severity | Description                               |  Days Open
-            -----+----------+-------------------------------------------+-----------
-             101 | Critical | Intermittent system crash                 |          6
-              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
-              79 | Minor    | System slow when running too many reports |         47
-            '''
-        integer = Word(nums)
-        SEP = Suppress('|')
-        # use SkipTo to simply match everything up until the next SEP
-        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
-        # - parse action will call token.strip() for each matched token, i.e., the description body
-        string_data = SkipTo(SEP, ignore=quotedString)
-        string_data.setParseAction(tokenMap(str.strip))
-        ticket_expr = (integer("issue_num") + SEP 
-                      + string_data("sev") + SEP 
-                      + string_data("desc") + SEP 
-                      + integer("days_open"))
-        
-        for tkt in ticket_expr.searchString(report):
-            print tkt.dump()
-    prints::
-        ['101', 'Critical', 'Intermittent system crash', '6']
-        - days_open: 6
-        - desc: Intermittent system crash
-        - issue_num: 101
-        - sev: Critical
-        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
-        - days_open: 14
-        - desc: Spelling error on Login ('log|n')
-        - issue_num: 94
-        - sev: Cosmetic
-        ['79', 'Minor', 'System slow when running too many reports', '47']
-        - days_open: 47
-        - desc: System slow when running too many reports
-        - issue_num: 79
-        - sev: Minor
-    """
-    def __init__( self, other, include=False, ignore=None, failOn=None ):
-        super( SkipTo, self ).__init__( other )
-        self.ignoreExpr = ignore
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.includeMatch = include
-        self.asList = False
-        if isinstance(failOn, basestring):
-            self.failOn = ParserElement._literalStringClass(failOn)
-        else:
-            self.failOn = failOn
-        self.errmsg = "No match found for "+_ustr(self.expr)
-
-    def parseImpl( self, instring, loc, doActions=True ):
-        startloc = loc
-        instrlen = len(instring)
-        expr = self.expr
-        expr_parse = self.expr._parse
-        self_failOn_canParseNext = self.failOn.canParseNext if self.failOn is not None else None
-        self_ignoreExpr_tryParse = self.ignoreExpr.tryParse if self.ignoreExpr is not None else None
-        
-        tmploc = loc
-        while tmploc <= instrlen:
-            if self_failOn_canParseNext is not None:
-                # break if failOn expression matches
-                if self_failOn_canParseNext(instring, tmploc):
-                    break
-                    
-            if self_ignoreExpr_tryParse is not None:
-                # advance past ignore expressions
-                while 1:
-                    try:
-                        tmploc = self_ignoreExpr_tryParse(instring, tmploc)
-                    except ParseBaseException:
-                        break
-            
-            try:
-                expr_parse(instring, tmploc, doActions=False, callPreParse=False)
-            except (ParseException, IndexError):
-                # no match, advance loc in string
-                tmploc += 1
-            else:
-                # matched skipto expr, done
-                break
-
-        else:
-            # ran off the end of the input string without matching skipto expr, fail
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        # build up return values
-        loc = tmploc
-        skiptext = instring[startloc:loc]
-        skipresult = ParseResults(skiptext)
-        
-        if self.includeMatch:
-            loc, mat = expr_parse(instring,loc,doActions,callPreParse=False)
-            skipresult += mat
-
-        return loc, skipresult
-
-class Forward(ParseElementEnhance):
-    """
-    Forward declaration of an expression to be defined later -
-    used for recursive grammars, such as algebraic infix notation.
-    When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
-
-    Note: take care when assigning to C{Forward} not to overlook precedence of operators.
-    Specifically, '|' has a lower precedence than '<<', so that::
-        fwdExpr << a | b | c
-    will actually be evaluated as::
-        (fwdExpr << a) | b | c
-    thereby leaving b and c out as parseable alternatives.  It is recommended that you
-    explicitly group the values inserted into the C{Forward}::
-        fwdExpr << (a | b | c)
-    Converting to use the '<<=' operator instead will avoid this problem.
-
-    See L{ParseResults.pprint} for an example of a recursive parser created using
-    C{Forward}.
-    """
-    def __init__( self, other=None ):
-        super(Forward,self).__init__( other, savelist=False )
-
-    def __lshift__( self, other ):
-        if isinstance( other, basestring ):
-            other = ParserElement._literalStringClass(other)
-        self.expr = other
-        self.strRepr = None
-        self.mayIndexError = self.expr.mayIndexError
-        self.mayReturnEmpty = self.expr.mayReturnEmpty
-        self.setWhitespaceChars( self.expr.whiteChars )
-        self.skipWhitespace = self.expr.skipWhitespace
-        self.saveAsList = self.expr.saveAsList
-        self.ignoreExprs.extend(self.expr.ignoreExprs)
-        return self
-        
-    def __ilshift__(self, other):
-        return self << other
-    
-    def leaveWhitespace( self ):
-        self.skipWhitespace = False
-        return self
-
-    def streamline( self ):
-        if not self.streamlined:
-            self.streamlined = True
-            if self.expr is not None:
-                self.expr.streamline()
-        return self
-
-    def validate( self, validateTrace=[] ):
-        if self not in validateTrace:
-            tmp = validateTrace[:]+[self]
-            if self.expr is not None:
-                self.expr.validate(tmp)
-        self.checkRecursion([])
-
-    def __str__( self ):
-        if hasattr(self,"name"):
-            return self.name
-        return self.__class__.__name__ + ": ..."
-
-        # stubbed out for now - creates awful memory and perf issues
-        self._revertClass = self.__class__
-        self.__class__ = _ForwardNoRecurse
-        try:
-            if self.expr is not None:
-                retString = _ustr(self.expr)
-            else:
-                retString = "None"
-        finally:
-            self.__class__ = self._revertClass
-        return self.__class__.__name__ + ": " + retString
-
-    def copy(self):
-        if self.expr is not None:
-            return super(Forward,self).copy()
-        else:
-            ret = Forward()
-            ret <<= self
-            return ret
-
-class _ForwardNoRecurse(Forward):
-    def __str__( self ):
-        return "..."
-
-class TokenConverter(ParseElementEnhance):
-    """
-    Abstract subclass of C{ParseExpression}, for converting parsed results.
-    """
-    def __init__( self, expr, savelist=False ):
-        super(TokenConverter,self).__init__( expr )#, savelist )
-        self.saveAsList = False
-
-class Combine(TokenConverter):
-    """
-    Converter to concatenate all matching tokens to a single string.
-    By default, the matching patterns must also be contiguous in the input string;
-    this can be disabled by specifying C{'adjacent=False'} in the constructor.
-
-    Example::
-        real = Word(nums) + '.' + Word(nums)
-        print(real.parseString('3.1416')) # -> ['3', '.', '1416']
-        # will also erroneously match the following
-        print(real.parseString('3. 1416')) # -> ['3', '.', '1416']
-
-        real = Combine(Word(nums) + '.' + Word(nums))
-        print(real.parseString('3.1416')) # -> ['3.1416']
-        # no match when there are internal spaces
-        print(real.parseString('3. 1416')) # -> Exception: Expected W:(0123...)
-    """
-    def __init__( self, expr, joinString="", adjacent=True ):
-        super(Combine,self).__init__( expr )
-        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
-        if adjacent:
-            self.leaveWhitespace()
-        self.adjacent = adjacent
-        self.skipWhitespace = True
-        self.joinString = joinString
-        self.callPreparse = True
-
-    def ignore( self, other ):
-        if self.adjacent:
-            ParserElement.ignore(self, other)
-        else:
-            super( Combine, self).ignore( other )
-        return self
-
-    def postParse( self, instring, loc, tokenlist ):
-        retToks = tokenlist.copy()
-        del retToks[:]
-        retToks += ParseResults([ "".join(tokenlist._asStringList(self.joinString)) ], modal=self.modalResults)
-
-        if self.resultsName and retToks.haskeys():
-            return [ retToks ]
-        else:
-            return retToks
-
-class Group(TokenConverter):
-    """
-    Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions.
-
-    Example::
-        ident = Word(alphas)
-        num = Word(nums)
-        term = ident | num
-        func = ident + Optional(delimitedList(term))
-        print(func.parseString("fn a,b,100"))  # -> ['fn', 'a', 'b', '100']
-
-        func = ident + Group(Optional(delimitedList(term)))
-        print(func.parseString("fn a,b,100"))  # -> ['fn', ['a', 'b', '100']]
-    """
-    def __init__( self, expr ):
-        super(Group,self).__init__( expr )
-        self.saveAsList = True
-
-    def postParse( self, instring, loc, tokenlist ):
-        return [ tokenlist ]
-
-class Dict(TokenConverter):
-    """
-    Converter to return a repetitive expression as a list, but also as a dictionary.
-    Each element can also be referenced using the first token in the expression as its key.
-    Useful for tabular report scraping when the first column can be used as a item key.
-
-    Example::
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
-        
-        # print attributes as plain groups
-        print(OneOrMore(attr_expr).parseString(text).dump())
-        
-        # instead of OneOrMore(expr), parse using Dict(OneOrMore(Group(expr))) - Dict will auto-assign names
-        result = Dict(OneOrMore(Group(attr_expr))).parseString(text)
-        print(result.dump())
-        
-        # access named fields as dict entries, or output as dict
-        print(result['shape'])        
-        print(result.asDict())
-    prints::
-        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
-
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: light blue
-        - posn: upper left
-        - shape: SQUARE
-        - texture: burlap
-        SQUARE
-        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
-    See more examples at L{ParseResults} of accessing fields by results name.
-    """
-    def __init__( self, expr ):
-        super(Dict,self).__init__( expr )
-        self.saveAsList = True
-
-    def postParse( self, instring, loc, tokenlist ):
-        for i,tok in enumerate(tokenlist):
-            if len(tok) == 0:
-                continue
-            ikey = tok[0]
-            if isinstance(ikey,int):
-                ikey = _ustr(tok[0]).strip()
-            if len(tok)==1:
-                tokenlist[ikey] = _ParseResultsWithOffset("",i)
-            elif len(tok)==2 and not isinstance(tok[1],ParseResults):
-                tokenlist[ikey] = _ParseResultsWithOffset(tok[1],i)
-            else:
-                dictvalue = tok.copy() #ParseResults(i)
-                del dictvalue[0]
-                if len(dictvalue)!= 1 or (isinstance(dictvalue,ParseResults) and dictvalue.haskeys()):
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue,i)
-                else:
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0],i)
-
-        if self.resultsName:
-            return [ tokenlist ]
-        else:
-            return tokenlist
-
-
-class Suppress(TokenConverter):
-    """
-    Converter for ignoring the results of a parsed expression.
-
-    Example::
-        source = "a, b, c,d"
-        wd = Word(alphas)
-        wd_list1 = wd + ZeroOrMore(',' + wd)
-        print(wd_list1.parseString(source))
-
-        # often, delimiters that are useful during parsing are just in the
-        # way afterward - use Suppress to keep them out of the parsed output
-        wd_list2 = wd + ZeroOrMore(Suppress(',') + wd)
-        print(wd_list2.parseString(source))
-    prints::
-        ['a', ',', 'b', ',', 'c', ',', 'd']
-        ['a', 'b', 'c', 'd']
-    (See also L{delimitedList}.)
-    """
-    def postParse( self, instring, loc, tokenlist ):
-        return []
-
-    def suppress( self ):
-        return self
-
-
-class OnlyOnce(object):
-    """
-    Wrapper for parse actions, to ensure they are only called once.
-    """
-    def __init__(self, methodCall):
-        self.callable = _trim_arity(methodCall)
-        self.called = False
-    def __call__(self,s,l,t):
-        if not self.called:
-            results = self.callable(s,l,t)
-            self.called = True
-            return results
-        raise ParseException(s,l,"")
-    def reset(self):
-        self.called = False
-
-def traceParseAction(f):
-    """
-    Decorator for debugging parse actions. 
-    
-    When the parse action is called, this decorator will print C{">> entering I{method-name}(line:I{current_source_line}, I{parse_location}, I{matched_tokens})".}
-    When the parse action completes, the decorator will print C{"<<"} followed by the returned value, or any exception that the parse action raised.
-
-    Example::
-        wd = Word(alphas)
-
-        @traceParseAction
-        def remove_duplicate_chars(tokens):
-            return ''.join(sorted(set(''.join(tokens)))
-
-        wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
-        print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
-    prints::
-        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
-        <<leaving remove_duplicate_chars (ret: 'dfjkls')
-        ['dfjkls']
-    """
-    f = _trim_arity(f)
-    def z(*paArgs):
-        thisFunc = f.__name__
-        s,l,t = paArgs[-3:]
-        if len(paArgs)>3:
-            thisFunc = paArgs[0].__class__.__name__ + '.' + thisFunc
-        sys.stderr.write( ">>entering %s(line: '%s', %d, %r)\n" % (thisFunc,line(l,s),l,t) )
-        try:
-            ret = f(*paArgs)
-        except Exception as exc:
-            sys.stderr.write( "<<leaving %s (exception: %s)\n" % (thisFunc,exc) )
-            raise
-        sys.stderr.write( "<<leaving %s (ret: %r)\n" % (thisFunc,ret) )
-        return ret
-    try:
-        z.__name__ = f.__name__
-    except AttributeError:
-        pass
-    return z
-
-#
-# global helpers
-#
-def delimitedList( expr, delim=",", combine=False ):
-    """
-    Helper to define a delimited list of expressions - the delimiter defaults to ','.
-    By default, the list elements and delimiters can have intervening whitespace, and
-    comments, but this can be overridden by passing C{combine=True} in the constructor.
-    If C{combine} is set to C{True}, the matching tokens are returned as a single token
-    string, with the delimiters included; otherwise, the matching tokens are returned
-    as a list of tokens, with the delimiters suppressed.
-
-    Example::
-        delimitedList(Word(alphas)).parseString("aa,bb,cc") # -> ['aa', 'bb', 'cc']
-        delimitedList(Word(hexnums), delim=':', combine=True).parseString("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
-    """
-    dlName = _ustr(expr)+" ["+_ustr(delim)+" "+_ustr(expr)+"]..."
-    if combine:
-        return Combine( expr + ZeroOrMore( delim + expr ) ).setName(dlName)
-    else:
-        return ( expr + ZeroOrMore( Suppress( delim ) + expr ) ).setName(dlName)
-
-def countedArray( expr, intExpr=None ):
-    """
-    Helper to define a counted list of expressions.
-    This helper defines a pattern of the form::
-        integer expr expr expr...
-    where the leading integer tells how many expr expressions follow.
-    The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
-    
-    If C{intExpr} is specified, it should be a pyparsing expression that produces an integer value.
-
-    Example::
-        countedArray(Word(alphas)).parseString('2 ab cd ef')  # -> ['ab', 'cd']
-
-        # in this parser, the leading integer value is given in binary,
-        # '10' indicating that 2 values are in the array
-        binaryConstant = Word('01').setParseAction(lambda t: int(t[0], 2))
-        countedArray(Word(alphas), intExpr=binaryConstant).parseString('10 ab cd ef')  # -> ['ab', 'cd']
-    """
-    arrayExpr = Forward()
-    def countFieldParseAction(s,l,t):
-        n = t[0]
-        arrayExpr << (n and Group(And([expr]*n)) or Group(empty))
-        return []
-    if intExpr is None:
-        intExpr = Word(nums).setParseAction(lambda t:int(t[0]))
-    else:
-        intExpr = intExpr.copy()
-    intExpr.setName("arrayLen")
-    intExpr.addParseAction(countFieldParseAction, callDuringTry=True)
-    return ( intExpr + arrayExpr ).setName('(len) ' + _ustr(expr) + '...')
-
-def _flatten(L):
-    ret = []
-    for i in L:
-        if isinstance(i,list):
-            ret.extend(_flatten(i))
-        else:
-            ret.append(i)
-    return ret
-
-def matchPreviousLiteral(expr):
-    """
-    Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks
-    for a 'repeat' of a previous expression.  For example::
-        first = Word(nums)
-        second = matchPreviousLiteral(first)
-        matchExpr = first + ":" + second
-    will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
-    previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
-    If this is not desired, use C{matchPreviousExpr}.
-    Do I{not} use with packrat parsing enabled.
-    """
-    rep = Forward()
-    def copyTokenToRepeater(s,l,t):
-        if t:
-            if len(t) == 1:
-                rep << t[0]
-            else:
-                # flatten t tokens
-                tflat = _flatten(t.asList())
-                rep << And(Literal(tt) for tt in tflat)
-        else:
-            rep << Empty()
-    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
-    rep.setName('(prev) ' + _ustr(expr))
-    return rep
-
-def matchPreviousExpr(expr):
-    """
-    Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks
-    for a 'repeat' of a previous expression.  For example::
-        first = Word(nums)
-        second = matchPreviousExpr(first)
-        matchExpr = first + ":" + second
-    will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
-    expressions, will I{not} match the leading C{"1:1"} in C{"1:10"};
-    the expressions are evaluated first, and then compared, so
-    C{"1"} is compared with C{"10"}.
-    Do I{not} use with packrat parsing enabled.
-    """
-    rep = Forward()
-    e2 = expr.copy()
-    rep <<= e2
-    def copyTokenToRepeater(s,l,t):
-        matchTokens = _flatten(t.asList())
-        def mustMatchTheseTokens(s,l,t):
-            theseTokens = _flatten(t.asList())
-            if  theseTokens != matchTokens:
-                raise ParseException("",0,"")
-        rep.setParseAction( mustMatchTheseTokens, callDuringTry=True )
-    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
-    rep.setName('(prev) ' + _ustr(expr))
-    return rep
-
-def _escapeRegexRangeChars(s):
-    #~  escape these chars: ^-]
-    for c in r"\^-]":
-        s = s.replace(c,_bslash+c)
-    s = s.replace("\n",r"\n")
-    s = s.replace("\t",r"\t")
-    return _ustr(s)
-
-def oneOf( strs, caseless=False, useRegex=True ):
-    """
-    Helper to quickly define a set of alternative Literals, and makes sure to do
-    longest-first testing when there is a conflict, regardless of the input order,
-    but returns a C{L{MatchFirst}} for best performance.
-
-    Parameters:
-     - strs - a string of space-delimited literals, or a collection of string literals
-     - caseless - (default=C{False}) - treat all literals as caseless
-     - useRegex - (default=C{True}) - as an optimization, will generate a Regex
-          object; otherwise, will generate a C{MatchFirst} object (if C{caseless=True}, or
-          if creating a C{Regex} raises an exception)
-
-    Example::
-        comp_oper = oneOf("< = > <= >= !=")
-        var = Word(alphas)
-        number = Word(nums)
-        term = var | number
-        comparison_expr = term + comp_oper + term
-        print(comparison_expr.searchString("B = 12  AA=23 B<=AA AA>12"))
-    prints::
-        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
-    """
-    if caseless:
-        isequal = ( lambda a,b: a.upper() == b.upper() )
-        masks = ( lambda a,b: b.upper().startswith(a.upper()) )
-        parseElementClass = CaselessLiteral
-    else:
-        isequal = ( lambda a,b: a == b )
-        masks = ( lambda a,b: b.startswith(a) )
-        parseElementClass = Literal
-
-    symbols = []
-    if isinstance(strs,basestring):
-        symbols = strs.split()
-    elif isinstance(strs, collections.Iterable):
-        symbols = list(strs)
-    else:
-        warnings.warn("Invalid argument to oneOf, expected string or iterable",
-                SyntaxWarning, stacklevel=2)
-    if not symbols:
-        return NoMatch()
-
-    i = 0
-    while i < len(symbols)-1:
-        cur = symbols[i]
-        for j,other in enumerate(symbols[i+1:]):
-            if ( isequal(other, cur) ):
-                del symbols[i+j+1]
-                break
-            elif ( masks(cur, other) ):
-                del symbols[i+j+1]
-                symbols.insert(i,other)
-                cur = other
-                break
-        else:
-            i += 1
-
-    if not caseless and useRegex:
-        #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
-        try:
-            if len(symbols)==len("".join(symbols)):
-                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) ).setName(' | '.join(symbols))
-            else:
-                return Regex( "|".join(re.escape(sym) for sym in symbols) ).setName(' | '.join(symbols))
-        except Exception:
-            warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
-                    SyntaxWarning, stacklevel=2)
-
-
-    # last resort, just use MatchFirst
-    return MatchFirst(parseElementClass(sym) for sym in symbols).setName(' | '.join(symbols))
-
-def dictOf( key, value ):
-    """
-    Helper to easily and clearly define a dictionary by specifying the respective patterns
-    for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
-    in the proper order.  The key pattern can include delimiting markers or punctuation,
-    as long as they are suppressed, thereby leaving the significant key text.  The value
-    pattern can include named results, so that the C{Dict} results can include named token
-    fields.
-
-    Example::
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
-        print(OneOrMore(attr_expr).parseString(text).dump())
-        
-        attr_label = label
-        attr_value = Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join)
-
-        # similar to Dict, but simpler call format
-        result = dictOf(attr_label, attr_value).parseString(text)
-        print(result.dump())
-        print(result['shape'])
-        print(result.shape)  # object attribute access works too
-        print(result.asDict())
-    prints::
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: light blue
-        - posn: upper left
-        - shape: SQUARE
-        - texture: burlap
-        SQUARE
-        SQUARE
-        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
-    """
-    return Dict( ZeroOrMore( Group ( key + value ) ) )
-
-def originalTextFor(expr, asString=True):
-    """
-    Helper to return the original, untokenized text for a given expression.  Useful to
-    restore the parsed fields of an HTML start tag into the raw tag text itself, or to
-    revert separate tokens with intervening whitespace back to the original matching
-    input text. By default, returns astring containing the original parsed text.  
-       
-    If the optional C{asString} argument is passed as C{False}, then the return value is a 
-    C{L{ParseResults}} containing any results names that were originally matched, and a 
-    single token containing the original matched text from the input string.  So if 
-    the expression passed to C{L{originalTextFor}} contains expressions with defined
-    results names, you must set C{asString} to C{False} if you want to preserve those
-    results name values.
-
-    Example::
-        src = "this is test <b> bold <i>text</i> </b> normal text "
-        for tag in ("b","i"):
-            opener,closer = makeHTMLTags(tag)
-            patt = originalTextFor(opener + SkipTo(closer) + closer)
-            print(patt.searchString(src)[0])
-    prints::
-        ['<b> bold <i>text</i> </b>']
-        ['<i>text</i>']
-    """
-    locMarker = Empty().setParseAction(lambda s,loc,t: loc)
-    endlocMarker = locMarker.copy()
-    endlocMarker.callPreparse = False
-    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
-    if asString:
-        extractText = lambda s,l,t: s[t._original_start:t._original_end]
-    else:
-        def extractText(s,l,t):
-            t[:] = [s[t.pop('_original_start'):t.pop('_original_end')]]
-    matchExpr.setParseAction(extractText)
-    matchExpr.ignoreExprs = expr.ignoreExprs
-    return matchExpr
-
-def ungroup(expr): 
-    """
-    Helper to undo pyparsing's default grouping of And expressions, even
-    if all but one are non-empty.
-    """
-    return TokenConverter(expr).setParseAction(lambda t:t[0])
-
-def locatedExpr(expr):
-    """
-    Helper to decorate a returned token with its starting and ending locations in the input string.
-    This helper adds the following results names:
-     - locn_start = location where matched expression begins
-     - locn_end = location where matched expression ends
-     - value = the actual parsed results
-
-    Be careful if the input text contains C{<TAB>} characters, you may want to call
-    C{L{ParserElement.parseWithTabs}}
-
-    Example::
-        wd = Word(alphas)
-        for match in locatedExpr(wd).searchString("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-    prints::
-        [[0, 'ljsdf', 5]]
-        [[8, 'lksdjjf', 15]]
-        [[18, 'lkkjj', 23]]
-    """
-    locator = Empty().setParseAction(lambda s,l,t: l)
-    return Group(locator("locn_start") + expr("value") + locator.copy().leaveWhitespace()("locn_end"))
-
-
-# convenience constants for positional expressions
-empty       = Empty().setName("empty")
-lineStart   = LineStart().setName("lineStart")
-lineEnd     = LineEnd().setName("lineEnd")
-stringStart = StringStart().setName("stringStart")
-stringEnd   = StringEnd().setName("stringEnd")
-
-_escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
-_escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
-_escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
-_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
-_charRange = Group(_singleChar + Suppress("-") + _singleChar)
-_reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
-
-def srange(s):
-    r"""
-    Helper to easily define string ranges for use in Word construction.  Borrows
-    syntax from regexp '[]' string range definitions::
-        srange("[0-9]")   -> "0123456789"
-        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
-        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
-    The input string must be enclosed in []'s, and the returned string is the expanded
-    character set joined into a single string.
-    The values enclosed in the []'s may be:
-     - a single character
-     - an escaped character with a leading backslash (such as C{\-} or C{\]})
-     - an escaped hex character with a leading C{'\x'} (C{\x21}, which is a C{'!'} character) 
-         (C{\0x##} is also supported for backwards compatibility) 
-     - an escaped octal character with a leading C{'\0'} (C{\041}, which is a C{'!'} character)
-     - a range of any of the above, separated by a dash (C{'a-z'}, etc.)
-     - any combination of the above (C{'aeiouy'}, C{'a-zA-Z0-9_$'}, etc.)
-    """
-    _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
-    try:
-        return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)
-    except Exception:
-        return ""
-
-def matchOnlyAtCol(n):
-    """
-    Helper method for defining parse actions that require matching at a specific
-    column in the input text.
-    """
-    def verifyCol(strg,locn,toks):
-        if col(locn,strg) != n:
-            raise ParseException(strg,locn,"matched token not at column %d" % n)
-    return verifyCol
-
-def replaceWith(replStr):
-    """
-    Helper method for common parse actions that simply return a literal value.  Especially
-    useful when used with C{L{transformString<ParserElement.transformString>}()}.
-
-    Example::
-        num = Word(nums).setParseAction(lambda toks: int(toks[0]))
-        na = oneOf("N/A NA").setParseAction(replaceWith(math.nan))
-        term = na | num
-        
-        OneOrMore(term).parseString("324 234 N/A 234") # -> [324, 234, nan, 234]
-    """
-    return lambda s,l,t: [replStr]
-
-def removeQuotes(s,l,t):
-    """
-    Helper parse action for removing quotation marks from parsed quoted strings.
-
-    Example::
-        # by default, quotation marks are included in parsed results
-        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
-
-        # use removeQuotes to strip quotation marks from parsed results
-        quotedString.setParseAction(removeQuotes)
-        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
-    """
-    return t[0][1:-1]
-
-def tokenMap(func, *args):
-    """
-    Helper to define a parse action by mapping a function to all elements of a ParseResults list.If any additional 
-    args are passed, they are forwarded to the given function as additional arguments after
-    the token, as in C{hex_integer = Word(hexnums).setParseAction(tokenMap(int, 16))}, which will convert the
-    parsed data to an integer using base 16.
-
-    Example (compare the last to example in L{ParserElement.transformString}::
-        hex_ints = OneOrMore(Word(hexnums)).setParseAction(tokenMap(int, 16))
-        hex_ints.runTests('''
-            00 11 22 aa FF 0a 0d 1a
-            ''')
-        
-        upperword = Word(alphas).setParseAction(tokenMap(str.upper))
-        OneOrMore(upperword).runTests('''
-            my kingdom for a horse
-            ''')
-
-        wd = Word(alphas).setParseAction(tokenMap(str.title))
-        OneOrMore(wd).setParseAction(' '.join).runTests('''
-            now is the winter of our discontent made glorious summer by this sun of york
-            ''')
-    prints::
-        00 11 22 aa FF 0a 0d 1a
-        [0, 17, 34, 170, 255, 10, 13, 26]
-
-        my kingdom for a horse
-        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
-
-        now is the winter of our discontent made glorious summer by this sun of york
-        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
-    """
-    def pa(s,l,t):
-        return [func(tokn, *args) for tokn in t]
-
-    try:
-        func_name = getattr(func, '__name__', 
-                            getattr(func, '__class__').__name__)
-    except Exception:
-        func_name = str(func)
-    pa.__name__ = func_name
-
-    return pa
-
-upcaseTokens = tokenMap(lambda t: _ustr(t).upper())
-"""(Deprecated) Helper parse action to convert tokens to upper case. Deprecated in favor of L{pyparsing_common.upcaseTokens}"""
-
-downcaseTokens = tokenMap(lambda t: _ustr(t).lower())
-"""(Deprecated) Helper parse action to convert tokens to lower case. Deprecated in favor of L{pyparsing_common.downcaseTokens}"""
-    
-def _makeTags(tagStr, xml):
-    """Internal helper to construct opening and closing tag expressions, given a tag name"""
-    if isinstance(tagStr,basestring):
-        resname = tagStr
-        tagStr = Keyword(tagStr, caseless=not xml)
-    else:
-        resname = tagStr.name
-
-    tagAttrName = Word(alphas,alphanums+"_-:")
-    if (xml):
-        tagAttrValue = dblQuotedString.copy().setParseAction( removeQuotes )
-        openTag = Suppress("<") + tagStr("tag") + \
-                Dict(ZeroOrMore(Group( tagAttrName + Suppress("=") + tagAttrValue ))) + \
-                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
-    else:
-        printablesLessRAbrack = "".join(c for c in printables if c not in ">")
-        tagAttrValue = quotedString.copy().setParseAction( removeQuotes ) | Word(printablesLessRAbrack)
-        openTag = Suppress("<") + tagStr("tag") + \
-                Dict(ZeroOrMore(Group( tagAttrName.setParseAction(downcaseTokens) + \
-                Optional( Suppress("=") + tagAttrValue ) ))) + \
-                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
-    closeTag = Combine(_L("</") + tagStr + ">")
-
-    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % resname)
-    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % resname)
-    openTag.tag = resname
-    closeTag.tag = resname
-    return openTag, closeTag
-
-def makeHTMLTags(tagStr):
-    """
-    Helper to construct opening and closing tag expressions for HTML, given a tag name. Matches
-    tags in either upper or lower case, attributes with namespaces and with quoted or unquoted values.
-
-    Example::
-        text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
-        # makeHTMLTags returns pyparsing expressions for the opening and closing tags as a 2-tuple
-        a,a_end = makeHTMLTags("A")
-        link_expr = a + SkipTo(a_end)("link_text") + a_end
-        
-        for link in link_expr.searchString(text):
-            # attributes in the <A> tag (like "href" shown here) are also accessible as named results
-            print(link.link_text, '->', link.href)
-    prints::
-        pyparsing -> http://pyparsing.wikispaces.com
-    """
-    return _makeTags( tagStr, False )
-
-def makeXMLTags(tagStr):
-    """
-    Helper to construct opening and closing tag expressions for XML, given a tag name. Matches
-    tags only in the given upper/lower case.
-
-    Example: similar to L{makeHTMLTags}
-    """
-    return _makeTags( tagStr, True )
-
-def withAttribute(*args,**attrDict):
-    """
-    Helper to create a validating parse action to be used with start tags created
-    with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
-    with a required attribute value, to avoid false matches on common tags such as
-    C{<TD>} or C{<DIV>}.
-
-    Call C{withAttribute} with a series of attribute names and values. Specify the list
-    of filter attributes names and values as:
-     - keyword arguments, as in C{(align="right")}, or
-     - as an explicit dict with C{**} operator, when an attribute name is also a Python
-          reserved word, as in C{**{"class":"Customer", "align":"right"}}
-     - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
-    For attribute names with a namespace prefix, you must use the second form.  Attribute
-    names are matched insensitive to upper/lower case.
-       
-    If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
-
-    To verify that the attribute exists, but without specifying a value, pass
-    C{withAttribute.ANY_VALUE} as the value.
-
-    Example::
-        html = '''
-            <div>
-            Some text
-            <div type="grid">1 4 0 1 0</div>
-            <div type="graph">1,3 2,3 1,1</div>
-            <div>this has no type</div>
-            </div>
-                
-        '''
-        div,div_end = makeHTMLTags("div")
-
-        # only match div tag having a type attribute with value "grid"
-        div_grid = div().setParseAction(withAttribute(type="grid"))
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.searchString(html):
-            print(grid_header.body)
-        
-        # construct a match with any div tag having a type attribute, regardless of the value
-        div_any_type = div().setParseAction(withAttribute(type=withAttribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.searchString(html):
-            print(div_header.body)
-    prints::
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    if args:
-        attrs = args[:]
-    else:
-        attrs = attrDict.items()
-    attrs = [(k,v) for k,v in attrs]
-    def pa(s,l,tokens):
-        for attrName,attrValue in attrs:
-            if attrName not in tokens:
-                raise ParseException(s,l,"no matching attribute " + attrName)
-            if attrValue != withAttribute.ANY_VALUE and tokens[attrName] != attrValue:
-                raise ParseException(s,l,"attribute '%s' has value '%s', must be '%s'" %
-                                            (attrName, tokens[attrName], attrValue))
-    return pa
-withAttribute.ANY_VALUE = object()
-
-def withClass(classname, namespace=''):
-    """
-    Simplified version of C{L{withAttribute}} when matching on a div class - made
-    difficult because C{class} is a reserved word in Python.
-
-    Example::
-        html = '''
-            <div>
-            Some text
-            <div class="grid">1 4 0 1 0</div>
-            <div class="graph">1,3 2,3 1,1</div>
-            <div>this &lt;div&gt; has no class</div>
-            </div>
-                
-        '''
-        div,div_end = makeHTMLTags("div")
-        div_grid = div().setParseAction(withClass("grid"))
-        
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.searchString(html):
-            print(grid_header.body)
-        
-        div_any_type = div().setParseAction(withClass(withAttribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.searchString(html):
-            print(div_header.body)
-    prints::
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    classattr = "%s:class" % namespace if namespace else "class"
-    return withAttribute(**{classattr : classname})        
-
-opAssoc = _Constants()
-opAssoc.LEFT = object()
-opAssoc.RIGHT = object()
-
-def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
-    """
-    Helper method for constructing grammars of expressions made up of
-    operators working in a precedence hierarchy.  Operators may be unary or
-    binary, left- or right-associative.  Parse actions can also be attached
-    to operator expressions. The generated parser will also recognize the use 
-    of parentheses to override operator precedences (see example below).
-    
-    Note: if you define a deep operator list, you may see performance issues
-    when using infixNotation. See L{ParserElement.enablePackrat} for a
-    mechanism to potentially improve your parser performance.
-
-    Parameters:
-     - baseExpr - expression representing the most basic element for the nested
-     - opList - list of tuples, one for each operator precedence level in the
-      expression grammar; each tuple is of the form
-      (opExpr, numTerms, rightLeftAssoc, parseAction), where:
-       - opExpr is the pyparsing expression for the operator;
-          may also be a string, which will be converted to a Literal;
-          if numTerms is 3, opExpr is a tuple of two expressions, for the
-          two operators separating the 3 terms
-       - numTerms is the number of terms for this operator (must
-          be 1, 2, or 3)
-       - rightLeftAssoc is the indicator whether the operator is
-          right or left associative, using the pyparsing-defined
-          constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
-       - parseAction is the parse action to be associated with
-          expressions matching this operator expression (the
-          parse action tuple member may be omitted)
-     - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
-     - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
-
-    Example::
-        # simple example of four-function arithmetic with ints and variable names
-        integer = pyparsing_common.signed_integer
-        varname = pyparsing_common.identifier 
-        
-        arith_expr = infixNotation(integer | varname,
-            [
-            ('-', 1, opAssoc.RIGHT),
-            (oneOf('* /'), 2, opAssoc.LEFT),
-            (oneOf('+ -'), 2, opAssoc.LEFT),
-            ])
-        
-        arith_expr.runTests('''
-            5+3*6
-            (5+3)*6
-            -2--11
-            ''', fullDump=False)
-    prints::
-        5+3*6
-        [[5, '+', [3, '*', 6]]]
-
-        (5+3)*6
-        [[[5, '+', 3], '*', 6]]
-
-        -2--11
-        [[['-', 2], '-', ['-', 11]]]
-    """
-    ret = Forward()
-    lastExpr = baseExpr | ( lpar + ret + rpar )
-    for i,operDef in enumerate(opList):
-        opExpr,arity,rightLeftAssoc,pa = (operDef + (None,))[:4]
-        termName = "%s term" % opExpr if arity < 3 else "%s%s term" % opExpr
-        if arity == 3:
-            if opExpr is None or len(opExpr) != 2:
-                raise ValueError("if numterms=3, opExpr must be a tuple or list of two expressions")
-            opExpr1, opExpr2 = opExpr
-        thisExpr = Forward().setName(termName)
-        if rightLeftAssoc == opAssoc.LEFT:
-            if arity == 1:
-                matchExpr = FollowedBy(lastExpr + opExpr) + Group( lastExpr + OneOrMore( opExpr ) )
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = FollowedBy(lastExpr + opExpr + lastExpr) + Group( lastExpr + OneOrMore( opExpr + lastExpr ) )
-                else:
-                    matchExpr = FollowedBy(lastExpr+lastExpr) + Group( lastExpr + OneOrMore(lastExpr) )
-            elif arity == 3:
-                matchExpr = FollowedBy(lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr) + \
-                            Group( lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr )
-            else:
-                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
-        elif rightLeftAssoc == opAssoc.RIGHT:
-            if arity == 1:
-                # try to avoid LR with this extra test
-                if not isinstance(opExpr, Optional):
-                    opExpr = Optional(opExpr)
-                matchExpr = FollowedBy(opExpr.expr + thisExpr) + Group( opExpr + thisExpr )
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = FollowedBy(lastExpr + opExpr + thisExpr) + Group( lastExpr + OneOrMore( opExpr + thisExpr ) )
-                else:
-                    matchExpr = FollowedBy(lastExpr + thisExpr) + Group( lastExpr + OneOrMore( thisExpr ) )
-            elif arity == 3:
-                matchExpr = FollowedBy(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr) + \
-                            Group( lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr )
-            else:
-                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
-        else:
-            raise ValueError("operator must indicate right or left associativity")
-        if pa:
-            matchExpr.setParseAction( pa )
-        thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
-        lastExpr = thisExpr
-    ret <<= lastExpr
-    return ret
-
-operatorPrecedence = infixNotation
-"""(Deprecated) Former name of C{L{infixNotation}}, will be dropped in a future release."""
-
-dblQuotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"').setName("string enclosed in double quotes")
-sglQuotedString = Combine(Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("string enclosed in single quotes")
-quotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"'|
-                       Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("quotedString using single or double quotes")
-unicodeString = Combine(_L('u') + quotedString.copy()).setName("unicode string literal")
-
-def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.copy()):
-    """
-    Helper method for defining nested lists enclosed in opening and closing
-    delimiters ("(" and ")" are the default).
-
-    Parameters:
-     - opener - opening character for a nested list (default=C{"("}); can also be a pyparsing expression
-     - closer - closing character for a nested list (default=C{")"}); can also be a pyparsing expression
-     - content - expression for items within the nested lists (default=C{None})
-     - ignoreExpr - expression for ignoring opening and closing delimiters (default=C{quotedString})
-
-    If an expression is not provided for the content argument, the nested
-    expression will capture all whitespace-delimited content between delimiters
-    as a list of separate values.
-
-    Use the C{ignoreExpr} argument to define expressions that may contain
-    opening or closing characters that should not be treated as opening
-    or closing characters for nesting, such as quotedString or a comment
-    expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
-    The default is L{quotedString}, but if no expressions are to be ignored,
-    then pass C{None} for this argument.
-
-    Example::
-        data_type = oneOf("void int short long char float double")
-        decl_data_type = Combine(data_type + Optional(Word('*')))
-        ident = Word(alphas+'_', alphanums+'_')
-        number = pyparsing_common.number
-        arg = Group(decl_data_type + ident)
-        LPAR,RPAR = map(Suppress, "()")
-
-        code_body = nestedExpr('{', '}', ignoreExpr=(quotedString | cStyleComment))
-
-        c_function = (decl_data_type("type") 
-                      + ident("name")
-                      + LPAR + Optional(delimitedList(arg), [])("args") + RPAR 
-                      + code_body("body"))
-        c_function.ignore(cStyleComment)
-        
-        source_code = '''
-            int is_odd(int x) { 
-                return (x%2); 
-            }
-                
-            int dec_to_hex(char hchar) { 
-                if (hchar >= '0' && hchar <= '9') { 
-                    return (ord(hchar)-ord('0')); 
-                } else { 
-                    return (10+ord(hchar)-ord('A'));
-                } 
-            }
-        '''
-        for func in c_function.searchString(source_code):
-            print("%(name)s (%(type)s) args: %(args)s" % func)
-
-    prints::
-        is_odd (int) args: [['int', 'x']]
-        dec_to_hex (int) args: [['char', 'hchar']]
-    """
-    if opener == closer:
-        raise ValueError("opening and closing strings cannot be the same")
-    if content is None:
-        if isinstance(opener,basestring) and isinstance(closer,basestring):
-            if len(opener) == 1 and len(closer)==1:
-                if ignoreExpr is not None:
-                    content = (Combine(OneOrMore(~ignoreExpr +
-                                    CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS,exact=1))
-                                ).setParseAction(lambda t:t[0].strip()))
-                else:
-                    content = (empty.copy()+CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS
-                                ).setParseAction(lambda t:t[0].strip()))
-            else:
-                if ignoreExpr is not None:
-                    content = (Combine(OneOrMore(~ignoreExpr + 
-                                    ~Literal(opener) + ~Literal(closer) +
-                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
-                                ).setParseAction(lambda t:t[0].strip()))
-                else:
-                    content = (Combine(OneOrMore(~Literal(opener) + ~Literal(closer) +
-                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
-                                ).setParseAction(lambda t:t[0].strip()))
-        else:
-            raise ValueError("opening and closing arguments must be strings if no content expression is given")
-    ret = Forward()
-    if ignoreExpr is not None:
-        ret <<= Group( Suppress(opener) + ZeroOrMore( ignoreExpr | ret | content ) + Suppress(closer) )
-    else:
-        ret <<= Group( Suppress(opener) + ZeroOrMore( ret | content )  + Suppress(closer) )
-    ret.setName('nested %s%s expression' % (opener,closer))
-    return ret
-
-def indentedBlock(blockStatementExpr, indentStack, indent=True):
-    """
-    Helper method for defining space-delimited indentation blocks, such as
-    those used to define block statements in Python source code.
-
-    Parameters:
-     - blockStatementExpr - expression defining syntax of statement that
-            is repeated within the indented block
-     - indentStack - list created by caller to manage indentation stack
-            (multiple statementWithIndentedBlock expressions within a single grammar
-            should share a common indentStack)
-     - indent - boolean indicating whether block must be indented beyond the
-            the current level; set to False for block of left-most statements
-            (default=C{True})
-
-    A valid block must contain at least one C{blockStatement}.
-
-    Example::
-        data = '''
-        def A(z):
-          A1
-          B = 100
-          G = A2
-          A2
-          A3
-        B
-        def BB(a,b,c):
-          BB1
-          def BBA():
-            bba1
-            bba2
-            bba3
-        C
-        D
-        def spam(x,y):
-             def eggs(z):
-                 pass
-        '''
-
-
-        indentStack = [1]
-        stmt = Forward()
-
-        identifier = Word(alphas, alphanums)
-        funcDecl = ("def" + identifier + Group( "(" + Optional( delimitedList(identifier) ) + ")" ) + ":")
-        func_body = indentedBlock(stmt, indentStack)
-        funcDef = Group( funcDecl + func_body )
-
-        rvalue = Forward()
-        funcCall = Group(identifier + "(" + Optional(delimitedList(rvalue)) + ")")
-        rvalue << (funcCall | identifier | Word(nums))
-        assignment = Group(identifier + "=" + rvalue)
-        stmt << ( funcDef | assignment | identifier )
-
-        module_body = OneOrMore(stmt)
-
-        parseTree = module_body.parseString(data)
-        parseTree.pprint()
-    prints::
-        [['def',
-          'A',
-          ['(', 'z', ')'],
-          ':',
-          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
-         'B',
-         ['def',
-          'BB',
-          ['(', 'a', 'b', 'c', ')'],
-          ':',
-          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
-         'C',
-         'D',
-         ['def',
-          'spam',
-          ['(', 'x', 'y', ')'],
-          ':',
-          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]] 
-    """
-    def checkPeerIndent(s,l,t):
-        if l >= len(s): return
-        curCol = col(l,s)
-        if curCol != indentStack[-1]:
-            if curCol > indentStack[-1]:
-                raise ParseFatalException(s,l,"illegal nesting")
-            raise ParseException(s,l,"not a peer entry")
-
-    def checkSubIndent(s,l,t):
-        curCol = col(l,s)
-        if curCol > indentStack[-1]:
-            indentStack.append( curCol )
-        else:
-            raise ParseException(s,l,"not a subentry")
-
-    def checkUnindent(s,l,t):
-        if l >= len(s): return
-        curCol = col(l,s)
-        if not(indentStack and curCol < indentStack[-1] and curCol <= indentStack[-2]):
-            raise ParseException(s,l,"not an unindent")
-        indentStack.pop()
-
-    NL = OneOrMore(LineEnd().setWhitespaceChars("\t ").suppress())
-    INDENT = (Empty() + Empty().setParseAction(checkSubIndent)).setName('INDENT')
-    PEER   = Empty().setParseAction(checkPeerIndent).setName('')
-    UNDENT = Empty().setParseAction(checkUnindent).setName('UNINDENT')
-    if indent:
-        smExpr = Group( Optional(NL) +
-            #~ FollowedBy(blockStatementExpr) +
-            INDENT + (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) + UNDENT)
-    else:
-        smExpr = Group( Optional(NL) +
-            (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) )
-    blockStatementExpr.ignore(_bslash + LineEnd())
-    return smExpr.setName('indented block')
-
-alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
-punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
-
-anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:").setName('any tag'))
-_htmlEntityMap = dict(zip("gt lt amp nbsp quot apos".split(),'><& "\''))
-commonHTMLEntity = Regex('&(?P<entity>' + '|'.join(_htmlEntityMap.keys()) +");").setName("common HTML entity")
-def replaceHTMLEntity(t):
-    """Helper parser action to replace common HTML entities with their special characters"""
-    return _htmlEntityMap.get(t.entity)
-
-# it's easy to get these comment structures wrong - they're very common, so may as well make them available
-cStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/').setName("C style comment")
-"Comment of the form C{/* ... */}"
-
-htmlComment = Regex(r"<!--[\s\S]*?-->").setName("HTML comment")
-"Comment of the form C{<!-- ... -->}"
-
-restOfLine = Regex(r".*").leaveWhitespace().setName("rest of line")
-dblSlashComment = Regex(r"//(?:\\\n|[^\n])*").setName("// comment")
-"Comment of the form C{// ... (to end of line)}"
-
-cppStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/'| dblSlashComment).setName("C++ style comment")
-"Comment of either form C{L{cStyleComment}} or C{L{dblSlashComment}}"
-
-javaStyleComment = cppStyleComment
-"Same as C{L{cppStyleComment}}"
-
-pythonStyleComment = Regex(r"#.*").setName("Python style comment")
-"Comment of the form C{# ... (to end of line)}"
-
-_commasepitem = Combine(OneOrMore(Word(printables, excludeChars=',') +
-                                  Optional( Word(" \t") +
-                                            ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
-commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
-"""(Deprecated) Predefined expression of 1 or more printable words or quoted strings, separated by commas.
-   This expression is deprecated in favor of L{pyparsing_common.comma_separated_list}."""
-
-# some other useful expressions - using lower-case class name since we are really using this as a namespace
-class pyparsing_common:
-    """
-    Here are some common low-level expressions that may be useful in jump-starting parser development:
-     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sci_real>})
-     - common L{programming identifiers<identifier>}
-     - network addresses (L{MAC<mac_address>}, L{IPv4<ipv4_address>}, L{IPv6<ipv6_address>})
-     - ISO8601 L{dates<iso8601_date>} and L{datetime<iso8601_datetime>}
-     - L{UUID<uuid>}
-     - L{comma-separated list<comma_separated_list>}
-    Parse actions:
-     - C{L{convertToInteger}}
-     - C{L{convertToFloat}}
-     - C{L{convertToDate}}
-     - C{L{convertToDatetime}}
-     - C{L{stripHTMLTags}}
-     - C{L{upcaseTokens}}
-     - C{L{downcaseTokens}}
-
-    Example::
-        pyparsing_common.number.runTests('''
-            # any int or real number, returned as the appropriate type
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.fnumber.runTests('''
-            # any int or real number, returned as float
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.hex_integer.runTests('''
-            # hex numbers
-            100
-            FF
-            ''')
-
-        pyparsing_common.fraction.runTests('''
-            # fractions
-            1/2
-            -3/4
-            ''')
-
-        pyparsing_common.mixed_integer.runTests('''
-            # mixed fractions
-            1
-            1/2
-            -3/4
-            1-3/4
-            ''')
-
-        import uuid
-        pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
-        pyparsing_common.uuid.runTests('''
-            # uuid
-            12345678-1234-5678-1234-567812345678
-            ''')
-    prints::
-        # any int or real number, returned as the appropriate type
-        100
-        [100]
-
-        -100
-        [-100]
-
-        +100
-        [100]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # any int or real number, returned as float
-        100
-        [100.0]
-
-        -100
-        [-100.0]
-
-        +100
-        [100.0]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # hex numbers
-        100
-        [256]
-
-        FF
-        [255]
-
-        # fractions
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        # mixed fractions
-        1
-        [1]
-
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        1-3/4
-        [1.75]
-
-        # uuid
-        12345678-1234-5678-1234-567812345678
-        [UUID('12345678-1234-5678-1234-567812345678')]
-    """
-
-    convertToInteger = tokenMap(int)
-    """
-    Parse action for converting parsed integers to Python int
-    """
-
-    convertToFloat = tokenMap(float)
-    """
-    Parse action for converting parsed numbers to Python float
-    """
-
-    integer = Word(nums).setName("integer").setParseAction(convertToInteger)
-    """expression that parses an unsigned integer, returns an int"""
-
-    hex_integer = Word(hexnums).setName("hex integer").setParseAction(tokenMap(int,16))
-    """expression that parses a hexadecimal integer, returns an int"""
-
-    signed_integer = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
-    """expression that parses an integer with optional leading sign, returns an int"""
-
-    fraction = (signed_integer().setParseAction(convertToFloat) + '/' + signed_integer().setParseAction(convertToFloat)).setName("fraction")
-    """fractional expression of an integer divided by an integer, returns a float"""
-    fraction.addParseAction(lambda t: t[0]/t[-1])
-
-    mixed_integer = (fraction | signed_integer + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
-    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
-    mixed_integer.addParseAction(sum)
-
-    real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
-    """expression that parses a floating point number and returns a float"""
-
-    sci_real = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
-    """expression that parses a floating point number with optional scientific notation and returns a float"""
-
-    # streamlining this expression makes the docs nicer-looking
-    number = (sci_real | real | signed_integer).streamline()
-    """any numeric expression, returns the corresponding Python type"""
-
-    fnumber = Regex(r'[+-]?\d+\.?\d*([eE][+-]?\d+)?').setName("fnumber").setParseAction(convertToFloat)
-    """any int or real number, returned as float"""
-    
-    identifier = Word(alphas+'_', alphanums+'_').setName("identifier")
-    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
-    
-    ipv4_address = Regex(r'(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}').setName("IPv4 address")
-    "IPv4 address (C{0.0.0.0 - 255.255.255.255})"
-
-    _ipv6_part = Regex(r'[0-9a-fA-F]{1,4}').setName("hex_integer")
-    _full_ipv6_address = (_ipv6_part + (':' + _ipv6_part)*7).setName("full IPv6 address")
-    _short_ipv6_address = (Optional(_ipv6_part + (':' + _ipv6_part)*(0,6)) + "::" + Optional(_ipv6_part + (':' + _ipv6_part)*(0,6))).setName("short IPv6 address")
-    _short_ipv6_address.addCondition(lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8)
-    _mixed_ipv6_address = ("::ffff:" + ipv4_address).setName("mixed IPv6 address")
-    ipv6_address = Combine((_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).setName("IPv6 address")).setName("IPv6 address")
-    "IPv6 address (long, short, or mixed form)"
-    
-    mac_address = Regex(r'[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}').setName("MAC address")
-    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
-
-    @staticmethod
-    def convertToDate(fmt="%Y-%m-%d"):
-        """
-        Helper to create a parse action for converting parsed date string to Python datetime.date
-
-        Params -
-         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%d"})
-
-        Example::
-            date_expr = pyparsing_common.iso8601_date.copy()
-            date_expr.setParseAction(pyparsing_common.convertToDate())
-            print(date_expr.parseString("1999-12-31"))
-        prints::
-            [datetime.date(1999, 12, 31)]
-        """
-        def cvt_fn(s,l,t):
-            try:
-                return datetime.strptime(t[0], fmt).date()
-            except ValueError as ve:
-                raise ParseException(s, l, str(ve))
-        return cvt_fn
-
-    @staticmethod
-    def convertToDatetime(fmt="%Y-%m-%dT%H:%M:%S.%f"):
-        """
-        Helper to create a parse action for converting parsed datetime string to Python datetime.datetime
-
-        Params -
-         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%dT%H:%M:%S.%f"})
-
-        Example::
-            dt_expr = pyparsing_common.iso8601_datetime.copy()
-            dt_expr.setParseAction(pyparsing_common.convertToDatetime())
-            print(dt_expr.parseString("1999-12-31T23:59:59.999"))
-        prints::
-            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
-        """
-        def cvt_fn(s,l,t):
-            try:
-                return datetime.strptime(t[0], fmt)
-            except ValueError as ve:
-                raise ParseException(s, l, str(ve))
-        return cvt_fn
-
-    iso8601_date = Regex(r'(?P<year>\d{4})(?:-(?P<month>\d\d)(?:-(?P<day>\d\d))?)?').setName("ISO8601 date")
-    "ISO8601 date (C{yyyy-mm-dd})"
-
-    iso8601_datetime = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)[T ](?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d(\.\d*)?)?)?(?P<tz>Z|[+-]\d\d:?\d\d)?').setName("ISO8601 datetime")
-    "ISO8601 datetime (C{yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)}) - trailing seconds, milliseconds, and timezone optional; accepts separating C{'T'} or C{' '}"
-
-    uuid = Regex(r'[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}').setName("UUID")
-    "UUID (C{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx})"
-
-    _html_stripper = anyOpenTag.suppress() | anyCloseTag.suppress()
-    @staticmethod
-    def stripHTMLTags(s, l, tokens):
-        """
-        Parse action to remove HTML tags from web page HTML source
-
-        Example::
-            # strip HTML links from normal text 
-            text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
-            td,td_end = makeHTMLTags("TD")
-            table_text = td + SkipTo(td_end).setParseAction(pyparsing_common.stripHTMLTags)("body") + td_end
-            
-            print(table_text.parseString(text).body) # -> 'More info at the pyparsing wiki page'
-        """
-        return pyparsing_common._html_stripper.transformString(tokens[0])
-
-    _commasepitem = Combine(OneOrMore(~Literal(",") + ~LineEnd() + Word(printables, excludeChars=',') 
-                                        + Optional( White(" \t") ) ) ).streamline().setName("commaItem")
-    comma_separated_list = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("comma separated list")
-    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
-
-    upcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).upper()))
-    """Parse action to convert tokens to upper case."""
-
-    downcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).lower()))
-    """Parse action to convert tokens to lower case."""
-
-
-if __name__ == "__main__":
-
-    selectToken    = CaselessLiteral("select")
-    fromToken      = CaselessLiteral("from")
-
-    ident          = Word(alphas, alphanums + "_$")
-
-    columnName     = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
-    columnNameList = Group(delimitedList(columnName)).setName("columns")
-    columnSpec     = ('*' | columnNameList)
-
-    tableName      = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
-    tableNameList  = Group(delimitedList(tableName)).setName("tables")
-    
-    simpleSQL      = selectToken("command") + columnSpec("columns") + fromToken + tableNameList("tables")
-
-    # demo runTests method, including embedded comments in test string
-    simpleSQL.runTests("""
-        # '*' as column list and dotted table name
-        select * from SYS.XYZZY
-
-        # caseless match on "SELECT", and casts back to "select"
-        SELECT * from XYZZY, ABC
-
-        # list of column names, and mixed case SELECT keyword
-        Select AA,BB,CC from Sys.dual
-
-        # multiple tables
-        Select A, B, C from Sys.dual, Table2
-
-        # invalid SELECT keyword - should fail
-        Xelect A, B, C from Sys.dual
-
-        # incomplete command - should fail
-        Select
-
-        # invalid column name - should fail
-        Select ^^^ frox Sys.dual
-
-        """)
-
-    pyparsing_common.number.runTests("""
-        100
-        -100
-        +100
-        3.14159
-        6.02e23
-        1e-12
-        """)
-
-    # any int or real number, returned as float
-    pyparsing_common.fnumber.runTests("""
-        100
-        -100
-        +100
-        3.14159
-        6.02e23
-        1e-12
-        """)
-
-    pyparsing_common.hex_integer.runTests("""
-        100
-        FF
-        """)
-
-    import uuid
-    pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
-    pyparsing_common.uuid.runTests("""
-        12345678-1234-5678-1234-567812345678
-        """)
diff --git a/pkg_resources/_vendor/six.py b/pkg_resources/_vendor/six.py
deleted file mode 100644
index 190c0239cd..0000000000
--- a/pkg_resources/_vendor/six.py
+++ /dev/null
@@ -1,868 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2015 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from __future__ import absolute_import
-
-import functools
-import itertools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.10.0"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
-
-if PY3:
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-
-            def __len__(self):
-                return 1 << 31
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
-        return result
-
-
-class MovedModule(_LazyDescr):
-
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-
-    """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser",
-                "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog",
-                "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
-                "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
-
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ['parse', 'error', 'request', 'response', 'robotparser']
-
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    def create_unbound_method(func, cls):
-        return func
-
-    Iterator = object
-else:
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
-    class Iterator(object):
-
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(get_unbound_function,
-         """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
-
-
-if PY3:
-    def b(s):
-        return s.encode("latin-1")
-
-    def u(s):
-        return s
-    unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-else:
-    def b(s):
-        return s
-    # Workaround for standalone backslash
-
-    def u(s):
-        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
-    unichr = unichr
-    int2byte = chr
-
-    def byte2int(bs):
-        return ord(bs[0])
-
-    def indexbytes(buf, i):
-        return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        if value is None:
-            value = tp()
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
-""")
-
-
-if sys.version_info[:2] == (3, 2):
-    exec_("""def raise_from(value, from_value):
-    if from_value is None:
-        raise value
-    raise value from from_value
-""")
-elif sys.version_info[:2] > (3, 2):
-    exec_("""def raise_from(value, from_value):
-    raise value from from_value
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-              updated=functools.WRAPPER_UPDATES):
-        def wrapper(f):
-            f = functools.wraps(wrapped, assigned, updated)(f)
-            f.__wrapped__ = wrapped
-            return f
-        return wrapper
-else:
-    wraps = functools.wraps
-
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get('__slots__')
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
deleted file mode 100644
index 9a94c5bcc2..0000000000
--- a/pkg_resources/_vendor/vendored.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-packaging==16.8
-pyparsing==2.1.10
-six==1.10.0
-appdirs==1.4.0
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
deleted file mode 100644
index b4156fec20..0000000000
--- a/pkg_resources/extern/__init__.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import sys
-
-
-class VendorImporter:
-    """
-    A PEP 302 meta path importer for finding optionally-vendored
-    or otherwise naturally-installed packages from root_name.
-    """
-
-    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
-        self.root_name = root_name
-        self.vendored_names = set(vendored_names)
-        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
-
-    @property
-    def search_path(self):
-        """
-        Search first the vendor package then as a natural package.
-        """
-        yield self.vendor_pkg + '.'
-        yield ''
-
-    def find_module(self, fullname, path=None):
-        """
-        Return self when fullname starts with root_name and the
-        target module is one vendored through this importer.
-        """
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
-
-    def load_module(self, fullname):
-        """
-        Iterate over the search path to locate and load fullname.
-        """
-        root, base, target = fullname.partition(self.root_name + '.')
-        for prefix in self.search_path:
-            try:
-                extant = prefix + target
-                __import__(extant)
-                mod = sys.modules[extant]
-                sys.modules[fullname] = mod
-                # mysterious hack:
-                # Remove the reference to the extant package/module
-                # on later Python versions to cause relative imports
-                # in the vendor package to resolve the same modules
-                # as those going through this importer.
-                if sys.version_info > (3, 3):
-                    del sys.modules[extant]
-                return mod
-            except ImportError:
-                pass
-        else:
-            raise ImportError(
-                "The '{target}' package is required; "
-                "normally this is bundled with this package so if you get "
-                "this warning, consult the packager of your "
-                "distribution.".format(**locals())
-            )
-
-    def install(self):
-        """
-        Install this importer into sys.meta_path if not already present.
-        """
-        if self not in sys.meta_path:
-            sys.meta_path.append(self)
-
-
-names = 'packaging', 'pyparsing', 'six', 'appdirs'
-VendorImporter(__name__, names).install()
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 49bf7a04b8..bef914a22a 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,7 +12,7 @@
 import distutils.dist
 import distutils.command.install_egg_info
 
-from pkg_resources.extern.six.moves import map
+from six.moves import map
 
 import pytest
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 00ca74262a..f28378b9c6 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -5,10 +5,10 @@
 import string
 import platform
 
-from pkg_resources.extern.six.moves import map
+from six.moves import map
 
 import pytest
-from pkg_resources.extern import packaging
+import packaging
 
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
diff --git a/setup.py b/setup.py
index 8e125fc18e..bd58504225 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,10 @@
 def require_metadata():
     "Prevent improper installs without necessary metadata. See #659"
     if not os.path.exists('setuptools.egg-info'):
-        msg = "Cannot build setuptools without metadata. Run bootstrap.py"
+        msg = (
+            "Cannot build setuptools without metadata. "
+            "Install rwt and run `rwt -- bootstrap.py`."
+        )
         raise RuntimeError(msg)
 
 
@@ -157,6 +160,11 @@ def pypi_link(pkg_filename):
         Topic :: Utilities
         """).strip().splitlines(),
     python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*',
+    install_requires=[
+        'packaging>=16.8',
+        'six>=1.10.0',
+        'appdirs>=1.4.0',
+    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2016.9.26",
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 54577ceded..c60e1eaba6 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filter, filterfalse, map
+from six.moves import filter, filterfalse, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 4532b1cc0d..35ece78d76 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,6 +1,6 @@
 from distutils.errors import DistutilsOptionError
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 from setuptools.command.setopt import edit_config, option_base, config_file
 
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 8cd9dfefe2..ae344cd051 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,7 +11,7 @@
 import textwrap
 import marshal
 
-from setuptools.extern import six
+import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 36f53f0dd4..c2fd8704e0 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -10,7 +10,7 @@
 from distutils import log
 
 from setuptools.extension import Library
-from setuptools.extern import six
+import six
 
 try:
     # Attempt to use Cython for building extensions, if available
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b0314fd413..56daa2bd32 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -8,8 +8,8 @@
 import distutils.errors
 import itertools
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter, filterfalse
+import six
+from six.moves import map, filter, filterfalse
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index aa82f95920..1489de9e34 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,7 +5,7 @@
 import glob
 import io
 
-from setuptools.extern import six
+import six
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 36e7f3598f..d3eabfc3ba 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,8 @@
 import shlex
 import io
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import configparser, map
+import six
+from six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 98a8730008..2bc57b18c2 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,8 +16,8 @@
 import time
 import collections
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
+import six
+from six.moves import map
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
@@ -30,7 +30,7 @@
 import setuptools.unicode_utils as unicode_utils
 from setuptools.glob import glob
 
-from pkg_resources.extern import packaging
+import packaging
 
 
 def translate_pattern(glob):
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 61063e7542..a2c74b2d76 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -3,7 +3,7 @@
 from distutils.util import convert_path
 from distutils.command import sdist
 
-from setuptools.extern.six.moves import filter
+from six.moves import filter
 
 
 class sdist_add_defaults:
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index b89353f529..7ea36e968e 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -4,7 +4,7 @@
 import os
 import shutil
 
-from setuptools.extern import six
+import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 84e29a1b7d..2c2d88afa5 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@
 import io
 import contextlib
 
-from setuptools.extern import six
+import six
 
 from .py36compat import sdist_add_defaults
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 7e57cc0262..6f6298c46f 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,7 +4,7 @@
 import distutils
 import os
 
-from setuptools.extern.six.moves import configparser
+from six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index ef0af12f12..e7a386d19d 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -7,8 +7,8 @@
 from distutils import log
 from unittest import TestLoader
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter
+import six
+from six.moves import map, filter
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 269dc2d503..eeb0718b67 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,8 @@
 import itertools
 import functools
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import http_client, urllib
+import six
+from six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 from .upload import upload
diff --git a/setuptools/config.py b/setuptools/config.py
index d71ff028da..19b39629c7 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -7,7 +7,7 @@
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.py26compat import import_module
-from setuptools.extern.six import string_types
+from six import string_types
 
 
 def read_configuration(
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 159464be23..be55dc4e65 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -12,9 +12,9 @@
     DistutilsSetupError)
 from distutils.util import rfc822_escape
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
-from pkg_resources.extern import packaging
+import six
+from six.moves import map
+import packaging
 
 from setuptools.depends import Require
 from setuptools import windows_support
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 29468894f8..34a36dfbb3 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -4,7 +4,7 @@
 import distutils.errors
 import distutils.extension
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 from .monkey import get_unpatched
 
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
deleted file mode 100644
index 2cd08b7ed9..0000000000
--- a/setuptools/extern/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from pkg_resources.extern import VendorImporter
-
-names = 'six',
-VendorImporter(__name__, names, 'pkg_resources._vendor').install()
diff --git a/setuptools/glob.py b/setuptools/glob.py
index 6c781de349..f264402671 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -10,7 +10,7 @@
 import os
 import re
 import fnmatch
-from setuptools.extern.six import binary_type
+from six import binary_type
 
 __all__ = ["glob", "iglob", "escape"]
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index dbe9a6176d..5843c46bbc 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -10,7 +10,7 @@
 import inspect
 
 from .py26compat import import_module
-from setuptools.extern import six
+import six
 
 import setuptools
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 447ddb3822..97e27303f8 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -20,14 +20,14 @@
 import platform
 import itertools
 import distutils.errors
-from pkg_resources.extern.packaging.version import LegacyVersion
+from packaging.version import LegacyVersion
 
-from setuptools.extern.six.moves import filterfalse
+from six.moves import filterfalse
 
 from .monkey import get_unpatched
 
 if platform.system() == 'Windows':
-    from setuptools.extern.six.moves import winreg
+    from six.moves import winreg
     safe_env = os.environ
 else:
     """
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 0a889f224a..ba90743964 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -3,7 +3,7 @@
 from distutils import log
 import itertools
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 
 flatten = itertools.chain.from_iterable
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d80d43bc79..65c3c433a1 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -14,8 +14,8 @@
 except ImportError:
     from urllib2 import splituser
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client, configparser, map
+import six
+from six.moves import urllib, http_client, configparser, map
 
 import setuptools
 from pkg_resources import (
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 2588d680cd..ad91d73eae 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -3,7 +3,7 @@
 import array
 import collections
 
-from setuptools.extern import six
+import six
 
 
 OpArg = collections.namedtuple('OpArg', 'opcode arg')
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 817a3afaae..0ddd233242 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,8 +8,8 @@
 import contextlib
 import pickle
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import builtins, map
+import six
+from six.moves import builtins, map
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 82f8870ab8..efeef71dcb 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,7 @@
 import atexit
 import re
 
-from setuptools.extern.six.moves import urllib, http_client, map
+from six.moves import urllib, http_client, map
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index dbf1620108..f54c478e1a 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,7 +8,7 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-from setuptools.extern import six
+import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 535ae10766..77ebecf92f 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,7 +5,7 @@
 import contextlib
 import site
 
-from setuptools.extern import six
+import six
 import pkg_resources
 
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 35312120bb..5cdde21722 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,7 +4,7 @@
 import time
 import threading
 
-from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
+from six.moves import BaseHTTPServer, SimpleHTTPServer
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index b789e9acef..5cdf63f2bb 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -3,7 +3,7 @@
 import tarfile
 import io
 
-from setuptools.extern import six
+import six
 
 import pytest
 
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 602571540f..59a896d81f 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,7 +2,7 @@
 import distutils.command.build_ext as orig
 from distutils.sysconfig import get_config_var
 
-from setuptools.extern import six
+import six
 
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 5dd72aaee8..3b1b1e2d54 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -9,7 +9,7 @@
 import io
 import subprocess
 
-from setuptools.extern import six
+import six
 from setuptools.command import test
 
 import pytest
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index f7e7d2bf0a..24c5149af2 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1ea33b0890..f5c932dac1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,7 +16,7 @@
 import zipfile
 
 import time
-from setuptools.extern.six.moves import urllib
+from six.moves import urllib
 
 import pytest
 try:
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a32b981d67..c9a4425af7 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,7 +6,7 @@
 
 from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
-from setuptools.extern.six.moves import map
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 78fb0627b0..a83d4fe867 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,7 +7,7 @@
 import os
 import sys
 
-from setuptools.extern.six.moves import urllib
+from six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 602c43a274..cf39346a18 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -11,7 +11,7 @@
 
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
-from setuptools.extern import six
+import six
 from setuptools.tests.textwrap import DALS
 
 import pytest
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index f09dd78c31..d68867c227 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,8 @@
 import os
 import distutils.errors
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client
+import six
+from six.moves import urllib, http_client
 
 import pkg_resources
 import setuptools.package_index
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f34068dcd3..38fdda248e 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,8 +9,8 @@
 import contextlib
 import io
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
+import six
+from six.moves import map
 
 import pytest
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 7c63efd20b..6a84f9bead 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,7 +1,7 @@
 import unicodedata
 import sys
 
-from setuptools.extern import six
+import six
 
 
 # HFS Plus uses decomposed UTF-8
diff --git a/tests/test_pypi.py b/tests/test_pypi.py
index b3425e53bc..173b2c876b 100644
--- a/tests/test_pypi.py
+++ b/tests/test_pypi.py
@@ -2,8 +2,8 @@
 import subprocess
 
 import virtualenv
-from setuptools.extern.six.moves import http_client
-from setuptools.extern.six.moves import xmlrpc_client
+from six.moves import http_client
+from six.moves import xmlrpc_client
 
 TOP = 200
 PYPI_HOSTNAME = 'pypi.python.org'
diff --git a/tox.ini b/tox.ini
index 3c222bf7fd..5fcad763b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,9 @@
 [testenv]
-deps=-rtests/requirements.txt
+deps=
+    -rtests/requirements.txt
+    packaging
+    appdirs
+    six
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
 commands=py.test {posargs:-rsx}
 usedevelop=True

From a36dbf75bd6b1283fd3da28c25fd583f20025c36 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 23:12:23 -0500
Subject: [PATCH 6435/8469] In the bootstrap script, generate a
 requirements.txt file and use it to install the dependencies just in time to
 make them available long enough to generate the egg info.

---
 .gitignore   |  1 +
 .travis.yml  |  2 +-
 bootstrap.py | 40 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d77520f68..ec3d0e3522 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ setuptools.egg-info
 *.swp
 *~
 .hg*
+requirements.txt
diff --git a/.travis.yml b/.travis.yml
index cb8cae908d..210926df37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ script:
  - env
 
  # update egg_info based on setup.py in checkout
- - rwt -- bootstrap.py
+ - python bootstrap.py
 
  - tox
 
diff --git a/bootstrap.py b/bootstrap.py
index 761b8dfcd2..705a87201b 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,13 +5,18 @@
 egg-info command to flesh out the egg-info directory.
 """
 
-__requires__ = ['packaging', 'six', 'appdirs']
-
 import os
+import io
+import re
+import contextlib
+import tempfile
+import shutil
 import sys
 import textwrap
 import subprocess
 
+import pip
+
 minimal_egg_info = textwrap.dedent("""
     [distutils.commands]
     egg_info = setuptools.command.egg_info:egg_info
@@ -54,6 +59,35 @@ def run_egg_info():
     subprocess.check_call(cmd)
 
 
+def gen_deps():
+    with io.open('setup.py', encoding='utf-8') as strm:
+        text = strm.read()
+    pattern = r'install_requires=\[(.*?)\]'
+    match = re.search(pattern, text, flags=re.M|re.DOTALL)
+    reqs = eval(match.group(1).replace('\n', ''))
+    with io.open('requirements.txt', 'w', encoding='utf-8') as reqs_file:
+        reqs_file.write('\n'.join(reqs))
+
+
+@contextlib.contextmanager
+def install_deps():
+    "Just in time make the deps available"
+    gen_deps()
+    tmpdir = tempfile.mkdtemp()
+    args = [
+        'install',
+        '-t', tmpdir,
+        '-r', 'requirements.txt',
+    ]
+    pip.main(args)
+    os.environ['PYTHONPATH'] = tmpdir
+    try:
+        yield tmpdir
+    finally:
+        shutil.rmtree(tmpdir)
+
+
 if __name__ == '__main__':
     ensure_egg_info()
-    run_egg_info()
+    with install_deps():
+        run_egg_info()

From 377e4b4f6a8a1a4b2f07f6d45f9641e733c61452 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 23:13:29 -0500
Subject: [PATCH 6436/8469] Also have tox reference the generated
 requirements.txt

---
 tox.ini | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5fcad763b4..6b43dcd80b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,7 @@
 [testenv]
 deps=
     -rtests/requirements.txt
-    packaging
-    appdirs
-    six
+    -rrequirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
 commands=py.test {posargs:-rsx}
 usedevelop=True

From 767dcea007cf19b016c33f036f750c87b5876d1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Jan 2017 23:15:38 -0500
Subject: [PATCH 6437/8469] Use unicode literals

---
 bootstrap.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap.py b/bootstrap.py
index 705a87201b..f7644f12aa 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,6 +5,8 @@
 egg-info command to flesh out the egg-info directory.
 """
 
+from __future__ import unicode_literals
+
 import os
 import io
 import re
@@ -47,7 +49,8 @@ def build_egg_info():
     """
 
     os.mkdir('setuptools.egg-info')
-    with open('setuptools.egg-info/entry_points.txt', 'w') as ep:
+    filename = 'setuptools.egg-info/entry_points.txt'
+    with io.open(filename, 'w', encoding='utf-8') as ep:
         ep.write(minimal_egg_info)
 
 

From 80d29ed93d0ee3ea95ea921ae38e59bb86d4f627 Mon Sep 17 00:00:00 2001
From: Patrick Lannigan <p.lannigan@gmail.com>
Date: Mon, 2 Jan 2017 08:15:40 -0500
Subject: [PATCH 6438/8469] Document use of environment markers in
 extras_require

---
 docs/setuptools.txt | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2f78b133de..94ee09ad1a 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -769,6 +769,38 @@ so that Package B doesn't have to remove the ``[PDF]`` from its requirement
 specifier.
 
 
+.. _Platform Specific Dependencies:
+
+
+Declaring platform specific dependencies
+----------------------------------------
+
+Sometimes a project might require a dependency to run on a specific platform.
+This could to a package that back ports a module so that it can be used in
+older python versions.  Or it could be a package that is required to run on a
+specific operating system.  This will allow a project to work on multiple
+different platforms without installing dependencies that are not required for
+a platform that is installing the project.
+
+For example, here is a project that uses the ``enum`` module and ``pywin32``::
+
+    setup(
+        name="Project",
+        ...
+        extras_require={
+            ':python_version < "3.4"': ["enum34"],
+            ':sys_platform == "win32"': ["pywin32 >= 1.0"]
+        }
+    )
+
+Since the ``enum`` module was added in python 3.4, it should only be installed
+if the python version is earlier.  Since ``pywin32`` will only be used on
+windows, it should only be installed when the operating system is Windows.
+Specifying version requirements for the dependencies is supported as normal.
+
+The environmental markers that may be used for testing platform types are
+detailed in PEP 496.
+
 Including Data Files
 ====================
 

From dc8683bd8e8600680a7581fd3a2d34ba8f1fa0ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jan 2017 09:29:42 -0500
Subject: [PATCH 6439/8469] More aggressively remove references to
 'tag_svn_revision' option in egg_info. Ref #619.

---
 setup.cfg                      |  2 +-
 setuptools/command/egg_info.py | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e46be52a14..406aa4f91f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,7 +8,7 @@ tag_build = .post
 tag_date = 1
 
 [aliases]
-clean_egg_info = egg_info -RDb ''
+clean_egg_info = egg_info -Db ''
 release = clean_egg_info sdist bdist_wheel
 source = register sdist binary
 binary = bdist_egg upload --show-response
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 98a8730008..e3578074d0 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -121,18 +121,13 @@ class egg_info(Command):
     user_options = [
         ('egg-base=', 'e', "directory containing .egg-info directories"
                            " (default: top of the source tree)"),
-        ('tag-svn-revision', 'r',
-         "Add subversion revision ID to version number"),
         ('tag-date', 'd', "Add date stamp (e.g. 20050528) to version number"),
         ('tag-build=', 'b', "Specify explicit tag to add to version number"),
-        ('no-svn-revision', 'R',
-         "Don't add subversion revision ID [default]"),
         ('no-date', 'D', "Don't include date stamp [default]"),
     ]
 
-    boolean_options = ['tag-date', 'tag-svn-revision']
+    boolean_options = ['tag-date']
     negative_opt = {
-        'no-svn-revision': 'tag-svn-revision',
         'no-date': 'tag-date',
     }
 
@@ -148,8 +143,8 @@ def initialize_options(self):
 
     def save_version_info(self, filename):
         """
-        Materialize the values of svn_revision and date into the
-        build tag. Install these keys in a deterministic order
+        Materialize the value of date into the
+        build tag. Install build keys in a deterministic order
         to avoid arbitrary reordering on subsequent builds.
         """
         # python 2.6 compatibility

From b848627d17328cab9bdce4fabd314c76d5f7d96e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jan 2017 09:56:47 -0500
Subject: [PATCH 6440/8469] Add a no-op property for 'tag_svn_revision' to
 suppress errors when distutils attempts to detect and set these values based
 on settings in setup.cfg as found in sdists built by earlier versions of
 setuptools. Ref #619.

---
 setuptools/command/egg_info.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e3578074d0..ca6a4348af 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -141,6 +141,18 @@ def initialize_options(self):
         self.broken_egg_info = False
         self.vtags = None
 
+    ####################################
+    # allow the 'tag_svn_revision' to be detected and
+    # set, supporting sdists built on older Setuptools.
+    @property
+    def tag_svn_revision(self):
+        pass
+
+    @tag_svn_revision.setter
+    def tag_svn_revision(self, value):
+        pass
+    ####################################
+
     def save_version_info(self, filename):
         """
         Materialize the value of date into the

From 76e888d72b178880d62a731da52b9a3a51832a4f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jan 2017 10:16:27 -0500
Subject: [PATCH 6441/8469] Remove references to SVN sandbox.

---
 docs/setuptools.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2f78b133de..7dcbb6f2c9 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -59,14 +59,6 @@ Feature Highlights:
 * Create extensible applications and frameworks that automatically discover
   extensions, using simple "entry points" declared in a project's setup script.
 
-In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `Python SVN sandbox`_, and in-development versions of the
-`0.6 branch`_ are available as well.
-
-.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-
-.. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
-
 .. contents:: **Table of Contents**
 
 .. _ez_setup.py: `bootstrap module`_

From 8db1d2d4f72f347f3fd5a9d8cf4a225173251318 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 2 Jan 2017 10:22:37 -0500
Subject: [PATCH 6442/8469] Remove documentation about tag-svn-revision. Ref
 #619.

---
 docs/setuptools.txt | 102 +++-----------------------------------------
 1 file changed, 7 insertions(+), 95 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7dcbb6f2c9..458ad59b6b 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1414,10 +1414,6 @@ egg distributions by adding one or more of the following to the project's
   manually-specified post-release tag, such as a build or revision number
   (``--tag-build=STRING, -bSTRING``)
 
-* A "last-modified revision number" string generated automatically from
-  Subversion's metadata (assuming your project is being built from a Subversion
-  "working copy")  (``--tag-svn-revision, -r``)
-
 * An 8-character representation of the build date (``--tag-date, -d``), as
   a postrelease tag
 
@@ -1549,68 +1545,6 @@ this::
 in order to check out the in-development version of ``projectname``.
 
 
-Managing "Continuous Releases" Using Subversion
------------------------------------------------
-
-If you expect your users to track in-development versions of your project via
-Subversion, there are a few additional steps you should take to ensure that
-things work smoothly with EasyInstall.  First, you should add the following
-to your project's ``setup.cfg`` file:
-
-.. code-block:: ini
-
-    [egg_info]
-    tag_build = .dev
-    tag_svn_revision = 1
-
-This will tell ``setuptools`` to generate package version numbers like
-``1.0a1.dev-r1263``, which will be considered to be an *older* release than
-``1.0a1``.  Thus, when you actually release ``1.0a1``, the entire egg
-infrastructure (including ``setuptools``, ``pkg_resources`` and EasyInstall)
-will know that ``1.0a1`` supersedes any interim snapshots from Subversion, and
-handle upgrades accordingly.
-
-(Note: the project version number you specify in ``setup.py`` should always be
-the *next* version of your software, not the last released version.
-Alternately, you can leave out the ``tag_build=.dev``, and always use the
-*last* release as a version number, so that your post-1.0 builds are labelled
-``1.0-r1263``, indicating a post-1.0 patchlevel.  Most projects so far,
-however, seem to prefer to think of their project as being a future version
-still under development, rather than a past version being patched.  It is of
-course possible for a single project to have both situations, using
-post-release numbering on release branches, and pre-release numbering on the
-trunk.  But you don't have to make things this complex if you don't want to.)
-
-Commonly, projects releasing code from Subversion will include a PyPI link to
-their checkout URL (as described in the previous section) with an
-``#egg=projectname-dev`` suffix.  This allows users to request EasyInstall
-to download ``projectname==dev`` in order to get the latest in-development
-code.  Note that if your project depends on such in-progress code, you may wish
-to specify your ``install_requires`` (or other requirements) to include
-``==dev``, e.g.:
-
-.. code-block:: python
-
-    install_requires=["OtherProject>=0.2a1.dev-r143,==dev"]
-
-The above example says, "I really want at least this particular development
-revision number, but feel free to follow and use an ``#egg=OtherProject-dev``
-link if you find one".  This avoids the need to have actual source or binary
-distribution snapshots of in-development code available, just to be able to
-depend on the latest and greatest a project has to offer.
-
-A final note for Subversion development: if you are using SVN revision tags
-as described in this section, it's a good idea to run ``setup.py develop``
-after each Subversion checkin or update, because your project's version number
-will be changing, and your script wrappers need to be updated accordingly.
-
-Also, if the project's requirements have changed, the ``develop`` command will
-take care of fetching the updated dependencies, building changed extensions,
-etc.  Be sure to also remind any of your users who check out your project
-from Subversion that they need to run ``setup.py develop`` after every update
-in order to keep their checkout completely in sync.
-
-
 Making "Official" (Non-Snapshot) Releases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1624,18 +1558,18 @@ tagging the release, so the trunk will still produce development snapshots.
 Alternately, if you are not branching for releases, you can override the
 default version options on the command line, using something like::
 
-    python setup.py egg_info -RDb "" sdist bdist_egg register upload
+    python setup.py egg_info -Db "" sdist bdist_egg register upload
 
-The first part of this command (``egg_info -RDb ""``) will override the
+The first part of this command (``egg_info -Db ""``) will override the
 configured tag information, before creating source and binary eggs, registering
 the project with PyPI, and uploading the files.  Thus, these commands will use
-the plain version from your ``setup.py``, without adding the Subversion
-revision number or build designation string.
+the plain version from your ``setup.py``, without adding the build designation
+string.
 
 Of course, if you will be doing this a lot, you may wish to create a personal
 alias for this operation, e.g.::
 
-    python setup.py alias -u release egg_info -RDb ""
+    python setup.py alias -u release egg_info -Db ""
 
 You can then use it like this::
 
@@ -1695,8 +1629,7 @@ the command line supplies its expansion.  For example, this command defines
 a sitewide alias called "daily", that sets various ``egg_info`` tagging
 options::
 
-    setup.py alias --global-config daily egg_info --tag-svn-revision \
-        --tag-build=development
+    setup.py alias --global-config daily egg_info --tag-build=development
 
 Once the alias is defined, it can then be used with other setup commands,
 e.g.::
@@ -1706,7 +1639,7 @@ e.g.::
     setup.py daily sdist bdist_egg  # generate both
 
 The above commands are interpreted as if the word ``daily`` were replaced with
-``egg_info --tag-svn-revision --tag-build=development``.
+``egg_info --tag-build=development``.
 
 Note that setuptools will expand each alias *at most once* in a given command
 line.  This serves two purposes.  First, if you accidentally create an alias
@@ -1993,27 +1926,6 @@ added in the following order:
     it on the command line using ``-b ""`` or ``--tag-build=""`` as an argument
     to the ``egg_info`` command.
 
-``--tag-svn-revision, -r``
-    If the current directory is a Subversion checkout (i.e. has a ``.svn``
-    subdirectory, this appends a string of the form "-rNNNN" to the project's
-    version string, where NNNN is the revision number of the most recent
-    modification to the current directory, as obtained from the ``svn info``
-    command.
-
-    If the current directory is not a Subversion checkout, the command will
-    look for a ``PKG-INFO`` file instead, and try to find the revision number
-    from that, by looking for a "-rNNNN" string at the end of the version
-    number.  (This is so that building a package from a source distribution of
-    a Subversion snapshot will produce a binary with the correct version
-    number.)
-
-    If there is no ``PKG-INFO`` file, or the version number contained therein
-    does not end with ``-r`` and a number, then ``-r0`` is used.
-
-``--no-svn-revision, -R``
-    Don't include the Subversion revision in the version number.  This option
-    is included so you can override a default setting put in ``setup.cfg``.
-
 ``--tag-date, -d``
     Add a date stamp of the form "-YYYYMMDD" (e.g. "-20050528") to the
     project's version number.

From 78339bc0d77649f47be496879e4a5f768657d229 Mon Sep 17 00:00:00 2001
From: Patrick Lannigan <p.lannigan@gmail.com>
Date: Mon, 2 Jan 2017 16:40:22 -0500
Subject: [PATCH 6443/8469] Have documentation link to referenced PEP.

---
 docs/setuptools.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 94ee09ad1a..5dd30b13fe 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -799,7 +799,9 @@ windows, it should only be installed when the operating system is Windows.
 Specifying version requirements for the dependencies is supported as normal.
 
 The environmental markers that may be used for testing platform types are
-detailed in PEP 496.
+detailed in `PEP 496`_.
+
+.. _PEP 496: https://www.python.org/dev/peps/pep-0496/
 
 Including Data Files
 ====================

From 37a48e9a7a5ae5ac770b05b8f1ff52bdceda3cae Mon Sep 17 00:00:00 2001
From: Patrick Lannigan <p.lannigan@gmail.com>
Date: Mon, 2 Jan 2017 21:21:01 -0500
Subject: [PATCH 6444/8469] Document use of install_requires with corrected PEP

PEP 496 is a draft that was never accepted, so it does not have the
correct information.
---
 docs/setuptools.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5dd30b13fe..601628b4c8 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -787,21 +787,21 @@ For example, here is a project that uses the ``enum`` module and ``pywin32``::
     setup(
         name="Project",
         ...
-        extras_require={
-            ':python_version < "3.4"': ["enum34"],
-            ':sys_platform == "win32"': ["pywin32 >= 1.0"]
-        }
+        install_requires=[
+            'enum34;python_version<"3.4"',
+            'pywin32 >= 1.0;platform_system=="Windows"'
+        ]
     )
 
-Since the ``enum`` module was added in python 3.4, it should only be installed
+Since the ``enum`` module was added in Python 3.4, it should only be installed
 if the python version is earlier.  Since ``pywin32`` will only be used on
 windows, it should only be installed when the operating system is Windows.
 Specifying version requirements for the dependencies is supported as normal.
 
 The environmental markers that may be used for testing platform types are
-detailed in `PEP 496`_.
+detailed in `PEP 508`_.
 
-.. _PEP 496: https://www.python.org/dev/peps/pep-0496/
+.. _PEP 508: https://www.python.org/dev/peps/pep-0508/
 
 Including Data Files
 ====================

From e9f0e6f16b46d084bdf92606cd0217b3f12ed25a Mon Sep 17 00:00:00 2001
From: David Szotten <davidszotten@gmail.com>
Date: Thu, 5 Jan 2017 11:47:09 +0000
Subject: [PATCH 6445/8469] strip trailing slash from package_dir before
 counting slashes

---
 setuptools/command/develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index aa82f95920..ca05d1e30b 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -79,7 +79,7 @@ def finalize_options(self):
             project_name=ei.egg_name
         )
 
-        p = self.egg_base.replace(os.sep, '/')
+        p = self.egg_base.replace(os.sep, '/').rstrip('/')
         if p != os.curdir:
             p = '../' * (p.count('/') + 1)
         self.setup_path = p

From bb2251bae83b072cd972f6865198d70272e7a824 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Jan 2017 13:08:56 -0500
Subject: [PATCH 6446/8469] Include tox.ini in the sdist. Ref #904.

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index e25a5ea577..325bbed82e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,3 +11,4 @@ include LICENSE
 include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini
+include tox.ini

From 93d8715bff84449b62c2439dfa5845a9d12006e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Jan 2017 13:10:31 -0500
Subject: [PATCH 6447/8469] Remove pytest alias. Use tox to run tests. Ref
 #904.

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 406aa4f91f..74d7e085ca 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,7 +12,6 @@ clean_egg_info = egg_info -Db ''
 release = clean_egg_info sdist bdist_wheel
 source = register sdist binary
 binary = bdist_egg upload --show-response
-test = pytest
 
 [upload]
 repository = https://upload.pypi.org/legacy/

From 9c4d84f53e96b023c79ef54b8092a8c1440212ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Jan 2017 13:19:31 -0500
Subject: [PATCH 6448/8469] Update documentation references from removed
 pythonhosted docs to RTD. Fixes #903.

---
 CHANGES.rst | 10 +++++-----
 README.rst  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 264b939ad8..8c214db3a1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -97,7 +97,7 @@ v30.3.0
 
 * #394 via #862: Added support for `declarative package
   config in a setup.cfg file
-  <http://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files>`_.
+  <https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files>`_.
 
 v30.2.1
 -------
@@ -708,7 +708,7 @@ v20.6.0
   `semver <https://semver.org>`_ precisely.
   The 'v' prefix on version numbers now also allows
   version numbers to be referenced in the changelog,
-  e.g. https://pythonhosted.org/setuptools/history.html#v20-6-0.
+  e.g. http://setuptools.readthedocs.io/en/latest/history.html#v20-6-0.
 
 20.5
 ----
@@ -788,7 +788,7 @@ v20.6.0
 
 * Added support for using passwords from keyring in the upload
   command. See `the upload docs
-  <http://pythonhosted.org/setuptools/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
+  <https://setuptools.readthedocs.io/en/latest/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
   for details.
 
 20.0
@@ -1542,7 +1542,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 ---
 
 * Added a `Developer Guide
-  <https://pythonhosted.org/setuptools/developer-guide.html>`_ to the official
+  <https://setuptools.readthedocs.io/en/latest/developer-guide.html>`_ to the official
   documentation.
 * Some code refactoring and cleanup was done with no intended behavioral
   changes.
@@ -2962,7 +2962,7 @@ easy_install
  * ``setuptools`` now finds its commands, ``setup()`` argument validators, and
    metadata writers using entry points, so that they can be extended by
    third-party packages. See `Creating distutils Extensions
-   <http://pythonhosted.org/setuptools/setuptools.html#creating-distutils-extensions>`_
+   <https://setuptools.readthedocs.io/en/latest/setuptools.html#creating-distutils-extensions>`_
    for more details.
 
  * The vestigial ``depends`` command has been removed. It was never finished
diff --git a/README.rst b/README.rst
index 9cb8758fb5..accaac3c3e 100755
--- a/README.rst
+++ b/README.rst
@@ -126,8 +126,8 @@ Use ``--help`` to get a full options list, but we recommend consulting
 the `EasyInstall manual`_ for detailed instructions, especially `the section
 on custom installation locations`_.
 
-.. _EasyInstall manual: https://pythonhosted.org/setuptools/EasyInstall
-.. _the section on custom installation locations: https://pythonhosted.org/setuptools/EasyInstall#custom-installation-locations
+.. _EasyInstall manual: https://setuptools.readthedocs.io/en/latest/easy_install.html
+.. _the section on custom installation locations: https://setuptools.readthedocs.io/en/latest/easy_install.html#custom-installation-locations
 
 
 Downloads

From 3c182f9f1eea89040fbfc88d1ccbed31ece6a00b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Jan 2017 13:23:43 -0500
Subject: [PATCH 6449/8469] Remove documentation for upload_docs command,
 deprecated in v27.

---
 docs/setuptools.txt | 62 ---------------------------------------------
 1 file changed, 62 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5c72445b25..2a494fca2d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2273,68 +2273,6 @@ password from the keyring.
 
 New in 20.1: Added keyring support.
 
-.. _upload_docs:
-
-``upload_docs`` - Upload package documentation to PyPI
-======================================================
-
-PyPI now supports uploading project documentation to the dedicated URL
-https://pythonhosted.org/<project>/.
-
-The ``upload_docs`` command will create the necessary zip file out of a
-documentation directory and will post to the repository.
-
-Note that to upload the documentation of a project, the corresponding version
-must already be registered with PyPI, using the distutils ``register``
-command -- just like the ``upload`` command.
-
-Assuming there is an ``Example`` project with documentation in the
-subdirectory ``docs``, e.g.::
-
-  Example/
-  |-- example.py
-  |-- setup.cfg
-  |-- setup.py
-  |-- docs
-  |   |-- build
-  |   |   `-- html
-  |   |   |   |-- index.html
-  |   |   |   `-- tips_tricks.html
-  |   |-- conf.py
-  |   |-- index.txt
-  |   `-- tips_tricks.txt
-
-You can simply pass the documentation directory path to the ``upload_docs``
-command::
-
-    python setup.py upload_docs --upload-dir=docs/build/html
-
-If no ``--upload-dir`` is given, ``upload_docs`` will attempt to run the
-``build_sphinx`` command to generate uploadable documentation.
-For the command to become available, `Sphinx <http://sphinx.pocoo.org/>`_
-must be installed in the same environment as distribute.
-
-As with other ``setuptools``-based commands, you can define useful
-defaults in the ``setup.cfg`` of your Python project, e.g.:
-
-.. code-block:: ini
-
-    [upload_docs]
-    upload-dir = docs/build/html
-
-The ``upload_docs`` command has the following options:
-
-``--upload-dir``
-    The directory to be uploaded to the repository.
-
-``--show-response``
-    Display the full response text from server; this is useful for debugging
-    PyPI problems.
-
-``--repository=URL, -r URL``
-    The URL of the repository to upload to.  Defaults to
-    https://pypi.python.org/pypi (i.e., the main PyPI installation).
-
 
 -----------------------------------------
 Configuring setup() using setup.cfg files

From c999a93ca02b2b933384d1d0345505c4ed72f80b Mon Sep 17 00:00:00 2001
From: Elvis Stansvik <elvis.stansvik@orexplore.com>
Date: Sun, 8 Jan 2017 18:24:24 +0100
Subject: [PATCH 6450/8469] Fix broken link in docs/developer-guide.txt

---
 docs/developer-guide.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index c8f51b0208..8a1363808e 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -13,11 +13,11 @@ Recommended Reading
 -------------------
 
 Please read `How to write the perfect pull request
-<http://blog.jaraco.com/2014/04/how-to-write-perfect-pull-request.html>`_
-for some tips on contributing to open source projects. Although the article
-is not authoritative, it was authored by the maintainer of Setuptools, so
-reflects his opinions and will improve the likelihood of acceptance and
-quality of contribution.
+<https://blog.jaraco.com/how-to-write-perfect-pull-request/>`_ for some tips
+on contributing to open source projects. Although the article is not
+authoritative, it was authored by the maintainer of Setuptools, so reflects
+his opinions and will improve the likelihood of acceptance and quality of
+contribution.
 
 ------------------
 Project Management

From bad51fc70140efc0d9fdf5de632ca4798b995752 Mon Sep 17 00:00:00 2001
From: Ilya Kulakov <kulakov.ilya@gmail.com>
Date: Fri, 13 Jan 2017 18:20:28 -0800
Subject: [PATCH 6451/8469] Fix certifi fallback is not used on Windows.

---
 setuptools/ssl_support.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 82f8870ab8..661b6b5238 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -237,14 +237,21 @@ def close(self):
 
 def find_ca_bundle():
     """Return an existing CA bundle path, or None"""
+    ca_bundle_path = None
+
     if os.name == 'nt':
-        return get_win_certfile()
+        ca_bundle_path = get_win_certfile()
     else:
         for cert_path in cert_paths:
             if os.path.isfile(cert_path):
-                return cert_path
-    try:
-        import certifi
-        return certifi.where()
-    except (ImportError, ResolutionError, ExtractionError):
-        return None
+                ca_bundle_path = cert_path
+                break
+
+    if ca_bundle_path is None:
+        try:
+            import certifi
+            ca_bundle_path = certifi.where()
+        except (ImportError, ResolutionError, ExtractionError):
+            pass
+
+    return ca_bundle_path

From 59d325c236500eb5cd8e88e9f13094253d689de7 Mon Sep 17 00:00:00 2001
From: Daniel Nunes <gandaganza@gmail.com>
Date: Sat, 14 Jan 2017 22:05:18 +0000
Subject: [PATCH 6452/8469] Added newer_pairwise_group() convenience function.

---
 setuptools/dep_util.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 setuptools/dep_util.py

diff --git a/setuptools/dep_util.py b/setuptools/dep_util.py
new file mode 100644
index 0000000000..2931c13ec3
--- /dev/null
+++ b/setuptools/dep_util.py
@@ -0,0 +1,23 @@
+from distutils.dep_util import newer_group
+
+# yes, this is was almost entirely copy-pasted from
+# 'newer_pairwise()', this is just another convenience
+# function.
+def newer_pairwise_group(sources_groups, targets):
+    """Walk both arguments in parallel, testing if each source group is newer
+    than its corresponding target. Returns a pair of lists (sources_groups,
+    targets) where sources is newer than target, according to the semantics
+    of 'newer_group()'.
+    """
+    if len(sources_groups) != len(targets):
+        raise ValueError("'sources_group' and 'targets' must be the same length")
+
+    # build a pair of lists (sources_groups, targets) where source is newer
+    n_sources = []
+    n_targets = []
+    for i in range(len(sources_groups)):
+        if newer_group(sources_groups[i], targets[i]):
+            n_sources.append(sources_groups[i])
+            n_targets.append(targets[i])
+
+    return n_sources, n_targets

From a40114a442e18cd29271bd3c37dbfcaf6a2ec817 Mon Sep 17 00:00:00 2001
From: Daniel Nunes <gandaganza@gmail.com>
Date: Sun, 15 Jan 2017 01:36:02 +0000
Subject: [PATCH 6453/8469] Added tests for newer_pairwise_group().

---
 setuptools/tests/test_dep_util.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 setuptools/tests/test_dep_util.py

diff --git a/setuptools/tests/test_dep_util.py b/setuptools/tests/test_dep_util.py
new file mode 100644
index 0000000000..e5027c1020
--- /dev/null
+++ b/setuptools/tests/test_dep_util.py
@@ -0,0 +1,30 @@
+from setuptools.dep_util import newer_pairwise_group
+import os
+import pytest
+
+
+@pytest.fixture
+def groups_target(tmpdir):
+    """Sets up some older sources, a target and newer sources.
+    Returns a 3-tuple in this order.
+    """
+    creation_order = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
+    mtime = 0
+
+    for i in range(len(creation_order)):
+        creation_order[i] = os.path.join(str(tmpdir), creation_order[i])
+        with open(creation_order[i], 'w'):
+            pass
+
+        # make sure modification times are sequential
+        os.utime(creation_order[i], (mtime, mtime))
+        mtime += 1
+
+    return creation_order[:2], creation_order[2], creation_order[3:]
+
+
+def test_newer_pairwise_group(groups_target):
+    older = newer_pairwise_group([groups_target[0]], [groups_target[1]])
+    newer = newer_pairwise_group([groups_target[2]], [groups_target[1]])
+    assert older == ([], [])
+    assert newer == ([groups_target[2]], [groups_target[1]])

From f383c6d24fdb2faf8cbe070ce0983c6480630730 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jan 2017 10:40:37 -0500
Subject: [PATCH 6454/8469] Remove installation instructions from the README
 and instead refer to the Python Packaging User's Guide, which indicates to
 use pip for installing setuptools. Moved Credits to the history section of
 the documentation. Cleaned up hyperlinks.

---
 README.rst       | 240 +++--------------------------------------------
 docs/history.txt |  38 ++++++++
 2 files changed, 49 insertions(+), 229 deletions(-)

diff --git a/README.rst b/README.rst
index accaac3c3e..d8de81896e 100755
--- a/README.rst
+++ b/README.rst
@@ -1,241 +1,23 @@
-===============================
-Installing and Using Setuptools
-===============================
-
-.. contents:: **Table of Contents**
-
-
 .. image:: https://readthedocs.org/projects/setuptools/badge/?version=latest
     :target: https://setuptools.readthedocs.io
 
--------------------------
-Installation Instructions
--------------------------
-
-The recommended way to bootstrap setuptools on any system is to download
-`ez_setup.py`_ and run it using the target Python environment. Different
-operating systems have different recommended techniques to accomplish this
-basic routine, so below are some examples to get you started.
-
-Setuptools requires Python 2.6 or later. To install setuptools
-on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
-<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
-
-The link provided to ez_setup.py is a bookmark to bootstrap script for the
-latest known stable release.
-
-.. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
-
-Windows (Powershell 3 or later)
-===============================
-
-For best results, uninstall previous versions FIRST (see `Uninstalling`_).
-
-Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows
-with PowerShell 3 installed, it's possible to install with one simple
-Powershell command. Start up Powershell and paste this command::
-
-    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python -
-
-.. image:: https://badges.gitter.im/pypa/setuptools.svg
-   :alt: Join the chat at https://gitter.im/pypa/setuptools
-   :target: https://gitter.im/pypa/setuptools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-
-You must start the Powershell with Administrative privileges or you may choose
-to install a user-local installation::
-
-    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python - --user
-
-If you have Python 3.3 or later, you can use the ``py`` command to install to
-different Python versions. For example, to install to Python 3.3 if you have
-Python 2.7 installed::
-
-    > (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 -
-
-The recommended way to install setuptools on Windows is to download
-`ez_setup.py`_ and run it. The script will download the appropriate
-distribution file and install it for you.
-
-Once installation is complete, you will find an ``easy_install`` program in
-your Python ``Scripts`` subdirectory. For simple invocation and best results,
-add this directory to your ``PATH`` environment variable, if it is not already
-present. If you did a user-local install, the ``Scripts`` subdirectory is
-``$env:APPDATA\Python\Scripts``.
-
-
-Windows (simplified)
-====================
-
-For Windows without PowerShell 3 or for installation without a command-line,
-download `ez_setup.py`_ using your preferred web browser or other technique
-and "run" that file.
-
-
-Unix (wget)
-===========
-
-Most Linux distributions come with wget.
-
-Download `ez_setup.py`_ and run it using the target Python version. The script
-will download the appropriate version and install it for you::
-
-    > wget https://bootstrap.pypa.io/ez_setup.py -O - | python
-
-Note that you will may need to invoke the command with superuser privileges to
-install to the system Python::
-
-    > wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python
-
-Alternatively, Setuptools may be installed to a user-local path::
-
-    > wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
-
-Note that on some older systems (noted on Debian 6 and CentOS 5 installations),
-`wget` may refuse to download `ez_setup.py`, complaining that the certificate common name `*.c.ssl.fastly.net`
-does not match the host name `bootstrap.pypa.io`. In addition, the `ez_setup.py` script may then encounter similar problems using
-`wget` internally to download `setuptools-x.y.zip`, complaining that the certificate common name of `www.python.org` does not match the
-host name `pypi.python.org`. Those are known issues, related to a bug in the older versions of `wget`
-(see `Issue 59 <https://bitbucket.org/pypa/pypi/issue/59#comment-5881915>`_). If you happen to encounter them,
-install Setuptools as follows::
-
-    > wget --no-check-certificate https://bootstrap.pypa.io/ez_setup.py
-    > python ez_setup.py --insecure
-
-
-Unix including Mac OS X (curl)
-==============================
+See the `Installation Instructions
+<https://packaging.python.org/installing/>`_ in the Python Packaging
+User's Guide for instructions on installing, upgrading, and uninstalling
+Setuptools.
 
-If your system has curl installed, follow the ``wget`` instructions but
-replace ``wget`` with ``curl`` and ``-O`` with ``-o``. For example::
+The project is `maintained at Github <https://github.com/pypa/setuptools>`_.
 
-    > curl https://bootstrap.pypa.io/ez_setup.py -o - | python
+Questions and comments should be directed to the `distutils-sig
+mailing list <http://mail.python.org/pipermail/distutils-sig/>`_.
+Bug reports and especially tested patches may be
+submitted directly to the `bug tracker
+<https://github.com/pypa/setuptools/issues>`_.
 
 
-Advanced Installation
-=====================
-
-For more advanced installation options, such as installing to custom
-locations or prefixes, download and extract the source
-tarball from `Setuptools on PyPI <https://pypi.python.org/pypi/setuptools>`_
-and run setup.py with any supported distutils and Setuptools options.
-For example::
-
-    setuptools-x.x$ python setup.py install --prefix=/opt/setuptools
-
-Use ``--help`` to get a full options list, but we recommend consulting
-the `EasyInstall manual`_ for detailed instructions, especially `the section
-on custom installation locations`_.
-
-.. _EasyInstall manual: https://setuptools.readthedocs.io/en/latest/easy_install.html
-.. _the section on custom installation locations: https://setuptools.readthedocs.io/en/latest/easy_install.html#custom-installation-locations
-
-
-Downloads
-=========
-
-All setuptools downloads can be found at `the project's home page in the Python
-Package Index`_. Scroll to the very bottom of the page to find the links.
-
-.. _the project's home page in the Python Package Index: https://pypi.python.org/pypi/setuptools
-
-In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `GitHub repo`_, and in-development versions of the
-`0.6 branch`_ are available as well.
-
-.. _GitHub repo: https://github.com/pypa/setuptools/archive/master.tar.gz#egg=setuptools-dev
-.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-
-Uninstalling
-============
-
-On Windows, if Setuptools was installed using an ``.exe`` or ``.msi``
-installer, simply use the uninstall feature of "Add/Remove Programs" in the
-Control Panel.
-
-Otherwise, to uninstall Setuptools or Distribute, regardless of the Python
-version, delete all ``setuptools*`` and ``distribute*`` files and
-directories from your system's ``site-packages`` directory
-(and any other ``sys.path`` directories) FIRST.
-
-If you are upgrading or otherwise plan to re-install Setuptools or Distribute,
-nothing further needs to be done. If you want to completely remove Setuptools,
-you may also want to remove the 'easy_install' and 'easy_install-x.x' scripts
-and associated executables installed to the Python scripts directory.
-
---------------------------------
-Using Setuptools and EasyInstall
---------------------------------
-
-Here are some of the available manuals, tutorials, and other resources for
-learning about Setuptools, Python Eggs, and EasyInstall:
-
-* `The EasyInstall user's guide and reference manual`_
-* `The setuptools Developer's Guide`_
-* `The pkg_resources API reference`_
-* `The Internal Structure of Python Eggs`_
-
-Questions, comments, and bug reports should be directed to the `distutils-sig
-mailing list`_. If you have written (or know of) any tutorials, documentation,
-plug-ins, or other resources for setuptools users, please let us know about
-them there, so this reference list can be updated. If you have working,
-*tested* patches to correct problems or add features, you may submit them to
-the `setuptools bug tracker`_.
-
-.. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
-.. _The Internal Structure of Python Eggs: https://setuptools.readthedocs.io/en/latest/formats.html
-.. _The setuptools Developer's Guide: https://setuptools.readthedocs.io/en/latest/developer-guide.html
-.. _The pkg_resources API reference: https://setuptools.readthedocs.io/en/latest/pkg_resources.html
-.. _The EasyInstall user's guide and reference manual: https://setuptools.readthedocs.io/en/latest/easy_install.html
-.. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-
-
--------
-Credits
--------
-
-* The original design for the ``.egg`` format and the ``pkg_resources`` API was
-  co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
-  version of ``pkg_resources``, and supplied the OS X operating system version
-  compatibility algorithm.
-
-* Ian Bicking implemented many early "creature comfort" features of
-  easy_install, including support for downloading via Sourceforge and
-  Subversion repositories. Ian's comments on the Web-SIG about WSGI
-  application deployment also inspired the concept of "entry points" in eggs,
-  and he has given talks at PyCon and elsewhere to inform and educate the
-  community about eggs and setuptools.
-
-* Jim Fulton contributed time and effort to build automated tests of various
-  aspects of ``easy_install``, and supplied the doctests for the command-line
-  ``.exe`` wrappers on Windows.
-
-* Phillip J. Eby is the seminal author of setuptools, and
-  first proposed the idea of an importable binary distribution format for
-  Python application plug-ins.
-
-* Significant parts of the implementation of setuptools were funded by the Open
-  Source Applications Foundation, to provide a plug-in infrastructure for the
-  Chandler PIM application. In addition, many OSAF staffers (such as Mike
-  "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
-  use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
-
-* Tarek Ziadé is the principal author of the Distribute fork, which
-  re-invigorated the community on the project, encouraged renewed innovation,
-  and addressed many defects.
-
-* Since the merge with Distribute, Jason R. Coombs is the
-  maintainer of setuptools. The project is maintained in coordination with
-  the Python Packaging Authority (PyPA) and the larger Python community.
-
-.. _files:
-
-
----------------
 Code of Conduct
 ---------------
 
 Everyone interacting in the setuptools project's codebases, issue trackers,
 chat rooms, and mailing lists is expected to follow the
-`PyPA Code of Conduct`_.
-
-.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/
+`PyPA Code of Conduct <https://www.pypa.io/en/latest/code-of-conduct/>`_.
diff --git a/docs/history.txt b/docs/history.txt
index 8e217503ba..8fd1dc6538 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -6,3 +6,41 @@ History
 *******
 
 .. include:: ../CHANGES (links).rst
+
+Credits
+*******
+
+* The original design for the ``.egg`` format and the ``pkg_resources`` API was
+  co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
+  version of ``pkg_resources``, and supplied the OS X operating system version
+  compatibility algorithm.
+
+* Ian Bicking implemented many early "creature comfort" features of
+  easy_install, including support for downloading via Sourceforge and
+  Subversion repositories. Ian's comments on the Web-SIG about WSGI
+  application deployment also inspired the concept of "entry points" in eggs,
+  and he has given talks at PyCon and elsewhere to inform and educate the
+  community about eggs and setuptools.
+
+* Jim Fulton contributed time and effort to build automated tests of various
+  aspects of ``easy_install``, and supplied the doctests for the command-line
+  ``.exe`` wrappers on Windows.
+
+* Phillip J. Eby is the seminal author of setuptools, and
+  first proposed the idea of an importable binary distribution format for
+  Python application plug-ins.
+
+* Significant parts of the implementation of setuptools were funded by the Open
+  Source Applications Foundation, to provide a plug-in infrastructure for the
+  Chandler PIM application. In addition, many OSAF staffers (such as Mike
+  "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
+  use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
+
+* Tarek Ziadé is the principal author of the Distribute fork, which
+  re-invigorated the community on the project, encouraged renewed innovation,
+  and addressed many defects.
+
+* Since the merge with Distribute, Jason R. Coombs is the
+  maintainer of setuptools. The project is maintained in coordination with
+  the Python Packaging Authority (PyPA) and the larger Python community.
+

From ded221d756dca6cc1371db698005926cbd13fd05 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jan 2017 10:44:50 -0500
Subject: [PATCH 6455/8469] Update changelog

---
 CHANGES.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8c214db3a1..749184e829 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,15 @@
+v33.1.0
+-------
+
+Installation via pip, as indicated in the `Python Packaging
+User's Guide <https://packaging.python.org/installing/>`_,
+is the officially-supported mechanism for installing
+Setuptools, and this recommendation is now explicit in the
+much more concise README.
+
+Other edits and tweaks were made to the documentation. The
+codebase is unchanged.
+
 v33.0.0
 -------
 

From 7aa463d16c2500652bce12f41cdcd7d1a87eb3a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Jan 2017 10:44:55 -0500
Subject: [PATCH 6456/8469] =?UTF-8?q?Bump=20version:=2033.0.0=20=E2=86=92?=
 =?UTF-8?q?=2033.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 74d7e085ca..4c97dc8a76 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 33.0.0
+current_version = 33.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 8e125fc18e..bfe6e07329 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="33.0.0",
+    version="33.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 118f32deccfd792fde1c856b226406656795de21 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 16 Jan 2017 17:17:51 +0200
Subject: [PATCH 6457/8469] Fix GitHub typo

[CI skip]
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index d8de81896e..2f55bce106 100755
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ See the `Installation Instructions
 User's Guide for instructions on installing, upgrading, and uninstalling
 Setuptools.
 
-The project is `maintained at Github <https://github.com/pypa/setuptools>`_.
+The project is `maintained at GitHub <https://github.com/pypa/setuptools>`_.
 
 Questions and comments should be directed to the `distutils-sig
 mailing list <http://mail.python.org/pipermail/distutils-sig/>`_.

From 71327bd97840e1d1f6d30e6d926767f4a8b1e1ec Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 16 Jan 2017 17:19:00 +0200
Subject: [PATCH 6458/8469] Python 3.6 is out

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b402cf6d9f..047551b98b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
   - "3.6-dev"
   - nightly
   - pypy

From 0084a32c3c16323e159c3f8929de43ab1942203b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 13:57:02 -0500
Subject: [PATCH 6459/8469] Use 3.7-dev as the future candidate.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 047551b98b..ea6c501637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - "3.6-dev"
+  - "3.7-dev"
   - nightly
   - pypy
 env:

From 7f0ff1c9bffbde1b7d5ce760e4f10799c1920f9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 13:58:19 -0500
Subject: [PATCH 6460/8469] Only test ASCII on Python 2.7 and 3.current

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea6c501637..7009cd9d64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,12 @@ python:
   - "3.7-dev"
   - nightly
   - pypy
-env:
- - ""
- - LC_ALL=C LC_CTYPE=C
+matrix:
+  include:
+  - python: 3.6
+    env: LC_ALL=C LC_CTYPE=C
+  - python: 2.7
+    env: LC_ALL=C LC_CTYPE=C
 script:
  - pip install tox
 

From 22f49d83f060b6f3a15c7e1a8dd2c6c373b3ba20 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:00:39 -0500
Subject: [PATCH 6461/8469] I doubt there's any need to test on 3.7-dev if
 we're testing nightly.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7009cd9d64..0683a619e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - "3.7-dev"
   - nightly
   - pypy
 matrix:

From f64c8f72952192655584994da11cdc9d40c54d32 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:04:27 -0500
Subject: [PATCH 6462/8469] Update changelog. Ref #921.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 749184e829..339a0e6dc8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v33.1.1
+-------
+
+* #921: Correct issue where certifi fallback not being
+  reached on Windows.
+
 v33.1.0
 -------
 

From 827c4c365fccad37907688b3518e7d351d3bfc5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:20:39 -0500
Subject: [PATCH 6463/8469] Refactor find_ca_bundle to simplify branching
 logic.

---
 setuptools/ssl_support.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 661b6b5238..2313651f89 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,7 @@
 import atexit
 import re
 
-from setuptools.extern.six.moves import urllib, http_client, map
+from setuptools.extern.six.moves import urllib, http_client, map, filter
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
@@ -237,21 +237,16 @@ def close(self):
 
 def find_ca_bundle():
     """Return an existing CA bundle path, or None"""
-    ca_bundle_path = None
+    extant_cert_paths = filter(os.path.isfile, cert_paths)
+    return (
+        get_win_certfile()
+        or next(extant_cert_paths, None)
+        or _certifi_where()
+    )
 
-    if os.name == 'nt':
-        ca_bundle_path = get_win_certfile()
-    else:
-        for cert_path in cert_paths:
-            if os.path.isfile(cert_path):
-                ca_bundle_path = cert_path
-                break
 
-    if ca_bundle_path is None:
-        try:
-            import certifi
-            ca_bundle_path = certifi.where()
-        except (ImportError, ResolutionError, ExtractionError):
-            pass
-
-    return ca_bundle_path
+def _certifi_where():
+    try:
+        return __import__('certifi').where()
+    except (ImportError, ResolutionError, ExtractionError):
+        pass

From 88c77110867997d171cdee17e4b52e4011e00911 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:25:32 -0500
Subject: [PATCH 6464/8469] Replace global variable serving as an implicit
 cache with an explicit 'once' decorator.

---
 setuptools/ssl_support.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2313651f89..0635c43d29 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -2,6 +2,7 @@
 import socket
 import atexit
 import re
+import functools
 
 from setuptools.extern.six.moves import urllib, http_client, map, filter
 
@@ -204,14 +205,18 @@ def opener_for(ca_bundle=None):
     ).open
 
 
-_wincerts = None
+# from jaraco.functools
+def once(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        if not hasattr(func, 'always_returns'):
+            func.always_returns = func(*args, **kwargs)
+        return func.always_returns
+    return wrapper
 
 
+@once
 def get_win_certfile():
-    global _wincerts
-    if _wincerts is not None:
-        return _wincerts.name
-
     try:
         from wincertstore import CertFile
     except ImportError:

From f024bd4e0ade92953f5dff85364bd12dd06e1e8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:25:46 -0500
Subject: [PATCH 6465/8469] Remove unused import

---
 setuptools/ssl_support.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 0635c43d29..d827d11bfa 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -6,7 +6,6 @@
 
 from setuptools.extern.six.moves import urllib, http_client, map, filter
 
-import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
 
 try:

From 89cbd6c2c6355f0fa99e86394a6d86e1b624950d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:29:59 -0500
Subject: [PATCH 6466/8469] Remove unused parameter

---
 setuptools/ssl_support.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index d827d11bfa..efd22d5fcb 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -222,11 +222,10 @@ def get_win_certfile():
         return None
 
     class MyCertFile(CertFile):
-        def __init__(self, stores=(), certs=()):
+        def __init__(self, stores=()):
             CertFile.__init__(self)
             for store in stores:
                 self.addstore(store)
-            self.addcerts(certs)
             atexit.register(self.close)
 
         def close(self):

From 7b322451271218e3e8f5a207958928268c34e916 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:31:41 -0500
Subject: [PATCH 6467/8469] Rely on namespacing to discriminate between novel
 class and parent.

---
 setuptools/ssl_support.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index efd22d5fcb..af28ca2f6b 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -217,24 +217,24 @@ def wrapper(*args, **kwargs):
 @once
 def get_win_certfile():
     try:
-        from wincertstore import CertFile
+        import wincertstore
     except ImportError:
         return None
 
-    class MyCertFile(CertFile):
+    class CertFile(wincertstore.CertFile):
         def __init__(self, stores=()):
-            CertFile.__init__(self)
+            super(CertFile, self).__init__()
             for store in stores:
                 self.addstore(store)
             atexit.register(self.close)
 
         def close(self):
             try:
-                super(MyCertFile, self).close()
+                super(CertFile, self).close()
             except OSError:
                 pass
 
-    _wincerts = MyCertFile(stores=['CA', 'ROOT'])
+    _wincerts = CertFile(stores=['CA', 'ROOT'])
     return _wincerts.name
 
 

From e316a702071feecc059102e032439e8ca0551c1a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:35:33 -0500
Subject: [PATCH 6468/8469] Simply invoke addstore twice, rather than looping.

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

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index af28ca2f6b..72b18ef266 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -222,10 +222,8 @@ def get_win_certfile():
         return None
 
     class CertFile(wincertstore.CertFile):
-        def __init__(self, stores=()):
+        def __init__(self):
             super(CertFile, self).__init__()
-            for store in stores:
-                self.addstore(store)
             atexit.register(self.close)
 
         def close(self):
@@ -234,7 +232,9 @@ def close(self):
             except OSError:
                 pass
 
-    _wincerts = CertFile(stores=['CA', 'ROOT'])
+    _wincerts = CertFile()
+    _wincerts.addstore('CA')
+    _wincerts.addstore('ROOT')
     return _wincerts.name
 
 

From b9ca305f48b5da7cfe0f831fdc32dc0aa3890035 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:37:02 -0500
Subject: [PATCH 6469/8469] Remove unused imports

---
 setuptools/__init__.py      | 2 +-
 setuptools/namespaces.py    | 1 -
 setuptools/package_index.py | 3 +--
 setuptools/py33compat.py    | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 54577ceded..04f7674082 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filter, filterfalse, map
+from setuptools.extern.six.moves import filter, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 0a889f224a..bd17d9e7c6 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -1,5 +1,4 @@
 import os
-import sys
 from distutils import log
 import itertools
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index d80d43bc79..5c25c9d641 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,10 +17,9 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
-import setuptools
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
-    require, Environment, find_distributions, safe_name, safe_version,
+    Environment, find_distributions, safe_name, safe_version,
     to_filename, Requirement, DEVELOP_DIST,
 )
 from setuptools import ssl_support
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 2588d680cd..af64d5d1e2 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -1,5 +1,4 @@
 import dis
-import code
 import array
 import collections
 

From 552ea0d4a08ad24e06c2aa5b1746e669be1c48f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:50:30 -0500
Subject: [PATCH 6470/8469] Restore setuptools import, falsely identified as an
 unused import by linter.

---
 setuptools/package_index.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5c25c9d641..45fac01a44 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,6 +17,7 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
+import setuptools
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     Environment, find_distributions, safe_name, safe_version,
@@ -47,7 +48,7 @@
 _SOCKET_TIMEOUT = 15
 
 _tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
-user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
+user_agent = _tmpl.format(py_major=sys.version[:3], setuptools=setuptools)
 
 
 def parse_requirement_arg(spec):

From 730834b5c286b5ba2091394339d0759035804eba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 16 Jan 2017 14:53:37 -0500
Subject: [PATCH 6471/8469] =?UTF-8?q?Bump=20version:=2033.1.0=20=E2=86=92?=
 =?UTF-8?q?=2033.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4c97dc8a76..1d45057beb 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 33.1.0
+current_version = 33.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index bfe6e07329..d75cdb3d18 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="33.1.0",
+    version="33.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 336a065df01a4b409f57809a668208d666010a62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 17 Jan 2017 09:44:26 -0500
Subject: [PATCH 6472/8469] Add pyproject.toml per PEP 518 for use by a future
 pip release. Ref #581.

---
 pyproject.toml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..0aa2e1c865
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,9 @@
+[build-system]
+# for Setuptools, its own requirements are build requirements,
+# so keep this in sync with install_requires in setup.py.
+requires = [
+    "wheel",
+    "packaging>=16.8",
+    "six>=1.10.0",
+    "appdirs>=1.4.0",
+]

From 79919e21fd1947749959c977d2bb05645e7829e0 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 17 Jan 2017 22:28:20 +0200
Subject: [PATCH 6473/8469] Update Python versions

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index d75cdb3d18..060c26c2fa 100755
--- a/setup.py
+++ b/setup.py
@@ -145,12 +145,14 @@ def pypi_link(pkg_filename):
         Intended Audience :: Developers
         License :: OSI Approved :: MIT License
         Operating System :: OS Independent
+        Programming Language :: Python :: 2
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
+        Programming Language :: Python :: 3.6
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration

From 9f440c3f7461e5c097705ca0823b316c0c11e2f9 Mon Sep 17 00:00:00 2001
From: Daniel Nunes <gandaganza@gmail.com>
Date: Thu, 19 Jan 2017 22:01:33 +0000
Subject: [PATCH 6474/8469] Added build_clib module and unit tests. Added
 rudimentary dependency system for build_libraries. Added obj_deps and cflags
 keys to build_info dictionary.

---
 setuptools/command/__init__.py      |  2 +-
 setuptools/command/build_clib.py    | 98 +++++++++++++++++++++++++++++
 setuptools/tests/test_build_clib.py | 59 +++++++++++++++++
 3 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/command/build_clib.py
 create mode 100644 setuptools/tests/test_build_clib.py

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index efbe9411c1..c96d33c23d 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst', 'upload_docs', 'upload',
+    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib',
 ]
 
 from distutils.command.bdist import bdist
diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
new file mode 100644
index 0000000000..09caff6ffd
--- /dev/null
+++ b/setuptools/command/build_clib.py
@@ -0,0 +1,98 @@
+import distutils.command.build_clib as orig
+from distutils.errors import DistutilsSetupError
+from distutils import log
+from setuptools.dep_util import newer_pairwise_group
+
+
+class build_clib(orig.build_clib):
+    """
+    Override the default build_clib behaviour to do the following:
+
+    1. Implement a rudimentary timestamp-based dependency system
+       so 'compile()' doesn't run every time.
+    2. Add more keys to the 'build_info' dictionary:
+        * obj_deps - specify dependencies for each object compiled.
+                     this should be a dictionary mapping a key
+                     with the source filename to a list of
+                     dependencies. Use an empty string for global
+                     dependencies.
+        * cflags   - specify a list of additional flags to pass to
+                     the compiler.
+    """
+
+    def build_libraries(self, libraries):
+        for (lib_name, build_info) in libraries:
+            sources = build_info.get('sources')
+            if sources is None or not isinstance(sources, (list, tuple)):
+                raise DistutilsSetupError(
+                       "in 'libraries' option (library '%s'), "
+                       "'sources' must be present and must be "
+                       "a list of source filenames" % lib_name)
+            sources = list(sources)
+
+            log.info("building '%s' library", lib_name)
+
+            # Make sure everything is the correct type.
+            # obj_deps should be a dictionary of keys as sources
+            # and a list/tuple of files that are its dependencies.
+            obj_deps = build_info.get('obj_deps', dict())
+            if not isinstance(obj_deps, dict):
+                raise DistutilsSetupError(
+                       "in 'libraries' option (library '%s'), "
+                       "'obj_deps' must be a dictionary of "
+                       "type 'source: list'" % lib_name)
+            dependencies = []
+
+            # Get the global dependencies that are specified by the '' key.
+            # These will go into every source's dependency list.
+            global_deps = obj_deps.get('', list())
+            if not isinstance(global_deps, (list, tuple)):
+                raise DistutilsSetupError(
+                       "in 'libraries' option (library '%s'), "
+                       "'obj_deps' must be a dictionary of "
+                       "type 'source: list'" % lib_name)
+
+            # Build the list to be used by newer_pairwise_group
+            # each source will be auto-added to its dependencies.
+            for source in sources:
+                src_deps = [source]
+                src_deps.extend(global_deps)
+                extra_deps = obj_deps.get(source, list())
+                if not isinstance(extra_deps, (list, tuple)):
+                    raise DistutilsSetupError(
+                           "in 'libraries' option (library '%s'), "
+                           "'obj_deps' must be a dictionary of "
+                           "type 'source: list'" % lib_name)
+                src_deps.extend(extra_deps)
+                dependencies.append(src_deps)
+
+            expected_objects = self.compiler.object_filenames(
+                    sources,
+                    output_dir=self.build_temp
+                    )
+
+            if newer_pairwise_group(dependencies, expected_objects) != ([], []):
+                # First, compile the source code to object files in the library
+                # directory.  (This should probably change to putting object
+                # files in a temporary build directory.)
+                macros = build_info.get('macros')
+                include_dirs = build_info.get('include_dirs')
+                cflags = build_info.get('cflags')
+                objects = self.compiler.compile(
+                        sources,
+                        output_dir=self.build_temp,
+                        macros=macros,
+                        include_dirs=include_dirs,
+                        extra_postargs=cflags,
+                        debug=self.debug
+                        )
+
+            # Now "link" the object files together into a static library.
+            # (On Unix at least, this isn't really linking -- it just
+            # builds an archive.  Whatever.)
+            self.compiler.create_static_lib(
+                    expected_objects,
+                    lib_name,
+                    output_dir=self.build_clib,
+                    debug=self.debug
+                    )
diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py
new file mode 100644
index 0000000000..7e3d1de9d4
--- /dev/null
+++ b/setuptools/tests/test_build_clib.py
@@ -0,0 +1,59 @@
+import pytest
+import os
+import shutil
+
+from unittest import mock
+from distutils.errors import DistutilsSetupError
+from setuptools.command.build_clib import build_clib
+from setuptools.dist import Distribution
+
+
+class TestBuildCLib:
+    @mock.patch(
+            'setuptools.command.build_clib.newer_pairwise_group'
+            )
+    def test_build_libraries(self, mock_newer):
+        dist = Distribution()
+        cmd = build_clib(dist)
+
+        # this will be a long section, just making sure all
+        # exceptions are properly raised
+        libs = [('example', {'sources': 'broken.c'})]
+        with pytest.raises(DistutilsSetupError):
+            cmd.build_libraries(libs)
+
+        obj_deps = 'some_string'
+        libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})]
+        with pytest.raises(DistutilsSetupError):
+            cmd.build_libraries(libs)
+
+        obj_deps = {'': ''}
+        libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})]
+        with pytest.raises(DistutilsSetupError):
+            cmd.build_libraries(libs)
+
+        obj_deps = {'source.c': ''}
+        libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})]
+        with pytest.raises(DistutilsSetupError):
+            cmd.build_libraries(libs)
+
+        # with that out of the way, let's see if the crude dependency
+        # system works
+        cmd.compiler = mock.MagicMock(spec=cmd.compiler)
+        mock_newer.return_value = ([],[])
+
+        obj_deps = {'': ('global.h',), 'example.c': ('example.h',)}
+        libs = [('example', {'sources': ['example.c'] ,'obj_deps': obj_deps})]
+
+        cmd.build_libraries(libs)
+        assert [['example.c', 'global.h', 'example.h']] in mock_newer.call_args[0]
+        assert not cmd.compiler.compile.called
+        assert cmd.compiler.create_static_lib.call_count == 1
+
+        # reset the call numbers so we can test again
+        cmd.compiler.reset_mock()
+
+        mock_newer.return_value = ''  # anything as long as it's not ([],[])
+        cmd.build_libraries(libs)
+        assert cmd.compiler.compile.call_count == 1
+        assert cmd.compiler.create_static_lib.call_count == 1

From 11676d39c405672270a543bdc32de395b935b869 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 10:08:09 -0500
Subject: [PATCH 6475/8469] Update changelog

---
 CHANGES.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 339a0e6dc8..e7e64fce20 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,25 @@
+v34.0.0
+-------
+
+* #581: Instead of vendoring the growing list of
+  dependencies that Setuptools requires to function,
+  Setuptools now requires these dependencies just like
+  any other project. Unlike other projects, however,
+  Setuptools cannot rely on ``setup_requires`` to
+  demand the dependencies it needs to install because
+  its own machinery would be necessary to pull those
+  dependencies if not present (a bootstrapping problem).
+  As a result, Setuptools no longer supports self upgrade or
+  installation in the general case. Instead, users are
+  directed to use pip to install and upgrade using the
+  ``wheel`` distributions of setuptools.
+
+  Users are welcome to contrive other means to install
+  or upgrade Setuptools using other means, such as
+  pre-installing the Setuptools dependencies with pip
+  or a bespoke bootstrap tool, but such usage is not
+  recommended and is not supported.
+
 v33.1.1
 -------
 

From 97372c1341b79f6d78d823868a1bad9170eb13c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 10:33:33 -0500
Subject: [PATCH 6476/8469] =?UTF-8?q?Bump=20version:=2033.1.1=20=E2=86=92?=
 =?UTF-8?q?=2034.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1d45057beb..3ea4ae7b64 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 33.1.1
+current_version = 34.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 7ad17ac0df..78b9ff329f 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="33.1.1",
+    version="34.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 094862cd6c1683b6a861e8824a96ef74dfd1a8d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 12:01:44 -0500
Subject: [PATCH 6477/8469] Try installing requirements before deploying
 (because the requirements that tox installed aren't available to the Python
 that Travis PyPI uses for deployment). Ref #934.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c30878cd77..7affc0a659 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ script:
 
  - tox
 
+before_deploy:
+  - pip install -r requirements.txt
 deploy:
   provider: pypi
   # Also update server in setup.cfg

From 56274b32724933cd2016488c4e667e86d30572ef Mon Sep 17 00:00:00 2001
From: Hatem Nassrat <hnassrat@gmail.com>
Date: Mon, 23 Jan 2017 18:07:21 +0000
Subject: [PATCH 6478/8469] fixes #935 - allows for glob syntax in graft

---
 setuptools/command/egg_info.py    | 4 +++-
 setuptools/tests/test_manifest.py | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5ab54dc70f..62bf00aaa9 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -429,7 +429,9 @@ def recursive_exclude(self, dir, pattern):
 
     def graft(self, dir):
         """Include all files from 'dir/'."""
-        found = distutils.filelist.findall(dir)
+        found = []
+        for match_dir in glob(dir):
+            found += distutils.filelist.findall(match_dir)
         self.extend(found)
         return bool(found)
 
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index cf39346a18..3b34c88813 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -206,6 +206,15 @@ def test_graft(self):
             l('app/static/app.css'), l('app/static/app.css.map')])
         assert files == self.get_files()
 
+    def test_graft_glob_syntax(self):
+        """Include the whole app/static/ directory."""
+        l = make_local_path
+        self.make_manifest("graft */static")
+        files = default_files | set([
+            l('app/static/app.js'), l('app/static/app.js.map'),
+            l('app/static/app.css'), l('app/static/app.css.map')])
+        assert files == self.get_files()
+
     def test_graft_global_exclude(self):
         """Exclude all *.map files in the project."""
         l = make_local_path

From 8c272f081afc0fb290310eca108a9fa8cab9b44b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 16:58:41 -0500
Subject: [PATCH 6479/8469] Update changelog. Ref #936.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e7e64fce20..0fc87ea759 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v34.0.1
+-------
+
+* #935: Fix glob syntax in graft.
+
 v34.0.0
 -------
 

From 9cb83c3711d737fa3bff56f55e4def8267bae83c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 17:01:33 -0500
Subject: [PATCH 6480/8469] Prefer list comprehension to init/append loop. Ref
 #936.

---
 setuptools/command/egg_info.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 62bf00aaa9..1a6ea9cb57 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -429,9 +429,11 @@ def recursive_exclude(self, dir, pattern):
 
     def graft(self, dir):
         """Include all files from 'dir/'."""
-        found = []
-        for match_dir in glob(dir):
-            found += distutils.filelist.findall(match_dir)
+        found = [
+            item
+            for match_dir in glob(dir)
+            for item in distutils.filelist.findall(match_dir)
+        ]
         self.extend(found)
         return bool(found)
 

From 6d89f362c9657e12fe2500c061e77747305b76e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 23 Jan 2017 17:01:46 -0500
Subject: [PATCH 6481/8469] =?UTF-8?q?Bump=20version:=2034.0.0=20=E2=86=92?=
 =?UTF-8?q?=2034.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3ea4ae7b64..9553081a5d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.0.0
+current_version = 34.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 78b9ff329f..b9d32742a5 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.0.0",
+    version="34.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 992807c6797e5125d2bb9f20aa0f8fe0cc84fdcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Jan 2017 09:38:37 -0500
Subject: [PATCH 6482/8469] Update changelog to give some direction when pip is
 too old. Fixes #940.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0fc87ea759..407995d2bd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -25,6 +25,13 @@ v34.0.0
   or a bespoke bootstrap tool, but such usage is not
   recommended and is not supported.
 
+  As discovered in #940, not all versions of pip will
+  successfully install Setuptools from its pre-built
+  wheel. If you encounter issues with "No module named
+  six" or "No module named packaging", especially
+  following a line "Running setup.py egg_info for package
+  setuptools", then your pip is not new enough.
+
 v33.1.1
 -------
 

From 997b4351f8459622c203eb1b274fee7a73980ce6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Jan 2017 09:54:19 -0500
Subject: [PATCH 6483/8469] Update changelog. Ref #883.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 407995d2bd..05a4175aa8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.0.2
+-------
+
+* #882: Ensure extras are honored when building the
+  working set.
+
 v34.0.1
 -------
 

From 322472e4ffdc03901be1f584a548b00f1372037d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Jan 2017 10:13:24 -0500
Subject: [PATCH 6484/8469] Extract staticmethod for resolving setup path

---
 setuptools/command/develop.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 1489de9e34..97708ba33f 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -79,15 +79,28 @@ def finalize_options(self):
             project_name=ei.egg_name
         )
 
-        p = self.egg_base.replace(os.sep, '/')
-        if p != os.curdir:
-            p = '../' * (p.count('/') + 1)
-        self.setup_path = p
-        p = normalize_path(os.path.join(self.install_dir, self.egg_path, p))
-        if p != normalize_path(os.curdir):
+        self.setup_path = self._resolve_setup_path(
+            self.egg_base,
+            self.install_dir,
+            self.egg_path,
+        )
+
+    @staticmethod
+    def _resolve_setup_path(egg_base, install_dir, egg_path):
+        """
+        Generate a path from egg_base back to '.' where the
+        setup script resides and ensure that path points to the
+        setup path from $install_dir/$egg_path.
+        """
+        path_to_setup = egg_base.replace(os.sep, '/')
+        if path_to_setup != os.curdir:
+            path_to_setup = '../' * (path_to_setup.count('/') + 1)
+        resolved = normalize_path(os.path.join(install_dir, egg_path, path_to_setup))
+        if resolved != normalize_path(os.curdir):
             raise DistutilsOptionError(
                 "Can't get a consistent path to setup script from"
-                " installation directory", p, normalize_path(os.curdir))
+                " installation directory", resolved, normalize_path(os.curdir))
+        return path_to_setup
 
     def install_for_development(self):
         if six.PY3 and getattr(self.distribution, 'use_2to3', False):

From ba15c9294488451900766898865c024dad2bf2be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Jan 2017 10:23:51 -0500
Subject: [PATCH 6485/8469] Add tests for _resolve_setup_path, including one
 that elicits the error reported in #913.

---
 setuptools/tests/test_develop.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 3b1b1e2d54..54e199c34e 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -122,6 +122,22 @@ def test_console_scripts(self, tmpdir):
         # assert '0.0' not in foocmd_text
 
 
+class TestResolver:
+    """
+    TODO: These tests were written with a minimal understanding
+    of what _resolve_setup_path is intending to do. Come up with
+    more meaningful cases that look like real-world scenarios.
+    """
+    def test_resolve_setup_path_cwd(self):
+        assert develop._resolve_setup_path('.', '.', '.') == '.'
+
+    def test_resolve_setup_path_one_dir(self):
+        assert develop._resolve_setup_path('pkgs', '.', 'pkgs') == '../'
+
+    def test_resolve_setup_path_one_dir_trailing_slash(self):
+        assert develop._resolve_setup_path('pkgs/', '.', 'pkgs') == '../'
+
+
 class TestNamespaces:
 
     @staticmethod

From 3469f8bcbcde1085baa4c9cde9aad9020acee3f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 24 Jan 2017 10:28:46 -0500
Subject: [PATCH 6486/8469] =?UTF-8?q?Bump=20version:=2034.0.1=20=E2=86=92?=
 =?UTF-8?q?=2034.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9553081a5d..928c37b5bf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.0.1
+current_version = 34.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b9d32742a5..41a8df3bcc 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.0.1",
+    version="34.0.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 5a028a7061f37868133d2951ca284d34e253484d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Jan 2017 10:32:59 -0500
Subject: [PATCH 6487/8469] Update changelog to reflect additional issue
 revealed in pypa/pip#4253.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 601aefbaf1..3fa2b76b1b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -40,6 +40,12 @@ v34.0.0
   following a line "Running setup.py egg_info for package
   setuptools", then your pip is not new enough.
 
+  There's an additional issue in pip where setuptools
+  is upgraded concurrently with other source packages,
+  described in pip #4253. The proposed workaround is to
+  always upgrade Setuptools first prior to upgrading
+  other packages that would upgrade Setuptools.
+
 v33.1.1
 -------
 

From edfa86809c0010caaa24b65c0e84c8467ba43b2b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jan 2017 09:41:09 -0500
Subject: [PATCH 6488/8469] Loosen restriction on the version of six required.
 Fixes #947.

---
 CHANGES.rst | 7 +++++++
 setup.py    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3fa2b76b1b..3dfcfc58af 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v34.0.3
+-------
+
+* #947: Loosen restriction on the version of six required,
+  restoring compatibility with environments relying on
+  six 1.6.0 and later.
+
 v34.0.2
 -------
 
diff --git a/setup.py b/setup.py
index 41a8df3bcc..d89adfea96 100755
--- a/setup.py
+++ b/setup.py
@@ -164,7 +164,7 @@ def pypi_link(pkg_filename):
     python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*',
     install_requires=[
         'packaging>=16.8',
-        'six>=1.10.0',
+        'six>=1.6.0',
         'appdirs>=1.4.0',
     ],
     extras_require={

From 1e7fe0df079ec9a508442fd08c94c60ea8a87126 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jan 2017 09:41:14 -0500
Subject: [PATCH 6489/8469] =?UTF-8?q?Bump=20version:=2034.0.2=20=E2=86=92?=
 =?UTF-8?q?=2034.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 928c37b5bf..b37857b79a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.0.2
+current_version = 34.0.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index d89adfea96..8ccaeaec9b 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.0.2",
+    version="34.0.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From ab76ea7987af0a196147195eb6adfa8347baf59c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jan 2017 20:21:03 -0500
Subject: [PATCH 6490/8469] Update changelog. Ref #930.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3dfcfc58af..4058e23be3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.1.0
+-------
+
+* #930: ``build_info`` now accepts two new parameters
+  to optimize and customize the building of C libraries.
+
 v34.0.3
 -------
 

From c0b93651405c1e79f3f49decfc97bc072641b2b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 28 Jan 2017 21:05:09 -0500
Subject: [PATCH 6491/8469] =?UTF-8?q?Bump=20version:=2034.0.3=20=E2=86=92?=
 =?UTF-8?q?=2034.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b37857b79a..be162bbf29 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.0.3
+current_version = 34.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 8ccaeaec9b..88795a2313 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.0.3",
+    version="34.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 90e95f2367a2325dbf29e5a7a92ef483806ae7b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 30 Jan 2017 14:30:55 -0500
Subject: [PATCH 6492/8469] Rely on backports.unittest_mock plugin to make mock
 available on old Python versions. Ref #949.

---
 pkg_resources/tests/test_markers.py   | 5 +----
 setuptools/tests/test_easy_install.py | 5 +----
 setuptools/tests/test_msvc.py         | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 78810b6ef6..9306d5b348 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,7 +1,4 @@
-try:
-    import unittest.mock as mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from pkg_resources import evaluate_marker
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f5c932dac1..b75e6ff2e1 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,15 +14,12 @@
 import distutils.errors
 import io
 import zipfile
+from unittest import mock
 
 import time
 from six.moves import urllib
 
 import pytest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 
 from setuptools import sandbox
 from setuptools.sandbox import run_setup
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index a0c76ea0da..fbeed1d5c5 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -5,12 +5,9 @@
 import os
 import contextlib
 import distutils.errors
+from unittest import mock
 
 import pytest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 
 from . import contexts
 

From 4499210cb8c3c947708479e4bd9d10370aabaf83 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 1 Feb 2017 04:42:48 +0300
Subject: [PATCH 6493/8469] Issue #29218: Remove unused install_misc command

It has been documented as unused since 6c6844a2fa30 (2000-05-25)

Patch by Eric N. Vander Weele.
---
 cmd.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/cmd.py b/cmd.py
index 939f795945..dba3191e58 100644
--- a/cmd.py
+++ b/cmd.py
@@ -401,34 +401,3 @@ def make_file(self, infiles, outfile, func, args,
         # Otherwise, print the "skip" message
         else:
             log.debug(skip_msg)
-
-# XXX 'install_misc' class not currently used -- it was the base class for
-# both 'install_scripts' and 'install_data', but they outgrew it.  It might
-# still be useful for 'install_headers', though, so I'm keeping it around
-# for the time being.
-
-class install_misc(Command):
-    """Common base class for installing some files in a subdirectory.
-    Currently used by install_data and install_scripts.
-    """
-
-    user_options = [('install-dir=', 'd', "directory to install the files to")]
-
-    def initialize_options (self):
-        self.install_dir = None
-        self.outfiles = []
-
-    def _install_dir_from(self, dirname):
-        self.set_undefined_options('install', (dirname, 'install_dir'))
-
-    def _copy_files(self, filelist):
-        self.outfiles = []
-        if not filelist:
-            return
-        self.mkpath(self.install_dir)
-        for f in filelist:
-            self.copy_file(f, self.install_dir)
-            self.outfiles.append(os.path.join(self.install_dir, f))
-
-    def get_outputs(self):
-        return self.outfiles

From e83845ac9b23d3e6e397263aa933372148fc5fee Mon Sep 17 00:00:00 2001
From: smheidrich <smheidrich@weltenfunktion.de>
Date: Thu, 2 Feb 2017 12:32:27 +0100
Subject: [PATCH 6494/8469] Added autosectionlabel Sphinx extension and
 replaced some obsolete links.

---
 docs/conf.py           |  2 +-
 docs/pkg_resources.txt | 10 ++++------
 docs/setuptools.txt    |  7 +++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index c1854ed8a2..fe684271ef 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['rst.linker']
+extensions = ['rst.linker', 'sphinx.ext.autosectionlabel']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index e8412b3371..487320ce89 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -143,10 +143,10 @@ namespace package for Zope Corporation packages, and the ``peak`` namespace
 package for the Python Enterprise Application Kit.
 
 To create a namespace package, you list it in the ``namespace_packages``
-argument to ``setup()``, in your project's ``setup.py``.  (See the `setuptools
-documentation on namespace packages`_ for more information on this.)  Also,
-you must add a ``declare_namespace()`` call in the package's ``__init__.py``
-file(s):
+argument to ``setup()``, in your project's ``setup.py``.  (See the
+:ref:`setuptools documentation on namespace packages <Namespace Packages>` for
+more information on this.)  Also, you must add a ``declare_namespace()`` call
+in the package's ``__init__.py`` file(s):
 
 ``declare_namespace(name)``
     Declare that the dotted package name `name` is a "namespace package" whose
@@ -175,8 +175,6 @@ filesystem and zip importers, you can extend its support to other "importers"
 compatible with PEP 302 using the ``register_namespace_handler()`` function.
 See the section below on `Supporting Custom Importers`_ for details.
 
-.. _setuptools documentation on namespace packages: http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-
 
 ``WorkingSet`` Objects
 ======================
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2a494fca2d..2c197d9835 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -940,14 +940,13 @@ Typically, existing programs manipulate a package's ``__file__`` attribute in
 order to find the location of data files.  However, this manipulation isn't
 compatible with PEP 302-based import hooks, including importing from zip files
 and Python Eggs.  It is strongly recommended that, if you are using data files,
-you should use the `Resource Management API`_ of ``pkg_resources`` to access
+you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
 them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
 you're using setuptools to distribute your package, there is no reason not to
 use its resource management API.  See also `Accessing Package Resources`_ for
 a quick example of converting code that uses ``__file__`` to use
 ``pkg_resources`` instead.
 
-.. _Resource Management API: http://peak.telecommunity.com/DevCenter/PkgResources#resourcemanager-api
 .. _Accessing Package Resources: http://peak.telecommunity.com/DevCenter/PythonEggs#accessing-package-resources
 
 
@@ -959,8 +958,8 @@ location (e.g. ``/usr/share``).  This feature intended to be used for things
 like documentation, example configuration files, and the like.  ``setuptools``
 does not install these data files in a separate location, however.  They are
 bundled inside the egg file or directory, alongside the Python modules and
-packages.  The data files can also be accessed using the `Resource Management
-API`_, by specifying a ``Requirement`` instead of a package name::
+packages.  The data files can also be accessed using the :ref:`ResourceManager
+API`, by specifying a ``Requirement`` instead of a package name::
 
     from pkg_resources import Requirement, resource_filename
     filename = resource_filename(Requirement.parse("MyProject"),"sample.conf")

From ed360af83a547d565aea8c20d3086486c4c9491c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Feb 2017 09:00:35 -0500
Subject: [PATCH 6495/8469] Infer the username using getpass.getuser() if no
 username is resolved from .pypirc.

---
 setuptools/command/upload.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 484baa5a53..a44173a99a 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -10,6 +10,10 @@ class upload(orig.upload):
 
     def finalize_options(self):
         orig.upload.finalize_options(self)
+        self.username = (
+            self.username or
+            getpass.getuser()
+        )
         # Attempt to obtain password. Short circuit evaluation at the first
         # sign of success.
         self.password = (

From 4481a64e2c905f40afa478ebd5418614f322b9b0 Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Thu, 2 Feb 2017 08:54:37 -0600
Subject: [PATCH 6496/8469] Add --skip-dep-install to boostrap.py script

The --skip-dep-install flag skips installation of setuptools dependencies
using pip, delegating this responsibility to other tools.  This can be used to
install setuptools without the need for pip.

closes #950
---
 bootstrap.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index f7644f12aa..1a78931122 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -7,6 +7,7 @@
 
 from __future__ import unicode_literals
 
+import argparse
 import os
 import io
 import re
@@ -17,7 +18,6 @@
 import textwrap
 import subprocess
 
-import pip
 
 minimal_egg_info = textwrap.dedent("""
     [distutils.commands]
@@ -75,6 +75,7 @@ def gen_deps():
 @contextlib.contextmanager
 def install_deps():
     "Just in time make the deps available"
+    import pip
     gen_deps()
     tmpdir = tempfile.mkdtemp()
     args = [
@@ -91,6 +92,15 @@ def install_deps():
 
 
 if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='bootstrap setuptools')
+    parser.add_argument(
+        '--skip-dep-install', action='store_true',
+        help=("Do not attempt to install setuptools dependencies. These "
+              "should be provided in the environment in another manner."))
+    args = parser.parse_args()
     ensure_egg_info()
-    with install_deps():
+    if args.skip_dep_install:
         run_egg_info()
+    else:
+        with install_deps():
+            run_egg_info()

From c182abae2af4cb5e12bb8200995a0026de07f146 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Feb 2017 10:50:47 -0500
Subject: [PATCH 6497/8469] Extract main function

---
 bootstrap.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap.py b/bootstrap.py
index 1a78931122..2ca678ff59 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -91,7 +91,7 @@ def install_deps():
         shutil.rmtree(tmpdir)
 
 
-if __name__ == '__main__':
+def main():
     parser = argparse.ArgumentParser(description='bootstrap setuptools')
     parser.add_argument(
         '--skip-dep-install', action='store_true',
@@ -104,3 +104,6 @@ def install_deps():
     else:
         with install_deps():
             run_egg_info()
+
+
+__name__ == '__main__' and main()

From 174e84e0ce297c38aa11f6618c7d0dad7f1a5acf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Feb 2017 11:01:37 -0500
Subject: [PATCH 6498/8469] In bootstrap, defer installation of dependencies if
 unneeded. Ref #958.

---
 bootstrap.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 2ca678ff59..ad9b067eca 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -7,7 +7,6 @@
 
 from __future__ import unicode_literals
 
-import argparse
 import os
 import io
 import re
@@ -92,16 +91,12 @@ def install_deps():
 
 
 def main():
-    parser = argparse.ArgumentParser(description='bootstrap setuptools')
-    parser.add_argument(
-        '--skip-dep-install', action='store_true',
-        help=("Do not attempt to install setuptools dependencies. These "
-              "should be provided in the environment in another manner."))
-    args = parser.parse_args()
     ensure_egg_info()
-    if args.skip_dep_install:
+    try:
+        # first assume dependencies are present
         run_egg_info()
-    else:
+    except Exception:
+        # but if that fails, try again with dependencies just in time
         with install_deps():
             run_egg_info()
 

From e65c45538fab94008b8066edd134725be8f9c400 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Feb 2017 11:21:38 -0500
Subject: [PATCH 6499/8469] Always generate the dependencies.

---
 bootstrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.py b/bootstrap.py
index ad9b067eca..ee3b53c841 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -75,7 +75,6 @@ def gen_deps():
 def install_deps():
     "Just in time make the deps available"
     import pip
-    gen_deps()
     tmpdir = tempfile.mkdtemp()
     args = [
         'install',
@@ -92,6 +91,7 @@ def install_deps():
 
 def main():
     ensure_egg_info()
+    gen_deps()
     try:
         # first assume dependencies are present
         run_egg_info()

From 7b87e5c5efb0e6f824f4c46a12342a46fe358f14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Feb 2017 13:11:25 -0500
Subject: [PATCH 6500/8469] Require sphinx 1.4 for autosectionlabel plugin. Ref
 #957.

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 0871ed76ae..4be418877c 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1,2 @@
 rst.linker>=1.6.1
+sphinx>=1.4

From 43ba6abb0257dc0a51c9799bd1dea83f0fdc04e0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Feb 2017 15:13:26 -0500
Subject: [PATCH 6501/8469] Always cast to str on Linux and Python 2, let
 rmtree handle the rest. Fixes #953.

---
 CHANGES.rst              | 6 ++++++
 setuptools/py27compat.py | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4058e23be3..bef385bc58 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.1.1
+-------
+
+* #953: More aggressively employ the compatibility issue
+  originally added in #706.
+
 v34.1.0
 -------
 
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index a71a936e10..f0a80a8eda 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -21,7 +21,6 @@ def get_all_headers(message, key):
 
 linux_py2_ascii = (
 	platform.system() == 'Linux' and
-	sys.getfilesystemencoding() == 'ascii' and
 	sys.version_info < (3,)
 )
 

From 3ddf493a251e92f46d5516713f37ac206c735b4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Feb 2017 15:13:45 -0500
Subject: [PATCH 6502/8469] =?UTF-8?q?Bump=20version:=2034.1.0=20=E2=86=92?=
 =?UTF-8?q?=2034.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index be162bbf29..211e5601e8 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.1.0
+current_version = 34.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 88795a2313..85ded0c221 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.1.0",
+    version="34.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 50830de19302234b6741e2d1b853fbf07fbedf95 Mon Sep 17 00:00:00 2001
From: idle sign <idlesign@yandex.ru>
Date: Sat, 4 Feb 2017 15:21:12 +0700
Subject: [PATCH 6503/8469] Dropped support for classifiers subsection handling
 in setup.cfg (see #952).

---
 docs/setuptools.txt             | 10 +++++-----
 setuptools/config.py            | 11 -----------
 setuptools/tests/test_config.py | 13 ++++++++-----
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2c197d9835..f0da6e1d96 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2302,10 +2302,10 @@ boilerplate code in some cases.
     long_description = file: README.rst
     keywords = one, two
     license = BSD 3-Clause License
-
-    [metadata.classifiers]
-    Framework :: Django
-    Programming Language :: Python :: 3.5
+    classifiers =
+        Framework :: Django
+        Programming Language :: Python :: 3
+        Programming Language :: Python :: 3.5
 
     [options]
     zip_safe = False
@@ -2398,7 +2398,7 @@ author                                str
 author_email       author-email       str
 maintainer                            str
 maintainer_email   maintainer-email   str
-classifiers        classifier         file:, section, list-comma
+classifiers        classifier         file:, list-comma
 license                               file:, str
 description        summary            file:, str
 long_description   long-description   file:, str
diff --git a/setuptools/config.py b/setuptools/config.py
index 19b39629c7..39a01f88b7 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -412,17 +412,6 @@ def parsers(self):
             'version': self._parse_version,
         }
 
-    def parse_section_classifiers(self, section_options):
-        """Parses configuration file section.
-
-        :param dict section_options:
-        """
-        classifiers = []
-        for begin, (_, rest) in section_options.items():
-            classifiers.append('%s :%s' % (begin.title(), rest))
-
-        self['classifiers'] = classifiers
-
     def _parse_version(self, value):
         """Parses `version` option value.
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index fa8d523b47..799fb165c2 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -257,6 +257,7 @@ def test_usupported_section(self, tmpdir):
     def test_classifiers(self, tmpdir):
         expected = set([
             'Framework :: Django',
+            'Programming Language :: Python :: 3',
             'Programming Language :: Python :: 3.5',
         ])
 
@@ -269,19 +270,21 @@ def test_classifiers(self, tmpdir):
 
         tmpdir.join('classifiers').write(
             'Framework :: Django\n'
+            'Programming Language :: Python :: 3\n'
             'Programming Language :: Python :: 3.5\n'
         )
 
         with get_dist(tmpdir) as dist:
             assert set(dist.metadata.classifiers) == expected
 
-        # From section.
+        # From list notation
         config.write(
-            '[metadata.classifiers]\n'
-            'Framework :: Django\n'
-            'Programming Language :: Python :: 3.5\n'
+            '[metadata]\n'
+            'classifiers =\n'
+            '    Framework :: Django\n'
+            '    Programming Language :: Python :: 3\n'
+            '    Programming Language :: Python :: 3.5\n'
         )
-
         with get_dist(tmpdir) as dist:
             assert set(dist.metadata.classifiers) == expected
 

From d6ffbbd869548f855e7550cf28686e88b48a1495 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 10 Feb 2017 19:16:37 +0300
Subject: [PATCH 6504/8469] support dist-info distributions inside zip files

---
 pkg_resources/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index e33de0e704..220a7ccc2e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1956,6 +1956,12 @@ def find_eggs_in_zip(importer, path_item, only=False):
             subpath = os.path.join(path_item, subitem)
             for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
                 yield dist
+        elif subitem.lower().endswith('.dist-info'):
+            subpath = os.path.join(path_item, subitem)
+            submeta = EggMetadata(zipimport.zipimporter(subpath))
+            submeta.egg_info = subpath
+            yield Distribution.from_location(path_item, subitem, submeta)
+
 
 
 register_finder(zipimport.zipimporter, find_eggs_in_zip)

From 5470fb8fdf3a65cd18541980bf38e4984b5b1775 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Feb 2017 14:33:49 -0500
Subject: [PATCH 6505/8469] Update changelog. Ref #966.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bef385bc58..8db3c6881b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.2.0
+-------
+
+* #966: Add support for reading dist-info metadata and
+  thus locating Distributions from zip files.
+
 v34.1.1
 -------
 

From 5f235ac251a88a1704166f2e2c12903bafad8adb Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Sat, 11 Feb 2017 12:14:09 +0900
Subject: [PATCH 6506/8469] A local version label starts with '+' sign, as per
 https://www.python.org/dev/peps/pep-0440/#id23

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4236105806..b19893e84e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -30,7 +30,7 @@
 from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
 
-EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')
+EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
 PYPI_MD5 = re.compile(

From f1ca29cc9332a1bb59e250aa280ddc5239b5457e Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Mon, 13 Feb 2017 01:44:17 +0900
Subject: [PATCH 6507/8469] An epoch starts with a number followed by '!'.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b19893e84e..3544dd5460 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -30,7 +30,7 @@
 from setuptools.py26compat import strip_fragment
 from setuptools.py27compat import get_all_headers
 
-EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+]+)$')
+EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
 PYPI_MD5 = re.compile(

From 57fa89ac2d7461995b7191aeab8a027a86d73120 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Mon, 13 Feb 2017 04:35:30 +0900
Subject: [PATCH 6508/8469] Add a test.

---
 setuptools/tests/test_packageindex.py | 42 +++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index d68867c227..1a66394f15 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -181,6 +181,48 @@ def test_local_index(self, tmpdir):
         res = setuptools.package_index.local_open(url)
         assert 'content' in res.read()
 
+    def test_egg_fragment(self):
+        """
+        EGG fragments must comply to PEP 440
+        """
+        epoch = [
+            '',
+            '1!',
+        ]
+        releases = [
+            '0',
+            '0.0',
+            '0.0.0',
+        ]
+        pre = [
+            'a0',
+            'b0',
+            'rc0',
+        ]
+        post = [
+            '.post0'
+        ]
+        dev = [
+            '.dev0',
+        ]
+        local = [
+            ('', ''),
+            ('+ubuntu.0', '+ubuntu.0'),
+            ('+ubuntu-0', '+ubuntu.0'),
+            ('+ubuntu_0', '+ubuntu.0'),
+        ]
+        versions = [
+            [''.join([e, r, p, l]) for l in ll]
+            for e in epoch
+            for r in releases
+            for p in sum([pre, post, dev], [''])
+            for ll in local]
+        for v, vc in versions:
+            dists = list(setuptools.package_index.distros_for_url(
+                'http://example.com/example.zip#egg=example-' + v))
+            assert dists[0].version == ''
+            assert dists[1].version == vc
+
 
 class TestContentCheckers:
     def test_md5(self):

From f33cfac393676065088bf7b704207bdcda0fdd4f Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Mon, 13 Feb 2017 04:42:08 +0900
Subject: [PATCH 6509/8469] Description for the change.

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8db3c6881b..16fcbcc789 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,10 @@ v34.2.0
 * #966: Add support for reading dist-info metadata and
   thus locating Distributions from zip files.
 
+* #968: Allow '+' and '!' in egg fragments
+  so that it can take package names that contain
+  PEP 440 conforming version specifiers.
+
 v34.1.1
 -------
 

From 92c5667e23e0c3a242182f3f869b86bad6d5a0ae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Feb 2017 21:31:50 -0500
Subject: [PATCH 6510/8469] =?UTF-8?q?Bump=20version:=2034.1.1=20=E2=86=92?=
 =?UTF-8?q?=2034.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 211e5601e8..78c3153f14 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.1.1
+current_version = 34.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 85ded0c221..250d7f3925 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.1.1",
+    version="34.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 9406d8fe002605af0f76f2de6c1e2fa1f44522fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Feb 2017 09:53:05 -0500
Subject: [PATCH 6511/8469] Remove redundant test from -nspkg.pth.

If m is non-true, then has_mfs must have been False.
---
 setuptools/namespaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 556b5dd20a..7c24a566c3 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -52,7 +52,7 @@ def _get_target(self):
                 "importlib.util.module_from_spec("
                     "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
                         "[os.path.dirname(p)])))",
-        "m = m or not has_mfs and "
+        "m = m or "
             "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",

From 5c80844b0291ef2b326bcf8cf79e9a69dbd01a6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Feb 2017 11:51:23 -0500
Subject: [PATCH 6512/8469] Release on Python 3.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7affc0a659..adb2f948d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ deploy:
   on:
     tags: true
     all_branches: true
-    python: 3.5
+    python: 3.6
     condition: $LC_ALL != "C"
   user: jaraco
   password:

From 05d47d9fc7a5d1509734a2205fd2c976d22996b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Feb 2017 16:36:16 -0500
Subject: [PATCH 6513/8469] Update changelog. Ref #961.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4058e23be3..efe4488e12 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.3.0
+-------
+
+* #941: In the upload command, if the username is blank,
+  default to ``getpass.getuser()``.
+
 v34.1.0
 -------
 

From 31cbff363a92d872f2daaaf1a24e1f9c0e47ca1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Feb 2017 16:53:15 -0500
Subject: [PATCH 6514/8469] Update version match for issue12885. Ref #971.

---
 CHANGES.rst          | 3 +++
 setuptools/monkey.py | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0e47fe06ae..c6d5556fc0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ v34.3.0
 * #941: In the upload command, if the username is blank,
   default to ``getpass.getuser()``.
 
+* #971: Correct distutils findall monkeypatch to match
+  appropriate versions (namely Python 3.4.6).
+
 v34.2.0
 -------
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 5843c46bbc..da6ecfe78d 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -52,13 +52,7 @@ def patch_all():
     # we can't patch distutils.cmd, alas
     distutils.core.Command = setuptools.Command
 
-    has_issue_12885 = (
-        sys.version_info < (3, 4, 6)
-        or
-        (3, 5) < sys.version_info <= (3, 5, 3)
-        or
-        (3, 6) < sys.version_info
-    )
+    has_issue_12885 = sys.version_info <= (3, 5, 3)
 
     if has_issue_12885:
         # fix findall bug in distutils (http://bugs.python.org/issue12885)

From bb4906b775ac64e0ac4184df4f1b4900be5ddae8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Feb 2017 16:55:20 -0500
Subject: [PATCH 6515/8469] Remove incorrect open bound on 3.6 or later for
 warehouse patch.

---
 setuptools/monkey.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index da6ecfe78d..68fad9dd08 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -66,8 +66,6 @@ def patch_all():
         (3, 4) < sys.version_info < (3, 4, 6)
         or
         (3, 5) < sys.version_info <= (3, 5, 3)
-        or
-        (3, 6) < sys.version_info
     )
 
     if needs_warehouse:

From 4c560effc96a75f337193bc164ad4117b0e333ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 23 Feb 2017 17:00:20 -0500
Subject: [PATCH 6516/8469] =?UTF-8?q?Bump=20version:=2034.2.0=20=E2=86=92?=
 =?UTF-8?q?=2034.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 78c3153f14..9fbe41eeef 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.2.0
+current_version = 34.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 250d7f3925..5d436acec5 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.2.0",
+    version="34.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Feb 2017 11:49:51 -0500
Subject: [PATCH 6517/8469] Revert "Merge pull request #933 from
 pypa/feature/581-depend-not-bundle"

This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing
changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
---
 .gitignore                                    |    1 -
 .travis.yml                                   |    4 +-
 bootstrap.py                                  |   47 +-
 pavement.py                                   |   32 +
 pkg_resources/__init__.py                     |   15 +-
 pkg_resources/_vendor/__init__.py             |    0
 pkg_resources/_vendor/appdirs.py              |  552 ++
 pkg_resources/_vendor/packaging/__about__.py  |   21 +
 pkg_resources/_vendor/packaging/__init__.py   |   14 +
 pkg_resources/_vendor/packaging/_compat.py    |   30 +
 .../_vendor/packaging/_structures.py          |   68 +
 pkg_resources/_vendor/packaging/markers.py    |  301 +
 .../_vendor/packaging/requirements.py         |  127 +
 pkg_resources/_vendor/packaging/specifiers.py |  774 +++
 pkg_resources/_vendor/packaging/utils.py      |   14 +
 pkg_resources/_vendor/packaging/version.py    |  393 ++
 pkg_resources/_vendor/pyparsing.py            | 5696 +++++++++++++++++
 pkg_resources/_vendor/six.py                  |  868 +++
 pkg_resources/_vendor/vendored.txt            |    4 +
 pkg_resources/extern/__init__.py              |   73 +
 pkg_resources/tests/test_pkg_resources.py     |    2 +-
 pkg_resources/tests/test_resources.py         |    4 +-
 pyproject.toml                                |    9 -
 setup.py                                      |   10 +-
 setuptools/__init__.py                        |    2 +-
 setuptools/command/alias.py                   |    2 +-
 setuptools/command/bdist_egg.py               |    2 +-
 setuptools/command/build_ext.py               |    2 +-
 setuptools/command/build_py.py                |    4 +-
 setuptools/command/develop.py                 |    2 +-
 setuptools/command/easy_install.py            |    4 +-
 setuptools/command/egg_info.py                |    6 +-
 setuptools/command/py36compat.py              |    2 +-
 setuptools/command/rotate.py                  |    2 +-
 setuptools/command/sdist.py                   |    2 +-
 setuptools/command/setopt.py                  |    2 +-
 setuptools/command/test.py                    |    4 +-
 setuptools/command/upload_docs.py             |    4 +-
 setuptools/config.py                          |    2 +-
 setuptools/dist.py                            |    6 +-
 setuptools/extension.py                       |    2 +-
 setuptools/extern/__init__.py                 |    4 +
 setuptools/glob.py                            |    2 +-
 setuptools/monkey.py                          |    2 +-
 setuptools/msvc.py                            |    6 +-
 setuptools/namespaces.py                      |    2 +-
 setuptools/package_index.py                   |    4 +-
 setuptools/py33compat.py                      |    2 +-
 setuptools/sandbox.py                         |    4 +-
 setuptools/ssl_support.py                     |    2 +-
 setuptools/tests/__init__.py                  |    2 +-
 setuptools/tests/contexts.py                  |    2 +-
 setuptools/tests/server.py                    |    2 +-
 setuptools/tests/test_archive_util.py         |    2 +-
 setuptools/tests/test_build_ext.py            |    2 +-
 setuptools/tests/test_develop.py              |    2 +-
 setuptools/tests/test_dist_info.py            |    2 +-
 setuptools/tests/test_easy_install.py         |    2 +-
 setuptools/tests/test_egg_info.py             |    2 +-
 setuptools/tests/test_integration.py          |    2 +-
 setuptools/tests/test_manifest.py             |    2 +-
 setuptools/tests/test_packageindex.py         |    4 +-
 setuptools/tests/test_sdist.py                |    4 +-
 setuptools/unicode_utils.py                   |    2 +-
 tests/requirements.txt                        |    1 +
 tests/test_pypi.py                            |    4 +-
 tox.ini                                       |    5 +-
 67 files changed, 9044 insertions(+), 135 deletions(-)
 create mode 100644 pavement.py
 create mode 100644 pkg_resources/_vendor/__init__.py
 create mode 100644 pkg_resources/_vendor/appdirs.py
 create mode 100644 pkg_resources/_vendor/packaging/__about__.py
 create mode 100644 pkg_resources/_vendor/packaging/__init__.py
 create mode 100644 pkg_resources/_vendor/packaging/_compat.py
 create mode 100644 pkg_resources/_vendor/packaging/_structures.py
 create mode 100644 pkg_resources/_vendor/packaging/markers.py
 create mode 100644 pkg_resources/_vendor/packaging/requirements.py
 create mode 100644 pkg_resources/_vendor/packaging/specifiers.py
 create mode 100644 pkg_resources/_vendor/packaging/utils.py
 create mode 100644 pkg_resources/_vendor/packaging/version.py
 create mode 100644 pkg_resources/_vendor/pyparsing.py
 create mode 100644 pkg_resources/_vendor/six.py
 create mode 100644 pkg_resources/_vendor/vendored.txt
 create mode 100644 pkg_resources/extern/__init__.py
 delete mode 100644 pyproject.toml
 create mode 100644 setuptools/extern/__init__.py

diff --git a/.gitignore b/.gitignore
index ec3d0e3522..4d77520f68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@ setuptools.egg-info
 *.swp
 *~
 .hg*
-requirements.txt
diff --git a/.travis.yml b/.travis.yml
index adb2f948d7..56d1c4ef84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,7 @@ matrix:
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
 script:
- # need tox and rwt to get started
- - pip install tox rwt
+ - pip install tox
 
  # Output the env, to verify behavior
  - env
@@ -24,6 +23,7 @@ script:
  # update egg_info based on setup.py in checkout
  - python bootstrap.py
 
+ #- python -m tox
  - tox
 
 before_deploy:
diff --git a/bootstrap.py b/bootstrap.py
index ee3b53c841..24d7093c00 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,14 +5,7 @@
 egg-info command to flesh out the egg-info directory.
 """
 
-from __future__ import unicode_literals
-
 import os
-import io
-import re
-import contextlib
-import tempfile
-import shutil
 import sys
 import textwrap
 import subprocess
@@ -48,8 +41,7 @@ def build_egg_info():
     """
 
     os.mkdir('setuptools.egg-info')
-    filename = 'setuptools.egg-info/entry_points.txt'
-    with io.open(filename, 'w', encoding='utf-8') as ep:
+    with open('setuptools.egg-info/entry_points.txt', 'w') as ep:
         ep.write(minimal_egg_info)
 
 
@@ -61,44 +53,9 @@ def run_egg_info():
     subprocess.check_call(cmd)
 
 
-def gen_deps():
-    with io.open('setup.py', encoding='utf-8') as strm:
-        text = strm.read()
-    pattern = r'install_requires=\[(.*?)\]'
-    match = re.search(pattern, text, flags=re.M|re.DOTALL)
-    reqs = eval(match.group(1).replace('\n', ''))
-    with io.open('requirements.txt', 'w', encoding='utf-8') as reqs_file:
-        reqs_file.write('\n'.join(reqs))
-
-
-@contextlib.contextmanager
-def install_deps():
-    "Just in time make the deps available"
-    import pip
-    tmpdir = tempfile.mkdtemp()
-    args = [
-        'install',
-        '-t', tmpdir,
-        '-r', 'requirements.txt',
-    ]
-    pip.main(args)
-    os.environ['PYTHONPATH'] = tmpdir
-    try:
-        yield tmpdir
-    finally:
-        shutil.rmtree(tmpdir)
-
-
 def main():
     ensure_egg_info()
-    gen_deps()
-    try:
-        # first assume dependencies are present
-        run_egg_info()
-    except Exception:
-        # but if that fails, try again with dependencies just in time
-        with install_deps():
-            run_egg_info()
+    run_egg_info()
 
 
 __name__ == '__main__' and main()
diff --git a/pavement.py b/pavement.py
new file mode 100644
index 0000000000..f85617d4fe
--- /dev/null
+++ b/pavement.py
@@ -0,0 +1,32 @@
+import re
+
+from paver.easy import task, path as Path
+import pip
+
+
+def remove_all(paths):
+    for path in paths:
+        path.rmtree() if path.isdir() else path.remove()
+
+
+@task
+def update_vendored():
+    vendor = Path('pkg_resources/_vendor')
+    # pip uninstall doesn't support -t, so do it manually
+    remove_all(vendor.glob('packaging*'))
+    remove_all(vendor.glob('six*'))
+    remove_all(vendor.glob('pyparsing*'))
+    remove_all(vendor.glob('appdirs*'))
+    install_args = [
+        'install',
+        '-r', str(vendor / 'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    packaging = vendor / 'packaging'
+    for file in packaging.glob('*.py'):
+        text = file.text()
+        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
+        file.write_text(text)
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 220a7ccc2e..2ed07c3dfe 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -45,8 +45,8 @@
     # Python 3.2 compatibility
     import imp as _imp
 
-import six
-from six.moves import urllib, map, filter
+from pkg_resources.extern import six
+from pkg_resources.extern.six.moves import urllib, map, filter
 
 # capture these to bypass sandboxing
 from os import utime
@@ -67,11 +67,12 @@
 except ImportError:
     importlib_machinery = None
 
-import packaging.version
-import packaging.specifiers
-import packaging.requirements
-import packaging.markers
-import appdirs
+from pkg_resources.extern import appdirs
+from pkg_resources.extern import packaging
+__import__('pkg_resources.extern.packaging.version')
+__import__('pkg_resources.extern.packaging.specifiers')
+__import__('pkg_resources.extern.packaging.requirements')
+__import__('pkg_resources.extern.packaging.markers')
 
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")
diff --git a/pkg_resources/_vendor/__init__.py b/pkg_resources/_vendor/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
new file mode 100644
index 0000000000..f4dba0953c
--- /dev/null
+++ b/pkg_resources/_vendor/appdirs.py
@@ -0,0 +1,552 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2005-2010 ActiveState Software Inc.
+# Copyright (c) 2013 Eddy Petrișor
+
+"""Utilities for determining application-specific dirs.
+
+See <http://github.com/ActiveState/appdirs> for details and usage.
+"""
+# Dev Notes:
+# - MSDN on where to store app data files:
+#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
+# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
+# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+__version_info__ = (1, 4, 0)
+__version__ = '.'.join(map(str, __version_info__))
+
+
+import sys
+import os
+
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    unicode = str
+
+if sys.platform.startswith('java'):
+    import platform
+    os_name = platform.java_ver()[3][0]
+    if os_name.startswith('Windows'): # "Windows XP", "Windows 7", etc.
+        system = 'win32'
+    elif os_name.startswith('Mac'): # "Mac OS X", etc.
+        system = 'darwin'
+    else: # "Linux", "SunOS", "FreeBSD", etc.
+        # Setting this to "linux2" is not ideal, but only Windows or Mac
+        # are actually checked for and the rest of the module expects
+        # *sys.platform* style strings.
+        system = 'linux2'
+else:
+    system = sys.platform
+
+
+
+def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
+    r"""Return full path to the user-specific data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "roaming" (boolean, default False) can be set True to use the Windows
+            roaming appdata directory. That means that for users on a Windows
+            network setup for roaming profiles, this user data will be
+            sync'd on login. See
+            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
+            for a discussion of issues.
+
+    Typical user data directories are:
+        Mac OS X:               ~/Library/Application Support/<AppName>
+        Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
+        Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
+        Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
+        Win 7  (not roaming):   C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>
+        Win 7  (roaming):       C:\Users\<username>\AppData\Roaming\<AppAuthor>\<AppName>
+
+    For Unix, we follow the XDG spec and support $XDG_DATA_HOME.
+    That means, by default "~/.local/share/<AppName>".
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
+        path = os.path.normpath(_get_win_folder(const))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+    elif system == 'darwin':
+        path = os.path.expanduser('~/Library/Application Support/')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        path = os.getenv('XDG_DATA_HOME', os.path.expanduser("~/.local/share"))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
+    """Return full path to the user-shared data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "multipath" is an optional parameter only applicable to *nix
+            which indicates that the entire list of data dirs should be
+            returned. By default, the first item from XDG_DATA_DIRS is
+            returned, or '/usr/local/share/<AppName>',
+            if XDG_DATA_DIRS is not set
+
+    Typical user data directories are:
+        Mac OS X:   /Library/Application Support/<AppName>
+        Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
+        Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
+        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
+        Win 7:      C:\ProgramData\<AppAuthor>\<AppName>   # Hidden, but writeable on Win 7.
+
+    For Unix, this is using the $XDG_DATA_DIRS[0] default.
+
+    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        path = os.path.normpath(_get_win_folder("CSIDL_COMMON_APPDATA"))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+    elif system == 'darwin':
+        path = os.path.expanduser('/Library/Application Support')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        # XDG default for $XDG_DATA_DIRS
+        # only first, if multipath is False
+        path = os.getenv('XDG_DATA_DIRS',
+                         os.pathsep.join(['/usr/local/share', '/usr/share']))
+        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
+        if appname:
+            if version:
+                appname = os.path.join(appname, version)
+            pathlist = [os.sep.join([x, appname]) for x in pathlist]
+
+        if multipath:
+            path = os.pathsep.join(pathlist)
+        else:
+            path = pathlist[0]
+        return path
+
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
+    r"""Return full path to the user-specific config dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "roaming" (boolean, default False) can be set True to use the Windows
+            roaming appdata directory. That means that for users on a Windows
+            network setup for roaming profiles, this user data will be
+            sync'd on login. See
+            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
+            for a discussion of issues.
+
+    Typical user data directories are:
+        Mac OS X:               same as user_data_dir
+        Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
+        Win *:                  same as user_data_dir
+
+    For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME.
+    That means, by deafult "~/.config/<AppName>".
+    """
+    if system in ["win32", "darwin"]:
+        path = user_data_dir(appname, appauthor, None, roaming)
+    else:
+        path = os.getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config"))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def site_config_dir(appname=None, appauthor=None, version=None, multipath=False):
+    """Return full path to the user-shared data dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "multipath" is an optional parameter only applicable to *nix
+            which indicates that the entire list of config dirs should be
+            returned. By default, the first item from XDG_CONFIG_DIRS is
+            returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
+
+    Typical user data directories are:
+        Mac OS X:   same as site_data_dir
+        Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
+                    $XDG_CONFIG_DIRS
+        Win *:      same as site_data_dir
+        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
+
+    For Unix, this is using the $XDG_CONFIG_DIRS[0] default, if multipath=False
+
+    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
+    """
+    if system in ["win32", "darwin"]:
+        path = site_data_dir(appname, appauthor)
+        if appname and version:
+            path = os.path.join(path, version)
+    else:
+        # XDG default for $XDG_CONFIG_DIRS
+        # only first, if multipath is False
+        path = os.getenv('XDG_CONFIG_DIRS', '/etc/xdg')
+        pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)]
+        if appname:
+            if version:
+                appname = os.path.join(appname, version)
+            pathlist = [os.sep.join([x, appname]) for x in pathlist]
+
+        if multipath:
+            path = os.pathsep.join(pathlist)
+        else:
+            path = pathlist[0]
+    return path
+
+
+def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
+    r"""Return full path to the user-specific cache dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "opinion" (boolean) can be False to disable the appending of
+            "Cache" to the base app data dir for Windows. See
+            discussion below.
+
+    Typical user cache directories are:
+        Mac OS X:   ~/Library/Caches/<AppName>
+        Unix:       ~/.cache/<AppName> (XDG default)
+        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
+        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
+
+    On Windows the only suggestion in the MSDN docs is that local settings go in
+    the `CSIDL_LOCAL_APPDATA` directory. This is identical to the non-roaming
+    app data dir (the default returned by `user_data_dir` above). Apps typically
+    put cache data somewhere *under* the given dir here. Some examples:
+        ...\Mozilla\Firefox\Profiles\<ProfileName>\Cache
+        ...\Acme\SuperApp\Cache\1.0
+    OPINION: This function appends "Cache" to the `CSIDL_LOCAL_APPDATA` value.
+    This can be disabled with the `opinion=False` option.
+    """
+    if system == "win32":
+        if appauthor is None:
+            appauthor = appname
+        path = os.path.normpath(_get_win_folder("CSIDL_LOCAL_APPDATA"))
+        if appname:
+            if appauthor is not False:
+                path = os.path.join(path, appauthor, appname)
+            else:
+                path = os.path.join(path, appname)
+            if opinion:
+                path = os.path.join(path, "Cache")
+    elif system == 'darwin':
+        path = os.path.expanduser('~/Library/Caches')
+        if appname:
+            path = os.path.join(path, appname)
+    else:
+        path = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
+    r"""Return full path to the user-specific log dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "opinion" (boolean) can be False to disable the appending of
+            "Logs" to the base app data dir for Windows, and "log" to the
+            base cache dir for Unix. See discussion below.
+
+    Typical user cache directories are:
+        Mac OS X:   ~/Library/Logs/<AppName>
+        Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
+        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
+        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
+
+    On Windows the only suggestion in the MSDN docs is that local settings
+    go in the `CSIDL_LOCAL_APPDATA` directory. (Note: I'm interested in
+    examples of what some windows apps use for a logs dir.)
+
+    OPINION: This function appends "Logs" to the `CSIDL_LOCAL_APPDATA`
+    value for Windows and appends "log" to the user cache dir for Unix.
+    This can be disabled with the `opinion=False` option.
+    """
+    if system == "darwin":
+        path = os.path.join(
+            os.path.expanduser('~/Library/Logs'),
+            appname)
+    elif system == "win32":
+        path = user_data_dir(appname, appauthor, version)
+        version = False
+        if opinion:
+            path = os.path.join(path, "Logs")
+    else:
+        path = user_cache_dir(appname, appauthor, version)
+        version = False
+        if opinion:
+            path = os.path.join(path, "log")
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
+class AppDirs(object):
+    """Convenience wrapper for getting application dirs."""
+    def __init__(self, appname, appauthor=None, version=None, roaming=False,
+                 multipath=False):
+        self.appname = appname
+        self.appauthor = appauthor
+        self.version = version
+        self.roaming = roaming
+        self.multipath = multipath
+
+    @property
+    def user_data_dir(self):
+        return user_data_dir(self.appname, self.appauthor,
+                             version=self.version, roaming=self.roaming)
+
+    @property
+    def site_data_dir(self):
+        return site_data_dir(self.appname, self.appauthor,
+                             version=self.version, multipath=self.multipath)
+
+    @property
+    def user_config_dir(self):
+        return user_config_dir(self.appname, self.appauthor,
+                               version=self.version, roaming=self.roaming)
+
+    @property
+    def site_config_dir(self):
+        return site_config_dir(self.appname, self.appauthor,
+                             version=self.version, multipath=self.multipath)
+
+    @property
+    def user_cache_dir(self):
+        return user_cache_dir(self.appname, self.appauthor,
+                              version=self.version)
+
+    @property
+    def user_log_dir(self):
+        return user_log_dir(self.appname, self.appauthor,
+                            version=self.version)
+
+
+#---- internal support stuff
+
+def _get_win_folder_from_registry(csidl_name):
+    """This is a fallback technique at best. I'm not sure if using the
+    registry for this guarantees us the correct answer for all CSIDL_*
+    names.
+    """
+    import _winreg
+
+    shell_folder_name = {
+        "CSIDL_APPDATA": "AppData",
+        "CSIDL_COMMON_APPDATA": "Common AppData",
+        "CSIDL_LOCAL_APPDATA": "Local AppData",
+    }[csidl_name]
+
+    key = _winreg.OpenKey(
+        _winreg.HKEY_CURRENT_USER,
+        r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
+    )
+    dir, type = _winreg.QueryValueEx(key, shell_folder_name)
+    return dir
+
+
+def _get_win_folder_with_pywin32(csidl_name):
+    from win32com.shell import shellcon, shell
+    dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
+    # Try to make this a unicode path because SHGetFolderPath does
+    # not return unicode strings when there is unicode data in the
+    # path.
+    try:
+        dir = unicode(dir)
+
+        # Downgrade to short path name if have highbit chars. See
+        # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+        has_high_char = False
+        for c in dir:
+            if ord(c) > 255:
+                has_high_char = True
+                break
+        if has_high_char:
+            try:
+                import win32api
+                dir = win32api.GetShortPathName(dir)
+            except ImportError:
+                pass
+    except UnicodeError:
+        pass
+    return dir
+
+
+def _get_win_folder_with_ctypes(csidl_name):
+    import ctypes
+
+    csidl_const = {
+        "CSIDL_APPDATA": 26,
+        "CSIDL_COMMON_APPDATA": 35,
+        "CSIDL_LOCAL_APPDATA": 28,
+    }[csidl_name]
+
+    buf = ctypes.create_unicode_buffer(1024)
+    ctypes.windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
+
+    # Downgrade to short path name if have highbit chars. See
+    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+    has_high_char = False
+    for c in buf:
+        if ord(c) > 255:
+            has_high_char = True
+            break
+    if has_high_char:
+        buf2 = ctypes.create_unicode_buffer(1024)
+        if ctypes.windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
+            buf = buf2
+
+    return buf.value
+
+def _get_win_folder_with_jna(csidl_name):
+    import array
+    from com.sun import jna
+    from com.sun.jna.platform import win32
+
+    buf_size = win32.WinDef.MAX_PATH * 2
+    buf = array.zeros('c', buf_size)
+    shell = win32.Shell32.INSTANCE
+    shell.SHGetFolderPath(None, getattr(win32.ShlObj, csidl_name), None, win32.ShlObj.SHGFP_TYPE_CURRENT, buf)
+    dir = jna.Native.toString(buf.tostring()).rstrip("\0")
+
+    # Downgrade to short path name if have highbit chars. See
+    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
+    has_high_char = False
+    for c in dir:
+        if ord(c) > 255:
+            has_high_char = True
+            break
+    if has_high_char:
+        buf = array.zeros('c', buf_size)
+        kernel = win32.Kernel32.INSTANCE
+        if kernal.GetShortPathName(dir, buf, buf_size):
+            dir = jna.Native.toString(buf.tostring()).rstrip("\0")
+
+    return dir
+
+if system == "win32":
+    try:
+        import win32com.shell
+        _get_win_folder = _get_win_folder_with_pywin32
+    except ImportError:
+        try:
+            from ctypes import windll
+            _get_win_folder = _get_win_folder_with_ctypes
+        except ImportError:
+            try:
+                import com.sun.jna
+                _get_win_folder = _get_win_folder_with_jna
+            except ImportError:
+                _get_win_folder = _get_win_folder_from_registry
+
+
+#---- self test code
+
+if __name__ == "__main__":
+    appname = "MyApp"
+    appauthor = "MyCompany"
+
+    props = ("user_data_dir", "site_data_dir",
+             "user_config_dir", "site_config_dir",
+             "user_cache_dir", "user_log_dir")
+
+    print("-- app dirs (with optional 'version')")
+    dirs = AppDirs(appname, appauthor, version="1.0")
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (without optional 'version')")
+    dirs = AppDirs(appname, appauthor)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (without optional 'appauthor')")
+    dirs = AppDirs(appname)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
+
+    print("\n-- app dirs (with disabled 'appauthor')")
+    dirs = AppDirs(appname, appauthor=False)
+    for prop in props:
+        print("%s: %s" % (prop, getattr(dirs, prop)))
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
new file mode 100644
index 0000000000..95d330ef82
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -0,0 +1,21 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "packaging"
+__summary__ = "Core utilities for Python packages"
+__uri__ = "https://github.com/pypa/packaging"
+
+__version__ = "16.8"
+
+__author__ = "Donald Stufft and individual contributors"
+__email__ = "donald@stufft.io"
+
+__license__ = "BSD or Apache License, Version 2.0"
+__copyright__ = "Copyright 2014-2016 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py
new file mode 100644
index 0000000000..5ee6220203
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/__init__.py
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+from .__about__ import (
+    __author__, __copyright__, __email__, __license__, __summary__, __title__,
+    __uri__, __version__
+)
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
diff --git a/pkg_resources/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
new file mode 100644
index 0000000000..210bb80b7e
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/_compat.py
@@ -0,0 +1,30 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+# flake8: noqa
+
+if PY3:
+    string_types = str,
+else:
+    string_types = basestring,
+
+
+def with_metaclass(meta, *bases):
+    """
+    Create a base class with a metaclass.
+    """
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
new file mode 100644
index 0000000000..ccc27861c3
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/_structures.py
@@ -0,0 +1,68 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+
+class Infinity(object):
+
+    def __repr__(self):
+        return "Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return False
+
+    def __le__(self, other):
+        return False
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return True
+
+    def __ge__(self, other):
+        return True
+
+    def __neg__(self):
+        return NegativeInfinity
+
+Infinity = Infinity()
+
+
+class NegativeInfinity(object):
+
+    def __repr__(self):
+        return "-Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return True
+
+    def __le__(self, other):
+        return True
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return False
+
+    def __ge__(self, other):
+        return False
+
+    def __neg__(self):
+        return Infinity
+
+NegativeInfinity = NegativeInfinity()
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
new file mode 100644
index 0000000000..892e578edd
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -0,0 +1,301 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import operator
+import os
+import platform
+import sys
+
+from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+
+from ._compat import string_types
+from .specifiers import Specifier, InvalidSpecifier
+
+
+__all__ = [
+    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
+    "Marker", "default_environment",
+]
+
+
+class InvalidMarker(ValueError):
+    """
+    An invalid marker was found, users should refer to PEP 508.
+    """
+
+
+class UndefinedComparison(ValueError):
+    """
+    An invalid operation was attempted on a value that doesn't support it.
+    """
+
+
+class UndefinedEnvironmentName(ValueError):
+    """
+    A name was attempted to be used that does not exist inside of the
+    environment.
+    """
+
+
+class Node(object):
+
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
+
+    def serialize(self):
+        raise NotImplementedError
+
+
+class Variable(Node):
+
+    def serialize(self):
+        return str(self)
+
+
+class Value(Node):
+
+    def serialize(self):
+        return '"{0}"'.format(self)
+
+
+class Op(Node):
+
+    def serialize(self):
+        return str(self)
+
+
+VARIABLE = (
+    L("implementation_version") |
+    L("platform_python_implementation") |
+    L("implementation_name") |
+    L("python_full_version") |
+    L("platform_release") |
+    L("platform_version") |
+    L("platform_machine") |
+    L("platform_system") |
+    L("python_version") |
+    L("sys_platform") |
+    L("os_name") |
+    L("os.name") |  # PEP-345
+    L("sys.platform") |  # PEP-345
+    L("platform.version") |  # PEP-345
+    L("platform.machine") |  # PEP-345
+    L("platform.python_implementation") |  # PEP-345
+    L("python_implementation") |  # undocumented setuptools legacy
+    L("extra")
+)
+ALIASES = {
+    'os.name': 'os_name',
+    'sys.platform': 'sys_platform',
+    'platform.version': 'platform_version',
+    'platform.machine': 'platform_machine',
+    'platform.python_implementation': 'platform_python_implementation',
+    'python_implementation': 'platform_python_implementation'
+}
+VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
+
+VERSION_CMP = (
+    L("===") |
+    L("==") |
+    L(">=") |
+    L("<=") |
+    L("!=") |
+    L("~=") |
+    L(">") |
+    L("<")
+)
+
+MARKER_OP = VERSION_CMP | L("not in") | L("in")
+MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
+
+MARKER_VALUE = QuotedString("'") | QuotedString('"')
+MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
+
+BOOLOP = L("and") | L("or")
+
+MARKER_VAR = VARIABLE | MARKER_VALUE
+
+MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
+MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
+
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+
+MARKER_EXPR = Forward()
+MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
+MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
+
+MARKER = stringStart + MARKER_EXPR + stringEnd
+
+
+def _coerce_parse_result(results):
+    if isinstance(results, ParseResults):
+        return [_coerce_parse_result(i) for i in results]
+    else:
+        return results
+
+
+def _format_marker(marker, first=True):
+    assert isinstance(marker, (list, tuple, string_types))
+
+    # Sometimes we have a structure like [[...]] which is a single item list
+    # where the single item is itself it's own list. In that case we want skip
+    # the rest of this function so that we don't get extraneous () on the
+    # outside.
+    if (isinstance(marker, list) and len(marker) == 1 and
+            isinstance(marker[0], (list, tuple))):
+        return _format_marker(marker[0])
+
+    if isinstance(marker, list):
+        inner = (_format_marker(m, first=False) for m in marker)
+        if first:
+            return " ".join(inner)
+        else:
+            return "(" + " ".join(inner) + ")"
+    elif isinstance(marker, tuple):
+        return " ".join([m.serialize() for m in marker])
+    else:
+        return marker
+
+
+_operators = {
+    "in": lambda lhs, rhs: lhs in rhs,
+    "not in": lambda lhs, rhs: lhs not in rhs,
+    "<": operator.lt,
+    "<=": operator.le,
+    "==": operator.eq,
+    "!=": operator.ne,
+    ">=": operator.ge,
+    ">": operator.gt,
+}
+
+
+def _eval_op(lhs, op, rhs):
+    try:
+        spec = Specifier("".join([op.serialize(), rhs]))
+    except InvalidSpecifier:
+        pass
+    else:
+        return spec.contains(lhs)
+
+    oper = _operators.get(op.serialize())
+    if oper is None:
+        raise UndefinedComparison(
+            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
+        )
+
+    return oper(lhs, rhs)
+
+
+_undefined = object()
+
+
+def _get_env(environment, name):
+    value = environment.get(name, _undefined)
+
+    if value is _undefined:
+        raise UndefinedEnvironmentName(
+            "{0!r} does not exist in evaluation environment.".format(name)
+        )
+
+    return value
+
+
+def _evaluate_markers(markers, environment):
+    groups = [[]]
+
+    for marker in markers:
+        assert isinstance(marker, (list, tuple, string_types))
+
+        if isinstance(marker, list):
+            groups[-1].append(_evaluate_markers(marker, environment))
+        elif isinstance(marker, tuple):
+            lhs, op, rhs = marker
+
+            if isinstance(lhs, Variable):
+                lhs_value = _get_env(environment, lhs.value)
+                rhs_value = rhs.value
+            else:
+                lhs_value = lhs.value
+                rhs_value = _get_env(environment, rhs.value)
+
+            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
+        else:
+            assert marker in ["and", "or"]
+            if marker == "or":
+                groups.append([])
+
+    return any(all(item) for item in groups)
+
+
+def format_full_version(info):
+    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    kind = info.releaselevel
+    if kind != 'final':
+        version += kind[0] + str(info.serial)
+    return version
+
+
+def default_environment():
+    if hasattr(sys, 'implementation'):
+        iver = format_full_version(sys.implementation.version)
+        implementation_name = sys.implementation.name
+    else:
+        iver = '0'
+        implementation_name = ''
+
+    return {
+        "implementation_name": implementation_name,
+        "implementation_version": iver,
+        "os_name": os.name,
+        "platform_machine": platform.machine(),
+        "platform_release": platform.release(),
+        "platform_system": platform.system(),
+        "platform_version": platform.version(),
+        "python_full_version": platform.python_version(),
+        "platform_python_implementation": platform.python_implementation(),
+        "python_version": platform.python_version()[:3],
+        "sys_platform": sys.platform,
+    }
+
+
+class Marker(object):
+
+    def __init__(self, marker):
+        try:
+            self._markers = _coerce_parse_result(MARKER.parseString(marker))
+        except ParseException as e:
+            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
+                marker, marker[e.loc:e.loc + 8])
+            raise InvalidMarker(err_str)
+
+    def __str__(self):
+        return _format_marker(self._markers)
+
+    def __repr__(self):
+        return "<Marker({0!r})>".format(str(self))
+
+    def evaluate(self, environment=None):
+        """Evaluate a marker.
+
+        Return the boolean from evaluating the given marker against the
+        environment. environment is an optional argument to override all or
+        part of the determined environment.
+
+        The environment is determined from the current Python process.
+        """
+        current_environment = default_environment()
+        if environment is not None:
+            current_environment.update(environment)
+
+        return _evaluate_markers(self._markers, current_environment)
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
new file mode 100644
index 0000000000..0c8c4a3852
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -0,0 +1,127 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import string
+import re
+
+from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+from pkg_resources.extern.six.moves.urllib import parse as urlparse
+
+from .markers import MARKER_EXPR, Marker
+from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+
+
+class InvalidRequirement(ValueError):
+    """
+    An invalid requirement was found, users should refer to PEP 508.
+    """
+
+
+ALPHANUM = Word(string.ascii_letters + string.digits)
+
+LBRACKET = L("[").suppress()
+RBRACKET = L("]").suppress()
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+COMMA = L(",").suppress()
+SEMICOLON = L(";").suppress()
+AT = L("@").suppress()
+
+PUNCTUATION = Word("-_.")
+IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
+IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
+
+NAME = IDENTIFIER("name")
+EXTRA = IDENTIFIER
+
+URI = Regex(r'[^ ]+')("url")
+URL = (AT + URI)
+
+EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
+EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
+
+VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
+VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
+
+VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
+VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
+                       joinString=",", adjacent=False)("_raw_spec")
+_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+
+VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
+VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
+
+MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+MARKER_EXPR.setParseAction(
+    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+)
+MARKER_SEPERATOR = SEMICOLON
+MARKER = MARKER_SEPERATOR + MARKER_EXPR
+
+VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
+URL_AND_MARKER = URL + Optional(MARKER)
+
+NAMED_REQUIREMENT = \
+    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+
+REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+
+
+class Requirement(object):
+    """Parse a requirement.
+
+    Parse a given requirement string into its parts, such as name, specifier,
+    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
+    string.
+    """
+
+    # TODO: Can we test whether something is contained within a requirement?
+    #       If so how do we do that? Do we need to test against the _name_ of
+    #       the thing as well as the version? What about the markers?
+    # TODO: Can we normalize the name and extra name?
+
+    def __init__(self, requirement_string):
+        try:
+            req = REQUIREMENT.parseString(requirement_string)
+        except ParseException as e:
+            raise InvalidRequirement(
+                "Invalid requirement, parse error at \"{0!r}\"".format(
+                    requirement_string[e.loc:e.loc + 8]))
+
+        self.name = req.name
+        if req.url:
+            parsed_url = urlparse.urlparse(req.url)
+            if not (parsed_url.scheme and parsed_url.netloc) or (
+                    not parsed_url.scheme and not parsed_url.netloc):
+                raise InvalidRequirement("Invalid URL given")
+            self.url = req.url
+        else:
+            self.url = None
+        self.extras = set(req.extras.asList() if req.extras else [])
+        self.specifier = SpecifierSet(req.specifier)
+        self.marker = req.marker if req.marker else None
+
+    def __str__(self):
+        parts = [self.name]
+
+        if self.extras:
+            parts.append("[{0}]".format(",".join(sorted(self.extras))))
+
+        if self.specifier:
+            parts.append(str(self.specifier))
+
+        if self.url:
+            parts.append("@ {0}".format(self.url))
+
+        if self.marker:
+            parts.append("; {0}".format(self.marker))
+
+        return "".join(parts)
+
+    def __repr__(self):
+        return "<Requirement({0!r})>".format(str(self))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
new file mode 100644
index 0000000000..7f5a76cfd6
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -0,0 +1,774 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import abc
+import functools
+import itertools
+import re
+
+from ._compat import string_types, with_metaclass
+from .version import Version, LegacyVersion, parse
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+
+    @abc.abstractmethod
+    def __str__(self):
+        """
+        Returns the str representation of this Specifier like object. This
+        should be representative of the Specifier itself.
+        """
+
+    @abc.abstractmethod
+    def __hash__(self):
+        """
+        Returns a hash value for this Specifier like object.
+        """
+
+    @abc.abstractmethod
+    def __eq__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are equal.
+        """
+
+    @abc.abstractmethod
+    def __ne__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are not equal.
+        """
+
+    @abc.abstractproperty
+    def prereleases(self):
+        """
+        Returns whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @prereleases.setter
+    def prereleases(self, value):
+        """
+        Sets whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @abc.abstractmethod
+    def contains(self, item, prereleases=None):
+        """
+        Determines if the given item is contained within this specifier.
+        """
+
+    @abc.abstractmethod
+    def filter(self, iterable, prereleases=None):
+        """
+        Takes an iterable of items and filters them so that only items which
+        are contained within this specifier are allowed in it.
+        """
+
+
+class _IndividualSpecifier(BaseSpecifier):
+
+    _operators = {}
+
+    def __init__(self, spec="", prereleases=None):
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<{0}({1!r}{2})>".format(
+            self.__class__.__name__,
+            str(self),
+            pre,
+        )
+
+    def __str__(self):
+        return "{0}{1}".format(*self._spec)
+
+    def __hash__(self):
+        return hash(self._spec)
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec == other._spec
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec != other._spec
+
+    def _get_operator(self, op):
+        return getattr(self, "_compare_{0}".format(self._operators[op]))
+
+    def _coerce_version(self, version):
+        if not isinstance(version, (LegacyVersion, Version)):
+            version = parse(version)
+        return version
+
+    @property
+    def operator(self):
+        return self._spec[0]
+
+    @property
+    def version(self):
+        return self._spec[1]
+
+    @property
+    def prereleases(self):
+        return self._prereleases
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        item = self._coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        return self._get_operator(self.operator)(item, self.version)
+
+    def filter(self, iterable, prereleases=None):
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = self._coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if (parsed_version.is_prerelease and not
+                        (prereleases or self.prereleases)):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the begining.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+class LegacySpecifier(_IndividualSpecifier):
+
+    _regex_str = (
+        r"""
+        (?P<operator>(==|!=|<=|>=|<|>))
+        \s*
+        (?P<version>
+            [^,;\s)]* # Since this is a "legacy" specifier, and the version
+                      # string can be just about anything, we match everything
+                      # except for whitespace, a semi-colon for marker support,
+                      # a closing paren since versions can be enclosed in
+                      # them, and a comma since it's a version separator.
+        )
+        """
+    )
+
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+    }
+
+    def _coerce_version(self, version):
+        if not isinstance(version, LegacyVersion):
+            version = LegacyVersion(str(version))
+        return version
+
+    def _compare_equal(self, prospective, spec):
+        return prospective == self._coerce_version(spec)
+
+    def _compare_not_equal(self, prospective, spec):
+        return prospective != self._coerce_version(spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= self._coerce_version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= self._coerce_version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        return prospective < self._coerce_version(spec)
+
+    def _compare_greater_than(self, prospective, spec):
+        return prospective > self._coerce_version(spec)
+
+
+def _require_version_compare(fn):
+    @functools.wraps(fn)
+    def wrapped(self, prospective, spec):
+        if not isinstance(prospective, Version):
+            return False
+        return fn(self, prospective, spec)
+    return wrapped
+
+
+class Specifier(_IndividualSpecifier):
+
+    _regex_str = (
+        r"""
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        """
+    )
+
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    @_require_version_compare
+    def _compare_compatible(self, prospective, spec):
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post") and not
+                               x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return (self._get_operator(">=")(prospective, spec) and
+                self._get_operator("==")(prospective, prefix))
+
+    @_require_version_compare
+    def _compare_equal(self, prospective, spec):
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # In the case of prefix matching we want to ignore local segment.
+            prospective = Version(prospective.public)
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            prospective = prospective[:len(spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            spec, prospective = _pad_version(spec, prospective)
+        else:
+            # Convert our spec string into a Version
+            spec = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec.local:
+                prospective = Version(prospective.public)
+
+        return prospective == spec
+
+    @_require_version_compare
+    def _compare_not_equal(self, prospective, spec):
+        return not self._compare_equal(prospective, spec)
+
+    @_require_version_compare
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= Version(spec)
+
+    @_require_version_compare
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= Version(spec)
+
+    @_require_version_compare
+    def _compare_less_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is less than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective < spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a pre-release version, that we do not accept pre-release
+        # versions for the version mentioned in the specifier (e.g. <3.1 should
+        # not match 3.1.dev0, but should match 3.0.dev0).
+        if not spec.is_prerelease and prospective.is_prerelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # less than the spec version *and* it's not a pre-release of the same
+        # version in the spec.
+        return True
+
+    @_require_version_compare
+    def _compare_greater_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is greater than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective > spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a post-release version, that we do not accept
+        # post-release versions for the version mentioned in the specifier
+        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
+        if not spec.is_postrelease and prospective.is_postrelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # Ensure that we do not allow a local version of the version mentioned
+        # in the specifier, which is techincally greater than, to match.
+        if prospective.local is not None:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # greater than the spec version *and* it's not a pre-release of the
+        # same version in the spec.
+        return True
+
+    def _compare_arbitrary(self, prospective, spec):
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~=", "==="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if parse(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    result = []
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split[0]):])
+    right_split.append(right[len(right_split[0]):])
+
+    # Insert our padding
+    left_split.insert(
+        1,
+        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
+    )
+    right_split.insert(
+        1,
+        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
+    )
+
+    return (
+        list(itertools.chain(*left_split)),
+        list(itertools.chain(*right_split)),
+    )
+
+
+class SpecifierSet(BaseSpecifier):
+
+    def __init__(self, specifiers="", prereleases=None):
+        # Split on , to break each indidivual specifier into it's own item, and
+        # strip each item to remove leading/trailing whitespace.
+        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+
+        # Parsed each individual specifier, attempting first to make it a
+        # Specifier and falling back to a LegacySpecifier.
+        parsed = set()
+        for specifier in specifiers:
+            try:
+                parsed.add(Specifier(specifier))
+            except InvalidSpecifier:
+                parsed.add(LegacySpecifier(specifier))
+
+        # Turn our parsed specifiers into a frozen set and save them for later.
+        self._specs = frozenset(parsed)
+
+        # Store our prereleases value so we can use it later to determine if
+        # we accept prereleases or not.
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
+
+    def __str__(self):
+        return ",".join(sorted(str(s) for s in self._specs))
+
+    def __hash__(self):
+        return hash(self._specs)
+
+    def __and__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        specifier = SpecifierSet()
+        specifier._specs = frozenset(self._specs | other._specs)
+
+        if self._prereleases is None and other._prereleases is not None:
+            specifier._prereleases = other._prereleases
+        elif self._prereleases is not None and other._prereleases is None:
+            specifier._prereleases = self._prereleases
+        elif self._prereleases == other._prereleases:
+            specifier._prereleases = self._prereleases
+        else:
+            raise ValueError(
+                "Cannot combine SpecifierSets with True and False prerelease "
+                "overrides."
+            )
+
+        return specifier
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    def __len__(self):
+        return len(self._specs)
+
+    def __iter__(self):
+        return iter(self._specs)
+
+    @property
+    def prereleases(self):
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Ensure that our item is a Version or LegacyVersion instance.
+        if not isinstance(item, (LegacyVersion, Version)):
+            item = parse(item)
+
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # We can determine if we're going to allow pre-releases by looking to
+        # see if any of the underlying items supports them. If none of them do
+        # and this item is a pre-release then we do not allow it and we can
+        # short circuit that here.
+        # Note: This means that 1.0.dev1 would not be contained in something
+        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
+        if not prereleases and item.is_prerelease:
+            return False
+
+        # We simply dispatch to the underlying specs here to make sure that the
+        # given version is contained within all of them.
+        # Note: This use of all() here means that an empty set of specifiers
+        #       will always return True, this is an explicit design decision.
+        return all(
+            s.contains(item, prereleases=prereleases)
+            for s in self._specs
+        )
+
+    def filter(self, iterable, prereleases=None):
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # If we have any specifiers, then we want to wrap our iterable in the
+        # filter method for each one, this will act as a logical AND amongst
+        # each specifier.
+        if self._specs:
+            for spec in self._specs:
+                iterable = spec.filter(iterable, prereleases=bool(prereleases))
+            return iterable
+        # If we do not have any specifiers, then we need to have a rough filter
+        # which will filter out any pre-releases, unless there are no final
+        # releases, and which will filter out LegacyVersion in general.
+        else:
+            filtered = []
+            found_prereleases = []
+
+            for item in iterable:
+                # Ensure that we some kind of Version class for this item.
+                if not isinstance(item, (LegacyVersion, Version)):
+                    parsed_version = parse(item)
+                else:
+                    parsed_version = item
+
+                # Filter out any item which is parsed as a LegacyVersion
+                if isinstance(parsed_version, LegacyVersion):
+                    continue
+
+                # Store any item which is a pre-release for later unless we've
+                # already found a final version or we are accepting prereleases
+                if parsed_version.is_prerelease and not prereleases:
+                    if not filtered:
+                        found_prereleases.append(item)
+                else:
+                    filtered.append(item)
+
+            # If we've found no items except for pre-releases, then we'll go
+            # ahead and use the pre-releases
+            if not filtered and found_prereleases and prereleases is None:
+                return found_prereleases
+
+            return filtered
diff --git a/pkg_resources/_vendor/packaging/utils.py b/pkg_resources/_vendor/packaging/utils.py
new file mode 100644
index 0000000000..942387cef5
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/utils.py
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+    # This is taken from PEP 503.
+    return _canonicalize_regex.sub("-", name).lower()
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
new file mode 100644
index 0000000000..83b5ee8c5e
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -0,0 +1,393 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+
+from ._structures import Infinity
+
+
+__all__ = [
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
+]
+
+
+_Version = collections.namedtuple(
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
+)
+
+
+def parse(version):
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+
+    def __hash__(self):
+        return hash(self._key)
+
+    def __lt__(self, other):
+        return self._compare(other, lambda s, o: s < o)
+
+    def __le__(self, other):
+        return self._compare(other, lambda s, o: s <= o)
+
+    def __eq__(self, other):
+        return self._compare(other, lambda s, o: s == o)
+
+    def __ge__(self, other):
+        return self._compare(other, lambda s, o: s >= o)
+
+    def __gt__(self, other):
+        return self._compare(other, lambda s, o: s > o)
+
+    def __ne__(self, other):
+        return self._compare(other, lambda s, o: s != o)
+
+    def _compare(self, other, method):
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return method(self._key, other._key)
+
+
+class LegacyVersion(_BaseVersion):
+
+    def __init__(self, version):
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+    def __str__(self):
+        return self._version
+
+    def __repr__(self):
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        return self._version
+
+    @property
+    def base_version(self):
+        return self._version
+
+    @property
+    def local(self):
+        return None
+
+    @property
+    def is_prerelease(self):
+        return False
+
+    @property
+    def is_postrelease(self):
+        return False
+
+
+_legacy_version_component_re = re.compile(
+    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
+)
+
+_legacy_version_replacement_map = {
+    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+    parts = tuple(parts)
+
+    return epoch, parts
+
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(
+        r"^\s*" + VERSION_PATTERN + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    def __init__(self, version):
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(
+                match.group("pre_l"),
+                match.group("pre_n"),
+            ),
+            post=_parse_letter_version(
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
+            ),
+            dev=_parse_letter_version(
+                match.group("dev_l"),
+                match.group("dev_n"),
+            ),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        # Pre-release
+        if self._version.pre is not None:
+            parts.append("".join(str(x) for x in self._version.pre))
+
+        # Post-release
+        if self._version.post is not None:
+            parts.append(".post{0}".format(self._version.post[1]))
+
+        # Development release
+        if self._version.dev is not None:
+            parts.append(".dev{0}".format(self._version.dev[1]))
+
+        # Local version segment
+        if self._version.local is not None:
+            parts.append(
+                "+{0}".format(".".join(str(x) for x in self._version.local))
+            )
+
+        return "".join(parts)
+
+    @property
+    def public(self):
+        return str(self).split("+", 1)[0]
+
+    @property
+    def base_version(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        return "".join(parts)
+
+    @property
+    def local(self):
+        version_string = str(self)
+        if "+" in version_string:
+            return version_string.split("+", 1)[1]
+
+    @property
+    def is_prerelease(self):
+        return bool(self._version.dev or self._version.pre)
+
+    @property
+    def is_postrelease(self):
+        return bool(self._version.post)
+
+
+def _parse_letter_version(letter, number):
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+
+_local_version_seperators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_seperators.split(local)
+        )
+
+
+def _cmpkey(epoch, release, pre, post, dev, local):
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    release = tuple(
+        reversed(list(
+            itertools.dropwhile(
+                lambda x: x == 0,
+                reversed(release),
+            )
+        ))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        pre = -Infinity
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        pre = Infinity
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        post = -Infinity
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        dev = Infinity
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        local = -Infinity
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        local = tuple(
+            (i, "") if isinstance(i, int) else (-Infinity, i)
+            for i in local
+        )
+
+    return epoch, release, pre, post, dev, local
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
new file mode 100644
index 0000000000..a21224359e
--- /dev/null
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -0,0 +1,5696 @@
+# module pyparsing.py
+#
+# Copyright (c) 2003-2016  Paul T. McGuire
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__doc__ = \
+"""
+pyparsing module - Classes and methods to define and execute parsing grammars
+
+The pyparsing module is an alternative approach to creating and executing simple grammars,
+vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
+don't need to learn a new syntax for defining grammars or matching expressions - the parsing module
+provides a library of classes that you use to construct the grammar directly in Python.
+
+Here is a program to parse "Hello, World!" (or any greeting of the form 
+C{"<salutation>, <addressee>!"}), built up using L{Word}, L{Literal}, and L{And} elements 
+(L{'+'<ParserElement.__add__>} operator gives L{And} expressions, strings are auto-converted to
+L{Literal} expressions)::
+
+    from pyparsing import Word, alphas
+
+    # define grammar of a greeting
+    greet = Word(alphas) + "," + Word(alphas) + "!"
+
+    hello = "Hello, World!"
+    print (hello, "->", greet.parseString(hello))
+
+The program outputs the following::
+
+    Hello, World! -> ['Hello', ',', 'World', '!']
+
+The Python representation of the grammar is quite readable, owing to the self-explanatory
+class names, and the use of '+', '|' and '^' operators.
+
+The L{ParseResults} object returned from L{ParserElement.parseString<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
+object with named attributes.
+
+The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
+ - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
+ - quoted strings
+ - embedded comments
+"""
+
+__version__ = "2.1.10"
+__versionTime__ = "07 Oct 2016 01:31 UTC"
+__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
+
+import string
+from weakref import ref as wkref
+import copy
+import sys
+import warnings
+import re
+import sre_constants
+import collections
+import pprint
+import traceback
+import types
+from datetime import datetime
+
+try:
+    from _thread import RLock
+except ImportError:
+    from threading import RLock
+
+try:
+    from collections import OrderedDict as _OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict as _OrderedDict
+    except ImportError:
+        _OrderedDict = None
+
+#~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) )
+
+__all__ = [
+'And', 'CaselessKeyword', 'CaselessLiteral', 'CharsNotIn', 'Combine', 'Dict', 'Each', 'Empty',
+'FollowedBy', 'Forward', 'GoToColumn', 'Group', 'Keyword', 'LineEnd', 'LineStart', 'Literal',
+'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or',
+'ParseBaseException', 'ParseElementEnhance', 'ParseException', 'ParseExpression', 'ParseFatalException',
+'ParseResults', 'ParseSyntaxException', 'ParserElement', 'QuotedString', 'RecursiveGrammarException',
+'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 
+'White', 'Word', 'WordEnd', 'WordStart', 'ZeroOrMore',
+'alphanums', 'alphas', 'alphas8bit', 'anyCloseTag', 'anyOpenTag', 'cStyleComment', 'col',
+'commaSeparatedList', 'commonHTMLEntity', 'countedArray', 'cppStyleComment', 'dblQuotedString',
+'dblSlashComment', 'delimitedList', 'dictOf', 'downcaseTokens', 'empty', 'hexnums',
+'htmlComment', 'javaStyleComment', 'line', 'lineEnd', 'lineStart', 'lineno',
+'makeHTMLTags', 'makeXMLTags', 'matchOnlyAtCol', 'matchPreviousExpr', 'matchPreviousLiteral',
+'nestedExpr', 'nullDebugAction', 'nums', 'oneOf', 'opAssoc', 'operatorPrecedence', 'printables',
+'punc8bit', 'pythonStyleComment', 'quotedString', 'removeQuotes', 'replaceHTMLEntity', 
+'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
+'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
+'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
+'CloseMatch', 'tokenMap', 'pyparsing_common',
+]
+
+system_version = tuple(sys.version_info)[:3]
+PY_3 = system_version[0] == 3
+if PY_3:
+    _MAX_INT = sys.maxsize
+    basestring = str
+    unichr = chr
+    _ustr = str
+
+    # build list of single arg builtins, that can be used as parse actions
+    singleArgBuiltins = [sum, len, sorted, reversed, list, tuple, set, any, all, min, max]
+
+else:
+    _MAX_INT = sys.maxint
+    range = xrange
+
+    def _ustr(obj):
+        """Drop-in replacement for str(obj) that tries to be Unicode friendly. It first tries
+           str(obj). If that fails with a UnicodeEncodeError, then it tries unicode(obj). It
+           then < returns the unicode object | encodes it with the default encoding | ... >.
+        """
+        if isinstance(obj,unicode):
+            return obj
+
+        try:
+            # If this works, then _ustr(obj) has the same behaviour as str(obj), so
+            # it won't break any existing code.
+            return str(obj)
+
+        except UnicodeEncodeError:
+            # Else encode it
+            ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
+            xmlcharref = Regex('&#\d+;')
+            xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
+            return xmlcharref.transformString(ret)
+
+    # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
+    singleArgBuiltins = []
+    import __builtin__
+    for fname in "sum len sorted reversed list tuple set any all min max".split():
+        try:
+            singleArgBuiltins.append(getattr(__builtin__,fname))
+        except AttributeError:
+            continue
+            
+_generatorType = type((y for y in range(1)))
+ 
+def _xml_escape(data):
+    """Escape &, <, >, ", ', etc. in a string of data."""
+
+    # ampersand must be replaced first
+    from_symbols = '&><"\''
+    to_symbols = ('&'+s+';' for s in "amp gt lt quot apos".split())
+    for from_,to_ in zip(from_symbols, to_symbols):
+        data = data.replace(from_, to_)
+    return data
+
+class _Constants(object):
+    pass
+
+alphas     = string.ascii_uppercase + string.ascii_lowercase
+nums       = "0123456789"
+hexnums    = nums + "ABCDEFabcdef"
+alphanums  = alphas + nums
+_bslash    = chr(92)
+printables = "".join(c for c in string.printable if c not in string.whitespace)
+
+class ParseBaseException(Exception):
+    """base exception class for all parsing runtime exceptions"""
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, pstr, loc=0, msg=None, elem=None ):
+        self.loc = loc
+        if msg is None:
+            self.msg = pstr
+            self.pstr = ""
+        else:
+            self.msg = msg
+            self.pstr = pstr
+        self.parserElement = elem
+        self.args = (pstr, loc, msg)
+
+    @classmethod
+    def _from_exception(cls, pe):
+        """
+        internal factory method to simplify creating one type of ParseException 
+        from another - avoids having __init__ signature conflicts among subclasses
+        """
+        return cls(pe.pstr, pe.loc, pe.msg, pe.parserElement)
+
+    def __getattr__( self, aname ):
+        """supported attributes by name are:
+            - lineno - returns the line number of the exception text
+            - col - returns the column number of the exception text
+            - line - returns the line containing the exception text
+        """
+        if( aname == "lineno" ):
+            return lineno( self.loc, self.pstr )
+        elif( aname in ("col", "column") ):
+            return col( self.loc, self.pstr )
+        elif( aname == "line" ):
+            return line( self.loc, self.pstr )
+        else:
+            raise AttributeError(aname)
+
+    def __str__( self ):
+        return "%s (at char %d), (line:%d, col:%d)" % \
+                ( self.msg, self.loc, self.lineno, self.column )
+    def __repr__( self ):
+        return _ustr(self)
+    def markInputline( self, markerString = ">!<" ):
+        """Extracts the exception line from the input string, and marks
+           the location of the exception with a special symbol.
+        """
+        line_str = self.line
+        line_column = self.column - 1
+        if markerString:
+            line_str = "".join((line_str[:line_column],
+                                markerString, line_str[line_column:]))
+        return line_str.strip()
+    def __dir__(self):
+        return "lineno col line".split() + dir(type(self))
+
+class ParseException(ParseBaseException):
+    """
+    Exception thrown when parse expressions don't match class;
+    supported attributes by name are:
+     - lineno - returns the line number of the exception text
+     - col - returns the column number of the exception text
+     - line - returns the line containing the exception text
+        
+    Example::
+        try:
+            Word(nums).setName("integer").parseString("ABC")
+        except ParseException as pe:
+            print(pe)
+            print("column: {}".format(pe.col))
+            
+    prints::
+       Expected integer (at char 0), (line:1, col:1)
+        column: 1
+    """
+    pass
+
+class ParseFatalException(ParseBaseException):
+    """user-throwable exception thrown when inconsistent parse content
+       is found; stops all parsing immediately"""
+    pass
+
+class ParseSyntaxException(ParseFatalException):
+    """just like L{ParseFatalException}, but thrown internally when an
+       L{ErrorStop<And._ErrorStop>} ('-' operator) indicates that parsing is to stop 
+       immediately because an unbacktrackable syntax error has been found"""
+    pass
+
+#~ class ReparseException(ParseBaseException):
+    #~ """Experimental class - parse actions can raise this exception to cause
+       #~ pyparsing to reparse the input string:
+        #~ - with a modified input string, and/or
+        #~ - with a modified start location
+       #~ Set the values of the ReparseException in the constructor, and raise the
+       #~ exception in a parse action to cause pyparsing to use the new string/location.
+       #~ Setting the values as None causes no change to be made.
+       #~ """
+    #~ def __init_( self, newstring, restartLoc ):
+        #~ self.newParseText = newstring
+        #~ self.reparseLoc = restartLoc
+
+class RecursiveGrammarException(Exception):
+    """exception thrown by L{ParserElement.validate} if the grammar could be improperly recursive"""
+    def __init__( self, parseElementList ):
+        self.parseElementTrace = parseElementList
+
+    def __str__( self ):
+        return "RecursiveGrammarException: %s" % self.parseElementTrace
+
+class _ParseResultsWithOffset(object):
+    def __init__(self,p1,p2):
+        self.tup = (p1,p2)
+    def __getitem__(self,i):
+        return self.tup[i]
+    def __repr__(self):
+        return repr(self.tup[0])
+    def setOffset(self,i):
+        self.tup = (self.tup[0],i)
+
+class ParseResults(object):
+    """
+    Structured parse results, to provide multiple means of access to the parsed data:
+       - as a list (C{len(results)})
+       - by list index (C{results[0], results[1]}, etc.)
+       - by attribute (C{results.<resultsName>} - see L{ParserElement.setResultsName})
+
+    Example::
+        integer = Word(nums)
+        date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+        # equivalent form:
+        # date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+
+        # parseString returns a ParseResults object
+        result = date_str.parseString("1999/12/31")
+
+        def test(s, fn=repr):
+            print("%s -> %s" % (s, fn(eval(s))))
+        test("list(result)")
+        test("result[0]")
+        test("result['month']")
+        test("result.day")
+        test("'month' in result")
+        test("'minutes' in result")
+        test("result.dump()", str)
+    prints::
+        list(result) -> ['1999', '/', '12', '/', '31']
+        result[0] -> '1999'
+        result['month'] -> '12'
+        result.day -> '31'
+        'month' in result -> True
+        'minutes' in result -> False
+        result.dump() -> ['1999', '/', '12', '/', '31']
+        - day: 31
+        - month: 12
+        - year: 1999
+    """
+    def __new__(cls, toklist=None, name=None, asList=True, modal=True ):
+        if isinstance(toklist, cls):
+            return toklist
+        retobj = object.__new__(cls)
+        retobj.__doinit = True
+        return retobj
+
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance ):
+        if self.__doinit:
+            self.__doinit = False
+            self.__name = None
+            self.__parent = None
+            self.__accumNames = {}
+            self.__asList = asList
+            self.__modal = modal
+            if toklist is None:
+                toklist = []
+            if isinstance(toklist, list):
+                self.__toklist = toklist[:]
+            elif isinstance(toklist, _generatorType):
+                self.__toklist = list(toklist)
+            else:
+                self.__toklist = [toklist]
+            self.__tokdict = dict()
+
+        if name is not None and name:
+            if not modal:
+                self.__accumNames[name] = 0
+            if isinstance(name,int):
+                name = _ustr(name) # will always return a str, but use _ustr for consistency
+            self.__name = name
+            if not (isinstance(toklist, (type(None), basestring, list)) and toklist in (None,'',[])):
+                if isinstance(toklist,basestring):
+                    toklist = [ toklist ]
+                if asList:
+                    if isinstance(toklist,ParseResults):
+                        self[name] = _ParseResultsWithOffset(toklist.copy(),0)
+                    else:
+                        self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]),0)
+                    self[name].__name = name
+                else:
+                    try:
+                        self[name] = toklist[0]
+                    except (KeyError,TypeError,IndexError):
+                        self[name] = toklist
+
+    def __getitem__( self, i ):
+        if isinstance( i, (int,slice) ):
+            return self.__toklist[i]
+        else:
+            if i not in self.__accumNames:
+                return self.__tokdict[i][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[i] ])
+
+    def __setitem__( self, k, v, isinstance=isinstance ):
+        if isinstance(v,_ParseResultsWithOffset):
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [v]
+            sub = v[0]
+        elif isinstance(k,(int,slice)):
+            self.__toklist[k] = v
+            sub = v
+        else:
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [_ParseResultsWithOffset(v,0)]
+            sub = v
+        if isinstance(sub,ParseResults):
+            sub.__parent = wkref(self)
+
+    def __delitem__( self, i ):
+        if isinstance(i,(int,slice)):
+            mylen = len( self.__toklist )
+            del self.__toklist[i]
+
+            # convert int to slice
+            if isinstance(i, int):
+                if i < 0:
+                    i += mylen
+                i = slice(i, i+1)
+            # get removed indices
+            removed = list(range(*i.indices(mylen)))
+            removed.reverse()
+            # fixup indices in token dictionary
+            for name,occurrences in self.__tokdict.items():
+                for j in removed:
+                    for k, (value, position) in enumerate(occurrences):
+                        occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
+        else:
+            del self.__tokdict[i]
+
+    def __contains__( self, k ):
+        return k in self.__tokdict
+
+    def __len__( self ): return len( self.__toklist )
+    def __bool__(self): return ( not not self.__toklist )
+    __nonzero__ = __bool__
+    def __iter__( self ): return iter( self.__toklist )
+    def __reversed__( self ): return iter( self.__toklist[::-1] )
+    def _iterkeys( self ):
+        if hasattr(self.__tokdict, "iterkeys"):
+            return self.__tokdict.iterkeys()
+        else:
+            return iter(self.__tokdict)
+
+    def _itervalues( self ):
+        return (self[k] for k in self._iterkeys())
+            
+    def _iteritems( self ):
+        return ((k, self[k]) for k in self._iterkeys())
+
+    if PY_3:
+        keys = _iterkeys       
+        """Returns an iterator of all named result keys (Python 3.x only)."""
+
+        values = _itervalues
+        """Returns an iterator of all named result values (Python 3.x only)."""
+
+        items = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 3.x only)."""
+
+    else:
+        iterkeys = _iterkeys
+        """Returns an iterator of all named result keys (Python 2.x only)."""
+
+        itervalues = _itervalues
+        """Returns an iterator of all named result values (Python 2.x only)."""
+
+        iteritems = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 2.x only)."""
+
+        def keys( self ):
+            """Returns all named result keys (as a list in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.iterkeys())
+
+        def values( self ):
+            """Returns all named result values (as a list in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.itervalues())
+                
+        def items( self ):
+            """Returns all named result key-values (as a list of tuples in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.iteritems())
+
+    def haskeys( self ):
+        """Since keys() returns an iterator, this method is helpful in bypassing
+           code that looks for the existence of any defined results names."""
+        return bool(self.__tokdict)
+        
+    def pop( self, *args, **kwargs):
+        """
+        Removes and returns item at specified index (default=C{last}).
+        Supports both C{list} and C{dict} semantics for C{pop()}. If passed no
+        argument or an integer argument, it will use C{list} semantics
+        and pop tokens from the list of parsed tokens. If passed a 
+        non-integer argument (most likely a string), it will use C{dict}
+        semantics and pop the corresponding value from any defined 
+        results names. A second default return value argument is 
+        supported, just as in C{dict.pop()}.
+
+        Example::
+            def remove_first(tokens):
+                tokens.pop(0)
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            print(OneOrMore(Word(nums)).addParseAction(remove_first).parseString("0 123 321")) # -> ['123', '321']
+
+            label = Word(alphas)
+            patt = label("LABEL") + OneOrMore(Word(nums))
+            print(patt.parseString("AAB 123 321").dump())
+
+            # Use pop() in a parse action to remove named result (note that corresponding value is not
+            # removed from list form of results)
+            def remove_LABEL(tokens):
+                tokens.pop("LABEL")
+                return tokens
+            patt.addParseAction(remove_LABEL)
+            print(patt.parseString("AAB 123 321").dump())
+        prints::
+            ['AAB', '123', '321']
+            - LABEL: AAB
+
+            ['AAB', '123', '321']
+        """
+        if not args:
+            args = [-1]
+        for k,v in kwargs.items():
+            if k == 'default':
+                args = (args[0], v)
+            else:
+                raise TypeError("pop() got an unexpected keyword argument '%s'" % k)
+        if (isinstance(args[0], int) or 
+                        len(args) == 1 or 
+                        args[0] in self):
+            index = args[0]
+            ret = self[index]
+            del self[index]
+            return ret
+        else:
+            defaultvalue = args[1]
+            return defaultvalue
+
+    def get(self, key, defaultValue=None):
+        """
+        Returns named result matching the given key, or if there is no
+        such name, then returns the given C{defaultValue} or C{None} if no
+        C{defaultValue} is specified.
+
+        Similar to C{dict.get()}.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            result = date_str.parseString("1999/12/31")
+            print(result.get("year")) # -> '1999'
+            print(result.get("hour", "not specified")) # -> 'not specified'
+            print(result.get("hour")) # -> None
+        """
+        if key in self:
+            return self[key]
+        else:
+            return defaultValue
+
+    def insert( self, index, insStr ):
+        """
+        Inserts new element at location index in the list of parsed tokens.
+        
+        Similar to C{list.insert()}.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+
+            # use a parse action to insert the parse location in the front of the parsed results
+            def insert_locn(locn, tokens):
+                tokens.insert(0, locn)
+            print(OneOrMore(Word(nums)).addParseAction(insert_locn).parseString("0 123 321")) # -> [0, '0', '123', '321']
+        """
+        self.__toklist.insert(index, insStr)
+        # fixup indices in token dictionary
+        for name,occurrences in self.__tokdict.items():
+            for k, (value, position) in enumerate(occurrences):
+                occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
+
+    def append( self, item ):
+        """
+        Add single element to end of ParseResults list of elements.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            
+            # use a parse action to compute the sum of the parsed integers, and add it to the end
+            def append_sum(tokens):
+                tokens.append(sum(map(int, tokens)))
+            print(OneOrMore(Word(nums)).addParseAction(append_sum).parseString("0 123 321")) # -> ['0', '123', '321', 444]
+        """
+        self.__toklist.append(item)
+
+    def extend( self, itemseq ):
+        """
+        Add sequence of elements to end of ParseResults list of elements.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            
+            # use a parse action to append the reverse of the matched strings, to make a palindrome
+            def make_palindrome(tokens):
+                tokens.extend(reversed([t[::-1] for t in tokens]))
+                return ''.join(tokens)
+            print(patt.addParseAction(make_palindrome).parseString("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
+        """
+        if isinstance(itemseq, ParseResults):
+            self += itemseq
+        else:
+            self.__toklist.extend(itemseq)
+
+    def clear( self ):
+        """
+        Clear all elements and results names.
+        """
+        del self.__toklist[:]
+        self.__tokdict.clear()
+
+    def __getattr__( self, name ):
+        try:
+            return self[name]
+        except KeyError:
+            return ""
+            
+        if name in self.__tokdict:
+            if name not in self.__accumNames:
+                return self.__tokdict[name][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[name] ])
+        else:
+            return ""
+
+    def __add__( self, other ):
+        ret = self.copy()
+        ret += other
+        return ret
+
+    def __iadd__( self, other ):
+        if other.__tokdict:
+            offset = len(self.__toklist)
+            addoffset = lambda a: offset if a<0 else a+offset
+            otheritems = other.__tokdict.items()
+            otherdictitems = [(k, _ParseResultsWithOffset(v[0],addoffset(v[1])) )
+                                for (k,vlist) in otheritems for v in vlist]
+            for k,v in otherdictitems:
+                self[k] = v
+                if isinstance(v[0],ParseResults):
+                    v[0].__parent = wkref(self)
+            
+        self.__toklist += other.__toklist
+        self.__accumNames.update( other.__accumNames )
+        return self
+
+    def __radd__(self, other):
+        if isinstance(other,int) and other == 0:
+            # useful for merging many ParseResults using sum() builtin
+            return self.copy()
+        else:
+            # this may raise a TypeError - so be it
+            return other + self
+        
+    def __repr__( self ):
+        return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) )
+
+    def __str__( self ):
+        return '[' + ', '.join(_ustr(i) if isinstance(i, ParseResults) else repr(i) for i in self.__toklist) + ']'
+
+    def _asStringList( self, sep='' ):
+        out = []
+        for item in self.__toklist:
+            if out and sep:
+                out.append(sep)
+            if isinstance( item, ParseResults ):
+                out += item._asStringList()
+            else:
+                out.append( _ustr(item) )
+        return out
+
+    def asList( self ):
+        """
+        Returns the parse results as a nested list of matching tokens, all converted to strings.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            result = patt.parseString("sldkj lsdkj sldkj")
+            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
+            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
+            
+            # Use asList() to create an actual list
+            result_list = result.asList()
+            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
+        """
+        return [res.asList() if isinstance(res,ParseResults) else res for res in self.__toklist]
+
+    def asDict( self ):
+        """
+        Returns the named parse results as a nested dictionary.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
+            
+            result_dict = result.asDict()
+            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
+
+            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
+            import json
+            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
+            print(json.dumps(result.asDict())) # -> {"month": "31", "day": "1999", "year": "12"}
+        """
+        if PY_3:
+            item_fn = self.items
+        else:
+            item_fn = self.iteritems
+            
+        def toItem(obj):
+            if isinstance(obj, ParseResults):
+                if obj.haskeys():
+                    return obj.asDict()
+                else:
+                    return [toItem(v) for v in obj]
+            else:
+                return obj
+                
+        return dict((k,toItem(v)) for k,v in item_fn())
+
+    def copy( self ):
+        """
+        Returns a new copy of a C{ParseResults} object.
+        """
+        ret = ParseResults( self.__toklist )
+        ret.__tokdict = self.__tokdict.copy()
+        ret.__parent = self.__parent
+        ret.__accumNames.update( self.__accumNames )
+        ret.__name = self.__name
+        return ret
+
+    def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ):
+        """
+        (Deprecated) Returns the parse results as XML. Tags are created for tokens and lists that have defined results names.
+        """
+        nl = "\n"
+        out = []
+        namedItems = dict((v[1],k) for (k,vlist) in self.__tokdict.items()
+                                                            for v in vlist)
+        nextLevelIndent = indent + "  "
+
+        # collapse out indents if formatting is not desired
+        if not formatted:
+            indent = ""
+            nextLevelIndent = ""
+            nl = ""
+
+        selfTag = None
+        if doctag is not None:
+            selfTag = doctag
+        else:
+            if self.__name:
+                selfTag = self.__name
+
+        if not selfTag:
+            if namedItemsOnly:
+                return ""
+            else:
+                selfTag = "ITEM"
+
+        out += [ nl, indent, "<", selfTag, ">" ]
+
+        for i,res in enumerate(self.__toklist):
+            if isinstance(res,ParseResults):
+                if i in namedItems:
+                    out += [ res.asXML(namedItems[i],
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+                else:
+                    out += [ res.asXML(None,
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+            else:
+                # individual token, see if there is a name for it
+                resTag = None
+                if i in namedItems:
+                    resTag = namedItems[i]
+                if not resTag:
+                    if namedItemsOnly:
+                        continue
+                    else:
+                        resTag = "ITEM"
+                xmlBodyText = _xml_escape(_ustr(res))
+                out += [ nl, nextLevelIndent, "<", resTag, ">",
+                                                xmlBodyText,
+                                                "</", resTag, ">" ]
+
+        out += [ nl, indent, "</", selfTag, ">" ]
+        return "".join(out)
+
+    def __lookup(self,sub):
+        for k,vlist in self.__tokdict.items():
+            for v,loc in vlist:
+                if sub is v:
+                    return k
+        return None
+
+    def getName(self):
+        """
+        Returns the results name for this token expression. Useful when several 
+        different expressions might match at a particular location.
+
+        Example::
+            integer = Word(nums)
+            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
+            house_number_expr = Suppress('#') + Word(nums, alphanums)
+            user_data = (Group(house_number_expr)("house_number") 
+                        | Group(ssn_expr)("ssn")
+                        | Group(integer)("age"))
+            user_info = OneOrMore(user_data)
+            
+            result = user_info.parseString("22 111-22-3333 #221B")
+            for item in result:
+                print(item.getName(), ':', item[0])
+        prints::
+            age : 22
+            ssn : 111-22-3333
+            house_number : 221B
+        """
+        if self.__name:
+            return self.__name
+        elif self.__parent:
+            par = self.__parent()
+            if par:
+                return par.__lookup(self)
+            else:
+                return None
+        elif (len(self) == 1 and
+               len(self.__tokdict) == 1 and
+               next(iter(self.__tokdict.values()))[0][1] in (0,-1)):
+            return next(iter(self.__tokdict.keys()))
+        else:
+            return None
+
+    def dump(self, indent='', depth=0, full=True):
+        """
+        Diagnostic method for listing out the contents of a C{ParseResults}.
+        Accepts an optional C{indent} argument so that this string can be embedded
+        in a nested display of other data.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(result.dump())
+        prints::
+            ['12', '/', '31', '/', '1999']
+            - day: 1999
+            - month: 31
+            - year: 12
+        """
+        out = []
+        NL = '\n'
+        out.append( indent+_ustr(self.asList()) )
+        if full:
+            if self.haskeys():
+                items = sorted((str(k), v) for k,v in self.items())
+                for k,v in items:
+                    if out:
+                        out.append(NL)
+                    out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
+                    if isinstance(v,ParseResults):
+                        if v:
+                            out.append( v.dump(indent,depth+1) )
+                        else:
+                            out.append(_ustr(v))
+                    else:
+                        out.append(repr(v))
+            elif any(isinstance(vv,ParseResults) for vv in self):
+                v = self
+                for i,vv in enumerate(v):
+                    if isinstance(vv,ParseResults):
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
+                    else:
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
+            
+        return "".join(out)
+
+    def pprint(self, *args, **kwargs):
+        """
+        Pretty-printer for parsed results as a list, using the C{pprint} module.
+        Accepts additional positional or keyword args as defined for the 
+        C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})
+
+        Example::
+            ident = Word(alphas, alphanums)
+            num = Word(nums)
+            func = Forward()
+            term = ident | num | Group('(' + func + ')')
+            func <<= ident + Group(Optional(delimitedList(term)))
+            result = func.parseString("fna a,b,(fnb c,d,200),100")
+            result.pprint(width=40)
+        prints::
+            ['fna',
+             ['a',
+              'b',
+              ['(', 'fnb', ['c', 'd', '200'], ')'],
+              '100']]
+        """
+        pprint.pprint(self.asList(), *args, **kwargs)
+
+    # add support for pickle protocol
+    def __getstate__(self):
+        return ( self.__toklist,
+                 ( self.__tokdict.copy(),
+                   self.__parent is not None and self.__parent() or None,
+                   self.__accumNames,
+                   self.__name ) )
+
+    def __setstate__(self,state):
+        self.__toklist = state[0]
+        (self.__tokdict,
+         par,
+         inAccumNames,
+         self.__name) = state[1]
+        self.__accumNames = {}
+        self.__accumNames.update(inAccumNames)
+        if par is not None:
+            self.__parent = wkref(par)
+        else:
+            self.__parent = None
+
+    def __getnewargs__(self):
+        return self.__toklist, self.__name, self.__asList, self.__modal
+
+    def __dir__(self):
+        return (dir(type(self)) + list(self.keys()))
+
+collections.MutableMapping.register(ParseResults)
+
+def col (loc,strg):
+    """Returns current column within a string, counting newlines as line separators.
+   The first column is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    s = strg
+    return 1 if 0<loc<len(s) and s[loc-1] == '\n' else loc - s.rfind("\n", 0, loc)
+
+def lineno(loc,strg):
+    """Returns current line number within a string, counting newlines as line separators.
+   The first line is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    return strg.count("\n",0,loc) + 1
+
+def line( loc, strg ):
+    """Returns the line of text containing loc within a string, counting newlines as line separators.
+       """
+    lastCR = strg.rfind("\n", 0, loc)
+    nextCR = strg.find("\n", loc)
+    if nextCR >= 0:
+        return strg[lastCR+1:nextCR]
+    else:
+        return strg[lastCR+1:]
+
+def _defaultStartDebugAction( instring, loc, expr ):
+    print (("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )))
+
+def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ):
+    print ("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
+
+def _defaultExceptionDebugAction( instring, loc, expr, exc ):
+    print ("Exception raised:" + _ustr(exc))
+
+def nullDebugAction(*args):
+    """'Do-nothing' debug action, to suppress debugging output during parsing."""
+    pass
+
+# Only works on Python 3.x - nonlocal is toxic to Python 2 installs
+#~ 'decorator to trim function calls to match the arity of the target'
+#~ def _trim_arity(func, maxargs=3):
+    #~ if func in singleArgBuiltins:
+        #~ return lambda s,l,t: func(t)
+    #~ limit = 0
+    #~ foundArity = False
+    #~ def wrapper(*args):
+        #~ nonlocal limit,foundArity
+        #~ while 1:
+            #~ try:
+                #~ ret = func(*args[limit:])
+                #~ foundArity = True
+                #~ return ret
+            #~ except TypeError:
+                #~ if limit == maxargs or foundArity:
+                    #~ raise
+                #~ limit += 1
+                #~ continue
+    #~ return wrapper
+
+# this version is Python 2.x-3.x cross-compatible
+'decorator to trim function calls to match the arity of the target'
+def _trim_arity(func, maxargs=2):
+    if func in singleArgBuiltins:
+        return lambda s,l,t: func(t)
+    limit = [0]
+    foundArity = [False]
+    
+    # traceback return data structure changed in Py3.5 - normalize back to plain tuples
+    if system_version[:2] >= (3,5):
+        def extract_stack(limit=0):
+            # special handling for Python 3.5.0 - extra deep call stack by 1
+            offset = -3 if system_version == (3,5,0) else -2
+            frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
+            return [(frame_summary.filename, frame_summary.lineno)]
+        def extract_tb(tb, limit=0):
+            frames = traceback.extract_tb(tb, limit=limit)
+            frame_summary = frames[-1]
+            return [(frame_summary.filename, frame_summary.lineno)]
+    else:
+        extract_stack = traceback.extract_stack
+        extract_tb = traceback.extract_tb
+    
+    # synthesize what would be returned by traceback.extract_stack at the call to 
+    # user's parse action 'func', so that we don't incur call penalty at parse time
+    
+    LINE_DIFF = 6
+    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND 
+    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
+    this_line = extract_stack(limit=2)[-1]
+    pa_call_line_synth = (this_line[0], this_line[1]+LINE_DIFF)
+
+    def wrapper(*args):
+        while 1:
+            try:
+                ret = func(*args[limit[0]:])
+                foundArity[0] = True
+                return ret
+            except TypeError:
+                # re-raise TypeErrors if they did not come from our arity testing
+                if foundArity[0]:
+                    raise
+                else:
+                    try:
+                        tb = sys.exc_info()[-1]
+                        if not extract_tb(tb, limit=2)[-1][:2] == pa_call_line_synth:
+                            raise
+                    finally:
+                        del tb
+
+                if limit[0] <= maxargs:
+                    limit[0] += 1
+                    continue
+                raise
+
+    # copy func name to wrapper for sensible debug output
+    func_name = "<parse action>"
+    try:
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    wrapper.__name__ = func_name
+
+    return wrapper
+
+class ParserElement(object):
+    """Abstract base level parser element class."""
+    DEFAULT_WHITE_CHARS = " \n\t\r"
+    verbose_stacktrace = False
+
+    @staticmethod
+    def setDefaultWhitespaceChars( chars ):
+        r"""
+        Overrides the default whitespace chars
+
+        Example::
+            # default whitespace chars are space, <TAB> and newline
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
+            
+            # change to just treat newline as significant
+            ParserElement.setDefaultWhitespaceChars(" \t")
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def']
+        """
+        ParserElement.DEFAULT_WHITE_CHARS = chars
+
+    @staticmethod
+    def inlineLiteralsUsing(cls):
+        """
+        Set class to be used for inclusion of string literals into a parser.
+        
+        Example::
+            # default literal class used is Literal
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+
+            # change to Suppress
+            ParserElement.inlineLiteralsUsing(Suppress)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '12', '31']
+        """
+        ParserElement._literalStringClass = cls
+
+    def __init__( self, savelist=False ):
+        self.parseAction = list()
+        self.failAction = None
+        #~ self.name = "<unknown>"  # don't define self.name, let subclasses try/except upcall
+        self.strRepr = None
+        self.resultsName = None
+        self.saveAsList = savelist
+        self.skipWhitespace = True
+        self.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        self.copyDefaultWhiteChars = True
+        self.mayReturnEmpty = False # used when checking for left-recursion
+        self.keepTabs = False
+        self.ignoreExprs = list()
+        self.debug = False
+        self.streamlined = False
+        self.mayIndexError = True # used to optimize exception handling for subclasses that don't advance parse index
+        self.errmsg = ""
+        self.modalResults = True # used to mark results names as modal (report only last) or cumulative (list all)
+        self.debugActions = ( None, None, None ) #custom debug actions
+        self.re = None
+        self.callPreparse = True # used to avoid redundant calls to preParse
+        self.callDuringTry = False
+
+    def copy( self ):
+        """
+        Make a copy of this C{ParserElement}.  Useful for defining different parse actions
+        for the same parsing pattern, using copies of the original parse element.
+        
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            integerK = integer.copy().addParseAction(lambda toks: toks[0]*1024) + Suppress("K")
+            integerM = integer.copy().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+            
+            print(OneOrMore(integerK | integerM | integer).parseString("5K 100 640K 256M"))
+        prints::
+            [5120, 100, 655360, 268435456]
+        Equivalent form of C{expr.copy()} is just C{expr()}::
+            integerM = integer().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+        """
+        cpy = copy.copy( self )
+        cpy.parseAction = self.parseAction[:]
+        cpy.ignoreExprs = self.ignoreExprs[:]
+        if self.copyDefaultWhiteChars:
+            cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        return cpy
+
+    def setName( self, name ):
+        """
+        Define name for this expression, makes debugging and exception messages clearer.
+        
+        Example::
+            Word(nums).parseString("ABC")  # -> Exception: Expected W:(0123...) (at char 0), (line:1, col:1)
+            Word(nums).setName("integer").parseString("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+        """
+        self.name = name
+        self.errmsg = "Expected " + self.name
+        if hasattr(self,"exception"):
+            self.exception.msg = self.errmsg
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        """
+        Define name for referencing matching tokens as a nested attribute
+        of the returned parse results.
+        NOTE: this returns a *copy* of the original C{ParserElement} object;
+        this is so that the client can define a basic element, such as an
+        integer, and reference it in multiple places with different names.
+
+        You can also set results names using the abbreviated syntax,
+        C{expr("name")} in place of C{expr.setResultsName("name")} - 
+        see L{I{__call__}<__call__>}.
+
+        Example::
+            date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+
+            # equivalent form:
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+        """
+        newself = self.copy()
+        if name.endswith("*"):
+            name = name[:-1]
+            listAllMatches=True
+        newself.resultsName = name
+        newself.modalResults = not listAllMatches
+        return newself
+
+    def setBreak(self,breakFlag = True):
+        """Method to invoke the Python pdb debugger when this element is
+           about to be parsed. Set C{breakFlag} to True to enable, False to
+           disable.
+        """
+        if breakFlag:
+            _parseMethod = self._parse
+            def breaker(instring, loc, doActions=True, callPreParse=True):
+                import pdb
+                pdb.set_trace()
+                return _parseMethod( instring, loc, doActions, callPreParse )
+            breaker._originalParseMethod = _parseMethod
+            self._parse = breaker
+        else:
+            if hasattr(self._parse,"_originalParseMethod"):
+                self._parse = self._parse._originalParseMethod
+        return self
+
+    def setParseAction( self, *fns, **kwargs ):
+        """
+        Define action to perform when successfully matching parse element definition.
+        Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
+        C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
+         - s   = the original string being parsed (see note below)
+         - loc = the location of the matching substring
+         - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
+        If the functions in fns modify the tokens, they can return them as the return
+        value from fn, and the modified list of tokens will replace the original.
+        Otherwise, fn does not need to return any value.
+
+        Optional keyword arguments:
+         - callDuringTry = (default=C{False}) indicate if parse action should be run during lookaheads and alternate testing
+
+        Note: the default parsing behavior is to expand tabs in the input string
+        before starting the parsing process.  See L{I{parseString}<parseString>} for more information
+        on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+        consistent view of the parsed string, the parse location, and line and column
+        positions within the parsed string.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer + '/' + integer + '/' + integer
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+            # use parse action to convert to ints at parse time
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            date_str = integer + '/' + integer + '/' + integer
+
+            # note that integer fields are now ints, not strings
+            date_str.parseString("1999/12/31")  # -> [1999, '/', 12, '/', 31]
+        """
+        self.parseAction = list(map(_trim_arity, list(fns)))
+        self.callDuringTry = kwargs.get("callDuringTry", False)
+        return self
+
+    def addParseAction( self, *fns, **kwargs ):
+        """
+        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
+        
+        See examples in L{I{copy}<copy>}.
+        """
+        self.parseAction += list(map(_trim_arity, list(fns)))
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def addCondition(self, *fns, **kwargs):
+        """Add a boolean predicate function to expression's list of parse actions. See 
+        L{I{setParseAction}<setParseAction>} for function call signatures. Unlike C{setParseAction}, 
+        functions passed to C{addCondition} need to return boolean success/fail of the condition.
+
+        Optional keyword arguments:
+         - message = define a custom message to be used in the raised exception
+         - fatal   = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise ParseException
+         
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            year_int = integer.copy()
+            year_int.addCondition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
+            date_str = year_int + '/' + integer + '/' + integer
+
+            result = date_str.parseString("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0), (line:1, col:1)
+        """
+        msg = kwargs.get("message", "failed user-defined condition")
+        exc_type = ParseFatalException if kwargs.get("fatal", False) else ParseException
+        for fn in fns:
+            def pa(s,l,t):
+                if not bool(_trim_arity(fn)(s,l,t)):
+                    raise exc_type(s,l,msg)
+            self.parseAction.append(pa)
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def setFailAction( self, fn ):
+        """Define action to perform if parsing fails at this expression.
+           Fail acton fn is a callable function that takes the arguments
+           C{fn(s,loc,expr,err)} where:
+            - s = string being parsed
+            - loc = location where expression match was attempted and failed
+            - expr = the parse expression that failed
+            - err = the exception thrown
+           The function returns no value.  It may throw C{L{ParseFatalException}}
+           if it is desired to stop parsing immediately."""
+        self.failAction = fn
+        return self
+
+    def _skipIgnorables( self, instring, loc ):
+        exprsFound = True
+        while exprsFound:
+            exprsFound = False
+            for e in self.ignoreExprs:
+                try:
+                    while 1:
+                        loc,dummy = e._parse( instring, loc )
+                        exprsFound = True
+                except ParseException:
+                    pass
+        return loc
+
+    def preParse( self, instring, loc ):
+        if self.ignoreExprs:
+            loc = self._skipIgnorables( instring, loc )
+
+        if self.skipWhitespace:
+            wt = self.whiteChars
+            instrlen = len(instring)
+            while loc < instrlen and instring[loc] in wt:
+                loc += 1
+
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        return loc, []
+
+    def postParse( self, instring, loc, tokenlist ):
+        return tokenlist
+
+    #~ @profile
+    def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
+        debugging = ( self.debug ) #and doActions )
+
+        if debugging or self.failAction:
+            #~ print ("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
+            if (self.debugActions[0] ):
+                self.debugActions[0]( instring, loc, self )
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            try:
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            except ParseBaseException as err:
+                #~ print ("Exception raised:", err)
+                if self.debugActions[2]:
+                    self.debugActions[2]( instring, tokensStart, self, err )
+                if self.failAction:
+                    self.failAction( instring, tokensStart, self, err )
+                raise
+        else:
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            if self.mayIndexError or loc >= len(instring):
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            else:
+                loc,tokens = self.parseImpl( instring, preloc, doActions )
+
+        tokens = self.postParse( instring, loc, tokens )
+
+        retTokens = ParseResults( tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults )
+        if self.parseAction and (doActions or self.callDuringTry):
+            if debugging:
+                try:
+                    for fn in self.parseAction:
+                        tokens = fn( instring, tokensStart, retTokens )
+                        if tokens is not None:
+                            retTokens = ParseResults( tokens,
+                                                      self.resultsName,
+                                                      asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                      modal=self.modalResults )
+                except ParseBaseException as err:
+                    #~ print "Exception raised in user parse action:", err
+                    if (self.debugActions[2] ):
+                        self.debugActions[2]( instring, tokensStart, self, err )
+                    raise
+            else:
+                for fn in self.parseAction:
+                    tokens = fn( instring, tokensStart, retTokens )
+                    if tokens is not None:
+                        retTokens = ParseResults( tokens,
+                                                  self.resultsName,
+                                                  asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                  modal=self.modalResults )
+
+        if debugging:
+            #~ print ("Matched",self,"->",retTokens.asList())
+            if (self.debugActions[1] ):
+                self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
+
+        return loc, retTokens
+
+    def tryParse( self, instring, loc ):
+        try:
+            return self._parse( instring, loc, doActions=False )[0]
+        except ParseFatalException:
+            raise ParseException( instring, loc, self.errmsg, self)
+    
+    def canParseNext(self, instring, loc):
+        try:
+            self.tryParse(instring, loc)
+        except (ParseException, IndexError):
+            return False
+        else:
+            return True
+
+    class _UnboundedCache(object):
+        def __init__(self):
+            cache = {}
+            self.not_in_cache = not_in_cache = object()
+
+            def get(self, key):
+                return cache.get(key, not_in_cache)
+
+            def set(self, key, value):
+                cache[key] = value
+
+            def clear(self):
+                cache.clear()
+
+            self.get = types.MethodType(get, self)
+            self.set = types.MethodType(set, self)
+            self.clear = types.MethodType(clear, self)
+
+    if _OrderedDict is not None:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = _OrderedDict()
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.popitem(False)
+
+                def clear(self):
+                    cache.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    else:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = {}
+                key_fifo = collections.deque([], size)
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.pop(key_fifo.popleft(), None)
+                    key_fifo.append(key)
+
+                def clear(self):
+                    cache.clear()
+                    key_fifo.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    # argument cache for optimizing repeated calls when backtracking through recursive expressions
+    packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
+    packrat_cache_lock = RLock()
+    packrat_cache_stats = [0, 0]
+
+    # this method gets repeatedly called during backtracking with the same arguments -
+    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
+    def _parseCache( self, instring, loc, doActions=True, callPreParse=True ):
+        HIT, MISS = 0, 1
+        lookup = (self, instring, loc, callPreParse, doActions)
+        with ParserElement.packrat_cache_lock:
+            cache = ParserElement.packrat_cache
+            value = cache.get(lookup)
+            if value is cache.not_in_cache:
+                ParserElement.packrat_cache_stats[MISS] += 1
+                try:
+                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
+                except ParseBaseException as pe:
+                    # cache a copy of the exception, without the traceback
+                    cache.set(lookup, pe.__class__(*pe.args))
+                    raise
+                else:
+                    cache.set(lookup, (value[0], value[1].copy()))
+                    return value
+            else:
+                ParserElement.packrat_cache_stats[HIT] += 1
+                if isinstance(value, Exception):
+                    raise value
+                return (value[0], value[1].copy())
+
+    _parse = _parseNoCache
+
+    @staticmethod
+    def resetCache():
+        ParserElement.packrat_cache.clear()
+        ParserElement.packrat_cache_stats[:] = [0] * len(ParserElement.packrat_cache_stats)
+
+    _packratEnabled = False
+    @staticmethod
+    def enablePackrat(cache_size_limit=128):
+        """Enables "packrat" parsing, which adds memoizing to the parsing logic.
+           Repeated parse attempts at the same string location (which happens
+           often in many complex grammars) can immediately return a cached value,
+           instead of re-executing parsing/validating code.  Memoizing is done of
+           both valid results and parsing exceptions.
+           
+           Parameters:
+            - cache_size_limit - (default=C{128}) - if an integer value is provided
+              will limit the size of the packrat cache; if None is passed, then
+              the cache size will be unbounded; if 0 is passed, the cache will
+              be effectively disabled.
+            
+           This speedup may break existing programs that use parse actions that
+           have side-effects.  For this reason, packrat parsing is disabled when
+           you first import pyparsing.  To activate the packrat feature, your
+           program must call the class method C{ParserElement.enablePackrat()}.  If
+           your program uses C{psyco} to "compile as you go", you must call
+           C{enablePackrat} before calling C{psyco.full()}.  If you do not do this,
+           Python will crash.  For best results, call C{enablePackrat()} immediately
+           after importing pyparsing.
+           
+           Example::
+               import pyparsing
+               pyparsing.ParserElement.enablePackrat()
+        """
+        if not ParserElement._packratEnabled:
+            ParserElement._packratEnabled = True
+            if cache_size_limit is None:
+                ParserElement.packrat_cache = ParserElement._UnboundedCache()
+            else:
+                ParserElement.packrat_cache = ParserElement._FifoCache(cache_size_limit)
+            ParserElement._parse = ParserElement._parseCache
+
+    def parseString( self, instring, parseAll=False ):
+        """
+        Execute the parse expression with the given string.
+        This is the main interface to the client code, once the complete
+        expression has been built.
+
+        If you want the grammar to require that the entire input string be
+        successfully parsed, then set C{parseAll} to True (equivalent to ending
+        the grammar with C{L{StringEnd()}}).
+
+        Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
+        in order to report proper column numbers in parse actions.
+        If the input string contains tabs and
+        the grammar uses parse actions that use the C{loc} argument to index into the
+        string being parsed, you can ensure you have a consistent view of the input
+        string by:
+         - calling C{parseWithTabs} on your grammar before calling C{parseString}
+           (see L{I{parseWithTabs}<parseWithTabs>})
+         - define your parse action using the full C{(s,loc,toks)} signature, and
+           reference the input string using the parse action's C{s} argument
+         - explictly expand the tabs in your input string before calling
+           C{parseString}
+        
+        Example::
+            Word('a').parseString('aaaaabaaa')  # -> ['aaaaa']
+            Word('a').parseString('aaaaabaaa', parseAll=True)  # -> Exception: Expected end of text
+        """
+        ParserElement.resetCache()
+        if not self.streamlined:
+            self.streamline()
+            #~ self.saveAsList = True
+        for e in self.ignoreExprs:
+            e.streamline()
+        if not self.keepTabs:
+            instring = instring.expandtabs()
+        try:
+            loc, tokens = self._parse( instring, 0 )
+            if parseAll:
+                loc = self.preParse( instring, loc )
+                se = Empty() + StringEnd()
+                se._parse( instring, loc )
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+        else:
+            return tokens
+
+    def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
+        """
+        Scan the input string for expression matches.  Each match will return the
+        matching tokens, start location, and end location.  May be called with optional
+        C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
+        C{overlap} is specified, then overlapping matches will be reported.
+
+        Note that the start and end locations are reported relative to the string
+        being parsed.  See L{I{parseString}<parseString>} for more information on parsing
+        strings with embedded tabs.
+
+        Example::
+            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
+            print(source)
+            for tokens,start,end in Word(alphas).scanString(source):
+                print(' '*start + '^'*(end-start))
+                print(' '*start + tokens[0])
+        
+        prints::
+        
+            sldjf123lsdjjkf345sldkjf879lkjsfd987
+            ^^^^^
+            sldjf
+                    ^^^^^^^
+                    lsdjjkf
+                              ^^^^^^
+                              sldkjf
+                                       ^^^^^^
+                                       lkjsfd
+        """
+        if not self.streamlined:
+            self.streamline()
+        for e in self.ignoreExprs:
+            e.streamline()
+
+        if not self.keepTabs:
+            instring = _ustr(instring).expandtabs()
+        instrlen = len(instring)
+        loc = 0
+        preparseFn = self.preParse
+        parseFn = self._parse
+        ParserElement.resetCache()
+        matches = 0
+        try:
+            while loc <= instrlen and matches < maxMatches:
+                try:
+                    preloc = preparseFn( instring, loc )
+                    nextLoc,tokens = parseFn( instring, preloc, callPreParse=False )
+                except ParseException:
+                    loc = preloc+1
+                else:
+                    if nextLoc > loc:
+                        matches += 1
+                        yield tokens, preloc, nextLoc
+                        if overlap:
+                            nextloc = preparseFn( instring, loc )
+                            if nextloc > loc:
+                                loc = nextLoc
+                            else:
+                                loc += 1
+                        else:
+                            loc = nextLoc
+                    else:
+                        loc = preloc+1
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def transformString( self, instring ):
+        """
+        Extension to C{L{scanString}}, to modify matching text with modified tokens that may
+        be returned from a parse action.  To use C{transformString}, define a grammar and
+        attach a parse action to it that modifies the returned token list.
+        Invoking C{transformString()} on a target string will then scan for matches,
+        and replace the matched text patterns according to the logic in the parse
+        action.  C{transformString()} returns the resulting transformed string.
+        
+        Example::
+            wd = Word(alphas)
+            wd.setParseAction(lambda toks: toks[0].title())
+            
+            print(wd.transformString("now is the winter of our discontent made glorious summer by this sun of york."))
+        Prints::
+            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
+        """
+        out = []
+        lastE = 0
+        # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
+        # keep string locs straight between transformString and scanString
+        self.keepTabs = True
+        try:
+            for t,s,e in self.scanString( instring ):
+                out.append( instring[lastE:s] )
+                if t:
+                    if isinstance(t,ParseResults):
+                        out += t.asList()
+                    elif isinstance(t,list):
+                        out += t
+                    else:
+                        out.append(t)
+                lastE = e
+            out.append(instring[lastE:])
+            out = [o for o in out if o]
+            return "".join(map(_ustr,_flatten(out)))
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def searchString( self, instring, maxMatches=_MAX_INT ):
+        """
+        Another extension to C{L{scanString}}, simplifying the access to the tokens found
+        to match the given parse expression.  May be called with optional
+        C{maxMatches} argument, to clip searching after 'n' matches are found.
+        
+        Example::
+            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
+            cap_word = Word(alphas.upper(), alphas.lower())
+            
+            print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
+        prints::
+            ['More', 'Iron', 'Lead', 'Gold', 'I']
+        """
+        try:
+            return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def split(self, instring, maxsplit=_MAX_INT, includeSeparators=False):
+        """
+        Generator method to split a string using the given expression as a separator.
+        May be called with optional C{maxsplit} argument, to limit the number of splits;
+        and the optional C{includeSeparators} argument (default=C{False}), if the separating
+        matching text should be included in the split results.
+        
+        Example::        
+            punc = oneOf(list(".,;:/-!?"))
+            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
+        prints::
+            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
+        """
+        splits = 0
+        last = 0
+        for t,s,e in self.scanString(instring, maxMatches=maxsplit):
+            yield instring[last:s]
+            if includeSeparators:
+                yield t[0]
+            last = e
+        yield instring[last:]
+
+    def __add__(self, other ):
+        """
+        Implementation of + operator - returns C{L{And}}. Adding strings to a ParserElement
+        converts them to L{Literal}s by default.
+        
+        Example::
+            greet = Word(alphas) + "," + Word(alphas) + "!"
+            hello = "Hello, World!"
+            print (hello, "->", greet.parseString(hello))
+        Prints::
+            Hello, World! -> ['Hello', ',', 'World', '!']
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, other ] )
+
+    def __radd__(self, other ):
+        """
+        Implementation of + operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other + self
+
+    def __sub__(self, other):
+        """
+        Implementation of - operator, returns C{L{And}} with error stop
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, And._ErrorStop(), other ] )
+
+    def __rsub__(self, other ):
+        """
+        Implementation of - operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other - self
+
+    def __mul__(self,other):
+        """
+        Implementation of * operator, allows use of C{expr * 3} in place of
+        C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
+        tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
+        may also include C{None} as in:
+         - C{expr*(n,None)} or C{expr*(n,)} is equivalent
+              to C{expr*n + L{ZeroOrMore}(expr)}
+              (read as "at least n instances of C{expr}")
+         - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
+              (read as "0 to n instances of C{expr}")
+         - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
+         - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
+
+        Note that C{expr*(None,n)} does not raise an exception if
+        more than n exprs exist in the input stream; that is,
+        C{expr*(None,n)} does not enforce a maximum number of expr
+        occurrences.  If this behavior is desired, then write
+        C{expr*(None,n) + ~expr}
+        """
+        if isinstance(other,int):
+            minElements, optElements = other,0
+        elif isinstance(other,tuple):
+            other = (other + (None, None))[:2]
+            if other[0] is None:
+                other = (0, other[1])
+            if isinstance(other[0],int) and other[1] is None:
+                if other[0] == 0:
+                    return ZeroOrMore(self)
+                if other[0] == 1:
+                    return OneOrMore(self)
+                else:
+                    return self*other[0] + ZeroOrMore(self)
+            elif isinstance(other[0],int) and isinstance(other[1],int):
+                minElements, optElements = other
+                optElements -= minElements
+            else:
+                raise TypeError("cannot multiply 'ParserElement' and ('%s','%s') objects", type(other[0]),type(other[1]))
+        else:
+            raise TypeError("cannot multiply 'ParserElement' and '%s' objects", type(other))
+
+        if minElements < 0:
+            raise ValueError("cannot multiply ParserElement by negative value")
+        if optElements < 0:
+            raise ValueError("second tuple value must be greater or equal to first tuple value")
+        if minElements == optElements == 0:
+            raise ValueError("cannot multiply ParserElement by 0 or (0,0)")
+
+        if (optElements):
+            def makeOptionalList(n):
+                if n>1:
+                    return Optional(self + makeOptionalList(n-1))
+                else:
+                    return Optional(self)
+            if minElements:
+                if minElements == 1:
+                    ret = self + makeOptionalList(optElements)
+                else:
+                    ret = And([self]*minElements) + makeOptionalList(optElements)
+            else:
+                ret = makeOptionalList(optElements)
+        else:
+            if minElements == 1:
+                ret = self
+            else:
+                ret = And([self]*minElements)
+        return ret
+
+    def __rmul__(self, other):
+        return self.__mul__(other)
+
+    def __or__(self, other ):
+        """
+        Implementation of | operator - returns C{L{MatchFirst}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return MatchFirst( [ self, other ] )
+
+    def __ror__(self, other ):
+        """
+        Implementation of | operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other | self
+
+    def __xor__(self, other ):
+        """
+        Implementation of ^ operator - returns C{L{Or}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Or( [ self, other ] )
+
+    def __rxor__(self, other ):
+        """
+        Implementation of ^ operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other ^ self
+
+    def __and__(self, other ):
+        """
+        Implementation of & operator - returns C{L{Each}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Each( [ self, other ] )
+
+    def __rand__(self, other ):
+        """
+        Implementation of & operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other & self
+
+    def __invert__( self ):
+        """
+        Implementation of ~ operator - returns C{L{NotAny}}
+        """
+        return NotAny( self )
+
+    def __call__(self, name=None):
+        """
+        Shortcut for C{L{setResultsName}}, with C{listAllMatches=False}.
+        
+        If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
+        passed as C{True}.
+           
+        If C{name} is omitted, same as calling C{L{copy}}.
+
+        Example::
+            # these are equivalent
+            userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
+            userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")             
+        """
+        if name is not None:
+            return self.setResultsName(name)
+        else:
+            return self.copy()
+
+    def suppress( self ):
+        """
+        Suppresses the output of this C{ParserElement}; useful to keep punctuation from
+        cluttering up returned output.
+        """
+        return Suppress( self )
+
+    def leaveWhitespace( self ):
+        """
+        Disables the skipping of whitespace before matching the characters in the
+        C{ParserElement}'s defined pattern.  This is normally only used internally by
+        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
+        """
+        self.skipWhitespace = False
+        return self
+
+    def setWhitespaceChars( self, chars ):
+        """
+        Overrides the default whitespace chars
+        """
+        self.skipWhitespace = True
+        self.whiteChars = chars
+        self.copyDefaultWhiteChars = False
+        return self
+
+    def parseWithTabs( self ):
+        """
+        Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
+        Must be called before C{parseString} when the input grammar contains elements that
+        match C{<TAB>} characters.
+        """
+        self.keepTabs = True
+        return self
+
+    def ignore( self, other ):
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        
+        Example::
+            patt = OneOrMore(Word(alphas))
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj']
+            
+            patt.ignore(cStyleComment)
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj', 'lskjd']
+        """
+        if isinstance(other, basestring):
+            other = Suppress(other)
+
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                self.ignoreExprs.append(other)
+        else:
+            self.ignoreExprs.append( Suppress( other.copy() ) )
+        return self
+
+    def setDebugActions( self, startAction, successAction, exceptionAction ):
+        """
+        Enable display of debugging messages while doing pattern matching.
+        """
+        self.debugActions = (startAction or _defaultStartDebugAction,
+                             successAction or _defaultSuccessDebugAction,
+                             exceptionAction or _defaultExceptionDebugAction)
+        self.debug = True
+        return self
+
+    def setDebug( self, flag=True ):
+        """
+        Enable display of debugging messages while doing pattern matching.
+        Set C{flag} to True to enable, False to disable.
+
+        Example::
+            wd = Word(alphas).setName("alphaword")
+            integer = Word(nums).setName("numword")
+            term = wd | integer
+            
+            # turn on debugging for wd
+            wd.setDebug()
+
+            OneOrMore(term).parseString("abc 123 xyz 890")
+        
+        prints::
+            Match alphaword at loc 0(1,1)
+            Matched alphaword -> ['abc']
+            Match alphaword at loc 3(1,4)
+            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
+            Match alphaword at loc 7(1,8)
+            Matched alphaword -> ['xyz']
+            Match alphaword at loc 11(1,12)
+            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
+            Match alphaword at loc 15(1,16)
+            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
+
+        The output shown is that produced by the default debug actions - custom debug actions can be
+        specified using L{setDebugActions}. Prior to attempting
+        to match the C{wd} expression, the debugging message C{"Match <exprname> at loc <n>(<line>,<col>)"}
+        is shown. Then if the parse succeeds, a C{"Matched"} message is shown, or an C{"Exception raised"}
+        message is shown. Also note the use of L{setName} to assign a human-readable name to the expression,
+        which makes debugging and exception messages easier to understand - for instance, the default
+        name created for the C{Word} expression without calling C{setName} is C{"W:(ABCD...)"}.
+        """
+        if flag:
+            self.setDebugActions( _defaultStartDebugAction, _defaultSuccessDebugAction, _defaultExceptionDebugAction )
+        else:
+            self.debug = False
+        return self
+
+    def __str__( self ):
+        return self.name
+
+    def __repr__( self ):
+        return _ustr(self)
+
+    def streamline( self ):
+        self.streamlined = True
+        self.strRepr = None
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        pass
+
+    def validate( self, validateTrace=[] ):
+        """
+        Check defined expressions for valid structure, check for infinite recursive definitions.
+        """
+        self.checkRecursion( [] )
+
+    def parseFile( self, file_or_filename, parseAll=False ):
+        """
+        Execute the parse expression on the given file or filename.
+        If a filename is specified (instead of a file object),
+        the entire file is opened, read, and closed before parsing.
+        """
+        try:
+            file_contents = file_or_filename.read()
+        except AttributeError:
+            with open(file_or_filename, "r") as f:
+                file_contents = f.read()
+        try:
+            return self.parseString(file_contents, parseAll)
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def __eq__(self,other):
+        if isinstance(other, ParserElement):
+            return self is other or vars(self) == vars(other)
+        elif isinstance(other, basestring):
+            return self.matches(other)
+        else:
+            return super(ParserElement,self)==other
+
+    def __ne__(self,other):
+        return not (self == other)
+
+    def __hash__(self):
+        return hash(id(self))
+
+    def __req__(self,other):
+        return self == other
+
+    def __rne__(self,other):
+        return not (self == other)
+
+    def matches(self, testString, parseAll=True):
+        """
+        Method for quick testing of a parser against a test string. Good for simple 
+        inline microtests of sub expressions while building up larger parser.
+           
+        Parameters:
+         - testString - to test against this expression for a match
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests
+            
+        Example::
+            expr = Word(nums)
+            assert expr.matches("100")
+        """
+        try:
+            self.parseString(_ustr(testString), parseAll=parseAll)
+            return True
+        except ParseBaseException:
+            return False
+                
+    def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResults=True, failureTests=False):
+        """
+        Execute the parse expression on a series of test strings, showing each
+        test, the parsed results or where the parse failed. Quick and easy way to
+        run a parse expression against a list of sample strings.
+           
+        Parameters:
+         - tests - a list of separate test strings, or a multiline string of test strings
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests           
+         - comment - (default=C{'#'}) - expression for indicating embedded comments in the test 
+              string; pass None to disable comment filtering
+         - fullDump - (default=C{True}) - dump results as list followed by results names in nested outline;
+              if False, only dump nested list
+         - printResults - (default=C{True}) prints test output to stdout
+         - failureTests - (default=C{False}) indicates if these tests are expected to fail parsing
+
+        Returns: a (success, results) tuple, where success indicates that all tests succeeded
+        (or failed if C{failureTests} is True), and the results contain a list of lines of each 
+        test's output
+        
+        Example::
+            number_expr = pyparsing_common.number.copy()
+
+            result = number_expr.runTests('''
+                # unsigned integer
+                100
+                # negative integer
+                -100
+                # float with scientific notation
+                6.02e23
+                # integer with scientific notation
+                1e-12
+                ''')
+            print("Success" if result[0] else "Failed!")
+
+            result = number_expr.runTests('''
+                # stray character
+                100Z
+                # missing leading digit before '.'
+                -.100
+                # too many '.'
+                3.14.159
+                ''', failureTests=True)
+            print("Success" if result[0] else "Failed!")
+        prints::
+            # unsigned integer
+            100
+            [100]
+
+            # negative integer
+            -100
+            [-100]
+
+            # float with scientific notation
+            6.02e23
+            [6.02e+23]
+
+            # integer with scientific notation
+            1e-12
+            [1e-12]
+
+            Success
+            
+            # stray character
+            100Z
+               ^
+            FAIL: Expected end of text (at char 3), (line:1, col:4)
+
+            # missing leading digit before '.'
+            -.100
+            ^
+            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
+
+            # too many '.'
+            3.14.159
+                ^
+            FAIL: Expected end of text (at char 4), (line:1, col:5)
+
+            Success
+
+        Each test string must be on a single line. If you want to test a string that spans multiple
+        lines, create a test like this::
+
+            expr.runTest(r"this is a test\\n of strings that spans \\n 3 lines")
+        
+        (Note that this is a raw string literal, you must include the leading 'r'.)
+        """
+        if isinstance(tests, basestring):
+            tests = list(map(str.strip, tests.rstrip().splitlines()))
+        if isinstance(comment, basestring):
+            comment = Literal(comment)
+        allResults = []
+        comments = []
+        success = True
+        for t in tests:
+            if comment is not None and comment.matches(t, False) or comments and not t:
+                comments.append(t)
+                continue
+            if not t:
+                continue
+            out = ['\n'.join(comments), t]
+            comments = []
+            try:
+                t = t.replace(r'\n','\n')
+                result = self.parseString(t, parseAll=parseAll)
+                out.append(result.dump(full=fullDump))
+                success = success and not failureTests
+            except ParseBaseException as pe:
+                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
+                if '\n' in t:
+                    out.append(line(pe.loc, t))
+                    out.append(' '*(col(pe.loc,t)-1) + '^' + fatal)
+                else:
+                    out.append(' '*pe.loc + '^' + fatal)
+                out.append("FAIL: " + str(pe))
+                success = success and failureTests
+                result = pe
+            except Exception as exc:
+                out.append("FAIL-EXCEPTION: " + str(exc))
+                success = success and failureTests
+                result = exc
+
+            if printResults:
+                if fullDump:
+                    out.append('')
+                print('\n'.join(out))
+
+            allResults.append((t, result))
+        
+        return success, allResults
+
+        
+class Token(ParserElement):
+    """
+    Abstract C{ParserElement} subclass, for defining atomic matching patterns.
+    """
+    def __init__( self ):
+        super(Token,self).__init__( savelist=False )
+
+
+class Empty(Token):
+    """
+    An empty token, will always match.
+    """
+    def __init__( self ):
+        super(Empty,self).__init__()
+        self.name = "Empty"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+
+class NoMatch(Token):
+    """
+    A token that will never match.
+    """
+    def __init__( self ):
+        super(NoMatch,self).__init__()
+        self.name = "NoMatch"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.errmsg = "Unmatchable token"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
+class Literal(Token):
+    """
+    Token to exactly match a specified string.
+    
+    Example::
+        Literal('blah').parseString('blah')  # -> ['blah']
+        Literal('blah').parseString('blahfooblah')  # -> ['blah']
+        Literal('blah').parseString('bla')  # -> Exception: Expected "blah"
+    
+    For case-insensitive matching, use L{CaselessLiteral}.
+    
+    For keyword matching (force word break before and after the matched string),
+    use L{Keyword} or L{CaselessKeyword}.
+    """
+    def __init__( self, matchString ):
+        super(Literal,self).__init__()
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Literal; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+            self.__class__ = Empty
+        self.name = '"%s"' % _ustr(self.match)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+
+    # Performance tuning: this routine gets called a *lot*
+    # if this is a single character match string  and the first character matches,
+    # short-circuit as quickly as possible, and avoid calling startswith
+    #~ @profile
+    def parseImpl( self, instring, loc, doActions=True ):
+        if (instring[loc] == self.firstMatchChar and
+            (self.matchLen==1 or instring.startswith(self.match,loc)) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+_L = Literal
+ParserElement._literalStringClass = Literal
+
+class Keyword(Token):
+    """
+    Token to exactly match a specified string as a keyword, that is, it must be
+    immediately followed by a non-keyword character.  Compare with C{L{Literal}}:
+     - C{Literal("if")} will match the leading C{'if'} in C{'ifAndOnlyIf'}.
+     - C{Keyword("if")} will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
+    Accepts two optional constructor arguments in addition to the keyword string:
+     - C{identChars} is a string of characters that would be valid identifier characters,
+          defaulting to all alphanumerics + "_" and "$"
+     - C{caseless} allows case-insensitive matching, default is C{False}.
+       
+    Example::
+        Keyword("start").parseString("start")  # -> ['start']
+        Keyword("start").parseString("starting")  # -> Exception
+
+    For case-insensitive matching, use L{CaselessKeyword}.
+    """
+    DEFAULT_KEYWORD_CHARS = alphanums+"_$"
+
+    def __init__( self, matchString, identChars=None, caseless=False ):
+        super(Keyword,self).__init__()
+        if identChars is None:
+            identChars = Keyword.DEFAULT_KEYWORD_CHARS
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Keyword; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+        self.name = '"%s"' % self.match
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+        self.caseless = caseless
+        if caseless:
+            self.caselessmatch = matchString.upper()
+            identChars = identChars.upper()
+        self.identChars = set(identChars)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.caseless:
+            if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+                 (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) and
+                 (loc == 0 or instring[loc-1].upper() not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        else:
+            if (instring[loc] == self.firstMatchChar and
+                (self.matchLen==1 or instring.startswith(self.match,loc)) and
+                (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) and
+                (loc == 0 or instring[loc-1] not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+    def copy(self):
+        c = super(Keyword,self).copy()
+        c.identChars = Keyword.DEFAULT_KEYWORD_CHARS
+        return c
+
+    @staticmethod
+    def setDefaultKeywordChars( chars ):
+        """Overrides the default Keyword chars
+        """
+        Keyword.DEFAULT_KEYWORD_CHARS = chars
+
+class CaselessLiteral(Literal):
+    """
+    Token to match a specified string, ignoring case of letters.
+    Note: the matched results will always be in the case of the given
+    match string, NOT the case of the input text.
+
+    Example::
+        OneOrMore(CaselessLiteral("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessKeyword}.)
+    """
+    def __init__( self, matchString ):
+        super(CaselessLiteral,self).__init__( matchString.upper() )
+        # Preserve the defining literal.
+        self.returnString = matchString
+        self.name = "'%s'" % self.returnString
+        self.errmsg = "Expected " + self.name
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[ loc:loc+self.matchLen ].upper() == self.match:
+            return loc+self.matchLen, self.returnString
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class CaselessKeyword(Keyword):
+    """
+    Caseless version of L{Keyword}.
+
+    Example::
+        OneOrMore(CaselessKeyword("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessLiteral}.)
+    """
+    def __init__( self, matchString, identChars=None ):
+        super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+             (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class CloseMatch(Token):
+    """
+    A variation on L{Literal} which matches "close" matches, that is, 
+    strings with at most 'n' mismatching characters. C{CloseMatch} takes parameters:
+     - C{match_string} - string to be matched
+     - C{maxMismatches} - (C{default=1}) maximum number of mismatches allowed to count as a match
+    
+    The results from a successful parse will contain the matched text from the input string and the following named results:
+     - C{mismatches} - a list of the positions within the match_string where mismatches were found
+     - C{original} - the original match_string used to compare against the input string
+    
+    If C{mismatches} is an empty list, then the match was an exact match.
+    
+    Example::
+        patt = CloseMatch("ATCATCGAATGGA")
+        patt.parseString("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
+        patt.parseString("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
+
+        # exact match
+        patt.parseString("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
+
+        # close match allowing up to 2 mismatches
+        patt = CloseMatch("ATCATCGAATGGA", maxMismatches=2)
+        patt.parseString("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
+    """
+    def __init__(self, match_string, maxMismatches=1):
+        super(CloseMatch,self).__init__()
+        self.name = match_string
+        self.match_string = match_string
+        self.maxMismatches = maxMismatches
+        self.errmsg = "Expected %r (with up to %d mismatches)" % (self.match_string, self.maxMismatches)
+        self.mayIndexError = False
+        self.mayReturnEmpty = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        start = loc
+        instrlen = len(instring)
+        maxloc = start + len(self.match_string)
+
+        if maxloc <= instrlen:
+            match_string = self.match_string
+            match_stringloc = 0
+            mismatches = []
+            maxMismatches = self.maxMismatches
+
+            for match_stringloc,s_m in enumerate(zip(instring[loc:maxloc], self.match_string)):
+                src,mat = s_m
+                if src != mat:
+                    mismatches.append(match_stringloc)
+                    if len(mismatches) > maxMismatches:
+                        break
+            else:
+                loc = match_stringloc + 1
+                results = ParseResults([instring[start:loc]])
+                results['original'] = self.match_string
+                results['mismatches'] = mismatches
+                return loc, results
+
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
+class Word(Token):
+    """
+    Token for matching words composed of allowed character sets.
+    Defined with string containing all allowed initial characters,
+    an optional string containing allowed body characters (if omitted,
+    defaults to the initial character set), and an optional minimum,
+    maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction. An optional
+    C{excludeChars} parameter can list characters that might be found in 
+    the input C{bodyChars} string; useful to define a word of all printables
+    except for one or two characters, for instance.
+    
+    L{srange} is useful for defining custom character set strings for defining 
+    C{Word} expressions, using range notation from regular expression character sets.
+    
+    A common mistake is to use C{Word} to match a specific literal string, as in 
+    C{Word("Address")}. Remember that C{Word} uses the string argument to define
+    I{sets} of matchable characters. This expression would match "Add", "AAA",
+    "dAred", or any other word made up of the characters 'A', 'd', 'r', 'e', and 's'.
+    To match an exact literal string, use L{Literal} or L{Keyword}.
+
+    pyparsing includes helper strings for building Words:
+     - L{alphas}
+     - L{nums}
+     - L{alphanums}
+     - L{hexnums}
+     - L{alphas8bit} (alphabetic characters in ASCII range 128-255 - accented, tilded, umlauted, etc.)
+     - L{punc8bit} (non-alphabetic characters in ASCII range 128-255 - currency, symbols, superscripts, diacriticals, etc.)
+     - L{printables} (any non-whitespace character)
+
+    Example::
+        # a word composed of digits
+        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
+        
+        # a word with a leading capital, and zero or more lowercase
+        capital_word = Word(alphas.upper(), alphas.lower())
+
+        # hostnames are alphanumeric, with leading alpha, and '-'
+        hostname = Word(alphas, alphanums+'-')
+        
+        # roman numeral (not a strict parser, accepts invalid mix of characters)
+        roman = Word("IVXLCDM")
+        
+        # any string of non-whitespace characters, except for ','
+        csv_value = Word(printables, excludeChars=",")
+    """
+    def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False, excludeChars=None ):
+        super(Word,self).__init__()
+        if excludeChars:
+            initChars = ''.join(c for c in initChars if c not in excludeChars)
+            if bodyChars:
+                bodyChars = ''.join(c for c in bodyChars if c not in excludeChars)
+        self.initCharsOrig = initChars
+        self.initChars = set(initChars)
+        if bodyChars :
+            self.bodyCharsOrig = bodyChars
+            self.bodyChars = set(bodyChars)
+        else:
+            self.bodyCharsOrig = initChars
+            self.bodyChars = set(initChars)
+
+        self.maxSpecified = max > 0
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(Word()) if zero-length word is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.asKeyword = asKeyword
+
+        if ' ' not in self.initCharsOrig+self.bodyCharsOrig and (min==1 and max==0 and exact==0):
+            if self.bodyCharsOrig == self.initCharsOrig:
+                self.reString = "[%s]+" % _escapeRegexRangeChars(self.initCharsOrig)
+            elif len(self.initCharsOrig) == 1:
+                self.reString = "%s[%s]*" % \
+                                      (re.escape(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            else:
+                self.reString = "[%s][%s]*" % \
+                                      (_escapeRegexRangeChars(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            if self.asKeyword:
+                self.reString = r"\b"+self.reString+r"\b"
+            try:
+                self.re = re.compile( self.reString )
+            except Exception:
+                self.re = None
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.re:
+            result = self.re.match(instring,loc)
+            if not result:
+                raise ParseException(instring, loc, self.errmsg, self)
+
+            loc = result.end()
+            return loc, result.group()
+
+        if not(instring[ loc ] in self.initChars):
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        instrlen = len(instring)
+        bodychars = self.bodyChars
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, instrlen )
+        while loc < maxloc and instring[loc] in bodychars:
+            loc += 1
+
+        throwException = False
+        if loc - start < self.minLen:
+            throwException = True
+        if self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
+            throwException = True
+        if self.asKeyword:
+            if (start>0 and instring[start-1] in bodychars) or (loc<instrlen and instring[loc] in bodychars):
+                throwException = True
+
+        if throwException:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(Word,self).__str__()
+        except Exception:
+            pass
+
+
+        if self.strRepr is None:
+
+            def charsAsStr(s):
+                if len(s)>4:
+                    return s[:4]+"..."
+                else:
+                    return s
+
+            if ( self.initCharsOrig != self.bodyCharsOrig ):
+                self.strRepr = "W:(%s,%s)" % ( charsAsStr(self.initCharsOrig), charsAsStr(self.bodyCharsOrig) )
+            else:
+                self.strRepr = "W:(%s)" % charsAsStr(self.initCharsOrig)
+
+        return self.strRepr
+
+
+class Regex(Token):
+    """
+    Token for matching strings that match a given regular expression.
+    Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
+    If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
+    named parse results.
+
+    Example::
+        realnum = Regex(r"[+-]?\d+\.\d*")
+        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
+        # ref: http://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
+        roman = Regex(r"M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
+    """
+    compiledREtype = type(re.compile("[A-Z]"))
+    def __init__( self, pattern, flags=0):
+        """The parameters C{pattern} and C{flags} are passed to the C{re.compile()} function as-is. See the Python C{re} module for an explanation of the acceptable patterns and flags."""
+        super(Regex,self).__init__()
+
+        if isinstance(pattern, basestring):
+            if not pattern:
+                warnings.warn("null string passed to Regex; use Empty() instead",
+                        SyntaxWarning, stacklevel=2)
+
+            self.pattern = pattern
+            self.flags = flags
+
+            try:
+                self.re = re.compile(self.pattern, self.flags)
+                self.reString = self.pattern
+            except sre_constants.error:
+                warnings.warn("invalid pattern (%s) passed to Regex" % pattern,
+                    SyntaxWarning, stacklevel=2)
+                raise
+
+        elif isinstance(pattern, Regex.compiledREtype):
+            self.re = pattern
+            self.pattern = \
+            self.reString = str(pattern)
+            self.flags = flags
+            
+        else:
+            raise ValueError("Regex may only be constructed with a string or a compiled RE object")
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = self.re.match(instring,loc)
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        d = result.groupdict()
+        ret = ParseResults(result.group())
+        if d:
+            for k in d:
+                ret[k] = d[k]
+        return loc,ret
+
+    def __str__( self ):
+        try:
+            return super(Regex,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "Re:(%s)" % repr(self.pattern)
+
+        return self.strRepr
+
+
+class QuotedString(Token):
+    r"""
+    Token for matching strings that are delimited by quoting characters.
+    
+    Defined with the following parameters:
+        - quoteChar - string of one or more characters defining the quote delimiting string
+        - escChar - character to escape quotes, typically backslash (default=C{None})
+        - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=C{None})
+        - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
+        - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
+        - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
+        - convertWhitespaceEscapes - convert escaped whitespace (C{'\t'}, C{'\n'}, etc.) to actual whitespace (default=C{True})
+
+    Example::
+        qs = QuotedString('"')
+        print(qs.searchString('lsjdf "This is the quote" sldjf'))
+        complex_qs = QuotedString('{{', endQuoteChar='}}')
+        print(complex_qs.searchString('lsjdf {{This is the "quote"}} sldjf'))
+        sql_qs = QuotedString('"', escQuote='""')
+        print(sql_qs.searchString('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
+    prints::
+        [['This is the quote']]
+        [['This is the "quote"']]
+        [['This is the quote with "embedded" quotes']]
+    """
+    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None, convertWhitespaceEscapes=True):
+        super(QuotedString,self).__init__()
+
+        # remove white space from quote chars - wont work anyway
+        quoteChar = quoteChar.strip()
+        if not quoteChar:
+            warnings.warn("quoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+            raise SyntaxError()
+
+        if endQuoteChar is None:
+            endQuoteChar = quoteChar
+        else:
+            endQuoteChar = endQuoteChar.strip()
+            if not endQuoteChar:
+                warnings.warn("endQuoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+                raise SyntaxError()
+
+        self.quoteChar = quoteChar
+        self.quoteCharLen = len(quoteChar)
+        self.firstQuoteChar = quoteChar[0]
+        self.endQuoteChar = endQuoteChar
+        self.endQuoteCharLen = len(endQuoteChar)
+        self.escChar = escChar
+        self.escQuote = escQuote
+        self.unquoteResults = unquoteResults
+        self.convertWhitespaceEscapes = convertWhitespaceEscapes
+
+        if multiline:
+            self.flags = re.MULTILINE | re.DOTALL
+            self.pattern = r'%s(?:[^%s%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        else:
+            self.flags = 0
+            self.pattern = r'%s(?:[^%s\n\r%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        if len(self.endQuoteChar) > 1:
+            self.pattern += (
+                '|(?:' + ')|(?:'.join("%s[^%s]" % (re.escape(self.endQuoteChar[:i]),
+                                               _escapeRegexRangeChars(self.endQuoteChar[i]))
+                                    for i in range(len(self.endQuoteChar)-1,0,-1)) + ')'
+                )
+        if escQuote:
+            self.pattern += (r'|(?:%s)' % re.escape(escQuote))
+        if escChar:
+            self.pattern += (r'|(?:%s.)' % re.escape(escChar))
+            self.escCharReplacePattern = re.escape(self.escChar)+"(.)"
+        self.pattern += (r')*%s' % re.escape(self.endQuoteChar))
+
+        try:
+            self.re = re.compile(self.pattern, self.flags)
+            self.reString = self.pattern
+        except sre_constants.error:
+            warnings.warn("invalid pattern (%s) passed to Regex" % self.pattern,
+                SyntaxWarning, stacklevel=2)
+            raise
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = instring[loc] == self.firstQuoteChar and self.re.match(instring,loc) or None
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        ret = result.group()
+
+        if self.unquoteResults:
+
+            # strip off quotes
+            ret = ret[self.quoteCharLen:-self.endQuoteCharLen]
+
+            if isinstance(ret,basestring):
+                # replace escaped whitespace
+                if '\\' in ret and self.convertWhitespaceEscapes:
+                    ws_map = {
+                        r'\t' : '\t',
+                        r'\n' : '\n',
+                        r'\f' : '\f',
+                        r'\r' : '\r',
+                    }
+                    for wslit,wschar in ws_map.items():
+                        ret = ret.replace(wslit, wschar)
+
+                # replace escaped characters
+                if self.escChar:
+                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
+
+                # replace escaped quotes
+                if self.escQuote:
+                    ret = ret.replace(self.escQuote, self.endQuoteChar)
+
+        return loc, ret
+
+    def __str__( self ):
+        try:
+            return super(QuotedString,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "quoted string, starting with %s ending with %s" % (self.quoteChar, self.endQuoteChar)
+
+        return self.strRepr
+
+
+class CharsNotIn(Token):
+    """
+    Token for matching words composed of characters I{not} in a given set (will
+    include whitespace in matched characters if not listed in the provided exclusion set - see example).
+    Defined with string containing all disallowed characters, and an optional
+    minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction.
+
+    Example::
+        # define a comma-separated-value as anything that is not a ','
+        csv_value = CharsNotIn(',')
+        print(delimitedList(csv_value).parseString("dkls,lsdkjf,s12 34,@!#,213"))
+    prints::
+        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
+    """
+    def __init__( self, notChars, min=1, max=0, exact=0 ):
+        super(CharsNotIn,self).__init__()
+        self.skipWhitespace = False
+        self.notChars = notChars
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(CharsNotIn()) if zero-length char group is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = ( self.minLen == 0 )
+        self.mayIndexError = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[loc] in self.notChars:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        notchars = self.notChars
+        maxlen = min( start+self.maxLen, len(instring) )
+        while loc < maxlen and \
+              (instring[loc] not in notchars):
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(CharsNotIn, self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            if len(self.notChars) > 4:
+                self.strRepr = "!W:(%s...)" % self.notChars[:4]
+            else:
+                self.strRepr = "!W:(%s)" % self.notChars
+
+        return self.strRepr
+
+class White(Token):
+    """
+    Special matching class for matching whitespace.  Normally, whitespace is ignored
+    by pyparsing grammars.  This class is included when some whitespace structures
+    are significant.  Define with a string containing the whitespace characters to be
+    matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
+    as defined for the C{L{Word}} class.
+    """
+    whiteStrs = {
+        " " : "<SPC>",
+        "\t": "<TAB>",
+        "\n": "<LF>",
+        "\r": "<CR>",
+        "\f": "<FF>",
+        }
+    def __init__(self, ws=" \t\r\n", min=1, max=0, exact=0):
+        super(White,self).__init__()
+        self.matchWhite = ws
+        self.setWhitespaceChars( "".join(c for c in self.whiteChars if c not in self.matchWhite) )
+        #~ self.leaveWhitespace()
+        self.name = ("".join(White.whiteStrs[c] for c in self.matchWhite))
+        self.mayReturnEmpty = True
+        self.errmsg = "Expected " + self.name
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if not(instring[ loc ] in self.matchWhite):
+            raise ParseException(instring, loc, self.errmsg, self)
+        start = loc
+        loc += 1
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, len(instring) )
+        while loc < maxloc and instring[loc] in self.matchWhite:
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+
+class _PositionToken(Token):
+    def __init__( self ):
+        super(_PositionToken,self).__init__()
+        self.name=self.__class__.__name__
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+class GoToColumn(_PositionToken):
+    """
+    Token to advance to a specific column of input text; useful for tabular report scraping.
+    """
+    def __init__( self, colno ):
+        super(GoToColumn,self).__init__()
+        self.col = colno
+
+    def preParse( self, instring, loc ):
+        if col(loc,instring) != self.col:
+            instrlen = len(instring)
+            if self.ignoreExprs:
+                loc = self._skipIgnorables( instring, loc )
+            while loc < instrlen and instring[loc].isspace() and col( loc, instring ) != self.col :
+                loc += 1
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        thiscol = col( loc, instring )
+        if thiscol > self.col:
+            raise ParseException( instring, loc, "Text not in expected column", self )
+        newloc = loc + self.col - thiscol
+        ret = instring[ loc: newloc ]
+        return newloc, ret
+
+
+class LineStart(_PositionToken):
+    """
+    Matches if current position is at the beginning of a line within the parse string
+    
+    Example::
+    
+        test = '''\
+        AAA this line
+        AAA and this line
+          AAA but not this one
+        B AAA and definitely not this one
+        '''
+
+        for t in (LineStart() + 'AAA' + restOfLine).searchString(test):
+            print(t)
+    
+    Prints::
+        ['AAA', ' this line']
+        ['AAA', ' and this line']    
+
+    """
+    def __init__( self ):
+        super(LineStart,self).__init__()
+        self.errmsg = "Expected start of line"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if col(loc, instring) == 1:
+            return loc, []
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class LineEnd(_PositionToken):
+    """
+    Matches if current position is at the end of a line within the parse string
+    """
+    def __init__( self ):
+        super(LineEnd,self).__init__()
+        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
+        self.errmsg = "Expected end of line"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc<len(instring):
+            if instring[loc] == "\n":
+                return loc+1, "\n"
+            else:
+                raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class StringStart(_PositionToken):
+    """
+    Matches if current position is at the beginning of the parse string
+    """
+    def __init__( self ):
+        super(StringStart,self).__init__()
+        self.errmsg = "Expected start of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc != 0:
+            # see if entire string up to here is just whitespace and ignoreables
+            if loc != self.preParse( instring, 0 ):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class StringEnd(_PositionToken):
+    """
+    Matches if current position is at the end of the parse string
+    """
+    def __init__( self ):
+        super(StringEnd,self).__init__()
+        self.errmsg = "Expected end of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc < len(instring):
+            raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        elif loc > len(instring):
+            return loc, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class WordStart(_PositionToken):
+    """
+    Matches if the current position is at the beginning of a Word, and
+    is not preceded by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
+    the string being parsed, or at the beginning of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordStart,self).__init__()
+        self.wordChars = set(wordChars)
+        self.errmsg = "Not at the start of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        if loc != 0:
+            if (instring[loc-1] in self.wordChars or
+                instring[loc] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class WordEnd(_PositionToken):
+    """
+    Matches if the current position is at the end of a Word, and
+    is not followed by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
+    the string being parsed, or at the end of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordEnd,self).__init__()
+        self.wordChars = set(wordChars)
+        self.skipWhitespace = False
+        self.errmsg = "Not at the end of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        instrlen = len(instring)
+        if instrlen>0 and loc<instrlen:
+            if (instring[loc] in self.wordChars or
+                instring[loc-1] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+
+class ParseExpression(ParserElement):
+    """
+    Abstract subclass of ParserElement, for combining and post-processing parsed tokens.
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(ParseExpression,self).__init__(savelist)
+        if isinstance( exprs, _generatorType ):
+            exprs = list(exprs)
+
+        if isinstance( exprs, basestring ):
+            self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+        elif isinstance( exprs, collections.Iterable ):
+            exprs = list(exprs)
+            # if sequence of strings provided, wrap with Literal
+            if all(isinstance(expr, basestring) for expr in exprs):
+                exprs = map(ParserElement._literalStringClass, exprs)
+            self.exprs = list(exprs)
+        else:
+            try:
+                self.exprs = list( exprs )
+            except TypeError:
+                self.exprs = [ exprs ]
+        self.callPreparse = False
+
+    def __getitem__( self, i ):
+        return self.exprs[i]
+
+    def append( self, other ):
+        self.exprs.append( other )
+        self.strRepr = None
+        return self
+
+    def leaveWhitespace( self ):
+        """Extends C{leaveWhitespace} defined in base class, and also invokes C{leaveWhitespace} on
+           all contained expressions."""
+        self.skipWhitespace = False
+        self.exprs = [ e.copy() for e in self.exprs ]
+        for e in self.exprs:
+            e.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseExpression, self).ignore( other )
+                for e in self.exprs:
+                    e.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseExpression, self).ignore( other )
+            for e in self.exprs:
+                e.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def __str__( self ):
+        try:
+            return super(ParseExpression,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.exprs) )
+        return self.strRepr
+
+    def streamline( self ):
+        super(ParseExpression,self).streamline()
+
+        for e in self.exprs:
+            e.streamline()
+
+        # collapse nested And's of the form And( And( And( a,b), c), d) to And( a,b,c,d )
+        # but only if there are no parse actions or resultsNames on the nested And's
+        # (likewise for Or's and MatchFirst's)
+        if ( len(self.exprs) == 2 ):
+            other = self.exprs[0]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = other.exprs[:] + [ self.exprs[1] ]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+            other = self.exprs[-1]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = self.exprs[:-1] + other.exprs[:]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+        self.errmsg = "Expected " + _ustr(self)
+        
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        ret = super(ParseExpression,self).setResultsName(name,listAllMatches)
+        return ret
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        for e in self.exprs:
+            e.validate(tmp)
+        self.checkRecursion( [] )
+        
+    def copy(self):
+        ret = super(ParseExpression,self).copy()
+        ret.exprs = [e.copy() for e in self.exprs]
+        return ret
+
+class And(ParseExpression):
+    """
+    Requires all given C{ParseExpression}s to be found in the given order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'+'} operator.
+    May also be constructed using the C{'-'} operator, which will suppress backtracking.
+
+    Example::
+        integer = Word(nums)
+        name_expr = OneOrMore(Word(alphas))
+
+        expr = And([integer("id"),name_expr("name"),integer("age")])
+        # more easily written as:
+        expr = integer("id") + name_expr("name") + integer("age")
+    """
+
+    class _ErrorStop(Empty):
+        def __init__(self, *args, **kwargs):
+            super(And._ErrorStop,self).__init__(*args, **kwargs)
+            self.name = '-'
+            self.leaveWhitespace()
+
+    def __init__( self, exprs, savelist = True ):
+        super(And,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.setWhitespaceChars( self.exprs[0].whiteChars )
+        self.skipWhitespace = self.exprs[0].skipWhitespace
+        self.callPreparse = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        # pass False as last arg to _parse for first element, since we already
+        # pre-parsed the string as part of our And pre-parsing
+        loc, resultlist = self.exprs[0]._parse( instring, loc, doActions, callPreParse=False )
+        errorStop = False
+        for e in self.exprs[1:]:
+            if isinstance(e, And._ErrorStop):
+                errorStop = True
+                continue
+            if errorStop:
+                try:
+                    loc, exprtokens = e._parse( instring, loc, doActions )
+                except ParseSyntaxException:
+                    raise
+                except ParseBaseException as pe:
+                    pe.__traceback__ = None
+                    raise ParseSyntaxException._from_exception(pe)
+                except IndexError:
+                    raise ParseSyntaxException(instring, len(instring), self.errmsg, self)
+            else:
+                loc, exprtokens = e._parse( instring, loc, doActions )
+            if exprtokens or exprtokens.haskeys():
+                resultlist += exprtokens
+        return loc, resultlist
+
+    def __iadd__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #And( [ self, other ] )
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+            if not e.mayReturnEmpty:
+                break
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+
+class Or(ParseExpression):
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the expression that matches the longest string will be used.
+    May be constructed using the C{'^'} operator.
+
+    Example::
+        # construct Or using '^' operator
+        
+        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789"))
+    prints::
+        [['123'], ['3.1416'], ['789']]
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(Or,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        matches = []
+        for e in self.exprs:
+            try:
+                loc2 = e.tryParse( instring, loc )
+            except ParseException as err:
+                err.__traceback__ = None
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+            else:
+                # save match among all matches, to retry longest to shortest
+                matches.append((loc2, e))
+
+        if matches:
+            matches.sort(key=lambda x: -x[0])
+            for _,e in matches:
+                try:
+                    return e._parse( instring, loc, doActions )
+                except ParseException as err:
+                    err.__traceback__ = None
+                    if err.loc > maxExcLoc:
+                        maxException = err
+                        maxExcLoc = err.loc
+
+        if maxException is not None:
+            maxException.msg = self.errmsg
+            raise maxException
+        else:
+            raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+
+    def __ixor__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #Or( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ^ ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class MatchFirst(ParseExpression):
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the first one listed is the one that will match.
+    May be constructed using the C{'|'} operator.
+
+    Example::
+        # construct MatchFirst using '|' operator
+        
+        # watch the order of expressions to match
+        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
+
+        # put more selective expression first
+        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
+        print(number.searchString("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(MatchFirst,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        for e in self.exprs:
+            try:
+                ret = e._parse( instring, loc, doActions )
+                return ret
+            except ParseException as err:
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+
+        # only got here if no expression matched, raise exception for match that made it the furthest
+        else:
+            if maxException is not None:
+                maxException.msg = self.errmsg
+                raise maxException
+            else:
+                raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+    def __ior__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #MatchFirst( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " | ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class Each(ParseExpression):
+    """
+    Requires all given C{ParseExpression}s to be found, but in any order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'&'} operator.
+
+    Example::
+        color = oneOf("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
+        shape_type = oneOf("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
+        integer = Word(nums)
+        shape_attr = "shape:" + shape_type("shape")
+        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
+        color_attr = "color:" + color("color")
+        size_attr = "size:" + integer("size")
+
+        # use Each (using operator '&') to accept attributes in any order 
+        # (shape and posn are required, color and size are optional)
+        shape_spec = shape_attr & posn_attr & Optional(color_attr) & Optional(size_attr)
+
+        shape_spec.runTests('''
+            shape: SQUARE color: BLACK posn: 100, 120
+            shape: CIRCLE size: 50 color: BLUE posn: 50,80
+            color:GREEN size:20 shape:TRIANGLE posn:20,40
+            '''
+            )
+    prints::
+        shape: SQUARE color: BLACK posn: 100, 120
+        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
+        - color: BLACK
+        - posn: ['100', ',', '120']
+          - x: 100
+          - y: 120
+        - shape: SQUARE
+
+
+        shape: CIRCLE size: 50 color: BLUE posn: 50,80
+        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
+        - color: BLUE
+        - posn: ['50', ',', '80']
+          - x: 50
+          - y: 80
+        - shape: CIRCLE
+        - size: 50
+
+
+        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
+        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
+        - color: GREEN
+        - posn: ['20', ',', '40']
+          - x: 20
+          - y: 40
+        - shape: TRIANGLE
+        - size: 20
+    """
+    def __init__( self, exprs, savelist = True ):
+        super(Each,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.skipWhitespace = True
+        self.initExprGroups = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.initExprGroups:
+            self.opt1map = dict((id(e.expr),e) for e in self.exprs if isinstance(e,Optional))
+            opt1 = [ e.expr for e in self.exprs if isinstance(e,Optional) ]
+            opt2 = [ e for e in self.exprs if e.mayReturnEmpty and not isinstance(e,Optional)]
+            self.optionals = opt1 + opt2
+            self.multioptionals = [ e.expr for e in self.exprs if isinstance(e,ZeroOrMore) ]
+            self.multirequired = [ e.expr for e in self.exprs if isinstance(e,OneOrMore) ]
+            self.required = [ e for e in self.exprs if not isinstance(e,(Optional,ZeroOrMore,OneOrMore)) ]
+            self.required += self.multirequired
+            self.initExprGroups = False
+        tmpLoc = loc
+        tmpReqd = self.required[:]
+        tmpOpt  = self.optionals[:]
+        matchOrder = []
+
+        keepMatching = True
+        while keepMatching:
+            tmpExprs = tmpReqd + tmpOpt + self.multioptionals + self.multirequired
+            failed = []
+            for e in tmpExprs:
+                try:
+                    tmpLoc = e.tryParse( instring, tmpLoc )
+                except ParseException:
+                    failed.append(e)
+                else:
+                    matchOrder.append(self.opt1map.get(id(e),e))
+                    if e in tmpReqd:
+                        tmpReqd.remove(e)
+                    elif e in tmpOpt:
+                        tmpOpt.remove(e)
+            if len(failed) == len(tmpExprs):
+                keepMatching = False
+
+        if tmpReqd:
+            missing = ", ".join(_ustr(e) for e in tmpReqd)
+            raise ParseException(instring,loc,"Missing one or more required elements (%s)" % missing )
+
+        # add any unmatched Optionals, in case they have default values defined
+        matchOrder += [e for e in self.exprs if isinstance(e,Optional) and e.expr in tmpOpt]
+
+        resultlist = []
+        for e in matchOrder:
+            loc,results = e._parse(instring,loc,doActions)
+            resultlist.append(results)
+
+        finalResults = sum(resultlist, ParseResults([]))
+        return loc, finalResults
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " & ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class ParseElementEnhance(ParserElement):
+    """
+    Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens.
+    """
+    def __init__( self, expr, savelist=False ):
+        super(ParseElementEnhance,self).__init__(savelist)
+        if isinstance( expr, basestring ):
+            if issubclass(ParserElement._literalStringClass, Token):
+                expr = ParserElement._literalStringClass(expr)
+            else:
+                expr = ParserElement._literalStringClass(Literal(expr))
+        self.expr = expr
+        self.strRepr = None
+        if expr is not None:
+            self.mayIndexError = expr.mayIndexError
+            self.mayReturnEmpty = expr.mayReturnEmpty
+            self.setWhitespaceChars( expr.whiteChars )
+            self.skipWhitespace = expr.skipWhitespace
+            self.saveAsList = expr.saveAsList
+            self.callPreparse = expr.callPreparse
+            self.ignoreExprs.extend(expr.ignoreExprs)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.expr is not None:
+            return self.expr._parse( instring, loc, doActions, callPreParse=False )
+        else:
+            raise ParseException("",loc,self.errmsg,self)
+
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        self.expr = self.expr.copy()
+        if self.expr is not None:
+            self.expr.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseElementEnhance, self).ignore( other )
+                if self.expr is not None:
+                    self.expr.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseElementEnhance, self).ignore( other )
+            if self.expr is not None:
+                self.expr.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def streamline( self ):
+        super(ParseElementEnhance,self).streamline()
+        if self.expr is not None:
+            self.expr.streamline()
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        if self in parseElementList:
+            raise RecursiveGrammarException( parseElementList+[self] )
+        subRecCheckList = parseElementList[:] + [ self ]
+        if self.expr is not None:
+            self.expr.checkRecursion( subRecCheckList )
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        if self.expr is not None:
+            self.expr.validate(tmp)
+        self.checkRecursion( [] )
+
+    def __str__( self ):
+        try:
+            return super(ParseElementEnhance,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None and self.expr is not None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.expr) )
+        return self.strRepr
+
+
+class FollowedBy(ParseElementEnhance):
+    """
+    Lookahead matching of the given parse expression.  C{FollowedBy}
+    does I{not} advance the parsing position within the input string, it only
+    verifies that the specified parse expression matches at the current
+    position.  C{FollowedBy} always returns a null token list.
+
+    Example::
+        # use FollowedBy to match a label only if it is followed by a ':'
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        OneOrMore(attr_expr).parseString("shape: SQUARE color: BLACK posn: upper left").pprint()
+    prints::
+        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
+    """
+    def __init__( self, expr ):
+        super(FollowedBy,self).__init__(expr)
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        self.expr.tryParse( instring, loc )
+        return loc, []
+
+
+class NotAny(ParseElementEnhance):
+    """
+    Lookahead to disallow matching with the given parse expression.  C{NotAny}
+    does I{not} advance the parsing position within the input string, it only
+    verifies that the specified parse expression does I{not} match at the current
+    position.  Also, C{NotAny} does I{not} skip over leading whitespace. C{NotAny}
+    always returns a null token list.  May be constructed using the '~' operator.
+
+    Example::
+        
+    """
+    def __init__( self, expr ):
+        super(NotAny,self).__init__(expr)
+        #~ self.leaveWhitespace()
+        self.skipWhitespace = False  # do NOT use self.leaveWhitespace(), don't want to propagate to exprs
+        self.mayReturnEmpty = True
+        self.errmsg = "Found unwanted token, "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.expr.canParseNext(instring, loc):
+            raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "~{" + _ustr(self.expr) + "}"
+
+        return self.strRepr
+
+class _MultipleMatch(ParseElementEnhance):
+    def __init__( self, expr, stopOn=None):
+        super(_MultipleMatch, self).__init__(expr)
+        self.saveAsList = True
+        ender = stopOn
+        if isinstance(ender, basestring):
+            ender = ParserElement._literalStringClass(ender)
+        self.not_ender = ~ender if ender is not None else None
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        self_expr_parse = self.expr._parse
+        self_skip_ignorables = self._skipIgnorables
+        check_ender = self.not_ender is not None
+        if check_ender:
+            try_not_ender = self.not_ender.tryParse
+        
+        # must be at least one (but first see if we are the stopOn sentinel;
+        # if so, fail)
+        if check_ender:
+            try_not_ender(instring, loc)
+        loc, tokens = self_expr_parse( instring, loc, doActions, callPreParse=False )
+        try:
+            hasIgnoreExprs = (not not self.ignoreExprs)
+            while 1:
+                if check_ender:
+                    try_not_ender(instring, loc)
+                if hasIgnoreExprs:
+                    preloc = self_skip_ignorables( instring, loc )
+                else:
+                    preloc = loc
+                loc, tmptokens = self_expr_parse( instring, preloc, doActions )
+                if tmptokens or tmptokens.haskeys():
+                    tokens += tmptokens
+        except (ParseException,IndexError):
+            pass
+
+        return loc, tokens
+        
+class OneOrMore(_MultipleMatch):
+    """
+    Repetition of one or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match one or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: BLACK"
+        OneOrMore(attr_expr).parseString(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
+
+        # use stopOn attribute for OneOrMore to avoid reading label string as part of the data
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        OneOrMore(attr_expr).parseString(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
+        
+        # could also be written as
+        (attr_expr * (1,)).parseString(text).pprint()
+    """
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + _ustr(self.expr) + "}..."
+
+        return self.strRepr
+
+class ZeroOrMore(_MultipleMatch):
+    """
+    Optional repetition of zero or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match zero or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
+
+    Example: similar to L{OneOrMore}
+    """
+    def __init__( self, expr, stopOn=None):
+        super(ZeroOrMore,self).__init__(expr, stopOn=stopOn)
+        self.mayReturnEmpty = True
+        
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            return super(ZeroOrMore, self).parseImpl(instring, loc, doActions)
+        except (ParseException,IndexError):
+            return loc, []
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]..."
+
+        return self.strRepr
+
+class _NullToken(object):
+    def __bool__(self):
+        return False
+    __nonzero__ = __bool__
+    def __str__(self):
+        return ""
+
+_optionalNotMatched = _NullToken()
+class Optional(ParseElementEnhance):
+    """
+    Optional matching of the given expression.
+
+    Parameters:
+     - expr - expression that must match zero or more times
+     - default (optional) - value to be returned if the optional expression is not found.
+
+    Example::
+        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
+        zip = Combine(Word(nums, exact=5) + Optional('-' + Word(nums, exact=4)))
+        zip.runTests('''
+            # traditional ZIP code
+            12345
+            
+            # ZIP+4 form
+            12101-0001
+            
+            # invalid ZIP
+            98765-
+            ''')
+    prints::
+        # traditional ZIP code
+        12345
+        ['12345']
+
+        # ZIP+4 form
+        12101-0001
+        ['12101-0001']
+
+        # invalid ZIP
+        98765-
+             ^
+        FAIL: Expected end of text (at char 5), (line:1, col:6)
+    """
+    def __init__( self, expr, default=_optionalNotMatched ):
+        super(Optional,self).__init__( expr, savelist=False )
+        self.saveAsList = self.expr.saveAsList
+        self.defaultValue = default
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
+        except (ParseException,IndexError):
+            if self.defaultValue is not _optionalNotMatched:
+                if self.expr.resultsName:
+                    tokens = ParseResults([ self.defaultValue ])
+                    tokens[self.expr.resultsName] = self.defaultValue
+                else:
+                    tokens = [ self.defaultValue ]
+            else:
+                tokens = []
+        return loc, tokens
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]"
+
+        return self.strRepr
+
+class SkipTo(ParseElementEnhance):
+    """
+    Token for skipping over all undefined text until the matched expression is found.
+
+    Parameters:
+     - expr - target expression marking the end of the data to be skipped
+     - include - (default=C{False}) if True, the target expression is also parsed 
+          (the skipped text and target expression are returned as a 2-element list).
+     - ignore - (default=C{None}) used to define grammars (typically quoted strings and 
+          comments) that might contain false matches to the target expression
+     - failOn - (default=C{None}) define expressions that are not allowed to be 
+          included in the skipped test; if found before the target expression is found, 
+          the SkipTo is not a match
+
+    Example::
+        report = '''
+            Outstanding Issues Report - 1 Jan 2000
+
+               # | Severity | Description                               |  Days Open
+            -----+----------+-------------------------------------------+-----------
+             101 | Critical | Intermittent system crash                 |          6
+              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
+              79 | Minor    | System slow when running too many reports |         47
+            '''
+        integer = Word(nums)
+        SEP = Suppress('|')
+        # use SkipTo to simply match everything up until the next SEP
+        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
+        # - parse action will call token.strip() for each matched token, i.e., the description body
+        string_data = SkipTo(SEP, ignore=quotedString)
+        string_data.setParseAction(tokenMap(str.strip))
+        ticket_expr = (integer("issue_num") + SEP 
+                      + string_data("sev") + SEP 
+                      + string_data("desc") + SEP 
+                      + integer("days_open"))
+        
+        for tkt in ticket_expr.searchString(report):
+            print tkt.dump()
+    prints::
+        ['101', 'Critical', 'Intermittent system crash', '6']
+        - days_open: 6
+        - desc: Intermittent system crash
+        - issue_num: 101
+        - sev: Critical
+        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
+        - days_open: 14
+        - desc: Spelling error on Login ('log|n')
+        - issue_num: 94
+        - sev: Cosmetic
+        ['79', 'Minor', 'System slow when running too many reports', '47']
+        - days_open: 47
+        - desc: System slow when running too many reports
+        - issue_num: 79
+        - sev: Minor
+    """
+    def __init__( self, other, include=False, ignore=None, failOn=None ):
+        super( SkipTo, self ).__init__( other )
+        self.ignoreExpr = ignore
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.includeMatch = include
+        self.asList = False
+        if isinstance(failOn, basestring):
+            self.failOn = ParserElement._literalStringClass(failOn)
+        else:
+            self.failOn = failOn
+        self.errmsg = "No match found for "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        startloc = loc
+        instrlen = len(instring)
+        expr = self.expr
+        expr_parse = self.expr._parse
+        self_failOn_canParseNext = self.failOn.canParseNext if self.failOn is not None else None
+        self_ignoreExpr_tryParse = self.ignoreExpr.tryParse if self.ignoreExpr is not None else None
+        
+        tmploc = loc
+        while tmploc <= instrlen:
+            if self_failOn_canParseNext is not None:
+                # break if failOn expression matches
+                if self_failOn_canParseNext(instring, tmploc):
+                    break
+                    
+            if self_ignoreExpr_tryParse is not None:
+                # advance past ignore expressions
+                while 1:
+                    try:
+                        tmploc = self_ignoreExpr_tryParse(instring, tmploc)
+                    except ParseBaseException:
+                        break
+            
+            try:
+                expr_parse(instring, tmploc, doActions=False, callPreParse=False)
+            except (ParseException, IndexError):
+                # no match, advance loc in string
+                tmploc += 1
+            else:
+                # matched skipto expr, done
+                break
+
+        else:
+            # ran off the end of the input string without matching skipto expr, fail
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        # build up return values
+        loc = tmploc
+        skiptext = instring[startloc:loc]
+        skipresult = ParseResults(skiptext)
+        
+        if self.includeMatch:
+            loc, mat = expr_parse(instring,loc,doActions,callPreParse=False)
+            skipresult += mat
+
+        return loc, skipresult
+
+class Forward(ParseElementEnhance):
+    """
+    Forward declaration of an expression to be defined later -
+    used for recursive grammars, such as algebraic infix notation.
+    When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
+
+    Note: take care when assigning to C{Forward} not to overlook precedence of operators.
+    Specifically, '|' has a lower precedence than '<<', so that::
+        fwdExpr << a | b | c
+    will actually be evaluated as::
+        (fwdExpr << a) | b | c
+    thereby leaving b and c out as parseable alternatives.  It is recommended that you
+    explicitly group the values inserted into the C{Forward}::
+        fwdExpr << (a | b | c)
+    Converting to use the '<<=' operator instead will avoid this problem.
+
+    See L{ParseResults.pprint} for an example of a recursive parser created using
+    C{Forward}.
+    """
+    def __init__( self, other=None ):
+        super(Forward,self).__init__( other, savelist=False )
+
+    def __lshift__( self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass(other)
+        self.expr = other
+        self.strRepr = None
+        self.mayIndexError = self.expr.mayIndexError
+        self.mayReturnEmpty = self.expr.mayReturnEmpty
+        self.setWhitespaceChars( self.expr.whiteChars )
+        self.skipWhitespace = self.expr.skipWhitespace
+        self.saveAsList = self.expr.saveAsList
+        self.ignoreExprs.extend(self.expr.ignoreExprs)
+        return self
+        
+    def __ilshift__(self, other):
+        return self << other
+    
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        return self
+
+    def streamline( self ):
+        if not self.streamlined:
+            self.streamlined = True
+            if self.expr is not None:
+                self.expr.streamline()
+        return self
+
+    def validate( self, validateTrace=[] ):
+        if self not in validateTrace:
+            tmp = validateTrace[:]+[self]
+            if self.expr is not None:
+                self.expr.validate(tmp)
+        self.checkRecursion([])
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+        return self.__class__.__name__ + ": ..."
+
+        # stubbed out for now - creates awful memory and perf issues
+        self._revertClass = self.__class__
+        self.__class__ = _ForwardNoRecurse
+        try:
+            if self.expr is not None:
+                retString = _ustr(self.expr)
+            else:
+                retString = "None"
+        finally:
+            self.__class__ = self._revertClass
+        return self.__class__.__name__ + ": " + retString
+
+    def copy(self):
+        if self.expr is not None:
+            return super(Forward,self).copy()
+        else:
+            ret = Forward()
+            ret <<= self
+            return ret
+
+class _ForwardNoRecurse(Forward):
+    def __str__( self ):
+        return "..."
+
+class TokenConverter(ParseElementEnhance):
+    """
+    Abstract subclass of C{ParseExpression}, for converting parsed results.
+    """
+    def __init__( self, expr, savelist=False ):
+        super(TokenConverter,self).__init__( expr )#, savelist )
+        self.saveAsList = False
+
+class Combine(TokenConverter):
+    """
+    Converter to concatenate all matching tokens to a single string.
+    By default, the matching patterns must also be contiguous in the input string;
+    this can be disabled by specifying C{'adjacent=False'} in the constructor.
+
+    Example::
+        real = Word(nums) + '.' + Word(nums)
+        print(real.parseString('3.1416')) # -> ['3', '.', '1416']
+        # will also erroneously match the following
+        print(real.parseString('3. 1416')) # -> ['3', '.', '1416']
+
+        real = Combine(Word(nums) + '.' + Word(nums))
+        print(real.parseString('3.1416')) # -> ['3.1416']
+        # no match when there are internal spaces
+        print(real.parseString('3. 1416')) # -> Exception: Expected W:(0123...)
+    """
+    def __init__( self, expr, joinString="", adjacent=True ):
+        super(Combine,self).__init__( expr )
+        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
+        if adjacent:
+            self.leaveWhitespace()
+        self.adjacent = adjacent
+        self.skipWhitespace = True
+        self.joinString = joinString
+        self.callPreparse = True
+
+    def ignore( self, other ):
+        if self.adjacent:
+            ParserElement.ignore(self, other)
+        else:
+            super( Combine, self).ignore( other )
+        return self
+
+    def postParse( self, instring, loc, tokenlist ):
+        retToks = tokenlist.copy()
+        del retToks[:]
+        retToks += ParseResults([ "".join(tokenlist._asStringList(self.joinString)) ], modal=self.modalResults)
+
+        if self.resultsName and retToks.haskeys():
+            return [ retToks ]
+        else:
+            return retToks
+
+class Group(TokenConverter):
+    """
+    Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions.
+
+    Example::
+        ident = Word(alphas)
+        num = Word(nums)
+        term = ident | num
+        func = ident + Optional(delimitedList(term))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', 'a', 'b', '100']
+
+        func = ident + Group(Optional(delimitedList(term)))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', ['a', 'b', '100']]
+    """
+    def __init__( self, expr ):
+        super(Group,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        return [ tokenlist ]
+
+class Dict(TokenConverter):
+    """
+    Converter to return a repetitive expression as a list, but also as a dictionary.
+    Each element can also be referenced using the first token in the expression as its key.
+    Useful for tabular report scraping when the first column can be used as a item key.
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        # print attributes as plain groups
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        # instead of OneOrMore(expr), parse using Dict(OneOrMore(Group(expr))) - Dict will auto-assign names
+        result = Dict(OneOrMore(Group(attr_expr))).parseString(text)
+        print(result.dump())
+        
+        # access named fields as dict entries, or output as dict
+        print(result['shape'])        
+        print(result.asDict())
+    prints::
+        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
+
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
+    See more examples at L{ParseResults} of accessing fields by results name.
+    """
+    def __init__( self, expr ):
+        super(Dict,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        for i,tok in enumerate(tokenlist):
+            if len(tok) == 0:
+                continue
+            ikey = tok[0]
+            if isinstance(ikey,int):
+                ikey = _ustr(tok[0]).strip()
+            if len(tok)==1:
+                tokenlist[ikey] = _ParseResultsWithOffset("",i)
+            elif len(tok)==2 and not isinstance(tok[1],ParseResults):
+                tokenlist[ikey] = _ParseResultsWithOffset(tok[1],i)
+            else:
+                dictvalue = tok.copy() #ParseResults(i)
+                del dictvalue[0]
+                if len(dictvalue)!= 1 or (isinstance(dictvalue,ParseResults) and dictvalue.haskeys()):
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue,i)
+                else:
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0],i)
+
+        if self.resultsName:
+            return [ tokenlist ]
+        else:
+            return tokenlist
+
+
+class Suppress(TokenConverter):
+    """
+    Converter for ignoring the results of a parsed expression.
+
+    Example::
+        source = "a, b, c,d"
+        wd = Word(alphas)
+        wd_list1 = wd + ZeroOrMore(',' + wd)
+        print(wd_list1.parseString(source))
+
+        # often, delimiters that are useful during parsing are just in the
+        # way afterward - use Suppress to keep them out of the parsed output
+        wd_list2 = wd + ZeroOrMore(Suppress(',') + wd)
+        print(wd_list2.parseString(source))
+    prints::
+        ['a', ',', 'b', ',', 'c', ',', 'd']
+        ['a', 'b', 'c', 'd']
+    (See also L{delimitedList}.)
+    """
+    def postParse( self, instring, loc, tokenlist ):
+        return []
+
+    def suppress( self ):
+        return self
+
+
+class OnlyOnce(object):
+    """
+    Wrapper for parse actions, to ensure they are only called once.
+    """
+    def __init__(self, methodCall):
+        self.callable = _trim_arity(methodCall)
+        self.called = False
+    def __call__(self,s,l,t):
+        if not self.called:
+            results = self.callable(s,l,t)
+            self.called = True
+            return results
+        raise ParseException(s,l,"")
+    def reset(self):
+        self.called = False
+
+def traceParseAction(f):
+    """
+    Decorator for debugging parse actions. 
+    
+    When the parse action is called, this decorator will print C{">> entering I{method-name}(line:I{current_source_line}, I{parse_location}, I{matched_tokens})".}
+    When the parse action completes, the decorator will print C{"<<"} followed by the returned value, or any exception that the parse action raised.
+
+    Example::
+        wd = Word(alphas)
+
+        @traceParseAction
+        def remove_duplicate_chars(tokens):
+            return ''.join(sorted(set(''.join(tokens)))
+
+        wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
+        print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
+    prints::
+        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
+        <<leaving remove_duplicate_chars (ret: 'dfjkls')
+        ['dfjkls']
+    """
+    f = _trim_arity(f)
+    def z(*paArgs):
+        thisFunc = f.__name__
+        s,l,t = paArgs[-3:]
+        if len(paArgs)>3:
+            thisFunc = paArgs[0].__class__.__name__ + '.' + thisFunc
+        sys.stderr.write( ">>entering %s(line: '%s', %d, %r)\n" % (thisFunc,line(l,s),l,t) )
+        try:
+            ret = f(*paArgs)
+        except Exception as exc:
+            sys.stderr.write( "<<leaving %s (exception: %s)\n" % (thisFunc,exc) )
+            raise
+        sys.stderr.write( "<<leaving %s (ret: %r)\n" % (thisFunc,ret) )
+        return ret
+    try:
+        z.__name__ = f.__name__
+    except AttributeError:
+        pass
+    return z
+
+#
+# global helpers
+#
+def delimitedList( expr, delim=",", combine=False ):
+    """
+    Helper to define a delimited list of expressions - the delimiter defaults to ','.
+    By default, the list elements and delimiters can have intervening whitespace, and
+    comments, but this can be overridden by passing C{combine=True} in the constructor.
+    If C{combine} is set to C{True}, the matching tokens are returned as a single token
+    string, with the delimiters included; otherwise, the matching tokens are returned
+    as a list of tokens, with the delimiters suppressed.
+
+    Example::
+        delimitedList(Word(alphas)).parseString("aa,bb,cc") # -> ['aa', 'bb', 'cc']
+        delimitedList(Word(hexnums), delim=':', combine=True).parseString("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
+    """
+    dlName = _ustr(expr)+" ["+_ustr(delim)+" "+_ustr(expr)+"]..."
+    if combine:
+        return Combine( expr + ZeroOrMore( delim + expr ) ).setName(dlName)
+    else:
+        return ( expr + ZeroOrMore( Suppress( delim ) + expr ) ).setName(dlName)
+
+def countedArray( expr, intExpr=None ):
+    """
+    Helper to define a counted list of expressions.
+    This helper defines a pattern of the form::
+        integer expr expr expr...
+    where the leading integer tells how many expr expressions follow.
+    The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+    
+    If C{intExpr} is specified, it should be a pyparsing expression that produces an integer value.
+
+    Example::
+        countedArray(Word(alphas)).parseString('2 ab cd ef')  # -> ['ab', 'cd']
+
+        # in this parser, the leading integer value is given in binary,
+        # '10' indicating that 2 values are in the array
+        binaryConstant = Word('01').setParseAction(lambda t: int(t[0], 2))
+        countedArray(Word(alphas), intExpr=binaryConstant).parseString('10 ab cd ef')  # -> ['ab', 'cd']
+    """
+    arrayExpr = Forward()
+    def countFieldParseAction(s,l,t):
+        n = t[0]
+        arrayExpr << (n and Group(And([expr]*n)) or Group(empty))
+        return []
+    if intExpr is None:
+        intExpr = Word(nums).setParseAction(lambda t:int(t[0]))
+    else:
+        intExpr = intExpr.copy()
+    intExpr.setName("arrayLen")
+    intExpr.addParseAction(countFieldParseAction, callDuringTry=True)
+    return ( intExpr + arrayExpr ).setName('(len) ' + _ustr(expr) + '...')
+
+def _flatten(L):
+    ret = []
+    for i in L:
+        if isinstance(i,list):
+            ret.extend(_flatten(i))
+        else:
+            ret.append(i)
+    return ret
+
+def matchPreviousLiteral(expr):
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousLiteral(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
+    previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
+    If this is not desired, use C{matchPreviousExpr}.
+    Do I{not} use with packrat parsing enabled.
+    """
+    rep = Forward()
+    def copyTokenToRepeater(s,l,t):
+        if t:
+            if len(t) == 1:
+                rep << t[0]
+            else:
+                # flatten t tokens
+                tflat = _flatten(t.asList())
+                rep << And(Literal(tt) for tt in tflat)
+        else:
+            rep << Empty()
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
+    return rep
+
+def matchPreviousExpr(expr):
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousExpr(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
+    expressions, will I{not} match the leading C{"1:1"} in C{"1:10"};
+    the expressions are evaluated first, and then compared, so
+    C{"1"} is compared with C{"10"}.
+    Do I{not} use with packrat parsing enabled.
+    """
+    rep = Forward()
+    e2 = expr.copy()
+    rep <<= e2
+    def copyTokenToRepeater(s,l,t):
+        matchTokens = _flatten(t.asList())
+        def mustMatchTheseTokens(s,l,t):
+            theseTokens = _flatten(t.asList())
+            if  theseTokens != matchTokens:
+                raise ParseException("",0,"")
+        rep.setParseAction( mustMatchTheseTokens, callDuringTry=True )
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
+    return rep
+
+def _escapeRegexRangeChars(s):
+    #~  escape these chars: ^-]
+    for c in r"\^-]":
+        s = s.replace(c,_bslash+c)
+    s = s.replace("\n",r"\n")
+    s = s.replace("\t",r"\t")
+    return _ustr(s)
+
+def oneOf( strs, caseless=False, useRegex=True ):
+    """
+    Helper to quickly define a set of alternative Literals, and makes sure to do
+    longest-first testing when there is a conflict, regardless of the input order,
+    but returns a C{L{MatchFirst}} for best performance.
+
+    Parameters:
+     - strs - a string of space-delimited literals, or a collection of string literals
+     - caseless - (default=C{False}) - treat all literals as caseless
+     - useRegex - (default=C{True}) - as an optimization, will generate a Regex
+          object; otherwise, will generate a C{MatchFirst} object (if C{caseless=True}, or
+          if creating a C{Regex} raises an exception)
+
+    Example::
+        comp_oper = oneOf("< = > <= >= !=")
+        var = Word(alphas)
+        number = Word(nums)
+        term = var | number
+        comparison_expr = term + comp_oper + term
+        print(comparison_expr.searchString("B = 12  AA=23 B<=AA AA>12"))
+    prints::
+        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
+    """
+    if caseless:
+        isequal = ( lambda a,b: a.upper() == b.upper() )
+        masks = ( lambda a,b: b.upper().startswith(a.upper()) )
+        parseElementClass = CaselessLiteral
+    else:
+        isequal = ( lambda a,b: a == b )
+        masks = ( lambda a,b: b.startswith(a) )
+        parseElementClass = Literal
+
+    symbols = []
+    if isinstance(strs,basestring):
+        symbols = strs.split()
+    elif isinstance(strs, collections.Iterable):
+        symbols = list(strs)
+    else:
+        warnings.warn("Invalid argument to oneOf, expected string or iterable",
+                SyntaxWarning, stacklevel=2)
+    if not symbols:
+        return NoMatch()
+
+    i = 0
+    while i < len(symbols)-1:
+        cur = symbols[i]
+        for j,other in enumerate(symbols[i+1:]):
+            if ( isequal(other, cur) ):
+                del symbols[i+j+1]
+                break
+            elif ( masks(cur, other) ):
+                del symbols[i+j+1]
+                symbols.insert(i,other)
+                cur = other
+                break
+        else:
+            i += 1
+
+    if not caseless and useRegex:
+        #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
+        try:
+            if len(symbols)==len("".join(symbols)):
+                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) ).setName(' | '.join(symbols))
+            else:
+                return Regex( "|".join(re.escape(sym) for sym in symbols) ).setName(' | '.join(symbols))
+        except Exception:
+            warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
+                    SyntaxWarning, stacklevel=2)
+
+
+    # last resort, just use MatchFirst
+    return MatchFirst(parseElementClass(sym) for sym in symbols).setName(' | '.join(symbols))
+
+def dictOf( key, value ):
+    """
+    Helper to easily and clearly define a dictionary by specifying the respective patterns
+    for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
+    in the proper order.  The key pattern can include delimiting markers or punctuation,
+    as long as they are suppressed, thereby leaving the significant key text.  The value
+    pattern can include named results, so that the C{Dict} results can include named token
+    fields.
+
+    Example::
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        attr_label = label
+        attr_value = Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join)
+
+        # similar to Dict, but simpler call format
+        result = dictOf(attr_label, attr_value).parseString(text)
+        print(result.dump())
+        print(result['shape'])
+        print(result.shape)  # object attribute access works too
+        print(result.asDict())
+    prints::
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        SQUARE
+        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
+    """
+    return Dict( ZeroOrMore( Group ( key + value ) ) )
+
+def originalTextFor(expr, asString=True):
+    """
+    Helper to return the original, untokenized text for a given expression.  Useful to
+    restore the parsed fields of an HTML start tag into the raw tag text itself, or to
+    revert separate tokens with intervening whitespace back to the original matching
+    input text. By default, returns astring containing the original parsed text.  
+       
+    If the optional C{asString} argument is passed as C{False}, then the return value is a 
+    C{L{ParseResults}} containing any results names that were originally matched, and a 
+    single token containing the original matched text from the input string.  So if 
+    the expression passed to C{L{originalTextFor}} contains expressions with defined
+    results names, you must set C{asString} to C{False} if you want to preserve those
+    results name values.
+
+    Example::
+        src = "this is test <b> bold <i>text</i> </b> normal text "
+        for tag in ("b","i"):
+            opener,closer = makeHTMLTags(tag)
+            patt = originalTextFor(opener + SkipTo(closer) + closer)
+            print(patt.searchString(src)[0])
+    prints::
+        ['<b> bold <i>text</i> </b>']
+        ['<i>text</i>']
+    """
+    locMarker = Empty().setParseAction(lambda s,loc,t: loc)
+    endlocMarker = locMarker.copy()
+    endlocMarker.callPreparse = False
+    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
+    if asString:
+        extractText = lambda s,l,t: s[t._original_start:t._original_end]
+    else:
+        def extractText(s,l,t):
+            t[:] = [s[t.pop('_original_start'):t.pop('_original_end')]]
+    matchExpr.setParseAction(extractText)
+    matchExpr.ignoreExprs = expr.ignoreExprs
+    return matchExpr
+
+def ungroup(expr): 
+    """
+    Helper to undo pyparsing's default grouping of And expressions, even
+    if all but one are non-empty.
+    """
+    return TokenConverter(expr).setParseAction(lambda t:t[0])
+
+def locatedExpr(expr):
+    """
+    Helper to decorate a returned token with its starting and ending locations in the input string.
+    This helper adds the following results names:
+     - locn_start = location where matched expression begins
+     - locn_end = location where matched expression ends
+     - value = the actual parsed results
+
+    Be careful if the input text contains C{<TAB>} characters, you may want to call
+    C{L{ParserElement.parseWithTabs}}
+
+    Example::
+        wd = Word(alphas)
+        for match in locatedExpr(wd).searchString("ljsdf123lksdjjf123lkkjj1222"):
+            print(match)
+    prints::
+        [[0, 'ljsdf', 5]]
+        [[8, 'lksdjjf', 15]]
+        [[18, 'lkkjj', 23]]
+    """
+    locator = Empty().setParseAction(lambda s,l,t: l)
+    return Group(locator("locn_start") + expr("value") + locator.copy().leaveWhitespace()("locn_end"))
+
+
+# convenience constants for positional expressions
+empty       = Empty().setName("empty")
+lineStart   = LineStart().setName("lineStart")
+lineEnd     = LineEnd().setName("lineEnd")
+stringStart = StringStart().setName("stringStart")
+stringEnd   = StringEnd().setName("stringEnd")
+
+_escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
+_escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
+_escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
+_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
+_charRange = Group(_singleChar + Suppress("-") + _singleChar)
+_reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
+
+def srange(s):
+    r"""
+    Helper to easily define string ranges for use in Word construction.  Borrows
+    syntax from regexp '[]' string range definitions::
+        srange("[0-9]")   -> "0123456789"
+        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
+        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
+    The input string must be enclosed in []'s, and the returned string is the expanded
+    character set joined into a single string.
+    The values enclosed in the []'s may be:
+     - a single character
+     - an escaped character with a leading backslash (such as C{\-} or C{\]})
+     - an escaped hex character with a leading C{'\x'} (C{\x21}, which is a C{'!'} character) 
+         (C{\0x##} is also supported for backwards compatibility) 
+     - an escaped octal character with a leading C{'\0'} (C{\041}, which is a C{'!'} character)
+     - a range of any of the above, separated by a dash (C{'a-z'}, etc.)
+     - any combination of the above (C{'aeiouy'}, C{'a-zA-Z0-9_$'}, etc.)
+    """
+    _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
+    try:
+        return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)
+    except Exception:
+        return ""
+
+def matchOnlyAtCol(n):
+    """
+    Helper method for defining parse actions that require matching at a specific
+    column in the input text.
+    """
+    def verifyCol(strg,locn,toks):
+        if col(locn,strg) != n:
+            raise ParseException(strg,locn,"matched token not at column %d" % n)
+    return verifyCol
+
+def replaceWith(replStr):
+    """
+    Helper method for common parse actions that simply return a literal value.  Especially
+    useful when used with C{L{transformString<ParserElement.transformString>}()}.
+
+    Example::
+        num = Word(nums).setParseAction(lambda toks: int(toks[0]))
+        na = oneOf("N/A NA").setParseAction(replaceWith(math.nan))
+        term = na | num
+        
+        OneOrMore(term).parseString("324 234 N/A 234") # -> [324, 234, nan, 234]
+    """
+    return lambda s,l,t: [replStr]
+
+def removeQuotes(s,l,t):
+    """
+    Helper parse action for removing quotation marks from parsed quoted strings.
+
+    Example::
+        # by default, quotation marks are included in parsed results
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
+
+        # use removeQuotes to strip quotation marks from parsed results
+        quotedString.setParseAction(removeQuotes)
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
+    """
+    return t[0][1:-1]
+
+def tokenMap(func, *args):
+    """
+    Helper to define a parse action by mapping a function to all elements of a ParseResults list.If any additional 
+    args are passed, they are forwarded to the given function as additional arguments after
+    the token, as in C{hex_integer = Word(hexnums).setParseAction(tokenMap(int, 16))}, which will convert the
+    parsed data to an integer using base 16.
+
+    Example (compare the last to example in L{ParserElement.transformString}::
+        hex_ints = OneOrMore(Word(hexnums)).setParseAction(tokenMap(int, 16))
+        hex_ints.runTests('''
+            00 11 22 aa FF 0a 0d 1a
+            ''')
+        
+        upperword = Word(alphas).setParseAction(tokenMap(str.upper))
+        OneOrMore(upperword).runTests('''
+            my kingdom for a horse
+            ''')
+
+        wd = Word(alphas).setParseAction(tokenMap(str.title))
+        OneOrMore(wd).setParseAction(' '.join).runTests('''
+            now is the winter of our discontent made glorious summer by this sun of york
+            ''')
+    prints::
+        00 11 22 aa FF 0a 0d 1a
+        [0, 17, 34, 170, 255, 10, 13, 26]
+
+        my kingdom for a horse
+        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
+
+        now is the winter of our discontent made glorious summer by this sun of york
+        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
+    """
+    def pa(s,l,t):
+        return [func(tokn, *args) for tokn in t]
+
+    try:
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    pa.__name__ = func_name
+
+    return pa
+
+upcaseTokens = tokenMap(lambda t: _ustr(t).upper())
+"""(Deprecated) Helper parse action to convert tokens to upper case. Deprecated in favor of L{pyparsing_common.upcaseTokens}"""
+
+downcaseTokens = tokenMap(lambda t: _ustr(t).lower())
+"""(Deprecated) Helper parse action to convert tokens to lower case. Deprecated in favor of L{pyparsing_common.downcaseTokens}"""
+    
+def _makeTags(tagStr, xml):
+    """Internal helper to construct opening and closing tag expressions, given a tag name"""
+    if isinstance(tagStr,basestring):
+        resname = tagStr
+        tagStr = Keyword(tagStr, caseless=not xml)
+    else:
+        resname = tagStr.name
+
+    tagAttrName = Word(alphas,alphanums+"_-:")
+    if (xml):
+        tagAttrValue = dblQuotedString.copy().setParseAction( removeQuotes )
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName + Suppress("=") + tagAttrValue ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    else:
+        printablesLessRAbrack = "".join(c for c in printables if c not in ">")
+        tagAttrValue = quotedString.copy().setParseAction( removeQuotes ) | Word(printablesLessRAbrack)
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName.setParseAction(downcaseTokens) + \
+                Optional( Suppress("=") + tagAttrValue ) ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    closeTag = Combine(_L("</") + tagStr + ">")
+
+    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % resname)
+    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % resname)
+    openTag.tag = resname
+    closeTag.tag = resname
+    return openTag, closeTag
+
+def makeHTMLTags(tagStr):
+    """
+    Helper to construct opening and closing tag expressions for HTML, given a tag name. Matches
+    tags in either upper or lower case, attributes with namespaces and with quoted or unquoted values.
+
+    Example::
+        text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+        # makeHTMLTags returns pyparsing expressions for the opening and closing tags as a 2-tuple
+        a,a_end = makeHTMLTags("A")
+        link_expr = a + SkipTo(a_end)("link_text") + a_end
+        
+        for link in link_expr.searchString(text):
+            # attributes in the <A> tag (like "href" shown here) are also accessible as named results
+            print(link.link_text, '->', link.href)
+    prints::
+        pyparsing -> http://pyparsing.wikispaces.com
+    """
+    return _makeTags( tagStr, False )
+
+def makeXMLTags(tagStr):
+    """
+    Helper to construct opening and closing tag expressions for XML, given a tag name. Matches
+    tags only in the given upper/lower case.
+
+    Example: similar to L{makeHTMLTags}
+    """
+    return _makeTags( tagStr, True )
+
+def withAttribute(*args,**attrDict):
+    """
+    Helper to create a validating parse action to be used with start tags created
+    with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
+    with a required attribute value, to avoid false matches on common tags such as
+    C{<TD>} or C{<DIV>}.
+
+    Call C{withAttribute} with a series of attribute names and values. Specify the list
+    of filter attributes names and values as:
+     - keyword arguments, as in C{(align="right")}, or
+     - as an explicit dict with C{**} operator, when an attribute name is also a Python
+          reserved word, as in C{**{"class":"Customer", "align":"right"}}
+     - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
+    For attribute names with a namespace prefix, you must use the second form.  Attribute
+    names are matched insensitive to upper/lower case.
+       
+    If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
+
+    To verify that the attribute exists, but without specifying a value, pass
+    C{withAttribute.ANY_VALUE} as the value.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div type="grid">1 4 0 1 0</div>
+            <div type="graph">1,3 2,3 1,1</div>
+            <div>this has no type</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+
+        # only match div tag having a type attribute with value "grid"
+        div_grid = div().setParseAction(withAttribute(type="grid"))
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        # construct a match with any div tag having a type attribute, regardless of the value
+        div_any_type = div().setParseAction(withAttribute(type=withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
+    if args:
+        attrs = args[:]
+    else:
+        attrs = attrDict.items()
+    attrs = [(k,v) for k,v in attrs]
+    def pa(s,l,tokens):
+        for attrName,attrValue in attrs:
+            if attrName not in tokens:
+                raise ParseException(s,l,"no matching attribute " + attrName)
+            if attrValue != withAttribute.ANY_VALUE and tokens[attrName] != attrValue:
+                raise ParseException(s,l,"attribute '%s' has value '%s', must be '%s'" %
+                                            (attrName, tokens[attrName], attrValue))
+    return pa
+withAttribute.ANY_VALUE = object()
+
+def withClass(classname, namespace=''):
+    """
+    Simplified version of C{L{withAttribute}} when matching on a div class - made
+    difficult because C{class} is a reserved word in Python.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div class="grid">1 4 0 1 0</div>
+            <div class="graph">1,3 2,3 1,1</div>
+            <div>this &lt;div&gt; has no class</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+        div_grid = div().setParseAction(withClass("grid"))
+        
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        div_any_type = div().setParseAction(withClass(withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
+    classattr = "%s:class" % namespace if namespace else "class"
+    return withAttribute(**{classattr : classname})        
+
+opAssoc = _Constants()
+opAssoc.LEFT = object()
+opAssoc.RIGHT = object()
+
+def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
+    """
+    Helper method for constructing grammars of expressions made up of
+    operators working in a precedence hierarchy.  Operators may be unary or
+    binary, left- or right-associative.  Parse actions can also be attached
+    to operator expressions. The generated parser will also recognize the use 
+    of parentheses to override operator precedences (see example below).
+    
+    Note: if you define a deep operator list, you may see performance issues
+    when using infixNotation. See L{ParserElement.enablePackrat} for a
+    mechanism to potentially improve your parser performance.
+
+    Parameters:
+     - baseExpr - expression representing the most basic element for the nested
+     - opList - list of tuples, one for each operator precedence level in the
+      expression grammar; each tuple is of the form
+      (opExpr, numTerms, rightLeftAssoc, parseAction), where:
+       - opExpr is the pyparsing expression for the operator;
+          may also be a string, which will be converted to a Literal;
+          if numTerms is 3, opExpr is a tuple of two expressions, for the
+          two operators separating the 3 terms
+       - numTerms is the number of terms for this operator (must
+          be 1, 2, or 3)
+       - rightLeftAssoc is the indicator whether the operator is
+          right or left associative, using the pyparsing-defined
+          constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
+       - parseAction is the parse action to be associated with
+          expressions matching this operator expression (the
+          parse action tuple member may be omitted)
+     - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
+     - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
+
+    Example::
+        # simple example of four-function arithmetic with ints and variable names
+        integer = pyparsing_common.signed_integer
+        varname = pyparsing_common.identifier 
+        
+        arith_expr = infixNotation(integer | varname,
+            [
+            ('-', 1, opAssoc.RIGHT),
+            (oneOf('* /'), 2, opAssoc.LEFT),
+            (oneOf('+ -'), 2, opAssoc.LEFT),
+            ])
+        
+        arith_expr.runTests('''
+            5+3*6
+            (5+3)*6
+            -2--11
+            ''', fullDump=False)
+    prints::
+        5+3*6
+        [[5, '+', [3, '*', 6]]]
+
+        (5+3)*6
+        [[[5, '+', 3], '*', 6]]
+
+        -2--11
+        [[['-', 2], '-', ['-', 11]]]
+    """
+    ret = Forward()
+    lastExpr = baseExpr | ( lpar + ret + rpar )
+    for i,operDef in enumerate(opList):
+        opExpr,arity,rightLeftAssoc,pa = (operDef + (None,))[:4]
+        termName = "%s term" % opExpr if arity < 3 else "%s%s term" % opExpr
+        if arity == 3:
+            if opExpr is None or len(opExpr) != 2:
+                raise ValueError("if numterms=3, opExpr must be a tuple or list of two expressions")
+            opExpr1, opExpr2 = opExpr
+        thisExpr = Forward().setName(termName)
+        if rightLeftAssoc == opAssoc.LEFT:
+            if arity == 1:
+                matchExpr = FollowedBy(lastExpr + opExpr) + Group( lastExpr + OneOrMore( opExpr ) )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + lastExpr) + Group( lastExpr + OneOrMore( opExpr + lastExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr+lastExpr) + Group( lastExpr + OneOrMore(lastExpr) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr) + \
+                            Group( lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        elif rightLeftAssoc == opAssoc.RIGHT:
+            if arity == 1:
+                # try to avoid LR with this extra test
+                if not isinstance(opExpr, Optional):
+                    opExpr = Optional(opExpr)
+                matchExpr = FollowedBy(opExpr.expr + thisExpr) + Group( opExpr + thisExpr )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + thisExpr) + Group( lastExpr + OneOrMore( opExpr + thisExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr + thisExpr) + Group( lastExpr + OneOrMore( thisExpr ) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr) + \
+                            Group( lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        else:
+            raise ValueError("operator must indicate right or left associativity")
+        if pa:
+            matchExpr.setParseAction( pa )
+        thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
+        lastExpr = thisExpr
+    ret <<= lastExpr
+    return ret
+
+operatorPrecedence = infixNotation
+"""(Deprecated) Former name of C{L{infixNotation}}, will be dropped in a future release."""
+
+dblQuotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"').setName("string enclosed in double quotes")
+sglQuotedString = Combine(Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("string enclosed in single quotes")
+quotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"'|
+                       Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("quotedString using single or double quotes")
+unicodeString = Combine(_L('u') + quotedString.copy()).setName("unicode string literal")
+
+def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.copy()):
+    """
+    Helper method for defining nested lists enclosed in opening and closing
+    delimiters ("(" and ")" are the default).
+
+    Parameters:
+     - opener - opening character for a nested list (default=C{"("}); can also be a pyparsing expression
+     - closer - closing character for a nested list (default=C{")"}); can also be a pyparsing expression
+     - content - expression for items within the nested lists (default=C{None})
+     - ignoreExpr - expression for ignoring opening and closing delimiters (default=C{quotedString})
+
+    If an expression is not provided for the content argument, the nested
+    expression will capture all whitespace-delimited content between delimiters
+    as a list of separate values.
+
+    Use the C{ignoreExpr} argument to define expressions that may contain
+    opening or closing characters that should not be treated as opening
+    or closing characters for nesting, such as quotedString or a comment
+    expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
+    The default is L{quotedString}, but if no expressions are to be ignored,
+    then pass C{None} for this argument.
+
+    Example::
+        data_type = oneOf("void int short long char float double")
+        decl_data_type = Combine(data_type + Optional(Word('*')))
+        ident = Word(alphas+'_', alphanums+'_')
+        number = pyparsing_common.number
+        arg = Group(decl_data_type + ident)
+        LPAR,RPAR = map(Suppress, "()")
+
+        code_body = nestedExpr('{', '}', ignoreExpr=(quotedString | cStyleComment))
+
+        c_function = (decl_data_type("type") 
+                      + ident("name")
+                      + LPAR + Optional(delimitedList(arg), [])("args") + RPAR 
+                      + code_body("body"))
+        c_function.ignore(cStyleComment)
+        
+        source_code = '''
+            int is_odd(int x) { 
+                return (x%2); 
+            }
+                
+            int dec_to_hex(char hchar) { 
+                if (hchar >= '0' && hchar <= '9') { 
+                    return (ord(hchar)-ord('0')); 
+                } else { 
+                    return (10+ord(hchar)-ord('A'));
+                } 
+            }
+        '''
+        for func in c_function.searchString(source_code):
+            print("%(name)s (%(type)s) args: %(args)s" % func)
+
+    prints::
+        is_odd (int) args: [['int', 'x']]
+        dec_to_hex (int) args: [['char', 'hchar']]
+    """
+    if opener == closer:
+        raise ValueError("opening and closing strings cannot be the same")
+    if content is None:
+        if isinstance(opener,basestring) and isinstance(closer,basestring):
+            if len(opener) == 1 and len(closer)==1:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr +
+                                    CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (empty.copy()+CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS
+                                ).setParseAction(lambda t:t[0].strip()))
+            else:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr + 
+                                    ~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (Combine(OneOrMore(~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+        else:
+            raise ValueError("opening and closing arguments must be strings if no content expression is given")
+    ret = Forward()
+    if ignoreExpr is not None:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ignoreExpr | ret | content ) + Suppress(closer) )
+    else:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ret | content )  + Suppress(closer) )
+    ret.setName('nested %s%s expression' % (opener,closer))
+    return ret
+
+def indentedBlock(blockStatementExpr, indentStack, indent=True):
+    """
+    Helper method for defining space-delimited indentation blocks, such as
+    those used to define block statements in Python source code.
+
+    Parameters:
+     - blockStatementExpr - expression defining syntax of statement that
+            is repeated within the indented block
+     - indentStack - list created by caller to manage indentation stack
+            (multiple statementWithIndentedBlock expressions within a single grammar
+            should share a common indentStack)
+     - indent - boolean indicating whether block must be indented beyond the
+            the current level; set to False for block of left-most statements
+            (default=C{True})
+
+    A valid block must contain at least one C{blockStatement}.
+
+    Example::
+        data = '''
+        def A(z):
+          A1
+          B = 100
+          G = A2
+          A2
+          A3
+        B
+        def BB(a,b,c):
+          BB1
+          def BBA():
+            bba1
+            bba2
+            bba3
+        C
+        D
+        def spam(x,y):
+             def eggs(z):
+                 pass
+        '''
+
+
+        indentStack = [1]
+        stmt = Forward()
+
+        identifier = Word(alphas, alphanums)
+        funcDecl = ("def" + identifier + Group( "(" + Optional( delimitedList(identifier) ) + ")" ) + ":")
+        func_body = indentedBlock(stmt, indentStack)
+        funcDef = Group( funcDecl + func_body )
+
+        rvalue = Forward()
+        funcCall = Group(identifier + "(" + Optional(delimitedList(rvalue)) + ")")
+        rvalue << (funcCall | identifier | Word(nums))
+        assignment = Group(identifier + "=" + rvalue)
+        stmt << ( funcDef | assignment | identifier )
+
+        module_body = OneOrMore(stmt)
+
+        parseTree = module_body.parseString(data)
+        parseTree.pprint()
+    prints::
+        [['def',
+          'A',
+          ['(', 'z', ')'],
+          ':',
+          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
+         'B',
+         ['def',
+          'BB',
+          ['(', 'a', 'b', 'c', ')'],
+          ':',
+          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
+         'C',
+         'D',
+         ['def',
+          'spam',
+          ['(', 'x', 'y', ')'],
+          ':',
+          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]] 
+    """
+    def checkPeerIndent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if curCol != indentStack[-1]:
+            if curCol > indentStack[-1]:
+                raise ParseFatalException(s,l,"illegal nesting")
+            raise ParseException(s,l,"not a peer entry")
+
+    def checkSubIndent(s,l,t):
+        curCol = col(l,s)
+        if curCol > indentStack[-1]:
+            indentStack.append( curCol )
+        else:
+            raise ParseException(s,l,"not a subentry")
+
+    def checkUnindent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if not(indentStack and curCol < indentStack[-1] and curCol <= indentStack[-2]):
+            raise ParseException(s,l,"not an unindent")
+        indentStack.pop()
+
+    NL = OneOrMore(LineEnd().setWhitespaceChars("\t ").suppress())
+    INDENT = (Empty() + Empty().setParseAction(checkSubIndent)).setName('INDENT')
+    PEER   = Empty().setParseAction(checkPeerIndent).setName('')
+    UNDENT = Empty().setParseAction(checkUnindent).setName('UNINDENT')
+    if indent:
+        smExpr = Group( Optional(NL) +
+            #~ FollowedBy(blockStatementExpr) +
+            INDENT + (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) + UNDENT)
+    else:
+        smExpr = Group( Optional(NL) +
+            (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) )
+    blockStatementExpr.ignore(_bslash + LineEnd())
+    return smExpr.setName('indented block')
+
+alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
+punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
+
+anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:").setName('any tag'))
+_htmlEntityMap = dict(zip("gt lt amp nbsp quot apos".split(),'><& "\''))
+commonHTMLEntity = Regex('&(?P<entity>' + '|'.join(_htmlEntityMap.keys()) +");").setName("common HTML entity")
+def replaceHTMLEntity(t):
+    """Helper parser action to replace common HTML entities with their special characters"""
+    return _htmlEntityMap.get(t.entity)
+
+# it's easy to get these comment structures wrong - they're very common, so may as well make them available
+cStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/').setName("C style comment")
+"Comment of the form C{/* ... */}"
+
+htmlComment = Regex(r"<!--[\s\S]*?-->").setName("HTML comment")
+"Comment of the form C{<!-- ... -->}"
+
+restOfLine = Regex(r".*").leaveWhitespace().setName("rest of line")
+dblSlashComment = Regex(r"//(?:\\\n|[^\n])*").setName("// comment")
+"Comment of the form C{// ... (to end of line)}"
+
+cppStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/'| dblSlashComment).setName("C++ style comment")
+"Comment of either form C{L{cStyleComment}} or C{L{dblSlashComment}}"
+
+javaStyleComment = cppStyleComment
+"Same as C{L{cppStyleComment}}"
+
+pythonStyleComment = Regex(r"#.*").setName("Python style comment")
+"Comment of the form C{# ... (to end of line)}"
+
+_commasepitem = Combine(OneOrMore(Word(printables, excludeChars=',') +
+                                  Optional( Word(" \t") +
+                                            ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
+commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
+"""(Deprecated) Predefined expression of 1 or more printable words or quoted strings, separated by commas.
+   This expression is deprecated in favor of L{pyparsing_common.comma_separated_list}."""
+
+# some other useful expressions - using lower-case class name since we are really using this as a namespace
+class pyparsing_common:
+    """
+    Here are some common low-level expressions that may be useful in jump-starting parser development:
+     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sci_real>})
+     - common L{programming identifiers<identifier>}
+     - network addresses (L{MAC<mac_address>}, L{IPv4<ipv4_address>}, L{IPv6<ipv6_address>})
+     - ISO8601 L{dates<iso8601_date>} and L{datetime<iso8601_datetime>}
+     - L{UUID<uuid>}
+     - L{comma-separated list<comma_separated_list>}
+    Parse actions:
+     - C{L{convertToInteger}}
+     - C{L{convertToFloat}}
+     - C{L{convertToDate}}
+     - C{L{convertToDatetime}}
+     - C{L{stripHTMLTags}}
+     - C{L{upcaseTokens}}
+     - C{L{downcaseTokens}}
+
+    Example::
+        pyparsing_common.number.runTests('''
+            # any int or real number, returned as the appropriate type
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.fnumber.runTests('''
+            # any int or real number, returned as float
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.hex_integer.runTests('''
+            # hex numbers
+            100
+            FF
+            ''')
+
+        pyparsing_common.fraction.runTests('''
+            # fractions
+            1/2
+            -3/4
+            ''')
+
+        pyparsing_common.mixed_integer.runTests('''
+            # mixed fractions
+            1
+            1/2
+            -3/4
+            1-3/4
+            ''')
+
+        import uuid
+        pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+        pyparsing_common.uuid.runTests('''
+            # uuid
+            12345678-1234-5678-1234-567812345678
+            ''')
+    prints::
+        # any int or real number, returned as the appropriate type
+        100
+        [100]
+
+        -100
+        [-100]
+
+        +100
+        [100]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # any int or real number, returned as float
+        100
+        [100.0]
+
+        -100
+        [-100.0]
+
+        +100
+        [100.0]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # hex numbers
+        100
+        [256]
+
+        FF
+        [255]
+
+        # fractions
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        # mixed fractions
+        1
+        [1]
+
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        1-3/4
+        [1.75]
+
+        # uuid
+        12345678-1234-5678-1234-567812345678
+        [UUID('12345678-1234-5678-1234-567812345678')]
+    """
+
+    convertToInteger = tokenMap(int)
+    """
+    Parse action for converting parsed integers to Python int
+    """
+
+    convertToFloat = tokenMap(float)
+    """
+    Parse action for converting parsed numbers to Python float
+    """
+
+    integer = Word(nums).setName("integer").setParseAction(convertToInteger)
+    """expression that parses an unsigned integer, returns an int"""
+
+    hex_integer = Word(hexnums).setName("hex integer").setParseAction(tokenMap(int,16))
+    """expression that parses a hexadecimal integer, returns an int"""
+
+    signed_integer = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
+    """expression that parses an integer with optional leading sign, returns an int"""
+
+    fraction = (signed_integer().setParseAction(convertToFloat) + '/' + signed_integer().setParseAction(convertToFloat)).setName("fraction")
+    """fractional expression of an integer divided by an integer, returns a float"""
+    fraction.addParseAction(lambda t: t[0]/t[-1])
+
+    mixed_integer = (fraction | signed_integer + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
+    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
+    mixed_integer.addParseAction(sum)
+
+    real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
+    """expression that parses a floating point number and returns a float"""
+
+    sci_real = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
+    """expression that parses a floating point number with optional scientific notation and returns a float"""
+
+    # streamlining this expression makes the docs nicer-looking
+    number = (sci_real | real | signed_integer).streamline()
+    """any numeric expression, returns the corresponding Python type"""
+
+    fnumber = Regex(r'[+-]?\d+\.?\d*([eE][+-]?\d+)?').setName("fnumber").setParseAction(convertToFloat)
+    """any int or real number, returned as float"""
+    
+    identifier = Word(alphas+'_', alphanums+'_').setName("identifier")
+    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
+    
+    ipv4_address = Regex(r'(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}').setName("IPv4 address")
+    "IPv4 address (C{0.0.0.0 - 255.255.255.255})"
+
+    _ipv6_part = Regex(r'[0-9a-fA-F]{1,4}').setName("hex_integer")
+    _full_ipv6_address = (_ipv6_part + (':' + _ipv6_part)*7).setName("full IPv6 address")
+    _short_ipv6_address = (Optional(_ipv6_part + (':' + _ipv6_part)*(0,6)) + "::" + Optional(_ipv6_part + (':' + _ipv6_part)*(0,6))).setName("short IPv6 address")
+    _short_ipv6_address.addCondition(lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8)
+    _mixed_ipv6_address = ("::ffff:" + ipv4_address).setName("mixed IPv6 address")
+    ipv6_address = Combine((_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).setName("IPv6 address")).setName("IPv6 address")
+    "IPv6 address (long, short, or mixed form)"
+    
+    mac_address = Regex(r'[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}').setName("MAC address")
+    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
+
+    @staticmethod
+    def convertToDate(fmt="%Y-%m-%d"):
+        """
+        Helper to create a parse action for converting parsed date string to Python datetime.date
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%d"})
+
+        Example::
+            date_expr = pyparsing_common.iso8601_date.copy()
+            date_expr.setParseAction(pyparsing_common.convertToDate())
+            print(date_expr.parseString("1999-12-31"))
+        prints::
+            [datetime.date(1999, 12, 31)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt).date()
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    @staticmethod
+    def convertToDatetime(fmt="%Y-%m-%dT%H:%M:%S.%f"):
+        """
+        Helper to create a parse action for converting parsed datetime string to Python datetime.datetime
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%dT%H:%M:%S.%f"})
+
+        Example::
+            dt_expr = pyparsing_common.iso8601_datetime.copy()
+            dt_expr.setParseAction(pyparsing_common.convertToDatetime())
+            print(dt_expr.parseString("1999-12-31T23:59:59.999"))
+        prints::
+            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt)
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    iso8601_date = Regex(r'(?P<year>\d{4})(?:-(?P<month>\d\d)(?:-(?P<day>\d\d))?)?').setName("ISO8601 date")
+    "ISO8601 date (C{yyyy-mm-dd})"
+
+    iso8601_datetime = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)[T ](?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d(\.\d*)?)?)?(?P<tz>Z|[+-]\d\d:?\d\d)?').setName("ISO8601 datetime")
+    "ISO8601 datetime (C{yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)}) - trailing seconds, milliseconds, and timezone optional; accepts separating C{'T'} or C{' '}"
+
+    uuid = Regex(r'[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}').setName("UUID")
+    "UUID (C{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx})"
+
+    _html_stripper = anyOpenTag.suppress() | anyCloseTag.suppress()
+    @staticmethod
+    def stripHTMLTags(s, l, tokens):
+        """
+        Parse action to remove HTML tags from web page HTML source
+
+        Example::
+            # strip HTML links from normal text 
+            text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+            td,td_end = makeHTMLTags("TD")
+            table_text = td + SkipTo(td_end).setParseAction(pyparsing_common.stripHTMLTags)("body") + td_end
+            
+            print(table_text.parseString(text).body) # -> 'More info at the pyparsing wiki page'
+        """
+        return pyparsing_common._html_stripper.transformString(tokens[0])
+
+    _commasepitem = Combine(OneOrMore(~Literal(",") + ~LineEnd() + Word(printables, excludeChars=',') 
+                                        + Optional( White(" \t") ) ) ).streamline().setName("commaItem")
+    comma_separated_list = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("comma separated list")
+    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
+
+    upcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).upper()))
+    """Parse action to convert tokens to upper case."""
+
+    downcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).lower()))
+    """Parse action to convert tokens to lower case."""
+
+
+if __name__ == "__main__":
+
+    selectToken    = CaselessLiteral("select")
+    fromToken      = CaselessLiteral("from")
+
+    ident          = Word(alphas, alphanums + "_$")
+
+    columnName     = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    columnNameList = Group(delimitedList(columnName)).setName("columns")
+    columnSpec     = ('*' | columnNameList)
+
+    tableName      = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    tableNameList  = Group(delimitedList(tableName)).setName("tables")
+    
+    simpleSQL      = selectToken("command") + columnSpec("columns") + fromToken + tableNameList("tables")
+
+    # demo runTests method, including embedded comments in test string
+    simpleSQL.runTests("""
+        # '*' as column list and dotted table name
+        select * from SYS.XYZZY
+
+        # caseless match on "SELECT", and casts back to "select"
+        SELECT * from XYZZY, ABC
+
+        # list of column names, and mixed case SELECT keyword
+        Select AA,BB,CC from Sys.dual
+
+        # multiple tables
+        Select A, B, C from Sys.dual, Table2
+
+        # invalid SELECT keyword - should fail
+        Xelect A, B, C from Sys.dual
+
+        # incomplete command - should fail
+        Select
+
+        # invalid column name - should fail
+        Select ^^^ frox Sys.dual
+
+        """)
+
+    pyparsing_common.number.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    # any int or real number, returned as float
+    pyparsing_common.fnumber.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    pyparsing_common.hex_integer.runTests("""
+        100
+        FF
+        """)
+
+    import uuid
+    pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+    pyparsing_common.uuid.runTests("""
+        12345678-1234-5678-1234-567812345678
+        """)
diff --git a/pkg_resources/_vendor/six.py b/pkg_resources/_vendor/six.py
new file mode 100644
index 0000000000..190c0239cd
--- /dev/null
+++ b/pkg_resources/_vendor/six.py
@@ -0,0 +1,868 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2015 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from __future__ import absolute_import
+
+import functools
+import itertools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.10.0"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)  # Invokes __set__.
+        try:
+            # This is a bit ugly, but it avoids running this again by
+            # removing this descriptor.
+            delattr(obj.__class__, self.name)
+        except AttributeError:
+            pass
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("intern", "__builtin__", "sys"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
+    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+]
+# Add windows specific modules.
+if sys.platform == "win32":
+    _moved_attributes += [
+        MovedModule("winreg", "_winreg"),
+    ]
+
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+    MovedAttribute("splittag", "urllib", "urllib.parse"),
+    MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    def create_unbound_method(func, cls):
+        return func
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    def create_unbound_method(func, cls):
+        return types.MethodType(func, None, cls)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+
+    viewkeys = operator.methodcaller("keys")
+
+    viewvalues = operator.methodcaller("values")
+
+    viewitems = operator.methodcaller("items")
+else:
+    def iterkeys(d, **kw):
+        return d.iterkeys(**kw)
+
+    def itervalues(d, **kw):
+        return d.itervalues(**kw)
+
+    def iteritems(d, **kw):
+        return d.iteritems(**kw)
+
+    def iterlists(d, **kw):
+        return d.iterlists(**kw)
+
+    viewkeys = operator.methodcaller("viewkeys")
+
+    viewvalues = operator.methodcaller("viewvalues")
+
+    viewitems = operator.methodcaller("viewitems")
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+
+    def u(s):
+        return s
+    unichr = chr
+    import struct
+    int2byte = struct.Struct(">B").pack
+    del struct
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    _assertCountEqual = "assertCountEqual"
+    if sys.version_info[1] <= 1:
+        _assertRaisesRegex = "assertRaisesRegexp"
+        _assertRegex = "assertRegexpMatches"
+    else:
+        _assertRaisesRegex = "assertRaisesRegex"
+        _assertRegex = "assertRegex"
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+
+    def byte2int(bs):
+        return ord(bs[0])
+
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    iterbytes = functools.partial(itertools.imap, ord)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    _assertCountEqual = "assertItemsEqual"
+    _assertRaisesRegex = "assertRaisesRegexp"
+    _assertRegex = "assertRegexpMatches"
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
+def assertRaisesRegex(self, *args, **kwargs):
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+
+
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+    def reraise(tp, value, tb=None):
+        if value is None:
+            value = tp()
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+if sys.version_info[:2] == (3, 2):
+    exec_("""def raise_from(value, from_value):
+    if from_value is None:
+        raise value
+    raise value from from_value
+""")
+elif sys.version_info[:2] > (3, 2):
+    exec_("""def raise_from(value, from_value):
+    raise value from from_value
+""")
+else:
+    def raise_from(value, from_value):
+        raise value
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                    isinstance(data, unicode) and
+                    fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+if sys.version_info[:2] < (3, 3):
+    _print = print_
+
+    def print_(*args, **kwargs):
+        fp = kwargs.get("file", sys.stdout)
+        flush = kwargs.pop("flush", False)
+        _print(*args, **kwargs)
+        if flush and fp is not None:
+            fp.flush()
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
+        def wrapper(f):
+            f = functools.wraps(wrapped, assigned, updated)(f)
+            f.__wrapped__ = wrapped
+            return f
+        return wrapper
+else:
+    wraps = functools.wraps
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
+def python_2_unicode_compatible(klass):
+    """
+    A decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if PY2:
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+                importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
new file mode 100644
index 0000000000..9a94c5bcc2
--- /dev/null
+++ b/pkg_resources/_vendor/vendored.txt
@@ -0,0 +1,4 @@
+packaging==16.8
+pyparsing==2.1.10
+six==1.10.0
+appdirs==1.4.0
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
new file mode 100644
index 0000000000..b4156fec20
--- /dev/null
+++ b/pkg_resources/extern/__init__.py
@@ -0,0 +1,73 @@
+import sys
+
+
+class VendorImporter:
+    """
+    A PEP 302 meta path importer for finding optionally-vendored
+    or otherwise naturally-installed packages from root_name.
+    """
+
+    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
+        self.root_name = root_name
+        self.vendored_names = set(vendored_names)
+        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
+
+    @property
+    def search_path(self):
+        """
+        Search first the vendor package then as a natural package.
+        """
+        yield self.vendor_pkg + '.'
+        yield ''
+
+    def find_module(self, fullname, path=None):
+        """
+        Return self when fullname starts with root_name and the
+        target module is one vendored through this importer.
+        """
+        root, base, target = fullname.partition(self.root_name + '.')
+        if root:
+            return
+        if not any(map(target.startswith, self.vendored_names)):
+            return
+        return self
+
+    def load_module(self, fullname):
+        """
+        Iterate over the search path to locate and load fullname.
+        """
+        root, base, target = fullname.partition(self.root_name + '.')
+        for prefix in self.search_path:
+            try:
+                extant = prefix + target
+                __import__(extant)
+                mod = sys.modules[extant]
+                sys.modules[fullname] = mod
+                # mysterious hack:
+                # Remove the reference to the extant package/module
+                # on later Python versions to cause relative imports
+                # in the vendor package to resolve the same modules
+                # as those going through this importer.
+                if sys.version_info > (3, 3):
+                    del sys.modules[extant]
+                return mod
+            except ImportError:
+                pass
+        else:
+            raise ImportError(
+                "The '{target}' package is required; "
+                "normally this is bundled with this package so if you get "
+                "this warning, consult the packager of your "
+                "distribution.".format(**locals())
+            )
+
+    def install(self):
+        """
+        Install this importer into sys.meta_path if not already present.
+        """
+        if self not in sys.meta_path:
+            sys.meta_path.append(self)
+
+
+names = 'packaging', 'pyparsing', 'six', 'appdirs'
+VendorImporter(__name__, names).install()
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index bef914a22a..49bf7a04b8 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,7 +12,7 @@
 import distutils.dist
 import distutils.command.install_egg_info
 
-from six.moves import map
+from pkg_resources.extern.six.moves import map
 
 import pytest
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index f28378b9c6..00ca74262a 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -5,10 +5,10 @@
 import string
 import platform
 
-from six.moves import map
+from pkg_resources.extern.six.moves import map
 
 import pytest
-import packaging
+from pkg_resources.extern import packaging
 
 import pkg_resources
 from pkg_resources import (parse_requirements, VersionConflict, parse_version,
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index 0aa2e1c865..0000000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[build-system]
-# for Setuptools, its own requirements are build requirements,
-# so keep this in sync with install_requires in setup.py.
-requires = [
-    "wheel",
-    "packaging>=16.8",
-    "six>=1.10.0",
-    "appdirs>=1.4.0",
-]
diff --git a/setup.py b/setup.py
index 5d436acec5..02cafd55c9 100755
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,7 @@
 def require_metadata():
     "Prevent improper installs without necessary metadata. See #659"
     if not os.path.exists('setuptools.egg-info'):
-        msg = (
-            "Cannot build setuptools without metadata. "
-            "Install rwt and run `rwt -- bootstrap.py`."
-        )
+        msg = "Cannot build setuptools without metadata. Run bootstrap.py"
         raise RuntimeError(msg)
 
 
@@ -162,11 +159,6 @@ def pypi_link(pkg_filename):
         Topic :: Utilities
         """).strip().splitlines(),
     python_requires='>=2.6,!=3.0.*,!=3.1.*,!=3.2.*',
-    install_requires=[
-        'packaging>=16.8',
-        'six>=1.6.0',
-        'appdirs>=1.4.0',
-    ],
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2016.9.26",
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d01918ed59..04f7674082 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from six.moves import filter, map
+from setuptools.extern.six.moves import filter, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 35ece78d76..4532b1cc0d 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,6 +1,6 @@
 from distutils.errors import DistutilsOptionError
 
-from six.moves import map
+from setuptools.extern.six.moves import map
 
 from setuptools.command.setopt import edit_config, option_base, config_file
 
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index ae344cd051..8cd9dfefe2 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,7 +11,7 @@
 import textwrap
 import marshal
 
-import six
+from setuptools.extern import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index c2fd8704e0..36f53f0dd4 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -10,7 +10,7 @@
 from distutils import log
 
 from setuptools.extension import Library
-import six
+from setuptools.extern import six
 
 try:
     # Attempt to use Cython for building extensions, if available
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 56daa2bd32..b0314fd413 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -8,8 +8,8 @@
 import distutils.errors
 import itertools
 
-import six
-from six.moves import map, filter, filterfalse
+from setuptools.extern import six
+from setuptools.extern.six.moves import map, filter, filterfalse
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index ddfdc662ad..85b23c6080 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,7 +5,7 @@
 import glob
 import io
 
-import six
+from setuptools.extern import six
 
 from pkg_resources import Distribution, PathMetadata, normalize_path
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d3eabfc3ba..36e7f3598f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,8 @@
 import shlex
 import io
 
-import six
-from six.moves import configparser, map
+from setuptools.extern import six
+from setuptools.extern.six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1a6ea9cb57..a32c42f82c 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,8 +16,8 @@
 import time
 import collections
 
-import six
-from six.moves import map
+from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
@@ -30,7 +30,7 @@
 import setuptools.unicode_utils as unicode_utils
 from setuptools.glob import glob
 
-import packaging
+from pkg_resources.extern import packaging
 
 
 def translate_pattern(glob):
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index a2c74b2d76..61063e7542 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -3,7 +3,7 @@
 from distutils.util import convert_path
 from distutils.command import sdist
 
-from six.moves import filter
+from setuptools.extern.six.moves import filter
 
 
 class sdist_add_defaults:
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index 7ea36e968e..b89353f529 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -4,7 +4,7 @@
 import os
 import shutil
 
-import six
+from setuptools.extern import six
 
 from setuptools import Command
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2c2d88afa5..84e29a1b7d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@
 import io
 import contextlib
 
-import six
+from setuptools.extern import six
 
 from .py36compat import sdist_add_defaults
 
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 6f6298c46f..7e57cc0262 100755
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -4,7 +4,7 @@
 import distutils
 import os
 
-from six.moves import configparser
+from setuptools.extern.six.moves import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e7a386d19d..ef0af12f12 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -7,8 +7,8 @@
 from distutils import log
 from unittest import TestLoader
 
-import six
-from six.moves import map, filter
+from setuptools.extern import six
+from setuptools.extern.six.moves import map, filter
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index eeb0718b67..269dc2d503 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -16,8 +16,8 @@
 import itertools
 import functools
 
-import six
-from six.moves import http_client, urllib
+from setuptools.extern import six
+from setuptools.extern.six.moves import http_client, urllib
 
 from pkg_resources import iter_entry_points
 from .upload import upload
diff --git a/setuptools/config.py b/setuptools/config.py
index 39a01f88b7..0149316cb1 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -7,7 +7,7 @@
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.py26compat import import_module
-from six import string_types
+from setuptools.extern.six import string_types
 
 
 def read_configuration(
diff --git a/setuptools/dist.py b/setuptools/dist.py
index be55dc4e65..159464be23 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -12,9 +12,9 @@
     DistutilsSetupError)
 from distutils.util import rfc822_escape
 
-import six
-from six.moves import map
-import packaging
+from setuptools.extern import six
+from setuptools.extern.six.moves import map
+from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
 from setuptools import windows_support
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 34a36dfbb3..29468894f8 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -4,7 +4,7 @@
 import distutils.errors
 import distutils.extension
 
-from six.moves import map
+from setuptools.extern.six.moves import map
 
 from .monkey import get_unpatched
 
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
new file mode 100644
index 0000000000..2cd08b7ed9
--- /dev/null
+++ b/setuptools/extern/__init__.py
@@ -0,0 +1,4 @@
+from pkg_resources.extern import VendorImporter
+
+names = 'six',
+VendorImporter(__name__, names, 'pkg_resources._vendor').install()
diff --git a/setuptools/glob.py b/setuptools/glob.py
index f264402671..6c781de349 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -10,7 +10,7 @@
 import os
 import re
 import fnmatch
-from six import binary_type
+from setuptools.extern.six import binary_type
 
 __all__ = ["glob", "iglob", "escape"]
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 68fad9dd08..94f22a56d0 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -10,7 +10,7 @@
 import inspect
 
 from .py26compat import import_module
-import six
+from setuptools.extern import six
 
 import setuptools
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 97e27303f8..447ddb3822 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -20,14 +20,14 @@
 import platform
 import itertools
 import distutils.errors
-from packaging.version import LegacyVersion
+from pkg_resources.extern.packaging.version import LegacyVersion
 
-from six.moves import filterfalse
+from setuptools.extern.six.moves import filterfalse
 
 from .monkey import get_unpatched
 
 if platform.system() == 'Windows':
-    from six.moves import winreg
+    from setuptools.extern.six.moves import winreg
     safe_env = os.environ
 else:
     """
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 7c24a566c3..dc16106d3d 100755
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -2,7 +2,7 @@
 from distutils import log
 import itertools
 
-from six.moves import map
+from setuptools.extern.six.moves import map
 
 
 flatten = itertools.chain.from_iterable
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3544dd5460..faef537707 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -14,8 +14,8 @@
 except ImportError:
     from urllib2 import splituser
 
-import six
-from six.moves import urllib, http_client, configparser, map
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
 import setuptools
 from pkg_resources import (
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 0caa2003d8..af64d5d1e2 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -2,7 +2,7 @@
 import array
 import collections
 
-import six
+from setuptools.extern import six
 
 
 OpArg = collections.namedtuple('OpArg', 'opcode arg')
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 0ddd233242..817a3afaae 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,8 +8,8 @@
 import contextlib
 import pickle
 
-import six
-from six.moves import builtins, map
+from setuptools.extern import six
+from setuptools.extern.six.moves import builtins, map
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index fa5e4421c8..72b18ef266 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -4,7 +4,7 @@
 import re
 import functools
 
-from six.moves import urllib, http_client, map, filter
+from setuptools.extern.six.moves import urllib, http_client, map, filter
 
 from pkg_resources import ResolutionError, ExtractionError
 
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index f54c478e1a..dbf1620108 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -8,7 +8,7 @@
 from distutils.core import Extension
 from distutils.version import LooseVersion
 
-import six
+from setuptools.extern import six
 import pytest
 
 import setuptools.dist
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 77ebecf92f..535ae10766 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -5,7 +5,7 @@
 import contextlib
 import site
 
-import six
+from setuptools.extern import six
 import pkg_resources
 
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 5cdde21722..35312120bb 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,7 +4,7 @@
 import time
 import threading
 
-from six.moves import BaseHTTPServer, SimpleHTTPServer
+from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index 5cdf63f2bb..b789e9acef 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -3,7 +3,7 @@
 import tarfile
 import io
 
-import six
+from setuptools.extern import six
 
 import pytest
 
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 59a896d81f..602571540f 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,7 +2,7 @@
 import distutils.command.build_ext as orig
 from distutils.sysconfig import get_config_var
 
-import six
+from setuptools.extern import six
 
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 54e199c34e..ad7cfa05c3 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -9,7 +9,7 @@
 import io
 import subprocess
 
-import six
+from setuptools.extern import six
 from setuptools.command import test
 
 import pytest
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 24c5149af2..f7e7d2bf0a 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-from six.moves import map
+from setuptools.extern.six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b75e6ff2e1..52db16f6a8 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -17,7 +17,7 @@
 from unittest import mock
 
 import time
-from six.moves import urllib
+from setuptools.extern.six.moves import urllib
 
 import pytest
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index c9a4425af7..a32b981d67 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,7 +6,7 @@
 
 from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
-from six.moves import map
+from setuptools.extern.six.moves import map
 
 import pytest
 
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index a83d4fe867..78fb0627b0 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -7,7 +7,7 @@
 import os
 import sys
 
-from six.moves import urllib
+from setuptools.extern.six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 3b34c88813..f17cf6a6a9 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -11,7 +11,7 @@
 
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
-import six
+from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
 
 import pytest
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 1a66394f15..53e20d44c8 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -4,8 +4,8 @@
 import os
 import distutils.errors
 
-import six
-from six.moves import urllib, http_client
+from setuptools.extern import six
+from setuptools.extern.six.moves import urllib, http_client
 
 import pkg_resources
 import setuptools.package_index
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 38fdda248e..f34068dcd3 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -9,8 +9,8 @@
 import contextlib
 import io
 
-import six
-from six.moves import map
+from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 import pytest
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 6a84f9bead..7c63efd20b 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,7 +1,7 @@
 import unicodedata
 import sys
 
-import six
+from setuptools.extern import six
 
 
 # HFS Plus uses decomposed UTF-8
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 88a36c635c..d07e9cdeb7 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,4 @@
 pytest-flake8
 pytest>=3.0.2
+setuptools[ssl]
 backports.unittest_mock>=1.2
diff --git a/tests/test_pypi.py b/tests/test_pypi.py
index 173b2c876b..b3425e53bc 100644
--- a/tests/test_pypi.py
+++ b/tests/test_pypi.py
@@ -2,8 +2,8 @@
 import subprocess
 
 import virtualenv
-from six.moves import http_client
-from six.moves import xmlrpc_client
+from setuptools.extern.six.moves import http_client
+from setuptools.extern.six.moves import xmlrpc_client
 
 TOP = 200
 PYPI_HOSTNAME = 'pypi.python.org'
diff --git a/tox.ini b/tox.ini
index 6b43dcd80b..cae9c745c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,5 @@
 [testenv]
-deps=
-    -rtests/requirements.txt
-    -rrequirements.txt
+deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
 commands=py.test {posargs:-rsx}
 usedevelop=True
-extras=ssl

From e753cb42481783ac858ceb518aaac1472075063c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 24 Feb 2017 10:55:44 +0200
Subject: [PATCH 6518/8469] Python 3.6 invalid escape sequence deprecation
 fixes

---
 CHANGES.rst                           | 6 ++++++
 pkg_resources/tests/test_resources.py | 2 +-
 setuptools/command/easy_install.py    | 2 +-
 setuptools/msvc.py                    | 4 ++--
 setuptools/package_index.py           | 8 ++++----
 setuptools/sandbox.py                 | 4 ++--
 setuptools/tests/test_bdist_egg.py    | 2 +-
 setuptools/tests/test_easy_install.py | 2 +-
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c6d5556fc0..000705b710 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.3.1
+-------
+
+* #983: Fixes to invalid escape sequence deprecations on
+  Python 3.6.
+
 v34.3.0
 -------
 
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index f28378b9c6..b997aaa345 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -593,7 +593,7 @@ def testSimpleRequirements(self):
             [Requirement('Twis-Ted>=1.2-1')]
         )
         assert (
-            list(parse_requirements('Twisted >=1.2, \ # more\n<2.0'))
+            list(parse_requirements('Twisted >=1.2, \\ # more\n<2.0'))
             ==
             [Requirement('Twisted>=1.2,<2.0')]
         )
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d3eabfc3ba..f5ca075452 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2013,7 +2013,7 @@ class ScriptWriter(object):
     gui apps.
     """
 
-    template = textwrap.dedent("""
+    template = textwrap.dedent(r"""
         # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
         __requires__ = %(spec)r
         import re
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 97e27303f8..d41daec4a0 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -272,7 +272,7 @@ def current_dir(self, hidex86=False, x64=False):
         )
 
     def target_dir(self, hidex86=False, x64=False):
-        """
+        r"""
         Target platform specific subfolder.
 
         Parameters
@@ -294,7 +294,7 @@ def target_dir(self, hidex86=False, x64=False):
         )
 
     def cross_dir(self, forcex86=False):
-        """
+        r"""
         Cross platform specific subfolder.
 
         Parameters
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3544dd5460..5d397b67c5 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -34,8 +34,8 @@
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
 PYPI_MD5 = re.compile(
-    '<a href="([^"#]+)">([^<]+)</a>\n\s+\\(<a (?:title="MD5 hash"\n\s+)'
-    'href="[^?]+\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\\)'
+    '<a href="([^"#]+)">([^<]+)</a>\n\\s+\\(<a (?:title="MD5 hash"\n\\s+)'
+    'href="[^?]+\\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\\)'
 )
 URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):', re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
@@ -161,7 +161,7 @@ def interpret_distro_name(
     # versions in distribution archive names (sdist and bdist).
 
     parts = basename.split('-')
-    if not py_version and any(re.match('py\d\.\d$', p) for p in parts[2:]):
+    if not py_version and any(re.match(r'py\d\.\d$', p) for p in parts[2:]):
         # it is a bdist_dumb, not an sdist -- bail out
         return
 
@@ -205,7 +205,7 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-REL = re.compile("""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
+REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
 # this line is here to fix emacs' cruddy broken syntax highlighting
 
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 0ddd233242..41c1c3b19d 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -215,7 +215,7 @@ def _needs_hiding(mod_name):
     >>> _needs_hiding('Cython')
     True
     """
-    pattern = re.compile('(setuptools|pkg_resources|distutils|Cython)(\.|$)')
+    pattern = re.compile(r'(setuptools|pkg_resources|distutils|Cython)(\.|$)')
     return bool(pattern.match(mod_name))
 
 
@@ -391,7 +391,7 @@ class DirectorySandbox(AbstractSandbox):
 
     _exception_patterns = [
         # Allow lib2to3 to attempt to save a pickled grammar object (#121)
-        '.*lib2to3.*\.pickle$',
+        r'.*lib2to3.*\.pickle$',
     ]
     "exempt writing to paths that match the pattern"
 
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 5aabf404fd..d24aa366d4 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -41,4 +41,4 @@ def test_bdist_egg(self, setup_context, user_override):
 
         # let's see if we got our egg link at the right place
         [content] = os.listdir('dist')
-        assert re.match('foo-0.0.0-py[23].\d.egg$', content)
+        assert re.match(r'foo-0.0.0-py[23].\d.egg$', content)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b75e6ff2e1..fd8300a02e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -65,7 +65,7 @@ def test_install_site_py(self, tmpdir):
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()
-        expected = header + DALS("""
+        expected = header + DALS(r"""
             # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
             __requires__ = 'spec'
             import re

From d4c215a7c61fb1f94b88bd2aa0b332ebaff18193 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Feb 2017 21:16:34 -0600
Subject: [PATCH 6519/8469] Add a test capturing new proposed expectation that
 Setuptools' build dependencies should not require setuptools to build in
 order to avoid inevitable conflicts when bootstrapping from source. Packaging
 fails this test. Ref #980

---
 setuptools/tests/test_integration.py | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index a83d4fe867..cb62eb2957 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -98,3 +98,53 @@ def test_pbr(install_context):
 def test_python_novaclient(install_context):
     _install_one('python-novaclient', install_context,
                  'novaclient', 'base.py')
+
+import re
+import subprocess
+import functools
+import tarfile, zipfile
+
+
+build_deps = ['appdirs', 'packaging', 'pyparsing', 'six']
+@pytest.mark.parametrize("build_dep", build_deps)
+@pytest.mark.skipif(sys.version_info < (3, 6), reason='run only on late versions')
+def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
+    """
+    All setuptools build dependencies must build without
+    setuptools.
+    """
+    if 'pyparsing' in build_dep:
+        pytest.xfail(reason="Project imports setuptools unconditionally")
+    build_target = tmpdir_factory.mktemp('source')
+    build_dir = download_and_extract(request, build_dep, build_target)
+    install_target = tmpdir_factory.mktemp('target')
+    output = install(build_dir, install_target)
+    for line in output.splitlines():
+        match = re.search('Unknown distribution option: (.*)', line)
+        allowed_unknowns = [
+            'test_suite',
+            'tests_require',
+            'install_requires',
+        ]
+        assert not match or match.group(1).strip('"\'') in allowed_unknowns
+
+
+def install(pkg_dir, install_dir):
+    with open(os.path.join(pkg_dir, 'setuptools.py'), 'w') as breaker:
+        breaker.write('raise ImportError()')
+    cmd = [sys.executable, 'setup.py', 'install', '--prefix', install_dir]
+    env = dict(os.environ, PYTHONPATH=pkg_dir)
+    output = subprocess.check_output(cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
+    return output.decode('utf-8')
+
+
+def download_and_extract(request, req, target):
+    cmd = [sys.executable, '-m', 'pip', 'download', '--no-deps',
+        '--no-binary', ':all:', req]
+    output = subprocess.check_output(cmd, encoding='utf-8')
+    filename = re.search('Saved (.*)', output).group(1)
+    request.addfinalizer(functools.partial(os.remove, filename))
+    opener = zipfile.ZipFile if filename.endswith('.zip') else tarfile.open
+    with opener(filename) as archive:
+        archive.extractall(target)
+    return os.path.join(target, os.listdir(target)[0])

From 20aca0e37e2003a364098a27189c732197ccbec2 Mon Sep 17 00:00:00 2001
From: Emil Styrke <emil.styrke@gmail.com>
Date: Mon, 27 Feb 2017 14:15:39 +0100
Subject: [PATCH 6520/8469] Fix for auto_chmod behavior

Apparently, in (at least) python 3.5.2, the function that is called on Windows to remove files is os.unlink and not os.remove. This results in permission errors when trying to clean up after easy_install has been used to install a package from a Git repository.
---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f5ca075452..ef83f7aed2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1675,7 +1675,7 @@ def _first_line_re():
 
 
 def auto_chmod(func, arg, exc):
-    if func is os.remove and os.name == 'nt':
+    if func in [os.unlink, os.remove] and os.name == 'nt':
         chmod(arg, stat.S_IWRITE)
         return func(arg)
     et, ev, _ = sys.exc_info()

From 76e1b4957060319545f5a1abd1494cd77a017fa8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Mar 2017 19:08:58 -0500
Subject: [PATCH 6521/8469] Update changelog

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 000705b710..66af4bde04 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 v34.3.1
 -------
 
+* #988: Trap ``os.unlink`` same as ``os.remove`` in
+  ``auto_chmod`` error handler.
+
 * #983: Fixes to invalid escape sequence deprecations on
   Python 3.6.
 

From c4ff7cc6551097d513d310fac6d0c099b1afa32e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Mar 2017 19:18:40 -0500
Subject: [PATCH 6522/8469] =?UTF-8?q?Bump=20version:=2034.3.0=20=E2=86=92?=
 =?UTF-8?q?=2034.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9fbe41eeef..cf36f54fc7 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.3.0
+current_version = 34.3.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 5d436acec5..6bd0cce84c 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.3.0",
+    version="34.3.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 62fc6681509f04ba7ee12e87d6ac5d6056214fa8 Mon Sep 17 00:00:00 2001
From: Florian Schulze <florian.schulze@gmx.net>
Date: Sat, 11 Mar 2017 14:45:15 +0100
Subject: [PATCH 6523/8469] Fix documentation upload by fixing content_type in
 _build_multipart on Python 3.x.

---
 setuptools/command/upload_docs.py    | 2 +-
 setuptools/tests/test_upload_docs.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index eeb0718b67..910d5ea7c8 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -138,7 +138,7 @@ def _build_multipart(cls, data):
         part_groups = map(builder, data.items())
         parts = itertools.chain.from_iterable(part_groups)
         body_items = itertools.chain(parts, end_items)
-        content_type = 'multipart/form-data; boundary=%s' % boundary
+        content_type = 'multipart/form-data; boundary=%s' % boundary.decode('ascii')
         return b''.join(body_items), content_type
 
     def upload_file(self, filename):
diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index 5d50bb0b2f..a26e32a61d 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -64,6 +64,8 @@ def test_build_multipart(self):
         )
         body, content_type = upload_docs._build_multipart(data)
         assert 'form-data' in content_type
+        assert "b'" not in content_type
+        assert 'b"' not in content_type
         assert isinstance(body, bytes)
         assert b'foo' in body
         assert b'content' in body

From da1dcf42236810c76c763ee9be8ba71bf213c297 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Mar 2017 09:12:07 -0500
Subject: [PATCH 6524/8469] Extract variables to remove hanging indents.

---
 setuptools/command/upload_docs.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 910d5ea7c8..468cb377d5 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -77,9 +77,8 @@ def create_zipfile(self, filename):
             self.mkpath(self.target_dir)  # just in case
             for root, dirs, files in os.walk(self.target_dir):
                 if root == self.target_dir and not files:
-                    raise DistutilsOptionError(
-                        "no files found in upload directory '%s'"
-                        % self.target_dir)
+                    tmpl = "no files found in upload directory '%s'"
+                    raise DistutilsOptionError(tmpl % self.target_dir)
                 for name in files:
                     full = os.path.join(root, name)
                     relative = root[len(self.target_dir):].lstrip(os.path.sep)
@@ -159,8 +158,8 @@ def upload_file(self, filename):
 
         body, ct = self._build_multipart(data)
 
-        self.announce("Submitting documentation to %s" % (self.repository),
-                      log.INFO)
+        msg = "Submitting documentation to %s" % (self.repository)
+        self.announce(msg, log.INFO)
 
         # build the Request
         # We can't use urllib2 since we need to send the Basic
@@ -191,16 +190,16 @@ def upload_file(self, filename):
 
         r = conn.getresponse()
         if r.status == 200:
-            self.announce('Server response (%s): %s' % (r.status, r.reason),
-                          log.INFO)
+            msg = 'Server response (%s): %s' % (r.status, r.reason)
+            self.announce(msg, log.INFO)
         elif r.status == 301:
             location = r.getheader('Location')
             if location is None:
                 location = 'https://pythonhosted.org/%s/' % meta.get_name()
-            self.announce('Upload successful. Visit %s' % location,
-                          log.INFO)
+            msg = 'Upload successful. Visit %s' % location
+            self.announce(msg, log.INFO)
         else:
-            self.announce('Upload failed (%s): %s' % (r.status, r.reason),
-                          log.ERROR)
+            msg = 'Upload failed (%s): %s' % (r.status, r.reason)
+            self.announce(msg, log.ERROR)
         if self.show_response:
             print('-' * 75, r.read(), '-' * 75)

From 94ad54108b1584e19c79521aa487b20b1fd18f69 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Mar 2017 09:14:55 -0500
Subject: [PATCH 6525/8469] Update changelog. Ref #993.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 66af4bde04..cef2ddb1c4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v34.3.2
+-------
+
+* #993: Fix documentation upload by correcting
+  rendering of content-type in _build_multipart
+  on Python 3.
+
 v34.3.1
 -------
 

From 907fc81e098e6e173501d63b4541b404d8feed2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Mar 2017 09:16:43 -0500
Subject: [PATCH 6526/8469] =?UTF-8?q?Bump=20version:=2034.3.1=20=E2=86=92?=
 =?UTF-8?q?=2034.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index cf36f54fc7..8a7aeabd66 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.3.1
+current_version = 34.3.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6bd0cce84c..825b2f94b9 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.3.1",
+    version="34.3.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 20b3b3eaa74935d4854b63f75d893def27a4248e Mon Sep 17 00:00:00 2001
From: JGoutin <JGoutin@users.noreply.github.com>
Date: Mon, 20 Mar 2017 17:45:57 +0100
Subject: [PATCH 6527/8469] Update for MS BuildTools 2017

---
 setuptools/msvc.py | 96 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 81 insertions(+), 15 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index d41daec4a0..71fe24cd31 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -13,6 +13,7 @@
 
 Microsoft Visual C++ 14.0:
     Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+    Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
 """
 
 import os
@@ -150,6 +151,7 @@ def msvc14_get_vc_env(plat_spec):
     -------------------------
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+        Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
 
     Parameters
     ----------
@@ -411,7 +413,7 @@ def microsoft(self, key, x86=False):
         ------
         str: value
         """
-        node64 = '' if self.pi.current_is_x86() or x86 else r'\Wow6432Node'
+        node64 = '' if self.pi.current_is_x86() or x86 else 'Wow6432Node'
         return os.path.join('Software', node64, 'Microsoft', key)
 
     def lookup(self, key, name):
@@ -483,12 +485,13 @@ def find_available_vc_vers(self):
         """
         Find all available Microsoft Visual C++ versions.
         """
-        vckeys = (self.ri.vc, self.ri.vc_for_python)
+        ms = self.ri.microsoft
+        vckeys = (self.ri.vc, self.ri.vc_for_python, self.ri.vs)
         vc_vers = []
         for hkey in self.ri.HKEYS:
             for key in vckeys:
                 try:
-                    bkey = winreg.OpenKey(hkey, key, 0, winreg.KEY_READ)
+                    bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ)
                 except (OSError, IOError):
                     continue
                 subkeys, values, _ = winreg.QueryInfoKey(bkey)
@@ -525,9 +528,24 @@ def VCInstallDir(self):
         """
         Microsoft Visual C++ directory.
         """
-        # Default path
-        default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
-        guess_vc = os.path.join(self.ProgramFilesx86, default)
+        self.VSInstallDir
+
+        # Default path starting VS2017
+        guess_vc = ''
+        if self.vc_ver > 14.0:
+            default = r'VC\Tools\MSVC'
+            guess_vc = os.path.join(self.VSInstallDir, default)
+            # Subdir with VC exact version as name
+            try:
+                vc_exact_ver = os.listdir(guess_vc)[-1]
+                guess_vc = os.path.join(guess_vc, vc_exact_ver)
+            except (OSError, IOError, IndexError):
+                guess_vc = ''
+
+        # Legacy default path
+        if not guess_vc:
+            default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
+            guess_vc = os.path.join(self.ProgramFilesx86, default)
 
         # Try to get "VC++ for Python" path from registry as default path
         reg_path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
@@ -725,9 +743,19 @@ def _find_dot_net_versions(self, bits=32):
         bits: int
             Platform number of bits: 32 or 64.
         """
-        # Find actual .NET version
+        # Find actual .NET version in registry
         ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
 
+        # If nothing in registry, look in Framework folder
+        if not ver:
+            dot_net_dir = (self.FrameworkDir32 if bits == 32 else
+                           self.FrameworkDir64)
+            for dir_name in reversed(os.listdir(dot_net_dir)):
+                if (os.path.isdir(os.path.join(dot_net_dir, dir_name)) and
+                        dir_name.startswith('v')):
+                    ver = dir_name
+                    break
+
         # Set .NET versions for specified MSVC++ version
         if self.vc_ver >= 12.0:
             frameworkver = (ver, 'v4.0')
@@ -810,7 +838,10 @@ def VCLibraries(self):
         """
         Microsoft Visual C++ & Microsoft Foundation Class Libraries
         """
-        arch_subdir = self.pi.target_dir(hidex86=True)
+        if self.vc_ver >= 15.0:
+            arch_subdir = self.pi.target_dir(x64=True)
+        else:
+            arch_subdir = self.pi.target_dir(hidex86=True)
         paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
 
         if self.vc_ver >= 14.0:
@@ -840,10 +871,20 @@ def VCTools(self):
         if arch_subdir:
             tools += [os.path.join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
-        if self.vc_ver >= 14.0:
+        if self.vc_ver == 14.0:
             path = 'Bin%s' % self.pi.current_dir(hidex86=True)
             tools += [os.path.join(si.VCInstallDir, path)]
 
+        elif self.vc_ver >= 15.0:
+            host_dir = (r'bin\HostX86%s' if self.pi.current_is_x86() else
+                        r'bin\HostX64%s')
+            tools += [os.path.join(
+                si.VCInstallDir, host_dir % self.pi.target_dir(x64=True))]
+
+            if self.pi.current_cpu != self.pi.target_cpu:
+                tools += [os.path.join(
+                    si.VCInstallDir, host_dir % self.pi.current_dir(x64=True))]
+
         else:
             tools += [os.path.join(si.VCInstallDir, 'Bin')]
 
@@ -933,8 +974,11 @@ def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
-        bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
-        tools = [os.path.join(self.si.WindowsSdkDir, bin_dir)]
+        if self.vc_ver < 15.0:
+            bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
+            tools = [os.path.join(self.si.WindowsSdkDir, bin_dir)]
+        else:
+            tools = []
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
@@ -949,6 +993,12 @@ def SdkTools(self):
             path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
             tools += [os.path.join(self.si.WindowsSdkDir, path)]
 
+        elif self.vc_ver >= 15.0:
+            path = os.path.join(self.si.WindowsSdkDir, 'Bin')
+            arch_subdir = self.pi.current_dir(x64=True)
+            sdkver = self._get_content_dirname(path, slash=False)
+            tools += [os.path.join(path, r'%s%s' % (sdkver, arch_subdir))]
+
         if self.si.WindowsSDKExecutablePath:
             tools += [self.si.WindowsSDKExecutablePath]
 
@@ -1023,10 +1073,21 @@ def MSBuild(self):
         """
         if self.vc_ver < 12.0:
             return []
+        elif self.vc_ver < 15.0:
+            base_path = self.si.ProgramFilesx86
+            arch_subdir = self.pi.current_dir(hidex86=True)
+        else:
+            base_path = self.si.VSInstallDir
+            arch_subdir = ''
 
-        arch_subdir = self.pi.current_dir(hidex86=True)
         path = r'MSBuild\%0.1f\bin%s' % (self.vc_ver, arch_subdir)
-        return [os.path.join(self.si.ProgramFilesx86, path)]
+        build = [os.path.join(base_path, path)]
+
+        if self.vc_ver >= 15.0:
+            # Add Roslyn C# & Visual Basic Compiler
+            build += [os.path.join(base_path, path, 'Roslyn')]
+
+        return build
 
     @property
     def HTMLHelpWorkshop(self):
@@ -1170,7 +1231,7 @@ def _unique_everseen(self, iterable, key=None):
                     seen_add(k)
                     yield element
 
-    def _get_content_dirname(self, path):
+    def _get_content_dirname(self, path, slash=True):
         """
         Return name of the first dir in path or '' if no dir found.
 
@@ -1178,6 +1239,8 @@ def _get_content_dirname(self, path):
         ----------
         path: str
             Path where search dir.
+        slash: bool
+            If not True, only return "name" not "name\"
 
         Return
         ------
@@ -1187,7 +1250,10 @@ def _get_content_dirname(self, path):
         try:
             name = os.listdir(path)
             if name:
-                return '%s\\' % name[0]
+                name = name[0]
+                if slash:
+                    return '%s\\' % name
+                return name
             return ''
         except (OSError, IOError):
             return ''

From 282d7d354900dbae5724feb9af1ad7bbf617220e Mon Sep 17 00:00:00 2001
From: Jim Fulton <jim@jimfulton.info>
Date: Fri, 24 Mar 2017 12:55:03 -0400
Subject: [PATCH 6528/8469] fixed incomplete import of packaging.specifiers and
 packaging.version

This fixes: #997
---
 setuptools/dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index be55dc4e65..71c6c28864 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,7 +14,8 @@
 
 import six
 from six.moves import map
-import packaging
+import packaging.specifiers
+import packaging.version
 
 from setuptools.depends import Require
 from setuptools import windows_support

From b4d9046f6d0f9edc1afaba9a91c919026532ca43 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Mar 2017 11:44:09 -0400
Subject: [PATCH 6529/8469] Update changelog. Ref #998.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index cef2ddb1c4..54eba03623 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v34.3.3
+-------
+
+* #967 (and #997): Explicitly import submodules of
+  packaging to account for environments where the imports
+  of those submodules is not implied by other behavior.
+
 v34.3.2
 -------
 

From e05b6ae26868626d84ac8eb13955fbed0894e160 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Mar 2017 11:44:25 -0400
Subject: [PATCH 6530/8469] =?UTF-8?q?Bump=20version:=2034.3.2=20=E2=86=92?=
 =?UTF-8?q?=2034.3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8a7aeabd66..7fcd65be09 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.3.2
+current_version = 34.3.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 825b2f94b9..100acfaa3b 100755
--- a/setup.py
+++ b/setup.py
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.3.2",
+    version="34.3.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 943833d493a95061c4c432337e7133aa311ccdba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 21:32:37 -0400
Subject: [PATCH 6531/8469] Update docs to use jaraco.packaging.sphinx to grab
 metadata from the package.

---
 docs/conf.py          | 64 ++++++++++++-------------------------------
 docs/requirements.txt |  5 ++--
 2 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index fe684271ef..1b1bb5fbe6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,18 +18,11 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
-# Allow Sphinx to find the setup command that is imported below, as referenced above.
-import os
-import sys
-sys.path.append(os.path.abspath('..'))
-
-import setup as setup_script
-
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['rst.linker', 'sphinx.ext.autosectionlabel']
+extensions = ['rst.linker', 'sphinx.ext.autosectionlabel', 'jaraco.packaging.sphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -40,19 +33,6 @@
 # The master toctree document.
 master_doc = 'index'
 
-# General information about the project.
-project = 'Setuptools'
-copyright = '2009-2014, The fellowship of the packaging'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = setup_script.setup_params['version']
-# The full version, including alpha/beta/rc tags.
-release = setup_script.setup_params['version']
-
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = []
@@ -69,13 +49,6 @@
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['_theme']
 
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-html_title = "Setuptools documentation"
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = "Setuptools"
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 html_use_smartypants = True
@@ -89,9 +62,6 @@
 # If false, no index is generated.
 html_use_index = False
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Setuptoolsdoc'
-
 # -- Options for LaTeX output --------------------------------------------------
 
 # Grouping the document tree into LaTeX files. List of tuples
@@ -109,60 +79,60 @@
         ),
         replace=[
             dict(
-                pattern=r"(Issue )?#(?P<issue>\d+)",
-                url='{GH}/pypa/setuptools/issues/{issue}',
+                pattern=r'(Issue )?#(?P<issue>\d+)',
+                url='{package_url}/issues/{issue}',
             ),
             dict(
-                pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
+                pattern=r'BB Pull Request ?#(?P<bb_pull_request>\d+)',
                 url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
             ),
             dict(
-                pattern=r"Distribute #(?P<distribute>\d+)",
+                pattern=r'Distribute #(?P<distribute>\d+)',
                 url='{BB}/tarek/distribute/issue/{distribute}',
             ),
             dict(
-                pattern=r"Buildout #(?P<buildout>\d+)",
+                pattern=r'Buildout #(?P<buildout>\d+)',
                 url='{GH}/buildout/buildout/issues/{buildout}',
             ),
             dict(
-                pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
+                pattern=r'Old Setuptools #(?P<old_setuptools>\d+)',
                 url='http://bugs.python.org/setuptools/issue{old_setuptools}',
             ),
             dict(
-                pattern=r"Jython #(?P<jython>\d+)",
+                pattern=r'Jython #(?P<jython>\d+)',
                 url='http://bugs.jython.org/issue{jython}',
             ),
             dict(
-                pattern=r"Python #(?P<python>\d+)",
+                pattern=r'Python #(?P<python>\d+)',
                 url='http://bugs.python.org/issue{python}',
             ),
             dict(
-                pattern=r"Interop #(?P<interop>\d+)",
+                pattern=r'Interop #(?P<interop>\d+)',
                 url='{GH}/pypa/interoperability-peps/issues/{interop}',
             ),
             dict(
-                pattern=r"Pip #(?P<pip>\d+)",
+                pattern=r'Pip #(?P<pip>\d+)',
                 url='{GH}/pypa/pip/issues/{pip}',
             ),
             dict(
-                pattern=r"Packaging #(?P<packaging>\d+)",
+                pattern=r'Packaging #(?P<packaging>\d+)',
                 url='{GH}/pypa/packaging/issues/{packaging}',
             ),
             dict(
-                pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
+                pattern=r'[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)',
                 url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
             ),
             dict(
-                pattern=r"PEP[- ](?P<pep_number>\d+)",
+                pattern=r'PEP[- ](?P<pep_number>\d+)',
                 url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
             ),
             dict(
-                pattern=r"setuptools_svn #(?P<setuptools_svn>\d+)",
+                pattern=r'setuptools_svn #(?P<setuptools_svn>\d+)',
                 url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}',
             ),
             dict(
-                pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
-                with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+                pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+                with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
             ),
         ],
     ),
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 4be418877c..7333deddab 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,3 @@
-rst.linker>=1.6.1
-sphinx>=1.4
+sphinx
+rst.linker>=1.9
+jaraco.packaging>=3.2

From 23d74941204535bd08aec7699566865d810b52f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 21:45:19 -0400
Subject: [PATCH 6532/8469] Require a late version of setuptools to allow the
 docs to invoke setup.py

---
 docs/requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7333deddab..2138c88492 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,5 @@
 sphinx
 rst.linker>=1.9
 jaraco.packaging>=3.2
+
+setuptools>=34

From 52c58bedd49552359993b533fcd86da4ff58b0c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 22:06:23 -0400
Subject: [PATCH 6533/8469] Add hack to invoke bootstrap script so that
 setup.py --version can be invoked.

---
 docs/conf.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 1b1bb5fbe6..36d3f24c06 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,6 +18,11 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
+
+# hack to run the bootstrap script so that jaraco.packaging.sphinx
+# can invoke setup.py
+exec(open('../bootstrap.py').read())
+
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions

From b6bf75575644f8cb5457618a5a2c8e35e152052b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 22:15:03 -0400
Subject: [PATCH 6534/8469] Check for egg info dir relative to setup.py

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 100acfaa3b..77abf59395 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,8 @@
 
 def require_metadata():
     "Prevent improper installs without necessary metadata. See #659"
-    if not os.path.exists('setuptools.egg-info'):
+    egg_info_dir = os.path.join(here, 'setuptools.egg-info')
+    if not os.path.exists(egg_info_dir):
         msg = (
             "Cannot build setuptools without metadata. "
             "Install rwt and run `rwt -- bootstrap.py`."

From c9587fe384a2eab6e9d81408abb58936d15286ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 22:18:49 -0400
Subject: [PATCH 6535/8469] Try running bootstrap in subprocess in order to be
 in the project root.

---
 docs/conf.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 36d3f24c06..6119ad1206 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,6 +21,9 @@
 
 # hack to run the bootstrap script so that jaraco.packaging.sphinx
 # can invoke setup.py
+import subprocess
+import sys
+subprocess.Popen([sys.executable, 'bootstrap.py'], cwd='..')
 exec(open('../bootstrap.py').read())
 
 # -- General configuration -----------------------------------------------------

From 74329a7fa2a482309e4eb244b3920e28a76cfcbf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 22:23:04 -0400
Subject: [PATCH 6536/8469] Remove excess hack

---
 docs/conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6119ad1206..15061ecfea 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,7 +24,6 @@
 import subprocess
 import sys
 subprocess.Popen([sys.executable, 'bootstrap.py'], cwd='..')
-exec(open('../bootstrap.py').read())
 
 # -- General configuration -----------------------------------------------------
 

From b10187e1fa7f602d7f5cc75821d14b494625aef9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 30 Mar 2017 22:38:03 -0400
Subject: [PATCH 6537/8469] Make sure bootstrap finishes before continuing, and
 ensure that jaraco.packaging.sphinx is run before rst.linker.

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

diff --git a/docs/conf.py b/docs/conf.py
index 15061ecfea..7f781fef60 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,13 +23,13 @@
 # can invoke setup.py
 import subprocess
 import sys
-subprocess.Popen([sys.executable, 'bootstrap.py'], cwd='..')
+subprocess.check_call([sys.executable, 'bootstrap.py'], cwd='..')
 
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['rst.linker', 'sphinx.ext.autosectionlabel', 'jaraco.packaging.sphinx']
+extensions = ['jaraco.packaging.sphinx', 'rst.linker', 'sphinx.ext.autosectionlabel']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

From 332b586b7c65dee7e9a2dbbcbc1c896f4a862a3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 31 Mar 2017 08:22:38 -0400
Subject: [PATCH 6538/8469] Hack must genuflect to the arbitrory invocation
 location

---
 docs/conf.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7f781fef60..28f86da432 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,7 +23,9 @@
 # can invoke setup.py
 import subprocess
 import sys
-subprocess.check_call([sys.executable, 'bootstrap.py'], cwd='..')
+import os
+proj_root = os.path.join(os.path.dirname(__file__), os.path.pardir)
+subprocess.check_call([sys.executable, 'bootstrap.py'], cwd=proj_root)
 
 # -- General configuration -----------------------------------------------------
 

From e8ca95c2e12f46e203715194e4729f8b33de2c23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 31 Mar 2017 08:27:33 -0400
Subject: [PATCH 6539/8469] Constrain hack to the RTD environment. Rely on
 bootstrap routine to make dependencies available.

---
 docs/conf.py          | 13 ++++++++-----
 docs/requirements.txt |  2 --
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 28f86da432..f7d02303cc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,14 +18,17 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
-
-# hack to run the bootstrap script so that jaraco.packaging.sphinx
-# can invoke setup.py
 import subprocess
 import sys
 import os
-proj_root = os.path.join(os.path.dirname(__file__), os.path.pardir)
-subprocess.check_call([sys.executable, 'bootstrap.py'], cwd=proj_root)
+
+
+# hack to run the bootstrap script so that jaraco.packaging.sphinx
+# can invoke setup.py
+'READTHEDOCS' in os.environ and subprocess.check_call(
+    [sys.executable, 'bootstrap.py'],
+    cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
+)
 
 # -- General configuration -----------------------------------------------------
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 2138c88492..7333deddab 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,3 @@
 sphinx
 rst.linker>=1.9
 jaraco.packaging>=3.2
-
-setuptools>=34

From bdbe0776c19646e703bd0b89ad3f33e6797256a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 31 Mar 2017 08:35:09 -0400
Subject: [PATCH 6540/8469] Although bootstrap.py is installing the deps, it
 removes them as well, so doc builds still require build deps.

---
 docs/requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7333deddab..2138c88492 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,5 @@
 sphinx
 rst.linker>=1.9
 jaraco.packaging>=3.2
+
+setuptools>=34

From abaf7c4dd76c56eb509f6a5f6caa2f8e886801b6 Mon Sep 17 00:00:00 2001
From: Marcel Bargull <marcel.bargull@udo.edu>
Date: Fri, 7 Apr 2017 13:42:51 +0200
Subject: [PATCH 6541/8469] Fixes #999: support python_requires, py_modules in
 configuration files

---
 docs/setuptools.txt             | 2 ++
 setuptools/config.py            | 1 +
 setuptools/dist.py              | 4 +++-
 setuptools/tests/test_config.py | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index f0da6e1d96..bf5bb8cecc 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2425,6 +2425,7 @@ zip_safe                 bool
 setup_requires           list-semi
 install_requires         list-semi
 extras_require           section
+python_requires          str
 entry_points             file:, section
 use_2to3                 bool
 use_2to3_fixers          list-comma
@@ -2440,6 +2441,7 @@ package_dir              dict
 package_data             section
 exclude_package_data     section
 namespace_packages       list-comma
+py_modules               list-comma
 =======================  =====
 
 .. note::
diff --git a/setuptools/config.py b/setuptools/config.py
index 39a01f88b7..252f2deb34 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -462,6 +462,7 @@ def parsers(self):
             'tests_require': parse_list_semicolon,
             'packages': self._parse_packages,
             'entry_points': self._parse_file,
+            'py_modules': parse_list,
         }
 
     def _parse_packages(self, value):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 71c6c28864..fd1d28c226 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -166,7 +166,7 @@ def check_specifier(dist, attr, value):
         packaging.specifiers.SpecifierSet(value)
     except packaging.specifiers.InvalidSpecifier as error:
         tmpl = (
-            "{attr!r} must be a string or list of strings "
+            "{attr!r} must be a string "
             "containing valid version specifiers; {error}"
         )
         raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
@@ -353,6 +353,8 @@ def parse_config_files(self, filenames=None):
         _Distribution.parse_config_files(self, filenames=filenames)
 
         parse_configuration(self, self.command_options)
+        if getattr(self, 'python_requires', None):
+            self.metadata.python_requires = self.python_requires
 
     def parse_command_line(self):
         """Process features after parsing command line options"""
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 799fb165c2..8bd2a49428 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -312,6 +312,8 @@ def test_basic(self, tmpdir):
             'setup_requires = docutils>=0.3; spack ==1.1, ==1.3; there\n'
             'dependency_links = http://some.com/here/1, '
                 'http://some.com/there/2\n'
+            'python_requires = >=1.0, !=2.8\n'
+            'py_modules = module1, module2\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.zip_safe
@@ -340,6 +342,8 @@ def test_basic(self, tmpdir):
                 'there'
             ])
             assert dist.tests_require == ['mock==0.7.2', 'pytest']
+            assert dist.python_requires == '>=1.0, !=2.8'
+            assert dist.py_modules == ['module1', 'module2']
 
     def test_multiline(self, tmpdir):
         fake_env(

From b504713684e8adeff8bcaeafec5196ec7806c558 Mon Sep 17 00:00:00 2001
From: Marcel Bargull <marcel.bargull@udo.edu>
Date: Fri, 7 Apr 2017 16:33:40 +0200
Subject: [PATCH 6542/8469] Update changelog. Ref #1007.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 54eba03623..12d4cc58ec 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v34.4.0
+-------
+
+* #999 via #1007: Extend support for declarative package
+  config in a setup.cfg file to include the options
+  ``python_requires`` and ``py_modules``.
+
 v34.3.3
 -------
 

From ac59ef12d16c13533ead6401bdb4727016be77e3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 21:52:18 -0400
Subject: [PATCH 6543/8469] extract two functions for guessing the VC version;
 ref #995

---
 setuptools/msvc.py | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 71fe24cd31..cf556ad3be 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -530,22 +530,7 @@ def VCInstallDir(self):
         """
         self.VSInstallDir
 
-        # Default path starting VS2017
-        guess_vc = ''
-        if self.vc_ver > 14.0:
-            default = r'VC\Tools\MSVC'
-            guess_vc = os.path.join(self.VSInstallDir, default)
-            # Subdir with VC exact version as name
-            try:
-                vc_exact_ver = os.listdir(guess_vc)[-1]
-                guess_vc = os.path.join(guess_vc, vc_exact_ver)
-            except (OSError, IOError, IndexError):
-                guess_vc = ''
-
-        # Legacy default path
-        if not guess_vc:
-            default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
-            guess_vc = os.path.join(self.ProgramFilesx86, default)
+        guess_vc = self._guess_vc() or self._guess_vc_legacy()
 
         # Try to get "VC++ for Python" path from registry as default path
         reg_path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
@@ -561,6 +546,30 @@ def VCInstallDir(self):
 
         return path
 
+    def _guess_vc(self):
+        """
+        Locate Visual C for 2017
+        """
+
+        if self.vc_ver <= 14.0:
+            return
+
+        default = r'VC\Tools\MSVC'
+        guess_vc = os.path.join(self.VSInstallDir, default)
+        # Subdir with VC exact version as name
+        try:
+            vc_exact_ver = os.listdir(guess_vc)[-1]
+            return os.path.join(guess_vc, vc_exact_ver)
+        except (OSError, IOError, IndexError):
+            pass
+
+    def _guess_vc_legacy(self):
+        """
+        Locate Visual C for versions prior to 2017
+        """
+        default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
+        return os.path.join(self.ProgramFilesx86, default)
+
     @property
     def WindowsSdkVersion(self):
         """

From 934d6707b1d8c55c930d458e39b11038e9276a4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:07:30 -0400
Subject: [PATCH 6544/8469] Extract method for finding .Net in the framework
 folder. Ref #995.

---
 setuptools/msvc.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index cf556ad3be..1588cd2ec1 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -753,17 +753,9 @@ def _find_dot_net_versions(self, bits=32):
             Platform number of bits: 32 or 64.
         """
         # Find actual .NET version in registry
-        ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits) or ''
-
-        # If nothing in registry, look in Framework folder
-        if not ver:
-            dot_net_dir = (self.FrameworkDir32 if bits == 32 else
-                           self.FrameworkDir64)
-            for dir_name in reversed(os.listdir(dot_net_dir)):
-                if (os.path.isdir(os.path.join(dot_net_dir, dir_name)) and
-                        dir_name.startswith('v')):
-                    ver = dir_name
-                    break
+        reg_ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits)
+        dot_net_dir = getattr(self, 'FrameworkDir%d' % bits)
+        ver = reg_ver or self._find_dot_net_in(dot_net_dir) or ''
 
         # Set .NET versions for specified MSVC++ version
         if self.vc_ver >= 12.0:
@@ -777,6 +769,18 @@ def _find_dot_net_versions(self, bits=32):
             frameworkver = ('v3.0', 'v2.0.50727')
         return frameworkver
 
+    def _find_dot_net_in(self, dot_net_dir):
+        """
+        Find .Net in the Framework folder
+        """
+        matching_dirs = (
+            dir_name
+            for dir_name in reversed(os.listdir(dot_net_dir))
+            if os.path.isdir(os.path.join(dot_net_dir, dir_name))
+            and dir_name.startswith('v')
+        )
+        return next(matching_dirs, None)
+
 
 class EnvironmentInfo:
     """

From 9430e92f888a7c41f295373bd8a6ef8af967e2e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:19:06 -0400
Subject: [PATCH 6545/8469] Move initialization into a single location. Ref
 #995.

---
 setuptools/msvc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 1588cd2ec1..baf2021e13 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -987,11 +987,11 @@ def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
+        tools = []
+
         if self.vc_ver < 15.0:
             bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
-            tools = [os.path.join(self.si.WindowsSdkDir, bin_dir)]
-        else:
-            tools = []
+            tools += [os.path.join(self.si.WindowsSdkDir, bin_dir)]
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)

From 3fa9efcbb390b87304ddc64551e9fca823694773 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:23:18 -0400
Subject: [PATCH 6546/8469] Extract generator for simpler syntax. Ref #995.

---
 setuptools/msvc.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index baf2021e13..c5a8aea00d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -987,16 +987,17 @@ def SdkTools(self):
         """
         Microsoft Windows SDK Tools
         """
-        tools = []
+        return list(self._sdk_tools())
 
+    def _sdk_tools(self):
         if self.vc_ver < 15.0:
             bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
-            tools += [os.path.join(self.si.WindowsSdkDir, bin_dir)]
+            yield os.path.join(self.si.WindowsSdkDir, bin_dir)
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
             path = 'Bin%s' % arch_subdir
-            tools += [os.path.join(self.si.WindowsSdkDir, path)]
+            yield os.path.join(self.si.WindowsSdkDir, path)
 
         if self.vc_ver == 10.0 or self.vc_ver == 11.0:
             if self.pi.target_is_x86():
@@ -1004,18 +1005,16 @@ def SdkTools(self):
             else:
                 arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
-            tools += [os.path.join(self.si.WindowsSdkDir, path)]
+            yield os.path.join(self.si.WindowsSdkDir, path)
 
         elif self.vc_ver >= 15.0:
             path = os.path.join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
             sdkver = self._get_content_dirname(path, slash=False)
-            tools += [os.path.join(path, r'%s%s' % (sdkver, arch_subdir))]
+            yield os.path.join(path, r'%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
-            tools += [self.si.WindowsSDKExecutablePath]
-
-        return tools
+            yield self.si.WindowsSDKExecutablePath
 
     @property
     def SdkSetup(self):

From f357a32fdc9ce8e6a862efcbb9a0229f6f0a685c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:30:49 -0400
Subject: [PATCH 6547/8469] Simplify _get_content_dirname by simply removing
 the trailing backslash. Ref #995.

---
 setuptools/msvc.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index c5a8aea00d..9a9118346a 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -1010,7 +1010,7 @@ def _sdk_tools(self):
         elif self.vc_ver >= 15.0:
             path = os.path.join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
-            sdkver = self._get_content_dirname(path, slash=False)
+            sdkver = self._get_content_dirname(path).rstrip('\\')
             yield os.path.join(path, r'%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
@@ -1243,7 +1243,7 @@ def _unique_everseen(self, iterable, key=None):
                     seen_add(k)
                     yield element
 
-    def _get_content_dirname(self, path, slash=True):
+    def _get_content_dirname(self, path):
         """
         Return name of the first dir in path or '' if no dir found.
 
@@ -1251,8 +1251,6 @@ def _get_content_dirname(self, path, slash=True):
         ----------
         path: str
             Path where search dir.
-        slash: bool
-            If not True, only return "name" not "name\"
 
         Return
         ------
@@ -1262,10 +1260,7 @@ def _get_content_dirname(self, path, slash=True):
         try:
             name = os.listdir(path)
             if name:
-                name = name[0]
-                if slash:
-                    return '%s\\' % name
-                return name
+                return '%s\\' % name[0]
             return ''
         except (OSError, IOError):
             return ''

From cd13a8c0c4ee765a8bd083863338dec4ba618d08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:33:28 -0400
Subject: [PATCH 6548/8469] Remove unnecessary raw string. Ref #995.

---
 setuptools/msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 9a9118346a..35c02129e6 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -1011,7 +1011,7 @@ def _sdk_tools(self):
             path = os.path.join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
             sdkver = self._get_content_dirname(path).rstrip('\\')
-            yield os.path.join(path, r'%s%s' % (sdkver, arch_subdir))
+            yield os.path.join(path, '%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
             yield self.si.WindowsSDKExecutablePath

From 76ac9dcbc17a4d04c201667f47c8ee040ef5c8ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:36:51 -0400
Subject: [PATCH 6549/8469] Update changelog. Ref #995.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index cef2ddb1c4..37098e8c22 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v34.4.0
+-------
+
+* #995: In MSVC support, add support for Microsoft
+  Build Tools 2017.
+
 v34.3.2
 -------
 

From 315e8ffaa3886e7988ff29238e5240bc33317eea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 7 Apr 2017 22:40:46 -0400
Subject: [PATCH 6550/8469] =?UTF-8?q?Bump=20version:=2034.3.3=20=E2=86=92?=
 =?UTF-8?q?=2034.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 7fcd65be09..fcade157dc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.3.3
+current_version = 34.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 77abf59395..0ccc663117 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.3.3",
+    version="34.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f420bb2093f85d3aa34e732c42133b0e2e06ecd9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 10:18:31 -0400
Subject: [PATCH 6551/8469] Let the default vc_min_ver represent the most
 lenient, degenerate limit.

---
 setuptools/msvc.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 35c02129e6..75745e67b6 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -806,15 +806,14 @@ class EnvironmentInfo:
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparaison.
 
-    def __init__(self, arch, vc_ver=None, vc_min_ver=None):
+    def __init__(self, arch, vc_ver=None, vc_min_ver=0):
         self.pi = PlatformInfo(arch)
         self.ri = RegistryInfo(self.pi)
         self.si = SystemInfo(self.ri, vc_ver)
 
-        if vc_min_ver:
-            if self.vc_ver < vc_min_ver:
-                err = 'No suitable Microsoft Visual C++ version found'
-                raise distutils.errors.DistutilsPlatformError(err)
+        if self.vc_ver < vc_min_ver:
+            err = 'No suitable Microsoft Visual C++ version found'
+            raise distutils.errors.DistutilsPlatformError(err)
 
     @property
     def vc_ver(self):

From 66177c944536aab86994f6df7172c0d9d6acb5cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 10:20:47 -0400
Subject: [PATCH 6552/8469] Extract private method for locating latest
 available vc ver.

---
 setuptools/msvc.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 75745e67b6..d739178b1d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -472,14 +472,14 @@ class SystemInfo:
     def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info
         self.pi = self.ri.pi
-        if vc_ver:
-            self.vc_ver = vc_ver
-        else:
-            try:
-                self.vc_ver = self.find_available_vc_vers()[-1]
-            except IndexError:
-                err = 'No Microsoft Visual C++ version found'
-                raise distutils.errors.DistutilsPlatformError(err)
+        self.vc_ver = vc_ver or self._find_latest_available_vc_ver()
+
+    def _find_latest_available_vc_ver(self):
+        try:
+            return self.find_available_vc_vers()[-1]
+        except IndexError:
+            err = 'No Microsoft Visual C++ version found'
+            raise distutils.errors.DistutilsPlatformError(err)
 
     def find_available_vc_vers(self):
         """

From c86965048dee300bc4d985afc72e5de7267658b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 10:29:23 -0400
Subject: [PATCH 6553/8469] spaces for consistency

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

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index f0a80a8eda..4b6fae912f 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -20,8 +20,8 @@ def get_all_headers(message, key):
 
 
 linux_py2_ascii = (
-	platform.system() == 'Linux' and
-	sys.version_info < (3,)
+    platform.system() == 'Linux' and
+    sys.version_info < (3,)
 )
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x

From 1d928cbc7b2cfcf1ffd2ec27f83ee33f0af39dfe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 10:35:00 -0400
Subject: [PATCH 6554/8469] Use six to detect Python 2

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

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 4b6fae912f..701283c8c1 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -2,9 +2,10 @@
 Compatibility Support for Python 2.7 and earlier
 """
 
-import sys
 import platform
 
+import six
+
 
 def get_all_headers(message, key):
     """
@@ -13,15 +14,14 @@ def get_all_headers(message, key):
     return message.get_all(key)
 
 
-if sys.version_info < (3,):
-
+if six.PY2:
     def get_all_headers(message, key):
         return message.getheaders(key)
 
 
 linux_py2_ascii = (
     platform.system() == 'Linux' and
-    sys.version_info < (3,)
+    six.PY2
 )
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x

From b50fdf497d6970002a2f7156650d7da21e2e39f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 10:44:34 -0400
Subject: [PATCH 6555/8469] In msvc9_query_vcvarsall, ensure dict values are
 not unicode. Fixes #992.

---
 CHANGES.rst              |  7 +++++++
 setuptools/msvc.py       |  5 ++++-
 setuptools/py27compat.py | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 081e2cfed0..85ba8cbffb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v34.4.1
+-------
+
+* #992: In msvc.msvc9_query_vcvarsall, ensure the
+  returned dicts have str values and not Unicode for
+  compatibilty with os.environ.
+
 v34.4.0
 -------
 
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index d739178b1d..1e7a32774d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -26,6 +26,7 @@
 from six.moves import filterfalse
 
 from .monkey import get_unpatched
+from . import py27compat
 
 if platform.system() == 'Windows':
     from six.moves import winreg
@@ -134,11 +135,13 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
     # If error, try to set environment directly
     try:
-        return EnvironmentInfo(arch, ver).return_env()
+        env = EnvironmentInfo(arch, ver).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, ver, arch)
         raise
 
+    return py27compat.make_dict_values_strings(env)
+
 
 def msvc14_get_vc_env(plat_spec):
     """
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 701283c8c1..0f92488945 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -26,3 +26,17 @@ def get_all_headers(message, key):
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x
 """Workaround for http://bugs.python.org/issue24672"""
+
+
+def dict_values_strings(dict_):
+    """
+    Given a dict, make sure the text values are str.
+    """
+    if six.PY3:
+        return dict_
+
+    # When dropping Python 2.6 support, use a dict constructor
+    return dict(
+        (key, str(value))
+        for key, value in dict_.iteritems()
+    )

From 6ab912d1f676604d71e8e2090d262002f78929d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Apr 2017 11:23:32 -0400
Subject: [PATCH 6556/8469] Correct typo. Ref #992.

---
 setuptools/msvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 1e7a32774d..3970bfaf8c 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -140,7 +140,7 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
         _augment_exception(exc, ver, arch)
         raise
 
-    return py27compat.make_dict_values_strings(env)
+    return py27compat.dict_values_strings(env)
 
 
 def msvc14_get_vc_env(plat_spec):

From fe3deeeebd6d5f01e803ea6bbfcf001834ca45b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Apr 2017 11:13:51 -0400
Subject: [PATCH 6557/8469] Nicer syntax for processing PYTHONPATH

---
 setuptools/command/easy_install.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ef83f7aed2..55d2656011 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1349,9 +1349,16 @@ def _expand(self, *attrs):
 
 
 def get_site_dirs():
-    # return a list of 'site' dirs
-    sitedirs = [_f for _f in os.environ.get('PYTHONPATH',
-                                            '').split(os.pathsep) if _f]
+    """
+    Return a list of 'site' dirs
+    """
+
+    sitedirs = []
+
+    # start with PYTHONPATH
+    pythonpath_items = os.environ.get('PYTHONPATH', '').split(os.pathsep)
+    sitedirs.extend(filter(None, pythonpath_items))
+
     prefixes = [sys.prefix]
     if sys.exec_prefix != sys.prefix:
         prefixes.append(sys.exec_prefix)

From 3b18e07289d1cd4cdd046d46c244d77938732e5e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Apr 2017 11:24:25 -0400
Subject: [PATCH 6558/8469] Consolidate technique for reading PYTHONPATH.

---
 setuptools/command/easy_install.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 55d2656011..e30ca3ac16 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -474,8 +474,7 @@ def check_site_dir(self):
         else:
             self.pth_file = None
 
-        PYTHONPATH = os.environ.get('PYTHONPATH', '').split(os.pathsep)
-        if instdir not in map(normalize_path, filter(None, PYTHONPATH)):
+        if instdir not in map(normalize_path, _pythonpath()):
             # only PYTHONPATH dirs need a site.py, so pretend it's there
             self.sitepy_installed = True
         elif self.multi_version and not os.path.exists(pth_file):
@@ -1348,6 +1347,11 @@ def _expand(self, *attrs):
                 setattr(self, attr, val)
 
 
+def _pythonpath():
+    items = os.environ.get('PYTHONPATH', '').split(os.pathsep)
+    return filter(None, items)
+
+
 def get_site_dirs():
     """
     Return a list of 'site' dirs
@@ -1356,8 +1360,7 @@ def get_site_dirs():
     sitedirs = []
 
     # start with PYTHONPATH
-    pythonpath_items = os.environ.get('PYTHONPATH', '').split(os.pathsep)
-    sitedirs.extend(filter(None, pythonpath_items))
+    sitedirs.extend(_pythonpath())
 
     prefixes = [sys.prefix]
     if sys.exec_prefix != sys.prefix:

From a1aa1be06bdef8824c8954bb74dc9a57f324f826 Mon Sep 17 00:00:00 2001
From: JGoutin <JGoutin@users.noreply.github.com>
Date: Mon, 10 Apr 2017 17:56:48 +0200
Subject: [PATCH 6559/8469] Fixes for Visual Studio 2017

- VCRuntimeRedist new path since VS2017.
- Use always last Windows SDK and UCRT SDK when more than one version are available.
- Minors docstrings changes.

Tested with "Visual Studio 2017 Community" and "Visual Studio Build Tools 2017".
---
 setuptools/msvc.py | 130 +++++++++++++++++++++++++++------------------
 1 file changed, 79 insertions(+), 51 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 3970bfaf8c..3110eaffe3 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -4,15 +4,16 @@
 Known supported compilers:
 --------------------------
 Microsoft Visual C++ 9.0:
-    Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
-    Microsoft Windows SDK 7.0 (x86, x64, ia64);
+    Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
     Microsoft Windows SDK 6.1 (x86, x64, ia64)
+    Microsoft Windows SDK 7.0 (x86, x64, ia64)
 
 Microsoft Visual C++ 10.0:
     Microsoft Windows SDK 7.1 (x86, x64, ia64)
 
 Microsoft Visual C++ 14.0:
     Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+    Microsoft Visual Studio 2017 (x86, x64, arm, arm64)
     Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
 """
 
@@ -96,7 +97,7 @@ def msvc9_find_vcvarsall(version):
 
 def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     """
-    Patched "distutils.msvc9compiler.query_vcvarsall" for support standalones
+    Patched "distutils.msvc9compiler.query_vcvarsall" for support extra
     compilers.
 
     Set environment without use of "vcvarsall.bat".
@@ -104,9 +105,9 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     Known supported compilers
     -------------------------
     Microsoft Visual C++ 9.0:
-        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64);
-        Microsoft Windows SDK 7.0 (x86, x64, ia64);
+        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
         Microsoft Windows SDK 6.1 (x86, x64, ia64)
+        Microsoft Windows SDK 7.0 (x86, x64, ia64)
 
     Microsoft Visual C++ 10.0:
         Microsoft Windows SDK 7.1 (x86, x64, ia64)
@@ -145,7 +146,7 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
 def msvc14_get_vc_env(plat_spec):
     """
-    Patched "distutils._msvccompiler._get_vc_env" for support standalones
+    Patched "distutils._msvccompiler._get_vc_env" for support extra
     compilers.
 
     Set environment without use of "vcvarsall.bat".
@@ -154,6 +155,7 @@ def msvc14_get_vc_env(plat_spec):
     -------------------------
     Microsoft Visual C++ 14.0:
         Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+        Microsoft Visual Studio 2017 (x86, x64, arm, arm64)
         Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
 
     Parameters
@@ -553,7 +555,6 @@ def _guess_vc(self):
         """
         Locate Visual C for 2017
         """
-
         if self.vc_ver <= 14.0:
             return
 
@@ -576,9 +577,8 @@ def _guess_vc_legacy(self):
     @property
     def WindowsSdkVersion(self):
         """
-        Microsoft Windows SDK versions.
+        Microsoft Windows SDK versions for specified MSVC++ version.
         """
-        # Set Windows SDK versions for specified MSVC++ version
         if self.vc_ver <= 9.0:
             return ('7.0', '6.1', '6.0a')
         elif self.vc_ver == 10.0:
@@ -590,6 +590,14 @@ def WindowsSdkVersion(self):
         elif self.vc_ver >= 14.0:
             return ('10.0', '8.1')
 
+    @property
+    def WindowsSdkLastVersion(self):
+        """
+        Microsoft Windows SDK last version
+        """
+        return self._use_last_dir_name(os.path.join(
+            self.WindowsSdkDir, 'lib'))
+
     @property
     def WindowsSdkDir(self):
         """
@@ -687,6 +695,14 @@ def UniversalCRTSdkDir(self):
                 break
         return sdkdir or ''
 
+    @property
+    def UniversalCRTSdkLastVersion(self):
+        """
+        Microsoft Universal C Runtime SDK last version
+        """
+        return self._use_last_dir_name(os.path.join(
+            self.UniversalCRTSdkDir, 'lib'))
+
     @property
     def NetFxSdkVersion(self):
         """
@@ -746,7 +762,7 @@ def FrameworkVersion64(self):
         """
         return self._find_dot_net_versions(64)
 
-    def _find_dot_net_versions(self, bits=32):
+    def _find_dot_net_versions(self, bits):
         """
         Find Microsoft .NET Framework versions.
 
@@ -758,7 +774,7 @@ def _find_dot_net_versions(self, bits=32):
         # Find actual .NET version in registry
         reg_ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits)
         dot_net_dir = getattr(self, 'FrameworkDir%d' % bits)
-        ver = reg_ver or self._find_dot_net_in(dot_net_dir) or ''
+        ver = reg_ver or self._use_last_dir_name(dot_net_dir, 'v') or ''
 
         # Set .NET versions for specified MSVC++ version
         if self.vc_ver >= 12.0:
@@ -772,17 +788,24 @@ def _find_dot_net_versions(self, bits=32):
             frameworkver = ('v3.0', 'v2.0.50727')
         return frameworkver
 
-    def _find_dot_net_in(self, dot_net_dir):
+    def _use_last_dir_name(self, path, prefix=''):
         """
-        Find .Net in the Framework folder
+        Return name of the last dir in path or '' if no dir found.
+
+        Parameters
+        ----------
+        path: str
+            Use dirs in this path
+        prefix: str
+            Use only dirs startings by this prefix
         """
         matching_dirs = (
             dir_name
-            for dir_name in reversed(os.listdir(dot_net_dir))
-            if os.path.isdir(os.path.join(dot_net_dir, dir_name))
-            and dir_name.startswith('v')
+            for dir_name in reversed(os.listdir(path))
+            if os.path.isdir(os.path.join(path, dir_name)) and
+            dir_name.startswith(prefix)
         )
-        return next(matching_dirs, None)
+        return next(matching_dirs, None) or ''
 
 
 class EnvironmentInfo:
@@ -917,8 +940,8 @@ def OSLibraries(self):
         else:
             arch_subdir = self.pi.target_dir(x64=True)
             lib = os.path.join(self.si.WindowsSdkDir, 'lib')
-            libver = self._get_content_dirname(lib)
-            return [os.path.join(lib, '%sum%s' % (libver, arch_subdir))]
+            libver = self._sdk_subdir
+            return [os.path.join(lib, '%sum%s' % (libver , arch_subdir))]
 
     @property
     def OSIncludes(self):
@@ -932,7 +955,7 @@ def OSIncludes(self):
 
         else:
             if self.vc_ver >= 14.0:
-                sdkver = self._get_content_dirname(include)
+                sdkver = self._sdk_subdir
             else:
                 sdkver = ''
             return [os.path.join(include, '%sshared' % sdkver),
@@ -992,6 +1015,9 @@ def SdkTools(self):
         return list(self._sdk_tools())
 
     def _sdk_tools(self):
+        """
+        Microsoft Windows SDK Tools paths generator
+        """
         if self.vc_ver < 15.0:
             bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
             yield os.path.join(self.si.WindowsSdkDir, bin_dir)
@@ -1012,12 +1038,20 @@ def _sdk_tools(self):
         elif self.vc_ver >= 15.0:
             path = os.path.join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
-            sdkver = self._get_content_dirname(path).rstrip('\\')
+            sdkver = self.si.WindowsSdkLastVersion
             yield os.path.join(path, '%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
             yield self.si.WindowsSDKExecutablePath
 
+    @property
+    def _sdk_subdir(self):
+        """
+        Microsoft Windows SDK version subdir
+        """
+        ucrtver = self.si.WindowsSdkLastVersion
+        return ('%s\\' % ucrtver) if ucrtver else ''
+
     @property
     def SdkSetup(self):
         """
@@ -1116,27 +1150,34 @@ def HTMLHelpWorkshop(self):
     @property
     def UCRTLibraries(self):
         """
-        Microsoft Universal CRT Libraries
+        Microsoft Universal C Runtime SDK Libraries
         """
         if self.vc_ver < 14.0:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
         lib = os.path.join(self.si.UniversalCRTSdkDir, 'lib')
-        ucrtver = self._get_content_dirname(lib)
+        ucrtver = self._ucrt_subdir
         return [os.path.join(lib, '%sucrt%s' % (ucrtver, arch_subdir))]
 
     @property
     def UCRTIncludes(self):
         """
-        Microsoft Universal CRT Include
+        Microsoft Universal C Runtime SDK Include
         """
         if self.vc_ver < 14.0:
             return []
 
         include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
-        ucrtver = self._get_content_dirname(include)
-        return [os.path.join(include, '%sucrt' % ucrtver)]
+        return [os.path.join(include, '%sucrt' % self._ucrt_subdir)]
+
+    @property
+    def _ucrt_subdir(self):
+        """
+        Microsoft Universal C Runtime SDK version subdir
+        """
+        ucrtver = self.si.UniversalCRTSdkLastVersion
+        return ('%s\\' % ucrtver) if ucrtver else ''
 
     @property
     def FSharp(self):
@@ -1154,9 +1195,18 @@ def VCRuntimeRedist(self):
         Microsoft Visual C++ runtime redistribuable dll
         """
         arch_subdir = self.pi.target_dir(x64=True)
-        vcruntime = 'redist%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
-        vcruntime = vcruntime % (arch_subdir, self.vc_ver, self.vc_ver)
-        return os.path.join(self.si.VCInstallDir, vcruntime)
+        if self.vc_ver < 15:
+            redist_path = self.si.VCInstallDir
+            vcruntime = 'redist%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
+        else:
+            redist_path = self.si.VCInstallDir.replace('\\Tools', '\\Redist')
+            vcruntime = 'onecore%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
+
+        # Visual Studio 2017  is still Visual C++ 14.0
+        dll_ver = 14.0 if self.vc_ver == 15 else self.vc_ver
+
+        vcruntime = vcruntime % (arch_subdir, self.vc_ver, dll_ver)
+        return os.path.join(redist_path, vcruntime)
 
     def return_env(self, exists=True):
         """
@@ -1244,25 +1294,3 @@ def _unique_everseen(self, iterable, key=None):
                 if k not in seen:
                     seen_add(k)
                     yield element
-
-    def _get_content_dirname(self, path):
-        """
-        Return name of the first dir in path or '' if no dir found.
-
-        Parameters
-        ----------
-        path: str
-            Path where search dir.
-
-        Return
-        ------
-        foldername: str
-            "name\" or ""
-        """
-        try:
-            name = os.listdir(path)
-            if name:
-                return '%s\\' % name[0]
-            return ''
-        except (OSError, IOError):
-            return ''

From e7b62cfe6df1239f6ec5c00f9223799008a80502 Mon Sep 17 00:00:00 2001
From: JGoutin <JGoutin@users.noreply.github.com>
Date: Mon, 10 Apr 2017 18:02:02 +0200
Subject: [PATCH 6560/8469] Add #1008 changes

---
 CHANGES.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 85ba8cbffb..bf4daf760f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v34.4.2
+-------
+* #1008: In MSVC support, use always the last version available for Windows SDK and UCRT SDK.
+* #1008: In MSVC support, fix "vcruntime140.dll" returned path with Visual Studio 2017.
+
 v34.4.1
 -------
 
@@ -8,8 +13,7 @@ v34.4.1
 v34.4.0
 -------
 
-* #995: In MSVC support, add support for Microsoft
-  Build Tools 2017.
+* #995: In MSVC support, add support for "Microsoft Visual Studio 2017" and "Microsoft Visual Studio Build Tools 2017".
 
 * #999 via #1007: Extend support for declarative package
   config in a setup.cfg file to include the options

From 4489bc183b74a554356d9504816a15ad122726b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Apr 2017 12:03:47 -0400
Subject: [PATCH 6561/8469] Update whitespace for consistency and better
 rendering

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bf4daf760f..f06a0c8537 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,6 @@
 v34.4.2
 -------
+
 * #1008: In MSVC support, use always the last version available for Windows SDK and UCRT SDK.
 * #1008: In MSVC support, fix "vcruntime140.dll" returned path with Visual Studio 2017.
 

From 38ab8c0009f10e72c71cbdb1df56915e99459510 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Apr 2017 12:04:23 -0400
Subject: [PATCH 6562/8469] =?UTF-8?q?Bump=20version:=2034.4.0=20=E2=86=92?=
 =?UTF-8?q?=2034.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fcade157dc..686da2f63b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.4.0
+current_version = 34.4.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0ccc663117..798cf845f1 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.4.0",
+    version="34.4.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 6f05117f5c66e1c77c3a55ac90f91779b72e1d5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Apr 2017 12:05:49 -0400
Subject: [PATCH 6563/8469] Update changelog to combine 34.4.1 and 34.4.2 as
 the former was never released. Ref #1008.

---
 CHANGES.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f06a0c8537..18583f0b89 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,11 +1,9 @@
-v34.4.2
+v34.4.1
 -------
 
 * #1008: In MSVC support, use always the last version available for Windows SDK and UCRT SDK.
-* #1008: In MSVC support, fix "vcruntime140.dll" returned path with Visual Studio 2017.
 
-v34.4.1
--------
+* #1008: In MSVC support, fix "vcruntime140.dll" returned path with Visual Studio 2017.
 
 * #992: In msvc.msvc9_query_vcvarsall, ensure the
   returned dicts have str values and not Unicode for

From a9d403889def99bdb1a1d02b47b8247b3af0817a Mon Sep 17 00:00:00 2001
From: Igor Starikov <idlesign@yandex.ru>
Date: Wed, 12 Apr 2017 12:06:37 +0700
Subject: [PATCH 6564/8469] Docs: notes on setup.cfg and ez_setup

(see # 1006)
---
 docs/setuptools.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bf5bb8cecc..eb9fdbd3c4 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1176,6 +1176,8 @@ Distributing a ``setuptools``-based project
 Using ``setuptools``...  Without bundling it!
 ---------------------------------------------
 
+.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
+
 Your users might not have ``setuptools`` installed on their machines, or even
 if they do, it might not be the right version.  Fixing this is easy; just
 download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
@@ -2277,6 +2279,11 @@ New in 20.1: Added keyring support.
 Configuring setup() using setup.cfg files
 -----------------------------------------
 
+.. note:: New in 30.3.0 (8 Dec 2016).
+
+.. important:: ``setup.py`` with ``setup()`` function call is still required even 
+                if your configuration resides in ``setup.cfg``.
+
 ``Setuptools`` allows using configuration files (usually `setup.cfg`)
 to define package’s metadata and other options which are normally supplied
 to ``setup()`` function.

From 1955e5b0df67cc1aa389b8c655199958a6fcc6a0 Mon Sep 17 00:00:00 2001
From: Stefano Miccoli <stefano.miccoli@polimi.it>
Date: Thu, 13 Apr 2017 22:57:56 +0200
Subject: [PATCH 6565/8469] addresses #436

---
 setuptools/command/egg_info.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1a6ea9cb57..21bbfb72de 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -564,8 +564,6 @@ def add_defaults(self):
         rcfiles = list(walk_revctrl())
         if rcfiles:
             self.filelist.extend(rcfiles)
-        elif os.path.exists(self.manifest):
-            self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 

From 7bb68f652d75c6a8585c95a75757ef6ca0b7d151 Mon Sep 17 00:00:00 2001
From: Ryan Gonzalez <kirbyfan64@users.noreply.github.com>
Date: Fri, 14 Apr 2017 04:00:25 -0500
Subject: [PATCH 6566/8469] bpo-11913: Add README.rst to the distutils standard
 READMEs list (#563)

---
 command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/sdist.py b/command/sdist.py
index 180e28626d..52eaa15d47 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -96,7 +96,7 @@ def checking_metadata(self):
 
     sub_commands = [('check', checking_metadata)]
 
-    READMES = 'README', 'README.txt'
+    READMES = ('README', 'README.txt', 'README.rst')
 
     def initialize_options(self):
         # 'template' and 'manifest' are, respectively, the names of

From 17720e7ce95523f013bca29ff5913e3317eb5ac1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Apr 2017 09:54:47 -0500
Subject: [PATCH 6567/8469] Update changelog. Ref #1014.

---
 CHANGES.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 18583f0b89..e6691486b2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v35.0.0
+-------
+
+* #436: In egg_info.manifest_maker, no longer read
+  the file list from the manifest file, and instead
+  re-build it on each build. In this way, files removed
+  from the specification will not linger in the manifest.
+  As a result, any files manually added to the manifest
+  will be removed on subsequent egg_info invocations.
+  No projects should be manually adding files to the
+  manifest and should instead use MANIFEST.in or SCM
+  file finders to force inclusion of files in the manifest.
+
 v34.4.1
 -------
 

From 9869424e3e74a41e39563e9b4b507c760660673c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Apr 2017 09:55:06 -0500
Subject: [PATCH 6568/8469] =?UTF-8?q?Bump=20version:=2034.4.1=20=E2=86=92?=
 =?UTF-8?q?=2035.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 686da2f63b..57ca3d501f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.4.1
+current_version = 35.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 798cf845f1..328941c13d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.4.1",
+    version="35.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 862da01619666f94a56724180a31753bf98fd29d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Apr 2017 10:06:46 -0500
Subject: [PATCH 6569/8469] Mark failures as allowed. Ref #1015.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index adb2f948d7..fd18a33a0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ matrix:
     env: LC_ALL=C LC_CTYPE=C
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
+  allow_failures:
+  # https://github.com/pypa/setuptools/issues/1015
+  - python: nightly
 script:
  # need tox and rwt to get started
  - pip install tox rwt

From 74b46ceaf9affd65da0ba0d2d56e58a85955a652 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Apr 2017 09:00:53 -0500
Subject: [PATCH 6570/8469] Revert "In msvc9_query_vcvarsall, ensure dict
 values are not unicode. Fixes #992."

This reverts commit b50fdf497d6970002a2f7156650d7da21e2e39f5.
---
 setuptools/msvc.py       |  5 +----
 setuptools/py27compat.py | 14 --------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 3110eaffe3..84dcb2a78a 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -27,7 +27,6 @@
 from six.moves import filterfalse
 
 from .monkey import get_unpatched
-from . import py27compat
 
 if platform.system() == 'Windows':
     from six.moves import winreg
@@ -136,13 +135,11 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
     # If error, try to set environment directly
     try:
-        env = EnvironmentInfo(arch, ver).return_env()
+        return EnvironmentInfo(arch, ver).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, ver, arch)
         raise
 
-    return py27compat.dict_values_strings(env)
-
 
 def msvc14_get_vc_env(plat_spec):
     """
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 0f92488945..701283c8c1 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -26,17 +26,3 @@ def get_all_headers(message, key):
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x
 """Workaround for http://bugs.python.org/issue24672"""
-
-
-def dict_values_strings(dict_):
-    """
-    Given a dict, make sure the text values are str.
-    """
-    if six.PY3:
-        return dict_
-
-    # When dropping Python 2.6 support, use a dict constructor
-    return dict(
-        (key, str(value))
-        for key, value in dict_.iteritems()
-    )

From 0a32f2290aed6db34a142de0d5c0d607b60c6a05 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Apr 2017 09:01:55 -0500
Subject: [PATCH 6571/8469] Update changelog. Ref #992.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e6691486b2..426622a1eb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v35.0.1
+-------
+
+* #992: Revert change introduced in v34.4.1, now
+  considered invalid.
+
 v35.0.0
 -------
 

From 58fa3b44e5130b0cf79523c876f46a07734db7ba Mon Sep 17 00:00:00 2001
From: Pi Delport <pjdelport@gmail.com>
Date: Tue, 18 Apr 2017 17:10:47 +0200
Subject: [PATCH 6572/8469] Add an integration test to install pyuri

This test is also a regression test for issue #1016.
---
 setuptools/tests/test_integration.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index cb62eb2957..2acec91b98 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -99,6 +99,21 @@ def test_python_novaclient(install_context):
     _install_one('python-novaclient', install_context,
                  'novaclient', 'base.py')
 
+
+def test_pyuri(install_context):
+    """
+    Install the pyuri package (version 0.3.1 at the time of writing).
+
+    This is also a regression test for issue #1016.
+    """
+    _install_one('pyuri', install_context, 'pyuri', 'uri.py')
+
+    pyuri = install_context.installed_projects['pyuri']
+
+    # The package data should be installed.
+    assert os.path.exists(os.path.join(pyuri.location, 'pyuri', 'uri.regex'))
+
+
 import re
 import subprocess
 import functools

From 1163c86b3b62258f28964c2aee8483631a85c892 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Apr 2017 17:52:44 -0500
Subject: [PATCH 6573/8469] Revert "addresses #436". Fixes #1016.

This reverts commit 1955e5b0df67cc1aa389b8c655199958a6fcc6a0.
---
 setuptools/command/egg_info.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 21bbfb72de..1a6ea9cb57 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -564,6 +564,8 @@ def add_defaults(self):
         rcfiles = list(walk_revctrl())
         if rcfiles:
             self.filelist.extend(rcfiles)
+        elif os.path.exists(self.manifest):
+            self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 

From 07ca50a90f78bb8ffd499dd67a64cd2d021c1747 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Apr 2017 18:10:13 -0500
Subject: [PATCH 6574/8469] Update changelog. Ref #1016.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 426622a1eb..ebd183606a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,11 @@ v35.0.1
 * #992: Revert change introduced in v34.4.1, now
   considered invalid.
 
+* #1016: Revert change introduced in v35.0.0 per #1014,
+  referencing #436. The approach had unintended
+  consequences, causing sdist installs to be missing
+  files.
+
 v35.0.0
 -------
 

From 413d1e9a9585a5fe170c72b46fdd3ed4c094f848 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Apr 2017 18:10:23 -0500
Subject: [PATCH 6575/8469] =?UTF-8?q?Bump=20version:=2035.0.0=20=E2=86=92?=
 =?UTF-8?q?=2035.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 57ca3d501f..da62ac4fcf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 35.0.0
+current_version = 35.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 328941c13d..df73251175 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="35.0.0",
+    version="35.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f1a9711815acab7e2d9c77b86b43117f72c5c78f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Apr 2017 18:32:40 -0500
Subject: [PATCH 6576/8469] Pass flags programmatically, avoiding deprecating
 trailing pattern flags syntax revealed in #1015.

---
 setuptools/command/egg_info.py    |  3 ++-
 setuptools/tests/test_manifest.py | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1a6ea9cb57..151e495be3 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -112,7 +112,8 @@ def translate_pattern(glob):
         if not last_chunk:
             pat += sep
 
-    return re.compile(pat + r'\Z(?ms)')
+    pat += r'\Z'
+    return re.compile(pat, flags=re.MULTILINE|re.DOTALL)
 
 
 class egg_info(Command):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 3b34c88813..57347b5322 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -71,26 +71,26 @@ def get_pattern(glob):
 
 def test_translated_pattern_test():
     l = make_local_path
-    assert get_pattern('foo') == r'foo\Z(?ms)'
-    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z(?ms)')
+    assert get_pattern('foo') == r'foo\Z'
+    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z')
 
     # Glob matching
-    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z(?ms)')
-    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z(?ms)')
-    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z(?ms)')
+    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z')
+    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z')
+    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z')
     assert get_pattern('docs/page-?.txt') \
-        == l(r'docs\/page\-[^\/]\.txt\Z(?ms)')
+        == l(r'docs\/page\-[^\/]\.txt\Z')
 
     # Globstars change what they mean depending upon where they are
-    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z(?ms)')
-    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z(?ms)')
-    assert get_pattern(l('**')) == r'.*\Z(?ms)'
+    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z')
+    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z')
+    assert get_pattern(l('**')) == r'.*\Z'
 
     # Character classes
-    assert get_pattern('pre[one]post') == r'pre[one]post\Z(?ms)'
-    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z(?ms)'
-    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z(?ms)'
-    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z(?ms)'
+    assert get_pattern('pre[one]post') == r'pre[one]post\Z'
+    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z'
+    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z'
+    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z'
 
 
 class TempDirTestCase(object):

From d8e1ed570126dfc99ed7f9126df3bfc890e7005d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Apr 2017 21:00:50 -0500
Subject: [PATCH 6577/8469] Rewrite tests to test the actual matching rather
 than making assertions about the regular expressions. Fixes #1015.

---
 .travis.yml                       |   3 -
 setuptools/tests/test_manifest.py | 103 ++++++++++++++++++++++++------
 2 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd18a33a0d..adb2f948d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,6 @@ matrix:
     env: LC_ALL=C LC_CTYPE=C
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
-  allow_failures:
-  # https://github.com/pypa/setuptools/issues/1015
-  - python: nightly
 script:
  # need tox and rwt to get started
  - pip install tox rwt
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 57347b5322..28cbca1a2d 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -6,6 +6,7 @@
 import shutil
 import sys
 import tempfile
+import itertools
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
@@ -65,32 +66,94 @@ def touch(filename):
 ]))
 
 
-def get_pattern(glob):
-    return translate_pattern(make_local_path(glob)).pattern
-
-
-def test_translated_pattern_test():
-    l = make_local_path
-    assert get_pattern('foo') == r'foo\Z'
-    assert get_pattern(l('foo/bar')) == l(r'foo\/bar\Z')
+translate_specs = [
+    ('foo', ['foo'], ['bar', 'foobar']),
+    ('foo/bar', ['foo/bar'], ['foo/bar/baz', './foo/bar', 'foo']),
 
     # Glob matching
-    assert get_pattern('*.txt') == l(r'[^\/]*\.txt\Z')
-    assert get_pattern('dir/*.txt') == l(r'dir\/[^\/]*\.txt\Z')
-    assert get_pattern('*/*.py') == l(r'[^\/]*\/[^\/]*\.py\Z')
-    assert get_pattern('docs/page-?.txt') \
-        == l(r'docs\/page\-[^\/]\.txt\Z')
+    ('*.txt', ['foo.txt', 'bar.txt'], ['foo/foo.txt']),
+    ('dir/*.txt', ['dir/foo.txt', 'dir/bar.txt', 'dir/.txt'], ['notdir/foo.txt']),
+    ('*/*.py', ['bin/start.py'], []),
+    ('docs/page-?.txt', ['docs/page-9.txt'], ['docs/page-10.txt']),
 
     # Globstars change what they mean depending upon where they are
-    assert get_pattern(l('foo/**/bar')) == l(r'foo\/(?:[^\/]+\/)*bar\Z')
-    assert get_pattern(l('foo/**')) == l(r'foo\/.*\Z')
-    assert get_pattern(l('**')) == r'.*\Z'
+    (
+        'foo/**/bar',
+        ['foo/bing/bar', 'foo/bing/bang/bar', 'foo/bar'],
+        ['foo/abar'],
+    ),
+    (
+        'foo/**',
+        ['foo/bar/bing.py', 'foo/x'],
+        ['/foo/x'],
+    ),
+    (
+        '**',
+        ['x', 'abc/xyz', '@nything'],
+        [],
+    ),
 
     # Character classes
-    assert get_pattern('pre[one]post') == r'pre[one]post\Z'
-    assert get_pattern('hello[!one]world') == r'hello[^one]world\Z'
-    assert get_pattern('[]one].txt') == r'[\]one]\.txt\Z'
-    assert get_pattern('foo[!]one]bar') == r'foo[^\]one]bar\Z'
+    (
+        'pre[one]post',
+        ['preopost', 'prenpost', 'preepost'],
+        ['prepost', 'preonepost'],
+    ),
+
+    (
+        'hello[!one]world',
+        ['helloxworld', 'helloyworld'],
+        ['hellooworld', 'helloworld', 'hellooneworld'],
+    ),
+
+    (
+        '[]one].txt',
+        ['o.txt', '].txt', 'e.txt'],
+        ['one].txt'],
+    ),
+
+    (
+        'foo[!]one]bar',
+        ['fooybar'],
+        ['foo]bar', 'fooobar', 'fooebar'],
+    ),
+
+]
+"""
+A spec of inputs for 'translate_pattern' and matches and mismatches
+for that input.
+"""
+
+match_params = itertools.chain.from_iterable(
+    zip(itertools.repeat(pattern), matches)
+    for pattern, matches, mismatches in translate_specs
+)
+
+
+@pytest.fixture(params=match_params)
+def pattern_match(request):
+    return map(make_local_path, request.param)
+
+
+mismatch_params = itertools.chain.from_iterable(
+    zip(itertools.repeat(pattern), mismatches)
+    for pattern, matches, mismatches in translate_specs
+)
+
+
+@pytest.fixture(params=mismatch_params)
+def pattern_mismatch(request):
+    return map(make_local_path, request.param)
+
+
+def test_translated_pattern_match(pattern_match):
+    pattern, target = pattern_match
+    assert translate_pattern(pattern).match(target)
+
+
+def test_translated_pattern_mismatch(pattern_mismatch):
+    pattern, target = pattern_mismatch
+    assert not translate_pattern(pattern).match(target)
 
 
 class TempDirTestCase(object):

From 9381f65a8ab5cd89e262e60bdac83834e1eafd22 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 25 Apr 2017 02:11:09 +0200
Subject: [PATCH 6578/8469] bpo-30132: distutils test_build_ext() uses
 temp_cwd() (#1278)

test_build_ext() of test_distutils now uses support.temp_cwd() to
prevent the creation of a pdb file in the current working directory
on Windows.
---
 tests/test_build_ext.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index be7f5f38aa..96e5f03095 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -41,6 +41,13 @@ def build_ext(self, *args, **kwargs):
         return build_ext(*args, **kwargs)
 
     def test_build_ext(self):
+        # bpo-30132: On Windows, a .pdb file may be created in the current
+        # working directory. Create a temporary working directory to cleanup
+        # everything at the end of the test.
+        with support.temp_cwd():
+            self._test_build_ext()
+
+    def _test_build_ext(self):
         cmd = support.missing_compiler_executable()
         if cmd is not None:
             self.skipTest('The %r command is not found' % cmd)

From b1cb67c743de2581f9393315b23777011c22ecf7 Mon Sep 17 00:00:00 2001
From: Nick Douma <n.douma@nekoconeko.nl>
Date: Thu, 27 Apr 2017 11:44:56 +0200
Subject: [PATCH 6579/8469] Use a different method to lookup base classes on
 Jython

Jython seems to implement inspect.getmro differently, which causes
any classes with the same name as a class lower in the MRO not to
be returned.

This patch offloads the MRO lookup to a separate function, which
implements different logic for Jython only.

Ref #1024
---
 setuptools/monkey.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 68fad9dd08..97ba159d03 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -21,6 +21,19 @@
 """
 
 
+def get_mro(cls):
+    """Returns the bases classes for cls sorted by the MRO.
+
+    Works around an issue on Jython where inspect.getmro will not return all
+    base classes if multiple classes share the same name. Instead, this
+    function will return a tuple containing the class itself, and the contents
+    of cls.__bases__ .
+    """
+    if platform.python_implementation() != "Jython":
+        return inspect.getmro(cls)
+    return (cls,) + cls.__bases__
+
+
 def get_unpatched(item):
     lookup = (
         get_unpatched_class if isinstance(item, six.class_types) else
@@ -38,7 +51,7 @@ def get_unpatched_class(cls):
     """
     external_bases = (
         cls
-        for cls in inspect.getmro(cls)
+        for cls in get_mro(cls)
         if not cls.__module__.startswith('setuptools')
     )
     base = next(external_bases)

From 8219fe5211aebbc8de8da9c988cc2a2b85b92829 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 27 Apr 2017 15:28:54 -0400
Subject: [PATCH 6580/8469] Make _get_mro private; Swap logic to put preferred
 behavior at top level; Update docstring to reference issue.

---
 setuptools/monkey.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 97ba159d03..acd0a4f41c 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -21,17 +21,18 @@
 """
 
 
-def get_mro(cls):
-    """Returns the bases classes for cls sorted by the MRO.
+def _get_mro(cls):
+    """
+    Returns the bases classes for cls sorted by the MRO.
 
     Works around an issue on Jython where inspect.getmro will not return all
     base classes if multiple classes share the same name. Instead, this
     function will return a tuple containing the class itself, and the contents
-    of cls.__bases__ .
+    of cls.__bases__. See https://github.com/pypa/setuptools/issues/1024.
     """
-    if platform.python_implementation() != "Jython":
-        return inspect.getmro(cls)
-    return (cls,) + cls.__bases__
+    if platform.python_implementation() == "Jython":
+        return (cls,) + cls.__bases__
+    return inspect.getmro(cls)
 
 
 def get_unpatched(item):
@@ -51,7 +52,7 @@ def get_unpatched_class(cls):
     """
     external_bases = (
         cls
-        for cls in get_mro(cls)
+        for cls in _get_mro(cls)
         if not cls.__module__.startswith('setuptools')
     )
     base = next(external_bases)

From 81c15b5010c3005ec8d77e89a3f974e54be8d10f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 27 Apr 2017 15:31:43 -0400
Subject: [PATCH 6581/8469] Update changelog. Ref #1025.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index ebd183606a..d83eb9d8ee 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v35.0.2
+-------
+
+* #1024: Add workaround for Jython #2581 in monkey module.
+
 v35.0.1
 -------
 

From d2dfacad71021417cf2cf082d0687774c3188142 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 27 Apr 2017 15:36:34 -0400
Subject: [PATCH 6582/8469] Update changelog. Ref #1015.

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d83eb9d8ee..1ac719dfee 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,8 @@
 v35.0.2
 -------
 
+* #1015: Fix test failures on Python 3.7.
+
 * #1024: Add workaround for Jython #2581 in monkey module.
 
 v35.0.1

From 44d2c01914baff076853f6402655589dde070703 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 27 Apr 2017 15:36:45 -0400
Subject: [PATCH 6583/8469] =?UTF-8?q?Bump=20version:=2035.0.1=20=E2=86=92?=
 =?UTF-8?q?=2035.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index da62ac4fcf..cb247aaf40 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 35.0.1
+current_version = 35.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index df73251175..0d465cc888 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="35.0.1",
+    version="35.0.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 28091832dcb224724ef4d89eaa042ff6fea00746 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 2 May 2017 13:11:50 +0200
Subject: [PATCH 6584/8469] bpo-30132: distutils BuildExtTestCase use temp_cwd
 (#1380)

BuildExtTestCase of test_distutils now uses support.temp_cwd() in
setUp() to remove files created in the current working in all
BuildExtTestCase unit tests, not only test_build_ext().

Move also tearDown() just after setUp().
---
 tests/test_build_ext.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 96e5f03095..a72218274c 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -37,17 +37,28 @@ def setUp(self):
         from distutils.command import build_ext
         build_ext.USER_BASE = site.USER_BASE
 
-    def build_ext(self, *args, **kwargs):
-        return build_ext(*args, **kwargs)
-
-    def test_build_ext(self):
         # bpo-30132: On Windows, a .pdb file may be created in the current
         # working directory. Create a temporary working directory to cleanup
         # everything at the end of the test.
-        with support.temp_cwd():
-            self._test_build_ext()
+        self.temp_cwd = support.temp_cwd()
+        self.temp_cwd.__enter__()
+        self.addCleanup(self.temp_cwd.__exit__, None, None, None)
+
+    def tearDown(self):
+        # Get everything back to normal
+        support.unload('xx')
+        sys.path = self.sys_path[0]
+        sys.path[:] = self.sys_path[1]
+        import site
+        site.USER_BASE = self.old_user_base
+        from distutils.command import build_ext
+        build_ext.USER_BASE = self.old_user_base
+        super(BuildExtTestCase, self).tearDown()
 
-    def _test_build_ext(self):
+    def build_ext(self, *args, **kwargs):
+        return build_ext(*args, **kwargs)
+
+    def test_build_ext(self):
         cmd = support.missing_compiler_executable()
         if cmd is not None:
             self.skipTest('The %r command is not found' % cmd)
@@ -91,17 +102,6 @@ def _test_build_ext(self):
         self.assertIsInstance(xx.Null(), xx.Null)
         self.assertIsInstance(xx.Str(), xx.Str)
 
-    def tearDown(self):
-        # Get everything back to normal
-        support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
-        import site
-        site.USER_BASE = self.old_user_base
-        from distutils.command import build_ext
-        build_ext.USER_BASE = self.old_user_base
-        super(BuildExtTestCase, self).tearDown()
-
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
         cmd = self.build_ext(dist)

From 37a5021a1e623c5edf1a6a01ba71d967c4b1a4d2 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 4 May 2017 23:29:09 +0200
Subject: [PATCH 6585/8469] bpo-30273: Update sysconfig (#1464)

The AST_H_DIR variable was removed from Makefile.pre.in by the commit
a5c62a8e9f0de6c4133825a5710984a3cd5e102b (bpo-23404).

AST_H_DIR was hardcoded to "Include", so replace the removed variable
by its content.

Remove also ASDLGEN variable from sysconfig example since this
variable was also removed.
---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 8bf1a7016b..90004acea8 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -97,7 +97,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             if plat_specific:
                 return base
             if _sys_home:
-                incdir = os.path.join(_sys_home, get_config_var('AST_H_DIR'))
+                incdir = os.path.join(_sys_home, 'Include')
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
             return os.path.normpath(incdir)

From b19c8614bc78fef2b48148e4ec4ea46274320416 Mon Sep 17 00:00:00 2001
From: Jeremy Kloth <jeremy.kloth@gmail.com>
Date: Tue, 9 May 2017 09:24:13 -0600
Subject: [PATCH 6586/8469] bpo-30273: update distutils.sysconfig for venv's
 created from Python (#1515)

compiled out-of-tree (builddir != srcdir). (see also bpo-15366)
---
 sysconfig.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 90004acea8..2bcd1dd288 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -93,14 +93,11 @@ def get_python_inc(plat_specific=0, prefix=None):
             # the build directory may not be the source directory, we
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
-            base = _sys_home or project_base
             if plat_specific:
-                return base
-            if _sys_home:
-                incdir = os.path.join(_sys_home, 'Include')
+                return _sys_home or project_base
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
-            return os.path.normpath(incdir)
+                return os.path.normpath(incdir)
         python_dir = 'python' + get_python_version() + build_flags
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":

From ddeea9fac9629e183c74a2a92199240a95714211 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 May 2017 14:26:16 -0400
Subject: [PATCH 6587/8469] Remove stale references to rwt. Ref #1018.

---
 .travis.yml | 4 ++--
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index adb2f948d7..a49822f804 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ matrix:
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
 script:
- # need tox and rwt to get started
- - pip install tox rwt
+ # need tox to get started
+ - pip install tox
 
  # Output the env, to verify behavior
  - env
diff --git a/setup.py b/setup.py
index 0d465cc888..e222ba9350 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ def require_metadata():
     if not os.path.exists(egg_info_dir):
         msg = (
             "Cannot build setuptools without metadata. "
-            "Install rwt and run `rwt -- bootstrap.py`."
+            "Install rwt and run `bootstrap.py`."
         )
         raise RuntimeError(msg)
 

From 6a645af13ac4ef4dd2c4012c47f8d21d529358a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 11 May 2017 14:32:38 -0400
Subject: [PATCH 6588/8469] Remove another reference to rwt. Ref #1018.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e222ba9350..6b9da273a6 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ def require_metadata():
     if not os.path.exists(egg_info_dir):
         msg = (
             "Cannot build setuptools without metadata. "
-            "Install rwt and run `bootstrap.py`."
+            "Run `bootstrap.py`."
         )
         raise RuntimeError(msg)
 

From 094a8909470795a0a5c18a616a0cd2f4d10a19e2 Mon Sep 17 00:00:00 2001
From: Pi Delport <pjdelport@gmail.com>
Date: Wed, 19 Apr 2017 10:26:11 +0200
Subject: [PATCH 6589/8469] Add bootstrap instructions to tox.ini

This will help get new contributors started, if they're just used to
running "tox".
---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 6b43dcd80b..342b034e62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,5 @@
+# Note: Run "python bootstrap.py" before running Tox, to generate metadata.
+
 [testenv]
 deps=
     -rtests/requirements.txt

From f60c81e570ec3187eeeb92c4ad4f0a788fdeaec6 Mon Sep 17 00:00:00 2001
From: Pi Delport <pjdelport@gmail.com>
Date: Wed, 19 Apr 2017 13:41:34 +0200
Subject: [PATCH 6590/8469] Add snippet for running Tox against all supported
 Pythons

---
 tox.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tox.ini b/tox.ini
index 342b034e62..c81a3391a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,8 @@
 # Note: Run "python bootstrap.py" before running Tox, to generate metadata.
+#
+# To run Tox against all supported Python interpreters, you can set:
+#
+# export TOXENV='py2{6,7},py3{3,4,5,6},pypy'
 
 [testenv]
 deps=

From efcc426349bef47ff8698245af99e34e3489988d Mon Sep 17 00:00:00 2001
From: Pi Delport <pjdelport@gmail.com>
Date: Wed, 19 Apr 2017 13:43:54 +0200
Subject: [PATCH 6591/8469] Add the pytest cache directory to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ec3d0e3522..e8d18b31f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ setuptools.egg-info
 *~
 .hg*
 requirements.txt
+.cache

From d919999bf8c37b2efad7d6eb57ec2f5ff340799e Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Tue, 16 May 2017 11:13:30 +0300
Subject: [PATCH 6592/8469] Document -s to run single test

Fixes https://github.com/pypa/setuptools/issues/1032
---
 setuptools/command/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index e7a386d19d..29227d79ea 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -67,7 +67,7 @@ class test(Command):
     user_options = [
         ('test-module=', 'm', "Run 'test_suite' in specified module"),
         ('test-suite=', 's',
-         "Test suite to run (e.g. 'some_module.test_suite')"),
+         "Run single test, case or suite (e.g. 'module.test_suite')"),
         ('test-runner=', 'r', "Test runner to use"),
     ]
 

From 252748ea7dc284747562b5de212aba51d79a2479 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 18 May 2017 07:35:54 -0700
Subject: [PATCH 6593/8469] bpo-30296 Remove unnecessary tuples, lists, sets,
 and dicts (#1489)

* Replaced list(<generator expression>) with list comprehension
* Replaced dict(<generator expression>) with dict comprehension
* Replaced set(<list literal>) with set literal
* Replaced builtin func(<list comprehension>) with func(<generator
  expression>) when supported (e.g. any(), all(), tuple(), min(), &
  max())
---
 msvc9compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc9compiler.py b/msvc9compiler.py
index 2119127622..c401ddc86e 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -255,7 +255,7 @@ def query_vcvarsall(version, arch="x86"):
     """Launch vcvarsall.bat and read the settings from its environment
     """
     vcvarsall = find_vcvarsall(version)
-    interesting = set(("include", "lib", "libpath", "path"))
+    interesting = {"include", "lib", "libpath", "path"}
     result = {}
 
     if vcvarsall is None:

From 7474f891cd5f62b0ef2af286096b47f8497e5d0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:08:53 -0400
Subject: [PATCH 6594/8469] Remove extraneous whitespace and empty comment

---
 setuptools/sandbox.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 41c1c3b19d..9c4ff33688 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -486,6 +486,3 @@ def __str__(self):
 support alternate installation locations even if you run its setup
 script by hand.  Please inform the package's author and the EasyInstall
 maintainers to find out if a fix or workaround is available.""" % self.args
-
-
-#

From d6959fca54137c47abb9c3f7a0cbd1d0fd3704d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:12:01 -0400
Subject: [PATCH 6595/8469] Use dedent and left strip to store the template
 inside the class.

---
 setuptools/sandbox.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 9c4ff33688..4711fec216 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -7,6 +7,7 @@
 import re
 import contextlib
 import pickle
+import textwrap
 
 import six
 from six.moves import builtins, map
@@ -476,13 +477,17 @@ def open(self, file, flags, mode=0o777, *args, **kw):
 class SandboxViolation(DistutilsError):
     """A setup script attempted to modify the filesystem outside the sandbox"""
 
-    def __str__(self):
-        return """SandboxViolation: %s%r %s
+    tmpl = textwrap.dedent("""
+        SandboxViolation: %s%r %s
+
+        The package setup script has attempted to modify files on your system
+        that are not within the EasyInstall build area, and has been aborted.
 
-The package setup script has attempted to modify files on your system
-that are not within the EasyInstall build area, and has been aborted.
+        This package cannot be safely installed by EasyInstall, and may not
+        support alternate installation locations even if you run its setup
+        script by hand.  Please inform the package's author and the EasyInstall
+        maintainers to find out if a fix or workaround is available.
+        """).lstrip()
 
-This package cannot be safely installed by EasyInstall, and may not
-support alternate installation locations even if you run its setup
-script by hand.  Please inform the package's author and the EasyInstall
-maintainers to find out if a fix or workaround is available.""" % self.args
+    def __str__(self):
+        return self.tmpl % self.args

From c96c3ffba9f8a6ab43e6f3d57349a46e3076c374 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:30:58 -0400
Subject: [PATCH 6596/8469] Expand test to cover string rendering of
 SandboxViolation

---
 setuptools/tests/test_sandbox.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 929f0a5be8..2b3d859e80 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -126,3 +126,7 @@ def write_file():
         assert cmd == 'open'
         assert args == ('/etc/foo', 'w')
         assert kwargs == {}
+
+        msg = str(caught.value)
+        assert 'open' in msg
+        assert "('/etc/foo', 'w')" in msg

From d48cb39b4666477da1d954d3604023095c233869 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:31:55 -0400
Subject: [PATCH 6597/8469] Use new style format strings and expand args to
 variables for better clarity of purpose.

---
 setuptools/sandbox.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 4711fec216..53964f4b2b 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -478,7 +478,7 @@ class SandboxViolation(DistutilsError):
     """A setup script attempted to modify the filesystem outside the sandbox"""
 
     tmpl = textwrap.dedent("""
-        SandboxViolation: %s%r %s
+        SandboxViolation: {cmd}{args!r} {kwargs}
 
         The package setup script has attempted to modify files on your system
         that are not within the EasyInstall build area, and has been aborted.
@@ -490,4 +490,5 @@ class SandboxViolation(DistutilsError):
         """).lstrip()
 
     def __str__(self):
-        return self.tmpl % self.args
+        cmd, args, kwargs = self.args
+        return self.tmpl.format(**locals())

From 20567bef2a36b259d2209cc76fd11a61ad288853 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:42:04 -0400
Subject: [PATCH 6598/8469] Implement AbstractSandbox as a context manager.

---
 setuptools/sandbox.py            | 31 ++++++++++++++++---------------
 setuptools/tests/test_sandbox.py |  4 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 53964f4b2b..14f18d74af 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -249,11 +249,9 @@ def run_setup(setup_script, args):
                 setup_script.encode(sys.getfilesystemencoding())
             )
 
-            def runner():
+            with DirectorySandbox(setup_dir):
                 ns = dict(__file__=dunder_file, __name__='__main__')
                 _execfile(setup_script, ns)
-
-            DirectorySandbox(setup_dir).run(runner)
         except SystemExit as v:
             if v.args and v.args[0]:
                 raise
@@ -275,21 +273,24 @@ def _copy(self, source):
         for name in self._attrs:
             setattr(os, name, getattr(source, name))
 
+    def __enter__(self):
+        self._copy(self)
+        if _file:
+            builtins.file = self._file
+        builtins.open = self._open
+        self._active = True
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self._active = False
+        if _file:
+            builtins.file = _file
+        builtins.open = _open
+        self._copy(_os)
+
     def run(self, func):
         """Run 'func' under os sandboxing"""
-        try:
-            self._copy(self)
-            if _file:
-                builtins.file = self._file
-            builtins.open = self._open
-            self._active = True
+        with self:
             return func()
-        finally:
-            self._active = False
-            if _file:
-                builtins.file = _file
-            builtins.open = _open
-            self._copy(_os)
 
     def _mk_dual_path_wrapper(name):
         original = getattr(_os, name)
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 2b3d859e80..6b0400f374 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -12,8 +12,8 @@
 
 class TestSandbox:
     def test_devnull(self, tmpdir):
-        sandbox = DirectorySandbox(str(tmpdir))
-        sandbox.run(self._file_writer(os.devnull))
+        with DirectorySandbox(str(tmpdir)):
+            self._file_writer(os.devnull)
 
     @staticmethod
     def _file_writer(path):

From 8d3ed39696c5932a48b5f4a3768caa9f9e8c54b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 11:47:44 -0400
Subject: [PATCH 6599/8469] Just use class in its namespace

---
 setuptools/tests/test_sandbox.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index 6b0400f374..a3f1206d5b 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -7,12 +7,11 @@
 
 import pkg_resources
 import setuptools.sandbox
-from setuptools.sandbox import DirectorySandbox
 
 
 class TestSandbox:
     def test_devnull(self, tmpdir):
-        with DirectorySandbox(str(tmpdir)):
+        with setuptools.sandbox.DirectorySandbox(str(tmpdir)):
             self._file_writer(os.devnull)
 
     @staticmethod
@@ -116,11 +115,11 @@ def write_file():
             with open('/etc/foo', 'w'):
                 pass
 
-        sandbox = DirectorySandbox(str(tmpdir))
         with pytest.raises(setuptools.sandbox.SandboxViolation) as caught:
             with setuptools.sandbox.save_modules():
                 setuptools.sandbox.hide_setuptools()
-                sandbox.run(write_file)
+                with setuptools.sandbox.DirectorySandbox(str(tmpdir)):
+                    write_file()
 
         cmd, args, kwargs = caught.value.args
         assert cmd == 'open'

From 4dc2c76b62a5071dfacf434555dfa8ec2be0b433 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 May 2017 12:10:24 -0400
Subject: [PATCH 6600/8469] Temporarily pin backports.unittest_mock to 1.2 to
 bypass the issue reported in #1038.

---
 tests/requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 88a36c635c..6e2e78e2a7 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,4 @@
 pytest-flake8
 pytest>=3.0.2
-backports.unittest_mock>=1.2
+# pinned to 1.2 as temporary workaround for #1038
+backports.unittest_mock>=1.2,<1.3

From daaeffc5ab0218a63c804ba873ce5d019aef4839 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 May 2017 19:55:50 -0400
Subject: [PATCH 6601/8469] Update changelog

---
 CHANGES.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1ac719dfee..bc13fd8c6b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v36.0.0
+-------
+
+* #980 and others: Once again, Setuptools vendors all
+  of its dependencies. It seems to be the case that in
+  the Python ecosystem, all build tools must run without
+  any dependencies (build, runtime, or otherwise). At
+  such a point that a mechanism exists that allows
+  build tools to have dependencies, Setuptools will adopt
+  it.
+
 v35.0.2
 -------
 

From a9d902519680132493176106fe46aa9d77eafd10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 May 2017 19:57:57 -0400
Subject: [PATCH 6602/8469] =?UTF-8?q?Bump=20version:=2035.0.2=20=E2=86=92?=
 =?UTF-8?q?=2036.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index cb247aaf40..e39b524d21 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 35.0.2
+current_version = 36.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ea9b7e741e..9250e073d4 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="35.0.2",
+    version="36.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 09902adaf5a3a279e991a23a8c25cdedea15a7e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 31 May 2017 11:54:50 -0400
Subject: [PATCH 6603/8469] Remove now unnecessary before_deploy step

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa26015f2f..6d6333f871 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

From 1cebea7e885c357d8f64a021bec4316b7993c50c Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Wed, 31 May 2017 21:29:05 -0400
Subject: [PATCH 6604/8469] fixed #1042 -- corrected an import

---
 setuptools/py27compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 701283c8c1..2985011b92 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -4,7 +4,7 @@
 
 import platform
 
-import six
+from setuptools.extern import six
 
 
 def get_all_headers(message, key):

From b00739278d9a82bfc032a523595662a7aac09fa7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jun 2017 09:00:23 -0400
Subject: [PATCH 6605/8469] Update changelog. Ref #1043.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bc13fd8c6b..b2d1ed9a90 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
 -------
 

From bf558e8d1f402c3ac9be74b96bb2002875e72581 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jun 2017 09:00:31 -0400
Subject: [PATCH 6606/8469] =?UTF-8?q?Bump=20version:=2036.0.0=20=E2=86=92?=
 =?UTF-8?q?=2036.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e39b524d21..b5199a625f 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 9250e073d4..6eaac16ad5 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",

From f69469b16da3ab755ca9719a5e800b27aea80f62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jun 2017 09:15:12 -0400
Subject: [PATCH 6607/8469] Remove section on bootstrap branch, no longer
 relevant.

---
 docs/releases.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/docs/releases.txt b/docs/releases.txt
index c84ddd75e4..5a0d0b0141 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -12,21 +12,6 @@ is major, minor, or patch based on the scope of the changes in the
 release. Then, push the commits to the master branch. If tests pass,
 the release will be uploaded to PyPI (from the Python 3.5 tests).
 
-Bootstrap Branch
-----------------
-
-Setuptools has a bootstrap script (ez_setup.py), which is hosted in the
-repository in the ``bootstrap`` branch.
-
-Therefore, the latest bootstrap script can be retrieved by checking out
-that branch.
-
-The officially-published location of the bootstrap script is hosted on Python
-infrastructure (#python-infra on freenode) at https://bootstrap.pypa.io and
-is updated every fifteen minutes from the bootstrap branch. Sometimes,
-especially when the bootstrap script is rolled back, this
-process doesn't work as expected and requires manual intervention.
-
 Release Frequency
 -----------------
 

From f8cb9c6547de40234c67ba1caf56a7b63d11f07b Mon Sep 17 00:00:00 2001
From: Alex Chan <a.chan@wellcome.ac.uk>
Date: Thu, 1 Jun 2017 14:48:46 +0100
Subject: [PATCH 6608/8469] Add a test that setuptools can be installed in a
 clean environment

---
 .travis.yml      |  3 +++
 clean_install.sh | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 clean_install.sh

diff --git a/.travis.yml b/.travis.yml
index 6d6333f871..6c72e7311a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,9 @@ script:
  #- python -m tox
  - tox
 
+ # Check that setuptools can be installed in a clean environment
+ - ./clean_install.sh
+
 deploy:
   provider: pypi
   # Also update server in setup.cfg
diff --git a/clean_install.sh b/clean_install.sh
new file mode 100755
index 0000000000..40bdd7d362
--- /dev/null
+++ b/clean_install.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o xtrace
+
+# Create a temporary directory to install the virtualenv in
+VENV_DIR="$(mktemp -d)"
+function cleanup { rm -rf "$VENV_DIR" }
+trap cleanup EXIT
+
+# Create a virtualenv that doesn't have pip or setuptools installed
+wget https://raw.githubusercontent.com/pypa/virtualenv/master/virtualenv.py
+python virtualenv.py --no-wheel --no-pip --no-setuptools "$VENV_DIR"
+source "$VENV_DIR/bin/activate"
+
+# Now try to install setuptools
+python bootstrap.py
+python setup.py install

From 1b6d0c8088123a5bb8adaeda567fd58834f58e24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jun 2017 11:09:08 -0400
Subject: [PATCH 6609/8469] Update release process to give guidance on updating
 the changelog prior to release.

---
 docs/releases.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/releases.txt b/docs/releases.txt
index 5a0d0b0141..da0e31f5ed 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -7,10 +7,20 @@ mechanical technique for releases, enacted by Travis following a
 successful build of a tagged release per
 `PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
 
+Prior to cutting a release, please check that the CHANGES.rst reflects
+the summary of changes since the last release.
+Ideally, these changelog entries would have been added
+along with the changes, but it's always good to check.
+Think about it from the
+perspective of a user not involved with the development--what would
+that person want to know about what has changed--or from the
+perspective of your future self wanting to know when a particular
+change landed.
+
 To cut a release, install and run ``bumpversion {part}`` where ``part``
 is major, minor, or patch based on the scope of the changes in the
 release. Then, push the commits to the master branch. If tests pass,
-the release will be uploaded to PyPI (from the Python 3.5 tests).
+the release will be uploaded to PyPI (from the Python 3.6 tests).
 
 Release Frequency
 -----------------

From 1b2a92e97875b66d2c6244a249f5ecd711b5a717 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 1 Jun 2017 11:19:13 -0400
Subject: [PATCH 6610/8469] Use bump2version for releases so that annotated
 tags are employed.

---
 docs/releases.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/releases.txt b/docs/releases.txt
index da0e31f5ed..30ea084fec 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -17,7 +17,7 @@ that person want to know about what has changed--or from the
 perspective of your future self wanting to know when a particular
 change landed.
 
-To cut a release, install and run ``bumpversion {part}`` where ``part``
+To cut a release, install and run ``bump2version {part}`` where ``part``
 is major, minor, or patch based on the scope of the changes in the
 release. Then, push the commits to the master branch. If tests pass,
 the release will be uploaded to PyPI (from the Python 3.6 tests).

From 7a1aaef09c6964e8842f28b17da890d3da71d3e2 Mon Sep 17 00:00:00 2001
From: Alex Chan <a.chan@wellcome.ac.uk>
Date: Thu, 1 Jun 2017 18:06:14 +0100
Subject: [PATCH 6611/8469] Fix bash syntax error

---
 clean_install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clean_install.sh b/clean_install.sh
index 40bdd7d362..28860f472e 100755
--- a/clean_install.sh
+++ b/clean_install.sh
@@ -5,7 +5,9 @@ set -o xtrace
 
 # Create a temporary directory to install the virtualenv in
 VENV_DIR="$(mktemp -d)"
-function cleanup { rm -rf "$VENV_DIR" }
+function cleanup() {
+  rm -rf "$VENV_DIR"
+}
 trap cleanup EXIT
 
 # Create a virtualenv that doesn't have pip or setuptools installed

From 3b443bc9ca9d7159f57fc232c97a4635ecb4086f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Jun 2017 15:33:40 -0400
Subject: [PATCH 6612/8469] Use io.open when saving entry_points.

---
 bootstrap.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.py b/bootstrap.py
index 24d7093c00..f3a12c0729 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -9,6 +9,7 @@
 import sys
 import textwrap
 import subprocess
+import io
 
 
 minimal_egg_info = textwrap.dedent("""
@@ -41,7 +42,7 @@ def build_egg_info():
     """
 
     os.mkdir('setuptools.egg-info')
-    with open('setuptools.egg-info/entry_points.txt', 'w') as ep:
+    with io.open('setuptools.egg-info/entry_points.txt', 'w') as ep:
         ep.write(minimal_egg_info)
 
 

From 6d739f2460f794cbf58eeaab2b9f86a3051e4e82 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Tue, 6 Jun 2017 01:47:35 +0800
Subject: [PATCH 6613/8469] Fix a typo: compatibilty -> compatibility

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b2d1ed9a90..2942c48fb5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -56,7 +56,7 @@ v34.4.1
 
 * #992: In msvc.msvc9_query_vcvarsall, ensure the
   returned dicts have str values and not Unicode for
-  compatibilty with os.environ.
+  compatibility with os.environ.
 
 v34.4.0
 -------

From 995d309317c6895a123c03df28bc8f51f6ead5f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Jun 2017 17:04:45 -0400
Subject: [PATCH 6614/8469] Limit the scope of deprecation of the upload_docs
 command.

---
 CHANGES.rst                       | 11 +++++++++++
 setuptools/command/upload_docs.py |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b2d1ed9a90..35ee477658 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v36.1.0
+-------
+
+* Removed deprecation of and restored support for
+  ``upload_docs`` command for sites other than PyPI.
+  Only warehouse is dropping support, but services like
+  `devpi <http://doc.devpi.net/latest/>`_ continue to
+  support docs built by setuptools' plugins. See
+  `this comment <https://bitbucket.org/hpk42/devpi/issues/388/support-rtd-model-for-building-uploading#comment-34292423>`_
+  for more context on the motivation for this change.
+
 v36.0.1
 -------
 
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 24a017cfec..07aa564af4 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -57,7 +57,6 @@ def initialize_options(self):
         self.target_dir = None
 
     def finalize_options(self):
-        log.warn("Upload_docs command is deprecated. Use RTD instead.")
         upload.finalize_options(self)
         if self.upload_dir is None:
             if self.has_sphinx():
@@ -69,6 +68,8 @@ def finalize_options(self):
         else:
             self.ensure_dirname('upload_dir')
             self.target_dir = self.upload_dir
+        if 'pypi.python.org' in self.repository:
+            log.warn("Upload_docs command is deprecated. Use RTD instead.")
         self.announce('Using upload directory %s' % self.target_dir)
 
     def create_zipfile(self, filename):

From 10a3ceecfca9bea3155e6be6eada811192e0fa16 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 10 Jun 2017 14:49:09 -0700
Subject: [PATCH 6615/8469] Rename [wheel] section to [bdist_wheel] as the
 former is legacy

See:

https://bitbucket.org/pypa/wheel/src/54ddbcc9cec25e1f4d111a142b8bfaa163130a61/wheel/bdist_wheel.py?fileviewer=file-view-default#bdist_wheel.py-119:125

http://pythonwheels.com/
---
 setup.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b5199a625f..9facb308e9 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,8 +19,7 @@ repository = https://upload.pypi.org/legacy/
 [sdist]
 formats = zip
 
-[wheel]
+[bdist_wheel]
 universal = 1
 
 [bumpversion:file:setup.py]
-

From 925dd35ec77d4cfd79c899f34255e3a753f33ca5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:03:23 -0400
Subject: [PATCH 6616/8469] Avoid race condition in ensure_directory. Ref
 #1083.

---
 CHANGES.rst                 |  3 +++
 pkg_resources/__init__.py   |  5 +++--
 pkg_resources/py31compat.py | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkg_resources/py31compat.py

diff --git a/CHANGES.rst b/CHANGES.rst
index 35ee477658..1bae3f2587 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 v36.1.0
 -------
 
+* #1083: Avoid race condition on directory creation in
+  ``pkg_resources.ensure_directory``.
+
 * Removed deprecation of and restored support for
   ``upload_docs`` command for sites other than PyPI.
   Only warehouse is dropping support, but services like
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2ed07c3dfe..51b4749261 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -67,6 +67,7 @@
 except ImportError:
     importlib_machinery = None
 
+from . import py31compat
 from pkg_resources.extern import appdirs
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
@@ -74,6 +75,7 @@
 __import__('pkg_resources.extern.packaging.requirements')
 __import__('pkg_resources.extern.packaging.markers')
 
+
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")
 
@@ -2958,8 +2960,7 @@ def _find_adapter(registry, ob):
 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):
diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
new file mode 100644
index 0000000000..28120cac74
--- /dev/null
+++ b/pkg_resources/py31compat.py
@@ -0,0 +1,17 @@
+import os
+import errno
+import sys
+
+
+PY32 = sys.version_info >= (3, 2)
+
+
+def _makedirs_31(path, exist_ok=False):
+    try:
+        os.makedirs(path)
+    except OSError as exc:
+        if exc.errno != errno.EEXIST:
+            raise
+
+
+makedirs = os.makedirs if PY32 else _makedirs_31

From 902edffbbab6203a9b3d765485159208fa6e68c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:03:30 -0400
Subject: [PATCH 6617/8469] =?UTF-8?q?Bump=20version:=2036.0.1=20=E2=86=92?=
 =?UTF-8?q?=2036.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b5199a625f..10eed8456f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.0.1
+current_version = 36.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6eaac16ad5..c051fc1d22 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.0.1",
+    version="36.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 04a306fa080e8a71f94ea5198b507c501c621cb6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:13:54 -0400
Subject: [PATCH 6618/8469] Use makedirs with future compatibility throughout
 setuptools. Ref #1083.

---
 setuptools/command/easy_install.py | 5 ++---
 setuptools/sandbox.py              | 6 +++---
 setuptools/tests/files.py          | 6 ++++--
 setuptools/tests/test_manifest.py  | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index e319f77cab..8fba7b4115 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -59,7 +59,7 @@
     Distribution, PathMetadata, EggMetadata, WorkingSet, DistributionNotFound,
     VersionConflict, DEVELOP_DIST,
 )
-import pkg_resources
+import pkg_resources.py31compat
 
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
@@ -544,8 +544,7 @@ def check_pth_processing(self):
             if ok_exists:
                 os.unlink(ok_file)
             dirname = os.path.dirname(ok_file)
-            if not os.path.exists(dirname):
-                os.makedirs(dirname)
+            pkg_resources.py31compat.makedirs(dirname, exist_ok=True)
             f = open(pth_file, 'w')
         except (OSError, IOError):
             self.cant_write_to_target()
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index f99c13c400..1d981f497f 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -12,7 +12,7 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import builtins, map
 
-import pkg_resources
+import pkg_resources.py31compat
 
 if sys.platform.startswith('java'):
     import org.python.modules.posix.PosixModule as _os
@@ -26,6 +26,7 @@
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
+
 __all__ = [
     "AbstractSandbox", "DirectorySandbox", "SandboxViolation", "run_setup",
 ]
@@ -73,8 +74,7 @@ def override_temp(replacement):
     """
     Monkey-patch tempfile.tempdir with replacement, ensuring it exists
     """
-    if not os.path.isdir(replacement):
-        os.makedirs(replacement)
+    pkg_resources.py31compat.makedirs(replacement, exist_ok=True)
 
     saved = tempfile.tempdir
 
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index 4364241baa..98de9fc341 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -1,6 +1,9 @@
 import os
 
 
+import pkg_resources.py31compat
+
+
 def build_files(file_defs, prefix=""):
     """
     Build a set of files/directories, as described by the file_defs dictionary.
@@ -24,8 +27,7 @@ def build_files(file_defs, prefix=""):
     for name, contents in file_defs.items():
         full_name = os.path.join(prefix, name)
         if isinstance(contents, dict):
-            if not os.path.exists(full_name):
-                os.makedirs(full_name)
+            pkg_resources.py31compat.makedirs(full_name, exist_ok=True)
             build_files(contents, prefix=full_name)
         else:
             with open(full_name, 'w') as f:
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index ab9b3469ab..65eec7d93f 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -10,6 +10,7 @@
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
+import pkg_resources.py31compat
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
 from setuptools.extern import six
@@ -361,8 +362,7 @@ def make_files(self, files):
         for file in files:
             file = os.path.join(self.temp_dir, file)
             dirname, basename = os.path.split(file)
-            if not os.path.exists(dirname):
-                os.makedirs(dirname)
+            pkg_resources.py31compat.makedirs(dirname, exist_ok=True)
             open(file, 'w').close()
 
     def test_process_template_line(self):

From 2cd7f22eb62b413d65fe4208d66f7e2738f71a56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:16:51 -0400
Subject: [PATCH 6619/8469] Correctly honor exist_ok. Ref #1083.

---
 CHANGES.rst                 | 7 +++++++
 pkg_resources/py31compat.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1bae3f2587..487accd918 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.1.1
+-------
+
+* #1083: Correct ``py31compat.makedirs`` to correctly honor
+  ``exist_ok`` parameter.
+* #1083: Also use makedirs compatibility throughout setuptools.
+
 v36.1.0
 -------
 
diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index 28120cac74..c6217af75a 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -10,7 +10,7 @@ def _makedirs_31(path, exist_ok=False):
     try:
         os.makedirs(path)
     except OSError as exc:
-        if exc.errno != errno.EEXIST:
+        if not exist_ok or exc.errno != errno.EEXIST:
             raise
 
 

From dd622e26da86651bf1f0506452c2c55eb1eb8f4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:23:07 -0400
Subject: [PATCH 6620/8469] Use unicode_literals in bootstrap script

---
 bootstrap.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bootstrap.py b/bootstrap.py
index f3a12c0729..8c7d7fc3e6 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,6 +5,8 @@
 egg-info command to flesh out the egg-info directory.
 """
 
+from __future__ import unicode_literals
+
 import os
 import sys
 import textwrap

From 387d0e532272855d19aaed536ad0d3096eebfb87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 14:59:22 -0400
Subject: [PATCH 6621/8469] Restrict use of os.makedirs to those with the
 security patch introduced in Python 3.2.6, 3.3.5, and 3.4.1 per
 https://bugs.python.org/issue21082. Ref #1082.

---
 pkg_resources/py31compat.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index c6217af75a..f8875aaa65 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -3,9 +3,6 @@
 import sys
 
 
-PY32 = sys.version_info >= (3, 2)
-
-
 def _makedirs_31(path, exist_ok=False):
     try:
         os.makedirs(path)
@@ -14,4 +11,12 @@ def _makedirs_31(path, exist_ok=False):
             raise
 
 
-makedirs = os.makedirs if PY32 else _makedirs_31
+# 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, 6) or
+    (3, 3) <= sys.version_info <= (3, 3, 5) or
+    (3, 4) <= sys.version_info <= (3, 4, 1)
+)
+makedirs = os.makedirs if needs_makedirs else _makedirs_31

From b39dcbd12164cdd682aea2d39e298fe968dcf38e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 15:03:23 -0400
Subject: [PATCH 6622/8469] Correct bounds and boolean selector.

---
 pkg_resources/py31compat.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index f8875aaa65..1e73ee3eb7 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -15,8 +15,8 @@ def _makedirs_31(path, exist_ok=False):
 #  and exists_ok considerations are disentangled.
 # See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
 needs_makedirs = (
-    sys.version_info <= (3, 2, 6) or
-    (3, 3) <= sys.version_info <= (3, 3, 5) or
-    (3, 4) <= sys.version_info <= (3, 4, 1)
+    sys.version_info < (3, 2, 6) or
+    (3, 3) <= sys.version_info < (3, 3, 5) or
+    (3, 4) <= sys.version_info < (3, 4, 1)
 )
-makedirs = os.makedirs if needs_makedirs else _makedirs_31
+makedirs = _makedirs_31 if needs_makedirs else os.makedirs

From 7ef1a45b7eea578022a509a3ddca0c6ea8b97b27 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 15:09:41 -0400
Subject: [PATCH 6623/8469] Confusingly, the issue was fixed in a larger point
 release on Python 3.3 than on Python 3.2.

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

diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index 1e73ee3eb7..331a51bb0f 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -15,8 +15,8 @@ def _makedirs_31(path, exist_ok=False):
 #  and exists_ok considerations are disentangled.
 # See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
 needs_makedirs = (
-    sys.version_info < (3, 2, 6) or
-    (3, 3) <= sys.version_info < (3, 3, 5) or
+    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

From f8899569a5433f5d9027c294686a8b62215975c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 15:12:58 -0400
Subject: [PATCH 6624/8469] =?UTF-8?q?Bump=20version:=2036.1.0=20=E2=86=92?=
 =?UTF-8?q?=2036.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 10eed8456f..9046b41b0d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.1.0
+current_version = 36.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c051fc1d22..42a4c069c2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.1.0",
+    version="36.1.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 443e48d824c0dfd114dd6e92dc827159b2d5da52 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 15 Jun 2017 08:23:57 +0200
Subject: [PATCH 6625/8469] tox: add xpassed tests to the report

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index c3ea462b89..98005fa2a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,5 +7,5 @@
 [testenv]
 deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=py.test {posargs:-rsx}
+commands=py.test {posargs:-rsxX}
 usedevelop=True

From aa43b11bff2450296da9c41e705d03b5c28bf5bf Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 15 Jun 2017 08:49:55 +0200
Subject: [PATCH 6626/8469] tests: move py.test report arguments to pytest.ini

So it's possible to run tox with something like:
`py.test -k test_unicode_filename_in_sdist`, and
not loose the default report arguments.
---
 pytest.ini | 2 +-
 tox.ini    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 11a213db2b..16fdc5af87 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py -rsxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
diff --git a/tox.ini b/tox.ini
index 98005fa2a4..4b4b4fd8ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,5 +7,5 @@
 [testenv]
 deps=-rtests/requirements.txt
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=py.test {posargs:-rsxX}
+commands=py.test {posargs}
 usedevelop=True

From e992c1ae2eba0638f5d463da78acf476ec2c04f8 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 15 Jun 2017 09:45:36 +0200
Subject: [PATCH 6627/8469] tests: fix `fail_on_ascii` fixture

In my environment, with:

- LANGUAGE=en_US:en_GB:en:C
- LC_ALL=en_US.UTF-8

Running the testsuite with:

- python3.6 -m pytest: is successful
- tox -e py36: fails

The later because LC_ALL is unset by tox, and LANGUAGE is not passed
through, so `locale.getpreferredencoding()` returns 'ANSI_X3.4-1968'.
---
 setuptools/tests/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index dbf1620108..8ae4402dde 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,4 +1,5 @@
 """Tests for the 'setuptools' package"""
+import locale
 import sys
 import os
 import distutils.core
@@ -16,8 +17,7 @@
 from setuptools import Feature
 from setuptools.depends import Require
 
-c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL"))
-is_ascii = c_type in ("C", "POSIX")
+is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
 
 

From 462610859692843e3bb6162befe978f14244eada Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 15 Jun 2017 10:03:16 +0200
Subject: [PATCH 6628/8469] tests: mark test_unicode_filename_in_sdist with
 fail_on_ascii

---
 setuptools/tests/test_easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2d9682a965..1b7178a11a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -30,6 +30,7 @@
 from pkg_resources import normalize_path, working_set
 from pkg_resources import Distribution as PRDistribution
 import setuptools.tests.server
+from setuptools.tests import fail_on_ascii
 import pkg_resources
 
 from .py26compat import tarfile_open
@@ -166,6 +167,7 @@ def sdist_unicode(self, tmpdir):
         sdist_zip.close()
         return str(sdist)
 
+    @fail_on_ascii
     def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if

From 100b73452e6e5e3b60ce8d0887e39f9af1d10899 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 15 Jun 2017 12:09:27 +0200
Subject: [PATCH 6629/8469] travis: fix ASCII builds

Setting LC_ALL/LC_CTYPE=C does not work since LANG=en_US.UTF-8.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d6333f871..330e25a85d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,9 @@ python:
 matrix:
   include:
   - python: 3.6
-    env: LC_ALL=C LC_CTYPE=C
+    env: LANG=C
   - python: 2.7
-    env: LC_ALL=C LC_CTYPE=C
+    env: LANG=C
 script:
  # need tox to get started
  - pip install tox

From 410317331922f1450322db993a1bc86de6ffbee1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 15:21:59 -0400
Subject: [PATCH 6630/8469] Add comment explaining additional needs for this
 test.

---
 clean_install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/clean_install.sh b/clean_install.sh
index 28860f472e..f8f80dc7c1 100755
--- a/clean_install.sh
+++ b/clean_install.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+# This test was created in
+# https://github.com/pypa/setuptools/pull/1050
+# but it really should be incorporated into the test suite
+# such that it runs on Windows and doesn't depend on
+# virtualenv. Moving to test_integration will likely address
+# those concerns.
+
 set -o errexit
 set -o xtrace
 

From cf3e1b296a8d7cea519ef07b041c30ec891f9f18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 15:22:37 -0400
Subject: [PATCH 6631/8469] Move clean install test to tests dir.

---
 .travis.yml                                | 2 +-
 clean_install.sh => tests/clean_install.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename clean_install.sh => tests/clean_install.sh (100%)

diff --git a/.travis.yml b/.travis.yml
index 6c72e7311a..4a9a861f39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ script:
  - tox
 
  # Check that setuptools can be installed in a clean environment
- - ./clean_install.sh
+ - tests/clean_install.sh
 
 deploy:
   provider: pypi
diff --git a/clean_install.sh b/tests/clean_install.sh
similarity index 100%
rename from clean_install.sh
rename to tests/clean_install.sh

From 050808db513e54c12190d64d5ba0a1f6e8ad9590 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 10 Jul 2017 02:54:29 +0200
Subject: [PATCH 6632/8469] fix handling of environment markers in
 `install_requires`

---
 setuptools/dist.py                | 34 ++++++++++++++++++++++++++++++-
 setuptools/tests/test_egg_info.py | 15 +++++++++-----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6b97ed33c5..cb887ea612 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -8,6 +8,7 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
+from collections import defaultdict
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 from distutils.util import rfc822_escape
@@ -134,7 +135,13 @@ def check_extras(dist, attr, value):
                 k, m = k.split(':', 1)
                 if pkg_resources.invalid_marker(m):
                     raise DistutilsSetupError("Invalid environment marker: " + m)
-            list(pkg_resources.parse_requirements(v))
+            for r in pkg_resources.parse_requirements(v):
+                if r.marker:
+                    tmpl = (
+                        "'extras_require' requirements cannot include "
+                        "environment markers, in {section!r}: '{req!s}'"
+                    )
+                    raise DistutilsSetupError(tmpl.format(section=k, req=r))
     except (TypeError, ValueError, AttributeError):
         raise DistutilsSetupError(
             "'extras_require' must be a dictionary whose values are "
@@ -346,6 +353,31 @@ def __init__(self, attrs=None):
                 )
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
+        self._finalize_requires()
+
+    def _finalize_requires(self):
+        """Move requirements in `install_requires` that
+        are using environment markers to `extras_require`.
+        """
+        if not self.install_requires:
+            return
+        extras_require = defaultdict(list, (
+            (k, list(pkg_resources.parse_requirements(v)))
+            for k, v in (self.extras_require or {}).items()
+        ))
+        install_requires = []
+        for r in pkg_resources.parse_requirements(self.install_requires):
+            marker = r.marker
+            if not marker:
+                install_requires.append(r)
+                continue
+            r.marker = None
+            extras_require[':'+str(marker)].append(r)
+        self.extras_require = dict(
+            (k, [str(r) for r in v])
+            for k, v in extras_require.items()
+        )
+        self.install_requires = [str(r) for r in install_requires]
 
     def parse_config_files(self, filenames=None):
         """Parses configuration files from various levels
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a32b981d67..55df448974 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -185,8 +185,12 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
         self._run_install_command(tmpdir_cwd, env)
         egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        assert "barbazquux;python_version<'2'" in open(
-            requires_txt).read().split('\n')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        assert install_requires.lstrip() == DALS('''
+                                                 [:python_version < "2"]
+                                                 barbazquux
+                                                 ''')
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):
@@ -202,10 +206,11 @@ def test_tests_require_with_markers(self, tmpdir_cwd, env):
             tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    def test_extra_requires_with_markers(self, tmpdir_cwd, env):
+    def test_extras_require_with_markers(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
-            """extra_requires={":python_version<'2'": ["barbazquux"]},""")
-        self._run_install_command(tmpdir_cwd, env)
+            """extras_require={"extra": ["barbazquux; python_version<'2'"]},""")
+        with pytest.raises(AssertionError):
+            self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_python_requires_egg_info(self, tmpdir_cwd, env):

From 01d7c86c402253c306131e4891f47ff1266c9563 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 4 Jun 2017 00:59:33 +0300
Subject: [PATCH 6633/8469] Run build stages (pipelines) in Travis CI config

Also:
* enable pip cache
* split script into install+script steps
---
 .travis.yml | 73 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 448d63125d..b3fccb9085 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,45 @@
 language: python
-python:
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
-  - nightly
-  - pypy
-matrix:
+jobs:
+  fast_finish: true
   include:
-  - python: 3.6
+  - python: 2.6
+  - python: &latest_py2 2.7
+  - python: 3.3
+  - python: 3.4
+  - python: 3.5
+  - python: &latest_py3 3.6
+  - python: nightly
+  - python: pypy
+  - python: *latest_py3
     env: LANG=C
-  - python: 2.7
+  - python: *latest_py2
     env: LANG=C
-script:
- # need tox to get started
- - pip install tox
+  - stage: deploy (does actual deploy to PYPI only for tagged commits)
+    python: *latest_py3
+    deploy:
+      provider: pypi
+      on:
+        tags: true
+        all_branches: true
+      user: jaraco
+      password:
+        secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
+      distributions: release
+      skip_upload_docs: true
 
- # Output the env, to verify behavior
- - env
+cache: pip
 
- # update egg_info based on setup.py in checkout
- - python bootstrap.py
+install:
+# need tox to get started
+- pip install tox
 
- #- python -m tox
- - tox
+# Output the env, to verify behavior
+- env
 
- # Check that setuptools can be installed in a clean environment
- - tests/clean_install.sh
+# update egg_info based on setup.py in checkout
+- python bootstrap.py
 
-deploy:
-  provider: pypi
-  # Also update server in setup.cfg
-  server: https://upload.pypi.org/legacy/
-  on:
-    tags: true
-    all_branches: true
-    python: 3.6
-    condition: $LC_ALL != "C"
-  user: jaraco
-  password:
-    secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
-  distributions: release
-  skip_upload_docs: true
+# Check that setuptools can be installed in a clean environment
+- tests/clean_install.sh
+
+script: tox

From ef5295f2e80c506c3355a7247047139e8f7b7365 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 4 Jun 2017 11:20:32 +0300
Subject: [PATCH 6634/8469] Don't run tests in deploy-only job

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b3fccb9085..bb09ad8e2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ jobs:
     env: LANG=C
   - stage: deploy (does actual deploy to PYPI only for tagged commits)
     python: *latest_py3
+    install: skip
+    script: skip
     deploy:
       provider: pypi
       on:

From 45d662b916b515d9c88db7a6cd53f3186530d56a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 14 Jul 2017 02:40:09 +0300
Subject: [PATCH 6635/8469] Explicitly ask Travis to use containers for jobs

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bb09ad8e2f..08834232d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: python
 jobs:
   fast_finish: true

From e82eadd1ff76b9aa3d5a8e472f48c054a296d8fe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 20:58:19 -0400
Subject: [PATCH 6636/8469] Restore test that includes an environment marker.

---
 setuptools/tests/test_egg_info.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 55df448974..51648fff6d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -207,6 +207,12 @@ def test_tests_require_with_markers(self, tmpdir_cwd, env):
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """extras_require={":python_version<'2'": ["barbazquux"]},""")
+        self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extras_require_with_markers_in_req(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """extras_require={"extra": ["barbazquux; python_version<'2'"]},""")
         with pytest.raises(AssertionError):

From 44233b1b8cecc77001dec43a2d86e6955d529f82 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:17:58 -0400
Subject: [PATCH 6637/8469] Extract the creation of the mismatch marker.

---
 setuptools/tests/test_egg_info.py | 34 +++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 51648fff6d..1376075c95 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -179,45 +179,53 @@ def _setup_script_with_requires(self, requires_line):
             'setup.py': setup_script,
         })
 
+    mismatch_marker = "python_version<'{this_ver}'".format(
+        this_ver=sys.version_info[0],
+    )
+
     def test_install_requires_with_markers(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """install_requires=["barbazquux;python_version<'2'"],""")
+        tmpl = 'install_requires=["barbazquux;{marker}"],'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
         self._run_install_command(tmpdir_cwd, env)
         egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         with open(requires_txt) as fp:
             install_requires = fp.read()
         assert install_requires.lstrip() == DALS('''
-                                                 [:python_version < "2"]
+                                                 [:python_version < "{sys.version_info[0]}"]
                                                  barbazquux
-                                                 ''')
+                                                 ''').format(sys=sys)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """setup_requires=["barbazquux;python_version<'2'"],""")
+        tmpl = 'setup_requires=["barbazquux;{marker}"],'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
         self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_tests_require_with_markers(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """tests_require=["barbazquux;python_version<'2'"],""")
+        tmpl = 'tests_require=["barbazquux;{marker}"],'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
         self._run_install_command(
             tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_markers(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """extras_require={":python_version<'2'": ["barbazquux"]},""")
+        tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
         self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_markers_in_req(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """extras_require={"extra": ["barbazquux; python_version<'2'"]},""")
+        tmpl = 'extras_require={{"extra": ["barbazquux; {marker}"]}},'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
             self._run_install_command(tmpdir_cwd, env)
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(

From 295dbf3043da95165683991d71c187c875daa600 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:20:02 -0400
Subject: [PATCH 6638/8469] extract variable for expected_requires.

---
 setuptools/tests/test_egg_info.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1376075c95..6358abf050 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -192,10 +192,11 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         with open(requires_txt) as fp:
             install_requires = fp.read()
-        assert install_requires.lstrip() == DALS('''
-                                                 [:python_version < "{sys.version_info[0]}"]
-                                                 barbazquux
-                                                 ''').format(sys=sys)
+        expected_requires = DALS('''
+             [:python_version < "{sys.version_info[0]}"]
+             barbazquux
+             ''').format(sys=sys)
+        assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):

From 3cf29ecb38271ae0512273d561adebd03df023b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:27:43 -0400
Subject: [PATCH 6639/8469] Extract _check_extra function

---
 setuptools/dist.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index cb887ea612..c7f6d37134 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -8,6 +8,7 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
+import itertools
 from collections import defaultdict
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
@@ -130,7 +131,16 @@ def check_nsp(dist, attr, value):
 def check_extras(dist, attr, value):
     """Verify that extras_require mapping is valid"""
     try:
-        for k, v in value.items():
+        list(itertools.starmap(_check_extra, value.items()))
+    except (TypeError, ValueError, AttributeError):
+        raise DistutilsSetupError(
+            "'extras_require' must be a dictionary whose values are "
+            "strings or lists of strings containing valid project/version "
+            "requirement specifiers."
+        )
+
+
+def _check_extra(k, v):
             if ':' in k:
                 k, m = k.split(':', 1)
                 if pkg_resources.invalid_marker(m):
@@ -142,12 +152,6 @@ def check_extras(dist, attr, value):
                         "environment markers, in {section!r}: '{req!s}'"
                     )
                     raise DistutilsSetupError(tmpl.format(section=k, req=r))
-    except (TypeError, ValueError, AttributeError):
-        raise DistutilsSetupError(
-            "'extras_require' must be a dictionary whose values are "
-            "strings or lists of strings containing valid project/version "
-            "requirement specifiers."
-        )
 
 
 def assert_bool(dist, attr, value):

From 8c00a37662c6f2ff3814d75d5569c02f83e411a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:28:13 -0400
Subject: [PATCH 6640/8469] Reindent

---
 setuptools/dist.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c7f6d37134..1a475ed0d3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -141,17 +141,18 @@ def check_extras(dist, attr, value):
 
 
 def _check_extra(k, v):
-            if ':' in k:
-                k, m = k.split(':', 1)
-                if pkg_resources.invalid_marker(m):
-                    raise DistutilsSetupError("Invalid environment marker: " + m)
-            for r in pkg_resources.parse_requirements(v):
-                if r.marker:
-                    tmpl = (
-                        "'extras_require' requirements cannot include "
-                        "environment markers, in {section!r}: '{req!s}'"
-                    )
-                    raise DistutilsSetupError(tmpl.format(section=k, req=r))
+    if ':' in k:
+        k, m = k.split(':', 1)
+        if pkg_resources.invalid_marker(m):
+            raise DistutilsSetupError("Invalid environment marker: " + m)
+
+    for r in pkg_resources.parse_requirements(v):
+        if r.marker:
+            tmpl = (
+                "'extras_require' requirements cannot include "
+                "environment markers, in {section!r}: '{req!s}'"
+            )
+            raise DistutilsSetupError(tmpl.format(section=k, req=r))
 
 
 def assert_bool(dist, attr, value):

From dfe339ec3b1c2d0f463ed39f86c34c01ff8faedc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:31:31 -0400
Subject: [PATCH 6641/8469] Use better variable names and the partition method
 for simplicity.

---
 setuptools/dist.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1a475ed0d3..5adbfd4e0f 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -140,19 +140,18 @@ def check_extras(dist, attr, value):
         )
 
 
-def _check_extra(k, v):
-    if ':' in k:
-        k, m = k.split(':', 1)
-        if pkg_resources.invalid_marker(m):
-            raise DistutilsSetupError("Invalid environment marker: " + m)
+def _check_extra(extra, reqs):
+    name, sep, marker = extra.partition(':')
+    if marker and pkg_resources.invalid_marker(marker):
+        raise DistutilsSetupError("Invalid environment marker: " + marker)
 
-    for r in pkg_resources.parse_requirements(v):
+    for r in pkg_resources.parse_requirements(reqs):
         if r.marker:
             tmpl = (
                 "'extras_require' requirements cannot include "
                 "environment markers, in {section!r}: '{req!s}'"
             )
-            raise DistutilsSetupError(tmpl.format(section=k, req=r))
+            raise DistutilsSetupError(tmpl.format(section=name, req=r))
 
 
 def assert_bool(dist, attr, value):

From 1bbb027f369fb7dbf58a939bca57a9c8e9ecf8c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:43:49 -0400
Subject: [PATCH 6642/8469] Use filter and next to directly extract a single
 failure.

---
 setuptools/dist.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 5adbfd4e0f..619318f39c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -9,13 +9,14 @@
 import distutils.cmd
 import distutils.dist
 import itertools
+import operator
 from collections import defaultdict
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 from distutils.util import rfc822_escape
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import map
+from setuptools.extern.six.moves import map, filter
 from pkg_resources.extern import packaging
 
 __import__('pkg_resources.extern.packaging.specifiers')
@@ -145,13 +146,16 @@ def _check_extra(extra, reqs):
     if marker and pkg_resources.invalid_marker(marker):
         raise DistutilsSetupError("Invalid environment marker: " + marker)
 
-    for r in pkg_resources.parse_requirements(reqs):
-        if r.marker:
-            tmpl = (
-                "'extras_require' requirements cannot include "
-                "environment markers, in {section!r}: '{req!s}'"
-            )
-            raise DistutilsSetupError(tmpl.format(section=name, req=r))
+    # extras requirements cannot themselves have markers
+    parsed = pkg_resources.parse_requirements(reqs)
+    marked_reqs = filter(operator.attrgetter('marker'), parsed)
+    bad_req = next(marked_reqs, None)
+    if bad_req:
+        tmpl = (
+            "'extras_require' requirements cannot include "
+            "environment markers, in {name!r}: '{bad_req!s}'"
+        )
+        raise DistutilsSetupError(tmpl.format(**locals()))
 
 
 def assert_bool(dist, attr, value):

From 986a8bce395c1a5b9e41a547d02eb09dd432e93e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:51:56 -0400
Subject: [PATCH 6643/8469] Delint

---
 setuptools/dist.py | 51 ++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 619318f39c..68c8747a76 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -11,17 +11,15 @@
 import itertools
 import operator
 from collections import defaultdict
-from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
-    DistutilsSetupError)
+from distutils.errors import (
+    DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
+)
 from distutils.util import rfc822_escape
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map, filter
 from pkg_resources.extern import packaging
 
-__import__('pkg_resources.extern.packaging.specifiers')
-__import__('pkg_resources.extern.packaging.version')
-
 from setuptools.depends import Require
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
@@ -29,6 +27,9 @@
 import pkg_resources
 from .py36compat import Distribution_parse_config_files
 
+__import__('pkg_resources.extern.packaging.specifiers')
+__import__('pkg_resources.extern.packaging.version')
+
 
 def _get_unpatched(cls):
     warnings.warn("Do not call this function", DeprecationWarning)
@@ -364,7 +365,8 @@ def __init__(self, attrs=None):
         self._finalize_requires()
 
     def _finalize_requires(self):
-        """Move requirements in `install_requires` that
+        """
+        Move requirements in `install_requires` that
         are using environment markers to `extras_require`.
         """
         if not self.install_requires:
@@ -380,7 +382,7 @@ def _finalize_requires(self):
                 install_requires.append(r)
                 continue
             r.marker = None
-            extras_require[':'+str(marker)].append(r)
+            extras_require[':' + str(marker)].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in v])
             for k, v in extras_require.items()
@@ -432,7 +434,10 @@ def finalize_options(self):
                 ep.load()(self, ep.name, value)
         if getattr(self, 'convert_2to3_doctests', None):
             # XXX may convert to set here when we can rely on set being builtin
-            self.convert_2to3_doctests = [os.path.abspath(p) for p in self.convert_2to3_doctests]
+            self.convert_2to3_doctests = [
+                os.path.abspath(p)
+                for p in self.convert_2to3_doctests
+            ]
         else:
             self.convert_2to3_doctests = []
 
@@ -476,7 +481,8 @@ def fetch_build_egg(self, req):
                 opts['find_links'] = ('setup', links)
             install_dir = self.get_egg_cache_dir()
             cmd = easy_install(
-                dist, args=["x"], install_dir=install_dir, exclude_scripts=True,
+                dist, args=["x"], install_dir=install_dir,
+                exclude_scripts=True,
                 always_copy=False, build_directory=None, editable=False,
                 upgrade=False, multi_version=True, no_report=True, user=False
             )
@@ -501,8 +507,11 @@ def _set_global_opts_from_features(self):
                 if not feature.include_by_default():
                     excdef, incdef = incdef, excdef
 
-                go.append(('with-' + name, None, 'include ' + descr + incdef))
-                go.append(('without-' + name, None, 'exclude ' + descr + excdef))
+                new = (
+                    ('with-' + name, None, 'include ' + descr + incdef),
+                    ('without-' + name, None, 'exclude ' + descr + excdef),
+                )
+                go.extend(new)
                 no['without-' + name] = 'with-' + name
 
         self.global_options = self.feature_options = go + self.global_options
@@ -530,7 +539,8 @@ def get_command_class(self, command):
         if command in self.cmdclass:
             return self.cmdclass[command]
 
-        for ep in pkg_resources.iter_entry_points('distutils.commands', command):
+        eps = pkg_resources.iter_entry_points('distutils.commands', command)
+        for ep in eps:
             ep.require(installer=self.fetch_build_egg)
             self.cmdclass[command] = cmdclass = ep.load()
             return cmdclass
@@ -664,7 +674,8 @@ def _include_misc(self, name, value):
                 name + ": this setting cannot be changed via include/exclude"
             )
         else:
-            setattr(self, name, old + [item for item in value if item not in old])
+            new = [item for item in value if item not in old]
+            setattr(self, name, old + new)
 
     def exclude(self, **attrs):
         """Remove items from distribution that are named in keyword arguments
@@ -875,14 +886,14 @@ class Feature:
 
     @staticmethod
     def warn_deprecated():
-        warnings.warn(
+        msg = (
             "Features are deprecated and will be removed in a future "
-                "version. See https://github.com/pypa/setuptools/issues/65.",
-            DeprecationWarning,
-            stacklevel=3,
+            "version. See https://github.com/pypa/setuptools/issues/65."
         )
+        warnings.warn(msg, DeprecationWarning, stacklevel=3)
 
-    def __init__(self, description, standard=False, available=True,
+    def __init__(
+            self, description, standard=False, available=True,
             optional=True, require_features=(), remove=(), **extras):
         self.warn_deprecated()
 
@@ -907,8 +918,8 @@ def __init__(self, description, standard=False, available=True,
 
         if not remove and not require_features and not extras:
             raise DistutilsSetupError(
-                "Feature %s: must define 'require_features', 'remove', or at least one"
-                " of 'packages', 'py_modules', etc."
+                "Feature %s: must define 'require_features', 'remove', or "
+                "at least one of 'packages', 'py_modules', etc."
             )
 
     def include_by_default(self):

From 8318b01c30c254da014099bba145db90fd7e42f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 21:53:40 -0400
Subject: [PATCH 6644/8469] Update changelog. Ref #1081.

---
 CHANGES.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 08af86a610..0a5b748110 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v36.2.0
+-------
+
+* #1081: Environment markers indicated in ``install_requires``
+  are now processed and treated as nameless ``extras_require``
+  with markers, allowing their metadata in requires.txt to be
+  correctly generated.
+
 v36.1.1
 -------
 

From 92b33a5d27858e1a3b2752707b0a9fea28424efc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 22:09:44 -0400
Subject: [PATCH 6645/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0a5b748110..02ec2f74b2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,11 @@ v36.2.0
   with markers, allowing their metadata in requires.txt to be
   correctly generated.
 
+* #1053: Tagged commits are now released using Travis-CI
+  build stages, meaning releases depend on passing tests on
+  all supported Python versions (Linux) and not just the latest
+  Python version.
+
 v36.1.1
 -------
 

From 7257263ba6568ae2868a0eb96f4e36917fb607b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 22:10:08 -0400
Subject: [PATCH 6646/8469] Delint

---
 setuptools/tests/test_egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 6358abf050..07bd88181e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -64,7 +64,7 @@ def env(self):
             yield env
 
     dict_order_fails = pytest.mark.skipif(
-        sys.version_info < (2,7),
+        sys.version_info < (2, 7),
         reason="Intermittent failures on Python 2.6",
     )
 

From 9f001330499f93bc847fce9281abb9425491d538 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 22:12:02 -0400
Subject: [PATCH 6647/8469] =?UTF-8?q?Bump=20version:=2036.1.1=20=E2=86=92?=
 =?UTF-8?q?=2036.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 9046b41b0d..416f654366 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.1.1
+current_version = 36.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 42a4c069c2..b3f5a7d9b3 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.1.1",
+    version="36.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 1eec02038d28506a42bc45d14ef2d54b136cc8bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Jul 2017 23:02:26 -0400
Subject: [PATCH 6648/8469] Invoke bootstrap prior to cutting release. Fixes
 #1084.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 08834232d5..cbf49da658 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ jobs:
     python: *latest_py3
     install: skip
     script: skip
+    before_deploy: python bootstrap.py
     deploy:
       provider: pypi
       on:

From bf20d881df662da30d94687efb2ff3d3ba32f55a Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 14 Jul 2017 08:49:23 +0200
Subject: [PATCH 6649/8469] tests: switch back to mock instead of
 backports.unittest_mock

---
 pkg_resources/tests/test_markers.py   | 2 +-
 setuptools/tests/test_build_clib.py   | 2 +-
 setuptools/tests/test_easy_install.py | 2 +-
 setuptools/tests/test_msvc.py         | 2 +-
 tests/requirements.txt                | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 9306d5b348..15a3b499a6 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,4 +1,4 @@
-from unittest import mock
+import mock
 
 from pkg_resources import evaluate_marker
 
diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py
index 7e3d1de9d4..aebcc350ec 100644
--- a/setuptools/tests/test_build_clib.py
+++ b/setuptools/tests/test_build_clib.py
@@ -2,7 +2,7 @@
 import os
 import shutil
 
-from unittest import mock
+import mock
 from distutils.errors import DistutilsSetupError
 from setuptools.command.build_clib import build_clib
 from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1b7178a11a..26cdd90d5d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,7 +14,7 @@
 import distutils.errors
 import io
 import zipfile
-from unittest import mock
+import mock
 
 import time
 from setuptools.extern.six.moves import urllib
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index fbeed1d5c5..32d7a907cf 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -5,7 +5,7 @@
 import os
 import contextlib
 import distutils.errors
-from unittest import mock
+import mock
 
 import pytest
 
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 6e2e78e2a7..ddba6cc874 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,3 @@
+mock
 pytest-flake8
 pytest>=3.0.2
-# pinned to 1.2 as temporary workaround for #1038
-backports.unittest_mock>=1.2,<1.3

From 95386da92ec1725a09c5cd8e457be5ff3dc15a3e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 14 Jul 2017 08:58:14 +0200
Subject: [PATCH 6650/8469] tests: rework clean install test

Use pytest-virtualenv so the test can be run no Windows too.
---
 .travis.yml                         |  3 ---
 setuptools/tests/test_virtualenv.py | 31 +++++++++++++++++++++++++++++
 tests/clean_install.sh              | 27 -------------------------
 tests/requirements.txt              |  3 +++
 4 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 setuptools/tests/test_virtualenv.py
 delete mode 100755 tests/clean_install.sh

diff --git a/.travis.yml b/.travis.yml
index cbf49da658..b207a8d2f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,4 @@ install:
 # update egg_info based on setup.py in checkout
 - python bootstrap.py
 
-# Check that setuptools can be installed in a clean environment
-- tests/clean_install.sh
-
 script: tox
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
new file mode 100644
index 0000000000..eb8db7a66b
--- /dev/null
+++ b/setuptools/tests/test_virtualenv.py
@@ -0,0 +1,31 @@
+import os
+
+from pytest import yield_fixture
+from pytest_fixture_config import yield_requires_config
+
+import pytest_virtualenv
+
+
+@yield_requires_config(pytest_virtualenv.CONFIG, ['virtualenv_executable'])
+@yield_fixture(scope='function')
+def bare_virtualenv():
+    """ Bare virtualenv (no pip/setuptools/wheel).
+    """
+    with pytest_virtualenv.VirtualEnv(args=(
+        '--no-wheel',
+        '--no-pip',
+        '--no-setuptools',
+    )) as venv:
+        yield venv
+
+
+SOURCE_DIR = os.path.join(os.path.dirname(__file__), '../..')
+
+def test_clean_env_install(bare_virtualenv):
+    """
+    Check setuptools can be installed in a clean environment.
+    """
+    bare_virtualenv.run(' && '.join((
+        'cd {source}',
+        'python setup.py install',
+    )).format(source=SOURCE_DIR))
diff --git a/tests/clean_install.sh b/tests/clean_install.sh
deleted file mode 100755
index f8f80dc7c1..0000000000
--- a/tests/clean_install.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# This test was created in
-# https://github.com/pypa/setuptools/pull/1050
-# but it really should be incorporated into the test suite
-# such that it runs on Windows and doesn't depend on
-# virtualenv. Moving to test_integration will likely address
-# those concerns.
-
-set -o errexit
-set -o xtrace
-
-# Create a temporary directory to install the virtualenv in
-VENV_DIR="$(mktemp -d)"
-function cleanup() {
-  rm -rf "$VENV_DIR"
-}
-trap cleanup EXIT
-
-# Create a virtualenv that doesn't have pip or setuptools installed
-wget https://raw.githubusercontent.com/pypa/virtualenv/master/virtualenv.py
-python virtualenv.py --no-wheel --no-pip --no-setuptools "$VENV_DIR"
-source "$VENV_DIR/bin/activate"
-
-# Now try to install setuptools
-python bootstrap.py
-python setup.py install
diff --git a/tests/requirements.txt b/tests/requirements.txt
index ddba6cc874..0c4df8ef8f 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,6 @@
+importlib; python_version<"2.7"
 mock
 pytest-flake8
+pytest-virtualenv>=1.2.7
 pytest>=3.0.2
+virtualenv

From 7c2df64c8558ac71c20d86d3cb2a05daad99cc87 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 14 Jul 2017 05:44:35 +0200
Subject: [PATCH 6651/8469] fix possible error when finalizing
 `install_requires`

---
 setuptools/dist.py                  |  5 +++--
 setuptools/tests/test_virtualenv.py | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 68c8747a76..1bd89ddd51 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -369,11 +369,12 @@ def _finalize_requires(self):
         Move requirements in `install_requires` that
         are using environment markers to `extras_require`.
         """
-        if not self.install_requires:
+        if not getattr(self, 'install_requires', None):
             return
+        extras_require = getattr(self, 'extras_require', None)
         extras_require = defaultdict(list, (
             (k, list(pkg_resources.parse_requirements(v)))
-            for k, v in (self.extras_require or {}).items()
+            for k, v in (extras_require or {}).items()
         ))
         install_requires = []
         for r in pkg_resources.parse_requirements(self.install_requires):
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index eb8db7a66b..a7f485a49f 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,3 +1,4 @@
+import glob
 import os
 
 from pytest import yield_fixture
@@ -29,3 +30,21 @@ def test_clean_env_install(bare_virtualenv):
         'cd {source}',
         'python setup.py install',
     )).format(source=SOURCE_DIR))
+
+def test_pip_upgrade_from_source(virtualenv):
+    """
+    Check pip can upgrade setuptools from source.
+    """
+    dist_dir = virtualenv.workspace
+    # Generate source distribution / wheel.
+    virtualenv.run(' && '.join((
+        'cd {source}',
+        'python setup.py -q sdist -d {dist}',
+        'python setup.py -q bdist_wheel -d {dist}',
+    )).format(source=SOURCE_DIR, dist=dist_dir))
+    sdist = glob.glob(os.path.join(dist_dir, '*.zip'))[0]
+    wheel = glob.glob(os.path.join(dist_dir, '*.whl'))[0]
+    # Then update from wheel.
+    virtualenv.run('pip install ' + wheel)
+    # And finally try to upgrade from source.
+    virtualenv.run('pip install --no-cache-dir --upgrade ' + sdist)

From 2328be3cc556076b91c8ec74da7b85b178dbc574 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 15 Jul 2017 03:32:57 +0200
Subject: [PATCH 6652/8469] fix `extras_require` handling

Allow requirements of the form `"extra": ["barbazquux; {marker}"]`
by internally converting them to `"extra:{marker}": ["barbazquux"]`.
---
 setuptools/dist.py                | 46 +++++++++++++++---------------
 setuptools/tests/test_egg_info.py | 47 ++++++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1bd89ddd51..d77d56b12d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -9,7 +9,6 @@
 import distutils.cmd
 import distutils.dist
 import itertools
-import operator
 from collections import defaultdict
 from distutils.errors import (
     DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
@@ -17,7 +16,7 @@
 from distutils.util import rfc822_escape
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter
+from setuptools.extern.six.moves import map
 from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
@@ -146,17 +145,7 @@ def _check_extra(extra, reqs):
     name, sep, marker = extra.partition(':')
     if marker and pkg_resources.invalid_marker(marker):
         raise DistutilsSetupError("Invalid environment marker: " + marker)
-
-    # extras requirements cannot themselves have markers
-    parsed = pkg_resources.parse_requirements(reqs)
-    marked_reqs = filter(operator.attrgetter('marker'), parsed)
-    bad_req = next(marked_reqs, None)
-    if bad_req:
-        tmpl = (
-            "'extras_require' requirements cannot include "
-            "environment markers, in {name!r}: '{bad_req!s}'"
-        )
-        raise DistutilsSetupError(tmpl.format(**locals()))
+    list(pkg_resources.parse_requirements(reqs))
 
 
 def assert_bool(dist, attr, value):
@@ -366,18 +355,29 @@ def __init__(self, attrs=None):
 
     def _finalize_requires(self):
         """
-        Move requirements in `install_requires` that
-        are using environment markers to `extras_require`.
+        Fix environment markers in `install_requires` and `extras_require`.
+
+        - move requirements in `install_requires` that are using environment
+          markers to `extras_require`.
+        - convert requirements in `extras_require` of the form
+          `"extra": ["barbazquux; {marker}"]` to
+          `"extra:{marker}": ["barbazquux"]`.
         """
-        if not getattr(self, 'install_requires', None):
-            return
-        extras_require = getattr(self, 'extras_require', None)
-        extras_require = defaultdict(list, (
-            (k, list(pkg_resources.parse_requirements(v)))
-            for k, v in (extras_require or {}).items()
-        ))
+        extras_require = defaultdict(list)
+        for k, v in (
+            getattr(self, 'extras_require', None) or {}
+        ).items():
+            for r in pkg_resources.parse_requirements(v):
+                marker = r.marker
+                if marker:
+                    r.marker = None
+                    extras_require[k + ':' + str(marker)].append(r)
+                else:
+                    extras_require[k].append(r)
         install_requires = []
-        for r in pkg_resources.parse_requirements(self.install_requires):
+        for r in pkg_resources.parse_requirements(
+            getattr(self, 'install_requires', None) or ()
+        ):
             marker = r.marker
             if not marker:
                 install_requires.append(r)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 07bd88181e..0b6f06b2b8 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -182,6 +182,11 @@ def _setup_script_with_requires(self, requires_line):
     mismatch_marker = "python_version<'{this_ver}'".format(
         this_ver=sys.version_info[0],
     )
+    # Alternate equivalent syntax.
+    mismatch_marker_alternate = 'python_version < "{this_ver}"'.format(
+        this_ver=sys.version_info[0],
+    )
+    invalid_marker = "<=>++"
 
     def test_install_requires_with_markers(self, tmpdir_cwd, env):
         tmpl = 'install_requires=["barbazquux;{marker}"],'
@@ -193,9 +198,9 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
         with open(requires_txt) as fp:
             install_requires = fp.read()
         expected_requires = DALS('''
-             [:python_version < "{sys.version_info[0]}"]
+             [:{marker}]
              barbazquux
-             ''').format(sys=sys)
+             ''').format(marker=self.mismatch_marker_alternate)
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
@@ -214,19 +219,53 @@ def test_tests_require_with_markers(self, tmpdir_cwd, env):
             tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    def test_extras_require_with_markers(self, tmpdir_cwd, env):
+    def test_extras_require_with_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.mismatch_marker)
         self._setup_script_with_requires(req)
         self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [:{marker}]
+             barbazquux
+             ''').format(marker=self.mismatch_marker)
+        assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    def test_extras_require_with_markers_in_req(self, tmpdir_cwd, env):
+    def test_extras_require_with_marker_in_req(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{"extra": ["barbazquux; {marker}"]}},'
         req = tmpl.format(marker=self.mismatch_marker)
         self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [extra:{marker}]
+             barbazquux
+             ''').format(marker=self.mismatch_marker_alternate)
+        assert install_requires.lstrip() == expected_requires
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env):
+        tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
+        req = tmpl.format(marker=self.invalid_marker)
+        self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
             self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
+        tmpl = 'extras_require={{"extra": ["barbazquux; {marker}"]}},'
+        req = tmpl.format(marker=self.invalid_marker)
+        self._setup_script_with_requires(req)
+        with pytest.raises(AssertionError):
+            self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(

From a3ec721ec1e70f1f7aec6c3349ad85b446410809 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 14 Jul 2017 23:56:05 +0200
Subject: [PATCH 6653/8469] fix `install_requires` handling of extras

Internally move requirements in `install_requires` that are using
extras to `extras_require` so those extras don't get stripped when
building wheels.
---
 setuptools/dist.py                | 12 ++++++++---
 setuptools/tests/test_egg_info.py | 33 ++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d77d56b12d..9a034db553 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -358,7 +358,7 @@ def _finalize_requires(self):
         Fix environment markers in `install_requires` and `extras_require`.
 
         - move requirements in `install_requires` that are using environment
-          markers to `extras_require`.
+          markers or extras to `extras_require`.
         - convert requirements in `extras_require` of the form
           `"extra": ["barbazquux; {marker}"]` to
           `"extra:{marker}": ["barbazquux"]`.
@@ -379,11 +379,17 @@ def _finalize_requires(self):
             getattr(self, 'install_requires', None) or ()
         ):
             marker = r.marker
-            if not marker:
+            extras = r.extras
+            if not marker and not extras:
                 install_requires.append(r)
                 continue
+            r.extras = ()
             r.marker = None
-            extras_require[':' + str(marker)].append(r)
+            for e in extras or ('',):
+                section = e
+                if marker:
+                    section += ':' + str(marker)
+                extras_require[section].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in v])
             for k, v in extras_require.items()
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 0b6f06b2b8..5ea55d6188 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -188,7 +188,7 @@ def _setup_script_with_requires(self, requires_line):
     )
     invalid_marker = "<=>++"
 
-    def test_install_requires_with_markers(self, tmpdir_cwd, env):
+    def test_install_requires_with_marker(self, tmpdir_cwd, env):
         tmpl = 'install_requires=["barbazquux;{marker}"],'
         req = tmpl.format(marker=self.mismatch_marker)
         self._setup_script_with_requires(req)
@@ -204,6 +204,37 @@ def test_install_requires_with_markers(self, tmpdir_cwd, env):
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_install_requires_with_extra(self, tmpdir_cwd, env):
+        req = 'install_requires=["barbazquux [test]"],'
+        self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [test]
+             barbazquux
+             ''')
+        assert install_requires.lstrip() == expected_requires
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_install_requires_with_extra_and_marker(self, tmpdir_cwd, env):
+        tmpl = 'install_requires=["barbazquux [test]; {marker}"],'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [test:{marker}]
+             barbazquux
+             ''').format(marker=self.mismatch_marker_alternate)
+        assert install_requires.lstrip() == expected_requires
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
     def test_setup_requires_with_markers(self, tmpdir_cwd, env):
         tmpl = 'setup_requires=["barbazquux;{marker}"],'
         req = tmpl.format(marker=self.mismatch_marker)

From 7c9b1e6b044b31316c19ce8c94cb452b990a489f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:13:40 -0400
Subject: [PATCH 6654/8469] Update changelog. Ref #1089.

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 02ec2f74b2..36b2fca542 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.2.1
+-------
+
+* fix #1086
+* fix #1087
+* support extras specifiers in install_requires requirements
+
 v36.2.0
 -------
 

From ac7a33c84d74afd3b7453bd880943be9cb4c5787 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:13:53 -0400
Subject: [PATCH 6655/8469] =?UTF-8?q?Bump=20version:=2036.2.0=20=E2=86=92?=
 =?UTF-8?q?=2036.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 416f654366..203b9312e3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.0
+current_version = 36.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b3f5a7d9b3..854aee3878 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.0",
+    version="36.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e1b4250bceedcc44ae9c3dc7d960bbca885bb27c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:23:27 -0400
Subject: [PATCH 6656/8469] More concise explanation

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b207a8d2f3..dbbe3ea91b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ jobs:
     env: LANG=C
   - python: *latest_py2
     env: LANG=C
-  - stage: deploy (does actual deploy to PYPI only for tagged commits)
+  - stage: deploy (to PyPI for tagged commits)
     python: *latest_py3
     install: skip
     script: skip

From dce380e100840575d0477f7e6afb136701599055 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:32:29 -0400
Subject: [PATCH 6657/8469] Remove dependency on virtualenv. Setuptools' tests
 don't require it except pytest-virtualenv, which declares it.

---
 tests/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0c4df8ef8f..44e76edba4 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,4 +3,3 @@ mock
 pytest-flake8
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2
-virtualenv

From 4d0b492a7958292ed7df0a28b07198a79033e77e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:34:04 -0400
Subject: [PATCH 6658/8469] Extract variable for nicer indentation

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 9a034db553..602ba50052 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -364,9 +364,8 @@ def _finalize_requires(self):
           `"extra:{marker}": ["barbazquux"]`.
         """
         extras_require = defaultdict(list)
-        for k, v in (
-            getattr(self, 'extras_require', None) or {}
-        ).items():
+        spec_ext_reqs = getattr(self, 'extras_require', None) or {}
+        for k, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
                 marker = r.marker
                 if marker:
@@ -375,9 +374,8 @@ def _finalize_requires(self):
                 else:
                     extras_require[k].append(r)
         install_requires = []
-        for r in pkg_resources.parse_requirements(
-            getattr(self, 'install_requires', None) or ()
-        ):
+        spec_inst_reqs = getattr(self, 'install_requires', None) or ()
+        for r in pkg_resources.parse_requirements(spec_inst_reqs):
             marker = r.marker
             extras = r.extras
             if not marker and not extras:

From 3e6409381946eba193533c9a9a968af9be1231f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 13:51:49 -0400
Subject: [PATCH 6659/8469] Consolidate assignment of extras to the key in
 extras requirements.

---
 setuptools/dist.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 602ba50052..2b720b5318 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -367,12 +367,10 @@ def _finalize_requires(self):
         spec_ext_reqs = getattr(self, 'extras_require', None) or {}
         for k, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
-                marker = r.marker
-                if marker:
+                if r.marker:
+                    k += ':' + str(r.marker)
                     r.marker = None
-                    extras_require[k + ':' + str(marker)].append(r)
-                else:
-                    extras_require[k].append(r)
+                extras_require[k].append(r)
         install_requires = []
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         for r in pkg_resources.parse_requirements(spec_inst_reqs):

From 171fc767992f55f10186b6ded6ea2875328d0827 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 14:10:33 -0400
Subject: [PATCH 6660/8469] Extract two methods (still interdependent) for
 fixing requires

---
 setuptools/dist.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2b720b5318..ad50a8efee 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -356,21 +356,31 @@ def __init__(self, attrs=None):
     def _finalize_requires(self):
         """
         Fix environment markers in `install_requires` and `extras_require`.
+        """
+        self._convert_extras_requirements()
+        self._move_install_requirements_markers()
 
-        - move requirements in `install_requires` that are using environment
-          markers or extras to `extras_require`.
-        - convert requirements in `extras_require` of the form
-          `"extra": ["barbazquux; {marker}"]` to
-          `"extra:{marker}": ["barbazquux"]`.
+    def _convert_extras_requirements(self):
+        """
+        Convert requirements in `extras_require` of the form
+        `"extra": ["barbazquux; {marker}"]` to
+        `"extra:{marker}": ["barbazquux"]`.
         """
-        extras_require = defaultdict(list)
         spec_ext_reqs = getattr(self, 'extras_require', None) or {}
+        self._tmp_extras_require = defaultdict(list)
         for k, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
                 if r.marker:
                     k += ':' + str(r.marker)
                     r.marker = None
-                extras_require[k].append(r)
+                self._tmp_extras_require[k].append(r)
+
+    def _move_install_requirements_markers(self):
+        """
+        Move requirements in `install_requires` that are using environment
+        markers or extras to `extras_require`.
+        """
+
         install_requires = []
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         for r in pkg_resources.parse_requirements(spec_inst_reqs):
@@ -385,10 +395,10 @@ def _finalize_requires(self):
                 section = e
                 if marker:
                     section += ':' + str(marker)
-                extras_require[section].append(r)
+                self._tmp_extras_require[section].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in v])
-            for k, v in extras_require.items()
+            for k, v in self._tmp_extras_require.items()
         )
         self.install_requires = [str(r) for r in install_requires]
 

From 81ffba7099ea754a970c2d857bcca2ac88358557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 14:50:07 -0400
Subject: [PATCH 6661/8469] Use term 'section' consistently

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ad50a8efee..ffa972f3e3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -368,12 +368,12 @@ def _convert_extras_requirements(self):
         """
         spec_ext_reqs = getattr(self, 'extras_require', None) or {}
         self._tmp_extras_require = defaultdict(list)
-        for k, v in spec_ext_reqs.items():
+        for section, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
                 if r.marker:
-                    k += ':' + str(r.marker)
+                    section += ':' + str(r.marker)
                     r.marker = None
-                self._tmp_extras_require[k].append(r)
+                self._tmp_extras_require[section].append(r)
 
     def _move_install_requirements_markers(self):
         """
@@ -391,8 +391,7 @@ def _move_install_requirements_markers(self):
                 continue
             r.extras = ()
             r.marker = None
-            for e in extras or ('',):
-                section = e
+            for section in extras or ('',):
                 if marker:
                     section += ':' + str(marker)
                 self._tmp_extras_require[section].append(r)

From 00a738d4d0d4e84c240e32cebfb54fdc653de00a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:07:33 -0400
Subject: [PATCH 6662/8469] Handle rebuild of install_requires separate from
 building extras"

---
 setuptools/dist.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ffa972f3e3..febb1b0cd3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -380,15 +380,21 @@ def _move_install_requirements_markers(self):
         Move requirements in `install_requires` that are using environment
         markers or extras to `extras_require`.
         """
-
-        install_requires = []
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
-        for r in pkg_resources.parse_requirements(spec_inst_reqs):
+        self.install_requires = list(
+            str(req)
+            for req in pkg_resources.parse_requirements(spec_inst_reqs)
+            if not req.marker and not req.extras
+        )
+
+        markers_or_extras_reqs = (
+            req
+            for req in pkg_resources.parse_requirements(spec_inst_reqs)
+            if req.marker or req.extras
+        )
+        for r in markers_or_extras_reqs:
             marker = r.marker
             extras = r.extras
-            if not marker and not extras:
-                install_requires.append(r)
-                continue
             r.extras = ()
             r.marker = None
             for section in extras or ('',):
@@ -399,7 +405,6 @@ def _move_install_requirements_markers(self):
             (k, [str(r) for r in v])
             for k, v in self._tmp_extras_require.items()
         )
-        self.install_requires = [str(r) for r in install_requires]
 
     def parse_config_files(self, filenames=None):
         """Parses configuration files from various levels

From f464c4b808e74f0c23ff36e4a83722011718ddc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:26:50 -0400
Subject: [PATCH 6663/8469] Extract a function for removing extras and marker
 from a requirement.

---
 setuptools/dist.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index febb1b0cd3..d335d92a18 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -372,7 +372,6 @@ def _convert_extras_requirements(self):
             for r in pkg_resources.parse_requirements(v):
                 if r.marker:
                     section += ':' + str(r.marker)
-                    r.marker = None
                 self._tmp_extras_require[section].append(r)
 
     def _move_install_requirements_markers(self):
@@ -393,19 +392,26 @@ def _move_install_requirements_markers(self):
             if req.marker or req.extras
         )
         for r in markers_or_extras_reqs:
-            marker = r.marker
-            extras = r.extras
-            r.extras = ()
-            r.marker = None
-            for section in extras or ('',):
-                if marker:
-                    section += ':' + str(marker)
+            suffix = ':' + str(r.marker) if r.marker else ''
+            sections = [
+                section + suffix
+                for section in r.extras or ('',)
+            ]
+            for section in sections:
                 self._tmp_extras_require[section].append(r)
         self.extras_require = dict(
-            (k, [str(r) for r in v])
+            (k, [str(r) for r in map(self._clean_req, v)])
             for k, v in self._tmp_extras_require.items()
         )
 
+    def _clean_req(self, req):
+        """
+        Given a Requirement, remove extras and markers and return it.
+        """
+        req.extras = ()
+        req.marker = None
+        return req
+
     def parse_config_files(self, filenames=None):
         """Parses configuration files from various levels
         and loads configuration.

From b812935899dec7e7afea3ea0ae0f5a9b3169f741 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:45:07 -0400
Subject: [PATCH 6664/8469] Consolidate logic around a 'simple' requirement

---
 setuptools/dist.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d335d92a18..cf25c64d0b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -16,7 +16,7 @@
 from distutils.util import rfc822_escape
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import map
+from setuptools.extern.six.moves import map, filter, filterfalse
 from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
@@ -379,17 +379,21 @@ def _move_install_requirements_markers(self):
         Move requirements in `install_requires` that are using environment
         markers or extras to `extras_require`.
         """
+        def is_simple_req(req):
+            return not req.marker and not req.extras
+
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         self.install_requires = list(
             str(req)
-            for req in pkg_resources.parse_requirements(spec_inst_reqs)
-            if not req.marker and not req.extras
+            for req in filter(
+                is_simple_req,
+                pkg_resources.parse_requirements(spec_inst_reqs),
+            )
         )
 
-        markers_or_extras_reqs = (
-            req
-            for req in pkg_resources.parse_requirements(spec_inst_reqs)
-            if req.marker or req.extras
+        markers_or_extras_reqs = filterfalse(
+            is_simple_req,
+            pkg_resources.parse_requirements(spec_inst_reqs),
         )
         for r in markers_or_extras_reqs:
             suffix = ':' + str(r.marker) if r.marker else ''

From 77044955def37aa95310224d6b8436a8f8e0c6d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:49:26 -0400
Subject: [PATCH 6665/8469] Refactor a bit for clarity

---
 setuptools/dist.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index cf25c64d0b..88bdf5aae9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -379,23 +379,26 @@ def _move_install_requirements_markers(self):
         Move requirements in `install_requires` that are using environment
         markers or extras to `extras_require`.
         """
+
+        # divide the install_requires into two sets, simple ones still
+        # handled by install_requires and more complex ones handled
+        # by extras_require.
+
         def is_simple_req(req):
             return not req.marker and not req.extras
 
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
-        self.install_requires = list(
-            str(req)
-            for req in filter(
-                is_simple_req,
-                pkg_resources.parse_requirements(spec_inst_reqs),
-            )
+        simple_reqs = filter(
+            is_simple_req,
+            pkg_resources.parse_requirements(spec_inst_reqs),
         )
-
-        markers_or_extras_reqs = filterfalse(
+        complex_reqs = filterfalse(
             is_simple_req,
             pkg_resources.parse_requirements(spec_inst_reqs),
         )
-        for r in markers_or_extras_reqs:
+        self.install_requires = list(map(str, simple_reqs))
+
+        for r in complex_reqs:
             suffix = ':' + str(r.marker) if r.marker else ''
             sections = [
                 section + suffix

From f26bf186bad984b8649a723d795f66c4f8e415f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:52:38 -0400
Subject: [PATCH 6666/8469] Align suffix calculation for extras sections

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 88bdf5aae9..50f5c18f16 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -370,9 +370,8 @@ def _convert_extras_requirements(self):
         self._tmp_extras_require = defaultdict(list)
         for section, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
-                if r.marker:
-                    section += ':' + str(r.marker)
-                self._tmp_extras_require[section].append(r)
+                suffix = ':' + str(r.marker) if r.marker else ''
+                self._tmp_extras_require[section + suffix].append(r)
 
     def _move_install_requirements_markers(self):
         """
@@ -400,12 +399,8 @@ def is_simple_req(req):
 
         for r in complex_reqs:
             suffix = ':' + str(r.marker) if r.marker else ''
-            sections = [
-                section + suffix
-                for section in r.extras or ('',)
-            ]
-            for section in sections:
-                self._tmp_extras_require[section].append(r)
+            for section in r.extras or ('',):
+                self._tmp_extras_require[section + suffix].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in map(self._clean_req, v)])
             for k, v in self._tmp_extras_require.items()

From e144d98e8b38ee3440ad4fbf28c085e057858806 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 15:59:11 -0400
Subject: [PATCH 6667/8469] Parse the requirements just once for simplicity and
 clarity

---
 setuptools/dist.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 50f5c18f16..c4a42183bc 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -387,14 +387,9 @@ def is_simple_req(req):
             return not req.marker and not req.extras
 
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
-        simple_reqs = filter(
-            is_simple_req,
-            pkg_resources.parse_requirements(spec_inst_reqs),
-        )
-        complex_reqs = filterfalse(
-            is_simple_req,
-            pkg_resources.parse_requirements(spec_inst_reqs),
-        )
+        inst_reqs = list(pkg_resources.parse_requirements(spec_inst_reqs))
+        simple_reqs = filter(is_simple_req, inst_reqs)
+        complex_reqs = filterfalse(is_simple_req, inst_reqs)
         self.install_requires = list(map(str, simple_reqs))
 
         for r in complex_reqs:

From 880774ac34e43c832f52d64923c670f59b54f07e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 23 Jul 2017 22:14:47 +0200
Subject: [PATCH 6668/8469] Revert "fix `install_requires` handling of extras"

This reverts commit a3ec721ec1e70f1f7aec6c3349ad85b446410809.
---
 setuptools/dist.py                | 11 +++-----
 setuptools/tests/test_egg_info.py | 42 ++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 50f5c18f16..f6bf2601da 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -376,7 +376,7 @@ def _convert_extras_requirements(self):
     def _move_install_requirements_markers(self):
         """
         Move requirements in `install_requires` that are using environment
-        markers or extras to `extras_require`.
+        markers `extras_require`.
         """
 
         # divide the install_requires into two sets, simple ones still
@@ -384,7 +384,7 @@ def _move_install_requirements_markers(self):
         # by extras_require.
 
         def is_simple_req(req):
-            return not req.marker and not req.extras
+            return not req.marker
 
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         simple_reqs = filter(
@@ -398,9 +398,7 @@ def is_simple_req(req):
         self.install_requires = list(map(str, simple_reqs))
 
         for r in complex_reqs:
-            suffix = ':' + str(r.marker) if r.marker else ''
-            for section in r.extras or ('',):
-                self._tmp_extras_require[section + suffix].append(r)
+            self._tmp_extras_require[':' + str(r.marker)].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in map(self._clean_req, v)])
             for k, v in self._tmp_extras_require.items()
@@ -408,9 +406,8 @@ def is_simple_req(req):
 
     def _clean_req(self, req):
         """
-        Given a Requirement, remove extras and markers and return it.
+        Given a Requirement, remove environment markers and return it.
         """
-        req.extras = ()
         req.marker = None
         return req
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 5ea55d6188..d9d4ec3b3a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -207,14 +207,13 @@ def test_install_requires_with_marker(self, tmpdir_cwd, env):
     def test_install_requires_with_extra(self, tmpdir_cwd, env):
         req = 'install_requires=["barbazquux [test]"],'
         self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        self._run_install_command(tmpdir_cwd, env, cmd=['egg_info'])
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         with open(requires_txt) as fp:
             install_requires = fp.read()
         expected_requires = DALS('''
-             [test]
-             barbazquux
+             barbazquux[test]
              ''')
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
@@ -229,8 +228,8 @@ def test_install_requires_with_extra_and_marker(self, tmpdir_cwd, env):
         with open(requires_txt) as fp:
             install_requires = fp.read()
         expected_requires = DALS('''
-             [test:{marker}]
-             barbazquux
+             [:{marker}]
+             barbazquux[test]
              ''').format(marker=self.mismatch_marker_alternate)
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
@@ -250,6 +249,37 @@ def test_tests_require_with_markers(self, tmpdir_cwd, env):
             tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_extras_require_with_extra(self, tmpdir_cwd, env):
+        req = 'extras_require={"extra": ["barbazquux [test]"]},'
+        self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env, cmd=['egg_info'])
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [extra]
+             barbazquux[test]
+             ''')
+        assert install_requires.lstrip() == expected_requires
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extras_require_with_extra_and_marker_in_req(self, tmpdir_cwd, env):
+        tmpl = 'extras_require={{"extra": ["barbazquux [test]; {marker}"]}},'
+        req = tmpl.format(marker=self.mismatch_marker)
+        self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [extra:{marker}]
+             barbazquux[test]
+             ''').format(marker=self.mismatch_marker_alternate)
+        assert install_requires.lstrip() == expected_requires
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
     def test_extras_require_with_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.mismatch_marker)

From a440f728c0066f284e0d2246026264c7166a8bf5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Jul 2017 16:14:55 -0400
Subject: [PATCH 6669/8469] Extract method capturing the 'suffix' for a marker.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c4a42183bc..d1472a3477 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -370,9 +370,17 @@ def _convert_extras_requirements(self):
         self._tmp_extras_require = defaultdict(list)
         for section, v in spec_ext_reqs.items():
             for r in pkg_resources.parse_requirements(v):
-                suffix = ':' + str(r.marker) if r.marker else ''
+                suffix = self._suffix_for(r)
                 self._tmp_extras_require[section + suffix].append(r)
 
+    @staticmethod
+    def _suffix_for(req):
+        """
+        For a requirement, return the 'extras_require' suffix for
+        that requirement.
+        """
+        return ':' + str(req.marker) if req.marker else ''
+
     def _move_install_requirements_markers(self):
         """
         Move requirements in `install_requires` that are using environment
@@ -393,9 +401,13 @@ def is_simple_req(req):
         self.install_requires = list(map(str, simple_reqs))
 
         for r in complex_reqs:
-            suffix = ':' + str(r.marker) if r.marker else ''
-            for section in r.extras or ('',):
-                self._tmp_extras_require[section + suffix].append(r)
+            sections = (
+                section + self._suffix_for(r)
+                for section in r.extras or ('',)
+            )
+            for section in sections:
+                self._tmp_extras_require[section].append(r)
+
         self.extras_require = dict(
             (k, [str(r) for r in map(self._clean_req, v)])
             for k, v in self._tmp_extras_require.items()

From c464fbad5c7a84697cbfdea9df61e32c5c9fe3c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Jul 2017 09:47:26 -0400
Subject: [PATCH 6670/8469] Update changelog. Ref #1100.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 36b2fca542..9a16816c3c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.2.2
+-------
+
+* #1099: Revert commit a3ec721, restoring intended purpose of
+  extras as part of a requirement declaration.
+
 v36.2.1
 -------
 

From da396e49582197fc28c46b1b0605c7f2ecf8298c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Jul 2017 09:47:37 -0400
Subject: [PATCH 6671/8469] =?UTF-8?q?Bump=20version:=2036.2.1=20=E2=86=92?=
 =?UTF-8?q?=2036.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 203b9312e3..33024f5141 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.1
+current_version = 36.2.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 854aee3878..5c48f7407d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.1",
+    version="36.2.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From a82fd99f671e6bbcfd753196862d891c0d32d82c Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 25 Jul 2017 20:59:48 +0200
Subject: [PATCH 6672/8469] do not strip empty sections in `extras_require`

---
 setuptools/dist.py                |  2 ++
 setuptools/tests/test_egg_info.py | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0787261e44..dfe700bdbc 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -369,6 +369,8 @@ def _convert_extras_requirements(self):
         spec_ext_reqs = getattr(self, 'extras_require', None) or {}
         self._tmp_extras_require = defaultdict(list)
         for section, v in spec_ext_reqs.items():
+            # Do not strip empty sections.
+            self._tmp_extras_require[section]
             for r in pkg_resources.parse_requirements(v):
                 suffix = self._suffix_for(r)
                 self._tmp_extras_require[section + suffix].append(r)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d9d4ec3b3a..9ea7cdcefa 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -274,6 +274,8 @@ def test_extras_require_with_extra_and_marker_in_req(self, tmpdir_cwd, env):
         with open(requires_txt) as fp:
             install_requires = fp.read()
         expected_requires = DALS('''
+             [extra]
+
              [extra:{marker}]
              barbazquux[test]
              ''').format(marker=self.mismatch_marker_alternate)
@@ -306,6 +308,8 @@ def test_extras_require_with_marker_in_req(self, tmpdir_cwd, env):
         with open(requires_txt) as fp:
             install_requires = fp.read()
         expected_requires = DALS('''
+             [extra]
+
              [extra:{marker}]
              barbazquux
              ''').format(marker=self.mismatch_marker_alternate)
@@ -328,6 +332,20 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
             self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_extras_require_with_empty_section(self, tmpdir_cwd, env):
+        tmpl = 'extras_require={{"empty": []}},'
+        req = tmpl.format(marker=self.invalid_marker)
+        self._setup_script_with_requires(req)
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        with open(requires_txt) as fp:
+            install_requires = fp.read()
+        expected_requires = DALS('''
+             [empty]
+             ''').format(marker=self.mismatch_marker_alternate)
+        assert install_requires.lstrip() == expected_requires
+
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """python_requires='>=2.7.12',""")

From f46a630f13fcf97c56d7f38e55aa1833f2063dee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 25 Jul 2017 21:13:04 -0400
Subject: [PATCH 6673/8469] Update changelog. Ref #1103.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9a16816c3c..9af6001baa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.2.3
+-------
+
+* #1102: Restore behavior for empty extras.
+
 v36.2.2
 -------
 

From c452f9fdd87d990fb81f7e48d6cb0fe1fcd4b92e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 25 Jul 2017 21:13:17 -0400
Subject: [PATCH 6674/8469] =?UTF-8?q?Bump=20version:=2036.2.2=20=E2=86=92?=
 =?UTF-8?q?=2036.2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 33024f5141..5633027e48 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.2
+current_version = 36.2.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 5c48f7407d..8c21a37222 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.2",
+    version="36.2.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 35fa31fa6705d6b6866b5f5361b833e19339713b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 26 Jul 2017 13:07:38 -0400
Subject: [PATCH 6675/8469] Use inspect.getmro to inspect the mro. Alternate
 implementation to that proposed in #1092.

---
 CHANGES.rst               |  6 ++++++
 pkg_resources/__init__.py | 21 +++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9af6001baa..8412557b09 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.2.4
+-------
+
+* #1092: ``pkg_resources`` now uses ``inspect.getmro`` to
+  resolve classes in method resolution order.
+
 v36.2.3
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 51b4749261..f6666968b4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -37,6 +37,7 @@
 import tempfile
 import textwrap
 import itertools
+import inspect
 from pkgutil import get_importer
 
 try:
@@ -2939,20 +2940,20 @@ def parse(s):
         return req
 
 
-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
 
 
 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]
 

From de05e931c35cef1d5888231fe3f4b47526bca8f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 26 Jul 2017 13:07:42 -0400
Subject: [PATCH 6676/8469] =?UTF-8?q?Bump=20version:=2036.2.3=20=E2=86=92?=
 =?UTF-8?q?=2036.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5633027e48..ae2f2d2537 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.3
+current_version = 36.2.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 8c21a37222..bb465f2db5 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.3",
+    version="36.2.4",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 0c86c6a290c6ddce7732228820482a600f7520ca Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 26 Jul 2017 19:51:24 +0200
Subject: [PATCH 6677/8469] tests: minor cleanup; remove dead code

---
 setuptools/tests/test_easy_install.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 26cdd90d5d..c9d396f4e3 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -567,18 +567,6 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
     return test_pkg
 
 
-def make_trivial_sdist(dist_path, setup_py):
-    """Create a simple sdist tarball at dist_path, containing just a
-    setup.py, the contents of which are provided by the setup_py string.
-    """
-
-    setup_py_file = tarfile.TarInfo(name='setup.py')
-    setup_py_bytes = io.BytesIO(setup_py.encode('utf-8'))
-    setup_py_file.size = len(setup_py_bytes.getvalue())
-    with tarfile_open(dist_path, 'w:gz') as dist:
-        dist.addfile(setup_py_file, fileobj=setup_py_bytes)
-
-
 @pytest.mark.skipif(
     sys.platform.startswith('java') and ei.is_sh(sys.executable),
     reason="Test cannot run under java when executable is sh"

From 75e88f63cc0308f7933e936b171f9cba2d04e7ad Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 21 Jul 2017 16:39:15 +0200
Subject: [PATCH 6678/8469] fix `test` command handling of `extras_require`

Also install platform specific requirements in `extras_require`.
---
 setuptools/command/test.py          | 10 +++--
 setuptools/tests/test_virtualenv.py | 66 +++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index b8863fdcfb..638d0c56e4 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -11,7 +11,7 @@
 from setuptools.extern.six.moves import map, filter
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
-                           working_set, _namespace_packages,
+                           working_set, _namespace_packages, evaluate_marker,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
 from setuptools.py31compat import unittest_main
@@ -191,9 +191,13 @@ def install_dists(dist):
         Install the requirements indicated by self.distribution and
         return an iterable of the dists that were built.
         """
-        ir_d = dist.fetch_build_eggs(dist.install_requires or [])
+        ir_d = dist.fetch_build_eggs(dist.install_requires)
         tr_d = dist.fetch_build_eggs(dist.tests_require or [])
-        return itertools.chain(ir_d, tr_d)
+        er_d = dist.fetch_build_eggs(
+            v for k, v in dist.extras_require.items()
+            if k.startswith(':') and evaluate_marker(k[1:])
+        )
+        return itertools.chain(ir_d, tr_d, er_d)
 
     def run(self):
         installed_dists = self.install_dists(self.distribution)
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index a7f485a49f..17b8793cf6 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -6,6 +6,9 @@
 
 import pytest_virtualenv
 
+from .textwrap import DALS
+from .test_easy_install import make_nspkg_sdist
+
 
 @yield_requires_config(pytest_virtualenv.CONFIG, ['virtualenv_executable'])
 @yield_fixture(scope='function')
@@ -48,3 +51,66 @@ def test_pip_upgrade_from_source(virtualenv):
     virtualenv.run('pip install ' + wheel)
     # And finally try to upgrade from source.
     virtualenv.run('pip install --no-cache-dir --upgrade ' + sdist)
+
+def test_test_command_install_requirements(bare_virtualenv, tmpdir):
+    """
+    Check the test command will install all required dependencies.
+    """
+    bare_virtualenv.run(' && '.join((
+        'cd {source}',
+        'python setup.py develop',
+    )).format(source=SOURCE_DIR))
+    def sdist(distname, version):
+        dist_path = tmpdir.join('%s-%s.tar.gz' % (distname, version))
+        make_nspkg_sdist(str(dist_path), distname, version)
+        return dist_path
+    dependency_links = [
+        str(dist_path)
+        for dist_path in (
+            sdist('foobar', '2.4'),
+            sdist('bits', '4.2'),
+            sdist('bobs', '6.0'),
+            sdist('pieces', '0.6'),
+        )
+    ]
+    with tmpdir.join('setup.py').open('w') as fp:
+        fp.write(DALS(
+            '''
+            from setuptools import setup
+
+            setup(
+                dependency_links={dependency_links!r},
+                install_requires=[
+                    'barbazquux1; sys_platform in ""',
+                    'foobar==2.4',
+                ],
+                setup_requires='bits==4.2',
+                tests_require="""
+                    bobs==6.0
+                """,
+                extras_require={{
+                    'test': ['barbazquux2'],
+                    ':"" in sys_platform': 'pieces==0.6',
+                    ':python_version > "1"': """
+                        pieces
+                        foobar
+                    """,
+                }}
+            )
+            '''.format(dependency_links=dependency_links)))
+    with tmpdir.join('test.py').open('w') as fp:
+        fp.write(DALS(
+            '''
+            import foobar
+            import bits
+            import bobs
+            import pieces
+
+            open('success', 'w').close()
+            '''))
+    # Run test command for test package.
+    bare_virtualenv.run(' && '.join((
+        'cd {tmpdir}',
+        'python setup.py test -s test',
+    )).format(tmpdir=tmpdir))
+    assert tmpdir.join('success').check()

From d607a330bb821d77470a3f029f9db38fa08e85ad Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 17 Jul 2017 20:31:02 +0200
Subject: [PATCH 6679/8469] travis: update image

Update to the future defaults: `dist: trusty`.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cbf49da658..1bb78cfb2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 sudo: false
 language: python
 jobs:

From 01ad2ba2e4b57ad44b365e49dda2071bec8bbf70 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 28 Jul 2017 20:44:37 +0200
Subject: [PATCH 6680/8469] travis: add `pypy3` job

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1bb78cfb2e..20975f8606 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ jobs:
   - python: &latest_py3 3.6
   - python: nightly
   - python: pypy
+  - python: pypy3
   - python: *latest_py3
     env: LANG=C
   - python: *latest_py2

From 7c169ce99f999b775541d39bf0b1b1c1d34d4ea0 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 29 Jul 2017 22:06:48 +0200
Subject: [PATCH 6681/8469] tests: disable pytest-flake8 on Python 2.6

Python 2.6 support has been official dropped from
flake8 for some time, and broken since 3.4.0.
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 44e76edba4..c9413b86db 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,5 +1,5 @@
 importlib; python_version<"2.7"
 mock
-pytest-flake8
+pytest-flake8; python_version>="2.7"
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2

From 92616dbfb2682bee04d5fe662a5951a6b629b846 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Jul 2017 20:55:44 -0400
Subject: [PATCH 6682/8469] Update changelog. Ref #1106.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8412557b09..e006d287a5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.2.5
+-------
+
+* #1093: Fix test command handler with extras_require.
+
 v36.2.4
 -------
 

From 4915efda9e1ee003826c9b95cfa1b7d47767994c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Jul 2017 20:55:52 -0400
Subject: [PATCH 6683/8469] =?UTF-8?q?Bump=20version:=2036.2.4=20=E2=86=92?=
 =?UTF-8?q?=2036.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ae2f2d2537..4bf7b13bf6 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.4
+current_version = 36.2.5
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index bb465f2db5..9571cfa97d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.4",
+    version="36.2.5",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 7961c8b4d8cd57164508f4f82f59b5906cae5c3e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 31 Jul 2017 03:40:09 +0200
Subject: [PATCH 6684/8469] travis: fix deployment

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cf904c099f..a5e08a2efc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ jobs:
       password:
         secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
       distributions: release
+      skip_cleanup: true
       skip_upload_docs: true
 
 cache: pip

From 49df713e676436e062bacde706b5084b958f0322 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Jul 2017 21:41:56 -0400
Subject: [PATCH 6685/8469] Update changelog

---
 CHANGES.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e006d287a5..75f39d4828 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,8 @@ v36.2.5
 -------
 
 * #1093: Fix test command handler with extras_require.
+* #1112, #1091, #1115: Now using Trusty containers in
+  Travis for CI and CD.
 
 v36.2.4
 -------

From d59415c6921bcb1282feffcf104d18949040b404 Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leorochael@gmail.com>
Date: Mon, 31 Jul 2017 16:08:28 -0300
Subject: [PATCH 6686/8469] Ignore .eggs

Directory used by setuptools to auto-install dependencies
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b23ade08c5..2e2f71b8f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ lib
 distribute.egg-info
 setuptools.egg-info
 .coverage
+.eggs
 .tox
 *.egg
 *.py[cod]

From 80848f95f295464639bfd349e62d40d2e279fa76 Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leorochael@gmail.com>
Date: Mon, 31 Jul 2017 16:07:52 -0300
Subject: [PATCH 6687/8469] pytest-virtualenv does not require virtualenv

But our tests do, one that provides `--no-wheel`.
---
 tests/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index c9413b86db..4761505fc9 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,5 +1,6 @@
 importlib; python_version<"2.7"
 mock
 pytest-flake8; python_version>="2.7"
+virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2

From e265e4560965878531fea7856fb165a182908b8d Mon Sep 17 00:00:00 2001
From: Leonardo Rochael Almeida <leorochael@gmail.com>
Date: Mon, 31 Jul 2017 16:29:32 -0300
Subject: [PATCH 6688/8469] Better detect unpacked eggs

Do not assume a directory named in `.egg` is an egg, unless it has an
actual egg metadata directory.

Closes #462
---
 CHANGES.rst                                   |  6 ++
 pkg_resources/__init__.py                     | 18 +++--
 .../tests/test_find_distributions.py          | 65 +++++++++++++++++++
 setup.py                                      |  2 +-
 4 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 pkg_resources/tests/test_find_distributions.py

diff --git a/CHANGES.rst b/CHANGES.rst
index 75f39d4828..7baca6565d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.2.6
+-------
+
+* #462: Don't assume a directory is an egg by the ``.egg``
+  extension alone.
+
 v36.2.5
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f6666968b4..f13a69b302 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1553,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
@@ -1956,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
@@ -2033,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
@@ -2221,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'))
     )
 
 
diff --git a/pkg_resources/tests/test_find_distributions.py b/pkg_resources/tests/test_find_distributions.py
new file mode 100644
index 0000000000..97999b3354
--- /dev/null
+++ b/pkg_resources/tests/test_find_distributions.py
@@ -0,0 +1,65 @@
+import subprocess
+import sys
+
+import pytest
+import pkg_resources
+
+SETUP_TEMPLATE = """
+import setuptools
+setuptools.setup(
+    name="my-test-package",
+    version="1.0",
+    zip_safe=True,
+)
+""".lstrip()
+
+class TestFindDistributions:
+
+    @pytest.fixture
+    def target_dir(self, tmpdir):
+        target_dir = tmpdir.mkdir('target')
+        # place a .egg named directory in the target that is not an egg:
+        target_dir.mkdir('not.an.egg')
+        return str(target_dir)
+
+    @pytest.fixture
+    def project_dir(self, tmpdir):
+        project_dir = tmpdir.mkdir('my-test-package')
+        (project_dir / "setup.py").write(SETUP_TEMPLATE)
+        return str(project_dir)
+
+    def test_non_egg_dir_named_egg(self, target_dir):
+        dists = pkg_resources.find_distributions(target_dir)
+        assert not list(dists)
+
+    def test_standalone_egg_directory(self, project_dir, target_dir):
+        # install this distro as an unpacked egg:
+        args = [
+            sys.executable,
+            '-c', 'from setuptools.command.easy_install import main; main()',
+            '-mNx',
+            '-d', target_dir,
+            '--always-unzip',
+            project_dir,
+        ]
+        subprocess.check_call(args)
+        dists = pkg_resources.find_distributions(target_dir)
+        assert [dist.project_name for dist in dists] == ['my-test-package']
+        dists = pkg_resources.find_distributions(target_dir, only=True)
+        assert not list(dists)
+
+    def test_zipped_egg(self, project_dir, target_dir):
+        # install this distro as an unpacked egg:
+        args = [
+            sys.executable,
+            '-c', 'from setuptools.command.easy_install import main; main()',
+            '-mNx',
+            '-d', target_dir,
+            '--zip-ok',
+            project_dir,
+        ]
+        subprocess.check_call(args)
+        dists = pkg_resources.find_distributions(target_dir)
+        assert [dist.project_name for dist in dists] == ['my-test-package']
+        dists = pkg_resources.find_distributions(target_dir, only=True)
+        assert not list(dists)
diff --git a/setup.py b/setup.py
index 9571cfa97d..7b29c53ee2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.5",
+    version="36.2.6",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 28e2625c12f7115c8bcb8c101327328e5007592f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Aug 2017 16:29:47 -0400
Subject: [PATCH 6689/8469] Last bump was manual. Resync.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 4bf7b13bf6..1c2b3b16bb 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.5
+current_version = 36.2.6
 commit = True
 tag = True
 

From 096f3287314549ac423f1c1c443f8aefa0b64b4f Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 27 Jul 2017 01:45:54 +0200
Subject: [PATCH 6690/8469] fix requires handling when using setup.cfg

---
 setuptools/dist.py                |  10 +-
 setuptools/tests/test_config.py   |   6 +-
 setuptools/tests/test_egg_info.py | 334 +++++++++++++++++-------------
 3 files changed, 201 insertions(+), 149 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index dfe700bdbc..21730f22ba 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -349,14 +349,15 @@ def __init__(self, attrs=None):
                     "setuptools, pip, and PyPI. Please see PEP 440 for more "
                     "details." % self.metadata.version
                 )
-        if getattr(self, 'python_requires', None):
-            self.metadata.python_requires = self.python_requires
         self._finalize_requires()
 
     def _finalize_requires(self):
         """
-        Fix environment markers in `install_requires` and `extras_require`.
+        Set `metadata.python_requires` and fix environment markers
+        in `install_requires` and `extras_require`.
         """
+        if getattr(self, 'python_requires', None):
+            self.metadata.python_requires = self.python_requires
         self._convert_extras_requirements()
         self._move_install_requirements_markers()
 
@@ -424,8 +425,7 @@ def parse_config_files(self, filenames=None):
         _Distribution.parse_config_files(self, filenames=filenames)
 
         parse_configuration(self, self.command_options)
-        if getattr(self, 'python_requires', None):
-            self.metadata.python_requires = self.python_requires
+        self._finalize_requires()
 
     def parse_command_line(self):
         """Process features after parsing command line options"""
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 8bd2a49428..dbabd69e6d 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -333,7 +333,7 @@ def test_basic(self, tmpdir):
             ])
             assert dist.install_requires == ([
                 'docutils>=0.3',
-                'pack ==1.1, ==1.3',
+                'pack==1.1,==1.3',
                 'hey'
             ])
             assert dist.setup_requires == ([
@@ -403,7 +403,7 @@ def test_multiline(self, tmpdir):
             ])
             assert dist.install_requires == ([
                 'docutils>=0.3',
-                'pack ==1.1, ==1.3',
+                'pack==1.1,==1.3',
                 'hey'
             ])
             assert dist.setup_requires == ([
@@ -508,7 +508,7 @@ def test_extras_require(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.extras_require == {
                 'pdf': ['ReportLab>=1.2', 'RXP'],
-                'rest': ['docutils>=0.3', 'pack ==1.1, ==1.3']
+                'rest': ['docutils>=0.3', 'pack==1.1,==1.3']
             }
 
     def test_entry_points(self, tmpdir):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 9ea7cdcefa..33d6cc5268 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,3 +1,4 @@
+import ast
 import os
 import glob
 import re
@@ -165,19 +166,17 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
 
-    def _setup_script_with_requires(self, requires_line):
-        setup_script = DALS("""
+    def _setup_script_with_requires(self, requires, use_setup_cfg=False):
+        setup_script = DALS(
+            '''
             from setuptools import setup
 
-            setup(
-                name='foo',
-                %s
-                zip_safe=False,
-            )
-            """ % requires_line)
-        build_files({
-            'setup.py': setup_script,
-        })
+            setup(name='foo', zip_safe=False, %s)
+            '''
+        ) % ('' if use_setup_cfg else requires)
+        setup_config = requires if use_setup_cfg else ''
+        build_files({'setup.py': setup_script,
+                     'setup.cfg': setup_config})
 
     mismatch_marker = "python_version<'{this_ver}'".format(
         this_ver=sys.version_info[0],
@@ -188,131 +187,198 @@ def _setup_script_with_requires(self, requires_line):
     )
     invalid_marker = "<=>++"
 
-    def test_install_requires_with_marker(self, tmpdir_cwd, env):
-        tmpl = 'install_requires=["barbazquux;{marker}"],'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [:{marker}]
-             barbazquux
-             ''').format(marker=self.mismatch_marker_alternate)
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+    class RequiresTestHelper(object):
+
+        @staticmethod
+        def parametrize(*test_list, **format_dict):
+            idlist = []
+            argvalues = []
+            for test in test_list:
+                test_params = test.lstrip().split('\n\n', 3)
+                name_kwargs = test_params.pop(0).split('\n')
+                if len(name_kwargs) > 1:
+                    install_cmd_kwargs = ast.literal_eval(name_kwargs[1].strip())
+                else:
+                    install_cmd_kwargs = {}
+                name = name_kwargs[0].strip()
+                setup_py_requires, setup_cfg_requires, expected_requires = (
+                    DALS(a).format(**format_dict) for a in test_params
+                )
+                for id_, requires, use_cfg in (
+                    (name, setup_py_requires, False),
+                    (name + '_in_setup_cfg', setup_cfg_requires, True),
+                ):
+                    idlist.append(id_)
+                    marks = ()
+                    if requires.startswith('@xfail\n'):
+                        requires = requires[7:]
+                        marks = pytest.mark.xfail
+                    argvalues.append(pytest.param(requires, use_cfg,
+                                                  expected_requires,
+                                                  install_cmd_kwargs,
+                                                  marks=marks))
+            return pytest.mark.parametrize('requires,use_setup_cfg,'
+                                           'expected_requires,install_cmd_kwargs',
+                                           argvalues, ids=idlist)
+
+    @RequiresTestHelper.parametrize(
+        # Format of a test:
+        #
+        # id
+        # install_cmd_kwargs [optional]
+        #
+        # requires block (when used in setup.py)
+        #
+        # requires block (when used in setup.cfg)
+        #
+        # expected contents of requires.txt
 
-    def test_install_requires_with_extra(self, tmpdir_cwd, env):
-        req = 'install_requires=["barbazquux [test]"],'
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env, cmd=['egg_info'])
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             barbazquux[test]
-             ''')
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        '''
+        install_requires_with_marker
+
+        install_requires=["barbazquux;{mismatch_marker}"],
+
+        [options]
+        install_requires =
+            barbazquux; {mismatch_marker}
 
-    def test_install_requires_with_extra_and_marker(self, tmpdir_cwd, env):
-        tmpl = 'install_requires=["barbazquux [test]; {marker}"],'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [:{marker}]
-             barbazquux[test]
-             ''').format(marker=self.mismatch_marker_alternate)
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        [:{mismatch_marker_alternate}]
+        barbazquux
+        ''',
 
-    def test_setup_requires_with_markers(self, tmpdir_cwd, env):
-        tmpl = 'setup_requires=["barbazquux;{marker}"],'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        '''
+        install_requires_with_extra
+        {'cmd': ['egg_info']}
 
-    def test_tests_require_with_markers(self, tmpdir_cwd, env):
-        tmpl = 'tests_require=["barbazquux;{marker}"],'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(
-            tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        install_requires=["barbazquux [test]"],
 
-    def test_extras_require_with_extra(self, tmpdir_cwd, env):
-        req = 'extras_require={"extra": ["barbazquux [test]"]},'
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env, cmd=['egg_info'])
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [extra]
-             barbazquux[test]
-             ''')
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        [options]
+        install_requires =
+            barbazquux [test]
 
-    def test_extras_require_with_extra_and_marker_in_req(self, tmpdir_cwd, env):
-        tmpl = 'extras_require={{"extra": ["barbazquux [test]; {marker}"]}},'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [extra]
-
-             [extra:{marker}]
-             barbazquux[test]
-             ''').format(marker=self.mismatch_marker_alternate)
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        barbazquux[test]
+        ''',
 
-    def test_extras_require_with_marker(self, tmpdir_cwd, env):
-        tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [:{marker}]
-             barbazquux
-             ''').format(marker=self.mismatch_marker)
-        assert install_requires.lstrip() == expected_requires
-        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+        '''
+        install_requires_with_extra_and_marker
 
-    def test_extras_require_with_marker_in_req(self, tmpdir_cwd, env):
-        tmpl = 'extras_require={{"extra": ["barbazquux; {marker}"]}},'
-        req = tmpl.format(marker=self.mismatch_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        install_requires=["barbazquux [test]; {mismatch_marker}"],
+
+        [options]
+        install_requires =
+            barbazquux [test]; {mismatch_marker}
+
+        [:{mismatch_marker_alternate}]
+        barbazquux[test]
+        ''',
+
+        '''
+        setup_requires_with_markers
+
+        setup_requires=["barbazquux;{mismatch_marker}"],
+
+        [options]
+        setup_requires =
+            barbazquux; {mismatch_marker}
+
+        ''',
+
+        '''
+        tests_require_with_markers
+        {'cmd': ['test'], 'output': "Ran 0 tests in"}
+
+        tests_require=["barbazquux;{mismatch_marker}"],
+
+        [options]
+        tests_require =
+            barbazquux; {mismatch_marker}
+
+        ''',
+
+        '''
+        extras_require_with_extra
+        {'cmd': ['egg_info']}
+
+        extras_require={{"extra": ["barbazquux [test]"]}},
+
+        [options.extras_require]
+        extra = barbazquux [test]
+
+        [extra]
+        barbazquux[test]
+        ''',
+
+        '''
+        extras_require_with_extra_and_marker_in_req
+
+        extras_require={{"extra": ["barbazquux [test]; {mismatch_marker}"]}},
+
+        [options.extras_require]
+        extra =
+            barbazquux [test]; {mismatch_marker}
+
+        [extra]
+
+        [extra:{mismatch_marker_alternate}]
+        barbazquux[test]
+        ''',
+
+        # FIXME: ConfigParser does not allow : in key names!
+        '''
+        extras_require_with_marker
+
+        extras_require={{":{mismatch_marker}": ["barbazquux"]}},
+
+        @xfail
+        [options.extras_require]
+        :{mismatch_marker} = barbazquux
+
+        [:{mismatch_marker}]
+        barbazquux
+        ''',
+
+        '''
+        extras_require_with_marker_in_req
+
+        extras_require={{"extra": ["barbazquux; {mismatch_marker}"]}},
+
+        [options.extras_require]
+        extra =
+            barbazquux; {mismatch_marker}
+
+        [extra]
+
+        [extra:{mismatch_marker_alternate}]
+        barbazquux
+        ''',
+
+        '''
+        extras_require_with_empty_section
+
+        extras_require={{"empty": []}},
+
+        [options.extras_require]
+        empty =
+
+        [empty]
+        ''',
+        # Format arguments.
+        invalid_marker=invalid_marker,
+        mismatch_marker=mismatch_marker,
+        mismatch_marker_alternate=mismatch_marker_alternate,
+    )
+    def test_requires(self, tmpdir_cwd, env,
+                      requires, use_setup_cfg,
+                      expected_requires, install_cmd_kwargs):
+        self._setup_script_with_requires(requires, use_setup_cfg)
+        self._run_install_command(tmpdir_cwd, env, **install_cmd_kwargs)
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [extra]
-
-             [extra:{marker}]
-             barbazquux
-             ''').format(marker=self.mismatch_marker_alternate)
+        if os.path.exists(requires_txt):
+            with open(requires_txt) as fp:
+                install_requires = fp.read()
+        else:
+            install_requires = ''
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
@@ -332,20 +398,6 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
             self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
-    def test_extras_require_with_empty_section(self, tmpdir_cwd, env):
-        tmpl = 'extras_require={{"empty": []}},'
-        req = tmpl.format(marker=self.invalid_marker)
-        self._setup_script_with_requires(req)
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
-        with open(requires_txt) as fp:
-            install_requires = fp.read()
-        expected_requires = DALS('''
-             [empty]
-             ''').format(marker=self.mismatch_marker_alternate)
-        assert install_requires.lstrip() == expected_requires
-
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """python_requires='>=2.7.12',""")

From a95062c01b93ee87c5ee4a68204fd17c52109c2a Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 2 Aug 2017 00:30:14 +0200
Subject: [PATCH 6691/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7baca6565d..19afc8cb11 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.2.7
+-------
+
+* fix #1105: Fix handling of requirements with environment
+  markers when declared in ``setup.cfg`` (same treatment as
+  for #1081).
+
 v36.2.6
 -------
 

From d548901f9911e784892e99e933d6c60016521e34 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 2 Aug 2017 00:32:54 +0200
Subject: [PATCH 6692/8469] =?UTF-8?q?Bump=20version:=2036.2.6=20=E2=86=92?=
 =?UTF-8?q?=2036.2.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1c2b3b16bb..42531f2832 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.6
+current_version = 36.2.7
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 7b29c53ee2..3c6d4027cb 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.6",
+    version="36.2.7",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 54e6a1cd8565c0130024fd68fd628d36fa0ec1c9 Mon Sep 17 00:00:00 2001
From: Segev Finer <segev208@gmail.com>
Date: Wed, 2 Aug 2017 21:44:53 +0300
Subject: [PATCH 6693/8469] Fix exception on mingw built Python 2

The exception is caused by the VCForPython27 monkey patch. It's not needed on mingw built Python. Disable it and avoid the import by using the same function that `distutils` uses to decide it's running on a mingw built Python.

Fixes #1118
---
 setuptools/monkey.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 6d3711ec1f..62194595fe 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -4,6 +4,7 @@
 
 import sys
 import distutils.filelist
+from distutils.util import get_platform
 import platform
 import types
 import functools
@@ -152,13 +153,13 @@ def patch_for_msvc_specialized_compiler():
     Patch functions in distutils to use standalone Microsoft Visual C++
     compilers.
     """
-    # import late to avoid circular imports on Python < 3.5
-    msvc = import_module('setuptools.msvc')
-
-    if platform.system() != 'Windows':
+    if not get_platform().startswith('win'):
         # Compilers only availables on Microsoft Windows
         return
 
+    # import late to avoid circular imports on Python < 3.5
+    msvc = import_module('setuptools.msvc')
+
     def patch_params(mod_name, func_name):
         """
         Prepare the parameters for patch_func to patch indicated function.

From 300c8802ef4d13d9433af3bce9d22936ff3c610f Mon Sep 17 00:00:00 2001
From: Segev Finer <segev208@gmail.com>
Date: Thu, 3 Aug 2017 21:39:59 +0300
Subject: [PATCH 6694/8469] Fix exception on mingw built Python 2

msvc9compiler doesn't like being imported on mingw built Python. It
throws DistutilsPlatformError, so catch it.

Fixes #1118
---
 setuptools/monkey.py | 9 ++++-----
 setuptools/msvc.py   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 62194595fe..6d3711ec1f 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -4,7 +4,6 @@
 
 import sys
 import distutils.filelist
-from distutils.util import get_platform
 import platform
 import types
 import functools
@@ -153,13 +152,13 @@ def patch_for_msvc_specialized_compiler():
     Patch functions in distutils to use standalone Microsoft Visual C++
     compilers.
     """
-    if not get_platform().startswith('win'):
-        # Compilers only availables on Microsoft Windows
-        return
-
     # import late to avoid circular imports on Python < 3.5
     msvc = import_module('setuptools.msvc')
 
+    if platform.system() != 'Windows':
+        # Compilers only availables on Microsoft Windows
+        return
+
     def patch_params(mod_name, func_name):
         """
         Prepare the parameters for patch_func to patch indicated function.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 729021aca7..f391781543 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -47,7 +47,7 @@ class winreg:
 
 try:
     from distutils.msvc9compiler import Reg
-except ImportError:
+except (ImportError, distutils.errors.DistutilsPlatformError):
     pass
 
 

From 20d6c6c22d88260669a1aec573d62aabc4052abf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 3 Aug 2017 14:52:36 -0400
Subject: [PATCH 6695/8469] Extract variable for exceptions to provide
 explanation

---
 setuptools/msvc.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index f391781543..8e3b638fee 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -45,9 +45,18 @@ class winreg:
 
     safe_env = dict()
 
+_msvc9_suppress_errors = (
+    # msvc9compiler isn't available on some platforms
+    ImportError,
+    
+    # msvc9compiler raises DistutilsPlatformError in some
+    # environments. See #1118.
+    distutils.errors.DistutilsPlatformError,
+)
+
 try:
     from distutils.msvc9compiler import Reg
-except (ImportError, distutils.errors.DistutilsPlatformError):
+except _msvc9_suppress_errors:
     pass
 
 

From e5461b6ccc57596c7e9cf7837084f8a20eeec9b7 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 5 Aug 2017 18:31:53 +0200
Subject: [PATCH 6696/8469] workaround easy_install bug

Don't reuse `easy_install` command in `Distribution.fetch_build_egg` implementation.

Fix #196.
---
 setuptools/dist.py            | 54 ++++++++++++++++-------------------
 setuptools/tests/test_dist.py | 46 +++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 setuptools/tests/test_dist.py

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 21730f22ba..e1510b6f38 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -485,36 +485,30 @@ def get_egg_cache_dir(self):
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
-
-        try:
-            cmd = self._egg_fetcher
-            cmd.package_index.to_scan = []
-        except AttributeError:
-            from setuptools.command.easy_install import easy_install
-            dist = self.__class__({'script_args': ['easy_install']})
-            dist.parse_config_files()
-            opts = dist.get_option_dict('easy_install')
-            keep = (
-                'find_links', 'site_dirs', 'index_url', 'optimize',
-                'site_dirs', 'allow_hosts'
-            )
-            for key in list(opts):
-                if key not in keep:
-                    del opts[key]  # don't use any other settings
-            if self.dependency_links:
-                links = self.dependency_links[:]
-                if 'find_links' in opts:
-                    links = opts['find_links'][1].split() + links
-                opts['find_links'] = ('setup', links)
-            install_dir = self.get_egg_cache_dir()
-            cmd = easy_install(
-                dist, args=["x"], install_dir=install_dir,
-                exclude_scripts=True,
-                always_copy=False, build_directory=None, editable=False,
-                upgrade=False, multi_version=True, no_report=True, user=False
-            )
-            cmd.ensure_finalized()
-            self._egg_fetcher = cmd
+        from setuptools.command.easy_install import easy_install
+        dist = self.__class__({'script_args': ['easy_install']})
+        dist.parse_config_files()
+        opts = dist.get_option_dict('easy_install')
+        keep = (
+            'find_links', 'site_dirs', 'index_url', 'optimize',
+            'site_dirs', 'allow_hosts'
+        )
+        for key in list(opts):
+            if key not in keep:
+                del opts[key]  # don't use any other settings
+        if self.dependency_links:
+            links = self.dependency_links[:]
+            if 'find_links' in opts:
+                links = opts['find_links'][1].split() + links
+            opts['find_links'] = ('setup', links)
+        install_dir = self.get_egg_cache_dir()
+        cmd = easy_install(
+            dist, args=["x"], install_dir=install_dir,
+            exclude_scripts=True,
+            always_copy=False, build_directory=None, editable=False,
+            upgrade=False, multi_version=True, no_report=True, user=False
+        )
+        cmd.ensure_finalized()
         return cmd.easy_install(req)
 
     def _set_global_opts_from_features(self):
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
new file mode 100644
index 0000000000..435ffec0fb
--- /dev/null
+++ b/setuptools/tests/test_dist.py
@@ -0,0 +1,46 @@
+from setuptools import Distribution
+from setuptools.extern.six.moves.urllib.request import pathname2url
+from setuptools.extern.six.moves.urllib_parse import urljoin
+
+from .textwrap import DALS
+from .test_easy_install import make_nspkg_sdist
+
+
+def test_dist_fetch_build_egg(tmpdir):
+    """
+    Check multiple calls to `Distribution.fetch_build_egg` work as expected.
+    """
+    index = tmpdir.mkdir('index')
+    index_url = urljoin('file://', pathname2url(str(index)))
+    def sdist_with_index(distname, version):
+        dist_dir = index.mkdir(distname)
+        dist_sdist = '%s-%s.tar.gz' % (distname, version)
+        make_nspkg_sdist(str(dist_dir.join(dist_sdist)), distname, version)
+        with dist_dir.join('index.html').open('w') as fp:
+            fp.write(DALS(
+                '''
+                <!DOCTYPE html><html><body>
+                <a href="{dist_sdist}" rel="internal">{dist_sdist}</a><br/>
+                </body></html>
+                '''
+            ).format(dist_sdist=dist_sdist))
+    sdist_with_index('barbazquux', '3.2.0')
+    sdist_with_index('barbazquux-runner', '2.11.1')
+    with tmpdir.join('setup.cfg').open('w') as fp:
+        fp.write(DALS(
+            '''
+            [easy_install]
+            index_url = {index_url}
+            '''
+        ).format(index_url=index_url))
+    reqs = '''
+    barbazquux-runner
+    barbazquux
+    '''.split()
+    with tmpdir.as_cwd():
+        dist = Distribution()
+        resolved_dists = [
+            dist.fetch_build_egg(r)
+            for r in reqs
+        ]
+    assert [dist.key for dist in resolved_dists if dist] == reqs

From 986ff42f117e8ac3cc952bfc2c043f7de8ba7084 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 9 Aug 2017 23:16:13 +0300
Subject: [PATCH 6697/8469] Allow adding few files @ metadata.long_description

---
 setuptools/config.py            |  6 +++---
 setuptools/tests/test_config.py | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 06a61d160c..4d3eff93a7 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -245,8 +245,8 @@ def _parse_file(cls, value):
         directory with setup.py.
 
         Examples:
-            include: LICENSE
-            include: src/file.txt
+            file: LICENSE
+            file: src/file.txt
 
         :param str value:
         :rtype: str
@@ -408,7 +408,7 @@ def parsers(self):
             'classifiers': self._get_parser_compound(parse_file, parse_list),
             'license': parse_file,
             'description': parse_file,
-            'long_description': parse_file,
+            'long_description': self._get_parser_compound(parse_list, lambda l: '\n'.join(map(parse_file, l))),
             'version': self._parse_version,
         }
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index dbabd69e6d..95ae60b285 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -139,6 +139,30 @@ def test_basic(self, tmpdir):
             assert metadata.download_url == 'http://test.test.com/test/'
             assert metadata.maintainer_email == 'test@test.com'
 
+    def test_file_mixed(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'long_description =\n'
+            '    Some normal line\n'
+            '    file: README.rst\n'
+            '    Another line\n'
+            '    file: CHANGES.rst\n'
+            '\n'
+        )
+
+        tmpdir.join('README.rst').write('readme contents\nline2')
+        tmpdir.join('CHANGES.rst').write('changelog contents\nand stuff')
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.long_description == (
+                'Some normal line\n'
+                'readme contents\nline2\n'
+                'Another line\n'
+                'changelog contents\nand stuff'
+            )
+
     def test_file_sandboxed(self, tmpdir):
 
         fake_env(

From 30bf0a41e410d17d118fd9bdf9385f035871951e Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 9 Aug 2017 23:34:38 +0300
Subject: [PATCH 6698/8469] Add info about few `file:`'s to changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 19afc8cb11..a48b8f132d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.3.0
+-------
+
+* #1131: Make possible using several ``file:`` directives
+  within metadata.long_description in ``setup.cfg``.
+
 v36.2.7
 -------
 

From b699f94728c82691bed9b67a48b170951535fa38 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 28 Aug 2017 10:22:21 +0300
Subject: [PATCH 6699/8469] Support list of files passed to `file:` directive

* `file:` not accepts comma-separated list of filenames
* files' contents are glues with an LF separator
---
 setuptools/config.py            | 30 +++++++++++++++++++-----------
 setuptools/tests/test_config.py | 10 ++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 4d3eff93a7..b6627c808e 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -246,30 +246,38 @@ def _parse_file(cls, value):
 
         Examples:
             file: LICENSE
-            file: src/file.txt
+            file: README.rst, CHANGELOG.md, src/file.txt
 
         :param str value:
         :rtype: str
         """
+        include_directive = 'file:'
+        file_contents = []
+
         if not isinstance(value, string_types):
             return value
 
-        include_directive = 'file:'
         if not value.startswith(include_directive):
             return value
 
+        filepaths = value[len(include_directive):]
+        filepaths = filepaths.split(',')
+        filepaths = map(str.strip, filepaths)
+        filepaths = map(os.path.abspath, filepaths)
+
         current_directory = os.getcwd()
 
-        filepath = value.replace(include_directive, '').strip()
-        filepath = os.path.abspath(filepath)
+        for filepath in filepaths:
+            if not filepath.startswith(current_directory):
+                raise DistutilsOptionError(
+                    '`file:` directive can not access %s' % filepath)
 
-        if not filepath.startswith(current_directory):
-            raise DistutilsOptionError(
-                '`file:` directive can not access %s' % filepath)
+            if os.path.isfile(filepath):
+                with io.open(filepath, encoding='utf-8') as f:
+                    file_contents.append(f.read())
 
-        if os.path.isfile(filepath):
-            with io.open(filepath, encoding='utf-8') as f:
-                value = f.read()
+        if file_contents:
+            value = '\n'.join(file_contents)
 
         return value
 
@@ -408,7 +416,7 @@ def parsers(self):
             'classifiers': self._get_parser_compound(parse_file, parse_list),
             'license': parse_file,
             'description': parse_file,
-            'long_description': self._get_parser_compound(parse_list, lambda l: '\n'.join(map(parse_file, l))),
+            'long_description': parse_file,
             'version': self._parse_version,
         }
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 95ae60b285..d81d428825 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -144,11 +144,7 @@ def test_file_mixed(self, tmpdir):
         fake_env(
             tmpdir,
             '[metadata]\n'
-            'long_description =\n'
-            '    Some normal line\n'
-            '    file: README.rst\n'
-            '    Another line\n'
-            '    file: CHANGES.rst\n'
+            'long_description = file: README.rst, CHANGES.rst\n'
             '\n'
         )
 
@@ -157,9 +153,7 @@ def test_file_mixed(self, tmpdir):
 
         with get_dist(tmpdir) as dist:
             assert dist.metadata.long_description == (
-                'Some normal line\n'
                 'readme contents\nline2\n'
-                'Another line\n'
                 'changelog contents\nand stuff'
             )
 
@@ -168,7 +162,7 @@ def test_file_sandboxed(self, tmpdir):
         fake_env(
             tmpdir,
             '[metadata]\n'
-            'long_description = file: ../../README\n'
+            'long_description = file: CHANGES.rst, ../../README\n'
         )
 
         with get_dist(tmpdir, parse=False) as dist:

From a9ad5e3fc1e5d5eaa54182129e4245e947c02065 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 28 Aug 2017 10:27:39 +0300
Subject: [PATCH 6700/8469] Update changelog to reflect after-review changes

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a48b8f132d..1392e2a688 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,8 @@
 v36.3.0
 -------
 
-* #1131: Make possible using several ``file:`` directives
-  within metadata.long_description in ``setup.cfg``.
+* #1131: Make possible using several files within ``file:`` directive
+  in metadata.long_description in ``setup.cfg``.
 
 v36.2.7
 -------

From c5c4304d8c60b6f985c8c7607f6950d31d1b2e33 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 28 Aug 2017 10:39:29 +0300
Subject: [PATCH 6701/8469] Convert path to str, which is needed under Py 2

---
 setuptools/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/config.py b/setuptools/config.py
index b6627c808e..6fa50d204b 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -262,6 +262,7 @@ def _parse_file(cls, value):
 
         filepaths = value[len(include_directive):]
         filepaths = filepaths.split(',')
+        filepaths = map(str, filepaths)  # Needed for Python 2
         filepaths = map(str.strip, filepaths)
         filepaths = map(os.path.abspath, filepaths)
 

From 675f5aad0f675ce3d7f3e0125d2ab69843babcbb Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 28 Aug 2017 10:42:52 +0300
Subject: [PATCH 6702/8469] Update docs with a file list usage example

Now it's possible to use it like this:
* long_description = file: README.rst, CHANGELOG.rst, LICENSE.rst
---
 docs/setuptools.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index eb9fdbd3c4..45d746d26c 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2306,7 +2306,7 @@ boilerplate code in some cases.
     name = my_package
     version = attr: src.VERSION
     description = My package description
-    long_description = file: README.rst
+    long_description = file: README.rst, CHANGELOG.rst, LICENSE.rst
     keywords = one, two
     license = BSD 3-Clause License
     classifiers =
@@ -2379,7 +2379,7 @@ Type names used below:
 Special directives:
 
 * ``attr:`` - value could be read from module attribute
-* ``file:`` - value could be read from a file
+* ``file:`` - value could be read from a list of files and then concatenated
 
 
 .. note::

From 29688821b381268a0d59c0d26317d88ad518f966 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Wed, 21 Jun 2017 14:08:35 +0200
Subject: [PATCH 6703/8469] Sort file lists

to generate reproducible zip files
that do not differ depending on (random) filesystem order

See https://reproducible-builds.org/ for why this matters.
---
 setuptools/command/bdist_egg.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 8cd9dfefe2..51755d52c9 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -38,6 +38,14 @@ def strip_module(filename):
         filename = filename[:-6]
     return filename
 
+def sorted_walk(dir):
+    """Do os.walk in a reproducible way,
+    independent of indeterministic filesystem readdir order
+    """
+    for base, dirs, files in os.walk(dir):
+        dirs.sort()
+        files.sort()
+        yield base, dirs, files
 
 def write_stub(resource, pyfile):
     _stub_template = textwrap.dedent("""
@@ -302,7 +310,7 @@ def get_ext_outputs(self):
         ext_outputs = []
 
         paths = {self.bdist_dir: ''}
-        for base, dirs, files in os.walk(self.bdist_dir):
+        for base, dirs, files in sorted_walk(self.bdist_dir):
             for filename in files:
                 if os.path.splitext(filename)[1].lower() in NATIVE_EXTENSIONS:
                     all_outputs.append(paths[base] + filename)
@@ -329,7 +337,7 @@ def get_ext_outputs(self):
 
 def walk_egg(egg_dir):
     """Walk an unpacked egg's contents, skipping the metadata directory"""
-    walker = os.walk(egg_dir)
+    walker = sorted_walk(egg_dir)
     base, dirs, files = next(walker)
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
@@ -463,10 +471,10 @@ def visit(z, dirname, names):
     compression = zipfile.ZIP_DEFLATED if compress else zipfile.ZIP_STORED
     if not dry_run:
         z = zipfile.ZipFile(zip_filename, mode, compression=compression)
-        for dirname, dirs, files in os.walk(base_dir):
+        for dirname, dirs, files in sorted_walk(base_dir):
             visit(z, dirname, files)
         z.close()
     else:
-        for dirname, dirs, files in os.walk(base_dir):
+        for dirname, dirs, files in sorted_walk(base_dir):
             visit(None, dirname, files)
     return zip_filename

From df23966ac5bae1028a37af53c644b9e0839ac93b Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 25 Aug 2017 11:32:36 +0200
Subject: [PATCH 6704/8469] pkg_resources: do not call stat() and access()

The current code in find_on_path is doing a lot of stat() calls which are
actually useless and prone to race conditions.

As described in Python documentation
(https://docs.python.org/3/library/os.html#os.access), os.access must not be
used before opening a file. Same goes for a directory.

This patch removes those checks by handling exceptions correctly when using
os.listdir() instead, which improves pkg_resources import time.
---
 pkg_resources/__init__.py | 95 +++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 39 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f13a69b302..277ee93804 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -34,6 +34,7 @@
 import collections
 import plistlib
 import email.parser
+import errno
 import tempfile
 import textwrap
 import itertools
@@ -80,6 +81,11 @@
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")
 
+if six.PY2:
+    # Those builtin exceptions are only defined in Python 3
+    PermissionError = None
+    NotADirectoryError = None
+
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None
@@ -2008,46 +2014,57 @@ def find_on_path(importer, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
 
-    if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
-        if _is_unpacked_egg(path_item):
-            yield Distribution.from_filename(
-                path_item, metadata=PathMetadata(
-                    path_item, os.path.join(path_item, 'EGG-INFO')
-                )
+    if _is_unpacked_egg(path_item):
+        yield Distribution.from_filename(
+            path_item, metadata=PathMetadata(
+                path_item, os.path.join(path_item, 'EGG-INFO')
             )
-        else:
-            # scan for .egg and .egg-info in directory
-            path_item_entries = _by_version_descending(os.listdir(path_item))
-            for entry in path_item_entries:
-                lower = entry.lower()
-                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
-                    fullpath = os.path.join(path_item, entry)
-                    if os.path.isdir(fullpath):
-                        # egg-info directory, allow getting metadata
-                        if len(os.listdir(fullpath)) == 0:
-                            # Empty egg directory, skip.
-                            continue
-                        metadata = PathMetadata(path_item, fullpath)
-                    else:
-                        metadata = FileMetadata(fullpath)
-                    yield Distribution.from_location(
-                        path_item, entry, metadata, precedence=DEVELOP_DIST
-                    )
-                elif not only and _is_egg_path(entry):
-                    dists = find_distributions(os.path.join(path_item, entry))
-                    for dist in dists:
-                        yield dist
-                elif not only and lower.endswith('.egg-link'):
-                    with open(os.path.join(path_item, entry)) as entry_file:
-                        entry_lines = entry_file.readlines()
-                    for line in entry_lines:
-                        if not line.strip():
-                            continue
-                        path = os.path.join(path_item, line.rstrip())
-                        dists = find_distributions(path)
-                        for item in dists:
-                            yield item
-                        break
+        )
+    else:
+        try:
+            entries = os.listdir(path_item)
+        except (PermissionError, NotADirectoryError):
+            return
+        except OSError as e:
+            # Ignore the directory if does not exist, not a directory or we
+            # don't have permissions
+            if (e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
+                # Python 2 on Windows needs to be handled this way :(
+               or hasattr(e, "winerror") and e.winerror == 267):
+                return
+            raise
+        # scan for .egg and .egg-info in directory
+        path_item_entries = _by_version_descending(entries)
+        for entry in path_item_entries:
+            lower = entry.lower()
+            if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
+                fullpath = os.path.join(path_item, entry)
+                if os.path.isdir(fullpath):
+                    # egg-info directory, allow getting metadata
+                    if len(os.listdir(fullpath)) == 0:
+                        # Empty egg directory, skip.
+                        continue
+                    metadata = PathMetadata(path_item, fullpath)
+                else:
+                    metadata = FileMetadata(fullpath)
+                yield Distribution.from_location(
+                    path_item, entry, metadata, precedence=DEVELOP_DIST
+                )
+            elif not only and _is_egg_path(entry):
+                dists = find_distributions(os.path.join(path_item, entry))
+                for dist in dists:
+                    yield dist
+            elif not only and lower.endswith('.egg-link'):
+                with open(os.path.join(path_item, entry)) as entry_file:
+                    entry_lines = entry_file.readlines()
+                for line in entry_lines:
+                    if not line.strip():
+                        continue
+                    path = os.path.join(path_item, line.rstrip())
+                    dists = find_distributions(path)
+                    for item in dists:
+                        yield item
+                    break
 
 
 register_finder(pkgutil.ImpImporter, find_on_path)

From 5da6479d917d77c8091d8b4c32724054ae5adf65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 08:50:44 -0400
Subject: [PATCH 6705/8469] Avoid interaction of multiple factors in test.

If one wishes to test both 'mixed' and 'sandboxed', let's create a separate test for that, but it's probably unnecessary.
---
 setuptools/tests/test_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index d81d428825..cdfa5af43b 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -162,7 +162,7 @@ def test_file_sandboxed(self, tmpdir):
         fake_env(
             tmpdir,
             '[metadata]\n'
-            'long_description = file: CHANGES.rst, ../../README\n'
+            'long_description = file: ../../README\n'
         )
 
         with get_dist(tmpdir, parse=False) as dist:

From fc59fe8ea080f7d469c6c388fa878c4ede3e6557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 08:54:02 -0400
Subject: [PATCH 6706/8469] Using generator comprehension, avoid casting
 filepath to bytes on Python 2

---
 setuptools/config.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 6fa50d204b..23fc25eae6 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -260,11 +260,8 @@ def _parse_file(cls, value):
         if not value.startswith(include_directive):
             return value
 
-        filepaths = value[len(include_directive):]
-        filepaths = filepaths.split(',')
-        filepaths = map(str, filepaths)  # Needed for Python 2
-        filepaths = map(str.strip, filepaths)
-        filepaths = map(os.path.abspath, filepaths)
+        spec = value[len(include_directive):]
+        filepaths = (os.path.abspath(path.strip()) for path in spec.split(','))
 
         current_directory = os.getcwd()
 

From 3af152a26ee2ef889b8d7ab4428c975ba0c8e85b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 09:05:42 -0400
Subject: [PATCH 6707/8469] Extract method for reading local file. Now return
 results directly instead of for/append loop.

---
 setuptools/config.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 23fc25eae6..2b1562693e 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -252,7 +252,6 @@ def _parse_file(cls, value):
         :rtype: str
         """
         include_directive = 'file:'
-        file_contents = []
 
         if not isinstance(value, string_types):
             return value
@@ -262,22 +261,24 @@ def _parse_file(cls, value):
 
         spec = value[len(include_directive):]
         filepaths = (os.path.abspath(path.strip()) for path in spec.split(','))
+        return '\n'.join(
+            self._read_local_file(path)
+            for path in filepath
+            if os.path.isfile(path)
+        )
+
+    @staticmethod
+    def _read_local_file(filepath):
+        """
+        Read contents of filepath. Raise error if the file
+        isn't in the current directory.
+        """
+        if not filepath.startswith(os.getcwd()):
+            raise DistutilsOptionError(
+                '`file:` directive can not access %s' % filepath)
 
-        current_directory = os.getcwd()
-
-        for filepath in filepaths:
-            if not filepath.startswith(current_directory):
-                raise DistutilsOptionError(
-                    '`file:` directive can not access %s' % filepath)
-
-            if os.path.isfile(filepath):
-                with io.open(filepath, encoding='utf-8') as f:
-                    file_contents.append(f.read())
-
-        if file_contents:
-            value = '\n'.join(file_contents)
-
-        return value
+        with io.open(filepath, encoding='utf-8') as f:
+            return f.read()
 
     @classmethod
     def _parse_attr(cls, value):

From 7e549f6eb72e37f50a1183e018ad2f3b2c952285 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 09:09:41 -0400
Subject: [PATCH 6708/8469] Correct typo

---
 setuptools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 2b1562693e..7ba02184cb 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -263,7 +263,7 @@ def _parse_file(cls, value):
         filepaths = (os.path.abspath(path.strip()) for path in spec.split(','))
         return '\n'.join(
             self._read_local_file(path)
-            for path in filepath
+            for path in filepaths
             if os.path.isfile(path)
         )
 

From 3c25384fce3f6134a342ab32b7afc54cc6066fa3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 09:13:37 -0400
Subject: [PATCH 6709/8469] Use proper reference.

---
 setuptools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 7ba02184cb..75f829fb88 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -262,7 +262,7 @@ def _parse_file(cls, value):
         spec = value[len(include_directive):]
         filepaths = (os.path.abspath(path.strip()) for path in spec.split(','))
         return '\n'.join(
-            self._read_local_file(path)
+            cls._read_local_file(path)
             for path in filepaths
             if os.path.isfile(path)
         )

From 9e708961e7fa64e56c9469ca52163d7e2df31477 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 09:32:25 -0400
Subject: [PATCH 6710/8469] Need to perform the local assertion before checking
 for existence.

---
 setuptools/config.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 75f829fb88..9a62e2ec55 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -262,21 +262,20 @@ def _parse_file(cls, value):
         spec = value[len(include_directive):]
         filepaths = (os.path.abspath(path.strip()) for path in spec.split(','))
         return '\n'.join(
-            cls._read_local_file(path)
+            cls._read_file(path)
             for path in filepaths
-            if os.path.isfile(path)
+            if (cls._assert_local(path) or True)
+            and os.path.isfile(path)
         )
 
     @staticmethod
-    def _read_local_file(filepath):
-        """
-        Read contents of filepath. Raise error if the file
-        isn't in the current directory.
-        """
+    def _assert_local(filepath):
         if not filepath.startswith(os.getcwd()):
             raise DistutilsOptionError(
                 '`file:` directive can not access %s' % filepath)
 
+    @staticmethod
+    def _read_file(filepath):
         with io.open(filepath, encoding='utf-8') as f:
             return f.read()
 

From b4d58d4929dd4e19870b5eafa48046a0a0c2bf07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Aug 2017 09:45:10 -0400
Subject: [PATCH 6711/8469] =?UTF-8?q?Bump=20version:=2036.2.7=20=E2=86=92?=
 =?UTF-8?q?=2036.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 3 ++-
 setup.py  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2a6529faae..ddc2a7229d 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.2.7
+current_version = 36.3.0
 commit = True
 tag = True
 
@@ -23,3 +23,4 @@ formats = zip
 universal = 1
 
 [bumpversion:file:setup.py]
+
diff --git a/setup.py b/setup.py
index 3c6d4027cb..d7a13445bd 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.2.7",
+    version="36.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 4fc60ed1e47f725a833dd63656ceec981a58e1a0 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sat, 30 Jul 2016 08:15:53 -0700
Subject: [PATCH 6712/8469] Add new long_description_content_type kwarg

This is used to populate the new `Description-Content-Type` field.

`Description-Content-Type` is described at
https://github.com/pypa/python-packaging-user-guide/pull/258
---
 setup.py                       |  1 +
 setuptools/command/egg_info.py |  4 ++++
 setuptools/dist.py             | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/setup.py b/setup.py
index d7a13445bd..a02e41aa2e 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ def pypi_link(pkg_filename):
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     long_description=long_description,
+    long_description_content_type='text/x-rst; charset=UTF-8',
     keywords="CPAN PyPI distutils eggs package management",
     url="https://github.com/pypa/setuptools",
     src_root=None,
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6c00b0b7c2..a183d15db7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -599,6 +599,10 @@ def write_pkg_info(cmd, basename, filename):
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
         metadata.name, oldname = cmd.egg_name, metadata.name
+        metadata.long_description_content_type = getattr(
+            cmd.distribution,
+            'long_description_content_type'
+        )
         try:
             # write unescaped data to PKG-INFO, so older pkg_resources
             # can still parse it
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 21730f22ba..084641a8be 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -58,6 +58,13 @@ def write_pkg_file(self, file):
     if self.download_url:
         file.write('Download-URL: %s\n' % self.download_url)
 
+    long_desc_content_type = getattr(
+        self,
+        'long_description_content_type',
+        None
+    ) or 'UNKNOWN'
+    file.write('Description-Content-Type: %s\n' % long_desc_content_type)
+
     long_desc = rfc822_escape(self.get_long_description())
     file.write('Description: %s\n' % long_desc)
 
@@ -317,6 +324,9 @@ def __init__(self, attrs=None):
         self.dist_files = []
         self.src_root = attrs and attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
+        self.long_description_content_type = _attrs_dict.get(
+            'long_description_content_type'
+        )
         # Make sure we have any eggs needed to interpret 'attrs'
         if attrs is not None:
             self.dependency_links = attrs.pop('dependency_links', [])

From ffc5f66bf730106854bd2bf41da494d5a17dcc46 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Sun, 31 Jul 2016 15:17:12 -0700
Subject: [PATCH 6713/8469] Add test_long_description_content_type

Test that specifying a `long_description_content_type` keyword arg to
the `setup` function results in writing a `Description-Content-Type`
line to the `PKG-INFO` file in the `<distribution>.egg-info` directory.

`Description-Content-Type` is described at
https://github.com/pypa/python-packaging-user-guide/pull/258
---
 setuptools/tests/test_egg_info.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 33d6cc5268..e454694d11 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -398,6 +398,31 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
             self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_long_description_content_type(self, tmpdir_cwd, env):
+        # Test that specifying a `long_description_content_type` keyword arg to
+        # the `setup` function results in writing a `Description-Content-Type`
+        # line to the `PKG-INFO` file in the `<distribution>.egg-info`
+        # directory.
+        # `Description-Content-Type` is described at
+        # https://github.com/pypa/python-packaging-user-guide/pull/258
+
+        self._setup_script_with_requires(
+            """long_description_content_type='text/markdown',""")
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        code, data = environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        expected_line = 'Description-Content-Type: text/markdown'
+        assert expected_line in pkg_info_lines
+
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """python_requires='>=2.7.12',""")

From 6b65f6b0a4e116dc56217ad8bc92e2a57d8c15a3 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 28 Aug 2017 12:31:48 -0500
Subject: [PATCH 6714/8469] Add long_description_content_type to metadata table

---
 docs/setuptools.txt | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 45d746d26c..531d727c10 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2394,27 +2394,28 @@ Metadata
     Aliases given below are supported for compatibility reasons,
     but not advised.
 
-=================  =================  =====
-Key                Aliases            Accepted value type
-=================  =================  =====
-name                                  str
-version                               attr:, str
-url                home-page          str
-download_url       download-url       str
-author                                str
-author_email       author-email       str
-maintainer                            str
-maintainer_email   maintainer-email   str
-classifiers        classifier         file:, list-comma
-license                               file:, str
-description        summary            file:, str
-long_description   long-description   file:, str
-keywords                              list-comma
-platforms          platform           list-comma
-provides                              list-comma
-requires                              list-comma
-obsoletes                             list-comma
-=================  =================  =====
+==============================  =================  =====
+Key                             Aliases            Accepted value type
+==============================  =================  =====
+name                                               str
+version                                            attr:, str
+url                             home-page          str
+download_url                    download-url       str
+author                                             str
+author_email                    author-email       str
+maintainer                                         str
+maintainer_email                maintainer-email   str
+classifiers                     classifier         file:, list-comma
+license                                            file:, str
+description                     summary            file:, str
+long_description                long-description   file:, str
+long_description_content_type                      str
+keywords                                           list-comma
+platforms                       platform           list-comma
+provides                                           list-comma
+requires                                           list-comma
+obsoletes                                          list-comma
+==============================  =================  =====
 
 .. note::
 

From bf1f96484714dab6ab79462085d5716cd7b175b1 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 28 Aug 2017 13:11:19 -0500
Subject: [PATCH 6715/8469] Update CHANGES.rst

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1392e2a688..f512cb78f5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.4.0
+-------
+
+* #1075: Add new ``Description-Content-Type`` metadata field. `See here for
+  documentation on how to use this field.
+  <https://packaging.python.org/specifications/#description-content-type>`_
+
 v36.3.0
 -------
 

From ff554f49af775663bc37e1005cf1b613804b2f51 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 7 Aug 2017 23:28:19 +0200
Subject: [PATCH 6716/8469] pkg_resources: improve
 WorkingSet.resolve(replace_conflicting=True)

Correctly replace conflicting distributions in sub-requirements
if possible (instead of only for top-level requirements passed
as arguments).

Fix #1124.
---
 pkg_resources/__init__.py               |  14 +-
 pkg_resources/tests/test_working_set.py | 478 ++++++++++++++++++++++++
 2 files changed, 489 insertions(+), 3 deletions(-)
 create mode 100644 pkg_resources/tests/test_working_set.py

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index f13a69b302..9eb2a37000 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -852,7 +852,10 @@ def resolve(self, requirements, env=None, installer=None,
                             # distribution
                             env = Environment([])
                             ws = WorkingSet([])
-                    dist = best[req.key] = env.best_match(req, ws, installer)
+                    dist = best[req.key] = env.best_match(
+                        req, ws, installer,
+                        replace_conflicting=replace_conflicting
+                    )
                     if dist is None:
                         requirers = required_by.get(req, None)
                         raise DistributionNotFound(req, requirers)
@@ -1104,7 +1107,7 @@ def add(self, dist):
                 dists.append(dist)
                 dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
 
-    def best_match(self, req, working_set, installer=None):
+    def best_match(self, req, working_set, installer=None, replace_conflicting=False):
         """Find distribution best matching `req` and usable on `working_set`
 
         This calls the ``find(req)`` method of the `working_set` to see if a
@@ -1117,7 +1120,12 @@ def best_match(self, req, working_set, installer=None):
         calling the environment's ``obtain(req, installer)`` method will be
         returned.
         """
-        dist = working_set.find(req)
+        try:
+            dist = working_set.find(req)
+        except VersionConflict:
+            if not replace_conflicting:
+                raise
+            dist = None
         if dist is not None:
             return dist
         for dist in self[req.key]:
diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
new file mode 100644
index 0000000000..422a7283e9
--- /dev/null
+++ b/pkg_resources/tests/test_working_set.py
@@ -0,0 +1,478 @@
+import inspect
+import re
+import textwrap
+
+import pytest
+
+import pkg_resources
+
+from .test_resources import Metadata
+
+
+def strip_comments(s):
+    return '\n'.join(
+        l for l in s.split('\n')
+        if l.strip() and not l.strip().startswith('#')
+    )
+
+def parse_distributions(s):
+    '''
+    Parse a series of distribution specs of the form:
+    {project_name}-{version}
+       [optional, indented requirements specification]
+
+    Example:
+
+        foo-0.2
+        bar-1.0
+          foo>=3.0
+          [feature]
+          baz
+
+    yield 2 distributions:
+        - project_name=foo, version=0.2
+        - project_name=bar, version=1.0, requires=['foo>=3.0', 'baz; extra=="feature"']
+    '''
+    s = s.strip()
+    for spec in re.split('\n(?=[^\s])', s):
+        if not spec:
+            continue
+        fields = spec.split('\n', 1)
+        assert 1 <= len(fields) <= 2
+        name, version = fields.pop(0).split('-')
+        if fields:
+            requires = textwrap.dedent(fields.pop(0))
+            metadata=Metadata(('requires.txt', requires))
+        else:
+            metadata = None
+        dist = pkg_resources.Distribution(project_name=name,
+                                          version=version,
+                                          metadata=metadata)
+        yield dist
+
+
+class FakeInstaller(object):
+
+    def __init__(self, installable_dists):
+        self._installable_dists = installable_dists
+
+    def __call__(self, req):
+        return next(iter(filter(lambda dist: dist in req,
+                                self._installable_dists)), None)
+
+
+def parametrize_test_working_set_resolve(*test_list):
+    idlist = []
+    argvalues = []
+    for test in test_list:
+        (
+            name,
+            installed_dists,
+            installable_dists,
+            requirements,
+            expected1, expected2
+        ) = [
+            strip_comments(s.lstrip()) for s in
+            textwrap.dedent(test).lstrip().split('\n\n', 5)
+        ]
+        installed_dists = list(parse_distributions(installed_dists))
+        installable_dists = list(parse_distributions(installable_dists))
+        requirements = list(pkg_resources.parse_requirements(requirements))
+        for id_, replace_conflicting, expected in (
+            (name, False, expected1),
+            (name + '_replace_conflicting', True, expected2),
+        ):
+            idlist.append(id_)
+            expected = strip_comments(expected.strip())
+            if re.match('\w+$', expected):
+                expected = getattr(pkg_resources, expected)
+                assert issubclass(expected, Exception)
+            else:
+                expected = list(parse_distributions(expected))
+            argvalues.append(pytest.param(installed_dists, installable_dists,
+                                          requirements, replace_conflicting,
+                                          expected))
+    return pytest.mark.parametrize('installed_dists,installable_dists,'
+                                   'requirements,replace_conflicting,'
+                                   'resolved_dists_or_exception',
+                                   argvalues, ids=idlist)
+
+
+@parametrize_test_working_set_resolve(
+    '''
+    # id
+    noop
+
+    # installed
+
+    # installable
+
+    # wanted
+
+    # resolved
+
+    # resolved [replace conflicting]
+    ''',
+
+    '''
+    # id
+    already_installed
+
+    # installed
+    foo-3.0
+
+    # installable
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    foo-3.0
+
+    # resolved [replace conflicting]
+    foo-3.0
+    ''',
+
+    '''
+    # id
+    installable_not_installed
+
+    # installed
+
+    # installable
+    foo-3.0
+    foo-4.0
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    foo-3.0
+
+    # resolved [replace conflicting]
+    foo-3.0
+    ''',
+
+    '''
+    # id
+    not_installable
+
+    # installed
+
+    # installable
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    DistributionNotFound
+
+    # resolved [replace conflicting]
+    DistributionNotFound
+    ''',
+
+    '''
+    # id
+    no_matching_version
+
+    # installed
+
+    # installable
+    foo-3.1
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    DistributionNotFound
+
+    # resolved [replace conflicting]
+    DistributionNotFound
+    ''',
+
+    '''
+    # id
+    installable_with_installed_conflict
+
+    # installed
+    foo-3.1
+
+    # installable
+    foo-3.5
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    foo-3.5
+    ''',
+
+    '''
+    # id
+    not_installable_with_installed_conflict
+
+    # installed
+    foo-3.1
+
+    # installable
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    DistributionNotFound
+    ''',
+
+    '''
+    # id
+    installed_with_installed_require
+
+    # installed
+    foo-3.9
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # installable
+
+    # wanted
+    baz
+
+    # resolved
+    foo-3.9
+    baz-0.1
+
+    # resolved [replace conflicting]
+    foo-3.9
+    baz-0.1
+    ''',
+
+    '''
+    # id
+    installed_with_conflicting_installed_require
+
+    # installed
+    foo-5
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # installable
+
+    # wanted
+    baz
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    DistributionNotFound
+    ''',
+
+    '''
+    # id
+    installed_with_installable_conflicting_require
+
+    # installed
+    foo-5
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # installable
+    foo-2.9
+
+    # wanted
+    baz
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    baz-0.1
+    foo-2.9
+    ''',
+
+    '''
+    # id
+    installed_with_installable_require
+
+    # installed
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # installable
+    foo-3.9
+
+    # wanted
+    baz
+
+    # resolved
+    foo-3.9
+    baz-0.1
+
+    # resolved [replace conflicting]
+    foo-3.9
+    baz-0.1
+    ''',
+
+    '''
+    # id
+    installable_with_installed_require
+
+    # installed
+    foo-3.9
+
+    # installable
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # wanted
+    baz
+
+    # resolved
+    foo-3.9
+    baz-0.1
+
+    # resolved [replace conflicting]
+    foo-3.9
+    baz-0.1
+    ''',
+
+    '''
+    # id
+    installable_with_installable_require
+
+    # installed
+
+    # installable
+    foo-3.9
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # wanted
+    baz
+
+    # resolved
+    foo-3.9
+    baz-0.1
+
+    # resolved [replace conflicting]
+    foo-3.9
+    baz-0.1
+    ''',
+
+    '''
+    # id
+    installable_with_conflicting_installable_require
+
+    # installed
+    foo-5
+
+    # installable
+    foo-2.9
+    baz-0.1
+        foo>=2.1,!=3.1,<4
+
+    # wanted
+    baz
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    baz-0.1
+    foo-2.9
+    ''',
+
+    '''
+    # id
+    conflicting_installables
+
+    # installed
+
+    # installable
+    foo-2.9
+    foo-5.0
+
+    # wanted
+    foo>=2.1,!=3.1,<4
+    foo>=4
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    VersionConflict
+    ''',
+
+    '''
+    # id
+    installables_with_conflicting_requires
+
+    # installed
+
+    # installable
+    foo-2.9
+        dep==1.0
+    baz-5.0
+        dep==2.0
+    dep-1.0
+    dep-2.0
+
+    # wanted
+    foo
+    baz
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    VersionConflict
+    ''',
+
+    '''
+    # id
+    installables_with_conflicting_nested_requires
+
+    # installed
+
+    # installable
+    foo-2.9
+        dep1
+    dep1-1.0
+        subdep<1.0
+    baz-5.0
+        dep2
+    dep2-1.0
+        subdep>1.0
+    subdep-0.9
+    subdep-1.1
+
+    # wanted
+    foo
+    baz
+
+    # resolved
+    VersionConflict
+
+    # resolved [replace conflicting]
+    VersionConflict
+    ''',
+)
+def test_working_set_resolve(installed_dists, installable_dists, requirements,
+                             replace_conflicting, resolved_dists_or_exception):
+    ws = pkg_resources.WorkingSet([])
+    list(map(ws.add, installed_dists))
+    resolve_call = lambda: ws.resolve(
+        requirements, installer=FakeInstaller(installable_dists),
+        replace_conflicting=replace_conflicting,
+    )
+    if inspect.isclass(resolved_dists_or_exception):
+        with pytest.raises(resolved_dists_or_exception):
+            resolve_call()
+    else:
+        assert sorted(resolve_call()) == sorted(resolved_dists_or_exception)

From 3dc206647c09bbdd5d9dc838911e3a9f79702200 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 29 Aug 2017 14:43:53 +0200
Subject: [PATCH 6717/8469] Update changelog

---
 CHANGES.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1392e2a688..1ac9b5fbca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+In development
+--------------
+
+* #1129: Fix working set dependencies handling when replacing conflicting
+  distributions (e.g. when using ``setup_requires`` with a conflicting
+  transitive dependency, fix #1124).
+
 v36.3.0
 -------
 

From 500bb9a161e810523c48825491b853c5fbe595cc Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Tue, 22 Aug 2017 00:22:54 +0200
Subject: [PATCH 6718/8469] Improve README file list handling and add Markdown
 to the current list

Markdown is a widely used format to write README files and
documentation. This patch aims to simplify adding new formats and at
the same time adds that one to the list.
---
 CHANGES.rst                 | 5 +++++
 setuptools/command/sdist.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1392e2a688..a488341f9d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.3.1
+
+* Improved handling of README files extensions and added 
+  Markdown to the list of searched READMES. 
+
 v36.3.0
 -------
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 84e29a1b7d..7b4d197d48 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -37,7 +37,8 @@ class sdist(sdist_add_defaults, orig.sdist):
 
     negative_opt = {}
 
-    READMES = 'README', 'README.rst', 'README.txt'
+    README_EXTENSIONS = ['', '.rst', '.txt', '.md']
+    READMES = tuple('README{}'.format(ext) for ext in README_EXTENSIONS)
 
     def run(self):
         self.run_command('egg_info')

From d12975cabfe905c299541a2292dcd52c26eadce2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Sep 2017 11:02:07 -0400
Subject: [PATCH 6719/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 19afc8cb11..9451ff3a71 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.4.0
+-------
+
+* #1068: Sort files and directories when building eggs for
+  deterministic order.
+
 v36.2.7
 -------
 

From 37eceeb0a4aab75c54f8e6afb66fd236562ca9f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Sep 2017 13:35:22 -0400
Subject: [PATCH 6720/8469] Update changelog

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 24a3e4d0ac..9b9d5fe16d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,10 @@ v36.4.0
 * #1068: Sort files and directories when building eggs for
   deterministic order.
 
+* #196: Remove caching of easy_install command in fetch_build_egg.
+  Fixes issue where ``pytest-runner-N.N`` would satisfy the installation
+  of ``pytest``.
+
 v36.3.0
 -------
 

From 679ead9cc14287a1ba6cb8c0facdf42e20aef035 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Sep 2017 14:05:07 -0400
Subject: [PATCH 6721/8469] Update changelog

---
 CHANGES.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index ced6630c5a..8130511e37 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,8 +16,11 @@ v36.4.0
   distributions (e.g. when using ``setup_requires`` with a conflicting
   transitive dependency, fix #1124).
 
-* #1133: Improved handling of README files extensions and added 
-  Markdown to the list of searched READMES. 
+* #1133: Improved handling of README files extensions and added
+  Markdown to the list of searched READMES.
+
+* #1135: Improve performance of pkg_resources import by not invoking
+  ``access`` or ``stat`` and using ``os.listdir`` instead.
 
 v36.3.0
 -------

From a4980242d8b449e1ab08adaac073deff9efc9cc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Sep 2017 14:07:09 -0400
Subject: [PATCH 6722/8469] =?UTF-8?q?Bump=20version:=2036.3.0=20=E2=86=92?=
 =?UTF-8?q?=2036.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ddc2a7229d..ea649893f1 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.3.0
+current_version = 36.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a02e41aa2e..eb939ff370 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.3.0",
+    version="36.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e909e1cb7aff16a02a965fe3ebaa16a65d749d63 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 3 Sep 2017 20:10:22 +0200
Subject: [PATCH 6723/8469] Fix Python 2.6 support

---
 setuptools/command/sdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 7b4d197d48..508148e06d 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -38,7 +38,7 @@ class sdist(sdist_add_defaults, orig.sdist):
     negative_opt = {}
 
     README_EXTENSIONS = ['', '.rst', '.txt', '.md']
-    READMES = tuple('README{}'.format(ext) for ext in README_EXTENSIONS)
+    READMES = tuple('README{0}'.format(ext) for ext in README_EXTENSIONS)
 
     def run(self):
         self.run_command('egg_info')

From c3052243e0aa7e756645a116fef7ed9ff09bfd5e Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 4 Sep 2017 16:36:05 -0700
Subject: [PATCH 6724/8469] remove IRIX support (closes bpo-31341) (#3310)

See PEP 11.
---
 tests/test_unixccompiler.py |  8 --------
 unixccompiler.py            |  2 --
 util.py                     | 19 +++++++------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index efba27e1c8..eef702cf01 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -51,14 +51,6 @@ def gcv(v):
 
         sysconfig.get_config_var = old_gcv
 
-        # irix646
-        sys.platform = 'irix646'
-        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
-
-        # osf1V5
-        sys.platform = 'osf1V5'
-        self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
-
         # GCC GNULD
         sys.platform = 'bar'
         def gcv(v):
diff --git a/unixccompiler.py b/unixccompiler.py
index 3f321c28dc..ab4d4de156 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -233,8 +233,6 @@ def runtime_library_dir_option(self, dir):
             if self._is_gcc(compiler):
                 return ["-Wl,+s", "-L" + dir]
             return ["+s", "-L" + dir]
-        elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
-            return ["-rpath", dir]
         else:
             if self._is_gcc(compiler):
                 # gcc on non-GNU systems does not need -Wl, but can
diff --git a/util.py b/util.py
index fdcf6fabae..b8a69114c8 100644
--- a/util.py
+++ b/util.py
@@ -16,21 +16,17 @@
 from distutils.errors import DistutilsByteCompileError
 
 def get_platform ():
-    """Return a string that identifies the current platform.  This is used
-    mainly to distinguish platform-specific build directories and
-    platform-specific built distributions.  Typically includes the OS name
-    and version and the architecture (as supplied by 'os.uname()'),
-    although the exact information included depends on the OS; eg. for IRIX
-    the architecture isn't particularly important (IRIX only runs on SGI
-    hardware), but for Linux the kernel version isn't particularly
-    important.
+    """Return a string that identifies the current platform.  This is used mainly to
+    distinguish platform-specific build directories and platform-specific built
+    distributions.  Typically includes the OS name and version and the
+    architecture (as supplied by 'os.uname()'), although the exact information
+    included depends on the OS; eg. on Linux, the kernel version isn't
+    particularly important.
 
     Examples of returned values:
        linux-i586
        linux-alpha (?)
        solaris-2.6-sun4u
-       irix-5.3
-       irix64-6.2
 
     Windows will return one of:
        win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
@@ -38,6 +34,7 @@ def get_platform ():
        win32 (all others - specifically, sys.platform is returned)
 
     For other non-POSIX platforms, currently just returns 'sys.platform'.
+
     """
     if os.name == 'nt':
         # sniff sys.version for architecture.
@@ -87,8 +84,6 @@ def get_platform ():
             bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
             machine += ".%s" % bitness[sys.maxsize]
         # fall through to standard osname-release-machine representation
-    elif osname[:4] == "irix":              # could be "irix64"!
-        return "%s-%s" % (osname, release)
     elif osname[:3] == "aix":
         return "%s-%s.%s" % (osname, version, release)
     elif osname[:6] == "cygwin":

From 91a97f1145f3d78667b162907af985b8d6fcc61a Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 6 Sep 2017 10:01:38 -0700
Subject: [PATCH 6725/8469] bpo-31340: Change to building with MSVC v141
 (included with Visual Studio 2017) (#3311)

---
 command/bdist_wininst.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index d3e1d3af22..6309c3e248 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -318,26 +318,30 @@ def get_exe_bytes(self):
         # string compares seem wrong, but are what sysconfig.py itself uses
         if self.target_version and self.target_version < cur_version:
             if self.target_version < "2.4":
-                bv = 6.0
+                bv = '6.0'
             elif self.target_version == "2.4":
-                bv = 7.1
+                bv = '7.1'
             elif self.target_version == "2.5":
-                bv = 8.0
+                bv = '8.0'
             elif self.target_version <= "3.2":
-                bv = 9.0
+                bv = '9.0'
             elif self.target_version <= "3.4":
-                bv = 10.0
+                bv = '10.0'
             else:
-                bv = 14.0
+                bv = '14.0'
         else:
             # for current version - use authoritative check.
             try:
                 from msvcrt import CRT_ASSEMBLY_VERSION
             except ImportError:
                 # cross-building, so assume the latest version
-                bv = 14.0
+                bv = '14.0'
             else:
-                bv = float('.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]))
+                bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2])
+                if bv == '14.11':
+                    # v141 and v140 are binary compatible,
+                    # so keep using the 14.0 stub.
+                    bv = '14.0'
 
 
         # wininst-x.y.exe is in the same directory as this file
@@ -353,7 +357,7 @@ def get_exe_bytes(self):
         else:
             sfix = ''
 
-        filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
+        filename = os.path.join(directory, "wininst-%s%s.exe" % (bv, sfix))
         f = open(filename, "rb")
         try:
             return f.read()

From 3a5968943a1722688994990326d2009210179e9d Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 6 Sep 2017 15:45:25 -0700
Subject: [PATCH 6726/8469] Remove all mention of Windows IA-64 support
 (GH-3389)

It was mostly removed long ago.
---
 command/build_ext.py |  2 +-
 msvc9compiler.py     |  4 +---
 msvccompiler.py      |  2 +-
 tests/test_util.py   |  7 -------
 util.py              | 12 +-----------
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 9155626a47..7444565562 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -208,7 +208,7 @@ def finalize_options(self):
             if self.plat_name == 'win32':
                 suffix = 'win32'
             else:
-                # win-amd64 or win-ia64
+                # win-amd64
                 suffix = self.plat_name[4:]
             new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
             if suffix:
diff --git a/msvc9compiler.py b/msvc9compiler.py
index c401ddc86e..4c0036a0f1 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -55,7 +55,6 @@
 PLAT_TO_VCVARS = {
     'win32' : 'x86',
     'win-amd64' : 'amd64',
-    'win-ia64' : 'ia64',
 }
 
 class Reg:
@@ -344,7 +343,7 @@ def initialize(self, plat_name=None):
         if plat_name is None:
             plat_name = get_platform()
         # sanity check for platforms to prevent obscure errors later.
-        ok_plats = 'win32', 'win-amd64', 'win-ia64'
+        ok_plats = 'win32', 'win-amd64'
         if plat_name not in ok_plats:
             raise DistutilsPlatformError("--plat-name must be one of %s" %
                                          (ok_plats,))
@@ -362,7 +361,6 @@ def initialize(self, plat_name=None):
             # to cross compile, you use 'x86_amd64'.
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
-            # No idea how itanium handles this, if at all.
             if plat_name == get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]
diff --git a/msvccompiler.py b/msvccompiler.py
index 1048cd4159..d1de2fbfcb 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -172,7 +172,7 @@ def get_build_version():
 def get_build_architecture():
     """Return the processor architecture.
 
-    Possible results are "Intel", "Itanium", or "AMD64".
+    Possible results are "Intel" or "AMD64".
     """
 
     prefix = " bit ("
diff --git a/tests/test_util.py b/tests/test_util.py
index 4e9d79b7c6..e2fc380958 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -78,13 +78,6 @@ def test_get_platform(self):
         sys.platform = 'win32'
         self.assertEqual(get_platform(), 'win-amd64')
 
-        # windows XP, itanium
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Itanium)]')
-        sys.platform = 'win32'
-        self.assertEqual(get_platform(), 'win-ia64')
-
         # macbook
         os.name = 'posix'
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
diff --git a/util.py b/util.py
index b8a69114c8..9394c1e056 100644
--- a/util.py
+++ b/util.py
@@ -30,24 +30,14 @@ def get_platform ():
 
     Windows will return one of:
        win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-ia64 (64bit Windows on Itanium)
        win32 (all others - specifically, sys.platform is returned)
 
     For other non-POSIX platforms, currently just returns 'sys.platform'.
 
     """
     if os.name == 'nt':
-        # sniff sys.version for architecture.
-        prefix = " bit ("
-        i = sys.version.find(prefix)
-        if i == -1:
-            return sys.platform
-        j = sys.version.find(")", i)
-        look = sys.version[i+len(prefix):j].lower()
-        if look == 'amd64':
+        if 'amd64' in sys.version.lower():
             return 'win-amd64'
-        if look == 'itanium':
-            return 'win-ia64'
         return sys.platform
 
     # Set for cross builds explicitly

From d3c1d635ce32d35fb3b520d1ab009e401c7c1722 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 7 Sep 2017 11:49:23 -0700
Subject: [PATCH 6727/8469] bpo-30389 Adds detection of VS 2017 to
 distutils._msvccompiler (#1632)

---
 _msvccompiler.py           | 95 +++++++++++++++++++++++++++-----------
 tests/test_msvccompiler.py | 28 ++++++++++-
 2 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index b120273fe9..ef1356b97d 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -17,6 +17,7 @@
 import shutil
 import stat
 import subprocess
+import winreg
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
@@ -24,10 +25,9 @@
 from distutils import log
 from distutils.util import get_platform
 
-import winreg
 from itertools import count
 
-def _find_vcvarsall(plat_spec):
+def _find_vc2015():
     try:
         key = winreg.OpenKeyEx(
             winreg.HKEY_LOCAL_MACHINE,
@@ -38,9 +38,9 @@ def _find_vcvarsall(plat_spec):
         log.debug("Visual C++ is not registered")
         return None, None
 
+    best_version = 0
+    best_dir = None
     with key:
-        best_version = 0
-        best_dir = None
         for i in count():
             try:
                 v, vc_dir, vt = winreg.EnumValue(key, i)
@@ -53,25 +53,74 @@ def _find_vcvarsall(plat_spec):
                     continue
                 if version >= 14 and version > best_version:
                     best_version, best_dir = version, vc_dir
-        if not best_version:
-            log.debug("No suitable Visual C++ version found")
-            return None, None
+    return best_version, best_dir
+
+def _find_vc2017():
+    import _findvs
+    import threading
+
+    best_version = 0,   # tuple for full version comparisons
+    best_dir = None
+
+    # We need to call findall() on its own thread because it will
+    # initialize COM.
+    all_packages = []
+    def _getall():
+        all_packages.extend(_findvs.findall())
+    t = threading.Thread(target=_getall)
+    t.start()
+    t.join()
+
+    for name, version_str, path, packages in all_packages:
+        if 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64' in packages:
+            vc_dir = os.path.join(path, 'VC', 'Auxiliary', 'Build')
+            if not os.path.isdir(vc_dir):
+                continue
+            try:
+                version = tuple(int(i) for i in version_str.split('.'))
+            except (ValueError, TypeError):
+                continue
+            if version > best_version:
+                best_version, best_dir = version, vc_dir
+    try:
+        best_version = best_version[0]
+    except IndexError:
+        best_version = None
+    return best_version, best_dir
 
-        vcvarsall = os.path.join(best_dir, "vcvarsall.bat")
-        if not os.path.isfile(vcvarsall):
-            log.debug("%s cannot be found", vcvarsall)
-            return None, None
+def _find_vcvarsall(plat_spec):
+    best_version, best_dir = _find_vc2017()
+    vcruntime = None
+    vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
+    if best_version:
+        vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
+            "Microsoft.VC141.CRT", "vcruntime140.dll")
+        try:
+            import glob
+            vcruntime = glob.glob(vcredist, recursive=True)[-1]
+        except (ImportError, OSError, LookupError):
+            vcruntime = None
+
+    if not best_version:
+        best_version, best_dir = _find_vc2015()
+        if best_version:
+            vcruntime = os.path.join(best_dir, 'redist', vcruntime_plat,
+                "Microsoft.VC140.CRT", "vcruntime140.dll")
+
+    if not best_version:
+        log.debug("No suitable Visual C++ version found")
+        return None, None
 
+    vcvarsall = os.path.join(best_dir, "vcvarsall.bat")
+    if not os.path.isfile(vcvarsall):
+        log.debug("%s cannot be found", vcvarsall)
+        return None, None
+
+    if not vcruntime or not os.path.isfile(vcruntime):
+        log.debug("%s cannot be found", vcruntime)
         vcruntime = None
-        vcruntime_spec = _VCVARS_PLAT_TO_VCRUNTIME_REDIST.get(plat_spec)
-        if vcruntime_spec:
-            vcruntime = os.path.join(best_dir,
-                vcruntime_spec.format(best_version))
-            if not os.path.isfile(vcruntime):
-                log.debug("%s cannot be found", vcruntime)
-                vcruntime = None
 
-        return vcvarsall, vcruntime
+    return vcvarsall, vcruntime
 
 def _get_vc_env(plat_spec):
     if os.getenv("DISTUTILS_USE_SDK"):
@@ -130,14 +179,6 @@ def _find_exe(exe, paths=None):
     'win-amd64' : 'x86_amd64',
 }
 
-# A map keyed by get_platform() return values to the file under
-# the VC install directory containing the vcruntime redistributable.
-_VCVARS_PLAT_TO_VCRUNTIME_REDIST = {
-    'x86' : 'redist\\x86\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
-    'amd64' : 'redist\\x64\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
-    'x86_amd64' : 'redist\\x64\\Microsoft.VC{0}0.CRT\\vcruntime{0}0.dll',
-}
-
 # A set containing the DLLs that are guaranteed to be available for
 # all micro versions of this Python version. Known extension
 # dependencies that are not in this set will be copied to the output
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index 4dc24886c8..70a9c93a4e 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -76,12 +76,12 @@ def test_vcruntime_skip_copy(self):
         compiler = _msvccompiler.MSVCCompiler()
         compiler.initialize()
         dll = compiler._vcruntime_redist
-        self.assertTrue(os.path.isfile(dll))
+        self.assertTrue(os.path.isfile(dll), dll or "<None>")
 
         compiler._copy_vcruntime(tempdir)
 
         self.assertFalse(os.path.isfile(os.path.join(
-            tempdir, os.path.basename(dll))))
+            tempdir, os.path.basename(dll))), dll or "<None>")
 
     def test_get_vc_env_unicode(self):
         import distutils._msvccompiler as _msvccompiler
@@ -101,6 +101,30 @@ def test_get_vc_env_unicode(self):
             if old_distutils_use_sdk:
                 os.environ['DISTUTILS_USE_SDK'] = old_distutils_use_sdk
 
+    def test_get_vc2017(self):
+        import distutils._msvccompiler as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2017
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._find_vc2017()
+        if version:
+            self.assertGreaterEqual(version, 15)
+            self.assertTrue(os.path.isdir(path))
+        else:
+            raise unittest.SkipTest("VS 2017 is not installed")
+
+    def test_get_vc2015(self):
+        import distutils._msvccompiler as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2015
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._find_vc2015()
+        if version:
+            self.assertGreaterEqual(version, 14)
+            self.assertTrue(os.path.isdir(path))
+        else:
+            raise unittest.SkipTest("VS 2015 is not installed")
+
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 

From b59076e9f12c295aca42927f2a544e46fd31f386 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 21 May 2017 15:12:22 -0500
Subject: [PATCH 6728/8469] pep517: add module

Add a module that implements the PEP 517 specification.
---
 setuptools/dist.py   | 13 +++++++-
 setuptools/pep517.py | 70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/pep517.py

diff --git a/setuptools/dist.py b/setuptools/dist.py
index a2ca879516..42501f663b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -30,6 +30,14 @@
 __import__('pkg_resources.extern.packaging.version')
 
 
+skip_install_eggs = False
+
+
+class SetupRequirementsError(BaseException):
+    def __init__(self, specifiers):
+        self.specifiers = specifiers
+
+
 def _get_unpatched(cls):
     warnings.warn("Do not call this function", DeprecationWarning)
     return get_unpatched(cls)
@@ -332,7 +340,10 @@ def __init__(self, attrs=None):
             self.dependency_links = attrs.pop('dependency_links', [])
             assert_string_list(self, 'dependency_links', self.dependency_links)
         if attrs and 'setup_requires' in attrs:
-            self.fetch_build_eggs(attrs['setup_requires'])
+            if skip_install_eggs:
+                raise SetupRequirementsError(attrs['setup_requires'])
+            else:
+                self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)
diff --git a/setuptools/pep517.py b/setuptools/pep517.py
new file mode 100644
index 0000000000..3256030818
--- /dev/null
+++ b/setuptools/pep517.py
@@ -0,0 +1,70 @@
+import os
+import sys
+import subprocess
+import tokenize
+import shutil
+import tempfile
+
+from setuptools import dist
+from setuptools.dist import SetupRequirementsError
+
+
+SETUPTOOLS_IMPLEMENTATION_REVISION = 0.1
+
+def _run_setup(setup_script='setup.py'): #
+    # Note that we can reuse our build directory between calls
+    # Correctness comes first, then optimization later    
+    __file__=setup_script
+    f=getattr(tokenize, 'open', open)(__file__)
+    code=f.read().replace('\\r\\n', '\\n')
+    f.close()
+    exec(compile(code, __file__, 'exec'))
+
+
+def get_build_requires(config_settings):
+    requirements = ['setuptools', 'wheel']
+    dist.skip_install_eggs = True
+
+    sys.argv = sys.argv[:1] + ['egg_info'] + \
+        config_settings["--global-option"]
+    try:
+        _run_setup()
+    except SetupRequirementsError as e:
+        requirements += e.specifiers
+
+    dist.skip_install_eggs = False
+
+    return requirements
+
+
+def get_requires_for_build_wheel(config_settings=None):
+    return get_build_requires(config_settings)
+
+
+def get_requires_for_build_sdist(config_settings=None):
+    return get_build_requires(config_settings)
+
+
+def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
+    sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', metadata_directory]
+    _run_setup()
+
+def build_wheel(wheel_directory, config_settings=None,
+                metadata_directory=None):
+    wheel_directory = os.path.abspath(wheel_directory)
+    sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
+        config_settings["--global-option"]
+    _run_setup()
+    if wheel_directory != 'dist':
+        shutil.rmtree(wheel_directory)
+        shutil.copytree('dist', wheel_directory)
+
+
+def build_sdist(sdist_directory, config_settings=None):
+    sdist_directory = os.path.abspath(sdist_directory)
+    sys.argv = sys.argv[:1] + ['sdist'] + \
+        config_settings["--global-option"]
+    _run_setup()
+    if sdist_directory != 'dist':
+        shutil.rmtree(sdist_directory)
+        shutil.copytree('dist', sdist_directory)

From 06ec6304f0fbd36f9a0d1fd1ebf717352c1f5138 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 20:51:44 -0500
Subject: [PATCH 6729/8469] tests: begin build frontend emulation

---
 setuptools/tests/test_pep_517.py | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 setuptools/tests/test_pep_517.py

diff --git a/setuptools/tests/test_pep_517.py b/setuptools/tests/test_pep_517.py
new file mode 100644
index 0000000000..fdc7c2312d
--- /dev/null
+++ b/setuptools/tests/test_pep_517.py
@@ -0,0 +1,41 @@
+import pytest
+import os
+
+# Only test the backend on Python 3
+# because we don't want to require
+# a concurrent.futures backport for testing
+pytest.importorskip('concurrent.futures')
+
+from importlib import import_module
+from concurrent.futures import ProcessPoolExecutor
+
+class BuildBackend(object):
+    """PEP 517 Build Backend"""
+    def __init__(self, cwd=None, env={}, backend_name='setuptools.pep517'):
+        self.cwd = cwd
+        self.env = env
+        self.backend_name = backend_name
+        self.pool = ProcessPoolExecutor()
+
+    def __getattr__(self, name):
+        """Handles aribrary function invokations on the build backend."""
+
+        def method(**kw):
+            return self.pool.submit(
+                BuildBackendCaller(self.cwd, self.env, self.backend_name),
+                (name, kw)).result()
+
+        return method
+
+
+class BuildBackendCaller(object):
+    def __init__(self, cwd, env, backend_name):
+        self.cwd = cwd
+        self.env = env
+        self.backend_name = backend_name
+
+    def __getattr__(self, name):
+        """Handles aribrary function invokations on the build backend."""
+        os.chdir(self.cwd)
+        os.environ.update(self.env)
+        return getattr(import_module(self.backend_name), name)

From bfe0ee278051b5bfb17b4d716750b1f59aec4499 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 21:01:21 -0500
Subject: [PATCH 6730/8469] pep517: implement build backend fixture

---
 .../tests/{test_pep_517.py => test_pep517.py} | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 rename setuptools/tests/{test_pep_517.py => test_pep517.py} (69%)

diff --git a/setuptools/tests/test_pep_517.py b/setuptools/tests/test_pep517.py
similarity index 69%
rename from setuptools/tests/test_pep_517.py
rename to setuptools/tests/test_pep517.py
index fdc7c2312d..7bb460dd13 100644
--- a/setuptools/tests/test_pep_517.py
+++ b/setuptools/tests/test_pep517.py
@@ -8,6 +8,10 @@
 
 from importlib import import_module
 from concurrent.futures import ProcessPoolExecutor
+from .files import build_files
+from .textwrap import DALS
+from . import contexts
+
 
 class BuildBackend(object):
     """PEP 517 Build Backend"""
@@ -39,3 +43,27 @@ def __getattr__(self, name):
         os.chdir(self.cwd)
         os.environ.update(self.env)
         return getattr(import_module(self.backend_name), name)
+
+
+@pytest.fixture
+def build_backend():
+    setup_script = DALS("""
+    from setuptools import setup
+
+    setup(
+        name='foo',
+        py_modules=['hello'],
+        entry_points={'console_scripts': ['hi = hello.run']},
+        zip_safe=False,
+    )
+    """)
+
+    build_files({
+        'setup.py': setup_script,
+        'hello.py': DALS("""
+            def run():
+                print('hello')
+            """)
+    })
+
+    return BuildBackend(cwd='.')    

From 33546858db9b960be11c384f608528b127ca7923 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 21:49:53 -0500
Subject: [PATCH 6731/8469] tests: add get_requires_for_build_wheel

---
 setuptools/pep517.py            | 10 +++++
 setuptools/tests/test_pep517.py | 68 +++++++++++++++++++++------------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 3256030818..b3535790c1 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -21,7 +21,13 @@ def _run_setup(setup_script='setup.py'): #
     exec(compile(code, __file__, 'exec'))
 
 
+def fix_config(config_settings):
+    config_settings = config_settings or {}
+    config_settings.setdefault('--global-option', [])
+    return config_settings
+
 def get_build_requires(config_settings):
+    config_settings = fix_config(config_settings)
     requirements = ['setuptools', 'wheel']
     dist.skip_install_eggs = True
 
@@ -38,10 +44,12 @@ def get_build_requires(config_settings):
 
 
 def get_requires_for_build_wheel(config_settings=None):
+    config_settings = fix_config(config_settings)
     return get_build_requires(config_settings)
 
 
 def get_requires_for_build_sdist(config_settings=None):
+    config_settings = fix_config(config_settings)
     return get_build_requires(config_settings)
 
 
@@ -51,6 +59,7 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
 
 def build_wheel(wheel_directory, config_settings=None,
                 metadata_directory=None):
+    config_settings = fix_config(config_settings)
     wheel_directory = os.path.abspath(wheel_directory)
     sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
         config_settings["--global-option"]
@@ -61,6 +70,7 @@ def build_wheel(wheel_directory, config_settings=None,
 
 
 def build_sdist(sdist_directory, config_settings=None):
+    config_settings = fix_config(config_settings)
     sdist_directory = os.path.abspath(sdist_directory)
     sys.argv = sys.argv[:1] + ['sdist'] + \
         config_settings["--global-option"]
diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 7bb460dd13..fd0a196545 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -6,7 +6,9 @@
 # a concurrent.futures backport for testing
 pytest.importorskip('concurrent.futures')
 
+from contextlib import contextmanager
 from importlib import import_module
+from tempfile import mkdtemp
 from concurrent.futures import ProcessPoolExecutor
 from .files import build_files
 from .textwrap import DALS
@@ -24,10 +26,10 @@ def __init__(self, cwd=None, env={}, backend_name='setuptools.pep517'):
     def __getattr__(self, name):
         """Handles aribrary function invokations on the build backend."""
 
-        def method(**kw):
+        def method(*args, **kw):
             return self.pool.submit(
                 BuildBackendCaller(self.cwd, self.env, self.backend_name),
-                (name, kw)).result()
+                (name, args, kw)).result()
 
         return method
 
@@ -38,32 +40,50 @@ def __init__(self, cwd, env, backend_name):
         self.env = env
         self.backend_name = backend_name
 
-    def __getattr__(self, name):
+    def __call__(self, info):
         """Handles aribrary function invokations on the build backend."""
         os.chdir(self.cwd)
         os.environ.update(self.env)
-        return getattr(import_module(self.backend_name), name)
+        name, args, kw = info
+        return getattr(import_module(self.backend_name), name)(*args, **kw)
+
+
+@contextmanager
+def enter_directory(dir, val=None):
+    original_dir = os.getcwd()
+    os.chdir(dir)
+    yield val
+    os.chdir(original_dir)
 
 
 @pytest.fixture
 def build_backend():
-    setup_script = DALS("""
-    from setuptools import setup
-
-    setup(
-        name='foo',
-        py_modules=['hello'],
-        entry_points={'console_scripts': ['hi = hello.run']},
-        zip_safe=False,
-    )
-    """)
-
-    build_files({
-        'setup.py': setup_script,
-        'hello.py': DALS("""
-            def run():
-                print('hello')
-            """)
-    })
-
-    return BuildBackend(cwd='.')    
+    tmpdir = mkdtemp()
+    with enter_directory(tmpdir):
+        setup_script = DALS("""
+        from setuptools import setup
+
+        setup(
+            name='foo',
+            py_modules=['hello'],
+            setup_requires=['test-package'],
+            entry_points={'console_scripts': ['hi = hello.run']},
+            zip_safe=False,
+        )
+        """)
+
+        build_files({
+            'setup.py': setup_script,
+            'hello.py': DALS("""
+                def run():
+                    print('hello')
+                """)
+        })
+
+    return enter_directory(tmpdir, BuildBackend(cwd='.'))
+
+
+def test_get_requires_for_build_wheel(build_backend):
+    with build_backend as b:
+        assert list(sorted(b.get_requires_for_build_wheel())) == \
+            list(sorted(['test-package', 'setuptools', 'wheel']))

From 12d4fba61cb8a8533566dafdae8874b617aaedbd Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 22:16:34 -0500
Subject: [PATCH 6732/8469] tests: add build_wheel and build_sdist

---
 setuptools/pep517.py            | 11 +++++++++++
 setuptools/tests/test_pep517.py | 24 +++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index b3535790c1..4ba23552f7 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -68,6 +68,11 @@ def build_wheel(wheel_directory, config_settings=None,
         shutil.rmtree(wheel_directory)
         shutil.copytree('dist', wheel_directory)
 
+    wheels = [f for f in os.listdir(wheel_directory)
+                if f.endswith('.whl')]
+
+    assert len(wheels) == 1
+    return wheels[0]
 
 def build_sdist(sdist_directory, config_settings=None):
     config_settings = fix_config(config_settings)
@@ -78,3 +83,9 @@ def build_sdist(sdist_directory, config_settings=None):
     if sdist_directory != 'dist':
         shutil.rmtree(sdist_directory)
         shutil.copytree('dist', sdist_directory)
+
+    sdists = [f for f in os.listdir(sdist_directory)
+                if f.endswith('.tar.gz')]
+
+    assert len(sdists) == 1
+    return sdists[0]
\ No newline at end of file
diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index fd0a196545..0dd38b1b19 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -28,7 +28,8 @@ def __getattr__(self, name):
 
         def method(*args, **kw):
             return self.pool.submit(
-                BuildBackendCaller(self.cwd, self.env, self.backend_name),
+                BuildBackendCaller(os.path.abspath(self.cwd), self.env,
+                                   self.backend_name),
                 (name, args, kw)).result()
 
         return method
@@ -66,7 +67,7 @@ def build_backend():
         setup(
             name='foo',
             py_modules=['hello'],
-            setup_requires=['test-package'],
+            setup_requires=['six'],
             entry_points={'console_scripts': ['hi = hello.run']},
             zip_safe=False,
         )
@@ -86,4 +87,21 @@ def run():
 def test_get_requires_for_build_wheel(build_backend):
     with build_backend as b:
         assert list(sorted(b.get_requires_for_build_wheel())) == \
-            list(sorted(['test-package', 'setuptools', 'wheel']))
+            list(sorted(['six', 'setuptools', 'wheel']))
+
+def test_build_wheel(build_backend):
+    with build_backend as b:
+        dist_dir = os.path.abspath('pip-wheel')
+        os.makedirs(dist_dir)
+        wheel_name = b.build_wheel(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, wheel_name))
+
+
+def test_build_sdist(build_backend):
+    with build_backend as b:
+        dist_dir = os.path.abspath('pip-sdist')
+        os.makedirs(dist_dir)
+        sdist_name = b.build_sdist(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
\ No newline at end of file

From 3a67d08b474385ffb8ac6ba65bddeb3ed760bd1d Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 22:25:52 -0500
Subject: [PATCH 6733/8469] dist: rename skip install eggs to be private.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 42501f663b..1641469ea8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -30,7 +30,7 @@
 __import__('pkg_resources.extern.packaging.version')
 
 
-skip_install_eggs = False
+_skip_install_eggs = False
 
 
 class SetupRequirementsError(BaseException):
@@ -340,10 +340,9 @@ def __init__(self, attrs=None):
             self.dependency_links = attrs.pop('dependency_links', [])
             assert_string_list(self, 'dependency_links', self.dependency_links)
         if attrs and 'setup_requires' in attrs:
-            if skip_install_eggs:
+            if _skip_install_eggs:
                 raise SetupRequirementsError(attrs['setup_requires'])
-            else:
-                self.fetch_build_eggs(attrs['setup_requires'])
+            self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)

From 4148e41fe666c5024efc6577dde6104a0ffa630e Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 3 Sep 2017 22:26:33 -0500
Subject: [PATCH 6734/8469] pep517: rename skip_install_eggs

---
 setuptools/pep517.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 4ba23552f7..68ca88f11c 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -29,7 +29,7 @@ def fix_config(config_settings):
 def get_build_requires(config_settings):
     config_settings = fix_config(config_settings)
     requirements = ['setuptools', 'wheel']
-    dist.skip_install_eggs = True
+    dist._skip_install_eggs = True
 
     sys.argv = sys.argv[:1] + ['egg_info'] + \
         config_settings["--global-option"]
@@ -38,7 +38,7 @@ def get_build_requires(config_settings):
     except SetupRequirementsError as e:
         requirements += e.specifiers
 
-    dist.skip_install_eggs = False
+    dist._skip_install_eggs = False
 
     return requirements
 
@@ -88,4 +88,4 @@ def build_sdist(sdist_directory, config_settings=None):
                 if f.endswith('.tar.gz')]
 
     assert len(sdists) == 1
-    return sdists[0]
\ No newline at end of file
+    return sdists[0]

From b054af5817aed2be88ed6ba856a86423e18edc09 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Wed, 6 Sep 2017 15:21:36 -0500
Subject: [PATCH 6735/8469] dist_info: implement command

---
 setuptools/command/dist_info.py | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 setuptools/command/dist_info.py

diff --git a/setuptools/command/dist_info.py b/setuptools/command/dist_info.py
new file mode 100644
index 0000000000..c8dc659b11
--- /dev/null
+++ b/setuptools/command/dist_info.py
@@ -0,0 +1,37 @@
+"""
+Create a dist_info directory
+As defined in the wheel specification
+"""
+
+import os
+import shutil
+
+from distutils.core import Command
+
+
+class dist_info(Command):
+
+    description = 'create a .dist-info directory'
+
+    user_options = [
+        ('egg-base=', 'e', "directory containing .egg-info directories"
+                           " (default: top of the source tree)"),
+    ]
+
+    def initialize_options(self):
+        self.egg_base = None
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        egg_info = self.get_finalized_command('egg_info')
+        egg_info.run()
+        dist_info_dir = egg_info.egg_info[:-len('.egg-info')] + '.dist-info'
+
+        bdist_wheel = self.get_finalized_command('bdist_wheel')
+        bdist_wheel.egg2dist(egg_info.egg_info, dist_info_dir)
+
+        if self.egg_base:
+            shutil.move(dist_info_dir, os.path.join(
+                self.egg_base, dist_info_dir))

From ddd5d0a9bc0f5b37915ee03fbdc87f1b04529458 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 7 Sep 2017 21:51:47 -0500
Subject: [PATCH 6736/8469] tests: cleanup the backend

---
 setuptools/tests/test_pep517.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 0dd38b1b19..f2438b6aee 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -15,17 +15,21 @@
 from . import contexts
 
 
-class BuildBackend(object):
-    """PEP 517 Build Backend"""
+class BuildBackendBase(object):
     def __init__(self, cwd=None, env={}, backend_name='setuptools.pep517'):
         self.cwd = cwd
         self.env = env
         self.backend_name = backend_name
+
+
+class BuildBackend(object):
+    """PEP 517 Build Backend"""
+    def __init__(self, *args, **kwargs):
+        super(BuildBackend, self).__init__(*args, **kwargs)
         self.pool = ProcessPoolExecutor()
 
     def __getattr__(self, name):
-        """Handles aribrary function invokations on the build backend."""
-
+        """Handles aribrary function invocations on the build backend."""
         def method(*args, **kw):
             return self.pool.submit(
                 BuildBackendCaller(os.path.abspath(self.cwd), self.env,
@@ -35,12 +39,7 @@ def method(*args, **kw):
         return method
 
 
-class BuildBackendCaller(object):
-    def __init__(self, cwd, env, backend_name):
-        self.cwd = cwd
-        self.env = env
-        self.backend_name = backend_name
-
+class BuildBackendCaller(BuildBackendBase):
     def __call__(self, info):
         """Handles aribrary function invokations on the build backend."""
         os.chdir(self.cwd)

From 97ddc77ed2787e67e76d090d338e1d2a67336f16 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 7 Sep 2017 21:58:50 -0500
Subject: [PATCH 6737/8469] tests: implement prepare_metadata

---
 setuptools/tests/test_pep517.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index f2438b6aee..b9a75dbd38 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -103,4 +103,13 @@ def test_build_sdist(build_backend):
         os.makedirs(dist_dir)
         sdist_name = b.build_sdist(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
\ No newline at end of file
+        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
+
+def test_prepare_metadata_for_build_wheel(build_backend):
+    with build_backend as b:
+        dist_dir = os.path.abspath('pip-dist-info')
+        os.makedirs(dist_dir)
+
+        b.prepare_metadata_for_build_wheel()
+
+        assert os.path.isfile(os.path.join(dist_dir, 'METADATA'))

From 17d56d62d38b392d4abf5739eede7f9271e23310 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 7 Sep 2017 22:02:38 -0500
Subject: [PATCH 6738/8469] tests: pep517: fix

---
 setuptools/tests/test_pep517.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index b9a75dbd38..263ca87045 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -22,7 +22,7 @@ def __init__(self, cwd=None, env={}, backend_name='setuptools.pep517'):
         self.backend_name = backend_name
 
 
-class BuildBackend(object):
+class BuildBackend(BuildBackendBase):
     """PEP 517 Build Backend"""
     def __init__(self, *args, **kwargs):
         super(BuildBackend, self).__init__(*args, **kwargs)

From 19db98f416d93dadafea588a9913af6eebc89336 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 7 Sep 2017 22:10:26 -0500
Subject: [PATCH 6739/8469] pep517: prepare_metadata: return basename

---
 setuptools/pep517.py            | 13 +++++++++++--
 setuptools/tests/test_pep517.py |  5 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 68ca88f11c..25474b555b 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -26,6 +26,7 @@ def fix_config(config_settings):
     config_settings.setdefault('--global-option', [])
     return config_settings
 
+
 def get_build_requires(config_settings):
     config_settings = fix_config(config_settings)
     requirements = ['setuptools', 'wheel']
@@ -57,6 +58,13 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', metadata_directory]
     _run_setup()
 
+    dist_infos = [f for f in os.listdir(metadata_directory)
+                  if f.endswith('.dist-info')]
+
+    assert len(dist_infos) == 1
+    return dist_infos[0]
+
+
 def build_wheel(wheel_directory, config_settings=None,
                 metadata_directory=None):
     config_settings = fix_config(config_settings)
@@ -69,11 +77,12 @@ def build_wheel(wheel_directory, config_settings=None,
         shutil.copytree('dist', wheel_directory)
 
     wheels = [f for f in os.listdir(wheel_directory)
-                if f.endswith('.whl')]
+              if f.endswith('.whl')]
 
     assert len(wheels) == 1
     return wheels[0]
 
+
 def build_sdist(sdist_directory, config_settings=None):
     config_settings = fix_config(config_settings)
     sdist_directory = os.path.abspath(sdist_directory)
@@ -85,7 +94,7 @@ def build_sdist(sdist_directory, config_settings=None):
         shutil.copytree('dist', sdist_directory)
 
     sdists = [f for f in os.listdir(sdist_directory)
-                if f.endswith('.tar.gz')]
+              if f.endswith('.tar.gz')]
 
     assert len(sdists) == 1
     return sdists[0]
diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 263ca87045..0fbdacc4e7 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -110,6 +110,7 @@ def test_prepare_metadata_for_build_wheel(build_backend):
         dist_dir = os.path.abspath('pip-dist-info')
         os.makedirs(dist_dir)
 
-        b.prepare_metadata_for_build_wheel()
+        dist_info = b.prepare_metadata_for_build_wheel(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, 'METADATA'))
+        assert os.path.isfile(os.path.join(dist_dir, dist_info,
+                              'METADATA'))

From 944976d869b96d6a960daf45bf8545987c6dea91 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 7 Sep 2017 22:15:03 -0500
Subject: [PATCH 6740/8469] dist_info: register command

---
 setuptools/command/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index c96d33c23d..4fe3bb5684 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib',
+    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib', 'dist_info',
 ]
 
 from distutils.command.bdist import bdist

From 80a820fe98ad6a687828c3e129412f33417498c5 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Fri, 8 Sep 2017 10:40:52 -0500
Subject: [PATCH 6741/8469] tests: pep517: minor cleanup

---
 setuptools/tests/test_pep517.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 0fbdacc4e7..da22877024 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -34,17 +34,16 @@ def method(*args, **kw):
             return self.pool.submit(
                 BuildBackendCaller(os.path.abspath(self.cwd), self.env,
                                    self.backend_name),
-                (name, args, kw)).result()
+                name, *args, **kw).result()
 
         return method
 
 
 class BuildBackendCaller(BuildBackendBase):
-    def __call__(self, info):
+    def __call__(self, name, *args, **kw):
         """Handles aribrary function invokations on the build backend."""
         os.chdir(self.cwd)
         os.environ.update(self.env)
-        name, args, kw = info
         return getattr(import_module(self.backend_name), name)(*args, **kw)
 
 

From 2d96236409de143b6c37c98ceeac3db969c4e247 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 09:17:38 -0400
Subject: [PATCH 6742/8469] Extract variable for ignorable errors to improve
 indentation.

---
 pkg_resources/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ce6053f170..6eca01dc70 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2036,9 +2036,12 @@ def find_on_path(importer, path_item, only=False):
         except OSError as e:
             # Ignore the directory if does not exist, not a directory or we
             # don't have permissions
-            if (e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
+            ignorable = (
+                e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
                 # Python 2 on Windows needs to be handled this way :(
-               or hasattr(e, "winerror") and e.winerror == 267):
+                or getattr(e, "winerror", None) == 267
+            )
+            if ignorable:
                 return
             raise
         # scan for .egg and .egg-info in directory

From 0a61412521347cf683dcb1026c3d44aeac31f94a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 09:28:44 -0400
Subject: [PATCH 6743/8469] Remove unnecessary paretheses.

---
 pkg_resources/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6eca01dc70..9c0f3d95dc 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2253,9 +2253,7 @@ def _is_egg_path(path):
     """
     Determine if given path appears to be an egg.
     """
-    return (
-        path.lower().endswith('.egg')
-    )
+    return path.lower().endswith('.egg')
 
 
 def _is_unpacked_egg(path):

From f24868e7921d960ea4d63958e7090522ada8f2d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:18:18 -0400
Subject: [PATCH 6744/8469] Extract functions for resolving egg_link and
 reading non-empty lines from a file.

---
 pkg_resources/__init__.py | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 9c0f3d95dc..cbf0a6a5fc 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2048,8 +2048,8 @@ def find_on_path(importer, path_item, only=False):
         path_item_entries = _by_version_descending(entries)
         for entry in path_item_entries:
             lower = entry.lower()
+            fullpath = os.path.join(path_item, entry)
             if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
-                fullpath = os.path.join(path_item, entry)
                 if os.path.isdir(fullpath):
                     # egg-info directory, allow getting metadata
                     if len(os.listdir(fullpath)) == 0:
@@ -2062,20 +2062,34 @@ def find_on_path(importer, path_item, only=False):
                     path_item, entry, metadata, precedence=DEVELOP_DIST
                 )
             elif not only and _is_egg_path(entry):
-                dists = find_distributions(os.path.join(path_item, entry))
+                dists = find_distributions(fullpath)
                 for dist in dists:
                     yield dist
             elif not only and lower.endswith('.egg-link'):
-                with open(os.path.join(path_item, entry)) as entry_file:
-                    entry_lines = entry_file.readlines()
-                for line in entry_lines:
-                    if not line.strip():
-                        continue
-                    path = os.path.join(path_item, line.rstrip())
-                    dists = find_distributions(path)
-                    for item in dists:
-                        yield item
-                    break
+                dists = resolve_egg_link(fullpath)
+                for dist in dists:
+                    yield dist
+
+
+def non_empty_lines(path):
+    """
+    Yield non-empty lines from file at path
+    """
+    return (line.rstrip() for line in open(path) if line.strip())
+
+
+def resolve_egg_link(path):
+    """
+    Given a path to an .egg-link, resolve distributions
+    present in the referenced path.
+    """
+    referenced_paths = non_empty_lines(path)
+    resolved_paths = (
+        os.path.join(os.path.dirname(path), ref)
+        for ref in referenced_paths
+    )
+    dist_groups = map(find_distributions, resolved_paths)
+    return next(dist_groups, ())
 
 
 register_finder(pkgutil.ImpImporter, find_on_path)

From 7e173ffb2da7cbdbf0c90b491779402aa74a6b42 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:31:50 -0400
Subject: [PATCH 6745/8469] Extract distributions_from_metadata

---
 pkg_resources/__init__.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index cbf0a6a5fc..7b5043dc10 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2050,17 +2050,9 @@ def find_on_path(importer, path_item, only=False):
             lower = entry.lower()
             fullpath = os.path.join(path_item, entry)
             if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
-                if os.path.isdir(fullpath):
-                    # egg-info directory, allow getting metadata
-                    if len(os.listdir(fullpath)) == 0:
-                        # Empty egg directory, skip.
-                        continue
-                    metadata = PathMetadata(path_item, fullpath)
-                else:
-                    metadata = FileMetadata(fullpath)
-                yield Distribution.from_location(
-                    path_item, entry, metadata, precedence=DEVELOP_DIST
-                )
+                dists = distributions_from_metadata(fullpath)
+                for dist in dists:
+                    yield dist
             elif not only and _is_egg_path(entry):
                 dists = find_distributions(fullpath)
                 for dist in dists:
@@ -2071,6 +2063,21 @@ def find_on_path(importer, path_item, only=False):
                     yield dist
 
 
+def distributions_from_metadata(path):
+    root = os.path.dirname(path)
+    if os.path.isdir(path):
+        if len(os.listdir(path)) == 0:
+            # empty metadata dir; skip
+            return
+        metadata = PathMetadata(root, path)
+    else:
+        metadata = FileMetadata(path)
+    entry = os.path.basename(path)
+    yield Distribution.from_location(
+        root, entry, metadata, precedence=DEVELOP_DIST,
+    )
+
+
 def non_empty_lines(path):
     """
     Yield non-empty lines from file at path

From a95cd91de2c314640fdd5466a67c44f1642f9803 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:41:47 -0400
Subject: [PATCH 6746/8469] Assign dists just once

---
 pkg_resources/__init__.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7b5043dc10..87568c2e3f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2049,18 +2049,18 @@ def find_on_path(importer, path_item, only=False):
         for entry in path_item_entries:
             lower = entry.lower()
             fullpath = os.path.join(path_item, entry)
-            if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
-                dists = distributions_from_metadata(fullpath)
-                for dist in dists:
-                    yield dist
-            elif not only and _is_egg_path(entry):
-                dists = find_distributions(fullpath)
-                for dist in dists:
-                    yield dist
-            elif not only and lower.endswith('.egg-link'):
-                dists = resolve_egg_link(fullpath)
-                for dist in dists:
-                    yield dist
+            dists = (
+                distributions_from_metadata(fullpath)
+                if lower.endswith('.egg-info')
+                or lower.endswith('.dist-info') else
+                find_distributions(fullpath)
+                if not only and _is_egg_path(entry) else
+                resolve_egg_link(fullpath)
+                if not only and lower.endswith('.egg-link') else
+                ()
+            )
+            for dist in dists:
+                yield dist
 
 
 def distributions_from_metadata(path):

From 5df09426c3cfae75257849dcc505f4258217bf62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:43:27 -0400
Subject: [PATCH 6747/8469] Extract variable for is_meta

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 87568c2e3f..d9664adc01 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2049,10 +2049,10 @@ def find_on_path(importer, path_item, only=False):
         for entry in path_item_entries:
             lower = entry.lower()
             fullpath = os.path.join(path_item, entry)
+            is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
             dists = (
                 distributions_from_metadata(fullpath)
-                if lower.endswith('.egg-info')
-                or lower.endswith('.dist-info') else
+                if is_meta else
                 find_distributions(fullpath)
                 if not only and _is_egg_path(entry) else
                 resolve_egg_link(fullpath)

From e9e4cf8c1b55c55f16337f31bbbadd44da615557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:45:29 -0400
Subject: [PATCH 6748/8469] Short circuit and dedent large block

---
 pkg_resources/__init__.py | 65 ++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d9664adc01..3f7e5b6608 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2028,39 +2028,40 @@ def find_on_path(importer, path_item, only=False):
                 path_item, os.path.join(path_item, 'EGG-INFO')
             )
         )
-    else:
-        try:
-            entries = os.listdir(path_item)
-        except (PermissionError, NotADirectoryError):
+        return
+
+    try:
+        entries = os.listdir(path_item)
+    except (PermissionError, NotADirectoryError):
+        return
+    except OSError as e:
+        # Ignore the directory if does not exist, not a directory or we
+        # don't have permissions
+        ignorable = (
+            e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
+            # Python 2 on Windows needs to be handled this way :(
+            or getattr(e, "winerror", None) == 267
+        )
+        if ignorable:
             return
-        except OSError as e:
-            # Ignore the directory if does not exist, not a directory or we
-            # don't have permissions
-            ignorable = (
-                e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
-                # Python 2 on Windows needs to be handled this way :(
-                or getattr(e, "winerror", None) == 267
-            )
-            if ignorable:
-                return
-            raise
-        # scan for .egg and .egg-info in directory
-        path_item_entries = _by_version_descending(entries)
-        for entry in path_item_entries:
-            lower = entry.lower()
-            fullpath = os.path.join(path_item, entry)
-            is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
-            dists = (
-                distributions_from_metadata(fullpath)
-                if is_meta else
-                find_distributions(fullpath)
-                if not only and _is_egg_path(entry) else
-                resolve_egg_link(fullpath)
-                if not only and lower.endswith('.egg-link') else
-                ()
-            )
-            for dist in dists:
-                yield dist
+        raise
+    # scan for .egg and .egg-info in directory
+    path_item_entries = _by_version_descending(entries)
+    for entry in path_item_entries:
+        lower = entry.lower()
+        fullpath = os.path.join(path_item, entry)
+        is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
+        dists = (
+            distributions_from_metadata(fullpath)
+            if is_meta else
+            find_distributions(fullpath)
+            if not only and _is_egg_path(entry) else
+            resolve_egg_link(fullpath)
+            if not only and lower.endswith('.egg-link') else
+            ()
+        )
+        for dist in dists:
+            yield dist
 
 
 def distributions_from_metadata(path):

From eea94d01a59f7f43dd41c271ff6849995a4d1e7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 11:58:33 -0400
Subject: [PATCH 6749/8469] Extract function for listdir

---
 pkg_resources/__init__.py | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3f7e5b6608..d9154e6d36 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2030,21 +2030,8 @@ def find_on_path(importer, path_item, only=False):
         )
         return
 
-    try:
-        entries = os.listdir(path_item)
-    except (PermissionError, NotADirectoryError):
-        return
-    except OSError as e:
-        # Ignore the directory if does not exist, not a directory or we
-        # don't have permissions
-        ignorable = (
-            e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
-            # Python 2 on Windows needs to be handled this way :(
-            or getattr(e, "winerror", None) == 267
-        )
-        if ignorable:
-            return
-        raise
+    entries = safe_listdir(path_item)
+
     # scan for .egg and .egg-info in directory
     path_item_entries = _by_version_descending(entries)
     for entry in path_item_entries:
@@ -2064,6 +2051,27 @@ def find_on_path(importer, path_item, only=False):
             yield dist
 
 
+def safe_listdir(path):
+    """
+    Attempt to list contents of path, but suppress some exceptions.
+    """
+    try:
+        return os.listdir(path)
+    except (PermissionError, NotADirectoryError):
+        pass
+    except OSError as e:
+        # Ignore the directory if does not exist, not a directory or
+        # permission denied
+        ignorable = (
+            e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
+            # Python 2 on Windows needs to be handled this way :(
+            or getattr(e, "winerror", None) == 267
+        )
+        if not ignorable:
+            raise
+    return ()
+
+
 def distributions_from_metadata(path):
     root = os.path.dirname(path)
     if os.path.isdir(path):

From 9ff9a0d6a79b8d4b610f8e8780586dd2114856d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 12:04:12 -0400
Subject: [PATCH 6750/8469] Create a NoDists factory for returning no dists,
 whose boolean value is False.

---
 pkg_resources/__init__.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d9154e6d36..82b4ce51bc 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2045,12 +2045,29 @@ def find_on_path(importer, path_item, only=False):
             if not only and _is_egg_path(entry) else
             resolve_egg_link(fullpath)
             if not only and lower.endswith('.egg-link') else
-            ()
+            NoDists()(fullpath)
         )
         for dist in dists:
             yield dist
 
 
+class NoDists:
+    """
+    >>> bool(NoDists())
+    False
+
+    >>> list(NoDists()('anything'))
+    []
+    """
+    def __bool__(self):
+        return False
+    if six.PY2:
+        __nonzero__ = __bool__
+
+    def __call__(self, fullpath):
+        return iter(())
+
+
 def safe_listdir(path):
     """
     Attempt to list contents of path, but suppress some exceptions.

From 6f10cff41ca441a91ddb9182c591a4a2e170633a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 12:14:46 -0400
Subject: [PATCH 6751/8469] Extract function for resolving the dist factory for
 a path item entry

---
 pkg_resources/__init__.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 82b4ce51bc..0f5dd23875 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2035,22 +2035,26 @@ def find_on_path(importer, path_item, only=False):
     # scan for .egg and .egg-info in directory
     path_item_entries = _by_version_descending(entries)
     for entry in path_item_entries:
-        lower = entry.lower()
         fullpath = os.path.join(path_item, entry)
-        is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
-        dists = (
-            distributions_from_metadata(fullpath)
-            if is_meta else
-            find_distributions(fullpath)
-            if not only and _is_egg_path(entry) else
-            resolve_egg_link(fullpath)
-            if not only and lower.endswith('.egg-link') else
-            NoDists()(fullpath)
-        )
-        for dist in dists:
+        factory = dist_factory(path_item, entry, only)
+        for dist in factory(fullpath):
             yield dist
 
 
+def dist_factory(path_item, entry, only):
+    lower = entry.lower()
+    is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
+    return (
+        distributions_from_metadata
+        if is_meta else
+        find_distributions
+        if not only and _is_egg_path(entry) else
+        resolve_egg_link
+        if not only and lower.endswith('.egg-link') else
+        NoDists()
+    )
+
+
 class NoDists:
     """
     >>> bool(NoDists())

From d3fc6036c7fe25ee7ffee3fc9f0b75f2b9d5a58a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 9 Sep 2017 12:26:51 -0400
Subject: [PATCH 6752/8469] Screen entries before sorting in find_on_path. Ref
 #1134.

---
 CHANGES.rst               |  7 +++++++
 pkg_resources/__init__.py | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8130511e37..011e19fff9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.5.0
+-------
+
+* Inspired by #1134, performed substantial refactoring of
+  ``pkg_resources.find_on_path`` to facilitate an optimization
+  for paths with many non-version entries.
+
 v36.4.0
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0f5dd23875..68349df44e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2032,8 +2032,17 @@ def find_on_path(importer, path_item, only=False):
 
     entries = safe_listdir(path_item)
 
+    # for performance, before sorting by version,
+    # screen entries for only those that will yield
+    # distributions
+    filtered = (
+        entry
+        for entry in entries
+        if dist_factory(path_item, entry, only)
+    )
+
     # scan for .egg and .egg-info in directory
-    path_item_entries = _by_version_descending(entries)
+    path_item_entries = _by_version_descending(filtered)
     for entry in path_item_entries:
         fullpath = os.path.join(path_item, entry)
         factory = dist_factory(path_item, entry, only)
@@ -2042,6 +2051,9 @@ def find_on_path(importer, path_item, only=False):
 
 
 def dist_factory(path_item, entry, only):
+    """
+    Return a dist_factory for a path_item and entry
+    """
     lower = entry.lower()
     is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
     return (

From 63bc0b0210a73a8a534b03210aacfadd0523e405 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 28 Aug 2017 21:31:53 +0300
Subject: [PATCH 6753/8469] Add badges to the top of README

* PYPI
* Travis CI
* AppVeyor CI
* List of currently supported Python versions
---
 README.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.rst b/README.rst
index 2f55bce106..1c6ee60354 100755
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,17 @@
+.. image:: https://img.shields.io/pypi/v/setuptools.svg
+   :target: https://pypi.org/project/setuptools
+
 .. image:: https://readthedocs.org/projects/setuptools/badge/?version=latest
     :target: https://setuptools.readthedocs.io
 
+.. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20build%20%40%20Travis%20CI
+   :target: http://travis-ci.org/pypa/setuptools
+
+.. image:: https://img.shields.io/appveyor/ci/jaraco/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
+   :target: https://ci.appveyor.com/project/jaraco/setuptools/branch/master
+
+.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
+
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From 5d163b5bf846b86dfebf335548deb1398262c8b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 Sep 2017 15:41:30 -0400
Subject: [PATCH 6754/8469] Use platform-friendly syntax for Mercurial
 checkouts. Fixes #170.

---
 CHANGES.rst                 | 6 ++++++
 setuptools/package_index.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 011e19fff9..f9de501228 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.5.1
+-------
+
+* #170: When working with Mercurial checkouts, use Windows-friendly
+  syntax for suppressing output.
+
 v36.5.0
 -------
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 2acc817a66..a6363b1856 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -893,7 +893,7 @@ def _download_hg(self, url, filename):
 
         if rev is not None:
             self.info("Updating to %s", rev)
-            os.system("(cd %s && hg up -C -r %s >&-)" % (
+            os.system("(cd %s && hg up -C -r %s -q)" % (
                 filename,
                 rev,
             ))

From 6cffeac651ba21ea52e8e85c1e652882f236660f Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 13 Sep 2017 21:56:45 +0200
Subject: [PATCH 6755/8469] fix `test_pip_upgrade_from_source` test on Python
 2.6

---
 setuptools/tests/test_virtualenv.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 17b8793cf6..9dbd3c86ed 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,5 +1,6 @@
 import glob
 import os
+import sys
 
 from pytest import yield_fixture
 from pytest_fixture_config import yield_requires_config
@@ -39,6 +40,9 @@ def test_pip_upgrade_from_source(virtualenv):
     Check pip can upgrade setuptools from source.
     """
     dist_dir = virtualenv.workspace
+    if sys.version_info < (2, 7):
+        # Python 2.6 support was dropped in wheel 0.30.0.
+        virtualenv.run('pip install -U "wheel<0.30.0"')
     # Generate source distribution / wheel.
     virtualenv.run(' && '.join((
         'cd {source}',

From 871d4e30e525c102929bcdf7ff53054e99a5cd63 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 13 Sep 2017 22:49:13 +0200
Subject: [PATCH 6756/8469] travis: make deploy stage conditional

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a5e08a2efc..60f5815fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ jobs:
   - python: *latest_py2
     env: LANG=C
   - stage: deploy (to PyPI for tagged commits)
+    if: tag IS present
     python: *latest_py3
     install: skip
     script: skip

From 4a2ebc7e7f71f38925977a18fad2a8883dc86c65 Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Thu, 14 Sep 2017 16:29:55 +0000
Subject: [PATCH 6757/8469] Docs proofreading

---
 docs/setuptools.txt | 92 ++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 531d727c10..f255cfd217 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2281,21 +2281,23 @@ Configuring setup() using setup.cfg files
 
 .. note:: New in 30.3.0 (8 Dec 2016).
 
-.. important:: ``setup.py`` with ``setup()`` function call is still required even 
-                if your configuration resides in ``setup.cfg``.
+.. important::
+    A ``setup.py`` file containing a ``setup()`` function call is still
+    required even if your configuration resides in ``setup.cfg``.
 
-``Setuptools`` allows using configuration files (usually `setup.cfg`)
-to define package’s metadata and other options which are normally supplied
-to ``setup()`` function.
+``Setuptools`` allows using configuration files (usually :file:`setup.cfg`)
+to define a package’s metadata and other options that are normally supplied
+to the ``setup()`` function.
 
-This approach not only allows automation scenarios, but also reduces
+This approach not only allows automation scenarios but also reduces
 boilerplate code in some cases.
 
 .. note::
-    Implementation presents limited compatibility with distutils2-like
-    ``setup.cfg`` sections (used by ``pbr`` and ``d2to1`` packages).
 
-    Namely: only metadata related keys from ``metadata`` section are supported
+    This implementation has limited compatibility with the distutils2-like
+    ``setup.cfg`` sections used by the ``pbr`` and ``d2to1`` packages.
+
+    Namely: only metadata-related keys from ``metadata`` section are supported
     (except for ``description-file``); keys from ``files``, ``entry_points``
     and ``backwards_compat`` are not supported.
 
@@ -2336,12 +2338,13 @@ boilerplate code in some cases.
         src.subpackage2
 
 
-Metadata and options could be set in sections with the same names.
+Metadata and options are set in the config sections of the same name.
 
-* Keys are the same as keyword arguments one provides to ``setup()`` function.
+* Keys are the same as the keyword arguments one provides to the ``setup()``
+  function.
 
-* Complex values could be placed comma-separated or one per line
-  in *dangling* sections. The following are the same:
+* Complex values can be written comma-separated or placed one per line
+  in *dangling* config values. The following are equivalent:
 
   .. code-block:: ini
 
@@ -2353,10 +2356,11 @@ Metadata and options could be set in sections with the same names.
         one
         two
 
-* In some cases complex values could be provided in subsections for clarity.
+* In some cases, complex values can be provided in dedicated subsections for
+  clarity.
 
-* Some keys allow ``file:``, ``attr:`` and ``find:`` directives to cover
-  common usecases.
+* Some keys allow ``file:``, ``attr:``, and ``find:`` directives in order to
+  cover common usecases.
 
 * Unknown keys are ignored.
 
@@ -2369,33 +2373,34 @@ Some values are treated as simple strings, some allow more logic.
 Type names used below:
 
 * ``str`` - simple string
-* ``list-comma`` - dangling list or comma-separated values string
-* ``list-semi`` - dangling list or semicolon-separated values string
-* ``bool`` -  ``True`` is 1, yes, true
-* ``dict`` - list-comma where keys from values are separated by =
-* ``section`` - values could be read from a dedicated (sub)section
+* ``list-comma`` - dangling list or string of comma-separated values
+* ``list-semi`` - dangling list or string of semicolon-separated values
+* ``bool`` - ``True`` is 1, yes, true
+* ``dict`` - list-comma where keys are separated from values by ``=``
+* ``section`` - values are read from a dedicated (sub)section
 
 
 Special directives:
 
-* ``attr:`` - value could be read from module attribute
-* ``file:`` - value could be read from a list of files and then concatenated
+* ``attr:`` - Value is read from a module attribute.  ``attr:`` supports
+  callables and iterables; unsupported types are cast using ``str()``.
+* ``file:`` - Value is read from a list of files and then concatenated
 
 
 .. note::
-    ``file:`` directive is sandboxed and won't reach anything outside
-    directory with ``setup.py``.
+    The ``file:`` directive is sandboxed and won't reach anything outside
+    the directory containing ``setup.py``.
 
 
 Metadata
 --------
 
 .. note::
-    Aliases given below are supported for compatibility reasons,
-    but not advised.
+    The aliases given below are supported for compatibility reasons,
+    but their use is not advised.
 
 ==============================  =================  =====
-Key                             Aliases            Accepted value type
+Key                             Aliases            Type
 ==============================  =================  =====
 name                                               str
 version                                            attr:, str
@@ -2417,17 +2422,12 @@ requires                                           list-comma
 obsoletes                                          list-comma
 ==============================  =================  =====
 
-.. note::
-
-    **version** - ``attr:`` supports callables; supports iterables;
-    unsupported types are casted using ``str()``.
-
 
 Options
 -------
 
 =======================  =====
-Key                      Accepted value type
+Key                      Type
 =======================  =====
 zip_safe                 bool
 setup_requires           list-semi
@@ -2454,10 +2454,10 @@ py_modules               list-comma
 
 .. note::
 
-    **packages** - ``find:`` directive can be further configured
-    in a dedicated subsection `options.packages.find`. This subsection
-    accepts the same keys as `setuptools.find` function:
-    `where`, `include`, `exclude`.
+    **packages** - The ``find:`` directive can be further configured
+    in a dedicated subsection ``options.packages.find``. This subsection
+    accepts the same keys as the `setuptools.find` function:
+    ``where``, ``include``, and ``exclude``.
 
 
 Configuration API
@@ -2465,7 +2465,7 @@ Configuration API
 
 Some automation tools may wish to access data from a configuration file.
 
-``Setuptools`` exposes ``read_configuration()`` function allowing
+``Setuptools`` exposes a ``read_configuration()`` function for
 parsing ``metadata`` and ``options`` sections into a dictionary.
 
 
@@ -2476,16 +2476,16 @@ parsing ``metadata`` and ``options`` sections into a dictionary.
     conf_dict = read_configuration('/home/user/dev/package/setup.cfg')
 
 
-By default ``read_configuration()`` will read only file provided
+By default, ``read_configuration()`` will read only the file provided
 in the first argument. To include values from other configuration files
-which could be in various places set `find_others` function argument
+which could be in various places, set the ``find_others`` keyword argument
 to ``True``.
 
-If you have only a configuration file but not the whole package you can still
-try to get data out of it with the help of `ignore_option_errors` function
-argument. When it is set to ``True`` all options with errors possibly produced
-by directives, such as ``attr:`` and others will be silently ignored.
-As a consequence the resulting dictionary will include no such options.
+If you have only a configuration file but not the whole package, you can still
+try to get data out of it with the help of the ``ignore_option_errors`` keyword
+argument. When it is set to ``True``, all options with errors possibly produced
+by directives, such as ``attr:`` and others, will be silently ignored.
+As a consequence, the resulting dictionary will include no such options.
 
 
 --------------------------------

From ee33fa23dcdb7f9a0e89e2df3a50706b75678a36 Mon Sep 17 00:00:00 2001
From: Bibo Hao <haobibo@users.noreply.github.com>
Date: Wed, 13 Sep 2017 11:47:12 +0800
Subject: [PATCH 6758/8469] python 3 bdist_egg --exclude-source-files
 __pycache__ issue

---
 setuptools/command/bdist_egg.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 51755d52c9..5bfc7ba221 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -8,6 +8,7 @@
 from types import CodeType
 import sys
 import os
+import re
 import textwrap
 import marshal
 
@@ -238,6 +239,8 @@ def run(self):
 
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
+        py3 = sys.version_info >= (3, 0)
+        re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$')
         for base, dirs, files in walk_egg(self.bdist_dir):
             for name in files:
                 if name.endswith('.py'):
@@ -245,6 +248,17 @@ def zap_pyfiles(self):
                     log.debug("Deleting %s", path)
                     os.unlink(path)
 
+                if py3 and base.endswith('__pycache__'):
+                    path_old = os.path.join(base, name)
+                    
+                    m = re_pycache_file.match(name)
+                    path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2))
+                    log.info("Renaming Python 3 .pyc file from [%s] to [%s]" % (path_old, path_new))
+                    if os.path.exists(path_new):
+                        os.unlink(path_new)
+                    os.rename(path_old, path_new)
+
+
     def zip_safe(self):
         safe = getattr(self.distribution, 'zip_safe', None)
         if safe is not None:

From acc77db19ed21f11c20493fd81831343212a3f01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Sep 2017 10:19:19 -0400
Subject: [PATCH 6759/8469] Combine changelog entries

---
 CHANGES.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f9de501228..8217aabad4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,12 +1,9 @@
-v36.5.1
+v36.5.0
 -------
 
 * #170: When working with Mercurial checkouts, use Windows-friendly
   syntax for suppressing output.
 
-v36.5.0
--------
-
 * Inspired by #1134, performed substantial refactoring of
   ``pkg_resources.find_on_path`` to facilitate an optimization
   for paths with many non-version entries.

From 9f295a706590b1e3618978d6f2d83af0b893ec4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Sep 2017 10:19:29 -0400
Subject: [PATCH 6760/8469] =?UTF-8?q?Bump=20version:=2036.4.0=20=E2=86=92?=
 =?UTF-8?q?=2036.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ea649893f1..e5ebf4b8df 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.4.0
+current_version = 36.5.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index eb939ff370..ee968d9a89 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.4.0",
+    version="36.5.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b1e47b43f3d2b972057ebe4c564b0ed03d39cd3d Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 16 Sep 2017 11:23:22 -0700
Subject: [PATCH 6761/8469] Clean up resource warnings during tests

When tests are invoked with the Python flag -Wall, warnings appear in
the form of:

  ResourceWarning: unclosed file ...

Close all files and resources deterministically to avoid such warnings.
Most often, easiest to do using a context manager.
---
 pkg_resources/__init__.py                 | 6 +++++-
 pkg_resources/tests/test_pkg_resources.py | 4 ++--
 setuptools/tests/test_egg_info.py         | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 68349df44e..049b8a5458 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2124,7 +2124,11 @@ def non_empty_lines(path):
     """
     Yield non-empty lines from file at path
     """
-    return (line.rstrip() for line in open(path) if line.strip())
+    with open(path) as f:
+        for line in f:
+            line = line.strip()
+            if line:
+                yield line
 
 
 def resolve_egg_link(path):
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 49bf7a04b8..c6a7ac97e9 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -92,8 +92,8 @@ def test_resource_filename_rewrites_on_change(self):
         ts = timestamp(self.ref_time)
         os.utime(filename, (ts, ts))
         filename = zp.get_resource_filename(manager, 'data.dat')
-        f = open(filename)
-        assert f.read() == 'hello, world!'
+        with open(filename) as f:
+            assert f.read() == 'hello, world!'
         manager.cleanup_resources()
 
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index e454694d11..1411f93c0d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -164,7 +164,8 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
         self._run_install_command(tmpdir_cwd, env)
         egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
-        assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
+        with open(sources_txt) as f:
+            assert 'docs/usage.rst' in f.read().split('\n')
 
     def _setup_script_with_requires(self, requires, use_setup_cfg=False):
         setup_script = DALS(
@@ -447,7 +448,8 @@ def test_python_requires_install(self, tmpdir_cwd, env):
         self._run_install_command(tmpdir_cwd, env)
         egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
         pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
-        assert 'Requires-Python: >=1.2.3' in open(pkginfo).read().split('\n')
+        with open(pkginfo) as f:
+            assert 'Requires-Python: >=1.2.3' in f.read().split('\n')
 
     def test_manifest_maker_warning_suppression(self):
         fixtures = [

From ee40d9fffac9c13ecfe9a427872adeeaedc57778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 20 Sep 2017 14:03:27 +0200
Subject: [PATCH 6762/8469] Tests: Run `python -m pip` instead of plain `pip`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows to run the testsuite on systems where `/usr/bin/pip`
is a specific Python version, but the tests are run on a different one.

For example in Fedora RPM, when the Python 3 tests are invoked,
they should use Python 3 pip, not Python 2 `/usr/bin/pip`.

Unlike other approaches, like using `pip2`/`pip3` which is currently
done in Fedora RPM (downstream patch), this way it Works Everywhereâ„¢
and the downstream patch can be dropped.

See https://src.fedoraproject.org/rpms/python-setuptools/blob/54eaa03a4dc97f93a5e4c92c55e580a4ab55a058/f/0001-Run-test-on-a-version-specific-pip.patch
---
 setuptools/tests/test_develop.py    | 2 ++
 setuptools/tests/test_namespaces.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ad7cfa05c3..ec67c798fd 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -167,6 +167,8 @@ def test_namespace_package_importable(self, tmpdir):
         target = tmpdir / 'packages'
         # use pip to install to the target directory
         install_cmd = [
+            sys.executable,
+            '-m',
             'pip',
             'install',
             str(pkg_A),
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 721cad1e63..14759e661d 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -30,6 +30,8 @@ def test_mixed_site_and_non_site(self, tmpdir):
         targets = site_packages, path_packages
         # use pip to install to the target directory
         install_cmd = [
+            sys.executable,
+            '-m',
             'pip',
             'install',
             str(pkg_A),
@@ -38,6 +40,8 @@ def test_mixed_site_and_non_site(self, tmpdir):
         subprocess.check_call(install_cmd)
         namespaces.make_site_dir(site_packages)
         install_cmd = [
+            sys.executable,
+            '-m',
             'pip',
             'install',
             str(pkg_B),
@@ -88,6 +92,8 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         target = tmpdir / 'packages'
         # use pip to install to the target directory
         install_cmd = [
+            sys.executable,
+            '-m',
             'pip',
             'install',
             str(pkg_A),

From 7ea8086d35b6e072c8deae6de54c55f0582161e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 20 Sep 2017 14:52:48 +0200
Subject: [PATCH 6763/8469] Tests: Run `python -m pip.__main__` to support
 Python 2.6

See https://bugs.python.org/issue2751
---
 setuptools/tests/test_develop.py    | 2 +-
 setuptools/tests/test_namespaces.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index ec67c798fd..cb4ff4b401 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -169,7 +169,7 @@ def test_namespace_package_importable(self, tmpdir):
         install_cmd = [
             sys.executable,
             '-m',
-            'pip',
+            'pip.__main__',
             'install',
             str(pkg_A),
             '-t', str(target),
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 14759e661d..1ac1b35e8b 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -32,7 +32,7 @@ def test_mixed_site_and_non_site(self, tmpdir):
         install_cmd = [
             sys.executable,
             '-m',
-            'pip',
+            'pip.__main__',
             'install',
             str(pkg_A),
             '-t', str(site_packages),
@@ -42,7 +42,7 @@ def test_mixed_site_and_non_site(self, tmpdir):
         install_cmd = [
             sys.executable,
             '-m',
-            'pip',
+            'pip.__main__',
             'install',
             str(pkg_B),
             '-t', str(path_packages),
@@ -94,7 +94,7 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         install_cmd = [
             sys.executable,
             '-m',
-            'pip',
+            'pip.__main__',
             'install',
             str(pkg_A),
             '-t', str(target),

From 65536e456ed4e721a116094b5f18093ef90eb3c4 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 20 Sep 2017 23:20:35 +0200
Subject: [PATCH 6764/8469] tests: make sure some essential tests are run

---
 setuptools/tests/__init__.py        | 320 ----------------------------
 setuptools/tests/test_setuptools.py | 320 ++++++++++++++++++++++++++++
 2 files changed, 320 insertions(+), 320 deletions(-)

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 8ae4402dde..54dd7d2b20 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -1,326 +1,6 @@
-"""Tests for the 'setuptools' package"""
 import locale
-import sys
-import os
-import distutils.core
-import distutils.cmd
-from distutils.errors import DistutilsOptionError, DistutilsPlatformError
-from distutils.errors import DistutilsSetupError
-from distutils.core import Extension
-from distutils.version import LooseVersion
 
-from setuptools.extern import six
 import pytest
 
-import setuptools.dist
-import setuptools.depends as dep
-from setuptools import Feature
-from setuptools.depends import Require
-
 is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
-
-
-def makeSetup(**args):
-    """Return distribution from 'setup(**args)', without executing commands"""
-
-    distutils.core._setup_stop_after = "commandline"
-
-    # Don't let system command line leak into tests!
-    args.setdefault('script_args', ['install'])
-
-    try:
-        return setuptools.setup(**args)
-    finally:
-        distutils.core._setup_stop_after = None
-
-
-needs_bytecode = pytest.mark.skipif(
-    not hasattr(dep, 'get_module_constant'),
-    reason="bytecode support not available",
-)
-
-
-class TestDepends:
-    def testExtractConst(self):
-        if not hasattr(dep, 'extract_constant'):
-            # skip on non-bytecode platforms
-            return
-
-        def f1():
-            global x, y, z
-            x = "test"
-            y = z
-
-        fc = six.get_function_code(f1)
-
-        # unrecognized name
-        assert dep.extract_constant(fc, 'q', -1) is None
-
-        # constant assigned
-        dep.extract_constant(fc, 'x', -1) == "test"
-
-        # expression assigned
-        dep.extract_constant(fc, 'y', -1) == -1
-
-        # recognized name, not assigned
-        dep.extract_constant(fc, 'z', -1) is None
-
-    def testFindModule(self):
-        with pytest.raises(ImportError):
-            dep.find_module('no-such.-thing')
-        with pytest.raises(ImportError):
-            dep.find_module('setuptools.non-existent')
-        f, p, i = dep.find_module('setuptools.tests')
-        f.close()
-
-    @needs_bytecode
-    def testModuleExtract(self):
-        from email import __version__
-        assert dep.get_module_constant('email', '__version__') == __version__
-        assert dep.get_module_constant('sys', 'version') == sys.version
-        assert dep.get_module_constant('setuptools.tests', '__doc__') == __doc__
-
-    @needs_bytecode
-    def testRequire(self):
-        req = Require('Email', '1.0.3', 'email')
-
-        assert req.name == 'Email'
-        assert req.module == 'email'
-        assert req.requested_version == '1.0.3'
-        assert req.attribute == '__version__'
-        assert req.full_name() == 'Email-1.0.3'
-
-        from email import __version__
-        assert req.get_version() == __version__
-        assert req.version_ok('1.0.9')
-        assert not req.version_ok('0.9.1')
-        assert not req.version_ok('unknown')
-
-        assert req.is_present()
-        assert req.is_current()
-
-        req = Require('Email 3000', '03000', 'email', format=LooseVersion)
-        assert req.is_present()
-        assert not req.is_current()
-        assert not req.version_ok('unknown')
-
-        req = Require('Do-what-I-mean', '1.0', 'd-w-i-m')
-        assert not req.is_present()
-        assert not req.is_current()
-
-        req = Require('Tests', None, 'tests', homepage="http://example.com")
-        assert req.format is None
-        assert req.attribute is None
-        assert req.requested_version is None
-        assert req.full_name() == 'Tests'
-        assert req.homepage == 'http://example.com'
-
-        paths = [os.path.dirname(p) for p in __path__]
-        assert req.is_present(paths)
-        assert req.is_current(paths)
-
-
-class TestDistro:
-    def setup_method(self, method):
-        self.e1 = Extension('bar.ext', ['bar.c'])
-        self.e2 = Extension('c.y', ['y.c'])
-
-        self.dist = makeSetup(
-            packages=['a', 'a.b', 'a.b.c', 'b', 'c'],
-            py_modules=['b.d', 'x'],
-            ext_modules=(self.e1, self.e2),
-            package_dir={},
-        )
-
-    def testDistroType(self):
-        assert isinstance(self.dist, setuptools.dist.Distribution)
-
-    def testExcludePackage(self):
-        self.dist.exclude_package('a')
-        assert self.dist.packages == ['b', 'c']
-
-        self.dist.exclude_package('b')
-        assert self.dist.packages == ['c']
-        assert self.dist.py_modules == ['x']
-        assert self.dist.ext_modules == [self.e1, self.e2]
-
-        self.dist.exclude_package('c')
-        assert self.dist.packages == []
-        assert self.dist.py_modules == ['x']
-        assert self.dist.ext_modules == [self.e1]
-
-        # test removals from unspecified options
-        makeSetup().exclude_package('x')
-
-    def testIncludeExclude(self):
-        # remove an extension
-        self.dist.exclude(ext_modules=[self.e1])
-        assert self.dist.ext_modules == [self.e2]
-
-        # add it back in
-        self.dist.include(ext_modules=[self.e1])
-        assert self.dist.ext_modules == [self.e2, self.e1]
-
-        # should not add duplicate
-        self.dist.include(ext_modules=[self.e1])
-        assert self.dist.ext_modules == [self.e2, self.e1]
-
-    def testExcludePackages(self):
-        self.dist.exclude(packages=['c', 'b', 'a'])
-        assert self.dist.packages == []
-        assert self.dist.py_modules == ['x']
-        assert self.dist.ext_modules == [self.e1]
-
-    def testEmpty(self):
-        dist = makeSetup()
-        dist.include(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
-        dist = makeSetup()
-        dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
-
-    def testContents(self):
-        assert self.dist.has_contents_for('a')
-        self.dist.exclude_package('a')
-        assert not self.dist.has_contents_for('a')
-
-        assert self.dist.has_contents_for('b')
-        self.dist.exclude_package('b')
-        assert not self.dist.has_contents_for('b')
-
-        assert self.dist.has_contents_for('c')
-        self.dist.exclude_package('c')
-        assert not self.dist.has_contents_for('c')
-
-    def testInvalidIncludeExclude(self):
-        with pytest.raises(DistutilsSetupError):
-            self.dist.include(nonexistent_option='x')
-        with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(nonexistent_option='x')
-        with pytest.raises(DistutilsSetupError):
-            self.dist.include(packages={'x': 'y'})
-        with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(packages={'x': 'y'})
-        with pytest.raises(DistutilsSetupError):
-            self.dist.include(ext_modules={'x': 'y'})
-        with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(ext_modules={'x': 'y'})
-
-        with pytest.raises(DistutilsSetupError):
-            self.dist.include(package_dir=['q'])
-        with pytest.raises(DistutilsSetupError):
-            self.dist.exclude(package_dir=['q'])
-
-
-class TestFeatures:
-    def setup_method(self, method):
-        self.req = Require('Distutils', '1.0.3', 'distutils')
-        self.dist = makeSetup(
-            features={
-                'foo': Feature("foo", standard=True, require_features=['baz', self.req]),
-                'bar': Feature("bar", standard=True, packages=['pkg.bar'],
-                               py_modules=['bar_et'], remove=['bar.ext'],
-                               ),
-                'baz': Feature(
-                        "baz", optional=False, packages=['pkg.baz'],
-                        scripts=['scripts/baz_it'],
-                        libraries=[('libfoo', 'foo/foofoo.c')]
-                       ),
-                'dwim': Feature("DWIM", available=False, remove='bazish'),
-            },
-            script_args=['--without-bar', 'install'],
-            packages=['pkg.bar', 'pkg.foo'],
-            py_modules=['bar_et', 'bazish'],
-            ext_modules=[Extension('bar.ext', ['bar.c'])]
-        )
-
-    def testDefaults(self):
-        assert not Feature(
-            "test", standard=True, remove='x', available=False
-        ).include_by_default()
-        assert Feature("test", standard=True, remove='x').include_by_default()
-        # Feature must have either kwargs, removes, or require_features
-        with pytest.raises(DistutilsSetupError):
-            Feature("test")
-
-    def testAvailability(self):
-        with pytest.raises(DistutilsPlatformError):
-            self.dist.features['dwim'].include_in(self.dist)
-
-    def testFeatureOptions(self):
-        dist = self.dist
-        assert (
-            ('with-dwim', None, 'include DWIM') in dist.feature_options
-        )
-        assert (
-            ('without-dwim', None, 'exclude DWIM (default)') in dist.feature_options
-        )
-        assert (
-            ('with-bar', None, 'include bar (default)') in dist.feature_options
-        )
-        assert (
-            ('without-bar', None, 'exclude bar') in dist.feature_options
-        )
-        assert dist.feature_negopt['without-foo'] == 'with-foo'
-        assert dist.feature_negopt['without-bar'] == 'with-bar'
-        assert dist.feature_negopt['without-dwim'] == 'with-dwim'
-        assert ('without-baz' not in dist.feature_negopt)
-
-    def testUseFeatures(self):
-        dist = self.dist
-        assert dist.with_foo == 1
-        assert dist.with_bar == 0
-        assert dist.with_baz == 1
-        assert ('bar_et' not in dist.py_modules)
-        assert ('pkg.bar' not in dist.packages)
-        assert ('pkg.baz' in dist.packages)
-        assert ('scripts/baz_it' in dist.scripts)
-        assert (('libfoo', 'foo/foofoo.c') in dist.libraries)
-        assert dist.ext_modules == []
-        assert dist.require_features == [self.req]
-
-        # If we ask for bar, it should fail because we explicitly disabled
-        # it on the command line
-        with pytest.raises(DistutilsOptionError):
-            dist.include_feature('bar')
-
-    def testFeatureWithInvalidRemove(self):
-        with pytest.raises(SystemExit):
-            makeSetup(features={'x': Feature('x', remove='y')})
-
-
-class TestCommandTests:
-    def testTestIsCommand(self):
-        test_cmd = makeSetup().get_command_obj('test')
-        assert (isinstance(test_cmd, distutils.cmd.Command))
-
-    def testLongOptSuiteWNoDefault(self):
-        ts1 = makeSetup(script_args=['test', '--test-suite=foo.tests.suite'])
-        ts1 = ts1.get_command_obj('test')
-        ts1.ensure_finalized()
-        assert ts1.test_suite == 'foo.tests.suite'
-
-    def testDefaultSuite(self):
-        ts2 = makeSetup(test_suite='bar.tests.suite').get_command_obj('test')
-        ts2.ensure_finalized()
-        assert ts2.test_suite == 'bar.tests.suite'
-
-    def testDefaultWModuleOnCmdLine(self):
-        ts3 = makeSetup(
-            test_suite='bar.tests',
-            script_args=['test', '-m', 'foo.tests']
-        ).get_command_obj('test')
-        ts3.ensure_finalized()
-        assert ts3.test_module == 'foo.tests'
-        assert ts3.test_suite == 'foo.tests.test_suite'
-
-    def testConflictingOptions(self):
-        ts4 = makeSetup(
-            script_args=['test', '-m', 'bar.tests', '-s', 'foo.tests.suite']
-        ).get_command_obj('test')
-        with pytest.raises(DistutilsOptionError):
-            ts4.ensure_finalized()
-
-    def testNoSuite(self):
-        ts5 = makeSetup().get_command_obj('test')
-        ts5.ensure_finalized()
-        assert ts5.test_suite is None
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index e59800d2ec..26e37a6c14 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -1,8 +1,328 @@
+"""Tests for the 'setuptools' package"""
+
+import sys
 import os
+import distutils.core
+import distutils.cmd
+from distutils.errors import DistutilsOptionError, DistutilsPlatformError
+from distutils.errors import DistutilsSetupError
+from distutils.core import Extension
+from distutils.version import LooseVersion
 
 import pytest
 
 import setuptools
+import setuptools.dist
+import setuptools.depends as dep
+from setuptools import Feature
+from setuptools.depends import Require
+from setuptools.extern import six
+
+
+def makeSetup(**args):
+    """Return distribution from 'setup(**args)', without executing commands"""
+
+    distutils.core._setup_stop_after = "commandline"
+
+    # Don't let system command line leak into tests!
+    args.setdefault('script_args', ['install'])
+
+    try:
+        return setuptools.setup(**args)
+    finally:
+        distutils.core._setup_stop_after = None
+
+
+needs_bytecode = pytest.mark.skipif(
+    not hasattr(dep, 'get_module_constant'),
+    reason="bytecode support not available",
+)
+
+
+class TestDepends:
+    def testExtractConst(self):
+        if not hasattr(dep, 'extract_constant'):
+            # skip on non-bytecode platforms
+            return
+
+        def f1():
+            global x, y, z
+            x = "test"
+            y = z
+
+        fc = six.get_function_code(f1)
+
+        # unrecognized name
+        assert dep.extract_constant(fc, 'q', -1) is None
+
+        # constant assigned
+        dep.extract_constant(fc, 'x', -1) == "test"
+
+        # expression assigned
+        dep.extract_constant(fc, 'y', -1) == -1
+
+        # recognized name, not assigned
+        dep.extract_constant(fc, 'z', -1) is None
+
+    def testFindModule(self):
+        with pytest.raises(ImportError):
+            dep.find_module('no-such.-thing')
+        with pytest.raises(ImportError):
+            dep.find_module('setuptools.non-existent')
+        f, p, i = dep.find_module('setuptools.tests')
+        f.close()
+
+    @needs_bytecode
+    def testModuleExtract(self):
+        from json import __version__
+        assert dep.get_module_constant('json', '__version__') == __version__
+        assert dep.get_module_constant('sys', 'version') == sys.version
+        assert dep.get_module_constant('setuptools.tests.test_setuptools', '__doc__') == __doc__
+
+    @needs_bytecode
+    def testRequire(self):
+        req = Require('Json', '1.0.3', 'json')
+
+        assert req.name == 'Json'
+        assert req.module == 'json'
+        assert req.requested_version == '1.0.3'
+        assert req.attribute == '__version__'
+        assert req.full_name() == 'Json-1.0.3'
+
+        from json import __version__
+        assert req.get_version() == __version__
+        assert req.version_ok('1.0.9')
+        assert not req.version_ok('0.9.1')
+        assert not req.version_ok('unknown')
+
+        assert req.is_present()
+        assert req.is_current()
+
+        req = Require('Json 3000', '03000', 'json', format=LooseVersion)
+        assert req.is_present()
+        assert not req.is_current()
+        assert not req.version_ok('unknown')
+
+        req = Require('Do-what-I-mean', '1.0', 'd-w-i-m')
+        assert not req.is_present()
+        assert not req.is_current()
+
+        req = Require('Tests', None, 'tests', homepage="http://example.com")
+        assert req.format is None
+        assert req.attribute is None
+        assert req.requested_version is None
+        assert req.full_name() == 'Tests'
+        assert req.homepage == 'http://example.com'
+
+        from setuptools.tests import __path__
+        paths = [os.path.dirname(p) for p in __path__]
+        assert req.is_present(paths)
+        assert req.is_current(paths)
+
+
+class TestDistro:
+    def setup_method(self, method):
+        self.e1 = Extension('bar.ext', ['bar.c'])
+        self.e2 = Extension('c.y', ['y.c'])
+
+        self.dist = makeSetup(
+            packages=['a', 'a.b', 'a.b.c', 'b', 'c'],
+            py_modules=['b.d', 'x'],
+            ext_modules=(self.e1, self.e2),
+            package_dir={},
+        )
+
+    def testDistroType(self):
+        assert isinstance(self.dist, setuptools.dist.Distribution)
+
+    def testExcludePackage(self):
+        self.dist.exclude_package('a')
+        assert self.dist.packages == ['b', 'c']
+
+        self.dist.exclude_package('b')
+        assert self.dist.packages == ['c']
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1, self.e2]
+
+        self.dist.exclude_package('c')
+        assert self.dist.packages == []
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1]
+
+        # test removals from unspecified options
+        makeSetup().exclude_package('x')
+
+    def testIncludeExclude(self):
+        # remove an extension
+        self.dist.exclude(ext_modules=[self.e1])
+        assert self.dist.ext_modules == [self.e2]
+
+        # add it back in
+        self.dist.include(ext_modules=[self.e1])
+        assert self.dist.ext_modules == [self.e2, self.e1]
+
+        # should not add duplicate
+        self.dist.include(ext_modules=[self.e1])
+        assert self.dist.ext_modules == [self.e2, self.e1]
+
+    def testExcludePackages(self):
+        self.dist.exclude(packages=['c', 'b', 'a'])
+        assert self.dist.packages == []
+        assert self.dist.py_modules == ['x']
+        assert self.dist.ext_modules == [self.e1]
+
+    def testEmpty(self):
+        dist = makeSetup()
+        dist.include(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
+        dist = makeSetup()
+        dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2])
+
+    def testContents(self):
+        assert self.dist.has_contents_for('a')
+        self.dist.exclude_package('a')
+        assert not self.dist.has_contents_for('a')
+
+        assert self.dist.has_contents_for('b')
+        self.dist.exclude_package('b')
+        assert not self.dist.has_contents_for('b')
+
+        assert self.dist.has_contents_for('c')
+        self.dist.exclude_package('c')
+        assert not self.dist.has_contents_for('c')
+
+    def testInvalidIncludeExclude(self):
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(nonexistent_option='x')
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(nonexistent_option='x')
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(packages={'x': 'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(packages={'x': 'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(ext_modules={'x': 'y'})
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(ext_modules={'x': 'y'})
+
+        with pytest.raises(DistutilsSetupError):
+            self.dist.include(package_dir=['q'])
+        with pytest.raises(DistutilsSetupError):
+            self.dist.exclude(package_dir=['q'])
+
+
+class TestFeatures:
+    def setup_method(self, method):
+        self.req = Require('Distutils', '1.0.3', 'distutils')
+        self.dist = makeSetup(
+            features={
+                'foo': Feature("foo", standard=True, require_features=['baz', self.req]),
+                'bar': Feature("bar", standard=True, packages=['pkg.bar'],
+                               py_modules=['bar_et'], remove=['bar.ext'],
+                               ),
+                'baz': Feature(
+                        "baz", optional=False, packages=['pkg.baz'],
+                        scripts=['scripts/baz_it'],
+                        libraries=[('libfoo', 'foo/foofoo.c')]
+                       ),
+                'dwim': Feature("DWIM", available=False, remove='bazish'),
+            },
+            script_args=['--without-bar', 'install'],
+            packages=['pkg.bar', 'pkg.foo'],
+            py_modules=['bar_et', 'bazish'],
+            ext_modules=[Extension('bar.ext', ['bar.c'])]
+        )
+
+    def testDefaults(self):
+        assert not Feature(
+            "test", standard=True, remove='x', available=False
+        ).include_by_default()
+        assert Feature("test", standard=True, remove='x').include_by_default()
+        # Feature must have either kwargs, removes, or require_features
+        with pytest.raises(DistutilsSetupError):
+            Feature("test")
+
+    def testAvailability(self):
+        with pytest.raises(DistutilsPlatformError):
+            self.dist.features['dwim'].include_in(self.dist)
+
+    def testFeatureOptions(self):
+        dist = self.dist
+        assert (
+            ('with-dwim', None, 'include DWIM') in dist.feature_options
+        )
+        assert (
+            ('without-dwim', None, 'exclude DWIM (default)') in dist.feature_options
+        )
+        assert (
+            ('with-bar', None, 'include bar (default)') in dist.feature_options
+        )
+        assert (
+            ('without-bar', None, 'exclude bar') in dist.feature_options
+        )
+        assert dist.feature_negopt['without-foo'] == 'with-foo'
+        assert dist.feature_negopt['without-bar'] == 'with-bar'
+        assert dist.feature_negopt['without-dwim'] == 'with-dwim'
+        assert ('without-baz' not in dist.feature_negopt)
+
+    def testUseFeatures(self):
+        dist = self.dist
+        assert dist.with_foo == 1
+        assert dist.with_bar == 0
+        assert dist.with_baz == 1
+        assert ('bar_et' not in dist.py_modules)
+        assert ('pkg.bar' not in dist.packages)
+        assert ('pkg.baz' in dist.packages)
+        assert ('scripts/baz_it' in dist.scripts)
+        assert (('libfoo', 'foo/foofoo.c') in dist.libraries)
+        assert dist.ext_modules == []
+        assert dist.require_features == [self.req]
+
+        # If we ask for bar, it should fail because we explicitly disabled
+        # it on the command line
+        with pytest.raises(DistutilsOptionError):
+            dist.include_feature('bar')
+
+    def testFeatureWithInvalidRemove(self):
+        with pytest.raises(SystemExit):
+            makeSetup(features={'x': Feature('x', remove='y')})
+
+
+class TestCommandTests:
+    def testTestIsCommand(self):
+        test_cmd = makeSetup().get_command_obj('test')
+        assert (isinstance(test_cmd, distutils.cmd.Command))
+
+    def testLongOptSuiteWNoDefault(self):
+        ts1 = makeSetup(script_args=['test', '--test-suite=foo.tests.suite'])
+        ts1 = ts1.get_command_obj('test')
+        ts1.ensure_finalized()
+        assert ts1.test_suite == 'foo.tests.suite'
+
+    def testDefaultSuite(self):
+        ts2 = makeSetup(test_suite='bar.tests.suite').get_command_obj('test')
+        ts2.ensure_finalized()
+        assert ts2.test_suite == 'bar.tests.suite'
+
+    def testDefaultWModuleOnCmdLine(self):
+        ts3 = makeSetup(
+            test_suite='bar.tests',
+            script_args=['test', '-m', 'foo.tests']
+        ).get_command_obj('test')
+        ts3.ensure_finalized()
+        assert ts3.test_module == 'foo.tests'
+        assert ts3.test_suite == 'foo.tests.test_suite'
+
+    def testConflictingOptions(self):
+        ts4 = makeSetup(
+            script_args=['test', '-m', 'bar.tests', '-s', 'foo.tests.suite']
+        ).get_command_obj('test')
+        with pytest.raises(DistutilsOptionError):
+            ts4.ensure_finalized()
+
+    def testNoSuite(self):
+        ts5 = makeSetup().get_command_obj('test')
+        ts5.ensure_finalized()
+        assert ts5.test_suite is None
 
 
 @pytest.fixture

From f7e4a57aad94d1ca2408729d9c6df7419dbac909 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 24 Sep 2017 18:51:52 -0500
Subject: [PATCH 6765/8469] nit: fix spelling error and re-use contextmanager

---
 setuptools/tests/test_pep517.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index da22877024..ea149f7341 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -41,7 +41,7 @@ def method(*args, **kw):
 
 class BuildBackendCaller(BuildBackendBase):
     def __call__(self, name, *args, **kw):
-        """Handles aribrary function invokations on the build backend."""
+        """Handles aribrary function invocations on the build backend."""
         os.chdir(self.cwd)
         os.environ.update(self.env)
         return getattr(import_module(self.backend_name), name)(*args, **kw)
@@ -58,7 +58,8 @@ def enter_directory(dir, val=None):
 @pytest.fixture
 def build_backend():
     tmpdir = mkdtemp()
-    with enter_directory(tmpdir):
+    ctx = enter_directory(tmpdir, BuildBackend(cwd='.'))
+    with ctx:
         setup_script = DALS("""
         from setuptools import setup
 
@@ -79,7 +80,7 @@ def run():
                 """)
         })
 
-    return enter_directory(tmpdir, BuildBackend(cwd='.'))
+    return ctx
 
 
 def test_get_requires_for_build_wheel(build_backend):

From a2d62dd2a79720c8780645cfca2ff64eea18ffcf Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 24 Sep 2017 19:10:05 -0500
Subject: [PATCH 6766/8469] pep517: add module docstring

---
 setuptools/pep517.py | 46 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 25474b555b..5f6b992dfa 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -1,3 +1,31 @@
+"""A PEP 517 interface to setuptools
+
+Previously, when a user or a command line tool (let's call it a "frontend")
+needed to make a request of setuptools to take a certain action, for
+example, generating a list of installation requirements, the frontend would
+would call "setup.py egg_info" or "setup.py bdist_wheel" on the command line.
+
+PEP 517 defines a different method of interfacing with setuptools. Rather
+than calling "setup.py" directly, the frontend should:
+
+  1. Set the current directory to the directory with a setup.py file
+  2. Import this module into a safe python interpreter (one in which
+     setuptools can potentially set global variables or crash hard).
+  3. Call one of the functions defined in PEP 517.
+  
+What each function does is defined in PEP 517. However, here is a "casual"
+definition of the functions (this definition should not be relied on for
+bug reports or API stability):
+
+  - `build_wheel`: build a wheel in the folder and return the basename
+  - `get_requires_for_build_wheel`: get the `setup_requires` to build
+  - `prepare_metadata_for_build_wheel`: get the `install_requires`
+  - `build_sdist`: build an sdist in the folder and return the basename
+  - `get_requires_for_build_sdist`: get the `setup_requires` to build
+
+Again, this is not a formal definition! Just a "taste" of the module.
+"""
+
 import os
 import sys
 import subprocess
@@ -21,14 +49,14 @@ def _run_setup(setup_script='setup.py'): #
     exec(compile(code, __file__, 'exec'))
 
 
-def fix_config(config_settings):
+def _fix_config(config_settings):
     config_settings = config_settings or {}
     config_settings.setdefault('--global-option', [])
     return config_settings
 
 
-def get_build_requires(config_settings):
-    config_settings = fix_config(config_settings)
+def _get_build_requires(config_settings):
+    config_settings = _fix_config(config_settings)
     requirements = ['setuptools', 'wheel']
     dist._skip_install_eggs = True
 
@@ -45,13 +73,13 @@ def get_build_requires(config_settings):
 
 
 def get_requires_for_build_wheel(config_settings=None):
-    config_settings = fix_config(config_settings)
-    return get_build_requires(config_settings)
+    config_settings = _fix_config(config_settings)
+    return _get_build_requires(config_settings)
 
 
 def get_requires_for_build_sdist(config_settings=None):
-    config_settings = fix_config(config_settings)
-    return get_build_requires(config_settings)
+    config_settings = _fix_config(config_settings)
+    return _get_build_requires(config_settings)
 
 
 def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
@@ -67,7 +95,7 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
 
 def build_wheel(wheel_directory, config_settings=None,
                 metadata_directory=None):
-    config_settings = fix_config(config_settings)
+    config_settings = _fix_config(config_settings)
     wheel_directory = os.path.abspath(wheel_directory)
     sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
         config_settings["--global-option"]
@@ -84,7 +112,7 @@ def build_wheel(wheel_directory, config_settings=None,
 
 
 def build_sdist(sdist_directory, config_settings=None):
-    config_settings = fix_config(config_settings)
+    config_settings = _fix_config(config_settings)
     sdist_directory = os.path.abspath(sdist_directory)
     sys.argv = sys.argv[:1] + ['sdist'] + \
         config_settings["--global-option"]

From d72a5a7c28794cabfc9481691eb89e86fc37efb6 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 24 Sep 2017 19:13:37 -0500
Subject: [PATCH 6767/8469] tests: pep517: fix enter_directory

---
 setuptools/tests/test_pep517.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index ea149f7341..442a064929 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -49,10 +49,11 @@ def __call__(self, name, *args, **kw):
 
 @contextmanager
 def enter_directory(dir, val=None):
-    original_dir = os.getcwd()
-    os.chdir(dir)
-    yield val
-    os.chdir(original_dir)
+    while True:
+        original_dir = os.getcwd()
+        os.chdir(dir)
+        yield val
+        os.chdir(original_dir)
 
 
 @pytest.fixture

From 14ea4d1487ec70efe31f34169b74347f50e0654a Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 24 Sep 2017 19:21:00 -0500
Subject: [PATCH 6768/8469] tests: pep517: revert changes

---
 setuptools/tests/test_pep517.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 442a064929..df4414a14a 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -49,18 +49,16 @@ def __call__(self, name, *args, **kw):
 
 @contextmanager
 def enter_directory(dir, val=None):
-    while True:
-        original_dir = os.getcwd()
-        os.chdir(dir)
-        yield val
-        os.chdir(original_dir)
+    original_dir = os.getcwd()
+    os.chdir(dir)
+    yield val
+    os.chdir(original_dir)
 
 
 @pytest.fixture
 def build_backend():
     tmpdir = mkdtemp()
-    ctx = enter_directory(tmpdir, BuildBackend(cwd='.'))
-    with ctx:
+    with enter_directory(tmpdir):
         setup_script = DALS("""
         from setuptools import setup
 
@@ -81,7 +79,7 @@ def run():
                 """)
         })
 
-    return ctx
+    return enter_directory(tmpdir, BuildBackend(cwd='.'))
 
 
 def test_get_requires_for_build_wheel(build_backend):

From bc85ee971b84a177d06751a7b4075debecd604a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=B6nke?= <stefan@gronke.org>
Date: Mon, 25 Sep 2017 18:58:10 +0200
Subject: [PATCH 6769/8469] bpo-31569: correct PCBuild/ case to PCbuild/ in
 build scripts and docs (GH-3711)

---
 sysconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.py b/sysconfig.py
index 2bcd1dd288..e07a6c8b94 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -23,7 +23,7 @@
 BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
 
 # Path to the base directory of the project. On Windows the binary may
-# live in project/PCBuild/win32 or project/PCBuild/amd64.
+# live in project/PCbuild/win32 or project/PCbuild/amd64.
 # set for cross builds
 if "_PYTHON_PROJECT_BASE" in os.environ:
     project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])

From 6b18d32f779cf78bf0b0384277d52d8bf803d621 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 28 Sep 2017 22:44:27 -0700
Subject: [PATCH 6770/8469] remove support for BSD/OS (closes bpo-31624)
 (#3812)

---
 util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.py b/util.py
index 9394c1e056..83682628ba 100644
--- a/util.py
+++ b/util.py
@@ -53,8 +53,8 @@ def get_platform ():
 
     (osname, host, release, version, machine) = os.uname()
 
-    # Convert the OS name to lowercase, remove '/' characters
-    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
+    # Convert the OS name to lowercase, remove '/' characters, and translate
+    # spaces (for "Power Macintosh")
     osname = osname.lower().replace('/', '')
     machine = machine.replace(' ', '_')
     machine = machine.replace('/', '-')

From 2a7ad18393a8cc8d7ebf5d0df77de0715c964acf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 09:13:50 +0200
Subject: [PATCH 6771/8469] Remove excess whitespace

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

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 5f6b992dfa..c8d4b49357 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -12,7 +12,7 @@
   2. Import this module into a safe python interpreter (one in which
      setuptools can potentially set global variables or crash hard).
   3. Call one of the functions defined in PEP 517.
-  
+
 What each function does is defined in PEP 517. However, here is a "casual"
 definition of the functions (this definition should not be relied on for
 bug reports or API stability):
@@ -41,7 +41,7 @@
 
 def _run_setup(setup_script='setup.py'): #
     # Note that we can reuse our build directory between calls
-    # Correctness comes first, then optimization later    
+    # Correctness comes first, then optimization later
     __file__=setup_script
     f=getattr(tokenize, 'open', open)(__file__)
     code=f.read().replace('\\r\\n', '\\n')

From b67a4c32b19df8b4bf65eb7edc68ba71865787ae Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 09:14:02 +0200
Subject: [PATCH 6772/8469] Feed the hobgoblins (delint)

---
 setuptools/pep517.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index c8d4b49357..4032c5bb90 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -28,10 +28,8 @@
 
 import os
 import sys
-import subprocess
 import tokenize
 import shutil
-import tempfile
 
 from setuptools import dist
 from setuptools.dist import SetupRequirementsError
@@ -39,12 +37,13 @@
 
 SETUPTOOLS_IMPLEMENTATION_REVISION = 0.1
 
-def _run_setup(setup_script='setup.py'): #
+
+def _run_setup(setup_script='setup.py'):
     # Note that we can reuse our build directory between calls
     # Correctness comes first, then optimization later
-    __file__=setup_script
-    f=getattr(tokenize, 'open', open)(__file__)
-    code=f.read().replace('\\r\\n', '\\n')
+    __file__ = setup_script
+    f = getattr(tokenize, 'open', open)(__file__)
+    code = f.read().replace('\\r\\n', '\\n')
     f.close()
     exec(compile(code, __file__, 'exec'))
 

From 84a97be0633f526de2f24b096d5fd1bf1cd75ac6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 09:15:58 +0200
Subject: [PATCH 6773/8469] Remove unused variable

---
 setuptools/pep517.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index 4032c5bb90..b3e9ea8666 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -35,9 +35,6 @@
 from setuptools.dist import SetupRequirementsError
 
 
-SETUPTOOLS_IMPLEMENTATION_REVISION = 0.1
-
-
 def _run_setup(setup_script='setup.py'):
     # Note that we can reuse our build directory between calls
     # Correctness comes first, then optimization later

From c292a995eaa090c88c2d3edab6716cdb77629e42 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 09:41:09 +0200
Subject: [PATCH 6774/8469] Remove meaningless commend

---
 setuptools/tests/test_sdist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f34068dcd3..f84c57dc4b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -42,7 +42,6 @@
     LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
 
 
-# Cannot use context manager because of Python 2.4
 @contextlib.contextmanager
 def quiet():
     old_stdout, old_stderr = sys.stdout, sys.stderr

From b8936cee54cc023ba6c6081e03e0425bce20b1f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 15:01:39 +0200
Subject: [PATCH 6775/8469] Use natural byte literals in test_sdist

---
 setuptools/tests/test_sdist.py | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f84c57dc4b..1b5422f4f6 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -41,6 +41,8 @@
 else:
     LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
 
+utf_8_filename = LATIN1_FILENAME.decode('latin-1').encode('utf-8')
+
 
 @contextlib.contextmanager
 def quiet():
@@ -52,17 +54,10 @@ def quiet():
         sys.stdout, sys.stderr = old_stdout, old_stderr
 
 
-# Fake byte literals for Python <= 2.5
-def b(s, encoding='utf-8'):
-    if six.PY3:
-        return s.encode(encoding)
-    return s
-
-
 # Convert to POSIX path
 def posix(path):
     if six.PY3 and not isinstance(path, str):
-        return path.replace(os.sep.encode('ascii'), b('/'))
+        return path.replace(os.sep.encode('ascii'), b'/')
     else:
         return path.replace(os.sep, '/')
 
@@ -200,8 +195,7 @@ def test_write_manifest_allows_utf8_filenames(self):
         mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         os.mkdir('sdist_test.egg-info')
 
-        # UTF-8 filename
-        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+        filename = os.path.join(b'sdist_test', utf_8_filename)
 
         # Must touch the file or risk removal
         open(filename, "w").close()
@@ -240,7 +234,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
         os.mkdir('sdist_test.egg-info')
 
         # Latin-1 filename
-        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
 
         # Add filename with surrogates and write manifest
         with quiet():
@@ -274,10 +268,10 @@ def test_manifest_is_read_with_utf8_encoding(self):
             cmd.run()
 
         # Add UTF-8 filename to manifest
-        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+        filename = os.path.join(b'sdist_test', utf_8_filename)
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         manifest = open(cmd.manifest, 'ab')
-        manifest.write(b('\n') + filename)
+        manifest.write(b'\n' + filename)
         manifest.close()
 
         # The file must exist to be included in the filelist
@@ -306,10 +300,10 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             cmd.run()
 
         # Add Latin-1 filename to manifest
-        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         manifest = open(cmd.manifest, 'ab')
-        manifest.write(b('\n') + filename)
+        manifest.write(b'\n' + filename)
         manifest.close()
 
         # The file must exist to be included in the filelist
@@ -333,7 +327,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         cmd.ensure_finalized()
 
         # UTF-8 filename
-        filename = os.path.join(b('sdist_test'), b('smörbröd.py'))
+        filename = os.path.join(b'sdist_test', utf_8_filename)
         open(filename, 'w').close()
 
         with quiet():
@@ -367,7 +361,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         cmd.ensure_finalized()
 
         # Latin-1 filename
-        filename = os.path.join(b('sdist_test'), LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
         open(filename, 'w').close()
         assert os.path.isfile(filename)
 

From 1c00a900c9aba25d6369cf9312997434ad68b9b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 15:03:47 +0200
Subject: [PATCH 6776/8469] Collapse encoding detection

---
 setuptools/tests/test_sdist.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 1b5422f4f6..5cb63c4b5d 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -374,10 +374,9 @@ def test_sdist_with_latin1_encoded_filename(self):
                 # Latin-1 is similar to Windows-1252 however
                 # on mbcs filesys it is not in latin-1 encoding
                 fs_enc = sys.getfilesystemencoding()
-                if fs_enc == 'mbcs':
-                    filename = filename.decode('mbcs')
-                else:
-                    filename = filename.decode('latin-1')
+                if fs_enc != 'mbcs':
+                    fs_enc = 'latin-1'
+                filename = filename.decode(fs_enc)
 
                 assert filename in cmd.filelist.files
             else:

From 5e6d72b852229750d00023885a6ce6149060d08a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 15:04:25 +0200
Subject: [PATCH 6777/8469] Feed the hobgoblins (delint).

---
 setuptools/tests/test_sdist.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 5cb63c4b5d..e7fc71e3b0 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -128,8 +128,8 @@ def test_package_data_in_sdist(self):
 
     def test_defaults_case_sensitivity(self):
         """
-            Make sure default files (README.*, etc.) are added in a case-sensitive
-            way to avoid problems with packages built on Windows.
+        Make sure default files (README.*, etc.) are added in a case-sensitive
+        way to avoid problems with packages built on Windows.
         """
 
         open(os.path.join(self.temp_dir, 'readme.rst'), 'w').close()
@@ -146,7 +146,9 @@ def test_defaults_case_sensitivity(self):
         with quiet():
             cmd.run()
 
-        # lowercase all names so we can test in a case-insensitive way to make sure the files are not included
+        # lowercase all names so we can test in a
+        # case-insensitive way to make sure the files
+        # are not included.
         manifest = map(lambda x: x.lower(), cmd.filelist.files)
         assert 'readme.rst' not in manifest, manifest
         assert 'setup.py' not in manifest, manifest

From a85c59d34bbb232fc110714dc3aeb3c823a6f3cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 15:30:09 +0200
Subject: [PATCH 6778/8469] Expect failure on macOS 10.13 and other operating
 systems where writing latin-1 encoded filenames is prohibited. Fixes #1169.

---
 setuptools/tests/test_sdist.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index e7fc71e3b0..3b9a3b945c 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -80,6 +80,21 @@ def read_all_bytes(filename):
         return fp.read()
 
 
+def latin1_fail():
+    try:
+        desc, filename = tempfile.mkstemp(suffix=LATIN1_FILENAME)
+        os.close(desc)
+        os.remove(filename)
+    except Exception:
+        return True
+
+
+fail_on_latin1_encoded_filenames = pytest.mark.xfail(
+    latin1_fail(),
+    reason="System does not support latin-1 filenames",
+)
+
+
 class TestSdistTest:
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
@@ -290,6 +305,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
         assert filename in cmd.filelist.files
 
     @py3_only
+    @fail_on_latin1_encoded_filenames
     def test_read_manifest_skips_non_utf8_filenames(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
@@ -321,6 +337,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
         assert filename not in cmd.filelist.files
 
     @fail_on_ascii
+    @fail_on_latin1_encoded_filenames
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)
@@ -355,6 +372,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         else:
             assert filename in cmd.filelist.files
 
+    @fail_on_latin1_encoded_filenames
     def test_sdist_with_latin1_encoded_filename(self):
         # Test for #303.
         dist = Distribution(SETUP_ATTRS)

From ba46991d7cd488d682e80bb0e69964c4ed6c3303 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Oct 2017 15:36:45 +0200
Subject: [PATCH 6779/8469] Move filename fixtures to a 'text' module so they
 can use unicode literals.

---
 setuptools/tests/test_sdist.py | 23 ++++++++---------------
 setuptools/tests/text.py       |  9 +++++++++
 2 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 setuptools/tests/text.py

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 3b9a3b945c..02222da5a6 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -19,6 +19,7 @@
 from setuptools.command.egg_info import manifest_maker
 from setuptools.dist import Distribution
 from setuptools.tests import fail_on_ascii
+from .text import Filenames
 
 py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
 
@@ -36,13 +37,6 @@
 setup(**%r)
 """ % SETUP_ATTRS
 
-if six.PY3:
-    LATIN1_FILENAME = 'smörbröd.py'.encode('latin-1')
-else:
-    LATIN1_FILENAME = 'sm\xf6rbr\xf6d.py'
-
-utf_8_filename = LATIN1_FILENAME.decode('latin-1').encode('utf-8')
-
 
 @contextlib.contextmanager
 def quiet():
@@ -82,7 +76,7 @@ def read_all_bytes(filename):
 
 def latin1_fail():
     try:
-        desc, filename = tempfile.mkstemp(suffix=LATIN1_FILENAME)
+        desc, filename = tempfile.mkstemp(suffix=Filenames.latin_1)
         os.close(desc)
         os.remove(filename)
     except Exception:
@@ -212,7 +206,7 @@ def test_write_manifest_allows_utf8_filenames(self):
         mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         os.mkdir('sdist_test.egg-info')
 
-        filename = os.path.join(b'sdist_test', utf_8_filename)
+        filename = os.path.join(b'sdist_test', Filenames.utf_8)
 
         # Must touch the file or risk removal
         open(filename, "w").close()
@@ -251,7 +245,7 @@ def test_write_manifest_skips_non_utf8_filenames(self):
         os.mkdir('sdist_test.egg-info')
 
         # Latin-1 filename
-        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', Filenames.latin_1)
 
         # Add filename with surrogates and write manifest
         with quiet():
@@ -285,7 +279,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
             cmd.run()
 
         # Add UTF-8 filename to manifest
-        filename = os.path.join(b'sdist_test', utf_8_filename)
+        filename = os.path.join(b'sdist_test', Filenames.utf_8)
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         manifest = open(cmd.manifest, 'ab')
         manifest.write(b'\n' + filename)
@@ -318,7 +312,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
             cmd.run()
 
         # Add Latin-1 filename to manifest
-        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', Filenames.latin_1)
         cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt')
         manifest = open(cmd.manifest, 'ab')
         manifest.write(b'\n' + filename)
@@ -345,8 +339,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         cmd = sdist(dist)
         cmd.ensure_finalized()
 
-        # UTF-8 filename
-        filename = os.path.join(b'sdist_test', utf_8_filename)
+        filename = os.path.join(b'sdist_test', Filenames.utf_8)
         open(filename, 'w').close()
 
         with quiet():
@@ -381,7 +374,7 @@ def test_sdist_with_latin1_encoded_filename(self):
         cmd.ensure_finalized()
 
         # Latin-1 filename
-        filename = os.path.join(b'sdist_test', LATIN1_FILENAME)
+        filename = os.path.join(b'sdist_test', Filenames.latin_1)
         open(filename, 'w').close()
         assert os.path.isfile(filename)
 
diff --git a/setuptools/tests/text.py b/setuptools/tests/text.py
new file mode 100644
index 0000000000..ad2c6249b5
--- /dev/null
+++ b/setuptools/tests/text.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+
+class Filenames:
+    unicode = 'smörbröd.py'
+    latin_1 = unicode.encode('latin-1')
+    utf_8 = unicode.encode('utf-8')

From 4e5c1640ac88e227aa967b8bfe04ce26325f284f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 09:35:41 +0200
Subject: [PATCH 6780/8469] Move customized behavior for fetch_build_eggs into
 a specialized subclass of Distribution.

---
 setuptools/dist.py   | 10 ----------
 setuptools/pep517.py | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1641469ea8..a2ca879516 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -30,14 +30,6 @@
 __import__('pkg_resources.extern.packaging.version')
 
 
-_skip_install_eggs = False
-
-
-class SetupRequirementsError(BaseException):
-    def __init__(self, specifiers):
-        self.specifiers = specifiers
-
-
 def _get_unpatched(cls):
     warnings.warn("Do not call this function", DeprecationWarning)
     return get_unpatched(cls)
@@ -340,8 +332,6 @@ def __init__(self, attrs=None):
             self.dependency_links = attrs.pop('dependency_links', [])
             assert_string_list(self, 'dependency_links', self.dependency_links)
         if attrs and 'setup_requires' in attrs:
-            if _skip_install_eggs:
-                raise SetupRequirementsError(attrs['setup_requires'])
             self.fetch_build_eggs(attrs['setup_requires'])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
diff --git a/setuptools/pep517.py b/setuptools/pep517.py
index b3e9ea8666..54f2987bf2 100644
--- a/setuptools/pep517.py
+++ b/setuptools/pep517.py
@@ -30,9 +30,35 @@
 import sys
 import tokenize
 import shutil
+import contextlib
 
-from setuptools import dist
-from setuptools.dist import SetupRequirementsError
+import setuptools
+import distutils
+
+
+class SetupRequirementsError(BaseException):
+    def __init__(self, specifiers):
+        self.specifiers = specifiers
+
+
+class Distribution(setuptools.dist.Distribution):
+    def fetch_build_eggs(self, specifiers):
+        raise SetupRequirementsError(specifiers)
+
+    @classmethod
+    @contextlib.contextmanager
+    def patch(cls):
+        """
+        Replace
+        distutils.dist.Distribution with this class
+        for the duration of this context.
+        """
+        orig = distutils.core.Distribution
+        distutils.core.Distribution = cls
+        try:
+            yield
+        finally:
+            distutils.core.Distribution = orig
 
 
 def _run_setup(setup_script='setup.py'):
@@ -54,17 +80,15 @@ def _fix_config(config_settings):
 def _get_build_requires(config_settings):
     config_settings = _fix_config(config_settings)
     requirements = ['setuptools', 'wheel']
-    dist._skip_install_eggs = True
 
     sys.argv = sys.argv[:1] + ['egg_info'] + \
         config_settings["--global-option"]
     try:
-        _run_setup()
+        with Distribution.patch():
+            _run_setup()
     except SetupRequirementsError as e:
         requirements += e.specifiers
 
-    dist._skip_install_eggs = False
-
     return requirements
 
 

From fa5f1be3b6cc13db5d6df9dfbe90542aad6bd3c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 09:43:21 +0200
Subject: [PATCH 6781/8469] Clean up imports in test_pep517 to conform to PEP 8
 standards.

---
 setuptools/tests/test_pep517.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index df4414a14a..adc155cc03 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -1,18 +1,15 @@
-import pytest
 import os
+import contextlib
+import tempfile
 
-# Only test the backend on Python 3
-# because we don't want to require
-# a concurrent.futures backport for testing
-pytest.importorskip('concurrent.futures')
+import pytest
 
-from contextlib import contextmanager
-from importlib import import_module
-from tempfile import mkdtemp
-from concurrent.futures import ProcessPoolExecutor
 from .files import build_files
 from .textwrap import DALS
-from . import contexts
+
+
+futures = pytest.importorskip('concurrent.futures')
+importlib = pytest.importorskip('importlib')
 
 
 class BuildBackendBase(object):
@@ -26,7 +23,7 @@ class BuildBackend(BuildBackendBase):
     """PEP 517 Build Backend"""
     def __init__(self, *args, **kwargs):
         super(BuildBackend, self).__init__(*args, **kwargs)
-        self.pool = ProcessPoolExecutor()
+        self.pool = futures.ProcessPoolExecutor()
 
     def __getattr__(self, name):
         """Handles aribrary function invocations on the build backend."""
@@ -44,10 +41,11 @@ def __call__(self, name, *args, **kw):
         """Handles aribrary function invocations on the build backend."""
         os.chdir(self.cwd)
         os.environ.update(self.env)
-        return getattr(import_module(self.backend_name), name)(*args, **kw)
+        mod = importlib.import_module(self.backend_name)
+        return getattr(mod, name)(*args, **kw)
 
 
-@contextmanager
+@contextlib.contextmanager
 def enter_directory(dir, val=None):
     original_dir = os.getcwd()
     os.chdir(dir)
@@ -57,7 +55,7 @@ def enter_directory(dir, val=None):
 
 @pytest.fixture
 def build_backend():
-    tmpdir = mkdtemp()
+    tmpdir = tempfile.mkdtemp()
     with enter_directory(tmpdir):
         setup_script = DALS("""
         from setuptools import setup
@@ -87,6 +85,7 @@ def test_get_requires_for_build_wheel(build_backend):
         assert list(sorted(b.get_requires_for_build_wheel())) == \
             list(sorted(['six', 'setuptools', 'wheel']))
 
+
 def test_build_wheel(build_backend):
     with build_backend as b:
         dist_dir = os.path.abspath('pip-wheel')
@@ -104,6 +103,7 @@ def test_build_sdist(build_backend):
 
         assert os.path.isfile(os.path.join(dist_dir, sdist_name))
 
+
 def test_prepare_metadata_for_build_wheel(build_backend):
     with build_backend as b:
         dist_dir = os.path.abspath('pip-dist-info')

From 9a42fe5cbc5fa73d528547a918586647f2122140 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 09:53:13 +0200
Subject: [PATCH 6782/8469] Use pytest tmpdir fixture for simplicity.

---
 setuptools/tests/test_pep517.py | 69 +++++++++++++--------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index adc155cc03..07b5aadab2 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -45,19 +45,9 @@ def __call__(self, name, *args, **kw):
         return getattr(mod, name)(*args, **kw)
 
 
-@contextlib.contextmanager
-def enter_directory(dir, val=None):
-    original_dir = os.getcwd()
-    os.chdir(dir)
-    yield val
-    os.chdir(original_dir)
-
-
 @pytest.fixture
-def build_backend():
-    tmpdir = tempfile.mkdtemp()
-    with enter_directory(tmpdir):
-        setup_script = DALS("""
+def build_backend(tmpdir):
+    setup_script = DALS("""
         from setuptools import setup
 
         setup(
@@ -68,48 +58,45 @@ def build_backend():
             zip_safe=False,
         )
         """)
-
-        build_files({
-            'setup.py': setup_script,
-            'hello.py': DALS("""
-                def run():
-                    print('hello')
-                """)
-        })
-
-    return enter_directory(tmpdir, BuildBackend(cwd='.'))
+    defn = {
+        'setup.py': setup_script,
+        'hello.py': DALS("""
+            def run():
+                print('hello')
+            """)
+    }
+    build_files(defn, prefix=str(tmpdir))
+    with tmpdir.as_cwd():
+        yield BuildBackend(cwd='.')
 
 
 def test_get_requires_for_build_wheel(build_backend):
-    with build_backend as b:
-        assert list(sorted(b.get_requires_for_build_wheel())) == \
-            list(sorted(['six', 'setuptools', 'wheel']))
+    b = build_backend
+    assert list(sorted(b.get_requires_for_build_wheel())) == \
+        list(sorted(['six', 'setuptools', 'wheel']))
 
 
 def test_build_wheel(build_backend):
-    with build_backend as b:
-        dist_dir = os.path.abspath('pip-wheel')
-        os.makedirs(dist_dir)
-        wheel_name = b.build_wheel(dist_dir)
+    dist_dir = os.path.abspath('pip-wheel')
+    os.makedirs(dist_dir)
+    wheel_name = build_backend.build_wheel(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, wheel_name))
+    assert os.path.isfile(os.path.join(dist_dir, wheel_name))
 
 
 def test_build_sdist(build_backend):
-    with build_backend as b:
-        dist_dir = os.path.abspath('pip-sdist')
-        os.makedirs(dist_dir)
-        sdist_name = b.build_sdist(dist_dir)
+    dist_dir = os.path.abspath('pip-sdist')
+    os.makedirs(dist_dir)
+    sdist_name = build_backend.build_sdist(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
+    assert os.path.isfile(os.path.join(dist_dir, sdist_name))
 
 
 def test_prepare_metadata_for_build_wheel(build_backend):
-    with build_backend as b:
-        dist_dir = os.path.abspath('pip-dist-info')
-        os.makedirs(dist_dir)
+    dist_dir = os.path.abspath('pip-dist-info')
+    os.makedirs(dist_dir)
 
-        dist_info = b.prepare_metadata_for_build_wheel(dist_dir)
+    dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, dist_info,
-                              'METADATA'))
+    assert os.path.isfile(os.path.join(dist_dir, dist_info,
+                          'METADATA'))

From f8e6e7204394dd37e0c3f16230427189f50bb4b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 09:54:56 +0200
Subject: [PATCH 6783/8469] Extract variables in test for clarity.

---
 setuptools/tests/test_pep517.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 07b5aadab2..af963037b6 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -71,9 +71,9 @@ def run():
 
 
 def test_get_requires_for_build_wheel(build_backend):
-    b = build_backend
-    assert list(sorted(b.get_requires_for_build_wheel())) == \
-        list(sorted(['six', 'setuptools', 'wheel']))
+    actual = build_backend.get_requires_for_build_wheel()
+    expected = ['six', 'setuptools', 'wheel']
+    assert sorted(actual) == sorted(expected)
 
 
 def test_build_wheel(build_backend):

From 9cb2bcb48ed11ba2b3f0ee21b506adebb5622f59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 09:56:14 +0200
Subject: [PATCH 6784/8469] Remove unused imports

---
 setuptools/tests/test_pep517.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index af963037b6..5998f1f2ff 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -1,6 +1,4 @@
 import os
-import contextlib
-import tempfile
 
 import pytest
 

From 720ba1011686a7dc6bfa29490a9316ba73f4e020 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:04:02 +0200
Subject: [PATCH 6785/8469] Inline setup.py for consistency.

---
 setuptools/tests/test_pep517.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 5998f1f2ff..71644b4aeb 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -45,23 +45,22 @@ def __call__(self, name, *args, **kw):
 
 @pytest.fixture
 def build_backend(tmpdir):
-    setup_script = DALS("""
-        from setuptools import setup
-
-        setup(
-            name='foo',
-            py_modules=['hello'],
-            setup_requires=['six'],
-            entry_points={'console_scripts': ['hi = hello.run']},
-            zip_safe=False,
-        )
-        """)
     defn = {
-        'setup.py': setup_script,
+        'setup.py': DALS("""
+            from setuptools import setup
+
+            setup(
+                name='foo',
+                py_modules=['hello'],
+                setup_requires=['six'],
+                entry_points={'console_scripts': ['hi = hello.run']},
+                zip_safe=False,
+            )
+            """),
         'hello.py': DALS("""
             def run():
                 print('hello')
-            """)
+            """),
     }
     build_files(defn, prefix=str(tmpdir))
     with tmpdir.as_cwd():

From 6cc792288fb7fdcb257b427c6b94b770b9149308 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:05:25 +0200
Subject: [PATCH 6786/8469] Remove apparently irrelevant details.

---
 setuptools/tests/test_pep517.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 71644b4aeb..12c86fa547 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -53,8 +53,6 @@ def build_backend(tmpdir):
                 name='foo',
                 py_modules=['hello'],
                 setup_requires=['six'],
-                entry_points={'console_scripts': ['hi = hello.run']},
-                zip_safe=False,
             )
             """),
         'hello.py': DALS("""

From 35d77eb73fe9a91b49f7b73d84092036680282c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:06:48 +0200
Subject: [PATCH 6787/8469] Use shorthand for conciseness.

---
 setuptools/tests/test_pep517.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index 12c86fa547..dd32572dbf 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -47,9 +47,7 @@ def __call__(self, name, *args, **kw):
 def build_backend(tmpdir):
     defn = {
         'setup.py': DALS("""
-            from setuptools import setup
-
-            setup(
+            __import__('setuptools').setup(
                 name='foo',
                 py_modules=['hello'],
                 setup_requires=['six'],

From 3e8bb3bcc17f349a20bf70c2678a154d8ff693b6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:09:52 +0200
Subject: [PATCH 6788/8469] Reindent for nicer lines

---
 setuptools/tests/test_pep517.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_pep517.py
index dd32572dbf..fa6628ec30 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_pep517.py
@@ -26,10 +26,9 @@ def __init__(self, *args, **kwargs):
     def __getattr__(self, name):
         """Handles aribrary function invocations on the build backend."""
         def method(*args, **kw):
-            return self.pool.submit(
-                BuildBackendCaller(os.path.abspath(self.cwd), self.env,
-                                   self.backend_name),
-                name, *args, **kw).result()
+            root = os.path.abspath(self.cwd)
+            caller = BuildBackendCaller(root, self.env, self.backend_name)
+            return self.pool.submit(caller, name, *args, **kw).result()
 
         return method
 
@@ -91,5 +90,4 @@ def test_prepare_metadata_for_build_wheel(build_backend):
 
     dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
 
-    assert os.path.isfile(os.path.join(dist_dir, dist_info,
-                          'METADATA'))
+    assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))

From 5a0f4b9784a35e514f53ea08adb29d999f511cac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:14:43 +0200
Subject: [PATCH 6789/8469] Renamed 'pep517' to 'build_meta'

---
 setuptools/{pep517.py => build_meta.py}                 | 0
 setuptools/tests/{test_pep517.py => test_build_meta.py} | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename setuptools/{pep517.py => build_meta.py} (100%)
 rename setuptools/tests/{test_pep517.py => test_build_meta.py} (99%)

diff --git a/setuptools/pep517.py b/setuptools/build_meta.py
similarity index 100%
rename from setuptools/pep517.py
rename to setuptools/build_meta.py
diff --git a/setuptools/tests/test_pep517.py b/setuptools/tests/test_build_meta.py
similarity index 99%
rename from setuptools/tests/test_pep517.py
rename to setuptools/tests/test_build_meta.py
index fa6628ec30..69a700c2c1 100644
--- a/setuptools/tests/test_pep517.py
+++ b/setuptools/tests/test_build_meta.py
@@ -11,7 +11,7 @@
 
 
 class BuildBackendBase(object):
-    def __init__(self, cwd=None, env={}, backend_name='setuptools.pep517'):
+    def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
         self.cwd = cwd
         self.env = env
         self.backend_name = backend_name

From 8c385a127bdffd372f266f4fd4eb4fc134e132a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 10:16:28 +0200
Subject: [PATCH 6790/8469] Update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8130511e37..9b93efb43e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.6.0
+-------
+
+* #1143: Added ``setuptools.build_meta`` module, an implementation
+  of PEP-517 for Setuptools-defined packages.
+
 v36.4.0
 -------
 

From aa2e8aaea3e466025230b1956f62b0839529e27f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 11:23:37 +0200
Subject: [PATCH 6791/8469] Update changelog regarding dist_info command. Ref
 #1143.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index aa61e1cdc4..3dbda9dc4b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ v36.6.0
 * #1143: Added ``setuptools.build_meta`` module, an implementation
   of PEP-517 for Setuptools-defined packages.
 
+* #1143: Added ``dist_info`` command for producing dist_info
+  metadata.
+
 v36.5.0
 -------
 

From cb9e3a35bfc07136c44d942698fc45fc3f12192b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 11:25:55 +0200
Subject: [PATCH 6792/8469] =?UTF-8?q?Bump=20version:=2036.5.0=20=E2=86=92?=
 =?UTF-8?q?=2036.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e5ebf4b8df..c1ee1ba495 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.5.0
+current_version = 36.6.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ee968d9a89..33003465a1 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.5.0",
+    version="36.6.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 75b870b9a6233338f24841e86df88f03697f71f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 12:40:53 +0200
Subject: [PATCH 6793/8469] Feed the hobgoblins (delint).

---
 pkg_resources/__init__.py | 72 +++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 049b8a5458..66d54ca8d2 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -480,8 +480,10 @@ def get_build_platform():
         try:
             version = _macosx_vers()
             machine = os.uname()[4].replace(" ", "_")
-            return "macosx-%d.%d-%s" % (int(version[0]), int(version[1]),
-                _macosx_arch(machine))
+            return "macosx-%d.%d-%s" % (
+                int(version[0]), int(version[1]),
+                _macosx_arch(machine),
+            )
         except ValueError:
             # if someone is running a non-Mac darwin system, this will fall
             # through to the default implementation
@@ -806,7 +808,8 @@ def resolve(self, requirements, env=None, installer=None,
         already-installed distribution; it should return a ``Distribution`` or
         ``None``.
 
-        Unless `replace_conflicting=True`, raises a VersionConflict exception if
+        Unless `replace_conflicting=True`, raises a VersionConflict exception
+        if
         any requirements are found on the path that have the correct name but
         the wrong version.  Otherwise, if an `installer` is supplied it will be
         invoked to obtain the correct version of the requirement and activate
@@ -885,8 +888,8 @@ def resolve(self, requirements, env=None, installer=None,
         # return list of distros to activate
         return to_activate
 
-    def find_plugins(self, plugin_env, full_env=None, installer=None,
-            fallback=True):
+    def find_plugins(
+            self, plugin_env, full_env=None, installer=None, fallback=True):
         """Find all activatable distributions in `plugin_env`
 
         Example usage::
@@ -1040,7 +1043,8 @@ def markers_pass(self, req, extras=None):
 class Environment(object):
     """Searchable snapshot of distributions on a search path"""
 
-    def __init__(self, search_path=None, platform=get_supported_platform(),
+    def __init__(
+            self, search_path=None, platform=get_supported_platform(),
             python=PY_MAJOR):
         """Snapshot distributions available on a search path
 
@@ -1113,7 +1117,8 @@ def add(self, dist):
                 dists.append(dist)
                 dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
 
-    def best_match(self, req, working_set, installer=None, replace_conflicting=False):
+    def best_match(
+            self, req, working_set, installer=None, replace_conflicting=False):
         """Find distribution best matching `req` and usable on `working_set`
 
         This calls the ``find(req)`` method of the `working_set` to see if a
@@ -1248,8 +1253,8 @@ def extraction_error(self):
         tmpl = textwrap.dedent("""
             Can't extract file(s) to egg cache
 
-            The following error occurred while trying to extract file(s) to the Python egg
-            cache:
+            The following error occurred while trying to extract file(s)
+            to the Python egg cache:
 
               {old_exc}
 
@@ -1257,9 +1262,9 @@ def extraction_error(self):
 
               {cache_path}
 
-            Perhaps your account does not have write access to this directory?  You can
-            change the cache directory by setting the PYTHON_EGG_CACHE environment
-            variable to point to an accessible directory.
+            Perhaps your account does not have write access to this directory?
+            You can change the cache directory by setting the PYTHON_EGG_CACHE
+            environment variable to point to an accessible directory.
             """).lstrip()
         err = ExtractionError(tmpl.format(**locals()))
         err.manager = self
@@ -1309,11 +1314,13 @@ def _warn_unsafe_extraction_path(path):
             return
         mode = os.stat(path).st_mode
         if mode & stat.S_IWOTH or mode & stat.S_IWGRP:
-            msg = ("%s is writable by group/others and vulnerable to attack "
+            msg = (
+                "%s is writable by group/others and vulnerable to attack "
                 "when "
                 "used with get_resource_filename. Consider a more secure "
                 "location (set with .set_extraction_path or the "
-                "PYTHON_EGG_CACHE environment variable)." % path)
+                "PYTHON_EGG_CACHE environment variable)." % path
+            )
             warnings.warn(msg, UserWarning)
 
     def postprocess(self, tempname, filename):
@@ -1597,8 +1604,11 @@ def _get(self, path):
 
     @classmethod
     def _register(cls):
-        loader_cls = getattr(importlib_machinery, 'SourceFileLoader',
-            type(None))
+        loader_cls = getattr(
+            importlib_machinery,
+            'SourceFileLoader',
+            type(None),
+        )
         register_loader_type(loader_cls, cls)
 
 
@@ -1766,7 +1776,10 @@ def _extract_resource(self, manager, zip_path):
             if self._is_current(real_path, zip_path):
                 return real_path
 
-            outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))
+            outf, tmpnam = _mkstemp(
+                ".$extract",
+                dir=os.path.dirname(real_path),
+            )
             os.write(outf, self.loader.get_data(zip_path))
             os.close(outf)
             utime(tmpnam, (timestamp, timestamp))
@@ -1972,7 +1985,8 @@ def find_eggs_in_zip(importer, path_item, only=False):
     for subitem in metadata.resource_listdir('/'):
         if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
-            for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
+            dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
+            for dist in dists:
                 yield dist
         elif subitem.lower().endswith('.dist-info'):
             subpath = os.path.join(path_item, subitem)
@@ -1981,7 +1995,6 @@ def find_eggs_in_zip(importer, path_item, only=False):
             yield Distribution.from_location(path_item, subitem, submeta)
 
 
-
 register_finder(zipimport.zipimporter, find_eggs_in_zip)
 
 
@@ -2527,7 +2540,8 @@ class Distribution(object):
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
 
-    def __init__(self, location=None, metadata=None, project_name=None,
+    def __init__(
+            self, location=None, metadata=None, project_name=None,
             version=None, py_version=PY_MAJOR, platform=None,
             precedence=EGG_DIST):
         self.project_name = safe_name(project_name or 'Unknown')
@@ -2803,7 +2817,8 @@ def insert_on(self, path, loc=None, replace=False):
                 if replace:
                     break
                 else:
-                    # don't modify path (even removing duplicates) if found and not replace
+                    # don't modify path (even removing duplicates) if
+                    # found and not replace
                     return
             elif item == bdir and self.precedence == EGG_DIST:
                 # if it's an .egg, give it precedence over its directory
@@ -2900,7 +2915,10 @@ def _reload_version(self):
 
 
 class DistInfoDistribution(Distribution):
-    """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
+    """
+    Wrap an actual or potential sys.path entry
+    w/metadata, .dist-info style.
+    """
     PKG_INFO = 'METADATA'
     EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])")
 
@@ -2950,7 +2968,7 @@ def reqs_for_extra(extra):
     '.egg': Distribution,
     '.egg-info': EggInfoDistribution,
     '.dist-info': DistInfoDistribution,
-    }
+}
 
 
 def issue_warning(*args, **kw):
@@ -3035,7 +3053,8 @@ def __contains__(self, item):
     def __hash__(self):
         return self.__hash
 
-    def __repr__(self): return "Requirement.parse(%r)" % str(self)
+    def __repr__(self):
+        return "Requirement.parse(%r)" % str(self)
 
     @staticmethod
     def parse(s):
@@ -3169,7 +3188,10 @@ def _initialize_master_working_set():
         dist.activate(replace=False)
         for dist in working_set
     )
-    add_activation_listener(lambda dist: dist.activate(replace=True), existing=False)
+    add_activation_listener(
+        lambda dist: dist.activate(replace=True),
+        existing=False,
+    )
     working_set.entries = []
     # match order
     list(map(working_set.add_entry, sys.path))

From d1f16fdd849264795bfa0a383581ac4ffefeec58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 22:08:53 +0200
Subject: [PATCH 6794/8469] Use simpler Requirement from packaging.requirements

---
 pkg_resources/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 66d54ca8d2..e103847376 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2392,7 +2392,9 @@ def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
         self.name = name
         self.module_name = module_name
         self.attrs = tuple(attrs)
-        self.extras = Requirement.parse(("x[%s]" % ','.join(extras))).extras
+        ex_spec = "x[%s]" % ','.join(extras)
+        req = packaging.requirements.Requirement(ex_spec)
+        self.extras = tuple(req.extras)
         self.dist = dist
 
     def __str__(self):

From 4ee5c6510006d384f9ddd444824367ccaf67f0c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 22:28:55 +0200
Subject: [PATCH 6795/8469] Remove unnecessary serialization/parsing of extras
 in EntryPoint.__init__. Fixes #1132.

---
 pkg_resources/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index e103847376..6f1071fb87 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2392,9 +2392,7 @@ def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
         self.name = name
         self.module_name = module_name
         self.attrs = tuple(attrs)
-        ex_spec = "x[%s]" % ','.join(extras)
-        req = packaging.requirements.Requirement(ex_spec)
-        self.extras = tuple(req.extras)
+        self.extras = tuple(extras)
         self.dist = dist
 
     def __str__(self):

From 4995726bbdc92ab1f4235dfc8b9ee08c9f365d3e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 12 Oct 2017 22:33:14 +0200
Subject: [PATCH 6796/8469] Update changelog. Ref #1132.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3dbda9dc4b..6b84c03f57 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.6.1
+-------
+
+* #1132: Removed redundant and costly serialization/parsing step
+  in ``EntryPoint.__init__``.
+
 v36.6.0
 -------
 

From 60270c2422caa7ed2b33a327c63a85395f7c23a8 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Fri, 13 Oct 2017 16:02:38 -0500
Subject: [PATCH 6797/8469] commands: dist_info: say something!

The dist_info command did not say anything like other
commands did. This gives some more helpful information.
---
 setuptools/command/dist_info.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/dist_info.py b/setuptools/command/dist_info.py
index c8dc659b11..c6c6dacb78 100644
--- a/setuptools/command/dist_info.py
+++ b/setuptools/command/dist_info.py
@@ -7,6 +7,7 @@
 import shutil
 
 from distutils.core import Command
+from distutils import log
 
 
 class dist_info(Command):
@@ -28,10 +29,12 @@ def run(self):
         egg_info = self.get_finalized_command('egg_info')
         egg_info.run()
         dist_info_dir = egg_info.egg_info[:-len('.egg-info')] + '.dist-info'
+        log.info("creating '{}'".format(os.path.abspath(dist_info_dir)))
 
         bdist_wheel = self.get_finalized_command('bdist_wheel')
         bdist_wheel.egg2dist(egg_info.egg_info, dist_info_dir)
 
         if self.egg_base:
-            shutil.move(dist_info_dir, os.path.join(
-                self.egg_base, dist_info_dir))
+            destination = os.path.join(self.egg_base, dist_info_dir)
+            log.info("creating '{}'".format(os.path.abspath(destination)))
+            shutil.move(dist_info_dir, destination)

From ffb2e6994a3405c2ab007ab9564bb02c9263eb6c Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 12:48:33 -0500
Subject: [PATCH 6798/8469] BUG: re-initialize the master working set

In some cases (specifically when pip imports this module in a virtualenv),
pkg_resources can already be imported, causing setuptools to load
entry_points from an older version. Here, we re-initialize the master
working set to fix the case where the entry points from an older
setuptools are loaded.
---
 setuptools/build_meta.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 54f2987bf2..365e24ee43 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -35,6 +35,8 @@
 import setuptools
 import distutils
 
+from pkg_resources import _initialize_master_working_set
+
 
 class SetupRequirementsError(BaseException):
     def __init__(self, specifiers):
@@ -64,6 +66,7 @@ def patch(cls):
 def _run_setup(setup_script='setup.py'):
     # Note that we can reuse our build directory between calls
     # Correctness comes first, then optimization later
+    _initialize_master_working_set()
     __file__ = setup_script
     f = getattr(tokenize, 'open', open)(__file__)
     code = f.read().replace('\\r\\n', '\\n')

From e2e15d52473c52071d331b415bcf949f8e848a22 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 12:53:22 -0500
Subject: [PATCH 6799/8469] dist_info: create the egg_info in the same location

This change is a small simplification that simply creates the
egg_info directory in the egg_base location; it's a minor
cleanup that results in some read and it helps with
read-only directories (the egg_info directory is uncontrollable).
---
 setuptools/command/dist_info.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/setuptools/command/dist_info.py b/setuptools/command/dist_info.py
index c6c6dacb78..28b88c8887 100644
--- a/setuptools/command/dist_info.py
+++ b/setuptools/command/dist_info.py
@@ -4,7 +4,6 @@
 """
 
 import os
-import shutil
 
 from distutils.core import Command
 from distutils import log
@@ -27,14 +26,10 @@ def finalize_options(self):
 
     def run(self):
         egg_info = self.get_finalized_command('egg_info')
+        egg_info.egg_base = self.egg_base
         egg_info.run()
         dist_info_dir = egg_info.egg_info[:-len('.egg-info')] + '.dist-info'
         log.info("creating '{}'".format(os.path.abspath(dist_info_dir)))
 
         bdist_wheel = self.get_finalized_command('bdist_wheel')
         bdist_wheel.egg2dist(egg_info.egg_info, dist_info_dir)
-
-        if self.egg_base:
-            destination = os.path.join(self.egg_base, dist_info_dir)
-            log.info("creating '{}'".format(os.path.abspath(destination)))
-            shutil.move(dist_info_dir, destination)

From cf130d32a57eddc455b39295c09ac5758187e549 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 13:01:18 -0500
Subject: [PATCH 6800/8469] build_meta: print dist_info directories

---
 setuptools/build_meta.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 365e24ee43..99ca03390b 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -112,6 +112,8 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     dist_infos = [f for f in os.listdir(metadata_directory)
                   if f.endswith('.dist-info')]
 
+    print(dist_infos)
+
     assert len(dist_infos) == 1
     return dist_infos[0]
 

From 0e6c4aae4fac818bacefa4bcc7a378944299af86 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 13:10:49 -0500
Subject: [PATCH 6801/8469] dist_info: re-finalize the egg_info options

---
 setuptools/command/dist_info.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/command/dist_info.py b/setuptools/command/dist_info.py
index 28b88c8887..c45258fa03 100644
--- a/setuptools/command/dist_info.py
+++ b/setuptools/command/dist_info.py
@@ -27,6 +27,7 @@ def finalize_options(self):
     def run(self):
         egg_info = self.get_finalized_command('egg_info')
         egg_info.egg_base = self.egg_base
+        egg_info.finalize_options()
         egg_info.run()
         dist_info_dir = egg_info.egg_info[:-len('.egg-info')] + '.dist-info'
         log.info("creating '{}'".format(os.path.abspath(dist_info_dir)))

From efc7b7b5fb61125b888a615d6ef4b1fca85332c0 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 13:12:47 -0500
Subject: [PATCH 6802/8469] FIX: revert changes

---
 setuptools/build_meta.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 99ca03390b..365e24ee43 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -112,8 +112,6 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     dist_infos = [f for f in os.listdir(metadata_directory)
                   if f.endswith('.dist-info')]
 
-    print(dist_infos)
-
     assert len(dist_infos) == 1
     return dist_infos[0]
 

From 1a37f5713e08a0320038ec4e5d2164f95a29abef Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sun, 15 Oct 2017 13:28:32 -0500
Subject: [PATCH 6803/8469] FIX: setup the correct environment before loading
 setup.py

---
 setuptools/build_meta.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 365e24ee43..02ad91ccb6 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -68,10 +68,11 @@ def _run_setup(setup_script='setup.py'):
     # Correctness comes first, then optimization later
     _initialize_master_working_set()
     __file__ = setup_script
+    __name__ = '__main__'
     f = getattr(tokenize, 'open', open)(__file__)
     code = f.read().replace('\\r\\n', '\\n')
     f.close()
-    exec(compile(code, __file__, 'exec'))
+    exec(compile(code, __file__, 'exec'), locals())
 
 
 def _fix_config(config_settings):

From ca9d086aa03cc40ee9024ae933d623799ac0c841 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 15 Oct 2017 20:31:10 -0700
Subject: [PATCH 6804/8469] Include license file in the generated wheel package

The wheel package format supports including the license file. This is
done using the [metadata] section in the setup.cfg file. For additional
information on this feature, see:

https://wheel.readthedocs.io/en/stable/index.html#including-the-license-in-the-generated-wheel-file
---
 setup.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index c1ee1ba495..8422a269ae 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,5 +22,7 @@ formats = zip
 [bdist_wheel]
 universal = 1
 
-[bumpversion:file:setup.py]
+[metadata]
+license_file = LICENSE
 
+[bumpversion:file:setup.py]

From 55e1b97a8a06956d60f7e441ebe46200efc775df Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Mon, 16 Oct 2017 10:42:52 -0500
Subject: [PATCH 6805/8469] FIX: drop the more contraversial changes

---
 setuptools/build_meta.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 02ad91ccb6..f89f82d645 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -35,8 +35,6 @@
 import setuptools
 import distutils
 
-from pkg_resources import _initialize_master_working_set
-
 
 class SetupRequirementsError(BaseException):
     def __init__(self, specifiers):
@@ -66,7 +64,6 @@ def patch(cls):
 def _run_setup(setup_script='setup.py'):
     # Note that we can reuse our build directory between calls
     # Correctness comes first, then optimization later
-    _initialize_master_working_set()
     __file__ = setup_script
     __name__ = '__main__'
     f = getattr(tokenize, 'open', open)(__file__)

From b05a6c5e42d85ee463e5c718ceb49f19b609beba Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Mon, 16 Oct 2017 10:57:10 -0500
Subject: [PATCH 6806/8469] TST: add more for build_meta

---
 setuptools/tests/test_build_meta.py | 65 ++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 69a700c2c1..2516b7029a 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -42,22 +42,55 @@ def __call__(self, name, *args, **kw):
         return getattr(mod, name)(*args, **kw)
 
 
-@pytest.fixture
-def build_backend(tmpdir):
-    defn = {
-        'setup.py': DALS("""
-            __import__('setuptools').setup(
-                name='foo',
-                py_modules=['hello'],
-                setup_requires=['six'],
-            )
-            """),
-        'hello.py': DALS("""
-            def run():
-                print('hello')
-            """),
-    }
-    build_files(defn, prefix=str(tmpdir))
+defns = [{
+            'setup.py': DALS("""
+                __import__('setuptools').setup(
+                    name='foo',
+                    py_modules=['hello'],
+                    setup_requires=['six'],
+                )
+                """),
+            'hello.py': DALS("""
+                def run():
+                    print('hello')
+                """),
+        },
+        {
+            'setup.py': DALS("""
+                assert __name__ == '__main__'
+                __import__('setuptools').setup(
+                    name='foo',
+                    py_modules=['hello'],
+                    setup_requires=['six'],
+                )
+                """),
+            'hello.py': DALS("""
+                def run():
+                    print('hello')
+                """),
+        },
+        {
+            'setup.py': DALS("""
+                variable = True
+                def function():
+                    return variable
+                assert variable
+                __import__('setuptools').setup(
+                    name='foo',
+                    py_modules=['hello'],
+                    setup_requires=['six'],
+                )
+                """),
+            'hello.py': DALS("""
+                def run():
+                    print('hello')
+                """),
+        }]
+
+
+@pytest.fixture(scope="module", params=defns)
+def build_backend(tmpdir, request):
+    build_files(request.param, prefix=str(tmpdir))
     with tmpdir.as_cwd():
         yield BuildBackend(cwd='.')
 

From 1cceb2cb31e10826bd6bfb1cfacfe4996a99ae63 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Mon, 16 Oct 2017 10:59:35 -0500
Subject: [PATCH 6807/8469] FIX: remove the

---
 setuptools/tests/test_build_meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 2516b7029a..659c1a6587 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -88,7 +88,7 @@ def run():
         }]
 
 
-@pytest.fixture(scope="module", params=defns)
+@pytest.fixture(params=defns)
 def build_backend(tmpdir, request):
     build_files(request.param, prefix=str(tmpdir))
     with tmpdir.as_cwd():

From f2ad62e0543ea6dde2e91f08c0feed09fdd55724 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 20 Sep 2017 02:10:28 +0200
Subject: [PATCH 6808/8469] tests: fix easy_install test assertion

---
 setuptools/tests/test_easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c9d396f4e3..617ee48924 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -406,7 +406,7 @@ def test_setup_requires_overrides_version_conflict(self):
 
                 lines = stdout.readlines()
                 assert len(lines) > 0
-                assert lines[-1].strip(), 'test_pkg'
+                assert lines[-1].strip() == 'test_pkg'
 
     def test_setup_requires_override_nspkg(self):
         """

From 472c79f95cc41a3e85d6b212347d6b006c9c3c26 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 14 Sep 2017 22:07:13 +0200
Subject: [PATCH 6809/8469] support `setup_requires` in setup.cfg

---
 setuptools/__init__.py                | 22 ++++++-
 setuptools/dist.py                    | 40 ++++++-------
 setuptools/tests/test_dist.py         |  1 +
 setuptools/tests/test_easy_install.py | 83 +++++++++++++++++++++++++--
 4 files changed, 118 insertions(+), 28 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 04f7674082..7da47fbed5 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -109,7 +109,27 @@ def _looks_like_package(path):
 
 find_packages = PackageFinder.find
 
-setup = distutils.core.setup
+
+def _install_setup_requires(attrs):
+    # Note: do not use `setuptools.Distribution` directly, as
+    # our PEP 517 backend patch `distutils.core.Distribution`.
+    dist = distutils.core.Distribution(dict(
+        (k, v) for k, v in attrs.items()
+        if k in ('dependency_links', 'setup_requires')
+    ))
+    # Honor setup.cfg's options.
+    dist.parse_config_files(ignore_option_errors=True)
+    if dist.setup_requires:
+        dist.fetch_build_eggs(dist.setup_requires)
+
+
+def setup(**attrs):
+    # Make sure we have any requirements needed to interpret 'attrs'.
+    _install_setup_requires(attrs)
+    return distutils.core.setup(**attrs)
+
+setup.__doc__ = distutils.core.setup.__doc__
+
 
 _Command = monkey.get_unpatched(distutils.core.Command)
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index a2ca879516..aa304500e8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -316,23 +316,19 @@ def __init__(self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
             self.package_data = {}
-        _attrs_dict = attrs or {}
-        if 'features' in _attrs_dict or 'require_features' in _attrs_dict:
+        attrs = attrs or {}
+        if 'features' in attrs or 'require_features' in attrs:
             Feature.warn_deprecated()
         self.require_features = []
         self.features = {}
         self.dist_files = []
-        self.src_root = attrs and attrs.pop("src_root", None)
+        self.src_root = attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
-        self.long_description_content_type = _attrs_dict.get(
+        self.long_description_content_type = attrs.get(
             'long_description_content_type'
         )
-        # Make sure we have any eggs needed to interpret 'attrs'
-        if attrs is not None:
-            self.dependency_links = attrs.pop('dependency_links', [])
-            assert_string_list(self, 'dependency_links', self.dependency_links)
-        if attrs and 'setup_requires' in attrs:
-            self.fetch_build_eggs(attrs['setup_requires'])
+        self.dependency_links = attrs.pop('dependency_links', [])
+        self.setup_requires = attrs.pop('setup_requires', [])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)
@@ -427,14 +423,15 @@ def _clean_req(self, req):
         req.marker = None
         return req
 
-    def parse_config_files(self, filenames=None):
+    def parse_config_files(self, filenames=None, ignore_option_errors=False):
         """Parses configuration files from various levels
         and loads configuration.
 
         """
         _Distribution.parse_config_files(self, filenames=filenames)
 
-        parse_configuration(self, self.command_options)
+        parse_configuration(self, self.command_options,
+                            ignore_option_errors=ignore_option_errors)
         self._finalize_requires()
 
     def parse_command_line(self):
@@ -497,19 +494,20 @@ def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
         from setuptools.command.easy_install import easy_install
         dist = self.__class__({'script_args': ['easy_install']})
-        dist.parse_config_files()
         opts = dist.get_option_dict('easy_install')
-        keep = (
-            'find_links', 'site_dirs', 'index_url', 'optimize',
-            'site_dirs', 'allow_hosts'
-        )
-        for key in list(opts):
-            if key not in keep:
-                del opts[key]  # don't use any other settings
+        opts.clear()
+        opts.update(
+            (k, v)
+            for k, v in self.get_option_dict('easy_install').items()
+            if k in (
+                # don't use any other settings
+                'find_links', 'site_dirs', 'index_url',
+                'optimize', 'site_dirs', 'allow_hosts',
+        ))
         if self.dependency_links:
             links = self.dependency_links[:]
             if 'find_links' in opts:
-                links = opts['find_links'][1].split() + links
+                links = opts['find_links'][1] + links
             opts['find_links'] = ('setup', links)
         install_dir = self.get_egg_cache_dir()
         cmd = easy_install(
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 435ffec0fb..c4c9bd0388 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -39,6 +39,7 @@ def sdist_with_index(distname, version):
     '''.split()
     with tmpdir.as_cwd():
         dist = Distribution()
+        dist.parse_config_files()
         resolved_dists = [
             dist.fetch_build_egg(r)
             for r in reqs
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 617ee48924..1d3390c567 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -381,7 +381,15 @@ def create_sdist():
                 """))])
             yield dist_path
 
-    def test_setup_requires_overrides_version_conflict(self):
+    use_setup_cfg = (
+        (),
+        ('dependency_links',),
+        ('setup_requires',),
+        ('dependency_links', 'setup_requires'),
+    )
+
+    @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg)
+    def test_setup_requires_overrides_version_conflict(self, use_setup_cfg):
         """
         Regression test for distribution issue 323:
         https://bitbucket.org/tarek/distribute/issues/323
@@ -397,7 +405,7 @@ def test_setup_requires_overrides_version_conflict(self):
 
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
-                test_pkg = create_setup_requires_package(temp_dir)
+                test_pkg = create_setup_requires_package(temp_dir, use_setup_cfg=use_setup_cfg)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with contexts.quiet() as (stdout, stderr):
                     # Don't even need to install the package, just
@@ -408,7 +416,8 @@ def test_setup_requires_overrides_version_conflict(self):
                 assert len(lines) > 0
                 assert lines[-1].strip() == 'test_pkg'
 
-    def test_setup_requires_override_nspkg(self):
+    @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg)
+    def test_setup_requires_override_nspkg(self, use_setup_cfg):
         """
         Like ``test_setup_requires_overrides_version_conflict`` but where the
         ``setup_requires`` package is part of a namespace package that has
@@ -446,7 +455,8 @@ def test_setup_requires_override_nspkg(self):
                 """)
 
                 test_pkg = create_setup_requires_package(
-                    temp_dir, 'foo.bar', '0.2', make_nspkg_sdist, template)
+                    temp_dir, 'foo.bar', '0.2', make_nspkg_sdist, template,
+                    use_setup_cfg=use_setup_cfg)
 
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
 
@@ -464,6 +474,38 @@ def test_setup_requires_override_nspkg(self):
                 assert len(lines) > 0
                 assert lines[-1].strip() == 'test_pkg'
 
+    @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg)
+    def test_setup_requires_with_attr_version(self, use_setup_cfg):
+        def make_dependency_sdist(dist_path, distname, version):
+            make_sdist(dist_path, [
+                ('setup.py',
+                 DALS("""
+                      import setuptools
+                      setuptools.setup(
+                          name={name!r},
+                          version={version!r},
+                          py_modules=[{name!r}],
+                      )
+                      """.format(name=distname, version=version))),
+                (distname + '.py',
+                 DALS("""
+                      version = 42
+                      """
+                     ))])
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                test_pkg = create_setup_requires_package(
+                    temp_dir, setup_attrs=dict(version='attr: foobar.version'),
+                    make_package=make_dependency_sdist,
+                    use_setup_cfg=use_setup_cfg+('version',),
+                )
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                with contexts.quiet() as (stdout, stderr):
+                    run_setup(test_setup_py, ['--version'])
+                lines = stdout.readlines()
+                assert len(lines) > 0
+                assert lines[-1].strip() == '42'
+
 
 def make_trivial_sdist(dist_path, distname, version):
     """
@@ -532,7 +574,8 @@ def make_sdist(dist_path, files):
 
 def create_setup_requires_package(path, distname='foobar', version='0.1',
                                   make_package=make_trivial_sdist,
-                                  setup_py_template=None):
+                                  setup_py_template=None, setup_attrs={},
+                                  use_setup_cfg=()):
     """Creates a source tree under path for a trivial test package that has a
     single requirement in setup_requires--a tarball for that requirement is
     also created and added to the dependency_links argument.
@@ -547,11 +590,39 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
         'setup_requires': ['%s==%s' % (distname, version)],
         'dependency_links': [os.path.abspath(path)]
     }
+    test_setup_attrs.update(setup_attrs)
 
     test_pkg = os.path.join(path, 'test_pkg')
-    test_setup_py = os.path.join(test_pkg, 'setup.py')
     os.mkdir(test_pkg)
 
+    if use_setup_cfg:
+        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+        options = []
+        metadata = []
+        for name in use_setup_cfg:
+            value = test_setup_attrs.pop(name)
+            if name in 'name version'.split():
+                section = metadata
+            else:
+                section = options
+            if isinstance(value, (tuple, list)):
+                value = ';'.join(value)
+            section.append('%s: %s' % (name, value))
+        with open(test_setup_cfg, 'w') as f:
+            f.write(DALS(
+                """
+                [metadata]
+                {metadata}
+                [options]
+                {options}
+                """
+            ).format(
+                options='\n'.join(options),
+                metadata='\n'.join(metadata),
+            ))
+
+    test_setup_py = os.path.join(test_pkg, 'setup.py')
+
     if setup_py_template is None:
         setup_py_template = DALS("""\
             import setuptools

From ca5a81864d5fc3b6bcb1e9186a38e3fbc0d0beff Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 19 Oct 2017 14:35:48 -0500
Subject: [PATCH 6810/8469] BUG: look for dist-infos in subdirectories

This code is a bit ugly, but it's also been tested with the pip test suite
It's not the best solution long term (the best solution is to get the egg_info
directory directly from egg_info), but it works for now and avoids
technical risk.
---
 setuptools/build_meta.py | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index f89f82d645..609ea1e510 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -93,6 +93,11 @@ def _get_build_requires(config_settings):
     return requirements
 
 
+def _get_immediate_subdirectories(a_dir):
+    return [name for name in os.listdir(a_dir)
+            if os.path.isdir(os.path.join(a_dir, name))]
+
+
 def get_requires_for_build_wheel(config_settings=None):
     config_settings = _fix_config(config_settings)
     return _get_build_requires(config_settings)
@@ -106,11 +111,29 @@ def get_requires_for_build_sdist(config_settings=None):
 def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', metadata_directory]
     _run_setup()
+    
+    dist_info_directory = metadata_directory
+    while True:    
+        dist_infos = [f for f in os.listdir(dist_info_directory)
+                      if f.endswith('.dist-info')]
+
+        if len(dist_infos) == 0 and \
+                len(_get_immediate_subdirectories(dist_info_directory)) == 1:
+            dist_info_directory = os.path.join(
+                dist_info_directory, os.listdir(dist_info_directory)[0])
+            continue
+
+        assert len(dist_infos) == 1
+        break
+
+    # PEP 517 requires that the .dist-info directory be placed in the
+    # metadata_directory. To comply, we MUST copy the directory to the root
+    if dist_info_directory != metadata_directory:
+        shutil.move(
+            os.path.join(dist_info_directory, dist_infos[0]),
+            metadata_directory)
+        shutil.rmtree(dist_info_directory, ignore_errors=True)
 
-    dist_infos = [f for f in os.listdir(metadata_directory)
-                  if f.endswith('.dist-info')]
-
-    assert len(dist_infos) == 1
     return dist_infos[0]
 
 

From cb0d6a91d8df8b4c70b95432ad33364181e49c33 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Oct 2017 10:09:37 -0400
Subject: [PATCH 6811/8469] Feed the hobgoblins (delint).

---
 setuptools/command/develop.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 85b23c6080..959c932a5c 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -95,7 +95,9 @@ def _resolve_setup_path(egg_base, install_dir, egg_path):
         path_to_setup = egg_base.replace(os.sep, '/').rstrip('/')
         if path_to_setup != os.curdir:
             path_to_setup = '../' * (path_to_setup.count('/') + 1)
-        resolved = normalize_path(os.path.join(install_dir, egg_path, path_to_setup))
+        resolved = normalize_path(
+            os.path.join(install_dir, egg_path, path_to_setup)
+        )
         if resolved != normalize_path(os.curdir):
             raise DistutilsOptionError(
                 "Can't get a consistent path to setup script from"

From 9da60d4ae2727a61eb11bd7c6393567e0793d128 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Oct 2017 10:14:40 -0400
Subject: [PATCH 6812/8469] Shorten link for nicer indentation

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 8fba7b4115..71991efac1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1817,7 +1817,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
         #    get/del patterns instead. For more detailed information see the
         #    following links:
         #      https://github.com/pypa/setuptools/issues/202#issuecomment-202913420
-        #      https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
+        #      http://bit.ly/2h9itJX
         old_entry = cache[p]
         del cache[p]
         new_entry = updater and updater(p, old_entry)

From ada14dc9f376d9c325ad2eac8a20122b8da2c15e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Oct 2017 10:23:14 -0400
Subject: [PATCH 6813/8469] Feed the hobgoblins (delint).

---
 setuptools/command/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 4fe3bb5684..fe619e2e67 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,8 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib', 'dist_info',
+    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib',
+    'dist_info',
 ]
 
 from distutils.command.bdist import bdist

From 3686dedb4bfbd0e6630c10119c8fe7af9369248e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 25 Oct 2017 17:50:22 +0200
Subject: [PATCH 6814/8469] add test to ensure `setup.cfg` interpolation
 behavior remain unchanged

---
 setuptools/tests/test_config.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index cdfa5af43b..2494a0bc20 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -3,6 +3,7 @@
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.dist import Distribution
 from setuptools.config import ConfigHandler, read_configuration
+from setuptools.extern.six.moves.configparser import InterpolationMissingOptionError
 
 
 class ErrConfigHandler(ConfigHandler):
@@ -306,6 +307,15 @@ def test_classifiers(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert set(dist.metadata.classifiers) == expected
 
+    def test_interpolation(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'description = %(message)s\n'
+        )
+        with pytest.raises(InterpolationMissingOptionError):
+            with get_dist(tmpdir):
+                pass
 
 class TestOptions:
 

From 2c897b5b877d401e13b661f2a0a14e99a1aabdc8 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 25 Oct 2017 17:55:26 +0200
Subject: [PATCH 6815/8469] improve encoding handling for `setup.cfg`

Support the same mechanism as for Python sources for declaring
the encoding to be used when reading `setup.cfg` (see PEP 263),
and return the results of reading it as Unicode.

Fix #1062 and #1136.
---
 setuptools/__init__.py            | 34 ++++++++++++++++
 setuptools/dist.py                |  2 +-
 setuptools/py36compat.py          | 37 ++++++++++++------
 setuptools/tests/test_config.py   | 65 ++++++++++++++++++++++++++++++-
 setuptools/tests/test_egg_info.py | 46 ++++++++++++++++++++++
 5 files changed, 169 insertions(+), 15 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 04f7674082..77b4a37440 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -4,9 +4,12 @@
 import functools
 import distutils.core
 import distutils.filelist
+import re
+from distutils.errors import DistutilsOptionError
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
+from setuptools.extern.six import string_types
 from setuptools.extern.six.moves import filter, map
 
 import setuptools.version
@@ -127,6 +130,37 @@ def __init__(self, dist, **kw):
         _Command.__init__(self, dist)
         vars(self).update(kw)
 
+    def _ensure_stringlike(self, option, what, default=None):
+        val = getattr(self, option)
+        if val is None:
+            setattr(self, option, default)
+            return default
+        elif not isinstance(val, string_types):
+            raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
+                                       % (option, what, val))
+        return val
+
+    def ensure_string_list(self, option):
+        r"""Ensure that 'option' is a list of strings.  If 'option' is
+        currently a string, we split it either on /,\s*/ or /\s+/, so
+        "foo bar baz", "foo,bar,baz", and "foo,   bar baz" all become
+        ["foo", "bar", "baz"].
+        """
+        val = getattr(self, option)
+        if val is None:
+            return
+        elif isinstance(val, string_types):
+            setattr(self, option, re.split(r',\s*|\s+', val))
+        else:
+            if isinstance(val, list):
+                ok = all(isinstance(v, string_types) for v in val)
+            else:
+                ok = False
+            if not ok:
+                raise DistutilsOptionError(
+                      "'%s' must be a list of strings (got %r)"
+                      % (option, val))
+
     def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         cmd = _Command.reinitialize_command(self, command, reinit_subcommands)
         vars(cmd).update(kw)
diff --git a/setuptools/dist.py b/setuptools/dist.py
index a2ca879516..b10bd6f7e4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -432,7 +432,7 @@ def parse_config_files(self, filenames=None):
         and loads configuration.
 
         """
-        _Distribution.parse_config_files(self, filenames=filenames)
+        Distribution_parse_config_files.parse_config_files(self, filenames=filenames)
 
         parse_configuration(self, self.command_options)
         self._finalize_requires()
diff --git a/setuptools/py36compat.py b/setuptools/py36compat.py
index f527969645..3d3c34ec50 100644
--- a/setuptools/py36compat.py
+++ b/setuptools/py36compat.py
@@ -1,7 +1,21 @@
+import io
+import re
 import sys
 from distutils.errors import DistutilsOptionError
 from distutils.util import strtobool
 from distutils.debug import DEBUG
+from setuptools.extern import six
+
+
+CODING_RE = re.compile(br'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)')
+
+def detect_encoding(fp):
+    first_line = fp.readline()
+    fp.seek(0)
+    m = CODING_RE.match(first_line)
+    if m is None:
+        return None
+    return m.group(1).decode('ascii')
 
 
 class Distribution_parse_config_files:
@@ -13,10 +27,10 @@ class Distribution_parse_config_files:
     as implemented in distutils.
     """
     def parse_config_files(self, filenames=None):
-        from configparser import ConfigParser
+        from setuptools.extern.six.moves.configparser import ConfigParser
 
         # Ignore install directory options if we have a venv
-        if sys.prefix != sys.base_prefix:
+        if six.PY3 and sys.prefix != sys.base_prefix:
             ignore_options = [
                 'install-base', 'install-platbase', 'install-lib',
                 'install-platlib', 'install-purelib', 'install-headers',
@@ -33,11 +47,16 @@ def parse_config_files(self, filenames=None):
         if DEBUG:
             self.announce("Distribution.parse_config_files():")
 
-        parser = ConfigParser(interpolation=None)
+        parser = ConfigParser()
         for filename in filenames:
-            if DEBUG:
-                self.announce("  reading %s" % filename)
-            parser.read(filename)
+            with io.open(filename, 'rb') as fp:
+                encoding = detect_encoding(fp)
+                if DEBUG:
+                    self.announce("  reading %s [%s]" % (
+                        filename, encoding or 'locale')
+                    )
+                reader = io.TextIOWrapper(fp, encoding=encoding)
+                (parser.read_file if six.PY3 else parser.readfp)(reader)
             for section in parser.sections():
                 options = parser.options(section)
                 opt_dict = self.get_option_dict(section)
@@ -69,12 +88,6 @@ def parse_config_files(self, filenames=None):
                     raise DistutilsOptionError(msg)
 
 
-if sys.version_info < (3,):
-    # Python 2 behavior is sufficient
-    class Distribution_parse_config_files:
-        pass
-
-
 if False:
     # When updated behavior is available upstream,
     # disable override here.
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 2494a0bc20..89fde257c2 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,9 +1,13 @@
+# -*- coding: UTF-8 -*-
+from __future__ import unicode_literals
+
 import contextlib
 import pytest
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.dist import Distribution
 from setuptools.config import ConfigHandler, read_configuration
 from setuptools.extern.six.moves.configparser import InterpolationMissingOptionError
+from setuptools.tests import is_ascii
 
 
 class ErrConfigHandler(ConfigHandler):
@@ -17,7 +21,7 @@ def make_package_dir(name, base_dir):
     return dir_package, init_file
 
 
-def fake_env(tmpdir, setup_cfg, setup_py=None):
+def fake_env(tmpdir, setup_cfg, setup_py=None, encoding='ascii'):
 
     if setup_py is None:
         setup_py = (
@@ -27,7 +31,7 @@ def fake_env(tmpdir, setup_cfg, setup_py=None):
 
     tmpdir.join('setup.py').write(setup_py)
     config = tmpdir.join('setup.cfg')
-    config.write(setup_cfg)
+    config.write(setup_cfg.encode(encoding), mode='wb')
 
     package_dir, init_file = make_package_dir('fake_package', tmpdir)
 
@@ -317,6 +321,63 @@ def test_interpolation(self, tmpdir):
             with get_dist(tmpdir):
                 pass
 
+    skip_if_not_ascii = pytest.mark.skipif(not is_ascii, reason='Test not supported with this locale')
+
+    @skip_if_not_ascii
+    def test_non_ascii_1(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'description = éàïôñ\n',
+            encoding='utf-8'
+        )
+        with pytest.raises(UnicodeDecodeError):
+            with get_dist(tmpdir):
+                pass
+
+    def test_non_ascii_2(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '# -*- coding: invalid\n'
+        )
+        with pytest.raises(LookupError):
+            with get_dist(tmpdir):
+                pass
+
+    def test_non_ascii_3(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '\n'
+            '# -*- coding: invalid\n'
+        )
+        with get_dist(tmpdir):
+            pass
+
+    @skip_if_not_ascii
+    def test_non_ascii_4(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '# -*- coding: utf-8\n'
+            '[metadata]\n'
+            'description = éàïôñ\n',
+            encoding='utf-8'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.description == 'éàïôñ'
+
+    @skip_if_not_ascii
+    def test_non_ascii_5(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '# vim: set fileencoding=iso-8859-15 :\n'
+            '[metadata]\n'
+            'description = éàïôñ\n',
+            encoding='iso-8859-15'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.description == 'éàïôñ'
+
+
 class TestOptions:
 
     def test_basic(self, tmpdir):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1411f93c0d..5196f32e29 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -497,3 +497,49 @@ def __init__(self, files, base):
         # expect exactly one result
         result, = results
         return result
+
+    EGG_INFO_TESTS = (
+        # Check for issue #1136: invalid string type when
+        # reading declarative `setup.cfg` under Python 2.
+        {
+            'setup.py': DALS(
+                """
+                from setuptools import setup
+                setup(
+                    name="foo",
+                )
+                """),
+            'setup.cfg': DALS(
+                """
+                [options]
+                package_dir =
+                    = src
+                """),
+            'src': {},
+        },
+        # Check Unicode can be used in `setup.py` under Python 2.
+        {
+            'setup.py': DALS(
+                """
+                # -*- coding: utf-8 -*-
+                from __future__ import unicode_literals
+                from setuptools import setup, find_packages
+                setup(
+                    name="foo",
+                    package_dir={'': 'src'},
+                )
+                """),
+            'src': {},
+        }
+    )
+
+    @pytest.mark.parametrize('package_files', EGG_INFO_TESTS)
+    def test_egg_info(self, tmpdir_cwd, env, package_files):
+        """
+        """
+        build_files(package_files)
+        code, data = environment.run_setup_py(
+            cmd=['egg_info'],
+            data_stream=1,
+        )
+        assert not code, data

From 65cf5a85b0b59d3bab1f4b4e153557c6484ae825 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Oct 2017 23:55:14 -0700
Subject: [PATCH 6816/8469] fixes bpo-31866: remove code pertaining to AtheOS
 support (#4115)

We stop support this OS in 2007 with commit
19fab761b71a1687aee3415db3a937b5ce31975d. Let's finish.
---
 command/build_ext.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 7444565562..8fad9cdc2b 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -215,9 +215,9 @@ def finalize_options(self):
                 new_lib = os.path.join(new_lib, suffix)
             self.library_dirs.append(new_lib)
 
-        # for extensions under Cygwin and AtheOS Python's library directory must be
+        # For extensions under Cygwin, Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin':
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -715,22 +715,6 @@ def get_libraries(self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-        elif sys.platform[:6] == "atheos":
-            from distutils import sysconfig
-
-            template = "python%d.%d"
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # Get SHLIBS from Makefile
-            extra = []
-            for lib in sysconfig.get_config_var('SHLIBS').split():
-                if lib.startswith('-l'):
-                    extra.append(lib[2:])
-                else:
-                    extra.append(lib)
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib, "m"] + extra
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries

From 84093b78ec61ad47a2a0dea9f1be8d94fa0d485e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 26 Jun 2017 16:32:43 +0200
Subject: [PATCH 6817/8469] fix `test` command when run with Python 2

When using Python 2, `python2 -m unittest` is not equivalent to
`python2 -m unittest discover`.
---
 setuptools/command/test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 638d0c56e4..523407fde3 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -101,6 +101,8 @@ def test_args(self):
         return list(self._test_args())
 
     def _test_args(self):
+        if not self.test_suite:
+            yield 'discover'
         if self.verbose:
             yield '--verbose'
         if self.test_suite:

From dbff2e7ed421be9ec96029366479a8627691e7f3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 26 Jun 2017 16:33:36 +0200
Subject: [PATCH 6818/8469] fix `test` command running tests twice

---
 setuptools/command/test.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 523407fde3..bfa7149615 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -18,6 +18,11 @@
 
 
 class ScanningLoader(TestLoader):
+
+    def __init__(self):
+        TestLoader.__init__(self)
+        self._visited = set()
+
     def loadTestsFromModule(self, module, pattern=None):
         """Return a suite of all tests cases contained in the given module
 
@@ -25,6 +30,10 @@ def loadTestsFromModule(self, module, pattern=None):
         If the module has an ``additional_tests`` function, call it and add
         the return value to the tests.
         """
+        if module in self._visited:
+            return None
+        self._visited.add(module)
+
         tests = []
         tests.append(TestLoader.loadTestsFromModule(self, module))
 
@@ -101,7 +110,7 @@ def test_args(self):
         return list(self._test_args())
 
     def _test_args(self):
-        if not self.test_suite:
+        if not self.test_suite and sys.version_info >= (2, 7):
             yield 'discover'
         if self.verbose:
             yield '--verbose'

From b5d00314293e400bc72f3699e428f168ac74d824 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 26 Jun 2017 17:58:09 +0200
Subject: [PATCH 6819/8469] tests: improve `test` command test

- cleanup test: we're not installing, so no need to override the user site,
  or skip the test when run with a virtual environment
- use pytest support for capturing output (`context.quiet` does not work
  with Python 2), and check the output
---
 setuptools/tests/test_test.py | 51 ++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 7ea43c5797..02cba00d86 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -2,9 +2,8 @@
 
 from __future__ import unicode_literals
 
+from distutils import log
 import os
-import site
-from distutils.errors import DistutilsError
 
 import pytest
 
@@ -66,26 +65,28 @@ def sample_test(tmpdir_cwd):
         f.write(TEST_PY)
 
 
-@pytest.mark.skipif('hasattr(sys, "real_prefix")')
-@pytest.mark.usefixtures('user_override')
-@pytest.mark.usefixtures('sample_test')
-class TestTestTest:
-    def test_test(self):
-        params = dict(
-            name='foo',
-            packages=['name', 'name.space', 'name.space.tests'],
-            namespace_packages=['name'],
-            test_suite='name.space.tests.test_suite',
-            use_2to3=True,
-        )
-        dist = Distribution(params)
-        dist.script_name = 'setup.py'
-        cmd = test(dist)
-        cmd.user = 1
-        cmd.ensure_finalized()
-        cmd.install_dir = site.USER_SITE
-        cmd.user = 1
-        with contexts.quiet():
-            # The test runner calls sys.exit
-            with contexts.suppress_exceptions(SystemExit):
-                cmd.run()
+@pytest.fixture
+def silent_log():
+    # Running some of the other tests will automatically
+    # change the log level to info, messing our output.
+    log.set_verbosity(0)
+
+
+@pytest.mark.usefixtures('sample_test', 'silent_log')
+def test_test(capfd):
+    params = dict(
+        name='foo',
+        packages=['name', 'name.space', 'name.space.tests'],
+        namespace_packages=['name'],
+        test_suite='name.space.tests.test_suite',
+        use_2to3=True,
+    )
+    dist = Distribution(params)
+    dist.script_name = 'setup.py'
+    cmd = test(dist)
+    cmd.ensure_finalized()
+    # The test runner calls sys.exit
+    with contexts.suppress_exceptions(SystemExit):
+        cmd.run()
+    out, err = capfd.readouterr()
+    assert out == 'Foo\n'

From 803707a68f228f452703333cbf75708938c2eb9e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 26 Jun 2017 18:28:07 +0200
Subject: [PATCH 6820/8469] tests: check `test` command run tests only once

---
 setuptools/tests/test_test.py | 43 +++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 02cba00d86..960527bcab 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -4,6 +4,7 @@
 
 from distutils import log
 import os
+import sys
 
 import pytest
 
@@ -66,13 +67,13 @@ def sample_test(tmpdir_cwd):
 
 
 @pytest.fixture
-def silent_log():
+def quiet_log():
     # Running some of the other tests will automatically
     # change the log level to info, messing our output.
     log.set_verbosity(0)
 
 
-@pytest.mark.usefixtures('sample_test', 'silent_log')
+@pytest.mark.usefixtures('sample_test', 'quiet_log')
 def test_test(capfd):
     params = dict(
         name='foo',
@@ -90,3 +91,41 @@ def test_test(capfd):
         cmd.run()
     out, err = capfd.readouterr()
     assert out == 'Foo\n'
+
+
+@pytest.mark.xfail(
+    sys.version_info < (2, 7),
+    reason="No discover support for unittest on Python 2.6",
+)
+@pytest.mark.usefixtures('tmpdir_cwd', 'quiet_log')
+def test_tests_are_run_once(capfd):
+    params = dict(
+        name='foo',
+        packages=['dummy'],
+    )
+    with open('setup.py', 'wt') as f:
+        f.write('from setuptools import setup; setup(\n')
+        for k, v in sorted(params.items()):
+            f.write('    %s=%r,\n' % (k, v))
+        f.write(')\n')
+    os.makedirs('dummy')
+    with open('dummy/__init__.py', 'wt'):
+        pass
+    with open('dummy/test_dummy.py', 'wt') as f:
+        f.write(DALS(
+            """
+            from __future__ import print_function
+            import unittest
+            class TestTest(unittest.TestCase):
+                def test_test(self):
+                    print('Foo')
+             """))
+    dist = Distribution(params)
+    dist.script_name = 'setup.py'
+    cmd = test(dist)
+    cmd.ensure_finalized()
+    # The test runner calls sys.exit
+    with contexts.suppress_exceptions(SystemExit):
+        cmd.run()
+    out, err = capfd.readouterr()
+    assert out == 'Foo\n'

From e630dfc9d761ef9d61df4eefe16de1368ebf3a42 Mon Sep 17 00:00:00 2001
From: Gerhard Weis <g.weis@griffith.edu.au>
Date: Thu, 9 Nov 2017 07:14:51 +1000
Subject: [PATCH 6821/8469] use ssl.create_default_context and SNI if available

---
 setuptools/ssl_support.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 72b18ef266..6362f1f426 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -186,9 +186,14 @@ def connect(self):
         else:
             actual_host = self.host
 
-        self.sock = ssl.wrap_socket(
-            sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
-        )
+        if hasattr(ssl, 'create_default_context'):
+            ctx = ssl.create_default_context(cafile=self.ca_bundle)
+            self.sock = ctx.wrap_socket(sock, server_hostname=actual_host)
+        else:
+            # This is for python < 2.7.9 and < 3.4?
+            self.sock = ssl.wrap_socket(
+                sock, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_bundle
+            )
         try:
             match_hostname(self.sock.getpeercert(), actual_host)
         except CertificateError:

From 50a9c568d04fda21590254e60a27227b9a6eb650 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 8 Nov 2017 14:44:44 -0800
Subject: [PATCH 6822/8469] Replace KB unit with KiB (#4293)

kB (*kilo* byte) unit means 1000 bytes, whereas KiB ("kibibyte")
means 1024 bytes. KB was misused: replace kB or KB with KiB when
appropriate.

Same change for MB and GB which become MiB and GiB.

Change the output of Tools/iobench/iobench.py.

Round also the size of the documentation from 5.5 MB to 5 MiB.
---
 cygwinccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 1c36990347..6c5d77746b 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -234,8 +234,8 @@ def link(self, target_desc, objects, output_filename, output_dir=None,
         # who wants symbols and a many times larger output file
         # should explicitly switch the debug mode on
         # otherwise we let dllwrap/ld strip the output file
-        # (On my machine: 10KB < stripped_file < ??100KB
-        #   unstripped_file = stripped_file + XXX KB
+        # (On my machine: 10KiB < stripped_file < ??100KiB
+        #   unstripped_file = stripped_file + XXX KiB
         #  ( XXX=254 for a typical python extension))
         if not debug:
             extra_preargs.append("-s")

From 0830232c2c700f09bbd39b8cddc2a0828399e7e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 19:23:29 -0500
Subject: [PATCH 6823/8469] Unconditionally rename __pycache__ files if they
 exist.

---
 setuptools/command/bdist_egg.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 5bfc7ba221..f52c40d150 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -239,7 +239,6 @@ def run(self):
 
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
-        py3 = sys.version_info >= (3, 0)
         re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$')
         for base, dirs, files in walk_egg(self.bdist_dir):
             for name in files:
@@ -248,12 +247,12 @@ def zap_pyfiles(self):
                     log.debug("Deleting %s", path)
                     os.unlink(path)
 
-                if py3 and base.endswith('__pycache__'):
+                if base.endswith('__pycache__'):
                     path_old = os.path.join(base, name)
-                    
+
                     m = re_pycache_file.match(name)
                     path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2))
-                    log.info("Renaming Python 3 .pyc file from [%s] to [%s]" % (path_old, path_new))
+                    log.info("Renaming file from [%s] to [%s]" % (path_old, path_new))
                     if os.path.exists(path_new):
                         os.unlink(path_new)
                     os.rename(path_old, path_new)

From 9a79433af7e66ee5c1f721a1803dad4873666e62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 19:30:56 -0500
Subject: [PATCH 6824/8469] Use named groups in the pattern

---
 setuptools/command/bdist_egg.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index f52c40d150..14dd97d381 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -239,7 +239,6 @@ def run(self):
 
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
-        re_pycache_file = re.compile('(.+)\.cpython-3\d(.pyc)$')
         for base, dirs, files in walk_egg(self.bdist_dir):
             for name in files:
                 if name.endswith('.py'):
@@ -250,8 +249,9 @@ def zap_pyfiles(self):
                 if base.endswith('__pycache__'):
                     path_old = os.path.join(base, name)
 
-                    m = re_pycache_file.match(name)
-                    path_new = os.path.join(base, os.pardir, m.group(1) + m.group(2))
+                    pattern = r'(?P<name>.+)\.(?P<magic>[^.]+)\.pyc'
+                    m = re.match(pattern, name)
+                    path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc')
                     log.info("Renaming file from [%s] to [%s]" % (path_old, path_new))
                     if os.path.exists(path_new):
                         os.unlink(path_new)

From 2676c5a277c5e571cdaeed64e5494315d5ec4c1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 19:34:54 -0500
Subject: [PATCH 6825/8469] Avoid check/act race condition

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

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 14dd97d381..4e36c635e7 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -253,8 +253,10 @@ def zap_pyfiles(self):
                     m = re.match(pattern, name)
                     path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc')
                     log.info("Renaming file from [%s] to [%s]" % (path_old, path_new))
-                    if os.path.exists(path_new):
-                        os.unlink(path_new)
+                    try:
+                        os.remove(path_new)
+                    except OSError:
+                        pass
                     os.rename(path_old, path_new)
 
 

From 7874d4e0980265937b6957ba05805e00bacc0ed8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 19:36:07 -0500
Subject: [PATCH 6826/8469] Re-use path

---
 setuptools/command/bdist_egg.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 4e36c635e7..5fdb62d905 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -241,13 +241,14 @@ def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
         for base, dirs, files in walk_egg(self.bdist_dir):
             for name in files:
+                path = os.path.join(base, name)
+
                 if name.endswith('.py'):
-                    path = os.path.join(base, name)
                     log.debug("Deleting %s", path)
                     os.unlink(path)
 
                 if base.endswith('__pycache__'):
-                    path_old = os.path.join(base, name)
+                    path_old = path
 
                     pattern = r'(?P<name>.+)\.(?P<magic>[^.]+)\.pyc'
                     m = re.match(pattern, name)

From 2709afcea4b09157b27acf0bc151bd4c76347ce5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 19:54:49 -0500
Subject: [PATCH 6827/8469] Add test capturing expectation. Ref #1145.

---
 setuptools/tests/test_bdist_egg.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index d24aa366d4..61615b385c 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -2,6 +2,7 @@
 """
 import os
 import re
+import zipfile
 
 import pytest
 
@@ -16,7 +17,7 @@
 """
 
 
-@pytest.yield_fixture
+@pytest.fixture(scope='function')
 def setup_context(tmpdir):
     with (tmpdir / 'setup.py').open('w') as f:
         f.write(SETUP_PY)
@@ -32,7 +33,7 @@ def test_bdist_egg(self, setup_context, user_override):
             script_name='setup.py',
             script_args=['bdist_egg'],
             name='foo',
-            py_modules=['hi']
+            py_modules=['hi'],
         ))
         os.makedirs(os.path.join('build', 'src'))
         with contexts.quiet():
@@ -42,3 +43,20 @@ def test_bdist_egg(self, setup_context, user_override):
         # let's see if we got our egg link at the right place
         [content] = os.listdir('dist')
         assert re.match(r'foo-0.0.0-py[23].\d.egg$', content)
+
+    def test_exclude_source_files(self, setup_context, user_override):
+        dist = Distribution(dict(
+            script_name='setup.py',
+            script_args=['bdist_egg', '--exclude-source-files'],
+            name='foo',
+            py_modules=['hi'],
+        ))
+        with contexts.quiet():
+            dist.parse_command_line()
+            dist.run_commands()
+        [dist_name] = os.listdir('dist')
+        dist_filename = os.path.join('dist', dist_name)
+        zip = zipfile.ZipFile(dist_filename)
+        names = list(zi.filename for zi in zip.filelist)
+        assert 'hi.pyc' in names
+        assert 'hi.py' not in names

From 4216b5f3fece69e3b74c646f72b8fe757b658729 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 20:21:11 -0500
Subject: [PATCH 6828/8469] Update changelog. Ref #1145.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6b84c03f57..bea607865c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ v36.6.1
 * #1132: Removed redundant and costly serialization/parsing step
   in ``EntryPoint.__init__``.
 
+* #844: ``bdist_egg --exclude-source-files`` now tested and works
+  on Python 3.
+
 v36.6.0
 -------
 

From 4f43bd2a665a8115a03eb8d073cacb8945d22462 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 20:27:39 -0500
Subject: [PATCH 6829/8469] =?UTF-8?q?Bump=20version:=2036.6.0=20=E2=86=92?=
 =?UTF-8?q?=2036.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 3 ++-
 setup.py  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8422a269ae..7f8087826e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.6.0
+current_version = 36.6.1
 commit = True
 tag = True
 
@@ -26,3 +26,4 @@ universal = 1
 license_file = LICENSE
 
 [bumpversion:file:setup.py]
+
diff --git a/setup.py b/setup.py
index 33003465a1..c5bc72548a 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.6.0",
+    version="36.6.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 42f5ec91c131b8b24a330adb28b235aa432be98a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 20:43:33 -0500
Subject: [PATCH 6830/8469] Update changelog; ref #1150

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6b84c03f57..e3d82cc2c2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.7.0
+-------
+
+* #1054: Support ``setup_requires`` in ``setup.cfg`` files.
+
 v36.6.1
 -------
 

From d5f914876127d8ea60bc3f90d509fd0745f909f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 9 Nov 2017 20:46:12 -0500
Subject: [PATCH 6831/8469] =?UTF-8?q?Bump=20version:=2036.6.1=20=E2=86=92?=
 =?UTF-8?q?=2036.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 7f8087826e..94dfbd620a 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.6.1
+current_version = 36.7.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c5bc72548a..389a805975 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.6.1",
+    version="36.7.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 57a09271dcd0840fb285495fe862aa42d9f9742c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Nov 2017 00:08:04 -0500
Subject: [PATCH 6832/8469] xfail test when byte code generation is disabled.
 Fixes #1193.

---
 CHANGES.rst                        | 6 ++++++
 setuptools/tests/test_bdist_egg.py | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9341c92858..f17e79c972 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.7.1
+-------
+
+* #1193: Avoid test failures in bdist_egg when
+  PYTHONDONTWRITEBYTECODE is set.
+
 v36.7.0
 -------
 
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 61615b385c..54742aa646 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -44,6 +44,10 @@ def test_bdist_egg(self, setup_context, user_override):
         [content] = os.listdir('dist')
         assert re.match(r'foo-0.0.0-py[23].\d.egg$', content)
 
+    @pytest.mark.xfail(
+        os.environ.get('PYTHONDONTWRITEBYTECODE'),
+        reason="Byte code disabled",
+    )
     def test_exclude_source_files(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',

From c218b65053915aa084c897defa2a25a11175ddc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Nov 2017 00:26:58 -0500
Subject: [PATCH 6833/8469] =?UTF-8?q?Bump=20version:=2036.7.0=20=E2=86=92?=
 =?UTF-8?q?=2036.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 94dfbd620a..d1d94cdda3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.7.0
+current_version = 36.7.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 389a805975..2c4ba8407c 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.7.0",
+    version="36.7.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b4f2df191e0f9de47a71b3c9fba9f44447e017b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 Nov 2017 10:01:08 -0500
Subject: [PATCH 6834/8469] Update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6b84c03f57..fcacd8ea0c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.6.2
+-------
+
+* #701: Fixed duplicate test discovery on Python 3.
+
 v36.6.1
 -------
 

From 5b6c8d3f49366a88210cef7ee5d9629637108a2b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 Nov 2017 10:03:34 -0500
Subject: [PATCH 6835/8469] =?UTF-8?q?Bump=20version:=2036.7.1=20=E2=86=92?=
 =?UTF-8?q?=2036.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d1d94cdda3..f064fcf915 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.7.1
+current_version = 36.7.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 2c4ba8407c..7148962af4 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.7.1",
+    version="36.7.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From fb1c2534662259bec479aff19cf49ae8781bdf9b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 Nov 2017 20:34:50 -0500
Subject: [PATCH 6836/8469] Update changelog. Ref #1175.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9b84cdc65f..9ca450318b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v36.7.3
+-------
+
+* #1175: Bug fixes to ``build_meta`` module.
+
 v36.7.2
 -------
 

From eb91a5e2491e231dc1094000dda6401cffb4747c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 13 Nov 2017 20:34:55 -0500
Subject: [PATCH 6837/8469] =?UTF-8?q?Bump=20version:=2036.7.2=20=E2=86=92?=
 =?UTF-8?q?=2036.7.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f064fcf915..850f576264 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.7.2
+current_version = 36.7.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 7148962af4..b5e7879bf1 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.7.2",
+    version="36.7.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 2ef955096db1999fb9caffe5d642dc2cefd2c1ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 Nov 2017 17:40:10 -0500
Subject: [PATCH 6838/8469] Update broken link. Fixes #1197.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index a6363b1856..5dbb480588 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -382,7 +382,7 @@ def url_ok(self, url, fatal=False):
         if is_file or self.allows(urllib.parse.urlparse(url)[1]):
             return True
         msg = ("\nNote: Bypassing %s (disallowed host; see "
-            "http://bit.ly/1dg9ijs for details).\n")
+            "http://bit.ly/2hrImnY for details).\n")
         if fatal:
             raise DistutilsError(msg % url)
         else:

From b27fc068fe8eb409851f3f92c1834e36073759c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 Nov 2017 17:45:18 -0500
Subject: [PATCH 6839/8469] Feed the hobgoblins (delint).

---
 setuptools/package_index.py | 41 +++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 5dbb480588..e0aeb309d7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -141,7 +141,7 @@ def distros_for_filename(filename, metadata=None):
 def interpret_distro_name(
         location, basename, metadata, py_version=None, precedence=SOURCE_DIST,
         platform=None
-        ):
+):
     """Generate alternative interpretations of a source distro name
 
     Note: if `location` is a filesystem filename, you should call
@@ -292,7 +292,7 @@ class PackageIndex(Environment):
     def __init__(
             self, index_url="https://pypi.python.org/simple", hosts=('*',),
             ca_bundle=None, verify_ssl=True, *args, **kw
-            ):
+    ):
         Environment.__init__(self, *args, **kw)
         self.index_url = index_url + "/" [:not index_url.endswith('/')]
         self.scanned_urls = {}
@@ -346,7 +346,8 @@ def process_url(self, url, retrieve=False):
 
         base = f.url  # handle redirects
         page = f.read()
-        if not isinstance(page, str):  # We are in Python 3 and got bytes. We want str.
+        if not isinstance(page, str):
+            # In Python 3 and got bytes but want str.
             if isinstance(f, urllib.error.HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'
@@ -381,7 +382,8 @@ def url_ok(self, url, fatal=False):
         is_file = s and s.group(1).lower() == 'file'
         if is_file or self.allows(urllib.parse.urlparse(url)[1]):
             return True
-        msg = ("\nNote: Bypassing %s (disallowed host; see "
+        msg = (
+            "\nNote: Bypassing %s (disallowed host; see "
             "http://bit.ly/2hrImnY for details).\n")
         if fatal:
             raise DistutilsError(msg % url)
@@ -500,15 +502,16 @@ def check_hash(self, checker, filename, tfp):
         """
         checker is a ContentChecker
         """
-        checker.report(self.debug,
+        checker.report(
+            self.debug,
             "Validating %%s checksum for %s" % filename)
         if not checker.is_valid():
             tfp.close()
             os.unlink(filename)
             raise DistutilsError(
                 "%s validation failed for %s; "
-                "possible download problem?" % (
-                                checker.hash.name, os.path.basename(filename))
+                "possible download problem?"
+                % (checker.hash.name, os.path.basename(filename))
             )
 
     def add_find_links(self, urls):
@@ -536,7 +539,8 @@ def not_found_in_index(self, requirement):
         if self[requirement.key]:  # we've seen at least one distro
             meth, msg = self.info, "Couldn't retrieve index page for %r"
         else:  # no distros seen for this name, might be misspelled
-            meth, msg = (self.warn,
+            meth, msg = (
+                self.warn,
                 "Couldn't find index page for %r (maybe misspelled?)")
         meth(msg, requirement.unsafe_name)
         self.scan_all()
@@ -577,8 +581,7 @@ def download(self, spec, tmpdir):
 
     def fetch_distribution(
             self, requirement, tmpdir, force_scan=False, source=False,
-            develop_ok=False, local_index=None
-            ):
+            develop_ok=False, local_index=None):
         """Obtain a distribution suitable for fulfilling `requirement`
 
         `requirement` must be a ``pkg_resources.Requirement`` instance.
@@ -609,12 +612,19 @@ def find(req, env=None):
 
                 if dist.precedence == DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
-                        self.warn("Skipping development or system egg: %s", dist)
+                        self.warn(
+                            "Skipping development or system egg: %s", dist,
+                        )
                         skipped[dist] = 1
                     continue
 
-                if dist in req and (dist.precedence <= SOURCE_DIST or not source):
-                    dist.download_location = self.download(dist.location, tmpdir)
+                test = (
+                    dist in req
+                    and (dist.precedence <= SOURCE_DIST or not source)
+                )
+                if test:
+                    loc = self.download(dist.location, tmpdir)
+                    dist.download_location = loc
                     if os.path.exists(dist.download_location):
                         return dist
 
@@ -704,7 +714,7 @@ def gen_setup(self, filename, fragment, tmpdir):
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
         # Download the file
-        fp, info = None, None
+        fp = None
         try:
             checker = HashChecker.from_url(url)
             fp = self.open_url(strip_fragment(url))
@@ -1103,7 +1113,8 @@ def local_open(url):
                 f += '/'
             files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:
-            tmpl = ("<html><head><title>{url}</title>"
+            tmpl = (
+                "<html><head><title>{url}</title>"
                 "</head><body>{files}</body></html>")
             body = tmpl.format(url=url, files='\n'.join(files))
         status, message = 200, "OK"

From 9d391e77e247e4718d94c3f6000d34832576d356 Mon Sep 17 00:00:00 2001
From: xdegaye <xdegaye@gmail.com>
Date: Sat, 18 Nov 2017 18:17:16 +0100
Subject: [PATCH 6840/8469] bpo-29185: Fix `test_distutils` failures on Android
 (GH-4438)

* Run gzip with separate command line options (Android understands  '-f9' as the name of a file).
* Creation of a hard link is controled by SELinux on Android.
---
 tests/test_archive_util.py |  2 +-
 tests/test_file_util.py    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 02fa1e27a4..14ba4ca34b 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -162,7 +162,7 @@ def test_tarfile_vs_tar(self):
         # now create another tarball using `tar`
         tarball2 = os.path.join(tmpdir, 'archive2.tar.gz')
         tar_cmd = ['tar', '-cf', 'archive2.tar', 'dist']
-        gzip_cmd = ['gzip', '-f9', 'archive2.tar']
+        gzip_cmd = ['gzip', '-f', '-9', 'archive2.tar']
         old_dir = os.getcwd()
         os.chdir(tmpdir)
         try:
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index 03040afc79..a4e2d025f9 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -8,7 +8,7 @@
 from distutils import log
 from distutils.tests import support
 from distutils.errors import DistutilsFileError
-from test.support import run_unittest
+from test.support import run_unittest, unlink
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -80,6 +80,14 @@ def test_move_file_exception_unpacking_unlink(self):
     def test_copy_file_hard_link(self):
         with open(self.source, 'w') as f:
             f.write('some content')
+        # Check first that copy_file() will not fall back on copying the file
+        # instead of creating the hard link.
+        try:
+            os.link(self.source, self.target)
+        except OSError as e:
+            self.skipTest('os.link: %s' % e)
+        else:
+            unlink(self.target)
         st = os.stat(self.source)
         copy_file(self.source, self.target, link='hard')
         st2 = os.stat(self.source)

From c32594450b72762c999e3f825911713d659a2088 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Nov 2017 21:21:16 -0500
Subject: [PATCH 6841/8469] Update changelog. Ref #1190.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9ca450318b..65ab85bc6e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.8.0
+-------
+
+* #1190: In SSL support for package index operations, use SNI
+  where available.
+
 v36.7.3
 -------
 

From d1cef0c5aa0ca473d4b5fef6b11e5508a37663a2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Nov 2017 21:37:14 -0500
Subject: [PATCH 6842/8469] =?UTF-8?q?Bump=20version:=2036.7.3=20=E2=86=92?=
 =?UTF-8?q?=2036.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 850f576264..8da91de23c 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.7.3
+current_version = 36.8.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b5e7879bf1..c6dfc79515 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.7.3",
+    version="36.8.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 2ed8ca16d5bb38a72baa96fe00596d402dec9eb0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 11:52:55 -0500
Subject: [PATCH 6843/8469] Reference to __main__ is only required for Python
 2.6.

---
 setuptools/tests/test_develop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index cb4ff4b401..ec67c798fd 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -169,7 +169,7 @@ def test_namespace_package_importable(self, tmpdir):
         install_cmd = [
             sys.executable,
             '-m',
-            'pip.__main__',
+            'pip',
             'install',
             str(pkg_A),
             '-t', str(target),

From 4c6f629bb9c63c2208c3b03bb1e15a0d4e4731db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 11:54:44 -0500
Subject: [PATCH 6844/8469] Extract Python versions as top-level factors.

---
 .travis.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60f5815fd3..33ab283bf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,20 @@
 dist: trusty
 sudo: false
 language: python
+python:
+- 2.6
+- &latest_py2 2.7
+- 3.3
+- 3.4
+- 3.5
+- &latest_py3 3.6
+- nightly
+- pypy
+- pypy3
+
 jobs:
   fast_finish: true
   include:
-  - python: 2.6
-  - python: &latest_py2 2.7
-  - python: 3.3
-  - python: 3.4
-  - python: 3.5
-  - python: &latest_py3 3.6
-  - python: nightly
-  - python: pypy
-  - python: pypy3
   - python: *latest_py3
     env: LANG=C
   - python: *latest_py2

From c6fe76cbc22ac6ac64709a0381a6ce48a8c9884a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 12:22:49 -0500
Subject: [PATCH 6845/8469] Remove reference to Python 2.6 as a supported
 interpreter.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 4b4b4fd8ba..dd5a5493cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py2{6,7},py3{3,4,5,6},pypy'
+# export TOXENV='py27,py3{3,4,5,6},pypy'
 
 [testenv]
 deps=-rtests/requirements.txt

From d51a696eb114bfe4e077b83b750a02282d4d8b47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 12:23:13 -0500
Subject: [PATCH 6846/8469] PyPy3 is supported

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 4b4b4fd8ba..e8c1aca4dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py2{6,7},py3{3,4,5,6},pypy'
+# export TOXENV='py2{6,7},py3{3,4,5,6},pypy,pypy3'
 
 [testenv]
 deps=-rtests/requirements.txt

From 9edbd7e80fce13b1895c6932f70361285a65b84b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 13:07:30 -0500
Subject: [PATCH 6847/8469] Disable hanging test on PyPy3. Ref #1202.

---
 setuptools/tests/test_develop.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index cb4ff4b401..a0aaada5f8 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -8,6 +8,7 @@
 import sys
 import io
 import subprocess
+import platform
 
 from setuptools.extern import six
 from setuptools.command import test
@@ -153,8 +154,14 @@ def install_develop(src_dir, target):
             with test.test.paths_on_pythonpath([str(target)]):
                 subprocess.check_call(develop_cmd)
 
-    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
-        reason="https://github.com/pypa/setuptools/issues/851")
+    @pytest.mark.skipif(
+        bool(os.environ.get("APPVEYOR")),
+        reason="https://github.com/pypa/setuptools/issues/851",
+    )
+    @pytest.mark.skipif(
+        platform.python_implementation() == 'PyPy' and six.PY3,
+        reason="https://github.com/pypa/setuptools/issues/1202",
+    )
     def test_namespace_package_importable(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed

From 45ec75beccba6432b3ed7b80fd84b65276453e9d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 13:10:04 -0500
Subject: [PATCH 6848/8469] Feed the hobgoblins (delint).

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

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index a0aaada5f8..35ea14039f 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -62,7 +62,8 @@ class TestDevelop:
     in_virtualenv = hasattr(sys, 'real_prefix')
     in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix
 
-    @pytest.mark.skipif(in_virtualenv or in_venv,
+    @pytest.mark.skipif(
+        in_virtualenv or in_venv,
         reason="Cannot run when invoked in a virtualenv or venv")
     def test_2to3_user_mode(self, test_env):
         settings = dict(
@@ -102,7 +103,8 @@ def test_console_scripts(self, tmpdir):
         Test that console scripts are installed and that they reference
         only the project by name and not the current version.
         """
-        pytest.skip("TODO: needs a fixture to cause 'develop' "
+        pytest.skip(
+            "TODO: needs a fixture to cause 'develop' "
             "to be invoked without mutating environment.")
         settings = dict(
             name='foo',

From d45be2cc4f7a1e4ddc70b363baaa613c6b068b98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Nov 2017 13:12:25 -0500
Subject: [PATCH 6849/8469] =?UTF-8?q?Bump=20version:=2036.8.0=20=E2=86=92?=
 =?UTF-8?q?=2037.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8da91de23c..04dcfbf885 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.8.0
+current_version = 37.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 492b96d8b5..25d44de39a 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.8.0",
+    version="37.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 553e21e12ca2ebe6ab0f597e69594b71271faecc Mon Sep 17 00:00:00 2001
From: Henk-Jaap Wagenaar <wagenaarhenkjaap@gmail.com>
Date: Tue, 21 Nov 2017 22:16:53 +0000
Subject: [PATCH 6850/8469] Add setup.cfg support for
 long_description_content_type (in line with docs).

---
 setuptools/command/egg_info.py  | 2 +-
 setuptools/dist.py              | 7 +++++++
 setuptools/tests/test_config.py | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1d41b27da..27e10eeb32 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -598,7 +598,7 @@ def write_pkg_info(cmd, basename, filename):
         metadata.version, oldver = cmd.egg_version, metadata.version
         metadata.name, oldname = cmd.egg_name, metadata.name
         metadata.long_description_content_type = getattr(
-            cmd.distribution,
+            cmd.distribution.metadata,
             'long_description_content_type'
         )
         try:
diff --git a/setuptools/dist.py b/setuptools/dist.py
index aa304500e8..48c7a45604 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -332,6 +332,13 @@ def __init__(self, attrs=None):
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)
+
+        try:
+            self.metadata.long_description_content_type
+        except AttributeError:
+            self.metadata.long_description_content_type = \
+                self.long_description_content_type
+
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index cdfa5af43b..15b0cee10b 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -110,6 +110,7 @@ def test_basic(self, tmpdir):
             '[metadata]\n'
             'version = 10.1.1\n'
             'description = Some description\n'
+            'long_description_content_type = text/something\n'
             'long_description = file: README\n'
             'name = fake_name\n'
             'keywords = one, two\n'
@@ -131,6 +132,7 @@ def test_basic(self, tmpdir):
 
             assert metadata.version == '10.1.1'
             assert metadata.description == 'Some description'
+            assert metadata.long_description_content_type == 'text/something'
             assert metadata.long_description == 'readme contents\nline2'
             assert metadata.provides == ['package', 'package.sub']
             assert metadata.license == 'BSD 3-Clause License'

From df2246449c271c07586bcecc3eaa36e9b0e94e3d Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 21 Nov 2017 00:48:44 +0000
Subject: [PATCH 6851/8469] Support PEP 345 Project-URL metadata

By including one or more Project-URL entries in PKG-INFO metadata,
PyPI can display helpful hyperlinks in a generic manner. Add support
here to be able to pass it through setup.cfg and setup.py with a
project_urls dict. See the corresponding section of the Core
Metadata Specifications from the Python Packaging User Guide for
details:

https://packaging.python.org/specifications/core-metadata/#project-url-multiple-use
---
 docs/setuptools.txt               |  1 +
 setup.py                          |  5 +++++
 setuptools/command/egg_info.py    |  1 +
 setuptools/config.py              |  2 ++
 setuptools/dist.py                | 11 ++++++++++-
 setuptools/tests/test_config.py   | 16 ++++++++++++++++
 setuptools/tests/test_egg_info.py | 30 ++++++++++++++++++++++++++++++
 7 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index c2822c4f9e..e3154b469b 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2406,6 +2406,7 @@ name                                               str
 version                                            attr:, str
 url                             home-page          str
 download_url                    download-url       str
+project_urls                                       dict
 author                                             str
 author_email                    author-email       str
 maintainer                                         str
diff --git a/setup.py b/setup.py
index 25d44de39a..7a05c718a9 100755
--- a/setup.py
+++ b/setup.py
@@ -98,6 +98,11 @@ def pypi_link(pkg_filename):
     long_description_content_type='text/x-rst; charset=UTF-8',
     keywords="CPAN PyPI distutils eggs package management",
     url="https://github.com/pypa/setuptools",
+    project_urls={
+        "Bug Tracker": "https://github.com/pypa/setuptools/issues",
+        "Documentation": "http://setuptools.readthedocs.io/",
+        "Source Code": "https://github.com/pypa/setuptools",
+    },
     src_root=None,
     packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1d41b27da..c8b2bd173e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -597,6 +597,7 @@ def write_pkg_info(cmd, basename, filename):
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
         metadata.name, oldname = cmd.egg_name, metadata.name
+        metadata.project_urls = cmd.distribution.metadata.project_urls
         metadata.long_description_content_type = getattr(
             cmd.distribution,
             'long_description_content_type'
diff --git a/setuptools/config.py b/setuptools/config.py
index 5382844769..a70794a42e 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -404,6 +404,7 @@ def parsers(self):
         """Metadata item name to parser function mapping."""
         parse_list = self._parse_list
         parse_file = self._parse_file
+        parse_dict = self._parse_dict
 
         return {
             'platforms': parse_list,
@@ -416,6 +417,7 @@ def parsers(self):
             'description': parse_file,
             'long_description': parse_file,
             'version': self._parse_version,
+            'project_urls': parse_dict,
         }
 
     def _parse_version(self, value):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index aa304500e8..fa03cd27bc 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -44,7 +44,7 @@ def write_pkg_file(self, file):
             self.classifiers or self.download_url):
         version = '1.1'
     # Setuptools specific for PEP 345
-    if hasattr(self, 'python_requires'):
+    if hasattr(self, 'python_requires') or self.project_urls:
         version = '1.2'
 
     file.write('Metadata-Version: %s\n' % version)
@@ -57,6 +57,8 @@ def write_pkg_file(self, file):
     file.write('License: %s\n' % self.get_license())
     if self.download_url:
         file.write('Download-URL: %s\n' % self.download_url)
+    for project_url in self.project_urls.items():
+        file.write('Project-URL: %s, %s\n' % project_url)
 
     long_desc_content_type = getattr(
         self,
@@ -327,11 +329,18 @@ def __init__(self, attrs=None):
         self.long_description_content_type = attrs.get(
             'long_description_content_type'
         )
+        self.project_urls = attrs.get('project_urls', {})
         self.dependency_links = attrs.pop('dependency_links', [])
         self.setup_requires = attrs.pop('setup_requires', [])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)
+
+        # The project_urls attribute may not be supported in distutils, so
+        # prime it here from our value if not automatically set
+        self.metadata.project_urls = getattr(
+            self.metadata, 'project_urls', self.project_urls)
+
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
             self.metadata.version = str(self.metadata.version)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index cdfa5af43b..a69bca467c 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -215,6 +215,22 @@ def test_multiline(self, tmpdir):
                 'Programming Language :: Python :: 3.5',
             ]
 
+    def test_dict(self, tmpdir):
+
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'project_urls =\n'
+            '  Link One = https://example.com/one/\n'
+            '  Link Two = https://example.com/two/\n'
+        )
+        with get_dist(tmpdir) as dist:
+            metadata = dist.metadata
+            assert metadata.project_urls == {
+                'Link One': 'https://example.com/one/',
+                'Link Two': 'https://example.com/two/',
+            }
+
     def test_version(self, tmpdir):
 
         _, config = fake_env(
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a97d0c84b0..e05498b84a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -417,6 +417,36 @@ def test_long_description_content_type(self, tmpdir_cwd, env):
         expected_line = 'Description-Content-Type: text/markdown'
         assert expected_line in pkg_info_lines
 
+    def test_project_urls(self, tmpdir_cwd, env):
+        # Test that specifying a `project_urls` dict to the `setup`
+        # function results in writing multiple `Project-URL` lines to
+        # the `PKG-INFO` file in the `<distribution>.egg-info`
+        # directory.
+        # `Project-URL` is described at https://packaging.python.org
+        #     /specifications/core-metadata/#project-url-multiple-use
+
+        self._setup_script_with_requires(
+            """project_urls={
+                'Link One': 'https://example.com/one/',
+                'Link Two': 'https://example.com/two/',
+                },""")
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        code, data = environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        expected_line = 'Project-URL: Link One, https://example.com/one/'
+        assert expected_line in pkg_info_lines
+        expected_line = 'Project-URL: Link Two, https://example.com/two/'
+        assert expected_line in pkg_info_lines
+
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
             """python_requires='>=2.7.12',""")

From 87e3be861e20d10e395cef7b549cd660b3dcab26 Mon Sep 17 00:00:00 2001
From: Andreas Maier <andreas.r.maier@gmx.de>
Date: Wed, 22 Nov 2017 20:40:01 +0100
Subject: [PATCH 6852/8469] Improved exception message of
 pkg_resources.ResolutionError

---
 pkg_resources/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c06cf4b1d8..62b82081b1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1513,7 +1513,9 @@ def metadata_listdir(self, name):
     def run_script(self, script_name, namespace):
         script = 'scripts/' + script_name
         if not self.has_metadata(script):
-            raise ResolutionError("No script named %r" % script_name)
+            raise ResolutionError(
+                "No script named %r in 'scripts' directory of metadata "
+                "directory %r" % (script_name, self.egg_info))
         script_text = self.get_metadata(script).replace('\r\n', '\n')
         script_text = script_text.replace('\r', '\n')
         script_filename = self._fn(self.egg_info, script)

From c644f6f0fd7b432b8ff18d03c9c646273774c75b Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 23 Nov 2017 21:34:20 +0300
Subject: [PATCH 6853/8469] bpo-19610: setup() now raises TypeError for invalid
 types (GH-4519)

The Distribution class now explicitly raises an
exception when 'classifiers', 'keywords' and
'platforms' fields are not specified as a list.
---
 dist.py            | 26 ++++++++++++++++++++++++++
 tests/test_dist.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/dist.py b/dist.py
index 62a24516cf..78c29ede6c 100644
--- a/dist.py
+++ b/dist.py
@@ -1188,12 +1188,38 @@ def get_long_description(self):
     def get_keywords(self):
         return self.keywords or []
 
+    def set_keywords(self, value):
+        # If 'keywords' is a string, it will be converted to a list
+        # by Distribution.finalize_options(). To maintain backwards
+        # compatibility, do not raise an exception if 'keywords' is
+        # a string.
+        if not isinstance(value, (list, str)):
+            msg = "'keywords' should be a 'list', not %r"
+            raise TypeError(msg % type(value).__name__)
+        self.keywords = value
+
     def get_platforms(self):
         return self.platforms or ["UNKNOWN"]
 
+    def set_platforms(self, value):
+        # If 'platforms' is a string, it will be converted to a list
+        # by Distribution.finalize_options(). To maintain backwards
+        # compatibility, do not raise an exception if 'platforms' is
+        # a string.
+        if not isinstance(value, (list, str)):
+            msg = "'platforms' should be a 'list', not %r"
+            raise TypeError(msg % type(value).__name__)
+        self.platforms = value
+
     def get_classifiers(self):
         return self.classifiers or []
 
+    def set_classifiers(self, value):
+        if not isinstance(value, list):
+            msg = "'classifiers' should be a 'list', not %r"
+            raise TypeError(msg % type(value).__name__)
+        self.classifiers = value
+
     def get_download_url(self):
         return self.download_url or "UNKNOWN"
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 1f104cef67..50b456ec94 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -195,6 +195,13 @@ def test_finalize_options(self):
         self.assertEqual(dist.metadata.platforms, ['one', 'two'])
         self.assertEqual(dist.metadata.keywords, ['one', 'two'])
 
+        attrs = {'keywords': 'foo bar',
+                 'platforms': 'foo bar'}
+        dist = Distribution(attrs=attrs)
+        dist.finalize_options()
+        self.assertEqual(dist.metadata.platforms, ['foo bar'])
+        self.assertEqual(dist.metadata.keywords, ['foo bar'])
+
     def test_get_command_packages(self):
         dist = Distribution()
         self.assertEqual(dist.command_packages, None)
@@ -338,9 +345,46 @@ def test_classifier(self):
         attrs = {'name': 'Boa', 'version': '3.0',
                  'classifiers': ['Programming Language :: Python :: 3']}
         dist = Distribution(attrs)
+        self.assertEqual(dist.get_classifiers(),
+                         ['Programming Language :: Python :: 3'])
         meta = self.format_metadata(dist)
         self.assertIn('Metadata-Version: 1.1', meta)
 
+    def test_classifier_invalid_type(self):
+        attrs = {'name': 'Boa', 'version': '3.0',
+                 'classifiers': ('Programming Language :: Python :: 3',)}
+        msg = "'classifiers' should be a 'list', not 'tuple'"
+        with self.assertRaises(TypeError, msg=msg):
+            Distribution(attrs)
+
+    def test_keywords(self):
+        attrs = {'name': 'Monty', 'version': '1.0',
+                 'keywords': ['spam', 'eggs', 'life of brian']}
+        dist = Distribution(attrs)
+        self.assertEqual(dist.get_keywords(),
+                         ['spam', 'eggs', 'life of brian'])
+
+    def test_keywords_invalid_type(self):
+        attrs = {'name': 'Monty', 'version': '1.0',
+                 'keywords': ('spam', 'eggs', 'life of brian')}
+        msg = "'keywords' should be a 'list', not 'tuple'"
+        with self.assertRaises(TypeError, msg=msg):
+            Distribution(attrs)
+
+    def test_platforms(self):
+        attrs = {'name': 'Monty', 'version': '1.0',
+                 'platforms': ['GNU/Linux', 'Some Evil Platform']}
+        dist = Distribution(attrs)
+        self.assertEqual(dist.get_platforms(),
+                         ['GNU/Linux', 'Some Evil Platform'])
+
+    def test_platforms_invalid_types(self):
+        attrs = {'name': 'Monty', 'version': '1.0',
+                 'platforms': ('GNU/Linux', 'Some Evil Platform')}
+        msg = "'platforms' should be a 'list', not 'tuple'"
+        with self.assertRaises(TypeError, msg=msg):
+            Distribution(attrs)
+
     def test_download_url(self):
         attrs = {'name': 'Boa', 'version': '3.0',
                  'download_url': 'http://example.org/boa'}

From 00de710988226c3189bd6abb13cfa87c7d97de5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 08:25:09 -0500
Subject: [PATCH 6854/8469] Fix NameError

---
 setuptools/command/egg_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a1d41b27da..103c5f20b9 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -640,7 +640,7 @@ def write_requirements(cmd, basename, filename):
 
 
 def write_setup_requirements(cmd, basename, filename):
-    data = StringIO()
+    data = io.StringIO()
     _write_requirements(data, cmd.distribution.setup_requires)
     cmd.write_or_delete_file("setup-requirements", filename, data.getvalue())
 

From 686895b17c4ebefcaa6066f5d34db7304cf1a33f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 08:50:25 -0500
Subject: [PATCH 6855/8469] Cleanup indentation

---
 setuptools/tests/test_egg_info.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a97d0c84b0..d4b79d63d3 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -191,7 +191,8 @@ def parametrize(*test_list, **format_dict):
                 test_params = test.lstrip().split('\n\n', 3)
                 name_kwargs = test_params.pop(0).split('\n')
                 if len(name_kwargs) > 1:
-                    install_cmd_kwargs = ast.literal_eval(name_kwargs[1].strip())
+                    val = name_kwargs[1].strip()
+                    install_cmd_kwargs = ast.literal_eval(val)
                 else:
                     install_cmd_kwargs = {}
                 name = name_kwargs[0].strip()
@@ -211,9 +212,11 @@ def parametrize(*test_list, **format_dict):
                                                   expected_requires,
                                                   install_cmd_kwargs,
                                                   marks=marks))
-            return pytest.mark.parametrize('requires,use_setup_cfg,'
-                                           'expected_requires,install_cmd_kwargs',
-                                           argvalues, ids=idlist)
+            return pytest.mark.parametrize(
+                'requires,use_setup_cfg,'
+                'expected_requires,install_cmd_kwargs',
+                argvalues, ids=idlist,
+            )
 
     @RequiresTestHelper.parametrize(
         # Format of a test:
@@ -361,9 +364,9 @@ def parametrize(*test_list, **format_dict):
         mismatch_marker=mismatch_marker,
         mismatch_marker_alternate=mismatch_marker_alternate,
     )
-    def test_requires(self, tmpdir_cwd, env,
-                      requires, use_setup_cfg,
-                      expected_requires, install_cmd_kwargs):
+    def test_requires(
+            self, tmpdir_cwd, env, requires, use_setup_cfg,
+            expected_requires, install_cmd_kwargs):
         self._setup_script_with_requires(requires, use_setup_cfg)
         self._run_install_command(tmpdir_cwd, env, **install_cmd_kwargs)
         egg_info_dir = os.path.join('.', 'foo.egg-info')

From 5ecd7575c9c09d4ec2d8f993c5fb405388c3f3c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 09:01:29 -0500
Subject: [PATCH 6856/8469] Add two tests demonstrating that requires.txt
 generation is deterministic. Ref #458.

---
 setuptools/tests/test_egg_info.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d4b79d63d3..0810ee3bf0 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -230,6 +230,20 @@ def parametrize(*test_list, **format_dict):
         #
         # expected contents of requires.txt
 
+        '''
+        install_requires_deterministic
+
+        install_requires=["fake-factory==0.5.2", "pytz"]
+
+        [options]
+        install_requires =
+            fake-factory==0.5.2
+            pytz
+
+        fake-factory==0.5.2
+        pytz
+        ''',
+
         '''
         install_requires_with_marker
 

From c461d5134f2aa89a4f6883f15bb84929b10f7ebf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 09:15:22 -0500
Subject: [PATCH 6857/8469] Add another test demonstrating that if requirements
 are declared in a non-deterministic order, they may appear in the metadata in
 non-deterministic order. Ref #458.

---
 setuptools/tests/test_egg_info.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 0810ee3bf0..774efb8655 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -244,6 +244,20 @@ def parametrize(*test_list, **format_dict):
         pytz
         ''',
 
+        '''
+        install_requires_set_deterministic
+
+        install_requires={{"fake-factory==0.5.2", "pytz"}}
+
+        [options]
+        install_requires =
+            fake-factory==0.5.2
+            pytz
+
+        fake-factory==0.5.2
+        pytz
+        ''',
+
         '''
         install_requires_with_marker
 

From 45f6ce2afb10aed556fec33c16b765728133f59a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 09:37:29 -0500
Subject: [PATCH 6858/8469] Add test asserting that install_requires parameters
 cannot be unordered. Ref #458.

---
 setuptools/tests/test_egg_info.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 774efb8655..66ca9164d5 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -244,20 +244,6 @@ def parametrize(*test_list, **format_dict):
         pytz
         ''',
 
-        '''
-        install_requires_set_deterministic
-
-        install_requires={{"fake-factory==0.5.2", "pytz"}}
-
-        [options]
-        install_requires =
-            fake-factory==0.5.2
-            pytz
-
-        fake-factory==0.5.2
-        pytz
-        ''',
-
         '''
         install_requires_with_marker
 
@@ -407,6 +393,17 @@ def test_requires(
         assert install_requires.lstrip() == expected_requires
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_install_requires_unordered_disallowed(self, tmpdir_cwd, env):
+        """
+        Packages that pass unordered install_requires sequences
+        should be rejected as they produce non-deterministic
+        builds. See #458.
+        """
+        req = 'install_requires={"fake-factory==0.5.2", "pytz"}'
+        self._setup_script_with_requires(req)
+        with pytest.raises(AssertionError):
+            self._run_install_command(tmpdir_cwd, env)
+
     def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.invalid_marker)

From f012485e4767f3be81493c93ad534a02c6f14f14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 09:45:05 -0500
Subject: [PATCH 6859/8469] Disallow unordered sequences for specifying
 install_requires. Fixes #458.

---
 CHANGES.rst        | 7 +++++++
 setuptools/dist.py | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index f75bb62a4f..c8a3ecc3f6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v38.0.0
+-------
+
+* #458: In order to support deterministic builds, Setuptools no
+  longer allows packages to declare ``install_requires`` as
+  unordered sequences (sets or dicts).
+
 v37.0.0
 -------
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index aa304500e8..477f93ddba 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -166,6 +166,8 @@ def check_requirements(dist, attr, value):
     """Verify that install_requires is a valid requirements list"""
     try:
         list(pkg_resources.parse_requirements(value))
+        if isinstance(value, (dict, set)):
+            raise TypeError("Unordered types are not allowed")
     except (TypeError, ValueError) as error:
         tmpl = (
             "{attr!r} must be a string or list of strings "

From c90ddcb846bec53761b1622b294e846786f875bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 09:48:11 -0500
Subject: [PATCH 6860/8469] =?UTF-8?q?Bump=20version:=2037.0.0=20=E2=86=92?=
 =?UTF-8?q?=2038.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 04dcfbf885..c06810df75 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 37.0.0
+current_version = 38.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 25d44de39a..845588d466 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="37.0.0",
+    version="38.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From b2e99f6731c6ba6fe6bd60f79f2166640f3db21d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 10:10:10 -0500
Subject: [PATCH 6861/8469] Shorten message and update changelog. Ref #1209.

---
 CHANGES.rst               | 6 ++++++
 pkg_resources/__init__.py | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c8a3ecc3f6..df91d99945 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.1.0
+-------
+
+* #1208: Improve error message when failing to locate scripts
+  in egg-info metadata.
+
 v38.0.0
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 62b82081b1..73334641b5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1514,8 +1514,9 @@ def run_script(self, script_name, namespace):
         script = 'scripts/' + script_name
         if not self.has_metadata(script):
             raise ResolutionError(
-                "No script named %r in 'scripts' directory of metadata "
-                "directory %r" % (script_name, self.egg_info))
+                "Script {script!r} not found in metadata at {self.egg_info!r}"
+                .format(**locals()),
+            )
         script_text = self.get_metadata(script).replace('\r\n', '\n')
         script_text = script_text.replace('\r', '\n')
         script_filename = self._fn(self.egg_info, script)

From 5bcd7f0328be56f96f76622acb3e188c16450354 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 10:20:51 -0500
Subject: [PATCH 6862/8469] HTTPS everywhere

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 1c6ee60354..f754d96624 100755
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@
     :target: https://setuptools.readthedocs.io
 
 .. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20build%20%40%20Travis%20CI
-   :target: http://travis-ci.org/pypa/setuptools
+   :target: https://travis-ci.org/pypa/setuptools
 
 .. image:: https://img.shields.io/appveyor/ci/jaraco/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
    :target: https://ci.appveyor.com/project/jaraco/setuptools/branch/master

From dce4750aed2d5b0a4ba677b0e308cd10dca2f6ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 25 Nov 2017 10:36:16 -0500
Subject: [PATCH 6863/8469] =?UTF-8?q?Bump=20version:=2038.0.0=20=E2=86=92?=
 =?UTF-8?q?=2038.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index c06810df75..39452fdeec 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.0.0
+current_version = 38.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 845588d466..052d7a1f53 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.0.0",
+    version="38.1.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 780a6f161ed4ce1026f5279c53c196d3bfdcec37 Mon Sep 17 00:00:00 2001
From: Henk-Jaap Wagenaar <wagenaarhenkjaap@gmail.com>
Date: Sat, 25 Nov 2017 18:55:58 +0000
Subject: [PATCH 6864/8469] Rework how to handle long_description_content_type

---
 setuptools/command/egg_info.py |  5 +----
 setuptools/dist.py             | 18 +++++-------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 27e10eeb32..d3725a2f2a 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -597,10 +597,7 @@ def write_pkg_info(cmd, basename, filename):
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
         metadata.name, oldname = cmd.egg_name, metadata.name
-        metadata.long_description_content_type = getattr(
-            cmd.distribution.metadata,
-            'long_description_content_type'
-        )
+
         try:
             # write unescaped data to PKG-INFO, so older pkg_resources
             # can still parse it
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 48c7a45604..8148df9548 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -58,11 +58,8 @@ def write_pkg_file(self, file):
     if self.download_url:
         file.write('Download-URL: %s\n' % self.download_url)
 
-    long_desc_content_type = getattr(
-        self,
-        'long_description_content_type',
-        None
-    ) or 'UNKNOWN'
+    long_desc_content_type = \
+        self.long_description_content_type or 'UNKNOWN'
     file.write('Description-Content-Type: %s\n' % long_desc_content_type)
 
     long_desc = rfc822_escape(self.get_long_description())
@@ -324,20 +321,15 @@ def __init__(self, attrs=None):
         self.dist_files = []
         self.src_root = attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
-        self.long_description_content_type = attrs.get(
-            'long_description_content_type'
-        )
         self.dependency_links = attrs.pop('dependency_links', [])
         self.setup_requires = attrs.pop('setup_requires', [])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
         _Distribution.__init__(self, attrs)
 
-        try:
-            self.metadata.long_description_content_type
-        except AttributeError:
-            self.metadata.long_description_content_type = \
-                self.long_description_content_type
+        self.metadata.long_description_content_type = attrs.get(
+            'long_description_content_type'
+        )
 
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)

From 118edbb2b715c96620b51018c1d28e81f2318053 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 2 Nov 2017 21:19:39 +0100
Subject: [PATCH 6865/8469] easy_install: add support for installing from
 wheels

Note: wheels are installed as eggs, so each install is self-contained
and multiple versions of the same package can be installed at the same
time.

Limitations:
- headers are not supported
- resulting egg metadata requirements have their markers stripped
---
 setuptools/command/easy_install.py |  32 +++
 setuptools/glibc.py                |  86 ++++++
 setuptools/package_index.py        |  14 +-
 setuptools/pep425tags.py           | 316 +++++++++++++++++++++
 setuptools/tests/test_wheel.py     | 430 +++++++++++++++++++++++++++++
 setuptools/wheel.py                | 125 +++++++++
 tests/requirements.txt             |   1 +
 7 files changed, 1003 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/glibc.py
 create mode 100644 setuptools/pep425tags.py
 create mode 100644 setuptools/tests/test_wheel.py
 create mode 100644 setuptools/wheel.py

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 71991efac1..12e223106c 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -53,6 +53,7 @@
     PackageIndex, parse_requirement_arg, URL_SCHEME,
 )
 from setuptools.command import bdist_egg, egg_info
+from setuptools.wheel import Wheel
 from pkg_resources import (
     yield_lines, normalize_path, resource_string, ensure_directory,
     get_distribution, find_distributions, Environment, Requirement,
@@ -842,6 +843,8 @@ def install_eggs(self, spec, dist_filename, tmpdir):
             return [self.install_egg(dist_filename, tmpdir)]
         elif dist_filename.lower().endswith('.exe'):
             return [self.install_exe(dist_filename, tmpdir)]
+        elif dist_filename.lower().endswith('.whl'):
+            return [self.install_wheel(dist_filename, tmpdir)]
 
         # Anything else, try to extract and build
         setup_base = tmpdir
@@ -1038,6 +1041,35 @@ def process(src, dst):
                     f.write('\n'.join(locals()[name]) + '\n')
                     f.close()
 
+    def install_wheel(self, wheel_path, tmpdir):
+        wheel = Wheel(wheel_path)
+        assert wheel.is_compatible()
+        destination = os.path.join(self.install_dir, wheel.egg_name())
+        destination = os.path.abspath(destination)
+        if not self.dry_run:
+            ensure_directory(destination)
+        if os.path.isdir(destination) and not os.path.islink(destination):
+            dir_util.remove_tree(destination, dry_run=self.dry_run)
+        elif os.path.exists(destination):
+            self.execute(
+                os.unlink,
+                (destination,),
+                "Removing " + destination,
+            )
+        try:
+            self.execute(
+                wheel.install_as_egg,
+                (destination,),
+                ("Installing %s to %s") % (
+                    os.path.basename(wheel_path),
+                    os.path.dirname(destination)
+                ),
+            )
+        finally:
+            update_dist_caches(destination, fix_zipimporter_caches=False)
+        self.add_output(destination)
+        return self.egg_distribution(destination)
+
     __mv_warning = textwrap.dedent("""
         Because this distribution was installed --multi-version, before you can
         import modules from this package in an application, you will need to
diff --git a/setuptools/glibc.py b/setuptools/glibc.py
new file mode 100644
index 0000000000..a134591c30
--- /dev/null
+++ b/setuptools/glibc.py
@@ -0,0 +1,86 @@
+# This file originally from pip:
+# https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/utils/glibc.py
+from __future__ import absolute_import
+
+import ctypes
+import re
+import warnings
+
+
+def glibc_version_string():
+    "Returns glibc version string, or None if not using glibc."
+
+    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
+    # manpage says, "If filename is NULL, then the returned handle is for the
+    # main program". This way we can let the linker do the work to figure out
+    # which libc our process is actually using.
+    process_namespace = ctypes.CDLL(None)
+    try:
+        gnu_get_libc_version = process_namespace.gnu_get_libc_version
+    except AttributeError:
+        # Symbol doesn't exist -> therefore, we are not linked to
+        # glibc.
+        return None
+
+    # Call gnu_get_libc_version, which returns a string like "2.5"
+    gnu_get_libc_version.restype = ctypes.c_char_p
+    version_str = gnu_get_libc_version()
+    # py2 / py3 compatibility:
+    if not isinstance(version_str, str):
+        version_str = version_str.decode("ascii")
+
+    return version_str
+
+
+# Separated out from have_compatible_glibc for easier unit testing
+def check_glibc_version(version_str, required_major, minimum_minor):
+    # Parse string and check against requested version.
+    #
+    # We use a regexp instead of str.split because we want to discard any
+    # random junk that might come after the minor version -- this might happen
+    # in patched/forked versions of glibc (e.g. Linaro's version of glibc
+    # uses version strings like "2.20-2014.11"). See gh-3588.
+    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
+    if not m:
+        warnings.warn("Expected glibc version with 2 components major.minor,"
+                      " got: %s" % version_str, RuntimeWarning)
+        return False
+    return (int(m.group("major")) == required_major and
+            int(m.group("minor")) >= minimum_minor)
+
+
+def have_compatible_glibc(required_major, minimum_minor):
+    version_str = glibc_version_string()
+    if version_str is None:
+        return False
+    return check_glibc_version(version_str, required_major, minimum_minor)
+
+
+# platform.libc_ver regularly returns completely nonsensical glibc
+# versions. E.g. on my computer, platform says:
+#
+#   ~$ python2.7 -c 'import platform; print(platform.libc_ver())'
+#   ('glibc', '2.7')
+#   ~$ python3.5 -c 'import platform; print(platform.libc_ver())'
+#   ('glibc', '2.9')
+#
+# But the truth is:
+#
+#   ~$ ldd --version
+#   ldd (Debian GLIBC 2.22-11) 2.22
+#
+# This is unfortunate, because it means that the linehaul data on libc
+# versions that was generated by pip 8.1.2 and earlier is useless and
+# misleading. Solution: instead of using platform, use our code that actually
+# works.
+def libc_ver():
+    """Try to determine the glibc version
+
+    Returns a tuple of strings (lib, version) which default to empty strings
+    in case the lookup fails.
+    """
+    glibc_version = glibc_version_string()
+    if glibc_version is None:
+        return ("", "")
+    else:
+        return ("glibc", glibc_version)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index fe2ef50fee..ad7433078e 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -21,13 +21,14 @@
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
     Environment, find_distributions, safe_name, safe_version,
-    to_filename, Requirement, DEVELOP_DIST,
+    to_filename, Requirement, DEVELOP_DIST, EGG_DIST,
 )
 from setuptools import ssl_support
 from distutils import log
 from distutils.errors import DistutilsError
 from fnmatch import translate
 from setuptools.py27compat import get_all_headers
+from setuptools.wheel import Wheel
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
@@ -115,6 +116,17 @@ def distros_for_location(location, basename, metadata=None):
     if basename.endswith('.egg') and '-' in basename:
         # only one, unambiguous interpretation
         return [Distribution.from_location(location, basename, metadata)]
+    if basename.endswith('.whl') and '-' in basename:
+        wheel = Wheel(basename)
+        if not wheel.is_compatible():
+            return []
+        return [Distribution(
+            location=location,
+            project_name=wheel.project_name,
+            version=wheel.version,
+            # Increase priority over eggs.
+            precedence=EGG_DIST + 1,
+        )]
     if basename.endswith('.exe'):
         win_base, py_ver, platform = parse_bdist_wininst(basename)
         if win_base is not None:
diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
new file mode 100644
index 0000000000..dfe55d587a
--- /dev/null
+++ b/setuptools/pep425tags.py
@@ -0,0 +1,316 @@
+# This file originally from pip:
+# https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/pep425tags.py
+"""Generate and work with PEP 425 Compatibility Tags."""
+from __future__ import absolute_import
+
+import distutils.util
+import platform
+import re
+import sys
+import sysconfig
+import warnings
+from collections import OrderedDict
+
+from . import glibc
+
+_osx_arch_pat = re.compile(r'(.+)_(\d+)_(\d+)_(.+)')
+
+
+def get_config_var(var):
+    try:
+        return sysconfig.get_config_var(var)
+    except IOError as e:  # Issue #1074
+        warnings.warn("{}".format(e), RuntimeWarning)
+        return None
+
+
+def get_abbr_impl():
+    """Return abbreviated implementation name."""
+    if hasattr(sys, 'pypy_version_info'):
+        pyimpl = 'pp'
+    elif sys.platform.startswith('java'):
+        pyimpl = 'jy'
+    elif sys.platform == 'cli':
+        pyimpl = 'ip'
+    else:
+        pyimpl = 'cp'
+    return pyimpl
+
+
+def get_impl_ver():
+    """Return implementation version."""
+    impl_ver = get_config_var("py_version_nodot")
+    if not impl_ver or get_abbr_impl() == 'pp':
+        impl_ver = ''.join(map(str, get_impl_version_info()))
+    return impl_ver
+
+
+def get_impl_version_info():
+    """Return sys.version_info-like tuple for use in decrementing the minor
+    version."""
+    if get_abbr_impl() == 'pp':
+        # as per https://github.com/pypa/pip/issues/2882
+        return (sys.version_info[0], sys.pypy_version_info.major,
+                sys.pypy_version_info.minor)
+    else:
+        return sys.version_info[0], sys.version_info[1]
+
+
+def get_impl_tag():
+    """
+    Returns the Tag for this specific implementation.
+    """
+    return "{}{}".format(get_abbr_impl(), get_impl_ver())
+
+
+def get_flag(var, fallback, expected=True, warn=True):
+    """Use a fallback method for determining SOABI flags if the needed config
+    var is unset or unavailable."""
+    val = get_config_var(var)
+    if val is None:
+        if warn:
+            warnings.warn("Config variable '{0}' is unset, Python ABI tag may "
+                          "be incorrect".format(var), RuntimeWarning, 2)
+        return fallback()
+    return val == expected
+
+
+def get_abi_tag():
+    """Return the ABI tag based on SOABI (if available) or emulate SOABI
+    (CPython 2, PyPy)."""
+    soabi = get_config_var('SOABI')
+    impl = get_abbr_impl()
+    if not soabi and impl in {'cp', 'pp'} and hasattr(sys, 'maxunicode'):
+        d = ''
+        m = ''
+        u = ''
+        if get_flag('Py_DEBUG',
+                    lambda: hasattr(sys, 'gettotalrefcount'),
+                    warn=(impl == 'cp')):
+            d = 'd'
+        if get_flag('WITH_PYMALLOC',
+                    lambda: impl == 'cp',
+                    warn=(impl == 'cp')):
+            m = 'm'
+        if get_flag('Py_UNICODE_SIZE',
+                    lambda: sys.maxunicode == 0x10ffff,
+                    expected=4,
+                    warn=(impl == 'cp' and
+                          sys.version_info < (3, 3))) \
+                and sys.version_info < (3, 3):
+            u = 'u'
+        abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
+    elif soabi and soabi.startswith('cpython-'):
+        abi = 'cp' + soabi.split('-')[1]
+    elif soabi:
+        abi = soabi.replace('.', '_').replace('-', '_')
+    else:
+        abi = None
+    return abi
+
+
+def _is_running_32bit():
+    return sys.maxsize == 2147483647
+
+
+def get_platform():
+    """Return our platform name 'win32', 'linux_x86_64'"""
+    if sys.platform == 'darwin':
+        # distutils.util.get_platform() returns the release based on the value
+        # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may
+        # be significantly older than the user's current machine.
+        release, _, machine = platform.mac_ver()
+        split_ver = release.split('.')
+
+        if machine == "x86_64" and _is_running_32bit():
+            machine = "i386"
+        elif machine == "ppc64" and _is_running_32bit():
+            machine = "ppc"
+
+        return 'macosx_{}_{}_{}'.format(split_ver[0], split_ver[1], machine)
+
+    # XXX remove distutils dependency
+    result = distutils.util.get_platform().replace('.', '_').replace('-', '_')
+    if result == "linux_x86_64" and _is_running_32bit():
+        # 32 bit Python program (running on a 64 bit Linux): pip should only
+        # install and run 32 bit compiled extensions in that case.
+        result = "linux_i686"
+
+    return result
+
+
+def is_manylinux1_compatible():
+    # Only Linux, and only x86-64 / i686
+    if get_platform() not in {"linux_x86_64", "linux_i686"}:
+        return False
+
+    # Check for presence of _manylinux module
+    try:
+        import _manylinux
+        return bool(_manylinux.manylinux1_compatible)
+    except (ImportError, AttributeError):
+        # Fall through to heuristic check below
+        pass
+
+    # Check glibc version. CentOS 5 uses glibc 2.5.
+    return glibc.have_compatible_glibc(2, 5)
+
+
+def get_darwin_arches(major, minor, machine):
+    """Return a list of supported arches (including group arches) for
+    the given major, minor and machine architecture of an macOS machine.
+    """
+    arches = []
+
+    def _supports_arch(major, minor, arch):
+        # Looking at the application support for macOS versions in the chart
+        # provided by https://en.wikipedia.org/wiki/OS_X#Versions it appears
+        # our timeline looks roughly like:
+        #
+        # 10.0 - Introduces ppc support.
+        # 10.4 - Introduces ppc64, i386, and x86_64 support, however the ppc64
+        #        and x86_64 support is CLI only, and cannot be used for GUI
+        #        applications.
+        # 10.5 - Extends ppc64 and x86_64 support to cover GUI applications.
+        # 10.6 - Drops support for ppc64
+        # 10.7 - Drops support for ppc
+        #
+        # Given that we do not know if we're installing a CLI or a GUI
+        # application, we must be conservative and assume it might be a GUI
+        # application and behave as if ppc64 and x86_64 support did not occur
+        # until 10.5.
+        #
+        # Note: The above information is taken from the "Application support"
+        #       column in the chart not the "Processor support" since I believe
+        #       that we care about what instruction sets an application can use
+        #       not which processors the OS supports.
+        if arch == 'ppc':
+            return (major, minor) <= (10, 5)
+        if arch == 'ppc64':
+            return (major, minor) == (10, 5)
+        if arch == 'i386':
+            return (major, minor) >= (10, 4)
+        if arch == 'x86_64':
+            return (major, minor) >= (10, 5)
+        if arch in groups:
+            for garch in groups[arch]:
+                if _supports_arch(major, minor, garch):
+                    return True
+        return False
+
+    groups = OrderedDict([
+        ("fat", ("i386", "ppc")),
+        ("intel", ("x86_64", "i386")),
+        ("fat64", ("x86_64", "ppc64")),
+        ("fat32", ("x86_64", "i386", "ppc")),
+    ])
+
+    if _supports_arch(major, minor, machine):
+        arches.append(machine)
+
+    for garch in groups:
+        if machine in groups[garch] and _supports_arch(major, minor, garch):
+            arches.append(garch)
+
+    arches.append('universal')
+
+    return arches
+
+
+def get_supported(versions=None, noarch=False, platform=None,
+                  impl=None, abi=None):
+    """Return a list of supported tags for each version specified in
+    `versions`.
+
+    :param versions: a list of string versions, of the form ["33", "32"],
+        or None. The first version will be assumed to support our ABI.
+    :param platform: specify the exact platform you want valid
+        tags for, or None. If None, use the local system platform.
+    :param impl: specify the exact implementation you want valid
+        tags for, or None. If None, use the local interpreter impl.
+    :param abi: specify the exact abi you want valid
+        tags for, or None. If None, use the local interpreter abi.
+    """
+    supported = []
+
+    # Versions must be given with respect to the preference
+    if versions is None:
+        versions = []
+        version_info = get_impl_version_info()
+        major = version_info[:-1]
+        # Support all previous minor Python versions.
+        for minor in range(version_info[-1], -1, -1):
+            versions.append(''.join(map(str, major + (minor,))))
+
+    impl = impl or get_abbr_impl()
+
+    abis = []
+
+    abi = abi or get_abi_tag()
+    if abi:
+        abis[0:0] = [abi]
+
+    abi3s = set()
+    import imp
+    for suffix in imp.get_suffixes():
+        if suffix[0].startswith('.abi'):
+            abi3s.add(suffix[0].split('.', 2)[1])
+
+    abis.extend(sorted(list(abi3s)))
+
+    abis.append('none')
+
+    if not noarch:
+        arch = platform or get_platform()
+        if arch.startswith('macosx'):
+            # support macosx-10.6-intel on macosx-10.9-x86_64
+            match = _osx_arch_pat.match(arch)
+            if match:
+                name, major, minor, actual_arch = match.groups()
+                tpl = '{}_{}_%i_%s'.format(name, major)
+                arches = []
+                for m in reversed(range(int(minor) + 1)):
+                    for a in get_darwin_arches(int(major), m, actual_arch):
+                        arches.append(tpl % (m, a))
+            else:
+                # arch pattern didn't match (?!)
+                arches = [arch]
+        elif platform is None and is_manylinux1_compatible():
+            arches = [arch.replace('linux', 'manylinux1'), arch]
+        else:
+            arches = [arch]
+
+        # Current version, current API (built specifically for our Python):
+        for abi in abis:
+            for arch in arches:
+                supported.append(('%s%s' % (impl, versions[0]), abi, arch))
+
+        # abi3 modules compatible with older version of Python
+        for version in versions[1:]:
+            # abi3 was introduced in Python 3.2
+            if version in {'31', '30'}:
+                break
+            for abi in abi3s:   # empty set if not Python 3
+                for arch in arches:
+                    supported.append(("%s%s" % (impl, version), abi, arch))
+
+        # Has binaries, does not use the Python API:
+        for arch in arches:
+            supported.append(('py%s' % (versions[0][0]), 'none', arch))
+
+    # No abi / arch, but requires our implementation:
+    supported.append(('%s%s' % (impl, versions[0]), 'none', 'any'))
+    # Tagged specifically as being cross-version compatible
+    # (with just the major version specified)
+    supported.append(('%s%s' % (impl, versions[0][0]), 'none', 'any'))
+
+    # No abi / arch, generic Python
+    for i, version in enumerate(versions):
+        supported.append(('py%s' % (version,), 'none', 'any'))
+        if i == 0:
+            supported.append(('py%s' % (version[0]), 'none', 'any'))
+
+    return supported
+
+
+implementation_tag = get_impl_tag()
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
new file mode 100644
index 0000000000..a0c16c5391
--- /dev/null
+++ b/setuptools/tests/test_wheel.py
@@ -0,0 +1,430 @@
+"""wheel tests
+"""
+
+from distutils.sysconfig import get_config_var
+from distutils.util import get_platform
+import contextlib
+import glob
+import inspect
+import os
+import subprocess
+import sys
+
+import pytest
+
+from pkg_resources import Distribution, PathMetadata, PY_MAJOR
+from setuptools.wheel import Wheel
+
+from .contexts import tempdir
+from .files import build_files
+from .textwrap import DALS
+
+
+WHEEL_INFO_TESTS = (
+    ('invalid.whl', ValueError),
+    ('simplewheel-2.0-1-py2.py3-none-any.whl', {
+        'project_name': 'simplewheel',
+        'version': '2.0',
+        'build': '1',
+        'py_version': 'py2.py3',
+        'abi': 'none',
+        'platform': 'any',
+    }),
+    ('simple.dist-0.1-py2.py3-none-any.whl', {
+        'project_name': 'simple.dist',
+        'version': '0.1',
+        'build': None,
+        'py_version': 'py2.py3',
+        'abi': 'none',
+        'platform': 'any',
+    }),
+    ('example_pkg_a-1-py3-none-any.whl', {
+        'project_name': 'example_pkg_a',
+        'version': '1',
+        'build': None,
+        'py_version': 'py3',
+        'abi': 'none',
+        'platform': 'any',
+    }),
+    ('PyQt5-5.9-5.9.1-cp35.cp36.cp37-abi3-manylinux1_x86_64.whl', {
+        'project_name': 'PyQt5',
+        'version': '5.9',
+        'build': '5.9.1',
+        'py_version': 'cp35.cp36.cp37',
+        'abi': 'abi3',
+        'platform': 'manylinux1_x86_64',
+    }),
+)
+
+@pytest.mark.parametrize(
+    ('filename', 'info'), WHEEL_INFO_TESTS,
+    ids=[t[0] for t in WHEEL_INFO_TESTS]
+)
+def test_wheel_info(filename, info):
+    if inspect.isclass(info):
+        with pytest.raises(info):
+            Wheel(filename)
+        return
+    w = Wheel(filename)
+    assert {k: getattr(w, k) for k in info.keys()} == info
+
+
+@contextlib.contextmanager
+def build_wheel(extra_file_defs=None, **kwargs):
+    file_defs = {
+        'setup.py': DALS(
+            '''
+            from setuptools import setup
+            import setuptools
+            setup(**%r)
+            '''
+        ) % kwargs,
+    }
+    if extra_file_defs:
+        file_defs.update(extra_file_defs)
+    with tempdir() as source_dir:
+        build_files(file_defs, source_dir)
+        subprocess.check_call((sys.executable, 'setup.py',
+                               '-q', 'bdist_wheel'), cwd=source_dir)
+        yield glob.glob(os.path.join(source_dir, 'dist', '*.whl'))[0]
+
+
+def tree(root):
+    def depth(path):
+        return len(path.split(os.path.sep))
+    def prefix(path_depth):
+        if not path_depth:
+            return ''
+        return '|  ' * (path_depth - 1) + '|-- '
+    lines = []
+    root_depth = depth(root)
+    for dirpath, dirnames, filenames in os.walk(root):
+        dirnames.sort()
+        filenames.sort()
+        dir_depth = depth(dirpath) - root_depth
+        if dir_depth > 0:
+            lines.append('%s%s/' % (prefix(dir_depth - 1),
+                                    os.path.basename(dirpath)))
+        for f in filenames:
+            lines.append('%s%s' % (prefix(dir_depth), f))
+    return '\n'.join(lines) + '\n'
+
+
+def _check_wheel_install(filename, install_dir, install_tree,
+                         project_name, version, requires_txt):
+    w = Wheel(filename)
+    egg_path = os.path.join(install_dir, w.egg_name())
+    w.install_as_egg(egg_path)
+    if install_tree is not None:
+        install_tree = install_tree.format(
+            py_version=PY_MAJOR,
+            platform=get_platform(),
+            shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO')
+        )
+        assert install_tree == tree(install_dir)
+    metadata = PathMetadata(egg_path, os.path.join(egg_path, 'EGG-INFO'))
+    dist = Distribution.from_filename(egg_path, metadata=metadata)
+    assert dist.project_name == project_name
+    assert dist.version == version
+    if requires_txt is None:
+        assert not dist.has_metadata('requires.txt')
+    else:
+        assert requires_txt == dist.get_metadata('requires.txt').lstrip()
+
+
+class Record(object):
+
+    def __init__(self, id, **kwargs):
+        self._id = id
+        self._fields = kwargs
+
+    def __repr__(self):
+        return '%s(**%r)' % (self._id, self._fields)
+
+
+WHEEL_INSTALL_TESTS = (
+
+    dict(
+        id='basic',
+        file_defs={
+            'foo': {
+                '__init__.py': ''
+            }
+        },
+        setup_kwargs=dict(
+            packages=['foo'],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            |-- foo/
+            |  |-- __init__.py
+            '''
+        ),
+    ),
+
+    dict(
+        id='data',
+        file_defs={
+            'data.txt': DALS(
+                '''
+                Some data...
+                '''
+            ),
+        },
+        setup_kwargs=dict(
+            data_files=[('data_dir', ['data.txt'])],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            |-- data_dir/
+            |  |-- data.txt
+            '''
+        ),
+    ),
+
+    dict(
+        id='extension',
+        file_defs={
+            'extension.c': DALS(
+                '''
+                #include "Python.h"
+
+                #if PY_MAJOR_VERSION >= 3
+
+                static struct PyModuleDef moduledef = {
+                        PyModuleDef_HEAD_INIT,
+                        "extension",
+                        NULL,
+                        0,
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL
+                };
+
+                #define INITERROR return NULL
+
+                PyMODINIT_FUNC PyInit_extension(void)
+
+                #else
+
+                #define INITERROR return
+
+                void initextension(void)
+
+                #endif
+                {
+                #if PY_MAJOR_VERSION >= 3
+                    PyObject *module = PyModule_Create(&moduledef);
+                #else
+                    PyObject *module = Py_InitModule("extension", NULL);
+                #endif
+                    if (module == NULL)
+                        INITERROR;
+                #if PY_MAJOR_VERSION >= 3
+                    return module;
+                #endif
+                }
+                '''
+            ),
+        },
+        setup_kwargs=dict(
+            ext_modules=[
+                Record('setuptools.Extension',
+                       name='extension',
+                       sources=['extension.c'])
+            ],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}-{platform}.egg/
+            |-- extension{shlib_ext}
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            '''
+        ),
+    ),
+
+    dict(
+        id='header',
+        file_defs={
+            'header.h': DALS(
+                '''
+                '''
+            ),
+        },
+        setup_kwargs=dict(
+            headers=['header.h'],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- header.h
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            '''
+        ),
+    ),
+
+    dict(
+        id='script',
+        file_defs={
+            'script.py': DALS(
+                '''
+                #/usr/bin/python
+                print('hello world!')
+                '''
+            ),
+            'script.sh': DALS(
+                '''
+                #/bin/sh
+                echo 'hello world!'
+                '''
+            ),
+        },
+        setup_kwargs=dict(
+            scripts=['script.py', 'script.sh'],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            |  |-- scripts/
+            |  |  |-- script.py
+            |  |  |-- script.sh
+            '''
+        ),
+    ),
+
+    dict(
+        id='requires1',
+        install_requires='foobar==2.0',
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- requires.txt
+            |  |-- top_level.txt
+            '''),
+        requires_txt=DALS(
+            '''
+            foobar==2.0
+            '''
+        ),
+    ),
+
+    dict(
+        id='requires2',
+        install_requires='''
+        bar
+        foo<=2.0; %r in sys_platform
+        ''' % sys.platform,
+        requires_txt=DALS(
+            '''
+            bar
+            foo<=2.0
+            '''
+        ),
+    ),
+
+    dict(
+        id='requires3',
+        install_requires='''
+        bar; %r != sys_platform
+        ''' % sys.platform,
+    ),
+
+    dict(
+        id='requires4',
+        install_requires='''
+        foo
+        ''',
+        extras_require={
+            'extra': 'foobar>3',
+        },
+        requires_txt=DALS(
+            '''
+            foo
+
+            [extra]
+            foobar>3
+            '''
+        ),
+    ),
+
+    dict(
+        id='requires5',
+        extras_require={
+            'extra': 'foobar; %r != sys_platform' % sys.platform,
+        },
+        requires_txt=DALS(
+            '''
+            [extra]
+            '''
+        ),
+    ),
+
+)
+
+@pytest.mark.parametrize(
+    'params', WHEEL_INSTALL_TESTS,
+    ids=list(params['id'] for params in WHEEL_INSTALL_TESTS),
+)
+def test_wheel_install(params):
+    project_name = params.get('name', 'foo')
+    version = params.get('version', '1.0')
+    install_requires = params.get('install_requires', [])
+    extras_require = params.get('extras_require', {})
+    requires_txt = params.get('requires_txt', None)
+    install_tree = params.get('install_tree')
+    file_defs = params.get('file_defs', {})
+    setup_kwargs = params.get('setup_kwargs', {})
+    with build_wheel(
+        name=project_name,
+        version=version,
+        install_requires=install_requires,
+        extras_require=extras_require,
+        extra_file_defs=file_defs,
+        **setup_kwargs
+    ) as filename, tempdir() as install_dir:
+        _check_wheel_install(filename, install_dir,
+                             install_tree, project_name,
+                             version, requires_txt)
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
new file mode 100644
index 0000000000..6e3df77ce4
--- /dev/null
+++ b/setuptools/wheel.py
@@ -0,0 +1,125 @@
+'''Wheels support.'''
+
+from distutils.util import get_platform
+import email
+import itertools
+import os
+import re
+import zipfile
+
+from pkg_resources import Distribution, PathMetadata, parse_version
+from setuptools import Distribution as SetuptoolsDistribution
+from setuptools import pep425tags
+from setuptools.command.egg_info import write_requirements
+
+
+WHEEL_NAME = re.compile(
+    r"""^(?P<project_name>.+?)-(?P<version>\d.*?)
+    ((-(?P<build>\d.*?))?-(?P<py_version>.+?)-(?P<abi>.+?)-(?P<platform>.+?)
+    )\.whl$""",
+re.VERBOSE).match
+
+
+class Wheel(object):
+
+    def __init__(self, filename):
+        match = WHEEL_NAME(os.path.basename(filename))
+        if match is None:
+            raise ValueError('invalid wheel name: %r' % filename)
+        self.filename = filename
+        for k, v in match.groupdict().items():
+            setattr(self, k, v)
+
+    def tags(self):
+        '''List tags (py_version, abi, platform) supported by this wheel.'''
+        return itertools.product(self.py_version.split('.'),
+                                 self.abi.split('.'),
+                                 self.platform.split('.'))
+
+    def is_compatible(self):
+        '''Is the wheel is compatible with the current platform?'''
+        supported_tags = pep425tags.get_supported()
+        return next((True for t in self.tags() if t in supported_tags), False)
+
+    def egg_name(self):
+        return Distribution(
+            project_name=self.project_name, version=self.version,
+            platform=(None if self.platform == 'any' else get_platform()),
+        ).egg_name() + '.egg'
+
+    def install_as_egg(self, destination_eggdir):
+        '''Install wheel as an egg directory.'''
+        with zipfile.ZipFile(self.filename) as zf:
+            dist_basename = '%s-%s' % (self.project_name, self.version)
+            dist_info = '%s.dist-info' % dist_basename
+            dist_data = '%s.data' % dist_basename
+            def get_metadata(name):
+                with zf.open('%s/%s' % (dist_info, name)) as fp:
+                    value = fp.read().decode('utf-8')
+                    return email.parser.Parser().parsestr(value)
+            wheel_metadata = get_metadata('WHEEL')
+            dist_metadata = get_metadata('METADATA')
+            # Check wheel format version is supported.
+            wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
+            if not parse_version('1.0') <= wheel_version < parse_version('2.0dev0'):
+                raise ValueError('unsupported wheel format version: %s' % wheel_version)
+            # Extract to target directory.
+            os.mkdir(destination_eggdir)
+            zf.extractall(destination_eggdir)
+            # Convert metadata.
+            dist_info = os.path.join(destination_eggdir, dist_info)
+            dist = Distribution.from_location(
+                destination_eggdir, dist_info,
+                metadata=PathMetadata(destination_eggdir, dist_info)
+            )
+            # Note: we need to evaluate and strip markers now,
+            # as we can't easily convert back from the syntax:
+            # foobar; "linux" in sys_platform and extra == 'test'
+            def raw_req(req):
+                req.marker = None
+                return str(req)
+            install_requires = list(sorted(map(raw_req, dist.requires())))
+            extras_require = {
+                extra: list(sorted(
+                    req
+                    for req in map(raw_req, dist.requires((extra,)))
+                    if req not in install_requires
+                ))
+                for extra in dist.extras
+            }
+            egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
+            os.rename(dist_info, egg_info)
+            os.rename(os.path.join(egg_info, 'METADATA'),
+                      os.path.join(egg_info, 'PKG-INFO'))
+            setup_dist = SetuptoolsDistribution(attrs=dict(
+                install_requires=install_requires,
+                extras_require=extras_require,
+            ))
+            write_requirements(setup_dist.get_command_obj('egg_info'),
+                               None, os.path.join(egg_info, 'requires.txt'))
+            # Move data entries to their correct location.
+            dist_data = os.path.join(destination_eggdir, dist_data)
+            dist_data_scripts = os.path.join(dist_data, 'scripts')
+            if os.path.exists(dist_data_scripts):
+                egg_info_scripts = os.path.join(destination_eggdir,
+                                                'EGG-INFO', 'scripts')
+                os.mkdir(egg_info_scripts)
+                for entry in os.listdir(dist_data_scripts):
+                    # Remove bytecode, as it's not properly handled
+                    # during easy_install scripts install phase.
+                    if entry.endswith('.pyc'):
+                        os.unlink(os.path.join(dist_data_scripts, entry))
+                    else:
+                        os.rename(os.path.join(dist_data_scripts, entry),
+                                  os.path.join(egg_info_scripts, entry))
+                os.rmdir(dist_data_scripts)
+            for subdir in filter(os.path.exists, (
+                os.path.join(dist_data, d)
+                for d in ('data', 'headers', 'purelib', 'platlib')
+            )):
+                for entry in os.listdir(subdir):
+                    os.rename(os.path.join(subdir, entry),
+                              os.path.join(destination_eggdir, entry))
+                os.rmdir(subdir)
+            if os.path.exists(dist_data):
+                os.rmdir(dist_data)
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 4761505fc9..38b6924712 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -4,3 +4,4 @@ pytest-flake8; python_version>="2.7"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2
+wheel

From d4959f2c85d8b36c71249fdf81ed9c26c9f31690 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 26 Nov 2017 18:50:47 +0100
Subject: [PATCH 6866/8469] update changelog

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index df91d99945..63d17d5db8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.2.0
+-------
+
+* #1200: easy_install now support installing from wheels:
+  they will be installed as standalone unzipped eggs.
+
 v38.1.0
 -------
 

From 7b3ed4f22aad1b62c537cc89b07b1691033730c3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 26 Nov 2017 18:51:39 +0100
Subject: [PATCH 6867/8469] =?UTF-8?q?Bump=20version:=2038.1.0=20=E2=86=92?=
 =?UTF-8?q?=2038.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 39452fdeec..f00b544f9b 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.1.0
+current_version = 38.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 052d7a1f53..7b2c10010d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.1.0",
+    version="38.2.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e72afd6243713cd0d3f8a5bc5b50fb59934d7ff8 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 26 Nov 2017 23:11:14 +0100
Subject: [PATCH 6868/8469] fix encoding handling of wheels metadata

---
 CHANGES.rst                    |  6 ++++++
 setuptools/tests/files.py      |  9 +++++++--
 setuptools/tests/test_wheel.py | 14 ++++++++++++--
 setuptools/wheel.py            |  3 ++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 63d17d5db8..d5fd66a376 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.2.1
+-------
+
+* #1212: fix encoding handling of metadata when installing
+  from a wheel.
+
 v38.2.0
 -------
 
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index 98de9fc341..75ec740d0e 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -1,6 +1,7 @@
 import os
 
 
+from pkg_resources.extern.six import binary_type
 import pkg_resources.py31compat
 
 
@@ -30,5 +31,9 @@ def build_files(file_defs, prefix=""):
             pkg_resources.py31compat.makedirs(full_name, exist_ok=True)
             build_files(contents, prefix=full_name)
         else:
-            with open(full_name, 'w') as f:
-                f.write(contents)
+            if isinstance(contents, binary_type):
+                with open(full_name, 'wb') as f:
+                    f.write(contents)
+            else:
+                with open(full_name, 'w') as f:
+                    f.write(contents)
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index a0c16c5391..2e857253d5 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """wheel tests
 """
 
@@ -72,13 +74,14 @@ def test_wheel_info(filename, info):
 @contextlib.contextmanager
 def build_wheel(extra_file_defs=None, **kwargs):
     file_defs = {
-        'setup.py': DALS(
+        'setup.py': (DALS(
             '''
+            # -*- coding: utf-8 -*-
             from setuptools import setup
             import setuptools
             setup(**%r)
             '''
-        ) % kwargs,
+        ) % kwargs).encode('utf-8'),
     }
     if extra_file_defs:
         file_defs.update(extra_file_defs)
@@ -170,6 +173,13 @@ def __repr__(self):
         ),
     ),
 
+    dict(
+        id='utf-8',
+        setup_kwargs=dict(
+            description='Description accentuée',
+        )
+    ),
+
     dict(
         id='data',
         file_defs={
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 6e3df77ce4..f711f38bae 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -8,6 +8,7 @@
 import zipfile
 
 from pkg_resources import Distribution, PathMetadata, parse_version
+from pkg_resources.extern.six import PY3
 from setuptools import Distribution as SetuptoolsDistribution
 from setuptools import pep425tags
 from setuptools.command.egg_info import write_requirements
@@ -55,7 +56,7 @@ def install_as_egg(self, destination_eggdir):
             dist_data = '%s.data' % dist_basename
             def get_metadata(name):
                 with zf.open('%s/%s' % (dist_info, name)) as fp:
-                    value = fp.read().decode('utf-8')
+                    value = fp.read().decode('utf-8') if PY3 else fp.read()
                     return email.parser.Parser().parsestr(value)
             wheel_metadata = get_metadata('WHEEL')
             dist_metadata = get_metadata('METADATA')

From b066b29042daf7b60c40d116f823ac28943cfbad Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 26 Nov 2017 23:17:06 +0100
Subject: [PATCH 6869/8469] =?UTF-8?q?Bump=20version:=2038.2.0=20=E2=86=92?=
 =?UTF-8?q?=2038.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f00b544f9b..fd93d44d94 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.0
+current_version = 38.2.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 7b2c10010d..8662816557 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.0",
+    version="38.2.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From da1c78f354fac3ce177e2869828a34b3e6df1820 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 27 Nov 2017 13:25:04 +0100
Subject: [PATCH 6870/8469] fix namespace packages handling of wheels

---
 CHANGES.rst                    |  6 ++++++
 setuptools/tests/test_wheel.py | 32 ++++++++++++++++++++++++++++++++
 setuptools/wheel.py            | 18 ++++++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d5fd66a376..3886854a1c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.2.2
+-------
+
+* #1214: fix handling of namespace packages when installing
+  from a wheel.
+
 v38.2.1
 -------
 
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 2e857253d5..408c357612 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -412,6 +412,38 @@ def __repr__(self):
         ),
     ),
 
+    dict(
+        id='namespace_package',
+        file_defs={
+            'foo': {
+                'bar': {
+                    '__init__.py': ''
+                },
+            },
+        },
+        setup_kwargs=dict(
+            namespace_packages=['foo'],
+            packages=['foo.bar'],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- foo-1.0-py{py_version}-nspkg.pth
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- namespace_packages.txt
+            |  |-- top_level.txt
+            |-- foo/
+            |  |-- __init__.py
+            |  |-- bar/
+            |  |  |-- __init__.py
+            '''),
+    ),
+
 )
 
 @pytest.mark.parametrize(
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index f711f38bae..c23272133f 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -20,6 +20,13 @@
     )\.whl$""",
 re.VERBOSE).match
 
+NAMESPACE_PACKAGE_INIT = '''\
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    __path__ = __import__('pkgutil').extend_path(__path__, __name__)
+'''
+
 
 class Wheel(object):
 
@@ -124,3 +131,14 @@ def raw_req(req):
                 os.rmdir(subdir)
             if os.path.exists(dist_data):
                 os.rmdir(dist_data)
+            # Fix namespace packages.
+            namespace_packages = os.path.join(egg_info, 'namespace_packages.txt')
+            if os.path.exists(namespace_packages):
+                with open(namespace_packages) as fp:
+                    namespace_packages = fp.read().split()
+                for mod in namespace_packages:
+                    mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
+                    mod_init = os.path.join(mod_dir, '__init__.py')
+                    if os.path.exists(mod_dir) and not os.path.exists(mod_init):
+                        with open(mod_init, 'w') as fp:
+                            fp.write(NAMESPACE_PACKAGE_INIT)

From 13c068c24bf0cfe9fc0070e24fdde28e2be59fc9 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 27 Nov 2017 23:20:38 +0100
Subject: [PATCH 6871/8469] =?UTF-8?q?Bump=20version:=2038.2.1=20=E2=86=92?=
 =?UTF-8?q?=2038.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fd93d44d94..19b073eb76 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.1
+current_version = 38.2.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 8662816557..778fc5056d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.1",
+    version="38.2.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 54f245d390998b4815255702d54ab1e682004698 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 27 Nov 2017 23:35:25 +0100
Subject: [PATCH 6872/8469] tests: fix pytest requirement so Python 3.3 is
 supported

---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 38b6924712..9c8bcff722 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,5 +3,5 @@ mock
 pytest-flake8; python_version>="2.7"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
-pytest>=3.0.2
+pytest>=3.0.2,<=3.2.5
 wheel

From d77377ab40b7d833835793b62201a20ed67df4f5 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 28 Nov 2017 00:30:40 +0100
Subject: [PATCH 6873/8469] =?UTF-8?q?Bump=20version:=2038.2.2=20=E2=86=92?=
 =?UTF-8?q?=2038.2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 19b073eb76..b2e68c6f21 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.2
+current_version = 38.2.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 778fc5056d..61d2ceaaa4 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.2",
+    version="38.2.3",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From f7194b879e22a498a573d277fbcb3b9226412f89 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 28 Nov 2017 15:30:32 +0100
Subject: [PATCH 6874/8469] bpo-32155: Bugfixes found by flake8 F841 warnings
 (#4608)

* distutils.config: Use the PyPIRCCommand.realm attribute if set
* turtledemo: wait until macOS osascript command completes to not
  create a zombie process
* Tools/scripts/treesync.py: declare 'default_answer' and
  'create_files' as globals to modify them with the command line
  arguments. Previously, -y, -n, -f and -a options had no effect.

flake8 warning: "F841 local variable 'p' is assigned to but never
used".
---
 config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index bf8d8dd2f5..e66d103f7d 100644
--- a/config.py
+++ b/config.py
@@ -77,7 +77,7 @@ def _read_pypirc(self):
                     # optional params
                     for key, default in (('repository',
                                           self.DEFAULT_REPOSITORY),
-                                         ('realm', self.DEFAULT_REALM),
+                                         ('realm', realm),
                                          ('password', None)):
                         if config.has_option(server, key):
                             current[key] = config.get(server, key)
@@ -106,7 +106,7 @@ def _read_pypirc(self):
                         'password': config.get(server, 'password'),
                         'repository': repository,
                         'server': server,
-                        'realm': self.DEFAULT_REALM}
+                        'realm': realm}
 
         return {}
 

From 3c144a62210850ec965d8ebf81c0bad9558e18b0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 28 Nov 2017 23:19:26 +0100
Subject: [PATCH 6875/8469] bpo-32155: Revert distutils.config change (#4618)

Revert distutils changes of the commit
696b501cd11dc429a0f661adeb598bfaf89e4112 and remove the realm
variable.
---
 config.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config.py b/config.py
index e66d103f7d..2171abd696 100644
--- a/config.py
+++ b/config.py
@@ -51,7 +51,6 @@ def _read_pypirc(self):
         if os.path.exists(rc):
             self.announce('Using PyPI login from %s' % rc)
             repository = self.repository or self.DEFAULT_REPOSITORY
-            realm = self.realm or self.DEFAULT_REALM
 
             config = RawConfigParser()
             config.read(rc)
@@ -77,7 +76,7 @@ def _read_pypirc(self):
                     # optional params
                     for key, default in (('repository',
                                           self.DEFAULT_REPOSITORY),
-                                         ('realm', realm),
+                                         ('realm', self.DEFAULT_REALM),
                                          ('password', None)):
                         if config.has_option(server, key):
                             current[key] = config.get(server, key)
@@ -106,7 +105,7 @@ def _read_pypirc(self):
                         'password': config.get(server, 'password'),
                         'repository': repository,
                         'server': server,
-                        'realm': realm}
+                        'realm': self.DEFAULT_REALM}
 
         return {}
 

From b729553a6c6b92dfc7cfd9c577f2399bfde3000e Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 30 Nov 2017 14:59:03 +0100
Subject: [PATCH 6876/8469] update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3886854a1c..0cff779e00 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.2.3
+-------
+
+* fix Travis' Python 3.3 job.
+
 v38.2.2
 -------
 

From 35c0e9c2d67cbda4033ba0e0b1c20e4df8c24ce7 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 30 Nov 2017 19:46:16 +0100
Subject: [PATCH 6877/8469] fix `data_files` handling when installing from
 wheel

---
 setuptools/tests/test_wheel.py | 36 ++++++++++++++++++++++++++++++++++
 setuptools/wheel.py            | 27 +++++++++++++++++++++----
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 408c357612..b6be6f1f05 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -444,6 +444,42 @@ def __repr__(self):
             '''),
     ),
 
+    dict(
+        id='data_in_package',
+        file_defs={
+            'foo': {
+                '__init__.py': '',
+                'data_dir': {
+                    'data.txt': DALS(
+                        '''
+                        Some data...
+                        '''
+                    ),
+                }
+            }
+        },
+        setup_kwargs=dict(
+            packages=['foo'],
+            data_files=[('foo/data_dir', ['foo/data_dir/data.txt'])],
+        ),
+        install_tree=DALS(
+            '''
+            foo-1.0-py{py_version}.egg/
+            |-- EGG-INFO/
+            |  |-- DESCRIPTION.rst
+            |  |-- PKG-INFO
+            |  |-- RECORD
+            |  |-- WHEEL
+            |  |-- metadata.json
+            |  |-- top_level.txt
+            |-- foo/
+            |  |-- __init__.py
+            |  |-- data_dir/
+            |  |  |-- data.txt
+            '''
+        ),
+    ),
+
 )
 
 @pytest.mark.parametrize(
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index c23272133f..9ffe434ae3 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -28,6 +28,28 @@
 '''
 
 
+def unpack(src_dir, dst_dir):
+    '''Move everything under `src_dir` to `dst_dir`, and delete the former.'''
+    for dirpath, dirnames, filenames in os.walk(src_dir):
+        subdir = os.path.relpath(dirpath, src_dir)
+        for f in filenames:
+            src = os.path.join(dirpath, f)
+            dst = os.path.join(dst_dir, subdir, f)
+            os.renames(src, dst)
+        for n, d in reversed(list(enumerate(dirnames))):
+            src = os.path.join(dirpath, d)
+            dst = os.path.join(dst_dir, subdir, d)
+            if not os.path.exists(dst):
+                # Directory does not exist in destination,
+                # rename it and prune it from os.walk list.
+                os.renames(src, dst)
+                del dirnames[n]
+    # Cleanup.
+    for dirpath, dirnames, filenames in os.walk(src_dir, topdown=True):
+        assert not filenames
+        os.rmdir(dirpath)
+
+
 class Wheel(object):
 
     def __init__(self, filename):
@@ -125,10 +147,7 @@ def raw_req(req):
                 os.path.join(dist_data, d)
                 for d in ('data', 'headers', 'purelib', 'platlib')
             )):
-                for entry in os.listdir(subdir):
-                    os.rename(os.path.join(subdir, entry),
-                              os.path.join(destination_eggdir, entry))
-                os.rmdir(subdir)
+                unpack(subdir, destination_eggdir)
             if os.path.exists(dist_data):
                 os.rmdir(dist_data)
             # Fix namespace packages.

From e1946bc255e891ef1f8e399a2a2d30b197e89037 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 4 Dec 2017 18:01:09 +0100
Subject: [PATCH 6878/8469] update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 0cff779e00..3694b15272 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.2.4
+-------
+
+* #1220: Fix `data_files` handling when installing from wheel.
+
 v38.2.3
 -------
 

From e001996ab483c7c725e8894f560fb84c43150bcc Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 4 Dec 2017 18:14:16 +0100
Subject: [PATCH 6879/8469] =?UTF-8?q?Bump=20version:=2038.2.3=20=E2=86=92?=
 =?UTF-8?q?=2038.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b2e68c6f21..d6f1a195b5 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.3
+current_version = 38.2.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 61d2ceaaa4..0e3e42c536 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.3",
+    version="38.2.4",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From cba37f7ece298acceaa5506d24548f6ec039c9b3 Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nas-github@arctrix.com>
Date: Mon, 4 Dec 2017 18:58:12 -0800
Subject: [PATCH 6880/8469] bpo-19610: Warn if distutils is provided something
 other than a list to some fields (#4685)

* Rather than raise TypeError, warn and call list() on the value.

* Fix tests, revise NEWS and whatsnew text.

* Revise documentation, a string is okay as well.

* Ensure 'requires' and 'obsoletes' are real lists.

* Test that requires and obsoletes are turned to lists.
---
 dist.py            | 46 +++++++++++++++++++-------------------------
 tests/test_dist.py | 48 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/dist.py b/dist.py
index 78c29ede6c..6cf0a0d663 100644
--- a/dist.py
+++ b/dist.py
@@ -27,6 +27,20 @@
 command_re = re.compile(r'^[a-zA-Z]([a-zA-Z0-9_]*)$')
 
 
+def _ensure_list(value, fieldname):
+    if isinstance(value, str):
+        # a string containing comma separated values is okay.  It will
+        # be converted to a list by Distribution.finalize_options().
+        pass
+    elif not isinstance(value, list):
+        # passing a tuple or an iterator perhaps, warn and convert
+        typename = type(value).__name__
+        msg = f"Warning: '{fieldname}' should be a list, got type '{typename}'"
+        log.log(log.WARN, msg)
+        value = list(value)
+    return value
+
+
 class Distribution:
     """The core of the Distutils.  Most of the work hiding behind 'setup'
     is really done within a Distribution instance, which farms the work out
@@ -257,10 +271,7 @@ def __init__(self, attrs=None):
                     setattr(self, key, val)
                 else:
                     msg = "Unknown distribution option: %s" % repr(key)
-                    if warnings is not None:
-                        warnings.warn(msg)
-                    else:
-                        sys.stderr.write(msg + "\n")
+                    warnings.warn(msg)
 
         # no-user-cfg is handled before other command line args
         # because other args override the config files, and this
@@ -1189,36 +1200,19 @@ def get_keywords(self):
         return self.keywords or []
 
     def set_keywords(self, value):
-        # If 'keywords' is a string, it will be converted to a list
-        # by Distribution.finalize_options(). To maintain backwards
-        # compatibility, do not raise an exception if 'keywords' is
-        # a string.
-        if not isinstance(value, (list, str)):
-            msg = "'keywords' should be a 'list', not %r"
-            raise TypeError(msg % type(value).__name__)
-        self.keywords = value
+        self.keywords = _ensure_list(value, 'keywords')
 
     def get_platforms(self):
         return self.platforms or ["UNKNOWN"]
 
     def set_platforms(self, value):
-        # If 'platforms' is a string, it will be converted to a list
-        # by Distribution.finalize_options(). To maintain backwards
-        # compatibility, do not raise an exception if 'platforms' is
-        # a string.
-        if not isinstance(value, (list, str)):
-            msg = "'platforms' should be a 'list', not %r"
-            raise TypeError(msg % type(value).__name__)
-        self.platforms = value
+        self.platforms = _ensure_list(value, 'platforms')
 
     def get_classifiers(self):
         return self.classifiers or []
 
     def set_classifiers(self, value):
-        if not isinstance(value, list):
-            msg = "'classifiers' should be a 'list', not %r"
-            raise TypeError(msg % type(value).__name__)
-        self.classifiers = value
+        self.classifiers = _ensure_list(value, 'classifiers')
 
     def get_download_url(self):
         return self.download_url or "UNKNOWN"
@@ -1231,7 +1225,7 @@ def set_requires(self, value):
         import distutils.versionpredicate
         for v in value:
             distutils.versionpredicate.VersionPredicate(v)
-        self.requires = value
+        self.requires = list(value)
 
     def get_provides(self):
         return self.provides or []
@@ -1250,7 +1244,7 @@ def set_obsoletes(self, value):
         import distutils.versionpredicate
         for v in value:
             distutils.versionpredicate.VersionPredicate(v)
-        self.obsoletes = value
+        self.obsoletes = list(value)
 
 def fix_help_options(options):
     """Convert a 4-tuple 'help_options' list as found in various command
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 50b456ec94..0a19f0fb62 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -11,7 +11,9 @@
 from distutils.dist import Distribution, fix_help_options, DistributionMetadata
 from distutils.cmd import Command
 
-from test.support import TESTFN, captured_stdout, run_unittest
+from test.support import (
+     TESTFN, captured_stdout, captured_stderr, run_unittest
+)
 from distutils.tests import support
 from distutils import log
 
@@ -319,6 +321,13 @@ def test_requires_illegal(self):
                            "version": "1.0",
                            "requires": ["my.pkg (splat)"]})
 
+    def test_requires_to_list(self):
+        attrs = {"name": "package",
+                 "requires": iter(["other"])}
+        dist = Distribution(attrs)
+        self.assertIsInstance(dist.metadata.requires, list)
+
+
     def test_obsoletes(self):
         attrs = {"name": "package",
                  "version": "1.0",
@@ -341,6 +350,12 @@ def test_obsoletes_illegal(self):
                            "version": "1.0",
                            "obsoletes": ["my.pkg (splat)"]})
 
+    def test_obsoletes_to_list(self):
+        attrs = {"name": "package",
+                 "obsoletes": iter(["other"])}
+        dist = Distribution(attrs)
+        self.assertIsInstance(dist.metadata.obsoletes, list)
+
     def test_classifier(self):
         attrs = {'name': 'Boa', 'version': '3.0',
                  'classifiers': ['Programming Language :: Python :: 3']}
@@ -353,9 +368,14 @@ def test_classifier(self):
     def test_classifier_invalid_type(self):
         attrs = {'name': 'Boa', 'version': '3.0',
                  'classifiers': ('Programming Language :: Python :: 3',)}
-        msg = "'classifiers' should be a 'list', not 'tuple'"
-        with self.assertRaises(TypeError, msg=msg):
-            Distribution(attrs)
+        with captured_stderr() as error:
+            d = Distribution(attrs)
+        # should have warning about passing a non-list
+        self.assertIn('should be a list', error.getvalue())
+        # should be converted to a list
+        self.assertIsInstance(d.metadata.classifiers, list)
+        self.assertEqual(d.metadata.classifiers,
+                         list(attrs['classifiers']))
 
     def test_keywords(self):
         attrs = {'name': 'Monty', 'version': '1.0',
@@ -367,9 +387,13 @@ def test_keywords(self):
     def test_keywords_invalid_type(self):
         attrs = {'name': 'Monty', 'version': '1.0',
                  'keywords': ('spam', 'eggs', 'life of brian')}
-        msg = "'keywords' should be a 'list', not 'tuple'"
-        with self.assertRaises(TypeError, msg=msg):
-            Distribution(attrs)
+        with captured_stderr() as error:
+            d = Distribution(attrs)
+        # should have warning about passing a non-list
+        self.assertIn('should be a list', error.getvalue())
+        # should be converted to a list
+        self.assertIsInstance(d.metadata.keywords, list)
+        self.assertEqual(d.metadata.keywords, list(attrs['keywords']))
 
     def test_platforms(self):
         attrs = {'name': 'Monty', 'version': '1.0',
@@ -381,9 +405,13 @@ def test_platforms(self):
     def test_platforms_invalid_types(self):
         attrs = {'name': 'Monty', 'version': '1.0',
                  'platforms': ('GNU/Linux', 'Some Evil Platform')}
-        msg = "'platforms' should be a 'list', not 'tuple'"
-        with self.assertRaises(TypeError, msg=msg):
-            Distribution(attrs)
+        with captured_stderr() as error:
+            d = Distribution(attrs)
+        # should have warning about passing a non-list
+        self.assertIn('should be a list', error.getvalue())
+        # should be converted to a list
+        self.assertIsInstance(d.metadata.platforms, list)
+        self.assertEqual(d.metadata.platforms, list(attrs['platforms']))
 
     def test_download_url(self):
         attrs = {'name': 'Boa', 'version': '3.0',

From 7af7f8a68ea4b0f7d45a739273684832fa609935 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 5 Dec 2017 17:56:10 +0000
Subject: [PATCH 6881/8469] Document project_urls setup parameter

Add an entry to the Setuptools usage documentation for the
project_urls dict, and include it in the "advanced" project example.

While at it, adjust the dogfooding use in Setuptools' own setup.py
to use HTTPS for the Documentation URL and drop redundant entries
for Bug Tracker and Source Code.

Also remove a no-op attribute reassignment from egg_info.py.
---
 docs/setuptools.txt            | 10 ++++++++++
 setup.py                       |  4 +---
 setuptools/command/egg_info.py |  1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e3154b469b..bea8018195 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -145,6 +145,11 @@ dependencies, and perhaps some data files and scripts::
         license="PSF",
         keywords="hello world example examples",
         url="http://example.com/HelloWorld/",   # project home page, if any
+        project_urls={
+            "Bug Tracker": "https://bugs.example.com/HelloWorld/",
+            "Documentation": "https://docs.example.com/HelloWorld/",
+            "Source Code": "https://code.example.com/HelloWorld/",
+        }
 
         # could also include long_description, download_url, classifiers, etc.
     )
@@ -408,6 +413,11 @@ unless you need the associated ``setuptools`` feature.
     A list of modules to search for additional fixers to be used during
     the 2to3 conversion. See :doc:`python3` for more details.
 
+``project_urls``
+    An arbitrary map of URL names to hyperlinks, allowing more extensible
+    documentation of where various resources can be found than the simple
+    ``url`` and ``download_url`` options provide.
+
 
 Using ``find_packages()``
 -------------------------
diff --git a/setup.py b/setup.py
index 7a05c718a9..19239465b5 100755
--- a/setup.py
+++ b/setup.py
@@ -99,9 +99,7 @@ def pypi_link(pkg_filename):
     keywords="CPAN PyPI distutils eggs package management",
     url="https://github.com/pypa/setuptools",
     project_urls={
-        "Bug Tracker": "https://github.com/pypa/setuptools/issues",
-        "Documentation": "http://setuptools.readthedocs.io/",
-        "Source Code": "https://github.com/pypa/setuptools",
+        "Documentation": "https://setuptools.readthedocs.io/",
     },
     src_root=None,
     packages=setuptools.find_packages(exclude=['*.tests']),
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index c8b2bd173e..a1d41b27da 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -597,7 +597,6 @@ def write_pkg_info(cmd, basename, filename):
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
         metadata.name, oldname = cmd.egg_name, metadata.name
-        metadata.project_urls = cmd.distribution.metadata.project_urls
         metadata.long_description_content_type = getattr(
             cmd.distribution,
             'long_description_content_type'

From 8fe36a5710beb556a06d05f284e5ea49b4656624 Mon Sep 17 00:00:00 2001
From: Zoran Simic <zsimic@netflix.com>
Date: Sat, 9 Dec 2017 16:12:28 -0800
Subject: [PATCH 6882/8469] Removed warning when PYTHONDONTWRITEBYTECODE is
 enabled

---
 CHANGES.rst                        | 5 +++++
 setuptools/command/easy_install.py | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3694b15272..f9f1ea038b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.2.5
+-------
+
+* Removed warning when PYTHONDONTWRITEBYTECODE is enabled
+
 v38.2.4
 -------
 
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 12e223106c..b691e70268 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1248,7 +1248,6 @@ def pf(src, dst):
 
     def byte_compile(self, to_compile):
         if sys.dont_write_bytecode:
-            self.warn('byte-compiling is disabled, skipping.')
             return
 
         from distutils.util import byte_compile

From 66729ab597c6bfddd128159fe0a6d13e7f95ce83 Mon Sep 17 00:00:00 2001
From: Doug Greiman <dgreiman@google.com>
Date: Sun, 5 Nov 2017 05:43:18 -0800
Subject: [PATCH 6883/8469] Add testcase for
 pkg_resources.ZipProvider.resource_listdir

---
 pkg_resources/tests/test_pkg_resources.py | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index c6a7ac97e9..f2c00b297b 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -62,10 +62,21 @@ def setup_class(cls):
         zip_info.filename = 'data.dat'
         zip_info.date_time = cls.ref_time.timetuple()
         zip_egg.writestr(zip_info, 'hello, world!')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'subdir/mod2.py'
+        zip_info.date_time = cls.ref_time.timetuple()
+        zip_egg.writestr(zip_info, 'x = 6\n')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'subdir/data2.dat'
+        zip_info.date_time = cls.ref_time.timetuple()
+        zip_egg.writestr(zip_info, 'goodbye, world!')
         zip_egg.close()
         egg.close()
 
         sys.path.append(egg.name)
+        subdir = os.path.join(egg.name, 'subdir')
+        sys.path.append(subdir)
+        cls.finalizers.append(EggRemover(subdir))
         cls.finalizers.append(EggRemover(egg.name))
 
     @classmethod
@@ -73,6 +84,30 @@ def teardown_class(cls):
         for finalizer in cls.finalizers:
             finalizer()
 
+    def test_resource_listdir(self):
+        import mod
+        zp = pkg_resources.ZipProvider(mod)
+
+        expected_root = ['data.dat', 'mod.py', 'subdir']
+        assert sorted(zp.resource_listdir('')) == expected_root
+        assert sorted(zp.resource_listdir('/')) == expected_root
+
+        expected_subdir = ['data2.dat', 'mod2.py']
+        assert sorted(zp.resource_listdir('subdir')) == expected_subdir
+        assert sorted(zp.resource_listdir('subdir/')) == expected_subdir
+
+        assert zp.resource_listdir('nonexistent') == []
+        assert zp.resource_listdir('nonexistent/') == []
+
+        import mod2
+        zp2 = pkg_resources.ZipProvider(mod2)
+
+        assert sorted(zp2.resource_listdir('')) == expected_subdir
+        assert sorted(zp2.resource_listdir('/')) == expected_subdir
+
+        assert zp2.resource_listdir('subdir') == []
+        assert zp2.resource_listdir('subdir/') == []
+
     def test_resource_filename_rewrites_on_change(self):
         """
         If a previous call to get_resource_filename has saved the file, but

From 7b8b56fa28fc9ee4cd6e0156074505e3fef620e3 Mon Sep 17 00:00:00 2001
From: Doug Greiman <dgreiman@google.com>
Date: Sun, 5 Nov 2017 05:43:48 -0800
Subject: [PATCH 6884/8469] Fix trailing slash handling in
 pkg_resources.ZipProvider

Given a ZipProvider, if the underlying ZipImporter prefix is empty,
then resource_listdir('') and resource_listdir('subdir/') fail, while
resource_listdir('/') and resource_listdir('subdir') succeed.

On the other hand, if the underlying ZipImport prefix is not empty,
then resource_listdir('/') fails but resource_listdir('') succeeds.

With this change, the cases listed succeed with or without trailing
slashes.
---
 pkg_resources/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 73334641b5..ffaf7acae1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1693,6 +1693,10 @@ def __init__(self, module):
     def _zipinfo_name(self, fspath):
         # Convert a virtual filename (full path to file) into a zipfile subpath
         # usable with the zipimport directory cache for our target archive
+        while fspath.endswith(os.sep):
+            fspath = fspath[:-1]
+        if fspath == self.loader.archive:
+            return ''
         if fspath.startswith(self.zip_pre):
             return fspath[len(self.zip_pre):]
         raise AssertionError(

From b0138c4df9e3d287a5a2995be53746c9d0581725 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 14 Dec 2017 11:39:34 +0100
Subject: [PATCH 6885/8469] bpo-32302: Fix distutils bdist_wininst for CRT v142
 (#4851)

CRT v142 is binary compatible with CRT v140.
---
 command/bdist_wininst.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 6309c3e248..83f0073265 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -338,8 +338,8 @@ def get_exe_bytes(self):
                 bv = '14.0'
             else:
                 bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2])
-                if bv == '14.11':
-                    # v141 and v140 are binary compatible,
+                if bv in ('14.11', '14.12'):
+                    # v142, v141 and v140 are binary compatible,
                     # so keep using the 14.0 stub.
                     bv = '14.0'
 

From 8620a70b45ad4e7222c19ba89b2232821cd4aa70 Mon Sep 17 00:00:00 2001
From: Doug Greiman <dgreiman@google.com>
Date: Fri, 22 Dec 2017 14:51:36 -0800
Subject: [PATCH 6886/8469] Slightly simplify code via rstrip()

---
 pkg_resources/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ffaf7acae1..08f9bbe7ef 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1693,8 +1693,7 @@ def __init__(self, module):
     def _zipinfo_name(self, fspath):
         # Convert a virtual filename (full path to file) into a zipfile subpath
         # usable with the zipimport directory cache for our target archive
-        while fspath.endswith(os.sep):
-            fspath = fspath[:-1]
+        fspath = fspath.rstrip(os.sep)
         if fspath == self.loader.archive:
             return ''
         if fspath.startswith(self.zip_pre):

From 2bf0478092cd2768db510671b4d428d5386edb9b Mon Sep 17 00:00:00 2001
From: Doug Greiman <dgreiman@google.com>
Date: Fri, 22 Dec 2017 15:00:16 -0800
Subject: [PATCH 6887/8469] Update changelog.  Ref #1232

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3694b15272..7227b7fe7c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.2.5
+-------
+
+* #1232: Fix trailing slash handling in ``pkg_resources.ZipProvider``.
+
 v38.2.4
 -------
 

From 0d0baed8da468b2cedb9aa6caf60dc15fdeebd34 Mon Sep 17 00:00:00 2001
From: Doug Greiman <dgreiman@google.com>
Date: Fri, 22 Dec 2017 15:04:22 -0800
Subject: [PATCH 6888/8469] =?UTF-8?q?Bump=20version:=2038.2.4=20=E2=86=92?=
 =?UTF-8?q?=2038.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d6f1a195b5..0a33329c10 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.4
+current_version = 38.2.5
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0e3e42c536..af799e465a 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.4",
+    version="38.2.5",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 85747b8ccc2a2da7ecb59c6aff2561c052c463d2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jan 2018 20:37:37 -0500
Subject: [PATCH 6889/8469] Update changelog. Ref #1207.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7227b7fe7c..4189169716 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.2.6
+-------
+
+* #1207: Add support for ``long_description_type`` to setup.cfg
+  declarative config as intended and documented.
+
 v38.2.5
 -------
 

From 82c7b798928cf2f508585b33616f454ef0b21983 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jan 2018 20:46:17 -0500
Subject: [PATCH 6890/8469] Remove extraneous attribute copy, artifact of bad
 merge.

---
 setuptools/dist.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index fc5db5d174..c2bfdbc7c6 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -325,9 +325,6 @@ def __init__(self, attrs=None):
         self.dist_files = []
         self.src_root = attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
-        self.long_description_content_type = attrs.get(
-            'long_description_content_type'
-        )
         self.project_urls = attrs.get('project_urls', {})
         self.dependency_links = attrs.pop('dependency_links', [])
         self.setup_requires = attrs.pop('setup_requires', [])

From 239d0558998793d6a7ae8152963afe6df7460c18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jan 2018 20:48:04 -0500
Subject: [PATCH 6891/8469] Update changelog. Ref #1210.

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4189169716..5ae8ff9a59 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,7 @@
-v38.2.6
+v38.3.0
 -------
 
+* #1210: Add support for PEP 345 Project-URL metadata.
 * #1207: Add support for ``long_description_type`` to setup.cfg
   declarative config as intended and documented.
 

From 4ae5bc9e6fd52517fe31048b6570224fb9cbb70d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 4 Jan 2018 20:58:28 -0500
Subject: [PATCH 6892/8469] =?UTF-8?q?Bump=20version:=2038.2.5=20=E2=86=92?=
 =?UTF-8?q?=2038.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 0a33329c10..13b520a898 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.2.5
+current_version = 38.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ea0f94a86d..e2b5dc90a2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.2.5",
+    version="38.3.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 76dc0f8c3eedd585c81fed0da40cd8b698597bb2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jan 2018 08:16:44 -0500
Subject: [PATCH 6893/8469] On further consideration, behavior change is an 0.1
 bump. Ref #1231

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index df50fc8225..737cc0f866 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-v38.3.1
+v38.4.0
 -------
 
 * #1231: Removed warning when PYTHONDONTWRITEBYTECODE is enabled.

From 56bf1a9c12fd881fe6f69c3693cc426acf8012c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jan 2018 08:17:02 -0500
Subject: [PATCH 6894/8469] =?UTF-8?q?Bump=20version:=2038.3.0=20=E2=86=92?=
 =?UTF-8?q?=2038.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 13b520a898..8b0a754020 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.3.0
+current_version = 38.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index e2b5dc90a2..b5be0b529d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.3.0",
+    version="38.4.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From de000c41dbc110839c794337808ad98c1097b263 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Jan 2018 08:18:43 -0500
Subject: [PATCH 6895/8469] On Appveyor, omit the '1.0.' prefix on all builds.

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 9313a48207..8ecee10bdb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,3 +18,5 @@ test_script:
   - "python bootstrap.py"
   - "python -m pip install tox"
   - "tox"
+
+version: '{build}'

From 9a97c496dcd05e6b3d418903a3728daa790e29cc Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 19 Jan 2018 09:09:36 +1100
Subject: [PATCH 6896/8469] bpo-32588: Move _findvs into its own module and add
 missing _queue module to installer (#5227)

---
 _msvccompiler.py         | 4 ++--
 command/bdist_wininst.py | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index ef1356b97d..c9d3c6c671 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -56,7 +56,7 @@ def _find_vc2015():
     return best_version, best_dir
 
 def _find_vc2017():
-    import _findvs
+    import _distutils_findvs
     import threading
 
     best_version = 0,   # tuple for full version comparisons
@@ -66,7 +66,7 @@ def _find_vc2017():
     # initialize COM.
     all_packages = []
     def _getall():
-        all_packages.extend(_findvs.findall())
+        all_packages.extend(_distutils_findvs.findall())
     t = threading.Thread(target=_getall)
     t.start()
     t.join()
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 83f0073265..0871a4f7d6 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -337,11 +337,10 @@ def get_exe_bytes(self):
                 # cross-building, so assume the latest version
                 bv = '14.0'
             else:
-                bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2])
-                if bv in ('14.11', '14.12'):
-                    # v142, v141 and v140 are binary compatible,
-                    # so keep using the 14.0 stub.
-                    bv = '14.0'
+                # as far as we know, CRT is binary compatible based on
+                # the first field, so assume 'x.0' until proven otherwise
+                major = CRT_ASSEMBLY_VERSION.partition('.')[0]
+                bv = major + '.0'
 
 
         # wininst-x.y.exe is in the same directory as this file

From 618312bec376e5c71b0938a754106973d8889417 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Jan 2018 08:41:57 -0500
Subject: [PATCH 6897/8469] Refactor to short-circuit on dry-run

---
 setuptools/command/easy_install.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b691e70268..b7396b85e5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -828,14 +828,16 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
         target = os.path.join(self.script_dir, script_name)
         self.add_output(target)
 
-        mask = current_umask()
         if not self.dry_run:
-            ensure_directory(target)
-            if os.path.exists(target):
-                os.unlink(target)
-            with open(target, "w" + mode) as f:
-                f.write(contents)
-            chmod(target, 0o777 - mask)
+            return
+
+        mask = current_umask()
+        ensure_directory(target)
+        if os.path.exists(target):
+            os.unlink(target)
+        with open(target, "w" + mode) as f:
+            f.write(contents)
+        chmod(target, 0o777 - mask)
 
     def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them

From 5d5861adecc1b0cb57e6d0061016b4d0e68da629 Mon Sep 17 00:00:00 2001
From: Dylan Wilson <dylanjw@protonmail.com>
Date: Tue, 23 Jan 2018 15:11:14 -0800
Subject: [PATCH 6898/8469] Reflect find_packages behavior in doc

find_packages doesnt find PEP420 packages but
the documentation suggests that it does.

see: pypa/setuptools#97
---
 docs/setuptools.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bea8018195..cebb6268a7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -437,9 +437,9 @@ such projects also need something like ``package_dir={'':'src'}`` in their
 ``setup()`` arguments, but that's just a normal distutils thing.)
 
 Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
-patterns, and finds Python packages (any directory). On Python 3.2 and
-earlier, packages are only recognized if they include an ``__init__.py`` file.
-Finally, exclusion patterns are applied to remove matching packages.
+patterns, and finds Python packages (any directory). Packages are only
+recognized if they include an ``__init__.py`` file. Finally, exclusion 
+patterns are applied to remove matching packages.
 
 Inclusion and exclusion patterns are package names, optionally including
 wildcards.  For

From 4d38fb9841d25c6bd5779824a16975ed9ab421b2 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 25 Jan 2018 08:36:12 +0100
Subject: [PATCH 6899/8469] Fix dry-run handling

---
 setuptools/command/easy_install.py    |  2 +-
 setuptools/tests/test_easy_install.py | 45 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index b7396b85e5..a6f61436b7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -828,7 +828,7 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
         target = os.path.join(self.script_dir, script_name)
         self.add_output(target)
 
-        if not self.dry_run:
+        if self.dry_run:
             return
 
         mask = current_umask()
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 834710ef29..57339c8a12 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -183,6 +183,51 @@ def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         cmd.ensure_finalized()
         cmd.easy_install(sdist_unicode)
 
+    @pytest.fixture
+    def sdist_script(self, tmpdir):
+        files = [
+            (
+                'setup.py',
+                DALS("""
+                    import setuptools
+                    setuptools.setup(
+                        name="setuptools-test-script",
+                        version="1.0",
+                        scripts=["mypkg_script"],
+                    )
+                    """),
+            ),
+            (
+                u'mypkg_script',
+                DALS("""
+                     #/usr/bin/python
+                     print('mypkg_script')
+                     """),
+            ),
+        ]
+        sdist_name = 'setuptools-test-script-1.0.zip'
+        sdist = str(tmpdir / sdist_name)
+        make_sdist(sdist, files)
+        return sdist
+
+    @pytest.mark.skipif(not sys.platform.startswith('linux'),
+                        reason="Test can only be run on Linux")
+    def test_script_install(self, sdist_script, tmpdir, monkeypatch):
+        """
+        Check scripts are installed.
+        """
+        dist = Distribution({'script_args': ['easy_install']})
+        target = (tmpdir / 'target').ensure_dir()
+        cmd = ei.easy_install(
+            dist,
+            install_dir=str(target),
+            args=['x'],
+        )
+        monkeypatch.setitem(os.environ, 'PYTHONPATH', str(target))
+        cmd.ensure_finalized()
+        cmd.easy_install(sdist_script)
+        assert (target / 'mypkg_script').exists()
+
 
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):

From 7bf15cb3c8a29545cc4869a4a1c52ac678eba1da Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 25 Jan 2018 10:27:04 +0100
Subject: [PATCH 6900/8469] fix Python 3.7 support

- update scanning code to handle pyc header change
- handle change to `Exception.__repr__` output
---
 setuptools/command/bdist_egg.py  | 4 +++-
 setuptools/tests/test_sandbox.py | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 5fdb62d905..d222c20863 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -409,8 +409,10 @@ def scan_module(egg_dir, base, name, stubs):
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
     if sys.version_info < (3, 3):
         skip = 8  # skip magic & date
-    else:
+    elif sys.version_info < (3, 7):
         skip = 12  # skip magic & date & file size
+    else:
+        skip = 16 # skip magic & reserved? & date & file size
     f = open(filename, 'rb')
     f.read(skip)
     code = marshal.load(f)
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index a3f1206d5b..d867542229 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -75,6 +75,8 @@ def test_no_exception_passes_quietly(self):
     def test_unpickleable_exception(self):
         class CantPickleThis(Exception):
             "This Exception is unpickleable because it's not in globals"
+            def __repr__(self):
+                return 'CantPickleThis%r' % (self.args,)
 
         with setuptools.sandbox.ExceptionSaver() as saved_exc:
             raise CantPickleThis('detail')

From b3168e5e01e79300b17c1791eed97c4733fa7a49 Mon Sep 17 00:00:00 2001
From: Bo Bayles <bbayles@gmail.com>
Date: Thu, 25 Jan 2018 18:02:03 -0600
Subject: [PATCH 6901/8469] bpo-32304: Fix distutils upload for sdists ending
 with \x0d (GH-5264)

Patch by Bo Bayles.
---
 command/upload.py    |  2 --
 tests/test_upload.py | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 1fd574a9f1..f7752f9d12 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -159,8 +159,6 @@ def upload_file(self, command, pyversion, filename):
                 body.write(title.encode('utf-8'))
                 body.write(b"\r\n\r\n")
                 body.write(value)
-                if value and value[-1:] == b'\r':
-                    body.write(b'\n')  # write an extra newline (lurve Macs)
         body.write(end_boundary)
         body = body.getvalue()
 
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 2cb2f6ce93..c17d8e7d54 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -143,6 +143,32 @@ def test_upload(self):
         results = self.get_logs(INFO)
         self.assertEqual(results[-1], 75 * '-' + '\nxyzzy\n' + 75 * '-')
 
+    # bpo-32304: archives whose last byte was b'\r' were corrupted due to
+    # normalization intended for Mac OS 9.
+    def test_upload_correct_cr(self):
+        # content that ends with \r should not be modified.
+        tmp = self.mkdtemp()
+        path = os.path.join(tmp, 'xxx')
+        self.write_file(path, content='yy\r')
+        command, pyversion, filename = 'xxx', '2.6', path
+        dist_files = [(command, pyversion, filename)]
+        self.write_file(self.rc, PYPIRC_LONG_PASSWORD)
+
+        # other fields that ended with \r used to be modified, now are
+        # preserved.
+        pkg_dir, dist = self.create_dist(
+            dist_files=dist_files,
+            description='long description\r'
+        )
+        cmd = upload(dist)
+        cmd.show_response = 1
+        cmd.ensure_finalized()
+        cmd.run()
+
+        headers = dict(self.last_open.req.headers)
+        self.assertEqual(headers['Content-length'], '2172')
+        self.assertIn(b'long description\r', self.last_open.req.data)
+
     def test_upload_fails(self):
         self.next_msg = "Not Found"
         self.next_code = 404

From aa09100cbf3e0fef9606bc5f2afdd5cb2840427d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Feb 2018 09:25:37 -0500
Subject: [PATCH 6902/8469] Update changelog.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 737cc0f866..e784c2d39a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.4.1
+-------
+
+* #1257: In bdist_egg.scan_module, fix ValueError on Python 3.7.
+
 v38.4.0
 -------
 

From 676fbed14e74ea4578997b7b27aa5ca9ba2607f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Feb 2018 09:31:10 -0500
Subject: [PATCH 6903/8469] =?UTF-8?q?Bump=20version:=2038.4.0=20=E2=86=92?=
 =?UTF-8?q?=2038.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 8b0a754020..b40abfae78 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.4.0
+current_version = 38.4.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b5be0b529d..94db5a3774 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.4.0",
+    version="38.4.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From ca71bc26f65f1eac9f26b5e5b0d7b4109186fe59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Feb 2018 16:36:23 -0500
Subject: [PATCH 6904/8469] Import Cython.Compiler.Main as recommended by
 Cython project to improve Cython detection. Fixes #1229.

---
 CHANGES.rst                     | 6 ++++++
 setuptools/command/build_ext.py | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e784c2d39a..5a526e8a75 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.5.0
+-------
+
+* #1229: Expand imports in ``build_ext`` to refine detection of
+  Cython availability.
+
 v38.4.1
 -------
 
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 36f53f0dd4..ea97b37b2c 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -15,6 +15,9 @@
 try:
     # Attempt to use Cython for building extensions, if available
     from Cython.Distutils.build_ext import build_ext as _build_ext
+    # Additionally, assert that the compiler module will load
+    # also. Ref #1229.
+    __import__('Cython.Compiler.Main')
 except ImportError:
     _build_ext = _du_build_ext
 

From 038baa16016503708cf3bddcaf2f9b8d541c17bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Feb 2018 16:38:33 -0500
Subject: [PATCH 6905/8469] Prefer new_build_ext for Cython builds as
 recommended by Cython project. Fixes #1270.

---
 CHANGES.rst                     | 3 +++
 setuptools/command/build_ext.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5a526e8a75..ef0a8a8760 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ v38.5.0
 * #1229: Expand imports in ``build_ext`` to refine detection of
   Cython availability.
 
+* #1270: When Cython is available, ``build_ext`` now uses the
+  new_build_ext.
+
 v38.4.1
 -------
 
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index ea97b37b2c..01d65f5904 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -14,7 +14,7 @@
 
 try:
     # Attempt to use Cython for building extensions, if available
-    from Cython.Distutils.build_ext import build_ext as _build_ext
+    from Cython.Distutils.build_ext import new_build_ext as _build_ext
     # Additionally, assert that the compiler module will load
     # also. Ref #1229.
     __import__('Cython.Compiler.Main')

From 39459cfd652bf6c0073f52645607ffbc1c2aad89 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Feb 2018 17:37:30 -0500
Subject: [PATCH 6906/8469] Unpin pytest - not sure why it was pinned.

---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 9c8bcff722..38b6924712 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,5 +3,5 @@ mock
 pytest-flake8; python_version>="2.7"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
-pytest>=3.0.2,<=3.2.5
+pytest>=3.0.2
 wheel

From 317a6ba8f2a4de338f83eacab1bc2085b8ae0e0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Feb 2018 17:54:43 -0500
Subject: [PATCH 6907/8469] =?UTF-8?q?Bump=20version:=2038.4.1=20=E2=86=92?=
 =?UTF-8?q?=2038.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b40abfae78..69585181dc 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.4.1
+current_version = 38.5.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 94db5a3774..090cf00e23 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.4.1",
+    version="38.5.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From cfb0d71afd7d6cb026e35930b80b98e779f52c24 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 4 Feb 2018 17:55:15 -0500
Subject: [PATCH 6908/8469] Feed the hobgoblins (delint).

---
 setuptools/tests/test_virtualenv.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 9dbd3c86ed..eea11652a6 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -26,6 +26,7 @@ def bare_virtualenv():
 
 SOURCE_DIR = os.path.join(os.path.dirname(__file__), '../..')
 
+
 def test_clean_env_install(bare_virtualenv):
     """
     Check setuptools can be installed in a clean environment.
@@ -35,6 +36,7 @@ def test_clean_env_install(bare_virtualenv):
         'python setup.py install',
     )).format(source=SOURCE_DIR))
 
+
 def test_pip_upgrade_from_source(virtualenv):
     """
     Check pip can upgrade setuptools from source.
@@ -56,6 +58,7 @@ def test_pip_upgrade_from_source(virtualenv):
     # And finally try to upgrade from source.
     virtualenv.run('pip install --no-cache-dir --upgrade ' + sdist)
 
+
 def test_test_command_install_requirements(bare_virtualenv, tmpdir):
     """
     Check the test command will install all required dependencies.
@@ -64,6 +67,7 @@ def test_test_command_install_requirements(bare_virtualenv, tmpdir):
         'cd {source}',
         'python setup.py develop',
     )).format(source=SOURCE_DIR))
+
     def sdist(distname, version):
         dist_path = tmpdir.join('%s-%s.tar.gz' % (distname, version))
         make_nspkg_sdist(str(dist_path), distname, version)

From d916fa24c1eafb839ab18cc09c4c4350e183ab83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Feb 2018 10:29:14 -0500
Subject: [PATCH 6909/8469] Feed the hobgoblins (delint).

---
 setuptools/command/bdist_egg.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index d222c20863..423b818765 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -39,6 +39,7 @@ def strip_module(filename):
         filename = filename[:-6]
     return filename
 
+
 def sorted_walk(dir):
     """Do os.walk in a reproducible way,
     independent of indeterministic filesystem readdir order
@@ -48,6 +49,7 @@ def sorted_walk(dir):
         files.sort()
         yield base, dirs, files
 
+
 def write_stub(resource, pyfile):
     _stub_template = textwrap.dedent("""
         def __bootstrap__():
@@ -252,15 +254,17 @@ def zap_pyfiles(self):
 
                     pattern = r'(?P<name>.+)\.(?P<magic>[^.]+)\.pyc'
                     m = re.match(pattern, name)
-                    path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc')
-                    log.info("Renaming file from [%s] to [%s]" % (path_old, path_new))
+                    path_new = os.path.join(
+                        base, os.pardir, m.group('name') + '.pyc')
+                    log.info(
+                        "Renaming file from [%s] to [%s]"
+                        % (path_old, path_new))
                     try:
                         os.remove(path_new)
                     except OSError:
                         pass
                     os.rename(path_old, path_new)
 
-
     def zip_safe(self):
         safe = getattr(self.distribution, 'zip_safe', None)
         if safe is not None:
@@ -412,7 +416,7 @@ def scan_module(egg_dir, base, name, stubs):
     elif sys.version_info < (3, 7):
         skip = 12  # skip magic & date & file size
     else:
-        skip = 16 # skip magic & reserved? & date & file size
+        skip = 16  # skip magic & reserved? & date & file size
     f = open(filename, 'rb')
     f.read(skip)
     code = marshal.load(f)

From 211b194bee365b19aad10a487b20b48b17eb5c19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Feb 2018 05:46:57 -0500
Subject: [PATCH 6910/8469] Revert "Prefer new_build_ext for Cython builds as
 recommended by Cython project. Fixes #1270." Reopens #1270. Fixes #1271.

This reverts commit 038baa16016503708cf3bddcaf2f9b8d541c17bc.
---
 setuptools/command/build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 01d65f5904..ea97b37b2c 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -14,7 +14,7 @@
 
 try:
     # Attempt to use Cython for building extensions, if available
-    from Cython.Distutils.build_ext import new_build_ext as _build_ext
+    from Cython.Distutils.build_ext import build_ext as _build_ext
     # Additionally, assert that the compiler module will load
     # also. Ref #1229.
     __import__('Cython.Compiler.Main')

From 611ee7aab1df726030d18d6e22366877f29525ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Feb 2018 05:52:59 -0500
Subject: [PATCH 6911/8469] Update changelog. Ref #1271.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index ef0a8a8760..1b515f5533 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.5.1
+-------
+
+* #1271: Revert to Cython legacy ``build_ext`` behavior for
+  compatibility.
+
 v38.5.0
 -------
 

From b1c13f660d92fa5d707d2e1ec7acafe7d665d753 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Feb 2018 05:53:06 -0500
Subject: [PATCH 6912/8469] =?UTF-8?q?Bump=20version:=2038.5.0=20=E2=86=92?=
 =?UTF-8?q?=2038.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 69585181dc..2ad462d875 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.5.0
+current_version = 38.5.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 090cf00e23..a3123b57d5 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.5.0",
+    version="38.5.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 9a66194a12e486bbff7aabca67f59afa3a960768 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 13:33:53 -0500
Subject: [PATCH 6913/8469] Prefer implied tuple.

---
 setuptools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index a70794a42e..8eddcae88a 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -109,7 +109,7 @@ def parse_configuration(
         distribution, command_options, ignore_option_errors)
     options.parse()
 
-    return [meta, options]
+    return meta, options
 
 
 class ConfigHandler(object):

From 2efa19d215f2a7698c266363894c3184eb72129a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 21:39:12 -0500
Subject: [PATCH 6914/8469] Delint

---
 pkg_resources/__init__.py | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 08f9bbe7ef..d60f08bb65 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -90,6 +90,21 @@
 # satisfy the linters.
 require = None
 working_set = None
+add_activation_listener = None
+resources_stream = None
+cleanup_resources = None
+resource_dir = None
+resource_stream = None
+set_extraction_path = None
+resource_isdir = None
+resource_string = None
+iter_entry_points = None
+resource_listdir = None
+resource_filename = None
+resource_exists = None
+_distribution_finders = None
+_namespace_handlers = None
+_namespace_packages = None
 
 
 class PEP440Warning(RuntimeWarning):
@@ -1074,9 +1089,12 @@ def can_add(self, dist):
         requirements specified when this environment was created, or False
         is returned.
         """
-        return (self.python is None or dist.py_version is None
-            or dist.py_version == self.python) \
-            and compatible_platforms(dist.platform, self.platform)
+        py_compat = (
+            self.python is None
+            or dist.py_version is None
+            or dist.py_version == self.python
+        )
+        return py_compat and compatible_platforms(dist.platform, self.platform)
 
     def remove(self, dist):
         """Remove `dist` from the environment"""
@@ -1621,11 +1639,16 @@ def _register(cls):
 class EmptyProvider(NullProvider):
     """Provider that returns nothing for all requests"""
 
-    _isdir = _has = lambda self, path: False
-    _get = lambda self, path: ''
-    _listdir = lambda self, path: []
     module_path = None
 
+    _isdir = _has = lambda self, path: False
+
+    def _get(self, path):
+        return ''
+
+    def _listdir(self, path):
+        return []
+
     def __init__(self):
         pass
 
@@ -2515,7 +2538,8 @@ def _version_from_file(lines):
     Given an iterable of lines from a Metadata file, return
     the value of the Version field, if present, or None otherwise.
     """
-    is_version_line = lambda line: line.lower().startswith('version:')
+    def is_version_line(line):
+        return line.lower().startswith('version:')
     version_lines = filter(is_version_line, lines)
     line = next(iter(version_lines), '')
     _, _, value = line.partition(':')

From dc071a330c51804e9749e6d08370b048b785eadc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 22:42:16 -0500
Subject: [PATCH 6915/8469] Add a comment

---
 pkg_resources/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d60f08bb65..0854756041 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2676,6 +2676,10 @@ def version(self):
 
     @property
     def _dep_map(self):
+        """
+        A map of extra to its list of (direct) requirements
+        for this distribution, including the null extra.
+        """
         try:
             return self.__dep_map
         except AttributeError:

From 872cab1085f7dd763daed76124d5bcb4457d733e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 22:46:44 -0500
Subject: [PATCH 6916/8469] Extract method for _build_dep_map

---
 pkg_resources/__init__.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0854756041..cecf769123 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2683,20 +2683,24 @@ def _dep_map(self):
         try:
             return self.__dep_map
         except AttributeError:
-            dm = self.__dep_map = {None: []}
-            for name in 'requires.txt', 'depends.txt':
-                for extra, reqs in split_sections(self._get_metadata(name)):
-                    if extra:
-                        if ':' in extra:
-                            extra, marker = extra.split(':', 1)
-                            if invalid_marker(marker):
-                                # XXX warn
-                                reqs = []
-                            elif not evaluate_marker(marker):
-                                reqs = []
-                        extra = safe_extra(extra) or None
-                    dm.setdefault(extra, []).extend(parse_requirements(reqs))
-            return dm
+            self.__dep_map = self._build_dep_map()
+        return self.__dep_map
+
+    def _build_dep_map(self):
+        dm = {None: []}
+        for name in 'requires.txt', 'depends.txt':
+            for extra, reqs in split_sections(self._get_metadata(name)):
+                if extra:
+                    if ':' in extra:
+                        extra, marker = extra.split(':', 1)
+                        if invalid_marker(marker):
+                            # XXX warn
+                            reqs = []
+                        elif not evaluate_marker(marker):
+                            reqs = []
+                    extra = safe_extra(extra) or None
+                dm.setdefault(extra, []).extend(parse_requirements(reqs))
+        return dm
 
     def requires(self, extras=()):
         """List of Requirements needed for this distro if `extras` are used"""

From 1bbafd871d1ea4419636ef0066af8afebf6f5d52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 22:51:34 -0500
Subject: [PATCH 6917/8469] Remove redundant initialization

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index cecf769123..af65c24997 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2687,7 +2687,7 @@ def _dep_map(self):
         return self.__dep_map
 
     def _build_dep_map(self):
-        dm = {None: []}
+        dm = {}
         for name in 'requires.txt', 'depends.txt':
             for extra, reqs in split_sections(self._get_metadata(name)):
                 if extra:

From 7d34b2d75fa19fa689fd3033a28fc53562ee6a98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 23:16:43 -0500
Subject: [PATCH 6918/8469] Extract method for filtering extras

---
 pkg_resources/__init__.py | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index af65c24997..7635a90168 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2683,22 +2683,36 @@ def _dep_map(self):
         try:
             return self.__dep_map
         except AttributeError:
-            self.__dep_map = self._build_dep_map()
+            self.__dep_map = self._filter_extras(self._build_dep_map())
         return self.__dep_map
 
+    @staticmethod
+    def _filter_extras(dm):
+        """
+        Given a mapping of extras to dependencies, strip off
+        environment markers and filter out any dependencies
+        not matching the markers.
+        """
+        for extra in list(dm):
+            if extra:
+                new_extra = extra
+                reqs = dm.pop(extra)
+                if ':' in extra:
+                    new_extra, marker = extra.split(':', 1)
+                    if invalid_marker(marker):
+                        # XXX warn
+                        reqs = []
+                    elif not evaluate_marker(marker):
+                        reqs = []
+                new_extra = safe_extra(new_extra) or None
+
+                dm.setdefault(new_extra, []).extend(reqs)
+        return dm
+
     def _build_dep_map(self):
         dm = {}
         for name in 'requires.txt', 'depends.txt':
             for extra, reqs in split_sections(self._get_metadata(name)):
-                if extra:
-                    if ':' in extra:
-                        extra, marker = extra.split(':', 1)
-                        if invalid_marker(marker):
-                            # XXX warn
-                            reqs = []
-                        elif not evaluate_marker(marker):
-                            reqs = []
-                    extra = safe_extra(extra) or None
                 dm.setdefault(extra, []).extend(parse_requirements(reqs))
         return dm
 

From ae9709b31450cdff1c5d00aefcb2ad0d11999f12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 23:40:27 -0500
Subject: [PATCH 6919/8469] Use filter

---
 pkg_resources/__init__.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7635a90168..c32de48908 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2693,20 +2693,19 @@ def _filter_extras(dm):
         environment markers and filter out any dependencies
         not matching the markers.
         """
-        for extra in list(dm):
-            if extra:
-                new_extra = extra
-                reqs = dm.pop(extra)
-                if ':' in extra:
-                    new_extra, marker = extra.split(':', 1)
-                    if invalid_marker(marker):
-                        # XXX warn
-                        reqs = []
-                    elif not evaluate_marker(marker):
-                        reqs = []
-                new_extra = safe_extra(new_extra) or None
-
-                dm.setdefault(new_extra, []).extend(reqs)
+        for extra in list(filter(None, dm)):
+            new_extra = extra
+            reqs = dm.pop(extra)
+            if ':' in extra:
+                new_extra, marker = extra.split(':', 1)
+                if invalid_marker(marker):
+                    # XXX warn
+                    reqs = []
+                elif not evaluate_marker(marker):
+                    reqs = []
+            new_extra = safe_extra(new_extra) or None
+
+            dm.setdefault(new_extra, []).extend(reqs)
         return dm
 
     def _build_dep_map(self):

From cdf2cc4a521d05ad76aa96cb37504cdb9f824c2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 23:41:05 -0500
Subject: [PATCH 6920/8469] Use partition

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

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c32de48908..1d8d88c8ab 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2696,8 +2696,8 @@ def _filter_extras(dm):
         for extra in list(filter(None, dm)):
             new_extra = extra
             reqs = dm.pop(extra)
-            if ':' in extra:
-                new_extra, marker = extra.split(':', 1)
+            new_extra, _, marker = extra.partition(':')
+            if marker:
                 if invalid_marker(marker):
                     # XXX warn
                     reqs = []

From 271dee89e1ec9740c008f1938aa896616e164ede Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 10 Feb 2018 23:51:45 -0500
Subject: [PATCH 6921/8469] Perform marker calculation in one step

---
 pkg_resources/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 1d8d88c8ab..062b82c639 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2697,12 +2697,12 @@ def _filter_extras(dm):
             new_extra = extra
             reqs = dm.pop(extra)
             new_extra, _, marker = extra.partition(':')
-            if marker:
-                if invalid_marker(marker):
-                    # XXX warn
-                    reqs = []
-                elif not evaluate_marker(marker):
-                    reqs = []
+            fails_marker = marker and (
+                invalid_marker(marker)
+                or not evaluate_marker(marker)
+            )
+            if fails_marker:
+                reqs = []
             new_extra = safe_extra(new_extra) or None
 
             dm.setdefault(new_extra, []).extend(reqs)

From f59e08fa002c62b8a9a36eed4e068d471585e565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Sun, 18 Feb 2018 18:14:54 -0500
Subject: [PATCH 6922/8469] Improve error message for "setup.py upload" without
 dist files (#21060)

---
 command/upload.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/upload.py b/command/upload.py
index f7752f9d12..32dda359ba 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -57,7 +57,8 @@ def finalize_options(self):
 
     def run(self):
         if not self.distribution.dist_files:
-            msg = "No dist file created in earlier command"
+            msg = ("Must create and upload files in one command "
+                   "(e.g. setup.py sdist upload)")
             raise DistutilsOptionError(msg)
         for command, pyversion, filename in self.distribution.dist_files:
             self.upload_file(command, pyversion, filename)

From 885402d3ffb3d77dca661487038aa88aaaa483cc Mon Sep 17 00:00:00 2001
From: Vincent Philippon <sindaewoh@gmail.com>
Date: Mon, 19 Feb 2018 18:28:00 -0500
Subject: [PATCH 6923/8469] Fix documentation inconsistency on version
 specifier

The `,` is the equivalent of an "and".
Also, the pkg_resources section documents and behave like this too:

```
>>> pkg_resources.Requirement('requests>1,>2').specifier.contains('1.2.3')
False
>>> pkg_resources.Requirement('requests>1,>2').specifier.contains('2.3.4')
True
```
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index cebb6268a7..2425e100ee 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -571,7 +571,7 @@ project name or version identifier must be replaced with ``-``.
 Version specifiers for a given project are internally sorted into ascending
 version order, and used to establish what ranges of versions are acceptable.
 Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
-``">1"``, and ``"<2,<3"`` becomes ``"<3"``). ``"!="`` versions are excised from
+``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
 the ranges they fall within.  A project's version is then checked for
 membership in the resulting ranges. (Note that providing conflicting conditions
 for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may

From 0d99729166cc722bc86a1284141f45ab34bca793 Mon Sep 17 00:00:00 2001
From: Vincent Philippon <sindaewoh@gmail.com>
Date: Mon, 19 Feb 2018 18:37:19 -0500
Subject: [PATCH 6924/8469] Fix documentation spacing error causing wrong
 formatting.

---
 docs/pkg_resources.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 8d337cb297..b40a209fe4 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -638,7 +638,7 @@ Requirements Parsing
     sorted into ascending version order, and used to establish what ranges of
     versions are acceptable.  Adjacent redundant conditions are effectively
     consolidated (e.g. ``">1, >2"`` produces the same results as ``">2"``, and
-    ``"<2,<3"`` produces the same results as``"<2"``). ``"!="`` versions are
+    ``"<2,<3"`` produces the same results as ``"<2"``). ``"!="`` versions are
     excised from the ranges they fall within.  The version being tested for
     acceptability is then checked for membership in the resulting ranges.
 

From d2d76256e1b19fe58d23d14891208d076873f07b Mon Sep 17 00:00:00 2001
From: Thijs Triemstra <info@collab.nl>
Date: Tue, 20 Feb 2018 03:46:39 +0100
Subject: [PATCH 6925/8469] enable pip cache in appveyor build

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 8ecee10bdb..7c61455ce6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,6 +14,9 @@ install:
 
 build: off
 
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
 test_script:
   - "python bootstrap.py"
   - "python -m pip install tox"

From 5da3a845683ded446cad8af009d3ab9f264a944f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 20 Feb 2018 20:45:22 -0500
Subject: [PATCH 6926/8469] Remove reference to bitbucket mirror. Fixes #1280.

---
 docs/developer-guide.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 8a1363808e..b2c1a0cefd 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -82,9 +82,6 @@ branches or multiple forks to maintain separate efforts.
 The Continuous Integration tests that validate every release are run
 from this repository.
 
-For posterity, the old `Bitbucket mirror
-<https://bitbucket.org/pypa/setuptools>`_ is available.
-
 -------
 Testing
 -------

From 0a6264dc11a7c692f2444825da2bf91078dcb118 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Mar 2018 15:59:28 -0500
Subject: [PATCH 6927/8469] Prevent StopIteration from bubbling up in
 parse_requirements. Fixes #1285.

---
 CHANGES.rst               | 6 ++++++
 pkg_resources/__init__.py | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 1b515f5533..e518b19949 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.5.2
+-------
+
+* #1285: Fixed RuntimeError in pkg_resources.parse_requirements
+  on Python 3.7 (stemming from PEP 479).
+
 v38.5.1
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 062b82c639..c9b2d251d9 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3035,7 +3035,10 @@ def parse_requirements(strs):
         # If there is a line continuation, drop it, and append the next line.
         if line.endswith('\\'):
             line = line[:-2].strip()
-            line += next(lines)
+            try:
+                line += next(lines)
+            except StopIteration:
+                return
         yield Requirement(line)
 
 

From e4da2275b57335c5ea2574b728c926eeefe6875c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Mar 2018 17:01:48 -0500
Subject: [PATCH 6928/8469] Skip tests in test_virtualenv if the prefix is
 broken on that virtualenv. Ref #1284.

---
 setuptools/tests/test_virtualenv.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index eea11652a6..b66a311d73 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -2,6 +2,7 @@
 import os
 import sys
 
+import pytest
 from pytest import yield_fixture
 from pytest_fixture_config import yield_requires_config
 
@@ -11,6 +12,20 @@
 from .test_easy_install import make_nspkg_sdist
 
 
+@pytest.fixture(autouse=True)
+def pytest_virtualenv_works(virtualenv):
+    """
+    pytest_virtualenv may not work. if it doesn't, skip these
+    tests. See #1284.
+    """
+    venv_prefix = virtualenv.run(
+        'python -c "import sys; print(sys.prefix)"',
+        capture=True,
+    ).strip()
+    if venv_prefix == sys.prefix:
+        pytest.skip("virtualenv is broken (see pypa/setuptools#1284)")
+
+
 @yield_requires_config(pytest_virtualenv.CONFIG, ['virtualenv_executable'])
 @yield_fixture(scope='function')
 def bare_virtualenv():

From 39f29d6e0efd6a1e688cd057fb29877648061893 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Mar 2018 17:03:28 -0500
Subject: [PATCH 6929/8469] Include tox-venv to bring venv from the future.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1fd73aa51e..a8494c03a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ cache: pip
 
 install:
 # need tox to get started
-- pip install tox
+- pip install tox tox-venv
 
 # Output the env, to verify behavior
 - env

From 5ff527aa357195997a4fbe6d04661a2f187b165f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 5 Mar 2018 17:12:27 -0500
Subject: [PATCH 6930/8469] Exclude tox-venv on Python 3.3, where it fails.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a8494c03a9..ffbd72a3d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ cache: pip
 
 install:
 # need tox to get started
-- pip install tox tox-venv
+- pip install tox 'tox-venv; python_version!="3.3"'
 
 # Output the env, to verify behavior
 - env

From c9ecd46f7b8a2a70a2fdf0535caf582602341042 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Mar 2018 12:08:46 -0500
Subject: [PATCH 6931/8469] =?UTF-8?q?Bump=20version:=2038.5.1=20=E2=86=92?=
 =?UTF-8?q?=2038.5.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2ad462d875..37dbe5ec97 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.5.1
+current_version = 38.5.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a3123b57d5..0e438d9a0e 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.5.1",
+    version="38.5.2",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e065e9012612f3e0b8713fd61d298126f7fcfa21 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Mar 2018 12:24:12 -0500
Subject: [PATCH 6932/8469] Feed the hobgoblins (delint).

---
 pkg_resources/__init__.py                     |  2 +-
 .../tests/test_find_distributions.py          |  1 +
 pkg_resources/tests/test_pkg_resources.py     |  6 ++-
 pkg_resources/tests/test_resources.py         | 41 +++++++++++++------
 pkg_resources/tests/test_working_set.py       | 10 +++--
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c9b2d251d9..92272f20c6 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1307,7 +1307,7 @@ def get_cache_path(self, archive_name, names=()):
         target_path = os.path.join(extract_path, archive_name + '-tmp', *names)
         try:
             _bypass_ensure_directory(target_path)
-        except:
+        except Exception:
             self.extraction_error()
 
         self._warn_unsafe_extraction_path(extract_path)
diff --git a/pkg_resources/tests/test_find_distributions.py b/pkg_resources/tests/test_find_distributions.py
index 97999b3354..d735c5902f 100644
--- a/pkg_resources/tests/test_find_distributions.py
+++ b/pkg_resources/tests/test_find_distributions.py
@@ -13,6 +13,7 @@
 )
 """.lstrip()
 
+
 class TestFindDistributions:
 
     @pytest.fixture
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index f2c00b297b..7442b79f74 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -154,8 +154,10 @@ def test_setuptools_not_imported(self):
         lines = (
             'import pkg_resources',
             'import sys',
-            'assert "setuptools" not in sys.modules, '
-                '"setuptools was imported"',
+            (
+                'assert "setuptools" not in sys.modules, '
+                '"setuptools was imported"'
+            ),
         )
         cmd = [sys.executable, '-c', '; '.join(lines)]
         subprocess.check_call(cmd)
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index dcd2f42c17..05438219bf 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -11,7 +11,8 @@
 from pkg_resources.extern import packaging
 
 import pkg_resources
-from pkg_resources import (parse_requirements, VersionConflict, parse_version,
+from pkg_resources import (
+    parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
     WorkingSet)
 
@@ -51,7 +52,8 @@ def testCollection(self):
         assert list(ad) == ['foopkg']
 
         # Distributions sort by version
-        assert [dist.version for dist in ad['FooPkg']] == ['1.4', '1.3-1', '1.2']
+        expected = ['1.4', '1.3-1', '1.2']
+        assert [dist.version for dist in ad['FooPkg']] == expected
 
         # Removing a distribution leaves sequence alone
         ad.remove(ad['FooPkg'][1])
@@ -97,7 +99,10 @@ def checkFooPkg(self, d):
     def testDistroBasics(self):
         d = Distribution(
             "/some/path",
-            project_name="FooPkg", version="1.3-1", py_version="2.4", platform="win32"
+            project_name="FooPkg",
+            version="1.3-1",
+            py_version="2.4",
+            platform="win32",
         )
         self.checkFooPkg(d)
 
@@ -113,10 +118,11 @@ def testDistroParse(self):
 
     def testDistroMetadata(self):
         d = Distribution(
-            "/some/path", project_name="FooPkg", py_version="2.4", platform="win32",
+            "/some/path", project_name="FooPkg",
+            py_version="2.4", platform="win32",
             metadata=Metadata(
                 ('PKG-INFO', "Metadata-Version: 1.0\nVersion: 1.3-1\n")
-            )
+            ),
         )
         self.checkFooPkg(d)
 
@@ -164,7 +170,10 @@ def testResolve(self):
         ad.add(Baz)
 
         # Activation list now includes resolved dependency
-        assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) == [Foo, Baz]
+        assert (
+            list(ws.resolve(parse_requirements("Foo[bar]"), ad))
+            == [Foo, Baz]
+        )
         # Requests for conflicting versions produce VersionConflict
         with pytest.raises(VersionConflict) as vc:
             ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad)
@@ -415,7 +424,8 @@ def checkSubMap(self, m):
 
     submap_expect = dict(
         feature1=EntryPoint('feature1', 'somemodule', ['somefunction']),
-        feature2=EntryPoint('feature2', 'another.module', ['SomeClass'], ['extra1', 'extra2']),
+        feature2=EntryPoint(
+            'feature2', 'another.module', ['SomeClass'], ['extra1', 'extra2']),
         feature3=EntryPoint('feature3', 'this.module', extras=['something'])
     )
     submap_str = """
@@ -518,11 +528,17 @@ def testSetuptoolsProjectName(self):
             Requirement.parse('setuptools').project_name == 'setuptools')
         # setuptools 0.7 and higher means setuptools.
         assert (
-            Requirement.parse('setuptools == 0.7').project_name == 'setuptools')
+            Requirement.parse('setuptools == 0.7').project_name
+            == 'setuptools'
+        )
         assert (
-            Requirement.parse('setuptools == 0.7a1').project_name == 'setuptools')
+            Requirement.parse('setuptools == 0.7a1').project_name
+            == 'setuptools'
+        )
         assert (
-            Requirement.parse('setuptools >= 0.7').project_name == 'setuptools')
+            Requirement.parse('setuptools >= 0.7').project_name
+            == 'setuptools'
+        )
 
 
 class TestParsing:
@@ -552,7 +568,7 @@ def testSplitting(self):
                     """
         assert (
             list(pkg_resources.split_sections(sample))
-                ==
+            ==
             [
                 (None, ["x"]),
                 ("Y", ["z", "a"]),
@@ -838,7 +854,8 @@ def test_path_order(self, symlinked_tmpdir):
             subpkg = nspkg / 'subpkg'
             subpkg.ensure_dir()
             (nspkg / '__init__.py').write_text(self.ns_str, encoding='utf-8')
-            (subpkg / '__init__.py').write_text(vers_str % number, encoding='utf-8')
+            (subpkg / '__init__.py').write_text(
+                vers_str % number, encoding='utf-8')
 
         import nspkg.subpkg
         import nspkg
diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
index 422a7283e9..42ddcc86f2 100644
--- a/pkg_resources/tests/test_working_set.py
+++ b/pkg_resources/tests/test_working_set.py
@@ -1,6 +1,7 @@
 import inspect
 import re
 import textwrap
+import functools
 
 import pytest
 
@@ -15,6 +16,7 @@ def strip_comments(s):
         if l.strip() and not l.strip().startswith('#')
     )
 
+
 def parse_distributions(s):
     '''
     Parse a series of distribution specs of the form:
@@ -31,7 +33,8 @@ def parse_distributions(s):
 
     yield 2 distributions:
         - project_name=foo, version=0.2
-        - project_name=bar, version=1.0, requires=['foo>=3.0', 'baz; extra=="feature"']
+        - project_name=bar, version=1.0,
+          requires=['foo>=3.0', 'baz; extra=="feature"']
     '''
     s = s.strip()
     for spec in re.split('\n(?=[^\s])', s):
@@ -42,7 +45,7 @@ def parse_distributions(s):
         name, version = fields.pop(0).split('-')
         if fields:
             requires = textwrap.dedent(fields.pop(0))
-            metadata=Metadata(('requires.txt', requires))
+            metadata = Metadata(('requires.txt', requires))
         else:
             metadata = None
         dist = pkg_resources.Distribution(project_name=name,
@@ -467,7 +470,8 @@ def test_working_set_resolve(installed_dists, installable_dists, requirements,
                              replace_conflicting, resolved_dists_or_exception):
     ws = pkg_resources.WorkingSet([])
     list(map(ws.add, installed_dists))
-    resolve_call = lambda: ws.resolve(
+    resolve_call = functools.partial(
+        ws.resolve,
         requirements, installer=FakeInstaller(installable_dists),
         replace_conflicting=replace_conflicting,
     )

From f4464151c2fbd3f684ce00fadfc0e0c27097e2df Mon Sep 17 00:00:00 2001
From: David Pugh <david.pugh@mclaren.com>
Date: Thu, 8 Mar 2018 13:36:11 +0000
Subject: [PATCH 6933/8469] Updated package_data documentation

---
 docs/setuptools.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2425e100ee..ce20c548fe 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -885,6 +885,14 @@ Also notice that if you use paths, you *must* use a forward slash (``/``) as
 the path separator, even if you are on Windows.  Setuptools automatically
 converts slashes to appropriate platform-specific separators at build time.
 
+If datafiles are contained in a subdirectory of a package that isn't a package
+itself (no ``__init__.py``) then the subdirectory names (or ``*``) are required
+in the ``package_data`` argument (as shown above with ``'data/*.dat'``).
+
+When building an ``sdist`` the datafiles are also drawn from the
+``package_name.egg-info/SOURCES.txt`` file so make sure that this is removed if
+the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
+
 (Note: although the ``package_data`` argument was previously only available in
 ``setuptools``, it was also added to the Python ``distutils`` package as of
 Python 2.4; there is `some documentation for the feature`__ available on the
@@ -926,7 +934,7 @@ In summary, the three options allow you to:
     Accept all data files and directories matched by ``MANIFEST.in``.
 
 ``package_data``
-    Specify additional patterns to match files and directories that may or may
+    Specify additional patterns to match files that may or may
     not be matched by ``MANIFEST.in`` or found in source control.
 
 ``exclude_package_data``

From cb39b3f2e4eed76a2cae7ae8f68489067be5f978 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Mar 2018 16:34:08 -0500
Subject: [PATCH 6934/8469] Add some commas.

---
 docs/setuptools.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index ce20c548fe..65080a0b21 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -886,11 +886,11 @@ the path separator, even if you are on Windows.  Setuptools automatically
 converts slashes to appropriate platform-specific separators at build time.
 
 If datafiles are contained in a subdirectory of a package that isn't a package
-itself (no ``__init__.py``) then the subdirectory names (or ``*``) are required
+itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
 in the ``package_data`` argument (as shown above with ``'data/*.dat'``).
 
-When building an ``sdist`` the datafiles are also drawn from the
-``package_name.egg-info/SOURCES.txt`` file so make sure that this is removed if
+When building an ``sdist``, the datafiles are also drawn from the
+``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
 the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
 
 (Note: although the ``package_data`` argument was previously only available in

From b2ea3c4a20d008622caec445f5b6916ddd420d16 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 5 Mar 2018 21:57:06 -0600
Subject: [PATCH 6935/8469] Updates for PEP 566 (Metadata 2.1)

---
 setuptools/dist.py                | 27 +++++++++++++++++++++++----
 setuptools/tests/test_config.py   |  1 +
 setuptools/tests/test_egg_info.py | 19 +++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c2bfdbc7c6..33ceb40426 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -46,6 +46,8 @@ def write_pkg_file(self, file):
     # Setuptools specific for PEP 345
     if hasattr(self, 'python_requires') or self.project_urls:
         version = '1.2'
+    if self.long_description_content_type or self.provides_extras:
+        version = '2.1'
 
     file.write('Metadata-Version: %s\n' % version)
     file.write('Name: %s\n' % self.get_name())
@@ -60,10 +62,6 @@ def write_pkg_file(self, file):
     for project_url in self.project_urls.items():
         file.write('Project-URL: %s, %s\n' % project_url)
 
-    long_desc_content_type = \
-        self.long_description_content_type or 'UNKNOWN'
-    file.write('Description-Content-Type: %s\n' % long_desc_content_type)
-
     long_desc = rfc822_escape(self.get_long_description())
     file.write('Description: %s\n' % long_desc)
 
@@ -83,6 +81,16 @@ def write_pkg_file(self, file):
     if hasattr(self, 'python_requires'):
         file.write('Requires-Python: %s\n' % self.python_requires)
 
+    # PEP 566
+    if self.long_description_content_type:
+        file.write(
+            'Description-Content-Type: %s\n' %
+            self.long_description_content_type
+        )
+    if self.provides_extras:
+        for extra in self.provides_extras:
+            file.write('Provides-Extra: %s\n' % extra)
+
 
 # from Python 3.4
 def write_pkg_info(self, base_dir):
@@ -339,6 +347,9 @@ def __init__(self, attrs=None):
         self.metadata.long_description_content_type = attrs.get(
             'long_description_content_type'
         )
+        self.metadata.provides_extras = getattr(
+            self.metadata, 'provides_extras', set()
+        )
 
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
@@ -372,6 +383,14 @@ def _finalize_requires(self):
         """
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
+
+        if getattr(self, 'extras_require', None):
+            for extra in self.extras_require.keys():
+                # Since this gets called multiple times at points where the
+                # keys have become 'converted' extras, ensure that we are only
+                # truly adding extras we haven't seen before here.
+                self.metadata.provides_extras.add(extra.split(':')[0])
+
         self._convert_extras_requirements()
         self._move_install_requirements_markers()
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 383e0d3071..abb953a8fa 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -546,6 +546,7 @@ def test_extras_require(self, tmpdir):
                 'pdf': ['ReportLab>=1.2', 'RXP'],
                 'rest': ['docutils>=0.3', 'pack==1.1,==1.3']
             }
+            assert dist.metadata.provides_extras == set(['pdf', 'rest'])
 
     def test_entry_points(self, tmpdir):
         _, config = fake_env(
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 7d12434e1f..ff5fa0a30b 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -420,6 +420,24 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
             self._run_install_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
+    def test_provides_extra(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            'extras_require={"foobar": ["barbazquux"]},')
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        code, data = environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        assert 'Provides-Extra: foobar' in pkg_info_lines
+        assert 'Metadata-Version: 2.1' in pkg_info_lines
+
     def test_long_description_content_type(self, tmpdir_cwd, env):
         # Test that specifying a `long_description_content_type` keyword arg to
         # the `setup` function results in writing a `Description-Content-Type`
@@ -444,6 +462,7 @@ def test_long_description_content_type(self, tmpdir_cwd, env):
             pkg_info_lines = pkginfo_file.read().split('\n')
         expected_line = 'Description-Content-Type: text/markdown'
         assert expected_line in pkg_info_lines
+        assert 'Metadata-Version: 2.1' in pkg_info_lines
 
     def test_project_urls(self, tmpdir_cwd, env):
         # Test that specifying a `project_urls` dict to the `setup`

From bb85f40858438be88d22fe1fc35aa6c62cabe80a Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Thu, 15 Mar 2018 15:55:23 -0500
Subject: [PATCH 6936/8469] Add changelog entry

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index e518b19949..ccac3d35ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.5.3
+-------
+
+* Support Metadata 2.1 (`PEP 566 <https://www.python.org/dev/peps/pep-0566/>`_)
+
 v38.5.2
 -------
 

From fe97cb5453c22e63784dd1e24baaac902cc950fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Mar 2018 18:39:54 -0400
Subject: [PATCH 6937/8469] Update CHANGES.rst

---
 CHANGES.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index ccac3d35ef..7c3a46c675 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
-v38.5.3
+v38.6.0
 -------
 
-* Support Metadata 2.1 (`PEP 566 <https://www.python.org/dev/peps/pep-0566/>`_)
+* #1286: Add support for Metadata 2.1 (PEP 566).
 
 v38.5.2
 -------

From 16187afb3f532199f4951801d4e39939c560facc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 15 Mar 2018 18:40:35 -0400
Subject: [PATCH 6938/8469] =?UTF-8?q?Bump=20version:=2038.5.2=20=E2=86=92?=
 =?UTF-8?q?=2038.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 37dbe5ec97..560b724ba0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.5.2
+current_version = 38.6.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 0e438d9a0e..ff064e3381 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.5.2",
+    version="38.6.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From 9e554095b4e987371f7929902d12278b4e2ad91e Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Fri, 16 Mar 2018 01:14:19 -0500
Subject: [PATCH 6939/8469] provide a failing test case for regression
 introduced in b2ea3c4a - spurious "Provides-Extra:" generated in metadata

---
 setuptools/tests/test_egg_info.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index ff5fa0a30b..d221167152 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -438,6 +438,23 @@ def test_provides_extra(self, tmpdir_cwd, env):
         assert 'Provides-Extra: foobar' in pkg_info_lines
         assert 'Metadata-Version: 2.1' in pkg_info_lines
 
+    def test_doesnt_provides_extra(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            '''install_requires=["spam ; python_version<'3.3'"]''')
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_text = pkginfo_file.read()
+        assert 'Provides-Extra:' not in pkg_info_text
+
     def test_long_description_content_type(self, tmpdir_cwd, env):
         # Test that specifying a `long_description_content_type` keyword arg to
         # the `setup` function results in writing a `Description-Content-Type`

From 696afcad2d750f55c66ffc2a504fa2ebed1b6a59 Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Fri, 16 Mar 2018 01:17:06 -0500
Subject: [PATCH 6940/8469] fix for regression - spurious "Provides-Extra:"
 generated in metadata

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 33ceb40426..38ab4044b0 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -89,7 +89,8 @@ def write_pkg_file(self, file):
         )
     if self.provides_extras:
         for extra in self.provides_extras:
-            file.write('Provides-Extra: %s\n' % extra)
+            if extra:
+                file.write('Provides-Extra: %s\n' % extra)
 
 
 # from Python 3.4

From 1fffc0eff9892c7c9bc3b177dd3483a41e85e40e Mon Sep 17 00:00:00 2001
From: wim glenn <wim.glenn@gmail.com>
Date: Fri, 16 Mar 2018 14:27:42 -0500
Subject: [PATCH 6941/8469] address review comments and squash the empty string
 extra earlier

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 38ab4044b0..d24958daae 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -89,8 +89,7 @@ def write_pkg_file(self, file):
         )
     if self.provides_extras:
         for extra in self.provides_extras:
-            if extra:
-                file.write('Provides-Extra: %s\n' % extra)
+            file.write('Provides-Extra: %s\n' % extra)
 
 
 # from Python 3.4
@@ -390,7 +389,9 @@ def _finalize_requires(self):
                 # Since this gets called multiple times at points where the
                 # keys have become 'converted' extras, ensure that we are only
                 # truly adding extras we haven't seen before here.
-                self.metadata.provides_extras.add(extra.split(':')[0])
+                extra = extra.split(':')[0]
+                if extra:
+                    self.metadata.provides_extras.add(extra)
 
         self._convert_extras_requirements()
         self._move_install_requirements_markers()

From d8170d79a1059b6c58e1b54d94c6600f85354bf6 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 16 Mar 2018 18:23:24 -0400
Subject: [PATCH 6942/8469] Add support for maintainer in PKG-INFO

Per PEP 345, metadata Version 1.2 should support the Author,
Maintainer, Author-Email and Maintainer-Email fields.
---
 setuptools/dist.py            | 48 +++++++++++++++------
 setuptools/tests/test_dist.py | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 33ceb40426..a6928c4984 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,6 +14,7 @@
     DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
 )
 from distutils.util import rfc822_escape
+from distutils.version import StrictVersion
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map, filter, filterfalse
@@ -34,28 +35,46 @@ def _get_unpatched(cls):
     warnings.warn("Do not call this function", DeprecationWarning)
     return get_unpatched(cls)
 
+def get_metadata_version(dist_md):
+    if dist_md.long_description_content_type or dist_md.provides_extras:
+        return StrictVersion('2.1')
+    elif getattr(dist_md, 'python_requires', None) is not None:
+        return StrictVersion('1.2')
+    elif (dist_md.provides or dist_md.requires or dist_md.obsoletes or
+            dist_md.classifiers or dist_md.download_url):
+        return StrictVersion('1.1')
+
+    return StrictVersion('1.0')
+
 
 # Based on Python 3.5 version
 def write_pkg_file(self, file):
     """Write the PKG-INFO format data to a file object.
     """
-    version = '1.0'
-    if (self.provides or self.requires or self.obsoletes or
-            self.classifiers or self.download_url):
-        version = '1.1'
-    # Setuptools specific for PEP 345
-    if hasattr(self, 'python_requires') or self.project_urls:
-        version = '1.2'
-    if self.long_description_content_type or self.provides_extras:
-        version = '2.1'
+    version = get_metadata_version(self)
 
     file.write('Metadata-Version: %s\n' % version)
     file.write('Name: %s\n' % self.get_name())
     file.write('Version: %s\n' % self.get_version())
     file.write('Summary: %s\n' % self.get_description())
     file.write('Home-page: %s\n' % self.get_url())
-    file.write('Author: %s\n' % self.get_contact())
-    file.write('Author-email: %s\n' % self.get_contact_email())
+
+    if version == '1.2':
+        file.write('Author: %s\n' % self.get_contact())
+        file.write('Author-email: %s\n' % self.get_contact_email())
+    else:
+        optional_fields = (
+            ('Author', 'author'),
+            ('Author-email', 'author_email'),
+            ('Maintainer', 'maintainer'),
+            ('Maintainer-email', 'maintainer_email'),
+        )
+
+        for field, attr in optional_fields:
+            attr_val = getattr(self, attr)
+            if attr_val is not None:
+                file.write('%s: %s\n' % (field, attr_val))
+
     file.write('License: %s\n' % self.get_license())
     if self.download_url:
         file.write('Download-URL: %s\n' % self.download_url)
@@ -69,7 +88,12 @@ def write_pkg_file(self, file):
     if keywords:
         file.write('Keywords: %s\n' % keywords)
 
-    self._write_list(file, 'Platform', self.get_platforms())
+    if version == '1.2':
+        for platform in self.get_platforms():
+            file.write('Platform: %s\n' % platform)
+    else:
+        self._write_list(file, 'Platform', self.get_platforms())
+
     self._write_list(file, 'Classifier', self.get_classifiers())
 
     # PEP 314
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index c4c9bd0388..0c10f05bc1 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -1,10 +1,13 @@
+# -*- coding: utf-8 -*-
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
+from setuptools.extern.six import StringIO
 
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
 
+import pytest
 
 def test_dist_fetch_build_egg(tmpdir):
     """
@@ -45,3 +48,78 @@ def sdist_with_index(distname, version):
             for r in reqs
         ]
     assert [dist.key for dist in resolved_dists if dist] == reqs
+
+
+def __maintainer_test_cases():
+    attrs = {"name": "package",
+             "version": "1.0",
+             "description": "xxx"}
+
+    def merge_dicts(d1, d2):
+        d1 = d1.copy()
+        d1.update(d2)
+
+        return d1
+
+    test_cases = [
+        ('No author, no maintainer', attrs.copy()),
+        ('Author (no e-mail), no maintainer', merge_dicts(attrs,
+            {'author': 'Author Name'})),
+        ('Author (e-mail), no maintainer', merge_dicts(attrs,
+            {'author': 'Author Name',
+             'author_email': 'author@name.com'})),
+        ('No author, maintainer (no e-mail)', merge_dicts(attrs,
+            {'maintainer': 'Maintainer Name'})),
+        ('No author, maintainer (e-mail)', merge_dicts(attrs,
+            {'maintainer': 'Maintainer Name',
+             'maintainer_email': 'maintainer@name.com'})),
+        ('Author (no e-mail), Maintainer (no-email)', merge_dicts(attrs,
+            {'author': 'Author Name',
+             'maintainer': 'Maintainer Name'})),
+        ('Author (e-mail), Maintainer (e-mail)', merge_dicts(attrs,
+            {'author': 'Author Name',
+             'author_email': 'author@name.com',
+             'maintainer': 'Maintainer Name',
+             'maintainer_email': 'maintainer@name.com'})),
+        ('No author (e-mail), no maintainer (e-mail)', merge_dicts(attrs,
+            {'author_email': 'author@name.com',
+             'maintainer_email': 'maintainer@name.com'})),
+        ('Author unicode', merge_dicts(attrs,
+            {'author': '鉄沢寛'})),
+        ('Maintainer unicode', merge_dicts(attrs,
+            {'maintainer': 'Jan �ukasiewicz'})),
+    ]
+
+    return test_cases
+
+@pytest.mark.parametrize('name,attrs', __maintainer_test_cases())
+def test_maintainer_author(name, attrs):
+    tested_keys = {
+        'author': 'Author',
+        'author_email': 'Author-email',
+        'maintainer': 'Maintainer',
+        'maintainer_email': 'Maintainer-email',
+    }
+
+    # Generate a PKG-INFO file
+    dist = Distribution(attrs)
+    PKG_INFO = StringIO()
+    dist.metadata.write_pkg_file(PKG_INFO)
+    PKG_INFO.seek(0)
+
+    pkg_lines = PKG_INFO.readlines()
+    pkg_lines = [_ for _ in pkg_lines if _]   # Drop blank lines
+    pkg_lines_set = set(pkg_lines)
+
+    # Duplicate lines should not be generated
+    assert len(pkg_lines) == len(pkg_lines_set)
+
+    for fkey, dkey in tested_keys.items():
+        val = attrs.get(dkey, None)
+        if val is None:
+            for line in pkg_lines:
+                assert not line.startswith(fkey + ':')
+        else:
+            line = '%s: %s' % (fkey, val)
+            assert line in pkg_lines_set
+

From 604e0852c6020904419f9be37b2bec2c3c3b3779 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 10:27:41 -0400
Subject: [PATCH 6943/8469] Update changelog. Ref #1293.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c3a46c675..01fb448ccf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v38.6.1
+-------
+
+* #1292: Avoid generating ``Provides-Extra`` in metadata when
+  no extra is present (but environment markers are).
+
 v38.6.0
 -------
 

From 025690980c3540dc170abec3a3b18fd11f8b15bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 10:27:46 -0400
Subject: [PATCH 6944/8469] =?UTF-8?q?Bump=20version:=2038.6.0=20=E2=86=92?=
 =?UTF-8?q?=2038.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 560b724ba0..5a9a875ced 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.6.0
+current_version = 38.6.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ff064e3381..a59ba44b91 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.6.0",
+    version="38.6.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e2de3b60da1408bd9dd19910e67a9660f3dbbf1b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 10:31:16 -0400
Subject: [PATCH 6945/8469] Update changelog.

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 01fb448ccf..cabddaf661 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v38.7.0
+-------
+
+* #1288: Add support for maintainer in PKG-INFO.
+
 v38.6.1
 -------
 

From fc45e788f6c470ec983e3e1cbeb6054ffbb9fd56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 10:32:30 -0400
Subject: [PATCH 6946/8469] =?UTF-8?q?Bump=20version:=2038.6.1=20=E2=86=92?=
 =?UTF-8?q?=2038.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5a9a875ced..1d8dd5ad4e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.6.1
+current_version = 38.7.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a59ba44b91..c25ade00c2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.6.1",
+    version="38.7.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

From e141c08edc47834b04eb0fd7c1510ee04b682921 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 11:38:32 -0400
Subject: [PATCH 6947/8469] Use six for splituser

---
 setuptools/package_index.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ad7433078e..64a11c9b0a 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -9,11 +9,6 @@
 import itertools
 from functools import wraps
 
-try:
-    from urllib.parse import splituser
-except ImportError:
-    from urllib2 import splituser
-
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
@@ -857,7 +852,7 @@ def _download_svn(self, url, filename):
             scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/', 1)
-                auth, host = splituser(netloc)
+                auth, host = urllib.parse.splituser(netloc)
                 if auth:
                     if ':' in auth:
                         user, pw = auth.split(':', 1)
@@ -1064,7 +1059,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         raise http_client.InvalidURL("nonnumeric port: ''")
 
     if scheme in ('http', 'https'):
-        auth, host = splituser(netloc)
+        auth, host = urllib.parse.splituser(netloc)
     else:
         auth = None
 

From 6fba91c17b264beec674bb25019e3888fe5ba305 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 11:53:22 -0400
Subject: [PATCH 6948/8469] Rely on stdlib to decode entities.

---
 setuptools/package_index.py | 17 ++---------------
 setuptools/py33compat.py    |  9 +++++++++
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 64a11c9b0a..914b5e6159 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -23,6 +23,7 @@
 from distutils.errors import DistutilsError
 from fnmatch import translate
 from setuptools.py27compat import get_all_headers
+from setuptools.py33compat import unescape
 from setuptools.wheel import Wheel
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
@@ -931,23 +932,9 @@ def warn(self, msg, *args):
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
 
 
-def uchr(c):
-    if not isinstance(c, int):
-        return c
-    if c > 255:
-        return six.unichr(c)
-    return chr(c)
-
-
 def decode_entity(match):
     what = match.group(1)
-    if what.startswith('#x'):
-        what = int(what[2:], 16)
-    elif what.startswith('#'):
-        what = int(what[1:])
-    else:
-        what = six.moves.html_entities.name2codepoint.get(what, match.group(0))
-    return uchr(what)
+    return unescape(what)
 
 
 def htmldecode(text):
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index af64d5d1e2..2a73ebb3c7 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -2,7 +2,13 @@
 import array
 import collections
 
+try:
+    import html
+except ImportError:
+    html = None
+
 from setuptools.extern import six
+from setuptools.extern.six.moves import html_parser
 
 
 OpArg = collections.namedtuple('OpArg', 'opcode arg')
@@ -43,3 +49,6 @@ def __iter__(self):
 
 
 Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)
+
+
+unescape = getattr(html, 'unescape', html_parser.HTMLParser().unescape)

From d97e55a10ecc0d9934de275722b8664827a21f5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 12:43:57 -0400
Subject: [PATCH 6949/8469] Extract version comparisons as pytest parameters.

---
 pkg_resources/tests/test_resources.py | 135 ++++++++++----------------
 1 file changed, 51 insertions(+), 84 deletions(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 05438219bf..05f35adef2 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -4,6 +4,7 @@
 import sys
 import string
 import platform
+import itertools
 
 from pkg_resources.extern.six.moves import map
 
@@ -17,6 +18,14 @@
     WorkingSet)
 
 
+# from Python 3.6 docs.
+def pairwise(iterable):
+    "s -> (s0,s1), (s1,s2), (s2, s3), ..."
+    a, b = itertools.tee(iterable)
+    next(b, None)
+    return zip(a, b)
+
+
 class Metadata(pkg_resources.EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 
@@ -650,95 +659,53 @@ def test_spaces_between_multiple_versions(self):
         req, = parse_requirements('foo>=1.0, <3')
         req, = parse_requirements('foo >= 1.0, < 3')
 
-    def testVersionEquality(self):
-        def c(s1, s2):
-            p1, p2 = parse_version(s1), parse_version(s2)
-            assert p1 == p2, (s1, s2, p1, p2)
-
-        c('1.2-rc1', '1.2rc1')
-        c('0.4', '0.4.0')
-        c('0.4.0.0', '0.4.0')
-        c('0.4.0-0', '0.4-0')
-        c('0post1', '0.0post1')
-        c('0pre1', '0.0c1')
-        c('0.0.0preview1', '0c1')
-        c('0.0c1', '0-rc1')
-        c('1.2a1', '1.2.a.1')
-        c('1.2.a', '1.2a')
-
-    def testVersionOrdering(self):
-        def c(s1, s2):
-            p1, p2 = parse_version(s1), parse_version(s2)
-            assert p1 < p2, (s1, s2, p1, p2)
-
-        c('2.1', '2.1.1')
-        c('2a1', '2b0')
-        c('2a1', '2.1')
-        c('2.3a1', '2.3')
-        c('2.1-1', '2.1-2')
-        c('2.1-1', '2.1.1')
-        c('2.1', '2.1post4')
-        c('2.1a0-20040501', '2.1')
-        c('1.1', '02.1')
-        c('3.2', '3.2.post0')
-        c('3.2post1', '3.2post2')
-        c('0.4', '4.0')
-        c('0.0.4', '0.4.0')
-        c('0post1', '0.4post1')
-        c('2.1.0-rc1', '2.1.0')
-        c('2.1dev', '2.1a0')
-
-        torture = """
+    @pytest.mark.parametrize(
+        ['lower', 'upper'],
+        [
+            ('1.2-rc1', '1.2rc1'),
+            ('0.4', '0.4.0'),
+            ('0.4.0.0', '0.4.0'),
+            ('0.4.0-0', '0.4-0'),
+            ('0post1', '0.0post1'),
+            ('0pre1', '0.0c1'),
+            ('0.0.0preview1', '0c1'),
+            ('0.0c1', '0-rc1'),
+            ('1.2a1', '1.2.a.1'),
+            ('1.2.a', '1.2a'),
+        ],
+    )
+    def testVersionEquality(self, lower, upper):
+        assert parse_version(lower) == parse_version(upper)
+
+    torture = """
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1
         0.79.9999+0.80.0pre2-3 0.79.9999+0.80.0pre2-2
         0.77.2-1 0.77.1-1 0.77.0-1
-        """.split()
-
-        for p, v1 in enumerate(torture):
-            for v2 in torture[p + 1:]:
-                c(v2, v1)
-
-    def testVersionBuildout(self):
-        """
-        Buildout has a function in it's bootstrap.py that inspected the return
-        value of parse_version. The new parse_version returns a Version class
-        which needs to support this behavior, at least for now.
-        """
-
-        def buildout(parsed_version):
-            _final_parts = '*final-', '*final'
-
-            def _final_version(parsed_version):
-                for part in parsed_version:
-                    if (part[:1] == '*') and (part not in _final_parts):
-                        return False
-                return True
-
-            return _final_version(parsed_version)
-
-        assert buildout(parse_version("1.0"))
-        assert not buildout(parse_version("1.0a1"))
-
-    def testVersionIndexable(self):
         """
-        Some projects were doing things like parse_version("v")[0], so we'll
-        support indexing the same as we support iterating.
-        """
-        assert parse_version("1.0")[0] == "00000001"
 
-    def testVersionTupleSort(self):
-        """
-        Some projects expected to be able to sort tuples against the return
-        value of parse_version. So again we'll add a warning enabled shim to
-        make this possible.
-        """
-        assert parse_version("1.0") < tuple(parse_version("2.0"))
-        assert parse_version("1.0") <= tuple(parse_version("2.0"))
-        assert parse_version("1.0") == tuple(parse_version("1.0"))
-        assert parse_version("3.0") > tuple(parse_version("2.0"))
-        assert parse_version("3.0") >= tuple(parse_version("2.0"))
-        assert parse_version("3.0") != tuple(parse_version("2.0"))
-        assert not (parse_version("3.0") != tuple(parse_version("3.0")))
+    @pytest.mark.parametrize(
+        ['lower', 'upper'],
+        [
+            ('2.1', '2.1.1'),
+            ('2a1', '2b0'),
+            ('2a1', '2.1'),
+            ('2.3a1', '2.3'),
+            ('2.1-1', '2.1-2'),
+            ('2.1-1', '2.1.1'),
+            ('2.1', '2.1post4'),
+            ('2.1a0-20040501', '2.1'),
+            ('1.1', '02.1'),
+            ('3.2', '3.2.post0'),
+            ('3.2post1', '3.2post2'),
+            ('0.4', '4.0'),
+            ('0.0.4', '0.4.0'),
+            ('0post1', '0.4post1'),
+            ('2.1.0-rc1', '2.1.0'),
+            ('2.1dev', '2.1a0'),
+        ] + list(pairwise(reversed(torture.split()))),
+    )
+    def testVersionOrdering(self, lower, upper):
+        assert parse_version(lower) < parse_version(upper)
 
     def testVersionHashable(self):
         """

From eeeb9b27fa48fccf2b5d52919eff1c75c4ad1718 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 13:16:11 -0400
Subject: [PATCH 6950/8469] Remove SetuptoolsVersion and
 SetuptoolsLegacyVersion. Ref #296.

---
 CHANGES.rst               |  10 ++++
 pkg_resources/__init__.py | 111 +-------------------------------------
 2 files changed, 12 insertions(+), 109 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cabddaf661..93eca56d8f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v39.0.0
+-------
+
+* #296: Removed long-deprecated support for iteration on
+  Version objects as returned by ``pkg_resources.parse_version``.
+  Removed the ``SetuptoolsVersion`` and
+  ``SetuptoolsLegacyVersion`` names as well. They should not
+  have been used, but if they were, replace with
+  ``Version`` and ``LegacyVersion`` from ``packaging.version``.
+
 v38.7.0
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 92272f20c6..8d95bd2912 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -114,118 +114,11 @@ class PEP440Warning(RuntimeWarning):
     """
 
 
-class _SetuptoolsVersionMixin(object):
-    def __hash__(self):
-        return super(_SetuptoolsVersionMixin, self).__hash__()
-
-    def __lt__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) < other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__lt__(other)
-
-    def __le__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) <= other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__le__(other)
-
-    def __eq__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) == other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__eq__(other)
-
-    def __ge__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) >= other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__ge__(other)
-
-    def __gt__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) > other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__gt__(other)
-
-    def __ne__(self, other):
-        if isinstance(other, tuple):
-            return tuple(self) != other
-        else:
-            return super(_SetuptoolsVersionMixin, self).__ne__(other)
-
-    def __getitem__(self, key):
-        return tuple(self)[key]
-
-    def __iter__(self):
-        component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
-        replace = {
-            'pre': 'c',
-            'preview': 'c',
-            '-': 'final-',
-            'rc': 'c',
-            'dev': '@',
-        }.get
-
-        def _parse_version_parts(s):
-            for part in component_re.split(s):
-                part = replace(part, part)
-                if not part or part == '.':
-                    continue
-                if part[:1] in '0123456789':
-                    # pad for numeric comparison
-                    yield part.zfill(8)
-                else:
-                    yield '*' + part
-
-            # ensure that alpha/beta/candidate are before final
-            yield '*final'
-
-        def old_parse_version(s):
-            parts = []
-            for part in _parse_version_parts(s.lower()):
-                if part.startswith('*'):
-                    # remove '-' before a prerelease tag
-                    if part < '*final':
-                        while parts and parts[-1] == '*final-':
-                            parts.pop()
-                    # remove trailing zeros from each series of numeric parts
-                    while parts and parts[-1] == '00000000':
-                        parts.pop()
-                parts.append(part)
-            return tuple(parts)
-
-        # Warn for use of this function
-        warnings.warn(
-            "You have iterated over the result of "
-            "pkg_resources.parse_version. This is a legacy behavior which is "
-            "inconsistent with the new version class introduced in setuptools "
-            "8.0. In most cases, conversion to a tuple is unnecessary. For "
-            "comparison of versions, sort the Version instances directly. If "
-            "you have another use case requiring the tuple, please file a "
-            "bug with the setuptools project describing that need.",
-            RuntimeWarning,
-            stacklevel=1,
-        )
-
-        for part in old_parse_version(str(self)):
-            yield part
-
-
-class SetuptoolsVersion(_SetuptoolsVersionMixin, packaging.version.Version):
-    pass
-
-
-class SetuptoolsLegacyVersion(_SetuptoolsVersionMixin,
-                              packaging.version.LegacyVersion):
-    pass
-
-
 def parse_version(v):
     try:
-        return SetuptoolsVersion(v)
+        return packaging.version.Version(v)
     except packaging.version.InvalidVersion:
-        return SetuptoolsLegacyVersion(v)
+        return packaging.version.LegacyVersion(v)
 
 
 _state_vars = {}

From 6d45fa032f81210ef40358185981b7b01f27c22a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 13:20:54 -0400
Subject: [PATCH 6951/8469] Delint

---
 setup.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index c25ade00c2..2712f89964 100755
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,8 @@ def _gen_console_scripts():
     )
     if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
         return
-    yield ("easy_install-{shortver} = setuptools.command.easy_install:main"
-        .format(shortver=sys.version[:3]))
+    tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
+    yield tmpl.format(shortver=sys.version[:3])
 
 
 readme_path = os.path.join(here, 'README.rst')
@@ -90,8 +90,10 @@ def pypi_link(pkg_filename):
 setup_params = dict(
     name="setuptools",
     version="38.7.0",
-    description="Easily download, build, install, upgrade, and uninstall "
-        "Python packages",
+    description=(
+        "Easily download, build, install, upgrade, and uninstall "
+        "Python packages"
+    ),
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     long_description=long_description,
@@ -139,7 +141,10 @@ def pypi_link(pkg_filename):
             "requires.txt = setuptools.command.egg_info:write_requirements",
             "entry_points.txt = setuptools.command.egg_info:write_entries",
             "eager_resources.txt = setuptools.command.egg_info:overwrite_arg",
-            "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg",
+            (
+                "namespace_packages.txt = "
+                "setuptools.command.egg_info:overwrite_arg"
+            ),
             "top_level.txt = setuptools.command.egg_info:write_toplevel_names",
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",

From d0f7a33daba39f60aa402c094cd4276b8b6ce462 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 13:36:16 -0400
Subject: [PATCH 6952/8469] Copy VendorImporter. Ref #1296.

---
 setuptools/extern/__init__.py | 71 ++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 2cd08b7ed9..70ac180c6f 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,4 +1,73 @@
-from pkg_resources.extern import VendorImporter
+import sys
+
+
+class VendorImporter:
+    """
+    A PEP 302 meta path importer for finding optionally-vendored
+    or otherwise naturally-installed packages from root_name.
+    """
+
+    def __init__(self, root_name, vendored_names=(), vendor_pkg=None):
+        self.root_name = root_name
+        self.vendored_names = set(vendored_names)
+        self.vendor_pkg = vendor_pkg or root_name.replace('extern', '_vendor')
+
+    @property
+    def search_path(self):
+        """
+        Search first the vendor package then as a natural package.
+        """
+        yield self.vendor_pkg + '.'
+        yield ''
+
+    def find_module(self, fullname, path=None):
+        """
+        Return self when fullname starts with root_name and the
+        target module is one vendored through this importer.
+        """
+        root, base, target = fullname.partition(self.root_name + '.')
+        if root:
+            return
+        if not any(map(target.startswith, self.vendored_names)):
+            return
+        return self
+
+    def load_module(self, fullname):
+        """
+        Iterate over the search path to locate and load fullname.
+        """
+        root, base, target = fullname.partition(self.root_name + '.')
+        for prefix in self.search_path:
+            try:
+                extant = prefix + target
+                __import__(extant)
+                mod = sys.modules[extant]
+                sys.modules[fullname] = mod
+                # mysterious hack:
+                # Remove the reference to the extant package/module
+                # on later Python versions to cause relative imports
+                # in the vendor package to resolve the same modules
+                # as those going through this importer.
+                if sys.version_info > (3, 3):
+                    del sys.modules[extant]
+                return mod
+            except ImportError:
+                pass
+        else:
+            raise ImportError(
+                "The '{target}' package is required; "
+                "normally this is bundled with this package so if you get "
+                "this warning, consult the packager of your "
+                "distribution.".format(**locals())
+            )
+
+    def install(self):
+        """
+        Install this importer into sys.meta_path if not already present.
+        """
+        if self not in sys.meta_path:
+            sys.meta_path.append(self)
+
 
 names = 'six',
 VendorImporter(__name__, names, 'pkg_resources._vendor').install()

From 929acc4e551448a68411968fb50336ad51ed4d3c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 14:10:32 -0400
Subject: [PATCH 6953/8469] Setuptools now vendors its own direct dependencies
 (packaging, six, pyparsing). Ref #1296.

---
 pavement.py                                   |   49 +-
 pkg_resources/_vendor/packaging/markers.py    |    6 +-
 .../_vendor/packaging/requirements.py         |    8 +-
 setuptools/_vendor/__init__.py                |    0
 setuptools/_vendor/packaging/__about__.py     |   21 +
 setuptools/_vendor/packaging/__init__.py      |   14 +
 setuptools/_vendor/packaging/_compat.py       |   30 +
 setuptools/_vendor/packaging/_structures.py   |   68 +
 setuptools/_vendor/packaging/markers.py       |  301 +
 setuptools/_vendor/packaging/requirements.py  |  127 +
 setuptools/_vendor/packaging/specifiers.py    |  774 +++
 setuptools/_vendor/packaging/utils.py         |   14 +
 setuptools/_vendor/packaging/version.py       |  393 ++
 setuptools/_vendor/pyparsing.py               | 5696 +++++++++++++++++
 setuptools/_vendor/six.py                     |  868 +++
 setuptools/_vendor/vendored.txt               |    3 +
 setuptools/command/egg_info.py                |    2 +-
 setuptools/dist.py                            |    6 +-
 setuptools/extern/__init__.py                 |    4 +-
 setuptools/msvc.py                            |    4 +-
 setuptools/tests/files.py                     |    2 +-
 setuptools/wheel.py                           |    2 +-
 22 files changed, 8370 insertions(+), 22 deletions(-)
 create mode 100644 setuptools/_vendor/__init__.py
 create mode 100644 setuptools/_vendor/packaging/__about__.py
 create mode 100644 setuptools/_vendor/packaging/__init__.py
 create mode 100644 setuptools/_vendor/packaging/_compat.py
 create mode 100644 setuptools/_vendor/packaging/_structures.py
 create mode 100644 setuptools/_vendor/packaging/markers.py
 create mode 100644 setuptools/_vendor/packaging/requirements.py
 create mode 100644 setuptools/_vendor/packaging/specifiers.py
 create mode 100644 setuptools/_vendor/packaging/utils.py
 create mode 100644 setuptools/_vendor/packaging/version.py
 create mode 100644 setuptools/_vendor/pyparsing.py
 create mode 100644 setuptools/_vendor/six.py
 create mode 100644 setuptools/_vendor/vendored.txt

diff --git a/pavement.py b/pavement.py
index f85617d4fe..ca54e61f4c 100644
--- a/pavement.py
+++ b/pavement.py
@@ -11,6 +11,32 @@ def remove_all(paths):
 
 @task
 def update_vendored():
+    update_pkg_resources()
+    update_setuptools()
+
+
+def rewrite_packaging(pkg_files, new_root):
+    """
+    Rewrite imports in packaging to redirect to vendored copies.
+    """
+    for file in pkg_files.glob('*.py'):
+        text = file.text()
+        text = re.sub(r' (pyparsing|six)', rf' {new_root}.\1', text)
+        file.write_text(text)
+
+
+def install(vendor):
+    clean(vendor)
+    install_args = [
+        'install',
+        '-r', str(vendor / 'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))
+
+def update_pkg_resources():
     vendor = Path('pkg_resources/_vendor')
     # pip uninstall doesn't support -t, so do it manually
     remove_all(vendor.glob('packaging*'))
@@ -23,10 +49,23 @@ def update_vendored():
         '-t', str(vendor),
     ]
     pip.main(install_args)
-    packaging = vendor / 'packaging'
-    for file in packaging.glob('*.py'):
-        text = file.text()
-        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
-        file.write_text(text)
+    rewrite_packaging(vendor / 'packaging', 'pkg_resources.extern.')
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))
+
+
+def update_setuptools():
+    vendor = Path('setuptools/_vendor')
+    # pip uninstall doesn't support -t, so do it manually
+    remove_all(vendor.glob('packaging*'))
+    remove_all(vendor.glob('six*'))
+    remove_all(vendor.glob('pyparsing*'))
+    install_args = [
+        'install',
+        '-r', str(vendor / 'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    rewrite_packaging(vendor / 'packaging', 'setuptools.extern')
     remove_all(vendor.glob('*.dist-info'))
     remove_all(vendor.glob('*.egg-info'))
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index 892e578edd..a4805648dd 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -8,9 +8,9 @@
 import platform
 import sys
 
-from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
-from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
-from pkg_resources.extern.pyparsing import Literal as L  # noqa
+from pkg_resources.extern..pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources.extern..pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources.extern..pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
 from .specifiers import Specifier, InvalidSpecifier
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 0c8c4a3852..ccaed95b13 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -6,10 +6,10 @@
 import string
 import re
 
-from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
-from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
-from pkg_resources.extern.pyparsing import Literal as L  # noqa
-from pkg_resources.extern.six.moves.urllib import parse as urlparse
+from pkg_resources.extern..pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources.extern..pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources.extern..pyparsing import Literal as L  # noqa
+from pkg_resources.extern..six.moves.urllib import parse as urlparse
 
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
diff --git a/setuptools/_vendor/__init__.py b/setuptools/_vendor/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
new file mode 100644
index 0000000000..95d330ef82
--- /dev/null
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -0,0 +1,21 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "packaging"
+__summary__ = "Core utilities for Python packages"
+__uri__ = "https://github.com/pypa/packaging"
+
+__version__ = "16.8"
+
+__author__ = "Donald Stufft and individual contributors"
+__email__ = "donald@stufft.io"
+
+__license__ = "BSD or Apache License, Version 2.0"
+__copyright__ = "Copyright 2014-2016 %s" % __author__
diff --git a/setuptools/_vendor/packaging/__init__.py b/setuptools/_vendor/packaging/__init__.py
new file mode 100644
index 0000000000..5ee6220203
--- /dev/null
+++ b/setuptools/_vendor/packaging/__init__.py
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+from .__about__ import (
+    __author__, __copyright__, __email__, __license__, __summary__, __title__,
+    __uri__, __version__
+)
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
diff --git a/setuptools/_vendor/packaging/_compat.py b/setuptools/_vendor/packaging/_compat.py
new file mode 100644
index 0000000000..210bb80b7e
--- /dev/null
+++ b/setuptools/_vendor/packaging/_compat.py
@@ -0,0 +1,30 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+# flake8: noqa
+
+if PY3:
+    string_types = str,
+else:
+    string_types = basestring,
+
+
+def with_metaclass(meta, *bases):
+    """
+    Create a base class with a metaclass.
+    """
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
diff --git a/setuptools/_vendor/packaging/_structures.py b/setuptools/_vendor/packaging/_structures.py
new file mode 100644
index 0000000000..ccc27861c3
--- /dev/null
+++ b/setuptools/_vendor/packaging/_structures.py
@@ -0,0 +1,68 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+
+class Infinity(object):
+
+    def __repr__(self):
+        return "Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return False
+
+    def __le__(self, other):
+        return False
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return True
+
+    def __ge__(self, other):
+        return True
+
+    def __neg__(self):
+        return NegativeInfinity
+
+Infinity = Infinity()
+
+
+class NegativeInfinity(object):
+
+    def __repr__(self):
+        return "-Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return True
+
+    def __le__(self, other):
+        return True
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return False
+
+    def __ge__(self, other):
+        return False
+
+    def __neg__(self):
+        return Infinity
+
+NegativeInfinity = NegativeInfinity()
diff --git a/setuptools/_vendor/packaging/markers.py b/setuptools/_vendor/packaging/markers.py
new file mode 100644
index 0000000000..031332a305
--- /dev/null
+++ b/setuptools/_vendor/packaging/markers.py
@@ -0,0 +1,301 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import operator
+import os
+import platform
+import sys
+
+from setuptools.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from setuptools.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from setuptools.extern.pyparsing import Literal as L  # noqa
+
+from ._compat import string_types
+from .specifiers import Specifier, InvalidSpecifier
+
+
+__all__ = [
+    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
+    "Marker", "default_environment",
+]
+
+
+class InvalidMarker(ValueError):
+    """
+    An invalid marker was found, users should refer to PEP 508.
+    """
+
+
+class UndefinedComparison(ValueError):
+    """
+    An invalid operation was attempted on a value that doesn't support it.
+    """
+
+
+class UndefinedEnvironmentName(ValueError):
+    """
+    A name was attempted to be used that does not exist inside of the
+    environment.
+    """
+
+
+class Node(object):
+
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
+
+    def serialize(self):
+        raise NotImplementedError
+
+
+class Variable(Node):
+
+    def serialize(self):
+        return str(self)
+
+
+class Value(Node):
+
+    def serialize(self):
+        return '"{0}"'.format(self)
+
+
+class Op(Node):
+
+    def serialize(self):
+        return str(self)
+
+
+VARIABLE = (
+    L("implementation_version") |
+    L("platform_python_implementation") |
+    L("implementation_name") |
+    L("python_full_version") |
+    L("platform_release") |
+    L("platform_version") |
+    L("platform_machine") |
+    L("platform_system") |
+    L("python_version") |
+    L("sys_platform") |
+    L("os_name") |
+    L("os.name") |  # PEP-345
+    L("sys.platform") |  # PEP-345
+    L("platform.version") |  # PEP-345
+    L("platform.machine") |  # PEP-345
+    L("platform.python_implementation") |  # PEP-345
+    L("python_implementation") |  # undocumented setuptools legacy
+    L("extra")
+)
+ALIASES = {
+    'os.name': 'os_name',
+    'sys.platform': 'sys_platform',
+    'platform.version': 'platform_version',
+    'platform.machine': 'platform_machine',
+    'platform.python_implementation': 'platform_python_implementation',
+    'python_implementation': 'platform_python_implementation'
+}
+VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
+
+VERSION_CMP = (
+    L("===") |
+    L("==") |
+    L(">=") |
+    L("<=") |
+    L("!=") |
+    L("~=") |
+    L(">") |
+    L("<")
+)
+
+MARKER_OP = VERSION_CMP | L("not in") | L("in")
+MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
+
+MARKER_VALUE = QuotedString("'") | QuotedString('"')
+MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
+
+BOOLOP = L("and") | L("or")
+
+MARKER_VAR = VARIABLE | MARKER_VALUE
+
+MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
+MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
+
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+
+MARKER_EXPR = Forward()
+MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
+MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
+
+MARKER = stringStart + MARKER_EXPR + stringEnd
+
+
+def _coerce_parse_result(results):
+    if isinstance(results, ParseResults):
+        return [_coerce_parse_result(i) for i in results]
+    else:
+        return results
+
+
+def _format_marker(marker, first=True):
+    assert isinstance(marker, (list, tuple, string_types))
+
+    # Sometimes we have a structure like [[...]] which is a single item list
+    # where the single item is itself it's own list. In that case we want skip
+    # the rest of this function so that we don't get extraneous () on the
+    # outside.
+    if (isinstance(marker, list) and len(marker) == 1 and
+            isinstance(marker[0], (list, tuple))):
+        return _format_marker(marker[0])
+
+    if isinstance(marker, list):
+        inner = (_format_marker(m, first=False) for m in marker)
+        if first:
+            return " ".join(inner)
+        else:
+            return "(" + " ".join(inner) + ")"
+    elif isinstance(marker, tuple):
+        return " ".join([m.serialize() for m in marker])
+    else:
+        return marker
+
+
+_operators = {
+    "in": lambda lhs, rhs: lhs in rhs,
+    "not in": lambda lhs, rhs: lhs not in rhs,
+    "<": operator.lt,
+    "<=": operator.le,
+    "==": operator.eq,
+    "!=": operator.ne,
+    ">=": operator.ge,
+    ">": operator.gt,
+}
+
+
+def _eval_op(lhs, op, rhs):
+    try:
+        spec = Specifier("".join([op.serialize(), rhs]))
+    except InvalidSpecifier:
+        pass
+    else:
+        return spec.contains(lhs)
+
+    oper = _operators.get(op.serialize())
+    if oper is None:
+        raise UndefinedComparison(
+            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
+        )
+
+    return oper(lhs, rhs)
+
+
+_undefined = object()
+
+
+def _get_env(environment, name):
+    value = environment.get(name, _undefined)
+
+    if value is _undefined:
+        raise UndefinedEnvironmentName(
+            "{0!r} does not exist in evaluation environment.".format(name)
+        )
+
+    return value
+
+
+def _evaluate_markers(markers, environment):
+    groups = [[]]
+
+    for marker in markers:
+        assert isinstance(marker, (list, tuple, string_types))
+
+        if isinstance(marker, list):
+            groups[-1].append(_evaluate_markers(marker, environment))
+        elif isinstance(marker, tuple):
+            lhs, op, rhs = marker
+
+            if isinstance(lhs, Variable):
+                lhs_value = _get_env(environment, lhs.value)
+                rhs_value = rhs.value
+            else:
+                lhs_value = lhs.value
+                rhs_value = _get_env(environment, rhs.value)
+
+            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
+        else:
+            assert marker in ["and", "or"]
+            if marker == "or":
+                groups.append([])
+
+    return any(all(item) for item in groups)
+
+
+def format_full_version(info):
+    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    kind = info.releaselevel
+    if kind != 'final':
+        version += kind[0] + str(info.serial)
+    return version
+
+
+def default_environment():
+    if hasattr(sys, 'implementation'):
+        iver = format_full_version(sys.implementation.version)
+        implementation_name = sys.implementation.name
+    else:
+        iver = '0'
+        implementation_name = ''
+
+    return {
+        "implementation_name": implementation_name,
+        "implementation_version": iver,
+        "os_name": os.name,
+        "platform_machine": platform.machine(),
+        "platform_release": platform.release(),
+        "platform_system": platform.system(),
+        "platform_version": platform.version(),
+        "python_full_version": platform.python_version(),
+        "platform_python_implementation": platform.python_implementation(),
+        "python_version": platform.python_version()[:3],
+        "sys_platform": sys.platform,
+    }
+
+
+class Marker(object):
+
+    def __init__(self, marker):
+        try:
+            self._markers = _coerce_parse_result(MARKER.parseString(marker))
+        except ParseException as e:
+            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
+                marker, marker[e.loc:e.loc + 8])
+            raise InvalidMarker(err_str)
+
+    def __str__(self):
+        return _format_marker(self._markers)
+
+    def __repr__(self):
+        return "<Marker({0!r})>".format(str(self))
+
+    def evaluate(self, environment=None):
+        """Evaluate a marker.
+
+        Return the boolean from evaluating the given marker against the
+        environment. environment is an optional argument to override all or
+        part of the determined environment.
+
+        The environment is determined from the current Python process.
+        """
+        current_environment = default_environment()
+        if environment is not None:
+            current_environment.update(environment)
+
+        return _evaluate_markers(self._markers, current_environment)
diff --git a/setuptools/_vendor/packaging/requirements.py b/setuptools/_vendor/packaging/requirements.py
new file mode 100644
index 0000000000..5b493416f2
--- /dev/null
+++ b/setuptools/_vendor/packaging/requirements.py
@@ -0,0 +1,127 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import string
+import re
+
+from setuptools.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from setuptools.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from setuptools.extern.pyparsing import Literal as L  # noqa
+from setuptools.extern.six.moves.urllib import parse as urlparse
+
+from .markers import MARKER_EXPR, Marker
+from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+
+
+class InvalidRequirement(ValueError):
+    """
+    An invalid requirement was found, users should refer to PEP 508.
+    """
+
+
+ALPHANUM = Word(string.ascii_letters + string.digits)
+
+LBRACKET = L("[").suppress()
+RBRACKET = L("]").suppress()
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+COMMA = L(",").suppress()
+SEMICOLON = L(";").suppress()
+AT = L("@").suppress()
+
+PUNCTUATION = Word("-_.")
+IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
+IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
+
+NAME = IDENTIFIER("name")
+EXTRA = IDENTIFIER
+
+URI = Regex(r'[^ ]+')("url")
+URL = (AT + URI)
+
+EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
+EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
+
+VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
+VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
+
+VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
+VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
+                       joinString=",", adjacent=False)("_raw_spec")
+_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+
+VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
+VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
+
+MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+MARKER_EXPR.setParseAction(
+    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+)
+MARKER_SEPERATOR = SEMICOLON
+MARKER = MARKER_SEPERATOR + MARKER_EXPR
+
+VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
+URL_AND_MARKER = URL + Optional(MARKER)
+
+NAMED_REQUIREMENT = \
+    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+
+REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+
+
+class Requirement(object):
+    """Parse a requirement.
+
+    Parse a given requirement string into its parts, such as name, specifier,
+    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
+    string.
+    """
+
+    # TODO: Can we test whether something is contained within a requirement?
+    #       If so how do we do that? Do we need to test against the _name_ of
+    #       the thing as well as the version? What about the markers?
+    # TODO: Can we normalize the name and extra name?
+
+    def __init__(self, requirement_string):
+        try:
+            req = REQUIREMENT.parseString(requirement_string)
+        except ParseException as e:
+            raise InvalidRequirement(
+                "Invalid requirement, parse error at \"{0!r}\"".format(
+                    requirement_string[e.loc:e.loc + 8]))
+
+        self.name = req.name
+        if req.url:
+            parsed_url = urlparse.urlparse(req.url)
+            if not (parsed_url.scheme and parsed_url.netloc) or (
+                    not parsed_url.scheme and not parsed_url.netloc):
+                raise InvalidRequirement("Invalid URL given")
+            self.url = req.url
+        else:
+            self.url = None
+        self.extras = set(req.extras.asList() if req.extras else [])
+        self.specifier = SpecifierSet(req.specifier)
+        self.marker = req.marker if req.marker else None
+
+    def __str__(self):
+        parts = [self.name]
+
+        if self.extras:
+            parts.append("[{0}]".format(",".join(sorted(self.extras))))
+
+        if self.specifier:
+            parts.append(str(self.specifier))
+
+        if self.url:
+            parts.append("@ {0}".format(self.url))
+
+        if self.marker:
+            parts.append("; {0}".format(self.marker))
+
+        return "".join(parts)
+
+    def __repr__(self):
+        return "<Requirement({0!r})>".format(str(self))
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
new file mode 100644
index 0000000000..7f5a76cfd6
--- /dev/null
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -0,0 +1,774 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import abc
+import functools
+import itertools
+import re
+
+from ._compat import string_types, with_metaclass
+from .version import Version, LegacyVersion, parse
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+
+    @abc.abstractmethod
+    def __str__(self):
+        """
+        Returns the str representation of this Specifier like object. This
+        should be representative of the Specifier itself.
+        """
+
+    @abc.abstractmethod
+    def __hash__(self):
+        """
+        Returns a hash value for this Specifier like object.
+        """
+
+    @abc.abstractmethod
+    def __eq__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are equal.
+        """
+
+    @abc.abstractmethod
+    def __ne__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are not equal.
+        """
+
+    @abc.abstractproperty
+    def prereleases(self):
+        """
+        Returns whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @prereleases.setter
+    def prereleases(self, value):
+        """
+        Sets whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @abc.abstractmethod
+    def contains(self, item, prereleases=None):
+        """
+        Determines if the given item is contained within this specifier.
+        """
+
+    @abc.abstractmethod
+    def filter(self, iterable, prereleases=None):
+        """
+        Takes an iterable of items and filters them so that only items which
+        are contained within this specifier are allowed in it.
+        """
+
+
+class _IndividualSpecifier(BaseSpecifier):
+
+    _operators = {}
+
+    def __init__(self, spec="", prereleases=None):
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<{0}({1!r}{2})>".format(
+            self.__class__.__name__,
+            str(self),
+            pre,
+        )
+
+    def __str__(self):
+        return "{0}{1}".format(*self._spec)
+
+    def __hash__(self):
+        return hash(self._spec)
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec == other._spec
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec != other._spec
+
+    def _get_operator(self, op):
+        return getattr(self, "_compare_{0}".format(self._operators[op]))
+
+    def _coerce_version(self, version):
+        if not isinstance(version, (LegacyVersion, Version)):
+            version = parse(version)
+        return version
+
+    @property
+    def operator(self):
+        return self._spec[0]
+
+    @property
+    def version(self):
+        return self._spec[1]
+
+    @property
+    def prereleases(self):
+        return self._prereleases
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        item = self._coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        return self._get_operator(self.operator)(item, self.version)
+
+    def filter(self, iterable, prereleases=None):
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = self._coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if (parsed_version.is_prerelease and not
+                        (prereleases or self.prereleases)):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the begining.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+class LegacySpecifier(_IndividualSpecifier):
+
+    _regex_str = (
+        r"""
+        (?P<operator>(==|!=|<=|>=|<|>))
+        \s*
+        (?P<version>
+            [^,;\s)]* # Since this is a "legacy" specifier, and the version
+                      # string can be just about anything, we match everything
+                      # except for whitespace, a semi-colon for marker support,
+                      # a closing paren since versions can be enclosed in
+                      # them, and a comma since it's a version separator.
+        )
+        """
+    )
+
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+    }
+
+    def _coerce_version(self, version):
+        if not isinstance(version, LegacyVersion):
+            version = LegacyVersion(str(version))
+        return version
+
+    def _compare_equal(self, prospective, spec):
+        return prospective == self._coerce_version(spec)
+
+    def _compare_not_equal(self, prospective, spec):
+        return prospective != self._coerce_version(spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= self._coerce_version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= self._coerce_version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        return prospective < self._coerce_version(spec)
+
+    def _compare_greater_than(self, prospective, spec):
+        return prospective > self._coerce_version(spec)
+
+
+def _require_version_compare(fn):
+    @functools.wraps(fn)
+    def wrapped(self, prospective, spec):
+        if not isinstance(prospective, Version):
+            return False
+        return fn(self, prospective, spec)
+    return wrapped
+
+
+class Specifier(_IndividualSpecifier):
+
+    _regex_str = (
+        r"""
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        """
+    )
+
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    @_require_version_compare
+    def _compare_compatible(self, prospective, spec):
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post") and not
+                               x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return (self._get_operator(">=")(prospective, spec) and
+                self._get_operator("==")(prospective, prefix))
+
+    @_require_version_compare
+    def _compare_equal(self, prospective, spec):
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # In the case of prefix matching we want to ignore local segment.
+            prospective = Version(prospective.public)
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            prospective = prospective[:len(spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            spec, prospective = _pad_version(spec, prospective)
+        else:
+            # Convert our spec string into a Version
+            spec = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec.local:
+                prospective = Version(prospective.public)
+
+        return prospective == spec
+
+    @_require_version_compare
+    def _compare_not_equal(self, prospective, spec):
+        return not self._compare_equal(prospective, spec)
+
+    @_require_version_compare
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= Version(spec)
+
+    @_require_version_compare
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= Version(spec)
+
+    @_require_version_compare
+    def _compare_less_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is less than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective < spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a pre-release version, that we do not accept pre-release
+        # versions for the version mentioned in the specifier (e.g. <3.1 should
+        # not match 3.1.dev0, but should match 3.0.dev0).
+        if not spec.is_prerelease and prospective.is_prerelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # less than the spec version *and* it's not a pre-release of the same
+        # version in the spec.
+        return True
+
+    @_require_version_compare
+    def _compare_greater_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is greater than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective > spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a post-release version, that we do not accept
+        # post-release versions for the version mentioned in the specifier
+        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
+        if not spec.is_postrelease and prospective.is_postrelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # Ensure that we do not allow a local version of the version mentioned
+        # in the specifier, which is techincally greater than, to match.
+        if prospective.local is not None:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # greater than the spec version *and* it's not a pre-release of the
+        # same version in the spec.
+        return True
+
+    def _compare_arbitrary(self, prospective, spec):
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~=", "==="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if parse(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    result = []
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split[0]):])
+    right_split.append(right[len(right_split[0]):])
+
+    # Insert our padding
+    left_split.insert(
+        1,
+        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
+    )
+    right_split.insert(
+        1,
+        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
+    )
+
+    return (
+        list(itertools.chain(*left_split)),
+        list(itertools.chain(*right_split)),
+    )
+
+
+class SpecifierSet(BaseSpecifier):
+
+    def __init__(self, specifiers="", prereleases=None):
+        # Split on , to break each indidivual specifier into it's own item, and
+        # strip each item to remove leading/trailing whitespace.
+        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+
+        # Parsed each individual specifier, attempting first to make it a
+        # Specifier and falling back to a LegacySpecifier.
+        parsed = set()
+        for specifier in specifiers:
+            try:
+                parsed.add(Specifier(specifier))
+            except InvalidSpecifier:
+                parsed.add(LegacySpecifier(specifier))
+
+        # Turn our parsed specifiers into a frozen set and save them for later.
+        self._specs = frozenset(parsed)
+
+        # Store our prereleases value so we can use it later to determine if
+        # we accept prereleases or not.
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
+
+    def __str__(self):
+        return ",".join(sorted(str(s) for s in self._specs))
+
+    def __hash__(self):
+        return hash(self._specs)
+
+    def __and__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        specifier = SpecifierSet()
+        specifier._specs = frozenset(self._specs | other._specs)
+
+        if self._prereleases is None and other._prereleases is not None:
+            specifier._prereleases = other._prereleases
+        elif self._prereleases is not None and other._prereleases is None:
+            specifier._prereleases = self._prereleases
+        elif self._prereleases == other._prereleases:
+            specifier._prereleases = self._prereleases
+        else:
+            raise ValueError(
+                "Cannot combine SpecifierSets with True and False prerelease "
+                "overrides."
+            )
+
+        return specifier
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    def __len__(self):
+        return len(self._specs)
+
+    def __iter__(self):
+        return iter(self._specs)
+
+    @property
+    def prereleases(self):
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Ensure that our item is a Version or LegacyVersion instance.
+        if not isinstance(item, (LegacyVersion, Version)):
+            item = parse(item)
+
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # We can determine if we're going to allow pre-releases by looking to
+        # see if any of the underlying items supports them. If none of them do
+        # and this item is a pre-release then we do not allow it and we can
+        # short circuit that here.
+        # Note: This means that 1.0.dev1 would not be contained in something
+        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
+        if not prereleases and item.is_prerelease:
+            return False
+
+        # We simply dispatch to the underlying specs here to make sure that the
+        # given version is contained within all of them.
+        # Note: This use of all() here means that an empty set of specifiers
+        #       will always return True, this is an explicit design decision.
+        return all(
+            s.contains(item, prereleases=prereleases)
+            for s in self._specs
+        )
+
+    def filter(self, iterable, prereleases=None):
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # If we have any specifiers, then we want to wrap our iterable in the
+        # filter method for each one, this will act as a logical AND amongst
+        # each specifier.
+        if self._specs:
+            for spec in self._specs:
+                iterable = spec.filter(iterable, prereleases=bool(prereleases))
+            return iterable
+        # If we do not have any specifiers, then we need to have a rough filter
+        # which will filter out any pre-releases, unless there are no final
+        # releases, and which will filter out LegacyVersion in general.
+        else:
+            filtered = []
+            found_prereleases = []
+
+            for item in iterable:
+                # Ensure that we some kind of Version class for this item.
+                if not isinstance(item, (LegacyVersion, Version)):
+                    parsed_version = parse(item)
+                else:
+                    parsed_version = item
+
+                # Filter out any item which is parsed as a LegacyVersion
+                if isinstance(parsed_version, LegacyVersion):
+                    continue
+
+                # Store any item which is a pre-release for later unless we've
+                # already found a final version or we are accepting prereleases
+                if parsed_version.is_prerelease and not prereleases:
+                    if not filtered:
+                        found_prereleases.append(item)
+                else:
+                    filtered.append(item)
+
+            # If we've found no items except for pre-releases, then we'll go
+            # ahead and use the pre-releases
+            if not filtered and found_prereleases and prereleases is None:
+                return found_prereleases
+
+            return filtered
diff --git a/setuptools/_vendor/packaging/utils.py b/setuptools/_vendor/packaging/utils.py
new file mode 100644
index 0000000000..942387cef5
--- /dev/null
+++ b/setuptools/_vendor/packaging/utils.py
@@ -0,0 +1,14 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+    # This is taken from PEP 503.
+    return _canonicalize_regex.sub("-", name).lower()
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
new file mode 100644
index 0000000000..83b5ee8c5e
--- /dev/null
+++ b/setuptools/_vendor/packaging/version.py
@@ -0,0 +1,393 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+
+from ._structures import Infinity
+
+
+__all__ = [
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
+]
+
+
+_Version = collections.namedtuple(
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
+)
+
+
+def parse(version):
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+
+    def __hash__(self):
+        return hash(self._key)
+
+    def __lt__(self, other):
+        return self._compare(other, lambda s, o: s < o)
+
+    def __le__(self, other):
+        return self._compare(other, lambda s, o: s <= o)
+
+    def __eq__(self, other):
+        return self._compare(other, lambda s, o: s == o)
+
+    def __ge__(self, other):
+        return self._compare(other, lambda s, o: s >= o)
+
+    def __gt__(self, other):
+        return self._compare(other, lambda s, o: s > o)
+
+    def __ne__(self, other):
+        return self._compare(other, lambda s, o: s != o)
+
+    def _compare(self, other, method):
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return method(self._key, other._key)
+
+
+class LegacyVersion(_BaseVersion):
+
+    def __init__(self, version):
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+    def __str__(self):
+        return self._version
+
+    def __repr__(self):
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        return self._version
+
+    @property
+    def base_version(self):
+        return self._version
+
+    @property
+    def local(self):
+        return None
+
+    @property
+    def is_prerelease(self):
+        return False
+
+    @property
+    def is_postrelease(self):
+        return False
+
+
+_legacy_version_component_re = re.compile(
+    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
+)
+
+_legacy_version_replacement_map = {
+    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+    parts = tuple(parts)
+
+    return epoch, parts
+
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(
+        r"^\s*" + VERSION_PATTERN + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    def __init__(self, version):
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(
+                match.group("pre_l"),
+                match.group("pre_n"),
+            ),
+            post=_parse_letter_version(
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
+            ),
+            dev=_parse_letter_version(
+                match.group("dev_l"),
+                match.group("dev_n"),
+            ),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        # Pre-release
+        if self._version.pre is not None:
+            parts.append("".join(str(x) for x in self._version.pre))
+
+        # Post-release
+        if self._version.post is not None:
+            parts.append(".post{0}".format(self._version.post[1]))
+
+        # Development release
+        if self._version.dev is not None:
+            parts.append(".dev{0}".format(self._version.dev[1]))
+
+        # Local version segment
+        if self._version.local is not None:
+            parts.append(
+                "+{0}".format(".".join(str(x) for x in self._version.local))
+            )
+
+        return "".join(parts)
+
+    @property
+    def public(self):
+        return str(self).split("+", 1)[0]
+
+    @property
+    def base_version(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        return "".join(parts)
+
+    @property
+    def local(self):
+        version_string = str(self)
+        if "+" in version_string:
+            return version_string.split("+", 1)[1]
+
+    @property
+    def is_prerelease(self):
+        return bool(self._version.dev or self._version.pre)
+
+    @property
+    def is_postrelease(self):
+        return bool(self._version.post)
+
+
+def _parse_letter_version(letter, number):
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+
+_local_version_seperators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_seperators.split(local)
+        )
+
+
+def _cmpkey(epoch, release, pre, post, dev, local):
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    release = tuple(
+        reversed(list(
+            itertools.dropwhile(
+                lambda x: x == 0,
+                reversed(release),
+            )
+        ))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        pre = -Infinity
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        pre = Infinity
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        post = -Infinity
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        dev = Infinity
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        local = -Infinity
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        local = tuple(
+            (i, "") if isinstance(i, int) else (-Infinity, i)
+            for i in local
+        )
+
+    return epoch, release, pre, post, dev, local
diff --git a/setuptools/_vendor/pyparsing.py b/setuptools/_vendor/pyparsing.py
new file mode 100644
index 0000000000..a21224359e
--- /dev/null
+++ b/setuptools/_vendor/pyparsing.py
@@ -0,0 +1,5696 @@
+# module pyparsing.py
+#
+# Copyright (c) 2003-2016  Paul T. McGuire
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__doc__ = \
+"""
+pyparsing module - Classes and methods to define and execute parsing grammars
+
+The pyparsing module is an alternative approach to creating and executing simple grammars,
+vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
+don't need to learn a new syntax for defining grammars or matching expressions - the parsing module
+provides a library of classes that you use to construct the grammar directly in Python.
+
+Here is a program to parse "Hello, World!" (or any greeting of the form 
+C{"<salutation>, <addressee>!"}), built up using L{Word}, L{Literal}, and L{And} elements 
+(L{'+'<ParserElement.__add__>} operator gives L{And} expressions, strings are auto-converted to
+L{Literal} expressions)::
+
+    from pyparsing import Word, alphas
+
+    # define grammar of a greeting
+    greet = Word(alphas) + "," + Word(alphas) + "!"
+
+    hello = "Hello, World!"
+    print (hello, "->", greet.parseString(hello))
+
+The program outputs the following::
+
+    Hello, World! -> ['Hello', ',', 'World', '!']
+
+The Python representation of the grammar is quite readable, owing to the self-explanatory
+class names, and the use of '+', '|' and '^' operators.
+
+The L{ParseResults} object returned from L{ParserElement.parseString<ParserElement.parseString>} can be accessed as a nested list, a dictionary, or an
+object with named attributes.
+
+The pyparsing module handles some of the problems that are typically vexing when writing text parsers:
+ - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
+ - quoted strings
+ - embedded comments
+"""
+
+__version__ = "2.1.10"
+__versionTime__ = "07 Oct 2016 01:31 UTC"
+__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
+
+import string
+from weakref import ref as wkref
+import copy
+import sys
+import warnings
+import re
+import sre_constants
+import collections
+import pprint
+import traceback
+import types
+from datetime import datetime
+
+try:
+    from _thread import RLock
+except ImportError:
+    from threading import RLock
+
+try:
+    from collections import OrderedDict as _OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict as _OrderedDict
+    except ImportError:
+        _OrderedDict = None
+
+#~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) )
+
+__all__ = [
+'And', 'CaselessKeyword', 'CaselessLiteral', 'CharsNotIn', 'Combine', 'Dict', 'Each', 'Empty',
+'FollowedBy', 'Forward', 'GoToColumn', 'Group', 'Keyword', 'LineEnd', 'LineStart', 'Literal',
+'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or',
+'ParseBaseException', 'ParseElementEnhance', 'ParseException', 'ParseExpression', 'ParseFatalException',
+'ParseResults', 'ParseSyntaxException', 'ParserElement', 'QuotedString', 'RecursiveGrammarException',
+'Regex', 'SkipTo', 'StringEnd', 'StringStart', 'Suppress', 'Token', 'TokenConverter', 
+'White', 'Word', 'WordEnd', 'WordStart', 'ZeroOrMore',
+'alphanums', 'alphas', 'alphas8bit', 'anyCloseTag', 'anyOpenTag', 'cStyleComment', 'col',
+'commaSeparatedList', 'commonHTMLEntity', 'countedArray', 'cppStyleComment', 'dblQuotedString',
+'dblSlashComment', 'delimitedList', 'dictOf', 'downcaseTokens', 'empty', 'hexnums',
+'htmlComment', 'javaStyleComment', 'line', 'lineEnd', 'lineStart', 'lineno',
+'makeHTMLTags', 'makeXMLTags', 'matchOnlyAtCol', 'matchPreviousExpr', 'matchPreviousLiteral',
+'nestedExpr', 'nullDebugAction', 'nums', 'oneOf', 'opAssoc', 'operatorPrecedence', 'printables',
+'punc8bit', 'pythonStyleComment', 'quotedString', 'removeQuotes', 'replaceHTMLEntity', 
+'replaceWith', 'restOfLine', 'sglQuotedString', 'srange', 'stringEnd',
+'stringStart', 'traceParseAction', 'unicodeString', 'upcaseTokens', 'withAttribute',
+'indentedBlock', 'originalTextFor', 'ungroup', 'infixNotation','locatedExpr', 'withClass',
+'CloseMatch', 'tokenMap', 'pyparsing_common',
+]
+
+system_version = tuple(sys.version_info)[:3]
+PY_3 = system_version[0] == 3
+if PY_3:
+    _MAX_INT = sys.maxsize
+    basestring = str
+    unichr = chr
+    _ustr = str
+
+    # build list of single arg builtins, that can be used as parse actions
+    singleArgBuiltins = [sum, len, sorted, reversed, list, tuple, set, any, all, min, max]
+
+else:
+    _MAX_INT = sys.maxint
+    range = xrange
+
+    def _ustr(obj):
+        """Drop-in replacement for str(obj) that tries to be Unicode friendly. It first tries
+           str(obj). If that fails with a UnicodeEncodeError, then it tries unicode(obj). It
+           then < returns the unicode object | encodes it with the default encoding | ... >.
+        """
+        if isinstance(obj,unicode):
+            return obj
+
+        try:
+            # If this works, then _ustr(obj) has the same behaviour as str(obj), so
+            # it won't break any existing code.
+            return str(obj)
+
+        except UnicodeEncodeError:
+            # Else encode it
+            ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
+            xmlcharref = Regex('&#\d+;')
+            xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
+            return xmlcharref.transformString(ret)
+
+    # build list of single arg builtins, tolerant of Python version, that can be used as parse actions
+    singleArgBuiltins = []
+    import __builtin__
+    for fname in "sum len sorted reversed list tuple set any all min max".split():
+        try:
+            singleArgBuiltins.append(getattr(__builtin__,fname))
+        except AttributeError:
+            continue
+            
+_generatorType = type((y for y in range(1)))
+ 
+def _xml_escape(data):
+    """Escape &, <, >, ", ', etc. in a string of data."""
+
+    # ampersand must be replaced first
+    from_symbols = '&><"\''
+    to_symbols = ('&'+s+';' for s in "amp gt lt quot apos".split())
+    for from_,to_ in zip(from_symbols, to_symbols):
+        data = data.replace(from_, to_)
+    return data
+
+class _Constants(object):
+    pass
+
+alphas     = string.ascii_uppercase + string.ascii_lowercase
+nums       = "0123456789"
+hexnums    = nums + "ABCDEFabcdef"
+alphanums  = alphas + nums
+_bslash    = chr(92)
+printables = "".join(c for c in string.printable if c not in string.whitespace)
+
+class ParseBaseException(Exception):
+    """base exception class for all parsing runtime exceptions"""
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, pstr, loc=0, msg=None, elem=None ):
+        self.loc = loc
+        if msg is None:
+            self.msg = pstr
+            self.pstr = ""
+        else:
+            self.msg = msg
+            self.pstr = pstr
+        self.parserElement = elem
+        self.args = (pstr, loc, msg)
+
+    @classmethod
+    def _from_exception(cls, pe):
+        """
+        internal factory method to simplify creating one type of ParseException 
+        from another - avoids having __init__ signature conflicts among subclasses
+        """
+        return cls(pe.pstr, pe.loc, pe.msg, pe.parserElement)
+
+    def __getattr__( self, aname ):
+        """supported attributes by name are:
+            - lineno - returns the line number of the exception text
+            - col - returns the column number of the exception text
+            - line - returns the line containing the exception text
+        """
+        if( aname == "lineno" ):
+            return lineno( self.loc, self.pstr )
+        elif( aname in ("col", "column") ):
+            return col( self.loc, self.pstr )
+        elif( aname == "line" ):
+            return line( self.loc, self.pstr )
+        else:
+            raise AttributeError(aname)
+
+    def __str__( self ):
+        return "%s (at char %d), (line:%d, col:%d)" % \
+                ( self.msg, self.loc, self.lineno, self.column )
+    def __repr__( self ):
+        return _ustr(self)
+    def markInputline( self, markerString = ">!<" ):
+        """Extracts the exception line from the input string, and marks
+           the location of the exception with a special symbol.
+        """
+        line_str = self.line
+        line_column = self.column - 1
+        if markerString:
+            line_str = "".join((line_str[:line_column],
+                                markerString, line_str[line_column:]))
+        return line_str.strip()
+    def __dir__(self):
+        return "lineno col line".split() + dir(type(self))
+
+class ParseException(ParseBaseException):
+    """
+    Exception thrown when parse expressions don't match class;
+    supported attributes by name are:
+     - lineno - returns the line number of the exception text
+     - col - returns the column number of the exception text
+     - line - returns the line containing the exception text
+        
+    Example::
+        try:
+            Word(nums).setName("integer").parseString("ABC")
+        except ParseException as pe:
+            print(pe)
+            print("column: {}".format(pe.col))
+            
+    prints::
+       Expected integer (at char 0), (line:1, col:1)
+        column: 1
+    """
+    pass
+
+class ParseFatalException(ParseBaseException):
+    """user-throwable exception thrown when inconsistent parse content
+       is found; stops all parsing immediately"""
+    pass
+
+class ParseSyntaxException(ParseFatalException):
+    """just like L{ParseFatalException}, but thrown internally when an
+       L{ErrorStop<And._ErrorStop>} ('-' operator) indicates that parsing is to stop 
+       immediately because an unbacktrackable syntax error has been found"""
+    pass
+
+#~ class ReparseException(ParseBaseException):
+    #~ """Experimental class - parse actions can raise this exception to cause
+       #~ pyparsing to reparse the input string:
+        #~ - with a modified input string, and/or
+        #~ - with a modified start location
+       #~ Set the values of the ReparseException in the constructor, and raise the
+       #~ exception in a parse action to cause pyparsing to use the new string/location.
+       #~ Setting the values as None causes no change to be made.
+       #~ """
+    #~ def __init_( self, newstring, restartLoc ):
+        #~ self.newParseText = newstring
+        #~ self.reparseLoc = restartLoc
+
+class RecursiveGrammarException(Exception):
+    """exception thrown by L{ParserElement.validate} if the grammar could be improperly recursive"""
+    def __init__( self, parseElementList ):
+        self.parseElementTrace = parseElementList
+
+    def __str__( self ):
+        return "RecursiveGrammarException: %s" % self.parseElementTrace
+
+class _ParseResultsWithOffset(object):
+    def __init__(self,p1,p2):
+        self.tup = (p1,p2)
+    def __getitem__(self,i):
+        return self.tup[i]
+    def __repr__(self):
+        return repr(self.tup[0])
+    def setOffset(self,i):
+        self.tup = (self.tup[0],i)
+
+class ParseResults(object):
+    """
+    Structured parse results, to provide multiple means of access to the parsed data:
+       - as a list (C{len(results)})
+       - by list index (C{results[0], results[1]}, etc.)
+       - by attribute (C{results.<resultsName>} - see L{ParserElement.setResultsName})
+
+    Example::
+        integer = Word(nums)
+        date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+        # equivalent form:
+        # date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+
+        # parseString returns a ParseResults object
+        result = date_str.parseString("1999/12/31")
+
+        def test(s, fn=repr):
+            print("%s -> %s" % (s, fn(eval(s))))
+        test("list(result)")
+        test("result[0]")
+        test("result['month']")
+        test("result.day")
+        test("'month' in result")
+        test("'minutes' in result")
+        test("result.dump()", str)
+    prints::
+        list(result) -> ['1999', '/', '12', '/', '31']
+        result[0] -> '1999'
+        result['month'] -> '12'
+        result.day -> '31'
+        'month' in result -> True
+        'minutes' in result -> False
+        result.dump() -> ['1999', '/', '12', '/', '31']
+        - day: 31
+        - month: 12
+        - year: 1999
+    """
+    def __new__(cls, toklist=None, name=None, asList=True, modal=True ):
+        if isinstance(toklist, cls):
+            return toklist
+        retobj = object.__new__(cls)
+        retobj.__doinit = True
+        return retobj
+
+    # Performance tuning: we construct a *lot* of these, so keep this
+    # constructor as small and fast as possible
+    def __init__( self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance ):
+        if self.__doinit:
+            self.__doinit = False
+            self.__name = None
+            self.__parent = None
+            self.__accumNames = {}
+            self.__asList = asList
+            self.__modal = modal
+            if toklist is None:
+                toklist = []
+            if isinstance(toklist, list):
+                self.__toklist = toklist[:]
+            elif isinstance(toklist, _generatorType):
+                self.__toklist = list(toklist)
+            else:
+                self.__toklist = [toklist]
+            self.__tokdict = dict()
+
+        if name is not None and name:
+            if not modal:
+                self.__accumNames[name] = 0
+            if isinstance(name,int):
+                name = _ustr(name) # will always return a str, but use _ustr for consistency
+            self.__name = name
+            if not (isinstance(toklist, (type(None), basestring, list)) and toklist in (None,'',[])):
+                if isinstance(toklist,basestring):
+                    toklist = [ toklist ]
+                if asList:
+                    if isinstance(toklist,ParseResults):
+                        self[name] = _ParseResultsWithOffset(toklist.copy(),0)
+                    else:
+                        self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]),0)
+                    self[name].__name = name
+                else:
+                    try:
+                        self[name] = toklist[0]
+                    except (KeyError,TypeError,IndexError):
+                        self[name] = toklist
+
+    def __getitem__( self, i ):
+        if isinstance( i, (int,slice) ):
+            return self.__toklist[i]
+        else:
+            if i not in self.__accumNames:
+                return self.__tokdict[i][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[i] ])
+
+    def __setitem__( self, k, v, isinstance=isinstance ):
+        if isinstance(v,_ParseResultsWithOffset):
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [v]
+            sub = v[0]
+        elif isinstance(k,(int,slice)):
+            self.__toklist[k] = v
+            sub = v
+        else:
+            self.__tokdict[k] = self.__tokdict.get(k,list()) + [_ParseResultsWithOffset(v,0)]
+            sub = v
+        if isinstance(sub,ParseResults):
+            sub.__parent = wkref(self)
+
+    def __delitem__( self, i ):
+        if isinstance(i,(int,slice)):
+            mylen = len( self.__toklist )
+            del self.__toklist[i]
+
+            # convert int to slice
+            if isinstance(i, int):
+                if i < 0:
+                    i += mylen
+                i = slice(i, i+1)
+            # get removed indices
+            removed = list(range(*i.indices(mylen)))
+            removed.reverse()
+            # fixup indices in token dictionary
+            for name,occurrences in self.__tokdict.items():
+                for j in removed:
+                    for k, (value, position) in enumerate(occurrences):
+                        occurrences[k] = _ParseResultsWithOffset(value, position - (position > j))
+        else:
+            del self.__tokdict[i]
+
+    def __contains__( self, k ):
+        return k in self.__tokdict
+
+    def __len__( self ): return len( self.__toklist )
+    def __bool__(self): return ( not not self.__toklist )
+    __nonzero__ = __bool__
+    def __iter__( self ): return iter( self.__toklist )
+    def __reversed__( self ): return iter( self.__toklist[::-1] )
+    def _iterkeys( self ):
+        if hasattr(self.__tokdict, "iterkeys"):
+            return self.__tokdict.iterkeys()
+        else:
+            return iter(self.__tokdict)
+
+    def _itervalues( self ):
+        return (self[k] for k in self._iterkeys())
+            
+    def _iteritems( self ):
+        return ((k, self[k]) for k in self._iterkeys())
+
+    if PY_3:
+        keys = _iterkeys       
+        """Returns an iterator of all named result keys (Python 3.x only)."""
+
+        values = _itervalues
+        """Returns an iterator of all named result values (Python 3.x only)."""
+
+        items = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 3.x only)."""
+
+    else:
+        iterkeys = _iterkeys
+        """Returns an iterator of all named result keys (Python 2.x only)."""
+
+        itervalues = _itervalues
+        """Returns an iterator of all named result values (Python 2.x only)."""
+
+        iteritems = _iteritems
+        """Returns an iterator of all named result key-value tuples (Python 2.x only)."""
+
+        def keys( self ):
+            """Returns all named result keys (as a list in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.iterkeys())
+
+        def values( self ):
+            """Returns all named result values (as a list in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.itervalues())
+                
+        def items( self ):
+            """Returns all named result key-values (as a list of tuples in Python 2.x, as an iterator in Python 3.x)."""
+            return list(self.iteritems())
+
+    def haskeys( self ):
+        """Since keys() returns an iterator, this method is helpful in bypassing
+           code that looks for the existence of any defined results names."""
+        return bool(self.__tokdict)
+        
+    def pop( self, *args, **kwargs):
+        """
+        Removes and returns item at specified index (default=C{last}).
+        Supports both C{list} and C{dict} semantics for C{pop()}. If passed no
+        argument or an integer argument, it will use C{list} semantics
+        and pop tokens from the list of parsed tokens. If passed a 
+        non-integer argument (most likely a string), it will use C{dict}
+        semantics and pop the corresponding value from any defined 
+        results names. A second default return value argument is 
+        supported, just as in C{dict.pop()}.
+
+        Example::
+            def remove_first(tokens):
+                tokens.pop(0)
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            print(OneOrMore(Word(nums)).addParseAction(remove_first).parseString("0 123 321")) # -> ['123', '321']
+
+            label = Word(alphas)
+            patt = label("LABEL") + OneOrMore(Word(nums))
+            print(patt.parseString("AAB 123 321").dump())
+
+            # Use pop() in a parse action to remove named result (note that corresponding value is not
+            # removed from list form of results)
+            def remove_LABEL(tokens):
+                tokens.pop("LABEL")
+                return tokens
+            patt.addParseAction(remove_LABEL)
+            print(patt.parseString("AAB 123 321").dump())
+        prints::
+            ['AAB', '123', '321']
+            - LABEL: AAB
+
+            ['AAB', '123', '321']
+        """
+        if not args:
+            args = [-1]
+        for k,v in kwargs.items():
+            if k == 'default':
+                args = (args[0], v)
+            else:
+                raise TypeError("pop() got an unexpected keyword argument '%s'" % k)
+        if (isinstance(args[0], int) or 
+                        len(args) == 1 or 
+                        args[0] in self):
+            index = args[0]
+            ret = self[index]
+            del self[index]
+            return ret
+        else:
+            defaultvalue = args[1]
+            return defaultvalue
+
+    def get(self, key, defaultValue=None):
+        """
+        Returns named result matching the given key, or if there is no
+        such name, then returns the given C{defaultValue} or C{None} if no
+        C{defaultValue} is specified.
+
+        Similar to C{dict.get()}.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            result = date_str.parseString("1999/12/31")
+            print(result.get("year")) # -> '1999'
+            print(result.get("hour", "not specified")) # -> 'not specified'
+            print(result.get("hour")) # -> None
+        """
+        if key in self:
+            return self[key]
+        else:
+            return defaultValue
+
+    def insert( self, index, insStr ):
+        """
+        Inserts new element at location index in the list of parsed tokens.
+        
+        Similar to C{list.insert()}.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+
+            # use a parse action to insert the parse location in the front of the parsed results
+            def insert_locn(locn, tokens):
+                tokens.insert(0, locn)
+            print(OneOrMore(Word(nums)).addParseAction(insert_locn).parseString("0 123 321")) # -> [0, '0', '123', '321']
+        """
+        self.__toklist.insert(index, insStr)
+        # fixup indices in token dictionary
+        for name,occurrences in self.__tokdict.items():
+            for k, (value, position) in enumerate(occurrences):
+                occurrences[k] = _ParseResultsWithOffset(value, position + (position > index))
+
+    def append( self, item ):
+        """
+        Add single element to end of ParseResults list of elements.
+
+        Example::
+            print(OneOrMore(Word(nums)).parseString("0 123 321")) # -> ['0', '123', '321']
+            
+            # use a parse action to compute the sum of the parsed integers, and add it to the end
+            def append_sum(tokens):
+                tokens.append(sum(map(int, tokens)))
+            print(OneOrMore(Word(nums)).addParseAction(append_sum).parseString("0 123 321")) # -> ['0', '123', '321', 444]
+        """
+        self.__toklist.append(item)
+
+    def extend( self, itemseq ):
+        """
+        Add sequence of elements to end of ParseResults list of elements.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            
+            # use a parse action to append the reverse of the matched strings, to make a palindrome
+            def make_palindrome(tokens):
+                tokens.extend(reversed([t[::-1] for t in tokens]))
+                return ''.join(tokens)
+            print(patt.addParseAction(make_palindrome).parseString("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
+        """
+        if isinstance(itemseq, ParseResults):
+            self += itemseq
+        else:
+            self.__toklist.extend(itemseq)
+
+    def clear( self ):
+        """
+        Clear all elements and results names.
+        """
+        del self.__toklist[:]
+        self.__tokdict.clear()
+
+    def __getattr__( self, name ):
+        try:
+            return self[name]
+        except KeyError:
+            return ""
+            
+        if name in self.__tokdict:
+            if name not in self.__accumNames:
+                return self.__tokdict[name][-1][0]
+            else:
+                return ParseResults([ v[0] for v in self.__tokdict[name] ])
+        else:
+            return ""
+
+    def __add__( self, other ):
+        ret = self.copy()
+        ret += other
+        return ret
+
+    def __iadd__( self, other ):
+        if other.__tokdict:
+            offset = len(self.__toklist)
+            addoffset = lambda a: offset if a<0 else a+offset
+            otheritems = other.__tokdict.items()
+            otherdictitems = [(k, _ParseResultsWithOffset(v[0],addoffset(v[1])) )
+                                for (k,vlist) in otheritems for v in vlist]
+            for k,v in otherdictitems:
+                self[k] = v
+                if isinstance(v[0],ParseResults):
+                    v[0].__parent = wkref(self)
+            
+        self.__toklist += other.__toklist
+        self.__accumNames.update( other.__accumNames )
+        return self
+
+    def __radd__(self, other):
+        if isinstance(other,int) and other == 0:
+            # useful for merging many ParseResults using sum() builtin
+            return self.copy()
+        else:
+            # this may raise a TypeError - so be it
+            return other + self
+        
+    def __repr__( self ):
+        return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) )
+
+    def __str__( self ):
+        return '[' + ', '.join(_ustr(i) if isinstance(i, ParseResults) else repr(i) for i in self.__toklist) + ']'
+
+    def _asStringList( self, sep='' ):
+        out = []
+        for item in self.__toklist:
+            if out and sep:
+                out.append(sep)
+            if isinstance( item, ParseResults ):
+                out += item._asStringList()
+            else:
+                out.append( _ustr(item) )
+        return out
+
+    def asList( self ):
+        """
+        Returns the parse results as a nested list of matching tokens, all converted to strings.
+
+        Example::
+            patt = OneOrMore(Word(alphas))
+            result = patt.parseString("sldkj lsdkj sldkj")
+            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
+            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
+            
+            # Use asList() to create an actual list
+            result_list = result.asList()
+            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
+        """
+        return [res.asList() if isinstance(res,ParseResults) else res for res in self.__toklist]
+
+    def asDict( self ):
+        """
+        Returns the named parse results as a nested dictionary.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
+            
+            result_dict = result.asDict()
+            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
+
+            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
+            import json
+            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
+            print(json.dumps(result.asDict())) # -> {"month": "31", "day": "1999", "year": "12"}
+        """
+        if PY_3:
+            item_fn = self.items
+        else:
+            item_fn = self.iteritems
+            
+        def toItem(obj):
+            if isinstance(obj, ParseResults):
+                if obj.haskeys():
+                    return obj.asDict()
+                else:
+                    return [toItem(v) for v in obj]
+            else:
+                return obj
+                
+        return dict((k,toItem(v)) for k,v in item_fn())
+
+    def copy( self ):
+        """
+        Returns a new copy of a C{ParseResults} object.
+        """
+        ret = ParseResults( self.__toklist )
+        ret.__tokdict = self.__tokdict.copy()
+        ret.__parent = self.__parent
+        ret.__accumNames.update( self.__accumNames )
+        ret.__name = self.__name
+        return ret
+
+    def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ):
+        """
+        (Deprecated) Returns the parse results as XML. Tags are created for tokens and lists that have defined results names.
+        """
+        nl = "\n"
+        out = []
+        namedItems = dict((v[1],k) for (k,vlist) in self.__tokdict.items()
+                                                            for v in vlist)
+        nextLevelIndent = indent + "  "
+
+        # collapse out indents if formatting is not desired
+        if not formatted:
+            indent = ""
+            nextLevelIndent = ""
+            nl = ""
+
+        selfTag = None
+        if doctag is not None:
+            selfTag = doctag
+        else:
+            if self.__name:
+                selfTag = self.__name
+
+        if not selfTag:
+            if namedItemsOnly:
+                return ""
+            else:
+                selfTag = "ITEM"
+
+        out += [ nl, indent, "<", selfTag, ">" ]
+
+        for i,res in enumerate(self.__toklist):
+            if isinstance(res,ParseResults):
+                if i in namedItems:
+                    out += [ res.asXML(namedItems[i],
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+                else:
+                    out += [ res.asXML(None,
+                                        namedItemsOnly and doctag is None,
+                                        nextLevelIndent,
+                                        formatted)]
+            else:
+                # individual token, see if there is a name for it
+                resTag = None
+                if i in namedItems:
+                    resTag = namedItems[i]
+                if not resTag:
+                    if namedItemsOnly:
+                        continue
+                    else:
+                        resTag = "ITEM"
+                xmlBodyText = _xml_escape(_ustr(res))
+                out += [ nl, nextLevelIndent, "<", resTag, ">",
+                                                xmlBodyText,
+                                                "</", resTag, ">" ]
+
+        out += [ nl, indent, "</", selfTag, ">" ]
+        return "".join(out)
+
+    def __lookup(self,sub):
+        for k,vlist in self.__tokdict.items():
+            for v,loc in vlist:
+                if sub is v:
+                    return k
+        return None
+
+    def getName(self):
+        """
+        Returns the results name for this token expression. Useful when several 
+        different expressions might match at a particular location.
+
+        Example::
+            integer = Word(nums)
+            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
+            house_number_expr = Suppress('#') + Word(nums, alphanums)
+            user_data = (Group(house_number_expr)("house_number") 
+                        | Group(ssn_expr)("ssn")
+                        | Group(integer)("age"))
+            user_info = OneOrMore(user_data)
+            
+            result = user_info.parseString("22 111-22-3333 #221B")
+            for item in result:
+                print(item.getName(), ':', item[0])
+        prints::
+            age : 22
+            ssn : 111-22-3333
+            house_number : 221B
+        """
+        if self.__name:
+            return self.__name
+        elif self.__parent:
+            par = self.__parent()
+            if par:
+                return par.__lookup(self)
+            else:
+                return None
+        elif (len(self) == 1 and
+               len(self.__tokdict) == 1 and
+               next(iter(self.__tokdict.values()))[0][1] in (0,-1)):
+            return next(iter(self.__tokdict.keys()))
+        else:
+            return None
+
+    def dump(self, indent='', depth=0, full=True):
+        """
+        Diagnostic method for listing out the contents of a C{ParseResults}.
+        Accepts an optional C{indent} argument so that this string can be embedded
+        in a nested display of other data.
+
+        Example::
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+            
+            result = date_str.parseString('12/31/1999')
+            print(result.dump())
+        prints::
+            ['12', '/', '31', '/', '1999']
+            - day: 1999
+            - month: 31
+            - year: 12
+        """
+        out = []
+        NL = '\n'
+        out.append( indent+_ustr(self.asList()) )
+        if full:
+            if self.haskeys():
+                items = sorted((str(k), v) for k,v in self.items())
+                for k,v in items:
+                    if out:
+                        out.append(NL)
+                    out.append( "%s%s- %s: " % (indent,('  '*depth), k) )
+                    if isinstance(v,ParseResults):
+                        if v:
+                            out.append( v.dump(indent,depth+1) )
+                        else:
+                            out.append(_ustr(v))
+                    else:
+                        out.append(repr(v))
+            elif any(isinstance(vv,ParseResults) for vv in self):
+                v = self
+                for i,vv in enumerate(v):
+                    if isinstance(vv,ParseResults):
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),vv.dump(indent,depth+1) ))
+                    else:
+                        out.append("\n%s%s[%d]:\n%s%s%s" % (indent,('  '*(depth)),i,indent,('  '*(depth+1)),_ustr(vv)))
+            
+        return "".join(out)
+
+    def pprint(self, *args, **kwargs):
+        """
+        Pretty-printer for parsed results as a list, using the C{pprint} module.
+        Accepts additional positional or keyword args as defined for the 
+        C{pprint.pprint} method. (U{http://docs.python.org/3/library/pprint.html#pprint.pprint})
+
+        Example::
+            ident = Word(alphas, alphanums)
+            num = Word(nums)
+            func = Forward()
+            term = ident | num | Group('(' + func + ')')
+            func <<= ident + Group(Optional(delimitedList(term)))
+            result = func.parseString("fna a,b,(fnb c,d,200),100")
+            result.pprint(width=40)
+        prints::
+            ['fna',
+             ['a',
+              'b',
+              ['(', 'fnb', ['c', 'd', '200'], ')'],
+              '100']]
+        """
+        pprint.pprint(self.asList(), *args, **kwargs)
+
+    # add support for pickle protocol
+    def __getstate__(self):
+        return ( self.__toklist,
+                 ( self.__tokdict.copy(),
+                   self.__parent is not None and self.__parent() or None,
+                   self.__accumNames,
+                   self.__name ) )
+
+    def __setstate__(self,state):
+        self.__toklist = state[0]
+        (self.__tokdict,
+         par,
+         inAccumNames,
+         self.__name) = state[1]
+        self.__accumNames = {}
+        self.__accumNames.update(inAccumNames)
+        if par is not None:
+            self.__parent = wkref(par)
+        else:
+            self.__parent = None
+
+    def __getnewargs__(self):
+        return self.__toklist, self.__name, self.__asList, self.__modal
+
+    def __dir__(self):
+        return (dir(type(self)) + list(self.keys()))
+
+collections.MutableMapping.register(ParseResults)
+
+def col (loc,strg):
+    """Returns current column within a string, counting newlines as line separators.
+   The first column is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    s = strg
+    return 1 if 0<loc<len(s) and s[loc-1] == '\n' else loc - s.rfind("\n", 0, loc)
+
+def lineno(loc,strg):
+    """Returns current line number within a string, counting newlines as line separators.
+   The first line is number 1.
+
+   Note: the default parsing behavior is to expand tabs in the input string
+   before starting the parsing process.  See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information
+   on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+   consistent view of the parsed string, the parse location, and line and column
+   positions within the parsed string.
+   """
+    return strg.count("\n",0,loc) + 1
+
+def line( loc, strg ):
+    """Returns the line of text containing loc within a string, counting newlines as line separators.
+       """
+    lastCR = strg.rfind("\n", 0, loc)
+    nextCR = strg.find("\n", loc)
+    if nextCR >= 0:
+        return strg[lastCR+1:nextCR]
+    else:
+        return strg[lastCR+1:]
+
+def _defaultStartDebugAction( instring, loc, expr ):
+    print (("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )))
+
+def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ):
+    print ("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
+
+def _defaultExceptionDebugAction( instring, loc, expr, exc ):
+    print ("Exception raised:" + _ustr(exc))
+
+def nullDebugAction(*args):
+    """'Do-nothing' debug action, to suppress debugging output during parsing."""
+    pass
+
+# Only works on Python 3.x - nonlocal is toxic to Python 2 installs
+#~ 'decorator to trim function calls to match the arity of the target'
+#~ def _trim_arity(func, maxargs=3):
+    #~ if func in singleArgBuiltins:
+        #~ return lambda s,l,t: func(t)
+    #~ limit = 0
+    #~ foundArity = False
+    #~ def wrapper(*args):
+        #~ nonlocal limit,foundArity
+        #~ while 1:
+            #~ try:
+                #~ ret = func(*args[limit:])
+                #~ foundArity = True
+                #~ return ret
+            #~ except TypeError:
+                #~ if limit == maxargs or foundArity:
+                    #~ raise
+                #~ limit += 1
+                #~ continue
+    #~ return wrapper
+
+# this version is Python 2.x-3.x cross-compatible
+'decorator to trim function calls to match the arity of the target'
+def _trim_arity(func, maxargs=2):
+    if func in singleArgBuiltins:
+        return lambda s,l,t: func(t)
+    limit = [0]
+    foundArity = [False]
+    
+    # traceback return data structure changed in Py3.5 - normalize back to plain tuples
+    if system_version[:2] >= (3,5):
+        def extract_stack(limit=0):
+            # special handling for Python 3.5.0 - extra deep call stack by 1
+            offset = -3 if system_version == (3,5,0) else -2
+            frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
+            return [(frame_summary.filename, frame_summary.lineno)]
+        def extract_tb(tb, limit=0):
+            frames = traceback.extract_tb(tb, limit=limit)
+            frame_summary = frames[-1]
+            return [(frame_summary.filename, frame_summary.lineno)]
+    else:
+        extract_stack = traceback.extract_stack
+        extract_tb = traceback.extract_tb
+    
+    # synthesize what would be returned by traceback.extract_stack at the call to 
+    # user's parse action 'func', so that we don't incur call penalty at parse time
+    
+    LINE_DIFF = 6
+    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND 
+    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
+    this_line = extract_stack(limit=2)[-1]
+    pa_call_line_synth = (this_line[0], this_line[1]+LINE_DIFF)
+
+    def wrapper(*args):
+        while 1:
+            try:
+                ret = func(*args[limit[0]:])
+                foundArity[0] = True
+                return ret
+            except TypeError:
+                # re-raise TypeErrors if they did not come from our arity testing
+                if foundArity[0]:
+                    raise
+                else:
+                    try:
+                        tb = sys.exc_info()[-1]
+                        if not extract_tb(tb, limit=2)[-1][:2] == pa_call_line_synth:
+                            raise
+                    finally:
+                        del tb
+
+                if limit[0] <= maxargs:
+                    limit[0] += 1
+                    continue
+                raise
+
+    # copy func name to wrapper for sensible debug output
+    func_name = "<parse action>"
+    try:
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    wrapper.__name__ = func_name
+
+    return wrapper
+
+class ParserElement(object):
+    """Abstract base level parser element class."""
+    DEFAULT_WHITE_CHARS = " \n\t\r"
+    verbose_stacktrace = False
+
+    @staticmethod
+    def setDefaultWhitespaceChars( chars ):
+        r"""
+        Overrides the default whitespace chars
+
+        Example::
+            # default whitespace chars are space, <TAB> and newline
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
+            
+            # change to just treat newline as significant
+            ParserElement.setDefaultWhitespaceChars(" \t")
+            OneOrMore(Word(alphas)).parseString("abc def\nghi jkl")  # -> ['abc', 'def']
+        """
+        ParserElement.DEFAULT_WHITE_CHARS = chars
+
+    @staticmethod
+    def inlineLiteralsUsing(cls):
+        """
+        Set class to be used for inclusion of string literals into a parser.
+        
+        Example::
+            # default literal class used is Literal
+            integer = Word(nums)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+
+            # change to Suppress
+            ParserElement.inlineLiteralsUsing(Suppress)
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")           
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '12', '31']
+        """
+        ParserElement._literalStringClass = cls
+
+    def __init__( self, savelist=False ):
+        self.parseAction = list()
+        self.failAction = None
+        #~ self.name = "<unknown>"  # don't define self.name, let subclasses try/except upcall
+        self.strRepr = None
+        self.resultsName = None
+        self.saveAsList = savelist
+        self.skipWhitespace = True
+        self.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        self.copyDefaultWhiteChars = True
+        self.mayReturnEmpty = False # used when checking for left-recursion
+        self.keepTabs = False
+        self.ignoreExprs = list()
+        self.debug = False
+        self.streamlined = False
+        self.mayIndexError = True # used to optimize exception handling for subclasses that don't advance parse index
+        self.errmsg = ""
+        self.modalResults = True # used to mark results names as modal (report only last) or cumulative (list all)
+        self.debugActions = ( None, None, None ) #custom debug actions
+        self.re = None
+        self.callPreparse = True # used to avoid redundant calls to preParse
+        self.callDuringTry = False
+
+    def copy( self ):
+        """
+        Make a copy of this C{ParserElement}.  Useful for defining different parse actions
+        for the same parsing pattern, using copies of the original parse element.
+        
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            integerK = integer.copy().addParseAction(lambda toks: toks[0]*1024) + Suppress("K")
+            integerM = integer.copy().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+            
+            print(OneOrMore(integerK | integerM | integer).parseString("5K 100 640K 256M"))
+        prints::
+            [5120, 100, 655360, 268435456]
+        Equivalent form of C{expr.copy()} is just C{expr()}::
+            integerM = integer().addParseAction(lambda toks: toks[0]*1024*1024) + Suppress("M")
+        """
+        cpy = copy.copy( self )
+        cpy.parseAction = self.parseAction[:]
+        cpy.ignoreExprs = self.ignoreExprs[:]
+        if self.copyDefaultWhiteChars:
+            cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS
+        return cpy
+
+    def setName( self, name ):
+        """
+        Define name for this expression, makes debugging and exception messages clearer.
+        
+        Example::
+            Word(nums).parseString("ABC")  # -> Exception: Expected W:(0123...) (at char 0), (line:1, col:1)
+            Word(nums).setName("integer").parseString("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+        """
+        self.name = name
+        self.errmsg = "Expected " + self.name
+        if hasattr(self,"exception"):
+            self.exception.msg = self.errmsg
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        """
+        Define name for referencing matching tokens as a nested attribute
+        of the returned parse results.
+        NOTE: this returns a *copy* of the original C{ParserElement} object;
+        this is so that the client can define a basic element, such as an
+        integer, and reference it in multiple places with different names.
+
+        You can also set results names using the abbreviated syntax,
+        C{expr("name")} in place of C{expr.setResultsName("name")} - 
+        see L{I{__call__}<__call__>}.
+
+        Example::
+            date_str = (integer.setResultsName("year") + '/' 
+                        + integer.setResultsName("month") + '/' 
+                        + integer.setResultsName("day"))
+
+            # equivalent form:
+            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+        """
+        newself = self.copy()
+        if name.endswith("*"):
+            name = name[:-1]
+            listAllMatches=True
+        newself.resultsName = name
+        newself.modalResults = not listAllMatches
+        return newself
+
+    def setBreak(self,breakFlag = True):
+        """Method to invoke the Python pdb debugger when this element is
+           about to be parsed. Set C{breakFlag} to True to enable, False to
+           disable.
+        """
+        if breakFlag:
+            _parseMethod = self._parse
+            def breaker(instring, loc, doActions=True, callPreParse=True):
+                import pdb
+                pdb.set_trace()
+                return _parseMethod( instring, loc, doActions, callPreParse )
+            breaker._originalParseMethod = _parseMethod
+            self._parse = breaker
+        else:
+            if hasattr(self._parse,"_originalParseMethod"):
+                self._parse = self._parse._originalParseMethod
+        return self
+
+    def setParseAction( self, *fns, **kwargs ):
+        """
+        Define action to perform when successfully matching parse element definition.
+        Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
+        C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
+         - s   = the original string being parsed (see note below)
+         - loc = the location of the matching substring
+         - toks = a list of the matched tokens, packaged as a C{L{ParseResults}} object
+        If the functions in fns modify the tokens, they can return them as the return
+        value from fn, and the modified list of tokens will replace the original.
+        Otherwise, fn does not need to return any value.
+
+        Optional keyword arguments:
+         - callDuringTry = (default=C{False}) indicate if parse action should be run during lookaheads and alternate testing
+
+        Note: the default parsing behavior is to expand tabs in the input string
+        before starting the parsing process.  See L{I{parseString}<parseString>} for more information
+        on parsing strings containing C{<TAB>}s, and suggested methods to maintain a
+        consistent view of the parsed string, the parse location, and line and column
+        positions within the parsed string.
+        
+        Example::
+            integer = Word(nums)
+            date_str = integer + '/' + integer + '/' + integer
+
+            date_str.parseString("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+
+            # use parse action to convert to ints at parse time
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            date_str = integer + '/' + integer + '/' + integer
+
+            # note that integer fields are now ints, not strings
+            date_str.parseString("1999/12/31")  # -> [1999, '/', 12, '/', 31]
+        """
+        self.parseAction = list(map(_trim_arity, list(fns)))
+        self.callDuringTry = kwargs.get("callDuringTry", False)
+        return self
+
+    def addParseAction( self, *fns, **kwargs ):
+        """
+        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
+        
+        See examples in L{I{copy}<copy>}.
+        """
+        self.parseAction += list(map(_trim_arity, list(fns)))
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def addCondition(self, *fns, **kwargs):
+        """Add a boolean predicate function to expression's list of parse actions. See 
+        L{I{setParseAction}<setParseAction>} for function call signatures. Unlike C{setParseAction}, 
+        functions passed to C{addCondition} need to return boolean success/fail of the condition.
+
+        Optional keyword arguments:
+         - message = define a custom message to be used in the raised exception
+         - fatal   = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise ParseException
+         
+        Example::
+            integer = Word(nums).setParseAction(lambda toks: int(toks[0]))
+            year_int = integer.copy()
+            year_int.addCondition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
+            date_str = year_int + '/' + integer + '/' + integer
+
+            result = date_str.parseString("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0), (line:1, col:1)
+        """
+        msg = kwargs.get("message", "failed user-defined condition")
+        exc_type = ParseFatalException if kwargs.get("fatal", False) else ParseException
+        for fn in fns:
+            def pa(s,l,t):
+                if not bool(_trim_arity(fn)(s,l,t)):
+                    raise exc_type(s,l,msg)
+            self.parseAction.append(pa)
+        self.callDuringTry = self.callDuringTry or kwargs.get("callDuringTry", False)
+        return self
+
+    def setFailAction( self, fn ):
+        """Define action to perform if parsing fails at this expression.
+           Fail acton fn is a callable function that takes the arguments
+           C{fn(s,loc,expr,err)} where:
+            - s = string being parsed
+            - loc = location where expression match was attempted and failed
+            - expr = the parse expression that failed
+            - err = the exception thrown
+           The function returns no value.  It may throw C{L{ParseFatalException}}
+           if it is desired to stop parsing immediately."""
+        self.failAction = fn
+        return self
+
+    def _skipIgnorables( self, instring, loc ):
+        exprsFound = True
+        while exprsFound:
+            exprsFound = False
+            for e in self.ignoreExprs:
+                try:
+                    while 1:
+                        loc,dummy = e._parse( instring, loc )
+                        exprsFound = True
+                except ParseException:
+                    pass
+        return loc
+
+    def preParse( self, instring, loc ):
+        if self.ignoreExprs:
+            loc = self._skipIgnorables( instring, loc )
+
+        if self.skipWhitespace:
+            wt = self.whiteChars
+            instrlen = len(instring)
+            while loc < instrlen and instring[loc] in wt:
+                loc += 1
+
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        return loc, []
+
+    def postParse( self, instring, loc, tokenlist ):
+        return tokenlist
+
+    #~ @profile
+    def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
+        debugging = ( self.debug ) #and doActions )
+
+        if debugging or self.failAction:
+            #~ print ("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
+            if (self.debugActions[0] ):
+                self.debugActions[0]( instring, loc, self )
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            try:
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            except ParseBaseException as err:
+                #~ print ("Exception raised:", err)
+                if self.debugActions[2]:
+                    self.debugActions[2]( instring, tokensStart, self, err )
+                if self.failAction:
+                    self.failAction( instring, tokensStart, self, err )
+                raise
+        else:
+            if callPreParse and self.callPreparse:
+                preloc = self.preParse( instring, loc )
+            else:
+                preloc = loc
+            tokensStart = preloc
+            if self.mayIndexError or loc >= len(instring):
+                try:
+                    loc,tokens = self.parseImpl( instring, preloc, doActions )
+                except IndexError:
+                    raise ParseException( instring, len(instring), self.errmsg, self )
+            else:
+                loc,tokens = self.parseImpl( instring, preloc, doActions )
+
+        tokens = self.postParse( instring, loc, tokens )
+
+        retTokens = ParseResults( tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults )
+        if self.parseAction and (doActions or self.callDuringTry):
+            if debugging:
+                try:
+                    for fn in self.parseAction:
+                        tokens = fn( instring, tokensStart, retTokens )
+                        if tokens is not None:
+                            retTokens = ParseResults( tokens,
+                                                      self.resultsName,
+                                                      asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                      modal=self.modalResults )
+                except ParseBaseException as err:
+                    #~ print "Exception raised in user parse action:", err
+                    if (self.debugActions[2] ):
+                        self.debugActions[2]( instring, tokensStart, self, err )
+                    raise
+            else:
+                for fn in self.parseAction:
+                    tokens = fn( instring, tokensStart, retTokens )
+                    if tokens is not None:
+                        retTokens = ParseResults( tokens,
+                                                  self.resultsName,
+                                                  asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
+                                                  modal=self.modalResults )
+
+        if debugging:
+            #~ print ("Matched",self,"->",retTokens.asList())
+            if (self.debugActions[1] ):
+                self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
+
+        return loc, retTokens
+
+    def tryParse( self, instring, loc ):
+        try:
+            return self._parse( instring, loc, doActions=False )[0]
+        except ParseFatalException:
+            raise ParseException( instring, loc, self.errmsg, self)
+    
+    def canParseNext(self, instring, loc):
+        try:
+            self.tryParse(instring, loc)
+        except (ParseException, IndexError):
+            return False
+        else:
+            return True
+
+    class _UnboundedCache(object):
+        def __init__(self):
+            cache = {}
+            self.not_in_cache = not_in_cache = object()
+
+            def get(self, key):
+                return cache.get(key, not_in_cache)
+
+            def set(self, key, value):
+                cache[key] = value
+
+            def clear(self):
+                cache.clear()
+
+            self.get = types.MethodType(get, self)
+            self.set = types.MethodType(set, self)
+            self.clear = types.MethodType(clear, self)
+
+    if _OrderedDict is not None:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = _OrderedDict()
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.popitem(False)
+
+                def clear(self):
+                    cache.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    else:
+        class _FifoCache(object):
+            def __init__(self, size):
+                self.not_in_cache = not_in_cache = object()
+
+                cache = {}
+                key_fifo = collections.deque([], size)
+
+                def get(self, key):
+                    return cache.get(key, not_in_cache)
+
+                def set(self, key, value):
+                    cache[key] = value
+                    if len(cache) > size:
+                        cache.pop(key_fifo.popleft(), None)
+                    key_fifo.append(key)
+
+                def clear(self):
+                    cache.clear()
+                    key_fifo.clear()
+
+                self.get = types.MethodType(get, self)
+                self.set = types.MethodType(set, self)
+                self.clear = types.MethodType(clear, self)
+
+    # argument cache for optimizing repeated calls when backtracking through recursive expressions
+    packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
+    packrat_cache_lock = RLock()
+    packrat_cache_stats = [0, 0]
+
+    # this method gets repeatedly called during backtracking with the same arguments -
+    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
+    def _parseCache( self, instring, loc, doActions=True, callPreParse=True ):
+        HIT, MISS = 0, 1
+        lookup = (self, instring, loc, callPreParse, doActions)
+        with ParserElement.packrat_cache_lock:
+            cache = ParserElement.packrat_cache
+            value = cache.get(lookup)
+            if value is cache.not_in_cache:
+                ParserElement.packrat_cache_stats[MISS] += 1
+                try:
+                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
+                except ParseBaseException as pe:
+                    # cache a copy of the exception, without the traceback
+                    cache.set(lookup, pe.__class__(*pe.args))
+                    raise
+                else:
+                    cache.set(lookup, (value[0], value[1].copy()))
+                    return value
+            else:
+                ParserElement.packrat_cache_stats[HIT] += 1
+                if isinstance(value, Exception):
+                    raise value
+                return (value[0], value[1].copy())
+
+    _parse = _parseNoCache
+
+    @staticmethod
+    def resetCache():
+        ParserElement.packrat_cache.clear()
+        ParserElement.packrat_cache_stats[:] = [0] * len(ParserElement.packrat_cache_stats)
+
+    _packratEnabled = False
+    @staticmethod
+    def enablePackrat(cache_size_limit=128):
+        """Enables "packrat" parsing, which adds memoizing to the parsing logic.
+           Repeated parse attempts at the same string location (which happens
+           often in many complex grammars) can immediately return a cached value,
+           instead of re-executing parsing/validating code.  Memoizing is done of
+           both valid results and parsing exceptions.
+           
+           Parameters:
+            - cache_size_limit - (default=C{128}) - if an integer value is provided
+              will limit the size of the packrat cache; if None is passed, then
+              the cache size will be unbounded; if 0 is passed, the cache will
+              be effectively disabled.
+            
+           This speedup may break existing programs that use parse actions that
+           have side-effects.  For this reason, packrat parsing is disabled when
+           you first import pyparsing.  To activate the packrat feature, your
+           program must call the class method C{ParserElement.enablePackrat()}.  If
+           your program uses C{psyco} to "compile as you go", you must call
+           C{enablePackrat} before calling C{psyco.full()}.  If you do not do this,
+           Python will crash.  For best results, call C{enablePackrat()} immediately
+           after importing pyparsing.
+           
+           Example::
+               import pyparsing
+               pyparsing.ParserElement.enablePackrat()
+        """
+        if not ParserElement._packratEnabled:
+            ParserElement._packratEnabled = True
+            if cache_size_limit is None:
+                ParserElement.packrat_cache = ParserElement._UnboundedCache()
+            else:
+                ParserElement.packrat_cache = ParserElement._FifoCache(cache_size_limit)
+            ParserElement._parse = ParserElement._parseCache
+
+    def parseString( self, instring, parseAll=False ):
+        """
+        Execute the parse expression with the given string.
+        This is the main interface to the client code, once the complete
+        expression has been built.
+
+        If you want the grammar to require that the entire input string be
+        successfully parsed, then set C{parseAll} to True (equivalent to ending
+        the grammar with C{L{StringEnd()}}).
+
+        Note: C{parseString} implicitly calls C{expandtabs()} on the input string,
+        in order to report proper column numbers in parse actions.
+        If the input string contains tabs and
+        the grammar uses parse actions that use the C{loc} argument to index into the
+        string being parsed, you can ensure you have a consistent view of the input
+        string by:
+         - calling C{parseWithTabs} on your grammar before calling C{parseString}
+           (see L{I{parseWithTabs}<parseWithTabs>})
+         - define your parse action using the full C{(s,loc,toks)} signature, and
+           reference the input string using the parse action's C{s} argument
+         - explictly expand the tabs in your input string before calling
+           C{parseString}
+        
+        Example::
+            Word('a').parseString('aaaaabaaa')  # -> ['aaaaa']
+            Word('a').parseString('aaaaabaaa', parseAll=True)  # -> Exception: Expected end of text
+        """
+        ParserElement.resetCache()
+        if not self.streamlined:
+            self.streamline()
+            #~ self.saveAsList = True
+        for e in self.ignoreExprs:
+            e.streamline()
+        if not self.keepTabs:
+            instring = instring.expandtabs()
+        try:
+            loc, tokens = self._parse( instring, 0 )
+            if parseAll:
+                loc = self.preParse( instring, loc )
+                se = Empty() + StringEnd()
+                se._parse( instring, loc )
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+        else:
+            return tokens
+
+    def scanString( self, instring, maxMatches=_MAX_INT, overlap=False ):
+        """
+        Scan the input string for expression matches.  Each match will return the
+        matching tokens, start location, and end location.  May be called with optional
+        C{maxMatches} argument, to clip scanning after 'n' matches are found.  If
+        C{overlap} is specified, then overlapping matches will be reported.
+
+        Note that the start and end locations are reported relative to the string
+        being parsed.  See L{I{parseString}<parseString>} for more information on parsing
+        strings with embedded tabs.
+
+        Example::
+            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
+            print(source)
+            for tokens,start,end in Word(alphas).scanString(source):
+                print(' '*start + '^'*(end-start))
+                print(' '*start + tokens[0])
+        
+        prints::
+        
+            sldjf123lsdjjkf345sldkjf879lkjsfd987
+            ^^^^^
+            sldjf
+                    ^^^^^^^
+                    lsdjjkf
+                              ^^^^^^
+                              sldkjf
+                                       ^^^^^^
+                                       lkjsfd
+        """
+        if not self.streamlined:
+            self.streamline()
+        for e in self.ignoreExprs:
+            e.streamline()
+
+        if not self.keepTabs:
+            instring = _ustr(instring).expandtabs()
+        instrlen = len(instring)
+        loc = 0
+        preparseFn = self.preParse
+        parseFn = self._parse
+        ParserElement.resetCache()
+        matches = 0
+        try:
+            while loc <= instrlen and matches < maxMatches:
+                try:
+                    preloc = preparseFn( instring, loc )
+                    nextLoc,tokens = parseFn( instring, preloc, callPreParse=False )
+                except ParseException:
+                    loc = preloc+1
+                else:
+                    if nextLoc > loc:
+                        matches += 1
+                        yield tokens, preloc, nextLoc
+                        if overlap:
+                            nextloc = preparseFn( instring, loc )
+                            if nextloc > loc:
+                                loc = nextLoc
+                            else:
+                                loc += 1
+                        else:
+                            loc = nextLoc
+                    else:
+                        loc = preloc+1
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def transformString( self, instring ):
+        """
+        Extension to C{L{scanString}}, to modify matching text with modified tokens that may
+        be returned from a parse action.  To use C{transformString}, define a grammar and
+        attach a parse action to it that modifies the returned token list.
+        Invoking C{transformString()} on a target string will then scan for matches,
+        and replace the matched text patterns according to the logic in the parse
+        action.  C{transformString()} returns the resulting transformed string.
+        
+        Example::
+            wd = Word(alphas)
+            wd.setParseAction(lambda toks: toks[0].title())
+            
+            print(wd.transformString("now is the winter of our discontent made glorious summer by this sun of york."))
+        Prints::
+            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
+        """
+        out = []
+        lastE = 0
+        # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
+        # keep string locs straight between transformString and scanString
+        self.keepTabs = True
+        try:
+            for t,s,e in self.scanString( instring ):
+                out.append( instring[lastE:s] )
+                if t:
+                    if isinstance(t,ParseResults):
+                        out += t.asList()
+                    elif isinstance(t,list):
+                        out += t
+                    else:
+                        out.append(t)
+                lastE = e
+            out.append(instring[lastE:])
+            out = [o for o in out if o]
+            return "".join(map(_ustr,_flatten(out)))
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def searchString( self, instring, maxMatches=_MAX_INT ):
+        """
+        Another extension to C{L{scanString}}, simplifying the access to the tokens found
+        to match the given parse expression.  May be called with optional
+        C{maxMatches} argument, to clip searching after 'n' matches are found.
+        
+        Example::
+            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
+            cap_word = Word(alphas.upper(), alphas.lower())
+            
+            print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
+        prints::
+            ['More', 'Iron', 'Lead', 'Gold', 'I']
+        """
+        try:
+            return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def split(self, instring, maxsplit=_MAX_INT, includeSeparators=False):
+        """
+        Generator method to split a string using the given expression as a separator.
+        May be called with optional C{maxsplit} argument, to limit the number of splits;
+        and the optional C{includeSeparators} argument (default=C{False}), if the separating
+        matching text should be included in the split results.
+        
+        Example::        
+            punc = oneOf(list(".,;:/-!?"))
+            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
+        prints::
+            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
+        """
+        splits = 0
+        last = 0
+        for t,s,e in self.scanString(instring, maxMatches=maxsplit):
+            yield instring[last:s]
+            if includeSeparators:
+                yield t[0]
+            last = e
+        yield instring[last:]
+
+    def __add__(self, other ):
+        """
+        Implementation of + operator - returns C{L{And}}. Adding strings to a ParserElement
+        converts them to L{Literal}s by default.
+        
+        Example::
+            greet = Word(alphas) + "," + Word(alphas) + "!"
+            hello = "Hello, World!"
+            print (hello, "->", greet.parseString(hello))
+        Prints::
+            Hello, World! -> ['Hello', ',', 'World', '!']
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, other ] )
+
+    def __radd__(self, other ):
+        """
+        Implementation of + operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other + self
+
+    def __sub__(self, other):
+        """
+        Implementation of - operator, returns C{L{And}} with error stop
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return And( [ self, And._ErrorStop(), other ] )
+
+    def __rsub__(self, other ):
+        """
+        Implementation of - operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other - self
+
+    def __mul__(self,other):
+        """
+        Implementation of * operator, allows use of C{expr * 3} in place of
+        C{expr + expr + expr}.  Expressions may also me multiplied by a 2-integer
+        tuple, similar to C{{min,max}} multipliers in regular expressions.  Tuples
+        may also include C{None} as in:
+         - C{expr*(n,None)} or C{expr*(n,)} is equivalent
+              to C{expr*n + L{ZeroOrMore}(expr)}
+              (read as "at least n instances of C{expr}")
+         - C{expr*(None,n)} is equivalent to C{expr*(0,n)}
+              (read as "0 to n instances of C{expr}")
+         - C{expr*(None,None)} is equivalent to C{L{ZeroOrMore}(expr)}
+         - C{expr*(1,None)} is equivalent to C{L{OneOrMore}(expr)}
+
+        Note that C{expr*(None,n)} does not raise an exception if
+        more than n exprs exist in the input stream; that is,
+        C{expr*(None,n)} does not enforce a maximum number of expr
+        occurrences.  If this behavior is desired, then write
+        C{expr*(None,n) + ~expr}
+        """
+        if isinstance(other,int):
+            minElements, optElements = other,0
+        elif isinstance(other,tuple):
+            other = (other + (None, None))[:2]
+            if other[0] is None:
+                other = (0, other[1])
+            if isinstance(other[0],int) and other[1] is None:
+                if other[0] == 0:
+                    return ZeroOrMore(self)
+                if other[0] == 1:
+                    return OneOrMore(self)
+                else:
+                    return self*other[0] + ZeroOrMore(self)
+            elif isinstance(other[0],int) and isinstance(other[1],int):
+                minElements, optElements = other
+                optElements -= minElements
+            else:
+                raise TypeError("cannot multiply 'ParserElement' and ('%s','%s') objects", type(other[0]),type(other[1]))
+        else:
+            raise TypeError("cannot multiply 'ParserElement' and '%s' objects", type(other))
+
+        if minElements < 0:
+            raise ValueError("cannot multiply ParserElement by negative value")
+        if optElements < 0:
+            raise ValueError("second tuple value must be greater or equal to first tuple value")
+        if minElements == optElements == 0:
+            raise ValueError("cannot multiply ParserElement by 0 or (0,0)")
+
+        if (optElements):
+            def makeOptionalList(n):
+                if n>1:
+                    return Optional(self + makeOptionalList(n-1))
+                else:
+                    return Optional(self)
+            if minElements:
+                if minElements == 1:
+                    ret = self + makeOptionalList(optElements)
+                else:
+                    ret = And([self]*minElements) + makeOptionalList(optElements)
+            else:
+                ret = makeOptionalList(optElements)
+        else:
+            if minElements == 1:
+                ret = self
+            else:
+                ret = And([self]*minElements)
+        return ret
+
+    def __rmul__(self, other):
+        return self.__mul__(other)
+
+    def __or__(self, other ):
+        """
+        Implementation of | operator - returns C{L{MatchFirst}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return MatchFirst( [ self, other ] )
+
+    def __ror__(self, other ):
+        """
+        Implementation of | operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other | self
+
+    def __xor__(self, other ):
+        """
+        Implementation of ^ operator - returns C{L{Or}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Or( [ self, other ] )
+
+    def __rxor__(self, other ):
+        """
+        Implementation of ^ operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other ^ self
+
+    def __and__(self, other ):
+        """
+        Implementation of & operator - returns C{L{Each}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return Each( [ self, other ] )
+
+    def __rand__(self, other ):
+        """
+        Implementation of & operator when left operand is not a C{L{ParserElement}}
+        """
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        if not isinstance( other, ParserElement ):
+            warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
+                    SyntaxWarning, stacklevel=2)
+            return None
+        return other & self
+
+    def __invert__( self ):
+        """
+        Implementation of ~ operator - returns C{L{NotAny}}
+        """
+        return NotAny( self )
+
+    def __call__(self, name=None):
+        """
+        Shortcut for C{L{setResultsName}}, with C{listAllMatches=False}.
+        
+        If C{name} is given with a trailing C{'*'} character, then C{listAllMatches} will be
+        passed as C{True}.
+           
+        If C{name} is omitted, same as calling C{L{copy}}.
+
+        Example::
+            # these are equivalent
+            userdata = Word(alphas).setResultsName("name") + Word(nums+"-").setResultsName("socsecno")
+            userdata = Word(alphas)("name") + Word(nums+"-")("socsecno")             
+        """
+        if name is not None:
+            return self.setResultsName(name)
+        else:
+            return self.copy()
+
+    def suppress( self ):
+        """
+        Suppresses the output of this C{ParserElement}; useful to keep punctuation from
+        cluttering up returned output.
+        """
+        return Suppress( self )
+
+    def leaveWhitespace( self ):
+        """
+        Disables the skipping of whitespace before matching the characters in the
+        C{ParserElement}'s defined pattern.  This is normally only used internally by
+        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
+        """
+        self.skipWhitespace = False
+        return self
+
+    def setWhitespaceChars( self, chars ):
+        """
+        Overrides the default whitespace chars
+        """
+        self.skipWhitespace = True
+        self.whiteChars = chars
+        self.copyDefaultWhiteChars = False
+        return self
+
+    def parseWithTabs( self ):
+        """
+        Overrides default behavior to expand C{<TAB>}s to spaces before parsing the input string.
+        Must be called before C{parseString} when the input grammar contains elements that
+        match C{<TAB>} characters.
+        """
+        self.keepTabs = True
+        return self
+
+    def ignore( self, other ):
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        
+        Example::
+            patt = OneOrMore(Word(alphas))
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj']
+            
+            patt.ignore(cStyleComment)
+            patt.parseString('ablaj /* comment */ lskjd') # -> ['ablaj', 'lskjd']
+        """
+        if isinstance(other, basestring):
+            other = Suppress(other)
+
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                self.ignoreExprs.append(other)
+        else:
+            self.ignoreExprs.append( Suppress( other.copy() ) )
+        return self
+
+    def setDebugActions( self, startAction, successAction, exceptionAction ):
+        """
+        Enable display of debugging messages while doing pattern matching.
+        """
+        self.debugActions = (startAction or _defaultStartDebugAction,
+                             successAction or _defaultSuccessDebugAction,
+                             exceptionAction or _defaultExceptionDebugAction)
+        self.debug = True
+        return self
+
+    def setDebug( self, flag=True ):
+        """
+        Enable display of debugging messages while doing pattern matching.
+        Set C{flag} to True to enable, False to disable.
+
+        Example::
+            wd = Word(alphas).setName("alphaword")
+            integer = Word(nums).setName("numword")
+            term = wd | integer
+            
+            # turn on debugging for wd
+            wd.setDebug()
+
+            OneOrMore(term).parseString("abc 123 xyz 890")
+        
+        prints::
+            Match alphaword at loc 0(1,1)
+            Matched alphaword -> ['abc']
+            Match alphaword at loc 3(1,4)
+            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
+            Match alphaword at loc 7(1,8)
+            Matched alphaword -> ['xyz']
+            Match alphaword at loc 11(1,12)
+            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
+            Match alphaword at loc 15(1,16)
+            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
+
+        The output shown is that produced by the default debug actions - custom debug actions can be
+        specified using L{setDebugActions}. Prior to attempting
+        to match the C{wd} expression, the debugging message C{"Match <exprname> at loc <n>(<line>,<col>)"}
+        is shown. Then if the parse succeeds, a C{"Matched"} message is shown, or an C{"Exception raised"}
+        message is shown. Also note the use of L{setName} to assign a human-readable name to the expression,
+        which makes debugging and exception messages easier to understand - for instance, the default
+        name created for the C{Word} expression without calling C{setName} is C{"W:(ABCD...)"}.
+        """
+        if flag:
+            self.setDebugActions( _defaultStartDebugAction, _defaultSuccessDebugAction, _defaultExceptionDebugAction )
+        else:
+            self.debug = False
+        return self
+
+    def __str__( self ):
+        return self.name
+
+    def __repr__( self ):
+        return _ustr(self)
+
+    def streamline( self ):
+        self.streamlined = True
+        self.strRepr = None
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        pass
+
+    def validate( self, validateTrace=[] ):
+        """
+        Check defined expressions for valid structure, check for infinite recursive definitions.
+        """
+        self.checkRecursion( [] )
+
+    def parseFile( self, file_or_filename, parseAll=False ):
+        """
+        Execute the parse expression on the given file or filename.
+        If a filename is specified (instead of a file object),
+        the entire file is opened, read, and closed before parsing.
+        """
+        try:
+            file_contents = file_or_filename.read()
+        except AttributeError:
+            with open(file_or_filename, "r") as f:
+                file_contents = f.read()
+        try:
+            return self.parseString(file_contents, parseAll)
+        except ParseBaseException as exc:
+            if ParserElement.verbose_stacktrace:
+                raise
+            else:
+                # catch and re-raise exception from here, clears out pyparsing internal stack trace
+                raise exc
+
+    def __eq__(self,other):
+        if isinstance(other, ParserElement):
+            return self is other or vars(self) == vars(other)
+        elif isinstance(other, basestring):
+            return self.matches(other)
+        else:
+            return super(ParserElement,self)==other
+
+    def __ne__(self,other):
+        return not (self == other)
+
+    def __hash__(self):
+        return hash(id(self))
+
+    def __req__(self,other):
+        return self == other
+
+    def __rne__(self,other):
+        return not (self == other)
+
+    def matches(self, testString, parseAll=True):
+        """
+        Method for quick testing of a parser against a test string. Good for simple 
+        inline microtests of sub expressions while building up larger parser.
+           
+        Parameters:
+         - testString - to test against this expression for a match
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests
+            
+        Example::
+            expr = Word(nums)
+            assert expr.matches("100")
+        """
+        try:
+            self.parseString(_ustr(testString), parseAll=parseAll)
+            return True
+        except ParseBaseException:
+            return False
+                
+    def runTests(self, tests, parseAll=True, comment='#', fullDump=True, printResults=True, failureTests=False):
+        """
+        Execute the parse expression on a series of test strings, showing each
+        test, the parsed results or where the parse failed. Quick and easy way to
+        run a parse expression against a list of sample strings.
+           
+        Parameters:
+         - tests - a list of separate test strings, or a multiline string of test strings
+         - parseAll - (default=C{True}) - flag to pass to C{L{parseString}} when running tests           
+         - comment - (default=C{'#'}) - expression for indicating embedded comments in the test 
+              string; pass None to disable comment filtering
+         - fullDump - (default=C{True}) - dump results as list followed by results names in nested outline;
+              if False, only dump nested list
+         - printResults - (default=C{True}) prints test output to stdout
+         - failureTests - (default=C{False}) indicates if these tests are expected to fail parsing
+
+        Returns: a (success, results) tuple, where success indicates that all tests succeeded
+        (or failed if C{failureTests} is True), and the results contain a list of lines of each 
+        test's output
+        
+        Example::
+            number_expr = pyparsing_common.number.copy()
+
+            result = number_expr.runTests('''
+                # unsigned integer
+                100
+                # negative integer
+                -100
+                # float with scientific notation
+                6.02e23
+                # integer with scientific notation
+                1e-12
+                ''')
+            print("Success" if result[0] else "Failed!")
+
+            result = number_expr.runTests('''
+                # stray character
+                100Z
+                # missing leading digit before '.'
+                -.100
+                # too many '.'
+                3.14.159
+                ''', failureTests=True)
+            print("Success" if result[0] else "Failed!")
+        prints::
+            # unsigned integer
+            100
+            [100]
+
+            # negative integer
+            -100
+            [-100]
+
+            # float with scientific notation
+            6.02e23
+            [6.02e+23]
+
+            # integer with scientific notation
+            1e-12
+            [1e-12]
+
+            Success
+            
+            # stray character
+            100Z
+               ^
+            FAIL: Expected end of text (at char 3), (line:1, col:4)
+
+            # missing leading digit before '.'
+            -.100
+            ^
+            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
+
+            # too many '.'
+            3.14.159
+                ^
+            FAIL: Expected end of text (at char 4), (line:1, col:5)
+
+            Success
+
+        Each test string must be on a single line. If you want to test a string that spans multiple
+        lines, create a test like this::
+
+            expr.runTest(r"this is a test\\n of strings that spans \\n 3 lines")
+        
+        (Note that this is a raw string literal, you must include the leading 'r'.)
+        """
+        if isinstance(tests, basestring):
+            tests = list(map(str.strip, tests.rstrip().splitlines()))
+        if isinstance(comment, basestring):
+            comment = Literal(comment)
+        allResults = []
+        comments = []
+        success = True
+        for t in tests:
+            if comment is not None and comment.matches(t, False) or comments and not t:
+                comments.append(t)
+                continue
+            if not t:
+                continue
+            out = ['\n'.join(comments), t]
+            comments = []
+            try:
+                t = t.replace(r'\n','\n')
+                result = self.parseString(t, parseAll=parseAll)
+                out.append(result.dump(full=fullDump))
+                success = success and not failureTests
+            except ParseBaseException as pe:
+                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
+                if '\n' in t:
+                    out.append(line(pe.loc, t))
+                    out.append(' '*(col(pe.loc,t)-1) + '^' + fatal)
+                else:
+                    out.append(' '*pe.loc + '^' + fatal)
+                out.append("FAIL: " + str(pe))
+                success = success and failureTests
+                result = pe
+            except Exception as exc:
+                out.append("FAIL-EXCEPTION: " + str(exc))
+                success = success and failureTests
+                result = exc
+
+            if printResults:
+                if fullDump:
+                    out.append('')
+                print('\n'.join(out))
+
+            allResults.append((t, result))
+        
+        return success, allResults
+
+        
+class Token(ParserElement):
+    """
+    Abstract C{ParserElement} subclass, for defining atomic matching patterns.
+    """
+    def __init__( self ):
+        super(Token,self).__init__( savelist=False )
+
+
+class Empty(Token):
+    """
+    An empty token, will always match.
+    """
+    def __init__( self ):
+        super(Empty,self).__init__()
+        self.name = "Empty"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+
+class NoMatch(Token):
+    """
+    A token that will never match.
+    """
+    def __init__( self ):
+        super(NoMatch,self).__init__()
+        self.name = "NoMatch"
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.errmsg = "Unmatchable token"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
+class Literal(Token):
+    """
+    Token to exactly match a specified string.
+    
+    Example::
+        Literal('blah').parseString('blah')  # -> ['blah']
+        Literal('blah').parseString('blahfooblah')  # -> ['blah']
+        Literal('blah').parseString('bla')  # -> Exception: Expected "blah"
+    
+    For case-insensitive matching, use L{CaselessLiteral}.
+    
+    For keyword matching (force word break before and after the matched string),
+    use L{Keyword} or L{CaselessKeyword}.
+    """
+    def __init__( self, matchString ):
+        super(Literal,self).__init__()
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Literal; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+            self.__class__ = Empty
+        self.name = '"%s"' % _ustr(self.match)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+
+    # Performance tuning: this routine gets called a *lot*
+    # if this is a single character match string  and the first character matches,
+    # short-circuit as quickly as possible, and avoid calling startswith
+    #~ @profile
+    def parseImpl( self, instring, loc, doActions=True ):
+        if (instring[loc] == self.firstMatchChar and
+            (self.matchLen==1 or instring.startswith(self.match,loc)) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+_L = Literal
+ParserElement._literalStringClass = Literal
+
+class Keyword(Token):
+    """
+    Token to exactly match a specified string as a keyword, that is, it must be
+    immediately followed by a non-keyword character.  Compare with C{L{Literal}}:
+     - C{Literal("if")} will match the leading C{'if'} in C{'ifAndOnlyIf'}.
+     - C{Keyword("if")} will not; it will only match the leading C{'if'} in C{'if x=1'}, or C{'if(y==2)'}
+    Accepts two optional constructor arguments in addition to the keyword string:
+     - C{identChars} is a string of characters that would be valid identifier characters,
+          defaulting to all alphanumerics + "_" and "$"
+     - C{caseless} allows case-insensitive matching, default is C{False}.
+       
+    Example::
+        Keyword("start").parseString("start")  # -> ['start']
+        Keyword("start").parseString("starting")  # -> Exception
+
+    For case-insensitive matching, use L{CaselessKeyword}.
+    """
+    DEFAULT_KEYWORD_CHARS = alphanums+"_$"
+
+    def __init__( self, matchString, identChars=None, caseless=False ):
+        super(Keyword,self).__init__()
+        if identChars is None:
+            identChars = Keyword.DEFAULT_KEYWORD_CHARS
+        self.match = matchString
+        self.matchLen = len(matchString)
+        try:
+            self.firstMatchChar = matchString[0]
+        except IndexError:
+            warnings.warn("null string passed to Keyword; use Empty() instead",
+                            SyntaxWarning, stacklevel=2)
+        self.name = '"%s"' % self.match
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = False
+        self.mayIndexError = False
+        self.caseless = caseless
+        if caseless:
+            self.caselessmatch = matchString.upper()
+            identChars = identChars.upper()
+        self.identChars = set(identChars)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.caseless:
+            if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+                 (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) and
+                 (loc == 0 or instring[loc-1].upper() not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        else:
+            if (instring[loc] == self.firstMatchChar and
+                (self.matchLen==1 or instring.startswith(self.match,loc)) and
+                (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) and
+                (loc == 0 or instring[loc-1] not in self.identChars) ):
+                return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+    def copy(self):
+        c = super(Keyword,self).copy()
+        c.identChars = Keyword.DEFAULT_KEYWORD_CHARS
+        return c
+
+    @staticmethod
+    def setDefaultKeywordChars( chars ):
+        """Overrides the default Keyword chars
+        """
+        Keyword.DEFAULT_KEYWORD_CHARS = chars
+
+class CaselessLiteral(Literal):
+    """
+    Token to match a specified string, ignoring case of letters.
+    Note: the matched results will always be in the case of the given
+    match string, NOT the case of the input text.
+
+    Example::
+        OneOrMore(CaselessLiteral("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessKeyword}.)
+    """
+    def __init__( self, matchString ):
+        super(CaselessLiteral,self).__init__( matchString.upper() )
+        # Preserve the defining literal.
+        self.returnString = matchString
+        self.name = "'%s'" % self.returnString
+        self.errmsg = "Expected " + self.name
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[ loc:loc+self.matchLen ].upper() == self.match:
+            return loc+self.matchLen, self.returnString
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class CaselessKeyword(Keyword):
+    """
+    Caseless version of L{Keyword}.
+
+    Example::
+        OneOrMore(CaselessKeyword("CMD")).parseString("cmd CMD Cmd10") # -> ['CMD', 'CMD']
+        
+    (Contrast with example for L{CaselessLiteral}.)
+    """
+    def __init__( self, matchString, identChars=None ):
+        super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True )
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and
+             (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ):
+            return loc+self.matchLen, self.match
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class CloseMatch(Token):
+    """
+    A variation on L{Literal} which matches "close" matches, that is, 
+    strings with at most 'n' mismatching characters. C{CloseMatch} takes parameters:
+     - C{match_string} - string to be matched
+     - C{maxMismatches} - (C{default=1}) maximum number of mismatches allowed to count as a match
+    
+    The results from a successful parse will contain the matched text from the input string and the following named results:
+     - C{mismatches} - a list of the positions within the match_string where mismatches were found
+     - C{original} - the original match_string used to compare against the input string
+    
+    If C{mismatches} is an empty list, then the match was an exact match.
+    
+    Example::
+        patt = CloseMatch("ATCATCGAATGGA")
+        patt.parseString("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
+        patt.parseString("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
+
+        # exact match
+        patt.parseString("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
+
+        # close match allowing up to 2 mismatches
+        patt = CloseMatch("ATCATCGAATGGA", maxMismatches=2)
+        patt.parseString("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
+    """
+    def __init__(self, match_string, maxMismatches=1):
+        super(CloseMatch,self).__init__()
+        self.name = match_string
+        self.match_string = match_string
+        self.maxMismatches = maxMismatches
+        self.errmsg = "Expected %r (with up to %d mismatches)" % (self.match_string, self.maxMismatches)
+        self.mayIndexError = False
+        self.mayReturnEmpty = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        start = loc
+        instrlen = len(instring)
+        maxloc = start + len(self.match_string)
+
+        if maxloc <= instrlen:
+            match_string = self.match_string
+            match_stringloc = 0
+            mismatches = []
+            maxMismatches = self.maxMismatches
+
+            for match_stringloc,s_m in enumerate(zip(instring[loc:maxloc], self.match_string)):
+                src,mat = s_m
+                if src != mat:
+                    mismatches.append(match_stringloc)
+                    if len(mismatches) > maxMismatches:
+                        break
+            else:
+                loc = match_stringloc + 1
+                results = ParseResults([instring[start:loc]])
+                results['original'] = self.match_string
+                results['mismatches'] = mismatches
+                return loc, results
+
+        raise ParseException(instring, loc, self.errmsg, self)
+
+
+class Word(Token):
+    """
+    Token for matching words composed of allowed character sets.
+    Defined with string containing all allowed initial characters,
+    an optional string containing allowed body characters (if omitted,
+    defaults to the initial character set), and an optional minimum,
+    maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction. An optional
+    C{excludeChars} parameter can list characters that might be found in 
+    the input C{bodyChars} string; useful to define a word of all printables
+    except for one or two characters, for instance.
+    
+    L{srange} is useful for defining custom character set strings for defining 
+    C{Word} expressions, using range notation from regular expression character sets.
+    
+    A common mistake is to use C{Word} to match a specific literal string, as in 
+    C{Word("Address")}. Remember that C{Word} uses the string argument to define
+    I{sets} of matchable characters. This expression would match "Add", "AAA",
+    "dAred", or any other word made up of the characters 'A', 'd', 'r', 'e', and 's'.
+    To match an exact literal string, use L{Literal} or L{Keyword}.
+
+    pyparsing includes helper strings for building Words:
+     - L{alphas}
+     - L{nums}
+     - L{alphanums}
+     - L{hexnums}
+     - L{alphas8bit} (alphabetic characters in ASCII range 128-255 - accented, tilded, umlauted, etc.)
+     - L{punc8bit} (non-alphabetic characters in ASCII range 128-255 - currency, symbols, superscripts, diacriticals, etc.)
+     - L{printables} (any non-whitespace character)
+
+    Example::
+        # a word composed of digits
+        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
+        
+        # a word with a leading capital, and zero or more lowercase
+        capital_word = Word(alphas.upper(), alphas.lower())
+
+        # hostnames are alphanumeric, with leading alpha, and '-'
+        hostname = Word(alphas, alphanums+'-')
+        
+        # roman numeral (not a strict parser, accepts invalid mix of characters)
+        roman = Word("IVXLCDM")
+        
+        # any string of non-whitespace characters, except for ','
+        csv_value = Word(printables, excludeChars=",")
+    """
+    def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False, excludeChars=None ):
+        super(Word,self).__init__()
+        if excludeChars:
+            initChars = ''.join(c for c in initChars if c not in excludeChars)
+            if bodyChars:
+                bodyChars = ''.join(c for c in bodyChars if c not in excludeChars)
+        self.initCharsOrig = initChars
+        self.initChars = set(initChars)
+        if bodyChars :
+            self.bodyCharsOrig = bodyChars
+            self.bodyChars = set(bodyChars)
+        else:
+            self.bodyCharsOrig = initChars
+            self.bodyChars = set(initChars)
+
+        self.maxSpecified = max > 0
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(Word()) if zero-length word is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.asKeyword = asKeyword
+
+        if ' ' not in self.initCharsOrig+self.bodyCharsOrig and (min==1 and max==0 and exact==0):
+            if self.bodyCharsOrig == self.initCharsOrig:
+                self.reString = "[%s]+" % _escapeRegexRangeChars(self.initCharsOrig)
+            elif len(self.initCharsOrig) == 1:
+                self.reString = "%s[%s]*" % \
+                                      (re.escape(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            else:
+                self.reString = "[%s][%s]*" % \
+                                      (_escapeRegexRangeChars(self.initCharsOrig),
+                                      _escapeRegexRangeChars(self.bodyCharsOrig),)
+            if self.asKeyword:
+                self.reString = r"\b"+self.reString+r"\b"
+            try:
+                self.re = re.compile( self.reString )
+            except Exception:
+                self.re = None
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.re:
+            result = self.re.match(instring,loc)
+            if not result:
+                raise ParseException(instring, loc, self.errmsg, self)
+
+            loc = result.end()
+            return loc, result.group()
+
+        if not(instring[ loc ] in self.initChars):
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        instrlen = len(instring)
+        bodychars = self.bodyChars
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, instrlen )
+        while loc < maxloc and instring[loc] in bodychars:
+            loc += 1
+
+        throwException = False
+        if loc - start < self.minLen:
+            throwException = True
+        if self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
+            throwException = True
+        if self.asKeyword:
+            if (start>0 and instring[start-1] in bodychars) or (loc<instrlen and instring[loc] in bodychars):
+                throwException = True
+
+        if throwException:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(Word,self).__str__()
+        except Exception:
+            pass
+
+
+        if self.strRepr is None:
+
+            def charsAsStr(s):
+                if len(s)>4:
+                    return s[:4]+"..."
+                else:
+                    return s
+
+            if ( self.initCharsOrig != self.bodyCharsOrig ):
+                self.strRepr = "W:(%s,%s)" % ( charsAsStr(self.initCharsOrig), charsAsStr(self.bodyCharsOrig) )
+            else:
+                self.strRepr = "W:(%s)" % charsAsStr(self.initCharsOrig)
+
+        return self.strRepr
+
+
+class Regex(Token):
+    """
+    Token for matching strings that match a given regular expression.
+    Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
+    If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
+    named parse results.
+
+    Example::
+        realnum = Regex(r"[+-]?\d+\.\d*")
+        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
+        # ref: http://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
+        roman = Regex(r"M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
+    """
+    compiledREtype = type(re.compile("[A-Z]"))
+    def __init__( self, pattern, flags=0):
+        """The parameters C{pattern} and C{flags} are passed to the C{re.compile()} function as-is. See the Python C{re} module for an explanation of the acceptable patterns and flags."""
+        super(Regex,self).__init__()
+
+        if isinstance(pattern, basestring):
+            if not pattern:
+                warnings.warn("null string passed to Regex; use Empty() instead",
+                        SyntaxWarning, stacklevel=2)
+
+            self.pattern = pattern
+            self.flags = flags
+
+            try:
+                self.re = re.compile(self.pattern, self.flags)
+                self.reString = self.pattern
+            except sre_constants.error:
+                warnings.warn("invalid pattern (%s) passed to Regex" % pattern,
+                    SyntaxWarning, stacklevel=2)
+                raise
+
+        elif isinstance(pattern, Regex.compiledREtype):
+            self.re = pattern
+            self.pattern = \
+            self.reString = str(pattern)
+            self.flags = flags
+            
+        else:
+            raise ValueError("Regex may only be constructed with a string or a compiled RE object")
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = self.re.match(instring,loc)
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        d = result.groupdict()
+        ret = ParseResults(result.group())
+        if d:
+            for k in d:
+                ret[k] = d[k]
+        return loc,ret
+
+    def __str__( self ):
+        try:
+            return super(Regex,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "Re:(%s)" % repr(self.pattern)
+
+        return self.strRepr
+
+
+class QuotedString(Token):
+    r"""
+    Token for matching strings that are delimited by quoting characters.
+    
+    Defined with the following parameters:
+        - quoteChar - string of one or more characters defining the quote delimiting string
+        - escChar - character to escape quotes, typically backslash (default=C{None})
+        - escQuote - special quote sequence to escape an embedded quote string (such as SQL's "" to escape an embedded ") (default=C{None})
+        - multiline - boolean indicating whether quotes can span multiple lines (default=C{False})
+        - unquoteResults - boolean indicating whether the matched text should be unquoted (default=C{True})
+        - endQuoteChar - string of one or more characters defining the end of the quote delimited string (default=C{None} => same as quoteChar)
+        - convertWhitespaceEscapes - convert escaped whitespace (C{'\t'}, C{'\n'}, etc.) to actual whitespace (default=C{True})
+
+    Example::
+        qs = QuotedString('"')
+        print(qs.searchString('lsjdf "This is the quote" sldjf'))
+        complex_qs = QuotedString('{{', endQuoteChar='}}')
+        print(complex_qs.searchString('lsjdf {{This is the "quote"}} sldjf'))
+        sql_qs = QuotedString('"', escQuote='""')
+        print(sql_qs.searchString('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
+    prints::
+        [['This is the quote']]
+        [['This is the "quote"']]
+        [['This is the quote with "embedded" quotes']]
+    """
+    def __init__( self, quoteChar, escChar=None, escQuote=None, multiline=False, unquoteResults=True, endQuoteChar=None, convertWhitespaceEscapes=True):
+        super(QuotedString,self).__init__()
+
+        # remove white space from quote chars - wont work anyway
+        quoteChar = quoteChar.strip()
+        if not quoteChar:
+            warnings.warn("quoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+            raise SyntaxError()
+
+        if endQuoteChar is None:
+            endQuoteChar = quoteChar
+        else:
+            endQuoteChar = endQuoteChar.strip()
+            if not endQuoteChar:
+                warnings.warn("endQuoteChar cannot be the empty string",SyntaxWarning,stacklevel=2)
+                raise SyntaxError()
+
+        self.quoteChar = quoteChar
+        self.quoteCharLen = len(quoteChar)
+        self.firstQuoteChar = quoteChar[0]
+        self.endQuoteChar = endQuoteChar
+        self.endQuoteCharLen = len(endQuoteChar)
+        self.escChar = escChar
+        self.escQuote = escQuote
+        self.unquoteResults = unquoteResults
+        self.convertWhitespaceEscapes = convertWhitespaceEscapes
+
+        if multiline:
+            self.flags = re.MULTILINE | re.DOTALL
+            self.pattern = r'%s(?:[^%s%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        else:
+            self.flags = 0
+            self.pattern = r'%s(?:[^%s\n\r%s]' % \
+                ( re.escape(self.quoteChar),
+                  _escapeRegexRangeChars(self.endQuoteChar[0]),
+                  (escChar is not None and _escapeRegexRangeChars(escChar) or '') )
+        if len(self.endQuoteChar) > 1:
+            self.pattern += (
+                '|(?:' + ')|(?:'.join("%s[^%s]" % (re.escape(self.endQuoteChar[:i]),
+                                               _escapeRegexRangeChars(self.endQuoteChar[i]))
+                                    for i in range(len(self.endQuoteChar)-1,0,-1)) + ')'
+                )
+        if escQuote:
+            self.pattern += (r'|(?:%s)' % re.escape(escQuote))
+        if escChar:
+            self.pattern += (r'|(?:%s.)' % re.escape(escChar))
+            self.escCharReplacePattern = re.escape(self.escChar)+"(.)"
+        self.pattern += (r')*%s' % re.escape(self.endQuoteChar))
+
+        try:
+            self.re = re.compile(self.pattern, self.flags)
+            self.reString = self.pattern
+        except sre_constants.error:
+            warnings.warn("invalid pattern (%s) passed to Regex" % self.pattern,
+                SyntaxWarning, stacklevel=2)
+            raise
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayIndexError = False
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        result = instring[loc] == self.firstQuoteChar and self.re.match(instring,loc) or None
+        if not result:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        loc = result.end()
+        ret = result.group()
+
+        if self.unquoteResults:
+
+            # strip off quotes
+            ret = ret[self.quoteCharLen:-self.endQuoteCharLen]
+
+            if isinstance(ret,basestring):
+                # replace escaped whitespace
+                if '\\' in ret and self.convertWhitespaceEscapes:
+                    ws_map = {
+                        r'\t' : '\t',
+                        r'\n' : '\n',
+                        r'\f' : '\f',
+                        r'\r' : '\r',
+                    }
+                    for wslit,wschar in ws_map.items():
+                        ret = ret.replace(wslit, wschar)
+
+                # replace escaped characters
+                if self.escChar:
+                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
+
+                # replace escaped quotes
+                if self.escQuote:
+                    ret = ret.replace(self.escQuote, self.endQuoteChar)
+
+        return loc, ret
+
+    def __str__( self ):
+        try:
+            return super(QuotedString,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "quoted string, starting with %s ending with %s" % (self.quoteChar, self.endQuoteChar)
+
+        return self.strRepr
+
+
+class CharsNotIn(Token):
+    """
+    Token for matching words composed of characters I{not} in a given set (will
+    include whitespace in matched characters if not listed in the provided exclusion set - see example).
+    Defined with string containing all disallowed characters, and an optional
+    minimum, maximum, and/or exact length.  The default value for C{min} is 1 (a
+    minimum value < 1 is not valid); the default values for C{max} and C{exact}
+    are 0, meaning no maximum or exact length restriction.
+
+    Example::
+        # define a comma-separated-value as anything that is not a ','
+        csv_value = CharsNotIn(',')
+        print(delimitedList(csv_value).parseString("dkls,lsdkjf,s12 34,@!#,213"))
+    prints::
+        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
+    """
+    def __init__( self, notChars, min=1, max=0, exact=0 ):
+        super(CharsNotIn,self).__init__()
+        self.skipWhitespace = False
+        self.notChars = notChars
+
+        if min < 1:
+            raise ValueError("cannot specify a minimum length < 1; use Optional(CharsNotIn()) if zero-length char group is permitted")
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+        self.name = _ustr(self)
+        self.errmsg = "Expected " + self.name
+        self.mayReturnEmpty = ( self.minLen == 0 )
+        self.mayIndexError = False
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if instring[loc] in self.notChars:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        start = loc
+        loc += 1
+        notchars = self.notChars
+        maxlen = min( start+self.maxLen, len(instring) )
+        while loc < maxlen and \
+              (instring[loc] not in notchars):
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+    def __str__( self ):
+        try:
+            return super(CharsNotIn, self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            if len(self.notChars) > 4:
+                self.strRepr = "!W:(%s...)" % self.notChars[:4]
+            else:
+                self.strRepr = "!W:(%s)" % self.notChars
+
+        return self.strRepr
+
+class White(Token):
+    """
+    Special matching class for matching whitespace.  Normally, whitespace is ignored
+    by pyparsing grammars.  This class is included when some whitespace structures
+    are significant.  Define with a string containing the whitespace characters to be
+    matched; default is C{" \\t\\r\\n"}.  Also takes optional C{min}, C{max}, and C{exact} arguments,
+    as defined for the C{L{Word}} class.
+    """
+    whiteStrs = {
+        " " : "<SPC>",
+        "\t": "<TAB>",
+        "\n": "<LF>",
+        "\r": "<CR>",
+        "\f": "<FF>",
+        }
+    def __init__(self, ws=" \t\r\n", min=1, max=0, exact=0):
+        super(White,self).__init__()
+        self.matchWhite = ws
+        self.setWhitespaceChars( "".join(c for c in self.whiteChars if c not in self.matchWhite) )
+        #~ self.leaveWhitespace()
+        self.name = ("".join(White.whiteStrs[c] for c in self.matchWhite))
+        self.mayReturnEmpty = True
+        self.errmsg = "Expected " + self.name
+
+        self.minLen = min
+
+        if max > 0:
+            self.maxLen = max
+        else:
+            self.maxLen = _MAX_INT
+
+        if exact > 0:
+            self.maxLen = exact
+            self.minLen = exact
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if not(instring[ loc ] in self.matchWhite):
+            raise ParseException(instring, loc, self.errmsg, self)
+        start = loc
+        loc += 1
+        maxloc = start + self.maxLen
+        maxloc = min( maxloc, len(instring) )
+        while loc < maxloc and instring[loc] in self.matchWhite:
+            loc += 1
+
+        if loc - start < self.minLen:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        return loc, instring[start:loc]
+
+
+class _PositionToken(Token):
+    def __init__( self ):
+        super(_PositionToken,self).__init__()
+        self.name=self.__class__.__name__
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+class GoToColumn(_PositionToken):
+    """
+    Token to advance to a specific column of input text; useful for tabular report scraping.
+    """
+    def __init__( self, colno ):
+        super(GoToColumn,self).__init__()
+        self.col = colno
+
+    def preParse( self, instring, loc ):
+        if col(loc,instring) != self.col:
+            instrlen = len(instring)
+            if self.ignoreExprs:
+                loc = self._skipIgnorables( instring, loc )
+            while loc < instrlen and instring[loc].isspace() and col( loc, instring ) != self.col :
+                loc += 1
+        return loc
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        thiscol = col( loc, instring )
+        if thiscol > self.col:
+            raise ParseException( instring, loc, "Text not in expected column", self )
+        newloc = loc + self.col - thiscol
+        ret = instring[ loc: newloc ]
+        return newloc, ret
+
+
+class LineStart(_PositionToken):
+    """
+    Matches if current position is at the beginning of a line within the parse string
+    
+    Example::
+    
+        test = '''\
+        AAA this line
+        AAA and this line
+          AAA but not this one
+        B AAA and definitely not this one
+        '''
+
+        for t in (LineStart() + 'AAA' + restOfLine).searchString(test):
+            print(t)
+    
+    Prints::
+        ['AAA', ' this line']
+        ['AAA', ' and this line']    
+
+    """
+    def __init__( self ):
+        super(LineStart,self).__init__()
+        self.errmsg = "Expected start of line"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if col(loc, instring) == 1:
+            return loc, []
+        raise ParseException(instring, loc, self.errmsg, self)
+
+class LineEnd(_PositionToken):
+    """
+    Matches if current position is at the end of a line within the parse string
+    """
+    def __init__( self ):
+        super(LineEnd,self).__init__()
+        self.setWhitespaceChars( ParserElement.DEFAULT_WHITE_CHARS.replace("\n","") )
+        self.errmsg = "Expected end of line"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc<len(instring):
+            if instring[loc] == "\n":
+                return loc+1, "\n"
+            else:
+                raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class StringStart(_PositionToken):
+    """
+    Matches if current position is at the beginning of the parse string
+    """
+    def __init__( self ):
+        super(StringStart,self).__init__()
+        self.errmsg = "Expected start of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc != 0:
+            # see if entire string up to here is just whitespace and ignoreables
+            if loc != self.preParse( instring, 0 ):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class StringEnd(_PositionToken):
+    """
+    Matches if current position is at the end of the parse string
+    """
+    def __init__( self ):
+        super(StringEnd,self).__init__()
+        self.errmsg = "Expected end of text"
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if loc < len(instring):
+            raise ParseException(instring, loc, self.errmsg, self)
+        elif loc == len(instring):
+            return loc+1, []
+        elif loc > len(instring):
+            return loc, []
+        else:
+            raise ParseException(instring, loc, self.errmsg, self)
+
+class WordStart(_PositionToken):
+    """
+    Matches if the current position is at the beginning of a Word, and
+    is not preceded by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordStart(alphanums)}. C{WordStart} will also match at the beginning of
+    the string being parsed, or at the beginning of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordStart,self).__init__()
+        self.wordChars = set(wordChars)
+        self.errmsg = "Not at the start of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        if loc != 0:
+            if (instring[loc-1] in self.wordChars or
+                instring[loc] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+class WordEnd(_PositionToken):
+    """
+    Matches if the current position is at the end of a Word, and
+    is not followed by any character in a given set of C{wordChars}
+    (default=C{printables}). To emulate the C{\b} behavior of regular expressions,
+    use C{WordEnd(alphanums)}. C{WordEnd} will also match at the end of
+    the string being parsed, or at the end of a line.
+    """
+    def __init__(self, wordChars = printables):
+        super(WordEnd,self).__init__()
+        self.wordChars = set(wordChars)
+        self.skipWhitespace = False
+        self.errmsg = "Not at the end of a word"
+
+    def parseImpl(self, instring, loc, doActions=True ):
+        instrlen = len(instring)
+        if instrlen>0 and loc<instrlen:
+            if (instring[loc] in self.wordChars or
+                instring[loc-1] not in self.wordChars):
+                raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+
+class ParseExpression(ParserElement):
+    """
+    Abstract subclass of ParserElement, for combining and post-processing parsed tokens.
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(ParseExpression,self).__init__(savelist)
+        if isinstance( exprs, _generatorType ):
+            exprs = list(exprs)
+
+        if isinstance( exprs, basestring ):
+            self.exprs = [ ParserElement._literalStringClass( exprs ) ]
+        elif isinstance( exprs, collections.Iterable ):
+            exprs = list(exprs)
+            # if sequence of strings provided, wrap with Literal
+            if all(isinstance(expr, basestring) for expr in exprs):
+                exprs = map(ParserElement._literalStringClass, exprs)
+            self.exprs = list(exprs)
+        else:
+            try:
+                self.exprs = list( exprs )
+            except TypeError:
+                self.exprs = [ exprs ]
+        self.callPreparse = False
+
+    def __getitem__( self, i ):
+        return self.exprs[i]
+
+    def append( self, other ):
+        self.exprs.append( other )
+        self.strRepr = None
+        return self
+
+    def leaveWhitespace( self ):
+        """Extends C{leaveWhitespace} defined in base class, and also invokes C{leaveWhitespace} on
+           all contained expressions."""
+        self.skipWhitespace = False
+        self.exprs = [ e.copy() for e in self.exprs ]
+        for e in self.exprs:
+            e.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseExpression, self).ignore( other )
+                for e in self.exprs:
+                    e.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseExpression, self).ignore( other )
+            for e in self.exprs:
+                e.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def __str__( self ):
+        try:
+            return super(ParseExpression,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.exprs) )
+        return self.strRepr
+
+    def streamline( self ):
+        super(ParseExpression,self).streamline()
+
+        for e in self.exprs:
+            e.streamline()
+
+        # collapse nested And's of the form And( And( And( a,b), c), d) to And( a,b,c,d )
+        # but only if there are no parse actions or resultsNames on the nested And's
+        # (likewise for Or's and MatchFirst's)
+        if ( len(self.exprs) == 2 ):
+            other = self.exprs[0]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = other.exprs[:] + [ self.exprs[1] ]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+            other = self.exprs[-1]
+            if ( isinstance( other, self.__class__ ) and
+                  not(other.parseAction) and
+                  other.resultsName is None and
+                  not other.debug ):
+                self.exprs = self.exprs[:-1] + other.exprs[:]
+                self.strRepr = None
+                self.mayReturnEmpty |= other.mayReturnEmpty
+                self.mayIndexError  |= other.mayIndexError
+
+        self.errmsg = "Expected " + _ustr(self)
+        
+        return self
+
+    def setResultsName( self, name, listAllMatches=False ):
+        ret = super(ParseExpression,self).setResultsName(name,listAllMatches)
+        return ret
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        for e in self.exprs:
+            e.validate(tmp)
+        self.checkRecursion( [] )
+        
+    def copy(self):
+        ret = super(ParseExpression,self).copy()
+        ret.exprs = [e.copy() for e in self.exprs]
+        return ret
+
+class And(ParseExpression):
+    """
+    Requires all given C{ParseExpression}s to be found in the given order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'+'} operator.
+    May also be constructed using the C{'-'} operator, which will suppress backtracking.
+
+    Example::
+        integer = Word(nums)
+        name_expr = OneOrMore(Word(alphas))
+
+        expr = And([integer("id"),name_expr("name"),integer("age")])
+        # more easily written as:
+        expr = integer("id") + name_expr("name") + integer("age")
+    """
+
+    class _ErrorStop(Empty):
+        def __init__(self, *args, **kwargs):
+            super(And._ErrorStop,self).__init__(*args, **kwargs)
+            self.name = '-'
+            self.leaveWhitespace()
+
+    def __init__( self, exprs, savelist = True ):
+        super(And,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.setWhitespaceChars( self.exprs[0].whiteChars )
+        self.skipWhitespace = self.exprs[0].skipWhitespace
+        self.callPreparse = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        # pass False as last arg to _parse for first element, since we already
+        # pre-parsed the string as part of our And pre-parsing
+        loc, resultlist = self.exprs[0]._parse( instring, loc, doActions, callPreParse=False )
+        errorStop = False
+        for e in self.exprs[1:]:
+            if isinstance(e, And._ErrorStop):
+                errorStop = True
+                continue
+            if errorStop:
+                try:
+                    loc, exprtokens = e._parse( instring, loc, doActions )
+                except ParseSyntaxException:
+                    raise
+                except ParseBaseException as pe:
+                    pe.__traceback__ = None
+                    raise ParseSyntaxException._from_exception(pe)
+                except IndexError:
+                    raise ParseSyntaxException(instring, len(instring), self.errmsg, self)
+            else:
+                loc, exprtokens = e._parse( instring, loc, doActions )
+            if exprtokens or exprtokens.haskeys():
+                resultlist += exprtokens
+        return loc, resultlist
+
+    def __iadd__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #And( [ self, other ] )
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+            if not e.mayReturnEmpty:
+                break
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+
+class Or(ParseExpression):
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the expression that matches the longest string will be used.
+    May be constructed using the C{'^'} operator.
+
+    Example::
+        # construct Or using '^' operator
+        
+        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789"))
+    prints::
+        [['123'], ['3.1416'], ['789']]
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(Or,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        matches = []
+        for e in self.exprs:
+            try:
+                loc2 = e.tryParse( instring, loc )
+            except ParseException as err:
+                err.__traceback__ = None
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+            else:
+                # save match among all matches, to retry longest to shortest
+                matches.append((loc2, e))
+
+        if matches:
+            matches.sort(key=lambda x: -x[0])
+            for _,e in matches:
+                try:
+                    return e._parse( instring, loc, doActions )
+                except ParseException as err:
+                    err.__traceback__ = None
+                    if err.loc > maxExcLoc:
+                        maxException = err
+                        maxExcLoc = err.loc
+
+        if maxException is not None:
+            maxException.msg = self.errmsg
+            raise maxException
+        else:
+            raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+
+    def __ixor__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #Or( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " ^ ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class MatchFirst(ParseExpression):
+    """
+    Requires that at least one C{ParseExpression} is found.
+    If two expressions match, the first one listed is the one that will match.
+    May be constructed using the C{'|'} operator.
+
+    Example::
+        # construct MatchFirst using '|' operator
+        
+        # watch the order of expressions to match
+        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
+        print(number.searchString("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
+
+        # put more selective expression first
+        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
+        print(number.searchString("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
+    """
+    def __init__( self, exprs, savelist = False ):
+        super(MatchFirst,self).__init__(exprs, savelist)
+        if self.exprs:
+            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+        else:
+            self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        maxExcLoc = -1
+        maxException = None
+        for e in self.exprs:
+            try:
+                ret = e._parse( instring, loc, doActions )
+                return ret
+            except ParseException as err:
+                if err.loc > maxExcLoc:
+                    maxException = err
+                    maxExcLoc = err.loc
+            except IndexError:
+                if len(instring) > maxExcLoc:
+                    maxException = ParseException(instring,len(instring),e.errmsg,self)
+                    maxExcLoc = len(instring)
+
+        # only got here if no expression matched, raise exception for match that made it the furthest
+        else:
+            if maxException is not None:
+                maxException.msg = self.errmsg
+                raise maxException
+            else:
+                raise ParseException(instring, loc, "no defined alternatives to match", self)
+
+    def __ior__(self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass( other )
+        return self.append( other ) #MatchFirst( [ self, other ] )
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " | ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class Each(ParseExpression):
+    """
+    Requires all given C{ParseExpression}s to be found, but in any order.
+    Expressions may be separated by whitespace.
+    May be constructed using the C{'&'} operator.
+
+    Example::
+        color = oneOf("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
+        shape_type = oneOf("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
+        integer = Word(nums)
+        shape_attr = "shape:" + shape_type("shape")
+        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
+        color_attr = "color:" + color("color")
+        size_attr = "size:" + integer("size")
+
+        # use Each (using operator '&') to accept attributes in any order 
+        # (shape and posn are required, color and size are optional)
+        shape_spec = shape_attr & posn_attr & Optional(color_attr) & Optional(size_attr)
+
+        shape_spec.runTests('''
+            shape: SQUARE color: BLACK posn: 100, 120
+            shape: CIRCLE size: 50 color: BLUE posn: 50,80
+            color:GREEN size:20 shape:TRIANGLE posn:20,40
+            '''
+            )
+    prints::
+        shape: SQUARE color: BLACK posn: 100, 120
+        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
+        - color: BLACK
+        - posn: ['100', ',', '120']
+          - x: 100
+          - y: 120
+        - shape: SQUARE
+
+
+        shape: CIRCLE size: 50 color: BLUE posn: 50,80
+        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
+        - color: BLUE
+        - posn: ['50', ',', '80']
+          - x: 50
+          - y: 80
+        - shape: CIRCLE
+        - size: 50
+
+
+        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
+        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
+        - color: GREEN
+        - posn: ['20', ',', '40']
+          - x: 20
+          - y: 40
+        - shape: TRIANGLE
+        - size: 20
+    """
+    def __init__( self, exprs, savelist = True ):
+        super(Each,self).__init__(exprs, savelist)
+        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self.skipWhitespace = True
+        self.initExprGroups = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.initExprGroups:
+            self.opt1map = dict((id(e.expr),e) for e in self.exprs if isinstance(e,Optional))
+            opt1 = [ e.expr for e in self.exprs if isinstance(e,Optional) ]
+            opt2 = [ e for e in self.exprs if e.mayReturnEmpty and not isinstance(e,Optional)]
+            self.optionals = opt1 + opt2
+            self.multioptionals = [ e.expr for e in self.exprs if isinstance(e,ZeroOrMore) ]
+            self.multirequired = [ e.expr for e in self.exprs if isinstance(e,OneOrMore) ]
+            self.required = [ e for e in self.exprs if not isinstance(e,(Optional,ZeroOrMore,OneOrMore)) ]
+            self.required += self.multirequired
+            self.initExprGroups = False
+        tmpLoc = loc
+        tmpReqd = self.required[:]
+        tmpOpt  = self.optionals[:]
+        matchOrder = []
+
+        keepMatching = True
+        while keepMatching:
+            tmpExprs = tmpReqd + tmpOpt + self.multioptionals + self.multirequired
+            failed = []
+            for e in tmpExprs:
+                try:
+                    tmpLoc = e.tryParse( instring, tmpLoc )
+                except ParseException:
+                    failed.append(e)
+                else:
+                    matchOrder.append(self.opt1map.get(id(e),e))
+                    if e in tmpReqd:
+                        tmpReqd.remove(e)
+                    elif e in tmpOpt:
+                        tmpOpt.remove(e)
+            if len(failed) == len(tmpExprs):
+                keepMatching = False
+
+        if tmpReqd:
+            missing = ", ".join(_ustr(e) for e in tmpReqd)
+            raise ParseException(instring,loc,"Missing one or more required elements (%s)" % missing )
+
+        # add any unmatched Optionals, in case they have default values defined
+        matchOrder += [e for e in self.exprs if isinstance(e,Optional) and e.expr in tmpOpt]
+
+        resultlist = []
+        for e in matchOrder:
+            loc,results = e._parse(instring,loc,doActions)
+            resultlist.append(results)
+
+        finalResults = sum(resultlist, ParseResults([]))
+        return loc, finalResults
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + " & ".join(_ustr(e) for e in self.exprs) + "}"
+
+        return self.strRepr
+
+    def checkRecursion( self, parseElementList ):
+        subRecCheckList = parseElementList[:] + [ self ]
+        for e in self.exprs:
+            e.checkRecursion( subRecCheckList )
+
+
+class ParseElementEnhance(ParserElement):
+    """
+    Abstract subclass of C{ParserElement}, for combining and post-processing parsed tokens.
+    """
+    def __init__( self, expr, savelist=False ):
+        super(ParseElementEnhance,self).__init__(savelist)
+        if isinstance( expr, basestring ):
+            if issubclass(ParserElement._literalStringClass, Token):
+                expr = ParserElement._literalStringClass(expr)
+            else:
+                expr = ParserElement._literalStringClass(Literal(expr))
+        self.expr = expr
+        self.strRepr = None
+        if expr is not None:
+            self.mayIndexError = expr.mayIndexError
+            self.mayReturnEmpty = expr.mayReturnEmpty
+            self.setWhitespaceChars( expr.whiteChars )
+            self.skipWhitespace = expr.skipWhitespace
+            self.saveAsList = expr.saveAsList
+            self.callPreparse = expr.callPreparse
+            self.ignoreExprs.extend(expr.ignoreExprs)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.expr is not None:
+            return self.expr._parse( instring, loc, doActions, callPreParse=False )
+        else:
+            raise ParseException("",loc,self.errmsg,self)
+
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        self.expr = self.expr.copy()
+        if self.expr is not None:
+            self.expr.leaveWhitespace()
+        return self
+
+    def ignore( self, other ):
+        if isinstance( other, Suppress ):
+            if other not in self.ignoreExprs:
+                super( ParseElementEnhance, self).ignore( other )
+                if self.expr is not None:
+                    self.expr.ignore( self.ignoreExprs[-1] )
+        else:
+            super( ParseElementEnhance, self).ignore( other )
+            if self.expr is not None:
+                self.expr.ignore( self.ignoreExprs[-1] )
+        return self
+
+    def streamline( self ):
+        super(ParseElementEnhance,self).streamline()
+        if self.expr is not None:
+            self.expr.streamline()
+        return self
+
+    def checkRecursion( self, parseElementList ):
+        if self in parseElementList:
+            raise RecursiveGrammarException( parseElementList+[self] )
+        subRecCheckList = parseElementList[:] + [ self ]
+        if self.expr is not None:
+            self.expr.checkRecursion( subRecCheckList )
+
+    def validate( self, validateTrace=[] ):
+        tmp = validateTrace[:]+[self]
+        if self.expr is not None:
+            self.expr.validate(tmp)
+        self.checkRecursion( [] )
+
+    def __str__( self ):
+        try:
+            return super(ParseElementEnhance,self).__str__()
+        except Exception:
+            pass
+
+        if self.strRepr is None and self.expr is not None:
+            self.strRepr = "%s:(%s)" % ( self.__class__.__name__, _ustr(self.expr) )
+        return self.strRepr
+
+
+class FollowedBy(ParseElementEnhance):
+    """
+    Lookahead matching of the given parse expression.  C{FollowedBy}
+    does I{not} advance the parsing position within the input string, it only
+    verifies that the specified parse expression matches at the current
+    position.  C{FollowedBy} always returns a null token list.
+
+    Example::
+        # use FollowedBy to match a label only if it is followed by a ':'
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        OneOrMore(attr_expr).parseString("shape: SQUARE color: BLACK posn: upper left").pprint()
+    prints::
+        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
+    """
+    def __init__( self, expr ):
+        super(FollowedBy,self).__init__(expr)
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        self.expr.tryParse( instring, loc )
+        return loc, []
+
+
+class NotAny(ParseElementEnhance):
+    """
+    Lookahead to disallow matching with the given parse expression.  C{NotAny}
+    does I{not} advance the parsing position within the input string, it only
+    verifies that the specified parse expression does I{not} match at the current
+    position.  Also, C{NotAny} does I{not} skip over leading whitespace. C{NotAny}
+    always returns a null token list.  May be constructed using the '~' operator.
+
+    Example::
+        
+    """
+    def __init__( self, expr ):
+        super(NotAny,self).__init__(expr)
+        #~ self.leaveWhitespace()
+        self.skipWhitespace = False  # do NOT use self.leaveWhitespace(), don't want to propagate to exprs
+        self.mayReturnEmpty = True
+        self.errmsg = "Found unwanted token, "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        if self.expr.canParseNext(instring, loc):
+            raise ParseException(instring, loc, self.errmsg, self)
+        return loc, []
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "~{" + _ustr(self.expr) + "}"
+
+        return self.strRepr
+
+class _MultipleMatch(ParseElementEnhance):
+    def __init__( self, expr, stopOn=None):
+        super(_MultipleMatch, self).__init__(expr)
+        self.saveAsList = True
+        ender = stopOn
+        if isinstance(ender, basestring):
+            ender = ParserElement._literalStringClass(ender)
+        self.not_ender = ~ender if ender is not None else None
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        self_expr_parse = self.expr._parse
+        self_skip_ignorables = self._skipIgnorables
+        check_ender = self.not_ender is not None
+        if check_ender:
+            try_not_ender = self.not_ender.tryParse
+        
+        # must be at least one (but first see if we are the stopOn sentinel;
+        # if so, fail)
+        if check_ender:
+            try_not_ender(instring, loc)
+        loc, tokens = self_expr_parse( instring, loc, doActions, callPreParse=False )
+        try:
+            hasIgnoreExprs = (not not self.ignoreExprs)
+            while 1:
+                if check_ender:
+                    try_not_ender(instring, loc)
+                if hasIgnoreExprs:
+                    preloc = self_skip_ignorables( instring, loc )
+                else:
+                    preloc = loc
+                loc, tmptokens = self_expr_parse( instring, preloc, doActions )
+                if tmptokens or tmptokens.haskeys():
+                    tokens += tmptokens
+        except (ParseException,IndexError):
+            pass
+
+        return loc, tokens
+        
+class OneOrMore(_MultipleMatch):
+    """
+    Repetition of one or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match one or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: BLACK"
+        OneOrMore(attr_expr).parseString(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
+
+        # use stopOn attribute for OneOrMore to avoid reading label string as part of the data
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        OneOrMore(attr_expr).parseString(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
+        
+        # could also be written as
+        (attr_expr * (1,)).parseString(text).pprint()
+    """
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "{" + _ustr(self.expr) + "}..."
+
+        return self.strRepr
+
+class ZeroOrMore(_MultipleMatch):
+    """
+    Optional repetition of zero or more of the given expression.
+    
+    Parameters:
+     - expr - expression that must match zero or more times
+     - stopOn - (default=C{None}) - expression for a terminating sentinel
+          (only required if the sentinel would ordinarily match the repetition 
+          expression)          
+
+    Example: similar to L{OneOrMore}
+    """
+    def __init__( self, expr, stopOn=None):
+        super(ZeroOrMore,self).__init__(expr, stopOn=stopOn)
+        self.mayReturnEmpty = True
+        
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            return super(ZeroOrMore, self).parseImpl(instring, loc, doActions)
+        except (ParseException,IndexError):
+            return loc, []
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]..."
+
+        return self.strRepr
+
+class _NullToken(object):
+    def __bool__(self):
+        return False
+    __nonzero__ = __bool__
+    def __str__(self):
+        return ""
+
+_optionalNotMatched = _NullToken()
+class Optional(ParseElementEnhance):
+    """
+    Optional matching of the given expression.
+
+    Parameters:
+     - expr - expression that must match zero or more times
+     - default (optional) - value to be returned if the optional expression is not found.
+
+    Example::
+        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
+        zip = Combine(Word(nums, exact=5) + Optional('-' + Word(nums, exact=4)))
+        zip.runTests('''
+            # traditional ZIP code
+            12345
+            
+            # ZIP+4 form
+            12101-0001
+            
+            # invalid ZIP
+            98765-
+            ''')
+    prints::
+        # traditional ZIP code
+        12345
+        ['12345']
+
+        # ZIP+4 form
+        12101-0001
+        ['12101-0001']
+
+        # invalid ZIP
+        98765-
+             ^
+        FAIL: Expected end of text (at char 5), (line:1, col:6)
+    """
+    def __init__( self, expr, default=_optionalNotMatched ):
+        super(Optional,self).__init__( expr, savelist=False )
+        self.saveAsList = self.expr.saveAsList
+        self.defaultValue = default
+        self.mayReturnEmpty = True
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        try:
+            loc, tokens = self.expr._parse( instring, loc, doActions, callPreParse=False )
+        except (ParseException,IndexError):
+            if self.defaultValue is not _optionalNotMatched:
+                if self.expr.resultsName:
+                    tokens = ParseResults([ self.defaultValue ])
+                    tokens[self.expr.resultsName] = self.defaultValue
+                else:
+                    tokens = [ self.defaultValue ]
+            else:
+                tokens = []
+        return loc, tokens
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+
+        if self.strRepr is None:
+            self.strRepr = "[" + _ustr(self.expr) + "]"
+
+        return self.strRepr
+
+class SkipTo(ParseElementEnhance):
+    """
+    Token for skipping over all undefined text until the matched expression is found.
+
+    Parameters:
+     - expr - target expression marking the end of the data to be skipped
+     - include - (default=C{False}) if True, the target expression is also parsed 
+          (the skipped text and target expression are returned as a 2-element list).
+     - ignore - (default=C{None}) used to define grammars (typically quoted strings and 
+          comments) that might contain false matches to the target expression
+     - failOn - (default=C{None}) define expressions that are not allowed to be 
+          included in the skipped test; if found before the target expression is found, 
+          the SkipTo is not a match
+
+    Example::
+        report = '''
+            Outstanding Issues Report - 1 Jan 2000
+
+               # | Severity | Description                               |  Days Open
+            -----+----------+-------------------------------------------+-----------
+             101 | Critical | Intermittent system crash                 |          6
+              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
+              79 | Minor    | System slow when running too many reports |         47
+            '''
+        integer = Word(nums)
+        SEP = Suppress('|')
+        # use SkipTo to simply match everything up until the next SEP
+        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
+        # - parse action will call token.strip() for each matched token, i.e., the description body
+        string_data = SkipTo(SEP, ignore=quotedString)
+        string_data.setParseAction(tokenMap(str.strip))
+        ticket_expr = (integer("issue_num") + SEP 
+                      + string_data("sev") + SEP 
+                      + string_data("desc") + SEP 
+                      + integer("days_open"))
+        
+        for tkt in ticket_expr.searchString(report):
+            print tkt.dump()
+    prints::
+        ['101', 'Critical', 'Intermittent system crash', '6']
+        - days_open: 6
+        - desc: Intermittent system crash
+        - issue_num: 101
+        - sev: Critical
+        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
+        - days_open: 14
+        - desc: Spelling error on Login ('log|n')
+        - issue_num: 94
+        - sev: Cosmetic
+        ['79', 'Minor', 'System slow when running too many reports', '47']
+        - days_open: 47
+        - desc: System slow when running too many reports
+        - issue_num: 79
+        - sev: Minor
+    """
+    def __init__( self, other, include=False, ignore=None, failOn=None ):
+        super( SkipTo, self ).__init__( other )
+        self.ignoreExpr = ignore
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+        self.includeMatch = include
+        self.asList = False
+        if isinstance(failOn, basestring):
+            self.failOn = ParserElement._literalStringClass(failOn)
+        else:
+            self.failOn = failOn
+        self.errmsg = "No match found for "+_ustr(self.expr)
+
+    def parseImpl( self, instring, loc, doActions=True ):
+        startloc = loc
+        instrlen = len(instring)
+        expr = self.expr
+        expr_parse = self.expr._parse
+        self_failOn_canParseNext = self.failOn.canParseNext if self.failOn is not None else None
+        self_ignoreExpr_tryParse = self.ignoreExpr.tryParse if self.ignoreExpr is not None else None
+        
+        tmploc = loc
+        while tmploc <= instrlen:
+            if self_failOn_canParseNext is not None:
+                # break if failOn expression matches
+                if self_failOn_canParseNext(instring, tmploc):
+                    break
+                    
+            if self_ignoreExpr_tryParse is not None:
+                # advance past ignore expressions
+                while 1:
+                    try:
+                        tmploc = self_ignoreExpr_tryParse(instring, tmploc)
+                    except ParseBaseException:
+                        break
+            
+            try:
+                expr_parse(instring, tmploc, doActions=False, callPreParse=False)
+            except (ParseException, IndexError):
+                # no match, advance loc in string
+                tmploc += 1
+            else:
+                # matched skipto expr, done
+                break
+
+        else:
+            # ran off the end of the input string without matching skipto expr, fail
+            raise ParseException(instring, loc, self.errmsg, self)
+
+        # build up return values
+        loc = tmploc
+        skiptext = instring[startloc:loc]
+        skipresult = ParseResults(skiptext)
+        
+        if self.includeMatch:
+            loc, mat = expr_parse(instring,loc,doActions,callPreParse=False)
+            skipresult += mat
+
+        return loc, skipresult
+
+class Forward(ParseElementEnhance):
+    """
+    Forward declaration of an expression to be defined later -
+    used for recursive grammars, such as algebraic infix notation.
+    When the expression is known, it is assigned to the C{Forward} variable using the '<<' operator.
+
+    Note: take care when assigning to C{Forward} not to overlook precedence of operators.
+    Specifically, '|' has a lower precedence than '<<', so that::
+        fwdExpr << a | b | c
+    will actually be evaluated as::
+        (fwdExpr << a) | b | c
+    thereby leaving b and c out as parseable alternatives.  It is recommended that you
+    explicitly group the values inserted into the C{Forward}::
+        fwdExpr << (a | b | c)
+    Converting to use the '<<=' operator instead will avoid this problem.
+
+    See L{ParseResults.pprint} for an example of a recursive parser created using
+    C{Forward}.
+    """
+    def __init__( self, other=None ):
+        super(Forward,self).__init__( other, savelist=False )
+
+    def __lshift__( self, other ):
+        if isinstance( other, basestring ):
+            other = ParserElement._literalStringClass(other)
+        self.expr = other
+        self.strRepr = None
+        self.mayIndexError = self.expr.mayIndexError
+        self.mayReturnEmpty = self.expr.mayReturnEmpty
+        self.setWhitespaceChars( self.expr.whiteChars )
+        self.skipWhitespace = self.expr.skipWhitespace
+        self.saveAsList = self.expr.saveAsList
+        self.ignoreExprs.extend(self.expr.ignoreExprs)
+        return self
+        
+    def __ilshift__(self, other):
+        return self << other
+    
+    def leaveWhitespace( self ):
+        self.skipWhitespace = False
+        return self
+
+    def streamline( self ):
+        if not self.streamlined:
+            self.streamlined = True
+            if self.expr is not None:
+                self.expr.streamline()
+        return self
+
+    def validate( self, validateTrace=[] ):
+        if self not in validateTrace:
+            tmp = validateTrace[:]+[self]
+            if self.expr is not None:
+                self.expr.validate(tmp)
+        self.checkRecursion([])
+
+    def __str__( self ):
+        if hasattr(self,"name"):
+            return self.name
+        return self.__class__.__name__ + ": ..."
+
+        # stubbed out for now - creates awful memory and perf issues
+        self._revertClass = self.__class__
+        self.__class__ = _ForwardNoRecurse
+        try:
+            if self.expr is not None:
+                retString = _ustr(self.expr)
+            else:
+                retString = "None"
+        finally:
+            self.__class__ = self._revertClass
+        return self.__class__.__name__ + ": " + retString
+
+    def copy(self):
+        if self.expr is not None:
+            return super(Forward,self).copy()
+        else:
+            ret = Forward()
+            ret <<= self
+            return ret
+
+class _ForwardNoRecurse(Forward):
+    def __str__( self ):
+        return "..."
+
+class TokenConverter(ParseElementEnhance):
+    """
+    Abstract subclass of C{ParseExpression}, for converting parsed results.
+    """
+    def __init__( self, expr, savelist=False ):
+        super(TokenConverter,self).__init__( expr )#, savelist )
+        self.saveAsList = False
+
+class Combine(TokenConverter):
+    """
+    Converter to concatenate all matching tokens to a single string.
+    By default, the matching patterns must also be contiguous in the input string;
+    this can be disabled by specifying C{'adjacent=False'} in the constructor.
+
+    Example::
+        real = Word(nums) + '.' + Word(nums)
+        print(real.parseString('3.1416')) # -> ['3', '.', '1416']
+        # will also erroneously match the following
+        print(real.parseString('3. 1416')) # -> ['3', '.', '1416']
+
+        real = Combine(Word(nums) + '.' + Word(nums))
+        print(real.parseString('3.1416')) # -> ['3.1416']
+        # no match when there are internal spaces
+        print(real.parseString('3. 1416')) # -> Exception: Expected W:(0123...)
+    """
+    def __init__( self, expr, joinString="", adjacent=True ):
+        super(Combine,self).__init__( expr )
+        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
+        if adjacent:
+            self.leaveWhitespace()
+        self.adjacent = adjacent
+        self.skipWhitespace = True
+        self.joinString = joinString
+        self.callPreparse = True
+
+    def ignore( self, other ):
+        if self.adjacent:
+            ParserElement.ignore(self, other)
+        else:
+            super( Combine, self).ignore( other )
+        return self
+
+    def postParse( self, instring, loc, tokenlist ):
+        retToks = tokenlist.copy()
+        del retToks[:]
+        retToks += ParseResults([ "".join(tokenlist._asStringList(self.joinString)) ], modal=self.modalResults)
+
+        if self.resultsName and retToks.haskeys():
+            return [ retToks ]
+        else:
+            return retToks
+
+class Group(TokenConverter):
+    """
+    Converter to return the matched tokens as a list - useful for returning tokens of C{L{ZeroOrMore}} and C{L{OneOrMore}} expressions.
+
+    Example::
+        ident = Word(alphas)
+        num = Word(nums)
+        term = ident | num
+        func = ident + Optional(delimitedList(term))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', 'a', 'b', '100']
+
+        func = ident + Group(Optional(delimitedList(term)))
+        print(func.parseString("fn a,b,100"))  # -> ['fn', ['a', 'b', '100']]
+    """
+    def __init__( self, expr ):
+        super(Group,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        return [ tokenlist ]
+
+class Dict(TokenConverter):
+    """
+    Converter to return a repetitive expression as a list, but also as a dictionary.
+    Each element can also be referenced using the first token in the expression as its key.
+    Useful for tabular report scraping when the first column can be used as a item key.
+
+    Example::
+        data_word = Word(alphas)
+        label = data_word + FollowedBy(':')
+        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).setParseAction(' '.join))
+
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        
+        # print attributes as plain groups
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        # instead of OneOrMore(expr), parse using Dict(OneOrMore(Group(expr))) - Dict will auto-assign names
+        result = Dict(OneOrMore(Group(attr_expr))).parseString(text)
+        print(result.dump())
+        
+        # access named fields as dict entries, or output as dict
+        print(result['shape'])        
+        print(result.asDict())
+    prints::
+        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
+
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
+    See more examples at L{ParseResults} of accessing fields by results name.
+    """
+    def __init__( self, expr ):
+        super(Dict,self).__init__( expr )
+        self.saveAsList = True
+
+    def postParse( self, instring, loc, tokenlist ):
+        for i,tok in enumerate(tokenlist):
+            if len(tok) == 0:
+                continue
+            ikey = tok[0]
+            if isinstance(ikey,int):
+                ikey = _ustr(tok[0]).strip()
+            if len(tok)==1:
+                tokenlist[ikey] = _ParseResultsWithOffset("",i)
+            elif len(tok)==2 and not isinstance(tok[1],ParseResults):
+                tokenlist[ikey] = _ParseResultsWithOffset(tok[1],i)
+            else:
+                dictvalue = tok.copy() #ParseResults(i)
+                del dictvalue[0]
+                if len(dictvalue)!= 1 or (isinstance(dictvalue,ParseResults) and dictvalue.haskeys()):
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue,i)
+                else:
+                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0],i)
+
+        if self.resultsName:
+            return [ tokenlist ]
+        else:
+            return tokenlist
+
+
+class Suppress(TokenConverter):
+    """
+    Converter for ignoring the results of a parsed expression.
+
+    Example::
+        source = "a, b, c,d"
+        wd = Word(alphas)
+        wd_list1 = wd + ZeroOrMore(',' + wd)
+        print(wd_list1.parseString(source))
+
+        # often, delimiters that are useful during parsing are just in the
+        # way afterward - use Suppress to keep them out of the parsed output
+        wd_list2 = wd + ZeroOrMore(Suppress(',') + wd)
+        print(wd_list2.parseString(source))
+    prints::
+        ['a', ',', 'b', ',', 'c', ',', 'd']
+        ['a', 'b', 'c', 'd']
+    (See also L{delimitedList}.)
+    """
+    def postParse( self, instring, loc, tokenlist ):
+        return []
+
+    def suppress( self ):
+        return self
+
+
+class OnlyOnce(object):
+    """
+    Wrapper for parse actions, to ensure they are only called once.
+    """
+    def __init__(self, methodCall):
+        self.callable = _trim_arity(methodCall)
+        self.called = False
+    def __call__(self,s,l,t):
+        if not self.called:
+            results = self.callable(s,l,t)
+            self.called = True
+            return results
+        raise ParseException(s,l,"")
+    def reset(self):
+        self.called = False
+
+def traceParseAction(f):
+    """
+    Decorator for debugging parse actions. 
+    
+    When the parse action is called, this decorator will print C{">> entering I{method-name}(line:I{current_source_line}, I{parse_location}, I{matched_tokens})".}
+    When the parse action completes, the decorator will print C{"<<"} followed by the returned value, or any exception that the parse action raised.
+
+    Example::
+        wd = Word(alphas)
+
+        @traceParseAction
+        def remove_duplicate_chars(tokens):
+            return ''.join(sorted(set(''.join(tokens)))
+
+        wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
+        print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
+    prints::
+        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
+        <<leaving remove_duplicate_chars (ret: 'dfjkls')
+        ['dfjkls']
+    """
+    f = _trim_arity(f)
+    def z(*paArgs):
+        thisFunc = f.__name__
+        s,l,t = paArgs[-3:]
+        if len(paArgs)>3:
+            thisFunc = paArgs[0].__class__.__name__ + '.' + thisFunc
+        sys.stderr.write( ">>entering %s(line: '%s', %d, %r)\n" % (thisFunc,line(l,s),l,t) )
+        try:
+            ret = f(*paArgs)
+        except Exception as exc:
+            sys.stderr.write( "<<leaving %s (exception: %s)\n" % (thisFunc,exc) )
+            raise
+        sys.stderr.write( "<<leaving %s (ret: %r)\n" % (thisFunc,ret) )
+        return ret
+    try:
+        z.__name__ = f.__name__
+    except AttributeError:
+        pass
+    return z
+
+#
+# global helpers
+#
+def delimitedList( expr, delim=",", combine=False ):
+    """
+    Helper to define a delimited list of expressions - the delimiter defaults to ','.
+    By default, the list elements and delimiters can have intervening whitespace, and
+    comments, but this can be overridden by passing C{combine=True} in the constructor.
+    If C{combine} is set to C{True}, the matching tokens are returned as a single token
+    string, with the delimiters included; otherwise, the matching tokens are returned
+    as a list of tokens, with the delimiters suppressed.
+
+    Example::
+        delimitedList(Word(alphas)).parseString("aa,bb,cc") # -> ['aa', 'bb', 'cc']
+        delimitedList(Word(hexnums), delim=':', combine=True).parseString("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
+    """
+    dlName = _ustr(expr)+" ["+_ustr(delim)+" "+_ustr(expr)+"]..."
+    if combine:
+        return Combine( expr + ZeroOrMore( delim + expr ) ).setName(dlName)
+    else:
+        return ( expr + ZeroOrMore( Suppress( delim ) + expr ) ).setName(dlName)
+
+def countedArray( expr, intExpr=None ):
+    """
+    Helper to define a counted list of expressions.
+    This helper defines a pattern of the form::
+        integer expr expr expr...
+    where the leading integer tells how many expr expressions follow.
+    The matched tokens returns the array of expr tokens as a list - the leading count token is suppressed.
+    
+    If C{intExpr} is specified, it should be a pyparsing expression that produces an integer value.
+
+    Example::
+        countedArray(Word(alphas)).parseString('2 ab cd ef')  # -> ['ab', 'cd']
+
+        # in this parser, the leading integer value is given in binary,
+        # '10' indicating that 2 values are in the array
+        binaryConstant = Word('01').setParseAction(lambda t: int(t[0], 2))
+        countedArray(Word(alphas), intExpr=binaryConstant).parseString('10 ab cd ef')  # -> ['ab', 'cd']
+    """
+    arrayExpr = Forward()
+    def countFieldParseAction(s,l,t):
+        n = t[0]
+        arrayExpr << (n and Group(And([expr]*n)) or Group(empty))
+        return []
+    if intExpr is None:
+        intExpr = Word(nums).setParseAction(lambda t:int(t[0]))
+    else:
+        intExpr = intExpr.copy()
+    intExpr.setName("arrayLen")
+    intExpr.addParseAction(countFieldParseAction, callDuringTry=True)
+    return ( intExpr + arrayExpr ).setName('(len) ' + _ustr(expr) + '...')
+
+def _flatten(L):
+    ret = []
+    for i in L:
+        if isinstance(i,list):
+            ret.extend(_flatten(i))
+        else:
+            ret.append(i)
+    return ret
+
+def matchPreviousLiteral(expr):
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousLiteral(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches a
+    previous literal, will also match the leading C{"1:1"} in C{"1:10"}.
+    If this is not desired, use C{matchPreviousExpr}.
+    Do I{not} use with packrat parsing enabled.
+    """
+    rep = Forward()
+    def copyTokenToRepeater(s,l,t):
+        if t:
+            if len(t) == 1:
+                rep << t[0]
+            else:
+                # flatten t tokens
+                tflat = _flatten(t.asList())
+                rep << And(Literal(tt) for tt in tflat)
+        else:
+            rep << Empty()
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
+    return rep
+
+def matchPreviousExpr(expr):
+    """
+    Helper to define an expression that is indirectly defined from
+    the tokens matched in a previous expression, that is, it looks
+    for a 'repeat' of a previous expression.  For example::
+        first = Word(nums)
+        second = matchPreviousExpr(first)
+        matchExpr = first + ":" + second
+    will match C{"1:1"}, but not C{"1:2"}.  Because this matches by
+    expressions, will I{not} match the leading C{"1:1"} in C{"1:10"};
+    the expressions are evaluated first, and then compared, so
+    C{"1"} is compared with C{"10"}.
+    Do I{not} use with packrat parsing enabled.
+    """
+    rep = Forward()
+    e2 = expr.copy()
+    rep <<= e2
+    def copyTokenToRepeater(s,l,t):
+        matchTokens = _flatten(t.asList())
+        def mustMatchTheseTokens(s,l,t):
+            theseTokens = _flatten(t.asList())
+            if  theseTokens != matchTokens:
+                raise ParseException("",0,"")
+        rep.setParseAction( mustMatchTheseTokens, callDuringTry=True )
+    expr.addParseAction(copyTokenToRepeater, callDuringTry=True)
+    rep.setName('(prev) ' + _ustr(expr))
+    return rep
+
+def _escapeRegexRangeChars(s):
+    #~  escape these chars: ^-]
+    for c in r"\^-]":
+        s = s.replace(c,_bslash+c)
+    s = s.replace("\n",r"\n")
+    s = s.replace("\t",r"\t")
+    return _ustr(s)
+
+def oneOf( strs, caseless=False, useRegex=True ):
+    """
+    Helper to quickly define a set of alternative Literals, and makes sure to do
+    longest-first testing when there is a conflict, regardless of the input order,
+    but returns a C{L{MatchFirst}} for best performance.
+
+    Parameters:
+     - strs - a string of space-delimited literals, or a collection of string literals
+     - caseless - (default=C{False}) - treat all literals as caseless
+     - useRegex - (default=C{True}) - as an optimization, will generate a Regex
+          object; otherwise, will generate a C{MatchFirst} object (if C{caseless=True}, or
+          if creating a C{Regex} raises an exception)
+
+    Example::
+        comp_oper = oneOf("< = > <= >= !=")
+        var = Word(alphas)
+        number = Word(nums)
+        term = var | number
+        comparison_expr = term + comp_oper + term
+        print(comparison_expr.searchString("B = 12  AA=23 B<=AA AA>12"))
+    prints::
+        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
+    """
+    if caseless:
+        isequal = ( lambda a,b: a.upper() == b.upper() )
+        masks = ( lambda a,b: b.upper().startswith(a.upper()) )
+        parseElementClass = CaselessLiteral
+    else:
+        isequal = ( lambda a,b: a == b )
+        masks = ( lambda a,b: b.startswith(a) )
+        parseElementClass = Literal
+
+    symbols = []
+    if isinstance(strs,basestring):
+        symbols = strs.split()
+    elif isinstance(strs, collections.Iterable):
+        symbols = list(strs)
+    else:
+        warnings.warn("Invalid argument to oneOf, expected string or iterable",
+                SyntaxWarning, stacklevel=2)
+    if not symbols:
+        return NoMatch()
+
+    i = 0
+    while i < len(symbols)-1:
+        cur = symbols[i]
+        for j,other in enumerate(symbols[i+1:]):
+            if ( isequal(other, cur) ):
+                del symbols[i+j+1]
+                break
+            elif ( masks(cur, other) ):
+                del symbols[i+j+1]
+                symbols.insert(i,other)
+                cur = other
+                break
+        else:
+            i += 1
+
+    if not caseless and useRegex:
+        #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
+        try:
+            if len(symbols)==len("".join(symbols)):
+                return Regex( "[%s]" % "".join(_escapeRegexRangeChars(sym) for sym in symbols) ).setName(' | '.join(symbols))
+            else:
+                return Regex( "|".join(re.escape(sym) for sym in symbols) ).setName(' | '.join(symbols))
+        except Exception:
+            warnings.warn("Exception creating Regex for oneOf, building MatchFirst",
+                    SyntaxWarning, stacklevel=2)
+
+
+    # last resort, just use MatchFirst
+    return MatchFirst(parseElementClass(sym) for sym in symbols).setName(' | '.join(symbols))
+
+def dictOf( key, value ):
+    """
+    Helper to easily and clearly define a dictionary by specifying the respective patterns
+    for the key and value.  Takes care of defining the C{L{Dict}}, C{L{ZeroOrMore}}, and C{L{Group}} tokens
+    in the proper order.  The key pattern can include delimiting markers or punctuation,
+    as long as they are suppressed, thereby leaving the significant key text.  The value
+    pattern can include named results, so that the C{Dict} results can include named token
+    fields.
+
+    Example::
+        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join))
+        print(OneOrMore(attr_expr).parseString(text).dump())
+        
+        attr_label = label
+        attr_value = Suppress(':') + OneOrMore(data_word, stopOn=label).setParseAction(' '.join)
+
+        # similar to Dict, but simpler call format
+        result = dictOf(attr_label, attr_value).parseString(text)
+        print(result.dump())
+        print(result['shape'])
+        print(result.shape)  # object attribute access works too
+        print(result.asDict())
+    prints::
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+        - color: light blue
+        - posn: upper left
+        - shape: SQUARE
+        - texture: burlap
+        SQUARE
+        SQUARE
+        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
+    """
+    return Dict( ZeroOrMore( Group ( key + value ) ) )
+
+def originalTextFor(expr, asString=True):
+    """
+    Helper to return the original, untokenized text for a given expression.  Useful to
+    restore the parsed fields of an HTML start tag into the raw tag text itself, or to
+    revert separate tokens with intervening whitespace back to the original matching
+    input text. By default, returns astring containing the original parsed text.  
+       
+    If the optional C{asString} argument is passed as C{False}, then the return value is a 
+    C{L{ParseResults}} containing any results names that were originally matched, and a 
+    single token containing the original matched text from the input string.  So if 
+    the expression passed to C{L{originalTextFor}} contains expressions with defined
+    results names, you must set C{asString} to C{False} if you want to preserve those
+    results name values.
+
+    Example::
+        src = "this is test <b> bold <i>text</i> </b> normal text "
+        for tag in ("b","i"):
+            opener,closer = makeHTMLTags(tag)
+            patt = originalTextFor(opener + SkipTo(closer) + closer)
+            print(patt.searchString(src)[0])
+    prints::
+        ['<b> bold <i>text</i> </b>']
+        ['<i>text</i>']
+    """
+    locMarker = Empty().setParseAction(lambda s,loc,t: loc)
+    endlocMarker = locMarker.copy()
+    endlocMarker.callPreparse = False
+    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
+    if asString:
+        extractText = lambda s,l,t: s[t._original_start:t._original_end]
+    else:
+        def extractText(s,l,t):
+            t[:] = [s[t.pop('_original_start'):t.pop('_original_end')]]
+    matchExpr.setParseAction(extractText)
+    matchExpr.ignoreExprs = expr.ignoreExprs
+    return matchExpr
+
+def ungroup(expr): 
+    """
+    Helper to undo pyparsing's default grouping of And expressions, even
+    if all but one are non-empty.
+    """
+    return TokenConverter(expr).setParseAction(lambda t:t[0])
+
+def locatedExpr(expr):
+    """
+    Helper to decorate a returned token with its starting and ending locations in the input string.
+    This helper adds the following results names:
+     - locn_start = location where matched expression begins
+     - locn_end = location where matched expression ends
+     - value = the actual parsed results
+
+    Be careful if the input text contains C{<TAB>} characters, you may want to call
+    C{L{ParserElement.parseWithTabs}}
+
+    Example::
+        wd = Word(alphas)
+        for match in locatedExpr(wd).searchString("ljsdf123lksdjjf123lkkjj1222"):
+            print(match)
+    prints::
+        [[0, 'ljsdf', 5]]
+        [[8, 'lksdjjf', 15]]
+        [[18, 'lkkjj', 23]]
+    """
+    locator = Empty().setParseAction(lambda s,l,t: l)
+    return Group(locator("locn_start") + expr("value") + locator.copy().leaveWhitespace()("locn_end"))
+
+
+# convenience constants for positional expressions
+empty       = Empty().setName("empty")
+lineStart   = LineStart().setName("lineStart")
+lineEnd     = LineEnd().setName("lineEnd")
+stringStart = StringStart().setName("stringStart")
+stringEnd   = StringEnd().setName("stringEnd")
+
+_escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
+_escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
+_escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
+_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
+_charRange = Group(_singleChar + Suppress("-") + _singleChar)
+_reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
+
+def srange(s):
+    r"""
+    Helper to easily define string ranges for use in Word construction.  Borrows
+    syntax from regexp '[]' string range definitions::
+        srange("[0-9]")   -> "0123456789"
+        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
+        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
+    The input string must be enclosed in []'s, and the returned string is the expanded
+    character set joined into a single string.
+    The values enclosed in the []'s may be:
+     - a single character
+     - an escaped character with a leading backslash (such as C{\-} or C{\]})
+     - an escaped hex character with a leading C{'\x'} (C{\x21}, which is a C{'!'} character) 
+         (C{\0x##} is also supported for backwards compatibility) 
+     - an escaped octal character with a leading C{'\0'} (C{\041}, which is a C{'!'} character)
+     - a range of any of the above, separated by a dash (C{'a-z'}, etc.)
+     - any combination of the above (C{'aeiouy'}, C{'a-zA-Z0-9_$'}, etc.)
+    """
+    _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))
+    try:
+        return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)
+    except Exception:
+        return ""
+
+def matchOnlyAtCol(n):
+    """
+    Helper method for defining parse actions that require matching at a specific
+    column in the input text.
+    """
+    def verifyCol(strg,locn,toks):
+        if col(locn,strg) != n:
+            raise ParseException(strg,locn,"matched token not at column %d" % n)
+    return verifyCol
+
+def replaceWith(replStr):
+    """
+    Helper method for common parse actions that simply return a literal value.  Especially
+    useful when used with C{L{transformString<ParserElement.transformString>}()}.
+
+    Example::
+        num = Word(nums).setParseAction(lambda toks: int(toks[0]))
+        na = oneOf("N/A NA").setParseAction(replaceWith(math.nan))
+        term = na | num
+        
+        OneOrMore(term).parseString("324 234 N/A 234") # -> [324, 234, nan, 234]
+    """
+    return lambda s,l,t: [replStr]
+
+def removeQuotes(s,l,t):
+    """
+    Helper parse action for removing quotation marks from parsed quoted strings.
+
+    Example::
+        # by default, quotation marks are included in parsed results
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
+
+        # use removeQuotes to strip quotation marks from parsed results
+        quotedString.setParseAction(removeQuotes)
+        quotedString.parseString("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
+    """
+    return t[0][1:-1]
+
+def tokenMap(func, *args):
+    """
+    Helper to define a parse action by mapping a function to all elements of a ParseResults list.If any additional 
+    args are passed, they are forwarded to the given function as additional arguments after
+    the token, as in C{hex_integer = Word(hexnums).setParseAction(tokenMap(int, 16))}, which will convert the
+    parsed data to an integer using base 16.
+
+    Example (compare the last to example in L{ParserElement.transformString}::
+        hex_ints = OneOrMore(Word(hexnums)).setParseAction(tokenMap(int, 16))
+        hex_ints.runTests('''
+            00 11 22 aa FF 0a 0d 1a
+            ''')
+        
+        upperword = Word(alphas).setParseAction(tokenMap(str.upper))
+        OneOrMore(upperword).runTests('''
+            my kingdom for a horse
+            ''')
+
+        wd = Word(alphas).setParseAction(tokenMap(str.title))
+        OneOrMore(wd).setParseAction(' '.join).runTests('''
+            now is the winter of our discontent made glorious summer by this sun of york
+            ''')
+    prints::
+        00 11 22 aa FF 0a 0d 1a
+        [0, 17, 34, 170, 255, 10, 13, 26]
+
+        my kingdom for a horse
+        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
+
+        now is the winter of our discontent made glorious summer by this sun of york
+        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
+    """
+    def pa(s,l,t):
+        return [func(tokn, *args) for tokn in t]
+
+    try:
+        func_name = getattr(func, '__name__', 
+                            getattr(func, '__class__').__name__)
+    except Exception:
+        func_name = str(func)
+    pa.__name__ = func_name
+
+    return pa
+
+upcaseTokens = tokenMap(lambda t: _ustr(t).upper())
+"""(Deprecated) Helper parse action to convert tokens to upper case. Deprecated in favor of L{pyparsing_common.upcaseTokens}"""
+
+downcaseTokens = tokenMap(lambda t: _ustr(t).lower())
+"""(Deprecated) Helper parse action to convert tokens to lower case. Deprecated in favor of L{pyparsing_common.downcaseTokens}"""
+    
+def _makeTags(tagStr, xml):
+    """Internal helper to construct opening and closing tag expressions, given a tag name"""
+    if isinstance(tagStr,basestring):
+        resname = tagStr
+        tagStr = Keyword(tagStr, caseless=not xml)
+    else:
+        resname = tagStr.name
+
+    tagAttrName = Word(alphas,alphanums+"_-:")
+    if (xml):
+        tagAttrValue = dblQuotedString.copy().setParseAction( removeQuotes )
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName + Suppress("=") + tagAttrValue ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    else:
+        printablesLessRAbrack = "".join(c for c in printables if c not in ">")
+        tagAttrValue = quotedString.copy().setParseAction( removeQuotes ) | Word(printablesLessRAbrack)
+        openTag = Suppress("<") + tagStr("tag") + \
+                Dict(ZeroOrMore(Group( tagAttrName.setParseAction(downcaseTokens) + \
+                Optional( Suppress("=") + tagAttrValue ) ))) + \
+                Optional("/",default=[False]).setResultsName("empty").setParseAction(lambda s,l,t:t[0]=='/') + Suppress(">")
+    closeTag = Combine(_L("</") + tagStr + ">")
+
+    openTag = openTag.setResultsName("start"+"".join(resname.replace(":"," ").title().split())).setName("<%s>" % resname)
+    closeTag = closeTag.setResultsName("end"+"".join(resname.replace(":"," ").title().split())).setName("</%s>" % resname)
+    openTag.tag = resname
+    closeTag.tag = resname
+    return openTag, closeTag
+
+def makeHTMLTags(tagStr):
+    """
+    Helper to construct opening and closing tag expressions for HTML, given a tag name. Matches
+    tags in either upper or lower case, attributes with namespaces and with quoted or unquoted values.
+
+    Example::
+        text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+        # makeHTMLTags returns pyparsing expressions for the opening and closing tags as a 2-tuple
+        a,a_end = makeHTMLTags("A")
+        link_expr = a + SkipTo(a_end)("link_text") + a_end
+        
+        for link in link_expr.searchString(text):
+            # attributes in the <A> tag (like "href" shown here) are also accessible as named results
+            print(link.link_text, '->', link.href)
+    prints::
+        pyparsing -> http://pyparsing.wikispaces.com
+    """
+    return _makeTags( tagStr, False )
+
+def makeXMLTags(tagStr):
+    """
+    Helper to construct opening and closing tag expressions for XML, given a tag name. Matches
+    tags only in the given upper/lower case.
+
+    Example: similar to L{makeHTMLTags}
+    """
+    return _makeTags( tagStr, True )
+
+def withAttribute(*args,**attrDict):
+    """
+    Helper to create a validating parse action to be used with start tags created
+    with C{L{makeXMLTags}} or C{L{makeHTMLTags}}. Use C{withAttribute} to qualify a starting tag
+    with a required attribute value, to avoid false matches on common tags such as
+    C{<TD>} or C{<DIV>}.
+
+    Call C{withAttribute} with a series of attribute names and values. Specify the list
+    of filter attributes names and values as:
+     - keyword arguments, as in C{(align="right")}, or
+     - as an explicit dict with C{**} operator, when an attribute name is also a Python
+          reserved word, as in C{**{"class":"Customer", "align":"right"}}
+     - a list of name-value tuples, as in ( ("ns1:class", "Customer"), ("ns2:align","right") )
+    For attribute names with a namespace prefix, you must use the second form.  Attribute
+    names are matched insensitive to upper/lower case.
+       
+    If just testing for C{class} (with or without a namespace), use C{L{withClass}}.
+
+    To verify that the attribute exists, but without specifying a value, pass
+    C{withAttribute.ANY_VALUE} as the value.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div type="grid">1 4 0 1 0</div>
+            <div type="graph">1,3 2,3 1,1</div>
+            <div>this has no type</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+
+        # only match div tag having a type attribute with value "grid"
+        div_grid = div().setParseAction(withAttribute(type="grid"))
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        # construct a match with any div tag having a type attribute, regardless of the value
+        div_any_type = div().setParseAction(withAttribute(type=withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
+    if args:
+        attrs = args[:]
+    else:
+        attrs = attrDict.items()
+    attrs = [(k,v) for k,v in attrs]
+    def pa(s,l,tokens):
+        for attrName,attrValue in attrs:
+            if attrName not in tokens:
+                raise ParseException(s,l,"no matching attribute " + attrName)
+            if attrValue != withAttribute.ANY_VALUE and tokens[attrName] != attrValue:
+                raise ParseException(s,l,"attribute '%s' has value '%s', must be '%s'" %
+                                            (attrName, tokens[attrName], attrValue))
+    return pa
+withAttribute.ANY_VALUE = object()
+
+def withClass(classname, namespace=''):
+    """
+    Simplified version of C{L{withAttribute}} when matching on a div class - made
+    difficult because C{class} is a reserved word in Python.
+
+    Example::
+        html = '''
+            <div>
+            Some text
+            <div class="grid">1 4 0 1 0</div>
+            <div class="graph">1,3 2,3 1,1</div>
+            <div>this &lt;div&gt; has no class</div>
+            </div>
+                
+        '''
+        div,div_end = makeHTMLTags("div")
+        div_grid = div().setParseAction(withClass("grid"))
+        
+        grid_expr = div_grid + SkipTo(div | div_end)("body")
+        for grid_header in grid_expr.searchString(html):
+            print(grid_header.body)
+        
+        div_any_type = div().setParseAction(withClass(withAttribute.ANY_VALUE))
+        div_expr = div_any_type + SkipTo(div | div_end)("body")
+        for div_header in div_expr.searchString(html):
+            print(div_header.body)
+    prints::
+        1 4 0 1 0
+
+        1 4 0 1 0
+        1,3 2,3 1,1
+    """
+    classattr = "%s:class" % namespace if namespace else "class"
+    return withAttribute(**{classattr : classname})        
+
+opAssoc = _Constants()
+opAssoc.LEFT = object()
+opAssoc.RIGHT = object()
+
+def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
+    """
+    Helper method for constructing grammars of expressions made up of
+    operators working in a precedence hierarchy.  Operators may be unary or
+    binary, left- or right-associative.  Parse actions can also be attached
+    to operator expressions. The generated parser will also recognize the use 
+    of parentheses to override operator precedences (see example below).
+    
+    Note: if you define a deep operator list, you may see performance issues
+    when using infixNotation. See L{ParserElement.enablePackrat} for a
+    mechanism to potentially improve your parser performance.
+
+    Parameters:
+     - baseExpr - expression representing the most basic element for the nested
+     - opList - list of tuples, one for each operator precedence level in the
+      expression grammar; each tuple is of the form
+      (opExpr, numTerms, rightLeftAssoc, parseAction), where:
+       - opExpr is the pyparsing expression for the operator;
+          may also be a string, which will be converted to a Literal;
+          if numTerms is 3, opExpr is a tuple of two expressions, for the
+          two operators separating the 3 terms
+       - numTerms is the number of terms for this operator (must
+          be 1, 2, or 3)
+       - rightLeftAssoc is the indicator whether the operator is
+          right or left associative, using the pyparsing-defined
+          constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
+       - parseAction is the parse action to be associated with
+          expressions matching this operator expression (the
+          parse action tuple member may be omitted)
+     - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
+     - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
+
+    Example::
+        # simple example of four-function arithmetic with ints and variable names
+        integer = pyparsing_common.signed_integer
+        varname = pyparsing_common.identifier 
+        
+        arith_expr = infixNotation(integer | varname,
+            [
+            ('-', 1, opAssoc.RIGHT),
+            (oneOf('* /'), 2, opAssoc.LEFT),
+            (oneOf('+ -'), 2, opAssoc.LEFT),
+            ])
+        
+        arith_expr.runTests('''
+            5+3*6
+            (5+3)*6
+            -2--11
+            ''', fullDump=False)
+    prints::
+        5+3*6
+        [[5, '+', [3, '*', 6]]]
+
+        (5+3)*6
+        [[[5, '+', 3], '*', 6]]
+
+        -2--11
+        [[['-', 2], '-', ['-', 11]]]
+    """
+    ret = Forward()
+    lastExpr = baseExpr | ( lpar + ret + rpar )
+    for i,operDef in enumerate(opList):
+        opExpr,arity,rightLeftAssoc,pa = (operDef + (None,))[:4]
+        termName = "%s term" % opExpr if arity < 3 else "%s%s term" % opExpr
+        if arity == 3:
+            if opExpr is None or len(opExpr) != 2:
+                raise ValueError("if numterms=3, opExpr must be a tuple or list of two expressions")
+            opExpr1, opExpr2 = opExpr
+        thisExpr = Forward().setName(termName)
+        if rightLeftAssoc == opAssoc.LEFT:
+            if arity == 1:
+                matchExpr = FollowedBy(lastExpr + opExpr) + Group( lastExpr + OneOrMore( opExpr ) )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + lastExpr) + Group( lastExpr + OneOrMore( opExpr + lastExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr+lastExpr) + Group( lastExpr + OneOrMore(lastExpr) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr) + \
+                            Group( lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        elif rightLeftAssoc == opAssoc.RIGHT:
+            if arity == 1:
+                # try to avoid LR with this extra test
+                if not isinstance(opExpr, Optional):
+                    opExpr = Optional(opExpr)
+                matchExpr = FollowedBy(opExpr.expr + thisExpr) + Group( opExpr + thisExpr )
+            elif arity == 2:
+                if opExpr is not None:
+                    matchExpr = FollowedBy(lastExpr + opExpr + thisExpr) + Group( lastExpr + OneOrMore( opExpr + thisExpr ) )
+                else:
+                    matchExpr = FollowedBy(lastExpr + thisExpr) + Group( lastExpr + OneOrMore( thisExpr ) )
+            elif arity == 3:
+                matchExpr = FollowedBy(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr) + \
+                            Group( lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr )
+            else:
+                raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
+        else:
+            raise ValueError("operator must indicate right or left associativity")
+        if pa:
+            matchExpr.setParseAction( pa )
+        thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
+        lastExpr = thisExpr
+    ret <<= lastExpr
+    return ret
+
+operatorPrecedence = infixNotation
+"""(Deprecated) Former name of C{L{infixNotation}}, will be dropped in a future release."""
+
+dblQuotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"').setName("string enclosed in double quotes")
+sglQuotedString = Combine(Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("string enclosed in single quotes")
+quotedString = Combine(Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*')+'"'|
+                       Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*")+"'").setName("quotedString using single or double quotes")
+unicodeString = Combine(_L('u') + quotedString.copy()).setName("unicode string literal")
+
+def nestedExpr(opener="(", closer=")", content=None, ignoreExpr=quotedString.copy()):
+    """
+    Helper method for defining nested lists enclosed in opening and closing
+    delimiters ("(" and ")" are the default).
+
+    Parameters:
+     - opener - opening character for a nested list (default=C{"("}); can also be a pyparsing expression
+     - closer - closing character for a nested list (default=C{")"}); can also be a pyparsing expression
+     - content - expression for items within the nested lists (default=C{None})
+     - ignoreExpr - expression for ignoring opening and closing delimiters (default=C{quotedString})
+
+    If an expression is not provided for the content argument, the nested
+    expression will capture all whitespace-delimited content between delimiters
+    as a list of separate values.
+
+    Use the C{ignoreExpr} argument to define expressions that may contain
+    opening or closing characters that should not be treated as opening
+    or closing characters for nesting, such as quotedString or a comment
+    expression.  Specify multiple expressions using an C{L{Or}} or C{L{MatchFirst}}.
+    The default is L{quotedString}, but if no expressions are to be ignored,
+    then pass C{None} for this argument.
+
+    Example::
+        data_type = oneOf("void int short long char float double")
+        decl_data_type = Combine(data_type + Optional(Word('*')))
+        ident = Word(alphas+'_', alphanums+'_')
+        number = pyparsing_common.number
+        arg = Group(decl_data_type + ident)
+        LPAR,RPAR = map(Suppress, "()")
+
+        code_body = nestedExpr('{', '}', ignoreExpr=(quotedString | cStyleComment))
+
+        c_function = (decl_data_type("type") 
+                      + ident("name")
+                      + LPAR + Optional(delimitedList(arg), [])("args") + RPAR 
+                      + code_body("body"))
+        c_function.ignore(cStyleComment)
+        
+        source_code = '''
+            int is_odd(int x) { 
+                return (x%2); 
+            }
+                
+            int dec_to_hex(char hchar) { 
+                if (hchar >= '0' && hchar <= '9') { 
+                    return (ord(hchar)-ord('0')); 
+                } else { 
+                    return (10+ord(hchar)-ord('A'));
+                } 
+            }
+        '''
+        for func in c_function.searchString(source_code):
+            print("%(name)s (%(type)s) args: %(args)s" % func)
+
+    prints::
+        is_odd (int) args: [['int', 'x']]
+        dec_to_hex (int) args: [['char', 'hchar']]
+    """
+    if opener == closer:
+        raise ValueError("opening and closing strings cannot be the same")
+    if content is None:
+        if isinstance(opener,basestring) and isinstance(closer,basestring):
+            if len(opener) == 1 and len(closer)==1:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr +
+                                    CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (empty.copy()+CharsNotIn(opener+closer+ParserElement.DEFAULT_WHITE_CHARS
+                                ).setParseAction(lambda t:t[0].strip()))
+            else:
+                if ignoreExpr is not None:
+                    content = (Combine(OneOrMore(~ignoreExpr + 
+                                    ~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+                else:
+                    content = (Combine(OneOrMore(~Literal(opener) + ~Literal(closer) +
+                                    CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS,exact=1))
+                                ).setParseAction(lambda t:t[0].strip()))
+        else:
+            raise ValueError("opening and closing arguments must be strings if no content expression is given")
+    ret = Forward()
+    if ignoreExpr is not None:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ignoreExpr | ret | content ) + Suppress(closer) )
+    else:
+        ret <<= Group( Suppress(opener) + ZeroOrMore( ret | content )  + Suppress(closer) )
+    ret.setName('nested %s%s expression' % (opener,closer))
+    return ret
+
+def indentedBlock(blockStatementExpr, indentStack, indent=True):
+    """
+    Helper method for defining space-delimited indentation blocks, such as
+    those used to define block statements in Python source code.
+
+    Parameters:
+     - blockStatementExpr - expression defining syntax of statement that
+            is repeated within the indented block
+     - indentStack - list created by caller to manage indentation stack
+            (multiple statementWithIndentedBlock expressions within a single grammar
+            should share a common indentStack)
+     - indent - boolean indicating whether block must be indented beyond the
+            the current level; set to False for block of left-most statements
+            (default=C{True})
+
+    A valid block must contain at least one C{blockStatement}.
+
+    Example::
+        data = '''
+        def A(z):
+          A1
+          B = 100
+          G = A2
+          A2
+          A3
+        B
+        def BB(a,b,c):
+          BB1
+          def BBA():
+            bba1
+            bba2
+            bba3
+        C
+        D
+        def spam(x,y):
+             def eggs(z):
+                 pass
+        '''
+
+
+        indentStack = [1]
+        stmt = Forward()
+
+        identifier = Word(alphas, alphanums)
+        funcDecl = ("def" + identifier + Group( "(" + Optional( delimitedList(identifier) ) + ")" ) + ":")
+        func_body = indentedBlock(stmt, indentStack)
+        funcDef = Group( funcDecl + func_body )
+
+        rvalue = Forward()
+        funcCall = Group(identifier + "(" + Optional(delimitedList(rvalue)) + ")")
+        rvalue << (funcCall | identifier | Word(nums))
+        assignment = Group(identifier + "=" + rvalue)
+        stmt << ( funcDef | assignment | identifier )
+
+        module_body = OneOrMore(stmt)
+
+        parseTree = module_body.parseString(data)
+        parseTree.pprint()
+    prints::
+        [['def',
+          'A',
+          ['(', 'z', ')'],
+          ':',
+          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
+         'B',
+         ['def',
+          'BB',
+          ['(', 'a', 'b', 'c', ')'],
+          ':',
+          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
+         'C',
+         'D',
+         ['def',
+          'spam',
+          ['(', 'x', 'y', ')'],
+          ':',
+          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]] 
+    """
+    def checkPeerIndent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if curCol != indentStack[-1]:
+            if curCol > indentStack[-1]:
+                raise ParseFatalException(s,l,"illegal nesting")
+            raise ParseException(s,l,"not a peer entry")
+
+    def checkSubIndent(s,l,t):
+        curCol = col(l,s)
+        if curCol > indentStack[-1]:
+            indentStack.append( curCol )
+        else:
+            raise ParseException(s,l,"not a subentry")
+
+    def checkUnindent(s,l,t):
+        if l >= len(s): return
+        curCol = col(l,s)
+        if not(indentStack and curCol < indentStack[-1] and curCol <= indentStack[-2]):
+            raise ParseException(s,l,"not an unindent")
+        indentStack.pop()
+
+    NL = OneOrMore(LineEnd().setWhitespaceChars("\t ").suppress())
+    INDENT = (Empty() + Empty().setParseAction(checkSubIndent)).setName('INDENT')
+    PEER   = Empty().setParseAction(checkPeerIndent).setName('')
+    UNDENT = Empty().setParseAction(checkUnindent).setName('UNINDENT')
+    if indent:
+        smExpr = Group( Optional(NL) +
+            #~ FollowedBy(blockStatementExpr) +
+            INDENT + (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) + UNDENT)
+    else:
+        smExpr = Group( Optional(NL) +
+            (OneOrMore( PEER + Group(blockStatementExpr) + Optional(NL) )) )
+    blockStatementExpr.ignore(_bslash + LineEnd())
+    return smExpr.setName('indented block')
+
+alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
+punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
+
+anyOpenTag,anyCloseTag = makeHTMLTags(Word(alphas,alphanums+"_:").setName('any tag'))
+_htmlEntityMap = dict(zip("gt lt amp nbsp quot apos".split(),'><& "\''))
+commonHTMLEntity = Regex('&(?P<entity>' + '|'.join(_htmlEntityMap.keys()) +");").setName("common HTML entity")
+def replaceHTMLEntity(t):
+    """Helper parser action to replace common HTML entities with their special characters"""
+    return _htmlEntityMap.get(t.entity)
+
+# it's easy to get these comment structures wrong - they're very common, so may as well make them available
+cStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/').setName("C style comment")
+"Comment of the form C{/* ... */}"
+
+htmlComment = Regex(r"<!--[\s\S]*?-->").setName("HTML comment")
+"Comment of the form C{<!-- ... -->}"
+
+restOfLine = Regex(r".*").leaveWhitespace().setName("rest of line")
+dblSlashComment = Regex(r"//(?:\\\n|[^\n])*").setName("// comment")
+"Comment of the form C{// ... (to end of line)}"
+
+cppStyleComment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + '*/'| dblSlashComment).setName("C++ style comment")
+"Comment of either form C{L{cStyleComment}} or C{L{dblSlashComment}}"
+
+javaStyleComment = cppStyleComment
+"Same as C{L{cppStyleComment}}"
+
+pythonStyleComment = Regex(r"#.*").setName("Python style comment")
+"Comment of the form C{# ... (to end of line)}"
+
+_commasepitem = Combine(OneOrMore(Word(printables, excludeChars=',') +
+                                  Optional( Word(" \t") +
+                                            ~Literal(",") + ~LineEnd() ) ) ).streamline().setName("commaItem")
+commaSeparatedList = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("commaSeparatedList")
+"""(Deprecated) Predefined expression of 1 or more printable words or quoted strings, separated by commas.
+   This expression is deprecated in favor of L{pyparsing_common.comma_separated_list}."""
+
+# some other useful expressions - using lower-case class name since we are really using this as a namespace
+class pyparsing_common:
+    """
+    Here are some common low-level expressions that may be useful in jump-starting parser development:
+     - numeric forms (L{integers<integer>}, L{reals<real>}, L{scientific notation<sci_real>})
+     - common L{programming identifiers<identifier>}
+     - network addresses (L{MAC<mac_address>}, L{IPv4<ipv4_address>}, L{IPv6<ipv6_address>})
+     - ISO8601 L{dates<iso8601_date>} and L{datetime<iso8601_datetime>}
+     - L{UUID<uuid>}
+     - L{comma-separated list<comma_separated_list>}
+    Parse actions:
+     - C{L{convertToInteger}}
+     - C{L{convertToFloat}}
+     - C{L{convertToDate}}
+     - C{L{convertToDatetime}}
+     - C{L{stripHTMLTags}}
+     - C{L{upcaseTokens}}
+     - C{L{downcaseTokens}}
+
+    Example::
+        pyparsing_common.number.runTests('''
+            # any int or real number, returned as the appropriate type
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.fnumber.runTests('''
+            # any int or real number, returned as float
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+        pyparsing_common.hex_integer.runTests('''
+            # hex numbers
+            100
+            FF
+            ''')
+
+        pyparsing_common.fraction.runTests('''
+            # fractions
+            1/2
+            -3/4
+            ''')
+
+        pyparsing_common.mixed_integer.runTests('''
+            # mixed fractions
+            1
+            1/2
+            -3/4
+            1-3/4
+            ''')
+
+        import uuid
+        pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+        pyparsing_common.uuid.runTests('''
+            # uuid
+            12345678-1234-5678-1234-567812345678
+            ''')
+    prints::
+        # any int or real number, returned as the appropriate type
+        100
+        [100]
+
+        -100
+        [-100]
+
+        +100
+        [100]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # any int or real number, returned as float
+        100
+        [100.0]
+
+        -100
+        [-100.0]
+
+        +100
+        [100.0]
+
+        3.14159
+        [3.14159]
+
+        6.02e23
+        [6.02e+23]
+
+        1e-12
+        [1e-12]
+
+        # hex numbers
+        100
+        [256]
+
+        FF
+        [255]
+
+        # fractions
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        # mixed fractions
+        1
+        [1]
+
+        1/2
+        [0.5]
+
+        -3/4
+        [-0.75]
+
+        1-3/4
+        [1.75]
+
+        # uuid
+        12345678-1234-5678-1234-567812345678
+        [UUID('12345678-1234-5678-1234-567812345678')]
+    """
+
+    convertToInteger = tokenMap(int)
+    """
+    Parse action for converting parsed integers to Python int
+    """
+
+    convertToFloat = tokenMap(float)
+    """
+    Parse action for converting parsed numbers to Python float
+    """
+
+    integer = Word(nums).setName("integer").setParseAction(convertToInteger)
+    """expression that parses an unsigned integer, returns an int"""
+
+    hex_integer = Word(hexnums).setName("hex integer").setParseAction(tokenMap(int,16))
+    """expression that parses a hexadecimal integer, returns an int"""
+
+    signed_integer = Regex(r'[+-]?\d+').setName("signed integer").setParseAction(convertToInteger)
+    """expression that parses an integer with optional leading sign, returns an int"""
+
+    fraction = (signed_integer().setParseAction(convertToFloat) + '/' + signed_integer().setParseAction(convertToFloat)).setName("fraction")
+    """fractional expression of an integer divided by an integer, returns a float"""
+    fraction.addParseAction(lambda t: t[0]/t[-1])
+
+    mixed_integer = (fraction | signed_integer + Optional(Optional('-').suppress() + fraction)).setName("fraction or mixed integer-fraction")
+    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
+    mixed_integer.addParseAction(sum)
+
+    real = Regex(r'[+-]?\d+\.\d*').setName("real number").setParseAction(convertToFloat)
+    """expression that parses a floating point number and returns a float"""
+
+    sci_real = Regex(r'[+-]?\d+([eE][+-]?\d+|\.\d*([eE][+-]?\d+)?)').setName("real number with scientific notation").setParseAction(convertToFloat)
+    """expression that parses a floating point number with optional scientific notation and returns a float"""
+
+    # streamlining this expression makes the docs nicer-looking
+    number = (sci_real | real | signed_integer).streamline()
+    """any numeric expression, returns the corresponding Python type"""
+
+    fnumber = Regex(r'[+-]?\d+\.?\d*([eE][+-]?\d+)?').setName("fnumber").setParseAction(convertToFloat)
+    """any int or real number, returned as float"""
+    
+    identifier = Word(alphas+'_', alphanums+'_').setName("identifier")
+    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
+    
+    ipv4_address = Regex(r'(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}').setName("IPv4 address")
+    "IPv4 address (C{0.0.0.0 - 255.255.255.255})"
+
+    _ipv6_part = Regex(r'[0-9a-fA-F]{1,4}').setName("hex_integer")
+    _full_ipv6_address = (_ipv6_part + (':' + _ipv6_part)*7).setName("full IPv6 address")
+    _short_ipv6_address = (Optional(_ipv6_part + (':' + _ipv6_part)*(0,6)) + "::" + Optional(_ipv6_part + (':' + _ipv6_part)*(0,6))).setName("short IPv6 address")
+    _short_ipv6_address.addCondition(lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8)
+    _mixed_ipv6_address = ("::ffff:" + ipv4_address).setName("mixed IPv6 address")
+    ipv6_address = Combine((_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).setName("IPv6 address")).setName("IPv6 address")
+    "IPv6 address (long, short, or mixed form)"
+    
+    mac_address = Regex(r'[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}').setName("MAC address")
+    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
+
+    @staticmethod
+    def convertToDate(fmt="%Y-%m-%d"):
+        """
+        Helper to create a parse action for converting parsed date string to Python datetime.date
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%d"})
+
+        Example::
+            date_expr = pyparsing_common.iso8601_date.copy()
+            date_expr.setParseAction(pyparsing_common.convertToDate())
+            print(date_expr.parseString("1999-12-31"))
+        prints::
+            [datetime.date(1999, 12, 31)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt).date()
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    @staticmethod
+    def convertToDatetime(fmt="%Y-%m-%dT%H:%M:%S.%f"):
+        """
+        Helper to create a parse action for converting parsed datetime string to Python datetime.datetime
+
+        Params -
+         - fmt - format to be passed to datetime.strptime (default=C{"%Y-%m-%dT%H:%M:%S.%f"})
+
+        Example::
+            dt_expr = pyparsing_common.iso8601_datetime.copy()
+            dt_expr.setParseAction(pyparsing_common.convertToDatetime())
+            print(dt_expr.parseString("1999-12-31T23:59:59.999"))
+        prints::
+            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
+        """
+        def cvt_fn(s,l,t):
+            try:
+                return datetime.strptime(t[0], fmt)
+            except ValueError as ve:
+                raise ParseException(s, l, str(ve))
+        return cvt_fn
+
+    iso8601_date = Regex(r'(?P<year>\d{4})(?:-(?P<month>\d\d)(?:-(?P<day>\d\d))?)?').setName("ISO8601 date")
+    "ISO8601 date (C{yyyy-mm-dd})"
+
+    iso8601_datetime = Regex(r'(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)[T ](?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d(\.\d*)?)?)?(?P<tz>Z|[+-]\d\d:?\d\d)?').setName("ISO8601 datetime")
+    "ISO8601 datetime (C{yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)}) - trailing seconds, milliseconds, and timezone optional; accepts separating C{'T'} or C{' '}"
+
+    uuid = Regex(r'[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}').setName("UUID")
+    "UUID (C{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx})"
+
+    _html_stripper = anyOpenTag.suppress() | anyCloseTag.suppress()
+    @staticmethod
+    def stripHTMLTags(s, l, tokens):
+        """
+        Parse action to remove HTML tags from web page HTML source
+
+        Example::
+            # strip HTML links from normal text 
+            text = '<td>More info at the <a href="http://pyparsing.wikispaces.com">pyparsing</a> wiki page</td>'
+            td,td_end = makeHTMLTags("TD")
+            table_text = td + SkipTo(td_end).setParseAction(pyparsing_common.stripHTMLTags)("body") + td_end
+            
+            print(table_text.parseString(text).body) # -> 'More info at the pyparsing wiki page'
+        """
+        return pyparsing_common._html_stripper.transformString(tokens[0])
+
+    _commasepitem = Combine(OneOrMore(~Literal(",") + ~LineEnd() + Word(printables, excludeChars=',') 
+                                        + Optional( White(" \t") ) ) ).streamline().setName("commaItem")
+    comma_separated_list = delimitedList( Optional( quotedString.copy() | _commasepitem, default="") ).setName("comma separated list")
+    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
+
+    upcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).upper()))
+    """Parse action to convert tokens to upper case."""
+
+    downcaseTokens = staticmethod(tokenMap(lambda t: _ustr(t).lower()))
+    """Parse action to convert tokens to lower case."""
+
+
+if __name__ == "__main__":
+
+    selectToken    = CaselessLiteral("select")
+    fromToken      = CaselessLiteral("from")
+
+    ident          = Word(alphas, alphanums + "_$")
+
+    columnName     = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    columnNameList = Group(delimitedList(columnName)).setName("columns")
+    columnSpec     = ('*' | columnNameList)
+
+    tableName      = delimitedList(ident, ".", combine=True).setParseAction(upcaseTokens)
+    tableNameList  = Group(delimitedList(tableName)).setName("tables")
+    
+    simpleSQL      = selectToken("command") + columnSpec("columns") + fromToken + tableNameList("tables")
+
+    # demo runTests method, including embedded comments in test string
+    simpleSQL.runTests("""
+        # '*' as column list and dotted table name
+        select * from SYS.XYZZY
+
+        # caseless match on "SELECT", and casts back to "select"
+        SELECT * from XYZZY, ABC
+
+        # list of column names, and mixed case SELECT keyword
+        Select AA,BB,CC from Sys.dual
+
+        # multiple tables
+        Select A, B, C from Sys.dual, Table2
+
+        # invalid SELECT keyword - should fail
+        Xelect A, B, C from Sys.dual
+
+        # incomplete command - should fail
+        Select
+
+        # invalid column name - should fail
+        Select ^^^ frox Sys.dual
+
+        """)
+
+    pyparsing_common.number.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    # any int or real number, returned as float
+    pyparsing_common.fnumber.runTests("""
+        100
+        -100
+        +100
+        3.14159
+        6.02e23
+        1e-12
+        """)
+
+    pyparsing_common.hex_integer.runTests("""
+        100
+        FF
+        """)
+
+    import uuid
+    pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
+    pyparsing_common.uuid.runTests("""
+        12345678-1234-5678-1234-567812345678
+        """)
diff --git a/setuptools/_vendor/six.py b/setuptools/_vendor/six.py
new file mode 100644
index 0000000000..190c0239cd
--- /dev/null
+++ b/setuptools/_vendor/six.py
@@ -0,0 +1,868 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2015 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from __future__ import absolute_import
+
+import functools
+import itertools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.10.0"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)  # Invokes __set__.
+        try:
+            # This is a bit ugly, but it avoids running this again by
+            # removing this descriptor.
+            delattr(obj.__class__, self.name)
+        except AttributeError:
+            pass
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("intern", "__builtin__", "sys"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
+    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+]
+# Add windows specific modules.
+if sys.platform == "win32":
+    _moved_attributes += [
+        MovedModule("winreg", "_winreg"),
+    ]
+
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+    MovedAttribute("splittag", "urllib", "urllib.parse"),
+    MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    def create_unbound_method(func, cls):
+        return func
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    def create_unbound_method(func, cls):
+        return types.MethodType(func, None, cls)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+
+    viewkeys = operator.methodcaller("keys")
+
+    viewvalues = operator.methodcaller("values")
+
+    viewitems = operator.methodcaller("items")
+else:
+    def iterkeys(d, **kw):
+        return d.iterkeys(**kw)
+
+    def itervalues(d, **kw):
+        return d.itervalues(**kw)
+
+    def iteritems(d, **kw):
+        return d.iteritems(**kw)
+
+    def iterlists(d, **kw):
+        return d.iterlists(**kw)
+
+    viewkeys = operator.methodcaller("viewkeys")
+
+    viewvalues = operator.methodcaller("viewvalues")
+
+    viewitems = operator.methodcaller("viewitems")
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+
+    def u(s):
+        return s
+    unichr = chr
+    import struct
+    int2byte = struct.Struct(">B").pack
+    del struct
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    _assertCountEqual = "assertCountEqual"
+    if sys.version_info[1] <= 1:
+        _assertRaisesRegex = "assertRaisesRegexp"
+        _assertRegex = "assertRegexpMatches"
+    else:
+        _assertRaisesRegex = "assertRaisesRegex"
+        _assertRegex = "assertRegex"
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+
+    def byte2int(bs):
+        return ord(bs[0])
+
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    iterbytes = functools.partial(itertools.imap, ord)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    _assertCountEqual = "assertItemsEqual"
+    _assertRaisesRegex = "assertRaisesRegexp"
+    _assertRegex = "assertRegexpMatches"
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
+def assertRaisesRegex(self, *args, **kwargs):
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+
+
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+    def reraise(tp, value, tb=None):
+        if value is None:
+            value = tp()
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+if sys.version_info[:2] == (3, 2):
+    exec_("""def raise_from(value, from_value):
+    if from_value is None:
+        raise value
+    raise value from from_value
+""")
+elif sys.version_info[:2] > (3, 2):
+    exec_("""def raise_from(value, from_value):
+    raise value from from_value
+""")
+else:
+    def raise_from(value, from_value):
+        raise value
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                    isinstance(data, unicode) and
+                    fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+if sys.version_info[:2] < (3, 3):
+    _print = print_
+
+    def print_(*args, **kwargs):
+        fp = kwargs.get("file", sys.stdout)
+        flush = kwargs.pop("flush", False)
+        _print(*args, **kwargs)
+        if flush and fp is not None:
+            fp.flush()
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
+        def wrapper(f):
+            f = functools.wraps(wrapped, assigned, updated)(f)
+            f.__wrapped__ = wrapped
+            return f
+        return wrapper
+else:
+    wraps = functools.wraps
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
+def python_2_unicode_compatible(klass):
+    """
+    A decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if PY2:
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+                importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
new file mode 100644
index 0000000000..be3e72eb30
--- /dev/null
+++ b/setuptools/_vendor/vendored.txt
@@ -0,0 +1,3 @@
+packaging==16.8
+pyparsing==2.1.10
+six==1.10.0
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index befa09043a..f3e604d3f0 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -30,7 +30,7 @@
 import setuptools.unicode_utils as unicode_utils
 from setuptools.glob import glob
 
-from pkg_resources.extern import packaging
+from setuptools.extern import packaging
 
 
 def translate_pattern(glob):
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b74dd0f51a..cd34eef639 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -17,8 +17,8 @@
 from distutils.version import StrictVersion
 
 from setuptools.extern import six
+from setuptools.extern import packaging
 from setuptools.extern.six.moves import map, filter, filterfalse
-from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
 from setuptools import windows_support
@@ -27,8 +27,8 @@
 import pkg_resources
 from .py36compat import Distribution_parse_config_files
 
-__import__('pkg_resources.extern.packaging.specifiers')
-__import__('pkg_resources.extern.packaging.version')
+__import__('setuptools.extern.packaging.specifiers')
+__import__('setuptools.extern.packaging.version')
 
 
 def _get_unpatched(cls):
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 70ac180c6f..da3d668d99 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -69,5 +69,5 @@ def install(self):
             sys.meta_path.append(self)
 
 
-names = 'six',
-VendorImporter(__name__, names, 'pkg_resources._vendor').install()
+names = 'six', 'packaging', 'pyparsing',
+VendorImporter(__name__, names, 'setuptools._vendor').install()
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 8e3b638fee..5e20b3f1dd 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -22,7 +22,7 @@
 import platform
 import itertools
 import distutils.errors
-from pkg_resources.extern.packaging.version import LegacyVersion
+from setuptools.extern.packaging.version import LegacyVersion
 
 from setuptools.extern.six.moves import filterfalse
 
@@ -48,7 +48,7 @@ class winreg:
 _msvc9_suppress_errors = (
     # msvc9compiler isn't available on some platforms
     ImportError,
-    
+
     # msvc9compiler raises DistutilsPlatformError in some
     # environments. See #1118.
     distutils.errors.DistutilsPlatformError,
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index 75ec740d0e..f5f0e6bbc8 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -1,7 +1,7 @@
 import os
 
 
-from pkg_resources.extern.six import binary_type
+from setuptools.extern.six import binary_type
 import pkg_resources.py31compat
 
 
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 9ffe434ae3..37dfa53103 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -8,7 +8,7 @@
 import zipfile
 
 from pkg_resources import Distribution, PathMetadata, parse_version
-from pkg_resources.extern.six import PY3
+from setuptools.extern.six import PY3
 from setuptools import Distribution as SetuptoolsDistribution
 from setuptools import pep425tags
 from setuptools.command.egg_info import write_requirements

From 7dd1e4e68899f7f5543dabe81363b95ad907446c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 14:23:38 -0400
Subject: [PATCH 6954/8469] Extract common functionality into reusable
 functions

---
 pavement.py                                   | 43 ++++++++-----------
 pkg_resources/_vendor/packaging/markers.py    |  6 +--
 .../_vendor/packaging/requirements.py         |  8 ++--
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/pavement.py b/pavement.py
index ca54e61f4c..84e5825d8b 100644
--- a/pavement.py
+++ b/pavement.py
@@ -25,6 +25,18 @@ def rewrite_packaging(pkg_files, new_root):
         file.write_text(text)
 
 
+def clean(vendor):
+    """
+    Remove all files out of the vendor directory except the meta
+    data (as pip uninstall doesn't support -t).
+    """
+    remove_all(
+        path
+        for path in vendor.glob('*')
+        if path.basename() != 'vendored.txt'
+    )
+
+
 def install(vendor):
     clean(vendor)
     install_args = [
@@ -35,37 +47,16 @@ def install(vendor):
     pip.main(install_args)
     remove_all(vendor.glob('*.dist-info'))
     remove_all(vendor.glob('*.egg-info'))
+    (vendor / '__init__.py').write_text('')
+
 
 def update_pkg_resources():
     vendor = Path('pkg_resources/_vendor')
-    # pip uninstall doesn't support -t, so do it manually
-    remove_all(vendor.glob('packaging*'))
-    remove_all(vendor.glob('six*'))
-    remove_all(vendor.glob('pyparsing*'))
-    remove_all(vendor.glob('appdirs*'))
-    install_args = [
-        'install',
-        '-r', str(vendor / 'vendored.txt'),
-        '-t', str(vendor),
-    ]
-    pip.main(install_args)
-    rewrite_packaging(vendor / 'packaging', 'pkg_resources.extern.')
-    remove_all(vendor.glob('*.dist-info'))
-    remove_all(vendor.glob('*.egg-info'))
+    install(vendor)
+    rewrite_packaging(vendor / 'packaging', 'pkg_resources.extern')
 
 
 def update_setuptools():
     vendor = Path('setuptools/_vendor')
-    # pip uninstall doesn't support -t, so do it manually
-    remove_all(vendor.glob('packaging*'))
-    remove_all(vendor.glob('six*'))
-    remove_all(vendor.glob('pyparsing*'))
-    install_args = [
-        'install',
-        '-r', str(vendor / 'vendored.txt'),
-        '-t', str(vendor),
-    ]
-    pip.main(install_args)
+    install(vendor)
     rewrite_packaging(vendor / 'packaging', 'setuptools.extern')
-    remove_all(vendor.glob('*.dist-info'))
-    remove_all(vendor.glob('*.egg-info'))
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index a4805648dd..892e578edd 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -8,9 +8,9 @@
 import platform
 import sys
 
-from pkg_resources.extern..pyparsing import ParseException, ParseResults, stringStart, stringEnd
-from pkg_resources.extern..pyparsing import ZeroOrMore, Group, Forward, QuotedString
-from pkg_resources.extern..pyparsing import Literal as L  # noqa
+from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
 from .specifiers import Specifier, InvalidSpecifier
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index ccaed95b13..0c8c4a3852 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -6,10 +6,10 @@
 import string
 import re
 
-from pkg_resources.extern..pyparsing import stringStart, stringEnd, originalTextFor, ParseException
-from pkg_resources.extern..pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
-from pkg_resources.extern..pyparsing import Literal as L  # noqa
-from pkg_resources.extern..six.moves.urllib import parse as urlparse
+from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+from pkg_resources.extern.six.moves.urllib import parse as urlparse
 
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet

From 6c2bccf360b7587cccbd59dd0b0b6081604f77c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 14:27:55 -0400
Subject: [PATCH 6955/8469] Update changelog. Fixes #1296.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 93eca56d8f..8fae9816d5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 v39.0.0
 -------
 
+* #1296: Setuptools now vendors its own direct dependencies, no
+  longer relying on the dependencies as vendored by pkg_resources.
+
 * #296: Removed long-deprecated support for iteration on
   Version objects as returned by ``pkg_resources.parse_version``.
   Removed the ``SetuptoolsVersion`` and

From a6e5aa4eacfc978d2b00be06733698feeab87ce6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Mar 2018 14:48:40 -0400
Subject: [PATCH 6956/8469] =?UTF-8?q?Bump=20version:=2038.7.0=20=E2=86=92?=
 =?UTF-8?q?=2039.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1d8dd5ad4e..4b5a26ab62 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 38.7.0
+current_version = 39.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 2712f89964..b2cff53bf2 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="38.7.0",
+    version="39.0.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 2005e53e887c4ce6ca6da27241e43e3686e8f298 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 17 Mar 2018 19:59:08 -0400
Subject: [PATCH 6957/8469] Make dist test fail under unicode

---
 setuptools/tests/test_dist.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 0c10f05bc1..ed75b54636 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -2,7 +2,6 @@
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
-from setuptools.extern.six import StringIO
 
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
@@ -85,15 +84,15 @@ def merge_dicts(d1, d2):
             {'author_email': 'author@name.com',
              'maintainer_email': 'maintainer@name.com'})),
         ('Author unicode', merge_dicts(attrs,
-            {'author': '鉄沢寛'})),
+            {'author': u'鉄沢寛'})),
         ('Maintainer unicode', merge_dicts(attrs,
-            {'maintainer': 'Jan �ukasiewicz'})),
+            {'maintainer': u'Jan �ukasiewicz'})),
     ]
 
     return test_cases
 
 @pytest.mark.parametrize('name,attrs', __maintainer_test_cases())
-def test_maintainer_author(name, attrs):
+def test_maintainer_author(name, attrs, tmpdir):
     tested_keys = {
         'author': 'Author',
         'author_email': 'Author-email',
@@ -103,11 +102,14 @@ def test_maintainer_author(name, attrs):
 
     # Generate a PKG-INFO file
     dist = Distribution(attrs)
-    PKG_INFO = StringIO()
-    dist.metadata.write_pkg_file(PKG_INFO)
-    PKG_INFO.seek(0)
+    fn = tmpdir.mkdir('pkg_info')
+    fn_s = str(fn)
+
+    dist.metadata.write_pkg_info(fn_s)
+
+    with open(str(fn.join('PKG-INFO')), 'r') as f:
+        pkg_lines = f.readlines()
 
-    pkg_lines = PKG_INFO.readlines()
     pkg_lines = [_ for _ in pkg_lines if _]   # Drop blank lines
     pkg_lines_set = set(pkg_lines)
 

From f78c489384f9a87ec73b515cf94949f3427d6210 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 17 Mar 2018 19:59:45 -0400
Subject: [PATCH 6958/8469] Fix issue with unicode author/maintainer on PY2

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index cd34eef639..0fb3d29ce1 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 __all__ = ['Distribution']
 
 import re
@@ -38,7 +39,9 @@ def _get_unpatched(cls):
 def get_metadata_version(dist_md):
     if dist_md.long_description_content_type or dist_md.provides_extras:
         return StrictVersion('2.1')
-    elif getattr(dist_md, 'python_requires', None) is not None:
+    elif (dist_md.maintainer is not None or
+          dist_md.maintainer_email is not None or
+          getattr(dist_md, 'python_requires', None) is not None):
         return StrictVersion('1.2')
     elif (dist_md.provides or dist_md.requires or dist_md.obsoletes or
             dist_md.classifiers or dist_md.download_url):
@@ -48,7 +51,7 @@ def get_metadata_version(dist_md):
 
 
 # Based on Python 3.5 version
-def write_pkg_file(self, file):
+def write_pkg_file(self, file, is_test=False):
     """Write the PKG-INFO format data to a file object.
     """
     version = get_metadata_version(self)
@@ -59,7 +62,7 @@ def write_pkg_file(self, file):
     file.write('Summary: %s\n' % self.get_description())
     file.write('Home-page: %s\n' % self.get_url())
 
-    if version == '1.2':
+    if version < StrictVersion('1.2'):
         file.write('Author: %s\n' % self.get_contact())
         file.write('Author-email: %s\n' % self.get_contact_email())
     else:
@@ -72,6 +75,9 @@ def write_pkg_file(self, file):
 
         for field, attr in optional_fields:
             attr_val = getattr(self, attr)
+            if six.PY2:
+               attr_val = self._encode_field(attr_val)
+
             if attr_val is not None:
                 file.write('%s: %s\n' % (field, attr_val))
 
@@ -88,7 +94,7 @@ def write_pkg_file(self, file):
     if keywords:
         file.write('Keywords: %s\n' % keywords)
 
-    if version == '1.2':
+    if version >= StrictVersion('1.2'):
         for platform in self.get_platforms():
             file.write('Platform: %s\n' % platform)
     else:

From c14a674e89fa5fc6661a35ca4eb468afa886c775 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 09:41:28 -0400
Subject: [PATCH 6959/8469] When possible, avoid test-specific interfaces in
 production code.

---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0fb3d29ce1..61cf580706 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -51,7 +51,7 @@ def get_metadata_version(dist_md):
 
 
 # Based on Python 3.5 version
-def write_pkg_file(self, file, is_test=False):
+def write_pkg_file(self, file):
     """Write the PKG-INFO format data to a file object.
     """
     version = get_metadata_version(self)

From ad2d7e483ef5531962f6ca0c463704505afeb471 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 09:54:37 -0400
Subject: [PATCH 6960/8469] Use unicode literals

---
 setuptools/tests/test_dist.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index ed75b54636..74bd8cc83a 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
@@ -84,9 +87,9 @@ def merge_dicts(d1, d2):
             {'author_email': 'author@name.com',
              'maintainer_email': 'maintainer@name.com'})),
         ('Author unicode', merge_dicts(attrs,
-            {'author': u'鉄沢寛'})),
+            {'author': '鉄沢寛'})),
         ('Maintainer unicode', merge_dicts(attrs,
-            {'maintainer': u'Jan �ukasiewicz'})),
+            {'maintainer': 'Jan �ukasiewicz'})),
     ]
 
     return test_cases

From d92bc63ddd88729ad0bd892eacce29439b821fd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 09:55:59 -0400
Subject: [PATCH 6961/8469] Delint

---
 setuptools/dist.py            |  5 +++--
 setuptools/tests/test_dist.py | 31 +++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 61cf580706..284d922df5 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -36,6 +36,7 @@ def _get_unpatched(cls):
     warnings.warn("Do not call this function", DeprecationWarning)
     return get_unpatched(cls)
 
+
 def get_metadata_version(dist_md):
     if dist_md.long_description_content_type or dist_md.provides_extras:
         return StrictVersion('2.1')
@@ -76,7 +77,7 @@ def write_pkg_file(self, file):
         for field, attr in optional_fields:
             attr_val = getattr(self, attr)
             if six.PY2:
-               attr_val = self._encode_field(attr_val)
+                attr_val = self._encode_field(attr_val)
 
             if attr_val is not None:
                 file.write('%s: %s\n' % (field, attr_val))
@@ -562,7 +563,7 @@ def fetch_build_egg(self, req):
                 # don't use any other settings
                 'find_links', 'site_dirs', 'index_url',
                 'optimize', 'site_dirs', 'allow_hosts',
-        ))
+            ))
         if self.dependency_links:
             links = self.dependency_links[:]
             if 'find_links' in opts:
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 74bd8cc83a..28b46fd380 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -11,12 +11,14 @@
 
 import pytest
 
+
 def test_dist_fetch_build_egg(tmpdir):
     """
     Check multiple calls to `Distribution.fetch_build_egg` work as expected.
     """
     index = tmpdir.mkdir('index')
     index_url = urljoin('file://', pathname2url(str(index)))
+
     def sdist_with_index(distname, version):
         dist_dir = index.mkdir(distname)
         dist_sdist = '%s-%s.tar.gz' % (distname, version)
@@ -65,35 +67,45 @@ def merge_dicts(d1, d2):
 
     test_cases = [
         ('No author, no maintainer', attrs.copy()),
-        ('Author (no e-mail), no maintainer', merge_dicts(attrs,
+        ('Author (no e-mail), no maintainer', merge_dicts(
+            attrs,
             {'author': 'Author Name'})),
-        ('Author (e-mail), no maintainer', merge_dicts(attrs,
+        ('Author (e-mail), no maintainer', merge_dicts(
+            attrs,
             {'author': 'Author Name',
              'author_email': 'author@name.com'})),
-        ('No author, maintainer (no e-mail)', merge_dicts(attrs,
+        ('No author, maintainer (no e-mail)', merge_dicts(
+            attrs,
             {'maintainer': 'Maintainer Name'})),
-        ('No author, maintainer (e-mail)', merge_dicts(attrs,
+        ('No author, maintainer (e-mail)', merge_dicts(
+            attrs,
             {'maintainer': 'Maintainer Name',
              'maintainer_email': 'maintainer@name.com'})),
-        ('Author (no e-mail), Maintainer (no-email)', merge_dicts(attrs,
+        ('Author (no e-mail), Maintainer (no-email)', merge_dicts(
+            attrs,
             {'author': 'Author Name',
              'maintainer': 'Maintainer Name'})),
-        ('Author (e-mail), Maintainer (e-mail)', merge_dicts(attrs,
+        ('Author (e-mail), Maintainer (e-mail)', merge_dicts(
+            attrs,
             {'author': 'Author Name',
              'author_email': 'author@name.com',
              'maintainer': 'Maintainer Name',
              'maintainer_email': 'maintainer@name.com'})),
-        ('No author (e-mail), no maintainer (e-mail)', merge_dicts(attrs,
+        ('No author (e-mail), no maintainer (e-mail)', merge_dicts(
+            attrs,
             {'author_email': 'author@name.com',
              'maintainer_email': 'maintainer@name.com'})),
-        ('Author unicode', merge_dicts(attrs,
+        ('Author unicode', merge_dicts(
+            attrs,
             {'author': '鉄沢寛'})),
-        ('Maintainer unicode', merge_dicts(attrs,
+        ('Maintainer unicode', merge_dicts(
+            attrs,
             {'maintainer': 'Jan �ukasiewicz'})),
     ]
 
     return test_cases
 
+
 @pytest.mark.parametrize('name,attrs', __maintainer_test_cases())
 def test_maintainer_author(name, attrs, tmpdir):
     tested_keys = {
@@ -127,4 +139,3 @@ def test_maintainer_author(name, attrs, tmpdir):
         else:
             line = '%s: %s' % (fkey, val)
             assert line in pkg_lines_set
-

From b38d71f2935ce069f5f1f6b2ccaa7b99c838db67 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 09:59:32 -0400
Subject: [PATCH 6962/8469] Open metadata file with UTF-8 decoding.

---
 setuptools/tests/test_dist.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 28b46fd380..8d5c9e387e 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -2,6 +2,8 @@
 
 from __future__ import unicode_literals
 
+import io
+
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
@@ -122,7 +124,7 @@ def test_maintainer_author(name, attrs, tmpdir):
 
     dist.metadata.write_pkg_info(fn_s)
 
-    with open(str(fn.join('PKG-INFO')), 'r') as f:
+    with io.open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f:
         pkg_lines = f.readlines()
 
     pkg_lines = [_ for _ in pkg_lines if _]   # Drop blank lines

From b1b837df6846cc64bdfec94408fc2276fbfe93ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 10:00:57 -0400
Subject: [PATCH 6963/8469] Use filter to filter blank lines

---
 setuptools/tests/test_dist.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 8d5c9e387e..0279318b1c 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -127,7 +127,9 @@ def test_maintainer_author(name, attrs, tmpdir):
     with io.open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f:
         pkg_lines = f.readlines()
 
-    pkg_lines = [_ for _ in pkg_lines if _]   # Drop blank lines
+    # Drop blank lines
+    pkg_lines = list(filter(None, pkg_lines))
+
     pkg_lines_set = set(pkg_lines)
 
     # Duplicate lines should not be generated

From eb6502d70552df1fa1272497c05d8c5893f6befe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 10:01:39 -0400
Subject: [PATCH 6964/8469] Use another variable name to avoid masking prior
 value.

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

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 0279318b1c..5162e1c985 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -125,10 +125,10 @@ def test_maintainer_author(name, attrs, tmpdir):
     dist.metadata.write_pkg_info(fn_s)
 
     with io.open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f:
-        pkg_lines = f.readlines()
+        raw_pkg_lines = f.readlines()
 
     # Drop blank lines
-    pkg_lines = list(filter(None, pkg_lines))
+    pkg_lines = list(filter(None, raw_pkg_lines))
 
     pkg_lines_set = set(pkg_lines)
 

From f96f0db5ab8e90a0c3757e7951da26f0a948e9cf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 10:34:42 -0400
Subject: [PATCH 6965/8469] Update changelog. Ref #1300.

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8fae9816d5..05de76e50a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v39.0.1
+-------
+
+* #1297: Restore Unicode handling for Maintainer fields in
+  metadata.
+
 v39.0.0
 -------
 

From 76f1da96edb2a9252c4aa7f4eacdac4312209d1c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Mar 2018 10:34:48 -0400
Subject: [PATCH 6966/8469] =?UTF-8?q?Bump=20version:=2039.0.0=20=E2=86=92?=
 =?UTF-8?q?=2039.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4b5a26ab62..daec5c99f3 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.0.0
+current_version = 39.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b2cff53bf2..9ac05104d4 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.0.0",
+    version="39.0.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From a0723a66bf7950ee470971ac9931d751a7dd76f3 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 18 Mar 2018 11:43:00 -0400
Subject: [PATCH 6967/8469] Stop patching write_pkg_info

---
 setuptools/dist.py   |  9 ---------
 setuptools/monkey.py | 16 ----------------
 2 files changed, 25 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 284d922df5..321ab6b7d7 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -123,15 +123,6 @@ def write_pkg_file(self, file):
             file.write('Provides-Extra: %s\n' % extra)
 
 
-# from Python 3.4
-def write_pkg_info(self, base_dir):
-    """Write the PKG-INFO file into the release tree.
-    """
-    with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
-              encoding='UTF-8') as pkg_info:
-        self.write_pkg_file(pkg_info)
-
-
 sequence = tuple, list
 
 
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index d9eb7d7b29..08ed50d9ec 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -87,7 +87,6 @@ def patch_all():
         distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
 
     _patch_distribution_metadata_write_pkg_file()
-    _patch_distribution_metadata_write_pkg_info()
 
     # Install Distribution throughout the distutils
     for module in distutils.dist, distutils.core, distutils.cmd:
@@ -111,21 +110,6 @@ def _patch_distribution_metadata_write_pkg_file():
     )
 
 
-def _patch_distribution_metadata_write_pkg_info():
-    """
-    Workaround issue #197 - Python 3 prior to 3.2.2 uses an environment-local
-    encoding to save the pkg_info. Monkey-patch its write_pkg_info method to
-    correct this undesirable behavior.
-    """
-    environment_local = (3,) <= sys.version_info[:3] < (3, 2, 2)
-    if not environment_local:
-        return
-
-    distutils.dist.DistributionMetadata.write_pkg_info = (
-        setuptools.dist.write_pkg_info
-    )
-
-
 def patch_func(replacement, target_mod, func_name):
     """
     Patch func_name in target_mod with replacement

From 0a2c83252613aaaddb8f995d86df370af7003cbb Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 10:22:22 -0400
Subject: [PATCH 6968/8469] Add coverage generation to tox

---
 tests/requirements.txt |  2 ++
 tox.ini                | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 38b6924712..d3995f745a 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -5,3 +5,5 @@ virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2
 wheel
+coverage
+pytest-cov
diff --git a/tox.ini b/tox.ini
index 2f7d4dc818..dab48816e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,28 @@
 
 [testenv]
 deps=-rtests/requirements.txt
+setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=py.test {posargs}
+# These are separate so xfail tests don't count towards code coverage
+commands=pytest -m "not xfail" {posargs: "{toxinidir}" --cov-config={toxinidir}/tox.ini --cov=setuptools}
+         pytest -m "xfail"  {posargs: "{toxinidir}"}
 usedevelop=True
+
+
+[testenv:coverage]
+description=Combine coverage data and create reports
+deps=coverage
+skip_install=True
+changedir={toxworkdir}
+setenv=COVERAGE_FILE=.coverage
+commands=coverage erase
+         coverage combine
+         coverage report --rcfile={toxinidir}/tox.ini
+         coverage xml
+
+[coverage:run]
+source=setuptools
+
+[coverage:report]
+skip_covered=True
+show_missing=True

From 65c5ae1ae8ebc83df2224f31e24fcb9f87a36aed Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 10:28:51 -0400
Subject: [PATCH 6969/8469] Add coverage to travis

---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ffbd72a3d4..a0d90925eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,19 @@ python:
 - nightly
 - pypy
 - pypy3
+env:
+    TOXENV=py
 
 jobs:
   fast_finish: true
   include:
   - python: *latest_py3
-    env: LANG=C
+    env: &cenv
+        global:
+            - LANG=C
+            - TOXENV=py
   - python: *latest_py2
-    env: LANG=C
+    env: *cenv
   - stage: deploy (to PyPI for tagged commits)
     if: tag IS present
     python: *latest_py3
@@ -49,3 +54,6 @@ install:
 - python bootstrap.py
 
 script: tox
+
+after_success:
+    - if [[ $TOXENV == "py" ]]; then tox -e coverage; fi

From 49b65d25db9b85b0d34bfc713d6ca4ca5c1096c0 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 10:43:00 -0400
Subject: [PATCH 6970/8469] Add codecov to tox and travis

---
 .travis.yml | 3 ++-
 tox.ini     | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a0d90925eb..731a067bad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,4 +56,5 @@ install:
 script: tox
 
 after_success:
-    - if [[ $TOXENV == "py" ]]; then tox -e coverage; fi
+    - if [[ $TOXENV == "py" ]]; then tox -e coverage,codecov; fi
+
diff --git a/tox.ini b/tox.ini
index dab48816e6..2201768dc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,12 @@ commands=coverage erase
          coverage report --rcfile={toxinidir}/tox.ini
          coverage xml
 
+[testenv:codecov]
+description=[Only run on CI]: Upload coverage data to codecov
+deps=codecov
+skip_install=True
+commands=codecov --file {toxworkdir}/coverage.xml
+
 [coverage:run]
 source=setuptools
 

From a2b444f1375d8c56275e50bd2a9bbe111003a76b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 10:54:34 -0400
Subject: [PATCH 6971/8469] Add coverage to appveyor build

---
 appveyor.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7c61455ce6..2b6594599e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
 
-  APPVEYOR: true
+  APPVEYOR: True
 
   matrix:
     - PYTHON: "C:\\Python35-x64"
@@ -20,6 +20,10 @@ cache:
 test_script:
   - "python bootstrap.py"
   - "python -m pip install tox"
-  - "tox"
+  - "tox -e py"
+
+after_test:
+    - tox -e coverage,codecov
 
 version: '{build}'
+

From aeb6c9435b50715f91f4ad06e387172be9742beb Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 11:16:18 -0400
Subject: [PATCH 6972/8469] Add travis, appveyor and codecov passenvs

Some of these environment variables are necessary codecov to
detect that it is on travis/appveyor and thus doesn't need
an upload token.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 2201768dc9..2c3de95e50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@
 [testenv]
 deps=-rtests/requirements.txt
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
+passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
 # These are separate so xfail tests don't count towards code coverage
 commands=pytest -m "not xfail" {posargs: "{toxinidir}" --cov-config={toxinidir}/tox.ini --cov=setuptools}
          pytest -m "xfail"  {posargs: "{toxinidir}"}

From 4bca77392b8da2f1de80c944d221a9874b72cf6b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 11:28:01 -0400
Subject: [PATCH 6973/8469] Add codecov settings

---
 .codecov.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .codecov.yml

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 0000000000..69cb76019a
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1 @@
+comment: false

From 20e424c2dfa0d290580e4e355eca765632dc90a4 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 21 Mar 2018 11:37:42 -0400
Subject: [PATCH 6974/8469] Omit vendored code from coverage

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 2c3de95e50..5a7044d41c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ commands=codecov --file {toxworkdir}/coverage.xml
 
 [coverage:run]
 source=setuptools
+omit=setuptools/_vendor/*
 
 [coverage:report]
 skip_covered=True

From b987fe1c2fa61040cc07a07d93b5284b66b03288 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 22 Mar 2018 11:09:28 -0400
Subject: [PATCH 6975/8469] Add lower bound to coverage packages

---
 tests/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index d3995f745a..fd826d0974 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -5,5 +5,5 @@ virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2
 wheel
-coverage
-pytest-cov
+coverage>=4.5.1
+pytest-cov>=2.5.1

From 18ea99486520e3f7cf1668436ae800695ae1fb9c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 22 Mar 2018 11:12:28 -0400
Subject: [PATCH 6976/8469] Update tox passenv

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 5a7044d41c..6f76058520 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,9 @@
 [testenv]
 deps=-rtests/requirements.txt
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
+# TODO: The passed environment variables came from copying other tox.ini files
+# These should probably be individually annotated to explain what needs them.
+passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
 # These are separate so xfail tests don't count towards code coverage
 commands=pytest -m "not xfail" {posargs: "{toxinidir}" --cov-config={toxinidir}/tox.ini --cov=setuptools}
          pytest -m "xfail"  {posargs: "{toxinidir}"}

From 9d9aa90c912fa363a5dcb263b709ca776c911661 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 22 Mar 2018 14:54:28 -0400
Subject: [PATCH 6977/8469] Start omitting */_vendor/*

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6f76058520..42d01a2b3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,7 +35,7 @@ commands=codecov --file {toxworkdir}/coverage.xml
 
 [coverage:run]
 source=setuptools
-omit=setuptools/_vendor/*
+omit=*/_vendor/*
 
 [coverage:report]
 skip_covered=True

From 685987d6275f8d9f5815c0f80bf581fb3d6d02fd Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 23 Mar 2018 13:11:28 -0400
Subject: [PATCH 6978/8469] Skip coverage on pypy3 on travis

On pypy3 on Travis (version 5.8.0), running with coverage
enabled causes significant slowdown and test_build_meta
ends up timing out or otherwise failing. Until that is
fixed, skip coverage on pypy3 on Travis.
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 731a067bad..fb659f1310 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ python:
 - &latest_py3 3.6
 - nightly
 - pypy
-- pypy3
 env:
     TOXENV=py
 
@@ -23,6 +22,10 @@ jobs:
             - TOXENV=py
   - python: *latest_py2
     env: *cenv
+  - python: pypy3
+    # Running coverage breaks the pypy3 build on Travis only.
+    # Until that's fixed the pypy3 build needs to be run without coverage
+    script: tox -e py -- $TRAVIS_BUILD_DIR
   - stage: deploy (to PyPI for tagged commits)
     if: tag IS present
     python: *latest_py3

From e6b7f8d868b2f3fd5ac2015055e5414f489d418b Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Mon, 26 Mar 2018 12:03:08 +0100
Subject: [PATCH 6979/8469] tests: Add regression test for #1081

This ensures we don't unknowingly change the behavior of this again.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: #1307
---
 setuptools/tests/test_egg_info.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index d221167152..2a070debe0 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -244,6 +244,18 @@ def parametrize(*test_list, **format_dict):
         pytz
         ''',
 
+        '''
+        install_requires_ordered
+
+        install_requires=["fake-factory>=1.12.3,!=2.0"]
+
+        [options]
+        install_requires =
+            fake-factory>=1.12.3,!=2.0
+
+        fake-factory!=2.0,>=1.12.3
+        ''',
+
         '''
         install_requires_with_marker
 

From 58d299de99612f76f2ff5cfe7fb142d95e5e8738 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 26 Mar 2018 18:34:40 +0200
Subject: [PATCH 6980/8469] Improve speed and clarity of code coverage

Rationale:
- tox should work the same as before
- coverage is too slow and disabled by default locally
- disable coverage on pypy and pypy3 (way too slow)
- add coverage info for pkg_resources
- make sure tests are ignored in coverage
- make sure all CI jobs are identifiable
- include coverage for xfail (too complicated otherwise)
- disable report on terminal
---
 .travis.yml  | 28 ++++++++++++----------------
 appveyor.yml | 10 ++++++----
 tox.ini      | 23 +++++++++++------------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb659f1310..544b8df305 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,29 +8,20 @@ python:
 - 3.5
 - &latest_py3 3.6
 - nightly
-- pypy
-env:
-    TOXENV=py
 
 jobs:
   fast_finish: true
   include:
   - python: *latest_py3
-    env: &cenv
-        global:
-            - LANG=C
-            - TOXENV=py
+    env: LANG=C
   - python: *latest_py2
-    env: *cenv
-  - python: pypy3
-    # Running coverage breaks the pypy3 build on Travis only.
-    # Until that's fixed the pypy3 build needs to be run without coverage
-    script: tox -e py -- $TRAVIS_BUILD_DIR
+    env: LANG=C
   - stage: deploy (to PyPI for tagged commits)
     if: tag IS present
     python: *latest_py3
     install: skip
     script: skip
+    after_success: skip
     before_deploy: python bootstrap.py
     deploy:
       provider: pypi
@@ -43,6 +34,13 @@ jobs:
       distributions: release
       skip_cleanup: true
       skip_upload_docs: true
+  # Don't run coverage on pypy.
+  - python: pypy
+    script: tox
+    after_success: skip
+  - python: pypy3
+    script: tox
+    after_success: skip
 
 cache: pip
 
@@ -56,8 +54,6 @@ install:
 # update egg_info based on setup.py in checkout
 - python bootstrap.py
 
-script: tox
-
-after_success:
-    - if [[ $TOXENV == "py" ]]; then tox -e coverage,codecov; fi
+script: tox -- --cov
 
+after_success: env TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME tox -e coverage,codecov
diff --git a/appveyor.yml b/appveyor.yml
index 2b6594599e..ff7122b41f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,13 @@
 environment:
 
   APPVEYOR: True
+  CODECOV_ENV: APPVEYOR_JOB_NAME
 
   matrix:
-    - PYTHON: "C:\\Python35-x64"
-    - PYTHON: "C:\\Python27-x64"
+    - APPVEYOR_JOB_NAME: "python35-x64"
+      PYTHON: "C:\\Python35-x64"
+    - APPVEYOR_JOB_NAME: "python27-x64"
+      PYTHON: "C:\\Python27-x64"
 
 install:
   # symlink python from a directory with a space
@@ -20,10 +23,9 @@ cache:
 test_script:
   - "python bootstrap.py"
   - "python -m pip install tox"
-  - "tox -e py"
+  - "tox -- --cov"
 
 after_test:
     - tox -e coverage,codecov
 
 version: '{build}'
-
diff --git a/tox.ini b/tox.ini
index 42d01a2b3a..a0c4cdf300 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,28 +4,28 @@
 #
 # export TOXENV='py27,py3{3,4,5,6},pypy,pypy3'
 
+[tox]
+envlist=python
+
 [testenv]
 deps=-rtests/requirements.txt
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
-# These are separate so xfail tests don't count towards code coverage
-commands=pytest -m "not xfail" {posargs: "{toxinidir}" --cov-config={toxinidir}/tox.ini --cov=setuptools}
-         pytest -m "xfail"  {posargs: "{toxinidir}"}
+commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
 
 
 [testenv:coverage]
-description=Combine coverage data and create reports
+description=Combine coverage data and create report
 deps=coverage
 skip_install=True
 changedir={toxworkdir}
 setenv=COVERAGE_FILE=.coverage
 commands=coverage erase
          coverage combine
-         coverage report --rcfile={toxinidir}/tox.ini
-         coverage xml
+         coverage {posargs:xml}
 
 [testenv:codecov]
 description=[Only run on CI]: Upload coverage data to codecov
@@ -34,9 +34,8 @@ skip_install=True
 commands=codecov --file {toxworkdir}/coverage.xml
 
 [coverage:run]
-source=setuptools
-omit=*/_vendor/*
-
-[coverage:report]
-skip_covered=True
-show_missing=True
+source=
+	pkg_resources
+	setuptools
+omit=
+	*/_vendor/*

From 41882016dbd6b334e6e10e2c3ac5afb9f5793ede Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 6 Apr 2018 17:07:44 -0400
Subject: [PATCH 6981/8469] Update wheel tests to reflect latest version

---
 setuptools/tests/test_wheel.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index b6be6f1f05..d8d5ddb23c 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -161,11 +161,9 @@ def __repr__(self):
             '''
             foo-1.0-py{py_version}.egg/
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             |-- foo/
             |  |-- __init__.py
@@ -196,11 +194,9 @@ def __repr__(self):
             '''
             foo-1.0-py{py_version}.egg/
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             |-- data_dir/
             |  |-- data.txt
@@ -267,11 +263,9 @@ def __repr__(self):
             foo-1.0-py{py_version}-{platform}.egg/
             |-- extension{shlib_ext}
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             '''
         ),
@@ -293,11 +287,9 @@ def __repr__(self):
             foo-1.0-py{py_version}.egg/
             |-- header.h
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             '''
         ),
@@ -326,11 +318,9 @@ def __repr__(self):
             '''
             foo-1.0-py{py_version}.egg/
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             |  |-- scripts/
             |  |  |-- script.py
@@ -346,11 +336,9 @@ def __repr__(self):
             '''
             foo-1.0-py{py_version}.egg/
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- requires.txt
             |  |-- top_level.txt
             '''),
@@ -430,11 +418,9 @@ def __repr__(self):
             foo-1.0-py{py_version}.egg/
             |-- foo-1.0-py{py_version}-nspkg.pth
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- namespace_packages.txt
             |  |-- top_level.txt
             |-- foo/
@@ -466,11 +452,9 @@ def __repr__(self):
             '''
             foo-1.0-py{py_version}.egg/
             |-- EGG-INFO/
-            |  |-- DESCRIPTION.rst
             |  |-- PKG-INFO
             |  |-- RECORD
             |  |-- WHEEL
-            |  |-- metadata.json
             |  |-- top_level.txt
             |-- foo/
             |  |-- __init__.py

From ed3762fc7d16174a54b2fa83af1996decafd756f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 7 Apr 2018 13:38:31 -0400
Subject: [PATCH 6982/8469] Switch test_wheel over to subset-based test

This is both compatible with the old version of wheel (last one
supported under Python 3.3) and is more in line with our commitment,
which is that the wheel install provides at least these files.
---
 setuptools/tests/test_wheel.py | 268 +++++++++++++++++----------------
 1 file changed, 142 insertions(+), 126 deletions(-)

diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index d8d5ddb23c..150ac4c1b5 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -92,39 +92,49 @@ def build_wheel(extra_file_defs=None, **kwargs):
         yield glob.glob(os.path.join(source_dir, 'dist', '*.whl'))[0]
 
 
-def tree(root):
-    def depth(path):
-        return len(path.split(os.path.sep))
-    def prefix(path_depth):
-        if not path_depth:
-            return ''
-        return '|  ' * (path_depth - 1) + '|-- '
-    lines = []
-    root_depth = depth(root)
+def tree_set(root):
+    contents = set()
     for dirpath, dirnames, filenames in os.walk(root):
-        dirnames.sort()
-        filenames.sort()
-        dir_depth = depth(dirpath) - root_depth
-        if dir_depth > 0:
-            lines.append('%s%s/' % (prefix(dir_depth - 1),
-                                    os.path.basename(dirpath)))
-        for f in filenames:
-            lines.append('%s%s' % (prefix(dir_depth), f))
-    return '\n'.join(lines) + '\n'
-
-
-def _check_wheel_install(filename, install_dir, install_tree,
+        for filename in filenames:
+            contents.add(os.path.join(os.path.relpath(dirpath, root),
+                                      filename))
+    return contents
+
+
+def flatten_tree(tree):
+    """Flatten nested dicts and lists into a full list of paths"""
+    output = set()
+    for node, contents in tree.items():
+        if isinstance(contents, dict):
+            contents = flatten_tree(contents)
+
+        for elem in contents:
+            if isinstance(elem, dict):
+                output |= {os.path.join(node, val)
+                           for val in flatten_tree(elem)}
+            else:
+                output.add(os.path.join(node, elem))
+    return output
+
+
+def format_install_tree(tree):
+    return {x.format(
+        py_version=PY_MAJOR,
+        platform=get_platform(),
+        shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO'))
+            for x in tree}
+
+
+def _check_wheel_install(filename, install_dir, install_tree_includes,
                          project_name, version, requires_txt):
     w = Wheel(filename)
     egg_path = os.path.join(install_dir, w.egg_name())
     w.install_as_egg(egg_path)
-    if install_tree is not None:
-        install_tree = install_tree.format(
-            py_version=PY_MAJOR,
-            platform=get_platform(),
-            shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO')
-        )
-        assert install_tree == tree(install_dir)
+    if install_tree_includes is not None:
+        install_tree = format_install_tree(install_tree_includes)
+        exp = tree_set(install_dir)
+        assert install_tree.issubset(exp), (install_tree - exp)
+
     metadata = PathMetadata(egg_path, os.path.join(egg_path, 'EGG-INFO'))
     dist = Distribution.from_filename(egg_path, metadata=metadata)
     assert dist.project_name == project_name
@@ -157,18 +167,17 @@ def __repr__(self):
         setup_kwargs=dict(
             packages=['foo'],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            |-- foo/
-            |  |-- __init__.py
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': {
+                'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt'
+                ],
+                'foo': ['__init__.py']
+            }
+        }),
     ),
 
     dict(
@@ -190,18 +199,19 @@ def __repr__(self):
         setup_kwargs=dict(
             data_files=[('data_dir', ['data.txt'])],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            |-- data_dir/
-            |  |-- data.txt
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': {
+                'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt'
+                ],
+                'data_dir': [
+                    'data.txt'
+                ]
+            }
+        }),
     ),
 
     dict(
@@ -258,17 +268,17 @@ def __repr__(self):
                        sources=['extension.c'])
             ],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}-{platform}.egg/
-            |-- extension{shlib_ext}
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}-{platform}.egg': [
+                'extension{shlib_ext}',
+                {'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt',
+                ]},
+            ]
+        }),
     ),
 
     dict(
@@ -282,17 +292,17 @@ def __repr__(self):
         setup_kwargs=dict(
             headers=['header.h'],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- header.h
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': [
+                'header.h',
+                {'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt',
+                ]},
+            ]
+        }),
     ),
 
     dict(
@@ -314,34 +324,37 @@ def __repr__(self):
         setup_kwargs=dict(
             scripts=['script.py', 'script.sh'],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            |  |-- scripts/
-            |  |  |-- script.py
-            |  |  |-- script.sh
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': {
+                'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt',
+                    {'scripts': [
+                        'script.py',
+                        'script.sh'
+                    ]}
+
+                ]
+            }
+        })
     ),
 
     dict(
         id='requires1',
         install_requires='foobar==2.0',
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- requires.txt
-            |  |-- top_level.txt
-            '''),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': {
+                'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'requires.txt',
+                    'top_level.txt',
+                ]
+            }
+        }),
         requires_txt=DALS(
             '''
             foobar==2.0
@@ -413,21 +426,22 @@ def __repr__(self):
             namespace_packages=['foo'],
             packages=['foo.bar'],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- foo-1.0-py{py_version}-nspkg.pth
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- namespace_packages.txt
-            |  |-- top_level.txt
-            |-- foo/
-            |  |-- __init__.py
-            |  |-- bar/
-            |  |  |-- __init__.py
-            '''),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': [
+                'foo-1.0-py{py_version}-nspkg.pth',
+                {'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'namespace_packages.txt',
+                    'top_level.txt',
+                ]},
+                {'foo': [
+                    '__init__.py',
+                    {'bar': ['__init__.py']},
+                ]},
+            ]
+        }),
     ),
 
     dict(
@@ -448,20 +462,22 @@ def __repr__(self):
             packages=['foo'],
             data_files=[('foo/data_dir', ['foo/data_dir/data.txt'])],
         ),
-        install_tree=DALS(
-            '''
-            foo-1.0-py{py_version}.egg/
-            |-- EGG-INFO/
-            |  |-- PKG-INFO
-            |  |-- RECORD
-            |  |-- WHEEL
-            |  |-- top_level.txt
-            |-- foo/
-            |  |-- __init__.py
-            |  |-- data_dir/
-            |  |  |-- data.txt
-            '''
-        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': {
+                'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'top_level.txt',
+                ],
+                'foo': [
+                    '__init__.py',
+                    {'data_dir': [
+                        'data.txt',
+                    ]}
+                ]
+            }
+        }),
     ),
 
 )

From 4377d517a95a0df2d4e0941438bebdb9f804a527 Mon Sep 17 00:00:00 2001
From: Tomas Orsava <torsava@redhat.com>
Date: Thu, 12 Apr 2018 14:55:06 +0200
Subject: [PATCH 6983/8469] Make safe_name compliant to PEP 503 and behaviour
 of pip > 8.1.2

According to PEP 503, a "normalized" project name has all runs of the
characters ., - and _ replaced with a single - character. [0]

Similarly, since version 8.1.2, that is the behaviour of pip as well. [1]

However, Setuptools still allows a . in the normalized name, which
is causing trouble down the line.

[0] https://www.python.org/dev/peps/pep-0503/#normalized-names
[1] https://github.com/pypa/pip/issues/3666
---
 pkg_resources/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 8d95bd2912..19a7eba8a1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1309,9 +1309,9 @@ def get_default_cache():
 def safe_name(name):
     """Convert an arbitrary string to a standard distribution name
 
-    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
+    Any runs of non-alphanumeric characters are replaced with a single '-'.
     """
-    return re.sub('[^A-Za-z0-9.]+', '-', name)
+    return re.sub('[^A-Za-z0-9]+', '-', name)
 
 
 def safe_version(version):

From 2ae4ab8915833e1a719199011b923bc87931949c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 12 Apr 2018 14:06:34 -0400
Subject: [PATCH 6984/8469] Add .pytest_cache/ to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2e2f71b8f2..f5661164f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ setuptools.egg-info
 *~
 .hg*
 .cache
+.pytest_cache/

From 542e5069e27bad1f72e0b37211f4d4c82d38267c Mon Sep 17 00:00:00 2001
From: Thomas Khyn <thomas@ksytek.com>
Date: Wed, 18 Apr 2018 15:26:11 +1200
Subject: [PATCH 6985/8469] pep425tags: turn warning into a debug log entry

fixes #1314
---
 setuptools/pep425tags.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
index dfe55d587a..3bdd3285a5 100644
--- a/setuptools/pep425tags.py
+++ b/setuptools/pep425tags.py
@@ -4,6 +4,7 @@
 from __future__ import absolute_import
 
 import distutils.util
+from distutils import log
 import platform
 import re
 import sys
@@ -69,8 +70,8 @@ def get_flag(var, fallback, expected=True, warn=True):
     val = get_config_var(var)
     if val is None:
         if warn:
-            warnings.warn("Config variable '{0}' is unset, Python ABI tag may "
-                          "be incorrect".format(var), RuntimeWarning, 2)
+            log.debug("Config variable '%s' is unset, Python ABI tag may "
+                      "be incorrect", var)
         return fallback()
     return val == expected
 

From 9af3f4208386064dbe5c7f5c9b6724a8bb1e760c Mon Sep 17 00:00:00 2001
From: Michael Wild <themiwi@users.sourceforge.net>
Date: Sun, 22 Apr 2018 13:07:52 +0200
Subject: [PATCH 6986/8469] Adds call to os.path.abspath() in
 pkg_resources.normalize_path() on Cygwin

This works around problems that stem from getcwd(3) on Cygwin returning paths containing symlinks. I am not sure at all whether this is a good place to fix it, but that's where I got hit by the issue when doing a `python setup.py develop` (or `pip install -e .`).
---
 pkg_resources/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 8d95bd2912..3cbb5d199d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2220,7 +2220,15 @@ def null_ns_handler(importer, path_item, packageName, module):
 
 def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
-    return os.path.normcase(os.path.realpath(filename))
+    if sys.platform == 'cygwin':
+      # This results in a call to getcwd() if `filename` is relative. Contrary
+      # to POSIX 2008 on Cygwin getcwd (3) contains symlink components. Using
+      # os.path.abspath() works around this limitation. A fix in os.getcwd()
+      # would probably better, in Cygwin even more so except that this seems
+      # to be by design...
+      return os.path.normcase(os.path.realpath(os.path.abspath(filename)))
+    else:
+      return os.path.normcase(os.path.realpath(filename))
 
 
 def _normalize_cached(filename, _cache={}):

From afa410dcce836b0dea503a68eae7467911201bc5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Apr 2018 15:29:48 -0400
Subject: [PATCH 6987/8469] Refactor to support multiple loader names. Ref
 #1337.

---
 pkg_resources/__init__.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 8d95bd2912..2ccf85adda 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1518,12 +1518,10 @@ def _get(self, path):
 
     @classmethod
     def _register(cls):
-        loader_cls = getattr(
-            importlib_machinery,
-            'SourceFileLoader',
-            type(None),
-        )
-        register_loader_type(loader_cls, cls)
+        loader_names = 'SourceFileLoader',
+        for name in loader_names:
+            loader_cls = getattr(importlib_machinery, name, type(None))
+            register_loader_type(loader_cls, cls)
 
 
 DefaultProvider._register()

From d0800d78a78809020b1681574061490019096657 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Apr 2018 15:31:17 -0400
Subject: [PATCH 6988/8469] Honor SourcelessFileLoader in DefaultProvider.
 Fixes #1337.

---
 CHANGES.rst               | 6 ++++++
 pkg_resources/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 05de76e50a..906da6bda8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v39.1.0
+-------
+
+* #1337: In ``pkg_resources``, now support loading resources
+  for modules loaded by the ``SourcelessFileLoader``.
+
 v39.0.1
 -------
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2ccf85adda..d5b0fe9828 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1518,7 +1518,7 @@ def _get(self, path):
 
     @classmethod
     def _register(cls):
-        loader_names = 'SourceFileLoader',
+        loader_names = 'SourceFileLoader', 'SourcelessFileLoader',
         for name in loader_names:
             loader_cls = getattr(importlib_machinery, name, type(None))
             register_loader_type(loader_cls, cls)

From 06736eec5894df69dc267876cf78381804df3ada Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 26 Apr 2018 06:27:19 -0700
Subject: [PATCH 6989/8469] Update all pypi.python.org URLs to pypi.org

For details on the new PyPI, see the blog post:

https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
---
 CHANGES.rst                           | 4 ++--
 docs/_templates/indexsidebar.html     | 2 +-
 docs/easy_install.txt                 | 7 +++----
 docs/python3.txt                      | 4 ++--
 docs/setuptools.txt                   | 6 +++---
 setuptools/command/easy_install.py    | 2 +-
 setuptools/package_index.py           | 2 +-
 setuptools/tests/test_packageindex.py | 4 ++--
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 906da6bda8..3ad475f379 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1808,7 +1808,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Issue #313: Removed built-in support for subversion. Projects wishing to
   retain support for subversion will need to use a third party library. The
   extant implementation is being ported to `setuptools_svn
-  <https://pypi.python.org/pypi/setuptools_svn>`_.
+  <https://pypi.org/project/setuptools_svn/>`_.
 * Issue #315: Updated setuptools to hide its own loaded modules during
   installation of another package. This change will enable setuptools to
   upgrade (or downgrade) itself even when its own metadata and implementation
@@ -2313,7 +2313,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 * Address security vulnerability in SSL match_hostname check as reported in
   Python #17997.
 * Prefer `backports.ssl_match_hostname
-  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ for backport
+  <https://pypi.org/project/backports.ssl_match_hostname/>`_ for backport
   implementation if present.
 * Correct NameError in ``ssl_support`` module (``socket.error``).
 
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 3b127602ec..80002d0871 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -1,7 +1,7 @@
 <h3>Download</h3>
 
 <p>Current version: <b>{{ version }}</b></p>
-<p>Get Setuptools from the <a href="https://pypi.python.org/pypi/setuptools"> Python Package Index</a>
+<p>Get Setuptools from the <a href="https://pypi.org/project/setuptools/"> Python Package Index</a>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 56b1667226..5c99234361 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -31,7 +31,7 @@ Using "Easy Install"
 Installing "Easy Install"
 -------------------------
 
-Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_
+Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
@@ -831,7 +831,7 @@ Command-Line Options
 
 ``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
     Specifies the base URL of the Python Package Index.  The default is
-    https://pypi.python.org/simple if not specified.  When a package is requested
+    https://pypi.org/simple/ if not specified.  When a package is requested
     that is not locally available or linked from a ``--find-links`` download
     page, the package index will be searched for download pages for the needed
     package, and those download pages will be searched for links to download
@@ -1019,7 +1019,7 @@ that the User installation scheme alone does not provide, e.g. the ability to hi
 
 Please refer to the `virtualenv`_ documentation for more details.
 
-.. _virtualenv: https://pypi.python.org/pypi/virtualenv
+.. _virtualenv: https://pypi.org/project/virtualenv/
 
 
 
@@ -1620,4 +1620,3 @@ Future Plans
 * Signature checking?  SSL?  Ability to suppress PyPI search?
 * Display byte progress meter when downloading distributions and long pages?
 * Redirect stdout/stderr to log during run_setup?
-
diff --git a/docs/python3.txt b/docs/python3.txt
index d550cb68c1..c528fc3ced 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -10,8 +10,8 @@ code.
 Setuptools provides a facility to invoke 2to3 on the code as a part of the
 build process, by setting the keyword parameter ``use_2to3`` to True, but
 the Setuptools strongly recommends instead developing a unified codebase
-using `six <https://pypi.python.org/pypi/six>`_,
-`future <https://pypi.python.org/pypi/future>`_, or another compatibility
+using `six <https://pypi.org/project/six/>`_,
+`future <https://pypi.org/project/future/>`_, or another compatibility
 library.
 
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 65080a0b21..e14d208881 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2277,7 +2277,7 @@ The ``upload`` command is implemented and `documented
 in distutils.
 
 Setuptools augments the ``upload`` command with support
-for `keyring <https://pypi.python.org/pypi/keyring>`_,
+for `keyring <https://pypi.org/project/keyring/>`_,
 allowing the password to be stored in a secure
 location and not in plaintext in the .pypirc file. To use
 keyring, first install keyring and set the password for
@@ -2671,8 +2671,8 @@ Adding Support for Revision Control Systems
 If the files you want to include in the source distribution are tracked using
 Git, Mercurial or SVN, you can use the following packages to achieve that:
 
-- Git and Mercurial: `setuptools_scm <https://pypi.python.org/pypi/setuptools_scm>`_
-- SVN: `setuptools_svn <https://pypi.python.org/pypi/setuptools_svn>`_
+- Git and Mercurial: `setuptools_scm <https://pypi.org/project/setuptools_scm/>`_
+- SVN: `setuptools_svn <https://pypi.org/project/setuptools_svn/>`_
 
 If you would like to create a plugin for ``setuptools`` to find files tracked
 by another revision control system, you can do so by adding an entry point to
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a6f61436b7..85ee40f1d5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -319,7 +319,7 @@ def finalize_options(self):
                     self.all_site_dirs.append(normalize_path(d))
         if not self.editable:
             self.check_site_dir()
-        self.index_url = self.index_url or "https://pypi.python.org/simple"
+        self.index_url = self.index_url or "https://pypi.org/simple/"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
             if path_item not in self.shadow_path:
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 914b5e6159..b6407be304 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -297,7 +297,7 @@ class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
     def __init__(
-            self, index_url="https://pypi.python.org/simple", hosts=('*',),
+            self, index_url="https://pypi.org/simple/", hosts=('*',),
             ca_bundle=None, verify_ssl=True, *args, **kw
     ):
         Environment.__init__(self, *args, **kw)
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 53e20d44c8..63b9294610 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -265,11 +265,11 @@ def test_percent_in_password(self, tmpdir, monkeypatch):
         with pypirc.open('w') as strm:
             strm.write(DALS("""
                 [pypi]
-                repository=https://pypi.python.org
+                repository=https://pypi.org
                 username=jaraco
                 password=pity%
             """))
         cfg = setuptools.package_index.PyPIConfig()
-        cred = cfg.creds_by_repository['https://pypi.python.org']
+        cred = cfg.creds_by_repository['https://pypi.org']
         assert cred.username == 'jaraco'
         assert cred.password == 'pity%'

From afff74eeeab445c994c7df3d7152e6d0b87523cf Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 28 Apr 2018 10:42:52 +0200
Subject: [PATCH 6990/8469] Update changelog.

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3ad475f379..d8b5b49147 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,11 @@
 v39.1.0
 -------
 
+* #1340: Update all PyPI URLs to reflect the switch to the
+  new Warehouse codebase.
 * #1337: In ``pkg_resources``, now support loading resources
   for modules loaded by the ``SourcelessFileLoader``.
+* #1332: Silence spurious wheel related warnings on Windows.
 
 v39.0.1
 -------

From 511193af87e252d687e7e82936b4abc5db404910 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 28 Apr 2018 10:43:40 +0200
Subject: [PATCH 6991/8469] =?UTF-8?q?Bump=20version:=2039.0.1=20=E2=86=92?=
 =?UTF-8?q?=2039.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index daec5c99f3..2c84f0b763 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.0.1
+current_version = 39.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9ac05104d4..b08552d437 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.0.1",
+    version="39.1.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From b5d72640a7a5be77e14548f41b69357e44187579 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 28 Apr 2018 12:44:04 +0200
Subject: [PATCH 6992/8469] travis: fix deployment stage

---
 .travis.yml | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 544b8df305..ced8fa6bcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ python:
 - 3.5
 - &latest_py3 3.6
 - nightly
+- pypy
+- pypy3
 
 jobs:
   fast_finish: true
@@ -21,7 +23,7 @@ jobs:
     python: *latest_py3
     install: skip
     script: skip
-    after_success: skip
+    after_success: true
     before_deploy: python bootstrap.py
     deploy:
       provider: pypi
@@ -34,13 +36,6 @@ jobs:
       distributions: release
       skip_cleanup: true
       skip_upload_docs: true
-  # Don't run coverage on pypy.
-  - python: pypy
-    script: tox
-    after_success: skip
-  - python: pypy3
-    script: tox
-    after_success: skip
 
 cache: pip
 
@@ -54,6 +49,31 @@ install:
 # update egg_info based on setup.py in checkout
 - python bootstrap.py
 
-script: tox -- --cov
+script:
+  - |
+    ( # Run testsuite.
+      set -ex
+      case $TRAVIS_PYTHON_VERSION in
+      pypy*)
+        # Don't run coverage on pypy (too slow).
+        tox
+        ;;
+      *)
+        tox -- --cov
+        ;;
+      esac
+    )
 
-after_success: env TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME tox -e coverage,codecov
+after_success:
+  - |
+    ( # Upload coverage data.
+      set -ex
+      case $TRAVIS_PYTHON_VERSION in
+      pypy*)
+        ;;
+        *)
+        export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
+        tox -e coverage,codecov
+        ;;
+      esac
+    )

From 14f75bcb5f3fe9734a6eb0d151ee748b12390fa7 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 1 May 2018 16:22:44 +1000
Subject: [PATCH 6993/8469] Pin pytest-flake8 to 1.0.0

pytest-flake8 1.0.1 has a hard dependency on pytest>=3.5 [1], which
does not support python3.3 [2].  Avoid it for python3.3 and below
until python3.3 is removed [3].

Additionally, ensure we have a recent enough pip in travis ci to
handle multiple requirements entries.

[1] https://github.com/tholo/pytest-flake8/commit/25bbd3b42d3aa0962fb736202115dae9e5d2cd7c
[2] https://docs.pytest.org/en/latest/changelog.html#pytest-3-3-0-2017-11-23
[3] https://github.com/pypa/setuptools/pull/1342
---
 .travis.yml            | 2 ++
 tests/requirements.txt | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ced8fa6bcc..9f09c0faa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,8 @@ jobs:
 cache: pip
 
 install:
+# ensure we have recent pip/setuptools
+- pip install --upgrade pip setuptools
 # need tox to get started
 - pip install tox 'tox-venv; python_version!="3.3"'
 
diff --git a/tests/requirements.txt b/tests/requirements.txt
index fd826d0974..aff32c10ea 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,7 @@
 importlib; python_version<"2.7"
 mock
-pytest-flake8; python_version>="2.7"
+pytest-flake8<=1.0.0; python_version>="3.3" and python_version<"3.5"
+pytest-flake8; python_version>="2.7" and python_version!="3.3" and python_version!="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2

From d564851059813836454f275e9b735f9068cf32c6 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Mon, 14 May 2018 09:42:59 -0400
Subject: [PATCH 6994/8469] Add tox environment for docs

---
 .gitignore               |  1 +
 docs/developer-guide.txt | 12 +++++++-----
 tox.ini                  |  8 ++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5661164f7..b850622f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 bin
 build
 dist
+docs/build
 include
 lib
 distribute.egg-info
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index b2c1a0cefd..8521005518 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -106,10 +106,12 @@ Setuptools follows ``semver``.
 Building Documentation
 ----------------------
 
-Setuptools relies on the Sphinx system for building documentation.
-To accommodate RTD, docs must be built from the docs/ directory.
+Setuptools relies on the `Sphinx`_ system for building documentation.
+The `published documentation`_ is hosted on Read the Docs.
 
-To build them, you need to have installed the requirements specified
-in docs/requirements.txt. One way to do this is to use rwt:
+To build the docs locally, use tox::
 
-    setuptools/docs$ python -m rwt -r requirements.txt -- -m sphinx . html
+    $ tox -e docs
+
+.. _Sphinx: http://www.sphinx-doc.org/en/master/
+.. _published documentation: https://setuptools.readthedocs.io/en/latest/
diff --git a/tox.ini b/tox.ini
index a0c4cdf300..962cb9e1be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,14 @@ deps=codecov
 skip_install=True
 commands=codecov --file {toxworkdir}/coverage.xml
 
+[testenv:docs]
+deps = -r{toxinidir}/docs/requirements.txt
+skip_install=True
+commands =
+    python {toxinidir}/bootstrap.py
+    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/build/html
+    sphinx-build -b man -d {envtmpdir}/doctrees docs docs/build/man
+
 [coverage:run]
 source=
 	pkg_resources

From 37e7df7af707f7022bf50656f27470ccbbf66e9c Mon Sep 17 00:00:00 2001
From: Matt Layman <matthewlayman@gmail.com>
Date: Mon, 14 May 2018 10:17:59 -0400
Subject: [PATCH 6995/8469] Add coverage badge to README

This shows the coverage of the master branch as measured by Codecov.
---
 README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index f754d96624..8dbc08278a 100755
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,9 @@
 .. image:: https://img.shields.io/appveyor/ci/jaraco/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
    :target: https://ci.appveyor.com/project/jaraco/setuptools/branch/master
 
+.. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg
+   :target: https://codecov.io/gh/pypa/setuptools
+
 .. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
 
 See the `Installation Instructions

From be00aaed0c0a34e0c4e5b98a8708ee480397b003 Mon Sep 17 00:00:00 2001
From: Miriam Sexton <miriam@industrydive.com>
Date: Mon, 14 May 2018 11:36:37 -0400
Subject: [PATCH 6996/8469] Change Developer Guide instruction on how to
 checkout from github

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 8521005518..dda34bf771 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -63,7 +63,7 @@ Source Code
 
 Grab the code at Github::
 
-    $ git checkout https://github.com/pypa/setuptools
+    $ git clone https://github.com/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
 Github, commit the changes to your repository, and then make a pull request

From 9bdf2f7dde7eb6a6767663a3d5dfa1624f59559c Mon Sep 17 00:00:00 2001
From: Miriam Sexton <miriam@industrydive.com>
Date: Mon, 14 May 2018 11:43:03 -0400
Subject: [PATCH 6997/8469] Change Developer Guide instruction on how to run
 tests

---
 docs/developer-guide.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index dda34bf771..25aaeaabb6 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -86,8 +86,12 @@ from this repository.
 Testing
 -------
 
-The primary tests are run using tox. To run the tests, first make
-sure you have tox installed, then invoke it::
+The primary tests are run using tox. To run the tests, first create the metadata
+needed to run the tests::
+
+    $ python bootstrap.py
+
+Then make sure you have tox installed, and invoke it::
 
     $ tox
 

From 5c90644b2d81207869cd21c052b223d984f30340 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 14 May 2018 10:30:16 -0400
Subject: [PATCH 6998/8469] Add configuration for towncrier

---
 pyproject.toml         | 34 ++++++++++++++++++++++++++++++++++
 towncrier_template.rst | 27 +++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 pyproject.toml
 create mode 100644 towncrier_template.rst

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..cffd0e9afd
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,34 @@
+[tool.towncrier]
+    package = "setuptools"
+    package_dir = "setuptools"
+    filename = "CHANGES.rst"
+    directory = "changelog.d"
+    title_format = "v{version}"
+    issue_format = "#{issue}"
+    template = "towncrier_template.rst"
+    underlines = ["-"]
+
+    [[tool.towncrier.type]]
+        directory = "deprecation"
+        name = "Deprecations"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "breaking"
+        name = "Breaking Changes"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "change"
+        name = "Changes"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "doc"
+        name = "Documentation changes"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "misc"
+        name = "Misc"
+        showcontent = true
diff --git a/towncrier_template.rst b/towncrier_template.rst
new file mode 100644
index 0000000000..02b2882bb1
--- /dev/null
+++ b/towncrier_template.rst
@@ -0,0 +1,27 @@
+{% for section, _ in sections.items() %}
+{% set underline = underlines[0] %}{% if section %}{{section}}
+{{ underline * section|length }}
+{% endif %}
+{% if sections[section] %}
+{% for category, val in definitions.items() if category in sections[section]%}
+{% if definitions[category]['showcontent'] %}
+{% for text, values in sections[section][category].items() %}
+* {{ values|join(', ') }}: {{ text }}
+{% endfor %}
+
+{% else %}
+*  {{ sections[section][category]['']|join(', ') }}
+
+{% endif %}
+{% if sections[section][category]|length == 0 %}
+No significant changes.
+{% else %}
+{% endif %}
+{% endfor %}
+
+{% else %}
+No significant changes.
+
+
+{% endif %}
+{% endfor %}

From 007c8a00253778b421cd7c6b9b67d40c317b188a Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 14 May 2018 11:01:29 -0400
Subject: [PATCH 6999/8469] Add documentation on how to create a changelog
 entry

---
 docs/developer-guide.txt | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 25aaeaabb6..ea1034ab04 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -57,6 +57,38 @@ Setuptools makes extensive use of hyperlinks to tickets in the changelog so
 that system integrators and other users can get a quick summary, but then
 jump to the in-depth discussion about any subject referenced.
 
+---------------------
+Making a pull request
+---------------------
+
+When making a pull request, please include a short summary of the changes
+and a reference to any issue tickets that the PR is intended to solve. All
+PRs with code changes should include tests. All changes should include a
+changelog entry.
+
+``setuptools`` uses `towncrier <https://town-crier.readthedocs.io/en/latest/>`_
+for changelog managment, so when making a PR, please add a news fragment in the
+``changelog.d/`` folder. Changelog files are written in Restructured Text and
+should be a 1 or 2 sentence description of the substantive changes in the PR.
+They should be named ``<pr_number>.<category>.rst``, where the categories are:
+
+- ``change``: Any backwards compatible code change
+- ``breaking``: Any backwards-compatibility breaking change
+- ``doc``: A change to the documentation
+- ``misc``: Changes internal to the repo like CI, test and build changes
+- ``deprecation``: For deprecations of an existing feature of behavior
+
+A pull request may have more than one of these components, for example a code
+change may introduce a new feature that deprecates an old feature, in which
+case two fragments should be added. It is not necessary to make a separate
+documentation fragment for documentation changes accompanying the relevant
+code changes. See the following for an example news fragment:
+
+.. code-block:: bash
+
+    $ cat changelog.d/1288.change.rst
+    Add support for maintainer in PKG-INFO
+
 -----------
 Source Code
 -----------

From 51e3fabf063399ef5cf3bad9ef3b506108b5bb70 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 14 May 2018 10:39:37 -0400
Subject: [PATCH 7000/8469] Add changelog entry for towncrier addition

---
 changelog.d/1354.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1354.misc.rst

diff --git a/changelog.d/1354.misc.rst b/changelog.d/1354.misc.rst
new file mode 100644
index 0000000000..7f9b80c95b
--- /dev/null
+++ b/changelog.d/1354.misc.rst
@@ -0,0 +1 @@
+Added ``towncrier`` for changelog managment.

From 2f2f21ad470a93dff15db81f450d02a238d87424 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Mon, 14 May 2018 14:48:39 -0400
Subject: [PATCH 7001/8469] Fix doc build warnings

---
 docs/conf.py           | 5 ++++-
 docs/pkg_resources.txt | 1 +
 docs/setuptools.txt    | 2 +-
 tox.ini                | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index f7d02303cc..c7eb6d3f3c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -34,7 +34,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['jaraco.packaging.sphinx', 'rst.linker', 'sphinx.ext.autosectionlabel']
+extensions = ['jaraco.packaging.sphinx', 'rst.linker']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -45,6 +45,9 @@
 # The master toctree document.
 master_doc = 'index'
 
+# A list of glob-style patterns that should be excluded when looking for source files.
+exclude_patterns = ['requirements.txt']
+
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = []
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index b40a209fe4..18545f4ba0 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1087,6 +1087,7 @@ so that supporting custom importers or new distribution formats can be done
 simply by creating an appropriate `IResourceProvider`_ implementation; see the
 section below on `Supporting Custom Importers`_ for more details.
 
+.. _ResourceManager API:
 
 ``ResourceManager`` API
 =======================
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e14d208881..5ee967abc1 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -242,7 +242,6 @@ have setuptools automatically tag your in-development releases with various
 pre- or post-release tags.  See the following sections for more details:
 
 * `Tagging and "Daily Build" or "Snapshot" Releases`_
-* `Managing "Continuous Releases" Using Subversion`_
 * The `egg_info`_ command
 
 
@@ -1366,6 +1365,7 @@ then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
 flag, so that it will not be necessary for ``bdist_egg`` or ``EasyInstall`` to
 try to guess whether your project can work as a zipfile.
 
+.. _Namespace Packages:
 
 Namespace Packages
 ------------------
diff --git a/tox.ini b/tox.ini
index 962cb9e1be..a16e89faa7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,8 +38,8 @@ deps = -r{toxinidir}/docs/requirements.txt
 skip_install=True
 commands =
     python {toxinidir}/bootstrap.py
-    sphinx-build -b html -d {envtmpdir}/doctrees docs docs/build/html
-    sphinx-build -b man -d {envtmpdir}/doctrees docs docs/build/man
+    sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
+    sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
 
 [coverage:run]
 source=

From 78e887ff5b3d87f052b7195181eeb1f3d251f760 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 14 May 2018 15:12:01 -0400
Subject: [PATCH 7002/8469] Add changelog for #1357

---
 changelog.d/1357.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1357.doc.rst

diff --git a/changelog.d/1357.doc.rst b/changelog.d/1357.doc.rst
new file mode 100644
index 0000000000..11d97cc707
--- /dev/null
+++ b/changelog.d/1357.doc.rst
@@ -0,0 +1 @@
+Fixed warnings in documentation builds and started enforcing that the docs build without warnings in tox.

From d85c11bcd1fc177405a6fe36eaddf92fbcb1b1db Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 12 Apr 2018 14:04:53 -0400
Subject: [PATCH 7003/8469] Bump appveyor Python 3 to 3.6

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ff7122b41f..f50f8386ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,8 +4,8 @@ environment:
   CODECOV_ENV: APPVEYOR_JOB_NAME
 
   matrix:
-    - APPVEYOR_JOB_NAME: "python35-x64"
-      PYTHON: "C:\\Python35-x64"
+    - APPVEYOR_JOB_NAME: "python36-x64"
+      PYTHON: "C:\\Python36-x64"
     - APPVEYOR_JOB_NAME: "python27-x64"
       PYTHON: "C:\\Python27-x64"
 

From a960ee1c3f1d1d1067ec1e3c88dc345060bd33a4 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Mon, 14 May 2018 17:53:42 -0400
Subject: [PATCH 7004/8469] Support loading version from a file

---
 changelog.d/1359.change.rst     |  2 ++
 docs/setuptools.txt             |  6 +++++-
 setuptools/config.py            | 13 +++++++++++++
 setuptools/tests/test_config.py | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1359.change.rst

diff --git a/changelog.d/1359.change.rst b/changelog.d/1359.change.rst
new file mode 100644
index 0000000000..05746e737f
--- /dev/null
+++ b/changelog.d/1359.change.rst
@@ -0,0 +1,2 @@
+Support using "file:" to load a PEP 440-compliant package version
+from a text file.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5ee967abc1..6b3bbdedf0 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2421,7 +2421,7 @@ Metadata
 Key                             Aliases            Type
 ==============================  =================  =====
 name                                               str
-version                                            attr:, str
+version                                            attr:, file:, str
 url                             home-page          str
 download_url                    download-url       str
 project_urls                                       dict
@@ -2441,6 +2441,10 @@ requires                                           list-comma
 obsoletes                                          list-comma
 ==============================  =================  =====
 
+.. note::
+    A version loaded using the ``file:`` directive must comply with PEP 440.
+    It is easy to accidentally put something other than a valid version
+    string in such a file, so validation is stricter in this case.
 
 Options
 -------
diff --git a/setuptools/config.py b/setuptools/config.py
index 8eddcae88a..6343840e26 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -7,6 +7,7 @@
 from importlib import import_module
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
+from setuptools.extern.packaging.version import LegacyVersion, parse
 from setuptools.extern.six import string_types
 
 
@@ -427,6 +428,18 @@ def _parse_version(self, value):
         :rtype: str
 
         """
+        version = self._parse_file(value)
+
+        if version != value:
+            version = version.strip()
+            # Be strict about versions loaded from file because it's easy to
+            # accidentally include newlines and other unintended content
+            if isinstance(parse(version), LegacyVersion):
+                raise DistutilsOptionError('Version loaded from %s does not comply with PEP 440: %s' % (
+                    value, version
+                ))
+            return version
+
         version = self._parse_attr(value)
 
         if callable(version):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index abb953a8fa..17ac09c8f1 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -268,6 +268,23 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
+    def test_version_file(self, tmpdir):
+
+        _, config = fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = file: fake_package/version.txt\n'
+        )
+        tmpdir.join('fake_package', 'version.txt').write('1.2.3\n')
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
+        tmpdir.join('fake_package', 'version.txt').write('1.2.3\n4.5.6\n')
+        with pytest.raises(DistutilsOptionError):
+            with get_dist(tmpdir) as dist:
+                _ = dist.metadata.version
+
     def test_unknown_meta_item(self, tmpdir):
 
         fake_env(

From d0a809b53721a3554c28e1480e22626791a0e660 Mon Sep 17 00:00:00 2001
From: Mason Egger <mason@masonegger.com>
Date: Tue, 15 May 2018 10:20:32 -0400
Subject: [PATCH 7005/8469] Add github pull request template

---
 .github/pull_request_template.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000000..aa5508076e
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+<!-- First time contributors: Take a moment to review https://setuptools.readthedocs.io/en/latest/developer-guide.html! -->
+<!-- Remove sections if not applicable -->
+
+## Summary of changes
+
+<!-- Summary goes here -->
+
+Closes <!-- issue number here -->
+
+### Pull Request Checklist
+- [ ] Changes have tests
+- [ ] News fragment added in changelog.d. See [documentation](http://setuptools.readthedocs.io/en/latest/developer-guide.html#making-a-pull-request) for details

From a72e9970d4ebf279e8bc29f3083ef2f991530d68 Mon Sep 17 00:00:00 2001
From: Mason Egger <mason@masonegger.com>
Date: Tue, 15 May 2018 10:38:56 -0400
Subject: [PATCH 7006/8469] Update developer guide documentation

Add changelog for PR #1363 (issue #1355)
---
 changelog.d/1355.misc.rst | 1 +
 docs/developer-guide.txt  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1355.misc.rst

diff --git a/changelog.d/1355.misc.rst b/changelog.d/1355.misc.rst
new file mode 100644
index 0000000000..af1e3f3f1c
--- /dev/null
+++ b/changelog.d/1355.misc.rst
@@ -0,0 +1 @@
+Add PR template.
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index ea1034ab04..6b04603b16 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -62,8 +62,8 @@ Making a pull request
 ---------------------
 
 When making a pull request, please include a short summary of the changes
-and a reference to any issue tickets that the PR is intended to solve. All
-PRs with code changes should include tests. All changes should include a
+and a reference to any issue tickets that the PR is intended to solve.
+All PRs with code changes should include tests. All changes should include a
 changelog entry.
 
 ``setuptools`` uses `towncrier <https://town-crier.readthedocs.io/en/latest/>`_

From 0088027f2798fe35d0101451ccbdcf62ccee282c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 May 2018 11:29:00 -0400
Subject: [PATCH 7007/8469] Add the phrase declarative config for easier
 searching

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5ee967abc1..5af76c3e20 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -437,7 +437,7 @@ such projects also need something like ``package_dir={'':'src'}`` in their
 
 Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
 patterns, and finds Python packages (any directory). Packages are only
-recognized if they include an ``__init__.py`` file. Finally, exclusion 
+recognized if they include an ``__init__.py`` file. Finally, exclusion
 patterns are applied to remove matching packages.
 
 Inclusion and exclusion patterns are package names, optionally including
@@ -2305,7 +2305,7 @@ Configuring setup() using setup.cfg files
 
 ``Setuptools`` allows using configuration files (usually :file:`setup.cfg`)
 to define a package’s metadata and other options that are normally supplied
-to the ``setup()`` function.
+to the ``setup()`` function (declarative config).
 
 This approach not only allows automation scenarios but also reduces
 boilerplate code in some cases.

From 4e43bc474b3013cf6ba37c00ed78d3343fde6a4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 May 2018 11:46:15 -0400
Subject: [PATCH 7008/8469] Add install_requires to example

---
 docs/setuptools.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 5af76c3e20..76830e4134 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2341,6 +2341,9 @@ boilerplate code in some cases.
     scripts =
       bin/first.py
       bin/second.py
+    install_requires =
+      requests
+      importlib; python_version == "2.6"
 
     [options.package_data]
     * = *.txt, *.rst

From 5668d1513a9d793e03a3df8db470314724656cc4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 May 2018 11:59:22 -0400
Subject: [PATCH 7009/8469] Moved AppVeyor to pypa org

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 8dbc08278a..2c008cc6e3 100755
--- a/README.rst
+++ b/README.rst
@@ -7,8 +7,8 @@
 .. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20build%20%40%20Travis%20CI
    :target: https://travis-ci.org/pypa/setuptools
 
-.. image:: https://img.shields.io/appveyor/ci/jaraco/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
-   :target: https://ci.appveyor.com/project/jaraco/setuptools/branch/master
+.. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
+   :target: https://ci.appveyor.com/project/pypa/setuptools/branch/master
 
 .. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg
    :target: https://codecov.io/gh/pypa/setuptools

From 3159321c932202f352f6878d833b8d52463d8858 Mon Sep 17 00:00:00 2001
From: jeffrey k eliasen <jeff@jke.net>
Date: Tue, 15 May 2018 14:10:16 -0400
Subject: [PATCH 7010/8469] tests

---
 pkg_resources/tests/test_resources.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 05f35adef2..3b14d7c0c1 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -145,6 +145,24 @@ def testDistroDependsSimple(self):
         for v in "Twisted>=1.5", "Twisted>=1.5\nZConfig>=2.0":
             self.checkRequires(self.distRequires(v), v)
 
+    def test_distribution_dir_includes_provider_dir(self):
+        d = pkg_resources.Distribution()
+        before = d.__dir__()
+        assert 'test_attr' not in before
+        d._provider.test_attr = None
+        after = d.__dir__()
+        assert len(after) == len(before) + 1
+        assert 'test_attr' in after
+
+    def test_distribution_dir_ignores_provider_dir_leading_underscore(self):
+        d = pkg_resources.Distribution()
+        before = d.__dir__()
+        assert '_test_attr' not in before
+        d._provider._test_attr = None
+        after = d.__dir__()
+        assert len(after) == len(before)
+        assert '_test_attr' not in after
+
     def testResolve(self):
         ad = pkg_resources.Environment([])
         ws = WorkingSet([])

From 8806d73c0b03b3304dc0edd83582c085d0b71299 Mon Sep 17 00:00:00 2001
From: jeffrey k eliasen <jeff@jke.net>
Date: Tue, 15 May 2018 14:13:04 -0400
Subject: [PATCH 7011/8469] implementation

---
 pkg_resources/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d5b0fe9828..09c3546aa6 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2667,6 +2667,15 @@ def __getattr__(self, attr):
             raise AttributeError(attr)
         return getattr(self._provider, attr)
 
+    def __dir__(self):
+        return list(
+            set(super(Distribution, self).__dir__())
+            | set(
+                attr for attr in self._provider.__dir__()
+                if not attr.startswith('_')
+            )
+        )
+
     @classmethod
     def from_filename(cls, filename, metadata=None, **kw):
         return cls.from_location(

From 1a90187c407eacbd6bdad05d8bd6e1d94587faa8 Mon Sep 17 00:00:00 2001
From: jeffrey k eliasen <jeff@jke.net>
Date: Tue, 15 May 2018 14:21:33 -0400
Subject: [PATCH 7012/8469] changelog info

---
 changelog.d/1364.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1364.rst

diff --git a/changelog.d/1364.rst b/changelog.d/1364.rst
new file mode 100644
index 0000000000..f7b4c01296
--- /dev/null
+++ b/changelog.d/1364.rst
@@ -0,0 +1 @@
+Add `__dir__()` implementation to `pkg_resources.Distribution()` that includes the attributes in the `_provider` instance variable.
\ No newline at end of file

From 58ad1e140703a9214b63e120113a17d48142dc8a Mon Sep 17 00:00:00 2001
From: jeffrey k eliasen <jeff@jke.net>
Date: Tue, 15 May 2018 15:06:47 -0400
Subject: [PATCH 7013/8469] python 2.7 does not implement object.__dir__()

---
 pkg_resources/__init__.py             |  4 ++++
 pkg_resources/tests/test_resources.py | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 09c3546aa6..394930ca1a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2676,6 +2676,10 @@ def __dir__(self):
             )
         )
 
+    if not hasattr(object, '__dir__'):
+        # python 2.7 not supported
+        del __dir__
+
     @classmethod
     def from_filename(cls, filename, metadata=None, **kw):
         return cls.from_location(
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 3b14d7c0c1..04d02c1f61 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -145,6 +145,16 @@ def testDistroDependsSimple(self):
         for v in "Twisted>=1.5", "Twisted>=1.5\nZConfig>=2.0":
             self.checkRequires(self.distRequires(v), v)
 
+    needs_object_dir = pytest.mark.skipif(
+        not hasattr(object, '__dir__'),
+        reason='object.__dir__ necessary for self.__dir__ implementation',
+    )
+
+    def test_distribution_dir(self):
+        d = pkg_resources.Distribution()
+        dir(d)
+
+    @needs_object_dir
     def test_distribution_dir_includes_provider_dir(self):
         d = pkg_resources.Distribution()
         before = d.__dir__()
@@ -154,6 +164,7 @@ def test_distribution_dir_includes_provider_dir(self):
         assert len(after) == len(before) + 1
         assert 'test_attr' in after
 
+    @needs_object_dir
     def test_distribution_dir_ignores_provider_dir_leading_underscore(self):
         d = pkg_resources.Distribution()
         before = d.__dir__()

From 5dddf7f26295af7ab9cd5dbf1e2b4472d7739187 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 May 2018 15:11:03 -0400
Subject: [PATCH 7014/8469] Remove compatibility branch for Python 3.0-3.1.

---
 pkg_resources/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index d5b0fe9828..dbdc9b04dc 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -377,11 +377,7 @@ def get_build_platform():
     XXX Currently this is the same as ``distutils.util.get_platform()``, but it
     needs some hacks for Linux and Mac OS X.
     """
-    try:
-        # Python 2.7 or >=3.2
-        from sysconfig import get_platform
-    except ImportError:
-        from distutils.util import get_platform
+    from sysconfig import get_platform
 
     plat = get_platform()
     if sys.platform == "darwin" and not plat.startswith('macosx-'):

From 0c2e5c9db4c7dd26ba49ffc4a75657715be587b0 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Tue, 15 May 2018 16:26:04 -0400
Subject: [PATCH 7015/8469] Fix attr: with package_dirs

---
 changelog.d/1365.change.rst     |  2 ++
 setuptools/config.py            | 34 ++++++++++++++++-----
 setuptools/tests/test_config.py | 53 +++++++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 changelog.d/1365.change.rst

diff --git a/changelog.d/1365.change.rst b/changelog.d/1365.change.rst
new file mode 100644
index 0000000000..63eb008b80
--- /dev/null
+++ b/changelog.d/1365.change.rst
@@ -0,0 +1,2 @@
+Take the package_dir option into account when loading the version from a
+module attribute.
diff --git a/setuptools/config.py b/setuptools/config.py
index 6343840e26..d3f0b123d5 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -102,14 +102,14 @@ def parse_configuration(
         If False exceptions are propagated as expected.
     :rtype: list
     """
-    meta = ConfigMetadataHandler(
-        distribution.metadata, command_options, ignore_option_errors)
-    meta.parse()
-
     options = ConfigOptionsHandler(
         distribution, command_options, ignore_option_errors)
     options.parse()
 
+    meta = ConfigMetadataHandler(
+        distribution.metadata, command_options, ignore_option_errors, distribution.package_dir)
+    meta.parse()
+
     return meta, options
 
 
@@ -281,7 +281,7 @@ def _read_file(filepath):
             return f.read()
 
     @classmethod
-    def _parse_attr(cls, value):
+    def _parse_attr(cls, value, package_dir=None):
         """Represents value as a module attribute.
 
         Examples:
@@ -301,7 +301,21 @@ def _parse_attr(cls, value):
         module_name = '.'.join(attrs_path)
         module_name = module_name or '__init__'
 
-        sys.path.insert(0, os.getcwd())
+        parent_path = os.getcwd()
+        if package_dir:
+            if attrs_path[0] in package_dir:
+                # A custom path was specified for the module we want to import
+                custom_path = package_dir[attrs_path[0]]
+                parts = custom_path.rsplit('/', 1)
+                if len(parts) > 1:
+                    parent_path = os.path.join(os.getcwd(), parts[0])
+                    module_name = parts[1]
+                else:
+                    module_name = custom_path
+            elif '' in package_dir:
+                # A custom parent directory was specified for all root modules
+                parent_path = os.path.join(os.getcwd(), package_dir[''])
+        sys.path.insert(0, parent_path)
         try:
             module = import_module(module_name)
             value = getattr(module, attr_name)
@@ -400,6 +414,12 @@ class ConfigMetadataHandler(ConfigHandler):
 
     """
 
+    def __init__(self, target_obj, options, ignore_option_errors=False,
+                 package_dir=None):
+        super(ConfigMetadataHandler, self).__init__(target_obj, options,
+                                                    ignore_option_errors)
+        self.package_dir = package_dir
+
     @property
     def parsers(self):
         """Metadata item name to parser function mapping."""
@@ -440,7 +460,7 @@ def _parse_version(self, value):
                 ))
             return version
 
-        version = self._parse_attr(value)
+        version = self._parse_attr(value, self.package_dir)
 
         if callable(version):
             version = version()
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 17ac09c8f1..de7c8b4daf 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -10,13 +10,15 @@ class ErrConfigHandler(ConfigHandler):
 
 
 def make_package_dir(name, base_dir):
-    dir_package = base_dir.mkdir(name)
+    dir_package = base_dir
+    for dir_name in name.split('/'):
+        dir_package = dir_package.mkdir(dir_name)
     init_file = dir_package.join('__init__.py')
     init_file.write('')
     return dir_package, init_file
 
 
-def fake_env(tmpdir, setup_cfg, setup_py=None):
+def fake_env(tmpdir, setup_cfg, setup_py=None, package_path='fake_package'):
 
     if setup_py is None:
         setup_py = (
@@ -28,7 +30,7 @@ def fake_env(tmpdir, setup_cfg, setup_py=None):
     config = tmpdir.join('setup.cfg')
     config.write(setup_cfg)
 
-    package_dir, init_file = make_package_dir('fake_package', tmpdir)
+    package_dir, init_file = make_package_dir(package_path, tmpdir)
 
     init_file.write(
         'VERSION = (1, 2, 3)\n'
@@ -285,6 +287,51 @@ def test_version_file(self, tmpdir):
             with get_dist(tmpdir) as dist:
                 _ = dist.metadata.version
 
+    def test_version_with_package_dir_simple(self, tmpdir):
+
+        _, config = fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = attr: fake_package_simple.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    = src\n',
+            package_path='src/fake_package_simple'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
+    def test_version_with_package_dir_rename(self, tmpdir):
+
+        _, config = fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = attr: fake_package_rename.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    fake_package_rename = fake_dir\n',
+            package_path='fake_dir'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
+    def test_version_with_package_dir_complex(self, tmpdir):
+
+        _, config = fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = attr: fake_package_complex.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    fake_package_complex = src/fake_dir\n',
+            package_path='src/fake_dir'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
     def test_unknown_meta_item(self, tmpdir):
 
         fake_env(

From 593b409fb66efcabe046e240a868b7dbcf1fc01b Mon Sep 17 00:00:00 2001
From: Arnon Yaari <arnony@infinidat.com>
Date: Mon, 14 May 2018 17:10:29 +0300
Subject: [PATCH 7016/8469] Use canonicalize_name to look for .dist-info in
 wheel files

Fixes issue #1350
---
 setuptools/tests/test_wheel.py | 33 +++++++++++++++++++++++++++++++++
 setuptools/wheel.py            | 16 ++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 150ac4c1b5..cf6508686d 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -9,12 +9,15 @@
 import glob
 import inspect
 import os
+import shutil
 import subprocess
 import sys
+import zipfile
 
 import pytest
 
 from pkg_resources import Distribution, PathMetadata, PY_MAJOR
+from setuptools.extern.packaging.utils import canonicalize_name
 from setuptools.wheel import Wheel
 
 from .contexts import tempdir
@@ -506,3 +509,33 @@ def test_wheel_install(params):
         _check_wheel_install(filename, install_dir,
                              install_tree, project_name,
                              version, requires_txt)
+
+
+def test_wheel_install_pep_503():
+    project_name = 'Foo_Bar'    # PEP 503 canonicalized name is "foo-bar"
+    version = '1.0'
+    with build_wheel(
+        name=project_name,
+        version=version,
+    ) as filename, tempdir() as install_dir:
+        new_filename = filename.replace(project_name,
+                                        canonicalize_name(project_name))
+        shutil.move(filename, new_filename)
+        _check_wheel_install(new_filename, install_dir, None,
+                             canonicalize_name(project_name),
+                             version, None)
+
+
+def test_wheel_no_dist_dir():
+    project_name = 'nodistinfo'
+    version = '1.0'
+    wheel_name = '{0}-{1}-py2.py3-none-any.whl'.format(project_name, version)
+    with tempdir() as source_dir:
+        wheel_path = os.path.join(source_dir, wheel_name)
+        # create an empty zip file
+        zipfile.ZipFile(wheel_path, 'w').close()
+        with tempdir() as install_dir:
+            with pytest.raises(ValueError):
+                _check_wheel_install(wheel_path, install_dir, None,
+                                     project_name,
+                                     version, None)
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 37dfa53103..4a33b20324 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -4,10 +4,12 @@
 import email
 import itertools
 import os
+import posixpath
 import re
 import zipfile
 
 from pkg_resources import Distribution, PathMetadata, parse_version
+from setuptools.extern.packaging.utils import canonicalize_name
 from setuptools.extern.six import PY3
 from setuptools import Distribution as SetuptoolsDistribution
 from setuptools import pep425tags
@@ -77,14 +79,24 @@ def egg_name(self):
             platform=(None if self.platform == 'any' else get_platform()),
         ).egg_name() + '.egg'
 
+    def get_dist_info(self, zf):
+        # find the correct name of the .dist-info dir in the wheel file
+        for member in zf.namelist():
+            dirname = posixpath.dirname(member)
+            if (dirname.endswith('.dist-info') and
+                    canonicalize_name(dirname).startswith(
+                        canonicalize_name(self.project_name))):
+                return dirname
+        raise ValueError("unsupported wheel format. .dist-info not found")
+
     def install_as_egg(self, destination_eggdir):
         '''Install wheel as an egg directory.'''
         with zipfile.ZipFile(self.filename) as zf:
             dist_basename = '%s-%s' % (self.project_name, self.version)
-            dist_info = '%s.dist-info' % dist_basename
+            dist_info = self.get_dist_info(zf)
             dist_data = '%s.data' % dist_basename
             def get_metadata(name):
-                with zf.open('%s/%s' % (dist_info, name)) as fp:
+                with zf.open(posixpath.join(dist_info, name)) as fp:
                     value = fp.read().decode('utf-8') if PY3 else fp.read()
                     return email.parser.Parser().parsestr(value)
             wheel_metadata = get_metadata('WHEEL')

From 70c786bb62973a1b8284bceef1321ece79ceb7ee Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 15 May 2018 13:04:44 -0400
Subject: [PATCH 7017/8469] Add changelog for #1360

---
 changelog.d/1360.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1360.change.rst

diff --git a/changelog.d/1360.change.rst b/changelog.d/1360.change.rst
new file mode 100644
index 0000000000..36f40483b3
--- /dev/null
+++ b/changelog.d/1360.change.rst
@@ -0,0 +1 @@
+Fixed issue with a mismatch between the name of the package and the name of the .dist-info file in wheel files

From 7326ff2a919a1b98262c10e618bfa524d0a14d5f Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Wed, 16 May 2018 10:19:28 -0400
Subject: [PATCH 7018/8469] Generate doc previews for pull requests

---
 netlify.toml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 netlify.toml

diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 0000000000..ec21e7be93
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,5 @@
+# Configuration for pull request documentation previews via Netlify
+
+[build]
+    publish = "docs/build/html"
+    command = "pip install tox && tox -e docs"

From af30e013a27c310b423331314fdbee1f93d2172f Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Wed, 16 May 2018 16:23:39 -0400
Subject: [PATCH 7019/8469] Don't require network in tests

---
 changelog.d/1368.misc.rst         |  1 +
 setuptools/tests/test_egg_info.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 changelog.d/1368.misc.rst

diff --git a/changelog.d/1368.misc.rst b/changelog.d/1368.misc.rst
new file mode 100644
index 0000000000..289e6a6875
--- /dev/null
+++ b/changelog.d/1368.misc.rst
@@ -0,0 +1 @@
+Fixed tests which failed without network connectivity.
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 2a070debe0..4397d06451 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -233,27 +233,27 @@ def parametrize(*test_list, **format_dict):
         '''
         install_requires_deterministic
 
-        install_requires=["fake-factory==0.5.2", "pytz"]
+        install_requires=["wheel>=0.5", "pytest"]
 
         [options]
         install_requires =
-            fake-factory==0.5.2
-            pytz
+            wheel>=0.5
+            pytest
 
-        fake-factory==0.5.2
-        pytz
+        wheel>=0.5
+        pytest
         ''',
 
         '''
         install_requires_ordered
 
-        install_requires=["fake-factory>=1.12.3,!=2.0"]
+        install_requires=["pytest>=3.0.2,!=10.9999"]
 
         [options]
         install_requires =
-            fake-factory>=1.12.3,!=2.0
+            pytest>=3.0.2,!=10.9999
 
-        fake-factory!=2.0,>=1.12.3
+        pytest!=10.9999,>=3.0.2
         ''',
 
         '''

From 07cd2e4e716264fd51aededcb77cefe37aafb25a Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 30 Apr 2018 19:08:58 +1000
Subject: [PATCH 7020/8469] Allow setting long_description_content_type
 externally

Some tools, such as PBR, might want to set
long_description_content_type during the parent object's
Distribution.__init__() call (during distutils setup_keywords entry
points).  However, that field is currently unconditionally overwritten
after these calls, erasing the value.

We would rather not duplicate the existing method of copying into
dist.metadata as done with project_urls.

This preserves the fields within Distribution.metadata described by
self._DISTUTIULS_UNUPPORTED_METADATA, or otherwise takes it from
arguments.

A test case that simulates setting the long description and overriding
the arguments is added.
---
 changelog.d/1343.misc.rst       |  4 +++
 setuptools/dist.py              | 36 +++++++++++++++++----------
 setuptools/tests/test_config.py | 43 ++++++++++++++++++++++++++++++++-
 3 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 changelog.d/1343.misc.rst

diff --git a/changelog.d/1343.misc.rst b/changelog.d/1343.misc.rst
new file mode 100644
index 0000000000..644320f4f0
--- /dev/null
+++ b/changelog.d/1343.misc.rst
@@ -0,0 +1,4 @@
+The ``setuptools`` specific ``long_description_content_type``,
+``project_urls`` and ``provides_extras`` fields are now set
+consistently after any ``distutils`` ``setup_keywords`` calls,
+allowing them to override values.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 321ab6b7d7..6ee4a97f3e 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -328,6 +328,12 @@ class Distribution(Distribution_parse_config_files, _Distribution):
     distribution for the included and excluded features.
     """
 
+    _DISTUTILS_UNSUPPORTED_METADATA = {
+        'long_description_content_type': None,
+        'project_urls': dict,
+        'provides_extras': set,
+    }
+
     _patched_dist = None
 
     def patch_missing_pkg_info(self, attrs):
@@ -353,25 +359,29 @@ def __init__(self, attrs=None):
         self.require_features = []
         self.features = {}
         self.dist_files = []
+        # Filter-out setuptools' specific options.
         self.src_root = attrs.pop("src_root", None)
         self.patch_missing_pkg_info(attrs)
-        self.project_urls = attrs.get('project_urls', {})
         self.dependency_links = attrs.pop('dependency_links', [])
         self.setup_requires = attrs.pop('setup_requires', [])
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
-        _Distribution.__init__(self, attrs)
-
-        # The project_urls attribute may not be supported in distutils, so
-        # prime it here from our value if not automatically set
-        self.metadata.project_urls = getattr(
-            self.metadata, 'project_urls', self.project_urls)
-        self.metadata.long_description_content_type = attrs.get(
-            'long_description_content_type'
-        )
-        self.metadata.provides_extras = getattr(
-            self.metadata, 'provides_extras', set()
-        )
+        _Distribution.__init__(self, {
+            k: v for k, v in attrs.items()
+            if k not in self._DISTUTILS_UNSUPPORTED_METADATA
+        })
+
+        # Fill-in missing metadata fields not supported by distutils.
+        # Note some fields may have been set by other tools (e.g. pbr)
+        # above; they are taken preferrentially to setup() arguments
+        for option, default in self._DISTUTILS_UNSUPPORTED_METADATA.items():
+            for source in self.metadata.__dict__, attrs:
+                if option in source:
+                    value = source[option]
+                    break
+            else:
+                value = default() if default else None
+            setattr(self.metadata, option, value)
 
         if isinstance(self.metadata.version, numbers.Number):
             # Some people apparently take "version number" too literally :)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 17ac09c8f1..91471306e3 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,7 +1,8 @@
 import contextlib
 import pytest
 from distutils.errors import DistutilsOptionError, DistutilsFileError
-from setuptools.dist import Distribution
+from mock import patch
+from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
 
 
@@ -598,3 +599,43 @@ def test_entry_points(self, tmpdir):
 
         with get_dist(tmpdir) as dist:
             assert dist.entry_points == expected
+
+saved_dist_init = _Distribution.__init__
+class TestExternalSetters:
+    # During creation of the setuptools Distribution() object, we call
+    # the init of the parent distutils Distribution object via
+    # _Distribution.__init__ ().
+    #
+    # It's possible distutils calls out to various keyword
+    # implementations (i.e. distutils.setup_keywords entry points)
+    # that may set a range of variables.
+    #
+    # This wraps distutil's Distribution.__init__ and simulates
+    # pbr or something else setting these values.
+    def _fake_distribution_init(self, dist, attrs):
+        saved_dist_init(dist, attrs)
+        # see self._DISTUTUILS_UNSUPPORTED_METADATA
+        setattr(dist.metadata, 'long_description_content_type',
+                'text/something')
+        # Test overwrite setup() args
+        setattr(dist.metadata, 'project_urls', {
+            'Link One': 'https://example.com/one/',
+            'Link Two': 'https://example.com/two/',
+        })
+        return None
+
+    @patch.object(_Distribution, '__init__', autospec=True)
+    def test_external_setters(self,  mock_parent_init, tmpdir):
+        mock_parent_init.side_effect = self._fake_distribution_init
+
+        dist = Distribution(attrs={
+            'project_urls': {
+                'will_be': 'ignored'
+            }
+        })
+
+        assert dist.metadata.long_description_content_type == 'text/something'
+        assert dist.metadata.project_urls == {
+            'Link One': 'https://example.com/one/',
+            'Link Two': 'https://example.com/two/',
+        }

From c608faf8336bcb94624545e6c07a702afcb92b2d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 16 May 2018 18:00:50 -0400
Subject: [PATCH 7021/8469] Tests in test_egg_info no longer invoke 'setup.py
 install', but instead focus on the behavior in egg_info as the namesake
 suggests.

---
 setuptools/tests/test_egg_info.py | 50 +++++++------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4397d06451..8b3b90f77f 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -128,11 +128,11 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
 
         self._validate_content_order(content, expected_order)
 
-    def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
+    def test_expected_files_produced(self, tmpdir_cwd, env):
         self._create_project()
 
-        self._run_install_command(tmpdir_cwd, env)
-        actual = self._find_egg_info_files(env.paths['lib'])
+        self._run_egg_info_command(tmpdir_cwd, env)
+        actual = os.listdir('foo.egg-info')
 
         expected = [
             'PKG-INFO',
@@ -154,8 +154,8 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
                 'usage.rst': "Run 'hi'",
             }
         })
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        self._run_egg_info_command(tmpdir_cwd, env)
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         with open(sources_txt) as f:
             assert 'docs/usage.rst' in f.read().split('\n')
@@ -394,7 +394,7 @@ def test_requires(
             self, tmpdir_cwd, env, requires, use_setup_cfg,
             expected_requires, install_cmd_kwargs):
         self._setup_script_with_requires(requires, use_setup_cfg)
-        self._run_install_command(tmpdir_cwd, env, **install_cmd_kwargs)
+        self._run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs)
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         if os.path.exists(requires_txt):
@@ -414,14 +414,14 @@ def test_install_requires_unordered_disallowed(self, tmpdir_cwd, env):
         req = 'install_requires={"fake-factory==0.5.2", "pytz"}'
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_install_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
 
     def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_install_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
@@ -429,7 +429,7 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_install_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_provides_extra(self, tmpdir_cwd, env):
@@ -541,15 +541,6 @@ def test_python_requires_egg_info(self, tmpdir_cwd, env):
         assert 'Requires-Python: >=2.7.12' in pkg_info_lines
         assert 'Metadata-Version: 1.2' in pkg_info_lines
 
-    def test_python_requires_install(self, tmpdir_cwd, env):
-        self._setup_script_with_requires(
-            """python_requires='>=1.2.3',""")
-        self._run_install_command(tmpdir_cwd, env)
-        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
-        pkginfo = os.path.join(egg_info_dir, 'PKG-INFO')
-        with open(pkginfo) as f:
-            assert 'Requires-Python: >=1.2.3' in f.read().split('\n')
-
     def test_manifest_maker_warning_suppression(self):
         fixtures = [
             "standard file not found: should have one of foo.py, bar.py",
@@ -559,17 +550,13 @@ def test_manifest_maker_warning_suppression(self):
         for msg in fixtures:
             assert manifest_maker._should_suppress_warning(msg)
 
-    def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
+    def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
         if cmd is None:
             cmd = [
-                'install',
-                '--home', env.paths['home'],
-                '--install-lib', env.paths['lib'],
-                '--install-scripts', env.paths['scripts'],
-                '--install-data', env.paths['data'],
+                'egg_info',
             ]
         code, data = environment.run_setup_py(
             cmd=cmd,
@@ -581,18 +568,3 @@ def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
             raise AssertionError(data)
         if output:
             assert output in data
-
-    def _find_egg_info_files(self, root):
-        class DirList(list):
-            def __init__(self, files, base):
-                super(DirList, self).__init__(files)
-                self.base = base
-
-        results = (
-            DirList(filenames, dirpath)
-            for dirpath, dirnames, filenames in os.walk(root)
-            if os.path.basename(dirpath) == 'EGG-INFO'
-        )
-        # expect exactly one result
-        result, = results
-        return result

From 736ed24e9dbf4528f7b3aa531d8d418b648f98a6 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Wed, 16 May 2018 18:00:44 -0400
Subject: [PATCH 7022/8469] Add tests for PEP 425 support

---
 changelog.d/1369.misc.rst           |   1 +
 setuptools/tests/test_glibc.py      |  37 +++++++
 setuptools/tests/test_pep425tags.py | 164 ++++++++++++++++++++++++++++
 3 files changed, 202 insertions(+)
 create mode 100644 changelog.d/1369.misc.rst
 create mode 100644 setuptools/tests/test_glibc.py
 create mode 100644 setuptools/tests/test_pep425tags.py

diff --git a/changelog.d/1369.misc.rst b/changelog.d/1369.misc.rst
new file mode 100644
index 0000000000..d1803f23de
--- /dev/null
+++ b/changelog.d/1369.misc.rst
@@ -0,0 +1 @@
+Added unit tests for PEP 425 compatibility tags support.
diff --git a/setuptools/tests/test_glibc.py b/setuptools/tests/test_glibc.py
new file mode 100644
index 0000000000..9cb9796482
--- /dev/null
+++ b/setuptools/tests/test_glibc.py
@@ -0,0 +1,37 @@
+import warnings
+
+from setuptools.glibc import check_glibc_version
+
+
+class TestGlibc(object):
+    def test_manylinux1_check_glibc_version(self):
+        """
+        Test that the check_glibc_version function is robust against weird
+        glibc version strings.
+        """
+        for two_twenty in ["2.20",
+                           # used by "linaro glibc", see gh-3588
+                           "2.20-2014.11",
+                           # weird possibilities that I just made up
+                           "2.20+dev",
+                           "2.20-custom",
+                           "2.20.1",
+                           ]:
+            assert check_glibc_version(two_twenty, 2, 15)
+            assert check_glibc_version(two_twenty, 2, 20)
+            assert not check_glibc_version(two_twenty, 2, 21)
+            assert not check_glibc_version(two_twenty, 3, 15)
+            assert not check_glibc_version(two_twenty, 1, 15)
+
+        # For strings that we just can't parse at all, we should warn and
+        # return false
+        for bad_string in ["asdf", "", "foo.bar"]:
+            with warnings.catch_warnings(record=True) as ws:
+                warnings.filterwarnings("always")
+                assert not check_glibc_version(bad_string, 2, 5)
+                for w in ws:
+                    if "Expected glibc version with" in str(w.message):
+                        break
+                else:
+                    # Didn't find the warning we were expecting
+                    assert False
diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
new file mode 100644
index 0000000000..0f60e0ede4
--- /dev/null
+++ b/setuptools/tests/test_pep425tags.py
@@ -0,0 +1,164 @@
+import sys
+
+from mock import patch
+
+from setuptools import pep425tags
+
+
+class TestPEP425Tags(object):
+
+    def mock_get_config_var(self, **kwd):
+        """
+        Patch sysconfig.get_config_var for arbitrary keys.
+        """
+        get_config_var = pep425tags.sysconfig.get_config_var
+
+        def _mock_get_config_var(var):
+            if var in kwd:
+                return kwd[var]
+            return get_config_var(var)
+        return _mock_get_config_var
+
+    def abi_tag_unicode(self, flags, config_vars):
+        """
+        Used to test ABI tags, verify correct use of the `u` flag
+        """
+        config_vars.update({'SOABI': None})
+        base = pep425tags.get_abbr_impl() + pep425tags.get_impl_ver()
+
+        if sys.version_info < (3, 3):
+            config_vars.update({'Py_UNICODE_SIZE': 2})
+            mock_gcf = self.mock_get_config_var(**config_vars)
+            with patch('setuptools.pep425tags.sysconfig.get_config_var', mock_gcf):
+                abi_tag = pep425tags.get_abi_tag()
+                assert abi_tag == base + flags
+
+            config_vars.update({'Py_UNICODE_SIZE': 4})
+            mock_gcf = self.mock_get_config_var(**config_vars)
+            with patch('setuptools.pep425tags.sysconfig.get_config_var',
+                       mock_gcf):
+                abi_tag = pep425tags.get_abi_tag()
+                assert abi_tag == base + flags + 'u'
+
+        else:
+            # On Python >= 3.3, UCS-4 is essentially permanently enabled, and
+            # Py_UNICODE_SIZE is None. SOABI on these builds does not include
+            # the 'u' so manual SOABI detection should not do so either.
+            config_vars.update({'Py_UNICODE_SIZE': None})
+            mock_gcf = self.mock_get_config_var(**config_vars)
+            with patch('setuptools.pep425tags.sysconfig.get_config_var',
+                       mock_gcf):
+                abi_tag = pep425tags.get_abi_tag()
+                assert abi_tag == base + flags
+
+    def test_broken_sysconfig(self):
+        """
+        Test that pep425tags still works when sysconfig is broken.
+        Can be a problem on Python 2.7
+        Issue #1074.
+        """
+        def raises_ioerror(var):
+            raise IOError("I have the wrong path!")
+
+        with patch('setuptools.pep425tags.sysconfig.get_config_var',
+                   raises_ioerror):
+            assert len(pep425tags.get_supported())
+
+    def test_no_hyphen_tag(self):
+        """
+        Test that no tag contains a hyphen.
+        """
+        mock_gcf = self.mock_get_config_var(SOABI='cpython-35m-darwin')
+
+        with patch('setuptools.pep425tags.sysconfig.get_config_var',
+                   mock_gcf):
+            supported = pep425tags.get_supported()
+
+        for (py, abi, plat) in supported:
+            assert '-' not in py
+            assert '-' not in abi
+            assert '-' not in plat
+
+    def test_manual_abi_noflags(self):
+        """
+        Test that no flags are set on a non-PyDebug, non-Pymalloc ABI tag.
+        """
+        self.abi_tag_unicode('', {'Py_DEBUG': False, 'WITH_PYMALLOC': False})
+
+    def test_manual_abi_d_flag(self):
+        """
+        Test that the `d` flag is set on a PyDebug, non-Pymalloc ABI tag.
+        """
+        self.abi_tag_unicode('d', {'Py_DEBUG': True, 'WITH_PYMALLOC': False})
+
+    def test_manual_abi_m_flag(self):
+        """
+        Test that the `m` flag is set on a non-PyDebug, Pymalloc ABI tag.
+        """
+        self.abi_tag_unicode('m', {'Py_DEBUG': False, 'WITH_PYMALLOC': True})
+
+    def test_manual_abi_dm_flags(self):
+        """
+        Test that the `dm` flags are set on a PyDebug, Pymalloc ABI tag.
+        """
+        self.abi_tag_unicode('dm', {'Py_DEBUG': True, 'WITH_PYMALLOC': True})
+
+
+class TestManylinux1Tags(object):
+
+    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
+    @patch('setuptools.glibc.have_compatible_glibc',
+           lambda major, minor: True)
+    def test_manylinux1_compatible_on_linux_x86_64(self):
+        """
+        Test that manylinux1 is enabled on linux_x86_64
+        """
+        assert pep425tags.is_manylinux1_compatible()
+
+    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_i686')
+    @patch('setuptools.glibc.have_compatible_glibc',
+           lambda major, minor: True)
+    def test_manylinux1_compatible_on_linux_i686(self):
+        """
+        Test that manylinux1 is enabled on linux_i686
+        """
+        assert pep425tags.is_manylinux1_compatible()
+
+    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
+    @patch('setuptools.glibc.have_compatible_glibc',
+           lambda major, minor: False)
+    def test_manylinux1_2(self):
+        """
+        Test that manylinux1 is disabled with incompatible glibc
+        """
+        assert not pep425tags.is_manylinux1_compatible()
+
+    @patch('setuptools.pep425tags.get_platform', lambda: 'arm6vl')
+    @patch('setuptools.glibc.have_compatible_glibc',
+           lambda major, minor: True)
+    def test_manylinux1_3(self):
+        """
+        Test that manylinux1 is disabled on arm6vl
+        """
+        assert not pep425tags.is_manylinux1_compatible()
+
+    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
+    @patch('setuptools.glibc.have_compatible_glibc',
+           lambda major, minor: True)
+    @patch('sys.platform', 'linux2')
+    def test_manylinux1_tag_is_first(self):
+        """
+        Test that the more specific tag manylinux1 comes first.
+        """
+        groups = {}
+        for pyimpl, abi, arch in pep425tags.get_supported():
+            groups.setdefault((pyimpl, abi), []).append(arch)
+
+        for arches in groups.values():
+            if arches == ['any']:
+                continue
+            # Expect the most specific arch first:
+            if len(arches) == 3:
+                assert arches == ['manylinux1_x86_64', 'linux_x86_64', 'any']
+            else:
+                assert arches == ['manylinux1_x86_64', 'linux_x86_64']

From 114bb58167d4f6462e0b7d69a46233b796840ba8 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Thu, 17 May 2018 10:42:53 -0400
Subject: [PATCH 7023/8469] Stop testing Python 3.3 in Travis

---
 .travis.yml               | 3 +--
 changelog.d/1372.misc.rst | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1372.misc.rst

diff --git a/.travis.yml b/.travis.yml
index 9f09c0faa7..63d0333ae6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ sudo: false
 language: python
 python:
 - &latest_py2 2.7
-- 3.3
 - 3.4
 - 3.5
 - &latest_py3 3.6
@@ -43,7 +42,7 @@ install:
 # ensure we have recent pip/setuptools
 - pip install --upgrade pip setuptools
 # need tox to get started
-- pip install tox 'tox-venv; python_version!="3.3"'
+- pip install tox tox-venv
 
 # Output the env, to verify behavior
 - env
diff --git a/changelog.d/1372.misc.rst b/changelog.d/1372.misc.rst
new file mode 100644
index 0000000000..d1bc789bb1
--- /dev/null
+++ b/changelog.d/1372.misc.rst
@@ -0,0 +1,2 @@
+Stop testing Python 3.3 in Travis CI, now that the latest version of
+``wheel`` no longer installs on it.

From 37978a703cf4d306a3e0426d9dabfa1fb04e36d1 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Thu, 17 May 2018 14:18:03 -0400
Subject: [PATCH 7024/8469] Update release process docs

---
 changelog.d/1352.misc.rst |  1 +
 changelog.d/1353.doc.rst  |  1 +
 changelog.d/1356.doc.rst  |  1 +
 changelog.d/1376.doc.rst  |  1 +
 docs/releases.txt         | 37 ++++++++++++++++++++++++-------------
 towncrier_template.rst    |  1 -
 6 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 changelog.d/1352.misc.rst
 create mode 100644 changelog.d/1353.doc.rst
 create mode 100644 changelog.d/1356.doc.rst
 create mode 100644 changelog.d/1376.doc.rst

diff --git a/changelog.d/1352.misc.rst b/changelog.d/1352.misc.rst
new file mode 100644
index 0000000000..331ce47b2b
--- /dev/null
+++ b/changelog.d/1352.misc.rst
@@ -0,0 +1 @@
+Added ``tox`` environment for documentation builds.
diff --git a/changelog.d/1353.doc.rst b/changelog.d/1353.doc.rst
new file mode 100644
index 0000000000..f23fec8f9c
--- /dev/null
+++ b/changelog.d/1353.doc.rst
@@ -0,0 +1 @@
+Added coverage badge to README.
diff --git a/changelog.d/1356.doc.rst b/changelog.d/1356.doc.rst
new file mode 100644
index 0000000000..7ea0e8303e
--- /dev/null
+++ b/changelog.d/1356.doc.rst
@@ -0,0 +1 @@
+Made small fixes to the developer guide documentation.
diff --git a/changelog.d/1376.doc.rst b/changelog.d/1376.doc.rst
new file mode 100644
index 0000000000..c2dcacdaab
--- /dev/null
+++ b/changelog.d/1376.doc.rst
@@ -0,0 +1 @@
+Updated release process docs.
diff --git a/docs/releases.txt b/docs/releases.txt
index 30ea084fec..234f69eeb9 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -7,20 +7,31 @@ mechanical technique for releases, enacted by Travis following a
 successful build of a tagged release per
 `PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
 
-Prior to cutting a release, please check that the CHANGES.rst reflects
-the summary of changes since the last release.
-Ideally, these changelog entries would have been added
-along with the changes, but it's always good to check.
-Think about it from the
-perspective of a user not involved with the development--what would
-that person want to know about what has changed--or from the
-perspective of your future self wanting to know when a particular
-change landed.
-
-To cut a release, install and run ``bump2version {part}`` where ``part``
+Prior to cutting a release, please use `towncrier`_ to update
+``CHANGES.rst`` to summarize the changes since the last release.
+To update the changelog:
+
+1. Install towncrier via ``pip install towncrier`` if not already installed.
+2. Preview the new ``CHANGES.rst`` entry by running
+   ``towncrier --draft --version {new.version.number}`` (enter the desired
+   version number for the next release).  If any changes are needed, make
+   them and generate a new preview until the output is acceptable.  Run
+   ``git add`` for any modified files.
+3. Run ``towncrier --version {new.version.number}`` to stage the changelog
+   updates in git.
+
+Once the changelog edits are staged and ready to commit, cut a release by
+installing and running ``bump2version {part}`` where ``part``
 is major, minor, or patch based on the scope of the changes in the
-release. Then, push the commits to the master branch. If tests pass,
-the release will be uploaded to PyPI (from the Python 3.6 tests).
+release. Then, push the commits to the master branch::
+
+    $ git push origin master
+    $ git push --tags
+
+If tests pass, the release will be uploaded to PyPI (from the Python 3.6
+tests).
+
+.. _towncrier: https://pypi.org/project/towncrier/
 
 Release Frequency
 -----------------
diff --git a/towncrier_template.rst b/towncrier_template.rst
index 02b2882bb1..9c23b9775f 100644
--- a/towncrier_template.rst
+++ b/towncrier_template.rst
@@ -8,7 +8,6 @@
 {% for text, values in sections[section][category].items() %}
 * {{ values|join(', ') }}: {{ text }}
 {% endfor %}
-
 {% else %}
 *  {{ sections[section][category]['']|join(', ') }}
 

From 6d07df7536d3799fafa2877f1b02ccfc0378658c Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jmbowman@alum.mit.edu>
Date: Sat, 19 May 2018 15:06:49 -0400
Subject: [PATCH 7025/8469] =?UTF-8?q?Bump=20version:=2039.1.0=20=E2=86=92?=
 =?UTF-8?q?=2039.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 26 ++++++++++++++++++++++++++
 changelog.d/1343.misc.rst   |  4 ----
 changelog.d/1352.misc.rst   |  1 -
 changelog.d/1353.doc.rst    |  1 -
 changelog.d/1354.misc.rst   |  1 -
 changelog.d/1355.misc.rst   |  1 -
 changelog.d/1356.doc.rst    |  1 -
 changelog.d/1357.doc.rst    |  1 -
 changelog.d/1359.change.rst |  2 --
 changelog.d/1360.change.rst |  1 -
 changelog.d/1365.change.rst |  2 --
 changelog.d/1368.misc.rst   |  1 -
 changelog.d/1369.misc.rst   |  1 -
 changelog.d/1372.misc.rst   |  2 --
 changelog.d/1376.doc.rst    |  1 -
 setup.cfg                   |  2 +-
 setup.py                    |  2 +-
 17 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 changelog.d/1343.misc.rst
 delete mode 100644 changelog.d/1352.misc.rst
 delete mode 100644 changelog.d/1353.doc.rst
 delete mode 100644 changelog.d/1354.misc.rst
 delete mode 100644 changelog.d/1355.misc.rst
 delete mode 100644 changelog.d/1356.doc.rst
 delete mode 100644 changelog.d/1357.doc.rst
 delete mode 100644 changelog.d/1359.change.rst
 delete mode 100644 changelog.d/1360.change.rst
 delete mode 100644 changelog.d/1365.change.rst
 delete mode 100644 changelog.d/1368.misc.rst
 delete mode 100644 changelog.d/1369.misc.rst
 delete mode 100644 changelog.d/1372.misc.rst
 delete mode 100644 changelog.d/1376.doc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index d8b5b49147..d3d661cc3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,29 @@
+v39.2.0
+-------
+
+* #1359: Support using "file:" to load a PEP 440-compliant package version from
+  a text file.
+* #1360: Fixed issue with a mismatch between the name of the package and the
+  name of the .dist-info file in wheel files
+* #1365: Take the package_dir option into account when loading the version from
+  a module attribute.
+* #1353: Added coverage badge to README.
+* #1356: Made small fixes to the developer guide documentation.
+* #1357: Fixed warnings in documentation builds and started enforcing that the
+  docs build without warnings in tox.
+* #1376: Updated release process docs.
+* #1343: The ``setuptools`` specific ``long_description_content_type``,
+  ``project_urls`` and ``provides_extras`` fields are now set consistently
+  after any ``distutils`` ``setup_keywords`` calls, allowing them to override
+  values.
+* #1352: Added ``tox`` environment for documentation builds.
+* #1354: Added ``towncrier`` for changelog managment.
+* #1355: Add PR template.
+* #1368: Fixed tests which failed without network connectivity.
+* #1369: Added unit tests for PEP 425 compatibility tags support.
+* #1372: Stop testing Python 3.3 in Travis CI, now that the latest version of
+  ``wheel`` no longer installs on it.
+
 v39.1.0
 -------
 
diff --git a/changelog.d/1343.misc.rst b/changelog.d/1343.misc.rst
deleted file mode 100644
index 644320f4f0..0000000000
--- a/changelog.d/1343.misc.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The ``setuptools`` specific ``long_description_content_type``,
-``project_urls`` and ``provides_extras`` fields are now set
-consistently after any ``distutils`` ``setup_keywords`` calls,
-allowing them to override values.
diff --git a/changelog.d/1352.misc.rst b/changelog.d/1352.misc.rst
deleted file mode 100644
index 331ce47b2b..0000000000
--- a/changelog.d/1352.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``tox`` environment for documentation builds.
diff --git a/changelog.d/1353.doc.rst b/changelog.d/1353.doc.rst
deleted file mode 100644
index f23fec8f9c..0000000000
--- a/changelog.d/1353.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added coverage badge to README.
diff --git a/changelog.d/1354.misc.rst b/changelog.d/1354.misc.rst
deleted file mode 100644
index 7f9b80c95b..0000000000
--- a/changelog.d/1354.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``towncrier`` for changelog managment.
diff --git a/changelog.d/1355.misc.rst b/changelog.d/1355.misc.rst
deleted file mode 100644
index af1e3f3f1c..0000000000
--- a/changelog.d/1355.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add PR template.
diff --git a/changelog.d/1356.doc.rst b/changelog.d/1356.doc.rst
deleted file mode 100644
index 7ea0e8303e..0000000000
--- a/changelog.d/1356.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Made small fixes to the developer guide documentation.
diff --git a/changelog.d/1357.doc.rst b/changelog.d/1357.doc.rst
deleted file mode 100644
index 11d97cc707..0000000000
--- a/changelog.d/1357.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed warnings in documentation builds and started enforcing that the docs build without warnings in tox.
diff --git a/changelog.d/1359.change.rst b/changelog.d/1359.change.rst
deleted file mode 100644
index 05746e737f..0000000000
--- a/changelog.d/1359.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Support using "file:" to load a PEP 440-compliant package version
-from a text file.
diff --git a/changelog.d/1360.change.rst b/changelog.d/1360.change.rst
deleted file mode 100644
index 36f40483b3..0000000000
--- a/changelog.d/1360.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed issue with a mismatch between the name of the package and the name of the .dist-info file in wheel files
diff --git a/changelog.d/1365.change.rst b/changelog.d/1365.change.rst
deleted file mode 100644
index 63eb008b80..0000000000
--- a/changelog.d/1365.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Take the package_dir option into account when loading the version from a
-module attribute.
diff --git a/changelog.d/1368.misc.rst b/changelog.d/1368.misc.rst
deleted file mode 100644
index 289e6a6875..0000000000
--- a/changelog.d/1368.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed tests which failed without network connectivity.
diff --git a/changelog.d/1369.misc.rst b/changelog.d/1369.misc.rst
deleted file mode 100644
index d1803f23de..0000000000
--- a/changelog.d/1369.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added unit tests for PEP 425 compatibility tags support.
diff --git a/changelog.d/1372.misc.rst b/changelog.d/1372.misc.rst
deleted file mode 100644
index d1bc789bb1..0000000000
--- a/changelog.d/1372.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Stop testing Python 3.3 in Travis CI, now that the latest version of
-``wheel`` no longer installs on it.
diff --git a/changelog.d/1376.doc.rst b/changelog.d/1376.doc.rst
deleted file mode 100644
index c2dcacdaab..0000000000
--- a/changelog.d/1376.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated release process docs.
diff --git a/setup.cfg b/setup.cfg
index 2c84f0b763..e23ee6f041 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.1.0
+current_version = 39.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b08552d437..b122df82f3 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.1.0",
+    version="39.2.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 341bbf4d0a8a6674255517a5145aecf7e3957c15 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jmbowman@alum.mit.edu>
Date: Sat, 19 May 2018 15:37:39 -0400
Subject: [PATCH 7026/8469] Make minor fixes to release docs

---
 CHANGES.rst              | 2 ++
 changelog.d/1364.rst     | 1 -
 changelog.d/1379.doc.rst | 1 +
 docs/releases.txt        | 6 +++++-
 4 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/1364.rst
 create mode 100644 changelog.d/1379.doc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index d3d661cc3e..156ba47d51 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@ v39.2.0
   a text file.
 * #1360: Fixed issue with a mismatch between the name of the package and the
   name of the .dist-info file in wheel files
+* #1364: Add `__dir__()` implementation to `pkg_resources.Distribution()` that
+  includes the attributes in the `_provider` instance variable.
 * #1365: Take the package_dir option into account when loading the version from
   a module attribute.
 * #1353: Added coverage badge to README.
diff --git a/changelog.d/1364.rst b/changelog.d/1364.rst
deleted file mode 100644
index f7b4c01296..0000000000
--- a/changelog.d/1364.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add `__dir__()` implementation to `pkg_resources.Distribution()` that includes the attributes in the `_provider` instance variable.
\ No newline at end of file
diff --git a/changelog.d/1379.doc.rst b/changelog.d/1379.doc.rst
new file mode 100644
index 0000000000..ca017719e5
--- /dev/null
+++ b/changelog.d/1379.doc.rst
@@ -0,0 +1 @@
+Minor doc fixes after actually using the new release process.
diff --git a/docs/releases.txt b/docs/releases.txt
index 234f69eeb9..98ba39e88d 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -19,9 +19,13 @@ To update the changelog:
    ``git add`` for any modified files.
 3. Run ``towncrier --version {new.version.number}`` to stage the changelog
    updates in git.
+4. Verify that there are no remaining ``changelog.d/*.rst`` files.  If a
+   file was named incorrectly, it may be ignored by towncrier.
+5. Review the updated ``CHANGES.rst`` file.  If any changes are needed,
+   make the edits and stage them via ``git add CHANGES.rst``.
 
 Once the changelog edits are staged and ready to commit, cut a release by
-installing and running ``bump2version {part}`` where ``part``
+installing and running ``bump2version --allow-dirty {part}`` where ``part``
 is major, minor, or patch based on the scope of the changes in the
 release. Then, push the commits to the master branch::
 

From e078d78a439591fd7028cf80ca0b7c12ae013d4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 May 2018 09:31:11 -0400
Subject: [PATCH 7027/8469] Add reference to Setuptools Developers team for
 clarity of maintenance and removed reference to Jason as maintainer.

---
 README.rst       | 4 +++-
 docs/history.txt | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 2c008cc6e3..8505c5517f 100755
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,9 @@ See the `Installation Instructions
 User's Guide for instructions on installing, upgrading, and uninstalling
 Setuptools.
 
-The project is `maintained at GitHub <https://github.com/pypa/setuptools>`_.
+The project is `maintained at GitHub <https://github.com/pypa/setuptools>`_
+by the `Setuptools Developers
+<https://github.com/orgs/pypa/teams/setuptools-developers>`_.
 
 Questions and comments should be directed to the `distutils-sig
 mailing list <http://mail.python.org/pipermail/distutils-sig/>`_.
diff --git a/docs/history.txt b/docs/history.txt
index 8fd1dc6538..385cfa7eda 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -40,7 +40,6 @@ Credits
   re-invigorated the community on the project, encouraged renewed innovation,
   and addressed many defects.
 
-* Since the merge with Distribute, Jason R. Coombs is the
-  maintainer of setuptools. The project is maintained in coordination with
-  the Python Packaging Authority (PyPA) and the larger Python community.
-
+* Jason R. Coombs performed the merge with Distribute, maintaining the
+  project for several years in coordination with the Python Packaging
+  Authority (PyPA).

From 7392f01ffced3acfdef25b0b2d55cefdc6ee468a Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 26 Apr 2018 18:06:09 +0300
Subject: [PATCH 7028/8469] Drop support for EOL Python 3.3

---
 docs/easy_install.txt                    |  2 +-
 pkg_resources/__init__.py                |  6 +++---
 pkg_resources/extern/__init__.py         |  2 +-
 pkg_resources/py31compat.py              |  3 +--
 pkg_resources/tests/test_resources.py    |  6 +++---
 setup.py                                 |  3 +--
 setuptools/command/bdist_egg.py          |  2 +-
 setuptools/command/build_ext.py          | 12 +-----------
 setuptools/extern/__init__.py            |  2 +-
 setuptools/monkey.py                     |  2 --
 setuptools/pep425tags.py                 |  4 ++--
 setuptools/site-patch.py                 |  2 +-
 setuptools/tests/test_easy_install.py    |  2 +-
 setuptools/tests/test_egg_info.py        |  2 +-
 setuptools/tests/test_install_scripts.py |  2 +-
 tox.ini                                  |  2 +-
 16 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 5c99234361..f426b6ffd5 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
-You will need at least Python 3.3 or 2.7.  An ``easy_install`` script will be
+You will need at least Python 3.4 or 2.7.  An ``easy_install`` script will be
 installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4e4409b32b..91d00483b1 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -78,8 +78,8 @@
 __import__('pkg_resources.extern.packaging.markers')
 
 
-if (3, 0) < sys.version_info < (3, 3):
-    raise RuntimeError("Python 3.3 or later is required")
+if (3, 0) < sys.version_info < (3, 4):
+    raise RuntimeError("Python 3.4 or later is required")
 
 if six.PY2:
     # Those builtin exceptions are only defined in Python 3
@@ -959,7 +959,7 @@ def __init__(
         `platform` is an optional string specifying the name of the platform
         that platform-specific distributions must be compatible with.  If
         unspecified, it defaults to the current platform.  `python` is an
-        optional string naming the desired version of Python (e.g. ``'3.3'``);
+        optional string naming the desired version of Python (e.g. ``'3.6'``);
         it defaults to the current version.
 
         You may explicitly set `platform` (and/or `python`) to ``None`` if you
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index b4156fec20..dfde433dc2 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -48,7 +48,7 @@ def load_module(self, fullname):
                 # on later Python versions to cause relative imports
                 # in the vendor package to resolve the same modules
                 # as those going through this importer.
-                if sys.version_info > (3, 3):
+                if sys.version_info.major >= 3:
                     del sys.modules[extant]
                 return mod
             except ImportError:
diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index 331a51bb0f..fd4b6fd088 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -15,8 +15,7 @@ def _makedirs_31(path, exist_ok=False):
 #  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
+    sys.version_info.major == 2 or
     (3, 4) <= sys.version_info < (3, 4, 1)
 )
 makedirs = _makedirs_31 if needs_makedirs else os.makedirs
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 04d02c1f61..171ba2f96f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -668,7 +668,7 @@ def test_requirements_with_markers(self):
         assert (
             Requirement.parse("name==1.1;python_version=='2.7'")
             !=
-            Requirement.parse("name==1.1;python_version=='3.3'")
+            Requirement.parse("name==1.1;python_version=='3.6'")
         )
         assert (
             Requirement.parse("name==1.0;python_version=='2.7'")
@@ -676,9 +676,9 @@ def test_requirements_with_markers(self):
             Requirement.parse("name==1.2;python_version=='2.7'")
         )
         assert (
-            Requirement.parse("name[foo]==1.0;python_version=='3.3'")
+            Requirement.parse("name[foo]==1.0;python_version=='3.6'")
             !=
-            Requirement.parse("name[foo,bar]==1.0;python_version=='3.3'")
+            Requirement.parse("name[foo,bar]==1.0;python_version=='3.6'")
         )
 
     def test_local_version(self):
diff --git a/setup.py b/setup.py
index b122df82f3..22c26dd2d8 100755
--- a/setup.py
+++ b/setup.py
@@ -161,7 +161,6 @@ def pypi_link(pkg_filename):
         Programming Language :: Python :: 2
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
-        Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6
@@ -170,7 +169,7 @@ def pypi_link(pkg_filename):
         Topic :: System :: Systems Administration
         Topic :: Utilities
         """).strip().splitlines(),
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
         "certs": "certifi==2016.9.26",
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 423b818765..14530729b9 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -411,7 +411,7 @@ def scan_module(egg_dir, base, name, stubs):
         return True  # Extension module
     pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
-    if sys.version_info < (3, 3):
+    if sys.version_info.major == 2:
         skip = 8  # skip magic & date
     elif sys.version_info < (3, 7):
         skip = 12  # skip magic & date & file size
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index ea97b37b2c..60a8a32f08 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -112,7 +112,7 @@ def get_ext_filename(self, fullname):
                 and get_abi3_suffix()
             )
             if use_abi3:
-                so_ext = _get_config_var_837('EXT_SUFFIX')
+                so_ext = get_config_var('EXT_SUFFIX')
                 filename = filename[:-len(so_ext)]
                 filename = filename + get_abi3_suffix()
             if isinstance(ext, Library):
@@ -319,13 +319,3 @@ def link_shared_object(
         self.create_static_lib(
             objects, basename, output_dir, debug, target_lang
         )
-
-
-def _get_config_var_837(name):
-    """
-    In https://github.com/pypa/setuptools/pull/837, we discovered
-    Python 3.3.0 exposes the extension suffix under the name 'SO'.
-    """
-    if sys.version_info < (3, 3, 1):
-        name = 'SO'
-    return get_config_var(name)
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index da3d668d99..52785a0328 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -48,7 +48,7 @@ def load_module(self, fullname):
                 # on later Python versions to cause relative imports
                 # in the vendor package to resolve the same modules
                 # as those going through this importer.
-                if sys.version_info > (3, 3):
+                if sys.version_info.major >= 3:
                     del sys.modules[extant]
                 return mod
             except ImportError:
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 08ed50d9ec..05a738b055 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -75,8 +75,6 @@ def patch_all():
     needs_warehouse = (
         sys.version_info < (2, 7, 13)
         or
-        (3, 0) < sys.version_info < (3, 3, 7)
-        or
         (3, 4) < sys.version_info < (3, 4, 6)
         or
         (3, 5) < sys.version_info <= (3, 5, 3)
diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
index 3bdd3285a5..a86a0d183e 100644
--- a/setuptools/pep425tags.py
+++ b/setuptools/pep425tags.py
@@ -97,8 +97,8 @@ def get_abi_tag():
                     lambda: sys.maxunicode == 0x10ffff,
                     expected=4,
                     warn=(impl == 'cp' and
-                          sys.version_info < (3, 3))) \
-                and sys.version_info < (3, 3):
+                          sys.version_info.major == 2)) \
+                and sys.version_info.major == 2:
             u = 'u'
         abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
     elif soabi and soabi.startswith('cpython-'):
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 0d2d2ff8da..40b00de0a7 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -23,7 +23,7 @@ def __boot():
                 break
         else:
             try:
-                import imp  # Avoid import loop in Python >= 3.3
+                import imp  # Avoid import loop in Python 3
                 stream, path, descr = imp.find_module('site', [item])
             except ImportError:
                 continue
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 57339c8a12..3fc7fdaf30 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -688,7 +688,7 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
 )
 class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
-    exe_with_spaces = r'C:\Program Files\Python33\python.exe'
+    exe_with_spaces = r'C:\Program Files\Python36\python.exe'
 
     def test_get_script_header(self):
         expected = '#!%s\n' % ei.nt_quote_arg(os.path.normpath(sys.executable))
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 8b3b90f77f..a70a93a8a7 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -452,7 +452,7 @@ def test_provides_extra(self, tmpdir_cwd, env):
 
     def test_doesnt_provides_extra(self, tmpdir_cwd, env):
         self._setup_script_with_requires(
-            '''install_requires=["spam ; python_version<'3.3'"]''')
+            '''install_requires=["spam ; python_version<'3.6'"]''')
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
diff --git a/setuptools/tests/test_install_scripts.py b/setuptools/tests/test_install_scripts.py
index 7393241f84..727ad65b13 100644
--- a/setuptools/tests/test_install_scripts.py
+++ b/setuptools/tests/test_install_scripts.py
@@ -19,7 +19,7 @@ class TestInstallScripts:
     )
     unix_exe = '/usr/dummy-test-path/local/bin/python'
     unix_spaces_exe = '/usr/bin/env dummy-test-python'
-    win32_exe = 'C:\\Dummy Test Path\\Program Files\\Python 3.3\\python.exe'
+    win32_exe = 'C:\\Dummy Test Path\\Program Files\\Python 3.6\\python.exe'
 
     def _run_install_scripts(self, install_dir, executable=None):
         dist = Distribution(self.settings)
diff --git a/tox.ini b/tox.ini
index a16e89faa7..1a369653fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py27,py3{3,4,5,6},pypy,pypy3'
+# export TOXENV='py27,py3{4,5,6},pypy,pypy3'
 
 [tox]
 envlist=python

From ca7aa27ceb9370dabbca21b55d6410bb1101f8f0 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 26 Apr 2018 18:14:38 +0300
Subject: [PATCH 7029/8469] Remove redundant Python 3.1 code

---
 setuptools/command/easy_install.py |  3 ++-
 setuptools/py31compat.py           | 14 --------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 85ee40f1d5..a059a0bdd1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,12 +40,13 @@
 import shlex
 import io
 
+from sysconfig import get_config_vars, get_path
+
 from setuptools.extern import six
 from setuptools.extern.six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
-from setuptools.py31compat import get_path, get_config_vars
 from setuptools.py27compat import rmtree_safe
 from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 4ea953201f..12895cd868 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -1,17 +1,3 @@
-__all__ = ['get_config_vars', 'get_path']
-
-try:
-    # Python 2.7 or >=3.2
-    from sysconfig import get_config_vars, get_path
-except ImportError:
-    from distutils.sysconfig import get_config_vars, get_python_lib
-
-    def get_path(name):
-        if name not in ('platlib', 'purelib'):
-            raise ValueError("Name must be purelib or platlib")
-        return get_python_lib(name == 'platlib')
-
-
 try:
     # Python >=3.2
     from tempfile import TemporaryDirectory

From 88ae237911346d74c1c8a51a11dd47b486f3b4c5 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 26 Apr 2018 21:20:42 +0300
Subject: [PATCH 7030/8469] Make it clear this compat module provides no public
 members

---
 setuptools/py31compat.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 12895cd868..3aecf74e93 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -1,3 +1,5 @@
+__all__ = []
+
 try:
     # Python >=3.2
     from tempfile import TemporaryDirectory

From a23faf97bbe7f58e3fd8d9cf290170b58bda9565 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 17 May 2018 11:33:29 -0400
Subject: [PATCH 7031/8469] Add changelog entry for dropping 3.3 support

---
 changelog.d/1342.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1342.breaking.rst

diff --git a/changelog.d/1342.breaking.rst b/changelog.d/1342.breaking.rst
new file mode 100644
index 0000000000..9756e313dd
--- /dev/null
+++ b/changelog.d/1342.breaking.rst
@@ -0,0 +1 @@
+Drop support for Python 3.3.

From c9f21d7698ea2c3510ae99f27574b660445d95f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jun 2018 15:51:41 -0400
Subject: [PATCH 7032/8469] Remove documentation about non-package data files
 that's no longer relevant without eggs. Fixes #1385.

---
 docs/setuptools.txt | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index f7b9351b78..4d9278e318 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -970,35 +970,14 @@ a quick example of converting code that uses ``__file__`` to use
 Non-Package Data Files
 ----------------------
 
-The ``distutils`` normally install general "data files" to a platform-specific
-location (e.g. ``/usr/share``).  This feature intended to be used for things
-like documentation, example configuration files, and the like.  ``setuptools``
-does not install these data files in a separate location, however.  They are
-bundled inside the egg file or directory, alongside the Python modules and
-packages.  The data files can also be accessed using the :ref:`ResourceManager
-API`, by specifying a ``Requirement`` instead of a package name::
-
-    from pkg_resources import Requirement, resource_filename
-    filename = resource_filename(Requirement.parse("MyProject"),"sample.conf")
-
-The above code will obtain the filename of the "sample.conf" file in the data
-root of the "MyProject" distribution.
-
-Note, by the way, that this encapsulation of data files means that you can't
-actually install data files to some arbitrary location on a user's machine;
-this is a feature, not a bug.  You can always include a script in your
-distribution that extracts and copies your the documentation or data files to
-a user-specified location, at their discretion.  If you put related data files
-in a single directory, you can use ``resource_filename()`` with the directory
-name to get a filesystem directory that then can be copied with the ``shutil``
-module.  (Even if your package is installed as a zipfile, calling
-``resource_filename()`` on a directory will return an actual filesystem
-directory, whose contents will be that entire subtree of your distribution.)
-
-(Of course, if you're writing a new package, you can just as easily place your
-data files or directories inside one of your packages, rather than using the
-distutils' approach.  However, if you're updating an existing application, it
-may be simpler not to change the way it currently specifies these data files.)
+Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
+files from the distribution into the egg (see `this reference
+<https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
+fall back to the platform-specific location for installing data files, there is
+no supported facility to reliably retrieve these resources.
+
+Instead, the PyPA recommends that any data files you wish to be accessible at
+run time be included in the package.
 
 
 Automatic Resource Extraction

From 097e031561aecc7af929768e63719a359fdd450b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 2 Jun 2018 15:53:59 -0400
Subject: [PATCH 7033/8469] Add changelog entry and include the final unsaved
 edit to setuptools.txt. Ref #1385.

---
 changelog.d/1385.doc.rst | 1 +
 docs/setuptools.txt      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1385.doc.rst

diff --git a/changelog.d/1385.doc.rst b/changelog.d/1385.doc.rst
new file mode 100644
index 0000000000..7bd88e8f21
--- /dev/null
+++ b/changelog.d/1385.doc.rst
@@ -0,0 +1 @@
+Removed section on non-package data files.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 4d9278e318..c82dc51133 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -971,7 +971,7 @@ Non-Package Data Files
 ----------------------
 
 Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
-files from the distribution into the egg (see `this reference
+files from the distribution into the egg (see `the old docs
 <https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
 fall back to the platform-specific location for installing data files, there is
 no supported facility to reliably retrieve these resources.

From 885f0b174621be1c040848d141bae732ed06e030 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 08:54:07 -0400
Subject: [PATCH 7034/8469] Feed the hobgoblins (delint).

---
 setuptools/wheel.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 4a33b20324..e171a97924 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -20,7 +20,7 @@
     r"""^(?P<project_name>.+?)-(?P<version>\d.*?)
     ((-(?P<build>\d.*?))?-(?P<py_version>.+?)-(?P<abi>.+?)-(?P<platform>.+?)
     )\.whl$""",
-re.VERBOSE).match
+    re.VERBOSE).match
 
 NAMESPACE_PACKAGE_INIT = '''\
 try:
@@ -95,16 +95,21 @@ def install_as_egg(self, destination_eggdir):
             dist_basename = '%s-%s' % (self.project_name, self.version)
             dist_info = self.get_dist_info(zf)
             dist_data = '%s.data' % dist_basename
+
             def get_metadata(name):
                 with zf.open(posixpath.join(dist_info, name)) as fp:
                     value = fp.read().decode('utf-8') if PY3 else fp.read()
                     return email.parser.Parser().parsestr(value)
             wheel_metadata = get_metadata('WHEEL')
-            dist_metadata = get_metadata('METADATA')
             # Check wheel format version is supported.
             wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
-            if not parse_version('1.0') <= wheel_version < parse_version('2.0dev0'):
-                raise ValueError('unsupported wheel format version: %s' % wheel_version)
+            wheel_v1 = (
+                parse_version('1.0') <= wheel_version
+                < parse_version('2.0dev0')
+            )
+            if not wheel_v1:
+                raise ValueError(
+                    'unsupported wheel format version: %s' % wheel_version)
             # Extract to target directory.
             os.mkdir(destination_eggdir)
             zf.extractall(destination_eggdir)
@@ -114,8 +119,9 @@ def get_metadata(name):
                 destination_eggdir, dist_info,
                 metadata=PathMetadata(destination_eggdir, dist_info)
             )
-            # Note: we need to evaluate and strip markers now,
-            # as we can't easily convert back from the syntax:
+
+            # Note: Evaluate and strip markers now,
+            # as it's difficult to convert back from the syntax:
             # foobar; "linux" in sys_platform and extra == 'test'
             def raw_req(req):
                 req.marker = None
@@ -163,13 +169,16 @@ def raw_req(req):
             if os.path.exists(dist_data):
                 os.rmdir(dist_data)
             # Fix namespace packages.
-            namespace_packages = os.path.join(egg_info, 'namespace_packages.txt')
+            namespace_packages = os.path.join(
+                egg_info, 'namespace_packages.txt')
             if os.path.exists(namespace_packages):
                 with open(namespace_packages) as fp:
                     namespace_packages = fp.read().split()
                 for mod in namespace_packages:
                     mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
                     mod_init = os.path.join(mod_dir, '__init__.py')
-                    if os.path.exists(mod_dir) and not os.path.exists(mod_init):
+                    if (
+                            os.path.exists(mod_dir)
+                            and not os.path.exists(mod_init)):
                         with open(mod_init, 'w') as fp:
                             fp.write(NAMESPACE_PACKAGE_INIT)

From c2460c75c3e0aac25387c04d7601959d2b6a3449 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:09:38 -0400
Subject: [PATCH 7035/8469] Extract method to save indentation

---
 setuptools/wheel.py | 181 ++++++++++++++++++++++----------------------
 1 file changed, 92 insertions(+), 89 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index e171a97924..3065f2a139 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -92,93 +92,96 @@ def get_dist_info(self, zf):
     def install_as_egg(self, destination_eggdir):
         '''Install wheel as an egg directory.'''
         with zipfile.ZipFile(self.filename) as zf:
-            dist_basename = '%s-%s' % (self.project_name, self.version)
-            dist_info = self.get_dist_info(zf)
-            dist_data = '%s.data' % dist_basename
-
-            def get_metadata(name):
-                with zf.open(posixpath.join(dist_info, name)) as fp:
-                    value = fp.read().decode('utf-8') if PY3 else fp.read()
-                    return email.parser.Parser().parsestr(value)
-            wheel_metadata = get_metadata('WHEEL')
-            # Check wheel format version is supported.
-            wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
-            wheel_v1 = (
-                parse_version('1.0') <= wheel_version
-                < parse_version('2.0dev0')
-            )
-            if not wheel_v1:
-                raise ValueError(
-                    'unsupported wheel format version: %s' % wheel_version)
-            # Extract to target directory.
-            os.mkdir(destination_eggdir)
-            zf.extractall(destination_eggdir)
-            # Convert metadata.
-            dist_info = os.path.join(destination_eggdir, dist_info)
-            dist = Distribution.from_location(
-                destination_eggdir, dist_info,
-                metadata=PathMetadata(destination_eggdir, dist_info)
-            )
-
-            # Note: Evaluate and strip markers now,
-            # as it's difficult to convert back from the syntax:
-            # foobar; "linux" in sys_platform and extra == 'test'
-            def raw_req(req):
-                req.marker = None
-                return str(req)
-            install_requires = list(sorted(map(raw_req, dist.requires())))
-            extras_require = {
-                extra: list(sorted(
-                    req
-                    for req in map(raw_req, dist.requires((extra,)))
-                    if req not in install_requires
-                ))
-                for extra in dist.extras
-            }
-            egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
-            os.rename(dist_info, egg_info)
-            os.rename(os.path.join(egg_info, 'METADATA'),
-                      os.path.join(egg_info, 'PKG-INFO'))
-            setup_dist = SetuptoolsDistribution(attrs=dict(
-                install_requires=install_requires,
-                extras_require=extras_require,
+            self._install_as_egg(destination_eggdir, zf)
+
+    def _install_as_egg(self, destination_eggdir, zf):
+        dist_basename = '%s-%s' % (self.project_name, self.version)
+        dist_info = self.get_dist_info(zf)
+        dist_data = '%s.data' % dist_basename
+
+        def get_metadata(name):
+            with zf.open(posixpath.join(dist_info, name)) as fp:
+                value = fp.read().decode('utf-8') if PY3 else fp.read()
+                return email.parser.Parser().parsestr(value)
+        wheel_metadata = get_metadata('WHEEL')
+        # Check wheel format version is supported.
+        wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
+        wheel_v1 = (
+            parse_version('1.0') <= wheel_version
+            < parse_version('2.0dev0')
+        )
+        if not wheel_v1:
+            raise ValueError(
+                'unsupported wheel format version: %s' % wheel_version)
+        # Extract to target directory.
+        os.mkdir(destination_eggdir)
+        zf.extractall(destination_eggdir)
+        # Convert metadata.
+        dist_info = os.path.join(destination_eggdir, dist_info)
+        dist = Distribution.from_location(
+            destination_eggdir, dist_info,
+            metadata=PathMetadata(destination_eggdir, dist_info)
+        )
+
+        # Note: Evaluate and strip markers now,
+        # as it's difficult to convert back from the syntax:
+        # foobar; "linux" in sys_platform and extra == 'test'
+        def raw_req(req):
+            req.marker = None
+            return str(req)
+        install_requires = list(sorted(map(raw_req, dist.requires())))
+        extras_require = {
+            extra: list(sorted(
+                req
+                for req in map(raw_req, dist.requires((extra,)))
+                if req not in install_requires
             ))
-            write_requirements(setup_dist.get_command_obj('egg_info'),
-                               None, os.path.join(egg_info, 'requires.txt'))
-            # Move data entries to their correct location.
-            dist_data = os.path.join(destination_eggdir, dist_data)
-            dist_data_scripts = os.path.join(dist_data, 'scripts')
-            if os.path.exists(dist_data_scripts):
-                egg_info_scripts = os.path.join(destination_eggdir,
-                                                'EGG-INFO', 'scripts')
-                os.mkdir(egg_info_scripts)
-                for entry in os.listdir(dist_data_scripts):
-                    # Remove bytecode, as it's not properly handled
-                    # during easy_install scripts install phase.
-                    if entry.endswith('.pyc'):
-                        os.unlink(os.path.join(dist_data_scripts, entry))
-                    else:
-                        os.rename(os.path.join(dist_data_scripts, entry),
-                                  os.path.join(egg_info_scripts, entry))
-                os.rmdir(dist_data_scripts)
-            for subdir in filter(os.path.exists, (
-                os.path.join(dist_data, d)
-                for d in ('data', 'headers', 'purelib', 'platlib')
-            )):
-                unpack(subdir, destination_eggdir)
-            if os.path.exists(dist_data):
-                os.rmdir(dist_data)
-            # Fix namespace packages.
-            namespace_packages = os.path.join(
-                egg_info, 'namespace_packages.txt')
-            if os.path.exists(namespace_packages):
-                with open(namespace_packages) as fp:
-                    namespace_packages = fp.read().split()
-                for mod in namespace_packages:
-                    mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
-                    mod_init = os.path.join(mod_dir, '__init__.py')
-                    if (
-                            os.path.exists(mod_dir)
-                            and not os.path.exists(mod_init)):
-                        with open(mod_init, 'w') as fp:
-                            fp.write(NAMESPACE_PACKAGE_INIT)
+            for extra in dist.extras
+        }
+        egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
+        os.rename(dist_info, egg_info)
+        os.rename(os.path.join(egg_info, 'METADATA'),
+                  os.path.join(egg_info, 'PKG-INFO'))
+        setup_dist = SetuptoolsDistribution(attrs=dict(
+            install_requires=install_requires,
+            extras_require=extras_require,
+        ))
+        write_requirements(setup_dist.get_command_obj('egg_info'),
+                           None, os.path.join(egg_info, 'requires.txt'))
+        # Move data entries to their correct location.
+        dist_data = os.path.join(destination_eggdir, dist_data)
+        dist_data_scripts = os.path.join(dist_data, 'scripts')
+        if os.path.exists(dist_data_scripts):
+            egg_info_scripts = os.path.join(destination_eggdir,
+                                            'EGG-INFO', 'scripts')
+            os.mkdir(egg_info_scripts)
+            for entry in os.listdir(dist_data_scripts):
+                # Remove bytecode, as it's not properly handled
+                # during easy_install scripts install phase.
+                if entry.endswith('.pyc'):
+                    os.unlink(os.path.join(dist_data_scripts, entry))
+                else:
+                    os.rename(os.path.join(dist_data_scripts, entry),
+                              os.path.join(egg_info_scripts, entry))
+            os.rmdir(dist_data_scripts)
+        for subdir in filter(os.path.exists, (
+            os.path.join(dist_data, d)
+            for d in ('data', 'headers', 'purelib', 'platlib')
+        )):
+            unpack(subdir, destination_eggdir)
+        if os.path.exists(dist_data):
+            os.rmdir(dist_data)
+        # Fix namespace packages.
+        namespace_packages = os.path.join(
+            egg_info, 'namespace_packages.txt')
+        if os.path.exists(namespace_packages):
+            with open(namespace_packages) as fp:
+                namespace_packages = fp.read().split()
+            for mod in namespace_packages:
+                mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
+                mod_init = os.path.join(mod_dir, '__init__.py')
+                if (
+                        os.path.exists(mod_dir)
+                        and not os.path.exists(mod_init)):
+                    with open(mod_init, 'w') as fp:
+                        fp.write(NAMESPACE_PACKAGE_INIT)

From ac3e41e61a72f34a46799f63531465495e3465a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:11:14 -0400
Subject: [PATCH 7036/8469] Use the new breathing room to consolidate lines

---
 setuptools/wheel.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 3065f2a139..d7ce56bf89 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -107,8 +107,7 @@ def get_metadata(name):
         # Check wheel format version is supported.
         wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
         wheel_v1 = (
-            parse_version('1.0') <= wheel_version
-            < parse_version('2.0dev0')
+            parse_version('1.0') <= wheel_version < parse_version('2.0dev0')
         )
         if not wheel_v1:
             raise ValueError(
@@ -120,7 +119,7 @@ def get_metadata(name):
         dist_info = os.path.join(destination_eggdir, dist_info)
         dist = Distribution.from_location(
             destination_eggdir, dist_info,
-            metadata=PathMetadata(destination_eggdir, dist_info)
+            metadata=PathMetadata(destination_eggdir, dist_info),
         )
 
         # Note: Evaluate and strip markers now,
@@ -180,8 +179,6 @@ def raw_req(req):
             for mod in namespace_packages:
                 mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
                 mod_init = os.path.join(mod_dir, '__init__.py')
-                if (
-                        os.path.exists(mod_dir)
-                        and not os.path.exists(mod_init)):
+                if os.path.exists(mod_dir) and not os.path.exists(mod_init):
                     with open(mod_init, 'w') as fp:
                         fp.write(NAMESPACE_PACKAGE_INIT)

From 169639bd253b55bbc4ef021a666c57b6029d3c5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:12:06 -0400
Subject: [PATCH 7037/8469] Remove redundant 'list'

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

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index d7ce56bf89..193edafd4c 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -130,11 +130,11 @@ def raw_req(req):
             return str(req)
         install_requires = list(sorted(map(raw_req, dist.requires())))
         extras_require = {
-            extra: list(sorted(
+            extra: sorted(
                 req
                 for req in map(raw_req, dist.requires((extra,)))
                 if req not in install_requires
-            ))
+            )
             for extra in dist.extras
         }
         egg_info = os.path.join(destination_eggdir, 'EGG-INFO')

From f8d08c3929e7645ba134598793076d2a7d55344c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:15:11 -0400
Subject: [PATCH 7038/8469] Avoid hanging indents

---
 setuptools/wheel.py | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 193edafd4c..920bb6f0e3 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -64,9 +64,11 @@ def __init__(self, filename):
 
     def tags(self):
         '''List tags (py_version, abi, platform) supported by this wheel.'''
-        return itertools.product(self.py_version.split('.'),
-                                 self.abi.split('.'),
-                                 self.platform.split('.'))
+        return itertools.product(
+            self.py_version.split('.'),
+            self.abi.split('.'),
+            self.platform.split('.'),
+        )
 
     def is_compatible(self):
         '''Is the wheel is compatible with the current platform?'''
@@ -139,20 +141,27 @@ def raw_req(req):
         }
         egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
         os.rename(dist_info, egg_info)
-        os.rename(os.path.join(egg_info, 'METADATA'),
-                  os.path.join(egg_info, 'PKG-INFO'))
-        setup_dist = SetuptoolsDistribution(attrs=dict(
-            install_requires=install_requires,
-            extras_require=extras_require,
-        ))
-        write_requirements(setup_dist.get_command_obj('egg_info'),
-                           None, os.path.join(egg_info, 'requires.txt'))
+        os.rename(
+            os.path.join(egg_info, 'METADATA'),
+            os.path.join(egg_info, 'PKG-INFO'),
+        )
+        setup_dist = SetuptoolsDistribution(
+            attrs=dict(
+                install_requires=install_requires,
+                extras_require=extras_require,
+            ),
+        )
+        write_requirements(
+            setup_dist.get_command_obj('egg_info'),
+            None,
+            os.path.join(egg_info, 'requires.txt'),
+        )
         # Move data entries to their correct location.
         dist_data = os.path.join(destination_eggdir, dist_data)
         dist_data_scripts = os.path.join(dist_data, 'scripts')
         if os.path.exists(dist_data_scripts):
-            egg_info_scripts = os.path.join(destination_eggdir,
-                                            'EGG-INFO', 'scripts')
+            egg_info_scripts = os.path.join(
+                destination_eggdir, 'EGG-INFO', 'scripts')
             os.mkdir(egg_info_scripts)
             for entry in os.listdir(dist_data_scripts):
                 # Remove bytecode, as it's not properly handled
@@ -160,8 +169,10 @@ def raw_req(req):
                 if entry.endswith('.pyc'):
                     os.unlink(os.path.join(dist_data_scripts, entry))
                 else:
-                    os.rename(os.path.join(dist_data_scripts, entry),
-                              os.path.join(egg_info_scripts, entry))
+                    os.rename(
+                        os.path.join(dist_data_scripts, entry),
+                        os.path.join(egg_info_scripts, entry),
+                    )
             os.rmdir(dist_data_scripts)
         for subdir in filter(os.path.exists, (
             os.path.join(dist_data, d)

From 19d79d2f9fef6b9e024a1352ed51f9b7d829b768 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:16:44 -0400
Subject: [PATCH 7039/8469] Extract method for fixing namespace packages

---
 setuptools/wheel.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 920bb6f0e3..a64aa5bf4a 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -1,4 +1,4 @@
-'''Wheels support.'''
+"""Wheels support."""
 
 from distutils.util import get_platform
 import email
@@ -181,7 +181,10 @@ def raw_req(req):
             unpack(subdir, destination_eggdir)
         if os.path.exists(dist_data):
             os.rmdir(dist_data)
-        # Fix namespace packages.
+        self._fix_namespace_packages(egg_info, destination_eggdir)
+
+    @staticmethod
+    def _fix_namespace_packages(egg_info, destination_eggdir):
         namespace_packages = os.path.join(
             egg_info, 'namespace_packages.txt')
         if os.path.exists(namespace_packages):

From ad676fe418b22c894385f8d1316f2a60d8d1a291 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:18:48 -0400
Subject: [PATCH 7040/8469] Extract method for _move_data_entries

---
 setuptools/wheel.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index a64aa5bf4a..e3d807c1e5 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -156,7 +156,12 @@ def raw_req(req):
             None,
             os.path.join(egg_info, 'requires.txt'),
         )
-        # Move data entries to their correct location.
+        self._move_data_entries(destination_eggdir, dist_data)
+        self._fix_namespace_packages(egg_info, destination_eggdir)
+
+    @staticmethod
+    def _move_data_entries(destination_eggdir, dist_data):
+        """Move data entries to their correct location."""
         dist_data = os.path.join(destination_eggdir, dist_data)
         dist_data_scripts = os.path.join(dist_data, 'scripts')
         if os.path.exists(dist_data_scripts):
@@ -181,7 +186,6 @@ def raw_req(req):
             unpack(subdir, destination_eggdir)
         if os.path.exists(dist_data):
             os.rmdir(dist_data)
-        self._fix_namespace_packages(egg_info, destination_eggdir)
 
     @staticmethod
     def _fix_namespace_packages(egg_info, destination_eggdir):

From 68f2ffd0bec368c31201a19b326d41dba5b81495 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:28:50 -0400
Subject: [PATCH 7041/8469] Extract _convert_metadata. install_as_egg is almost
 comprehensible now.

---
 setuptools/wheel.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index e3d807c1e5..dc03bbc8b4 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -100,11 +100,19 @@ def _install_as_egg(self, destination_eggdir, zf):
         dist_basename = '%s-%s' % (self.project_name, self.version)
         dist_info = self.get_dist_info(zf)
         dist_data = '%s.data' % dist_basename
+        egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
 
+        self._convert_metadata(zf, destination_eggdir, dist_info, egg_info)
+        self._move_data_entries(destination_eggdir, dist_data)
+        self._fix_namespace_packages(egg_info, destination_eggdir)
+
+    @staticmethod
+    def _convert_metadata(zf, destination_eggdir, dist_info, egg_info):
         def get_metadata(name):
             with zf.open(posixpath.join(dist_info, name)) as fp:
                 value = fp.read().decode('utf-8') if PY3 else fp.read()
                 return email.parser.Parser().parsestr(value)
+
         wheel_metadata = get_metadata('WHEEL')
         # Check wheel format version is supported.
         wheel_version = parse_version(wheel_metadata.get('Wheel-Version'))
@@ -139,7 +147,6 @@ def raw_req(req):
             )
             for extra in dist.extras
         }
-        egg_info = os.path.join(destination_eggdir, 'EGG-INFO')
         os.rename(dist_info, egg_info)
         os.rename(
             os.path.join(egg_info, 'METADATA'),
@@ -156,8 +163,6 @@ def raw_req(req):
             None,
             os.path.join(egg_info, 'requires.txt'),
         )
-        self._move_data_entries(destination_eggdir, dist_data)
-        self._fix_namespace_packages(egg_info, destination_eggdir)
 
     @staticmethod
     def _move_data_entries(destination_eggdir, dist_data):

From 7068f1d4c86e6d8e705a2b77da6c5dcf6a8d7bcd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:45:14 -0400
Subject: [PATCH 7042/8469] Split test into two and parameterize

---
 setuptools/tests/test_glibc.py | 67 ++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/setuptools/tests/test_glibc.py b/setuptools/tests/test_glibc.py
index 9cb9796482..0a7cac0e64 100644
--- a/setuptools/tests/test_glibc.py
+++ b/setuptools/tests/test_glibc.py
@@ -1,37 +1,50 @@
 import warnings
 
+import pytest
+
 from setuptools.glibc import check_glibc_version
 
 
+@pytest.fixture(params=[
+    "2.20",
+    # used by "linaro glibc", see gh-3588
+    "2.20-2014.11",
+    # weird possibilities that I just made up
+    "2.20+dev",
+    "2.20-custom",
+    "2.20.1",
+    ])
+def two_twenty(request):
+    return request.param
+
+
+@pytest.fixture(params=["asdf", "", "foo.bar"])
+def bad_string(request):
+    return request.param
+
+
 class TestGlibc(object):
-    def test_manylinux1_check_glibc_version(self):
+    def test_manylinux1_check_glibc_version(self, two_twenty):
         """
         Test that the check_glibc_version function is robust against weird
         glibc version strings.
         """
-        for two_twenty in ["2.20",
-                           # used by "linaro glibc", see gh-3588
-                           "2.20-2014.11",
-                           # weird possibilities that I just made up
-                           "2.20+dev",
-                           "2.20-custom",
-                           "2.20.1",
-                           ]:
-            assert check_glibc_version(two_twenty, 2, 15)
-            assert check_glibc_version(two_twenty, 2, 20)
-            assert not check_glibc_version(two_twenty, 2, 21)
-            assert not check_glibc_version(two_twenty, 3, 15)
-            assert not check_glibc_version(two_twenty, 1, 15)
-
-        # For strings that we just can't parse at all, we should warn and
-        # return false
-        for bad_string in ["asdf", "", "foo.bar"]:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.filterwarnings("always")
-                assert not check_glibc_version(bad_string, 2, 5)
-                for w in ws:
-                    if "Expected glibc version with" in str(w.message):
-                        break
-                else:
-                    # Didn't find the warning we were expecting
-                    assert False
+        assert check_glibc_version(two_twenty, 2, 15)
+        assert check_glibc_version(two_twenty, 2, 20)
+        assert not check_glibc_version(two_twenty, 2, 21)
+        assert not check_glibc_version(two_twenty, 3, 15)
+        assert not check_glibc_version(two_twenty, 1, 15)
+
+    def test_bad_versions(self, bad_string):
+        """
+        For unparseable strings, warn and return False
+        """
+        with warnings.catch_warnings(record=True) as ws:
+            warnings.filterwarnings("always")
+            assert not check_glibc_version(bad_string, 2, 5)
+            for w in ws:
+                if "Expected glibc version with" in str(w.message):
+                    break
+            else:
+                # Didn't find the warning we were expecting
+                assert False

From cca86c7f1d4040834c3265ccecdd9e21b4036df5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:50:25 -0400
Subject: [PATCH 7043/8469] Use Python 3 syntax for new-style clasess

---
 pkg_resources/__init__.py                 | 11 +++++++----
 pkg_resources/tests/test_pkg_resources.py |  8 +++++---
 pkg_resources/tests/test_working_set.py   |  4 +++-
 setuptools/__init__.py                    |  4 +++-
 setuptools/command/develop.py             |  4 +++-
 setuptools/command/easy_install.py        |  4 +++-
 setuptools/command/test.py                |  4 +++-
 setuptools/config.py                      |  5 ++++-
 setuptools/package_index.py               |  6 ++++--
 setuptools/py31compat.py                  |  5 ++++-
 setuptools/py33compat.py                  |  3 ++-
 setuptools/tests/test_build_meta.py       |  4 +++-
 setuptools/tests/test_easy_install.py     |  4 +++-
 setuptools/tests/test_egg_info.py         |  6 ++++--
 setuptools/tests/test_glibc.py            |  4 +++-
 setuptools/tests/test_manifest.py         |  4 +++-
 setuptools/tests/test_pep425tags.py       |  6 ++++--
 setuptools/tests/test_wheel.py            |  4 +++-
 setuptools/wheel.py                       |  5 ++++-
 19 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 91d00483b1..6701540819 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -78,6 +78,9 @@
 __import__('pkg_resources.extern.packaging.markers')
 
 
+__metaclass__ = type
+
+
 if (3, 0) < sys.version_info < (3, 4):
     raise RuntimeError("Python 3.4 or later is required")
 
@@ -537,7 +540,7 @@ def resource_listdir(resource_name):
         """List of resource names in the directory (like ``os.listdir()``)"""
 
 
-class WorkingSet(object):
+class WorkingSet:
     """A collection of active distributions on sys.path (or a similar list)"""
 
     def __init__(self, entries=None):
@@ -944,7 +947,7 @@ def markers_pass(self, req, extras=None):
         return not req.marker or any(extra_evals)
 
 
-class Environment(object):
+class Environment:
     """Searchable snapshot of distributions on a search path"""
 
     def __init__(
@@ -2279,7 +2282,7 @@ def yield_lines(strs):
 ).match
 
 
-class EntryPoint(object):
+class EntryPoint:
     """Object representing an advertised importable object"""
 
     def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
@@ -2433,7 +2436,7 @@ def is_version_line(line):
     return safe_version(value.strip()) or None
 
 
-class Distribution(object):
+class Distribution:
     """Wrap an actual or potential sys.path entry w/metadata"""
     PKG_INFO = 'PKG-INFO'
 
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 7442b79f74..079e83f840 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -23,6 +23,8 @@
 except NameError:
     unicode = str
 
+__metaclass__ = type
+
 
 def timestamp(dt):
     """
@@ -43,7 +45,7 @@ def __call__(self):
             os.remove(self)
 
 
-class TestZipProvider(object):
+class TestZipProvider:
     finalizers = []
 
     ref_time = datetime.datetime(2013, 5, 12, 13, 25, 0)
@@ -132,7 +134,7 @@ def test_resource_filename_rewrites_on_change(self):
         manager.cleanup_resources()
 
 
-class TestResourceManager(object):
+class TestResourceManager:
     def test_get_cache_path(self):
         mgr = pkg_resources.ResourceManager()
         path = mgr.get_cache_path('foo')
@@ -163,7 +165,7 @@ def test_setuptools_not_imported(self):
         subprocess.check_call(cmd)
 
 
-class TestDeepVersionLookupDistutils(object):
+class TestDeepVersionLookupDistutils:
     @pytest.fixture
     def env(self, tmpdir):
         """
diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
index 42ddcc86f2..217edd8be7 100644
--- a/pkg_resources/tests/test_working_set.py
+++ b/pkg_resources/tests/test_working_set.py
@@ -9,6 +9,8 @@
 
 from .test_resources import Metadata
 
+__metaclass__ = type
+
 
 def strip_comments(s):
     return '\n'.join(
@@ -54,7 +56,7 @@ def parse_distributions(s):
         yield dist
 
 
-class FakeInstaller(object):
+class FakeInstaller:
 
     def __init__(self, installable_dists):
         self._installable_dists = installable_dists
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 7da47fbed5..ce55ec351d 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -15,6 +15,8 @@
 from setuptools.depends import Require
 from . import monkey
 
+__metaclass__ = type
+
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages',
@@ -31,7 +33,7 @@
 lib2to3_fixer_packages = ['lib2to3.fixes']
 
 
-class PackageFinder(object):
+class PackageFinder:
     """
     Generate a list of all Python packages found within a directory
     """
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 959c932a5c..fdc9fc432b 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -12,6 +12,8 @@
 from setuptools import namespaces
 import setuptools
 
+__metaclass__ = type
+
 
 class develop(namespaces.DevelopInstaller, easy_install):
     """Set up package for development"""
@@ -192,7 +194,7 @@ def install_wrapper_scripts(self, dist):
         return easy_install.install_wrapper_scripts(self, dist)
 
 
-class VersionlessRequirement(object):
+class VersionlessRequirement:
     """
     Adapt a pkg_resources.Distribution to simply return the project
     name as the 'requirement' so that scripts will work across
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a059a0bdd1..05508cebe1 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -63,6 +63,8 @@
 )
 import pkg_resources.py31compat
 
+__metaclass__ = type
+
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
@@ -2050,7 +2052,7 @@ class WindowsCommandSpec(CommandSpec):
     split_args = dict(posix=False)
 
 
-class ScriptWriter(object):
+class ScriptWriter:
     """
     Encapsulates behavior around writing entry point scripts for console and
     gui apps.
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 51aee1f7b1..dde0118c90 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -16,6 +16,8 @@
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
 
+__metaclass__ = type
+
 
 class ScanningLoader(TestLoader):
 
@@ -58,7 +60,7 @@ def loadTestsFromModule(self, module, pattern=None):
 
 
 # adapted from jaraco.classes.properties:NonDataProperty
-class NonDataProperty(object):
+class NonDataProperty:
     def __init__(self, fget):
         self.fget = fget
 
diff --git a/setuptools/config.py b/setuptools/config.py
index d3f0b123d5..5f908cf129 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -11,6 +11,9 @@
 from setuptools.extern.six import string_types
 
 
+__metaclass__ = type
+
+
 def read_configuration(
         filepath, find_others=False, ignore_option_errors=False):
     """Read given configuration file and returns options from it as a dict.
@@ -113,7 +116,7 @@ def parse_configuration(
     return meta, options
 
 
-class ConfigHandler(object):
+class ConfigHandler:
     """Handles metadata supplied in configuration files."""
 
     section_prefix = None
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index b6407be304..ed4162cd40 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -26,6 +26,8 @@
 from setuptools.py33compat import unescape
 from setuptools.wheel import Wheel
 
+__metaclass__ = type
+
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
@@ -235,7 +237,7 @@ def find_external_links(url, page):
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
 
-class ContentChecker(object):
+class ContentChecker:
     """
     A null content checker that defines the interface for checking content
     """
@@ -980,7 +982,7 @@ def _encode_auth(auth):
     return encoded.replace('\n', '')
 
 
-class Credential(object):
+class Credential:
     """
     A username/password pair. Use like a namedtuple.
     """
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 3aecf74e93..1a0705ece3 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -1,5 +1,8 @@
 __all__ = []
 
+__metaclass__ = type
+
+
 try:
     # Python >=3.2
     from tempfile import TemporaryDirectory
@@ -7,7 +10,7 @@
     import shutil
     import tempfile
 
-    class TemporaryDirectory(object):
+    class TemporaryDirectory:
         """
         Very simple temporary directory context manager.
         Will try to delete afterward, but will also ignore OS and similar
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 2a73ebb3c7..87cf53983c 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -10,11 +10,12 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import html_parser
 
+__metaclass__ = type
 
 OpArg = collections.namedtuple('OpArg', 'opcode arg')
 
 
-class Bytecode_compat(object):
+class Bytecode_compat:
     def __init__(self, code):
         self.code = code
 
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 659c1a6587..b39b7b8f90 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -5,12 +5,14 @@
 from .files import build_files
 from .textwrap import DALS
 
+__metaclass__ = type
+
 
 futures = pytest.importorskip('concurrent.futures')
 importlib = pytest.importorskip('importlib')
 
 
-class BuildBackendBase(object):
+class BuildBackendBase:
     def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
         self.cwd = cwd
         self.env = env
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3fc7fdaf30..345d283c31 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -36,8 +36,10 @@
 from . import contexts
 from .textwrap import DALS
 
+__metaclass__ = type
 
-class FakeDist(object):
+
+class FakeDist:
     def get_entry_map(self, group):
         if group != 'console_scripts':
             return {}
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a70a93a8a7..1a100266ea 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -16,12 +16,14 @@
 from .textwrap import DALS
 from . import contexts
 
+__metaclass__ = type
+
 
 class Environment(str):
     pass
 
 
-class TestEggInfo(object):
+class TestEggInfo:
 
     setup_script = DALS("""
         from setuptools import setup
@@ -181,7 +183,7 @@ def _setup_script_with_requires(self, requires, use_setup_cfg=False):
     )
     invalid_marker = "<=>++"
 
-    class RequiresTestHelper(object):
+    class RequiresTestHelper:
 
         @staticmethod
         def parametrize(*test_list, **format_dict):
diff --git a/setuptools/tests/test_glibc.py b/setuptools/tests/test_glibc.py
index 0a7cac0e64..795fdc5665 100644
--- a/setuptools/tests/test_glibc.py
+++ b/setuptools/tests/test_glibc.py
@@ -4,6 +4,8 @@
 
 from setuptools.glibc import check_glibc_version
 
+__metaclass__ = type
+
 
 @pytest.fixture(params=[
     "2.20",
@@ -23,7 +25,7 @@ def bad_string(request):
     return request.param
 
 
-class TestGlibc(object):
+class TestGlibc:
     def test_manylinux1_check_glibc_version(self, two_twenty):
         """
         Test that the check_glibc_version function is robust against weird
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 65eec7d93f..c9533dda9f 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -18,6 +18,8 @@
 
 import pytest
 
+__metaclass__ = type
+
 py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
 
 
@@ -157,7 +159,7 @@ def test_translated_pattern_mismatch(pattern_mismatch):
     assert not translate_pattern(pattern).match(target)
 
 
-class TempDirTestCase(object):
+class TempDirTestCase:
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
         self.old_cwd = os.getcwd()
diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
index 0f60e0ede4..658784ac95 100644
--- a/setuptools/tests/test_pep425tags.py
+++ b/setuptools/tests/test_pep425tags.py
@@ -4,8 +4,10 @@
 
 from setuptools import pep425tags
 
+__metaclass__ = type
 
-class TestPEP425Tags(object):
+
+class TestPEP425Tags:
 
     def mock_get_config_var(self, **kwd):
         """
@@ -104,7 +106,7 @@ def test_manual_abi_dm_flags(self):
         self.abi_tag_unicode('dm', {'Py_DEBUG': True, 'WITH_PYMALLOC': True})
 
 
-class TestManylinux1Tags(object):
+class TestManylinux1Tags:
 
     @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
     @patch('setuptools.glibc.have_compatible_glibc',
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index cf6508686d..6db5fa117e 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -24,6 +24,8 @@
 from .files import build_files
 from .textwrap import DALS
 
+__metaclass__ = type
+
 
 WHEEL_INFO_TESTS = (
     ('invalid.whl', ValueError),
@@ -148,7 +150,7 @@ def _check_wheel_install(filename, install_dir, install_tree_includes,
         assert requires_txt == dist.get_metadata('requires.txt').lstrip()
 
 
-class Record(object):
+class Record:
 
     def __init__(self, id, **kwargs):
         self._id = id
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index dc03bbc8b4..95a794a853 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -16,6 +16,9 @@
 from setuptools.command.egg_info import write_requirements
 
 
+__metaclass__ = type
+
+
 WHEEL_NAME = re.compile(
     r"""^(?P<project_name>.+?)-(?P<version>\d.*?)
     ((-(?P<build>\d.*?))?-(?P<py_version>.+?)-(?P<abi>.+?)-(?P<platform>.+?)
@@ -52,7 +55,7 @@ def unpack(src_dir, dst_dir):
         os.rmdir(dirpath)
 
 
-class Wheel(object):
+class Wheel:
 
     def __init__(self, filename):
         match = WHEEL_NAME(os.path.basename(filename))

From 08d20c8d43dcda7a79efca0434185102fe6dc9bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 09:52:49 -0400
Subject: [PATCH 7044/8469] Use raw strings for regular expressions

---
 pkg_resources/tests/test_working_set.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
index 217edd8be7..b3ca4ea8e4 100644
--- a/pkg_resources/tests/test_working_set.py
+++ b/pkg_resources/tests/test_working_set.py
@@ -39,7 +39,7 @@ def parse_distributions(s):
           requires=['foo>=3.0', 'baz; extra=="feature"']
     '''
     s = s.strip()
-    for spec in re.split('\n(?=[^\s])', s):
+    for spec in re.split(r'\n(?=[^\s])', s):
         if not spec:
             continue
         fields = spec.split('\n', 1)
@@ -89,7 +89,7 @@ def parametrize_test_working_set_resolve(*test_list):
         ):
             idlist.append(id_)
             expected = strip_comments(expected.strip())
-            if re.match('\w+$', expected):
+            if re.match(r'\w+$', expected):
                 expected = getattr(pkg_resources, expected)
                 assert issubclass(expected, Exception)
             else:

From 3174f82b943f53e04ad7a5a6b2aa67ca2b2d44c5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 10:05:20 -0400
Subject: [PATCH 7045/8469] Use raw strings for regexes

---
 setuptools/package_index.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ed4162cd40..9bf0421fa7 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -29,11 +29,11 @@
 __metaclass__ = type
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
-HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
+HREF = re.compile(r"""href\s*=\s*['"]?([^'"> ]+)""", re.I)
 # this is here to fix emacs' cruddy broken syntax highlighting
 PYPI_MD5 = re.compile(
-    '<a href="([^"#]+)">([^<]+)</a>\n\\s+\\(<a (?:title="MD5 hash"\n\\s+)'
-    'href="[^?]+\\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\\)'
+    r'<a href="([^"#]+)">([^<]+)</a>\n\s+\(<a (?:title="MD5 hash"\n\s+)'
+    r'href="[^?]+\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\)'
 )
 URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):', re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()

From 9f379bbf78fcc1af1714c4a6c6f2afe172e0ed05 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 10:06:10 -0400
Subject: [PATCH 7046/8469] Remove stale comment, added in 8cc0d5c2 and made
 meaningless in 26eee297.

---
 setuptools/package_index.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 9bf0421fa7..619649b909 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -30,7 +30,6 @@
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile(r"""href\s*=\s*['"]?([^'"> ]+)""", re.I)
-# this is here to fix emacs' cruddy broken syntax highlighting
 PYPI_MD5 = re.compile(
     r'<a href="([^"#]+)">([^<]+)</a>\n\s+\(<a (?:title="MD5 hash"\n\s+)'
     r'href="[^?]+\?:action=show_md5&amp;digest=([0-9a-f]{32})">md5</a>\)'

From c2262d9fe4eaac507ff128ae60b6682e8d132e4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Jun 2018 10:20:34 -0400
Subject: [PATCH 7047/8469] Use text_type and string_types from six

---
 pkg_resources/tests/test_pkg_resources.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 079e83f840..4e2cac9459 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -13,16 +13,12 @@
 import distutils.command.install_egg_info
 
 from pkg_resources.extern.six.moves import map
+from pkg_resources.extern.six import text_type, string_types
 
 import pytest
 
 import pkg_resources
 
-try:
-    unicode
-except NameError:
-    unicode = str
-
 __metaclass__ = type
 
 
@@ -37,7 +33,7 @@ def timestamp(dt):
         return time.mktime(dt.timetuple())
 
 
-class EggRemover(unicode):
+class EggRemover(text_type):
     def __call__(self):
         if self in sys.path:
             sys.path.remove(self)
@@ -140,7 +136,7 @@ def test_get_cache_path(self):
         path = mgr.get_cache_path('foo')
         type_ = str(type(path))
         message = "Unexpected type from get_cache_path: " + type_
-        assert isinstance(path, (unicode, str)), message
+        assert isinstance(path, string_types), message
 
 
 class TestIndependence:

From 95880b3ebbd61367d2c4b3409e7789e1893c2d79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 4 Jun 2018 21:16:43 -0400
Subject: [PATCH 7048/8469] Add test and adjust match. Fixes #1366.

---
 setuptools/package_index.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 619649b909..cda54b7171 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -934,12 +934,19 @@ def warn(self, msg, *args):
 
 
 def decode_entity(match):
-    what = match.group(1)
+    what = match.group(0)
     return unescape(what)
 
 
 def htmldecode(text):
-    """Decode HTML entities in the given text."""
+    """
+    Decode HTML entities in the given text.
+
+    >>> htmldecode(
+    ...     'https://../package_name-0.1.2.tar.gz'
+    ...     '?tokena=A&amp;tokenb=B">package_name-0.1.2.tar.gz')
+    'https://../package_name-0.1.2.tar.gz?tokena=A&tokenb=B">package_name-0.1.2.tar.gz'
+    """
     return entity_sub(decode_entity, text)
 
 

From 20e50f6365c54cee1b7c558106e7ee0ed048825f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:26:08 -0400
Subject: [PATCH 7049/8469] Update changelog. Ref #1366.

---
 changelog.d/1366.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1366.change.rst

diff --git a/changelog.d/1366.change.rst b/changelog.d/1366.change.rst
new file mode 100644
index 0000000000..f70e2a2e8a
--- /dev/null
+++ b/changelog.d/1366.change.rst
@@ -0,0 +1 @@
+In package_index, fixed handling of encoded entities in URLs.

From 5ceaa6d1ee1f21aed3d08e0026590174778de2b5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:32:21 -0400
Subject: [PATCH 7050/8469] Configure doctests to match Python 2 unicode
 literal syntax.

---
 pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pytest.ini b/pytest.ini
index 16fdc5af87..20c952fa8a 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,3 +4,4 @@ norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811
+doctest_optionflags=ALLOW_UNICODE

From 65699525394a9cd70bbdcf292f59a557f86e65ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:37:40 -0400
Subject: [PATCH 7051/8469] Apparently when specifying any doctest_optionflags,
 it's necessary to also indicate the defaults. Add ELLIPSIS to fix other
 failing tests.

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 20c952fa8a..6ec3be8838 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,4 +4,4 @@ norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811
-doctest_optionflags=ALLOW_UNICODE
+doctest_optionflags=ELLIPSIS ALLOW_UNICODE

From 445d38472d3dc2fd004b02d645e7eadcf26fbc30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:38:07 -0400
Subject: [PATCH 7052/8469] Move ignores into conftest.py

---
 conftest.py | 12 ++++++++++++
 pytest.ini  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index 3cccfe1abd..13dc709a11 100644
--- a/conftest.py
+++ b/conftest.py
@@ -6,3 +6,15 @@ def pytest_addoption(parser):
         "--package_name", action="append", default=[],
         help="list of package_name to pass to test functions",
     )
+
+
+collect_ignore = [
+    'release.py',
+    'setuptools/lib2to3_ex.py',
+    'tests/manual_test.py',
+    'tests/test_pypi.py',
+    'tests/shlib_test',
+    'scripts/upload-old-releases-as-zip.py',
+    'pavement.py',
+    'setuptools/tests/mod_with_constant.py',
+]
diff --git a/pytest.ini b/pytest.ini
index 6ec3be8838..1c5b6b0934 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py -rsxX
+addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -rsxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821

From 992293d1aa03ad3e7258f51bdbb385ace4035737 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:41:36 -0400
Subject: [PATCH 7053/8469] Remove crufty ignores

---
 conftest.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conftest.py b/conftest.py
index 13dc709a11..abb79f1b4a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -9,12 +9,9 @@ def pytest_addoption(parser):
 
 
 collect_ignore = [
-    'release.py',
     'setuptools/lib2to3_ex.py',
     'tests/manual_test.py',
     'tests/test_pypi.py',
-    'tests/shlib_test',
-    'scripts/upload-old-releases-as-zip.py',
     'pavement.py',
     'setuptools/tests/mod_with_constant.py',
 ]

From 0a39f8e47944ef416fdd276ec91a3be464fa8a2e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:45:42 -0400
Subject: [PATCH 7054/8469] Only ignore collection on older Pythons

---
 conftest.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index abb79f1b4a..5bebe21aa0 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,3 +1,6 @@
+import sys
+
+
 pytest_plugins = 'setuptools.tests.fixtures'
 
 
@@ -9,9 +12,12 @@ def pytest_addoption(parser):
 
 
 collect_ignore = [
-    'setuptools/lib2to3_ex.py',
     'tests/manual_test.py',
     'tests/test_pypi.py',
     'pavement.py',
     'setuptools/tests/mod_with_constant.py',
 ]
+
+
+if sys.version_info < (3,):
+    collect_ignore.append('setuptools/lib2to3_ex.py')

From 042aab8230fe156e6d28d448aa669184e34342d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:46:15 -0400
Subject: [PATCH 7055/8469] Feed the hobgoblins (delint).

---
 tests/manual_test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/manual_test.py b/tests/manual_test.py
index e5aaf179c6..52295f9a56 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -89,8 +89,10 @@ def test_full():
     assert len(eggs) == 3
     assert eggs[1].startswith('setuptools')
     del eggs[1]
-    assert eggs == ['extensions-0.3-py2.6.egg',
-        'zc.recipe.egg-1.2.2-py2.6.egg']
+    assert eggs == [
+        'extensions-0.3-py2.6.egg',
+        'zc.recipe.egg-1.2.2-py2.6.egg',
+    ]
 
 
 if __name__ == '__main__':

From 9832db367961e9215a1c55703dcbe47b339ca409 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:53:57 -0400
Subject: [PATCH 7056/8469] Remove crufty, ignored test.

---
 conftest.py        |  1 -
 tests/test_pypi.py | 82 ----------------------------------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 tests/test_pypi.py

diff --git a/conftest.py b/conftest.py
index 5bebe21aa0..d966d68dff 100644
--- a/conftest.py
+++ b/conftest.py
@@ -13,7 +13,6 @@ def pytest_addoption(parser):
 
 collect_ignore = [
     'tests/manual_test.py',
-    'tests/test_pypi.py',
     'pavement.py',
     'setuptools/tests/mod_with_constant.py',
 ]
diff --git a/tests/test_pypi.py b/tests/test_pypi.py
deleted file mode 100644
index b3425e53bc..0000000000
--- a/tests/test_pypi.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import os
-import subprocess
-
-import virtualenv
-from setuptools.extern.six.moves import http_client
-from setuptools.extern.six.moves import xmlrpc_client
-
-TOP = 200
-PYPI_HOSTNAME = 'pypi.python.org'
-
-
-def rpc_pypi(method, *args):
-    """Call an XML-RPC method on the Pypi server."""
-    conn = http_client.HTTPSConnection(PYPI_HOSTNAME)
-    headers = {'Content-Type': 'text/xml'}
-    payload = xmlrpc_client.dumps(args, method)
-
-    conn.request("POST", "/pypi", payload, headers)
-    response = conn.getresponse()
-    if response.status == 200:
-        result = xmlrpc_client.loads(response.read())[0][0]
-        return result
-    else:
-        raise RuntimeError("Unable to download the list of top "
-                           "packages from Pypi.")
-
-
-def get_top_packages(limit):
-    """Collect the name of the top packages on Pypi."""
-    packages = rpc_pypi('top_packages')
-    return packages[:limit]
-
-
-def _package_install(package_name, tmp_dir=None, local_setuptools=True):
-    """Try to install a package and return the exit status.
-
-    This function creates a virtual environment, install setuptools using pip
-    and then install the required package. If local_setuptools is True, it
-    will install the local version of setuptools.
-    """
-    package_dir = os.path.join(tmp_dir, "test_%s" % package_name)
-    if not local_setuptools:
-        package_dir = package_dir + "_baseline"
-
-    virtualenv.create_environment(package_dir)
-
-    pip_path = os.path.join(package_dir, "bin", "pip")
-    if local_setuptools:
-        subprocess.check_call([pip_path, "install", "."])
-    returncode = subprocess.call([pip_path, "install", package_name])
-    return returncode
-
-
-def test_package_install(package_name, tmpdir):
-    """Test to verify the outcome of installing a package.
-
-    This test compare that the return code when installing a package is the
-    same as with the current stable version of setuptools.
-    """
-    new_exit_status = _package_install(package_name, tmp_dir=str(tmpdir))
-    if new_exit_status:
-        print("Installation failed, testing against stable setuptools",
-              package_name)
-        old_exit_status = _package_install(package_name, tmp_dir=str(tmpdir),
-                                           local_setuptools=False)
-        assert new_exit_status == old_exit_status
-
-
-def pytest_generate_tests(metafunc):
-    """Generator function for test_package_install.
-
-    This function will generate calls to test_package_install. If a package
-    list has been specified on the command line, it will be used. Otherwise,
-    Pypi will be queried to get the current list of top packages.
-    """
-    if "package_name" in metafunc.fixturenames:
-        if not metafunc.config.option.package_name:
-            packages = get_top_packages(TOP)
-            packages = [name for name, downloads in packages]
-        else:
-            packages = metafunc.config.option.package_name
-        metafunc.parametrize("package_name", packages)

From 3e3b9f7968fbe47b8e7038d1b1767676daecfaca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 08:57:21 -0400
Subject: [PATCH 7057/8469] Include pavement.py in tests (where applicable).

---
 conftest.py            | 5 ++++-
 tests/requirements.txt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index d966d68dff..0d7b274c07 100644
--- a/conftest.py
+++ b/conftest.py
@@ -13,10 +13,13 @@ def pytest_addoption(parser):
 
 collect_ignore = [
     'tests/manual_test.py',
-    'pavement.py',
     'setuptools/tests/mod_with_constant.py',
 ]
 
 
 if sys.version_info < (3,):
     collect_ignore.append('setuptools/lib2to3_ex.py')
+
+
+if sys.version_info < (3, 6):
+    collect_ignore.append('pavement.py')
diff --git a/tests/requirements.txt b/tests/requirements.txt
index aff32c10ea..a8cde39547 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -8,3 +8,4 @@ pytest>=3.0.2
 wheel
 coverage>=4.5.1
 pytest-cov>=2.5.1
+paver; python_version>="3.6"

From 30d376e84c5c13df4e83b66343a7bda6a8022aa2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 09:06:52 -0400
Subject: [PATCH 7058/8469] Remove references to Python 3.3 and 2.6.

---
 tests/requirements.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index a8cde39547..af16fc477c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,7 +1,6 @@
-importlib; python_version<"2.7"
 mock
-pytest-flake8<=1.0.0; python_version>="3.3" and python_version<"3.5"
-pytest-flake8; python_version>="2.7" and python_version!="3.3" and python_version!="3.4"
+pytest-flake8<=1.0.0; python_version>="3.4" and python_version<"3.5"
+pytest-flake8; python_version>="2.7" and python_version!="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2

From 6894478f878b4b579ae8a40e81fa002ad31f63b9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 6 Jun 2018 09:07:36 -0400
Subject: [PATCH 7059/8469] More directly address the Python 3.4 compatibility.

---
 tests/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index af16fc477c..b38fcbf06e 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,6 @@
 mock
-pytest-flake8<=1.0.0; python_version>="3.4" and python_version<"3.5"
-pytest-flake8; python_version>="2.7" and python_version!="3.4"
+pytest-flake8; python_version!="3.4"
+pytest-flake8<=1.0.0; python_version=="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2

From c13fcfd43f5ce16a2fb4930622293395a494004f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 14 Jun 2018 08:30:15 -0400
Subject: [PATCH 7060/8469] Update roadmap

---
 docs/roadmap.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 8f175b9f75..9bde49360a 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -2,5 +2,9 @@
 Roadmap
 =======
 
-Setuptools is primarily in maintenance mode. The project attempts to address
-user issues, concerns, and feature requests in a timely fashion.
+Setuptools has the following large-scale goals on the roadmap:
+
+- Harmonize declarative config with pyproject.toml syntax.
+- Deprecate and remove setup_requires and easy_install in
+  favor of PEP 518 build requirements and pip install.
+- Adopt the Distutils package and stop monkeypatching stdlib.

From 313d0da028a2f47b3ac2fac62e12d4103bcdccf0 Mon Sep 17 00:00:00 2001
From: "Michael A. Smith" <michaels@syapse.com>
Date: Thu, 21 Jun 2018 14:54:38 -0400
Subject: [PATCH 7061/8469] Fix Town Crier Link

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 6b04603b16..8a967f6cfb 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -66,7 +66,7 @@ and a reference to any issue tickets that the PR is intended to solve.
 All PRs with code changes should include tests. All changes should include a
 changelog entry.
 
-``setuptools`` uses `towncrier <https://town-crier.readthedocs.io/en/latest/>`_
+``setuptools`` uses `towncrier <https://pypi.org/project/towncrier/>`_
 for changelog managment, so when making a PR, please add a news fragment in the
 ``changelog.d/`` folder. Changelog files are written in Restructured Text and
 should be a 1 or 2 sentence description of the substantive changes in the PR.

From d8bd6dde9378c58daf71bf88d805ae0d4b5e03dc Mon Sep 17 00:00:00 2001
From: wim glenn <wim.glenn@gmail.com>
Date: Mon, 25 Jun 2018 12:42:00 -0500
Subject: [PATCH 7062/8469] Avoid resource warning from dev scripts installed
 editable

Avoid ` ResourceWarning: unclosed file <_io.TextIOWrapper name='whatever' mode='r' encoding='UTF-8'>` on dev scripts installed editable
---
 setuptools/script (dev).tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/script (dev).tmpl b/setuptools/script (dev).tmpl
index d58b1bb5bf..39a24b0488 100644
--- a/setuptools/script (dev).tmpl	
+++ b/setuptools/script (dev).tmpl	
@@ -2,4 +2,5 @@
 __requires__ = %(spec)r
 __import__('pkg_resources').require(%(spec)r)
 __file__ = %(dev_path)r
-exec(compile(open(__file__).read(), __file__, 'exec'))
+with open(__file__) as f:
+    exec(compile(f.read(), __file__, 'exec'))

From 776096522af8d8320b879571ded2b1c43242c0da Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Wed, 27 Jun 2018 21:32:11 +0300
Subject: [PATCH 7063/8469] always process module.__path__ for namespace
 packages, fixes #1321

---
 pkg_resources/__init__.py           | 11 +++++-----
 setuptools/tests/test_namespaces.py | 31 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6701540819..d642a405f4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2135,12 +2135,13 @@ def position_in_sys_path(path):
         parts = path_parts[:-module_parts]
         return safe_sys_path_index(_normalize_cached(os.sep.join(parts)))
 
-    if not isinstance(orig_path, list):
-        # Is this behavior useful when module.__path__ is not a list?
-        return
+    new_path = sorted(orig_path, key=position_in_sys_path)
+    new_path = [_normalize_cached(p) for p in new_path]
 
-    orig_path.sort(key=position_in_sys_path)
-    module.__path__[:] = [_normalize_cached(p) for p in orig_path]
+    if isinstance(module.__path__, list):
+        module.__path__[:] = new_path
+    else:
+        module.__path__ = new_path
 
 
 def declare_namespace(packageName):
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 1ac1b35e8b..00ec75b45d 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -109,3 +109,34 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A))
+
+    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
+        reason="https://github.com/pypa/setuptools/issues/851")
+    def test_packages_in_the_sampe_namespace_installed_and_cwd(self, tmpdir):
+        """
+        Installing one namespace package and also have another in the same
+        namespace in the current working directory, both of them must be
+        importable.
+        """
+        pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
+        pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB')
+        target = tmpdir / 'packages'
+        # use pip to install to the target directory
+        install_cmd = [
+            sys.executable,
+            '-m',
+            'pip.__main__',
+            'install',
+            str(pkg_A),
+            '-t', str(target),
+        ]
+        subprocess.check_call(install_cmd)
+        namespaces.make_site_dir(target)
+
+        # ensure that all packages import and pkg_resources imports
+        pkg_resources_imp = [
+            sys.executable,
+            '-c', 'import pkg_resources; import myns.pkgA; import myns.pkgB',
+        ]
+        with test.test.paths_on_pythonpath([str(target)]):
+            subprocess.check_call(pkg_resources_imp, cwd=str(pkg_B))

From ecae51daeff22edcbbab38016d118778add14d33 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Wed, 27 Jun 2018 21:44:13 +0300
Subject: [PATCH 7064/8469] added changelog.d entry

---
 changelog.d/1402.change.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/1402.change.rst

diff --git a/changelog.d/1402.change.rst b/changelog.d/1402.change.rst
new file mode 100644
index 0000000000..5a68ac9ddf
--- /dev/null
+++ b/changelog.d/1402.change.rst
@@ -0,0 +1,2 @@
+Fixed a bug with namespace packages under python-3.6 when one package in
+current directory hides another which is installed.

From eda87a7558908bafb38268e3e08a737beff1fa8f Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 20 Jun 2018 14:25:16 +0200
Subject: [PATCH 7065/8469] docs: fix developer guide

Drop `Source Code` section, as it contains an outdated guideline
with respect to documenting changes and its contents are already
covered by other sections.
---
 changelog.d/1403.doc.rst |  1 +
 docs/developer-guide.txt | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 create mode 100644 changelog.d/1403.doc.rst

diff --git a/changelog.d/1403.doc.rst b/changelog.d/1403.doc.rst
new file mode 100644
index 0000000000..1a636085a1
--- /dev/null
+++ b/changelog.d/1403.doc.rst
@@ -0,0 +1 @@
+Fix developer's guide.
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 8a967f6cfb..c011491a30 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -89,31 +89,6 @@ code changes. See the following for an example news fragment:
     $ cat changelog.d/1288.change.rst
     Add support for maintainer in PKG-INFO
 
------------
-Source Code
------------
-
-Grab the code at Github::
-
-    $ git clone https://github.com/pypa/setuptools
-
-If you want to contribute changes, we recommend you fork the repository on
-Github, commit the changes to your repository, and then make a pull request
-on Github. If you make some changes, don't forget to:
-
-- add a note in CHANGES.rst
-
-Please commit all changes in the 'master' branch against the latest available
-commit or for bug-fixes, against an earlier commit or release in which the
-bug occurred.
-
-If you find yourself working on more than one issue at a time, Setuptools
-generally prefers Git-style branches, so use Mercurial bookmarks or Git
-branches or multiple forks to maintain separate efforts.
-
-The Continuous Integration tests that validate every release are run
-from this repository.
-
 -------
 Testing
 -------

From b32fcfa56d22c68350edbae25fb31fd17efd06a3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 28 Jun 2018 13:10:15 +0200
Subject: [PATCH 7066/8469] changes: fix typo

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 156ba47d51..d52ed48fca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -19,7 +19,7 @@ v39.2.0
   after any ``distutils`` ``setup_keywords`` calls, allowing them to override
   values.
 * #1352: Added ``tox`` environment for documentation builds.
-* #1354: Added ``towncrier`` for changelog managment.
+* #1354: Added ``towncrier`` for changelog management.
 * #1355: Add PR template.
 * #1368: Fixed tests which failed without network connectivity.
 * #1369: Added unit tests for PEP 425 compatibility tags support.

From 601f82e57247edf8505696304fbc7a3da4013cfc Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 28 Jun 2018 13:19:38 +0200
Subject: [PATCH 7067/8469] fix PEP 518 configuration

Add `build-system.requires` key to `pyproject.toml`:
- this is necessary with pip 10.0.1, as otherwise the defaults will be
  to require both `setuptools` and `wheel` (and we only need the later)
- a `pyproject.toml` with no `build-system.requires` key will be invalid
  and rejected by a future version of pip
  (see https://github.com/pypa/pip/issues/5416#issuecomment-399638608)
---
 changelog.d/1404.misc.rst | 1 +
 pyproject.toml            | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/1404.misc.rst

diff --git a/changelog.d/1404.misc.rst b/changelog.d/1404.misc.rst
new file mode 100644
index 0000000000..2d4bd629fb
--- /dev/null
+++ b/changelog.d/1404.misc.rst
@@ -0,0 +1 @@
+Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
diff --git a/pyproject.toml b/pyproject.toml
index cffd0e9afd..07c23bb5f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,6 @@
+[build-system]
+requires = ["wheel"]
+
 [tool.towncrier]
     package = "setuptools"
     package_dir = "setuptools"

From d8f8de7f46979736e0e1aab3343d4f7a29e2e0c2 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Wed, 4 Jul 2018 10:03:37 -0400
Subject: [PATCH 7068/8469] Add tests for find_packages_ns()

---
 setuptools/tests/test_find_packages.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index a6023de9d5..02ae5a946d 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -7,14 +7,15 @@
 
 import pytest
 
-import setuptools
+from setuptools.extern.six import PY3
 from setuptools import find_packages
 
-find_420_packages = setuptools.PEP420PackageFinder.find
+py3_only = pytest.mark.xfail(not PY3, reason="Test runs on Python 3 only")
+if PY3:
+  from setuptools import find_packages_ns
 
 # modeled after CPython's test.support.can_symlink
 
-
 def can_symlink():
     TESTFN = tempfile.mktemp()
     symlink_path = TESTFN + "can_symlink"
@@ -153,30 +154,35 @@ def test_symlinked_packages_are_included(self):
     def _assert_packages(self, actual, expected):
         assert set(actual) == set(expected)
 
+    @py3_only
     def test_pep420_ns_package(self):
-        packages = find_420_packages(
+        packages = find_packages_ns(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
+    @py3_only
     def test_pep420_ns_package_no_includes(self):
-        packages = find_420_packages(
+        packages = find_packages_ns(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
+    @py3_only
     def test_pep420_ns_package_no_includes_or_excludes(self):
-        packages = find_420_packages(self.dist_dir)
-        expected = [
-            'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
+        packages = find_packages_ns(self.dist_dir)
+        expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self._assert_packages(packages, expected)
 
+    @py3_only
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
-        packages = find_420_packages(
+        packages = find_packages_ns(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
+    @py3_only
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
-        packages = find_420_packages(self.dist_dir)
+        packages = find_packages_ns(self.dist_dir)
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
+

From 2b7a2dd7bfd7d742c8816d45150b9e495f5970f8 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Wed, 4 Jul 2018 10:04:01 -0400
Subject: [PATCH 7069/8469] Add find_packages_ns()

This fixes GH #97 by introducing an alternate version of find_packages
that works with PEP 420 namespace packages.
---
 setuptools/__init__.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ce55ec351d..e705f0d1af 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,12 +1,14 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
+import sys
 import functools
 import distutils.core
 import distutils.filelist
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
+from setuptools.extern.six import PY3
 from setuptools.extern.six.moves import filter, map
 
 import setuptools.version
@@ -17,11 +19,15 @@
 
 __metaclass__ = type
 
+
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
-    'find_packages',
+    'find_packages'
 ]
 
+if PY3:
+  __all__.append('find_packages_ns')
+
 __version__ = setuptools.version.__version__
 
 bootstrap_install_from = None
@@ -111,6 +117,9 @@ def _looks_like_package(path):
 
 find_packages = PackageFinder.find
 
+if PY3:
+  find_packages_ns = PEP420PackageFinder.find
+
 
 def _install_setup_requires(attrs):
     # Note: do not use `setuptools.Distribution` directly, as

From b0a89a1c00ded4fe98f2e161066bc7b1ff933fc4 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Wed, 4 Jul 2018 10:04:49 -0400
Subject: [PATCH 7070/8469] Add documentation for find_packages_ns()

---
 docs/setuptools.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index c82dc51133..1d509a73c0 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -59,6 +59,9 @@ Feature Highlights:
 * Create extensible applications and frameworks that automatically discover
   extensions, using simple "entry points" declared in a project's setup script.
 
+* Full support for PEP 420 via ``find_packages_ns()``, which is also backwards
+  compatible to the existing ``find_packages()`` for Python >= 3.3.
+
 .. contents:: **Table of Contents**
 
 .. _ez_setup.py: `bootstrap module`_
@@ -107,6 +110,21 @@ As you can see, it doesn't take much to use setuptools in a project.
 Run that script in your project folder, alongside the Python packages
 you have developed.
 
+For Python 3.3+, and whenever you are using PEP 420 compliant implicit
+namespace packages, you can use ``find_packages_ns()`` instead.
+But keep in mind that if you do, you might have to either define a few 
+exclusions or reorganize your codebase a little bit so that the new function 
+does not find for example your test fixtures and treat them as implicit
+namespace packages. And here is a minimal setup script using 
+``find_packages_ns()``::
+
+    from setuptools import setup, find_packages_ns as find_packages
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages(),
+    )
+
 Invoke that script to produce eggs, upload to
 PyPI, and automatically include all packages in the directory where the
 setup.py lives.  See the `Command Reference`_ section below to see what

From 26fce7125849d090dd65dd7c046515a347357f01 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Wed, 4 Jul 2018 10:06:25 -0400
Subject: [PATCH 7071/8469] Add changelog for PR #1312

---
 changelog.d/1312.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1312.change.rst

diff --git a/changelog.d/1312.change.rst b/changelog.d/1312.change.rst
new file mode 100644
index 0000000000..9314f9e142
--- /dev/null
+++ b/changelog.d/1312.change.rst
@@ -0,0 +1 @@
+Introduce find_packages_ns() to find PEP 420 namespace packages.

From a5797d2c468c1d7005ea36b77ce00941e7c8b251 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 4 Jul 2018 10:52:04 -0400
Subject: [PATCH 7072/8469] Expand documentation for find_packages_ns

This moves the documentation out of "Basic Usage" and expands on some of
the caveats of this approach.
---
 docs/setuptools.txt | 76 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 1d509a73c0..9a088254cc 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -110,21 +110,6 @@ As you can see, it doesn't take much to use setuptools in a project.
 Run that script in your project folder, alongside the Python packages
 you have developed.
 
-For Python 3.3+, and whenever you are using PEP 420 compliant implicit
-namespace packages, you can use ``find_packages_ns()`` instead.
-But keep in mind that if you do, you might have to either define a few 
-exclusions or reorganize your codebase a little bit so that the new function 
-does not find for example your test fixtures and treat them as implicit
-namespace packages. And here is a minimal setup script using 
-``find_packages_ns()``::
-
-    from setuptools import setup, find_packages_ns as find_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_packages(),
-    )
-
 Invoke that script to produce eggs, upload to
 PyPI, and automatically include all packages in the directory where the
 setup.py lives.  See the `Command Reference`_ section below to see what
@@ -480,6 +465,67 @@ argument in your setup script.  Especially since it frees you from having to
 remember to modify your setup script whenever your project grows additional
 top-level packages or subpackages.
 
+``find_packages_ns()``
+----------------------
+In Python 3.3+, ``setuptools`` also provides the ``find_packages_ns`` variant
+of ``find_packages``, which has the same function signature as
+``find_packages``, but works with `PEP 420`_ compliant implicit namespace
+packages. Here is a minimal setup script using ``find_packages_ns``::
+
+    from setuptools import setup, find_packages_ns
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages_ns(),
+    )
+
+
+Keep in mind that according to PEP 420, you may have to either re-organize your
+codebase a bit or define a few exclusions, as the definition of an implicit
+namespace package is quite lenient, so for a project organized like so::
+
+
+    ├── namespace
+    │   └── mypackage
+    │       ├── __init__.py
+    │       └── mod1.py
+    ├── setup.py
+    └── tests
+        └── test_mod1.py
+
+A naive ``find_packages_ns()`` would install both ``namespace.mypackage`` and a
+top-level package called ``tests``! One way to avoid this problem is to use the
+``include`` keyword to whitelist the packages to include, like so::
+
+    from setuptools import setup, find_packages_ns
+
+    setup(
+        name="namespace.mypackage",
+        version="0.1",
+        packages=find_packages_ns(include=['namespace.*'])
+    )
+
+Another option is to use the "src" layout, where all package code is placed in
+the ``src`` directory, like so::
+
+
+    ├── setup.py
+    ├── src
+    │   └── namespace
+    │       └── mypackage
+    │           ├── __init__.py
+    │           └── mod1.py
+    └── tests
+        └── test_mod1.py
+
+With this layout, the package directory is specified as ``src``, as such::
+
+    setup(name="namespace.mypackage",
+          version="0.1",
+          package_dir={'': 'src'},
+          packages=find_packages_ns(where='src'))
+
+.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
 
 Automatic Script Creation
 =========================

From a91c571942baf303ac8cbd2cc2676252bed7d4bc Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Sun, 8 Jul 2018 13:26:08 -0500
Subject: [PATCH 7073/8469] Deprecate upload and register commands

---
 changelog.d/1410.change.rst    |  1 +
 docs/setuptools.txt            | 88 +++++++++++-----------------------
 setuptools/command/register.py | 14 ++++--
 setuptools/command/upload.py   | 11 +++++
 4 files changed, 50 insertions(+), 64 deletions(-)
 create mode 100644 changelog.d/1410.change.rst

diff --git a/changelog.d/1410.change.rst b/changelog.d/1410.change.rst
new file mode 100644
index 0000000000..ab6162ce79
--- /dev/null
+++ b/changelog.d/1410.change.rst
@@ -0,0 +1 @@
+Deprecate ``upload`` and ``register`` commands.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index c82dc51133..511a9898ae 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -48,8 +48,6 @@ Feature Highlights:
 * Command aliases - create project-specific, per-user, or site-wide shortcut
   names for commonly used commands and options
 
-* PyPI upload support - upload your source distributions and eggs to PyPI
-
 * Deploy your project in "development mode", such that it's available on
   ``sys.path``, yet can still be edited directly from its source checkout.
 
@@ -107,11 +105,10 @@ As you can see, it doesn't take much to use setuptools in a project.
 Run that script in your project folder, alongside the Python packages
 you have developed.
 
-Invoke that script to produce eggs, upload to
-PyPI, and automatically include all packages in the directory where the
-setup.py lives.  See the `Command Reference`_ section below to see what
-commands you can give to this setup script. For example,
-to produce a source distribution, simply invoke::
+Invoke that script to produce distributions and automatically include all
+packages in the directory where the setup.py lives.  See the `Command
+Reference`_ section below to see what commands you can give to this setup
+script. For example, to produce a source distribution, simply invoke::
 
     python setup.py sdist
 
@@ -138,7 +135,7 @@ dependencies, and perhaps some data files and scripts::
             'hello': ['*.msg'],
         },
 
-        # metadata for upload to PyPI
+        # metadata to display on PyPI
         author="Me",
         author_email="me@example.com",
         description="This is an Example Package",
@@ -618,9 +615,8 @@ using ``setup.py develop``.)
 Dependencies that aren't in PyPI
 --------------------------------
 
-If your project depends on packages that aren't registered in PyPI, you may
-still be able to depend on them, as long as they are available for download
-as:
+If your project depends on packages that don't exist on PyPI, you may still be
+able to depend on them, as long as they are available for download as:
 
 - an egg, in the standard distutils ``sdist`` format,
 - a single ``.py`` file, or
@@ -1192,15 +1188,6 @@ Whenever you install an updated version of setuptools, you should also update
 your projects' ``ez_setup.py`` files, so that a matching version gets installed
 on the target machine(s).
 
-By the way, setuptools supports the new PyPI "upload" command, so you can use
-``setup.py sdist upload`` or ``setup.py bdist_egg upload`` to upload your
-source or egg distributions respectively.  Your project's current version must
-be registered with PyPI first, of course; you can use ``setup.py register`` to
-do that.  Or you can do it all in one step, e.g. ``setup.py register sdist
-bdist_egg upload`` will register the package, build source and egg
-distributions, and then upload them both to PyPI, where they'll be easily
-found by other projects that depend on them.
-
 (By the way, if you need to distribute a specific version of ``setuptools``,
 you can specify the exact version and base download URL as parameters to the
 ``use_setuptools()`` function.  See the function's docstring for details.)
@@ -1517,22 +1504,11 @@ you use any option at all.
 Making your package available for EasyInstall
 ---------------------------------------------
 
-If you use the ``register`` command (``setup.py register``) to register your
-package with PyPI, that's most of the battle right there.  (See the
-`docs for the register command`_ for more details.)
-
-.. _docs for the register command: http://docs.python.org/dist/package-index.html
-
-If you also use the `upload`_ command to upload actual distributions of your
-package, that's even better, because EasyInstall will be able to find and
-download them directly from your project's PyPI page.
-
-However, there may be reasons why you don't want to upload distributions to
+There may be reasons why you don't want to upload distributions to
 PyPI, and just want your existing distributions (or perhaps a Subversion
 checkout) to be used instead.
 
-So here's what you need to do before running the ``register`` command.  There
-are three ``setup()`` arguments that affect EasyInstall:
+There are three ``setup()`` arguments that affect EasyInstall:
 
 ``url`` and ``download_url``
    These become links on your project's PyPI page.  EasyInstall will examine
@@ -1590,13 +1566,12 @@ tagging the release, so the trunk will still produce development snapshots.
 Alternately, if you are not branching for releases, you can override the
 default version options on the command line, using something like::
 
-    python setup.py egg_info -Db "" sdist bdist_egg register upload
+    python setup.py egg_info -Db "" sdist bdist_egg
 
 The first part of this command (``egg_info -Db ""``) will override the
-configured tag information, before creating source and binary eggs, registering
-the project with PyPI, and uploading the files.  Thus, these commands will use
-the plain version from your ``setup.py``, without adding the build designation
-string.
+configured tag information, before creating source and binary eggs. Thus, these
+commands will use the plain version from your ``setup.py``, without adding the
+build designation string.
 
 Of course, if you will be doing this a lot, you may wish to create a personal
 alias for this operation, e.g.::
@@ -1605,7 +1580,7 @@ alias for this operation, e.g.::
 
 You can then use it like this::
 
-    python setup.py release sdist bdist_egg register upload
+    python setup.py release sdist bdist_egg
 
 Or of course you can create more elaborate aliases that do all of the above.
 See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
@@ -1921,11 +1896,11 @@ This command performs two operations: it updates a project's ``.egg-info``
 metadata directory (used by the ``bdist_egg``, ``develop``, and ``test``
 commands), and it allows you to temporarily change a project's version string,
 to support "daily builds" or "snapshot" releases.  It is run automatically by
-the ``sdist``, ``bdist_egg``, ``develop``, ``register``, and ``test`` commands
-in order to update the project's metadata, but you can also specify it
-explicitly in order to temporarily change the project's version string while
-executing other commands.  (It also generates the``.egg-info/SOURCES.txt``
-manifest file, which is used when you are building source distributions.)
+the ``sdist``, ``bdist_egg``, ``develop``, and ``test`` commands in order to
+update the project's metadata, but you can also specify it explicitly in order
+to temporarily change the project's version string while executing other
+commands.  (It also generates the``.egg-info/SOURCES.txt`` manifest file, which
+is used when you are building source distributions.)
 
 In addition to writing the core egg metadata defined by ``setuptools`` and
 required by ``pkg_resources``, this command can be extended to write other
@@ -1999,10 +1974,10 @@ Creating a dated "nightly build" snapshot egg::
 
     python setup.py egg_info --tag-date --tag-build=DEV bdist_egg
 
-Creating and uploading a release with no version tags, even if some default
-tags are specified in ``setup.cfg``::
+Creating a release with no version tags, even if some default tags are
+specified in ``setup.cfg``::
 
-    python setup.py egg_info -RDb "" sdist bdist_egg register upload
+    python setup.py egg_info -RDb "" sdist bdist_egg
 
 (Notice that ``egg_info`` must always appear on the command line *before* any
 commands that you want the version changes to apply to.)
@@ -2251,25 +2226,16 @@ available:
 ``upload`` - Upload source and/or egg distributions to PyPI
 ===========================================================
 
+.. warning::
+    **upload** is deprecated in favor of using `twine
+    <https://pypi.org/p/twine>`_
+
 The ``upload`` command is implemented and `documented
 <https://docs.python.org/3.1/distutils/uploading.html>`_
 in distutils.
 
-Setuptools augments the ``upload`` command with support
-for `keyring <https://pypi.org/project/keyring/>`_,
-allowing the password to be stored in a secure
-location and not in plaintext in the .pypirc file. To use
-keyring, first install keyring and set the password for
-the relevant repository, e.g.::
-
-    python -m keyring set <repository> <username>
-    Password for '<username>' in '<repository>': ********
-
-Then, in .pypirc, set the repository configuration as normal,
-but omit the password. Thereafter, uploads will use the
-password from the keyring.
-
 New in 20.1: Added keyring support.
+New in 40.0: Deprecated the upload command.
 
 
 -----------------------------------------
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 8d6336a14d..98bc01566f 100755
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,3 +1,4 @@
+from distutils import log
 import distutils.command.register as orig
 
 
@@ -5,6 +6,13 @@ class register(orig.register):
     __doc__ = orig.register.__doc__
 
     def run(self):
-        # Make sure that we are using valid current name/version info
-        self.run_command('egg_info')
-        orig.register.run(self)
+        try:
+            # Make sure that we are using valid current name/version info
+            self.run_command('egg_info')
+            orig.register.run(self)
+        finally:
+            self.announce(
+                "WARNING: Registering is deprecated, use twine to "
+                "upload instead (https://pypi.org/p/twine/)",
+                log.WARN
+            )
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index a44173a99a..72f24d8f48 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -1,4 +1,5 @@
 import getpass
+from distutils import log
 from distutils.command import upload as orig
 
 
@@ -8,6 +9,16 @@ class upload(orig.upload):
     in a variety of different ways.
     """
 
+    def run(self):
+        try:
+            orig.upload.run(self)
+        finally:
+            self.announce(
+                "WARNING: Uploading via this command is deprecated, use twine "
+                "to upload instead (https://pypi.org/p/twine/)",
+                log.WARN
+            )
+
     def finalize_options(self):
         orig.upload.finalize_options(self)
         self.username = (

From 7edce73432363808834c001bbda05944eff5caa0 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Sun, 8 Jul 2018 19:48:32 -0500
Subject: [PATCH 7074/8469] Tests for deprecation warnings

---
 setuptools/tests/test_register.py | 43 +++++++++++++++++++++++++++++++
 setuptools/tests/test_upload.py   | 43 +++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 setuptools/tests/test_register.py
 create mode 100644 setuptools/tests/test_upload.py

diff --git a/setuptools/tests/test_register.py b/setuptools/tests/test_register.py
new file mode 100644
index 0000000000..92d576dbe1
--- /dev/null
+++ b/setuptools/tests/test_register.py
@@ -0,0 +1,43 @@
+import mock
+from distutils import log
+
+import pytest
+
+from setuptools.command.register import register
+from setuptools.dist import Distribution
+
+
+class TestRegisterTest:
+    def test_warns_deprecation(self):
+        dist = Distribution()
+
+        cmd = register(dist)
+        cmd.run_command = mock.Mock()
+        cmd.send_metadata = mock.Mock()
+        cmd.announce = mock.Mock()
+
+        cmd.run()
+
+        cmd.announce.assert_called_once_with(
+            "WARNING: Registering is deprecated, use twine to upload instead "
+            "(https://pypi.org/p/twine/)",
+            log.WARN
+        )
+
+    def test_warns_deprecation_when_raising(self):
+        dist = Distribution()
+
+        cmd = register(dist)
+        cmd.run_command = mock.Mock()
+        cmd.send_metadata = mock.Mock()
+        cmd.send_metadata.side_effect = Exception
+        cmd.announce = mock.Mock()
+
+        with pytest.raises(Exception):
+            cmd.run()
+
+        cmd.announce.assert_called_once_with(
+            "WARNING: Registering is deprecated, use twine to upload instead "
+            "(https://pypi.org/p/twine/)",
+            log.WARN
+        )
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
new file mode 100644
index 0000000000..95a8d16b11
--- /dev/null
+++ b/setuptools/tests/test_upload.py
@@ -0,0 +1,43 @@
+import mock
+from distutils import log
+
+import pytest
+
+from setuptools.command.upload import upload
+from setuptools.dist import Distribution
+
+
+class TestUploadTest:
+    def test_warns_deprecation(self):
+        dist = Distribution()
+        dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
+
+        cmd = upload(dist)
+        cmd.upload_file = mock.Mock()
+        cmd.announce = mock.Mock()
+
+        cmd.run()
+
+        cmd.announce.assert_called_once_with(
+            "WARNING: Uploading via this command is deprecated, use twine to "
+            "upload instead (https://pypi.org/p/twine/)",
+            log.WARN
+        )
+
+    def test_warns_deprecation_when_raising(self):
+        dist = Distribution()
+        dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
+
+        cmd = upload(dist)
+        cmd.upload_file = mock.Mock()
+        cmd.upload_file.side_effect = Exception
+        cmd.announce = mock.Mock()
+
+        with pytest.raises(Exception):
+            cmd.run()
+
+        cmd.announce.assert_called_once_with(
+            "WARNING: Uploading via this command is deprecated, use twine to "
+            "upload instead (https://pypi.org/p/twine/)",
+            log.WARN
+        )

From e1fb17476770620546d0bd244b35591b99ba6ea7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Jul 2018 00:01:40 -0400
Subject: [PATCH 7075/8469] Revert 7392f01f for pkg_resources/extern. 3.3 is
 the right signal there.

---
 pkg_resources/extern/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index dfde433dc2..b4156fec20 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -48,7 +48,7 @@ def load_module(self, fullname):
                 # on later Python versions to cause relative imports
                 # in the vendor package to resolve the same modules
                 # as those going through this importer.
-                if sys.version_info.major >= 3:
+                if sys.version_info > (3, 3):
                     del sys.modules[extant]
                 return mod
             except ImportError:

From 949bd166692af0694631542b02e3a2f26a48b455 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Jul 2018 00:07:40 -0400
Subject: [PATCH 7076/8469] Avoid removing packages imported from the root.
 Fixes #1383.

---
 changelog.d/1383.change          | 1 +
 pkg_resources/extern/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1383.change

diff --git a/changelog.d/1383.change b/changelog.d/1383.change
new file mode 100644
index 0000000000..dc8b839bff
--- /dev/null
+++ b/changelog.d/1383.change
@@ -0,0 +1 @@
+In pkg_resources VendorImporter, avoid removing packages imported from the root.
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index b4156fec20..c1eb9e998f 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -48,7 +48,7 @@ def load_module(self, fullname):
                 # on later Python versions to cause relative imports
                 # in the vendor package to resolve the same modules
                 # as those going through this importer.
-                if sys.version_info > (3, 3):
+                if prefix and sys.version_info > (3, 3):
                     del sys.modules[extant]
                 return mod
             except ImportError:

From 510c3c64bd32e7c3870001e5e7a56ca5e387e797 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Jul 2018 00:13:58 -0400
Subject: [PATCH 7077/8469] =?UTF-8?q?Bump=20version:=2039.2.0=20=E2=86=92?=
 =?UTF-8?q?=2040.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                   | 11 +++++++++++
 changelog.d/1342.breaking.rst |  1 -
 changelog.d/1366.change.rst   |  1 -
 changelog.d/1379.doc.rst      |  1 -
 changelog.d/1383.change       |  1 -
 changelog.d/1385.doc.rst      |  1 -
 changelog.d/1403.doc.rst      |  1 -
 changelog.d/1404.misc.rst     |  1 -
 setup.cfg                     |  2 +-
 setup.py                      |  2 +-
 10 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 changelog.d/1342.breaking.rst
 delete mode 100644 changelog.d/1366.change.rst
 delete mode 100644 changelog.d/1379.doc.rst
 delete mode 100644 changelog.d/1383.change
 delete mode 100644 changelog.d/1385.doc.rst
 delete mode 100644 changelog.d/1403.doc.rst
 delete mode 100644 changelog.d/1404.misc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index d52ed48fca..2f96af99c5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v40.0.0
+-------
+* #1342: Drop support for Python 3.3.
+* #1366: In package_index, fixed handling of encoded entities in URLs.
+* #1383: In pkg_resources VendorImporter, avoid removing packages imported from the root.
+* #1379: Minor doc fixes after actually using the new release process.
+* #1385: Removed section on non-package data files.
+* #1403: Fix developer's guide.
+* #1404: Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
+
+
 v39.2.0
 -------
 
diff --git a/changelog.d/1342.breaking.rst b/changelog.d/1342.breaking.rst
deleted file mode 100644
index 9756e313dd..0000000000
--- a/changelog.d/1342.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for Python 3.3.
diff --git a/changelog.d/1366.change.rst b/changelog.d/1366.change.rst
deleted file mode 100644
index f70e2a2e8a..0000000000
--- a/changelog.d/1366.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In package_index, fixed handling of encoded entities in URLs.
diff --git a/changelog.d/1379.doc.rst b/changelog.d/1379.doc.rst
deleted file mode 100644
index ca017719e5..0000000000
--- a/changelog.d/1379.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Minor doc fixes after actually using the new release process.
diff --git a/changelog.d/1383.change b/changelog.d/1383.change
deleted file mode 100644
index dc8b839bff..0000000000
--- a/changelog.d/1383.change
+++ /dev/null
@@ -1 +0,0 @@
-In pkg_resources VendorImporter, avoid removing packages imported from the root.
diff --git a/changelog.d/1385.doc.rst b/changelog.d/1385.doc.rst
deleted file mode 100644
index 7bd88e8f21..0000000000
--- a/changelog.d/1385.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed section on non-package data files.
diff --git a/changelog.d/1403.doc.rst b/changelog.d/1403.doc.rst
deleted file mode 100644
index 1a636085a1..0000000000
--- a/changelog.d/1403.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix developer's guide.
diff --git a/changelog.d/1404.misc.rst b/changelog.d/1404.misc.rst
deleted file mode 100644
index 2d4bd629fb..0000000000
--- a/changelog.d/1404.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
diff --git a/setup.cfg b/setup.cfg
index e23ee6f041..2caeca9b76 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 39.2.0
+current_version = 40.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 22c26dd2d8..27a0e30e02 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="39.2.0",
+    version="40.0.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From dc9fcbd5ef343321cf29ce1e34f454dadeb59dd2 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 10 Jul 2018 11:16:04 -0400
Subject: [PATCH 7078/8469] Switch over to using six.PY{2,3} when possible

---
 pkg_resources/py31compat.py     | 4 +++-
 setuptools/command/bdist_egg.py | 2 +-
 setuptools/extern/__init__.py   | 2 +-
 setuptools/pep425tags.py        | 6 ++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
index fd4b6fd088..a381c424f9 100644
--- a/pkg_resources/py31compat.py
+++ b/pkg_resources/py31compat.py
@@ -2,6 +2,8 @@
 import errno
 import sys
 
+from .extern import six
+
 
 def _makedirs_31(path, exist_ok=False):
     try:
@@ -15,7 +17,7 @@ def _makedirs_31(path, exist_ok=False):
 #  and exists_ok considerations are disentangled.
 # See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
 needs_makedirs = (
-    sys.version_info.major == 2 or
+    six.PY2 or
     (3, 4) <= sys.version_info < (3, 4, 1)
 )
 makedirs = _makedirs_31 if needs_makedirs else os.makedirs
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 14530729b9..9f8df917e6 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -411,7 +411,7 @@ def scan_module(egg_dir, base, name, stubs):
         return True  # Extension module
     pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
-    if sys.version_info.major == 2:
+    if six.PY2:
         skip = 8  # skip magic & date
     elif sys.version_info < (3, 7):
         skip = 12  # skip magic & date & file size
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 52785a0328..cb2fa32927 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -48,7 +48,7 @@ def load_module(self, fullname):
                 # on later Python versions to cause relative imports
                 # in the vendor package to resolve the same modules
                 # as those going through this importer.
-                if sys.version_info.major >= 3:
+                if sys.version_info >= (3, ):
                     del sys.modules[extant]
                 return mod
             except ImportError:
diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
index a86a0d183e..8bf4277dbd 100644
--- a/setuptools/pep425tags.py
+++ b/setuptools/pep425tags.py
@@ -12,6 +12,8 @@
 import warnings
 from collections import OrderedDict
 
+from .extern import six
+
 from . import glibc
 
 _osx_arch_pat = re.compile(r'(.+)_(\d+)_(\d+)_(.+)')
@@ -97,8 +99,8 @@ def get_abi_tag():
                     lambda: sys.maxunicode == 0x10ffff,
                     expected=4,
                     warn=(impl == 'cp' and
-                          sys.version_info.major == 2)) \
-                and sys.version_info.major == 2:
+                          six.PY2)) \
+                and six.PY2:
             u = 'u'
         abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
     elif soabi and soabi.startswith('cpython-'):

From 6e9ea31599c05df83501669def725b9e92b5b033 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 10 Jul 2018 11:54:15 -0400
Subject: [PATCH 7079/8469] Add changelog for PR #1416

---
 changelog.d/1416.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1416.change.rst

diff --git a/changelog.d/1416.change.rst b/changelog.d/1416.change.rst
new file mode 100644
index 0000000000..e4138a8fb6
--- /dev/null
+++ b/changelog.d/1416.change.rst
@@ -0,0 +1 @@
+Moved several Python version checks over to using ``six.PY2`` and ``six.PY3``.

From 209e3ac20fa69c7352e28b2aeeb2898fbbbf87d4 Mon Sep 17 00:00:00 2001
From: JGoutin <JGoutin@users.noreply.github.com>
Date: Tue, 12 Jun 2018 20:39:32 +0200
Subject: [PATCH 7080/8469] Fix "Microsoft Visual C++ Build Tools" link

---
 setuptools/msvc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 5e20b3f1dd..b9c472f14f 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -232,8 +232,7 @@ def _augment_exception(exc, version, arch=''):
         elif version >= 14.0:
             # For VC++ 14.0 Redirect user to Visual C++ Build Tools
             message += (' Get it with "Microsoft Visual C++ Build Tools": '
-                        r'http://landinghub.visualstudio.com/'
-                        'visual-cpp-build-tools')
+                        r'https://visualstudio.microsoft.com/downloads/')
 
     exc.args = (message, )
 

From baa9aea1de4351b96e6e677a8cd95bc5f122087e Mon Sep 17 00:00:00 2001
From: JGoutin <JGoutin@users.noreply.github.com>
Date: Tue, 12 Jun 2018 20:49:08 +0200
Subject: [PATCH 7081/8469] Create 1388.change.rst

---
 changelog.d/1388.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1388.change.rst

diff --git a/changelog.d/1388.change.rst b/changelog.d/1388.change.rst
new file mode 100644
index 0000000000..b98dc966df
--- /dev/null
+++ b/changelog.d/1388.change.rst
@@ -0,0 +1 @@
+Fixed "Microsoft Visual C++ Build Tools" link in exception when Visual C++ not found.

From bb36b41818b99079372dbb55b272465820d58de3 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 11 Jul 2018 09:51:44 -0400
Subject: [PATCH 7082/8469] Add test for cache_path race condition

This mocks out the isdir call so that the directory is created
immediately after you determine whether or not it exists, thus
simulating a race condition between two threads or processes
creating the same directory.
---
 pkg_resources/tests/test_pkg_resources.py | 33 ++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 4e2cac9459..62a39b8fa8 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,6 +12,11 @@
 import distutils.dist
 import distutils.command.install_egg_info
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 from pkg_resources.extern.six.moves import map
 from pkg_resources.extern.six import text_type, string_types
 
@@ -138,8 +143,34 @@ def test_get_cache_path(self):
         message = "Unexpected type from get_cache_path: " + type_
         assert isinstance(path, string_types), message
 
+    def test_get_cache_path_race(self, tmpdir):
+        # Patch to os.path.isdir to create a race condition
+        def patched_isdir(dirname, unpatched_isdir=pkg_resources.isdir):
+            patched_isdir.dirnames.append(dirname)
+
+            was_dir = unpatched_isdir(dirname)
+            if not was_dir:
+                os.makedirs(dirname)
+            return was_dir
+
+        patched_isdir.dirnames = []
+
+        # Get a cache path with a "race condition"
+        mgr = pkg_resources.ResourceManager()
+        mgr.set_extraction_path(str(tmpdir))
+
+        archive_name = os.sep.join(('foo', 'bar', 'baz'))
+        with mock.patch.object(pkg_resources, 'isdir', new=patched_isdir):
+            mgr.get_cache_path(archive_name)
+
+        # Because this test relies on the implementation details of this
+        # function, these assertions are a sentinel to ensure that the
+        # test suite will not fail silently if the implementation changes.
+        called_dirnames = patched_isdir.dirnames
+        assert len(called_dirnames) == 2
+        assert called_dirnames[0].split(os.sep)[-2:] == ['foo', 'bar']
+        assert called_dirnames[1].split(os.sep)[-1:] == ['foo']
 
-class TestIndependence:
     """
     Tests to ensure that pkg_resources runs independently from setuptools.
     """

From 342443f5034851bbd55823f2c900d7ebabe1b306 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 11 Jul 2018 10:23:55 -0400
Subject: [PATCH 7083/8469] Fix race condition in _bypass_ensure_directory

This fixes a race condition in _bypass_ensure_directory where
two threads or processes may erroneously fail because they are
both creating the same directory. A more robust implementation
of this may involve exposing the un-wrapped os.makedirs.

Originally reported with proposed patch by @JonKohler in
github PR #1412. This patch came out of discussions on that
thread.
---
 pkg_resources/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6701540819..4f42156d0c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -47,6 +47,11 @@
     # Python 3.2 compatibility
     import imp as _imp
 
+try:
+    FileExistsError
+except NameError:
+    FileExistsError = OSError
+
 from pkg_resources.extern import six
 from pkg_resources.extern.six.moves import urllib, map, filter
 
@@ -3030,7 +3035,10 @@ def _bypass_ensure_directory(path):
     dirname, filename = split(path)
     if dirname and filename and not isdir(dirname):
         _bypass_ensure_directory(dirname)
-        mkdir(dirname, 0o755)
+        try:
+            mkdir(dirname, 0o755)
+        except FileExistsError:
+            pass
 
 
 def split_sections(s):

From 67f190adf28d433f0d43ad5014a3fe66f43eb551 Mon Sep 17 00:00:00 2001
From: Jon Kohler <jon@nutanix.com>
Date: Mon, 9 Jul 2018 13:14:33 -0400
Subject: [PATCH 7084/8469] Changelog for github PR #1418

---
 changelog.d/1418.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1418.change.rst

diff --git a/changelog.d/1418.change.rst b/changelog.d/1418.change.rst
new file mode 100644
index 0000000000..d7656f574b
--- /dev/null
+++ b/changelog.d/1418.change.rst
@@ -0,0 +1 @@
+Solved race in when creating egg cache directories.

From e9bdeda02a1be80d295aa8e4b068e4844141512b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 13 Jul 2018 00:02:14 -0400
Subject: [PATCH 7085/8469] Extract name/version functionality from egg_info to
 be re-used by a dist-info command. Ref #1386.

---
 setuptools/command/egg_info.py | 61 +++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index f3e604d3f0..5fd6c88803 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -116,7 +116,33 @@ def translate_pattern(glob):
     return re.compile(pat, flags=re.MULTILINE|re.DOTALL)
 
 
-class egg_info(Command):
+class InfoCommon:
+    tag_build = None
+    tag_date = None
+
+    @property
+    def name(self):
+        return safe_name(self.distribution.get_name())
+
+    def tagged_version(self):
+        version = self.distribution.get_version()
+        # egg_info may be called more than once for a distribution,
+        # in which case the version string already contains all tags.
+        if self.vtags and version.endswith(self.vtags):
+            return safe_version(version)
+        return safe_version(version + self.vtags)
+
+    def tags(self):
+        version = ''
+        if self.tag_build:
+            version += self.tag_build
+        if self.tag_date:
+            version += time.strftime("-%Y%m%d")
+        return version
+    vtags = property(tags)
+
+
+class egg_info(InfoCommon, Command):
     description = "create a distribution's .egg-info directory"
 
     user_options = [
@@ -133,14 +159,9 @@ class egg_info(Command):
     }
 
     def initialize_options(self):
-        self.egg_name = None
-        self.egg_version = None
         self.egg_base = None
         self.egg_info = None
-        self.tag_build = None
-        self.tag_date = 0
         self.broken_egg_info = False
-        self.vtags = None
 
     ####################################
     # allow the 'tag_svn_revision' to be detected and
@@ -167,11 +188,15 @@ def save_version_info(self, filename):
         egg_info['tag_date'] = 0
         edit_config(filename, dict(egg_info=egg_info))
 
-    def finalize_options(self):
-        self.egg_name = safe_name(self.distribution.get_name())
-        self.vtags = self.tags()
-        self.egg_version = self.tagged_version()
+    @property
+    def egg_name(self):
+        return self.name
+
+    @property
+    def egg_version(self):
+        return self.tagged_version()
 
+    def finalize_options(self):
         parsed_version = parse_version(self.egg_version)
 
         try:
@@ -254,14 +279,6 @@ def delete_file(self, filename):
         if not self.dry_run:
             os.unlink(filename)
 
-    def tagged_version(self):
-        version = self.distribution.get_version()
-        # egg_info may be called more than once for a distribution,
-        # in which case the version string already contains all tags.
-        if self.vtags and version.endswith(self.vtags):
-            return safe_version(version)
-        return safe_version(version + self.vtags)
-
     def run(self):
         self.mkpath(self.egg_info)
         installer = self.distribution.fetch_build_egg
@@ -277,14 +294,6 @@ def run(self):
 
         self.find_sources()
 
-    def tags(self):
-        version = ''
-        if self.tag_build:
-            version += self.tag_build
-        if self.tag_date:
-            version += time.strftime("-%Y%m%d")
-        return version
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info, "SOURCES.txt")

From f90944775adb861d8de98026be4864e488be9c15 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 13 Jul 2018 00:20:14 -0400
Subject: [PATCH 7086/8469] Relax overfitted test. Fixes #1425.

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

diff --git a/setuptools/tests/test_register.py b/setuptools/tests/test_register.py
index 92d576dbe1..96114595db 100644
--- a/setuptools/tests/test_register.py
+++ b/setuptools/tests/test_register.py
@@ -18,7 +18,7 @@ def test_warns_deprecation(self):
 
         cmd.run()
 
-        cmd.announce.assert_called_once_with(
+        cmd.announce.assert_called_with(
             "WARNING: Registering is deprecated, use twine to upload instead "
             "(https://pypi.org/p/twine/)",
             log.WARN
@@ -36,7 +36,7 @@ def test_warns_deprecation_when_raising(self):
         with pytest.raises(Exception):
             cmd.run()
 
-        cmd.announce.assert_called_once_with(
+        cmd.announce.assert_called_with(
             "WARNING: Registering is deprecated, use twine to upload instead "
             "(https://pypi.org/p/twine/)",
             log.WARN

From b48d4900233169c1143adfdd64aa00230ae13f26 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 14 Jul 2018 19:56:33 -0700
Subject: [PATCH 7087/8469] Add a space after header, so reST rendering isn't
 mangled. (#1429)

* Add a space after header, so reST rendering isn't mangled.

* Add newline in template, too.
---
 CHANGES.rst            | 1 +
 towncrier_template.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2f96af99c5..05de4cfc84 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,6 @@
 v40.0.0
 -------
+
 * #1342: Drop support for Python 3.3.
 * #1366: In package_index, fixed handling of encoded entities in URLs.
 * #1383: In pkg_resources VendorImporter, avoid removing packages imported from the root.
diff --git a/towncrier_template.rst b/towncrier_template.rst
index 9c23b9775f..fbc5ef03b0 100644
--- a/towncrier_template.rst
+++ b/towncrier_template.rst
@@ -2,6 +2,7 @@
 {% set underline = underlines[0] %}{% if section %}{{section}}
 {{ underline * section|length }}
 {% endif %}
+
 {% if sections[section] %}
 {% for category, val in definitions.items() if category in sections[section]%}
 {% if definitions[category]['showcontent'] %}

From 74d0f1dc010170301dafe46faacee84bf246c880 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <pitrou@free.fr>
Date: Mon, 16 Jul 2018 19:03:03 +0200
Subject: [PATCH 7088/8469] bpo-32430: Rename Modules/Setup.dist to
 Modules/Setup (GH-8229)

bpo-32430: Rename Modules/Setup.dist to Modules/Setup

Remove the necessity to copy the former manually to the latter when updating the local source tree.
---
 sysconfig.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index e07a6c8b94..b433fc86ff 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -36,10 +36,8 @@
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
 # different (hard-wired) directories.
-# Setup.local is available for Makefile builds including VPATH builds,
-# Setup.dist is available on Windows
 def _is_python_source_dir(d):
-    for fn in ("Setup.dist", "Setup.local"):
+    for fn in ("Setup", "Setup.local"):
         if os.path.isfile(os.path.join(d, "Modules", fn)):
             return True
     return False

From b90515f8041352a33c6ca7099be38dee0d5a5cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 20 Jul 2018 16:48:06 +0200
Subject: [PATCH 7089/8469] Make install directory if it doesn't exist yet

Problem: In Fedora, `sudo python3 setup.py install` installs to
/usr/local/lib/pythonX.Y/site-packages. However that directory is
not always there as it is not installed together with the python3
package (Fedora packages should not install stuff to /usr/local).

When the directory does not exist an installation attempt fails with:

  [Errno 2] No such file or directory:
  '/usr/local/lib/python3.7/site-packages/test-easy-install-11875.write-test'

Solution: Make the directory if it doesn't exists yet. If user has
no permissions, the above error is preserved, yet with root (sudo)
it works now.
---
 changelog.d/1431.chnage.rst        | 3 +++
 setuptools/command/easy_install.py | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 changelog.d/1431.chnage.rst

diff --git a/changelog.d/1431.chnage.rst b/changelog.d/1431.chnage.rst
new file mode 100644
index 0000000000..a5cb324e3c
--- /dev/null
+++ b/changelog.d/1431.chnage.rst
@@ -0,0 +1,3 @@
+Make install directory if it doesn't exist yet to prevent Fedora's
+specific setup to blow up if ``/usr/local/lib/pythonX.Y/site-packages``
+doesn't exist yet.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 05508cebe1..5b65b95d8e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -450,6 +450,12 @@ def check_site_dir(self):
         instdir = normalize_path(self.install_dir)
         pth_file = os.path.join(instdir, 'easy-install.pth')
 
+        if not os.path.exists(instdir):
+            try:
+                os.makedirs(instdir)
+            except (OSError, IOError):
+                self.cant_write_to_target()
+
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
         is_site_dir = instdir in self.all_site_dirs
 

From 8be16112e6817cc23ee4f317bc58db5f1c7eb108 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 26 Jul 2018 04:23:10 -0700
Subject: [PATCH 7090/8469] bpo-34225: Ensure INCLUDE and LIB directories do
 not end with a backslash. (GH-8464)

---
 _msvccompiler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index c9d3c6c671..30b3b47398 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -252,11 +252,11 @@ def initialize(self, plat_name=None):
 
         for dir in vc_env.get('include', '').split(os.pathsep):
             if dir:
-                self.add_include_dir(dir)
+                self.add_include_dir(dir.rstrip(os.sep))
 
         for dir in vc_env.get('lib', '').split(os.pathsep):
             if dir:
-                self.add_library_dir(dir)
+                self.add_library_dir(dir.rstrip(os.sep))
 
         self.preprocess_options = None
         # If vcruntime_redist is available, link against it dynamically. Otherwise,

From 760e2e1df9c9c9d1fc072e7b6ad9df4c32bfc835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 27 Jul 2018 14:36:34 +0200
Subject: [PATCH 7091/8469] Remove spurious executable permissions

---
 README.rst                             | 0
 changelog.d/1441.misc.rst              | 1 +
 easy_install.py                        | 0
 launcher.c                             | 0
 pytest.ini                             | 0
 setup.cfg                              | 0
 setuptools/archive_util.py             | 0
 setuptools/command/alias.py            | 0
 setuptools/command/bdist_rpm.py        | 0
 setuptools/command/bdist_wininst.py    | 0
 setuptools/command/develop.py          | 0
 setuptools/command/egg_info.py         | 0
 setuptools/command/install_egg_info.py | 0
 setuptools/command/install_scripts.py  | 0
 setuptools/command/register.py         | 0
 setuptools/command/rotate.py           | 0
 setuptools/command/saveopts.py         | 0
 setuptools/command/sdist.py            | 0
 setuptools/command/setopt.py           | 0
 setuptools/namespaces.py               | 0
 setuptools/package_index.py            | 0
 setuptools/sandbox.py                  | 0
 22 files changed, 1 insertion(+)
 mode change 100755 => 100644 README.rst
 create mode 100644 changelog.d/1441.misc.rst
 mode change 100755 => 100644 easy_install.py
 mode change 100755 => 100644 launcher.c
 mode change 100755 => 100644 pytest.ini
 mode change 100755 => 100644 setup.cfg
 mode change 100755 => 100644 setuptools/archive_util.py
 mode change 100755 => 100644 setuptools/command/alias.py
 mode change 100755 => 100644 setuptools/command/bdist_rpm.py
 mode change 100755 => 100644 setuptools/command/bdist_wininst.py
 mode change 100755 => 100644 setuptools/command/develop.py
 mode change 100755 => 100644 setuptools/command/egg_info.py
 mode change 100755 => 100644 setuptools/command/install_egg_info.py
 mode change 100755 => 100644 setuptools/command/install_scripts.py
 mode change 100755 => 100644 setuptools/command/register.py
 mode change 100755 => 100644 setuptools/command/rotate.py
 mode change 100755 => 100644 setuptools/command/saveopts.py
 mode change 100755 => 100644 setuptools/command/sdist.py
 mode change 100755 => 100644 setuptools/command/setopt.py
 mode change 100755 => 100644 setuptools/namespaces.py
 mode change 100755 => 100644 setuptools/package_index.py
 mode change 100755 => 100644 setuptools/sandbox.py

diff --git a/README.rst b/README.rst
old mode 100755
new mode 100644
diff --git a/changelog.d/1441.misc.rst b/changelog.d/1441.misc.rst
new file mode 100644
index 0000000000..470d4b569a
--- /dev/null
+++ b/changelog.d/1441.misc.rst
@@ -0,0 +1 @@
+Remove spurious executable permissions from files that don't need them.
diff --git a/easy_install.py b/easy_install.py
old mode 100755
new mode 100644
diff --git a/launcher.c b/launcher.c
old mode 100755
new mode 100644
diff --git a/pytest.ini b/pytest.ini
old mode 100755
new mode 100644
diff --git a/setup.cfg b/setup.cfg
old mode 100755
new mode 100644
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/saveopts.py b/setuptools/command/saveopts.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
old mode 100755
new mode 100644
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
old mode 100755
new mode 100644
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
old mode 100755
new mode 100644
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
old mode 100755
new mode 100644
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
old mode 100755
new mode 100644

From ea8652e12058fa2b4c6a9a5427d58fff5de8977e Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 9 Aug 2018 15:57:22 +0300
Subject: [PATCH 7092/8469] Upgrade vendored pyparsing from 2.1.10 to 2.2.0

---
 pkg_resources/_vendor/pyparsing.py | 54 +++++++++++++++++++++---------
 setuptools/_vendor/pyparsing.py    | 54 +++++++++++++++++++++---------
 2 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
index a21224359e..e8aefc8ca1 100644
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -60,8 +60,8 @@ class names, and the use of '+', '|' and '^' operators.
  - embedded comments
 """
 
-__version__ = "2.1.10"
-__versionTime__ = "07 Oct 2016 01:31 UTC"
+__version__ = "2.2.0"
+__versionTime__ = "06 Mar 2017 02:06 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -144,7 +144,7 @@ def _ustr(obj):
         except UnicodeEncodeError:
             # Else encode it
             ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
-            xmlcharref = Regex('&#\d+;')
+            xmlcharref = Regex(r'&#\d+;')
             xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
             return xmlcharref.transformString(ret)
 
@@ -809,7 +809,7 @@ def __lookup(self,sub):
         return None
 
     def getName(self):
-        """
+        r"""
         Returns the results name for this token expression. Useful when several 
         different expressions might match at a particular location.
 
@@ -1226,7 +1226,7 @@ def breaker(instring, loc, doActions=True, callPreParse=True):
 
     def setParseAction( self, *fns, **kwargs ):
         """
-        Define action to perform when successfully matching parse element definition.
+        Define one or more actions to perform when successfully matching parse element definition.
         Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
         C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
          - s   = the original string being parsed (see note below)
@@ -1264,7 +1264,7 @@ def setParseAction( self, *fns, **kwargs ):
 
     def addParseAction( self, *fns, **kwargs ):
         """
-        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
+        Add one or more parse actions to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
         
         See examples in L{I{copy}<copy>}.
         """
@@ -1443,10 +1443,14 @@ def set(self, key, value):
 
             def clear(self):
                 cache.clear()
+                
+            def cache_len(self):
+                return len(cache)
 
             self.get = types.MethodType(get, self)
             self.set = types.MethodType(set, self)
             self.clear = types.MethodType(clear, self)
+            self.__len__ = types.MethodType(cache_len, self)
 
     if _OrderedDict is not None:
         class _FifoCache(object):
@@ -1460,15 +1464,22 @@ def get(self, key):
 
                 def set(self, key, value):
                     cache[key] = value
-                    if len(cache) > size:
-                        cache.popitem(False)
+                    while len(cache) > size:
+                        try:
+                            cache.popitem(False)
+                        except KeyError:
+                            pass
 
                 def clear(self):
                     cache.clear()
 
+                def cache_len(self):
+                    return len(cache)
+
                 self.get = types.MethodType(get, self)
                 self.set = types.MethodType(set, self)
                 self.clear = types.MethodType(clear, self)
+                self.__len__ = types.MethodType(cache_len, self)
 
     else:
         class _FifoCache(object):
@@ -1483,7 +1494,7 @@ def get(self, key):
 
                 def set(self, key, value):
                     cache[key] = value
-                    if len(cache) > size:
+                    while len(key_fifo) > size:
                         cache.pop(key_fifo.popleft(), None)
                     key_fifo.append(key)
 
@@ -1491,9 +1502,13 @@ def clear(self):
                     cache.clear()
                     key_fifo.clear()
 
+                def cache_len(self):
+                    return len(cache)
+
                 self.get = types.MethodType(get, self)
                 self.set = types.MethodType(set, self)
                 self.clear = types.MethodType(clear, self)
+                self.__len__ = types.MethodType(cache_len, self)
 
     # argument cache for optimizing repeated calls when backtracking through recursive expressions
     packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
@@ -1743,8 +1758,12 @@ def searchString( self, instring, maxMatches=_MAX_INT ):
             cap_word = Word(alphas.upper(), alphas.lower())
             
             print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
+
+            # the sum() builtin can be used to merge results into a single ParseResults object
+            print(sum(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity")))
         prints::
-            ['More', 'Iron', 'Lead', 'Gold', 'I']
+            [['More'], ['Iron'], ['Lead'], ['Gold'], ['I'], ['Electricity']]
+            ['More', 'Iron', 'Lead', 'Gold', 'I', 'Electricity']
         """
         try:
             return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
@@ -1819,7 +1838,7 @@ def __sub__(self, other):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
             return None
-        return And( [ self, And._ErrorStop(), other ] )
+        return self + And._ErrorStop() + other
 
     def __rsub__(self, other ):
         """
@@ -2722,7 +2741,7 @@ def charsAsStr(s):
 
 
 class Regex(Token):
-    """
+    r"""
     Token for matching strings that match a given regular expression.
     Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
     If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
@@ -2911,7 +2930,7 @@ def parseImpl( self, instring, loc, doActions=True ):
 
                 # replace escaped characters
                 if self.escChar:
-                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
+                    ret = re.sub(self.escCharReplacePattern, r"\g<1>", ret)
 
                 # replace escaped quotes
                 if self.escQuote:
@@ -5020,7 +5039,9 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
           constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
        - parseAction is the parse action to be associated with
           expressions matching this operator expression (the
-          parse action tuple member may be omitted)
+          parse action tuple member may be omitted); if the parse action
+          is passed a tuple or list of functions, this is equivalent to
+          calling C{setParseAction(*fn)} (L{ParserElement.setParseAction})
      - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
      - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
 
@@ -5093,7 +5114,10 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
         else:
             raise ValueError("operator must indicate right or left associativity")
         if pa:
-            matchExpr.setParseAction( pa )
+            if isinstance(pa, (tuple, list)):
+                matchExpr.setParseAction(*pa)
+            else:
+                matchExpr.setParseAction(pa)
         thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
         lastExpr = thisExpr
     ret <<= lastExpr
diff --git a/setuptools/_vendor/pyparsing.py b/setuptools/_vendor/pyparsing.py
index a21224359e..e8aefc8ca1 100644
--- a/setuptools/_vendor/pyparsing.py
+++ b/setuptools/_vendor/pyparsing.py
@@ -60,8 +60,8 @@ class names, and the use of '+', '|' and '^' operators.
  - embedded comments
 """
 
-__version__ = "2.1.10"
-__versionTime__ = "07 Oct 2016 01:31 UTC"
+__version__ = "2.2.0"
+__versionTime__ = "06 Mar 2017 02:06 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -144,7 +144,7 @@ def _ustr(obj):
         except UnicodeEncodeError:
             # Else encode it
             ret = unicode(obj).encode(sys.getdefaultencoding(), 'xmlcharrefreplace')
-            xmlcharref = Regex('&#\d+;')
+            xmlcharref = Regex(r'&#\d+;')
             xmlcharref.setParseAction(lambda t: '\\u' + hex(int(t[0][2:-1]))[2:])
             return xmlcharref.transformString(ret)
 
@@ -809,7 +809,7 @@ def __lookup(self,sub):
         return None
 
     def getName(self):
-        """
+        r"""
         Returns the results name for this token expression. Useful when several 
         different expressions might match at a particular location.
 
@@ -1226,7 +1226,7 @@ def breaker(instring, loc, doActions=True, callPreParse=True):
 
     def setParseAction( self, *fns, **kwargs ):
         """
-        Define action to perform when successfully matching parse element definition.
+        Define one or more actions to perform when successfully matching parse element definition.
         Parse action fn is a callable method with 0-3 arguments, called as C{fn(s,loc,toks)},
         C{fn(loc,toks)}, C{fn(toks)}, or just C{fn()}, where:
          - s   = the original string being parsed (see note below)
@@ -1264,7 +1264,7 @@ def setParseAction( self, *fns, **kwargs ):
 
     def addParseAction( self, *fns, **kwargs ):
         """
-        Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
+        Add one or more parse actions to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.
         
         See examples in L{I{copy}<copy>}.
         """
@@ -1443,10 +1443,14 @@ def set(self, key, value):
 
             def clear(self):
                 cache.clear()
+                
+            def cache_len(self):
+                return len(cache)
 
             self.get = types.MethodType(get, self)
             self.set = types.MethodType(set, self)
             self.clear = types.MethodType(clear, self)
+            self.__len__ = types.MethodType(cache_len, self)
 
     if _OrderedDict is not None:
         class _FifoCache(object):
@@ -1460,15 +1464,22 @@ def get(self, key):
 
                 def set(self, key, value):
                     cache[key] = value
-                    if len(cache) > size:
-                        cache.popitem(False)
+                    while len(cache) > size:
+                        try:
+                            cache.popitem(False)
+                        except KeyError:
+                            pass
 
                 def clear(self):
                     cache.clear()
 
+                def cache_len(self):
+                    return len(cache)
+
                 self.get = types.MethodType(get, self)
                 self.set = types.MethodType(set, self)
                 self.clear = types.MethodType(clear, self)
+                self.__len__ = types.MethodType(cache_len, self)
 
     else:
         class _FifoCache(object):
@@ -1483,7 +1494,7 @@ def get(self, key):
 
                 def set(self, key, value):
                     cache[key] = value
-                    if len(cache) > size:
+                    while len(key_fifo) > size:
                         cache.pop(key_fifo.popleft(), None)
                     key_fifo.append(key)
 
@@ -1491,9 +1502,13 @@ def clear(self):
                     cache.clear()
                     key_fifo.clear()
 
+                def cache_len(self):
+                    return len(cache)
+
                 self.get = types.MethodType(get, self)
                 self.set = types.MethodType(set, self)
                 self.clear = types.MethodType(clear, self)
+                self.__len__ = types.MethodType(cache_len, self)
 
     # argument cache for optimizing repeated calls when backtracking through recursive expressions
     packrat_cache = {} # this is set later by enabledPackrat(); this is here so that resetCache() doesn't fail
@@ -1743,8 +1758,12 @@ def searchString( self, instring, maxMatches=_MAX_INT ):
             cap_word = Word(alphas.upper(), alphas.lower())
             
             print(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity"))
+
+            # the sum() builtin can be used to merge results into a single ParseResults object
+            print(sum(cap_word.searchString("More than Iron, more than Lead, more than Gold I need Electricity")))
         prints::
-            ['More', 'Iron', 'Lead', 'Gold', 'I']
+            [['More'], ['Iron'], ['Lead'], ['Gold'], ['I'], ['Electricity']]
+            ['More', 'Iron', 'Lead', 'Gold', 'I', 'Electricity']
         """
         try:
             return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ])
@@ -1819,7 +1838,7 @@ def __sub__(self, other):
             warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
                     SyntaxWarning, stacklevel=2)
             return None
-        return And( [ self, And._ErrorStop(), other ] )
+        return self + And._ErrorStop() + other
 
     def __rsub__(self, other ):
         """
@@ -2722,7 +2741,7 @@ def charsAsStr(s):
 
 
 class Regex(Token):
-    """
+    r"""
     Token for matching strings that match a given regular expression.
     Defined with string specifying the regular expression in a form recognized by the inbuilt Python re module.
     If the given regex contains named groups (defined using C{(?P<name>...)}), these will be preserved as 
@@ -2911,7 +2930,7 @@ def parseImpl( self, instring, loc, doActions=True ):
 
                 # replace escaped characters
                 if self.escChar:
-                    ret = re.sub(self.escCharReplacePattern,"\g<1>",ret)
+                    ret = re.sub(self.escCharReplacePattern, r"\g<1>", ret)
 
                 # replace escaped quotes
                 if self.escQuote:
@@ -5020,7 +5039,9 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
           constants C{opAssoc.RIGHT} and C{opAssoc.LEFT}.
        - parseAction is the parse action to be associated with
           expressions matching this operator expression (the
-          parse action tuple member may be omitted)
+          parse action tuple member may be omitted); if the parse action
+          is passed a tuple or list of functions, this is equivalent to
+          calling C{setParseAction(*fn)} (L{ParserElement.setParseAction})
      - lpar - expression for matching left-parentheses (default=C{Suppress('(')})
      - rpar - expression for matching right-parentheses (default=C{Suppress(')')})
 
@@ -5093,7 +5114,10 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ):
         else:
             raise ValueError("operator must indicate right or left associativity")
         if pa:
-            matchExpr.setParseAction( pa )
+            if isinstance(pa, (tuple, list)):
+                matchExpr.setParseAction(*pa)
+            else:
+                matchExpr.setParseAction(pa)
         thisExpr <<= ( matchExpr.setName(termName) | lastExpr )
         lastExpr = thisExpr
     ret <<= lastExpr

From 306d77a044a20e58f2a786da31b6061fabd1f44a Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 9 Aug 2018 17:43:54 +0300
Subject: [PATCH 7093/8469] Add changelog

---
 changelog.d/1450.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1450.change.rst

diff --git a/changelog.d/1450.change.rst b/changelog.d/1450.change.rst
new file mode 100644
index 0000000000..38f906e303
--- /dev/null
+++ b/changelog.d/1450.change.rst
@@ -0,0 +1 @@
+Upgrade vendored PyParsing from 2.1.10 to 2.2.0.

From 9755c3bc2bf1fe50bf67dccb583ffad9d57f7bab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Aug 2018 11:58:08 -0400
Subject: [PATCH 7094/8469] Rewrite loop as single generator expression.

---
 pkg_resources/__init__.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4f42156d0c..86ec3411bd 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -645,13 +645,12 @@ def iter_entry_points(self, group, name=None):
         distributions in the working set, otherwise only ones matching
         both `group` and `name` are yielded (in distribution order).
         """
-        for dist in self:
-            entries = dist.get_entry_map(group)
-            if name is None:
-                for ep in entries.values():
-                    yield ep
-            elif name in entries:
-                yield entries[name]
+        return (
+            entry
+            for dist in self
+            for entry in dist.get_entry_map(group).values()
+            if name is None or name == entry.name
+        )
 
     def run_script(self, requires, script_name):
         """Locate distribution for `requires` and run `script_name` script"""

From 79d2a47528a35c3c955e117b3912fe0ac7dc36e2 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 11 Aug 2018 19:06:46 +0200
Subject: [PATCH 7095/8469] tox: fix configuration so newer tox versions are
 supported

Starting with tox 3.2.0, the commands for installing/listing
dependencies changed from pip to python -m pip, which is problematic
as this will leave bits of the previous (from the virtualenv creation)
older version of setuptools installed in the site-packages directory
because from pip's point of view, the active setuptools version is the
one in the current directory (which cannot be uninstalled).

Fix #1453.
---
 tox.ini | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tox.ini b/tox.ini
index 1a369653fc..3b03b7db17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,12 @@ envlist=python
 
 [testenv]
 deps=-rtests/requirements.txt
+# Changed from default (`python -m pip ...`)
+# to prevent the current working directory
+# from being added to `sys.path`.
+install_command={envbindir}/pip install {opts} {packages}
+# Same as above.
+list_dependencies_command={envbindir}/pip freeze
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.

From 0254a2fda8e8bd4f289d01e2179191e936517f04 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Fri, 17 Aug 2018 14:58:35 +0200
Subject: [PATCH 7096/8469] Rename find_namepaces_ns to find_namespace_packages
 (#1423)

* fix #1419 PEP420: add find_namespace: directive

* fix #1419 PEP420: add find_namespace: directive to documentation

* fix #1419 PEP420: add tests

* fix #1419 PEP420: clean up code

* fix #1419 PEP420: fix typo in documentation

* fix #1419 PEP420: fix typo in documentation

* fix #1419 PEP420: clean up code

* fix #1419 PEP420: add changelog entry

* fixup! fix #1419 PEP420: add tests

* fix #1419 PEP420: cleanup code refactor markers

* #1420: Rename find_namespace_ns to find_namespace_packages

*  #1420: update changelog entry
---
 changelog.d/1312.change.rst            |  2 +-
 changelog.d/1420.change.rst            |  1 +
 docs/setuptools.txt                    | 35 +++++++-------
 setuptools/__init__.py                 |  4 +-
 setuptools/config.py                   | 16 +++++--
 setuptools/tests/__init__.py           | 12 +++++
 setuptools/tests/test_config.py        | 64 ++++++++++++++++++++++++--
 setuptools/tests/test_find_packages.py | 16 +++----
 8 files changed, 115 insertions(+), 35 deletions(-)
 create mode 100644 changelog.d/1420.change.rst

diff --git a/changelog.d/1312.change.rst b/changelog.d/1312.change.rst
index 9314f9e142..e2542f98fd 100644
--- a/changelog.d/1312.change.rst
+++ b/changelog.d/1312.change.rst
@@ -1 +1 @@
-Introduce find_packages_ns() to find PEP 420 namespace packages.
+Introduce find_namespace_packages() to find PEP 420 namespace packages.
diff --git a/changelog.d/1420.change.rst b/changelog.d/1420.change.rst
new file mode 100644
index 0000000000..6967adccb0
--- /dev/null
+++ b/changelog.d/1420.change.rst
@@ -0,0 +1 @@
+Add find_namespace: directive to config parser
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 0660e14d5d..89f45bd857 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -57,7 +57,7 @@ Feature Highlights:
 * Create extensible applications and frameworks that automatically discover
   extensions, using simple "entry points" declared in a project's setup script.
 
-* Full support for PEP 420 via ``find_packages_ns()``, which is also backwards
+* Full support for PEP 420 via ``find_namespace_packages()``, which is also backwards
   compatible to the existing ``find_packages()`` for Python >= 3.3.
 
 .. contents:: **Table of Contents**
@@ -462,18 +462,18 @@ argument in your setup script.  Especially since it frees you from having to
 remember to modify your setup script whenever your project grows additional
 top-level packages or subpackages.
 
-``find_packages_ns()``
-----------------------
-In Python 3.3+, ``setuptools`` also provides the ``find_packages_ns`` variant
+``find_namespace_packages()``
+-----------------------------
+In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
 of ``find_packages``, which has the same function signature as
 ``find_packages``, but works with `PEP 420`_ compliant implicit namespace
-packages. Here is a minimal setup script using ``find_packages_ns``::
+packages. Here is a minimal setup script using ``find_namespace_packages``::
 
-    from setuptools import setup, find_packages_ns
+    from setuptools import setup, find_namespace_packages
     setup(
         name="HelloWorld",
         version="0.1",
-        packages=find_packages_ns(),
+        packages=find_namespace_packages(),
     )
 
 
@@ -490,16 +490,16 @@ namespace package is quite lenient, so for a project organized like so::
     └── tests
         └── test_mod1.py
 
-A naive ``find_packages_ns()`` would install both ``namespace.mypackage`` and a
+A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
 top-level package called ``tests``! One way to avoid this problem is to use the
 ``include`` keyword to whitelist the packages to include, like so::
 
-    from setuptools import setup, find_packages_ns
+    from setuptools import setup, find_namespace_packages
 
     setup(
         name="namespace.mypackage",
         version="0.1",
-        packages=find_packages_ns(include=['namespace.*'])
+        packages=find_namespace_packages(include=['namespace.*'])
     )
 
 Another option is to use the "src" layout, where all package code is placed in
@@ -520,7 +520,7 @@ With this layout, the package directory is specified as ``src``, as such::
     setup(name="namespace.mypackage",
           version="0.1",
           package_dir={'': 'src'},
-          packages=find_packages_ns(where='src'))
+          packages=find_namespace_packages(where='src'))
 
 .. _PEP 420: https://www.python.org/dev/peps/pep-0420/
 
@@ -2389,8 +2389,8 @@ Metadata and options are set in the config sections of the same name.
 * In some cases, complex values can be provided in dedicated subsections for
   clarity.
 
-* Some keys allow ``file:``, ``attr:``, and ``find:`` directives in order to
-  cover common usecases.
+* Some keys allow ``file:``, ``attr:``, and ``find:`` and ``find_namespace:`` directives in
+  order to cover common usecases.
 
 * Unknown keys are ignored.
 
@@ -2479,7 +2479,7 @@ eager_resources          list-comma
 dependency_links         list-comma
 tests_require            list-semi
 include_package_data     bool
-packages                 find:, list-comma
+packages                 find:, find_namespace:, list-comma
 package_dir              dict
 package_data             section
 exclude_package_data     section
@@ -2489,10 +2489,13 @@ py_modules               list-comma
 
 .. note::
 
-    **packages** - The ``find:`` directive can be further configured
+    **packages** - The ``find:`` and ``find_namespace:`` directive can be further configured
     in a dedicated subsection ``options.packages.find``. This subsection
-    accepts the same keys as the `setuptools.find` function:
+    accepts the same keys as the `setuptools.find_packages` and the
+    `setuptools.find_namespace_packages` function:
     ``where``, ``include``, and ``exclude``.
+    
+    **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
 
 
 Configuration API
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index e705f0d1af..54309b57fe 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -26,7 +26,7 @@
 ]
 
 if PY3:
-  __all__.append('find_packages_ns')
+  __all__.append('find_namespace_packages')
 
 __version__ = setuptools.version.__version__
 
@@ -118,7 +118,7 @@ def _looks_like_package(path):
 find_packages = PackageFinder.find
 
 if PY3:
-  find_packages_ns = PEP420PackageFinder.find
+  find_namespace_packages = PEP420PackageFinder.find
 
 
 def _install_setup_requires(attrs):
diff --git a/setuptools/config.py b/setuptools/config.py
index 5f908cf129..0da3dbc9cf 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -8,7 +8,7 @@
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.extern.packaging.version import LegacyVersion, parse
-from setuptools.extern.six import string_types
+from setuptools.extern.six import string_types, PY3
 
 
 __metaclass__ = type
@@ -515,16 +515,24 @@ def _parse_packages(self, value):
         :param value:
         :rtype: list
         """
-        find_directive = 'find:'
+        find_directives = ['find:', 'find_namespace:']
+        trimmed_value = value.strip()
 
-        if not value.startswith(find_directive):
+        if not trimmed_value in find_directives:
             return self._parse_list(value)
 
+        findns = trimmed_value == find_directives[1]
+        if findns and not PY3:
+            raise DistutilsOptionError('find_namespace: directive is unsupported on Python < 3.3')
+
         # Read function arguments from a dedicated section.
         find_kwargs = self.parse_section_packages__find(
             self.sections.get('packages.find', {}))
 
-        from setuptools import find_packages
+        if findns:
+            from setuptools import find_namespace_packages as find_packages
+        else:
+            from setuptools import find_packages
 
         return find_packages(**find_kwargs)
 
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 54dd7d2b20..5f4a1c2958 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -2,5 +2,17 @@
 
 import pytest
 
+from setuptools.extern.six import PY2, PY3
+
+
+__all__ = [
+  'fail_on_ascii', 'py2_only', 'py3_only'
+]
+
+
 is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
+
+
+py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
+py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 19b3763363..acf221549b 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -4,18 +4,20 @@
 from mock import patch
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
-
+from . import py2_only, py3_only
 
 class ErrConfigHandler(ConfigHandler):
     """Erroneous handler. Fails to implement required methods."""
 
 
-def make_package_dir(name, base_dir):
+def make_package_dir(name, base_dir, ns=False):
     dir_package = base_dir
     for dir_name in name.split('/'):
         dir_package = dir_package.mkdir(dir_name)
-    init_file = dir_package.join('__init__.py')
-    init_file.write('')
+    init_file = None
+    if not ns:
+      init_file = dir_package.join('__init__.py')
+      init_file.write('')
     return dir_package, init_file
 
 
@@ -596,6 +598,60 @@ def test_find_directive(self, tmpdir):
             assert set(dist.packages) == set(
                 ['fake_package',  'fake_package.sub_two'])
 
+    @py2_only
+    def test_find_namespace_directive_fails_on_py2(self, tmpdir):
+        dir_package, config = fake_env(
+            tmpdir,
+            '[options]\n'
+            'packages = find_namespace:\n'
+        )
+
+        with pytest.raises(DistutilsOptionError):
+            with get_dist(tmpdir) as dist:
+                dist.parse_config_files()
+
+    @py3_only
+    def test_find_namespace_directive(self, tmpdir):
+        dir_package, config = fake_env(
+            tmpdir,
+            '[options]\n'
+            'packages = find_namespace:\n'
+        )
+
+        dir_sub_one, _ = make_package_dir('sub_one', dir_package)
+        dir_sub_two, _ = make_package_dir('sub_two', dir_package, ns=True)
+
+        with get_dist(tmpdir) as dist:
+            assert set(dist.packages) == { 
+                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one'
+            }
+
+        config.write(
+            '[options]\n'
+            'packages = find_namespace:\n'
+            '\n'
+            '[options.packages.find]\n'
+            'where = .\n'
+            'include =\n'
+            '    fake_package.sub_one\n'
+            '    two\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.packages == ['fake_package.sub_one']
+
+        config.write(
+            '[options]\n'
+            'packages = find_namespace:\n'
+            '\n'
+            '[options.packages.find]\n'
+            'exclude =\n'
+            '    fake_package.sub_one\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert set(dist.packages) == {
+                'fake_package',  'fake_package.sub_two'
+            }
+
     def test_extras_require(self, tmpdir):
         fake_env(
             tmpdir,
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index 02ae5a946d..b08f91c7d5 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -7,12 +7,12 @@
 
 import pytest
 
+from . import py3_only
+
 from setuptools.extern.six import PY3
 from setuptools import find_packages
-
-py3_only = pytest.mark.xfail(not PY3, reason="Test runs on Python 3 only")
 if PY3:
-  from setuptools import find_packages_ns
+  from setuptools import find_namespace_packages
 
 # modeled after CPython's test.support.can_symlink
 
@@ -156,26 +156,26 @@ def _assert_packages(self, actual, expected):
 
     @py3_only
     def test_pep420_ns_package(self):
-        packages = find_packages_ns(
+        packages = find_namespace_packages(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @py3_only
     def test_pep420_ns_package_no_includes(self):
-        packages = find_packages_ns(
+        packages = find_namespace_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @py3_only
     def test_pep420_ns_package_no_includes_or_excludes(self):
-        packages = find_packages_ns(self.dist_dir)
+        packages = find_namespace_packages(self.dist_dir)
         expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self._assert_packages(packages, expected)
 
     @py3_only
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
-        packages = find_packages_ns(
+        packages = find_namespace_packages(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
@@ -183,6 +183,6 @@ def test_regular_package_with_nested_pep420_ns_packages(self):
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
-        packages = find_packages_ns(self.dist_dir)
+        packages = find_namespace_packages(self.dist_dir)
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 

From 248ba511439402fc367ec808a97b1de40fdefbdf Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 9 Aug 2018 17:31:47 +0300
Subject: [PATCH 7097/8469] Upgrade vendored appdirs from 1.4.0 to 1.4.3

---
 pkg_resources/_vendor/appdirs.py   | 86 ++++++++++++++++++++++++------
 pkg_resources/_vendor/vendored.txt |  4 +-
 setuptools/_vendor/vendored.txt    |  2 +-
 3 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
index f4dba0953c..ae67001af8 100644
--- a/pkg_resources/_vendor/appdirs.py
+++ b/pkg_resources/_vendor/appdirs.py
@@ -13,7 +13,7 @@
 # - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
 # - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
-__version_info__ = (1, 4, 0)
+__version_info__ = (1, 4, 3)
 __version__ = '.'.join(map(str, __version_info__))
 
 
@@ -98,7 +98,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
 
 
 def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
-    """Return full path to the user-shared data dir for this application.
+    r"""Return full path to the user-shared data dir for this application.
 
         "appname" is the name of application.
             If None, just the system directory is returned.
@@ -117,7 +117,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             returned, or '/usr/local/share/<AppName>',
             if XDG_DATA_DIRS is not set
 
-    Typical user data directories are:
+    Typical site data directories are:
         Mac OS X:   /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
@@ -184,13 +184,13 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
             for a discussion of issues.
 
-    Typical user data directories are:
+    Typical user config directories are:
         Mac OS X:               same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
     For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME.
-    That means, by deafult "~/.config/<AppName>".
+    That means, by default "~/.config/<AppName>".
     """
     if system in ["win32", "darwin"]:
         path = user_data_dir(appname, appauthor, None, roaming)
@@ -204,7 +204,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
 
 
 def site_config_dir(appname=None, appauthor=None, version=None, multipath=False):
-    """Return full path to the user-shared data dir for this application.
+    r"""Return full path to the user-shared data dir for this application.
 
         "appname" is the name of application.
             If None, just the system directory is returned.
@@ -222,7 +222,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned. By default, the first item from XDG_CONFIG_DIRS is
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
-    Typical user data directories are:
+    Typical site config directories are:
         Mac OS X:   same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
@@ -311,6 +311,48 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
     return path
 
 
+def user_state_dir(appname=None, appauthor=None, version=None, roaming=False):
+    r"""Return full path to the user-specific state dir for this application.
+
+        "appname" is the name of application.
+            If None, just the system directory is returned.
+        "appauthor" (only used on Windows) is the name of the
+            appauthor or distributing body for this application. Typically
+            it is the owning company name. This falls back to appname. You may
+            pass False to disable it.
+        "version" is an optional version path element to append to the
+            path. You might want to use this if you want multiple versions
+            of your app to be able to run independently. If used, this
+            would typically be "<major>.<minor>".
+            Only applied when appname is present.
+        "roaming" (boolean, default False) can be set True to use the Windows
+            roaming appdata directory. That means that for users on a Windows
+            network setup for roaming profiles, this user data will be
+            sync'd on login. See
+            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
+            for a discussion of issues.
+
+    Typical user state directories are:
+        Mac OS X:  same as user_data_dir
+        Unix:      ~/.local/state/<AppName>   # or in $XDG_STATE_HOME, if defined
+        Win *:     same as user_data_dir
+
+    For Unix, we follow this Debian proposal <https://wiki.debian.org/XDGBaseDirectorySpecification#state>
+    to extend the XDG spec and support $XDG_STATE_HOME.
+
+    That means, by default "~/.local/state/<AppName>".
+    """
+    if system in ["win32", "darwin"]:
+        path = user_data_dir(appname, appauthor, None, roaming)
+    else:
+        path = os.getenv('XDG_STATE_HOME', os.path.expanduser("~/.local/state"))
+        if appname:
+            path = os.path.join(path, appname)
+    if appname and version:
+        path = os.path.join(path, version)
+    return path
+
+
 def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
     r"""Return full path to the user-specific log dir for this application.
 
@@ -329,7 +371,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             "Logs" to the base app data dir for Windows, and "log" to the
             base cache dir for Unix. See discussion below.
 
-    Typical user cache directories are:
+    Typical user log directories are:
         Mac OS X:   ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
@@ -364,8 +406,8 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
 
 class AppDirs(object):
     """Convenience wrapper for getting application dirs."""
-    def __init__(self, appname, appauthor=None, version=None, roaming=False,
-                 multipath=False):
+    def __init__(self, appname=None, appauthor=None, version=None,
+            roaming=False, multipath=False):
         self.appname = appname
         self.appauthor = appauthor
         self.version = version
@@ -397,6 +439,11 @@ def user_cache_dir(self):
         return user_cache_dir(self.appname, self.appauthor,
                               version=self.version)
 
+    @property
+    def user_state_dir(self):
+        return user_state_dir(self.appname, self.appauthor,
+                              version=self.version)
+
     @property
     def user_log_dir(self):
         return user_log_dir(self.appname, self.appauthor,
@@ -410,7 +457,10 @@ def _get_win_folder_from_registry(csidl_name):
     registry for this guarantees us the correct answer for all CSIDL_*
     names.
     """
-    import _winreg
+    if PY3:
+      import winreg as _winreg
+    else:
+      import _winreg
 
     shell_folder_name = {
         "CSIDL_APPDATA": "AppData",
@@ -500,7 +550,7 @@ def _get_win_folder_with_jna(csidl_name):
     if has_high_char:
         buf = array.zeros('c', buf_size)
         kernel = win32.Kernel32.INSTANCE
-        if kernal.GetShortPathName(dir, buf, buf_size):
+        if kernel.GetShortPathName(dir, buf, buf_size):
             dir = jna.Native.toString(buf.tostring()).rstrip("\0")
 
     return dir
@@ -527,9 +577,15 @@ def _get_win_folder_with_jna(csidl_name):
     appname = "MyApp"
     appauthor = "MyCompany"
 
-    props = ("user_data_dir", "site_data_dir",
-             "user_config_dir", "site_config_dir",
-             "user_cache_dir", "user_log_dir")
+    props = ("user_data_dir",
+             "user_config_dir",
+             "user_cache_dir",
+             "user_state_dir",
+             "user_log_dir",
+             "site_data_dir",
+             "site_config_dir")
+
+    print("-- app dirs %s --" % __version__)
 
     print("-- app dirs (with optional 'version')")
     dirs = AppDirs(appname, appauthor, version="1.0")
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 9a94c5bcc2..e3d564f163 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
 packaging==16.8
-pyparsing==2.1.10
+pyparsing==2.2.0
 six==1.10.0
-appdirs==1.4.0
+appdirs==1.4.3
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index be3e72eb30..ca0d5ce38e 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,3 +1,3 @@
 packaging==16.8
-pyparsing==2.1.10
+pyparsing==2.2.0
 six==1.10.0

From 993f6d870f1420d38ad0745d034a5e9cb90d7c32 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 9 Aug 2018 17:42:56 +0300
Subject: [PATCH 7098/8469] Add changelog

---
 changelog.d/1451.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1451.change.rst

diff --git a/changelog.d/1451.change.rst b/changelog.d/1451.change.rst
new file mode 100644
index 0000000000..236efd8508
--- /dev/null
+++ b/changelog.d/1451.change.rst
@@ -0,0 +1 @@
+Upgrade vendored appdirs from 1.4.0 to 1.4.3.

From 8d887526f34f8955d7df257a24e8e8cf9f3f16de Mon Sep 17 00:00:00 2001
From: Daniele Esposti <daniele.esposti@gmail.com>
Date: Sat, 16 Jun 2018 16:05:49 +0200
Subject: [PATCH 7099/8469] Support scripts with unicode content

This also renames the _to_ascii function to better reflect its purpose.
---
 setuptools/command/easy_install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 05508cebe1..dd17cc13f5 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -96,7 +96,7 @@ def samefile(p1, p2):
 
 if six.PY2:
 
-    def _to_ascii(s):
+    def _to_bytes(s):
         return s
 
     def isascii(s):
@@ -107,8 +107,8 @@ def isascii(s):
             return False
 else:
 
-    def _to_ascii(s):
-        return s.encode('ascii')
+    def _to_bytes(s):
+        return s.encode('utf8')
 
     def isascii(s):
         try:
@@ -805,7 +805,7 @@ def install_script(self, dist, script_name, script_text, dev_path=None):
         if is_script:
             body = self._load_template(dev_path) % locals()
             script_text = ScriptWriter.get_header(script_text) + body
-        self.write_script(script_name, _to_ascii(script_text), 'b')
+        self.write_script(script_name, _to_bytes(script_text), 'b')
 
     @staticmethod
     def _load_template(dev_path):

From 961387fb4112d631e4ddc1f48467205bc77d7fe6 Mon Sep 17 00:00:00 2001
From: Daniele Esposti <daniele.esposti@gmail.com>
Date: Wed, 11 Jul 2018 08:53:13 +0100
Subject: [PATCH 7100/8469] Added test for scripts with unicode

---
 setuptools/tests/test_easy_install.py | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 345d283c31..80a6549734 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -185,6 +185,58 @@ def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
         cmd.ensure_finalized()
         cmd.easy_install(sdist_unicode)
 
+    @pytest.fixture
+    def sdist_unicode_in_script(self, tmpdir):
+        files = [
+            (
+                "setup.py",
+                DALS("""
+                    import setuptools
+                    setuptools.setup(
+                        name="setuptools-test-unicode",
+                        version="1.0",
+                        packages=["mypkg"],
+                        include_package_data=True,
+                        scripts=['mypkg/unicode_in_script'],
+                    )
+                    """),
+            ),
+            ("mypkg/__init__.py", ""),
+            (
+                "mypkg/unicode_in_script",
+                DALS(
+                    """
+                    #!/bin/sh
+                    # \xc3\xa1
+
+                    non_python_fn() {
+                    }
+                """),
+            ),
+        ]
+        sdist_name = "setuptools-test-unicode-script-1.0.zip"
+        sdist = tmpdir / sdist_name
+        # can't use make_sdist, because the issue only occurs
+        #  with zip sdists.
+        sdist_zip = zipfile.ZipFile(str(sdist), "w")
+        for filename, content in files:
+            sdist_zip.writestr(filename, content)
+        sdist_zip.close()
+        return str(sdist)
+
+    @fail_on_ascii
+    def test_unicode_content_in_sdist(self, sdist_unicode_in_script, tmpdir, monkeypatch):
+        """
+        The install command should execute correctly even if
+        the package has unicode in scripts.
+        """
+        dist = Distribution({"script_args": ["easy_install"]})
+        target = (tmpdir / "target").ensure_dir()
+        cmd = ei.easy_install(dist, install_dir=str(target), args=["x"])
+        monkeypatch.setitem(os.environ, "PYTHONPATH", str(target))
+        cmd.ensure_finalized()
+        cmd.easy_install(sdist_unicode_in_script)
+
     @pytest.fixture
     def sdist_script(self, tmpdir):
         files = [

From c43d0f6fbbdf7386cb65b6a4c74adaadea76793d Mon Sep 17 00:00:00 2001
From: Daniele Esposti <daniele.esposti@gmail.com>
Date: Sat, 16 Jun 2018 02:07:27 +0200
Subject: [PATCH 7101/8469] Add changelog for PR #1389

---
 changelog.d/1389.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1389.change.rst

diff --git a/changelog.d/1389.change.rst b/changelog.d/1389.change.rst
new file mode 100644
index 0000000000..1177b92498
--- /dev/null
+++ b/changelog.d/1389.change.rst
@@ -0,0 +1 @@
+Scripts which have unicode content are now supported

From 96a81b6d70de9748af8135a6f3a888c0959f3ac2 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 17 Aug 2018 09:06:57 -0400
Subject: [PATCH 7102/8469] Add .gitignore to changelog.d

Add an empty .gitignore to changelog.d to prevent the directory from
being deleted when it is emptied out during a release.
---
 changelog.d/.gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 changelog.d/.gitignore

diff --git a/changelog.d/.gitignore b/changelog.d/.gitignore
new file mode 100644
index 0000000000..e69de29bb2

From 115fab8b601de84c9841c1172ebe43a8610144cb Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 17 Aug 2018 10:23:27 -0400
Subject: [PATCH 7103/8469] Prepare 40.1.0 release

---
 CHANGES.rst                 | 15 +++++++++++++++
 changelog.d/1312.change.rst |  1 -
 changelog.d/1388.change.rst |  1 -
 changelog.d/1389.change.rst |  1 -
 changelog.d/1410.change.rst |  1 -
 changelog.d/1416.change.rst |  1 -
 changelog.d/1418.change.rst |  1 -
 changelog.d/1420.change.rst |  1 -
 changelog.d/1441.misc.rst   |  1 -
 changelog.d/1450.change.rst |  1 -
 changelog.d/1451.change.rst |  1 -
 11 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 changelog.d/1312.change.rst
 delete mode 100644 changelog.d/1388.change.rst
 delete mode 100644 changelog.d/1389.change.rst
 delete mode 100644 changelog.d/1410.change.rst
 delete mode 100644 changelog.d/1416.change.rst
 delete mode 100644 changelog.d/1418.change.rst
 delete mode 100644 changelog.d/1420.change.rst
 delete mode 100644 changelog.d/1441.misc.rst
 delete mode 100644 changelog.d/1450.change.rst
 delete mode 100644 changelog.d/1451.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 05de4cfc84..cc43156f97 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v40.1.0
+-------
+
+* #1410: Deprecated ``upload`` and ``register`` commands.
+* #1312: Introduced find_namespace_packages() to find PEP 420 namespace packages.
+* #1420: Added find_namespace: directive to config parser.
+* #1418: Solved race in when creating egg cache directories.
+* #1450: Upgraded vendored PyParsing from 2.1.10 to 2.2.0.
+* #1451: Upgraded vendored appdirs from 1.4.0 to 1.4.3.
+* #1388: Fixed "Microsoft Visual C++ Build Tools" link in exception when Visual C++ not found.
+* #1389: Added support for scripts which have unicode content.
+* #1416: Moved several Python version checks over to using ``six.PY2`` and ``six.PY3``.
+* #1441: Removed spurious executable permissions from files that don't need them.
+
+
 v40.0.0
 -------
 
diff --git a/changelog.d/1312.change.rst b/changelog.d/1312.change.rst
deleted file mode 100644
index e2542f98fd..0000000000
--- a/changelog.d/1312.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Introduce find_namespace_packages() to find PEP 420 namespace packages.
diff --git a/changelog.d/1388.change.rst b/changelog.d/1388.change.rst
deleted file mode 100644
index b98dc966df..0000000000
--- a/changelog.d/1388.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed "Microsoft Visual C++ Build Tools" link in exception when Visual C++ not found.
diff --git a/changelog.d/1389.change.rst b/changelog.d/1389.change.rst
deleted file mode 100644
index 1177b92498..0000000000
--- a/changelog.d/1389.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Scripts which have unicode content are now supported
diff --git a/changelog.d/1410.change.rst b/changelog.d/1410.change.rst
deleted file mode 100644
index ab6162ce79..0000000000
--- a/changelog.d/1410.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate ``upload`` and ``register`` commands.
diff --git a/changelog.d/1416.change.rst b/changelog.d/1416.change.rst
deleted file mode 100644
index e4138a8fb6..0000000000
--- a/changelog.d/1416.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Moved several Python version checks over to using ``six.PY2`` and ``six.PY3``.
diff --git a/changelog.d/1418.change.rst b/changelog.d/1418.change.rst
deleted file mode 100644
index d7656f574b..0000000000
--- a/changelog.d/1418.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Solved race in when creating egg cache directories.
diff --git a/changelog.d/1420.change.rst b/changelog.d/1420.change.rst
deleted file mode 100644
index 6967adccb0..0000000000
--- a/changelog.d/1420.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add find_namespace: directive to config parser
diff --git a/changelog.d/1441.misc.rst b/changelog.d/1441.misc.rst
deleted file mode 100644
index 470d4b569a..0000000000
--- a/changelog.d/1441.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove spurious executable permissions from files that don't need them.
diff --git a/changelog.d/1450.change.rst b/changelog.d/1450.change.rst
deleted file mode 100644
index 38f906e303..0000000000
--- a/changelog.d/1450.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade vendored PyParsing from 2.1.10 to 2.2.0.
diff --git a/changelog.d/1451.change.rst b/changelog.d/1451.change.rst
deleted file mode 100644
index 236efd8508..0000000000
--- a/changelog.d/1451.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade vendored appdirs from 1.4.0 to 1.4.3.

From d2346c91804333b29fe63b8e1414cd764eb1ef5f Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 17 Aug 2018 17:36:20 +0300
Subject: [PATCH 7104/8469] xfail namespace packages tests on appveyor instead
 of skipping them

---
 setuptools/tests/test_namespaces.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 00ec75b45d..52ac6a68ab 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -14,8 +14,10 @@ class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 5),
         reason="Requires importlib.util.module_from_spec")
-    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
-        reason="https://github.com/pypa/setuptools/issues/851")
+    @pytest.mark.xfail(
+        os.environ.get("APPVEYOR"),
+        reason="https://github.com/pypa/setuptools/issues/851",
+    )
     def test_mixed_site_and_non_site(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed
@@ -55,8 +57,10 @@ def test_mixed_site_and_non_site(self, tmpdir):
         with test.test.paths_on_pythonpath(map(str, targets)):
             subprocess.check_call(try_import)
 
-    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
-        reason="https://github.com/pypa/setuptools/issues/851")
+    @pytest.mark.xfail(
+        os.environ.get("APPVEYOR"),
+        reason="https://github.com/pypa/setuptools/issues/851",
+    )
     def test_pkg_resources_import(self, tmpdir):
         """
         Ensure that a namespace package doesn't break on import
@@ -81,8 +85,10 @@ def test_pkg_resources_import(self, tmpdir):
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(try_import)
 
-    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
-        reason="https://github.com/pypa/setuptools/issues/851")
+    @pytest.mark.xfail(
+        os.environ.get("APPVEYOR"),
+        reason="https://github.com/pypa/setuptools/issues/851",
+    )
     def test_namespace_package_installed_and_cwd(self, tmpdir):
         """
         Installing a namespace packages but also having it in the current
@@ -110,8 +116,10 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A))
 
-    @pytest.mark.skipif(bool(os.environ.get("APPVEYOR")),
-        reason="https://github.com/pypa/setuptools/issues/851")
+    @pytest.mark.xfail(
+        os.environ.get("APPVEYOR"),
+        reason="https://github.com/pypa/setuptools/issues/851",
+    )
     def test_packages_in_the_sampe_namespace_installed_and_cwd(self, tmpdir):
         """
         Installing one namespace package and also have another in the same

From 1fc75056079f49d980dd664222bae47a713906ca Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 17 Aug 2018 17:38:22 +0300
Subject: [PATCH 7105/8469] change formatting to fix flake8 warning

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

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 52ac6a68ab..839f565163 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -12,8 +12,10 @@
 
 class TestNamespaces:
 
-    @pytest.mark.xfail(sys.version_info < (3, 5),
-        reason="Requires importlib.util.module_from_spec")
+    @pytest.mark.xfail(
+        sys.version_info < (3, 5),
+        reason="Requires importlib.util.module_from_spec",
+    )
     @pytest.mark.xfail(
         os.environ.get("APPVEYOR"),
         reason="https://github.com/pypa/setuptools/issues/851",

From d63b6b5b9fb63c0bfb83fb91edee10114c932e54 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 17 Aug 2018 14:49:56 -0400
Subject: [PATCH 7106/8469] =?UTF-8?q?Bump=20version:=2040.0.0=20=E2=86=92?=
 =?UTF-8?q?=2040.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2caeca9b76..870d629962 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.0.0
+current_version = 40.1.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 27a0e30e02..526a7ba6d3 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.0.0",
+    version="40.1.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 6f58adff3ffef015de299e24720dca3997878a71 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Fri, 13 Jul 2018 15:17:49 +0100
Subject: [PATCH 7107/8469] gitignore: Ignore .venv directory

These are commonly used for testing purposes.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b850622f3f..1f58eb319c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ setuptools.egg-info
 .coverage
 .eggs
 .tox
+.venv
 *.egg
 *.py[cod]
 *.swp

From cf50418d36c80b35e0f791a96f0a828705ebf25f Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Fri, 13 Jul 2018 15:20:46 +0100
Subject: [PATCH 7108/8469] trivial: Fix file permissions

There's no reason these should be executable.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 setuptools/command/easy_install.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 setuptools/command/easy_install.py

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
old mode 100755
new mode 100644

From 47874756915a9a757f81d87f32ef5bfa2a333a26 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Fri, 13 Jul 2018 15:59:55 +0100
Subject: [PATCH 7109/8469] egg_info: Touch 'egg-info' directory

'tox' determines whether a package should be rebuilt by comparing the
timestamp of the package's 'egg-info' directory and its 'setup.py' or
'setup.cfg' files [1][2]. Unfortunately this checks the 'egg-info'
directory itself, which is not updated, unlike the contents of that
directory. This means that 'tox' will always rebuild the package once
one of the two setup files has been updated.

While this is clearly a bug in 'tox' that should be fixed separately,
there is merit in using this as a heuristic so enable it.

[1] https://github.com/tox-dev/tox/blob/3.1.0/src/tox/venv.py#L253-L257
[2] https://github.com/tox-dev/tox/blob/3.1.0/src/tox/venv.py#L221-L244

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 changelog.d/1427.change.rst       |  1 +
 setuptools/command/egg_info.py    |  1 +
 setuptools/tests/test_egg_info.py | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 changelog.d/1427.change.rst

diff --git a/changelog.d/1427.change.rst b/changelog.d/1427.change.rst
new file mode 100644
index 0000000000..86260235a4
--- /dev/null
+++ b/changelog.d/1427.change.rst
@@ -0,0 +1 @@
+Set timestamp of ``.egg-info`` directory whenever ``egg_info`` command is run.
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5fd6c88803..a3cd35dc15 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -281,6 +281,7 @@ def delete_file(self, filename):
 
     def run(self):
         self.mkpath(self.egg_info)
+        os.utime(self.egg_info, None)
         installer = self.distribution.fetch_build_egg
         for ep in iter_entry_points('egg_info.writers'):
             ep.require(installer=installer)
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1a100266ea..c7a082953a 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,9 +1,11 @@
+import datetime
 import sys
 import ast
 import os
 import glob
 import re
 import stat
+import time
 
 from setuptools.command.egg_info import egg_info, manifest_maker
 from setuptools.dist import Distribution
@@ -146,6 +148,21 @@ def test_expected_files_produced(self, tmpdir_cwd, env):
         ]
         assert sorted(actual) == expected
 
+    def test_rebuilt(self, tmpdir_cwd, env):
+        """Ensure timestamps are updated when the command is re-run."""
+        self._create_project()
+
+        self._run_egg_info_command(tmpdir_cwd, env)
+        timestamp_a = os.path.getmtime('foo.egg-info')
+
+        # arbitrary sleep just to handle *really* fast systems
+        time.sleep(.001)
+
+        self._run_egg_info_command(tmpdir_cwd, env)
+        timestamp_b = os.path.getmtime('foo.egg-info')
+
+        assert timestamp_a != timestamp_b
+
     def test_manifest_template_is_read(self, tmpdir_cwd, env):
         self._create_project()
         build_files({

From 83c7d77abdaf4f802cd651fb59de77c72dc94cfe Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Mon, 20 Aug 2018 15:25:14 +0100
Subject: [PATCH 7110/8469] PEP 517 hook arguments are unicode, not str (and
 distutils objects to that)

---
 setuptools/build_meta.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 609ea1e510..fb657a5462 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -61,6 +61,19 @@ def patch(cls):
             distutils.core.Distribution = orig
 
 
+def _to_str(s):
+    """
+    Convert a filename to a string (on Python 2, explicitly
+    a byte string, not Unicode) as distutils checks for the
+    exact type str.
+    """
+    if sys.version_info[0] == 2 and not isinstance(s, str):
+        # Assume it's Unicode, as that's what the PEP says
+        # should be provided.
+        return s.encode(sys.getfilesystemencoding())
+    return s
+
+
 def _run_setup(setup_script='setup.py'):
     # Note that we can reuse our build directory between calls
     # Correctness comes first, then optimization later
@@ -109,7 +122,7 @@ def get_requires_for_build_sdist(config_settings=None):
 
 
 def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
-    sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', metadata_directory]
+    sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', _to_str(metadata_directory)]
     _run_setup()
     
     dist_info_directory = metadata_directory

From 337c008c33ab5799911cc7a8f4e8ff93e715a73b Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 21 Aug 2018 01:54:51 +0200
Subject: [PATCH 7111/8469] setuptools: fix regression with `egg_info` command

Ensure version is tagged only once.
---
 changelog.d/1465.change.rst       |  1 +
 setuptools/command/egg_info.py    | 16 ++++++++--------
 setuptools/tests/test_egg_info.py | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 changelog.d/1465.change.rst

diff --git a/changelog.d/1465.change.rst b/changelog.d/1465.change.rst
new file mode 100644
index 0000000000..93e3e2e244
--- /dev/null
+++ b/changelog.d/1465.change.rst
@@ -0,0 +1 @@
+Fix regression with `egg_info` command when tagging is used.
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5fd6c88803..74350cbd1a 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -160,7 +160,9 @@ class egg_info(InfoCommon, Command):
 
     def initialize_options(self):
         self.egg_base = None
+        self.egg_name = None
         self.egg_info = None
+        self.egg_version = None
         self.broken_egg_info = False
 
     ####################################
@@ -188,15 +190,13 @@ def save_version_info(self, filename):
         egg_info['tag_date'] = 0
         edit_config(filename, dict(egg_info=egg_info))
 
-    @property
-    def egg_name(self):
-        return self.name
-
-    @property
-    def egg_version(self):
-        return self.tagged_version()
-
     def finalize_options(self):
+        # Note: we need to capture the current value returned
+        # by `self.tagged_version()`, so we can later update
+        # `self.distribution.metadata.version` without
+        # repercussions.
+        self.egg_name = self.name
+        self.egg_version = self.tagged_version()
         parsed_version = parse_version(self.egg_version)
 
         try:
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1a100266ea..17d40fb894 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -570,3 +570,19 @@ def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
             raise AssertionError(data)
         if output:
             assert output in data
+
+    def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'setup.cfg': DALS("""
+                              [egg_info]
+                              tag_build = dev
+                              tag_date = 0
+                              tag_svn_revision = 0
+                              """),
+        })
+        self._run_egg_info_command(tmpdir_cwd, env)
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        assert 'Version: 0.0.0.dev0' in pkg_info_lines

From 785feaf7981fac8731a750f6ed1f6a19561c50ed Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Tue, 21 Aug 2018 09:51:03 +0100
Subject: [PATCH 7112/8469] Add a test for a Unicode metadata directory

---
 setuptools/tests/test_build_meta.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index b39b7b8f90..c1be3eda92 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -126,3 +126,12 @@ def test_prepare_metadata_for_build_wheel(build_backend):
     dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
 
     assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
+
+
+def test_prepare_metadata_for_build_wheel_with_unicode(build_backend):
+    dist_dir = os.path.abspath(u'pip-dist-info')
+    os.makedirs(dist_dir)
+
+    dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
+
+    assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))

From 687cfab49529e530af4091ddf126a476681b7fd3 Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Tue, 21 Aug 2018 09:59:58 +0100
Subject: [PATCH 7113/8469] Add a changelog entry

---
 changelog.d/1466.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1466.change.rst

diff --git a/changelog.d/1466.change.rst b/changelog.d/1466.change.rst
new file mode 100644
index 0000000000..7818bfc10d
--- /dev/null
+++ b/changelog.d/1466.change.rst
@@ -0,0 +1 @@
+Fix handling of Unicode arguments in PEP 517 backend

From 0553c91f1c08d0426574bc996e377706a6df3e1a Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Tue, 21 Aug 2018 14:01:26 +0300
Subject: [PATCH 7114/8469] remove xfail for namespace tests that actually pass
 in AppVeyor

---
 setuptools/tests/test_namespaces.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 839f565163..f2acff84f3 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -59,10 +59,6 @@ def test_mixed_site_and_non_site(self, tmpdir):
         with test.test.paths_on_pythonpath(map(str, targets)):
             subprocess.check_call(try_import)
 
-    @pytest.mark.xfail(
-        os.environ.get("APPVEYOR"),
-        reason="https://github.com/pypa/setuptools/issues/851",
-    )
     def test_pkg_resources_import(self, tmpdir):
         """
         Ensure that a namespace package doesn't break on import
@@ -87,10 +83,6 @@ def test_pkg_resources_import(self, tmpdir):
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(try_import)
 
-    @pytest.mark.xfail(
-        os.environ.get("APPVEYOR"),
-        reason="https://github.com/pypa/setuptools/issues/851",
-    )
     def test_namespace_package_installed_and_cwd(self, tmpdir):
         """
         Installing a namespace packages but also having it in the current
@@ -118,11 +110,7 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A))
 
-    @pytest.mark.xfail(
-        os.environ.get("APPVEYOR"),
-        reason="https://github.com/pypa/setuptools/issues/851",
-    )
-    def test_packages_in_the_sampe_namespace_installed_and_cwd(self, tmpdir):
+    def test_packages_in_the_same_namespace_installed_and_cwd(self, tmpdir):
         """
         Installing one namespace package and also have another in the same
         namespace in the current working directory, both of them must be

From 172a572840cb19ec65d4541a557cd79d3865297a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 08:33:26 -0400
Subject: [PATCH 7115/8469] =?UTF-8?q?Bump=20version:=2040.1.0=20=E2=86=92?=
 =?UTF-8?q?=2040.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1465.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1465.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index cc43156f97..5c52e9405f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+vv40.1.1
+--------
+
+* #1465: Fix regression with `egg_info` command when tagging is used.
+
+
 v40.1.0
 -------
 
diff --git a/changelog.d/1465.change.rst b/changelog.d/1465.change.rst
deleted file mode 100644
index 93e3e2e244..0000000000
--- a/changelog.d/1465.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression with `egg_info` command when tagging is used.
diff --git a/setup.cfg b/setup.cfg
index 870d629962..df021971e5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.1.0
+current_version = 40.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 526a7ba6d3..96dbbbbc6e 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.1.0",
+    version="40.2.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 167e90277b3b5d7366372c087eeba9c9a211d22f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 08:38:01 -0400
Subject: [PATCH 7116/8469] =?UTF-8?q?Correct=20wrong=20bumpversion=20?=
 =?UTF-8?q?=E2=86=92=2040.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index df021971e5..0304f6ffb0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.2.0
+current_version = 40.1.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 96dbbbbc6e..e01043aadb 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.2.0",
+    version="40.1.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From ea8eab864c96a56a6e6a408c3f1864dcd7d31d07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 08:51:17 -0400
Subject: [PATCH 7117/8469] Use unicode literals throughout.

---
 setuptools/tests/test_build_meta.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index c1be3eda92..fe52fd4de5 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 
 import pytest
@@ -129,7 +131,7 @@ def test_prepare_metadata_for_build_wheel(build_backend):
 
 
 def test_prepare_metadata_for_build_wheel_with_unicode(build_backend):
-    dist_dir = os.path.abspath(u'pip-dist-info')
+    dist_dir = os.path.abspath('pip-dist-info')
     os.makedirs(dist_dir)
 
     dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)

From 45d02681438f22943315c793f7fd72d668d93a3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 08:56:44 -0400
Subject: [PATCH 7118/8469] Adapt test to only run on Python 2, as it's
 redundant on Python 3.

---
 setuptools/tests/test_build_meta.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index fe52fd4de5..a7d1af6606 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -130,8 +130,9 @@ def test_prepare_metadata_for_build_wheel(build_backend):
     assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
 
 
-def test_prepare_metadata_for_build_wheel_with_unicode(build_backend):
-    dist_dir = os.path.abspath('pip-dist-info')
+@pytest.mark.skipif('sys.version_info > (3,)')
+def test_prepare_metadata_for_build_wheel_with_str(build_backend):
+    dist_dir = os.path.abspath(str('pip-dist-info'))
     os.makedirs(dist_dir)
 
     dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)

From cb938be8439b69dc5f9b5c319466b2dce4cdf93f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 08:57:48 -0400
Subject: [PATCH 7119/8469] =?UTF-8?q?Bump=20version:=2040.1.1=20=E2=86=92?=
 =?UTF-8?q?=2040.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1466.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1466.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 5c52e9405f..3169e9142e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.2.0
+-------
+
+* #1466: Fix handling of Unicode arguments in PEP 517 backend
+
+
 vv40.1.1
 --------
 
diff --git a/changelog.d/1466.change.rst b/changelog.d/1466.change.rst
deleted file mode 100644
index 7818bfc10d..0000000000
--- a/changelog.d/1466.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix handling of Unicode arguments in PEP 517 backend
diff --git a/setup.cfg b/setup.cfg
index 0304f6ffb0..df021971e5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.1.1
+current_version = 40.2.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index e01043aadb..96dbbbbc6e 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.1.1",
+    version="40.2.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 6498a7e3544e25183854b1b44d77c2e650d83dbb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 09:00:41 -0400
Subject: [PATCH 7120/8469] Reindent to avoid hanging indent.

---
 setuptools/tests/test_build_meta.py | 90 +++++++++++++++--------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a7d1af6606..a5aa75a35e 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -46,50 +46,52 @@ def __call__(self, name, *args, **kw):
         return getattr(mod, name)(*args, **kw)
 
 
-defns = [{
-            'setup.py': DALS("""
-                __import__('setuptools').setup(
-                    name='foo',
-                    py_modules=['hello'],
-                    setup_requires=['six'],
-                )
-                """),
-            'hello.py': DALS("""
-                def run():
-                    print('hello')
-                """),
-        },
-        {
-            'setup.py': DALS("""
-                assert __name__ == '__main__'
-                __import__('setuptools').setup(
-                    name='foo',
-                    py_modules=['hello'],
-                    setup_requires=['six'],
-                )
-                """),
-            'hello.py': DALS("""
-                def run():
-                    print('hello')
-                """),
-        },
-        {
-            'setup.py': DALS("""
-                variable = True
-                def function():
-                    return variable
-                assert variable
-                __import__('setuptools').setup(
-                    name='foo',
-                    py_modules=['hello'],
-                    setup_requires=['six'],
-                )
-                """),
-            'hello.py': DALS("""
-                def run():
-                    print('hello')
-                """),
-        }]
+defns = [
+    {
+        'setup.py': DALS("""
+            __import__('setuptools').setup(
+                name='foo',
+                py_modules=['hello'],
+                setup_requires=['six'],
+            )
+            """),
+        'hello.py': DALS("""
+            def run():
+                print('hello')
+            """),
+    },
+    {
+        'setup.py': DALS("""
+            assert __name__ == '__main__'
+            __import__('setuptools').setup(
+                name='foo',
+                py_modules=['hello'],
+                setup_requires=['six'],
+            )
+            """),
+        'hello.py': DALS("""
+            def run():
+                print('hello')
+            """),
+    },
+    {
+        'setup.py': DALS("""
+            variable = True
+            def function():
+                return variable
+            assert variable
+            __import__('setuptools').setup(
+                name='foo',
+                py_modules=['hello'],
+                setup_requires=['six'],
+            )
+            """),
+        'hello.py': DALS("""
+            def run():
+                print('hello')
+            """),
+    },
+]
 
 
 @pytest.fixture(params=defns)

From 5c84682f385fc326b2fe4285041f0aa666e3da01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 09:11:05 -0400
Subject: [PATCH 7121/8469] Delint

---
 setuptools/tests/test_easy_install.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 80a6549734..872f97c29a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -126,7 +126,9 @@ def test_all_site_dirs(self, monkeypatch):
         site.getsitepackages.
         """
         path = normalize_path('/setuptools/test/site-packages')
-        mock_gsp = lambda: [path]
+
+        def mock_gsp():
+            return [path]
         monkeypatch.setattr(site, 'getsitepackages', mock_gsp, raising=False)
         assert path in ei.get_site_dirs()
 

From 9aa447ee4b7c49c62085560caefbd6c7868ccea9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 10:51:12 -0400
Subject: [PATCH 7122/8469] Use unicode literals in test_easy_install.

---
 setuptools/tests/test_easy_install.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 872f97c29a..7e0293c37d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Easy install Tests
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sys
 import os
@@ -17,6 +17,7 @@
 import mock
 
 import time
+from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
 
 import pytest
@@ -43,7 +44,7 @@ class FakeDist:
     def get_entry_map(self, group):
         if group != 'console_scripts':
             return {}
-        return {'name': 'ep'}
+        return {str('name'): 'ep'}
 
     def as_requirement(self):
         return 'spec'
@@ -156,7 +157,7 @@ def sdist_unicode(self, tmpdir):
                 "",
             ),
             (
-                u'mypkg/\u2603.txt',
+                'mypkg/☃.txt',
                 "",
             ),
         ]
@@ -209,7 +210,7 @@ def sdist_unicode_in_script(self, tmpdir):
                 DALS(
                     """
                     #!/bin/sh
-                    # \xc3\xa1
+                    # á
 
                     non_python_fn() {
                     }
@@ -222,7 +223,7 @@ def sdist_unicode_in_script(self, tmpdir):
         #  with zip sdists.
         sdist_zip = zipfile.ZipFile(str(sdist), "w")
         for filename, content in files:
-            sdist_zip.writestr(filename, content)
+            sdist_zip.writestr(filename, content.encode('utf-8'))
         sdist_zip.close()
         return str(sdist)
 
@@ -254,7 +255,7 @@ def sdist_script(self, tmpdir):
                     """),
             ),
             (
-                u'mypkg_script',
+                'mypkg_script',
                 DALS("""
                      #/usr/bin/python
                      print('mypkg_script')
@@ -510,7 +511,7 @@ def test_setup_requires_overrides_version_conflict(self, use_setup_cfg):
                 with contexts.quiet() as (stdout, stderr):
                     # Don't even need to install the package, just
                     # running the setup.py at all is sufficient
-                    run_setup(test_setup_py, ['--name'])
+                    run_setup(test_setup_py, [str('--name')])
 
                 lines = stdout.readlines()
                 assert len(lines) > 0
@@ -564,7 +565,7 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
                     try:
                         # Don't even need to install the package, just
                         # running the setup.py at all is sufficient
-                        run_setup(test_setup_py, ['--name'])
+                        run_setup(test_setup_py, [str('--name')])
                     except pkg_resources.VersionConflict:
                         self.fail('Installing setup.py requirements '
                             'caused a VersionConflict')
@@ -601,7 +602,7 @@ def make_dependency_sdist(dist_path, distname, version):
                 )
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with contexts.quiet() as (stdout, stderr):
-                    run_setup(test_setup_py, ['--version'])
+                    run_setup(test_setup_py, [str('--version')])
                 lines = stdout.readlines()
                 assert len(lines) > 0
                 assert lines[-1].strip() == '42'
@@ -728,7 +729,6 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
             import setuptools
             setuptools.setup(**%r)
         """)
-
     with open(test_setup_py, 'w') as f:
         f.write(setup_py_template % test_setup_attrs)
 
@@ -744,6 +744,8 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
 )
 class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
+    if six.PY2:
+        non_ascii_exe = non_ascii_exe.encode('utf-8')
     exe_with_spaces = r'C:\Program Files\Python36\python.exe'
 
     def test_get_script_header(self):
@@ -760,7 +762,7 @@ def test_get_script_header_args(self):
     def test_get_script_header_non_ascii_exe(self):
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
             executable=self.non_ascii_exe)
-        expected = '#!%s -x\n' % self.non_ascii_exe
+        expected = str('#!%s -x\n') % self.non_ascii_exe
         assert actual == expected
 
     def test_get_script_header_exe_with_spaces(self):

From 01fd232d95ad51f784de53c0993a7b91868d269d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Aug 2018 11:02:22 -0400
Subject: [PATCH 7123/8469] Delint

---
 setuptools/tests/test_easy_install.py | 60 +++++++++++++++------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 7e0293c37d..955c2ae94e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -80,7 +80,7 @@ def test_get_script_args(self):
                 sys.exit(
                     load_entry_point('spec', 'console_scripts', 'name')()
                 )
-            """)
+            """)  # noqa: E501
         dist = FakeDist()
 
         args = next(ei.ScriptWriter.get_args(dist))
@@ -172,7 +172,8 @@ def sdist_unicode(self, tmpdir):
         return str(sdist)
 
     @fail_on_ascii
-    def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
+    def test_unicode_filename_in_sdist(
+            self, sdist_unicode, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if
         the package has unicode filenames.
@@ -228,7 +229,8 @@ def sdist_unicode_in_script(self, tmpdir):
         return str(sdist)
 
     @fail_on_ascii
-    def test_unicode_content_in_sdist(self, sdist_unicode_in_script, tmpdir, monkeypatch):
+    def test_unicode_content_in_sdist(
+            self, sdist_unicode_in_script, tmpdir, monkeypatch):
         """
         The install command should execute correctly even if
         the package has unicode in scripts.
@@ -453,8 +455,8 @@ def test_setup_requires_honors_fetch_params(self):
                             dist_file,
                         ]
                         with sandbox.save_argv(['easy_install']):
-                            # attempt to install the dist. It should fail because
-                            #  it doesn't exist.
+                            # attempt to install the dist. It should
+                            # fail because it doesn't exist.
                             with pytest.raises(SystemExit):
                                 easy_install_pkg.main(ei_params)
         # there should have been two or three requests to the server
@@ -506,7 +508,8 @@ def test_setup_requires_overrides_version_conflict(self, use_setup_cfg):
 
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
-                test_pkg = create_setup_requires_package(temp_dir, use_setup_cfg=use_setup_cfg)
+                test_pkg = create_setup_requires_package(
+                    temp_dir, use_setup_cfg=use_setup_cfg)
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with contexts.quiet() as (stdout, stderr):
                     # Don't even need to install the package, just
@@ -567,7 +570,8 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
                         # running the setup.py at all is sufficient
                         run_setup(test_setup_py, [str('--name')])
                     except pkg_resources.VersionConflict:
-                        self.fail('Installing setup.py requirements '
+                        self.fail(
+                            'Installing setup.py requirements '
                             'caused a VersionConflict')
 
                 assert 'FAIL' not in stdout.getvalue()
@@ -578,21 +582,23 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg):
     @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg)
     def test_setup_requires_with_attr_version(self, use_setup_cfg):
         def make_dependency_sdist(dist_path, distname, version):
-            make_sdist(dist_path, [
-                ('setup.py',
-                 DALS("""
-                      import setuptools
-                      setuptools.setup(
-                          name={name!r},
-                          version={version!r},
-                          py_modules=[{name!r}],
-                      )
-                      """.format(name=distname, version=version))),
-                (distname + '.py',
-                 DALS("""
-                      version = 42
-                      """
-                     ))])
+            files = [(
+                'setup.py',
+                DALS("""
+                    import setuptools
+                    setuptools.setup(
+                        name={name!r},
+                        version={version!r},
+                        py_modules=[{name!r}],
+                    )
+                    """.format(name=distname, version=version)),
+            ), (
+                distname + '.py',
+                DALS("""
+                    version = 42
+                    """),
+            )]
+            make_sdist(dist_path, files)
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
                 test_pkg = create_setup_requires_package(
@@ -754,19 +760,21 @@ def test_get_script_header(self):
         assert actual == expected
 
     def test_get_script_header_args(self):
-        expected = '#!%s -x\n' % ei.nt_quote_arg(os.path.normpath
-            (sys.executable))
+        expected = '#!%s -x\n' % ei.nt_quote_arg(
+            os.path.normpath(sys.executable))
         actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x')
         assert actual == expected
 
     def test_get_script_header_non_ascii_exe(self):
-        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
+        actual = ei.ScriptWriter.get_script_header(
+            '#!/usr/bin/python',
             executable=self.non_ascii_exe)
         expected = str('#!%s -x\n') % self.non_ascii_exe
         assert actual == expected
 
     def test_get_script_header_exe_with_spaces(self):
-        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python',
+        actual = ei.ScriptWriter.get_script_header(
+            '#!/usr/bin/python',
             executable='"' + self.exe_with_spaces + '"')
         expected = '#!"%s"\n' % self.exe_with_spaces
         assert actual == expected

From ec1a8f60134fb409c9b747cb15e0b5efbd519874 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Tue, 21 Aug 2018 19:48:22 +0300
Subject: [PATCH 7124/8469] remove xfail for AppVeyor from namespace tests
 entirely

---
 setuptools/tests/test_namespaces.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index f2acff84f3..da19bd79b8 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -16,10 +16,6 @@ class TestNamespaces:
         sys.version_info < (3, 5),
         reason="Requires importlib.util.module_from_spec",
     )
-    @pytest.mark.xfail(
-        os.environ.get("APPVEYOR"),
-        reason="https://github.com/pypa/setuptools/issues/851",
-    )
     def test_mixed_site_and_non_site(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed

From 0e48f661aab7b40bbe9c8e033594f61e7e712b4a Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 4 Sep 2018 11:01:09 +0200
Subject: [PATCH 7125/8469] bpo-34530: Fix distutils find_executable()
 (GH-9049)

distutils.spawn.find_executable() now falls back on os.defpath if the
PATH environment variable is not set.
---
 spawn.py            |  2 +-
 tests/test_spawn.py | 49 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/spawn.py b/spawn.py
index 5dd415a283..5387688093 100644
--- a/spawn.py
+++ b/spawn.py
@@ -173,7 +173,7 @@ def find_executable(executable, path=None):
     os.environ['PATH'].  Returns the complete filename or None if not found.
     """
     if path is None:
-        path = os.environ['PATH']
+        path = os.environ.get('PATH', os.defpath)
 
     paths = path.split(os.pathsep)
     base, ext = os.path.splitext(executable)
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 5edc24a3a1..0d455385d8 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -1,9 +1,13 @@
 """Tests for distutils.spawn."""
-import unittest
-import sys
 import os
+import stat
+import sys
+import unittest
+from unittest import mock
 from test.support import run_unittest, unix_shell
+from test import support as test_support
 
+from distutils.spawn import find_executable
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn
 from distutils.errors import DistutilsExecError
@@ -51,6 +55,47 @@ def test_spawn(self):
         os.chmod(exe, 0o777)
         spawn([exe])  # should work without any error
 
+    def test_find_executable(self):
+        with test_support.temp_dir() as tmp_dir:
+            # use TESTFN to get a pseudo-unique filename
+            program_noeext = test_support.TESTFN
+            # Give the temporary program an ".exe" suffix for all.
+            # It's needed on Windows and not harmful on other platforms.
+            program = program_noeext + ".exe"
+
+            filename = os.path.join(tmp_dir, program)
+            with open(filename, "wb"):
+                pass
+            os.chmod(filename, stat.S_IXUSR)
+
+            # test path parameter
+            rv = find_executable(program, path=tmp_dir)
+            self.assertEqual(rv, filename)
+
+            if sys.platform == 'win32':
+                # test without ".exe" extension
+                rv = find_executable(program_noeext, path=tmp_dir)
+                self.assertEqual(rv, filename)
+
+            # test find in the current directory
+            with test_support.change_cwd(tmp_dir):
+                rv = find_executable(program)
+                self.assertEqual(rv, program)
+
+            # test non-existent program
+            dont_exist_program = "dontexist_" + program
+            rv = find_executable(dont_exist_program , path=tmp_dir)
+            self.assertIsNone(rv)
+
+            # test os.defpath: missing PATH environment variable
+            with test_support.EnvironmentVarGuard() as env:
+                with mock.patch('distutils.spawn.os.defpath', tmp_dir):
+                    env.pop('PATH')
+
+                    rv = find_executable(program)
+                    self.assertEqual(rv, filename)
+
+
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)
 

From d2eb595732e54ff8e785483b2a47fd3d20431057 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 7 Sep 2018 17:30:33 +0200
Subject: [PATCH 7126/8469] bpo-34605: Avoid master/slave terms (GH-9101)

* Replace "master process" with "parent process"
* Replace "master option mappings" with "main option mappings"
* Replace "master pattern object" with "main pattern object"
* ssl: replace "master" with "server"
* And some other similar changes
---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 0258d3deae..41bf4bb9fb 100644
--- a/command/install.py
+++ b/command/install.py
@@ -223,7 +223,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         """Finalizes options."""
-        # This method (and its pliant slaves, like 'finalize_unix()',
+        # This method (and its pliant childs, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
         # anything else we care to install from a Python module

From 4a6183a2492528b3072f91cd221c86bee8853b09 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 7 Sep 2018 18:13:10 +0200
Subject: [PATCH 7127/8469] bpo-34605: childs => children (GH-9102)

---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index 41bf4bb9fb..a1d1a1ea37 100644
--- a/command/install.py
+++ b/command/install.py
@@ -223,7 +223,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         """Finalizes options."""
-        # This method (and its pliant childs, like 'finalize_unix()',
+        # This method (and its pliant children, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
         # anything else we care to install from a Python module

From 64f5d63b221c89c3ef543f4ef10a99ff0027a63c Mon Sep 17 00:00:00 2001
From: Julien Malard <julien.malard@mail.mcgill.ca>
Date: Sun, 9 Sep 2018 02:01:26 +0530
Subject: [PATCH 7128/8469] bpo-34421 avoid unicode error in distutils logging
 (GH-8799)

This caused installation errors in some cases on Windows.
Patch by Julien Malard.
---
 log.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/log.py b/log.py
index b301a8338c..3a6602bc8b 100644
--- a/log.py
+++ b/log.py
@@ -31,7 +31,10 @@ def _log(self, level, msg, args):
                 # emulate backslashreplace error handler
                 encoding = stream.encoding
                 msg = msg.encode(encoding, "backslashreplace").decode(encoding)
-            stream.write('%s\n' % msg)
+            try:
+                stream.write('%s\n' % msg)
+            except UnicodeEncodeError:
+                stream.write('%s\n' % msg.encode('unicode-escape').decode('ascii'))
             stream.flush()
 
     def log(self, level, msg, *args):

From 1d8e96874138f1451199aba5a2f55a6e05e67c25 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Sep 2018 09:27:06 -0400
Subject: [PATCH 7129/8469] Remove extraneous v

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3169e9142e..d1667ebfe8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@ v40.2.0
 * #1466: Fix handling of Unicode arguments in PEP 517 backend
 
 
-vv40.1.1
+v40.1.1
 --------
 
 * #1465: Fix regression with `egg_info` command when tagging is used.

From b277efb9be14751c874aff02f72237bad8600df3 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 12 Sep 2018 01:40:06 +0200
Subject: [PATCH 7130/8469] bpo-34605: Replace "pliant children" with "helpers"
 (GH-9195)

In distutils.command.install, replace "pliant children" (previously,
it was "pliant slaves") with "helpers".

<!-- issue-number: [bpo-34605](https://www.bugs.python.org/issue34605) -->
https://bugs.python.org/issue34605
<!-- /issue-number -->
---
 command/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/install.py b/command/install.py
index a1d1a1ea37..c625c95bf7 100644
--- a/command/install.py
+++ b/command/install.py
@@ -223,7 +223,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         """Finalizes options."""
-        # This method (and its pliant children, like 'finalize_unix()',
+        # This method (and its helpers, like 'finalize_unix()',
         # 'finalize_other()', and 'select_scheme()') is where the default
         # installation directories for modules, extension modules, and
         # anything else we care to install from a Python module

From 2fabfd3a66e6984bd6fccf07b46356f956af0297 Mon Sep 17 00:00:00 2001
From: Bernat Gabor <gaborjbernat@gmail.com>
Date: Thu, 13 Sep 2018 10:03:06 +0100
Subject: [PATCH 7131/8469] build_meta.get_requires_for_build_sdist does not
 include wheel

the wheel package is not required to build a source distribution

Resolves #1474.
---
 changelog.d/1474.change.rst         |  1 +
 setuptools/build_meta.py            | 11 +++++------
 setuptools/tests/test_build_meta.py |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/1474.change.rst

diff --git a/changelog.d/1474.change.rst b/changelog.d/1474.change.rst
new file mode 100644
index 0000000000..9d40e785a8
--- /dev/null
+++ b/changelog.d/1474.change.rst
@@ -0,0 +1 @@
+``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index fb657a5462..f7f9bda241 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -91,9 +91,8 @@ def _fix_config(config_settings):
     return config_settings
 
 
-def _get_build_requires(config_settings):
+def _get_build_requires(config_settings, requirements):
     config_settings = _fix_config(config_settings)
-    requirements = ['setuptools', 'wheel']
 
     sys.argv = sys.argv[:1] + ['egg_info'] + \
         config_settings["--global-option"]
@@ -113,20 +112,20 @@ def _get_immediate_subdirectories(a_dir):
 
 def get_requires_for_build_wheel(config_settings=None):
     config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings)
+    return _get_build_requires(config_settings, requirements=['setuptools', 'wheel'])
 
 
 def get_requires_for_build_sdist(config_settings=None):
     config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings)
+    return _get_build_requires(config_settings, requirements=['setuptools'])
 
 
 def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', _to_str(metadata_directory)]
     _run_setup()
-    
+
     dist_info_directory = metadata_directory
-    while True:    
+    while True:
         dist_infos = [f for f in os.listdir(dist_info_directory)
                       if f.endswith('.dist-info')]
 
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a5aa75a35e..f1d517bb08 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -107,6 +107,12 @@ def test_get_requires_for_build_wheel(build_backend):
     assert sorted(actual) == sorted(expected)
 
 
+def test_get_requires_for_build_sdist(build_backend):
+    actual = build_backend.get_requires_for_build_sdist()
+    expected = ['six', 'setuptools']
+    assert sorted(actual) == sorted(expected)
+
+
 def test_build_wheel(build_backend):
     dist_dir = os.path.abspath('pip-wheel')
     os.makedirs(dist_dir)

From 12b9f825c347e842f581de89539d1bf0c582e108 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Sep 2018 13:30:58 -0400
Subject: [PATCH 7132/8469] Assign on separate lines

---
 pkg_resources/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 86ec3411bd..3f776e46ed 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2155,7 +2155,8 @@ def declare_namespace(packageName):
         if packageName in _namespace_packages:
             return
 
-        path, parent = sys.path, None
+        path = sys.path
+        parent = None
         if '.' in packageName:
             parent = '.'.join(packageName.split('.')[:-1])
             declare_namespace(parent)

From 948b3f41f9079a1c3afd3a409389d90346ec3bff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Sep 2018 13:35:26 -0400
Subject: [PATCH 7133/8469] Rely on rpartition.

---
 pkg_resources/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3f776e46ed..33f86987ee 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2156,9 +2156,9 @@ def declare_namespace(packageName):
             return
 
         path = sys.path
-        parent = None
-        if '.' in packageName:
-            parent = '.'.join(packageName.split('.')[:-1])
+        parent, _, _ = packageName.rpartition('.')
+
+        if parent:
             declare_namespace(parent)
             if parent not in _namespace_packages:
                 __import__(parent)
@@ -2169,7 +2169,7 @@ def declare_namespace(packageName):
 
         # Track what packages are namespaces, so when new path items are added,
         # they can be updated
-        _namespace_packages.setdefault(parent, []).append(packageName)
+        _namespace_packages.setdefault(parent or None, []).append(packageName)
         _namespace_packages.setdefault(packageName, [])
 
         for path_item in path:

From 6e122a15f84db69af984e464a46358a594a6ba47 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Sep 2018 15:14:48 -0400
Subject: [PATCH 7134/8469] Suppress warnings in importer.find_module. Fixes
 #1111.

---
 changelog.d/1486.change.rst | 1 +
 pkg_resources/__init__.py   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1486.change.rst

diff --git a/changelog.d/1486.change.rst b/changelog.d/1486.change.rst
new file mode 100644
index 0000000000..561784fb0f
--- /dev/null
+++ b/changelog.d/1486.change.rst
@@ -0,0 +1 @@
+Suppress warnings in pkg_resources.handle_ns.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 33f86987ee..fa1cba86f0 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2094,7 +2094,12 @@ def _handle_ns(packageName, path_item):
     importer = get_importer(path_item)
     if importer is None:
         return None
-    loader = importer.find_module(packageName)
+
+    # capture warnings due to #1111
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        loader = importer.find_module(packageName)
+
     if loader is None:
         return None
     module = sys.modules.get(packageName)

From 9a2cb89a1c733343c7040073a799d0cd782e435e Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Fri, 14 Sep 2018 15:03:29 -0700
Subject: [PATCH 7135/8469] Add tests for setuptools.glob

---
 setuptools/tests/test_glob.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 setuptools/tests/test_glob.py

diff --git a/setuptools/tests/test_glob.py b/setuptools/tests/test_glob.py
new file mode 100644
index 0000000000..a0728c5d12
--- /dev/null
+++ b/setuptools/tests/test_glob.py
@@ -0,0 +1,35 @@
+import pytest
+
+from setuptools.glob import glob
+
+from .files import build_files
+
+
+@pytest.mark.parametrize('tree, pattern, matches', (
+    ('', b'', []),
+    ('', '', []),
+    ('''
+     appveyor.yml
+     CHANGES.rst
+     LICENSE
+     MANIFEST.in
+     pyproject.toml
+     README.rst
+     setup.cfg
+     setup.py
+     ''', '*.rst', ('CHANGES.rst', 'README.rst')),
+    ('''
+     appveyor.yml
+     CHANGES.rst
+     LICENSE
+     MANIFEST.in
+     pyproject.toml
+     README.rst
+     setup.cfg
+     setup.py
+     ''', b'*.rst', (b'CHANGES.rst', b'README.rst')),
+))
+def test_glob(monkeypatch, tmpdir, tree, pattern, matches):
+    monkeypatch.chdir(tmpdir)
+    build_files({name: '' for name in tree.split()})
+    assert list(sorted(glob(pattern))) == list(sorted(matches))

From 4f165ed9d35ea7e37823bec25ed822338387c0be Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Fri, 14 Sep 2018 05:56:37 -0700
Subject: [PATCH 7136/8469] Remove use of compatibility shim six.binary_type

The type bytes is available on all supported Pythons. Makes the code
more forward compatible with Python 3.
---
 changelog.d/1479.misc.rst |  1 +
 setuptools/glob.py        | 14 ++++++--------
 setuptools/tests/files.py |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 changelog.d/1479.misc.rst

diff --git a/changelog.d/1479.misc.rst b/changelog.d/1479.misc.rst
new file mode 100644
index 0000000000..b04b0ce15f
--- /dev/null
+++ b/changelog.d/1479.misc.rst
@@ -0,0 +1 @@
+Remove internal use of six.binary_type
diff --git a/setuptools/glob.py b/setuptools/glob.py
index 6c781de349..9d7cbc5da6 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -3,14 +3,12 @@
 
 Changes include:
  * `yield from` and PEP3102 `*` removed.
- * `bytes` changed to `six.binary_type`.
  * Hidden files are not ignored.
 """
 
 import os
 import re
 import fnmatch
-from setuptools.extern.six import binary_type
 
 __all__ = ["glob", "iglob", "escape"]
 
@@ -92,7 +90,7 @@ def _iglob(pathname, recursive):
 
 def glob1(dirname, pattern):
     if not dirname:
-        if isinstance(pattern, binary_type):
+        if isinstance(pattern, bytes):
             dirname = os.curdir.encode('ASCII')
         else:
             dirname = os.curdir
@@ -129,8 +127,8 @@ def glob2(dirname, pattern):
 # Recursively yields relative pathnames inside a literal directory.
 def _rlistdir(dirname):
     if not dirname:
-        if isinstance(dirname, binary_type):
-            dirname = binary_type(os.curdir, 'ASCII')
+        if isinstance(dirname, bytes):
+            dirname = os.curdir.encode('ASCII')
         else:
             dirname = os.curdir
     try:
@@ -149,7 +147,7 @@ def _rlistdir(dirname):
 
 
 def has_magic(s):
-    if isinstance(s, binary_type):
+    if isinstance(s, bytes):
         match = magic_check_bytes.search(s)
     else:
         match = magic_check.search(s)
@@ -157,7 +155,7 @@ def has_magic(s):
 
 
 def _isrecursive(pattern):
-    if isinstance(pattern, binary_type):
+    if isinstance(pattern, bytes):
         return pattern == b'**'
     else:
         return pattern == '**'
@@ -169,7 +167,7 @@ def escape(pathname):
     # Escaping is done by wrapping any of "*?[" between square brackets.
     # Metacharacters do not work in the drive part and shouldn't be escaped.
     drive, pathname = os.path.splitdrive(pathname)
-    if isinstance(pathname, binary_type):
+    if isinstance(pathname, bytes):
         pathname = magic_check_bytes.sub(br'[\1]', pathname)
     else:
         pathname = magic_check.sub(r'[\1]', pathname)
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index f5f0e6bbc8..465a6b41e6 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -1,7 +1,6 @@
 import os
 
 
-from setuptools.extern.six import binary_type
 import pkg_resources.py31compat
 
 
@@ -31,7 +30,7 @@ def build_files(file_defs, prefix=""):
             pkg_resources.py31compat.makedirs(full_name, exist_ok=True)
             build_files(contents, prefix=full_name)
         else:
-            if isinstance(contents, binary_type):
+            if isinstance(contents, bytes):
                 with open(full_name, 'wb') as f:
                     f.write(contents)
             else:

From 6a70dbd61b343647847447114fa798a1dab95f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <christian.gonzalez@nerdocs.at>
Date: Sat, 15 Sep 2018 16:24:03 +0200
Subject: [PATCH 7137/8469] link to setuptools doc

---
 docs/pkg_resources.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 18545f4ba0..0c9fb5f260 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -703,7 +703,7 @@ entry point group and look for entry points named "pre_process" and
 To advertise an entry point, a project needs to use ``setuptools`` and provide
 an ``entry_points`` argument to ``setup()`` in its setup script, so that the
 entry points will be included in the distribution's metadata.  For more
-details, see the ``setuptools`` documentation.  (XXX link here to setuptools)
+details, see the [``setuptools`` documentation](https://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins).
 
 Each project distribution can advertise at most one entry point of a given
 name within the same entry point group.  For example, a distutils extension

From 6b222623ae5a817c27ba612e776bc45641ae41c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 10:19:45 -0400
Subject: [PATCH 7138/8469] Add Tidelift badge to readme

---
 README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index 8505c5517f..a9bed52113 100644
--- a/README.rst
+++ b/README.rst
@@ -15,6 +15,9 @@
 
 .. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
 
+.. image:: https://tidelift.com/badges/github/pypa/setuptools
+   :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
+
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From 5a58c69518337e8f0d309cb0c9a9027840cd676e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 10:33:39 -0400
Subject: [PATCH 7139/8469] Configure readthedocs with a .yml file

---
 .readthedocs.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .readthedocs.yml

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 0000000000..3aef6b6be4
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,4 @@
+python:
+  version: 3
+  requirements_file: docs/requirements.txt
+  pip_install: false

From 6aa7964fd23de681d6b74cbc01f3d552191e998b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 10:51:13 -0400
Subject: [PATCH 7140/8469] Merge ancient easy_install history into changelog

---
 CHANGES.rst           | 477 ++++++++++++++++++++++++++++++++++++++++
 docs/easy_install.txt | 498 ------------------------------------------
 2 files changed, 477 insertions(+), 498 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d1667ebfe8..fd42a6b519 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3210,6 +3210,37 @@ easy_install
    gracefully under Google App Engine (with an ``ImportError`` loading the
    C-based module, instead of getting a ``NameError``).
 
+ * Fixed ``win32.exe`` support for .pth files, so unnecessary directory nesting
+   is flattened out in the resulting egg.  (There was a case-sensitivity
+   problem that affected some distributions, notably ``pywin32``.)
+
+ * Prevent ``--help-commands`` and other junk from showing under Python 2.5
+   when running ``easy_install --help``.
+
+ * Fixed GUI scripts sometimes not executing on Windows
+
+ * Fixed not picking up dependency links from recursive dependencies.
+
+ * Only make ``.py``, ``.dll`` and ``.so`` files executable when unpacking eggs
+
+ * Changes for Jython compatibility
+
+ * Improved error message when a requirement is also a directory name, but the
+   specified directory is not a source package.
+
+ * Fixed ``--allow-hosts`` option blocking ``file:`` URLs
+
+ * Fixed HTTP SVN detection failing when the page title included a project
+   name (e.g. on SourceForge-hosted SVN)
+
+ * Fix Jython script installation to handle ``#!`` lines better when
+   ``sys.executable`` is a script.
+
+ * Removed use of deprecated ``md5`` module if ``hashlib`` is available
+
+ * Keep site directories (e.g. ``site-packages``) from being included in
+   ``.pth`` files.
+
 0.6c7
 -----
 
@@ -3220,6 +3251,11 @@ easy_install
    ``--root`` or ``--single-version-externally-managed``, due to the
    parent package not having the child package as an attribute.
 
+ * ``ftp:`` download URLs now work correctly.
+
+ * The default ``--index-url`` is now ``https://pypi.python.org/simple``, to use
+   the Python Package Index's new simpler (and faster!) REST API.
+
 0.6c6
 -----
 
@@ -3243,6 +3279,18 @@ easy_install
  * Fix ``find_packages()`` treating ``ez_setup`` and directories with ``.`` in
    their names as packages.
 
+ * EasyInstall no longer aborts the installation process if a URL it wants to
+   retrieve can't be downloaded, unless the URL is an actual package download.
+   Instead, it issues a warning and tries to keep going.
+
+ * Fixed distutils-style scripts originally built on Windows having their line
+   endings doubled when installed on any platform.
+
+ * Added ``--local-snapshots-ok`` flag, to allow building eggs from projects
+   installed using ``setup.py develop``.
+
+ * Fixed not HTML-decoding URLs scraped from web pages
+
 0.6c5
 -----
 
@@ -3252,6 +3300,9 @@ easy_install
  * Fix uploaded ``bdist_wininst`` packages being described as suitable for
    "any" version by Python 2.5, even if a ``--target-version`` was specified.
 
+ * Fixed ``.dll`` files on Cygwin not having executable permissions when an egg
+   is installed unzipped.
+
 0.6c4
 -----
 
@@ -3281,11 +3332,34 @@ easy_install
    listed a namespace package ``foo.bar`` without explicitly listing ``foo``
    as a namespace package.
 
+ * Added support for HTTP "Basic" authentication using ``http://user:pass@host``
+   URLs.  If a password-protected page contains links to the same host (and
+   protocol), those links will inherit the credentials used to access the
+   original page.
+
+ * Removed all special support for Sourceforge mirrors, as Sourceforge's
+   mirror system now works well for non-browser downloads.
+
+ * Fixed not recognizing ``win32.exe`` installers that included a custom
+   bitmap.
+
+ * Fixed not allowing ``os.open()`` of paths outside the sandbox, even if they
+   are opened read-only (e.g. reading ``/dev/urandom`` for random numbers, as
+   is done by ``os.urandom()`` on some platforms).
+
+ * Fixed a problem with ``.pth`` testing on Windows when ``sys.executable``
+   has a space in it (e.g., the user installed Python to a ``Program Files``
+   directory).
+
 0.6c3
 -----
 
  * Fixed breakages caused by Subversion 1.4's new "working copy" format
 
+ * You can once again use "python -m easy_install" with Python 2.4 and above.
+
+ * Python 2.5 compatibility fixes added.
+
 0.6c2
 -----
 
@@ -3296,6 +3370,19 @@ easy_install
  * Running ``setup.py develop`` on a setuptools-using project will now install
    setuptools if needed, instead of only downloading the egg.
 
+ * Windows script wrappers now support quoted arguments and arguments
+   containing spaces.  (Patch contributed by Jim Fulton.)
+
+ * The ``ez_setup.py`` script now actually works when you put a setuptools
+   ``.egg`` alongside it for bootstrapping an offline machine.
+
+ * A writable installation directory on ``sys.path`` is no longer required to
+   download and extract a source distribution using ``--editable``.
+
+ * Generated scripts now use ``-x`` on the ``#!`` line when ``sys.executable``
+   contains non-ASCII characters, to prevent deprecation warnings about an
+   unspecified encoding when the script is run.
+
 0.6c1
 -----
 
@@ -3319,6 +3406,9 @@ easy_install
    the version was overridden on the command line that built the source
    distribution.)
 
+ * EasyInstall now includes setuptools version information in the
+   ``User-Agent`` string sent to websites it visits.
+
 0.6b4
 -----
 
@@ -3331,6 +3421,27 @@ easy_install
  * Fixed redundant warnings about missing ``README`` file(s); it should now
    appear only if you are actually a source distribution.
 
+ * Fix creating Python wrappers for non-Python scripts
+
+ * Fix ``ftp://`` directory listing URLs from causing a crash when used in the
+   "Home page" or "Download URL" slots on PyPI.
+
+ * Fix ``sys.path_importer_cache`` not being updated when an existing zipfile
+   or directory is deleted/overwritten.
+
+ * Fix not recognizing HTML 404 pages from package indexes.
+
+ * Allow ``file://`` URLs to be used as a package index.  URLs that refer to
+   directories will use an internally-generated directory listing if there is
+   no ``index.html`` file in the directory.
+
+ * Allow external links in a package index to be specified using
+   ``rel="homepage"`` or ``rel="download"``, without needing the old
+   PyPI-specific visible markup.
+
+ * Suppressed warning message about possibly-misspelled project name, if an egg
+   or link for that project name has already been seen.
+
 0.6b3
 -----
 
@@ -3341,6 +3452,28 @@ easy_install
    ``include_package_data`` and ``package_data`` are used to refer to the same
    files.
 
+ * Fix local ``--find-links`` eggs not being copied except with
+   ``--always-copy``.
+
+ * Fix sometimes not detecting local packages installed outside of "site"
+   directories.
+
+ * Fix mysterious errors during initial ``setuptools`` install, caused by
+   ``ez_setup`` trying to run ``easy_install`` twice, due to a code fallthru
+   after deleting the egg from which it's running.
+
+0.6b2
+-----
+
+ * Don't install or update a ``site.py`` patch when installing to a
+   ``PYTHONPATH`` directory with ``--multi-version``, unless an
+   ``easy-install.pth`` file is already in use there.
+
+ * Construct ``.pth`` file paths in such a way that installing an egg whose
+   name begins with ``import`` doesn't cause a syntax error.
+
+ * Fixed a bogus warning message that wasn't updated since the 0.5 versions.
+
 0.6b1
 -----
 
@@ -3348,6 +3481,21 @@ easy_install
    the name of a ``.py`` loader/wrapper.  (Python's import machinery ignores
    this suffix when searching for an extension module.)
 
+ * Better ambiguity management: accept ``#egg`` name/version even if processing
+   what appears to be a correctly-named distutils file, and ignore ``.egg``
+   files with no ``-``, since valid Python ``.egg`` files always have a version
+   number (but Scheme eggs often don't).
+
+ * Support ``file://`` links to directories in ``--find-links``, so that
+   easy_install can build packages from local source checkouts.
+
+ * Added automatic retry for Sourceforge mirrors.  The new download process is
+   to first just try dl.sourceforge.net, then randomly select mirror IPs and
+   remove ones that fail, until something works.  The removed IPs stay removed
+   for the remainder of the run.
+
+ * Ignore bdist_dumb distributions when looking at download URLs.
+
 0.6a11
 ------
 
@@ -3381,11 +3529,75 @@ easy_install
    it. Previously, the file could be left open and the actual error would be
    masked by problems trying to remove the open file on Windows systems.
 
+ * Process ``dependency_links.txt`` if found in a distribution, by adding the
+   URLs to the list for scanning.
+
+ * Use relative paths in ``.pth`` files when eggs are being installed to the
+   same directory as the ``.pth`` file.  This maximizes portability of the
+   target directory when building applications that contain eggs.
+
+ * Added ``easy_install-N.N`` script(s) for convenience when using multiple
+   Python versions.
+
+ * Added automatic handling of installation conflicts.  Eggs are now shifted to
+   the front of sys.path, in an order consistent with where they came from,
+   making EasyInstall seamlessly co-operate with system package managers.
+
+   The ``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk`` options
+   are now no longer necessary, and will generate warnings at the end of a
+   run if you use them.
+
+ * Don't recursively traverse subdirectories given to ``--find-links``.
+
 0.6a10
 ------
 
  * Fixed the ``develop`` command ignoring ``--find-links``.
 
+ * Added exhaustive testing of the install directory, including a spawn test
+   for ``.pth`` file support, and directory writability/existence checks.  This
+   should virtually eliminate the need to set or configure ``--site-dirs``.
+
+ * Added ``--prefix`` option for more do-what-I-mean-ishness in the absence of
+   RTFM-ing.  :)
+
+ * Enhanced ``PYTHONPATH`` support so that you don't have to put any eggs on it
+   manually to make it work.  ``--multi-version`` is no longer a silent
+   default; you must explicitly use it if installing to a non-PYTHONPATH,
+   non-"site" directory.
+
+ * Expand ``$variables`` used in the ``--site-dirs``, ``--build-directory``,
+   ``--install-dir``, and ``--script-dir`` options, whether on the command line
+   or in configuration files.
+
+ * Improved SourceForge mirror processing to work faster and be less affected
+   by transient HTML changes made by SourceForge.
+
+ * PyPI searches now use the exact spelling of requirements specified on the
+   command line or in a project's ``install_requires``.  Previously, a
+   normalized form of the name was used, which could lead to unnecessary
+   full-index searches when a project's name had an underscore (``_``) in it.
+
+ * EasyInstall can now download bare ``.py`` files and wrap them in an egg,
+   as long as you include an ``#egg=name-version`` suffix on the URL, or if
+   the ``.py`` file is listed as the "Download URL" on the project's PyPI page.
+   This allows third parties to "package" trivial Python modules just by
+   linking to them (e.g. from within their own PyPI page or download links
+   page).
+
+ * The ``--always-copy`` option now skips "system" and "development" eggs since
+   they can't be reliably copied.  Note that this may cause EasyInstall to
+   choose an older version of a package than what you expected, or it may cause
+   downloading and installation of a fresh version of what's already installed.
+
+ * The ``--find-links`` option previously scanned all supplied URLs and
+   directories as early as possible, but now only directories and direct
+   archive links are scanned immediately.  URLs are not retrieved unless a
+   package search was already going to go online due to a package not being
+   available locally, or due to the use of the ``--update`` or ``-U`` option.
+
+ * Fixed the annoying ``--help-commands`` wart.
+
 0.6a9
 -----
 
@@ -3436,6 +3648,22 @@ easy_install
    and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
    back into an ``.egg`` file or directory and install it as such.
 
+ * Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
+   "baskets") when they weren't explicitly listed in the ``.pth`` file.
+
+ * If more than one URL appears to describe the exact same distribution, prefer
+   the shortest one.  This helps to avoid "table of contents" CGI URLs like the
+   ones on effbot.org.
+
+ * Quote arguments to python.exe (including python's path) to avoid problems
+   when Python (or a script) is installed in a directory whose name contains
+   spaces on Windows.
+
+ * Support full roundtrip translation of eggs to and from ``bdist_wininst``
+   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
+   egg in an .exe that will safely install it as an egg (i.e., with metadata
+   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
+   back into an ``.egg`` file or directory and install it as such.
 
 0.6a8
 -----
@@ -3464,6 +3692,45 @@ easy_install
    metadata cache to pretend that the egg has valid version information, until
    it has a chance to make it actually be so (via the ``egg_info`` command).
 
+ * Update for changed SourceForge mirror format
+
+ * Fixed not installing dependencies for some packages fetched via Subversion
+
+ * Fixed dependency installation with ``--always-copy`` not using the same
+   dependency resolution procedure as other operations.
+
+ * Fixed not fully removing temporary directories on Windows, if a Subversion
+   checkout left read-only files behind
+
+ * Fixed some problems building extensions when Pyrex was installed, especially
+   with Python 2.4 and/or packages using SWIG.
+
+0.6a7
+-----
+
+ * Fixed not being able to install Windows script wrappers using Python 2.3
+
+0.6a6
+-----
+
+ * Added support for "traditional" PYTHONPATH-based non-root installation, and
+   also the convenient ``virtual-python.py`` script, based on a contribution
+   by Ian Bicking.  The setuptools egg now contains a hacked ``site`` module
+   that makes the PYTHONPATH-based approach work with .pth files, so that you
+   can get the full EasyInstall feature set on such installations.
+
+ * Added ``--no-deps`` and ``--allow-hosts`` options.
+
+ * Improved Windows ``.exe`` script wrappers so that the script can have the
+   same name as a module without confusing Python.
+
+ * Changed dependency processing so that it's breadth-first, allowing a
+   depender's preferences to override those of a dependee, to prevent conflicts
+   when a lower version is acceptable to the dependee, but not the depender.
+   Also, ensure that currently installed/selected packages aren't given
+   precedence over ones desired by a package being installed, which could
+   cause conflict errors.
+
 0.6a5
 -----
 
@@ -3476,6 +3743,17 @@ easy_install
    on Windows and other platforms.  (The special handling is only for Windows;
    other platforms are treated the same as for ``console_scripts``.)
 
+ * Improved error message when trying to use old ways of running
+   ``easy_install``.  Removed the ability to run via ``python -m`` or by
+   running ``easy_install.py``; ``easy_install`` is the command to run on all
+   supported platforms.
+
+ * Improved wrapper script generation and runtime initialization so that a
+   VersionConflict doesn't occur if you later install a competing version of a
+   needed package as the default version of that package.
+
+ * Fixed a problem parsing version numbers in ``#egg=`` links.
+
 0.6a2
 -----
 
@@ -3484,6 +3762,15 @@ easy_install
    scripts get an ``.exe`` wrapper so you can just type their name. On other
    platforms, the scripts are written without a file extension.
 
+ * EasyInstall can now install "console_scripts" defined by packages that use
+   ``setuptools`` and define appropriate entry points.  On Windows, console
+   scripts get an ``.exe`` wrapper so you can just type their name.  On other
+   platforms, the scripts are installed without a file extension.
+
+ * Using ``python -m easy_install`` or running ``easy_install.py`` is now
+   DEPRECATED, since an ``easy_install`` wrapper is now available on all
+   platforms.
+
 0.6a1
 -----
 
@@ -3529,6 +3816,55 @@ easy_install
    or documented, and never would have worked without EasyInstall - which it
    pre-dated and was never compatible with.
 
+ * EasyInstall now does MD5 validation of downloads from PyPI, or from any link
+   that has an "#md5=..." trailer with a 32-digit lowercase hex md5 digest.
+
+ * EasyInstall now handles symlinks in target directories by removing the link,
+   rather than attempting to overwrite the link's destination.  This makes it
+   easier to set up an alternate Python "home" directory (as described above in
+   the `Non-Root Installation`_ section).
+
+ * Added support for handling MacOS platform information in ``.egg`` filenames,
+   based on a contribution by Kevin Dangoor.  You may wish to delete and
+   reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
+   because the format for this platform information has changed so that minor
+   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
+   previous OS version to become obsolete.
+
+ * easy_install's dependency processing algorithms have changed.  When using
+   ``--always-copy``, it now ensures that dependencies are copied too.  When
+   not using ``--always-copy``, it tries to use a single resolution loop,
+   rather than recursing.
+
+ * Fixed installing extra ``.pyc`` or ``.pyo`` files for scripts with ``.py``
+   extensions.
+
+ * Added ``--site-dirs`` option to allow adding custom "site" directories.
+   Made ``easy-install.pth`` work in platform-specific alternate site
+   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
+
+ * If you manually delete the current version of a package, the next run of
+   EasyInstall against the target directory will now remove the stray entry
+   from the ``easy-install.pth`` file.
+
+ * EasyInstall now recognizes URLs with a ``#egg=project_name`` fragment ID
+   as pointing to the named project's source checkout.  Such URLs have a lower
+   match precedence than any other kind of distribution, so they'll only be
+   used if they have a higher version number than any other available
+   distribution, or if you use the ``--editable`` option.  The ``#egg``
+   fragment can contain a version if it's formatted as ``#egg=proj-ver``,
+   where ``proj`` is the project name, and ``ver`` is the version number.  You
+   *must* use the format for these values that the ``bdist_egg`` command uses;
+   i.e., all non-alphanumeric runs must be condensed to single underscore
+   characters.
+
+ * Added the ``--editable`` option; see `Editing and Viewing Source Packages`_
+   above for more info.  Also, slightly changed the behavior of the
+   ``--build-directory`` option.
+
+ * Fixed the setup script sandbox facility not recognizing certain paths as
+   valid on case-insensitive platforms.
+
 0.5a12
 ------
 
@@ -3536,12 +3872,28 @@ easy_install
    ``python -m``, and marks them as unsafe for zipping, since Python 2.4 can't
    handle ``-m`` on zipped modules.
 
+ * Fix ``python -m easy_install`` not working due to setuptools being installed
+   as a zipfile.  Update safety scanner to check for modules that might be used
+   as ``python -m`` scripts.
+
+ * Misc. fixes for win32.exe support, including changes to support Python 2.4's
+   changed ``bdist_wininst`` format.
+
 0.5a11
 ------
 
  * Fix breakage of the "develop" command that was caused by the addition of
    ``--always-unzip`` to the ``easy_install`` command.
 
+0.5a10
+------
+
+ * Put the ``easy_install`` module back in as a module, as it's needed for
+   ``python -m`` to run it!
+
+ * Allow ``--find-links/-f`` to accept local directories or filenames as well
+   as URLs.
+
 0.5a9
 -----
 
@@ -3576,6 +3928,31 @@ easy_install
 
  * Fixed the swapped ``-d`` and ``-b`` options of ``bdist_egg``.
 
+ * EasyInstall now automatically detects when an "unmanaged" package or
+   module is going to be on ``sys.path`` ahead of a package you're installing,
+   thereby preventing the newer version from being imported.  By default, it
+   will abort installation to alert you of the problem, but there are also
+   new options (``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk``)
+   available to change the default behavior.  (Note: this new feature doesn't
+   take effect for egg files that were built with older ``setuptools``
+   versions, because they lack the new metadata file required to implement it.)
+
+ * The ``easy_install`` distutils command now uses ``DistutilsError`` as its
+   base error type for errors that should just issue a message to stderr and
+   exit the program without a traceback.
+
+ * EasyInstall can now be given a path to a directory containing a setup
+   script, and it will attempt to build and install the package there.
+
+ * EasyInstall now performs a safety analysis on module contents to determine
+   whether a package is likely to run in zipped form, and displays
+   information about what modules may be doing introspection that would break
+   when running as a zipfile.
+
+ * Added the ``--always-unzip/-Z`` option, to force unzipping of packages that
+   would ordinarily be considered safe to unzip, and changed the meaning of
+   ``--zip-ok/-z`` to "always leave everything zipped".
+
 0.5a8
 -----
 
@@ -3603,6 +3980,9 @@ easy_install
  * Added a "setopt" command that sets a single option in a specified distutils
    configuration file.
 
+ * There is now a separate documentation page for setuptools; revision
+   history that's not specific to EasyInstall has been moved to that page.
+
 0.5a7
 -----
 
@@ -3670,6 +4050,39 @@ easy_install
  * Setup scripts using setuptools now always install using ``easy_install``
    internally, for ease of uninstallation and upgrading.
 
+ * Added ``--always-copy/-a`` option to always copy needed packages to the
+   installation directory, even if they're already present elsewhere on
+   sys.path. (In previous versions, this was the default behavior, but now
+   you must request it.)
+
+ * Added ``--upgrade/-U`` option to force checking PyPI for latest available
+   version(s) of all packages requested by name and version, even if a matching
+   version is available locally.
+
+ * Added automatic installation of dependencies declared by a distribution
+   being installed.  These dependencies must be listed in the distribution's
+   ``EGG-INFO`` directory, so the distribution has to have declared its
+   dependencies by using setuptools.  If a package has requirements it didn't
+   declare, you'll still have to deal with them yourself.  (E.g., by asking
+   EasyInstall to find and install them.)
+
+ * Added the ``--record`` option to ``easy_install`` for the benefit of tools
+   that run ``setup.py install --record=filename`` on behalf of another
+   packaging system.)
+
+0.5a3
+-----
+
+ * Fixed not setting script permissions to allow execution.
+
+ * Improved sandboxing so that setup scripts that want a temporary directory
+   (e.g. pychecker) can still run in the sandbox.
+
+0.5a2
+-----
+
+ * Fix stupid stupid refactoring-at-the-last-minute typos.  :(
+
 0.5a1
 -----
 
@@ -3684,6 +4097,29 @@ easy_install
     from setuptools import setup
     # etc...
 
+ * Added support for converting ``.win32.exe`` installers to eggs on the fly.
+   EasyInstall will now recognize such files by name and install them.
+
+ * Fixed a problem with picking the "best" version to install (versions were
+   being sorted as strings, rather than as parsed values)
+
+0.4a4
+-----
+
+ * Added support for the distutils "verbose/quiet" and "dry-run" options, as
+   well as the "optimize" flag.
+
+ * Support downloading packages that were uploaded to PyPI (by scanning all
+   links on package pages, not just the homepage/download links).
+
+0.4a3
+-----
+
+ * Add progress messages to the search/download process so that you can tell
+   what URLs it's reading to find download links.  (Hopefully, this will help
+   people report out-of-date and broken links to package authors, and to tell
+   when they've asked for a package that doesn't exist.)
+
 0.4a2
 -----
 
@@ -3711,6 +4147,44 @@ easy_install
    their ``command_consumes_arguments`` attribute to ``True`` in order to
    receive an ``args`` option containing the rest of the command line.
 
+ * Added support for installing scripts
+
+ * Added support for setting options via distutils configuration files, and
+   using distutils' default options as a basis for EasyInstall's defaults.
+
+ * Renamed ``--scan-url/-s`` to ``--find-links/-f`` to free up ``-s`` for the
+   script installation directory option.
+
+ * Use ``urllib2`` instead of ``urllib``, to allow use of ``https:`` URLs if
+   Python includes SSL support.
+
+0.4a1
+-----
+
+ * Added ``--scan-url`` and ``--index-url`` options, to scan download pages
+   and search PyPI for needed packages.
+
+0.3a4
+-----
+
+ * Restrict ``--build-directory=DIR/-b DIR`` option to only be used with single
+   URL installs, to avoid running the wrong setup.py.
+
+0.3a3
+-----
+
+ * Added ``--build-directory=DIR/-b DIR`` option.
+
+ * Added "installation report" that explains how to use 'require()' when doing
+   a multiversion install or alternate installation directory.
+
+ * Added SourceForge mirror auto-select (Contributed by Ian Bicking)
+
+ * Added "sandboxing" that stops a setup script from running if it attempts to
+   write to the filesystem outside of the build area
+
+ * Added more workarounds for packages with quirky ``install_data`` hacks
+
 0.3a2
 -----
 
@@ -3718,6 +4192,9 @@ easy_install
    with a subversion revision number, the current date, or an explicit tag
    value. Run ``setup.py bdist_egg --help`` to get more information.
 
+ * Added subversion download support for ``svn:`` and ``svn+`` URLs, as well as
+   automatic recognition of HTTP subversion URLs (Contributed by Ian Bicking)
+
  * Misc. bug fixes
 
 0.3a1
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index f426b6ffd5..56c1a394f3 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -1114,504 +1114,6 @@ displayed MD5 info (broken onto two lines for readability)::
     <a href="([^"#]+)">([^<]+)</a>\n\s+\(<a href="[^?]+\?:action=show_md5
     &amp;digest=([0-9a-f]{32})">md5</a>\)
 
-History
-=======
-
-0.6c9
- * Fixed ``win32.exe`` support for .pth files, so unnecessary directory nesting
-   is flattened out in the resulting egg.  (There was a case-sensitivity
-   problem that affected some distributions, notably ``pywin32``.)
-
- * Prevent ``--help-commands`` and other junk from showing under Python 2.5
-   when running ``easy_install --help``.
-
- * Fixed GUI scripts sometimes not executing on Windows
-
- * Fixed not picking up dependency links from recursive dependencies.
-
- * Only make ``.py``, ``.dll`` and ``.so`` files executable when unpacking eggs
-
- * Changes for Jython compatibility
-
- * Improved error message when a requirement is also a directory name, but the
-   specified directory is not a source package.
-
- * Fixed ``--allow-hosts`` option blocking ``file:`` URLs
-
- * Fixed HTTP SVN detection failing when the page title included a project
-   name (e.g. on SourceForge-hosted SVN)
-
- * Fix Jython script installation to handle ``#!`` lines better when
-   ``sys.executable`` is a script.
-
- * Removed use of deprecated ``md5`` module if ``hashlib`` is available
-
- * Keep site directories (e.g. ``site-packages``) from being included in
-   ``.pth`` files.
-
-0.6c7
- * ``ftp:`` download URLs now work correctly.
-
- * The default ``--index-url`` is now ``https://pypi.python.org/simple``, to use
-   the Python Package Index's new simpler (and faster!) REST API.
-
-0.6c6
- * EasyInstall no longer aborts the installation process if a URL it wants to
-   retrieve can't be downloaded, unless the URL is an actual package download.
-   Instead, it issues a warning and tries to keep going.
-
- * Fixed distutils-style scripts originally built on Windows having their line
-   endings doubled when installed on any platform.
-
- * Added ``--local-snapshots-ok`` flag, to allow building eggs from projects
-   installed using ``setup.py develop``.
-
- * Fixed not HTML-decoding URLs scraped from web pages
-
-0.6c5
- * Fixed ``.dll`` files on Cygwin not having executable permissions when an egg
-   is installed unzipped.
-
-0.6c4
- * Added support for HTTP "Basic" authentication using ``http://user:pass@host``
-   URLs.  If a password-protected page contains links to the same host (and
-   protocol), those links will inherit the credentials used to access the
-   original page.
-
- * Removed all special support for Sourceforge mirrors, as Sourceforge's
-   mirror system now works well for non-browser downloads.
-
- * Fixed not recognizing ``win32.exe`` installers that included a custom
-   bitmap.
-
- * Fixed not allowing ``os.open()`` of paths outside the sandbox, even if they
-   are opened read-only (e.g. reading ``/dev/urandom`` for random numbers, as
-   is done by ``os.urandom()`` on some platforms).
-
- * Fixed a problem with ``.pth`` testing on Windows when ``sys.executable``
-   has a space in it (e.g., the user installed Python to a ``Program Files``
-   directory).
-
-0.6c3
- * You can once again use "python -m easy_install" with Python 2.4 and above.
-
- * Python 2.5 compatibility fixes added.
-
-0.6c2
- * Windows script wrappers now support quoted arguments and arguments
-   containing spaces.  (Patch contributed by Jim Fulton.)
-
- * The ``ez_setup.py`` script now actually works when you put a setuptools
-   ``.egg`` alongside it for bootstrapping an offline machine.
-
- * A writable installation directory on ``sys.path`` is no longer required to
-   download and extract a source distribution using ``--editable``.
-
- * Generated scripts now use ``-x`` on the ``#!`` line when ``sys.executable``
-   contains non-ASCII characters, to prevent deprecation warnings about an
-   unspecified encoding when the script is run.
-
-0.6c1
- * EasyInstall now includes setuptools version information in the
-   ``User-Agent`` string sent to websites it visits.
-
-0.6b4
- * Fix creating Python wrappers for non-Python scripts
-
- * Fix ``ftp://`` directory listing URLs from causing a crash when used in the
-   "Home page" or "Download URL" slots on PyPI.
-
- * Fix ``sys.path_importer_cache`` not being updated when an existing zipfile
-   or directory is deleted/overwritten.
-
- * Fix not recognizing HTML 404 pages from package indexes.
-
- * Allow ``file://`` URLs to be used as a package index.  URLs that refer to
-   directories will use an internally-generated directory listing if there is
-   no ``index.html`` file in the directory.
-
- * Allow external links in a package index to be specified using
-   ``rel="homepage"`` or ``rel="download"``, without needing the old
-   PyPI-specific visible markup.
-
- * Suppressed warning message about possibly-misspelled project name, if an egg
-   or link for that project name has already been seen.
-
-0.6b3
- * Fix local ``--find-links`` eggs not being copied except with
-   ``--always-copy``.
-
- * Fix sometimes not detecting local packages installed outside of "site"
-   directories.
-
- * Fix mysterious errors during initial ``setuptools`` install, caused by
-   ``ez_setup`` trying to run ``easy_install`` twice, due to a code fallthru
-   after deleting the egg from which it's running.
-
-0.6b2
- * Don't install or update a ``site.py`` patch when installing to a
-   ``PYTHONPATH`` directory with ``--multi-version``, unless an
-   ``easy-install.pth`` file is already in use there.
-
- * Construct ``.pth`` file paths in such a way that installing an egg whose
-   name begins with ``import`` doesn't cause a syntax error.
-
- * Fixed a bogus warning message that wasn't updated since the 0.5 versions.
-
-0.6b1
- * Better ambiguity management: accept ``#egg`` name/version even if processing
-   what appears to be a correctly-named distutils file, and ignore ``.egg``
-   files with no ``-``, since valid Python ``.egg`` files always have a version
-   number (but Scheme eggs often don't).
-
- * Support ``file://`` links to directories in ``--find-links``, so that
-   easy_install can build packages from local source checkouts.
-
- * Added automatic retry for Sourceforge mirrors.  The new download process is
-   to first just try dl.sourceforge.net, then randomly select mirror IPs and
-   remove ones that fail, until something works.  The removed IPs stay removed
-   for the remainder of the run.
-
- * Ignore bdist_dumb distributions when looking at download URLs.
-
-0.6a11
- * Process ``dependency_links.txt`` if found in a distribution, by adding the
-   URLs to the list for scanning.
-
- * Use relative paths in ``.pth`` files when eggs are being installed to the
-   same directory as the ``.pth`` file.  This maximizes portability of the
-   target directory when building applications that contain eggs.
-
- * Added ``easy_install-N.N`` script(s) for convenience when using multiple
-   Python versions.
-
- * Added automatic handling of installation conflicts.  Eggs are now shifted to
-   the front of sys.path, in an order consistent with where they came from,
-   making EasyInstall seamlessly co-operate with system package managers.
-
-   The ``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk`` options
-   are now no longer necessary, and will generate warnings at the end of a
-   run if you use them.
-
- * Don't recursively traverse subdirectories given to ``--find-links``.
-
-0.6a10
- * Added exhaustive testing of the install directory, including a spawn test
-   for ``.pth`` file support, and directory writability/existence checks.  This
-   should virtually eliminate the need to set or configure ``--site-dirs``.
-
- * Added ``--prefix`` option for more do-what-I-mean-ishness in the absence of
-   RTFM-ing.  :)
-
- * Enhanced ``PYTHONPATH`` support so that you don't have to put any eggs on it
-   manually to make it work.  ``--multi-version`` is no longer a silent
-   default; you must explicitly use it if installing to a non-PYTHONPATH,
-   non-"site" directory.
-
- * Expand ``$variables`` used in the ``--site-dirs``, ``--build-directory``,
-   ``--install-dir``, and ``--script-dir`` options, whether on the command line
-   or in configuration files.
-
- * Improved SourceForge mirror processing to work faster and be less affected
-   by transient HTML changes made by SourceForge.
-
- * PyPI searches now use the exact spelling of requirements specified on the
-   command line or in a project's ``install_requires``.  Previously, a
-   normalized form of the name was used, which could lead to unnecessary
-   full-index searches when a project's name had an underscore (``_``) in it.
-
- * EasyInstall can now download bare ``.py`` files and wrap them in an egg,
-   as long as you include an ``#egg=name-version`` suffix on the URL, or if
-   the ``.py`` file is listed as the "Download URL" on the project's PyPI page.
-   This allows third parties to "package" trivial Python modules just by
-   linking to them (e.g. from within their own PyPI page or download links
-   page).
-
- * The ``--always-copy`` option now skips "system" and "development" eggs since
-   they can't be reliably copied.  Note that this may cause EasyInstall to
-   choose an older version of a package than what you expected, or it may cause
-   downloading and installation of a fresh version of what's already installed.
-
- * The ``--find-links`` option previously scanned all supplied URLs and
-   directories as early as possible, but now only directories and direct
-   archive links are scanned immediately.  URLs are not retrieved unless a
-   package search was already going to go online due to a package not being
-   available locally, or due to the use of the ``--update`` or ``-U`` option.
-
- * Fixed the annoying ``--help-commands`` wart.
-
-0.6a9
- * Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
-   "baskets") when they weren't explicitly listed in the ``.pth`` file.
-
- * If more than one URL appears to describe the exact same distribution, prefer
-   the shortest one.  This helps to avoid "table of contents" CGI URLs like the
-   ones on effbot.org.
-
- * Quote arguments to python.exe (including python's path) to avoid problems
-   when Python (or a script) is installed in a directory whose name contains
-   spaces on Windows.
-
- * Support full roundtrip translation of eggs to and from ``bdist_wininst``
-   format.  Running ``bdist_wininst`` on a setuptools-based package wraps the
-   egg in an .exe that will safely install it as an egg (i.e., with metadata
-   and entry-point wrapper scripts), and ``easy_install`` can turn the .exe
-   back into an ``.egg`` file or directory and install it as such.
-
-0.6a8
- * Update for changed SourceForge mirror format
-
- * Fixed not installing dependencies for some packages fetched via Subversion
-
- * Fixed dependency installation with ``--always-copy`` not using the same
-   dependency resolution procedure as other operations.
-
- * Fixed not fully removing temporary directories on Windows, if a Subversion
-   checkout left read-only files behind
-
- * Fixed some problems building extensions when Pyrex was installed, especially
-   with Python 2.4 and/or packages using SWIG.
-
-0.6a7
- * Fixed not being able to install Windows script wrappers using Python 2.3
-
-0.6a6
- * Added support for "traditional" PYTHONPATH-based non-root installation, and
-   also the convenient ``virtual-python.py`` script, based on a contribution
-   by Ian Bicking.  The setuptools egg now contains a hacked ``site`` module
-   that makes the PYTHONPATH-based approach work with .pth files, so that you
-   can get the full EasyInstall feature set on such installations.
-
- * Added ``--no-deps`` and ``--allow-hosts`` options.
-
- * Improved Windows ``.exe`` script wrappers so that the script can have the
-   same name as a module without confusing Python.
-
- * Changed dependency processing so that it's breadth-first, allowing a
-   depender's preferences to override those of a dependee, to prevent conflicts
-   when a lower version is acceptable to the dependee, but not the depender.
-   Also, ensure that currently installed/selected packages aren't given
-   precedence over ones desired by a package being installed, which could
-   cause conflict errors.
-
-0.6a3
- * Improved error message when trying to use old ways of running
-   ``easy_install``.  Removed the ability to run via ``python -m`` or by
-   running ``easy_install.py``; ``easy_install`` is the command to run on all
-   supported platforms.
-
- * Improved wrapper script generation and runtime initialization so that a
-   VersionConflict doesn't occur if you later install a competing version of a
-   needed package as the default version of that package.
-
- * Fixed a problem parsing version numbers in ``#egg=`` links.
-
-0.6a2
- * EasyInstall can now install "console_scripts" defined by packages that use
-   ``setuptools`` and define appropriate entry points.  On Windows, console
-   scripts get an ``.exe`` wrapper so you can just type their name.  On other
-   platforms, the scripts are installed without a file extension.
-
- * Using ``python -m easy_install`` or running ``easy_install.py`` is now
-   DEPRECATED, since an ``easy_install`` wrapper is now available on all
-   platforms.
-
-0.6a1
- * EasyInstall now does MD5 validation of downloads from PyPI, or from any link
-   that has an "#md5=..." trailer with a 32-digit lowercase hex md5 digest.
-
- * EasyInstall now handles symlinks in target directories by removing the link,
-   rather than attempting to overwrite the link's destination.  This makes it
-   easier to set up an alternate Python "home" directory (as described above in
-   the `Non-Root Installation`_ section).
-
- * Added support for handling MacOS platform information in ``.egg`` filenames,
-   based on a contribution by Kevin Dangoor.  You may wish to delete and
-   reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
-   because the format for this platform information has changed so that minor
-   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
-   previous OS version to become obsolete.
-
- * easy_install's dependency processing algorithms have changed.  When using
-   ``--always-copy``, it now ensures that dependencies are copied too.  When
-   not using ``--always-copy``, it tries to use a single resolution loop,
-   rather than recursing.
-
- * Fixed installing extra ``.pyc`` or ``.pyo`` files for scripts with ``.py``
-   extensions.
-
- * Added ``--site-dirs`` option to allow adding custom "site" directories.
-   Made ``easy-install.pth`` work in platform-specific alternate site
-   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
-
- * If you manually delete the current version of a package, the next run of
-   EasyInstall against the target directory will now remove the stray entry
-   from the ``easy-install.pth`` file.
-
- * EasyInstall now recognizes URLs with a ``#egg=project_name`` fragment ID
-   as pointing to the named project's source checkout.  Such URLs have a lower
-   match precedence than any other kind of distribution, so they'll only be
-   used if they have a higher version number than any other available
-   distribution, or if you use the ``--editable`` option.  The ``#egg``
-   fragment can contain a version if it's formatted as ``#egg=proj-ver``,
-   where ``proj`` is the project name, and ``ver`` is the version number.  You
-   *must* use the format for these values that the ``bdist_egg`` command uses;
-   i.e., all non-alphanumeric runs must be condensed to single underscore
-   characters.
-
- * Added the ``--editable`` option; see `Editing and Viewing Source Packages`_
-   above for more info.  Also, slightly changed the behavior of the
-   ``--build-directory`` option.
-
- * Fixed the setup script sandbox facility not recognizing certain paths as
-   valid on case-insensitive platforms.
-
-0.5a12
- * Fix ``python -m easy_install`` not working due to setuptools being installed
-   as a zipfile.  Update safety scanner to check for modules that might be used
-   as ``python -m`` scripts.
-
- * Misc. fixes for win32.exe support, including changes to support Python 2.4's
-   changed ``bdist_wininst`` format.
-
-0.5a10
- * Put the ``easy_install`` module back in as a module, as it's needed for
-   ``python -m`` to run it!
-
- * Allow ``--find-links/-f`` to accept local directories or filenames as well
-   as URLs.
-
-0.5a9
- * EasyInstall now automatically detects when an "unmanaged" package or
-   module is going to be on ``sys.path`` ahead of a package you're installing,
-   thereby preventing the newer version from being imported.  By default, it
-   will abort installation to alert you of the problem, but there are also
-   new options (``--delete-conflicting`` and ``--ignore-conflicts-at-my-risk``)
-   available to change the default behavior.  (Note: this new feature doesn't
-   take effect for egg files that were built with older ``setuptools``
-   versions, because they lack the new metadata file required to implement it.)
-
- * The ``easy_install`` distutils command now uses ``DistutilsError`` as its
-   base error type for errors that should just issue a message to stderr and
-   exit the program without a traceback.
-
- * EasyInstall can now be given a path to a directory containing a setup
-   script, and it will attempt to build and install the package there.
-
- * EasyInstall now performs a safety analysis on module contents to determine
-   whether a package is likely to run in zipped form, and displays
-   information about what modules may be doing introspection that would break
-   when running as a zipfile.
-
- * Added the ``--always-unzip/-Z`` option, to force unzipping of packages that
-   would ordinarily be considered safe to unzip, and changed the meaning of
-   ``--zip-ok/-z`` to "always leave everything zipped".
-
-0.5a8
- * There is now a separate documentation page for `setuptools`_; revision
-   history that's not specific to EasyInstall has been moved to that page.
-
- .. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
-
-0.5a5
- * Made ``easy_install`` a standard ``setuptools`` command, moving it from
-   the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
-   that if you were importing or extending it, you must now change your imports
-   accordingly.  ``easy_install.py`` is still installed as a script, but not as
-   a module.
-
-0.5a4
- * Added ``--always-copy/-a`` option to always copy needed packages to the
-   installation directory, even if they're already present elsewhere on
-   sys.path. (In previous versions, this was the default behavior, but now
-   you must request it.)
-
- * Added ``--upgrade/-U`` option to force checking PyPI for latest available
-   version(s) of all packages requested by name and version, even if a matching
-   version is available locally.
-
- * Added automatic installation of dependencies declared by a distribution
-   being installed.  These dependencies must be listed in the distribution's
-   ``EGG-INFO`` directory, so the distribution has to have declared its
-   dependencies by using setuptools.  If a package has requirements it didn't
-   declare, you'll still have to deal with them yourself.  (E.g., by asking
-   EasyInstall to find and install them.)
-
- * Added the ``--record`` option to ``easy_install`` for the benefit of tools
-   that run ``setup.py install --record=filename`` on behalf of another
-   packaging system.)
-
-0.5a3
- * Fixed not setting script permissions to allow execution.
-
- * Improved sandboxing so that setup scripts that want a temporary directory
-   (e.g. pychecker) can still run in the sandbox.
-
-0.5a2
- * Fix stupid stupid refactoring-at-the-last-minute typos.  :(
-
-0.5a1
- * Added support for converting ``.win32.exe`` installers to eggs on the fly.
-   EasyInstall will now recognize such files by name and install them.
-
- * Fixed a problem with picking the "best" version to install (versions were
-   being sorted as strings, rather than as parsed values)
-
-0.4a4
- * Added support for the distutils "verbose/quiet" and "dry-run" options, as
-   well as the "optimize" flag.
-
- * Support downloading packages that were uploaded to PyPI (by scanning all
-   links on package pages, not just the homepage/download links).
-
-0.4a3
- * Add progress messages to the search/download process so that you can tell
-   what URLs it's reading to find download links.  (Hopefully, this will help
-   people report out-of-date and broken links to package authors, and to tell
-   when they've asked for a package that doesn't exist.)
-
-0.4a2
- * Added support for installing scripts
-
- * Added support for setting options via distutils configuration files, and
-   using distutils' default options as a basis for EasyInstall's defaults.
-
- * Renamed ``--scan-url/-s`` to ``--find-links/-f`` to free up ``-s`` for the
-   script installation directory option.
-
- * Use ``urllib2`` instead of ``urllib``, to allow use of ``https:`` URLs if
-   Python includes SSL support.
-
-0.4a1
- * Added ``--scan-url`` and ``--index-url`` options, to scan download pages
-   and search PyPI for needed packages.
-
-0.3a4
- * Restrict ``--build-directory=DIR/-b DIR`` option to only be used with single
-   URL installs, to avoid running the wrong setup.py.
-
-0.3a3
- * Added ``--build-directory=DIR/-b DIR`` option.
-
- * Added "installation report" that explains how to use 'require()' when doing
-   a multiversion install or alternate installation directory.
-
- * Added SourceForge mirror auto-select (Contributed by Ian Bicking)
-
- * Added "sandboxing" that stops a setup script from running if it attempts to
-   write to the filesystem outside of the build area
-
- * Added more workarounds for packages with quirky ``install_data`` hacks
-
-0.3a2
- * Added subversion download support for ``svn:`` and ``svn+`` URLs, as well as
-   automatic recognition of HTTP subversion URLs (Contributed by Ian Bicking)
-
- * Misc. bug fixes
-
-0.3a1
- * Initial release.
-
 
 Future Plans
 ============

From e919dab687d281fe0242b17ba1727e91046eb26b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 10:53:09 -0400
Subject: [PATCH 7141/8469] Remove backwards compatibility notes and future
 plans from Easy Install docs

---
 docs/easy_install.txt | 45 -------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 56c1a394f3..d28141f18b 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -1077,48 +1077,3 @@ EasyInstall to be able to look up and download packages:
 8. If a package index is accessed via a ``file://`` URL, then EasyInstall will
    automatically use ``index.html`` files, if present, when trying to read a
    directory with a trailing ``/`` on the URL.
-
-
-Backward Compatibility
-~~~~~~~~~~~~~~~~~~~~~~
-
-Package indexes that wish to support setuptools versions prior to 0.6b4 should
-also follow these rules:
-
-* Homepage and download links must be preceded with ``"<th>Home Page"`` or
-  ``"<th>Download URL"``, in addition to (or instead of) the ``rel=""``
-  attributes on the actual links.  These marker strings do not need to be
-  visible, or uncommented, however!  For example, the following is a valid
-  homepage link that will work with any version of setuptools::
-
-    <li>
-     <strong>Home Page:</strong>
-     <!-- <th>Home Page -->
-     <a rel="homepage" href="http://sqlobject.org">http://sqlobject.org</a>
-    </li>
-
-  Even though the marker string is in an HTML comment, older versions of
-  EasyInstall will still "see" it and know that the link that follows is the
-  project's home page URL.
-
-* The pages described by paragraph 3(b) of the preceding section *must*
-  contain the string ``"Index of Packages</title>"`` somewhere in their text.
-  This can be inside of an HTML comment, if desired, and it can be anywhere
-  in the page.  (Note: this string MUST NOT appear on normal project pages, as
-  described in paragraphs 2 and 3(a)!)
-
-In addition, for compatibility with PyPI versions that do not use ``#md5=``
-fragment IDs, EasyInstall uses the following regular expression to match PyPI's
-displayed MD5 info (broken onto two lines for readability)::
-
-    <a href="([^"#]+)">([^<]+)</a>\n\s+\(<a href="[^?]+\?:action=show_md5
-    &amp;digest=([0-9a-f]{32})">md5</a>\)
-
-
-Future Plans
-============
-
-* Additional utilities to list/remove/verify packages
-* Signature checking?  SSL?  Ability to suppress PyPI search?
-* Display byte progress meter when downloading distributions and long pages?
-* Redirect stdout/stderr to log during run_setup?

From f4b320e5e3ec9c7e1ef4b90017050e029029d449 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 10:55:41 -0400
Subject: [PATCH 7142/8469] Update Easy Install docs reflecting the
 deprecation.

---
 docs/easy_install.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index d28141f18b..9b98a6e05b 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -2,6 +2,12 @@
 Easy Install
 ============
 
+..warning::
+    Easy Install is deprecated. Do not use it. Instead use pip. If
+    you think you need Easy Install, please reach out to the PyPA
+    team (a ticket to pip or setuptools is fine), describing your
+    use-case.
+
 Easy Install is a python module (``easy_install``) bundled with ``setuptools``
 that lets you automatically download, build, install, and manage Python
 packages.

From 533d9592c64c8996bf642339cbd6d63f958c1d3b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:01:06 -0400
Subject: [PATCH 7143/8469] Pin against sphinx 1.8.0 due to
 sphinx-doc/sphinx#5417.

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 2138c88492..c6d594e8d5 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,4 @@
-sphinx
+sphinx!=1.8.0
 rst.linker>=1.9
 jaraco.packaging>=3.2
 

From 73503dfd7476752d0a0ebffc9a7205ef1b22f751 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:03:25 -0400
Subject: [PATCH 7144/8469] Fix broken reference to setuptools docs

---
 docs/easy_install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 9b98a6e05b..41d182e041 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -23,7 +23,7 @@ bug -- and then do so via list discussion first.)
 (Also, if you'd like to learn about how you can use ``setuptools`` to make your
 own packages work better with EasyInstall, or provide EasyInstall-like features
 without requiring your users to use EasyInstall directly, you'll probably want
-to check out the full `setuptools`_ documentation as well.)
+to check out the full documentation as well.)
 
 .. contents:: **Table of Contents**
 

From 91b6f64cf48efc9ad55e6036ebcf6e8554c7968f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:06:05 -0400
Subject: [PATCH 7145/8469] Fix other broken references due to moving changelog

---
 CHANGES.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index fd42a6b519..5c673a74f8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3821,8 +3821,8 @@ easy_install
 
  * EasyInstall now handles symlinks in target directories by removing the link,
    rather than attempting to overwrite the link's destination.  This makes it
-   easier to set up an alternate Python "home" directory (as described above in
-   the `Non-Root Installation`_ section).
+   easier to set up an alternate Python "home" directory (as described in
+   the Non-Root Installation section of the docs).
 
  * Added support for handling MacOS platform information in ``.egg`` filenames,
    based on a contribution by Kevin Dangoor.  You may wish to delete and
@@ -3858,8 +3858,8 @@ easy_install
    i.e., all non-alphanumeric runs must be condensed to single underscore
    characters.
 
- * Added the ``--editable`` option; see `Editing and Viewing Source Packages`_
-   above for more info.  Also, slightly changed the behavior of the
+ * Added the ``--editable`` option; see Editing and Viewing Source Packages
+   in the docs.  Also, slightly changed the behavior of the
    ``--build-directory`` option.
 
  * Fixed the setup script sandbox facility not recognizing certain paths as

From 5f2cb7661d989e79b82c0df195e0c371fab3949f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:13:40 -0400
Subject: [PATCH 7146/8469] Update changelog

---
 changelog.d/1324.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1324.change.rst

diff --git a/changelog.d/1324.change.rst b/changelog.d/1324.change.rst
new file mode 100644
index 0000000000..5c97dd2a30
--- /dev/null
+++ b/changelog.d/1324.change.rst
@@ -0,0 +1 @@
+Make safe_name compliant with PEP 503.

From 4af86b5ac3caf2e3b79b3227c9d11ae01210c1ee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:49:35 -0400
Subject: [PATCH 7147/8469] Minor reword

---
 changelog.d/1402.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1402.change.rst b/changelog.d/1402.change.rst
index 5a68ac9ddf..52852f055e 100644
--- a/changelog.d/1402.change.rst
+++ b/changelog.d/1402.change.rst
@@ -1,2 +1,2 @@
-Fixed a bug with namespace packages under python-3.6 when one package in
+Fixed a bug with namespace packages under Python 3.6 when one package in
 current directory hides another which is installed.

From c2018ee09b7f442b33b441eed02eb5d8f68fd278 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:50:03 -0400
Subject: [PATCH 7148/8469] Add periods to changelog entries

---
 changelog.d/1474.change.rst | 2 +-
 changelog.d/1479.misc.rst   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.d/1474.change.rst b/changelog.d/1474.change.rst
index 9d40e785a8..c02f059bdf 100644
--- a/changelog.d/1474.change.rst
+++ b/changelog.d/1474.change.rst
@@ -1 +1 @@
-``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore
+``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore.
diff --git a/changelog.d/1479.misc.rst b/changelog.d/1479.misc.rst
index b04b0ce15f..604827c1fc 100644
--- a/changelog.d/1479.misc.rst
+++ b/changelog.d/1479.misc.rst
@@ -1 +1 @@
-Remove internal use of six.binary_type
+Remove internal use of six.binary_type.

From cdcc7e5f1ecb6e485a71676a071d1b37adac3d51 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 11:59:31 -0400
Subject: [PATCH 7149/8469] Revert "Make safe_name compliant to PEP 503 and
 behaviour of pip > 8.1.2"

---
 changelog.d/1324.change.rst | 1 -
 pkg_resources/__init__.py   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1324.change.rst

diff --git a/changelog.d/1324.change.rst b/changelog.d/1324.change.rst
deleted file mode 100644
index 5c97dd2a30..0000000000
--- a/changelog.d/1324.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make safe_name compliant with PEP 503.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 84a4b34bf6..3ae2c5cdb7 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1312,9 +1312,9 @@ def get_default_cache():
 def safe_name(name):
     """Convert an arbitrary string to a standard distribution name
 
-    Any runs of non-alphanumeric characters are replaced with a single '-'.
+    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
     """
-    return re.sub('[^A-Za-z0-9]+', '-', name)
+    return re.sub('[^A-Za-z0-9.]+', '-', name)
 
 
 def safe_version(version):

From b711d1b53b2556b47273c28dae3345a664c54972 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Sep 2018 12:19:10 -0400
Subject: [PATCH 7150/8469] =?UTF-8?q?Bump=20version:=2040.2.0=20=E2=86=92?=
 =?UTF-8?q?=2040.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 11 +++++++++++
 changelog.d/1402.change.rst |  2 --
 changelog.d/1427.change.rst |  1 -
 changelog.d/1474.change.rst |  1 -
 changelog.d/1479.misc.rst   |  1 -
 changelog.d/1486.change.rst |  1 -
 setup.cfg                   |  2 +-
 setup.py                    |  2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/1402.change.rst
 delete mode 100644 changelog.d/1427.change.rst
 delete mode 100644 changelog.d/1474.change.rst
 delete mode 100644 changelog.d/1479.misc.rst
 delete mode 100644 changelog.d/1486.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 5c673a74f8..5da4acfa4f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v40.3.0
+-------
+
+* #1402: Fixed a bug with namespace packages under Python 3.6 when one package in
+  current directory hides another which is installed.
+* #1427: Set timestamp of ``.egg-info`` directory whenever ``egg_info`` command is run.
+* #1474: ``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore.
+* #1486: Suppress warnings in pkg_resources.handle_ns.
+* #1479: Remove internal use of six.binary_type.
+
+
 v40.2.0
 -------
 
diff --git a/changelog.d/1402.change.rst b/changelog.d/1402.change.rst
deleted file mode 100644
index 52852f055e..0000000000
--- a/changelog.d/1402.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a bug with namespace packages under Python 3.6 when one package in
-current directory hides another which is installed.
diff --git a/changelog.d/1427.change.rst b/changelog.d/1427.change.rst
deleted file mode 100644
index 86260235a4..0000000000
--- a/changelog.d/1427.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set timestamp of ``.egg-info`` directory whenever ``egg_info`` command is run.
diff --git a/changelog.d/1474.change.rst b/changelog.d/1474.change.rst
deleted file mode 100644
index c02f059bdf..0000000000
--- a/changelog.d/1474.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore.
diff --git a/changelog.d/1479.misc.rst b/changelog.d/1479.misc.rst
deleted file mode 100644
index 604827c1fc..0000000000
--- a/changelog.d/1479.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove internal use of six.binary_type.
diff --git a/changelog.d/1486.change.rst b/changelog.d/1486.change.rst
deleted file mode 100644
index 561784fb0f..0000000000
--- a/changelog.d/1486.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Suppress warnings in pkg_resources.handle_ns.
diff --git a/setup.cfg b/setup.cfg
index df021971e5..f013124cd7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.2.0
+current_version = 40.3.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 96dbbbbc6e..38057fd82f 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.2.0",
+    version="40.3.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From d39791489ce78d16e0238f60c429f0be08f4a994 Mon Sep 17 00:00:00 2001
From: Bernat Gabor <gaborjbernat@gmail.com>
Date: Fri, 14 Sep 2018 15:01:41 +0100
Subject: [PATCH 7151/8469] build_meta sdist directory delegate to --dist-dir

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

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index f7f9bda241..0067a7ac35 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -171,11 +171,9 @@ def build_sdist(sdist_directory, config_settings=None):
     config_settings = _fix_config(config_settings)
     sdist_directory = os.path.abspath(sdist_directory)
     sys.argv = sys.argv[:1] + ['sdist'] + \
-        config_settings["--global-option"]
+        config_settings["--global-option"] + \
+        ["--dist-dir", sdist_directory]
     _run_setup()
-    if sdist_directory != 'dist':
-        shutil.rmtree(sdist_directory)
-        shutil.copytree('dist', sdist_directory)
 
     sdists = [f for f in os.listdir(sdist_directory)
               if f.endswith('.tar.gz')]

From cd0278debfbd8d99d28f132d6c1fa67843d84170 Mon Sep 17 00:00:00 2001
From: Bernat Gabor <gaborjbernat@gmail.com>
Date: Fri, 14 Sep 2018 18:09:24 +0100
Subject: [PATCH 7152/8469] Add tests exposing the issues with sdist_directory
 not being --dist-dir

---
 setuptools/tests/test_build_meta.py | 36 ++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index f1d517bb08..7b195e2c38 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import os
+import shutil
 
 import pytest
 
@@ -9,7 +10,6 @@
 
 __metaclass__ = type
 
-
 futures = pytest.importorskip('concurrent.futures')
 importlib = pytest.importorskip('importlib')
 
@@ -23,12 +23,14 @@ def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
 
 class BuildBackend(BuildBackendBase):
     """PEP 517 Build Backend"""
+
     def __init__(self, *args, **kwargs):
         super(BuildBackend, self).__init__(*args, **kwargs)
         self.pool = futures.ProcessPoolExecutor()
 
     def __getattr__(self, name):
         """Handles aribrary function invocations on the build backend."""
+
         def method(*args, **kw):
             root = os.path.abspath(self.cwd)
             caller = BuildBackendCaller(root, self.env, self.backend_name)
@@ -51,6 +53,7 @@ def __call__(self, name, *args, **kw):
         'setup.py': DALS("""
             __import__('setuptools').setup(
                 name='foo',
+                version='0.0.0',
                 py_modules=['hello'],
                 setup_requires=['six'],
             )
@@ -65,6 +68,7 @@ def run():
             assert __name__ == '__main__'
             __import__('setuptools').setup(
                 name='foo',
+                version='0.0.0',
                 py_modules=['hello'],
                 setup_requires=['six'],
             )
@@ -82,6 +86,7 @@ def function():
             assert variable
             __import__('setuptools').setup(
                 name='foo',
+                version='0.0.0',
                 py_modules=['hello'],
                 setup_requires=['six'],
             )
@@ -146,3 +151,32 @@ def test_prepare_metadata_for_build_wheel_with_str(build_backend):
     dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
 
     assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
+
+
+def test_build_sdist_explicit_dist(build_backend):
+    # explicitly specifying the dist folder should work
+    # the folder sdist_directory and the ``--dist-dir`` can be the same
+    dist_dir = os.path.abspath('dist')
+    sdist_name = build_backend.build_sdist(dist_dir)
+    assert os.path.isfile(os.path.join(dist_dir, sdist_name))
+
+
+def test_build_sdist_version_change(build_backend):
+    sdist_into_directory = os.path.abspath("out_sdist")
+    os.makedirs(sdist_into_directory)
+
+    sdist_name = build_backend.build_sdist(sdist_into_directory)
+    assert os.path.isfile(os.path.join(sdist_into_directory, sdist_name))
+
+    # if the setup.py changes subsequent call of the build meta should still succeed, given the
+    # sdist_directory the frontend specifies is empty
+    with open(os.path.abspath("setup.py"), 'rt') as file_handler:
+        content = file_handler.read()
+    with open(os.path.abspath("setup.py"), 'wt') as file_handler:
+        file_handler.write(content.replace("version='0.0.0'", "version='0.0.1'"))
+
+    shutil.rmtree(sdist_into_directory)
+    os.makedirs(sdist_into_directory)
+
+    sdist_name = build_backend.build_sdist("out_sdist")
+    assert os.path.isfile(os.path.join(os.path.abspath("out_sdist"), sdist_name))

From bcbc52840b4dc28daa9cc5d729ff646b911b77b7 Mon Sep 17 00:00:00 2001
From: Bernat Gabor <gaborjbernat@gmail.com>
Date: Sun, 16 Sep 2018 22:15:37 +0100
Subject: [PATCH 7153/8469] add changelog for #1481

---
 changelog.d/1481.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1481.change.rst

diff --git a/changelog.d/1481.change.rst b/changelog.d/1481.change.rst
new file mode 100644
index 0000000000..ee0663a834
--- /dev/null
+++ b/changelog.d/1481.change.rst
@@ -0,0 +1 @@
+join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same (this means the build frontend no longer needs to clean manually the dist dir - to avoid multiple sdist presence, and we no longer need to handle conflicts between these two flags)

From da5f8619e1cd3e08c8a7d9df1d3753b8f176485b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Sep 2018 09:05:53 -0400
Subject: [PATCH 7154/8469] wordsmith changelog

---
 changelog.d/1481.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1481.change.rst b/changelog.d/1481.change.rst
index ee0663a834..463ba6d92e 100644
--- a/changelog.d/1481.change.rst
+++ b/changelog.d/1481.change.rst
@@ -1 +1 @@
-join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same (this means the build frontend no longer needs to clean manually the dist dir - to avoid multiple sdist presence, and we no longer need to handle conflicts between these two flags)
+Join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same target (meaning the build frontend no longer needs to clean manually the dist dir to avoid multiple sdist presence, and setuptools no longer needs to handle conflicts between the two).

From b40d2de57b61a28cb79f25eb99a2c2e6f9426343 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Sep 2018 09:08:44 -0400
Subject: [PATCH 7155/8469] =?UTF-8?q?Bump=20version:=2040.3.0=20=E2=86=92?=
 =?UTF-8?q?=2040.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1481.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1481.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 5da4acfa4f..189ea809b7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.4.0
+-------
+
+* #1481: Join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same target (meaning the build frontend no longer needs to clean manually the dist dir to avoid multiple sdist presence, and setuptools no longer needs to handle conflicts between the two).
+
+
 v40.3.0
 -------
 
diff --git a/changelog.d/1481.change.rst b/changelog.d/1481.change.rst
deleted file mode 100644
index 463ba6d92e..0000000000
--- a/changelog.d/1481.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same target (meaning the build frontend no longer needs to clean manually the dist dir to avoid multiple sdist presence, and setuptools no longer needs to handle conflicts between the two).
diff --git a/setup.cfg b/setup.cfg
index f013124cd7..7c87806490 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.3.0
+current_version = 40.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 38057fd82f..3ecf1d2e5b 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.3.0",
+    version="40.4.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From a170865f29bce8389ffcf5bfda8091fc6c120a45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Sep 2018 11:12:43 -0400
Subject: [PATCH 7156/8469] Update pavement not to import pip

---
 pavement.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pavement.py b/pavement.py
index 84e5825d8b..b5220d102b 100644
--- a/pavement.py
+++ b/pavement.py
@@ -1,7 +1,8 @@
 import re
+import sys
+import subprocess
 
 from paver.easy import task, path as Path
-import pip
 
 
 def remove_all(paths):
@@ -40,11 +41,13 @@ def clean(vendor):
 def install(vendor):
     clean(vendor)
     install_args = [
+        sys.executable,
+        '-m', 'pip',
         'install',
         '-r', str(vendor / 'vendored.txt'),
         '-t', str(vendor),
     ]
-    pip.main(install_args)
+    subprocess.check_call(install_args)
     remove_all(vendor.glob('*.dist-info'))
     remove_all(vendor.glob('*.egg-info'))
     (vendor / '__init__.py').write_text('')

From d4b5eb62d4a848c5cf6e2a0c3c5f39151b31897d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Sep 2018 11:15:31 -0400
Subject: [PATCH 7157/8469] Bump to pyparsing 2.2.1 and re-run paver
 update_vendored. Fixes #1480.

---
 changelog.d/1480.change.rst     |  1 +
 setuptools/_vendor/pyparsing.py | 46 ++++++++++++++++++++++++---------
 setuptools/_vendor/vendored.txt |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/1480.change.rst

diff --git a/changelog.d/1480.change.rst b/changelog.d/1480.change.rst
new file mode 100644
index 0000000000..9d855bdf31
--- /dev/null
+++ b/changelog.d/1480.change.rst
@@ -0,0 +1 @@
+Bump vendored pyparsing to 2.2.1.
diff --git a/setuptools/_vendor/pyparsing.py b/setuptools/_vendor/pyparsing.py
index e8aefc8ca1..cf75e1e5fc 100644
--- a/setuptools/_vendor/pyparsing.py
+++ b/setuptools/_vendor/pyparsing.py
@@ -1,6 +1,6 @@
 # module pyparsing.py
 #
-# Copyright (c) 2003-2016  Paul T. McGuire
+# Copyright (c) 2003-2018  Paul T. McGuire
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,7 @@
 __doc__ = \
 """
 pyparsing module - Classes and methods to define and execute parsing grammars
+=============================================================================
 
 The pyparsing module is an alternative approach to creating and executing simple grammars,
 vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
@@ -58,10 +59,23 @@ class names, and the use of '+', '|' and '^' operators.
  - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
  - quoted strings
  - embedded comments
+
+
+Getting Started -
+-----------------
+Visit the classes L{ParserElement} and L{ParseResults} to see the base classes that most other pyparsing
+classes inherit from. Use the docstrings for examples of how to:
+ - construct literal match expressions from L{Literal} and L{CaselessLiteral} classes
+ - construct character word-group expressions using the L{Word} class
+ - see how to create repetitive expressions using L{ZeroOrMore} and L{OneOrMore} classes
+ - use L{'+'<And>}, L{'|'<MatchFirst>}, L{'^'<Or>}, and L{'&'<Each>} operators to combine simple expressions into more complex ones
+ - associate names with your parsed results using L{ParserElement.setResultsName}
+ - find some helpful expression short-cuts like L{delimitedList} and L{oneOf}
+ - find more useful common expressions in the L{pyparsing_common} namespace class
 """
 
-__version__ = "2.2.0"
-__versionTime__ = "06 Mar 2017 02:06 UTC"
+__version__ = "2.2.1"
+__versionTime__ = "18 Sep 2018 00:49 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -82,6 +96,15 @@ class names, and the use of '+', '|' and '^' operators.
 except ImportError:
     from threading import RLock
 
+try:
+    # Python 3
+    from collections.abc import Iterable
+    from collections.abc import MutableMapping
+except ImportError:
+    # Python 2.7
+    from collections import Iterable
+    from collections import MutableMapping
+
 try:
     from collections import OrderedDict as _OrderedDict
 except ImportError:
@@ -940,7 +963,7 @@ def __getnewargs__(self):
     def __dir__(self):
         return (dir(type(self)) + list(self.keys()))
 
-collections.MutableMapping.register(ParseResults)
+MutableMapping.register(ParseResults)
 
 def col (loc,strg):
     """Returns current column within a string, counting newlines as line separators.
@@ -1025,11 +1048,11 @@ def extract_stack(limit=0):
             # special handling for Python 3.5.0 - extra deep call stack by 1
             offset = -3 if system_version == (3,5,0) else -2
             frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
-            return [(frame_summary.filename, frame_summary.lineno)]
+            return [frame_summary[:2]]
         def extract_tb(tb, limit=0):
             frames = traceback.extract_tb(tb, limit=limit)
             frame_summary = frames[-1]
-            return [(frame_summary.filename, frame_summary.lineno)]
+            return [frame_summary[:2]]
     else:
         extract_stack = traceback.extract_stack
         extract_tb = traceback.extract_tb
@@ -1374,7 +1397,7 @@ def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
             else:
                 preloc = loc
             tokensStart = preloc
-            if self.mayIndexError or loc >= len(instring):
+            if self.mayIndexError or preloc >= len(instring):
                 try:
                     loc,tokens = self.parseImpl( instring, preloc, doActions )
                 except IndexError:
@@ -1408,7 +1431,6 @@ def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
                                                   self.resultsName,
                                                   asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
                                                   modal=self.modalResults )
-
         if debugging:
             #~ print ("Matched",self,"->",retTokens.asList())
             if (self.debugActions[1] ):
@@ -3242,7 +3264,7 @@ def __init__( self, exprs, savelist = False ):
 
         if isinstance( exprs, basestring ):
             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
-        elif isinstance( exprs, collections.Iterable ):
+        elif isinstance( exprs, Iterable ):
             exprs = list(exprs)
             # if sequence of strings provided, wrap with Literal
             if all(isinstance(expr, basestring) for expr in exprs):
@@ -4393,7 +4415,7 @@ def traceParseAction(f):
 
         @traceParseAction
         def remove_duplicate_chars(tokens):
-            return ''.join(sorted(set(''.join(tokens)))
+            return ''.join(sorted(set(''.join(tokens))))
 
         wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
         print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
@@ -4583,7 +4605,7 @@ def oneOf( strs, caseless=False, useRegex=True ):
     symbols = []
     if isinstance(strs,basestring):
         symbols = strs.split()
-    elif isinstance(strs, collections.Iterable):
+    elif isinstance(strs, Iterable):
         symbols = list(strs)
     else:
         warnings.warn("Invalid argument to oneOf, expected string or iterable",
@@ -4734,7 +4756,7 @@ def locatedExpr(expr):
 _escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
 _escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
 _escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
-_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
+_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | CharsNotIn(r'\]', exact=1)
 _charRange = Group(_singleChar + Suppress("-") + _singleChar)
 _reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
 
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index ca0d5ce38e..7d77863d57 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,3 +1,3 @@
 packaging==16.8
-pyparsing==2.2.0
+pyparsing==2.2.1
 six==1.10.0

From 4f86e36471749397aeb30b6c29edffa7b3bdefc6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Sep 2018 11:16:24 -0400
Subject: [PATCH 7158/8469] =?UTF-8?q?Bump=20version:=2040.4.0=20=E2=86=92?=
 =?UTF-8?q?=2040.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1480.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1480.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 189ea809b7..816a4d274c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.4.1
+-------
+
+* #1480: Bump vendored pyparsing to 2.2.1.
+
+
 v40.4.0
 -------
 
diff --git a/changelog.d/1480.change.rst b/changelog.d/1480.change.rst
deleted file mode 100644
index 9d855bdf31..0000000000
--- a/changelog.d/1480.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bump vendored pyparsing to 2.2.1.
diff --git a/setup.cfg b/setup.cfg
index 7c87806490..26a14bdecc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.4.0
+current_version = 40.4.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 3ecf1d2e5b..5b08b18d01 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.4.0",
+    version="40.4.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 1eadacc8da624e5883d91040a7058b58557b400e Mon Sep 17 00:00:00 2001
From: joeflack4 <joeflack4@gmail.com>
Date: Wed, 19 Sep 2018 12:42:05 -0400
Subject: [PATCH 7159/8469] Added .idea/ to gitignore, to cover cases where
 people are using a Jetbrains text editor.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1f58eb319c..0c272d1c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ setuptools.egg-info
 *~
 .hg*
 .cache
+.idea/
 .pytest_cache/

From e5fede1f013671465e4023d5048d2fbab33a8932 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 20 Sep 2018 13:38:34 -0700
Subject: [PATCH 7160/8469] bpo-34011: Fixes missing venv files and other tests
 (GH-9458)

---
 tests/test_bdist.py         | 3 +++
 tests/test_bdist_wininst.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index f762f5d987..c80b3edc02 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -39,6 +39,9 @@ def test_skip_build(self):
 
         for name in names:
             subcmd = cmd.get_finalized_command(name)
+            if getattr(subcmd, '_unsupported', False):
+                # command is not supported on this build
+                continue
             self.assertTrue(subcmd.skip_build,
                             '%s should take --skip-build from bdist' % name)
 
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 5d17ab19a9..4c19bbab21 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -5,6 +5,8 @@
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
+@unittest.skipIf(getattr(bdist_wininst, '_unsupported', False),
+    'bdist_wininst is not supported in this install')
 class BuildWinInstTestCase(support.TempdirManager,
                            support.LoggingSilencer,
                            unittest.TestCase):

From 8cb8bb58e38f26c9abdc4904a30c55a006d73730 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Sep 2018 13:14:26 -0400
Subject: [PATCH 7161/8469] Update changelog for example release.

---
 changelog.d/1497.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1497.misc.rst

diff --git a/changelog.d/1497.misc.rst b/changelog.d/1497.misc.rst
new file mode 100644
index 0000000000..637a9d2d91
--- /dev/null
+++ b/changelog.d/1497.misc.rst
@@ -0,0 +1 @@
+Updated gitignore in repo.

From 5ba6a4246793d5ad3c9ec105792c1d16aa13a205 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 21 Sep 2018 13:16:06 -0400
Subject: [PATCH 7162/8469] =?UTF-8?q?Bump=20version:=2040.4.1=20=E2=86=92?=
 =?UTF-8?q?=2040.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst               | 6 ++++++
 changelog.d/1497.misc.rst | 1 -
 setup.cfg                 | 2 +-
 setup.py                  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1497.misc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 816a4d274c..01a91b5322 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.4.2
+-------
+
+* #1497: Updated gitignore in repo.
+
+
 v40.4.1
 -------
 
diff --git a/changelog.d/1497.misc.rst b/changelog.d/1497.misc.rst
deleted file mode 100644
index 637a9d2d91..0000000000
--- a/changelog.d/1497.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated gitignore in repo.
diff --git a/setup.cfg b/setup.cfg
index 26a14bdecc..b5659e19d8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.4.1
+current_version = 40.4.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 5b08b18d01..ad5f52847c 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.4.1",
+    version="40.4.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 323ff835845c6b4e7e8a8e004f5ad4eaf878e4d8 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 23 Sep 2018 09:12:59 +0300
Subject: [PATCH 7163/8469] bpo-34421: Improve distutils logging for non-ASCII
 strings. (GH-9126)

Use "backslashreplace" instead of "unicode-escape".  It is not
implementation depended and escapes only non-encodable characters.

Also simplify the code.
---
 log.py            |  7 +++----
 tests/test_log.py | 46 ++++++++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/log.py b/log.py
index 3a6602bc8b..8ef6b28ea2 100644
--- a/log.py
+++ b/log.py
@@ -27,14 +27,13 @@ def _log(self, level, msg, args):
                 stream = sys.stderr
             else:
                 stream = sys.stdout
-            if stream.errors == 'strict':
+            try:
+                stream.write('%s\n' % msg)
+            except UnicodeEncodeError:
                 # emulate backslashreplace error handler
                 encoding = stream.encoding
                 msg = msg.encode(encoding, "backslashreplace").decode(encoding)
-            try:
                 stream.write('%s\n' % msg)
-            except UnicodeEncodeError:
-                stream.write('%s\n' % msg.encode('unicode-escape').decode('ascii'))
             stream.flush()
 
     def log(self, level, msg, *args):
diff --git a/tests/test_log.py b/tests/test_log.py
index 0c2ad7a426..22c26246ca 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -3,33 +3,39 @@
 import sys
 import unittest
 from tempfile import NamedTemporaryFile
-from test.support import run_unittest
+from test.support import swap_attr, run_unittest
 
 from distutils import log
 
 class TestLog(unittest.TestCase):
     def test_non_ascii(self):
-        # Issue #8663: test that non-ASCII text is escaped with
-        # backslashreplace error handler (stream use ASCII encoding and strict
-        # error handler)
-        old_stdout = sys.stdout
-        old_stderr = sys.stderr
-        old_threshold = log.set_threshold(log.DEBUG)
-        try:
-            with NamedTemporaryFile(mode="w+", encoding='ascii') as stdout, \
-                 NamedTemporaryFile(mode="w+", encoding='ascii') as stderr:
-                sys.stdout = stdout
-                sys.stderr = stderr
-                log.debug("debug:\xe9")
-                log.fatal("fatal:\xe9")
+        # Issues #8663, #34421: test that non-encodable text is escaped with
+        # backslashreplace error handler and encodable non-ASCII text is
+        # output as is.
+        for errors in ('strict', 'backslashreplace', 'surrogateescape',
+                       'replace', 'ignore'):
+            with self.subTest(errors=errors), \
+                 NamedTemporaryFile("w+", encoding='cp437', errors=errors) as stdout, \
+                 NamedTemporaryFile("w+", encoding='cp437', errors=errors) as stderr:
+                old_threshold = log.set_threshold(log.DEBUG)
+                try:
+                    with swap_attr(sys, 'stdout', stdout), \
+                         swap_attr(sys, 'stderr', stderr):
+                        log.debug('Dεbug\tMėssãge')
+                        log.fatal('Fαtal\tÈrr�r')
+                finally:
+                    log.set_threshold(old_threshold)
+
                 stdout.seek(0)
-                self.assertEqual(stdout.read().rstrip(), "debug:\\xe9")
+                self.assertEqual(stdout.read().rstrip(),
+                        'Dεbug\tM?ss?ge' if errors == 'replace' else
+                        'Dεbug\tMssge' if errors == 'ignore' else
+                        'Dεbug\tM\\u0117ss\\xe3ge')
                 stderr.seek(0)
-                self.assertEqual(stderr.read().rstrip(), "fatal:\\xe9")
-        finally:
-            log.set_threshold(old_threshold)
-            sys.stdout = old_stdout
-            sys.stderr = old_stderr
+                self.assertEqual(stderr.read().rstrip(),
+                        'Fαtal\t?rr?r' if errors == 'replace' else
+                        'Fαtal\trrr' if errors == 'ignore' else
+                        'Fαtal\t\\xc8rr\\u014dr')
 
 def test_suite():
     return unittest.makeSuite(TestLog)

From a23e74ec65eaca077c3e8f21d592823c821e98f6 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 23 Sep 2018 14:10:07 +0300
Subject: [PATCH 7164/8469] Use in-memory streams instead of
 NamedTemporaryFile. (GH-9508)

---
 tests/test_log.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/test_log.py b/tests/test_log.py
index 22c26246ca..75cf900617 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -1,8 +1,8 @@
 """Tests for distutils.log"""
 
+import io
 import sys
 import unittest
-from tempfile import NamedTemporaryFile
 from test.support import swap_attr, run_unittest
 
 from distutils import log
@@ -14,9 +14,11 @@ def test_non_ascii(self):
         # output as is.
         for errors in ('strict', 'backslashreplace', 'surrogateescape',
                        'replace', 'ignore'):
-            with self.subTest(errors=errors), \
-                 NamedTemporaryFile("w+", encoding='cp437', errors=errors) as stdout, \
-                 NamedTemporaryFile("w+", encoding='cp437', errors=errors) as stderr:
+            with self.subTest(errors=errors):
+                stdout = io.TextIOWrapper(io.BytesIO(),
+                                          encoding='cp437', errors=errors)
+                stderr = io.TextIOWrapper(io.BytesIO(),
+                                          encoding='cp437', errors=errors)
                 old_threshold = log.set_threshold(log.DEBUG)
                 try:
                     with swap_attr(sys, 'stdout', stdout), \

From 2862b90422c63afc8864952878594e4194c517d9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 10:21:47 -0400
Subject: [PATCH 7165/8469] Bump to pyparsing 2.2.1 and re-run paver
 update_vendored. Fixes #1480.

---
 changelog.d/1480.change.rst        |  1 +
 pkg_resources/_vendor/pyparsing.py | 46 ++++++++++++++++++++++--------
 pkg_resources/_vendor/vendored.txt |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/1480.change.rst

diff --git a/changelog.d/1480.change.rst b/changelog.d/1480.change.rst
new file mode 100644
index 0000000000..a15ceabd8b
--- /dev/null
+++ b/changelog.d/1480.change.rst
@@ -0,0 +1 @@
+Bump vendored pyparsing in pkg_resources to 2.2.1.
diff --git a/pkg_resources/_vendor/pyparsing.py b/pkg_resources/_vendor/pyparsing.py
index e8aefc8ca1..cf75e1e5fc 100644
--- a/pkg_resources/_vendor/pyparsing.py
+++ b/pkg_resources/_vendor/pyparsing.py
@@ -1,6 +1,6 @@
 # module pyparsing.py
 #
-# Copyright (c) 2003-2016  Paul T. McGuire
+# Copyright (c) 2003-2018  Paul T. McGuire
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,7 @@
 __doc__ = \
 """
 pyparsing module - Classes and methods to define and execute parsing grammars
+=============================================================================
 
 The pyparsing module is an alternative approach to creating and executing simple grammars,
 vs. the traditional lex/yacc approach, or the use of regular expressions.  With pyparsing, you
@@ -58,10 +59,23 @@ class names, and the use of '+', '|' and '^' operators.
  - extra or missing whitespace (the above program will also handle "Hello,World!", "Hello  ,  World  !", etc.)
  - quoted strings
  - embedded comments
+
+
+Getting Started -
+-----------------
+Visit the classes L{ParserElement} and L{ParseResults} to see the base classes that most other pyparsing
+classes inherit from. Use the docstrings for examples of how to:
+ - construct literal match expressions from L{Literal} and L{CaselessLiteral} classes
+ - construct character word-group expressions using the L{Word} class
+ - see how to create repetitive expressions using L{ZeroOrMore} and L{OneOrMore} classes
+ - use L{'+'<And>}, L{'|'<MatchFirst>}, L{'^'<Or>}, and L{'&'<Each>} operators to combine simple expressions into more complex ones
+ - associate names with your parsed results using L{ParserElement.setResultsName}
+ - find some helpful expression short-cuts like L{delimitedList} and L{oneOf}
+ - find more useful common expressions in the L{pyparsing_common} namespace class
 """
 
-__version__ = "2.2.0"
-__versionTime__ = "06 Mar 2017 02:06 UTC"
+__version__ = "2.2.1"
+__versionTime__ = "18 Sep 2018 00:49 UTC"
 __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
 
 import string
@@ -82,6 +96,15 @@ class names, and the use of '+', '|' and '^' operators.
 except ImportError:
     from threading import RLock
 
+try:
+    # Python 3
+    from collections.abc import Iterable
+    from collections.abc import MutableMapping
+except ImportError:
+    # Python 2.7
+    from collections import Iterable
+    from collections import MutableMapping
+
 try:
     from collections import OrderedDict as _OrderedDict
 except ImportError:
@@ -940,7 +963,7 @@ def __getnewargs__(self):
     def __dir__(self):
         return (dir(type(self)) + list(self.keys()))
 
-collections.MutableMapping.register(ParseResults)
+MutableMapping.register(ParseResults)
 
 def col (loc,strg):
     """Returns current column within a string, counting newlines as line separators.
@@ -1025,11 +1048,11 @@ def extract_stack(limit=0):
             # special handling for Python 3.5.0 - extra deep call stack by 1
             offset = -3 if system_version == (3,5,0) else -2
             frame_summary = traceback.extract_stack(limit=-offset+limit-1)[offset]
-            return [(frame_summary.filename, frame_summary.lineno)]
+            return [frame_summary[:2]]
         def extract_tb(tb, limit=0):
             frames = traceback.extract_tb(tb, limit=limit)
             frame_summary = frames[-1]
-            return [(frame_summary.filename, frame_summary.lineno)]
+            return [frame_summary[:2]]
     else:
         extract_stack = traceback.extract_stack
         extract_tb = traceback.extract_tb
@@ -1374,7 +1397,7 @@ def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
             else:
                 preloc = loc
             tokensStart = preloc
-            if self.mayIndexError or loc >= len(instring):
+            if self.mayIndexError or preloc >= len(instring):
                 try:
                     loc,tokens = self.parseImpl( instring, preloc, doActions )
                 except IndexError:
@@ -1408,7 +1431,6 @@ def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ):
                                                   self.resultsName,
                                                   asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
                                                   modal=self.modalResults )
-
         if debugging:
             #~ print ("Matched",self,"->",retTokens.asList())
             if (self.debugActions[1] ):
@@ -3242,7 +3264,7 @@ def __init__( self, exprs, savelist = False ):
 
         if isinstance( exprs, basestring ):
             self.exprs = [ ParserElement._literalStringClass( exprs ) ]
-        elif isinstance( exprs, collections.Iterable ):
+        elif isinstance( exprs, Iterable ):
             exprs = list(exprs)
             # if sequence of strings provided, wrap with Literal
             if all(isinstance(expr, basestring) for expr in exprs):
@@ -4393,7 +4415,7 @@ def traceParseAction(f):
 
         @traceParseAction
         def remove_duplicate_chars(tokens):
-            return ''.join(sorted(set(''.join(tokens)))
+            return ''.join(sorted(set(''.join(tokens))))
 
         wds = OneOrMore(wd).setParseAction(remove_duplicate_chars)
         print(wds.parseString("slkdjs sld sldd sdlf sdljf"))
@@ -4583,7 +4605,7 @@ def oneOf( strs, caseless=False, useRegex=True ):
     symbols = []
     if isinstance(strs,basestring):
         symbols = strs.split()
-    elif isinstance(strs, collections.Iterable):
+    elif isinstance(strs, Iterable):
         symbols = list(strs)
     else:
         warnings.warn("Invalid argument to oneOf, expected string or iterable",
@@ -4734,7 +4756,7 @@ def locatedExpr(expr):
 _escapedPunc = Word( _bslash, r"\[]-*.$+^?()~ ", exact=2 ).setParseAction(lambda s,l,t:t[0][1])
 _escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").setParseAction(lambda s,l,t:unichr(int(t[0].lstrip(r'\0x'),16)))
 _escapedOctChar = Regex(r"\\0[0-7]+").setParseAction(lambda s,l,t:unichr(int(t[0][1:],8)))
-_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables, excludeChars=r'\]', exact=1) | Regex(r"\w", re.UNICODE)
+_singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | CharsNotIn(r'\]', exact=1)
 _charRange = Group(_singleChar + Suppress("-") + _singleChar)
 _reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"
 
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index e3d564f163..7f4f40879b 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
 packaging==16.8
-pyparsing==2.2.0
+pyparsing==2.2.1
 six==1.10.0
 appdirs==1.4.3

From 898c252e4c1d0521a106fb608993aef099dca16e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 10:23:52 -0400
Subject: [PATCH 7166/8469] =?UTF-8?q?Bump=20version:=2040.4.2=20=E2=86=92?=
 =?UTF-8?q?=2040.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1480.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1480.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 01a91b5322..263a19aa1c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.4.3
+-------
+
+* #1480: Bump vendored pyparsing in pkg_resources to 2.2.1.
+
+
 v40.4.2
 -------
 
diff --git a/changelog.d/1480.change.rst b/changelog.d/1480.change.rst
deleted file mode 100644
index a15ceabd8b..0000000000
--- a/changelog.d/1480.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bump vendored pyparsing in pkg_resources to 2.2.1.
diff --git a/setup.cfg b/setup.cfg
index b5659e19d8..55347d619e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.4.2
+current_version = 40.4.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ad5f52847c..b37082c4ba 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.4.2",
+    version="40.4.3",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From e3ce4c508fe2b0c56c6bd22ee0eb15fb3a7fb279 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 10:32:55 -0400
Subject: [PATCH 7167/8469] Capture expected warning

---
 setuptools/tests/test_pep425tags.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
index 658784ac95..f558a0d87c 100644
--- a/setuptools/tests/test_pep425tags.py
+++ b/setuptools/tests/test_pep425tags.py
@@ -1,5 +1,6 @@
 import sys
 
+import pytest
 from mock import patch
 
 from setuptools import pep425tags
@@ -64,7 +65,8 @@ def raises_ioerror(var):
 
         with patch('setuptools.pep425tags.sysconfig.get_config_var',
                    raises_ioerror):
-            assert len(pep425tags.get_supported())
+            with pytest.warns(RuntimeWarning):
+                assert len(pep425tags.get_supported())
 
     def test_no_hyphen_tag(self):
         """

From b3d098a3f7eb41c9554fdafe3d5aeb68d51f81f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 10:41:42 -0400
Subject: [PATCH 7168/8469] Ignore warnings about deprecated features.

---
 setuptools/tests/test_setuptools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 26e37a6c14..7aae3a163a 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -210,6 +210,7 @@ def testInvalidIncludeExclude(self):
             self.dist.exclude(package_dir=['q'])
 
 
+@pytest.mark.filterwarnings('ignore:Features are deprecated')
 class TestFeatures:
     def setup_method(self, method):
         self.req = Require('Distutils', '1.0.3', 'distutils')

From f325331100dc82916cba35b7310030fe6f337767 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 11:35:24 -0400
Subject: [PATCH 7169/8469] Use preferred interface, fixing DeprecationWarning
 on later Pythons.

---
 setuptools/package_index.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index cda54b7171..e650ac6f49 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -980,8 +980,7 @@ def _encode_auth(auth):
     auth_s = urllib.parse.unquote(auth)
     # convert to bytes
     auth_bytes = auth_s.encode()
-    # use the legacy interface for Python 2.3 support
-    encoded_bytes = base64.encodestring(auth_bytes)
+    encoded_bytes = base64.b64encode(auth_bytes)
     # convert back to a string
     encoded = encoded_bytes.decode()
     # strip the trailing carriage return

From 8c355d7c2f20feaf85c2ee5a96e993826e62bbd4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 11:48:44 -0400
Subject: [PATCH 7170/8469] Use stacklevel=2 to better reveal usage of
 deprecated calls.

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index dd17cc13f5..a1470f6ddb 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2085,7 +2085,7 @@ def get_script_args(cls, dist, executable=None, wininst=False):
     @classmethod
     def get_script_header(cls, script_text, executable=None, wininst=False):
         # for backward compatibility
-        warnings.warn("Use get_header", DeprecationWarning)
+        warnings.warn("Use get_header", DeprecationWarning, stacklevel=2)
         if wininst:
             executable = "python.exe"
         cmd = cls.command_spec_class.best().from_param(executable)

From da3d5f36862b916941da87d86e13cb74c874ccec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 11:52:50 -0400
Subject: [PATCH 7171/8469] Replace redundant code with call of that code.

---
 setuptools/command/easy_install.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a1470f6ddb..3da601b741 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2088,9 +2088,7 @@ def get_script_header(cls, script_text, executable=None, wininst=False):
         warnings.warn("Use get_header", DeprecationWarning, stacklevel=2)
         if wininst:
             executable = "python.exe"
-        cmd = cls.command_spec_class.best().from_param(executable)
-        cmd.install_options(script_text)
-        return cmd.as_header()
+        return cls.get_header(script_text, executable)
 
     @classmethod
     def get_args(cls, dist, header=None):

From a48e96b5352f6bc6755202f35324e0dcfde2283b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 11:56:02 -0400
Subject: [PATCH 7172/8469] Update tests to remove use of deprecated
 get_script_header

---
 setuptools/tests/test_easy_install.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 955c2ae94e..1e3688068a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -756,24 +756,24 @@ class TestScriptHeader:
 
     def test_get_script_header(self):
         expected = '#!%s\n' % ei.nt_quote_arg(os.path.normpath(sys.executable))
-        actual = ei.ScriptWriter.get_script_header('#!/usr/local/bin/python')
+        actual = ei.ScriptWriter.get_header('#!/usr/local/bin/python')
         assert actual == expected
 
     def test_get_script_header_args(self):
         expected = '#!%s -x\n' % ei.nt_quote_arg(
             os.path.normpath(sys.executable))
-        actual = ei.ScriptWriter.get_script_header('#!/usr/bin/python -x')
+        actual = ei.ScriptWriter.get_header('#!/usr/bin/python -x')
         assert actual == expected
 
     def test_get_script_header_non_ascii_exe(self):
-        actual = ei.ScriptWriter.get_script_header(
+        actual = ei.ScriptWriter.get_header(
             '#!/usr/bin/python',
             executable=self.non_ascii_exe)
         expected = str('#!%s -x\n') % self.non_ascii_exe
         assert actual == expected
 
     def test_get_script_header_exe_with_spaces(self):
-        actual = ei.ScriptWriter.get_script_header(
+        actual = ei.ScriptWriter.get_header(
             '#!/usr/bin/python',
             executable='"' + self.exe_with_spaces + '"')
         expected = '#!"%s"\n' % self.exe_with_spaces
@@ -817,7 +817,7 @@ def test_from_simple_string_uses_shlex(self):
 
 class TestWindowsScriptWriter:
     def test_header(self):
-        hdr = ei.WindowsScriptWriter.get_script_header('')
+        hdr = ei.WindowsScriptWriter.get_header('')
         assert hdr.startswith('#!')
         assert hdr.endswith('\n')
         hdr = hdr.lstrip('#!')

From 5b869d5c19ffea9b149b214e3638de83cc4c5d98 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 12:04:11 -0400
Subject: [PATCH 7173/8469] Suppress Unbuild egg warnings in TestPTHFileWriter

---
 setuptools/tests/test_easy_install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 1e3688068a..b0cc4c9fbc 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -288,6 +288,7 @@ def test_script_install(self, sdist_script, tmpdir, monkeypatch):
         assert (target / 'mypkg_script').exists()
 
 
+@pytest.mark.filterwarnings('ignore:Unbuilt egg')
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):
         '''a pth file manager should set dirty

From c2f72efd261bf89372dfa27b1c115012e74bd525 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 12:44:23 -0400
Subject: [PATCH 7174/8469] Deprecate Subversion download functionality. Ref
 #1502. Used UserWarning instead of DeprecationWarning so it's visible to
 users who might be relying on this functionality.

---
 changelog.d/1502.change.rst | 1 +
 setuptools/package_index.py | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/1502.change.rst

diff --git a/changelog.d/1502.change.rst b/changelog.d/1502.change.rst
new file mode 100644
index 0000000000..8ddf5d43e9
--- /dev/null
+++ b/changelog.d/1502.change.rst
@@ -0,0 +1 @@
+Deprecated support for downloads from Subversion in package_index/easy_install.
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index e650ac6f49..1608b91ace 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -7,6 +7,7 @@
 import base64
 import hashlib
 import itertools
+import warnings
 from functools import wraps
 
 from setuptools.extern import six
@@ -848,6 +849,7 @@ def _download_html(self, url, headers, filename):
         raise DistutilsError("Unexpected HTML page found at " + url)
 
     def _download_svn(self, url, filename):
+        warnings.warn("SVN download support is deprecated", UserWarning)
         url = url.split('#', 1)[0]  # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:

From 18708e4ad51e32ef0aa09e15aaa5bfa7240cf2c9 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 19 Oct 2018 18:09:33 +0200
Subject: [PATCH 7175/8469] travis: preemptively switch to VM-based jobs

Rational: https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 63d0333ae6..fba548e929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 dist: trusty
-sudo: false
 language: python
 python:
 - &latest_py2 2.7

From 544f4b939943c80bdaf468e72c4cbeddd6cfe585 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 19 Oct 2018 18:17:51 +0200
Subject: [PATCH 7176/8469] travis: fix support for Python 3.7 and add support
 for 3.8

---
 .travis.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fba548e929..627c1f6332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,29 @@
 dist: trusty
 language: python
-python:
-- &latest_py2 2.7
-- 3.4
-- 3.5
-- &latest_py3 3.6
-- nightly
-- pypy
-- pypy3
 
 jobs:
   fast_finish: true
   include:
-  - python: *latest_py3
+  - &latest_py2
+    python: 2.7
+  - <<: *latest_py2
     env: LANG=C
-  - python: *latest_py2
+  - python: pypy
+  - python: pypy3
+  - python: 3.4
+  - python: 3.5
+  - &default_py
+    python: 3.6
+  - &latest_py3
+    python: 3.7
+    dist: xenial
+  - <<: *latest_py3
     env: LANG=C
-  - stage: deploy (to PyPI for tagged commits)
+  - python: 3.8-dev
+    dist: xenial
+  - <<: *default_py
+    stage: deploy (to PyPI for tagged commits)
     if: tag IS present
-    python: *latest_py3
     install: skip
     script: skip
     after_success: true

From d6c05b4b63c337b6280496cd6a9e63b6a99ce53f Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 19 Oct 2018 18:24:18 +0200
Subject: [PATCH 7177/8469] travis: ensure test requirements are installed and
 up-to-date

Particularly: update pip so PEP 518 support is available.
---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 627c1f6332..7e61d8a483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,12 +43,14 @@ jobs:
 cache: pip
 
 install:
-# ensure we have recent pip/setuptools
-- pip install --upgrade pip setuptools
+
+# ensure we have recent pip/setuptools/wheel
+- pip install --disable-pip-version-check --upgrade pip setuptools wheel
 # need tox to get started
-- pip install tox tox-venv
+- pip install --upgrade tox tox-venv
 
 # Output the env, to verify behavior
+- pip freeze --all
 - env
 
 # update egg_info based on setup.py in checkout

From 5a9fd0f4110e2ff3e914b186fd4d9dcd46c4da92 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 19 Oct 2018 19:33:16 +0200
Subject: [PATCH 7178/8469] appveyor: ensure test requirements are installed
 and up-to-date

---
 appveyor.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f50f8386ac..b90de892af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,9 +21,12 @@ cache:
   - '%LOCALAPPDATA%\pip\Cache'
 
 test_script:
-  - "python bootstrap.py"
-  - "python -m pip install tox"
-  - "tox -- --cov"
+  - python --version
+  - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
+  - pip install --upgrade tox tox-venv
+  - pip freeze --all
+  - python bootstrap.py
+  - tox -- --cov
 
 after_test:
     - tox -e coverage,codecov

From c562f10429782b23b62df038b78350efeb54291c Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 19 Oct 2018 19:45:23 +0200
Subject: [PATCH 7179/8469] appveyor: only clone the first 50 commits

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index b90de892af..ef4a9f7e35 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,5 @@
+clone_depth: 50
+
 environment:
 
   APPVEYOR: True

From 32bbe849d9427f1c3ef7c7d93ced324c4d90a2ad Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 21 Oct 2018 16:28:04 +0200
Subject: [PATCH 7180/8469] coverage: disable gcov processing

We don't need it and it generates a couple of error messages on AppVeyor:

  FIND: Parameter format not correct
  [...]
  Error running `find 'C:\projects\setuptools' -not - [...]
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 3b03b7db17..a2f850dff5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ commands=coverage erase
 description=[Only run on CI]: Upload coverage data to codecov
 deps=codecov
 skip_install=True
-commands=codecov --file {toxworkdir}/coverage.xml
+commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 
 [testenv:docs]
 deps = -r{toxinidir}/docs/requirements.txt

From 604fc1ec955db2ce6e0c021073462cb3f4fac667 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 21 Oct 2018 17:16:31 +0200
Subject: [PATCH 7181/8469] coverage: ignore invalid Python 3.8 coverage data

---
 .travis.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e61d8a483..0e53bd29da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,9 @@ jobs:
   - <<: *latest_py2
     env: LANG=C
   - python: pypy
+    env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
+    env: DISABLE_COVERAGE=1
   - python: 3.4
   - python: 3.5
   - &default_py
@@ -21,6 +23,7 @@ jobs:
     env: LANG=C
   - python: 3.8-dev
     dist: xenial
+    env: DISABLE_COVERAGE=1  # Ignore invalid coverage data.
   - <<: *default_py
     stage: deploy (to PyPI for tagged commits)
     if: tag IS present
@@ -59,28 +62,20 @@ install:
 script:
   - |
     ( # Run testsuite.
-      set -ex
-      case $TRAVIS_PYTHON_VERSION in
-      pypy*)
-        # Don't run coverage on pypy (too slow).
-        tox
-        ;;
-      *)
+      if [ -z "$DISABLE_COVERAGE" ]
+      then
         tox -- --cov
-        ;;
-      esac
+      else
+        tox
+      fi
     )
 
 after_success:
   - |
     ( # Upload coverage data.
-      set -ex
-      case $TRAVIS_PYTHON_VERSION in
-      pypy*)
-        ;;
-        *)
+      if [ -z "$DISABLE_COVERAGE" ]
+      then
         export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
         tox -e coverage,codecov
-        ;;
-      esac
+      fi
     )

From 8c22c3b5ac0a5a293b03b79686e53f885d71cba4 Mon Sep 17 00:00:00 2001
From: Thirumal Venkat <me@thirumal.in>
Date: Wed, 24 Oct 2018 01:05:52 +0530
Subject: [PATCH 7182/8469] Drop use of six.u (#1517)

---
 changelog.d/1517.change.rst        | 1 +
 setuptools/command/easy_install.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1517.change.rst

diff --git a/changelog.d/1517.change.rst b/changelog.d/1517.change.rst
new file mode 100644
index 0000000000..18a77a8ba4
--- /dev/null
+++ b/changelog.d/1517.change.rst
@@ -0,0 +1 @@
+Dropped use of six.u in favor of `u""` literals.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 3da601b741..c670a16e61 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -632,7 +632,7 @@ def check_editable(self, spec):
 
     @contextlib.contextmanager
     def _tmpdir(self):
-        tmpdir = tempfile.mkdtemp(prefix=six.u("easy_install-"))
+        tmpdir = tempfile.mkdtemp(prefix=u"easy_install-")
         try:
             # cast to str as workaround for #709 and #710 and #712
             yield str(tmpdir)

From 74afc688fc4084390c9e9169984b5f7d8339b8e4 Mon Sep 17 00:00:00 2001
From: Satoru SATOH <satoru.satoh@gmail.com>
Date: Wed, 24 Oct 2018 03:42:01 +0900
Subject: [PATCH 7183/8469] Add data_files support in setup.cfg with test case

In the test case, dist.data_files needs to be sorted because the
current implementation loads the configuration files as a dictionary
with arbitrary order on Python < 3.6.
---
 setuptools/config.py            |  8 ++++++++
 setuptools/tests/test_config.py | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/setuptools/config.py b/setuptools/config.py
index 0da3dbc9cf..73a3bf7031 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -598,3 +598,11 @@ def parse_section_extras_require(self, section_options):
         parse_list = partial(self._parse_list, separator=';')
         self['extras_require'] = self._parse_section_to_dict(
             section_options, parse_list)
+
+    def parse_section_data_files(self, section_options):
+        """Parses `data_files` configuration file section.
+
+        :param dict section_options:
+        """
+        parsed = self._parse_section_to_dict(section_options, self._parse_list)
+        self['data_files'] = [(k, v) for k, v in parsed.items()]
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index acf221549b..76759ec57c 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -703,6 +703,23 @@ def test_entry_points(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.entry_points == expected
 
+    def test_data_files(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options.data_files]\n'
+            'cfg =\n'
+            '      a/b.conf\n'
+            '      c/d.conf\n'
+            'data = e/f.dat, g/h.dat\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            expected = [
+                ('cfg', ['a/b.conf', 'c/d.conf']),
+                ('data', ['e/f.dat', 'g/h.dat']),
+            ]
+            assert sorted(dist.data_files) == sorted(expected)
+
 saved_dist_init = _Distribution.__init__
 class TestExternalSetters:
     # During creation of the setuptools Distribution() object, we call

From 8d6a2d2031108e11df5823211e500af3d5daad5f Mon Sep 17 00:00:00 2001
From: Satoru SATOH <satoru.satoh@gmail.com>
Date: Wed, 24 Oct 2018 03:49:56 +0900
Subject: [PATCH 7184/8469] Add docs on how to use data_files in setup.cfg

This adds the `[options.data_files]` section to the existing setup.cfg
example.
---
 docs/setuptools.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 89f45bd857..da9b0132e1 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2367,6 +2367,11 @@ boilerplate code in some cases.
         src.subpackage1
         src.subpackage2
 
+    [options.data_files]
+    /etc/my_package =
+        site.d/00_default.conf
+        host.d/00_default.conf
+    data = data/img/logo.png, data/svg/icon.svg
 
 Metadata and options are set in the config sections of the same name.
 

From b77ea8cbc705c1ae4c84870da895eafe2aac94a2 Mon Sep 17 00:00:00 2001
From: Satoru SATOH <satoru.satoh@gmail.com>
Date: Wed, 24 Oct 2018 11:34:22 +0900
Subject: [PATCH 7185/8469] Add a news fragment for PR #1520

---
 changelog.d/1520.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1520.change.rst

diff --git a/changelog.d/1520.change.rst b/changelog.d/1520.change.rst
new file mode 100644
index 0000000000..00569c6ff0
--- /dev/null
+++ b/changelog.d/1520.change.rst
@@ -0,0 +1 @@
+Added support for ``data_files`` in ``setup.cfg``.

From 84f1abafd3a707b464f039892ef48b9e282d0d4a Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung <uranusjr@gmail.com>
Date: Wed, 24 Oct 2018 09:52:56 +0800
Subject: [PATCH 7186/8469] Call os.path.normpath to normalize paths for comp

---
 changelog.d/1519.change.rst               | 1 +
 pkg_resources/__init__.py                 | 2 +-
 pkg_resources/tests/test_pkg_resources.py | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1519.change.rst

diff --git a/changelog.d/1519.change.rst b/changelog.d/1519.change.rst
new file mode 100644
index 0000000000..d6da88be78
--- /dev/null
+++ b/changelog.d/1519.change.rst
@@ -0,0 +1 @@
+Perform additional path normalization to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3ae2c5cdb7..2b2442f51b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2228,7 +2228,7 @@ def null_ns_handler(importer, path_item, packageName, module):
 
 def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
-    return os.path.normcase(os.path.realpath(filename))
+    return os.path.normcase(os.path.normpath(os.path.realpath(filename)))
 
 
 def _normalize_cached(filename, _cache={}):
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 62a39b8fa8..81b67a31a9 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -236,3 +236,8 @@ def test_version_resolved_from_egg_info(self, env):
         req = pkg_resources.Requirement.parse('foo>=1.9')
         dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req)
         assert dist.version == version
+
+    def test_normalize_path(self, tmpdir):
+        path = str(tmpdir)
+        expected = os.path.normcase(os.path.normpath(os.path.realpath(path)))
+        assert pkg_resources.normalize_path(path) == expected

From d765ecb15daa2145bb87de5fcc6ed45d371e2330 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <pganssle@users.noreply.github.com>
Date: Thu, 25 Oct 2018 23:29:48 +0800
Subject: [PATCH 7187/8469] Describe where the behavior change is made

Co-Authored-By: uranusjr <uranusjr@gmail.com>
---
 changelog.d/1519.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1519.change.rst b/changelog.d/1519.change.rst
index d6da88be78..a0e8a6f14a 100644
--- a/changelog.d/1519.change.rst
+++ b/changelog.d/1519.change.rst
@@ -1 +1 @@
-Perform additional path normalization to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.
+In ``pkg_resources.normalize_path``, additional path normalization is now performed to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.

From 6966c75947609b5e2dd85aa4cb1725e3e4897e04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Oct 2018 11:34:08 -0400
Subject: [PATCH 7188/8469] Extract patch and its purpose into a specialized
 function which can be excluded from coverage.

---
 pkg_resources/__init__.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3cbb5d199d..5423af6f4c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2220,15 +2220,18 @@ def null_ns_handler(importer, path_item, packageName, module):
 
 def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
-    if sys.platform == 'cygwin':
-      # This results in a call to getcwd() if `filename` is relative. Contrary
-      # to POSIX 2008 on Cygwin getcwd (3) contains symlink components. Using
-      # os.path.abspath() works around this limitation. A fix in os.getcwd()
-      # would probably better, in Cygwin even more so except that this seems
-      # to be by design...
-      return os.path.normcase(os.path.realpath(os.path.abspath(filename)))
-    else:
-      return os.path.normcase(os.path.realpath(filename))
+    return os.path.normcase(os.path.realpath(_cygwin_patch(filename)))
+
+
+def _cygwin_patch(filename):  # pragma: nocover
+    """
+    Contrary to POSIX 2008, on Cygwin, getcwd (3) contains
+    symlink components. Using
+    os.path.abspath() works around this limitation. A fix in os.getcwd()
+    would probably better, in Cygwin even more so, except
+    that this seems to be by design...
+    """
+    return os.path.abspath(filename) if sys.platform == 'cygwin' else filename
 
 
 def _normalize_cached(filename, _cache={}):

From c14b6f35659ca0a13968632f58e18ba40cd11dca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Oct 2018 11:36:40 -0400
Subject: [PATCH 7189/8469] Update changelog

---
 changelog.d/1335.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1335.change.rst

diff --git a/changelog.d/1335.change.rst b/changelog.d/1335.change.rst
new file mode 100644
index 0000000000..a6ced1bb1a
--- /dev/null
+++ b/changelog.d/1335.change.rst
@@ -0,0 +1 @@
+In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.

From 72b5c330318a624832402c5445f1213ce82f5642 Mon Sep 17 00:00:00 2001
From: Jesus Laime <laimejesu@gmail.com>
Date: Thu, 25 Oct 2018 20:35:16 -0300
Subject: [PATCH 7190/8469] Fix deprecation warning in easy_install docs

---
 docs/easy_install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 41d182e041..aa11f89083 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -2,7 +2,7 @@
 Easy Install
 ============
 
-..warning::
+.. warning::
     Easy Install is deprecated. Do not use it. Instead use pip. If
     you think you need Easy Install, please reach out to the PyPA
     team (a ticket to pip or setuptools is fine), describing your

From bda99a0f512505368219afa75634811b72f2f892 Mon Sep 17 00:00:00 2001
From: Jesus Laime <laimejesu@gmail.com>
Date: Thu, 25 Oct 2018 20:49:20 -0300
Subject: [PATCH 7191/8469] Add changelog for PR #1526 (issue #1525)

---
 changelog.d/1525.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1525.doc.rst

diff --git a/changelog.d/1525.doc.rst b/changelog.d/1525.doc.rst
new file mode 100644
index 0000000000..402ea260ae
--- /dev/null
+++ b/changelog.d/1525.doc.rst
@@ -0,0 +1 @@
+Fixed rendering of the deprecation warning in easy_install doc.

From 8cdb68448e70d019ccaf25b2d66b1ecbf82494e5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Oct 2018 11:41:29 -0400
Subject: [PATCH 7192/8469] =?UTF-8?q?Bump=20version:=2040.4.3=20=E2=86=92?=
 =?UTF-8?q?=2040.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 10 ++++++++++
 changelog.d/1335.change.rst |  1 -
 changelog.d/1502.change.rst |  1 -
 changelog.d/1517.change.rst |  1 -
 changelog.d/1520.change.rst |  1 -
 changelog.d/1525.doc.rst    |  1 -
 setup.cfg                   |  2 +-
 setup.py                    |  2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/1335.change.rst
 delete mode 100644 changelog.d/1502.change.rst
 delete mode 100644 changelog.d/1517.change.rst
 delete mode 100644 changelog.d/1520.change.rst
 delete mode 100644 changelog.d/1525.doc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 263a19aa1c..ca07119d95 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v40.5.0
+-------
+
+* #1335: In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.
+* #1502: Deprecated support for downloads from Subversion in package_index/easy_install.
+* #1517: Dropped use of six.u in favor of `u""` literals.
+* #1520: Added support for ``data_files`` in ``setup.cfg``.
+* #1525: Fixed rendering of the deprecation warning in easy_install doc.
+
+
 v40.4.3
 -------
 
diff --git a/changelog.d/1335.change.rst b/changelog.d/1335.change.rst
deleted file mode 100644
index a6ced1bb1a..0000000000
--- a/changelog.d/1335.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.
diff --git a/changelog.d/1502.change.rst b/changelog.d/1502.change.rst
deleted file mode 100644
index 8ddf5d43e9..0000000000
--- a/changelog.d/1502.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated support for downloads from Subversion in package_index/easy_install.
diff --git a/changelog.d/1517.change.rst b/changelog.d/1517.change.rst
deleted file mode 100644
index 18a77a8ba4..0000000000
--- a/changelog.d/1517.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Dropped use of six.u in favor of `u""` literals.
diff --git a/changelog.d/1520.change.rst b/changelog.d/1520.change.rst
deleted file mode 100644
index 00569c6ff0..0000000000
--- a/changelog.d/1520.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added support for ``data_files`` in ``setup.cfg``.
diff --git a/changelog.d/1525.doc.rst b/changelog.d/1525.doc.rst
deleted file mode 100644
index 402ea260ae..0000000000
--- a/changelog.d/1525.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed rendering of the deprecation warning in easy_install doc.
diff --git a/setup.cfg b/setup.cfg
index 55347d619e..5f7abd3940 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.4.3
+current_version = 40.5.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b37082c4ba..2cac67a2b0 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.4.3",
+    version="40.5.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 1fb56a315f92e09d930ab7c2c787adbaead64d76 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Oct 2018 12:18:44 -0400
Subject: [PATCH 7193/8469] Update roadmap to expand scope of declarative
 config goals.

---
 docs/roadmap.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 9bde49360a..d5a127e890 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -4,7 +4,9 @@ Roadmap
 
 Setuptools has the following large-scale goals on the roadmap:
 
-- Harmonize declarative config with pyproject.toml syntax.
+- Mature declarative config to supersede imperative config in
+  all supported use-cases and harmonize with pyproject.toml
+  syntax.
 - Deprecate and remove setup_requires and easy_install in
   favor of PEP 518 build requirements and pip install.
 - Adopt the Distutils package and stop monkeypatching stdlib.

From d3215c10b6f9ccd8940f9345642ee0718f158585 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 11:25:51 +0100
Subject: [PATCH 7194/8469] Mark Py 2/3-only tests as skip instead of xfail

Also reuse pre-defined py2_only and py3_only decorators where
appropriate.
---
 setuptools/tests/test_build_meta.py | 3 ++-
 setuptools/tests/test_manifest.py   | 3 +--
 setuptools/tests/test_namespaces.py | 2 +-
 setuptools/tests/test_sdist.py      | 2 +-
 setuptools/tests/test_test.py       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 7b195e2c38..c5f4dcaa9b 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -7,6 +7,7 @@
 
 from .files import build_files
 from .textwrap import DALS
+from . import py2_only
 
 __metaclass__ = type
 
@@ -143,7 +144,7 @@ def test_prepare_metadata_for_build_wheel(build_backend):
     assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
 
 
-@pytest.mark.skipif('sys.version_info > (3,)')
+@py2_only
 def test_prepare_metadata_for_build_wheel_with_str(build_backend):
     dist_dir = os.path.abspath(str('pip-dist-info'))
     os.makedirs(dist_dir)
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index c9533dda9f..5edfbea003 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -15,13 +15,12 @@
 from setuptools.dist import Distribution
 from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
+from . import py3_only
 
 import pytest
 
 __metaclass__ = type
 
-py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
-
 
 def make_local_path(s):
     """Converts '/' in a string to os.sep"""
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index da19bd79b8..670ccee915 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -12,7 +12,7 @@
 
 class TestNamespaces:
 
-    @pytest.mark.xfail(
+    @pytest.mark.skipif(
         sys.version_info < (3, 5),
         reason="Requires importlib.util.module_from_spec",
     )
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 02222da5a6..3a203890c8 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -20,8 +20,8 @@
 from setuptools.dist import Distribution
 from setuptools.tests import fail_on_ascii
 from .text import Filenames
+from . import py3_only
 
-py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
 
 SETUP_ATTRS = {
     'name': 'sdist_test',
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 960527bcab..4ba70484fc 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -93,7 +93,7 @@ def test_test(capfd):
     assert out == 'Foo\n'
 
 
-@pytest.mark.xfail(
+@pytest.mark.skipif(
     sys.version_info < (2, 7),
     reason="No discover support for unittest on Python 2.6",
 )

From dc9b2b6bdb2e53582ed7d090f40a1aec5983fd3a Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 10:27:56 +0100
Subject: [PATCH 7195/8469] Add Python 3.7 to the classifiers

Fixes https://github.com/pypa/setuptools/issues/1528.
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 2cac67a2b0..cdb4ec7999 100755
--- a/setup.py
+++ b/setup.py
@@ -164,6 +164,7 @@ def pypi_link(pkg_filename):
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6
+        Programming Language :: Python :: 3.7
         Topic :: Software Development :: Libraries :: Python Modules
         Topic :: System :: Archiving :: Packaging
         Topic :: System :: Systems Administration

From 98056a680fde6bede9ce4c159b72d1ac01bf9067 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 11:39:30 +0100
Subject: [PATCH 7196/8469] Remove pytest marker and code for Python < 2.7

---
 setuptools/tests/test_test.py       | 4 ----
 setuptools/tests/test_virtualenv.py | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 4ba70484fc..8d1425e187 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -93,10 +93,6 @@ def test_test(capfd):
     assert out == 'Foo\n'
 
 
-@pytest.mark.skipif(
-    sys.version_info < (2, 7),
-    reason="No discover support for unittest on Python 2.6",
-)
 @pytest.mark.usefixtures('tmpdir_cwd', 'quiet_log')
 def test_tests_are_run_once(capfd):
     params = dict(
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index b66a311d73..e511c91816 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -57,9 +57,6 @@ def test_pip_upgrade_from_source(virtualenv):
     Check pip can upgrade setuptools from source.
     """
     dist_dir = virtualenv.workspace
-    if sys.version_info < (2, 7):
-        # Python 2.6 support was dropped in wheel 0.30.0.
-        virtualenv.run('pip install -U "wheel<0.30.0"')
     # Generate source distribution / wheel.
     virtualenv.run(' && '.join((
         'cd {source}',

From ef1442b187c04d8cd06ecd6adcb2c63a06637e73 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 11:37:01 +0100
Subject: [PATCH 7197/8469] Add changelog entry for PR #1531

---
 changelog.d/1531.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1531.misc.rst

diff --git a/changelog.d/1531.misc.rst b/changelog.d/1531.misc.rst
new file mode 100644
index 0000000000..cc51940d2e
--- /dev/null
+++ b/changelog.d/1531.misc.rst
@@ -0,0 +1 @@
+Converted Python version-specific tests to use ``skipif`` instead of ``xfail``, and removed Python 2.6-specific code from the tests.

From f25c12c2f60fe524a92282337c999b64d2c8ba91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Nurlu?= <gnurlu1@bloomberg.net>
Date: Sat, 27 Oct 2018 13:09:34 +0100
Subject: [PATCH 7198/8469] Exclude .pyc in _vendor folder from sdist output

Fixes #1414
---
 MANIFEST.in               | 2 +-
 changelog.d/1533.misc.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1533.misc.rst

diff --git a/MANIFEST.in b/MANIFEST.in
index 325bbed82e..9cce3c90e4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,7 @@ recursive-include setuptools *.py *.exe *.xml
 recursive-include tests *.py
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
-recursive-include setuptools/_vendor *
+recursive-include setuptools/_vendor *.py *.txt
 recursive-include pkg_resources *.py *.txt
 include *.py
 include *.rst
diff --git a/changelog.d/1533.misc.rst b/changelog.d/1533.misc.rst
new file mode 100644
index 0000000000..934df49484
--- /dev/null
+++ b/changelog.d/1533.misc.rst
@@ -0,0 +1 @@
+Restrict the `recursive-include setuptools/_vendor` to contain only .py and .txt files

From ab4e5b9b3c3404f897e12a9fd882fddc9a36cc77 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Sat, 27 Oct 2018 15:09:08 +0200
Subject: [PATCH 7199/8469] Document building Cython projects instead of Pyrex

Refs #1395
---
 changelog.d/1395.doc.rst |  1 +
 docs/setuptools.txt      | 39 ++++++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 changelog.d/1395.doc.rst

diff --git a/changelog.d/1395.doc.rst b/changelog.d/1395.doc.rst
new file mode 100644
index 0000000000..346041ce41
--- /dev/null
+++ b/changelog.d/1395.doc.rst
@@ -0,0 +1 @@
+Document building Cython projects instead of Pyrex
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index da9b0132e1..e3bcad59ae 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -41,9 +41,9 @@ Feature Highlights:
   files for any number of "main" functions in your project.  (Note: this is not
   a py2exe replacement; the .exe files rely on the local Python installation.)
 
-* Transparent Pyrex support, so that your setup.py can list ``.pyx`` files and
-  still work even when the end-user doesn't have Pyrex installed (as long as
-  you include the Pyrex-generated C in your source distribution)
+* Transparent Cython support, so that your setup.py can list ``.pyx`` files and
+  still work even when the end-user doesn't have Cython installed (as long as
+  you include the Cython-generated C in your source distribution)
 
 * Command aliases - create project-specific, per-user, or site-wide shortcut
   names for commonly used commands and options
@@ -1651,29 +1651,34 @@ See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
 
 
 
-Distributing Extensions compiled with Pyrex
--------------------------------------------
+Distributing Extensions compiled with Cython
+--------------------------------------------
 
-``setuptools`` includes transparent support for building Pyrex extensions, as
-long as you define your extensions using ``setuptools.Extension``, *not*
-``distutils.Extension``.  You must also not import anything from Pyrex in
-your setup script.
+``setuptools`` will detect at build time whether Cython is installed or not.
+If Cython is not found ``setputools`` will ignore pyx files. In case it's
+available you are supposed it will work with just a couple of adjustments.
+``setuptools`` includes transparent support for building Cython extensions, as
+long as you define your extensions using ``setuptools.Extension``.
+Then you should use Cython own ``build_ext`` in ``cmdclass``, e.g.::
+
+   from Cython.Distutils import build_ext
+
+   setup(...
+         cmdclass={"build_ext": build_ext}
+         ...)
 
 If you follow these rules, you can safely list ``.pyx`` files as the source
-of your ``Extension`` objects in the setup script.  ``setuptools`` will detect
-at build time whether Pyrex is installed or not.  If it is, then ``setuptools``
-will use it.  If not, then ``setuptools`` will silently change the
-``Extension`` objects to refer to the ``.c`` counterparts of the ``.pyx``
-files, so that the normal distutils C compilation process will occur.
+of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
+will use it.
 
 Of course, for this to work, your source distributions must include the C
-code generated by Pyrex, as well as your original ``.pyx`` files.  This means
+code generated by Cython, as well as your original ``.pyx`` files.  This means
 that you will probably want to include current ``.c`` files in your revision
 control system, rebuilding them whenever you check changes in for the ``.pyx``
 source files.  This will ensure that people tracking your project in a revision
-control system will be able to build it even if they don't have Pyrex
+control system will be able to build it even if they don't have Cython
 installed, and that your source releases will be similarly usable with or
-without Pyrex.
+without Cython.
 
 
 -----------------

From d059e4273d71a012acdbbe1acf4c552e6f5c0793 Mon Sep 17 00:00:00 2001
From: DanGolding <dan@golding.za.net>
Date: Sat, 27 Oct 2018 14:31:31 +0100
Subject: [PATCH 7200/8469] Update setup.cfg documentation to include
 data_files (#1532)

* Update setup.cfg documentation to include data_files
---
 docs/setuptools.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index da9b0132e1..46103b258d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2466,9 +2466,9 @@ obsoletes                                          list-comma
 Options
 -------
 
-=======================  =====
-Key                      Type
-=======================  =====
+=======================  ===================================  =====
+Key                      Type                                 Minimum Version
+=======================  ===================================  =====
 zip_safe                 bool
 setup_requires           list-semi
 install_requires         list-semi
@@ -2490,7 +2490,8 @@ package_data             section
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
-=======================  =====
+data_files               dict                                 40.5.0
+=======================  ===================================  =====
 
 .. note::
 

From ca0760af2071c333cda28d18279db95455ffa2de Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sat, 27 Oct 2018 13:19:22 +0100
Subject: [PATCH 7201/8469] Setuptools will install licenses if included in
 setup.cfg

Addressing #357

`python setup.py sdist` now includes the license file if `license_file`
is included in `setup.cfg` unless it is explicitly excluded in `MANIFEST.in`.

Co-Authored-By: Poyzan Nur Taneli <31743851+ptaneli@users.noreply.github.com>
---
 setuptools/command/egg_info.py |  1 +
 setuptools/command/sdist.py    | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index bd116e1f6c..93100ab946 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -568,6 +568,7 @@ def _should_suppress_warning(msg):
 
     def add_defaults(self):
         sdist.add_defaults(self)
+        self.check_license()
         self.filelist.append(self.template)
         self.filelist.append(self.manifest)
         rcfiles = list(walk_revctrl())
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index bcfae4d82f..a1b20733c3 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -6,6 +6,7 @@
 import contextlib
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import configparser
 
 from .py36compat import sdist_add_defaults
 
@@ -198,3 +199,27 @@ def read_manifest(self):
                 continue
             self.filelist.append(line)
         manifest.close()
+
+    def check_license(self):
+        """Read the setup configuration file ('setup.cfg') and use it to find
+        if a license is defined with the 'license_file' attribute.
+        If the license is declared and exists, it will be added to
+        'self.filelist'.
+        """
+
+        cfg_file = 'setup.cfg'
+        log.debug("Reading configuration from %s", cfg_file)
+        parser = configparser.RawConfigParser()
+        parser.read(cfg_file)
+        try:
+            license_file = parser.get('metadata', 'license_file')
+
+            if not os.path.exists(license_file):
+                log.warn("warning: Failed to find license file '%s' in setup.cfg",
+                        license_file)
+                return
+
+            self.filelist.append(license_file)
+        except configparser.Error:
+            log.debug("license_file attribute is not defined in setup.cfg")
+            return

From d011cd989c1d3d5906f2bffb8d68a9da88cab120 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 15:40:30 +0100
Subject: [PATCH 7202/8469] Document using setup.cfg for src-layouts

---
 docs/setuptools.txt | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 46103b258d..3cde56ea98 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2400,6 +2400,34 @@ Metadata and options are set in the config sections of the same name.
 * Unknown keys are ignored.
 
 
+Using a ``src/`` layout (storing packages in a subdirectory)
+============================================================
+
+If you use a `src` layout, as in, you package structure looks like this::
+
+    ├── src
+    │   └── mypackage
+    │       ├── __init__.py
+    │       └── mod1.py
+    ├── setup.py
+    └── setup.cfg
+
+You can set up your ``setup.cfg`` to automatically look up all your packages in
+the subdirectory like this:
+
+.. code-block:: ini
+
+    # This example contains just the necessary options for a src-layout, set up
+    # the rest of the file as described above.
+
+    [options]
+    package_dir=
+        =src
+    packages=find:
+
+    [options.packages.find]
+    where=src
+
 Specifying values
 =================
 

From a31921034d64b59431ba2da0004f35785e3da422 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 15:43:06 +0100
Subject: [PATCH 7203/8469] Add changelog entry

---
 changelog.d/1537.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1537.doc.rst

diff --git a/changelog.d/1537.doc.rst b/changelog.d/1537.doc.rst
new file mode 100644
index 0000000000..02d15eae17
--- /dev/null
+++ b/changelog.d/1537.doc.rst
@@ -0,0 +1 @@
+Document how to use setup.cfg for src/ layouts.
\ No newline at end of file

From 7d129e6ba46ee01c25d6e6b463ec7df29e624670 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sat, 27 Oct 2018 15:44:24 +0100
Subject: [PATCH 7204/8469] Correct typo

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 3cde56ea98..f3a5f4ffb9 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2403,7 +2403,7 @@ Metadata and options are set in the config sections of the same name.
 Using a ``src/`` layout (storing packages in a subdirectory)
 ============================================================
 
-If you use a `src` layout, as in, you package structure looks like this::
+If you use a ``src/`` layout, as in, you package structure looks like this::
 
     ├── src
     │   └── mypackage

From 00b172d6b4a4f3fb1546dd0c2fc53ec2d4087b00 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sat, 27 Oct 2018 16:32:24 +0100
Subject: [PATCH 7205/8469] Unit tests for installing licenses from setup.cfg
 (#357)

Co-Authored-By: Poyzan Nur Taneli <31743851+ptaneli@users.noreply.github.com>
---
 setuptools/tests/test_egg_info.py | 92 +++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 59ffb16d1d..2ca91e85d0 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -486,6 +486,98 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
             pkg_info_text = pkginfo_file.read()
         assert 'Provides-Extra:' not in pkg_info_text
 
+    def test_setup_cfg_with_license(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE
+                              """),
+            'LICENSE': DALS("Test license")
+        })
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_text = sources_file.read()
+        assert 'LICENSE' in sources_text
+
+    def test_setup_cfg_with_invalid_license(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = INVALID_LICENSE
+                              """),
+            'LICENSE': DALS("Test license")
+        })
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_text = sources_file.read()
+        assert 'LICENSE' not in sources_text
+        assert 'INVALID_LICENSE' not in sources_text
+
+    def test_setup_cfg_with_no_license(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'setup.cfg': DALS("""
+                              """),
+            'LICENSE': DALS("Test license")
+        })
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_text = sources_file.read()
+        assert 'LICENSE' not in sources_text
+
+    def test_setup_cfg_with_license_excluded(self, tmpdir_cwd, env):
+        self._create_project()
+        build_files({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE
+                              """),
+            'MANIFEST.in': DALS("exclude LICENSE"),
+            'LICENSE': DALS("Test license")
+        })
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_text = sources_file.read()
+        assert 'LICENSE' not in sources_text
+
     def test_long_description_content_type(self, tmpdir_cwd, env):
         # Test that specifying a `long_description_content_type` keyword arg to
         # the `setup` function results in writing a `Description-Content-Type`

From 525e5ede9119a5cbc4b35a1606068a212fea3c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Nurlu?= <gnurlu1@bloomberg.net>
Date: Sat, 27 Oct 2018 16:30:19 +0100
Subject: [PATCH 7206/8469] Add before_deploy checks for pyc files in TravisCI

This should stop the PyPI release stage if a `.pyc` exists in the
generated SOURCES.txt.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0e53bd29da..442e3ec29f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,9 @@ jobs:
     install: skip
     script: skip
     after_success: true
-    before_deploy: python bootstrap.py
+    before_deploy:
+      - python bootstrap.py
+      - ! grep pyc setuptools.egg-info/SOURCES.txt
     deploy:
       provider: pypi
       on:

From 856c4c9a44b6deec6ea9c7126fdeef39f6e1e488 Mon Sep 17 00:00:00 2001
From: Vito <vitoace@gmail.com>
Date: Sat, 27 Oct 2018 11:39:34 -0400
Subject: [PATCH 7207/8469] Added minimum version info to setup.cfg metadata

This also documents that the long_description_content_type keyword was
added in version 38.6.0.

Co-authored-by: Gene Matusovsky <gene_matusovsky@s5a.com>
---
 docs/setuptools.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 46103b258d..f2774b65c7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2434,9 +2434,9 @@ Metadata
     The aliases given below are supported for compatibility reasons,
     but their use is not advised.
 
-==============================  =================  =====
-Key                             Aliases            Type
-==============================  =================  =====
+==============================  =================  =================  ===============
+Key                             Aliases            Type               Minumum Version
+==============================  =================  =================  ===============
 name                                               str
 version                                            attr:, file:, str
 url                             home-page          str
@@ -2450,13 +2450,13 @@ classifiers                     classifier         file:, list-comma
 license                                            file:, str
 description                     summary            file:, str
 long_description                long-description   file:, str
-long_description_content_type                      str
+long_description_content_type                      str                38.6.0
 keywords                                           list-comma
 platforms                       platform           list-comma
 provides                                           list-comma
 requires                                           list-comma
 obsoletes                                          list-comma
-==============================  =================  =====
+==============================  =================  =================  ===============
 
 .. note::
     A version loaded using the ``file:`` directive must comply with PEP 440.

From e97921f0b885d07f21276c9e416418f8bc16aaaa Mon Sep 17 00:00:00 2001
From: Vito <vitoace@gmail.com>
Date: Sat, 27 Oct 2018 11:47:54 -0400
Subject: [PATCH 7208/8469] Added news fragment for PR #1539

---
 changelog.d/1539.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1539.doc.rst

diff --git a/changelog.d/1539.doc.rst b/changelog.d/1539.doc.rst
new file mode 100644
index 0000000000..220f65197d
--- /dev/null
+++ b/changelog.d/1539.doc.rst
@@ -0,0 +1 @@
+Added minumum version column in ``setup.cfg`` metadata table.

From 9fad9937977e96cb984a0d30ae5ec3ee237a0ce7 Mon Sep 17 00:00:00 2001
From: Kanika Sabharwal <kanika03.sabharwal@gmail.com>
Date: Sat, 27 Oct 2018 15:58:50 -0400
Subject: [PATCH 7209/8469] added unittest for _download_git

---
 setuptools/tests/test_packageindex.py | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 63b9294610..7c2f2c84d6 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -6,6 +6,7 @@
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client
+import mock
 
 import pkg_resources
 import setuptools.package_index
@@ -224,6 +225,41 @@ def test_egg_fragment(self):
             assert dists[1].version == vc
 
 
+    def test_download_git(self):
+        index = setuptools.package_index.PackageIndex(
+            hosts=('www.example.com',)
+        )
+
+        index._vcs_split_rev_from_url = mock.Mock()
+        url = 'https://example.com/bar'
+        rev = '2995'
+
+        index._vcs_split_rev_from_url.return_value = (url, rev)
+
+        filename = "somefile.py"
+
+        with mock.patch("os.system") as os_system_mock:
+
+            result = index._download_git(url, filename)
+
+        os_system_mock.assert_called()
+
+        assert os_system_mock.call_args_list[0][0] \
+            == ("git clone --quiet %s %s" % (url, filename), )
+
+        assert os_system_mock.call_args_list[1][0] \
+            == ("(cd %s && git checkout --quiet %s)" % (filename, rev), )
+        assert result == filename
+
+        index._vcs_split_rev_from_url.return_value = (url, None)
+
+        with mock.patch("os.system") as os_system_mock:
+
+            index._download_git(url, filename)
+
+        os_system_mock.assert_called_once_with("git clone --quiet %s %s" % (url, filename))
+
+
 class TestContentCheckers:
     def test_md5(self):
         checker = setuptools.package_index.HashChecker.from_url(

From f45153a292dc749defaa9c6c1ce9c4062f083b6d Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 27 Oct 2018 16:48:33 -0400
Subject: [PATCH 7210/8469] bpo-35067: Remove _distutils_findvs and use
 vswhere.exe instead. (GH-10095)

---
 _msvccompiler.py | 64 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 30b3b47398..84b4ef5959 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -56,43 +56,43 @@ def _find_vc2015():
     return best_version, best_dir
 
 def _find_vc2017():
-    import _distutils_findvs
-    import threading
+    """Returns "15, path" based on the result of invoking vswhere.exe
+    If no install is found, returns "None, None"
 
-    best_version = 0,   # tuple for full version comparisons
-    best_dir = None
+    The version is returned to avoid unnecessarily changing the function
+    result. It may be ignored when the path is not None.
+
+    If vswhere.exe is not available, by definition, VS 2017 is not
+    installed.
+    """
+    import json
+
+    root = os.environ.get("ProgramFiles(x86)") or os.environ.get("ProgramFiles")
+    if not root:
+        return None, None
 
-    # We need to call findall() on its own thread because it will
-    # initialize COM.
-    all_packages = []
-    def _getall():
-        all_packages.extend(_distutils_findvs.findall())
-    t = threading.Thread(target=_getall)
-    t.start()
-    t.join()
-
-    for name, version_str, path, packages in all_packages:
-        if 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64' in packages:
-            vc_dir = os.path.join(path, 'VC', 'Auxiliary', 'Build')
-            if not os.path.isdir(vc_dir):
-                continue
-            try:
-                version = tuple(int(i) for i in version_str.split('.'))
-            except (ValueError, TypeError):
-                continue
-            if version > best_version:
-                best_version, best_dir = version, vc_dir
     try:
-        best_version = best_version[0]
-    except IndexError:
-        best_version = None
-    return best_version, best_dir
+        path = subprocess.check_output([
+            os.path.join(root, "Microsoft Visual Studio", "Installer", "vswhere.exe"),
+            "-latest",
+            "-prerelease",
+            "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+            "-property", "installationPath",
+        ], encoding="mbcs", errors="strict").strip()
+    except (subprocess.CalledProcessError, OSError, UnicodeDecodeError):
+        return None, None
+
+    path = os.path.join(path, "VC", "Auxiliary", "Build")
+    if os.path.isdir(path):
+        return 15, path
+
+    return None, None
 
 def _find_vcvarsall(plat_spec):
-    best_version, best_dir = _find_vc2017()
+    _, best_dir = _find_vc2017()
     vcruntime = None
     vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
-    if best_version:
+    if best_dir:
         vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
             "Microsoft.VC141.CRT", "vcruntime140.dll")
         try:
@@ -101,13 +101,13 @@ def _find_vcvarsall(plat_spec):
         except (ImportError, OSError, LookupError):
             vcruntime = None
 
-    if not best_version:
+    if not best_dir:
         best_version, best_dir = _find_vc2015()
         if best_version:
             vcruntime = os.path.join(best_dir, 'redist', vcruntime_plat,
                 "Microsoft.VC140.CRT", "vcruntime140.dll")
 
-    if not best_version:
+    if not best_dir:
         log.debug("No suitable Visual C++ version found")
         return None, None
 

From a6a5040ae14b74bfaaaf835d57129ee7618e5cfd Mon Sep 17 00:00:00 2001
From: Sreejith Menon <sreejith_1729@yahoo.co.in>
Date: Sat, 27 Oct 2018 10:29:08 -0700
Subject: [PATCH 7211/8469] Deprecate the requires keyword

For runtime dependencies, install_requires should be used. For build
dependencies, a PEP 518-compliant `pyproject.toml` should be used.

Other dependencies can use extra requirements.
---
 setuptools/config.py            | 21 ++++++++++++++++++++-
 setuptools/tests/test_config.py | 17 +++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 73a3bf7031..1f9c50f9ee 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -2,8 +2,10 @@
 import io
 import os
 import sys
+import warnings
 from collections import defaultdict
 from functools import partial
+from functools import wraps
 from importlib import import_module
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
@@ -399,6 +401,20 @@ def parse(self):
 
             section_parser_method(section_options)
 
+    def _deprecated_config_handler(self, func, msg, warning_class):
+        """ this function will wrap around parameters that are deprecated
+        
+        :param msg: deprecation message 
+        :param warning_class: class of warning exception to be raised
+        :param func: function to be wrapped around
+        """
+        @wraps(func)
+        def config_handler(*args, **kwargs):
+            warnings.warn(msg, warning_class)
+            return func(*args, **kwargs)
+        
+        return config_handler
+
 
 class ConfigMetadataHandler(ConfigHandler):
 
@@ -434,7 +450,10 @@ def parsers(self):
             'platforms': parse_list,
             'keywords': parse_list,
             'provides': parse_list,
-            'requires': parse_list,
+            'requires': self._deprecated_config_handler(parse_list,
+                "The requires parameter is deprecated, please use " +
+                "install_requires for runtime dependencies.",
+                DeprecationWarning),
             'obsoletes': parse_list,
             'classifiers': self._get_parser_compound(parse_file, parse_list),
             'license': parse_file,
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 76759ec57c..736c184dca 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -391,6 +391,23 @@ def test_classifiers(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert set(dist.metadata.classifiers) == expected
 
+    def test_deprecated_config_handlers(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = 10.1.1\n'
+            'description = Some description\n'
+            'requires = some, requirement\n'
+        )
+
+        with pytest.deprecated_call():
+            with get_dist(tmpdir) as dist:
+                metadata = dist.metadata
+
+                assert metadata.version == '10.1.1'
+                assert metadata.description == 'Some description'
+                assert metadata.requires == ['some', 'requirement']
+
 
 class TestOptions:
 

From 717de8391f5ddfc507fcf2d36a49274f37ef5a16 Mon Sep 17 00:00:00 2001
From: Sreejith Menon <sreejith_1729@yahoo.co.in>
Date: Sat, 27 Oct 2018 10:29:08 -0700
Subject: [PATCH 7212/8469] Add changelog for PR #1541

---
 changelog.d/1541.deprecation.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1541.deprecation.rst

diff --git a/changelog.d/1541.deprecation.rst b/changelog.d/1541.deprecation.rst
new file mode 100644
index 0000000000..cc07aaa78b
--- /dev/null
+++ b/changelog.d/1541.deprecation.rst
@@ -0,0 +1 @@
+Officially deprecated the ``requires`` parameter in ``setup()``.

From 009e0a92b463d444e48c17a3a636fc7c477dec71 Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <madigens@gmail.com>
Date: Sun, 28 Oct 2018 11:02:13 +0000
Subject: [PATCH 7213/8469] Edit wording

---
 docs/setuptools.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index f3a5f4ffb9..ae8a2eb736 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2400,10 +2400,11 @@ Metadata and options are set in the config sections of the same name.
 * Unknown keys are ignored.
 
 
-Using a ``src/`` layout (storing packages in a subdirectory)
-============================================================
+Using a ``src/`` layout
+=======================
 
-If you use a ``src/`` layout, as in, you package structure looks like this::
+One commonly used package configuration has all the module source code in a
+subdirectory (often called the ``src/`` layout), like this::
 
     ├── src
     │   └── mypackage
@@ -2412,7 +2413,7 @@ If you use a ``src/`` layout, as in, you package structure looks like this::
     ├── setup.py
     └── setup.cfg
 
-You can set up your ``setup.cfg`` to automatically look up all your packages in
+You can set up your ``setup.cfg`` to automatically find all your packages in
 the subdirectory like this:
 
 .. code-block:: ini

From 08bff86fe64cfb05d9ecd6dbf436fa706ecc8440 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sun, 28 Oct 2018 11:25:18 +0000
Subject: [PATCH 7214/8469] Make the new tests parametrized

---
 setuptools/tests/test_egg_info.py | 79 ++++++++-----------------------
 1 file changed, 19 insertions(+), 60 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 2ca91e85d0..76c31adadf 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -486,84 +486,39 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
             pkg_info_text = pkginfo_file.read()
         assert 'Provides-Extra:' not in pkg_info_text
 
-    def test_setup_cfg_with_license(self, tmpdir_cwd, env):
-        self._create_project()
-        build_files({
+    @pytest.mark.parametrize("files, license_in_sources", [
+        ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = LICENSE
                               """),
             'LICENSE': DALS("Test license")
-        })
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        environment.run_setup_py(
-            cmd=['egg_info'],
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
-            sources_text = sources_file.read()
-        assert 'LICENSE' in sources_text
-
-    def test_setup_cfg_with_invalid_license(self, tmpdir_cwd, env):
-        self._create_project()
-        build_files({
+        }, True), # with license
+        ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = INVALID_LICENSE
                               """),
             'LICENSE': DALS("Test license")
-        })
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        environment.run_setup_py(
-            cmd=['egg_info'],
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
-            sources_text = sources_file.read()
-        assert 'LICENSE' not in sources_text
-        assert 'INVALID_LICENSE' not in sources_text
-
-    def test_setup_cfg_with_no_license(self, tmpdir_cwd, env):
-        self._create_project()
-        build_files({
+        }, False), # with an invalid license
+        ({
             'setup.cfg': DALS("""
                               """),
             'LICENSE': DALS("Test license")
-        })
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        environment.run_setup_py(
-            cmd=['egg_info'],
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
-            sources_text = sources_file.read()
-        assert 'LICENSE' not in sources_text
-
-    def test_setup_cfg_with_license_excluded(self, tmpdir_cwd, env):
-        self._create_project()
-        build_files({
+        }, False), # no license_file attribute
+        ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = LICENSE
                               """),
             'MANIFEST.in': DALS("exclude LICENSE"),
             'LICENSE': DALS("Test license")
-        })
+        }, False) # license file is manually excluded
+    ])
+    def test_setup_cfg_license_file(
+            self, tmpdir_cwd, env, files, license_in_sources):
+        self._create_project()
+        build_files(files)
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
@@ -576,7 +531,11 @@ def test_setup_cfg_with_license_excluded(self, tmpdir_cwd, env):
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
             sources_text = sources_file.read()
-        assert 'LICENSE' not in sources_text
+        if license_in_sources:
+            assert 'LICENSE' in sources_text
+        else:
+            assert 'LICENSE' not in sources_text
+            assert 'INVALID_LICENSE' not in sources_text # for invalid license test
 
     def test_long_description_content_type(self, tmpdir_cwd, env):
         # Test that specifying a `long_description_content_type` keyword arg to

From 742457284db958bdf5efacde6e2b885c81247b27 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sun, 28 Oct 2018 11:41:46 +0000
Subject: [PATCH 7215/8469] Document the new `license_file` behaviour

---
 changelog.d/1536.change.rst | 3 +++
 docs/setuptools.txt         | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/1536.change.rst

diff --git a/changelog.d/1536.change.rst b/changelog.d/1536.change.rst
new file mode 100644
index 0000000000..8a69959cbd
--- /dev/null
+++ b/changelog.d/1536.change.rst
@@ -0,0 +1,3 @@
+``setuptools`` will now automatically include licenses if ``setup.cfg``
+contains a ``license_file`` attribute, unless this file is manually excluded
+inside ``MANIFEST.in``.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index da9b0132e1..436f207d92 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2448,6 +2448,7 @@ maintainer                                         str
 maintainer_email                maintainer-email   str
 classifiers                     classifier         file:, list-comma
 license                                            file:, str
+license_file                                       str
 description                     summary            file:, str
 long_description                long-description   file:, str
 long_description_content_type                      str

From 912f772c61ce432561423e91a8ace70b0ec86a08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Oct 2018 10:20:01 -0400
Subject: [PATCH 7216/8469] Update recommendation. Fixes #1549.

---
 docs/setuptools.txt | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index ec40548a74..3cad38b146 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1655,17 +1655,26 @@ Distributing Extensions compiled with Cython
 --------------------------------------------
 
 ``setuptools`` will detect at build time whether Cython is installed or not.
-If Cython is not found ``setputools`` will ignore pyx files. In case it's
-available you are supposed it will work with just a couple of adjustments.
-``setuptools`` includes transparent support for building Cython extensions, as
-long as you define your extensions using ``setuptools.Extension``.
-Then you should use Cython own ``build_ext`` in ``cmdclass``, e.g.::
+If Cython is not found ``setputools`` will ignore pyx files.
 
-   from Cython.Distutils import build_ext
+To ensure Cython is available, include Cython in the build-requires section
+of your pyproject.toml::
 
-   setup(...
-         cmdclass={"build_ext": build_ext}
-         ...)
+    [build-system]
+    requires=[..., 'cython']
+
+Built with pip 10 or later, that declaration is sufficient to include Cython
+in the build. For broader compatibility, declare the dependency in your
+setup-requires of setup.cfg::
+
+    [options]
+    setup_requires =
+        ...
+        cython
+
+As long as Cython is present in the build environment, ``setuptools`` includes
+transparent support for building Cython extensions, as
+long as extensions are defined using ``setuptools.Extension``.
 
 If you follow these rules, you can safely list ``.pyx`` files as the source
 of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
@@ -2505,7 +2514,7 @@ data_files               dict                                 40.5.0
     accepts the same keys as the `setuptools.find_packages` and the
     `setuptools.find_namespace_packages` function:
     ``where``, ``include``, and ``exclude``.
-    
+
     **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
 
 

From 0fd21d1e737bd5a031c09b87e58aa9d505b51121 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <pganssle@users.noreply.github.com>
Date: Sun, 28 Oct 2018 11:12:06 -0400
Subject: [PATCH 7217/8469] fix typo

Co-Authored-By: jaraco <jaraco@jaraco.com>
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 3cad38b146..9a0ee0c18b 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1655,7 +1655,7 @@ Distributing Extensions compiled with Cython
 --------------------------------------------
 
 ``setuptools`` will detect at build time whether Cython is installed or not.
-If Cython is not found ``setputools`` will ignore pyx files.
+If Cython is not found ``setuptools`` will ignore pyx files.
 
 To ensure Cython is available, include Cython in the build-requires section
 of your pyproject.toml::

From 4e4efa77722cc2e99171a2396252a4ddc98450e3 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sun, 28 Oct 2018 15:36:02 +0000
Subject: [PATCH 7218/8469] `check_license` no longer needs to parse
 `setup.cfg`

---
 setuptools/command/sdist.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a1b20733c3..347f88170f 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -201,25 +201,21 @@ def read_manifest(self):
         manifest.close()
 
     def check_license(self):
-        """Read the setup configuration file ('setup.cfg') and use it to find
-        if a license is defined with the 'license_file' attribute.
-        If the license is declared and exists, it will be added to
-        'self.filelist'.
+        """Checks if license_file' is configured and adds it to
+        'self.filelist' if the value contains a valid path.
         """
 
-        cfg_file = 'setup.cfg'
-        log.debug("Reading configuration from %s", cfg_file)
-        parser = configparser.RawConfigParser()
-        parser.read(cfg_file)
+        opts = self.distribution.get_option_dict('metadata')
         try:
-            license_file = parser.get('metadata', 'license_file')
-
-            if not os.path.exists(license_file):
-                log.warn("warning: Failed to find license file '%s' in setup.cfg",
-                        license_file)
-                return
+            # ignore the source of the value
+            _, license_file = opts.get('license_file')
+        except TypeError:
+            log.debug("'license_file' attribute is not defined")
+            return
 
-            self.filelist.append(license_file)
-        except configparser.Error:
-            log.debug("license_file attribute is not defined in setup.cfg")
+        if not os.path.exists(license_file):
+            log.warn("warning: Failed to find the configured license file '%s'",
+                    license_file)
             return
+
+        self.filelist.append(license_file)

From ad043d61d3bfff3ca69f477f44a718597a34e779 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Oct 2018 14:05:57 -0400
Subject: [PATCH 7219/8469] Feed the hobgoblins (delint).

---
 setuptools/config.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 73a3bf7031..4cc1cb387c 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -110,7 +110,8 @@ def parse_configuration(
     options.parse()
 
     meta = ConfigMetadataHandler(
-        distribution.metadata, command_options, ignore_option_errors, distribution.package_dir)
+        distribution.metadata, command_options, ignore_option_errors,
+        distribution.package_dir)
     meta.parse()
 
     return meta, options
@@ -458,9 +459,12 @@ def _parse_version(self, value):
             # Be strict about versions loaded from file because it's easy to
             # accidentally include newlines and other unintended content
             if isinstance(parse(version), LegacyVersion):
-                raise DistutilsOptionError('Version loaded from %s does not comply with PEP 440: %s' % (
-                    value, version
-                ))
+                tmpl = (
+                    'Version loaded from {value} does not '
+                    'comply with PEP 440: {version}'
+                )
+                raise DistutilsOptionError(tmpl.format(**locals()))
+
             return version
 
         version = self._parse_attr(value, self.package_dir)
@@ -518,12 +522,13 @@ def _parse_packages(self, value):
         find_directives = ['find:', 'find_namespace:']
         trimmed_value = value.strip()
 
-        if not trimmed_value in find_directives:
+        if trimmed_value not in find_directives:
             return self._parse_list(value)
 
         findns = trimmed_value == find_directives[1]
         if findns and not PY3:
-            raise DistutilsOptionError('find_namespace: directive is unsupported on Python < 3.3')
+            raise DistutilsOptionError(
+                'find_namespace: directive is unsupported on Python < 3.3')
 
         # Read function arguments from a dedicated section.
         find_kwargs = self.parse_section_packages__find(

From 9ad8e0dd09dc7f8c22f7cf51a5c83b7c788b50d7 Mon Sep 17 00:00:00 2001
From: Varun Kamath <varunkamath18@gmail.com>
Date: Sun, 28 Oct 2018 14:12:34 -0400
Subject: [PATCH 7220/8469] Remove ez_setup from documentation (#1553)

Remove ez_setup from setuptools installation docs

This removes ez_setup.py from the setuptools development instructions
and updates some links into EasyInstall that were skipping over the
deprecation warning.
---
 changelog.d/1553.doc.rst |  1 +
 docs/setuptools.txt      | 18 ++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/1553.doc.rst

diff --git a/changelog.d/1553.doc.rst b/changelog.d/1553.doc.rst
new file mode 100644
index 0000000000..2f68b95e3c
--- /dev/null
+++ b/changelog.d/1553.doc.rst
@@ -0,0 +1 @@
+Update installation instructions to point to ``pip install`` instead of ``ez_setup.py``.
\ No newline at end of file
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 9398f8e9b9..9eec82f376 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -73,23 +73,17 @@ Developer's Guide
 Installing ``setuptools``
 =========================
 
-Please follow the `EasyInstall Installation Instructions`_ to install the
-current stable version of setuptools.  In particular, be sure to read the
-section on `Custom Installation Locations`_ if you are installing anywhere
-other than Python's ``site-packages`` directory.
+.. _EasyInstall Installation Instructions: easy_install.html
 
-.. _EasyInstall Installation Instructions: easy_install.html#installation-instructions
+.. _Custom Installation Locations: easy_install.html
 
-.. _Custom Installation Locations: easy_install.html#custom-installation-locations
+.. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
 
-If you want the current in-development version of setuptools, you should first
-install a stable version, and then run::
+To install the latest version of setuptools, use::
 
-    ez_setup.py setuptools==dev
-
-This will download and install the latest development (i.e. unstable) version
-of setuptools from the Python Subversion sandbox.
+    pip install -U setuptools
 
+Refer to `Installing Packages`_ guide for more information.
 
 Basic Use
 =========

From 42fe2eb166a3a1b2d31f0be93ad034ec48ea9b38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Oct 2018 14:16:19 -0400
Subject: [PATCH 7221/8469] Extract _get_option function for getting an option
 from getter or attribute.

---
 setuptools/config.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 4cc1cb387c..302d633f35 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -2,6 +2,7 @@
 import io
 import os
 import sys
+import functools
 from collections import defaultdict
 from functools import partial
 from importlib import import_module
@@ -61,6 +62,18 @@ def read_configuration(
     return configuration_to_dict(handlers)
 
 
+def _get_option(target_obj, key):
+    """
+    Given a target object and option key, get that option from
+    the target object, either through a get_{key} method or
+    from an attribute directly.
+    """
+    getter_name = 'get_{key}'.format(**locals())
+    by_attribute = functools.partial(getattr, target_obj, key)
+    getter = getattr(target_obj, getter_name, by_attribute)
+    return getter()
+
+
 def configuration_to_dict(handlers):
     """Returns configuration data gathered by given handlers as a dict.
 
@@ -74,17 +87,9 @@ def configuration_to_dict(handlers):
     for handler in handlers:
 
         obj_alias = handler.section_prefix
-        target_obj = handler.target_obj
 
         for option in handler.set_options:
-            getter = getattr(target_obj, 'get_%s' % option, None)
-
-            if getter is None:
-                value = getattr(target_obj, option)
-
-            else:
-                value = getter()
-
+            value = _get_option(handler.target_obj, option)
             config_dict[obj_alias][option] = value
 
     return config_dict

From 9543875b93ab646e6c1f5ded7164d108de498852 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Oct 2018 14:17:27 -0400
Subject: [PATCH 7222/8469] Inline variable

---
 setuptools/config.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 302d633f35..15d18672ed 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -85,12 +85,9 @@ def configuration_to_dict(handlers):
     config_dict = defaultdict(dict)
 
     for handler in handlers:
-
-        obj_alias = handler.section_prefix
-
         for option in handler.set_options:
             value = _get_option(handler.target_obj, option)
-            config_dict[obj_alias][option] = value
+            config_dict[handler.section_prefix][option] = value
 
     return config_dict
 

From 8d83d328224315aa76a142fd714bcafd7d3f2c21 Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sun, 28 Oct 2018 16:18:18 -0400
Subject: [PATCH 7223/8469] remove private and redundant link

---
 README.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.rst b/README.rst
index a9bed52113..0454f2eddd 100644
--- a/README.rst
+++ b/README.rst
@@ -23,10 +23,6 @@ See the `Installation Instructions
 User's Guide for instructions on installing, upgrading, and uninstalling
 Setuptools.
 
-The project is `maintained at GitHub <https://github.com/pypa/setuptools>`_
-by the `Setuptools Developers
-<https://github.com/orgs/pypa/teams/setuptools-developers>`_.
-
 Questions and comments should be directed to the `distutils-sig
 mailing list <http://mail.python.org/pipermail/distutils-sig/>`_.
 Bug reports and especially tested patches may be

From 5854b0eba03dd257e30efff68f1632bdec5f0416 Mon Sep 17 00:00:00 2001
From: Junhan Huang <robinhuang@172-2-0-43.lightspeed.dybhfl.sbcglobal.net>
Date: Sat, 27 Oct 2018 16:26:51 -0400
Subject: [PATCH 7224/8469] Add custom deprecation warning classes

`DeprecationWarning` is not visible by default in the latest versions of
CPython, so this switches the deprecation warnings in setuptools and
pkg_resources over to custom classes derived from `Warning` instead.

Fixes issue github issue #159

Co-authored-by: Junhan Huang <robin.j.huang@gmail.com>
Co-authored-by: Marton Pono <marci93@gmail.com>
---
 pkg_resources/__init__.py          | 13 ++++++++++++-
 setuptools/__init__.py             |  4 ++++
 setuptools/_deprecation_warning.py |  7 +++++++
 setuptools/command/easy_install.py | 15 +++++++++++----
 setuptools/command/egg_info.py     |  8 ++++++--
 setuptools/dist.py                 | 10 ++++++++--
 6 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 setuptools/_deprecation_warning.py

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7413470137..d8e4c26b4d 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -238,6 +238,9 @@ def get_supported_platform():
     'register_finder', 'register_namespace_handler', 'register_loader_type',
     'fixup_namespace_packages', 'get_importer',
 
+    # Warnings
+    'PkgResourcesDeprecationWarning',
+
     # Deprecated/backward compatibility only
     'run_main', 'AvailableDistributions',
 ]
@@ -2335,7 +2338,7 @@ def load(self, require=True, *args, **kwargs):
             warnings.warn(
                 "Parameters to load are deprecated.  Call .resolve and "
                 ".require separately.",
-                DeprecationWarning,
+                PkgResourcesDeprecationWarning,
                 stacklevel=2,
             )
         if require:
@@ -3158,3 +3161,11 @@ def _initialize_master_working_set():
     # match order
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
+
+class PkgResourcesDeprecationWarning(Warning):
+    """
+    Base class for warning about deprecations in ``pkg_resources``
+
+    This class is not derived from ``DeprecationWarning``, and as such is
+    visible by default.
+    """
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 54309b57fe..e438036a8c 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,6 +8,8 @@
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
+from ._deprecation_warning import SetuptoolsDeprecationWarning
+
 from setuptools.extern.six import PY3
 from setuptools.extern.six.moves import filter, map
 
@@ -22,6 +24,7 @@
 
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
+    'SetuptoolsDeprecationWarning',
     'find_packages'
 ]
 
@@ -188,4 +191,5 @@ def findall(dir=os.curdir):
     return list(files)
 
 
+# Apply monkey patches
 monkey.patch_all()
diff --git a/setuptools/_deprecation_warning.py b/setuptools/_deprecation_warning.py
new file mode 100644
index 0000000000..086b64dd38
--- /dev/null
+++ b/setuptools/_deprecation_warning.py
@@ -0,0 +1,7 @@
+class SetuptoolsDeprecationWarning(Warning):
+    """
+    Base class for warning deprecations in ``setuptools``
+
+    This class is not derived from ``DeprecationWarning``, and as such is
+    visible by default.
+    """
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index c670a16e61..06c98271ba 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -40,8 +40,11 @@
 import shlex
 import io
 
+
 from sysconfig import get_config_vars, get_path
 
+from setuptools import SetuptoolsDeprecationWarning
+
 from setuptools.extern import six
 from setuptools.extern.six.moves import configparser, map
 
@@ -2077,7 +2080,7 @@ class ScriptWriter:
     @classmethod
     def get_script_args(cls, dist, executable=None, wininst=False):
         # for backward compatibility
-        warnings.warn("Use get_args", DeprecationWarning)
+        warnings.warn("Use get_args", EasyInstallDeprecationWarning)
         writer = (WindowsScriptWriter if wininst else ScriptWriter).best()
         header = cls.get_script_header("", executable, wininst)
         return writer.get_args(dist, header)
@@ -2085,7 +2088,7 @@ def get_script_args(cls, dist, executable=None, wininst=False):
     @classmethod
     def get_script_header(cls, script_text, executable=None, wininst=False):
         # for backward compatibility
-        warnings.warn("Use get_header", DeprecationWarning, stacklevel=2)
+        warnings.warn("Use get_header", EasyInstallDeprecationWarning, stacklevel=2)
         if wininst:
             executable = "python.exe"
         return cls.get_header(script_text, executable)
@@ -2120,7 +2123,7 @@ def _ensure_safe_name(name):
     @classmethod
     def get_writer(cls, force_windows):
         # for backward compatibility
-        warnings.warn("Use best", DeprecationWarning)
+        warnings.warn("Use best", EasyInstallDeprecationWarning)
         return WindowsScriptWriter.best() if force_windows else cls.best()
 
     @classmethod
@@ -2152,7 +2155,7 @@ class WindowsScriptWriter(ScriptWriter):
     @classmethod
     def get_writer(cls):
         # for backward compatibility
-        warnings.warn("Use best", DeprecationWarning)
+        warnings.warn("Use best", EasyInstallDeprecationWarning)
         return cls.best()
 
     @classmethod
@@ -2333,3 +2336,7 @@ def gen_usage(script_name):
         yield
     finally:
         distutils.core.gen_usage = saved
+
+class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
+    """Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""
+    
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index bd116e1f6c..e1022d31fa 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -31,7 +31,7 @@
 from setuptools.glob import glob
 
 from setuptools.extern import packaging
-
+from setuptools import SetuptoolsDeprecationWarning
 
 def translate_pattern(glob):
     """
@@ -696,7 +696,7 @@ def get_pkg_info_revision():
     Get a -r### off of PKG-INFO Version in case this is an sdist of
     a subversion revision.
     """
-    warnings.warn("get_pkg_info_revision is deprecated.", DeprecationWarning)
+    warnings.warn("get_pkg_info_revision is deprecated.", EggInfoDeprecationWarning)
     if os.path.exists('PKG-INFO'):
         with io.open('PKG-INFO') as f:
             for line in f:
@@ -704,3 +704,7 @@ def get_pkg_info_revision():
                 if match:
                     return int(match.group(1))
     return 0
+
+
+class EggInfoDeprecationWarning(SetuptoolsDeprecationWarning):
+    """Class for warning about deprecations in eggInfo in setupTools. Not ignored by default, unlike DeprecationWarning."""
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6ee4a97f3e..f6078dbe0a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -21,6 +21,8 @@
 from setuptools.extern import packaging
 from setuptools.extern.six.moves import map, filter, filterfalse
 
+from . import SetuptoolsDeprecationWarning
+
 from setuptools.depends import Require
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
@@ -33,7 +35,7 @@
 
 
 def _get_unpatched(cls):
-    warnings.warn("Do not call this function", DeprecationWarning)
+    warnings.warn("Do not call this function", DistDeprecationWarning)
     return get_unpatched(cls)
 
 
@@ -980,7 +982,7 @@ def warn_deprecated():
             "Features are deprecated and will be removed in a future "
             "version. See https://github.com/pypa/setuptools/issues/65."
         )
-        warnings.warn(msg, DeprecationWarning, stacklevel=3)
+        warnings.warn(msg, DistDeprecationWarning, stacklevel=3)
 
     def __init__(
             self, description, standard=False, available=True,
@@ -1069,3 +1071,7 @@ def validate(self, dist):
                     " doesn't contain any packages or modules under %s"
                     % (self.description, item, item)
                 )
+
+
+class DistDeprecationWarning(SetuptoolsDeprecationWarning):
+    """Class for warning about deprecations in dist in setuptools. Not ignored by default, unlike DeprecationWarning."""

From bf1673504ed9705d18ae178b96f57c5784ab4ad7 Mon Sep 17 00:00:00 2001
From: robinjhuang <robin.j.huang@gmail.com>
Date: Sat, 27 Oct 2018 16:39:27 -0400
Subject: [PATCH 7225/8469] Add a changelog for PR #1545

---
 changelog.d/1545.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1545.feature.rst

diff --git a/changelog.d/1545.feature.rst b/changelog.d/1545.feature.rst
new file mode 100644
index 0000000000..70591d56d9
--- /dev/null
+++ b/changelog.d/1545.feature.rst
@@ -0,0 +1 @@
+Changed the warning class of all deprecation warnings; deprecation warning classes are no longer derived from ``DeprecationWarning`` and are thus visible by default.

From 9d63059f112c80d0419bac71596c79cd4660398d Mon Sep 17 00:00:00 2001
From: robinjhuang <robin.j.huang@gmail.com>
Date: Sat, 27 Oct 2018 18:06:46 -0400
Subject: [PATCH 7226/8469] Add unit tests for PkgResourcesDeprecationWarning

---
 pkg_resources/tests/test_resources.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 171ba2f96f..86afcf7411 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -15,7 +15,7 @@
 from pkg_resources import (
     parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
-    WorkingSet)
+    WorkingSet, PkgResourcesDeprecationWarning)
 
 
 # from Python 3.6 docs.
@@ -492,6 +492,15 @@ def testParseMap(self):
         with pytest.raises(ValueError):
             EntryPoint.parse_map(self.submap_str)
 
+    def testDeprecationWarnings(self):
+        ep = EntryPoint(
+            "foo", "pkg_resources.tests.test_resources", ["TestEntryPoints"],
+            ["x"]
+        )
+        with pytest.warns(pkg_resources.PkgResourcesDeprecationWarning):
+            ep.load(require=False)
+
+
 
 class TestRequirements:
     def testBasics(self):

From 3a9dc2b03ef313ee7729606fb56ae9b41066dfd1 Mon Sep 17 00:00:00 2001
From: robinjhuang <robin.j.huang@gmail.com>
Date: Sat, 27 Oct 2018 18:46:55 -0400
Subject: [PATCH 7227/8469] Add unit tests for setuptools deprecation warnings

These are tests to ensure that the specified deprecation warnings are
raised when the functions are called.

Co-authored-by: Junhan Huang <robin.j.huang@gmail.com>
Co-authored-by: Marton Pono <marci93@gmail.com>
---
 setuptools/tests/test_dist.py         |  5 ++++-
 setuptools/tests/test_easy_install.py | 18 +++++++++++++++++-
 setuptools/tests/test_egg_info.py     |  5 ++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 5162e1c985..223ad90c95 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 import io
-
+from setuptools.dist import DistDeprecationWarning, _get_unpatched
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
@@ -56,6 +56,9 @@ def sdist_with_index(distname, version):
     assert [dist.key for dist in resolved_dists if dist] == reqs
 
 
+def test_dist__get_unpatched_deprecated():
+    pytest.warns(DistDeprecationWarning, _get_unpatched, [""])
+
 def __maintainer_test_cases():
     attrs = {"name": "package",
              "version": "1.0",
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b0cc4c9fbc..2cf65ae7e5 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,7 +15,7 @@
 import io
 import zipfile
 import mock
-
+from setuptools.command.easy_install import EasyInstallDeprecationWarning, ScriptWriter, WindowsScriptWriter
 import time
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
@@ -288,6 +288,22 @@ def test_script_install(self, sdist_script, tmpdir, monkeypatch):
         assert (target / 'mypkg_script').exists()
 
 
+    def test_dist_get_script_args_deprecated(self):
+        with pytest.warns(EasyInstallDeprecationWarning):
+            ScriptWriter.get_script_args(None, None)
+
+    def test_dist_get_script_header_deprecated(self):
+        with pytest.warns(EasyInstallDeprecationWarning):
+            ScriptWriter.get_script_header("")
+
+    def test_dist_get_writer_deprecated(self):
+        with pytest.warns(EasyInstallDeprecationWarning):
+            ScriptWriter.get_writer(None)
+
+    def test_dist_WindowsScriptWriter_get_writer_deprecated(self):
+        with pytest.warns(EasyInstallDeprecationWarning):
+            WindowsScriptWriter.get_writer()
+
 @pytest.mark.filterwarnings('ignore:Unbuilt egg')
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 59ffb16d1d..46fb884f23 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -7,7 +7,7 @@
 import stat
 import time
 
-from setuptools.command.egg_info import egg_info, manifest_maker
+from setuptools.command.egg_info import egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision
 from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map
 
@@ -603,3 +603,6 @@ def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
         with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
             pkg_info_lines = pkginfo_file.read().split('\n')
         assert 'Version: 0.0.0.dev0' in pkg_info_lines
+
+    def test_get_pkg_info_revision_deprecated(self):
+        pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)
\ No newline at end of file

From 76ef30913dce00de4bca773f2dda9dd25ff66ad8 Mon Sep 17 00:00:00 2001
From: Alex Hirzel <alex@hirzel.us>
Date: Sun, 28 Oct 2018 21:44:14 -0400
Subject: [PATCH 7228/8469] change find_module to find_spec for py37 compat

---
 pkg_resources/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7413470137..9b5bd1026c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2098,10 +2098,11 @@ def _handle_ns(packageName, path_item):
     # capture warnings due to #1111
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
-        loader = importer.find_module(packageName)
-
-    if loader is None:
-        return None
+        spec = importer.find_spec(packageName)
+        if spec is not None:
+            loader = spec.loader
+        else:
+            return None
     module = sys.modules.get(packageName)
     if module is None:
         module = sys.modules[packageName] = types.ModuleType(packageName)

From eb123bbf0cdb25d855aa9a1794646d4abd309c9a Mon Sep 17 00:00:00 2001
From: Alex Hirzel <alex@hirzel.us>
Date: Sun, 28 Oct 2018 22:00:13 -0400
Subject: [PATCH 7229/8469] default to find_module, fall-back to find_spec,
 fail gracefully after

---
 pkg_resources/__init__.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 9b5bd1026c..2b8c44301f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2098,11 +2098,15 @@ def _handle_ns(packageName, path_item):
     # capture warnings due to #1111
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
-        spec = importer.find_spec(packageName)
-        if spec is not None:
-            loader = spec.loader
-        else:
-            return None
+        try:
+            loader = importer.find_module(packageName)
+        except AttributeError:
+            try:
+                loader = importer.find_spec(packageName).loader
+            except:
+                loader = None
+    if loader is None:
+        return None
     module = sys.modules.get(packageName)
     if module is None:
         module = sys.modules[packageName] = types.ModuleType(packageName)

From 63185e91406d6ba02fe42c6b7e188111054f1b14 Mon Sep 17 00:00:00 2001
From: Alex Hirzel <alex@hirzel.us>
Date: Sun, 28 Oct 2018 22:03:28 -0400
Subject: [PATCH 7230/8469] add changelog entry

---
 changelog.d/1563.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1563.change.rst

diff --git a/changelog.d/1563.change.rst b/changelog.d/1563.change.rst
new file mode 100644
index 0000000000..a2452cd824
--- /dev/null
+++ b/changelog.d/1563.change.rst
@@ -0,0 +1 @@
+If find_module fails or does not exist, attempt to use find_spec(...).loader

From d5ea41a2a3d08f9e203252f1de5853f94870aab3 Mon Sep 17 00:00:00 2001
From: Andrew Zhou <30874884+0az@users.noreply.github.com>
Date: Sun, 28 Oct 2018 22:33:35 -0700
Subject: [PATCH 7231/8469] Improve setup.cfg minimum version documentation

- version: a960ee1c3f1d1d1067ec1e3c88dc345060bd33a4
- project_urls: df2246449c271c07586bcecc3eaa36e9b0e94e3d
---
 docs/setuptools.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 9eec82f376..fe2a06f972 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2475,10 +2475,10 @@ Metadata
 Key                             Aliases            Type               Minumum Version
 ==============================  =================  =================  ===============
 name                                               str
-version                                            attr:, file:, str
+version                                            attr:, file:, str  39.2.0
 url                             home-page          str
 download_url                    download-url       str
-project_urls                                       dict
+project_urls                                       dict               38.3.0
 author                                             str
 author_email                    author-email       str
 maintainer                                         str
@@ -2503,9 +2503,9 @@ obsoletes                                          list-comma
 Options
 -------
 
-=======================  ===================================  =====
+=======================  ===================================  ===============
 Key                      Type                                 Minimum Version
-=======================  ===================================  =====
+=======================  ===================================  ===============
 zip_safe                 bool
 setup_requires           list-semi
 install_requires         list-semi
@@ -2528,7 +2528,7 @@ exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
 data_files               dict                                 40.5.0
-=======================  ===================================  =====
+=======================  ===================================  ===============
 
 .. note::
 

From cdfeb2bdaa0d30889d53425c9bea6de7273b40cc Mon Sep 17 00:00:00 2001
From: Andrew Zhou <30874884+0az@users.noreply.github.com>
Date: Sun, 28 Oct 2018 22:40:19 -0700
Subject: [PATCH 7232/8469] Add news fragment

---
 changelog.d/1564.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1564.doc.rst

diff --git a/changelog.d/1564.doc.rst b/changelog.d/1564.doc.rst
new file mode 100644
index 0000000000..37494a2650
--- /dev/null
+++ b/changelog.d/1564.doc.rst
@@ -0,0 +1 @@
+Document setup.cfg minimum version for version and project_urls

From 90325195b5bf35afa12b699a7e9fddc0571e1551 Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung <uranusjr@gmail.com>
Date: Fri, 26 Oct 2018 10:13:15 +0800
Subject: [PATCH 7233/8469] Test normalize_path on various inputs

---
 pkg_resources/tests/test_pkg_resources.py | 56 +++++++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 81b67a31a9..416f9aff2f 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -237,7 +237,55 @@ def test_version_resolved_from_egg_info(self, env):
         dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req)
         assert dist.version == version
 
-    def test_normalize_path(self, tmpdir):
-        path = str(tmpdir)
-        expected = os.path.normcase(os.path.normpath(os.path.realpath(path)))
-        assert pkg_resources.normalize_path(path) == expected
+    @pytest.mark.parametrize(
+        'unnormalized, normalized',
+        [
+            ('foo', 'foo'),
+            ('foo/', 'foo'),
+            ('foo/bar', 'foo/bar'),
+            ('foo/bar/', 'foo/bar'),
+        ],
+    )
+    def test_normalize_path_trailing_sep(self, unnormalized, normalized):
+        """Ensure the trailing slash is cleaned for path comparison.
+
+        See pypa/setuptools#1519.
+        """
+        result_from_unnormalized = pkg_resources.normalize_path(unnormalized)
+        result_from_normalized = pkg_resources.normalize_path(normalized)
+        assert result_from_unnormalized == result_from_normalized
+
+    @pytest.mark.skipif(
+        os.path.normcase('A') != os.path.normcase('a'),
+        reason='Testing case-insensitive filesystems.',
+    )
+    @pytest.mark.parametrize(
+        'unnormalized, normalized',
+        [
+            ('MiXeD/CasE', 'mixed/case'),
+        ],
+    )
+    def test_normalize_path_normcase(self, unnormalized, normalized):
+        """Ensure mixed case is normalized on case-insensitive filesystems.
+        """
+        result_from_unnormalized = pkg_resources.normalize_path(unnormalized)
+        result_from_normalized = pkg_resources.normalize_path(normalized)
+        assert result_from_unnormalized == result_from_normalized
+
+    @pytest.mark.skipif(
+        os.path.sep != '\\',
+        reason='Testing systems using backslashes as path separators.',
+    )
+    @pytest.mark.parametrize(
+        'unnormalized, expected',
+        [
+            ('forward/slash', 'forward\\slash'),
+            ('forward/slash/', 'forward\\slash'),
+            ('backward\\slash\\', 'backward\\slash'),
+        ],
+    )
+    def test_normalize_path_backslash_sep(self, unnormalized, expected):
+        """Ensure path seps are cleaned on backslash path sep systems.
+        """
+        result = pkg_resources.normalize_path(unnormalized)
+        assert result.endswith(expected)

From 22bb74122729f7f7735db420ef32b7c578ca0d13 Mon Sep 17 00:00:00 2001
From: Andrew Zhou <30874884+0az@users.noreply.github.com>
Date: Tue, 30 Oct 2018 09:26:10 -0700
Subject: [PATCH 7234/8469] Add version footnote

---
 docs/setuptools.txt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index fe2a06f972..4e548066fa 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2471,11 +2471,11 @@ Metadata
     The aliases given below are supported for compatibility reasons,
     but their use is not advised.
 
-==============================  =================  =================  ===============
-Key                             Aliases            Type               Minumum Version
-==============================  =================  =================  ===============
+==============================  =================  =================  =============== =====
+Key                             Aliases            Type               Minumum Version Notes
+==============================  =================  =================  =============== =====
 name                                               str
-version                                            attr:, file:, str  39.2.0
+version                                            attr:, file:, str  39.2.0          (1)
 url                             home-page          str
 download_url                    download-url       str
 project_urls                                       dict               38.3.0
@@ -2493,19 +2493,22 @@ platforms                       platform           list-comma
 provides                                           list-comma
 requires                                           list-comma
 obsoletes                                          list-comma
-==============================  =================  =================  ===============
+==============================  =================  =================  =============== =====
 
 .. note::
     A version loaded using the ``file:`` directive must comply with PEP 440.
     It is easy to accidentally put something other than a valid version
     string in such a file, so validation is stricter in this case.
 
+Notes:
+1. The `version` file attribute has only been supported since 39.2.0.
+
 Options
 -------
 
-=======================  ===================================  ===============
-Key                      Type                                 Minimum Version
-=======================  ===================================  ===============
+=======================  ===================================  =============== =====
+Key                      Type                                 Minimum Version Notes
+=======================  ===================================  =============== =====
 zip_safe                 bool
 setup_requires           list-semi
 install_requires         list-semi
@@ -2528,7 +2531,7 @@ exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
 data_files               dict                                 40.5.0
-=======================  ===================================  ===============
+=======================  ===================================  =============== =====
 
 .. note::
 

From f0cd0ad9f29da6c6991ba0e02fc41b7e46459fb1 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 30 Oct 2018 22:54:15 +0100
Subject: [PATCH 7235/8469] Document that rpmbuild is required for bdist_rpm
 (#1547)

Document that rpmbuild is required for bdist_rpm

Refs #1456
---
 changelog.d/1456.doc.rst | 1 +
 docs/setuptools.txt      | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 changelog.d/1456.doc.rst

diff --git a/changelog.d/1456.doc.rst b/changelog.d/1456.doc.rst
new file mode 100644
index 0000000000..b01d533800
--- /dev/null
+++ b/changelog.d/1456.doc.rst
@@ -0,0 +1 @@
+Documented that the ``rpmbuild`` packages is required for the ``bdist_rpm`` command.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 9eec82f376..2912a43ca7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1333,6 +1333,10 @@ Creating System Packages
     ``bdist_deb`` command is an example of a command that currently requires
     this kind of patching to work with setuptools.
 
+    Please note that building system packages may require you to install
+    some system software, for example ``bdist_rpm`` requires the ``rpmbuild``
+    command installed.
+
     If you or your users have a problem building a usable system package for
     your project, please report the problem via the mailing list so that
     either the "bdist" tool in question or setuptools can be modified to

From f9bb94ae5ecef14d0168e820fe4aeae6ca341f4e Mon Sep 17 00:00:00 2001
From: Varun Kamath <varunkamath18@gmail.com>
Date: Sun, 28 Oct 2018 16:02:11 -0400
Subject: [PATCH 7236/8469] Update distribution guide and archive ez_setup doc

This adds a simple introductory guide to the modern way to distribute
`setuptools`-based projects with a link to the Python packaging
tutorial.

Rather than delete the old `ez_setup` information, it has been moved to
a separate archive for people who want to use it as a historical
reference.
---
 docs/ez_setup.txt   | 195 ++++++++++++++++++++++++++++++++++++++++++++
 docs/index.txt      |   3 +-
 docs/setuptools.txt | 192 +++++++++----------------------------------
 3 files changed, 234 insertions(+), 156 deletions(-)
 create mode 100644 docs/ez_setup.txt

diff --git a/docs/ez_setup.txt b/docs/ez_setup.txt
new file mode 100644
index 0000000000..0126fee307
--- /dev/null
+++ b/docs/ez_setup.txt
@@ -0,0 +1,195 @@
+:orphan:
+
+``ez_setup`` distribution guide 
+===============================
+
+Using ``setuptools``...  Without bundling it!
+---------------------------------------------
+
+.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
+
+.. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
+
+.. _EasyInstall Installation Instructions: easy_install.html
+
+.. _Custom Installation Locations: easy_install.html
+
+Your users might not have ``setuptools`` installed on their machines, or even
+if they do, it might not be the right version.  Fixing this is easy; just
+download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
+script.  (Be sure to add it to your revision control system, too.)  Then add
+these two lines to the very top of your setup script, before the script imports
+anything from setuptools:
+
+.. code-block:: python
+
+    import ez_setup
+    ez_setup.use_setuptools()
+
+That's it.  The ``ez_setup`` module will automatically download a matching
+version of ``setuptools`` from PyPI, if it isn't present on the target system.
+Whenever you install an updated version of setuptools, you should also update
+your projects' ``ez_setup.py`` files, so that a matching version gets installed
+on the target machine(s).
+
+(By the way, if you need to distribute a specific version of ``setuptools``,
+you can specify the exact version and base download URL as parameters to the
+``use_setuptools()`` function.  See the function's docstring for details.)
+
+
+What Your Users Should Know
+---------------------------
+
+In general, a setuptools-based project looks just like any distutils-based
+project -- as long as your users have an internet connection and are installing
+to ``site-packages``, that is.  But for some users, these conditions don't
+apply, and they may become frustrated if this is their first encounter with
+a setuptools-based project.  To keep these users happy, you should review the
+following topics in your project's installation instructions, if they are
+relevant to your project and your target audience isn't already familiar with
+setuptools and ``easy_install``.
+
+Network Access
+    If your project is using ``ez_setup``, you should inform users of the
+    need to either have network access, or to preinstall the correct version of
+    setuptools using the `EasyInstall installation instructions`_.  Those
+    instructions also have tips for dealing with firewalls as well as how to
+    manually download and install setuptools.
+
+Custom Installation Locations
+    You should inform your users that if they are installing your project to
+    somewhere other than the main ``site-packages`` directory, they should
+    first install setuptools using the instructions for `Custom Installation
+    Locations`_, before installing your project.
+
+Your Project's Dependencies
+    If your project depends on other projects that may need to be downloaded
+    from PyPI or elsewhere, you should list them in your installation
+    instructions, or tell users how to find out what they are.  While most
+    users will not need this information, any users who don't have unrestricted
+    internet access may have to find, download, and install the other projects
+    manually.  (Note, however, that they must still install those projects
+    using ``easy_install``, or your project will not know they are installed,
+    and your setup script will try to download them again.)
+
+    If you want to be especially friendly to users with limited network access,
+    you may wish to build eggs for your project and its dependencies, making
+    them all available for download from your site, or at least create a page
+    with links to all of the needed eggs.  In this way, users with limited
+    network access can manually download all the eggs to a single directory,
+    then use the ``-f`` option of ``easy_install`` to specify the directory
+    to find eggs in.  Users who have full network access can just use ``-f``
+    with the URL of your download page, and ``easy_install`` will find all the
+    needed eggs using your links directly.  This is also useful when your
+    target audience isn't able to compile packages (e.g. most Windows users)
+    and your package or some of its dependencies include C code.
+
+Revision Control System Users and Co-Developers
+    Users and co-developers who are tracking your in-development code using
+    a revision control system should probably read this manual's sections
+    regarding such development.  Alternately, you may wish to create a
+    quick-reference guide containing the tips from this manual that apply to
+    your particular situation.  For example, if you recommend that people use
+    ``setup.py develop`` when tracking your in-development code, you should let
+    them know that this needs to be run after every update or commit.
+
+    Similarly, if you remove modules or data files from your project, you
+    should remind them to run ``setup.py clean --all`` and delete any obsolete
+    ``.pyc`` or ``.pyo``.  (This tip applies to the distutils in general, not
+    just setuptools, but not everybody knows about them; be kind to your users
+    by spelling out your project's best practices rather than leaving them
+    guessing.)
+
+Creating System Packages
+    Some users want to manage all Python packages using a single package
+    manager, and sometimes that package manager isn't ``easy_install``!
+    Setuptools currently supports ``bdist_rpm``, ``bdist_wininst``, and
+    ``bdist_dumb`` formats for system packaging.  If a user has a locally-
+    installed "bdist" packaging tool that internally uses the distutils
+    ``install`` command, it should be able to work with ``setuptools``.  Some
+    examples of "bdist" formats that this should work with include the
+    ``bdist_nsi`` and ``bdist_msi`` formats for Windows.
+
+    However, packaging tools that build binary distributions by running
+    ``setup.py install`` on the command line or as a subprocess will require
+    modification to work with setuptools.  They should use the
+    ``--single-version-externally-managed`` option to the ``install`` command,
+    combined with the standard ``--root`` or ``--record`` options.
+    See the `install command`_ documentation below for more details.  The
+    ``bdist_deb`` command is an example of a command that currently requires
+    this kind of patching to work with setuptools.
+
+    Please note that building system packages may require you to install
+    some system software, for example ``bdist_rpm`` requires the ``rpmbuild``
+    command to be installed.
+
+    If you or your users have a problem building a usable system package for
+    your project, please report the problem via the mailing list so that
+    either the "bdist" tool in question or setuptools can be modified to
+    resolve the issue.
+
+Your users might not have ``setuptools`` installed on their machines, or even
+if they do, it might not be the right version.  Fixing this is easy; just
+download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
+script.  (Be sure to add it to your revision control system, too.)  Then add
+these two lines to the very top of your setup script, before the script imports
+anything from setuptools:
+
+.. code-block:: python
+
+    import ez_setup
+    ez_setup.use_setuptools()
+
+That's it.  The ``ez_setup`` module will automatically download a matching
+version of ``setuptools`` from PyPI, if it isn't present on the target system.
+Whenever you install an updated version of setuptools, you should also update
+your projects' ``ez_setup.py`` files, so that a matching version gets installed
+on the target machine(s).
+
+(By the way, if you need to distribute a specific version of ``setuptools``,
+you can specify the exact version and base download URL as parameters to the
+``use_setuptools()`` function.  See the function's docstring for details.)
+
+.. _install command:
+
+``install`` - Run ``easy_install`` or old-style installation
+============================================================
+
+The setuptools ``install`` command is basically a shortcut to run the
+``easy_install`` command on the current project.  However, for convenience
+in creating "system packages" of setuptools-based projects, you can also
+use this option:
+
+``--single-version-externally-managed``
+    This boolean option tells the ``install`` command to perform an "old style"
+    installation, with the addition of an ``.egg-info`` directory so that the
+    installed project will still have its metadata available and operate
+    normally.  If you use this option, you *must* also specify the ``--root``
+    or ``--record`` options (or both), because otherwise you will have no way
+    to identify and remove the installed files.
+
+This option is automatically in effect when ``install`` is invoked by another
+distutils command, so that commands like ``bdist_wininst`` and ``bdist_rpm``
+will create system packages of eggs.  It is also automatically in effect if
+you specify the ``--root`` option.
+
+
+``install_egg_info`` - Install an ``.egg-info`` directory in ``site-packages``
+==============================================================================
+
+Setuptools runs this command as part of ``install`` operations that use the
+``--single-version-externally-managed`` options.  You should not invoke it
+directly; it is documented here for completeness and so that distutils
+extensions such as system package builders can make use of it.  This command
+has only one option:
+
+``--install-dir=DIR, -d DIR``
+    The parent directory where the ``.egg-info`` directory will be placed.
+    Defaults to the same as the ``--install-dir`` option specified for the
+    ``install_lib`` command, which is usually the system ``site-packages``
+    directory.
+
+This command assumes that the ``egg_info`` command has been given valid options
+via the command line or ``setup.cfg``, as it will invoke the ``egg_info``
+command and use its options to locate the project's source ``.egg-info``
+directory.
diff --git a/docs/index.txt b/docs/index.txt
index 74aabb5e68..3515e0e68c 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -17,9 +17,10 @@ Documentation content:
    :maxdepth: 2
 
    setuptools
-   easy_install
    pkg_resources
    python3
    development
    roadmap
+   easy_install
+   ez_setup
    history
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2912a43ca7..a1cdce1bd6 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1223,125 +1223,53 @@ the quoted part.
 Distributing a ``setuptools``-based project
 ===========================================
 
-Using ``setuptools``...  Without bundling it!
----------------------------------------------
+Detailed instructions to distribute a setuptools project can be found at 
+`Packaging project tutorials`_.
 
-.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
+.. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
 
-Your users might not have ``setuptools`` installed on their machines, or even
-if they do, it might not be the right version.  Fixing this is easy; just
-download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
-script.  (Be sure to add it to your revision control system, too.)  Then add
-these two lines to the very top of your setup script, before the script imports
-anything from setuptools:
+Before you begin, make sure you have the latest versions of setuptools and wheel::
 
-.. code-block:: python
+    python3 -m pip install --user --upgrade setuptools wheel
 
-    import ez_setup
-    ez_setup.use_setuptools()
+To build a setuptools project, run this command from the same directory where
+setup.py is located::
 
-That's it.  The ``ez_setup`` module will automatically download a matching
-version of ``setuptools`` from PyPI, if it isn't present on the target system.
-Whenever you install an updated version of setuptools, you should also update
-your projects' ``ez_setup.py`` files, so that a matching version gets installed
-on the target machine(s).
+    python3 setup.py sdist bdist_wheel
 
-(By the way, if you need to distribute a specific version of ``setuptools``,
-you can specify the exact version and base download URL as parameters to the
-``use_setuptools()`` function.  See the function's docstring for details.)
+This will generate distribution archives in the `dist` directory.
 
+Before you upload the generated archives make sure you're registered on 
+https://test.pypi.org/account/register/. You will also need to verify your email
+to be able to upload any packages.
+You should install twine to be able to upload packages::
 
-What Your Users Should Know
----------------------------
+    python3 -m pip install --user --upgrade setuptools wheel
+
+Now, to upload these archives, run::
+
+    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+To install your newly uploaded package ``example_pkg``,  you can use pip::
 
-In general, a setuptools-based project looks just like any distutils-based
-project -- as long as your users have an internet connection and are installing
-to ``site-packages``, that is.  But for some users, these conditions don't
-apply, and they may become frustrated if this is their first encounter with
-a setuptools-based project.  To keep these users happy, you should review the
-following topics in your project's installation instructions, if they are
-relevant to your project and your target audience isn't already familiar with
-setuptools and ``easy_install``.
-
-Network Access
-    If your project is using ``ez_setup``, you should inform users of the
-    need to either have network access, or to preinstall the correct version of
-    setuptools using the `EasyInstall installation instructions`_.  Those
-    instructions also have tips for dealing with firewalls as well as how to
-    manually download and install setuptools.
-
-Custom Installation Locations
-    You should inform your users that if they are installing your project to
-    somewhere other than the main ``site-packages`` directory, they should
-    first install setuptools using the instructions for `Custom Installation
-    Locations`_, before installing your project.
-
-Your Project's Dependencies
-    If your project depends on other projects that may need to be downloaded
-    from PyPI or elsewhere, you should list them in your installation
-    instructions, or tell users how to find out what they are.  While most
-    users will not need this information, any users who don't have unrestricted
-    internet access may have to find, download, and install the other projects
-    manually.  (Note, however, that they must still install those projects
-    using ``easy_install``, or your project will not know they are installed,
-    and your setup script will try to download them again.)
-
-    If you want to be especially friendly to users with limited network access,
-    you may wish to build eggs for your project and its dependencies, making
-    them all available for download from your site, or at least create a page
-    with links to all of the needed eggs.  In this way, users with limited
-    network access can manually download all the eggs to a single directory,
-    then use the ``-f`` option of ``easy_install`` to specify the directory
-    to find eggs in.  Users who have full network access can just use ``-f``
-    with the URL of your download page, and ``easy_install`` will find all the
-    needed eggs using your links directly.  This is also useful when your
-    target audience isn't able to compile packages (e.g. most Windows users)
-    and your package or some of its dependencies include C code.
-
-Revision Control System Users and Co-Developers
-    Users and co-developers who are tracking your in-development code using
-    a revision control system should probably read this manual's sections
-    regarding such development.  Alternately, you may wish to create a
-    quick-reference guide containing the tips from this manual that apply to
-    your particular situation.  For example, if you recommend that people use
-    ``setup.py develop`` when tracking your in-development code, you should let
-    them know that this needs to be run after every update or commit.
-
-    Similarly, if you remove modules or data files from your project, you
-    should remind them to run ``setup.py clean --all`` and delete any obsolete
-    ``.pyc`` or ``.pyo``.  (This tip applies to the distutils in general, not
-    just setuptools, but not everybody knows about them; be kind to your users
-    by spelling out your project's best practices rather than leaving them
-    guessing.)
-
-Creating System Packages
-    Some users want to manage all Python packages using a single package
-    manager, and sometimes that package manager isn't ``easy_install``!
-    Setuptools currently supports ``bdist_rpm``, ``bdist_wininst``, and
-    ``bdist_dumb`` formats for system packaging.  If a user has a locally-
-    installed "bdist" packaging tool that internally uses the distutils
-    ``install`` command, it should be able to work with ``setuptools``.  Some
-    examples of "bdist" formats that this should work with include the
-    ``bdist_nsi`` and ``bdist_msi`` formats for Windows.
-
-    However, packaging tools that build binary distributions by running
-    ``setup.py install`` on the command line or as a subprocess will require
-    modification to work with setuptools.  They should use the
-    ``--single-version-externally-managed`` option to the ``install`` command,
-    combined with the standard ``--root`` or ``--record`` options.
-    See the `install command`_ documentation below for more details.  The
-    ``bdist_deb`` command is an example of a command that currently requires
-    this kind of patching to work with setuptools.
-
-    Please note that building system packages may require you to install
-    some system software, for example ``bdist_rpm`` requires the ``rpmbuild``
-    command installed.
-
-    If you or your users have a problem building a usable system package for
-    your project, please report the problem via the mailing list so that
-    either the "bdist" tool in question or setuptools can be modified to
-    resolve the issue.
+    python3 -m pip install --index-url https://test.pypi.org/simple/ example_pkg
 
+If you have issues at any point, please refer to `Packaging project tutorials`_
+for clarification.
+
+Distributing legacy ``setuptools`` projects using ez_setup.py
+-------------------------------------------------------------
+
+.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
+
+Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is 
+deprecated in favor of PIP. Please consider migrating to using pip and twine based
+distribution.
+
+However, if you still have any ``ez_setup`` based packages, documentation for 
+ez_setup based distributions can be found at `ez_setup distribution guide`_.
+
+.. _ez_setup distribution guide: ez_setup.html
 
 Setting the ``zip_safe`` flag
 -----------------------------
@@ -2058,52 +1986,6 @@ specified in ``setup.cfg``::
 (Notice that ``egg_info`` must always appear on the command line *before* any
 commands that you want the version changes to apply to.)
 
-
-.. _install command:
-
-``install`` - Run ``easy_install`` or old-style installation
-============================================================
-
-The setuptools ``install`` command is basically a shortcut to run the
-``easy_install`` command on the current project.  However, for convenience
-in creating "system packages" of setuptools-based projects, you can also
-use this option:
-
-``--single-version-externally-managed``
-    This boolean option tells the ``install`` command to perform an "old style"
-    installation, with the addition of an ``.egg-info`` directory so that the
-    installed project will still have its metadata available and operate
-    normally.  If you use this option, you *must* also specify the ``--root``
-    or ``--record`` options (or both), because otherwise you will have no way
-    to identify and remove the installed files.
-
-This option is automatically in effect when ``install`` is invoked by another
-distutils command, so that commands like ``bdist_wininst`` and ``bdist_rpm``
-will create system packages of eggs.  It is also automatically in effect if
-you specify the ``--root`` option.
-
-
-``install_egg_info`` - Install an ``.egg-info`` directory in ``site-packages``
-==============================================================================
-
-Setuptools runs this command as part of ``install`` operations that use the
-``--single-version-externally-managed`` options.  You should not invoke it
-directly; it is documented here for completeness and so that distutils
-extensions such as system package builders can make use of it.  This command
-has only one option:
-
-``--install-dir=DIR, -d DIR``
-    The parent directory where the ``.egg-info`` directory will be placed.
-    Defaults to the same as the ``--install-dir`` option specified for the
-    ``install_lib`` command, which is usually the system ``site-packages``
-    directory.
-
-This command assumes that the ``egg_info`` command has been given valid options
-via the command line or ``setup.cfg``, as it will invoke the ``egg_info``
-command and use its options to locate the project's source ``.egg-info``
-directory.
-
-
 .. _rotate:
 
 ``rotate`` - Delete outdated distribution files

From f666e2a70d24cae554b0800df512b884fdca25c3 Mon Sep 17 00:00:00 2001
From: Varun Kamath <varunkamath18@gmail.com>
Date: Sun, 28 Oct 2018 16:06:55 -0400
Subject: [PATCH 7237/8469] Add news fragment for PR #1560

---
 changelog.d/1560.doc.rst | 1 +
 docs/index.txt           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 changelog.d/1560.doc.rst

diff --git a/changelog.d/1560.doc.rst b/changelog.d/1560.doc.rst
new file mode 100644
index 0000000000..8288aa4e95
--- /dev/null
+++ b/changelog.d/1560.doc.rst
@@ -0,0 +1 @@
+update ``setuptools`` distribution documentation to mimic packaging.python.org tutorial.
\ No newline at end of file
diff --git a/docs/index.txt b/docs/index.txt
index 3515e0e68c..ba4be25fbf 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -22,5 +22,4 @@ Documentation content:
    development
    roadmap
    easy_install
-   ez_setup
    history

From 4e21a2f34f5ac23c9884a553639d76de2e2bcdc8 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 29 Oct 2018 10:16:41 -0400
Subject: [PATCH 7238/8469] Change index header for Easy Install

---
 docs/index.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.txt b/docs/index.txt
index ba4be25fbf..13a46e74ef 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -21,5 +21,5 @@ Documentation content:
    python3
    development
    roadmap
-   easy_install
+   Deprecated: Easy Install <easy_install>
    history

From af4f0bae84750a299d8396e7da27f8d5220d19b2 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 1 Nov 2018 11:52:54 -0700
Subject: [PATCH 7239/8469] Add missing word to sentence in docs (#1552)

Add missing word to sentence in python 3 docs
---
 changelog.d/1552.doc.rst | 1 +
 docs/python3.txt         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1552.doc.rst

diff --git a/changelog.d/1552.doc.rst b/changelog.d/1552.doc.rst
new file mode 100644
index 0000000000..43e0e62d10
--- /dev/null
+++ b/changelog.d/1552.doc.rst
@@ -0,0 +1 @@
+Fixed a minor typo in the python 2/3 compatibility documentation.
diff --git a/docs/python3.txt b/docs/python3.txt
index c528fc3ced..6b55fe785e 100644
--- a/docs/python3.txt
+++ b/docs/python3.txt
@@ -9,7 +9,7 @@ code.
 
 Setuptools provides a facility to invoke 2to3 on the code as a part of the
 build process, by setting the keyword parameter ``use_2to3`` to True, but
-the Setuptools strongly recommends instead developing a unified codebase
+the Setuptools project strongly recommends instead developing a unified codebase
 using `six <https://pypi.org/project/six/>`_,
 `future <https://pypi.org/project/future/>`_, or another compatibility
 library.

From d3e08a321065f9c84ac923417f9d80ae510adaaf Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sun, 28 Oct 2018 12:47:00 -0400
Subject: [PATCH 7240/8469] Add tests for setup.py inclusion

This tests that `setup.py` is included by default in the distribution
with the egg_info command and when an sdist is built with
build_meta.build_sdist
---
 setuptools/tests/test_build_meta.py | 12 ++++++++
 setuptools/tests/test_egg_info.py   | 16 +++++++++-
 setuptools/tests/test_sdist.py      | 46 +++++++++++++++++++++++++++--
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index c5f4dcaa9b..82a5511c48 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -2,9 +2,11 @@
 
 import os
 import shutil
+import tarfile
 
 import pytest
 
+from setuptools.build_meta import build_sdist
 from .files import build_files
 from .textwrap import DALS
 from . import py2_only
@@ -181,3 +183,13 @@ def test_build_sdist_version_change(build_backend):
 
     sdist_name = build_backend.build_sdist("out_sdist")
     assert os.path.isfile(os.path.join(os.path.abspath("out_sdist"), sdist_name))
+
+
+def test_build_sdist_setup_py_exists(tmpdir_cwd):
+    # If build_sdist is called from a script other than setup.py,
+    # ensure setup.py is include
+    build_files(defns[0])
+    targz_path = build_sdist("temp")
+    with tarfile.open(os.path.join("temp", targz_path)) as tar:
+        assert any('setup.py' in name for name in tar.getnames())
+
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 46fb884f23..f97b3f1d81 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -569,6 +569,20 @@ def test_manifest_maker_warning_suppression(self):
         for msg in fixtures:
             assert manifest_maker._should_suppress_warning(msg)
 
+    def test_egg_info_includes_setup_py(self, tmpdir_cwd):
+        self._create_project()
+        dist = Distribution({"name": "foo", "version": "0.0.1"})
+        dist.script_name = "non_setup.py"
+        egg_info_instance = egg_info(dist)
+        egg_info_instance.finalize_options()
+        egg_info_instance.run()
+
+        assert 'setup.py' in egg_info_instance.filelist.files
+
+        with open(egg_info_instance.egg_info + "/SOURCES.txt") as f:
+            sources = f.read().split('\n')
+            assert 'setup.py' in sources
+
     def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
@@ -605,4 +619,4 @@ def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
         assert 'Version: 0.0.0.dev0' in pkg_info_lines
 
     def test_get_pkg_info_revision_deprecated(self):
-        pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)
\ No newline at end of file
+        pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 3a203890c8..d2c4e0cf95 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -92,9 +92,8 @@ def latin1_fail():
 class TestSdistTest:
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
-        f = open(os.path.join(self.temp_dir, 'setup.py'), 'w')
-        f.write(SETUP_PY)
-        f.close()
+        with open(os.path.join(self.temp_dir, 'setup.py'), 'w') as f:
+            f.write(SETUP_PY)
 
         # Set up the rest of the test package
         test_pkg = os.path.join(self.temp_dir, 'sdist_test')
@@ -135,6 +134,47 @@ def test_package_data_in_sdist(self):
         assert os.path.join('sdist_test', 'c.rst') not in manifest
         assert os.path.join('d', 'e.dat') in manifest
 
+    def test_setup_py_exists(self):
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'foo.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        with quiet():
+            cmd.run()
+
+        manifest = cmd.filelist.files
+        assert 'setup.py' in manifest
+
+    def test_setup_py_missing(self):
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'foo.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        if os.path.exists("setup.py"):
+            os.remove("setup.py")
+        with quiet():
+            cmd.run()
+
+        manifest = cmd.filelist.files
+        assert 'setup.py' not in manifest
+
+    def test_setup_py_excluded(self):
+        with open("MANIFEST.in", "w") as manifest_file:
+            manifest_file.write("exclude setup.py")
+
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'foo.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+
+        with quiet():
+            cmd.run()
+
+        manifest = cmd.filelist.files
+        assert 'setup.py' not in manifest
+
     def test_defaults_case_sensitivity(self):
         """
         Make sure default files (README.*, etc.) are added in a case-sensitive

From fcfe6ef3b7a49f68a9d732558ad80a7afe98aaa9 Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sun, 28 Oct 2018 12:47:43 -0400
Subject: [PATCH 7241/8469] Add setup.py to egg-info by default

Fixes GH issue #1506
---
 setuptools/command/egg_info.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e1022d31fa..d9fe3da319 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -575,6 +575,12 @@ def add_defaults(self):
             self.filelist.extend(rcfiles)
         elif os.path.exists(self.manifest):
             self.read_manifest()
+
+        if os.path.exists("setup.py"):
+            # setup.py should be included by default, even if it's not
+            # the script called to create the sdist
+            self.filelist.append("setup.py")
+
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 

From 7a3e4b4169d5f65714f1302aff6c420237ff9295 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 2 Nov 2018 20:38:43 -0400
Subject: [PATCH 7242/8469] Add futures backport to test reqs

`setuptools.tests.test_build_meta` relies on the Python 3 feature
`concurrent.futures` to run, and as a result has been silently skipped
in Python 2.7. This adds the `futures` backport to the 2.7 test
requirements and turns the `pytest.importorskip` invocations in test_build_meta
into standard import statements.
---
 setuptools/tests/test_build_meta.py | 5 +++--
 tests/requirements.txt              | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index c5f4dcaa9b..2dc45bc42d 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -11,8 +11,9 @@
 
 __metaclass__ = type
 
-futures = pytest.importorskip('concurrent.futures')
-importlib = pytest.importorskip('importlib')
+# Backports on Python 2.7
+import importlib
+from concurrent import futures
 
 
 class BuildBackendBase:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index b38fcbf06e..0c6c3e597c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -8,3 +8,4 @@ wheel
 coverage>=4.5.1
 pytest-cov>=2.5.1
 paver; python_version>="3.6"
+futures; python_version=="2.7"

From b2cbe8606a12913c12b9a1fe3f5f8c0f8082c296 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 2 Nov 2018 20:46:29 -0400
Subject: [PATCH 7243/8469] Add changelog for PR #1572

---
 changelog.d/1572.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1572.misc.rst

diff --git a/changelog.d/1572.misc.rst b/changelog.d/1572.misc.rst
new file mode 100644
index 0000000000..aa3ab7ae9e
--- /dev/null
+++ b/changelog.d/1572.misc.rst
@@ -0,0 +1 @@
+Added the ``concurrent.futures`` backport ``futures`` to the Python 2.7 test suite requirements.

From 6d8a4ebcd6a9e61ac92146d2e41deeb92a7a5ec1 Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sun, 28 Oct 2018 15:10:28 -0400
Subject: [PATCH 7244/8469] Add changelog for PR #1554

---
 changelog.d/1554.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1554.change.rst

diff --git a/changelog.d/1554.change.rst b/changelog.d/1554.change.rst
new file mode 100644
index 0000000000..d55c042ce4
--- /dev/null
+++ b/changelog.d/1554.change.rst
@@ -0,0 +1 @@
+``build_meta.build_sdist`` now includes ``setup.py`` in source distributions by default

From bff67db79c5c1f65cde5fea9919f121dacbc0e7b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 2 Nov 2018 20:29:40 -0400
Subject: [PATCH 7245/8469] Test that manifest can exclude setup.py

---
 setuptools/tests/test_build_meta.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 82a5511c48..940780cf5c 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -193,3 +193,24 @@ def test_build_sdist_setup_py_exists(tmpdir_cwd):
     with tarfile.open(os.path.join("temp", targz_path)) as tar:
         assert any('setup.py' in name for name in tar.getnames())
 
+
+def test_build_sdist_setup_py_manifest_excluded(tmpdir_cwd):
+    # Ensure that MANIFEST.in can exclude setup.py
+    files = {
+        'setup.py': DALS("""
+    __import__('setuptools').setup(
+        name='foo',
+        version='0.0.0',
+        py_modules=['hello']
+    )"""),
+        'hello.py': '',
+        'MANIFEST.in': DALS("""
+    exclude setup.py
+    """)
+    }
+
+    build_files(files)
+    targz_path = build_sdist("temp")
+    with tarfile.open(os.path.join("temp", targz_path)) as tar:
+        assert not any('setup.py' in name for name in tar.getnames())
+

From b841e0aececb0e28ff3fabe29bf22c4b86fae9d8 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 5 Nov 2018 16:20:25 +0200
Subject: [PATCH 7246/8469] bpo-35133: Fix mistakes when concatenate string
 literals on different lines. (GH-10284)

Two kind of mistakes:

1. Missed space. After concatenating there is no space between words.

2. Missed comma. Causes unintentional concatenating in a list of strings.
---
 command/bdist_dumb.py    | 2 +-
 command/bdist_msi.py     | 4 ++--
 command/bdist_rpm.py     | 2 +-
 command/bdist_wininst.py | 4 ++--
 command/build_ext.py     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/bdist_dumb.py b/command/bdist_dumb.py
index e9274d925a..f0d6b5b8cd 100644
--- a/command/bdist_dumb.py
+++ b/command/bdist_dumb.py
@@ -32,7 +32,7 @@ class bdist_dumb(Command):
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
                     ('relative', None,
-                     "build the archive using relative paths"
+                     "build the archive using relative paths "
                      "(default: false)"),
                     ('owner=', 'u',
                      "Owner name used when creating a tar file"
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index a4bd5a589d..80104c372d 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -98,14 +98,14 @@ class bdist_msi(Command):
                     ('no-target-compile', 'c',
                      "do not compile .py to .pyc on the target system"),
                     ('no-target-optimize', 'o',
-                     "do not compile .py to .pyo (optimized)"
+                     "do not compile .py to .pyo (optimized) "
                      "on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
                     ('install-script=', None,
-                     "basename of installation script to be run after"
+                     "basename of installation script to be run after "
                      "installation or before deinstallation"),
                     ('pre-install-script=', None,
                      "Fully qualified filename of a script to be run before "
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index ac4621791d..02f10dd89d 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -58,7 +58,7 @@ class bdist_rpm(Command):
          "RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") "
          "[default: maintainer or author from setup script]"),
         ('packager=', None,
-         "RPM packager (eg. \"Jane Doe <jane@example.net>\")"
+         "RPM packager (eg. \"Jane Doe <jane@example.net>\") "
          "[default: vendor]"),
         ('doc-files=', None,
          "list of documentation files (space or comma-separated)"),
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 0871a4f7d6..fde56754e8 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -29,7 +29,7 @@ class bdist_wininst(Command):
                     ('no-target-compile', 'c',
                      "do not compile .py to .pyc on the target system"),
                     ('no-target-optimize', 'o',
-                     "do not compile .py to .pyo (optimized)"
+                     "do not compile .py to .pyo (optimized) "
                      "on the target system"),
                     ('dist-dir=', 'd',
                      "directory to put final built distributions in"),
@@ -40,7 +40,7 @@ class bdist_wininst(Command):
                     ('skip-build', None,
                      "skip rebuilding everything (for testing/debugging)"),
                     ('install-script=', None,
-                     "basename of installation script to be run after"
+                     "basename of installation script to be run after "
                      "installation or before deinstallation"),
                     ('pre-install-script=', None,
                      "Fully qualified filename of a script to be run before "
diff --git a/command/build_ext.py b/command/build_ext.py
index 8fad9cdc2b..158465d233 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -365,7 +365,7 @@ def check_extensions_list(self, extensions):
             ext_name, build_info = ext
 
             log.warn("old-style (ext_name, build_info) tuple found in "
-                     "ext_modules for extension '%s'"
+                     "ext_modules for extension '%s' "
                      "-- please convert to Extension instance", ext_name)
 
             if not (isinstance(ext_name, str) and

From cbef2949856f5e0957be1cbdfdc92325f9ae9f1e Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 27 Oct 2018 17:21:11 -0400
Subject: [PATCH 7247/8469] Add upload_file to setuptools.command.upload

---
 setuptools/command/upload.py | 147 ++++++++++++++++++++++++++++++++++-
 1 file changed, 146 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 72f24d8f48..dae7d74dfb 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -1,14 +1,24 @@
+import io
+import os
+import hashlib
 import getpass
+
+from base64 import standard_b64encode
+
 from distutils import log
 from distutils.command import upload as orig
 
+from distutils.errors import DistutilsError
+
+from six.moves.urllib.request import urlopen, Request
+from six.moves.urllib.error import HTTPError
+from six.moves.urllib.parse import urlparse
 
 class upload(orig.upload):
     """
     Override default upload behavior to obtain password
     in a variety of different ways.
     """
-
     def run(self):
         try:
             orig.upload.run(self)
@@ -33,6 +43,141 @@ def finalize_options(self):
             self._prompt_for_password()
         )
 
+    def upload_file(self, command, pyversion, filename):
+        # Makes sure the repository URL is compliant
+        schema, netloc, url, params, query, fragments = \
+            urlparse(self.repository)
+        if params or query or fragments:
+            raise AssertionError("Incompatible url %s" % self.repository)
+
+        if schema not in ('http', 'https'):
+            raise AssertionError("unsupported schema " + schema)
+
+        # Sign if requested
+        if self.sign:
+            gpg_args = ["gpg", "--detach-sign", "-a", filename]
+            if self.identity:
+                gpg_args[2:2] = ["--local-user", self.identity]
+            spawn(gpg_args,
+                  dry_run=self.dry_run)
+
+        # Fill in the data - send all the meta-data in case we need to
+        # register a new release
+        with open(filename, 'rb') as f:
+            content = f.read()
+
+        meta = self.distribution.metadata
+
+        data = {
+            # action
+            ':action': 'file_upload',
+            'protocol_version': '1',
+
+            # identify release
+            'name': meta.get_name(),
+            'version': meta.get_version(),
+
+            # file content
+            'content': (os.path.basename(filename),content),
+            'filetype': command,
+            'pyversion': pyversion,
+            'md5_digest': hashlib.md5(content).hexdigest(),
+
+            # additional meta-data
+            'metadata_version': '1.0',
+            'summary': meta.get_description(),
+            'home_page': meta.get_url(),
+            'author': meta.get_contact(),
+            'author_email': meta.get_contact_email(),
+            'license': meta.get_licence(),
+            'description': meta.get_long_description(),
+            'keywords': meta.get_keywords(),
+            'platform': meta.get_platforms(),
+            'classifiers': meta.get_classifiers(),
+            'download_url': meta.get_download_url(),
+            # PEP 314
+            'provides': meta.get_provides(),
+            'requires': meta.get_requires(),
+            'obsoletes': meta.get_obsoletes(),
+            }
+        comment = ''
+        if command == 'bdist_rpm':
+            dist, version, id = platform.dist()
+            if dist:
+                comment = 'built for %s %s' % (dist, version)
+        elif command == 'bdist_dumb':
+            comment = 'built for %s' % platform.platform(terse=1)
+        data['comment'] = comment
+
+        if self.sign:
+            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
+                                     open(filename+".asc", "rb").read())
+
+        # set up the authentication
+        user_pass = (self.username + ":" + self.password).encode('ascii')
+        # The exact encoding of the authentication string is debated.
+        # Anyway PyPI only accepts ascii for both username or password.
+        auth = "Basic " + standard_b64encode(user_pass).decode('ascii')
+
+        # Build up the MIME payload for the POST data
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = b'\r\n--' + boundary.encode('ascii')
+        end_boundary = sep_boundary + b'--\r\n'
+        body = io.BytesIO()
+        for key, value in data.items():
+            title = '\r\nContent-Disposition: form-data; name="%s"' % key
+            # handle multiple entries for the same name
+            if not isinstance(value, list):
+                value = [value]
+            for value in value:
+                if type(value) is tuple:
+                    title += '; filename="%s"' % value[0]
+                    value = value[1]
+                else:
+                    value = str(value).encode('utf-8')
+                body.write(sep_boundary)
+                body.write(title.encode('utf-8'))
+                body.write(b"\r\n\r\n")
+                body.write(value)
+        body.write(end_boundary)
+        body = body.getvalue()
+
+        msg = "Submitting %s to %s" % (filename, self.repository)
+        self.announce(msg, log.INFO)
+
+        # build the Request
+        headers = {
+            'Content-type': 'multipart/form-data; boundary=%s' % boundary,
+            'Content-length': str(len(body)),
+            'Authorization': auth,
+        }
+
+        request = Request(self.repository, data=body,
+                          headers=headers)
+        # send the data
+        try:
+            result = urlopen(request)
+            status = result.getcode()
+            reason = result.msg
+        except HTTPError as e:
+            status = e.code
+            reason = e.msg
+        except OSError as e:
+            self.announce(str(e), log.ERROR)
+            raise
+
+        if status == 200:
+            self.announce('Server response (%s): %s' % (status, reason),
+                          log.INFO)
+            if self.show_response:
+                text = self._read_pypi_response(result)
+                msg = '\n'.join(('-' * 75, text, '-' * 75))
+                self.announce(msg, log.INFO)
+        else:
+            msg = 'Upload failed (%s): %s' % (status, reason)
+            self.announce(msg, log.ERROR)
+            raise DistutilsError(msg)
+
     def _load_password_from_keyring(self):
         """
         Attempt to load password from keyring. Suppress Exceptions.

From 83fb2385518f7cf7885144f12db80b9364e67c7f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 6 Nov 2018 09:18:05 -0500
Subject: [PATCH 7248/8469] Add DistributionMetadata.read_pkg_file

This is the baseline, unchanged from the version in distutils.dist, to
be modified before patching.
---
 setuptools/dist.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index f6078dbe0a..44e9aa89b6 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -53,6 +53,59 @@ def get_metadata_version(dist_md):
     return StrictVersion('1.0')
 
 
+def read_pkg_file(self, file):
+    """Reads the metadata values from a file object."""
+    msg = message_from_file(file)
+
+    def _read_field(name):
+        value = msg[name]
+        if value == 'UNKNOWN':
+            return None
+        return value
+
+    def _read_list(name):
+        values = msg.get_all(name, None)
+        if values == []:
+            return None
+        return values
+
+    metadata_version = msg['metadata-version']
+    self.name = _read_field('name')
+    self.version = _read_field('version')
+    self.description = _read_field('summary')
+    # we are filling author only.
+    self.author = _read_field('author')
+    self.maintainer = None
+    self.author_email = _read_field('author-email')
+    self.maintainer_email = None
+    self.url = _read_field('home-page')
+    self.license = _read_field('license')
+
+    if 'download-url' in msg:
+        self.download_url = _read_field('download-url')
+    else:
+        self.download_url = None
+
+    self.long_description = _read_field('description')
+    self.description = _read_field('summary')
+
+    if 'keywords' in msg:
+        self.keywords = _read_field('keywords').split(',')
+
+    self.platforms = _read_list('platform')
+    self.classifiers = _read_list('classifier')
+
+    # PEP 314 - these fields only exist in 1.1
+    if metadata_version == '1.1':
+        self.requires = _read_list('requires')
+        self.provides = _read_list('provides')
+        self.obsoletes = _read_list('obsoletes')
+    else:
+        self.requires = None
+        self.provides = None
+        self.obsoletes = None
+
+
 # Based on Python 3.5 version
 def write_pkg_file(self, file):
     """Write the PKG-INFO format data to a file object.

From b7a6d8ad1b20e94de0b0bdebd1a6e9c8fd51695a Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 28 Oct 2018 14:19:04 -0400
Subject: [PATCH 7249/8469] Add failing test for issue #1381

---
 setuptools/tests/test_upload.py | 59 +++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 95a8d16b11..5b8e267c76 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -1,13 +1,72 @@
 import mock
+import os
+import re
+
 from distutils import log
+from distutils.version import StrictVersion
 
 import pytest
+import six
 
 from setuptools.command.upload import upload
 from setuptools.dist import Distribution
 
 
+def _parse_upload_body(body):
+    boundary = u'\r\n----------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+    entries = []
+    name_re = re.compile(u'^Content-Disposition: form-data; name="([^\"]+)"')
+
+    for entry in body.split(boundary):
+        pair = entry.split(u'\r\n\r\n')
+        if not len(pair) == 2:
+            continue
+
+        key, value = map(six.text_type.strip, pair)
+        m = name_re.match(key)
+        if m is not None:
+            key = m.group(1)
+
+        entries.append((key, value))
+
+    return entries
+
+
 class TestUploadTest:
+    @pytest.mark.xfail(reason='Issue #1381')
+    @mock.patch('setuptools.command.upload.urlopen')
+    def test_upload_metadata(self, patch, tmpdir):
+        dist = Distribution()
+        dist.metadata.metadata_version = StrictVersion('2.1')
+
+        content = os.path.join(str(tmpdir), "test_upload_metadata_content")
+
+        with open(content, 'w') as f:
+            f.write("Some content")
+
+        dist.dist_files = [('xxx', '3.7', content)]
+
+        patch.return_value = mock.Mock()
+        patch.return_value.getcode.return_value = 200
+
+        cmd = upload(dist)
+        cmd.announce = mock.Mock()
+        cmd.username = 'user'
+        cmd.password = 'hunter2'
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # Make sure we did the upload
+        patch.assert_called_once()
+
+        # Make sure the metadata version is correct in the headers
+        request = patch.call_args_list[0][0][0]
+        body = request.data.decode('utf-8')
+
+        entries = dict(_parse_upload_body(body))
+        assert entries['metadata_version'] == '2.1'
+
+
     def test_warns_deprecation(self):
         dist = Distribution()
         dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]

From e5d362d3736bc5972835a55bcb165d8c55913547 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 6 Nov 2018 09:30:24 -0500
Subject: [PATCH 7250/8469] Store metadata version on metadata object

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 44e9aa89b6..5b750b624b 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -10,7 +10,11 @@
 import distutils.cmd
 import distutils.dist
 import itertools
+
+
 from collections import defaultdict
+from email import message_from_file
+
 from distutils.errors import (
     DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
 )
@@ -69,7 +73,7 @@ def _read_list(name):
             return None
         return values
 
-    metadata_version = msg['metadata-version']
+    self.metadata_version = StrictVersion(msg['metadata-version'])
     self.name = _read_field('name')
     self.version = _read_field('version')
     self.description = _read_field('summary')
@@ -96,7 +100,7 @@ def _read_list(name):
     self.classifiers = _read_list('classifier')
 
     # PEP 314 - these fields only exist in 1.1
-    if metadata_version == '1.1':
+    if metadata_version == StrictVersion('1.1'):
         self.requires = _read_list('requires')
         self.provides = _read_list('provides')
         self.obsoletes = _read_list('obsoletes')

From 386fcdbe02c4170a560d67742f2ac1319430ff43 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 5 Nov 2018 10:23:15 -0500
Subject: [PATCH 7251/8469] Start patching DistributionMetadata.read_pkg_file

This turns get_metadata_version into a method on DistributionMetadata,
populated either by inferrence (in the case of package metadata
specified in `setup`) or from the data in a specified PKG-INFO file.

To populate metadata_version from PKG-INFO, we need to monkey patch
read_pkg_file in addition to write_pkg_file.
---
 setuptools/dist.py   | 33 ++++++++++++++++++++-------------
 setuptools/monkey.py | 12 ++++++------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 5b750b624b..ae9816fd47 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -43,18 +43,25 @@ def _get_unpatched(cls):
     return get_unpatched(cls)
 
 
-def get_metadata_version(dist_md):
-    if dist_md.long_description_content_type or dist_md.provides_extras:
-        return StrictVersion('2.1')
-    elif (dist_md.maintainer is not None or
-          dist_md.maintainer_email is not None or
-          getattr(dist_md, 'python_requires', None) is not None):
-        return StrictVersion('1.2')
-    elif (dist_md.provides or dist_md.requires or dist_md.obsoletes or
-            dist_md.classifiers or dist_md.download_url):
-        return StrictVersion('1.1')
+def get_metadata_version(self):
+    mv = getattr(self, 'metadata_version', None)
+
+    if mv is None:
+        if self.long_description_content_type or self.provides_extras:
+            mv = StrictVersion('2.1')
+        elif (self.maintainer is not None or
+              self.maintainer_email is not None or
+              getattr(self, 'python_requires', None) is not None):
+            mv = StrictVersion('1.2')
+        elif (self.provides or self.requires or self.obsoletes or
+                self.classifiers or self.download_url):
+            mv = StrictVersion('1.1')
+        else:
+            mv = StrictVersion('1.0')
+
+        self.metadata_version = mv
 
-    return StrictVersion('1.0')
+    return mv
 
 
 def read_pkg_file(self, file):
@@ -100,7 +107,7 @@ def _read_list(name):
     self.classifiers = _read_list('classifier')
 
     # PEP 314 - these fields only exist in 1.1
-    if metadata_version == StrictVersion('1.1'):
+    if self.metadata_version == StrictVersion('1.1'):
         self.requires = _read_list('requires')
         self.provides = _read_list('provides')
         self.obsoletes = _read_list('obsoletes')
@@ -114,7 +121,7 @@ def _read_list(name):
 def write_pkg_file(self, file):
     """Write the PKG-INFO format data to a file object.
     """
-    version = get_metadata_version(self)
+    version = self.get_metadata_version()
 
     file.write('Metadata-Version: %s\n' % version)
     file.write('Name: %s\n' % self.get_name())
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 05a738b055..3c77f8cf27 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -84,7 +84,7 @@ def patch_all():
         warehouse = 'https://upload.pypi.org/legacy/'
         distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
 
-    _patch_distribution_metadata_write_pkg_file()
+    _patch_distribution_metadata()
 
     # Install Distribution throughout the distutils
     for module in distutils.dist, distutils.core, distutils.cmd:
@@ -101,11 +101,11 @@ def patch_all():
     patch_for_msvc_specialized_compiler()
 
 
-def _patch_distribution_metadata_write_pkg_file():
-    """Patch write_pkg_file to also write Requires-Python/Requires-External"""
-    distutils.dist.DistributionMetadata.write_pkg_file = (
-        setuptools.dist.write_pkg_file
-    )
+def _patch_distribution_metadata():
+    """Patch write_pkg_file and read_pkg_file for higher metadata standards"""
+    for attr in ('write_pkg_file', 'read_pkg_file', 'get_metadata_version'):
+        new_val = getattr(setuptools.dist, attr)
+        setattr(distutils.dist.DistributionMetadata, attr, new_val)
 
 
 def patch_func(replacement, target_mod, func_name):

From 33185837dbc1f75f7894b9cbc3e56c1c6a868c4c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 5 Nov 2018 10:26:50 -0500
Subject: [PATCH 7252/8469] Use get_metadata_version in upload_file

Previously this value was hard-coded to '1.0', which was inaccurate for
many packages.

Fixes #1381
---
 setuptools/command/upload.py    | 2 +-
 setuptools/tests/test_upload.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index dae7d74dfb..01fa026c2e 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -84,7 +84,7 @@ def upload_file(self, command, pyversion, filename):
             'md5_digest': hashlib.md5(content).hexdigest(),
 
             # additional meta-data
-            'metadata_version': '1.0',
+            'metadata_version': str(meta.get_metadata_version()),
             'summary': meta.get_description(),
             'home_page': meta.get_url(),
             'author': meta.get_contact(),
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 5b8e267c76..b18f83c8d0 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -33,7 +33,6 @@ def _parse_upload_body(body):
 
 
 class TestUploadTest:
-    @pytest.mark.xfail(reason='Issue #1381')
     @mock.patch('setuptools.command.upload.urlopen')
     def test_upload_metadata(self, patch, tmpdir):
         dist = Distribution()

From 54466884a9458bc77ecfe3a30ac0f1b21126006b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 5 Nov 2018 10:35:45 -0500
Subject: [PATCH 7253/8469] Add changelog for PR #1576

---
 changelog.d/1576.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1576.change.rst

diff --git a/changelog.d/1576.change.rst b/changelog.d/1576.change.rst
new file mode 100644
index 0000000000..85c578ed4f
--- /dev/null
+++ b/changelog.d/1576.change.rst
@@ -0,0 +1 @@
+Started monkey-patching ``get_metadata_version`` and ``read_pkg_file`` onto ``distutils.DistributionMetadata`` to retain the correct version on the ``PKG-INFO`` file in the (deprecated) ``upload`` command.

From 9ffb099b1154662bf1fa8da2a9e0cbef22a2a809 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 6 Nov 2018 09:10:00 -0500
Subject: [PATCH 7254/8469] Add test for read_pkg_file

---
 setuptools/tests/test_dist.py | 96 +++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 223ad90c95..36605ceabd 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -59,6 +59,102 @@ def sdist_with_index(distname, version):
 def test_dist__get_unpatched_deprecated():
     pytest.warns(DistDeprecationWarning, _get_unpatched, [""])
 
+
+def __read_test_cases():
+    # Metadata version 1.0
+    base_attrs = {
+        "name": "package",
+        "version": "0.0.1",
+        "author": "Foo Bar",
+        "author_email": "foo@bar.net",
+        "long_description": "Long\ndescription",
+        "description": "Short description",
+        "keywords": ["one", "two"]
+    }
+
+    def merge_dicts(d1, d2):
+        d1 = d1.copy()
+        d1.update(d2)
+
+        return d1
+
+    test_cases = [
+        ('Metadata version 1.0', base_attrs.copy()),
+        ('Metadata version 1.1: Provides', merge_dicts(base_attrs, {
+            'provides': ['package']
+        })),
+        ('Metadata version 1.1: Obsoletes', merge_dicts(base_attrs, {
+            'obsoletes': ['foo']
+        })),
+        ('Metadata version 1.1: Classifiers', merge_dicts(base_attrs, {
+            'classifiers': [
+                'Programming Language :: Python :: 3',
+                'Programming Language :: Python :: 3.7',
+                'License :: OSI Approved :: MIT License'
+        ]})),
+        ('Metadata version 1.1: Download URL', merge_dicts(base_attrs, {
+            'download_url': 'https://example.com'
+        })),
+        ('Metadata Version 1.2: Requires-Python', merge_dicts(base_attrs, {
+            'python_requires': '>=3.7'
+        })),
+        pytest.param('Metadata Version 1.2: Project-Url',
+            merge_dicts(base_attrs, {
+                'project_urls': {
+                    'Foo': 'https://example.bar'
+                }
+            }), marks=pytest.mark.xfail(
+                reason="Issue #1578: project_urls not read"
+        )),
+        ('Metadata Version 2.1: Long Description Content Type',
+         merge_dicts(base_attrs, {
+             'long_description_content_type': 'text/x-rst; charset=UTF-8'
+         })),
+        pytest.param('Metadata Version 2.1: Provides Extra',
+            merge_dicts(base_attrs, {
+                'provides_extras': ['foo', 'bar']
+        }), marks=pytest.mark.xfail(reason="provides_extras not read")),
+    ]
+
+    return test_cases
+
+
+@pytest.mark.parametrize('name,attrs', __read_test_cases())
+def test_read_metadata(name, attrs, tmpdir):
+    dist = Distribution(attrs)
+    metadata_out = dist.metadata
+    dist_class = metadata_out.__class__
+
+    # Write to PKG_INFO and then load into a new metadata object
+    fn = tmpdir.mkdir('pkg_info')
+    fn_s = str(fn)
+
+    metadata_out.write_pkg_info(fn_s)
+
+    metadata_in = dist_class()
+    with io.open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f:
+        metadata_in.read_pkg_file(f)
+
+    tested_attrs = [
+        ('name', dist_class.get_name),
+        ('version', dist_class.get_version),
+        ('metadata_version', dist_class.get_metadata_version),
+        ('provides', dist_class.get_provides),
+        ('description', dist_class.get_description),
+        ('download_url', dist_class.get_download_url),
+        ('keywords', dist_class.get_keywords),
+        ('platforms', dist_class.get_platforms),
+        ('obsoletes', dist_class.get_obsoletes),
+        ('requires', dist_class.get_requires),
+        ('classifiers', dist_class.get_classifiers),
+        ('project_urls', lambda s: getattr(s, 'project_urls', {})),
+        ('provides_extras', lambda s: getattr(s, 'provides_extras', set())),
+    ]
+
+    for attr, getter in tested_attrs:
+        assert getter(metadata_in) == getter(metadata_out)
+
+
 def __maintainer_test_cases():
     attrs = {"name": "package",
              "version": "1.0",

From c34962d08168e0149a71485f1f71ddfd22146140 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 6 Nov 2018 11:48:47 -0500
Subject: [PATCH 7255/8469] Use write_field in write_pkg_file

This creates a wrapper function for writing fields in the PKG-INFO file,
both to simplify the syntax and to add a point where we can inject an
encoding function in order to support Python 2.7 compatibility.
---
 setuptools/dist.py | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ae9816fd47..b741c64880 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -123,15 +123,23 @@ def write_pkg_file(self, file):
     """
     version = self.get_metadata_version()
 
-    file.write('Metadata-Version: %s\n' % version)
-    file.write('Name: %s\n' % self.get_name())
-    file.write('Version: %s\n' % self.get_version())
-    file.write('Summary: %s\n' % self.get_description())
-    file.write('Home-page: %s\n' % self.get_url())
+    if six.PY2:
+        def write_field(key, value):
+            file.write("%s: %s\n" % (key, self._encode_field(value)))
+    else:
+        def write_field(key, value):
+            file.write("%s: %s\n" % (key, value))
+
+
+    write_field('Metadata-Version', str(version))
+    write_field('Name', self.get_name())
+    write_field('Version', self.get_version())
+    write_field('Summary', self.get_description())
+    write_field('Home-page', self.get_url())
 
     if version < StrictVersion('1.2'):
-        file.write('Author: %s\n' % self.get_contact())
-        file.write('Author-email: %s\n' % self.get_contact_email())
+        write_field('Author:', self.get_contact())
+        write_field('Author-email:', self.get_contact_email())
     else:
         optional_fields = (
             ('Author', 'author'),
@@ -142,28 +150,26 @@ def write_pkg_file(self, file):
 
         for field, attr in optional_fields:
             attr_val = getattr(self, attr)
-            if six.PY2:
-                attr_val = self._encode_field(attr_val)
 
             if attr_val is not None:
-                file.write('%s: %s\n' % (field, attr_val))
+                write_field(field, attr_val)
 
-    file.write('License: %s\n' % self.get_license())
+    write_field('License', self.get_license())
     if self.download_url:
-        file.write('Download-URL: %s\n' % self.download_url)
+        write_field('Download-URL', self.download_url)
     for project_url in self.project_urls.items():
-        file.write('Project-URL: %s, %s\n' % project_url)
+        write_field('Project-URL',  '%s, %s' % project_url)
 
     long_desc = rfc822_escape(self.get_long_description())
-    file.write('Description: %s\n' % long_desc)
+    write_field('Description', long_desc)
 
     keywords = ','.join(self.get_keywords())
     if keywords:
-        file.write('Keywords: %s\n' % keywords)
+        write_field('Keywords', keywords)
 
     if version >= StrictVersion('1.2'):
         for platform in self.get_platforms():
-            file.write('Platform: %s\n' % platform)
+            write_field('Platform', platform)
     else:
         self._write_list(file, 'Platform', self.get_platforms())
 
@@ -176,17 +182,17 @@ def write_pkg_file(self, file):
 
     # Setuptools specific for PEP 345
     if hasattr(self, 'python_requires'):
-        file.write('Requires-Python: %s\n' % self.python_requires)
+        write_field('Requires-Python', self.python_requires)
 
     # PEP 566
     if self.long_description_content_type:
-        file.write(
-            'Description-Content-Type: %s\n' %
+        write_field(
+            'Description-Content-Type',
             self.long_description_content_type
         )
     if self.provides_extras:
         for extra in self.provides_extras:
-            file.write('Provides-Extra: %s\n' % extra)
+            write_field('Provides-Extra', extra)
 
 
 sequence = tuple, list

From bef22678626f4e201ef1bb6c5bc753dd01e6bf5a Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 6 Nov 2018 11:51:42 -0500
Subject: [PATCH 7256/8469] Use an in-memory IO object instead of a temp file

Rather than writing to a file in a temporary directory, we can write to
and read from an in-memory buffer, now that the encoding functionality
in write_pkg_file is fixed.
---
 setuptools/tests/test_dist.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 36605ceabd..a7f4452b1a 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -12,6 +12,7 @@
 from .test_easy_install import make_nspkg_sdist
 
 import pytest
+import six
 
 
 def test_dist_fetch_build_egg(tmpdir):
@@ -120,20 +121,22 @@ def merge_dicts(d1, d2):
 
 
 @pytest.mark.parametrize('name,attrs', __read_test_cases())
-def test_read_metadata(name, attrs, tmpdir):
+def test_read_metadata(name, attrs):
     dist = Distribution(attrs)
     metadata_out = dist.metadata
     dist_class = metadata_out.__class__
 
     # Write to PKG_INFO and then load into a new metadata object
-    fn = tmpdir.mkdir('pkg_info')
-    fn_s = str(fn)
+    if six.PY2:
+        PKG_INFO = io.BytesIO()
+    else:
+        PKG_INFO = io.StringIO()
 
-    metadata_out.write_pkg_info(fn_s)
+    metadata_out.write_pkg_file(PKG_INFO)
 
+    PKG_INFO.seek(0)
     metadata_in = dist_class()
-    with io.open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f:
-        metadata_in.read_pkg_file(f)
+    metadata_in.read_pkg_file(PKG_INFO)
 
     tested_attrs = [
         ('name', dist_class.get_name),

From dfe1b3afb433c7e1d0679c005407ac12104e6141 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 17:15:22 -0500
Subject: [PATCH 7257/8469] Add upload fixture

This is a fixture to create an upload command with a patched version of
urlopen so that no HTTP queries are sent.
---
 setuptools/tests/test_upload.py | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index b18f83c8d0..1b70301b5a 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -32,6 +32,51 @@ def _parse_upload_body(body):
     return entries
 
 
+@pytest.fixture
+def patched_upload(tmpdir):
+    class Fix:
+        def __init__(self, cmd, urlopen):
+            self.cmd = cmd
+            self.urlopen = urlopen
+
+        def __iter__(self):
+            return iter((self.cmd, self.urlopen))
+
+        def get_uploaded_metadata(self):
+            request = self.urlopen.call_args_list[0][0][0]
+            body = request.data.decode('utf-8')
+            entries = dict(_parse_upload_body(body))
+
+            return entries
+
+    class ResponseMock(mock.Mock):
+        def getheader(self, name, default=None):
+            """Mocked getheader method for response object"""
+            return {
+                'content-type': 'text/plain; charset=utf-8',
+            }.get(name.lower(), default)
+
+    with mock.patch('setuptools.command.upload.urlopen') as urlopen:
+        urlopen.return_value = ResponseMock()
+        urlopen.return_value.getcode.return_value = 200
+        urlopen.return_value.read.return_value = b''
+
+        content = os.path.join(str(tmpdir), "content_data")
+
+        with open(content, 'w') as f:
+            f.write("Some content")
+
+        dist = Distribution()
+        dist.dist_files = [('sdist', '3.7.0', content)]
+
+        cmd = upload(dist)
+        cmd.announce = mock.Mock()
+        cmd.username = 'user'
+        cmd.password = 'hunter2'
+
+        yield Fix(cmd, urlopen)
+
+
 class TestUploadTest:
     @mock.patch('setuptools.command.upload.urlopen')
     def test_upload_metadata(self, patch, tmpdir):

From f4458afd8c83a233ae637af1d77e77404d2da1e5 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 17:21:05 -0500
Subject: [PATCH 7258/8469] Use the patched_upload fixture in upload_metadata

`test_upload_metadata` was written before the fixture, so this updates
the test to use the fixture.
---
 setuptools/tests/test_upload.py | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 1b70301b5a..caabb8866c 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -78,25 +78,13 @@ def getheader(self, name, default=None):
 
 
 class TestUploadTest:
-    @mock.patch('setuptools.command.upload.urlopen')
-    def test_upload_metadata(self, patch, tmpdir):
-        dist = Distribution()
-        dist.metadata.metadata_version = StrictVersion('2.1')
-
-        content = os.path.join(str(tmpdir), "test_upload_metadata_content")
-
-        with open(content, 'w') as f:
-            f.write("Some content")
-
-        dist.dist_files = [('xxx', '3.7', content)]
+    def test_upload_metadata(self, patched_upload):
+        cmd, patch = patched_upload
 
-        patch.return_value = mock.Mock()
-        patch.return_value.getcode.return_value = 200
+        # Set the metadata version to 2.1
+        cmd.distribution.metadata.metadata_version = '2.1'
 
-        cmd = upload(dist)
-        cmd.announce = mock.Mock()
-        cmd.username = 'user'
-        cmd.password = 'hunter2'
+        # Run the command
         cmd.ensure_finalized()
         cmd.run()
 
@@ -104,10 +92,7 @@ def test_upload_metadata(self, patch, tmpdir):
         patch.assert_called_once()
 
         # Make sure the metadata version is correct in the headers
-        request = patch.call_args_list[0][0][0]
-        body = request.data.decode('utf-8')
-
-        entries = dict(_parse_upload_body(body))
+        entries = patched_upload.get_uploaded_metadata()
         assert entries['metadata_version'] == '2.1'
 
 

From 7417740076af72f49705088009d0b21afea7dd98 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 11:43:21 -0500
Subject: [PATCH 7259/8469] Add test for invalid URLs in upload_file

---
 setuptools/tests/test_upload.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index caabb8866c..6f497f086c 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -95,7 +95,6 @@ def test_upload_metadata(self, patched_upload):
         entries = patched_upload.get_uploaded_metadata()
         assert entries['metadata_version'] == '2.1'
 
-
     def test_warns_deprecation(self):
         dist = Distribution()
         dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
@@ -129,3 +128,21 @@ def test_warns_deprecation_when_raising(self):
             "upload instead (https://pypi.org/p/twine/)",
             log.WARN
         )
+
+    @pytest.mark.parametrize('url', [
+        'https://example.com/a;parameter',    # Has parameters
+        'https://example.com/a?query',        # Has query
+        'https://example.com/a#fragment',     # Has fragment
+        'ftp://example.com',                  # Invalid scheme
+
+    ])
+    def test_upload_file_invalid_url(self, url, patched_upload):
+        patched_upload.urlopen.side_effect = Exception("Should not be reached")
+
+        cmd = patched_upload.cmd
+        cmd.repository = url
+
+        cmd.ensure_finalized()
+        with pytest.raises(AssertionError):
+            cmd.run()
+

From 77b661a9599225721ac416cc342d56d1afb105a1 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 15:43:08 -0500
Subject: [PATCH 7260/8469] Add test for HTTPError in upload_file

---
 setuptools/tests/test_upload.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 6f497f086c..129159a7b8 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -3,6 +3,7 @@
 import re
 
 from distutils import log
+from distutils.errors import DistutilsError
 from distutils.version import StrictVersion
 
 import pytest
@@ -146,3 +147,22 @@ def test_upload_file_invalid_url(self, url, patched_upload):
         with pytest.raises(AssertionError):
             cmd.run()
 
+    def test_upload_file_http_error(self, patched_upload):
+        patched_upload.urlopen.side_effect = six.moves.urllib.error.HTTPError(
+            'https://example.com',
+            404,
+            'File not found',
+            None,
+            None
+        )
+
+        cmd = patched_upload.cmd
+        cmd.ensure_finalized()
+
+        with pytest.raises(DistutilsError):
+            cmd.run()
+
+        cmd.announce.assert_any_call(
+            'Upload failed (404): File not found',
+            log.ERROR)
+

From 1bca7ffdea25ee7ae7d335d676b0804a2f467d52 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 16:22:41 -0500
Subject: [PATCH 7261/8469] Add test for OSError in upload_file

---
 setuptools/tests/test_upload.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 129159a7b8..6aaac0753b 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -166,3 +166,13 @@ def test_upload_file_http_error(self, patched_upload):
             'Upload failed (404): File not found',
             log.ERROR)
 
+    def test_upload_file_os_error(self, patched_upload):
+        patched_upload.urlopen.side_effect = OSError("Invalid")
+
+        cmd = patched_upload.cmd
+        cmd.ensure_finalized()
+
+        with pytest.raises(OSError):
+            cmd.run()
+
+        cmd.announce.assert_any_call('Invalid', log.ERROR)

From b5c9c5f42db36a07dc27d39c1be2a311cc567d99 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 16:23:13 -0500
Subject: [PATCH 7262/8469] Fix gpg signature code in upload_file

This fixes an issue where `distutils.spawn.spawn` was not available in
the ported upload_file, which is only used when signing the data.

This also adds a test that the gpg signature command is invoked and
included in the uploaded data.
---
 setuptools/command/upload.py    |  1 +
 setuptools/tests/test_upload.py | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 01fa026c2e..1851ed28b3 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -7,6 +7,7 @@
 
 from distutils import log
 from distutils.command import upload as orig
+from distutils.spawn import spawn
 
 from distutils.errors import DistutilsError
 
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 6aaac0753b..3a1bbba9b6 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -176,3 +176,29 @@ def test_upload_file_os_error(self, patched_upload):
             cmd.run()
 
         cmd.announce.assert_any_call('Invalid', log.ERROR)
+
+    @mock.patch('setuptools.command.upload.spawn')
+    def test_upload_file_gpg(self, spawn, patched_upload):
+        cmd, urlopen = patched_upload
+
+        cmd.sign = True
+        cmd.identity = "Alice"
+        cmd.dry_run = True
+        content_fname = cmd.distribution.dist_files[0][2]
+        signed_file = content_fname + '.asc'
+
+        with open(signed_file, 'wb') as f:
+            f.write("signed-data".encode('utf-8'))
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        # Make sure that GPG was called
+        spawn.assert_called_once_with([
+            "gpg", "--detach-sign", "--local-user", "Alice", "-a",
+            content_fname
+        ], dry_run=True)
+
+        # Read the 'signed' data that was transmitted
+        entries = patched_upload.get_uploaded_metadata()
+        assert entries['gpg_signature'] == 'signed-data'

From 727dd60f6a11f38d165250c543ba135687fa2e61 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 16:41:19 -0500
Subject: [PATCH 7263/8469] Fix bdist_rpm and bdist_dumb in upload_file

This fixes uploads when bdist_rpm or bdist_dumb are the command, both of
which insert a comment about what platform they are built for.
---
 setuptools/command/upload.py    |  1 +
 setuptools/tests/test_upload.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 1851ed28b3..99d86011b7 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -2,6 +2,7 @@
 import os
 import hashlib
 import getpass
+import platform
 
 from base64 import standard_b64encode
 
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 3a1bbba9b6..7bf8e31268 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -202,3 +202,24 @@ def test_upload_file_gpg(self, spawn, patched_upload):
         # Read the 'signed' data that was transmitted
         entries = patched_upload.get_uploaded_metadata()
         assert entries['gpg_signature'] == 'signed-data'
+
+    @pytest.mark.parametrize('bdist', ['bdist_rpm', 'bdist_dumb'])
+    @mock.patch('setuptools.command.upload.platform')
+    def test_bdist_rpm_upload(self, platform, bdist, patched_upload):
+        # Set the upload command to include bdist_rpm
+        cmd = patched_upload.cmd
+        dist_files = cmd.distribution.dist_files
+        dist_files = [(bdist,) + dist_files[0][1:]]
+        cmd.distribution.dist_files = dist_files
+
+        # Mock out the platform commands to make this platform-independent
+        platform.dist.return_value = ('redhat', '', '')
+
+        cmd.ensure_finalized()
+        cmd.run()
+
+        entries = patched_upload.get_uploaded_metadata()
+
+        assert entries['comment'].startswith(u'built for')
+        assert len(entries['comment']) > len(u'built for')
+

From fe2c9e4292699635c91174bc049aefe81bf6116c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 7 Nov 2018 17:07:58 -0500
Subject: [PATCH 7264/8469] Fix show_response behavior on Python 2

The `upload.show_response` feature was not added until Python 3. Rather
than backport it, it is now enabled only if supported.

This also adds a "smoke test" for the feature.
---
 setuptools/command/upload.py    | 8 +++++---
 setuptools/tests/test_upload.py | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 99d86011b7..f57fe796be 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -172,9 +172,11 @@ def upload_file(self, command, pyversion, filename):
             self.announce('Server response (%s): %s' % (status, reason),
                           log.INFO)
             if self.show_response:
-                text = self._read_pypi_response(result)
-                msg = '\n'.join(('-' * 75, text, '-' * 75))
-                self.announce(msg, log.INFO)
+                text = getattr(self, '_read_pypi_response',
+                               lambda x: None)(result)
+                if text is not None:
+                    msg = '\n'.join(('-' * 75, text, '-' * 75))
+                    self.announce(msg, log.INFO)
         else:
             msg = 'Upload failed (%s): %s' % (status, reason)
             self.announce(msg, log.ERROR)
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 7bf8e31268..319ed7a220 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -223,3 +223,12 @@ def test_bdist_rpm_upload(self, platform, bdist, patched_upload):
         assert entries['comment'].startswith(u'built for')
         assert len(entries['comment']) > len(u'built for')
 
+    def test_show_response_no_error(self, patched_upload):
+        # This test is just that show_response doesn't throw an error
+        # It is not really important what the printed response looks like
+        # in a deprecated command, but we don't want to introduce new
+        # errors when importing this function from distutils
+
+        patched_upload.cmd.show_response = True
+        patched_upload.cmd.ensure_finalized()
+        patched_upload.cmd.run()

From 08cac8609e2340ea09057640cd1d728f79488b99 Mon Sep 17 00:00:00 2001
From: Alex Hirzel <alex@hirzel.us>
Date: Fri, 9 Nov 2018 21:04:00 -0500
Subject: [PATCH 7265/8469] updated per comments from @pganssle in #1563

---
 pkg_resources/__init__.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index e6487be0a8..deea96b9ba 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2098,16 +2098,19 @@ def _handle_ns(packageName, path_item):
     if importer is None:
         return None
 
-    # capture warnings due to #1111
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
+    # use find_spec (PEP 451) and fall-back to find_module (PEP 302)
+    try:
+        loader = importer.find_spec(packageName).loader
+    except AttributeError:
         try:
-            loader = importer.find_module(packageName)
+            # capture warnings due to #1111
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore")
+                loader = importer.find_module(packageName)
         except AttributeError:
-            try:
-                loader = importer.find_spec(packageName).loader
-            except:
-                loader = None
+            # not a system module
+            loader = None
+
     if loader is None:
         return None
     module = sys.modules.get(packageName)

From 1047052e341d69c799e26ff889359e101c5e0499 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sat, 10 Nov 2018 19:55:12 +0000
Subject: [PATCH 7266/8469] Address review comments

---
 setuptools/command/sdist.py       | 12 ++++++------
 setuptools/tests/test_egg_info.py |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 347f88170f..dc25398147 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -6,7 +6,6 @@
 import contextlib
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import configparser
 
 from .py36compat import sdist_add_defaults
 
@@ -206,11 +205,12 @@ def check_license(self):
         """
 
         opts = self.distribution.get_option_dict('metadata')
-        try:
-            # ignore the source of the value
-            _, license_file = opts.get('license_file')
-        except TypeError:
-            log.debug("'license_file' attribute is not defined")
+
+        # ignore the source of the value
+        _, license_file = opts.get('license_file', (None, None))
+
+        if license_file is None:
+            log.debug("'license_file' option was not specified")
             return
 
         if not os.path.exists(license_file):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 76c31adadf..04a17308c8 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -529,8 +529,10 @@ def test_setup_cfg_license_file(
             env=environ,
         )
         egg_info_dir = os.path.join('.', 'foo.egg-info')
+
         with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
             sources_text = sources_file.read()
+
         if license_in_sources:
             assert 'LICENSE' in sources_text
         else:

From 28872fc9e7d15a1acf3bc557795c76c5e64dbad3 Mon Sep 17 00:00:00 2001
From: Deniz Taneli <7292227+dtaneli@users.noreply.github.com>
Date: Sat, 10 Nov 2018 20:00:45 +0000
Subject: [PATCH 7267/8469] Remove unnecessary parameters from the test

---
 setuptools/tests/test_egg_info.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 04a17308c8..7c862e6120 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -519,14 +519,10 @@ def test_setup_cfg_license_file(
             self, tmpdir_cwd, env, files, license_in_sources):
         self._create_project()
         build_files(files)
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
+
         environment.run_setup_py(
             cmd=['egg_info'],
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)])
         )
         egg_info_dir = os.path.join('.', 'foo.egg-info')
 

From 641183c8277136a8d82e0b50b059b4d65bba7f7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Nov 2018 12:40:03 -0500
Subject: [PATCH 7268/8469] Update roadmap

---
 docs/roadmap.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index d5a127e890..62689283f0 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -10,3 +10,6 @@ Setuptools has the following large-scale goals on the roadmap:
 - Deprecate and remove setup_requires and easy_install in
   favor of PEP 518 build requirements and pip install.
 - Adopt the Distutils package and stop monkeypatching stdlib.
+- Provide essential interfaces for installers such as pip to
+  support creation of "editable" installs without invoking
+  easy_install or creating egg-info.

From 73fcf86334a7f72e823d7f89672e99486eed28d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Nov 2018 12:43:19 -0500
Subject: [PATCH 7269/8469] Add another roadmap item about pkg_resources.

---
 docs/roadmap.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 62689283f0..8dc3862ee8 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -13,3 +13,5 @@ Setuptools has the following large-scale goals on the roadmap:
 - Provide essential interfaces for installers such as pip to
   support creation of "editable" installs without invoking
   easy_install or creating egg-info.
+- Deprecate pkg_resources in favor of other third-party and
+  stdlib libraries.

From 38f1e490b230da4bff3e2db9857faf7f7223c760 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 11 Nov 2018 13:13:33 -0500
Subject: [PATCH 7270/8469] Replace Roadmap with milestones.

---
 docs/roadmap.txt | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/docs/roadmap.txt b/docs/roadmap.txt
index 8dc3862ee8..147288f303 100644
--- a/docs/roadmap.txt
+++ b/docs/roadmap.txt
@@ -2,16 +2,6 @@
 Roadmap
 =======
 
-Setuptools has the following large-scale goals on the roadmap:
-
-- Mature declarative config to supersede imperative config in
-  all supported use-cases and harmonize with pyproject.toml
-  syntax.
-- Deprecate and remove setup_requires and easy_install in
-  favor of PEP 518 build requirements and pip install.
-- Adopt the Distutils package and stop monkeypatching stdlib.
-- Provide essential interfaces for installers such as pip to
-  support creation of "editable" installs without invoking
-  easy_install or creating egg-info.
-- Deprecate pkg_resources in favor of other third-party and
-  stdlib libraries.
+Setuptools maintains a series of `milestones
+<https://github.com/pypa/setuptools/milestones>`_ to track
+a roadmap of large-scale goals.

From 2b5b91332a01c665cab77ad7962e87525850d7f5 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 10:08:55 -0500
Subject: [PATCH 7271/8469] Remove bdist_rpm and bdist_dumb comment

This comment is not used anywhere and `platform.dist()` is deprecated.

See CPython PR #10414: https://github.com/python/cpython/pull/10414
and bpo-35186: https://bugs.python.org/issue35186
---
 setuptools/command/upload.py    | 10 ++--------
 setuptools/tests/test_upload.py | 20 --------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index f57fe796be..3b8cab5e06 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -102,14 +102,8 @@ def upload_file(self, command, pyversion, filename):
             'requires': meta.get_requires(),
             'obsoletes': meta.get_obsoletes(),
             }
-        comment = ''
-        if command == 'bdist_rpm':
-            dist, version, id = platform.dist()
-            if dist:
-                comment = 'built for %s %s' % (dist, version)
-        elif command == 'bdist_dumb':
-            comment = 'built for %s' % platform.platform(terse=1)
-        data['comment'] = comment
+
+        data['comment'] = ''
 
         if self.sign:
             data['gpg_signature'] = (os.path.basename(filename) + ".asc",
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 319ed7a220..9229bba172 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -203,26 +203,6 @@ def test_upload_file_gpg(self, spawn, patched_upload):
         entries = patched_upload.get_uploaded_metadata()
         assert entries['gpg_signature'] == 'signed-data'
 
-    @pytest.mark.parametrize('bdist', ['bdist_rpm', 'bdist_dumb'])
-    @mock.patch('setuptools.command.upload.platform')
-    def test_bdist_rpm_upload(self, platform, bdist, patched_upload):
-        # Set the upload command to include bdist_rpm
-        cmd = patched_upload.cmd
-        dist_files = cmd.distribution.dist_files
-        dist_files = [(bdist,) + dist_files[0][1:]]
-        cmd.distribution.dist_files = dist_files
-
-        # Mock out the platform commands to make this platform-independent
-        platform.dist.return_value = ('redhat', '', '')
-
-        cmd.ensure_finalized()
-        cmd.run()
-
-        entries = patched_upload.get_uploaded_metadata()
-
-        assert entries['comment'].startswith(u'built for')
-        assert len(entries['comment']) > len(u'built for')
-
     def test_show_response_no_error(self, patched_upload):
         # This test is just that show_response doesn't throw an error
         # It is not really important what the printed response looks like

From 6f50e58948b50edf7d02d4effa44a47fefc9f6b9 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 12:04:48 -0500
Subject: [PATCH 7272/8469] Fix minimum version for data_files

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 0edd68fabd..bca211bdc3 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2416,7 +2416,7 @@ package_data             section
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
-data_files               dict                                 40.5.0
+data_files               dict                                 40.6.0
 =======================  ===================================  =============== =====
 
 .. note::

From daa5968f43163651011604a793615d850aafb2eb Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 12:32:24 -0500
Subject: [PATCH 7273/8469] Prepare changelog entry for version 40.6.0

---
 CHANGES.rst                      | 20 ++++++++++++++++++++
 changelog.d/1395.doc.rst         |  1 -
 changelog.d/1456.doc.rst         |  1 -
 changelog.d/1519.change.rst      |  1 -
 changelog.d/1531.misc.rst        |  1 -
 changelog.d/1533.misc.rst        |  1 -
 changelog.d/1537.doc.rst         |  1 -
 changelog.d/1539.doc.rst         |  1 -
 changelog.d/1541.deprecation.rst |  1 -
 changelog.d/1545.feature.rst     |  1 -
 changelog.d/1552.doc.rst         |  1 -
 changelog.d/1553.doc.rst         |  1 -
 changelog.d/1554.change.rst      |  1 -
 changelog.d/1560.doc.rst         |  1 -
 changelog.d/1564.doc.rst         |  1 -
 changelog.d/1572.misc.rst        |  1 -
 changelog.d/1576.change.rst      |  1 -
 17 files changed, 20 insertions(+), 16 deletions(-)
 delete mode 100644 changelog.d/1395.doc.rst
 delete mode 100644 changelog.d/1456.doc.rst
 delete mode 100644 changelog.d/1519.change.rst
 delete mode 100644 changelog.d/1531.misc.rst
 delete mode 100644 changelog.d/1533.misc.rst
 delete mode 100644 changelog.d/1537.doc.rst
 delete mode 100644 changelog.d/1539.doc.rst
 delete mode 100644 changelog.d/1541.deprecation.rst
 delete mode 100644 changelog.d/1545.feature.rst
 delete mode 100644 changelog.d/1552.doc.rst
 delete mode 100644 changelog.d/1553.doc.rst
 delete mode 100644 changelog.d/1554.change.rst
 delete mode 100644 changelog.d/1560.doc.rst
 delete mode 100644 changelog.d/1564.doc.rst
 delete mode 100644 changelog.d/1572.misc.rst
 delete mode 100644 changelog.d/1576.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index ca07119d95..3929703679 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+v40.6.0
+-------
+
+* #1541: Officially deprecated the ``requires`` parameter in ``setup()``.
+* #1519: In ``pkg_resources.normalize_path``, additional path normalization is now performed to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.
+* #1545: Changed the warning class of all deprecation warnings; deprecation warning classes are no longer derived from ``DeprecationWarning`` and are thus visible by default.
+* #1554: ``build_meta.build_sdist`` now includes ``setup.py`` in source distributions by default.
+* #1576: Started monkey-patching ``get_metadata_version`` and ``read_pkg_file`` onto ``distutils.DistributionMetadata`` to retain the correct version on the ``PKG-INFO`` file in the (deprecated) ``upload`` command.
+* #1533: Restricted the ``recursive-include setuptools/_vendor`` to contain only .py and .txt files.
+* #1395: Changed Pyrex references to Cython in the documentation.
+* #1456: Documented that the ``rpmbuild`` packages is required for the ``bdist_rpm`` command.
+* #1537: Documented how to use ``setup.cfg`` for ``src/ layouts``
+* #1539: Added minimum version column in ``setup.cfg`` metadata table.
+* #1552: Fixed a minor typo in the python 2/3 compatibility documentation.
+* #1553: Updated installation instructions to point to ``pip install`` instead of ``ez_setup.py``.
+* #1560: Updated ``setuptools`` distribution documentation to remove some outdated information.
+* #1564: Documented ``setup.cfg`` minimum version for version and project_urls.
+* #1572: Added the ``concurrent.futures`` backport ``futures`` to the Python 2.7 test suite requirements.
+
+
 v40.5.0
 -------
 
diff --git a/changelog.d/1395.doc.rst b/changelog.d/1395.doc.rst
deleted file mode 100644
index 346041ce41..0000000000
--- a/changelog.d/1395.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document building Cython projects instead of Pyrex
diff --git a/changelog.d/1456.doc.rst b/changelog.d/1456.doc.rst
deleted file mode 100644
index b01d533800..0000000000
--- a/changelog.d/1456.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Documented that the ``rpmbuild`` packages is required for the ``bdist_rpm`` command.
diff --git a/changelog.d/1519.change.rst b/changelog.d/1519.change.rst
deleted file mode 100644
index a0e8a6f14a..0000000000
--- a/changelog.d/1519.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``pkg_resources.normalize_path``, additional path normalization is now performed to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.
diff --git a/changelog.d/1531.misc.rst b/changelog.d/1531.misc.rst
deleted file mode 100644
index cc51940d2e..0000000000
--- a/changelog.d/1531.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Converted Python version-specific tests to use ``skipif`` instead of ``xfail``, and removed Python 2.6-specific code from the tests.
diff --git a/changelog.d/1533.misc.rst b/changelog.d/1533.misc.rst
deleted file mode 100644
index 934df49484..0000000000
--- a/changelog.d/1533.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restrict the `recursive-include setuptools/_vendor` to contain only .py and .txt files
diff --git a/changelog.d/1537.doc.rst b/changelog.d/1537.doc.rst
deleted file mode 100644
index 02d15eae17..0000000000
--- a/changelog.d/1537.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document how to use setup.cfg for src/ layouts.
\ No newline at end of file
diff --git a/changelog.d/1539.doc.rst b/changelog.d/1539.doc.rst
deleted file mode 100644
index 220f65197d..0000000000
--- a/changelog.d/1539.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added minumum version column in ``setup.cfg`` metadata table.
diff --git a/changelog.d/1541.deprecation.rst b/changelog.d/1541.deprecation.rst
deleted file mode 100644
index cc07aaa78b..0000000000
--- a/changelog.d/1541.deprecation.rst
+++ /dev/null
@@ -1 +0,0 @@
-Officially deprecated the ``requires`` parameter in ``setup()``.
diff --git a/changelog.d/1545.feature.rst b/changelog.d/1545.feature.rst
deleted file mode 100644
index 70591d56d9..0000000000
--- a/changelog.d/1545.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Changed the warning class of all deprecation warnings; deprecation warning classes are no longer derived from ``DeprecationWarning`` and are thus visible by default.
diff --git a/changelog.d/1552.doc.rst b/changelog.d/1552.doc.rst
deleted file mode 100644
index 43e0e62d10..0000000000
--- a/changelog.d/1552.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a minor typo in the python 2/3 compatibility documentation.
diff --git a/changelog.d/1553.doc.rst b/changelog.d/1553.doc.rst
deleted file mode 100644
index 2f68b95e3c..0000000000
--- a/changelog.d/1553.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update installation instructions to point to ``pip install`` instead of ``ez_setup.py``.
\ No newline at end of file
diff --git a/changelog.d/1554.change.rst b/changelog.d/1554.change.rst
deleted file mode 100644
index d55c042ce4..0000000000
--- a/changelog.d/1554.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-``build_meta.build_sdist`` now includes ``setup.py`` in source distributions by default
diff --git a/changelog.d/1560.doc.rst b/changelog.d/1560.doc.rst
deleted file mode 100644
index 8288aa4e95..0000000000
--- a/changelog.d/1560.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-update ``setuptools`` distribution documentation to mimic packaging.python.org tutorial.
\ No newline at end of file
diff --git a/changelog.d/1564.doc.rst b/changelog.d/1564.doc.rst
deleted file mode 100644
index 37494a2650..0000000000
--- a/changelog.d/1564.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document setup.cfg minimum version for version and project_urls
diff --git a/changelog.d/1572.misc.rst b/changelog.d/1572.misc.rst
deleted file mode 100644
index aa3ab7ae9e..0000000000
--- a/changelog.d/1572.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added the ``concurrent.futures`` backport ``futures`` to the Python 2.7 test suite requirements.
diff --git a/changelog.d/1576.change.rst b/changelog.d/1576.change.rst
deleted file mode 100644
index 85c578ed4f..0000000000
--- a/changelog.d/1576.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Started monkey-patching ``get_metadata_version`` and ``read_pkg_file`` onto ``distutils.DistributionMetadata`` to retain the correct version on the ``PKG-INFO`` file in the (deprecated) ``upload`` command.

From 283ebe24799a4e2dfbc38085ef6a85e05de1dac0 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 15:09:59 -0500
Subject: [PATCH 7274/8469] =?UTF-8?q?Bump=20version:=2040.5.0=20=E2=86=92?=
 =?UTF-8?q?=2040.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5f7abd3940..fd7e8cc987 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.5.0
+current_version = 40.6.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index cdb4ec7999..569730d3cb 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.5.0",
+    version="40.6.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 4f167f0fe532764fd3b19b0386c621b8f35ebf9e Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 15:57:45 -0500
Subject: [PATCH 7275/8469] Fix Travis test for pyc files in egg-info

`!` is a special character in YAML syntax, so this was being interpreted
as `grep pyc ...`, not `! grep pyc ...`

I've also added the same `pyc` test to the normal tests.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 442e3ec29f..d1febccbdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ jobs:
     after_success: true
     before_deploy:
       - python bootstrap.py
-      - ! grep pyc setuptools.egg-info/SOURCES.txt
+      - "! grep pyc setuptools.egg-info/SOURCES.txt"
     deploy:
       provider: pypi
       on:
@@ -60,6 +60,7 @@ install:
 
 # update egg_info based on setup.py in checkout
 - python bootstrap.py
+- "! grep pyc setuptools.egg-info/SOURCES.txt"
 
 script:
   - |

From ac3cee396ff93f66afa86bc6e3aa3da3a2667514 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 22:32:51 -0500
Subject: [PATCH 7276/8469] Fix issue with missing author metadata

Prior to this patch, if the author or author_email were omitted from
`setup`, a malformed `PKG-INFO` would be created.
---
 changelog.d/1590.change.rst   |  1 +
 setuptools/dist.py            |  4 ++--
 setuptools/tests/test_dist.py | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1590.change.rst

diff --git a/changelog.d/1590.change.rst b/changelog.d/1590.change.rst
new file mode 100644
index 0000000000..6d2a9140fd
--- /dev/null
+++ b/changelog.d/1590.change.rst
@@ -0,0 +1 @@
+Fixed regression where packages without ``author`` or ``author_email`` fields generated malformed package metadata.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b741c64880..7062ae8d8c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -138,8 +138,8 @@ def write_field(key, value):
     write_field('Home-page', self.get_url())
 
     if version < StrictVersion('1.2'):
-        write_field('Author:', self.get_contact())
-        write_field('Author-email:', self.get_contact_email())
+        write_field('Author', self.get_contact())
+        write_field('Author-email', self.get_contact_email())
     else:
         optional_fields = (
             ('Author', 'author'),
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index a7f4452b1a..170d27ed08 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -115,6 +115,20 @@ def merge_dicts(d1, d2):
             merge_dicts(base_attrs, {
                 'provides_extras': ['foo', 'bar']
         }), marks=pytest.mark.xfail(reason="provides_extras not read")),
+        ('Missing author, missing author e-mail',
+         {'name': 'foo', 'version': '1.0.0'}),
+        ('Missing author',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author_email': 'snorri@sturluson.name'}),
+        ('Missing author e-mail',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author': 'Snorri Sturluson'}),
+        ('Missing author',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author': 'Snorri Sturluson'}),
     ]
 
     return test_cases
@@ -141,6 +155,8 @@ def test_read_metadata(name, attrs):
     tested_attrs = [
         ('name', dist_class.get_name),
         ('version', dist_class.get_version),
+        ('author', dist_class.get_contact),
+        ('author_email', dist_class.get_contact_email),
         ('metadata_version', dist_class.get_metadata_version),
         ('provides', dist_class.get_provides),
         ('description', dist_class.get_description),

From 1935a9df8ad4f01520431691a50b365057cbdfb7 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 22:54:31 -0500
Subject: [PATCH 7277/8469] Update changelog for version 40.6.1

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1590.change.rst | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 changelog.d/1590.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 3929703679..7a3e8743f2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.6.1
+-------
+
+* #1590: Fixed regression where packages without ``author`` or ``author_email`` fields generated malformed package metadata.
+
+
 v40.6.0
 -------
 
diff --git a/changelog.d/1590.change.rst b/changelog.d/1590.change.rst
deleted file mode 100644
index 6d2a9140fd..0000000000
--- a/changelog.d/1590.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed regression where packages without ``author`` or ``author_email`` fields generated malformed package metadata.

From ad80b390b1a01be5db1c97c4b86dce1e90d25f21 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 12 Nov 2018 22:55:06 -0500
Subject: [PATCH 7278/8469] =?UTF-8?q?Bump=20version:=2040.6.0=20=E2=86=92?=
 =?UTF-8?q?=2040.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index fd7e8cc987..9e12b655d5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.0
+current_version = 40.6.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 569730d3cb..f24b8e746d 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.0",
+    version="40.6.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From ba7698287094f7274ae7cbabaf6baedc175ac213 Mon Sep 17 00:00:00 2001
From: Oleg Sharov <o.sharov@gmail.com>
Date: Tue, 13 Nov 2018 12:52:43 +0400
Subject: [PATCH 7279/8469] import internal version of six

---
 setuptools/command/upload.py    | 6 +++---
 setuptools/tests/test_dist.py   | 3 +--
 setuptools/tests/test_upload.py | 2 +-
 tests/manual_test.py            | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 3b8cab5e06..dd17f7a925 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -12,9 +12,9 @@
 
 from distutils.errors import DistutilsError
 
-from six.moves.urllib.request import urlopen, Request
-from six.moves.urllib.error import HTTPError
-from six.moves.urllib.parse import urlparse
+from setuptools.extern.six.moves.urllib.request import urlopen, Request
+from setuptools.extern.six.moves.urllib.error import HTTPError
+from setuptools.extern.six.moves.urllib.parse import urlparse
 
 class upload(orig.upload):
     """
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 170d27ed08..cf830b437d 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -7,13 +7,12 @@
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
+from setuptools.extern import six
 
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
 
 import pytest
-import six
-
 
 def test_dist_fetch_build_egg(tmpdir):
     """
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 9229bba172..cc0e8a0d94 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -7,10 +7,10 @@
 from distutils.version import StrictVersion
 
 import pytest
-import six
 
 from setuptools.command.upload import upload
 from setuptools.dist import Distribution
+from setuptools.extern import six
 
 
 def _parse_upload_body(body):
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 52295f9a56..99db4b0143 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -8,7 +8,7 @@
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
 
-from six.moves import urllib
+from setuptools.extern.six.moves import urllib
 
 
 def _system_call(*args):

From 9f547fe6a30d544f52f8201ba89cff36f79d792d Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 13 Nov 2018 10:33:35 +0100
Subject: [PATCH 7280/8469] add a test to catch unvendored dependencies

---
 setuptools/tests/test_virtualenv.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index e511c91816..7b5fea1738 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,3 +1,4 @@
+import distutils.command
 import glob
 import os
 import sys
@@ -134,3 +135,14 @@ def sdist(distname, version):
         'python setup.py test -s test',
     )).format(tmpdir=tmpdir))
     assert tmpdir.join('success').check()
+
+
+def test_no_missing_dependencies(bare_virtualenv):
+    """
+    Quick and dirty test to ensure all external dependencies are vendored.
+    """
+    for command in ('upload',):#sorted(distutils.command.__all__):
+        bare_virtualenv.run(' && '.join((
+            'cd {source}',
+            'python setup.py {command} -h',
+        )).format(command=command, source=SOURCE_DIR))

From 7d96d92ab588a245abc8e1f0d67f8a42112fb983 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 13 Nov 2018 10:36:20 +0100
Subject: [PATCH 7281/8469] add news entry

---
 changelog.d/1592.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1592.change.rst

diff --git a/changelog.d/1592.change.rst b/changelog.d/1592.change.rst
new file mode 100644
index 0000000000..028f31e0f5
--- /dev/null
+++ b/changelog.d/1592.change.rst
@@ -0,0 +1 @@
+Fix invalid dependency on external six module (instead of vendored version).

From b62705a84ab599a2feff059ececd33800f364555 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 13 Nov 2018 10:38:41 +0100
Subject: [PATCH 7282/8469] =?UTF-8?q?Bump=20version:=2040.6.1=20=E2=86=92?=
 =?UTF-8?q?=2040.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1592.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1592.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 7a3e8743f2..dc26cb4d48 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.6.2
+-------
+
+* #1592: Fix invalid dependency on external six module (instead of vendored version).
+
+
 v40.6.1
 -------
 
diff --git a/changelog.d/1592.change.rst b/changelog.d/1592.change.rst
deleted file mode 100644
index 028f31e0f5..0000000000
--- a/changelog.d/1592.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix invalid dependency on external six module (instead of vendored version).
diff --git a/setup.cfg b/setup.cfg
index 9e12b655d5..ace8038854 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.1
+current_version = 40.6.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index f24b8e746d..44b7edf53f 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.1",
+    version="40.6.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From ed22402b7b41f608eaacebaae67c805503904f7d Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Wed, 14 Nov 2018 18:07:37 +0000
Subject: [PATCH 7283/8469] Backend should not say that setuptools is needed to
 build

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

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 0067a7ac35..463d3757a3 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -112,12 +112,12 @@ def _get_immediate_subdirectories(a_dir):
 
 def get_requires_for_build_wheel(config_settings=None):
     config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings, requirements=['setuptools', 'wheel'])
+    return _get_build_requires(config_settings, requirements=['wheel'])
 
 
 def get_requires_for_build_sdist(config_settings=None):
     config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings, requirements=['setuptools'])
+    return _get_build_requires(config_settings, requirements=[])
 
 
 def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):

From f524f83eac216a046041122793fdd0ba74495cb0 Mon Sep 17 00:00:00 2001
From: Paul Moore <p.f.moore@gmail.com>
Date: Wed, 14 Nov 2018 18:30:18 +0000
Subject: [PATCH 7284/8469] Fix the tests

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

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 712e11498e..2a07944696 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -112,13 +112,13 @@ def build_backend(tmpdir, request):
 
 def test_get_requires_for_build_wheel(build_backend):
     actual = build_backend.get_requires_for_build_wheel()
-    expected = ['six', 'setuptools', 'wheel']
+    expected = ['six', 'wheel']
     assert sorted(actual) == sorted(expected)
 
 
 def test_get_requires_for_build_sdist(build_backend):
     actual = build_backend.get_requires_for_build_sdist()
-    expected = ['six', 'setuptools']
+    expected = ['six']
     assert sorted(actual) == sorted(expected)
 
 

From 4de8dc801004440310db8fffa3da0f76b05a2a1e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 3 Dec 2018 18:41:48 -0500
Subject: [PATCH 7285/8469] Add link to Tidelift Professional support in docs

---
 docs/_templates/indexsidebar.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 80002d0871..b8c6148e1f 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -6,3 +6,10 @@ <h3>Download</h3>
 <h3>Questions? Suggestions? Contributions?</h3>
 
 <p>Visit the <a href="https://github.com/pypa/setuptools">Setuptools project page</a> </p>
+
+<h3 class="donation">Professional support</h3>
+
+<p>
+Professionally-supported {{ project }} is available with the
+<a href="https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme">Tidelift Subscription</a>.
+</p>

From 15789c14939f1c441c95963419e1b3f941a2831d Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 5 Dec 2018 21:46:25 +0200
Subject: [PATCH 7286/8469] bpo-34738: Add directory entries in ZIP files
 created by distutils. (GH-9419)

---
 archive_util.py            |  8 ++++++++
 tests/test_archive_util.py | 13 ++++++-------
 tests/test_bdist_dumb.py   |  2 +-
 tests/test_sdist.py        | 12 ++++++++++--
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index 78ae5757c3..b002dc3b84 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -166,7 +166,15 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
                 zip = zipfile.ZipFile(zip_filename, "w",
                                       compression=zipfile.ZIP_STORED)
 
+            if base_dir != os.curdir:
+                path = os.path.normpath(os.path.join(base_dir, ''))
+                zip.write(path, path)
+                log.info("adding '%s'", path)
             for dirpath, dirnames, filenames in os.walk(base_dir):
+                for name in dirnames:
+                    path = os.path.normpath(os.path.join(dirpath, name, ''))
+                    zip.write(path, path)
+                    log.info("adding '%s'", path)
                 for name in filenames:
                     path = os.path.normpath(os.path.join(dirpath, name))
                     if os.path.isfile(path):
diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index 14ba4ca34b..e9aad0e40f 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -122,12 +122,13 @@ def _tarinfo(self, path):
         try:
             names = tar.getnames()
             names.sort()
-            return tuple(names)
+            return names
         finally:
             tar.close()
 
-    _created_files = ('dist', 'dist/file1', 'dist/file2',
-                      'dist/sub', 'dist/sub/file3', 'dist/sub2')
+    _zip_created_files = ['dist/', 'dist/file1', 'dist/file2',
+                          'dist/sub/', 'dist/sub/file3', 'dist/sub2/']
+    _created_files = [p.rstrip('/') for p in _zip_created_files]
 
     def _create_files(self):
         # creating something to tar
@@ -244,8 +245,7 @@ def test_make_zipfile(self):
         tarball = base_name + '.zip'
         self.assertTrue(os.path.exists(tarball))
         with zipfile.ZipFile(tarball) as zf:
-            self.assertEqual(sorted(zf.namelist()),
-                             ['dist/file1', 'dist/file2', 'dist/sub/file3'])
+            self.assertEqual(sorted(zf.namelist()), self._zip_created_files)
 
     @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
     def test_make_zipfile_no_zlib(self):
@@ -271,8 +271,7 @@ def fake_zipfile(*a, **kw):
                          [((tarball, "w"), {'compression': zipfile.ZIP_STORED})])
         self.assertTrue(os.path.exists(tarball))
         with zipfile.ZipFile(tarball) as zf:
-            self.assertEqual(sorted(zf.namelist()),
-                             ['dist/file1', 'dist/file2', 'dist/sub/file3'])
+            self.assertEqual(sorted(zf.namelist()), self._zip_created_files)
 
     def test_check_archive_formats(self):
         self.assertEqual(check_archive_formats(['gztar', 'xxx', 'zip']),
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py
index c8ccdc2383..01a233bce3 100644
--- a/tests/test_bdist_dumb.py
+++ b/tests/test_bdist_dumb.py
@@ -84,7 +84,7 @@ def test_simple_built(self):
         finally:
             fp.close()
 
-        contents = sorted(os.path.basename(fn) for fn in contents)
+        contents = sorted(filter(None, map(os.path.basename, contents)))
         wanted = ['foo-0.1-py%s.%s.egg-info' % sys.version_info[:2], 'foo.py']
         if not sys.dont_write_bytecode:
             wanted.append('foo.%s.pyc' % sys.implementation.cache_tag)
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 5444b815a8..23db126959 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -128,7 +128,9 @@ def test_prune_file_list(self):
             zip_file.close()
 
         # making sure everything has been pruned correctly
-        self.assertEqual(len(content), 4)
+        expected = ['', 'PKG-INFO', 'README', 'setup.py',
+                    'somecode/', 'somecode/__init__.py']
+        self.assertEqual(sorted(content), ['fake-1.0/' + x for x in expected])
 
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     @unittest.skipIf(find_executable('tar') is None,
@@ -226,7 +228,13 @@ def test_add_defaults(self):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEqual(len(content), 12)
+        expected = ['', 'PKG-INFO', 'README', 'buildout.cfg',
+                    'data/', 'data/data.dt', 'inroot.txt',
+                    'scripts/', 'scripts/script.py', 'setup.py',
+                    'some/', 'some/file.txt', 'some/other_file.txt',
+                    'somecode/', 'somecode/__init__.py', 'somecode/doc.dat',
+                    'somecode/doc.txt']
+        self.assertEqual(sorted(content), ['fake-1.0/' + x for x in expected])
 
         # checking the MANIFEST
         f = open(join(self.tmp_dir, 'MANIFEST'))

From 758eab35155b97c364d8bf40654367fcb8785379 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Dec 2018 14:43:20 -0500
Subject: [PATCH 7287/8469] Add changelog entry. Ref #1594.

---
 changelog.d/1594.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1594.change.rst

diff --git a/changelog.d/1594.change.rst b/changelog.d/1594.change.rst
new file mode 100644
index 0000000000..91a0c28c56
--- /dev/null
+++ b/changelog.d/1594.change.rst
@@ -0,0 +1 @@
+PEP 517 backend no longer declares setuptools as a dependency as it can be assumed.

From 1c1c9152abcb8b1b6a13f1cfb4744f8d73016876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Dec 2018 14:45:14 -0500
Subject: [PATCH 7288/8469] =?UTF-8?q?Bump=20version:=2040.6.2=20=E2=86=92?=
 =?UTF-8?q?=2040.6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1594.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1594.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index dc26cb4d48..48a176a815 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.6.3
+-------
+
+* #1594: PEP 517 backend no longer declares setuptools as a dependency as it can be assumed.
+
+
 v40.6.2
 -------
 
diff --git a/changelog.d/1594.change.rst b/changelog.d/1594.change.rst
deleted file mode 100644
index 91a0c28c56..0000000000
--- a/changelog.d/1594.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-PEP 517 backend no longer declares setuptools as a dependency as it can be assumed.
diff --git a/setup.cfg b/setup.cfg
index ace8038854..57ab623435 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.2
+current_version = 40.6.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 44b7edf53f..67d5691d3b 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.2",
+    version="40.6.3",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 7843688bc33dd4e13e10130bc49da4c290fe7d7f Mon Sep 17 00:00:00 2001
From: Dmitry Kuznetsov <jorikdima@gmail.com>
Date: Tue, 11 Dec 2018 20:35:24 -0800
Subject: [PATCH 7289/8469] Don't keep file modes for package data.

---
 changelog.d/1424.change.rst    | 1 +
 setuptools/command/build_py.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1424.change.rst

diff --git a/changelog.d/1424.change.rst b/changelog.d/1424.change.rst
new file mode 100644
index 0000000000..361997ddd6
--- /dev/null
+++ b/changelog.d/1424.change.rst
@@ -0,0 +1 @@
+Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag.
\ No newline at end of file
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index b0314fd413..6fc0a4e46d 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -120,7 +120,7 @@ def build_package_data(self):
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
                 srcfile = os.path.join(src_dir, filename)
-                outf, copied = self.copy_file(srcfile, target)
+                outf, copied = self.copy_file(srcfile, target, preserve_mode=False)
                 srcfile = os.path.abspath(srcfile)
                 if (copied and
                         srcfile in self.distribution.convert_2to3_doctests):

From 08cdccef121eae198d719d39fbeb43b19180d99a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Dec 2018 15:10:56 -0500
Subject: [PATCH 7290/8469] Call index.download, covering more code. Split test
 into two.

---
 setuptools/tests/test_packageindex.py | 53 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 7c2f2c84d6..1f6bc7979a 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -224,40 +224,43 @@ def test_egg_fragment(self):
             assert dists[0].version == ''
             assert dists[1].version == vc
 
-
-    def test_download_git(self):
-        index = setuptools.package_index.PackageIndex(
-            hosts=('www.example.com',)
-        )
-
-        index._vcs_split_rev_from_url = mock.Mock()
-        url = 'https://example.com/bar'
-        rev = '2995'
-
-        index._vcs_split_rev_from_url.return_value = (url, rev)
-
-        filename = "somefile.py"
+    def test_download_git_with_rev(self, tmpdir):
+        url = 'git+https://github.example/group/project@master#egg=foo'
+        index = setuptools.package_index.PackageIndex()
 
         with mock.patch("os.system") as os_system_mock:
-
-            result = index._download_git(url, filename)
+            result = index.download(url, str(tmpdir))
 
         os_system_mock.assert_called()
 
-        assert os_system_mock.call_args_list[0][0] \
-            == ("git clone --quiet %s %s" % (url, filename), )
-
-        assert os_system_mock.call_args_list[1][0] \
-            == ("(cd %s && git checkout --quiet %s)" % (filename, rev), )
-        assert result == filename
-
-        index._vcs_split_rev_from_url.return_value = (url, None)
+        expected_dir = str(tmpdir / 'project@master')
+        expected = (
+            'git clone --quiet '
+            'https://github.example/group/project {expected_dir}'
+        ).format(**locals())
+        first_call_args = os_system_mock.call_args_list[0][0]
+        assert first_call_args == (expected,)
+
+        tmpl = '(cd {expected_dir} && git checkout --quiet master)'
+        expected = tmpl.format(**locals())
+        assert os_system_mock.call_args_list[1][0] == (expected,)
+        assert result == expected_dir
+
+    def test_download_git_no_rev(self, tmpdir):
+        url = 'git+https://github.example/group/project#egg=foo'
+        index = setuptools.package_index.PackageIndex()
 
         with mock.patch("os.system") as os_system_mock:
+            result = index.download(url, str(tmpdir))
 
-            index._download_git(url, filename)
+        os_system_mock.assert_called()
 
-        os_system_mock.assert_called_once_with("git clone --quiet %s %s" % (url, filename))
+        expected_dir = str(tmpdir / 'project')
+        expected = (
+            'git clone --quiet '
+            'https://github.example/group/project {expected_dir}'
+        ).format(**locals())
+        os_system_mock.assert_called_once_with(expected)
 
 
 class TestContentCheckers:

From b431aef3a682a5e22d37568446b9cca1b14a2bf5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Dec 2018 15:14:09 -0500
Subject: [PATCH 7291/8469] Update changelog. Ref #1544.

---
 changelog.d/1544.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1544.change.rst

diff --git a/changelog.d/1544.change.rst b/changelog.d/1544.change.rst
new file mode 100644
index 0000000000..748b64e1c2
--- /dev/null
+++ b/changelog.d/1544.change.rst
@@ -0,0 +1 @@
+Added tests for PackageIndex.download (for git URLs).

From 3a351aa00e2110c3b3df0302b1ed6bcf66a1f8d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 23 Sep 2018 12:32:40 -0400
Subject: [PATCH 7292/8469] Remove use of splituser in packag_index.py. Fixes
 #1499.

---
 setuptools/package_index.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1608b91ace..7e9517cefa 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -850,13 +850,16 @@ def _download_html(self, url, headers, filename):
 
     def _download_svn(self, url, filename):
         warnings.warn("SVN download support is deprecated", UserWarning)
+        def splituser(host):
+            user, delim, host = host.rpartition('@')
+            return user, host
         url = url.split('#', 1)[0]  # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
             scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/', 1)
-                auth, host = urllib.parse.splituser(netloc)
+                auth, host = splituser(netloc)
                 if auth:
                     if ':' in auth:
                         user, pw = auth.split(':', 1)
@@ -1047,15 +1050,16 @@ def find_credential(self, url):
 def open_with_auth(url, opener=urllib.request.urlopen):
     """Open a urllib2 request, handling HTTP authentication"""
 
-    scheme, netloc, path, params, query, frag = urllib.parse.urlparse(url)
+    parsed = urllib.parse.urlparse(url)
+    scheme, netloc, path, params, query, frag = parsed
 
     # Double scheme does not raise on Mac OS X as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
     if netloc.endswith(':'):
         raise http_client.InvalidURL("nonnumeric port: ''")
 
-    if scheme in ('http', 'https'):
-        auth, host = urllib.parse.splituser(netloc)
+    if scheme in ('http', 'https') and parsed.username:
+        auth = ':'.join((parsed.username, parsed.password))
     else:
         auth = None
 
@@ -1068,7 +1072,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        parts = scheme, host, path, params, query, frag
+        parts = scheme, parsed.hostname, path, params, query, frag
         new_url = urllib.parse.urlunparse(parts)
         request = urllib.request.Request(new_url)
         request.add_header("Authorization", auth)
@@ -1082,7 +1086,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
         s2, h2, path2, param2, query2, frag2 = urllib.parse.urlparse(fp.url)
-        if s2 == scheme and h2 == host:
+        if s2 == scheme and h2 == parsed.hostname:
             parts = s2, netloc, path2, param2, query2, frag2
             fp.url = urllib.parse.urlunparse(parts)
 

From cafe49ae0c7c4914c469d8bd368185aebc29b4ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Oct 2018 10:55:04 -0400
Subject: [PATCH 7293/8469] Add changelog

---
 changelog.d/1499.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1499.change.rst

diff --git a/changelog.d/1499.change.rst b/changelog.d/1499.change.rst
new file mode 100644
index 0000000000..10e4db6824
--- /dev/null
+++ b/changelog.d/1499.change.rst
@@ -0,0 +1 @@
+``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.

From 42a792c3a4047d79027f7078a72238d5fb60294b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Dec 2018 20:24:46 -0500
Subject: [PATCH 7294/8469] Add test for download_svn, improving coverage on
 patch

---
 setuptools/tests/test_packageindex.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 1f6bc7979a..b727668287 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -262,6 +262,22 @@ def test_download_git_no_rev(self, tmpdir):
         ).format(**locals())
         os_system_mock.assert_called_once_with(expected)
 
+    def test_download_svn(self, tmpdir):
+        url = 'svn+https://svn.example/project#egg=foo'
+        index = setuptools.package_index.PackageIndex()
+
+        with mock.patch("os.system") as os_system_mock:
+            result = index.download(url, str(tmpdir))
+
+        os_system_mock.assert_called()
+
+        expected_dir = str(tmpdir / 'project')
+        expected = (
+            'svn checkout -q '
+            'svn+https://svn.example/project {expected_dir}'
+        ).format(**locals())
+        os_system_mock.assert_called_once_with(expected)
+
 
 class TestContentCheckers:
     def test_md5(self):

From 95c0e2810d32cfe69d84f5af41f7874fb57facca Mon Sep 17 00:00:00 2001
From: Paul Ganssle <pganssle@users.noreply.github.com>
Date: Mon, 17 Dec 2018 02:59:02 -0500
Subject: [PATCH 7295/8469] bpo-35186: Remove "built with" comment in setup.py
 upload (GH-10414)

platform.dist() is deprecated and slated for removal in Python 3.8. The
upload command itself should also not be used to upload to PyPI, but
while it continues to exist it should not use deprecated functions.
---
 command/upload.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index 32dda359ba..613ea71129 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -121,14 +121,8 @@ def upload_file(self, command, pyversion, filename):
             'requires': meta.get_requires(),
             'obsoletes': meta.get_obsoletes(),
             }
-        comment = ''
-        if command == 'bdist_rpm':
-            dist, version, id = platform.dist()
-            if dist:
-                comment = 'built for %s %s' % (dist, version)
-        elif command == 'bdist_dumb':
-            comment = 'built for %s' % platform.platform(terse=1)
-        data['comment'] = comment
+
+        data['comment'] = ''
 
         if self.sign:
             data['gpg_signature'] = (os.path.basename(filename) + ".asc",

From f7d1e8f497ec20e55a7757e34d0a6229642ba59a Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 18 Dec 2018 16:17:56 +0100
Subject: [PATCH 7296/8469] bpo-10496: distutils check_environ() handles
 getpwuid() error (GH-10931)

check_environ() of distutils.utils now catchs KeyError on calling
pwd.getpwuid(): don't create the HOME environment variable in this
case.
---
 tests/test_util.py | 34 +++++++++++++++++++++++++---------
 util.py            |  9 +++++++--
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index e2fc380958..bf0d4333f9 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -4,6 +4,7 @@
 import unittest
 from copy import copy
 from test.support import run_unittest
+from unittest import mock
 
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
@@ -234,20 +235,35 @@ def _join(*path):
 
     def test_check_environ(self):
         util._environ_checked = 0
-        if 'HOME' in os.environ:
-            del os.environ['HOME']
+        os.environ.pop('HOME', None)
 
-        # posix without HOME
-        if os.name == 'posix':  # this test won't run on windows
-            check_environ()
-            import pwd
-            self.assertEqual(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
-        else:
-            check_environ()
+        check_environ()
 
         self.assertEqual(os.environ['PLAT'], get_platform())
         self.assertEqual(util._environ_checked, 1)
 
+    @unittest.skipUnless(os.name == 'posix', 'specific to posix')
+    def test_check_environ_getpwuid(self):
+        util._environ_checked = 0
+        os.environ.pop('HOME', None)
+
+        import pwd
+
+        # only set pw_dir field, other fields are not used
+        result = pwd.struct_passwd((None, None, None, None, None,
+                                    '/home/distutils', None))
+        with mock.patch.object(pwd, 'getpwuid', return_value=result):
+            check_environ()
+            self.assertEqual(os.environ['HOME'], '/home/distutils')
+
+        util._environ_checked = 0
+        os.environ.pop('HOME', None)
+
+        # bpo-10496: Catch pwd.getpwuid() error
+        with mock.patch.object(pwd, 'getpwuid', side_effect=KeyError):
+            check_environ()
+            self.assertNotIn('HOME', os.environ)
+
     def test_split_quoted(self):
         self.assertEqual(split_quoted('""one"" "two" \'three\' \\four'),
                          ['one', 'two', 'three', 'four'])
diff --git a/util.py b/util.py
index 83682628ba..30a21e4afa 100644
--- a/util.py
+++ b/util.py
@@ -157,8 +157,13 @@ def check_environ ():
         return
 
     if os.name == 'posix' and 'HOME' not in os.environ:
-        import pwd
-        os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
+        try:
+            import pwd
+            os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
+        except (ImportError, KeyError):
+            # bpo-10496: if the current user identifier doesn't exist in the
+            # password database, do nothing
+            pass
 
     if 'PLAT' not in os.environ:
         os.environ['PLAT'] = get_platform()

From 8fa927e2b2fc81adb420285e470439fc3a28fcee Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 20 Dec 2018 19:00:14 +0200
Subject: [PATCH 7297/8469] bpo-22831: Use "with" to avoid possible fd leaks in
 distutils. (GH-10921)

---
 archive_util.py      | 22 +++++++++++-----------
 command/bdist_msi.py | 24 ++++++++++++------------
 command/config.py    | 36 +++++++++++++++++-------------------
 command/sdist.py     | 15 +++++++--------
 util.py              | 37 ++++++++++++++++++-------------------
 5 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/archive_util.py b/archive_util.py
index b002dc3b84..565a3117b4 100644
--- a/archive_util.py
+++ b/archive_util.py
@@ -166,21 +166,21 @@ def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
                 zip = zipfile.ZipFile(zip_filename, "w",
                                       compression=zipfile.ZIP_STORED)
 
-            if base_dir != os.curdir:
-                path = os.path.normpath(os.path.join(base_dir, ''))
-                zip.write(path, path)
-                log.info("adding '%s'", path)
-            for dirpath, dirnames, filenames in os.walk(base_dir):
-                for name in dirnames:
-                    path = os.path.normpath(os.path.join(dirpath, name, ''))
+            with zip:
+                if base_dir != os.curdir:
+                    path = os.path.normpath(os.path.join(base_dir, ''))
                     zip.write(path, path)
                     log.info("adding '%s'", path)
-                for name in filenames:
-                    path = os.path.normpath(os.path.join(dirpath, name))
-                    if os.path.isfile(path):
+                for dirpath, dirnames, filenames in os.walk(base_dir):
+                    for name in dirnames:
+                        path = os.path.normpath(os.path.join(dirpath, name, ''))
                         zip.write(path, path)
                         log.info("adding '%s'", path)
-            zip.close()
+                    for name in filenames:
+                        path = os.path.normpath(os.path.join(dirpath, name))
+                        if os.path.isfile(path):
+                            zip.write(path, path)
+                            log.info("adding '%s'", path)
 
     return zip_filename
 
diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index 80104c372d..f335a34898 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -390,18 +390,18 @@ def add_scripts(self):
         #     entries for each version as the above code does
         if self.pre_install_script:
             scriptfn = os.path.join(self.bdist_dir, "preinstall.bat")
-            f = open(scriptfn, "w")
-            # The batch file will be executed with [PYTHON], so that %1
-            # is the path to the Python interpreter; %0 will be the path
-            # of the batch file.
-            # rem ="""
-            # %1 %0
-            # exit
-            # """
-            # <actual script>
-            f.write('rem ="""\n%1 %0\nexit\n"""\n')
-            f.write(open(self.pre_install_script).read())
-            f.close()
+            with open(scriptfn, "w") as f:
+                # The batch file will be executed with [PYTHON], so that %1
+                # is the path to the Python interpreter; %0 will be the path
+                # of the batch file.
+                # rem ="""
+                # %1 %0
+                # exit
+                # """
+                # <actual script>
+                f.write('rem ="""\n%1 %0\nexit\n"""\n')
+                with open(self.pre_install_script) as fin:
+                    f.write(fin.read())
             add_data(self.db, "Binary",
                 [("PreInstall", msilib.Binary(scriptfn))
                 ])
diff --git a/command/config.py b/command/config.py
index 4ae153d194..f511b88857 100644
--- a/command/config.py
+++ b/command/config.py
@@ -106,15 +106,14 @@ def _check_compiler(self):
 
     def _gen_temp_sourcefile(self, body, headers, lang):
         filename = "_configtest" + LANG_EXT[lang]
-        file = open(filename, "w")
-        if headers:
-            for header in headers:
-                file.write("#include <%s>\n" % header)
-            file.write("\n")
-        file.write(body)
-        if body[-1] != "\n":
-            file.write("\n")
-        file.close()
+        with open(filename, "w") as file:
+            if headers:
+                for header in headers:
+                    file.write("#include <%s>\n" % header)
+                file.write("\n")
+            file.write(body)
+            if body[-1] != "\n":
+                file.write("\n")
         return filename
 
     def _preprocess(self, body, headers, include_dirs, lang):
@@ -203,17 +202,16 @@ def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
         if isinstance(pattern, str):
             pattern = re.compile(pattern)
 
-        file = open(out)
-        match = False
-        while True:
-            line = file.readline()
-            if line == '':
-                break
-            if pattern.search(line):
-                match = True
-                break
+        with open(out) as file:
+            match = False
+            while True:
+                line = file.readline()
+                if line == '':
+                    break
+                if pattern.search(line):
+                    match = True
+                    break
 
-        file.close()
         self._clean()
         return match
 
diff --git a/command/sdist.py b/command/sdist.py
index 52eaa15d47..b4996fcb1d 100644
--- a/command/sdist.py
+++ b/command/sdist.py
@@ -407,14 +407,13 @@ def read_manifest(self):
         distribution.
         """
         log.info("reading manifest file '%s'", self.manifest)
-        manifest = open(self.manifest)
-        for line in manifest:
-            # ignore comments and blank lines
-            line = line.strip()
-            if line.startswith('#') or not line:
-                continue
-            self.filelist.append(line)
-        manifest.close()
+        with open(self.manifest) as manifest:
+            for line in manifest:
+                # ignore comments and blank lines
+                line = line.strip()
+                if line.startswith('#') or not line:
+                    continue
+                self.filelist.append(line)
 
     def make_release_tree(self, base_dir, files):
         """Create the directory tree that will become the source
diff --git a/util.py b/util.py
index 30a21e4afa..15cd2ad9a9 100644
--- a/util.py
+++ b/util.py
@@ -378,35 +378,34 @@ def byte_compile (py_files,
             else:
                 script = open(script_name, "w")
 
-            script.write("""\
+            with script:
+                script.write("""\
 from distutils.util import byte_compile
 files = [
 """)
 
-            # XXX would be nice to write absolute filenames, just for
-            # safety's sake (script should be more robust in the face of
-            # chdir'ing before running it).  But this requires abspath'ing
-            # 'prefix' as well, and that breaks the hack in build_lib's
-            # 'byte_compile()' method that carefully tacks on a trailing
-            # slash (os.sep really) to make sure the prefix here is "just
-            # right".  This whole prefix business is rather delicate -- the
-            # problem is that it's really a directory, but I'm treating it
-            # as a dumb string, so trailing slashes and so forth matter.
-
-            #py_files = map(os.path.abspath, py_files)
-            #if prefix:
-            #    prefix = os.path.abspath(prefix)
-
-            script.write(",\n".join(map(repr, py_files)) + "]\n")
-            script.write("""
+                # XXX would be nice to write absolute filenames, just for
+                # safety's sake (script should be more robust in the face of
+                # chdir'ing before running it).  But this requires abspath'ing
+                # 'prefix' as well, and that breaks the hack in build_lib's
+                # 'byte_compile()' method that carefully tacks on a trailing
+                # slash (os.sep really) to make sure the prefix here is "just
+                # right".  This whole prefix business is rather delicate -- the
+                # problem is that it's really a directory, but I'm treating it
+                # as a dumb string, so trailing slashes and so forth matter.
+
+                #py_files = map(os.path.abspath, py_files)
+                #if prefix:
+                #    prefix = os.path.abspath(prefix)
+
+                script.write(",\n".join(map(repr, py_files)) + "]\n")
+                script.write("""
 byte_compile(files, optimize=%r, force=%r,
              prefix=%r, base_dir=%r,
              verbose=%r, dry_run=0,
              direct=1)
 """ % (optimize, force, prefix, base_dir, verbose))
 
-            script.close()
-
         cmd = [sys.executable]
         cmd.extend(subprocess._optim_args_from_interpreter_flags())
         cmd.append(script_name)

From 3b8307541e6d24c5eeb4e4998cf9ee46b6e6506f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Dec 2018 12:01:01 -0500
Subject: [PATCH 7298/8469] Rely on package names to namespace the package
 contents.

---
 setuptools/wheel.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 95a794a853..e11f0a1d91 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -8,10 +8,11 @@
 import re
 import zipfile
 
-from pkg_resources import Distribution, PathMetadata, parse_version
+import pkg_resources
+import setuptools
+from pkg_resources import parse_version
 from setuptools.extern.packaging.utils import canonicalize_name
 from setuptools.extern.six import PY3
-from setuptools import Distribution as SetuptoolsDistribution
 from setuptools import pep425tags
 from setuptools.command.egg_info import write_requirements
 
@@ -79,7 +80,7 @@ def is_compatible(self):
         return next((True for t in self.tags() if t in supported_tags), False)
 
     def egg_name(self):
-        return Distribution(
+        return pkg_resources.Distribution(
             project_name=self.project_name, version=self.version,
             platform=(None if self.platform == 'any' else get_platform()),
         ).egg_name() + '.egg'
@@ -130,9 +131,9 @@ def get_metadata(name):
         zf.extractall(destination_eggdir)
         # Convert metadata.
         dist_info = os.path.join(destination_eggdir, dist_info)
-        dist = Distribution.from_location(
+        dist = pkg_resources.Distribution.from_location(
             destination_eggdir, dist_info,
-            metadata=PathMetadata(destination_eggdir, dist_info),
+            metadata=pkg_resources.PathMetadata(destination_eggdir, dist_info),
         )
 
         # Note: Evaluate and strip markers now,
@@ -155,7 +156,7 @@ def raw_req(req):
             os.path.join(egg_info, 'METADATA'),
             os.path.join(egg_info, 'PKG-INFO'),
         )
-        setup_dist = SetuptoolsDistribution(
+        setup_dist = setuptools.Distribution(
             attrs=dict(
                 install_requires=install_requires,
                 extras_require=extras_require,

From 0902f02d9d68f18e906e727cbafa4a05fe5c9c91 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 24 Dec 2018 13:03:58 -0500
Subject: [PATCH 7299/8469] Access pkg_resources objects through its namespace

---
 setuptools/command/develop.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index fdc9fc432b..707494eb63 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -7,7 +7,7 @@
 
 from setuptools.extern import six
 
-from pkg_resources import Distribution, PathMetadata, normalize_path
+import pkg_resources
 from setuptools.command.easy_install import easy_install
 from setuptools import namespaces
 import setuptools
@@ -65,9 +65,9 @@ def finalize_options(self):
         if self.egg_path is None:
             self.egg_path = os.path.abspath(ei.egg_base)
 
-        target = normalize_path(self.egg_base)
-        egg_path = normalize_path(os.path.join(self.install_dir,
-                                               self.egg_path))
+        target = pkg_resources.normalize_path(self.egg_base)
+        egg_path = pkg_resources.normalize_path(
+            os.path.join(self.install_dir, self.egg_path))
         if egg_path != target:
             raise DistutilsOptionError(
                 "--egg-path must be a relative path from the install"
@@ -75,9 +75,9 @@ def finalize_options(self):
             )
 
         # Make a distribution for the package's source
-        self.dist = Distribution(
+        self.dist = pkg_resources.Distribution(
             target,
-            PathMetadata(target, os.path.abspath(ei.egg_info)),
+            pkg_resources.PathMetadata(target, os.path.abspath(ei.egg_info)),
             project_name=ei.egg_name
         )
 
@@ -97,13 +97,14 @@ def _resolve_setup_path(egg_base, install_dir, egg_path):
         path_to_setup = egg_base.replace(os.sep, '/').rstrip('/')
         if path_to_setup != os.curdir:
             path_to_setup = '../' * (path_to_setup.count('/') + 1)
-        resolved = normalize_path(
+        resolved = pkg_resources.normalize_path(
             os.path.join(install_dir, egg_path, path_to_setup)
         )
-        if resolved != normalize_path(os.curdir):
+        if resolved != pkg_resources.normalize_path(os.curdir):
             raise DistutilsOptionError(
                 "Can't get a consistent path to setup script from"
-                " installation directory", resolved, normalize_path(os.curdir))
+                " installation directory", resolved,
+                pkg_resources.normalize_path(os.curdir))
         return path_to_setup
 
     def install_for_development(self):
@@ -114,7 +115,7 @@ def install_for_development(self):
             self.reinitialize_command('build_py', inplace=0)
             self.run_command('build_py')
             bpy_cmd = self.get_finalized_command("build_py")
-            build_path = normalize_path(bpy_cmd.build_lib)
+            build_path = pkg_resources.normalize_path(bpy_cmd.build_lib)
 
             # Build extensions
             self.reinitialize_command('egg_info', egg_base=build_path)
@@ -128,7 +129,8 @@ def install_for_development(self):
             self.egg_path = build_path
             self.dist.location = build_path
             # XXX
-            self.dist._provider = PathMetadata(build_path, ei_cmd.egg_info)
+            self.dist._provider = pkg_resources.PathMetadata(
+                build_path, ei_cmd.egg_info)
         else:
             # Without 2to3 inplace works fine:
             self.run_command('egg_info')

From 1db80e46af67c5aa0ffebe3fc61dd5e0787a42c5 Mon Sep 17 00:00:00 2001
From: Michael Felt <aixtools@users.noreply.github.com>
Date: Fri, 28 Dec 2018 15:03:17 +0100
Subject: [PATCH 7300/8469] bpo-11191: skip unsupported test_distutils case for
 AIX with xlc (GH-8709)

Command line options for the xlc compiler behave differently from gcc and clang,
so skip this test case for now when xlc is the compiler.

Patch by aixtools (Michael Felt)
---
 command/config.py        | 1 -
 tests/test_config_cmd.py | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/command/config.py b/command/config.py
index f511b88857..aeda408e73 100644
--- a/command/config.py
+++ b/command/config.py
@@ -328,7 +328,6 @@ def check_header(self, header, include_dirs=None, library_dirs=None,
         return self.try_cpp(body="/* No body */", headers=[header],
                             include_dirs=include_dirs)
 
-
 def dump_file(filename, head=None):
     """Dumps a file content into log.info.
 
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 6e566e7915..b735fd334d 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -39,11 +39,17 @@ def test_dump_file(self):
 
     @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_search_cpp(self):
+        import shutil
         cmd = missing_compiler_executable(['preprocessor'])
         if cmd is not None:
             self.skipTest('The %r command is not found' % cmd)
         pkg_dir, dist = self.create_dist()
         cmd = config(dist)
+        cmd._check_compiler()
+        compiler = cmd.compiler
+        is_xlc = shutil.which(compiler.preprocessor[0]).startswith("/usr/vac")
+        if is_xlc:
+            self.skipTest('xlc: The -E option overrides the -P, -o, and -qsyntaxonly options')
 
         # simple pattern searches
         match = cmd.search_cpp(pattern='xxx', body='/* xxx */')

From b78994aa19ae0705f60e3b4b1e4087ecbe4ff0f5 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 28 Dec 2018 09:37:55 -0500
Subject: [PATCH 7301/8469] Import distribution in doctest

Fixes GH issue #1612, bug introduced in commit 0902f02d9d68f18
---
 setuptools/command/develop.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 707494eb63..009e4f9368 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -202,6 +202,7 @@ class VersionlessRequirement:
     name as the 'requirement' so that scripts will work across
     multiple versions.
 
+    >>> from pkg_resources import Distribution
     >>> dist = Distribution(project_name='foo', version='1.0')
     >>> str(dist.as_requirement())
     'foo==1.0'

From a0735f223b82695cc45eb127e072496aa1dbe8f0 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 28 Dec 2018 09:52:02 -0500
Subject: [PATCH 7302/8469] Assert that warning is raised with svn downloads

This both prevents the warning from surfacing during the tests and
ensures that no regressions occur.
---
 setuptools/tests/test_packageindex.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index b727668287..13cffb7ebc 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -7,6 +7,7 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client
 import mock
+import pytest
 
 import pkg_resources
 import setuptools.package_index
@@ -266,8 +267,9 @@ def test_download_svn(self, tmpdir):
         url = 'svn+https://svn.example/project#egg=foo'
         index = setuptools.package_index.PackageIndex()
 
-        with mock.patch("os.system") as os_system_mock:
-            result = index.download(url, str(tmpdir))
+        with pytest.warns(UserWarning):
+            with mock.patch("os.system") as os_system_mock:
+                result = index.download(url, str(tmpdir))
 
         os_system_mock.assert_called()
 

From d5f601406f99690cd6fd4cdbe9d492ae82db6a08 Mon Sep 17 00:00:00 2001
From: Reece D <jumbocakefdx@gmail.com>
Date: Thu, 27 Dec 2018 11:16:38 -0600
Subject: [PATCH 7303/8469] Use HTTPS in link to RFC #6125

---
 setuptools/ssl_support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 6362f1f426..226db694bb 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -59,7 +59,7 @@ class CertificateError(ValueError):
     def _dnsname_match(dn, hostname, max_wildcards=1):
         """Matching according to RFC 6125, section 6.4.3
 
-        http://tools.ietf.org/html/rfc6125#section-6.4.3
+        https://tools.ietf.org/html/rfc6125#section-6.4.3
         """
         pats = []
         if not dn:

From 8e25ed93913d34687de9a701e112a8ea5804d1cb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 03:57:52 -0500
Subject: [PATCH 7304/8469] Add mergify configuration for automatic merges. Ref
 #1612.

---
 .mergify.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000000..7ce5d41430
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,7 @@
+pull_request_rules:
+- name: auto-merge
+  conditions:
+  - label=auto-merge
+  actions:
+    merge:
+      method: merge

From b6b5c710b9f4b1b3aa21256a2065f4e917201b0e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 03:15:02 -0500
Subject: [PATCH 7305/8469] Add declaration indicating the PEP 517 build
 backend needed for building setuptools.

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 07c23bb5f5..4ef804ecdc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = ["wheel"]
+build-backend = "setuptools.build_meta"
 
 [tool.towncrier]
     package = "setuptools"

From 82c1c14ff0e472165dbe7d476f30cef5f55c7b77 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 04:14:32 -0500
Subject: [PATCH 7306/8469] Only auto-merge to master and only when tests pass

---
 .mergify.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 7ce5d41430..5631e68336 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,13 @@
 pull_request_rules:
 - name: auto-merge
   conditions:
+  - base=master
   - label=auto-merge
+  - status-success=continuous-integration/appveyor/branch
+  - status-success=continuous-integration/appveyor/pr
+  - status-success=continuous-integration/travis-ci/pr
+  - status-success=continuous-integration/travis-ci/push
+  - status-success=deploy/netlify
   actions:
     merge:
       method: merge

From 5e9718d2417b7b75d8f8c8f9705cd0bb877fec57 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 04:21:58 -0500
Subject: [PATCH 7307/8469] Only allow auto-merge PRs submitted by jaraco.

---
 .mergify.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mergify.yml b/.mergify.yml
index 5631e68336..2559a25245 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,6 +8,7 @@ pull_request_rules:
   - status-success=continuous-integration/travis-ci/pr
   - status-success=continuous-integration/travis-ci/push
   - status-success=deploy/netlify
+  - author=jaraco
   actions:
     merge:
       method: merge

From 6689d21735e02a5db52f25f978366cb072091af2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 04:45:12 -0500
Subject: [PATCH 7308/8469] Remove restriction for jaraco - only members with
 access can create labels, so it's secure enough to restrict based on the
 label.

---
 .mergify.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 2559a25245..5631e68336 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,7 +8,6 @@ pull_request_rules:
   - status-success=continuous-integration/travis-ci/pr
   - status-success=continuous-integration/travis-ci/push
   - status-success=deploy/netlify
-  - author=jaraco
   actions:
     merge:
       method: merge

From cdd47ac62b837e2a59642e12cfbd53431e77883b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 04:45:42 -0500
Subject: [PATCH 7309/8469] Add documents on auto-merge

---
 docs/developer-guide.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index c011491a30..39bf4717c0 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -89,6 +89,17 @@ code changes. See the following for an example news fragment:
     $ cat changelog.d/1288.change.rst
     Add support for maintainer in PKG-INFO
 
+-------------------
+Auto-Merge Requests
+-------------------
+
+To support running all code through CI, even lightweight contributions,
+the project employs Mergify to auto-merge pull requests tagged as
+auto-merge.
+
+Use ``hub pull-request -l auto-merge`` to create such a pull request
+from the command line after pushing a new branch.
+
 -------
 Testing
 -------

From 8f00d60d623fdc1b8614c5e454edebf8cec504b8 Mon Sep 17 00:00:00 2001
From: rajdeep <rajdeeprrao94@gmail.com>
Date: Sun, 28 Oct 2018 15:38:18 -0400
Subject: [PATCH 7310/8469] Disallow files for license inputs

The ability to handle files was originally added and documented based on
a misunderstanding of what the `license` field should include. The field
should be the name of the license, not the full text.

It is likely that anyone actually using this was outputing malformed
PKG-INFO files, because most license files contain newlines.

See GH issue #1551
---
 setup.cfg                         |  1 -
 setuptools/config.py              | 22 ++++++++++++++++++++--
 setuptools/tests/test_egg_info.py | 25 ++++++++++++++++++++++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 57ab623435..dd404469fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,4 +26,3 @@ universal = 1
 license_file = LICENSE
 
 [bumpversion:file:setup.py]
-
diff --git a/setuptools/config.py b/setuptools/config.py
index d1ac6734dc..3a6da20f34 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -246,6 +246,24 @@ def _parse_bool(cls, value):
         value = value.lower()
         return value in ('1', 'true', 'yes')
 
+    @classmethod
+    def _exclude_files_parser(cls, key):
+        """Returns a parser function to make sure field inputs
+        are not files.
+
+        Parses a value after getting the key so error messages are
+        more informative.
+
+        :param key:
+        :rtype: callable
+        """
+        def parser(value):
+            exclude_directive = 'file:'
+            if value.startswith(exclude_directive):
+                raise ValueError('Only strings are accepted for the {0} field, files are not accepted'.format(key))
+            return value
+        return parser
+
     @classmethod
     def _parse_file(cls, value):
         """Represents value as a string, allowing including text
@@ -255,7 +273,6 @@ def _parse_file(cls, value):
         directory with setup.py.
 
         Examples:
-            file: LICENSE
             file: README.rst, CHANGELOG.md, src/file.txt
 
         :param str value:
@@ -449,6 +466,7 @@ def parsers(self):
         parse_list = self._parse_list
         parse_file = self._parse_file
         parse_dict = self._parse_dict
+        exclude_files_parser = self._exclude_files_parser
 
         return {
             'platforms': parse_list,
@@ -460,7 +478,7 @@ def parsers(self):
                 DeprecationWarning),
             'obsoletes': parse_list,
             'classifiers': self._get_parser_compound(parse_file, parse_list),
-            'license': parse_file,
+            'license': exclude_files_parser('license'),
             'description': parse_file,
             'long_description': parse_file,
             'version': self._parse_version,
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index f97b3f1d81..e1105044d3 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -148,6 +148,26 @@ def test_expected_files_produced(self, tmpdir_cwd, env):
         ]
         assert sorted(actual) == expected
 
+    def test_license_is_a_string(self, tmpdir_cwd, env):
+        setup_config = DALS("""
+            [metadata]
+            name=foo
+            version=0.0.1
+            license=file:MIT
+            """)
+
+        setup_script = DALS("""
+            from setuptools import setup
+
+            setup()
+            """)
+
+        build_files({'setup.py': setup_script,
+                     'setup.cfg': setup_config})
+
+        with pytest.raises(ValueError):
+            self._run_egg_info_command(tmpdir_cwd, env)
+
     def test_rebuilt(self, tmpdir_cwd, env):
         """Ensure timestamps are updated when the command is re-run."""
         self._create_project()
@@ -598,7 +618,10 @@ def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
             env=environ,
         )
         if code:
-            raise AssertionError(data)
+            if 'ValueError' in data:
+                raise ValueError(data)
+            else:
+                raise AssertionError(data)
         if output:
             assert output in data
 

From 2b038993e835d5a0d328910bc855b53a7c21bc6e Mon Sep 17 00:00:00 2001
From: rajdeep <rajdeeprrao94@gmail.com>
Date: Sun, 28 Oct 2018 15:53:47 -0400
Subject: [PATCH 7311/8469] Add changelog file

---
 changelog.d/1551.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1551.breaking.rst

diff --git a/changelog.d/1551.breaking.rst b/changelog.d/1551.breaking.rst
new file mode 100644
index 0000000000..c0e477ce81
--- /dev/null
+++ b/changelog.d/1551.breaking.rst
@@ -0,0 +1 @@
+File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.

From 8b8e2c8b3b83151dad1719a8cb676e919766c1c9 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 29 Dec 2018 10:53:13 -0500
Subject: [PATCH 7312/8469] Change how license field ValueError is tested

Both the old and new approaches are deeply unsatisfying to me, but
without reworking how these test commands are run, I think this is
about as close as we can get to enforcing that this specific call
raises ValueError.
---
 setuptools/tests/test_egg_info.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index e1105044d3..979ff18e4e 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -165,9 +165,20 @@ def test_license_is_a_string(self, tmpdir_cwd, env):
         build_files({'setup.py': setup_script,
                      'setup.cfg': setup_config})
 
-        with pytest.raises(ValueError):
+        # This command should fail with a ValueError, but because it's
+        # currently configured to use a subprocess, the actual traceback
+        # object is lost and we need to parse it from stderr
+        with pytest.raises(AssertionError) as exc:
             self._run_egg_info_command(tmpdir_cwd, env)
 
+        # Hopefully this is not too fragile: the only argument to the
+        # assertion error should be a traceback, ending with:
+        #     ValueError: ....
+        #
+        #     assert not 1
+        tb = exc.value.args[0].split('\n')
+        assert tb[-3].lstrip().startswith('ValueError')
+
     def test_rebuilt(self, tmpdir_cwd, env):
         """Ensure timestamps are updated when the command is re-run."""
         self._create_project()
@@ -617,11 +628,8 @@ def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
             data_stream=1,
             env=environ,
         )
-        if code:
-            if 'ValueError' in data:
-                raise ValueError(data)
-            else:
-                raise AssertionError(data)
+        assert not code, data
+
         if output:
             assert output in data
 

From 4a8dedf068f165f2e44cf3f3fab3e43a102aafe9 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 29 Dec 2018 11:12:41 -0500
Subject: [PATCH 7313/8469] Remove file: from documentation for license field

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bca211bdc3..f68edf0ccd 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2370,7 +2370,7 @@ author_email                    author-email       str
 maintainer                                         str
 maintainer_email                maintainer-email   str
 classifiers                     classifier         file:, list-comma
-license                                            file:, str
+license                                            str
 description                     summary            file:, str
 long_description                long-description   file:, str
 long_description_content_type                      str                38.6.0

From 3db95bcc3dcc72dbb47d7dfc987ae646b249addd Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 29 Dec 2018 11:13:43 -0500
Subject: [PATCH 7314/8469] Add explicit test for license in setup.cfg

---
 setuptools/tests/test_config.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 736c184dca..53b8a956c4 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,10 +1,12 @@
 import contextlib
 import pytest
+
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from mock import patch
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
 from . import py2_only, py3_only
+from .textwrap import DALS
 
 class ErrConfigHandler(ConfigHandler):
     """Erroneous handler. Fails to implement required methods."""
@@ -146,6 +148,24 @@ def test_basic(self, tmpdir):
             assert metadata.download_url == 'http://test.test.com/test/'
             assert metadata.maintainer_email == 'test@test.com'
 
+    def test_license_cfg(self, tmpdir):
+        fake_env(
+            tmpdir,
+            DALS("""
+            [metadata]
+            name=foo
+            version=0.0.1
+            license=Apache 2.0
+            """)
+        )
+
+        with get_dist(tmpdir) as dist:
+            metadata = dist.metadata
+
+            assert metadata.name == "foo"
+            assert metadata.version == "0.0.1"
+            assert metadata.license == "Apache 2.0"
+
     def test_file_mixed(self, tmpdir):
 
         fake_env(

From 9bf0fbe2af7c859aa4ac5bc0be4639c1621570d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 13:42:19 -0500
Subject: [PATCH 7315/8469] Remove unused import

---
 setuptools/tests/test_upload.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index cc0e8a0d94..320c6959da 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -4,7 +4,6 @@
 
 from distutils import log
 from distutils.errors import DistutilsError
-from distutils.version import StrictVersion
 
 import pytest
 

From 0c9624fd5ee5abe3fb0d1e3dfa68a9cbaf261aed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 29 Dec 2018 13:47:21 -0500
Subject: [PATCH 7316/8469] Feed the hobgoblins (delint).

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

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index dd17f7a925..6db8888bb2 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -2,7 +2,6 @@
 import os
 import hashlib
 import getpass
-import platform
 
 from base64 import standard_b64encode
 
@@ -16,6 +15,7 @@
 from setuptools.extern.six.moves.urllib.error import HTTPError
 from setuptools.extern.six.moves.urllib.parse import urlparse
 
+
 class upload(orig.upload):
     """
     Override default upload behavior to obtain password
@@ -80,7 +80,7 @@ def upload_file(self, command, pyversion, filename):
             'version': meta.get_version(),
 
             # file content
-            'content': (os.path.basename(filename),content),
+            'content': (os.path.basename(filename), content),
             'filetype': command,
             'pyversion': pyversion,
             'md5_digest': hashlib.md5(content).hexdigest(),

From 5f48a74119c6866bcbc4f142318ac392ad2cb03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 29 Dec 2018 21:00:08 +0200
Subject: [PATCH 7317/8469] Spelling fixes

---
 docs/developer-guide.txt | 2 +-
 docs/setuptools.txt      | 2 +-
 setuptools/config.py     | 2 +-
 setuptools/pep425tags.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 39bf4717c0..f82df39760 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -67,7 +67,7 @@ All PRs with code changes should include tests. All changes should include a
 changelog entry.
 
 ``setuptools`` uses `towncrier <https://pypi.org/project/towncrier/>`_
-for changelog managment, so when making a PR, please add a news fragment in the
+for changelog management, so when making a PR, please add a news fragment in the
 ``changelog.d/`` folder. Changelog files are written in Restructured Text and
 should be a 1 or 2 sentence description of the substantive changes in the PR.
 They should be named ``<pr_number>.<category>.rst``, where the categories are:
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bca211bdc3..81b850c313 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2358,7 +2358,7 @@ Metadata
     but their use is not advised.
 
 ==============================  =================  =================  =============== =====
-Key                             Aliases            Type               Minumum Version Notes
+Key                             Aliases            Type               Minimum Version Notes
 ==============================  =================  =================  =============== =====
 name                                               str
 version                                            attr:, file:, str  39.2.0          (1)
diff --git a/setuptools/config.py b/setuptools/config.py
index d1ac6734dc..9af72f2516 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -394,7 +394,7 @@ def parse(self):
 
             section_parser_method = getattr(
                 self,
-                # Dots in section names are tranlsated into dunderscores.
+                # Dots in section names are translated into dunderscores.
                 ('parse_section%s' % method_postfix).replace('.', '__'),
                 None)
 
diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
index 8bf4277dbd..48745a2902 100644
--- a/setuptools/pep425tags.py
+++ b/setuptools/pep425tags.py
@@ -161,7 +161,7 @@ def is_manylinux1_compatible():
 
 def get_darwin_arches(major, minor, machine):
     """Return a list of supported arches (including group arches) for
-    the given major, minor and machine architecture of an macOS machine.
+    the given major, minor and machine architecture of a macOS machine.
     """
     arches = []
 

From 135a1566832cb75d37a9fbe1fe01005c0e05b4c3 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 1 Jan 2019 12:12:09 -0500
Subject: [PATCH 7318/8469] Tweak "making a pull request" documentation

reStructuredText is how the name is commonly stylized (see Wikipedia),
also fixed a typo in the "deprecation" description.
---
 docs/developer-guide.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index f82df39760..a5942c8b0f 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -68,7 +68,7 @@ changelog entry.
 
 ``setuptools`` uses `towncrier <https://pypi.org/project/towncrier/>`_
 for changelog management, so when making a PR, please add a news fragment in the
-``changelog.d/`` folder. Changelog files are written in Restructured Text and
+``changelog.d/`` folder. Changelog files are written in reStructuredText and
 should be a 1 or 2 sentence description of the substantive changes in the PR.
 They should be named ``<pr_number>.<category>.rst``, where the categories are:
 
@@ -76,7 +76,7 @@ They should be named ``<pr_number>.<category>.rst``, where the categories are:
 - ``breaking``: Any backwards-compatibility breaking change
 - ``doc``: A change to the documentation
 - ``misc``: Changes internal to the repo like CI, test and build changes
-- ``deprecation``: For deprecations of an existing feature of behavior
+- ``deprecation``: For deprecations of an existing feature or behavior
 
 A pull request may have more than one of these components, for example a code
 change may introduce a new feature that deprecates an old feature, in which

From b82c731a66415225f111872cc26e7da596189a87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Jan 2019 13:27:41 -0500
Subject: [PATCH 7319/8469] Allow PRs from other forks to auto-merge.

---
 .mergify.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 5631e68336..7f0df535ff 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -3,10 +3,8 @@ pull_request_rules:
   conditions:
   - base=master
   - label=auto-merge
-  - status-success=continuous-integration/appveyor/branch
   - status-success=continuous-integration/appveyor/pr
   - status-success=continuous-integration/travis-ci/pr
-  - status-success=continuous-integration/travis-ci/push
   - status-success=deploy/netlify
   actions:
     merge:

From 2db2a8f37d64d8abd281660d48009003cc8805ca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:23:14 -0500
Subject: [PATCH 7320/8469] Feed the hobgoblins (delint).

---
 setuptools/tests/test_build_meta.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 2a07944696..a472d3ebcc 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -172,18 +172,21 @@ def test_build_sdist_version_change(build_backend):
     sdist_name = build_backend.build_sdist(sdist_into_directory)
     assert os.path.isfile(os.path.join(sdist_into_directory, sdist_name))
 
-    # if the setup.py changes subsequent call of the build meta should still succeed, given the
+    # if the setup.py changes subsequent call of the build meta
+    # should still succeed, given the
     # sdist_directory the frontend specifies is empty
     with open(os.path.abspath("setup.py"), 'rt') as file_handler:
         content = file_handler.read()
     with open(os.path.abspath("setup.py"), 'wt') as file_handler:
-        file_handler.write(content.replace("version='0.0.0'", "version='0.0.1'"))
+        file_handler.write(
+            content.replace("version='0.0.0'", "version='0.0.1'"))
 
     shutil.rmtree(sdist_into_directory)
     os.makedirs(sdist_into_directory)
 
     sdist_name = build_backend.build_sdist("out_sdist")
-    assert os.path.isfile(os.path.join(os.path.abspath("out_sdist"), sdist_name))
+    assert os.path.isfile(
+        os.path.join(os.path.abspath("out_sdist"), sdist_name))
 
 
 def test_build_sdist_setup_py_exists(tmpdir_cwd):
@@ -214,4 +217,3 @@ def test_build_sdist_setup_py_manifest_excluded(tmpdir_cwd):
     targz_path = build_sdist("temp")
     with tarfile.open(os.path.join("temp", targz_path)) as tar:
         assert not any('setup.py' in name for name in tar.getnames())
-

From 38bbfded981e14bacf937a0a9a944b7766c39806 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:27:07 -0500
Subject: [PATCH 7321/8469] Add test capturing failure. Ref #1623.

---
 setuptools/tests/test_build_meta.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a472d3ebcc..82b44c8944 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -217,3 +217,22 @@ def test_build_sdist_setup_py_manifest_excluded(tmpdir_cwd):
     targz_path = build_sdist("temp")
     with tarfile.open(os.path.join("temp", targz_path)) as tar:
         assert not any('setup.py' in name for name in tar.getnames())
+
+
+def test_build_sdist_builds_targz_even_if_zip_indicated(tmpdir_cwd):
+    files = {
+        'setup.py': DALS("""
+            __import__('setuptools').setup(
+                name='foo',
+                version='0.0.0',
+                py_modules=['hello']
+            )"""),
+        'hello.py': '',
+        'setup.cfg': DALS("""
+            [sdist]
+            formats=zip
+            """)
+    }
+
+    build_files(files)
+    build_sdist("temp")

From 731df905fb0282c7255e4e0d4acf339a98e3db7e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:28:33 -0500
Subject: [PATCH 7322/8469] Always specify formats=gztar, overriding the
 project's legacy expectation that a zip sdist should be generated. Fixes
 #1623.

---
 setuptools/build_meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 463d3757a3..75178a7a3c 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -170,7 +170,7 @@ def build_wheel(wheel_directory, config_settings=None,
 def build_sdist(sdist_directory, config_settings=None):
     config_settings = _fix_config(config_settings)
     sdist_directory = os.path.abspath(sdist_directory)
-    sys.argv = sys.argv[:1] + ['sdist'] + \
+    sys.argv = sys.argv[:1] + ['sdist', '--formats', 'gztar'] + \
         config_settings["--global-option"] + \
         ["--dist-dir", sdist_directory]
     _run_setup()

From d56ed68dcdb321df635a2c3a698c5026b7feadcc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:31:44 -0500
Subject: [PATCH 7323/8469] Add changelog

---
 changelog.d/1625.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1625.change.rst

diff --git a/changelog.d/1625.change.rst b/changelog.d/1625.change.rst
new file mode 100644
index 0000000000..9125ac0ced
--- /dev/null
+++ b/changelog.d/1625.change.rst
@@ -0,0 +1 @@
+In PEP 517 build_meta builder, ensure that sdists are built as gztar per the spec.

From cc9305b9106eaf409c01e8a399a00137583e2a04 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:37:45 -0500
Subject: [PATCH 7324/8469] Rely on iterable unpacking to extract one element
 from generator expression.

---
 setuptools/build_meta.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 463d3757a3..7f2786c4cf 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -160,11 +160,11 @@ def build_wheel(wheel_directory, config_settings=None,
         shutil.rmtree(wheel_directory)
         shutil.copytree('dist', wheel_directory)
 
-    wheels = [f for f in os.listdir(wheel_directory)
-              if f.endswith('.whl')]
+    wheels = (f for f in os.listdir(wheel_directory)
+              if f.endswith('.whl'))
 
-    assert len(wheels) == 1
-    return wheels[0]
+    wheel, = wheels
+    return wheel
 
 
 def build_sdist(sdist_directory, config_settings=None):
@@ -175,8 +175,8 @@ def build_sdist(sdist_directory, config_settings=None):
         ["--dist-dir", sdist_directory]
     _run_setup()
 
-    sdists = [f for f in os.listdir(sdist_directory)
-              if f.endswith('.tar.gz')]
+    sdists = (f for f in os.listdir(sdist_directory)
+              if f.endswith('.tar.gz'))
 
-    assert len(sdists) == 1
-    return sdists[0]
+    sdist, = sdists
+    return sdist

From 7378e6be2f8f8a0d96b748e256dfa6b53821c3f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:39:37 -0500
Subject: [PATCH 7325/8469] Avoid hanging indent

---
 setuptools/build_meta.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 7f2786c4cf..5a69d284b5 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -160,8 +160,10 @@ def build_wheel(wheel_directory, config_settings=None,
         shutil.rmtree(wheel_directory)
         shutil.copytree('dist', wheel_directory)
 
-    wheels = (f for f in os.listdir(wheel_directory)
-              if f.endswith('.whl'))
+    wheels = (
+        f for f in os.listdir(wheel_directory)
+        if f.endswith('.whl')
+    )
 
     wheel, = wheels
     return wheel
@@ -175,8 +177,10 @@ def build_sdist(sdist_directory, config_settings=None):
         ["--dist-dir", sdist_directory]
     _run_setup()
 
-    sdists = (f for f in os.listdir(sdist_directory)
-              if f.endswith('.tar.gz'))
+    sdists = (
+        f for f in os.listdir(sdist_directory)
+        if f.endswith('.tar.gz')
+    )
 
     sdist, = sdists
     return sdist

From 2bb8225a6efa6f429d4522f47308b779a48cd07f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Jan 2019 14:42:23 -0500
Subject: [PATCH 7326/8469] Extract common behavior into a function

---
 setuptools/build_meta.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 5a69d284b5..02de44279c 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -149,6 +149,15 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
     return dist_infos[0]
 
 
+def _file_with_extension(directory, extension):
+    matching = (
+        f for f in os.listdir(directory)
+        if f.endswith(extension)
+    )
+    file, = matching
+    return file
+
+
 def build_wheel(wheel_directory, config_settings=None,
                 metadata_directory=None):
     config_settings = _fix_config(config_settings)
@@ -160,13 +169,7 @@ def build_wheel(wheel_directory, config_settings=None,
         shutil.rmtree(wheel_directory)
         shutil.copytree('dist', wheel_directory)
 
-    wheels = (
-        f for f in os.listdir(wheel_directory)
-        if f.endswith('.whl')
-    )
-
-    wheel, = wheels
-    return wheel
+    return _file_with_extension(wheel_directory, '.whl')
 
 
 def build_sdist(sdist_directory, config_settings=None):
@@ -177,10 +180,4 @@ def build_sdist(sdist_directory, config_settings=None):
         ["--dist-dir", sdist_directory]
     _run_setup()
 
-    sdists = (
-        f for f in os.listdir(sdist_directory)
-        if f.endswith('.tar.gz')
-    )
-
-    sdist, = sdists
-    return sdist
+    return _file_with_extension(sdist_directory, '.tar.gz')

From c688982505753013fa21a79be4a61ec9a3b8bc3c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Jan 2019 14:41:02 -0500
Subject: [PATCH 7327/8469] Feed the hobgoblins (delint).

---
 setuptools/config.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 59bb770864..0f7b5955d3 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -424,8 +424,8 @@ def parse(self):
 
     def _deprecated_config_handler(self, func, msg, warning_class):
         """ this function will wrap around parameters that are deprecated
-        
-        :param msg: deprecation message 
+
+        :param msg: deprecation message
         :param warning_class: class of warning exception to be raised
         :param func: function to be wrapped around
         """
@@ -433,7 +433,7 @@ def _deprecated_config_handler(self, func, msg, warning_class):
         def config_handler(*args, **kwargs):
             warnings.warn(msg, warning_class)
             return func(*args, **kwargs)
-        
+
         return config_handler
 
 
@@ -472,8 +472,9 @@ def parsers(self):
             'platforms': parse_list,
             'keywords': parse_list,
             'provides': parse_list,
-            'requires': self._deprecated_config_handler(parse_list,
-                "The requires parameter is deprecated, please use " +
+            'requires': self._deprecated_config_handler(
+                parse_list,
+                "The requires parameter is deprecated, please use "
                 "install_requires for runtime dependencies.",
                 DeprecationWarning),
             'obsoletes': parse_list,

From f8ff0d0d4657d5f6a638fb90f0d518bd2768aa7b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Jan 2019 14:42:27 -0500
Subject: [PATCH 7328/8469] Feed the hobgoblins (delint).

---
 setuptools/config.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 0f7b5955d3..b6626043fc 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -260,7 +260,9 @@ def _exclude_files_parser(cls, key):
         def parser(value):
             exclude_directive = 'file:'
             if value.startswith(exclude_directive):
-                raise ValueError('Only strings are accepted for the {0} field, files are not accepted'.format(key))
+                raise ValueError(
+                    'Only strings are accepted for the {0} field, '
+                    'files are not accepted'.format(key))
             return value
         return parser
 

From 18e2218e6220614cd5c9737cac10be598c3bf8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 10 Jan 2019 00:55:03 +0100
Subject: [PATCH 7329/8469] Distutils no longer needs to remain compatible with
 2.3 (GH-11423)

---
 README | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README b/README
index 408a203b85..23f488506f 100644
--- a/README
+++ b/README
@@ -8,6 +8,4 @@ The Distutils-SIG web page is also a good starting point:
 
     http://www.python.org/sigs/distutils-sig/
 
-WARNING : Distutils must remain compatible with 2.3
-
 $Id$

From 0c79e4d09cf429a2aabbcb6d4cf1455ec45a0137 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 11 Jan 2019 15:29:40 +0300
Subject: [PATCH 7330/8469] include pyproject.toml in sdist (#1632)

---
 setuptools/command/py36compat.py |  2 +-
 setuptools/tests/test_sdist.py   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 61063e7542..c256bfb855 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -76,7 +76,7 @@ def _add_defaults_standards(self):
                     self.warn("standard file '%s' not found" % fn)
 
     def _add_defaults_optional(self):
-        optional = ['test/test*.py', 'setup.cfg']
+        optional = ['test/test*.py', 'setup.cfg', 'pyproject.toml']
         for pattern in optional:
             files = filter(os.path.isfile, glob(pattern))
             self.filelist.extend(files)
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index d2c4e0cf95..06813a003b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -449,6 +449,20 @@ def test_sdist_with_latin1_encoded_filename(self):
             except UnicodeDecodeError:
                 filename not in cmd.filelist.files
 
+    def test_pyproject_toml_in_sdist(self):
+        """
+        Check if pyproject.toml is included in source distribution if present
+        """
+        open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+        with quiet():
+            cmd.run()
+        manifest = cmd.filelist.files
+        assert 'pyproject.toml' in manifest
+
 
 def test_default_revctrl():
     """

From bc976ed7b9a2e0594c5822316ae63e64723a7ed6 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 11 Jan 2019 15:33:18 +0300
Subject: [PATCH 7331/8469] add changelog fragment

---
 changelog.d/1634.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1634.change.rst

diff --git a/changelog.d/1634.change.rst b/changelog.d/1634.change.rst
new file mode 100644
index 0000000000..ab544239d6
--- /dev/null
+++ b/changelog.d/1634.change.rst
@@ -0,0 +1 @@
+Include ``pyproject.toml`` in source distribution by default

From 1d6bcf1730a8490a2a16fe2eac73a5437f743dd2 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 11 Jan 2019 15:34:32 +0300
Subject: [PATCH 7332/8469] add trailing dot in changelog fragment

---
 changelog.d/1634.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1634.change.rst b/changelog.d/1634.change.rst
index ab544239d6..27d0a64afe 100644
--- a/changelog.d/1634.change.rst
+++ b/changelog.d/1634.change.rst
@@ -1 +1 @@
-Include ``pyproject.toml`` in source distribution by default
+Include ``pyproject.toml`` in source distribution by default.

From d53e024af2f5d8f3a4a36588c3dc004d156bc830 Mon Sep 17 00:00:00 2001
From: Alexander Duryagin <aduryagin@gmail.com>
Date: Fri, 11 Jan 2019 15:57:54 +0300
Subject: [PATCH 7333/8469] do not change py36compat, put changes into sdist
 command

---
 setuptools/command/py36compat.py | 2 +-
 setuptools/command/sdist.py      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index c256bfb855..61063e7542 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -76,7 +76,7 @@ def _add_defaults_standards(self):
                     self.warn("standard file '%s' not found" % fn)
 
     def _add_defaults_optional(self):
-        optional = ['test/test*.py', 'setup.cfg', 'pyproject.toml']
+        optional = ['test/test*.py', 'setup.cfg']
         for pattern in optional:
             files = filter(os.path.isfile, glob(pattern))
             self.filelist.extend(files)
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index bcfae4d82f..40965a678c 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -121,6 +121,14 @@ def __read_template_hack(self):
     if has_leaky_handle:
         read_template = __read_template_hack
 
+    def _add_defaults_optional(self):
+        if six.PY2:
+            sdist_add_defaults._add_defaults_optional(self)
+        else:
+            super()._add_defaults_optional()
+        if os.path.isfile('pyproject.toml'):
+            self.filelist.append('pyproject.toml')
+
     def _add_defaults_python(self):
         """getting python files"""
         if self.distribution.has_pure_modules():

From 748b307354e3c29252e31c029196002b2bbd6995 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 17 Jan 2019 17:57:45 -0500
Subject: [PATCH 7334/8469] Pin pytest to <4 for now. Ref #1638.

---
 tests/requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0c6c3e597c..d301168a29 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,7 +3,8 @@ pytest-flake8; python_version!="3.4"
 pytest-flake8<=1.0.0; python_version=="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
-pytest>=3.0.2
+# pytest pinned to <4 due to #1638
+pytest>=3.7,<4
 wheel
 coverage>=4.5.1
 pytest-cov>=2.5.1

From cb20330b1f00ca7864338c7518a8f0883b3844a1 Mon Sep 17 00:00:00 2001
From: Marc Schlaich <marc.schlaich@googlemail.com>
Date: Sun, 20 Jan 2019 19:47:42 +0100
Subject: [PATCH 7335/8469] bpo-35699: fix distuils cannot detect Build Tools
 2017 anymore (GH-11495)

---
 _msvccompiler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 84b4ef5959..58b20a2102 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -78,6 +78,7 @@ def _find_vc2017():
             "-prerelease",
             "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
             "-property", "installationPath",
+            "-products", "*",
         ], encoding="mbcs", errors="strict").strip()
     except (subprocess.CalledProcessError, OSError, UnicodeDecodeError):
         return None, None

From bfe286c3a95615a1d927c46cbe3d8ce890bab2b0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 17 Jan 2019 16:24:15 -0500
Subject: [PATCH 7336/8469] Add validation of a resource path according to the
 docs. Only warn for now. Ref #1635.

---
 pkg_resources/__init__.py | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 6ca68daa01..a5bed9a625 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1466,10 +1466,55 @@ def _listdir(self, path):
         )
 
     def _fn(self, base, resource_name):
+        self._validate_resource_path(resource_name)
         if resource_name:
             return os.path.join(base, *resource_name.split('/'))
         return base
 
+    @staticmethod
+    def _validate_resource_path(path):
+        """
+        Validate the resource paths according to the docs.
+        https://setuptools.readthedocs.io/en/latest/pkg_resources.html#basic-resource-access
+
+        >>> warned = getfixture('recwarn')
+        >>> warnings.simplefilter('always')
+        >>> vrp = NullProvider._validate_resource_path
+        >>> vrp('foo/bar.txt')
+        >>> bool(warned)
+        False
+        >>> vrp('../foo/bar.txt')
+        >>> bool(warned)
+        True
+        >>> warned.clear()
+        >>> vrp('/foo/bar.txt')
+        >>> bool(warned)
+        True
+        >>> warned.clear()
+        >>> vrp('foo/../../bar.txt')
+        >>> bool(warned)
+        True
+        >>> warned.clear()
+        >>> vrp('foo/f../bar.txt')
+        >>> bool(warned)
+        False
+        """
+        invalid = (
+            path.startswith('/') or
+            re.search(r'\B\.\.\B', path)
+        )
+        if not invalid:
+            return
+
+        msg = "Use of .. or leading / in a resource path is not allowed."
+        # for compatibility, warn; in future
+        # raise ValueError(msg)
+        warnings.warn(
+            msg[:-1] + " and will raise exceptions in a future release.",
+            DeprecationWarning,
+            stacklevel=4,
+        )
+
     def _get(self, path):
         if hasattr(self.loader, 'get_data'):
             return self.loader.get_data(path)

From 20f38687bbcf0e668902d37d51023f1fddc55273 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 17 Jan 2019 16:49:49 -0500
Subject: [PATCH 7337/8469] Update docs to match implementation that resource
 names are rooted at the package. Ref #1635.

---
 changelog.d/1635.change.rst |  1 +
 docs/pkg_resources.txt      |  4 ++--
 pkg_resources/__init__.py   | 10 +++-------
 3 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 changelog.d/1635.change.rst

diff --git a/changelog.d/1635.change.rst b/changelog.d/1635.change.rst
new file mode 100644
index 0000000000..7227ce0d5e
--- /dev/null
+++ b/changelog.d/1635.change.rst
@@ -0,0 +1 @@
+Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents. Violations of this expectation raise DeprecationWarnings and will become errors.
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 0c9fb5f260..21aac814a6 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1132,8 +1132,8 @@ relative to the root of the identified distribution; i.e. its first path
 segment will be treated as a peer of the top-level modules or packages in the
 distribution.
 
-Note that resource names must be ``/``-separated paths and cannot be absolute
-(i.e. no leading ``/``) or contain relative names like ``".."``.  Do *not* use
+Note that resource names must be ``/``-separated paths rooted at the package
+and cannot contain relative names like ``".."``.  Do *not* use
 ``os.path`` routines to manipulate resource paths, as they are *not* filesystem
 paths.
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a5bed9a625..a3f1c56fbc 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1489,8 +1489,7 @@ def _validate_resource_path(path):
         >>> warned.clear()
         >>> vrp('/foo/bar.txt')
         >>> bool(warned)
-        True
-        >>> warned.clear()
+        False
         >>> vrp('foo/../../bar.txt')
         >>> bool(warned)
         True
@@ -1499,14 +1498,11 @@ def _validate_resource_path(path):
         >>> bool(warned)
         False
         """
-        invalid = (
-            path.startswith('/') or
-            re.search(r'\B\.\.\B', path)
-        )
+        invalid = '..' in path.split('/')
         if not invalid:
             return
 
-        msg = "Use of .. or leading / in a resource path is not allowed."
+        msg = "Use of .. in a resource path is not allowed."
         # for compatibility, warn; in future
         # raise ValueError(msg)
         warnings.warn(

From 1b935caf64fc8f3eb72c7ee8c05a221f7ca9d9b7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Jan 2019 21:31:39 -0500
Subject: [PATCH 7338/8469] Also disallow leading '/' in resource paths. Ref
 #1635.

---
 changelog.d/1635.change.rst | 2 +-
 docs/pkg_resources.txt      | 5 +++--
 pkg_resources/__init__.py   | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changelog.d/1635.change.rst b/changelog.d/1635.change.rst
index 7227ce0d5e..7c35dfd196 100644
--- a/changelog.d/1635.change.rst
+++ b/changelog.d/1635.change.rst
@@ -1 +1 @@
-Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents. Violations of this expectation raise DeprecationWarnings and will become errors.
+Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents or begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors.
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 21aac814a6..cdc1a5a505 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1132,8 +1132,9 @@ relative to the root of the identified distribution; i.e. its first path
 segment will be treated as a peer of the top-level modules or packages in the
 distribution.
 
-Note that resource names must be ``/``-separated paths rooted at the package
-and cannot contain relative names like ``".."``.  Do *not* use
+Note that resource names must be ``/``-separated paths rooted at the package,
+cannot contain relative names like ``".."``, and cannot begin with a
+leading ``/``.  Do *not* use
 ``os.path`` routines to manipulate resource paths, as they are *not* filesystem
 paths.
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a3f1c56fbc..3722272028 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1489,7 +1489,7 @@ def _validate_resource_path(path):
         >>> warned.clear()
         >>> vrp('/foo/bar.txt')
         >>> bool(warned)
-        False
+        True
         >>> vrp('foo/../../bar.txt')
         >>> bool(warned)
         True
@@ -1498,11 +1498,14 @@ def _validate_resource_path(path):
         >>> bool(warned)
         False
         """
-        invalid = '..' in path.split('/')
+        invalid = (
+            '..' in path.split('/') or
+            path.startswith('/')
+        )
         if not invalid:
             return
 
-        msg = "Use of .. in a resource path is not allowed."
+        msg = "Use of .. or leading '/' in a resource path is not allowed."
         # for compatibility, warn; in future
         # raise ValueError(msg)
         warnings.warn(

From 36a6a8bcf4b803f16891a766e87aabca3ace09e9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Jan 2019 21:34:25 -0500
Subject: [PATCH 7339/8469] Remove usage relying on deprecated and ambiguous
 leading slash. Ref #1635

---
 pkg_resources/__init__.py                 | 2 +-
 pkg_resources/tests/test_pkg_resources.py | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3722272028..b30392facb 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1932,7 +1932,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
     if only:
         # don't yield nested distros
         return
-    for subitem in metadata.resource_listdir('/'):
+    for subitem in metadata.resource_listdir(''):
         if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
             dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 416f9aff2f..2c2c9c7f97 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -93,7 +93,6 @@ def test_resource_listdir(self):
 
         expected_root = ['data.dat', 'mod.py', 'subdir']
         assert sorted(zp.resource_listdir('')) == expected_root
-        assert sorted(zp.resource_listdir('/')) == expected_root
 
         expected_subdir = ['data2.dat', 'mod2.py']
         assert sorted(zp.resource_listdir('subdir')) == expected_subdir
@@ -106,7 +105,6 @@ def test_resource_listdir(self):
         zp2 = pkg_resources.ZipProvider(mod2)
 
         assert sorted(zp2.resource_listdir('')) == expected_subdir
-        assert sorted(zp2.resource_listdir('/')) == expected_subdir
 
         assert zp2.resource_listdir('subdir') == []
         assert zp2.resource_listdir('subdir/') == []

From 24be5abd4cbd9d84537c457456f841522d626e14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Jan 2019 16:11:07 -0500
Subject: [PATCH 7340/8469] Given that the config file parsing functionality is
 unlikely to change upstream, just incorporate the functionality directly.

---
 setuptools/dist.py          | 78 ++++++++++++++++++++++++++++--
 setuptools/py36compat.py    | 95 -------------------------------------
 setuptools/unicode_utils.py | 13 +++++
 3 files changed, 87 insertions(+), 99 deletions(-)
 delete mode 100644 setuptools/py36compat.py

diff --git a/setuptools/dist.py b/setuptools/dist.py
index a2600711e3..4cc3bdfe7a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 __all__ = ['Distribution']
 
+import io
+import sys
 import re
 import os
 import warnings
@@ -9,9 +11,11 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
+from distutils.errors import DistutilsOptionError
+from distutils.util import strtobool
+from distutils.debug import DEBUG
 import itertools
 
-
 from collections import defaultdict
 from email import message_from_file
 
@@ -31,8 +35,8 @@
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
+from .unicode_utils import detect_encoding
 import pkg_resources
-from .py36compat import Distribution_parse_config_files
 
 __import__('setuptools.extern.packaging.specifiers')
 __import__('setuptools.extern.packaging.version')
@@ -332,7 +336,7 @@ def check_packages(dist, attr, value):
 _Distribution = get_unpatched(distutils.core.Distribution)
 
 
-class Distribution(Distribution_parse_config_files, _Distribution):
+class Distribution(_Distribution):
     """Distribution with support for features, tests, and package data
 
     This is an enhanced version of 'distutils.dist.Distribution' that
@@ -556,12 +560,78 @@ def _clean_req(self, req):
         req.marker = None
         return req
 
+    def _parse_config_files(self, filenames=None):
+        """
+        Adapted from distutils.dist.Distribution.parse_config_files,
+        this method provides the same functionality in subtly-improved
+        ways.
+        """
+        from setuptools.extern.six.moves.configparser import ConfigParser
+
+        # Ignore install directory options if we have a venv
+        if six.PY3 and sys.prefix != sys.base_prefix:
+            ignore_options = [
+                'install-base', 'install-platbase', 'install-lib',
+                'install-platlib', 'install-purelib', 'install-headers',
+                'install-scripts', 'install-data', 'prefix', 'exec-prefix',
+                'home', 'user', 'root']
+        else:
+            ignore_options = []
+
+        ignore_options = frozenset(ignore_options)
+
+        if filenames is None:
+            filenames = self.find_config_files()
+
+        if DEBUG:
+            self.announce("Distribution.parse_config_files():")
+
+        parser = ConfigParser()
+        for filename in filenames:
+            with io.open(filename, 'rb') as fp:
+                encoding = detect_encoding(fp)
+                if DEBUG:
+                    self.announce("  reading %s [%s]" % (
+                        filename, encoding or 'locale')
+                    )
+                reader = io.TextIOWrapper(fp, encoding=encoding)
+                (parser.read_file if six.PY3 else parser.readfp)(reader)
+            for section in parser.sections():
+                options = parser.options(section)
+                opt_dict = self.get_option_dict(section)
+
+                for opt in options:
+                    if opt != '__name__' and opt not in ignore_options:
+                        val = parser.get(section, opt)
+                        opt = opt.replace('-', '_')
+                        opt_dict[opt] = (filename, val)
+
+            # Make the ConfigParser forget everything (so we retain
+            # the original filenames that options come from)
+            parser.__init__()
+
+        # If there was a "global" section in the config file, use it
+        # to set Distribution options.
+
+        if 'global' in self.command_options:
+            for (opt, (src, val)) in self.command_options['global'].items():
+                alias = self.negative_opt.get(opt)
+                try:
+                    if alias:
+                        setattr(self, alias, not strtobool(val))
+                    elif opt in ('verbose', 'dry_run'):  # ugh!
+                        setattr(self, opt, strtobool(val))
+                    else:
+                        setattr(self, opt, val)
+                except ValueError as msg:
+                    raise DistutilsOptionError(msg)
+
     def parse_config_files(self, filenames=None, ignore_option_errors=False):
         """Parses configuration files from various levels
         and loads configuration.
 
         """
-        Distribution_parse_config_files.parse_config_files(self, filenames=filenames)
+        self._parse_config_files(filenames=filenames)
 
         parse_configuration(self, self.command_options,
                             ignore_option_errors=ignore_option_errors)
diff --git a/setuptools/py36compat.py b/setuptools/py36compat.py
deleted file mode 100644
index 3d3c34ec50..0000000000
--- a/setuptools/py36compat.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import io
-import re
-import sys
-from distutils.errors import DistutilsOptionError
-from distutils.util import strtobool
-from distutils.debug import DEBUG
-from setuptools.extern import six
-
-
-CODING_RE = re.compile(br'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)')
-
-def detect_encoding(fp):
-    first_line = fp.readline()
-    fp.seek(0)
-    m = CODING_RE.match(first_line)
-    if m is None:
-        return None
-    return m.group(1).decode('ascii')
-
-
-class Distribution_parse_config_files:
-    """
-    Mix-in providing forward-compatibility for functionality to be
-    included by default on Python 3.7.
-
-    Do not edit the code in this class except to update functionality
-    as implemented in distutils.
-    """
-    def parse_config_files(self, filenames=None):
-        from setuptools.extern.six.moves.configparser import ConfigParser
-
-        # Ignore install directory options if we have a venv
-        if six.PY3 and sys.prefix != sys.base_prefix:
-            ignore_options = [
-                'install-base', 'install-platbase', 'install-lib',
-                'install-platlib', 'install-purelib', 'install-headers',
-                'install-scripts', 'install-data', 'prefix', 'exec-prefix',
-                'home', 'user', 'root']
-        else:
-            ignore_options = []
-
-        ignore_options = frozenset(ignore_options)
-
-        if filenames is None:
-            filenames = self.find_config_files()
-
-        if DEBUG:
-            self.announce("Distribution.parse_config_files():")
-
-        parser = ConfigParser()
-        for filename in filenames:
-            with io.open(filename, 'rb') as fp:
-                encoding = detect_encoding(fp)
-                if DEBUG:
-                    self.announce("  reading %s [%s]" % (
-                        filename, encoding or 'locale')
-                    )
-                reader = io.TextIOWrapper(fp, encoding=encoding)
-                (parser.read_file if six.PY3 else parser.readfp)(reader)
-            for section in parser.sections():
-                options = parser.options(section)
-                opt_dict = self.get_option_dict(section)
-
-                for opt in options:
-                    if opt != '__name__' and opt not in ignore_options:
-                        val = parser.get(section,opt)
-                        opt = opt.replace('-', '_')
-                        opt_dict[opt] = (filename, val)
-
-            # Make the ConfigParser forget everything (so we retain
-            # the original filenames that options come from)
-            parser.__init__()
-
-        # If there was a "global" section in the config file, use it
-        # to set Distribution options.
-
-        if 'global' in self.command_options:
-            for (opt, (src, val)) in self.command_options['global'].items():
-                alias = self.negative_opt.get(opt)
-                try:
-                    if alias:
-                        setattr(self, alias, not strtobool(val))
-                    elif opt in ('verbose', 'dry_run'): # ugh!
-                        setattr(self, opt, strtobool(val))
-                    else:
-                        setattr(self, opt, val)
-                except ValueError as msg:
-                    raise DistutilsOptionError(msg)
-
-
-if False:
-    # When updated behavior is available upstream,
-    # disable override here.
-    class Distribution_parse_config_files:
-        pass
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 7c63efd20b..3b8179a870 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,5 +1,6 @@
 import unicodedata
 import sys
+import re
 
 from setuptools.extern import six
 
@@ -42,3 +43,15 @@ def try_encode(string, enc):
         return string.encode(enc)
     except UnicodeEncodeError:
         return None
+
+
+CODING_RE = re.compile(br'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)')
+
+
+def detect_encoding(fp):
+    first_line = fp.readline()
+    fp.seek(0)
+    m = CODING_RE.match(first_line)
+    if m is None:
+        return None
+    return m.group(1).decode('ascii')

From 9ef3ce697dd0ca38b420ceeb9388bc2a8f318524 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 25 Jan 2019 16:19:26 -0500
Subject: [PATCH 7341/8469] Update changelog

---
 changelog.d/1180.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1180.change.rst

diff --git a/changelog.d/1180.change.rst b/changelog.d/1180.change.rst
new file mode 100644
index 0000000000..2e0f78bf7a
--- /dev/null
+++ b/changelog.d/1180.change.rst
@@ -0,0 +1 @@
+Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).

From 590919d07a3036db09a3918b73ce3c8f91b84a7c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 11:35:08 -0500
Subject: [PATCH 7342/8469] Inject the project name in the referral also

---
 docs/_templates/indexsidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index b8c6148e1f..687cd2c986 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -11,5 +11,5 @@ <h3 class="donation">Professional support</h3>
 
 <p>
 Professionally-supported {{ project }} is available with the
-<a href="https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme">Tidelift Subscription</a>.
+<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=readme">Tidelift Subscription</a>.
 </p>

From f3ff0541b6967ee91be3f572c5afe4f559436aa1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 12:12:55 -0500
Subject: [PATCH 7343/8469] Add Tidelift template

---
 README.rst                            | 11 +++++++++++
 docs/_templates/tidelift-sidebar.html |  6 ++++++
 docs/conf.py                          |  4 ++++
 3 files changed, 21 insertions(+)
 create mode 100644 README.rst
 create mode 100644 docs/_templates/tidelift-sidebar.html
 create mode 100644 docs/conf.py

diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000..5d77d8d3a8
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,11 @@
+.. image:: https://tidelift.com/badges/github/GROUP/PROJECT
+   :target: https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=readme
+
+
+Security Contact
+================
+
+If you wish to report a security vulnerability, the public disclosure
+of which may exacerbate the risk, please
+`Contact Tidelift security <https://tidelift.com/security>`_,
+which will coordinate the fix and disclosure privately.
diff --git a/docs/_templates/tidelift-sidebar.html b/docs/_templates/tidelift-sidebar.html
new file mode 100644
index 0000000000..c89c0f09d0
--- /dev/null
+++ b/docs/_templates/tidelift-sidebar.html
@@ -0,0 +1,6 @@
+<h3 class="donation">Professional support</h3>
+
+<p>
+Professionally-supported {{ project }} is available with the
+<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=readme">Tidelift Subscription</a>.
+</p>
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 0000000000..d028733210
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,4 @@
+
+# Custom sidebar templates, maps document names to template names.
+templates_path = ['_templates']
+html_sidebars = {'index': 'tidelift-sidebar.html'}

From f8b9c426b4b3bd074ecfac71026af23a8a41b0dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 12:47:05 -0500
Subject: [PATCH 7344/8469] Make the project page link generic

---
 docs/_templates/indexsidebar.html | 2 +-
 docs/requirements.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 687cd2c986..504de6b069 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -5,7 +5,7 @@ <h3>Download</h3>
 
 <h3>Questions? Suggestions? Contributions?</h3>
 
-<p>Visit the <a href="https://github.com/pypa/setuptools">Setuptools project page</a> </p>
+<p>Visit the <a href="{{ package_url }}">Project page</a> </p>
 
 <h3 class="donation">Professional support</h3>
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
index c6d594e8d5..bc27165b22 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 sphinx!=1.8.0
 rst.linker>=1.9
-jaraco.packaging>=3.2
+jaraco.packaging>=6.1
 
 setuptools>=34

From c6655951aa8292127f01d53c337da1da642efe74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 13:18:15 -0500
Subject: [PATCH 7345/8469] Rely on alabaster theme to support sidebar
 rendering.

---
 docs/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/conf.py b/docs/conf.py
index d028733210..3d109305b4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,5 @@
 
 # Custom sidebar templates, maps document names to template names.
+html_theme = 'alabaster'
 templates_path = ['_templates']
 html_sidebars = {'index': 'tidelift-sidebar.html'}

From 3fc1e22cc2bf43d0266b9193e024c2e9e722a600 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 26 Jan 2019 23:03:59 +0100
Subject: [PATCH 7346/8469] tests: temporary pin pip to fix the Python 2.7 job

---
 tests/requirements.txt | 1 +
 tox.ini                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index d301168a29..f944df2740 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -10,3 +10,4 @@ coverage>=4.5.1
 pytest-cov>=2.5.1
 paver; python_version>="3.6"
 futures; python_version=="2.7"
+pip==18.1  # Temporary workaround for #1644.
diff --git a/tox.ini b/tox.ini
index a2f850dff5..a31cb1c535 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps=-rtests/requirements.txt
 # Changed from default (`python -m pip ...`)
 # to prevent the current working directory
 # from being added to `sys.path`.
-install_command={envbindir}/pip install {opts} {packages}
+install_command=python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages}
 # Same as above.
 list_dependencies_command={envbindir}/pip freeze
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}

From 5cd86987530892bfb01f68ad5f1a2b997a3d01e7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 20:20:12 -0500
Subject: [PATCH 7347/8469] Feed the hobgoblins (delint).

---
 setuptools/tests/files.py                 |   9 +-
 setuptools/tests/server.py                |  14 ++-
 setuptools/tests/test_build_clib.py       |   9 +-
 setuptools/tests/test_config.py           |  16 ++-
 setuptools/tests/test_depends.py          |  18 +--
 setuptools/tests/test_dist.py             |  15 ++-
 setuptools/tests/test_easy_install.py     |   6 +-
 setuptools/tests/test_egg_info.py         |   5 +-
 setuptools/tests/test_find_packages.py    |  11 +-
 setuptools/tests/test_install_scripts.py  |   6 +-
 setuptools/tests/test_integration.py      |  23 ++--
 setuptools/tests/test_manifest.py         | 133 +++++++++++-----------
 setuptools/tests/test_msvc.py             |   5 +-
 setuptools/tests/test_namespaces.py       |   1 -
 setuptools/tests/test_packageindex.py     |  17 ++-
 setuptools/tests/test_pep425tags.py       |   4 +-
 setuptools/tests/test_sandbox.py          |   3 +-
 setuptools/tests/test_setuptools.py       |   9 +-
 setuptools/tests/test_test.py             |   1 -
 setuptools/tests/test_virtualenv.py       |   3 +-
 setuptools/tests/test_wheel.py            |   2 +
 setuptools/tests/test_windows_wrappers.py |  13 ++-
 22 files changed, 183 insertions(+), 140 deletions(-)

diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index 465a6b41e6..bad2189d45 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -6,10 +6,13 @@
 
 def build_files(file_defs, prefix=""):
     """
-    Build a set of files/directories, as described by the file_defs dictionary.
+    Build a set of files/directories, as described by the
+    file_defs dictionary.
 
-    Each key/value pair in the dictionary is interpreted as a filename/contents
-    pair. If the contents value is a dictionary, a directory is created, and the
+    Each key/value pair in the dictionary is interpreted as
+    a filename/contents
+    pair. If the contents value is a dictionary, a directory
+    is created, and the
     dictionary interpreted as the files within it, recursively.
 
     For example:
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 35312120bb..fc3a5975ef 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -19,10 +19,11 @@ class IndexServer(BaseHTTPServer.HTTPServer):
         s.stop()
     """
 
-    def __init__(self, server_address=('', 0),
+    def __init__(
+            self, server_address=('', 0),
             RequestHandlerClass=SimpleHTTPServer.SimpleHTTPRequestHandler):
-        BaseHTTPServer.HTTPServer.__init__(self, server_address,
-            RequestHandlerClass)
+        BaseHTTPServer.HTTPServer.__init__(
+            self, server_address, RequestHandlerClass)
         self._run = True
 
     def start(self):
@@ -56,10 +57,11 @@ class MockServer(BaseHTTPServer.HTTPServer, threading.Thread):
     A simple HTTP Server that records the requests made to it.
     """
 
-    def __init__(self, server_address=('', 0),
+    def __init__(
+            self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
-        BaseHTTPServer.HTTPServer.__init__(self, server_address,
-            RequestHandlerClass)
+        BaseHTTPServer.HTTPServer.__init__(
+            self, server_address, RequestHandlerClass)
         threading.Thread.__init__(self)
         self.setDaemon(True)
         self.requests = []
diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py
index aebcc350ec..3779e679ea 100644
--- a/setuptools/tests/test_build_clib.py
+++ b/setuptools/tests/test_build_clib.py
@@ -1,6 +1,4 @@
 import pytest
-import os
-import shutil
 
 import mock
 from distutils.errors import DistutilsSetupError
@@ -40,13 +38,14 @@ def test_build_libraries(self, mock_newer):
         # with that out of the way, let's see if the crude dependency
         # system works
         cmd.compiler = mock.MagicMock(spec=cmd.compiler)
-        mock_newer.return_value = ([],[])
+        mock_newer.return_value = ([], [])
 
         obj_deps = {'': ('global.h',), 'example.c': ('example.h',)}
-        libs = [('example', {'sources': ['example.c'] ,'obj_deps': obj_deps})]
+        libs = [('example', {'sources': ['example.c'], 'obj_deps': obj_deps})]
 
         cmd.build_libraries(libs)
-        assert [['example.c', 'global.h', 'example.h']] in mock_newer.call_args[0]
+        assert [['example.c', 'global.h', 'example.h']] in \
+            mock_newer.call_args[0]
         assert not cmd.compiler.compile.called
         assert cmd.compiler.create_static_lib.call_count == 1
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 53b8a956c4..a6b44b9f2c 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -8,6 +8,7 @@
 from . import py2_only, py3_only
 from .textwrap import DALS
 
+
 class ErrConfigHandler(ConfigHandler):
     """Erroneous handler. Fails to implement required methods."""
 
@@ -18,8 +19,8 @@ def make_package_dir(name, base_dir, ns=False):
         dir_package = dir_package.mkdir(dir_name)
     init_file = None
     if not ns:
-      init_file = dir_package.join('__init__.py')
-      init_file.write('')
+        init_file = dir_package.join('__init__.py')
+        init_file.write('')
     return dir_package, init_file
 
 
@@ -308,7 +309,7 @@ def test_version_file(self, tmpdir):
         tmpdir.join('fake_package', 'version.txt').write('1.2.3\n4.5.6\n')
         with pytest.raises(DistutilsOptionError):
             with get_dist(tmpdir) as dist:
-                _ = dist.metadata.version
+                dist.metadata.version
 
     def test_version_with_package_dir_simple(self, tmpdir):
 
@@ -451,7 +452,7 @@ def test_basic(self, tmpdir):
             'tests_require = mock==0.7.2; pytest\n'
             'setup_requires = docutils>=0.3; spack ==1.1, ==1.3; there\n'
             'dependency_links = http://some.com/here/1, '
-                'http://some.com/there/2\n'
+            'http://some.com/there/2\n'
             'python_requires = >=1.0, !=2.8\n'
             'py_modules = module1, module2\n'
         )
@@ -659,7 +660,7 @@ def test_find_namespace_directive(self, tmpdir):
         dir_sub_two, _ = make_package_dir('sub_two', dir_package, ns=True)
 
         with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == { 
+            assert set(dist.packages) == {
                 'fake_package', 'fake_package.sub_two', 'fake_package.sub_one'
             }
 
@@ -711,7 +712,7 @@ def test_entry_points(self, tmpdir):
             tmpdir,
             '[options.entry_points]\n'
             'group1 = point1 = pack.module:func, '
-                '.point2 = pack.module2:func_rest [rest]\n'
+            '.point2 = pack.module2:func_rest [rest]\n'
             'group2 = point3 = pack.module:func2\n'
         )
 
@@ -757,7 +758,10 @@ def test_data_files(self, tmpdir):
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
+
 saved_dist_init = _Distribution.__init__
+
+
 class TestExternalSetters:
     # During creation of the setuptools Distribution() object, we call
     # the init of the parent distutils Distribution object via
diff --git a/setuptools/tests/test_depends.py b/setuptools/tests/test_depends.py
index e0cfa88049..bff1dfb199 100644
--- a/setuptools/tests/test_depends.py
+++ b/setuptools/tests/test_depends.py
@@ -5,12 +5,12 @@
 
 class TestGetModuleConstant:
 
-	def test_basic(self):
-		"""
-		Invoke get_module_constant on a module in
-		the test package.
-		"""
-		mod_name = 'setuptools.tests.mod_with_constant'
-		val = depends.get_module_constant(mod_name, 'value')
-		assert val == 'three, sir!'
-		assert 'setuptools.tests.mod_with_constant' not in sys.modules
+    def test_basic(self):
+        """
+        Invoke get_module_constant on a module in
+        the test package.
+        """
+        mod_name = 'setuptools.tests.mod_with_constant'
+        val = depends.get_module_constant(mod_name, 'value')
+        assert val == 'three, sir!'
+        assert 'setuptools.tests.mod_with_constant' not in sys.modules
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index cf830b437d..390c3dfcf0 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -14,6 +14,7 @@
 
 import pytest
 
+
 def test_dist_fetch_build_egg(tmpdir):
     """
     Check multiple calls to `Distribution.fetch_build_egg` work as expected.
@@ -90,30 +91,32 @@ def merge_dicts(d1, d2):
             'classifiers': [
                 'Programming Language :: Python :: 3',
                 'Programming Language :: Python :: 3.7',
-                'License :: OSI Approved :: MIT License'
-        ]})),
+                'License :: OSI Approved :: MIT License',
+            ]})),
         ('Metadata version 1.1: Download URL', merge_dicts(base_attrs, {
             'download_url': 'https://example.com'
         })),
         ('Metadata Version 1.2: Requires-Python', merge_dicts(base_attrs, {
             'python_requires': '>=3.7'
         })),
-        pytest.param('Metadata Version 1.2: Project-Url',
+        pytest.param(
+            'Metadata Version 1.2: Project-Url',
             merge_dicts(base_attrs, {
                 'project_urls': {
                     'Foo': 'https://example.bar'
                 }
             }), marks=pytest.mark.xfail(
                 reason="Issue #1578: project_urls not read"
-        )),
+            )),
         ('Metadata Version 2.1: Long Description Content Type',
          merge_dicts(base_attrs, {
              'long_description_content_type': 'text/x-rst; charset=UTF-8'
          })),
-        pytest.param('Metadata Version 2.1: Provides Extra',
+        pytest.param(
+            'Metadata Version 2.1: Provides Extra',
             merge_dicts(base_attrs, {
                 'provides_extras': ['foo', 'bar']
-        }), marks=pytest.mark.xfail(reason="provides_extras not read")),
+            }), marks=pytest.mark.xfail(reason="provides_extras not read")),
         ('Missing author, missing author e-mail',
          {'name': 'foo', 'version': '1.0.0'}),
         ('Missing author',
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2cf65ae7e5..c3fd1c6ef4 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,7 +15,9 @@
 import io
 import zipfile
 import mock
-from setuptools.command.easy_install import EasyInstallDeprecationWarning, ScriptWriter, WindowsScriptWriter
+from setuptools.command.easy_install import (
+    EasyInstallDeprecationWarning, ScriptWriter, WindowsScriptWriter,
+)
 import time
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
@@ -287,7 +289,6 @@ def test_script_install(self, sdist_script, tmpdir, monkeypatch):
         cmd.easy_install(sdist_script)
         assert (target / 'mypkg_script').exists()
 
-
     def test_dist_get_script_args_deprecated(self):
         with pytest.warns(EasyInstallDeprecationWarning):
             ScriptWriter.get_script_args(None, None)
@@ -304,6 +305,7 @@ def test_dist_WindowsScriptWriter_get_writer_deprecated(self):
         with pytest.warns(EasyInstallDeprecationWarning):
             WindowsScriptWriter.get_writer()
 
+
 @pytest.mark.filterwarnings('ignore:Unbuilt egg')
 class TestPTHFileWriter:
     def test_add_from_cwd_site_sets_dirty(self):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 979ff18e4e..571e605404 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,4 +1,3 @@
-import datetime
 import sys
 import ast
 import os
@@ -7,7 +6,9 @@
 import stat
 import time
 
-from setuptools.command.egg_info import egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision
+from setuptools.command.egg_info import (
+    egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision,
+)
 from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map
 
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index b08f91c7d5..ab26b4f128 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -12,10 +12,10 @@
 from setuptools.extern.six import PY3
 from setuptools import find_packages
 if PY3:
-  from setuptools import find_namespace_packages
+    from setuptools import find_namespace_packages
 
-# modeled after CPython's test.support.can_symlink
 
+# modeled after CPython's test.support.can_symlink
 def can_symlink():
     TESTFN = tempfile.mktemp()
     symlink_path = TESTFN + "can_symlink"
@@ -164,12 +164,14 @@ def test_pep420_ns_package(self):
     def test_pep420_ns_package_no_includes(self):
         packages = find_namespace_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
-        self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
+        self._assert_packages(
+            packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
     @py3_only
     def test_pep420_ns_package_no_includes_or_excludes(self):
         packages = find_namespace_packages(self.dist_dir)
-        expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
+        expected = [
+            'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self._assert_packages(packages, expected)
 
     @py3_only
@@ -185,4 +187,3 @@ def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
         packages = find_namespace_packages(self.dist_dir)
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
-
diff --git a/setuptools/tests/test_install_scripts.py b/setuptools/tests/test_install_scripts.py
index 727ad65b13..4338c792f1 100644
--- a/setuptools/tests/test_install_scripts.py
+++ b/setuptools/tests/test_install_scripts.py
@@ -64,7 +64,8 @@ def test_sys_executable_escaping_win32(self, tmpdir, monkeypatch):
     @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only')
     def test_executable_with_spaces_escaping_unix(self, tmpdir):
         """
-        Ensure that shebang on Unix is not quoted, even when a value with spaces
+        Ensure that shebang on Unix is not quoted, even when
+        a value with spaces
         is specified using --executable.
         """
         expected = '#!%s\n' % self.unix_spaces_exe
@@ -77,7 +78,8 @@ def test_executable_with_spaces_escaping_unix(self, tmpdir):
     @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only')
     def test_executable_arg_escaping_win32(self, tmpdir):
         """
-        Ensure that shebang on Windows is quoted when getting a path with spaces
+        Ensure that shebang on Windows is quoted when
+        getting a path with spaces
         from --executable, that is itself properly quoted.
         """
         expected = '#!"%s"\n' % self.win32_exe
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 3a9a6c50a1..e54f3209aa 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -6,6 +6,11 @@
 import glob
 import os
 import sys
+import re
+import subprocess
+import functools
+import tarfile
+import zipfile
 
 from setuptools.extern.six.moves import urllib
 import pytest
@@ -114,15 +119,12 @@ def test_pyuri(install_context):
     assert os.path.exists(os.path.join(pyuri.location, 'pyuri', 'uri.regex'))
 
 
-import re
-import subprocess
-import functools
-import tarfile, zipfile
+build_deps = ['appdirs', 'packaging', 'pyparsing', 'six']
 
 
-build_deps = ['appdirs', 'packaging', 'pyparsing', 'six']
 @pytest.mark.parametrize("build_dep", build_deps)
-@pytest.mark.skipif(sys.version_info < (3, 6), reason='run only on late versions')
+@pytest.mark.skipif(
+    sys.version_info < (3, 6), reason='run only on late versions')
 def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
     """
     All setuptools build dependencies must build without
@@ -149,13 +151,16 @@ def install(pkg_dir, install_dir):
         breaker.write('raise ImportError()')
     cmd = [sys.executable, 'setup.py', 'install', '--prefix', install_dir]
     env = dict(os.environ, PYTHONPATH=pkg_dir)
-    output = subprocess.check_output(cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
+    output = subprocess.check_output(
+        cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
     return output.decode('utf-8')
 
 
 def download_and_extract(request, req, target):
-    cmd = [sys.executable, '-m', 'pip', 'download', '--no-deps',
-        '--no-binary', ':all:', req]
+    cmd = [
+        sys.executable, '-m', 'pip', 'download', '--no-deps',
+        '--no-binary', ':all:', req,
+    ]
     output = subprocess.check_output(cmd, encoding='utf-8')
     filename = re.search('Saved (.*)', output).group(1)
     request.addfinalizer(functools.partial(os.remove, filename))
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 5edfbea003..2a0e9c8625 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -15,7 +15,6 @@
 from setuptools.dist import Distribution
 from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
-from . import py3_only
 
 import pytest
 
@@ -74,7 +73,9 @@ def touch(filename):
 
     # Glob matching
     ('*.txt', ['foo.txt', 'bar.txt'], ['foo/foo.txt']),
-    ('dir/*.txt', ['dir/foo.txt', 'dir/bar.txt', 'dir/.txt'], ['notdir/foo.txt']),
+    (
+        'dir/*.txt',
+        ['dir/foo.txt', 'dir/bar.txt', 'dir/.txt'], ['notdir/foo.txt']),
     ('*/*.py', ['bin/start.py'], []),
     ('docs/page-?.txt', ['docs/page-9.txt'], ['docs/page-10.txt']),
 
@@ -243,77 +244,77 @@ def test_include(self):
 
     def test_exclude(self):
         """Include everything in app/ except the text files"""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest(
             """
             include app/*
             exclude app/*.txt
             """)
-        files = default_files | set([l('app/c.rst')])
+        files = default_files | set([ml('app/c.rst')])
         assert files == self.get_files()
 
     def test_include_multiple(self):
         """Include with multiple patterns."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest("include app/*.txt app/static/*")
         files = default_files | set([
-            l('app/a.txt'), l('app/b.txt'),
-            l('app/static/app.js'), l('app/static/app.js.map'),
-            l('app/static/app.css'), l('app/static/app.css.map')])
+            ml('app/a.txt'), ml('app/b.txt'),
+            ml('app/static/app.js'), ml('app/static/app.js.map'),
+            ml('app/static/app.css'), ml('app/static/app.css.map')])
         assert files == self.get_files()
 
     def test_graft(self):
         """Include the whole app/static/ directory."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest("graft app/static")
         files = default_files | set([
-            l('app/static/app.js'), l('app/static/app.js.map'),
-            l('app/static/app.css'), l('app/static/app.css.map')])
+            ml('app/static/app.js'), ml('app/static/app.js.map'),
+            ml('app/static/app.css'), ml('app/static/app.css.map')])
         assert files == self.get_files()
 
     def test_graft_glob_syntax(self):
         """Include the whole app/static/ directory."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest("graft */static")
         files = default_files | set([
-            l('app/static/app.js'), l('app/static/app.js.map'),
-            l('app/static/app.css'), l('app/static/app.css.map')])
+            ml('app/static/app.js'), ml('app/static/app.js.map'),
+            ml('app/static/app.css'), ml('app/static/app.css.map')])
         assert files == self.get_files()
 
     def test_graft_global_exclude(self):
         """Exclude all *.map files in the project."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest(
             """
             graft app/static
             global-exclude *.map
             """)
         files = default_files | set([
-            l('app/static/app.js'), l('app/static/app.css')])
+            ml('app/static/app.js'), ml('app/static/app.css')])
         assert files == self.get_files()
 
     def test_global_include(self):
         """Include all *.rst, *.js, and *.css files in the whole tree."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest(
             """
             global-include *.rst *.js *.css
             """)
         files = default_files | set([
-            '.hidden.rst', 'testing.rst', l('app/c.rst'),
-            l('app/static/app.js'), l('app/static/app.css')])
+            '.hidden.rst', 'testing.rst', ml('app/c.rst'),
+            ml('app/static/app.js'), ml('app/static/app.css')])
         assert files == self.get_files()
 
     def test_graft_prune(self):
         """Include all files in app/, except for the whole app/static/ dir."""
-        l = make_local_path
+        ml = make_local_path
         self.make_manifest(
             """
             graft app
             prune app/static
             """)
         files = default_files | set([
-            l('app/a.txt'), l('app/b.txt'), l('app/c.rst')])
+            ml('app/a.txt'), ml('app/b.txt'), ml('app/c.rst')])
         assert files == self.get_files()
 
 
@@ -369,7 +370,7 @@ def make_files(self, files):
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns
         file_list = FileList()
-        l = make_local_path
+        ml = make_local_path
 
         # simulated file list
         self.make_files([
@@ -377,16 +378,16 @@ def test_process_template_line(self):
             'buildout.cfg',
             # filelist does not filter out VCS directories,
             # it's sdist that does
-            l('.hg/last-message.txt'),
-            l('global/one.txt'),
-            l('global/two.txt'),
-            l('global/files.x'),
-            l('global/here.tmp'),
-            l('f/o/f.oo'),
-            l('dir/graft-one'),
-            l('dir/dir2/graft2'),
-            l('dir3/ok'),
-            l('dir3/sub/ok.txt'),
+            ml('.hg/last-message.txt'),
+            ml('global/one.txt'),
+            ml('global/two.txt'),
+            ml('global/files.x'),
+            ml('global/here.tmp'),
+            ml('f/o/f.oo'),
+            ml('dir/graft-one'),
+            ml('dir/dir2/graft2'),
+            ml('dir3/ok'),
+            ml('dir3/sub/ok.txt'),
         ])
 
         MANIFEST_IN = DALS("""\
@@ -413,12 +414,12 @@ def test_process_template_line(self):
             'buildout.cfg',
             'four.txt',
             'ok',
-            l('.hg/last-message.txt'),
-            l('dir/graft-one'),
-            l('dir/dir2/graft2'),
-            l('f/o/f.oo'),
-            l('global/one.txt'),
-            l('global/two.txt'),
+            ml('.hg/last-message.txt'),
+            ml('dir/graft-one'),
+            ml('dir/dir2/graft2'),
+            ml('f/o/f.oo'),
+            ml('global/one.txt'),
+            ml('global/two.txt'),
         ]
 
         file_list.sort()
@@ -475,10 +476,10 @@ def test_process_template_line_invalid(self):
                 assert False, "Should have thrown an error"
 
     def test_include(self):
-        l = make_local_path
+        ml = make_local_path
         # include
         file_list = FileList()
-        self.make_files(['a.py', 'b.txt', l('d/c.py')])
+        self.make_files(['a.py', 'b.txt', ml('d/c.py')])
 
         file_list.process_template_line('include *.py')
         file_list.sort()
@@ -491,42 +492,42 @@ def test_include(self):
         self.assertWarnings()
 
     def test_exclude(self):
-        l = make_local_path
+        ml = make_local_path
         # exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
+        file_list.files = ['a.py', 'b.txt', ml('d/c.py')]
 
         file_list.process_template_line('exclude *.py')
         file_list.sort()
-        assert file_list.files == ['b.txt', l('d/c.py')]
+        assert file_list.files == ['b.txt', ml('d/c.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('exclude *.rb')
         file_list.sort()
-        assert file_list.files == ['b.txt', l('d/c.py')]
+        assert file_list.files == ['b.txt', ml('d/c.py')]
         self.assertWarnings()
 
     def test_global_include(self):
-        l = make_local_path
+        ml = make_local_path
         # global-include
         file_list = FileList()
-        self.make_files(['a.py', 'b.txt', l('d/c.py')])
+        self.make_files(['a.py', 'b.txt', ml('d/c.py')])
 
         file_list.process_template_line('global-include *.py')
         file_list.sort()
-        assert file_list.files == ['a.py', l('d/c.py')]
+        assert file_list.files == ['a.py', ml('d/c.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('global-include *.rb')
         file_list.sort()
-        assert file_list.files == ['a.py', l('d/c.py')]
+        assert file_list.files == ['a.py', ml('d/c.py')]
         self.assertWarnings()
 
     def test_global_exclude(self):
-        l = make_local_path
+        ml = make_local_path
         # global-exclude
         file_list = FileList()
-        file_list.files = ['a.py', 'b.txt', l('d/c.py')]
+        file_list.files = ['a.py', 'b.txt', ml('d/c.py')]
 
         file_list.process_template_line('global-exclude *.py')
         file_list.sort()
@@ -539,65 +540,65 @@ def test_global_exclude(self):
         self.assertWarnings()
 
     def test_recursive_include(self):
-        l = make_local_path
+        ml = make_local_path
         # recursive-include
         file_list = FileList()
-        self.make_files(['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')])
+        self.make_files(['a.py', ml('d/b.py'), ml('d/c.txt'), ml('d/d/e.py')])
 
         file_list.process_template_line('recursive-include d *.py')
         file_list.sort()
-        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-include e *.py')
         file_list.sort()
-        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')]
         self.assertWarnings()
 
     def test_recursive_exclude(self):
-        l = make_local_path
+        ml = make_local_path
         # recursive-exclude
         file_list = FileList()
-        file_list.files = ['a.py', l('d/b.py'), l('d/c.txt'), l('d/d/e.py')]
+        file_list.files = ['a.py', ml('d/b.py'), ml('d/c.txt'), ml('d/d/e.py')]
 
         file_list.process_template_line('recursive-exclude d *.py')
         file_list.sort()
-        assert file_list.files == ['a.py', l('d/c.txt')]
+        assert file_list.files == ['a.py', ml('d/c.txt')]
         self.assertNoWarnings()
 
         file_list.process_template_line('recursive-exclude e *.py')
         file_list.sort()
-        assert file_list.files == ['a.py', l('d/c.txt')]
+        assert file_list.files == ['a.py', ml('d/c.txt')]
         self.assertWarnings()
 
     def test_graft(self):
-        l = make_local_path
+        ml = make_local_path
         # graft
         file_list = FileList()
-        self.make_files(['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')])
+        self.make_files(['a.py', ml('d/b.py'), ml('d/d/e.py'), ml('f/f.py')])
 
         file_list.process_template_line('graft d')
         file_list.sort()
-        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('graft e')
         file_list.sort()
-        assert file_list.files == [l('d/b.py'), l('d/d/e.py')]
+        assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')]
         self.assertWarnings()
 
     def test_prune(self):
-        l = make_local_path
+        ml = make_local_path
         # prune
         file_list = FileList()
-        file_list.files = ['a.py', l('d/b.py'), l('d/d/e.py'), l('f/f.py')]
+        file_list.files = ['a.py', ml('d/b.py'), ml('d/d/e.py'), ml('f/f.py')]
 
         file_list.process_template_line('prune d')
         file_list.sort()
-        assert file_list.files == ['a.py', l('f/f.py')]
+        assert file_list.files == ['a.py', ml('f/f.py')]
         self.assertNoWarnings()
 
         file_list.process_template_line('prune e')
         file_list.sort()
-        assert file_list.files == ['a.py', l('f/f.py')]
+        assert file_list.files == ['a.py', ml('f/f.py')]
         self.assertWarnings()
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 32d7a907cf..24e38ea880 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -49,7 +49,8 @@ def read_values(cls, base, key):
             for k in hive if k.startswith(key.lower())
         )
 
-    return mock.patch.multiple(distutils.msvc9compiler.Reg,
+    return mock.patch.multiple(
+        distutils.msvc9compiler.Reg,
         read_keys=read_keys, read_values=read_values)
 
 
@@ -61,7 +62,7 @@ class TestModulePatch:
     """
 
     key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
-    key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
+    key_64 = key_32.replace(r'\microsoft', r'\wow6432node\microsoft')
 
     def test_patched(self):
         "Test the module is actually patched"
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 670ccee915..f937d98189 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-import os
 import sys
 import subprocess
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 13cffb7ebc..ab371884d9 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -44,7 +44,10 @@ def test_bad_url_typo(self):
             hosts=('www.example.com',)
         )
 
-        url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk'
+        url = (
+            'url:%20https://svn.plone.org/svn'
+            '/collective/inquant.contentmirror.plone/trunk'
+        )
         try:
             v = index.open_url(url)
         except Exception as v:
@@ -63,9 +66,9 @@ def _urlopen(*args):
         index.opener = _urlopen
         url = 'http://example.com'
         try:
-            v = index.open_url(url)
-        except Exception as v:
-            assert 'line' in str(v)
+            index.open_url(url)
+        except Exception as exc:
+            assert 'line' in str(exc)
         else:
             raise AssertionError('Should have raise here!')
 
@@ -83,7 +86,11 @@ def test_bad_url_double_scheme(self):
             index.open_url(url)
         except distutils.errors.DistutilsError as error:
             msg = six.text_type(error)
-            assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg or 'Name or service not known' in msg
+            assert (
+                'nonnumeric port' in msg
+                or 'getaddrinfo failed' in msg
+                or 'Name or service not known' in msg
+            )
             return
         raise RuntimeError("Did not raise")
 
diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
index f558a0d87c..30afdec7d4 100644
--- a/setuptools/tests/test_pep425tags.py
+++ b/setuptools/tests/test_pep425tags.py
@@ -32,7 +32,9 @@ def abi_tag_unicode(self, flags, config_vars):
         if sys.version_info < (3, 3):
             config_vars.update({'Py_UNICODE_SIZE': 2})
             mock_gcf = self.mock_get_config_var(**config_vars)
-            with patch('setuptools.pep425tags.sysconfig.get_config_var', mock_gcf):
+            with patch(
+                    'setuptools.pep425tags.sysconfig.get_config_var',
+                    mock_gcf):
                 abi_tag = pep425tags.get_abi_tag()
                 assert abi_tag == base + flags
 
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
index d867542229..99398cdb93 100644
--- a/setuptools/tests/test_sandbox.py
+++ b/setuptools/tests/test_sandbox.py
@@ -26,7 +26,8 @@ def test_setup_py_with_BOM(self):
         """
         It should be possible to execute a setup.py with a Byte Order Mark
         """
-        target = pkg_resources.resource_filename(__name__,
+        target = pkg_resources.resource_filename(
+            __name__,
             'script-with-bom.py')
         namespace = types.ModuleType('namespace')
         setuptools.sandbox._execfile(target, vars(namespace))
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 7aae3a163a..5896a69ae6 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -77,7 +77,8 @@ def testModuleExtract(self):
         from json import __version__
         assert dep.get_module_constant('json', '__version__') == __version__
         assert dep.get_module_constant('sys', 'version') == sys.version
-        assert dep.get_module_constant('setuptools.tests.test_setuptools', '__doc__') == __doc__
+        assert dep.get_module_constant(
+            'setuptools.tests.test_setuptools', '__doc__') == __doc__
 
     @needs_bytecode
     def testRequire(self):
@@ -216,7 +217,8 @@ def setup_method(self, method):
         self.req = Require('Distutils', '1.0.3', 'distutils')
         self.dist = makeSetup(
             features={
-                'foo': Feature("foo", standard=True, require_features=['baz', self.req]),
+                'foo': Feature(
+                    "foo", standard=True, require_features=['baz', self.req]),
                 'bar': Feature("bar", standard=True, packages=['pkg.bar'],
                                py_modules=['bar_et'], remove=['bar.ext'],
                                ),
@@ -252,7 +254,8 @@ def testFeatureOptions(self):
             ('with-dwim', None, 'include DWIM') in dist.feature_options
         )
         assert (
-            ('without-dwim', None, 'exclude DWIM (default)') in dist.feature_options
+            ('without-dwim', None, 'exclude DWIM (default)')
+            in dist.feature_options
         )
         assert (
             ('with-bar', None, 'include bar (default)') in dist.feature_options
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 8d1425e187..faaa6ba90a 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -4,7 +4,6 @@
 
 from distutils import log
 import os
-import sys
 
 import pytest
 
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 7b5fea1738..3d5c84b067 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,4 +1,3 @@
-import distutils.command
 import glob
 import os
 import sys
@@ -141,7 +140,7 @@ def test_no_missing_dependencies(bare_virtualenv):
     """
     Quick and dirty test to ensure all external dependencies are vendored.
     """
-    for command in ('upload',):#sorted(distutils.command.__all__):
+    for command in ('upload',):  # sorted(distutils.command.__all__):
         bare_virtualenv.run(' && '.join((
             'cd {source}',
             'python setup.py {command} -h',
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 6db5fa117e..e85a4a7e8d 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -63,6 +63,7 @@
     }),
 )
 
+
 @pytest.mark.parametrize(
     ('filename', 'info'), WHEEL_INFO_TESTS,
     ids=[t[0] for t in WHEEL_INFO_TESTS]
@@ -487,6 +488,7 @@ def __repr__(self):
 
 )
 
+
 @pytest.mark.parametrize(
     'params', WHEEL_INSTALL_TESTS,
     ids=list(params['id'] for params in WHEEL_INSTALL_TESTS),
diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index d2871c0f40..2553394a26 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -97,7 +97,8 @@ def test_basic(self, tmpdir):
             'arg 4\\',
             'arg5 a\\\\b',
         ]
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+        proc = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
         stdout, stderr = proc.communicate('hello\nworld\n'.encode('ascii'))
         actual = stdout.decode('ascii').replace('\r\n', '\n')
         expected = textwrap.dedent(r"""
@@ -134,7 +135,11 @@ def test_with_options(self, tmpdir):
         with (tmpdir / 'foo-script.py').open('w') as f:
             f.write(self.prep_script(tmpl))
         cmd = [str(tmpdir / 'foo.exe')]
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+        proc = subprocess.Popen(
+            cmd,
+            stdout=subprocess.PIPE,
+            stdin=subprocess.PIPE,
+            stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()
         actual = stdout.decode('ascii').replace('\r\n', '\n')
         expected = textwrap.dedent(r"""
@@ -172,7 +177,9 @@ def test_basic(self, tmpdir):
             str(tmpdir / 'test_output.txt'),
             'Test Argument',
         ]
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT)
+        proc = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
+            stderr=subprocess.STDOUT)
         stdout, stderr = proc.communicate()
         assert not stdout
         assert not stderr

From b1615d12435289c21853be2f4f40e523317998da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 21:45:33 -0500
Subject: [PATCH 7348/8469] Adopt
 distutils.dist.Distribution._set_command_options to support better string
 detection.

---
 setuptools/dist.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4cc3bdfe7a..a7ebe73bca 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,6 +14,7 @@
 from distutils.errors import DistutilsOptionError
 from distutils.util import strtobool
 from distutils.debug import DEBUG
+from distutils.fancy_getopt import translate_longopt
 import itertools
 
 from collections import defaultdict
@@ -626,6 +627,53 @@ def _parse_config_files(self, filenames=None):
                 except ValueError as msg:
                     raise DistutilsOptionError(msg)
 
+    def _set_command_options(self, command_obj, option_dict=None):
+        """
+        Set the options for 'command_obj' from 'option_dict'.  Basically
+        this means copying elements of a dictionary ('option_dict') to
+        attributes of an instance ('command').
+
+        'command_obj' must be a Command instance.  If 'option_dict' is not
+        supplied, uses the standard option dictionary for this command
+        (from 'self.command_options').
+
+        (Adopted from distutils.dist.Distribution._set_command_options)
+        """
+        command_name = command_obj.get_command_name()
+        if option_dict is None:
+            option_dict = self.get_option_dict(command_name)
+
+        if DEBUG:
+            self.announce("  setting options for '%s' command:" % command_name)
+        for (option, (source, value)) in option_dict.items():
+            if DEBUG:
+                self.announce("    %s = %s (from %s)" % (option, value,
+                                                         source))
+            try:
+                bool_opts = [translate_longopt(o)
+                             for o in command_obj.boolean_options]
+            except AttributeError:
+                bool_opts = []
+            try:
+                neg_opt = command_obj.negative_opt
+            except AttributeError:
+                neg_opt = {}
+
+            try:
+                is_string = isinstance(value, str)
+                if option in neg_opt and is_string:
+                    setattr(command_obj, neg_opt[option], not strtobool(value))
+                elif option in bool_opts and is_string:
+                    setattr(command_obj, option, strtobool(value))
+                elif hasattr(command_obj, option):
+                    setattr(command_obj, option, value)
+                else:
+                    raise DistutilsOptionError(
+                        "error in %s: command '%s' has no such option '%s'"
+                        % (source, command_name, option))
+            except ValueError as msg:
+                raise DistutilsOptionError(msg)
+
     def parse_config_files(self, filenames=None, ignore_option_errors=False):
         """Parses configuration files from various levels
         and loads configuration.

From 249f24a1f04ce390a9e48a4d8a5bff7982714c86 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 26 Jan 2019 21:48:38 -0500
Subject: [PATCH 7349/8469] Fix test failure by better detecting string options
 from an updated ConfigParser.

---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index a7ebe73bca..b8551228eb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -660,7 +660,7 @@ def _set_command_options(self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                is_string = isinstance(value, str)
+                is_string = isinstance(value, six.string_types)
                 if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:

From 78fd73026ad7284819936b651f7cfbe8a1ec98c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Jan 2019 09:16:47 -0500
Subject: [PATCH 7350/8469] =?UTF-8?q?Bump=20version:=2040.6.3=20=E2=86=92?=
 =?UTF-8?q?=2040.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                   | 10 ++++++++++
 changelog.d/1180.change.rst   |  1 -
 changelog.d/1499.change.rst   |  1 -
 changelog.d/1544.change.rst   |  1 -
 changelog.d/1551.breaking.rst |  1 -
 changelog.d/1625.change.rst   |  1 -
 setup.cfg                     |  3 ++-
 setup.py                      |  2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/1180.change.rst
 delete mode 100644 changelog.d/1499.change.rst
 delete mode 100644 changelog.d/1544.change.rst
 delete mode 100644 changelog.d/1551.breaking.rst
 delete mode 100644 changelog.d/1625.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 48a176a815..ca7122e993 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v40.7.0
+-------
+
+* #1551: File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
+* #1180: Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
+* #1499: ``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
+* #1544: Added tests for PackageIndex.download (for git URLs).
+* #1625: In PEP 517 build_meta builder, ensure that sdists are built as gztar per the spec.
+
+
 v40.6.3
 -------
 
diff --git a/changelog.d/1180.change.rst b/changelog.d/1180.change.rst
deleted file mode 100644
index 2e0f78bf7a..0000000000
--- a/changelog.d/1180.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
diff --git a/changelog.d/1499.change.rst b/changelog.d/1499.change.rst
deleted file mode 100644
index 10e4db6824..0000000000
--- a/changelog.d/1499.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
diff --git a/changelog.d/1544.change.rst b/changelog.d/1544.change.rst
deleted file mode 100644
index 748b64e1c2..0000000000
--- a/changelog.d/1544.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added tests for PackageIndex.download (for git URLs).
diff --git a/changelog.d/1551.breaking.rst b/changelog.d/1551.breaking.rst
deleted file mode 100644
index c0e477ce81..0000000000
--- a/changelog.d/1551.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
diff --git a/changelog.d/1625.change.rst b/changelog.d/1625.change.rst
deleted file mode 100644
index 9125ac0ced..0000000000
--- a/changelog.d/1625.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In PEP 517 build_meta builder, ensure that sdists are built as gztar per the spec.
diff --git a/setup.cfg b/setup.cfg
index dd404469fe..78eb7596fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.3
+current_version = 40.7.0
 commit = True
 tag = True
 
@@ -26,3 +26,4 @@ universal = 1
 license_file = LICENSE
 
 [bumpversion:file:setup.py]
+
diff --git a/setup.py b/setup.py
index 67d5691d3b..00db0f0a33 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.3",
+    version="40.7.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 91d769e88f0ae9e5dfce1fb9448864201407b579 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Jan 2019 11:07:40 -0500
Subject: [PATCH 7351/8469] Disallow Windows absolute paths unconditionally
 with no deprecation period.

---
 pkg_resources/__init__.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b30392facb..dcfa1d0843 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -39,6 +39,8 @@
 import textwrap
 import itertools
 import inspect
+import ntpath
+import posixpath
 from pkgutil import get_importer
 
 try:
@@ -1497,15 +1499,34 @@ def _validate_resource_path(path):
         >>> vrp('foo/f../bar.txt')
         >>> bool(warned)
         False
+
+        Windows path separators are straight-up disallowed.
+        >>> vrp(r'\\foo/bar.txt')
+        Traceback (most recent call last):
+        ...
+        ValueError: Use of .. or absolute path in a resource path \
+is not allowed.
+
+        >>> vrp(r'C:\\foo/bar.txt')
+        Traceback (most recent call last):
+        ...
+        ValueError: Use of .. or absolute path in a resource path \
+is not allowed.
         """
         invalid = (
-            '..' in path.split('/') or
-            path.startswith('/')
+            os.path.pardir in path.split(posixpath.sep) or
+            posixpath.isabs(path) or
+            ntpath.isabs(path)
         )
         if not invalid:
             return
 
-        msg = "Use of .. or leading '/' in a resource path is not allowed."
+        msg = "Use of .. or absolute path in a resource path is not allowed."
+
+        # Aggressively disallow Windows absolute paths
+        if ntpath.isabs(path) and not posixpath.isabs(path):
+            raise ValueError(msg)
+
         # for compatibility, warn; in future
         # raise ValueError(msg)
         warnings.warn(

From 6636302f735d94fe91b83469f1610e4112a91838 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Jan 2019 13:01:20 -0500
Subject: [PATCH 7352/8469] Update documentation to match more aggressive
 absolute path exclusion in resources.

---
 changelog.d/1635.change.rst | 2 +-
 docs/pkg_resources.txt      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/changelog.d/1635.change.rst b/changelog.d/1635.change.rst
index 7c35dfd196..d23f3fe30c 100644
--- a/changelog.d/1635.change.rst
+++ b/changelog.d/1635.change.rst
@@ -1 +1 @@
-Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents or begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors.
+Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents, that begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors. Additionally, any paths that are absolute on Windows are strictly disallowed and will raise ValueErrors.
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index cdc1a5a505..806f1b1468 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1133,8 +1133,7 @@ segment will be treated as a peer of the top-level modules or packages in the
 distribution.
 
 Note that resource names must be ``/``-separated paths rooted at the package,
-cannot contain relative names like ``".."``, and cannot begin with a
-leading ``/``.  Do *not* use
+cannot contain relative names like ``".."``, and cannot be absolute.  Do *not* use
 ``os.path`` routines to manipulate resource paths, as they are *not* filesystem
 paths.
 

From 900aad5a597a43ab4c8ea0efa8bf3041a195bf56 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Jan 2019 21:51:03 +0100
Subject: [PATCH 7353/8469] tweak #1644 workaround to fix
 `test_pip_upgrade_from_source`

Explicitly exclude `pyproject.toml` so it's never added (e.g. because `setuptools_scm` is used).
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9cce3c90e4..16d60e5ffc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,3 +12,4 @@ include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini
 include tox.ini
+exclude pyproject.toml  # Temporary workaround for #1644.

From 3ac3b67e2c8a776f410eae49472a0f8266e29612 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Jan 2019 23:04:09 +0100
Subject: [PATCH 7354/8469] tests: minor cleanup

---
 setuptools/tests/test_build_py.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index cc701ae67f..b3a99f5660 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -1,17 +1,9 @@
 import os
 
-import pytest
-
 from setuptools.dist import Distribution
 
 
-@pytest.yield_fixture
-def tmpdir_as_cwd(tmpdir):
-    with tmpdir.as_cwd():
-        yield tmpdir
-
-
-def test_directories_in_package_data_glob(tmpdir_as_cwd):
+def test_directories_in_package_data_glob(tmpdir_cwd):
     """
     Directories matching the glob in package_data should
     not be included in the package data.

From f7447817b65c12dfe508249cea019c41ce0dc23f Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Jan 2019 22:57:20 +0100
Subject: [PATCH 7355/8469] test: add a simple regression test for `build_ext`

---
 setuptools/tests/environment.py    |  2 +
 setuptools/tests/test_build_ext.py | 70 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/setuptools/tests/environment.py b/setuptools/tests/environment.py
index c67898ca79..bd3119efca 100644
--- a/setuptools/tests/environment.py
+++ b/setuptools/tests/environment.py
@@ -46,6 +46,8 @@ def run_setup_py(cmd, pypath=None, path=None,
             cmd, stdout=_PIPE, stderr=_PIPE, shell=shell, env=env,
         )
 
+        if isinstance(data_stream, tuple):
+            data_stream = slice(*data_stream)
         data = proc.communicate()[data_stream]
     except OSError:
         return 1, ''
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 602571540f..3dc87ca363 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -8,6 +8,10 @@
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
 
+from . import environment
+from .files import build_files
+from .textwrap import DALS
+
 
 class TestBuildExt:
     def test_get_ext_filename(self):
@@ -43,3 +47,69 @@ def test_abi3_filename(self):
             assert res.endswith('eggs.pyd')
         else:
             assert 'abi3' in res
+
+
+def test_build_ext_config_handling(tmpdir_cwd):
+    files = {
+        'setup.py': DALS(
+            """
+            from setuptools import Extension, setup
+            setup(
+                name='foo',
+                version='0.0.0',
+                ext_modules=[Extension('foo', ['foo.c'])],
+            )
+            """),
+        'foo.c': DALS(
+            """
+            #include "Python.h"
+
+            #if PY_MAJOR_VERSION >= 3
+
+            static struct PyModuleDef moduledef = {
+                    PyModuleDef_HEAD_INIT,
+                    "foo",
+                    NULL,
+                    0,
+                    NULL,
+                    NULL,
+                    NULL,
+                    NULL,
+                    NULL
+            };
+
+            #define INITERROR return NULL
+
+            PyMODINIT_FUNC PyInit_foo(void)
+
+            #else
+
+            #define INITERROR return
+
+            void initfoo(void)
+
+            #endif
+            {
+            #if PY_MAJOR_VERSION >= 3
+                PyObject *module = PyModule_Create(&moduledef);
+            #else
+                PyObject *module = Py_InitModule("extension", NULL);
+            #endif
+                if (module == NULL)
+                    INITERROR;
+            #if PY_MAJOR_VERSION >= 3
+                return module;
+            #endif
+            }
+            """),
+        'setup.cfg': DALS(
+            """
+            [build]
+            build-base = foo_build
+            """),
+    }
+    build_files(files)
+    code, output = environment.run_setup_py(
+        cmd=['build'], data_stream=(0, 2),
+    )
+    assert code == 0, '\nSTDOUT:\n%s\nSTDERR:\n%s' % output

From 9150b6b7272130f11a71190905e6bd3db31afd81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Jan 2019 17:10:37 -0500
Subject: [PATCH 7356/8469] Prefer native strings on Python 2 when reading
 config files. Fixes #1653.

---
 setuptools/dist.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index b8551228eb..ddb1787ad0 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -603,7 +603,7 @@ def _parse_config_files(self, filenames=None):
 
                 for opt in options:
                     if opt != '__name__' and opt not in ignore_options:
-                        val = parser.get(section, opt)
+                        val = self._try_str(parser.get(section, opt))
                         opt = opt.replace('-', '_')
                         opt_dict[opt] = (filename, val)
 
@@ -627,6 +627,26 @@ def _parse_config_files(self, filenames=None):
                 except ValueError as msg:
                     raise DistutilsOptionError(msg)
 
+    @staticmethod
+    def _try_str(val):
+        """
+        On Python 2, much of distutils relies on string values being of
+        type 'str' (bytes) and not unicode text. If the value can be safely
+        encoded to bytes using the default encoding, prefer that.
+
+        Why the default encoding? Because that value can be implicitly
+        decoded back to text if needed.
+
+        Ref #1653
+        """
+        if six.PY3:
+            return val
+        try:
+            return val.encode()
+        except UnicodeEncodeError:
+            pass
+        return val
+
     def _set_command_options(self, command_obj, option_dict=None):
         """
         Set the options for 'command_obj' from 'option_dict'.  Basically

From 32c2ec8bab51ca5b4609cefc3dc4eb9c4b0d5b87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Jan 2019 17:57:35 -0500
Subject: [PATCH 7357/8469] Add changelog

---
 changelog.d/1660.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1660.change.rst

diff --git a/changelog.d/1660.change.rst b/changelog.d/1660.change.rst
new file mode 100644
index 0000000000..52f6239786
--- /dev/null
+++ b/changelog.d/1660.change.rst
@@ -0,0 +1 @@
+On Python 2, when reading config files, downcast options from text to bytes to satisfy distutils expectations.

From 5133d86c3e71709f59fbb9c5b60577bcdb8a7698 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Jan 2019 19:08:28 -0500
Subject: [PATCH 7358/8469] =?UTF-8?q?Bump=20version:=2040.7.0=20=E2=86=92?=
 =?UTF-8?q?=2040.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1660.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1660.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index ca7122e993..79ebe16533 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.7.1
+-------
+
+* #1660: On Python 2, when reading config files, downcast options from text to bytes to satisfy distutils expectations.
+
+
 v40.7.0
 -------
 
diff --git a/changelog.d/1660.change.rst b/changelog.d/1660.change.rst
deleted file mode 100644
index 52f6239786..0000000000
--- a/changelog.d/1660.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-On Python 2, when reading config files, downcast options from text to bytes to satisfy distutils expectations.
diff --git a/setup.cfg b/setup.cfg
index 78eb7596fd..c934e2f484 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.0
+current_version = 40.7.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 00db0f0a33..9e50513b47 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.0",
+    version="40.7.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 260bbe545e15ea75782c540c421da6c0a67abfd5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Jan 2019 20:46:48 -0500
Subject: [PATCH 7359/8469] Ensure a specified port in package_index isn't lost
 in the parse/unparse of the URL when auth is present. Fixes #1663.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 7e9517cefa..ea76c00502 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1072,7 +1072,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        parts = scheme, parsed.hostname, path, params, query, frag
+        parts = scheme, netloc, path, params, query, frag
         new_url = urllib.parse.urlunparse(parts)
         request = urllib.request.Request(new_url)
         request.add_header("Authorization", auth)

From d3afa2f5c5521412188bd7698526378353455820 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Jan 2019 20:54:02 -0500
Subject: [PATCH 7360/8469] Add changelog

---
 changelog.d/1665.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1665.change.rst

diff --git a/changelog.d/1665.change.rst b/changelog.d/1665.change.rst
new file mode 100644
index 0000000000..55a1c0f1db
--- /dev/null
+++ b/changelog.d/1665.change.rst
@@ -0,0 +1 @@
+Restore port in URL handling in package_index.

From 39130a855560e2838ce3cd899d8e7406fcdb4006 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Jan 2019 20:56:25 -0500
Subject: [PATCH 7361/8469] Rename changelog to reflect new PR

---
 changelog.d/{1665.change.rst => 1666.change.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{1665.change.rst => 1666.change.rst} (100%)

diff --git a/changelog.d/1665.change.rst b/changelog.d/1666.change.rst
similarity index 100%
rename from changelog.d/1665.change.rst
rename to changelog.d/1666.change.rst

From 28605704049b638d9a71c010b7cbe8dc6a8d37fc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Jan 2019 20:57:40 -0500
Subject: [PATCH 7362/8469] =?UTF-8?q?Bump=20version:=2040.7.1=20=E2=86=92?=
 =?UTF-8?q?=2040.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1666.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1666.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 79ebe16533..7d1353b4d1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.7.2
+-------
+
+* #1666: Restore port in URL handling in package_index.
+
+
 v40.7.1
 -------
 
diff --git a/changelog.d/1666.change.rst b/changelog.d/1666.change.rst
deleted file mode 100644
index 55a1c0f1db..0000000000
--- a/changelog.d/1666.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore port in URL handling in package_index.
diff --git a/setup.cfg b/setup.cfg
index c934e2f484..16db122160 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.1
+current_version = 40.7.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9e50513b47..a009f17918 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.1",
+    version="40.7.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From d012529dbc6576dd5cfe31cafea3d8061ec5ef4f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 1 Feb 2019 13:56:25 -0500
Subject: [PATCH 7363/8469] Drop build-backend from pyproject.toml

Because we do not include setuptools in our build requirements and there
is no mechanism for a PEP 517 backend to bootstrap itself, setuptools
cannot use setuptools.build_meta as its backend, and cannot use PEP 517
to build itself.

Additionally, if you specify build-backend, it is impossible to disable
PEP 517 builds with pip's --no-use-pep517 flag.
---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4ef804ecdc..07c23bb5f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,5 @@
 [build-system]
 requires = ["wheel"]
-build-backend = "setuptools.build_meta"
 
 [tool.towncrier]
     package = "setuptools"

From 0830a69efde3d561c2025bdfa1fae10dcbbcc8ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Feb 2019 09:22:19 -0500
Subject: [PATCH 7364/8469] Revert to using a copy of splituser from Python
 3.8. Using urllib.parse.urlparse is clumsy and causes problems as reported in
 #1663 and #1668. Alternative to #1499 and fixes #1668.

---
 setuptools/package_index.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ea76c00502..05c9e34125 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -850,16 +850,13 @@ def _download_html(self, url, headers, filename):
 
     def _download_svn(self, url, filename):
         warnings.warn("SVN download support is deprecated", UserWarning)
-        def splituser(host):
-            user, delim, host = host.rpartition('@')
-            return user, host
         url = url.split('#', 1)[0]  # remove any fragment for svn's sake
         creds = ''
         if url.lower().startswith('svn:') and '@' in url:
             scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
             if not netloc and path.startswith('//') and '/' in path[2:]:
                 netloc, path = path[2:].split('/', 1)
-                auth, host = splituser(netloc)
+                auth, host = _splituser(netloc)
                 if auth:
                     if ':' in auth:
                         user, pw = auth.split(':', 1)
@@ -1058,8 +1055,8 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     if netloc.endswith(':'):
         raise http_client.InvalidURL("nonnumeric port: ''")
 
-    if scheme in ('http', 'https') and parsed.username:
-        auth = ':'.join((parsed.username, parsed.password))
+    if scheme in ('http', 'https'):
+        auth, address = _splituser(netloc)
     else:
         auth = None
 
@@ -1072,7 +1069,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        parts = scheme, netloc, path, params, query, frag
+        parts = scheme, address, path, params, query, frag
         new_url = urllib.parse.urlunparse(parts)
         request = urllib.request.Request(new_url)
         request.add_header("Authorization", auth)
@@ -1093,6 +1090,13 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     return fp
 
 
+# copy of urllib.parse._splituser from Python 3.8
+def _splituser(host):
+    """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
+    user, delim, host = host.rpartition('@')
+    return (user if delim else None), host
+
+
 # adding a timeout to avoid freezing package_index
 open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
 

From c65337e4b58523ff0db5d57d004cada74178bf74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Feb 2019 09:32:29 -0500
Subject: [PATCH 7365/8469] Add change description

---
 changelog.d/1670.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1670.change.rst

diff --git a/changelog.d/1670.change.rst b/changelog.d/1670.change.rst
new file mode 100644
index 0000000000..abad7950a7
--- /dev/null
+++ b/changelog.d/1670.change.rst
@@ -0,0 +1 @@
+In package_index, revert to using a copy of splituser from Python 3.8. Attempts to use ``urllib.parse.urlparse`` led to problems as reported in #1663 and #1668. This change serves as an alternative to #1499 and fixes #1668.

From be840c2fe49766e3311475441b123a4eb3ba473a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Feb 2019 10:17:02 -0500
Subject: [PATCH 7366/8469] Also restore port consideration when re-injecting
 credentials for found links.

---
 setuptools/package_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 05c9e34125..705a47cf80 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1083,7 +1083,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
         # Put authentication info back into request URL if same host,
         # so that links found on the page will work
         s2, h2, path2, param2, query2, frag2 = urllib.parse.urlparse(fp.url)
-        if s2 == scheme and h2 == parsed.hostname:
+        if s2 == scheme and h2 == address:
             parts = s2, netloc, path2, param2, query2, frag2
             fp.url = urllib.parse.urlunparse(parts)
 

From a08cf8bc0d4d06b9f185b62518f173ebd1d4c9f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 Feb 2019 10:25:50 -0500
Subject: [PATCH 7367/8469] =?UTF-8?q?Bump=20version:=2040.7.2=20=E2=86=92?=
 =?UTF-8?q?=2040.7.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                 | 6 ++++++
 changelog.d/1670.change.rst | 1 -
 setup.cfg                   | 2 +-
 setup.py                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1670.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 7d1353b4d1..62896220d2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.7.3
+-------
+
+* #1670: In package_index, revert to using a copy of splituser from Python 3.8. Attempts to use ``urllib.parse.urlparse`` led to problems as reported in #1663 and #1668. This change serves as an alternative to #1499 and fixes #1668.
+
+
 v40.7.2
 -------
 
diff --git a/changelog.d/1670.change.rst b/changelog.d/1670.change.rst
deleted file mode 100644
index abad7950a7..0000000000
--- a/changelog.d/1670.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In package_index, revert to using a copy of splituser from Python 3.8. Attempts to use ``urllib.parse.urlparse`` led to problems as reported in #1663 and #1668. This change serves as an alternative to #1499 and fixes #1668.
diff --git a/setup.cfg b/setup.cfg
index 16db122160..4261f9b619 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.2
+current_version = 40.7.3
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index a009f17918..b3e1cc7ef3 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.2",
+    version="40.7.3",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 74c323d1658f554b879ef6ac2867faf77776a2ac Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 11:45:10 -0500
Subject: [PATCH 7368/8469] Wrap build_meta backend in a class

In order to support both the `build_meta` and `build_meta_legacy`
backends, the core functionality is wrapped in a class with methods to
be overridden in build_meta_legacy. The class is an implementation
detail and should remain private.
---
 setuptools/build_meta.py | 187 ++++++++++++++++++++-------------------
 1 file changed, 97 insertions(+), 90 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index c883d92f14..f40549e709 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -74,81 +74,11 @@ def _to_str(s):
     return s
 
 
-def _run_setup(setup_script='setup.py'):
-    # Note that we can reuse our build directory between calls
-    # Correctness comes first, then optimization later
-    __file__ = setup_script
-    __name__ = '__main__'
-    f = getattr(tokenize, 'open', open)(__file__)
-    code = f.read().replace('\\r\\n', '\\n')
-    f.close()
-    exec(compile(code, __file__, 'exec'), locals())
-
-
-def _fix_config(config_settings):
-    config_settings = config_settings or {}
-    config_settings.setdefault('--global-option', [])
-    return config_settings
-
-
-def _get_build_requires(config_settings, requirements):
-    config_settings = _fix_config(config_settings)
-
-    sys.argv = sys.argv[:1] + ['egg_info'] + \
-        config_settings["--global-option"]
-    try:
-        with Distribution.patch():
-            _run_setup()
-    except SetupRequirementsError as e:
-        requirements += e.specifiers
-
-    return requirements
-
-
 def _get_immediate_subdirectories(a_dir):
     return [name for name in os.listdir(a_dir)
             if os.path.isdir(os.path.join(a_dir, name))]
 
 
-def get_requires_for_build_wheel(config_settings=None):
-    config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings, requirements=['wheel'])
-
-
-def get_requires_for_build_sdist(config_settings=None):
-    config_settings = _fix_config(config_settings)
-    return _get_build_requires(config_settings, requirements=[])
-
-
-def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
-    sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', _to_str(metadata_directory)]
-    _run_setup()
-
-    dist_info_directory = metadata_directory
-    while True:
-        dist_infos = [f for f in os.listdir(dist_info_directory)
-                      if f.endswith('.dist-info')]
-
-        if len(dist_infos) == 0 and \
-                len(_get_immediate_subdirectories(dist_info_directory)) == 1:
-            dist_info_directory = os.path.join(
-                dist_info_directory, os.listdir(dist_info_directory)[0])
-            continue
-
-        assert len(dist_infos) == 1
-        break
-
-    # PEP 517 requires that the .dist-info directory be placed in the
-    # metadata_directory. To comply, we MUST copy the directory to the root
-    if dist_info_directory != metadata_directory:
-        shutil.move(
-            os.path.join(dist_info_directory, dist_infos[0]),
-            metadata_directory)
-        shutil.rmtree(dist_info_directory, ignore_errors=True)
-
-    return dist_infos[0]
-
-
 def _file_with_extension(directory, extension):
     matching = (
         f for f in os.listdir(directory)
@@ -158,26 +88,103 @@ def _file_with_extension(directory, extension):
     return file
 
 
-def build_wheel(wheel_directory, config_settings=None,
-                metadata_directory=None):
-    config_settings = _fix_config(config_settings)
-    wheel_directory = os.path.abspath(wheel_directory)
-    sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
-        config_settings["--global-option"]
-    _run_setup()
-    if wheel_directory != 'dist':
-        shutil.rmtree(wheel_directory)
-        shutil.copytree('dist', wheel_directory)
+class _BuildMetaBackend(object):
 
-    return _file_with_extension(wheel_directory, '.whl')
+    def _fix_config(self, config_settings):
+        config_settings = config_settings or {}
+        config_settings.setdefault('--global-option', [])
+        return config_settings
 
+    def _get_build_requires(self, config_settings, requirements):
+        config_settings = self._fix_config(config_settings)
 
-def build_sdist(sdist_directory, config_settings=None):
-    config_settings = _fix_config(config_settings)
-    sdist_directory = os.path.abspath(sdist_directory)
-    sys.argv = sys.argv[:1] + ['sdist', '--formats', 'gztar'] + \
-        config_settings["--global-option"] + \
-        ["--dist-dir", sdist_directory]
-    _run_setup()
-
-    return _file_with_extension(sdist_directory, '.tar.gz')
+        sys.argv = sys.argv[:1] + ['egg_info'] + \
+            config_settings["--global-option"]
+        try:
+            with Distribution.patch():
+                self.run_setup()
+        except SetupRequirementsError as e:
+            requirements += e.specifiers
+
+        return requirements
+
+    def run_setup(self, setup_script='setup.py'):
+        # Note that we can reuse our build directory between calls
+        # Correctness comes first, then optimization later
+        __file__ = setup_script
+        __name__ = '__main__'
+        f = getattr(tokenize, 'open', open)(__file__)
+        code = f.read().replace('\\r\\n', '\\n')
+        f.close()
+        exec(compile(code, __file__, 'exec'), locals())
+
+    def get_requires_for_build_wheel(self, config_settings=None):
+        config_settings = self._fix_config(config_settings)
+        return self._get_build_requires(config_settings, requirements=['wheel'])
+
+    def get_requires_for_build_sdist(self, config_settings=None):
+        config_settings = self._fix_config(config_settings)
+        return self._get_build_requires(config_settings, requirements=[])
+
+    def prepare_metadata_for_build_wheel(self, metadata_directory,
+                                         config_settings=None):
+        sys.argv = sys.argv[:1] + ['dist_info', '--egg-base',
+                                   _to_str(metadata_directory)]
+        self.run_setup()
+
+        dist_info_directory = metadata_directory
+        while True:
+            dist_infos = [f for f in os.listdir(dist_info_directory)
+                          if f.endswith('.dist-info')]
+
+            if (len(dist_infos) == 0 and
+                len(_get_immediate_subdirectories(dist_info_directory)) == 1):
+
+                dist_info_directory = os.path.join(
+                    dist_info_directory, os.listdir(dist_info_directory)[0])
+                continue
+
+            assert len(dist_infos) == 1
+            break
+
+        # PEP 517 requires that the .dist-info directory be placed in the
+        # metadata_directory. To comply, we MUST copy the directory to the root
+        if dist_info_directory != metadata_directory:
+            shutil.move(
+                os.path.join(dist_info_directory, dist_infos[0]),
+                metadata_directory)
+            shutil.rmtree(dist_info_directory, ignore_errors=True)
+
+        return dist_infos[0]
+
+    def build_wheel(self, wheel_directory, config_settings=None,
+                    metadata_directory=None):
+        config_settings = self._fix_config(config_settings)
+        wheel_directory = os.path.abspath(wheel_directory)
+        sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
+            config_settings["--global-option"]
+        self.run_setup()
+        if wheel_directory != 'dist':
+            shutil.rmtree(wheel_directory)
+            shutil.copytree('dist', wheel_directory)
+
+        return _file_with_extension(wheel_directory, '.whl')
+
+    def build_sdist(self, sdist_directory, config_settings=None):
+        config_settings = self._fix_config(config_settings)
+        sdist_directory = os.path.abspath(sdist_directory)
+        sys.argv = sys.argv[:1] + ['sdist', '--formats', 'gztar'] + \
+            config_settings["--global-option"] + \
+            ["--dist-dir", sdist_directory]
+        self.run_setup()
+
+        return _file_with_extension(sdist_directory, '.tar.gz')
+
+
+_BACKEND = _BuildMetaBackend()
+
+get_requires_for_build_wheel = _BACKEND.get_requires_for_build_wheel
+get_requires_for_build_sdist = _BACKEND.get_requires_for_build_sdist
+prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
+build_wheel = _BACKEND.build_wheel
+build_sdist = _BACKEND.build_sdist

From f40a47a776904b09747502a1f210af9fc92ec542 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 11:46:21 -0500
Subject: [PATCH 7369/8469] Add __all__ to setuptools.build_meta

---
 setuptools/build_meta.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index f40549e709..8e31a04d45 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -35,6 +35,12 @@
 import setuptools
 import distutils
 
+__all__ = ['get_requires_for_build_sdist',
+           'get_requires_for_build_wheel',
+           'prepare_metadata_for_build_wheel',
+           'build_wheel',
+           'build_sdist',
+           'SetupRequirementsError']
 
 class SetupRequirementsError(BaseException):
     def __init__(self, specifiers):

From 6d0daf14277223da4e32093c00157ae5b26d1ece Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 12:11:21 -0500
Subject: [PATCH 7370/8469] Wrap build_meta tests in a reusable test class

---
 setuptools/tests/test_build_meta.py | 268 ++++++++++++++--------------
 1 file changed, 134 insertions(+), 134 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 82b44c8944..a9865382eb 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -6,7 +6,6 @@
 
 import pytest
 
-from setuptools.build_meta import build_sdist
 from .files import build_files
 from .textwrap import DALS
 from . import py2_only
@@ -103,136 +102,137 @@ def run():
 ]
 
 
-@pytest.fixture(params=defns)
-def build_backend(tmpdir, request):
-    build_files(request.param, prefix=str(tmpdir))
-    with tmpdir.as_cwd():
-        yield BuildBackend(cwd='.')
-
-
-def test_get_requires_for_build_wheel(build_backend):
-    actual = build_backend.get_requires_for_build_wheel()
-    expected = ['six', 'wheel']
-    assert sorted(actual) == sorted(expected)
-
-
-def test_get_requires_for_build_sdist(build_backend):
-    actual = build_backend.get_requires_for_build_sdist()
-    expected = ['six']
-    assert sorted(actual) == sorted(expected)
-
-
-def test_build_wheel(build_backend):
-    dist_dir = os.path.abspath('pip-wheel')
-    os.makedirs(dist_dir)
-    wheel_name = build_backend.build_wheel(dist_dir)
-
-    assert os.path.isfile(os.path.join(dist_dir, wheel_name))
-
-
-def test_build_sdist(build_backend):
-    dist_dir = os.path.abspath('pip-sdist')
-    os.makedirs(dist_dir)
-    sdist_name = build_backend.build_sdist(dist_dir)
-
-    assert os.path.isfile(os.path.join(dist_dir, sdist_name))
-
-
-def test_prepare_metadata_for_build_wheel(build_backend):
-    dist_dir = os.path.abspath('pip-dist-info')
-    os.makedirs(dist_dir)
-
-    dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
-
-    assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
-
-
-@py2_only
-def test_prepare_metadata_for_build_wheel_with_str(build_backend):
-    dist_dir = os.path.abspath(str('pip-dist-info'))
-    os.makedirs(dist_dir)
-
-    dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
-
-    assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
-
-
-def test_build_sdist_explicit_dist(build_backend):
-    # explicitly specifying the dist folder should work
-    # the folder sdist_directory and the ``--dist-dir`` can be the same
-    dist_dir = os.path.abspath('dist')
-    sdist_name = build_backend.build_sdist(dist_dir)
-    assert os.path.isfile(os.path.join(dist_dir, sdist_name))
-
-
-def test_build_sdist_version_change(build_backend):
-    sdist_into_directory = os.path.abspath("out_sdist")
-    os.makedirs(sdist_into_directory)
-
-    sdist_name = build_backend.build_sdist(sdist_into_directory)
-    assert os.path.isfile(os.path.join(sdist_into_directory, sdist_name))
-
-    # if the setup.py changes subsequent call of the build meta
-    # should still succeed, given the
-    # sdist_directory the frontend specifies is empty
-    with open(os.path.abspath("setup.py"), 'rt') as file_handler:
-        content = file_handler.read()
-    with open(os.path.abspath("setup.py"), 'wt') as file_handler:
-        file_handler.write(
-            content.replace("version='0.0.0'", "version='0.0.1'"))
-
-    shutil.rmtree(sdist_into_directory)
-    os.makedirs(sdist_into_directory)
-
-    sdist_name = build_backend.build_sdist("out_sdist")
-    assert os.path.isfile(
-        os.path.join(os.path.abspath("out_sdist"), sdist_name))
-
-
-def test_build_sdist_setup_py_exists(tmpdir_cwd):
-    # If build_sdist is called from a script other than setup.py,
-    # ensure setup.py is include
-    build_files(defns[0])
-    targz_path = build_sdist("temp")
-    with tarfile.open(os.path.join("temp", targz_path)) as tar:
-        assert any('setup.py' in name for name in tar.getnames())
-
-
-def test_build_sdist_setup_py_manifest_excluded(tmpdir_cwd):
-    # Ensure that MANIFEST.in can exclude setup.py
-    files = {
-        'setup.py': DALS("""
-    __import__('setuptools').setup(
-        name='foo',
-        version='0.0.0',
-        py_modules=['hello']
-    )"""),
-        'hello.py': '',
-        'MANIFEST.in': DALS("""
-    exclude setup.py
-    """)
-    }
-
-    build_files(files)
-    targz_path = build_sdist("temp")
-    with tarfile.open(os.path.join("temp", targz_path)) as tar:
-        assert not any('setup.py' in name for name in tar.getnames())
-
-
-def test_build_sdist_builds_targz_even_if_zip_indicated(tmpdir_cwd):
-    files = {
-        'setup.py': DALS("""
-            __import__('setuptools').setup(
-                name='foo',
-                version='0.0.0',
-                py_modules=['hello']
-            )"""),
-        'hello.py': '',
-        'setup.cfg': DALS("""
-            [sdist]
-            formats=zip
-            """)
-    }
-
-    build_files(files)
-    build_sdist("temp")
+class TestBuildMetaBackend:
+    backend_name = 'setuptools.build_meta'
+
+    def get_build_backend(self):
+        return BuildBackend(cwd='.', backend_name=self.backend_name)
+
+    @pytest.fixture(params=defns)
+    def build_backend(self, tmpdir, request):
+        build_files(request.param, prefix=str(tmpdir))
+        with tmpdir.as_cwd():
+            yield self.get_build_backend()
+
+    def test_get_requires_for_build_wheel(self, build_backend):
+        actual = build_backend.get_requires_for_build_wheel()
+        expected = ['six', 'wheel']
+        assert sorted(actual) == sorted(expected)
+
+    def test_get_requires_for_build_sdist(self, build_backend):
+        actual = build_backend.get_requires_for_build_sdist()
+        expected = ['six']
+        assert sorted(actual) == sorted(expected)
+
+    def test_build_wheel(self, build_backend):
+        dist_dir = os.path.abspath('pip-wheel')
+        os.makedirs(dist_dir)
+        wheel_name = build_backend.build_wheel(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, wheel_name))
+
+    def test_build_sdist(self, build_backend):
+        dist_dir = os.path.abspath('pip-sdist')
+        os.makedirs(dist_dir)
+        sdist_name = build_backend.build_sdist(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
+
+    def test_prepare_metadata_for_build_wheel(self, build_backend):
+        dist_dir = os.path.abspath('pip-dist-info')
+        os.makedirs(dist_dir)
+
+        dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
+
+    @py2_only
+    def test_prepare_metadata_for_build_wheel_with_str(self, build_backend):
+        dist_dir = os.path.abspath(str('pip-dist-info'))
+        os.makedirs(dist_dir)
+
+        dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
+
+    def test_build_sdist_explicit_dist(self, build_backend):
+        # explicitly specifying the dist folder should work
+        # the folder sdist_directory and the ``--dist-dir`` can be the same
+        dist_dir = os.path.abspath('dist')
+        sdist_name = build_backend.build_sdist(dist_dir)
+        assert os.path.isfile(os.path.join(dist_dir, sdist_name))
+
+    def test_build_sdist_version_change(self, build_backend):
+        sdist_into_directory = os.path.abspath("out_sdist")
+        os.makedirs(sdist_into_directory)
+
+        sdist_name = build_backend.build_sdist(sdist_into_directory)
+        assert os.path.isfile(os.path.join(sdist_into_directory, sdist_name))
+
+        # if the setup.py changes subsequent call of the build meta
+        # should still succeed, given the
+        # sdist_directory the frontend specifies is empty
+        with open(os.path.abspath("setup.py"), 'rt') as file_handler:
+            content = file_handler.read()
+        with open(os.path.abspath("setup.py"), 'wt') as file_handler:
+            file_handler.write(
+                content.replace("version='0.0.0'", "version='0.0.1'"))
+
+        shutil.rmtree(sdist_into_directory)
+        os.makedirs(sdist_into_directory)
+
+        sdist_name = build_backend.build_sdist("out_sdist")
+        assert os.path.isfile(
+            os.path.join(os.path.abspath("out_sdist"), sdist_name))
+
+    def test_build_sdist_setup_py_exists(self, tmpdir_cwd):
+        # If build_sdist is called from a script other than setup.py,
+        # ensure setup.py is included
+        build_files(defns[0])
+
+        build_backend = self.get_build_backend()
+        targz_path = build_backend.build_sdist("temp")
+        with tarfile.open(os.path.join("temp", targz_path)) as tar:
+            assert any('setup.py' in name for name in tar.getnames())
+
+    def test_build_sdist_setup_py_manifest_excluded(self, tmpdir_cwd):
+        # Ensure that MANIFEST.in can exclude setup.py
+        files = {
+            'setup.py': DALS("""
+        __import__('setuptools').setup(
+            name='foo',
+            version='0.0.0',
+            py_modules=['hello']
+        )"""),
+            'hello.py': '',
+            'MANIFEST.in': DALS("""
+        exclude setup.py
+        """)
+        }
+
+        build_files(files)
+
+        build_backend = self.get_build_backend()
+        targz_path = build_backend.build_sdist("temp")
+        with tarfile.open(os.path.join("temp", targz_path)) as tar:
+            assert not any('setup.py' in name for name in tar.getnames())
+
+    def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
+        files = {
+            'setup.py': DALS("""
+                __import__('setuptools').setup(
+                    name='foo',
+                    version='0.0.0',
+                    py_modules=['hello']
+                )"""),
+            'hello.py': '',
+            'setup.cfg': DALS("""
+                [sdist]
+                formats=zip
+                """)
+        }
+
+        build_files(files)
+
+        build_backend = self.get_build_backend()
+        build_backend.build_sdist("temp")

From bd800f4c793fdcff2347a263c39c4256107b417f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 12:24:15 -0500
Subject: [PATCH 7371/8469] Add test for relative path imports in build_meta

Failing test adapted from PR #1643

Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com>
---
 setuptools/tests/test_build_meta.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a9865382eb..8222b8a2ea 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -236,3 +236,23 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
 
         build_backend = self.get_build_backend()
         build_backend.build_sdist("temp")
+
+    _relative_path_import_files = {
+        'setup.py': DALS("""
+            __import__('setuptools').setup(
+                name='foo',
+                version=__import__('hello').__version__,
+                py_modules=['hello']
+            )"""),
+        'hello.py': '__version__ = "0.0.0"',
+        'setup.cfg': DALS("""
+            [sdist]
+            formats=zip
+            """)
+    }
+
+    def test_build_sdist_relative_path_import(self, tmpdir_cwd):
+        build_files(self._relative_path_import_files)
+        build_backend = self.get_build_backend()
+        with pytest.raises(ImportError):
+            build_backend.build_sdist("temp")

From a114112ea5e6df87a826e0fa2927cffd2472aec1 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 12:16:14 -0500
Subject: [PATCH 7372/8469] Add failing test suite for build_meta_legacy

This runs all build_meta tests, plus a test that it is possible to
import from the directory containing `setup.py` when using the
build_meta_legacy backend.
---
 setuptools/tests/test_build_meta.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 8222b8a2ea..5d97ebcec2 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -256,3 +256,16 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         build_backend = self.get_build_backend()
         with pytest.raises(ImportError):
             build_backend.build_sdist("temp")
+
+
+@pytest.mark.xfail
+class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
+    backend_name = 'setuptools.build_meta_legacy'
+
+    # build_meta_legacy-specific tests
+    def test_build_sdist_relative_path_import(self, tmpdir_cwd):
+        # This must fail in build_meta, but must pass in build_meta_legacy
+        build_files(self._relative_path_import_files)
+
+        build_backend = self.get_build_backend()
+        build_backend.build_sdist("temp")

From fd3b06dae1a33b3131cf96ddb9d7938430b9d8b5 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 12:31:28 -0500
Subject: [PATCH 7373/8469] Add build_meta_legacy backend

This is part of the solution to GH #1642, it is a
backwards-compatibility backend that can be used as a default PEP 517
backend for projects that use setuptools but haven't opted in to
build_meta.
---
 setuptools/build_meta_legacy.py     | 44 +++++++++++++++++++++++++++++
 setuptools/tests/test_build_meta.py |  1 -
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/build_meta_legacy.py

diff --git a/setuptools/build_meta_legacy.py b/setuptools/build_meta_legacy.py
new file mode 100644
index 0000000000..7eed41f111
--- /dev/null
+++ b/setuptools/build_meta_legacy.py
@@ -0,0 +1,44 @@
+"""Compatibility backend for setuptools
+
+This is a version of setuptools.build_meta that endeavors to maintain backwards
+compatibility with pre-PEP 517 modes of invocation. It exists as a temporary
+bridge between the old packaging mechanism and the new packaging mechanism,
+and will eventually be removed.
+"""
+
+import sys
+
+from setuptools.build_meta import _BuildMetaBackend
+from setuptools.build_meta import SetupRequirementsError
+
+
+__all__ = ['get_requires_for_build_sdist',
+           'get_requires_for_build_wheel',
+           'prepare_metadata_for_build_wheel',
+           'build_wheel',
+           'build_sdist',
+           'SetupRequirementsError']
+
+
+class _BuildMetaLegacyBackend(_BuildMetaBackend):
+    def run_setup(self, setup_script='setup.py'):
+        # In order to maintain compatibility with scripts assuming that
+        # the setup.py script is in a directory on the PYTHONPATH, inject
+        # '' into sys.path. (pypa/setuptools#1642)
+        sys_path = list(sys.path)       # Save the old path
+        if '' not in sys.path:
+            sys.path.insert(0, '')
+
+        super(_BuildMetaLegacyBackend,
+              self).run_setup(setup_script=setup_script)
+
+        sys.path = sys_path             # Restore the old path
+
+
+_BACKEND = _BuildMetaLegacyBackend()
+
+get_requires_for_build_wheel = _BACKEND.get_requires_for_build_wheel
+get_requires_for_build_sdist = _BACKEND.get_requires_for_build_sdist
+prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
+build_wheel = _BACKEND.build_wheel
+build_sdist = _BACKEND.build_sdist
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 5d97ebcec2..b29d6f29e5 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -258,7 +258,6 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
             build_backend.build_sdist("temp")
 
 
-@pytest.mark.xfail
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
     backend_name = 'setuptools.build_meta_legacy'
 

From 90a8701ae4088db2092a574c39c9ee56efc7eb6b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 27 Jan 2019 12:51:05 -0500
Subject: [PATCH 7374/8469] Add news fragment for PR #1652

---
 changelog.d/1652.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1652.change.rst

diff --git a/changelog.d/1652.change.rst b/changelog.d/1652.change.rst
new file mode 100644
index 0000000000..f535769942
--- /dev/null
+++ b/changelog.d/1652.change.rst
@@ -0,0 +1 @@
+Added the ``build_meta_legacy`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.

From 49d17725a0ad02552babbdc79c737cfb27430f4f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 28 Jan 2019 09:22:49 -0500
Subject: [PATCH 7375/8469] Set sys.path in try/finally block with comment

Per Nick Coghlan's suggestion on PR #1652, a try/finally block ensures
that the path is restored even in the event of an error.
---
 setuptools/build_meta_legacy.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/setuptools/build_meta_legacy.py b/setuptools/build_meta_legacy.py
index 7eed41f111..03492da9b5 100644
--- a/setuptools/build_meta_legacy.py
+++ b/setuptools/build_meta_legacy.py
@@ -6,6 +6,7 @@
 and will eventually be removed.
 """
 
+import os
 import sys
 
 from setuptools.build_meta import _BuildMetaBackend
@@ -25,14 +26,21 @@ def run_setup(self, setup_script='setup.py'):
         # In order to maintain compatibility with scripts assuming that
         # the setup.py script is in a directory on the PYTHONPATH, inject
         # '' into sys.path. (pypa/setuptools#1642)
-        sys_path = list(sys.path)       # Save the old path
-        if '' not in sys.path:
-            sys.path.insert(0, '')
-
-        super(_BuildMetaLegacyBackend,
-              self).run_setup(setup_script=setup_script)
-
-        sys.path = sys_path             # Restore the old path
+        sys_path = list(sys.path)           # Save the original path
+
+        try:
+            if '' not in sys.path:
+                sys.path.insert(0, '')
+
+            super(_BuildMetaLegacyBackend,
+                  self).run_setup(setup_script=setup_script)
+        finally:
+            # While PEP 517 frontends should be calling each hook in a fresh
+            # subprocess according to the standard (and thus it should not be
+            # strictly necessary to restore the old sys.path), we'll restore
+            # the original path so that the path manipulation does not persist
+            # within the hook after run_setup is called.
+            sys.path[:] = sys_path
 
 
 _BACKEND = _BuildMetaLegacyBackend()

From db590baf81ebcb23605da54118905437412228ce Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 28 Jan 2019 09:25:03 -0500
Subject: [PATCH 7376/8469] Use absolute path in build_meta_legacy

Using the absolute path to the directory of the setup script better
mimics the semantics of a direct invocation of python setup.py.
---
 setuptools/build_meta_legacy.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/build_meta_legacy.py b/setuptools/build_meta_legacy.py
index 03492da9b5..3d209711fe 100644
--- a/setuptools/build_meta_legacy.py
+++ b/setuptools/build_meta_legacy.py
@@ -28,10 +28,11 @@ def run_setup(self, setup_script='setup.py'):
         # '' into sys.path. (pypa/setuptools#1642)
         sys_path = list(sys.path)           # Save the original path
 
-        try:
-            if '' not in sys.path:
-                sys.path.insert(0, '')
+        script_dir = os.path.dirname(os.path.abspath(setup_script))
+        if script_dir not in sys.path:
+            sys.path.insert(0, script_dir)
 
+        try:
             super(_BuildMetaLegacyBackend,
                   self).run_setup(setup_script=setup_script)
         finally:

From 11fb3f38d23ff1e0d81e64ba3b68b3de2d2b990a Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sun, 3 Feb 2019 12:17:46 -0500
Subject: [PATCH 7377/8469] Move build_meta_legacy to build_meta:legacy

Rather than exposing a top-level module for the legacy backend, we will
move the legacy backend into the `setuptools.build_meta` module and
specify it using the module:object syntax.
---
 changelog.d/1652.change.rst         |  2 +-
 setuptools/build_meta.py            | 35 +++++++++++++++++++
 setuptools/build_meta_legacy.py     | 53 -----------------------------
 setuptools/tests/test_build_meta.py | 17 +++++++--
 4 files changed, 50 insertions(+), 57 deletions(-)
 delete mode 100644 setuptools/build_meta_legacy.py

diff --git a/changelog.d/1652.change.rst b/changelog.d/1652.change.rst
index f535769942..545365ac83 100644
--- a/changelog.d/1652.change.rst
+++ b/changelog.d/1652.change.rst
@@ -1 +1 @@
-Added the ``build_meta_legacy`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
+Added the ``build_meta:legacy`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 8e31a04d45..e16f319e3c 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -40,6 +40,7 @@
            'prepare_metadata_for_build_wheel',
            'build_wheel',
            'build_sdist',
+           'legacy',
            'SetupRequirementsError']
 
 class SetupRequirementsError(BaseException):
@@ -187,6 +188,36 @@ def build_sdist(self, sdist_directory, config_settings=None):
         return _file_with_extension(sdist_directory, '.tar.gz')
 
 
+class _BuildMetaLegacyBackend(_BuildMetaBackend):
+    """Compatibility backend for setuptools
+
+    This is a version of setuptools.build_meta that endeavors to maintain backwards
+    compatibility with pre-PEP 517 modes of invocation. It exists as a temporary
+    bridge between the old packaging mechanism and the new packaging mechanism,
+    and will eventually be removed.
+    """
+    def run_setup(self, setup_script='setup.py'):
+        # In order to maintain compatibility with scripts assuming that
+        # the setup.py script is in a directory on the PYTHONPATH, inject
+        # '' into sys.path. (pypa/setuptools#1642)
+        sys_path = list(sys.path)           # Save the original path
+
+        script_dir = os.path.dirname(os.path.abspath(setup_script))
+        if script_dir not in sys.path:
+            sys.path.insert(0, script_dir)
+
+        try:
+            super(_BuildMetaLegacyBackend,
+                  self).run_setup(setup_script=setup_script)
+        finally:
+            # While PEP 517 frontends should be calling each hook in a fresh
+            # subprocess according to the standard (and thus it should not be
+            # strictly necessary to restore the old sys.path), we'll restore
+            # the original path so that the path manipulation does not persist
+            # within the hook after run_setup is called.
+            sys.path[:] = sys_path
+
+# The primary backend
 _BACKEND = _BuildMetaBackend()
 
 get_requires_for_build_wheel = _BACKEND.get_requires_for_build_wheel
@@ -194,3 +225,7 @@ def build_sdist(self, sdist_directory, config_settings=None):
 prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
 build_wheel = _BACKEND.build_wheel
 build_sdist = _BACKEND.build_sdist
+
+
+# The legacy backend
+legacy = _BuildMetaLegacyBackend()
diff --git a/setuptools/build_meta_legacy.py b/setuptools/build_meta_legacy.py
deleted file mode 100644
index 3d209711fe..0000000000
--- a/setuptools/build_meta_legacy.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""Compatibility backend for setuptools
-
-This is a version of setuptools.build_meta that endeavors to maintain backwards
-compatibility with pre-PEP 517 modes of invocation. It exists as a temporary
-bridge between the old packaging mechanism and the new packaging mechanism,
-and will eventually be removed.
-"""
-
-import os
-import sys
-
-from setuptools.build_meta import _BuildMetaBackend
-from setuptools.build_meta import SetupRequirementsError
-
-
-__all__ = ['get_requires_for_build_sdist',
-           'get_requires_for_build_wheel',
-           'prepare_metadata_for_build_wheel',
-           'build_wheel',
-           'build_sdist',
-           'SetupRequirementsError']
-
-
-class _BuildMetaLegacyBackend(_BuildMetaBackend):
-    def run_setup(self, setup_script='setup.py'):
-        # In order to maintain compatibility with scripts assuming that
-        # the setup.py script is in a directory on the PYTHONPATH, inject
-        # '' into sys.path. (pypa/setuptools#1642)
-        sys_path = list(sys.path)           # Save the original path
-
-        script_dir = os.path.dirname(os.path.abspath(setup_script))
-        if script_dir not in sys.path:
-            sys.path.insert(0, script_dir)
-
-        try:
-            super(_BuildMetaLegacyBackend,
-                  self).run_setup(setup_script=setup_script)
-        finally:
-            # While PEP 517 frontends should be calling each hook in a fresh
-            # subprocess according to the standard (and thus it should not be
-            # strictly necessary to restore the old sys.path), we'll restore
-            # the original path so that the path manipulation does not persist
-            # within the hook after run_setup is called.
-            sys.path[:] = sys_path
-
-
-_BACKEND = _BuildMetaLegacyBackend()
-
-get_requires_for_build_wheel = _BACKEND.get_requires_for_build_wheel
-get_requires_for_build_sdist = _BACKEND.get_requires_for_build_sdist
-prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
-build_wheel = _BACKEND.build_wheel
-build_sdist = _BACKEND.build_sdist
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index b29d6f29e5..42e3098ae1 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -23,7 +23,6 @@ def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
         self.env = env
         self.backend_name = backend_name
 
-
 class BuildBackend(BuildBackendBase):
     """PEP 517 Build Backend"""
 
@@ -43,12 +42,24 @@ def method(*args, **kw):
 
 
 class BuildBackendCaller(BuildBackendBase):
+    def __init__(self, *args, **kwargs):
+        super(BuildBackendCaller, self).__init__(*args, **kwargs)
+
+        (self.backend_name, _,
+         self.backend_obj) = self.backend_name.partition(':')
+
     def __call__(self, name, *args, **kw):
         """Handles aribrary function invocations on the build backend."""
         os.chdir(self.cwd)
         os.environ.update(self.env)
         mod = importlib.import_module(self.backend_name)
-        return getattr(mod, name)(*args, **kw)
+
+        if self.backend_obj:
+            backend = getattr(mod, self.backend_obj)
+        else:
+            backend = mod
+
+        return getattr(backend, name)(*args, **kw)
 
 
 defns = [
@@ -259,7 +270,7 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
 
 
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
-    backend_name = 'setuptools.build_meta_legacy'
+    backend_name = 'setuptools.build_meta:legacy'
 
     # build_meta_legacy-specific tests
     def test_build_sdist_relative_path_import(self, tmpdir_cwd):

From 95d86241efd33f8db71e72352b31185389f4d68d Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 4 Feb 2019 17:15:13 -0800
Subject: [PATCH 7378/8469] bpo-35299: Fixed sysconfig and distutils during PGO
 profiling (GH-11744)

---
 command/build_ext.py    |  5 +++--
 sysconfig.py            | 25 +++++++++++++++++++------
 tests/test_build_ext.py |  6 ++++--
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 158465d233..0428466b00 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -161,9 +161,10 @@ def finalize_options(self):
 
         # Put the Python "system" include dir at the end, so that
         # any local include dirs take precedence.
-        self.include_dirs.append(py_include)
+        self.include_dirs.extend(py_include.split(os.path.pathsep))
         if plat_py_include != py_include:
-            self.include_dirs.append(plat_py_include)
+            self.include_dirs.extend(
+                plat_py_include.split(os.path.pathsep))
 
         self.ensure_string_list('libraries')
         self.ensure_string_list('link_objects')
diff --git a/sysconfig.py b/sysconfig.py
index b433fc86ff..40af493cdf 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -29,9 +29,7 @@
     project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])
 else:
     project_base = os.path.dirname(os.path.abspath(sys.executable))
-if (os.name == 'nt' and
-    project_base.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
-    project_base = os.path.dirname(os.path.dirname(project_base))
+
 
 # python_build: (Boolean) if true, we're either building Python or
 # building an extension with an un-installed Python, so we use
@@ -41,16 +39,26 @@ def _is_python_source_dir(d):
         if os.path.isfile(os.path.join(d, "Modules", fn)):
             return True
     return False
+
 _sys_home = getattr(sys, '_home', None)
-if (_sys_home and os.name == 'nt' and
-    _sys_home.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
-    _sys_home = os.path.dirname(os.path.dirname(_sys_home))
+
+if os.name == 'nt':
+    def _fix_pcbuild(d):
+        if d and os.path.normcase(d).startswith(
+                os.path.normcase(os.path.join(PREFIX, "PCbuild"))):
+            return PREFIX
+        return d
+    project_base = _fix_pcbuild(project_base)
+    _sys_home = _fix_pcbuild(_sys_home)
+
 def _python_build():
     if _sys_home:
         return _is_python_source_dir(_sys_home)
     return _is_python_source_dir(project_base)
+
 python_build = _python_build()
 
+
 # Calculate the build qualifier flags if they are defined.  Adding the flags
 # to the include and lib directories only makes sense for an installation, not
 # an in-source build.
@@ -99,6 +107,11 @@ def get_python_inc(plat_specific=0, prefix=None):
         python_dir = 'python' + get_python_version() + build_flags
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":
+        if python_build:
+            # Include both the include and PC dir to ensure we can find
+            # pyconfig.h
+            return (os.path.join(prefix, "include") + os.path.pathsep +
+                    os.path.join(prefix, "PC"))
         return os.path.join(prefix, "include")
     else:
         raise DistutilsPlatformError(
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index a72218274c..88847f9e9a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -177,10 +177,12 @@ def test_finalize_options(self):
         cmd.finalize_options()
 
         py_include = sysconfig.get_python_inc()
-        self.assertIn(py_include, cmd.include_dirs)
+        for p in py_include.split(os.path.pathsep):
+            self.assertIn(p, cmd.include_dirs)
 
         plat_py_include = sysconfig.get_python_inc(plat_specific=1)
-        self.assertIn(plat_py_include, cmd.include_dirs)
+        for p in plat_py_include.split(os.path.pathsep):
+            self.assertIn(p, cmd.include_dirs)
 
         # make sure cmd.libraries is turned into a list
         # if it's a string

From e04a41e3129fa9945e15b16fd6d65cc212c1d946 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 5 Feb 2019 08:42:36 -0500
Subject: [PATCH 7379/8469] Rename build_meta:legacy to build_meta:__legacy__

---
 changelog.d/1652.change.rst         | 2 +-
 setuptools/build_meta.py            | 4 ++--
 setuptools/tests/test_build_meta.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog.d/1652.change.rst b/changelog.d/1652.change.rst
index 545365ac83..387d212ced 100644
--- a/changelog.d/1652.change.rst
+++ b/changelog.d/1652.change.rst
@@ -1 +1 @@
-Added the ``build_meta:legacy`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
+Added the ``build_meta:__legacy__`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index e16f319e3c..70b7ab230e 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -40,7 +40,7 @@
            'prepare_metadata_for_build_wheel',
            'build_wheel',
            'build_sdist',
-           'legacy',
+           '__legacy__',
            'SetupRequirementsError']
 
 class SetupRequirementsError(BaseException):
@@ -228,4 +228,4 @@ def run_setup(self, setup_script='setup.py'):
 
 
 # The legacy backend
-legacy = _BuildMetaLegacyBackend()
+__legacy__ = _BuildMetaLegacyBackend()
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 42e3098ae1..6236b9f42b 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -270,7 +270,7 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
 
 
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
-    backend_name = 'setuptools.build_meta:legacy'
+    backend_name = 'setuptools.build_meta:__legacy__'
 
     # build_meta_legacy-specific tests
     def test_build_sdist_relative_path_import(self, tmpdir_cwd):

From 794219ba05b20b83bae0b50e9b5058f7c8bc9508 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 5 Feb 2019 12:54:38 -0500
Subject: [PATCH 7380/8469] Update changelog for version 40.8.0

---
 CHANGES.rst                 | 8 ++++++++
 changelog.d/1536.change.rst | 3 ---
 changelog.d/1635.change.rst | 1 -
 changelog.d/1652.change.rst | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1536.change.rst
 delete mode 100644 changelog.d/1635.change.rst
 delete mode 100644 changelog.d/1652.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 62896220d2..b043e449ab 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v40.8.0
+-------
+
+* #1652: Added the ``build_meta:__legacy__`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
+* #1635: Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents, that begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors. Additionally, any paths that are absolute on Windows are strictly disallowed and will raise ValueErrors.
+* #1536: ``setuptools`` will now automatically include licenses if ``setup.cfg`` contains a ``license_file`` attribute, unless this file is manually excluded inside ``MANIFEST.in``.
+
+
 v40.7.3
 -------
 
diff --git a/changelog.d/1536.change.rst b/changelog.d/1536.change.rst
deleted file mode 100644
index 8a69959cbd..0000000000
--- a/changelog.d/1536.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-``setuptools`` will now automatically include licenses if ``setup.cfg``
-contains a ``license_file`` attribute, unless this file is manually excluded
-inside ``MANIFEST.in``.
diff --git a/changelog.d/1635.change.rst b/changelog.d/1635.change.rst
deleted file mode 100644
index d23f3fe30c..0000000000
--- a/changelog.d/1635.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents, that begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors. Additionally, any paths that are absolute on Windows are strictly disallowed and will raise ValueErrors.
diff --git a/changelog.d/1652.change.rst b/changelog.d/1652.change.rst
deleted file mode 100644
index 387d212ced..0000000000
--- a/changelog.d/1652.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added the ``build_meta:__legacy__`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.

From c1243e96f05d3b13392a792144c97d9471581550 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 5 Feb 2019 13:13:51 -0500
Subject: [PATCH 7381/8469] =?UTF-8?q?Bump=20version:=2040.7.3=20=E2=86=92?=
 =?UTF-8?q?=2040.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4261f9b619..f0932e1c86 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.3
+current_version = 40.8.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index b3e1cc7ef3..8ec7ce06e5 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.3",
+    version="40.8.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From 179115b198387a21202433ea61cc53f2efd383fc Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 31 Jan 2019 08:29:36 -0500
Subject: [PATCH 7382/8469] Add support for setup.cfg-only projects

Many projects can get away with an empty `setup.py` and use *only* the
declarative `setup.cfg`. With the new PEP 517 backend, we can supply a
default empty `setup.py` if one is not provided.
---
 setuptools/build_meta.py            | 16 +++++++++++++---
 setuptools/tests/test_build_meta.py | 23 +++++++++++++++++++++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 70b7ab230e..047cc07b69 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -26,6 +26,7 @@
 Again, this is not a formal definition! Just a "taste" of the module.
 """
 
+import io
 import os
 import sys
 import tokenize
@@ -95,6 +96,14 @@ def _file_with_extension(directory, extension):
     return file
 
 
+def _open_setup_script(setup_script):
+    if not os.path.exists(setup_script):
+        # Supply a default setup.py
+        return io.StringIO(u"from setuptools import setup; setup()")
+
+    return getattr(tokenize, 'open', open)(setup_script)
+
+
 class _BuildMetaBackend(object):
 
     def _fix_config(self, config_settings):
@@ -120,9 +129,10 @@ def run_setup(self, setup_script='setup.py'):
         # Correctness comes first, then optimization later
         __file__ = setup_script
         __name__ = '__main__'
-        f = getattr(tokenize, 'open', open)(__file__)
-        code = f.read().replace('\\r\\n', '\\n')
-        f.close()
+
+        with _open_setup_script(__file__) as f:
+            code = f.read().replace(r'\r\n', r'\n')
+
         exec(compile(code, __file__, 'exec'), locals())
 
     def get_requires_for_build_wheel(self, config_settings=None):
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 6236b9f42b..74969322c1 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -110,6 +110,21 @@ def run():
                 print('hello')
             """),
     },
+    {
+        'setup.cfg': DALS("""
+        [metadata]
+        name = foo
+        version='0.0.0'
+
+        [options]
+        py_modules=hello
+        setup_requires=six
+        """),
+        'hello.py': DALS("""
+        def run():
+            print('hello')
+        """)
+    },
 ]
 
 
@@ -183,9 +198,13 @@ def test_build_sdist_version_change(self, build_backend):
         # if the setup.py changes subsequent call of the build meta
         # should still succeed, given the
         # sdist_directory the frontend specifies is empty
-        with open(os.path.abspath("setup.py"), 'rt') as file_handler:
+        setup_loc = os.path.abspath("setup.py")
+        if not os.path.exists(setup_loc):
+            setup_loc = os.path.abspath("setup.cfg")
+
+        with open(setup_loc, 'rt') as file_handler:
             content = file_handler.read()
-        with open(os.path.abspath("setup.py"), 'wt') as file_handler:
+        with open(setup_loc, 'wt') as file_handler:
             file_handler.write(
                 content.replace("version='0.0.0'", "version='0.0.1'"))
 

From 6bda3d5f1814b28a5a493363ca16228a4e37cd26 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 7 Feb 2019 08:12:48 -0500
Subject: [PATCH 7383/8469] Add changelog for PR #1675

---
 changelog.d/1675.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1675.change.rst

diff --git a/changelog.d/1675.change.rst b/changelog.d/1675.change.rst
new file mode 100644
index 0000000000..e90676283f
--- /dev/null
+++ b/changelog.d/1675.change.rst
@@ -0,0 +1 @@
+Added support for ``setup.cfg``-only projects when using the ``setuptools.build_meta`` backend. Projects that have enabled PEP 517 no longer need to have a ``setup.py`` and can use the purely declarative ``setup.cfg`` configuration file instead.

From 3963268b5a22798e01b0deac0553be206b2a3837 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam <pradyunsg@gmail.com>
Date: Tue, 12 Feb 2019 12:52:08 +0530
Subject: [PATCH 7384/8469] Update badges in README

* Consistent Styling
* Add Logos of CI services
* Shorten CI badge labels
* Reorder for better wrapping
---
 README.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index 0454f2eddd..bfbaaad82c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,23 +1,23 @@
 .. image:: https://img.shields.io/pypi/v/setuptools.svg
    :target: https://pypi.org/project/setuptools
 
-.. image:: https://readthedocs.org/projects/setuptools/badge/?version=latest
+.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
     :target: https://setuptools.readthedocs.io
 
-.. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20build%20%40%20Travis%20CI
+.. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20CI&logo=travis&logoColor=white
    :target: https://travis-ci.org/pypa/setuptools
 
-.. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20build%20%40%20Appveyor
+.. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20CI&logo=appveyor&logoColor=white
    :target: https://ci.appveyor.com/project/pypa/setuptools/branch/master
 
-.. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg
+.. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white
    :target: https://codecov.io/gh/pypa/setuptools
 
-.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
-
-.. image:: https://tidelift.com/badges/github/pypa/setuptools
+.. image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
 
+.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
+
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From ad98fcb350fa3ce63389520a391e23274de11064 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 Feb 2019 15:16:21 -0500
Subject: [PATCH 7385/8469] Add two tests capturing expectation for '' and None
 to _validate_resource_path. Ref #1686.

---
 pkg_resources/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index dcfa1d0843..5d66f6e034 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1512,6 +1512,19 @@ def _validate_resource_path(path):
         ...
         ValueError: Use of .. or absolute path in a resource path \
 is not allowed.
+
+        Blank values are allowed
+
+        >>> vrp('')
+        >>> bool(warned)
+        False
+
+        Non-string values are not.
+
+        >>> vrp(None)
+        Traceback (most recent call last):
+        ...
+        AttributeError: ...
         """
         invalid = (
             os.path.pardir in path.split(posixpath.sep) or

From f423812ac13d67c2bda112bda6fab7dc7a3dab92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 09:25:10 -0500
Subject: [PATCH 7386/8469] Move version to setup.cfg

---
 setup.cfg | 3 ++-
 setup.py  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f0932e1c86..14245edda8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ universal = 1
 
 [metadata]
 license_file = LICENSE
+version = 40.8.0
 
-[bumpversion:file:setup.py]
+[bumpversion:file:setup.cfg]
 
diff --git a/setup.py b/setup.py
index 8ec7ce06e5..78d7018c98 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,6 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.8.0",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

From fc61c27c1a96b371d9ffbafc2903aa045b4fab4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 10:06:20 -0500
Subject: [PATCH 7387/8469] Move bumpversion config to .bumpversion.cfg as it
 seems not to be possible to handle setup.cfg. Ref c4urself/bump2version#62.

---
 .bumpversion.cfg | 6 ++++++
 setup.cfg        | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 .bumpversion.cfg

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 0000000000..f4e8b40b94
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,6 @@
+[bumpversion]
+current_version = 40.8.0
+commit = True
+tag = True
+
+[bumpversion:file:setup.cfg]
diff --git a/setup.cfg b/setup.cfg
index 14245edda8..7a0fac154d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,3 @@
-[bumpversion]
-current_version = 40.8.0
-commit = True
-tag = True
-
 [egg_info]
 tag_build = .post
 tag_date = 1
@@ -25,6 +20,3 @@ universal = 1
 [metadata]
 license_file = LICENSE
 version = 40.8.0
-
-[bumpversion:file:setup.cfg]
-

From 4a6b8ba7ced6bb841000a59bdef7f9879fb6578d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 15:42:23 -0500
Subject: [PATCH 7388/8469] Add test capturing expectation that provides_extras
 are ordered.

---
 setuptools/tests/test_dist.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 390c3dfcf0..e349d068f5 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -263,3 +263,16 @@ def test_maintainer_author(name, attrs, tmpdir):
         else:
             line = '%s: %s' % (fkey, val)
             assert line in pkg_lines_set
+
+
+def test_provides_extras_deterministic_order():
+    attrs = dict(extras_require=dict(
+        a=['foo'],
+        b=['bar'],
+    ))
+    dist = Distribution(attrs)
+    assert dist.metadata.provides_extras == ['a', 'b']
+    attrs['extras_require'] = dict(
+        reversed(list(attrs['extras_require'].items())))
+    dist = Distribution(attrs)
+    assert dist.metadata.provides_extras == ['b', 'a']

From 3d289a7015b9ba4f8dd29594309e472fd880841e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 17:01:57 -0500
Subject: [PATCH 7389/8469] Add 'ordered_set' as a vendored package

---
 setuptools/_vendor/ordered_set.py | 488 ++++++++++++++++++++++++++++++
 setuptools/_vendor/vendored.txt   |   1 +
 setuptools/extern/__init__.py     |   2 +-
 3 files changed, 490 insertions(+), 1 deletion(-)
 create mode 100644 setuptools/_vendor/ordered_set.py

diff --git a/setuptools/_vendor/ordered_set.py b/setuptools/_vendor/ordered_set.py
new file mode 100644
index 0000000000..d257470b8a
--- /dev/null
+++ b/setuptools/_vendor/ordered_set.py
@@ -0,0 +1,488 @@
+"""
+An OrderedSet is a custom MutableSet that remembers its order, so that every
+entry has an index that can be looked up.
+
+Based on a recipe originally posted to ActiveState Recipes by Raymond Hettiger,
+and released under the MIT license.
+"""
+import itertools as it
+from collections import deque
+
+try:
+    # Python 3
+    from collections.abc import MutableSet, Sequence
+except ImportError:
+    # Python 2.7
+    from collections import MutableSet, Sequence
+
+SLICE_ALL = slice(None)
+__version__ = "3.1"
+
+
+def is_iterable(obj):
+    """
+    Are we being asked to look up a list of things, instead of a single thing?
+    We check for the `__iter__` attribute so that this can cover types that
+    don't have to be known by this module, such as NumPy arrays.
+
+    Strings, however, should be considered as atomic values to look up, not
+    iterables. The same goes for tuples, since they are immutable and therefore
+    valid entries.
+
+    We don't need to check for the Python 2 `unicode` type, because it doesn't
+    have an `__iter__` attribute anyway.
+    """
+    return (
+        hasattr(obj, "__iter__")
+        and not isinstance(obj, str)
+        and not isinstance(obj, tuple)
+    )
+
+
+class OrderedSet(MutableSet, Sequence):
+    """
+    An OrderedSet is a custom MutableSet that remembers its order, so that
+    every entry has an index that can be looked up.
+
+    Example:
+        >>> OrderedSet([1, 1, 2, 3, 2])
+        OrderedSet([1, 2, 3])
+    """
+
+    def __init__(self, iterable=None):
+        self.items = []
+        self.map = {}
+        if iterable is not None:
+            self |= iterable
+
+    def __len__(self):
+        """
+        Returns the number of unique elements in the ordered set
+
+        Example:
+            >>> len(OrderedSet([]))
+            0
+            >>> len(OrderedSet([1, 2]))
+            2
+        """
+        return len(self.items)
+
+    def __getitem__(self, index):
+        """
+        Get the item at a given index.
+
+        If `index` is a slice, you will get back that slice of items, as a
+        new OrderedSet.
+
+        If `index` is a list or a similar iterable, you'll get a list of
+        items corresponding to those indices. This is similar to NumPy's
+        "fancy indexing". The result is not an OrderedSet because you may ask
+        for duplicate indices, and the number of elements returned should be
+        the number of elements asked for.
+
+        Example:
+            >>> oset = OrderedSet([1, 2, 3])
+            >>> oset[1]
+            2
+        """
+        if isinstance(index, slice) and index == SLICE_ALL:
+            return self.copy()
+        elif hasattr(index, "__index__") or isinstance(index, slice):
+            result = self.items[index]
+            if isinstance(result, list):
+                return self.__class__(result)
+            else:
+                return result
+        elif is_iterable(index):
+            return [self.items[i] for i in index]
+        else:
+            raise TypeError("Don't know how to index an OrderedSet by %r" % index)
+
+    def copy(self):
+        """
+        Return a shallow copy of this object.
+
+        Example:
+            >>> this = OrderedSet([1, 2, 3])
+            >>> other = this.copy()
+            >>> this == other
+            True
+            >>> this is other
+            False
+        """
+        return self.__class__(self)
+
+    def __getstate__(self):
+        if len(self) == 0:
+            # The state can't be an empty list.
+            # We need to return a truthy value, or else __setstate__ won't be run.
+            #
+            # This could have been done more gracefully by always putting the state
+            # in a tuple, but this way is backwards- and forwards- compatible with
+            # previous versions of OrderedSet.
+            return (None,)
+        else:
+            return list(self)
+
+    def __setstate__(self, state):
+        if state == (None,):
+            self.__init__([])
+        else:
+            self.__init__(state)
+
+    def __contains__(self, key):
+        """
+        Test if the item is in this ordered set
+
+        Example:
+            >>> 1 in OrderedSet([1, 3, 2])
+            True
+            >>> 5 in OrderedSet([1, 3, 2])
+            False
+        """
+        return key in self.map
+
+    def add(self, key):
+        """
+        Add `key` as an item to this OrderedSet, then return its index.
+
+        If `key` is already in the OrderedSet, return the index it already
+        had.
+
+        Example:
+            >>> oset = OrderedSet()
+            >>> oset.append(3)
+            0
+            >>> print(oset)
+            OrderedSet([3])
+        """
+        if key not in self.map:
+            self.map[key] = len(self.items)
+            self.items.append(key)
+        return self.map[key]
+
+    append = add
+
+    def update(self, sequence):
+        """
+        Update the set with the given iterable sequence, then return the index
+        of the last element inserted.
+
+        Example:
+            >>> oset = OrderedSet([1, 2, 3])
+            >>> oset.update([3, 1, 5, 1, 4])
+            4
+            >>> print(oset)
+            OrderedSet([1, 2, 3, 5, 4])
+        """
+        item_index = None
+        try:
+            for item in sequence:
+                item_index = self.add(item)
+        except TypeError:
+            raise ValueError(
+                "Argument needs to be an iterable, got %s" % type(sequence)
+            )
+        return item_index
+
+    def index(self, key):
+        """
+        Get the index of a given entry, raising an IndexError if it's not
+        present.
+
+        `key` can be an iterable of entries that is not a string, in which case
+        this returns a list of indices.
+
+        Example:
+            >>> oset = OrderedSet([1, 2, 3])
+            >>> oset.index(2)
+            1
+        """
+        if is_iterable(key):
+            return [self.index(subkey) for subkey in key]
+        return self.map[key]
+
+    # Provide some compatibility with pd.Index
+    get_loc = index
+    get_indexer = index
+
+    def pop(self):
+        """
+        Remove and return the last element from the set.
+
+        Raises KeyError if the set is empty.
+
+        Example:
+            >>> oset = OrderedSet([1, 2, 3])
+            >>> oset.pop()
+            3
+        """
+        if not self.items:
+            raise KeyError("Set is empty")
+
+        elem = self.items[-1]
+        del self.items[-1]
+        del self.map[elem]
+        return elem
+
+    def discard(self, key):
+        """
+        Remove an element.  Do not raise an exception if absent.
+
+        The MutableSet mixin uses this to implement the .remove() method, which
+        *does* raise an error when asked to remove a non-existent item.
+
+        Example:
+            >>> oset = OrderedSet([1, 2, 3])
+            >>> oset.discard(2)
+            >>> print(oset)
+            OrderedSet([1, 3])
+            >>> oset.discard(2)
+            >>> print(oset)
+            OrderedSet([1, 3])
+        """
+        if key in self:
+            i = self.map[key]
+            del self.items[i]
+            del self.map[key]
+            for k, v in self.map.items():
+                if v >= i:
+                    self.map[k] = v - 1
+
+    def clear(self):
+        """
+        Remove all items from this OrderedSet.
+        """
+        del self.items[:]
+        self.map.clear()
+
+    def __iter__(self):
+        """
+        Example:
+            >>> list(iter(OrderedSet([1, 2, 3])))
+            [1, 2, 3]
+        """
+        return iter(self.items)
+
+    def __reversed__(self):
+        """
+        Example:
+            >>> list(reversed(OrderedSet([1, 2, 3])))
+            [3, 2, 1]
+        """
+        return reversed(self.items)
+
+    def __repr__(self):
+        if not self:
+            return "%s()" % (self.__class__.__name__,)
+        return "%s(%r)" % (self.__class__.__name__, list(self))
+
+    def __eq__(self, other):
+        """
+        Returns true if the containers have the same items. If `other` is a
+        Sequence, then order is checked, otherwise it is ignored.
+
+        Example:
+            >>> oset = OrderedSet([1, 3, 2])
+            >>> oset == [1, 3, 2]
+            True
+            >>> oset == [1, 2, 3]
+            False
+            >>> oset == [2, 3]
+            False
+            >>> oset == OrderedSet([3, 2, 1])
+            False
+        """
+        # In Python 2 deque is not a Sequence, so treat it as one for
+        # consistent behavior with Python 3.
+        if isinstance(other, (Sequence, deque)):
+            # Check that this OrderedSet contains the same elements, in the
+            # same order, as the other object.
+            return list(self) == list(other)
+        try:
+            other_as_set = set(other)
+        except TypeError:
+            # If `other` can't be converted into a set, it's not equal.
+            return False
+        else:
+            return set(self) == other_as_set
+
+    def union(self, *sets):
+        """
+        Combines all unique items.
+        Each items order is defined by its first appearance.
+
+        Example:
+            >>> oset = OrderedSet.union(OrderedSet([3, 1, 4, 1, 5]), [1, 3], [2, 0])
+            >>> print(oset)
+            OrderedSet([3, 1, 4, 5, 2, 0])
+            >>> oset.union([8, 9])
+            OrderedSet([3, 1, 4, 5, 2, 0, 8, 9])
+            >>> oset | {10}
+            OrderedSet([3, 1, 4, 5, 2, 0, 10])
+        """
+        cls = self.__class__ if isinstance(self, OrderedSet) else OrderedSet
+        containers = map(list, it.chain([self], sets))
+        items = it.chain.from_iterable(containers)
+        return cls(items)
+
+    def __and__(self, other):
+        # the parent implementation of this is backwards
+        return self.intersection(other)
+
+    def intersection(self, *sets):
+        """
+        Returns elements in common between all sets. Order is defined only
+        by the first set.
+
+        Example:
+            >>> oset = OrderedSet.intersection(OrderedSet([0, 1, 2, 3]), [1, 2, 3])
+            >>> print(oset)
+            OrderedSet([1, 2, 3])
+            >>> oset.intersection([2, 4, 5], [1, 2, 3, 4])
+            OrderedSet([2])
+            >>> oset.intersection()
+            OrderedSet([1, 2, 3])
+        """
+        cls = self.__class__ if isinstance(self, OrderedSet) else OrderedSet
+        if sets:
+            common = set.intersection(*map(set, sets))
+            items = (item for item in self if item in common)
+        else:
+            items = self
+        return cls(items)
+
+    def difference(self, *sets):
+        """
+        Returns all elements that are in this set but not the others.
+
+        Example:
+            >>> OrderedSet([1, 2, 3]).difference(OrderedSet([2]))
+            OrderedSet([1, 3])
+            >>> OrderedSet([1, 2, 3]).difference(OrderedSet([2]), OrderedSet([3]))
+            OrderedSet([1])
+            >>> OrderedSet([1, 2, 3]) - OrderedSet([2])
+            OrderedSet([1, 3])
+            >>> OrderedSet([1, 2, 3]).difference()
+            OrderedSet([1, 2, 3])
+        """
+        cls = self.__class__
+        if sets:
+            other = set.union(*map(set, sets))
+            items = (item for item in self if item not in other)
+        else:
+            items = self
+        return cls(items)
+
+    def issubset(self, other):
+        """
+        Report whether another set contains this set.
+
+        Example:
+            >>> OrderedSet([1, 2, 3]).issubset({1, 2})
+            False
+            >>> OrderedSet([1, 2, 3]).issubset({1, 2, 3, 4})
+            True
+            >>> OrderedSet([1, 2, 3]).issubset({1, 4, 3, 5})
+            False
+        """
+        if len(self) > len(other):  # Fast check for obvious cases
+            return False
+        return all(item in other for item in self)
+
+    def issuperset(self, other):
+        """
+        Report whether this set contains another set.
+
+        Example:
+            >>> OrderedSet([1, 2]).issuperset([1, 2, 3])
+            False
+            >>> OrderedSet([1, 2, 3, 4]).issuperset({1, 2, 3})
+            True
+            >>> OrderedSet([1, 4, 3, 5]).issuperset({1, 2, 3})
+            False
+        """
+        if len(self) < len(other):  # Fast check for obvious cases
+            return False
+        return all(item in self for item in other)
+
+    def symmetric_difference(self, other):
+        """
+        Return the symmetric difference of two OrderedSets as a new set.
+        That is, the new set will contain all elements that are in exactly
+        one of the sets.
+
+        Their order will be preserved, with elements from `self` preceding
+        elements from `other`.
+
+        Example:
+            >>> this = OrderedSet([1, 4, 3, 5, 7])
+            >>> other = OrderedSet([9, 7, 1, 3, 2])
+            >>> this.symmetric_difference(other)
+            OrderedSet([4, 5, 9, 2])
+        """
+        cls = self.__class__ if isinstance(self, OrderedSet) else OrderedSet
+        diff1 = cls(self).difference(other)
+        diff2 = cls(other).difference(self)
+        return diff1.union(diff2)
+
+    def _update_items(self, items):
+        """
+        Replace the 'items' list of this OrderedSet with a new one, updating
+        self.map accordingly.
+        """
+        self.items = items
+        self.map = {item: idx for (idx, item) in enumerate(items)}
+
+    def difference_update(self, *sets):
+        """
+        Update this OrderedSet to remove items from one or more other sets.
+
+        Example:
+            >>> this = OrderedSet([1, 2, 3])
+            >>> this.difference_update(OrderedSet([2, 4]))
+            >>> print(this)
+            OrderedSet([1, 3])
+
+            >>> this = OrderedSet([1, 2, 3, 4, 5])
+            >>> this.difference_update(OrderedSet([2, 4]), OrderedSet([1, 4, 6]))
+            >>> print(this)
+            OrderedSet([3, 5])
+        """
+        items_to_remove = set()
+        for other in sets:
+            items_to_remove |= set(other)
+        self._update_items([item for item in self.items if item not in items_to_remove])
+
+    def intersection_update(self, other):
+        """
+        Update this OrderedSet to keep only items in another set, preserving
+        their order in this set.
+
+        Example:
+            >>> this = OrderedSet([1, 4, 3, 5, 7])
+            >>> other = OrderedSet([9, 7, 1, 3, 2])
+            >>> this.intersection_update(other)
+            >>> print(this)
+            OrderedSet([1, 3, 7])
+        """
+        other = set(other)
+        self._update_items([item for item in self.items if item in other])
+
+    def symmetric_difference_update(self, other):
+        """
+        Update this OrderedSet to remove items from another set, then
+        add items from the other set that were not present in this set.
+
+        Example:
+            >>> this = OrderedSet([1, 4, 3, 5, 7])
+            >>> other = OrderedSet([9, 7, 1, 3, 2])
+            >>> this.symmetric_difference_update(other)
+            >>> print(this)
+            OrderedSet([4, 5, 9, 2])
+        """
+        items_to_add = [item for item in other if item not in self]
+        items_to_remove = set(other)
+        self._update_items(
+            [item for item in self.items if item not in items_to_remove] + items_to_add
+        )
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 7d77863d57..379aae56ed 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,3 +1,4 @@
 packaging==16.8
 pyparsing==2.2.1
 six==1.10.0
+ordered-set
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index cb2fa32927..e8c616f910 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -69,5 +69,5 @@ def install(self):
             sys.meta_path.append(self)
 
 
-names = 'six', 'packaging', 'pyparsing',
+names = 'six', 'packaging', 'pyparsing', 'ordered_set',
 VendorImporter(__name__, names, 'setuptools._vendor').install()

From 636070d9922f1443ae98b0fdd45b6c74c3c9af11 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 17:09:26 -0500
Subject: [PATCH 7390/8469] Use an ordered set when constructing 'extras
 provided'. Ref #1305.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ddb1787ad0..ce37761e3a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -28,6 +28,7 @@
 
 from setuptools.extern import six
 from setuptools.extern import packaging
+from setuptools.extern import ordered_set
 from setuptools.extern.six.moves import map, filter, filterfalse
 
 from . import SetuptoolsDeprecationWarning
@@ -408,7 +409,7 @@ class Distribution(_Distribution):
     _DISTUTILS_UNSUPPORTED_METADATA = {
         'long_description_content_type': None,
         'project_urls': dict,
-        'provides_extras': set,
+        'provides_extras': ordered_set.OrderedSet,
     }
 
     _patched_dist = None

From 7f7780e5b572d6fcacd63bf99389dd9f48c5345c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Feb 2019 17:37:01 -0500
Subject: [PATCH 7391/8469] In tests, force deterministic ordering on
 extras_require so tests pass.

---
 setuptools/tests/test_dist.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index e349d068f5..0c0b9d6663 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -3,6 +3,8 @@
 from __future__ import unicode_literals
 
 import io
+import collections
+
 from setuptools.dist import DistDeprecationWarning, _get_unpatched
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
@@ -266,13 +268,13 @@ def test_maintainer_author(name, attrs, tmpdir):
 
 
 def test_provides_extras_deterministic_order():
-    attrs = dict(extras_require=dict(
-        a=['foo'],
-        b=['bar'],
-    ))
+    extras = collections.OrderedDict()
+    extras['a'] = ['foo']
+    extras['b'] = ['bar']
+    attrs = dict(extras_require=extras)
     dist = Distribution(attrs)
     assert dist.metadata.provides_extras == ['a', 'b']
-    attrs['extras_require'] = dict(
+    attrs['extras_require'] = collections.OrderedDict(
         reversed(list(attrs['extras_require'].items())))
     dist = Distribution(attrs)
     assert dist.metadata.provides_extras == ['b', 'a']

From 82db4c621974659513effae337d47a05e31fe7a5 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Jan 2019 23:07:59 +0100
Subject: [PATCH 7392/8469] tests: improve `test_pip_upgrade_from_source`

Parametrize the test to check different versions of pip
(including master) are correctly supported.
---
 setuptools/tests/test_virtualenv.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 3d5c84b067..bd89fd6470 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -52,10 +52,24 @@ def test_clean_env_install(bare_virtualenv):
     )).format(source=SOURCE_DIR))
 
 
-def test_pip_upgrade_from_source(virtualenv):
+@pytest.mark.parametrize('pip_version', (
+    'pip==9.0.3',
+    'pip==10.0.1',
+    'pip==18.1',
+    'pip==19.0.1',
+    'https://github.com/pypa/pip/archive/master.zip',
+))
+def test_pip_upgrade_from_source(virtualenv, pip_version):
     """
     Check pip can upgrade setuptools from source.
     """
+    # Install pip/wheel, and remove setuptools (as it
+    # should not be needed for bootstraping from source)
+    virtualenv.run(' && '.join((
+        'pip uninstall -y setuptools',
+        'pip install -U wheel',
+        'python -m pip install {pip_version}',
+    )).format(pip_version=pip_version))
     dist_dir = virtualenv.workspace
     # Generate source distribution / wheel.
     virtualenv.run(' && '.join((

From b224605a8c16b2a713120bf0d484fa12ce781f02 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 7 Feb 2019 09:28:29 -0500
Subject: [PATCH 7393/8469] Automatically skip tests that require network

---
 setuptools/tests/test_virtualenv.py | 51 +++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index bd89fd6470..d7b98c7741 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -52,24 +52,55 @@ def test_clean_env_install(bare_virtualenv):
     )).format(source=SOURCE_DIR))
 
 
-@pytest.mark.parametrize('pip_version', (
-    'pip==9.0.3',
-    'pip==10.0.1',
-    'pip==18.1',
-    'pip==19.0.1',
-    'https://github.com/pypa/pip/archive/master.zip',
-))
-def test_pip_upgrade_from_source(virtualenv, pip_version):
+def _get_pip_versions():
+    # This fixture will attempt to detect if tests are being run without
+    # network connectivity and if so skip some tests
+
+    network = True
+    if not os.environ.get('NETWORK_REQUIRED', False):  # pragma: nocover
+        try:
+            from urllib.request import urlopen
+            from urllib.error import URLError
+        except ImportError:
+            from urllib2 import urlopen, URLError # Python 2.7 compat
+
+        try:
+            urlopen('https://pypi.org', timeout=1)
+        except URLError:
+            # No network, disable most of these tests
+            network = False
+
+    network_versions = [
+        'pip==9.0.3',
+        'pip==10.0.1',
+        'pip==18.1',
+        'pip==19.0.1',
+        'https://github.com/pypa/pip/archive/master.zip',
+    ]
+
+    versions = [None] + [
+        pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
+        for v in network_versions
+    ]
+
+    return versions
+
+
+@pytest.mark.parametrize('pip_version', _get_pip_versions())
+def test_pip_upgrade_from_source(pip_version, virtualenv):
     """
     Check pip can upgrade setuptools from source.
     """
     # Install pip/wheel, and remove setuptools (as it
     # should not be needed for bootstraping from source)
+    if pip_version is None:
+        upgrade_pip = ()
+    else:
+        upgrade_pip = ('python -m pip install -U {pip_version} --retries=1',)
     virtualenv.run(' && '.join((
         'pip uninstall -y setuptools',
         'pip install -U wheel',
-        'python -m pip install {pip_version}',
-    )).format(pip_version=pip_version))
+    ) + upgrade_pip).format(pip_version=pip_version))
     dist_dir = virtualenv.workspace
     # Generate source distribution / wheel.
     virtualenv.run(' && '.join((

From 675c690b4d8e55cd3c94a177d31b3a7937b2dd16 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 7 Feb 2019 09:28:29 -0500
Subject: [PATCH 7394/8469] Require network in CI builds

---
 .travis.yml  | 1 +
 appveyor.yml | 1 +
 tox.ini      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d1febccbdd..09c3817ee0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,7 @@ install:
 - "! grep pyc setuptools.egg-info/SOURCES.txt"
 
 script:
+  - export NETWORK_REQUIRED=1
   - |
     ( # Run testsuite.
       if [ -z "$DISABLE_COVERAGE" ]
diff --git a/appveyor.yml b/appveyor.yml
index ef4a9f7e35..7a3d174da8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@ clone_depth: 50
 environment:
 
   APPVEYOR: True
+  NETWORK_REQUIRED: True
   CODECOV_ENV: APPVEYOR_JOB_NAME
 
   matrix:
diff --git a/tox.ini b/tox.ini
index a31cb1c535..bb940ac072 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ list_dependencies_command={envbindir}/pip freeze
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
-passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_*
+passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
 commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
 

From 0483cca44855280d25e7798680bb520da8923e16 Mon Sep 17 00:00:00 2001
From: Ratin_Kumar <ratin.kumar.2k@gmail.com>
Date: Tue, 26 Feb 2019 20:55:00 +0530
Subject: [PATCH 7395/8469] Remove unwritten sections of the documentation
 (#1705)

These sections of the documentation were never written, and refer to deprecated functionality anyway, so they can be removed.
---
 changelog.d/1705.doc.rst |  1 +
 docs/setuptools.txt      | 36 ------------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 create mode 100644 changelog.d/1705.doc.rst

diff --git a/changelog.d/1705.doc.rst b/changelog.d/1705.doc.rst
new file mode 100644
index 0000000000..a2ce9c2b96
--- /dev/null
+++ b/changelog.d/1705.doc.rst
@@ -0,0 +1 @@
+Removed some placeholder documentation sections referring to deprecated features.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index a4e05d75d1..64b385cb1d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2679,42 +2679,6 @@ A few important points for writing revision control file finders:
   inform the user of the missing program(s).
 
 
-Subclassing ``Command``
------------------------
-
-Sorry, this section isn't written yet, and neither is a lot of what's below
-this point.
-
-XXX
-
-
-Reusing ``setuptools`` Code
-===========================
-
-``ez_setup``
-------------
-
-XXX
-
-
-``setuptools.archive_util``
----------------------------
-
-XXX
-
-
-``setuptools.sandbox``
-----------------------
-
-XXX
-
-
-``setuptools.package_index``
-----------------------------
-
-XXX
-
-
 Mailing List and Bug Tracker
 ============================
 

From 5b2175ebd9f4a669097e8309a53e3b843dcbb218 Mon Sep 17 00:00:00 2001
From: robnagler <github@q33.us>
Date: Tue, 26 Feb 2019 17:10:49 +0000
Subject: [PATCH 7396/8469] uniquify paths in PYTHONPATH

When running in a complex environment with lots of installed
packages, PYTHONPATH gets way too long. Instead, just make sure
that paths_on_pythonpath doesn't contain duplicates
---
 setuptools/command/test.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index dde0118c90..997fd8b056 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -186,11 +186,12 @@ def paths_on_pythonpath(paths):
         orig_pythonpath = os.environ.get('PYTHONPATH', nothing)
         current_pythonpath = os.environ.get('PYTHONPATH', '')
         try:
-            prefix = os.pathsep.join(paths)
-            to_join = filter(None, [prefix, current_pythonpath])
-            new_path = os.pathsep.join(to_join)
-            if new_path:
-                os.environ['PYTHONPATH'] = new_path
+            to_join = []
+            for x in list(paths) + current_pythonpath.split(os.pathsep):
+                if x not in to_join:
+                    to_join.append(x)
+            if to_join:
+                os.environ['PYTHONPATH'] = os.pathsep.join(to_join)
             yield
         finally:
             if orig_pythonpath is nothing:

From 9d329c1bbe7e35a3a4b5810f90ff292d51d7a66d Mon Sep 17 00:00:00 2001
From: Kevin Adler <kadler@us.ibm.com>
Date: Mon, 4 Mar 2019 08:48:40 -0600
Subject: [PATCH 7397/8469] bpo-35198 Fix C++ extension compilation on AIX
 (GH-10437)

For C++ extensions, distutils tries to replace the C compiler with the
C++ compiler, but it assumes that C compiler is the first element after
any environment variables set. On AIX, linking goes through ld_so_aix,
so it is the first element and the compiler is the next element. Thus
the replacement is faulty:

ld_so_aix gcc ... -> g++ gcc ...

Also, it assumed that self.compiler_cxx had only 1 element or that
there were the same number of elements as the linker has and in the
same order. This might not be the case, so instead concatenate
everything together.
---
 unixccompiler.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index ab4d4de156..d10a78da31 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -188,7 +188,15 @@ def link(self, target_desc, objects,
                         i = 1
                         while '=' in linker[i]:
                             i += 1
-                    linker[i] = self.compiler_cxx[i]
+
+                    if os.path.basename(linker[i]) == 'ld_so_aix':
+                        # AIX platforms prefix the compiler with the ld_so_aix
+                        # script, so we need to adjust our linker index
+                        offset = 1
+                    else:
+                        offset = 0
+
+                    linker[i+offset] = self.compiler_cxx[i]
 
                 if sys.platform == 'darwin':
                     linker = _osx_support.compiler_fixup(linker, ld_args)

From 16e452a42a3dbbb0ab3d3146ffa3b743cdca2539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Chapoton?= <fchapoton2@gmail.com>
Date: Wed, 6 Mar 2019 15:22:28 +0100
Subject: [PATCH 7398/8469] Remove duplicate import io (#1713)

Found by lgtm
---
 setuptools/dist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ddb1787ad0..6233d5dc2c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -1103,7 +1103,6 @@ def handle_display_options(self, option_order):
             return _Distribution.handle_display_options(self, option_order)
 
         # Stdout may be StringIO (e.g. in tests)
-        import io
         if not isinstance(sys.stdout, io.TextIOWrapper):
             return _Distribution.handle_display_options(self, option_order)
 

From f3e20900c492253924944707f390a9c12d7a30fd Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Tue, 12 Mar 2019 08:39:57 -0700
Subject: [PATCH 7399/8469] bpo-36264: Don't honor POSIX HOME in
 os.path.expanduser on Windows (GH-12282)

---
 tests/test_config.py | 1 +
 tests/test_dist.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_config.py b/tests/test_config.py
index 77ef788e24..344084afb7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -60,6 +60,7 @@ def setUp(self):
         super(BasePyPIRCCommandTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
         os.environ['HOME'] = self.tmp_dir
+        os.environ['USERPROFILE'] = self.tmp_dir
         self.rc = os.path.join(self.tmp_dir, '.pypirc')
         self.dist = Distribution()
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 0a19f0fb62..cc34725a99 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -463,7 +463,7 @@ def test_custom_pydistutils(self):
             # win32-style
             if sys.platform == 'win32':
                 # home drive should be found
-                os.environ['HOME'] = temp_dir
+                os.environ['USERPROFILE'] = temp_dir
                 files = dist.find_config_files()
                 self.assertIn(user_filename, files,
                               '%r not found in %r' % (user_filename, files))

From 1078515edfad6bf60085a2611fe24ffd497474ca Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 15 Mar 2019 14:57:52 +0100
Subject: [PATCH 7400/8469] bpo-36235: Fix CFLAGS in distutils
 customize_compiler() (GH-12236)

Fix CFLAGS in customize_compiler() of distutils.sysconfig: when the
CFLAGS environment variable is defined, don't override CFLAGS variable with
the OPT variable anymore.

Initial patch written by David Malcolm.

Co-Authored-By: David Malcolm <dmalcolm@redhat.com>
---
 sysconfig.py            |  6 +++---
 tests/test_sysconfig.py | 15 +++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sysconfig.py b/sysconfig.py
index 40af493cdf..a3494670db 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -181,8 +181,8 @@ def customize_compiler(compiler):
                 _osx_support.customize_compiler(_config_vars)
                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
 
-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+        (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+            get_config_vars('CC', 'CXX', 'CFLAGS',
                             'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
 
         if 'CC' in os.environ:
@@ -205,7 +205,7 @@ def customize_compiler(compiler):
         if 'LDFLAGS' in os.environ:
             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
         if 'CFLAGS' in os.environ:
-            cflags = opt + ' ' + os.environ['CFLAGS']
+            cflags = cflags + ' ' + os.environ['CFLAGS']
             ldshared = ldshared + ' ' + os.environ['CFLAGS']
         if 'CPPFLAGS' in os.environ:
             cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index fe4a2994e3..4bf6a067d4 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -9,7 +9,7 @@
 from distutils import sysconfig
 from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
-from test.support import TESTFN, run_unittest, check_warnings
+from test.support import TESTFN, run_unittest, check_warnings, swap_item
 
 class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     def setUp(self):
@@ -78,7 +78,9 @@ def test_srcdir_independent_of_cwd(self):
                          'not testing if default compiler is not unix')
     def test_customize_compiler(self):
         os.environ['AR'] = 'my_ar'
-        os.environ['ARFLAGS'] = '-arflags'
+        os.environ['CC'] = 'my_cc'
+        os.environ['ARFLAGS'] = '--myarflags'
+        os.environ['CFLAGS'] = '--mycflags'
 
         # make sure AR gets caught
         class compiler:
@@ -87,9 +89,14 @@ class compiler:
             def set_executables(self, **kw):
                 self.exes = kw
 
+        # Make sure that sysconfig._config_vars is initialized
+        sysconfig.get_config_vars()
+
         comp = compiler()
-        sysconfig.customize_compiler(comp)
-        self.assertEqual(comp.exes['archiver'], 'my_ar -arflags')
+        with swap_item(sysconfig._config_vars, 'CFLAGS', '--sysconfig-cflags'):
+            sysconfig.customize_compiler(comp)
+        self.assertEqual(comp.exes['archiver'], 'my_ar --myarflags')
+        self.assertEqual(comp.exes['compiler'], 'my_cc --sysconfig-cflags --mycflags')
 
     def test_parse_makefile_base(self):
         self.makefile = TESTFN

From 1aa781cd8ee638e7b403ebbd1caa82f8c7d4e6cd Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 16 Mar 2019 12:28:17 -0400
Subject: [PATCH 7401/8469] Add failing test for setup_requires

Per GH #1682, with setuptools.build_meta we are not properly handling
the situation where setup_requires is actually a newline-delimited
string rather than a list, which is supported by setup.py interface.

This adds several failing (and some passing) tests for how
setup_requires is handled by setuptools.build_meta.
---
 setuptools/tests/test_build_meta.py | 46 +++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 74969322c1..d9df8b2cc0 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -287,6 +287,52 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         with pytest.raises(ImportError):
             build_backend.build_sdist("temp")
 
+    @pytest.mark.parametrize('setup_literal, requirements', [
+        pytest.param("'foo'", ['foo'], marks=pytest.mark.xfail),
+        ("['foo']", ['foo']),
+        pytest.param(r"'foo\n'", ['foo'], marks=pytest.mark.xfail),
+        pytest.param(r"'foo\n\n'", ['foo'], marks=pytest.mark.xfail),
+        ("['foo', 'bar']", ['foo', 'bar']),
+        pytest.param(r"'# Has a comment line\nfoo'",
+                     ['foo'], marks=pytest.mark.xfail),
+        pytest.param(r"'foo # Has an inline comment'",
+                     ['foo'], marks=pytest.mark.xfail),
+        pytest.param(r"'foo \\\n >=3.0'",
+                     ['foo>=3.0'], marks=pytest.mark.xfail),
+        pytest.param(r"'foo\nbar'", ['foo', 'bar'], marks=pytest.mark.xfail),
+        pytest.param(r"'foo\nbar\n'", ['foo', 'bar'], marks=pytest.mark.xfail),
+        pytest.param(r"['foo\n', 'bar\n']",
+                     ['foo', 'bar'], marks=pytest.mark.xfail),
+    ])
+    def test_setup_requires(self, setup_literal, requirements, tmpdir_cwd):
+
+        files = {
+            'setup.py': DALS("""
+                from setuptools import setup
+
+                setup(
+                    name="qux",
+                    version="0.0.0",
+                    py_modules=["hello.py"],
+                    setup_requires={setup_literal},
+                )
+            """).format(setup_literal=setup_literal),
+            'hello.py': DALS("""
+            def run():
+                print('hello')
+            """),
+        }
+
+        build_files(files)
+
+        build_backend = self.get_build_backend()
+
+        # Ensure that the build requirements are properly parsed
+        expected = sorted(['wheel'] + requirements)
+        actual = build_backend.get_requires_for_build_wheel()
+
+        assert expected == sorted(actual)
+
 
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
     backend_name = 'setuptools.build_meta:__legacy__'

From 318f739d14a810042e6803fa3eb4c4e140f0ef88 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 16 Mar 2019 12:53:05 -0400
Subject: [PATCH 7402/8469] Add requirement parsing in setuptools.build_meta

This fixes GH #1682 by porting the pkg_resources requirement parsing
logic into setuptools.build_meta, so that all valid requirement
specifiers passed to setup_requires will be added to the
get_requires_for_build_* function outputs.

Fixes GH #1682
---
 setuptools/build_meta.py            | 45 ++++++++++++++++++++++++++++-
 setuptools/tests/test_build_meta.py | 22 ++++++--------
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 047cc07b69..fb37c02a1d 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -36,6 +36,8 @@
 import setuptools
 import distutils
 
+from setuptools._vendor import six
+
 __all__ = ['get_requires_for_build_sdist',
            'get_requires_for_build_wheel',
            'prepare_metadata_for_build_wheel',
@@ -51,7 +53,9 @@ def __init__(self, specifiers):
 
 class Distribution(setuptools.dist.Distribution):
     def fetch_build_eggs(self, specifiers):
-        raise SetupRequirementsError(specifiers)
+        specifier_list = self._parse_requirements(specifiers)
+
+        raise SetupRequirementsError(specifier_list)
 
     @classmethod
     @contextlib.contextmanager
@@ -68,6 +72,45 @@ def patch(cls):
         finally:
             distutils.core.Distribution = orig
 
+    def _yield_lines(self, strs):
+        """Yield non-empty/non-comment lines of a string or sequence"""
+        if isinstance(strs, six.string_types):
+            for s in strs.splitlines():
+                s = s.strip()
+                # skip blank lines/comments
+                if s and not s.startswith('#'):
+                    yield s
+        else:
+            for ss in strs:
+                for s in self._yield_lines(ss):
+                    yield s
+
+    def _parse_requirements(self, strs):
+        """Parse requirement specifiers into a list of requirement strings
+
+        This is forked from pkg_resources.parse_requirements.
+
+        `strs` must be a string, or a (possibly-nested) iterable thereof.
+        """
+        # create a steppable iterator, so we can handle \-continuations
+        lines = iter(self._yield_lines(strs))
+
+        requirements = []
+
+        for line in lines:
+            # Drop comments -- a hash without a space may be in a URL.
+            if ' #' in line:
+                line = line[:line.find(' #')]
+            # If there is a line continuation, drop it, and append the next line.
+            if line.endswith('\\'):
+                line = line[:-2].strip()
+                try:
+                    line += next(lines)
+                except StopIteration:
+                    return
+            requirements.append(line)
+
+        return requirements
 
 def _to_str(s):
     """
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index d9df8b2cc0..a14a3c7a7c 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -288,21 +288,17 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
             build_backend.build_sdist("temp")
 
     @pytest.mark.parametrize('setup_literal, requirements', [
-        pytest.param("'foo'", ['foo'], marks=pytest.mark.xfail),
+        ("'foo'", ['foo']),
         ("['foo']", ['foo']),
-        pytest.param(r"'foo\n'", ['foo'], marks=pytest.mark.xfail),
-        pytest.param(r"'foo\n\n'", ['foo'], marks=pytest.mark.xfail),
+        (r"'foo\n'", ['foo']),
+        (r"'foo\n\n'", ['foo']),
         ("['foo', 'bar']", ['foo', 'bar']),
-        pytest.param(r"'# Has a comment line\nfoo'",
-                     ['foo'], marks=pytest.mark.xfail),
-        pytest.param(r"'foo # Has an inline comment'",
-                     ['foo'], marks=pytest.mark.xfail),
-        pytest.param(r"'foo \\\n >=3.0'",
-                     ['foo>=3.0'], marks=pytest.mark.xfail),
-        pytest.param(r"'foo\nbar'", ['foo', 'bar'], marks=pytest.mark.xfail),
-        pytest.param(r"'foo\nbar\n'", ['foo', 'bar'], marks=pytest.mark.xfail),
-        pytest.param(r"['foo\n', 'bar\n']",
-                     ['foo', 'bar'], marks=pytest.mark.xfail),
+        (r"'# Has a comment line\nfoo'", ['foo']),
+        (r"'foo # Has an inline comment'", ['foo']),
+        (r"'foo \\\n >=3.0'", ['foo>=3.0']),
+        (r"'foo\nbar'", ['foo', 'bar']),
+        (r"'foo\nbar\n'", ['foo', 'bar']),
+        (r"['foo\n', 'bar\n']", ['foo', 'bar']),
     ])
     def test_setup_requires(self, setup_literal, requirements, tmpdir_cwd):
 

From b54d4c699fc4e1692dadd19bdd7cbcde1c844976 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 16 Mar 2019 12:57:57 -0400
Subject: [PATCH 7403/8469] Extend requirement parsing tests to sdists

---
 setuptools/tests/test_build_meta.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a14a3c7a7c..0bdea2d613 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -300,7 +300,9 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         (r"'foo\nbar\n'", ['foo', 'bar']),
         (r"['foo\n', 'bar\n']", ['foo', 'bar']),
     ])
-    def test_setup_requires(self, setup_literal, requirements, tmpdir_cwd):
+    @pytest.mark.parametrize('use_wheel', [True, False])
+    def test_setup_requires(self, setup_literal, requirements, use_wheel,
+                            tmpdir_cwd):
 
         files = {
             'setup.py': DALS("""
@@ -323,9 +325,16 @@ def run():
 
         build_backend = self.get_build_backend()
 
+        if use_wheel:
+            base_requirements = ['wheel']
+            get_requires = build_backend.get_requires_for_build_wheel
+        else:
+            base_requirements = []
+            get_requires = build_backend.get_requires_for_build_sdist
+
         # Ensure that the build requirements are properly parsed
-        expected = sorted(['wheel'] + requirements)
-        actual = build_backend.get_requires_for_build_wheel()
+        expected = sorted(base_requirements + requirements)
+        actual = get_requires()
 
         assert expected == sorted(actual)
 

From e33a714f9a9342e7aa035b22eaf29433fd58ba86 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 16 Mar 2019 13:05:29 -0400
Subject: [PATCH 7404/8469] Add changelog for PR #1720

---
 changelog.d/1720.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1720.change.rst

diff --git a/changelog.d/1720.change.rst b/changelog.d/1720.change.rst
new file mode 100644
index 0000000000..a0d8fb35aa
--- /dev/null
+++ b/changelog.d/1720.change.rst
@@ -0,0 +1 @@
+Added support for ``pkg_resources.parse_requirements``-style requirements in ``setup_requires`` when ``setup.py`` is invoked from the ``setuptools.build_meta`` build backend.

From c27c705f6a326e4820f1a34d6ce1db101dad3a30 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Sat, 16 Mar 2019 10:06:53 -0700
Subject: [PATCH 7405/8469] Fix typo in docstring (#1718)

---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6233d5dc2c..e6d08b9203 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -885,7 +885,7 @@ def include_feature(self, name):
     def include(self, **attrs):
         """Add items to distribution that are named in keyword arguments
 
-        For example, 'dist.exclude(py_modules=["x"])' would add 'x' to
+        For example, 'dist.include(py_modules=["x"])' would add 'x' to
         the distribution's 'py_modules' attribute, if it was not already
         there.
 

From 5efdf816fddcd8fbc9c3d1e6867a25848b1f9a06 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Sat, 16 Mar 2019 13:24:36 -0400
Subject: [PATCH 7406/8469] Use pkg_resources.parse_requirements in build_meta

Since pkg_resources is imported elsewhere anyway, we don't get much
value out of porting the requirement parser locally.
---
 setuptools/build_meta.py | 43 ++--------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index fb37c02a1d..47cbcbf684 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -36,7 +36,7 @@
 import setuptools
 import distutils
 
-from setuptools._vendor import six
+from pkg_resources import parse_requirements
 
 __all__ = ['get_requires_for_build_sdist',
            'get_requires_for_build_wheel',
@@ -53,7 +53,7 @@ def __init__(self, specifiers):
 
 class Distribution(setuptools.dist.Distribution):
     def fetch_build_eggs(self, specifiers):
-        specifier_list = self._parse_requirements(specifiers)
+        specifier_list = list(map(str, parse_requirements(specifiers)))
 
         raise SetupRequirementsError(specifier_list)
 
@@ -72,45 +72,6 @@ def patch(cls):
         finally:
             distutils.core.Distribution = orig
 
-    def _yield_lines(self, strs):
-        """Yield non-empty/non-comment lines of a string or sequence"""
-        if isinstance(strs, six.string_types):
-            for s in strs.splitlines():
-                s = s.strip()
-                # skip blank lines/comments
-                if s and not s.startswith('#'):
-                    yield s
-        else:
-            for ss in strs:
-                for s in self._yield_lines(ss):
-                    yield s
-
-    def _parse_requirements(self, strs):
-        """Parse requirement specifiers into a list of requirement strings
-
-        This is forked from pkg_resources.parse_requirements.
-
-        `strs` must be a string, or a (possibly-nested) iterable thereof.
-        """
-        # create a steppable iterator, so we can handle \-continuations
-        lines = iter(self._yield_lines(strs))
-
-        requirements = []
-
-        for line in lines:
-            # Drop comments -- a hash without a space may be in a URL.
-            if ' #' in line:
-                line = line[:line.find(' #')]
-            # If there is a line continuation, drop it, and append the next line.
-            if line.endswith('\\'):
-                line = line[:-2].strip()
-                try:
-                    line += next(lines)
-                except StopIteration:
-                    return
-            requirements.append(line)
-
-        return requirements
 
 def _to_str(s):
     """

From 4c6000461394d2a969c17b98ff7b64e7d6f6eee4 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Mon, 18 Mar 2019 17:19:02 +0100
Subject: [PATCH 7407/8469] bpo-36235: Enhance distutils
 test_customize_compiler() (GH-12403)

The test test_customize_compiler() now mocks all sysconfig variables
and all environment variables used by customize_compiler().
---
 tests/test_sysconfig.py | 92 +++++++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 13 deletions(-)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 4bf6a067d4..245a6c86b1 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -1,4 +1,5 @@
 """Tests for distutils.sysconfig."""
+import contextlib
 import os
 import shutil
 import subprocess
@@ -74,14 +75,7 @@ def test_srcdir_independent_of_cwd(self):
             os.chdir(cwd)
         self.assertEqual(srcdir, srcdir2)
 
-    @unittest.skipUnless(get_default_compiler() == 'unix',
-                         'not testing if default compiler is not unix')
-    def test_customize_compiler(self):
-        os.environ['AR'] = 'my_ar'
-        os.environ['CC'] = 'my_cc'
-        os.environ['ARFLAGS'] = '--myarflags'
-        os.environ['CFLAGS'] = '--mycflags'
-
+    def customize_compiler(self):
         # make sure AR gets caught
         class compiler:
             compiler_type = 'unix'
@@ -89,14 +83,86 @@ class compiler:
             def set_executables(self, **kw):
                 self.exes = kw
 
-        # Make sure that sysconfig._config_vars is initialized
-        sysconfig.get_config_vars()
+        sysconfig_vars = {
+            'AR': 'sc_ar',
+            'CC': 'sc_cc',
+            'CXX': 'sc_cxx',
+            'ARFLAGS': '--sc-arflags',
+            'CFLAGS': '--sc-cflags',
+            'CCSHARED': '--sc-ccshared',
+            'LDSHARED': 'sc_ldshared',
+            'SHLIB_SUFFIX': 'sc_shutil_suffix',
+        }
 
         comp = compiler()
-        with swap_item(sysconfig._config_vars, 'CFLAGS', '--sysconfig-cflags'):
+        with contextlib.ExitStack() as cm:
+            for key, value in sysconfig_vars.items():
+                cm.enter_context(swap_item(sysconfig._config_vars, key, value))
             sysconfig.customize_compiler(comp)
-        self.assertEqual(comp.exes['archiver'], 'my_ar --myarflags')
-        self.assertEqual(comp.exes['compiler'], 'my_cc --sysconfig-cflags --mycflags')
+
+        return comp
+
+    @unittest.skipUnless(get_default_compiler() == 'unix',
+                         'not testing if default compiler is not unix')
+    def test_customize_compiler(self):
+        # Make sure that sysconfig._config_vars is initialized
+        sysconfig.get_config_vars()
+
+        os.environ['AR'] = 'env_ar'
+        os.environ['CC'] = 'env_cc'
+        os.environ['CPP'] = 'env_cpp'
+        os.environ['CXX'] = 'env_cxx --env-cxx-flags'
+        os.environ['LDSHARED'] = 'env_ldshared'
+        os.environ['LDFLAGS'] = '--env-ldflags'
+        os.environ['ARFLAGS'] = '--env-arflags'
+        os.environ['CFLAGS'] = '--env-cflags'
+        os.environ['CPPFLAGS'] = '--env-cppflags'
+
+        comp = self.customize_compiler()
+        self.assertEqual(comp.exes['archiver'],
+                         'env_ar --env-arflags')
+        self.assertEqual(comp.exes['preprocessor'],
+                         'env_cpp --env-cppflags')
+        self.assertEqual(comp.exes['compiler'],
+                         'env_cc --sc-cflags --env-cflags --env-cppflags')
+        self.assertEqual(comp.exes['compiler_so'],
+                         ('env_cc --sc-cflags '
+                          '--env-cflags ''--env-cppflags --sc-ccshared'))
+        self.assertEqual(comp.exes['compiler_cxx'],
+                         'env_cxx --env-cxx-flags')
+        self.assertEqual(comp.exes['linker_exe'],
+                         'env_cc')
+        self.assertEqual(comp.exes['linker_so'],
+                         ('env_ldshared --env-ldflags --env-cflags'
+                          ' --env-cppflags'))
+        self.assertEqual(comp.shared_lib_extension, 'sc_shutil_suffix')
+
+        del os.environ['AR']
+        del os.environ['CC']
+        del os.environ['CPP']
+        del os.environ['CXX']
+        del os.environ['LDSHARED']
+        del os.environ['LDFLAGS']
+        del os.environ['ARFLAGS']
+        del os.environ['CFLAGS']
+        del os.environ['CPPFLAGS']
+
+        comp = self.customize_compiler()
+        self.assertEqual(comp.exes['archiver'],
+                         'sc_ar --sc-arflags')
+        self.assertEqual(comp.exes['preprocessor'],
+                         'sc_cc -E')
+        self.assertEqual(comp.exes['compiler'],
+                         'sc_cc --sc-cflags')
+        self.assertEqual(comp.exes['compiler_so'],
+                         'sc_cc --sc-cflags --sc-ccshared')
+        self.assertEqual(comp.exes['compiler_cxx'],
+                         'sc_cxx')
+        self.assertEqual(comp.exes['linker_exe'],
+                         'sc_cc')
+        self.assertEqual(comp.exes['linker_so'],
+                         'sc_ldshared')
+        self.assertEqual(comp.shared_lib_extension, 'sc_shutil_suffix')
 
     def test_parse_makefile_base(self):
         self.makefile = TESTFN

From d8b901bc15e2e365c7994cd65758f4181f3d9175 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Mar 2019 08:52:44 -0400
Subject: [PATCH 7408/8469] Add section on reporting security vulnerabilities
 through Tidelift.

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index bfbaaad82c..dac8a46873 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,10 @@ Bug reports and especially tested patches may be
 submitted directly to the `bug tracker
 <https://github.com/pypa/setuptools/issues>`_.
 
+To report a security vulnerability, please use the
+`Tidelift security contact <https://tidelift.com/security>`_.
+Tidelift will coordinate the fix and disclosure.
+
 
 Code of Conduct
 ---------------

From 9edd5b701549833ebbfb354c072962c58e5394ac Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 22 Mar 2019 19:54:23 -0400
Subject: [PATCH 7409/8469] Use nicer, simpler phrasing

---
 README.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 5d77d8d3a8..357626220b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,11 +1,9 @@
 .. image:: https://tidelift.com/badges/github/GROUP/PROJECT
    :target: https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=readme
 
-
 Security Contact
 ================
 
-If you wish to report a security vulnerability, the public disclosure
-of which may exacerbate the risk, please
-`Contact Tidelift security <https://tidelift.com/security>`_,
-which will coordinate the fix and disclosure privately.
+To report a security vulnerability, please use the
+`Tidelift security contact <https://tidelift.com/security>`_.
+Tidelift will coordinate the fix and disclosure.

From 868d8498bbccf63c274056959055800d02cac0d5 Mon Sep 17 00:00:00 2001
From: Philipp A <flying-sheep@web.de>
Date: Wed, 27 Mar 2019 22:34:19 +0100
Subject: [PATCH 7410/8469] bpo-31292: Fixed distutils check --restructuredtext
 for include directives (GH-10605)

---
 command/check.py      |  3 ++-
 tests/includetest.rst |  1 +
 tests/test_check.py   | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 tests/includetest.rst

diff --git a/command/check.py b/command/check.py
index 7ebe707cff..04c2f9642d 100644
--- a/command/check.py
+++ b/command/check.py
@@ -120,7 +120,8 @@ def check_restructuredtext(self):
 
     def _check_rst_data(self, data):
         """Returns warnings when the provided data doesn't compile."""
-        source_path = StringIO()
+        # the include and csv_table directives need this to be a path
+        source_path = self.distribution.script_name or 'setup.py'
         parser = Parser()
         settings = frontend.OptionParser(components=(Parser,)).get_default_values()
         settings.tab_width = 4
diff --git a/tests/includetest.rst b/tests/includetest.rst
new file mode 100644
index 0000000000..d7b4ae38b0
--- /dev/null
+++ b/tests/includetest.rst
@@ -0,0 +1 @@
+This should be included.
diff --git a/tests/test_check.py b/tests/test_check.py
index 3d22868e31..e534aca1d4 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.check."""
+import os
 import textwrap
 import unittest
 from test.support import run_unittest
@@ -13,13 +14,19 @@
     pygments = None
 
 
+HERE = os.path.dirname(__file__)
+
+
 class CheckTestCase(support.LoggingSilencer,
                     support.TempdirManager,
                     unittest.TestCase):
 
-    def _run(self, metadata=None, **options):
+    def _run(self, metadata=None, cwd=None, **options):
         if metadata is None:
             metadata = {}
+        if cwd is not None:
+            old_dir = os.getcwd()
+            os.chdir(cwd)
         pkg_info, dist = self.create_dist(**metadata)
         cmd = check(dist)
         cmd.initialize_options()
@@ -27,6 +34,8 @@ def _run(self, metadata=None, **options):
             setattr(cmd, name, value)
         cmd.ensure_finalized()
         cmd.run()
+        if cwd is not None:
+            os.chdir(old_dir)
         return cmd
 
     def test_check_metadata(self):
@@ -99,6 +108,11 @@ def test_check_restructuredtext(self):
         cmd = self._run(metadata, strict=1, restructuredtext=1)
         self.assertEqual(cmd._warnings, 0)
 
+        # check that includes work to test #31292
+        metadata['long_description'] = 'title\n=====\n\n.. include:: includetest.rst'
+        cmd = self._run(metadata, cwd=HERE, strict=1, restructuredtext=1)
+        self.assertEqual(cmd._warnings, 0)
+
     @unittest.skipUnless(HAS_DOCUTILS, "won't test without docutils")
     def test_check_restructuredtext_with_syntax_highlight(self):
         # Don't fail if there is a `code` or `code-block` directive

From e01330a5f42e850e0ce6ec3710b8a08669ea4219 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Tue, 2 Apr 2019 16:52:38 -0400
Subject: [PATCH 7411/8469] Pin pypy2.7 version in Travis

There is some issue with pypy2.7-5.8.0 in Travis. This probably does not
solve the *root* issue, but updating the pypy version does seem to fix
the build, so in the interest of unblocking the project, we will merge
this change.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 09c3817ee0..a5b670e4b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,8 @@ jobs:
     python: 2.7
   - <<: *latest_py2
     env: LANG=C
-  - python: pypy
+  - python: pypy2.7-6.0.0
+    dist: xenial
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
     env: DISABLE_COVERAGE=1

From 52939bcc8f549f6c8fef4bf76e09a20d0bf62e44 Mon Sep 17 00:00:00 2001
From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Thu, 21 Feb 2019 15:58:59 -0800
Subject: [PATCH 7412/8469] Add Distribution._get_version() for DRY

---
 pkg_resources/__init__.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 5d66f6e034..e8921f95bb 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2661,7 +2661,7 @@ def version(self):
         try:
             return self._version
         except AttributeError:
-            version = _version_from_file(self._get_metadata(self.PKG_INFO))
+            version = self._get_version()
             if version is None:
                 tmpl = "Missing 'Version:' header and/or %s file"
                 raise ValueError(tmpl % self.PKG_INFO, self)
@@ -2727,6 +2727,12 @@ def _get_metadata(self, name):
             for line in self.get_metadata_lines(name):
                 yield line
 
+    def _get_version(self):
+        lines = self._get_metadata(self.PKG_INFO)
+        version = _version_from_file(lines)
+
+        return version
+
     def activate(self, path=None, replace=False):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None:
@@ -2945,7 +2951,7 @@ def _reload_version(self):
         take an extra step and try to get the version number from
         the metadata file itself instead of the filename.
         """
-        md_version = _version_from_file(self._get_metadata(self.PKG_INFO))
+        md_version = self._get_version()
         if md_version:
             self._version = md_version
         return self

From 80ec85c55b1470df6541473f674f41bdc6bc5268 Mon Sep 17 00:00:00 2001
From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Fri, 22 Feb 2019 04:15:07 -0800
Subject: [PATCH 7413/8469] Include file path when Version: missing

Related to pip's github issue pypa/pip#6194.

This has come up in pip's issue tracker (github) multiple times:

  - pypa/pip#6177
  - pypa/pip#6283
  - pypa/pip#6194
---
 changelog.d/1664.change.rst               |  2 +
 pkg_resources/__init__.py                 | 37 +++++++++-
 pkg_resources/tests/test_pkg_resources.py | 84 +++++++++++++++++++++++
 3 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/1664.change.rst

diff --git a/changelog.d/1664.change.rst b/changelog.d/1664.change.rst
new file mode 100644
index 0000000000..85e40a39db
--- /dev/null
+++ b/changelog.d/1664.change.rst
@@ -0,0 +1,2 @@
+Added the path to the ``PKG-INFO`` or ``METADATA`` file in the exception
+text when the ``Version:`` header can't be found.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index e8921f95bb..97e08d6827 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1403,8 +1403,15 @@ def get_resource_string(self, manager, resource_name):
     def has_resource(self, resource_name):
         return self._has(self._fn(self.module_path, resource_name))
 
+    def _get_metadata_path(self, name):
+        return self._fn(self.egg_info, name)
+
     def has_metadata(self, name):
-        return self.egg_info and self._has(self._fn(self.egg_info, name))
+        if not self.egg_info:
+            return self.egg_info
+
+        path = self._get_metadata_path(name)
+        return self._has(path)
 
     def get_metadata(self, name):
         if not self.egg_info:
@@ -1868,6 +1875,9 @@ class FileMetadata(EmptyProvider):
     def __init__(self, path):
         self.path = path
 
+    def _get_metadata_path(self, name):
+        return self.path
+
     def has_metadata(self, name):
         return name == 'PKG-INFO' and os.path.isfile(self.path)
 
@@ -2663,8 +2673,12 @@ def version(self):
         except AttributeError:
             version = self._get_version()
             if version is None:
-                tmpl = "Missing 'Version:' header and/or %s file"
-                raise ValueError(tmpl % self.PKG_INFO, self)
+                path = self._get_metadata_path_for_display(self.PKG_INFO)
+                msg = (
+                    "Missing 'Version:' header and/or {} file at path: {}"
+                ).format(self.PKG_INFO, path)
+                raise ValueError(msg, self)
+
             return version
 
     @property
@@ -2722,6 +2736,23 @@ def requires(self, extras=()):
                 )
         return deps
 
+    def _get_metadata_path_for_display(self, name):
+        """
+        Return the path to the given metadata file, if available.
+        """
+        try:
+            # We need to access _get_metadata_path() on the provider object
+            # directly rather than through this class's __getattr__()
+            # since _get_metadata_path() is marked private.
+            path = self._provider._get_metadata_path(name)
+
+        # Handle exceptions e.g. in case the distribution's metadata
+        # provider doesn't support _get_metadata_path().
+        except Exception:
+            return '[could not detect]'
+
+        return path
+
     def _get_metadata(self, name):
         if self.has_metadata(name):
             for line in self.get_metadata_lines(name):
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 2c2c9c7f97..fb77c68587 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -17,6 +17,7 @@
 except ImportError:
     import mock
 
+from pkg_resources import DistInfoDistribution, Distribution, EggInfoDistribution
 from pkg_resources.extern.six.moves import map
 from pkg_resources.extern.six import text_type, string_types
 
@@ -190,6 +191,89 @@ def test_setuptools_not_imported(self):
         subprocess.check_call(cmd)
 
 
+# TODO: remove this in favor of Path.touch() when Python 2 is dropped.
+def touch_file(path):
+    """
+    Create an empty file.
+    """
+    with open(path, 'w'):
+        pass
+
+
+def make_distribution_no_version(tmpdir, basename):
+    """
+    Create a distribution directory with no file containing the version.
+    """
+    # Convert the LocalPath object to a string before joining.
+    dist_dir = os.path.join(str(tmpdir), basename)
+    os.mkdir(dist_dir)
+    # Make the directory non-empty so distributions_from_metadata()
+    # will detect it and yield it.
+    touch_file(os.path.join(dist_dir, 'temp.txt'))
+
+    dists = list(pkg_resources.distributions_from_metadata(dist_dir))
+    assert len(dists) == 1
+    dist, = dists
+
+    return dist, dist_dir
+
+
+@pytest.mark.parametrize(
+    'suffix, expected_filename, expected_dist_type',
+    [
+        ('egg-info', 'PKG-INFO', EggInfoDistribution),
+        ('dist-info', 'METADATA', DistInfoDistribution),
+    ],
+)
+def test_distribution_version_missing(tmpdir, suffix, expected_filename,
+    expected_dist_type):
+    """
+    Test Distribution.version when the "Version" header is missing.
+    """
+    basename = 'foo.{}'.format(suffix)
+    dist, dist_dir = make_distribution_no_version(tmpdir, basename)
+
+    expected_text = (
+        "Missing 'Version:' header and/or {} file at path: "
+    ).format(expected_filename)
+    metadata_path = os.path.join(dist_dir, expected_filename)
+
+    # Now check the exception raised when the "version" attribute is accessed.
+    with pytest.raises(ValueError) as excinfo:
+        dist.version
+
+    err = str(excinfo)
+    # Include a string expression after the assert so the full strings
+    # will be visible for inspection on failure.
+    assert expected_text in err, str((expected_text, err))
+
+    # Also check the args passed to the ValueError.
+    msg, dist = excinfo.value.args
+    assert expected_text in msg
+    # Check that the message portion contains the path.
+    assert metadata_path in msg, str((metadata_path, msg))
+    assert type(dist) == expected_dist_type
+
+
+def test_distribution_version_missing_undetected_path():
+    """
+    Test Distribution.version when the "Version" header is missing and
+    the path can't be detected.
+    """
+    # Create a Distribution object with no metadata argument, which results
+    # in an empty metadata provider.
+    dist = Distribution('/foo')
+    with pytest.raises(ValueError) as excinfo:
+        dist.version
+
+    msg, dist = excinfo.value.args
+    expected = (
+        "Missing 'Version:' header and/or PKG-INFO file at path: "
+        '[could not detect]'
+    )
+    assert msg == expected
+
+
 class TestDeepVersionLookupDistutils:
     @pytest.fixture
     def env(self, tmpdir):

From d24a1adb6a3b8a702eb5033bb1728cde428e5a6f Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 3 Apr 2019 14:25:01 -0400
Subject: [PATCH 7414/8469] Update changelog for version 40.9.0

---
 CHANGES.rst                 | 10 ++++++++++
 changelog.d/1664.change.rst |  2 --
 changelog.d/1675.change.rst |  1 -
 changelog.d/1705.doc.rst    |  1 -
 changelog.d/1720.change.rst |  1 -
 5 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1664.change.rst
 delete mode 100644 changelog.d/1675.change.rst
 delete mode 100644 changelog.d/1705.doc.rst
 delete mode 100644 changelog.d/1720.change.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index b043e449ab..2a8d432a8c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v40.9.0
+-------
+
+* #1675: Added support for ``setup.cfg``-only projects when using the ``setuptools.build_meta`` backend. Projects that have enabled PEP 517 no longer need to have a ``setup.py`` and can use the purely declarative ``setup.cfg`` configuration file instead.
+* #1720: Added support for ``pkg_resources.parse_requirements``-style requirements in ``setup_requires`` when ``setup.py`` is invoked from the ``setuptools.build_meta`` build backend.
+* #1664: Added the path to the ``PKG-INFO`` or ``METADATA`` file in the exception
+  text when the ``Version:`` header can't be found.
+* #1705: Removed some placeholder documentation sections referring to deprecated features.
+
+
 v40.8.0
 -------
 
diff --git a/changelog.d/1664.change.rst b/changelog.d/1664.change.rst
deleted file mode 100644
index 85e40a39db..0000000000
--- a/changelog.d/1664.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added the path to the ``PKG-INFO`` or ``METADATA`` file in the exception
-text when the ``Version:`` header can't be found.
diff --git a/changelog.d/1675.change.rst b/changelog.d/1675.change.rst
deleted file mode 100644
index e90676283f..0000000000
--- a/changelog.d/1675.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added support for ``setup.cfg``-only projects when using the ``setuptools.build_meta`` backend. Projects that have enabled PEP 517 no longer need to have a ``setup.py`` and can use the purely declarative ``setup.cfg`` configuration file instead.
diff --git a/changelog.d/1705.doc.rst b/changelog.d/1705.doc.rst
deleted file mode 100644
index a2ce9c2b96..0000000000
--- a/changelog.d/1705.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed some placeholder documentation sections referring to deprecated features.
diff --git a/changelog.d/1720.change.rst b/changelog.d/1720.change.rst
deleted file mode 100644
index a0d8fb35aa..0000000000
--- a/changelog.d/1720.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added support for ``pkg_resources.parse_requirements``-style requirements in ``setup_requires`` when ``setup.py`` is invoked from the ``setuptools.build_meta`` build backend.

From dd522e601426ad35644022278ca2a09a7cc542ad Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Wed, 3 Apr 2019 14:43:31 -0400
Subject: [PATCH 7415/8469] =?UTF-8?q?Bump=20version:=2040.8.0=20=E2=86=92?=
 =?UTF-8?q?=2040.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 3 ++-
 setup.cfg        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index f4e8b40b94..9840c0864e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,6 +1,7 @@
 [bumpversion]
-current_version = 40.8.0
+current_version = 40.9.0
 commit = True
 tag = True
 
 [bumpversion:file:setup.cfg]
+
diff --git a/setup.cfg b/setup.cfg
index 7a0fac154d..01fe6ae934 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,4 +19,4 @@ universal = 1
 
 [metadata]
 license_file = LICENSE
-version = 40.8.0
+version = 40.9.0

From 393809a02ed4d0f07faec5c1f23384233e6cd68e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 09:27:23 -0400
Subject: [PATCH 7416/8469] Feed the hobgoblins (delint).

---
 setuptools/dist.py              |  5 ++---
 setuptools/tests/test_config.py | 11 +++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index e6d08b9203..ae38029050 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -11,7 +11,6 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
-from distutils.errors import DistutilsOptionError
 from distutils.util import strtobool
 from distutils.debug import DEBUG
 from distutils.fancy_getopt import translate_longopt
@@ -135,7 +134,6 @@ def write_field(key, value):
         def write_field(key, value):
             file.write("%s: %s\n" % (key, value))
 
-
     write_field('Metadata-Version', str(version))
     write_field('Name', self.get_name())
     write_field('Version', self.get_version())
@@ -1281,4 +1279,5 @@ def validate(self, dist):
 
 
 class DistDeprecationWarning(SetuptoolsDeprecationWarning):
-    """Class for warning about deprecations in dist in setuptools. Not ignored by default, unlike DeprecationWarning."""
+    """Class for warning about deprecations in dist in
+    setuptools. Not ignored by default, unlike DeprecationWarning."""
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 6b17770969..4daf1df17b 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -8,7 +8,7 @@
 from mock import patch
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
-from setuptools.extern.six.moves.configparser import InterpolationMissingOptionError
+from setuptools.extern.six.moves import configparser
 from setuptools.tests import is_ascii
 from . import py2_only, py3_only
 from .textwrap import DALS
@@ -29,7 +29,9 @@ def make_package_dir(name, base_dir, ns=False):
     return dir_package, init_file
 
 
-def fake_env(tmpdir, setup_cfg, setup_py=None, encoding='ascii', package_path='fake_package'):
+def fake_env(
+        tmpdir, setup_cfg, setup_py=None,
+        encoding='ascii', package_path='fake_package'):
 
     if setup_py is None:
         setup_py = (
@@ -440,11 +442,12 @@ def test_interpolation(self, tmpdir):
             '[metadata]\n'
             'description = %(message)s\n'
         )
-        with pytest.raises(InterpolationMissingOptionError):
+        with pytest.raises(configparser.InterpolationMissingOptionError):
             with get_dist(tmpdir):
                 pass
 
-    skip_if_not_ascii = pytest.mark.skipif(not is_ascii, reason='Test not supported with this locale')
+    skip_if_not_ascii = pytest.mark.skipif(
+        not is_ascii, reason='Test not supported with this locale')
 
     @skip_if_not_ascii
     def test_non_ascii_1(self, tmpdir):

From 85fa4a6bc506be12fdbd0f4cff139e7c4e3bc6a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 10:04:50 -0400
Subject: [PATCH 7417/8469] When reading config files, require them to be
 encoded with UTF-8. Fixes #1702.

---
 setuptools/dist.py              |  9 ++-------
 setuptools/tests/test_config.py | 31 +++++++++----------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ae38029050..9a165de0dd 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -35,7 +35,6 @@
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
-from .unicode_utils import detect_encoding
 import pkg_resources
 
 __import__('setuptools.extern.packaging.specifiers')
@@ -587,13 +586,9 @@ def _parse_config_files(self, filenames=None):
 
         parser = ConfigParser()
         for filename in filenames:
-            with io.open(filename, 'rb') as fp:
-                encoding = detect_encoding(fp)
+            with io.open(filename, encoding='utf-8') as reader:
                 if DEBUG:
-                    self.announce("  reading %s [%s]" % (
-                        filename, encoding or 'locale')
-                    )
-                reader = io.TextIOWrapper(fp, encoding=encoding)
+                    self.announce("  reading {filename}".format(**locals()))
                 (parser.read_file if six.PY3 else parser.readfp)(reader)
             for section in parser.sections():
                 options = parser.options(section)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 4daf1df17b..bc97664d4d 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -9,7 +9,6 @@
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
 from setuptools.extern.six.moves import configparser
-from setuptools.tests import is_ascii
 from . import py2_only, py3_only
 from .textwrap import DALS
 
@@ -446,10 +445,6 @@ def test_interpolation(self, tmpdir):
             with get_dist(tmpdir):
                 pass
 
-    skip_if_not_ascii = pytest.mark.skipif(
-        not is_ascii, reason='Test not supported with this locale')
-
-    @skip_if_not_ascii
     def test_non_ascii_1(self, tmpdir):
         fake_env(
             tmpdir,
@@ -457,18 +452,8 @@ def test_non_ascii_1(self, tmpdir):
             'description = éàïôñ\n',
             encoding='utf-8'
         )
-        with pytest.raises(UnicodeDecodeError):
-            with get_dist(tmpdir):
-                pass
-
-    def test_non_ascii_2(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '# -*- coding: invalid\n'
-        )
-        with pytest.raises(LookupError):
-            with get_dist(tmpdir):
-                pass
+        with get_dist(tmpdir):
+            pass
 
     def test_non_ascii_3(self, tmpdir):
         fake_env(
@@ -479,7 +464,6 @@ def test_non_ascii_3(self, tmpdir):
         with get_dist(tmpdir):
             pass
 
-    @skip_if_not_ascii
     def test_non_ascii_4(self, tmpdir):
         fake_env(
             tmpdir,
@@ -491,8 +475,10 @@ def test_non_ascii_4(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.description == 'éàïôñ'
 
-    @skip_if_not_ascii
-    def test_non_ascii_5(self, tmpdir):
+    def test_not_utf8(self, tmpdir):
+        """
+        Config files encoded not in UTF-8 will fail
+        """
         fake_env(
             tmpdir,
             '# vim: set fileencoding=iso-8859-15 :\n'
@@ -500,8 +486,9 @@ def test_non_ascii_5(self, tmpdir):
             'description = éàïôñ\n',
             encoding='iso-8859-15'
         )
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.description == 'éàïôñ'
+        with pytest.raises(UnicodeDecodeError):
+            with get_dist(tmpdir):
+                pass
 
 
 class TestOptions:

From e89509f7de02d116b97715d4d8637ea24faa9419 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 10:23:51 -0400
Subject: [PATCH 7418/8469] Add changelog entry. Ref #1702.

---
 changelog.d/1735.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1735.breaking.rst

diff --git a/changelog.d/1735.breaking.rst b/changelog.d/1735.breaking.rst
new file mode 100644
index 0000000000..448730c42c
--- /dev/null
+++ b/changelog.d/1735.breaking.rst
@@ -0,0 +1 @@
+When parsing setup.cfg files, setuptools now requires the files to be encoded as UTF-8. Any other encoding will lead to a UnicodeDecodeError. This change removes support for specifying an encoding using a 'coding: ' directive in the header of the file, a feature that was introduces in 40.7. Given the recent release of the aforementioned feature, it is assumed that few if any projects are utilizing the feature to specify an encoding other than UTF-8.

From 7b09ba64c0327ecea04cc95057ffa7d5c8d939c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 10:46:00 -0400
Subject: [PATCH 7419/8469] Add test for setopt to demonstrate that edit_config
 retains non-ASCII characters.

---
 setuptools/tests/test_setopt.py | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 setuptools/tests/test_setopt.py

diff --git a/setuptools/tests/test_setopt.py b/setuptools/tests/test_setopt.py
new file mode 100644
index 0000000000..2241ef73a4
--- /dev/null
+++ b/setuptools/tests/test_setopt.py
@@ -0,0 +1,36 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
+import io
+
+import six
+
+from setuptools.command import setopt
+from setuptools.extern.six.moves import configparser
+
+
+class TestEdit:
+    @staticmethod
+    def parse_config(filename):
+        parser = configparser.ConfigParser()
+        with io.open(filename, encoding='utf-8') as reader:
+            (parser.read_file if six.PY3 else parser.readfp)(reader)
+        return parser
+
+    @staticmethod
+    def write_text(file, content):
+        with io.open(file, 'wb') as strm:
+            strm.write(content.encode('utf-8'))
+
+    def test_utf8_encoding_retained(self, tmpdir):
+        """
+        When editing a file, non-ASCII characters encoded in
+        UTF-8 should be retained.
+        """
+        config = tmpdir.join('setup.cfg')
+        self.write_text(config, '[names]\njaraco=йарацо')
+        setopt.edit_config(str(config), dict(names=dict(other='yes')))
+        parser = self.parse_config(str(config))
+        assert parser['names']['jaraco'] == 'йарацо'
+        assert parser['names']['other'] == 'yes'

From b336e83a63722b3a3e4d3f1779686149d5cef8d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 10:49:23 -0400
Subject: [PATCH 7420/8469] Add compatibility for Python 2

---
 setuptools/tests/test_setopt.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_setopt.py b/setuptools/tests/test_setopt.py
index 2241ef73a4..7c803500b9 100644
--- a/setuptools/tests/test_setopt.py
+++ b/setuptools/tests/test_setopt.py
@@ -29,8 +29,8 @@ def test_utf8_encoding_retained(self, tmpdir):
         UTF-8 should be retained.
         """
         config = tmpdir.join('setup.cfg')
-        self.write_text(config, '[names]\njaraco=йарацо')
+        self.write_text(str(config), '[names]\njaraco=йарацо')
         setopt.edit_config(str(config), dict(names=dict(other='yes')))
         parser = self.parse_config(str(config))
-        assert parser['names']['jaraco'] == 'йарацо'
-        assert parser['names']['other'] == 'yes'
+        assert parser.get('names', 'jaraco') == 'йарацо'
+        assert parser.get('names', 'other') == 'yes'

From 7ed188bcaf38a25fb63fbb1ed3b070428ff95759 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 11:07:02 -0400
Subject: [PATCH 7421/8469] Correct cyrillic to match preferred pronunciation.

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

diff --git a/setuptools/tests/test_setopt.py b/setuptools/tests/test_setopt.py
index 7c803500b9..3fb04fb455 100644
--- a/setuptools/tests/test_setopt.py
+++ b/setuptools/tests/test_setopt.py
@@ -29,8 +29,8 @@ def test_utf8_encoding_retained(self, tmpdir):
         UTF-8 should be retained.
         """
         config = tmpdir.join('setup.cfg')
-        self.write_text(str(config), '[names]\njaraco=йарацо')
+        self.write_text(str(config), '[names]\njaraco=джарако')
         setopt.edit_config(str(config), dict(names=dict(other='yes')))
         parser = self.parse_config(str(config))
-        assert parser.get('names', 'jaraco') == 'йарацо'
+        assert parser.get('names', 'jaraco') == 'джарако'
         assert parser.get('names', 'other') == 'yes'

From f36781084f8f870ea747d477bd742057ea022421 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 12:25:03 -0400
Subject: [PATCH 7422/8469] Remove detect_encoding, no longer used.

---
 setuptools/unicode_utils.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 3b8179a870..7c63efd20b 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,6 +1,5 @@
 import unicodedata
 import sys
-import re
 
 from setuptools.extern import six
 
@@ -43,15 +42,3 @@ def try_encode(string, enc):
         return string.encode(enc)
     except UnicodeEncodeError:
         return None
-
-
-CODING_RE = re.compile(br'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)')
-
-
-def detect_encoding(fp):
-    first_line = fp.readline()
-    fp.seek(0)
-    m = CODING_RE.match(first_line)
-    if m is None:
-        return None
-    return m.group(1).decode('ascii')

From 7a80e29b31f255a3fff5147e50d0135271b7c101 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 13:23:32 -0400
Subject: [PATCH 7423/8469] =?UTF-8?q?Bump=20version:=2040.9.0=20=E2=86=92?=
 =?UTF-8?q?=2041.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 6 ++++++
 changelog.d/1735.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1735.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9840c0864e..a8fd179a80 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.9.0
+current_version = 41.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 2a8d432a8c..8785d3d269 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v41.0.0
+-------
+
+* #1735: When parsing setup.cfg files, setuptools now requires the files to be encoded as UTF-8. Any other encoding will lead to a UnicodeDecodeError. This change removes support for specifying an encoding using a 'coding: ' directive in the header of the file, a feature that was introduces in 40.7. Given the recent release of the aforementioned feature, it is assumed that few if any projects are utilizing the feature to specify an encoding other than UTF-8.
+
+
 v40.9.0
 -------
 
diff --git a/changelog.d/1735.breaking.rst b/changelog.d/1735.breaking.rst
deleted file mode 100644
index 448730c42c..0000000000
--- a/changelog.d/1735.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-When parsing setup.cfg files, setuptools now requires the files to be encoded as UTF-8. Any other encoding will lead to a UnicodeDecodeError. This change removes support for specifying an encoding using a 'coding: ' directive in the header of the file, a feature that was introduces in 40.7. Given the recent release of the aforementioned feature, it is assumed that few if any projects are utilizing the feature to specify an encoding other than UTF-8.
diff --git a/setup.cfg b/setup.cfg
index 01fe6ae934..561e7b248e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,4 +19,4 @@ universal = 1
 
 [metadata]
 license_file = LICENSE
-version = 40.9.0
+version = 41.0.0

From 8db41e478db4ded53b9836f62211f8c9371ec7c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 15:12:21 -0400
Subject: [PATCH 7424/8469] Rely on unique_everseen to avoid unnecessarily
 polluting the PYTHONPATH with duplicate entries.

---
 setuptools/command/test.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 997fd8b056..973e4eb214 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -15,6 +15,7 @@
                            working_set, _namespace_packages, evaluate_marker,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
+from .build_py import _unique_everseen
 
 __metaclass__ = type
 
@@ -186,12 +187,11 @@ def paths_on_pythonpath(paths):
         orig_pythonpath = os.environ.get('PYTHONPATH', nothing)
         current_pythonpath = os.environ.get('PYTHONPATH', '')
         try:
-            to_join = []
-            for x in list(paths) + current_pythonpath.split(os.pathsep):
-                if x not in to_join:
-                    to_join.append(x)
-            if to_join:
-                os.environ['PYTHONPATH'] = os.pathsep.join(to_join)
+            prefix = os.pathsep.join(_unique_everseen(paths))
+            to_join = filter(None, [prefix, current_pythonpath])
+            new_path = os.pathsep.join(to_join)
+            if new_path:
+                os.environ['PYTHONPATH'] = new_path
             yield
         finally:
             if orig_pythonpath is nothing:

From 1b4ef9635452958482a121f41e65d0b6cca1a9d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 15:16:31 -0400
Subject: [PATCH 7425/8469] Add changelog entry.

---
 changelog.d/1709.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1709.bugfix.rst

diff --git a/changelog.d/1709.bugfix.rst b/changelog.d/1709.bugfix.rst
new file mode 100644
index 0000000000..c6670ae9c6
--- /dev/null
+++ b/changelog.d/1709.bugfix.rst
@@ -0,0 +1 @@
+In test.paths_on_python_path, avoid adding unnecessary duplicates to the PYTHONPATH.

From 7db010201783ae4b795908161e2027565e70a12f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Apr 2019 15:25:33 -0400
Subject: [PATCH 7426/8469] Rename changelog entry to use correct category.

---
 changelog.d/{1709.bugfix.rst => 1709.change.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{1709.bugfix.rst => 1709.change.rst} (100%)

diff --git a/changelog.d/1709.bugfix.rst b/changelog.d/1709.change.rst
similarity index 100%
rename from changelog.d/1709.bugfix.rst
rename to changelog.d/1709.change.rst

From 817e0bd71433db065c3c74b0b04de7c734ba9ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr>
Date: Mon, 8 Apr 2019 13:08:48 +0000
Subject: [PATCH 7427/8469] bpo-35416: fix potential resource warnings in
 distutils (GH-10918)

---
 command/bdist_rpm.py     |  3 +-
 command/bdist_wininst.py | 74 +++++++++++++++++++++-------------------
 command/upload.py        |  5 +--
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 02f10dd89d..20ca7ac6dc 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -537,7 +537,8 @@ def _make_spec_file(self):
                     '',
                     '%' + rpm_opt,])
                 if val:
-                    spec_file.extend(open(val, 'r').read().split('\n'))
+                    with open(val) as f:
+                        spec_file.extend(f.read().split('\n'))
                 else:
                     spec_file.append(default)
 
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index fde56754e8..1cf2e963e0 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -247,47 +247,49 @@ def create_exe(self, arcname, fullname, bitmap=None):
         self.announce("creating %s" % installer_name)
 
         if bitmap:
-            bitmapdata = open(bitmap, "rb").read()
+            with open(bitmap, "rb") as f:
+                bitmapdata = f.read()
             bitmaplen = len(bitmapdata)
         else:
             bitmaplen = 0
 
-        file = open(installer_name, "wb")
-        file.write(self.get_exe_bytes())
-        if bitmap:
-            file.write(bitmapdata)
-
-        # Convert cfgdata from unicode to ascii, mbcs encoded
-        if isinstance(cfgdata, str):
-            cfgdata = cfgdata.encode("mbcs")
-
-        # Append the pre-install script
-        cfgdata = cfgdata + b"\0"
-        if self.pre_install_script:
-            # We need to normalize newlines, so we open in text mode and
-            # convert back to bytes. "latin-1" simply avoids any possible
-            # failures.
-            with open(self.pre_install_script, "r",
-                encoding="latin-1") as script:
-                script_data = script.read().encode("latin-1")
-            cfgdata = cfgdata + script_data + b"\n\0"
-        else:
-            # empty pre-install script
+        with open(installer_name, "wb") as file:
+            file.write(self.get_exe_bytes())
+            if bitmap:
+                file.write(bitmapdata)
+
+            # Convert cfgdata from unicode to ascii, mbcs encoded
+            if isinstance(cfgdata, str):
+                cfgdata = cfgdata.encode("mbcs")
+
+            # Append the pre-install script
             cfgdata = cfgdata + b"\0"
-        file.write(cfgdata)
-
-        # The 'magic number' 0x1234567B is used to make sure that the
-        # binary layout of 'cfgdata' is what the wininst.exe binary
-        # expects.  If the layout changes, increment that number, make
-        # the corresponding changes to the wininst.exe sources, and
-        # recompile them.
-        header = struct.pack("<iii",
-                             0x1234567B,       # tag
-                             len(cfgdata),     # length
-                             bitmaplen,        # number of bytes in bitmap
-                             )
-        file.write(header)
-        file.write(open(arcname, "rb").read())
+            if self.pre_install_script:
+                # We need to normalize newlines, so we open in text mode and
+                # convert back to bytes. "latin-1" simply avoids any possible
+                # failures.
+                with open(self.pre_install_script, "r",
+                    encoding="latin-1") as script:
+                    script_data = script.read().encode("latin-1")
+                cfgdata = cfgdata + script_data + b"\n\0"
+            else:
+                # empty pre-install script
+                cfgdata = cfgdata + b"\0"
+            file.write(cfgdata)
+
+            # The 'magic number' 0x1234567B is used to make sure that the
+            # binary layout of 'cfgdata' is what the wininst.exe binary
+            # expects.  If the layout changes, increment that number, make
+            # the corresponding changes to the wininst.exe sources, and
+            # recompile them.
+            header = struct.pack("<iii",
+                                0x1234567B,       # tag
+                                len(cfgdata),     # length
+                                bitmaplen,        # number of bytes in bitmap
+                                )
+            file.write(header)
+            with open(arcname, "rb") as f:
+                file.write(f.read())
 
     def get_installer_filename(self, fullname):
         # Factored out to allow overriding in subclasses
diff --git a/command/upload.py b/command/upload.py
index 613ea71129..11afa24b77 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -125,8 +125,9 @@ def upload_file(self, command, pyversion, filename):
         data['comment'] = ''
 
         if self.sign:
-            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc", "rb").read())
+            with open(filename + ".asc", "rb") as f:
+                data['gpg_signature'] = (os.path.basename(filename) + ".asc",
+                                         f.read())
 
         # set up the authentication
         user_pass = (self.username + ":" + self.password).encode('ascii')

From 88d1940211c0852e49b5ea45e7b3b00afd29caa0 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Tue, 9 Apr 2019 14:54:30 +0900
Subject: [PATCH 7428/8469] fix code styling (GH-12737)

---
 command/bdist_wininst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 1cf2e963e0..3a616883be 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -269,7 +269,7 @@ def create_exe(self, arcname, fullname, bitmap=None):
                 # convert back to bytes. "latin-1" simply avoids any possible
                 # failures.
                 with open(self.pre_install_script, "r",
-                    encoding="latin-1") as script:
+                          encoding="latin-1") as script:
                     script_data = script.read().encode("latin-1")
                 cfgdata = cfgdata + script_data + b"\n\0"
             else:

From ef2792fe08aabeb870e8f489d2bbfe2898ce1766 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Thu, 11 Apr 2019 01:38:48 +0200
Subject: [PATCH 7429/8469] bpo-36235: Fix distutils test_customize_compiler()
 on macOS (GH-12764)

Set CUSTOMIZED_OSX_COMPILER to True to disable
_osx_support.customize_compiler().
---
 tests/test_sysconfig.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 245a6c86b1..236755d095 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -92,6 +92,9 @@ def set_executables(self, **kw):
             'CCSHARED': '--sc-ccshared',
             'LDSHARED': 'sc_ldshared',
             'SHLIB_SUFFIX': 'sc_shutil_suffix',
+
+            # On macOS, disable _osx_support.customize_compiler()
+            'CUSTOMIZED_OSX_COMPILER': 'True',
         }
 
         comp = compiler()

From 59aeb62614ab07acb4b9520d81179d6e647dfbb7 Mon Sep 17 00:00:00 2001
From: 2xB <31772910+2xB@users.noreply.github.com>
Date: Fri, 12 Apr 2019 00:32:12 +0200
Subject: [PATCH 7430/8469] FIX: git and hg revision checkout under Windows

Windows does not change the working directory for a process via `cd .. && <process>` (see e.g. this question: https://stackoverflow.com/q/55641332/8575607 ). This commit replaces the use of `cd .. &&` with arguments provided by `git` and `hg` respectively.
---
 setuptools/package_index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 705a47cf80..6b06f2ca28 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -897,7 +897,7 @@ def _download_git(self, url, filename):
 
         if rev is not None:
             self.info("Checking out %s", rev)
-            os.system("(cd %s && git checkout --quiet %s)" % (
+            os.system("git -C %s checkout --quiet %s" % (
                 filename,
                 rev,
             ))
@@ -913,7 +913,7 @@ def _download_hg(self, url, filename):
 
         if rev is not None:
             self.info("Updating to %s", rev)
-            os.system("(cd %s && hg up -C -r %s -q)" % (
+            os.system("hg --cwd %s up -C -r %s -q" % (
                 filename,
                 rev,
             ))

From 01376621f092f9d448e1bf0e1e669bda15b73809 Mon Sep 17 00:00:00 2001
From: 2xB <31772910+2xB@users.noreply.github.com>
Date: Fri, 12 Apr 2019 00:58:48 +0200
Subject: [PATCH 7431/8469] Added description in changelog.d

---
 changelog.d/1741.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1741.change.rst

diff --git a/changelog.d/1741.change.rst b/changelog.d/1741.change.rst
new file mode 100644
index 0000000000..b465958a81
--- /dev/null
+++ b/changelog.d/1741.change.rst
@@ -0,0 +1 @@
+Fixed revision checkout routine of git and hg repositories under Windows

From 0259db3b7aaaff9d0dfdde48e9dbc0361d3ab47f Mon Sep 17 00:00:00 2001
From: 2xB <31772910+2xB@users.noreply.github.com>
Date: Fri, 12 Apr 2019 01:10:33 +0200
Subject: [PATCH 7432/8469] Updated test to check for changed git rev checkout

Checking for new implementation solving issue #1740
---
 setuptools/tests/test_packageindex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index ab371884d9..60d968fdfa 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -249,7 +249,7 @@ def test_download_git_with_rev(self, tmpdir):
         first_call_args = os_system_mock.call_args_list[0][0]
         assert first_call_args == (expected,)
 
-        tmpl = '(cd {expected_dir} && git checkout --quiet master)'
+        tmpl = 'git -C {expected_dir} checkout --quiet master'
         expected = tmpl.format(**locals())
         assert os_system_mock.call_args_list[1][0] == (expected,)
         assert result == expected_dir

From eaa19fd89c2e61f52c677c958041013422df133f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 12 Apr 2019 13:50:25 -0400
Subject: [PATCH 7433/8469] More directly describe the change.

---
 changelog.d/1741.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1741.change.rst b/changelog.d/1741.change.rst
index b465958a81..03b2478007 100644
--- a/changelog.d/1741.change.rst
+++ b/changelog.d/1741.change.rst
@@ -1 +1 @@
-Fixed revision checkout routine of git and hg repositories under Windows
+In package_index, now honor "current directory" during a checkout of git and hg repositories under Windows

From 80f67626467684fffb9702eb523fc7c3efa8c510 Mon Sep 17 00:00:00 2001
From: gpotter2 <gabriel@potter.fr>
Date: Sun, 14 Apr 2019 16:00:24 +0200
Subject: [PATCH 7434/8469] Update super old CHANGES.rst dead links

---
 CHANGES.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 8785d3d269..08c5ee0bdb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1496,8 +1496,8 @@ v20.6.0
 19.7
 ----
 
-* `Off-project PR <https://github.com/jaraco/setuptools/pull/32>`_:
-  For FreeBSD, also honor root certificates from ca_root_nss.
+* Off-project PR: `0dcee79 <https://github.com/pypa/setuptools/commit/0dcee791dfdcfacddaaec79b29f30a347a147413>`_ and `f9bd9b9 <https://github.com/pypa/setuptools/commit/f9bd9b9f5df54ef5a0bf8d16c3a889ab8c640580>`_
+  For FreeBSD, also `honor root certificates from ca_root_nss <https://github.com/pypa/setuptools/commit/3ae46c30225eb46e1f5aada1a19e88b79f04dc72>`_.
 
 19.6.2
 ------
@@ -1661,9 +1661,9 @@ v20.6.0
   now logged when pkg_resources is imported on Python 3.2 or earlier
   Python 3 versions.
 * `Add support for python_platform_implementation environment marker
-  <https://github.com/jaraco/setuptools/pull/28>`_.
+  <https://github.com/pypa/setuptools/commit/94416707fd59a65f4a8f7f70541d6b3fc018b626>`_.
 * `Fix dictionary mutation during iteration
-  <https://github.com/jaraco/setuptools/pull/29>`_.
+  <https://github.com/pypa/setuptools/commit/57ebfa41e0f96b97e599ecd931b7ae8a143e096e>`_.
 
 18.4
 ----
@@ -2023,7 +2023,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
 ---
 
 * Prefer vendored packaging library `as recommended
-  <https://github.com/jaraco/setuptools/commit/170657b68f4b92e7e1bf82f5e19a831f5744af67#commitcomment-9109448>`_.
+  <https://github.com/pypa/setuptools/commit/170657b68f4b92e7e1bf82f5e19a831f5744af67>`_.
 
 9.0.1
 -----

From 1d1c462903645fa567508a1272ed28c5f334c24c Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 17 Apr 2019 16:26:36 +0200
Subject: [PATCH 7435/8469] bpo-35755: shutil.which() uses
 os.confstr("CS_PATH") (GH-12858)

shutil.which() and distutils.spawn.find_executable() now use
os.confstr("CS_PATH") if available instead of os.defpath, if the PATH
environment variable is not set.

Don't use os.confstr("CS_PATH") nor os.defpath if the PATH
environment variable is set to an empty string to mimick Unix 'which'
command behavior.

Changes:

* find_executable() now starts by checking for the executable in the
  current working directly case. Add an explicit
  "if not path: return None".
* Add tests for PATH='' (empty string), PATH=':' and for PATHEXT.
---
 spawn.py            | 39 +++++++++++++++++++++++--------------
 tests/test_spawn.py | 47 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/spawn.py b/spawn.py
index 5387688093..888327270e 100644
--- a/spawn.py
+++ b/spawn.py
@@ -172,21 +172,32 @@ def find_executable(executable, path=None):
     A string listing directories separated by 'os.pathsep'; defaults to
     os.environ['PATH'].  Returns the complete filename or None if not found.
     """
-    if path is None:
-        path = os.environ.get('PATH', os.defpath)
-
-    paths = path.split(os.pathsep)
-    base, ext = os.path.splitext(executable)
-
+    _, ext = os.path.splitext(executable)
     if (sys.platform == 'win32') and (ext != '.exe'):
         executable = executable + '.exe'
 
-    if not os.path.isfile(executable):
-        for p in paths:
-            f = os.path.join(p, executable)
-            if os.path.isfile(f):
-                # the file exists, we have a shot at spawn working
-                return f
-        return None
-    else:
+    if os.path.isfile(executable):
         return executable
+
+    if path is None:
+        path = os.environ.get('PATH', None)
+        if path is None:
+            try:
+                path = os.confstr("CS_PATH")
+            except (AttributeError, ValueError):
+                # os.confstr() or CS_PATH is not available
+                path = os.defpath
+        # bpo-35755: Don't use os.defpath if the PATH environment variable is
+        # set to an empty string to mimick Unix which command behavior
+
+    # PATH='' doesn't match, whereas PATH=':' looks in the current directory
+    if not path:
+        return None
+
+    paths = path.split(os.pathsep)
+    for p in paths:
+        f = os.path.join(p, executable)
+        if os.path.isfile(f):
+            # the file exists, we have a shot at spawn working
+            return f
+    return None
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 0d455385d8..f9ae69ef86 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -87,11 +87,52 @@ def test_find_executable(self):
             rv = find_executable(dont_exist_program , path=tmp_dir)
             self.assertIsNone(rv)
 
-            # test os.defpath: missing PATH environment variable
+            # PATH='': no match, except in the current directory
             with test_support.EnvironmentVarGuard() as env:
-                with mock.patch('distutils.spawn.os.defpath', tmp_dir):
-                    env.pop('PATH')
+                env['PATH'] = ''
+                with unittest.mock.patch('distutils.spawn.os.confstr',
+                                         return_value=tmp_dir, create=True), \
+                     unittest.mock.patch('distutils.spawn.os.defpath',
+                                         tmp_dir):
+                    rv = find_executable(program)
+                    self.assertIsNone(rv)
+
+                    # look in current directory
+                    with test_support.change_cwd(tmp_dir):
+                        rv = find_executable(program)
+                        self.assertEqual(rv, program)
+
+            # PATH=':': explicitly looks in the current directory
+            with test_support.EnvironmentVarGuard() as env:
+                env['PATH'] = os.pathsep
+                with unittest.mock.patch('distutils.spawn.os.confstr',
+                                         return_value='', create=True), \
+                     unittest.mock.patch('distutils.spawn.os.defpath', ''):
+                    rv = find_executable(program)
+                    self.assertIsNone(rv)
+
+                    # look in current directory
+                    with test_support.change_cwd(tmp_dir):
+                        rv = find_executable(program)
+                        self.assertEqual(rv, program)
+
+            # missing PATH: test os.confstr("CS_PATH") and os.defpath
+            with test_support.EnvironmentVarGuard() as env:
+                env.pop('PATH', None)
+
+                # without confstr
+                with unittest.mock.patch('distutils.spawn.os.confstr',
+                                         side_effect=ValueError,
+                                         create=True), \
+                     unittest.mock.patch('distutils.spawn.os.defpath',
+                                         tmp_dir):
+                    rv = find_executable(program)
+                    self.assertEqual(rv, filename)
 
+                # with confstr
+                with unittest.mock.patch('distutils.spawn.os.confstr',
+                                         return_value=tmp_dir, create=True), \
+                     unittest.mock.patch('distutils.spawn.os.defpath', ''):
                     rv = find_executable(program)
                     self.assertEqual(rv, filename)
 

From 3dd8d681a9db9ca36372f3a6a8fe6457076ea8b0 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 17 Apr 2019 17:44:06 +0200
Subject: [PATCH 7436/8469] bpo-35755: Don't say "to mimick Unix which command
 behavior" (GH-12861)

---
 spawn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spawn.py b/spawn.py
index 888327270e..d3a12c2833 100644
--- a/spawn.py
+++ b/spawn.py
@@ -188,7 +188,7 @@ def find_executable(executable, path=None):
                 # os.confstr() or CS_PATH is not available
                 path = os.defpath
         # bpo-35755: Don't use os.defpath if the PATH environment variable is
-        # set to an empty string to mimick Unix which command behavior
+        # set to an empty string
 
     # PATH='' doesn't match, whereas PATH=':' looks in the current directory
     if not path:

From 869c634880f24b918ca074588b625b9dce2038b2 Mon Sep 17 00:00:00 2001
From: Floris Lambrechts <florisla@gmail.com>
Date: Tue, 26 Mar 2019 09:08:33 +0100
Subject: [PATCH 7437/8469] Add test for pre-existing wheels in build_meta

Currently, this will fail because setuptools.build_meta.build_wheel
assumes that no wheels already exist in the `dist/` directory.

See GH #1671
---
 setuptools/tests/test_build_meta.py | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 0bdea2d613..90400afc50 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -157,6 +157,44 @@ def test_build_wheel(self, build_backend):
 
         assert os.path.isfile(os.path.join(dist_dir, wheel_name))
 
+    @pytest.mark.xfail(reason="Known error, see GH #1671")
+    def test_build_wheel_with_existing_wheel_file_present(self, tmpdir_cwd):
+        # Building a wheel should still succeed if there's already a wheel
+        # in the wheel directory
+        files = {
+            'setup.py': "from setuptools import setup\nsetup()",
+            'VERSION': "0.0.1",
+            'setup.cfg': DALS("""
+                [metadata]
+                name = foo
+                version = file: VERSION
+            """),
+            'pyproject.toml': DALS("""
+                [build-system]
+                requires = ["setuptools", "wheel"]
+                build-backend = "setuptools.build_meta
+            """),
+        }
+
+        build_files(files)
+
+        dist_dir = os.path.abspath('pip-wheel-preexisting')
+        os.makedirs(dist_dir)
+
+        # make first wheel
+        build_backend = self.get_build_backend()
+        wheel_one = build_backend.build_wheel(dist_dir)
+
+        # change version
+        with open("VERSION", "wt") as version_file:
+            version_file.write("0.0.2")
+
+        # make *second* wheel
+        wheel_two = self.get_build_backend().build_wheel(dist_dir)
+
+        assert os.path.isfile(os.path.join(dist_dir, wheel_one))
+        assert wheel_one != wheel_two
+
     def test_build_sdist(self, build_backend):
         dist_dir = os.path.abspath('pip-sdist')
         os.makedirs(dist_dir)

From 901f7cc2a036bfeb93bfbe480608e04c76c2c5ec Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sat, 20 Apr 2019 23:24:41 -0400
Subject: [PATCH 7438/8469] Fix error when wheels already exist in dist/

`build_meta.build_wheel` assumes that the only wheel in its output
directory is the one it builds, but prior to this, it also used the
`dist/` folder as its working output directory. This commit uses a
temporary directory instead, preventing an error that was triggered when
previously-generated wheel files were still sitting in `dist/`.

Fixes GH #1671
---
 setuptools/build_meta.py            | 23 ++++++++++++++++-------
 setuptools/py31compat.py            |  4 ++--
 setuptools/tests/test_build_meta.py |  7 ++++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 47cbcbf684..e40904a5df 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -35,6 +35,7 @@
 
 import setuptools
 import distutils
+from setuptools.py31compat import TemporaryDirectory
 
 from pkg_resources import parse_requirements
 
@@ -182,14 +183,22 @@ def build_wheel(self, wheel_directory, config_settings=None,
                     metadata_directory=None):
         config_settings = self._fix_config(config_settings)
         wheel_directory = os.path.abspath(wheel_directory)
-        sys.argv = sys.argv[:1] + ['bdist_wheel'] + \
-            config_settings["--global-option"]
-        self.run_setup()
-        if wheel_directory != 'dist':
-            shutil.rmtree(wheel_directory)
-            shutil.copytree('dist', wheel_directory)
 
-        return _file_with_extension(wheel_directory, '.whl')
+        # Build the wheel in a temporary directory, then copy to the target
+        with TemporaryDirectory(dir=wheel_directory) as tmp_dist_dir:
+            sys.argv = (sys.argv[:1] +
+                        ['bdist_wheel', '--dist-dir', tmp_dist_dir] +
+                        config_settings["--global-option"])
+            self.run_setup()
+
+            wheel_basename = _file_with_extension(tmp_dist_dir, '.whl')
+            wheel_path = os.path.join(wheel_directory, wheel_basename)
+            if os.path.exists(wheel_path):
+                # os.rename will fail overwriting on non-unix env
+                os.remove(wheel_path)
+            os.rename(os.path.join(tmp_dist_dir, wheel_basename), wheel_path)
+
+        return wheel_basename
 
     def build_sdist(self, sdist_directory, config_settings=None):
         config_settings = self._fix_config(config_settings)
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
index 1a0705ece3..e1da7ee2a2 100644
--- a/setuptools/py31compat.py
+++ b/setuptools/py31compat.py
@@ -17,9 +17,9 @@ class TemporaryDirectory:
         errors on deletion.
         """
 
-        def __init__(self):
+        def __init__(self, **kwargs):
             self.name = None  # Handle mkdtemp raising an exception
-            self.name = tempfile.mkdtemp()
+            self.name = tempfile.mkdtemp(**kwargs)
 
         def __enter__(self):
             return self.name
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 90400afc50..88e29ffe1a 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -157,7 +157,6 @@ def test_build_wheel(self, build_backend):
 
         assert os.path.isfile(os.path.join(dist_dir, wheel_name))
 
-    @pytest.mark.xfail(reason="Known error, see GH #1671")
     def test_build_wheel_with_existing_wheel_file_present(self, tmpdir_cwd):
         # Building a wheel should still succeed if there's already a wheel
         # in the wheel directory
@@ -195,6 +194,12 @@ def test_build_wheel_with_existing_wheel_file_present(self, tmpdir_cwd):
         assert os.path.isfile(os.path.join(dist_dir, wheel_one))
         assert wheel_one != wheel_two
 
+        # and if rebuilding the same wheel?
+        open(os.path.join(dist_dir, wheel_two), 'w').close()
+        wheel_three = self.get_build_backend().build_wheel(dist_dir)
+        assert wheel_three == wheel_two
+        assert os.path.getsize(os.path.join(dist_dir, wheel_three)) > 0
+
     def test_build_sdist(self, build_backend):
         dist_dir = os.path.abspath('pip-sdist')
         os.makedirs(dist_dir)

From e4f987b141104e709367cbe629f3cd6ef5153216 Mon Sep 17 00:00:00 2001
From: Shashank Singh <shashanksingh28@gmail.com>
Date: Sat, 20 Apr 2019 23:25:59 -0400
Subject: [PATCH 7439/8469] Add changelog for PR #1745

---
 changelog.d/1671.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1671.change.rst

diff --git a/changelog.d/1671.change.rst b/changelog.d/1671.change.rst
new file mode 100644
index 0000000000..95ae49da64
--- /dev/null
+++ b/changelog.d/1671.change.rst
@@ -0,0 +1 @@
+Fixed issue with the PEP 517 backend that prevented building a wheel when the ``dist/`` directory contained existing ``.whl`` files.

From bd3d72b030eeae19ebc2eb3a0a325f87b41a09f1 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 16:49:46 +0200
Subject: [PATCH 7440/8469] travis: preemptively switch to xenial

As it will soon become the default: https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment
---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a5b670e4b9..d99656e026 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 language: python
 
 jobs:
@@ -9,7 +9,6 @@ jobs:
   - <<: *latest_py2
     env: LANG=C
   - python: pypy2.7-6.0.0
-    dist: xenial
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
     env: DISABLE_COVERAGE=1
@@ -19,11 +18,9 @@ jobs:
     python: 3.6
   - &latest_py3
     python: 3.7
-    dist: xenial
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
-    dist: xenial
     env: DISABLE_COVERAGE=1  # Ignore invalid coverage data.
   - <<: *default_py
     stage: deploy (to PyPI for tagged commits)

From 3a797435ccdc5a115b681572d5ba0cfd484ae810 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 16:53:37 +0200
Subject: [PATCH 7441/8469] travis: update PyPy 3 job to latest supported
 version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d99656e026..9429dc6ca4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ jobs:
     env: LANG=C
   - python: pypy2.7-6.0.0
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
-  - python: pypy3
+  - python: pypy3.5-6.0.0
     env: DISABLE_COVERAGE=1
   - python: 3.4
   - python: 3.5

From 127c8c74dead715b67a66eed86c420fe7b31ea3b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 22 Apr 2019 11:05:29 -0400
Subject: [PATCH 7442/8469] Limit workers in ProcessPoolExecutor

As a mitigation for #1730, this commit limits the number of workers in
the ProcessPoolExecutor to 1 (default is the number of CPUs). On PyPy,
having a higher number of available workers dramatically increases the
number of concurrent processes, leading to some resource exhaustion
issues.

This does not address the root issue, but should improve the situation
until the root issue is addressed.
---
 setuptools/tests/test_build_meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 90400afc50..e32cfb92b8 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -28,7 +28,7 @@ class BuildBackend(BuildBackendBase):
 
     def __init__(self, *args, **kwargs):
         super(BuildBackend, self).__init__(*args, **kwargs)
-        self.pool = futures.ProcessPoolExecutor()
+        self.pool = futures.ProcessPoolExecutor(max_workers=1)
 
     def __getattr__(self, name):
         """Handles aribrary function invocations on the build backend."""

From e66857af348a823b15701c39a88add28cfaab3bd Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 16:00:24 +0000
Subject: [PATCH 7443/8469] travis: re-enable coverage for Python 3.8 job
 (#1748)

Now that the issue with invalid coverage data has been fixed.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9429dc6ca4..ffcad99864 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,6 @@ jobs:
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
-    env: DISABLE_COVERAGE=1  # Ignore invalid coverage data.
   - <<: *default_py
     stage: deploy (to PyPI for tagged commits)
     if: tag IS present

From 97d7563915b6e2ad8a638e988361357709a83bda Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 22:07:03 +0200
Subject: [PATCH 7444/8469] =?UTF-8?q?Bump=20version:=2041.0.0=20=E2=86=92?=
 =?UTF-8?q?=2041.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 8 ++++++++
 changelog.d/1671.change.rst | 1 -
 changelog.d/1709.change.rst | 1 -
 changelog.d/1741.change.rst | 1 -
 setup.cfg                   | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1671.change.rst
 delete mode 100644 changelog.d/1709.change.rst
 delete mode 100644 changelog.d/1741.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a8fd179a80..87acb5ef8d 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.0.0
+current_version = 41.0.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 08c5ee0bdb..9da2253792 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v41.0.1
+-------
+
+* #1671: Fixed issue with the PEP 517 backend that prevented building a wheel when the ``dist/`` directory contained existing ``.whl`` files.
+* #1709: In test.paths_on_python_path, avoid adding unnecessary duplicates to the PYTHONPATH.
+* #1741: In package_index, now honor "current directory" during a checkout of git and hg repositories under Windows
+
+
 v41.0.0
 -------
 
diff --git a/changelog.d/1671.change.rst b/changelog.d/1671.change.rst
deleted file mode 100644
index 95ae49da64..0000000000
--- a/changelog.d/1671.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed issue with the PEP 517 backend that prevented building a wheel when the ``dist/`` directory contained existing ``.whl`` files.
diff --git a/changelog.d/1709.change.rst b/changelog.d/1709.change.rst
deleted file mode 100644
index c6670ae9c6..0000000000
--- a/changelog.d/1709.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In test.paths_on_python_path, avoid adding unnecessary duplicates to the PYTHONPATH.
diff --git a/changelog.d/1741.change.rst b/changelog.d/1741.change.rst
deleted file mode 100644
index 03b2478007..0000000000
--- a/changelog.d/1741.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In package_index, now honor "current directory" during a checkout of git and hg repositories under Windows
diff --git a/setup.cfg b/setup.cfg
index 561e7b248e..3945408162 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,4 +19,4 @@ universal = 1
 
 [metadata]
 license_file = LICENSE
-version = 41.0.0
+version = 41.0.1

From 5f88c42f3b4529956e4d02453ae571e32bc4692a Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 22:18:50 +0200
Subject: [PATCH 7445/8469] build_meta: fix 2 issues with `build_wheel` /
 `build_sdist`

Fix the following cases:

* `build_sdist` is called with another sdist already present
  in the destination directory

* `build_wheel` is called with the destination directory not
  already created
---
 setuptools/build_meta.py            | 47 +++++++++++++++--------------
 setuptools/tests/test_build_meta.py | 38 ++++++++++++-----------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index e40904a5df..10c4b528d9 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -38,6 +38,7 @@
 from setuptools.py31compat import TemporaryDirectory
 
 from pkg_resources import parse_requirements
+from pkg_resources.py31compat import makedirs
 
 __all__ = ['get_requires_for_build_sdist',
            'get_requires_for_build_wheel',
@@ -179,36 +180,38 @@ def prepare_metadata_for_build_wheel(self, metadata_directory,
 
         return dist_infos[0]
 
-    def build_wheel(self, wheel_directory, config_settings=None,
-                    metadata_directory=None):
+    def _build_with_temp_dir(self, setup_command, result_extension,
+                             result_directory, config_settings):
         config_settings = self._fix_config(config_settings)
-        wheel_directory = os.path.abspath(wheel_directory)
+        result_directory = os.path.abspath(result_directory)
 
-        # Build the wheel in a temporary directory, then copy to the target
-        with TemporaryDirectory(dir=wheel_directory) as tmp_dist_dir:
-            sys.argv = (sys.argv[:1] +
-                        ['bdist_wheel', '--dist-dir', tmp_dist_dir] +
+        # Build in a temporary directory, then copy to the target.
+        makedirs(result_directory, exist_ok=True)
+        with TemporaryDirectory(dir=result_directory) as tmp_dist_dir:
+            sys.argv = (sys.argv[:1] + setup_command +
+                        ['--dist-dir', tmp_dist_dir] +
                         config_settings["--global-option"])
             self.run_setup()
 
-            wheel_basename = _file_with_extension(tmp_dist_dir, '.whl')
-            wheel_path = os.path.join(wheel_directory, wheel_basename)
-            if os.path.exists(wheel_path):
-                # os.rename will fail overwriting on non-unix env
-                os.remove(wheel_path)
-            os.rename(os.path.join(tmp_dist_dir, wheel_basename), wheel_path)
+            result_basename = _file_with_extension(tmp_dist_dir, result_extension)
+            result_path = os.path.join(result_directory, result_basename)
+            if os.path.exists(result_path):
+                # os.rename will fail overwriting on non-Unix.
+                os.remove(result_path)
+            os.rename(os.path.join(tmp_dist_dir, result_basename), result_path)
 
-        return wheel_basename
+        return result_basename
 
-    def build_sdist(self, sdist_directory, config_settings=None):
-        config_settings = self._fix_config(config_settings)
-        sdist_directory = os.path.abspath(sdist_directory)
-        sys.argv = sys.argv[:1] + ['sdist', '--formats', 'gztar'] + \
-            config_settings["--global-option"] + \
-            ["--dist-dir", sdist_directory]
-        self.run_setup()
 
-        return _file_with_extension(sdist_directory, '.tar.gz')
+    def build_wheel(self, wheel_directory, config_settings=None,
+                    metadata_directory=None):
+        return self._build_with_temp_dir(['bdist_wheel'], '.whl',
+                                         wheel_directory, config_settings)
+
+    def build_sdist(self, sdist_directory, config_settings=None):
+        return self._build_with_temp_dir(['sdist', '--formats', 'gztar'],
+                                         '.tar.gz', sdist_directory,
+                                         config_settings)
 
 
 class _BuildMetaLegacyBackend(_BuildMetaBackend):
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 7612ebd7fc..e1efe5617c 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -157,9 +157,10 @@ def test_build_wheel(self, build_backend):
 
         assert os.path.isfile(os.path.join(dist_dir, wheel_name))
 
-    def test_build_wheel_with_existing_wheel_file_present(self, tmpdir_cwd):
-        # Building a wheel should still succeed if there's already a wheel
-        # in the wheel directory
+    @pytest.mark.parametrize('build_type', ('wheel', 'sdist'))
+    def test_build_with_existing_file_present(self, build_type, tmpdir_cwd):
+        # Building a sdist/wheel should still succeed if there's
+        # already a sdist/wheel in the destination directory.
         files = {
             'setup.py': "from setuptools import setup\nsetup()",
             'VERSION': "0.0.1",
@@ -177,28 +178,31 @@ def test_build_wheel_with_existing_wheel_file_present(self, tmpdir_cwd):
 
         build_files(files)
 
-        dist_dir = os.path.abspath('pip-wheel-preexisting')
-        os.makedirs(dist_dir)
+        dist_dir = os.path.abspath('preexisting-' + build_type)
 
-        # make first wheel
         build_backend = self.get_build_backend()
-        wheel_one = build_backend.build_wheel(dist_dir)
+        build_method = getattr(build_backend, 'build_' + build_type)
+
+        # Build a first sdist/wheel.
+        # Note: this also check the destination directory is
+        # successfully created if it does not exist already.
+        first_result = build_method(dist_dir)
 
-        # change version
+        # Change version.
         with open("VERSION", "wt") as version_file:
             version_file.write("0.0.2")
 
-        # make *second* wheel
-        wheel_two = self.get_build_backend().build_wheel(dist_dir)
+        # Build a *second* sdist/wheel.
+        second_result = build_method(dist_dir)
 
-        assert os.path.isfile(os.path.join(dist_dir, wheel_one))
-        assert wheel_one != wheel_two
+        assert os.path.isfile(os.path.join(dist_dir, first_result))
+        assert first_result != second_result
 
-        # and if rebuilding the same wheel?
-        open(os.path.join(dist_dir, wheel_two), 'w').close()
-        wheel_three = self.get_build_backend().build_wheel(dist_dir)
-        assert wheel_three == wheel_two
-        assert os.path.getsize(os.path.join(dist_dir, wheel_three)) > 0
+        # And if rebuilding the exact same sdist/wheel?
+        open(os.path.join(dist_dir, second_result), 'w').close()
+        third_result = build_method(dist_dir)
+        assert third_result == second_result
+        assert os.path.getsize(os.path.join(dist_dir, third_result)) > 0
 
     def test_build_sdist(self, build_backend):
         dist_dir = os.path.abspath('pip-sdist')

From 812a97c2a90f67a551b6b158e08fe466748d7902 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 22 Apr 2019 23:25:17 +0200
Subject: [PATCH 7446/8469] changelog: add entry for PR #1750

---
 changelog.d/1749.change.rst | 1 +
 changelog.d/1750.change.rst | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/1749.change.rst
 create mode 100644 changelog.d/1750.change.rst

diff --git a/changelog.d/1749.change.rst b/changelog.d/1749.change.rst
new file mode 100644
index 0000000000..de67807234
--- /dev/null
+++ b/changelog.d/1749.change.rst
@@ -0,0 +1 @@
+Fixed issue with the PEP 517 backend where building a source distribution would fail if any tarball existed in the destination directory.
diff --git a/changelog.d/1750.change.rst b/changelog.d/1750.change.rst
new file mode 100644
index 0000000000..7a22229ef3
--- /dev/null
+++ b/changelog.d/1750.change.rst
@@ -0,0 +1 @@
+Fixed an issue with PEP 517 backend where wheel builds would fail if the destination directory did not already exist.

From 89a5c175e47d95d33a700eedecf402e78d2a964a Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Thu, 25 Apr 2019 11:59:34 +0200
Subject: [PATCH 7447/8469] bpo-28552: Fix distutils.sysconfig for empty
 sys.executable (GH-12875)

bpo-28552, bpo-7774: Fix distutils.sysconfig if sys.executable is
None or an empty string: use os.getcwd() to initialize project_base.

Fix also the distutils build command: don't use sys.executable if
it's evaluated as false (None or empty string).
---
 command/build.py | 2 +-
 sysconfig.py     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/command/build.py b/command/build.py
index c6f52e61e1..a86df0bc7f 100644
--- a/command/build.py
+++ b/command/build.py
@@ -116,7 +116,7 @@ def finalize_options(self):
             self.build_scripts = os.path.join(self.build_base,
                                               'scripts-%d.%d' % sys.version_info[:2])
 
-        if self.executable is None:
+        if self.executable is None and sys.executable:
             self.executable = os.path.normpath(sys.executable)
 
         if isinstance(self.parallel, str):
diff --git a/sysconfig.py b/sysconfig.py
index a3494670db..570a612d1b 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -28,7 +28,12 @@
 if "_PYTHON_PROJECT_BASE" in os.environ:
     project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])
 else:
-    project_base = os.path.dirname(os.path.abspath(sys.executable))
+    if sys.executable:
+        project_base = os.path.dirname(os.path.abspath(sys.executable))
+    else:
+        # sys.executable can be empty if argv[0] has been changed and Python is
+        # unable to retrieve the real program name
+        project_base = os.getcwd()
 
 
 # python_build: (Boolean) if true, we're either building Python or

From eb3478f2cdccd5489b64f7bb8cec4988fba985c7 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Thu, 25 Apr 2019 20:13:10 +0200
Subject: [PATCH 7448/8469] bpo-21536: C extensions are no longer linked to
 libpython (GH-12946)

On Unix, C extensions are no longer linked to libpython.

It is now possible to load a C extension built using a shared library
Python with a statically linked Python.

When Python is embedded, libpython must not be loaded with
RTLD_LOCAL, but RTLD_GLOBAL instead. Previously, using RTLD_LOCAL, it
was already not possible to load C extensions which were not linked
to libpython, like C extensions of the standard library built by the
"*shared*" section of Modules/Setup.

distutils, python-config and python-config.py have been modified.
---
 command/build_ext.py | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 0428466b00..1672d02acf 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -714,20 +714,5 @@ def get_libraries(self, ext):
                 # don't extend ext.libraries, it may be shared with other
                 # extensions, it is a reference to the original list
                 return ext.libraries + [pythonlib]
-            else:
-                return ext.libraries
-        elif sys.platform == 'darwin':
-            # Don't use the default code below
-            return ext.libraries
-        elif sys.platform[:3] == 'aix':
-            # Don't use the default code below
-            return ext.libraries
-        else:
-            from distutils import sysconfig
-            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
-                pythonlib = 'python{}.{}{}'.format(
-                    sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff,
-                    sysconfig.get_config_var('ABIFLAGS'))
-                return ext.libraries + [pythonlib]
-            else:
-                return ext.libraries
+
+        return ext.libraries

From 03ae9d8b1618be1a9dc5c9a3349fb01b4c7c7d14 Mon Sep 17 00:00:00 2001
From: Paul Monson <paulmon@users.noreply.github.com>
Date: Thu, 25 Apr 2019 11:36:45 -0700
Subject: [PATCH 7449/8469] bpo-35920: Windows 10 ARM32 platform support
 (GH-11774)

---
 _msvccompiler.py | 16 ++++++++++++++--
 spawn.py         |  2 +-
 sysconfig.py     |  1 +
 util.py          | 16 +++++++++++++---
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 58b20a2102..c7ac3f049e 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -89,13 +89,24 @@ def _find_vc2017():
 
     return None, None
 
+PLAT_SPEC_TO_RUNTIME = {
+    'x86' : 'x86',
+    'x86_amd64' : 'x64',
+    'x86_arm' : 'arm',
+}
+
 def _find_vcvarsall(plat_spec):
     _, best_dir = _find_vc2017()
     vcruntime = None
-    vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
+
+    if plat_spec in PLAT_SPEC_TO_RUNTIME:
+        vcruntime_plat = PLAT_SPEC_TO_RUNTIME[plat_spec]
+    else:
+        vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
+
     if best_dir:
         vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
-            "Microsoft.VC141.CRT", "vcruntime140.dll")
+            vcruntime_plat, "Microsoft.VC141.CRT", "vcruntime140.dll")
         try:
             import glob
             vcruntime = glob.glob(vcredist, recursive=True)[-1]
@@ -178,6 +189,7 @@ def _find_exe(exe, paths=None):
 PLAT_TO_VCVARS = {
     'win32' : 'x86',
     'win-amd64' : 'x86_amd64',
+    'win-arm32' : 'x86_arm',
 }
 
 # A set containing the DLLs that are guaranteed to be available for
diff --git a/spawn.py b/spawn.py
index d3a12c2833..ceb94945dc 100644
--- a/spawn.py
+++ b/spawn.py
@@ -81,7 +81,6 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
                   "command %r failed with exit status %d" % (cmd, rc))
 
 if sys.platform == 'darwin':
-    from distutils import sysconfig
     _cfg_target = None
     _cfg_target_split = None
 
@@ -95,6 +94,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     if sys.platform == 'darwin':
         global _cfg_target, _cfg_target_split
         if _cfg_target is None:
+            from distutils import sysconfig
             _cfg_target = sysconfig.get_config_var(
                                   'MACOSX_DEPLOYMENT_TARGET') or ''
             if _cfg_target:
diff --git a/sysconfig.py b/sysconfig.py
index 570a612d1b..b51629eb94 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -15,6 +15,7 @@
 import sys
 
 from .errors import DistutilsPlatformError
+from .util import get_platform, get_host_platform
 
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)
diff --git a/util.py b/util.py
index 15cd2ad9a9..50550e1893 100644
--- a/util.py
+++ b/util.py
@@ -15,7 +15,7 @@
 from distutils import log
 from distutils.errors import DistutilsByteCompileError
 
-def get_platform ():
+def get_host_platform():
     """Return a string that identifies the current platform.  This is used mainly to
     distinguish platform-specific build directories and platform-specific built
     distributions.  Typically includes the OS name and version and the
@@ -38,6 +38,8 @@ def get_platform ():
     if os.name == 'nt':
         if 'amd64' in sys.version.lower():
             return 'win-amd64'
+        if '(arm)' in sys.version.lower():
+            return 'win-arm32'
         return sys.platform
 
     # Set for cross builds explicitly
@@ -90,8 +92,16 @@ def get_platform ():
 
     return "%s-%s-%s" % (osname, release, machine)
 
-# get_platform ()
-
+def get_platform():
+    if os.name == 'nt':
+        TARGET_TO_PLAT = {
+            'x86' : 'win32',
+            'x64' : 'win-amd64',
+            'arm' : 'win-arm32',
+        }
+        return TARGET_TO_PLAT.get(os.environ.get('VSCMD_ARG_TGT_ARCH')) or get_host_platform()
+    else:
+        return get_host_platform()
 
 def convert_path (pathname):
     """Return 'pathname' as a name that will work on the native filesystem,

From 736a36a6342656cf7fda44eb3060ce2d3d092ef0 Mon Sep 17 00:00:00 2001
From: xdegaye <xdegaye@gmail.com>
Date: Mon, 29 Apr 2019 09:27:40 +0200
Subject: [PATCH 7450/8469]  bpo-21536: On Android, C extensions are linked to
 libpython (GH-12989)

---
 command/build_ext.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/command/build_ext.py b/command/build_ext.py
index 1672d02acf..c3b9602461 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -714,5 +714,20 @@ def get_libraries(self, ext):
                 # don't extend ext.libraries, it may be shared with other
                 # extensions, it is a reference to the original list
                 return ext.libraries + [pythonlib]
+        # On Android only the main executable and LD_PRELOADs are considered
+        # to be RTLD_GLOBAL, all the dependencies of the main executable
+        # remain RTLD_LOCAL and so the shared libraries must be linked with
+        # libpython when python is built with a shared python library (issue
+        # bpo-21536).
+        else:
+            from distutils.sysconfig import get_config_var
+            if get_config_var('Py_ENABLE_SHARED'):
+                # Either a native build on an Android device or the
+                # cross-compilation of Python.
+                if (hasattr(sys, 'getandroidapilevel') or
+                        ('_PYTHON_HOST_PLATFORM' in os.environ and
+                         get_config_var('ANDROID_API_LEVEL') != 0)):
+                    ldversion = get_config_var('LDVERSION')
+                    return ext.libraries + ['python' + ldversion]
 
         return ext.libraries

From f58549ab38eb6f5d1146510cbf15965aeb75c6fb Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 14 May 2019 15:31:27 +0200
Subject: [PATCH 7451/8469] tests: fix_test_build_deps_on_distutils

* ignore distutils' warning (`Unknown distribution option: 'python_requires'`)
* fix test on Windows
---
 setuptools/tests/test_integration.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index e54f3209aa..1e13218899 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -141,6 +141,7 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
         allowed_unknowns = [
             'test_suite',
             'tests_require',
+            'python_requires',
             'install_requires',
         ]
         assert not match or match.group(1).strip('"\'') in allowed_unknowns
@@ -149,8 +150,8 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
 def install(pkg_dir, install_dir):
     with open(os.path.join(pkg_dir, 'setuptools.py'), 'w') as breaker:
         breaker.write('raise ImportError()')
-    cmd = [sys.executable, 'setup.py', 'install', '--prefix', install_dir]
-    env = dict(os.environ, PYTHONPATH=pkg_dir)
+    cmd = [sys.executable, 'setup.py', 'install', '--prefix', str(install_dir)]
+    env = dict(os.environ, PYTHONPATH=str(pkg_dir))
     output = subprocess.check_output(
         cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
     return output.decode('utf-8')

From 9146e8808d3912c5a193f6f9b0cc32c13bc4a4fc Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 14 May 2019 16:58:09 +0200
Subject: [PATCH 7452/8469] appveyor: fix Python 2 job

Update virtualenv so the tox environment use a more recent version
of pip (and probably setuptools/wheel too).
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7a3d174da8..0881806968 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ cache:
 test_script:
   - python --version
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
-  - pip install --upgrade tox tox-venv
+  - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
   - python bootstrap.py
   - tox -- --cov

From 835580ae8926fc6ca7560ab7421387e3ba47242c Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 14 May 2019 17:01:08 +0200
Subject: [PATCH 7453/8469] tox: tweak configuration

Fix the `list_dependencies_command` so arguably the most important
packages are not hidden (pip, setuptools, and wheel).
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index bb940ac072..e0eef95a45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps=-rtests/requirements.txt
 # from being added to `sys.path`.
 install_command=python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages}
 # Same as above.
-list_dependencies_command={envbindir}/pip freeze
+list_dependencies_command={envbindir}/pip freeze --all
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.

From 314386fd5d4d0e925960f3e9982102095b9579c9 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Wed, 15 May 2019 12:20:25 +0200
Subject: [PATCH 7454/8469] Deprecated Eggsecutable Scripts

Closes: #1557
---
 changelog.d/1557.change         |  1 +
 docs/setuptools.txt             | 37 ---------------------------------
 setuptools/command/bdist_egg.py |  9 +++++++-
 3 files changed, 9 insertions(+), 38 deletions(-)
 create mode 100644 changelog.d/1557.change

diff --git a/changelog.d/1557.change b/changelog.d/1557.change
new file mode 100644
index 0000000000..77d2e3b4f4
--- /dev/null
+++ b/changelog.d/1557.change
@@ -0,0 +1 @@
+Deprecated eggsecutable scripts and removed related docs.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 64b385cb1d..f44813d17c 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -569,43 +569,6 @@ on "entry points" in general, see the section below on `Dynamic Discovery of
 Services and Plugins`_.
 
 
-"Eggsecutable" Scripts
-----------------------
-
-Occasionally, there are situations where it's desirable to make an ``.egg``
-file directly executable.  You can do this by including an entry point such
-as the following::
-
-    setup(
-        # other arguments here...
-        entry_points={
-            'setuptools.installation': [
-                'eggsecutable = my_package.some_module:main_func',
-            ]
-        }
-    )
-
-Any eggs built from the above setup script will include a short executable
-prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
-The prelude can be run on Unix-like platforms (including Mac and Linux) by
-invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
-``.egg`` file.  For the executable prelude to run, the appropriate version of
-Python must be available via the ``PATH`` environment variable, under its
-"long" name.  That is, if the egg is built for Python 2.3, there must be a
-``python2.3`` executable present in a directory on ``PATH``.
-
-This feature is primarily intended to support ez_setup the installation of
-setuptools itself on non-Windows platforms, but may also be useful for other
-projects as well.
-
-IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
-invoked via symlinks.  They *must* be invoked using their original filename, in
-order to ensure that, once running, ``pkg_resources`` will know what project
-and version is in use.  The header script will check this and exit with an
-error if the ``.egg`` file has been renamed or is invoked via a symlink that
-changes its base name.
-
-
 Declaring Dependencies
 ======================
 
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9f8df917e6..ae44eaa2bc 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -11,13 +11,14 @@
 import re
 import textwrap
 import marshal
+import warnings
 
 from setuptools.extern import six
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
 from setuptools.extension import Library
-from setuptools import Command
+from setuptools import Command, SetuptoolsDeprecationWarning
 
 try:
     # Python 2.7 or >=3.2
@@ -278,6 +279,12 @@ def gen_header(self):
         if ep is None:
             return 'w'  # not an eggsecutable, do it the usual way.
 
+        warnings.warn(
+            "Eggsecutables are deprecated and will be removed in a future "
+            "version.",
+            SetuptoolsDeprecationWarning
+        )
+
         if not ep.attrs or ep.extras:
             raise DistutilsSetupError(
                 "eggsecutable entry point (%r) cannot have 'extras' "

From a775582b44ca39096640c36550a9dcec7f965ec1 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Tue, 14 May 2019 12:35:35 +0200
Subject: [PATCH 7455/8469] Migrate constants from setup.py to setup.cfg

This also makes wheel an unconditional setup_requires dependency.

Closes: #1697
---
 setup.cfg | 43 ++++++++++++++++++++++++++++++++++++++++++-
 setup.py  | 46 ----------------------------------------------
 2 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 3945408162..ff87464bf4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,5 +18,46 @@ formats = zip
 universal = 1
 
 [metadata]
-license_file = LICENSE
+name = setuptools
 version = 41.0.1
+description = Easily download, build, install, upgrade, and uninstall Python packages
+author = Python Packaging Authority
+author_email = distutils-sig@python.org
+long_description = file: README.rst
+long_description_content_type = text/x-rst; charset=UTF-8
+license_file = LICENSE
+keywords = CPAN PyPI distutils eggs package management
+url = https://github.com/pypa/setuptools
+project_urls =
+    Documentation = https://setuptools.readthedocs.io/
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Topic :: Software Development :: Libraries :: Python Modules
+    Topic :: System :: Archiving :: Packaging
+    Topic :: System :: Systems Administration
+    Topic :: Utilities
+
+[options]
+zip_safe = True
+python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+py_modules = easy_install
+packages = find:
+
+[options.packages.find]
+exclude = *.tests
+
+[options.extras_require]
+ssl =
+    wincertstore==0.2; sys_platform=='win32'
+certs =
+    certifi==2016.9.26
diff --git a/setup.py b/setup.py
index 78d7018c98..f5030dd670 100755
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,8 @@
 Distutils setup file, used to install or test 'setuptools'
 """
 
-import io
 import os
 import sys
-import textwrap
 
 import setuptools
 
@@ -49,10 +47,6 @@ def _gen_console_scripts():
     yield tmpl.format(shortver=sys.version[:3])
 
 
-readme_path = os.path.join(here, 'README.rst')
-with io.open(readme_path, encoding='utf-8') as readme_file:
-    long_description = readme_file.read()
-
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
 )
@@ -88,25 +82,8 @@ def pypi_link(pkg_filename):
 
 
 setup_params = dict(
-    name="setuptools",
-    description=(
-        "Easily download, build, install, upgrade, and uninstall "
-        "Python packages"
-    ),
-    author="Python Packaging Authority",
-    author_email="distutils-sig@python.org",
-    long_description=long_description,
-    long_description_content_type='text/x-rst; charset=UTF-8',
-    keywords="CPAN PyPI distutils eggs package management",
-    url="https://github.com/pypa/setuptools",
-    project_urls={
-        "Documentation": "https://setuptools.readthedocs.io/",
-    },
     src_root=None,
-    packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
-    py_modules=['easy_install'],
-    zip_safe=True,
     entry_points={
         "distutils.commands": [
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
@@ -152,28 +129,6 @@ def pypi_link(pkg_filename):
         "setuptools.installation":
             ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
-    classifiers=textwrap.dedent("""
-        Development Status :: 5 - Production/Stable
-        Intended Audience :: Developers
-        License :: OSI Approved :: MIT License
-        Operating System :: OS Independent
-        Programming Language :: Python :: 2
-        Programming Language :: Python :: 2.7
-        Programming Language :: Python :: 3
-        Programming Language :: Python :: 3.4
-        Programming Language :: Python :: 3.5
-        Programming Language :: Python :: 3.6
-        Programming Language :: Python :: 3.7
-        Topic :: Software Development :: Libraries :: Python Modules
-        Topic :: System :: Archiving :: Packaging
-        Topic :: System :: Systems Administration
-        Topic :: Utilities
-        """).strip().splitlines(),
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-    extras_require={
-        "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2016.9.26",
-    },
     dependency_links=[
         pypi_link(
             'certifi-2016.9.26.tar.gz#md5=baa81e951a29958563689d868ef1064d',
@@ -182,7 +137,6 @@ def pypi_link(pkg_filename):
             'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
         ),
     ],
-    scripts=[],
     setup_requires=[
     ] + wheel,
 )

From 17eb6b93f482385c5c4c9d2ab92fbc00fa49674e Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Tue, 14 May 2019 12:39:34 +0200
Subject: [PATCH 7456/8469] Added changelog fragment

---
 changelog.d/1697.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1697.change.rst

diff --git a/changelog.d/1697.change.rst b/changelog.d/1697.change.rst
new file mode 100644
index 0000000000..44818b3c14
--- /dev/null
+++ b/changelog.d/1697.change.rst
@@ -0,0 +1 @@
+Moved most of the constants from setup.py to setup.cfg

From 8f227af516c8c6b991c8e6c76f5bf4672f36c41e Mon Sep 17 00:00:00 2001
From: Emiel Wiedijk <me@aimileus.nl>
Date: Sat, 23 Feb 2019 20:51:09 +0100
Subject: [PATCH 7457/8469] Set sys.argv[0] in build scripts run by build_meta

Some setup.py scripts, use sys.argv[0] to locate the source directory of
a project. I added this to build_meta.__legacy__ since that is focused
on backwards compatibility with old scripts. However, @pganssle said
this behaviour should not be added to setuptools.build_meta. Fixes #1628
---
 setuptools/build_meta.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 10c4b528d9..eb9e815ef8 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -232,6 +232,12 @@ def run_setup(self, setup_script='setup.py'):
         if script_dir not in sys.path:
             sys.path.insert(0, script_dir)
 
+        # Some setup.py scripts (e.g. in pygame and numpy) use sys.argv[0] to
+        # get the directory of the source code. They expect it to refer to the
+        # setup.py script.
+        sys_argv_0 = sys.argv[0]
+        sys.argv[0] = setup_script
+
         try:
             super(_BuildMetaLegacyBackend,
                   self).run_setup(setup_script=setup_script)
@@ -242,6 +248,7 @@ def run_setup(self, setup_script='setup.py'):
             # the original path so that the path manipulation does not persist
             # within the hook after run_setup is called.
             sys.path[:] = sys_path
+            sys.argv[0] = sys_argv_0
 
 # The primary backend
 _BACKEND = _BuildMetaBackend()

From 0eff214d94ced853ded99c036c6d792c889e47ab Mon Sep 17 00:00:00 2001
From: Emiel Wiedijk <me@aimileus.nl>
Date: Sat, 23 Feb 2019 21:06:45 +0100
Subject: [PATCH 7458/8469] Add changelog entry

---
 changelog.d/1704.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1704.change.rst

diff --git a/changelog.d/1704.change.rst b/changelog.d/1704.change.rst
new file mode 100644
index 0000000000..62450835b9
--- /dev/null
+++ b/changelog.d/1704.change.rst
@@ -0,0 +1 @@
+Set sys.argv[0] in setup script run by build_meta.__legacy__

From b2701fb39252fc68b4f0b22c3a3b79039f4cc58e Mon Sep 17 00:00:00 2001
From: Emiel Wiedijk <me@aimileus.nl>
Date: Sat, 23 Feb 2019 22:19:43 +0100
Subject: [PATCH 7459/8469] Add tests

---
 setuptools/tests/test_build_meta.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index e1efe5617c..41a4078975 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -385,6 +385,28 @@ def run():
 
         assert expected == sorted(actual)
 
+    _sys_argv_0_passthrough = {
+        'setup.py': DALS("""
+            import os
+            import sys
+
+            __import__('setuptools').setup(
+                name='foo',
+                version='0.0.0',
+            )
+
+            sys_argv = os.path.abspath(sys.argv[0])
+            file_path = os.path.abspath('setup.py')
+            assert sys_argv == file_path
+            """)
+    }
+
+    def test_sys_argv_passthrough(self, tmpdir_cwd):
+        build_files(self._sys_argv_0_passthrough)
+        build_backend = self.get_build_backend()
+        with pytest.raises(AssertionError):
+            build_backend.build_sdist("temp")
+
 
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
     backend_name = 'setuptools.build_meta:__legacy__'
@@ -396,3 +418,9 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
 
         build_backend = self.get_build_backend()
         build_backend.build_sdist("temp")
+
+    def test_sys_argv_passthrough(self, tmpdir_cwd):
+        build_files(self._sys_argv_0_passthrough)
+
+        build_backend = self.get_build_backend()
+        build_backend.build_sdist("temp")

From d307b46c898fa5ee902344dab7ecc6e8ed595987 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 09:23:51 +0200
Subject: [PATCH 7460/8469] Moved keywords section into separate document,
 added link in index

---
 docs/index.txt      |   1 +
 docs/keywords.txt   | 172 +++++++++++++++++++++++++++++++++++++++++++
 docs/setuptools.txt | 173 --------------------------------------------
 3 files changed, 173 insertions(+), 173 deletions(-)
 create mode 100644 docs/keywords.txt

diff --git a/docs/index.txt b/docs/index.txt
index 13a46e74ef..60c4f331d4 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -17,6 +17,7 @@ Documentation content:
    :maxdepth: 2
 
    setuptools
+   keywords
    pkg_resources
    python3
    development
diff --git a/docs/keywords.txt b/docs/keywords.txt
new file mode 100644
index 0000000000..a1097aca3b
--- /dev/null
+++ b/docs/keywords.txt
@@ -0,0 +1,172 @@
+==============================
+Supported ``setup()`` Keywords
+==============================
+
+The following keyword arguments to ``setup()`` are supported by ``setuptools``.
+All of them are optional; you do not have to supply them unless you need the
+associated ``setuptools`` feature.
+
+``include_package_data``
+    If set to ``True``, this tells ``setuptools`` to automatically include any
+    data files it finds inside your package directories that are specified by
+    your ``MANIFEST.in`` file.  For more information, see the section below on
+    `Including Data Files`_.
+
+``exclude_package_data``
+    A dictionary mapping package names to lists of glob patterns that should
+    be *excluded* from your package directories.  You can use this to trim back
+    any excess files included by ``include_package_data``.  For a complete
+    description and examples, see the section below on `Including Data Files`_.
+
+``package_data``
+    A dictionary mapping package names to lists of glob patterns.  For a
+    complete description and examples, see the section below on `Including
+    Data Files`_.  You do not need to use this option if you are using
+    ``include_package_data``, unless you need to add e.g. files that are
+    generated by your setup script and build process.  (And are therefore not
+    in source control or are files that you don't want to include in your
+    source distribution.)
+
+``zip_safe``
+    A boolean (True or False) flag specifying whether the project can be
+    safely installed and run from a zip file.  If this argument is not
+    supplied, the ``bdist_egg`` command will have to analyze all of your
+    project's contents for possible problems each time it builds an egg.
+
+``install_requires``
+    A string or list of strings specifying what other distributions need to
+    be installed when this one is.  See the section below on `Declaring
+    Dependencies`_ for details and examples of the format of this argument.
+
+``entry_points``
+    A dictionary mapping entry point group names to strings or lists of strings
+    defining the entry points.  Entry points are used to support dynamic
+    discovery of services or plugins provided by a project.  See `Dynamic
+    Discovery of Services and Plugins`_ for details and examples of the format
+    of this argument.  In addition, this keyword is used to support `Automatic
+    Script Creation`_.
+
+``extras_require``
+    A dictionary mapping names of "extras" (optional features of your project)
+    to strings or lists of strings specifying what other distributions must be
+    installed to support those features.  See the section below on `Declaring
+    Dependencies`_ for details and examples of the format of this argument.
+
+``python_requires``
+    A string corresponding to a version specifier (as defined in PEP 440) for
+    the Python version, used to specify the Requires-Python defined in PEP 345.
+
+``setup_requires``
+    A string or list of strings specifying what other distributions need to
+    be present in order for the *setup script* to run.  ``setuptools`` will
+    attempt to obtain these (even going so far as to download them using
+    ``EasyInstall``) before processing the rest of the setup script or commands.
+    This argument is needed if you are using distutils extensions as part of
+    your build process; for example, extensions that process setup() arguments
+    and turn them into EGG-INFO metadata files.
+
+    (Note: projects listed in ``setup_requires`` will NOT be automatically
+    installed on the system where the setup script is being run.  They are
+    simply downloaded to the ./.eggs directory if they're not locally available
+    already.  If you want them to be installed, as well as being available
+    when the setup script is run, you should add them to ``install_requires``
+    **and** ``setup_requires``.)
+
+``dependency_links``
+    A list of strings naming URLs to be searched when satisfying dependencies.
+    These links will be used if needed to install packages specified by
+    ``setup_requires`` or ``tests_require``.  They will also be written into
+    the egg's metadata for use by tools like EasyInstall to use when installing
+    an ``.egg`` file.
+
+``namespace_packages``
+    A list of strings naming the project's "namespace packages".  A namespace
+    package is a package that may be split across multiple project
+    distributions.  For example, Zope 3's ``zope`` package is a namespace
+    package, because subpackages like ``zope.interface`` and ``zope.publisher``
+    may be distributed separately.  The egg runtime system can automatically
+    merge such subpackages into a single parent package at runtime, as long
+    as you declare them in each project that contains any subpackages of the
+    namespace package, and as long as the namespace package's ``__init__.py``
+    does not contain any code other than a namespace declaration.  See the
+    section below on `Namespace Packages`_ for more information.
+
+``test_suite``
+    A string naming a ``unittest.TestCase`` subclass (or a package or module
+    containing one or more of them, or a method of such a subclass), or naming
+    a function that can be called with no arguments and returns a
+    ``unittest.TestSuite``.  If the named suite is a module, and the module
+    has an ``additional_tests()`` function, it is called and the results are
+    added to the tests to be run.  If the named suite is a package, any
+    submodules and subpackages are recursively added to the overall test suite.
+
+    Specifying this argument enables use of the `test`_ command to run the
+    specified test suite, e.g. via ``setup.py test``.  See the section on the
+    `test`_ command below for more details.
+
+``tests_require``
+    If your project's tests need one or more additional packages besides those
+    needed to install it, you can use this option to specify them.  It should
+    be a string or list of strings specifying what other distributions need to
+    be present for the package's tests to run.  When you run the ``test``
+    command, ``setuptools`` will  attempt to obtain these (even going
+    so far as to download them using ``EasyInstall``).  Note that these
+    required projects will *not* be installed on the system where the tests
+    are run, but only downloaded to the project's setup directory if they're
+    not already installed locally.
+
+.. _test_loader:
+
+``test_loader``
+    If you would like to use a different way of finding tests to run than what
+    setuptools normally uses, you can specify a module name and class name in
+    this argument.  The named class must be instantiable with no arguments, and
+    its instances must support the ``loadTestsFromNames()`` method as defined
+    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
+    pass only one test "name" in the `names` argument: the value supplied for
+    the ``test_suite`` argument.  The loader you specify may interpret this
+    string in any way it likes, as there are no restrictions on what may be
+    contained in a ``test_suite`` string.
+
+    The module name and class name must be separated by a ``:``.  The default
+    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
+    you want to use the default ``unittest`` behavior, you can specify
+    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
+    will prevent automatic scanning of submodules and subpackages.
+
+    The module and class you specify here may be contained in another package,
+    as long as you use the ``tests_require`` option to ensure that the package
+    containing the loader class is available when the ``test`` command is run.
+
+``eager_resources``
+    A list of strings naming resources that should be extracted together, if
+    any of them is needed, or if any C extensions included in the project are
+    imported.  This argument is only useful if the project will be installed as
+    a zipfile, and there is a need to have all of the listed resources be
+    extracted to the filesystem *as a unit*.  Resources listed here
+    should be '/'-separated paths, relative to the source root, so to list a
+    resource ``foo.png`` in package ``bar.baz``, you would include the string
+    ``bar/baz/foo.png`` in this argument.
+
+    If you only need to obtain resources one at a time, or you don't have any C
+    extensions that access other files in the project (such as data files or
+    shared libraries), you probably do NOT need this argument and shouldn't
+    mess with it.  For more details on how this argument works, see the section
+    below on `Automatic Resource Extraction`_.
+
+``use_2to3``
+    Convert the source code from Python 2 to Python 3 with 2to3 during the
+    build process. See :doc:`python3` for more details.
+
+``convert_2to3_doctests``
+    List of doctest source files that need to be converted with 2to3.
+    See :doc:`python3` for more details.
+
+``use_2to3_fixers``
+    A list of modules to search for additional fixers to be used during
+    the 2to3 conversion. See :doc:`python3` for more details.
+
+``project_urls``
+    An arbitrary map of URL names to hyperlinks, allowing more extensible
+    documentation of where various resources can be found than the simple
+    ``url`` and ``download_url`` options provide.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 64b385cb1d..7c0535d036 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -239,179 +239,6 @@ pre- or post-release tags.  See the following sections for more details:
 * The `egg_info`_ command
 
 
-New and Changed ``setup()`` Keywords
-====================================
-
-The following keyword arguments to ``setup()`` are added or changed by
-``setuptools``.  All of them are optional; you do not have to supply them
-unless you need the associated ``setuptools`` feature.
-
-``include_package_data``
-    If set to ``True``, this tells ``setuptools`` to automatically include any
-    data files it finds inside your package directories that are specified by
-    your ``MANIFEST.in`` file.  For more information, see the section below on
-    `Including Data Files`_.
-
-``exclude_package_data``
-    A dictionary mapping package names to lists of glob patterns that should
-    be *excluded* from your package directories.  You can use this to trim back
-    any excess files included by ``include_package_data``.  For a complete
-    description and examples, see the section below on `Including Data Files`_.
-
-``package_data``
-    A dictionary mapping package names to lists of glob patterns.  For a
-    complete description and examples, see the section below on `Including
-    Data Files`_.  You do not need to use this option if you are using
-    ``include_package_data``, unless you need to add e.g. files that are
-    generated by your setup script and build process.  (And are therefore not
-    in source control or are files that you don't want to include in your
-    source distribution.)
-
-``zip_safe``
-    A boolean (True or False) flag specifying whether the project can be
-    safely installed and run from a zip file.  If this argument is not
-    supplied, the ``bdist_egg`` command will have to analyze all of your
-    project's contents for possible problems each time it builds an egg.
-
-``install_requires``
-    A string or list of strings specifying what other distributions need to
-    be installed when this one is.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``entry_points``
-    A dictionary mapping entry point group names to strings or lists of strings
-    defining the entry points.  Entry points are used to support dynamic
-    discovery of services or plugins provided by a project.  See `Dynamic
-    Discovery of Services and Plugins`_ for details and examples of the format
-    of this argument.  In addition, this keyword is used to support `Automatic
-    Script Creation`_.
-
-``extras_require``
-    A dictionary mapping names of "extras" (optional features of your project)
-    to strings or lists of strings specifying what other distributions must be
-    installed to support those features.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``python_requires``
-    A string corresponding to a version specifier (as defined in PEP 440) for
-    the Python version, used to specify the Requires-Python defined in PEP 345.
-
-``setup_requires``
-    A string or list of strings specifying what other distributions need to
-    be present in order for the *setup script* to run.  ``setuptools`` will
-    attempt to obtain these (even going so far as to download them using
-    ``EasyInstall``) before processing the rest of the setup script or commands.
-    This argument is needed if you are using distutils extensions as part of
-    your build process; for example, extensions that process setup() arguments
-    and turn them into EGG-INFO metadata files.
-
-    (Note: projects listed in ``setup_requires`` will NOT be automatically
-    installed on the system where the setup script is being run.  They are
-    simply downloaded to the ./.eggs directory if they're not locally available
-    already.  If you want them to be installed, as well as being available
-    when the setup script is run, you should add them to ``install_requires``
-    **and** ``setup_requires``.)
-
-``dependency_links``
-    A list of strings naming URLs to be searched when satisfying dependencies.
-    These links will be used if needed to install packages specified by
-    ``setup_requires`` or ``tests_require``.  They will also be written into
-    the egg's metadata for use by tools like EasyInstall to use when installing
-    an ``.egg`` file.
-
-``namespace_packages``
-    A list of strings naming the project's "namespace packages".  A namespace
-    package is a package that may be split across multiple project
-    distributions.  For example, Zope 3's ``zope`` package is a namespace
-    package, because subpackages like ``zope.interface`` and ``zope.publisher``
-    may be distributed separately.  The egg runtime system can automatically
-    merge such subpackages into a single parent package at runtime, as long
-    as you declare them in each project that contains any subpackages of the
-    namespace package, and as long as the namespace package's ``__init__.py``
-    does not contain any code other than a namespace declaration.  See the
-    section below on `Namespace Packages`_ for more information.
-
-``test_suite``
-    A string naming a ``unittest.TestCase`` subclass (or a package or module
-    containing one or more of them, or a method of such a subclass), or naming
-    a function that can be called with no arguments and returns a
-    ``unittest.TestSuite``.  If the named suite is a module, and the module
-    has an ``additional_tests()`` function, it is called and the results are
-    added to the tests to be run.  If the named suite is a package, any
-    submodules and subpackages are recursively added to the overall test suite.
-
-    Specifying this argument enables use of the `test`_ command to run the
-    specified test suite, e.g. via ``setup.py test``.  See the section on the
-    `test`_ command below for more details.
-
-``tests_require``
-    If your project's tests need one or more additional packages besides those
-    needed to install it, you can use this option to specify them.  It should
-    be a string or list of strings specifying what other distributions need to
-    be present for the package's tests to run.  When you run the ``test``
-    command, ``setuptools`` will  attempt to obtain these (even going
-    so far as to download them using ``EasyInstall``).  Note that these
-    required projects will *not* be installed on the system where the tests
-    are run, but only downloaded to the project's setup directory if they're
-    not already installed locally.
-
-.. _test_loader:
-
-``test_loader``
-    If you would like to use a different way of finding tests to run than what
-    setuptools normally uses, you can specify a module name and class name in
-    this argument.  The named class must be instantiable with no arguments, and
-    its instances must support the ``loadTestsFromNames()`` method as defined
-    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
-    pass only one test "name" in the `names` argument: the value supplied for
-    the ``test_suite`` argument.  The loader you specify may interpret this
-    string in any way it likes, as there are no restrictions on what may be
-    contained in a ``test_suite`` string.
-
-    The module name and class name must be separated by a ``:``.  The default
-    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
-    you want to use the default ``unittest`` behavior, you can specify
-    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
-    will prevent automatic scanning of submodules and subpackages.
-
-    The module and class you specify here may be contained in another package,
-    as long as you use the ``tests_require`` option to ensure that the package
-    containing the loader class is available when the ``test`` command is run.
-
-``eager_resources``
-    A list of strings naming resources that should be extracted together, if
-    any of them is needed, or if any C extensions included in the project are
-    imported.  This argument is only useful if the project will be installed as
-    a zipfile, and there is a need to have all of the listed resources be
-    extracted to the filesystem *as a unit*.  Resources listed here
-    should be '/'-separated paths, relative to the source root, so to list a
-    resource ``foo.png`` in package ``bar.baz``, you would include the string
-    ``bar/baz/foo.png`` in this argument.
-
-    If you only need to obtain resources one at a time, or you don't have any C
-    extensions that access other files in the project (such as data files or
-    shared libraries), you probably do NOT need this argument and shouldn't
-    mess with it.  For more details on how this argument works, see the section
-    below on `Automatic Resource Extraction`_.
-
-``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`python3` for more details.
-
-``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3.
-    See :doc:`python3` for more details.
-
-``use_2to3_fixers``
-    A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`python3` for more details.
-
-``project_urls``
-    An arbitrary map of URL names to hyperlinks, allowing more extensible
-    documentation of where various resources can be found than the simple
-    ``url`` and ``download_url`` options provide.
-
-
 Using ``find_packages()``
 -------------------------
 

From 46a73d96faedee345834f29a7ac218de64519da2 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 10:29:11 +0200
Subject: [PATCH 7461/8469] Fixed broken implicit links

---
 docs/keywords.txt   | 34 +++++++++++++++++-----------------
 docs/setuptools.txt | 10 +++++++++-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index a1097aca3b..6a8fc2f2f8 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -9,19 +9,19 @@ associated ``setuptools`` feature.
 ``include_package_data``
     If set to ``True``, this tells ``setuptools`` to automatically include any
     data files it finds inside your package directories that are specified by
-    your ``MANIFEST.in`` file.  For more information, see the section below on
-    `Including Data Files`_.
+    your ``MANIFEST.in`` file.  For more information, see the section on
+    :ref:`Including Data Files`.
 
 ``exclude_package_data``
     A dictionary mapping package names to lists of glob patterns that should
     be *excluded* from your package directories.  You can use this to trim back
     any excess files included by ``include_package_data``.  For a complete
-    description and examples, see the section below on `Including Data Files`_.
+    description and examples, see the section on :ref:`Including Data Files`.
 
 ``package_data``
     A dictionary mapping package names to lists of glob patterns.  For a
-    complete description and examples, see the section below on `Including
-    Data Files`_.  You do not need to use this option if you are using
+    complete description and examples, see the section on :ref:`Including Data
+    Files`.  You do not need to use this option if you are using
     ``include_package_data``, unless you need to add e.g. files that are
     generated by your setup script and build process.  (And are therefore not
     in source control or are files that you don't want to include in your
@@ -35,22 +35,22 @@ associated ``setuptools`` feature.
 
 ``install_requires``
     A string or list of strings specifying what other distributions need to
-    be installed when this one is.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
+    be installed when this one is.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
 
 ``entry_points``
     A dictionary mapping entry point group names to strings or lists of strings
     defining the entry points.  Entry points are used to support dynamic
-    discovery of services or plugins provided by a project.  See `Dynamic
-    Discovery of Services and Plugins`_ for details and examples of the format
-    of this argument.  In addition, this keyword is used to support `Automatic
-    Script Creation`_.
+    discovery of services or plugins provided by a project.  See :ref:`Dynamic
+    Discovery of Services and Plugins` for details and examples of the format
+    of this argument.  In addition, this keyword is used to support
+    :ref:`Automatic Script Creation`.
 
 ``extras_require``
     A dictionary mapping names of "extras" (optional features of your project)
     to strings or lists of strings specifying what other distributions must be
-    installed to support those features.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
+    installed to support those features.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
 
 ``python_requires``
     A string corresponding to a version specifier (as defined in PEP 440) for
@@ -89,7 +89,7 @@ associated ``setuptools`` feature.
     as you declare them in each project that contains any subpackages of the
     namespace package, and as long as the namespace package's ``__init__.py``
     does not contain any code other than a namespace declaration.  See the
-    section below on `Namespace Packages`_ for more information.
+    section on :ref:`Namespace Packages` for more information.
 
 ``test_suite``
     A string naming a ``unittest.TestCase`` subclass (or a package or module
@@ -100,9 +100,9 @@ associated ``setuptools`` feature.
     added to the tests to be run.  If the named suite is a package, any
     submodules and subpackages are recursively added to the overall test suite.
 
-    Specifying this argument enables use of the `test`_ command to run the
+    Specifying this argument enables use of the :ref:`test` command to run the
     specified test suite, e.g. via ``setup.py test``.  See the section on the
-    `test`_ command below for more details.
+    :ref:`test` command below for more details.
 
 ``tests_require``
     If your project's tests need one or more additional packages besides those
@@ -152,7 +152,7 @@ associated ``setuptools`` feature.
     extensions that access other files in the project (such as data files or
     shared libraries), you probably do NOT need this argument and shouldn't
     mess with it.  For more details on how this argument works, see the section
-    below on `Automatic Resource Extraction`_.
+    below on :ref:`Automatic Resource Extraction`.
 
 ``use_2to3``
     Convert the source code from Python 2 to Python 3 with 2to3 during the
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7c0535d036..e07ac29682 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -345,6 +345,8 @@ With this layout, the package directory is specified as ``src``, as such::
 
 .. _PEP 420: https://www.python.org/dev/peps/pep-0420/
 
+.. _Automatic Script Creation:
+
 Automatic Script Creation
 =========================
 
@@ -432,6 +434,7 @@ and version is in use.  The header script will check this and exit with an
 error if the ``.egg`` file has been renamed or is invoked via a symlink that
 changes its base name.
 
+.. _Declaring Dependencies:
 
 Declaring Dependencies
 ======================
@@ -685,6 +688,8 @@ detailed in `PEP 508`_.
 
 .. _PEP 508: https://www.python.org/dev/peps/pep-0508/
 
+.. _Including Data Files:
+
 Including Data Files
 ====================
 
@@ -860,6 +865,7 @@ no supported facility to reliably retrieve these resources.
 Instead, the PyPA recommends that any data files you wish to be accessible at
 run time be included in the package.
 
+.. _Automatic Resource Extraction:
 
 Automatic Resource Extraction
 -----------------------------
@@ -905,6 +911,8 @@ Extensible Applications and Frameworks
 
 .. _Entry Points:
 
+.. _Dynamic Discovery of Services and Plugins:
+
 Dynamic Discovery of Services and Plugins
 -----------------------------------------
 
@@ -1977,7 +1985,7 @@ result (which must be a ``unittest.TestSuite``) is added to the tests to be
 run.  If the named suite is a package, any submodules and subpackages are
 recursively added to the overall test suite.  (Note: if your project specifies
 a ``test_loader``, the rules for processing the chosen ``test_suite`` may
-differ; see the `test_loader`_ documentation for more details.)
+differ; see the :ref:`test_loader <test_loader>` documentation for more details.)
 
 Note that many test systems including ``doctest`` support wrapping their
 non-``unittest`` tests in ``TestSuite`` objects.  So, if you are using a test

From d2de0b92773c4304d6264258228a008499ccfd21 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 11:03:51 +0200
Subject: [PATCH 7462/8469] Transcibed all keywords from
 https://docs.python.org/3/distutils/apiref.html#distutils.core.setup

---
 docs/keywords.txt | 89 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 6a8fc2f2f8..877a4caffe 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -3,9 +3,96 @@ Supported ``setup()`` Keywords
 ==============================
 
 The following keyword arguments to ``setup()`` are supported by ``setuptools``.
-All of them are optional; you do not have to supply them unless you need the
+Some of them are optional; you do not have to supply them unless you need the
 associated ``setuptools`` feature.
 
+``name``
+    A string specifying the name of the package.
+
+``version``
+    A string specifying the version number of the package.
+
+``description``
+    A string describing the package in a single line.
+
+``long_description``
+    A string providing a longer description of the package.
+
+``author``
+    A string specifying the author of the package.
+
+``author_email``
+    A string specifying the email address of the package author.
+
+``maintainer``
+    A string specifying the name of the current maintainer, if different from
+    the author. Note that if the maintainer is provided, setuptools will use it
+    as the author in ``PKG-INFO``.
+
+``maintainer_email``
+    A string specifying the email address of the current maintainer, if
+    different from the author.
+
+``url``
+    A string specifying the URL for the package homepage.
+
+``download_url``
+    A string specifying the URL to download the package.
+
+``packages``
+    A list of strings specifying the packages that setuptools will manipulate.
+
+``py_modules``
+    A list of strings specifying the modules that setuptools will manipulate.
+
+``scripts``
+    A list of strings specifying the standalone script files to be built and
+    installed.
+
+``ext_modules``
+    A list of instances of ``setuptools.Extension`` providing the list of
+    Python extensions to be built.
+
+``classifiers``
+    A list of strings describing the categories for the package.
+
+``distclass``
+    A subclass of ``Distribution`` to use.
+
+``script_name``
+    A string specifying the name of the setup.py script -- defaults to
+    ``sys.argv[0]``
+
+``script_args``
+    A list of strings defining the arguments to supply to the setup script.
+
+``options``
+    A dictionary providing the default options for the setup script.
+
+``license``
+    A string specifying the license of the package.
+
+``keywords``
+    A list of strings or a comma-separated string providing descriptive
+    meta-data. See: `PEP 0314`_.
+
+.. _PEP 0314: https://www.python.org/dev/peps/pep-0314/
+
+``platforms``
+    A list of strings or comma-separated string.
+
+``cmdclass``
+    A dictionary providing a mapping of command names to ``Command``
+    subclasses.
+
+``data_files``
+    A list of strings specifying the data files to install.
+
+``package_dir``
+    A dictionary providing a mapping of package to directory names.
+
+.. Below are setuptools keywords, above are distutils
+
 ``include_package_data``
     If set to ``True``, this tells ``setuptools`` to automatically include any
     data files it finds inside your package directories that are specified by

From 734e5106be681eec7f1717f9feb4836b025dbe97 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 11:07:58 +0200
Subject: [PATCH 7463/8469] Added changelog fragment

---
 changelog.d/1700.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1700.change.rst

diff --git a/changelog.d/1700.change.rst b/changelog.d/1700.change.rst
new file mode 100644
index 0000000000..f66046a2ca
--- /dev/null
+++ b/changelog.d/1700.change.rst
@@ -0,0 +1 @@
+Document all supported keywords by migrating the ones from distutils.

From 880ff4a3579bac7839f8f038085381ae14155f31 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 12:46:50 +0200
Subject: [PATCH 7464/8469] Force metadata-version = 1.2 when project urls are
 present.

Closes: #1756
---
 setuptools/dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 9a165de0dd..ea6411b178 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -54,7 +54,8 @@ def get_metadata_version(self):
             mv = StrictVersion('2.1')
         elif (self.maintainer is not None or
               self.maintainer_email is not None or
-              getattr(self, 'python_requires', None) is not None):
+              getattr(self, 'python_requires', None) is not None or
+              self.project_urls):
             mv = StrictVersion('1.2')
         elif (self.provides or self.requires or self.obsoletes or
                 self.classifiers or self.download_url):

From a64ddf0d2f2bcd6e9843fb55c94fba922f315722 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 13:48:15 +0200
Subject: [PATCH 7465/8469] Added test for metadata-version 1.2

---
 setuptools/tests/test_egg_info.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index db9c387335..316eb2edde 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -622,6 +622,7 @@ def test_project_urls(self, tmpdir_cwd, env):
         assert expected_line in pkg_info_lines
         expected_line = 'Project-URL: Link Two, https://example.com/two/'
         assert expected_line in pkg_info_lines
+        assert 'Metadata-Version: 1.2' in pkg_info_lines
 
     def test_python_requires_egg_info(self, tmpdir_cwd, env):
         self._setup_script_with_requires(

From a7fcfcdf8e224f42aa83c32363df3a39100ca69c Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 14:18:59 +0200
Subject: [PATCH 7466/8469] Added warnings for data_files, setup_requires and
 dependency_links

---
 docs/keywords.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 877a4caffe..81b8034476 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -86,6 +86,11 @@ associated ``setuptools`` feature.
     subclasses.
 
 ``data_files``
+
+    .. warning::
+        ``data_files`` is deprecated. It does not work with wheels, so it
+        should be avoided.
+
     A list of strings specifying the data files to install.
 
 ``package_dir``
@@ -144,6 +149,10 @@ associated ``setuptools`` feature.
     the Python version, used to specify the Requires-Python defined in PEP 345.
 
 ``setup_requires``
+
+    .. warning::
+        Using ``setup_requires`` is discouraged in favour for `PEP-518`_
+
     A string or list of strings specifying what other distributions need to
     be present in order for the *setup script* to run.  ``setuptools`` will
     attempt to obtain these (even going so far as to download them using
@@ -159,7 +168,13 @@ associated ``setuptools`` feature.
     when the setup script is run, you should add them to ``install_requires``
     **and** ``setup_requires``.)
 
+.. _PEP-518: http://www.python.org/dev/peps/pep-0518/
+
 ``dependency_links``
+
+    .. warning::
+        ``dependency_links`` is deprecated. It is not supported anymore by pip.
+
     A list of strings naming URLs to be searched when satisfying dependencies.
     These links will be used if needed to install packages specified by
     ``setup_requires`` or ``tests_require``.  They will also be written into

From 13c1825df412b6ed63ff05594af0e4dde5ef0455 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 14:19:25 +0200
Subject: [PATCH 7467/8469] Maintain old header and link to new keywords
 document

---
 docs/keywords.txt   | 2 ++
 docs/setuptools.txt | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 81b8034476..2666ba8590 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -1,3 +1,5 @@
+.. _Supported setup() Keywords:
+
 ==============================
 Supported ``setup()`` Keywords
 ==============================
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e07ac29682..4ddc2b7abe 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -239,6 +239,13 @@ pre- or post-release tags.  See the following sections for more details:
 * The `egg_info`_ command
 
 
+New and Changed ``setup()`` Keywords
+====================================
+
+The keywords supported by setuptools can be found in :ref:`Supported setup()
+Keywords`
+
+
 Using ``find_packages()``
 -------------------------
 

From b62d07c2b2ca80256b94e0df32ecdb93e98ac258 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Thu, 16 May 2019 14:27:30 +0200
Subject: [PATCH 7468/8469] Put deprecation in section rather then removing it
 (updated changelog as well)

---
 changelog.d/1557.change |  2 +-
 docs/setuptools.txt     | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/changelog.d/1557.change b/changelog.d/1557.change
index 77d2e3b4f4..9f8af4a6cc 100644
--- a/changelog.d/1557.change
+++ b/changelog.d/1557.change
@@ -1 +1 @@
-Deprecated eggsecutable scripts and removed related docs.
+Deprecated eggsecutable scripts and updated docs.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index f44813d17c..e4e56fb023 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -569,6 +569,45 @@ on "entry points" in general, see the section below on `Dynamic Discovery of
 Services and Plugins`_.
 
 
+"Eggsecutable" Scripts
+----------------------
+
+.. warning:: Eggsecutable Scripts are deprecated.
+
+Occasionally, there are situations where it's desirable to make an ``.egg``
+file directly executable.  You can do this by including an entry point such
+as the following::
+
+    setup(
+        # other arguments here...
+        entry_points={
+            'setuptools.installation': [
+                'eggsecutable = my_package.some_module:main_func',
+            ]
+        }
+    )
+
+Any eggs built from the above setup script will include a short executable
+prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
+The prelude can be run on Unix-like platforms (including Mac and Linux) by
+invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
+``.egg`` file.  For the executable prelude to run, the appropriate version of
+Python must be available via the ``PATH`` environment variable, under its
+"long" name.  That is, if the egg is built for Python 2.3, there must be a
+``python2.3`` executable present in a directory on ``PATH``.
+
+This feature is primarily intended to support ez_setup the installation of
+setuptools itself on non-Windows platforms, but may also be useful for other
+projects as well.
+
+IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
+invoked via symlinks.  They *must* be invoked using their original filename, in
+order to ensure that, once running, ``pkg_resources`` will know what project
+and version is in use.  The header script will check this and exit with an
+error if the ``.egg`` file has been renamed or is invoked via a symlink that
+changes its base name.
+
+
 Declaring Dependencies
 ======================
 

From 5e8927a17f4e1a5b7e97cbe42639dbcba21acb69 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Fri, 17 May 2019 08:22:55 +0200
Subject: [PATCH 7469/8469] Added changelog entry.

---
 changelog.d/1756.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1756.change.rst

diff --git a/changelog.d/1756.change.rst b/changelog.d/1756.change.rst
new file mode 100644
index 0000000000..5c908d3529
--- /dev/null
+++ b/changelog.d/1756.change.rst
@@ -0,0 +1 @@
+Forse metadata-version >= 1.2. when project urls are present.

From e8db26a129378279833620da952a1ecc6cef937b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 17 May 2019 16:17:33 -0400
Subject: [PATCH 7470/8469] Add support for automatic publishing of release
 notes

---
 .travis.yml | 6 ++++++
 tox.ini     | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 tox.ini

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..13f58071af
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+jobs:
+  include:
+  - stage: deploy
+    env:
+    # TIDELIFT_TOKEN
+    - secure: ...
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..8f419798dc
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,7 @@
+[testenv:release]
+passenv =
+	TIDELIFT_TOKEN
+deps =
+	jaraco.tidelift
+commands =
+	python -m jaraco.tidelift.publish-release-notes

From 534678f19edd76e6f93ad31900d9a92d00ef25fd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 17 May 2019 16:37:45 -0400
Subject: [PATCH 7471/8469] Use technique for environment passing matching that
 found in jaraco/skeleton

---
 .travis.yml | 1 +
 tox.ini     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13f58071af..a9afa23f5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,4 @@ jobs:
     env:
     # TIDELIFT_TOKEN
     - secure: ...
+    TOX_TESTENV_PASSENV="TIDELIFT_TOKEN"
diff --git a/tox.ini b/tox.ini
index 8f419798dc..7f9b6c1eb4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,4 @@
 [testenv:release]
-passenv =
-	TIDELIFT_TOKEN
 deps =
 	jaraco.tidelift
 commands =

From cc9e041823a6a06cabeaa27949abc4e2ff08aee0 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 12:37:06 +0200
Subject: [PATCH 7472/8469] Added unused requires, obsolete and requires for
 completenes

---
 docs/keywords.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 2666ba8590..ff757231ee 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -98,6 +98,23 @@ associated ``setuptools`` feature.
 ``package_dir``
     A dictionary providing a mapping of package to directory names.
 
+``requires``
+
+   .. warning::
+      ``requires`` is superseded by ``install_requires`` and should not be used
+      anymore.
+
+``obsoletes``
+
+   .. warning::
+      ``obsoletes`` is not supported by ``pip`` and should not be used.
+
+``requires``
+
+   .. warning::
+      ``requires`` is not supported by ``pip`` and should not be used.
+
+
 .. Below are setuptools keywords, above are distutils
 
 ``include_package_data``

From 0b323b5e158bfd284cdd6c99b130cfc05eb05187 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 12:37:48 +0200
Subject: [PATCH 7473/8469] Added ext_package

---
 docs/keywords.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index ff757231ee..4d7efd3823 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -51,6 +51,10 @@ associated ``setuptools`` feature.
     A list of strings specifying the standalone script files to be built and
     installed.
 
+``ext_package``
+    A string specifying the base package name for the extensions provided by
+    this package.
+
 ``ext_modules``
     A list of instances of ``setuptools.Extension`` providing the list of
     Python extensions to be built.

From e21b663802f7ca97c1cd4c2866338c0129e9a502 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 12:37:58 +0200
Subject: [PATCH 7474/8469] added use_2to3_exclude_fixers

---
 docs/keywords.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 4d7efd3823..7881e28543 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -291,6 +291,9 @@ associated ``setuptools`` feature.
     A list of modules to search for additional fixers to be used during
     the 2to3 conversion. See :doc:`python3` for more details.
 
+``use_2to3_exclude_fixers``
+    List of fixer names to be skipped.
+
 ``project_urls``
     An arbitrary map of URL names to hyperlinks, allowing more extensible
     documentation of where various resources can be found than the simple

From 4521d88caac6a68a1baf55c401589f8ce7b04243 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 12:38:09 +0200
Subject: [PATCH 7475/8469] added long_description_content_type

---
 docs/keywords.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 7881e28543..5086bcf14d 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -20,6 +20,10 @@ associated ``setuptools`` feature.
 ``long_description``
     A string providing a longer description of the package.
 
+``long_description_content_type``
+    A string specifying the content type is used for the ``long_description``
+    (e.g. ``text/markdown``)
+
 ``author``
     A string specifying the author of the package.
 

From 4786eb4053e1eac5cbf869b290a90436a9cfe347 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 12:59:56 +0200
Subject: [PATCH 7476/8469] Made keywords a subpage (via include directive)
 maintaining the old structure

---
 docs/index.txt      |  1 -
 docs/keywords.txt   | 10 ----------
 docs/setuptools.txt |  7 +++++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 60c4f331d4..13a46e74ef 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -17,7 +17,6 @@ Documentation content:
    :maxdepth: 2
 
    setuptools
-   keywords
    pkg_resources
    python3
    development
diff --git a/docs/keywords.txt b/docs/keywords.txt
index 5086bcf14d..cbaf7ae908 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -1,13 +1,3 @@
-.. _Supported setup() Keywords:
-
-==============================
-Supported ``setup()`` Keywords
-==============================
-
-The following keyword arguments to ``setup()`` are supported by ``setuptools``.
-Some of them are optional; you do not have to supply them unless you need the
-associated ``setuptools`` feature.
-
 ``name``
     A string specifying the name of the package.
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 4ddc2b7abe..ae85b8f57d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -242,8 +242,11 @@ pre- or post-release tags.  See the following sections for more details:
 New and Changed ``setup()`` Keywords
 ====================================
 
-The keywords supported by setuptools can be found in :ref:`Supported setup()
-Keywords`
+The following keyword arguments to ``setup()`` are supported by ``setuptools``.
+Some of them are optional; you do not have to supply them unless you need the
+associated ``setuptools`` feature.
+
+.. include:: keywords.txt
 
 
 Using ``find_packages()``

From 345f7e6fbc3118f3fd6c97a307dbbd9cda30a84c Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 13:05:39 +0200
Subject: [PATCH 7477/8469] s/requires/provides/

---
 docs/keywords.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index cbaf7ae908..488ed20bfb 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -107,10 +107,10 @@
    .. warning::
       ``obsoletes`` is not supported by ``pip`` and should not be used.
 
-``requires``
+``provides``
 
    .. warning::
-      ``requires`` is not supported by ``pip`` and should not be used.
+      ``provides`` is not supported by ``pip`` and should not be used.
 
 
 .. Below are setuptools keywords, above are distutils

From 73dbe0ec07e3738bc592e92def65209b45a14dfb Mon Sep 17 00:00:00 2001
From: Bastian Venthur <mail@venthur.de>
Date: Sat, 18 May 2019 13:06:53 +0200
Subject: [PATCH 7478/8469] s/favour/favor/

Co-Authored-By: Benoit Pierre <benoit.pierre@gmail.com>
---
 docs/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index 488ed20bfb..db50163a9b 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -168,7 +168,7 @@
 ``setup_requires``
 
     .. warning::
-        Using ``setup_requires`` is discouraged in favour for `PEP-518`_
+        Using ``setup_requires`` is discouraged in favor of `PEP-518`_
 
     A string or list of strings specifying what other distributions need to
     be present in order for the *setup script* to run.  ``setuptools`` will

From 6a3674a18d22dbea4d6b513b8e8a7ac28ada5eba Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sat, 18 May 2019 22:37:49 +0200
Subject: [PATCH 7479/8469] Added meat to obsoletes and provides, removed that
 they should not be used.

---
 docs/keywords.txt | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/docs/keywords.txt b/docs/keywords.txt
index db50163a9b..d56014e01f 100644
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -105,13 +105,49 @@
 ``obsoletes``
 
    .. warning::
-      ``obsoletes`` is not supported by ``pip`` and should not be used.
+      ``obsoletes`` is currently ignored by ``pip``.
+
+   List of strings describing packages which this package renders obsolete,
+   meaning that the two projects should not be installed at the same time.
+
+   Version declarations can be supplied. Version numbers must be in the format
+   specified in Version specifiers (e.g. ``foo (<3.0)``).
+
+   This field may be followed by an environment marker after a semicolon (e.g.
+   ``foo; os_name == "posix"``)
+
+   The most common use of this field will be in case a project name changes,
+   e.g. Gorgon 2.3 gets subsumed into Torqued Python 1.0. When you install
+   Torqued Python, the Gorgon distribution should be removed.
 
 ``provides``
 
    .. warning::
-      ``provides`` is not supported by ``pip`` and should not be used.
-
+      ``provides`` is currently ignored by ``pip``.
+
+   List of strings describing package- and virtual package names contained
+   within this package.
+
+   A package may provide additional names, e.g. to indicate that multiple
+   projects have been bundled together. For instance, source distributions of
+   the ZODB project have historically included the transaction project, which
+   is now available as a separate distribution. Installing such a source
+   distribution satisfies requirements for both ZODB and transaction.
+
+   A package may also provide a “virtual� project name, which does not
+   correspond to any separately-distributed project: such a name might be used
+   to indicate an abstract capability which could be supplied by one of
+   multiple projects. E.g., multiple projects might supply RDBMS bindings for
+   use by a given ORM: each project might declare that it provides
+   ORM-bindings, allowing other projects to depend only on having at most one
+   of them installed.
+
+   A version declaration may be supplied and must follow the rules described in
+   Version specifiers. The distribution’s version number will be implied if
+   none is specified (e.g. ``foo (<3.0)``).
+
+   Each package may be followed by an environment marker after a semicolon
+   (e.g. ``foo; os_name == "posix"``).
 
 .. Below are setuptools keywords, above are distutils
 

From 9d9a6d30b814bfdd7265e67ae9eea2f6e2db1657 Mon Sep 17 00:00:00 2001
From: "E. M. Bray" <erik.bray@lri.fr>
Date: Fri, 24 May 2019 17:33:47 +0200
Subject: [PATCH 7480/8469] bpo-21536: On Cygwin, C extensions must be linked
 with libpython (GH-13549)

It is also possible to link against a library or executable with a
statically linked libpython, but not both with the same DLL.  In fact
building a statically linked python is currently broken on Cygwin
for other (related) reasons.

The same problem applies to other POSIX-like layers over Windows
(MinGW, MSYS) but Python's build system does not seem to attempt
to support those platforms at the moment.
---
 command/build_ext.py | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index c3b9602461..2d7cdf063f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -714,20 +714,32 @@ def get_libraries(self, ext):
                 # don't extend ext.libraries, it may be shared with other
                 # extensions, it is a reference to the original list
                 return ext.libraries + [pythonlib]
-        # On Android only the main executable and LD_PRELOADs are considered
-        # to be RTLD_GLOBAL, all the dependencies of the main executable
-        # remain RTLD_LOCAL and so the shared libraries must be linked with
-        # libpython when python is built with a shared python library (issue
-        # bpo-21536).
         else:
+            # On Android only the main executable and LD_PRELOADs are considered
+            # to be RTLD_GLOBAL, all the dependencies of the main executable
+            # remain RTLD_LOCAL and so the shared libraries must be linked with
+            # libpython when python is built with a shared python library (issue
+            # bpo-21536).
+            # On Cygwin (and if required, other POSIX-like platforms based on
+            # Windows like MinGW) it is simply necessary that all symbols in
+            # shared libraries are resolved at link time.
             from distutils.sysconfig import get_config_var
+            link_libpython = False
             if get_config_var('Py_ENABLE_SHARED'):
-                # Either a native build on an Android device or the
-                # cross-compilation of Python.
-                if (hasattr(sys, 'getandroidapilevel') or
-                        ('_PYTHON_HOST_PLATFORM' in os.environ and
-                         get_config_var('ANDROID_API_LEVEL') != 0)):
-                    ldversion = get_config_var('LDVERSION')
-                    return ext.libraries + ['python' + ldversion]
+                # A native build on an Android device or on Cygwin
+                if hasattr(sys, 'getandroidapilevel'):
+                    link_libpython = True
+                elif sys.platform == 'cygwin':
+                    link_libpython = True
+                elif '_PYTHON_HOST_PLATFORM' in os.environ:
+                    # We are cross-compiling for one of the relevant platforms
+                    if get_config_var('ANDROID_API_LEVEL') != 0:
+                        link_libpython = True
+                    elif get_config_var('MACHDEP') == 'cygwin':
+                        link_libpython = True
+
+            if link_libpython:
+                ldversion = get_config_var('LDVERSION')
+                return ext.libraries + ['python' + ldversion]
 
         return ext.libraries

From ca1f766ee16c3a504082a95f2afd5a58fcae7d47 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 28 May 2019 21:38:56 +0200
Subject: [PATCH 7481/8469] tests: unpin pytest

The new releases for pytest-fixture-config and pytest-shutil are
compatible with pytest>=4.0.
---
 tests/requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index f944df2740..cb3e672696 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,8 +3,7 @@ pytest-flake8; python_version!="3.4"
 pytest-flake8<=1.0.0; python_version=="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
-# pytest pinned to <4 due to #1638
-pytest>=3.7,<4
+pytest>=3.7
 wheel
 coverage>=4.5.1
 pytest-cov>=2.5.1

From 59dd72d9df7a88d692637a8c488aa884c182e557 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Sat, 1 Jun 2019 20:33:32 +0200
Subject: [PATCH 7482/8469] Use license classifiers rather than the license
 field.

The license field has a 'free' format, while the classifiers are unique
identifiers, similar to SPDX identifiers. In the documentation, we
should therefore showcase the use of classifiers.
---
 changelog.d/1776.doc.rst | 1 +
 docs/setuptools.txt      | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/1776.doc.rst

diff --git a/changelog.d/1776.doc.rst b/changelog.d/1776.doc.rst
new file mode 100644
index 0000000000..d4f1dbca56
--- /dev/null
+++ b/changelog.d/1776.doc.rst
@@ -0,0 +1 @@
+Use license classifiers rather than the license field.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 64b385cb1d..2e7fe3bd93 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -136,16 +136,18 @@ dependencies, and perhaps some data files and scripts::
         author="Me",
         author_email="me@example.com",
         description="This is an Example Package",
-        license="PSF",
         keywords="hello world example examples",
         url="http://example.com/HelloWorld/",   # project home page, if any
         project_urls={
             "Bug Tracker": "https://bugs.example.com/HelloWorld/",
             "Documentation": "https://docs.example.com/HelloWorld/",
             "Source Code": "https://code.example.com/HelloWorld/",
-        }
+        },
+        classifiers=[
+            'License :: OSI Approved :: Python Software Foundation License'
+        ]
 
-        # could also include long_description, download_url, classifiers, etc.
+        # could also include long_description, download_url, etc.
     )
 
 In the sections that follow, we'll explain what most of these ``setup()``
@@ -2234,6 +2236,7 @@ boilerplate code in some cases.
     license = BSD 3-Clause License
     classifiers =
         Framework :: Django
+        License :: OSI Approved :: BSD License
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.5
 

From b30cb4676572d51a26f3b74a40035df97f8a41c7 Mon Sep 17 00:00:00 2001
From: Xtreak <tir.karthi@gmail.com>
Date: Mon, 3 Jun 2019 04:42:33 +0530
Subject: [PATCH 7483/8469] Fix typos in docs and docstrings (GH-13745)

---
 ccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index b71d1d39bc..1a411ed111 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -545,7 +545,7 @@ def compile(self, sources, output_dir=None, macros=None,
         'extra_preargs' and 'extra_postargs' are implementation- dependent.
         On platforms that have the notion of a command-line (e.g. Unix,
         DOS/Windows), they are most likely lists of strings: extra
-        command-line arguments to prepand/append to the compiler command
+        command-line arguments to prepend/append to the compiler command
         line.  On other platforms, consult the implementation class
         documentation.  In any event, they are intended as an escape hatch
         for those occasions when the abstract compiler framework doesn't

From d048c412f43c2b9eaa1e282fa2d3bacec2a2d82e Mon Sep 17 00:00:00 2001
From: Marcin Niemira <marcin.niemira@gmail.com>
Date: Sun, 9 Jun 2019 07:05:06 +1000
Subject: [PATCH 7484/8469] bpo-11122: fix hardcoded path checking for rpmbuild
 in bdist_rpm.py (GH-10594)

---
 command/bdist_rpm.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 20ca7ac6dc..74381cc69a 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -309,10 +309,7 @@ def run(self):
 
         # build package
         log.info("building RPMs")
-        rpm_cmd = ['rpm']
-        if os.path.exists('/usr/bin/rpmbuild') or \
-           os.path.exists('/bin/rpmbuild'):
-            rpm_cmd = ['rpmbuild']
+        rpm_cmd = ['rpmbuild']
 
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')

From 8aeff6b2c9a64e47ad2a22533d7e65c08cd4103f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 10 Jun 2019 13:03:33 -0400
Subject: [PATCH 7485/8469] Update developer docs to describe motivation behind
 vendored dependencies. Ref #1781.

---
 docs/developer-guide.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index a5942c8b0f..d145fba140 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -137,3 +137,17 @@ To build the docs locally, use tox::
 
 .. _Sphinx: http://www.sphinx-doc.org/en/master/
 .. _published documentation: https://setuptools.readthedocs.io/en/latest/
+
+---------------------
+Vendored Dependencies
+---------------------
+
+Setuptools has some dependencies, but due to `bootstrapping issues
+<https://github.com/pypa/setuptools/issues/980>`, those dependencies
+cannot be declared as they won't be resolved soon enough to build
+setuptools from source. Eventually, this limitation may be lifted as
+PEP 517/518 reach ubiquitous adoption, but for now, Setuptools
+cannot declare dependencies other than through
+``setuptools/_vendor/vendored.txt`` and
+``pkg_reosurces/_vendor/vendored.txt`` and refreshed by way of
+``paver update_vendored`` (pavement.py).

From 69b935025661716ac64b3e2b049ed9b703dfe96a Mon Sep 17 00:00:00 2001
From: Paul Monson <paulmon@users.noreply.github.com>
Date: Wed, 12 Jun 2019 10:16:49 -0700
Subject: [PATCH 7486/8469] bpo-37201: fix test_distutils failures for Windows
 ARM64 (GH-13902)

---
 _msvccompiler.py            | 2 ++
 tests/test_bdist_wininst.py | 4 ++++
 util.py                     | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index c7ac3f049e..6e14f330d7 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -93,6 +93,7 @@ def _find_vc2017():
     'x86' : 'x86',
     'x86_amd64' : 'x64',
     'x86_arm' : 'arm',
+    'x86_arm64' : 'arm64'
 }
 
 def _find_vcvarsall(plat_spec):
@@ -190,6 +191,7 @@ def _find_exe(exe, paths=None):
     'win32' : 'x86',
     'win-amd64' : 'x86_amd64',
     'win-arm32' : 'x86_arm',
+    'win-arm64' : 'x86_arm64'
 }
 
 # A set containing the DLLs that are guaranteed to be available for
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 4c19bbab21..163f1cc97b 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -1,10 +1,14 @@
 """Tests for distutils.command.bdist_wininst."""
+import sys
+import platform
 import unittest
 from test.support import run_unittest
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
+@unittest.skipIf(sys.platform == 'win32' and platform.machine() == 'ARM64',
+    'bdist_wininst is not supported in this install')
 @unittest.skipIf(getattr(bdist_wininst, '_unsupported', False),
     'bdist_wininst is not supported in this install')
 class BuildWinInstTestCase(support.TempdirManager,
diff --git a/util.py b/util.py
index 50550e1893..17a94bc428 100644
--- a/util.py
+++ b/util.py
@@ -40,6 +40,8 @@ def get_host_platform():
             return 'win-amd64'
         if '(arm)' in sys.version.lower():
             return 'win-arm32'
+        if '(arm64)' in sys.version.lower():
+            return 'win-arm64'
         return sys.platform
 
     # Set for cross builds explicitly

From fa22b42d9f2f8a15568dd3a3d290e33c9be86796 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 13 Jun 2019 18:31:57 +0200
Subject: [PATCH 7487/8469] launcher: Fix build with mingw-w64

execv() requires process.h to be included according to the MSVC documentation
but for some reason it also works without it.

mingw-w64 on the other hand fails to build the launcher if the include isn't there,
so add it.
---
 launcher.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/launcher.c b/launcher.c
index be69f0c6e9..23ef3ac206 100644
--- a/launcher.c
+++ b/launcher.c
@@ -37,6 +37,7 @@
 #include <windows.h>
 #include <tchar.h>
 #include <fcntl.h>
+#include <process.h>
 
 int child_pid=0;
 

From 53b8db359378f436bfd88f90a90aaf01b650d3a6 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Tue, 18 Jun 2019 16:15:25 +0900
Subject: [PATCH 7488/8469] Stop using deprecated HTMLParser.unescape

HTMLParser.unescape is accessed even when unused - this will cause an
exception when `HTMLParser.unescape` is removed in Python 3.9.
---
 changelog.d/1788.change.rst | 1 +
 setuptools/py33compat.py    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1788.change.rst

diff --git a/changelog.d/1788.change.rst b/changelog.d/1788.change.rst
new file mode 100644
index 0000000000..d8a49fd41d
--- /dev/null
+++ b/changelog.d/1788.change.rst
@@ -0,0 +1 @@
+Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 87cf53983c..cb69443638 100644
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -52,4 +52,8 @@ def __iter__(self):
 Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)
 
 
-unescape = getattr(html, 'unescape', html_parser.HTMLParser().unescape)
+unescape = getattr(html, 'unescape', None)
+if unescape is None:
+    # HTMLParser.unescape is deprecated since Python 3.4, and will be removed
+    # from 3.9.
+    unescape = html_parser.HTMLParser().unescape

From 10fe6be3d61414bd6cd9ed723e961d7ea8f5fd61 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 30 Jun 2019 14:24:41 +0200
Subject: [PATCH 7489/8469] tests: fix `test_distribution_version_missing` to
 work with pytest>=5.0

---
 pkg_resources/tests/test_pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index fb77c68587..a0f2c4526c 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -242,7 +242,7 @@ def test_distribution_version_missing(tmpdir, suffix, expected_filename,
     with pytest.raises(ValueError) as excinfo:
         dist.version
 
-    err = str(excinfo)
+    err = str(excinfo.value)
     # Include a string expression after the assert so the full strings
     # will be visible for inspection on failure.
     assert expected_text in err, str((expected_text, err))

From 4598c1a2a918f2f74e7242df775308841e477038 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 30 Jun 2019 14:25:12 +0200
Subject: [PATCH 7490/8469] tests: tweak default pytest arguments to fix Python
 3.8 support

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 1c5b6b0934..612fb91f63 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -rsxX
+addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
 flake8-ignore =
     setuptools/site-patch.py F821

From eb834d03cc5a681a43ad8b76d0761e718199e5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 1 Jul 2019 14:12:40 +0200
Subject: [PATCH 7491/8469] bpo-10945: Drop support for bdist_wininst on
 non-Windows systems (GH-14506)

bdist_wininst depends on MBCS codec, unavailable on non-Windows,
and bdist_wininst have not worked since at least Python 3.2, possibly
never on Python 3.

Here we document that bdist_wininst is only supported on Windows,
and we mark it unsupported otherwise to skip tests.

Distributors of Python 3 can now safely drop the bdist_wininst .exe files
without the need to skip bdist_wininst related tests.
---
 command/bdist_wininst.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index 3a616883be..acaa184b5f 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -55,6 +55,9 @@ class bdist_wininst(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
+    _unsupported = (sys.platform != "win32")
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None

From 6b9a31e6602723d98fce4c37f7151fdbab17367b Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Wed, 3 Jul 2019 11:12:27 +0200
Subject: [PATCH 7492/8469] bpo-37421: Fix test_distutils.test_build_ext()
 (GH-14564)

test_distutils.test_build_ext() is now able to remove the temporary
directory on Windows: don't import the newly built C extension ("xx")
in the current process, but test it in a separated process.
---
 tests/support.py        |  5 ++--
 tests/test_build_ext.py | 51 ++++++++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 7385c6bbf6..041309851d 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -6,6 +6,7 @@
 import unittest
 import sysconfig
 from copy import deepcopy
+import test.support
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
@@ -64,8 +65,8 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
-            d = self.tempdirs.pop()
-            shutil.rmtree(d, os.name in ('nt', 'cygwin'))
+            tmpdir = self.tempdirs.pop()
+            test.support.rmtree(tmpdir)
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 88847f9e9a..52d36b2484 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -15,6 +15,7 @@
 
 import unittest
 from test import support
+from test.support.script_helper import assert_python_ok
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
@@ -26,11 +27,8 @@ class BuildExtTestCase(TempdirManager,
                        unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
-        # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path, sys.path[:]
-        sys.path.append(self.tmp_dir)
         import site
         self.old_user_base = site.USER_BASE
         site.USER_BASE = self.mkdtemp()
@@ -40,15 +38,11 @@ def setUp(self):
         # bpo-30132: On Windows, a .pdb file may be created in the current
         # working directory. Create a temporary working directory to cleanup
         # everything at the end of the test.
-        self.temp_cwd = support.temp_cwd()
-        self.temp_cwd.__enter__()
-        self.addCleanup(self.temp_cwd.__exit__, None, None, None)
+        change_cwd = support.change_cwd(self.tmp_dir)
+        change_cwd.__enter__()
+        self.addCleanup(change_cwd.__exit__, None, None, None)
 
     def tearDown(self):
-        # Get everything back to normal
-        support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
         import site
         site.USER_BASE = self.old_user_base
         from distutils.command import build_ext
@@ -88,19 +82,34 @@ def test_build_ext(self):
         else:
             ALREADY_TESTED = type(self).__name__
 
-        import xx
+        code = textwrap.dedent(f"""
+            tmp_dir = {self.tmp_dir!r}
 
-        for attr in ('error', 'foo', 'new', 'roj'):
-            self.assertTrue(hasattr(xx, attr))
+            import sys
+            import unittest
+            from test import support
 
-        self.assertEqual(xx.foo(2, 5), 7)
-        self.assertEqual(xx.foo(13,15), 28)
-        self.assertEqual(xx.new().demo(), None)
-        if support.HAVE_DOCSTRINGS:
-            doc = 'This is a template module just for instruction.'
-            self.assertEqual(xx.__doc__, doc)
-        self.assertIsInstance(xx.Null(), xx.Null)
-        self.assertIsInstance(xx.Str(), xx.Str)
+            sys.path.insert(0, tmp_dir)
+            import xx
+
+            class Tests(unittest.TestCase):
+                def test_xx(self):
+                    for attr in ('error', 'foo', 'new', 'roj'):
+                        self.assertTrue(hasattr(xx, attr))
+
+                    self.assertEqual(xx.foo(2, 5), 7)
+                    self.assertEqual(xx.foo(13,15), 28)
+                    self.assertEqual(xx.new().demo(), None)
+                    if support.HAVE_DOCSTRINGS:
+                        doc = 'This is a template module just for instruction.'
+                        self.assertEqual(xx.__doc__, doc)
+                    self.assertIsInstance(xx.Null(), xx.Null)
+                    self.assertIsInstance(xx.Str(), xx.Str)
+
+
+            unittest.main()
+        """)
+        assert_python_ok('-c', code)
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})

From 850d4faed59006e8dbfcee2bbec13d1985d6538a Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 5 Jul 2019 10:44:12 +0200
Subject: [PATCH 7493/8469] bpo-37481: Deprecate distutils bdist_wininst
 command (GH-14553)

The distutils bdist_wininst command is now deprecated, use
bdist_wheel (wheel packages) instead.
---
 command/bdist_wininst.py    | 10 +++++++++-
 tests/test_bdist_wininst.py |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index acaa184b5f..b5ed6f041e 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -3,7 +3,9 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-import sys, os
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -58,6 +60,12 @@ class bdist_wininst(Command):
     # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
     _unsupported = (sys.platform != "win32")
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_wininst command is deprecated since Python 3.8, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 163f1cc97b..5c3d025d33 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -2,7 +2,7 @@
 import sys
 import platform
 import unittest
-from test.support import run_unittest
+from test.support import run_unittest, check_warnings
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -21,7 +21,8 @@ def test_get_exe_bytes(self):
         # this test makes sure it works now for every platform
         # let's create a command
         pkg_pth, dist = self.create_dist()
-        cmd = bdist_wininst(dist)
+        with check_warnings(("", DeprecationWarning)):
+            cmd = bdist_wininst(dist)
         cmd.ensure_finalized()
 
         # let's run the code that finds the right wininst*.exe file

From 67344c95b9402b4720d3c9e61d01096a6453efa6 Mon Sep 17 00:00:00 2001
From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Sat, 13 Jul 2019 03:19:50 -0700
Subject: [PATCH 7494/8469] Fix #1790 : Include the file path in get_metadata()
 UnicodeDecodeErrors (#1791)

Include the file path in get_metadata() UnicodeDecodeErrors.
---
 changelog.d/1790.change.rst               |  2 +
 pkg_resources/__init__.py                 | 13 +++++-
 pkg_resources/tests/test_pkg_resources.py | 54 +++++++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1790.change.rst

diff --git a/changelog.d/1790.change.rst b/changelog.d/1790.change.rst
new file mode 100644
index 0000000000..e4a7998d8f
--- /dev/null
+++ b/changelog.d/1790.change.rst
@@ -0,0 +1,2 @@
+Added the file path to the error message when a ``UnicodeDecodeError`` occurs
+while reading a metadata file.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 97e08d6827..1f170cfda5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1416,8 +1416,17 @@ def has_metadata(self, name):
     def get_metadata(self, name):
         if not self.egg_info:
             return ""
-        value = self._get(self._fn(self.egg_info, name))
-        return value.decode('utf-8') if six.PY3 else value
+        path = self._get_metadata_path(name)
+        value = self._get(path)
+        if six.PY2:
+            return value
+        try:
+            return value.decode('utf-8')
+        except UnicodeDecodeError as exc:
+            # Include the path in the error message to simplify
+            # troubleshooting, and without changing the exception type.
+            exc.reason += ' in {} file at path: {}'.format(name, path)
+            raise
 
     def get_metadata_lines(self, name):
         return yield_lines(self.get_metadata(name))
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index a0f2c4526c..5960868a52 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -18,6 +18,7 @@
     import mock
 
 from pkg_resources import DistInfoDistribution, Distribution, EggInfoDistribution
+from setuptools.extern import six
 from pkg_resources.extern.six.moves import map
 from pkg_resources.extern.six import text_type, string_types
 
@@ -191,6 +192,59 @@ def test_setuptools_not_imported(self):
         subprocess.check_call(cmd)
 
 
+def make_test_distribution(metadata_path, metadata):
+    """
+    Make a test Distribution object, and return it.
+
+    :param metadata_path: the path to the metadata file that should be
+        created. This should be inside a distribution directory that should
+        also be created. For example, an argument value might end with
+        "<project>.dist-info/METADATA".
+    :param metadata: the desired contents of the metadata file, as bytes.
+    """
+    dist_dir = os.path.dirname(metadata_path)
+    os.mkdir(dist_dir)
+    with open(metadata_path, 'wb') as f:
+        f.write(metadata)
+    dists = list(pkg_resources.distributions_from_metadata(dist_dir))
+    dist, = dists
+
+    return dist
+
+
+def test_get_metadata__bad_utf8(tmpdir):
+    """
+    Test a metadata file with bytes that can't be decoded as utf-8.
+    """
+    filename = 'METADATA'
+    # Convert the tmpdir LocalPath object to a string before joining.
+    metadata_path = os.path.join(str(tmpdir), 'foo.dist-info', filename)
+    # Encode a non-ascii string with the wrong encoding (not utf-8).
+    metadata = 'née'.encode('iso-8859-1')
+    dist = make_test_distribution(metadata_path, metadata=metadata)
+
+    if six.PY2:
+        # In Python 2, get_metadata() doesn't do any decoding.
+        actual = dist.get_metadata(filename)
+        assert actual == metadata
+        return
+
+    # Otherwise, we are in the Python 3 case.
+    with pytest.raises(UnicodeDecodeError) as excinfo:
+        dist.get_metadata(filename)
+
+    exc = excinfo.value
+    actual = str(exc)
+    expected = (
+        # The error message starts with "'utf-8' codec ..." However, the
+        # spelling of "utf-8" can vary (e.g. "utf8") so we don't include it
+        "codec can't decode byte 0xe9 in position 1: "
+        'invalid continuation byte in METADATA file at path: '
+    )
+    assert expected in actual, 'actual: {}'.format(actual)
+    assert actual.endswith(metadata_path), 'actual: {}'.format(actual)
+
+
 # TODO: remove this in favor of Path.touch() when Python 2 is dropped.
 def touch_file(path):
     """

From 305bb1cefc3251c67b55149139a768ddf474f7b6 Mon Sep 17 00:00:00 2001
From: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Date: Thu, 23 May 2019 14:15:19 -0400
Subject: [PATCH 7495/8469] fix assert_string_list docstring

value=None raises TypeError

DistutilsSetupError: 2 must be a list of strings (got None)
---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index ea6411b178..1e1b83beb1 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -213,7 +213,7 @@ def check_importable(dist, attr, value):
 
 
 def assert_string_list(dist, attr, value):
-    """Verify that value is a string list or None"""
+    """Verify that value is a string list"""
     try:
         assert ''.join(value) != value
     except (TypeError, ValueError, AttributeError, AssertionError):

From 8f848bd777278fc8dcb42dc45751cd8b95ec2a02 Mon Sep 17 00:00:00 2001
From: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Date: Wed, 22 May 2019 17:45:44 -0400
Subject: [PATCH 7496/8469] improve `package_data` check

Ensure the dictionary values are lists/tuples of strings.

Fix #1459.
---
 changelog.d/1769.change.rst   |  1 +
 setuptools/dist.py            | 29 ++++++++++---------
 setuptools/tests/test_dist.py | 53 ++++++++++++++++++++++++++++++++++-
 3 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 changelog.d/1769.change.rst

diff --git a/changelog.d/1769.change.rst b/changelog.d/1769.change.rst
new file mode 100644
index 0000000000..d48a23b632
--- /dev/null
+++ b/changelog.d/1769.change.rst
@@ -0,0 +1 @@
+Improve ``package_data`` check: ensure the dictionary values are lists/tuples of strings.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1e1b83beb1..f0f030b550 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -215,6 +215,10 @@ def check_importable(dist, attr, value):
 def assert_string_list(dist, attr, value):
     """Verify that value is a string list"""
     try:
+        # verify that value is a list or tuple to exclude unordered
+        # or single-use iterables
+        assert isinstance(value, (list, tuple))
+        # verify that elements of value are strings
         assert ''.join(value) != value
     except (TypeError, ValueError, AttributeError, AssertionError):
         raise DistutilsSetupError(
@@ -307,20 +311,17 @@ def check_test_suite(dist, attr, value):
 
 def check_package_data(dist, attr, value):
     """Verify that value is a dictionary of package names to glob lists"""
-    if isinstance(value, dict):
-        for k, v in value.items():
-            if not isinstance(k, str):
-                break
-            try:
-                iter(v)
-            except TypeError:
-                break
-        else:
-            return
-    raise DistutilsSetupError(
-        attr + " must be a dictionary mapping package names to lists of "
-        "wildcard patterns"
-    )
+    if not isinstance(value, dict):
+        raise DistutilsSetupError(
+            "{!r} must be a dictionary mapping package names to lists of "
+            "string wildcard patterns".format(attr))
+    for k, v in value.items():
+        if not isinstance(k, six.string_types):
+            raise DistutilsSetupError(
+                "keys of {!r} dict must be strings (got {!r})"
+                .format(attr, k)
+            )
+        assert_string_list(dist, 'values of {!r} dict'.format(attr), v)
 
 
 def check_packages(dist, attr, value):
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 390c3dfcf0..c771a19a19 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -3,7 +3,13 @@
 from __future__ import unicode_literals
 
 import io
-from setuptools.dist import DistDeprecationWarning, _get_unpatched
+import re
+from distutils.errors import DistutilsSetupError
+from setuptools.dist import (
+    _get_unpatched,
+    check_package_data,
+    DistDeprecationWarning,
+)
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
@@ -263,3 +269,48 @@ def test_maintainer_author(name, attrs, tmpdir):
         else:
             line = '%s: %s' % (fkey, val)
             assert line in pkg_lines_set
+
+
+CHECK_PACKAGE_DATA_TESTS = (
+    # Valid.
+    ({
+        '': ['*.txt', '*.rst'],
+        'hello': ['*.msg'],
+    }, None),
+    # Not a dictionary.
+    ((
+        ('', ['*.txt', '*.rst']),
+        ('hello', ['*.msg']),
+    ), (
+        "'package_data' must be a dictionary mapping package"
+        " names to lists of string wildcard patterns"
+    )),
+    # Invalid key type.
+    ({
+        400: ['*.txt', '*.rst'],
+    }, (
+        "keys of 'package_data' dict must be strings (got 400)"
+    )),
+    # Invalid value type.
+    ({
+        'hello': str('*.msg'),
+    }, (
+        "\"values of 'package_data' dict\" must be a list of strings (got '*.msg')"
+    )),
+    # Invalid value type (generators are single use)
+    ({
+        'hello': (x for x in "generator"),
+    }, (
+        "\"values of 'package_data' dict\" must be a list of strings "
+        "(got <generator object"
+    )),
+)
+
+
+@pytest.mark.parametrize('package_data, expected_message', CHECK_PACKAGE_DATA_TESTS)
+def test_check_package_data(package_data, expected_message):
+    if expected_message is None:
+        assert check_package_data(None, 'package_data', package_data) is None
+    else:
+        with pytest.raises(DistutilsSetupError, match=re.escape(expected_message)):
+            check_package_data(None, str('package_data'), package_data)

From 8f1f09b7f93f2fa86bafcd6502ec51d4680b4499 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 22 Jul 2019 17:52:55 -0400
Subject: [PATCH 7497/8469] Run docs build as part of CI

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ffcad99864..074e86e90b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ jobs:
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
+  - <<: *latest_py3
+    env: TOXENV=docs DISABLE_COVERAGE=1
   - <<: *default_py
     stage: deploy (to PyPI for tagged commits)
     if: tag IS present

From d694f54455d4b3884f74b72b54acbd8aeb94caed Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 23 Jul 2019 11:29:21 +0200
Subject: [PATCH 7498/8469] tests: fix `test_pip_upgrade_from_source` on Python
 3.4

Do not test pip's master on 3.4, as support for it has been dropped.
---
 setuptools/tests/test_virtualenv.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index d7b98c7741..74a1284ce7 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -8,6 +8,8 @@
 
 import pytest_virtualenv
 
+from setuptools.extern import six
+
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
 
@@ -75,9 +77,12 @@ def _get_pip_versions():
         'pip==10.0.1',
         'pip==18.1',
         'pip==19.0.1',
-        'https://github.com/pypa/pip/archive/master.zip',
     ]
 
+    # Pip's master dropped support for 3.4.
+    if not six.PY34:
+        network_versions.append('https://github.com/pypa/pip/archive/master.zip')
+
     versions = [None] + [
         pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
         for v in network_versions

From 3665ddcf056ef72aa6e8e92aee81684d146d5dde Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Thu, 1 Aug 2019 15:18:03 +0200
Subject: [PATCH 7499/8469] bpo-36302: Sort list of sources (GH-12341)

When building packages (e.g. for openSUSE Linux)
(random) filesystem order of input files
influences ordering of functions in the output .so files.
Thus without the patch, builds (in disposable VMs) would usually differ.

Without this patch, all callers have to be patched individually
https://github.com/dugsong/libdnet/pull/42
https://github.com/sass/libsass-python/pull/212
https://github.com/tahoe-lafs/pycryptopp/pull/41
https://github.com/yt-project/yt/pull/2206
https://github.com/pyproj4/pyproj/pull/142
https://github.com/pytries/datrie/pull/49
https://github.com/Roche/pyreadstat/pull/37
but that is an infinite effort.

See https://reproducible-builds.org/ for why this matters.
---
 command/build_ext.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 2d7cdf063f..38bb8fd93c 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -490,7 +490,8 @@ def build_extension(self, ext):
                   "in 'ext_modules' option (extension '%s'), "
                   "'sources' must be present and must be "
                   "a list of source filenames" % ext.name)
-        sources = list(sources)
+        # sort to make the resulting .so file build reproducible
+        sources = sorted(sources)
 
         ext_path = self.get_ext_fullpath(ext.name)
         depends = sources + ext.depends

From 7e1b1934c7e0dcd400ff17a701601d912aa603bc Mon Sep 17 00:00:00 2001
From: jgoutin <jgoutin@pm.me>
Date: Sat, 3 Aug 2019 10:41:34 +0200
Subject: [PATCH 7500/8469] Improve Visual C++ 14.X support

Improve VC++14 support for VS 2017 and 2019.
Separate VC from VS version (Miss match starting VS15).
Improve docstrings args and returns information + fixe typos.
Fix coding style and minor coding issues.
Remove Microsoft "Windows SDK 7.0" dead link.
---
 changelog.d/1811.change.rst |    1 +
 setuptools/msvc.py          | 1021 ++++++++++++++++++++++++-----------
 2 files changed, 700 insertions(+), 322 deletions(-)
 create mode 100644 changelog.d/1811.change.rst

diff --git a/changelog.d/1811.change.rst b/changelog.d/1811.change.rst
new file mode 100644
index 0000000000..dc52c6dbbe
--- /dev/null
+++ b/changelog.d/1811.change.rst
@@ -0,0 +1 @@
+Improve Visual C++ 14.X support, mainly for Visual Studio 2017 and 2019.
\ No newline at end of file
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index b9c472f14f..ffa7053b64 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -11,13 +11,17 @@
 Microsoft Visual C++ 10.0:
     Microsoft Windows SDK 7.1 (x86, x64, ia64)
 
-Microsoft Visual C++ 14.0:
+Microsoft Visual C++ 14.X:
     Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
-    Microsoft Visual Studio 2017 (x86, x64, arm, arm64)
     Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
+    Microsoft Visual Studio Build Tools 2019 (x86, x64, arm, arm64)
+
+This may also support compilers shipped with compatible Visual Studio versions.
 """
 
-import os
+import json
+from os import listdir, pathsep
+from os.path import join, isfile, isdir, dirname
 import sys
 import platform
 import itertools
@@ -30,12 +34,9 @@
 
 if platform.system() == 'Windows':
     from setuptools.extern.six.moves import winreg
-    safe_env = os.environ
+    from os import environ
 else:
-    """
-    Mock winreg and environ so the module can be imported
-    on this platform.
-    """
+    # Mock winreg and environ so the module can be imported on this platform.
 
     class winreg:
         HKEY_USERS = None
@@ -43,7 +44,7 @@ class winreg:
         HKEY_LOCAL_MACHINE = None
         HKEY_CLASSES_ROOT = None
 
-    safe_env = dict()
+    environ = dict()
 
 _msvc9_suppress_errors = (
     # msvc9compiler isn't available on some platforms
@@ -63,15 +64,13 @@ class winreg:
 def msvc9_find_vcvarsall(version):
     """
     Patched "distutils.msvc9compiler.find_vcvarsall" to use the standalone
-    compiler build for Python (VCForPython). Fall back to original behavior
-    when the standalone compiler is not available.
+    compiler build for Python
+    (VCForPython / Microsoft Visual C++ Compiler for Python 2.7).
 
-    Redirect the path of "vcvarsall.bat".
+    Fall back to original behavior when the standalone compiler is not
+    available.
 
-    Known supported compilers
-    -------------------------
-    Microsoft Visual C++ 9.0:
-        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
+    Redirect the path of "vcvarsall.bat".
 
     Parameters
     ----------
@@ -80,24 +79,25 @@ def msvc9_find_vcvarsall(version):
 
     Return
     ------
-    vcvarsall.bat path: str
+    str
+        vcvarsall.bat path
     """
-    VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
-    key = VC_BASE % ('', version)
+    vc_base = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f'
+    key = vc_base % ('', version)
     try:
         # Per-user installs register the compiler path here
         productdir = Reg.get_value(key, "installdir")
     except KeyError:
         try:
             # All-user installs on a 64-bit system register here
-            key = VC_BASE % ('Wow6432Node\\', version)
+            key = vc_base % ('Wow6432Node\\', version)
             productdir = Reg.get_value(key, "installdir")
         except KeyError:
             productdir = None
 
     if productdir:
-        vcvarsall = os.path.os.path.join(productdir, "vcvarsall.bat")
-        if os.path.isfile(vcvarsall):
+        vcvarsall = join(productdir, "vcvarsall.bat")
+        if isfile(vcvarsall):
             return vcvarsall
 
     return get_unpatched(msvc9_find_vcvarsall)(version)
@@ -106,20 +106,10 @@ def msvc9_find_vcvarsall(version):
 def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
     """
     Patched "distutils.msvc9compiler.query_vcvarsall" for support extra
-    compilers.
+    Microsoft Visual C++ 9.0 and 10.0 compilers.
 
     Set environment without use of "vcvarsall.bat".
 
-    Known supported compilers
-    -------------------------
-    Microsoft Visual C++ 9.0:
-        Microsoft Visual C++ Compiler for Python 2.7 (x86, amd64)
-        Microsoft Windows SDK 6.1 (x86, x64, ia64)
-        Microsoft Windows SDK 7.0 (x86, x64, ia64)
-
-    Microsoft Visual C++ 10.0:
-        Microsoft Windows SDK 7.1 (x86, x64, ia64)
-
     Parameters
     ----------
     ver: float
@@ -129,9 +119,10 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
     Return
     ------
-    environment: dict
+    dict
+        environment
     """
-    # Try to get environement from vcvarsall.bat (Classical way)
+    # Try to get environment from vcvarsall.bat (Classical way)
     try:
         orig = get_unpatched(msvc9_query_vcvarsall)
         return orig(ver, arch, *args, **kwargs)
@@ -153,17 +144,10 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 def msvc14_get_vc_env(plat_spec):
     """
     Patched "distutils._msvccompiler._get_vc_env" for support extra
-    compilers.
+    Microsoft Visual C++ 14.X compilers.
 
     Set environment without use of "vcvarsall.bat".
 
-    Known supported compilers
-    -------------------------
-    Microsoft Visual C++ 14.0:
-        Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
-        Microsoft Visual Studio 2017 (x86, x64, arm, arm64)
-        Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
-
     Parameters
     ----------
     plat_spec: str
@@ -171,7 +155,8 @@ def msvc14_get_vc_env(plat_spec):
 
     Return
     ------
-    environment: dict
+    dict
+        environment
     """
     # Try to get environment from vcvarsall.bat (Classical way)
     try:
@@ -217,9 +202,9 @@ def _augment_exception(exc, version, arch=''):
         if version == 9.0:
             if arch.lower().find('ia64') > -1:
                 # For VC++ 9.0, if IA64 support is needed, redirect user
-                # to Windows SDK 7.0
-                message += ' Get it with "Microsoft Windows SDK 7.0": '
-                message += msdownload % 3138
+                # to Windows SDK 7.0.
+                # Note: No download link available from Microsoft.
+                message += ' Get it with "Microsoft Windows SDK 7.0"'
             else:
                 # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
                 # This redirection link is maintained by Microsoft.
@@ -230,8 +215,8 @@ def _augment_exception(exc, version, arch=''):
             message += ' Get it with "Microsoft Windows SDK 7.1": '
             message += msdownload % 8279
         elif version >= 14.0:
-            # For VC++ 14.0 Redirect user to Visual C++ Build Tools
-            message += (' Get it with "Microsoft Visual C++ Build Tools": '
+            # For VC++ 14.X Redirect user to latest Visual C++ Build Tools
+            message += (' Get it with "Build Tools for Visual Studio": '
                         r'https://visualstudio.microsoft.com/downloads/')
 
     exc.args = (message, )
@@ -239,26 +224,50 @@ def _augment_exception(exc, version, arch=''):
 
 class PlatformInfo:
     """
-    Current and Target Architectures informations.
+    Current and Target Architectures information.
 
     Parameters
     ----------
     arch: str
         Target architecture.
     """
-    current_cpu = safe_env.get('processor_architecture', '').lower()
+    current_cpu = environ.get('processor_architecture', '').lower()
 
     def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
 
     @property
     def target_cpu(self):
+        """
+        Return Target CPU architecture.
+
+        Return
+        ------
+        str
+            Target CPU
+        """
         return self.arch[self.arch.find('_') + 1:]
 
     def target_is_x86(self):
+        """
+        Return True if target CPU is x86 32 bits..
+
+        Return
+        ------
+        bool
+            CPU is x86 32 bits
+        """
         return self.target_cpu == 'x86'
 
     def current_is_x86(self):
+        """
+        Return True if current CPU is x86 32 bits..
+
+        Return
+        ------
+        bool
+            CPU is x86 32 bits
+        """
         return self.current_cpu == 'x86'
 
     def current_dir(self, hidex86=False, x64=False):
@@ -274,8 +283,8 @@ def current_dir(self, hidex86=False, x64=False):
 
         Return
         ------
-        subfolder: str
-            '\target', or '' (see hidex86 parameter)
+        str
+            subfolder: '\target', or '' (see hidex86 parameter)
         """
         return (
             '' if (self.current_cpu == 'x86' and hidex86) else
@@ -296,8 +305,8 @@ def target_dir(self, hidex86=False, x64=False):
 
         Return
         ------
-        subfolder: str
-            '\current', or '' (see hidex86 parameter)
+        str
+            subfolder: '\current', or '' (see hidex86 parameter)
         """
         return (
             '' if (self.target_cpu == 'x86' and hidex86) else
@@ -312,13 +321,13 @@ def cross_dir(self, forcex86=False):
         Parameters
         ----------
         forcex86: bool
-            Use 'x86' as current architecture even if current acritecture is
+            Use 'x86' as current architecture even if current architecture is
             not x86.
 
         Return
         ------
-        subfolder: str
-            '' if target architecture is current architecture,
+        str
+            subfolder: '' if target architecture is current architecture,
             '\current_target' if not.
         """
         current = 'x86' if forcex86 else self.current_cpu
@@ -330,7 +339,7 @@ def cross_dir(self, forcex86=False):
 
 class RegistryInfo:
     """
-    Microsoft Visual Studio related registry informations.
+    Microsoft Visual Studio related registry information.
 
     Parameters
     ----------
@@ -349,6 +358,11 @@ def __init__(self, platform_info):
     def visualstudio(self):
         """
         Microsoft Visual Studio root registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
         return 'VisualStudio'
 
@@ -356,27 +370,47 @@ def visualstudio(self):
     def sxs(self):
         """
         Microsoft Visual Studio SxS registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
-        return os.path.join(self.visualstudio, 'SxS')
+        return join(self.visualstudio, 'SxS')
 
     @property
     def vc(self):
         """
         Microsoft Visual C++ VC7 registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
-        return os.path.join(self.sxs, 'VC7')
+        return join(self.sxs, 'VC7')
 
     @property
     def vs(self):
         """
         Microsoft Visual Studio VS7 registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
-        return os.path.join(self.sxs, 'VS7')
+        return join(self.sxs, 'VS7')
 
     @property
     def vc_for_python(self):
         """
         Microsoft Visual C++ for Python registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
         return r'DevDiv\VCForPython'
 
@@ -384,6 +418,11 @@ def vc_for_python(self):
     def microsoft_sdk(self):
         """
         Microsoft SDK registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
         return 'Microsoft SDKs'
 
@@ -391,20 +430,35 @@ def microsoft_sdk(self):
     def windows_sdk(self):
         """
         Microsoft Windows/Platform SDK registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
-        return os.path.join(self.microsoft_sdk, 'Windows')
+        return join(self.microsoft_sdk, 'Windows')
 
     @property
     def netfx_sdk(self):
         """
         Microsoft .NET Framework SDK registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
-        return os.path.join(self.microsoft_sdk, 'NETFXSDK')
+        return join(self.microsoft_sdk, 'NETFXSDK')
 
     @property
     def windows_kits_roots(self):
         """
         Microsoft Windows Kits Roots registry key.
+
+        Return
+        ------
+        str
+            Registry key
         """
         return r'Windows Kits\Installed Roots'
 
@@ -421,10 +475,11 @@ def microsoft(self, key, x86=False):
 
         Return
         ------
-        str: value
+        str
+            Registry key
         """
         node64 = '' if self.pi.current_is_x86() or x86 else 'Wow6432Node'
-        return os.path.join('Software', node64, 'Microsoft', key)
+        return join('Software', node64, 'Microsoft', key)
 
     def lookup(self, key, name):
         """
@@ -439,18 +494,19 @@ def lookup(self, key, name):
 
         Return
         ------
-        str: value
+        str
+            value
         """
-        KEY_READ = winreg.KEY_READ
+        key_read = winreg.KEY_READ
         openkey = winreg.OpenKey
         ms = self.microsoft
         for hkey in self.HKEYS:
             try:
-                bkey = openkey(hkey, ms(key), 0, KEY_READ)
+                bkey = openkey(hkey, ms(key), 0, key_read)
             except (OSError, IOError):
                 if not self.pi.current_is_x86():
                     try:
-                        bkey = openkey(hkey, ms(key, True), 0, KEY_READ)
+                        bkey = openkey(hkey, ms(key, True), 0, key_read)
                     except (OSError, IOError):
                         continue
                 else:
@@ -463,7 +519,7 @@ def lookup(self, key, name):
 
 class SystemInfo:
     """
-    Microsoft Windows and Visual Studio related system inormations.
+    Microsoft Windows and Visual Studio related system information.
 
     Parameters
     ----------
@@ -474,30 +530,52 @@ class SystemInfo:
     """
 
     # Variables and properties in this class use originals CamelCase variables
-    # names from Microsoft source files for more easy comparaison.
-    WinDir = safe_env.get('WinDir', '')
-    ProgramFiles = safe_env.get('ProgramFiles', '')
-    ProgramFilesx86 = safe_env.get('ProgramFiles(x86)', ProgramFiles)
+    # names from Microsoft source files for more easy comparison.
+    WinDir = environ.get('WinDir', '')
+    ProgramFiles = environ.get('ProgramFiles', '')
+    ProgramFilesx86 = environ.get('ProgramFiles(x86)', ProgramFiles)
 
     def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info
         self.pi = self.ri.pi
-        self.vc_ver = vc_ver or self._find_latest_available_vc_ver()
 
-    def _find_latest_available_vc_ver(self):
-        try:
-            return self.find_available_vc_vers()[-1]
-        except IndexError:
-            err = 'No Microsoft Visual C++ version found'
-            raise distutils.errors.DistutilsPlatformError(err)
+        self.known_vs_paths = self.find_programdata_vs_vers()
+
+        # Except for VS15+, VC version is aligned with VS version
+        self.vs_ver = self.vc_ver = (
+                vc_ver or self._find_latest_available_vs_ver())
+
+    def _find_latest_available_vs_ver(self):
+        """
+        Find the latest VC version
+
+        Return
+        ------
+        float
+            version
+        """
+        reg_vc_vers = self.find_reg_vs_vers()
+
+        if not (reg_vc_vers or self.known_vs_paths):
+            raise distutils.errors.DistutilsPlatformError(
+                'No Microsoft Visual C++ version found')
+
+        vc_vers = set(reg_vc_vers)
+        vc_vers.update(self.known_vs_paths)
+        return sorted(vc_vers)[-1]
 
-    def find_available_vc_vers(self):
+    def find_reg_vs_vers(self):
         """
-        Find all available Microsoft Visual C++ versions.
+        Find Microsoft Visual Studio versions available in registry.
+
+        Return
+        ------
+        list of float
+            Versions
         """
         ms = self.ri.microsoft
         vckeys = (self.ri.vc, self.ri.vc_for_python, self.ri.vs)
-        vc_vers = []
+        vs_vers = []
         for hkey in self.ri.HKEYS:
             for key in vckeys:
                 try:
@@ -508,49 +586,108 @@ def find_available_vc_vers(self):
                 for i in range(values):
                     try:
                         ver = float(winreg.EnumValue(bkey, i)[0])
-                        if ver not in vc_vers:
-                            vc_vers.append(ver)
+                        if ver not in vs_vers:
+                            vs_vers.append(ver)
                     except ValueError:
                         pass
                 for i in range(subkeys):
                     try:
                         ver = float(winreg.EnumKey(bkey, i))
-                        if ver not in vc_vers:
-                            vc_vers.append(ver)
+                        if ver not in vs_vers:
+                            vs_vers.append(ver)
                     except ValueError:
                         pass
-        return sorted(vc_vers)
+        return sorted(vs_vers)
+
+    def find_programdata_vs_vers(self):
+        r"""
+        Find Visual studio 2017+ versions from information in
+        "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances".
+
+        Return
+        ------
+        dict
+            float version as key, path as value.
+        """
+        vs_versions = {}
+        instances_dir = \
+            r'C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances'
+
+        try:
+            hashed_names = listdir(instances_dir)
+
+        except (OSError, IOError):
+            # Directory not exists with all Visual Studio versions
+            return vs_versions
+
+        for name in hashed_names:
+            try:
+                # Get VS installation path from "state.json" file
+                state_path = join(instances_dir, name, 'state.json')
+                with open(state_path, 'rt', encoding='utf-8') as state_file:
+                    state = json.load(state_file)
+                vs_path = state['installationPath']
+
+                # Raises OSError if this VS installation does not contain VC
+                listdir(join(vs_path, r'VC\Tools\MSVC'))
+
+                # Store version and path
+                vs_versions[self._as_float_version(
+                    state['installationVersion'])] = vs_path
+
+            except (OSError, IOError, KeyError):
+                # Skip if "state.json" file is missing or bad format
+                continue
+
+        return vs_versions
+
+    @staticmethod
+    def _as_float_version(version):
+        """
+        Return a string version as a simplified float version (major.minor)
+
+        Parameters
+        ----------
+        version: str
+            Version.
+
+        Return
+        ------
+        float
+            version
+        """
+        return float('.'.join(version.split('.')[:2]))
 
     @property
     def VSInstallDir(self):
         """
         Microsoft Visual Studio directory.
+
+        Return
+        ------
+        str
+            path
         """
         # Default path
-        name = 'Microsoft Visual Studio %0.1f' % self.vc_ver
-        default = os.path.join(self.ProgramFilesx86, name)
+        default = join(self.ProgramFilesx86,
+                       'Microsoft Visual Studio %0.1f' % self.vs_ver)
 
         # Try to get path from registry, if fail use default path
-        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vc_ver) or default
+        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vs_ver) or default
 
     @property
     def VCInstallDir(self):
         """
         Microsoft Visual C++ directory.
-        """
-        self.VSInstallDir
-
-        guess_vc = self._guess_vc() or self._guess_vc_legacy()
-
-        # Try to get "VC++ for Python" path from registry as default path
-        reg_path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
-        python_vc = self.ri.lookup(reg_path, 'installdir')
-        default_vc = os.path.join(python_vc, 'VC') if python_vc else guess_vc
 
-        # Try to get path from registry, if fail use default path
-        path = self.ri.lookup(self.ri.vc, '%0.1f' % self.vc_ver) or default_vc
+        Return
+        ------
+        str
+            path
+        """
+        path = self._guess_vc() or self._guess_vc_legacy()
 
-        if not os.path.isdir(path):
+        if not isdir(path):
             msg = 'Microsoft Visual C++ directory not found'
             raise distutils.errors.DistutilsPlatformError(msg)
 
@@ -558,186 +695,256 @@ def VCInstallDir(self):
 
     def _guess_vc(self):
         """
-        Locate Visual C for 2017
+        Locate Visual C++ for VS2017+.
+
+        Return
+        ------
+        str
+            path
         """
-        if self.vc_ver <= 14.0:
-            return
+        if self.vs_ver <= 14.0:
+            return ''
+
+        try:
+            # First search in known VS paths
+            vs_dir = self.known_vs_paths[self.vs_ver]
+        except KeyError:
+            # Else, search with path from registry
+            vs_dir = self.VSInstallDir
+
+        guess_vc = join(vs_dir, r'VC\Tools\MSVC')
 
-        default = r'VC\Tools\MSVC'
-        guess_vc = os.path.join(self.VSInstallDir, default)
         # Subdir with VC exact version as name
         try:
-            vc_exact_ver = os.listdir(guess_vc)[-1]
-            return os.path.join(guess_vc, vc_exact_ver)
+            # Update the VC version with real one instead of VS version
+            vc_ver = listdir(guess_vc)[-1]
+            self.vc_ver = self._as_float_version(vc_ver)
+            return join(guess_vc, vc_ver)
         except (OSError, IOError, IndexError):
-            pass
+            return ''
 
     def _guess_vc_legacy(self):
         """
-        Locate Visual C for versions prior to 2017
+        Locate Visual C++ for versions prior to 2017.
+
+        Return
+        ------
+        str
+            path
         """
-        default = r'Microsoft Visual Studio %0.1f\VC' % self.vc_ver
-        return os.path.join(self.ProgramFilesx86, default)
+        default = join(self.ProgramFilesx86,
+                       r'Microsoft Visual Studio %0.1f\VC' % self.vs_ver)
+
+        # Try to get "VC++ for Python" path from registry as default path
+        reg_path = join(self.ri.vc_for_python, '%0.1f' % self.vs_ver)
+        python_vc = self.ri.lookup(reg_path, 'installdir')
+        default_vc = join(python_vc, 'VC') if python_vc else default
+
+        # Try to get path from registry, if fail use default path
+        return self.ri.lookup(self.ri.vc, '%0.1f' % self.vs_ver) or default_vc
 
     @property
     def WindowsSdkVersion(self):
         """
         Microsoft Windows SDK versions for specified MSVC++ version.
-        """
-        if self.vc_ver <= 9.0:
-            return ('7.0', '6.1', '6.0a')
-        elif self.vc_ver == 10.0:
-            return ('7.1', '7.0a')
-        elif self.vc_ver == 11.0:
-            return ('8.0', '8.0a')
-        elif self.vc_ver == 12.0:
-            return ('8.1', '8.1a')
-        elif self.vc_ver >= 14.0:
-            return ('10.0', '8.1')
+
+        Return
+        ------
+        tuple of str
+            versions
+        """
+        if self.vs_ver <= 9.0:
+            return '7.0', '6.1', '6.0a'
+        elif self.vs_ver == 10.0:
+            return '7.1', '7.0a'
+        elif self.vs_ver == 11.0:
+            return '8.0', '8.0a'
+        elif self.vs_ver == 12.0:
+            return '8.1', '8.1a'
+        elif self.vs_ver >= 14.0:
+            return '10.0', '8.1'
 
     @property
     def WindowsSdkLastVersion(self):
         """
-        Microsoft Windows SDK last version
+        Microsoft Windows SDK last version.
+
+        Return
+        ------
+        str
+            version
         """
-        return self._use_last_dir_name(os.path.join(
-            self.WindowsSdkDir, 'lib'))
+        return self._use_last_dir_name(join(self.WindowsSdkDir, 'lib'))
 
     @property
     def WindowsSdkDir(self):
         """
         Microsoft Windows SDK directory.
+
+        Return
+        ------
+        str
+            path
         """
         sdkdir = ''
         for ver in self.WindowsSdkVersion:
             # Try to get it from registry
-            loc = os.path.join(self.ri.windows_sdk, 'v%s' % ver)
+            loc = join(self.ri.windows_sdk, 'v%s' % ver)
             sdkdir = self.ri.lookup(loc, 'installationfolder')
             if sdkdir:
                 break
-        if not sdkdir or not os.path.isdir(sdkdir):
+        if not sdkdir or not isdir(sdkdir):
             # Try to get "VC++ for Python" version from registry
-            path = os.path.join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
+            path = join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
             install_base = self.ri.lookup(path, 'installdir')
             if install_base:
-                sdkdir = os.path.join(install_base, 'WinSDK')
-        if not sdkdir or not os.path.isdir(sdkdir):
+                sdkdir = join(install_base, 'WinSDK')
+        if not sdkdir or not isdir(sdkdir):
             # If fail, use default new path
             for ver in self.WindowsSdkVersion:
                 intver = ver[:ver.rfind('.')]
-                path = r'Microsoft SDKs\Windows Kits\%s' % (intver)
-                d = os.path.join(self.ProgramFiles, path)
-                if os.path.isdir(d):
+                path = r'Microsoft SDKs\Windows Kits\%s' % intver
+                d = join(self.ProgramFiles, path)
+                if isdir(d):
                     sdkdir = d
-        if not sdkdir or not os.path.isdir(sdkdir):
+        if not sdkdir or not isdir(sdkdir):
             # If fail, use default old path
             for ver in self.WindowsSdkVersion:
                 path = r'Microsoft SDKs\Windows\v%s' % ver
-                d = os.path.join(self.ProgramFiles, path)
-                if os.path.isdir(d):
+                d = join(self.ProgramFiles, path)
+                if isdir(d):
                     sdkdir = d
         if not sdkdir:
             # If fail, use Platform SDK
-            sdkdir = os.path.join(self.VCInstallDir, 'PlatformSDK')
+            sdkdir = join(self.VCInstallDir, 'PlatformSDK')
         return sdkdir
 
     @property
     def WindowsSDKExecutablePath(self):
         """
         Microsoft Windows SDK executable directory.
+
+        Return
+        ------
+        str
+            path
         """
         # Find WinSDK NetFx Tools registry dir name
-        if self.vc_ver <= 11.0:
+        if self.vs_ver <= 11.0:
             netfxver = 35
             arch = ''
         else:
             netfxver = 40
-            hidex86 = True if self.vc_ver <= 12.0 else False
+            hidex86 = True if self.vs_ver <= 12.0 else False
             arch = self.pi.current_dir(x64=True, hidex86=hidex86)
         fx = 'WinSDK-NetFx%dTools%s' % (netfxver, arch.replace('\\', '-'))
 
-        # liste all possibles registry paths
+        # list all possibles registry paths
         regpaths = []
-        if self.vc_ver >= 14.0:
+        if self.vs_ver >= 14.0:
             for ver in self.NetFxSdkVersion:
-                regpaths += [os.path.join(self.ri.netfx_sdk, ver, fx)]
+                regpaths += [join(self.ri.netfx_sdk, ver, fx)]
 
         for ver in self.WindowsSdkVersion:
-            regpaths += [os.path.join(self.ri.windows_sdk, 'v%sA' % ver, fx)]
+            regpaths += [join(self.ri.windows_sdk, 'v%sA' % ver, fx)]
 
         # Return installation folder from the more recent path
         for path in regpaths:
             execpath = self.ri.lookup(path, 'installationfolder')
             if execpath:
-                break
-        return execpath
+                return execpath
 
     @property
     def FSharpInstallDir(self):
         """
         Microsoft Visual F# directory.
+
+        Return
+        ------
+        str
+            path
         """
-        path = r'%0.1f\Setup\F#' % self.vc_ver
-        path = os.path.join(self.ri.visualstudio, path)
+        path = join(self.ri.visualstudio, r'%0.1f\Setup\F#' % self.vs_ver)
         return self.ri.lookup(path, 'productdir') or ''
 
     @property
     def UniversalCRTSdkDir(self):
         """
         Microsoft Universal CRT SDK directory.
+
+        Return
+        ------
+        str
+            path
         """
         # Set Kit Roots versions for specified MSVC++ version
-        if self.vc_ver >= 14.0:
-            vers = ('10', '81')
-        else:
-            vers = ()
+        vers = ('10', '81') if self.vs_ver >= 14.0 else ()
 
         # Find path of the more recent Kit
         for ver in vers:
             sdkdir = self.ri.lookup(self.ri.windows_kits_roots,
                                     'kitsroot%s' % ver)
             if sdkdir:
-                break
-        return sdkdir or ''
+                return sdkdir or ''
 
     @property
     def UniversalCRTSdkLastVersion(self):
         """
-        Microsoft Universal C Runtime SDK last version
+        Microsoft Universal C Runtime SDK last version.
+
+        Return
+        ------
+        str
+            version
         """
-        return self._use_last_dir_name(os.path.join(
-            self.UniversalCRTSdkDir, 'lib'))
+        return self._use_last_dir_name(join(self.UniversalCRTSdkDir, 'lib'))
 
     @property
     def NetFxSdkVersion(self):
         """
         Microsoft .NET Framework SDK versions.
+
+        Return
+        ------
+        tuple of str
+            versions
         """
-        # Set FxSdk versions for specified MSVC++ version
-        if self.vc_ver >= 14.0:
-            return ('4.6.1', '4.6')
-        else:
-            return ()
+        # Set FxSdk versions for specified VS version
+        return (('4.7.2', '4.7.1', '4.7',
+                 '4.6.2', '4.6.1', '4.6',
+                 '4.5.2', '4.5.1', '4.5')
+                if self.vs_ver >= 14.0 else ())
 
     @property
     def NetFxSdkDir(self):
         """
         Microsoft .NET Framework SDK directory.
+
+        Return
+        ------
+        str
+            path
         """
+        sdkdir = ''
         for ver in self.NetFxSdkVersion:
-            loc = os.path.join(self.ri.netfx_sdk, ver)
+            loc = join(self.ri.netfx_sdk, ver)
             sdkdir = self.ri.lookup(loc, 'kitsinstallationfolder')
             if sdkdir:
                 break
-        return sdkdir or ''
+        return sdkdir
 
     @property
     def FrameworkDir32(self):
         """
         Microsoft .NET Framework 32bit directory.
+
+        Return
+        ------
+        str
+            path
         """
         # Default path
-        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework')
+        guess_fw = join(self.WinDir, r'Microsoft.NET\Framework')
 
         # Try to get path from registry, if fail use default path
         return self.ri.lookup(self.ri.vc, 'frameworkdir32') or guess_fw
@@ -746,9 +953,14 @@ def FrameworkDir32(self):
     def FrameworkDir64(self):
         """
         Microsoft .NET Framework 64bit directory.
+
+        Return
+        ------
+        str
+            path
         """
         # Default path
-        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework64')
+        guess_fw = join(self.WinDir, r'Microsoft.NET\Framework64')
 
         # Try to get path from registry, if fail use default path
         return self.ri.lookup(self.ri.vc, 'frameworkdir64') or guess_fw
@@ -757,6 +969,11 @@ def FrameworkDir64(self):
     def FrameworkVersion32(self):
         """
         Microsoft .NET Framework 32bit versions.
+
+        Return
+        ------
+        tuple of str
+            versions
         """
         return self._find_dot_net_versions(32)
 
@@ -764,6 +981,11 @@ def FrameworkVersion32(self):
     def FrameworkVersion64(self):
         """
         Microsoft .NET Framework 64bit versions.
+
+        Return
+        ------
+        tuple of str
+            versions
         """
         return self._find_dot_net_versions(64)
 
@@ -775,6 +997,11 @@ def _find_dot_net_versions(self, bits):
         ----------
         bits: int
             Platform number of bits: 32 or 64.
+
+        Return
+        ------
+        tuple of str
+            versions
         """
         # Find actual .NET version in registry
         reg_ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits)
@@ -782,18 +1009,17 @@ def _find_dot_net_versions(self, bits):
         ver = reg_ver or self._use_last_dir_name(dot_net_dir, 'v') or ''
 
         # Set .NET versions for specified MSVC++ version
-        if self.vc_ver >= 12.0:
-            frameworkver = (ver, 'v4.0')
-        elif self.vc_ver >= 10.0:
-            frameworkver = ('v4.0.30319' if ver.lower()[:2] != 'v4' else ver,
-                            'v3.5')
-        elif self.vc_ver == 9.0:
-            frameworkver = ('v3.5', 'v2.0.50727')
-        if self.vc_ver == 8.0:
-            frameworkver = ('v3.0', 'v2.0.50727')
-        return frameworkver
-
-    def _use_last_dir_name(self, path, prefix=''):
+        if self.vs_ver >= 12.0:
+            return ver, 'v4.0'
+        elif self.vs_ver >= 10.0:
+            return 'v4.0.30319' if ver.lower()[:2] != 'v4' else ver, 'v3.5'
+        elif self.vs_ver == 9.0:
+            return 'v3.5', 'v2.0.50727'
+        elif self.vs_ver == 8.0:
+            return 'v3.0', 'v2.0.50727'
+
+    @staticmethod
+    def _use_last_dir_name(path, prefix=''):
         """
         Return name of the last dir in path or '' if no dir found.
 
@@ -802,12 +1028,17 @@ def _use_last_dir_name(self, path, prefix=''):
         path: str
             Use dirs in this path
         prefix: str
-            Use only dirs startings by this prefix
+            Use only dirs starting by this prefix
+
+        Return
+        ------
+        str
+            name
         """
         matching_dirs = (
             dir_name
-            for dir_name in reversed(os.listdir(path))
-            if os.path.isdir(os.path.join(path, dir_name)) and
+            for dir_name in reversed(listdir(path))
+            if isdir(join(path, dir_name)) and
             dir_name.startswith(prefix)
         )
         return next(matching_dirs, None) or ''
@@ -818,7 +1049,7 @@ class EnvironmentInfo:
     Return environment variables for specified Microsoft Visual C++ version
     and platform : Lib, Include, Path and libpath.
 
-    This function is compatible with Microsoft Visual C++ 9.0 to 14.0.
+    This function is compatible with Microsoft Visual C++ 9.0 to 14.X.
 
     Script created by analysing Microsoft environment configuration files like
     "vcvars[...].bat", "SetEnv.Cmd", "vcbuildtools.bat", ...
@@ -835,7 +1066,7 @@ class EnvironmentInfo:
     """
 
     # Variables and properties in this class use originals CamelCase variables
-    # names from Microsoft source files for more easy comparaison.
+    # names from Microsoft source files for more easy comparison.
 
     def __init__(self, arch, vc_ver=None, vc_min_ver=0):
         self.pi = PlatformInfo(arch)
@@ -846,205 +1077,255 @@ def __init__(self, arch, vc_ver=None, vc_min_ver=0):
             err = 'No suitable Microsoft Visual C++ version found'
             raise distutils.errors.DistutilsPlatformError(err)
 
+    @property
+    def vs_ver(self):
+        """
+        Microsoft Visual Studio.
+
+        Return
+        ------
+        float
+            version
+        """
+        return self.si.vs_ver
+
     @property
     def vc_ver(self):
         """
         Microsoft Visual C++ version.
+
+        Return
+        ------
+        float
+            version
         """
         return self.si.vc_ver
 
     @property
     def VSTools(self):
         """
-        Microsoft Visual Studio Tools
+        Microsoft Visual Studio Tools.
+
+        Return
+        ------
+        list of str
+            paths
         """
         paths = [r'Common7\IDE', r'Common7\Tools']
 
-        if self.vc_ver >= 14.0:
+        if self.vs_ver >= 14.0:
             arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             paths += [r'Common7\IDE\CommonExtensions\Microsoft\TestWindow']
             paths += [r'Team Tools\Performance Tools']
             paths += [r'Team Tools\Performance Tools%s' % arch_subdir]
 
-        return [os.path.join(self.si.VSInstallDir, path) for path in paths]
+        return [join(self.si.VSInstallDir, path) for path in paths]
 
     @property
     def VCIncludes(self):
         """
-        Microsoft Visual C++ & Microsoft Foundation Class Includes
+        Microsoft Visual C++ & Microsoft Foundation Class Includes.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        return [os.path.join(self.si.VCInstallDir, 'Include'),
-                os.path.join(self.si.VCInstallDir, r'ATLMFC\Include')]
+        return [join(self.si.VCInstallDir, 'Include'),
+                join(self.si.VCInstallDir, r'ATLMFC\Include')]
 
     @property
     def VCLibraries(self):
         """
-        Microsoft Visual C++ & Microsoft Foundation Class Libraries
+        Microsoft Visual C++ & Microsoft Foundation Class Libraries.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver >= 15.0:
+        if self.vs_ver >= 15.0:
             arch_subdir = self.pi.target_dir(x64=True)
         else:
             arch_subdir = self.pi.target_dir(hidex86=True)
         paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
 
-        if self.vc_ver >= 14.0:
+        if self.vs_ver >= 14.0:
             paths += [r'Lib\store%s' % arch_subdir]
 
-        return [os.path.join(self.si.VCInstallDir, path) for path in paths]
+        return [join(self.si.VCInstallDir, path) for path in paths]
 
     @property
     def VCStoreRefs(self):
         """
-        Microsoft Visual C++ store references Libraries
+        Microsoft Visual C++ store references Libraries.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 14.0:
+        if self.vs_ver < 14.0:
             return []
-        return [os.path.join(self.si.VCInstallDir, r'Lib\store\references')]
+        return [join(self.si.VCInstallDir, r'Lib\store\references')]
 
     @property
     def VCTools(self):
         """
-        Microsoft Visual C++ Tools
+        Microsoft Visual C++ Tools.
+
+        Return
+        ------
+        list of str
+            paths
         """
         si = self.si
-        tools = [os.path.join(si.VCInstallDir, 'VCPackages')]
+        tools = [join(si.VCInstallDir, 'VCPackages')]
 
-        forcex86 = True if self.vc_ver <= 10.0 else False
+        forcex86 = True if self.vs_ver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
         if arch_subdir:
-            tools += [os.path.join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
+            tools += [join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
-        if self.vc_ver == 14.0:
+        if self.vs_ver == 14.0:
             path = 'Bin%s' % self.pi.current_dir(hidex86=True)
-            tools += [os.path.join(si.VCInstallDir, path)]
+            tools += [join(si.VCInstallDir, path)]
 
-        elif self.vc_ver >= 15.0:
+        elif self.vs_ver >= 15.0:
             host_dir = (r'bin\HostX86%s' if self.pi.current_is_x86() else
                         r'bin\HostX64%s')
-            tools += [os.path.join(
+            tools += [join(
                 si.VCInstallDir, host_dir % self.pi.target_dir(x64=True))]
 
             if self.pi.current_cpu != self.pi.target_cpu:
-                tools += [os.path.join(
+                tools += [join(
                     si.VCInstallDir, host_dir % self.pi.current_dir(x64=True))]
 
         else:
-            tools += [os.path.join(si.VCInstallDir, 'Bin')]
+            tools += [join(si.VCInstallDir, 'Bin')]
 
         return tools
 
     @property
     def OSLibraries(self):
         """
-        Microsoft Windows SDK Libraries
+        Microsoft Windows SDK Libraries.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver <= 10.0:
+        if self.vs_ver <= 10.0:
             arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
-            return [os.path.join(self.si.WindowsSdkDir, 'Lib%s' % arch_subdir)]
+            return [join(self.si.WindowsSdkDir, 'Lib%s' % arch_subdir)]
 
         else:
             arch_subdir = self.pi.target_dir(x64=True)
-            lib = os.path.join(self.si.WindowsSdkDir, 'lib')
+            lib = join(self.si.WindowsSdkDir, 'lib')
             libver = self._sdk_subdir
-            return [os.path.join(lib, '%sum%s' % (libver , arch_subdir))]
+            return [join(lib, '%sum%s' % (libver , arch_subdir))]
 
     @property
     def OSIncludes(self):
         """
-        Microsoft Windows SDK Include
+        Microsoft Windows SDK Include.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        include = os.path.join(self.si.WindowsSdkDir, 'include')
+        include = join(self.si.WindowsSdkDir, 'include')
 
-        if self.vc_ver <= 10.0:
-            return [include, os.path.join(include, 'gl')]
+        if self.vs_ver <= 10.0:
+            return [include, join(include, 'gl')]
 
         else:
-            if self.vc_ver >= 14.0:
+            if self.vs_ver >= 14.0:
                 sdkver = self._sdk_subdir
             else:
                 sdkver = ''
-            return [os.path.join(include, '%sshared' % sdkver),
-                    os.path.join(include, '%sum' % sdkver),
-                    os.path.join(include, '%swinrt' % sdkver)]
+            return [join(include, '%sshared' % sdkver),
+                    join(include, '%sum' % sdkver),
+                    join(include, '%swinrt' % sdkver)]
 
     @property
     def OSLibpath(self):
         """
-        Microsoft Windows SDK Libraries Paths
+        Microsoft Windows SDK Libraries Paths.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        ref = os.path.join(self.si.WindowsSdkDir, 'References')
+        ref = join(self.si.WindowsSdkDir, 'References')
         libpath = []
 
-        if self.vc_ver <= 9.0:
+        if self.vs_ver <= 9.0:
             libpath += self.OSLibraries
 
-        if self.vc_ver >= 11.0:
-            libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')]
+        if self.vs_ver >= 11.0:
+            libpath += [join(ref, r'CommonConfiguration\Neutral')]
 
-        if self.vc_ver >= 14.0:
+        if self.vs_ver >= 14.0:
             libpath += [
                 ref,
-                os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                os.path.join(
-                    ref,
-                    'Windows.Foundation.UniversalApiContract',
-                    '1.0.0.0',
-                ),
-                os.path.join(
-                    ref,
-                    'Windows.Foundation.FoundationContract',
-                    '1.0.0.0',
-                ),
-                os.path.join(
-                    ref,
-                    'Windows.Networking.Connectivity.WwanContract',
-                    '1.0.0.0',
-                ),
-                os.path.join(
-                    self.si.WindowsSdkDir,
-                    'ExtensionSDKs',
-                    'Microsoft.VCLibs',
-                    '%0.1f' % self.vc_ver,
-                    'References',
-                    'CommonConfiguration',
-                    'neutral',
-                ),
+                join(self.si.WindowsSdkDir, 'UnionMetadata'),
+                join(ref, 'Windows.Foundation.UniversalApiContract', '1.0.0.0'),
+                join(ref, 'Windows.Foundation.FoundationContract', '1.0.0.0'),
+                join(ref,'Windows.Networking.Connectivity.WwanContract',
+                     '1.0.0.0'),
+                join(self.si.WindowsSdkDir, 'ExtensionSDKs', 'Microsoft.VCLibs',
+                     '%0.1f' % self.vs_ver, 'References', 'CommonConfiguration',
+                     'neutral'),
             ]
         return libpath
 
     @property
     def SdkTools(self):
         """
-        Microsoft Windows SDK Tools
+        Microsoft Windows SDK Tools.
+
+        Return
+        ------
+        list of str
+            paths
         """
         return list(self._sdk_tools())
 
     def _sdk_tools(self):
         """
-        Microsoft Windows SDK Tools paths generator
+        Microsoft Windows SDK Tools paths generator.
+
+        Return
+        ------
+        generator of str
+            paths
         """
-        if self.vc_ver < 15.0:
-            bin_dir = 'Bin' if self.vc_ver <= 11.0 else r'Bin\x86'
-            yield os.path.join(self.si.WindowsSdkDir, bin_dir)
+        if self.vs_ver < 15.0:
+            bin_dir = 'Bin' if self.vs_ver <= 11.0 else r'Bin\x86'
+            yield join(self.si.WindowsSdkDir, bin_dir)
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
             path = 'Bin%s' % arch_subdir
-            yield os.path.join(self.si.WindowsSdkDir, path)
+            yield join(self.si.WindowsSdkDir, path)
 
-        if self.vc_ver == 10.0 or self.vc_ver == 11.0:
+        if self.vs_ver in (10.0, 11.0):
             if self.pi.target_is_x86():
                 arch_subdir = ''
             else:
                 arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
-            yield os.path.join(self.si.WindowsSdkDir, path)
+            yield join(self.si.WindowsSdkDir, path)
 
-        elif self.vc_ver >= 15.0:
-            path = os.path.join(self.si.WindowsSdkDir, 'Bin')
+        elif self.vs_ver >= 15.0:
+            path = join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
             sdkver = self.si.WindowsSdkLastVersion
-            yield os.path.join(path, '%s%s' % (sdkver, arch_subdir))
+            yield join(path, '%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
             yield self.si.WindowsSDKExecutablePath
@@ -1052,7 +1333,12 @@ def _sdk_tools(self):
     @property
     def _sdk_subdir(self):
         """
-        Microsoft Windows SDK version subdir
+        Microsoft Windows SDK version subdir.
+
+        Return
+        ------
+        str
+            subdir
         """
         ucrtver = self.si.WindowsSdkLastVersion
         return ('%s\\' % ucrtver) if ucrtver else ''
@@ -1060,22 +1346,32 @@ def _sdk_subdir(self):
     @property
     def SdkSetup(self):
         """
-        Microsoft Windows SDK Setup
+        Microsoft Windows SDK Setup.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver > 9.0:
+        if self.vs_ver > 9.0:
             return []
 
-        return [os.path.join(self.si.WindowsSdkDir, 'Setup')]
+        return [join(self.si.WindowsSdkDir, 'Setup')]
 
     @property
     def FxTools(self):
         """
-        Microsoft .NET Framework Tools
+        Microsoft .NET Framework Tools.
+
+        Return
+        ------
+        list of str
+            paths
         """
         pi = self.pi
         si = self.si
 
-        if self.vc_ver <= 10.0:
+        if self.vs_ver <= 10.0:
             include32 = True
             include64 = not pi.target_is_x86() and not pi.current_is_x86()
         else:
@@ -1084,102 +1380,142 @@ def FxTools(self):
 
         tools = []
         if include32:
-            tools += [os.path.join(si.FrameworkDir32, ver)
+            tools += [join(si.FrameworkDir32, ver)
                       for ver in si.FrameworkVersion32]
         if include64:
-            tools += [os.path.join(si.FrameworkDir64, ver)
+            tools += [join(si.FrameworkDir64, ver)
                       for ver in si.FrameworkVersion64]
         return tools
 
     @property
     def NetFxSDKLibraries(self):
         """
-        Microsoft .Net Framework SDK Libraries
+        Microsoft .Net Framework SDK Libraries.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 14.0 or not self.si.NetFxSdkDir:
+        if self.vs_ver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
-        return [os.path.join(self.si.NetFxSdkDir, r'lib\um%s' % arch_subdir)]
+        return [join(self.si.NetFxSdkDir, r'lib\um%s' % arch_subdir)]
 
     @property
     def NetFxSDKIncludes(self):
         """
-        Microsoft .Net Framework SDK Includes
+        Microsoft .Net Framework SDK Includes.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 14.0 or not self.si.NetFxSdkDir:
+        if self.vs_ver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
-        return [os.path.join(self.si.NetFxSdkDir, r'include\um')]
+        return [join(self.si.NetFxSdkDir, r'include\um')]
 
     @property
     def VsTDb(self):
         """
-        Microsoft Visual Studio Team System Database
+        Microsoft Visual Studio Team System Database.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        return [os.path.join(self.si.VSInstallDir, r'VSTSDB\Deploy')]
+        return [join(self.si.VSInstallDir, r'VSTSDB\Deploy')]
 
     @property
     def MSBuild(self):
         """
-        Microsoft Build Engine
+        Microsoft Build Engine.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 12.0:
+        if self.vs_ver < 12.0:
             return []
-        elif self.vc_ver < 15.0:
+        elif self.vs_ver < 15.0:
             base_path = self.si.ProgramFilesx86
             arch_subdir = self.pi.current_dir(hidex86=True)
         else:
             base_path = self.si.VSInstallDir
             arch_subdir = ''
 
-        path = r'MSBuild\%0.1f\bin%s' % (self.vc_ver, arch_subdir)
-        build = [os.path.join(base_path, path)]
+        path = r'MSBuild\%0.1f\bin%s' % (self.vs_ver, arch_subdir)
+        build = [join(base_path, path)]
 
-        if self.vc_ver >= 15.0:
+        if self.vs_ver >= 15.0:
             # Add Roslyn C# & Visual Basic Compiler
-            build += [os.path.join(base_path, path, 'Roslyn')]
+            build += [join(base_path, path, 'Roslyn')]
 
         return build
 
     @property
     def HTMLHelpWorkshop(self):
         """
-        Microsoft HTML Help Workshop
+        Microsoft HTML Help Workshop.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 11.0:
+        if self.vs_ver < 11.0:
             return []
 
-        return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
+        return [join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
 
     @property
     def UCRTLibraries(self):
         """
-        Microsoft Universal C Runtime SDK Libraries
+        Microsoft Universal C Runtime SDK Libraries.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 14.0:
+        if self.vs_ver < 14.0:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
-        lib = os.path.join(self.si.UniversalCRTSdkDir, 'lib')
+        lib = join(self.si.UniversalCRTSdkDir, 'lib')
         ucrtver = self._ucrt_subdir
-        return [os.path.join(lib, '%sucrt%s' % (ucrtver, arch_subdir))]
+        return [join(lib, '%sucrt%s' % (ucrtver, arch_subdir))]
 
     @property
     def UCRTIncludes(self):
         """
-        Microsoft Universal C Runtime SDK Include
+        Microsoft Universal C Runtime SDK Include.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 14.0:
+        if self.vs_ver < 14.0:
             return []
 
-        include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
-        return [os.path.join(include, '%sucrt' % self._ucrt_subdir)]
+        include = join(self.si.UniversalCRTSdkDir, 'include')
+        return [join(include, '%sucrt' % self._ucrt_subdir)]
 
     @property
     def _ucrt_subdir(self):
         """
-        Microsoft Universal C Runtime SDK version subdir
+        Microsoft Universal C Runtime SDK version subdir.
+
+        Return
+        ------
+        str
+            subdir
         """
         ucrtver = self.si.UniversalCRTSdkLastVersion
         return ('%s\\' % ucrtver) if ucrtver else ''
@@ -1187,31 +1523,52 @@ def _ucrt_subdir(self):
     @property
     def FSharp(self):
         """
-        Microsoft Visual F#
+        Microsoft Visual F#.
+
+        Return
+        ------
+        list of str
+            paths
         """
-        if self.vc_ver < 11.0 and self.vc_ver > 12.0:
+        if 11.0 > self.vs_ver > 12.0:
             return []
 
-        return self.si.FSharpInstallDir
+        return [self.si.FSharpInstallDir]
 
     @property
     def VCRuntimeRedist(self):
         """
-        Microsoft Visual C++ runtime redistribuable dll
-        """
-        arch_subdir = self.pi.target_dir(x64=True)
-        if self.vc_ver < 15:
-            redist_path = self.si.VCInstallDir
-            vcruntime = 'redist%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
-        else:
-            redist_path = self.si.VCInstallDir.replace('\\Tools', '\\Redist')
-            vcruntime = 'onecore%s\\Microsoft.VC%d0.CRT\\vcruntime%d0.dll'
-
-        # Visual Studio 2017  is still Visual C++ 14.0
-        dll_ver = 14.0 if self.vc_ver == 15 else self.vc_ver
+        Microsoft Visual C++ runtime redistributable dll.
 
-        vcruntime = vcruntime % (arch_subdir, self.vc_ver, dll_ver)
-        return os.path.join(redist_path, vcruntime)
+        Return
+        ------
+        str
+            path
+        """
+        vcruntime = 'vcruntime%d0.dll' % self.vc_ver
+        arch_subdir = self.pi.target_dir(x64=True).strip('\\')
+
+        # Installation prefixes candidates
+        prefixes = []
+        tools_path = self.si.VCInstallDir
+        redist_path = dirname(tools_path.replace(r'\Tools', r'\Redist'))
+        if isdir(redist_path):
+            # Redist version may not be exactly the same as tools
+            redist_path = join(redist_path, listdir(redist_path)[-1])
+            prefixes += [redist_path, join(redist_path, 'onecore')]
+
+        prefixes += [join(tools_path, 'redist')]  # VS14 legacy path
+
+        # CRT directory
+        crt_dirs = ('Microsoft.VC%d.CRT' % (self.vc_ver * 10),
+                    # Sometime store in directory with VS version instead of VC
+                    'Microsoft.VC%d.CRT' % (int(self.vs_ver) * 10))
+
+        # vcruntime path
+        for prefix, crt_dir in itertools.product(prefixes, crt_dirs):
+            path = join(prefix, arch_subdir, crt_dir, vcruntime)
+            if isfile(path):
+                return path
 
     def return_env(self, exists=True):
         """
@@ -1221,6 +1578,11 @@ def return_env(self, exists=True):
         ----------
         exists: bool
             It True, only return existing paths.
+
+        Return
+        ------
+        dict
+            environment
         """
         env = dict(
             include=self._build_paths('include',
@@ -1254,7 +1616,7 @@ def return_env(self, exists=True):
                                     self.FSharp],
                                    exists),
         )
-        if self.vc_ver >= 14 and os.path.isfile(self.VCRuntimeRedist):
+        if self.vs_ver >= 14 and isfile(self.VCRuntimeRedist):
             env['py_vcruntime_redist'] = self.VCRuntimeRedist
         return env
 
@@ -1265,20 +1627,35 @@ def _build_paths(self, name, spec_path_lists, exists):
         unique, extant, directories from those paths and from
         the environment variable. Raise an error if no paths
         are resolved.
+
+        Parameters
+        ----------
+        name: str
+            Environment variable name
+        spec_path_lists: list of str
+            Paths
+        exists: bool
+            It True, only return existing paths.
+
+        Return
+        ------
+        str
+            Pathsep-separated paths
         """
         # flatten spec_path_lists
         spec_paths = itertools.chain.from_iterable(spec_path_lists)
-        env_paths = safe_env.get(name, '').split(os.pathsep)
+        env_paths = environ.get(name, '').split(pathsep)
         paths = itertools.chain(spec_paths, env_paths)
-        extant_paths = list(filter(os.path.isdir, paths)) if exists else paths
+        extant_paths = list(filter(isdir, paths)) if exists else paths
         if not extant_paths:
             msg = "%s environment variable is empty" % name.upper()
             raise distutils.errors.DistutilsPlatformError(msg)
         unique_paths = self._unique_everseen(extant_paths)
-        return os.pathsep.join(unique_paths)
+        return pathsep.join(unique_paths)
 
     # from Python docs
-    def _unique_everseen(self, iterable, key=None):
+    @staticmethod
+    def _unique_everseen(iterable, key=None):
         """
         List unique elements, preserving order.
         Remember all elements ever seen.

From cab8dd1a30b14542fcfe7ab63f8cd8b5358222da Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 8 Aug 2019 08:42:54 +0300
Subject: [PATCH 7501/8469] bpo-37685: Fixed __eq__, __lt__ etc implementations
 in some classes. (GH-14952)

They now return NotImplemented for unsupported type of the other operand.
---
 tests/test_version.py | 16 ++++++++++++++++
 version.py            |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/tests/test_version.py b/tests/test_version.py
index 15f14c7de3..8671cd2fc5 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -45,6 +45,14 @@ def test_cmp_strict(self):
             self.assertEqual(res, wanted,
                              'cmp(%s, %s) should be %s, got %s' %
                              (v1, v2, wanted, res))
+            res = StrictVersion(v1)._cmp(v2)
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
+            res = StrictVersion(v1)._cmp(object())
+            self.assertIs(res, NotImplemented,
+                          'cmp(%s, %s) should be NotImplemented, got %s' %
+                          (v1, v2, res))
 
 
     def test_cmp(self):
@@ -63,6 +71,14 @@ def test_cmp(self):
             self.assertEqual(res, wanted,
                              'cmp(%s, %s) should be %s, got %s' %
                              (v1, v2, wanted, res))
+            res = LooseVersion(v1)._cmp(v2)
+            self.assertEqual(res, wanted,
+                             'cmp(%s, %s) should be %s, got %s' %
+                             (v1, v2, wanted, res))
+            res = LooseVersion(v1)._cmp(object())
+            self.assertIs(res, NotImplemented,
+                          'cmp(%s, %s) should be NotImplemented, got %s' %
+                          (v1, v2, res))
 
 def test_suite():
     return unittest.makeSuite(VersionTestCase)
diff --git a/version.py b/version.py
index af14cc1348..c33bebaed2 100644
--- a/version.py
+++ b/version.py
@@ -166,6 +166,8 @@ def __str__ (self):
     def _cmp (self, other):
         if isinstance(other, str):
             other = StrictVersion(other)
+        elif not isinstance(other, StrictVersion):
+            return NotImplemented
 
         if self.version != other.version:
             # numeric versions don't match
@@ -331,6 +333,8 @@ def __repr__ (self):
     def _cmp (self, other):
         if isinstance(other, str):
             other = LooseVersion(other)
+        elif not isinstance(other, LooseVersion):
+            return NotImplemented
 
         if self.version == other.version:
             return 0

From a85a63840b076c7a9d165db731ca6d1be28287e8 Mon Sep 17 00:00:00 2001
From: Pablo Galindo <Pablogsal@gmail.com>
Date: Thu, 8 Aug 2019 23:25:46 +0100
Subject: [PATCH 7502/8469] bpo-37795: Capture DeprecationWarnings in the test
 suite (GH-15184)

---
 tests/test_bdist.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/test_bdist.py b/tests/test_bdist.py
index c80b3edc02..130d8bf155 100644
--- a/tests/test_bdist.py
+++ b/tests/test_bdist.py
@@ -2,6 +2,7 @@
 import os
 import unittest
 from test.support import run_unittest
+import warnings
 
 from distutils.command.bdist import bdist
 from distutils.tests import support
@@ -38,7 +39,10 @@ def test_skip_build(self):
             names.append('bdist_msi')
 
         for name in names:
-            subcmd = cmd.get_finalized_command(name)
+            with warnings.catch_warnings():
+                warnings.filterwarnings('ignore', 'bdist_wininst command is deprecated',
+                                        DeprecationWarning)
+                subcmd = cmd.get_finalized_command(name)
             if getattr(subcmd, '_unsupported', False):
                 # command is not supported on this build
                 continue

From 5405d1e2770e798ed755e8cc821f6b95cb480d52 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 12 Aug 2019 06:18:19 +0200
Subject: [PATCH 7503/8469] travis: update PyPy jobs to use more recent
 versions

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ffcad99864..64d0544c27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ jobs:
     python: 2.7
   - <<: *latest_py2
     env: LANG=C
-  - python: pypy2.7-6.0.0
+  - python: pypy
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
-  - python: pypy3.5-6.0.0
+  - python: pypy3
     env: DISABLE_COVERAGE=1
   - python: 3.4
   - python: 3.5

From b03652f642a8ea04644eb7d5b38223148dea5611 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 13 Aug 2019 01:10:05 +0200
Subject: [PATCH 7504/8469] pkg_resources: fix ``Requirement`` hash/equality
 implementation

Take PEP 508 direct URL into account.
---
 changelog.d/1814.change.rst           |  1 +
 pkg_resources/__init__.py             |  1 +
 pkg_resources/tests/test_resources.py | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 changelog.d/1814.change.rst

diff --git a/changelog.d/1814.change.rst b/changelog.d/1814.change.rst
new file mode 100644
index 0000000000..c936699dd8
--- /dev/null
+++ b/changelog.d/1814.change.rst
@@ -0,0 +1 @@
+Fix ``pkg_resources.Requirement`` hash/equality implementation: take PEP 508 direct URL into account.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 1f170cfda5..e75769d720 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3109,6 +3109,7 @@ def __init__(self, requirement_string):
         self.extras = tuple(map(safe_extra, self.extras))
         self.hashCmp = (
             self.key,
+            self.url,
             self.specifier,
             frozenset(self.extras),
             str(self.marker) if self.marker else None,
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 86afcf7411..42c801a746 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -520,6 +520,11 @@ def testOrdering(self):
         assert r1 == r2
         assert str(r1) == str(r2)
         assert str(r2) == "Twisted==1.2c1,>=1.2"
+        assert (
+            Requirement("Twisted")
+            !=
+            Requirement("Twisted @ https://localhost/twisted.zip")
+        )
 
     def testBasicContains(self):
         r = Requirement("Twisted>=1.2")
@@ -546,11 +551,23 @@ def testOptionsAndHashing(self):
             ==
             hash((
                 "twisted",
+                None,
                 packaging.specifiers.SpecifierSet(">=1.2"),
                 frozenset(["foo", "bar"]),
                 None
             ))
         )
+        assert (
+            hash(Requirement.parse("Twisted @ https://localhost/twisted.zip"))
+            ==
+            hash((
+                "twisted",
+                "https://localhost/twisted.zip",
+                packaging.specifiers.SpecifierSet(),
+                frozenset(),
+                None
+            ))
+        )
 
     def testVersionEquality(self):
         r1 = Requirement.parse("foo==0.3a2")

From cd92d8a98f388b33fd7d5f24d096408408426b0c Mon Sep 17 00:00:00 2001
From: Christopher Head <chead@chead.ca>
Date: Mon, 12 Aug 2019 21:37:34 -0700
Subject: [PATCH 7505/8469] Document using asterisk in package_data section

---
 docs/setuptools.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2e7fe3bd93..3509a301d0 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2416,7 +2416,7 @@ tests_require            list-semi
 include_package_data     bool
 packages                 find:, find_namespace:, list-comma
 package_dir              dict
-package_data             section
+package_data             section                                              (1)
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma
@@ -2433,6 +2433,10 @@ data_files               dict                                 40.6.0
 
     **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
 
+Notes:
+1. In the `package_data` section, a key named with a single asterisk (`*`)
+refers to all packages, in lieu of the empty string used in `setup.py`.
+
 
 Configuration API
 =================

From 95d72cc558c7dddef164eb09a880b95e2f484bee Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2019 09:42:47 -0400
Subject: [PATCH 7506/8469] =?UTF-8?q?Bump=20version:=2041.0.1=20=E2=86=92?=
 =?UTF-8?q?=2041.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 13 +++++++++++++
 changelog.d/1697.change.rst |  1 -
 changelog.d/1749.change.rst |  1 -
 changelog.d/1750.change.rst |  1 -
 changelog.d/1756.change.rst |  1 -
 changelog.d/1769.change.rst |  1 -
 changelog.d/1776.doc.rst    |  1 -
 changelog.d/1788.change.rst |  1 -
 changelog.d/1790.change.rst |  2 --
 setup.cfg                   |  2 +-
 11 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 changelog.d/1697.change.rst
 delete mode 100644 changelog.d/1749.change.rst
 delete mode 100644 changelog.d/1750.change.rst
 delete mode 100644 changelog.d/1756.change.rst
 delete mode 100644 changelog.d/1769.change.rst
 delete mode 100644 changelog.d/1776.doc.rst
 delete mode 100644 changelog.d/1788.change.rst
 delete mode 100644 changelog.d/1790.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 87acb5ef8d..5a4536605c 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.0.1
+current_version = 41.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 9da2253792..9f9603c043 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v41.1.0
+-------
+
+* #1697: Moved most of the constants from setup.py to setup.cfg
+* #1749: Fixed issue with the PEP 517 backend where building a source distribution would fail if any tarball existed in the destination directory.
+* #1750: Fixed an issue with PEP 517 backend where wheel builds would fail if the destination directory did not already exist.
+* #1756: Forse metadata-version >= 1.2. when project urls are present.
+* #1769: Improve ``package_data`` check: ensure the dictionary values are lists/tuples of strings.
+* #1788: Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
+* #1790: Added the file path to the error message when a ``UnicodeDecodeError`` occurs while reading a metadata file.
+* #1776: Use license classifiers rather than the license field.
+
+
 v41.0.1
 -------
 
diff --git a/changelog.d/1697.change.rst b/changelog.d/1697.change.rst
deleted file mode 100644
index 44818b3c14..0000000000
--- a/changelog.d/1697.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Moved most of the constants from setup.py to setup.cfg
diff --git a/changelog.d/1749.change.rst b/changelog.d/1749.change.rst
deleted file mode 100644
index de67807234..0000000000
--- a/changelog.d/1749.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed issue with the PEP 517 backend where building a source distribution would fail if any tarball existed in the destination directory.
diff --git a/changelog.d/1750.change.rst b/changelog.d/1750.change.rst
deleted file mode 100644
index 7a22229ef3..0000000000
--- a/changelog.d/1750.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an issue with PEP 517 backend where wheel builds would fail if the destination directory did not already exist.
diff --git a/changelog.d/1756.change.rst b/changelog.d/1756.change.rst
deleted file mode 100644
index 5c908d3529..0000000000
--- a/changelog.d/1756.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Forse metadata-version >= 1.2. when project urls are present.
diff --git a/changelog.d/1769.change.rst b/changelog.d/1769.change.rst
deleted file mode 100644
index d48a23b632..0000000000
--- a/changelog.d/1769.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve ``package_data`` check: ensure the dictionary values are lists/tuples of strings.
diff --git a/changelog.d/1776.doc.rst b/changelog.d/1776.doc.rst
deleted file mode 100644
index d4f1dbca56..0000000000
--- a/changelog.d/1776.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use license classifiers rather than the license field.
diff --git a/changelog.d/1788.change.rst b/changelog.d/1788.change.rst
deleted file mode 100644
index d8a49fd41d..0000000000
--- a/changelog.d/1788.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
diff --git a/changelog.d/1790.change.rst b/changelog.d/1790.change.rst
deleted file mode 100644
index e4a7998d8f..0000000000
--- a/changelog.d/1790.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added the file path to the error message when a ``UnicodeDecodeError`` occurs
-while reading a metadata file.
diff --git a/setup.cfg b/setup.cfg
index ff87464bf4..3bcf442987 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.0.1
+version = 41.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 42bd00ada0e0f47c2446d6d1b750eb97eba45640 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2019 09:47:19 -0400
Subject: [PATCH 7507/8469] Prefer token for automated releases

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64d0544c27..13815fd4b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,9 @@ jobs:
       on:
         tags: true
         all_branches: true
-      user: jaraco
+      user: __token__
       password:
-        secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
+        secure: lBgpqft5tKMPRGefCPScPLWNKKGPF89kYrGt3RogqZrb9xB9+52bNrHgt0M5H2EQIRW9IC7/RFRXpT/dF4N8CT1hsljSVQxTQxiGazEYPSdEfOJ2CJxqs0smiL5Ck1T8EQeiuqRSM+/RFEDNaTjp+fe4HhSoPhea6TojAXRSzKdmcDLCwSJOujDccz0yMOagibnqfhO6ZsIv1LUUHWBeeUVrmx+3lz6uAqmNIOQ6hn6YTP4HLoEXTN+IIeQGIzXEZwY2Z/OXakiugxeNZOgRlkikT32KXyZ01hOhOdPOWrtv+q9tAAdqUeQmtdfFb3zy2vBr6bJkvplI5Obh/qHTphWA3iOTOoCICFYPhXY/npztwwqG7jFBRsZbWo1zuP92zUji6OoxK0ezkqEQcIhu+qsUERmsuowriNyFJZK8zVRdGc7JGaZvYe1h9k4l44J+VEIXUurKWji8BpL7dxq/ZPZRf2r5P2JqhU1VkGXrNgfze/N7U1Z1oUkHo1g/5InOl8nDN4Ul0oRXm9tezk5vYO/RMs9hphTdzda4iETikVjnXyHScSLWwI0UqF5MQdKBYsOCJM9deirWG2gXXspkW4HPkYUUe1pTCkaqoQ9+fWHcKTeDVT/52iuCsaSOJccOItyQqH/4nS3i3LaEf11DPMKKL58pbkoMD56p9iSrCCs=
       distributions: release
       skip_cleanup: true
       skip_upload_docs: true

From e40a6035d9e688d5a34077132b49c48dc74932f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 13 Aug 2019 13:39:28 -0400
Subject: [PATCH 7508/8469] Revert "Prefer token for automated releases"

This reverts commit 42bd00ada0e0f47c2446d6d1b750eb97eba45640.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13815fd4b6..64d0544c27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,9 @@ jobs:
       on:
         tags: true
         all_branches: true
-      user: __token__
+      user: jaraco
       password:
-        secure: lBgpqft5tKMPRGefCPScPLWNKKGPF89kYrGt3RogqZrb9xB9+52bNrHgt0M5H2EQIRW9IC7/RFRXpT/dF4N8CT1hsljSVQxTQxiGazEYPSdEfOJ2CJxqs0smiL5Ck1T8EQeiuqRSM+/RFEDNaTjp+fe4HhSoPhea6TojAXRSzKdmcDLCwSJOujDccz0yMOagibnqfhO6ZsIv1LUUHWBeeUVrmx+3lz6uAqmNIOQ6hn6YTP4HLoEXTN+IIeQGIzXEZwY2Z/OXakiugxeNZOgRlkikT32KXyZ01hOhOdPOWrtv+q9tAAdqUeQmtdfFb3zy2vBr6bJkvplI5Obh/qHTphWA3iOTOoCICFYPhXY/npztwwqG7jFBRsZbWo1zuP92zUji6OoxK0ezkqEQcIhu+qsUERmsuowriNyFJZK8zVRdGc7JGaZvYe1h9k4l44J+VEIXUurKWji8BpL7dxq/ZPZRf2r5P2JqhU1VkGXrNgfze/N7U1Z1oUkHo1g/5InOl8nDN4Ul0oRXm9tezk5vYO/RMs9hphTdzda4iETikVjnXyHScSLWwI0UqF5MQdKBYsOCJM9deirWG2gXXspkW4HPkYUUe1pTCkaqoQ9+fWHcKTeDVT/52iuCsaSOJccOItyQqH/4nS3i3LaEf11DPMKKL58pbkoMD56p9iSrCCs=
+        secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
       distributions: release
       skip_cleanup: true
       skip_upload_docs: true

From 05f42a2c14275937250c99478c94b20171d14aeb Mon Sep 17 00:00:00 2001
From: A_Rog <adam.thomas.rogerson@gmail.com>
Date: Wed, 14 Aug 2019 00:40:12 +0100
Subject: [PATCH 7509/8469] Fixed html sidebars to supported version in Sphinx
 (#1804)

---
 .travis.yml               | 2 ++
 changelog.d/1565.misc.rst | 2 ++
 docs/conf.py              | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1565.misc.rst

diff --git a/.travis.yml b/.travis.yml
index 64d0544c27..8441261de9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ jobs:
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
+  - <<: *latest_py3
+    env: TOXENV=docs DISABLE_COVERAGE=1
   - <<: *default_py
     stage: deploy (to PyPI for tagged commits)
     if: tag IS present
diff --git a/changelog.d/1565.misc.rst b/changelog.d/1565.misc.rst
new file mode 100644
index 0000000000..ca15573a1b
--- /dev/null
+++ b/changelog.d/1565.misc.rst
@@ -0,0 +1,2 @@
+Changed html_sidebars from string to list of string as per
+https://www.sphinx-doc.org/en/master/changes.html#id58 
diff --git a/docs/conf.py b/docs/conf.py
index c7eb6d3f3c..cbd19fb470 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -69,7 +69,7 @@
 html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {'index': ['relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html']}
 
 # If false, no module index is generated.
 html_use_modindex = False

From eb7436b36f9967d1becd2b822da548bd59b35d05 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 8 Jul 2019 09:32:21 -0700
Subject: [PATCH 7510/8469] Fix some usage of deprecated `imp` module

---
 changelog.d/479.change.rst        |  1 +
 setuptools/command/build_ext.py   | 10 ++++++++--
 setuptools/command/install_lib.py |  6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/479.change.rst

diff --git a/changelog.d/479.change.rst b/changelog.d/479.change.rst
new file mode 100644
index 0000000000..d494c0fc7c
--- /dev/null
+++ b/changelog.d/479.change.rst
@@ -0,0 +1 @@
+Remove some usage of the deprecated ``imp`` module.
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 60a8a32f08..daa8e4fe81 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -1,7 +1,6 @@
 import os
 import sys
 import itertools
-import imp
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file
 from distutils.ccompiler import new_compiler
@@ -12,6 +11,13 @@
 from setuptools.extension import Library
 from setuptools.extern import six
 
+if six.PY2:
+    import imp
+
+    EXTENSION_SUFFIXES = [s for s, _, tp in imp.get_suffixes() if tp == imp.C_EXTENSION]
+else:
+    from importlib.machinery import EXTENSION_SUFFIXES
+
 try:
     # Attempt to use Cython for building extensions, if available
     from Cython.Distutils.build_ext import build_ext as _build_ext
@@ -64,7 +70,7 @@ def _customize_compiler_for_shlib(compiler):
 
 def get_abi3_suffix():
     """Return the file extension for an abi3-compliant Extension()"""
-    for suffix, _, _ in (s for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION):
+    for suffix in EXTENSION_SUFFIXES:
         if '.abi3' in suffix:  # Unix
             return suffix
         elif suffix == '.pyd':  # Windows
diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 2b31c3e38b..07d6593309 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -1,5 +1,5 @@
 import os
-import imp
+import sys
 from itertools import product, starmap
 import distutils.command.install_lib as orig
 
@@ -74,10 +74,10 @@ def _gen_exclusion_paths():
         yield '__init__.pyc'
         yield '__init__.pyo'
 
-        if not hasattr(imp, 'get_tag'):
+        if not hasattr(sys, 'implementation'):
             return
 
-        base = os.path.join('__pycache__', '__init__.' + imp.get_tag())
+        base = os.path.join('__pycache__', '__init__.' + sys.implementation.cache_tag)
         yield base + '.pyc'
         yield base + '.pyo'
         yield base + '.opt-1.pyc'

From 43add1d3f5138e38adc4940647cc6eae94fb6123 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sat, 17 Aug 2019 19:14:48 -0700
Subject: [PATCH 7511/8469] Fixes for python3.10

---
 changelog.d/1824.change.rst           | 1 +
 pkg_resources/__init__.py             | 2 +-
 pkg_resources/api_tests.txt           | 2 +-
 pkg_resources/tests/test_resources.py | 2 +-
 setup.py                              | 2 +-
 setuptools/command/bdist_egg.py       | 2 +-
 setuptools/command/easy_install.py    | 6 +++---
 setuptools/package_index.py           | 2 +-
 setuptools/tests/test_bdist_egg.py    | 2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 changelog.d/1824.change.rst

diff --git a/changelog.d/1824.change.rst b/changelog.d/1824.change.rst
new file mode 100644
index 0000000000..5f60903687
--- /dev/null
+++ b/changelog.d/1824.change.rst
@@ -0,0 +1 @@
+Fix tests when running under ``python3.10``.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 1f170cfda5..fb68813e0c 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -333,7 +333,7 @@ class UnknownExtra(ResolutionError):
 
 _provider_factories = {}
 
-PY_MAJOR = sys.version[:3]
+PY_MAJOR = '{}.{}'.format(*sys.version_info)
 EGG_DIST = 3
 BINARY_DIST = 2
 SOURCE_DIST = 1
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 0a75170e4f..7ae5a038d2 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -36,7 +36,7 @@ Distributions have various introspectable attributes::
     >>> dist.version
     '0.9'
 
-    >>> dist.py_version == sys.version[:3]
+    >>> dist.py_version == '{}.{}'.format(*sys.version_info)
     True
 
     >>> print(dist.platform)
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 86afcf7411..7063ed3db2 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -116,7 +116,7 @@ def testDistroBasics(self):
         self.checkFooPkg(d)
 
         d = Distribution("/some/path")
-        assert d.py_version == sys.version[:3]
+        assert d.py_version == '{}.{}'.format(*sys.version_info)
         assert d.platform is None
 
     def testDistroParse(self):
diff --git a/setup.py b/setup.py
index f5030dd670..d97895fcc0 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ def _gen_console_scripts():
     if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
         return
     tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
-    yield tmpl.format(shortver=sys.version[:3])
+    yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
 
 
 package_data = dict(
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9f8df917e6..98470f1715 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -284,7 +284,7 @@ def gen_header(self):
                 "or refer to a module" % (ep,)
             )
 
-        pyver = sys.version[:3]
+        pyver = '{}.{}'.format(*sys.version_info)
         pkg = ep.module_name
         full = '.'.join(ep.attrs)
         base = ep.attrs[0]
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 06c98271ba..593ed7776c 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -241,7 +241,7 @@ def _render_version():
         """
         Render the Setuptools version and installation details, then exit.
         """
-        ver = sys.version[:3]
+        ver = '{}.{}'.format(*sys.version_info)
         dist = get_distribution('setuptools')
         tmpl = 'setuptools {dist.version} from {dist.location} (Python {ver})'
         print(tmpl.format(**locals()))
@@ -1412,7 +1412,7 @@ def get_site_dirs():
                     os.path.join(
                         prefix,
                         "lib",
-                        "python" + sys.version[:3],
+                        "python{}.{}".format(*sys.version_info),
                         "site-packages",
                     ),
                     os.path.join(prefix, "lib", "site-python"),
@@ -1433,7 +1433,7 @@ def get_site_dirs():
                             home,
                             'Library',
                             'Python',
-                            sys.version[:3],
+                            '{}.{}'.format(*sys.version_info),
                             'site-packages',
                         )
                         sitedirs.append(home_sp)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 6b06f2ca28..f419d47167 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -46,7 +46,7 @@
 _SOCKET_TIMEOUT = 15
 
 _tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
-user_agent = _tmpl.format(py_major=sys.version[:3], setuptools=setuptools)
+user_agent = _tmpl.format(py_major='{}.{}'.format(*sys.version_info), setuptools=setuptools)
 
 
 def parse_requirement_arg(spec):
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 54742aa646..fb5b90b1a3 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -42,7 +42,7 @@ def test_bdist_egg(self, setup_context, user_override):
 
         # let's see if we got our egg link at the right place
         [content] = os.listdir('dist')
-        assert re.match(r'foo-0.0.0-py[23].\d.egg$', content)
+        assert re.match(r'foo-0.0.0-py[23].\d+.egg$', content)
 
     @pytest.mark.xfail(
         os.environ.get('PYTHONDONTWRITEBYTECODE'),

From 1e6eb1a5f81f6332d1d58dd5690421d5cbb8a00b Mon Sep 17 00:00:00 2001
From: Bastian Venthur <bastian.venthur@flixbus.com>
Date: Tue, 20 Aug 2019 09:06:24 +0200
Subject: [PATCH 7512/8469] Added test for DeprecationWarning

---
 setuptools/tests/test_bdist_egg.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 54742aa646..a1860bf336 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -7,6 +7,7 @@
 import pytest
 
 from setuptools.dist import Distribution
+from setuptools import SetuptoolsDeprecationWarning
 
 from . import contexts
 
@@ -64,3 +65,18 @@ def test_exclude_source_files(self, setup_context, user_override):
         names = list(zi.filename for zi in zip.filelist)
         assert 'hi.pyc' in names
         assert 'hi.py' not in names
+
+    def test_eggsecutable_warning(self, setup_context, user_override):
+        dist = Distribution(dict(
+            script_name='setup.py',
+            script_args=['bdist_egg'],
+            name='foo',
+            py_modules=['hi'],
+            entry_points={
+                'setuptools.installation':
+                    ['eggsecutable = my_package.some_module:main_func']},
+        ))
+        with contexts.quiet():
+            dist.parse_command_line()
+            with pytest.warns(SetuptoolsDeprecationWarning):
+                dist.run_commands()

From 35233197be40eafa1e81d71aedeb82af1a761f54 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Aug 2019 04:49:30 -0400
Subject: [PATCH 7513/8469] Once again, use token for cutting releases.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8441261de9..8b7cece8b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,9 @@ jobs:
       on:
         tags: true
         all_branches: true
-      user: jaraco
+      user: __token__
       password:
-        secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
+        secure: FSp9KU+pdvWPxBOaxe6BNmcJ9y8259G3/NdTJ00r0qx/xMLpSneGjpuLqoD6BL2JoM6gRwurwakWoH/9Ah+Di7afETjMnL6WJKtDZ+Uu3YLx3ss7/FlhVz6zmVTaDJUzuo9dGr//qLBQTIxVjGYfQelRJyfMAXtrYWdeT/4489E45lMw+86Z/vnSBOxs4lWekeQW5Gem0cDViWu67RRiGkAEvrYVwuImMr2Dyhpv+l/mQGQIS/ezXuAEFToE6+q8VUVe/aK498Qovdc+O4M7OYk1JouFpffZ3tVZ6iWHQFcR11480UdI6VCIcFpPvGC/J8MWUWLjq7YOm0X9jPXgdYMUQLAP4clFgUr2qNoRSKWfuQlNdVVuS2htYcjJ3eEl90FhcIZKp+WVMrypRPOQJ8CBielZEs0dhytRrZSaJC1BNq25O/BPzws8dL8hYtoXsM6I3Zv5cZgdyqyq/eOEMCX7Cetv6do0U41VGEV5UohvyyuwH5l9GCuPREpY3sXayPg8fw7XcPjvvzSVyjcUT/ePW8sfnAyWZnngjweAn6dK8IFGPuSPQdlos78uxeUOvCVUW0xv/0m4lX73yoHdVVdLbu1MJTyibFGec86Bew9JqIcDlhHaIJ9ihZ9Z9tOtvp1cuNyKYE4kvmOtumDDicEw4DseYn2z5sZDTYTBsKY=
       distributions: release
       skip_cleanup: true
       skip_upload_docs: true

From a3e6e68365079642d8949b26ecb810751cc15ef1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 21 Aug 2019 04:50:43 -0400
Subject: [PATCH 7514/8469] =?UTF-8?q?Bump=20version:=2041.1.0=20=E2=86=92?=
 =?UTF-8?q?=2041.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg           | 2 +-
 CHANGES.rst                | 8 ++++++++
 changelog.d/1565.misc.rst  | 2 --
 changelog.d/479.change.rst | 1 -
 setup.cfg                  | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1565.misc.rst
 delete mode 100644 changelog.d/479.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5a4536605c..5e7e8ee4a0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.1.0
+current_version = 41.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 9f9603c043..84007b3160 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v41.2.0
+-------
+
+* #479: Remove some usage of the deprecated ``imp`` module.
+* #1565: Changed html_sidebars from string to list of string as per
+  https://www.sphinx-doc.org/en/master/changes.html#id58
+
+
 v41.1.0
 -------
 
diff --git a/changelog.d/1565.misc.rst b/changelog.d/1565.misc.rst
deleted file mode 100644
index ca15573a1b..0000000000
--- a/changelog.d/1565.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Changed html_sidebars from string to list of string as per
-https://www.sphinx-doc.org/en/master/changes.html#id58 
diff --git a/changelog.d/479.change.rst b/changelog.d/479.change.rst
deleted file mode 100644
index d494c0fc7c..0000000000
--- a/changelog.d/479.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove some usage of the deprecated ``imp`` module.
diff --git a/setup.cfg b/setup.cfg
index 3bcf442987..96792dd36c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.1.0
+version = 41.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From fd540b6535f56647581df61333bac7eadc1309f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 22 Aug 2019 20:01:38 -0400
Subject: [PATCH 7515/8469] Move Tidelift token into Travis configuration

---
 .travis.yml | 7 -------
 tox.ini     | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a9afa23f5b..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-jobs:
-  include:
-  - stage: deploy
-    env:
-    # TIDELIFT_TOKEN
-    - secure: ...
-    TOX_TESTENV_PASSENV="TIDELIFT_TOKEN"
diff --git a/tox.ini b/tox.ini
index 7f9b6c1eb4..35053514de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [testenv:release]
 deps =
 	jaraco.tidelift
+passenv =
+	TIDELIFT_TOKEN
 commands =
 	python -m jaraco.tidelift.publish-release-notes

From 976abeeaaacef8019329b7dfea5dcc8f47f4d70a Mon Sep 17 00:00:00 2001
From: Bastian Venthur <mail@venthur.de>
Date: Sun, 25 Aug 2019 12:35:22 +0200
Subject: [PATCH 7516/8469] warning -> deprecated

Co-Authored-By: Paul Ganssle <p.ganssle@gmail.com>
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e4e56fb023..51e46743db 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -572,7 +572,7 @@ Services and Plugins`_.
 "Eggsecutable" Scripts
 ----------------------
 
-.. warning:: Eggsecutable Scripts are deprecated.
+.. deprecated:: 41.3.0
 
 Occasionally, there are situations where it's desirable to make an ``.egg``
 file directly executable.  You can do this by including an entry point such

From 9dd100fa6c77745c61d20baca965c13d63f7d901 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sun, 25 Aug 2019 12:43:10 +0200
Subject: [PATCH 7517/8469] Removed unused context.quiet

---
 setuptools/tests/test_bdist_egg.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index a1860bf336..e28f87de81 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -76,7 +76,6 @@ def test_eggsecutable_warning(self, setup_context, user_override):
                 'setuptools.installation':
                     ['eggsecutable = my_package.some_module:main_func']},
         ))
-        with contexts.quiet():
-            dist.parse_command_line()
-            with pytest.warns(SetuptoolsDeprecationWarning):
-                dist.run_commands()
+        dist.parse_command_line()
+        with pytest.warns(SetuptoolsDeprecationWarning):
+            dist.run_commands()

From cd848cbc425ba0735e0987040f201de0b13f0486 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Wed, 28 Aug 2019 19:11:03 +0200
Subject: [PATCH 7518/8469] closes bpo-37965: Fix compiler warning of distutils
 CCompiler.test_function. (GH-15560)

https://bugs.python.org/issue37965


https://bugs.python.org/issue37965



Automerge-Triggered-By: @benjaminp
---
 ccompiler.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ccompiler.py b/ccompiler.py
index 1a411ed111..4cfc6c7065 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -781,8 +781,9 @@ def has_function(self, funcname, includes=None, include_dirs=None,
             for incl in includes:
                 f.write("""#include "%s"\n""" % incl)
             f.write("""\
-main (int argc, char **argv) {
+int main (int argc, char **argv) {
     %s();
+    return 0;
 }
 """ % funcname)
         finally:

From 7fa2fcf95430ba41959e16c19bd77795b2b4fc4a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 2 Sep 2019 00:30:36 +0200
Subject: [PATCH 7519/8469] Add GitHub Actions CI/CD test suite workflow

---
 .github/workflows/python-tests.yml | 75 ++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 .github/workflows/python-tests.yml

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
new file mode 100644
index 0000000000..00250ff1bc
--- /dev/null
+++ b/.github/workflows/python-tests.yml
@@ -0,0 +1,75 @@
+name: Test suite
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 1 0 * * *  # Run daily at 0:01 UTC
+
+jobs:
+  tests:
+    name: 👷
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # max-parallel: 5
+      matrix:
+        python-version:
+        - 3.7
+        - 3.6
+        - 3.5
+        - 2.7
+        os:
+        - ubuntu-18.04
+        - ubuntu-16.04
+        - macOS-10.14
+        - windows-2019
+        - windows-2016
+        env:
+        - TOXENV: python
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        version: ${{ matrix.python-version }}
+    - name: Upgrade pip/setuptools/wheel
+      run: >-
+        python
+        -m pip install
+        --disable-pip-version-check
+        --upgrade
+        pip setuptools wheel
+    - name: Install tox
+      run: >-
+        python -m pip install --upgrade tox tox-venv
+    - name: Log installed dists
+      run: >-
+        python -m pip freeze --all
+    - name: Log env vars
+      run: >-
+        env
+      env: ${{ matrix.env }}
+
+    - name: Update egg_info based on setup.py in checkout
+      run: >-
+        python -m bootstrap
+      env: ${{ matrix.env }}
+    - name: Verify that there's no cached Python modules in sources
+      if: >-
+        ! startsWith(matrix.os, 'windows-')
+      run: >-
+        ! grep pyc setuptools.egg-info/SOURCES.txt
+
+    - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
+      run: |
+        python -m tox --parallel auto --notest
+      env: ${{ matrix.env }}
+    - name: Test with tox
+      run: |
+        ${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
+        python -m tox \
+        --parallel 0 \
+        -- \
+        --cov
+      env: ${{ matrix.env }}

From 67dd74ad0fd84714c6710168c7e747630276230a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 2 Sep 2019 00:59:00 +0200
Subject: [PATCH 7520/8469] Temporary comment out win jobs

---
 .github/workflows/python-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 00250ff1bc..c5ab4dd5cc 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -22,8 +22,8 @@ jobs:
         - ubuntu-18.04
         - ubuntu-16.04
         - macOS-10.14
-        - windows-2019
-        - windows-2016
+        # - windows-2019
+        # - windows-2016
         env:
         - TOXENV: python
 

From 440238ebb54ba4b05d8656e0bdf333d53627c198 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Mon, 2 Sep 2019 16:14:01 +0200
Subject: [PATCH 7521/8469] Don't skip missing interpreters in tox

---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index c5ab4dd5cc..eb750a45ab 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -63,7 +63,7 @@ jobs:
 
     - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
       run: |
-        python -m tox --parallel auto --notest
+        python -m tox --parallel auto --notest --skip-missing-interpreters false
       env: ${{ matrix.env }}
     - name: Test with tox
       run: |

From 04940b6e09bb5054666442196383c2fe9e5a09a2 Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Tue, 3 Sep 2019 21:36:49 +0300
Subject: [PATCH 7522/8469] Fix typo in CHANGES.rst

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 84007b3160..dd47cb4353 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,7 +12,7 @@ v41.1.0
 * #1697: Moved most of the constants from setup.py to setup.cfg
 * #1749: Fixed issue with the PEP 517 backend where building a source distribution would fail if any tarball existed in the destination directory.
 * #1750: Fixed an issue with PEP 517 backend where wheel builds would fail if the destination directory did not already exist.
-* #1756: Forse metadata-version >= 1.2. when project urls are present.
+* #1756: Force metadata-version >= 1.2. when project urls are present.
 * #1769: Improve ``package_data`` check: ensure the dictionary values are lists/tuples of strings.
 * #1788: Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
 * #1790: Added the file path to the error message when a ``UnicodeDecodeError`` occurs while reading a metadata file.

From 211ff140a4bd82fcb4f01a5569cdc86e4badea8b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Sep 2019 16:36:40 +0100
Subject: [PATCH 7523/8469] Update badge URL

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 357626220b..420bfb4f04 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-.. image:: https://tidelift.com/badges/github/GROUP/PROJECT
+.. image:: https://tidelift.com/badges/package/pypi/PROJECT
    :target: https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=readme
 
 Security Contact

From 8f99a0c1b8ee2cb28a8bdb1811ef96da68636d1b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Sep 2019 17:30:03 +0100
Subject: [PATCH 7524/8469] Add funding reference to project

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..230b556cbd
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+tidelift: pypi/PROJECT

From 1c187ad0cf50fbc14626f63cb669a9ec5949012f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 9 Sep 2019 17:45:58 +0100
Subject: [PATCH 7525/8469] List sidebars to avoid errors looking for template
 't'

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3d109305b4..dbf962ddc4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,4 +2,4 @@
 # Custom sidebar templates, maps document names to template names.
 html_theme = 'alabaster'
 templates_path = ['_templates']
-html_sidebars = {'index': 'tidelift-sidebar.html'}
+html_sidebars = {'index': ['tidelift-sidebar.html']}

From 5ffd6d26a7806d8b8cc0aad93e50cc63bae294a1 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 10 Sep 2019 14:52:23 +0100
Subject: [PATCH 7526/8469] bpo-38088: Fixes distutils not finding
 vcruntime140.dll with only v142 toolset installed (GH-15849)

---
 _msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 6e14f330d7..e8e4b717b9 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -107,7 +107,7 @@ def _find_vcvarsall(plat_spec):
 
     if best_dir:
         vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
-            vcruntime_plat, "Microsoft.VC141.CRT", "vcruntime140.dll")
+            vcruntime_plat, "Microsoft.VC14*.CRT", "vcruntime140.dll")
         try:
             import glob
             vcruntime = glob.glob(vcredist, recursive=True)[-1]

From ca0ee009f81a460b483c7e451e58dfdcd7787045 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Sep 2019 16:39:57 +0100
Subject: [PATCH 7527/8469] Add test capturing failure. Ref #1787.

---
 setuptools/tests/test_config.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index bc97664d4d..4218713815 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -819,6 +819,18 @@ def test_data_files(self, tmpdir):
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
+    def test_python_requires_invalid(self, tmpdir):
+        fake_env(
+            tmpdir,
+            DALS("""
+            [options]
+            python_requires=invalid
+            """),
+        )
+        with pytest.raises(DistutilsOptionError):
+            with get_dist(tmpdir) as dist:
+                dist.parse_config_files()
+
 
 saved_dist_init = _Distribution.__init__
 

From b31777cd50c7cb59b4ef6c22bd014f0229ef32fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Sep 2019 16:52:58 +0100
Subject: [PATCH 7528/8469] Add more tests for valid behavior. Expand
 exception, any should do.

---
 setuptools/tests/test_config.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 4218713815..1b94a58689 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -819,6 +819,28 @@ def test_data_files(self, tmpdir):
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
+    def test_python_requires_simple(self, tmpdir):
+        fake_env(
+            tmpdir,
+            DALS("""
+            [options]
+            python_requires=>=2.7
+            """),
+        )
+        with get_dist(tmpdir) as dist:
+            dist.parse_config_files()
+
+    def test_python_requires_compound(self, tmpdir):
+        fake_env(
+            tmpdir,
+            DALS("""
+            [options]
+            python_requires=>=2.7,!=3.0.*
+            """),
+        )
+        with get_dist(tmpdir) as dist:
+            dist.parse_config_files()
+
     def test_python_requires_invalid(self, tmpdir):
         fake_env(
             tmpdir,
@@ -827,7 +849,7 @@ def test_python_requires_invalid(self, tmpdir):
             python_requires=invalid
             """),
         )
-        with pytest.raises(DistutilsOptionError):
+        with pytest.raises(Exception):
             with get_dist(tmpdir) as dist:
                 dist.parse_config_files()
 

From c3df086ed3570e7065e6935a52d95c8cdef2b071 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Sep 2019 16:54:07 +0100
Subject: [PATCH 7529/8469] Ensure that python_requires is checked during
 option processing. Fixes #1787.

---
 setuptools/config.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/config.py b/setuptools/config.py
index b6626043fc..2d50e25e89 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -12,6 +12,7 @@
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.extern.packaging.version import LegacyVersion, parse
+from setuptools.extern.packaging.specifiers import SpecifierSet
 from setuptools.extern.six import string_types, PY3
 
 
@@ -554,6 +555,7 @@ def parsers(self):
             'packages': self._parse_packages,
             'entry_points': self._parse_file,
             'py_modules': parse_list,
+            'python_requires': SpecifierSet,
         }
 
     def _parse_packages(self, value):

From 895d18c17d15f443c6d8953a176aa6c4df354c7d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Sep 2019 16:55:09 +0100
Subject: [PATCH 7530/8469] Update changelog. Ref #1787.

---
 changelog.d/1847.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1847.change.rst

diff --git a/changelog.d/1847.change.rst b/changelog.d/1847.change.rst
new file mode 100644
index 0000000000..2a6b9c77a9
--- /dev/null
+++ b/changelog.d/1847.change.rst
@@ -0,0 +1 @@
+Now traps errors when invalid ``python_requires`` values are supplied.

From 45b83cd189db31a0315a4297053feab77d8618b4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 11 Sep 2019 18:14:53 +0100
Subject: [PATCH 7531/8469] Update changelog. Ref #1690.

---
 changelog.d/1690.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1690.change.rst

diff --git a/changelog.d/1690.change.rst b/changelog.d/1690.change.rst
new file mode 100644
index 0000000000..ecc51c55ae
--- /dev/null
+++ b/changelog.d/1690.change.rst
@@ -0,0 +1 @@
+When storing extras, rely on OrderedSet to retain order of extras as indicated by the packager, which will also be deterministic on Python 2.7 (with PYTHONHASHSEED unset) and Python 3.6+.

From 6f962a07f586162d05e087a90ea8f44461772070 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Oct 2019 20:42:14 -0400
Subject: [PATCH 7532/8469] Refresh vendored packages (ordereddict 3.1.1)

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

diff --git a/setuptools/_vendor/ordered_set.py b/setuptools/_vendor/ordered_set.py
index d257470b8a..14876000de 100644
--- a/setuptools/_vendor/ordered_set.py
+++ b/setuptools/_vendor/ordered_set.py
@@ -87,14 +87,14 @@ def __getitem__(self, index):
         """
         if isinstance(index, slice) and index == SLICE_ALL:
             return self.copy()
+        elif is_iterable(index):
+            return [self.items[i] for i in index]
         elif hasattr(index, "__index__") or isinstance(index, slice):
             result = self.items[index]
             if isinstance(result, list):
                 return self.__class__(result)
             else:
                 return result
-        elif is_iterable(index):
-            return [self.items[i] for i in index]
         else:
             raise TypeError("Don't know how to index an OrderedSet by %r" % index)
 

From 53d662a9de0b8d449d167bf1c5cf291a2fecb094 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Oct 2019 21:17:53 -0400
Subject: [PATCH 7533/8469] Allow 'long_description_content_type' warnings for
 new versions of packaging. Fixes #1858.

---
 changelog.d/1858.misc.rst            | 1 +
 setuptools/tests/test_integration.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/1858.misc.rst

diff --git a/changelog.d/1858.misc.rst b/changelog.d/1858.misc.rst
new file mode 100644
index 0000000000..b16ac1dd0b
--- /dev/null
+++ b/changelog.d/1858.misc.rst
@@ -0,0 +1 @@
+Fixed failing integration test triggered by 'long_description_content_type' in packaging.
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1e13218899..1c0b2b18bb 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -143,6 +143,7 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
             'tests_require',
             'python_requires',
             'install_requires',
+            'long_description_content_type',
         ]
         assert not match or match.group(1).strip('"\'') in allowed_unknowns
 

From da3ccf5f648a5836ce5e9b0747a263860ae1dfaa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Oct 2019 21:22:05 -0400
Subject: [PATCH 7534/8469] =?UTF-8?q?Bump=20version:=2041.2.0=20=E2=86=92?=
 =?UTF-8?q?=2041.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 7 +++++++
 changelog.d/1690.change.rst | 1 -
 changelog.d/1858.misc.rst   | 1 -
 setup.cfg                   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1690.change.rst
 delete mode 100644 changelog.d/1858.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5e7e8ee4a0..37b224466f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.2.0
+current_version = 41.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index dd47cb4353..883f4f2beb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v41.3.0
+-------
+
+* #1690: When storing extras, rely on OrderedSet to retain order of extras as indicated by the packager, which will also be deterministic on Python 2.7 (with PYTHONHASHSEED unset) and Python 3.6+.
+* #1858: Fixed failing integration test triggered by 'long_description_content_type' in packaging.
+
+
 v41.2.0
 -------
 
diff --git a/changelog.d/1690.change.rst b/changelog.d/1690.change.rst
deleted file mode 100644
index ecc51c55ae..0000000000
--- a/changelog.d/1690.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-When storing extras, rely on OrderedSet to retain order of extras as indicated by the packager, which will also be deterministic on Python 2.7 (with PYTHONHASHSEED unset) and Python 3.6+.
diff --git a/changelog.d/1858.misc.rst b/changelog.d/1858.misc.rst
deleted file mode 100644
index b16ac1dd0b..0000000000
--- a/changelog.d/1858.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed failing integration test triggered by 'long_description_content_type' in packaging.
diff --git a/setup.cfg b/setup.cfg
index 96792dd36c..77a35de06b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.2.0
+version = 41.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 2e3c34f669c5272d036ef7edc58871c96663d587 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Oct 2019 21:29:32 -0400
Subject: [PATCH 7535/8469] Clarify the scope of the change.

---
 changelog.d/1847.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1847.change.rst b/changelog.d/1847.change.rst
index 2a6b9c77a9..d3f7724e20 100644
--- a/changelog.d/1847.change.rst
+++ b/changelog.d/1847.change.rst
@@ -1 +1 @@
-Now traps errors when invalid ``python_requires`` values are supplied.
+In declarative config, now traps errors when invalid ``python_requires`` values are supplied.

From 5eee6b4b523a6d2ae16ef913c01302f951b4f614 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Oct 2019 21:30:46 -0400
Subject: [PATCH 7536/8469] =?UTF-8?q?Bump=20version:=2041.3.0=20=E2=86=92?=
 =?UTF-8?q?=2041.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/1847.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1847.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 37b224466f..d6768cb8a8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.3.0
+current_version = 41.4.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 883f4f2beb..ecde25a571 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v41.4.0
+-------
+
+* #1847: In declarative config, now traps errors when invalid ``python_requires`` values are supplied.
+
+
 v41.3.0
 -------
 
diff --git a/changelog.d/1847.change.rst b/changelog.d/1847.change.rst
deleted file mode 100644
index d3f7724e20..0000000000
--- a/changelog.d/1847.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In declarative config, now traps errors when invalid ``python_requires`` values are supplied.
diff --git a/setup.cfg b/setup.cfg
index 77a35de06b..a55106a5a4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.3.0
+version = 41.4.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 026f9b75544c53636fd692af386730553740a511 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 14 Aug 2019 02:43:53 +0200
Subject: [PATCH 7537/8469] docs: mention dependency links support was dropped
 in pip 19.0

---
 docs/setuptools.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2e7fe3bd93..8cfb5f13a4 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -675,6 +675,10 @@ using ``setup.py develop``.)
 Dependencies that aren't in PyPI
 --------------------------------
 
+.. warning::
+    Dependency links support has been dropped by pip starting with version
+    19.0 (released 2019-01-22).
+
 If your project depends on packages that don't exist on PyPI, you may still be
 able to depend on them, as long as they are available for download as:
 

From d2db805b008346ba9aa34d8fb36faf2d019eed64 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 14 Aug 2019 02:44:20 +0200
Subject: [PATCH 7538/8469] docs: mention eggs are deprecated and not supported
 by pip

---
 docs/setuptools.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 8cfb5f13a4..26a3044e82 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1693,6 +1693,9 @@ file locations.
 ``bdist_egg`` - Create a Python Egg for the project
 ===================================================
 
+.. warning::
+    **eggs** are deprecated in favor of wheels, and not supported by pip.
+
 This command generates a Python Egg (``.egg`` file) for the project.  Python
 Eggs are the preferred binary distribution format for EasyInstall, because they
 are cross-platform (for "pure" packages), directly importable, and contain

From 8b3a8d08da9780d16dce7d62433f35dbb4cc55ad Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 7 Oct 2019 18:58:40 +0200
Subject: [PATCH 7539/8469] add news entry

---
 changelog.d/1860.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1860.doc.rst

diff --git a/changelog.d/1860.doc.rst b/changelog.d/1860.doc.rst
new file mode 100644
index 0000000000..f3554643fa
--- /dev/null
+++ b/changelog.d/1860.doc.rst
@@ -0,0 +1 @@
+Update documentation to mention the egg format is not supported by pip and dependency links support was dropped starting with pip 19.0.

From 734d09c5a3f48338b6a3d7687c5f9d0ed02ab479 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 7 Oct 2019 16:36:54 -0400
Subject: [PATCH 7540/8469] Pin ordered-set to current version for consistency.

---
 setuptools/_vendor/vendored.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 379aae56ed..5731b4244b 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,4 +1,4 @@
 packaging==16.8
 pyparsing==2.2.1
 six==1.10.0
-ordered-set
+ordered-set==3.1.1

From d7810a901382b827146874704f33bce896e1fb21 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 10 Aug 2019 02:18:34 +0200
Subject: [PATCH 7541/8469] wheel: silence info trace when writing
 `requires.txt`

---
 setuptools/wheel.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index e11f0a1d91..2982926ae8 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -1,6 +1,7 @@
 """Wheels support."""
 
 from distutils.util import get_platform
+from distutils import log
 import email
 import itertools
 import os
@@ -162,11 +163,17 @@ def raw_req(req):
                 extras_require=extras_require,
             ),
         )
-        write_requirements(
-            setup_dist.get_command_obj('egg_info'),
-            None,
-            os.path.join(egg_info, 'requires.txt'),
-        )
+        # Temporarily disable info traces.
+        log_threshold = log._global_log.threshold
+        log.set_threshold(log.WARN)
+        try:
+            write_requirements(
+                setup_dist.get_command_obj('egg_info'),
+                None,
+                os.path.join(egg_info, 'requires.txt'),
+            )
+        finally:
+            log.set_threshold(log_threshold)
 
     @staticmethod
     def _move_data_entries(destination_eggdir, dist_data):

From 16a3ef93fc66373f6c5f4da12303dd111403fcb1 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 17 Sep 2018 23:40:12 +0200
Subject: [PATCH 7542/8469] wheel: fix installation of empty namespace package

---
 changelog.d/1861.change.rst    |  1 +
 setuptools/tests/test_wheel.py | 28 ++++++++++++++++++++++++++++
 setuptools/wheel.py            |  4 +++-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1861.change.rst

diff --git a/changelog.d/1861.change.rst b/changelog.d/1861.change.rst
new file mode 100644
index 0000000000..5a4e0a56a9
--- /dev/null
+++ b/changelog.d/1861.change.rst
@@ -0,0 +1 @@
+Fix empty namespace package installation from wheel.
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index e85a4a7e8d..d50816c22a 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -450,6 +450,34 @@ def __repr__(self):
         }),
     ),
 
+    dict(
+        id='empty_namespace_package',
+        file_defs={
+            'foobar': {
+                '__init__.py': "__import__('pkg_resources').declare_namespace(__name__)",
+            },
+        },
+        setup_kwargs=dict(
+            namespace_packages=['foobar'],
+            packages=['foobar'],
+        ),
+        install_tree=flatten_tree({
+            'foo-1.0-py{py_version}.egg': [
+                'foo-1.0-py{py_version}-nspkg.pth',
+                {'EGG-INFO': [
+                    'PKG-INFO',
+                    'RECORD',
+                    'WHEEL',
+                    'namespace_packages.txt',
+                    'top_level.txt',
+                ]},
+                {'foobar': [
+                    '__init__.py',
+                ]},
+            ]
+        }),
+    ),
+
     dict(
         id='data_in_package',
         file_defs={
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 2982926ae8..22eec05ecd 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -213,6 +213,8 @@ def _fix_namespace_packages(egg_info, destination_eggdir):
             for mod in namespace_packages:
                 mod_dir = os.path.join(destination_eggdir, *mod.split('.'))
                 mod_init = os.path.join(mod_dir, '__init__.py')
-                if os.path.exists(mod_dir) and not os.path.exists(mod_init):
+                if not os.path.exists(mod_dir):
+                    os.mkdir(mod_dir)
+                if not os.path.exists(mod_init):
                     with open(mod_init, 'w') as fp:
                         fp.write(NAMESPACE_PACKAGE_INIT)

From cb8769d7d1a694d37194c44b98c543b2d5d38fc5 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 26 Jun 2019 22:25:03 +0200
Subject: [PATCH 7543/8469] minor cleanup

---
 setuptools/command/easy_install.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 06c98271ba..d7b7566c0d 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1180,8 +1180,7 @@ def _set_fetcher_options(self, base):
         # to the setup.cfg file.
         ei_opts = self.distribution.get_option_dict('easy_install').copy()
         fetch_directives = (
-            'find_links', 'site_dirs', 'index_url', 'optimize',
-            'site_dirs', 'allow_hosts',
+            'find_links', 'site_dirs', 'index_url', 'optimize', 'allow_hosts',
         )
         fetch_options = {}
         for key, val in ei_opts.items():

From 0d831c90e345ba6e7d0f82954f0cec5bdaa8501b Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 10 Aug 2019 03:57:58 +0200
Subject: [PATCH 7544/8469] improve workaround for #1644

Make it possible to use a more recent version of pip for tests.
---
 pytest.ini             |  2 +-
 tests/requirements.txt |  1 -
 tools/tox_pip.py       | 29 +++++++++++++++++++++++++++++
 tox.ini                | 14 ++++++++------
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 tools/tox_pip.py

diff --git a/pytest.ini b/pytest.ini
index 612fb91f63..764a55dd1f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern tools .*
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811
diff --git a/tests/requirements.txt b/tests/requirements.txt
index cb3e672696..1f70adee0a 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -9,4 +9,3 @@ coverage>=4.5.1
 pytest-cov>=2.5.1
 paver; python_version>="3.6"
 futures; python_version=="2.7"
-pip==18.1  # Temporary workaround for #1644.
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
new file mode 100644
index 0000000000..1117f99653
--- /dev/null
+++ b/tools/tox_pip.py
@@ -0,0 +1,29 @@
+import os
+import shutil
+import subprocess
+import sys
+from glob import glob
+
+VIRTUAL_ENV = os.environ['VIRTUAL_ENV']
+TOX_PIP_DIR = os.path.join(VIRTUAL_ENV, 'pip')
+
+
+def pip(args):
+    # First things first, get a recent (stable) version of pip.
+    if not os.path.exists(TOX_PIP_DIR):
+        subprocess.check_call([sys.executable, '-m', 'pip',
+                               '--disable-pip-version-check',
+                               'install', '-t', TOX_PIP_DIR,
+                               'pip'])
+        shutil.rmtree(glob(os.path.join(TOX_PIP_DIR, 'pip-*.dist-info'))[0])
+    # And use that version.
+    for n, a in enumerate(args):
+        if not a.startswith('-'):
+            if a in 'install' and '-e' in args[n:]:
+                args.insert(n + 1, '--no-use-pep517')
+            break
+    subprocess.check_call([sys.executable, os.path.join(TOX_PIP_DIR, 'pip')] + args)
+
+
+if __name__ == '__main__':
+    pip(sys.argv[1:])
diff --git a/tox.ini b/tox.ini
index e0eef95a45..8b34c235c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,14 +7,16 @@
 [tox]
 envlist=python
 
+[helpers]
+# Wrapper for calls to pip that make sure the version being used is a
+# up-to-date, and to prevent the current working directory from being
+# added to `sys.path`.
+pip = python {toxinidir}/tools/tox_pip.py
+
 [testenv]
 deps=-rtests/requirements.txt
-# Changed from default (`python -m pip ...`)
-# to prevent the current working directory
-# from being added to `sys.path`.
-install_command=python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages}
-# Same as above.
-list_dependencies_command={envbindir}/pip freeze --all
+install_command = {[helpers]pip} install {opts} {packages}
+list_dependencies_command = {[helpers]pip} freeze --all
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.

From bf069fe9ddcadaa2c029067601d06a07d037d4f7 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 23 Aug 2019 23:07:52 +0200
Subject: [PATCH 7545/8469] setuptools: update vendored packaging

---
 setuptools/_vendor/packaging/__about__.py    |  14 +-
 setuptools/_vendor/packaging/__init__.py     |  20 +-
 setuptools/_vendor/packaging/_compat.py      |   7 +-
 setuptools/_vendor/packaging/_structures.py  |   4 +-
 setuptools/_vendor/packaging/markers.py      |  91 ++---
 setuptools/_vendor/packaging/requirements.py |  41 +-
 setuptools/_vendor/packaging/specifiers.py   |  71 ++--
 setuptools/_vendor/packaging/tags.py         | 404 +++++++++++++++++++
 setuptools/_vendor/packaging/utils.py        |  43 ++
 setuptools/_vendor/packaging/version.py      | 149 ++++---
 setuptools/_vendor/vendored.txt              |   2 +-
 11 files changed, 660 insertions(+), 186 deletions(-)
 create mode 100644 setuptools/_vendor/packaging/tags.py

diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index 95d330ef82..dc95138d04 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -4,18 +4,24 @@
 from __future__ import absolute_import, division, print_function
 
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
 ]
 
 __title__ = "packaging"
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.8"
+__version__ = "19.2"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
 __license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2014-2016 %s" % __author__
+__copyright__ = "Copyright 2014-2019 %s" % __author__
diff --git a/setuptools/_vendor/packaging/__init__.py b/setuptools/_vendor/packaging/__init__.py
index 5ee6220203..a0cf67df52 100644
--- a/setuptools/_vendor/packaging/__init__.py
+++ b/setuptools/_vendor/packaging/__init__.py
@@ -4,11 +4,23 @@
 from __future__ import absolute_import, division, print_function
 
 from .__about__ import (
-    __author__, __copyright__, __email__, __license__, __summary__, __title__,
-    __uri__, __version__
+    __author__,
+    __copyright__,
+    __email__,
+    __license__,
+    __summary__,
+    __title__,
+    __uri__,
+    __version__,
 )
 
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
 ]
diff --git a/setuptools/_vendor/packaging/_compat.py b/setuptools/_vendor/packaging/_compat.py
index 210bb80b7e..25da473c19 100644
--- a/setuptools/_vendor/packaging/_compat.py
+++ b/setuptools/_vendor/packaging/_compat.py
@@ -12,9 +12,9 @@
 # flake8: noqa
 
 if PY3:
-    string_types = str,
+    string_types = (str,)
 else:
-    string_types = basestring,
+    string_types = (basestring,)
 
 
 def with_metaclass(meta, *bases):
@@ -27,4 +27,5 @@ def with_metaclass(meta, *bases):
     class metaclass(meta):
         def __new__(cls, name, this_bases, d):
             return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
+
+    return type.__new__(metaclass, "temporary_class", (), {})
diff --git a/setuptools/_vendor/packaging/_structures.py b/setuptools/_vendor/packaging/_structures.py
index ccc27861c3..68dcca634d 100644
--- a/setuptools/_vendor/packaging/_structures.py
+++ b/setuptools/_vendor/packaging/_structures.py
@@ -5,7 +5,6 @@
 
 
 class Infinity(object):
-
     def __repr__(self):
         return "Infinity"
 
@@ -33,11 +32,11 @@ def __ge__(self, other):
     def __neg__(self):
         return NegativeInfinity
 
+
 Infinity = Infinity()
 
 
 class NegativeInfinity(object):
-
     def __repr__(self):
         return "-Infinity"
 
@@ -65,4 +64,5 @@ def __ge__(self, other):
     def __neg__(self):
         return Infinity
 
+
 NegativeInfinity = NegativeInfinity()
diff --git a/setuptools/_vendor/packaging/markers.py b/setuptools/_vendor/packaging/markers.py
index 031332a305..4bdfdb24f2 100644
--- a/setuptools/_vendor/packaging/markers.py
+++ b/setuptools/_vendor/packaging/markers.py
@@ -17,8 +17,11 @@
 
 
 __all__ = [
-    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
-    "Marker", "default_environment",
+    "InvalidMarker",
+    "UndefinedComparison",
+    "UndefinedEnvironmentName",
+    "Marker",
+    "default_environment",
 ]
 
 
@@ -42,7 +45,6 @@ class UndefinedEnvironmentName(ValueError):
 
 
 class Node(object):
-
     def __init__(self, value):
         self.value = value
 
@@ -57,62 +59,52 @@ def serialize(self):
 
 
 class Variable(Node):
-
     def serialize(self):
         return str(self)
 
 
 class Value(Node):
-
     def serialize(self):
         return '"{0}"'.format(self)
 
 
 class Op(Node):
-
     def serialize(self):
         return str(self)
 
 
 VARIABLE = (
-    L("implementation_version") |
-    L("platform_python_implementation") |
-    L("implementation_name") |
-    L("python_full_version") |
-    L("platform_release") |
-    L("platform_version") |
-    L("platform_machine") |
-    L("platform_system") |
-    L("python_version") |
-    L("sys_platform") |
-    L("os_name") |
-    L("os.name") |  # PEP-345
-    L("sys.platform") |  # PEP-345
-    L("platform.version") |  # PEP-345
-    L("platform.machine") |  # PEP-345
-    L("platform.python_implementation") |  # PEP-345
-    L("python_implementation") |  # undocumented setuptools legacy
-    L("extra")
+    L("implementation_version")
+    | L("platform_python_implementation")
+    | L("implementation_name")
+    | L("python_full_version")
+    | L("platform_release")
+    | L("platform_version")
+    | L("platform_machine")
+    | L("platform_system")
+    | L("python_version")
+    | L("sys_platform")
+    | L("os_name")
+    | L("os.name")
+    | L("sys.platform")  # PEP-345
+    | L("platform.version")  # PEP-345
+    | L("platform.machine")  # PEP-345
+    | L("platform.python_implementation")  # PEP-345
+    | L("python_implementation")  # PEP-345
+    | L("extra")  # undocumented setuptools legacy
 )
 ALIASES = {
-    'os.name': 'os_name',
-    'sys.platform': 'sys_platform',
-    'platform.version': 'platform_version',
-    'platform.machine': 'platform_machine',
-    'platform.python_implementation': 'platform_python_implementation',
-    'python_implementation': 'platform_python_implementation'
+    "os.name": "os_name",
+    "sys.platform": "sys_platform",
+    "platform.version": "platform_version",
+    "platform.machine": "platform_machine",
+    "platform.python_implementation": "platform_python_implementation",
+    "python_implementation": "platform_python_implementation",
 }
 VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
 
 VERSION_CMP = (
-    L("===") |
-    L("==") |
-    L(">=") |
-    L("<=") |
-    L("!=") |
-    L("~=") |
-    L(">") |
-    L("<")
+    L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<")
 )
 
 MARKER_OP = VERSION_CMP | L("not in") | L("in")
@@ -152,8 +144,11 @@ def _format_marker(marker, first=True):
     # where the single item is itself it's own list. In that case we want skip
     # the rest of this function so that we don't get extraneous () on the
     # outside.
-    if (isinstance(marker, list) and len(marker) == 1 and
-            isinstance(marker[0], (list, tuple))):
+    if (
+        isinstance(marker, list)
+        and len(marker) == 1
+        and isinstance(marker[0], (list, tuple))
+    ):
         return _format_marker(marker[0])
 
     if isinstance(marker, list):
@@ -239,20 +234,20 @@ def _evaluate_markers(markers, environment):
 
 
 def format_full_version(info):
-    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    version = "{0.major}.{0.minor}.{0.micro}".format(info)
     kind = info.releaselevel
-    if kind != 'final':
+    if kind != "final":
         version += kind[0] + str(info.serial)
     return version
 
 
 def default_environment():
-    if hasattr(sys, 'implementation'):
+    if hasattr(sys, "implementation"):
         iver = format_full_version(sys.implementation.version)
         implementation_name = sys.implementation.name
     else:
-        iver = '0'
-        implementation_name = ''
+        iver = "0"
+        implementation_name = ""
 
     return {
         "implementation_name": implementation_name,
@@ -264,19 +259,19 @@ def default_environment():
         "platform_version": platform.version(),
         "python_full_version": platform.python_version(),
         "platform_python_implementation": platform.python_implementation(),
-        "python_version": platform.python_version()[:3],
+        "python_version": ".".join(platform.python_version_tuple()[:2]),
         "sys_platform": sys.platform,
     }
 
 
 class Marker(object):
-
     def __init__(self, marker):
         try:
             self._markers = _coerce_parse_result(MARKER.parseString(marker))
         except ParseException as e:
             err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
-                marker, marker[e.loc:e.loc + 8])
+                marker, marker[e.loc : e.loc + 8]
+            )
             raise InvalidMarker(err_str)
 
     def __str__(self):
diff --git a/setuptools/_vendor/packaging/requirements.py b/setuptools/_vendor/packaging/requirements.py
index 5b493416f2..8a0c2cb9be 100644
--- a/setuptools/_vendor/packaging/requirements.py
+++ b/setuptools/_vendor/packaging/requirements.py
@@ -38,8 +38,8 @@ class InvalidRequirement(ValueError):
 NAME = IDENTIFIER("name")
 EXTRA = IDENTIFIER
 
-URI = Regex(r'[^ ]+')("url")
-URL = (AT + URI)
+URI = Regex(r"[^ ]+")("url")
+URL = AT + URI
 
 EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
 EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
@@ -48,28 +48,31 @@ class InvalidRequirement(ValueError):
 VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
 
 VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
-VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
-                       joinString=",", adjacent=False)("_raw_spec")
+VERSION_MANY = Combine(
+    VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",", adjacent=False
+)("_raw_spec")
 _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
-_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or "")
 
 VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
 VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
 
 MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
 MARKER_EXPR.setParseAction(
-    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+    lambda s, l, t: Marker(s[t._original_start : t._original_end])
 )
-MARKER_SEPERATOR = SEMICOLON
-MARKER = MARKER_SEPERATOR + MARKER_EXPR
+MARKER_SEPARATOR = SEMICOLON
+MARKER = MARKER_SEPARATOR + MARKER_EXPR
 
 VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
 URL_AND_MARKER = URL + Optional(MARKER)
 
-NAMED_REQUIREMENT = \
-    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
 
 REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+# setuptools.extern.pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# issue #104
+REQUIREMENT.parseString("x[]")
 
 
 class Requirement(object):
@@ -90,15 +93,21 @@ def __init__(self, requirement_string):
             req = REQUIREMENT.parseString(requirement_string)
         except ParseException as e:
             raise InvalidRequirement(
-                "Invalid requirement, parse error at \"{0!r}\"".format(
-                    requirement_string[e.loc:e.loc + 8]))
+                'Parse error at "{0!r}": {1}'.format(
+                    requirement_string[e.loc : e.loc + 8], e.msg
+                )
+            )
 
         self.name = req.name
         if req.url:
             parsed_url = urlparse.urlparse(req.url)
-            if not (parsed_url.scheme and parsed_url.netloc) or (
-                    not parsed_url.scheme and not parsed_url.netloc):
-                raise InvalidRequirement("Invalid URL given")
+            if parsed_url.scheme == "file":
+                if urlparse.urlunparse(parsed_url) != req.url:
+                    raise InvalidRequirement("Invalid URL given")
+            elif not (parsed_url.scheme and parsed_url.netloc) or (
+                not parsed_url.scheme and not parsed_url.netloc
+            ):
+                raise InvalidRequirement("Invalid URL: {0}".format(req.url))
             self.url = req.url
         else:
             self.url = None
@@ -117,6 +126,8 @@ def __str__(self):
 
         if self.url:
             parts.append("@ {0}".format(self.url))
+            if self.marker:
+                parts.append(" ")
 
         if self.marker:
             parts.append("; {0}".format(self.marker))
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
index 7f5a76cfd6..743576a080 100644
--- a/setuptools/_vendor/packaging/specifiers.py
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -19,7 +19,6 @@ class InvalidSpecifier(ValueError):
 
 
 class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
-
     @abc.abstractmethod
     def __str__(self):
         """
@@ -84,10 +83,7 @@ def __init__(self, spec="", prereleases=None):
         if not match:
             raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
 
-        self._spec = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
+        self._spec = (match.group("operator").strip(), match.group("version").strip())
 
         # Store whether or not this Specifier should accept prereleases
         self._prereleases = prereleases
@@ -99,11 +95,7 @@ def __repr__(self):
             else ""
         )
 
-        return "<{0}({1!r}{2})>".format(
-            self.__class__.__name__,
-            str(self),
-            pre,
-        )
+        return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre)
 
     def __str__(self):
         return "{0}{1}".format(*self._spec)
@@ -194,11 +186,12 @@ def filter(self, iterable, prereleases=None):
                 # If our version is a prerelease, and we were not set to allow
                 # prereleases, then we'll store it for later incase nothing
                 # else matches this specifier.
-                if (parsed_version.is_prerelease and not
-                        (prereleases or self.prereleases)):
+                if parsed_version.is_prerelease and not (
+                    prereleases or self.prereleases
+                ):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the begining.
+                # accepting prereleases from the beginning.
                 else:
                     yielded = True
                     yield version
@@ -213,8 +206,7 @@ def filter(self, iterable, prereleases=None):
 
 class LegacySpecifier(_IndividualSpecifier):
 
-    _regex_str = (
-        r"""
+    _regex_str = r"""
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
@@ -225,10 +217,8 @@ class LegacySpecifier(_IndividualSpecifier):
                       # them, and a comma since it's a version separator.
         )
         """
-    )
 
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "==": "equal",
@@ -269,13 +259,13 @@ def wrapped(self, prospective, spec):
         if not isinstance(prospective, Version):
             return False
         return fn(self, prospective, spec)
+
     return wrapped
 
 
 class Specifier(_IndividualSpecifier):
 
-    _regex_str = (
-        r"""
+    _regex_str = r"""
         (?P<operator>(~=|==|!=|<=|>=|<|>|===))
         (?P<version>
             (?:
@@ -367,10 +357,8 @@ class Specifier(_IndividualSpecifier):
             )
         )
         """
-    )
 
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "~=": "compatible",
@@ -397,8 +385,7 @@ def _compare_compatible(self, prospective, spec):
         prefix = ".".join(
             list(
                 itertools.takewhile(
-                    lambda x: (not x.startswith("post") and not
-                               x.startswith("dev")),
+                    lambda x: (not x.startswith("post") and not x.startswith("dev")),
                     _version_split(spec),
                 )
             )[:-1]
@@ -407,8 +394,9 @@ def _compare_compatible(self, prospective, spec):
         # Add the prefix notation to the end of our string
         prefix += ".*"
 
-        return (self._get_operator(">=")(prospective, spec) and
-                self._get_operator("==")(prospective, prefix))
+        return self._get_operator(">=")(prospective, spec) and self._get_operator("==")(
+            prospective, prefix
+        )
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
@@ -428,7 +416,7 @@ def _compare_equal(self, prospective, spec):
             # Shorten the prospective version to be the same length as the spec
             # so that we can determine if the specifier is a prefix of the
             # prospective version or not.
-            prospective = prospective[:len(spec)]
+            prospective = prospective[: len(spec)]
 
             # Pad out our two sides with zeros so that they both equal the same
             # length.
@@ -503,7 +491,7 @@ def _compare_greater_than(self, prospective, spec):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is techincally greater than, to match.
+        # in the specifier, which is technically greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
@@ -567,27 +555,17 @@ def _pad_version(left, right):
     right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
 
     # Get the rest of our versions
-    left_split.append(left[len(left_split[0]):])
-    right_split.append(right[len(right_split[0]):])
+    left_split.append(left[len(left_split[0]) :])
+    right_split.append(right[len(right_split[0]) :])
 
     # Insert our padding
-    left_split.insert(
-        1,
-        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
-    )
-    right_split.insert(
-        1,
-        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
-    )
+    left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
+    right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
 
-    return (
-        list(itertools.chain(*left_split)),
-        list(itertools.chain(*right_split)),
-    )
+    return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split)))
 
 
 class SpecifierSet(BaseSpecifier):
-
     def __init__(self, specifiers="", prereleases=None):
         # Split on , to break each indidivual specifier into it's own item, and
         # strip each item to remove leading/trailing whitespace.
@@ -721,10 +699,7 @@ def contains(self, item, prereleases=None):
         # given version is contained within all of them.
         # Note: This use of all() here means that an empty set of specifiers
         #       will always return True, this is an explicit design decision.
-        return all(
-            s.contains(item, prereleases=prereleases)
-            for s in self._specs
-        )
+        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
     def filter(self, iterable, prereleases=None):
         # Determine if we're forcing a prerelease or not, if we're not forcing
diff --git a/setuptools/_vendor/packaging/tags.py b/setuptools/_vendor/packaging/tags.py
new file mode 100644
index 0000000000..ec9942f0f6
--- /dev/null
+++ b/setuptools/_vendor/packaging/tags.py
@@ -0,0 +1,404 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+from __future__ import absolute_import
+
+import distutils.util
+
+try:
+    from importlib.machinery import EXTENSION_SUFFIXES
+except ImportError:  # pragma: no cover
+    import imp
+
+    EXTENSION_SUFFIXES = [x[0] for x in imp.get_suffixes()]
+    del imp
+import platform
+import re
+import sys
+import sysconfig
+import warnings
+
+
+INTERPRETER_SHORT_NAMES = {
+    "python": "py",  # Generic.
+    "cpython": "cp",
+    "pypy": "pp",
+    "ironpython": "ip",
+    "jython": "jy",
+}
+
+
+_32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
+
+
+class Tag(object):
+
+    __slots__ = ["_interpreter", "_abi", "_platform"]
+
+    def __init__(self, interpreter, abi, platform):
+        self._interpreter = interpreter.lower()
+        self._abi = abi.lower()
+        self._platform = platform.lower()
+
+    @property
+    def interpreter(self):
+        return self._interpreter
+
+    @property
+    def abi(self):
+        return self._abi
+
+    @property
+    def platform(self):
+        return self._platform
+
+    def __eq__(self, other):
+        return (
+            (self.platform == other.platform)
+            and (self.abi == other.abi)
+            and (self.interpreter == other.interpreter)
+        )
+
+    def __hash__(self):
+        return hash((self._interpreter, self._abi, self._platform))
+
+    def __str__(self):
+        return "{}-{}-{}".format(self._interpreter, self._abi, self._platform)
+
+    def __repr__(self):
+        return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
+
+
+def parse_tag(tag):
+    tags = set()
+    interpreters, abis, platforms = tag.split("-")
+    for interpreter in interpreters.split("."):
+        for abi in abis.split("."):
+            for platform_ in platforms.split("."):
+                tags.add(Tag(interpreter, abi, platform_))
+    return frozenset(tags)
+
+
+def _normalize_string(string):
+    return string.replace(".", "_").replace("-", "_")
+
+
+def _cpython_interpreter(py_version):
+    # TODO: Is using py_version_nodot for interpreter version critical?
+    return "cp{major}{minor}".format(major=py_version[0], minor=py_version[1])
+
+
+def _cpython_abis(py_version):
+    abis = []
+    version = "{}{}".format(*py_version[:2])
+    debug = pymalloc = ucs4 = ""
+    with_debug = sysconfig.get_config_var("Py_DEBUG")
+    has_refcount = hasattr(sys, "gettotalrefcount")
+    # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
+    # extension modules is the best option.
+    # https://github.com/pypa/pip/issues/3383#issuecomment-173267692
+    has_ext = "_d.pyd" in EXTENSION_SUFFIXES
+    if with_debug or (with_debug is None and (has_refcount or has_ext)):
+        debug = "d"
+    if py_version < (3, 8):
+        with_pymalloc = sysconfig.get_config_var("WITH_PYMALLOC")
+        if with_pymalloc or with_pymalloc is None:
+            pymalloc = "m"
+        if py_version < (3, 3):
+            unicode_size = sysconfig.get_config_var("Py_UNICODE_SIZE")
+            if unicode_size == 4 or (
+                unicode_size is None and sys.maxunicode == 0x10FFFF
+            ):
+                ucs4 = "u"
+    elif debug:
+        # Debug builds can also load "normal" extension modules.
+        # We can also assume no UCS-4 or pymalloc requirement.
+        abis.append("cp{version}".format(version=version))
+    abis.insert(
+        0,
+        "cp{version}{debug}{pymalloc}{ucs4}".format(
+            version=version, debug=debug, pymalloc=pymalloc, ucs4=ucs4
+        ),
+    )
+    return abis
+
+
+def _cpython_tags(py_version, interpreter, abis, platforms):
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
+    for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
+        yield tag
+    for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
+        yield tag
+    # PEP 384 was first implemented in Python 3.2.
+    for minor_version in range(py_version[1] - 1, 1, -1):
+        for platform_ in platforms:
+            interpreter = "cp{major}{minor}".format(
+                major=py_version[0], minor=minor_version
+            )
+            yield Tag(interpreter, "abi3", platform_)
+
+
+def _pypy_interpreter():
+    return "pp{py_major}{pypy_major}{pypy_minor}".format(
+        py_major=sys.version_info[0],
+        pypy_major=sys.pypy_version_info.major,
+        pypy_minor=sys.pypy_version_info.minor,
+    )
+
+
+def _generic_abi():
+    abi = sysconfig.get_config_var("SOABI")
+    if abi:
+        return _normalize_string(abi)
+    else:
+        return "none"
+
+
+def _pypy_tags(py_version, interpreter, abi, platforms):
+    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
+        yield tag
+    for tag in (Tag(interpreter, "none", platform) for platform in platforms):
+        yield tag
+
+
+def _generic_tags(interpreter, py_version, abi, platforms):
+    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
+        yield tag
+    if abi != "none":
+        tags = (Tag(interpreter, "none", platform_) for platform_ in platforms)
+        for tag in tags:
+            yield tag
+
+
+def _py_interpreter_range(py_version):
+    """
+    Yield Python versions in descending order.
+
+    After the latest version, the major-only version will be yielded, and then
+    all following versions up to 'end'.
+    """
+    yield "py{major}{minor}".format(major=py_version[0], minor=py_version[1])
+    yield "py{major}".format(major=py_version[0])
+    for minor in range(py_version[1] - 1, -1, -1):
+        yield "py{major}{minor}".format(major=py_version[0], minor=minor)
+
+
+def _independent_tags(interpreter, py_version, platforms):
+    """
+    Return the sequence of tags that are consistent across implementations.
+
+    The tags consist of:
+    - py*-none-<platform>
+    - <interpreter>-none-any
+    - py*-none-any
+    """
+    for version in _py_interpreter_range(py_version):
+        for platform_ in platforms:
+            yield Tag(version, "none", platform_)
+    yield Tag(interpreter, "none", "any")
+    for version in _py_interpreter_range(py_version):
+        yield Tag(version, "none", "any")
+
+
+def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
+    if not is_32bit:
+        return arch
+
+    if arch.startswith("ppc"):
+        return "ppc"
+
+    return "i386"
+
+
+def _mac_binary_formats(version, cpu_arch):
+    formats = [cpu_arch]
+    if cpu_arch == "x86_64":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat64", "fat32"])
+
+    elif cpu_arch == "i386":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat32", "fat"])
+
+    elif cpu_arch == "ppc64":
+        # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
+        if version > (10, 5) or version < (10, 4):
+            return []
+        formats.append("fat64")
+
+    elif cpu_arch == "ppc":
+        if version > (10, 6):
+            return []
+        formats.extend(["fat32", "fat"])
+
+    formats.append("universal")
+    return formats
+
+
+def _mac_platforms(version=None, arch=None):
+    version_str, _, cpu_arch = platform.mac_ver()
+    if version is None:
+        version = tuple(map(int, version_str.split(".")[:2]))
+    if arch is None:
+        arch = _mac_arch(cpu_arch)
+    platforms = []
+    for minor_version in range(version[1], -1, -1):
+        compat_version = version[0], minor_version
+        binary_formats = _mac_binary_formats(compat_version, arch)
+        for binary_format in binary_formats:
+            platforms.append(
+                "macosx_{major}_{minor}_{binary_format}".format(
+                    major=compat_version[0],
+                    minor=compat_version[1],
+                    binary_format=binary_format,
+                )
+            )
+    return platforms
+
+
+# From PEP 513.
+def _is_manylinux_compatible(name, glibc_version):
+    # Check for presence of _manylinux module.
+    try:
+        import _manylinux
+
+        return bool(getattr(_manylinux, name + "_compatible"))
+    except (ImportError, AttributeError):
+        # Fall through to heuristic check below.
+        pass
+
+    return _have_compatible_glibc(*glibc_version)
+
+
+def _glibc_version_string():
+    # Returns glibc version string, or None if not using glibc.
+    import ctypes
+
+    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
+    # manpage says, "If filename is NULL, then the returned handle is for the
+    # main program". This way we can let the linker do the work to figure out
+    # which libc our process is actually using.
+    process_namespace = ctypes.CDLL(None)
+    try:
+        gnu_get_libc_version = process_namespace.gnu_get_libc_version
+    except AttributeError:
+        # Symbol doesn't exist -> therefore, we are not linked to
+        # glibc.
+        return None
+
+    # Call gnu_get_libc_version, which returns a string like "2.5"
+    gnu_get_libc_version.restype = ctypes.c_char_p
+    version_str = gnu_get_libc_version()
+    # py2 / py3 compatibility:
+    if not isinstance(version_str, str):
+        version_str = version_str.decode("ascii")
+
+    return version_str
+
+
+# Separated out from have_compatible_glibc for easier unit testing.
+def _check_glibc_version(version_str, required_major, minimum_minor):
+    # Parse string and check against requested version.
+    #
+    # We use a regexp instead of str.split because we want to discard any
+    # random junk that might come after the minor version -- this might happen
+    # in patched/forked versions of glibc (e.g. Linaro's version of glibc
+    # uses version strings like "2.20-2014.11"). See gh-3588.
+    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
+    if not m:
+        warnings.warn(
+            "Expected glibc version with 2 components major.minor,"
+            " got: %s" % version_str,
+            RuntimeWarning,
+        )
+        return False
+    return (
+        int(m.group("major")) == required_major
+        and int(m.group("minor")) >= minimum_minor
+    )
+
+
+def _have_compatible_glibc(required_major, minimum_minor):
+    version_str = _glibc_version_string()
+    if version_str is None:
+        return False
+    return _check_glibc_version(version_str, required_major, minimum_minor)
+
+
+def _linux_platforms(is_32bit=_32_BIT_INTERPRETER):
+    linux = _normalize_string(distutils.util.get_platform())
+    if linux == "linux_x86_64" and is_32bit:
+        linux = "linux_i686"
+    manylinux_support = (
+        ("manylinux2014", (2, 17)),  # CentOS 7 w/ glibc 2.17 (PEP 599)
+        ("manylinux2010", (2, 12)),  # CentOS 6 w/ glibc 2.12 (PEP 571)
+        ("manylinux1", (2, 5)),  # CentOS 5 w/ glibc 2.5 (PEP 513)
+    )
+    manylinux_support_iter = iter(manylinux_support)
+    for name, glibc_version in manylinux_support_iter:
+        if _is_manylinux_compatible(name, glibc_version):
+            platforms = [linux.replace("linux", name)]
+            break
+    else:
+        platforms = []
+    # Support for a later manylinux implies support for an earlier version.
+    platforms += [linux.replace("linux", name) for name, _ in manylinux_support_iter]
+    platforms.append(linux)
+    return platforms
+
+
+def _generic_platforms():
+    platform = _normalize_string(distutils.util.get_platform())
+    return [platform]
+
+
+def _interpreter_name():
+    name = platform.python_implementation().lower()
+    return INTERPRETER_SHORT_NAMES.get(name) or name
+
+
+def _generic_interpreter(name, py_version):
+    version = sysconfig.get_config_var("py_version_nodot")
+    if not version:
+        version = "".join(map(str, py_version[:2]))
+    return "{name}{version}".format(name=name, version=version)
+
+
+def sys_tags():
+    """
+    Returns the sequence of tag triples for the running interpreter.
+
+    The order of the sequence corresponds to priority order for the
+    interpreter, from most to least important.
+    """
+    py_version = sys.version_info[:2]
+    interpreter_name = _interpreter_name()
+    if platform.system() == "Darwin":
+        platforms = _mac_platforms()
+    elif platform.system() == "Linux":
+        platforms = _linux_platforms()
+    else:
+        platforms = _generic_platforms()
+
+    if interpreter_name == "cp":
+        interpreter = _cpython_interpreter(py_version)
+        abis = _cpython_abis(py_version)
+        for tag in _cpython_tags(py_version, interpreter, abis, platforms):
+            yield tag
+    elif interpreter_name == "pp":
+        interpreter = _pypy_interpreter()
+        abi = _generic_abi()
+        for tag in _pypy_tags(py_version, interpreter, abi, platforms):
+            yield tag
+    else:
+        interpreter = _generic_interpreter(interpreter_name, py_version)
+        abi = _generic_abi()
+        for tag in _generic_tags(interpreter, py_version, abi, platforms):
+            yield tag
+    for tag in _independent_tags(interpreter, py_version, platforms):
+        yield tag
diff --git a/setuptools/_vendor/packaging/utils.py b/setuptools/_vendor/packaging/utils.py
index 942387cef5..8841878693 100644
--- a/setuptools/_vendor/packaging/utils.py
+++ b/setuptools/_vendor/packaging/utils.py
@@ -5,6 +5,8 @@
 
 import re
 
+from .version import InvalidVersion, Version
+
 
 _canonicalize_regex = re.compile(r"[-_.]+")
 
@@ -12,3 +14,44 @@
 def canonicalize_name(name):
     # This is taken from PEP 503.
     return _canonicalize_regex.sub("-", name).lower()
+
+
+def canonicalize_version(version):
+    """
+    This is very similar to Version.__str__, but has one subtle differences
+    with the way it handles the release segment.
+    """
+
+    try:
+        version = Version(version)
+    except InvalidVersion:
+        # Legacy versions cannot be normalized
+        return version
+
+    parts = []
+
+    # Epoch
+    if version.epoch != 0:
+        parts.append("{0}!".format(version.epoch))
+
+    # Release segment
+    # NB: This strips trailing '.0's to normalize
+    parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in version.release)))
+
+    # Pre-release
+    if version.pre is not None:
+        parts.append("".join(str(x) for x in version.pre))
+
+    # Post-release
+    if version.post is not None:
+        parts.append(".post{0}".format(version.post))
+
+    # Development release
+    if version.dev is not None:
+        parts.append(".dev{0}".format(version.dev))
+
+    # Local version segment
+    if version.local is not None:
+        parts.append("+{0}".format(version.local))
+
+    return "".join(parts)
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
index 83b5ee8c5e..95157a1f78 100644
--- a/setuptools/_vendor/packaging/version.py
+++ b/setuptools/_vendor/packaging/version.py
@@ -10,14 +10,11 @@
 from ._structures import Infinity
 
 
-__all__ = [
-    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
-]
+__all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
 
 
 _Version = collections.namedtuple(
-    "_Version",
-    ["epoch", "release", "dev", "pre", "post", "local"],
+    "_Version", ["epoch", "release", "dev", "pre", "post", "local"]
 )
 
 
@@ -40,7 +37,6 @@ class InvalidVersion(ValueError):
 
 
 class _BaseVersion(object):
-
     def __hash__(self):
         return hash(self._key)
 
@@ -70,7 +66,6 @@ def _compare(self, other, method):
 
 
 class LegacyVersion(_BaseVersion):
-
     def __init__(self, version):
         self._version = str(version)
         self._key = _legacy_cmpkey(self._version)
@@ -89,6 +84,26 @@ def public(self):
     def base_version(self):
         return self._version
 
+    @property
+    def epoch(self):
+        return -1
+
+    @property
+    def release(self):
+        return None
+
+    @property
+    def pre(self):
+        return None
+
+    @property
+    def post(self):
+        return None
+
+    @property
+    def dev(self):
+        return None
+
     @property
     def local(self):
         return None
@@ -101,13 +116,19 @@ def is_prerelease(self):
     def is_postrelease(self):
         return False
 
+    @property
+    def is_devrelease(self):
+        return False
 
-_legacy_version_component_re = re.compile(
-    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
-)
+
+_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
 
 _legacy_version_replacement_map = {
-    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+    "pre": "c",
+    "preview": "c",
+    "-": "final-",
+    "rc": "c",
+    "dev": "@",
 }
 
 
@@ -154,6 +175,7 @@ def _legacy_cmpkey(version):
 
     return epoch, parts
 
+
 # Deliberately not anchored to the start and end of the string, to make it
 # easier for 3rd party code to reuse
 VERSION_PATTERN = r"""
@@ -190,10 +212,7 @@ def _legacy_cmpkey(version):
 
 class Version(_BaseVersion):
 
-    _regex = re.compile(
-        r"^\s*" + VERSION_PATTERN + r"\s*$",
-        re.VERBOSE | re.IGNORECASE,
-    )
+    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     def __init__(self, version):
         # Validate the version and parse it into pieces
@@ -205,18 +224,11 @@ def __init__(self, version):
         self._version = _Version(
             epoch=int(match.group("epoch")) if match.group("epoch") else 0,
             release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(
-                match.group("pre_l"),
-                match.group("pre_n"),
-            ),
+            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
             post=_parse_letter_version(
-                match.group("post_l"),
-                match.group("post_n1") or match.group("post_n2"),
-            ),
-            dev=_parse_letter_version(
-                match.group("dev_l"),
-                match.group("dev_n"),
+                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
             ),
+            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
             local=_parse_local_version(match.group("local")),
         )
 
@@ -237,32 +249,57 @@ def __str__(self):
         parts = []
 
         # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
+        parts.append(".".join(str(x) for x in self.release))
 
         # Pre-release
-        if self._version.pre is not None:
-            parts.append("".join(str(x) for x in self._version.pre))
+        if self.pre is not None:
+            parts.append("".join(str(x) for x in self.pre))
 
         # Post-release
-        if self._version.post is not None:
-            parts.append(".post{0}".format(self._version.post[1]))
+        if self.post is not None:
+            parts.append(".post{0}".format(self.post))
 
         # Development release
-        if self._version.dev is not None:
-            parts.append(".dev{0}".format(self._version.dev[1]))
+        if self.dev is not None:
+            parts.append(".dev{0}".format(self.dev))
 
         # Local version segment
-        if self._version.local is not None:
-            parts.append(
-                "+{0}".format(".".join(str(x) for x in self._version.local))
-            )
+        if self.local is not None:
+            parts.append("+{0}".format(self.local))
 
         return "".join(parts)
 
+    @property
+    def epoch(self):
+        return self._version.epoch
+
+    @property
+    def release(self):
+        return self._version.release
+
+    @property
+    def pre(self):
+        return self._version.pre
+
+    @property
+    def post(self):
+        return self._version.post[1] if self._version.post else None
+
+    @property
+    def dev(self):
+        return self._version.dev[1] if self._version.dev else None
+
+    @property
+    def local(self):
+        if self._version.local:
+            return ".".join(str(x) for x in self._version.local)
+        else:
+            return None
+
     @property
     def public(self):
         return str(self).split("+", 1)[0]
@@ -272,27 +309,25 @@ def base_version(self):
         parts = []
 
         # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
+        parts.append(".".join(str(x) for x in self.release))
 
         return "".join(parts)
 
-    @property
-    def local(self):
-        version_string = str(self)
-        if "+" in version_string:
-            return version_string.split("+", 1)[1]
-
     @property
     def is_prerelease(self):
-        return bool(self._version.dev or self._version.pre)
+        return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self):
-        return bool(self._version.post)
+        return self.post is not None
+
+    @property
+    def is_devrelease(self):
+        return self.dev is not None
 
 
 def _parse_letter_version(letter, number):
@@ -326,7 +361,7 @@ def _parse_letter_version(letter, number):
         return letter, int(number)
 
 
-_local_version_seperators = re.compile(r"[\._-]")
+_local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local):
@@ -336,7 +371,7 @@ def _parse_local_version(local):
     if local is not None:
         return tuple(
             part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_seperators.split(local)
+            for part in _local_version_separators.split(local)
         )
 
 
@@ -347,12 +382,7 @@ def _cmpkey(epoch, release, pre, post, dev, local):
     # re-reverse it back into the correct order and make it a tuple and use
     # that for our sorting key.
     release = tuple(
-        reversed(list(
-            itertools.dropwhile(
-                lambda x: x == 0,
-                reversed(release),
-            )
-        ))
+        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
     )
 
     # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
@@ -385,9 +415,6 @@ def _cmpkey(epoch, release, pre, post, dev, local):
         # - Numeric segments sort numerically
         # - Shorter versions sort before longer versions when the prefixes
         #   match exactly
-        local = tuple(
-            (i, "") if isinstance(i, int) else (-Infinity, i)
-            for i in local
-        )
+        local = tuple((i, "") if isinstance(i, int) else (-Infinity, i) for i in local)
 
     return epoch, release, pre, post, dev, local
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 5731b4244b..65183d9a2a 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==16.8
+packaging==19.2
 pyparsing==2.2.1
 six==1.10.0
 ordered-set==3.1.1

From 3d811b93a83d5931b821916c6ca172a69c403a97 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 23 Aug 2019 23:18:02 +0200
Subject: [PATCH 7546/8469] wheel: switch to `packaging.tags` for checking PEP
 425 tags

---
 setuptools/glibc.py                 |  86 --------
 setuptools/pep425tags.py            | 319 ----------------------------
 setuptools/tests/test_glibc.py      |  52 -----
 setuptools/tests/test_pep425tags.py | 170 ---------------
 setuptools/wheel.py                 |   4 +-
 5 files changed, 2 insertions(+), 629 deletions(-)
 delete mode 100644 setuptools/glibc.py
 delete mode 100644 setuptools/pep425tags.py
 delete mode 100644 setuptools/tests/test_glibc.py
 delete mode 100644 setuptools/tests/test_pep425tags.py

diff --git a/setuptools/glibc.py b/setuptools/glibc.py
deleted file mode 100644
index a134591c30..0000000000
--- a/setuptools/glibc.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file originally from pip:
-# https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/utils/glibc.py
-from __future__ import absolute_import
-
-import ctypes
-import re
-import warnings
-
-
-def glibc_version_string():
-    "Returns glibc version string, or None if not using glibc."
-
-    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
-    # manpage says, "If filename is NULL, then the returned handle is for the
-    # main program". This way we can let the linker do the work to figure out
-    # which libc our process is actually using.
-    process_namespace = ctypes.CDLL(None)
-    try:
-        gnu_get_libc_version = process_namespace.gnu_get_libc_version
-    except AttributeError:
-        # Symbol doesn't exist -> therefore, we are not linked to
-        # glibc.
-        return None
-
-    # Call gnu_get_libc_version, which returns a string like "2.5"
-    gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str = gnu_get_libc_version()
-    # py2 / py3 compatibility:
-    if not isinstance(version_str, str):
-        version_str = version_str.decode("ascii")
-
-    return version_str
-
-
-# Separated out from have_compatible_glibc for easier unit testing
-def check_glibc_version(version_str, required_major, minimum_minor):
-    # Parse string and check against requested version.
-    #
-    # We use a regexp instead of str.split because we want to discard any
-    # random junk that might come after the minor version -- this might happen
-    # in patched/forked versions of glibc (e.g. Linaro's version of glibc
-    # uses version strings like "2.20-2014.11"). See gh-3588.
-    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
-    if not m:
-        warnings.warn("Expected glibc version with 2 components major.minor,"
-                      " got: %s" % version_str, RuntimeWarning)
-        return False
-    return (int(m.group("major")) == required_major and
-            int(m.group("minor")) >= minimum_minor)
-
-
-def have_compatible_glibc(required_major, minimum_minor):
-    version_str = glibc_version_string()
-    if version_str is None:
-        return False
-    return check_glibc_version(version_str, required_major, minimum_minor)
-
-
-# platform.libc_ver regularly returns completely nonsensical glibc
-# versions. E.g. on my computer, platform says:
-#
-#   ~$ python2.7 -c 'import platform; print(platform.libc_ver())'
-#   ('glibc', '2.7')
-#   ~$ python3.5 -c 'import platform; print(platform.libc_ver())'
-#   ('glibc', '2.9')
-#
-# But the truth is:
-#
-#   ~$ ldd --version
-#   ldd (Debian GLIBC 2.22-11) 2.22
-#
-# This is unfortunate, because it means that the linehaul data on libc
-# versions that was generated by pip 8.1.2 and earlier is useless and
-# misleading. Solution: instead of using platform, use our code that actually
-# works.
-def libc_ver():
-    """Try to determine the glibc version
-
-    Returns a tuple of strings (lib, version) which default to empty strings
-    in case the lookup fails.
-    """
-    glibc_version = glibc_version_string()
-    if glibc_version is None:
-        return ("", "")
-    else:
-        return ("glibc", glibc_version)
diff --git a/setuptools/pep425tags.py b/setuptools/pep425tags.py
deleted file mode 100644
index 48745a2902..0000000000
--- a/setuptools/pep425tags.py
+++ /dev/null
@@ -1,319 +0,0 @@
-# This file originally from pip:
-# https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/pep425tags.py
-"""Generate and work with PEP 425 Compatibility Tags."""
-from __future__ import absolute_import
-
-import distutils.util
-from distutils import log
-import platform
-import re
-import sys
-import sysconfig
-import warnings
-from collections import OrderedDict
-
-from .extern import six
-
-from . import glibc
-
-_osx_arch_pat = re.compile(r'(.+)_(\d+)_(\d+)_(.+)')
-
-
-def get_config_var(var):
-    try:
-        return sysconfig.get_config_var(var)
-    except IOError as e:  # Issue #1074
-        warnings.warn("{}".format(e), RuntimeWarning)
-        return None
-
-
-def get_abbr_impl():
-    """Return abbreviated implementation name."""
-    if hasattr(sys, 'pypy_version_info'):
-        pyimpl = 'pp'
-    elif sys.platform.startswith('java'):
-        pyimpl = 'jy'
-    elif sys.platform == 'cli':
-        pyimpl = 'ip'
-    else:
-        pyimpl = 'cp'
-    return pyimpl
-
-
-def get_impl_ver():
-    """Return implementation version."""
-    impl_ver = get_config_var("py_version_nodot")
-    if not impl_ver or get_abbr_impl() == 'pp':
-        impl_ver = ''.join(map(str, get_impl_version_info()))
-    return impl_ver
-
-
-def get_impl_version_info():
-    """Return sys.version_info-like tuple for use in decrementing the minor
-    version."""
-    if get_abbr_impl() == 'pp':
-        # as per https://github.com/pypa/pip/issues/2882
-        return (sys.version_info[0], sys.pypy_version_info.major,
-                sys.pypy_version_info.minor)
-    else:
-        return sys.version_info[0], sys.version_info[1]
-
-
-def get_impl_tag():
-    """
-    Returns the Tag for this specific implementation.
-    """
-    return "{}{}".format(get_abbr_impl(), get_impl_ver())
-
-
-def get_flag(var, fallback, expected=True, warn=True):
-    """Use a fallback method for determining SOABI flags if the needed config
-    var is unset or unavailable."""
-    val = get_config_var(var)
-    if val is None:
-        if warn:
-            log.debug("Config variable '%s' is unset, Python ABI tag may "
-                      "be incorrect", var)
-        return fallback()
-    return val == expected
-
-
-def get_abi_tag():
-    """Return the ABI tag based on SOABI (if available) or emulate SOABI
-    (CPython 2, PyPy)."""
-    soabi = get_config_var('SOABI')
-    impl = get_abbr_impl()
-    if not soabi and impl in {'cp', 'pp'} and hasattr(sys, 'maxunicode'):
-        d = ''
-        m = ''
-        u = ''
-        if get_flag('Py_DEBUG',
-                    lambda: hasattr(sys, 'gettotalrefcount'),
-                    warn=(impl == 'cp')):
-            d = 'd'
-        if get_flag('WITH_PYMALLOC',
-                    lambda: impl == 'cp',
-                    warn=(impl == 'cp')):
-            m = 'm'
-        if get_flag('Py_UNICODE_SIZE',
-                    lambda: sys.maxunicode == 0x10ffff,
-                    expected=4,
-                    warn=(impl == 'cp' and
-                          six.PY2)) \
-                and six.PY2:
-            u = 'u'
-        abi = '%s%s%s%s%s' % (impl, get_impl_ver(), d, m, u)
-    elif soabi and soabi.startswith('cpython-'):
-        abi = 'cp' + soabi.split('-')[1]
-    elif soabi:
-        abi = soabi.replace('.', '_').replace('-', '_')
-    else:
-        abi = None
-    return abi
-
-
-def _is_running_32bit():
-    return sys.maxsize == 2147483647
-
-
-def get_platform():
-    """Return our platform name 'win32', 'linux_x86_64'"""
-    if sys.platform == 'darwin':
-        # distutils.util.get_platform() returns the release based on the value
-        # of MACOSX_DEPLOYMENT_TARGET on which Python was built, which may
-        # be significantly older than the user's current machine.
-        release, _, machine = platform.mac_ver()
-        split_ver = release.split('.')
-
-        if machine == "x86_64" and _is_running_32bit():
-            machine = "i386"
-        elif machine == "ppc64" and _is_running_32bit():
-            machine = "ppc"
-
-        return 'macosx_{}_{}_{}'.format(split_ver[0], split_ver[1], machine)
-
-    # XXX remove distutils dependency
-    result = distutils.util.get_platform().replace('.', '_').replace('-', '_')
-    if result == "linux_x86_64" and _is_running_32bit():
-        # 32 bit Python program (running on a 64 bit Linux): pip should only
-        # install and run 32 bit compiled extensions in that case.
-        result = "linux_i686"
-
-    return result
-
-
-def is_manylinux1_compatible():
-    # Only Linux, and only x86-64 / i686
-    if get_platform() not in {"linux_x86_64", "linux_i686"}:
-        return False
-
-    # Check for presence of _manylinux module
-    try:
-        import _manylinux
-        return bool(_manylinux.manylinux1_compatible)
-    except (ImportError, AttributeError):
-        # Fall through to heuristic check below
-        pass
-
-    # Check glibc version. CentOS 5 uses glibc 2.5.
-    return glibc.have_compatible_glibc(2, 5)
-
-
-def get_darwin_arches(major, minor, machine):
-    """Return a list of supported arches (including group arches) for
-    the given major, minor and machine architecture of a macOS machine.
-    """
-    arches = []
-
-    def _supports_arch(major, minor, arch):
-        # Looking at the application support for macOS versions in the chart
-        # provided by https://en.wikipedia.org/wiki/OS_X#Versions it appears
-        # our timeline looks roughly like:
-        #
-        # 10.0 - Introduces ppc support.
-        # 10.4 - Introduces ppc64, i386, and x86_64 support, however the ppc64
-        #        and x86_64 support is CLI only, and cannot be used for GUI
-        #        applications.
-        # 10.5 - Extends ppc64 and x86_64 support to cover GUI applications.
-        # 10.6 - Drops support for ppc64
-        # 10.7 - Drops support for ppc
-        #
-        # Given that we do not know if we're installing a CLI or a GUI
-        # application, we must be conservative and assume it might be a GUI
-        # application and behave as if ppc64 and x86_64 support did not occur
-        # until 10.5.
-        #
-        # Note: The above information is taken from the "Application support"
-        #       column in the chart not the "Processor support" since I believe
-        #       that we care about what instruction sets an application can use
-        #       not which processors the OS supports.
-        if arch == 'ppc':
-            return (major, minor) <= (10, 5)
-        if arch == 'ppc64':
-            return (major, minor) == (10, 5)
-        if arch == 'i386':
-            return (major, minor) >= (10, 4)
-        if arch == 'x86_64':
-            return (major, minor) >= (10, 5)
-        if arch in groups:
-            for garch in groups[arch]:
-                if _supports_arch(major, minor, garch):
-                    return True
-        return False
-
-    groups = OrderedDict([
-        ("fat", ("i386", "ppc")),
-        ("intel", ("x86_64", "i386")),
-        ("fat64", ("x86_64", "ppc64")),
-        ("fat32", ("x86_64", "i386", "ppc")),
-    ])
-
-    if _supports_arch(major, minor, machine):
-        arches.append(machine)
-
-    for garch in groups:
-        if machine in groups[garch] and _supports_arch(major, minor, garch):
-            arches.append(garch)
-
-    arches.append('universal')
-
-    return arches
-
-
-def get_supported(versions=None, noarch=False, platform=None,
-                  impl=None, abi=None):
-    """Return a list of supported tags for each version specified in
-    `versions`.
-
-    :param versions: a list of string versions, of the form ["33", "32"],
-        or None. The first version will be assumed to support our ABI.
-    :param platform: specify the exact platform you want valid
-        tags for, or None. If None, use the local system platform.
-    :param impl: specify the exact implementation you want valid
-        tags for, or None. If None, use the local interpreter impl.
-    :param abi: specify the exact abi you want valid
-        tags for, or None. If None, use the local interpreter abi.
-    """
-    supported = []
-
-    # Versions must be given with respect to the preference
-    if versions is None:
-        versions = []
-        version_info = get_impl_version_info()
-        major = version_info[:-1]
-        # Support all previous minor Python versions.
-        for minor in range(version_info[-1], -1, -1):
-            versions.append(''.join(map(str, major + (minor,))))
-
-    impl = impl or get_abbr_impl()
-
-    abis = []
-
-    abi = abi or get_abi_tag()
-    if abi:
-        abis[0:0] = [abi]
-
-    abi3s = set()
-    import imp
-    for suffix in imp.get_suffixes():
-        if suffix[0].startswith('.abi'):
-            abi3s.add(suffix[0].split('.', 2)[1])
-
-    abis.extend(sorted(list(abi3s)))
-
-    abis.append('none')
-
-    if not noarch:
-        arch = platform or get_platform()
-        if arch.startswith('macosx'):
-            # support macosx-10.6-intel on macosx-10.9-x86_64
-            match = _osx_arch_pat.match(arch)
-            if match:
-                name, major, minor, actual_arch = match.groups()
-                tpl = '{}_{}_%i_%s'.format(name, major)
-                arches = []
-                for m in reversed(range(int(minor) + 1)):
-                    for a in get_darwin_arches(int(major), m, actual_arch):
-                        arches.append(tpl % (m, a))
-            else:
-                # arch pattern didn't match (?!)
-                arches = [arch]
-        elif platform is None and is_manylinux1_compatible():
-            arches = [arch.replace('linux', 'manylinux1'), arch]
-        else:
-            arches = [arch]
-
-        # Current version, current API (built specifically for our Python):
-        for abi in abis:
-            for arch in arches:
-                supported.append(('%s%s' % (impl, versions[0]), abi, arch))
-
-        # abi3 modules compatible with older version of Python
-        for version in versions[1:]:
-            # abi3 was introduced in Python 3.2
-            if version in {'31', '30'}:
-                break
-            for abi in abi3s:   # empty set if not Python 3
-                for arch in arches:
-                    supported.append(("%s%s" % (impl, version), abi, arch))
-
-        # Has binaries, does not use the Python API:
-        for arch in arches:
-            supported.append(('py%s' % (versions[0][0]), 'none', arch))
-
-    # No abi / arch, but requires our implementation:
-    supported.append(('%s%s' % (impl, versions[0]), 'none', 'any'))
-    # Tagged specifically as being cross-version compatible
-    # (with just the major version specified)
-    supported.append(('%s%s' % (impl, versions[0][0]), 'none', 'any'))
-
-    # No abi / arch, generic Python
-    for i, version in enumerate(versions):
-        supported.append(('py%s' % (version,), 'none', 'any'))
-        if i == 0:
-            supported.append(('py%s' % (version[0]), 'none', 'any'))
-
-    return supported
-
-
-implementation_tag = get_impl_tag()
diff --git a/setuptools/tests/test_glibc.py b/setuptools/tests/test_glibc.py
deleted file mode 100644
index 795fdc5665..0000000000
--- a/setuptools/tests/test_glibc.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import warnings
-
-import pytest
-
-from setuptools.glibc import check_glibc_version
-
-__metaclass__ = type
-
-
-@pytest.fixture(params=[
-    "2.20",
-    # used by "linaro glibc", see gh-3588
-    "2.20-2014.11",
-    # weird possibilities that I just made up
-    "2.20+dev",
-    "2.20-custom",
-    "2.20.1",
-    ])
-def two_twenty(request):
-    return request.param
-
-
-@pytest.fixture(params=["asdf", "", "foo.bar"])
-def bad_string(request):
-    return request.param
-
-
-class TestGlibc:
-    def test_manylinux1_check_glibc_version(self, two_twenty):
-        """
-        Test that the check_glibc_version function is robust against weird
-        glibc version strings.
-        """
-        assert check_glibc_version(two_twenty, 2, 15)
-        assert check_glibc_version(two_twenty, 2, 20)
-        assert not check_glibc_version(two_twenty, 2, 21)
-        assert not check_glibc_version(two_twenty, 3, 15)
-        assert not check_glibc_version(two_twenty, 1, 15)
-
-    def test_bad_versions(self, bad_string):
-        """
-        For unparseable strings, warn and return False
-        """
-        with warnings.catch_warnings(record=True) as ws:
-            warnings.filterwarnings("always")
-            assert not check_glibc_version(bad_string, 2, 5)
-            for w in ws:
-                if "Expected glibc version with" in str(w.message):
-                    break
-            else:
-                # Didn't find the warning we were expecting
-                assert False
diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
deleted file mode 100644
index 30afdec7d4..0000000000
--- a/setuptools/tests/test_pep425tags.py
+++ /dev/null
@@ -1,170 +0,0 @@
-import sys
-
-import pytest
-from mock import patch
-
-from setuptools import pep425tags
-
-__metaclass__ = type
-
-
-class TestPEP425Tags:
-
-    def mock_get_config_var(self, **kwd):
-        """
-        Patch sysconfig.get_config_var for arbitrary keys.
-        """
-        get_config_var = pep425tags.sysconfig.get_config_var
-
-        def _mock_get_config_var(var):
-            if var in kwd:
-                return kwd[var]
-            return get_config_var(var)
-        return _mock_get_config_var
-
-    def abi_tag_unicode(self, flags, config_vars):
-        """
-        Used to test ABI tags, verify correct use of the `u` flag
-        """
-        config_vars.update({'SOABI': None})
-        base = pep425tags.get_abbr_impl() + pep425tags.get_impl_ver()
-
-        if sys.version_info < (3, 3):
-            config_vars.update({'Py_UNICODE_SIZE': 2})
-            mock_gcf = self.mock_get_config_var(**config_vars)
-            with patch(
-                    'setuptools.pep425tags.sysconfig.get_config_var',
-                    mock_gcf):
-                abi_tag = pep425tags.get_abi_tag()
-                assert abi_tag == base + flags
-
-            config_vars.update({'Py_UNICODE_SIZE': 4})
-            mock_gcf = self.mock_get_config_var(**config_vars)
-            with patch('setuptools.pep425tags.sysconfig.get_config_var',
-                       mock_gcf):
-                abi_tag = pep425tags.get_abi_tag()
-                assert abi_tag == base + flags + 'u'
-
-        else:
-            # On Python >= 3.3, UCS-4 is essentially permanently enabled, and
-            # Py_UNICODE_SIZE is None. SOABI on these builds does not include
-            # the 'u' so manual SOABI detection should not do so either.
-            config_vars.update({'Py_UNICODE_SIZE': None})
-            mock_gcf = self.mock_get_config_var(**config_vars)
-            with patch('setuptools.pep425tags.sysconfig.get_config_var',
-                       mock_gcf):
-                abi_tag = pep425tags.get_abi_tag()
-                assert abi_tag == base + flags
-
-    def test_broken_sysconfig(self):
-        """
-        Test that pep425tags still works when sysconfig is broken.
-        Can be a problem on Python 2.7
-        Issue #1074.
-        """
-        def raises_ioerror(var):
-            raise IOError("I have the wrong path!")
-
-        with patch('setuptools.pep425tags.sysconfig.get_config_var',
-                   raises_ioerror):
-            with pytest.warns(RuntimeWarning):
-                assert len(pep425tags.get_supported())
-
-    def test_no_hyphen_tag(self):
-        """
-        Test that no tag contains a hyphen.
-        """
-        mock_gcf = self.mock_get_config_var(SOABI='cpython-35m-darwin')
-
-        with patch('setuptools.pep425tags.sysconfig.get_config_var',
-                   mock_gcf):
-            supported = pep425tags.get_supported()
-
-        for (py, abi, plat) in supported:
-            assert '-' not in py
-            assert '-' not in abi
-            assert '-' not in plat
-
-    def test_manual_abi_noflags(self):
-        """
-        Test that no flags are set on a non-PyDebug, non-Pymalloc ABI tag.
-        """
-        self.abi_tag_unicode('', {'Py_DEBUG': False, 'WITH_PYMALLOC': False})
-
-    def test_manual_abi_d_flag(self):
-        """
-        Test that the `d` flag is set on a PyDebug, non-Pymalloc ABI tag.
-        """
-        self.abi_tag_unicode('d', {'Py_DEBUG': True, 'WITH_PYMALLOC': False})
-
-    def test_manual_abi_m_flag(self):
-        """
-        Test that the `m` flag is set on a non-PyDebug, Pymalloc ABI tag.
-        """
-        self.abi_tag_unicode('m', {'Py_DEBUG': False, 'WITH_PYMALLOC': True})
-
-    def test_manual_abi_dm_flags(self):
-        """
-        Test that the `dm` flags are set on a PyDebug, Pymalloc ABI tag.
-        """
-        self.abi_tag_unicode('dm', {'Py_DEBUG': True, 'WITH_PYMALLOC': True})
-
-
-class TestManylinux1Tags:
-
-    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
-    @patch('setuptools.glibc.have_compatible_glibc',
-           lambda major, minor: True)
-    def test_manylinux1_compatible_on_linux_x86_64(self):
-        """
-        Test that manylinux1 is enabled on linux_x86_64
-        """
-        assert pep425tags.is_manylinux1_compatible()
-
-    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_i686')
-    @patch('setuptools.glibc.have_compatible_glibc',
-           lambda major, minor: True)
-    def test_manylinux1_compatible_on_linux_i686(self):
-        """
-        Test that manylinux1 is enabled on linux_i686
-        """
-        assert pep425tags.is_manylinux1_compatible()
-
-    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
-    @patch('setuptools.glibc.have_compatible_glibc',
-           lambda major, minor: False)
-    def test_manylinux1_2(self):
-        """
-        Test that manylinux1 is disabled with incompatible glibc
-        """
-        assert not pep425tags.is_manylinux1_compatible()
-
-    @patch('setuptools.pep425tags.get_platform', lambda: 'arm6vl')
-    @patch('setuptools.glibc.have_compatible_glibc',
-           lambda major, minor: True)
-    def test_manylinux1_3(self):
-        """
-        Test that manylinux1 is disabled on arm6vl
-        """
-        assert not pep425tags.is_manylinux1_compatible()
-
-    @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
-    @patch('setuptools.glibc.have_compatible_glibc',
-           lambda major, minor: True)
-    @patch('sys.platform', 'linux2')
-    def test_manylinux1_tag_is_first(self):
-        """
-        Test that the more specific tag manylinux1 comes first.
-        """
-        groups = {}
-        for pyimpl, abi, arch in pep425tags.get_supported():
-            groups.setdefault((pyimpl, abi), []).append(arch)
-
-        for arches in groups.values():
-            if arches == ['any']:
-                continue
-            # Expect the most specific arch first:
-            if len(arches) == 3:
-                assert arches == ['manylinux1_x86_64', 'linux_x86_64', 'any']
-            else:
-                assert arches == ['manylinux1_x86_64', 'linux_x86_64']
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index e11f0a1d91..502f841065 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -11,9 +11,9 @@
 import pkg_resources
 import setuptools
 from pkg_resources import parse_version
+from setuptools.extern.packaging.tags import sys_tags
 from setuptools.extern.packaging.utils import canonicalize_name
 from setuptools.extern.six import PY3
-from setuptools import pep425tags
 from setuptools.command.egg_info import write_requirements
 
 
@@ -76,7 +76,7 @@ def tags(self):
 
     def is_compatible(self):
         '''Is the wheel is compatible with the current platform?'''
-        supported_tags = pep425tags.get_supported()
+        supported_tags = set(map(str, sys_tags()))
         return next((True for t in self.tags() if t in supported_tags), False)
 
     def egg_name(self):

From 0744f7b410ff937cec428b7d6ca103c419d81661 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 23 Aug 2019 23:57:35 +0200
Subject: [PATCH 7547/8469] add changelog entry

---
 changelog.d/1829.change.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog.d/1829.change.rst

diff --git a/changelog.d/1829.change.rst b/changelog.d/1829.change.rst
new file mode 100644
index 0000000000..36be832ac5
--- /dev/null
+++ b/changelog.d/1829.change.rst
@@ -0,0 +1,3 @@
+Update handling of wheels compatibility tags:
+* add support for manylinux2010
+* fix use of removed 'm' ABI flag in Python 3.8 on Windows

From b5a9209cd2a3882204e0f9c9158a4a4d1ebf5e9b Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 14 Aug 2019 02:01:37 +0200
Subject: [PATCH 7548/8469] docs: drop ez_setup documentation and related
 references

---
 changelog.d/1862.doc.rst |   1 +
 docs/easy_install.txt    |   4 +-
 docs/ez_setup.txt        | 195 ---------------------------------------
 docs/setuptools.txt      |  29 +-----
 4 files changed, 4 insertions(+), 225 deletions(-)
 create mode 100644 changelog.d/1862.doc.rst
 delete mode 100644 docs/ez_setup.txt

diff --git a/changelog.d/1862.doc.rst b/changelog.d/1862.doc.rst
new file mode 100644
index 0000000000..b71583ba37
--- /dev/null
+++ b/changelog.d/1862.doc.rst
@@ -0,0 +1 @@
+Drop ez_setup documentation: deprecated for some time (last updated in 2016), and still relying on easy_install (deprecated too).
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index aa11f89083..e247d8fd76 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -317,8 +317,8 @@ Note that instead of changing your ``PATH`` to include the Python scripts
 directory, you can also retarget the installation location for scripts so they
 go on a directory that's already on the ``PATH``.  For more information see
 `Command-Line Options`_ and `Configuration Files`_.  During installation,
-pass command line options (such as ``--script-dir``) to
-``ez_setup.py`` to control where ``easy_install.exe`` will be installed.
+pass command line options (such as ``--script-dir``) to to control where
+scripts will be installed.
 
 
 Windows Executable Launcher
diff --git a/docs/ez_setup.txt b/docs/ez_setup.txt
deleted file mode 100644
index 0126fee307..0000000000
--- a/docs/ez_setup.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-:orphan:
-
-``ez_setup`` distribution guide 
-===============================
-
-Using ``setuptools``...  Without bundling it!
----------------------------------------------
-
-.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
-
-.. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
-
-.. _EasyInstall Installation Instructions: easy_install.html
-
-.. _Custom Installation Locations: easy_install.html
-
-Your users might not have ``setuptools`` installed on their machines, or even
-if they do, it might not be the right version.  Fixing this is easy; just
-download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
-script.  (Be sure to add it to your revision control system, too.)  Then add
-these two lines to the very top of your setup script, before the script imports
-anything from setuptools:
-
-.. code-block:: python
-
-    import ez_setup
-    ez_setup.use_setuptools()
-
-That's it.  The ``ez_setup`` module will automatically download a matching
-version of ``setuptools`` from PyPI, if it isn't present on the target system.
-Whenever you install an updated version of setuptools, you should also update
-your projects' ``ez_setup.py`` files, so that a matching version gets installed
-on the target machine(s).
-
-(By the way, if you need to distribute a specific version of ``setuptools``,
-you can specify the exact version and base download URL as parameters to the
-``use_setuptools()`` function.  See the function's docstring for details.)
-
-
-What Your Users Should Know
----------------------------
-
-In general, a setuptools-based project looks just like any distutils-based
-project -- as long as your users have an internet connection and are installing
-to ``site-packages``, that is.  But for some users, these conditions don't
-apply, and they may become frustrated if this is their first encounter with
-a setuptools-based project.  To keep these users happy, you should review the
-following topics in your project's installation instructions, if they are
-relevant to your project and your target audience isn't already familiar with
-setuptools and ``easy_install``.
-
-Network Access
-    If your project is using ``ez_setup``, you should inform users of the
-    need to either have network access, or to preinstall the correct version of
-    setuptools using the `EasyInstall installation instructions`_.  Those
-    instructions also have tips for dealing with firewalls as well as how to
-    manually download and install setuptools.
-
-Custom Installation Locations
-    You should inform your users that if they are installing your project to
-    somewhere other than the main ``site-packages`` directory, they should
-    first install setuptools using the instructions for `Custom Installation
-    Locations`_, before installing your project.
-
-Your Project's Dependencies
-    If your project depends on other projects that may need to be downloaded
-    from PyPI or elsewhere, you should list them in your installation
-    instructions, or tell users how to find out what they are.  While most
-    users will not need this information, any users who don't have unrestricted
-    internet access may have to find, download, and install the other projects
-    manually.  (Note, however, that they must still install those projects
-    using ``easy_install``, or your project will not know they are installed,
-    and your setup script will try to download them again.)
-
-    If you want to be especially friendly to users with limited network access,
-    you may wish to build eggs for your project and its dependencies, making
-    them all available for download from your site, or at least create a page
-    with links to all of the needed eggs.  In this way, users with limited
-    network access can manually download all the eggs to a single directory,
-    then use the ``-f`` option of ``easy_install`` to specify the directory
-    to find eggs in.  Users who have full network access can just use ``-f``
-    with the URL of your download page, and ``easy_install`` will find all the
-    needed eggs using your links directly.  This is also useful when your
-    target audience isn't able to compile packages (e.g. most Windows users)
-    and your package or some of its dependencies include C code.
-
-Revision Control System Users and Co-Developers
-    Users and co-developers who are tracking your in-development code using
-    a revision control system should probably read this manual's sections
-    regarding such development.  Alternately, you may wish to create a
-    quick-reference guide containing the tips from this manual that apply to
-    your particular situation.  For example, if you recommend that people use
-    ``setup.py develop`` when tracking your in-development code, you should let
-    them know that this needs to be run after every update or commit.
-
-    Similarly, if you remove modules or data files from your project, you
-    should remind them to run ``setup.py clean --all`` and delete any obsolete
-    ``.pyc`` or ``.pyo``.  (This tip applies to the distutils in general, not
-    just setuptools, but not everybody knows about them; be kind to your users
-    by spelling out your project's best practices rather than leaving them
-    guessing.)
-
-Creating System Packages
-    Some users want to manage all Python packages using a single package
-    manager, and sometimes that package manager isn't ``easy_install``!
-    Setuptools currently supports ``bdist_rpm``, ``bdist_wininst``, and
-    ``bdist_dumb`` formats for system packaging.  If a user has a locally-
-    installed "bdist" packaging tool that internally uses the distutils
-    ``install`` command, it should be able to work with ``setuptools``.  Some
-    examples of "bdist" formats that this should work with include the
-    ``bdist_nsi`` and ``bdist_msi`` formats for Windows.
-
-    However, packaging tools that build binary distributions by running
-    ``setup.py install`` on the command line or as a subprocess will require
-    modification to work with setuptools.  They should use the
-    ``--single-version-externally-managed`` option to the ``install`` command,
-    combined with the standard ``--root`` or ``--record`` options.
-    See the `install command`_ documentation below for more details.  The
-    ``bdist_deb`` command is an example of a command that currently requires
-    this kind of patching to work with setuptools.
-
-    Please note that building system packages may require you to install
-    some system software, for example ``bdist_rpm`` requires the ``rpmbuild``
-    command to be installed.
-
-    If you or your users have a problem building a usable system package for
-    your project, please report the problem via the mailing list so that
-    either the "bdist" tool in question or setuptools can be modified to
-    resolve the issue.
-
-Your users might not have ``setuptools`` installed on their machines, or even
-if they do, it might not be the right version.  Fixing this is easy; just
-download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
-script.  (Be sure to add it to your revision control system, too.)  Then add
-these two lines to the very top of your setup script, before the script imports
-anything from setuptools:
-
-.. code-block:: python
-
-    import ez_setup
-    ez_setup.use_setuptools()
-
-That's it.  The ``ez_setup`` module will automatically download a matching
-version of ``setuptools`` from PyPI, if it isn't present on the target system.
-Whenever you install an updated version of setuptools, you should also update
-your projects' ``ez_setup.py`` files, so that a matching version gets installed
-on the target machine(s).
-
-(By the way, if you need to distribute a specific version of ``setuptools``,
-you can specify the exact version and base download URL as parameters to the
-``use_setuptools()`` function.  See the function's docstring for details.)
-
-.. _install command:
-
-``install`` - Run ``easy_install`` or old-style installation
-============================================================
-
-The setuptools ``install`` command is basically a shortcut to run the
-``easy_install`` command on the current project.  However, for convenience
-in creating "system packages" of setuptools-based projects, you can also
-use this option:
-
-``--single-version-externally-managed``
-    This boolean option tells the ``install`` command to perform an "old style"
-    installation, with the addition of an ``.egg-info`` directory so that the
-    installed project will still have its metadata available and operate
-    normally.  If you use this option, you *must* also specify the ``--root``
-    or ``--record`` options (or both), because otherwise you will have no way
-    to identify and remove the installed files.
-
-This option is automatically in effect when ``install`` is invoked by another
-distutils command, so that commands like ``bdist_wininst`` and ``bdist_rpm``
-will create system packages of eggs.  It is also automatically in effect if
-you specify the ``--root`` option.
-
-
-``install_egg_info`` - Install an ``.egg-info`` directory in ``site-packages``
-==============================================================================
-
-Setuptools runs this command as part of ``install`` operations that use the
-``--single-version-externally-managed`` options.  You should not invoke it
-directly; it is documented here for completeness and so that distutils
-extensions such as system package builders can make use of it.  This command
-has only one option:
-
-``--install-dir=DIR, -d DIR``
-    The parent directory where the ``.egg-info`` directory will be placed.
-    Defaults to the same as the ``--install-dir`` option specified for the
-    ``install_lib`` command, which is usually the system ``site-packages``
-    directory.
-
-This command assumes that the ``egg_info`` command has been given valid options
-via the command line or ``setup.cfg``, as it will invoke the ``egg_info``
-command and use its options to locate the project's source ``.egg-info``
-directory.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 26a3044e82..ba6b170a11 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -8,14 +8,7 @@ distribute Python packages, especially ones that have dependencies on other
 packages.
 
 Packages built and distributed using ``setuptools`` look to the user like
-ordinary Python packages based on the ``distutils``.  Your users don't need to
-install or even know about setuptools in order to use them, and you don't
-have to include the entire setuptools package in your distributions.  By
-including just a single `bootstrap module`_ (a 12K .py file), your package will
-automatically download and install ``setuptools`` if the user is building your
-package from source and doesn't have a suitable version already installed.
-
-.. _bootstrap module: https://bootstrap.pypa.io/ez_setup.py
+ordinary Python packages based on the ``distutils``.
 
 Feature Highlights:
 
@@ -62,8 +55,6 @@ Feature Highlights:
 
 .. contents:: **Table of Contents**
 
-.. _ez_setup.py: `bootstrap module`_
-
 
 -----------------
 Developer's Guide
@@ -596,10 +587,6 @@ Python must be available via the ``PATH`` environment variable, under its
 "long" name.  That is, if the egg is built for Python 2.3, there must be a
 ``python2.3`` executable present in a directory on ``PATH``.
 
-This feature is primarily intended to support ez_setup the installation of
-setuptools itself on non-Windows platforms, but may also be useful for other
-projects as well.
-
 IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
 invoked via symlinks.  They *must* be invoked using their original filename, in
 order to ensure that, once running, ``pkg_resources`` will know what project
@@ -1263,20 +1250,6 @@ To install your newly uploaded package ``example_pkg``,  you can use pip::
 If you have issues at any point, please refer to `Packaging project tutorials`_
 for clarification.
 
-Distributing legacy ``setuptools`` projects using ez_setup.py
--------------------------------------------------------------
-
-.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
-
-Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is 
-deprecated in favor of PIP. Please consider migrating to using pip and twine based
-distribution.
-
-However, if you still have any ``ez_setup`` based packages, documentation for 
-ez_setup based distributions can be found at `ez_setup distribution guide`_.
-
-.. _ez_setup distribution guide: ez_setup.html
-
 Setting the ``zip_safe`` flag
 -----------------------------
 

From 6a73945462a7e73168be53e377e4110a5dc89fb9 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 14 Aug 2019 00:49:50 +0200
Subject: [PATCH 7549/8469] tests: drop (easy_install based) manual tests

---
 tests/manual_test.py | 100 -------------------------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 tests/manual_test.py

diff --git a/tests/manual_test.py b/tests/manual_test.py
deleted file mode 100644
index 99db4b0143..0000000000
--- a/tests/manual_test.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import os
-import shutil
-import tempfile
-import subprocess
-from distutils.command.install import INSTALL_SCHEMES
-from string import Template
-
-from setuptools.extern.six.moves import urllib
-
-
-def _system_call(*args):
-    assert subprocess.call(args) == 0
-
-
-def tempdir(func):
-    def _tempdir(*args, **kwargs):
-        test_dir = tempfile.mkdtemp()
-        old_dir = os.getcwd()
-        os.chdir(test_dir)
-        try:
-            return func(*args, **kwargs)
-        finally:
-            os.chdir(old_dir)
-            shutil.rmtree(test_dir)
-
-    return _tempdir
-
-
-SIMPLE_BUILDOUT = """\
-[buildout]
-
-parts = eggs
-
-[eggs]
-recipe = zc.recipe.egg
-
-eggs =
-    extensions
-"""
-
-BOOTSTRAP = 'http://downloads.buildout.org/1/bootstrap.py'
-PYVER = sys.version.split()[0][:3]
-
-_VARS = {'base': '.',
-         'py_version_short': PYVER}
-
-scheme = 'nt' if sys.platform == 'win32' else 'unix_prefix'
-PURELIB = INSTALL_SCHEMES[scheme]['purelib']
-
-
-@tempdir
-def test_virtualenv():
-    """virtualenv with setuptools"""
-    purelib = os.path.abspath(Template(PURELIB).substitute(**_VARS))
-    _system_call('virtualenv', '--no-site-packages', '.')
-    _system_call('bin/easy_install', 'setuptools==dev')
-    # linux specific
-    site_pkg = os.listdir(purelib)
-    site_pkg.sort()
-    assert 'setuptools' in site_pkg[0]
-    easy_install = os.path.join(purelib, 'easy-install.pth')
-    with open(easy_install) as f:
-        res = f.read()
-    assert 'setuptools' in res
-
-
-@tempdir
-def test_full():
-    """virtualenv + pip + buildout"""
-    _system_call('virtualenv', '--no-site-packages', '.')
-    _system_call('bin/easy_install', '-q', 'setuptools==dev')
-    _system_call('bin/easy_install', '-qU', 'setuptools==dev')
-    _system_call('bin/easy_install', '-q', 'pip')
-    _system_call('bin/pip', 'install', '-q', 'zc.buildout')
-
-    with open('buildout.cfg', 'w') as f:
-        f.write(SIMPLE_BUILDOUT)
-
-    with open('bootstrap.py', 'w') as f:
-        f.write(urllib.request.urlopen(BOOTSTRAP).read())
-
-    _system_call('bin/python', 'bootstrap.py')
-    _system_call('bin/buildout', '-q')
-    eggs = os.listdir('eggs')
-    eggs.sort()
-    assert len(eggs) == 3
-    assert eggs[1].startswith('setuptools')
-    del eggs[1]
-    assert eggs == [
-        'extensions-0.3-py2.6.egg',
-        'zc.recipe.egg-1.2.2-py2.6.egg',
-    ]
-
-
-if __name__ == '__main__':
-    test_virtualenv()
-    test_full()

From 4c0e204413e6d2c33662a02c73a0ad13d81af9e5 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 8 Oct 2019 19:32:09 +0200
Subject: [PATCH 7550/8469] doc: drop most references to EasyInstall

---
 changelog.d/1868.doc.rst |   1 +
 docs/development.txt     |   2 +-
 docs/formats.txt         |   7 +-
 docs/pkg_resources.txt   |  14 +--
 docs/setuptools.txt      | 178 ++++++++++-----------------------------
 5 files changed, 54 insertions(+), 148 deletions(-)
 create mode 100644 changelog.d/1868.doc.rst

diff --git a/changelog.d/1868.doc.rst b/changelog.d/1868.doc.rst
new file mode 100644
index 0000000000..82283d7aea
--- /dev/null
+++ b/changelog.d/1868.doc.rst
@@ -0,0 +1 @@
+Drop most documentation references to (deprecated) EasyInstall.
diff --git a/docs/development.txt b/docs/development.txt
index 455f038afa..28e653fea9 100644
--- a/docs/development.txt
+++ b/docs/development.txt
@@ -7,7 +7,7 @@ Authority (PyPA) and led by Jason R. Coombs.
 
 This document describes the process by which Setuptools is developed.
 This document assumes the reader has some passing familiarity with
-*using* setuptools, the ``pkg_resources`` module, and EasyInstall.  It
+*using* setuptools, the ``pkg_resources`` module, and pip.  It
 does not attempt to explain basic concepts like inter-project
 dependencies, nor does it contain detailed lexical syntax for most
 file formats.  Neither does it explain concepts like "namespace
diff --git a/docs/formats.txt b/docs/formats.txt
index a182eb99fc..6c0456de29 100644
--- a/docs/formats.txt
+++ b/docs/formats.txt
@@ -299,11 +299,8 @@ specified by the ``setup_requires`` parameter to the Distribution.
 A list of dependency URLs, one per line, as specified using the
 ``dependency_links`` keyword to ``setup()``.  These may be direct
 download URLs, or the URLs of web pages containing direct download
-links, and will be used by EasyInstall to find dependencies, as though
-the user had manually provided them via the ``--find-links`` command
-line option.  Please see the setuptools manual and EasyInstall manual
-for more information on specifying this option, and for information on
-how EasyInstall processes ``--find-links`` URLs.
+links. Please see the setuptools manual for more information on
+specifying this option.
 
 
 ``depends.txt`` -- Obsolete, do not create!
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 806f1b1468..b887a9239f 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -245,8 +245,8 @@ abbreviation for ``pkg_resources.working_set.require()``:
     interactive interpreter hacking than for production use. If you're creating
     an actual library or application, it's strongly recommended that you create
     a "setup.py" script using ``setuptools``, and declare all your requirements
-    there.  That way, tools like EasyInstall can automatically detect what
-    requirements your package has, and deal with them accordingly.
+    there.  That way, tools like pip can automatically detect what requirements
+    your package has, and deal with them accordingly.
 
     Note that calling ``require('SomePackage')`` will not install
     ``SomePackage`` if it isn't already present.  If you need to do this, you
@@ -611,9 +611,9 @@ Requirements Parsing
     or activation of both Report-O-Rama and any libraries it needs in order to
     provide PDF support.  For example, you could use::
 
-        easy_install.py Report-O-Rama[PDF]
+        pip install Report-O-Rama[PDF]
 
-    To install the necessary packages using the EasyInstall program, or call
+    To install the necessary packages using pip, or call
     ``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary
     distributions to sys.path at runtime.
 
@@ -1843,9 +1843,9 @@ History
      because it isn't necessarily a filesystem path (and hasn't been for some
      time now).  The ``location`` of ``Distribution`` objects in the filesystem
      should always be normalized using ``pkg_resources.normalize_path()``; all
-     of the setuptools and EasyInstall code that generates distributions from
-     the filesystem (including ``Distribution.from_filename()``) ensure this
-     invariant, but if you use a more generic API like ``Distribution()`` or
+     of the setuptools' code that generates distributions from the filesystem
+     (including ``Distribution.from_filename()``) ensure this invariant, but if
+     you use a more generic API like ``Distribution()`` or
      ``Distribution.from_location()`` you should take care that you don't
      create a distribution with an un-normalized filesystem path.
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 26a3044e82..8468c3ad03 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -19,12 +19,6 @@ package from source and doesn't have a suitable version already installed.
 
 Feature Highlights:
 
-* Automatically find/download/install/upgrade dependencies at build time using
-  the `EasyInstall tool <easy_install.html>`_,
-  which supports downloading via HTTP, FTP, Subversion, and SourceForge, and
-  automatically scans web pages linked from PyPI to find download links.  (It's
-  the closest thing to CPAN currently available for Python.)
-
 * Create `Python Eggs <http://peak.telecommunity.com/DevCenter/PythonEggs>`_ -
   a single-file importable distribution format
 
@@ -73,10 +67,6 @@ Developer's Guide
 Installing ``setuptools``
 =========================
 
-.. _EasyInstall Installation Instructions: easy_install.html
-
-.. _Custom Installation Locations: easy_install.html
-
 .. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
 
 To install the latest version of setuptools, use::
@@ -160,7 +150,7 @@ Specifying Your Project's Version
 
 Setuptools can work well with most versioning schemes; there are, however, a
 few special things to watch out for, in order to ensure that setuptools and
-EasyInstall can always tell what version of your package is newer than another
+other tools can always tell what version of your package is newer than another
 version.  Knowing these things will also help you correctly specify what
 versions of other projects your project depends on.
 
@@ -301,11 +291,10 @@ unless you need the associated ``setuptools`` feature.
 ``setup_requires``
     A string or list of strings specifying what other distributions need to
     be present in order for the *setup script* to run.  ``setuptools`` will
-    attempt to obtain these (even going so far as to download them using
-    ``EasyInstall``) before processing the rest of the setup script or commands.
-    This argument is needed if you are using distutils extensions as part of
-    your build process; for example, extensions that process setup() arguments
-    and turn them into EGG-INFO metadata files.
+    attempt to obtain these before processing the rest of the setup script or
+    commands.  This argument is needed if you are using distutils extensions as
+    part of your build process; for example, extensions that process setup()
+    arguments and turn them into EGG-INFO metadata files.
 
     (Note: projects listed in ``setup_requires`` will NOT be automatically
     installed on the system where the setup script is being run.  They are
@@ -318,8 +307,7 @@ unless you need the associated ``setuptools`` feature.
     A list of strings naming URLs to be searched when satisfying dependencies.
     These links will be used if needed to install packages specified by
     ``setup_requires`` or ``tests_require``.  They will also be written into
-    the egg's metadata for use by tools like EasyInstall to use when installing
-    an ``.egg`` file.
+    the egg's metadata for use during install by tools that support them.
 
 ``namespace_packages``
     A list of strings naming the project's "namespace packages".  A namespace
@@ -351,8 +339,7 @@ unless you need the associated ``setuptools`` feature.
     needed to install it, you can use this option to specify them.  It should
     be a string or list of strings specifying what other distributions need to
     be present for the package's tests to run.  When you run the ``test``
-    command, ``setuptools`` will  attempt to obtain these (even going
-    so far as to download them using ``EasyInstall``).  Note that these
+    command, ``setuptools`` will  attempt to obtain these.  Note that these
     required projects will *not* be installed on the system where the tests
     are run, but only downloaded to the project's setup directory if they're
     not already installed locally.
@@ -552,11 +539,12 @@ script called ``baz``, you might do something like this::
     )
 
 When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or by using EasyInstall), a set of ``foo``,
-``bar``, and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules.  The functions you specify are called
-with no arguments, and their return value is passed to ``sys.exit()``, so you
-can return an errorlevel or message to print to stderr.
+install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
+and ``baz`` scripts will be installed that import ``main_func`` and
+``some_func`` from the specified modules.  The functions you specify are
+called with no arguments, and their return value is passed to
+``sys.exit()``, so you can return an errorlevel or message to print to
+stderr.
 
 On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
 created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
@@ -613,7 +601,7 @@ Declaring Dependencies
 
 ``setuptools`` supports automatically installing dependencies when a package is
 installed, and including information about dependencies in Python Eggs (so that
-package management tools like EasyInstall can use the information).
+package management tools like pip can use the information).
 
 ``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
 project's required dependencies.  This syntax consists of a project's PyPI
@@ -652,10 +640,9 @@ requirement in a string, each requirement must begin on a new line.
 
 This has three effects:
 
-1. When your project is installed, either by using EasyInstall, ``setup.py
-   install``, or ``setup.py develop``, all of the dependencies not already
-   installed will be located (via PyPI), downloaded, built (if necessary),
-   and installed.
+1. When your project is installed, either by using pip, ``setup.py install``,
+   or ``setup.py develop``, all of the dependencies not already installed will
+   be located (via PyPI), downloaded, built (if necessary), and installed.
 
 2. Any scripts in your project will be installed with wrappers that verify
    the availability of the specified dependencies at runtime, and ensure that
@@ -729,9 +716,8 @@ This will do a checkout (or a clone, in Git and Mercurial parlance) to a
 temporary folder and run ``setup.py bdist_egg``.
 
 The ``dependency_links`` option takes the form of a list of URL strings.  For
-example, the below will cause EasyInstall to search the specified page for
-eggs or source distributions, if the package's dependencies aren't already
-installed::
+example, this will cause a search of the specified page for eggs or source
+distributions, if the package's dependencies aren't already installed::
 
     setup(
         ...
@@ -771,7 +757,7 @@ names of "extra" features, to strings or lists of strings describing those
 features' requirements.  These requirements will *not* be automatically
 installed unless another package depends on them (directly or indirectly) by
 including the desired "extras" in square brackets after the associated project
-name.  (Or if the extras were listed in a requirement spec on the EasyInstall
+name.  (Or if the extras were listed in a requirement spec on the "pip install"
 command line.)
 
 Extras can be used by a project's `entry points`_ to specify dynamic
@@ -1186,13 +1172,12 @@ preferred way of working (as opposed to using a common independent staging area
 or the site-packages directory).
 
 To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install`` or the EasyInstall tool, except that it doesn't actually
-install anything.  Instead, it creates a special ``.egg-link`` file in the
-deployment directory, that links to your project's source code.  And, if your
-deployment directory is Python's ``site-packages`` directory, it will also
-update the ``easy-install.pth`` file to include your project's source code,
-thereby making it available on ``sys.path`` for all programs using that Python
-installation.
+``setup.py install``, except that it doesn't actually install anything.
+Instead, it creates a special ``.egg-link`` file in the deployment directory,
+that links to your project's source code.  And, if your deployment directory is
+Python's ``site-packages`` directory, it will also update the
+``easy-install.pth`` file to include your project's source code, thereby making
+it available on ``sys.path`` for all programs using that Python installation.
 
 If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
 will not link directly to your source code when run under Python 3, since
@@ -1312,20 +1297,14 @@ you've checked over all the warnings it issued, and you are either satisfied it
 doesn't work, you can always change it to ``False``, which will force
 ``setuptools`` to install your project as a directory rather than as a zipfile.
 
-Of course, the end-user can still override either decision, if they are using
-EasyInstall to install your package.  And, if you want to override for testing
-purposes, you can just run ``setup.py easy_install --zip-ok .`` or ``setup.py
-easy_install --always-unzip .`` in your project directory. to install the
-package as a zipfile or directory, respectively.
-
 In the future, as we gain more experience with different packages and become
 more satisfied with the robustness of the ``pkg_resources`` runtime, the
 "zip safety" analysis may become less conservative.  However, we strongly
 recommend that you determine for yourself whether your project functions
 correctly when installed as a zipfile, correct any problems if you can, and
 then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
-flag, so that it will not be necessary for ``bdist_egg`` or ``EasyInstall`` to
-try to guess whether your project can work as a zipfile.
+flag, so that it will not be necessary for ``bdist_egg`` to try to guess
+whether your project can work as a zipfile.
 
 .. _Namespace Packages:
 
@@ -1439,9 +1418,9 @@ to generate a daily build or snapshot for.  See the section below on the
 
 (Also, before you release your project, be sure to see the section above on
 `Specifying Your Project's Version`_ for more information about how pre- and
-post-release tags affect how setuptools and EasyInstall interpret version
-numbers.  This is important in order to make sure that dependency processing
-tools will know which versions of your project are newer than others.)
+post-release tags affect how version numbers are interpreted.  This is
+important in order to make sure that dependency processing tools will know
+which versions of your project are newer than others.)
 
 Finally, if you are creating builds frequently, and either building them in a
 downloadable location or are copying them to a distribution server, you should
@@ -1497,58 +1476,6 @@ all practical purposes, you'll probably use only the ``--formats`` option, if
 you use any option at all.
 
 
-Making your package available for EasyInstall
----------------------------------------------
-
-There may be reasons why you don't want to upload distributions to
-PyPI, and just want your existing distributions (or perhaps a Subversion
-checkout) to be used instead.
-
-There are three ``setup()`` arguments that affect EasyInstall:
-
-``url`` and ``download_url``
-   These become links on your project's PyPI page.  EasyInstall will examine
-   them to see if they link to a package ("primary links"), or whether they are
-   HTML pages.  If they're HTML pages, EasyInstall scans all HREF's on the
-   page for primary links
-
-``long_description``
-   EasyInstall will check any URLs contained in this argument to see if they
-   are primary links.
-
-A URL is considered a "primary link" if it is a link to a .tar.gz, .tgz, .zip,
-.egg, .egg.zip, .tar.bz2, or .exe file, or if it has an ``#egg=project`` or
-``#egg=project-version`` fragment identifier attached to it.  EasyInstall
-attempts to determine a project name and optional version number from the text
-of a primary link *without* downloading it.  When it has found all the primary
-links, EasyInstall will select the best match based on requested version,
-platform compatibility, and other criteria.
-
-So, if your ``url`` or ``download_url`` point either directly to a downloadable
-source distribution, or to HTML page(s) that have direct links to such, then
-EasyInstall will be able to locate downloads automatically.  If you want to
-make Subversion checkouts available, then you should create links with either
-``#egg=project`` or ``#egg=project-version`` added to the URL.  You should
-replace ``project`` and ``version`` with the values they would have in an egg
-filename.  (Be sure to actually generate an egg and then use the initial part
-of the filename, rather than trying to guess what the escaped form of the
-project name and version number will be.)
-
-Note that Subversion checkout links are of lower precedence than other kinds
-of distributions, so EasyInstall will not select a Subversion checkout for
-downloading unless it has a version included in the ``#egg=`` suffix, and
-it's a higher version than EasyInstall has seen in any other links for your
-project.
-
-As a result, it's a common practice to use mark checkout URLs with a version of
-"dev" (i.e., ``#egg=projectname-dev``), so that users can do something like
-this::
-
-    easy_install --editable projectname==dev
-
-in order to check out the in-development version of ``projectname``.
-
-
 Making "Official" (Non-Snapshot) Releases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1803,9 +1730,9 @@ Here are some of the options that the ``develop`` command accepts.  Note that
 they affect the project's dependencies as well as the project itself, so if you
 have dependencies that need to be installed and you use ``--exclude-scripts``
 (for example), the dependencies' scripts will not be installed either!  For
-this reason, you may want to use EasyInstall to install the project's
-dependencies before using the ``develop`` command, if you need finer control
-over the installation options for dependencies.
+this reason, you may want to use pip to install the project's dependencies
+before using the ``develop`` command, if you need finer control over the
+installation options for dependencies.
 
 ``--uninstall, -u``
     Un-deploy the current project.  You may use the ``--install-dir`` or ``-d``
@@ -1815,10 +1742,10 @@ over the installation options for dependencies.
     staging area is Python's ``site-packages`` directory.
 
     Note that this option currently does *not* uninstall script wrappers!  You
-    must uninstall them yourself, or overwrite them by using EasyInstall to
-    activate a different version of the package.  You can also avoid installing
-    script wrappers in the first place, if you use the ``--exclude-scripts``
-    (aka ``-x``) option when you run ``develop`` to deploy the project.
+    must uninstall them yourself, or overwrite them by using pip to install a
+    different version of the package.  You can also avoid installing script
+    wrappers in the first place, if you use the ``--exclude-scripts`` (aka
+    ``-x``) option when you run ``develop`` to deploy the project.
 
 ``--multi-version, -m``
     "Multi-version" mode. Specifying this option prevents ``develop`` from
@@ -1827,8 +1754,8 @@ over the installation options for dependencies.
     removed upon successful deployment.  In multi-version mode, no specific
     version of the package is available for importing, unless you use
     ``pkg_resources.require()`` to put it on ``sys.path``, or you are running
-    a wrapper script generated by ``setuptools`` or EasyInstall.  (In which
-    case the wrapper script calls ``require()`` for you.)
+    a wrapper script generated by ``setuptools``.  (In which case the wrapper
+    script calls ``require()`` for you.)
 
     Note that if you install to a directory other than ``site-packages``,
     this option is automatically in effect, because ``.pth`` files can only be
@@ -1881,25 +1808,6 @@ files), the ``develop`` command will use them as defaults, unless you override
 them in a ``[develop]`` section or on the command line.
 
 
-``easy_install`` - Find and install packages
-============================================
-
-This command runs the `EasyInstall tool
-<easy_install.html>`_ for you.  It is exactly
-equivalent to running the ``easy_install`` command.  All command line arguments
-following this command are consumed and not processed further by the distutils,
-so this must be the last command listed on the command line.  Please see
-the EasyInstall documentation for the options reference and usage examples.
-Normally, there is no reason to use this command via the command line, as you
-can just use ``easy_install`` directly.  It's only listed here so that you know
-it's a distutils command, which means that you can:
-
-* create command aliases that use it,
-* create distutils extensions that invoke it as a subcommand, and
-* configure options for it in your ``setup.cfg`` or other distutils config
-  files.
-
-
 .. _egg_info:
 
 ``egg_info`` - Create egg metadata and set build tags
@@ -1958,9 +1866,9 @@ added in the following order:
 (Note: Because these options modify the version number used for source and
 binary distributions of your project, you should first make sure that you know
 how the resulting version numbers will be interpreted by automated tools
-like EasyInstall.  See the section above on `Specifying Your Project's
-Version`_ for an explanation of pre- and post-release tags, as well as tips on
-how to choose and verify a versioning scheme for your your project.)
+like pip.  See the section above on `Specifying Your Project's Version`_ for an
+explanation of pre- and post-release tags, as well as tips on how to choose and
+verify a versioning scheme for your your project.)
 
 For advanced uses, there is one other option that can be set, to change the
 location of the project's ``.egg-info`` directory.  Commands that need to find

From 1410d87f8abb5bb28bf97f53219ee0db7b6340a3 Mon Sep 17 00:00:00 2001
From: isidentical <batuhanosmantaskaya@gmail.com>
Date: Fri, 4 Oct 2019 19:18:54 +0300
Subject: [PATCH 7551/8469] Upgrade setuptools.depends to importlib from
 depracated imp

---
 setuptools/depends.py                | 89 +++++++++++++++++++++++-----
 setuptools/tests/test_integration.py |  1 +
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index 45e7052d8d..97f0ed9dae 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,11 +1,23 @@
 import sys
-import imp
 import marshal
 from distutils.version import StrictVersion
-from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
+from setuptools.extern import six
 
 from .py33compat import Bytecode
 
+if six.PY2:
+    import imp
+    from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
+else:
+    import os.path
+    from importlib.util import find_spec, spec_from_loader
+    from importlib.machinery import SOURCE_SUFFIXES, BYTECODE_SUFFIXES, EXTENSION_SUFFIXES, BuiltinImporter, FrozenImporter
+    PY_SOURCE = 1
+    PY_COMPILED = 2
+    C_EXTENSION = 3
+    C_BUILTIN = 6
+    PY_FROZEN = 7
+
 
 __all__ = [
     'Require', 'find_module', 'get_module_constant', 'extract_constant'
@@ -81,21 +93,59 @@ def is_current(self, paths=None):
 
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
+    if six.PY3:
+        spec = find_spec(module, paths)
+        if spec is None:
+            raise ImportError("Can't find %s" % module)
+        if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
+            spec = spec_from_loader('__init__.py', spec.loader)
+
+        kind = -1
+        file = None
+        static = isinstance(spec.loader, type)
+        if spec.origin == 'frozen' or static and issubclass(spec.loader, FrozenImporter):
+            kind = PY_FROZEN
+            path = None # imp compabilty
+            suffix = mode = '' # imp compability
+        elif spec.origin == 'built-in' or static and issubclass(spec.loader, BuiltinImporter):
+            kind = C_BUILTIN
+            path = None # imp compabilty
+            suffix = mode = '' # imp compability
+        elif spec.has_location:
+            frozen = False
+            path = spec.origin
+            suffix = os.path.splitext(path)[1]
+            mode = 'r' if suffix in SOURCE_SUFFIXES else 'rb'
+
+            if suffix in SOURCE_SUFFIXES:
+                kind = PY_SOURCE
+            elif suffix in BYTECODE_SUFFIXES:
+                kind = PY_COMPILED
+            elif suffix in EXTENSION_SUFFIXES:
+                kind = C_EXTENSION
+
+            if kind in {PY_SOURCE, PY_COMPILED}:
+                file = open(path, mode)
+        else:
+            path = None
+            suffix = mode= ''
 
-    parts = module.split('.')
+        return file, path, (suffix, mode, kind)
 
-    while parts:
-        part = parts.pop(0)
-        f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
+    else:
+        parts = module.split('.')
+        while parts:
+            part = parts.pop(0)
+            f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
 
-        if kind == PKG_DIRECTORY:
-            parts = parts or ['__init__']
-            paths = [path]
+            if kind == PKG_DIRECTORY:
+                parts = parts or ['__init__']
+                paths = [path]
 
-        elif parts:
-            raise ImportError("Can't find %r in %s" % (parts, module))
+            elif parts:
+                raise ImportError("Can't find %r in %s" % (parts, module))
 
-    return info
+        return info
 
 
 def get_module_constant(module, symbol, default=-1, paths=None):
@@ -111,18 +161,29 @@ def get_module_constant(module, symbol, default=-1, paths=None):
         # Module doesn't exist
         return None
 
+    if six.PY3:
+        spec = find_spec(module, paths)
+        if hasattr(spec, 'submodule_search_locations'):
+            spec = spec_from_loader('__init__.py', spec.loader)
+
     try:
         if kind == PY_COMPILED:
             f.read(8)  # skip magic & date
             code = marshal.load(f)
         elif kind == PY_FROZEN:
-            code = imp.get_frozen_object(module)
+            if six.PY2:
+                code = imp.get_frozen_object(module)
+            else:
+                code = spec.loader.get_code(module)
         elif kind == PY_SOURCE:
             code = compile(f.read(), path, 'exec')
         else:
             # Not something we can parse; we'll have to import it.  :(
             if module not in sys.modules:
-                imp.load_module(module, f, path, (suffix, mode, kind))
+                if six.PY2:
+                    imp.load_module(module, f, path, (suffix, mode, kind))
+                else:
+                    sys.modules[module] = module_from_spec(spec)
             return getattr(sys.modules[module], symbol, None)
 
     finally:
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1e13218899..1c0b2b18bb 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -143,6 +143,7 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
             'tests_require',
             'python_requires',
             'install_requires',
+            'long_description_content_type',
         ]
         assert not match or match.group(1).strip('"\'') in allowed_unknowns
 

From 4c22a6ca57753d3b5604a90b61a0c6c5efe53a1d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 18 Oct 2019 20:37:42 -0400
Subject: [PATCH 7552/8469] Add new hook
 'setuptools.finalize_distribution_options' for plugins like 'setuptools_scm'
 to alter distribution options.

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

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2e5ad4bd68..987d684e09 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -728,6 +728,10 @@ def finalize_options(self):
         if self.features:
             self._set_global_opts_from_features()
 
+        hook_key = 'setuptools.finalize_distribution_options'
+        for ep in pkg_resources.iter_entry_points(hook_key):
+            ep.load()(self)
+
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             value = getattr(self, ep.name, None)
             if value is not None:

From d89682fcba90595d5d6aaf071d6efcc815bceba8 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 21 Oct 2019 16:49:13 -0700
Subject: [PATCH 7553/8469] Change coding cookie to use utf-8 (lowercase)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While perfectly valid, the encoding 'UTF-8' (uppercase) is not
recognized by the Emacs MULE system. As such, it displays the following
warning when opening a file with it used as an encoding cookie:

    Warning (mule): Invalid coding system ‘UTF-8’ is specified
    for the current buffer/file by the :coding tag.
    It is highly recommended to fix it before writing to a file.

Some discussion of this can be found at:

https://stackoverflow.com/questions/14031724/how-to-make-emacs-accept-utf-8-uppercase-encoding

While the post does offer a workaround for Emacs users, rather than ask
all to implement it, use the more typical utf-8 (lowercase).
---
 setuptools/tests/test_config.py | 2 +-
 setuptools/tests/test_test.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 1b94a58689..69d8d00db3 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import contextlib
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index faaa6ba90a..3415913b42 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 
 from __future__ import unicode_literals
 

From cd84510713ada48bf33d4efa749c2952e3fc1a49 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 19 Oct 2019 08:39:30 -0700
Subject: [PATCH 7554/8469] Deprecate the test command

Provide a warning to users. Suggest using tox as an alternative generic
entry point.

Refs #1684
---
 changelog.d/1878.change.rst   |  1 +
 docs/setuptools.txt           | 13 +++++++++
 setuptools/command/test.py    | 10 ++++++-
 setuptools/tests/test_test.py | 50 +++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1878.change.rst

diff --git a/changelog.d/1878.change.rst b/changelog.d/1878.change.rst
new file mode 100644
index 0000000000..0774b5d3e5
--- /dev/null
+++ b/changelog.d/1878.change.rst
@@ -0,0 +1 @@
+Formally deprecated the ``test`` command, with the recommendation that users migrate to ``tox``.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 26a3044e82..f69b75c249 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -346,6 +346,8 @@ unless you need the associated ``setuptools`` feature.
     specified test suite, e.g. via ``setup.py test``.  See the section on the
     `test`_ command below for more details.
 
+    New in 41.5.0: Deprecated the test command.
+
 ``tests_require``
     If your project's tests need one or more additional packages besides those
     needed to install it, you can use this option to specify them.  It should
@@ -357,6 +359,8 @@ unless you need the associated ``setuptools`` feature.
     are run, but only downloaded to the project's setup directory if they're
     not already installed locally.
 
+    New in 41.5.0: Deprecated the test command.
+
 .. _test_loader:
 
 ``test_loader``
@@ -380,6 +384,8 @@ unless you need the associated ``setuptools`` feature.
     as long as you use the ``tests_require`` option to ensure that the package
     containing the loader class is available when the ``test`` command is run.
 
+    New in 41.5.0: Deprecated the test command.
+
 ``eager_resources``
     A list of strings naming resources that should be extracted together, if
     any of them is needed, or if any C extensions included in the project are
@@ -2142,6 +2148,11 @@ distutils configuration file the option will be added to (or removed from).
 ``test`` - Build package and run a unittest suite
 =================================================
 
+.. warning::
+    ``test`` is deprecated and will be removed in a future version. Users
+    looking for a generic test entry point independent of test runner are
+    encouraged to use `tox <https://tox.readthedocs.io>`_.
+
 When doing test-driven development, or running automated builds that need
 testing before they are deployed for downloading or use, it's often useful
 to be able to run a project's unit tests without actually deploying the project
@@ -2187,6 +2198,8 @@ available:
     If you did not set a ``test_suite`` in your ``setup()`` call, and do not
     provide a ``--test-suite`` option, an error will occur.
 
+New in 41.5.0: Deprecated the test command.
+
 
 .. _upload:
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 973e4eb214..c148b38d10 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -74,7 +74,7 @@ def __get__(self, obj, objtype=None):
 class test(Command):
     """Command to run unit tests after in-place build"""
 
-    description = "run unit tests after in-place build"
+    description = "run unit tests after in-place build (deprecated)"
 
     user_options = [
         ('test-module=', 'm', "Run 'test_suite' in specified module"),
@@ -214,6 +214,14 @@ def install_dists(dist):
         return itertools.chain(ir_d, tr_d, er_d)
 
     def run(self):
+        self.announce(
+            "WARNING: Testing via this command is deprecated and will be "
+            "removed in a future version. Users looking for a generic test "
+            "entry point independent of test runner are encouraged to use "
+            "tox.",
+            log.WARN,
+        )
+
         installed_dists = self.install_dists(self.distribution)
 
         cmd = ' '.join(self._argv)
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index faaa6ba90a..382bd640e7 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -2,6 +2,7 @@
 
 from __future__ import unicode_literals
 
+import mock
 from distutils import log
 import os
 
@@ -124,3 +125,52 @@ def test_test(self):
         cmd.run()
     out, err = capfd.readouterr()
     assert out == 'Foo\n'
+
+
+@pytest.mark.usefixtures('sample_test')
+def test_warns_deprecation(capfd):
+    params = dict(
+        name='foo',
+        packages=['name', 'name.space', 'name.space.tests'],
+        namespace_packages=['name'],
+        test_suite='name.space.tests.test_suite',
+        use_2to3=True
+    )
+    dist = Distribution(params)
+    dist.script_name = 'setup.py'
+    cmd = test(dist)
+    cmd.ensure_finalized()
+    cmd.announce = mock.Mock()
+    cmd.run()
+    capfd.readouterr()
+    msg = (
+        "WARNING: Testing via this command is deprecated and will be "
+        "removed in a future version. Users looking for a generic test "
+        "entry point independent of test runner are encouraged to use "
+        "tox."
+    )
+    cmd.announce.assert_any_call(msg, log.WARN)
+
+
+@pytest.mark.usefixtures('sample_test')
+def test_deprecation_stderr(capfd):
+    params = dict(
+        name='foo',
+        packages=['name', 'name.space', 'name.space.tests'],
+        namespace_packages=['name'],
+        test_suite='name.space.tests.test_suite',
+        use_2to3=True
+    )
+    dist = Distribution(params)
+    dist.script_name = 'setup.py'
+    cmd = test(dist)
+    cmd.ensure_finalized()
+    cmd.run()
+    out, err = capfd.readouterr()
+    msg = (
+        "WARNING: Testing via this command is deprecated and will be "
+        "removed in a future version. Users looking for a generic test "
+        "entry point independent of test runner are encouraged to use "
+        "tox.\n"
+    )
+    assert msg in err

From 4069e0b536802a47c8c15ce839fd98a5f4c84620 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 21 Oct 2019 17:01:18 -0700
Subject: [PATCH 7555/8469] Remove outdated comment and suppressed exception
 from test_test.py

The test command has not called sys.exit since commit
2c4fd43277fc477d85b50e15c37b176136676270.
---
 setuptools/tests/test_test.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 280c837bf8..6242a018c4 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -86,9 +86,7 @@ def test_test(capfd):
     dist.script_name = 'setup.py'
     cmd = test(dist)
     cmd.ensure_finalized()
-    # The test runner calls sys.exit
-    with contexts.suppress_exceptions(SystemExit):
-        cmd.run()
+    cmd.run()
     out, err = capfd.readouterr()
     assert out == 'Foo\n'
 
@@ -120,9 +118,7 @@ def test_test(self):
     dist.script_name = 'setup.py'
     cmd = test(dist)
     cmd.ensure_finalized()
-    # The test runner calls sys.exit
-    with contexts.suppress_exceptions(SystemExit):
-        cmd.run()
+    cmd.run()
     out, err = capfd.readouterr()
     assert out == 'Foo\n'
 

From e4ef537525c2b1d120497379da9484c33ea3d773 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 21 Oct 2019 17:51:26 -0700
Subject: [PATCH 7556/8469] Add a trove classifier to document support for
 Python 3.8

---
 changelog.d/1884.doc.rst | 1 +
 setup.cfg                | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/1884.doc.rst

diff --git a/changelog.d/1884.doc.rst b/changelog.d/1884.doc.rst
new file mode 100644
index 0000000000..45615d5d88
--- /dev/null
+++ b/changelog.d/1884.doc.rst
@@ -0,0 +1 @@
+Added a trove classifier to document support for Python 3.8.
diff --git a/setup.cfg b/setup.cfg
index a55106a5a4..373ae8b535 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,6 +42,7 @@ classifiers =
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: System :: Archiving :: Packaging
     Topic :: System :: Systems Administration

From 89f15f448679e2ebedb40ed348423596dc658d31 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 21 Oct 2019 17:51:26 -0700
Subject: [PATCH 7557/8469] Add Python 3.8 final to Travis test matrix

---
 .travis.yml               | 3 ++-
 changelog.d/1886.misc.rst | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1886.misc.rst

diff --git a/.travis.yml b/.travis.yml
index 8b7cece8b4..7088d16621 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,9 @@ jobs:
   - python: 3.5
   - &default_py
     python: 3.6
+  - python: 3.7
   - &latest_py3
-    python: 3.7
+    python: 3.8
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
diff --git a/changelog.d/1886.misc.rst b/changelog.d/1886.misc.rst
new file mode 100644
index 0000000000..5e3f2873a8
--- /dev/null
+++ b/changelog.d/1886.misc.rst
@@ -0,0 +1 @@
+Added Python 3.8 release to the Travis test matrix.

From 2d25ca89318922e63b74c37e36d099173cf0da5a Mon Sep 17 00:00:00 2001
From: Dan Rose <dan@digilabs.io>
Date: Sun, 27 Oct 2019 02:31:59 -0500
Subject: [PATCH 7558/8469] Remove sys.modules hack

Fix #1888 (metadata accidentally not picklable), and removes a case where reimporting a vendored module results in a second copy of the same module.
---
 changelog.d/1890.change.rst     |  1 +
 setuptools/extern/__init__.py   |  7 -------
 setuptools/tests/test_extern.py | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/1890.change.rst
 create mode 100644 setuptools/tests/test_extern.py

diff --git a/changelog.d/1890.change.rst b/changelog.d/1890.change.rst
new file mode 100644
index 0000000000..458d8117ec
--- /dev/null
+++ b/changelog.d/1890.change.rst
@@ -0,0 +1 @@
+Fix vendored dependencies so importing ``setuptools.extern.some_module`` gives the same object as ``setuptools._vendor.some_module``. This makes Metadata picklable again.
\ No newline at end of file
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index e8c616f910..4e79aa17ec 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -43,13 +43,6 @@ def load_module(self, fullname):
                 __import__(extant)
                 mod = sys.modules[extant]
                 sys.modules[fullname] = mod
-                # mysterious hack:
-                # Remove the reference to the extant package/module
-                # on later Python versions to cause relative imports
-                # in the vendor package to resolve the same modules
-                # as those going through this importer.
-                if sys.version_info >= (3, ):
-                    del sys.modules[extant]
                 return mod
             except ImportError:
                 pass
diff --git a/setuptools/tests/test_extern.py b/setuptools/tests/test_extern.py
new file mode 100644
index 0000000000..3519a68073
--- /dev/null
+++ b/setuptools/tests/test_extern.py
@@ -0,0 +1,22 @@
+import importlib
+import pickle
+
+from setuptools import Distribution
+from setuptools.extern import ordered_set
+from setuptools.tests import py3_only
+
+
+def test_reimport_extern():
+    ordered_set2 = importlib.import_module(ordered_set.__name__)
+    assert ordered_set is ordered_set2
+
+
+def test_orderedset_pickle_roundtrip():
+    o1 = ordered_set.OrderedSet([1, 2, 5])
+    o2 = pickle.loads(pickle.dumps(o1))
+    assert o1 == o2
+
+
+@py3_only
+def test_distribution_picklable():
+    pickle.loads(pickle.dumps(Distribution()))

From 19eb6bf8bd28f1b9b66288c797d67eb8da71508d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 18:26:59 -0400
Subject: [PATCH 7559/8469] Fix typo

---
 docs/easy_install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index e247d8fd76..544b9efd59 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -317,7 +317,7 @@ Note that instead of changing your ``PATH`` to include the Python scripts
 directory, you can also retarget the installation location for scripts so they
 go on a directory that's already on the ``PATH``.  For more information see
 `Command-Line Options`_ and `Configuration Files`_.  During installation,
-pass command line options (such as ``--script-dir``) to to control where
+pass command line options (such as ``--script-dir``) to control where
 scripts will be installed.
 
 

From 6e8b1da1fb146186c52d8bdec5af969f26532ece Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 18:42:56 -0400
Subject: [PATCH 7560/8469] =?UTF-8?q?Bump=20version:=2041.4.0=20=E2=86=92?=
 =?UTF-8?q?=2041.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 14 ++++++++++++++
 changelog.d/1811.change.rst |  1 -
 changelog.d/1814.change.rst |  1 -
 changelog.d/1824.change.rst |  1 -
 changelog.d/1860.doc.rst    |  1 -
 changelog.d/1862.doc.rst    |  1 -
 changelog.d/1868.doc.rst    |  1 -
 changelog.d/1878.change.rst |  1 -
 changelog.d/1884.doc.rst    |  1 -
 changelog.d/1886.misc.rst   |  1 -
 setup.cfg                   |  2 +-
 12 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 changelog.d/1811.change.rst
 delete mode 100644 changelog.d/1814.change.rst
 delete mode 100644 changelog.d/1824.change.rst
 delete mode 100644 changelog.d/1860.doc.rst
 delete mode 100644 changelog.d/1862.doc.rst
 delete mode 100644 changelog.d/1868.doc.rst
 delete mode 100644 changelog.d/1878.change.rst
 delete mode 100644 changelog.d/1884.doc.rst
 delete mode 100644 changelog.d/1886.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d6768cb8a8..aeefc8f2c6 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.4.0
+current_version = 41.5.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ecde25a571..7e9fc0f6e8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,17 @@
+v41.5.0
+-------
+
+* #1811: Improve Visual C++ 14.X support, mainly for Visual Studio 2017 and 2019.
+* #1814: Fix ``pkg_resources.Requirement`` hash/equality implementation: take PEP 508 direct URL into account.
+* #1824: Fix tests when running under ``python3.10``.
+* #1878: Formally deprecated the ``test`` command, with the recommendation that users migrate to ``tox``.
+* #1860: Update documentation to mention the egg format is not supported by pip and dependency links support was dropped starting with pip 19.0.
+* #1862: Drop ez_setup documentation: deprecated for some time (last updated in 2016), and still relying on easy_install (deprecated too).
+* #1868: Drop most documentation references to (deprecated) EasyInstall.
+* #1884: Added a trove classifier to document support for Python 3.8.
+* #1886: Added Python 3.8 release to the Travis test matrix.
+
+
 v41.4.0
 -------
 
diff --git a/changelog.d/1811.change.rst b/changelog.d/1811.change.rst
deleted file mode 100644
index dc52c6dbbe..0000000000
--- a/changelog.d/1811.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve Visual C++ 14.X support, mainly for Visual Studio 2017 and 2019.
\ No newline at end of file
diff --git a/changelog.d/1814.change.rst b/changelog.d/1814.change.rst
deleted file mode 100644
index c936699dd8..0000000000
--- a/changelog.d/1814.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``pkg_resources.Requirement`` hash/equality implementation: take PEP 508 direct URL into account.
diff --git a/changelog.d/1824.change.rst b/changelog.d/1824.change.rst
deleted file mode 100644
index 5f60903687..0000000000
--- a/changelog.d/1824.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix tests when running under ``python3.10``.
diff --git a/changelog.d/1860.doc.rst b/changelog.d/1860.doc.rst
deleted file mode 100644
index f3554643fa..0000000000
--- a/changelog.d/1860.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update documentation to mention the egg format is not supported by pip and dependency links support was dropped starting with pip 19.0.
diff --git a/changelog.d/1862.doc.rst b/changelog.d/1862.doc.rst
deleted file mode 100644
index b71583ba37..0000000000
--- a/changelog.d/1862.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop ez_setup documentation: deprecated for some time (last updated in 2016), and still relying on easy_install (deprecated too).
diff --git a/changelog.d/1868.doc.rst b/changelog.d/1868.doc.rst
deleted file mode 100644
index 82283d7aea..0000000000
--- a/changelog.d/1868.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop most documentation references to (deprecated) EasyInstall.
diff --git a/changelog.d/1878.change.rst b/changelog.d/1878.change.rst
deleted file mode 100644
index 0774b5d3e5..0000000000
--- a/changelog.d/1878.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Formally deprecated the ``test`` command, with the recommendation that users migrate to ``tox``.
diff --git a/changelog.d/1884.doc.rst b/changelog.d/1884.doc.rst
deleted file mode 100644
index 45615d5d88..0000000000
--- a/changelog.d/1884.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added a trove classifier to document support for Python 3.8.
diff --git a/changelog.d/1886.misc.rst b/changelog.d/1886.misc.rst
deleted file mode 100644
index 5e3f2873a8..0000000000
--- a/changelog.d/1886.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added Python 3.8 release to the Travis test matrix.
diff --git a/setup.cfg b/setup.cfg
index 373ae8b535..0e030cde82 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.4.0
+version = 41.5.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From f430e585d84a5c63bb3b52e17af2f1b40fec8b71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 19:16:36 -0400
Subject: [PATCH 7561/8469] Remove apparently unrelated change to test

---
 setuptools/tests/test_integration.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1c0b2b18bb..1e13218899 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -143,7 +143,6 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
             'tests_require',
             'python_requires',
             'install_requires',
-            'long_description_content_type',
         ]
         assert not match or match.group(1).strip('"\'') in allowed_unknowns
 

From 85a9ca5e75abf00e0dde55dde4e2b0a11f93c04a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 19:50:53 -0400
Subject: [PATCH 7562/8469] Extract 'imp' re-implementation to setuptools._imp
 and wrap it in py27compat for compatibility.

---
 conftest.py              |  1 +
 setuptools/_imp.py       | 72 ++++++++++++++++++++++++++++++
 setuptools/depends.py    | 95 ++++------------------------------------
 setuptools/py27compat.py | 32 ++++++++++++++
 4 files changed, 113 insertions(+), 87 deletions(-)
 create mode 100644 setuptools/_imp.py

diff --git a/conftest.py b/conftest.py
index 0d7b274c07..1746bfb588 100644
--- a/conftest.py
+++ b/conftest.py
@@ -19,6 +19,7 @@ def pytest_addoption(parser):
 
 if sys.version_info < (3,):
     collect_ignore.append('setuptools/lib2to3_ex.py')
+    collect_ignore.append('setuptools/_imp.py')
 
 
 if sys.version_info < (3, 6):
diff --git a/setuptools/_imp.py b/setuptools/_imp.py
new file mode 100644
index 0000000000..6bc9024368
--- /dev/null
+++ b/setuptools/_imp.py
@@ -0,0 +1,72 @@
+"""
+Re-implementation of find_module and get_frozen_object
+from the deprecated imp module.
+"""
+
+import os
+import importlib.util
+import importlib.machinery
+
+
+PY_SOURCE = 1
+PY_COMPILED = 2
+C_EXTENSION = 3
+C_BUILTIN = 6
+PY_FROZEN = 7
+
+
+def find_module(module, paths=None):
+    """
+    """
+    spec = importlib.util.find_spec(module, paths)
+    if spec is None:
+        raise ImportError("Can't find %s" % module)
+    if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
+        spec = importlib.util.spec_from_loader('__init__.py', spec.loader)
+
+    kind = -1
+    file = None
+    static = isinstance(spec.loader, type)
+    if spec.origin == 'frozen' or static and issubclass(
+            spec.loader, importlib.machinery.FrozenImporter):
+        kind = PY_FROZEN
+        path = None  # imp compabilty
+        suffix = mode = ''  # imp compability
+    elif spec.origin == 'built-in' or static and issubclass(
+            spec.loader, importlib.machinery.BuiltinImporter):
+        kind = C_BUILTIN
+        path = None  # imp compabilty
+        suffix = mode = ''  # imp compability
+    elif spec.has_location:
+        path = spec.origin
+        suffix = os.path.splitext(path)[1]
+        mode = 'r' if suffix in importlib.machinery.SOURCE_SUFFIXES else 'rb'
+
+        if suffix in importlib.machinery.SOURCE_SUFFIXES:
+            kind = PY_SOURCE
+        elif suffix in importlib.machinery.BYTECODE_SUFFIXES:
+            kind = PY_COMPILED
+        elif suffix in importlib.machinery.EXTENSION_SUFFIXES:
+            kind = C_EXTENSION
+
+        if kind in {PY_SOURCE, PY_COMPILED}:
+            file = open(path, mode)
+    else:
+        path = None
+        suffix = mode = ''
+
+    return file, path, (suffix, mode, kind)
+
+
+def get_frozen_object(module, paths):
+    spec = importlib.util.find_spec(module, paths)
+    if hasattr(spec, 'submodule_search_locations'):
+        spec = importlib.util.spec_from_loader('__init__.py', spec.loader)
+    return spec.loader.get_code(module)
+
+
+def get_module(module, paths, info):
+    spec = importlib.util.find_spec(module, paths)
+    if hasattr(spec, 'submodule_search_locations'):
+        spec = importlib.util.spec_from_loader('__init__.py', spec.loader)
+    return importlib.util.module_from_spec(spec)
diff --git a/setuptools/depends.py b/setuptools/depends.py
index 97f0ed9dae..eed4913a6b 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,22 +1,11 @@
 import sys
 import marshal
 from distutils.version import StrictVersion
-from setuptools.extern import six
 
 from .py33compat import Bytecode
 
-if six.PY2:
-    import imp
-    from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN
-else:
-    import os.path
-    from importlib.util import find_spec, spec_from_loader
-    from importlib.machinery import SOURCE_SUFFIXES, BYTECODE_SUFFIXES, EXTENSION_SUFFIXES, BuiltinImporter, FrozenImporter
-    PY_SOURCE = 1
-    PY_COMPILED = 2
-    C_EXTENSION = 3
-    C_BUILTIN = 6
-    PY_FROZEN = 7
+from .py27compat import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
+from . import py27compat
 
 
 __all__ = [
@@ -27,7 +16,8 @@
 class Require:
     """A prerequisite to building or installing a distribution"""
 
-    def __init__(self, name, requested_version, module, homepage='',
+    def __init__(
+            self, name, requested_version, module, homepage='',
             attribute=None, format=None):
 
         if format is None and requested_version is not None:
@@ -91,63 +81,6 @@ def is_current(self, paths=None):
         return self.version_ok(version)
 
 
-def find_module(module, paths=None):
-    """Just like 'imp.find_module()', but with package support"""
-    if six.PY3:
-        spec = find_spec(module, paths)
-        if spec is None:
-            raise ImportError("Can't find %s" % module)
-        if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
-            spec = spec_from_loader('__init__.py', spec.loader)
-
-        kind = -1
-        file = None
-        static = isinstance(spec.loader, type)
-        if spec.origin == 'frozen' or static and issubclass(spec.loader, FrozenImporter):
-            kind = PY_FROZEN
-            path = None # imp compabilty
-            suffix = mode = '' # imp compability
-        elif spec.origin == 'built-in' or static and issubclass(spec.loader, BuiltinImporter):
-            kind = C_BUILTIN
-            path = None # imp compabilty
-            suffix = mode = '' # imp compability
-        elif spec.has_location:
-            frozen = False
-            path = spec.origin
-            suffix = os.path.splitext(path)[1]
-            mode = 'r' if suffix in SOURCE_SUFFIXES else 'rb'
-
-            if suffix in SOURCE_SUFFIXES:
-                kind = PY_SOURCE
-            elif suffix in BYTECODE_SUFFIXES:
-                kind = PY_COMPILED
-            elif suffix in EXTENSION_SUFFIXES:
-                kind = C_EXTENSION
-
-            if kind in {PY_SOURCE, PY_COMPILED}:
-                file = open(path, mode)
-        else:
-            path = None
-            suffix = mode= ''
-
-        return file, path, (suffix, mode, kind)
-
-    else:
-        parts = module.split('.')
-        while parts:
-            part = parts.pop(0)
-            f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
-
-            if kind == PKG_DIRECTORY:
-                parts = parts or ['__init__']
-                paths = [path]
-
-            elif parts:
-                raise ImportError("Can't find %r in %s" % (parts, module))
-
-        return info
-
-
 def get_module_constant(module, symbol, default=-1, paths=None):
     """Find 'module' by searching 'paths', and extract 'symbol'
 
@@ -156,35 +89,23 @@ def get_module_constant(module, symbol, default=-1, paths=None):
     constant.  Otherwise, return 'default'."""
 
     try:
-        f, path, (suffix, mode, kind) = find_module(module, paths)
+        f, path, (suffix, mode, kind) = info = find_module(module, paths)
     except ImportError:
         # Module doesn't exist
         return None
 
-    if six.PY3:
-        spec = find_spec(module, paths)
-        if hasattr(spec, 'submodule_search_locations'):
-            spec = spec_from_loader('__init__.py', spec.loader)
-
     try:
         if kind == PY_COMPILED:
             f.read(8)  # skip magic & date
             code = marshal.load(f)
         elif kind == PY_FROZEN:
-            if six.PY2:
-                code = imp.get_frozen_object(module)
-            else:
-                code = spec.loader.get_code(module)
+            code = py27compat.get_frozen_object(module, paths)
         elif kind == PY_SOURCE:
             code = compile(f.read(), path, 'exec')
         else:
             # Not something we can parse; we'll have to import it.  :(
-            if module not in sys.modules:
-                if six.PY2:
-                    imp.load_module(module, f, path, (suffix, mode, kind))
-                else:
-                    sys.modules[module] = module_from_spec(spec)
-            return getattr(sys.modules[module], symbol, None)
+            imported = py27compat.get_module(module, paths, info)
+            return getattr(imported, symbol, None)
 
     finally:
         if f:
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 2985011b92..cf5fb33efe 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -2,6 +2,7 @@
 Compatibility Support for Python 2.7 and earlier
 """
 
+import sys
 import platform
 
 from setuptools.extern import six
@@ -26,3 +27,34 @@ def get_all_headers(message, key):
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x
 """Workaround for http://bugs.python.org/issue24672"""
+
+
+try:
+    from ._imp import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
+    from ._imp import get_frozen_object, get_module
+except ImportError:
+    import imp
+    from imp import PY_COMPILED, PY_FROZEN, PY_SOURCE  # noqa
+
+    def find_module(module, paths=None):
+        """Just like 'imp.find_module()', but with package support"""
+        parts = module.split('.')
+        while parts:
+            part = parts.pop(0)
+            f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
+
+            if kind == imp.PKG_DIRECTORY:
+                parts = parts or ['__init__']
+                paths = [path]
+
+            elif parts:
+                raise ImportError("Can't find %r in %s" % (parts, module))
+
+        return info
+
+    def get_frozen_object(module, paths):
+        return imp.get_frozen_object(module)
+
+    def get_module(module, paths, info):
+        imp.load_module(*info)
+        return sys.modules[module]

From 773f1ec3c2622a78ee0280eb1d2b03c60871c52b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 19:54:42 -0400
Subject: [PATCH 7563/8469] Rely on contextlib.closing for brevity.

---
 setuptools/depends.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/setuptools/depends.py b/setuptools/depends.py
index eed4913a6b..a37675cbd9 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,5 +1,6 @@
 import sys
 import marshal
+import contextlib
 from distutils.version import StrictVersion
 
 from .py33compat import Bytecode
@@ -81,6 +82,17 @@ def is_current(self, paths=None):
         return self.version_ok(version)
 
 
+def maybe_close(f):
+    @contextlib.contextmanager
+    def empty():
+        yield
+        return
+    if not f:
+        return empty()
+
+    return contextlib.closing(f)
+
+
 def get_module_constant(module, symbol, default=-1, paths=None):
     """Find 'module' by searching 'paths', and extract 'symbol'
 
@@ -94,7 +106,7 @@ def get_module_constant(module, symbol, default=-1, paths=None):
         # Module doesn't exist
         return None
 
-    try:
+    with maybe_close(f):
         if kind == PY_COMPILED:
             f.read(8)  # skip magic & date
             code = marshal.load(f)
@@ -107,10 +119,6 @@ def get_module_constant(module, symbol, default=-1, paths=None):
             imported = py27compat.get_module(module, paths, info)
             return getattr(imported, symbol, None)
 
-    finally:
-        if f:
-            f.close()
-
     return extract_constant(code, symbol, default)
 
 

From 37d617cd983446dfe8073038d03dd31fc7f66796 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 20:40:07 -0400
Subject: [PATCH 7564/8469] Extract _resolve

---
 setuptools/_imp.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index 6bc9024368..c400d455c2 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -60,13 +60,17 @@ def find_module(module, paths=None):
 
 def get_frozen_object(module, paths):
     spec = importlib.util.find_spec(module, paths)
-    if hasattr(spec, 'submodule_search_locations'):
-        spec = importlib.util.spec_from_loader('__init__.py', spec.loader)
-    return spec.loader.get_code(module)
+    return spec.loader.get_code(_resolve(module))
+
+
+def _resolve(spec):
+    return (
+        importlib.util.spec_from_loader('__init__.py', spec.loader)
+        if hasattr(spec, 'submodule_search_locations')
+        else spec
+    )
 
 
 def get_module(module, paths, info):
     spec = importlib.util.find_spec(module, paths)
-    if hasattr(spec, 'submodule_search_locations'):
-        spec = importlib.util.spec_from_loader('__init__.py', spec.loader)
-    return importlib.util.module_from_spec(spec)
+    return importlib.util.module_from_spec(_resolve(spec))

From 4948b14a66f00eba749e52b77281f711413e071b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 27 Oct 2019 20:40:58 -0400
Subject: [PATCH 7565/8469] Avoid _resolve in get_module (causes failures).

---
 setuptools/_imp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index c400d455c2..cee9155145 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -73,4 +73,4 @@ def _resolve(spec):
 
 def get_module(module, paths, info):
     spec = importlib.util.find_spec(module, paths)
-    return importlib.util.module_from_spec(_resolve(spec))
+    return importlib.util.module_from_spec(spec)

From 16051d6b2d3641dc8951e90f7f04bcd04b8954d3 Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Mon, 28 Oct 2019 10:12:53 +0300
Subject: [PATCH 7566/8469] imp load_module fix

---
 setuptools/py27compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index cf5fb33efe..1d57360f4e 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -56,5 +56,5 @@ def get_frozen_object(module, paths):
         return imp.get_frozen_object(module)
 
     def get_module(module, paths, info):
-        imp.load_module(*info)
+        imp.load_module(module, *info)
         return sys.modules[module]

From 65fe7abeaba9e82b8f3755054759fed21c0c489b Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Mon, 28 Oct 2019 10:28:55 +0300
Subject: [PATCH 7567/8469] py34 compat

---
 setuptools/_imp.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index cee9155145..09073d44fe 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -4,6 +4,7 @@
 """
 
 import os
+import sys
 import importlib.util
 import importlib.machinery
 
@@ -70,7 +71,12 @@ def _resolve(spec):
         else spec
     )
 
+def _module_from_spec(spec):
+    if sys.version_info >= (3, 5):
+        return importlib.util.module_from_spec(spec)
+    else:
+        return spec.loader.load_module(spec.name)
 
 def get_module(module, paths, info):
     spec = importlib.util.find_spec(module, paths)
-    return importlib.util.module_from_spec(spec)
+    return _module_from_spec(spec)

From ce01c0199f93612848e664bfd920083168eaa293 Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Mon, 28 Oct 2019 10:59:21 +0300
Subject: [PATCH 7568/8469] add docstring to find_module

---
 setuptools/_imp.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index 09073d44fe..dc4b1b2c5d 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -17,8 +17,7 @@
 
 
 def find_module(module, paths=None):
-    """
-    """
+    """Just like 'imp.find_module()', but with package support"""
     spec = importlib.util.find_spec(module, paths)
     if spec is None:
         raise ImportError("Can't find %s" % module)

From 2f4952927e41643100e6e6f58124f34331c14add Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Mon, 28 Oct 2019 11:07:27 +0300
Subject: [PATCH 7569/8469] remove _resolve

---
 setuptools/_imp.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index dc4b1b2c5d..49ddc852be 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -63,13 +63,6 @@ def get_frozen_object(module, paths):
     return spec.loader.get_code(_resolve(module))
 
 
-def _resolve(spec):
-    return (
-        importlib.util.spec_from_loader('__init__.py', spec.loader)
-        if hasattr(spec, 'submodule_search_locations')
-        else spec
-    )
-
 def _module_from_spec(spec):
     if sys.version_info >= (3, 5):
         return importlib.util.module_from_spec(spec)

From 7489ea4047661a7dbd46ff155abe45c548284676 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Oct 2019 18:47:31 +0100
Subject: [PATCH 7570/8469] msvc: fix Python 2 support

---
 changelog.d/1891.change.rst | 1 +
 setuptools/msvc.py          | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/1891.change.rst

diff --git a/changelog.d/1891.change.rst b/changelog.d/1891.change.rst
new file mode 100644
index 0000000000..81ccff10e4
--- /dev/null
+++ b/changelog.d/1891.change.rst
@@ -0,0 +1 @@
+Fix code for detecting Visual Studio's version on Windows under Python 2.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index ffa7053b64..2ffe1c81ee 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -20,6 +20,7 @@
 """
 
 import json
+from io import open
 from os import listdir, pathsep
 from os.path import join, isfile, isdir, dirname
 import sys

From 7748921de342160ca2dc9c9539562bb9c924e14c Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 28 Oct 2019 19:12:39 +0100
Subject: [PATCH 7571/8469] =?UTF-8?q?Bump=20version:=2041.5.0=20=E2=86=92?=
 =?UTF-8?q?=2041.5.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/1891.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1891.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index aeefc8f2c6..0dc75e9bfd 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.5.0
+current_version = 41.5.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 7e9fc0f6e8..bac356385f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v41.5.1
+-------
+
+* #1891: Fix code for detecting Visual Studio's version on Windows under Python 2.
+
+
 v41.5.0
 -------
 
diff --git a/changelog.d/1891.change.rst b/changelog.d/1891.change.rst
deleted file mode 100644
index 81ccff10e4..0000000000
--- a/changelog.d/1891.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix code for detecting Visual Studio's version on Windows under Python 2.
diff --git a/setup.cfg b/setup.cfg
index 0e030cde82..8038b463cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.5.0
+version = 41.5.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 823ab9d2ec4ab89f90c0a781d872c9071b4afc13 Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 20 May 2019 18:25:19 -0400
Subject: [PATCH 7572/8469] Add support for `license_files` option in metadata

---
 changelog.d/1767.change.rst       |   2 +
 docs/setuptools.txt               |   1 +
 setuptools/command/sdist.py       |  26 ++--
 setuptools/config.py              |   1 +
 setuptools/dist.py                |   1 +
 setuptools/tests/test_egg_info.py | 198 ++++++++++++++++++++++++++++++
 6 files changed, 221 insertions(+), 8 deletions(-)
 create mode 100644 changelog.d/1767.change.rst

diff --git a/changelog.d/1767.change.rst b/changelog.d/1767.change.rst
new file mode 100644
index 0000000000..5d42aedc87
--- /dev/null
+++ b/changelog.d/1767.change.rst
@@ -0,0 +1,2 @@
+Add support for the ``license_files`` option in ``setup.cfg`` to automatically
+include multiple license files in a source distribution.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 344ea5bc36..22025f61cb 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2276,6 +2276,7 @@ maintainer_email                maintainer-email   str
 classifiers                     classifier         file:, list-comma
 license                                            str
 license_file                                       str
+license_files                                      list-comma
 description                     summary            file:, str
 long_description                long-description   file:, str
 long_description_content_type                      str                38.6.0
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index dc25398147..2431664007 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -200,10 +200,12 @@ def read_manifest(self):
         manifest.close()
 
     def check_license(self):
-        """Checks if license_file' is configured and adds it to
-        'self.filelist' if the value contains a valid path.
+        """Checks if license_file' or 'license_files' is configured and adds any
+        valid paths to 'self.filelist'.
         """
 
+        files = set()
+
         opts = self.distribution.get_option_dict('metadata')
 
         # ignore the source of the value
@@ -211,11 +213,19 @@ def check_license(self):
 
         if license_file is None:
             log.debug("'license_file' option was not specified")
-            return
+        else:
+            files.add(license_file)
 
-        if not os.path.exists(license_file):
-            log.warn("warning: Failed to find the configured license file '%s'",
-                    license_file)
-            return
+        try:
+            files.update(self.distribution.metadata.license_files)
+        except TypeError:
+            log.warn("warning: 'license_files' option is malformed")
+
+        for f in files:
+            if not os.path.exists(f):
+                log.warn(
+                    "warning: Failed to find the configured license file '%s'",
+                    f)
+                continue
 
-        self.filelist.append(license_file)
+            self.filelist.append(f)
diff --git a/setuptools/config.py b/setuptools/config.py
index 2d50e25e89..9b9a0c45e7 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -483,6 +483,7 @@ def parsers(self):
             'obsoletes': parse_list,
             'classifiers': self._get_parser_compound(parse_file, parse_list),
             'license': exclude_files_parser('license'),
+            'license_files': parse_list,
             'description': parse_file,
             'long_description': parse_file,
             'version': self._parse_version,
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2e5ad4bd68..fb379a20c4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -409,6 +409,7 @@ class Distribution(_Distribution):
         'long_description_content_type': None,
         'project_urls': dict,
         'provides_extras': ordered_set.OrderedSet,
+        'license_files': list,
     }
 
     _patched_dist = None
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 316eb2edde..61da1bdaac 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -567,6 +567,204 @@ def test_setup_cfg_license_file(
             assert 'LICENSE' not in sources_text
             assert 'INVALID_LICENSE' not in sources_text # for invalid license test
 
+    @pytest.mark.parametrize("files, incl_licenses, excl_licenses", [
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                                  LICENSE-ABC
+                                  LICENSE-XYZ
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with licenses
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files = LICENSE-ABC, LICENSE-XYZ
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with commas
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                                  LICENSE-ABC
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC'], ['LICENSE-XYZ']), # with one license
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # empty
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files = LICENSE-XYZ
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-XYZ'], ['LICENSE-ABC']), # on same line
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                                  LICENSE-ABC
+                                  INVALID_LICENSE
+                              """),
+            'LICENSE-ABC': DALS("Test license")
+        }, ['LICENSE-ABC'], ['INVALID_LICENSE']), # with an invalid license
+        ({
+            'setup.cfg': DALS("""
+                              """),
+            'LICENSE': DALS("Test license")
+        }, [], ['LICENSE']), # no license_files attribute
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files = LICENSE
+                              """),
+            'MANIFEST.in': DALS("exclude LICENSE"),
+            'LICENSE': DALS("Test license")
+        }, [], ['LICENSE']), # license file is manually excluded
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                                  LICENSE-ABC
+                                  LICENSE-XYZ
+                              """),
+            'MANIFEST.in': DALS("exclude LICENSE-XYZ"),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC'], ['LICENSE-XYZ']) # subset is manually excluded
+    ])
+    def test_setup_cfg_license_files(
+            self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
+        self._create_project()
+        build_files(files)
+
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)])
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_lines = list(line.strip() for line in sources_file)
+
+        for lf in incl_licenses:
+            assert sources_lines.count(lf) == 1
+
+        for lf in excl_licenses:
+            assert sources_lines.count(lf) == 0
+
+    @pytest.mark.parametrize("files, incl_licenses, excl_licenses", [
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file =
+                              license_files =
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # both empty
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file =
+                                  LICENSE-ABC
+                                  LICENSE-XYZ
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # license_file is still singular
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE-ABC
+                              license_files =
+                                  LICENSE-XYZ
+                                  LICENSE-PQR
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-PQR': DALS("PQR license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # combined
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE-ABC
+                              license_files =
+                                  LICENSE-ABC
+                                  LICENSE-XYZ
+                                  LICENSE-PQR
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-PQR': DALS("PQR license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # duplicate license
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE-ABC
+                              license_files =
+                                  LICENSE-XYZ
+                              """),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-PQR': DALS("PQR license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], ['LICENSE-PQR']), # combined subset
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE-ABC
+                              license_files =
+                                  LICENSE-XYZ
+                                  LICENSE-PQR
+                              """),
+            'LICENSE-PQR': DALS("Test license")
+        }, ['LICENSE-PQR'], ['LICENSE-ABC', 'LICENSE-XYZ']), # with invalid licenses
+        ({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE-ABC
+                              license_files =
+                                LICENSE-PQR
+                                LICENSE-XYZ
+                              """),
+            'MANIFEST.in': DALS("exclude LICENSE-ABC\nexclude LICENSE-PQR"),
+            'LICENSE-ABC': DALS("ABC license"),
+            'LICENSE-PQR': DALS("PQR license"),
+            'LICENSE-XYZ': DALS("XYZ license")
+        }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR']) # manually excluded
+    ])
+    def test_setup_cfg_license_file_license_files(
+            self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
+        self._create_project()
+        build_files(files)
+
+        environment.run_setup_py(
+            cmd=['egg_info'],
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)])
+        )
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+
+        with open(os.path.join(egg_info_dir, 'SOURCES.txt')) as sources_file:
+            sources_lines = list(line.strip() for line in sources_file)
+
+        for lf in incl_licenses:
+            assert sources_lines.count(lf) == 1
+
+        for lf in excl_licenses:
+            assert sources_lines.count(lf) == 0
+
     def test_long_description_content_type(self, tmpdir_cwd, env):
         # Test that specifying a `long_description_content_type` keyword arg to
         # the `setup` function results in writing a `Description-Content-Type`

From 648dfe5afea3bf2a690c9267131a503bcd37d289 Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 28 Oct 2019 18:38:30 -0400
Subject: [PATCH 7573/8469] Remove DALS for single-line strings

---
 setuptools/tests/test_egg_info.py | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 61da1bdaac..0db204baa3 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -524,27 +524,27 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
                               [metadata]
                               license_file = LICENSE
                               """),
-            'LICENSE': DALS("Test license")
+            'LICENSE': "Test license"
         }, True), # with license
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = INVALID_LICENSE
                               """),
-            'LICENSE': DALS("Test license")
+            'LICENSE': "Test license"
         }, False), # with an invalid license
         ({
             'setup.cfg': DALS("""
                               """),
-            'LICENSE': DALS("Test license")
+            'LICENSE': "Test license"
         }, False), # no license_file attribute
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = LICENSE
                               """),
-            'MANIFEST.in': DALS("exclude LICENSE"),
-            'LICENSE': DALS("Test license")
+            'MANIFEST.in': "exclude LICENSE",
+            'LICENSE': "Test license"
         }, False) # license file is manually excluded
     ])
     def test_setup_cfg_license_file(
@@ -575,16 +575,16 @@ def test_setup_cfg_license_file(
                                   LICENSE-ABC
                                   LICENSE-XYZ
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with licenses
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_files = LICENSE-ABC, LICENSE-XYZ
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with commas
         ({
             'setup.cfg': DALS("""
@@ -592,24 +592,24 @@ def test_setup_cfg_license_file(
                               license_files =
                                   LICENSE-ABC
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC'], ['LICENSE-XYZ']), # with one license
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_files =
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # empty
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_files = LICENSE-XYZ
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-XYZ'], ['LICENSE-ABC']), # on same line
         ({
             'setup.cfg': DALS("""
@@ -618,20 +618,20 @@ def test_setup_cfg_license_file(
                                   LICENSE-ABC
                                   INVALID_LICENSE
                               """),
-            'LICENSE-ABC': DALS("Test license")
+            'LICENSE-ABC': "Test license"
         }, ['LICENSE-ABC'], ['INVALID_LICENSE']), # with an invalid license
         ({
             'setup.cfg': DALS("""
                               """),
-            'LICENSE': DALS("Test license")
+            'LICENSE': "Test license"
         }, [], ['LICENSE']), # no license_files attribute
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_files = LICENSE
                               """),
-            'MANIFEST.in': DALS("exclude LICENSE"),
-            'LICENSE': DALS("Test license")
+            'MANIFEST.in': "exclude LICENSE",
+            'LICENSE': "Test license"
         }, [], ['LICENSE']), # license file is manually excluded
         ({
             'setup.cfg': DALS("""
@@ -640,9 +640,9 @@ def test_setup_cfg_license_file(
                                   LICENSE-ABC
                                   LICENSE-XYZ
                               """),
-            'MANIFEST.in': DALS("exclude LICENSE-XYZ"),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'MANIFEST.in': "exclude LICENSE-XYZ",
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC'], ['LICENSE-XYZ']) # subset is manually excluded
     ])
     def test_setup_cfg_license_files(
@@ -672,8 +672,8 @@ def test_setup_cfg_license_files(
                               license_file =
                               license_files =
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # both empty
         ({
             'setup.cfg': DALS("""
@@ -682,8 +682,8 @@ def test_setup_cfg_license_files(
                                   LICENSE-ABC
                                   LICENSE-XYZ
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-XYZ': "XYZ license"
         }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # license_file is still singular
         ({
             'setup.cfg': DALS("""
@@ -693,9 +693,9 @@ def test_setup_cfg_license_files(
                                   LICENSE-XYZ
                                   LICENSE-PQR
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-PQR': DALS("PQR license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-PQR': "PQR license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # combined
         ({
             'setup.cfg': DALS("""
@@ -706,9 +706,9 @@ def test_setup_cfg_license_files(
                                   LICENSE-XYZ
                                   LICENSE-PQR
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-PQR': DALS("PQR license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-PQR': "PQR license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # duplicate license
         ({
             'setup.cfg': DALS("""
@@ -717,9 +717,9 @@ def test_setup_cfg_license_files(
                               license_files =
                                   LICENSE-XYZ
                               """),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-PQR': DALS("PQR license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-PQR': "PQR license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC', 'LICENSE-XYZ'], ['LICENSE-PQR']), # combined subset
         ({
             'setup.cfg': DALS("""
@@ -729,7 +729,7 @@ def test_setup_cfg_license_files(
                                   LICENSE-XYZ
                                   LICENSE-PQR
                               """),
-            'LICENSE-PQR': DALS("Test license")
+            'LICENSE-PQR': "Test license"
         }, ['LICENSE-PQR'], ['LICENSE-ABC', 'LICENSE-XYZ']), # with invalid licenses
         ({
             'setup.cfg': DALS("""
@@ -739,10 +739,10 @@ def test_setup_cfg_license_files(
                                 LICENSE-PQR
                                 LICENSE-XYZ
                               """),
-            'MANIFEST.in': DALS("exclude LICENSE-ABC\nexclude LICENSE-PQR"),
-            'LICENSE-ABC': DALS("ABC license"),
-            'LICENSE-PQR': DALS("PQR license"),
-            'LICENSE-XYZ': DALS("XYZ license")
+            'MANIFEST.in': "exclude LICENSE-ABC\nexclude LICENSE-PQR",
+            'LICENSE-ABC': "ABC license",
+            'LICENSE-PQR': "PQR license",
+            'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR']) # manually excluded
     ])
     def test_setup_cfg_license_file_license_files(

From 4a31168e517134529c229b310e89039323fdb02f Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 28 Oct 2019 18:45:42 -0400
Subject: [PATCH 7574/8469] Use an OrderedSet for accumulating license files

---
 setuptools/command/sdist.py | 4 ++--
 setuptools/dist.py          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 2431664007..6043e0b9e8 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@
 import io
 import contextlib
 
-from setuptools.extern import six
+from setuptools.extern import six, ordered_set
 
 from .py36compat import sdist_add_defaults
 
@@ -204,7 +204,7 @@ def check_license(self):
         valid paths to 'self.filelist'.
         """
 
-        files = set()
+        files = ordered_set.OrderedSet()
 
         opts = self.distribution.get_option_dict('metadata')
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index fb379a20c4..0f3f7322d9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -409,7 +409,7 @@ class Distribution(_Distribution):
         'long_description_content_type': None,
         'project_urls': dict,
         'provides_extras': ordered_set.OrderedSet,
-        'license_files': list,
+        'license_files': ordered_set.OrderedSet,
     }
 
     _patched_dist = None

From e08ec2b640f6b2bf943fea70e2a7f9881bbe6e91 Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 28 Oct 2019 19:16:13 -0400
Subject: [PATCH 7575/8469] Filter out missing files and use extend()

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

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 6043e0b9e8..55ecdd978a 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -226,6 +226,6 @@ def check_license(self):
                 log.warn(
                     "warning: Failed to find the configured license file '%s'",
                     f)
-                continue
+                files.remove(f)
 
-            self.filelist.append(f)
+        self.filelist.extend(files)

From 3a0520b43dfac9f6ba507c6d09a60290219a0802 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Oct 2019 21:52:40 -0400
Subject: [PATCH 7576/8469] Extract compatibility function into compatibility
 module.

---
 setuptools/_imp.py       | 10 +++-------
 setuptools/py34compat.py |  8 ++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 setuptools/py34compat.py

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index 49ddc852be..ee719c9a36 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -8,6 +8,8 @@
 import importlib.util
 import importlib.machinery
 
+from .py34compat import module_from_spec
+
 
 PY_SOURCE = 1
 PY_COMPILED = 2
@@ -63,12 +65,6 @@ def get_frozen_object(module, paths):
     return spec.loader.get_code(_resolve(module))
 
 
-def _module_from_spec(spec):
-    if sys.version_info >= (3, 5):
-        return importlib.util.module_from_spec(spec)
-    else:
-        return spec.loader.load_module(spec.name)
-
 def get_module(module, paths, info):
     spec = importlib.util.find_spec(module, paths)
-    return _module_from_spec(spec)
+    return module_from_spec(spec)
diff --git a/setuptools/py34compat.py b/setuptools/py34compat.py
new file mode 100644
index 0000000000..bc7eefa99f
--- /dev/null
+++ b/setuptools/py34compat.py
@@ -0,0 +1,8 @@
+import importlib.util
+
+
+try:
+    module_from_spec = importlib.util.module_from_spec
+except AttributeError:
+    def module_from_spec(spec):
+        return spec.loader.load_module(spec.name)

From 2175d6bdcf4fe626e713961bb0315c91f206746b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Oct 2019 21:57:31 -0400
Subject: [PATCH 7577/8469] Add changelog entry.

---
 changelog.d/479.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/479.bugfix.rst

diff --git a/changelog.d/479.bugfix.rst b/changelog.d/479.bugfix.rst
new file mode 100644
index 0000000000..3c33964edb
--- /dev/null
+++ b/changelog.d/479.bugfix.rst
@@ -0,0 +1 @@
+Replace usage of deprecated ``imp`` module with local re-implementation in ``setuptools._imp``.

From e1f340b53f0088993b16e19999a4d6b0e86a9991 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Oct 2019 22:01:34 -0400
Subject: [PATCH 7578/8469] Avoid importerror on older Pythons

---
 setuptools/py34compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/py34compat.py b/setuptools/py34compat.py
index bc7eefa99f..54157a6375 100644
--- a/setuptools/py34compat.py
+++ b/setuptools/py34compat.py
@@ -1,4 +1,4 @@
-import importlib.util
+import importlib
 
 
 try:

From 82689e1aa8e6548f26f2ce3bcd069411cb39bfcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Oct 2019 22:06:44 -0400
Subject: [PATCH 7579/8469] Ensure importlib.util is imported on Python 3.5

---
 setuptools/py34compat.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/py34compat.py b/setuptools/py34compat.py
index 54157a6375..3ad917222a 100644
--- a/setuptools/py34compat.py
+++ b/setuptools/py34compat.py
@@ -1,5 +1,10 @@
 import importlib
 
+try:
+    import importlib.util
+except ImportError:
+    pass
+
 
 try:
     module_from_spec = importlib.util.module_from_spec

From 20d6407aa5f68dbeba61e8967290f2fbde4f85ab Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Tue, 29 Oct 2019 10:51:54 +0300
Subject: [PATCH 7580/8469] Allow calling get_frozen_object without paths,
 raise ImportError when it cant find module

---
 setuptools/_imp.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index ee719c9a36..ab29ef2123 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -60,11 +60,15 @@ def find_module(module, paths=None):
     return file, path, (suffix, mode, kind)
 
 
-def get_frozen_object(module, paths):
+def get_frozen_object(module, paths=None):
     spec = importlib.util.find_spec(module, paths)
-    return spec.loader.get_code(_resolve(module))
+    if not spec:
+        raise ImportError("Can't find %s" % module)
+    return spec.loader.get_code(module)
 
 
 def get_module(module, paths, info):
     spec = importlib.util.find_spec(module, paths)
+    if not spec:
+        raise ImportError("Can't find %s" % module)
     return module_from_spec(spec)

From cfa9245a7dea8a35f11580c0bfd27472a3182c7e Mon Sep 17 00:00:00 2001
From: Batuhan Taskaya <batuhanosmantaskaya@gmail.com>
Date: Tue, 29 Oct 2019 10:53:40 +0300
Subject: [PATCH 7581/8469] Remove 'sys' import

---
 setuptools/_imp.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index ab29ef2123..a3cce9b284 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -4,7 +4,6 @@
 """
 
 import os
-import sys
 import importlib.util
 import importlib.machinery
 

From 6defe6b8fd6008f61ce5ecfae91dc1df5e123694 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Oct 2019 09:52:32 -0400
Subject: [PATCH 7582/8469] Rename changelog file

---
 changelog.d/{479.bugfix.rst => 479.change.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{479.bugfix.rst => 479.change.rst} (100%)

diff --git a/changelog.d/479.bugfix.rst b/changelog.d/479.change.rst
similarity index 100%
rename from changelog.d/479.bugfix.rst
rename to changelog.d/479.change.rst

From a0fe403c141369defacf12dccbdc01634bbcb1da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Oct 2019 09:53:23 -0400
Subject: [PATCH 7583/8469] =?UTF-8?q?Bump=20version:=2041.5.1=20=E2=86=92?=
 =?UTF-8?q?=2041.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg           | 2 +-
 CHANGES.rst                | 6 ++++++
 changelog.d/479.change.rst | 1 -
 setup.cfg                  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/479.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 0dc75e9bfd..40db5b03f1 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.5.1
+current_version = 41.6.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index bac356385f..ba7b4647c8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v41.6.0
+-------
+
+* #479: Replace usage of deprecated ``imp`` module with local re-implementation in ``setuptools._imp``.
+
+
 v41.5.1
 -------
 
diff --git a/changelog.d/479.change.rst b/changelog.d/479.change.rst
deleted file mode 100644
index 3c33964edb..0000000000
--- a/changelog.d/479.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replace usage of deprecated ``imp`` module with local re-implementation in ``setuptools._imp``.
diff --git a/setup.cfg b/setup.cfg
index 8038b463cc..42a3d86c6c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.5.1
+version = 41.6.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From b2ab6f7c90b4daf5c05f08be230f329e8cb2f8e2 Mon Sep 17 00:00:00 2001
From: Andrew Taylor <ataylor@redtoad.ca>
Date: Tue, 29 Oct 2019 17:03:11 -0600
Subject: [PATCH 7584/8469] Add info message when authentication error
 encountered processing package index.

---
 setuptools/package_index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f419d47167..d9668e4e1c 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -348,6 +348,8 @@ def process_url(self, url, retrieve=False):
         f = self.open_url(url, tmpl % url)
         if f is None:
             return
+        if isinstance(f, urllib.error.HTTPError) and f.code == 401:
+            self.info("Authentication error: %s" % f.msg)
         self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
             f.close()  # not html, we can't process it

From 9fd54518fcb660d9d3f92b1bb242082f20c69c1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Oct 2019 15:00:55 -0400
Subject: [PATCH 7585/8469] Suppress deprecation of bdist_wininst. Ref #1823.

---
 pytest.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 612fb91f63..549e4d68f8 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,3 +5,6 @@ flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
+filterwarnings =
+	# https://github.com/pypa/setuptools/issues/1823
+	ignore:distutils.command.bdist_wininst::command is deprecated

From 6ac7b4ee036ef8e6954198689d214e8ee9b29118 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Oct 2019 15:58:45 -0400
Subject: [PATCH 7586/8469] Suppress deprecation of bdist_wininst (redo). Ref
 #1823.

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 549e4d68f8..0370f7f827 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -7,4 +7,4 @@ flake8-ignore =
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
 	# https://github.com/pypa/setuptools/issues/1823
-	ignore:distutils.command.bdist_wininst::command is deprecated
+	ignore:bdist_wininst command is deprecated

From 2fffeb6513a50af996ee07dfc4a62fb0bf5dce7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Oct 2019 15:33:12 -0400
Subject: [PATCH 7587/8469] Error on warnings. Fixes #1823.

---
 pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pytest.ini b/pytest.ini
index 0370f7f827..6786be4fbc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -8,3 +8,4 @@ doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
 	# https://github.com/pypa/setuptools/issues/1823
 	ignore:bdist_wininst command is deprecated
+	error

From 894aa5bede94d01639a5e6e95be02cb06164318f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Oct 2019 15:36:32 -0400
Subject: [PATCH 7588/8469] Move the error directive to the top, as it's more
 permanent.

---
 pytest.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 6786be4fbc..3b3d4b8b07 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -6,6 +6,7 @@ flake8-ignore =
     setuptools/py*compat.py F811
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
+	# Fail on warnings
+	error
 	# https://github.com/pypa/setuptools/issues/1823
 	ignore:bdist_wininst command is deprecated
-	error

From 96bc30807092c6f6a014d71510a23ab2dd07f3a7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 31 Oct 2019 15:36:52 -0400
Subject: [PATCH 7589/8469] Add changelog entry

---
 changelog.d/1899.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1899.change.rst

diff --git a/changelog.d/1899.change.rst b/changelog.d/1899.change.rst
new file mode 100644
index 0000000000..3076843956
--- /dev/null
+++ b/changelog.d/1899.change.rst
@@ -0,0 +1 @@
+Test suite now fails on warnings.

From f413f95e95b34b26d9ed9d9c43b3e4b3d30caecc Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 31 Oct 2019 11:25:57 -0400
Subject: [PATCH 7590/8469] Remove "upload" and "register" commands.

The upload and register commands were deprecated over a year ago, in
July 2018 (PR GH-1410, discussed in issue GH-1381). It is time to
actively remove them in favor of twine.
---
 changelog.d/1898.breaking.rst     |   1 +
 docs/setuptools.txt               |  15 +--
 setuptools/command/__init__.py    |   3 +-
 setuptools/command/register.py    |  22 ++--
 setuptools/command/upload.py      | 195 ++-------------------------
 setuptools/errors.py              |  16 +++
 setuptools/tests/test_register.py |  43 ++----
 setuptools/tests/test_upload.py   | 211 ++----------------------------
 8 files changed, 64 insertions(+), 442 deletions(-)
 create mode 100644 changelog.d/1898.breaking.rst
 create mode 100644 setuptools/errors.py

diff --git a/changelog.d/1898.breaking.rst b/changelog.d/1898.breaking.rst
new file mode 100644
index 0000000000..844a8a42fa
--- /dev/null
+++ b/changelog.d/1898.breaking.rst
@@ -0,0 +1 @@
+Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 344ea5bc36..399a56d3ca 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2087,16 +2087,13 @@ New in 41.5.0: Deprecated the test command.
 ``upload`` - Upload source and/or egg distributions to PyPI
 ===========================================================
 
-.. warning::
-    **upload** is deprecated in favor of using `twine
-    <https://pypi.org/p/twine>`_
-
-The ``upload`` command is implemented and `documented
-<https://docs.python.org/3.1/distutils/uploading.html>`_
-in distutils.
+The ``upload`` command was deprecated in version 40.0 and removed in version
+42.0. Use `twine <https://pypi.org/p/twine>`_ instead.
 
-New in 20.1: Added keyring support.
-New in 40.0: Deprecated the upload command.
+For  more information on the current best practices in uploading your packages
+to PyPI, see the Python Packaging User Guide's "Packaging Python Projects"
+tutorial specifically the section on `uploading the distribution archives
+<https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives>`_.
 
 
 -----------------------------------------
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index fe619e2e67..743f5588fa 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,8 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst', 'upload_docs', 'upload', 'build_clib',
-    'dist_info',
+    'bdist_wininst', 'upload_docs', 'build_clib', 'dist_info',
 ]
 
 from distutils.command.bdist import bdist
diff --git a/setuptools/command/register.py b/setuptools/command/register.py
index 98bc01566f..b8266b9a60 100644
--- a/setuptools/command/register.py
+++ b/setuptools/command/register.py
@@ -1,18 +1,18 @@
 from distutils import log
 import distutils.command.register as orig
 
+from setuptools.errors import RemovedCommandError
+
 
 class register(orig.register):
-    __doc__ = orig.register.__doc__
+    """Formerly used to register packages on PyPI."""
 
     def run(self):
-        try:
-            # Make sure that we are using valid current name/version info
-            self.run_command('egg_info')
-            orig.register.run(self)
-        finally:
-            self.announce(
-                "WARNING: Registering is deprecated, use twine to "
-                "upload instead (https://pypi.org/p/twine/)",
-                log.WARN
-            )
+        msg = (
+            "The register command has been removed, use twine to upload "
+            + "instead (https://pypi.org/p/twine)"
+        )
+
+        self.announce("ERROR: " + msg, log.ERROR)
+
+        raise RemovedCommandError(msg)
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 6db8888bb2..ec7f81e227 100644
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -1,196 +1,17 @@
-import io
-import os
-import hashlib
-import getpass
-
-from base64 import standard_b64encode
-
 from distutils import log
 from distutils.command import upload as orig
-from distutils.spawn import spawn
-
-from distutils.errors import DistutilsError
 
-from setuptools.extern.six.moves.urllib.request import urlopen, Request
-from setuptools.extern.six.moves.urllib.error import HTTPError
-from setuptools.extern.six.moves.urllib.parse import urlparse
+from setuptools.errors import RemovedCommandError
 
 
 class upload(orig.upload):
-    """
-    Override default upload behavior to obtain password
-    in a variety of different ways.
-    """
-    def run(self):
-        try:
-            orig.upload.run(self)
-        finally:
-            self.announce(
-                "WARNING: Uploading via this command is deprecated, use twine "
-                "to upload instead (https://pypi.org/p/twine/)",
-                log.WARN
-            )
+    """Formerly used to upload packages to PyPI."""
 
-    def finalize_options(self):
-        orig.upload.finalize_options(self)
-        self.username = (
-            self.username or
-            getpass.getuser()
-        )
-        # Attempt to obtain password. Short circuit evaluation at the first
-        # sign of success.
-        self.password = (
-            self.password or
-            self._load_password_from_keyring() or
-            self._prompt_for_password()
+    def run(self):
+        msg = (
+            "The upload command has been removed, use twine to upload "
+            + "instead (https://pypi.org/p/twine)"
         )
 
-    def upload_file(self, command, pyversion, filename):
-        # Makes sure the repository URL is compliant
-        schema, netloc, url, params, query, fragments = \
-            urlparse(self.repository)
-        if params or query or fragments:
-            raise AssertionError("Incompatible url %s" % self.repository)
-
-        if schema not in ('http', 'https'):
-            raise AssertionError("unsupported schema " + schema)
-
-        # Sign if requested
-        if self.sign:
-            gpg_args = ["gpg", "--detach-sign", "-a", filename]
-            if self.identity:
-                gpg_args[2:2] = ["--local-user", self.identity]
-            spawn(gpg_args,
-                  dry_run=self.dry_run)
-
-        # Fill in the data - send all the meta-data in case we need to
-        # register a new release
-        with open(filename, 'rb') as f:
-            content = f.read()
-
-        meta = self.distribution.metadata
-
-        data = {
-            # action
-            ':action': 'file_upload',
-            'protocol_version': '1',
-
-            # identify release
-            'name': meta.get_name(),
-            'version': meta.get_version(),
-
-            # file content
-            'content': (os.path.basename(filename), content),
-            'filetype': command,
-            'pyversion': pyversion,
-            'md5_digest': hashlib.md5(content).hexdigest(),
-
-            # additional meta-data
-            'metadata_version': str(meta.get_metadata_version()),
-            'summary': meta.get_description(),
-            'home_page': meta.get_url(),
-            'author': meta.get_contact(),
-            'author_email': meta.get_contact_email(),
-            'license': meta.get_licence(),
-            'description': meta.get_long_description(),
-            'keywords': meta.get_keywords(),
-            'platform': meta.get_platforms(),
-            'classifiers': meta.get_classifiers(),
-            'download_url': meta.get_download_url(),
-            # PEP 314
-            'provides': meta.get_provides(),
-            'requires': meta.get_requires(),
-            'obsoletes': meta.get_obsoletes(),
-            }
-
-        data['comment'] = ''
-
-        if self.sign:
-            data['gpg_signature'] = (os.path.basename(filename) + ".asc",
-                                     open(filename+".asc", "rb").read())
-
-        # set up the authentication
-        user_pass = (self.username + ":" + self.password).encode('ascii')
-        # The exact encoding of the authentication string is debated.
-        # Anyway PyPI only accepts ascii for both username or password.
-        auth = "Basic " + standard_b64encode(user_pass).decode('ascii')
-
-        # Build up the MIME payload for the POST data
-        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = b'\r\n--' + boundary.encode('ascii')
-        end_boundary = sep_boundary + b'--\r\n'
-        body = io.BytesIO()
-        for key, value in data.items():
-            title = '\r\nContent-Disposition: form-data; name="%s"' % key
-            # handle multiple entries for the same name
-            if not isinstance(value, list):
-                value = [value]
-            for value in value:
-                if type(value) is tuple:
-                    title += '; filename="%s"' % value[0]
-                    value = value[1]
-                else:
-                    value = str(value).encode('utf-8')
-                body.write(sep_boundary)
-                body.write(title.encode('utf-8'))
-                body.write(b"\r\n\r\n")
-                body.write(value)
-        body.write(end_boundary)
-        body = body.getvalue()
-
-        msg = "Submitting %s to %s" % (filename, self.repository)
-        self.announce(msg, log.INFO)
-
-        # build the Request
-        headers = {
-            'Content-type': 'multipart/form-data; boundary=%s' % boundary,
-            'Content-length': str(len(body)),
-            'Authorization': auth,
-        }
-
-        request = Request(self.repository, data=body,
-                          headers=headers)
-        # send the data
-        try:
-            result = urlopen(request)
-            status = result.getcode()
-            reason = result.msg
-        except HTTPError as e:
-            status = e.code
-            reason = e.msg
-        except OSError as e:
-            self.announce(str(e), log.ERROR)
-            raise
-
-        if status == 200:
-            self.announce('Server response (%s): %s' % (status, reason),
-                          log.INFO)
-            if self.show_response:
-                text = getattr(self, '_read_pypi_response',
-                               lambda x: None)(result)
-                if text is not None:
-                    msg = '\n'.join(('-' * 75, text, '-' * 75))
-                    self.announce(msg, log.INFO)
-        else:
-            msg = 'Upload failed (%s): %s' % (status, reason)
-            self.announce(msg, log.ERROR)
-            raise DistutilsError(msg)
-
-    def _load_password_from_keyring(self):
-        """
-        Attempt to load password from keyring. Suppress Exceptions.
-        """
-        try:
-            keyring = __import__('keyring')
-            return keyring.get_password(self.repository, self.username)
-        except Exception:
-            pass
-
-    def _prompt_for_password(self):
-        """
-        Prompt for a password on the tty. Suppress Exceptions.
-        """
-        try:
-            return getpass.getpass()
-        except (Exception, KeyboardInterrupt):
-            pass
+        self.announce("ERROR: " + msg, log.ERROR)
+        raise RemovedCommandError(msg)
diff --git a/setuptools/errors.py b/setuptools/errors.py
new file mode 100644
index 0000000000..2701747f56
--- /dev/null
+++ b/setuptools/errors.py
@@ -0,0 +1,16 @@
+"""setuptools.errors
+
+Provides exceptions used by setuptools modules.
+"""
+
+from distutils.errors import DistutilsError
+
+
+class RemovedCommandError(DistutilsError, RuntimeError):
+    """Error used for commands that have been removed in setuptools.
+
+    Since ``setuptools`` is built on ``distutils``, simply removing a command
+    from ``setuptools`` will make the behavior fall back to ``distutils``; this
+    error is raised if a command exists in ``distutils`` but has been actively
+    removed in ``setuptools``.
+    """
diff --git a/setuptools/tests/test_register.py b/setuptools/tests/test_register.py
index 96114595db..986058067b 100644
--- a/setuptools/tests/test_register.py
+++ b/setuptools/tests/test_register.py
@@ -1,43 +1,22 @@
-import mock
-from distutils import log
-
-import pytest
-
 from setuptools.command.register import register
 from setuptools.dist import Distribution
+from setuptools.errors import RemovedCommandError
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
-class TestRegisterTest:
-    def test_warns_deprecation(self):
-        dist = Distribution()
-
-        cmd = register(dist)
-        cmd.run_command = mock.Mock()
-        cmd.send_metadata = mock.Mock()
-        cmd.announce = mock.Mock()
-
-        cmd.run()
+import pytest
 
-        cmd.announce.assert_called_with(
-            "WARNING: Registering is deprecated, use twine to upload instead "
-            "(https://pypi.org/p/twine/)",
-            log.WARN
-        )
 
-    def test_warns_deprecation_when_raising(self):
+class TestRegister:
+    def test_register_exception(self):
+        """Ensure that the register command has been properly removed."""
         dist = Distribution()
+        dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
 
         cmd = register(dist)
-        cmd.run_command = mock.Mock()
-        cmd.send_metadata = mock.Mock()
-        cmd.send_metadata.side_effect = Exception
-        cmd.announce = mock.Mock()
 
-        with pytest.raises(Exception):
+        with pytest.raises(RemovedCommandError):
             cmd.run()
-
-        cmd.announce.assert_called_with(
-            "WARNING: Registering is deprecated, use twine to upload instead "
-            "(https://pypi.org/p/twine/)",
-            log.WARN
-        )
diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 320c6959da..7586cb262d 100644
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -1,213 +1,22 @@
-import mock
-import os
-import re
-
-from distutils import log
-from distutils.errors import DistutilsError
-
-import pytest
-
 from setuptools.command.upload import upload
 from setuptools.dist import Distribution
-from setuptools.extern import six
-
-
-def _parse_upload_body(body):
-    boundary = u'\r\n----------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-    entries = []
-    name_re = re.compile(u'^Content-Disposition: form-data; name="([^\"]+)"')
-
-    for entry in body.split(boundary):
-        pair = entry.split(u'\r\n\r\n')
-        if not len(pair) == 2:
-            continue
-
-        key, value = map(six.text_type.strip, pair)
-        m = name_re.match(key)
-        if m is not None:
-            key = m.group(1)
-
-        entries.append((key, value))
-
-    return entries
-
-
-@pytest.fixture
-def patched_upload(tmpdir):
-    class Fix:
-        def __init__(self, cmd, urlopen):
-            self.cmd = cmd
-            self.urlopen = urlopen
-
-        def __iter__(self):
-            return iter((self.cmd, self.urlopen))
-
-        def get_uploaded_metadata(self):
-            request = self.urlopen.call_args_list[0][0][0]
-            body = request.data.decode('utf-8')
-            entries = dict(_parse_upload_body(body))
-
-            return entries
+from setuptools.errors import RemovedCommandError
 
-    class ResponseMock(mock.Mock):
-        def getheader(self, name, default=None):
-            """Mocked getheader method for response object"""
-            return {
-                'content-type': 'text/plain; charset=utf-8',
-            }.get(name.lower(), default)
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
-    with mock.patch('setuptools.command.upload.urlopen') as urlopen:
-        urlopen.return_value = ResponseMock()
-        urlopen.return_value.getcode.return_value = 200
-        urlopen.return_value.read.return_value = b''
-
-        content = os.path.join(str(tmpdir), "content_data")
-
-        with open(content, 'w') as f:
-            f.write("Some content")
-
-        dist = Distribution()
-        dist.dist_files = [('sdist', '3.7.0', content)]
-
-        cmd = upload(dist)
-        cmd.announce = mock.Mock()
-        cmd.username = 'user'
-        cmd.password = 'hunter2'
-
-        yield Fix(cmd, urlopen)
-
-
-class TestUploadTest:
-    def test_upload_metadata(self, patched_upload):
-        cmd, patch = patched_upload
-
-        # Set the metadata version to 2.1
-        cmd.distribution.metadata.metadata_version = '2.1'
-
-        # Run the command
-        cmd.ensure_finalized()
-        cmd.run()
-
-        # Make sure we did the upload
-        patch.assert_called_once()
-
-        # Make sure the metadata version is correct in the headers
-        entries = patched_upload.get_uploaded_metadata()
-        assert entries['metadata_version'] == '2.1'
-
-    def test_warns_deprecation(self):
-        dist = Distribution()
-        dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
-
-        cmd = upload(dist)
-        cmd.upload_file = mock.Mock()
-        cmd.announce = mock.Mock()
-
-        cmd.run()
+import pytest
 
-        cmd.announce.assert_called_once_with(
-            "WARNING: Uploading via this command is deprecated, use twine to "
-            "upload instead (https://pypi.org/p/twine/)",
-            log.WARN
-        )
 
-    def test_warns_deprecation_when_raising(self):
+class TestUpload:
+    def test_upload_exception(self):
+        """Ensure that the register command has been properly removed."""
         dist = Distribution()
         dist.dist_files = [(mock.Mock(), mock.Mock(), mock.Mock())]
 
         cmd = upload(dist)
-        cmd.upload_file = mock.Mock()
-        cmd.upload_file.side_effect = Exception
-        cmd.announce = mock.Mock()
-
-        with pytest.raises(Exception):
-            cmd.run()
-
-        cmd.announce.assert_called_once_with(
-            "WARNING: Uploading via this command is deprecated, use twine to "
-            "upload instead (https://pypi.org/p/twine/)",
-            log.WARN
-        )
-
-    @pytest.mark.parametrize('url', [
-        'https://example.com/a;parameter',    # Has parameters
-        'https://example.com/a?query',        # Has query
-        'https://example.com/a#fragment',     # Has fragment
-        'ftp://example.com',                  # Invalid scheme
-
-    ])
-    def test_upload_file_invalid_url(self, url, patched_upload):
-        patched_upload.urlopen.side_effect = Exception("Should not be reached")
-
-        cmd = patched_upload.cmd
-        cmd.repository = url
-
-        cmd.ensure_finalized()
-        with pytest.raises(AssertionError):
-            cmd.run()
-
-    def test_upload_file_http_error(self, patched_upload):
-        patched_upload.urlopen.side_effect = six.moves.urllib.error.HTTPError(
-            'https://example.com',
-            404,
-            'File not found',
-            None,
-            None
-        )
-
-        cmd = patched_upload.cmd
-        cmd.ensure_finalized()
 
-        with pytest.raises(DistutilsError):
+        with pytest.raises(RemovedCommandError):
             cmd.run()
-
-        cmd.announce.assert_any_call(
-            'Upload failed (404): File not found',
-            log.ERROR)
-
-    def test_upload_file_os_error(self, patched_upload):
-        patched_upload.urlopen.side_effect = OSError("Invalid")
-
-        cmd = patched_upload.cmd
-        cmd.ensure_finalized()
-
-        with pytest.raises(OSError):
-            cmd.run()
-
-        cmd.announce.assert_any_call('Invalid', log.ERROR)
-
-    @mock.patch('setuptools.command.upload.spawn')
-    def test_upload_file_gpg(self, spawn, patched_upload):
-        cmd, urlopen = patched_upload
-
-        cmd.sign = True
-        cmd.identity = "Alice"
-        cmd.dry_run = True
-        content_fname = cmd.distribution.dist_files[0][2]
-        signed_file = content_fname + '.asc'
-
-        with open(signed_file, 'wb') as f:
-            f.write("signed-data".encode('utf-8'))
-
-        cmd.ensure_finalized()
-        cmd.run()
-
-        # Make sure that GPG was called
-        spawn.assert_called_once_with([
-            "gpg", "--detach-sign", "--local-user", "Alice", "-a",
-            content_fname
-        ], dry_run=True)
-
-        # Read the 'signed' data that was transmitted
-        entries = patched_upload.get_uploaded_metadata()
-        assert entries['gpg_signature'] == 'signed-data'
-
-    def test_show_response_no_error(self, patched_upload):
-        # This test is just that show_response doesn't throw an error
-        # It is not really important what the printed response looks like
-        # in a deprecated command, but we don't want to introduce new
-        # errors when importing this function from distutils
-
-        patched_upload.cmd.show_response = True
-        patched_upload.cmd.ensure_finalized()
-        patched_upload.cmd.run()

From 14c82188dae748fb7a7dd126fb2a5553e4865c95 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 8 Oct 2019 12:18:31 +0200
Subject: [PATCH 7591/8469] test: drop pkg_resources tests dependency on
 easy_install

---
 .../data/my-test-package-source/setup.cfg     |   0
 .../data/my-test-package-source/setup.py      |   6 ++
 .../EGG-INFO/PKG-INFO                         |  10 +++
 .../EGG-INFO/SOURCES.txt                      |   7 +++
 .../EGG-INFO/dependency_links.txt             |   1 +
 .../EGG-INFO/top_level.txt                    |   1 +
 .../EGG-INFO/zip-safe                         |   1 +
 .../my_test_package-1.0-py3.7.egg             | Bin 0 -> 843 bytes
 .../tests/test_find_distributions.py          |  58 ++++--------------
 pytest.ini                                    |   2 +-
 10 files changed, 40 insertions(+), 46 deletions(-)
 create mode 100644 pkg_resources/tests/data/my-test-package-source/setup.cfg
 create mode 100644 pkg_resources/tests/data/my-test-package-source/setup.py
 create mode 100644 pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO
 create mode 100644 pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt
 create mode 100644 pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt
 create mode 100644 pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt
 create mode 100644 pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe
 create mode 100644 pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg

diff --git a/pkg_resources/tests/data/my-test-package-source/setup.cfg b/pkg_resources/tests/data/my-test-package-source/setup.cfg
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pkg_resources/tests/data/my-test-package-source/setup.py b/pkg_resources/tests/data/my-test-package-source/setup.py
new file mode 100644
index 0000000000..fe80d28f46
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package-source/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+setuptools.setup(
+    name="my-test-package",
+    version="1.0",
+    zip_safe=True,
+)
diff --git a/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO
new file mode 100644
index 0000000000..7328e3f7d1
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: my-test-package
+Version: 1.0
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt
new file mode 100644
index 0000000000..3c4ee1676d
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt
@@ -0,0 +1,7 @@
+setup.cfg
+setup.py
+my_test_package.egg-info/PKG-INFO
+my_test_package.egg-info/SOURCES.txt
+my_test_package.egg-info/dependency_links.txt
+my_test_package.egg-info/top_level.txt
+my_test_package.egg-info/zip-safe
\ No newline at end of file
diff --git a/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt
@@ -0,0 +1 @@
+
diff --git a/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe
@@ -0,0 +1 @@
+
diff --git a/pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg b/pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg
new file mode 100644
index 0000000000000000000000000000000000000000..5115b8957da8213d02b718649c8702ac88bf0e72
GIT binary patch
literal 843
zcmWIWW@Zs#U|`^2n5Zq`&m4DbLIsew8;Avg*wx)#*VE6<Uq8Sb!uaf~>*?dE<9UVG
zTUYDcne&^246YbI_~d=YcWcmzwO4dKb@eXldib34^YMS`6etukYxeAjkj$k5ub#hs
zF8}WM(~0wEbA`;B*CkM-qkHm%zSHy9%buyFJyUS0HJTj!xohH<olC^j#Z$$mG`wx%
zWP74AZOK#dr%Emi0VvMwRIC1(26Wy9AO<-e?#y8S&>&~mV7-!xlG;;_T+IdotQYo{
zdscNMxpHZVUROLaU%=<_fu5xwzcf|f-Fr0ogxjs30UtHBu5OoL>{fg&CcQwgsq5zY
z{)cy0Y^(lyJ^9V@^PA<i{&{M3R^f@{P0`6oaX;!#d#OEaFS-BCqigMPMpSoAX1i|0
z40I185X&OFD<!ocH7_MKFS#;4Co?a*805gmOlZDB)-8styClCLJ}0#-HHV-!lsK!(
zEYK}ZOiKk@#K<JVj60rzwt+!IBZz_rCoI+jyiv8Ihd)F!14BdOa%AmDv4L&^vR^?V
z1p^I@_Q1e{I{;g_;WG*pY%tK!Sc_~FN+9Ah0~CfZ(9pOA*$h~S26(fwft0WUp+8W;
JGazPQ006C8>E-|c

literal 0
HcmV?d00001

diff --git a/pkg_resources/tests/test_find_distributions.py b/pkg_resources/tests/test_find_distributions.py
index d735c5902f..f9594422f2 100644
--- a/pkg_resources/tests/test_find_distributions.py
+++ b/pkg_resources/tests/test_find_distributions.py
@@ -1,17 +1,9 @@
-import subprocess
-import sys
-
+import py
 import pytest
 import pkg_resources
 
-SETUP_TEMPLATE = """
-import setuptools
-setuptools.setup(
-    name="my-test-package",
-    version="1.0",
-    zip_safe=True,
-)
-""".lstrip()
+
+TESTS_DATA_DIR = py.path.local(__file__).dirpath('data')
 
 
 class TestFindDistributions:
@@ -21,46 +13,22 @@ def target_dir(self, tmpdir):
         target_dir = tmpdir.mkdir('target')
         # place a .egg named directory in the target that is not an egg:
         target_dir.mkdir('not.an.egg')
-        return str(target_dir)
-
-    @pytest.fixture
-    def project_dir(self, tmpdir):
-        project_dir = tmpdir.mkdir('my-test-package')
-        (project_dir / "setup.py").write(SETUP_TEMPLATE)
-        return str(project_dir)
+        return target_dir
 
     def test_non_egg_dir_named_egg(self, target_dir):
-        dists = pkg_resources.find_distributions(target_dir)
+        dists = pkg_resources.find_distributions(str(target_dir))
         assert not list(dists)
 
-    def test_standalone_egg_directory(self, project_dir, target_dir):
-        # install this distro as an unpacked egg:
-        args = [
-            sys.executable,
-            '-c', 'from setuptools.command.easy_install import main; main()',
-            '-mNx',
-            '-d', target_dir,
-            '--always-unzip',
-            project_dir,
-        ]
-        subprocess.check_call(args)
-        dists = pkg_resources.find_distributions(target_dir)
+    def test_standalone_egg_directory(self, target_dir):
+        (TESTS_DATA_DIR / 'my-test-package_unpacked-egg').copy(target_dir)
+        dists = pkg_resources.find_distributions(str(target_dir))
         assert [dist.project_name for dist in dists] == ['my-test-package']
-        dists = pkg_resources.find_distributions(target_dir, only=True)
+        dists = pkg_resources.find_distributions(str(target_dir), only=True)
         assert not list(dists)
 
-    def test_zipped_egg(self, project_dir, target_dir):
-        # install this distro as an unpacked egg:
-        args = [
-            sys.executable,
-            '-c', 'from setuptools.command.easy_install import main; main()',
-            '-mNx',
-            '-d', target_dir,
-            '--zip-ok',
-            project_dir,
-        ]
-        subprocess.check_call(args)
-        dists = pkg_resources.find_distributions(target_dir)
+    def test_zipped_egg(self, target_dir):
+        (TESTS_DATA_DIR / 'my-test-package_zipped-egg').copy(target_dir)
+        dists = pkg_resources.find_distributions(str(target_dir))
         assert [dist.project_name for dist in dists] == ['my-test-package']
-        dists = pkg_resources.find_distributions(target_dir, only=True)
+        dists = pkg_resources.find_distributions(str(target_dir), only=True)
         assert not list(dists)
diff --git a/pytest.ini b/pytest.ini
index 5886973bad..0bc1ec0114 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern tools .*
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .*
 flake8-ignore =
     setuptools/site-patch.py F821
     setuptools/py*compat.py F811

From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?=
 <mimi1vx@users.noreply.github.com>
Date: Fri, 15 Nov 2019 08:52:35 +0100
Subject: [PATCH 7592/8469] Fix _imp module behaviour if is defined paths in
 find_spec call

fixes #1896
---
 setuptools/_imp.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index a3cce9b284..6ccec57993 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -19,7 +19,10 @@
 
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if spec is None:
         raise ImportError("Can't find %s" % module)
     if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
@@ -60,14 +63,20 @@ def find_module(module, paths=None):
 
 
 def get_frozen_object(module, paths=None):
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return spec.loader.get_code(module)
 
 
 def get_module(module, paths, info):
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return module_from_spec(spec)

From fed59d837495208c13cec64b5394cdd2cc3cb6de Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 14 Nov 2019 19:09:20 +0100
Subject: [PATCH 7593/8469] tests: fix some pytest warnings under Python 2

---
 setuptools/tests/test_integration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 1c0b2b18bb..f1a27f8be8 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -64,7 +64,7 @@ def fin():
     monkeypatch.setattr('site.USER_BASE', user_base.strpath)
     monkeypatch.setattr('site.USER_SITE', user_site.strpath)
     monkeypatch.setattr('sys.path', sys.path + [install_dir.strpath])
-    monkeypatch.setenv('PYTHONPATH', os.path.pathsep.join(sys.path))
+    monkeypatch.setenv(str('PYTHONPATH'), str(os.path.pathsep.join(sys.path)))
 
     # Set up the command for performing the installation.
     dist = Distribution()

From 77fa2369892b7e45ede9cad18aaa3f0721c96cc3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 15 Nov 2019 19:06:26 +0100
Subject: [PATCH 7594/8469] tweak workaround for #1644

Work around buggy pip detection code for "pip.exe install/update pip ...".
---
 tools/tox_pip.py | 11 ++++++++++-
 tox.ini          |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 1117f99653..5aeca80503 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -17,12 +17,21 @@ def pip(args):
                                'pip'])
         shutil.rmtree(glob(os.path.join(TOX_PIP_DIR, 'pip-*.dist-info'))[0])
     # And use that version.
+    pypath = os.environ.get('PYTHONPATH')
+    pypath = pypath.split(os.pathsep) if pypath is not None else []
+    pypath.insert(0, TOX_PIP_DIR)
+    os.environ['PYTHONPATH'] = os.pathsep.join(pypath)
+    # Disable PEP 517 support when using editable installs.
     for n, a in enumerate(args):
         if not a.startswith('-'):
             if a in 'install' and '-e' in args[n:]:
                 args.insert(n + 1, '--no-use-pep517')
             break
-    subprocess.check_call([sys.executable, os.path.join(TOX_PIP_DIR, 'pip')] + args)
+    # Fix call for setuptools editable install.
+    for n, a in enumerate(args):
+        if a == '.':
+            args[n] = os.getcwd()
+    subprocess.check_call([sys.executable, '-m', 'pip'] + args, cwd=TOX_PIP_DIR)
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index 8b34c235c9..5d439cb34b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ envlist=python
 pip = python {toxinidir}/tools/tox_pip.py
 
 [testenv]
-deps=-rtests/requirements.txt
+deps=-r{toxinidir}/tests/requirements.txt
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}

From d6948c636f5e657ac56911b71b7a459d326d8389 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 29 Apr 2018 19:47:42 +0200
Subject: [PATCH 7595/8469] dist: re-implement `fetch_build_egg` to use pip

---
 docs/setuptools.txt                   |  17 +--
 setuptools/dist.py                    |  28 +---
 setuptools/installer.py               | 129 +++++++++++++++++
 setuptools/tests/server.py            |  19 ++-
 setuptools/tests/test_easy_install.py | 197 +++++++++++++++++++++-----
 setuptools/tests/test_virtualenv.py   |  18 ++-
 tests/requirements.txt                |   1 +
 7 files changed, 336 insertions(+), 73 deletions(-)
 create mode 100644 setuptools/installer.py

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 399a56d3ca..9c8821dc81 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -282,10 +282,11 @@ unless you need the associated ``setuptools`` feature.
 ``setup_requires``
     A string or list of strings specifying what other distributions need to
     be present in order for the *setup script* to run.  ``setuptools`` will
-    attempt to obtain these before processing the rest of the setup script or
-    commands.  This argument is needed if you are using distutils extensions as
-    part of your build process; for example, extensions that process setup()
-    arguments and turn them into EGG-INFO metadata files.
+    attempt to obtain these (using pip if available) before processing the
+    rest of the setup script or commands.  This argument is needed if you
+    are using distutils extensions as part of your build process; for
+    example, extensions that process setup() arguments and turn them into
+    EGG-INFO metadata files.
 
     (Note: projects listed in ``setup_requires`` will NOT be automatically
     installed on the system where the setup script is being run.  They are
@@ -332,10 +333,10 @@ unless you need the associated ``setuptools`` feature.
     needed to install it, you can use this option to specify them.  It should
     be a string or list of strings specifying what other distributions need to
     be present for the package's tests to run.  When you run the ``test``
-    command, ``setuptools`` will  attempt to obtain these.  Note that these
-    required projects will *not* be installed on the system where the tests
-    are run, but only downloaded to the project's setup directory if they're
-    not already installed locally.
+    command, ``setuptools`` will  attempt to obtain these (using pip if
+    available).  Note that these required projects will *not* be installed on
+    the system where the tests are run, but only downloaded to the project's setup
+    directory if they're not already installed locally.
 
     New in 41.5.0: Deprecated the test command.
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2e5ad4bd68..4a76b52beb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -759,32 +759,8 @@ def get_egg_cache_dir(self):
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
-        from setuptools.command.easy_install import easy_install
-        dist = self.__class__({'script_args': ['easy_install']})
-        opts = dist.get_option_dict('easy_install')
-        opts.clear()
-        opts.update(
-            (k, v)
-            for k, v in self.get_option_dict('easy_install').items()
-            if k in (
-                # don't use any other settings
-                'find_links', 'site_dirs', 'index_url',
-                'optimize', 'site_dirs', 'allow_hosts',
-            ))
-        if self.dependency_links:
-            links = self.dependency_links[:]
-            if 'find_links' in opts:
-                links = opts['find_links'][1] + links
-            opts['find_links'] = ('setup', links)
-        install_dir = self.get_egg_cache_dir()
-        cmd = easy_install(
-            dist, args=["x"], install_dir=install_dir,
-            exclude_scripts=True,
-            always_copy=False, build_directory=None, editable=False,
-            upgrade=False, multi_version=True, no_report=True, user=False
-        )
-        cmd.ensure_finalized()
-        return cmd.easy_install(req)
+        from setuptools.installer import fetch_build_egg
+        return fetch_build_egg(self, req)
 
     def _set_global_opts_from_features(self):
         """Add --with-X/--without-X options based on optional features"""
diff --git a/setuptools/installer.py b/setuptools/installer.py
new file mode 100644
index 0000000000..35bc3cc550
--- /dev/null
+++ b/setuptools/installer.py
@@ -0,0 +1,129 @@
+import glob
+import os
+import subprocess
+import sys
+from distutils import log
+from distutils.errors import DistutilsError
+
+import pkg_resources
+from setuptools.command.easy_install import easy_install
+from setuptools.wheel import Wheel
+
+from .py31compat import TemporaryDirectory
+
+
+def _legacy_fetch_build_egg(dist, req):
+    """Fetch an egg needed for building.
+
+    Legacy path using EasyInstall.
+    """
+    tmp_dist = dist.__class__({'script_args': ['easy_install']})
+    opts = tmp_dist.get_option_dict('easy_install')
+    opts.clear()
+    opts.update(
+        (k, v)
+        for k, v in dist.get_option_dict('easy_install').items()
+        if k in (
+            # don't use any other settings
+            'find_links', 'site_dirs', 'index_url',
+            'optimize', 'site_dirs', 'allow_hosts',
+        ))
+    if dist.dependency_links:
+        links = dist.dependency_links[:]
+        if 'find_links' in opts:
+            links = opts['find_links'][1] + links
+        opts['find_links'] = ('setup', links)
+    install_dir = dist.get_egg_cache_dir()
+    cmd = easy_install(
+        tmp_dist, args=["x"], install_dir=install_dir,
+        exclude_scripts=True,
+        always_copy=False, build_directory=None, editable=False,
+        upgrade=False, multi_version=True, no_report=True, user=False
+    )
+    cmd.ensure_finalized()
+    return cmd.easy_install(req)
+
+
+def fetch_build_egg(dist, req):
+    """Fetch an egg needed for building.
+
+    Use pip/wheel to fetch/build a wheel."""
+    # Check pip is available.
+    try:
+        pkg_resources.get_distribution('pip')
+    except pkg_resources.DistributionNotFound:
+        dist.announce(
+            'WARNING: The pip package is not available, falling back '
+            'to EasyInstall for handling setup_requires/test_requires; '
+            'this is deprecated and will be removed in a future version.'
+            , log.WARN
+        )
+        return _legacy_fetch_build_egg(dist, req)
+    # Warn if wheel is not.
+    try:
+        pkg_resources.get_distribution('wheel')
+    except pkg_resources.DistributionNotFound:
+        dist.announce('WARNING: The wheel package is not available.', log.WARN)
+    if not isinstance(req, pkg_resources.Requirement):
+        req = pkg_resources.Requirement.parse(req)
+    # Take easy_install options into account, but do not override relevant
+    # pip environment variables (like PIP_INDEX_URL or PIP_QUIET); they'll
+    # take precedence.
+    opts = dist.get_option_dict('easy_install')
+    if 'allow_hosts' in opts:
+        raise DistutilsError('the `allow-hosts` option is not supported '
+                             'when using pip to install requirements.')
+    if 'PIP_QUIET' in os.environ or 'PIP_VERBOSE' in os.environ:
+        quiet = False
+    else:
+        quiet = True
+    if 'PIP_INDEX_URL' in os.environ:
+        index_url = None
+    elif 'index_url' in opts:
+        index_url = opts['index_url'][1]
+    else:
+        index_url = None
+    if 'find_links' in opts:
+        find_links = opts['find_links'][1][:]
+    else:
+        find_links = []
+    if dist.dependency_links:
+        find_links.extend(dist.dependency_links)
+    eggs_dir = os.path.realpath(dist.get_egg_cache_dir())
+    environment = pkg_resources.Environment()
+    for egg_dist in pkg_resources.find_distributions(eggs_dir):
+        if egg_dist in req and environment.can_add(egg_dist):
+            return egg_dist
+    with TemporaryDirectory() as tmpdir:
+        cmd = [
+            sys.executable, '-m', 'pip',
+            '--disable-pip-version-check',
+            'wheel', '--no-deps',
+            '-w', tmpdir,
+        ]
+        if quiet:
+            cmd.append('--quiet')
+        if index_url is not None:
+            cmd.extend(('--index-url', index_url))
+        if find_links is not None:
+            for link in find_links:
+                cmd.extend(('--find-links', link))
+        # If requirement is a PEP 508 direct URL, directly pass
+        # the URL to pip, as `req @ url` does not work on the
+        # command line.
+        if req.url:
+            cmd.append(req.url)
+        else:
+            cmd.append(str(req))
+        try:
+            subprocess.check_call(cmd)
+        except subprocess.CalledProcessError as e:
+            raise DistutilsError(str(e))
+        wheel = Wheel(glob.glob(os.path.join(tmpdir, '*.whl'))[0])
+        dist_location = os.path.join(eggs_dir, wheel.egg_name())
+        wheel.install_as_egg(dist_location)
+        dist_metadata = pkg_resources.PathMetadata(
+            dist_location, os.path.join(dist_location, 'EGG-INFO'))
+        dist = pkg_resources.Distribution.from_filename(
+            dist_location, metadata=dist_metadata)
+        return dist
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index fc3a5975ef..8b17b0816e 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -1,10 +1,13 @@
 """Basic http server for tests to simulate PyPI or custom indexes
 """
 
+import os
 import time
 import threading
 
 from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
+from setuptools.extern.six.moves.urllib_parse import urljoin
+from setuptools.extern.six.moves.urllib.request import pathname2url
 
 
 class IndexServer(BaseHTTPServer.HTTPServer):
@@ -69,6 +72,20 @@ def __init__(
     def run(self):
         self.serve_forever()
 
+    @property
+    def netloc(self):
+        return 'localhost:%s' % self.server_port
+
     @property
     def url(self):
-        return 'http://localhost:%(server_port)s/' % vars(self)
+        return 'http://%s/' % self.netloc
+
+
+def path_to_url(path, authority=None):
+    """ Convert a path to a file: URL. """
+    path = os.path.normpath(os.path.abspath(path))
+    base = 'file:'
+    if authority is not None:
+        base += '//' + authority
+    url = urljoin(base, pathname2url(path))
+    return url
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c3fd1c6ef4..aa75899a06 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,24 +15,24 @@
 import io
 import zipfile
 import mock
-from setuptools.command.easy_install import (
-    EasyInstallDeprecationWarning, ScriptWriter, WindowsScriptWriter,
-)
 import time
+
 from setuptools.extern import six
-from setuptools.extern.six.moves import urllib
 
 import pytest
 
 from setuptools import sandbox
 from setuptools.sandbox import run_setup
 import setuptools.command.easy_install as ei
-from setuptools.command.easy_install import PthDistributions
+from setuptools.command.easy_install import (
+    EasyInstallDeprecationWarning, ScriptWriter, PthDistributions,
+    WindowsScriptWriter,
+)
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 from pkg_resources import normalize_path, working_set
 from pkg_resources import Distribution as PRDistribution
-import setuptools.tests.server
+from setuptools.tests.server import MockServer, path_to_url
 from setuptools.tests import fail_on_ascii
 import pkg_resources
 
@@ -440,35 +440,40 @@ def distutils_package():
         yield
 
 
+@pytest.fixture
+def mock_index():
+    # set up a server which will simulate an alternate package index.
+    p_index = MockServer()
+    if p_index.server_port == 0:
+        # Some platforms (Jython) don't find a port to which to bind,
+        # so skip test for them.
+        pytest.skip("could not find a valid port")
+    p_index.start()
+    return p_index
+
+
 class TestDistutilsPackage:
     def test_bdist_egg_available_on_distutils_pkg(self, distutils_package):
         run_setup('setup.py', ['bdist_egg'])
 
 
 class TestSetupRequires:
-    def test_setup_requires_honors_fetch_params(self):
+
+    def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
         """
         When easy_install installs a source distribution which specifies
         setup_requires, it should honor the fetch parameters (such as
-        allow-hosts, index-url, and find-links).
+        index-url, and find-links).
         """
-        # set up a server which will simulate an alternate package index.
-        p_index = setuptools.tests.server.MockServer()
-        p_index.start()
-        netloc = 1
-        p_index_loc = urllib.parse.urlparse(p_index.url)[netloc]
-        if p_index_loc.endswith(':0'):
-            # Some platforms (Jython) don't find a port to which to bind,
-            #  so skip this test for them.
-            return
+        monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+        monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
         with contexts.quiet():
             # create an sdist that has a build-time dependency.
             with TestSetupRequires.create_sdist() as dist_file:
                 with contexts.tempdir() as temp_install_dir:
                     with contexts.environment(PYTHONPATH=temp_install_dir):
                         ei_params = [
-                            '--index-url', p_index.url,
-                            '--allow-hosts', p_index_loc,
+                            '--index-url', mock_index.url,
                             '--exclude-scripts',
                             '--install-dir', temp_install_dir,
                             dist_file,
@@ -478,10 +483,8 @@ def test_setup_requires_honors_fetch_params(self):
                             # fail because it doesn't exist.
                             with pytest.raises(SystemExit):
                                 easy_install_pkg.main(ei_params)
-        # there should have been two or three requests to the server
-        #  (three happens on Python 3.3a)
-        assert 2 <= len(p_index.requests) <= 3
-        assert p_index.requests[0].path == '/does-not-exist/'
+        # there should have been one requests to the server
+        assert [r.path for r in mock_index.requests] == ['/does-not-exist/']
 
     @staticmethod
     @contextlib.contextmanager
@@ -500,7 +503,9 @@ def create_sdist():
                         version="1.0",
                         setup_requires = ['does-not-exist'],
                     )
-                """))])
+                """)),
+                ('setup.cfg', ''),
+            ])
             yield dist_path
 
     use_setup_cfg = (
@@ -632,6 +637,113 @@ def make_dependency_sdist(dist_path, distname, version):
                 assert len(lines) > 0
                 assert lines[-1].strip() == '42'
 
+    def test_setup_requires_honors_pip_env(self, mock_index, monkeypatch):
+        monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+        monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        monkeypatch.setenv(str('PIP_INDEX_URL'), mock_index.url)
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                test_pkg = create_setup_requires_package(
+                    temp_dir, 'python-xlib', '0.19',
+                    setup_attrs=dict(dependency_links=[]))
+                test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+                with open(test_setup_cfg, 'w') as fp:
+                    fp.write(DALS(
+                        '''
+                        [easy_install]
+                        index_url = https://pypi.org/legacy/
+                        '''))
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                with pytest.raises(distutils.errors.DistutilsError):
+                    run_setup(test_setup_py, [str('--version')])
+        assert len(mock_index.requests) == 1
+        assert mock_index.requests[0].path == '/python-xlib/'
+
+    def test_setup_requires_with_pep508_url(self, mock_index, monkeypatch):
+        monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+        monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        monkeypatch.setenv(str('PIP_INDEX_URL'), mock_index.url)
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                dep_sdist = os.path.join(temp_dir, 'dep.tar.gz')
+                make_trivial_sdist(dep_sdist, 'dependency', '42')
+                dep_url = path_to_url(dep_sdist, authority='localhost')
+                test_pkg = create_setup_requires_package(
+                    temp_dir,
+                    'python-xlib', '0.19', # Ignored (overriden by setup_attrs).
+                    setup_attrs=dict(setup_requires='dependency @ %s' % dep_url))
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                run_setup(test_setup_py, [str('--version')])
+        assert len(mock_index.requests) == 0
+
+    def test_setup_requires_with_allow_hosts(self, mock_index):
+        ''' The `allow-hosts` option in not supported anymore. '''
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                test_pkg = os.path.join(temp_dir, 'test_pkg')
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+                os.mkdir(test_pkg)
+                with open(test_setup_py, 'w') as fp:
+                    fp.write(DALS(
+                        '''
+                        from setuptools import setup
+                        setup(setup_requires='python-xlib')
+                        '''))
+                with open(test_setup_cfg, 'w') as fp:
+                    fp.write(DALS(
+                        '''
+                        [easy_install]
+                        allow_hosts = *
+                        '''))
+                with pytest.raises(distutils.errors.DistutilsError):
+                    run_setup(test_setup_py, [str('--version')])
+        assert len(mock_index.requests) == 0
+
+    def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
+        ''' Check `python_requires` is honored. '''
+        monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+        monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        monkeypatch.setenv(str('PIP_NO_INDEX'), str('1'))
+        monkeypatch.setenv(str('PIP_VERBOSE'), str('1'))
+        dep_1_0_sdist = 'dep-1.0.tar.gz'
+        dep_1_0_url = path_to_url(str(tmpdir / dep_1_0_sdist))
+        dep_1_0_python_requires = '>=2.7'
+        make_python_requires_sdist(str(tmpdir / dep_1_0_sdist), 'dep', '1.0', dep_1_0_python_requires)
+        dep_2_0_sdist = 'dep-2.0.tar.gz'
+        dep_2_0_url = path_to_url(str(tmpdir / dep_2_0_sdist))
+        dep_2_0_python_requires = '!=' + '.'.join(map(str, sys.version_info[:2])) + '.*'
+        make_python_requires_sdist(str(tmpdir / dep_2_0_sdist), 'dep', '2.0', dep_2_0_python_requires)
+        index = tmpdir / 'index.html'
+        index.write_text(DALS(
+            '''
+            <!DOCTYPE html>
+            <html><head><title>Links for dep</title></head>
+            <body>
+                <h1>Links for dep</h1>
+                <a href="{dep_1_0_url}" data-requires-python="{dep_1_0_python_requires}">{dep_1_0_sdist}</a><br/>
+                <a href="{dep_2_0_url}" data-requires-python="{dep_2_0_python_requires}">{dep_2_0_sdist}</a><br/>
+            </body>
+            </html>
+            ''').format(
+                dep_1_0_url=dep_1_0_url,
+                dep_1_0_sdist=dep_1_0_sdist,
+                dep_1_0_python_requires=dep_1_0_python_requires,
+                dep_2_0_url=dep_2_0_url,
+                dep_2_0_sdist=dep_2_0_sdist,
+                dep_2_0_python_requires=dep_2_0_python_requires,
+            ), 'utf-8')
+        index_url = path_to_url(str(index))
+        with contexts.save_pkg_resources_state():
+            test_pkg = create_setup_requires_package(
+                str(tmpdir),
+                'python-xlib', '0.19', # Ignored (overriden by setup_attrs).
+                setup_attrs=dict(setup_requires='dep', dependency_links=[index_url]))
+            test_setup_py = os.path.join(test_pkg, 'setup.py')
+            run_setup(test_setup_py, [str('--version')])
+        eggs = list(map(str, pkg_resources.find_distributions(os.path.join(test_pkg, '.eggs'))))
+        assert eggs == ['dep 1.0']
+
 
 def make_trivial_sdist(dist_path, distname, version):
     """
@@ -647,7 +759,9 @@ def make_trivial_sdist(dist_path, distname, version):
                  name=%r,
                  version=%r
              )
-         """ % (distname, version)))])
+         """ % (distname, version))),
+        ('setup.cfg', ''),
+    ])
 
 
 def make_nspkg_sdist(dist_path, distname, version):
@@ -683,12 +797,29 @@ def make_nspkg_sdist(dist_path, distname, version):
     make_sdist(dist_path, files)
 
 
+def make_python_requires_sdist(dist_path, distname, version, python_requires):
+    make_sdist(dist_path, [
+        ('setup.py', DALS("""\
+                          import setuptools
+                          setuptools.setup(
+                              name={name!r},
+                              version={version!r},
+                              python_requires={python_requires!r},
+                          )
+                          """).format(name=distname, version=version,
+                                      python_requires=python_requires)),
+         ('setup.cfg', ''),
+    ])
+
+
 def make_sdist(dist_path, files):
     """
     Create a simple sdist tarball at dist_path, containing the files
     listed in ``files`` as ``(filename, content)`` tuples.
     """
 
+    # Distributions with only one file don't play well with pip.
+    assert len(files) > 1
     with tarfile.open(dist_path, 'w:gz') as dist:
         for filename, content in files:
             file_bytes = io.BytesIO(content.encode('utf-8'))
@@ -721,8 +852,8 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
     test_pkg = os.path.join(path, 'test_pkg')
     os.mkdir(test_pkg)
 
+    # setup.cfg
     if use_setup_cfg:
-        test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
         options = []
         metadata = []
         for name in use_setup_cfg:
@@ -734,8 +865,7 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
             if isinstance(value, (tuple, list)):
                 value = ';'.join(value)
             section.append('%s: %s' % (name, value))
-        with open(test_setup_cfg, 'w') as f:
-            f.write(DALS(
+        test_setup_cfg_contents = DALS(
                 """
                 [metadata]
                 {metadata}
@@ -745,16 +875,19 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
             ).format(
                 options='\n'.join(options),
                 metadata='\n'.join(metadata),
-            ))
-
-    test_setup_py = os.path.join(test_pkg, 'setup.py')
+            )
+    else:
+        test_setup_cfg_contents = ''
+    with open(os.path.join(test_pkg, 'setup.cfg'), 'w') as f:
+        f.write(test_setup_cfg_contents)
 
+    # setup.py
     if setup_py_template is None:
         setup_py_template = DALS("""\
             import setuptools
             setuptools.setup(**%r)
         """)
-    with open(test_setup_py, 'w') as f:
+    with open(os.path.join(test_pkg, 'setup.py'), 'w') as f:
         f.write(setup_py_template % test_setup_attrs)
 
     foobar_path = os.path.join(path, '%s-%s.tar.gz' % (distname, version))
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 74a1284ce7..cd3d9313c3 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -121,14 +121,12 @@ def test_pip_upgrade_from_source(pip_version, virtualenv):
     virtualenv.run('pip install --no-cache-dir --upgrade ' + sdist)
 
 
-def test_test_command_install_requirements(bare_virtualenv, tmpdir):
+def _check_test_command_install_requirements(virtualenv, tmpdir):
     """
     Check the test command will install all required dependencies.
     """
-    bare_virtualenv.run(' && '.join((
-        'cd {source}',
-        'python setup.py develop',
-    )).format(source=SOURCE_DIR))
+    # Install setuptools.
+    virtualenv.run('python setup.py develop', cd=SOURCE_DIR)
 
     def sdist(distname, version):
         dist_path = tmpdir.join('%s-%s.tar.gz' % (distname, version))
@@ -179,12 +177,20 @@ def sdist(distname, version):
             open('success', 'w').close()
             '''))
     # Run test command for test package.
-    bare_virtualenv.run(' && '.join((
+    virtualenv.run(' && '.join((
         'cd {tmpdir}',
         'python setup.py test -s test',
     )).format(tmpdir=tmpdir))
     assert tmpdir.join('success').check()
 
+def test_test_command_install_requirements(virtualenv, tmpdir):
+    # Ensure pip/wheel packages are installed.
+    virtualenv.run("python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
+    _check_test_command_install_requirements(virtualenv, tmpdir)
+
+def test_test_command_install_requirements_when_using_easy_install(bare_virtualenv, tmpdir):
+    _check_test_command_install_requirements(bare_virtualenv, tmpdir)
+
 
 def test_no_missing_dependencies(bare_virtualenv):
     """
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 1f70adee0a..1f8bd19d8c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -9,3 +9,4 @@ coverage>=4.5.1
 pytest-cov>=2.5.1
 paver; python_version>="3.6"
 futures; python_version=="2.7"
+pip>=19.1 # For proper file:// URLs support.

From 6e1838a9fb5feb000ba9b6a3c37c8b39d7e872b3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 14 Nov 2019 21:51:33 +0100
Subject: [PATCH 7596/8469] drop easy_install script and associated
 documentation

---
 docs/easy_install.txt                 | 1085 -------------------------
 docs/index.txt                        |    1 -
 easy_install.py                       |    5 -
 setup.cfg                             |    1 -
 setup.py                              |   19 -
 setuptools/command/easy_install.py    |   55 +-
 setuptools/tests/test_easy_install.py |   34 +-
 setuptools/tests/test_namespaces.py   |    5 +-
 8 files changed, 21 insertions(+), 1184 deletions(-)
 delete mode 100644 docs/easy_install.txt
 delete mode 100644 easy_install.py

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
deleted file mode 100644
index 544b9efd59..0000000000
--- a/docs/easy_install.txt
+++ /dev/null
@@ -1,1085 +0,0 @@
-============
-Easy Install
-============
-
-.. warning::
-    Easy Install is deprecated. Do not use it. Instead use pip. If
-    you think you need Easy Install, please reach out to the PyPA
-    team (a ticket to pip or setuptools is fine), describing your
-    use-case.
-
-Easy Install is a python module (``easy_install``) bundled with ``setuptools``
-that lets you automatically download, build, install, and manage Python
-packages.
-
-Please share your experiences with us! If you encounter difficulty installing
-a package, please contact us via the `distutils mailing list
-<http://mail.python.org/pipermail/distutils-sig/>`_.  (Note: please DO NOT send
-private email directly to the author of setuptools; it will be discarded.  The
-mailing list is a searchable archive of previously-asked and answered
-questions; you should begin your research there before reporting something as a
-bug -- and then do so via list discussion first.)
-
-(Also, if you'd like to learn about how you can use ``setuptools`` to make your
-own packages work better with EasyInstall, or provide EasyInstall-like features
-without requiring your users to use EasyInstall directly, you'll probably want
-to check out the full documentation as well.)
-
-.. contents:: **Table of Contents**
-
-
-Using "Easy Install"
-====================
-
-
-.. _installation instructions:
-
-Installing "Easy Install"
--------------------------
-
-Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
-for download links and basic installation instructions for each of the
-supported platforms.
-
-You will need at least Python 3.4 or 2.7.  An ``easy_install`` script will be
-installed in the normal location for Python scripts on your platform.
-
-Note that the instructions on the setuptools PyPI page assume that you are
-are installing to Python's primary ``site-packages`` directory.  If this is
-not the case, you should consult the section below on `Custom Installation
-Locations`_ before installing.  (And, on Windows, you should not use the
-``.exe`` installer when installing to an alternate location.)
-
-Note that ``easy_install`` normally works by downloading files from the
-internet.  If you are behind an NTLM-based firewall that prevents Python
-programs from accessing the net directly, you may wish to first install and use
-the `APS proxy server <http://ntlmaps.sf.net/>`_, which lets you get past such
-firewalls in the same way that your web browser(s) do.
-
-(Alternately, if you do not wish easy_install to actually download anything, you
-can restrict it from doing so with the ``--allow-hosts`` option; see the
-sections on `restricting downloads with --allow-hosts`_ and `command-line
-options`_ for more details.)
-
-
-Troubleshooting
-~~~~~~~~~~~~~~~
-
-If EasyInstall/setuptools appears to install correctly, and you can run the
-``easy_install`` command but it fails with an ``ImportError``, the most likely
-cause is that you installed to a location other than ``site-packages``,
-without taking any of the steps described in the `Custom Installation
-Locations`_ section below.  Please see that section and follow the steps to
-make sure that your custom location will work correctly.  Then re-install.
-
-Similarly, if you can run ``easy_install``, and it appears to be installing
-packages, but then you can't import them, the most likely issue is that you
-installed EasyInstall correctly but are using it to install packages to a
-non-standard location that hasn't been properly prepared.  Again, see the
-section on `Custom Installation Locations`_ for more details.
-
-
-Windows Notes
-~~~~~~~~~~~~~
-
-Installing setuptools will provide an ``easy_install`` command according to
-the techniques described in `Executables and Launchers`_. If the
-``easy_install`` command is not available after installation, that section
-provides details on how to configure Windows to make the commands available.
-
-
-Downloading and Installing a Package
-------------------------------------
-
-For basic use of ``easy_install``, you need only supply the filename or URL of
-a source distribution or .egg file (`Python Egg`__).
-
-__ http://peak.telecommunity.com/DevCenter/PythonEggs
-
-**Example 1**. Install a package by name, searching PyPI for the latest
-version, and automatically downloading, building, and installing it::
-
-    easy_install SQLObject
-
-**Example 2**. Install or upgrade a package by name and version by finding
-links on a given "download page"::
-
-    easy_install -f http://pythonpaste.org/package_index.html SQLObject
-
-**Example 3**. Download a source distribution from a specified URL,
-automatically building and installing it::
-
-    easy_install http://example.com/path/to/MyPackage-1.2.3.tgz
-
-**Example 4**. Install an already-downloaded .egg file::
-
-    easy_install /my_downloads/OtherPackage-3.2.1-py2.3.egg
-
-**Example 5**.  Upgrade an already-installed package to the latest version
-listed on PyPI::
-
-    easy_install --upgrade PyProtocols
-
-**Example 6**.  Install a source distribution that's already downloaded and
-extracted in the current directory (New in 0.5a9)::
-
-    easy_install .
-
-**Example 7**.  (New in 0.6a1) Find a source distribution or Subversion
-checkout URL for a package, and extract it or check it out to
-``~/projects/sqlobject`` (the name will always be in all-lowercase), where it
-can be examined or edited.  (The package will not be installed, but it can
-easily be installed with ``easy_install ~/projects/sqlobject``.  See `Editing
-and Viewing Source Packages`_ below for more info.)::
-
-    easy_install --editable --build-directory ~/projects SQLObject
-
-**Example 7**. (New in 0.6.11) Install a distribution within your home dir::
-
-    easy_install --user SQLAlchemy
-
-Easy Install accepts URLs, filenames, PyPI package names (i.e., ``distutils``
-"distribution" names), and package+version specifiers.  In each case, it will
-attempt to locate the latest available version that meets your criteria.
-
-When downloading or processing downloaded files, Easy Install recognizes
-distutils source distribution files with extensions of .tgz, .tar, .tar.gz,
-.tar.bz2, or .zip.  And of course it handles already-built .egg
-distributions as well as ``.win32.exe`` installers built using distutils.
-
-By default, packages are installed to the running Python installation's
-``site-packages`` directory, unless you provide the ``-d`` or ``--install-dir``
-option to specify an alternative directory, or specify an alternate location
-using distutils configuration files.  (See `Configuration Files`_, below.)
-
-By default, any scripts included with the package are installed to the running
-Python installation's standard script installation location.  However, if you
-specify an installation directory via the command line or a config file, then
-the default directory for installing scripts will be the same as the package
-installation directory, to ensure that the script will have access to the
-installed package.  You can override this using the ``-s`` or ``--script-dir``
-option.
-
-Installed packages are added to an ``easy-install.pth`` file in the install
-directory, so that Python will always use the most-recently-installed version
-of the package.  If you would like to be able to select which version to use at
-runtime, you should use the ``-m`` or ``--multi-version`` option.
-
-
-Upgrading a Package
--------------------
-
-You don't need to do anything special to upgrade a package: just install the
-new version, either by requesting a specific version, e.g.::
-
-    easy_install "SomePackage==2.0"
-
-a version greater than the one you have now::
-
-    easy_install "SomePackage>2.0"
-
-using the upgrade flag, to find the latest available version on PyPI::
-
-    easy_install --upgrade SomePackage
-
-or by using a download page, direct download URL, or package filename::
-
-    easy_install -f http://example.com/downloads ExamplePackage
-
-    easy_install http://example.com/downloads/ExamplePackage-2.0-py2.4.egg
-
-    easy_install my_downloads/ExamplePackage-2.0.tgz
-
-If you're using ``-m`` or ``--multi-version`` , using the ``require()``
-function at runtime automatically selects the newest installed version of a
-package that meets your version criteria.  So, installing a newer version is
-the only step needed to upgrade such packages.
-
-If you're installing to a directory on PYTHONPATH, or a configured "site"
-directory (and not using ``-m``), installing a package automatically replaces
-any previous version in the ``easy-install.pth`` file, so that Python will
-import the most-recently installed version by default.  So, again, installing
-the newer version is the only upgrade step needed.
-
-If you haven't suppressed script installation (using ``--exclude-scripts`` or
-``-x``), then the upgraded version's scripts will be installed, and they will
-be automatically patched to ``require()`` the corresponding version of the
-package, so that you can use them even if they are installed in multi-version
-mode.
-
-``easy_install`` never actually deletes packages (unless you're installing a
-package with the same name and version number as an existing package), so if
-you want to get rid of older versions of a package, please see `Uninstalling
-Packages`_, below.
-
-
-Changing the Active Version
----------------------------
-
-If you've upgraded a package, but need to revert to a previously-installed
-version, you can do so like this::
-
-    easy_install PackageName==1.2.3
-
-Where ``1.2.3`` is replaced by the exact version number you wish to switch to.
-If a package matching the requested name and version is not already installed
-in a directory on ``sys.path``, it will be located via PyPI and installed.
-
-If you'd like to switch to the latest installed version of ``PackageName``, you
-can do so like this::
-
-    easy_install PackageName
-
-This will activate the latest installed version.  (Note: if you have set any
-``find_links`` via distutils configuration files, those download pages will be
-checked for the latest available version of the package, and it will be
-downloaded and installed if it is newer than your current version.)
-
-Note that changing the active version of a package will install the newly
-active version's scripts, unless the ``--exclude-scripts`` or ``-x`` option is
-specified.
-
-
-Uninstalling Packages
----------------------
-
-If you have replaced a package with another version, then you can just delete
-the package(s) you don't need by deleting the PackageName-versioninfo.egg file
-or directory (found in the installation directory).
-
-If you want to delete the currently installed version of a package (or all
-versions of a package), you should first run::
-
-    easy_install -m PackageName
-
-This will ensure that Python doesn't continue to search for a package you're
-planning to remove. After you've done this, you can safely delete the .egg
-files or directories, along with any scripts you wish to remove.
-
-
-Managing Scripts
-----------------
-
-Whenever you install, upgrade, or change versions of a package, EasyInstall
-automatically installs the scripts for the selected package version, unless
-you tell it not to with ``-x`` or ``--exclude-scripts``.  If any scripts in
-the script directory have the same name, they are overwritten.
-
-Thus, you do not normally need to manually delete scripts for older versions of
-a package, unless the newer version of the package does not include a script
-of the same name.  However, if you are completely uninstalling a package, you
-may wish to manually delete its scripts.
-
-EasyInstall's default behavior means that you can normally only run scripts
-from one version of a package at a time.  If you want to keep multiple versions
-of a script available, however, you can simply use the ``--multi-version`` or
-``-m`` option, and rename the scripts that EasyInstall creates.  This works
-because EasyInstall installs scripts as short code stubs that ``require()`` the
-matching version of the package the script came from, so renaming the script
-has no effect on what it executes.
-
-For example, suppose you want to use two versions of the ``rst2html`` tool
-provided by the `docutils <http://docutils.sf.net/>`_ package.  You might
-first install one version::
-
-    easy_install -m docutils==0.3.9
-
-then rename the ``rst2html.py`` to ``r2h_039``, and install another version::
-
-    easy_install -m docutils==0.3.10
-
-This will create another ``rst2html.py`` script, this one using docutils
-version 0.3.10 instead of 0.3.9.  You now have two scripts, each using a
-different version of the package.  (Notice that we used ``-m`` for both
-installations, so that Python won't lock us out of using anything but the most
-recently-installed version of the package.)
-
-
-Executables and Launchers
--------------------------
-
-On Unix systems, scripts are installed with as natural files with a "#!"
-header and no extension and they launch under the Python version indicated in
-the header.
-
-On Windows, there is no mechanism to "execute" files without extensions, so
-EasyInstall provides two techniques to mirror the Unix behavior. The behavior
-is indicated by the SETUPTOOLS_LAUNCHER environment variable, which may be
-"executable" (default) or "natural".
-
-Regardless of the technique used, the script(s) will be installed to a Scripts
-directory (by default in the Python installation directory). It is recommended
-for EasyInstall that you ensure this directory is in the PATH environment
-variable. The easiest way to ensure the Scripts directory is in the PATH is
-to run ``Tools\Scripts\win_add2path.py`` from the Python directory.
-
-Note that instead of changing your ``PATH`` to include the Python scripts
-directory, you can also retarget the installation location for scripts so they
-go on a directory that's already on the ``PATH``.  For more information see
-`Command-Line Options`_ and `Configuration Files`_.  During installation,
-pass command line options (such as ``--script-dir``) to control where
-scripts will be installed.
-
-
-Windows Executable Launcher
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If the "executable" launcher is used, EasyInstall will create a '.exe'
-launcher of the same name beside each installed script (including
-``easy_install`` itself). These small .exe files launch the script of the
-same name using the Python version indicated in the '#!' header.
-
-This behavior is currently default. To force
-the use of executable launchers, set ``SETUPTOOLS_LAUNCHER`` to "executable".
-
-Natural Script Launcher
-~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall also supports deferring to an external launcher such as
-`pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
-Enable this experimental functionality by setting the
-``SETUPTOOLS_LAUNCHER`` environment variable to "natural". EasyInstall will
-then install scripts as simple
-scripts with a .pya (or .pyw) extension appended. If these extensions are
-associated with the pylauncher and listed in the PATHEXT environment variable,
-these scripts can then be invoked simply and directly just like any other
-executable. This behavior may become default in a future version.
-
-EasyInstall uses the .pya extension instead of simply
-the typical '.py' extension. This distinct extension is necessary to prevent
-Python
-from treating the scripts as importable modules (where name conflicts exist).
-Current releases of pylauncher do not yet associate with .pya files by
-default, but future versions should do so.
-
-
-Tips & Techniques
------------------
-
-Multiple Python Versions
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall installs itself under two names:
-``easy_install`` and ``easy_install-N.N``, where ``N.N`` is the Python version
-used to install it.  Thus, if you install EasyInstall for both Python 3.2 and
-2.7, you can use the ``easy_install-3.2`` or ``easy_install-2.7`` scripts to
-install packages for the respective Python version.
-
-Setuptools also supplies easy_install as a runnable module which may be
-invoked using ``python -m easy_install`` for any Python with Setuptools
-installed.
-
-Restricting Downloads with ``--allow-hosts``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can use the ``--allow-hosts`` (``-H``) option to restrict what domains
-EasyInstall will look for links and downloads on.  ``--allow-hosts=None``
-prevents downloading altogether.  You can also use wildcards, for example
-to restrict downloading to hosts in your own intranet.  See the section below
-on `Command-Line Options`_ for more details on the ``--allow-hosts`` option.
-
-By default, there are no host restrictions in effect, but you can change this
-default by editing the appropriate `configuration files`_ and adding:
-
-.. code-block:: ini
-
-    [easy_install]
-    allow_hosts = *.myintranet.example.com,*.python.org
-
-The above example would then allow downloads only from hosts in the
-``python.org`` and ``myintranet.example.com`` domains, unless overridden on the
-command line.
-
-
-Installing on Un-networked Machines
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Just copy the eggs or source packages you need to a directory on the target
-machine, then use the ``-f`` or ``--find-links`` option to specify that
-directory's location.  For example::
-
-    easy_install -H None -f somedir SomePackage
-
-will attempt to install SomePackage using only eggs and source packages found
-in ``somedir`` and disallowing all remote access.  You should of course make
-sure you have all of SomePackage's dependencies available in somedir.
-
-If you have another machine of the same operating system and library versions
-(or if the packages aren't platform-specific), you can create the directory of
-eggs using a command like this::
-
-    easy_install -zmaxd somedir SomePackage
-
-This will tell EasyInstall to put zipped eggs or source packages for
-SomePackage and all its dependencies into ``somedir``, without creating any
-scripts or .pth files.  You can then copy the contents of ``somedir`` to the
-target machine.  (``-z`` means zipped eggs, ``-m`` means multi-version, which
-prevents .pth files from being used, ``-a`` means to copy all the eggs needed,
-even if they're installed elsewhere on the machine, and ``-d`` indicates the
-directory to place the eggs in.)
-
-You can also build the eggs from local development packages that were installed
-with the ``setup.py develop`` command, by including the ``-l`` option, e.g.::
-
-    easy_install -zmaxld somedir SomePackage
-
-This will use locally-available source distributions to build the eggs.
-
-
-Packaging Others' Projects As Eggs
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Need to distribute a package that isn't published in egg form?  You can use
-EasyInstall to build eggs for a project.  You'll want to use the ``--zip-ok``,
-``--exclude-scripts``, and possibly ``--no-deps`` options (``-z``, ``-x`` and
-``-N``, respectively).  Use ``-d`` or ``--install-dir`` to specify the location
-where you'd like the eggs placed.  By placing them in a directory that is
-published to the web, you can then make the eggs available for download, either
-in an intranet or to the internet at large.
-
-If someone distributes a package in the form of a single ``.py`` file, you can
-wrap it in an egg by tacking an ``#egg=name-version`` suffix on the file's URL.
-So, something like this::
-
-    easy_install -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
-
-will install the package as an egg, and this::
-
-    easy_install -zmaxd. \
-        -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
-
-will create a ``.egg`` file in the current directory.
-
-
-Creating your own Package Index
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In addition to local directories and the Python Package Index, EasyInstall can
-find download links on most any web page whose URL is given to the ``-f``
-(``--find-links``) option.  In the simplest case, you can simply have a web
-page with links to eggs or Python source packages, even an automatically
-generated directory listing (such as the Apache web server provides).
-
-If you are setting up an intranet site for package downloads, you may want to
-configure the target machines to use your download site by default, adding
-something like this to their `configuration files`_:
-
-.. code-block:: ini
-
-    [easy_install]
-    find_links = http://mypackages.example.com/somedir/
-                 http://turbogears.org/download/
-                 http://peak.telecommunity.com/dist/
-
-As you can see, you can list multiple URLs separated by whitespace, continuing
-on multiple lines if necessary (as long as the subsequent lines are indented.
-
-If you are more ambitious, you can also create an entirely custom package index
-or PyPI mirror.  See the ``--index-url`` option under `Command-Line Options`_,
-below, and also the section on `Package Index "API"`_.
-
-
-Password-Protected Sites
-------------------------
-
-If a site you want to download from is password-protected using HTTP "Basic"
-authentication, you can specify your credentials in the URL, like so::
-
-    http://some_userid:some_password@some.example.com/some_path/
-
-You can do this with both index page URLs and direct download URLs.  As long
-as any HTML pages read by easy_install use *relative* links to point to the
-downloads, the same user ID and password will be used to do the downloading.
-
-Using .pypirc Credentials
--------------------------
-
-In additional to supplying credentials in the URL, ``easy_install`` will also
-honor credentials if present in the .pypirc file. Teams maintaining a private
-repository of packages may already have defined access credentials for
-uploading packages according to the distutils documentation. ``easy_install``
-will attempt to honor those if present. Refer to the distutils documentation
-for Python 2.5 or later for details on the syntax.
-
-Controlling Build Options
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall respects standard distutils `Configuration Files`_, so you can use
-them to configure build options for packages that it installs from source.  For
-example, if you are on Windows using the MinGW compiler, you can configure the
-default compiler by putting something like this:
-
-.. code-block:: ini
-
-    [build]
-    compiler = mingw32
-
-into the appropriate distutils configuration file.  In fact, since this is just
-normal distutils configuration, it will affect any builds using that config
-file, not just ones done by EasyInstall.  For example, if you add those lines
-to ``distutils.cfg`` in the ``distutils`` package directory, it will be the
-default compiler for *all* packages you build.  See `Configuration Files`_
-below for a list of the standard configuration file locations, and links to
-more documentation on using distutils configuration files.
-
-
-Editing and Viewing Source Packages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sometimes a package's source distribution  contains additional documentation,
-examples, configuration files, etc., that are not part of its actual code.  If
-you want to be able to examine these files, you can use the ``--editable``
-option to EasyInstall, and EasyInstall will look for a source distribution
-or Subversion URL for the package, then download and extract it or check it out
-as a subdirectory of the ``--build-directory`` you specify.  If you then wish
-to install the package after editing or configuring it, you can do so by
-rerunning EasyInstall with that directory as the target.
-
-Note that using ``--editable`` stops EasyInstall from actually building or
-installing the package; it just finds, obtains, and possibly unpacks it for
-you.  This allows you to make changes to the package if necessary, and to
-either install it in development mode using ``setup.py develop`` (if the
-package uses setuptools, that is), or by running ``easy_install projectdir``
-(where ``projectdir`` is the subdirectory EasyInstall created for the
-downloaded package.
-
-In order to use ``--editable`` (``-e`` for short), you *must* also supply a
-``--build-directory`` (``-b`` for short).  The project will be placed in a
-subdirectory of the build directory.  The subdirectory will have the same
-name as the project itself, but in all-lowercase.  If a file or directory of
-that name already exists, EasyInstall will print an error message and exit.
-
-Also, when using ``--editable``, you cannot use URLs or filenames as arguments.
-You *must* specify project names (and optional version requirements) so that
-EasyInstall knows what directory name(s) to create.  If you need to force
-EasyInstall to use a particular URL or filename, you should specify it as a
-``--find-links`` item (``-f`` for short), and then also specify
-the project name, e.g.::
-
-    easy_install -eb ~/projects \
-     -fhttp://prdownloads.sourceforge.net/ctypes/ctypes-0.9.6.tar.gz?download \
-     ctypes==0.9.6
-
-
-Dealing with Installation Conflicts
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-(NOTE: As of 0.6a11, this section is obsolete; it is retained here only so that
-people using older versions of EasyInstall can consult it.  As of version
-0.6a11, installation conflicts are handled automatically without deleting the
-old or system-installed packages, and without ignoring the issue.  Instead,
-eggs are automatically shifted to the front of ``sys.path`` using special
-code added to the ``easy-install.pth`` file.  So, if you are using version
-0.6a11 or better of setuptools, you do not need to worry about conflicts,
-and the following issues do not apply to you.)
-
-EasyInstall installs distributions in a "managed" way, such that each
-distribution can be independently activated or deactivated on ``sys.path``.
-However, packages that were not installed by EasyInstall are "unmanaged",
-in that they usually live all in one directory and cannot be independently
-activated or deactivated.
-
-As a result, if you are using EasyInstall to upgrade an existing package, or
-to install a package with the same name as an existing package, EasyInstall
-will warn you of the conflict.  (This is an improvement over ``setup.py
-install``, because the ``distutils`` just install new packages on top of old
-ones, possibly combining two unrelated packages or leaving behind modules that
-have been deleted in the newer version of the package.)
-
-EasyInstall will stop the installation if it detects a conflict
-between an existing, "unmanaged" package, and a module or package in any of
-the distributions you're installing.  It will display a list of all of the
-existing files and directories that would need to be deleted for the new
-package to be able to function correctly.  To proceed, you must manually
-delete these conflicting files and directories and re-run EasyInstall.
-
-Of course, once you've replaced all of your existing "unmanaged" packages with
-versions managed by EasyInstall, you won't have any more conflicts to worry
-about!
-
-
-Compressed Installation
-~~~~~~~~~~~~~~~~~~~~~~~
-
-EasyInstall tries to install packages in zipped form, if it can.  Zipping
-packages can improve Python's overall import performance if you're not using
-the ``--multi-version`` option, because Python processes zipfile entries on
-``sys.path`` much faster than it does directories.
-
-As of version 0.5a9, EasyInstall analyzes packages to determine whether they
-can be safely installed as a zipfile, and then acts on its analysis.  (Previous
-versions would not install a package as a zipfile unless you used the
-``--zip-ok`` option.)
-
-The current analysis approach is fairly conservative; it currently looks for:
-
- * Any use of the ``__file__`` or ``__path__`` variables (which should be
-   replaced with ``pkg_resources`` API calls)
-
- * Possible use of ``inspect`` functions that expect to manipulate source files
-   (e.g. ``inspect.getsource()``)
-
- * Top-level modules that might be scripts used with ``python -m`` (Python 2.4)
-
-If any of the above are found in the package being installed, EasyInstall will
-assume that the package cannot be safely run from a zipfile, and unzip it to
-a directory instead.  You can override this analysis with the ``-zip-ok`` flag,
-which will tell EasyInstall to install the package as a zipfile anyway.  Or,
-you can use the ``--always-unzip`` flag, in which case EasyInstall will always
-unzip, even if its analysis says the package is safe to run as a zipfile.
-
-Normally, however, it is simplest to let EasyInstall handle the determination
-of whether to zip or unzip, and only specify overrides when needed to work
-around a problem.  If you find you need to override EasyInstall's guesses, you
-may want to contact the package author and the EasyInstall maintainers, so that
-they can make appropriate changes in future versions.
-
-(Note: If a package uses ``setuptools`` in its setup script, the package author
-has the option to declare the package safe or unsafe for zipped usage via the
-``zip_safe`` argument to ``setup()``.  If the package author makes such a
-declaration, EasyInstall believes the package's author and does not perform its
-own analysis.  However, your command-line option, if any, will still override
-the package author's choice.)
-
-
-Reference Manual
-================
-
-Configuration Files
--------------------
-
-(New in 0.4a2)
-
-You may specify default options for EasyInstall using the standard
-distutils configuration files, under the command heading ``easy_install``.
-EasyInstall will look first for a ``setup.cfg`` file in the current directory,
-then a ``~/.pydistutils.cfg`` or ``$HOME\\pydistutils.cfg`` (on Unix-like OSes
-and Windows, respectively), and finally a ``distutils.cfg`` file in the
-``distutils`` package directory.  Here's a simple example:
-
-.. code-block:: ini
-
-    [easy_install]
-
-    # set the default location to install packages
-    install_dir = /home/me/lib/python
-
-    # Notice that indentation can be used to continue an option
-    # value; this is especially useful for the "--find-links"
-    # option, which tells easy_install to use download links on
-    # these pages before consulting PyPI:
-    #
-    find_links = http://sqlobject.org/
-                 http://peak.telecommunity.com/dist/
-
-In addition to accepting configuration for its own options under
-``[easy_install]``, EasyInstall also respects defaults specified for other
-distutils commands.  For example, if you don't set an ``install_dir`` for
-``[easy_install]``, but *have* set an ``install_lib`` for the ``[install]``
-command, this will become EasyInstall's default installation directory.  Thus,
-if you are already using distutils configuration files to set default install
-locations, build options, etc., EasyInstall will respect your existing settings
-until and unless you override them explicitly in an ``[easy_install]`` section.
-
-For more information, see also the current Python documentation on the `use and
-location of distutils configuration files <https://docs.python.org/install/index.html#inst-config-files>`_.
-
-Notice that ``easy_install`` will use the ``setup.cfg`` from the current
-working directory only if it was triggered from ``setup.py`` through the
-``install_requires`` option. The standalone command will not use that file.
-
-Command-Line Options
---------------------
-
-``--zip-ok, -z``
-    Install all packages as zip files, even if they are marked as unsafe for
-    running as a zipfile.  This can be useful when EasyInstall's analysis
-    of a non-setuptools package is too conservative, but keep in mind that
-    the package may not work correctly.  (Changed in 0.5a9; previously this
-    option was required in order for zipped installation to happen at all.)
-
-``--always-unzip, -Z``
-    Don't install any packages as zip files, even if the packages are marked
-    as safe for running as a zipfile.  This can be useful if a package does
-    something unsafe, but not in a way that EasyInstall can easily detect.
-    EasyInstall's default analysis is currently very conservative, however, so
-    you should only use this option if you've had problems with a particular
-    package, and *after* reporting the problem to the package's maintainer and
-    to the EasyInstall maintainers.
-
-    (Note: the ``-z/-Z`` options only affect the installation of newly-built
-    or downloaded packages that are not already installed in the target
-    directory; if you want to convert an existing installed version from
-    zipped to unzipped or vice versa, you'll need to delete the existing
-    version first, and re-run EasyInstall.)
-
-``--multi-version, -m``
-    "Multi-version" mode. Specifying this option prevents ``easy_install`` from
-    adding an ``easy-install.pth`` entry for the package being installed, and
-    if an entry for any version the package already exists, it will be removed
-    upon successful installation. In multi-version mode, no specific version of
-    the package is available for importing, unless you use
-    ``pkg_resources.require()`` to put it on ``sys.path``. This can be as
-    simple as::
-
-        from pkg_resources import require
-        require("SomePackage", "OtherPackage", "MyPackage")
-
-    which will put the latest installed version of the specified packages on
-    ``sys.path`` for you. (For more advanced uses, like selecting specific
-    versions and enabling optional dependencies, see the ``pkg_resources`` API
-    doc.)
-
-    Changed in 0.6a10: this option is no longer silently enabled when
-    installing to a non-PYTHONPATH, non-"site" directory.  You must always
-    explicitly use this option if you want it to be active.
-
-``--upgrade, -U``   (New in 0.5a4)
-    By default, EasyInstall only searches online if a project/version
-    requirement can't be met by distributions already installed
-    on sys.path or the installation directory.  However, if you supply the
-    ``--upgrade`` or ``-U`` flag, EasyInstall will always check the package
-    index and ``--find-links`` URLs before selecting a version to install.  In
-    this way, you can force EasyInstall to use the latest available version of
-    any package it installs (subject to any version requirements that might
-    exclude such later versions).
-
-``--install-dir=DIR, -d DIR``
-    Set the installation directory. It is up to you to ensure that this
-    directory is on ``sys.path`` at runtime, and to use
-    ``pkg_resources.require()`` to enable the installed package(s) that you
-    need.
-
-    (New in 0.4a2) If this option is not directly specified on the command line
-    or in a distutils configuration file, the distutils default installation
-    location is used.  Normally, this would be the ``site-packages`` directory,
-    but if you are using distutils configuration files, setting things like
-    ``prefix`` or ``install_lib``, then those settings are taken into
-    account when computing the default installation directory, as is the
-    ``--prefix`` option.
-
-``--script-dir=DIR, -s DIR``
-    Set the script installation directory.  If you don't supply this option
-    (via the command line or a configuration file), but you *have* supplied
-    an ``--install-dir`` (via command line or config file), then this option
-    defaults to the same directory, so that the scripts will be able to find
-    their associated package installation.  Otherwise, this setting defaults
-    to the location where the distutils would normally install scripts, taking
-    any distutils configuration file settings into account.
-
-``--exclude-scripts, -x``
-    Don't install scripts.  This is useful if you need to install multiple
-    versions of a package, but do not want to reset the version that will be
-    run by scripts that are already installed.
-
-``--user`` (New in 0.6.11)
-    Use the user-site-packages as specified in :pep:`370`
-    instead of the global site-packages.
-
-``--always-copy, -a``   (New in 0.5a4)
-    Copy all needed distributions to the installation directory, even if they
-    are already present in a directory on sys.path.  In older versions of
-    EasyInstall, this was the default behavior, but now you must explicitly
-    request it.  By default, EasyInstall will no longer copy such distributions
-    from other sys.path directories to the installation directory, unless you
-    explicitly gave the distribution's filename on the command line.
-
-    Note that as of 0.6a10, using this option excludes "system" and
-    "development" eggs from consideration because they can't be reliably
-    copied.  This may cause EasyInstall to choose an older version of a package
-    than what you expected, or it may cause downloading and installation of a
-    fresh copy of something that's already installed.  You will see warning
-    messages for any eggs that EasyInstall skips, before it falls back to an
-    older version or attempts to download a fresh copy.
-
-``--find-links=URLS_OR_FILENAMES, -f URLS_OR_FILENAMES``
-    Scan the specified "download pages" or directories for direct links to eggs
-    or other distributions.  Any existing file or directory names or direct
-    download URLs are immediately added to EasyInstall's search cache, and any
-    indirect URLs (ones that don't point to eggs or other recognized archive
-    formats) are added to a list of additional places to search for download
-    links.  As soon as EasyInstall has to go online to find a package (either
-    because it doesn't exist locally, or because ``--upgrade`` or ``-U`` was
-    used), the specified URLs will be downloaded and scanned for additional
-    direct links.
-
-    Eggs and archives found by way of ``--find-links`` are only downloaded if
-    they are needed to meet a requirement specified on the command line; links
-    to unneeded packages are ignored.
-
-    If all requested packages can be found using links on the specified
-    download pages, the Python Package Index will not be consulted unless you
-    also specified the ``--upgrade`` or ``-U`` option.
-
-    (Note: if you want to refer to a local HTML file containing links, you must
-    use a ``file:`` URL, as filenames that do not refer to a directory, egg, or
-    archive are ignored.)
-
-    You may specify multiple URLs or file/directory names with this option,
-    separated by whitespace.  Note that on the command line, you will probably
-    have to surround the URL list with quotes, so that it is recognized as a
-    single option value.  You can also specify URLs in a configuration file;
-    see `Configuration Files`_, above.
-
-    Changed in 0.6a10: previously all URLs and directories passed to this
-    option were scanned as early as possible, but from 0.6a10 on, only
-    directories and direct archive links are scanned immediately; URLs are not
-    retrieved unless a package search was already going to go online due to a
-    package not being available locally, or due to the use of the ``--update``
-    or ``-U`` option.
-
-``--no-find-links`` Blocks the addition of any link.
-    This parameter is useful if you want to avoid adding links defined in a
-    project easy_install is installing (whether it's a requested project or a
-    dependency). When used, ``--find-links`` is ignored.
-
-    Added in Distribute 0.6.11 and Setuptools 0.7.
-
-``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
-    Specifies the base URL of the Python Package Index.  The default is
-    https://pypi.org/simple/ if not specified.  When a package is requested
-    that is not locally available or linked from a ``--find-links`` download
-    page, the package index will be searched for download pages for the needed
-    package, and those download pages will be searched for links to download
-    an egg or source distribution.
-
-``--editable, -e`` (New in 0.6a1)
-    Only find and download source distributions for the specified projects,
-    unpacking them to subdirectories of the specified ``--build-directory``.
-    EasyInstall will not actually build or install the requested projects or
-    their dependencies; it will just find and extract them for you.  See
-    `Editing and Viewing Source Packages`_ above for more details.
-
-``--build-directory=DIR, -b DIR`` (UPDATED in 0.6a1)
-    Set the directory used to build source packages.  If a package is built
-    from a source distribution or checkout, it will be extracted to a
-    subdirectory of the specified directory.  The subdirectory will have the
-    same name as the extracted distribution's project, but in all-lowercase.
-    If a file or directory of that name already exists in the given directory,
-    a warning will be printed to the console, and the build will take place in
-    a temporary directory instead.
-
-    This option is most useful in combination with the ``--editable`` option,
-    which forces EasyInstall to *only* find and extract (but not build and
-    install) source distributions.  See `Editing and Viewing Source Packages`_,
-    above, for more information.
-
-``--verbose, -v, --quiet, -q`` (New in 0.4a4)
-    Control the level of detail of EasyInstall's progress messages.  The
-    default detail level is "info", which prints information only about
-    relatively time-consuming operations like running a setup script, unpacking
-    an archive, or retrieving a URL.  Using ``-q`` or ``--quiet`` drops the
-    detail level to "warn", which will only display installation reports,
-    warnings, and errors.  Using ``-v`` or ``--verbose`` increases the detail
-    level to include individual file-level operations, link analysis messages,
-    and distutils messages from any setup scripts that get run.  If you include
-    the ``-v`` option more than once, the second and subsequent uses are passed
-    down to any setup scripts, increasing the verbosity of their reporting as
-    well.
-
-``--dry-run, -n`` (New in 0.4a4)
-    Don't actually install the package or scripts.  This option is passed down
-    to any setup scripts run, so packages should not actually build either.
-    This does *not* skip downloading, nor does it skip extracting source
-    distributions to a temporary/build directory.
-
-``--optimize=LEVEL``, ``-O LEVEL`` (New in 0.4a4)
-    If you are installing from a source distribution, and are *not* using the
-    ``--zip-ok`` option, this option controls the optimization level for
-    compiling installed ``.py`` files to ``.pyo`` files.  It does not affect
-    the compilation of modules contained in ``.egg`` files, only those in
-    ``.egg`` directories.  The optimization level can be set to 0, 1, or 2;
-    the default is 0 (unless it's set under ``install`` or ``install_lib`` in
-    one of your distutils configuration files).
-
-``--record=FILENAME``  (New in 0.5a4)
-    Write a record of all installed files to FILENAME.  This is basically the
-    same as the same option for the standard distutils "install" command, and
-    is included for compatibility with tools that expect to pass this option
-    to "setup.py install".
-
-``--site-dirs=DIRLIST, -S DIRLIST``   (New in 0.6a1)
-    Specify one or more custom "site" directories (separated by commas).
-    "Site" directories are directories where ``.pth`` files are processed, such
-    as the main Python ``site-packages`` directory.  As of 0.6a10, EasyInstall
-    automatically detects whether a given directory processes ``.pth`` files
-    (or can be made to do so), so you should not normally need to use this
-    option.  It is is now only necessary if you want to override EasyInstall's
-    judgment and force an installation directory to be treated as if it
-    supported ``.pth`` files.
-
-``--no-deps, -N``  (New in 0.6a6)
-    Don't install any dependencies.  This is intended as a convenience for
-    tools that wrap eggs in a platform-specific packaging system.  (We don't
-    recommend that you use it for anything else.)
-
-``--allow-hosts=PATTERNS, -H PATTERNS``   (New in 0.6a6)
-    Restrict downloading and spidering to hosts matching the specified glob
-    patterns.  E.g. ``-H *.python.org`` restricts web access so that only
-    packages listed and downloadable from machines in the ``python.org``
-    domain.  The glob patterns must match the *entire* user/host/port section of
-    the target URL(s).  For example, ``*.python.org`` will NOT accept a URL
-    like ``http://python.org/foo`` or ``http://www.python.org:8080/``.
-    Multiple patterns can be specified by separating them with commas.  The
-    default pattern is ``*``, which matches anything.
-
-    In general, this option is mainly useful for blocking EasyInstall's web
-    access altogether (e.g. ``-Hlocalhost``), or to restrict it to an intranet
-    or other trusted site.  EasyInstall will do the best it can to satisfy
-    dependencies given your host restrictions, but of course can fail if it
-    can't find suitable packages.  EasyInstall displays all blocked URLs, so
-    that you can adjust your ``--allow-hosts`` setting if it is more strict
-    than you intended.  Some sites may wish to define a restrictive default
-    setting for this option in their `configuration files`_, and then manually
-    override the setting on the command line as needed.
-
-``--prefix=DIR`` (New in 0.6a10)
-    Use the specified directory as a base for computing the default
-    installation and script directories.  On Windows, the resulting default
-    directories will be ``prefix\\Lib\\site-packages`` and ``prefix\\Scripts``,
-    while on other platforms the defaults will be
-    ``prefix/lib/python2.X/site-packages`` (with the appropriate version
-    substituted) for libraries and ``prefix/bin`` for scripts.
-
-    Note that the ``--prefix`` option only sets the *default* installation and
-    script directories, and does not override the ones set on the command line
-    or in a configuration file.
-
-``--local-snapshots-ok, -l`` (New in 0.6c6)
-    Normally, EasyInstall prefers to only install *released* versions of
-    projects, not in-development ones, because such projects may not
-    have a currently-valid version number.  So, it usually only installs them
-    when their ``setup.py`` directory is explicitly passed on the command line.
-
-    However, if this option is used, then any in-development projects that were
-    installed using the ``setup.py develop`` command, will be used to build
-    eggs, effectively upgrading the "in-development" project to a snapshot
-    release.  Normally, this option is used only in conjunction with the
-    ``--always-copy`` option to create a distributable snapshot of every egg
-    needed to run an application.
-
-    Note that if you use this option, you must make sure that there is a valid
-    version number (such as an SVN revision number tag) for any in-development
-    projects that may be used, as otherwise EasyInstall may not be able to tell
-    what version of the project is "newer" when future installations or
-    upgrades are attempted.
-
-
-.. _non-root installation:
-
-Custom Installation Locations
------------------------------
-
-By default, EasyInstall installs python packages into Python's main ``site-packages`` directory,
-and manages them using a custom ``.pth`` file in that same directory.
-
-Very often though, a user or developer wants ``easy_install`` to install and manage python packages
-in an alternative location, usually for one of 3 reasons:
-
-1. They don't have access to write to the main Python site-packages directory.
-
-2. They want a user-specific stash of packages, that is not visible to other users.
-
-3. They want to isolate a set of packages to a specific python application, usually to minimize
-   the possibility of version conflicts.
-
-Historically, there have been many approaches to achieve custom installation.
-The following section lists only the easiest and most relevant approaches [1]_.
-
-`Use the "--user" option`_
-
-`Use the "--user" option and customize "PYTHONUSERBASE"`_
-
-`Use "virtualenv"`_
-
-.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_.
-
-.. _PEP-370: http://www.python.org/dev/peps/pep-0370/
-
-
-Use the "--user" option
-~~~~~~~~~~~~~~~~~~~~~~~
-Python provides a User scheme for installation, which means that all
-python distributions support an alternative install location that is specific to a user [3]_.
-The Default location for each OS is explained in the python documentation
-for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
-specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
-This approach serves the need to have a user-specific stash of packages.
-
-.. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
-
-Use the "--user" option and customize "PYTHONUSERBASE"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The User scheme install location can be customized by setting the ``PYTHONUSERBASE`` environment
-variable, which updates the value of ``site.USER_BASE``.  To isolate packages to a specific
-application, simply set the OS environment of that application to a specific value of
-``PYTHONUSERBASE``, that contains just those packages.
-
-Use "virtualenv"
-~~~~~~~~~~~~~~~~
-"virtualenv" is a 3rd-party python package that effectively "clones" a python installation, thereby
-creating an isolated location to install packages.  The evolution of "virtualenv" started before the existence
-of the User installation scheme.  "virtualenv" provides a version of ``easy_install`` that is
-scoped to the cloned python install and is used in the normal way. "virtualenv" does offer various features
-that the User installation scheme alone does not provide, e.g. the ability to hide the main python site-packages.
-
-Please refer to the `virtualenv`_ documentation for more details.
-
-.. _virtualenv: https://pypi.org/project/virtualenv/
-
-
-
-Package Index "API"
--------------------
-
-Custom package indexes (and PyPI) must follow the following rules for
-EasyInstall to be able to look up and download packages:
-
-1. Except where stated otherwise, "pages" are HTML or XHTML, and "links"
-   refer to ``href`` attributes.
-
-2. Individual project version pages' URLs must be of the form
-   ``base/projectname/version``, where ``base`` is the package index's base URL.
-
-3. Omitting the ``/version`` part of a project page's URL (but keeping the
-   trailing ``/``) should result in a page that is either:
-
-   a) The single active version of that project, as though the version had been
-      explicitly included, OR
-
-   b) A page with links to all of the active version pages for that project.
-
-4. Individual project version pages should contain direct links to downloadable
-   distributions where possible.  It is explicitly permitted for a project's
-   "long_description" to include URLs, and these should be formatted as HTML
-   links by the package index, as EasyInstall does no special processing to
-   identify what parts of a page are index-specific and which are part of the
-   project's supplied description.
-
-5. Where available, MD5 information should be added to download URLs by
-   appending a fragment identifier of the form ``#md5=...``, where ``...`` is
-   the 32-character hex MD5 digest.  EasyInstall will verify that the
-   downloaded file's MD5 digest matches the given value.
-
-6. Individual project version pages should identify any "homepage" or
-   "download" URLs using ``rel="homepage"`` and ``rel="download"`` attributes
-   on the HTML elements linking to those URLs. Use of these attributes will
-   cause EasyInstall to always follow the provided links, unless it can be
-   determined by inspection that they are downloadable distributions. If the
-   links are not to downloadable distributions, they are retrieved, and if they
-   are HTML, they are scanned for download links. They are *not* scanned for
-   additional "homepage" or "download" links, as these are only processed for
-   pages that are part of a package index site.
-
-7. The root URL of the index, if retrieved with a trailing ``/``, must result
-   in a page containing links to *all* projects' active version pages.
-
-   (Note: This requirement is a workaround for the absence of case-insensitive
-   ``safe_name()`` matching of project names in URL paths. If project names are
-   matched in this fashion (e.g. via the PyPI server, mod_rewrite, or a similar
-   mechanism), then it is not necessary to include this all-packages listing
-   page.)
-
-8. If a package index is accessed via a ``file://`` URL, then EasyInstall will
-   automatically use ``index.html`` files, if present, when trying to read a
-   directory with a trailing ``/`` on the URL.
diff --git a/docs/index.txt b/docs/index.txt
index 13a46e74ef..c251260df6 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -21,5 +21,4 @@ Documentation content:
    python3
    development
    roadmap
-   Deprecated: Easy Install <easy_install>
    history
diff --git a/easy_install.py b/easy_install.py
deleted file mode 100644
index d87e984034..0000000000
--- a/easy_install.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Run the EasyInstall command"""
-
-if __name__ == '__main__':
-    from setuptools.command.easy_install import main
-    main()
diff --git a/setup.cfg b/setup.cfg
index 42a3d86c6c..385ba14df4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -51,7 +51,6 @@ classifiers =
 [options]
 zip_safe = True
 python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
-py_modules = easy_install
 packages = find:
 
 [options.packages.find]
diff --git a/setup.py b/setup.py
index d97895fcc0..59efc23743 100755
--- a/setup.py
+++ b/setup.py
@@ -31,22 +31,6 @@ def read_commands():
     return command_ns['__all__']
 
 
-def _gen_console_scripts():
-    yield "easy_install = setuptools.command.easy_install:main"
-
-    # Gentoo distributions manage the python-version-specific scripts
-    # themselves, so those platforms define an environment variable to
-    # suppress the creation of the version-specific scripts.
-    var_names = (
-        'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
-        'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
-    )
-    if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
-        return
-    tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
-    yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
-
-
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
 )
@@ -125,9 +109,6 @@ def pypi_link(pkg_filename):
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
-        "console_scripts": list(_gen_console_scripts()),
-        "setuptools.installation":
-            ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
     dependency_links=[
         pypi_link(
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 545c3c4426..9d350ac0f6 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -73,7 +73,7 @@
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
-    'main', 'get_exe_prefixes',
+    'get_exe_prefixes',
 ]
 
 
@@ -2283,59 +2283,6 @@ def current_umask():
     return tmp
 
 
-def bootstrap():
-    # This function is called when setuptools*.egg is run using /bin/sh
-    import setuptools
-
-    argv0 = os.path.dirname(setuptools.__path__[0])
-    sys.argv[0] = argv0
-    sys.argv.append(argv0)
-    main()
-
-
-def main(argv=None, **kw):
-    from setuptools import setup
-    from setuptools.dist import Distribution
-
-    class DistributionWithoutHelpCommands(Distribution):
-        common_usage = ""
-
-        def _show_help(self, *args, **kw):
-            with _patch_usage():
-                Distribution._show_help(self, *args, **kw)
-
-    if argv is None:
-        argv = sys.argv[1:]
-
-    with _patch_usage():
-        setup(
-            script_args=['-q', 'easy_install', '-v'] + argv,
-            script_name=sys.argv[0] or 'easy_install',
-            distclass=DistributionWithoutHelpCommands,
-            **kw
-        )
-
-
-@contextlib.contextmanager
-def _patch_usage():
-    import distutils.core
-    USAGE = textwrap.dedent("""
-        usage: %(script)s [options] requirement_or_url ...
-           or: %(script)s --help
-        """).lstrip()
-
-    def gen_usage(script_name):
-        return USAGE % dict(
-            script=os.path.basename(script_name),
-        )
-
-    saved = distutils.core.gen_usage
-    distutils.core.gen_usage = gen_usage
-    try:
-        yield
-    finally:
-        distutils.core.gen_usage = saved
-
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
     """Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""
     
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aa75899a06..68319c2fb6 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -467,22 +467,24 @@ def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
         """
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
-        with contexts.quiet():
-            # create an sdist that has a build-time dependency.
-            with TestSetupRequires.create_sdist() as dist_file:
-                with contexts.tempdir() as temp_install_dir:
-                    with contexts.environment(PYTHONPATH=temp_install_dir):
-                        ei_params = [
-                            '--index-url', mock_index.url,
-                            '--exclude-scripts',
-                            '--install-dir', temp_install_dir,
-                            dist_file,
-                        ]
-                        with sandbox.save_argv(['easy_install']):
-                            # attempt to install the dist. It should
-                            # fail because it doesn't exist.
-                            with pytest.raises(SystemExit):
-                                easy_install_pkg.main(ei_params)
+        monkeypatch.setenv(str('PIP_VERBOSE'), str('1'))
+        # create an sdist that has a build-time dependency.
+        with TestSetupRequires.create_sdist() as dist_file:
+            with contexts.tempdir() as temp_dir:
+                setup_py = os.path.join(temp_dir, 'setup.py')
+                with open(setup_py, 'w') as fp:
+                    fp.write('__import__("setuptools").setup()')
+                temp_install_dir = os.path.join(temp_dir, 'target')
+                os.mkdir(temp_install_dir)
+                with contexts.environment(PYTHONPATH=temp_install_dir):
+                    # attempt to install the dist. It should
+                    # fail because it doesn't exist.
+                    with pytest.raises(SystemExit):
+                        run_setup(setup_py, ['easy_install',
+                                             '--exclude-scripts',
+                                             '--index-url', mock_index.url,
+                                             '--install-dir', temp_install_dir,
+                                             dist_file])
         # there should have been one requests to the server
         assert [r.path for r in mock_index.requests] == ['/does-not-exist/']
 
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index f937d98189..3c5df68a35 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -64,9 +64,8 @@ def test_pkg_resources_import(self, tmpdir):
         target.mkdir()
         install_cmd = [
             sys.executable,
-            '-m', 'easy_install',
-            '-d', str(target),
-            str(pkg),
+            '-m', 'pip.__main__', 'install',
+            '-t', str(target), str(pkg),
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(install_cmd)

From b8101f06532b1deab448e6e23d0a61eb125c62df Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Thu, 14 Nov 2019 22:01:09 +0100
Subject: [PATCH 7597/8469] deprecate easy_install command

---
 setuptools/command/easy_install.py | 8 +++++++-
 setuptools/command/install.py      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9d350ac0f6..d273bc101c 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -410,7 +410,13 @@ def expand_dirs(self):
         ]
         self._expand_attrs(dirs)
 
-    def run(self):
+    def run(self, show_deprecation=True):
+        if show_deprecation:
+            self.announce(
+                "WARNING: The easy_install command is deprecated "
+                "and will be removed in a future version."
+                , log.WARN,
+            )
         if self.verbose != self.distribution.verbose:
             log.set_verbosity(self.verbose)
         try:
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
index 31a5ddb577..72b9a3e424 100644
--- a/setuptools/command/install.py
+++ b/setuptools/command/install.py
@@ -114,7 +114,7 @@ def do_egg_install(self):
             args.insert(0, setuptools.bootstrap_install_from)
 
         cmd.args = args
-        cmd.run()
+        cmd.run(show_deprecation=False)
         setuptools.bootstrap_install_from = None
 
 

From dc868755d53520895d96ec0251a66df562a37095 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 15 Nov 2019 12:03:53 +0100
Subject: [PATCH 7598/8469] drop support for Python 3.4

---
 .travis.yml                         | 1 -
 changelog.d/1908.breaking.rst       | 1 +
 docs/easy_install.txt               | 2 +-
 pkg_resources/__init__.py           | 4 ++--
 setup.cfg                           | 3 +--
 setuptools/tests/test_virtualenv.py | 5 +----
 tests/requirements.txt              | 3 +--
 tox.ini                             | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/1908.breaking.rst

diff --git a/.travis.yml b/.travis.yml
index 7088d16621..3a744f2328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ jobs:
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
     env: DISABLE_COVERAGE=1
-  - python: 3.4
   - python: 3.5
   - &default_py
     python: 3.6
diff --git a/changelog.d/1908.breaking.rst b/changelog.d/1908.breaking.rst
new file mode 100644
index 0000000000..3fbb9fe70c
--- /dev/null
+++ b/changelog.d/1908.breaking.rst
@@ -0,0 +1 @@
+Drop support for Python 3.4.
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 544b9efd59..fac7b8fc2a 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -41,7 +41,7 @@ Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
 for download links and basic installation instructions for each of the
 supported platforms.
 
-You will need at least Python 3.4 or 2.7.  An ``easy_install`` script will be
+You will need at least Python 3.5 or 2.7.  An ``easy_install`` script will be
 installed in the normal location for Python scripts on your platform.
 
 Note that the instructions on the setuptools PyPI page assume that you are
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 51fb1192fc..2f5aa64a6e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -88,8 +88,8 @@
 __metaclass__ = type
 
 
-if (3, 0) < sys.version_info < (3, 4):
-    raise RuntimeError("Python 3.4 or later is required")
+if (3, 0) < sys.version_info < (3, 5):
+    raise RuntimeError("Python 3.5 or later is required")
 
 if six.PY2:
     # Those builtin exceptions are only defined in Python 3
diff --git a/setup.cfg b/setup.cfg
index 42a3d86c6c..920a27190b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,6 @@ classifiers =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
@@ -50,7 +49,7 @@ classifiers =
 
 [options]
 zip_safe = True
-python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
 py_modules = easy_install
 packages = find:
 
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 74a1284ce7..b60df32faf 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -77,12 +77,9 @@ def _get_pip_versions():
         'pip==10.0.1',
         'pip==18.1',
         'pip==19.0.1',
+        'https://github.com/pypa/pip/archive/master.zip',
     ]
 
-    # Pip's master dropped support for 3.4.
-    if not six.PY34:
-        network_versions.append('https://github.com/pypa/pip/archive/master.zip')
-
     versions = [None] + [
         pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
         for v in network_versions
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 1f70adee0a..ff596773a6 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,5 @@
 mock
-pytest-flake8; python_version!="3.4"
-pytest-flake8<=1.0.0; python_version=="3.4"
+pytest-flake8
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.7
diff --git a/tox.ini b/tox.ini
index 5d439cb34b..1eae7a7a07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py27,py3{4,5,6},pypy,pypy3'
+# export TOXENV='py27,py3{5,6,7,8},pypy,pypy3'
 
 [tox]
 envlist=python

From 6b210c65938527a4bbcea34942fe43971be3c014 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2019 12:06:47 -0500
Subject: [PATCH 7599/8469] Move all finalization of distribution options into
 hooks. Allow hooks to specify an index for ordering.

---
 setup.py           |  7 +++++++
 setuptools/dist.py | 24 ++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index f5030dd670..ac56a1b051 100755
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,13 @@ def pypi_link(pkg_filename):
             "%(cmd)s = setuptools.command.%(cmd)s:%(cmd)s" % locals()
             for cmd in read_commands()
         ],
+        "setuptools.finalize_distribution_options": [
+            "parent_finalize = setuptools.dist:_Distribution.finalize_options",
+            "features = setuptools.dist:Distribution._finalize_feature_opts",
+            "keywords = setuptools.dist:Distribution._finalize_setup_keywords",
+            "2to3_doctests = "
+            "setuptools.dist:Distribution._finalize_2to3_doctests",
+        ],
         "distutils.setup_keywords": [
             "eager_resources        = setuptools.dist:assert_string_list",
             "namespace_packages     = setuptools.dist:check_nsp",
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 987d684e09..449904317c 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -724,19 +724,28 @@ def fetch_build_eggs(self, requires):
         return resolved_dists
 
     def finalize_options(self):
-        _Distribution.finalize_options(self)
-        if self.features:
-            self._set_global_opts_from_features()
-
+        """
+        Allow plugins to apply arbitrary operations to the
+        distribution. Each hook may optionally define a 'order'
+        to influence the order of execution. Smaller numbers
+        go first and the default is 0.
+        """
         hook_key = 'setuptools.finalize_distribution_options'
-        for ep in pkg_resources.iter_entry_points(hook_key):
+
+        def by_order(hook):
+            return getattr(hook, 'order', 0)
+        eps = pkg_resources.iter_entry_points(hook_key)
+        for ep in sorted(eps, key=by_order):
             ep.load()(self)
 
+    def _finalize_setup_keywords(self):
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):
             value = getattr(self, ep.name, None)
             if value is not None:
                 ep.require(installer=self.fetch_build_egg)
                 ep.load()(self, ep.name, value)
+
+    def _finalize_2to3_doctests(self):
         if getattr(self, 'convert_2to3_doctests', None):
             # XXX may convert to set here when we can rely on set being builtin
             self.convert_2to3_doctests = [
@@ -790,9 +799,12 @@ def fetch_build_egg(self, req):
         cmd.ensure_finalized()
         return cmd.easy_install(req)
 
-    def _set_global_opts_from_features(self):
+    def _finalize_feature_opts(self):
         """Add --with-X/--without-X options based on optional features"""
 
+        if not self.features:
+            return
+
         go = []
         no = self.negative_opt.copy()
 

From 88951e9a5633abd4cdbfa3584647cec4247b8c30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2019 12:47:35 -0500
Subject: [PATCH 7600/8469] Add changelog entry and documentation about the
 feature.

---
 changelog.d/1877.change.rst |  1 +
 docs/setuptools.txt         | 31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/1877.change.rst

diff --git a/changelog.d/1877.change.rst b/changelog.d/1877.change.rst
new file mode 100644
index 0000000000..5a744fa3fd
--- /dev/null
+++ b/changelog.d/1877.change.rst
@@ -0,0 +1 @@
+Setuptools now exposes a new entry point hook "setuptools.finalize_distribution_options", enabling plugins like `setuptools_scm <https://pypi.org/project/setuptools_scm>`_ to configure options on the distribution at finalization time.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 2e7fe3bd93..ccbf069be7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1225,7 +1225,7 @@ the quoted part.
 Distributing a ``setuptools``-based project
 ===========================================
 
-Detailed instructions to distribute a setuptools project can be found at 
+Detailed instructions to distribute a setuptools project can be found at
 `Packaging project tutorials`_.
 
 .. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
@@ -1241,7 +1241,7 @@ setup.py is located::
 
 This will generate distribution archives in the `dist` directory.
 
-Before you upload the generated archives make sure you're registered on 
+Before you upload the generated archives make sure you're registered on
 https://test.pypi.org/account/register/. You will also need to verify your email
 to be able to upload any packages.
 You should install twine to be able to upload packages::
@@ -1264,11 +1264,11 @@ Distributing legacy ``setuptools`` projects using ez_setup.py
 
 .. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
 
-Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is 
+Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is
 deprecated in favor of PIP. Please consider migrating to using pip and twine based
 distribution.
 
-However, if you still have any ``ez_setup`` based packages, documentation for 
+However, if you still have any ``ez_setup`` based packages, documentation for
 ez_setup based distributions can be found at `ez_setup distribution guide`_.
 
 .. _ez_setup distribution guide: ez_setup.html
@@ -2515,6 +2515,10 @@ script defines entry points for them!
 Adding ``setup()`` Arguments
 ----------------------------
 
+.. warning:: Adding arguments to setup is discouraged as such arguments
+   are only supported through imperative execution and not supported through
+   declarative config.
+
 Sometimes, your commands may need additional arguments to the ``setup()``
 call.  You can enable this by defining entry points in the
 ``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
@@ -2566,6 +2570,25 @@ script using your extension lists your project in its ``setup_requires``
 argument.
 
 
+Customizing Distribution Options
+--------------------------------
+
+Plugins may wish to extend or alter the options on a Distribution object to
+suit the purposes of that project. For example, a tool that infers the
+``Distribution.version`` from SCM-metadata may need to hook into the
+option finalization. To enable this feature, Setuptools offers an entry
+point "setuptools.finalize_distribution_options". That entry point must
+be a callable taking one argument (the Distribution instance).
+
+If the callable has an ``.order`` property, that value will be used to
+determine the order in which the hook is called. Lower numbers are called
+first and the default is zero (0).
+
+Plugins may read, alter, and set properties on the distribution, but each
+plugin is encouraged to load the configuration/settings for their behavior
+independently.
+
+
 Adding new EGG-INFO Files
 -------------------------
 

From a00798264cf4d55db28585cfc147050a4d579b52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2019 12:49:03 -0500
Subject: [PATCH 7601/8469] Trim excess whitespace

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 399a56d3ca..b7fdf4105a 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1207,7 +1207,7 @@ the quoted part.
 Distributing a ``setuptools``-based project
 ===========================================
 
-Detailed instructions to distribute a setuptools project can be found at 
+Detailed instructions to distribute a setuptools project can be found at
 `Packaging project tutorials`_.
 
 .. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
@@ -1223,7 +1223,7 @@ setup.py is located::
 
 This will generate distribution archives in the `dist` directory.
 
-Before you upload the generated archives make sure you're registered on 
+Before you upload the generated archives make sure you're registered on
 https://test.pypi.org/account/register/. You will also need to verify your email
 to be able to upload any packages.
 You should install twine to be able to upload packages::

From a1e956b20f11f2d02f5a9855bda37660080184c9 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 16 Nov 2019 23:30:10 +0100
Subject: [PATCH 7602/8469] Revert "drop easy_install script and associated
 documentation"

This reverts commit 6e1838a9fb5feb000ba9b6a3c37c8b39d7e872b3.
---
 docs/easy_install.txt                 | 1085 +++++++++++++++++++++++++
 docs/index.txt                        |    1 +
 easy_install.py                       |    5 +
 setup.cfg                             |    1 +
 setup.py                              |   19 +
 setuptools/command/easy_install.py    |   55 +-
 setuptools/tests/test_easy_install.py |   34 +-
 setuptools/tests/test_namespaces.py   |    5 +-
 8 files changed, 1184 insertions(+), 21 deletions(-)
 create mode 100644 docs/easy_install.txt
 create mode 100644 easy_install.py

diff --git a/docs/easy_install.txt b/docs/easy_install.txt
new file mode 100644
index 0000000000..544b9efd59
--- /dev/null
+++ b/docs/easy_install.txt
@@ -0,0 +1,1085 @@
+============
+Easy Install
+============
+
+.. warning::
+    Easy Install is deprecated. Do not use it. Instead use pip. If
+    you think you need Easy Install, please reach out to the PyPA
+    team (a ticket to pip or setuptools is fine), describing your
+    use-case.
+
+Easy Install is a python module (``easy_install``) bundled with ``setuptools``
+that lets you automatically download, build, install, and manage Python
+packages.
+
+Please share your experiences with us! If you encounter difficulty installing
+a package, please contact us via the `distutils mailing list
+<http://mail.python.org/pipermail/distutils-sig/>`_.  (Note: please DO NOT send
+private email directly to the author of setuptools; it will be discarded.  The
+mailing list is a searchable archive of previously-asked and answered
+questions; you should begin your research there before reporting something as a
+bug -- and then do so via list discussion first.)
+
+(Also, if you'd like to learn about how you can use ``setuptools`` to make your
+own packages work better with EasyInstall, or provide EasyInstall-like features
+without requiring your users to use EasyInstall directly, you'll probably want
+to check out the full documentation as well.)
+
+.. contents:: **Table of Contents**
+
+
+Using "Easy Install"
+====================
+
+
+.. _installation instructions:
+
+Installing "Easy Install"
+-------------------------
+
+Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
+for download links and basic installation instructions for each of the
+supported platforms.
+
+You will need at least Python 3.4 or 2.7.  An ``easy_install`` script will be
+installed in the normal location for Python scripts on your platform.
+
+Note that the instructions on the setuptools PyPI page assume that you are
+are installing to Python's primary ``site-packages`` directory.  If this is
+not the case, you should consult the section below on `Custom Installation
+Locations`_ before installing.  (And, on Windows, you should not use the
+``.exe`` installer when installing to an alternate location.)
+
+Note that ``easy_install`` normally works by downloading files from the
+internet.  If you are behind an NTLM-based firewall that prevents Python
+programs from accessing the net directly, you may wish to first install and use
+the `APS proxy server <http://ntlmaps.sf.net/>`_, which lets you get past such
+firewalls in the same way that your web browser(s) do.
+
+(Alternately, if you do not wish easy_install to actually download anything, you
+can restrict it from doing so with the ``--allow-hosts`` option; see the
+sections on `restricting downloads with --allow-hosts`_ and `command-line
+options`_ for more details.)
+
+
+Troubleshooting
+~~~~~~~~~~~~~~~
+
+If EasyInstall/setuptools appears to install correctly, and you can run the
+``easy_install`` command but it fails with an ``ImportError``, the most likely
+cause is that you installed to a location other than ``site-packages``,
+without taking any of the steps described in the `Custom Installation
+Locations`_ section below.  Please see that section and follow the steps to
+make sure that your custom location will work correctly.  Then re-install.
+
+Similarly, if you can run ``easy_install``, and it appears to be installing
+packages, but then you can't import them, the most likely issue is that you
+installed EasyInstall correctly but are using it to install packages to a
+non-standard location that hasn't been properly prepared.  Again, see the
+section on `Custom Installation Locations`_ for more details.
+
+
+Windows Notes
+~~~~~~~~~~~~~
+
+Installing setuptools will provide an ``easy_install`` command according to
+the techniques described in `Executables and Launchers`_. If the
+``easy_install`` command is not available after installation, that section
+provides details on how to configure Windows to make the commands available.
+
+
+Downloading and Installing a Package
+------------------------------------
+
+For basic use of ``easy_install``, you need only supply the filename or URL of
+a source distribution or .egg file (`Python Egg`__).
+
+__ http://peak.telecommunity.com/DevCenter/PythonEggs
+
+**Example 1**. Install a package by name, searching PyPI for the latest
+version, and automatically downloading, building, and installing it::
+
+    easy_install SQLObject
+
+**Example 2**. Install or upgrade a package by name and version by finding
+links on a given "download page"::
+
+    easy_install -f http://pythonpaste.org/package_index.html SQLObject
+
+**Example 3**. Download a source distribution from a specified URL,
+automatically building and installing it::
+
+    easy_install http://example.com/path/to/MyPackage-1.2.3.tgz
+
+**Example 4**. Install an already-downloaded .egg file::
+
+    easy_install /my_downloads/OtherPackage-3.2.1-py2.3.egg
+
+**Example 5**.  Upgrade an already-installed package to the latest version
+listed on PyPI::
+
+    easy_install --upgrade PyProtocols
+
+**Example 6**.  Install a source distribution that's already downloaded and
+extracted in the current directory (New in 0.5a9)::
+
+    easy_install .
+
+**Example 7**.  (New in 0.6a1) Find a source distribution or Subversion
+checkout URL for a package, and extract it or check it out to
+``~/projects/sqlobject`` (the name will always be in all-lowercase), where it
+can be examined or edited.  (The package will not be installed, but it can
+easily be installed with ``easy_install ~/projects/sqlobject``.  See `Editing
+and Viewing Source Packages`_ below for more info.)::
+
+    easy_install --editable --build-directory ~/projects SQLObject
+
+**Example 7**. (New in 0.6.11) Install a distribution within your home dir::
+
+    easy_install --user SQLAlchemy
+
+Easy Install accepts URLs, filenames, PyPI package names (i.e., ``distutils``
+"distribution" names), and package+version specifiers.  In each case, it will
+attempt to locate the latest available version that meets your criteria.
+
+When downloading or processing downloaded files, Easy Install recognizes
+distutils source distribution files with extensions of .tgz, .tar, .tar.gz,
+.tar.bz2, or .zip.  And of course it handles already-built .egg
+distributions as well as ``.win32.exe`` installers built using distutils.
+
+By default, packages are installed to the running Python installation's
+``site-packages`` directory, unless you provide the ``-d`` or ``--install-dir``
+option to specify an alternative directory, or specify an alternate location
+using distutils configuration files.  (See `Configuration Files`_, below.)
+
+By default, any scripts included with the package are installed to the running
+Python installation's standard script installation location.  However, if you
+specify an installation directory via the command line or a config file, then
+the default directory for installing scripts will be the same as the package
+installation directory, to ensure that the script will have access to the
+installed package.  You can override this using the ``-s`` or ``--script-dir``
+option.
+
+Installed packages are added to an ``easy-install.pth`` file in the install
+directory, so that Python will always use the most-recently-installed version
+of the package.  If you would like to be able to select which version to use at
+runtime, you should use the ``-m`` or ``--multi-version`` option.
+
+
+Upgrading a Package
+-------------------
+
+You don't need to do anything special to upgrade a package: just install the
+new version, either by requesting a specific version, e.g.::
+
+    easy_install "SomePackage==2.0"
+
+a version greater than the one you have now::
+
+    easy_install "SomePackage>2.0"
+
+using the upgrade flag, to find the latest available version on PyPI::
+
+    easy_install --upgrade SomePackage
+
+or by using a download page, direct download URL, or package filename::
+
+    easy_install -f http://example.com/downloads ExamplePackage
+
+    easy_install http://example.com/downloads/ExamplePackage-2.0-py2.4.egg
+
+    easy_install my_downloads/ExamplePackage-2.0.tgz
+
+If you're using ``-m`` or ``--multi-version`` , using the ``require()``
+function at runtime automatically selects the newest installed version of a
+package that meets your version criteria.  So, installing a newer version is
+the only step needed to upgrade such packages.
+
+If you're installing to a directory on PYTHONPATH, or a configured "site"
+directory (and not using ``-m``), installing a package automatically replaces
+any previous version in the ``easy-install.pth`` file, so that Python will
+import the most-recently installed version by default.  So, again, installing
+the newer version is the only upgrade step needed.
+
+If you haven't suppressed script installation (using ``--exclude-scripts`` or
+``-x``), then the upgraded version's scripts will be installed, and they will
+be automatically patched to ``require()`` the corresponding version of the
+package, so that you can use them even if they are installed in multi-version
+mode.
+
+``easy_install`` never actually deletes packages (unless you're installing a
+package with the same name and version number as an existing package), so if
+you want to get rid of older versions of a package, please see `Uninstalling
+Packages`_, below.
+
+
+Changing the Active Version
+---------------------------
+
+If you've upgraded a package, but need to revert to a previously-installed
+version, you can do so like this::
+
+    easy_install PackageName==1.2.3
+
+Where ``1.2.3`` is replaced by the exact version number you wish to switch to.
+If a package matching the requested name and version is not already installed
+in a directory on ``sys.path``, it will be located via PyPI and installed.
+
+If you'd like to switch to the latest installed version of ``PackageName``, you
+can do so like this::
+
+    easy_install PackageName
+
+This will activate the latest installed version.  (Note: if you have set any
+``find_links`` via distutils configuration files, those download pages will be
+checked for the latest available version of the package, and it will be
+downloaded and installed if it is newer than your current version.)
+
+Note that changing the active version of a package will install the newly
+active version's scripts, unless the ``--exclude-scripts`` or ``-x`` option is
+specified.
+
+
+Uninstalling Packages
+---------------------
+
+If you have replaced a package with another version, then you can just delete
+the package(s) you don't need by deleting the PackageName-versioninfo.egg file
+or directory (found in the installation directory).
+
+If you want to delete the currently installed version of a package (or all
+versions of a package), you should first run::
+
+    easy_install -m PackageName
+
+This will ensure that Python doesn't continue to search for a package you're
+planning to remove. After you've done this, you can safely delete the .egg
+files or directories, along with any scripts you wish to remove.
+
+
+Managing Scripts
+----------------
+
+Whenever you install, upgrade, or change versions of a package, EasyInstall
+automatically installs the scripts for the selected package version, unless
+you tell it not to with ``-x`` or ``--exclude-scripts``.  If any scripts in
+the script directory have the same name, they are overwritten.
+
+Thus, you do not normally need to manually delete scripts for older versions of
+a package, unless the newer version of the package does not include a script
+of the same name.  However, if you are completely uninstalling a package, you
+may wish to manually delete its scripts.
+
+EasyInstall's default behavior means that you can normally only run scripts
+from one version of a package at a time.  If you want to keep multiple versions
+of a script available, however, you can simply use the ``--multi-version`` or
+``-m`` option, and rename the scripts that EasyInstall creates.  This works
+because EasyInstall installs scripts as short code stubs that ``require()`` the
+matching version of the package the script came from, so renaming the script
+has no effect on what it executes.
+
+For example, suppose you want to use two versions of the ``rst2html`` tool
+provided by the `docutils <http://docutils.sf.net/>`_ package.  You might
+first install one version::
+
+    easy_install -m docutils==0.3.9
+
+then rename the ``rst2html.py`` to ``r2h_039``, and install another version::
+
+    easy_install -m docutils==0.3.10
+
+This will create another ``rst2html.py`` script, this one using docutils
+version 0.3.10 instead of 0.3.9.  You now have two scripts, each using a
+different version of the package.  (Notice that we used ``-m`` for both
+installations, so that Python won't lock us out of using anything but the most
+recently-installed version of the package.)
+
+
+Executables and Launchers
+-------------------------
+
+On Unix systems, scripts are installed with as natural files with a "#!"
+header and no extension and they launch under the Python version indicated in
+the header.
+
+On Windows, there is no mechanism to "execute" files without extensions, so
+EasyInstall provides two techniques to mirror the Unix behavior. The behavior
+is indicated by the SETUPTOOLS_LAUNCHER environment variable, which may be
+"executable" (default) or "natural".
+
+Regardless of the technique used, the script(s) will be installed to a Scripts
+directory (by default in the Python installation directory). It is recommended
+for EasyInstall that you ensure this directory is in the PATH environment
+variable. The easiest way to ensure the Scripts directory is in the PATH is
+to run ``Tools\Scripts\win_add2path.py`` from the Python directory.
+
+Note that instead of changing your ``PATH`` to include the Python scripts
+directory, you can also retarget the installation location for scripts so they
+go on a directory that's already on the ``PATH``.  For more information see
+`Command-Line Options`_ and `Configuration Files`_.  During installation,
+pass command line options (such as ``--script-dir``) to control where
+scripts will be installed.
+
+
+Windows Executable Launcher
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the "executable" launcher is used, EasyInstall will create a '.exe'
+launcher of the same name beside each installed script (including
+``easy_install`` itself). These small .exe files launch the script of the
+same name using the Python version indicated in the '#!' header.
+
+This behavior is currently default. To force
+the use of executable launchers, set ``SETUPTOOLS_LAUNCHER`` to "executable".
+
+Natural Script Launcher
+~~~~~~~~~~~~~~~~~~~~~~~
+
+EasyInstall also supports deferring to an external launcher such as
+`pylauncher <https://bitbucket.org/pypa/pylauncher>`_ for launching scripts.
+Enable this experimental functionality by setting the
+``SETUPTOOLS_LAUNCHER`` environment variable to "natural". EasyInstall will
+then install scripts as simple
+scripts with a .pya (or .pyw) extension appended. If these extensions are
+associated with the pylauncher and listed in the PATHEXT environment variable,
+these scripts can then be invoked simply and directly just like any other
+executable. This behavior may become default in a future version.
+
+EasyInstall uses the .pya extension instead of simply
+the typical '.py' extension. This distinct extension is necessary to prevent
+Python
+from treating the scripts as importable modules (where name conflicts exist).
+Current releases of pylauncher do not yet associate with .pya files by
+default, but future versions should do so.
+
+
+Tips & Techniques
+-----------------
+
+Multiple Python Versions
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+EasyInstall installs itself under two names:
+``easy_install`` and ``easy_install-N.N``, where ``N.N`` is the Python version
+used to install it.  Thus, if you install EasyInstall for both Python 3.2 and
+2.7, you can use the ``easy_install-3.2`` or ``easy_install-2.7`` scripts to
+install packages for the respective Python version.
+
+Setuptools also supplies easy_install as a runnable module which may be
+invoked using ``python -m easy_install`` for any Python with Setuptools
+installed.
+
+Restricting Downloads with ``--allow-hosts``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can use the ``--allow-hosts`` (``-H``) option to restrict what domains
+EasyInstall will look for links and downloads on.  ``--allow-hosts=None``
+prevents downloading altogether.  You can also use wildcards, for example
+to restrict downloading to hosts in your own intranet.  See the section below
+on `Command-Line Options`_ for more details on the ``--allow-hosts`` option.
+
+By default, there are no host restrictions in effect, but you can change this
+default by editing the appropriate `configuration files`_ and adding:
+
+.. code-block:: ini
+
+    [easy_install]
+    allow_hosts = *.myintranet.example.com,*.python.org
+
+The above example would then allow downloads only from hosts in the
+``python.org`` and ``myintranet.example.com`` domains, unless overridden on the
+command line.
+
+
+Installing on Un-networked Machines
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Just copy the eggs or source packages you need to a directory on the target
+machine, then use the ``-f`` or ``--find-links`` option to specify that
+directory's location.  For example::
+
+    easy_install -H None -f somedir SomePackage
+
+will attempt to install SomePackage using only eggs and source packages found
+in ``somedir`` and disallowing all remote access.  You should of course make
+sure you have all of SomePackage's dependencies available in somedir.
+
+If you have another machine of the same operating system and library versions
+(or if the packages aren't platform-specific), you can create the directory of
+eggs using a command like this::
+
+    easy_install -zmaxd somedir SomePackage
+
+This will tell EasyInstall to put zipped eggs or source packages for
+SomePackage and all its dependencies into ``somedir``, without creating any
+scripts or .pth files.  You can then copy the contents of ``somedir`` to the
+target machine.  (``-z`` means zipped eggs, ``-m`` means multi-version, which
+prevents .pth files from being used, ``-a`` means to copy all the eggs needed,
+even if they're installed elsewhere on the machine, and ``-d`` indicates the
+directory to place the eggs in.)
+
+You can also build the eggs from local development packages that were installed
+with the ``setup.py develop`` command, by including the ``-l`` option, e.g.::
+
+    easy_install -zmaxld somedir SomePackage
+
+This will use locally-available source distributions to build the eggs.
+
+
+Packaging Others' Projects As Eggs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Need to distribute a package that isn't published in egg form?  You can use
+EasyInstall to build eggs for a project.  You'll want to use the ``--zip-ok``,
+``--exclude-scripts``, and possibly ``--no-deps`` options (``-z``, ``-x`` and
+``-N``, respectively).  Use ``-d`` or ``--install-dir`` to specify the location
+where you'd like the eggs placed.  By placing them in a directory that is
+published to the web, you can then make the eggs available for download, either
+in an intranet or to the internet at large.
+
+If someone distributes a package in the form of a single ``.py`` file, you can
+wrap it in an egg by tacking an ``#egg=name-version`` suffix on the file's URL.
+So, something like this::
+
+    easy_install -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
+
+will install the package as an egg, and this::
+
+    easy_install -zmaxd. \
+        -f "http://some.example.com/downloads/foo.py#egg=foo-1.0" foo
+
+will create a ``.egg`` file in the current directory.
+
+
+Creating your own Package Index
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In addition to local directories and the Python Package Index, EasyInstall can
+find download links on most any web page whose URL is given to the ``-f``
+(``--find-links``) option.  In the simplest case, you can simply have a web
+page with links to eggs or Python source packages, even an automatically
+generated directory listing (such as the Apache web server provides).
+
+If you are setting up an intranet site for package downloads, you may want to
+configure the target machines to use your download site by default, adding
+something like this to their `configuration files`_:
+
+.. code-block:: ini
+
+    [easy_install]
+    find_links = http://mypackages.example.com/somedir/
+                 http://turbogears.org/download/
+                 http://peak.telecommunity.com/dist/
+
+As you can see, you can list multiple URLs separated by whitespace, continuing
+on multiple lines if necessary (as long as the subsequent lines are indented.
+
+If you are more ambitious, you can also create an entirely custom package index
+or PyPI mirror.  See the ``--index-url`` option under `Command-Line Options`_,
+below, and also the section on `Package Index "API"`_.
+
+
+Password-Protected Sites
+------------------------
+
+If a site you want to download from is password-protected using HTTP "Basic"
+authentication, you can specify your credentials in the URL, like so::
+
+    http://some_userid:some_password@some.example.com/some_path/
+
+You can do this with both index page URLs and direct download URLs.  As long
+as any HTML pages read by easy_install use *relative* links to point to the
+downloads, the same user ID and password will be used to do the downloading.
+
+Using .pypirc Credentials
+-------------------------
+
+In additional to supplying credentials in the URL, ``easy_install`` will also
+honor credentials if present in the .pypirc file. Teams maintaining a private
+repository of packages may already have defined access credentials for
+uploading packages according to the distutils documentation. ``easy_install``
+will attempt to honor those if present. Refer to the distutils documentation
+for Python 2.5 or later for details on the syntax.
+
+Controlling Build Options
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+EasyInstall respects standard distutils `Configuration Files`_, so you can use
+them to configure build options for packages that it installs from source.  For
+example, if you are on Windows using the MinGW compiler, you can configure the
+default compiler by putting something like this:
+
+.. code-block:: ini
+
+    [build]
+    compiler = mingw32
+
+into the appropriate distutils configuration file.  In fact, since this is just
+normal distutils configuration, it will affect any builds using that config
+file, not just ones done by EasyInstall.  For example, if you add those lines
+to ``distutils.cfg`` in the ``distutils`` package directory, it will be the
+default compiler for *all* packages you build.  See `Configuration Files`_
+below for a list of the standard configuration file locations, and links to
+more documentation on using distutils configuration files.
+
+
+Editing and Viewing Source Packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes a package's source distribution  contains additional documentation,
+examples, configuration files, etc., that are not part of its actual code.  If
+you want to be able to examine these files, you can use the ``--editable``
+option to EasyInstall, and EasyInstall will look for a source distribution
+or Subversion URL for the package, then download and extract it or check it out
+as a subdirectory of the ``--build-directory`` you specify.  If you then wish
+to install the package after editing or configuring it, you can do so by
+rerunning EasyInstall with that directory as the target.
+
+Note that using ``--editable`` stops EasyInstall from actually building or
+installing the package; it just finds, obtains, and possibly unpacks it for
+you.  This allows you to make changes to the package if necessary, and to
+either install it in development mode using ``setup.py develop`` (if the
+package uses setuptools, that is), or by running ``easy_install projectdir``
+(where ``projectdir`` is the subdirectory EasyInstall created for the
+downloaded package.
+
+In order to use ``--editable`` (``-e`` for short), you *must* also supply a
+``--build-directory`` (``-b`` for short).  The project will be placed in a
+subdirectory of the build directory.  The subdirectory will have the same
+name as the project itself, but in all-lowercase.  If a file or directory of
+that name already exists, EasyInstall will print an error message and exit.
+
+Also, when using ``--editable``, you cannot use URLs or filenames as arguments.
+You *must* specify project names (and optional version requirements) so that
+EasyInstall knows what directory name(s) to create.  If you need to force
+EasyInstall to use a particular URL or filename, you should specify it as a
+``--find-links`` item (``-f`` for short), and then also specify
+the project name, e.g.::
+
+    easy_install -eb ~/projects \
+     -fhttp://prdownloads.sourceforge.net/ctypes/ctypes-0.9.6.tar.gz?download \
+     ctypes==0.9.6
+
+
+Dealing with Installation Conflicts
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+(NOTE: As of 0.6a11, this section is obsolete; it is retained here only so that
+people using older versions of EasyInstall can consult it.  As of version
+0.6a11, installation conflicts are handled automatically without deleting the
+old or system-installed packages, and without ignoring the issue.  Instead,
+eggs are automatically shifted to the front of ``sys.path`` using special
+code added to the ``easy-install.pth`` file.  So, if you are using version
+0.6a11 or better of setuptools, you do not need to worry about conflicts,
+and the following issues do not apply to you.)
+
+EasyInstall installs distributions in a "managed" way, such that each
+distribution can be independently activated or deactivated on ``sys.path``.
+However, packages that were not installed by EasyInstall are "unmanaged",
+in that they usually live all in one directory and cannot be independently
+activated or deactivated.
+
+As a result, if you are using EasyInstall to upgrade an existing package, or
+to install a package with the same name as an existing package, EasyInstall
+will warn you of the conflict.  (This is an improvement over ``setup.py
+install``, because the ``distutils`` just install new packages on top of old
+ones, possibly combining two unrelated packages or leaving behind modules that
+have been deleted in the newer version of the package.)
+
+EasyInstall will stop the installation if it detects a conflict
+between an existing, "unmanaged" package, and a module or package in any of
+the distributions you're installing.  It will display a list of all of the
+existing files and directories that would need to be deleted for the new
+package to be able to function correctly.  To proceed, you must manually
+delete these conflicting files and directories and re-run EasyInstall.
+
+Of course, once you've replaced all of your existing "unmanaged" packages with
+versions managed by EasyInstall, you won't have any more conflicts to worry
+about!
+
+
+Compressed Installation
+~~~~~~~~~~~~~~~~~~~~~~~
+
+EasyInstall tries to install packages in zipped form, if it can.  Zipping
+packages can improve Python's overall import performance if you're not using
+the ``--multi-version`` option, because Python processes zipfile entries on
+``sys.path`` much faster than it does directories.
+
+As of version 0.5a9, EasyInstall analyzes packages to determine whether they
+can be safely installed as a zipfile, and then acts on its analysis.  (Previous
+versions would not install a package as a zipfile unless you used the
+``--zip-ok`` option.)
+
+The current analysis approach is fairly conservative; it currently looks for:
+
+ * Any use of the ``__file__`` or ``__path__`` variables (which should be
+   replaced with ``pkg_resources`` API calls)
+
+ * Possible use of ``inspect`` functions that expect to manipulate source files
+   (e.g. ``inspect.getsource()``)
+
+ * Top-level modules that might be scripts used with ``python -m`` (Python 2.4)
+
+If any of the above are found in the package being installed, EasyInstall will
+assume that the package cannot be safely run from a zipfile, and unzip it to
+a directory instead.  You can override this analysis with the ``-zip-ok`` flag,
+which will tell EasyInstall to install the package as a zipfile anyway.  Or,
+you can use the ``--always-unzip`` flag, in which case EasyInstall will always
+unzip, even if its analysis says the package is safe to run as a zipfile.
+
+Normally, however, it is simplest to let EasyInstall handle the determination
+of whether to zip or unzip, and only specify overrides when needed to work
+around a problem.  If you find you need to override EasyInstall's guesses, you
+may want to contact the package author and the EasyInstall maintainers, so that
+they can make appropriate changes in future versions.
+
+(Note: If a package uses ``setuptools`` in its setup script, the package author
+has the option to declare the package safe or unsafe for zipped usage via the
+``zip_safe`` argument to ``setup()``.  If the package author makes such a
+declaration, EasyInstall believes the package's author and does not perform its
+own analysis.  However, your command-line option, if any, will still override
+the package author's choice.)
+
+
+Reference Manual
+================
+
+Configuration Files
+-------------------
+
+(New in 0.4a2)
+
+You may specify default options for EasyInstall using the standard
+distutils configuration files, under the command heading ``easy_install``.
+EasyInstall will look first for a ``setup.cfg`` file in the current directory,
+then a ``~/.pydistutils.cfg`` or ``$HOME\\pydistutils.cfg`` (on Unix-like OSes
+and Windows, respectively), and finally a ``distutils.cfg`` file in the
+``distutils`` package directory.  Here's a simple example:
+
+.. code-block:: ini
+
+    [easy_install]
+
+    # set the default location to install packages
+    install_dir = /home/me/lib/python
+
+    # Notice that indentation can be used to continue an option
+    # value; this is especially useful for the "--find-links"
+    # option, which tells easy_install to use download links on
+    # these pages before consulting PyPI:
+    #
+    find_links = http://sqlobject.org/
+                 http://peak.telecommunity.com/dist/
+
+In addition to accepting configuration for its own options under
+``[easy_install]``, EasyInstall also respects defaults specified for other
+distutils commands.  For example, if you don't set an ``install_dir`` for
+``[easy_install]``, but *have* set an ``install_lib`` for the ``[install]``
+command, this will become EasyInstall's default installation directory.  Thus,
+if you are already using distutils configuration files to set default install
+locations, build options, etc., EasyInstall will respect your existing settings
+until and unless you override them explicitly in an ``[easy_install]`` section.
+
+For more information, see also the current Python documentation on the `use and
+location of distutils configuration files <https://docs.python.org/install/index.html#inst-config-files>`_.
+
+Notice that ``easy_install`` will use the ``setup.cfg`` from the current
+working directory only if it was triggered from ``setup.py`` through the
+``install_requires`` option. The standalone command will not use that file.
+
+Command-Line Options
+--------------------
+
+``--zip-ok, -z``
+    Install all packages as zip files, even if they are marked as unsafe for
+    running as a zipfile.  This can be useful when EasyInstall's analysis
+    of a non-setuptools package is too conservative, but keep in mind that
+    the package may not work correctly.  (Changed in 0.5a9; previously this
+    option was required in order for zipped installation to happen at all.)
+
+``--always-unzip, -Z``
+    Don't install any packages as zip files, even if the packages are marked
+    as safe for running as a zipfile.  This can be useful if a package does
+    something unsafe, but not in a way that EasyInstall can easily detect.
+    EasyInstall's default analysis is currently very conservative, however, so
+    you should only use this option if you've had problems with a particular
+    package, and *after* reporting the problem to the package's maintainer and
+    to the EasyInstall maintainers.
+
+    (Note: the ``-z/-Z`` options only affect the installation of newly-built
+    or downloaded packages that are not already installed in the target
+    directory; if you want to convert an existing installed version from
+    zipped to unzipped or vice versa, you'll need to delete the existing
+    version first, and re-run EasyInstall.)
+
+``--multi-version, -m``
+    "Multi-version" mode. Specifying this option prevents ``easy_install`` from
+    adding an ``easy-install.pth`` entry for the package being installed, and
+    if an entry for any version the package already exists, it will be removed
+    upon successful installation. In multi-version mode, no specific version of
+    the package is available for importing, unless you use
+    ``pkg_resources.require()`` to put it on ``sys.path``. This can be as
+    simple as::
+
+        from pkg_resources import require
+        require("SomePackage", "OtherPackage", "MyPackage")
+
+    which will put the latest installed version of the specified packages on
+    ``sys.path`` for you. (For more advanced uses, like selecting specific
+    versions and enabling optional dependencies, see the ``pkg_resources`` API
+    doc.)
+
+    Changed in 0.6a10: this option is no longer silently enabled when
+    installing to a non-PYTHONPATH, non-"site" directory.  You must always
+    explicitly use this option if you want it to be active.
+
+``--upgrade, -U``   (New in 0.5a4)
+    By default, EasyInstall only searches online if a project/version
+    requirement can't be met by distributions already installed
+    on sys.path or the installation directory.  However, if you supply the
+    ``--upgrade`` or ``-U`` flag, EasyInstall will always check the package
+    index and ``--find-links`` URLs before selecting a version to install.  In
+    this way, you can force EasyInstall to use the latest available version of
+    any package it installs (subject to any version requirements that might
+    exclude such later versions).
+
+``--install-dir=DIR, -d DIR``
+    Set the installation directory. It is up to you to ensure that this
+    directory is on ``sys.path`` at runtime, and to use
+    ``pkg_resources.require()`` to enable the installed package(s) that you
+    need.
+
+    (New in 0.4a2) If this option is not directly specified on the command line
+    or in a distutils configuration file, the distutils default installation
+    location is used.  Normally, this would be the ``site-packages`` directory,
+    but if you are using distutils configuration files, setting things like
+    ``prefix`` or ``install_lib``, then those settings are taken into
+    account when computing the default installation directory, as is the
+    ``--prefix`` option.
+
+``--script-dir=DIR, -s DIR``
+    Set the script installation directory.  If you don't supply this option
+    (via the command line or a configuration file), but you *have* supplied
+    an ``--install-dir`` (via command line or config file), then this option
+    defaults to the same directory, so that the scripts will be able to find
+    their associated package installation.  Otherwise, this setting defaults
+    to the location where the distutils would normally install scripts, taking
+    any distutils configuration file settings into account.
+
+``--exclude-scripts, -x``
+    Don't install scripts.  This is useful if you need to install multiple
+    versions of a package, but do not want to reset the version that will be
+    run by scripts that are already installed.
+
+``--user`` (New in 0.6.11)
+    Use the user-site-packages as specified in :pep:`370`
+    instead of the global site-packages.
+
+``--always-copy, -a``   (New in 0.5a4)
+    Copy all needed distributions to the installation directory, even if they
+    are already present in a directory on sys.path.  In older versions of
+    EasyInstall, this was the default behavior, but now you must explicitly
+    request it.  By default, EasyInstall will no longer copy such distributions
+    from other sys.path directories to the installation directory, unless you
+    explicitly gave the distribution's filename on the command line.
+
+    Note that as of 0.6a10, using this option excludes "system" and
+    "development" eggs from consideration because they can't be reliably
+    copied.  This may cause EasyInstall to choose an older version of a package
+    than what you expected, or it may cause downloading and installation of a
+    fresh copy of something that's already installed.  You will see warning
+    messages for any eggs that EasyInstall skips, before it falls back to an
+    older version or attempts to download a fresh copy.
+
+``--find-links=URLS_OR_FILENAMES, -f URLS_OR_FILENAMES``
+    Scan the specified "download pages" or directories for direct links to eggs
+    or other distributions.  Any existing file or directory names or direct
+    download URLs are immediately added to EasyInstall's search cache, and any
+    indirect URLs (ones that don't point to eggs or other recognized archive
+    formats) are added to a list of additional places to search for download
+    links.  As soon as EasyInstall has to go online to find a package (either
+    because it doesn't exist locally, or because ``--upgrade`` or ``-U`` was
+    used), the specified URLs will be downloaded and scanned for additional
+    direct links.
+
+    Eggs and archives found by way of ``--find-links`` are only downloaded if
+    they are needed to meet a requirement specified on the command line; links
+    to unneeded packages are ignored.
+
+    If all requested packages can be found using links on the specified
+    download pages, the Python Package Index will not be consulted unless you
+    also specified the ``--upgrade`` or ``-U`` option.
+
+    (Note: if you want to refer to a local HTML file containing links, you must
+    use a ``file:`` URL, as filenames that do not refer to a directory, egg, or
+    archive are ignored.)
+
+    You may specify multiple URLs or file/directory names with this option,
+    separated by whitespace.  Note that on the command line, you will probably
+    have to surround the URL list with quotes, so that it is recognized as a
+    single option value.  You can also specify URLs in a configuration file;
+    see `Configuration Files`_, above.
+
+    Changed in 0.6a10: previously all URLs and directories passed to this
+    option were scanned as early as possible, but from 0.6a10 on, only
+    directories and direct archive links are scanned immediately; URLs are not
+    retrieved unless a package search was already going to go online due to a
+    package not being available locally, or due to the use of the ``--update``
+    or ``-U`` option.
+
+``--no-find-links`` Blocks the addition of any link.
+    This parameter is useful if you want to avoid adding links defined in a
+    project easy_install is installing (whether it's a requested project or a
+    dependency). When used, ``--find-links`` is ignored.
+
+    Added in Distribute 0.6.11 and Setuptools 0.7.
+
+``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
+    Specifies the base URL of the Python Package Index.  The default is
+    https://pypi.org/simple/ if not specified.  When a package is requested
+    that is not locally available or linked from a ``--find-links`` download
+    page, the package index will be searched for download pages for the needed
+    package, and those download pages will be searched for links to download
+    an egg or source distribution.
+
+``--editable, -e`` (New in 0.6a1)
+    Only find and download source distributions for the specified projects,
+    unpacking them to subdirectories of the specified ``--build-directory``.
+    EasyInstall will not actually build or install the requested projects or
+    their dependencies; it will just find and extract them for you.  See
+    `Editing and Viewing Source Packages`_ above for more details.
+
+``--build-directory=DIR, -b DIR`` (UPDATED in 0.6a1)
+    Set the directory used to build source packages.  If a package is built
+    from a source distribution or checkout, it will be extracted to a
+    subdirectory of the specified directory.  The subdirectory will have the
+    same name as the extracted distribution's project, but in all-lowercase.
+    If a file or directory of that name already exists in the given directory,
+    a warning will be printed to the console, and the build will take place in
+    a temporary directory instead.
+
+    This option is most useful in combination with the ``--editable`` option,
+    which forces EasyInstall to *only* find and extract (but not build and
+    install) source distributions.  See `Editing and Viewing Source Packages`_,
+    above, for more information.
+
+``--verbose, -v, --quiet, -q`` (New in 0.4a4)
+    Control the level of detail of EasyInstall's progress messages.  The
+    default detail level is "info", which prints information only about
+    relatively time-consuming operations like running a setup script, unpacking
+    an archive, or retrieving a URL.  Using ``-q`` or ``--quiet`` drops the
+    detail level to "warn", which will only display installation reports,
+    warnings, and errors.  Using ``-v`` or ``--verbose`` increases the detail
+    level to include individual file-level operations, link analysis messages,
+    and distutils messages from any setup scripts that get run.  If you include
+    the ``-v`` option more than once, the second and subsequent uses are passed
+    down to any setup scripts, increasing the verbosity of their reporting as
+    well.
+
+``--dry-run, -n`` (New in 0.4a4)
+    Don't actually install the package or scripts.  This option is passed down
+    to any setup scripts run, so packages should not actually build either.
+    This does *not* skip downloading, nor does it skip extracting source
+    distributions to a temporary/build directory.
+
+``--optimize=LEVEL``, ``-O LEVEL`` (New in 0.4a4)
+    If you are installing from a source distribution, and are *not* using the
+    ``--zip-ok`` option, this option controls the optimization level for
+    compiling installed ``.py`` files to ``.pyo`` files.  It does not affect
+    the compilation of modules contained in ``.egg`` files, only those in
+    ``.egg`` directories.  The optimization level can be set to 0, 1, or 2;
+    the default is 0 (unless it's set under ``install`` or ``install_lib`` in
+    one of your distutils configuration files).
+
+``--record=FILENAME``  (New in 0.5a4)
+    Write a record of all installed files to FILENAME.  This is basically the
+    same as the same option for the standard distutils "install" command, and
+    is included for compatibility with tools that expect to pass this option
+    to "setup.py install".
+
+``--site-dirs=DIRLIST, -S DIRLIST``   (New in 0.6a1)
+    Specify one or more custom "site" directories (separated by commas).
+    "Site" directories are directories where ``.pth`` files are processed, such
+    as the main Python ``site-packages`` directory.  As of 0.6a10, EasyInstall
+    automatically detects whether a given directory processes ``.pth`` files
+    (or can be made to do so), so you should not normally need to use this
+    option.  It is is now only necessary if you want to override EasyInstall's
+    judgment and force an installation directory to be treated as if it
+    supported ``.pth`` files.
+
+``--no-deps, -N``  (New in 0.6a6)
+    Don't install any dependencies.  This is intended as a convenience for
+    tools that wrap eggs in a platform-specific packaging system.  (We don't
+    recommend that you use it for anything else.)
+
+``--allow-hosts=PATTERNS, -H PATTERNS``   (New in 0.6a6)
+    Restrict downloading and spidering to hosts matching the specified glob
+    patterns.  E.g. ``-H *.python.org`` restricts web access so that only
+    packages listed and downloadable from machines in the ``python.org``
+    domain.  The glob patterns must match the *entire* user/host/port section of
+    the target URL(s).  For example, ``*.python.org`` will NOT accept a URL
+    like ``http://python.org/foo`` or ``http://www.python.org:8080/``.
+    Multiple patterns can be specified by separating them with commas.  The
+    default pattern is ``*``, which matches anything.
+
+    In general, this option is mainly useful for blocking EasyInstall's web
+    access altogether (e.g. ``-Hlocalhost``), or to restrict it to an intranet
+    or other trusted site.  EasyInstall will do the best it can to satisfy
+    dependencies given your host restrictions, but of course can fail if it
+    can't find suitable packages.  EasyInstall displays all blocked URLs, so
+    that you can adjust your ``--allow-hosts`` setting if it is more strict
+    than you intended.  Some sites may wish to define a restrictive default
+    setting for this option in their `configuration files`_, and then manually
+    override the setting on the command line as needed.
+
+``--prefix=DIR`` (New in 0.6a10)
+    Use the specified directory as a base for computing the default
+    installation and script directories.  On Windows, the resulting default
+    directories will be ``prefix\\Lib\\site-packages`` and ``prefix\\Scripts``,
+    while on other platforms the defaults will be
+    ``prefix/lib/python2.X/site-packages`` (with the appropriate version
+    substituted) for libraries and ``prefix/bin`` for scripts.
+
+    Note that the ``--prefix`` option only sets the *default* installation and
+    script directories, and does not override the ones set on the command line
+    or in a configuration file.
+
+``--local-snapshots-ok, -l`` (New in 0.6c6)
+    Normally, EasyInstall prefers to only install *released* versions of
+    projects, not in-development ones, because such projects may not
+    have a currently-valid version number.  So, it usually only installs them
+    when their ``setup.py`` directory is explicitly passed on the command line.
+
+    However, if this option is used, then any in-development projects that were
+    installed using the ``setup.py develop`` command, will be used to build
+    eggs, effectively upgrading the "in-development" project to a snapshot
+    release.  Normally, this option is used only in conjunction with the
+    ``--always-copy`` option to create a distributable snapshot of every egg
+    needed to run an application.
+
+    Note that if you use this option, you must make sure that there is a valid
+    version number (such as an SVN revision number tag) for any in-development
+    projects that may be used, as otherwise EasyInstall may not be able to tell
+    what version of the project is "newer" when future installations or
+    upgrades are attempted.
+
+
+.. _non-root installation:
+
+Custom Installation Locations
+-----------------------------
+
+By default, EasyInstall installs python packages into Python's main ``site-packages`` directory,
+and manages them using a custom ``.pth`` file in that same directory.
+
+Very often though, a user or developer wants ``easy_install`` to install and manage python packages
+in an alternative location, usually for one of 3 reasons:
+
+1. They don't have access to write to the main Python site-packages directory.
+
+2. They want a user-specific stash of packages, that is not visible to other users.
+
+3. They want to isolate a set of packages to a specific python application, usually to minimize
+   the possibility of version conflicts.
+
+Historically, there have been many approaches to achieve custom installation.
+The following section lists only the easiest and most relevant approaches [1]_.
+
+`Use the "--user" option`_
+
+`Use the "--user" option and customize "PYTHONUSERBASE"`_
+
+`Use "virtualenv"`_
+
+.. [1] There are older ways to achieve custom installation using various ``easy_install`` and ``setup.py install`` options, combined with ``PYTHONPATH`` and/or ``PYTHONUSERBASE`` alterations, but all of these are effectively deprecated by the User scheme brought in by `PEP-370`_.
+
+.. _PEP-370: http://www.python.org/dev/peps/pep-0370/
+
+
+Use the "--user" option
+~~~~~~~~~~~~~~~~~~~~~~~
+Python provides a User scheme for installation, which means that all
+python distributions support an alternative install location that is specific to a user [3]_.
+The Default location for each OS is explained in the python documentation
+for the ``site.USER_BASE`` variable.  This mode of installation can be turned on by
+specifying the ``--user`` option to ``setup.py install`` or ``easy_install``.
+This approach serves the need to have a user-specific stash of packages.
+
+.. [3] Prior to the User scheme, there was the Home scheme, which is still available, but requires more effort than the User scheme to get packages recognized.
+
+Use the "--user" option and customize "PYTHONUSERBASE"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The User scheme install location can be customized by setting the ``PYTHONUSERBASE`` environment
+variable, which updates the value of ``site.USER_BASE``.  To isolate packages to a specific
+application, simply set the OS environment of that application to a specific value of
+``PYTHONUSERBASE``, that contains just those packages.
+
+Use "virtualenv"
+~~~~~~~~~~~~~~~~
+"virtualenv" is a 3rd-party python package that effectively "clones" a python installation, thereby
+creating an isolated location to install packages.  The evolution of "virtualenv" started before the existence
+of the User installation scheme.  "virtualenv" provides a version of ``easy_install`` that is
+scoped to the cloned python install and is used in the normal way. "virtualenv" does offer various features
+that the User installation scheme alone does not provide, e.g. the ability to hide the main python site-packages.
+
+Please refer to the `virtualenv`_ documentation for more details.
+
+.. _virtualenv: https://pypi.org/project/virtualenv/
+
+
+
+Package Index "API"
+-------------------
+
+Custom package indexes (and PyPI) must follow the following rules for
+EasyInstall to be able to look up and download packages:
+
+1. Except where stated otherwise, "pages" are HTML or XHTML, and "links"
+   refer to ``href`` attributes.
+
+2. Individual project version pages' URLs must be of the form
+   ``base/projectname/version``, where ``base`` is the package index's base URL.
+
+3. Omitting the ``/version`` part of a project page's URL (but keeping the
+   trailing ``/``) should result in a page that is either:
+
+   a) The single active version of that project, as though the version had been
+      explicitly included, OR
+
+   b) A page with links to all of the active version pages for that project.
+
+4. Individual project version pages should contain direct links to downloadable
+   distributions where possible.  It is explicitly permitted for a project's
+   "long_description" to include URLs, and these should be formatted as HTML
+   links by the package index, as EasyInstall does no special processing to
+   identify what parts of a page are index-specific and which are part of the
+   project's supplied description.
+
+5. Where available, MD5 information should be added to download URLs by
+   appending a fragment identifier of the form ``#md5=...``, where ``...`` is
+   the 32-character hex MD5 digest.  EasyInstall will verify that the
+   downloaded file's MD5 digest matches the given value.
+
+6. Individual project version pages should identify any "homepage" or
+   "download" URLs using ``rel="homepage"`` and ``rel="download"`` attributes
+   on the HTML elements linking to those URLs. Use of these attributes will
+   cause EasyInstall to always follow the provided links, unless it can be
+   determined by inspection that they are downloadable distributions. If the
+   links are not to downloadable distributions, they are retrieved, and if they
+   are HTML, they are scanned for download links. They are *not* scanned for
+   additional "homepage" or "download" links, as these are only processed for
+   pages that are part of a package index site.
+
+7. The root URL of the index, if retrieved with a trailing ``/``, must result
+   in a page containing links to *all* projects' active version pages.
+
+   (Note: This requirement is a workaround for the absence of case-insensitive
+   ``safe_name()`` matching of project names in URL paths. If project names are
+   matched in this fashion (e.g. via the PyPI server, mod_rewrite, or a similar
+   mechanism), then it is not necessary to include this all-packages listing
+   page.)
+
+8. If a package index is accessed via a ``file://`` URL, then EasyInstall will
+   automatically use ``index.html`` files, if present, when trying to read a
+   directory with a trailing ``/`` on the URL.
diff --git a/docs/index.txt b/docs/index.txt
index c251260df6..13a46e74ef 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -21,4 +21,5 @@ Documentation content:
    python3
    development
    roadmap
+   Deprecated: Easy Install <easy_install>
    history
diff --git a/easy_install.py b/easy_install.py
new file mode 100644
index 0000000000..d87e984034
--- /dev/null
+++ b/easy_install.py
@@ -0,0 +1,5 @@
+"""Run the EasyInstall command"""
+
+if __name__ == '__main__':
+    from setuptools.command.easy_install import main
+    main()
diff --git a/setup.cfg b/setup.cfg
index 385ba14df4..42a3d86c6c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -51,6 +51,7 @@ classifiers =
 [options]
 zip_safe = True
 python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+py_modules = easy_install
 packages = find:
 
 [options.packages.find]
diff --git a/setup.py b/setup.py
index 59efc23743..d97895fcc0 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,22 @@ def read_commands():
     return command_ns['__all__']
 
 
+def _gen_console_scripts():
+    yield "easy_install = setuptools.command.easy_install:main"
+
+    # Gentoo distributions manage the python-version-specific scripts
+    # themselves, so those platforms define an environment variable to
+    # suppress the creation of the version-specific scripts.
+    var_names = (
+        'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
+        'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
+    )
+    if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
+        return
+    tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
+    yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
+
+
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
 )
@@ -109,6 +125,9 @@ def pypi_link(pkg_filename):
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
+        "console_scripts": list(_gen_console_scripts()),
+        "setuptools.installation":
+            ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
     dependency_links=[
         pypi_link(
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index d273bc101c..09066f8c86 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -73,7 +73,7 @@
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
-    'get_exe_prefixes',
+    'main', 'get_exe_prefixes',
 ]
 
 
@@ -2289,6 +2289,59 @@ def current_umask():
     return tmp
 
 
+def bootstrap():
+    # This function is called when setuptools*.egg is run using /bin/sh
+    import setuptools
+
+    argv0 = os.path.dirname(setuptools.__path__[0])
+    sys.argv[0] = argv0
+    sys.argv.append(argv0)
+    main()
+
+
+def main(argv=None, **kw):
+    from setuptools import setup
+    from setuptools.dist import Distribution
+
+    class DistributionWithoutHelpCommands(Distribution):
+        common_usage = ""
+
+        def _show_help(self, *args, **kw):
+            with _patch_usage():
+                Distribution._show_help(self, *args, **kw)
+
+    if argv is None:
+        argv = sys.argv[1:]
+
+    with _patch_usage():
+        setup(
+            script_args=['-q', 'easy_install', '-v'] + argv,
+            script_name=sys.argv[0] or 'easy_install',
+            distclass=DistributionWithoutHelpCommands,
+            **kw
+        )
+
+
+@contextlib.contextmanager
+def _patch_usage():
+    import distutils.core
+    USAGE = textwrap.dedent("""
+        usage: %(script)s [options] requirement_or_url ...
+           or: %(script)s --help
+        """).lstrip()
+
+    def gen_usage(script_name):
+        return USAGE % dict(
+            script=os.path.basename(script_name),
+        )
+
+    saved = distutils.core.gen_usage
+    distutils.core.gen_usage = gen_usage
+    try:
+        yield
+    finally:
+        distutils.core.gen_usage = saved
+
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
     """Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""
     
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 68319c2fb6..aa75899a06 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -467,24 +467,22 @@ def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
         """
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
-        monkeypatch.setenv(str('PIP_VERBOSE'), str('1'))
-        # create an sdist that has a build-time dependency.
-        with TestSetupRequires.create_sdist() as dist_file:
-            with contexts.tempdir() as temp_dir:
-                setup_py = os.path.join(temp_dir, 'setup.py')
-                with open(setup_py, 'w') as fp:
-                    fp.write('__import__("setuptools").setup()')
-                temp_install_dir = os.path.join(temp_dir, 'target')
-                os.mkdir(temp_install_dir)
-                with contexts.environment(PYTHONPATH=temp_install_dir):
-                    # attempt to install the dist. It should
-                    # fail because it doesn't exist.
-                    with pytest.raises(SystemExit):
-                        run_setup(setup_py, ['easy_install',
-                                             '--exclude-scripts',
-                                             '--index-url', mock_index.url,
-                                             '--install-dir', temp_install_dir,
-                                             dist_file])
+        with contexts.quiet():
+            # create an sdist that has a build-time dependency.
+            with TestSetupRequires.create_sdist() as dist_file:
+                with contexts.tempdir() as temp_install_dir:
+                    with contexts.environment(PYTHONPATH=temp_install_dir):
+                        ei_params = [
+                            '--index-url', mock_index.url,
+                            '--exclude-scripts',
+                            '--install-dir', temp_install_dir,
+                            dist_file,
+                        ]
+                        with sandbox.save_argv(['easy_install']):
+                            # attempt to install the dist. It should
+                            # fail because it doesn't exist.
+                            with pytest.raises(SystemExit):
+                                easy_install_pkg.main(ei_params)
         # there should have been one requests to the server
         assert [r.path for r in mock_index.requests] == ['/does-not-exist/']
 
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 3c5df68a35..f937d98189 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -64,8 +64,9 @@ def test_pkg_resources_import(self, tmpdir):
         target.mkdir()
         install_cmd = [
             sys.executable,
-            '-m', 'pip.__main__', 'install',
-            '-t', str(target), str(pkg),
+            '-m', 'easy_install',
+            '-d', str(target),
+            str(pkg),
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(install_cmd)

From f265e4089c63bfa17d8024d0d6a574c2aaaa992d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Nov 2019 20:18:24 -0500
Subject: [PATCH 7603/8469] normalize indentation

---
 pytest.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 3b3d4b8b07..1400d12217 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -6,7 +6,7 @@ flake8-ignore =
     setuptools/py*compat.py F811
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
-	# Fail on warnings
-	error
-	# https://github.com/pypa/setuptools/issues/1823
-	ignore:bdist_wininst command is deprecated
+    # Fail on warnings
+    error
+    # https://github.com/pypa/setuptools/issues/1823
+    ignore:bdist_wininst command is deprecated

From 4188aba5265e9b7145b1c5ed10c8e0ae769f70b4 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 17 Nov 2019 22:24:05 +0100
Subject: [PATCH 7604/8469] add changelog entries

---
 changelog.d/1830.breaking.rst | 7 +++++++
 changelog.d/1909.breaking.rst | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 changelog.d/1830.breaking.rst
 create mode 100644 changelog.d/1909.breaking.rst

diff --git a/changelog.d/1830.breaking.rst b/changelog.d/1830.breaking.rst
new file mode 100644
index 0000000000..9f2214ab77
--- /dev/null
+++ b/changelog.d/1830.breaking.rst
@@ -0,0 +1,7 @@
+Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
+ * support for ``python_requires``
+ * better support for wheels (proper handling of priority with respect to PEP 425 tags)
+ * PEP 517/518 support
+ * eggs are not supported
+ * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
+ * pip environment variables are honored (and take precedence over easy_install options)
diff --git a/changelog.d/1909.breaking.rst b/changelog.d/1909.breaking.rst
new file mode 100644
index 0000000000..9f2214ab77
--- /dev/null
+++ b/changelog.d/1909.breaking.rst
@@ -0,0 +1,7 @@
+Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
+ * support for ``python_requires``
+ * better support for wheels (proper handling of priority with respect to PEP 425 tags)
+ * PEP 517/518 support
+ * eggs are not supported
+ * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
+ * pip environment variables are honored (and take precedence over easy_install options)

From b09909462acad0d0175cf2fcef76cf1e1c7adc76 Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Tue, 19 Nov 2019 19:45:20 +0000
Subject: [PATCH 7605/8469] bpo-38839: Fix some unused functions in tests
 (GH-17189)

---
 tests/support.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 041309851d..259af882ec 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -39,8 +39,6 @@ def _log(self, level, msg, args):
         self.logs.append((level, msg, args))
 
     def get_logs(self, *levels):
-        def _format(msg, args):
-            return msg % args
         return [msg % args for level, msg, args
                 in self.logs if level in levels]
 

From d155aa0d61690b7013de968b912a001d18f5cfdd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Nov 2019 14:43:07 -0500
Subject: [PATCH 7606/8469] =?UTF-8?q?Bump=20version:=2041.6.0=20=E2=86=92?=
 =?UTF-8?q?=2042.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              |  2 +-
 CHANGES.rst                   | 20 ++++++++++++++++++++
 changelog.d/1767.change.rst   |  2 --
 changelog.d/1829.change.rst   |  3 ---
 changelog.d/1830.breaking.rst |  7 -------
 changelog.d/1861.change.rst   |  1 -
 changelog.d/1877.change.rst   |  1 -
 changelog.d/1898.breaking.rst |  1 -
 changelog.d/1909.breaking.rst |  7 -------
 setup.cfg                     |  2 +-
 10 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 changelog.d/1767.change.rst
 delete mode 100644 changelog.d/1829.change.rst
 delete mode 100644 changelog.d/1830.breaking.rst
 delete mode 100644 changelog.d/1861.change.rst
 delete mode 100644 changelog.d/1877.change.rst
 delete mode 100644 changelog.d/1898.breaking.rst
 delete mode 100644 changelog.d/1909.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 40db5b03f1..0551f1b044 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 41.6.0
+current_version = 42.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ba7b4647c8..0a8696c2a8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+v42.0.0
+-------
+
+* #1830, #1909: Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
+   * support for ``python_requires``
+   * better support for wheels (proper handling of priority with respect to PEP 425 tags)
+   * PEP 517/518 support
+   * eggs are not supported
+   * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
+   * pip environment variables are honored (and take precedence over easy_install options)
+* #1898: Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
+* #1767: Add support for the ``license_files`` option in ``setup.cfg`` to automatically
+  include multiple license files in a source distribution.
+* #1829: Update handling of wheels compatibility tags:
+  * add support for manylinux2010
+  * fix use of removed 'm' ABI flag in Python 3.8 on Windows
+* #1861: Fix empty namespace package installation from wheel.
+* #1877: Setuptools now exposes a new entry point hook "setuptools.finalize_distribution_options", enabling plugins like `setuptools_scm <https://pypi.org/project/setuptools_scm>`_ to configure options on the distribution at finalization time.
+
+
 v41.6.0
 -------
 
diff --git a/changelog.d/1767.change.rst b/changelog.d/1767.change.rst
deleted file mode 100644
index 5d42aedc87..0000000000
--- a/changelog.d/1767.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for the ``license_files`` option in ``setup.cfg`` to automatically
-include multiple license files in a source distribution.
diff --git a/changelog.d/1829.change.rst b/changelog.d/1829.change.rst
deleted file mode 100644
index 36be832ac5..0000000000
--- a/changelog.d/1829.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update handling of wheels compatibility tags:
-* add support for manylinux2010
-* fix use of removed 'm' ABI flag in Python 3.8 on Windows
diff --git a/changelog.d/1830.breaking.rst b/changelog.d/1830.breaking.rst
deleted file mode 100644
index 9f2214ab77..0000000000
--- a/changelog.d/1830.breaking.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
- * support for ``python_requires``
- * better support for wheels (proper handling of priority with respect to PEP 425 tags)
- * PEP 517/518 support
- * eggs are not supported
- * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
- * pip environment variables are honored (and take precedence over easy_install options)
diff --git a/changelog.d/1861.change.rst b/changelog.d/1861.change.rst
deleted file mode 100644
index 5a4e0a56a9..0000000000
--- a/changelog.d/1861.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix empty namespace package installation from wheel.
diff --git a/changelog.d/1877.change.rst b/changelog.d/1877.change.rst
deleted file mode 100644
index 5a744fa3fd..0000000000
--- a/changelog.d/1877.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now exposes a new entry point hook "setuptools.finalize_distribution_options", enabling plugins like `setuptools_scm <https://pypi.org/project/setuptools_scm>`_ to configure options on the distribution at finalization time.
diff --git a/changelog.d/1898.breaking.rst b/changelog.d/1898.breaking.rst
deleted file mode 100644
index 844a8a42fa..0000000000
--- a/changelog.d/1898.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
diff --git a/changelog.d/1909.breaking.rst b/changelog.d/1909.breaking.rst
deleted file mode 100644
index 9f2214ab77..0000000000
--- a/changelog.d/1909.breaking.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
- * support for ``python_requires``
- * better support for wheels (proper handling of priority with respect to PEP 425 tags)
- * PEP 517/518 support
- * eggs are not supported
- * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
- * pip environment variables are honored (and take precedence over easy_install options)
diff --git a/setup.cfg b/setup.cfg
index 42a3d86c6c..c0aa35bae5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 41.6.0
+version = 42.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 926c80f5e84823f48103f3695f55f23949cc5d37 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 25 Nov 2019 11:24:10 +0100
Subject: [PATCH 7607/8469] wheel: fix `is_compatible` implementation

---
 changelog.d/1918.change.rst    | 1 +
 setuptools/tests/test_wheel.py | 9 +++++++++
 setuptools/wheel.py            | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1918.change.rst

diff --git a/changelog.d/1918.change.rst b/changelog.d/1918.change.rst
new file mode 100644
index 0000000000..29d004566f
--- /dev/null
+++ b/changelog.d/1918.change.rst
@@ -0,0 +1 @@
+Fix regression in handling wheels compatibility tags.
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index d50816c22a..55d346c67c 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -18,6 +18,7 @@
 
 from pkg_resources import Distribution, PathMetadata, PY_MAJOR
 from setuptools.extern.packaging.utils import canonicalize_name
+from setuptools.extern.packaging.tags import parse_tag
 from setuptools.wheel import Wheel
 
 from .contexts import tempdir
@@ -571,3 +572,11 @@ def test_wheel_no_dist_dir():
                 _check_wheel_install(wheel_path, install_dir, None,
                                      project_name,
                                      version, None)
+
+
+def test_wheel_is_compatible(monkeypatch):
+    def sys_tags():
+        for t in parse_tag('cp36-cp36m-manylinux1_x86_64'):
+            yield t
+    monkeypatch.setattr('setuptools.wheel.sys_tags', sys_tags)
+    assert Wheel('onnxruntime-0.1.2-cp36-cp36m-manylinux1_x86_64.whl').is_compatible()
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 3effd79b3f..025aaa828a 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -77,7 +77,7 @@ def tags(self):
 
     def is_compatible(self):
         '''Is the wheel is compatible with the current platform?'''
-        supported_tags = set(map(str, sys_tags()))
+        supported_tags = set((t.interpreter, t.abi, t.platform) for t in sys_tags())
         return next((True for t in self.tags() if t in supported_tags), False)
 
     def egg_name(self):

From e84f616a6507ec9115fad68b221cbf5333d9d2d9 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Mon, 25 Nov 2019 12:08:38 +0100
Subject: [PATCH 7608/8469] =?UTF-8?q?Bump=20version:=2042.0.0=20=E2=86=92?=
 =?UTF-8?q?=2042.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/1918.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1918.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 0551f1b044..e37acce5f9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 42.0.0
+current_version = 42.0.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 0a8696c2a8..da657c2801 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v42.0.1
+-------
+
+* #1918: Fix regression in handling wheels compatibility tags.
+
+
 v42.0.0
 -------
 
diff --git a/changelog.d/1918.change.rst b/changelog.d/1918.change.rst
deleted file mode 100644
index 29d004566f..0000000000
--- a/changelog.d/1918.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression in handling wheels compatibility tags.
diff --git a/setup.cfg b/setup.cfg
index c0aa35bae5..b8e542798a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 42.0.0
+version = 42.0.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 6f46a4b703d4db225e96bb871e1bf6a7c3597329 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 26 Nov 2019 18:46:34 +0100
Subject: [PATCH 7609/8469] fix support for easy_install's find-links option in
 setup.cfg

---
 changelog.d/1921.change.txt           |  1 +
 setuptools/installer.py               | 13 +++++++--
 setuptools/tests/test_easy_install.py | 38 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1921.change.txt

diff --git a/changelog.d/1921.change.txt b/changelog.d/1921.change.txt
new file mode 100644
index 0000000000..7c001eb8ef
--- /dev/null
+++ b/changelog.d/1921.change.txt
@@ -0,0 +1 @@
+Fix support for easy_install's ``find-links`` option in ``setup.cfg``. 
diff --git a/setuptools/installer.py b/setuptools/installer.py
index 35bc3cc550..a5816608f6 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -7,11 +7,20 @@
 
 import pkg_resources
 from setuptools.command.easy_install import easy_install
+from setuptools.extern import six
 from setuptools.wheel import Wheel
 
 from .py31compat import TemporaryDirectory
 
 
+def _fixup_find_links(find_links):
+    """Ensure find-links option end-up being a list of strings."""
+    if isinstance(find_links, six.string_types):
+        return find_links.split()
+    assert isinstance(find_links, (tuple, list))
+    return find_links
+
+
 def _legacy_fetch_build_egg(dist, req):
     """Fetch an egg needed for building.
 
@@ -31,7 +40,7 @@ def _legacy_fetch_build_egg(dist, req):
     if dist.dependency_links:
         links = dist.dependency_links[:]
         if 'find_links' in opts:
-            links = opts['find_links'][1] + links
+            links = _fixup_find_links(opts['find_links'][1]) + links
         opts['find_links'] = ('setup', links)
     install_dir = dist.get_egg_cache_dir()
     cmd = easy_install(
@@ -84,7 +93,7 @@ def fetch_build_egg(dist, req):
     else:
         index_url = None
     if 'find_links' in opts:
-        find_links = opts['find_links'][1][:]
+        find_links = _fixup_find_links(opts['find_links'][1])[:]
     else:
         find_links = []
     if dist.dependency_links:
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aa75899a06..a21651ec78 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -744,6 +744,44 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
         eggs = list(map(str, pkg_resources.find_distributions(os.path.join(test_pkg, '.eggs'))))
         assert eggs == ['dep 1.0']
 
+    @pytest.mark.parametrize('use_legacy_installer,with_dependency_links_in_setup_py',
+                             itertools.product((False, True), (False, True)))
+    def test_setup_requires_with_find_links_in_setup_cfg(self, monkeypatch,
+                                                         use_legacy_installer,
+                                                         with_dependency_links_in_setup_py):
+        monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+        monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                make_trivial_sdist(os.path.join(temp_dir, 'python-xlib-42.tar.gz'), 'python-xlib', '42')
+                test_pkg = os.path.join(temp_dir, 'test_pkg')
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+                os.mkdir(test_pkg)
+                with open(test_setup_py, 'w') as fp:
+                    if with_dependency_links_in_setup_py:
+                        dependency_links = [os.path.join(temp_dir, 'links')]
+                    else:
+                        dependency_links = []
+                    fp.write(DALS(
+                        '''
+                        from setuptools import installer, setup
+                        if {use_legacy_installer}:
+                            installer.fetch_build_egg = installer._legacy_fetch_build_egg
+                        setup(setup_requires='python-xlib==42',
+                        dependency_links={dependency_links!r})
+                        ''').format(use_legacy_installer=use_legacy_installer,
+                                    dependency_links=dependency_links))
+                with open(test_setup_cfg, 'w') as fp:
+                    fp.write(DALS(
+                        '''
+                        [easy_install]
+                        index_url = {index_url}
+                        find_links = {find_links}
+                        ''').format(index_url=os.path.join(temp_dir, 'index'),
+                                    find_links=temp_dir))
+                run_setup(test_setup_py, [str('--version')])
+
 
 def make_trivial_sdist(dist_path, distname, version):
     """

From 7502dc9ca767927db9599f93cd48851ca59f7a62 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Tue, 26 Nov 2019 20:56:57 +0100
Subject: [PATCH 7610/8469] fix possible issue with transitive build
 dependencies

Handle the case where a missing transitive build dependency is
required by an extra for an already installed build dependency.
---
 changelog.d/1922.change.rst           |  1 +
 setuptools/installer.py               |  7 +++--
 setuptools/tests/test_easy_install.py | 44 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1922.change.rst

diff --git a/changelog.d/1922.change.rst b/changelog.d/1922.change.rst
new file mode 100644
index 0000000000..7aeb251c84
--- /dev/null
+++ b/changelog.d/1922.change.rst
@@ -0,0 +1 @@
+Fix possible issue with transitive build dependencies.
diff --git a/setuptools/installer.py b/setuptools/installer.py
index 35bc3cc550..ba9cfce9ff 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -64,8 +64,11 @@ def fetch_build_egg(dist, req):
         pkg_resources.get_distribution('wheel')
     except pkg_resources.DistributionNotFound:
         dist.announce('WARNING: The wheel package is not available.', log.WARN)
-    if not isinstance(req, pkg_resources.Requirement):
-        req = pkg_resources.Requirement.parse(req)
+    # Ignore environment markers: if we're here, it's needed. This ensure
+    # we don't try to ask pip for something like `babel; extra == "i18n"`,
+    # which would always be ignored.
+    req = pkg_resources.Requirement.parse(str(req))
+    req.marker = None
     # Take easy_install options into account, but do not override relevant
     # pip environment variables (like PIP_INDEX_URL or PIP_QUIET); they'll
     # take precedence.
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index aa75899a06..f6da1b16cb 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -37,6 +37,7 @@
 import pkg_resources
 
 from . import contexts
+from .files import build_files
 from .textwrap import DALS
 
 __metaclass__ = type
@@ -744,6 +745,49 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
         eggs = list(map(str, pkg_resources.find_distributions(os.path.join(test_pkg, '.eggs'))))
         assert eggs == ['dep 1.0']
 
+    def test_setup_requires_with_transitive_extra_dependency(self, monkeypatch):
+        # Use case: installing a package with a build dependency on
+        # an already installed `dep[extra]`, which in turn depends
+        # on `extra_dep` (whose is not already installed).
+        with contexts.save_pkg_resources_state():
+            with contexts.tempdir() as temp_dir:
+                # Create source distribution for `extra_dep`.
+                make_trivial_sdist(os.path.join(temp_dir, 'extra_dep-1.0.tar.gz'), 'extra_dep', '1.0')
+                # Create source tree for `dep`.
+                dep_pkg = os.path.join(temp_dir, 'dep')
+                os.mkdir(dep_pkg)
+                build_files({
+                    'setup.py':
+                    DALS("""
+                          import setuptools
+                          setuptools.setup(
+                              name='dep', version='2.0',
+                              extras_require={'extra': ['extra_dep']},
+                          )
+                         """),
+                    'setup.cfg': '',
+                }, prefix=dep_pkg)
+                # "Install" dep.
+                run_setup(os.path.join(dep_pkg, 'setup.py'), [str('dist_info')])
+                working_set.add_entry(dep_pkg)
+                # Create source tree for test package.
+                test_pkg = os.path.join(temp_dir, 'test_pkg')
+                test_setup_py = os.path.join(test_pkg, 'setup.py')
+                test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
+                os.mkdir(test_pkg)
+                with open(test_setup_py, 'w') as fp:
+                    fp.write(DALS(
+                        '''
+                        from setuptools import installer, setup
+                        setup(setup_requires='dep[extra]')
+                        '''))
+                # Check...
+                monkeypatch.setenv(str('PIP_FIND_LINKS'), str(temp_dir))
+                monkeypatch.setenv(str('PIP_NO_INDEX'), str('1'))
+                monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
+                monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+                run_setup(test_setup_py, [str('--version')])
+
 
 def make_trivial_sdist(dist_path, distname, version):
     """

From b10e8186a9305d1f899f0fd7d1319b7b15ed1ecd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 20:33:33 -0500
Subject: [PATCH 7611/8469] Rebrand to 'For Enterprise'

---
 docs/_templates/tidelift-sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_templates/tidelift-sidebar.html b/docs/_templates/tidelift-sidebar.html
index c89c0f09d0..ce48f46b8a 100644
--- a/docs/_templates/tidelift-sidebar.html
+++ b/docs/_templates/tidelift-sidebar.html
@@ -1,6 +1,6 @@
-<h3 class="donation">Professional support</h3>
+<h3 class="donation">For Enterprise</h3>
 
 <p>
 Professionally-supported {{ project }} is available with the
-<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=readme">Tidelift Subscription</a>.
+<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=referral">Tidelift Subscription</a>.
 </p>

From bb357fb88ca6df10b84235eff42bafa1461b2b75 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 20:38:21 -0500
Subject: [PATCH 7612/8469] Add a 'For Enterprise' section to the README

---
 README.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.rst b/README.rst
index 420bfb4f04..7b317c718e 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,15 @@
 .. image:: https://tidelift.com/badges/package/pypi/PROJECT
    :target: https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=readme
 
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=referral&utm_campaign=github>`_.
+
 Security Contact
 ================
 

From cbd977b8252f1df53aca7f09cf6160590b3b2ed0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 20:42:33 -0500
Subject: [PATCH 7613/8469] Rename 'Professional support' to 'For Enterprise'
 and add section on 'For Enterprise' to the README (linking to Tidelift).

---
 README.rst                        | 11 ++++++++++-
 docs/_templates/indexsidebar.html | 14 +++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index dac8a46873..da0549a98a 100644
--- a/README.rst
+++ b/README.rst
@@ -34,8 +34,17 @@ To report a security vulnerability, please use the
 Tidelift will coordinate the fix and disclosure.
 
 
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+Setuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.
+
 Code of Conduct
----------------
+===============
 
 Everyone interacting in the setuptools project's codebases, issue trackers,
 chat rooms, and mailing lists is expected to follow the
diff --git a/docs/_templates/indexsidebar.html b/docs/_templates/indexsidebar.html
index 504de6b069..d803b8a37a 100644
--- a/docs/_templates/indexsidebar.html
+++ b/docs/_templates/indexsidebar.html
@@ -1,3 +1,10 @@
+<h3 class="donation">For Enterprise</h3>
+
+<p>
+Professionally-supported {{ project }} is available with the
+<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=referral">Tidelift Subscription</a>.
+</p>
+
 <h3>Download</h3>
 
 <p>Current version: <b>{{ version }}</b></p>
@@ -6,10 +13,3 @@ <h3>Download</h3>
 <h3>Questions? Suggestions? Contributions?</h3>
 
 <p>Visit the <a href="{{ package_url }}">Project page</a> </p>
-
-<h3 class="donation">Professional support</h3>
-
-<p>
-Professionally-supported {{ project }} is available with the
-<a href="https://tidelift.com/subscription/pkg/pypi-{{ project }}?utm_source=pypi-{{ project }}&utm_medium=readme">Tidelift Subscription</a>.
-</p>

From 769658cc0fb73347d044de0279dc0a361c04b316 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 21:05:15 -0500
Subject: [PATCH 7614/8469] Don't pin to old Python as 'default'

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7088d16621..f37529d964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,7 @@ jobs:
     env: DISABLE_COVERAGE=1
   - python: 3.4
   - python: 3.5
-  - &default_py
-    python: 3.6
+  - python: 3.6
   - python: 3.7
   - &latest_py3
     python: 3.8
@@ -24,7 +23,7 @@ jobs:
   - python: 3.8-dev
   - <<: *latest_py3
     env: TOXENV=docs DISABLE_COVERAGE=1
-  - <<: *default_py
+  - <<: *latest_py3
     stage: deploy (to PyPI for tagged commits)
     if: tag IS present
     install: skip

From d7bdf132857be9da15a6c3b733f97e998725cdba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 21:07:53 -0500
Subject: [PATCH 7615/8469] Add 'release' tox environment from jaraco/skeleton

---
 tox.ini | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tox.ini b/tox.ini
index 5d439cb34b..faccffdce1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,3 +55,18 @@ source=
 	setuptools
 omit=
 	*/_vendor/*
+
+[testenv:release]
+skip_install = True
+deps =
+	pep517>=0.5
+	twine[keyring]>=1.13
+	path
+passenv =
+	TWINE_PASSWORD
+setenv =
+	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
+commands =
+	python -c "import path; path.Path('dist').rmtree_p()"
+	python -m pep517.build .
+	python -m twine upload dist/*

From ef3c044ca799e8796a872170adc09796ef59f7da Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 21:17:01 -0500
Subject: [PATCH 7616/8469] Invoke bootstrap prior to cutting release.

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index faccffdce1..a82b902bc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,6 +67,7 @@ passenv =
 setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
 commands =
+	python -m bootstrap
 	python -c "import path; path.Path('dist').rmtree_p()"
 	python -m pep517.build .
 	python -m twine upload dist/*

From 350a74162aa4b4893d2d50a4455304755e2014be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 Nov 2019 21:24:24 -0500
Subject: [PATCH 7617/8469] Simply invoke the tox 'release' environment to cut
 releases.

---
 .travis.yml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f37529d964..bcff8ad960 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,25 +24,11 @@ jobs:
   - <<: *latest_py3
     env: TOXENV=docs DISABLE_COVERAGE=1
   - <<: *latest_py3
-    stage: deploy (to PyPI for tagged commits)
+    stage: deploy
     if: tag IS present
     install: skip
-    script: skip
-    after_success: true
-    before_deploy:
-      - python bootstrap.py
-      - "! grep pyc setuptools.egg-info/SOURCES.txt"
-    deploy:
-      provider: pypi
-      on:
-        tags: true
-        all_branches: true
-      user: __token__
-      password:
-        secure: FSp9KU+pdvWPxBOaxe6BNmcJ9y8259G3/NdTJ00r0qx/xMLpSneGjpuLqoD6BL2JoM6gRwurwakWoH/9Ah+Di7afETjMnL6WJKtDZ+Uu3YLx3ss7/FlhVz6zmVTaDJUzuo9dGr//qLBQTIxVjGYfQelRJyfMAXtrYWdeT/4489E45lMw+86Z/vnSBOxs4lWekeQW5Gem0cDViWu67RRiGkAEvrYVwuImMr2Dyhpv+l/mQGQIS/ezXuAEFToE6+q8VUVe/aK498Qovdc+O4M7OYk1JouFpffZ3tVZ6iWHQFcR11480UdI6VCIcFpPvGC/J8MWUWLjq7YOm0X9jPXgdYMUQLAP4clFgUr2qNoRSKWfuQlNdVVuS2htYcjJ3eEl90FhcIZKp+WVMrypRPOQJ8CBielZEs0dhytRrZSaJC1BNq25O/BPzws8dL8hYtoXsM6I3Zv5cZgdyqyq/eOEMCX7Cetv6do0U41VGEV5UohvyyuwH5l9GCuPREpY3sXayPg8fw7XcPjvvzSVyjcUT/ePW8sfnAyWZnngjweAn6dK8IFGPuSPQdlos78uxeUOvCVUW0xv/0m4lX73yoHdVVdLbu1MJTyibFGec86Bew9JqIcDlhHaIJ9ihZ9Z9tOtvp1cuNyKYE4kvmOtumDDicEw4DseYn2z5sZDTYTBsKY=
-      distributions: release
-      skip_cleanup: true
-      skip_upload_docs: true
+    script: tox -e release
+    after_success: skip
 
 cache: pip
 

From 6429e2c54ba8d6cbb2d8d8e7108b91122cb7039a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 08:55:53 -0500
Subject: [PATCH 7618/8469] Restore 'setup.py' release step

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index a82b902bc9..21ec6cde98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,7 +59,7 @@ omit=
 [testenv:release]
 skip_install = True
 deps =
-	pep517>=0.5
+	wheel
 	twine[keyring]>=1.13
 	path
 passenv =
@@ -69,5 +69,5 @@ setenv =
 commands =
 	python -m bootstrap
 	python -c "import path; path.Path('dist').rmtree_p()"
-	python -m pep517.build .
+	python setup.py release
 	python -m twine upload dist/*

From 7a709b6d30dac9409707b1b9bf50cd7022e35118 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 09:14:49 -0500
Subject: [PATCH 7619/8469] Restore build-backend and remove switch to avoid
 pep517. Ref #1644.

---
 pyproject.toml   | 3 ++-
 tools/tox_pip.py | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 07c23bb5f5..5a2d7d3b67 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
-requires = ["wheel"]
+requires = ["setuptools >= 40.8", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [tool.towncrier]
     package = "setuptools"
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 5aeca80503..63518f927e 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -21,12 +21,6 @@ def pip(args):
     pypath = pypath.split(os.pathsep) if pypath is not None else []
     pypath.insert(0, TOX_PIP_DIR)
     os.environ['PYTHONPATH'] = os.pathsep.join(pypath)
-    # Disable PEP 517 support when using editable installs.
-    for n, a in enumerate(args):
-        if not a.startswith('-'):
-            if a in 'install' and '-e' in args[n:]:
-                args.insert(n + 1, '--no-use-pep517')
-            break
     # Fix call for setuptools editable install.
     for n, a in enumerate(args):
         if a == '.':

From 2292718a151994efb7d364312c73d5b536988049 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 09:23:31 -0500
Subject: [PATCH 7620/8469] Reword changelog to give more context

---
 changelog.d/1922.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1922.change.rst b/changelog.d/1922.change.rst
index 7aeb251c84..837ef9c9e8 100644
--- a/changelog.d/1922.change.rst
+++ b/changelog.d/1922.change.rst
@@ -1 +1 @@
-Fix possible issue with transitive build dependencies.
+Build dependencies (setup_requires and tests_require) now install transitive dependencies indicated by extras.

From a2e883e1b838db529d992d4c6c8ab73c16f48591 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 09:38:13 -0500
Subject: [PATCH 7621/8469] Extract function to strip the marker for concise
 code in the long function.

---
 setuptools/installer.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/setuptools/installer.py b/setuptools/installer.py
index ba9cfce9ff..527b95dedd 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -64,11 +64,8 @@ def fetch_build_egg(dist, req):
         pkg_resources.get_distribution('wheel')
     except pkg_resources.DistributionNotFound:
         dist.announce('WARNING: The wheel package is not available.', log.WARN)
-    # Ignore environment markers: if we're here, it's needed. This ensure
-    # we don't try to ask pip for something like `babel; extra == "i18n"`,
-    # which would always be ignored.
-    req = pkg_resources.Requirement.parse(str(req))
-    req.marker = None
+    # Ignore environment markers; if supplied, it is required.
+    req = strip_marker(req)
     # Take easy_install options into account, but do not override relevant
     # pip environment variables (like PIP_INDEX_URL or PIP_QUIET); they'll
     # take precedence.
@@ -130,3 +127,15 @@ def fetch_build_egg(dist, req):
         dist = pkg_resources.Distribution.from_filename(
             dist_location, metadata=dist_metadata)
         return dist
+
+
+def strip_marker(req):
+    """
+    Return a new requirement without the environment marker to avoid
+    calling pip with something like `babel; extra == "i18n"`, which
+    would always be ignored.
+    """
+    # create a copy to avoid mutating the input
+    req = pkg_resources.Requirement.parse(str(req))
+    req.marker = None
+    return req

From 53b2eb605de63b1c7589696ad55780b6ae0b7dcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 09:51:09 -0500
Subject: [PATCH 7622/8469] Publish release notes to tidelift following
 release.

---
 tox.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tox.ini b/tox.ini
index 21ec6cde98..6d3b9a9bc8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,8 +62,10 @@ deps =
 	wheel
 	twine[keyring]>=1.13
 	path
+	jaraco.tidelift
 passenv =
 	TWINE_PASSWORD
+	TIDELIFT_TOKEN
 setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
 commands =
@@ -71,3 +73,4 @@ commands =
 	python -c "import path; path.Path('dist').rmtree_p()"
 	python setup.py release
 	python -m twine upload dist/*
+	python -m jaraco.tidelift.publish-release-notes

From 6fa879b961c6623750a8a25325eeeda9e68fa541 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 09:52:47 -0500
Subject: [PATCH 7623/8469] =?UTF-8?q?Bump=20version:=2042.0.1=20=E2=86=92?=
 =?UTF-8?q?=2042.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 7 +++++++
 changelog.d/1921.change.txt | 1 -
 changelog.d/1922.change.rst | 1 -
 setup.cfg                   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1921.change.txt
 delete mode 100644 changelog.d/1922.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e37acce5f9..8a9f4435a0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 42.0.1
+current_version = 42.0.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index da657c2801..81abbe5976 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v42.0.2
+-------
+
+* #1921: Fix support for easy_install's ``find-links`` option in ``setup.cfg``.
+* #1922: Build dependencies (setup_requires and tests_require) now install transitive dependencies indicated by extras.
+
+
 v42.0.1
 -------
 
diff --git a/changelog.d/1921.change.txt b/changelog.d/1921.change.txt
deleted file mode 100644
index 7c001eb8ef..0000000000
--- a/changelog.d/1921.change.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix support for easy_install's ``find-links`` option in ``setup.cfg``. 
diff --git a/changelog.d/1922.change.rst b/changelog.d/1922.change.rst
deleted file mode 100644
index 837ef9c9e8..0000000000
--- a/changelog.d/1922.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Build dependencies (setup_requires and tests_require) now install transitive dependencies indicated by extras.
diff --git a/setup.cfg b/setup.cfg
index b8e542798a..68b49d734a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 42.0.1
+version = 42.0.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 1d03fdc94c3676a5b675ec7d818d48c6a772fb49 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 1 Dec 2019 10:04:20 -0500
Subject: [PATCH 7624/8469] Ensure tox is present for cutting release. Ref
 #1925.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bcff8ad960..b3a6556d66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ jobs:
   - <<: *latest_py3
     stage: deploy
     if: tag IS present
-    install: skip
     script: tox -e release
     after_success: skip
 

From 0fc2a2acd6cc64b37b67e5f42e4d15d8e734c01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Ogam?= <gery.ogam@gmail.com>
Date: Thu, 12 Dec 2019 13:55:07 +0100
Subject: [PATCH 7625/8469] Update setuptools.txt

---
 docs/setuptools.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index c109e673df..03b57cf3e7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -62,7 +62,7 @@ Installing ``setuptools``
 
 To install the latest version of setuptools, use::
 
-    pip install -U setuptools
+    pip install --upgrade setuptools
 
 Refer to `Installing Packages`_ guide for more information.
 
@@ -1199,7 +1199,7 @@ command; see the section on the `develop`_ command below for more details.
 Note that you can also apply setuptools commands to non-setuptools projects,
 using commands like this::
 
-   python -c "import setuptools; execfile('setup.py')" develop
+   python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
 
 That is, you can simply list the normal setup commands and options following
 the quoted part.
@@ -1215,7 +1215,7 @@ Detailed instructions to distribute a setuptools project can be found at
 
 Before you begin, make sure you have the latest versions of setuptools and wheel::
 
-    python3 -m pip install --user --upgrade setuptools wheel
+    pip install --upgrade setuptools wheel
 
 To build a setuptools project, run this command from the same directory where
 setup.py is located::
@@ -1229,15 +1229,15 @@ https://test.pypi.org/account/register/. You will also need to verify your email
 to be able to upload any packages.
 You should install twine to be able to upload packages::
 
-    python3 -m pip install --user --upgrade setuptools wheel
+    pip install --upgrade twine
 
 Now, to upload these archives, run::
 
-    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+    twine upload --repository-url https://test.pypi.org/simple/ dist/*
 
 To install your newly uploaded package ``example_pkg``,  you can use pip::
 
-    python3 -m pip install --index-url https://test.pypi.org/simple/ example_pkg
+    pip install --index-url https://test.pypi.org/simple/ example_pkg
 
 If you have issues at any point, please refer to `Packaging project tutorials`_
 for clarification.

From 2bf131d79252ce71e82c64ffbfdf1126d9602e90 Mon Sep 17 00:00:00 2001
From: Michael Felt <aixtools@users.noreply.github.com>
Date: Sun, 15 Dec 2019 15:17:53 +0100
Subject: [PATCH 7626/8469] bpo-38021: Modify AIX platform_tag so it covers PEP
 425 needs (GH-17303)

Provides a richer platform tag for AIX that we expect to be sufficient for PEP 425
binary distribution identification. Any backports to earlier Python versions will be
handled via setuptools.

Patch by Michael Felt.
---
 util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util.py b/util.py
index 17a94bc428..4b002ecef1 100644
--- a/util.py
+++ b/util.py
@@ -79,7 +79,8 @@ def get_host_platform():
             machine += ".%s" % bitness[sys.maxsize]
         # fall through to standard osname-release-machine representation
     elif osname[:3] == "aix":
-        return "%s-%s.%s" % (osname, version, release)
+        from _aix_support import aix_platform
+        return aix_platform()
     elif osname[:6] == "cygwin":
         osname = "cygwin"
         rel_re = re.compile (r'[\d.]+', re.ASCII)

From 72993bc1839f6f2ee3e04539a85410d837d3bf98 Mon Sep 17 00:00:00 2001
From: Johannes Reiff <mail@jreiff.de>
Date: Thu, 19 Dec 2019 14:06:22 +0100
Subject: [PATCH 7627/8469] Make easy_install command less strict (fixes #1405)

---
 setuptools/command/easy_install.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 09066f8c86..e979d2aa88 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -156,19 +156,16 @@ class easy_install(Command):
          "allow building eggs from local checkouts"),
         ('version', None, "print version information and exit"),
         ('no-find-links', None,
-         "Don't load find-links defined in packages being installed")
+         "Don't load find-links defined in packages being installed"),
+        ('user', None, "install in user site-package '%s'" % site.USER_SITE)
     ]
     boolean_options = [
         'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
         'editable',
-        'no-deps', 'local-snapshots-ok', 'version'
+        'no-deps', 'local-snapshots-ok', 'version',
+        'user'
     ]
 
-    if site.ENABLE_USER_SITE:
-        help_msg = "install in user site-package '%s'" % site.USER_SITE
-        user_options.append(('user', None, help_msg))
-        boolean_options.append('user')
-
     negative_opt = {'always-unzip': 'zip-ok'}
     create_index = PackageIndex
 
@@ -272,6 +269,9 @@ def finalize_options(self):
             self.config_vars['userbase'] = self.install_userbase
             self.config_vars['usersite'] = self.install_usersite
 
+        elif self.user:
+            log.warn("WARNING: The user site-packages directory is disabled.")
+
         self._fix_install_dir_for_user_site()
 
         self.expand_basedirs()
@@ -478,8 +478,9 @@ def check_site_dir(self):
                 self.cant_write_to_target()
 
         if not is_site_dir and not self.multi_version:
-            # Can't install non-multi to non-site dir
-            raise DistutilsError(self.no_default_version_msg())
+            # Can't install non-multi to non-site dir with easy_install
+            pythonpath = os.environ.get('PYTHONPATH', '')
+            log.warn(self.__no_default_msg, self.install_dir, pythonpath)
 
         if is_site_dir:
             if self.pth_file is None:
@@ -1309,10 +1310,6 @@ def byte_compile(self, to_compile):
 
         Please make the appropriate changes for your system and try again.""").lstrip()
 
-    def no_default_version_msg(self):
-        template = self.__no_default_msg
-        return template % (self.install_dir, os.environ.get('PYTHONPATH', ''))
-
     def install_site_py(self):
         """Make sure there's a site.py in the target dir, if needed"""
 
@@ -2344,4 +2341,3 @@ def gen_usage(script_name):
 
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
     """Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""
-    

From ec270f9e13fcc32a2a861273219ebfeba17838df Mon Sep 17 00:00:00 2001
From: Johannes Reiff <mail@jreiff.de>
Date: Thu, 19 Dec 2019 14:42:00 +0100
Subject: [PATCH 7628/8469] Add changelog entry for PR #1941

---
 changelog.d/1941.change.rst | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog.d/1941.change.rst

diff --git a/changelog.d/1941.change.rst b/changelog.d/1941.change.rst
new file mode 100644
index 0000000000..a41cdcfe6e
--- /dev/null
+++ b/changelog.d/1941.change.rst
@@ -0,0 +1,4 @@
+Improve editable installs with PEP 518 build isolation:
+
+* The ``--user`` option is now always available. A warning is issued if the user site directory is not available.
+* The error shown when the install directory is not in ``PYTHONPATH`` has been turned into a warning.

From 3910bbb8d57a8f811ce863e9e1d09ae631cfe353 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Dec 2019 22:04:09 -0500
Subject: [PATCH 7629/8469] Extract methods to separate _safe_data_files
 behavior and _add_data_files.

---
 setuptools/command/sdist.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 55ecdd978a..eebdfd1975 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -126,14 +126,27 @@ def _add_defaults_python(self):
         if self.distribution.has_pure_modules():
             build_py = self.get_finalized_command('build_py')
             self.filelist.extend(build_py.get_source_files())
-            # This functionality is incompatible with include_package_data, and
-            # will in fact create an infinite recursion if include_package_data
-            # is True.  Use of include_package_data will imply that
-            # distutils-style automatic handling of package_data is disabled
-            if not self.distribution.include_package_data:
-                for _, src_dir, _, filenames in build_py.data_files:
-                    self.filelist.extend([os.path.join(src_dir, filename)
-                                          for filename in filenames])
+            self._add_data_files(self._safe_data_files(build_py))
+
+    def _safe_data_files(self, build_py):
+        """
+        Extracting data_files from build_py is known to cause
+        infinite recursion errors when `include_package_data`
+        is enabled, so suppress it in that case.
+        """
+        if self.distribution.include_package_data:
+            return ()
+        return build_py.data_files
+
+    def _add_data_files(self, data_files):
+        """
+        Add data files as found in build_py.data_files.
+        """
+        self.filelist.extend(
+            os.path.join(src_dir, name)
+            for _, src_dir, _, filenames in data_files
+            for name in filenames
+        )
 
     def _add_defaults_data_files(self):
         try:

From c4419ed0099645ef3c27a617f93e9a6182962693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= <juergen.gmach@googlemail.com>
Date: Mon, 23 Dec 2019 15:53:18 +0100
Subject: [PATCH 7630/8469] bpo-38914 Do not require email field in setup.py.
 (GH-17388)

When checking `setup.py` and when the `author` field was provided, but
the `author_email` field was missing, erroneously a warning message was
displayed that the `author_email` field is required.

The specs do not require the `author_email`field:
https://packaging.python.org/specifications/core-metadata/#author

The same is valid for `maintainer` and `maintainer_email`.

The warning message has been adjusted.

modified:   Doc/distutils/examples.rst
modified:   Lib/distutils/command/check.py


https://bugs.python.org/issue38914
---
 command/check.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/command/check.py b/command/check.py
index 04c2f9642d..7ceabd3adf 100644
--- a/command/check.py
+++ b/command/check.py
@@ -80,8 +80,11 @@ def run(self):
     def check_metadata(self):
         """Ensures that all required elements of meta-data are supplied.
 
-        name, version, URL, (author and author_email) or
-        (maintainer and maintainer_email)).
+        Required fields:
+            name, version, URL
+
+        Recommended fields:
+            (author and author_email) or (maintainer and maintainer_email))
 
         Warns if any are missing.
         """
@@ -97,15 +100,15 @@ def check_metadata(self):
         if metadata.author:
             if not metadata.author_email:
                 self.warn("missing meta-data: if 'author' supplied, " +
-                          "'author_email' must be supplied too")
+                          "'author_email' should be supplied too")
         elif metadata.maintainer:
             if not metadata.maintainer_email:
                 self.warn("missing meta-data: if 'maintainer' supplied, " +
-                          "'maintainer_email' must be supplied too")
+                          "'maintainer_email' should be supplied too")
         else:
             self.warn("missing meta-data: either (author and author_email) " +
                       "or (maintainer and maintainer_email) " +
-                      "must be supplied")
+                      "should be supplied")
 
     def check_restructuredtext(self):
         """Checks if the long string fields are reST-compliant."""

From dea5858f1ecf042a17e94a3e26a10bbc78fd2f35 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2019 11:59:05 -0500
Subject: [PATCH 7631/8469] Add backend-path for future Pips

Co-Authored-By: Paul Ganssle <paul@ganssle.io>
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 5a2d7d3b67..f0fd8521ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,7 @@
 [build-system]
 requires = ["setuptools >= 40.8", "wheel"]
 build-backend = "setuptools.build_meta"
+backend-path = ["."]
 
 [tool.towncrier]
     package = "setuptools"

From 8495fb9c59cc9af3a770b7b5ea5f950790e782ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2019 12:21:15 -0500
Subject: [PATCH 7632/8469] Add changelog entry. Ref #1927.

---
 changelog.d/1927.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1927.change.rst

diff --git a/changelog.d/1927.change.rst b/changelog.d/1927.change.rst
new file mode 100644
index 0000000000..3b293d6343
--- /dev/null
+++ b/changelog.d/1927.change.rst
@@ -0,0 +1 @@
+Setuptools once again declares 'setuptools' in the ``build-system.requires`` and adds PEP 517 build support by declaring itself as the ``build-backend``. It additionally specifies ``build-system.backend-path`` to rely on itself for those builders that support it.

From 8a7a6272942c84a0cf59169b84f7434ea4dc4bfe Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung <uranusjr@gmail.com>
Date: Fri, 27 Dec 2019 16:12:40 +0800
Subject: [PATCH 7633/8469] Add test ensuring pyproject.toml is included during
 PEP 517 build.

---
 setuptools/tests/test_build_meta.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index e1efe5617c..326b4f5dbd 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -262,6 +262,27 @@ def test_build_sdist_version_change(self, build_backend):
         assert os.path.isfile(
             os.path.join(os.path.abspath("out_sdist"), sdist_name))
 
+    def test_build_sdist_pyproject_toml_exists(self, tmpdir_cwd):
+        files = {
+            'setup.py': DALS("""
+                __import__('setuptools').setup(
+                    name='foo',
+                    version='0.0.0',
+                    py_modules=['hello']
+                )"""),
+            'hello.py': '',
+            'pyproject.toml': DALS("""
+                [build-system]
+                requires = ["setuptools", "wheel"]
+                build-backend = "setuptools.build_meta
+                """),
+        }
+        build_files(files)
+        build_backend = self.get_build_backend()
+        targz_path = build_backend.build_sdist("temp")
+        with tarfile.open(os.path.join("temp", targz_path)) as tar:
+            assert any('pyproject.toml' in name for name in tar.getnames())
+
     def test_build_sdist_setup_py_exists(self, tmpdir_cwd):
         # If build_sdist is called from a script other than setup.py,
         # ensure setup.py is included

From 589a70571a890b8113c75916325230b0b832f8c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 29 Dec 2019 12:57:51 -0500
Subject: [PATCH 7634/8469] Mark the change as a breaking change.

---
 changelog.d/1634.breaking.rst | 1 +
 changelog.d/1634.change.rst   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 changelog.d/1634.breaking.rst
 delete mode 100644 changelog.d/1634.change.rst

diff --git a/changelog.d/1634.breaking.rst b/changelog.d/1634.breaking.rst
new file mode 100644
index 0000000000..b65e5d9f40
--- /dev/null
+++ b/changelog.d/1634.breaking.rst
@@ -0,0 +1 @@
+Include ``pyproject.toml`` in source distribution by default. Projects relying on the previous behavior where ``pyproject.toml`` was excluded by default should stop relying on that behavior or add ``exclude pyproject.toml`` to their MANIFEST.in file.
diff --git a/changelog.d/1634.change.rst b/changelog.d/1634.change.rst
deleted file mode 100644
index 27d0a64afe..0000000000
--- a/changelog.d/1634.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Include ``pyproject.toml`` in source distribution by default.

From f171cde1505fc5df438417dc5ae48d35fa60a002 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 12:47:46 -0500
Subject: [PATCH 7635/8469] Add test for exclusion expectation. Ref #1650.

---
 setuptools/tests/test_sdist.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 06813a003b..a413e4ede2 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -463,6 +463,22 @@ def test_pyproject_toml_in_sdist(self):
         manifest = cmd.filelist.files
         assert 'pyproject.toml' in manifest
 
+    def test_pyproject_toml_excluded(self):
+        """
+        Check that pyproject.toml can excluded even if present
+        """
+        open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+        with open('MANIFEST.in', 'w') as mts:
+            print('exclude pyproject.toml', file=mts)
+        dist = Distribution(SETUP_ATTRS)
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.ensure_finalized()
+        with quiet():
+            cmd.run()
+        manifest = cmd.filelist.files
+        assert 'pyproject.toml' not in manifest
+
 
 def test_default_revctrl():
     """

From 2eb3ba19f3153f83eb8b2470deb8ec02d21fca52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 12:50:25 -0500
Subject: [PATCH 7636/8469] Restore Python 2.7 compatibility

---
 setuptools/tests/test_sdist.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index a413e4ede2..b27c4a8336 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
+from __future__ import print_function
+
 import os
 import shutil
 import sys

From 47aab6525101bda3e2c7af1588b7abf5f6608b65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 13:14:50 -0500
Subject: [PATCH 7637/8469] =?UTF-8?q?Bump=20version:=2042.0.2=20=E2=86=92?=
 =?UTF-8?q?=2043.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 7 +++++++
 changelog.d/1634.breaking.rst | 1 -
 changelog.d/1927.change.rst   | 1 -
 setup.cfg                     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1634.breaking.rst
 delete mode 100644 changelog.d/1927.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8a9f4435a0..25093b873f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 42.0.2
+current_version = 43.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 81abbe5976..817f816820 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v43.0.0
+-------
+
+* #1634: Include ``pyproject.toml`` in source distribution by default. Projects relying on the previous behavior where ``pyproject.toml`` was excluded by default should stop relying on that behavior or add ``exclude pyproject.toml`` to their MANIFEST.in file.
+* #1927: Setuptools once again declares 'setuptools' in the ``build-system.requires`` and adds PEP 517 build support by declaring itself as the ``build-backend``. It additionally specifies ``build-system.backend-path`` to rely on itself for those builders that support it.
+
+
 v42.0.2
 -------
 
diff --git a/changelog.d/1634.breaking.rst b/changelog.d/1634.breaking.rst
deleted file mode 100644
index b65e5d9f40..0000000000
--- a/changelog.d/1634.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Include ``pyproject.toml`` in source distribution by default. Projects relying on the previous behavior where ``pyproject.toml`` was excluded by default should stop relying on that behavior or add ``exclude pyproject.toml`` to their MANIFEST.in file.
diff --git a/changelog.d/1927.change.rst b/changelog.d/1927.change.rst
deleted file mode 100644
index 3b293d6343..0000000000
--- a/changelog.d/1927.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools once again declares 'setuptools' in the ``build-system.requires`` and adds PEP 517 build support by declaring itself as the ``build-backend``. It additionally specifies ``build-system.backend-path`` to rely on itself for those builders that support it.
diff --git a/setup.cfg b/setup.cfg
index 68b49d734a..a9a9b504a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 42.0.2
+version = 43.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 9c40ab8861d1bbc18d1c8032f678e2ca15ada7ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 13:29:43 -0500
Subject: [PATCH 7638/8469] Rewrite TestSdistTest setup/teardown_method as
 pytest fixture.

---
 setuptools/tests/test_sdist.py | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index b27c4a8336..f2e9a5ec37 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -91,30 +91,29 @@ def latin1_fail():
 )
 
 
+def touch(path):
+    path.write_text('', encoding='utf-8')
+
+
 class TestSdistTest:
-    def setup_method(self, method):
-        self.temp_dir = tempfile.mkdtemp()
-        with open(os.path.join(self.temp_dir, 'setup.py'), 'w') as f:
-            f.write(SETUP_PY)
+    @pytest.fixture(autouse=True)
+    def source_dir(self, tmpdir):
+        self.temp_dir = str(tmpdir)
+        (tmpdir / 'setup.py').write_text(SETUP_PY, encoding='utf-8')
 
         # Set up the rest of the test package
-        test_pkg = os.path.join(self.temp_dir, 'sdist_test')
-        os.mkdir(test_pkg)
-        data_folder = os.path.join(self.temp_dir, "d")
-        os.mkdir(data_folder)
+        test_pkg = tmpdir / 'sdist_test'
+        test_pkg.mkdir()
+        data_folder = tmpdir / 'd'
+        data_folder.mkdir()
         # *.rst was not included in package_data, so c.rst should not be
         # automatically added to the manifest when not under version control
-        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst',
-                      os.path.join(data_folder, "e.dat")]:
-            # Just touch the files; their contents are irrelevant
-            open(os.path.join(test_pkg, fname), 'w').close()
-
-        self.old_cwd = os.getcwd()
-        os.chdir(self.temp_dir)
+        for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']:
+            touch(test_pkg / fname)
+        touch(data_folder / 'e.dat')
 
-    def teardown_method(self, method):
-        os.chdir(self.old_cwd)
-        shutil.rmtree(self.temp_dir)
+        with tmpdir.as_cwd():
+            yield
 
     def test_package_data_in_sdist(self):
         """Regression test for pull request #4: ensures that files listed in

From 9e3149802ee214ee0500ec299250bf4febc67e52 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 13:31:37 -0500
Subject: [PATCH 7639/8469] Remove instance attribute; rely on tmpdir fixture;
 re-use touch helper.

---
 setuptools/tests/test_sdist.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f2e9a5ec37..1b951a5be5 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -98,7 +98,6 @@ def touch(path):
 class TestSdistTest:
     @pytest.fixture(autouse=True)
     def source_dir(self, tmpdir):
-        self.temp_dir = str(tmpdir)
         (tmpdir / 'setup.py').write_text(SETUP_PY, encoding='utf-8')
 
         # Set up the rest of the test package
@@ -176,14 +175,14 @@ def test_setup_py_excluded(self):
         manifest = cmd.filelist.files
         assert 'setup.py' not in manifest
 
-    def test_defaults_case_sensitivity(self):
+    def test_defaults_case_sensitivity(self, tmpdir):
         """
         Make sure default files (README.*, etc.) are added in a case-sensitive
         way to avoid problems with packages built on Windows.
         """
 
-        open(os.path.join(self.temp_dir, 'readme.rst'), 'w').close()
-        open(os.path.join(self.temp_dir, 'SETUP.cfg'), 'w').close()
+        touch(tmpdir / 'readme.rst')
+        touch(tmpdir / 'SETUP.cfg')
 
         dist = Distribution(SETUP_ATTRS)
         # the extension deliberately capitalized for this test
@@ -450,11 +449,11 @@ def test_sdist_with_latin1_encoded_filename(self):
             except UnicodeDecodeError:
                 filename not in cmd.filelist.files
 
-    def test_pyproject_toml_in_sdist(self):
+    def test_pyproject_toml_in_sdist(self, tmpdir):
         """
         Check if pyproject.toml is included in source distribution if present
         """
-        open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+        touch(tmpdir / 'pyproject.toml')
         dist = Distribution(SETUP_ATTRS)
         dist.script_name = 'setup.py'
         cmd = sdist(dist)
@@ -464,11 +463,11 @@ def test_pyproject_toml_in_sdist(self):
         manifest = cmd.filelist.files
         assert 'pyproject.toml' in manifest
 
-    def test_pyproject_toml_excluded(self):
+    def test_pyproject_toml_excluded(self, tmpdir):
         """
         Check that pyproject.toml can excluded even if present
         """
-        open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+        touch(tmpdir / 'pyproject.toml')
         with open('MANIFEST.in', 'w') as mts:
             print('exclude pyproject.toml', file=mts)
         dist = Distribution(SETUP_ATTRS)

From a87f975e65507382aaecfb01fe8df4608c38f466 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 31 Dec 2019 13:32:57 -0500
Subject: [PATCH 7640/8469] Remove unused import

---
 setuptools/tests/test_sdist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 1b951a5be5..dcc64cf253 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -4,7 +4,6 @@
 from __future__ import print_function
 
 import os
-import shutil
 import sys
 import tempfile
 import unicodedata

From 90922a5eb9b2f002202a16c974b86750a46d21ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jan 2020 11:54:53 -0500
Subject: [PATCH 7641/8469] Restore Python 2.7 compatibility

---
 setuptools/tests/test_sdist.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index dcc64cf253..9ddbae8b72 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """sdist tests"""
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import os
 import sys
@@ -229,10 +229,6 @@ def test_manifest_is_written_with_utf8_encoding(self):
         u_contents = contents.decode('UTF-8')
 
         # The manifest should contain the UTF-8 filename
-        if six.PY2:
-            fs_enc = sys.getfilesystemencoding()
-            filename = filename.decode(fs_enc)
-
         assert posix(filename) in u_contents
 
     @py3_only

From 3d5b7775b7b7ee6c0b354a04fe1d33c1f9b0e5df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jan 2020 12:08:46 -0500
Subject: [PATCH 7642/8469] Fix latin1 and utf8 tests on Python 2

---
 setuptools/tests/test_sdist.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 9ddbae8b72..8538dd246a 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -369,7 +369,7 @@ def test_read_manifest_skips_non_utf8_filenames(self):
     @fail_on_latin1_encoded_filenames
     def test_sdist_with_utf8_encoded_filename(self):
         # Test for #303.
-        dist = Distribution(SETUP_ATTRS)
+        dist = Distribution(self.make_strings(SETUP_ATTRS))
         dist.script_name = 'setup.py'
         cmd = sdist(dist)
         cmd.ensure_finalized()
@@ -400,10 +400,19 @@ def test_sdist_with_utf8_encoded_filename(self):
         else:
             assert filename in cmd.filelist.files
 
+    @classmethod
+    def make_strings(cls, item):
+        if isinstance(item, dict):
+            return {
+                key: cls.make_strings(value) for key, value in item.items()}
+        if isinstance(item, list):
+            return list(map(cls.make_strings, item))
+        return str(item)
+
     @fail_on_latin1_encoded_filenames
     def test_sdist_with_latin1_encoded_filename(self):
         # Test for #303.
-        dist = Distribution(SETUP_ATTRS)
+        dist = Distribution(self.make_strings(SETUP_ATTRS))
         dist.script_name = 'setup.py'
         cmd = sdist(dist)
         cmd.ensure_finalized()

From 7e97def47723303fafabe48b22168bbc11bb4821 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jan 2020 18:33:05 -0500
Subject: [PATCH 7643/8469] =?UTF-8?q?Bump=20version:=2043.0.0=20=E2=86=92?=
 =?UTF-8?q?=2044.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 6 ++++++
 changelog.d/1908.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1908.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 25093b873f..e1bfa89859 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 43.0.0
+current_version = 44.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 817f816820..109a3f480f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v44.0.0
+-------
+
+* #1908: Drop support for Python 3.4.
+
+
 v43.0.0
 -------
 
diff --git a/changelog.d/1908.breaking.rst b/changelog.d/1908.breaking.rst
deleted file mode 100644
index 3fbb9fe70c..0000000000
--- a/changelog.d/1908.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for Python 3.4.
diff --git a/setup.cfg b/setup.cfg
index ed0840846f..ecef86098a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 43.0.0
+version = 44.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 98b7bab4d235e982526794bcec90827ac300f5bc Mon Sep 17 00:00:00 2001
From: Gabriel <gabriel@potter.fr>
Date: Thu, 2 Jan 2020 01:02:21 +0100
Subject: [PATCH 7644/8469] Update setuptools.txt

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 03b57cf3e7..7741ec07dd 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1000,11 +1000,11 @@ and Python Eggs.  It is strongly recommended that, if you are using data files,
 you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
 them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
 you're using setuptools to distribute your package, there is no reason not to
-use its resource management API.  See also `Accessing Package Resources`_ for
+use its resource management API.  See also `Importlib Resources`_ for
 a quick example of converting code that uses ``__file__`` to use
 ``pkg_resources`` instead.
 
-.. _Accessing Package Resources: http://peak.telecommunity.com/DevCenter/PythonEggs#accessing-package-resources
+.. _Importlib Resources: https://docs.python.org/3/library/importlib.html#module-importlib.resources
 
 
 Non-Package Data Files

From a46a6bfd903ecc292fc3645c37c1b72781528095 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Jan 2020 10:53:17 -0500
Subject: [PATCH 7645/8469] Require Python 3.5 or later, dropping support for
 Python 2.

This change does not yet remove any of the compatibility for Python 2, but only aims to declare the dropped support.
---
 .travis.yml                   | 8 +-------
 appveyor.yml                  | 4 ++--
 changelog.d/1458.breaking.rst | 1 +
 setup.cfg                     | 4 +---
 4 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 changelog.d/1458.breaking.rst

diff --git a/.travis.yml b/.travis.yml
index 501a0b69ce..d18b86c0e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,8 @@ language: python
 jobs:
   fast_finish: true
   include:
-  - &latest_py2
-    python: 2.7
-  - <<: *latest_py2
-    env: LANG=C
-  - python: pypy
-    env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
-    env: DISABLE_COVERAGE=1
+    env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: 3.5
   - python: 3.6
   - python: 3.7
diff --git a/appveyor.yml b/appveyor.yml
index 0881806968..fc65a9a70d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,8 @@ environment:
   matrix:
     - APPVEYOR_JOB_NAME: "python36-x64"
       PYTHON: "C:\\Python36-x64"
-    - APPVEYOR_JOB_NAME: "python27-x64"
-      PYTHON: "C:\\Python27-x64"
+    - APPVEYOR_JOB_NAME: "python37-x64"
+      PYTHON: "C:\\Python37-x64"
 
 install:
   # symlink python from a directory with a space
diff --git a/changelog.d/1458.breaking.rst b/changelog.d/1458.breaking.rst
new file mode 100644
index 0000000000..3004722cd0
--- /dev/null
+++ b/changelog.d/1458.breaking.rst
@@ -0,0 +1 @@
+Drop support for Python 2. Setuptools now requires Python 3.5 or later. Install setuptools using pip >=9 or pin to Setuptools <45 to maintain 2.7 support.
diff --git a/setup.cfg b/setup.cfg
index ecef86098a..1e23051fdb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,8 +35,6 @@ classifiers =
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
@@ -49,7 +47,7 @@ classifiers =
 
 [options]
 zip_safe = True
-python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+python_requires = >=3.5
 py_modules = easy_install
 packages = find:
 

From 79f1694b05a66cc0fbbbf4e72d63d0a340cf6d84 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jan 2020 06:30:03 -0500
Subject: [PATCH 7646/8469] Add obnoxious warning about Python 2 being
 unsupported on this release with guidance on how to avoid the warning and
 what to do if that guidance was ineffective.

---
 pkg_resources/__init__.py |  1 +
 pkg_resources/py2_warn.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkg_resources/py2_warn.py

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2f5aa64a6e..3fa883ceb4 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -83,6 +83,7 @@
 __import__('pkg_resources.extern.packaging.specifiers')
 __import__('pkg_resources.extern.packaging.requirements')
 __import__('pkg_resources.extern.packaging.markers')
+__import__('pkg_resources.py2_warn')
 
 
 __metaclass__ = type
diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
new file mode 100644
index 0000000000..1f29851c35
--- /dev/null
+++ b/pkg_resources/py2_warn.py
@@ -0,0 +1,19 @@
+import sys
+import warnings
+import textwrap
+
+
+msg = textwrap.dedent("""
+    You are running Setuptools on Python 2, which is no longer
+    supported and
+    >>> SETUPTOOLS WILL STOP WORKING <<<
+    in a subsequent release. Please ensure you are installing
+    Setuptools using pip 9.x or later or pin to `setuptools<45`
+    in your environment.
+    If you have done those things and are still encountering
+    this message, please comment in
+    https://github.com/pypa/setuptools/issues/1458
+    about the steps that led to this unsupported combination.
+    """)
+
+sys.version_info < (3,) and warnings.warn("*" * 60 + msg + "*" * 60)

From 073ad9711dc9f750b974fa7a76c832603af2efa6 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 6 Jan 2020 11:14:03 -0600
Subject: [PATCH 7647/8469] Fix TestPyPI upload URI

---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 03b57cf3e7..11faf0418c 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1233,7 +1233,7 @@ You should install twine to be able to upload packages::
 
 Now, to upload these archives, run::
 
-    twine upload --repository-url https://test.pypi.org/simple/ dist/*
+    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
 To install your newly uploaded package ``example_pkg``,  you can use pip::
 

From 796abd8dbec884cedf326cb5f85512a5d5648c4e Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Wed, 8 Jan 2020 19:10:11 +0200
Subject: [PATCH 7648/8469] Fix for Python 4: replace unsafe six.PY3 with PY2

---
 setuptools/command/build_ext.py    |  2 +-
 setuptools/command/develop.py      |  2 +-
 setuptools/command/easy_install.py |  2 +-
 setuptools/command/egg_info.py     |  2 +-
 setuptools/command/sdist.py        |  2 +-
 setuptools/command/test.py         |  4 ++--
 setuptools/command/upload_docs.py  |  4 ++--
 setuptools/dist.py                 |  6 +++---
 setuptools/tests/test_develop.py   |  4 ++--
 setuptools/tests/test_sdist.py     | 32 +++++++++++++++---------------
 setuptools/tests/test_setopt.py    |  2 +-
 11 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index daa8e4fe81..1b51e040b4 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -113,7 +113,7 @@ def get_ext_filename(self, fullname):
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
             use_abi3 = (
-                six.PY3
+                not six.PY2
                 and getattr(ext, 'py_limited_api')
                 and get_abi3_suffix()
             )
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index 009e4f9368..b561924609 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -108,7 +108,7 @@ def _resolve_setup_path(egg_base, install_dir, egg_path):
         return path_to_setup
 
     def install_for_development(self):
-        if six.PY3 and getattr(self.distribution, 'use_2to3', False):
+        if not six.PY2 and getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 09066f8c86..426301d6f3 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1567,7 +1567,7 @@ def get_exe_prefixes(exe_filename):
                 continue
             if parts[0].upper() in ('PURELIB', 'PLATLIB'):
                 contents = z.read(name)
-                if six.PY3:
+                if not six.PY2:
                     contents = contents.decode()
                 for pth in yield_lines(contents):
                     pth = pth.strip().replace('\\', '/')
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 5d8f451ee4..a5c5a2fc19 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -266,7 +266,7 @@ def write_file(self, what, filename, data):
         to the file.
         """
         log.info("writing %s to %s", what, filename)
-        if six.PY3:
+        if not six.PY2:
             data = data.encode("utf-8")
         if not self.dry_run:
             f = open(filename, 'wb')
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a851453f9a..8c3438eaa6 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -207,7 +207,7 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rb')
         for line in manifest:
             # The manifest must contain UTF-8. See #303.
-            if six.PY3:
+            if not six.PY2:
                 try:
                     line = line.decode('UTF-8')
                 except UnicodeDecodeError:
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index c148b38d10..f6470e9c34 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -129,7 +129,7 @@ def with_project_on_sys_path(self, func):
 
     @contextlib.contextmanager
     def project_on_sys_path(self, include_dists=[]):
-        with_2to3 = six.PY3 and getattr(self.distribution, 'use_2to3', False)
+        with_2to3 = not six.PY2 and getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
@@ -240,7 +240,7 @@ def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
-        if six.PY3 and getattr(self.distribution, 'use_2to3', False):
+        if not six.PY2 and getattr(self.distribution, 'use_2to3', False):
             module = self.test_suite.split('.')[0]
             if module in _namespace_packages:
                 del_modules = []
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 07aa564af4..130a0cb6c9 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -24,7 +24,7 @@
 
 
 def _encode(s):
-    errors = 'surrogateescape' if six.PY3 else 'strict'
+    errors = 'strict' if six.PY2 else 'surrogateescape'
     return s.encode('utf-8', errors)
 
 
@@ -153,7 +153,7 @@ def upload_file(self, filename):
         # set up the authentication
         credentials = _encode(self.username + ':' + self.password)
         credentials = standard_b64encode(credentials)
-        if six.PY3:
+        if not six.PY2:
             credentials = credentials.decode('ascii')
         auth = "Basic " + credentials
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1ba262ec8b..fe5adf4607 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -571,7 +571,7 @@ def _parse_config_files(self, filenames=None):
         from setuptools.extern.six.moves.configparser import ConfigParser
 
         # Ignore install directory options if we have a venv
-        if six.PY3 and sys.prefix != sys.base_prefix:
+        if not six.PY2 and sys.prefix != sys.base_prefix:
             ignore_options = [
                 'install-base', 'install-platbase', 'install-lib',
                 'install-platlib', 'install-purelib', 'install-headers',
@@ -593,7 +593,7 @@ def _parse_config_files(self, filenames=None):
             with io.open(filename, encoding='utf-8') as reader:
                 if DEBUG:
                     self.announce("  reading {filename}".format(**locals()))
-                (parser.read_file if six.PY3 else parser.readfp)(reader)
+                (parser.readfp if six.PY2 else parser.read_file)(reader)
             for section in parser.sections():
                 options = parser.options(section)
                 opt_dict = self.get_option_dict(section)
@@ -636,7 +636,7 @@ def _try_str(val):
 
         Ref #1653
         """
-        if six.PY3:
+        if not six.PY2:
             return val
         try:
             return val.encode()
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 00d4bd9abb..792975fd14 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -95,7 +95,7 @@ def test_2to3_user_mode(self, test_env):
         with io.open(fn) as init_file:
             init = init_file.read().strip()
 
-        expected = 'print("foo")' if six.PY3 else 'print "foo"'
+        expected = 'print "foo"' if six.PY2 else 'print("foo")'
         assert init == expected
 
     def test_console_scripts(self, tmpdir):
@@ -161,7 +161,7 @@ def install_develop(src_dir, target):
         reason="https://github.com/pypa/setuptools/issues/851",
     )
     @pytest.mark.skipif(
-        platform.python_implementation() == 'PyPy' and six.PY3,
+        platform.python_implementation() == 'PyPy' and not six.PY2,
         reason="https://github.com/pypa/setuptools/issues/1202",
     )
     def test_namespace_package_importable(self, tmpdir):
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 8538dd246a..0bea53dfd7 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -51,7 +51,7 @@ def quiet():
 
 # Convert to POSIX path
 def posix(path):
-    if six.PY3 and not isinstance(path, str):
+    if not six.PY2 and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b'/')
     else:
         return path.replace(os.sep, '/')
@@ -329,7 +329,7 @@ def test_manifest_is_read_with_utf8_encoding(self):
             cmd.read_manifest()
 
         # The filelist should contain the UTF-8 filename
-        if six.PY3:
+        if not six.PY2:
             filename = filename.decode('utf-8')
         assert filename in cmd.filelist.files
 
@@ -383,7 +383,7 @@ def test_sdist_with_utf8_encoded_filename(self):
         if sys.platform == 'darwin':
             filename = decompose(filename)
 
-        if six.PY3:
+        if not six.PY2:
             fs_enc = sys.getfilesystemencoding()
 
             if sys.platform == 'win32':
@@ -425,7 +425,19 @@ def test_sdist_with_latin1_encoded_filename(self):
         with quiet():
             cmd.run()
 
-        if six.PY3:
+        if six.PY2:
+            # Under Python 2 there seems to be no decoded string in the
+            # filelist.  However, due to decode and encoding of the
+            # file name to get utf-8 Manifest the latin1 maybe excluded
+            try:
+                # fs_enc should match how one is expect the decoding to
+                # be proformed for the manifest output.
+                fs_enc = sys.getfilesystemencoding()
+                filename.decode(fs_enc)
+                assert filename in cmd.filelist.files
+            except UnicodeDecodeError:
+                filename not in cmd.filelist.files
+        else:
             # not all windows systems have a default FS encoding of cp1252
             if sys.platform == 'win32':
                 # Latin-1 is similar to Windows-1252 however
@@ -440,18 +452,6 @@ def test_sdist_with_latin1_encoded_filename(self):
                 # The Latin-1 filename should have been skipped
                 filename = filename.decode('latin-1')
                 filename not in cmd.filelist.files
-        else:
-            # Under Python 2 there seems to be no decoded string in the
-            # filelist.  However, due to decode and encoding of the
-            # file name to get utf-8 Manifest the latin1 maybe excluded
-            try:
-                # fs_enc should match how one is expect the decoding to
-                # be proformed for the manifest output.
-                fs_enc = sys.getfilesystemencoding()
-                filename.decode(fs_enc)
-                assert filename in cmd.filelist.files
-            except UnicodeDecodeError:
-                filename not in cmd.filelist.files
 
     def test_pyproject_toml_in_sdist(self, tmpdir):
         """
diff --git a/setuptools/tests/test_setopt.py b/setuptools/tests/test_setopt.py
index 3fb04fb455..1b0389545a 100644
--- a/setuptools/tests/test_setopt.py
+++ b/setuptools/tests/test_setopt.py
@@ -15,7 +15,7 @@ class TestEdit:
     def parse_config(filename):
         parser = configparser.ConfigParser()
         with io.open(filename, encoding='utf-8') as reader:
-            (parser.read_file if six.PY3 else parser.readfp)(reader)
+            (parser.readfp if six.PY2 else parser.read_file)(reader)
         return parser
 
     @staticmethod

From b84a0997af9b5ba757d39b0631545f53d03bc741 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Wed, 8 Jan 2020 19:21:05 +0200
Subject: [PATCH 7649/8469] Add changelog

---
 changelog.d/1959.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1959.change.rst

diff --git a/changelog.d/1959.change.rst b/changelog.d/1959.change.rst
new file mode 100644
index 0000000000..c0cc8975e3
--- /dev/null
+++ b/changelog.d/1959.change.rst
@@ -0,0 +1 @@
+Fix for Python 4: replace unsafe six.PY3 with six.PY2

From 34d87688eae5d10970f3c8269ac01bcca4ad0229 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Jan 2020 17:23:00 -0500
Subject: [PATCH 7650/8469] Include token passthrough for azure pipelines
 publish stage.

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000..01bfa5f56f
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,2 @@
+      env:
+        TIDELIFT_TOKEN: $(Tidelift-token)

From c30a9652fb3bcf941ba17ccda3f577e0c4d99d07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Jan 2020 23:35:41 -0500
Subject: [PATCH 7651/8469] =?UTF-8?q?Bump=20version:=2044.0.0=20=E2=86=92?=
 =?UTF-8?q?=2045.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 7 +++++++
 changelog.d/1458.breaking.rst | 1 -
 changelog.d/1959.change.rst   | 1 -
 setup.cfg                     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1458.breaking.rst
 delete mode 100644 changelog.d/1959.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e1bfa89859..7714390795 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 44.0.0
+current_version = 45.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 109a3f480f..4a81e995c0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v45.0.0
+-------
+
+* #1458: Drop support for Python 2. Setuptools now requires Python 3.5 or later. Install setuptools using pip >=9 or pin to Setuptools <45 to maintain 2.7 support.
+* #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
+
+
 v44.0.0
 -------
 
diff --git a/changelog.d/1458.breaking.rst b/changelog.d/1458.breaking.rst
deleted file mode 100644
index 3004722cd0..0000000000
--- a/changelog.d/1458.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for Python 2. Setuptools now requires Python 3.5 or later. Install setuptools using pip >=9 or pin to Setuptools <45 to maintain 2.7 support.
diff --git a/changelog.d/1959.change.rst b/changelog.d/1959.change.rst
deleted file mode 100644
index c0cc8975e3..0000000000
--- a/changelog.d/1959.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix for Python 4: replace unsafe six.PY3 with six.PY2
diff --git a/setup.cfg b/setup.cfg
index 1e23051fdb..18c9e1df02 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 44.0.0
+version = 45.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 6cb025eadfbc6bf017ba2bfd80c192ac377be9fb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jan 2020 11:23:43 -0500
Subject: [PATCH 7652/8469] Rely on tox-pip-version to upgrade pip and minimize
 the hack for removing setuptools from the environment.

---
 tools/tox_pip.py | 37 +++++++++++++++----------------------
 tox.ini          |  8 +++++---
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 63518f927e..f592e41285 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -1,31 +1,24 @@
-import os
-import shutil
 import subprocess
 import sys
-from glob import glob
 
-VIRTUAL_ENV = os.environ['VIRTUAL_ENV']
-TOX_PIP_DIR = os.path.join(VIRTUAL_ENV, 'pip')
+
+def remove_setuptools():
+    """
+    Remove setuptools from the current environment.
+    """
+    print("Removing setuptools")
+    cmd = [sys.executable, '-m', 'pip', 'uninstall', '-y', 'setuptools']
+    # set cwd to something other than '.' to avoid detecting
+    # '.' as the installed package.
+    subprocess.check_call(cmd, cwd='.tox')
 
 
 def pip(args):
-    # First things first, get a recent (stable) version of pip.
-    if not os.path.exists(TOX_PIP_DIR):
-        subprocess.check_call([sys.executable, '-m', 'pip',
-                               '--disable-pip-version-check',
-                               'install', '-t', TOX_PIP_DIR,
-                               'pip'])
-        shutil.rmtree(glob(os.path.join(TOX_PIP_DIR, 'pip-*.dist-info'))[0])
-    # And use that version.
-    pypath = os.environ.get('PYTHONPATH')
-    pypath = pypath.split(os.pathsep) if pypath is not None else []
-    pypath.insert(0, TOX_PIP_DIR)
-    os.environ['PYTHONPATH'] = os.pathsep.join(pypath)
-    # Fix call for setuptools editable install.
-    for n, a in enumerate(args):
-        if a == '.':
-            args[n] = os.getcwd()
-    subprocess.check_call([sys.executable, '-m', 'pip'] + args, cwd=TOX_PIP_DIR)
+    # When installing '.', remove setuptools
+    '.' in args and remove_setuptools()
+
+    cmd = [sys.executable, '-m', 'pip'] + args
+    subprocess.check_call(cmd)
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index 6a1af56e8c..a666f0afb7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,15 +6,17 @@
 
 [tox]
 envlist=python
+minversion = 3.2
+requires =
+	tox-pip-version >= 0.0.6
 
 [helpers]
-# Wrapper for calls to pip that make sure the version being used is a
-# up-to-date, and to prevent the current working directory from being
-# added to `sys.path`.
+# Custom pip behavior
 pip = python {toxinidir}/tools/tox_pip.py
 
 [testenv]
 deps=-r{toxinidir}/tests/requirements.txt
+pip_version = pip
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}

From 8e6b9933e9981fc9ab19eef3dee93d0f703c4140 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jan 2020 10:13:09 -0500
Subject: [PATCH 7653/8469] Restore testing on Python 2, bypassing the
 requires-python check when installing setuptools.

---
 .travis.yml      | 4 ++++
 tools/tox_pip.py | 5 +++++
 tox.ini          | 4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d18b86c0e8..24b2451bea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ language: python
 jobs:
   fast_finish: true
   include:
+  - &latest_py2
+    python: 2.7
+  - <<: *latest_py2
+    env: LANG=C
   - python: pypy3
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: 3.5
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index f592e41285..06655fe439 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -1,3 +1,4 @@
+import os
 import subprocess
 import sys
 
@@ -14,6 +15,10 @@ def remove_setuptools():
 
 
 def pip(args):
+    # Honor requires-python when installing test suite dependencies
+    if any('-r' in arg for arg in args):
+        os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = '0'
+
     # When installing '.', remove setuptools
     '.' in args and remove_setuptools()
 
diff --git a/tox.ini b/tox.ini
index a666f0afb7..d458dc338c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,9 @@ deps=-r{toxinidir}/tests/requirements.txt
 pip_version = pip
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
-setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}
+setenv =
+	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
+	py27: PIP_IGNORE_REQUIRES_PYTHON=true
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED

From cb2138e24bc9a91e533c4596c125afa6f3eb5c6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jan 2020 12:38:15 -0500
Subject: [PATCH 7654/8469] Set toxenv for Python 2.7 so that workaround is
 present.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 24b2451bea..263386c8dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ jobs:
   include:
   - &latest_py2
     python: 2.7
+    env: TOXENV=py27
   - <<: *latest_py2
-    env: LANG=C
+    env: LANG=C TOXENV=py27
   - python: pypy3
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: 3.5

From e5e5ab2c080d0e9dc99470ec9f2ba21bdf141b80 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 12 Jan 2020 19:23:14 +0100
Subject: [PATCH 7655/8469] Add Python 3.8 to the test matrix

Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/workflows/python-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index eb750a45ab..f315e6fe3e 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -14,6 +14,7 @@ jobs:
       # max-parallel: 5
       matrix:
         python-version:
+        - 3.8
         - 3.7
         - 3.6
         - 3.5

From 23dce8ba4931084813e90b5837db2c20135082fa Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 12 Jan 2020 19:24:38 +0100
Subject: [PATCH 7656/8469] Upgrade the macOS VMs to use a new supported
 version

This change is necessary because macOS 10.15 is now deprecated.

Ref: https://github.blog/changelog/2019-10-31-github-actions-macos-virtual-environment-is-updating-to-catalina-and-dropping-mojave-support

Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index f315e6fe3e..71957abaa8 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -22,7 +22,7 @@ jobs:
         os:
         - ubuntu-18.04
         - ubuntu-16.04
-        - macOS-10.14
+        - macOS-latest
         # - windows-2019
         # - windows-2016
         env:

From 0cd3dfc3abb1c638578bf9b540d930ddad6d19c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Ogam?= <gery.ogam@gmail.com>
Date: Mon, 13 Jan 2020 19:52:25 +0100
Subject: [PATCH 7657/8469] Fix typos

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

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d214ca9917..a1d927d5f7 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1800,7 +1800,7 @@ to support "daily builds" or "snapshot" releases.  It is run automatically by
 the ``sdist``, ``bdist_egg``, ``develop``, and ``test`` commands in order to
 update the project's metadata, but you can also specify it explicitly in order
 to temporarily change the project's version string while executing other
-commands.  (It also generates the``.egg-info/SOURCES.txt`` manifest file, which
+commands.  (It also generates the ``.egg-info/SOURCES.txt`` manifest file, which
 is used when you are building source distributions.)
 
 In addition to writing the core egg metadata defined by ``setuptools`` and
@@ -1848,7 +1848,7 @@ binary distributions of your project, you should first make sure that you know
 how the resulting version numbers will be interpreted by automated tools
 like pip.  See the section above on `Specifying Your Project's Version`_ for an
 explanation of pre- and post-release tags, as well as tips on how to choose and
-verify a versioning scheme for your your project.)
+verify a versioning scheme for your project.)
 
 For advanced uses, there is one other option that can be set, to change the
 location of the project's ``.egg-info`` directory.  Commands that need to find

From 18a3cae3513818d355dbc8c05ff93bbcee09a6d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 14 Jan 2020 04:14:13 -0500
Subject: [PATCH 7658/8469] Update Python 2 warning to include a minimum sunset
 date and add a preamble to make referencing the warning more reliable. Ref
 #1458.

---
 changelog.d/1458.change.rst | 1 +
 pkg_resources/py2_warn.py   | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/1458.change.rst

diff --git a/changelog.d/1458.change.rst b/changelog.d/1458.change.rst
new file mode 100644
index 0000000000..c953127ae0
--- /dev/null
+++ b/changelog.d/1458.change.rst
@@ -0,0 +1 @@
+Add minimum sunset date and preamble to Python 2 warning.
diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
index 1f29851c35..1b15195626 100644
--- a/pkg_resources/py2_warn.py
+++ b/pkg_resources/py2_warn.py
@@ -7,7 +7,8 @@
     You are running Setuptools on Python 2, which is no longer
     supported and
     >>> SETUPTOOLS WILL STOP WORKING <<<
-    in a subsequent release. Please ensure you are installing
+    in a subsequent release (no sooner than 2020-04-20).
+    Please ensure you are installing
     Setuptools using pip 9.x or later or pin to `setuptools<45`
     in your environment.
     If you have done those things and are still encountering
@@ -16,4 +17,6 @@
     about the steps that led to this unsupported combination.
     """)
 
-sys.version_info < (3,) and warnings.warn("*" * 60 + msg + "*" * 60)
+pre = "Setuptools will stop working on Python 2\n"
+
+sys.version_info < (3,) and warnings.warn(pre + "*" * 60 + msg + "*" * 60)

From 5399c8597bcb86a08db4b423f914c474cd125c31 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 7 Apr 2019 23:22:46 +0200
Subject: [PATCH 7659/8469] =?UTF-8?q?=F0=9F=93=9D=20Document=20setup.cfg-o?=
 =?UTF-8?q?nly=20projects?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/requirements.txt |  1 +
 docs/setuptools.txt   | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index bc27165b22..e82df49ccb 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,5 @@
 sphinx!=1.8.0
+pygments-github-lexers==0.0.5
 rst.linker>=1.9
 jaraco.packaging>=6.1
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index d214ca9917..3a2028ced5 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2195,6 +2195,48 @@ Metadata and options are set in the config sections of the same name.
 
 * Unknown keys are ignored.
 
+setup.cfg-only projects
+=======================
+
+.. versionadded:: 40.9.0
+
+If ``setup.py`` is missing from the project directory when a PEP 517
+build is invoked, ``setuptools`` emulates a dummy ``setup.py`` file containing
+only a ``setuptools.setup()`` call.
+
+.. note::
+
+    PEP 517 doesn't support editable installs so this is currently
+    incompatible with ``pip install -e .``.
+
+This means that you can have a Python project with all build configuration
+specified in ``setup.cfg``, without a ``setup.py`` file, if you **can rely
+on** your project always being built by a PEP 517/518 compatible frontend.
+
+To use this feature:
+
+* Specify build requirements and PEP 517 build backend in
+  ``pyproject.toml``.
+  For example:
+
+  .. code-block:: toml
+
+      [build-system]
+      requires = [
+        "setuptools >= 40.9.0",
+        "wheel",
+      ]
+      build-backend = "setuptools.build_meta"
+
+* Use a PEP 517 compatible build frontend, such as ``pip >= 19`` or ``pep517``.
+
+  .. warning::
+
+      As PEP 517 is new, support is not universal, and frontends that
+      do support it may still have bugs. For compatibility, you may want to
+      put a ``setup.py`` file containing only a ``setuptools.setup()``
+      invocation.
+
 
 Using a ``src/`` layout
 =======================

From 9e4e2e0e4d9ea3a0f26cc1dd05c975f4cc660f11 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Sat, 25 May 2019 12:28:35 +0200
Subject: [PATCH 7660/8469] Mark PEP mentions as :pep: SphinX refs

---
 docs/setuptools.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 3a2028ced5..e2a7bb1cc1 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2200,22 +2200,23 @@ setup.cfg-only projects
 
 .. versionadded:: 40.9.0
 
-If ``setup.py`` is missing from the project directory when a PEP 517
+If ``setup.py`` is missing from the project directory when a :pep:`517`
 build is invoked, ``setuptools`` emulates a dummy ``setup.py`` file containing
 only a ``setuptools.setup()`` call.
 
 .. note::
 
-    PEP 517 doesn't support editable installs so this is currently
+    :pep:`517` doesn't support editable installs so this is currently
     incompatible with ``pip install -e .``.
 
 This means that you can have a Python project with all build configuration
 specified in ``setup.cfg``, without a ``setup.py`` file, if you **can rely
-on** your project always being built by a PEP 517/518 compatible frontend.
+on** your project always being built by a :pep:`517`/:pep:`518` compatible
+frontend.
 
 To use this feature:
 
-* Specify build requirements and PEP 517 build backend in
+* Specify build requirements and :pep:`517` build backend in
   ``pyproject.toml``.
   For example:
 
@@ -2228,11 +2229,11 @@ To use this feature:
       ]
       build-backend = "setuptools.build_meta"
 
-* Use a PEP 517 compatible build frontend, such as ``pip >= 19`` or ``pep517``.
+* Use a :pep:`517` compatible build frontend, such as ``pip >= 19`` or ``pep517``.
 
   .. warning::
 
-      As PEP 517 is new, support is not universal, and frontends that
+      As :pep:`517` is new, support is not universal, and frontends that
       do support it may still have bugs. For compatibility, you may want to
       put a ``setup.py`` file containing only a ``setuptools.setup()``
       invocation.

From b0657c80db7891a9eca038199d5d4c2e2bafed03 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Sun, 26 May 2019 19:46:36 +0200
Subject: [PATCH 7661/8469] =?UTF-8?q?=F0=9F=93=9D=20Improve=20the=20note?=
 =?UTF-8?q?=20about=20editable=20installs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Paul Ganssle <pganssle@users.noreply.github.com>
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e2a7bb1cc1..e5663fc46f 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2207,7 +2207,7 @@ only a ``setuptools.setup()`` call.
 .. note::
 
     :pep:`517` doesn't support editable installs so this is currently
-    incompatible with ``pip install -e .``.
+    incompatible with ``pip install -e .``, as :pep:`517` does not support editable installs.
 
 This means that you can have a Python project with all build configuration
 specified in ``setup.cfg``, without a ``setup.py`` file, if you **can rely

From 9afceaf1e5caf499ac78735b4393e8e2f3e9b2d9 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:16:03 +0200
Subject: [PATCH 7662/8469] Add flake8-2020 to requirements.txt

---
 tests/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 4b5e0eeb62..19bf5aefd0 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,5 +1,6 @@
 mock
 pytest-flake8
+flake8-2020; python_version>="3.6"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.7

From 4ea498b752fc89fd47c795f46fa1ff66c314dc58 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:22:50 +0200
Subject: [PATCH 7663/8469] Add changelog

---
 changelog.d/1968.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1968.misc.rst

diff --git a/changelog.d/1968.misc.rst b/changelog.d/1968.misc.rst
new file mode 100644
index 0000000000..4aa5343f4b
--- /dev/null
+++ b/changelog.d/1968.misc.rst
@@ -0,0 +1 @@
+Add flake8-2020 to check for misuse of sys.version or sys.version_info.

From 2ce065e44bfb5bd9b3d8589efdb57876b170e7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Ogam?= <gery.ogam@gmail.com>
Date: Wed, 15 Jan 2020 18:13:31 +0100
Subject: [PATCH 7664/8469] Remove the python command from setup.py calls

---
 docs/setuptools.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index a1d927d5f7..6798a5a515 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -88,7 +88,7 @@ packages in the directory where the setup.py lives.  See the `Command
 Reference`_ section below to see what commands you can give to this setup
 script. For example, to produce a source distribution, simply invoke::
 
-    python setup.py sdist
+    setup.py sdist
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
@@ -1220,7 +1220,7 @@ Before you begin, make sure you have the latest versions of setuptools and wheel
 To build a setuptools project, run this command from the same directory where
 setup.py is located::
 
-    python3 setup.py sdist bdist_wheel
+    setup.py sdist bdist_wheel
 
 This will generate distribution archives in the `dist` directory.
 
@@ -1469,7 +1469,7 @@ tagging the release, so the trunk will still produce development snapshots.
 Alternately, if you are not branching for releases, you can override the
 default version options on the command line, using something like::
 
-    python setup.py egg_info -Db "" sdist bdist_egg
+    setup.py egg_info -Db "" sdist bdist_egg
 
 The first part of this command (``egg_info -Db ""``) will override the
 configured tag information, before creating source and binary eggs. Thus, these
@@ -1479,11 +1479,11 @@ build designation string.
 Of course, if you will be doing this a lot, you may wish to create a personal
 alias for this operation, e.g.::
 
-    python setup.py alias -u release egg_info -Db ""
+    setup.py alias -u release egg_info -Db ""
 
 You can then use it like this::
 
-    python setup.py release sdist bdist_egg
+    setup.py release sdist bdist_egg
 
 Or of course you can create more elaborate aliases that do all of the above.
 See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
@@ -1873,12 +1873,12 @@ Other ``egg_info`` Options
 
 Creating a dated "nightly build" snapshot egg::
 
-    python setup.py egg_info --tag-date --tag-build=DEV bdist_egg
+    setup.py egg_info --tag-date --tag-build=DEV bdist_egg
 
 Creating a release with no version tags, even if some default tags are
 specified in ``setup.cfg``::
 
-    python setup.py egg_info -RDb "" sdist bdist_egg
+    setup.py egg_info -RDb "" sdist bdist_egg
 
 (Notice that ``egg_info`` must always appear on the command line *before* any
 commands that you want the version changes to apply to.)

From 1e5fa9b30a3c3d65d2767d5b9928e555b8c32713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Ogam?= <gery.ogam@gmail.com>
Date: Wed, 15 Jan 2020 18:23:38 +0100
Subject: [PATCH 7665/8469] Uniformise quotation marks

---
 docs/setuptools.txt | 104 ++++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 6798a5a515..f84837ff48 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -100,17 +100,17 @@ dependencies, and perhaps some data files and scripts::
         name="HelloWorld",
         version="0.1",
         packages=find_packages(),
-        scripts=['say_hello.py'],
+        scripts=["say_hello.py"],
 
         # Project uses reStructuredText, so ensure that the docutils get
         # installed or upgraded on the target machine
-        install_requires=['docutils>=0.3'],
+        install_requires=["docutils>=0.3"],
 
         package_data={
             # If any package contains *.txt or *.rst files, include them:
-            '': ['*.txt', '*.rst'],
-            # And include any *.msg files found in the 'hello' package, too:
-            'hello': ['*.msg'],
+            "": ["*.txt", "*.rst"],
+            # And include any *.msg files found in the "hello" package, too:
+            "hello": ["*.msg"],
         },
 
         # metadata to display on PyPI
@@ -125,7 +125,7 @@ dependencies, and perhaps some data files and scripts::
             "Source Code": "https://code.example.com/HelloWorld/",
         },
         classifiers=[
-            'License :: OSI Approved :: Python Software Foundation License'
+            "License :: OSI Approved :: Python Software Foundation License"
         ]
 
         # could also include long_description, download_url, etc.
@@ -207,11 +207,11 @@ but here are a few tips that will keep you out of trouble in the corner cases:
   to compare different version numbers::
 
     >>> from pkg_resources import parse_version
-    >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
+    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
     True
-    >>> parse_version('2.1-rc2') < parse_version('2.1')
+    >>> parse_version("2.1-rc2") < parse_version("2.1")
     True
-    >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
+    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
     True
 
 Once you've decided on a version numbering scheme for your project, you can
@@ -371,7 +371,7 @@ unless you need the associated ``setuptools`` feature.
     imported.  This argument is only useful if the project will be installed as
     a zipfile, and there is a need to have all of the listed resources be
     extracted to the filesystem *as a unit*.  Resources listed here
-    should be '/'-separated paths, relative to the source root, so to list a
+    should be "/"-separated paths, relative to the source root, so to list a
     resource ``foo.png`` in package ``bar.baz``, you would include the string
     ``bar/baz/foo.png`` in this argument.
 
@@ -413,7 +413,7 @@ the same
 directory as the setup script.  Some projects use a ``src`` or ``lib``
 directory as the root of their source tree, and those projects would of course
 use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir={'':'src'}`` in their
+such projects also need something like ``package_dir={"": "src"}`` in their
 ``setup()`` arguments, but that's just a normal distutils thing.)
 
 Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
@@ -480,7 +480,7 @@ top-level package called ``tests``! One way to avoid this problem is to use the
     setup(
         name="namespace.mypackage",
         version="0.1",
-        packages=find_namespace_packages(include=['namespace.*'])
+        packages=find_namespace_packages(include=["namespace.*"])
     )
 
 Another option is to use the "src" layout, where all package code is placed in
@@ -500,8 +500,8 @@ With this layout, the package directory is specified as ``src``, as such::
 
     setup(name="namespace.mypackage",
           version="0.1",
-          package_dir={'': 'src'},
-          packages=find_namespace_packages(where='src'))
+          package_dir={"": "src"},
+          packages=find_namespace_packages(where="src"))
 
 .. _PEP 420: https://www.python.org/dev/peps/pep-0420/
 
@@ -526,12 +526,12 @@ script called ``baz``, you might do something like this::
     setup(
         # other arguments here...
         entry_points={
-            'console_scripts': [
-                'foo = my_package.some_module:main_func',
-                'bar = other_module:some_func',
+            "console_scripts": [
+                "foo = my_package.some_module:main_func",
+                "bar = other_module:some_func",
             ],
-            'gui_scripts': [
-                'baz = my_package_gui:start_func',
+            "gui_scripts": [
+                "baz = my_package_gui:start_func",
             ]
         }
     )
@@ -567,8 +567,8 @@ as the following::
     setup(
         # other arguments here...
         entry_points={
-            'setuptools.installation': [
-                'eggsecutable = my_package.some_module:main_func',
+            "setuptools.installation": [
+                "eggsecutable = my_package.some_module:main_func",
             ]
         }
     )
@@ -741,8 +741,8 @@ For example, let's say that Project A offers optional PDF and reST support::
         name="Project-A",
         ...
         extras_require={
-            'PDF':  ["ReportLab>=1.2", "RXP"],
-            'reST': ["docutils>=0.3"],
+            "PDF":  ["ReportLab>=1.2", "RXP"],
+            "reST": ["docutils>=0.3"],
         }
     )
 
@@ -763,9 +763,9 @@ declare it like this, so that the "PDF" requirements are only resolved if the
         name="Project-A",
         ...
         entry_points={
-            'console_scripts': [
-                'rst2pdf = project_a.tools.pdfgen [PDF]',
-                'rst2html = project_a.tools.htmlgen',
+            "console_scripts": [
+                "rst2pdf = project_a.tools.pdfgen [PDF]",
+                "rst2html = project_a.tools.htmlgen",
                 # more script entry points ...
             ],
         }
@@ -801,8 +801,8 @@ setup to this::
         name="Project-A",
         ...
         extras_require={
-            'PDF':  [],
-            'reST': ["docutils>=0.3"],
+            "PDF":  [],
+            "reST": ["docutils>=0.3"],
         }
     )
 
@@ -829,8 +829,8 @@ For example, here is a project that uses the ``enum`` module and ``pywin32``::
         name="Project",
         ...
         install_requires=[
-            'enum34;python_version<"3.4"',
-            'pywin32 >= 1.0;platform_system=="Windows"'
+            "enum34;python_version<'3.4'",
+            "pywin32 >= 1.0;platform_system=='Windows'"
         ]
     )
 
@@ -878,9 +878,9 @@ e.g.::
         ...
         package_data={
             # If any package contains *.txt or *.rst files, include them:
-            '': ['*.txt', '*.rst'],
-            # And include any *.msg files found in the 'hello' package, too:
-            'hello': ['*.msg'],
+            "": ["*.txt", "*.rst"],
+            # And include any *.msg files found in the "hello" package, too:
+            "hello": ["*.msg"],
         }
     )
 
@@ -903,15 +903,15 @@ The setuptools setup file might look like this::
     from setuptools import setup, find_packages
     setup(
         ...
-        packages=find_packages('src'),  # include all packages under src
-        package_dir={'':'src'},   # tell distutils packages are under src
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
 
         package_data={
             # If any package contains *.txt files, include them:
-            '': ['*.txt'],
-            # And include any *.dat files found in the 'data' subdirectory
-            # of the 'mypkg' package, also:
-            'mypkg': ['data/*.dat'],
+            "": ["*.txt"],
+            # And include any *.dat files found in the "data" subdirectory
+            # of the "mypkg" package, also:
+            "mypkg": ["data/*.dat"],
         }
     )
 
@@ -926,7 +926,7 @@ converts slashes to appropriate platform-specific separators at build time.
 
 If datafiles are contained in a subdirectory of a package that isn't a package
 itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
-in the ``package_data`` argument (as shown above with ``'data/*.dat'``).
+in the ``package_data`` argument (as shown above with ``"data/*.dat"``).
 
 When building an ``sdist``, the datafiles are also drawn from the
 ``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
@@ -951,18 +951,18 @@ to do things like this::
     from setuptools import setup, find_packages
     setup(
         ...
-        packages=find_packages('src'),  # include all packages under src
-        package_dir={'':'src'},   # tell distutils packages are under src
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
 
         include_package_data=True,    # include everything in source control
 
         # ...but exclude README.txt from all packages
-        exclude_package_data={'': ['README.txt']},
+        exclude_package_data={"": ["README.txt"]},
     )
 
 The ``exclude_package_data`` option is a dictionary mapping package names to
 lists of wildcard patterns, just like the ``package_data`` option.  And, just
-as with that option, a key of ``''`` will apply the given pattern(s) to all
+as with that option, a key of ``""`` will apply the given pattern(s) to all
 packages.  However, any files that match these patterns will be *excluded*
 from installation, even if they were listed in ``package_data`` or were
 included as a result of using ``include_package_data``.
@@ -1096,12 +1096,12 @@ for our hypothetical blogging tool::
 
     setup(
         # ...
-        entry_points={'blogtool.parsers': '.rst = some_module:SomeClass'}
+        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
     )
 
     setup(
         # ...
-        entry_points={'blogtool.parsers': ['.rst = some_module:a_func']}
+        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
     )
 
     setup(
@@ -1309,7 +1309,7 @@ participates in.  For example, the ZopeInterface project might do this::
 
     setup(
         # ...
-        namespace_packages=['zope']
+        namespace_packages=["zope"]
     )
 
 because it contains a ``zope.interface`` package that lives in the ``zope``
@@ -1327,7 +1327,7 @@ packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
 packages), in a normal Python package layout.  These ``__init__.py`` files
 *must* contain the line::
 
-    __import__('pkg_resources').declare_namespace(__name__)
+    __import__("pkg_resources").declare_namespace(__name__)
 
 This code ensures that the namespace package machinery is operating and that
 the current package is registered as a namespace package.
@@ -1410,7 +1410,7 @@ pattern.  So, you can use a command line like::
 
     setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
 
-to build an egg whose version info includes 'DEV-rNNNN' (where NNNN is the
+to build an egg whose version info includes "DEV-rNNNN" (where NNNN is the
 most recent Subversion revision that affected the source tree), and then
 delete any egg files from the distribution directory except for the three
 that were built most recently.
@@ -1500,7 +1500,7 @@ To ensure Cython is available, include Cython in the build-requires section
 of your pyproject.toml::
 
     [build-system]
-    requires=[..., 'cython']
+    requires=[..., "cython"]
 
 Built with pip 10 or later, that declaration is sufficient to include Cython
 in the build. For broader compatibility, declare the dependency in your
@@ -2351,7 +2351,7 @@ parsing ``metadata`` and ``options`` sections into a dictionary.
 
     from setuptools.config import read_configuration
 
-    conf_dict = read_configuration('/home/user/dev/package/setup.cfg')
+    conf_dict = read_configuration("/home/user/dev/package/setup.cfg")
 
 
 By default, ``read_configuration()`` will read only the file provided
@@ -2531,7 +2531,7 @@ a file.  Here's what the writer utility looks like::
         argname = os.path.splitext(basename)[0]
         value = getattr(cmd.distribution, argname, None)
         if value is not None:
-            value = '\n'.join(value) + '\n'
+            value = "\n".join(value) + "\n"
         cmd.write_or_delete_file(argname, filename, value)
 
 As you can see, ``egg_info.writers`` entry points must be a function taking

From 310771c2808dc18218cc30082402c784deb6d2fa Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 18 Jan 2020 07:30:32 -0800
Subject: [PATCH 7666/8469] Add 'Programming Language :: Python :: 3 :: Only'
 trove classifier

The project has been Python 3 only since
a46a6bfd903ecc292fc3645c37c1b72781528095.
---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 18c9e1df02..35db335af7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,6 +36,7 @@ classifiers =
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7

From 9d32a834dfea6e144b05e502fca506fc19d4fa71 Mon Sep 17 00:00:00 2001
From: Ben Nuttall <ben@bennuttall.com>
Date: Sun, 19 Jan 2020 12:13:12 +0000
Subject: [PATCH 7667/8469] Ensure bdist_wheel no longer creates a universal
 wheel, close #1976

by removing the [bdist_wheel] section
---
 setup.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 18c9e1df02..f7dc4ea348 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,9 +14,6 @@ repository = https://upload.pypi.org/legacy/
 [sdist]
 formats = zip
 
-[bdist_wheel]
-universal = 1
-
 [metadata]
 name = setuptools
 version = 45.0.0

From c71969013d726c5cbd06dc81770ab064f3e783ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 09:53:27 -0500
Subject: [PATCH 7668/8469] Remove the Features feature. Fixes #65.

This commit reverts e4460fad043f4fa0edc7b7e1eef0b209f4588fe5.
---
 setup.py                            |   1 -
 setuptools/__init__.py              |   7 +-
 setuptools/dist.py                  | 260 +---------------------------
 setuptools/tests/test_setuptools.py |  83 +--------
 4 files changed, 7 insertions(+), 344 deletions(-)

diff --git a/setup.py b/setup.py
index 277b664083..1fe18bd13c 100755
--- a/setup.py
+++ b/setup.py
@@ -91,7 +91,6 @@ def pypi_link(pkg_filename):
         ],
         "setuptools.finalize_distribution_options": [
             "parent_finalize = setuptools.dist:_Distribution.finalize_options",
-            "features = setuptools.dist:Distribution._finalize_feature_opts",
             "keywords = setuptools.dist:Distribution._finalize_setup_keywords",
             "2to3_doctests = "
             "setuptools.dist:Distribution._finalize_2to3_doctests",
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a71b2bbdc6..dc0f9893da 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,6 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
-import sys
 import functools
 import distutils.core
 import distutils.filelist
@@ -17,7 +16,7 @@
 
 import setuptools.version
 from setuptools.extension import Extension
-from setuptools.dist import Distribution, Feature
+from setuptools.dist import Distribution
 from setuptools.depends import Require
 from . import monkey
 
@@ -25,13 +24,13 @@
 
 
 __all__ = [
-    'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
+    'setup', 'Distribution', 'Command', 'Extension', 'Require',
     'SetuptoolsDeprecationWarning',
     'find_packages'
 ]
 
 if PY3:
-  __all__.append('find_namespace_packages')
+    __all__.append('find_namespace_packages')
 
 __version__ = setuptools.version.__version__
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index fe5adf4607..ff5a9ff340 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -19,9 +19,7 @@
 from collections import defaultdict
 from email import message_from_file
 
-from distutils.errors import (
-    DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError,
-)
+from distutils.errors import DistutilsOptionError, DistutilsSetupError
 from distutils.util import rfc822_escape
 from distutils.version import StrictVersion
 
@@ -32,7 +30,6 @@
 
 from . import SetuptoolsDeprecationWarning
 
-from setuptools.depends import Require
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
@@ -338,7 +335,7 @@ def check_packages(dist, attr, value):
 
 
 class Distribution(_Distribution):
-    """Distribution with support for features, tests, and package data
+    """Distribution with support for tests and package data
 
     This is an enhanced version of 'distutils.dist.Distribution' that
     effectively adds the following new optional keyword arguments to 'setup()':
@@ -365,21 +362,6 @@ class Distribution(_Distribution):
         EasyInstall and requests one of your extras, the corresponding
         additional requirements will be installed if needed.
 
-     'features' **deprecated** -- a dictionary mapping option names to
-        'setuptools.Feature'
-        objects.  Features are a portion of the distribution that can be
-        included or excluded based on user options, inter-feature dependencies,
-        and availability on the current system.  Excluded features are omitted
-        from all setup commands, including source and binary distributions, so
-        you can create multiple distributions from the same source tree.
-        Feature names should be valid Python identifiers, except that they may
-        contain the '-' (minus) sign.  Features can be included or excluded
-        via the command line options '--with-X' and '--without-X', where 'X' is
-        the name of the feature.  Whether a feature is included by default, and
-        whether you are allowed to control this from the command line, is
-        determined by the Feature object.  See the 'Feature' class for more
-        information.
-
      'test_suite' -- the name of a test suite to run for the 'test' command.
         If the user runs 'python setup.py test', the package will be installed,
         and the named test suite will be run.  The format is the same as
@@ -401,8 +383,7 @@ class Distribution(_Distribution):
     for manipulating the distribution's contents.  For example, the 'include()'
     and 'exclude()' methods can be thought of as in-place add and subtract
     commands that add or remove packages, modules, extensions, and so on from
-    the distribution.  They are used by the feature subsystem to configure the
-    distribution for the included and excluded features.
+    the distribution.
     """
 
     _DISTUTILS_UNSUPPORTED_METADATA = {
@@ -432,10 +413,6 @@ def __init__(self, attrs=None):
         if not have_package_data:
             self.package_data = {}
         attrs = attrs or {}
-        if 'features' in attrs or 'require_features' in attrs:
-            Feature.warn_deprecated()
-        self.require_features = []
-        self.features = {}
         self.dist_files = []
         # Filter-out setuptools' specific options.
         self.src_root = attrs.pop("src_root", None)
@@ -702,17 +679,6 @@ def parse_config_files(self, filenames=None, ignore_option_errors=False):
                             ignore_option_errors=ignore_option_errors)
         self._finalize_requires()
 
-    def parse_command_line(self):
-        """Process features after parsing command line options"""
-        result = _Distribution.parse_command_line(self)
-        if self.features:
-            self._finalize_features()
-        return result
-
-    def _feature_attrname(self, name):
-        """Convert feature name to corresponding option attribute name"""
-        return 'with_' + name.replace('-', '_')
-
     def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
         resolved_dists = pkg_resources.working_set.resolve(
@@ -776,53 +742,6 @@ def fetch_build_egg(self, req):
         from setuptools.installer import fetch_build_egg
         return fetch_build_egg(self, req)
 
-    def _finalize_feature_opts(self):
-        """Add --with-X/--without-X options based on optional features"""
-
-        if not self.features:
-            return
-
-        go = []
-        no = self.negative_opt.copy()
-
-        for name, feature in self.features.items():
-            self._set_feature(name, None)
-            feature.validate(self)
-
-            if feature.optional:
-                descr = feature.description
-                incdef = ' (default)'
-                excdef = ''
-                if not feature.include_by_default():
-                    excdef, incdef = incdef, excdef
-
-                new = (
-                    ('with-' + name, None, 'include ' + descr + incdef),
-                    ('without-' + name, None, 'exclude ' + descr + excdef),
-                )
-                go.extend(new)
-                no['without-' + name] = 'with-' + name
-
-        self.global_options = self.feature_options = go + self.global_options
-        self.negative_opt = self.feature_negopt = no
-
-    def _finalize_features(self):
-        """Add/remove features and resolve dependencies between them"""
-
-        # First, flag all the enabled items (and thus their dependencies)
-        for name, feature in self.features.items():
-            enabled = self.feature_is_included(name)
-            if enabled or (enabled is None and feature.include_by_default()):
-                feature.include_in(self)
-                self._set_feature(name, 1)
-
-        # Then disable the rest, so that off-by-default features don't
-        # get flagged as errors when they're required by an enabled feature
-        for name, feature in self.features.items():
-            if not self.feature_is_included(name):
-                feature.exclude_from(self)
-                self._set_feature(name, 0)
-
     def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
@@ -852,25 +771,6 @@ def get_command_list(self):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.get_command_list(self)
 
-    def _set_feature(self, name, status):
-        """Set feature's inclusion status"""
-        setattr(self, self._feature_attrname(name), status)
-
-    def feature_is_included(self, name):
-        """Return 1 if feature is included, 0 if excluded, 'None' if unknown"""
-        return getattr(self, self._feature_attrname(name))
-
-    def include_feature(self, name):
-        """Request inclusion of feature named 'name'"""
-
-        if self.feature_is_included(name) == 0:
-            descr = self.features[name].description
-            raise DistutilsOptionError(
-                descr + " is required, but was excluded or is not available"
-            )
-        self.features[name].include_in(self)
-        self._set_feature(name, 1)
-
     def include(self, **attrs):
         """Add items to distribution that are named in keyword arguments
 
@@ -1115,160 +1015,6 @@ def handle_display_options(self, option_order):
                 sys.stdout.detach(), encoding, errors, newline, line_buffering)
 
 
-class Feature:
-    """
-    **deprecated** -- The `Feature` facility was never completely implemented
-    or supported, `has reported issues
-    <https://github.com/pypa/setuptools/issues/58>`_ and will be removed in
-    a future version.
-
-    A subset of the distribution that can be excluded if unneeded/wanted
-
-    Features are created using these keyword arguments:
-
-      'description' -- a short, human readable description of the feature, to
-         be used in error messages, and option help messages.
-
-      'standard' -- if true, the feature is included by default if it is
-         available on the current system.  Otherwise, the feature is only
-         included if requested via a command line '--with-X' option, or if
-         another included feature requires it.  The default setting is 'False'.
-
-      'available' -- if true, the feature is available for installation on the
-         current system.  The default setting is 'True'.
-
-      'optional' -- if true, the feature's inclusion can be controlled from the
-         command line, using the '--with-X' or '--without-X' options.  If
-         false, the feature's inclusion status is determined automatically,
-         based on 'availabile', 'standard', and whether any other feature
-         requires it.  The default setting is 'True'.
-
-      'require_features' -- a string or sequence of strings naming features
-         that should also be included if this feature is included.  Defaults to
-         empty list.  May also contain 'Require' objects that should be
-         added/removed from the distribution.
-
-      'remove' -- a string or list of strings naming packages to be removed
-         from the distribution if this feature is *not* included.  If the
-         feature *is* included, this argument is ignored.  This argument exists
-         to support removing features that "crosscut" a distribution, such as
-         defining a 'tests' feature that removes all the 'tests' subpackages
-         provided by other features.  The default for this argument is an empty
-         list.  (Note: the named package(s) or modules must exist in the base
-         distribution when the 'setup()' function is initially called.)
-
-      other keywords -- any other keyword arguments are saved, and passed to
-         the distribution's 'include()' and 'exclude()' methods when the
-         feature is included or excluded, respectively.  So, for example, you
-         could pass 'packages=["a","b"]' to cause packages 'a' and 'b' to be
-         added or removed from the distribution as appropriate.
-
-    A feature must include at least one 'requires', 'remove', or other
-    keyword argument.  Otherwise, it can't affect the distribution in any way.
-    Note also that you can subclass 'Feature' to create your own specialized
-    feature types that modify the distribution in other ways when included or
-    excluded.  See the docstrings for the various methods here for more detail.
-    Aside from the methods, the only feature attributes that distributions look
-    at are 'description' and 'optional'.
-    """
-
-    @staticmethod
-    def warn_deprecated():
-        msg = (
-            "Features are deprecated and will be removed in a future "
-            "version. See https://github.com/pypa/setuptools/issues/65."
-        )
-        warnings.warn(msg, DistDeprecationWarning, stacklevel=3)
-
-    def __init__(
-            self, description, standard=False, available=True,
-            optional=True, require_features=(), remove=(), **extras):
-        self.warn_deprecated()
-
-        self.description = description
-        self.standard = standard
-        self.available = available
-        self.optional = optional
-        if isinstance(require_features, (str, Require)):
-            require_features = require_features,
-
-        self.require_features = [
-            r for r in require_features if isinstance(r, str)
-        ]
-        er = [r for r in require_features if not isinstance(r, str)]
-        if er:
-            extras['require_features'] = er
-
-        if isinstance(remove, str):
-            remove = remove,
-        self.remove = remove
-        self.extras = extras
-
-        if not remove and not require_features and not extras:
-            raise DistutilsSetupError(
-                "Feature %s: must define 'require_features', 'remove', or "
-                "at least one of 'packages', 'py_modules', etc."
-            )
-
-    def include_by_default(self):
-        """Should this feature be included by default?"""
-        return self.available and self.standard
-
-    def include_in(self, dist):
-        """Ensure feature and its requirements are included in distribution
-
-        You may override this in a subclass to perform additional operations on
-        the distribution.  Note that this method may be called more than once
-        per feature, and so should be idempotent.
-
-        """
-
-        if not self.available:
-            raise DistutilsPlatformError(
-                self.description + " is required, "
-                "but is not available on this platform"
-            )
-
-        dist.include(**self.extras)
-
-        for f in self.require_features:
-            dist.include_feature(f)
-
-    def exclude_from(self, dist):
-        """Ensure feature is excluded from distribution
-
-        You may override this in a subclass to perform additional operations on
-        the distribution.  This method will be called at most once per
-        feature, and only after all included features have been asked to
-        include themselves.
-        """
-
-        dist.exclude(**self.extras)
-
-        if self.remove:
-            for item in self.remove:
-                dist.exclude_package(item)
-
-    def validate(self, dist):
-        """Verify that feature makes sense in context of distribution
-
-        This method is called by the distribution just before it parses its
-        command line.  It checks to ensure that the 'remove' attribute, if any,
-        contains only valid package/module names that are present in the base
-        distribution when 'setup()' is called.  You may override it in a
-        subclass to perform any other required validation of the feature
-        against a target distribution.
-        """
-
-        for item in self.remove:
-            if not dist.has_contents_for(item):
-                raise DistutilsSetupError(
-                    "%s wants to be able to remove %s, but the distribution"
-                    " doesn't contain any packages or modules under %s"
-                    % (self.description, item, item)
-                )
-
-
 class DistDeprecationWarning(SetuptoolsDeprecationWarning):
     """Class for warning about deprecations in dist in
     setuptools. Not ignored by default, unlike DeprecationWarning."""
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 5896a69ae6..26a6ab52d1 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -4,7 +4,7 @@
 import os
 import distutils.core
 import distutils.cmd
-from distutils.errors import DistutilsOptionError, DistutilsPlatformError
+from distutils.errors import DistutilsOptionError
 from distutils.errors import DistutilsSetupError
 from distutils.core import Extension
 from distutils.version import LooseVersion
@@ -14,7 +14,6 @@
 import setuptools
 import setuptools.dist
 import setuptools.depends as dep
-from setuptools import Feature
 from setuptools.depends import Require
 from setuptools.extern import six
 
@@ -211,86 +210,6 @@ def testInvalidIncludeExclude(self):
             self.dist.exclude(package_dir=['q'])
 
 
-@pytest.mark.filterwarnings('ignore:Features are deprecated')
-class TestFeatures:
-    def setup_method(self, method):
-        self.req = Require('Distutils', '1.0.3', 'distutils')
-        self.dist = makeSetup(
-            features={
-                'foo': Feature(
-                    "foo", standard=True, require_features=['baz', self.req]),
-                'bar': Feature("bar", standard=True, packages=['pkg.bar'],
-                               py_modules=['bar_et'], remove=['bar.ext'],
-                               ),
-                'baz': Feature(
-                        "baz", optional=False, packages=['pkg.baz'],
-                        scripts=['scripts/baz_it'],
-                        libraries=[('libfoo', 'foo/foofoo.c')]
-                       ),
-                'dwim': Feature("DWIM", available=False, remove='bazish'),
-            },
-            script_args=['--without-bar', 'install'],
-            packages=['pkg.bar', 'pkg.foo'],
-            py_modules=['bar_et', 'bazish'],
-            ext_modules=[Extension('bar.ext', ['bar.c'])]
-        )
-
-    def testDefaults(self):
-        assert not Feature(
-            "test", standard=True, remove='x', available=False
-        ).include_by_default()
-        assert Feature("test", standard=True, remove='x').include_by_default()
-        # Feature must have either kwargs, removes, or require_features
-        with pytest.raises(DistutilsSetupError):
-            Feature("test")
-
-    def testAvailability(self):
-        with pytest.raises(DistutilsPlatformError):
-            self.dist.features['dwim'].include_in(self.dist)
-
-    def testFeatureOptions(self):
-        dist = self.dist
-        assert (
-            ('with-dwim', None, 'include DWIM') in dist.feature_options
-        )
-        assert (
-            ('without-dwim', None, 'exclude DWIM (default)')
-            in dist.feature_options
-        )
-        assert (
-            ('with-bar', None, 'include bar (default)') in dist.feature_options
-        )
-        assert (
-            ('without-bar', None, 'exclude bar') in dist.feature_options
-        )
-        assert dist.feature_negopt['without-foo'] == 'with-foo'
-        assert dist.feature_negopt['without-bar'] == 'with-bar'
-        assert dist.feature_negopt['without-dwim'] == 'with-dwim'
-        assert ('without-baz' not in dist.feature_negopt)
-
-    def testUseFeatures(self):
-        dist = self.dist
-        assert dist.with_foo == 1
-        assert dist.with_bar == 0
-        assert dist.with_baz == 1
-        assert ('bar_et' not in dist.py_modules)
-        assert ('pkg.bar' not in dist.packages)
-        assert ('pkg.baz' in dist.packages)
-        assert ('scripts/baz_it' in dist.scripts)
-        assert (('libfoo', 'foo/foofoo.c') in dist.libraries)
-        assert dist.ext_modules == []
-        assert dist.require_features == [self.req]
-
-        # If we ask for bar, it should fail because we explicitly disabled
-        # it on the command line
-        with pytest.raises(DistutilsOptionError):
-            dist.include_feature('bar')
-
-    def testFeatureWithInvalidRemove(self):
-        with pytest.raises(SystemExit):
-            makeSetup(features={'x': Feature('x', remove='y')})
-
-
 class TestCommandTests:
     def testTestIsCommand(self):
         test_cmd = makeSetup().get_command_obj('test')

From 6980b9c8fed113f1046099924e16287662beff5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 10:06:53 -0500
Subject: [PATCH 7669/8469] Update changelog.

---
 changelog.d/65.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/65.breaking.rst

diff --git a/changelog.d/65.breaking.rst b/changelog.d/65.breaking.rst
new file mode 100644
index 0000000000..bde427402f
--- /dev/null
+++ b/changelog.d/65.breaking.rst
@@ -0,0 +1 @@
+Once again as in 3.0, removed the Features feature.

From 38af5c857fc93706cbb13de1c5e5a0b0a458fdce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 10:54:16 -0500
Subject: [PATCH 7670/8469] Update changelog.

---
 changelog.d/1974.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1974.change.rst

diff --git a/changelog.d/1974.change.rst b/changelog.d/1974.change.rst
new file mode 100644
index 0000000000..cadf1cf186
--- /dev/null
+++ b/changelog.d/1974.change.rst
@@ -0,0 +1 @@
+Add Python 3 Only Trove Classifier and remove universal wheel declaration for more complete transition from Python 2.

From 756a7d662a076657ddf67f0cba699ca5430cb840 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 10:55:07 -0500
Subject: [PATCH 7671/8469] =?UTF-8?q?Bump=20version:=2045.0.0=20=E2=86=92?=
 =?UTF-8?q?=2045.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 8 ++++++++
 changelog.d/1458.change.rst | 1 -
 changelog.d/1704.change.rst | 1 -
 changelog.d/1974.change.rst | 1 -
 setup.cfg                   | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1458.change.rst
 delete mode 100644 changelog.d/1704.change.rst
 delete mode 100644 changelog.d/1974.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7714390795..ef8a387751 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 45.0.0
+current_version = 45.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 4a81e995c0..198854fc24 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v45.1.0
+-------
+
+* #1458: Add minimum sunset date and preamble to Python 2 warning.
+* #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
+* #1974: Add Python 3 Only Trove Classifier and remove universal wheel declaration for more complete transition from Python 2.
+
+
 v45.0.0
 -------
 
diff --git a/changelog.d/1458.change.rst b/changelog.d/1458.change.rst
deleted file mode 100644
index c953127ae0..0000000000
--- a/changelog.d/1458.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add minimum sunset date and preamble to Python 2 warning.
diff --git a/changelog.d/1704.change.rst b/changelog.d/1704.change.rst
deleted file mode 100644
index 62450835b9..0000000000
--- a/changelog.d/1704.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set sys.argv[0] in setup script run by build_meta.__legacy__
diff --git a/changelog.d/1974.change.rst b/changelog.d/1974.change.rst
deleted file mode 100644
index cadf1cf186..0000000000
--- a/changelog.d/1974.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add Python 3 Only Trove Classifier and remove universal wheel declaration for more complete transition from Python 2.
diff --git a/setup.cfg b/setup.cfg
index e335ea224c..bef019eed8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 45.0.0
+version = 45.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From fcc9680fd931645d0e6928a358d726daa1ab220e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:15:42 -0500
Subject: [PATCH 7672/8469] Add azure pipelines from jaraco/skeleton

---
 azure-pipelines.yml | 71 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000..3e80bf443d
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,71 @@
+# Create the project in Azure with:
+# az devops project create --name $name --organization https://dev.azure.com/$org/ --visibility public
+# then configure the pipelines (through web UI)
+
+trigger:
+  branches:
+    include:
+    - '*'
+  tags:
+    include:
+    - '*'
+
+pool:
+  vmimage: 'Ubuntu-18.04'
+
+variables:
+- group: Azure secrets
+
+stages:
+- stage: Test
+  jobs:
+
+  - job: 'Test'
+    strategy:
+      matrix:
+        Python36:
+          python.version: '3.6'
+        Python38:
+          python.version: '3.8'
+      maxParallel: 4
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '$(python.version)'
+        architecture: 'x64'
+
+    - script: python -m pip install tox
+      displayName: 'Install tox'
+
+    - script: |
+        tox -- --junit-xml=test-results.xml
+      displayName: 'run tests'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: '**/test-results.xml'
+        testRunTitle: 'Python $(python.version)'
+      condition: succeededOrFailed()
+
+- stage: Publish
+  dependsOn: Test
+  jobs:
+  - job: 'Publish'
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '3.8'
+        architecture: 'x64'
+
+    - script: python -m pip install tox
+      displayName: 'Install tox'
+
+    - script: |
+        tox -e release
+      env:
+        TWINE_PASSWORD: $(PyPI-token)
+      displayName: 'publish to PyPI'
+
+  condition: contains(variables['Build.SourceBranch'], 'tags')

From d09dd5ff998887536e3e898ec7c007053d96e0aa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:29:30 -0500
Subject: [PATCH 7673/8469] Include PKG-INFO in minimal egg-info so that
 metadata doesn't need to be generated twice during bootstrap.

---
 bootstrap.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 8c7d7fc3e6..077bf690a7 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -25,6 +25,7 @@
     entry_points = setuptools.dist:check_entry_points
 
     [egg_info.writers]
+    PKG-INFO = setuptools.command.egg_info:write_pkg_info
     dependency_links.txt = setuptools.command.egg_info:overwrite_arg
     entry_points.txt = setuptools.command.egg_info:write_entries
     requires.txt = setuptools.command.egg_info:write_requirements
@@ -52,8 +53,6 @@ def run_egg_info():
     cmd = [sys.executable, 'setup.py', 'egg_info']
     print("Regenerating egg_info")
     subprocess.check_call(cmd)
-    print("...and again.")
-    subprocess.check_call(cmd)
 
 
 def main():

From 7f6394863dc096b9f31e71a5843acbd836ff8d6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:43:44 -0500
Subject: [PATCH 7674/8469] Only run 'egg_info' when bootstrapping was
 required.

---
 bootstrap.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index 077bf690a7..8fa9e4b554 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -36,10 +36,11 @@ def ensure_egg_info():
     if os.path.exists('setuptools.egg-info'):
         return
     print("adding minimal entry_points")
-    build_egg_info()
+    add_minimal_info()
+    run_egg_info()
 
 
-def build_egg_info():
+def add_minimal_info():
     """
     Build a minimal egg-info, enough to invoke egg_info
     """
@@ -55,9 +56,4 @@ def run_egg_info():
     subprocess.check_call(cmd)
 
 
-def main():
-    ensure_egg_info()
-    run_egg_info()
-
-
-__name__ == '__main__' and main()
+__name__ == '__main__' and ensure_egg_info()

From 94f88bf48af78c4f961fe42241da556837efa3c1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:54:02 -0500
Subject: [PATCH 7675/8469] Bootstrap the environment in tox, allowing simple
 'tox' to run tests and simplifying all of the pipelines.

---
 .github/workflows/python-tests.yml |  4 ----
 .travis.yml                        |  2 --
 appveyor.yml                       |  1 -
 docs/conf.py                       |  2 +-
 docs/developer-guide.txt           |  8 ++------
 tools/tox_pip.py                   | 11 +++++++++--
 tox.ini                            |  4 +---
 7 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 71957abaa8..a95a5b1de6 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -52,10 +52,6 @@ jobs:
         env
       env: ${{ matrix.env }}
 
-    - name: Update egg_info based on setup.py in checkout
-      run: >-
-        python -m bootstrap
-      env: ${{ matrix.env }}
     - name: Verify that there's no cached Python modules in sources
       if: >-
         ! startsWith(matrix.os, 'windows-')
diff --git a/.travis.yml b/.travis.yml
index 263386c8dd..fe875ab64f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,6 @@ install:
 - pip freeze --all
 - env
 
-# update egg_info based on setup.py in checkout
-- python bootstrap.py
 - "! grep pyc setuptools.egg-info/SOURCES.txt"
 
 script:
diff --git a/appveyor.yml b/appveyor.yml
index fc65a9a70d..f7ab22f6af 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,6 @@ test_script:
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
   - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
-  - python bootstrap.py
   - tox -- --cov
 
 after_test:
diff --git a/docs/conf.py b/docs/conf.py
index cbd19fb470..6f6ae13a60 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 # hack to run the bootstrap script so that jaraco.packaging.sphinx
 # can invoke setup.py
 'READTHEDOCS' in os.environ and subprocess.check_call(
-    [sys.executable, 'bootstrap.py'],
+    [sys.executable, '-m', 'bootstrap'],
     cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
 )
 
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index d145fba140..0b4ae4d4c3 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -104,12 +104,8 @@ from the command line after pushing a new branch.
 Testing
 -------
 
-The primary tests are run using tox. To run the tests, first create the metadata
-needed to run the tests::
-
-    $ python bootstrap.py
-
-Then make sure you have tox installed, and invoke it::
+The primary tests are run using tox.  Make sure you have tox installed,
+and invoke it::
 
     $ tox
 
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 06655fe439..2d33e9e505 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -14,13 +14,20 @@ def remove_setuptools():
     subprocess.check_call(cmd, cwd='.tox')
 
 
+def bootstrap():
+    print("Running bootstrap")
+    cmd = [sys.executable, '-m', 'bootstrap']
+    subprocess.check_call(cmd)
+
+
 def pip(args):
     # Honor requires-python when installing test suite dependencies
     if any('-r' in arg for arg in args):
         os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = '0'
 
-    # When installing '.', remove setuptools
-    '.' in args and remove_setuptools()
+    if '.' in args:
+        remove_setuptools()
+        bootstrap()
 
     cmd = [sys.executable, '-m', 'pip'] + args
     subprocess.check_call(cmd)
diff --git a/tox.ini b/tox.ini
index d458dc338c..e71067be93 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,3 @@
-# Note: Run "python bootstrap.py" before running Tox, to generate metadata.
-#
 # To run Tox against all supported Python interpreters, you can set:
 #
 # export TOXENV='py27,py3{5,6,7,8},pypy,pypy3'
@@ -49,7 +47,7 @@ commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 deps = -r{toxinidir}/docs/requirements.txt
 skip_install=True
 commands =
-    python {toxinidir}/bootstrap.py
+    python -m bootstrap
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
     sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
 

From 98bf0b5d2da335aa12517cbb01bc733eee3b216b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:55:33 -0500
Subject: [PATCH 7676/8469] Remove another reference to py27

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index d458dc338c..9d27dd17d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 #
 # To run Tox against all supported Python interpreters, you can set:
 #
-# export TOXENV='py27,py3{5,6,7,8},pypy,pypy3'
+# export TOXENV='py3{5,6,7,8},pypy,pypy3'
 
 [tox]
 envlist=python

From a0e8d0568d84e29066a5b45aade5aafe28237ec0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:57:02 -0500
Subject: [PATCH 7677/8469] Disable Python 2 tests on Github Actions

---
 .github/workflows/python-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 71957abaa8..fab2169a01 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -18,7 +18,6 @@ jobs:
         - 3.7
         - 3.6
         - 3.5
-        - 2.7
         os:
         - ubuntu-18.04
         - ubuntu-16.04

From 3d4d8b9dde61b87271861b8c7ebeb168ac4fa72b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 12:46:30 -0500
Subject: [PATCH 7678/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/conf.py                              | 39 ++++--------
 pkg_resources/__init__.py                 |  4 +-
 pkg_resources/tests/test_pkg_resources.py |  8 ++-
 pkg_resources/tests/test_resources.py     |  3 +-
 setuptools/__init__.py                    |  6 +-
 setuptools/archive_util.py                |  6 +-
 setuptools/build_meta.py                  | 24 ++++---
 setuptools/command/build_clib.py          | 31 ++++-----
 setuptools/command/build_ext.py           |  9 ++-
 setuptools/command/easy_install.py        | 31 +++++----
 setuptools/command/egg_info.py            | 12 ++--
 setuptools/command/install_lib.py         |  3 +-
 setuptools/command/py36compat.py          |  2 +-
 setuptools/command/test.py                |  3 +-
 setuptools/command/upload_docs.py         |  6 +-
 setuptools/dep_util.py                    |  4 +-
 setuptools/installer.py                   |  4 +-
 setuptools/msvc.py                        | 17 ++---
 setuptools/namespaces.py                  | 16 +++--
 setuptools/package_index.py               |  6 +-
 setuptools/py27compat.py                  |  2 +-
 setuptools/sandbox.py                     |  9 +--
 setuptools/site-patch.py                  | 10 +--
 setuptools/ssl_support.py                 | 23 ++++---
 setuptools/tests/test_build_meta.py       |  1 +
 setuptools/tests/test_dist.py             | 11 ++--
 setuptools/tests/test_easy_install.py     | 77 ++++++++++++++---------
 setuptools/tests/test_egg_info.py         | 48 +++++++-------
 setuptools/tests/test_test.py             |  2 +-
 setuptools/tests/test_virtualenv.py       | 12 ++--
 setuptools/tests/test_wheel.py            |  6 +-
 setuptools/wheel.py                       |  3 +-
 32 files changed, 251 insertions(+), 187 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index cbd19fb470..7cc61bf765 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,23 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# Setuptools documentation build configuration file, created by
-# sphinx-quickstart on Fri Jul 17 14:22:37 2009.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# The contents of this file are pickled, so don't put values in the namespace
-# that aren't pickleable (module imports are okay, they're removed automatically).
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-
 import subprocess
 import sys
 import os
@@ -30,10 +10,8 @@
     cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
 )
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration --
 
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['jaraco.packaging.sphinx', 'rst.linker']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -45,7 +23,8 @@
 # The master toctree document.
 master_doc = 'index'
 
-# A list of glob-style patterns that should be excluded when looking for source files.
+# A list of glob-style patterns that should be excluded
+# when looking for source files.
 exclude_patterns = ['requirements.txt']
 
 # List of directories, relative to source directory, that shouldn't be searched
@@ -55,7 +34,7 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
@@ -69,7 +48,10 @@
 html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': ['relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html']}
+html_sidebars = {
+    'index': [
+        'relations.html', 'sourcelink.html', 'indexsidebar.html',
+        'searchbox.html']}
 
 # If false, no module index is generated.
 html_use_modindex = False
@@ -77,10 +59,11 @@
 # If false, no index is generated.
 html_use_index = False
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output --
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author,
+# documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Setuptools.tex', 'Setuptools Documentation',
    'The fellowship of the packaging', 'manual'),
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3fa883ceb4..75563f95df 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2329,7 +2329,8 @@ def null_ns_handler(importer, path_item, packageName, module):
 
 def normalize_path(filename):
     """Normalize a file/dir name for comparison purposes"""
-    return os.path.normcase(os.path.realpath(os.path.normpath(_cygwin_patch(filename))))
+    return os.path.normcase(os.path.realpath(os.path.normpath(
+        _cygwin_patch(filename))))
 
 
 def _cygwin_patch(filename):  # pragma: nocover
@@ -3288,6 +3289,7 @@ def _initialize_master_working_set():
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
 
+
 class PkgResourcesDeprecationWarning(Warning):
     """
     Base class for warning about deprecations in ``pkg_resources``
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 5960868a52..78281869a6 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -17,7 +17,9 @@
 except ImportError:
     import mock
 
-from pkg_resources import DistInfoDistribution, Distribution, EggInfoDistribution
+from pkg_resources import (
+    DistInfoDistribution, Distribution, EggInfoDistribution,
+)
 from setuptools.extern import six
 from pkg_resources.extern.six.moves import map
 from pkg_resources.extern.six import text_type, string_types
@@ -279,8 +281,8 @@ def make_distribution_no_version(tmpdir, basename):
         ('dist-info', 'METADATA', DistInfoDistribution),
     ],
 )
-def test_distribution_version_missing(tmpdir, suffix, expected_filename,
-    expected_dist_type):
+def test_distribution_version_missing(
+        tmpdir, suffix, expected_filename, expected_dist_type):
     """
     Test Distribution.version when the "Version" header is missing.
     """
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 93fa711438..ed7cdfcc3f 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -15,7 +15,7 @@
 from pkg_resources import (
     parse_requirements, VersionConflict, parse_version,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
-    WorkingSet, PkgResourcesDeprecationWarning)
+    WorkingSet)
 
 
 # from Python 3.6 docs.
@@ -501,7 +501,6 @@ def testDeprecationWarnings(self):
             ep.load(require=False)
 
 
-
 class TestRequirements:
     def testBasics(self):
         r = Requirement.parse("Twisted>=1.2")
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a71b2bbdc6..b08c2f626a 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,7 +1,6 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
 import os
-import sys
 import functools
 import distutils.core
 import distutils.filelist
@@ -31,7 +30,7 @@
 ]
 
 if PY3:
-  __all__.append('find_namespace_packages')
+    __all__.append('find_namespace_packages')
 
 __version__ = setuptools.version.__version__
 
@@ -123,7 +122,7 @@ def _looks_like_package(path):
 find_packages = PackageFinder.find
 
 if PY3:
-  find_namespace_packages = PEP420PackageFinder.find
+    find_namespace_packages = PEP420PackageFinder.find
 
 
 def _install_setup_requires(attrs):
@@ -144,6 +143,7 @@ def setup(**attrs):
     _install_setup_requires(attrs)
     return distutils.core.setup(**attrs)
 
+
 setup.__doc__ = distutils.core.setup.__doc__
 
 
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 81436044d9..64528ca7a5 100644
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -25,7 +25,8 @@ def default_filter(src, dst):
     return dst
 
 
-def unpack_archive(filename, extract_dir, progress_filter=default_filter,
+def unpack_archive(
+        filename, extract_dir, progress_filter=default_filter,
         drivers=None):
     """Unpack `filename` to `extract_dir`, or raise ``UnrecognizedFormat``
 
@@ -148,7 +149,8 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
 
                 # resolve any links and to extract the link targets as normal
                 # files
-                while member is not None and (member.islnk() or member.issym()):
+                while member is not None and (
+                        member.islnk() or member.issym()):
                     linkpath = member.linkname
                     if member.issym():
                         base = posixpath.dirname(member.name)
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index eb9e815ef8..a1c951cf59 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -48,6 +48,7 @@
            '__legacy__',
            'SetupRequirementsError']
 
+
 class SetupRequirementsError(BaseException):
     def __init__(self, specifiers):
         self.specifiers = specifiers
@@ -143,7 +144,8 @@ def run_setup(self, setup_script='setup.py'):
 
     def get_requires_for_build_wheel(self, config_settings=None):
         config_settings = self._fix_config(config_settings)
-        return self._get_build_requires(config_settings, requirements=['wheel'])
+        return self._get_build_requires(
+            config_settings, requirements=['wheel'])
 
     def get_requires_for_build_sdist(self, config_settings=None):
         config_settings = self._fix_config(config_settings)
@@ -160,8 +162,10 @@ def prepare_metadata_for_build_wheel(self, metadata_directory,
             dist_infos = [f for f in os.listdir(dist_info_directory)
                           if f.endswith('.dist-info')]
 
-            if (len(dist_infos) == 0 and
-                len(_get_immediate_subdirectories(dist_info_directory)) == 1):
+            if (
+                len(dist_infos) == 0 and
+                len(_get_immediate_subdirectories(dist_info_directory)) == 1
+            ):
 
                 dist_info_directory = os.path.join(
                     dist_info_directory, os.listdir(dist_info_directory)[0])
@@ -193,7 +197,8 @@ def _build_with_temp_dir(self, setup_command, result_extension,
                         config_settings["--global-option"])
             self.run_setup()
 
-            result_basename = _file_with_extension(tmp_dist_dir, result_extension)
+            result_basename = _file_with_extension(
+                tmp_dist_dir, result_extension)
             result_path = os.path.join(result_directory, result_basename)
             if os.path.exists(result_path):
                 # os.rename will fail overwriting on non-Unix.
@@ -202,7 +207,6 @@ def _build_with_temp_dir(self, setup_command, result_extension,
 
         return result_basename
 
-
     def build_wheel(self, wheel_directory, config_settings=None,
                     metadata_directory=None):
         return self._build_with_temp_dir(['bdist_wheel'], '.whl',
@@ -217,9 +221,12 @@ def build_sdist(self, sdist_directory, config_settings=None):
 class _BuildMetaLegacyBackend(_BuildMetaBackend):
     """Compatibility backend for setuptools
 
-    This is a version of setuptools.build_meta that endeavors to maintain backwards
-    compatibility with pre-PEP 517 modes of invocation. It exists as a temporary
-    bridge between the old packaging mechanism and the new packaging mechanism,
+    This is a version of setuptools.build_meta that endeavors
+    to maintain backwards
+    compatibility with pre-PEP 517 modes of invocation. It
+    exists as a temporary
+    bridge between the old packaging mechanism and the new
+    packaging mechanism,
     and will eventually be removed.
     """
     def run_setup(self, setup_script='setup.py'):
@@ -250,6 +257,7 @@ def run_setup(self, setup_script='setup.py'):
             sys.path[:] = sys_path
             sys.argv[0] = sys_argv_0
 
+
 # The primary backend
 _BACKEND = _BuildMetaBackend()
 
diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
index 09caff6ffd..88f0d095b8 100644
--- a/setuptools/command/build_clib.py
+++ b/setuptools/command/build_clib.py
@@ -71,28 +71,31 @@ def build_libraries(self, libraries):
                     output_dir=self.build_temp
                     )
 
-            if newer_pairwise_group(dependencies, expected_objects) != ([], []):
+            if (
+                newer_pairwise_group(dependencies, expected_objects)
+                != ([], [])
+            ):
                 # First, compile the source code to object files in the library
                 # directory.  (This should probably change to putting object
                 # files in a temporary build directory.)
                 macros = build_info.get('macros')
                 include_dirs = build_info.get('include_dirs')
                 cflags = build_info.get('cflags')
-                objects = self.compiler.compile(
-                        sources,
-                        output_dir=self.build_temp,
-                        macros=macros,
-                        include_dirs=include_dirs,
-                        extra_postargs=cflags,
-                        debug=self.debug
-                        )
+                self.compiler.compile(
+                    sources,
+                    output_dir=self.build_temp,
+                    macros=macros,
+                    include_dirs=include_dirs,
+                    extra_postargs=cflags,
+                    debug=self.debug
+                )
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
             self.compiler.create_static_lib(
-                    expected_objects,
-                    lib_name,
-                    output_dir=self.build_clib,
-                    debug=self.debug
-                    )
+                expected_objects,
+                lib_name,
+                output_dir=self.build_clib,
+                debug=self.debug
+            )
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 1b51e040b4..03b6f3467f 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -14,7 +14,8 @@
 if six.PY2:
     import imp
 
-    EXTENSION_SUFFIXES = [s for s, _, tp in imp.get_suffixes() if tp == imp.C_EXTENSION]
+    EXTENSION_SUFFIXES = [
+        s for s, _, tp in imp.get_suffixes() if tp == imp.C_EXTENSION]
 else:
     from importlib.machinery import EXTENSION_SUFFIXES
 
@@ -29,7 +30,7 @@
 
 # make sure _config_vars is initialized
 get_config_var("LDSHARED")
-from distutils.sysconfig import _config_vars as _CONFIG_VARS
+from distutils.sysconfig import _config_vars as _CONFIG_VARS  # noqa
 
 
 def _customize_compiler_for_shlib(compiler):
@@ -65,7 +66,9 @@ def _customize_compiler_for_shlib(compiler):
     except ImportError:
         pass
 
-if_dl = lambda s: s if have_rtld else ''
+
+def if_dl(s):
+    return s if have_rtld else ''
 
 
 def get_abi3_suffix():
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 426301d6f3..b95ef1f6b0 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -121,7 +121,8 @@ def isascii(s):
             return False
 
 
-_one_liner = lambda text: textwrap.dedent(text).strip().replace('\n', '; ')
+def _one_liner(text):
+    return textwrap.dedent(text).strip().replace('\n', '; ')
 
 
 class easy_install(Command):
@@ -414,8 +415,8 @@ def run(self, show_deprecation=True):
         if show_deprecation:
             self.announce(
                 "WARNING: The easy_install command is deprecated "
-                "and will be removed in a future version."
-                , log.WARN,
+                "and will be removed in a future version.",
+                log.WARN,
             )
         if self.verbose != self.distribution.verbose:
             log.set_verbosity(self.verbose)
@@ -507,13 +508,13 @@ def check_site_dir(self):
         the distutils default setting) was:
 
             %s
-        """).lstrip()
+        """).lstrip()  # noqa
 
     __not_exists_id = textwrap.dedent("""
         This directory does not currently exist.  Please create it and try again, or
         choose a different installation directory (using the -d or --install-dir
         option).
-        """).lstrip()
+        """).lstrip()  # noqa
 
     __access_msg = textwrap.dedent("""
         Perhaps your account does not have write access to this directory?  If the
@@ -529,7 +530,7 @@ def check_site_dir(self):
           https://setuptools.readthedocs.io/en/latest/easy_install.html
 
         Please make the appropriate changes for your system and try again.
-        """).lstrip()
+        """).lstrip()  # noqa
 
     def cant_write_to_target(self):
         msg = self.__cant_write_msg % (sys.exc_info()[1], self.install_dir,)
@@ -1093,13 +1094,13 @@ def install_wheel(self, wheel_path, tmpdir):
             pkg_resources.require("%(name)s")  # latest installed version
             pkg_resources.require("%(name)s==%(version)s")  # this exact version
             pkg_resources.require("%(name)s>=%(version)s")  # this version or higher
-        """).lstrip()
+        """).lstrip()  # noqa
 
     __id_warning = textwrap.dedent("""
         Note also that the installation directory must be on sys.path at runtime for
         this to work.  (e.g. by being the application's script directory, by being on
         PYTHONPATH, or by being added to sys.path by your code.)
-        """)
+        """)  # noqa
 
     def installation_report(self, req, dist, what="Installed"):
         """Helpful installation message for display to package users"""
@@ -1124,7 +1125,7 @@ def installation_report(self, req, dist, what="Installed"):
             %(python)s setup.py develop
 
         See the setuptools documentation for the "develop" command for more info.
-        """).lstrip()
+        """).lstrip()  # noqa
 
     def report_editable(self, spec, setup_script):
         dirname = os.path.dirname(setup_script)
@@ -1307,7 +1308,8 @@ def byte_compile(self, to_compile):
           https://setuptools.readthedocs.io/en/latest/easy_install.html#custom-installation-locations
 
 
-        Please make the appropriate changes for your system and try again.""").lstrip()
+        Please make the appropriate changes for your system and try again.
+        """).strip()
 
     def no_default_version_msg(self):
         template = self.__no_default_msg
@@ -2093,7 +2095,8 @@ def get_script_args(cls, dist, executable=None, wininst=False):
     @classmethod
     def get_script_header(cls, script_text, executable=None, wininst=False):
         # for backward compatibility
-        warnings.warn("Use get_header", EasyInstallDeprecationWarning, stacklevel=2)
+        warnings.warn(
+            "Use get_header", EasyInstallDeprecationWarning, stacklevel=2)
         if wininst:
             executable = "python.exe"
         return cls.get_header(script_text, executable)
@@ -2342,6 +2345,8 @@ def gen_usage(script_name):
     finally:
         distutils.core.gen_usage = saved
 
+
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
-    """Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""
-    
+    """
+    Warning for EasyInstall deprecations, bypassing suppression.
+    """
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a5c5a2fc19..7fa89541cd 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -33,6 +33,7 @@
 from setuptools.extern import packaging
 from setuptools import SetuptoolsDeprecationWarning
 
+
 def translate_pattern(glob):
     """
     Translate a file path glob like '*.txt' in to a regular expression.
@@ -113,7 +114,7 @@ def translate_pattern(glob):
             pat += sep
 
     pat += r'\Z'
-    return re.compile(pat, flags=re.MULTILINE|re.DOTALL)
+    return re.compile(pat, flags=re.MULTILINE | re.DOTALL)
 
 
 class InfoCommon:
@@ -637,7 +638,9 @@ def warn_depends_obsolete(cmd, basename, filename):
 
 def _write_requirements(stream, reqs):
     lines = yield_lines(reqs or ())
-    append_cr = lambda line: line + '\n'
+
+    def append_cr(line):
+        return line + '\n'
     lines = map(append_cr, lines)
     stream.writelines(lines)
 
@@ -703,7 +706,8 @@ def get_pkg_info_revision():
     Get a -r### off of PKG-INFO Version in case this is an sdist of
     a subversion revision.
     """
-    warnings.warn("get_pkg_info_revision is deprecated.", EggInfoDeprecationWarning)
+    warnings.warn(
+        "get_pkg_info_revision is deprecated.", EggInfoDeprecationWarning)
     if os.path.exists('PKG-INFO'):
         with io.open('PKG-INFO') as f:
             for line in f:
@@ -714,4 +718,4 @@ def get_pkg_info_revision():
 
 
 class EggInfoDeprecationWarning(SetuptoolsDeprecationWarning):
-    """Class for warning about deprecations in eggInfo in setupTools. Not ignored by default, unlike DeprecationWarning."""
+    """Deprecated behavior warning for EggInfo, bypassing suppression."""
diff --git a/setuptools/command/install_lib.py b/setuptools/command/install_lib.py
index 07d6593309..2e9d8757a5 100644
--- a/setuptools/command/install_lib.py
+++ b/setuptools/command/install_lib.py
@@ -77,7 +77,8 @@ def _gen_exclusion_paths():
         if not hasattr(sys, 'implementation'):
             return
 
-        base = os.path.join('__pycache__', '__init__.' + sys.implementation.cache_tag)
+        base = os.path.join(
+            '__pycache__', '__init__.' + sys.implementation.cache_tag)
         yield base + '.pyc'
         yield base + '.pyo'
         yield base + '.opt-1.pyc'
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 61063e7542..2886055862 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -132,5 +132,5 @@ def _add_defaults_scripts(self):
 
 if hasattr(sdist.sdist, '_add_defaults_standards'):
     # disable the functionality already available upstream
-    class sdist_add_defaults:
+    class sdist_add_defaults:  # noqa
         pass
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index f6470e9c34..2d83967dd9 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -129,7 +129,8 @@ def with_project_on_sys_path(self, func):
 
     @contextlib.contextmanager
     def project_on_sys_path(self, include_dists=[]):
-        with_2to3 = not six.PY2 and getattr(self.distribution, 'use_2to3', False)
+        with_2to3 = not six.PY2 and getattr(
+            self.distribution, 'use_2to3', False)
 
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 130a0cb6c9..0351da7773 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -127,8 +127,8 @@ def _build_multipart(cls, data):
         """
         Build up the MIME payload for the POST data
         """
-        boundary = b'--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
-        sep_boundary = b'\n--' + boundary
+        boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
+        sep_boundary = b'\n--' + boundary.encode('ascii')
         end_boundary = sep_boundary + b'--'
         end_items = end_boundary, b"\n",
         builder = functools.partial(
@@ -138,7 +138,7 @@ def _build_multipart(cls, data):
         part_groups = map(builder, data.items())
         parts = itertools.chain.from_iterable(part_groups)
         body_items = itertools.chain(parts, end_items)
-        content_type = 'multipart/form-data; boundary=%s' % boundary.decode('ascii')
+        content_type = 'multipart/form-data; boundary=%s' % boundary
         return b''.join(body_items), content_type
 
     def upload_file(self, filename):
diff --git a/setuptools/dep_util.py b/setuptools/dep_util.py
index 2931c13ec3..521eb716a5 100644
--- a/setuptools/dep_util.py
+++ b/setuptools/dep_util.py
@@ -1,5 +1,6 @@
 from distutils.dep_util import newer_group
 
+
 # yes, this is was almost entirely copy-pasted from
 # 'newer_pairwise()', this is just another convenience
 # function.
@@ -10,7 +11,8 @@ def newer_pairwise_group(sources_groups, targets):
     of 'newer_group()'.
     """
     if len(sources_groups) != len(targets):
-        raise ValueError("'sources_group' and 'targets' must be the same length")
+        raise ValueError(
+            "'sources_group' and 'targets' must be the same length")
 
     # build a pair of lists (sources_groups, targets) where source is newer
     n_sources = []
diff --git a/setuptools/installer.py b/setuptools/installer.py
index 9f8be2ef84..1f183bd9af 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -64,8 +64,8 @@ def fetch_build_egg(dist, req):
         dist.announce(
             'WARNING: The pip package is not available, falling back '
             'to EasyInstall for handling setup_requires/test_requires; '
-            'this is deprecated and will be removed in a future version.'
-            , log.WARN
+            'this is deprecated and will be removed in a future version.',
+            log.WARN
         )
         return _legacy_fetch_build_egg(dist, req)
     # Warn if wheel is not.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 2ffe1c81ee..fa88c4e87d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -1225,7 +1225,7 @@ def OSLibraries(self):
             arch_subdir = self.pi.target_dir(x64=True)
             lib = join(self.si.WindowsSdkDir, 'lib')
             libver = self._sdk_subdir
-            return [join(lib, '%sum%s' % (libver , arch_subdir))]
+            return [join(lib, '%sum%s' % (libver, arch_subdir))]
 
     @property
     def OSIncludes(self):
@@ -1274,13 +1274,16 @@ def OSLibpath(self):
             libpath += [
                 ref,
                 join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                join(ref, 'Windows.Foundation.UniversalApiContract', '1.0.0.0'),
+                join(
+                    ref, 'Windows.Foundation.UniversalApiContract', '1.0.0.0'),
                 join(ref, 'Windows.Foundation.FoundationContract', '1.0.0.0'),
-                join(ref,'Windows.Networking.Connectivity.WwanContract',
-                     '1.0.0.0'),
-                join(self.si.WindowsSdkDir, 'ExtensionSDKs', 'Microsoft.VCLibs',
-                     '%0.1f' % self.vs_ver, 'References', 'CommonConfiguration',
-                     'neutral'),
+                join(
+                    ref, 'Windows.Networking.Connectivity.WwanContract',
+                    '1.0.0.0'),
+                join(
+                    self.si.WindowsSdkDir, 'ExtensionSDKs', 'Microsoft.VCLibs',
+                    '%0.1f' % self.vs_ver, 'References', 'CommonConfiguration',
+                    'neutral'),
             ]
         return libpath
 
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index dc16106d3d..5f403c96d7 100644
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -47,13 +47,17 @@ def _get_target(self):
         "p = os.path.join(%(root)s, *%(pth)r)",
         "importlib = has_mfs and __import__('importlib.util')",
         "has_mfs and __import__('importlib.machinery')",
-        "m = has_mfs and "
+        (
+            "m = has_mfs and "
             "sys.modules.setdefault(%(pkg)r, "
-                "importlib.util.module_from_spec("
-                    "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
-                        "[os.path.dirname(p)])))",
-        "m = m or "
-            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))",
+            "importlib.util.module_from_spec("
+            "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
+            "[os.path.dirname(p)])))"
+        ),
+        (
+            "m = m or "
+            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))"
+        ),
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",
     )
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index f419d47167..82eb45169f 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -46,7 +46,8 @@
 _SOCKET_TIMEOUT = 15
 
 _tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
-user_agent = _tmpl.format(py_major='{}.{}'.format(*sys.version_info), setuptools=setuptools)
+user_agent = _tmpl.format(
+    py_major='{}.{}'.format(*sys.version_info), setuptools=setuptools)
 
 
 def parse_requirement_arg(spec):
@@ -1092,7 +1093,8 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
 # copy of urllib.parse._splituser from Python 3.8
 def _splituser(host):
-    """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
+    """splituser('user[:passwd]@host[:port]')
+    --> 'user[:passwd]', 'host[:port]'."""
     user, delim, host = host.rpartition('@')
     return (user if delim else None), host
 
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 1d57360f4e..ba39af52b6 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -16,7 +16,7 @@ def get_all_headers(message, key):
 
 
 if six.PY2:
-    def get_all_headers(message, key):
+    def get_all_headers(message, key):  # noqa
         return message.getheaders(key)
 
 
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 685f3f72e3..e46dfc8d25 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -13,6 +13,8 @@
 from setuptools.extern.six.moves import builtins, map
 
 import pkg_resources.py31compat
+from distutils.errors import DistutilsError
+from pkg_resources import working_set
 
 if sys.platform.startswith('java'):
     import org.python.modules.posix.PosixModule as _os
@@ -23,8 +25,6 @@
 except NameError:
     _file = None
 _open = open
-from distutils.errors import DistutilsError
-from pkg_resources import working_set
 
 
 __all__ = [
@@ -374,7 +374,7 @@ def _remap_pair(self, operation, src, dst, *args, **kw):
 
 
 if hasattr(os, 'devnull'):
-    _EXCEPTIONS = [os.devnull,]
+    _EXCEPTIONS = [os.devnull]
 else:
     _EXCEPTIONS = []
 
@@ -466,7 +466,8 @@ def open(self, file, flags, mode=0o777, *args, **kw):
 
 
 WRITE_FLAGS = functools.reduce(
-    operator.or_, [getattr(_os, a, 0) for a in
+    operator.or_, [
+        getattr(_os, a, 0) for a in
         "O_WRONLY O_RDWR O_APPEND O_CREAT O_TRUNC O_TEMPORARY".split()]
 )
 
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
index 40b00de0a7..be0d43d354 100644
--- a/setuptools/site-patch.py
+++ b/setuptools/site-patch.py
@@ -38,22 +38,24 @@ def __boot():
     else:
         raise ImportError("Couldn't find the real 'site' module")
 
-    known_paths = dict([(makepath(item)[1], 1) for item in sys.path])  # 2.2 comp
+    # 2.2 comp
+    known_paths = dict([(
+        makepath(item)[1], 1) for item in sys.path])  # noqa
 
     oldpos = getattr(sys, '__egginsert', 0)  # save old insertion position
     sys.__egginsert = 0  # and reset the current one
 
     for item in PYTHONPATH:
-        addsitedir(item)
+        addsitedir(item)  # noqa
 
     sys.__egginsert += oldpos  # restore effective old position
 
-    d, nd = makepath(stdpath[0])
+    d, nd = makepath(stdpath[0])  # noqa
     insert_at = None
     new_path = []
 
     for item in sys.path:
-        p, np = makepath(item)
+        p, np = makepath(item)  # noqa
 
         if np == nd and insert_at is None:
             # We've hit the first 'system' path entry, so added entries go here
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 226db694bb..17c14c4694 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -35,7 +35,8 @@
 except AttributeError:
     HTTPSHandler = HTTPSConnection = object
 
-is_available = ssl is not None and object not in (HTTPSHandler, HTTPSConnection)
+is_available = ssl is not None and object not in (
+    HTTPSHandler, HTTPSConnection)
 
 
 try:
@@ -85,8 +86,10 @@ def _dnsname_match(dn, hostname, max_wildcards=1):
             return dn.lower() == hostname.lower()
 
         # RFC 6125, section 6.4.3, subitem 1.
-        # The client SHOULD NOT attempt to match a presented identifier in which
-        # the wildcard character comprises a label other than the left-most label.
+        # The client SHOULD NOT attempt to match a
+        # presented identifier in which the wildcard
+        # character comprises a label other than the
+        # left-most label.
         if leftmost == '*':
             # When '*' is a fragment by itself, it matches a non-empty dotless
             # fragment.
@@ -137,15 +140,16 @@ def match_hostname(cert, hostname):
                             return
                         dnsnames.append(value)
         if len(dnsnames) > 1:
-            raise CertificateError("hostname %r "
-                "doesn't match either of %s"
+            raise CertificateError(
+                "hostname %r doesn't match either of %s"
                 % (hostname, ', '.join(map(repr, dnsnames))))
         elif len(dnsnames) == 1:
-            raise CertificateError("hostname %r "
-                "doesn't match %r"
+            raise CertificateError(
+                "hostname %r doesn't match %r"
                 % (hostname, dnsnames[0]))
         else:
-            raise CertificateError("no appropriate commonName or "
+            raise CertificateError(
+                "no appropriate commonName or "
                 "subjectAltName fields were found")
 
 
@@ -158,7 +162,8 @@ def __init__(self, ca_bundle):
 
     def https_open(self, req):
         return self.do_open(
-            lambda host, **kw: VerifyingHTTPSConn(host, self.ca_bundle, **kw), req
+            lambda host, **kw: VerifyingHTTPSConn(host, self.ca_bundle, **kw),
+            req
         )
 
 
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index d68444f664..8fcf3055ff 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -23,6 +23,7 @@ def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
         self.env = env
         self.backend_name = backend_name
 
+
 class BuildBackend(BuildBackendBase):
     """PEP 517 Build Backend"""
 
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 36237f24a2..b93ef148e9 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -284,7 +284,7 @@ def test_provides_extras_deterministic_order():
     dist = Distribution(attrs)
     assert dist.metadata.provides_extras == ['b', 'a']
 
-   
+
 CHECK_PACKAGE_DATA_TESTS = (
     # Valid.
     ({
@@ -309,7 +309,8 @@ def test_provides_extras_deterministic_order():
     ({
         'hello': str('*.msg'),
     }, (
-        "\"values of 'package_data' dict\" must be a list of strings (got '*.msg')"
+        "\"values of 'package_data' dict\" "
+        "must be a list of strings (got '*.msg')"
     )),
     # Invalid value type (generators are single use)
     ({
@@ -321,10 +322,12 @@ def test_provides_extras_deterministic_order():
 )
 
 
-@pytest.mark.parametrize('package_data, expected_message', CHECK_PACKAGE_DATA_TESTS)
+@pytest.mark.parametrize(
+    'package_data, expected_message', CHECK_PACKAGE_DATA_TESTS)
 def test_check_package_data(package_data, expected_message):
     if expected_message is None:
         assert check_package_data(None, 'package_data', package_data) is None
     else:
-        with pytest.raises(DistutilsSetupError, match=re.escape(expected_message)):
+        with pytest.raises(
+                DistutilsSetupError, match=re.escape(expected_message)):
             check_package_data(None, str('package_data'), package_data)
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 2be1be47e8..30e79fec67 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -671,8 +671,10 @@ def test_setup_requires_with_pep508_url(self, mock_index, monkeypatch):
                 dep_url = path_to_url(dep_sdist, authority='localhost')
                 test_pkg = create_setup_requires_package(
                     temp_dir,
-                    'python-xlib', '0.19', # Ignored (overriden by setup_attrs).
-                    setup_attrs=dict(setup_requires='dependency @ %s' % dep_url))
+                    # Ignored (overriden by setup_attrs)
+                    'python-xlib', '0.19',
+                    setup_attrs=dict(
+                        setup_requires='dependency @ %s' % dep_url))
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 run_setup(test_setup_py, [str('--version')])
         assert len(mock_index.requests) == 0
@@ -710,11 +712,14 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
         dep_1_0_sdist = 'dep-1.0.tar.gz'
         dep_1_0_url = path_to_url(str(tmpdir / dep_1_0_sdist))
         dep_1_0_python_requires = '>=2.7'
-        make_python_requires_sdist(str(tmpdir / dep_1_0_sdist), 'dep', '1.0', dep_1_0_python_requires)
+        make_python_requires_sdist(
+            str(tmpdir / dep_1_0_sdist), 'dep', '1.0', dep_1_0_python_requires)
         dep_2_0_sdist = 'dep-2.0.tar.gz'
         dep_2_0_url = path_to_url(str(tmpdir / dep_2_0_sdist))
-        dep_2_0_python_requires = '!=' + '.'.join(map(str, sys.version_info[:2])) + '.*'
-        make_python_requires_sdist(str(tmpdir / dep_2_0_sdist), 'dep', '2.0', dep_2_0_python_requires)
+        dep_2_0_python_requires = '!=' + '.'.join(
+            map(str, sys.version_info[:2])) + '.*'
+        make_python_requires_sdist(
+            str(tmpdir / dep_2_0_sdist), 'dep', '2.0', dep_2_0_python_requires)
         index = tmpdir / 'index.html'
         index.write_text(DALS(
             '''
@@ -726,7 +731,7 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
                 <a href="{dep_2_0_url}" data-requires-python="{dep_2_0_python_requires}">{dep_2_0_sdist}</a><br/>
             </body>
             </html>
-            ''').format(
+            ''').format(  # noqa
                 dep_1_0_url=dep_1_0_url,
                 dep_1_0_sdist=dep_1_0_sdist,
                 dep_1_0_python_requires=dep_1_0_python_requires,
@@ -738,23 +743,29 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
         with contexts.save_pkg_resources_state():
             test_pkg = create_setup_requires_package(
                 str(tmpdir),
-                'python-xlib', '0.19', # Ignored (overriden by setup_attrs).
-                setup_attrs=dict(setup_requires='dep', dependency_links=[index_url]))
+                'python-xlib', '0.19',  # Ignored (overriden by setup_attrs).
+                setup_attrs=dict(
+                    setup_requires='dep', dependency_links=[index_url]))
             test_setup_py = os.path.join(test_pkg, 'setup.py')
             run_setup(test_setup_py, [str('--version')])
-        eggs = list(map(str, pkg_resources.find_distributions(os.path.join(test_pkg, '.eggs'))))
+        eggs = list(map(str, pkg_resources.find_distributions(
+            os.path.join(test_pkg, '.eggs'))))
         assert eggs == ['dep 1.0']
 
-    @pytest.mark.parametrize('use_legacy_installer,with_dependency_links_in_setup_py',
-                             itertools.product((False, True), (False, True)))
-    def test_setup_requires_with_find_links_in_setup_cfg(self, monkeypatch,
-                                                         use_legacy_installer,
-                                                         with_dependency_links_in_setup_py):
+    @pytest.mark.parametrize(
+        'use_legacy_installer,with_dependency_links_in_setup_py',
+        itertools.product((False, True), (False, True)))
+    def test_setup_requires_with_find_links_in_setup_cfg(
+            self, monkeypatch, use_legacy_installer,
+            with_dependency_links_in_setup_py):
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
-                make_trivial_sdist(os.path.join(temp_dir, 'python-xlib-42.tar.gz'), 'python-xlib', '42')
+                make_trivial_sdist(
+                    os.path.join(temp_dir, 'python-xlib-42.tar.gz'),
+                    'python-xlib',
+                    '42')
                 test_pkg = os.path.join(temp_dir, 'test_pkg')
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
@@ -771,7 +782,7 @@ def test_setup_requires_with_find_links_in_setup_cfg(self, monkeypatch,
                             installer.fetch_build_egg = installer._legacy_fetch_build_egg
                         setup(setup_requires='python-xlib==42',
                         dependency_links={dependency_links!r})
-                        ''').format(use_legacy_installer=use_legacy_installer,
+                        ''').format(use_legacy_installer=use_legacy_installer,  # noqa
                                     dependency_links=dependency_links))
                 with open(test_setup_cfg, 'w') as fp:
                     fp.write(DALS(
@@ -783,14 +794,17 @@ def test_setup_requires_with_find_links_in_setup_cfg(self, monkeypatch,
                                     find_links=temp_dir))
                 run_setup(test_setup_py, [str('--version')])
 
-    def test_setup_requires_with_transitive_extra_dependency(self, monkeypatch):
+    def test_setup_requires_with_transitive_extra_dependency(
+            self, monkeypatch):
         # Use case: installing a package with a build dependency on
         # an already installed `dep[extra]`, which in turn depends
         # on `extra_dep` (whose is not already installed).
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:
                 # Create source distribution for `extra_dep`.
-                make_trivial_sdist(os.path.join(temp_dir, 'extra_dep-1.0.tar.gz'), 'extra_dep', '1.0')
+                make_trivial_sdist(
+                    os.path.join(temp_dir, 'extra_dep-1.0.tar.gz'),
+                    'extra_dep', '1.0')
                 # Create source tree for `dep`.
                 dep_pkg = os.path.join(temp_dir, 'dep')
                 os.mkdir(dep_pkg)
@@ -806,12 +820,12 @@ def test_setup_requires_with_transitive_extra_dependency(self, monkeypatch):
                     'setup.cfg': '',
                 }, prefix=dep_pkg)
                 # "Install" dep.
-                run_setup(os.path.join(dep_pkg, 'setup.py'), [str('dist_info')])
+                run_setup(
+                    os.path.join(dep_pkg, 'setup.py'), [str('dist_info')])
                 working_set.add_entry(dep_pkg)
                 # Create source tree for test package.
                 test_pkg = os.path.join(temp_dir, 'test_pkg')
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
-                test_setup_cfg = os.path.join(test_pkg, 'setup.cfg')
                 os.mkdir(test_pkg)
                 with open(test_setup_py, 'w') as fp:
                     fp.write(DALS(
@@ -881,16 +895,19 @@ def make_nspkg_sdist(dist_path, distname, version):
 
 def make_python_requires_sdist(dist_path, distname, version, python_requires):
     make_sdist(dist_path, [
-        ('setup.py', DALS("""\
-                          import setuptools
-                          setuptools.setup(
-                              name={name!r},
-                              version={version!r},
-                              python_requires={python_requires!r},
-                          )
-                          """).format(name=distname, version=version,
-                                      python_requires=python_requires)),
-         ('setup.cfg', ''),
+        (
+            'setup.py',
+            DALS("""\
+                import setuptools
+                setuptools.setup(
+                  name={name!r},
+                  version={version!r},
+                  python_requires={python_requires!r},
+                )
+                """).format(
+                    name=distname, version=version,
+                    python_requires=python_requires)),
+        ('setup.cfg', ''),
     ])
 
 
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 0db204baa3..109f913587 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -525,19 +525,19 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
                               license_file = LICENSE
                               """),
             'LICENSE': "Test license"
-        }, True), # with license
+        }, True),  # with license
         ({
             'setup.cfg': DALS("""
                               [metadata]
                               license_file = INVALID_LICENSE
                               """),
             'LICENSE': "Test license"
-        }, False), # with an invalid license
+        }, False),  # with an invalid license
         ({
             'setup.cfg': DALS("""
                               """),
             'LICENSE': "Test license"
-        }, False), # no license_file attribute
+        }, False),  # no license_file attribute
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -545,7 +545,7 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
                               """),
             'MANIFEST.in': "exclude LICENSE",
             'LICENSE': "Test license"
-        }, False) # license file is manually excluded
+        }, False)  # license file is manually excluded
     ])
     def test_setup_cfg_license_file(
             self, tmpdir_cwd, env, files, license_in_sources):
@@ -565,7 +565,8 @@ def test_setup_cfg_license_file(
             assert 'LICENSE' in sources_text
         else:
             assert 'LICENSE' not in sources_text
-            assert 'INVALID_LICENSE' not in sources_text # for invalid license test
+            # for invalid license test
+            assert 'INVALID_LICENSE' not in sources_text
 
     @pytest.mark.parametrize("files, incl_licenses, excl_licenses", [
         ({
@@ -577,7 +578,7 @@ def test_setup_cfg_license_file(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with licenses
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []),  # with licenses
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -585,7 +586,7 @@ def test_setup_cfg_license_file(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []), # with commas
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], []),  # with commas
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -594,7 +595,7 @@ def test_setup_cfg_license_file(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC'], ['LICENSE-XYZ']), # with one license
+        }, ['LICENSE-ABC'], ['LICENSE-XYZ']),  # with one license
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -602,7 +603,7 @@ def test_setup_cfg_license_file(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # empty
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']),  # empty
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -610,7 +611,7 @@ def test_setup_cfg_license_file(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-XYZ'], ['LICENSE-ABC']), # on same line
+        }, ['LICENSE-XYZ'], ['LICENSE-ABC']),  # on same line
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -619,12 +620,12 @@ def test_setup_cfg_license_file(
                                   INVALID_LICENSE
                               """),
             'LICENSE-ABC': "Test license"
-        }, ['LICENSE-ABC'], ['INVALID_LICENSE']), # with an invalid license
+        }, ['LICENSE-ABC'], ['INVALID_LICENSE']),  # with an invalid license
         ({
             'setup.cfg': DALS("""
                               """),
             'LICENSE': "Test license"
-        }, [], ['LICENSE']), # no license_files attribute
+        }, [], ['LICENSE']),  # no license_files attribute
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -632,7 +633,7 @@ def test_setup_cfg_license_file(
                               """),
             'MANIFEST.in': "exclude LICENSE",
             'LICENSE': "Test license"
-        }, [], ['LICENSE']), # license file is manually excluded
+        }, [], ['LICENSE']),  # license file is manually excluded
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -643,7 +644,7 @@ def test_setup_cfg_license_file(
             'MANIFEST.in': "exclude LICENSE-XYZ",
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC'], ['LICENSE-XYZ']) # subset is manually excluded
+        }, ['LICENSE-ABC'], ['LICENSE-XYZ'])  # subset is manually excluded
     ])
     def test_setup_cfg_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
@@ -674,7 +675,7 @@ def test_setup_cfg_license_files(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # both empty
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']),  # both empty
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -684,7 +685,8 @@ def test_setup_cfg_license_files(
                               """),
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']), # license_file is still singular
+            # license_file is still singular
+        }, [], ['LICENSE-ABC', 'LICENSE-XYZ']),
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -696,7 +698,7 @@ def test_setup_cfg_license_files(
             'LICENSE-ABC': "ABC license",
             'LICENSE-PQR': "PQR license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # combined
+        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []),  # combined
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -709,7 +711,8 @@ def test_setup_cfg_license_files(
             'LICENSE-ABC': "ABC license",
             'LICENSE-PQR': "PQR license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []), # duplicate license
+            # duplicate license
+        }, ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], []),
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -720,7 +723,8 @@ def test_setup_cfg_license_files(
             'LICENSE-ABC': "ABC license",
             'LICENSE-PQR': "PQR license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC', 'LICENSE-XYZ'], ['LICENSE-PQR']), # combined subset
+            # combined subset
+        }, ['LICENSE-ABC', 'LICENSE-XYZ'], ['LICENSE-PQR']),
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -730,7 +734,8 @@ def test_setup_cfg_license_files(
                                   LICENSE-PQR
                               """),
             'LICENSE-PQR': "Test license"
-        }, ['LICENSE-PQR'], ['LICENSE-ABC', 'LICENSE-XYZ']), # with invalid licenses
+            # with invalid licenses
+        }, ['LICENSE-PQR'], ['LICENSE-ABC', 'LICENSE-XYZ']),
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -743,7 +748,8 @@ def test_setup_cfg_license_files(
             'LICENSE-ABC': "ABC license",
             'LICENSE-PQR': "PQR license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR']) # manually excluded
+            # manually excluded
+        }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR'])
     ])
     def test_setup_cfg_license_file_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 6242a018c4..8ee70a7ec3 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -12,7 +12,7 @@
 from setuptools.dist import Distribution
 
 from .textwrap import DALS
-from . import contexts
+
 
 SETUP_PY = DALS("""
     from setuptools import setup
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 2c35825a6b..b009fbd6f8 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -8,8 +8,6 @@
 
 import pytest_virtualenv
 
-from setuptools.extern import six
-
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
 
@@ -64,7 +62,7 @@ def _get_pip_versions():
             from urllib.request import urlopen
             from urllib.error import URLError
         except ImportError:
-            from urllib2 import urlopen, URLError # Python 2.7 compat
+            from urllib2 import urlopen, URLError  # Python 2.7 compat
 
         try:
             urlopen('https://pypi.org', timeout=1)
@@ -180,12 +178,16 @@ def sdist(distname, version):
     )).format(tmpdir=tmpdir))
     assert tmpdir.join('success').check()
 
+
 def test_test_command_install_requirements(virtualenv, tmpdir):
     # Ensure pip/wheel packages are installed.
-    virtualenv.run("python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
+    virtualenv.run(
+        "python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
     _check_test_command_install_requirements(virtualenv, tmpdir)
 
-def test_test_command_install_requirements_when_using_easy_install(bare_virtualenv, tmpdir):
+
+def test_test_command_install_requirements_when_using_easy_install(
+        bare_virtualenv, tmpdir):
     _check_test_command_install_requirements(bare_virtualenv, tmpdir)
 
 
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 55d346c67c..39eb06eec5 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -455,7 +455,8 @@ def __repr__(self):
         id='empty_namespace_package',
         file_defs={
             'foobar': {
-                '__init__.py': "__import__('pkg_resources').declare_namespace(__name__)",
+                '__init__.py':
+                    "__import__('pkg_resources').declare_namespace(__name__)",
             },
         },
         setup_kwargs=dict(
@@ -579,4 +580,5 @@ def sys_tags():
         for t in parse_tag('cp36-cp36m-manylinux1_x86_64'):
             yield t
     monkeypatch.setattr('setuptools.wheel.sys_tags', sys_tags)
-    assert Wheel('onnxruntime-0.1.2-cp36-cp36m-manylinux1_x86_64.whl').is_compatible()
+    assert Wheel(
+        'onnxruntime-0.1.2-cp36-cp36m-manylinux1_x86_64.whl').is_compatible()
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index 025aaa828a..ec1106a7b2 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -77,7 +77,8 @@ def tags(self):
 
     def is_compatible(self):
         '''Is the wheel is compatible with the current platform?'''
-        supported_tags = set((t.interpreter, t.abi, t.platform) for t in sys_tags())
+        supported_tags = set(
+            (t.interpreter, t.abi, t.platform) for t in sys_tags())
         return next((True for t in self.tags() if t in supported_tags), False)
 
     def egg_name(self):

From 313ac58f51c6ef92170647c4cc8626043f68a26b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 13:19:31 -0500
Subject: [PATCH 7679/8469] Run flake8 tests as part of test suite.

---
 .flake8    | 12 ++++++++++++
 pytest.ini |  7 ++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 .flake8

diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000000..c65806160d
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,12 @@
+[flake8]
+exclude=
+    .tox
+    setuptools/_vendor,
+    pkg_resources/_vendor
+ignore =
+    # W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+    W503
+    # W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
+    W504
+    setuptools/site-patch.py F821
+    setuptools/py*compat.py F811
diff --git a/pytest.ini b/pytest.ini
index 0bc1ec0114..904fe3363c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,9 +1,6 @@
 [pytest]
-addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .*
-flake8-ignore =
-    setuptools/site-patch.py F821
-    setuptools/py*compat.py F811
+addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt -r sxX
+norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
 	# https://github.com/pypa/setuptools/issues/1823

From 5ce9e5f343ca14f9875106f37f16ad498b294183 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 13:25:45 -0500
Subject: [PATCH 7680/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/conf.py                          |  8 +++----
 setuptools/__init__.py                |  4 ++--
 setuptools/command/build_clib.py      | 30 +++++++++++++--------------
 setuptools/dist.py                    |  2 +-
 setuptools/msvc.py                    |  2 +-
 setuptools/tests/__init__.py          |  2 +-
 setuptools/tests/test_build_clib.py   |  3 +--
 setuptools/tests/test_config.py       |  6 +++---
 setuptools/tests/test_easy_install.py | 26 +++++++++++------------
 setuptools/tests/test_setuptools.py   |  8 +++----
 setuptools/tests/test_wheel.py        | 11 +++++-----
 11 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7cc61bf765..918ca03449 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -64,10 +64,10 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author,
 # documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'Setuptools.tex', 'Setuptools Documentation',
-   'The fellowship of the packaging', 'manual'),
-]
+latex_documents = [(
+    'index', 'Setuptools.tex', 'Setuptools Documentation',
+    'The fellowship of the packaging', 'manual',
+)]
 
 link_files = {
     '../CHANGES.rst': dict(
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index b08c2f626a..07d6b6fa3b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -191,8 +191,8 @@ def ensure_string_list(self, option):
                 ok = False
             if not ok:
                 raise DistutilsOptionError(
-                      "'%s' must be a list of strings (got %r)"
-                      % (option, val))
+                    "'%s' must be a list of strings (got %r)"
+                    % (option, val))
 
     def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         cmd = _Command.reinitialize_command(self, command, reinit_subcommands)
diff --git a/setuptools/command/build_clib.py b/setuptools/command/build_clib.py
index 88f0d095b8..67ce2444ea 100644
--- a/setuptools/command/build_clib.py
+++ b/setuptools/command/build_clib.py
@@ -25,9 +25,9 @@ def build_libraries(self, libraries):
             sources = build_info.get('sources')
             if sources is None or not isinstance(sources, (list, tuple)):
                 raise DistutilsSetupError(
-                       "in 'libraries' option (library '%s'), "
-                       "'sources' must be present and must be "
-                       "a list of source filenames" % lib_name)
+                    "in 'libraries' option (library '%s'), "
+                    "'sources' must be present and must be "
+                    "a list of source filenames" % lib_name)
             sources = list(sources)
 
             log.info("building '%s' library", lib_name)
@@ -38,9 +38,9 @@ def build_libraries(self, libraries):
             obj_deps = build_info.get('obj_deps', dict())
             if not isinstance(obj_deps, dict):
                 raise DistutilsSetupError(
-                       "in 'libraries' option (library '%s'), "
-                       "'obj_deps' must be a dictionary of "
-                       "type 'source: list'" % lib_name)
+                    "in 'libraries' option (library '%s'), "
+                    "'obj_deps' must be a dictionary of "
+                    "type 'source: list'" % lib_name)
             dependencies = []
 
             # Get the global dependencies that are specified by the '' key.
@@ -48,9 +48,9 @@ def build_libraries(self, libraries):
             global_deps = obj_deps.get('', list())
             if not isinstance(global_deps, (list, tuple)):
                 raise DistutilsSetupError(
-                       "in 'libraries' option (library '%s'), "
-                       "'obj_deps' must be a dictionary of "
-                       "type 'source: list'" % lib_name)
+                    "in 'libraries' option (library '%s'), "
+                    "'obj_deps' must be a dictionary of "
+                    "type 'source: list'" % lib_name)
 
             # Build the list to be used by newer_pairwise_group
             # each source will be auto-added to its dependencies.
@@ -60,16 +60,16 @@ def build_libraries(self, libraries):
                 extra_deps = obj_deps.get(source, list())
                 if not isinstance(extra_deps, (list, tuple)):
                     raise DistutilsSetupError(
-                           "in 'libraries' option (library '%s'), "
-                           "'obj_deps' must be a dictionary of "
-                           "type 'source: list'" % lib_name)
+                        "in 'libraries' option (library '%s'), "
+                        "'obj_deps' must be a dictionary of "
+                        "type 'source: list'" % lib_name)
                 src_deps.extend(extra_deps)
                 dependencies.append(src_deps)
 
             expected_objects = self.compiler.object_filenames(
-                    sources,
-                    output_dir=self.build_temp
-                    )
+                sources,
+                output_dir=self.build_temp,
+            )
 
             if (
                 newer_pairwise_group(dependencies, expected_objects)
diff --git a/setuptools/dist.py b/setuptools/dist.py
index fe5adf4607..ad54839b0f 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -162,7 +162,7 @@ def write_field(key, value):
     if self.download_url:
         write_field('Download-URL', self.download_url)
     for project_url in self.project_urls.items():
-        write_field('Project-URL',  '%s, %s' % project_url)
+        write_field('Project-URL', '%s, %s' % project_url)
 
     long_desc = rfc822_escape(self.get_long_description())
     write_field('Description', long_desc)
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index fa88c4e87d..c2cbd1e543 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -544,7 +544,7 @@ def __init__(self, registry_info, vc_ver=None):
 
         # Except for VS15+, VC version is aligned with VS version
         self.vs_ver = self.vc_ver = (
-                vc_ver or self._find_latest_available_vs_ver())
+            vc_ver or self._find_latest_available_vs_ver())
 
     def _find_latest_available_vs_ver(self):
         """
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 5f4a1c2958..9c77b51f8d 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -6,7 +6,7 @@
 
 
 __all__ = [
-  'fail_on_ascii', 'py2_only', 'py3_only'
+    'fail_on_ascii', 'py2_only', 'py3_only'
 ]
 
 
diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py
index 3779e679ea..48bea2b43d 100644
--- a/setuptools/tests/test_build_clib.py
+++ b/setuptools/tests/test_build_clib.py
@@ -8,8 +8,7 @@
 
 class TestBuildCLib:
     @mock.patch(
-            'setuptools.command.build_clib.newer_pairwise_group'
-            )
+        'setuptools.command.build_clib.newer_pairwise_group')
     def test_build_libraries(self, mock_newer):
         dist = Distribution()
         cmd = build_clib(dist)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 69d8d00db3..2fa0b374e2 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -695,7 +695,7 @@ def test_find_directive(self, tmpdir):
         )
         with get_dist(tmpdir) as dist:
             assert set(dist.packages) == set(
-                ['fake_package',  'fake_package.sub_two'])
+                ['fake_package', 'fake_package.sub_two'])
 
     @py2_only
     def test_find_namespace_directive_fails_on_py2(self, tmpdir):
@@ -748,7 +748,7 @@ def test_find_namespace_directive(self, tmpdir):
         )
         with get_dist(tmpdir) as dist:
             assert set(dist.packages) == {
-                'fake_package',  'fake_package.sub_two'
+                'fake_package', 'fake_package.sub_two'
             }
 
     def test_extras_require(self, tmpdir):
@@ -881,7 +881,7 @@ def _fake_distribution_init(self, dist, attrs):
         return None
 
     @patch.object(_Distribution, '__init__', autospec=True)
-    def test_external_setters(self,  mock_parent_init, tmpdir):
+    def test_external_setters(self, mock_parent_init, tmpdir):
         mock_parent_init.side_effect = self._fake_distribution_init
 
         dist = Distribution(attrs={
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 30e79fec67..534392b99d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -629,7 +629,7 @@ def make_dependency_sdist(dist_path, distname, version):
                 test_pkg = create_setup_requires_package(
                     temp_dir, setup_attrs=dict(version='attr: foobar.version'),
                     make_package=make_dependency_sdist,
-                    use_setup_cfg=use_setup_cfg+('version',),
+                    use_setup_cfg=use_setup_cfg + ('version',),
                 )
                 test_setup_py = os.path.join(test_pkg, 'setup.py')
                 with contexts.quiet() as (stdout, stderr):
@@ -905,8 +905,8 @@ def make_python_requires_sdist(dist_path, distname, version, python_requires):
                   python_requires={python_requires!r},
                 )
                 """).format(
-                    name=distname, version=version,
-                    python_requires=python_requires)),
+                name=distname, version=version,
+                python_requires=python_requires)),
         ('setup.cfg', ''),
     ])
 
@@ -965,16 +965,16 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
                 value = ';'.join(value)
             section.append('%s: %s' % (name, value))
         test_setup_cfg_contents = DALS(
-                """
-                [metadata]
-                {metadata}
-                [options]
-                {options}
-                """
-            ).format(
-                options='\n'.join(options),
-                metadata='\n'.join(metadata),
-            )
+            """
+            [metadata]
+            {metadata}
+            [options]
+            {options}
+            """
+        ).format(
+            options='\n'.join(options),
+            metadata='\n'.join(metadata),
+        )
     else:
         test_setup_cfg_contents = ''
     with open(os.path.join(test_pkg, 'setup.cfg'), 'w') as f:
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 5896a69ae6..0da19b0e64 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -223,10 +223,10 @@ def setup_method(self, method):
                                py_modules=['bar_et'], remove=['bar.ext'],
                                ),
                 'baz': Feature(
-                        "baz", optional=False, packages=['pkg.baz'],
-                        scripts=['scripts/baz_it'],
-                        libraries=[('libfoo', 'foo/foofoo.c')]
-                       ),
+                    "baz", optional=False, packages=['pkg.baz'],
+                    scripts=['scripts/baz_it'],
+                    libraries=[('libfoo', 'foo/foofoo.c')]
+                ),
                 'dwim': Feature("DWIM", available=False, remove='bazish'),
             },
             script_args=['--without-bar', 'install'],
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index 39eb06eec5..f72ccbbf32 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -125,11 +125,12 @@ def flatten_tree(tree):
 
 
 def format_install_tree(tree):
-    return {x.format(
-        py_version=PY_MAJOR,
-        platform=get_platform(),
-        shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO'))
-            for x in tree}
+    return {
+        x.format(
+            py_version=PY_MAJOR,
+            platform=get_platform(),
+            shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO'))
+        for x in tree}
 
 
 def _check_wheel_install(filename, install_dir, install_tree_includes,

From 7cfeee80514bbdcd91b5dfbb937a9848ba4b7cf3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 14:42:56 -0500
Subject: [PATCH 7681/8469] Extract 'find_spec' function to consolidate
 behavior. Ref #1905.

---
 setuptools/_imp.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/setuptools/_imp.py b/setuptools/_imp.py
index 6ccec57993..451e45a831 100644
--- a/setuptools/_imp.py
+++ b/setuptools/_imp.py
@@ -17,12 +17,18 @@
 PY_FROZEN = 7
 
 
+def find_spec(module, paths):
+    finder = (
+        importlib.machinery.PathFinder().find_spec
+        if isinstance(paths, list) else
+        importlib.util.find_spec
+    )
+    return finder(module, paths)
+
+
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
-    if isinstance(paths, list):
-        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-    else:
-        spec = importlib.util.find_spec(module, paths)
+    spec = find_spec(module, paths)
     if spec is None:
         raise ImportError("Can't find %s" % module)
     if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
@@ -63,20 +69,14 @@ def find_module(module, paths=None):
 
 
 def get_frozen_object(module, paths=None):
-    if isinstance(paths, list):
-        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-    else:
-        spec = importlib.util.find_spec(module, paths)
+    spec = find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return spec.loader.get_code(module)
 
 
 def get_module(module, paths, info):
-    if isinstance(paths, list):
-        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-    else:
-        spec = importlib.util.find_spec(module, paths)
+    spec = find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return module_from_spec(spec)

From 20992988b5aec97062de8138b3c3737a38139b30 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 14:50:51 -0500
Subject: [PATCH 7682/8469] Add changelog entry. Ref #1905.

---
 changelog.d/1905.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1905.change.rst

diff --git a/changelog.d/1905.change.rst b/changelog.d/1905.change.rst
new file mode 100644
index 0000000000..7b73898cce
--- /dev/null
+++ b/changelog.d/1905.change.rst
@@ -0,0 +1 @@
+Fixed test failure introduced in 41.6.0 when the 'tests' directory is not present.

From 6b2490cd12e7e520b807ac35a084afd7bf3d912d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 14:55:21 -0500
Subject: [PATCH 7683/8469] Separate test for 'is_present' into its own test
 and add a TODO about this behavior being apparently unused.

---
 setuptools/tests/test_setuptools.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 0da19b0e64..bca69c3014 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -108,6 +108,11 @@ def testRequire(self):
         assert not req.is_present()
         assert not req.is_current()
 
+    @needs_bytecode
+    def test_require_present(self):
+        # In #1896, this test was failing for months with the only
+        # complaint coming from test runners (not end users).
+        # TODO: Evaluate if this code is needed at all.
         req = Require('Tests', None, 'tests', homepage="http://example.com")
         assert req.format is None
         assert req.attribute is None

From 7cd8b4966a6e7186ff45fe1f1c09a58f8a678113 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 15:05:08 -0500
Subject: [PATCH 7684/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setuptools/tests/test_dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index b93ef148e9..6e8c45fd30 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -61,7 +61,8 @@ def sdist_with_index(distname, version):
             dist.fetch_build_egg(r)
             for r in reqs
         ]
-    assert [dist.key for dist in resolved_dists if dist] == reqs
+    # noqa below because on Python 2 it causes flakes
+    assert [dist.key for dist in resolved_dists if dist] == reqs  # noqa
 
 
 def test_dist__get_unpatched_deprecated():

From 6d4e23882a5b1e1f31fb452aaad9d19cf0d02604 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 14:06:35 -0500
Subject: [PATCH 7685/8469] Move test dependencies to package metadata.

---
 setup.cfg              | 13 +++++++++++++
 tests/requirements.txt | 12 ------------
 tools/tox_pip.py       | 20 +++++++++++++++++++-
 tox.ini                |  3 ++-
 4 files changed, 34 insertions(+), 14 deletions(-)
 delete mode 100644 tests/requirements.txt

diff --git a/setup.cfg b/setup.cfg
index bef019eed8..87c25a62e4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -57,3 +57,16 @@ ssl =
     wincertstore==0.2; sys_platform=='win32'
 certs =
     certifi==2016.9.26
+tests =
+    mock
+    pytest-flake8
+    flake8-2020; python_version>="3.6"
+    virtualenv>=13.0.0
+    pytest-virtualenv>=1.2.7
+    pytest>=3.7
+    wheel
+    coverage>=4.5.1
+    pytest-cov>=2.5.1
+    paver; python_version>="3.6"
+    futures; python_version=="2.7"
+    pip>=19.1 # For proper file:// URLs support.
diff --git a/tests/requirements.txt b/tests/requirements.txt
deleted file mode 100644
index 19bf5aefd0..0000000000
--- a/tests/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-mock
-pytest-flake8
-flake8-2020; python_version>="3.6"
-virtualenv>=13.0.0
-pytest-virtualenv>=1.2.7
-pytest>=3.7
-wheel
-coverage>=4.5.1
-pytest-cov>=2.5.1
-paver; python_version>="3.6"
-futures; python_version=="2.7"
-pip>=19.1 # For proper file:// URLs support.
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 2d33e9e505..1b7eeda508 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -1,6 +1,7 @@
 import os
 import subprocess
 import sys
+import re
 
 
 def remove_setuptools():
@@ -20,12 +21,29 @@ def bootstrap():
     subprocess.check_call(cmd)
 
 
+def is_install_self(args):
+    """
+    Do the args represent an install of .?
+    """
+    def strip_extras(arg):
+        match = re.match(r'(.*)?\[.*\]$', arg)
+        return match.group(1) if match else arg
+
+    return (
+        'install' in args
+        and any(
+            arg in ['.', os.getcwd()]
+            for arg in map(strip_extras, args)
+        )
+    )
+
+
 def pip(args):
     # Honor requires-python when installing test suite dependencies
     if any('-r' in arg for arg in args):
         os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = '0'
 
-    if '.' in args:
+    if is_install_self(args):
         remove_setuptools()
         bootstrap()
 
diff --git a/tox.ini b/tox.ini
index a70dff871c..aeae13ce18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,6 @@ requires =
 pip = python {toxinidir}/tools/tox_pip.py
 
 [testenv]
-deps=-r{toxinidir}/tests/requirements.txt
 pip_version = pip
 install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
@@ -25,6 +24,8 @@ setenv =
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
 commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
+extras =
+	tests
 
 
 [testenv:coverage]

From 548adff948383937d94ca823ca6c1367ec331b62 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 12:45:18 +0100
Subject: [PATCH 7686/8469] Use `python-version` in setup-python action

Before this change, a deprecated `version` arg was used.
---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 8941b359e0..a1e3d95b13 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
-        version: ${{ matrix.python-version }}
+        python-version: ${{ matrix.python-version }}
     - name: Upgrade pip/setuptools/wheel
       run: >-
         python

From 5a5adf2df3ff231092a78df26cea965a41a4f47f Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 12:46:15 +0100
Subject: [PATCH 7687/8469] Bump setup-python action to v1.1.1

---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index a1e3d95b13..0801767fa6 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v1.1.1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Upgrade pip/setuptools/wheel

From 69ef612202e8ca5996865f23d9a4c935229b652b Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 12:51:20 +0100
Subject: [PATCH 7688/8469] Cache Pip dists in GH Actions CI/CD workflows

---
 .github/workflows/python-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 0801767fa6..64d4a0d6ee 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -33,6 +33,14 @@ jobs:
       uses: actions/setup-python@v1.1.1
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Cache pip
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}-${{ hashFiles('tests/requirements.txt') }}-${{ hashFiles('tox.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+          ${{ runner.os }}-
     - name: Upgrade pip/setuptools/wheel
       run: >-
         python

From 76754734f3f9dfc0817b3829c36dd6dca61c926c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 13:10:19 +0100
Subject: [PATCH 7689/8469] Switch to using the latest Ubuntu

---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 64d4a0d6ee..ebfe6b1810 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -19,7 +19,7 @@ jobs:
         - 3.6
         - 3.5
         os:
-        - ubuntu-18.04
+        - ubuntu-latest
         - ubuntu-16.04
         - macOS-latest
         # - windows-2019

From 5a30a9c44c2027331370cdf388a29d3de28790c2 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 14:12:52 +0100
Subject: [PATCH 7690/8469] Disable tox's parallel spinner

---
 .github/workflows/python-tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index ebfe6b1810..12ef645b7e 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -27,6 +27,9 @@ jobs:
         env:
         - TOXENV: python
 
+    env:
+      TOX_PARALLEL_NO_SPINNER: 1
+
     steps:
     - uses: actions/checkout@master
     - name: Set up Python ${{ matrix.python-version }}

From 347f319bb642af203301cc93d4c3591bbaac635c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 14:16:37 +0100
Subject: [PATCH 7691/8469] Log Python version in CI

---
 .github/workflows/python-tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 12ef645b7e..f5437b5e23 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -36,6 +36,9 @@ jobs:
       uses: actions/setup-python@v1.1.1
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Log Python version
+      run: >-
+        python --version
     - name: Cache pip
       uses: actions/cache@v1
       with:

From 1b0d1f65a956cee5cdf3236778fc051c962a678e Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 14:36:09 +0100
Subject: [PATCH 7692/8469] Log Python location in CI

---
 .github/workflows/python-tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index f5437b5e23..b1f9494678 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -39,6 +39,9 @@ jobs:
     - name: Log Python version
       run: >-
         python --version
+    - name: Log Python location
+      run: >-
+        which python
     - name: Cache pip
       uses: actions/cache@v1
       with:

From f4be7cfe1a897b443b998de932d1cd14e653a629 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 13:02:14 +0100
Subject: [PATCH 7693/8469] Fix running tests under Python 2

As per #1961.

P.S. Using `contains(['2.7', 'pypy2'], matrix.python-version)` does not
work even though
https://help.github.com/en/actions/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#contains
promises arrays to be supported.
---
 .github/workflows/python-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index b1f9494678..7b1dcac633 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -76,11 +76,13 @@ jobs:
 
     - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
       run: |
+        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
         python -m tox --parallel auto --notest --skip-missing-interpreters false
       env: ${{ matrix.env }}
     - name: Test with tox
       run: |
         ${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
+        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
         python -m tox \
         --parallel 0 \
         -- \

From f8af062c7345e6aaf82eed9a5fdf9f04c68d275f Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 12:46:34 +0100
Subject: [PATCH 7694/8469] =?UTF-8?q?Add=20PyPy=20=F0=9F=90=8D=20jobs=20to?=
 =?UTF-8?q?=20Actions=20CI/CD=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/python-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 7b1dcac633..286e022c87 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -15,6 +15,7 @@ jobs:
       matrix:
         python-version:
         - 3.8
+        - pypy3
         - 3.7
         - 3.6
         - 3.5

From 53d1343eacf565be5bf885960989c106accfb691 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 13:46:08 +0100
Subject: [PATCH 7695/8469] Support PyPy2

---
 .github/workflows/python-tests.yml | 4 ++--
 tox.ini                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 286e022c87..4dc997e56f 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -77,13 +77,13 @@ jobs:
 
     - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
       run: |
-        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
+        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
         python -m tox --parallel auto --notest --skip-missing-interpreters false
       env: ${{ matrix.env }}
     - name: Test with tox
       run: |
         ${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
-        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version || 'pypy2' == matrix.python-version) && 'py27' || '$TOXENV' }}
+        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
         python -m tox \
         --parallel 0 \
         -- \
diff --git a/tox.ini b/tox.ini
index a70dff871c..683b14541b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-	py27: PIP_IGNORE_REQUIRES_PYTHON=true
+	py{27,py2}: PIP_IGNORE_REQUIRES_PYTHON=true
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED

From d83f1b864492279ed11ddd9715b15805fc6b39d0 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 14 Jan 2020 14:20:54 +0100
Subject: [PATCH 7696/8469] Set TOXENV to pypy3 on macOS @ GH Actions CI/CD

---
 .github/workflows/python-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 4dc997e56f..4c02a1dbc1 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -78,12 +78,16 @@ jobs:
     - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
       run: |
         ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
+        ${{ startsWith(matrix.os, 'macOS-') && 'pypy3' == matrix.python-version  && 'export TOXENV=pypy3' || '' }}
+        echo TOXENV="$TOXENV"
         python -m tox --parallel auto --notest --skip-missing-interpreters false
       env: ${{ matrix.env }}
     - name: Test with tox
       run: |
         ${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
         ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
+        ${{ startsWith(matrix.os, 'macOS-') && 'pypy3' == matrix.python-version  && 'export TOXENV=pypy3' || '' }}
+        echo TOXENV="$TOXENV"
         python -m tox \
         --parallel 0 \
         -- \

From 673e62b219cf6adbb2139bbec1c53f6d89d3c60f Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 20 Jan 2020 03:08:08 +0100
Subject: [PATCH 7697/8469] Simplify GH Actions tests workflow

---
 .github/workflows/python-tests.yml | 48 +++++++++++++++++-------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 4c02a1dbc1..3c2aca3463 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -1,4 +1,6 @@
-name: Test suite
+name: >-
+  👷
+  Test suite
 
 on:
   push:
@@ -8,7 +10,10 @@ on:
 
 jobs:
   tests:
-    name: 👷
+    name: >-
+      ${{ matrix.python-version }}
+      /
+      ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       # max-parallel: 5
@@ -25,11 +30,10 @@ jobs:
         - macOS-latest
         # - windows-2019
         # - windows-2016
-        env:
-        - TOXENV: python
 
     env:
       TOX_PARALLEL_NO_SPINNER: 1
+      TOXENV: python
 
     steps:
     - uses: actions/checkout@master
@@ -43,7 +47,10 @@ jobs:
     - name: Log Python location
       run: >-
         which python
-    - name: Cache pip
+    - name: Log Python env
+      run: >-
+        python -m sysconfig
+    - name: Pip cache
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
@@ -64,10 +71,13 @@ jobs:
     - name: Log installed dists
       run: >-
         python -m pip freeze --all
+    - name: Adjust TOXENV for PyPy
+      if: startsWith(matrix.python-version, 'pypy')
+      run: >-
+        echo "::set-env name=TOXENV::${{ matrix.python-version }}"
     - name: Log env vars
       run: >-
         env
-      env: ${{ matrix.env }}
 
     - name: Verify that there's no cached Python modules in sources
       if: >-
@@ -76,20 +86,16 @@ jobs:
         ! grep pyc setuptools.egg-info/SOURCES.txt
 
     - name: 'Initialize tox envs: ${{ matrix.env.TOXENV }}'
-      run: |
-        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
-        ${{ startsWith(matrix.os, 'macOS-') && 'pypy3' == matrix.python-version  && 'export TOXENV=pypy3' || '' }}
-        echo TOXENV="$TOXENV"
-        python -m tox --parallel auto --notest --skip-missing-interpreters false
-      env: ${{ matrix.env }}
+      run: >-
+        python -m
+        tox
+        --parallel auto
+        --notest
+        --skip-missing-interpreters false
     - name: Test with tox
-      run: |
-        ${{ startsWith(matrix.os, 'windows-') && 'setx NETWORK_REQUIRED ' || 'export NETWORK_REQUIRED=' }}1
-        ${{ startsWith(matrix.os, 'windows-') && 'setx TOXENV ' || 'export TOXENV=' }}${{ ('2.7' == matrix.python-version && 'py27') || ('pypy2' == matrix.python-version && 'pypy2') || '$TOXENV' }}
-        ${{ startsWith(matrix.os, 'macOS-') && 'pypy3' == matrix.python-version  && 'export TOXENV=pypy3' || '' }}
-        echo TOXENV="$TOXENV"
-        python -m tox \
-        --parallel 0 \
-        -- \
+      run: >-
+        python -m
+        tox
+        --parallel auto
+        --
         --cov
-      env: ${{ matrix.env }}

From 8414998c9c026659144065ab0a8cb2e2956e5a46 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 20 Jan 2020 03:10:27 +0100
Subject: [PATCH 7698/8469] Add back NETWORK_REQUIRED env var

---
 .github/workflows/python-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 3c2aca3463..9d24a54a0d 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -32,6 +32,7 @@ jobs:
         # - windows-2016
 
     env:
+      NETWORK_REQUIRED: 1
       TOX_PARALLEL_NO_SPINNER: 1
       TOXENV: python
 

From 3a60d1de2d4b9cdf330158fd708dde3c23d6b344 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Jan 2020 09:31:59 -0500
Subject: [PATCH 7699/8469] Clarify subject of change. Ref #1905.

---
 changelog.d/1905.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1905.change.rst b/changelog.d/1905.change.rst
index 7b73898cce..f0e07a18c1 100644
--- a/changelog.d/1905.change.rst
+++ b/changelog.d/1905.change.rst
@@ -1 +1 @@
-Fixed test failure introduced in 41.6.0 when the 'tests' directory is not present.
+Fixed defect in _imp, introduced in 41.6.0 when the 'tests' directory is not present.

From d92f778b6c88c8a36c4aecac9543d9297c425096 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Jan 2020 10:34:25 -0500
Subject: [PATCH 7700/8469] Rewrite selective PIP_IGNORE_REQUIRES_PYTHON to
 allow test dependencies in metadata to be installed without ignoring
 REQUIRES_PYTHON

---
 setuptools/tests/test_virtualenv.py | 11 ++++++++
 tools/tox_pip.py                    | 39 +++++++++++++++++++++++------
 tox.ini                             |  1 -
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index b009fbd6f8..6549a6c01a 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -12,6 +12,17 @@
 from .test_easy_install import make_nspkg_sdist
 
 
+@pytest.fixture(autouse=True)
+def disable_requires_python(monkeypatch):
+    """
+    Disable Requires-Python on Python 2.7
+    """
+    if sys.version_info > (3,):
+        return
+
+    monkeypatch.setenv('PIP_IGNORE_REQUIRES_PYTHON', 'true')
+
+
 @pytest.fixture(autouse=True)
 def pytest_virtualenv_works(virtualenv):
     """
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 1b7eeda508..6f457bb2ea 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -38,18 +38,43 @@ def strip_extras(arg):
     )
 
 
-def pip(args):
-    # Honor requires-python when installing test suite dependencies
-    if any('-r' in arg for arg in args):
-        os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = '0'
+def pip(*args):
+    cmd = [sys.executable, '-m', 'pip'] + list(args)
+    return subprocess.check_call(cmd)
 
+
+def test_dependencies():
+    from ConfigParser import ConfigParser
+
+    def clean(dep):
+        spec, _, _ = dep.partition('#')
+        return spec.strip()
+
+    parser = ConfigParser()
+    parser.read('setup.cfg')
+    raw = parser.get('options.extras_require', 'tests').split('\n')
+    return filter(None, map(clean, raw))
+
+
+def disable_python_requires():
+    """
+    On Python 2, install the dependencies that are selective
+    on Python version while honoring REQUIRES_PYTHON, then
+    disable REQUIRES_PYTHON so that pip can install this
+    checkout of setuptools.
+    """
+    pip('install', *test_dependencies())
+    os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = 'true'
+
+
+def run(args):
     if is_install_self(args):
         remove_setuptools()
         bootstrap()
+        sys.version_info > (3,) or disable_python_requires()
 
-    cmd = [sys.executable, '-m', 'pip'] + args
-    subprocess.check_call(cmd)
+    pip(*args)
 
 
 if __name__ == '__main__':
-    pip(sys.argv[1:])
+    run(sys.argv[1:])
diff --git a/tox.ini b/tox.ini
index aeae13ce18..a5ce930f24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,6 @@ install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-	py27: PIP_IGNORE_REQUIRES_PYTHON=true
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED

From f9e279df7d75f2bfcba92c3393c4c64e25e6dcb7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Jan 2020 11:31:23 -0500
Subject: [PATCH 7701/8469] Move test dependencies into the package, removing
 'tests' directory which masks the error reported in #1896.

---
 {tests => setuptools/tests}/requirements.txt | 0
 tox.ini                                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {tests => setuptools/tests}/requirements.txt (100%)

diff --git a/tests/requirements.txt b/setuptools/tests/requirements.txt
similarity index 100%
rename from tests/requirements.txt
rename to setuptools/tests/requirements.txt
diff --git a/tox.ini b/tox.ini
index e0eef95a45..048e6ea278 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@
 envlist=python
 
 [testenv]
-deps=-rtests/requirements.txt
+deps=-rsetuptools/tests/requirements.txt
 # Changed from default (`python -m pip ...`)
 # to prevent the current working directory
 # from being added to `sys.path`.

From 461ea400887a576dba102816f72af1d6966e1768 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 20 Jan 2020 22:09:46 -0500
Subject: [PATCH 7702/8469] Opt into PEP 517 for pip installs to avoid implicit
 dependency on Setuptools to install test dependencies.

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index a5ce930f24..3eb408cc1f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
+	PIP_USE_PEP517=1
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED

From 620bd62c00985b551dde326619a6c895d7c80e63 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Jan 2020 22:07:49 -0500
Subject: [PATCH 7703/8469] Set PIP_USE_PEP517 in installer command so as not
 to influence the tests with that setting.

---
 tools/tox_pip.py | 2 ++
 tox.ini          | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 6f457bb2ea..9fe4f905c7 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -68,6 +68,8 @@ def disable_python_requires():
 
 
 def run(args):
+    os.environ['PIP_USE_PEP517'] = 'true'
+
     if is_install_self(args):
         remove_setuptools()
         bootstrap()
diff --git a/tox.ini b/tox.ini
index 3eb408cc1f..a5ce930f24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,6 @@ install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-	PIP_USE_PEP517=1
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED

From 641e088d193142f236d69c78d272cf7ece0d693c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 21 Jan 2020 22:38:03 -0500
Subject: [PATCH 7704/8469] Move docs dependencies into package metadata and
 use same technique as jaraco/skeleton to build docs in tox and rtd.

---
 .github/workflows/python-tests.yml |  2 +-
 .readthedocs.yml                   |  5 +++--
 docs/requirements.txt              |  5 -----
 setup.cfg                          |  7 +++++++
 tox.ini                            | 10 +++++-----
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 docs/requirements.txt

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 60765b522a..e3663cf0b8 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -55,7 +55,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}-${{ hashFiles('setup.cfg') }}-${{ hashFiles('tox.ini') }}
+        key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
         restore-keys: |
           ${{ runner.os }}-pip-
           ${{ runner.os }}-
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 3aef6b6be4..7b994a3579 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,4 +1,5 @@
 python:
   version: 3
-  requirements_file: docs/requirements.txt
-  pip_install: false
+  extra_requirements:
+  - docs
+  pip_install: true
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index bc27165b22..0000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-sphinx!=1.8.0
-rst.linker>=1.9
-jaraco.packaging>=6.1
-
-setuptools>=34
diff --git a/setup.cfg b/setup.cfg
index 87c25a62e4..bc34b22c4d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,8 +55,10 @@ exclude = *.tests
 [options.extras_require]
 ssl =
     wincertstore==0.2; sys_platform=='win32'
+
 certs =
     certifi==2016.9.26
+
 tests =
     mock
     pytest-flake8
@@ -70,3 +72,8 @@ tests =
     paver; python_version>="3.6"
     futures; python_version=="2.7"
     pip>=19.1 # For proper file:// URLs support.
+
+docs =
+    sphinx
+    jaraco.packaging>=6.1
+    rst.linker>=1.9
diff --git a/tox.ini b/tox.ini
index a5ce930f24..2164599f8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,12 +44,12 @@ skip_install=True
 commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 
 [testenv:docs]
-deps = -r{toxinidir}/docs/requirements.txt
-skip_install=True
+extras =
+        docs
+        testing
+changedir = docs
 commands =
-    python -m bootstrap
-    sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
-    sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
+        python -m sphinx . {toxinidir}/build/html
 
 [coverage:run]
 source=

From 60da370778026872e44d44c3a0429bfc2b242504 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Mon, 3 Feb 2020 15:05:14 +0100
Subject: [PATCH 7705/8469] Fix install_scripts() if bdist_wininst is missing

Closes #1985
---
 setuptools/command/install_scripts.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 16234273a2..8c9a15e2bb 100644
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -32,8 +32,11 @@ def run(self):
         )
         bs_cmd = self.get_finalized_command('build_scripts')
         exec_param = getattr(bs_cmd, 'executable', None)
-        bw_cmd = self.get_finalized_command("bdist_wininst")
-        is_wininst = getattr(bw_cmd, '_is_running', False)
+        try:
+            bw_cmd = self.get_finalized_command("bdist_wininst")
+            is_wininst = getattr(bw_cmd, '_is_running', False)
+        except ImportError:
+            is_wininst = False
         writer = ei.ScriptWriter
         if is_wininst:
             exec_param = "python.exe"

From 91ede46d247291a5e5449403880c15a2674ebcb5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 4 Feb 2020 05:34:17 -0500
Subject: [PATCH 7706/8469] Add changelog entry.

---
 changelog.d/1981.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1981.change.rst

diff --git a/changelog.d/1981.change.rst b/changelog.d/1981.change.rst
new file mode 100644
index 0000000000..c5713d9b62
--- /dev/null
+++ b/changelog.d/1981.change.rst
@@ -0,0 +1 @@
+Setuptools now declares its ``tests`` and ``docs`` dependencies in metadata (extras).

From daf18dd027a08dd318f348e12e75e9f4d8aaed0a Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Tue, 4 Feb 2020 16:24:30 +0100
Subject: [PATCH 7707/8469] bpo-39432: Implement PEP-489 algorithm for
 non-ascii "PyInit_*" symbol names in distutils (GH-18150)

Make it export the correct init symbol also on Windows.



https://bugs.python.org/issue39432
---
 command/build_ext.py    | 10 +++++++++-
 tests/test_build_ext.py | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/command/build_ext.py b/command/build_ext.py
index 38bb8fd93c..1a9bd1200f 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -689,7 +689,15 @@ def get_export_symbols(self, ext):
         provided, "PyInit_" + module_name.  Only relevant on Windows, where
         the .pyd file (DLL) must export the module "PyInit_" function.
         """
-        initfunc_name = "PyInit_" + ext.name.split('.')[-1]
+        suffix = '_' + ext.name.split('.')[-1]
+        try:
+            # Unicode module name support as defined in PEP-489
+            # https://www.python.org/dev/peps/pep-0489/#export-hook-name
+            suffix.encode('ascii')
+        except UnicodeEncodeError:
+            suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii')
+
+        initfunc_name = "PyInit" + suffix
         if initfunc_name not in ext.export_symbols:
             ext.export_symbols.append(initfunc_name)
         return ext.export_symbols
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 52d36b2484..7e3eafa8ef 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -304,6 +304,19 @@ def test_get_source_files(self):
         cmd.ensure_finalized()
         self.assertEqual(cmd.get_source_files(), ['xxx'])
 
+    def test_unicode_module_names(self):
+        modules = [
+            Extension('foo', ['aaa'], optional=False),
+            Extension('föö', ['uuu'], optional=False),
+        ]
+        dist = Distribution({'name': 'xx', 'ext_modules': modules})
+        cmd = self.build_ext(dist)
+        cmd.ensure_finalized()
+        self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo\..*')
+        self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö\..*')
+        self.assertEqual(cmd.get_export_symbols(modules[0]), ['PyInit_foo'])
+        self.assertEqual(cmd.get_export_symbols(modules[1]), ['PyInitU_f_gkaa'])
+
     def test_compiler_option(self):
         # cmd.compiler is an option and
         # should not be overridden by a compiler instance

From b0ecd44b1011db9c562019caec7e4ba2750ce4a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Feb 2020 18:50:05 -0500
Subject: [PATCH 7708/8469] Update changelog.

---
 changelog.d/1985.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1985.change.rst

diff --git a/changelog.d/1985.change.rst b/changelog.d/1985.change.rst
new file mode 100644
index 0000000000..33698b8874
--- /dev/null
+++ b/changelog.d/1985.change.rst
@@ -0,0 +1 @@
+Add support for installing scripts in environments where bdist_wininst is missing (i.e. Python 3.9).

From 131482820238cb060b38e7e55bffabea4f0a3a0e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:15:42 -0500
Subject: [PATCH 7709/8469] Add azure pipelines from jaraco/skeleton

---
 azure-pipelines.yml | 71 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000..3e80bf443d
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,71 @@
+# Create the project in Azure with:
+# az devops project create --name $name --organization https://dev.azure.com/$org/ --visibility public
+# then configure the pipelines (through web UI)
+
+trigger:
+  branches:
+    include:
+    - '*'
+  tags:
+    include:
+    - '*'
+
+pool:
+  vmimage: 'Ubuntu-18.04'
+
+variables:
+- group: Azure secrets
+
+stages:
+- stage: Test
+  jobs:
+
+  - job: 'Test'
+    strategy:
+      matrix:
+        Python36:
+          python.version: '3.6'
+        Python38:
+          python.version: '3.8'
+      maxParallel: 4
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '$(python.version)'
+        architecture: 'x64'
+
+    - script: python -m pip install tox
+      displayName: 'Install tox'
+
+    - script: |
+        tox -- --junit-xml=test-results.xml
+      displayName: 'run tests'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: '**/test-results.xml'
+        testRunTitle: 'Python $(python.version)'
+      condition: succeededOrFailed()
+
+- stage: Publish
+  dependsOn: Test
+  jobs:
+  - job: 'Publish'
+
+    steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '3.8'
+        architecture: 'x64'
+
+    - script: python -m pip install tox
+      displayName: 'Install tox'
+
+    - script: |
+        tox -e release
+      env:
+        TWINE_PASSWORD: $(PyPI-token)
+      displayName: 'publish to PyPI'
+
+  condition: contains(variables['Build.SourceBranch'], 'tags')

From d6bd6b1ea7efff2df20ca970de45fb0c2fe701e7 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Thu, 6 Feb 2020 15:48:10 +1100
Subject: [PATCH 7710/8469] bpo-39555: Fix distutils test to handle _d suffix
 on Windows debug build (GH-18357)

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

diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 7e3eafa8ef..5e47e0773a 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -312,8 +312,8 @@ def test_unicode_module_names(self):
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = self.build_ext(dist)
         cmd.ensure_finalized()
-        self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo\..*')
-        self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö\..*')
+        self.assertRegex(cmd.get_ext_filename(modules[0].name), r'foo(_d)?\..*')
+        self.assertRegex(cmd.get_ext_filename(modules[1].name), r'föö(_d)?\..*')
         self.assertEqual(cmd.get_export_symbols(modules[0]), ['PyInit_foo'])
         self.assertEqual(cmd.get_export_symbols(modules[1]), ['PyInitU_f_gkaa'])
 

From 0559f17d4588553eb428d57ecfebab9e0e988e65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jan 2020 11:54:02 -0500
Subject: [PATCH 7711/8469] Bootstrap the environment in tox, allowing simple
 'tox' to run tests and simplifying all of the pipelines.

---
 .travis.yml              |  2 --
 appveyor.yml             |  1 -
 docs/conf.py             |  2 +-
 docs/developer-guide.txt |  8 ++------
 tools/tox_pip.py         | 11 +++++++++--
 tox.ini                  |  4 +---
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 501a0b69ce..3ad310b37f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,6 @@ install:
 - pip freeze --all
 - env
 
-# update egg_info based on setup.py in checkout
-- python bootstrap.py
 - "! grep pyc setuptools.egg-info/SOURCES.txt"
 
 script:
diff --git a/appveyor.yml b/appveyor.yml
index 0881806968..02fe1ee565 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,6 @@ test_script:
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
   - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
-  - python bootstrap.py
   - tox -- --cov
 
 after_test:
diff --git a/docs/conf.py b/docs/conf.py
index cbd19fb470..6f6ae13a60 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 # hack to run the bootstrap script so that jaraco.packaging.sphinx
 # can invoke setup.py
 'READTHEDOCS' in os.environ and subprocess.check_call(
-    [sys.executable, 'bootstrap.py'],
+    [sys.executable, '-m', 'bootstrap'],
     cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
 )
 
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index d145fba140..0b4ae4d4c3 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -104,12 +104,8 @@ from the command line after pushing a new branch.
 Testing
 -------
 
-The primary tests are run using tox. To run the tests, first create the metadata
-needed to run the tests::
-
-    $ python bootstrap.py
-
-Then make sure you have tox installed, and invoke it::
+The primary tests are run using tox.  Make sure you have tox installed,
+and invoke it::
 
     $ tox
 
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index f592e41285..ba776638d6 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -13,9 +13,16 @@ def remove_setuptools():
     subprocess.check_call(cmd, cwd='.tox')
 
 
+def bootstrap():
+    print("Running bootstrap")
+    cmd = [sys.executable, '-m', 'bootstrap']
+    subprocess.check_call(cmd)
+
+
 def pip(args):
-    # When installing '.', remove setuptools
-    '.' in args and remove_setuptools()
+    if '.' in args:
+        remove_setuptools()
+        bootstrap()
 
     cmd = [sys.executable, '-m', 'pip'] + args
     subprocess.check_call(cmd)
diff --git a/tox.ini b/tox.ini
index a666f0afb7..ddfeddf96f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,3 @@
-# Note: Run "python bootstrap.py" before running Tox, to generate metadata.
-#
 # To run Tox against all supported Python interpreters, you can set:
 #
 # export TOXENV='py27,py3{5,6,7,8},pypy,pypy3'
@@ -47,7 +45,7 @@ commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 deps = -r{toxinidir}/docs/requirements.txt
 skip_install=True
 commands =
-    python {toxinidir}/bootstrap.py
+    python -m bootstrap
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
     sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man
 

From a5dec2f14e3414e4ee5dd146bff9c289d573de9a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Feb 2020 23:18:21 -0500
Subject: [PATCH 7712/8469] =?UTF-8?q?Bump=20version:=2045.1.0=20=E2=86=92?=
 =?UTF-8?q?=2045.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 13 +++++++++++++
 changelog.d/1905.change.rst |  1 -
 changelog.d/1941.change.rst |  4 ----
 changelog.d/1968.misc.rst   |  1 -
 changelog.d/1981.change.rst |  1 -
 changelog.d/1985.change.rst |  1 -
 setup.cfg                   |  2 +-
 8 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 changelog.d/1905.change.rst
 delete mode 100644 changelog.d/1941.change.rst
 delete mode 100644 changelog.d/1968.misc.rst
 delete mode 100644 changelog.d/1981.change.rst
 delete mode 100644 changelog.d/1985.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ef8a387751..8e86f31f09 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 45.1.0
+current_version = 45.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 198854fc24..f97f514208 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v45.2.0
+-------
+
+* #1905: Fixed defect in _imp, introduced in 41.6.0 when the 'tests' directory is not present.
+* #1941: Improve editable installs with PEP 518 build isolation:
+
+  * The ``--user`` option is now always available. A warning is issued if the user site directory is not available.
+  * The error shown when the install directory is not in ``PYTHONPATH`` has been turned into a warning.
+* #1981: Setuptools now declares its ``tests`` and ``docs`` dependencies in metadata (extras).
+* #1985: Add support for installing scripts in environments where bdist_wininst is missing (i.e. Python 3.9).
+* #1968: Add flake8-2020 to check for misuse of sys.version or sys.version_info.
+
+
 v45.1.0
 -------
 
diff --git a/changelog.d/1905.change.rst b/changelog.d/1905.change.rst
deleted file mode 100644
index f0e07a18c1..0000000000
--- a/changelog.d/1905.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed defect in _imp, introduced in 41.6.0 when the 'tests' directory is not present.
diff --git a/changelog.d/1941.change.rst b/changelog.d/1941.change.rst
deleted file mode 100644
index a41cdcfe6e..0000000000
--- a/changelog.d/1941.change.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Improve editable installs with PEP 518 build isolation:
-
-* The ``--user`` option is now always available. A warning is issued if the user site directory is not available.
-* The error shown when the install directory is not in ``PYTHONPATH`` has been turned into a warning.
diff --git a/changelog.d/1968.misc.rst b/changelog.d/1968.misc.rst
deleted file mode 100644
index 4aa5343f4b..0000000000
--- a/changelog.d/1968.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add flake8-2020 to check for misuse of sys.version or sys.version_info.
diff --git a/changelog.d/1981.change.rst b/changelog.d/1981.change.rst
deleted file mode 100644
index c5713d9b62..0000000000
--- a/changelog.d/1981.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now declares its ``tests`` and ``docs`` dependencies in metadata (extras).
diff --git a/changelog.d/1985.change.rst b/changelog.d/1985.change.rst
deleted file mode 100644
index 33698b8874..0000000000
--- a/changelog.d/1985.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for installing scripts in environments where bdist_wininst is missing (i.e. Python 3.9).
diff --git a/setup.cfg b/setup.cfg
index bc34b22c4d..8cca64774d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 45.1.0
+version = 45.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 8e5f7c22088ad8ee03096d1e591449bed2f14e44 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 10 Feb 2020 15:26:40 +0200
Subject: [PATCH 7713/8469] bpo-39586: Deprecate distutils bdist_msi command
 (GH-18415)

---
 command/bdist_msi.py    | 10 +++++++++-
 tests/test_bdist_msi.py |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/command/bdist_msi.py b/command/bdist_msi.py
index f335a34898..0863a1883e 100644
--- a/command/bdist_msi.py
+++ b/command/bdist_msi.py
@@ -6,7 +6,9 @@
 Implements the bdist_msi command.
 """
 
-import sys, os
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.dir_util import remove_tree
 from distutils.sysconfig import get_python_version
@@ -122,6 +124,12 @@ class bdist_msi(Command):
                     '3.5', '3.6', '3.7', '3.8', '3.9']
     other_version = 'X'
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_msi command is deprecated since Python 3.9, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 15d8bdff2b..418e60ec72 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,7 +1,7 @@
 """Tests for distutils.command.bdist_msi."""
 import sys
 import unittest
-from test.support import run_unittest
+from test.support import run_unittest, check_warnings
 from distutils.tests import support
 
 
@@ -14,7 +14,8 @@ def test_minimal(self):
         # minimal test XXX need more tests
         from distutils.command.bdist_msi import bdist_msi
         project_dir, dist = self.create_dist()
-        cmd = bdist_msi(dist)
+        with check_warnings(("", DeprecationWarning)):
+            cmd = bdist_msi(dist)
         cmd.ensure_finalized()
 
 

From 0b6a065ea1415f3491d998fefee47ce800d5afe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 11 Feb 2020 16:49:23 +0100
Subject: [PATCH 7714/8469] Include pkg_resources test data in sdist

This is the error otherwise:

_____________ TestFindDistributions.test_standalone_egg_directory ______________

self = <pkg_resources.tests.test_find_distributions.TestFindDistributions object at 0x7f17518a86d0>
target_dir = local('/tmp/pytest-of-mockbuild/pytest-0/test_standalone_egg_directory0/target')

    def test_standalone_egg_directory(self, target_dir):
        (TESTS_DATA_DIR / 'my-test-package_unpacked-egg').copy(target_dir)
        dists = pkg_resources.find_distributions(str(target_dir))
>       assert [dist.project_name for dist in dists] == ['my-test-package']
E       AssertionError: assert [] == ['my-test-package']
E         Right contains one more item: 'my-test-package'
E         Use -v to get the full diff

pkg_resources/tests/test_find_distributions.py:25: AssertionError
____________________ TestFindDistributions.test_zipped_egg _____________________

self = <module 'py.error'>, func = <built-in function listdir>
args = ('/builddir/build/BUILD/setuptools-45.2.0/pkg_resources/tests/data/my-test-package_zipped-egg',)
kwargs = {}, __tracebackhide__ = False, cls = <class 'py.error.ENOENT'>
value = FileNotFoundError(2, 'No such file or directory')
tb = <traceback object at 0x7f1751a6a7c0>, errno = 2

    def checked_call(self, func, *args, **kwargs):
        """ call a function and raise an errno-exception if applicable. """
        __tracebackhide__ = True
        try:
>           return func(*args, **kwargs)
E           FileNotFoundError: [Errno 2] No such file or directory: '/builddir/build/BUILD/setuptools-45.2.0/pkg_resources/tests/data/my-test-package_zipped-egg'

/usr/lib/python3.8/site-packages/py/_error.py:66: FileNotFoundError

During handling of the above exception, another exception occurred:

self = <pkg_resources.tests.test_find_distributions.TestFindDistributions object at 0x7f1751c8fe80>
target_dir = local('/tmp/pytest-of-mockbuild/pytest-0/test_zipped_egg0/target')

    def test_zipped_egg(self, target_dir):
>       (TESTS_DATA_DIR / 'my-test-package_zipped-egg').copy(target_dir)

pkg_resources/tests/test_find_distributions.py:30:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
/usr/lib/python3.8/site-packages/py/_path/local.py:437: in copy
    for x in self.visit(rec=rec):
/usr/lib/python3.8/site-packages/py/_path/common.py:377: in visit
    for x in Visitor(fil, rec, ignore, bf, sort).gen(self):
/usr/lib/python3.8/site-packages/py/_path/common.py:414: in gen
    entries = path.listdir()
/usr/lib/python3.8/site-packages/py/_path/local.py:392: in listdir
    names = py.error.checked_call(os.listdir, self.strpath)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <module 'py.error'>, func = <built-in function listdir>
args = ('/builddir/build/BUILD/setuptools-45.2.0/pkg_resources/tests/data/my-test-package_zipped-egg',)
kwargs = {}, __tracebackhide__ = False, cls = <class 'py.error.ENOENT'>
value = FileNotFoundError(2, 'No such file or directory')
tb = <traceback object at 0x7f1751a6a7c0>, errno = 2

    def checked_call(self, func, *args, **kwargs):
        """ call a function and raise an errno-exception if applicable. """
        __tracebackhide__ = True
        try:
            return func(*args, **kwargs)
        except self.Error:
            raise
        except (OSError, EnvironmentError):
            cls, value, tb = sys.exc_info()
            if not hasattr(value, 'errno'):
                raise
            __tracebackhide__ = False
            errno = value.errno
            try:
                if not isinstance(value, WindowsError):
                    raise NameError
            except NameError:
                # we are not on Windows, or we got a proper OSError
                cls = self._geterrnoclass(errno)
            else:
                try:
                    cls = self._geterrnoclass(_winerrnomap[errno])
                except KeyError:
                    raise value
>           raise cls("%s%r" % (func.__name__, args))
E           py.error.ENOENT: [No such file or directory]: listdir('/builddir/build/BUILD/setuptools-45.2.0/pkg_resources/tests/data/my-test-package_zipped-egg',)

/usr/lib/python3.8/site-packages/py/_error.py:86: ENOENT
---
 MANIFEST.in               | 1 +
 changelog.d/1991.misc.rst | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/1991.misc.rst

diff --git a/MANIFEST.in b/MANIFEST.in
index 16d60e5ffc..128ae280ec 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include setuptools/_vendor *.py *.txt
 recursive-include pkg_resources *.py *.txt
+recursive-include pkg_resources/tests/data *
 include *.py
 include *.rst
 include MANIFEST.in
diff --git a/changelog.d/1991.misc.rst b/changelog.d/1991.misc.rst
new file mode 100644
index 0000000000..ac6904a242
--- /dev/null
+++ b/changelog.d/1991.misc.rst
@@ -0,0 +1 @@
+Include pkg_resources test data in sdist, so tests can be executed from it.

From 53b8523fdfa19173d2e6b11d6b4d175f54b9dfea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 11 Feb 2020 22:12:37 -0500
Subject: [PATCH 7715/8469] Update deprecation version and include extension on
 changelog file.

---
 changelog.d/{1557.change => 1557.change.rst} |  0
 docs/setuptools.txt                          | 10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename changelog.d/{1557.change => 1557.change.rst} (100%)

diff --git a/changelog.d/1557.change b/changelog.d/1557.change.rst
similarity index 100%
rename from changelog.d/1557.change
rename to changelog.d/1557.change.rst
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 51e46743db..be0f65d6ca 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -572,7 +572,7 @@ Services and Plugins`_.
 "Eggsecutable" Scripts
 ----------------------
 
-.. deprecated:: 41.3.0
+.. deprecated:: 45.3.0
 
 Occasionally, there are situations where it's desirable to make an ``.egg``
 file directly executable.  You can do this by including an entry point such
@@ -1225,7 +1225,7 @@ the quoted part.
 Distributing a ``setuptools``-based project
 ===========================================
 
-Detailed instructions to distribute a setuptools project can be found at 
+Detailed instructions to distribute a setuptools project can be found at
 `Packaging project tutorials`_.
 
 .. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
@@ -1241,7 +1241,7 @@ setup.py is located::
 
 This will generate distribution archives in the `dist` directory.
 
-Before you upload the generated archives make sure you're registered on 
+Before you upload the generated archives make sure you're registered on
 https://test.pypi.org/account/register/. You will also need to verify your email
 to be able to upload any packages.
 You should install twine to be able to upload packages::
@@ -1264,11 +1264,11 @@ Distributing legacy ``setuptools`` projects using ez_setup.py
 
 .. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
 
-Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is 
+Distributing packages using the legacy ``ez_setup.py`` and ``easy_install`` is
 deprecated in favor of PIP. Please consider migrating to using pip and twine based
 distribution.
 
-However, if you still have any ``ez_setup`` based packages, documentation for 
+However, if you still have any ``ez_setup`` based packages, documentation for
 ez_setup based distributions can be found at `ez_setup distribution guide`_.
 
 .. _ez_setup distribution guide: ez_setup.html

From 9732946b82f9e064603a31d3591783e867b7359c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Feb 2020 08:43:20 -0500
Subject: [PATCH 7716/8469] Avoid installing setuptools 45 on Python 2.

Because Requires-Python is disabled for Python 2 to allow this declared-incompatible version to install on Python 2, the build-requirements must exclude installing setuptools 45 during the build-system setup.

Because Python 2 tests are only needed for internal validation, and because the latest pip is already installed, the build-system can rely on `backend-path = ["."]`.

Fixes #1996.
---
 pyproject.toml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f0fd8521ee..cfdc2574b7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,9 @@
 [build-system]
-requires = ["setuptools >= 40.8", "wheel"]
+requires = [
+    # avoid self install on Python 2; ref #1996
+    "setuptools >= 40.8; python_version > '3'",
+    "wheel",
+]
 build-backend = "setuptools.build_meta"
 backend-path = ["."]
 

From 4835f01c41f784e1bcd24752dfecb96eb44a1a16 Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@gmx.net>
Date: Fri, 14 Feb 2020 11:23:43 +0100
Subject: [PATCH 7717/8469] use finalize_distribution_options entrypoint order

fixes #1993
---
 setuptools/dist.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index fe5adf4607..f6453a0878 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -731,13 +731,13 @@ def finalize_options(self):
         to influence the order of execution. Smaller numbers
         go first and the default is 0.
         """
-        hook_key = 'setuptools.finalize_distribution_options'
+        group = 'setuptools.finalize_distribution_options'
 
         def by_order(hook):
             return getattr(hook, 'order', 0)
-        eps = pkg_resources.iter_entry_points(hook_key)
+        eps = map(lambda e: e.load(), pkg_resources.iter_entry_points(group))
         for ep in sorted(eps, key=by_order):
-            ep.load()(self)
+            ep(self)
 
     def _finalize_setup_keywords(self):
         for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'):

From 3f8fb00e442d110129e7d77b8104e4774a11ef92 Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@gmx.net>
Date: Sat, 15 Feb 2020 11:12:32 +0100
Subject: [PATCH 7718/8469] changelog for #1994

---
 changelog.d/1994.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1994.change.rst

diff --git a/changelog.d/1994.change.rst b/changelog.d/1994.change.rst
new file mode 100644
index 0000000000..4a6cc74298
--- /dev/null
+++ b/changelog.d/1994.change.rst
@@ -0,0 +1 @@
+Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.

From a99aeb82b254e27cef736a4e7eb89ece4583e100 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Feb 2020 11:51:53 -0500
Subject: [PATCH 7719/8469] Pin virtualenv to <20 as workaround for #1998.

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index ddfeddf96f..2d43e76fc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,8 @@ envlist=python
 minversion = 3.2
 requires =
 	tox-pip-version >= 0.0.6
+	# workaround for #1998
+	virtualenv < 20
 
 [helpers]
 # Custom pip behavior

From fd25f0cdaa63f20effefc96f195b0e909fac8c75 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Feb 2020 14:07:11 -0500
Subject: [PATCH 7720/8469] Suppress failures due to unfortunate combination of
 issues. Ref #2000.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3ad310b37f..3ce1bf07dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,9 @@ jobs:
     if: tag IS present
     script: tox -e release
     after_success: skip
+  allow_failures:
+  # suppress failures due to pypa/setuptools#2000
+  - python: pypy3
 
 cache: pip
 

From c1d7cc6701d33ee161d514ff61fe0e2017efee6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Feb 2020 12:30:03 -0500
Subject: [PATCH 7721/8469] Copy docs requirements to a separate file due to
 RTD constraints. Fixes #2001. Ref readthedocs/readthedocs.org#6662

---
 .readthedocs.yml      | 3 ++-
 docs/requirements.txt | 4 ++++
 setup.cfg             | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 7b994a3579..cb10a7f991 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -2,4 +2,5 @@ python:
   version: 3
   extra_requirements:
   - docs
-  pip_install: true
+  pip_install: false
+  requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 0000000000..6c35bf646e
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1,4 @@
+# keep these in sync with setup.cfg
+sphinx
+jaraco.packaging>=6.1
+rst.linker>=1.9
diff --git a/setup.cfg b/setup.cfg
index 8cca64774d..4ffb2f5e32 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -74,6 +74,7 @@ tests =
     pip>=19.1 # For proper file:// URLs support.
 
 docs =
+    # Keep these in sync with docs/requirements.txt
     sphinx
     jaraco.packaging>=6.1
     rst.linker>=1.9

From b3de7989665740cd4218d7d814e719d90e75de73 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 18 Jan 2020 08:13:23 -0800
Subject: [PATCH 7722/8469] Remove pkg_resources.py31compat.makedirs() in favor
 of the stdlib

As setuptools is now python 3.5+, this compatibility shim is no longer
necessary.
---
 changelog.d/1973.breaking.rst      |  1 +
 pkg_resources/__init__.py          |  3 +--
 pkg_resources/py31compat.py        | 23 -----------------------
 setuptools/build_meta.py           |  3 +--
 setuptools/command/easy_install.py |  4 ++--
 setuptools/sandbox.py              |  4 ++--
 setuptools/tests/files.py          |  5 +----
 setuptools/tests/test_manifest.py  |  3 +--
 8 files changed, 9 insertions(+), 37 deletions(-)
 create mode 100644 changelog.d/1973.breaking.rst
 delete mode 100644 pkg_resources/py31compat.py

diff --git a/changelog.d/1973.breaking.rst b/changelog.d/1973.breaking.rst
new file mode 100644
index 0000000000..398fdd710c
--- /dev/null
+++ b/changelog.d/1973.breaking.rst
@@ -0,0 +1 @@
+Removed ``pkg_resources.py31compat.makedirs`` in favor of the stdlib. Use ``os.makedirs()`` instead.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 75563f95df..149ab6d272 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -76,7 +76,6 @@
 except ImportError:
     importlib_machinery = None
 
-from . import py31compat
 from pkg_resources.extern import appdirs
 from pkg_resources.extern import packaging
 __import__('pkg_resources.extern.packaging.version')
@@ -3172,7 +3171,7 @@ def _find_adapter(registry, ob):
 def ensure_directory(path):
     """Ensure that the parent directory of `path` exists"""
     dirname = os.path.dirname(path)
-    py31compat.makedirs(dirname, exist_ok=True)
+    os.makedirs(dirname, exist_ok=True)
 
 
 def _bypass_ensure_directory(path):
diff --git a/pkg_resources/py31compat.py b/pkg_resources/py31compat.py
deleted file mode 100644
index a381c424f9..0000000000
--- a/pkg_resources/py31compat.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os
-import errno
-import sys
-
-from .extern import six
-
-
-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 = (
-    six.PY2 or
-    (3, 4) <= sys.version_info < (3, 4, 1)
-)
-makedirs = _makedirs_31 if needs_makedirs else os.makedirs
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index a1c951cf59..46266814ad 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -38,7 +38,6 @@
 from setuptools.py31compat import TemporaryDirectory
 
 from pkg_resources import parse_requirements
-from pkg_resources.py31compat import makedirs
 
 __all__ = ['get_requires_for_build_sdist',
            'get_requires_for_build_wheel',
@@ -190,7 +189,7 @@ def _build_with_temp_dir(self, setup_command, result_extension,
         result_directory = os.path.abspath(result_directory)
 
         # Build in a temporary directory, then copy to the target.
-        makedirs(result_directory, exist_ok=True)
+        os.makedirs(result_directory, exist_ok=True)
         with TemporaryDirectory(dir=result_directory) as tmp_dist_dir:
             sys.argv = (sys.argv[:1] + setup_command +
                         ['--dist-dir', tmp_dist_dir] +
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index abca1ae199..d224ea05e7 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -64,7 +64,7 @@
     Distribution, PathMetadata, EggMetadata, WorkingSet, DistributionNotFound,
     VersionConflict, DEVELOP_DIST,
 )
-import pkg_resources.py31compat
+import pkg_resources
 
 __metaclass__ = type
 
@@ -559,7 +559,7 @@ def check_pth_processing(self):
             if ok_exists:
                 os.unlink(ok_file)
             dirname = os.path.dirname(ok_file)
-            pkg_resources.py31compat.makedirs(dirname, exist_ok=True)
+            os.makedirs(dirname, exist_ok=True)
             f = open(pth_file, 'w')
         except (OSError, IOError):
             self.cant_write_to_target()
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e46dfc8d25..93ae8eb4d9 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -12,7 +12,7 @@
 from setuptools.extern import six
 from setuptools.extern.six.moves import builtins, map
 
-import pkg_resources.py31compat
+import pkg_resources
 from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
@@ -70,7 +70,7 @@ def override_temp(replacement):
     """
     Monkey-patch tempfile.tempdir with replacement, ensuring it exists
     """
-    pkg_resources.py31compat.makedirs(replacement, exist_ok=True)
+    os.makedirs(replacement, exist_ok=True)
 
     saved = tempfile.tempdir
 
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
index bad2189d45..71194b9de0 100644
--- a/setuptools/tests/files.py
+++ b/setuptools/tests/files.py
@@ -1,9 +1,6 @@
 import os
 
 
-import pkg_resources.py31compat
-
-
 def build_files(file_defs, prefix=""):
     """
     Build a set of files/directories, as described by the
@@ -30,7 +27,7 @@ def build_files(file_defs, prefix=""):
     for name, contents in file_defs.items():
         full_name = os.path.join(prefix, name)
         if isinstance(contents, dict):
-            pkg_resources.py31compat.makedirs(full_name, exist_ok=True)
+            os.makedirs(full_name, exist_ok=True)
             build_files(contents, prefix=full_name)
         else:
             if isinstance(contents, bytes):
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 2a0e9c8625..042a8b1742 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -10,7 +10,6 @@
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
-import pkg_resources.py31compat
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
 from setuptools.extern import six
@@ -364,7 +363,7 @@ def make_files(self, files):
         for file in files:
             file = os.path.join(self.temp_dir, file)
             dirname, basename = os.path.split(file)
-            pkg_resources.py31compat.makedirs(dirname, exist_ok=True)
+            os.makedirs(dirname, exist_ok=True)
             open(file, 'w').close()
 
     def test_process_template_line(self):

From abaa683c2140204b40051c80926c334ce4bba41c Mon Sep 17 00:00:00 2001
From: Ye-hyoung Kang <keepyourhonor@gmail.com>
Date: Mon, 2 Mar 2020 23:54:57 +0900
Subject: [PATCH 7723/8469] Fix broken link to Python docs

The broken link used to point to Python 2 docs (which has been moved).
Since Python 2 has reached its end-of-life, link to Python 3 docs instead.
---
 docs/setuptools.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index efcd0a8671..22e3c87252 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -941,7 +941,7 @@ python.org website.  If using the setuptools-specific ``include_package_data``
 argument, files specified by ``package_data`` will *not* be automatically
 added to the manifest unless they are listed in the MANIFEST.in file.)
 
-__ http://docs.python.org/dist/node11.html
+__ https://docs.python.org/3/distutils/setupscript.html#installing-package-data
 
 Sometimes, the ``include_package_data`` or ``package_data`` options alone
 aren't sufficient to precisely define what files you want included.  For

From 6a3729676d6aef85396d6fcf593a140e56ce32c7 Mon Sep 17 00:00:00 2001
From: Ye-hyoung Kang <keepyourhonor@gmail.com>
Date: Tue, 3 Mar 2020 00:05:19 +0900
Subject: [PATCH 7724/8469] Create 2011.doc.rst

Add news fragment
---
 changelog.d/2011.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2011.doc.rst

diff --git a/changelog.d/2011.doc.rst b/changelog.d/2011.doc.rst
new file mode 100644
index 0000000000..e36fb6a727
--- /dev/null
+++ b/changelog.d/2011.doc.rst
@@ -0,0 +1 @@
+Fix broken link to distutils docs on package_data

From d8d513d728552adee0677d5814eecc06d7775749 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Tue, 3 Mar 2020 00:04:11 +0000
Subject: [PATCH 7725/8469] bpo-38597: Never statically link extension
 initialization code on Windows (GH-18724)

---
 _msvccompiler.py           | 60 +++++---------------------------------
 tests/test_msvccompiler.py | 51 --------------------------------
 2 files changed, 7 insertions(+), 104 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index e8e4b717b9..03a5986d98 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -97,28 +97,11 @@ def _find_vc2017():
 }
 
 def _find_vcvarsall(plat_spec):
+    # bpo-38597: Removed vcruntime return value
     _, best_dir = _find_vc2017()
-    vcruntime = None
-
-    if plat_spec in PLAT_SPEC_TO_RUNTIME:
-        vcruntime_plat = PLAT_SPEC_TO_RUNTIME[plat_spec]
-    else:
-        vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
-
-    if best_dir:
-        vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
-            vcruntime_plat, "Microsoft.VC14*.CRT", "vcruntime140.dll")
-        try:
-            import glob
-            vcruntime = glob.glob(vcredist, recursive=True)[-1]
-        except (ImportError, OSError, LookupError):
-            vcruntime = None
 
     if not best_dir:
         best_version, best_dir = _find_vc2015()
-        if best_version:
-            vcruntime = os.path.join(best_dir, 'redist', vcruntime_plat,
-                "Microsoft.VC140.CRT", "vcruntime140.dll")
 
     if not best_dir:
         log.debug("No suitable Visual C++ version found")
@@ -129,11 +112,7 @@ def _find_vcvarsall(plat_spec):
         log.debug("%s cannot be found", vcvarsall)
         return None, None
 
-    if not vcruntime or not os.path.isfile(vcruntime):
-        log.debug("%s cannot be found", vcruntime)
-        vcruntime = None
-
-    return vcvarsall, vcruntime
+    return vcvarsall, None
 
 def _get_vc_env(plat_spec):
     if os.getenv("DISTUTILS_USE_SDK"):
@@ -142,7 +121,7 @@ def _get_vc_env(plat_spec):
             for key, value in os.environ.items()
         }
 
-    vcvarsall, vcruntime = _find_vcvarsall(plat_spec)
+    vcvarsall, _ = _find_vcvarsall(plat_spec)
     if not vcvarsall:
         raise DistutilsPlatformError("Unable to find vcvarsall.bat")
 
@@ -163,8 +142,6 @@ def _get_vc_env(plat_spec):
         if key and value
     }
 
-    if vcruntime:
-        env['py_vcruntime_redist'] = vcruntime
     return env
 
 def _find_exe(exe, paths=None):
@@ -194,12 +171,6 @@ def _find_exe(exe, paths=None):
     'win-arm64' : 'x86_arm64'
 }
 
-# A set containing the DLLs that are guaranteed to be available for
-# all micro versions of this Python version. Known extension
-# dependencies that are not in this set will be copied to the output
-# path.
-_BUNDLED_DLLS = frozenset(['vcruntime140.dll'])
-
 class MSVCCompiler(CCompiler) :
     """Concrete class that implements an interface to Microsoft Visual C++,
        as defined by the CCompiler abstract class."""
@@ -263,7 +234,6 @@ def initialize(self, plat_name=None):
         self.rc = _find_exe("rc.exe", paths)   # resource compiler
         self.mc = _find_exe("mc.exe", paths)   # message compiler
         self.mt = _find_exe("mt.exe", paths)   # message compiler
-        self._vcruntime_redist = vc_env.get('py_vcruntime_redist', '')
 
         for dir in vc_env.get('include', '').split(os.pathsep):
             if dir:
@@ -274,13 +244,12 @@ def initialize(self, plat_name=None):
                 self.add_library_dir(dir.rstrip(os.sep))
 
         self.preprocess_options = None
-        # If vcruntime_redist is available, link against it dynamically. Otherwise,
-        # use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
-        # later to dynamically link to ucrtbase but not vcruntime.
+        # bpo-38597: Always compile with dynamic linking
+        # Future releases of Python 3.x will include all past
+        # versions of vcruntime*.dll for compatibility.
         self.compile_options = [
-            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
+            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG', '/MD'
         ]
-        self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
 
         self.compile_options_debug = [
             '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
@@ -289,8 +258,6 @@ def initialize(self, plat_name=None):
         ldflags = [
             '/nologo', '/INCREMENTAL:NO', '/LTCG'
         ]
-        if not self._vcruntime_redist:
-            ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
 
         ldflags_debug = [
             '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
@@ -532,24 +499,11 @@ def link(self,
             try:
                 log.debug('Executing "%s" %s', self.linker, ' '.join(ld_args))
                 self.spawn([self.linker] + ld_args)
-                self._copy_vcruntime(output_dir)
             except DistutilsExecError as msg:
                 raise LinkError(msg)
         else:
             log.debug("skipping %s (up-to-date)", output_filename)
 
-    def _copy_vcruntime(self, output_dir):
-        vcruntime = self._vcruntime_redist
-        if not vcruntime or not os.path.isfile(vcruntime):
-            return
-
-        if os.path.basename(vcruntime).lower() in _BUNDLED_DLLS:
-            return
-
-        log.debug('Copying "%s"', vcruntime)
-        vcruntime = shutil.copy(vcruntime, output_dir)
-        os.chmod(vcruntime, stat.S_IWRITE)
-
     def spawn(self, cmd):
         old_path = os.getenv('path')
         try:
diff --git a/tests/test_msvccompiler.py b/tests/test_msvccompiler.py
index 70a9c93a4e..b518d6a78b 100644
--- a/tests/test_msvccompiler.py
+++ b/tests/test_msvccompiler.py
@@ -32,57 +32,6 @@ def _find_vcvarsall(plat_spec):
         finally:
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
-    def test_compiler_options(self):
-        import distutils._msvccompiler as _msvccompiler
-        # suppress path to vcruntime from _find_vcvarsall to
-        # check that /MT is added to compile options
-        old_find_vcvarsall = _msvccompiler._find_vcvarsall
-        def _find_vcvarsall(plat_spec):
-            return old_find_vcvarsall(plat_spec)[0], None
-        _msvccompiler._find_vcvarsall = _find_vcvarsall
-        try:
-            compiler = _msvccompiler.MSVCCompiler()
-            compiler.initialize()
-
-            self.assertIn('/MT', compiler.compile_options)
-            self.assertNotIn('/MD', compiler.compile_options)
-        finally:
-            _msvccompiler._find_vcvarsall = old_find_vcvarsall
-
-    def test_vcruntime_copy(self):
-        import distutils._msvccompiler as _msvccompiler
-        # force path to a known file - it doesn't matter
-        # what we copy as long as its name is not in
-        # _msvccompiler._BUNDLED_DLLS
-        old_find_vcvarsall = _msvccompiler._find_vcvarsall
-        def _find_vcvarsall(plat_spec):
-            return old_find_vcvarsall(plat_spec)[0], __file__
-        _msvccompiler._find_vcvarsall = _find_vcvarsall
-        try:
-            tempdir = self.mkdtemp()
-            compiler = _msvccompiler.MSVCCompiler()
-            compiler.initialize()
-            compiler._copy_vcruntime(tempdir)
-
-            self.assertTrue(os.path.isfile(os.path.join(
-                tempdir, os.path.basename(__file__))))
-        finally:
-            _msvccompiler._find_vcvarsall = old_find_vcvarsall
-
-    def test_vcruntime_skip_copy(self):
-        import distutils._msvccompiler as _msvccompiler
-
-        tempdir = self.mkdtemp()
-        compiler = _msvccompiler.MSVCCompiler()
-        compiler.initialize()
-        dll = compiler._vcruntime_redist
-        self.assertTrue(os.path.isfile(dll), dll or "<None>")
-
-        compiler._copy_vcruntime(tempdir)
-
-        self.assertFalse(os.path.isfile(os.path.join(
-            tempdir, os.path.basename(dll))), dll or "<None>")
-
     def test_get_vc_env_unicode(self):
         import distutils._msvccompiler as _msvccompiler
 

From c6f749b2b761da2b88cac62d8c6aa29f7276e3a7 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 4 Mar 2020 14:50:19 +0100
Subject: [PATCH 7726/8469] bpo-39763: distutils.spawn now uses subprocess
 (GH-18743)

Reimplement distutils.spawn.spawn() function with the subprocess
module.

setup.py now uses a basic implementation of the subprocess module if
the subprocess module is not available: before required C extension
modules are built.
---
 spawn.py            | 128 ++++++++------------------------------------
 tests/test_spawn.py |  11 ----
 2 files changed, 22 insertions(+), 117 deletions(-)

diff --git a/spawn.py b/spawn.py
index ceb94945dc..aad277b0ca 100644
--- a/spawn.py
+++ b/spawn.py
@@ -8,11 +8,18 @@
 
 import sys
 import os
+import subprocess
 
 from distutils.errors import DistutilsPlatformError, DistutilsExecError
 from distutils.debug import DEBUG
 from distutils import log
 
+
+if sys.platform == 'darwin':
+    _cfg_target = None
+    _cfg_target_split = None
+
+
 def spawn(cmd, search_path=1, verbose=0, dry_run=0):
     """Run another program, specified as a command list 'cmd', in a new process.
 
@@ -32,64 +39,16 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
     # cmd is documented as a list, but just in case some code passes a tuple
     # in, protect our %-formatting code against horrible death
     cmd = list(cmd)
-    if os.name == 'posix':
-        _spawn_posix(cmd, search_path, dry_run=dry_run)
-    elif os.name == 'nt':
-        _spawn_nt(cmd, search_path, dry_run=dry_run)
-    else:
-        raise DistutilsPlatformError(
-              "don't know how to spawn programs on platform '%s'" % os.name)
-
-def _nt_quote_args(args):
-    """Quote command-line arguments for DOS/Windows conventions.
-
-    Just wraps every argument which contains blanks in double quotes, and
-    returns a new argument list.
-    """
-    # XXX this doesn't seem very robust to me -- but if the Windows guys
-    # say it'll work, I guess I'll have to accept it.  (What if an arg
-    # contains quotes?  What other magic characters, other than spaces,
-    # have to be escaped?  Is there an escaping mechanism other than
-    # quoting?)
-    for i, arg in enumerate(args):
-        if ' ' in arg:
-            args[i] = '"%s"' % arg
-    return args
-
-def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
-    executable = cmd[0]
-    cmd = _nt_quote_args(cmd)
-    if search_path:
-        # either we find one or it stays the same
-        executable = find_executable(executable) or executable
-    log.info(' '.join([executable] + cmd[1:]))
-    if not dry_run:
-        # spawn for NT requires a full path to the .exe
-        try:
-            rc = os.spawnv(os.P_WAIT, executable, cmd)
-        except OSError as exc:
-            # this seems to happen when the command isn't found
-            if not DEBUG:
-                cmd = executable
-            raise DistutilsExecError(
-                  "command %r failed: %s" % (cmd, exc.args[-1]))
-        if rc != 0:
-            # and this reflects the command running but failing
-            if not DEBUG:
-                cmd = executable
-            raise DistutilsExecError(
-                  "command %r failed with exit status %d" % (cmd, rc))
-
-if sys.platform == 'darwin':
-    _cfg_target = None
-    _cfg_target_split = None
 
-def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
     log.info(' '.join(cmd))
     if dry_run:
         return
-    executable = cmd[0]
-    exec_fn = search_path and os.execvp or os.execv
+
+    if search_path:
+        executable = find_executable(cmd[0])
+        if executable is not None:
+            cmd[0] = executable
+
     env = None
     if sys.platform == 'darwin':
         global _cfg_target, _cfg_target_split
@@ -111,60 +70,17 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
                 raise DistutilsPlatformError(my_msg)
             env = dict(os.environ,
                        MACOSX_DEPLOYMENT_TARGET=cur_target)
-            exec_fn = search_path and os.execvpe or os.execve
-    pid = os.fork()
-    if pid == 0: # in the child
-        try:
-            if env is None:
-                exec_fn(executable, cmd)
-            else:
-                exec_fn(executable, cmd, env)
-        except OSError as e:
-            if not DEBUG:
-                cmd = executable
-            sys.stderr.write("unable to execute %r: %s\n"
-                             % (cmd, e.strerror))
-            os._exit(1)
 
+    proc = subprocess.Popen(cmd, env=env)
+    proc.wait()
+    exitcode = proc.returncode
+
+    if exitcode:
         if not DEBUG:
-            cmd = executable
-        sys.stderr.write("unable to execute %r for unknown reasons" % cmd)
-        os._exit(1)
-    else: # in the parent
-        # Loop until the child either exits or is terminated by a signal
-        # (ie. keep waiting if it's merely stopped)
-        while True:
-            try:
-                pid, status = os.waitpid(pid, 0)
-            except OSError as exc:
-                if not DEBUG:
-                    cmd = executable
-                raise DistutilsExecError(
-                      "command %r failed: %s" % (cmd, exc.args[-1]))
-            if os.WIFSIGNALED(status):
-                if not DEBUG:
-                    cmd = executable
-                raise DistutilsExecError(
-                      "command %r terminated by signal %d"
-                      % (cmd, os.WTERMSIG(status)))
-            elif os.WIFEXITED(status):
-                exit_status = os.WEXITSTATUS(status)
-                if exit_status == 0:
-                    return   # hey, it succeeded!
-                else:
-                    if not DEBUG:
-                        cmd = executable
-                    raise DistutilsExecError(
-                          "command %r failed with exit status %d"
-                          % (cmd, exit_status))
-            elif os.WIFSTOPPED(status):
-                continue
-            else:
-                if not DEBUG:
-                    cmd = executable
-                raise DistutilsExecError(
-                      "unknown error executing %r: termination status %d"
-                      % (cmd, status))
+            cmd = cmd[0]
+        raise DistutilsExecError(
+              "command %r failed with exit code %s" % (cmd, exitcode))
+
 
 def find_executable(executable, path=None):
     """Tries to find 'executable' in the directories listed in 'path'.
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index f9ae69ef86..73b0f5cb73 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -8,7 +8,6 @@
 from test import support as test_support
 
 from distutils.spawn import find_executable
-from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn
 from distutils.errors import DistutilsExecError
 from distutils.tests import support
@@ -17,16 +16,6 @@ class SpawnTestCase(support.TempdirManager,
                     support.LoggingSilencer,
                     unittest.TestCase):
 
-    def test_nt_quote_args(self):
-
-        for (args, wanted) in ((['with space', 'nospace'],
-                                ['"with space"', 'nospace']),
-                               (['nochange', 'nospace'],
-                                ['nochange', 'nospace'])):
-            res = _nt_quote_args(args)
-            self.assertEqual(res, wanted)
-
-
     @unittest.skipUnless(os.name in ('nt', 'posix'),
                          'Runs only under posix or nt')
     def test_spawn(self):

From 65fa92095484eb14b994574650809fca7cae2d2e Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Mon, 11 Nov 2019 12:00:16 +0100
Subject: [PATCH 7727/8469] Use CPython 3.8.0 mechanism to find msvc 14+

---
 appveyor.yml                    |   9 ++
 changelog.d/1904.change.rst     |   1 +
 setuptools/msvc.py              | 159 ++++++++++++++++++++++++++++++--
 setuptools/tests/test_msvc14.py |  84 +++++++++++++++++
 tox.ini                         |   2 +-
 5 files changed, 246 insertions(+), 9 deletions(-)
 create mode 100644 changelog.d/1904.change.rst
 create mode 100644 setuptools/tests/test_msvc14.py

diff --git a/appveyor.yml b/appveyor.yml
index f7ab22f6af..de4e6c66c6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,6 +7,15 @@ environment:
   CODECOV_ENV: APPVEYOR_JOB_NAME
 
   matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      APPVEYOR_JOB_NAME: "python35-x64-vs2015"
+      PYTHON: "C:\\Python35-x64"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      APPVEYOR_JOB_NAME: "python35-x64-vs2017"
+      PYTHON: "C:\\Python35-x64"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      APPVEYOR_JOB_NAME: "python35-x64-vs2019"
+      PYTHON: "C:\\Python35-x64"
     - APPVEYOR_JOB_NAME: "python36-x64"
       PYTHON: "C:\\Python36-x64"
     - APPVEYOR_JOB_NAME: "python37-x64"
diff --git a/changelog.d/1904.change.rst b/changelog.d/1904.change.rst
new file mode 100644
index 0000000000..fa4bbfd91f
--- /dev/null
+++ b/changelog.d/1904.change.rst
@@ -0,0 +1 @@
+Update msvc.py to use CPython 3.8.0 mechanism to find msvc 14+
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index c2cbd1e543..213e39c9d5 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -26,6 +26,7 @@
 import sys
 import platform
 import itertools
+import subprocess
 import distutils.errors
 from setuptools.extern.packaging.version import LegacyVersion
 
@@ -142,6 +143,154 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
         raise
 
 
+def _msvc14_find_vc2015():
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    try:
+        key = winreg.OpenKey(
+            winreg.HKEY_LOCAL_MACHINE,
+            r"Software\Microsoft\VisualStudio\SxS\VC7",
+            0,
+            winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+        )
+    except OSError:
+        return None, None
+
+    best_version = 0
+    best_dir = None
+    with key:
+        for i in itertools.count():
+            try:
+                v, vc_dir, vt = winreg.EnumValue(key, i)
+            except OSError:
+                break
+            if v and vt == winreg.REG_SZ and isdir(vc_dir):
+                try:
+                    version = int(float(v))
+                except (ValueError, TypeError):
+                    continue
+                if version >= 14 and version > best_version:
+                    best_version, best_dir = version, vc_dir
+    return best_version, best_dir
+
+
+def _msvc14_find_vc2017():
+    """Python 3.8 "distutils/_msvccompiler.py" backport
+
+    Returns "15, path" based on the result of invoking vswhere.exe
+    If no install is found, returns "None, None"
+
+    The version is returned to avoid unnecessarily changing the function
+    result. It may be ignored when the path is not None.
+
+    If vswhere.exe is not available, by definition, VS 2017 is not
+    installed.
+    """
+    root = environ.get("ProgramFiles(x86)") or environ.get("ProgramFiles")
+    if not root:
+        return None, None
+
+    try:
+        path = subprocess.check_output([
+            join(root, "Microsoft Visual Studio", "Installer", "vswhere.exe"),
+            "-latest",
+            "-prerelease",
+            "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+            "-property", "installationPath",
+            "-products", "*",
+        ]).decode(encoding="mbcs", errors="strict").strip()
+    except (subprocess.CalledProcessError, OSError, UnicodeDecodeError):
+        return None, None
+
+    path = join(path, "VC", "Auxiliary", "Build")
+    if isdir(path):
+        return 15, path
+
+    return None, None
+
+
+PLAT_SPEC_TO_RUNTIME = {
+    'x86': 'x86',
+    'x86_amd64': 'x64',
+    'x86_arm': 'arm',
+    'x86_arm64': 'arm64'
+}
+
+
+def _msvc14_find_vcvarsall(plat_spec):
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    _, best_dir = _msvc14_find_vc2017()
+    vcruntime = None
+
+    if plat_spec in PLAT_SPEC_TO_RUNTIME:
+        vcruntime_plat = PLAT_SPEC_TO_RUNTIME[plat_spec]
+    else:
+        vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
+
+    if best_dir:
+        vcredist = join(best_dir, "..", "..", "redist", "MSVC", "**",
+                        vcruntime_plat, "Microsoft.VC14*.CRT",
+                        "vcruntime140.dll")
+        try:
+            import glob
+            vcruntime = glob.glob(vcredist, recursive=True)[-1]
+        except (ImportError, OSError, LookupError):
+            vcruntime = None
+
+    if not best_dir:
+        best_version, best_dir = _msvc14_find_vc2015()
+        if best_version:
+            vcruntime = join(best_dir, 'redist', vcruntime_plat,
+                             "Microsoft.VC140.CRT", "vcruntime140.dll")
+
+    if not best_dir:
+        return None, None
+
+    vcvarsall = join(best_dir, "vcvarsall.bat")
+    if not isfile(vcvarsall):
+        return None, None
+
+    if not vcruntime or not isfile(vcruntime):
+        vcruntime = None
+
+    return vcvarsall, vcruntime
+
+
+def _msvc14_get_vc_env(plat_spec):
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    if "DISTUTILS_USE_SDK" in environ:
+        return {
+            key.lower(): value
+            for key, value in environ.items()
+        }
+
+    vcvarsall, vcruntime = _msvc14_find_vcvarsall(plat_spec)
+    if not vcvarsall:
+        raise distutils.errors.DistutilsPlatformError(
+            "Unable to find vcvarsall.bat"
+        )
+
+    try:
+        out = subprocess.check_output(
+            'cmd /u /c "{}" {} && set'.format(vcvarsall, plat_spec),
+            stderr=subprocess.STDOUT,
+        ).decode('utf-16le', errors='replace')
+    except subprocess.CalledProcessError as exc:
+        raise distutils.errors.DistutilsPlatformError(
+            "Error executing {}".format(exc.cmd)
+        )
+
+    env = {
+        key.lower(): value
+        for key, _, value in
+        (line.partition('=') for line in out.splitlines())
+        if key and value
+    }
+
+    if vcruntime:
+        env['py_vcruntime_redist'] = vcruntime
+    return env
+
+
 def msvc14_get_vc_env(plat_spec):
     """
     Patched "distutils._msvccompiler._get_vc_env" for support extra
@@ -159,16 +308,10 @@ def msvc14_get_vc_env(plat_spec):
     dict
         environment
     """
-    # Try to get environment from vcvarsall.bat (Classical way)
-    try:
-        return get_unpatched(msvc14_get_vc_env)(plat_spec)
-    except distutils.errors.DistutilsPlatformError:
-        # Pass error Vcvarsall.bat is missing
-        pass
 
-    # If error, try to set environment directly
+    # Always use backport from CPython 3.8
     try:
-        return EnvironmentInfo(plat_spec, vc_min_ver=14.0).return_env()
+        return _msvc14_get_vc_env(plat_spec)
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, 14.0)
         raise
diff --git a/setuptools/tests/test_msvc14.py b/setuptools/tests/test_msvc14.py
new file mode 100644
index 0000000000..7833aab47b
--- /dev/null
+++ b/setuptools/tests/test_msvc14.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+"""
+Tests for msvc support module (msvc14 unit tests).
+"""
+
+import os
+from distutils.errors import DistutilsPlatformError
+import pytest
+import sys
+
+
+@pytest.mark.skipif(sys.platform != "win32",
+                    reason="These tests are only for win32")
+class TestMSVC14:
+    """Python 3.8 "distutils/tests/test_msvccompiler.py" backport"""
+    def test_no_compiler(self):
+        import setuptools.msvc as _msvccompiler
+        # makes sure query_vcvarsall raises
+        # a DistutilsPlatformError if the compiler
+        # is not found
+
+        def _find_vcvarsall(plat_spec):
+            return None, None
+
+        old_find_vcvarsall = _msvccompiler._msvc14_find_vcvarsall
+        _msvccompiler._msvc14_find_vcvarsall = _find_vcvarsall
+        try:
+            pytest.raises(DistutilsPlatformError,
+                          _msvccompiler._msvc14_get_vc_env,
+                          'wont find this version')
+        finally:
+            _msvccompiler._msvc14_find_vcvarsall = old_find_vcvarsall
+
+    @pytest.mark.skipif(sys.version_info[0] < 3,
+                        reason="Unicode requires encode/decode on Python 2")
+    def test_get_vc_env_unicode(self):
+        import setuptools.msvc as _msvccompiler
+
+        test_var = 'ṰḖṤṪ┅ṼẨṜ'
+        test_value = '₃�₅'
+
+        # Ensure we don't early exit from _get_vc_env
+        old_distutils_use_sdk = os.environ.pop('DISTUTILS_USE_SDK', None)
+        os.environ[test_var] = test_value
+        try:
+            env = _msvccompiler._msvc14_get_vc_env('x86')
+            assert test_var.lower() in env
+            assert test_value == env[test_var.lower()]
+        finally:
+            os.environ.pop(test_var)
+            if old_distutils_use_sdk:
+                os.environ['DISTUTILS_USE_SDK'] = old_distutils_use_sdk
+
+    def test_get_vc2017(self):
+        import setuptools.msvc as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2017
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._msvc14_find_vc2017()
+        if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') in [
+            'Visual Studio 2017'
+        ]:
+            assert version
+        if version:
+            assert version >= 15
+            assert os.path.isdir(path)
+        else:
+            pytest.skip("VS 2017 is not installed")
+
+    def test_get_vc2015(self):
+        import setuptools.msvc as _msvccompiler
+
+        # This function cannot be mocked, so pass it if we find VS 2015
+        # and mark it skipped if we do not.
+        version, path = _msvccompiler._msvc14_find_vc2015()
+        if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') in [
+            'Visual Studio 2015', 'Visual Studio 2017'
+        ]:
+            assert version
+        if version:
+            assert version >= 14
+            assert os.path.isdir(path)
+        else:
+            pytest.skip("VS 2015 is not installed")
diff --git a/tox.ini b/tox.ini
index 959d7dadb5..1ebb922b5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
-passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
+passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
 commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
 usedevelop=True
 extras =

From dbbc6bba1c00ff193cea59a7eadee639d6ac3a11 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Mar 2020 14:55:12 -0500
Subject: [PATCH 7728/8469] =?UTF-8?q?Bump=20version:=2045.2.0=20=E2=86=92?=
 =?UTF-8?q?=2045.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 7 +++++++
 changelog.d/1557.change.rst | 1 -
 changelog.d/1904.change.rst | 1 -
 setup.cfg                   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1557.change.rst
 delete mode 100644 changelog.d/1904.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8e86f31f09..c438b5a813 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 45.2.0
+current_version = 45.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index f97f514208..e35c447253 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v45.3.0
+-------
+
+* #1557: Deprecated eggsecutable scripts and updated docs.
+* #1904: Update msvc.py to use CPython 3.8.0 mechanism to find msvc 14+
+
+
 v45.2.0
 -------
 
diff --git a/changelog.d/1557.change.rst b/changelog.d/1557.change.rst
deleted file mode 100644
index 9f8af4a6cc..0000000000
--- a/changelog.d/1557.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated eggsecutable scripts and updated docs.
diff --git a/changelog.d/1904.change.rst b/changelog.d/1904.change.rst
deleted file mode 100644
index fa4bbfd91f..0000000000
--- a/changelog.d/1904.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update msvc.py to use CPython 3.8.0 mechanism to find msvc 14+
diff --git a/setup.cfg b/setup.cfg
index 4ffb2f5e32..2e65b7a188 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 45.2.0
+version = 45.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From c5958f26680b8bfad10d0ec03a613725c9a4c580 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Mar 2020 16:50:40 -0500
Subject: [PATCH 7729/8469] Also remove mysterious hack from
 pkg_resources.extern

---
 pkg_resources/extern/__init__.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index c1eb9e998f..bf98d8f296 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -43,13 +43,6 @@ def load_module(self, fullname):
                 __import__(extant)
                 mod = sys.modules[extant]
                 sys.modules[fullname] = mod
-                # mysterious hack:
-                # Remove the reference to the extant package/module
-                # on later Python versions to cause relative imports
-                # in the vendor package to resolve the same modules
-                # as those going through this importer.
-                if prefix and sys.version_info > (3, 3):
-                    del sys.modules[extant]
                 return mod
             except ImportError:
                 pass

From a8f61a435ebc10638889b4be086254e525314bb2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Mar 2020 17:05:59 -0500
Subject: [PATCH 7730/8469] Try building docs with python3. Ref #1992.

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index ec21e7be93..aa84fe0049 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,4 +2,4 @@
 
 [build]
     publish = "docs/build/html"
-    command = "pip install tox && tox -e docs"
+    command = "python3 -m pip install tox && tox -e docs"

From 35cdda926151d52963baf32e0770f2d5f16e5dfd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Mar 2020 17:23:01 -0500
Subject: [PATCH 7731/8469] Reword UserWarning for insecure extraction path so
 that the message can be keyed for ignoring it. Ref #1899.

---
 pkg_resources/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 75563f95df..88d4bdcaed 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1235,12 +1235,13 @@ def _warn_unsafe_extraction_path(path):
         mode = os.stat(path).st_mode
         if mode & stat.S_IWOTH or mode & stat.S_IWGRP:
             msg = (
-                "%s is writable by group/others and vulnerable to attack "
-                "when "
-                "used with get_resource_filename. Consider a more secure "
+                "Extraction path is writable by group/others "
+                "and vulnerable to attack when "
+                "used with get_resource_filename ({path}). "
+                "Consider a more secure "
                 "location (set with .set_extraction_path or the "
-                "PYTHON_EGG_CACHE environment variable)." % path
-            )
+                "PYTHON_EGG_CACHE environment variable)."
+            ).format(**locals())
             warnings.warn(msg, UserWarning)
 
     def postprocess(self, tempname, filename):

From e63e131686be6bae3249a67958bdb2ef5abd1622 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 7 Mar 2020 17:25:23 -0500
Subject: [PATCH 7732/8469] Suppress UserWarning in pkg_resources.

---
 pytest.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 4cd94d5a73..517fe3ce89 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -7,3 +7,5 @@ filterwarnings =
     error
     # https://github.com/pypa/setuptools/issues/1823
     ignore:bdist_wininst command is deprecated
+    # Suppress this error; unimportant for CI tests
+    ignore:Extraction path is writable by group/others:UserWarning

From 8344ec66ee148ec841311f865c65b4129644e454 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 09:50:36 -0400
Subject: [PATCH 7733/8469] Try installing pip

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index aa84fe0049..5fffee445e 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,4 +2,4 @@
 
 [build]
     publish = "docs/build/html"
-    command = "python3 -m pip install tox && tox -e docs"
+    command = "(wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install tox && tox -e docs"

From 098562e1fd63835d92883d02331e11165df92d13 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 10:55:09 -0400
Subject: [PATCH 7734/8469] Use pep517 to avoid bb://pypa/distlib#136.

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index 5fffee445e..d08df89edc 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,4 +2,4 @@
 
 [build]
     publish = "docs/build/html"
-    command = "(wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install tox && tox -e docs"
+    command = "(wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install --use-pep517 tox && tox -e docs"

From b5b3b2e8af0535361543d0307bf24b97b2699ba3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 12:03:56 -0400
Subject: [PATCH 7735/8469] Emit the Python version

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index d08df89edc..77bd5b50a5 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,4 +2,4 @@
 
 [build]
     publish = "docs/build/html"
-    command = "(wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install --use-pep517 tox && tox -e docs"
+    command = "python3 -V && (wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install --use-pep517 tox && tox -e docs"

From 7aebb4624ddc29869b41ce0a21530b4398e8877e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 13:04:49 -0400
Subject: [PATCH 7736/8469] Add a file 'runtime.txt' to let Netlify know to use
 that env. Fixes #1992.

---
 netlify.toml | 2 +-
 runtime.txt  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 runtime.txt

diff --git a/netlify.toml b/netlify.toml
index 77bd5b50a5..ec21e7be93 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -2,4 +2,4 @@
 
 [build]
     publish = "docs/build/html"
-    command = "python3 -V && (wget https://bootstrap.pypa.io/get-pip.py -O - | python3) && python3 -m pip install --use-pep517 tox && tox -e docs"
+    command = "pip install tox && tox -e docs"
diff --git a/runtime.txt b/runtime.txt
new file mode 100644
index 0000000000..475ba515c0
--- /dev/null
+++ b/runtime.txt
@@ -0,0 +1 @@
+3.7

From 432baadc434e75f4ea5da9ff4c3546006e226c44 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 13:11:51 -0400
Subject: [PATCH 7737/8469] Docs land in build/html

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index ec21e7be93..145ab020e5 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,5 +1,5 @@
 # Configuration for pull request documentation previews via Netlify
 
 [build]
-    publish = "docs/build/html"
+    publish = "build/html"
     command = "pip install tox && tox -e docs"

From a8942b4a29799d15b6f0feb6656118fc6b9ce43b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 13:19:37 -0400
Subject: [PATCH 7738/8469] Add a note about runtime.txt

---
 netlify.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netlify.toml b/netlify.toml
index 145ab020e5..5828132edd 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,5 +1,7 @@
 # Configuration for pull request documentation previews via Netlify
 
+# Netlify relies on there being a ./runtime.txt to indicate Python 3.
+
 [build]
     publish = "build/html"
     command = "pip install tox && tox -e docs"

From dd250ca952bb3f109086eca3353b65a92fbcbf4d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 13:49:03 -0400
Subject: [PATCH 7739/8469] Suppress RuntimeWarning from sandbox module on
 Python 2

---
 pytest.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 517fe3ce89..0d1824e47b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -9,3 +9,7 @@ filterwarnings =
     ignore:bdist_wininst command is deprecated
     # Suppress this error; unimportant for CI tests
     ignore:Extraction path is writable by group/others:UserWarning
+    # Suppress Python 2 deprecation warning
+    ignore:Setuptools will stop working on Python 2:UserWarning
+    # Suppress weird RuntimeWarning.
+    ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning

From 47ca64bc1138960d7f6d8f0161ed2d74a3670ee4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 13:57:19 -0400
Subject: [PATCH 7740/8469] Suppress Windows bytes API warning until it can be
 fixed. Ref #2016.

---
 pytest.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 0d1824e47b..0c2c8a17a4 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -13,3 +13,5 @@ filterwarnings =
     ignore:Setuptools will stop working on Python 2:UserWarning
     # Suppress weird RuntimeWarning.
     ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
+    # Suppress use of bytes for filenames on Windows until fixed #2016
+    ignore:The Windows bytes API has been deprecated:DeprecationWarning

From 46430d4f340da778a86d92727bbd608c16d63ec0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 14:08:35 -0400
Subject: [PATCH 7741/8469] Suppress another warning

---
 pytest.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 0c2c8a17a4..a0d6dea6d2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -15,3 +15,5 @@ filterwarnings =
     ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
     # Suppress use of bytes for filenames on Windows until fixed #2016
     ignore:The Windows bytes API has been deprecated:DeprecationWarning
+    # Suppress another Python 2 UnicodeWarning
+    ignore:Unicode equal comparison failed to convert:UnicodeWarning

From d8e103d12af18bb8100952b4bc08eeed491b97c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 14:28:59 -0400
Subject: [PATCH 7742/8469] Get both UnicodeWarnings

---
 pytest.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index a0d6dea6d2..af61043fb2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -15,5 +15,6 @@ filterwarnings =
     ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
     # Suppress use of bytes for filenames on Windows until fixed #2016
     ignore:The Windows bytes API has been deprecated:DeprecationWarning
-    # Suppress another Python 2 UnicodeWarning
+    # Suppress other Python 2 UnicodeWarnings
     ignore:Unicode equal comparison failed to convert:UnicodeWarning
+    ignore:Unicode unequal comparison failed to convert:UnicodeWarning

From 50f3575da42ce5b7c013c28ff623ce16c231455d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 15:53:33 -0400
Subject: [PATCH 7743/8469] =?UTF-8?q?Bump=20version:=2045.3.0=20=E2=86=92?=
 =?UTF-8?q?=2046.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 10 ++++++++++
 changelog.d/1890.change.rst |  1 -
 changelog.d/1899.change.rst |  1 -
 changelog.d/1991.misc.rst   |  1 -
 changelog.d/2011.doc.rst    |  1 -
 changelog.d/65.breaking.rst |  1 -
 setup.cfg                   |  2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/1890.change.rst
 delete mode 100644 changelog.d/1899.change.rst
 delete mode 100644 changelog.d/1991.misc.rst
 delete mode 100644 changelog.d/2011.doc.rst
 delete mode 100644 changelog.d/65.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c438b5a813..5fabdff0eb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 45.3.0
+current_version = 46.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index e35c447253..93c1f890ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v46.0.0
+-------
+
+* #65: Once again as in 3.0, removed the Features feature.
+* #1890: Fix vendored dependencies so importing ``setuptools.extern.some_module`` gives the same object as ``setuptools._vendor.some_module``. This makes Metadata picklable again.
+* #1899: Test suite now fails on warnings.
+* #2011: Fix broken link to distutils docs on package_data
+* #1991: Include pkg_resources test data in sdist, so tests can be executed from it.
+
+
 v45.3.0
 -------
 
diff --git a/changelog.d/1890.change.rst b/changelog.d/1890.change.rst
deleted file mode 100644
index 458d8117ec..0000000000
--- a/changelog.d/1890.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix vendored dependencies so importing ``setuptools.extern.some_module`` gives the same object as ``setuptools._vendor.some_module``. This makes Metadata picklable again.
\ No newline at end of file
diff --git a/changelog.d/1899.change.rst b/changelog.d/1899.change.rst
deleted file mode 100644
index 3076843956..0000000000
--- a/changelog.d/1899.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Test suite now fails on warnings.
diff --git a/changelog.d/1991.misc.rst b/changelog.d/1991.misc.rst
deleted file mode 100644
index ac6904a242..0000000000
--- a/changelog.d/1991.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Include pkg_resources test data in sdist, so tests can be executed from it.
diff --git a/changelog.d/2011.doc.rst b/changelog.d/2011.doc.rst
deleted file mode 100644
index e36fb6a727..0000000000
--- a/changelog.d/2011.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken link to distutils docs on package_data
diff --git a/changelog.d/65.breaking.rst b/changelog.d/65.breaking.rst
deleted file mode 100644
index bde427402f..0000000000
--- a/changelog.d/65.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Once again as in 3.0, removed the Features feature.
diff --git a/setup.cfg b/setup.cfg
index 2e65b7a188..d231a3e11e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 45.3.0
+version = 46.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From b13dcdee2f2ed9affdf9f52700710789f5a04803 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 16:37:43 -0400
Subject: [PATCH 7744/8469] Replace playbook with code for finalizing a
 release.

---
 docs/releases.txt | 40 ++++++--------------------------
 tools/finalize.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 tox.ini           |  7 ++++++
 3 files changed, 73 insertions(+), 33 deletions(-)
 create mode 100644 tools/finalize.py

diff --git a/docs/releases.txt b/docs/releases.txt
index 98ba39e88d..35b415c265 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -3,39 +3,13 @@ Release Process
 ===============
 
 In order to allow for rapid, predictable releases, Setuptools uses a
-mechanical technique for releases, enacted by Travis following a
-successful build of a tagged release per
-`PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
-
-Prior to cutting a release, please use `towncrier`_ to update
-``CHANGES.rst`` to summarize the changes since the last release.
-To update the changelog:
-
-1. Install towncrier via ``pip install towncrier`` if not already installed.
-2. Preview the new ``CHANGES.rst`` entry by running
-   ``towncrier --draft --version {new.version.number}`` (enter the desired
-   version number for the next release).  If any changes are needed, make
-   them and generate a new preview until the output is acceptable.  Run
-   ``git add`` for any modified files.
-3. Run ``towncrier --version {new.version.number}`` to stage the changelog
-   updates in git.
-4. Verify that there are no remaining ``changelog.d/*.rst`` files.  If a
-   file was named incorrectly, it may be ignored by towncrier.
-5. Review the updated ``CHANGES.rst`` file.  If any changes are needed,
-   make the edits and stage them via ``git add CHANGES.rst``.
-
-Once the changelog edits are staged and ready to commit, cut a release by
-installing and running ``bump2version --allow-dirty {part}`` where ``part``
-is major, minor, or patch based on the scope of the changes in the
-release. Then, push the commits to the master branch::
-
-    $ git push origin master
-    $ git push --tags
-
-If tests pass, the release will be uploaded to PyPI (from the Python 3.6
-tests).
-
-.. _towncrier: https://pypi.org/project/towncrier/
+mechanical technique for releases, enacted on tagged commits by
+continuous integration.
+
+To finalize a release, run ``tox -e finalize``, review, then push
+the changes.
+
+If tests pass, the release will be uploaded to PyPI.
 
 Release Frequency
 -----------------
diff --git a/tools/finalize.py b/tools/finalize.py
new file mode 100644
index 0000000000..3b66341a80
--- /dev/null
+++ b/tools/finalize.py
@@ -0,0 +1,59 @@
+"""
+Finalize the repo for a release. Invokes towncrier and bumpversion.
+"""
+
+__requires__ = ['bump2version', 'towncrier']
+
+
+import subprocess
+import pathlib
+import re
+import sys
+
+
+def release_kind():
+    """
+    Determine which release to make based on the files in the
+    changelog.
+    """
+    # use min here as 'major' < 'minor' < 'patch'
+    return min(
+        'major' if 'breaking' in file.name else
+        'minor' if 'change' in file.name else
+        'patch'
+        for file in pathlib.Path('changelog.d').iterdir()
+    )
+
+
+bump_version_command = [
+    sys.executable,
+    '-m', 'bumpversion',
+    release_kind(),
+]
+
+
+def get_version():
+    cmd = bump_version_command + ['--dry-run', '--verbose']
+    out = subprocess.check_output(cmd, text=True)
+    return re.search('^new_version=(.*)', out, re.MULTILINE).group(1)
+
+
+def update_changelog():
+    cmd = [
+        sys.executable, '-m',
+        'towncrier',
+        '--version', get_version(),
+        '--yes',
+    ]
+    subprocess.check_call(cmd)
+
+
+def bump_version():
+    cmd = bump_version_command + ['--allow-dirty']
+    subprocess.check_call(cmd)
+
+
+if __name__ == '__main__':
+    print("Cutting release at", get_version())
+    update_changelog()
+    bump_version()
diff --git a/tox.ini b/tox.ini
index 1ebb922b5e..17201ca2a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,6 +60,13 @@ source=
 omit=
 	*/_vendor/*
 
+[testenv:finalize]
+deps =
+	towncrier
+	bump2version
+commands =
+	python tools/finalize.py
+
 [testenv:release]
 skip_install = True
 deps =

From a04ec132fedb9d180f302b302fa16cfd194667d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 16:40:07 -0400
Subject: [PATCH 7745/8469] Avoid install during finalize

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 17201ca2a8..347106ec37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,7 @@ omit=
 	*/_vendor/*
 
 [testenv:finalize]
+skip_install = True
 deps =
 	towncrier
 	bump2version

From 6e7341b2cb740741d77e0184db2b9028b1b93773 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Tue, 10 Mar 2020 09:53:09 +0100
Subject: [PATCH 7746/8469] bpo-1294959: Add sys.platlibdir attribute
 (GH-18381)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add --with-platlibdir option to the configure script: name of the
platform-specific library directory, stored in the new sys.platlitdir
attribute. It is used to build the path of platform-specific dynamic
libraries and the path of the standard library.

It is equal to "lib" on most platforms. On Fedora and SuSE, it is
equal to "lib64" on 64-bit systems.

Co-Authored-By: Jan Matějek <jmatejek@suse.com>
Co-Authored-By: Matěj Cepl <mcepl@cepl.eu>
Co-Authored-By: Charalampos Stratakis <cstratak@redhat.com>
---
 command/install.py    |  5 +++--
 sysconfig.py          | 11 +++++++++--
 tests/test_install.py |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/command/install.py b/command/install.py
index c625c95bf7..aaa300efa9 100644
--- a/command/install.py
+++ b/command/install.py
@@ -30,14 +30,14 @@
 INSTALL_SCHEMES = {
     'unix_prefix': {
         'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages',
         'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
         },
     'unix_home': {
         'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
+        'platlib': '$base/$platlibdir/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
@@ -298,6 +298,7 @@ def finalize_options(self):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                             'abiflags': abiflags,
+                            'platlibdir': sys.platlibdir,
                            }
 
         if HAS_USER_SITE:
diff --git a/sysconfig.py b/sysconfig.py
index b51629eb94..01ee519792 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -146,8 +146,15 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
             prefix = plat_specific and EXEC_PREFIX or PREFIX
 
     if os.name == "posix":
-        libpython = os.path.join(prefix,
-                                 "lib", "python" + get_python_version())
+        if plat_specific or standard_lib:
+            # Platform-specific modules (any module from a non-pure-Python
+            # module distribution) or standard Python library modules.
+            libdir = sys.platlibdir
+        else:
+            # Pure Python
+            libdir = "lib"
+        libpython = os.path.join(prefix, libdir,
+                                 "python" + get_python_version())
         if standard_lib:
             return libpython
         else:
diff --git a/tests/test_install.py b/tests/test_install.py
index 287ab1989e..51c80e0421 100644
--- a/tests/test_install.py
+++ b/tests/test_install.py
@@ -58,7 +58,8 @@ def check_path(got, expected):
 
         libdir = os.path.join(destination, "lib", "python")
         check_path(cmd.install_lib, libdir)
-        check_path(cmd.install_platlib, libdir)
+        platlibdir = os.path.join(destination, sys.platlibdir, "python")
+        check_path(cmd.install_platlib, platlibdir)
         check_path(cmd.install_purelib, libdir)
         check_path(cmd.install_headers,
                    os.path.join(destination, "include", "python", "foopkg"))

From a753df58651cb2d685dc721a40b450a7dba611ce Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 15:04:22 -0400
Subject: [PATCH 7747/8469] Suppress Pytest 5.4 warnings. Closes #2025

---
 pytest.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index af61043fb2..b13b7f3363 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -18,3 +18,5 @@ filterwarnings =
     # Suppress other Python 2 UnicodeWarnings
     ignore:Unicode equal comparison failed to convert:UnicodeWarning
     ignore:Unicode unequal comparison failed to convert:UnicodeWarning
+    # https://github.com/pypa/setuptools/issues/2025
+    ignore:direct construction of .*Item has been deprecated:DeprecationWarning

From 24fa288a98a14e6ec57b996b151a48203322c936 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 14:57:18 -0400
Subject: [PATCH 7748/8469] Extract method for validating version.

---
 setuptools/dist.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 7ffe0ba1fd..0f71dd9832 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -438,30 +438,35 @@ def __init__(self, attrs=None):
                 value = default() if default else None
             setattr(self.metadata, option, value)
 
-        if isinstance(self.metadata.version, numbers.Number):
+        self.metadata.version = self._validate_version(self.metadata.version)
+        self._finalize_requires()
+
+    @staticmethod
+    def _validate_version(version):
+        if isinstance(version, numbers.Number):
             # Some people apparently take "version number" too literally :)
-            self.metadata.version = str(self.metadata.version)
+            version = str(version)
 
-        if self.metadata.version is not None:
+        if version is not None:
             try:
-                ver = packaging.version.Version(self.metadata.version)
+                ver = packaging.version.Version(version)
                 normalized_version = str(ver)
-                if self.metadata.version != normalized_version:
+                if version != normalized_version:
                     warnings.warn(
                         "Normalizing '%s' to '%s'" % (
-                            self.metadata.version,
+                            version,
                             normalized_version,
                         )
                     )
-                    self.metadata.version = normalized_version
+                    version = normalized_version
             except (packaging.version.InvalidVersion, TypeError):
                 warnings.warn(
                     "The version specified (%r) is an invalid version, this "
                     "may not work as expected with newer versions of "
                     "setuptools, pip, and PyPI. Please see PEP 440 for more "
-                    "details." % self.metadata.version
+                    "details." % version
                 )
-        self._finalize_requires()
+        return version
 
     def _finalize_requires(self):
         """

From a323a4962eef39b6af7c5d07cdeb88bb0c307ce4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 15:31:09 -0400
Subject: [PATCH 7749/8469] Extract method for normalization, allowing for
 bypass when the version is wrapped in 'sic'. Fixes #308.

---
 setuptools/__init__.py |  4 ++++
 setuptools/dist.py     | 28 +++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 4485852f05..811f3fd2e8 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -224,5 +224,9 @@ def findall(dir=os.curdir):
     return list(files)
 
 
+class sic(str):
+    """Treat this string as-is (https://en.wikipedia.org/wiki/Sic)"""
+
+
 # Apply monkey patches
 monkey.patch_all()
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 0f71dd9832..a2f8ea0d00 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -30,6 +30,7 @@
 
 from . import SetuptoolsDeprecationWarning
 
+import setuptools
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
@@ -438,9 +439,22 @@ def __init__(self, attrs=None):
                 value = default() if default else None
             setattr(self.metadata, option, value)
 
-        self.metadata.version = self._validate_version(self.metadata.version)
+        self.metadata.version = self._normalize_version(
+            self._validate_version(self.metadata.version))
         self._finalize_requires()
 
+    @staticmethod
+    def _normalize_version(version):
+        if isinstance(version, setuptools.sic) or version is None:
+            return version
+
+        normalized = str(packaging.version.Version(version))
+        if version != normalized:
+            tmpl = "Normalizing '{version}' to '{normalized}'"
+            warnings.warn(tmpl.format(**locals()))
+            return normalized
+        return version
+
     @staticmethod
     def _validate_version(version):
         if isinstance(version, numbers.Number):
@@ -449,16 +463,7 @@ def _validate_version(version):
 
         if version is not None:
             try:
-                ver = packaging.version.Version(version)
-                normalized_version = str(ver)
-                if version != normalized_version:
-                    warnings.warn(
-                        "Normalizing '%s' to '%s'" % (
-                            version,
-                            normalized_version,
-                        )
-                    )
-                    version = normalized_version
+                packaging.version.Version(version)
             except (packaging.version.InvalidVersion, TypeError):
                 warnings.warn(
                     "The version specified (%r) is an invalid version, this "
@@ -466,6 +471,7 @@ def _validate_version(version):
                     "setuptools, pip, and PyPI. Please see PEP 440 for more "
                     "details." % version
                 )
+                return setuptools.sic(version)
         return version
 
     def _finalize_requires(self):

From 64c742406982f000e42dca065b4a34498312fb65 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 15:32:49 -0400
Subject: [PATCH 7750/8469] Add changelog entry.

---
 changelog.d/308.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/308.change.rst

diff --git a/changelog.d/308.change.rst b/changelog.d/308.change.rst
new file mode 100644
index 0000000000..5806d80ef0
--- /dev/null
+++ b/changelog.d/308.change.rst
@@ -0,0 +1 @@
+Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.

From b6076bee61984e6e05bf0d02e1daf09f0469e526 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 21:14:59 -0400
Subject: [PATCH 7751/8469] Add test capturing use-case for normalized version.
 Ref #308.

---
 setuptools/tests/test_dist.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 6e8c45fd30..26c271b142 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -139,6 +139,13 @@ def merge_dicts(d1, d2):
          {'name': 'foo',
           'version': '1.0.0',
           'author': 'Snorri Sturluson'}),
+        (
+            'Normalized version',
+            dict(
+                name='foo',
+                version='1.0.0a',
+            ),
+        ),
     ]
 
     return test_cases

From b43c5b81b76d687b50b05f05155838c69919c42c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 21:43:11 -0400
Subject: [PATCH 7752/8469] Remove superfluous test and re-organize tests for
 clarity.

---
 setuptools/tests/test_dist.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 6e8c45fd30..97055d9759 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -125,8 +125,6 @@ def merge_dicts(d1, d2):
             merge_dicts(base_attrs, {
                 'provides_extras': ['foo', 'bar']
             }), marks=pytest.mark.xfail(reason="provides_extras not read")),
-        ('Missing author, missing author e-mail',
-         {'name': 'foo', 'version': '1.0.0'}),
         ('Missing author',
          {'name': 'foo',
           'version': '1.0.0',
@@ -135,10 +133,8 @@ def merge_dicts(d1, d2):
          {'name': 'foo',
           'version': '1.0.0',
           'author': 'Snorri Sturluson'}),
-        ('Missing author',
-         {'name': 'foo',
-          'version': '1.0.0',
-          'author': 'Snorri Sturluson'}),
+        ('Missing author and e-mail',
+         {'name': 'foo', 'version': '1.0.0'}),
     ]
 
     return test_cases

From 0e1c968f36a5d6cf268fe3f1ffca9405bb99e20d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 22:08:36 -0400
Subject: [PATCH 7753/8469] Trim up syntax on test cases, including removing
 hanging indents.

---
 setuptools/tests/test_dist.py | 110 +++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 56 deletions(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 97055d9759..47c2de3e93 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -70,71 +70,69 @@ def test_dist__get_unpatched_deprecated():
 
 
 def __read_test_cases():
-    # Metadata version 1.0
-    base_attrs = {
-        "name": "package",
-        "version": "0.0.1",
-        "author": "Foo Bar",
-        "author_email": "foo@bar.net",
-        "long_description": "Long\ndescription",
-        "description": "Short description",
-        "keywords": ["one", "two"]
-    }
-
-    def merge_dicts(d1, d2):
-        d1 = d1.copy()
-        d1.update(d2)
-
-        return d1
+    base = dict(
+        name="package",
+        version="0.0.1",
+        author="Foo Bar",
+        author_email="foo@bar.net",
+        long_description="Long\ndescription",
+        description="Short description",
+        keywords=["one", "two"],
+    )
+
+    def params(**update):
+        return dict(base, **update)
 
     test_cases = [
-        ('Metadata version 1.0', base_attrs.copy()),
-        ('Metadata version 1.1: Provides', merge_dicts(base_attrs, {
-            'provides': ['package']
-        })),
-        ('Metadata version 1.1: Obsoletes', merge_dicts(base_attrs, {
-            'obsoletes': ['foo']
-        })),
-        ('Metadata version 1.1: Classifiers', merge_dicts(base_attrs, {
-            'classifiers': [
+        ('Metadata version 1.0', params()),
+        ('Metadata version 1.1: Provides', params(
+            provides=['package'],
+        )),
+        ('Metadata version 1.1: Obsoletes', params(
+            obsoletes=['foo'],
+        )),
+        ('Metadata version 1.1: Classifiers', params(
+            classifiers=[
                 'Programming Language :: Python :: 3',
                 'Programming Language :: Python :: 3.7',
                 'License :: OSI Approved :: MIT License',
-            ]})),
-        ('Metadata version 1.1: Download URL', merge_dicts(base_attrs, {
-            'download_url': 'https://example.com'
-        })),
-        ('Metadata Version 1.2: Requires-Python', merge_dicts(base_attrs, {
-            'python_requires': '>=3.7'
-        })),
+            ],
+        )),
+        ('Metadata version 1.1: Download URL', params(
+            download_url='https://example.com',
+        )),
+        ('Metadata Version 1.2: Requires-Python', params(
+            python_requires='>=3.7',
+        )),
         pytest.param(
             'Metadata Version 1.2: Project-Url',
-            merge_dicts(base_attrs, {
-                'project_urls': {
-                    'Foo': 'https://example.bar'
-                }
-            }), marks=pytest.mark.xfail(
-                reason="Issue #1578: project_urls not read"
-            )),
-        ('Metadata Version 2.1: Long Description Content Type',
-         merge_dicts(base_attrs, {
-             'long_description_content_type': 'text/x-rst; charset=UTF-8'
-         })),
+            params(project_urls=dict(Foo='https://example.bar')),
+            marks=pytest.mark.xfail(
+                reason="Issue #1578: project_urls not read",
+            ),
+        ),
+        ('Metadata Version 2.1: Long Description Content Type', params(
+            long_description_content_type='text/x-rst; charset=UTF-8',
+        )),
         pytest.param(
             'Metadata Version 2.1: Provides Extra',
-            merge_dicts(base_attrs, {
-                'provides_extras': ['foo', 'bar']
-            }), marks=pytest.mark.xfail(reason="provides_extras not read")),
-        ('Missing author',
-         {'name': 'foo',
-          'version': '1.0.0',
-          'author_email': 'snorri@sturluson.name'}),
-        ('Missing author e-mail',
-         {'name': 'foo',
-          'version': '1.0.0',
-          'author': 'Snorri Sturluson'}),
-        ('Missing author and e-mail',
-         {'name': 'foo', 'version': '1.0.0'}),
+            params(provides_extras=['foo', 'bar']),
+            marks=pytest.mark.xfail(reason="provides_extras not read"),
+        ),
+        ('Missing author', dict(
+            name='foo',
+            version='1.0.0',
+            author_email='snorri@sturluson.name',
+        )),
+        ('Missing author e-mail', dict(
+            name='foo',
+            version='1.0.0',
+            author='Snorri Sturluson',
+        )),
+        ('Missing author and e-mail', dict(
+            name='foo',
+            version='1.0.0',
+        )),
     ]
 
     return test_cases

From b8c2ae517db14b03dfba263aa66707ca67ecee8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 15 Mar 2020 22:22:04 -0400
Subject: [PATCH 7754/8469] Rely on partial now that pattern makes sense

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

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 47c2de3e93..a9837b1657 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -5,6 +5,7 @@
 import io
 import collections
 import re
+import functools
 from distutils.errors import DistutilsSetupError
 from setuptools.dist import (
     _get_unpatched,
@@ -80,8 +81,7 @@ def __read_test_cases():
         keywords=["one", "two"],
     )
 
-    def params(**update):
-        return dict(base, **update)
+    params = functools.partial(dict, base)
 
     test_cases = [
         ('Metadata version 1.0', params()),

From 8356ff3c6816d2a075098421252e096955d1fdbd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2020 21:43:22 -0400
Subject: [PATCH 7755/8469] Trim excess whitespace

---
 setuptools/tests/test_dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index c531b440d6..531ea1b417 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -137,7 +137,7 @@ def __read_test_cases():
         ('Bypass normalized version', dict(
             name='foo',
             version=sic('1.0.0a'),
-        )),      
+        )),
     ]
 
     return test_cases

From a3e1afead418ae25119bf19a587d9696c27beb9a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 05:13:37 -0400
Subject: [PATCH 7756/8469] Rename changefile and clean up changelog.

---
 changelog.d/1431.change.rst | 1 +
 changelog.d/1431.chnage.rst | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
 create mode 100644 changelog.d/1431.change.rst
 delete mode 100644 changelog.d/1431.chnage.rst

diff --git a/changelog.d/1431.change.rst b/changelog.d/1431.change.rst
new file mode 100644
index 0000000000..a3848afad7
--- /dev/null
+++ b/changelog.d/1431.change.rst
@@ -0,0 +1 @@
+In ``easy_install.check_site_dir``, ensure the installation directory exists.
diff --git a/changelog.d/1431.chnage.rst b/changelog.d/1431.chnage.rst
deleted file mode 100644
index a5cb324e3c..0000000000
--- a/changelog.d/1431.chnage.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Make install directory if it doesn't exist yet to prevent Fedora's
-specific setup to blow up if ``/usr/local/lib/pythonX.Y/site-packages``
-doesn't exist yet.

From 7db9dc2fc4b64e45979dc17ff844f997ff9fa63c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 05:38:29 -0400
Subject: [PATCH 7757/8469] Update changelog entry

---
 changelog.d/1563.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/1563.change.rst b/changelog.d/1563.change.rst
index a2452cd824..4ae1638448 100644
--- a/changelog.d/1563.change.rst
+++ b/changelog.d/1563.change.rst
@@ -1 +1 @@
-If find_module fails or does not exist, attempt to use find_spec(...).loader
+In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.

From 6b5a5872503290d6c90ab18cd72e46776977064a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 05:41:02 -0400
Subject: [PATCH 7758/8469] Trap AttributeError in exactly one place.

---
 pkg_resources/__init__.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index deea96b9ba..2f6c0cbf8a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2102,14 +2102,10 @@ def _handle_ns(packageName, path_item):
     try:
         loader = importer.find_spec(packageName).loader
     except AttributeError:
-        try:
-            # capture warnings due to #1111
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore")
-                loader = importer.find_module(packageName)
-        except AttributeError:
-            # not a system module
-            loader = None
+        # capture warnings due to #1111
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            loader = importer.find_module(packageName)
 
     if loader is None:
         return None

From 52e718872259617203556e4889d451167f209343 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 06:28:17 -0400
Subject: [PATCH 7759/8469] Add test capturing expectation. Ref #1451.

---
 setuptools/tests/test_build_py.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index b3a99f5660..92b455ddca 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -1,4 +1,6 @@
 import os
+import stat
+import shutil
 
 from setuptools.dist import Distribution
 
@@ -20,3 +22,28 @@ def test_directories_in_package_data_glob(tmpdir_cwd):
     os.makedirs('path/subpath')
     dist.parse_command_line()
     dist.run_commands()
+
+
+def test_read_only(tmpdir_cwd):
+    """
+    Ensure mode is not preserved in copy for package modules
+    and package data, as that causes problems
+    with deleting read-only files on Windows.
+
+    #1451
+    """
+    dist = Distribution(dict(
+        script_name='setup.py',
+        script_args=['build_py'],
+        packages=['pkg'],
+        package_data={'pkg': ['data.dat']},
+        name='pkg',
+    ))
+    os.makedirs('pkg')
+    open('pkg/__init__.py', 'w').close()
+    open('pkg/data.dat', 'w').close()
+    os.chmod('pkg/__init__.py', stat.S_IREAD)
+    os.chmod('pkg/data.dat', stat.S_IREAD)
+    dist.parse_command_line()
+    dist.run_commands()
+    shutil.rmtree('build')

From b1abc23f0124de8ad99149674613ff8e2c71706a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 16:37:43 -0400
Subject: [PATCH 7760/8469] Replace playbook with code for finalizing a
 release.

---
 docs/releases.txt | 40 ++++++--------------------------
 tools/finalize.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 tox.ini           |  7 ++++++
 3 files changed, 73 insertions(+), 33 deletions(-)
 create mode 100644 tools/finalize.py

diff --git a/docs/releases.txt b/docs/releases.txt
index 98ba39e88d..35b415c265 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -3,39 +3,13 @@ Release Process
 ===============
 
 In order to allow for rapid, predictable releases, Setuptools uses a
-mechanical technique for releases, enacted by Travis following a
-successful build of a tagged release per
-`PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
-
-Prior to cutting a release, please use `towncrier`_ to update
-``CHANGES.rst`` to summarize the changes since the last release.
-To update the changelog:
-
-1. Install towncrier via ``pip install towncrier`` if not already installed.
-2. Preview the new ``CHANGES.rst`` entry by running
-   ``towncrier --draft --version {new.version.number}`` (enter the desired
-   version number for the next release).  If any changes are needed, make
-   them and generate a new preview until the output is acceptable.  Run
-   ``git add`` for any modified files.
-3. Run ``towncrier --version {new.version.number}`` to stage the changelog
-   updates in git.
-4. Verify that there are no remaining ``changelog.d/*.rst`` files.  If a
-   file was named incorrectly, it may be ignored by towncrier.
-5. Review the updated ``CHANGES.rst`` file.  If any changes are needed,
-   make the edits and stage them via ``git add CHANGES.rst``.
-
-Once the changelog edits are staged and ready to commit, cut a release by
-installing and running ``bump2version --allow-dirty {part}`` where ``part``
-is major, minor, or patch based on the scope of the changes in the
-release. Then, push the commits to the master branch::
-
-    $ git push origin master
-    $ git push --tags
-
-If tests pass, the release will be uploaded to PyPI (from the Python 3.6
-tests).
-
-.. _towncrier: https://pypi.org/project/towncrier/
+mechanical technique for releases, enacted on tagged commits by
+continuous integration.
+
+To finalize a release, run ``tox -e finalize``, review, then push
+the changes.
+
+If tests pass, the release will be uploaded to PyPI.
 
 Release Frequency
 -----------------
diff --git a/tools/finalize.py b/tools/finalize.py
new file mode 100644
index 0000000000..3b66341a80
--- /dev/null
+++ b/tools/finalize.py
@@ -0,0 +1,59 @@
+"""
+Finalize the repo for a release. Invokes towncrier and bumpversion.
+"""
+
+__requires__ = ['bump2version', 'towncrier']
+
+
+import subprocess
+import pathlib
+import re
+import sys
+
+
+def release_kind():
+    """
+    Determine which release to make based on the files in the
+    changelog.
+    """
+    # use min here as 'major' < 'minor' < 'patch'
+    return min(
+        'major' if 'breaking' in file.name else
+        'minor' if 'change' in file.name else
+        'patch'
+        for file in pathlib.Path('changelog.d').iterdir()
+    )
+
+
+bump_version_command = [
+    sys.executable,
+    '-m', 'bumpversion',
+    release_kind(),
+]
+
+
+def get_version():
+    cmd = bump_version_command + ['--dry-run', '--verbose']
+    out = subprocess.check_output(cmd, text=True)
+    return re.search('^new_version=(.*)', out, re.MULTILINE).group(1)
+
+
+def update_changelog():
+    cmd = [
+        sys.executable, '-m',
+        'towncrier',
+        '--version', get_version(),
+        '--yes',
+    ]
+    subprocess.check_call(cmd)
+
+
+def bump_version():
+    cmd = bump_version_command + ['--allow-dirty']
+    subprocess.check_call(cmd)
+
+
+if __name__ == '__main__':
+    print("Cutting release at", get_version())
+    update_changelog()
+    bump_version()
diff --git a/tox.ini b/tox.ini
index 2d43e76fc5..b106922096 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,6 +58,13 @@ source=
 omit=
 	*/_vendor/*
 
+[testenv:finalize]
+deps =
+	towncrier
+	bump2version
+commands =
+	python tools/finalize.py
+
 [testenv:release]
 skip_install = True
 deps =

From c020b5f88579487350ea38a40d3ea2cab1318144 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 8 Mar 2020 16:40:07 -0400
Subject: [PATCH 7761/8469] Avoid install during finalize

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index b106922096..3fc6a56480 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,6 +59,7 @@ omit=
 	*/_vendor/*
 
 [testenv:finalize]
+skip_install = True
 deps =
 	towncrier
 	bump2version

From 1988125e800b3b64f9cf9311fea5525cc81546f9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Sat, 21 Mar 2020 14:41:31 -0400
Subject: [PATCH 7762/8469] =?UTF-8?q?Bump=20version:=2044.0.0=20=E2=86=92?=
 =?UTF-8?q?=2044.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 3 +--
 CHANGES.rst                 | 8 ++++++++
 changelog.d/1704.change.rst | 1 -
 changelog.d/1959.change.rst | 1 -
 changelog.d/1994.change.rst | 1 -
 setup.cfg                   | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/1704.change.rst
 delete mode 100644 changelog.d/1959.change.rst
 delete mode 100644 changelog.d/1994.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e1bfa89859..c8c9f544bf 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,7 +1,6 @@
 [bumpversion]
-current_version = 44.0.0
+current_version = 44.1.0
 commit = True
 tag = True
 
 [bumpversion:file:setup.cfg]
-
diff --git a/CHANGES.rst b/CHANGES.rst
index 109a3f480f..83cd8c784b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v44.1.0
+-------
+
+* #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
+* #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
+* #1994: Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.
+
+
 v44.0.0
 -------
 
diff --git a/changelog.d/1704.change.rst b/changelog.d/1704.change.rst
deleted file mode 100644
index 62450835b9..0000000000
--- a/changelog.d/1704.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set sys.argv[0] in setup script run by build_meta.__legacy__
diff --git a/changelog.d/1959.change.rst b/changelog.d/1959.change.rst
deleted file mode 100644
index c0cc8975e3..0000000000
--- a/changelog.d/1959.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix for Python 4: replace unsafe six.PY3 with six.PY2
diff --git a/changelog.d/1994.change.rst b/changelog.d/1994.change.rst
deleted file mode 100644
index 4a6cc74298..0000000000
--- a/changelog.d/1994.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.
diff --git a/setup.cfg b/setup.cfg
index ecef86098a..cb5ae73bc4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 44.0.0
+version = 44.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From ee4d0dd1c0bd4c3efb6d2b933c2027e88917bfd1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Sat, 21 Mar 2020 14:45:16 -0400
Subject: [PATCH 7763/8469] =?UTF-8?q?Bump=20version:=2046.0.0=20=E2=86=92?=
 =?UTF-8?q?=2046.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 15 +++++++++++++++
 changelog.d/1424.change.rst |  1 -
 changelog.d/1431.change.rst |  1 -
 changelog.d/1563.change.rst |  1 -
 changelog.d/308.change.rst  |  1 -
 setup.cfg                   |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/1424.change.rst
 delete mode 100644 changelog.d/1431.change.rst
 delete mode 100644 changelog.d/1563.change.rst
 delete mode 100644 changelog.d/308.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8f2ef1d856..28a327b2f8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.0.0
+current_version = 46.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 1e8da46ef4..12680a4d20 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v46.1.0
+-------
+
+* #308: Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.
+* #1424: Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag.
+* #1431: In ``easy_install.check_site_dir``, ensure the installation directory exists.
+* #1563: In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.
+
+Incorporate changes from v44.1.0:
+
+* #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
+* #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
+* #1994: Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.
+
+
 v44.1.0
 -------
 
diff --git a/changelog.d/1424.change.rst b/changelog.d/1424.change.rst
deleted file mode 100644
index 361997ddd6..0000000000
--- a/changelog.d/1424.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag.
\ No newline at end of file
diff --git a/changelog.d/1431.change.rst b/changelog.d/1431.change.rst
deleted file mode 100644
index a3848afad7..0000000000
--- a/changelog.d/1431.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``easy_install.check_site_dir``, ensure the installation directory exists.
diff --git a/changelog.d/1563.change.rst b/changelog.d/1563.change.rst
deleted file mode 100644
index 4ae1638448..0000000000
--- a/changelog.d/1563.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.
diff --git a/changelog.d/308.change.rst b/changelog.d/308.change.rst
deleted file mode 100644
index 5806d80ef0..0000000000
--- a/changelog.d/308.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.
diff --git a/setup.cfg b/setup.cfg
index d231a3e11e..0e9a05ed53 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.0.0
+version = 46.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 512565ee5090b8c1b685102c9ffb6195c99e32c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:00:03 -0400
Subject: [PATCH 7764/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setuptools/command/build_py.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 6fc0a4e46d..bac4fb1c93 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -120,7 +120,8 @@ def build_package_data(self):
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
                 srcfile = os.path.join(src_dir, filename)
-                outf, copied = self.copy_file(srcfile, target, preserve_mode=False)
+                outf, copied = self.copy_file(
+                    srcfile, target, preserve_mode=False)
                 srcfile = os.path.abspath(srcfile)
                 if (copied and
                         srcfile in self.distribution.convert_2to3_doctests):

From 936a8c68afacd56d4bcdf8412fe0c9ed6fe4dc09 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:01:02 -0400
Subject: [PATCH 7765/8469] Update changelog. Ref #1424.

---
 changelog.d/1424.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1424.bugfix.rst

diff --git a/changelog.d/1424.bugfix.rst b/changelog.d/1424.bugfix.rst
new file mode 100644
index 0000000000..2c7209f226
--- /dev/null
+++ b/changelog.d/1424.bugfix.rst
@@ -0,0 +1 @@
+Fixed lint error (long line) in #1424.

From 87fbe76a1d544a14abea34ca0824096eb7c37b38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Sat, 21 Mar 2020 15:01:42 -0400
Subject: [PATCH 7766/8469] =?UTF-8?q?Bump=20version:=2046.1.0=20=E2=86=92?=
 =?UTF-8?q?=2046.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 6 ++++++
 setup.cfg        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 28a327b2f8..03fe7b43fd 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.1.0
+current_version = 46.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 12680a4d20..1edbd12acb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v46.1.1
+-------
+
+No significant changes.
+
+
 v46.1.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 0e9a05ed53..1442618182 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.1.0
+version = 46.1.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 7bdef458b4b35e0a8fa7025266c7c1aa6b0f20c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:06:44 -0400
Subject: [PATCH 7767/8469] Add badge for Azure pipelines

---
 README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index da0549a98a..8a6bf91d5d 100644
--- a/README.rst
+++ b/README.rst
@@ -4,6 +4,9 @@
 .. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
     :target: https://setuptools.readthedocs.io
 
+.. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/jaraco.setuptools?branchName=master
+   :target: https://dev.azure.com/jaraco/setuptools/_build/latest?definitionId=1&branchName=master
+
 .. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20CI&logo=travis&logoColor=white
    :target: https://travis-ci.org/pypa/setuptools
 

From 5a1e4ea8a0671fc2e9d7559ae4e07ba1afe53d59 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:11:25 -0400
Subject: [PATCH 7768/8469] Solicit tidelift token from environment variables.
 Add Funding.yml.

---
 .github/FUNDING.yml | 1 +
 azure-pipelines.yml | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..27de01d019
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+tidelift: pypi/setuptools
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3e80bf443d..0253a770c0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -66,6 +66,7 @@ stages:
         tox -e release
       env:
         TWINE_PASSWORD: $(PyPI-token)
+        TIDELIFT_TOKEN: $(Tidelift-token)
       displayName: 'publish to PyPI'
 
   condition: contains(variables['Build.SourceBranch'], 'tags')

From 487ec9bc067e823bfe8c725f15fed452b6e3adc6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:14:24 -0400
Subject: [PATCH 7769/8469] Sync badges with jaraco/skeleton

---
 README.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 8a6bf91d5d..6caaa75640 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,10 @@
 .. image:: https://img.shields.io/pypi/v/setuptools.svg
-   :target: https://pypi.org/project/setuptools
+   :target: `PyPI link`_
 
-.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
-    :target: https://setuptools.readthedocs.io
+.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
+   :target: `PyPI link`_
+
+.. _PyPI link: https://pypi.org/project/setuptools
 
 .. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/jaraco.setuptools?branchName=master
    :target: https://dev.azure.com/jaraco/setuptools/_build/latest?definitionId=1&branchName=master
@@ -13,14 +15,15 @@
 .. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20CI&logo=appveyor&logoColor=white
    :target: https://ci.appveyor.com/project/pypa/setuptools/branch/master
 
+.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
+    :target: https://setuptools.readthedocs.io
+
 .. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white
    :target: https://codecov.io/gh/pypa/setuptools
 
 .. image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
 
-.. image:: https://img.shields.io/pypi/pyversions/setuptools.svg
-
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From f63c4335178512ad1db730222d54fc0df84ae798 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:15:53 -0400
Subject: [PATCH 7770/8469] Remove deploy step from travis. Let Azure pipelines
 cut the release.

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38a66f3215..3e97f353aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,6 @@ jobs:
   - python: 3.8-dev
   - <<: *latest_py3
     env: TOXENV=docs DISABLE_COVERAGE=1
-  - <<: *latest_py3
-    stage: deploy
-    if: tag IS present
-    script: tox -e release
-    after_success: skip
   allow_failures:
   # suppress failures due to pypa/setuptools#2000
   - python: pypy3

From e581a6186ffb7f00be82182543e833d7f0756510 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 21 Mar 2020 15:19:46 -0400
Subject: [PATCH 7771/8469] Remove changelog entry, intended for v46.1.1

---
 changelog.d/1424.bugfix.rst | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 changelog.d/1424.bugfix.rst

diff --git a/changelog.d/1424.bugfix.rst b/changelog.d/1424.bugfix.rst
deleted file mode 100644
index 2c7209f226..0000000000
--- a/changelog.d/1424.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed lint error (long line) in #1424.

From 9781208e4c78509ae0e819bf3da472190c5a7bc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 10:51:10 -0400
Subject: [PATCH 7772/8469] Add template for Python 2 incompatibility

---
 ...ls-warns-about-python-2-incompatibility.md | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
new file mode 100644
index 0000000000..4bed6c4f32
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -0,0 +1,48 @@
+---
+name: Setuptools warns about Python 2 incompatibility
+about: Report the issue where setuptools 45 or later stops working on Python 2
+title: Incompatible install in (summarize your environment)
+labels: Python 2
+assignees: ''
+
+---
+
+<!--
+
+It's by design that Setuptools 45 and later will stop working on Python 2. To ease the transition, Setuptools 45 was released to continue to have Python 2 compatibility, but emit a strenuous warning that it will stop working.
+
+In most cases, using pip 9 or later to install Setuptools from PyPI or any index supporting the Requires-Python metadata will do the right thing and install Setuptools 44.x on Python 2.
+
+If you've come to file an issue, it's probably because some process managed to bypass these protections.
+
+Your first course of action should be to reason about how you managed to get an unsupported version of Setuptools on Python 2. Please complete the sections below and provide any other detail about your environment that will help us help you.
+
+-->
+
+## Prerequisites
+
+<!-- These are the recommended workarounds for the issue. Please
+try them first. -->
+
+- [ ] Python 2 is required for this application.
+- [ ] Setuptools installed with pip 9 or later.
+- [ ] Pinning Setuptools to `setuptools<45` in the environment was unsuccessful.
+
+## Environment Details
+
+- Operating System and version:
+- Python version: 
+- Python installed how: 
+- Virtualenv version (if using virtualenv): n/a
+
+Command(s) used to install setuptools (and output):
+
+```
+```
+
+Output of `pip --version` when installing setuptools:
+
+```
+```
+
+## Other notes

From 734eec6e3fca725c6b18cad2fffbd1f3e3a56fa7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 10:57:15 -0400
Subject: [PATCH 7773/8469] Update warning message to direct users to file a
 template instead of commenting in #1458.

---
 changelog.d/1458.misc.rst | 1 +
 pkg_resources/py2_warn.py | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/1458.misc.rst

diff --git a/changelog.d/1458.misc.rst b/changelog.d/1458.misc.rst
new file mode 100644
index 0000000000..6a8e58a3e9
--- /dev/null
+++ b/changelog.d/1458.misc.rst
@@ -0,0 +1 @@
+Added template for reporting Python 2 incompatibilities.
diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
index 1b15195626..bfc3523415 100644
--- a/pkg_resources/py2_warn.py
+++ b/pkg_resources/py2_warn.py
@@ -12,9 +12,8 @@
     Setuptools using pip 9.x or later or pin to `setuptools<45`
     in your environment.
     If you have done those things and are still encountering
-    this message, please comment in
-    https://github.com/pypa/setuptools/issues/1458
-    about the steps that led to this unsupported combination.
+    this message, please follow up at
+    https://bit.ly/setuptools-py2-warning.
     """)
 
 pre = "Setuptools will stop working on Python 2\n"

From 7355cce542963d9a83c7c754dc63a0c7e68bf3aa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 11:05:13 -0400
Subject: [PATCH 7774/8469] Update py2 warning template to direct users to
 report downstream.

---
 .../setuptools-warns-about-python-2-incompatibility.md           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
index 4bed6c4f32..14317d9367 100644
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -25,6 +25,7 @@ Your first course of action should be to reason about how you managed to get an
 try them first. -->
 
 - [ ] Python 2 is required for this application.
+- [ ] I maintain the software that installs Setuptools (if not, please contact that project).
 - [ ] Setuptools installed with pip 9 or later.
 - [ ] Pinning Setuptools to `setuptools<45` in the environment was unsuccessful.
 

From db08c60c303d64459dae479af84e3cd1cd02ba1d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Wed, 25 Mar 2020 11:05:51 -0400
Subject: [PATCH 7775/8469] =?UTF-8?q?Bump=20version:=2046.1.1=20=E2=86=92?=
 =?UTF-8?q?=2046.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/1458.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1458.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 03fe7b43fd..4a54253c72 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.1.1
+current_version = 46.1.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 1edbd12acb..672355af58 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v46.1.2
+-------
+
+* #1458: Added template for reporting Python 2 incompatibilities.
+
+
 v46.1.1
 -------
 
diff --git a/changelog.d/1458.misc.rst b/changelog.d/1458.misc.rst
deleted file mode 100644
index 6a8e58a3e9..0000000000
--- a/changelog.d/1458.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added template for reporting Python 2 incompatibilities.
diff --git a/setup.cfg b/setup.cfg
index 1442618182..8347dede59 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.1.1
+version = 46.1.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From a3620a45b3df9be32316bd8807ca5a83c1380c9a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 13:29:50 -0400
Subject: [PATCH 7776/8469] Add test asserting that an executable script
 retains its executable bit. Ref #2041.

---
 setuptools/tests/test_build_py.py | 33 ++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index 92b455ddca..4cb11c1d33 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -26,9 +26,10 @@ def test_directories_in_package_data_glob(tmpdir_cwd):
 
 def test_read_only(tmpdir_cwd):
     """
-    Ensure mode is not preserved in copy for package modules
-    and package data, as that causes problems
-    with deleting read-only files on Windows.
+    Ensure read-only flag is not preserved in copy
+    for package modules and package data, as that
+    causes problems with deleting read-only files on
+    Windows.
 
     #1451
     """
@@ -47,3 +48,29 @@ def test_read_only(tmpdir_cwd):
     dist.parse_command_line()
     dist.run_commands()
     shutil.rmtree('build')
+
+
+def test_executable_data(tmpdir_cwd):
+    """
+    Ensure executable bit is preserved in copy for
+    package data, as users rely on it for scripts.
+
+    #2041
+    """
+    dist = Distribution(dict(
+        script_name='setup.py',
+        script_args=['build_py'],
+        packages=['pkg'],
+        package_data={'pkg': ['run-me']},
+        name='pkg',
+    ))
+    os.makedirs('pkg')
+    open('pkg/__init__.py', 'w').close()
+    open('pkg/run-me', 'w').close()
+    os.chmod('pkg/run-me', 0o700)
+
+    dist.parse_command_line()
+    dist.run_commands()
+
+    assert os.stat('build/lib/pkg/run-me').st_mode & stat.S_IEXEC, \
+        "Script is not executable"

From 70e95ee66a17e1655f70c9dbda107cea958f583f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 13:44:58 -0400
Subject: [PATCH 7777/8469] When copying package data, make sure it's writable,
 but otherwise preserve the mode. Fixes #2041.

---
 setuptools/command/build_py.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index bac4fb1c93..9d0288a50d 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -7,6 +7,7 @@
 import io
 import distutils.errors
 import itertools
+import stat
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map, filter, filterfalse
@@ -20,6 +21,10 @@ def run_2to3(self, files, doctests=True):
             "do nothing"
 
 
+def make_writable(target):
+    os.chmod(target, os.stat(target).st_mode | stat.S_IWRITE)
+
+
 class build_py(orig.build_py, Mixin2to3):
     """Enhanced 'build_py' command that includes data files with packages
 
@@ -120,8 +125,8 @@ def build_package_data(self):
                 target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
                 srcfile = os.path.join(src_dir, filename)
-                outf, copied = self.copy_file(
-                    srcfile, target, preserve_mode=False)
+                outf, copied = self.copy_file(srcfile, target)
+                make_writable(target)
                 srcfile = os.path.abspath(srcfile)
                 if (copied and
                         srcfile in self.distribution.convert_2to3_doctests):

From 8f8302da51016c6c98cf29417819fd0907e3993a Mon Sep 17 00:00:00 2001
From: jorikdima <jorikdima@gmail.com>
Date: Tue, 24 Mar 2020 20:21:35 -0700
Subject: [PATCH 7778/8469] Added description.

---
 changelog.d/2041.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2041.bugfix.rst

diff --git a/changelog.d/2041.bugfix.rst b/changelog.d/2041.bugfix.rst
new file mode 100644
index 0000000000..8db757d89d
--- /dev/null
+++ b/changelog.d/2041.bugfix.rst
@@ -0,0 +1 @@
+Preserve file modes during pkg files copying, but clear read only flag for target afterwards.

From ef3a38644ccc9f65ea20493e25de0955695b9dff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Mar 2020 14:00:29 -0400
Subject: [PATCH 7779/8469] Mark test_executable_data as xfail on Windows.

---
 setuptools/tests/test_build_py.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/tests/test_build_py.py b/setuptools/tests/test_build_py.py
index 4cb11c1d33..78a31ac49e 100644
--- a/setuptools/tests/test_build_py.py
+++ b/setuptools/tests/test_build_py.py
@@ -2,6 +2,8 @@
 import stat
 import shutil
 
+import pytest
+
 from setuptools.dist import Distribution
 
 
@@ -50,6 +52,12 @@ def test_read_only(tmpdir_cwd):
     shutil.rmtree('build')
 
 
+@pytest.mark.xfail(
+    'platform.system() == "Windows"',
+    reason="On Windows, files do not have executable bits",
+    raises=AssertionError,
+    strict=True,
+)
 def test_executable_data(tmpdir_cwd):
     """
     Ensure executable bit is preserved in copy for

From 3aeec3f0e989516e9229d9a75f5a038929dee6a6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Wed, 25 Mar 2020 14:27:44 -0400
Subject: [PATCH 7780/8469] =?UTF-8?q?Bump=20version:=2046.1.2=20=E2=86=92?=
 =?UTF-8?q?=2046.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 6 ++++++
 setup.cfg        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4a54253c72..00cbdc7a3b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.1.2
+current_version = 46.1.3
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 672355af58..ac61c17882 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v46.1.3
+-------
+
+No significant changes.
+
+
 v46.1.2
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 8347dede59..60838efce3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.1.2
+version = 46.1.3
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 578d2eca7232d429225d7de55f934ab303ad6f3f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 29 Mar 2020 21:40:38 -0400
Subject: [PATCH 7781/8469] initial draft for build_meta documentation

---
 docs/build_meta.txt | 88 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 docs/build_meta.txt

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
new file mode 100644
index 0000000000..bfba118193
--- /dev/null
+++ b/docs/build_meta.txt
@@ -0,0 +1,88 @@
+=======================================
+Documentation to setuptools.build_meta
+=======================================
+
+What is it?
+-------------
+
+Setuptools, or Python packaging in general, has faced many 
+`criticism <https://www.bernat.tech/growing-pain>`_ and 
+`PEP517 <https://www.python.org/dev/peps/pep-0517/>`_ attempts to fix this
+issue by ``get distutils-sig out of the business of being a gatekeeper for
+Python build system``. 
+
+A quick overview on the `current state of Python packaging 
+<https://www.bernat.tech/pep-517-and-python-packaging/>`_. The ``distutils``
+package specified the de facto standard way to bundle up your packages::
+
+    setup.py
+    mypkg/__init__.py
+
+And then you run ``python setup.py bdist`` and compressed ``.tar.gz`` will be
+available for distribution.
+
+Following this tradition, several other enhancements have been made: ``pip`` 
+was created and user can run ``pip install`` on their downloaded distribution 
+file and it will be installed. ``wheel`` format was created to minimize the 
+build process for C extension. ``PyPI`` and ``twine`` then made it easier to 
+upload and download the distribution and finally ``setuptools`` extends the 
+original ``distutils`` and emcompass everything else and become the standard
+way for Python packaging. (check the timeline for accuracy)
+
+I'll skip the many downsides and complexity that came with the development
+of setuptools. PEP517 aims to solve these issues by specifying a new 
+standardized way to distribute your packages which is not as compatible as
+the setuptools module.
+
+``build_meta.py`` therefore acts as an adaptor to the PEP517 and the existing
+setuptools. 
+
+How to use it?
+-------------
+
+Starting with a package that you want to distribute. You will need your source
+scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file.
+
+    ~/meowpkg/
+        pyproject.toml
+        setup.cfg
+        src/meowpkg/__init__.py
+         
+        
+The pyproject.toml file is required by PEP517 and PEP518 to specify the build 
+system (i.e. what is being used to package your scripts). To use it with 
+setuptools, the content would be::
+
+    [build-system]
+    requires = ["setuptools", "wheel"]
+    build-backend = "setuptools.build-meta"
+
+The setup.cfg is used to specify your package information (essentially
+replacing setup.py), specified on setuptools `documentation <https://
+setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-
+using-setup-cfg-files>`_ ::
+
+    [metadata]
+    name = meowpkg
+    version = 0.0.1
+    description = a package that meows
+    
+    [options]
+    package_dir=
+        =src
+    packages = find:
+
+    [options.packages.find]
+    where=src
+
+Now it's time to actually generate the distribution. PEP517 specifies two
+mandatory functions, ``build_wheel`` and ``build_sdist``, implemented in
+this module. Currently, it has to be done in the interpreter::
+
+    >>> import setuptools.build_meta
+    >>> setuptools.build_meta.build_wheel('wheel_dist')
+    'meowpkg-0.0.1-py3-none-any.whl'
+
+And now it's done! The ``.whl`` file  and ``.tar.gz`` can then be distributed 
+and installed!
+

From cc7186cde4238e9269beb2b19720380990759299 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 30 Mar 2020 13:25:17 -0400
Subject: [PATCH 7782/8469] First draft for build_meta documentation

---
 docs/build_meta.txt | 98 ++++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index bfba118193..47e0aa7485 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -5,37 +5,39 @@ Documentation to setuptools.build_meta
 What is it?
 -------------
 
-Setuptools, or Python packaging in general, has faced many 
-`criticism <https://www.bernat.tech/growing-pain>`_ and 
-`PEP517 <https://www.python.org/dev/peps/pep-0517/>`_ attempts to fix this
-issue by ``get distutils-sig out of the business of being a gatekeeper for
-Python build system``. 
-
-A quick overview on the `current state of Python packaging 
-<https://www.bernat.tech/pep-517-and-python-packaging/>`_. The ``distutils``
-package specified the de facto standard way to bundle up your packages::
-
-    setup.py
-    mypkg/__init__.py
-
-And then you run ``python setup.py bdist`` and compressed ``.tar.gz`` will be
-available for distribution.
-
-Following this tradition, several other enhancements have been made: ``pip`` 
-was created and user can run ``pip install`` on their downloaded distribution 
-file and it will be installed. ``wheel`` format was created to minimize the 
-build process for C extension. ``PyPI`` and ``twine`` then made it easier to 
-upload and download the distribution and finally ``setuptools`` extends the 
-original ``distutils`` and emcompass everything else and become the standard
-way for Python packaging. (check the timeline for accuracy)
-
-I'll skip the many downsides and complexity that came with the development
-of setuptools. PEP517 aims to solve these issues by specifying a new 
-standardized way to distribute your packages which is not as compatible as
-the setuptools module.
-
-``build_meta.py`` therefore acts as an adaptor to the PEP517 and the existing
-setuptools. 
+Python packaging has come `a long way <https://www.bernat.tech/pep-517-518/>`_.
+
+The traditional ``setuptools``'s way of packgaging Python modules
+uses a ``setup()`` function within the ``setup.py`` script. Commands such as
+``python setup.py bdist`` or ``python setup.py bdist_wheel`` generate a 
+distribution bundle and ``python setup.py install`` installs the distribution. 
+This interface makes it difficult to choose other packaging tools without an 
+overhaul. Additionally, the ``setup.py`` scripts hasn't been the most user
+friendly tool.
+
+PEP517 therefore came to rescue and specified a new standard to 
+package and distribute Python modules. Under PEP517:
+
+    a ``pyproject.toml`` file is used to specify what program to use
+    for generating distribution. 
+
+    Then, two functions provided by the program,``build_wheel(directory: str)`` 
+    and ``build_sdist(directory: str)`` create the distribution bundle at the 
+    specified ``directory``. The program is free to use its own configuration 
+    script or extend the ``.toml`` file. 
+
+    Lastly, ``pip install *.whl`` or ``pip install *.tar.gz`` does the actual
+    installation. If ``*.whl`` is available, ``pip`` will go ahead and copy
+    the files into ``site-packages`` directory. If not, ``pip`` will look at
+    ``pyproject.toml`` and decide what program to use to 'build from source' 
+    (the default is ``setuptools``)
+
+With this standard, switching between packaging tools becomes a lot easier and
+in the case of ``setuptools``, ``setup.py`` becomes optional.
+
+``build_meta`` is ``setuptools``'s implementation of PEP517. It provides the 
+two functions, ``build_wheel`` and ``build_sdist``, amongst others and uses 
+a ``setup.cfg`` to specify the information about the package. 
 
 How to use it?
 -------------
@@ -46,21 +48,20 @@ scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file.
     ~/meowpkg/
         pyproject.toml
         setup.cfg
-        src/meowpkg/__init__.py
+        meowpkg/__init__.py
          
         
-The pyproject.toml file is required by PEP517 and PEP518 to specify the build 
-system (i.e. what is being used to package your scripts). To use it with 
+The pyproject.toml file is required to specify the build system (i.e. what is 
+being used to package your scripts and install from source). To use it with 
 setuptools, the content would be::
 
     [build-system]
     requires = ["setuptools", "wheel"]
-    build-backend = "setuptools.build-meta"
+    build-backend = "setuptools.build_meta" 
 
-The setup.cfg is used to specify your package information (essentially
-replacing setup.py), specified on setuptools `documentation <https://
-setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-
-using-setup-cfg-files>`_ ::
+``setup.cfg`` is used to specify your package information, specified 
+`here <https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring
+-setup-using-setup-cfg-files>`_ ::
 
     [metadata]
     name = meowpkg
@@ -68,13 +69,8 @@ using-setup-cfg-files>`_ ::
     description = a package that meows
     
     [options]
-    package_dir=
-        =src
     packages = find:
 
-    [options.packages.find]
-    where=src
-
 Now it's time to actually generate the distribution. PEP517 specifies two
 mandatory functions, ``build_wheel`` and ``build_sdist``, implemented in
 this module. Currently, it has to be done in the interpreter::
@@ -82,7 +78,19 @@ this module. Currently, it has to be done in the interpreter::
     >>> import setuptools.build_meta
     >>> setuptools.build_meta.build_wheel('wheel_dist')
     'meowpkg-0.0.1-py3-none-any.whl'
+    >>> setuptools.build_meta.build_sdist('sdist')
+    'meowpkg-0.0.1.tar.gz'
 
 And now it's done! The ``.whl`` file  and ``.tar.gz`` can then be distributed 
-and installed!
+and installed::
+
+    ~/newcomputer/
+        meowpkg-0.0.1.whl
+        meowpkg-0.0.1.tar.gz
+
+    $ pip install meowpkg-0.0.1.whl
+
+or::
+
+    $ pip install meowpkg-0.0.1.tar.gz
 

From b5697f4458e0a2bbdb0d5a46222bb7e7adad8071 Mon Sep 17 00:00:00 2001
From: alvyjudy <53921639+alvyjudy@users.noreply.github.com>
Date: Mon, 30 Mar 2020 13:27:31 -0400
Subject: [PATCH 7783/8469] deleted blank lines and fixed underline

---
 docs/build_meta.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index 47e0aa7485..8d92d80462 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -40,7 +40,7 @@ two functions, ``build_wheel`` and ``build_sdist``, amongst others and uses
 a ``setup.cfg`` to specify the information about the package. 
 
 How to use it?
--------------
+--------------
 
 Starting with a package that you want to distribute. You will need your source
 scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file.
@@ -49,8 +49,7 @@ scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file.
         pyproject.toml
         setup.cfg
         meowpkg/__init__.py
-         
-        
+
 The pyproject.toml file is required to specify the build system (i.e. what is 
 being used to package your scripts and install from source). To use it with 
 setuptools, the content would be::

From 71af92d2e1f00162e46fe9c72370cad7e9bd0c5f Mon Sep 17 00:00:00 2001
From: alvyjudy <53921639+alvyjudy@users.noreply.github.com>
Date: Mon, 30 Mar 2020 13:30:30 -0400
Subject: [PATCH 7784/8469] fixed some RST syntax

---
 docs/build_meta.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index 8d92d80462..4467dddacb 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -21,7 +21,7 @@ package and distribute Python modules. Under PEP517:
     a ``pyproject.toml`` file is used to specify what program to use
     for generating distribution. 
 
-    Then, two functions provided by the program,``build_wheel(directory: str)`` 
+    Then, two functions provided by the program, ``build_wheel(directory: str)`` 
     and ``build_sdist(directory: str)`` create the distribution bundle at the 
     specified ``directory``. The program is free to use its own configuration 
     script or extend the ``.toml`` file. 
@@ -43,7 +43,7 @@ How to use it?
 --------------
 
 Starting with a package that you want to distribute. You will need your source
-scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file.
+scripts, a ``pyproject.toml`` file and a ``setup.cfg`` file::
 
     ~/meowpkg/
         pyproject.toml

From 19e45c14e49fa3e6cc849b69b3a83f85f316441c Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 30 Mar 2020 13:49:29 -0400
Subject: [PATCH 7785/8469] added changelog file

---
 changelog.d/1698.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1698.doc.rst

diff --git a/changelog.d/1698.doc.rst b/changelog.d/1698.doc.rst
new file mode 100644
index 0000000000..9b61fccb4c
--- /dev/null
+++ b/changelog.d/1698.doc.rst
@@ -0,0 +1 @@
+Added documentation for ``build_meta`` (a bare minimum, not completed)

From c3ae6d416043ca528e9cf88c4789afa9df223c5b Mon Sep 17 00:00:00 2001
From: Michael Felt <aixtools@users.noreply.github.com>
Date: Fri, 3 Apr 2020 16:38:28 +0200
Subject: [PATCH 7786/8469] bpo-40112: distutils test_search_cpp: Fix logic to
 determine if C compiler is xlc on AIX (GH-19225)

---
 tests/test_config_cmd.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index b735fd334d..8bd2c94237 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -47,8 +47,7 @@ def test_search_cpp(self):
         cmd = config(dist)
         cmd._check_compiler()
         compiler = cmd.compiler
-        is_xlc = shutil.which(compiler.preprocessor[0]).startswith("/usr/vac")
-        if is_xlc:
+        if sys.platform[:3] == "aix" and "xlc" in compiler.preprocessor[0].lower():
             self.skipTest('xlc: The -E option overrides the -P, -o, and -qsyntaxonly options')
 
         # simple pattern searches

From 03b92ca154951f16851e75b01b78b9127dad742f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Apr 2020 16:33:15 -0400
Subject: [PATCH 7787/8469] Protect against situation where the Git user e-mail
 is not configured. Ref #2057.

---
 tools/finalize.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/finalize.py b/tools/finalize.py
index 3b66341a80..5f284568d2 100644
--- a/tools/finalize.py
+++ b/tools/finalize.py
@@ -53,7 +53,15 @@ def bump_version():
     subprocess.check_call(cmd)
 
 
+def ensure_config():
+    """
+    Double-check that Git has an e-mail configured.
+    """
+    subprocess.check_output(['git', 'config', 'user.email'])
+
+
 if __name__ == '__main__':
     print("Cutting release at", get_version())
+    ensure_config()
     update_changelog()
     bump_version()

From 53c284b325959a6fd177e9d37d8b5dd5824db2b3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 6 Apr 2020 16:35:56 -0400
Subject: [PATCH 7788/8469] Pass environment variables when running finalize.
 Fixes #2057.

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 347106ec37..aa99e28367 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,6 +65,7 @@ skip_install = True
 deps =
 	towncrier
 	bump2version
+passenv = *
 commands =
 	python tools/finalize.py
 

From e5f3305933e65fbebe1562a3625cf16abb10a10b Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sat, 11 Apr 2020 18:11:31 +0000
Subject: [PATCH 7789/8469] change: Mac OS X -> macOS

Signed-off-by: Reece Dunham <me@rdil.rocks>
---
 .gitignore                       |  1 +
 CHANGES.rst                      | 10 +++++-----
 docs/history.txt                 |  2 +-
 docs/pkg_resources.txt           |  6 +++---
 pkg_resources/__init__.py        | 26 +++++++++++++-------------
 pkg_resources/_vendor/appdirs.py | 21 ++++++++++-----------
 pkg_resources/api_tests.txt      |  4 ++--
 setuptools/package_index.py      |  2 +-
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c272d1c74..90ae80505e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ setuptools.egg-info
 .cache
 .idea/
 .pytest_cache/
+.mypy_cache/
diff --git a/CHANGES.rst b/CHANGES.rst
index f97f514208..201ac692e4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1461,7 +1461,7 @@ v21.1.0
 * #572: In build_ext, now always import ``_CONFIG_VARS``
   from ``distutils`` rather than from ``sysconfig``
   to allow ``distutils.sysconfig.customize_compiler``
-  configure the OS X compiler for ``-dynamiclib``.
+  configure the macOS compiler for ``-dynamiclib``.
 
 v21.0.0
 -------
@@ -1881,7 +1881,7 @@ v20.6.0
   require that Cython be present before building source distributions.
   However, for systems with this build of setuptools, Cython will be
   downloaded on demand.
-* Issue #396: Fixed test failure on OS X.
+* Issue #396: Fixed test failure on macOS.
 * BB Pull Request #136: Remove excessive quoting from shebang headers
   for Jython.
 
@@ -3078,7 +3078,7 @@ how it parses version numbers.
 * Distribute #306: Even if 2to3 is used, we build in-place under Python 2.
 * Distribute #307: Prints the full path when .svn/entries is broken.
 * Distribute #313: Support for sdist subcommands (Python 2.7)
-* Distribute #314: test_local_index() would fail an OS X.
+* Distribute #314: test_local_index() would fail an macOS.
 * Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
 * Distribute #218: Improved documentation on behavior of `package_data` and
   `include_package_data`. Files indicated by `package_data` are now included
@@ -4105,7 +4105,7 @@ easy_install
    based on a contribution by Kevin Dangoor.  You may wish to delete and
    reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
    because the format for this platform information has changed so that minor
-   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
+   macOS upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
    previous OS version to become obsolete.
 
  * easy_install's dependency processing algorithms have changed.  When using
@@ -4118,7 +4118,7 @@ easy_install
 
  * Added ``--site-dirs`` option to allow adding custom "site" directories.
    Made ``easy-install.pth`` work in platform-specific alternate site
-   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
+   directories (e.g. ``~/Library/Python/2.x/site-packages`` on macOS).
 
  * If you manually delete the current version of a package, the next run of
    EasyInstall against the target directory will now remove the stray entry
diff --git a/docs/history.txt b/docs/history.txt
index 385cfa7eda..faf7adfe2c 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -12,7 +12,7 @@ Credits
 
 * The original design for the ``.egg`` format and the ``pkg_resources`` API was
   co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
-  version of ``pkg_resources``, and supplied the OS X operating system version
+  version of ``pkg_resources``, and supplied the macOS operating system version
   compatibility algorithm.
 
 * Ian Bicking implemented many early "creature comfort" features of
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index b887a9239f..71568c1a1a 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1621,7 +1621,7 @@ Platform Utilities
 
 ``get_build_platform()``
     Return this platform's identifier string.  For Windows, the return value
-    is ``"win32"``, and for Mac OS X it is a string of the form
+    is ``"win32"``, and for macOS it is a string of the form
     ``"macosx-10.4-ppc"``.  All other platforms return the same uname-based
     string that the ``distutils.util.get_platform()`` function returns.
     This string is the minimum platform version required by distributions built
@@ -1641,7 +1641,7 @@ Platform Utilities
     considered a wildcard, and the platforms are therefore compatible.
     Likewise, if the platform strings are equal, they're also considered
     compatible, and ``True`` is returned.  Currently, the only non-equal
-    platform strings that are considered compatible are Mac OS X platform
+    platform strings that are considered compatible are macOS platform
     strings with the same hardware type (e.g. ``ppc``) and major version
     (e.g. ``10``) with the `provided` platform's minor version being less than
     or equal to the `required` platform's minor version.
@@ -1674,7 +1674,7 @@ File/Path Utilities
     the same filesystem location if they have equal ``normalized_path()``
     values.  Specifically, this is a shortcut for calling ``os.path.realpath``
     and ``os.path.normcase`` on `path`.  Unfortunately, on certain platforms
-    (notably Cygwin and Mac OS X) the ``normcase`` function does not accurately
+    (notably Cygwin and macOS) the ``normcase`` function does not accurately
     reflect the platform's case-sensitivity, so there is always the possibility
     of two apparently-different paths being equal on such platforms.
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 75563f95df..e7f863b108 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -179,10 +179,10 @@ def get_supported_platform():
     """Return this platform's maximum compatible version.
 
     distutils.util.get_platform() normally reports the minimum version
-    of Mac OS X that would be required to *use* extensions produced by
+    of macOS that would be required to *use* extensions produced by
     distutils.  But what we want when checking compatibility is to know the
-    version of Mac OS X that we are *running*.  To allow usage of packages that
-    explicitly require a newer version of Mac OS X, we must also know the
+    version of macOS that we are *running*.  To allow usage of packages that
+    explicitly require a newer version of macOS, we must also know the
     current version of the OS.
 
     If this condition occurs for any other platform with a version in its
@@ -192,9 +192,9 @@ def get_supported_platform():
     m = macosVersionString.match(plat)
     if m is not None and sys.platform == "darwin":
         try:
-            plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
+            plat = 'macosx-%s-%s' % ('.'.join(_macos_vers()[:2]), m.group(3))
         except ValueError:
-            # not Mac OS X
+            # not macOS
             pass
     return plat
 
@@ -365,7 +365,7 @@ def get_provider(moduleOrReq):
     return _find_adapter(_provider_factories, loader)(module)
 
 
-def _macosx_vers(_cache=[]):
+def _macos_vers(_cache=[]):
     if not _cache:
         version = platform.mac_ver()[0]
         # fallback for MacPorts
@@ -381,7 +381,7 @@ def _macosx_vers(_cache=[]):
     return _cache[0]
 
 
-def _macosx_arch(machine):
+def _macos_arch(machine):
     return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
 
 
@@ -389,18 +389,18 @@ def get_build_platform():
     """Return this platform's string for platform-specific distributions
 
     XXX Currently this is the same as ``distutils.util.get_platform()``, but it
-    needs some hacks for Linux and Mac OS X.
+    needs some hacks for Linux and macOS.
     """
     from sysconfig import get_platform
 
     plat = get_platform()
     if sys.platform == "darwin" and not plat.startswith('macosx-'):
         try:
-            version = _macosx_vers()
+            version = _macos_vers()
             machine = os.uname()[4].replace(" ", "_")
             return "macosx-%d.%d-%s" % (
                 int(version[0]), int(version[1]),
-                _macosx_arch(machine),
+                _macos_arch(machine),
             )
         except ValueError:
             # if someone is running a non-Mac darwin system, this will fall
@@ -426,7 +426,7 @@ def compatible_platforms(provided, required):
         # easy case
         return True
 
-    # Mac OS X special cases
+    # macOS special cases
     reqMac = macosVersionString.match(required)
     if reqMac:
         provMac = macosVersionString.match(provided)
@@ -435,7 +435,7 @@ def compatible_platforms(provided, required):
         if not provMac:
             # this is backwards compatibility for packages built before
             # setuptools 0.6. All packages built after this point will
-            # use the new macosx designation.
+            # use the new macOS designation.
             provDarwin = darwinVersionString.match(provided)
             if provDarwin:
                 dversion = int(provDarwin.group(1))
@@ -443,7 +443,7 @@ def compatible_platforms(provided, required):
                 if dversion == 7 and macosversion >= "10.3" or \
                         dversion == 8 and macosversion >= "10.4":
                     return True
-            # egg isn't macosx or legacy darwin
+            # egg isn't macOS or legacy darwin
             return False
 
         # are they the same major version and machine type?
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
index ae67001af8..4552cbbf16 100644
--- a/pkg_resources/_vendor/appdirs.py
+++ b/pkg_resources/_vendor/appdirs.py
@@ -8,10 +8,9 @@
 See <http://github.com/ActiveState/appdirs> for details and usage.
 """
 # Dev Notes:
-# - MSDN on where to store app data files:
-#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
-# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+# - MSDN on where to store app data files: (TODO: needs new link)
+# - macOS: (TODO: needs new link)
+# - XDG spec for Un*x: https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
 __version_info__ = (1, 4, 3)
 __version__ = '.'.join(map(str, __version_info__))
@@ -64,7 +63,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
+        macOS:                 ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
         Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
@@ -118,7 +117,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             if XDG_DATA_DIRS is not set
 
     Typical site data directories are:
-        Mac OS X:   /Library/Application Support/<AppName>
+        macOS:      /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
         Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
@@ -185,7 +184,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user config directories are:
-        Mac OS X:               same as user_data_dir
+        macOS:                  same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
@@ -223,7 +222,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
     Typical site config directories are:
-        Mac OS X:   same as site_data_dir
+        macOS:      same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
         Win *:      same as site_data_dir
@@ -273,7 +272,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
             discussion below.
 
     Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
+        macOS:     ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
@@ -333,7 +332,7 @@ def user_state_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user state directories are:
-        Mac OS X:  same as user_data_dir
+        macOS:     same as user_data_dir
         Unix:      ~/.local/state/<AppName>   # or in $XDG_STATE_HOME, if defined
         Win *:     same as user_data_dir
 
@@ -372,7 +371,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             base cache dir for Unix. See discussion below.
 
     Typical user log directories are:
-        Mac OS X:   ~/Library/Logs/<AppName>
+        macOS:      ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 7ae5a038d2..ded18800fe 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -290,8 +290,8 @@ Platform Compatibility Rules
 ----------------------------
 
 On the Mac, there are potential compatibility issues for modules compiled
-on newer versions of Mac OS X than what the user is running. Additionally,
-Mac OS X will soon have two platforms to contend with: Intel and PowerPC.
+on newer versions of macOS than what the user is running. Additionally,
+macOS will soon have two platforms to contend with: Intel and PowerPC.
 
 Basic equality works as on other platforms::
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 82eb45169f..918060917c 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1051,7 +1051,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     parsed = urllib.parse.urlparse(url)
     scheme, netloc, path, params, query, frag = parsed
 
-    # Double scheme does not raise on Mac OS X as revealed by a
+    # Double scheme does not raise on macOS as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
     if netloc.endswith(':'):
         raise http_client.InvalidURL("nonnumeric port: ''")

From bafe5abd8c715fa18a06bfd62e685802a2a74ce8 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sat, 11 Apr 2020 18:11:31 +0000
Subject: [PATCH 7790/8469] change: Mac OS X -> macOS

Signed-off-by: Reece Dunham <me@rdil.rocks>
---
 .gitignore                       |  1 +
 CHANGES.rst                      | 10 +++++-----
 docs/history.txt                 |  2 +-
 docs/pkg_resources.txt           |  6 +++---
 pkg_resources/__init__.py        | 26 +++++++++++++-------------
 pkg_resources/_vendor/appdirs.py | 21 ++++++++++-----------
 pkg_resources/api_tests.txt      |  4 ++--
 setuptools/package_index.py      |  2 +-
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c272d1c74..90ae80505e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ setuptools.egg-info
 .cache
 .idea/
 .pytest_cache/
+.mypy_cache/
diff --git a/CHANGES.rst b/CHANGES.rst
index ac61c17882..c145eb3949 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1519,7 +1519,7 @@ v21.1.0
 * #572: In build_ext, now always import ``_CONFIG_VARS``
   from ``distutils`` rather than from ``sysconfig``
   to allow ``distutils.sysconfig.customize_compiler``
-  configure the OS X compiler for ``-dynamiclib``.
+  configure the macOS compiler for ``-dynamiclib``.
 
 v21.0.0
 -------
@@ -1939,7 +1939,7 @@ v20.6.0
   require that Cython be present before building source distributions.
   However, for systems with this build of setuptools, Cython will be
   downloaded on demand.
-* Issue #396: Fixed test failure on OS X.
+* Issue #396: Fixed test failure on macOS.
 * BB Pull Request #136: Remove excessive quoting from shebang headers
   for Jython.
 
@@ -3136,7 +3136,7 @@ how it parses version numbers.
 * Distribute #306: Even if 2to3 is used, we build in-place under Python 2.
 * Distribute #307: Prints the full path when .svn/entries is broken.
 * Distribute #313: Support for sdist subcommands (Python 2.7)
-* Distribute #314: test_local_index() would fail an OS X.
+* Distribute #314: test_local_index() would fail an macOS.
 * Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
 * Distribute #218: Improved documentation on behavior of `package_data` and
   `include_package_data`. Files indicated by `package_data` are now included
@@ -4163,7 +4163,7 @@ easy_install
    based on a contribution by Kevin Dangoor.  You may wish to delete and
    reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
    because the format for this platform information has changed so that minor
-   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
+   macOS upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
    previous OS version to become obsolete.
 
  * easy_install's dependency processing algorithms have changed.  When using
@@ -4176,7 +4176,7 @@ easy_install
 
  * Added ``--site-dirs`` option to allow adding custom "site" directories.
    Made ``easy-install.pth`` work in platform-specific alternate site
-   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
+   directories (e.g. ``~/Library/Python/2.x/site-packages`` on macOS).
 
  * If you manually delete the current version of a package, the next run of
    EasyInstall against the target directory will now remove the stray entry
diff --git a/docs/history.txt b/docs/history.txt
index 385cfa7eda..faf7adfe2c 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -12,7 +12,7 @@ Credits
 
 * The original design for the ``.egg`` format and the ``pkg_resources`` API was
   co-created by Phillip Eby and Bob Ippolito. Bob also implemented the first
-  version of ``pkg_resources``, and supplied the OS X operating system version
+  version of ``pkg_resources``, and supplied the macOS operating system version
   compatibility algorithm.
 
 * Ian Bicking implemented many early "creature comfort" features of
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index b887a9239f..71568c1a1a 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1621,7 +1621,7 @@ Platform Utilities
 
 ``get_build_platform()``
     Return this platform's identifier string.  For Windows, the return value
-    is ``"win32"``, and for Mac OS X it is a string of the form
+    is ``"win32"``, and for macOS it is a string of the form
     ``"macosx-10.4-ppc"``.  All other platforms return the same uname-based
     string that the ``distutils.util.get_platform()`` function returns.
     This string is the minimum platform version required by distributions built
@@ -1641,7 +1641,7 @@ Platform Utilities
     considered a wildcard, and the platforms are therefore compatible.
     Likewise, if the platform strings are equal, they're also considered
     compatible, and ``True`` is returned.  Currently, the only non-equal
-    platform strings that are considered compatible are Mac OS X platform
+    platform strings that are considered compatible are macOS platform
     strings with the same hardware type (e.g. ``ppc``) and major version
     (e.g. ``10``) with the `provided` platform's minor version being less than
     or equal to the `required` platform's minor version.
@@ -1674,7 +1674,7 @@ File/Path Utilities
     the same filesystem location if they have equal ``normalized_path()``
     values.  Specifically, this is a shortcut for calling ``os.path.realpath``
     and ``os.path.normcase`` on `path`.  Unfortunately, on certain platforms
-    (notably Cygwin and Mac OS X) the ``normcase`` function does not accurately
+    (notably Cygwin and macOS) the ``normcase`` function does not accurately
     reflect the platform's case-sensitivity, so there is always the possibility
     of two apparently-different paths being equal on such platforms.
 
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 15a4401afe..b0a49d86c8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -179,10 +179,10 @@ def get_supported_platform():
     """Return this platform's maximum compatible version.
 
     distutils.util.get_platform() normally reports the minimum version
-    of Mac OS X that would be required to *use* extensions produced by
+    of macOS that would be required to *use* extensions produced by
     distutils.  But what we want when checking compatibility is to know the
-    version of Mac OS X that we are *running*.  To allow usage of packages that
-    explicitly require a newer version of Mac OS X, we must also know the
+    version of macOS that we are *running*.  To allow usage of packages that
+    explicitly require a newer version of macOS, we must also know the
     current version of the OS.
 
     If this condition occurs for any other platform with a version in its
@@ -192,9 +192,9 @@ def get_supported_platform():
     m = macosVersionString.match(plat)
     if m is not None and sys.platform == "darwin":
         try:
-            plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
+            plat = 'macosx-%s-%s' % ('.'.join(_macos_vers()[:2]), m.group(3))
         except ValueError:
-            # not Mac OS X
+            # not macOS
             pass
     return plat
 
@@ -365,7 +365,7 @@ def get_provider(moduleOrReq):
     return _find_adapter(_provider_factories, loader)(module)
 
 
-def _macosx_vers(_cache=[]):
+def _macos_vers(_cache=[]):
     if not _cache:
         version = platform.mac_ver()[0]
         # fallback for MacPorts
@@ -381,7 +381,7 @@ def _macosx_vers(_cache=[]):
     return _cache[0]
 
 
-def _macosx_arch(machine):
+def _macos_arch(machine):
     return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
 
 
@@ -389,18 +389,18 @@ def get_build_platform():
     """Return this platform's string for platform-specific distributions
 
     XXX Currently this is the same as ``distutils.util.get_platform()``, but it
-    needs some hacks for Linux and Mac OS X.
+    needs some hacks for Linux and macOS.
     """
     from sysconfig import get_platform
 
     plat = get_platform()
     if sys.platform == "darwin" and not plat.startswith('macosx-'):
         try:
-            version = _macosx_vers()
+            version = _macos_vers()
             machine = os.uname()[4].replace(" ", "_")
             return "macosx-%d.%d-%s" % (
                 int(version[0]), int(version[1]),
-                _macosx_arch(machine),
+                _macos_arch(machine),
             )
         except ValueError:
             # if someone is running a non-Mac darwin system, this will fall
@@ -426,7 +426,7 @@ def compatible_platforms(provided, required):
         # easy case
         return True
 
-    # Mac OS X special cases
+    # macOS special cases
     reqMac = macosVersionString.match(required)
     if reqMac:
         provMac = macosVersionString.match(provided)
@@ -435,7 +435,7 @@ def compatible_platforms(provided, required):
         if not provMac:
             # this is backwards compatibility for packages built before
             # setuptools 0.6. All packages built after this point will
-            # use the new macosx designation.
+            # use the new macOS designation.
             provDarwin = darwinVersionString.match(provided)
             if provDarwin:
                 dversion = int(provDarwin.group(1))
@@ -443,7 +443,7 @@ def compatible_platforms(provided, required):
                 if dversion == 7 and macosversion >= "10.3" or \
                         dversion == 8 and macosversion >= "10.4":
                     return True
-            # egg isn't macosx or legacy darwin
+            # egg isn't macOS or legacy darwin
             return False
 
         # are they the same major version and machine type?
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
index ae67001af8..4552cbbf16 100644
--- a/pkg_resources/_vendor/appdirs.py
+++ b/pkg_resources/_vendor/appdirs.py
@@ -8,10 +8,9 @@
 See <http://github.com/ActiveState/appdirs> for details and usage.
 """
 # Dev Notes:
-# - MSDN on where to store app data files:
-#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
-# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+# - MSDN on where to store app data files: (TODO: needs new link)
+# - macOS: (TODO: needs new link)
+# - XDG spec for Un*x: https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
 __version_info__ = (1, 4, 3)
 __version__ = '.'.join(map(str, __version_info__))
@@ -64,7 +63,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
+        macOS:                 ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
         Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
@@ -118,7 +117,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             if XDG_DATA_DIRS is not set
 
     Typical site data directories are:
-        Mac OS X:   /Library/Application Support/<AppName>
+        macOS:      /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
         Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
@@ -185,7 +184,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user config directories are:
-        Mac OS X:               same as user_data_dir
+        macOS:                  same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
@@ -223,7 +222,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
     Typical site config directories are:
-        Mac OS X:   same as site_data_dir
+        macOS:      same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
         Win *:      same as site_data_dir
@@ -273,7 +272,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
             discussion below.
 
     Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
+        macOS:     ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
@@ -333,7 +332,7 @@ def user_state_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user state directories are:
-        Mac OS X:  same as user_data_dir
+        macOS:     same as user_data_dir
         Unix:      ~/.local/state/<AppName>   # or in $XDG_STATE_HOME, if defined
         Win *:     same as user_data_dir
 
@@ -372,7 +371,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             base cache dir for Unix. See discussion below.
 
     Typical user log directories are:
-        Mac OS X:   ~/Library/Logs/<AppName>
+        macOS:      ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt
index 7ae5a038d2..ded18800fe 100644
--- a/pkg_resources/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -290,8 +290,8 @@ Platform Compatibility Rules
 ----------------------------
 
 On the Mac, there are potential compatibility issues for modules compiled
-on newer versions of Mac OS X than what the user is running. Additionally,
-Mac OS X will soon have two platforms to contend with: Intel and PowerPC.
+on newer versions of macOS than what the user is running. Additionally,
+macOS will soon have two platforms to contend with: Intel and PowerPC.
 
 Basic equality works as on other platforms::
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 7a802413cb..0744ea2ad1 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1053,7 +1053,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     parsed = urllib.parse.urlparse(url)
     scheme, netloc, path, params, query, frag = parsed
 
-    # Double scheme does not raise on Mac OS X as revealed by a
+    # Double scheme does not raise on macOS as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
     if netloc.endswith(':'):
         raise http_client.InvalidURL("nonnumeric port: ''")

From 63b03e3610303163727308152590bcf78d5dc439 Mon Sep 17 00:00:00 2001
From: Reece Dunham <me@rdil.rocks>
Date: Sat, 11 Apr 2020 18:16:22 +0000
Subject: [PATCH 7791/8469] news fragment

---
 changelog.d/2062.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2062.change.rst

diff --git a/changelog.d/2062.change.rst b/changelog.d/2062.change.rst
new file mode 100644
index 0000000000..1f5fd8122e
--- /dev/null
+++ b/changelog.d/2062.change.rst
@@ -0,0 +1 @@
+Change 'Mac OS X' to 'macOS' in code.

From 9bfc5fa5fd0da9254c2e95edb42da3fb65893f75 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Sun, 16 Feb 2020 16:07:02 +0200
Subject: [PATCH 7792/8469] Deprecate bdist_wininst

---
 setuptools/command/bdist_wininst.py         |  9 ++++++++
 setuptools/tests/test_bdist_deprecations.py | 23 +++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 setuptools/tests/test_bdist_deprecations.py

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
index 073de97b46..ff4b634592 100644
--- a/setuptools/command/bdist_wininst.py
+++ b/setuptools/command/bdist_wininst.py
@@ -1,4 +1,7 @@
 import distutils.command.bdist_wininst as orig
+import warnings
+
+from setuptools import SetuptoolsDeprecationWarning
 
 
 class bdist_wininst(orig.bdist_wininst):
@@ -14,6 +17,12 @@ def reinitialize_command(self, command, reinit_subcommands=0):
         return cmd
 
     def run(self):
+        warnings.warn(
+            "bdist_wininst is deprecated and will be removed in a future "
+            "version. Use bdist_wheel (wheel packages) instead.",
+            SetuptoolsDeprecationWarning
+        )
+
         self._is_running = True
         try:
             orig.bdist_wininst.run(self)
diff --git a/setuptools/tests/test_bdist_deprecations.py b/setuptools/tests/test_bdist_deprecations.py
new file mode 100644
index 0000000000..704164aacb
--- /dev/null
+++ b/setuptools/tests/test_bdist_deprecations.py
@@ -0,0 +1,23 @@
+"""develop tests
+"""
+import mock
+
+import pytest
+
+from setuptools.dist import Distribution
+from setuptools import SetuptoolsDeprecationWarning
+
+
+@mock.patch("distutils.command.bdist_wininst.bdist_wininst")
+def test_bdist_wininst_warning(distutils_cmd):
+    dist = Distribution(dict(
+        script_name='setup.py',
+        script_args=['bdist_wininst'],
+        name='foo',
+        py_modules=['hi'],
+    ))
+    dist.parse_command_line()
+    with pytest.warns(SetuptoolsDeprecationWarning):
+        dist.run_commands()
+
+    distutils_cmd.run.assert_called_once()

From 8487f1ae61f50578d9adb314429eb578e8e9f0c9 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Sun, 22 Mar 2020 20:53:33 +0200
Subject: [PATCH 7793/8469] Add news fragment

---
 changelog.d/2040.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2040.change.rst

diff --git a/changelog.d/2040.change.rst b/changelog.d/2040.change.rst
new file mode 100644
index 0000000000..b8f36f6fb4
--- /dev/null
+++ b/changelog.d/2040.change.rst
@@ -0,0 +1 @@
+Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.

From 74e9f56dc7857cee680727406517c2c086511e12 Mon Sep 17 00:00:00 2001
From: Joshua Root <jmr@macports.org>
Date: Wed, 22 Apr 2020 17:44:10 +1000
Subject: [PATCH 7794/8469] bpo-38360: macOS: support alternate form of
 -isysroot flag (GH-16480)

It is possible to use either '-isysroot /some/path' (with a space) or
'-isysroot/some/path' (no space in between). Support both forms in
places where special handling of -isysroot is done, rather than just
the first form.
Co-authored-by: Ned Deily <nad@python.org>
---
 unixccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unixccompiler.py b/unixccompiler.py
index d10a78da31..4d7a6de740 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -288,7 +288,7 @@ def find_library_file(self, dirs, lib, debug=0):
             # vs
             #   /usr/lib/libedit.dylib
             cflags = sysconfig.get_config_var('CFLAGS')
-            m = re.search(r'-isysroot\s+(\S+)', cflags)
+            m = re.search(r'-isysroot\s*(\S+)', cflags)
             if m is None:
                 sysroot = '/'
             else:

From d11428b1cc059ff6aa0ddec0bd8354a1df68d752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <mcsinyx@disroot.org>
Date: Fri, 24 Apr 2020 22:34:10 +0700
Subject: [PATCH 7795/8469] Stop recognizing files ending with .dist-info as
 dist

As proposed in PEP 376, dist-info distributions must be directories.
---
 changelog.d/2075.breaking.rst             |  1 +
 pkg_resources/__init__.py                 | 30 +++++++++++------------
 pkg_resources/tests/test_pkg_resources.py |  8 ++++++
 3 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 changelog.d/2075.breaking.rst

diff --git a/changelog.d/2075.breaking.rst b/changelog.d/2075.breaking.rst
new file mode 100644
index 0000000000..8d88b33f21
--- /dev/null
+++ b/changelog.d/2075.breaking.rst
@@ -0,0 +1 @@
+Stop recognizing files ending with ``.dist-info`` as distribution metadata
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 15a4401afe..4d15086f5e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2056,33 +2056,31 @@ def find_on_path(importer, path_item, only=False):
     filtered = (
         entry
         for entry in entries
-        if dist_factory(path_item, entry, only)
+        if dist_factory(entry, only)
     )
 
     # scan for .egg and .egg-info in directory
     path_item_entries = _by_version_descending(filtered)
     for entry in path_item_entries:
         fullpath = os.path.join(path_item, entry)
-        factory = dist_factory(path_item, entry, only)
+        factory = dist_factory(entry, only)
         for dist in factory(fullpath):
             yield dist
 
 
-def dist_factory(path_item, entry, only):
-    """
-    Return a dist_factory for a path_item and entry
-    """
+def dist_factory(entry, only):
+    """Return a dist_factory for the given entry."""
     lower = entry.lower()
-    is_meta = any(map(lower.endswith, ('.egg-info', '.dist-info')))
-    return (
-        distributions_from_metadata
-        if is_meta else
-        find_distributions
-        if not only and _is_egg_path(entry) else
-        resolve_egg_link
-        if not only and lower.endswith('.egg-link') else
-        NoDists()
-    )
+    if lower.endswith('.egg-info'):
+        return distributions_from_metadata
+    elif lower.endswith('.dist-info') and os.path.isdir(entry):
+        return distributions_from_metadata
+    elif not only and _is_egg_path(entry):
+        return find_distributions
+    elif not only and lower.endswith('.egg-link'):
+        return resolve_egg_link
+    else:
+        return NoDists()
 
 
 class NoDists:
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 78281869a6..1c66dec055 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -330,6 +330,14 @@ def test_distribution_version_missing_undetected_path():
     assert msg == expected
 
 
+@pytest.mark.parametrize('only', [False, True])
+def test_dist_info_is_not_dir(tmp_path, only):
+    """Test path containing a file with dist-info extension."""
+    dist_info = tmp_path / 'foobar.dist-info'
+    dist_info.touch()
+    assert not pkg_resources.dist_factory(str(dist_info), only)
+
+
 class TestDeepVersionLookupDistutils:
     @pytest.fixture
     def env(self, tmpdir):

From ea19518aa139d623a4fad7d01159674ee43b9f15 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Thu, 30 Apr 2020 02:21:30 +0200
Subject: [PATCH 7796/8469] bpo-40443: Remove unused imports in tests
 (GH-19804)

---
 tests/test_build_clib.py | 1 -
 tests/test_config_cmd.py | 1 -
 tests/test_dist.py       | 2 +-
 tests/test_spawn.py      | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/test_build_clib.py b/tests/test_build_clib.py
index 85d09906f2..abd8313770 100644
--- a/tests/test_build_clib.py
+++ b/tests/test_build_clib.py
@@ -8,7 +8,6 @@
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
-from distutils.spawn import find_executable
 
 class BuildCLibTestCase(support.TempdirManager,
                         support.LoggingSilencer,
diff --git a/tests/test_config_cmd.py b/tests/test_config_cmd.py
index 8bd2c94237..9aeab07b46 100644
--- a/tests/test_config_cmd.py
+++ b/tests/test_config_cmd.py
@@ -39,7 +39,6 @@ def test_dump_file(self):
 
     @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_search_cpp(self):
-        import shutil
         cmd = missing_compiler_executable(['preprocessor'])
         if cmd is not None:
             self.skipTest('The %r command is not found' % cmd)
diff --git a/tests/test_dist.py b/tests/test_dist.py
index cc34725a99..60956dadef 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -8,7 +8,7 @@
 
 from unittest import mock
 
-from distutils.dist import Distribution, fix_help_options, DistributionMetadata
+from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 
 from test.support import (
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 73b0f5cb73..cf1faad5f4 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -2,8 +2,7 @@
 import os
 import stat
 import sys
-import unittest
-from unittest import mock
+import unittest.mock
 from test.support import run_unittest, unix_shell
 from test import support as test_support
 

From b36de51a8f36849b126ba46846cbddd00cd2ba8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 30 Apr 2020 10:19:03 +0200
Subject: [PATCH 7797/8469] Filter lib2to3 (Pending)DeprecationWarning in
 testes

lib2to3 is deprecated in Python 3.9: https://bugs.python.org/issue40360

Workarounds https://github.com/pypa/setuptools/issues/2081
---
 changelog.d/2082.misc.rst | 2 ++
 pytest.ini                | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 changelog.d/2082.misc.rst

diff --git a/changelog.d/2082.misc.rst b/changelog.d/2082.misc.rst
new file mode 100644
index 0000000000..81ad5d5853
--- /dev/null
+++ b/changelog.d/2082.misc.rst
@@ -0,0 +1,2 @@
+Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
+because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
diff --git a/pytest.ini b/pytest.ini
index b13b7f3363..479a2965ea 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -20,3 +20,6 @@ filterwarnings =
     ignore:Unicode unequal comparison failed to convert:UnicodeWarning
     # https://github.com/pypa/setuptools/issues/2025
     ignore:direct construction of .*Item has been deprecated:DeprecationWarning
+    # https://github.com/pypa/setuptools/issues/2081
+    ignore:lib2to3 package is deprecated:PendingDeprecationWarning
+    ignore:lib2to3 package is deprecated:DeprecationWarning

From a672328f1e2515f5b103df12d19fa3c2ffba68fc Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Thu, 30 Apr 2020 11:28:09 +0200
Subject: [PATCH 7798/8469] bpo-40443: Remove unused imports in distutils
 (GH-19802)

---
 _msvccompiler.py         | 4 ----
 bcppcompiler.py          | 4 ++--
 ccompiler.py             | 2 +-
 command/bdist_rpm.py     | 1 -
 command/bdist_wininst.py | 2 +-
 command/check.py         | 1 -
 command/upload.py        | 1 -
 cygwinccompiler.py       | 2 --
 msvc9compiler.py         | 3 +--
 msvccompiler.py          | 2 +-
 sysconfig.py             | 1 -
 11 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/_msvccompiler.py b/_msvccompiler.py
index 03a5986d98..af8099a407 100644
--- a/_msvccompiler.py
+++ b/_msvccompiler.py
@@ -14,8 +14,6 @@
 # ported to VS 2015 by Steve Dower
 
 import os
-import shutil
-import stat
 import subprocess
 import winreg
 
@@ -65,8 +63,6 @@ def _find_vc2017():
     If vswhere.exe is not available, by definition, VS 2017 is not
     installed.
     """
-    import json
-
     root = os.environ.get("ProgramFiles(x86)") or os.environ.get("ProgramFiles")
     if not root:
         return None, None
diff --git a/bcppcompiler.py b/bcppcompiler.py
index 9f4c432d90..071fea5d03 100644
--- a/bcppcompiler.py
+++ b/bcppcompiler.py
@@ -14,10 +14,10 @@
 
 import os
 from distutils.errors import \
-     DistutilsExecError, DistutilsPlatformError, \
+     DistutilsExecError, \
      CompileError, LibError, LinkError, UnknownFileError
 from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+     CCompiler, gen_preprocess_options
 from distutils.file_util import write_file
 from distutils.dep_util import newer
 from distutils import log
diff --git a/ccompiler.py b/ccompiler.py
index 4cfc6c7065..b5ef143e72 100644
--- a/ccompiler.py
+++ b/ccompiler.py
@@ -8,7 +8,7 @@
 from distutils.spawn import spawn
 from distutils.file_util import move_file
 from distutils.dir_util import mkpath
-from distutils.dep_util import newer_pairwise, newer_group
+from distutils.dep_util import newer_group
 from distutils.util import split_quoted, execute
 from distutils import log
 
diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py
index 74381cc69a..550cbfa1e2 100644
--- a/command/bdist_rpm.py
+++ b/command/bdist_rpm.py
@@ -6,7 +6,6 @@
 import subprocess, sys, os
 from distutils.core import Command
 from distutils.debug import DEBUG
-from distutils.util import get_platform
 from distutils.file_util import write_file
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py
index b5ed6f041e..0e9ddaa214 100644
--- a/command/bdist_wininst.py
+++ b/command/bdist_wininst.py
@@ -8,7 +8,7 @@
 import warnings
 from distutils.core import Command
 from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
+from distutils.dir_util import remove_tree
 from distutils.errors import *
 from distutils.sysconfig import get_python_version
 from distutils import log
diff --git a/command/check.py b/command/check.py
index 7ceabd3adf..ada2500646 100644
--- a/command/check.py
+++ b/command/check.py
@@ -11,7 +11,6 @@
     from docutils.parsers.rst import Parser
     from docutils import frontend
     from docutils import nodes
-    from io import StringIO
 
     class SilentReporter(Reporter):
 
diff --git a/command/upload.py b/command/upload.py
index 11afa24b77..d822ba0133 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -7,7 +7,6 @@
 
 import os
 import io
-import platform
 import hashlib
 from base64 import standard_b64encode
 from urllib.request import urlopen, Request, HTTPError
diff --git a/cygwinccompiler.py b/cygwinccompiler.py
index 6c5d77746b..66c12dd358 100644
--- a/cygwinccompiler.py
+++ b/cygwinccompiler.py
@@ -51,12 +51,10 @@
 from subprocess import Popen, PIPE, check_output
 import re
 
-from distutils.ccompiler import gen_preprocess_options, gen_lib_options
 from distutils.unixccompiler import UnixCCompiler
 from distutils.file_util import write_file
 from distutils.errors import (DistutilsExecError, CCompilerError,
         CompileError, UnknownFileError)
-from distutils import log
 from distutils.version import LooseVersion
 from distutils.spawn import find_executable
 
diff --git a/msvc9compiler.py b/msvc9compiler.py
index 4c0036a0f1..6934e964ab 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -19,8 +19,7 @@
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError
-from distutils.ccompiler import CCompiler, gen_preprocess_options, \
-                                gen_lib_options
+from distutils.ccompiler import CCompiler, gen_lib_options
 from distutils import log
 from distutils.util import get_platform
 
diff --git a/msvccompiler.py b/msvccompiler.py
index d1de2fbfcb..d5857cb1ff 100644
--- a/msvccompiler.py
+++ b/msvccompiler.py
@@ -13,7 +13,7 @@
      DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
 from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options
+     CCompiler, gen_lib_options
 from distutils import log
 
 _can_read_reg = False
diff --git a/sysconfig.py b/sysconfig.py
index 01ee519792..37feae5df7 100644
--- a/sysconfig.py
+++ b/sysconfig.py
@@ -15,7 +15,6 @@
 import sys
 
 from .errors import DistutilsPlatformError
-from .util import get_platform, get_host_platform
 
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)

From d2a64aebe4fd7b02c9d05a0cac30faac38f18977 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2020 05:51:59 -0400
Subject: [PATCH 7799/8469] Apply suggestions from code review

---
 changelog.d/1698.doc.rst |  2 +-
 docs/build_meta.txt      | 42 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/changelog.d/1698.doc.rst b/changelog.d/1698.doc.rst
index 9b61fccb4c..90dc14c1f4 100644
--- a/changelog.d/1698.doc.rst
+++ b/changelog.d/1698.doc.rst
@@ -1 +1 @@
-Added documentation for ``build_meta`` (a bare minimum, not completed)
+Added documentation for ``build_meta`` (a bare minimum, not completed).
diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index 4467dddacb..6749789148 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -1,5 +1,5 @@
 =======================================
-Documentation to setuptools.build_meta
+Build System Support
 =======================================
 
 What is it?
@@ -7,16 +7,18 @@ What is it?
 
 Python packaging has come `a long way <https://www.bernat.tech/pep-517-518/>`_.
 
-The traditional ``setuptools``'s way of packgaging Python modules
+The traditional ``setuptools`` way of packgaging Python modules
 uses a ``setup()`` function within the ``setup.py`` script. Commands such as
 ``python setup.py bdist`` or ``python setup.py bdist_wheel`` generate a 
 distribution bundle and ``python setup.py install`` installs the distribution. 
 This interface makes it difficult to choose other packaging tools without an 
-overhaul. Additionally, the ``setup.py`` scripts hasn't been the most user
-friendly tool.
+overhaul. Because ``setup.py`` scripts allowed for arbitrary execution, it
+proved difficult to provide a reliable user experience across environments
+and history.
 
-PEP517 therefore came to rescue and specified a new standard to 
-package and distribute Python modules. Under PEP517:
+`PEP 517 <https://www.python.org/dev/peps/pep-0517/>`_ therefore came to
+rescue and specified a new standard to 
+package and distribute Python modules. Under PEP 517:
 
     a ``pyproject.toml`` file is used to specify what program to use
     for generating distribution. 
@@ -35,8 +37,8 @@ package and distribute Python modules. Under PEP517:
 With this standard, switching between packaging tools becomes a lot easier and
 in the case of ``setuptools``, ``setup.py`` becomes optional.
 
-``build_meta`` is ``setuptools``'s implementation of PEP517. It provides the 
-two functions, ``build_wheel`` and ``build_sdist``, amongst others and uses 
+``build_meta`` is ``setuptools``'s implementation of PEP 517. It provides the 
+two functions, ``build_wheel`` and ``build_sdist`` amongst others, and uses 
 a ``setup.cfg`` to specify the information about the package. 
 
 How to use it?
@@ -58,7 +60,7 @@ setuptools, the content would be::
     requires = ["setuptools", "wheel"]
     build-backend = "setuptools.build_meta" 
 
-``setup.cfg`` is used to specify your package information, specified 
+Use ``setup.cfg`` to specify your package information, specified 
 `here <https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring
 -setup-using-setup-cfg-files>`_ ::
 
@@ -70,26 +72,24 @@ setuptools, the content would be::
     [options]
     packages = find:
 
-Now it's time to actually generate the distribution. PEP517 specifies two
-mandatory functions, ``build_wheel`` and ``build_sdist``, implemented in
-this module. Currently, it has to be done in the interpreter::
+Now generate the distribution. Although the PyPA is still working to
+`provide a recommended tool <https://github.com/pypa/packaging-problems/issues/219>`_
+to build packages, the `pep517 package <https://pypi.org/project/pep517`_
+provides this functionality. To build the package::
 
-    >>> import setuptools.build_meta
-    >>> setuptools.build_meta.build_wheel('wheel_dist')
-    'meowpkg-0.0.1-py3-none-any.whl'
-    >>> setuptools.build_meta.build_sdist('sdist')
-    'meowpkg-0.0.1.tar.gz'
+    $ pip install -q pep517
+    $ mkdir dist
+    $ python -m pep517.build .
 
 And now it's done! The ``.whl`` file  and ``.tar.gz`` can then be distributed 
 and installed::
 
-    ~/newcomputer/
+    dist/
         meowpkg-0.0.1.whl
         meowpkg-0.0.1.tar.gz
 
-    $ pip install meowpkg-0.0.1.whl
+    $ pip install dist/meowpkg-0.0.1.whl
 
 or::
 
-    $ pip install meowpkg-0.0.1.tar.gz
-
+    $ pip install dist/meowpkg-0.0.1.tar.gz

From cc5b5ec305100ecd897edfc7918f184ffc93c197 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2020 05:59:41 -0400
Subject: [PATCH 7800/8469] Apply suggestions from code review

---
 docs/build_meta.txt | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index 6749789148..ef9fb2ac5d 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -34,12 +34,8 @@ package and distribute Python modules. Under PEP 517:
     ``pyproject.toml`` and decide what program to use to 'build from source' 
     (the default is ``setuptools``)
 
-With this standard, switching between packaging tools becomes a lot easier and
-in the case of ``setuptools``, ``setup.py`` becomes optional.
-
-``build_meta`` is ``setuptools``'s implementation of PEP 517. It provides the 
-two functions, ``build_wheel`` and ``build_sdist`` amongst others, and uses 
-a ``setup.cfg`` to specify the information about the package. 
+With this standard, switching between packaging tools becomes a lot easier. ``build_meta``
+implements ``setuptools``' build system support.
 
 How to use it?
 --------------
@@ -60,9 +56,7 @@ setuptools, the content would be::
     requires = ["setuptools", "wheel"]
     build-backend = "setuptools.build_meta" 
 
-Use ``setup.cfg`` to specify your package information, specified 
-`here <https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring
--setup-using-setup-cfg-files>`_ ::
+Use ``setuptools``' `declarative config`_ to specify the package information::
 
     [metadata]
     name = meowpkg

From 8c360dfd6361a15d1bbdfadb5fd0927a9a4a4cef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2020 06:30:31 -0400
Subject: [PATCH 7801/8469] Revert changes to historical notes and vendored
 packages.

---
 CHANGES.rst                      | 10 +++++-----
 pkg_resources/_vendor/appdirs.py | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c145eb3949..ac61c17882 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1519,7 +1519,7 @@ v21.1.0
 * #572: In build_ext, now always import ``_CONFIG_VARS``
   from ``distutils`` rather than from ``sysconfig``
   to allow ``distutils.sysconfig.customize_compiler``
-  configure the macOS compiler for ``-dynamiclib``.
+  configure the OS X compiler for ``-dynamiclib``.
 
 v21.0.0
 -------
@@ -1939,7 +1939,7 @@ v20.6.0
   require that Cython be present before building source distributions.
   However, for systems with this build of setuptools, Cython will be
   downloaded on demand.
-* Issue #396: Fixed test failure on macOS.
+* Issue #396: Fixed test failure on OS X.
 * BB Pull Request #136: Remove excessive quoting from shebang headers
   for Jython.
 
@@ -3136,7 +3136,7 @@ how it parses version numbers.
 * Distribute #306: Even if 2to3 is used, we build in-place under Python 2.
 * Distribute #307: Prints the full path when .svn/entries is broken.
 * Distribute #313: Support for sdist subcommands (Python 2.7)
-* Distribute #314: test_local_index() would fail an macOS.
+* Distribute #314: test_local_index() would fail an OS X.
 * Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
 * Distribute #218: Improved documentation on behavior of `package_data` and
   `include_package_data`. Files indicated by `package_data` are now included
@@ -4163,7 +4163,7 @@ easy_install
    based on a contribution by Kevin Dangoor.  You may wish to delete and
    reinstall any eggs whose filename includes "darwin" and "Power_Macintosh",
    because the format for this platform information has changed so that minor
-   macOS upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
+   OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a
    previous OS version to become obsolete.
 
  * easy_install's dependency processing algorithms have changed.  When using
@@ -4176,7 +4176,7 @@ easy_install
 
  * Added ``--site-dirs`` option to allow adding custom "site" directories.
    Made ``easy-install.pth`` work in platform-specific alternate site
-   directories (e.g. ``~/Library/Python/2.x/site-packages`` on macOS).
+   directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X).
 
  * If you manually delete the current version of a package, the next run of
    EasyInstall against the target directory will now remove the stray entry
diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
index 4552cbbf16..ae67001af8 100644
--- a/pkg_resources/_vendor/appdirs.py
+++ b/pkg_resources/_vendor/appdirs.py
@@ -8,9 +8,10 @@
 See <http://github.com/ActiveState/appdirs> for details and usage.
 """
 # Dev Notes:
-# - MSDN on where to store app data files: (TODO: needs new link)
-# - macOS: (TODO: needs new link)
-# - XDG spec for Un*x: https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+# - MSDN on where to store app data files:
+#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
+# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
+# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
 __version_info__ = (1, 4, 3)
 __version__ = '.'.join(map(str, __version_info__))
@@ -63,7 +64,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        macOS:                 ~/Library/Application Support/<AppName>
+        Mac OS X:               ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
         Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
@@ -117,7 +118,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             if XDG_DATA_DIRS is not set
 
     Typical site data directories are:
-        macOS:      /Library/Application Support/<AppName>
+        Mac OS X:   /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
         Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
@@ -184,7 +185,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user config directories are:
-        macOS:                  same as user_data_dir
+        Mac OS X:               same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
@@ -222,7 +223,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
     Typical site config directories are:
-        macOS:      same as site_data_dir
+        Mac OS X:   same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
         Win *:      same as site_data_dir
@@ -272,7 +273,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
             discussion below.
 
     Typical user cache directories are:
-        macOS:     ~/Library/Caches/<AppName>
+        Mac OS X:   ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
@@ -332,7 +333,7 @@ def user_state_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user state directories are:
-        macOS:     same as user_data_dir
+        Mac OS X:  same as user_data_dir
         Unix:      ~/.local/state/<AppName>   # or in $XDG_STATE_HOME, if defined
         Win *:     same as user_data_dir
 
@@ -371,7 +372,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             base cache dir for Unix. See discussion below.
 
     Typical user log directories are:
-        macOS:      ~/Library/Logs/<AppName>
+        Mac OS X:   ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs

From 194ae0ee00f16cf6a30202ef1f35237f730f4b21 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2020 07:33:04 -0400
Subject: [PATCH 7802/8469] Update template to give more guidance, hoping to
 limit the blank submissions.

---
 .../setuptools-warns-about-python-2-incompatibility.md    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
index 14317d9367..2f5fe53dd0 100644
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -9,6 +9,10 @@ assignees: ''
 
 <!--
 
+Please DO NOT SUBMIT this template without first investigating the issue and answering the questions below. This template is intended mainly for developers of systems and not for end users. If you are an end user experiencing the warning, please work with your system maintainers (starting with the project you're trying to use) to report the issue.
+
+If you did not intend to use this template, but only meant to file a blank issue, just hit the back button and click "Open a blank issue".
+
 It's by design that Setuptools 45 and later will stop working on Python 2. To ease the transition, Setuptools 45 was released to continue to have Python 2 compatibility, but emit a strenuous warning that it will stop working.
 
 In most cases, using pip 9 or later to install Setuptools from PyPI or any index supporting the Requires-Python metadata will do the right thing and install Setuptools 44.x on Python 2.
@@ -32,8 +36,8 @@ try them first. -->
 ## Environment Details
 
 - Operating System and version:
-- Python version: 
-- Python installed how: 
+- Python version:
+- Python installed how:
 - Virtualenv version (if using virtualenv): n/a
 
 Command(s) used to install setuptools (and output):

From 40f81af021b899b76b96eef52bf020c2348e1aea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 3 May 2020 07:40:44 -0400
Subject: [PATCH 7803/8469] Remove shebang. Fixes #2076.

---
 setuptools/command/easy_install.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 64ff045718..5a9576ff29 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Easy Install
 ------------

From 61ca49c08e71fee962b760fb90f8f89bb158738b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Thu, 7 May 2020 11:39:55 -0400
Subject: [PATCH 7804/8469] Tweak note about setup.cfg

This note has gotten a bit out of date, since setup.py is no longer
required.
---
 docs/setuptools.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 22e3c87252..30a30c2612 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2106,8 +2106,9 @@ Configuring setup() using setup.cfg files
 .. note:: New in 30.3.0 (8 Dec 2016).
 
 .. important::
-    A ``setup.py`` file containing a ``setup()`` function call is still
-    required even if your configuration resides in ``setup.cfg``.
+    If compatibility with legacy builds (i.e. those not using the :pep:`517`
+    build API) is desired, a ``setup.py`` file containing a ``setup()`` function
+    call is still required even if your configuration resides in ``setup.cfg``.
 
 ``Setuptools`` allows using configuration files (usually :file:`setup.cfg`)
 to define a package’s metadata and other options that are normally supplied

From 2d607a9e59aa854b387f22d79301acb8739b133a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 13:19:52 -0400
Subject: [PATCH 7805/8469] Emit deprecation warning when 2to3 is used. Ref
 #2086.

---
 setuptools/lib2to3_ex.py      | 7 +++++++
 setuptools/tests/test_test.py | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index 4b1a73feb2..817dce409d 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -7,6 +7,7 @@
 This module raises an ImportError on Python 2.
 """
 
+import warnings
 from distutils.util import Mixin2to3 as _Mixin2to3
 from distutils import log
 from lib2to3.refactor import RefactoringTool, get_fixers_from_package
@@ -33,6 +34,12 @@ def run_2to3(self, files, doctests=False):
             return
         if not files:
             return
+
+        warnings.warn(
+            "2to3 support is deprecated. Please migrate to "
+            "a single-codebase solution or roll your own "
+            "conversion process.",
+            DeprecationWarning)
         log.info("Fixing " + " ".join(files))
         self.__build_fixer_names()
         self.__exclude_fixers()
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 8ee70a7ec3..0f77d8ff3d 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -73,7 +73,11 @@ def quiet_log():
     log.set_verbosity(0)
 
 
+ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
+
+
 @pytest.mark.usefixtures('sample_test', 'quiet_log')
+@ack_2to3
 def test_test(capfd):
     params = dict(
         name='foo',
@@ -124,6 +128,7 @@ def test_test(self):
 
 
 @pytest.mark.usefixtures('sample_test')
+@ack_2to3
 def test_warns_deprecation(capfd):
     params = dict(
         name='foo',
@@ -149,6 +154,7 @@ def test_warns_deprecation(capfd):
 
 
 @pytest.mark.usefixtures('sample_test')
+@ack_2to3
 def test_deprecation_stderr(capfd):
     params = dict(
         name='foo',

From b286525862fa0a4839f37b5836a20178293d7335 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 13:27:50 -0400
Subject: [PATCH 7806/8469] Update changelog.

---
 changelog.d/2086.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2086.change.rst

diff --git a/changelog.d/2086.change.rst b/changelog.d/2086.change.rst
new file mode 100644
index 0000000000..9fa54e5ace
--- /dev/null
+++ b/changelog.d/2086.change.rst
@@ -0,0 +1 @@
+Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.

From 0fffb84a1bc7925fbf862365787ab20e9ab89a0c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 14:03:30 -0400
Subject: [PATCH 7807/8469] In the deprecation warning, acknowledge that it's
 only for projects that still require Python 2 support.

---
 setuptools/lib2to3_ex.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index 817dce409d..6d9b147c0e 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -36,9 +36,10 @@ def run_2to3(self, files, doctests=False):
             return
 
         warnings.warn(
-            "2to3 support is deprecated. Please migrate to "
-            "a single-codebase solution or roll your own "
-            "conversion process.",
+            "2to3 support is deprecated. If the project still "
+            "requires Python 2 support, please migrate to "
+            "a single-codebase solution or employ an "
+            "independent conversion process.",
             DeprecationWarning)
         log.info("Fixing " + " ".join(files))
         self.__build_fixer_names()

From 6068b81e604c7c7c655420ffec3476a045a751c8 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:10:33 -0400
Subject: [PATCH 7808/8469] docs: reduced top index to three entries

The top index now points to three files: setuptools.txt (user guide),
development.txt (development guide) and a WIP index file that is to
summarized deprecated practice that remains relevant for backward
compatibility.
---
 docs/index.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 13a46e74ef..2f988a1809 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,10 +16,6 @@ Documentation content:
 .. toctree::
    :maxdepth: 2
 
-   setuptools
-   pkg_resources
-   python3
-   development
-   roadmap
-   Deprecated: Easy Install <easy_install>
-   history
+   User guide <setuptools>
+   Development guide <development>
+   Backward compatibility & deprecated practice <deprecated/index>

From 836e485b9419b645cb8686e1cd8a567c590aec0f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:17:29 -0400
Subject: [PATCH 7809/8469] doc: move python 2to3 doc into deprecated folder

---
 docs/{ => deprecated}/python3.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{ => deprecated}/python3.txt (100%)

diff --git a/docs/python3.txt b/docs/deprecated/python3.txt
similarity index 100%
rename from docs/python3.txt
rename to docs/deprecated/python3.txt

From 7b16d4806f44fc0562c80219ab9ee5d4ac0184b7 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:19:06 -0400
Subject: [PATCH 7810/8469] doc: move easy_install file into deprecated folder

---
 docs/{ => deprecated}/easy_install.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{ => deprecated}/easy_install.txt (100%)

diff --git a/docs/easy_install.txt b/docs/deprecated/easy_install.txt
similarity index 100%
rename from docs/easy_install.txt
rename to docs/deprecated/easy_install.txt

From 6ff2ea56e7828da84dd6da4bb32964a1e19e81f7 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:20:56 -0400
Subject: [PATCH 7811/8469] doc: rename formats.txt as python-eggs.txt

---
 docs/{formats.txt => python_eggs.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{formats.txt => python_eggs.txt} (100%)

diff --git a/docs/formats.txt b/docs/python_eggs.txt
similarity index 100%
rename from docs/formats.txt
rename to docs/python_eggs.txt

From 5c08e3959d2a8aeb83a8a5e1001fb5ed0278a934 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:22:04 -0400
Subject: [PATCH 7812/8469] doc: move python_eggs.txt to deprecated folder

---
 docs/{ => deprecated}/python_eggs.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/{ => deprecated}/python_eggs.txt (100%)

diff --git a/docs/python_eggs.txt b/docs/deprecated/python_eggs.txt
similarity index 100%
rename from docs/python_eggs.txt
rename to docs/deprecated/python_eggs.txt

From a354d7bc1b7737fc1b4a9d238a247364035ab3d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 14:23:10 -0400
Subject: [PATCH 7813/8469] Use the SetuptoolsDeprecationWarning to make the
 warning more visible outside test runners.

---
 setuptools/lib2to3_ex.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index 6d9b147c0e..017f7285b7 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -13,6 +13,7 @@
 from lib2to3.refactor import RefactoringTool, get_fixers_from_package
 
 import setuptools
+from ._deprecation_warning import SetuptoolsDeprecationWarning
 
 
 class DistutilsRefactoringTool(RefactoringTool):
@@ -40,7 +41,7 @@ def run_2to3(self, files, doctests=False):
             "requires Python 2 support, please migrate to "
             "a single-codebase solution or employ an "
             "independent conversion process.",
-            DeprecationWarning)
+            SetuptoolsDeprecationWarning)
         log.info("Fixing " + " ".join(files))
         self.__build_fixer_names()
         self.__exclude_fixers()

From 7e956179d09333cf8022c6261044e9eedf4aeef9 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:43:49 -0400
Subject: [PATCH 7814/8469] docs: change top index depth to one

---
 docs/index.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.txt b/docs/index.txt
index 2f988a1809..38fbbcc50c 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -14,7 +14,7 @@ designed to facilitate packaging Python projects, where packaging includes:
 Documentation content:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    User guide <setuptools>
    Development guide <development>

From bbed9d6584a934697a6da0c9251f902d844fc0e9 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:44:32 -0400
Subject: [PATCH 7815/8469] docs: added index for deprecated files

---
 docs/deprecated/index.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 docs/deprecated/index.txt

diff --git a/docs/deprecated/index.txt b/docs/deprecated/index.txt
new file mode 100644
index 0000000000..bb6579f826
--- /dev/null
+++ b/docs/deprecated/index.txt
@@ -0,0 +1,19 @@
+======================================================
+Guides on backward compatibility & deprecated practice
+======================================================
+
+``Setuptools`` has undergone tremendous changes since its first debut. As its
+development continues to roll forward, many of the practice and mechanisms it
+had established are now considered deprecated. But they still remain relevant
+as a plethora of libraries continue to depend on them. Many people also find
+it necessary to equip themselves with the knowledge to better support backward
+compatibility. This guide aims to provide the essential information for such
+objectives.
+
+.. toctree::
+    :maxdepth: 1
+
+    python3
+    python_eggs
+    easy_install
+

From d6769eb69b955ad8aa9f7877d782b97ce388f50f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Sun, 10 May 2020 14:58:43 -0400
Subject: [PATCH 7816/8469] Doc: added changelog.d news fragment

---
 changelog.d/2097.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2097.doc.rst

diff --git a/changelog.d/2097.doc.rst b/changelog.d/2097.doc.rst
new file mode 100644
index 0000000000..03cdec8ad9
--- /dev/null
+++ b/changelog.d/2097.doc.rst
@@ -0,0 +1 @@
+doc: simplify index and group deprecated files

From fdee8026f5d58ee7cee0fad3c0b7e0ae7d5272ba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 15:51:53 -0400
Subject: [PATCH 7817/8469] Restore parameter

---
 pkg_resources/__init__.py                 | 6 +++---
 pkg_resources/tests/test_pkg_resources.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 4d15086f5e..a50ad1aba5 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2056,19 +2056,19 @@ def find_on_path(importer, path_item, only=False):
     filtered = (
         entry
         for entry in entries
-        if dist_factory(entry, only)
+        if dist_factory(path_item, entry, only)
     )
 
     # scan for .egg and .egg-info in directory
     path_item_entries = _by_version_descending(filtered)
     for entry in path_item_entries:
         fullpath = os.path.join(path_item, entry)
-        factory = dist_factory(entry, only)
+        factory = dist_factory(path_item, entry, only)
         for dist in factory(fullpath):
             yield dist
 
 
-def dist_factory(entry, only):
+def dist_factory(path_item, entry, only):
     """Return a dist_factory for the given entry."""
     lower = entry.lower()
     if lower.endswith('.egg-info'):
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 1c66dec055..9991402c6a 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -335,7 +335,7 @@ def test_dist_info_is_not_dir(tmp_path, only):
     """Test path containing a file with dist-info extension."""
     dist_info = tmp_path / 'foobar.dist-info'
     dist_info.touch()
-    assert not pkg_resources.dist_factory(str(dist_info), only)
+    assert not pkg_resources.dist_factory(None, str(dist_info), only)
 
 
 class TestDeepVersionLookupDistutils:

From da3d39f88d3aad2281b78600e03cf05c1e983f71 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 15:56:20 -0400
Subject: [PATCH 7818/8469] Restore single return

---
 pkg_resources/__init__.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index a50ad1aba5..6a6bda2cab 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2071,16 +2071,18 @@ def find_on_path(importer, path_item, only=False):
 def dist_factory(path_item, entry, only):
     """Return a dist_factory for the given entry."""
     lower = entry.lower()
-    if lower.endswith('.egg-info'):
-        return distributions_from_metadata
-    elif lower.endswith('.dist-info') and os.path.isdir(entry):
-        return distributions_from_metadata
-    elif not only and _is_egg_path(entry):
-        return find_distributions
-    elif not only and lower.endswith('.egg-link'):
-        return resolve_egg_link
-    else:
-        return NoDists()
+    is_egg_info = lower.endswith('.egg-info')
+    is_dist_info = lower.endswith('.dist-info') and os.path.isdir(entry)
+    is_meta = is_egg_info or is_dist_info
+    return (
+        distributions_from_metadata
+        if is_meta else
+        find_distributions
+        if not only and _is_egg_path(entry) else
+        resolve_egg_link
+        if not only and lower.endswith('.egg-link') else
+        NoDists()
+    )
 
 
 class NoDists:

From 7b0a818f9a877d5e1fe558cf1a817bf2034ddf9f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 16:05:51 -0400
Subject: [PATCH 7819/8469] Fix test failures when 'foo.dist-info' does not
 exist

---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b840b4d85a..0575a989f8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2072,7 +2072,7 @@ def dist_factory(path_item, entry, only):
     """Return a dist_factory for the given entry."""
     lower = entry.lower()
     is_egg_info = lower.endswith('.egg-info')
-    is_dist_info = lower.endswith('.dist-info') and os.path.isdir(entry)
+    is_dist_info = lower.endswith('.dist-info') and not os.path.isfile(entry)
     is_meta = is_egg_info or is_dist_info
     return (
         distributions_from_metadata

From 5638e4783fc0f4f5cc40e7ecfab0500983826fa0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 16:18:22 -0400
Subject: [PATCH 7820/8469] To assess the directoriness of an entry, include
 the path of that entry.

---
 pkg_resources/__init__.py                 | 5 ++++-
 pkg_resources/tests/test_pkg_resources.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0575a989f8..0512731d9f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2072,7 +2072,10 @@ def dist_factory(path_item, entry, only):
     """Return a dist_factory for the given entry."""
     lower = entry.lower()
     is_egg_info = lower.endswith('.egg-info')
-    is_dist_info = lower.endswith('.dist-info') and not os.path.isfile(entry)
+    is_dist_info = (
+        lower.endswith('.dist-info') and
+        os.path.isdir(os.path.join(path_item, entry))
+    )
     is_meta = is_egg_info or is_dist_info
     return (
         distributions_from_metadata
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 9991402c6a..189a8668be 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -335,7 +335,7 @@ def test_dist_info_is_not_dir(tmp_path, only):
     """Test path containing a file with dist-info extension."""
     dist_info = tmp_path / 'foobar.dist-info'
     dist_info.touch()
-    assert not pkg_resources.dist_factory(None, str(dist_info), only)
+    assert not pkg_resources.dist_factory(str(tmp_path), str(dist_info), only)
 
 
 class TestDeepVersionLookupDistutils:

From b1b0134ba75dfefdad23d7410e14c74c8ec83aaa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 17:40:36 -0400
Subject: [PATCH 7821/8469] Based on my understanding, this is more of a bugfix
 than a breaking change.

---
 changelog.d/{2075.breaking.rst => 2075.change.rst} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename changelog.d/{2075.breaking.rst => 2075.change.rst} (84%)

diff --git a/changelog.d/2075.breaking.rst b/changelog.d/2075.change.rst
similarity index 84%
rename from changelog.d/2075.breaking.rst
rename to changelog.d/2075.change.rst
index 8d88b33f21..abb13000ad 100644
--- a/changelog.d/2075.breaking.rst
+++ b/changelog.d/2075.change.rst
@@ -1 +1 @@
-Stop recognizing files ending with ``.dist-info`` as distribution metadata
+Stop recognizing files ending with ``.dist-info`` as distribution metadata.

From d57adafdd9550376ef54ad3eb9f6a913adb2b214 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 10 May 2020 17:42:41 -0400
Subject: [PATCH 7822/8469] =?UTF-8?q?Bump=20version:=2046.1.3=20=E2=86=92?=
 =?UTF-8?q?=2046.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 12 ++++++++++++
 changelog.d/1698.doc.rst    |  1 -
 changelog.d/2040.change.rst |  1 -
 changelog.d/2062.change.rst |  1 -
 changelog.d/2075.change.rst |  1 -
 changelog.d/2082.misc.rst   |  2 --
 changelog.d/2086.change.rst |  1 -
 setup.cfg                   |  2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 changelog.d/1698.doc.rst
 delete mode 100644 changelog.d/2040.change.rst
 delete mode 100644 changelog.d/2062.change.rst
 delete mode 100644 changelog.d/2075.change.rst
 delete mode 100644 changelog.d/2082.misc.rst
 delete mode 100644 changelog.d/2086.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 00cbdc7a3b..c1b062e4d9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.1.3
+current_version = 46.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ac61c17882..03c89be6c5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,15 @@
+v46.2.0
+-------
+
+* #2040: Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.
+* #2062: Change 'Mac OS X' to 'macOS' in code.
+* #2075: Stop recognizing files ending with ``.dist-info`` as distribution metadata.
+* #2086: Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
+* #1698: Added documentation for ``build_meta`` (a bare minimum, not completed).
+* #2082: Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
+  because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
+
+
 v46.1.3
 -------
 
diff --git a/changelog.d/1698.doc.rst b/changelog.d/1698.doc.rst
deleted file mode 100644
index 90dc14c1f4..0000000000
--- a/changelog.d/1698.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation for ``build_meta`` (a bare minimum, not completed).
diff --git a/changelog.d/2040.change.rst b/changelog.d/2040.change.rst
deleted file mode 100644
index b8f36f6fb4..0000000000
--- a/changelog.d/2040.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.
diff --git a/changelog.d/2062.change.rst b/changelog.d/2062.change.rst
deleted file mode 100644
index 1f5fd8122e..0000000000
--- a/changelog.d/2062.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Change 'Mac OS X' to 'macOS' in code.
diff --git a/changelog.d/2075.change.rst b/changelog.d/2075.change.rst
deleted file mode 100644
index abb13000ad..0000000000
--- a/changelog.d/2075.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Stop recognizing files ending with ``.dist-info`` as distribution metadata.
diff --git a/changelog.d/2082.misc.rst b/changelog.d/2082.misc.rst
deleted file mode 100644
index 81ad5d5853..0000000000
--- a/changelog.d/2082.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
-because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
diff --git a/changelog.d/2086.change.rst b/changelog.d/2086.change.rst
deleted file mode 100644
index 9fa54e5ace..0000000000
--- a/changelog.d/2086.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
diff --git a/setup.cfg b/setup.cfg
index 60838efce3..2f5525f3c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.1.3
+version = 46.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 28a1b18a047de2e81712c55e3d81cc3f2c0c54f9 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 13:58:59 -0400
Subject: [PATCH 7823/8469] docs: created folder and index for userguide

---
 docs/userguide/index.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/userguide/index.txt

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
new file mode 100644
index 0000000000..e69de29bb2

From 7008a98cdcc359be75b1850db7c8f67270435328 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:17:59 -0400
Subject: [PATCH 7824/8469] docs: update userguide index

---
 docs/userguide/index.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index e69de29bb2..caaaa1d0c8 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -0,0 +1,17 @@
+==================================================
+Building and Distributing Packages with Setuptools
+==================================================
+
+``Setuptools`` is a collection of enhancements to the Python ``distutils``
+that allow developers to more easily build and
+distribute Python packages, especially ones that have dependencies on other
+packages.
+
+Packages built and distributed using ``setuptools`` look to the user like
+ordinary Python packages based on the ``distutils``.
+
+.. toctree::
+    :maxdepth: 1
+
+    Quickstart <quickstart>
+    keyword reference <keywords>
\ No newline at end of file

From ef435da2b41adf9674db1df00415db2b46012f21 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:19:18 -0400
Subject: [PATCH 7825/8469] docs: migrate basic use to quickstart

Did a cut and paste from setuptoo.txt to userguide/quickstart.txt
---
 docs/setuptools.txt           | 164 ---------------------------------
 docs/userguide/quickstart.txt | 165 ++++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+), 164 deletions(-)
 create mode 100644 docs/userguide/quickstart.txt

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 30a30c2612..f9d567d7ce 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -55,171 +55,7 @@ Developer's Guide
 -----------------
 
 
-Installing ``setuptools``
-=========================
-
-.. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
-
-To install the latest version of setuptools, use::
-
-    pip install --upgrade setuptools
-
-Refer to `Installing Packages`_ guide for more information.
-
-Basic Use
-=========
-
-For basic use of setuptools, just import things from setuptools instead of
-the distutils.  Here's a minimal setup script using setuptools::
-
-    from setuptools import setup, find_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_packages(),
-    )
-
-As you can see, it doesn't take much to use setuptools in a project.
-Run that script in your project folder, alongside the Python packages
-you have developed.
-
-Invoke that script to produce distributions and automatically include all
-packages in the directory where the setup.py lives.  See the `Command
-Reference`_ section below to see what commands you can give to this setup
-script. For example, to produce a source distribution, simply invoke::
-
-    setup.py sdist
-
-Of course, before you release your project to PyPI, you'll want to add a bit
-more information to your setup script to help people find or learn about your
-project.  And maybe your project will have grown by then to include a few
-dependencies, and perhaps some data files and scripts::
-
-    from setuptools import setup, find_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_packages(),
-        scripts=["say_hello.py"],
-
-        # Project uses reStructuredText, so ensure that the docutils get
-        # installed or upgraded on the target machine
-        install_requires=["docutils>=0.3"],
-
-        package_data={
-            # If any package contains *.txt or *.rst files, include them:
-            "": ["*.txt", "*.rst"],
-            # And include any *.msg files found in the "hello" package, too:
-            "hello": ["*.msg"],
-        },
-
-        # metadata to display on PyPI
-        author="Me",
-        author_email="me@example.com",
-        description="This is an Example Package",
-        keywords="hello world example examples",
-        url="http://example.com/HelloWorld/",   # project home page, if any
-        project_urls={
-            "Bug Tracker": "https://bugs.example.com/HelloWorld/",
-            "Documentation": "https://docs.example.com/HelloWorld/",
-            "Source Code": "https://code.example.com/HelloWorld/",
-        },
-        classifiers=[
-            "License :: OSI Approved :: Python Software Foundation License"
-        ]
-
-        # could also include long_description, download_url, etc.
-    )
 
-In the sections that follow, we'll explain what most of these ``setup()``
-arguments do (except for the metadata ones), and the various ways you might use
-them in your own project(s).
-
-
-Specifying Your Project's Version
----------------------------------
-
-Setuptools can work well with most versioning schemes; there are, however, a
-few special things to watch out for, in order to ensure that setuptools and
-other tools can always tell what version of your package is newer than another
-version.  Knowing these things will also help you correctly specify what
-versions of other projects your project depends on.
-
-A version consists of an alternating series of release numbers and pre-release
-or post-release tags.  A release number is a series of digits punctuated by
-dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
-numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
-same release number, denoting the first subrelease of release 2.  But  ``2.10``
-is the *tenth* subrelease of release 2, and so is a different and newer release
-from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
-ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
-
-Following a release number, you can have either a pre-release or post-release
-tag.  Pre-release tags make a version be considered *older* than the version
-they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
-which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
-a version be considered *newer* than the version they are appended to.  So,
-revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
-than ``2.4.1`` (which has a higher release number).
-
-A pre-release tag is a series of letters that are alphabetically before
-"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
-``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
-before the prerelease tag if it's immediately after a number, but it's okay to
-do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
-represent release candidate 1 of version ``2.4``, and are treated as identical
-by setuptools.
-
-In addition, there are three special prerelease tags that are treated as if
-they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
-``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
-``2.4c1``, and are treated as identical by setuptools.
-
-A post-release tag is either a series of letters that are alphabetically
-greater than or equal to "final", or a dash (``-``).  Post-release tags are
-generally used to separate patch numbers, port numbers, build numbers, revision
-numbers, or date stamps from the release number.  For example, the version
-``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
-version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
-post-release.
-
-Notice that after each pre or post-release tag, you are free to place another
-release number, followed again by more pre- or post-release tags.  For example,
-``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
-development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
-a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
-which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
-a post-release tag, so this version is *newer* than ``0.6a9.dev``.
-
-For the most part, setuptools' interpretation of version numbers is intuitive,
-but here are a few tips that will keep you out of trouble in the corner cases:
-
-* Don't stick adjoining pre-release tags together without a dot or number
-  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
-  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
-  ``1.9a.dev``, or separate the prerelease tags with a number, as in
-  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
-  identical versions from setuptools' point of view, so you can use whatever
-  scheme you prefer.
-
-* If you want to be certain that your chosen numbering scheme works the way
-  you think it will, you can use the ``pkg_resources.parse_version()`` function
-  to compare different version numbers::
-
-    >>> from pkg_resources import parse_version
-    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
-    True
-    >>> parse_version("2.1-rc2") < parse_version("2.1")
-    True
-    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
-    True
-
-Once you've decided on a version numbering scheme for your project, you can
-have setuptools automatically tag your in-development releases with various
-pre- or post-release tags.  See the following sections for more details:
-
-* `Tagging and "Daily Build" or "Snapshot" Releases`_
-* The `egg_info`_ command
 
 
 New and Changed ``setup()`` Keywords
diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
new file mode 100644
index 0000000000..4df50bc56e
--- /dev/null
+++ b/docs/userguide/quickstart.txt
@@ -0,0 +1,165 @@
+Installing ``setuptools``
+=========================
+
+.. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
+
+To install the latest version of setuptools, use::
+
+    pip install --upgrade setuptools
+
+Refer to `Installing Packages`_ guide for more information.
+
+Basic Use
+=========
+
+For basic use of setuptools, just import things from setuptools instead of
+the distutils.  Here's a minimal setup script using setuptools::
+
+    from setuptools import setup, find_packages
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages(),
+    )
+
+As you can see, it doesn't take much to use setuptools in a project.
+Run that script in your project folder, alongside the Python packages
+you have developed.
+
+Invoke that script to produce distributions and automatically include all
+packages in the directory where the setup.py lives.  See the `Command
+Reference`_ section below to see what commands you can give to this setup
+script. For example, to produce a source distribution, simply invoke::
+
+    setup.py sdist
+
+Of course, before you release your project to PyPI, you'll want to add a bit
+more information to your setup script to help people find or learn about your
+project.  And maybe your project will have grown by then to include a few
+dependencies, and perhaps some data files and scripts::
+
+    from setuptools import setup, find_packages
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_packages(),
+        scripts=["say_hello.py"],
+
+        # Project uses reStructuredText, so ensure that the docutils get
+        # installed or upgraded on the target machine
+        install_requires=["docutils>=0.3"],
+
+        package_data={
+            # If any package contains *.txt or *.rst files, include them:
+            "": ["*.txt", "*.rst"],
+            # And include any *.msg files found in the "hello" package, too:
+            "hello": ["*.msg"],
+        },
+
+        # metadata to display on PyPI
+        author="Me",
+        author_email="me@example.com",
+        description="This is an Example Package",
+        keywords="hello world example examples",
+        url="http://example.com/HelloWorld/",   # project home page, if any
+        project_urls={
+            "Bug Tracker": "https://bugs.example.com/HelloWorld/",
+            "Documentation": "https://docs.example.com/HelloWorld/",
+            "Source Code": "https://code.example.com/HelloWorld/",
+        },
+        classifiers=[
+            "License :: OSI Approved :: Python Software Foundation License"
+        ]
+
+        # could also include long_description, download_url, etc.
+    )
+
+In the sections that follow, we'll explain what most of these ``setup()``
+arguments do (except for the metadata ones), and the various ways you might use
+them in your own project(s).
+
+
+Specifying Your Project's Version
+---------------------------------
+
+Setuptools can work well with most versioning schemes; there are, however, a
+few special things to watch out for, in order to ensure that setuptools and
+other tools can always tell what version of your package is newer than another
+version.  Knowing these things will also help you correctly specify what
+versions of other projects your project depends on.
+
+A version consists of an alternating series of release numbers and pre-release
+or post-release tags.  A release number is a series of digits punctuated by
+dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
+numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
+same release number, denoting the first subrelease of release 2.  But  ``2.10``
+is the *tenth* subrelease of release 2, and so is a different and newer release
+from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
+ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
+
+Following a release number, you can have either a pre-release or post-release
+tag.  Pre-release tags make a version be considered *older* than the version
+they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
+which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
+a version be considered *newer* than the version they are appended to.  So,
+revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
+than ``2.4.1`` (which has a higher release number).
+
+A pre-release tag is a series of letters that are alphabetically before
+"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
+``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
+before the prerelease tag if it's immediately after a number, but it's okay to
+do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
+represent release candidate 1 of version ``2.4``, and are treated as identical
+by setuptools.
+
+In addition, there are three special prerelease tags that are treated as if
+they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
+``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
+``2.4c1``, and are treated as identical by setuptools.
+
+A post-release tag is either a series of letters that are alphabetically
+greater than or equal to "final", or a dash (``-``).  Post-release tags are
+generally used to separate patch numbers, port numbers, build numbers, revision
+numbers, or date stamps from the release number.  For example, the version
+``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
+version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
+post-release.
+
+Notice that after each pre or post-release tag, you are free to place another
+release number, followed again by more pre- or post-release tags.  For example,
+``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
+development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
+a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
+which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
+a post-release tag, so this version is *newer* than ``0.6a9.dev``.
+
+For the most part, setuptools' interpretation of version numbers is intuitive,
+but here are a few tips that will keep you out of trouble in the corner cases:
+
+* Don't stick adjoining pre-release tags together without a dot or number
+  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
+  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
+  ``1.9a.dev``, or separate the prerelease tags with a number, as in
+  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
+  identical versions from setuptools' point of view, so you can use whatever
+  scheme you prefer.
+
+* If you want to be certain that your chosen numbering scheme works the way
+  you think it will, you can use the ``pkg_resources.parse_version()`` function
+  to compare different version numbers::
+
+    >>> from pkg_resources import parse_version
+    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
+    True
+    >>> parse_version("2.1-rc2") < parse_version("2.1")
+    True
+    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
+    True
+
+Once you've decided on a version numbering scheme for your project, you can
+have setuptools automatically tag your in-development releases with various
+pre- or post-release tags.  See the following sections for more details:
+
+* `Tagging and "Daily Build" or "Snapshot" Releases`_
+* The `egg_info`_ command
\ No newline at end of file

From 7971245c98f7218a8614135db56438e9a4642594 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:22:04 -0400
Subject: [PATCH 7826/8469] docs: migrated keywords ref to keywords.txt

Did a cut and paste from setuptools.txt
---
 docs/setuptools.txt         | 174 -----------------------------------
 docs/userguide/keywords.txt | 175 ++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 174 deletions(-)
 create mode 100644 docs/userguide/keywords.txt

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index f9d567d7ce..e8a76c08e0 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -58,181 +58,7 @@ Developer's Guide
 
 
 
-New and Changed ``setup()`` Keywords
-====================================
 
-The following keyword arguments to ``setup()`` are added or changed by
-``setuptools``.  All of them are optional; you do not have to supply them
-unless you need the associated ``setuptools`` feature.
-
-``include_package_data``
-    If set to ``True``, this tells ``setuptools`` to automatically include any
-    data files it finds inside your package directories that are specified by
-    your ``MANIFEST.in`` file.  For more information, see the section below on
-    `Including Data Files`_.
-
-``exclude_package_data``
-    A dictionary mapping package names to lists of glob patterns that should
-    be *excluded* from your package directories.  You can use this to trim back
-    any excess files included by ``include_package_data``.  For a complete
-    description and examples, see the section below on `Including Data Files`_.
-
-``package_data``
-    A dictionary mapping package names to lists of glob patterns.  For a
-    complete description and examples, see the section below on `Including
-    Data Files`_.  You do not need to use this option if you are using
-    ``include_package_data``, unless you need to add e.g. files that are
-    generated by your setup script and build process.  (And are therefore not
-    in source control or are files that you don't want to include in your
-    source distribution.)
-
-``zip_safe``
-    A boolean (True or False) flag specifying whether the project can be
-    safely installed and run from a zip file.  If this argument is not
-    supplied, the ``bdist_egg`` command will have to analyze all of your
-    project's contents for possible problems each time it builds an egg.
-
-``install_requires``
-    A string or list of strings specifying what other distributions need to
-    be installed when this one is.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``entry_points``
-    A dictionary mapping entry point group names to strings or lists of strings
-    defining the entry points.  Entry points are used to support dynamic
-    discovery of services or plugins provided by a project.  See `Dynamic
-    Discovery of Services and Plugins`_ for details and examples of the format
-    of this argument.  In addition, this keyword is used to support `Automatic
-    Script Creation`_.
-
-``extras_require``
-    A dictionary mapping names of "extras" (optional features of your project)
-    to strings or lists of strings specifying what other distributions must be
-    installed to support those features.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
-
-``python_requires``
-    A string corresponding to a version specifier (as defined in PEP 440) for
-    the Python version, used to specify the Requires-Python defined in PEP 345.
-
-``setup_requires``
-    A string or list of strings specifying what other distributions need to
-    be present in order for the *setup script* to run.  ``setuptools`` will
-    attempt to obtain these (using pip if available) before processing the
-    rest of the setup script or commands.  This argument is needed if you
-    are using distutils extensions as part of your build process; for
-    example, extensions that process setup() arguments and turn them into
-    EGG-INFO metadata files.
-
-    (Note: projects listed in ``setup_requires`` will NOT be automatically
-    installed on the system where the setup script is being run.  They are
-    simply downloaded to the ./.eggs directory if they're not locally available
-    already.  If you want them to be installed, as well as being available
-    when the setup script is run, you should add them to ``install_requires``
-    **and** ``setup_requires``.)
-
-``dependency_links``
-    A list of strings naming URLs to be searched when satisfying dependencies.
-    These links will be used if needed to install packages specified by
-    ``setup_requires`` or ``tests_require``.  They will also be written into
-    the egg's metadata for use during install by tools that support them.
-
-``namespace_packages``
-    A list of strings naming the project's "namespace packages".  A namespace
-    package is a package that may be split across multiple project
-    distributions.  For example, Zope 3's ``zope`` package is a namespace
-    package, because subpackages like ``zope.interface`` and ``zope.publisher``
-    may be distributed separately.  The egg runtime system can automatically
-    merge such subpackages into a single parent package at runtime, as long
-    as you declare them in each project that contains any subpackages of the
-    namespace package, and as long as the namespace package's ``__init__.py``
-    does not contain any code other than a namespace declaration.  See the
-    section below on `Namespace Packages`_ for more information.
-
-``test_suite``
-    A string naming a ``unittest.TestCase`` subclass (or a package or module
-    containing one or more of them, or a method of such a subclass), or naming
-    a function that can be called with no arguments and returns a
-    ``unittest.TestSuite``.  If the named suite is a module, and the module
-    has an ``additional_tests()`` function, it is called and the results are
-    added to the tests to be run.  If the named suite is a package, any
-    submodules and subpackages are recursively added to the overall test suite.
-
-    Specifying this argument enables use of the `test`_ command to run the
-    specified test suite, e.g. via ``setup.py test``.  See the section on the
-    `test`_ command below for more details.
-
-    New in 41.5.0: Deprecated the test command.
-
-``tests_require``
-    If your project's tests need one or more additional packages besides those
-    needed to install it, you can use this option to specify them.  It should
-    be a string or list of strings specifying what other distributions need to
-    be present for the package's tests to run.  When you run the ``test``
-    command, ``setuptools`` will  attempt to obtain these (using pip if
-    available).  Note that these required projects will *not* be installed on
-    the system where the tests are run, but only downloaded to the project's setup
-    directory if they're not already installed locally.
-
-    New in 41.5.0: Deprecated the test command.
-
-.. _test_loader:
-
-``test_loader``
-    If you would like to use a different way of finding tests to run than what
-    setuptools normally uses, you can specify a module name and class name in
-    this argument.  The named class must be instantiable with no arguments, and
-    its instances must support the ``loadTestsFromNames()`` method as defined
-    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
-    pass only one test "name" in the `names` argument: the value supplied for
-    the ``test_suite`` argument.  The loader you specify may interpret this
-    string in any way it likes, as there are no restrictions on what may be
-    contained in a ``test_suite`` string.
-
-    The module name and class name must be separated by a ``:``.  The default
-    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
-    you want to use the default ``unittest`` behavior, you can specify
-    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
-    will prevent automatic scanning of submodules and subpackages.
-
-    The module and class you specify here may be contained in another package,
-    as long as you use the ``tests_require`` option to ensure that the package
-    containing the loader class is available when the ``test`` command is run.
-
-    New in 41.5.0: Deprecated the test command.
-
-``eager_resources``
-    A list of strings naming resources that should be extracted together, if
-    any of them is needed, or if any C extensions included in the project are
-    imported.  This argument is only useful if the project will be installed as
-    a zipfile, and there is a need to have all of the listed resources be
-    extracted to the filesystem *as a unit*.  Resources listed here
-    should be "/"-separated paths, relative to the source root, so to list a
-    resource ``foo.png`` in package ``bar.baz``, you would include the string
-    ``bar/baz/foo.png`` in this argument.
-
-    If you only need to obtain resources one at a time, or you don't have any C
-    extensions that access other files in the project (such as data files or
-    shared libraries), you probably do NOT need this argument and shouldn't
-    mess with it.  For more details on how this argument works, see the section
-    below on `Automatic Resource Extraction`_.
-
-``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`python3` for more details.
-
-``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3.
-    See :doc:`python3` for more details.
-
-``use_2to3_fixers``
-    A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`python3` for more details.
-
-``project_urls``
-    An arbitrary map of URL names to hyperlinks, allowing more extensible
-    documentation of where various resources can be found than the simple
-    ``url`` and ``download_url`` options provide.
 
 
 Using ``find_packages()``
diff --git a/docs/userguide/keywords.txt b/docs/userguide/keywords.txt
new file mode 100644
index 0000000000..e2852b3410
--- /dev/null
+++ b/docs/userguide/keywords.txt
@@ -0,0 +1,175 @@
+New and Changed ``setup()`` Keywords
+====================================
+
+The following keyword arguments to ``setup()`` are added or changed by
+``setuptools``.  All of them are optional; you do not have to supply them
+unless you need the associated ``setuptools`` feature.
+
+``include_package_data``
+    If set to ``True``, this tells ``setuptools`` to automatically include any
+    data files it finds inside your package directories that are specified by
+    your ``MANIFEST.in`` file.  For more information, see the section below on
+    `Including Data Files`_.
+
+``exclude_package_data``
+    A dictionary mapping package names to lists of glob patterns that should
+    be *excluded* from your package directories.  You can use this to trim back
+    any excess files included by ``include_package_data``.  For a complete
+    description and examples, see the section below on `Including Data Files`_.
+
+``package_data``
+    A dictionary mapping package names to lists of glob patterns.  For a
+    complete description and examples, see the section below on `Including
+    Data Files`_.  You do not need to use this option if you are using
+    ``include_package_data``, unless you need to add e.g. files that are
+    generated by your setup script and build process.  (And are therefore not
+    in source control or are files that you don't want to include in your
+    source distribution.)
+
+``zip_safe``
+    A boolean (True or False) flag specifying whether the project can be
+    safely installed and run from a zip file.  If this argument is not
+    supplied, the ``bdist_egg`` command will have to analyze all of your
+    project's contents for possible problems each time it builds an egg.
+
+``install_requires``
+    A string or list of strings specifying what other distributions need to
+    be installed when this one is.  See the section below on `Declaring
+    Dependencies`_ for details and examples of the format of this argument.
+
+``entry_points``
+    A dictionary mapping entry point group names to strings or lists of strings
+    defining the entry points.  Entry points are used to support dynamic
+    discovery of services or plugins provided by a project.  See `Dynamic
+    Discovery of Services and Plugins`_ for details and examples of the format
+    of this argument.  In addition, this keyword is used to support `Automatic
+    Script Creation`_.
+
+``extras_require``
+    A dictionary mapping names of "extras" (optional features of your project)
+    to strings or lists of strings specifying what other distributions must be
+    installed to support those features.  See the section below on `Declaring
+    Dependencies`_ for details and examples of the format of this argument.
+
+``python_requires``
+    A string corresponding to a version specifier (as defined in PEP 440) for
+    the Python version, used to specify the Requires-Python defined in PEP 345.
+
+``setup_requires``
+    A string or list of strings specifying what other distributions need to
+    be present in order for the *setup script* to run.  ``setuptools`` will
+    attempt to obtain these (using pip if available) before processing the
+    rest of the setup script or commands.  This argument is needed if you
+    are using distutils extensions as part of your build process; for
+    example, extensions that process setup() arguments and turn them into
+    EGG-INFO metadata files.
+
+    (Note: projects listed in ``setup_requires`` will NOT be automatically
+    installed on the system where the setup script is being run.  They are
+    simply downloaded to the ./.eggs directory if they're not locally available
+    already.  If you want them to be installed, as well as being available
+    when the setup script is run, you should add them to ``install_requires``
+    **and** ``setup_requires``.)
+
+``dependency_links``
+    A list of strings naming URLs to be searched when satisfying dependencies.
+    These links will be used if needed to install packages specified by
+    ``setup_requires`` or ``tests_require``.  They will also be written into
+    the egg's metadata for use during install by tools that support them.
+
+``namespace_packages``
+    A list of strings naming the project's "namespace packages".  A namespace
+    package is a package that may be split across multiple project
+    distributions.  For example, Zope 3's ``zope`` package is a namespace
+    package, because subpackages like ``zope.interface`` and ``zope.publisher``
+    may be distributed separately.  The egg runtime system can automatically
+    merge such subpackages into a single parent package at runtime, as long
+    as you declare them in each project that contains any subpackages of the
+    namespace package, and as long as the namespace package's ``__init__.py``
+    does not contain any code other than a namespace declaration.  See the
+    section below on `Namespace Packages`_ for more information.
+
+``test_suite``
+    A string naming a ``unittest.TestCase`` subclass (or a package or module
+    containing one or more of them, or a method of such a subclass), or naming
+    a function that can be called with no arguments and returns a
+    ``unittest.TestSuite``.  If the named suite is a module, and the module
+    has an ``additional_tests()`` function, it is called and the results are
+    added to the tests to be run.  If the named suite is a package, any
+    submodules and subpackages are recursively added to the overall test suite.
+
+    Specifying this argument enables use of the `test`_ command to run the
+    specified test suite, e.g. via ``setup.py test``.  See the section on the
+    `test`_ command below for more details.
+
+    New in 41.5.0: Deprecated the test command.
+
+``tests_require``
+    If your project's tests need one or more additional packages besides those
+    needed to install it, you can use this option to specify them.  It should
+    be a string or list of strings specifying what other distributions need to
+    be present for the package's tests to run.  When you run the ``test``
+    command, ``setuptools`` will  attempt to obtain these (using pip if
+    available).  Note that these required projects will *not* be installed on
+    the system where the tests are run, but only downloaded to the project's setup
+    directory if they're not already installed locally.
+
+    New in 41.5.0: Deprecated the test command.
+
+.. _test_loader:
+
+``test_loader``
+    If you would like to use a different way of finding tests to run than what
+    setuptools normally uses, you can specify a module name and class name in
+    this argument.  The named class must be instantiable with no arguments, and
+    its instances must support the ``loadTestsFromNames()`` method as defined
+    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
+    pass only one test "name" in the `names` argument: the value supplied for
+    the ``test_suite`` argument.  The loader you specify may interpret this
+    string in any way it likes, as there are no restrictions on what may be
+    contained in a ``test_suite`` string.
+
+    The module name and class name must be separated by a ``:``.  The default
+    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
+    you want to use the default ``unittest`` behavior, you can specify
+    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
+    will prevent automatic scanning of submodules and subpackages.
+
+    The module and class you specify here may be contained in another package,
+    as long as you use the ``tests_require`` option to ensure that the package
+    containing the loader class is available when the ``test`` command is run.
+
+    New in 41.5.0: Deprecated the test command.
+
+``eager_resources``
+    A list of strings naming resources that should be extracted together, if
+    any of them is needed, or if any C extensions included in the project are
+    imported.  This argument is only useful if the project will be installed as
+    a zipfile, and there is a need to have all of the listed resources be
+    extracted to the filesystem *as a unit*.  Resources listed here
+    should be "/"-separated paths, relative to the source root, so to list a
+    resource ``foo.png`` in package ``bar.baz``, you would include the string
+    ``bar/baz/foo.png`` in this argument.
+
+    If you only need to obtain resources one at a time, or you don't have any C
+    extensions that access other files in the project (such as data files or
+    shared libraries), you probably do NOT need this argument and shouldn't
+    mess with it.  For more details on how this argument works, see the section
+    below on `Automatic Resource Extraction`_.
+
+``use_2to3``
+    Convert the source code from Python 2 to Python 3 with 2to3 during the
+    build process. See :doc:`python3` for more details.
+
+``convert_2to3_doctests``
+    List of doctest source files that need to be converted with 2to3.
+    See :doc:`python3` for more details.
+
+``use_2to3_fixers``
+    A list of modules to search for additional fixers to be used during
+    the 2to3 conversion. See :doc:`python3` for more details.
+
+``project_urls``
+    An arbitrary map of URL names to hyperlinks, allowing more extensible
+    documentation of where various resources can be found than the simple
+    ``url`` and ``download_url`` options provide.
\ No newline at end of file

From 9175f899a4ddacc3c6bd6a02f3c17dde66403431 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:25:44 -0400
Subject: [PATCH 7827/8469] docs: add commands ref entry in userguide index

---
 docs/userguide/index.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index caaaa1d0c8..901aad42c7 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -14,4 +14,5 @@ ordinary Python packages based on the ``distutils``.
     :maxdepth: 1
 
     Quickstart <quickstart>
-    keyword reference <keywords>
\ No newline at end of file
+    keyword reference <keywords>
+    Command reference <commands>
\ No newline at end of file

From 9ea37eda077883d310bfb7537f58c51cab84ff4c Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:28:11 -0400
Subject: [PATCH 7828/8469] docs: migrate commands ref to commands.txt

---
 docs/setuptools.txt         | 565 -----------------------------------
 docs/userguide/commands.txt | 566 ++++++++++++++++++++++++++++++++++++
 2 files changed, 566 insertions(+), 565 deletions(-)
 create mode 100644 docs/userguide/commands.txt

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index e8a76c08e0..25af9d3322 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1193,572 +1193,7 @@ installed, and that your source releases will be similarly usable with or
 without Cython.
 
 
------------------
-Command Reference
------------------
-
-.. _alias:
-
-``alias`` - Define shortcuts for commonly used commands
-=======================================================
-
-Sometimes, you need to use the same commands over and over, but you can't
-necessarily set them as defaults.  For example, if you produce both development
-snapshot releases and "stable" releases of a project, you may want to put
-the distributions in different places, or use different ``egg_info`` tagging
-options, etc.  In these cases, it doesn't make sense to set the options in
-a distutils configuration file, because the values of the options changed based
-on what you're trying to do.
-
-Setuptools therefore allows you to define "aliases" - shortcut names for
-an arbitrary string of commands and options, using ``setup.py alias aliasname
-expansion``, where aliasname is the name of the new alias, and the remainder of
-the command line supplies its expansion.  For example, this command defines
-a sitewide alias called "daily", that sets various ``egg_info`` tagging
-options::
-
-    setup.py alias --global-config daily egg_info --tag-build=development
-
-Once the alias is defined, it can then be used with other setup commands,
-e.g.::
-
-    setup.py daily bdist_egg        # generate a daily-build .egg file
-    setup.py daily sdist            # generate a daily-build source distro
-    setup.py daily sdist bdist_egg  # generate both
-
-The above commands are interpreted as if the word ``daily`` were replaced with
-``egg_info --tag-build=development``.
-
-Note that setuptools will expand each alias *at most once* in a given command
-line.  This serves two purposes.  First, if you accidentally create an alias
-loop, it will have no effect; you'll instead get an error message about an
-unknown command.  Second, it allows you to define an alias for a command, that
-uses that command.  For example, this (project-local) alias::
-
-    setup.py alias bdist_egg bdist_egg rotate -k1 -m.egg
-
-redefines the ``bdist_egg`` command so that it always runs the ``rotate``
-command afterwards to delete all but the newest egg file.  It doesn't loop
-indefinitely on ``bdist_egg`` because the alias is only expanded once when
-used.
-
-You can remove a defined alias with the ``--remove`` (or ``-r``) option, e.g.::
-
-    setup.py alias --global-config --remove daily
-
-would delete the "daily" alias we defined above.
-
-Aliases can be defined on a project-specific, per-user, or sitewide basis.  The
-default is to define or remove a project-specific alias, but you can use any of
-the `configuration file options`_ (listed under the `saveopts`_ command, below)
-to determine which distutils configuration file an aliases will be added to
-(or removed from).
-
-Note that if you omit the "expansion" argument to the ``alias`` command,
-you'll get output showing that alias' current definition (and what
-configuration file it's defined in).  If you omit the alias name as well,
-you'll get a listing of all current aliases along with their configuration
-file locations.
-
-
-``bdist_egg`` - Create a Python Egg for the project
-===================================================
-
-.. warning::
-    **eggs** are deprecated in favor of wheels, and not supported by pip.
-
-This command generates a Python Egg (``.egg`` file) for the project.  Python
-Eggs are the preferred binary distribution format for EasyInstall, because they
-are cross-platform (for "pure" packages), directly importable, and contain
-project metadata including scripts and information about the project's
-dependencies.  They can be simply downloaded and added to ``sys.path``
-directly, or they can be placed in a directory on ``sys.path`` and then
-automatically discovered by the egg runtime system.
-
-This command runs the `egg_info`_ command (if it hasn't already run) to update
-the project's metadata (``.egg-info``) directory.  If you have added any extra
-metadata files to the ``.egg-info`` directory, those files will be included in
-the new egg file's metadata directory, for use by the egg runtime system or by
-any applications or frameworks that use that metadata.
-
-You won't usually need to specify any special options for this command; just
-use ``bdist_egg`` and you're done.  But there are a few options that may
-be occasionally useful:
-
-``--dist-dir=DIR, -d DIR``
-    Set the directory where the ``.egg`` file will be placed.  If you don't
-    supply this, then the ``--dist-dir`` setting of the ``bdist`` command
-    will be used, which is usually a directory named ``dist`` in the project
-    directory.
-
-``--plat-name=PLATFORM, -p PLATFORM``
-    Set the platform name string that will be embedded in the egg's filename
-    (assuming the egg contains C extensions).  This can be used to override
-    the distutils default platform name with something more meaningful.  Keep
-    in mind, however, that the egg runtime system expects to see eggs with
-    distutils platform names, so it may ignore or reject eggs with non-standard
-    platform names.  Similarly, the EasyInstall program may ignore them when
-    searching web pages for download links.  However, if you are
-    cross-compiling or doing some other unusual things, you might find a use
-    for this option.
-
-``--exclude-source-files``
-    Don't include any modules' ``.py`` files in the egg, just compiled Python,
-    C, and data files.  (Note that this doesn't affect any ``.py`` files in the
-    EGG-INFO directory or its subdirectories, since for example there may be
-    scripts with a ``.py`` extension which must still be retained.)  We don't
-    recommend that you use this option except for packages that are being
-    bundled for proprietary end-user applications, or for "embedded" scenarios
-    where space is at an absolute premium.  On the other hand, if your package
-    is going to be installed and used in compressed form, you might as well
-    exclude the source because Python's ``traceback`` module doesn't currently
-    understand how to display zipped source code anyway, or how to deal with
-    files that are in a different place from where their code was compiled.
-
-There are also some options you will probably never need, but which are there
-because they were copied from similar ``bdist`` commands used as an example for
-creating this one.  They may be useful for testing and debugging, however,
-which is why we kept them:
-
-``--keep-temp, -k``
-    Keep the contents of the ``--bdist-dir`` tree around after creating the
-    ``.egg`` file.
-
-``--bdist-dir=DIR, -b DIR``
-    Set the temporary directory for creating the distribution.  The entire
-    contents of this directory are zipped to create the ``.egg`` file, after
-    running various installation commands to copy the package's modules, data,
-    and extensions here.
-
-``--skip-build``
-    Skip doing any "build" commands; just go straight to the
-    install-and-compress phases.
-
-
-.. _develop:
-
-``develop`` - Deploy the project source in "Development Mode"
-=============================================================
-
-This command allows you to deploy your project's source for use in one or more
-"staging areas" where it will be available for importing.  This deployment is
-done in such a way that changes to the project source are immediately available
-in the staging area(s), without needing to run a build or install step after
-each change.
-
-The ``develop`` command works by creating an ``.egg-link`` file (named for the
-project) in the given staging area.  If the staging area is Python's
-``site-packages`` directory, it also updates an ``easy-install.pth`` file so
-that the project is on ``sys.path`` by default for all programs run using that
-Python installation.
-
-The ``develop`` command also installs wrapper scripts in the staging area (or
-a separate directory, as specified) that will ensure the project's dependencies
-are available on ``sys.path`` before running the project's source scripts.
-And, it ensures that any missing project dependencies are available in the
-staging area, by downloading and installing them if necessary.
-
-Last, but not least, the ``develop`` command invokes the ``build_ext -i``
-command to ensure any C extensions in the project have been built and are
-up-to-date, and the ``egg_info`` command to ensure the project's metadata is
-updated (so that the runtime and wrappers know what the project's dependencies
-are).  If you make any changes to the project's setup script or C extensions,
-you should rerun the ``develop`` command against all relevant staging areas to
-keep the project's scripts, metadata and extensions up-to-date.  Most other
-kinds of changes to your project should not require any build operations or
-rerunning ``develop``, but keep in mind that even minor changes to the setup
-script (e.g. changing an entry point definition) require you to re-run the
-``develop`` or ``test`` commands to keep the distribution updated.
-
-Here are some of the options that the ``develop`` command accepts.  Note that
-they affect the project's dependencies as well as the project itself, so if you
-have dependencies that need to be installed and you use ``--exclude-scripts``
-(for example), the dependencies' scripts will not be installed either!  For
-this reason, you may want to use pip to install the project's dependencies
-before using the ``develop`` command, if you need finer control over the
-installation options for dependencies.
-
-``--uninstall, -u``
-    Un-deploy the current project.  You may use the ``--install-dir`` or ``-d``
-    option to designate the staging area.  The created ``.egg-link`` file will
-    be removed, if present and it is still pointing to the project directory.
-    The project directory will be removed from ``easy-install.pth`` if the
-    staging area is Python's ``site-packages`` directory.
-
-    Note that this option currently does *not* uninstall script wrappers!  You
-    must uninstall them yourself, or overwrite them by using pip to install a
-    different version of the package.  You can also avoid installing script
-    wrappers in the first place, if you use the ``--exclude-scripts`` (aka
-    ``-x``) option when you run ``develop`` to deploy the project.
-
-``--multi-version, -m``
-    "Multi-version" mode. Specifying this option prevents ``develop`` from
-    adding an ``easy-install.pth`` entry for the project(s) being deployed, and
-    if an entry for any version of a project already exists, the entry will be
-    removed upon successful deployment.  In multi-version mode, no specific
-    version of the package is available for importing, unless you use
-    ``pkg_resources.require()`` to put it on ``sys.path``, or you are running
-    a wrapper script generated by ``setuptools``.  (In which case the wrapper
-    script calls ``require()`` for you.)
-
-    Note that if you install to a directory other than ``site-packages``,
-    this option is automatically in effect, because ``.pth`` files can only be
-    used in ``site-packages`` (at least in Python 2.3 and 2.4). So, if you use
-    the ``--install-dir`` or ``-d`` option (or they are set via configuration
-    file(s)) your project and its dependencies will be deployed in multi-
-    version mode.
-
-``--install-dir=DIR, -d DIR``
-    Set the installation directory (staging area).  If this option is not
-    directly specified on the command line or in a distutils configuration
-    file, the distutils default installation location is used.  Normally, this
-    will be the ``site-packages`` directory, but if you are using distutils
-    configuration files, setting things like ``prefix`` or ``install_lib``,
-    then those settings are taken into account when computing the default
-    staging area.
-
-``--script-dir=DIR, -s DIR``
-    Set the script installation directory.  If you don't supply this option
-    (via the command line or a configuration file), but you *have* supplied
-    an ``--install-dir`` (via command line or config file), then this option
-    defaults to the same directory, so that the scripts will be able to find
-    their associated package installation.  Otherwise, this setting defaults
-    to the location where the distutils would normally install scripts, taking
-    any distutils configuration file settings into account.
-
-``--exclude-scripts, -x``
-    Don't deploy script wrappers.  This is useful if you don't want to disturb
-    existing versions of the scripts in the staging area.
-
-``--always-copy, -a``
-    Copy all needed distributions to the staging area, even if they
-    are already present in another directory on ``sys.path``.  By default, if
-    a requirement can be met using a distribution that is already available in
-    a directory on ``sys.path``, it will not be copied to the staging area.
-
-``--egg-path=DIR``
-    Force the generated ``.egg-link`` file to use a specified relative path
-    to the source directory.  This can be useful in circumstances where your
-    installation directory is being shared by code running under multiple
-    platforms (e.g. Mac and Windows) which have different absolute locations
-    for the code under development, but the same *relative* locations with
-    respect to the installation directory.  If you use this option when
-    installing, you must supply the same relative path when uninstalling.
-
-In addition to the above options, the ``develop`` command also accepts all of
-the same options accepted by ``easy_install``.  If you've configured any
-``easy_install`` settings in your ``setup.cfg`` (or other distutils config
-files), the ``develop`` command will use them as defaults, unless you override
-them in a ``[develop]`` section or on the command line.
-
-
-.. _egg_info:
-
-``egg_info`` - Create egg metadata and set build tags
-=====================================================
-
-This command performs two operations: it updates a project's ``.egg-info``
-metadata directory (used by the ``bdist_egg``, ``develop``, and ``test``
-commands), and it allows you to temporarily change a project's version string,
-to support "daily builds" or "snapshot" releases.  It is run automatically by
-the ``sdist``, ``bdist_egg``, ``develop``, and ``test`` commands in order to
-update the project's metadata, but you can also specify it explicitly in order
-to temporarily change the project's version string while executing other
-commands.  (It also generates the ``.egg-info/SOURCES.txt`` manifest file, which
-is used when you are building source distributions.)
-
-In addition to writing the core egg metadata defined by ``setuptools`` and
-required by ``pkg_resources``, this command can be extended to write other
-metadata files as well, by defining entry points in the ``egg_info.writers``
-group.  See the section on `Adding new EGG-INFO Files`_ below for more details.
-Note that using additional metadata writers may require you to include a
-``setup_requires`` argument to ``setup()`` in order to ensure that the desired
-writers are available on ``sys.path``.
-
-
-Release Tagging Options
------------------------
-
-The following options can be used to modify the project's version string for
-all remaining commands on the setup command line.  The options are processed
-in the order shown, so if you use more than one, the requested tags will be
-added in the following order:
-
-``--tag-build=NAME, -b NAME``
-    Append NAME to the project's version string.  Due to the way setuptools
-    processes "pre-release" version suffixes beginning with the letters "a"
-    through "e" (like "alpha", "beta", and "candidate"), you will usually want
-    to use a tag like ".build" or ".dev", as this will cause the version number
-    to be considered *lower* than the project's default version.  (If you
-    want to make the version number *higher* than the default version, you can
-    always leave off --tag-build and then use one or both of the following
-    options.)
-
-    If you have a default build tag set in your ``setup.cfg``, you can suppress
-    it on the command line using ``-b ""`` or ``--tag-build=""`` as an argument
-    to the ``egg_info`` command.
-
-``--tag-date, -d``
-    Add a date stamp of the form "-YYYYMMDD" (e.g. "-20050528") to the
-    project's version number.
-
-``--no-date, -D``
-    Don't include a date stamp in the version number.  This option is included
-    so you can override a default setting in ``setup.cfg``.
-
-
-(Note: Because these options modify the version number used for source and
-binary distributions of your project, you should first make sure that you know
-how the resulting version numbers will be interpreted by automated tools
-like pip.  See the section above on `Specifying Your Project's Version`_ for an
-explanation of pre- and post-release tags, as well as tips on how to choose and
-verify a versioning scheme for your project.)
-
-For advanced uses, there is one other option that can be set, to change the
-location of the project's ``.egg-info`` directory.  Commands that need to find
-the project's source directory or metadata should get it from this setting:
-
-
-Other ``egg_info`` Options
---------------------------
-
-``--egg-base=SOURCEDIR, -e SOURCEDIR``
-    Specify the directory that should contain the .egg-info directory.  This
-    should normally be the root of your project's source tree (which is not
-    necessarily the same as your project directory; some projects use a ``src``
-    or ``lib`` subdirectory as the source root).  You should not normally need
-    to specify this directory, as it is normally determined from the
-    ``package_dir`` argument to the ``setup()`` function, if any.  If there is
-    no ``package_dir`` set, this option defaults to the current directory.
-
-
-``egg_info`` Examples
----------------------
-
-Creating a dated "nightly build" snapshot egg::
-
-    setup.py egg_info --tag-date --tag-build=DEV bdist_egg
-
-Creating a release with no version tags, even if some default tags are
-specified in ``setup.cfg``::
-
-    setup.py egg_info -RDb "" sdist bdist_egg
-
-(Notice that ``egg_info`` must always appear on the command line *before* any
-commands that you want the version changes to apply to.)
-
-.. _rotate:
-
-``rotate`` - Delete outdated distribution files
-===============================================
-
-As you develop new versions of your project, your distribution (``dist``)
-directory will gradually fill up with older source and/or binary distribution
-files.  The ``rotate`` command lets you automatically clean these up, keeping
-only the N most-recently modified files matching a given pattern.
-
-``--match=PATTERNLIST, -m PATTERNLIST``
-    Comma-separated list of glob patterns to match.  This option is *required*.
-    The project name and ``-*`` is prepended to the supplied patterns, in order
-    to match only distributions belonging to the current project (in case you
-    have a shared distribution directory for multiple projects).  Typically,
-    you will use a glob pattern like ``.zip`` or ``.egg`` to match files of
-    the specified type.  Note that each supplied pattern is treated as a
-    distinct group of files for purposes of selecting files to delete.
-
-``--keep=COUNT, -k COUNT``
-    Number of matching distributions to keep.  For each group of files
-    identified by a pattern specified with the ``--match`` option, delete all
-    but the COUNT most-recently-modified files in that group.  This option is
-    *required*.
-
-``--dist-dir=DIR, -d DIR``
-    Directory where the distributions are.  This defaults to the value of the
-    ``bdist`` command's ``--dist-dir`` option, which will usually be the
-    project's ``dist`` subdirectory.
-
-**Example 1**: Delete all .tar.gz files from the distribution directory, except
-for the 3 most recently modified ones::
-
-    setup.py rotate --match=.tar.gz --keep=3
 
-**Example 2**: Delete all Python 2.3 or Python 2.4 eggs from the distribution
-directory, except the most recently modified one for each Python version::
-
-    setup.py rotate --match=-py2.3*.egg,-py2.4*.egg --keep=1
-
-
-.. _saveopts:
-
-``saveopts`` - Save used options to a configuration file
-========================================================
-
-Finding and editing ``distutils`` configuration files can be a pain, especially
-since you also have to translate the configuration options from command-line
-form to the proper configuration file format.  You can avoid these hassles by
-using the ``saveopts`` command.  Just add it to the command line to save the
-options you used.  For example, this command builds the project using
-the ``mingw32`` C compiler, then saves the --compiler setting as the default
-for future builds (even those run implicitly by the ``install`` command)::
-
-    setup.py build --compiler=mingw32 saveopts
-
-The ``saveopts`` command saves all options for every command specified on the
-command line to the project's local ``setup.cfg`` file, unless you use one of
-the `configuration file options`_ to change where the options are saved.  For
-example, this command does the same as above, but saves the compiler setting
-to the site-wide (global) distutils configuration::
-
-    setup.py build --compiler=mingw32 saveopts -g
-
-Note that it doesn't matter where you place the ``saveopts`` command on the
-command line; it will still save all the options specified for all commands.
-For example, this is another valid way to spell the last example::
-
-    setup.py saveopts -g build --compiler=mingw32
-
-Note, however, that all of the commands specified are always run, regardless of
-where ``saveopts`` is placed on the command line.
-
-
-Configuration File Options
---------------------------
-
-Normally, settings such as options and aliases are saved to the project's
-local ``setup.cfg`` file.  But you can override this and save them to the
-global or per-user configuration files, or to a manually-specified filename.
-
-``--global-config, -g``
-    Save settings to the global ``distutils.cfg`` file inside the ``distutils``
-    package directory.  You must have write access to that directory to use
-    this option.  You also can't combine this option with ``-u`` or ``-f``.
-
-``--user-config, -u``
-    Save settings to the current user's ``~/.pydistutils.cfg`` (POSIX) or
-    ``$HOME/pydistutils.cfg`` (Windows) file.  You can't combine this option
-    with ``-g`` or ``-f``.
-
-``--filename=FILENAME, -f FILENAME``
-    Save settings to the specified configuration file to use.  You can't
-    combine this option with ``-g`` or ``-u``.  Note that if you specify a
-    non-standard filename, the ``distutils`` and ``setuptools`` will not
-    use the file's contents.  This option is mainly included for use in
-    testing.
-
-These options are used by other ``setuptools`` commands that modify
-configuration files, such as the `alias`_ and `setopt`_ commands.
-
-
-.. _setopt:
-
-``setopt`` - Set a distutils or setuptools option in a config file
-==================================================================
-
-This command is mainly for use by scripts, but it can also be used as a quick
-and dirty way to change a distutils configuration option without having to
-remember what file the options are in and then open an editor.
-
-**Example 1**.  Set the default C compiler to ``mingw32`` (using long option
-names)::
-
-    setup.py setopt --command=build --option=compiler --set-value=mingw32
-
-**Example 2**.  Remove any setting for the distutils default package
-installation directory (short option names)::
-
-    setup.py setopt -c install -o install_lib -r
-
-
-Options for the ``setopt`` command:
-
-``--command=COMMAND, -c COMMAND``
-    Command to set the option for.  This option is required.
-
-``--option=OPTION, -o OPTION``
-    The name of the option to set.  This option is required.
-
-``--set-value=VALUE, -s VALUE``
-    The value to set the option to.  Not needed if ``-r`` or ``--remove`` is
-    set.
-
-``--remove, -r``
-    Remove (unset) the option, instead of setting it.
-
-In addition to the above options, you may use any of the `configuration file
-options`_ (listed under the `saveopts`_ command, above) to determine which
-distutils configuration file the option will be added to (or removed from).
-
-
-.. _test:
-
-``test`` - Build package and run a unittest suite
-=================================================
-
-.. warning::
-    ``test`` is deprecated and will be removed in a future version. Users
-    looking for a generic test entry point independent of test runner are
-    encouraged to use `tox <https://tox.readthedocs.io>`_.
-
-When doing test-driven development, or running automated builds that need
-testing before they are deployed for downloading or use, it's often useful
-to be able to run a project's unit tests without actually deploying the project
-anywhere, even using the ``develop`` command.  The ``test`` command runs a
-project's unit tests without actually deploying it, by temporarily putting the
-project's source on ``sys.path``, after first running ``build_ext -i`` and
-``egg_info`` to ensure that any C extensions and project metadata are
-up-to-date.
-
-To use this command, your project's tests must be wrapped in a ``unittest``
-test suite by either a function, a ``TestCase`` class or method, or a module
-or package containing ``TestCase`` classes.  If the named suite is a module,
-and the module has an ``additional_tests()`` function, it is called and the
-result (which must be a ``unittest.TestSuite``) is added to the tests to be
-run.  If the named suite is a package, any submodules and subpackages are
-recursively added to the overall test suite.  (Note: if your project specifies
-a ``test_loader``, the rules for processing the chosen ``test_suite`` may
-differ; see the `test_loader`_ documentation for more details.)
-
-Note that many test systems including ``doctest`` support wrapping their
-non-``unittest`` tests in ``TestSuite`` objects.  So, if you are using a test
-package that does not support this, we suggest you encourage its developers to
-implement test suite support, as this is a convenient and standard way to
-aggregate a collection of tests to be run under a common test harness.
-
-By default, tests will be run in the "verbose" mode of the ``unittest``
-package's text test runner, but you can get the "quiet" mode (just dots) if
-you supply the ``-q`` or ``--quiet`` option, either as a global option to
-the setup script (e.g. ``setup.py -q test``) or as an option for the ``test``
-command itself (e.g. ``setup.py test -q``).  There is one other option
-available:
-
-``--test-suite=NAME, -s NAME``
-    Specify the test suite (or module, class, or method) to be run
-    (e.g. ``some_module.test_suite``).  The default for this option can be
-    set by giving a ``test_suite`` argument to the ``setup()`` function, e.g.::
-
-        setup(
-            # ...
-            test_suite="my_package.tests.test_all"
-        )
-
-    If you did not set a ``test_suite`` in your ``setup()`` call, and do not
-    provide a ``--test-suite`` option, an error will occur.
-
-New in 41.5.0: Deprecated the test command.
-
-
-.. _upload:
-
-``upload`` - Upload source and/or egg distributions to PyPI
-===========================================================
-
-The ``upload`` command was deprecated in version 40.0 and removed in version
-42.0. Use `twine <https://pypi.org/p/twine>`_ instead.
-
-For  more information on the current best practices in uploading your packages
-to PyPI, see the Python Packaging User Guide's "Packaging Python Projects"
-tutorial specifically the section on `uploading the distribution archives
-<https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives>`_.
 
 
 -----------------------------------------
diff --git a/docs/userguide/commands.txt b/docs/userguide/commands.txt
new file mode 100644
index 0000000000..8604841621
--- /dev/null
+++ b/docs/userguide/commands.txt
@@ -0,0 +1,566 @@
+-----------------
+Command Reference
+-----------------
+
+.. _alias:
+
+``alias`` - Define shortcuts for commonly used commands
+=======================================================
+
+Sometimes, you need to use the same commands over and over, but you can't
+necessarily set them as defaults.  For example, if you produce both development
+snapshot releases and "stable" releases of a project, you may want to put
+the distributions in different places, or use different ``egg_info`` tagging
+options, etc.  In these cases, it doesn't make sense to set the options in
+a distutils configuration file, because the values of the options changed based
+on what you're trying to do.
+
+Setuptools therefore allows you to define "aliases" - shortcut names for
+an arbitrary string of commands and options, using ``setup.py alias aliasname
+expansion``, where aliasname is the name of the new alias, and the remainder of
+the command line supplies its expansion.  For example, this command defines
+a sitewide alias called "daily", that sets various ``egg_info`` tagging
+options::
+
+    setup.py alias --global-config daily egg_info --tag-build=development
+
+Once the alias is defined, it can then be used with other setup commands,
+e.g.::
+
+    setup.py daily bdist_egg        # generate a daily-build .egg file
+    setup.py daily sdist            # generate a daily-build source distro
+    setup.py daily sdist bdist_egg  # generate both
+
+The above commands are interpreted as if the word ``daily`` were replaced with
+``egg_info --tag-build=development``.
+
+Note that setuptools will expand each alias *at most once* in a given command
+line.  This serves two purposes.  First, if you accidentally create an alias
+loop, it will have no effect; you'll instead get an error message about an
+unknown command.  Second, it allows you to define an alias for a command, that
+uses that command.  For example, this (project-local) alias::
+
+    setup.py alias bdist_egg bdist_egg rotate -k1 -m.egg
+
+redefines the ``bdist_egg`` command so that it always runs the ``rotate``
+command afterwards to delete all but the newest egg file.  It doesn't loop
+indefinitely on ``bdist_egg`` because the alias is only expanded once when
+used.
+
+You can remove a defined alias with the ``--remove`` (or ``-r``) option, e.g.::
+
+    setup.py alias --global-config --remove daily
+
+would delete the "daily" alias we defined above.
+
+Aliases can be defined on a project-specific, per-user, or sitewide basis.  The
+default is to define or remove a project-specific alias, but you can use any of
+the `configuration file options`_ (listed under the `saveopts`_ command, below)
+to determine which distutils configuration file an aliases will be added to
+(or removed from).
+
+Note that if you omit the "expansion" argument to the ``alias`` command,
+you'll get output showing that alias' current definition (and what
+configuration file it's defined in).  If you omit the alias name as well,
+you'll get a listing of all current aliases along with their configuration
+file locations.
+
+
+``bdist_egg`` - Create a Python Egg for the project
+===================================================
+
+.. warning::
+    **eggs** are deprecated in favor of wheels, and not supported by pip.
+
+This command generates a Python Egg (``.egg`` file) for the project.  Python
+Eggs are the preferred binary distribution format for EasyInstall, because they
+are cross-platform (for "pure" packages), directly importable, and contain
+project metadata including scripts and information about the project's
+dependencies.  They can be simply downloaded and added to ``sys.path``
+directly, or they can be placed in a directory on ``sys.path`` and then
+automatically discovered by the egg runtime system.
+
+This command runs the `egg_info`_ command (if it hasn't already run) to update
+the project's metadata (``.egg-info``) directory.  If you have added any extra
+metadata files to the ``.egg-info`` directory, those files will be included in
+the new egg file's metadata directory, for use by the egg runtime system or by
+any applications or frameworks that use that metadata.
+
+You won't usually need to specify any special options for this command; just
+use ``bdist_egg`` and you're done.  But there are a few options that may
+be occasionally useful:
+
+``--dist-dir=DIR, -d DIR``
+    Set the directory where the ``.egg`` file will be placed.  If you don't
+    supply this, then the ``--dist-dir`` setting of the ``bdist`` command
+    will be used, which is usually a directory named ``dist`` in the project
+    directory.
+
+``--plat-name=PLATFORM, -p PLATFORM``
+    Set the platform name string that will be embedded in the egg's filename
+    (assuming the egg contains C extensions).  This can be used to override
+    the distutils default platform name with something more meaningful.  Keep
+    in mind, however, that the egg runtime system expects to see eggs with
+    distutils platform names, so it may ignore or reject eggs with non-standard
+    platform names.  Similarly, the EasyInstall program may ignore them when
+    searching web pages for download links.  However, if you are
+    cross-compiling or doing some other unusual things, you might find a use
+    for this option.
+
+``--exclude-source-files``
+    Don't include any modules' ``.py`` files in the egg, just compiled Python,
+    C, and data files.  (Note that this doesn't affect any ``.py`` files in the
+    EGG-INFO directory or its subdirectories, since for example there may be
+    scripts with a ``.py`` extension which must still be retained.)  We don't
+    recommend that you use this option except for packages that are being
+    bundled for proprietary end-user applications, or for "embedded" scenarios
+    where space is at an absolute premium.  On the other hand, if your package
+    is going to be installed and used in compressed form, you might as well
+    exclude the source because Python's ``traceback`` module doesn't currently
+    understand how to display zipped source code anyway, or how to deal with
+    files that are in a different place from where their code was compiled.
+
+There are also some options you will probably never need, but which are there
+because they were copied from similar ``bdist`` commands used as an example for
+creating this one.  They may be useful for testing and debugging, however,
+which is why we kept them:
+
+``--keep-temp, -k``
+    Keep the contents of the ``--bdist-dir`` tree around after creating the
+    ``.egg`` file.
+
+``--bdist-dir=DIR, -b DIR``
+    Set the temporary directory for creating the distribution.  The entire
+    contents of this directory are zipped to create the ``.egg`` file, after
+    running various installation commands to copy the package's modules, data,
+    and extensions here.
+
+``--skip-build``
+    Skip doing any "build" commands; just go straight to the
+    install-and-compress phases.
+
+
+.. _develop:
+
+``develop`` - Deploy the project source in "Development Mode"
+=============================================================
+
+This command allows you to deploy your project's source for use in one or more
+"staging areas" where it will be available for importing.  This deployment is
+done in such a way that changes to the project source are immediately available
+in the staging area(s), without needing to run a build or install step after
+each change.
+
+The ``develop`` command works by creating an ``.egg-link`` file (named for the
+project) in the given staging area.  If the staging area is Python's
+``site-packages`` directory, it also updates an ``easy-install.pth`` file so
+that the project is on ``sys.path`` by default for all programs run using that
+Python installation.
+
+The ``develop`` command also installs wrapper scripts in the staging area (or
+a separate directory, as specified) that will ensure the project's dependencies
+are available on ``sys.path`` before running the project's source scripts.
+And, it ensures that any missing project dependencies are available in the
+staging area, by downloading and installing them if necessary.
+
+Last, but not least, the ``develop`` command invokes the ``build_ext -i``
+command to ensure any C extensions in the project have been built and are
+up-to-date, and the ``egg_info`` command to ensure the project's metadata is
+updated (so that the runtime and wrappers know what the project's dependencies
+are).  If you make any changes to the project's setup script or C extensions,
+you should rerun the ``develop`` command against all relevant staging areas to
+keep the project's scripts, metadata and extensions up-to-date.  Most other
+kinds of changes to your project should not require any build operations or
+rerunning ``develop``, but keep in mind that even minor changes to the setup
+script (e.g. changing an entry point definition) require you to re-run the
+``develop`` or ``test`` commands to keep the distribution updated.
+
+Here are some of the options that the ``develop`` command accepts.  Note that
+they affect the project's dependencies as well as the project itself, so if you
+have dependencies that need to be installed and you use ``--exclude-scripts``
+(for example), the dependencies' scripts will not be installed either!  For
+this reason, you may want to use pip to install the project's dependencies
+before using the ``develop`` command, if you need finer control over the
+installation options for dependencies.
+
+``--uninstall, -u``
+    Un-deploy the current project.  You may use the ``--install-dir`` or ``-d``
+    option to designate the staging area.  The created ``.egg-link`` file will
+    be removed, if present and it is still pointing to the project directory.
+    The project directory will be removed from ``easy-install.pth`` if the
+    staging area is Python's ``site-packages`` directory.
+
+    Note that this option currently does *not* uninstall script wrappers!  You
+    must uninstall them yourself, or overwrite them by using pip to install a
+    different version of the package.  You can also avoid installing script
+    wrappers in the first place, if you use the ``--exclude-scripts`` (aka
+    ``-x``) option when you run ``develop`` to deploy the project.
+
+``--multi-version, -m``
+    "Multi-version" mode. Specifying this option prevents ``develop`` from
+    adding an ``easy-install.pth`` entry for the project(s) being deployed, and
+    if an entry for any version of a project already exists, the entry will be
+    removed upon successful deployment.  In multi-version mode, no specific
+    version of the package is available for importing, unless you use
+    ``pkg_resources.require()`` to put it on ``sys.path``, or you are running
+    a wrapper script generated by ``setuptools``.  (In which case the wrapper
+    script calls ``require()`` for you.)
+
+    Note that if you install to a directory other than ``site-packages``,
+    this option is automatically in effect, because ``.pth`` files can only be
+    used in ``site-packages`` (at least in Python 2.3 and 2.4). So, if you use
+    the ``--install-dir`` or ``-d`` option (or they are set via configuration
+    file(s)) your project and its dependencies will be deployed in multi-
+    version mode.
+
+``--install-dir=DIR, -d DIR``
+    Set the installation directory (staging area).  If this option is not
+    directly specified on the command line or in a distutils configuration
+    file, the distutils default installation location is used.  Normally, this
+    will be the ``site-packages`` directory, but if you are using distutils
+    configuration files, setting things like ``prefix`` or ``install_lib``,
+    then those settings are taken into account when computing the default
+    staging area.
+
+``--script-dir=DIR, -s DIR``
+    Set the script installation directory.  If you don't supply this option
+    (via the command line or a configuration file), but you *have* supplied
+    an ``--install-dir`` (via command line or config file), then this option
+    defaults to the same directory, so that the scripts will be able to find
+    their associated package installation.  Otherwise, this setting defaults
+    to the location where the distutils would normally install scripts, taking
+    any distutils configuration file settings into account.
+
+``--exclude-scripts, -x``
+    Don't deploy script wrappers.  This is useful if you don't want to disturb
+    existing versions of the scripts in the staging area.
+
+``--always-copy, -a``
+    Copy all needed distributions to the staging area, even if they
+    are already present in another directory on ``sys.path``.  By default, if
+    a requirement can be met using a distribution that is already available in
+    a directory on ``sys.path``, it will not be copied to the staging area.
+
+``--egg-path=DIR``
+    Force the generated ``.egg-link`` file to use a specified relative path
+    to the source directory.  This can be useful in circumstances where your
+    installation directory is being shared by code running under multiple
+    platforms (e.g. Mac and Windows) which have different absolute locations
+    for the code under development, but the same *relative* locations with
+    respect to the installation directory.  If you use this option when
+    installing, you must supply the same relative path when uninstalling.
+
+In addition to the above options, the ``develop`` command also accepts all of
+the same options accepted by ``easy_install``.  If you've configured any
+``easy_install`` settings in your ``setup.cfg`` (or other distutils config
+files), the ``develop`` command will use them as defaults, unless you override
+them in a ``[develop]`` section or on the command line.
+
+
+.. _egg_info:
+
+``egg_info`` - Create egg metadata and set build tags
+=====================================================
+
+This command performs two operations: it updates a project's ``.egg-info``
+metadata directory (used by the ``bdist_egg``, ``develop``, and ``test``
+commands), and it allows you to temporarily change a project's version string,
+to support "daily builds" or "snapshot" releases.  It is run automatically by
+the ``sdist``, ``bdist_egg``, ``develop``, and ``test`` commands in order to
+update the project's metadata, but you can also specify it explicitly in order
+to temporarily change the project's version string while executing other
+commands.  (It also generates the ``.egg-info/SOURCES.txt`` manifest file, which
+is used when you are building source distributions.)
+
+In addition to writing the core egg metadata defined by ``setuptools`` and
+required by ``pkg_resources``, this command can be extended to write other
+metadata files as well, by defining entry points in the ``egg_info.writers``
+group.  See the section on `Adding new EGG-INFO Files`_ below for more details.
+Note that using additional metadata writers may require you to include a
+``setup_requires`` argument to ``setup()`` in order to ensure that the desired
+writers are available on ``sys.path``.
+
+
+Release Tagging Options
+-----------------------
+
+The following options can be used to modify the project's version string for
+all remaining commands on the setup command line.  The options are processed
+in the order shown, so if you use more than one, the requested tags will be
+added in the following order:
+
+``--tag-build=NAME, -b NAME``
+    Append NAME to the project's version string.  Due to the way setuptools
+    processes "pre-release" version suffixes beginning with the letters "a"
+    through "e" (like "alpha", "beta", and "candidate"), you will usually want
+    to use a tag like ".build" or ".dev", as this will cause the version number
+    to be considered *lower* than the project's default version.  (If you
+    want to make the version number *higher* than the default version, you can
+    always leave off --tag-build and then use one or both of the following
+    options.)
+
+    If you have a default build tag set in your ``setup.cfg``, you can suppress
+    it on the command line using ``-b ""`` or ``--tag-build=""`` as an argument
+    to the ``egg_info`` command.
+
+``--tag-date, -d``
+    Add a date stamp of the form "-YYYYMMDD" (e.g. "-20050528") to the
+    project's version number.
+
+``--no-date, -D``
+    Don't include a date stamp in the version number.  This option is included
+    so you can override a default setting in ``setup.cfg``.
+
+
+(Note: Because these options modify the version number used for source and
+binary distributions of your project, you should first make sure that you know
+how the resulting version numbers will be interpreted by automated tools
+like pip.  See the section above on `Specifying Your Project's Version`_ for an
+explanation of pre- and post-release tags, as well as tips on how to choose and
+verify a versioning scheme for your project.)
+
+For advanced uses, there is one other option that can be set, to change the
+location of the project's ``.egg-info`` directory.  Commands that need to find
+the project's source directory or metadata should get it from this setting:
+
+
+Other ``egg_info`` Options
+--------------------------
+
+``--egg-base=SOURCEDIR, -e SOURCEDIR``
+    Specify the directory that should contain the .egg-info directory.  This
+    should normally be the root of your project's source tree (which is not
+    necessarily the same as your project directory; some projects use a ``src``
+    or ``lib`` subdirectory as the source root).  You should not normally need
+    to specify this directory, as it is normally determined from the
+    ``package_dir`` argument to the ``setup()`` function, if any.  If there is
+    no ``package_dir`` set, this option defaults to the current directory.
+
+
+``egg_info`` Examples
+---------------------
+
+Creating a dated "nightly build" snapshot egg::
+
+    setup.py egg_info --tag-date --tag-build=DEV bdist_egg
+
+Creating a release with no version tags, even if some default tags are
+specified in ``setup.cfg``::
+
+    setup.py egg_info -RDb "" sdist bdist_egg
+
+(Notice that ``egg_info`` must always appear on the command line *before* any
+commands that you want the version changes to apply to.)
+
+.. _rotate:
+
+``rotate`` - Delete outdated distribution files
+===============================================
+
+As you develop new versions of your project, your distribution (``dist``)
+directory will gradually fill up with older source and/or binary distribution
+files.  The ``rotate`` command lets you automatically clean these up, keeping
+only the N most-recently modified files matching a given pattern.
+
+``--match=PATTERNLIST, -m PATTERNLIST``
+    Comma-separated list of glob patterns to match.  This option is *required*.
+    The project name and ``-*`` is prepended to the supplied patterns, in order
+    to match only distributions belonging to the current project (in case you
+    have a shared distribution directory for multiple projects).  Typically,
+    you will use a glob pattern like ``.zip`` or ``.egg`` to match files of
+    the specified type.  Note that each supplied pattern is treated as a
+    distinct group of files for purposes of selecting files to delete.
+
+``--keep=COUNT, -k COUNT``
+    Number of matching distributions to keep.  For each group of files
+    identified by a pattern specified with the ``--match`` option, delete all
+    but the COUNT most-recently-modified files in that group.  This option is
+    *required*.
+
+``--dist-dir=DIR, -d DIR``
+    Directory where the distributions are.  This defaults to the value of the
+    ``bdist`` command's ``--dist-dir`` option, which will usually be the
+    project's ``dist`` subdirectory.
+
+**Example 1**: Delete all .tar.gz files from the distribution directory, except
+for the 3 most recently modified ones::
+
+    setup.py rotate --match=.tar.gz --keep=3
+
+**Example 2**: Delete all Python 2.3 or Python 2.4 eggs from the distribution
+directory, except the most recently modified one for each Python version::
+
+    setup.py rotate --match=-py2.3*.egg,-py2.4*.egg --keep=1
+
+
+.. _saveopts:
+
+``saveopts`` - Save used options to a configuration file
+========================================================
+
+Finding and editing ``distutils`` configuration files can be a pain, especially
+since you also have to translate the configuration options from command-line
+form to the proper configuration file format.  You can avoid these hassles by
+using the ``saveopts`` command.  Just add it to the command line to save the
+options you used.  For example, this command builds the project using
+the ``mingw32`` C compiler, then saves the --compiler setting as the default
+for future builds (even those run implicitly by the ``install`` command)::
+
+    setup.py build --compiler=mingw32 saveopts
+
+The ``saveopts`` command saves all options for every command specified on the
+command line to the project's local ``setup.cfg`` file, unless you use one of
+the `configuration file options`_ to change where the options are saved.  For
+example, this command does the same as above, but saves the compiler setting
+to the site-wide (global) distutils configuration::
+
+    setup.py build --compiler=mingw32 saveopts -g
+
+Note that it doesn't matter where you place the ``saveopts`` command on the
+command line; it will still save all the options specified for all commands.
+For example, this is another valid way to spell the last example::
+
+    setup.py saveopts -g build --compiler=mingw32
+
+Note, however, that all of the commands specified are always run, regardless of
+where ``saveopts`` is placed on the command line.
+
+
+Configuration File Options
+--------------------------
+
+Normally, settings such as options and aliases are saved to the project's
+local ``setup.cfg`` file.  But you can override this and save them to the
+global or per-user configuration files, or to a manually-specified filename.
+
+``--global-config, -g``
+    Save settings to the global ``distutils.cfg`` file inside the ``distutils``
+    package directory.  You must have write access to that directory to use
+    this option.  You also can't combine this option with ``-u`` or ``-f``.
+
+``--user-config, -u``
+    Save settings to the current user's ``~/.pydistutils.cfg`` (POSIX) or
+    ``$HOME/pydistutils.cfg`` (Windows) file.  You can't combine this option
+    with ``-g`` or ``-f``.
+
+``--filename=FILENAME, -f FILENAME``
+    Save settings to the specified configuration file to use.  You can't
+    combine this option with ``-g`` or ``-u``.  Note that if you specify a
+    non-standard filename, the ``distutils`` and ``setuptools`` will not
+    use the file's contents.  This option is mainly included for use in
+    testing.
+
+These options are used by other ``setuptools`` commands that modify
+configuration files, such as the `alias`_ and `setopt`_ commands.
+
+
+.. _setopt:
+
+``setopt`` - Set a distutils or setuptools option in a config file
+==================================================================
+
+This command is mainly for use by scripts, but it can also be used as a quick
+and dirty way to change a distutils configuration option without having to
+remember what file the options are in and then open an editor.
+
+**Example 1**.  Set the default C compiler to ``mingw32`` (using long option
+names)::
+
+    setup.py setopt --command=build --option=compiler --set-value=mingw32
+
+**Example 2**.  Remove any setting for the distutils default package
+installation directory (short option names)::
+
+    setup.py setopt -c install -o install_lib -r
+
+
+Options for the ``setopt`` command:
+
+``--command=COMMAND, -c COMMAND``
+    Command to set the option for.  This option is required.
+
+``--option=OPTION, -o OPTION``
+    The name of the option to set.  This option is required.
+
+``--set-value=VALUE, -s VALUE``
+    The value to set the option to.  Not needed if ``-r`` or ``--remove`` is
+    set.
+
+``--remove, -r``
+    Remove (unset) the option, instead of setting it.
+
+In addition to the above options, you may use any of the `configuration file
+options`_ (listed under the `saveopts`_ command, above) to determine which
+distutils configuration file the option will be added to (or removed from).
+
+
+.. _test:
+
+``test`` - Build package and run a unittest suite
+=================================================
+
+.. warning::
+    ``test`` is deprecated and will be removed in a future version. Users
+    looking for a generic test entry point independent of test runner are
+    encouraged to use `tox <https://tox.readthedocs.io>`_.
+
+When doing test-driven development, or running automated builds that need
+testing before they are deployed for downloading or use, it's often useful
+to be able to run a project's unit tests without actually deploying the project
+anywhere, even using the ``develop`` command.  The ``test`` command runs a
+project's unit tests without actually deploying it, by temporarily putting the
+project's source on ``sys.path``, after first running ``build_ext -i`` and
+``egg_info`` to ensure that any C extensions and project metadata are
+up-to-date.
+
+To use this command, your project's tests must be wrapped in a ``unittest``
+test suite by either a function, a ``TestCase`` class or method, or a module
+or package containing ``TestCase`` classes.  If the named suite is a module,
+and the module has an ``additional_tests()`` function, it is called and the
+result (which must be a ``unittest.TestSuite``) is added to the tests to be
+run.  If the named suite is a package, any submodules and subpackages are
+recursively added to the overall test suite.  (Note: if your project specifies
+a ``test_loader``, the rules for processing the chosen ``test_suite`` may
+differ; see the `test_loader`_ documentation for more details.)
+
+Note that many test systems including ``doctest`` support wrapping their
+non-``unittest`` tests in ``TestSuite`` objects.  So, if you are using a test
+package that does not support this, we suggest you encourage its developers to
+implement test suite support, as this is a convenient and standard way to
+aggregate a collection of tests to be run under a common test harness.
+
+By default, tests will be run in the "verbose" mode of the ``unittest``
+package's text test runner, but you can get the "quiet" mode (just dots) if
+you supply the ``-q`` or ``--quiet`` option, either as a global option to
+the setup script (e.g. ``setup.py -q test``) or as an option for the ``test``
+command itself (e.g. ``setup.py test -q``).  There is one other option
+available:
+
+``--test-suite=NAME, -s NAME``
+    Specify the test suite (or module, class, or method) to be run
+    (e.g. ``some_module.test_suite``).  The default for this option can be
+    set by giving a ``test_suite`` argument to the ``setup()`` function, e.g.::
+
+        setup(
+            # ...
+            test_suite="my_package.tests.test_all"
+        )
+
+    If you did not set a ``test_suite`` in your ``setup()`` call, and do not
+    provide a ``--test-suite`` option, an error will occur.
+
+New in 41.5.0: Deprecated the test command.
+
+
+.. _upload:
+
+``upload`` - Upload source and/or egg distributions to PyPI
+===========================================================
+
+The ``upload`` command was deprecated in version 40.0 and removed in version
+42.0. Use `twine <https://pypi.org/p/twine>`_ instead.
+
+For  more information on the current best practices in uploading your packages
+to PyPI, see the Python Packaging User Guide's "Packaging Python Projects"
+tutorial specifically the section on `uploading the distribution archives
+<https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives>`_. 
\ No newline at end of file

From 14bae0541bb17824fa4530cf693ef0093b5bdf48 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:46:49 -0400
Subject: [PATCH 7829/8469] docs: migrate functionality info to separate file

cut-and-paste from setuptools.txt
---
 docs/setuptools.txt                | 1326 +--------------------------
 docs/userguide/functionalities.txt | 1338 ++++++++++++++++++++++++++++
 2 files changed, 1347 insertions(+), 1317 deletions(-)
 create mode 100644 docs/userguide/functionalities.txt

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 25af9d3322..7daeb3fc3f 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -61,953 +61,29 @@ Developer's Guide
 
 
 
-Using ``find_packages()``
--------------------------
-
-For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
-package list updated.  That's what ``setuptools.find_packages()`` is for.
-
-``find_packages()`` takes a source directory and two lists of package name
-patterns to exclude and include.  If omitted, the source directory defaults to
-the same
-directory as the setup script.  Some projects use a ``src`` or ``lib``
-directory as the root of their source tree, and those projects would of course
-use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir={"": "src"}`` in their
-``setup()`` arguments, but that's just a normal distutils thing.)
-
-Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
-patterns, and finds Python packages (any directory). Packages are only
-recognized if they include an ``__init__.py`` file. Finally, exclusion
-patterns are applied to remove matching packages.
-
-Inclusion and exclusion patterns are package names, optionally including
-wildcards.  For
-example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
-last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
-"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
-but it still won't exclude a top-level ``tests`` package or the children
-thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
-something like this::
-
-    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
-
-in order to cover all the bases.  Really, the exclusion patterns are intended
-to cover simpler use cases than this, like excluding a single, specified
-package and its subpackages.
-
-Regardless of the parameters, the ``find_packages()``
-function returns a list of package names suitable for use as the ``packages``
-argument to ``setup()``, and so is usually the easiest way to set that
-argument in your setup script.  Especially since it frees you from having to
-remember to modify your setup script whenever your project grows additional
-top-level packages or subpackages.
-
-``find_namespace_packages()``
------------------------------
-In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
-of ``find_packages``, which has the same function signature as
-``find_packages``, but works with `PEP 420`_ compliant implicit namespace
-packages. Here is a minimal setup script using ``find_namespace_packages``::
-
-    from setuptools import setup, find_namespace_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_namespace_packages(),
-    )
-
-
-Keep in mind that according to PEP 420, you may have to either re-organize your
-codebase a bit or define a few exclusions, as the definition of an implicit
-namespace package is quite lenient, so for a project organized like so::
-
-
-    ├── namespace
-    │   └── mypackage
-    │       ├── __init__.py
-    │       └── mod1.py
-    ├── setup.py
-    └── tests
-        └── test_mod1.py
 
-A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
-top-level package called ``tests``! One way to avoid this problem is to use the
-``include`` keyword to whitelist the packages to include, like so::
 
-    from setuptools import setup, find_namespace_packages
 
-    setup(
-        name="namespace.mypackage",
-        version="0.1",
-        packages=find_namespace_packages(include=["namespace.*"])
-    )
 
-Another option is to use the "src" layout, where all package code is placed in
-the ``src`` directory, like so::
 
 
-    ├── setup.py
-    ├── src
-    │   └── namespace
-    │       └── mypackage
-    │           ├── __init__.py
-    │           └── mod1.py
-    └── tests
-        └── test_mod1.py
-
-With this layout, the package directory is specified as ``src``, as such::
-
-    setup(name="namespace.mypackage",
-          version="0.1",
-          package_dir={"": "src"},
-          packages=find_namespace_packages(where="src"))
-
-.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
-
-Automatic Script Creation
-=========================
-
-Packaging and installing scripts can be a bit awkward with the distutils.  For
-one thing, there's no easy way to have a script's filename match local
-conventions on both Windows and POSIX platforms.  For another, you often have
-to create a separate file just for the "main" script, when your actual "main"
-is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
-option only works for actual ``.py`` files that aren't installed in a package.
-
-``setuptools`` fixes all of these problems by automatically generating scripts
-for you with the correct extension, and on Windows it will even create an
-``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
-The way to use this feature is to define "entry points" in your setup script
-that indicate what function the generated script should import and run.  For
-example, to create two console scripts called ``foo`` and ``bar``, and a GUI
-script called ``baz``, you might do something like this::
-
-    setup(
-        # other arguments here...
-        entry_points={
-            "console_scripts": [
-                "foo = my_package.some_module:main_func",
-                "bar = other_module:some_func",
-            ],
-            "gui_scripts": [
-                "baz = my_package_gui:start_func",
-            ]
-        }
-    )
-
-When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
-and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules.  The functions you specify are
-called with no arguments, and their return value is passed to
-``sys.exit()``, so you can return an errorlevel or message to print to
-stderr.
-
-On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
-created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
-``.exe`` wrappers find and execute the right version of Python to run the
-``.py`` or ``.pyw`` file.
-
-You may define as many "console script" and "gui script" entry points as you
-like, and each one can optionally specify "extras" that it depends on, that
-will be added to ``sys.path`` when the script is run.  For more information on
-"extras", see the section below on `Declaring Extras`_.  For more information
-on "entry points" in general, see the section below on `Dynamic Discovery of
-Services and Plugins`_.
-
-
-"Eggsecutable" Scripts
-----------------------
-
-.. deprecated:: 45.3.0
-
-Occasionally, there are situations where it's desirable to make an ``.egg``
-file directly executable.  You can do this by including an entry point such
-as the following::
-
-    setup(
-        # other arguments here...
-        entry_points={
-            "setuptools.installation": [
-                "eggsecutable = my_package.some_module:main_func",
-            ]
-        }
-    )
-
-Any eggs built from the above setup script will include a short executable
-prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
-The prelude can be run on Unix-like platforms (including Mac and Linux) by
-invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
-``.egg`` file.  For the executable prelude to run, the appropriate version of
-Python must be available via the ``PATH`` environment variable, under its
-"long" name.  That is, if the egg is built for Python 2.3, there must be a
-``python2.3`` executable present in a directory on ``PATH``.
-
-IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
-invoked via symlinks.  They *must* be invoked using their original filename, in
-order to ensure that, once running, ``pkg_resources`` will know what project
-and version is in use.  The header script will check this and exit with an
-error if the ``.egg`` file has been renamed or is invoked via a symlink that
-changes its base name.
-
-
-Declaring Dependencies
-======================
-
-``setuptools`` supports automatically installing dependencies when a package is
-installed, and including information about dependencies in Python Eggs (so that
-package management tools like pip can use the information).
-
-``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
-project's required dependencies.  This syntax consists of a project's PyPI
-name, optionally followed by a comma-separated list of "extras" in square
-brackets, optionally followed by a comma-separated list of version
-specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
-``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
-separated by whitespace, but any whitespace or nonstandard characters within a
-project name or version identifier must be replaced with ``-``.
-
-Version specifiers for a given project are internally sorted into ascending
-version order, and used to establish what ranges of versions are acceptable.
-Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
-``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
-the ranges they fall within.  A project's version is then checked for
-membership in the resulting ranges. (Note that providing conflicting conditions
-for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
-therefore produce bizarre results.)
-
-Here are some example requirement specifiers::
-
-    docutils >= 0.3
-
-    # comment lines and \ continuations are allowed in requirement strings
-    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
-        ==1.6, ==1.7  # and so are line-end comments
-
-    PEAK[FastCGI, reST]>=0.5a4
-
-    setuptools==0.5a7
-
-The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers.  If you include more than one
-requirement in a string, each requirement must begin on a new line.
-
-This has three effects:
-
-1. When your project is installed, either by using pip, ``setup.py install``,
-   or ``setup.py develop``, all of the dependencies not already installed will
-   be located (via PyPI), downloaded, built (if necessary), and installed.
 
-2. Any scripts in your project will be installed with wrappers that verify
-   the availability of the specified dependencies at runtime, and ensure that
-   the correct versions are added to ``sys.path`` (e.g. if multiple versions
-   have been installed).
-
-3. Python Egg distributions will include a metadata file listing the
-   dependencies.
 
-Note, by the way, that if you declare your dependencies in ``setup.py``, you do
-*not* need to use the ``require()`` function in your scripts or modules, as
-long as you either install the project or use ``setup.py develop`` to do
-development work on it.  (See `"Development Mode"`_ below for more details on
-using ``setup.py develop``.)
-
-
-Dependencies that aren't in PyPI
---------------------------------
-
-.. warning::
-    Dependency links support has been dropped by pip starting with version
-    19.0 (released 2019-01-22).
-
-If your project depends on packages that don't exist on PyPI, you may still be
-able to depend on them, as long as they are available for download as:
-
-- an egg, in the standard distutils ``sdist`` format,
-- a single ``.py`` file, or
-- a VCS repository (Subversion, Mercurial, or Git).
-
-You just need to add some URLs to the ``dependency_links`` argument to
-``setup()``.
-
-The URLs must be either:
-
-1. direct download URLs,
-2. the URLs of web pages that contain direct download links, or
-3. the repository's URL
-
-In general, it's better to link to web pages, because it is usually less
-complex to update a web page than to release a new version of your project.
-You can also use a SourceForge ``showfiles.php`` link in the case where a
-package you depend on is distributed via SourceForge.
-
-If you depend on a package that's distributed as a single ``.py`` file, you
-must include an ``"#egg=project-version"`` suffix to the URL, to give a project
-name and version number.  (Be sure to escape any dashes in the name or version
-by replacing them with underscores.)  EasyInstall will recognize this suffix
-and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
-as an egg.
-
-In the case of a VCS checkout, you should also append ``#egg=project-version``
-in order to identify for what package that checkout should be used. You can
-append ``@REV`` to the URL's path (before the fragment) to specify a revision.
-Additionally, you can also force the VCS being used by prepending the URL with
-a certain prefix. Currently available are:
-
--  ``svn+URL`` for Subversion,
--  ``git+URL`` for Git, and
--  ``hg+URL`` for Mercurial
-
-A more complete example would be:
-
-    ``vcs+proto://host/path@revision#egg=project-version``
-
-Be careful with the version. It should match the one inside the project files.
-If you want to disregard the version, you have to omit it both in the
-``requires`` and in the URL's fragment.
-
-This will do a checkout (or a clone, in Git and Mercurial parlance) to a
-temporary folder and run ``setup.py bdist_egg``.
-
-The ``dependency_links`` option takes the form of a list of URL strings.  For
-example, this will cause a search of the specified page for eggs or source
-distributions, if the package's dependencies aren't already installed::
-
-    setup(
-        ...
-        dependency_links=[
-            "http://peak.telecommunity.com/snapshots/"
-        ],
-    )
-
-
-.. _Declaring Extras:
-
-
-Declaring "Extras" (optional features with their own dependencies)
-------------------------------------------------------------------
-
-Sometimes a project has "recommended" dependencies, that are not required for
-all uses of the project.  For example, a project might offer optional PDF
-output if ReportLab is installed, and reStructuredText support if docutils is
-installed.  These optional features are called "extras", and setuptools allows
-you to define their requirements as well.  In this way, other projects that
-require these optional features can force the additional requirements to be
-installed, by naming the desired extras in their ``install_requires``.
-
-For example, let's say that Project A offers optional PDF and reST support::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require={
-            "PDF":  ["ReportLab>=1.2", "RXP"],
-            "reST": ["docutils>=0.3"],
-        }
-    )
-
-As you can see, the ``extras_require`` argument takes a dictionary mapping
-names of "extra" features, to strings or lists of strings describing those
-features' requirements.  These requirements will *not* be automatically
-installed unless another package depends on them (directly or indirectly) by
-including the desired "extras" in square brackets after the associated project
-name.  (Or if the extras were listed in a requirement spec on the "pip install"
-command line.)
-
-Extras can be used by a project's `entry points`_ to specify dynamic
-dependencies.  For example, if Project A includes a "rst2pdf" script, it might
-declare it like this, so that the "PDF" requirements are only resolved if the
-"rst2pdf" script is run::
-
-    setup(
-        name="Project-A",
-        ...
-        entry_points={
-            "console_scripts": [
-                "rst2pdf = project_a.tools.pdfgen [PDF]",
-                "rst2html = project_a.tools.htmlgen",
-                # more script entry points ...
-            ],
-        }
-    )
-
-Projects can also use another project's extras when specifying dependencies.
-For example, if project B needs "project A" with PDF support installed, it
-might declare the dependency like this::
-
-    setup(
-        name="Project-B",
-        install_requires=["Project-A[PDF]"],
-        ...
-    )
-
-This will cause ReportLab to be installed along with project A, if project B is
-installed -- even if project A was already installed.  In this way, a project
-can encapsulate groups of optional "downstream dependencies" under a feature
-name, so that packages that depend on it don't have to know what the downstream
-dependencies are.  If a later version of Project A builds in PDF support and
-no longer needs ReportLab, or if it ends up needing other dependencies besides
-ReportLab in order to provide PDF support, Project B's setup information does
-not need to change, but the right packages will still be installed if needed.
-
-Note, by the way, that if a project ends up not needing any other packages to
-support a feature, it should keep an empty requirements list for that feature
-in its ``extras_require`` argument, so that packages depending on that feature
-don't break (due to an invalid feature name).  For example, if Project A above
-builds in PDF support and no longer needs ReportLab, it could change its
-setup to this::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require={
-            "PDF":  [],
-            "reST": ["docutils>=0.3"],
-        }
-    )
-
-so that Package B doesn't have to remove the ``[PDF]`` from its requirement
-specifier.
-
-
-.. _Platform Specific Dependencies:
-
-
-Declaring platform specific dependencies
-----------------------------------------
-
-Sometimes a project might require a dependency to run on a specific platform.
-This could to a package that back ports a module so that it can be used in
-older python versions.  Or it could be a package that is required to run on a
-specific operating system.  This will allow a project to work on multiple
-different platforms without installing dependencies that are not required for
-a platform that is installing the project.
-
-For example, here is a project that uses the ``enum`` module and ``pywin32``::
-
-    setup(
-        name="Project",
-        ...
-        install_requires=[
-            "enum34;python_version<'3.4'",
-            "pywin32 >= 1.0;platform_system=='Windows'"
-        ]
-    )
-
-Since the ``enum`` module was added in Python 3.4, it should only be installed
-if the python version is earlier.  Since ``pywin32`` will only be used on
-windows, it should only be installed when the operating system is Windows.
-Specifying version requirements for the dependencies is supported as normal.
-
-The environmental markers that may be used for testing platform types are
-detailed in `PEP 508`_.
-
-.. _PEP 508: https://www.python.org/dev/peps/pep-0508/
-
-Including Data Files
-====================
-
-The distutils have traditionally allowed installation of "data files", which
-are placed in a platform-specific location.  However, the most common use case
-for data files distributed with a package is for use *by* the package, usually
-by including the data files in the package directory.
-
-Setuptools offers three ways to specify data files to be included in your
-packages.  First, you can simply use the ``include_package_data`` keyword,
-e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        include_package_data=True
-    )
-
-This tells setuptools to install any data files it finds in your packages.
-The data files must be specified via the distutils' ``MANIFEST.in`` file.
-(They can also be tracked by a revision control system, using an appropriate
-plugin.  See the section below on `Adding Support for Revision Control
-Systems`_ for information on how to write such plugins.)
-
-If you want finer-grained control over what files are included (for example,
-if you have documentation files in your package directories and want to exclude
-them from installation), then you can also use the ``package_data`` keyword,
-e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        package_data={
-            # If any package contains *.txt or *.rst files, include them:
-            "": ["*.txt", "*.rst"],
-            # And include any *.msg files found in the "hello" package, too:
-            "hello": ["*.msg"],
-        }
-    )
-
-The ``package_data`` argument is a dictionary that maps from package names to
-lists of glob patterns.  The globs may include subdirectory names, if the data
-files are contained in a subdirectory of the package.  For example, if the
-package tree looks like this::
-
-    setup.py
-    src/
-        mypkg/
-            __init__.py
-            mypkg.txt
-            data/
-                somefile.dat
-                otherdata.dat
-
-The setuptools setup file might look like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages=find_packages("src"),  # include all packages under src
-        package_dir={"": "src"},   # tell distutils packages are under src
-
-        package_data={
-            # If any package contains *.txt files, include them:
-            "": ["*.txt"],
-            # And include any *.dat files found in the "data" subdirectory
-            # of the "mypkg" package, also:
-            "mypkg": ["data/*.dat"],
-        }
-    )
-
-Notice that if you list patterns in ``package_data`` under the empty string,
-these patterns are used to find files in every package, even ones that also
-have their own patterns listed.  Thus, in the above example, the ``mypkg.txt``
-file gets included even though it's not listed in the patterns for ``mypkg``.
-
-Also notice that if you use paths, you *must* use a forward slash (``/``) as
-the path separator, even if you are on Windows.  Setuptools automatically
-converts slashes to appropriate platform-specific separators at build time.
-
-If datafiles are contained in a subdirectory of a package that isn't a package
-itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
-in the ``package_data`` argument (as shown above with ``"data/*.dat"``).
-
-When building an ``sdist``, the datafiles are also drawn from the
-``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
-the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
-
-(Note: although the ``package_data`` argument was previously only available in
-``setuptools``, it was also added to the Python ``distutils`` package as of
-Python 2.4; there is `some documentation for the feature`__ available on the
-python.org website.  If using the setuptools-specific ``include_package_data``
-argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are listed in the MANIFEST.in file.)
-
-__ https://docs.python.org/3/distutils/setupscript.html#installing-package-data
-
-Sometimes, the ``include_package_data`` or ``package_data`` options alone
-aren't sufficient to precisely define what files you want included.  For
-example, you may want to include package README files in your revision control
-system and source distributions, but exclude them from being installed.  So,
-setuptools offers an ``exclude_package_data`` option as well, that allows you
-to do things like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages=find_packages("src"),  # include all packages under src
-        package_dir={"": "src"},   # tell distutils packages are under src
-
-        include_package_data=True,    # include everything in source control
-
-        # ...but exclude README.txt from all packages
-        exclude_package_data={"": ["README.txt"]},
-    )
-
-The ``exclude_package_data`` option is a dictionary mapping package names to
-lists of wildcard patterns, just like the ``package_data`` option.  And, just
-as with that option, a key of ``""`` will apply the given pattern(s) to all
-packages.  However, any files that match these patterns will be *excluded*
-from installation, even if they were listed in ``package_data`` or were
-included as a result of using ``include_package_data``.
-
-In summary, the three options allow you to:
-
-``include_package_data``
-    Accept all data files and directories matched by ``MANIFEST.in``.
-
-``package_data``
-    Specify additional patterns to match files that may or may
-    not be matched by ``MANIFEST.in`` or found in source control.
-
-``exclude_package_data``
-    Specify patterns for data files and directories that should *not* be
-    included when a package is installed, even if they would otherwise have
-    been included due to the use of the preceding options.
-
-NOTE: Due to the way the distutils build process works, a data file that you
-include in your project and then stop including may be "orphaned" in your
-project's build directories, requiring you to run ``setup.py clean --all`` to
-fully remove them.  This may also be important for your users and contributors
-if they track intermediate revisions of your project using Subversion; be sure
-to let them know when you make changes that remove files from inclusion so they
-can run ``setup.py clean --all``.
-
-
-Accessing Data Files at Runtime
--------------------------------
-
-Typically, existing programs manipulate a package's ``__file__`` attribute in
-order to find the location of data files.  However, this manipulation isn't
-compatible with PEP 302-based import hooks, including importing from zip files
-and Python Eggs.  It is strongly recommended that, if you are using data files,
-you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
-them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
-you're using setuptools to distribute your package, there is no reason not to
-use its resource management API.  See also `Importlib Resources`_ for
-a quick example of converting code that uses ``__file__`` to use
-``pkg_resources`` instead.
-
-.. _Importlib Resources: https://docs.python.org/3/library/importlib.html#module-importlib.resources
-
-
-Non-Package Data Files
-----------------------
-
-Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
-files from the distribution into the egg (see `the old docs
-<https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
-fall back to the platform-specific location for installing data files, there is
-no supported facility to reliably retrieve these resources.
-
-Instead, the PyPA recommends that any data files you wish to be accessible at
-run time be included in the package.
-
-
-Automatic Resource Extraction
------------------------------
-
-If you are using tools that expect your resources to be "real" files, or your
-project includes non-extension native libraries or other files that your C
-extensions expect to be able to access, you may need to list those files in
-the ``eager_resources`` argument to ``setup()``, so that the files will be
-extracted together, whenever a C extension in the project is imported.
-
-This is especially important if your project includes shared libraries *other*
-than distutils-built C extensions, and those shared libraries use file
-extensions other than ``.dll``, ``.so``, or ``.dylib``, which are the
-extensions that setuptools 0.6a8 and higher automatically detects as shared
-libraries and adds to the ``native_libs.txt`` file for you.  Any shared
-libraries whose names do not end with one of those extensions should be listed
-as ``eager_resources``, because they need to be present in the filesystem when
-he C extensions that link to them are used.
-
-The ``pkg_resources`` runtime for compressed packages will automatically
-extract *all* C extensions and ``eager_resources`` at the same time, whenever
-*any* C extension or eager resource is requested via the ``resource_filename()``
-API.  (C extensions are imported using ``resource_filename()`` internally.)
-This ensures that C extensions will see all of the "real" files that they
-expect to see.
-
-Note also that you can list directory resource names in ``eager_resources`` as
-well, in which case the directory's contents (including subdirectories) will be
-extracted whenever any C extension or eager resource is requested.
-
-Please note that if you're not sure whether you need to use this argument, you
-don't!  It's really intended to support projects with lots of non-Python
-dependencies and as a last resort for crufty projects that can't otherwise
-handle being compressed.  If your package is pure Python, Python plus data
-files, or Python plus C, you really don't need this.  You've got to be using
-either C or an external program that needs "real" files in your project before
-there's any possibility of ``eager_resources`` being relevant to your project.
-
-
-Extensible Applications and Frameworks
-======================================
-
-
-.. _Entry Points:
 
-Dynamic Discovery of Services and Plugins
------------------------------------------
 
-``setuptools`` supports creating libraries that "plug in" to extensible
-applications and frameworks, by letting you register "entry points" in your
-project that can be imported by the application or framework.
-
-For example, suppose that a blogging tool wants to support plugins
-that provide translation for various file types to the blog's output format.
-The framework might define an "entry point group" called ``blogtool.parsers``,
-and then allow plugins to register entry points for the file extensions they
-support.
-
-This would allow people to create distributions that contain one or more
-parsers for different file types, and then the blogging tool would be able to
-find the parsers at runtime by looking up an entry point for the file
-extension (or mime type, or however it wants to).
-
-Note that if the blogging tool includes parsers for certain file formats, it
-can register these as entry points in its own setup script, which means it
-doesn't have to special-case its built-in formats.  They can just be treated
-the same as any other plugin's entry points would be.
-
-If you're creating a project that plugs in to an existing application or
-framework, you'll need to know what entry points or entry point groups are
-defined by that application or framework.  Then, you can register entry points
-in your setup script.  Here are a few examples of ways you might register an
-``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
-for our hypothetical blogging tool::
-
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
-    )
-
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
-    )
-
-    setup(
-        # ...
-        entry_points="""
-            [blogtool.parsers]
-            .rst = some.nested.module:SomeClass.some_classmethod [reST]
-        """,
-        extras_require=dict(reST="Docutils>=0.3.5")
-    )
-
-The ``entry_points`` argument to ``setup()`` accepts either a string with
-``.ini``-style sections, or a dictionary mapping entry point group names to
-either strings or lists of strings containing entry point specifiers.  An
-entry point specifier consists of a name and value, separated by an ``=``
-sign.  The value consists of a dotted module name, optionally followed by a
-``:`` and a dotted identifier naming an object within the module.  It can
-also include a bracketed list of "extras" that are required for the entry
-point to be used.  When the invoking application or framework requests loading
-of an entry point, any requirements implied by the associated extras will be
-passed to ``pkg_resources.require()``, so that an appropriate error message
-can be displayed if the needed package(s) are missing.  (Of course, the
-invoking app or framework can ignore such errors if it wants to make an entry
-point optional if a requirement isn't installed.)
-
-
-Defining Additional Metadata
-----------------------------
-
-Some extensible applications and frameworks may need to define their own kinds
-of metadata to include in eggs, which they can then access using the
-``pkg_resources`` metadata APIs.  Ordinarily, this is done by having plugin
-developers include additional files in their ``ProjectName.egg-info``
-directory.  However, since it can be tedious to create such files by hand, you
-may want to create a distutils extension that will create the necessary files
-from arguments to ``setup()``, in much the same way that ``setuptools`` does
-for many of the ``setup()`` arguments it adds.  See the section below on
-`Creating distutils Extensions`_ for more details, especially the subsection on
-`Adding new EGG-INFO Files`_.
-
-
-"Development Mode"
-==================
-
-Under normal circumstances, the ``distutils`` assume that you are going to
-build a distribution of your project, not use it in its "raw" or "unbuilt"
-form.  If you were to use the ``distutils`` that way, you would have to rebuild
-and reinstall your project every time you made a change to it during
-development.
-
-Another problem that sometimes comes up with the ``distutils`` is that you may
-need to do development on two related projects at the same time.  You may need
-to put both projects' packages in the same directory to run them, but need to
-keep them separate for revision control purposes.  How can you do this?
-
-Setuptools allows you to deploy your projects for use in a common directory or
-staging area, but without copying any files.  Thus, you can edit each project's
-code in its checkout directory, and only need to run build commands when you
-change a project's C extensions or similarly compiled files.  You can even
-deploy a project into another project's checkout directory, if that's your
-preferred way of working (as opposed to using a common independent staging area
-or the site-packages directory).
-
-To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install``, except that it doesn't actually install anything.
-Instead, it creates a special ``.egg-link`` file in the deployment directory,
-that links to your project's source code.  And, if your deployment directory is
-Python's ``site-packages`` directory, it will also update the
-``easy-install.pth`` file to include your project's source code, thereby making
-it available on ``sys.path`` for all programs using that Python installation.
-
-If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
-will not link directly to your source code when run under Python 3, since
-that source code would be made for Python 2 and not work under Python 3.
-Instead the ``setup.py develop`` will build Python 3 code under the ``build``
-directory, and link there. This means that after doing code changes you will
-have to run ``setup.py build`` before these changes are picked up by your
-Python 3 installation.
-
-In addition, the ``develop`` command creates wrapper scripts in the target
-script directory that will run your in-development scripts after ensuring that
-all your ``install_requires`` packages are available on ``sys.path``.
-
-You can deploy the same project to multiple staging areas, e.g. if you have
-multiple projects on the same machine that are sharing the same project you're
-doing development work.
-
-When you're done with a given development task, you can remove the project
-source from a staging area using ``setup.py develop --uninstall``, specifying
-the desired staging area if it's not the default.
-
-There are several options to control the precise behavior of the ``develop``
-command; see the section on the `develop`_ command below for more details.
-
-Note that you can also apply setuptools commands to non-setuptools projects,
-using commands like this::
-
-   python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
-
-That is, you can simply list the normal setup commands and options following
-the quoted part.
-
-
-Distributing a ``setuptools``-based project
-===========================================
-
-Detailed instructions to distribute a setuptools project can be found at
-`Packaging project tutorials`_.
-
-.. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
-
-Before you begin, make sure you have the latest versions of setuptools and wheel::
-
-    pip install --upgrade setuptools wheel
-
-To build a setuptools project, run this command from the same directory where
-setup.py is located::
-
-    setup.py sdist bdist_wheel
-
-This will generate distribution archives in the `dist` directory.
-
-Before you upload the generated archives make sure you're registered on
-https://test.pypi.org/account/register/. You will also need to verify your email
-to be able to upload any packages.
-You should install twine to be able to upload packages::
-
-    pip install --upgrade twine
-
-Now, to upload these archives, run::
-
-    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-
-To install your newly uploaded package ``example_pkg``,  you can use pip::
-
-    pip install --index-url https://test.pypi.org/simple/ example_pkg
-
-If you have issues at any point, please refer to `Packaging project tutorials`_
-for clarification.
-
-Setting the ``zip_safe`` flag
------------------------------
-
-For some use cases (such as bundling as part of a larger application), Python
-packages may be run directly from a zip file.
-Not all packages, however, are capable of running in compressed form, because
-they may expect to be able to access either source code or data files as
-normal operating system files.  So, ``setuptools`` can install your project
-as a zipfile or a directory, and its default choice is determined by the
-project's ``zip_safe`` flag.
-
-You can pass a True or False value for the ``zip_safe`` argument to the
-``setup()`` function, or you can omit it.  If you omit it, the ``bdist_egg``
-command will analyze your project's contents to see if it can detect any
-conditions that would prevent it from working in a zipfile.  It will output
-notices to the console about any such conditions that it finds.
-
-Currently, this analysis is extremely conservative: it will consider the
-project unsafe if it contains any C extensions or datafiles whatsoever.  This
-does *not* mean that the project can't or won't work as a zipfile!  It just
-means that the ``bdist_egg`` authors aren't yet comfortable asserting that
-the project *will* work.  If the project contains no C or data files, and does
-no ``__file__`` or ``__path__`` introspection or source code manipulation, then
-there is an extremely solid chance the project will work when installed as a
-zipfile.  (And if the project uses ``pkg_resources`` for all its data file
-access, then C extensions and other data files shouldn't be a problem at all.
-See the `Accessing Data Files at Runtime`_ section above for more information.)
 
-However, if ``bdist_egg`` can't be *sure* that your package will work, but
-you've checked over all the warnings it issued, and you are either satisfied it
-*will* work (or if you want to try it for yourself), then you should set
-``zip_safe`` to ``True`` in your ``setup()`` call.  If it turns out that it
-doesn't work, you can always change it to ``False``, which will force
-``setuptools`` to install your project as a directory rather than as a zipfile.
 
-In the future, as we gain more experience with different packages and become
-more satisfied with the robustness of the ``pkg_resources`` runtime, the
-"zip safety" analysis may become less conservative.  However, we strongly
-recommend that you determine for yourself whether your project functions
-correctly when installed as a zipfile, correct any problems if you can, and
-then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
-flag, so that it will not be necessary for ``bdist_egg`` to try to guess
-whether your project can work as a zipfile.
 
-.. _Namespace Packages:
 
-Namespace Packages
-------------------
 
-Sometimes, a large package is more useful if distributed as a collection of
-smaller eggs.  However, Python does not normally allow the contents of a
-package to be retrieved from more than one location.  "Namespace packages"
-are a solution for this problem.  When you declare a package to be a namespace
-package, it means that the package has no meaningful contents in its
-``__init__.py``, and that it is merely a container for modules and subpackages.
 
-The ``pkg_resources`` runtime will then automatically ensure that the contents
-of namespace packages that are spread over multiple eggs or directories are
-combined into a single "virtual" package.
 
-The ``namespace_packages`` argument to ``setup()`` lets you declare your
-project's namespace packages, so that they will be included in your project's
-metadata.  The argument should list the namespace packages that the egg
-participates in.  For example, the ZopeInterface project might do this::
 
-    setup(
-        # ...
-        namespace_packages=["zope"]
-    )
 
-because it contains a ``zope.interface`` package that lives in the ``zope``
-namespace package.  Similarly, a project for a standalone ``zope.publisher``
-would also declare the ``zope`` namespace package.  When these projects are
-installed and used, Python will see them both as part of a "virtual" ``zope``
-package, even though they will be installed in different locations.
-
-Namespace packages don't have to be top-level packages.  For example, Zope 3's
-``zope.app`` package is a namespace package, and in the future PEAK's
-``peak.util`` package will be too.
-
-Note, by the way, that your project's source tree must include the namespace
-packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
-packages), in a normal Python package layout.  These ``__init__.py`` files
-*must* contain the line::
-
-    __import__("pkg_resources").declare_namespace(__name__)
-
-This code ensures that the namespace package machinery is operating and that
-the current package is registered as a namespace package.
-
-You must NOT include any other code and data in a namespace package's
-``__init__.py``.  Even though it may appear to work during development, or when
-projects are installed as ``.egg`` files, it will not work when the projects
-are installed using "system" packaging tools -- in such cases the
-``__init__.py`` files will not be installed, let alone executed.
-
-You must include the ``declare_namespace()``  line in the ``__init__.py`` of
-*every* project that has contents for the namespace package in question, in
-order to ensure that the namespace will be declared regardless of which
-project's copy of ``__init__.py`` is loaded first.  If the first loaded
-``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!
+
+
+
+
 
 
 TRANSITIONAL NOTE
@@ -1033,164 +109,14 @@ Our apologies for the inconvenience, and thank you for your patience.
 
 
 
-Tagging and "Daily Build" or "Snapshot" Releases
-------------------------------------------------
-
-When a set of related projects are under development, it may be important to
-track finer-grained version increments than you would normally use for e.g.
-"stable" releases.  While stable releases might be measured in dotted numbers
-with alpha/beta/etc. status codes, development versions of a project often
-need to be tracked by revision or build number or even build date.  This is
-especially true when projects in development need to refer to one another, and
-therefore may literally need an up-to-the-minute version of something!
-
-To support these scenarios, ``setuptools`` allows you to "tag" your source and
-egg distributions by adding one or more of the following to the project's
-"official" version identifier:
-
-* A manually-specified pre-release tag, such as "build" or "dev", or a
-  manually-specified post-release tag, such as a build or revision number
-  (``--tag-build=STRING, -bSTRING``)
-
-* An 8-character representation of the build date (``--tag-date, -d``), as
-  a postrelease tag
-
-You can add these tags by adding ``egg_info`` and the desired options to
-the command line ahead of the ``sdist`` or ``bdist`` commands that you want
-to generate a daily build or snapshot for.  See the section below on the
-`egg_info`_ command for more details.
-
-(Also, before you release your project, be sure to see the section above on
-`Specifying Your Project's Version`_ for more information about how pre- and
-post-release tags affect how version numbers are interpreted.  This is
-important in order to make sure that dependency processing tools will know
-which versions of your project are newer than others.)
-
-Finally, if you are creating builds frequently, and either building them in a
-downloadable location or are copying them to a distribution server, you should
-probably also check out the `rotate`_ command, which lets you automatically
-delete all but the N most-recently-modified distributions matching a glob
-pattern.  So, you can use a command line like::
-
-    setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
-
-to build an egg whose version info includes "DEV-rNNNN" (where NNNN is the
-most recent Subversion revision that affected the source tree), and then
-delete any egg files from the distribution directory except for the three
-that were built most recently.
-
-If you have to manage automated builds for multiple packages, each with
-different tagging and rotation policies, you may also want to check out the
-`alias`_ command, which would let each package define an alias like ``daily``
-that would perform the necessary tag, build, and rotate commands.  Then, a
-simpler script or cron job could just run ``setup.py daily`` in each project
-directory.  (And, you could also define sitewide or per-user default versions
-of the ``daily`` alias, so that projects that didn't define their own would
-use the appropriate defaults.)
-
-
-Generating Source Distributions
--------------------------------
-
-``setuptools`` enhances the distutils' default algorithm for source file
-selection with pluggable endpoints for looking up files to include. If you are
-using a revision control system, and your source distributions only need to
-include files that you're tracking in revision control, use a corresponding
-plugin instead of writing a ``MANIFEST.in`` file. See the section below on
-`Adding Support for Revision Control Systems`_ for information on plugins.
-
-If you need to include automatically generated files, or files that are kept in
-an unsupported revision control system, you'll need to create a ``MANIFEST.in``
-file to specify any files that the default file location algorithm doesn't
-catch.  See the distutils documentation for more information on the format of
-the ``MANIFEST.in`` file.
 
-But, be sure to ignore any part of the distutils documentation that deals with
-``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
-from these issues and doesn't work the same way in any case.  Unlike the
-distutils, setuptools regenerates the source distribution manifest file
-every time you build a source distribution, and it builds it inside the
-project's ``.egg-info`` directory, out of the way of your main project
-directory.  You therefore need not worry about whether it is up-to-date or not.
 
-Indeed, because setuptools' approach to determining the contents of a source
-distribution is so much simpler, its ``sdist`` command omits nearly all of
-the options that the distutils' more complex ``sdist`` process requires.  For
-all practical purposes, you'll probably use only the ``--formats`` option, if
-you use any option at all.
 
 
-Making "Official" (Non-Snapshot) Releases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When you make an official release, creating source or binary distributions,
-you will need to override the tag settings from ``setup.cfg``, so that you
-don't end up registering versions like ``foobar-0.7a1.dev-r34832``.  This is
-easy to do if you are developing on the trunk and using tags or branches for
-your releases - just make the change to ``setup.cfg`` after branching or
-tagging the release, so the trunk will still produce development snapshots.
 
-Alternately, if you are not branching for releases, you can override the
-default version options on the command line, using something like::
 
-    setup.py egg_info -Db "" sdist bdist_egg
 
-The first part of this command (``egg_info -Db ""``) will override the
-configured tag information, before creating source and binary eggs. Thus, these
-commands will use the plain version from your ``setup.py``, without adding the
-build designation string.
-
-Of course, if you will be doing this a lot, you may wish to create a personal
-alias for this operation, e.g.::
-
-    setup.py alias -u release egg_info -Db ""
-
-You can then use it like this::
-
-    setup.py release sdist bdist_egg
-
-Or of course you can create more elaborate aliases that do all of the above.
-See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
-
-
-
-Distributing Extensions compiled with Cython
---------------------------------------------
-
-``setuptools`` will detect at build time whether Cython is installed or not.
-If Cython is not found ``setuptools`` will ignore pyx files.
-
-To ensure Cython is available, include Cython in the build-requires section
-of your pyproject.toml::
-
-    [build-system]
-    requires=[..., "cython"]
-
-Built with pip 10 or later, that declaration is sufficient to include Cython
-in the build. For broader compatibility, declare the dependency in your
-setup-requires of setup.cfg::
-
-    [options]
-    setup_requires =
-        ...
-        cython
-
-As long as Cython is present in the build environment, ``setuptools`` includes
-transparent support for building Cython extensions, as
-long as extensions are defined using ``setuptools.Extension``.
-
-If you follow these rules, you can safely list ``.pyx`` files as the source
-of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
-will use it.
-
-Of course, for this to work, your source distributions must include the C
-code generated by Cython, as well as your original ``.pyx`` files.  This means
-that you will probably want to include current ``.c`` files in your revision
-control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files.  This will ensure that people tracking your project in a revision
-control system will be able to build it even if they don't have Cython
-installed, and that your source releases will be similarly usable with or
-without Cython.
 
 
 
@@ -1466,247 +392,13 @@ by directives, such as ``attr:`` and others, will be silently ignored.
 As a consequence, the resulting dictionary will include no such options.
 
 
---------------------------------
-Extending and Reusing Setuptools
---------------------------------
-
-Creating ``distutils`` Extensions
-=================================
-
-It can be hard to add new commands or setup arguments to the distutils.  But
-the ``setuptools`` package makes it a bit easier, by allowing you to distribute
-a distutils extension as a separate project, and then have projects that need
-the extension just refer to it in their ``setup_requires`` argument.
-
-With ``setuptools``, your distutils extension projects can hook in new
-commands and ``setup()`` arguments just by defining "entry points".  These
-are mappings from command or argument names to a specification of where to
-import a handler from.  (See the section on `Dynamic Discovery of Services and
-Plugins`_ above for some more background on entry points.)
-
-
-Adding Commands
----------------
-
-You can add new ``setup`` commands by defining entry points in the
-``distutils.commands`` group.  For example, if you wanted to add a ``foo``
-command, you might add something like this to your distutils extension
-project's setup script::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-        },
-    )
-
-(Assuming, of course, that the ``foo`` class in ``mypackage.some_module`` is
-a ``setuptools.Command`` subclass.)
-
-Once a project containing such entry points has been activated on ``sys.path``,
-(e.g. by running "install" or "develop" with a site-packages installation
-directory) the command(s) will be available to any ``setuptools``-based setup
-scripts.  It is not necessary to use the ``--command-packages`` option or
-to monkeypatch the ``distutils.command`` package to install your commands;
-``setuptools`` automatically adds a wrapper to the distutils to search for
-entry points in the active distributions on ``sys.path``.  In fact, this is
-how setuptools' own commands are installed: the setuptools project's setup
-script defines entry points for them!
-
-
-Adding ``setup()`` Arguments
-----------------------------
-
-.. warning:: Adding arguments to setup is discouraged as such arguments
-   are only supported through imperative execution and not supported through
-   declarative config.
-
-Sometimes, your commands may need additional arguments to the ``setup()``
-call.  You can enable this by defining entry points in the
-``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
-argument called ``bar_baz``, you might add something like this to your
-distutils extension project's setup script::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-            "distutils.setup_keywords": [
-                "bar_baz = mypackage.some_module:validate_bar_baz",
-            ],
-        },
-    )
-
-The idea here is that the entry point defines a function that will be called
-to validate the ``setup()`` argument, if it's supplied.  The ``Distribution``
-object will have the initial value of the attribute set to ``None``, and the
-validation function will only be called if the ``setup()`` call sets it to
-a non-None value.  Here's an example validation function::
-
-    def assert_bool(dist, attr, value):
-        """Verify that value is True, False, 0, or 1"""
-        if bool(value) != value:
-            raise DistutilsSetupError(
-                "%r must be a boolean value (got %r)" % (attr,value)
-            )
-
-Your function should accept three arguments: the ``Distribution`` object,
-the attribute name, and the attribute value.  It should raise a
-``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
-is invalid.  Remember, your function will only be called with non-None values,
-and the default value of arguments defined this way is always None.  So, your
-commands should always be prepared for the possibility that the attribute will
-be ``None`` when they access it later.
-
-If more than one active distribution defines an entry point for the same
-``setup()`` argument, *all* of them will be called.  This allows multiple
-distutils extensions to define a common argument, as long as they agree on
-what values of that argument are valid.
-
-Also note that as with commands, it is not necessary to subclass or monkeypatch
-the distutils ``Distribution`` class in order to add your arguments; it is
-sufficient to define the entry points in your extension, as long as any setup
-script using your extension lists your project in its ``setup_requires``
-argument.
-
-
-Customizing Distribution Options
---------------------------------
-
-Plugins may wish to extend or alter the options on a Distribution object to
-suit the purposes of that project. For example, a tool that infers the
-``Distribution.version`` from SCM-metadata may need to hook into the
-option finalization. To enable this feature, Setuptools offers an entry
-point "setuptools.finalize_distribution_options". That entry point must
-be a callable taking one argument (the Distribution instance).
-
-If the callable has an ``.order`` property, that value will be used to
-determine the order in which the hook is called. Lower numbers are called
-first and the default is zero (0).
-
-Plugins may read, alter, and set properties on the distribution, but each
-plugin is encouraged to load the configuration/settings for their behavior
-independently.
-
-
-Adding new EGG-INFO Files
--------------------------
-
-Some extensible applications or frameworks may want to allow third parties to
-develop plugins with application or framework-specific metadata included in
-the plugins' EGG-INFO directory, for easy access via the ``pkg_resources``
-metadata API.  The easiest way to allow this is to create a distutils extension
-to be used from the plugin projects' setup scripts (via ``setup_requires``)
-that defines a new setup keyword, and then uses that data to write an EGG-INFO
-file when the ``egg_info`` command is run.
-
-The ``egg_info`` command looks for extension points in an ``egg_info.writers``
-group, and calls them to write the files.  Here's a simple example of a
-distutils extension defining a setup argument ``foo_bar``, which is a list of
-lines that will be written to ``foo_bar.txt`` in the EGG-INFO directory of any
-project that uses the argument::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.setup_keywords": [
-                "foo_bar = setuptools.dist:assert_string_list",
-            ],
-            "egg_info.writers": [
-                "foo_bar.txt = setuptools.command.egg_info:write_arg",
-            ],
-        },
-    )
-
-This simple example makes use of two utility functions defined by setuptools
-for its own use: a routine to validate that a setup keyword is a sequence of
-strings, and another one that looks up a setup argument and writes it to
-a file.  Here's what the writer utility looks like::
-
-    def write_arg(cmd, basename, filename):
-        argname = os.path.splitext(basename)[0]
-        value = getattr(cmd.distribution, argname, None)
-        if value is not None:
-            value = "\n".join(value) + "\n"
-        cmd.write_or_delete_file(argname, filename, value)
-
-As you can see, ``egg_info.writers`` entry points must be a function taking
-three arguments: a ``egg_info`` command instance, the basename of the file to
-write (e.g. ``foo_bar.txt``), and the actual full filename that should be
-written to.
-
-In general, writer functions should honor the command object's ``dry_run``
-setting when writing files, and use the ``distutils.log`` object to do any
-console output.  The easiest way to conform to this requirement is to use
-the ``cmd`` object's ``write_file()``, ``delete_file()``, and
-``write_or_delete_file()`` methods exclusively for your file operations.  See
-those methods' docstrings for more details.
-
-
-Adding Support for Revision Control Systems
--------------------------------------------------
-
-If the files you want to include in the source distribution are tracked using
-Git, Mercurial or SVN, you can use the following packages to achieve that:
-
-- Git and Mercurial: `setuptools_scm <https://pypi.org/project/setuptools_scm/>`_
-- SVN: `setuptools_svn <https://pypi.org/project/setuptools_svn/>`_
-
-If you would like to create a plugin for ``setuptools`` to find files tracked
-by another revision control system, you can do so by adding an entry point to
-the ``setuptools.file_finders`` group.  The entry point should be a function
-accepting a single directory name, and should yield all the filenames within
-that directory (and any subdirectories thereof) that are under revision
-control.
-
-For example, if you were going to create a plugin for a revision control system
-called "foobar", you would write a function something like this:
 
-.. code-block:: python
 
-    def find_files_for_foobar(dirname):
-        # loop to yield paths that start with `dirname`
-
-And you would register it in a setup script using something like this::
-
-    entry_points={
-        "setuptools.file_finders": [
-            "foobar = my_foobar_module:find_files_for_foobar",
-        ]
-    }
-
-Then, anyone who wants to use your plugin can simply install it, and their
-local setuptools installation will be able to find the necessary files.
-
-It is not necessary to distribute source control plugins with projects that
-simply use the other source control system, or to specify the plugins in
-``setup_requires``.  When you create a source distribution with the ``sdist``
-command, setuptools automatically records what files were found in the
-``SOURCES.txt`` file.  That way, recipients of source distributions don't need
-to have revision control at all.  However, if someone is working on a package
-by checking out with that system, they will need the same plugin(s) that the
-original author is using.
-
-A few important points for writing revision control file finders:
-
-* Your finder function MUST return relative paths, created by appending to the
-  passed-in directory name.  Absolute paths are NOT allowed, nor are relative
-  paths that reference a parent directory of the passed-in directory.
-
-* Your finder function MUST accept an empty string as the directory name,
-  meaning the current directory.  You MUST NOT convert this to a dot; just
-  yield relative paths.  So, yielding a subdirectory named ``some/dir`` under
-  the current directory should NOT be rendered as ``./some/dir`` or
-  ``/somewhere/some/dir``, but *always* as simply ``some/dir``
-
-* Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
-  with the absence of needed programs (i.e., ones belonging to the revision
-  control system itself.  It *may*, however, use ``distutils.log.warn()`` to
-  inform the user of the missing program(s).
+
+
+
+
+
 
 
 Mailing List and Bug Tracker
diff --git a/docs/userguide/functionalities.txt b/docs/userguide/functionalities.txt
new file mode 100644
index 0000000000..a310da9713
--- /dev/null
+++ b/docs/userguide/functionalities.txt
@@ -0,0 +1,1338 @@
+Using ``find_packages()``
+-------------------------
+
+For simple projects, it's usually easy enough to manually add packages to
+the ``packages`` argument of ``setup()``.  However, for very large projects
+(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
+package list updated.  That's what ``setuptools.find_packages()`` is for.
+
+``find_packages()`` takes a source directory and two lists of package name
+patterns to exclude and include.  If omitted, the source directory defaults to
+the same
+directory as the setup script.  Some projects use a ``src`` or ``lib``
+directory as the root of their source tree, and those projects would of course
+use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
+such projects also need something like ``package_dir={"": "src"}`` in their
+``setup()`` arguments, but that's just a normal distutils thing.)
+
+Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
+patterns, and finds Python packages (any directory). Packages are only
+recognized if they include an ``__init__.py`` file. Finally, exclusion
+patterns are applied to remove matching packages.
+
+Inclusion and exclusion patterns are package names, optionally including
+wildcards.  For
+example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
+last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
+"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
+but it still won't exclude a top-level ``tests`` package or the children
+thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
+something like this::
+
+    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
+
+in order to cover all the bases.  Really, the exclusion patterns are intended
+to cover simpler use cases than this, like excluding a single, specified
+package and its subpackages.
+
+Regardless of the parameters, the ``find_packages()``
+function returns a list of package names suitable for use as the ``packages``
+argument to ``setup()``, and so is usually the easiest way to set that
+argument in your setup script.  Especially since it frees you from having to
+remember to modify your setup script whenever your project grows additional
+top-level packages or subpackages.
+
+``find_namespace_packages()``
+-----------------------------
+In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
+of ``find_packages``, which has the same function signature as
+``find_packages``, but works with `PEP 420`_ compliant implicit namespace
+packages. Here is a minimal setup script using ``find_namespace_packages``::
+
+    from setuptools import setup, find_namespace_packages
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_namespace_packages(),
+    )
+
+
+Keep in mind that according to PEP 420, you may have to either re-organize your
+codebase a bit or define a few exclusions, as the definition of an implicit
+namespace package is quite lenient, so for a project organized like so::
+
+
+    ├── namespace
+    │   └── mypackage
+    │       ├── __init__.py
+    │       └── mod1.py
+    ├── setup.py
+    └── tests
+        └── test_mod1.py
+
+A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
+top-level package called ``tests``! One way to avoid this problem is to use the
+``include`` keyword to whitelist the packages to include, like so::
+
+    from setuptools import setup, find_namespace_packages
+
+    setup(
+        name="namespace.mypackage",
+        version="0.1",
+        packages=find_namespace_packages(include=["namespace.*"])
+    )
+
+Another option is to use the "src" layout, where all package code is placed in
+the ``src`` directory, like so::
+
+
+    ├── setup.py
+    ├── src
+    │   └── namespace
+    │       └── mypackage
+    │           ├── __init__.py
+    │           └── mod1.py
+    └── tests
+        └── test_mod1.py
+
+With this layout, the package directory is specified as ``src``, as such::
+
+    setup(name="namespace.mypackage",
+          version="0.1",
+          package_dir={"": "src"},
+          packages=find_namespace_packages(where="src"))
+
+.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
+
+Automatic Script Creation
+=========================
+
+Packaging and installing scripts can be a bit awkward with the distutils.  For
+one thing, there's no easy way to have a script's filename match local
+conventions on both Windows and POSIX platforms.  For another, you often have
+to create a separate file just for the "main" script, when your actual "main"
+is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
+option only works for actual ``.py`` files that aren't installed in a package.
+
+``setuptools`` fixes all of these problems by automatically generating scripts
+for you with the correct extension, and on Windows it will even create an
+``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
+The way to use this feature is to define "entry points" in your setup script
+that indicate what function the generated script should import and run.  For
+example, to create two console scripts called ``foo`` and ``bar``, and a GUI
+script called ``baz``, you might do something like this::
+
+    setup(
+        # other arguments here...
+        entry_points={
+            "console_scripts": [
+                "foo = my_package.some_module:main_func",
+                "bar = other_module:some_func",
+            ],
+            "gui_scripts": [
+                "baz = my_package_gui:start_func",
+            ]
+        }
+    )
+
+When this project is installed on non-Windows platforms (using "setup.py
+install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
+and ``baz`` scripts will be installed that import ``main_func`` and
+``some_func`` from the specified modules.  The functions you specify are
+called with no arguments, and their return value is passed to
+``sys.exit()``, so you can return an errorlevel or message to print to
+stderr.
+
+On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
+created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
+``.exe`` wrappers find and execute the right version of Python to run the
+``.py`` or ``.pyw`` file.
+
+You may define as many "console script" and "gui script" entry points as you
+like, and each one can optionally specify "extras" that it depends on, that
+will be added to ``sys.path`` when the script is run.  For more information on
+"extras", see the section below on `Declaring Extras`_.  For more information
+on "entry points" in general, see the section below on `Dynamic Discovery of
+Services and Plugins`_.
+
+"Eggsecutable" Scripts
+----------------------
+
+.. deprecated:: 45.3.0
+
+Occasionally, there are situations where it's desirable to make an ``.egg``
+file directly executable.  You can do this by including an entry point such
+as the following::
+
+    setup(
+        # other arguments here...
+        entry_points={
+            "setuptools.installation": [
+                "eggsecutable = my_package.some_module:main_func",
+            ]
+        }
+    )
+
+Any eggs built from the above setup script will include a short executable
+prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
+The prelude can be run on Unix-like platforms (including Mac and Linux) by
+invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
+``.egg`` file.  For the executable prelude to run, the appropriate version of
+Python must be available via the ``PATH`` environment variable, under its
+"long" name.  That is, if the egg is built for Python 2.3, there must be a
+``python2.3`` executable present in a directory on ``PATH``.
+
+IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
+invoked via symlinks.  They *must* be invoked using their original filename, in
+order to ensure that, once running, ``pkg_resources`` will know what project
+and version is in use.  The header script will check this and exit with an
+error if the ``.egg`` file has been renamed or is invoked via a symlink that
+changes its base name.
+
+Declaring Dependencies
+======================
+
+``setuptools`` supports automatically installing dependencies when a package is
+installed, and including information about dependencies in Python Eggs (so that
+package management tools like pip can use the information).
+
+``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
+project's required dependencies.  This syntax consists of a project's PyPI
+name, optionally followed by a comma-separated list of "extras" in square
+brackets, optionally followed by a comma-separated list of version
+specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
+``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
+separated by whitespace, but any whitespace or nonstandard characters within a
+project name or version identifier must be replaced with ``-``.
+
+Version specifiers for a given project are internally sorted into ascending
+version order, and used to establish what ranges of versions are acceptable.
+Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
+``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
+the ranges they fall within.  A project's version is then checked for
+membership in the resulting ranges. (Note that providing conflicting conditions
+for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
+therefore produce bizarre results.)
+
+Here are some example requirement specifiers::
+
+    docutils >= 0.3
+
+    # comment lines and \ continuations are allowed in requirement strings
+    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
+        ==1.6, ==1.7  # and so are line-end comments
+
+    PEAK[FastCGI, reST]>=0.5a4
+
+    setuptools==0.5a7
+
+The simplest way to include requirement specifiers is to use the
+``install_requires`` argument to ``setup()``.  It takes a string or list of
+strings containing requirement specifiers.  If you include more than one
+requirement in a string, each requirement must begin on a new line.
+
+This has three effects:
+
+1. When your project is installed, either by using pip, ``setup.py install``,
+   or ``setup.py develop``, all of the dependencies not already installed will
+   be located (via PyPI), downloaded, built (if necessary), and installed.
+
+2. Any scripts in your project will be installed with wrappers that verify
+   the availability of the specified dependencies at runtime, and ensure that
+   the correct versions are added to ``sys.path`` (e.g. if multiple versions
+   have been installed).
+
+3. Python Egg distributions will include a metadata file listing the
+   dependencies.
+
+Note, by the way, that if you declare your dependencies in ``setup.py``, you do
+*not* need to use the ``require()`` function in your scripts or modules, as
+long as you either install the project or use ``setup.py develop`` to do
+development work on it.  (See `"Development Mode"`_ below for more details on
+using ``setup.py develop``.)
+
+Dependencies that aren't in PyPI
+--------------------------------
+
+.. warning::
+    Dependency links support has been dropped by pip starting with version
+    19.0 (released 2019-01-22).
+
+If your project depends on packages that don't exist on PyPI, you may still be
+able to depend on them, as long as they are available for download as:
+
+- an egg, in the standard distutils ``sdist`` format,
+- a single ``.py`` file, or
+- a VCS repository (Subversion, Mercurial, or Git).
+
+You just need to add some URLs to the ``dependency_links`` argument to
+``setup()``.
+
+The URLs must be either:
+
+1. direct download URLs,
+2. the URLs of web pages that contain direct download links, or
+3. the repository's URL
+
+In general, it's better to link to web pages, because it is usually less
+complex to update a web page than to release a new version of your project.
+You can also use a SourceForge ``showfiles.php`` link in the case where a
+package you depend on is distributed via SourceForge.
+
+If you depend on a package that's distributed as a single ``.py`` file, you
+must include an ``"#egg=project-version"`` suffix to the URL, to give a project
+name and version number.  (Be sure to escape any dashes in the name or version
+by replacing them with underscores.)  EasyInstall will recognize this suffix
+and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
+as an egg.
+
+In the case of a VCS checkout, you should also append ``#egg=project-version``
+in order to identify for what package that checkout should be used. You can
+append ``@REV`` to the URL's path (before the fragment) to specify a revision.
+Additionally, you can also force the VCS being used by prepending the URL with
+a certain prefix. Currently available are:
+
+-  ``svn+URL`` for Subversion,
+-  ``git+URL`` for Git, and
+-  ``hg+URL`` for Mercurial
+
+A more complete example would be:
+
+    ``vcs+proto://host/path@revision#egg=project-version``
+
+Be careful with the version. It should match the one inside the project files.
+If you want to disregard the version, you have to omit it both in the
+``requires`` and in the URL's fragment.
+
+This will do a checkout (or a clone, in Git and Mercurial parlance) to a
+temporary folder and run ``setup.py bdist_egg``.
+
+The ``dependency_links`` option takes the form of a list of URL strings.  For
+example, this will cause a search of the specified page for eggs or source
+distributions, if the package's dependencies aren't already installed::
+
+    setup(
+        ...
+        dependency_links=[
+            "http://peak.telecommunity.com/snapshots/"
+        ],
+    )
+
+
+.. _Declaring Extras:
+
+
+Declaring "Extras" (optional features with their own dependencies)
+------------------------------------------------------------------
+
+Sometimes a project has "recommended" dependencies, that are not required for
+all uses of the project.  For example, a project might offer optional PDF
+output if ReportLab is installed, and reStructuredText support if docutils is
+installed.  These optional features are called "extras", and setuptools allows
+you to define their requirements as well.  In this way, other projects that
+require these optional features can force the additional requirements to be
+installed, by naming the desired extras in their ``install_requires``.
+
+For example, let's say that Project A offers optional PDF and reST support::
+
+    setup(
+        name="Project-A",
+        ...
+        extras_require={
+            "PDF":  ["ReportLab>=1.2", "RXP"],
+            "reST": ["docutils>=0.3"],
+        }
+    )
+
+As you can see, the ``extras_require`` argument takes a dictionary mapping
+names of "extra" features, to strings or lists of strings describing those
+features' requirements.  These requirements will *not* be automatically
+installed unless another package depends on them (directly or indirectly) by
+including the desired "extras" in square brackets after the associated project
+name.  (Or if the extras were listed in a requirement spec on the "pip install"
+command line.)
+
+Extras can be used by a project's `entry points`_ to specify dynamic
+dependencies.  For example, if Project A includes a "rst2pdf" script, it might
+declare it like this, so that the "PDF" requirements are only resolved if the
+"rst2pdf" script is run::
+
+    setup(
+        name="Project-A",
+        ...
+        entry_points={
+            "console_scripts": [
+                "rst2pdf = project_a.tools.pdfgen [PDF]",
+                "rst2html = project_a.tools.htmlgen",
+                # more script entry points ...
+            ],
+        }
+    )
+
+Projects can also use another project's extras when specifying dependencies.
+For example, if project B needs "project A" with PDF support installed, it
+might declare the dependency like this::
+
+    setup(
+        name="Project-B",
+        install_requires=["Project-A[PDF]"],
+        ...
+    )
+
+This will cause ReportLab to be installed along with project A, if project B is
+installed -- even if project A was already installed.  In this way, a project
+can encapsulate groups of optional "downstream dependencies" under a feature
+name, so that packages that depend on it don't have to know what the downstream
+dependencies are.  If a later version of Project A builds in PDF support and
+no longer needs ReportLab, or if it ends up needing other dependencies besides
+ReportLab in order to provide PDF support, Project B's setup information does
+not need to change, but the right packages will still be installed if needed.
+
+Note, by the way, that if a project ends up not needing any other packages to
+support a feature, it should keep an empty requirements list for that feature
+in its ``extras_require`` argument, so that packages depending on that feature
+don't break (due to an invalid feature name).  For example, if Project A above
+builds in PDF support and no longer needs ReportLab, it could change its
+setup to this::
+
+    setup(
+        name="Project-A",
+        ...
+        extras_require={
+            "PDF":  [],
+            "reST": ["docutils>=0.3"],
+        }
+    )
+
+so that Package B doesn't have to remove the ``[PDF]`` from its requirement
+specifier.
+
+.. _Platform Specific Dependencies:
+
+
+Declaring platform specific dependencies
+----------------------------------------
+
+Sometimes a project might require a dependency to run on a specific platform.
+This could to a package that back ports a module so that it can be used in
+older python versions.  Or it could be a package that is required to run on a
+specific operating system.  This will allow a project to work on multiple
+different platforms without installing dependencies that are not required for
+a platform that is installing the project.
+
+For example, here is a project that uses the ``enum`` module and ``pywin32``::
+
+    setup(
+        name="Project",
+        ...
+        install_requires=[
+            "enum34;python_version<'3.4'",
+            "pywin32 >= 1.0;platform_system=='Windows'"
+        ]
+    )
+
+Since the ``enum`` module was added in Python 3.4, it should only be installed
+if the python version is earlier.  Since ``pywin32`` will only be used on
+windows, it should only be installed when the operating system is Windows.
+Specifying version requirements for the dependencies is supported as normal.
+
+The environmental markers that may be used for testing platform types are
+detailed in `PEP 508`_.
+
+.. _PEP 508: https://www.python.org/dev/peps/pep-0508/
+
+Including Data Files
+====================
+
+The distutils have traditionally allowed installation of "data files", which
+are placed in a platform-specific location.  However, the most common use case
+for data files distributed with a package is for use *by* the package, usually
+by including the data files in the package directory.
+
+Setuptools offers three ways to specify data files to be included in your
+packages.  First, you can simply use the ``include_package_data`` keyword,
+e.g.::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        include_package_data=True
+    )
+
+This tells setuptools to install any data files it finds in your packages.
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+(They can also be tracked by a revision control system, using an appropriate
+plugin.  See the section below on `Adding Support for Revision Control
+Systems`_ for information on how to write such plugins.)
+
+If you want finer-grained control over what files are included (for example,
+if you have documentation files in your package directories and want to exclude
+them from installation), then you can also use the ``package_data`` keyword,
+e.g.::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        package_data={
+            # If any package contains *.txt or *.rst files, include them:
+            "": ["*.txt", "*.rst"],
+            # And include any *.msg files found in the "hello" package, too:
+            "hello": ["*.msg"],
+        }
+    )
+
+The ``package_data`` argument is a dictionary that maps from package names to
+lists of glob patterns.  The globs may include subdirectory names, if the data
+files are contained in a subdirectory of the package.  For example, if the
+package tree looks like this::
+
+    setup.py
+    src/
+        mypkg/
+            __init__.py
+            mypkg.txt
+            data/
+                somefile.dat
+                otherdata.dat
+
+The setuptools setup file might look like this::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
+
+        package_data={
+            # If any package contains *.txt files, include them:
+            "": ["*.txt"],
+            # And include any *.dat files found in the "data" subdirectory
+            # of the "mypkg" package, also:
+            "mypkg": ["data/*.dat"],
+        }
+    )
+
+Notice that if you list patterns in ``package_data`` under the empty string,
+these patterns are used to find files in every package, even ones that also
+have their own patterns listed.  Thus, in the above example, the ``mypkg.txt``
+file gets included even though it's not listed in the patterns for ``mypkg``.
+
+Also notice that if you use paths, you *must* use a forward slash (``/``) as
+the path separator, even if you are on Windows.  Setuptools automatically
+converts slashes to appropriate platform-specific separators at build time.
+
+If datafiles are contained in a subdirectory of a package that isn't a package
+itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
+in the ``package_data`` argument (as shown above with ``"data/*.dat"``).
+
+When building an ``sdist``, the datafiles are also drawn from the
+``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
+the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
+
+(Note: although the ``package_data`` argument was previously only available in
+``setuptools``, it was also added to the Python ``distutils`` package as of
+Python 2.4; there is `some documentation for the feature`__ available on the
+python.org website.  If using the setuptools-specific ``include_package_data``
+argument, files specified by ``package_data`` will *not* be automatically
+added to the manifest unless they are listed in the MANIFEST.in file.)
+
+__ https://docs.python.org/3/distutils/setupscript.html#installing-package-data
+
+Sometimes, the ``include_package_data`` or ``package_data`` options alone
+aren't sufficient to precisely define what files you want included.  For
+example, you may want to include package README files in your revision control
+system and source distributions, but exclude them from being installed.  So,
+setuptools offers an ``exclude_package_data`` option as well, that allows you
+to do things like this::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
+
+        include_package_data=True,    # include everything in source control
+
+        # ...but exclude README.txt from all packages
+        exclude_package_data={"": ["README.txt"]},
+    )
+
+The ``exclude_package_data`` option is a dictionary mapping package names to
+lists of wildcard patterns, just like the ``package_data`` option.  And, just
+as with that option, a key of ``""`` will apply the given pattern(s) to all
+packages.  However, any files that match these patterns will be *excluded*
+from installation, even if they were listed in ``package_data`` or were
+included as a result of using ``include_package_data``.
+
+In summary, the three options allow you to:
+
+``include_package_data``
+    Accept all data files and directories matched by ``MANIFEST.in``.
+
+``package_data``
+    Specify additional patterns to match files that may or may
+    not be matched by ``MANIFEST.in`` or found in source control.
+
+``exclude_package_data``
+    Specify patterns for data files and directories that should *not* be
+    included when a package is installed, even if they would otherwise have
+    been included due to the use of the preceding options.
+
+NOTE: Due to the way the distutils build process works, a data file that you
+include in your project and then stop including may be "orphaned" in your
+project's build directories, requiring you to run ``setup.py clean --all`` to
+fully remove them.  This may also be important for your users and contributors
+if they track intermediate revisions of your project using Subversion; be sure
+to let them know when you make changes that remove files from inclusion so they
+can run ``setup.py clean --all``.
+
+Accessing Data Files at Runtime
+-------------------------------
+
+Typically, existing programs manipulate a package's ``__file__`` attribute in
+order to find the location of data files.  However, this manipulation isn't
+compatible with PEP 302-based import hooks, including importing from zip files
+and Python Eggs.  It is strongly recommended that, if you are using data files,
+you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
+them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
+you're using setuptools to distribute your package, there is no reason not to
+use its resource management API.  See also `Importlib Resources`_ for
+a quick example of converting code that uses ``__file__`` to use
+``pkg_resources`` instead.
+
+.. _Importlib Resources: https://docs.python.org/3/library/importlib.html#module-importlib.resources
+
+
+Non-Package Data Files
+----------------------
+
+Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
+files from the distribution into the egg (see `the old docs
+<https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
+fall back to the platform-specific location for installing data files, there is
+no supported facility to reliably retrieve these resources.
+
+Instead, the PyPA recommends that any data files you wish to be accessible at
+run time be included in the package.
+
+
+Automatic Resource Extraction
+-----------------------------
+
+If you are using tools that expect your resources to be "real" files, or your
+project includes non-extension native libraries or other files that your C
+extensions expect to be able to access, you may need to list those files in
+the ``eager_resources`` argument to ``setup()``, so that the files will be
+extracted together, whenever a C extension in the project is imported.
+
+This is especially important if your project includes shared libraries *other*
+than distutils-built C extensions, and those shared libraries use file
+extensions other than ``.dll``, ``.so``, or ``.dylib``, which are the
+extensions that setuptools 0.6a8 and higher automatically detects as shared
+libraries and adds to the ``native_libs.txt`` file for you.  Any shared
+libraries whose names do not end with one of those extensions should be listed
+as ``eager_resources``, because they need to be present in the filesystem when
+he C extensions that link to them are used.
+
+The ``pkg_resources`` runtime for compressed packages will automatically
+extract *all* C extensions and ``eager_resources`` at the same time, whenever
+*any* C extension or eager resource is requested via the ``resource_filename()``
+API.  (C extensions are imported using ``resource_filename()`` internally.)
+This ensures that C extensions will see all of the "real" files that they
+expect to see.
+
+Note also that you can list directory resource names in ``eager_resources`` as
+well, in which case the directory's contents (including subdirectories) will be
+extracted whenever any C extension or eager resource is requested.
+
+Please note that if you're not sure whether you need to use this argument, you
+don't!  It's really intended to support projects with lots of non-Python
+dependencies and as a last resort for crufty projects that can't otherwise
+handle being compressed.  If your package is pure Python, Python plus data
+files, or Python plus C, you really don't need this.  You've got to be using
+either C or an external program that needs "real" files in your project before
+there's any possibility of ``eager_resources`` being relevant to your project.
+
+
+Extensible Applications and Frameworks
+======================================
+
+
+.. _Entry Points:
+
+Dynamic Discovery of Services and Plugins
+-----------------------------------------
+
+``setuptools`` supports creating libraries that "plug in" to extensible
+applications and frameworks, by letting you register "entry points" in your
+project that can be imported by the application or framework.
+
+For example, suppose that a blogging tool wants to support plugins
+that provide translation for various file types to the blog's output format.
+The framework might define an "entry point group" called ``blogtool.parsers``,
+and then allow plugins to register entry points for the file extensions they
+support.
+
+This would allow people to create distributions that contain one or more
+parsers for different file types, and then the blogging tool would be able to
+find the parsers at runtime by looking up an entry point for the file
+extension (or mime type, or however it wants to).
+
+Note that if the blogging tool includes parsers for certain file formats, it
+can register these as entry points in its own setup script, which means it
+doesn't have to special-case its built-in formats.  They can just be treated
+the same as any other plugin's entry points would be.
+
+If you're creating a project that plugs in to an existing application or
+framework, you'll need to know what entry points or entry point groups are
+defined by that application or framework.  Then, you can register entry points
+in your setup script.  Here are a few examples of ways you might register an
+``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
+for our hypothetical blogging tool::
+
+    setup(
+        # ...
+        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
+    )
+
+    setup(
+        # ...
+        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
+    )
+
+    setup(
+        # ...
+        entry_points="""
+            [blogtool.parsers]
+            .rst = some.nested.module:SomeClass.some_classmethod [reST]
+        """,
+        extras_require=dict(reST="Docutils>=0.3.5")
+    )
+
+The ``entry_points`` argument to ``setup()`` accepts either a string with
+``.ini``-style sections, or a dictionary mapping entry point group names to
+either strings or lists of strings containing entry point specifiers.  An
+entry point specifier consists of a name and value, separated by an ``=``
+sign.  The value consists of a dotted module name, optionally followed by a
+``:`` and a dotted identifier naming an object within the module.  It can
+also include a bracketed list of "extras" that are required for the entry
+point to be used.  When the invoking application or framework requests loading
+of an entry point, any requirements implied by the associated extras will be
+passed to ``pkg_resources.require()``, so that an appropriate error message
+can be displayed if the needed package(s) are missing.  (Of course, the
+invoking app or framework can ignore such errors if it wants to make an entry
+point optional if a requirement isn't installed.)
+
+Defining Additional Metadata
+----------------------------
+
+Some extensible applications and frameworks may need to define their own kinds
+of metadata to include in eggs, which they can then access using the
+``pkg_resources`` metadata APIs.  Ordinarily, this is done by having plugin
+developers include additional files in their ``ProjectName.egg-info``
+directory.  However, since it can be tedious to create such files by hand, you
+may want to create a distutils extension that will create the necessary files
+from arguments to ``setup()``, in much the same way that ``setuptools`` does
+for many of the ``setup()`` arguments it adds.  See the section below on
+`Creating distutils Extensions`_ for more details, especially the subsection on
+`Adding new EGG-INFO Files`_.
+
+
+"Development Mode"
+==================
+
+Under normal circumstances, the ``distutils`` assume that you are going to
+build a distribution of your project, not use it in its "raw" or "unbuilt"
+form.  If you were to use the ``distutils`` that way, you would have to rebuild
+and reinstall your project every time you made a change to it during
+development.
+
+Another problem that sometimes comes up with the ``distutils`` is that you may
+need to do development on two related projects at the same time.  You may need
+to put both projects' packages in the same directory to run them, but need to
+keep them separate for revision control purposes.  How can you do this?
+
+Setuptools allows you to deploy your projects for use in a common directory or
+staging area, but without copying any files.  Thus, you can edit each project's
+code in its checkout directory, and only need to run build commands when you
+change a project's C extensions or similarly compiled files.  You can even
+deploy a project into another project's checkout directory, if that's your
+preferred way of working (as opposed to using a common independent staging area
+or the site-packages directory).
+
+To do this, use the ``setup.py develop`` command.  It works very similarly to
+``setup.py install``, except that it doesn't actually install anything.
+Instead, it creates a special ``.egg-link`` file in the deployment directory,
+that links to your project's source code.  And, if your deployment directory is
+Python's ``site-packages`` directory, it will also update the
+``easy-install.pth`` file to include your project's source code, thereby making
+it available on ``sys.path`` for all programs using that Python installation.
+
+If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
+will not link directly to your source code when run under Python 3, since
+that source code would be made for Python 2 and not work under Python 3.
+Instead the ``setup.py develop`` will build Python 3 code under the ``build``
+directory, and link there. This means that after doing code changes you will
+have to run ``setup.py build`` before these changes are picked up by your
+Python 3 installation.
+
+In addition, the ``develop`` command creates wrapper scripts in the target
+script directory that will run your in-development scripts after ensuring that
+all your ``install_requires`` packages are available on ``sys.path``.
+
+You can deploy the same project to multiple staging areas, e.g. if you have
+multiple projects on the same machine that are sharing the same project you're
+doing development work.
+
+When you're done with a given development task, you can remove the project
+source from a staging area using ``setup.py develop --uninstall``, specifying
+the desired staging area if it's not the default.
+
+There are several options to control the precise behavior of the ``develop``
+command; see the section on the `develop`_ command below for more details.
+
+Note that you can also apply setuptools commands to non-setuptools projects,
+using commands like this::
+
+   python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
+
+That is, you can simply list the normal setup commands and options following
+the quoted part.
+
+
+Distributing a ``setuptools``-based project
+===========================================
+
+Detailed instructions to distribute a setuptools project can be found at
+`Packaging project tutorials`_.
+
+.. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
+
+Before you begin, make sure you have the latest versions of setuptools and wheel::
+
+    pip install --upgrade setuptools wheel
+
+To build a setuptools project, run this command from the same directory where
+setup.py is located::
+
+    setup.py sdist bdist_wheel
+
+This will generate distribution archives in the `dist` directory.
+
+Before you upload the generated archives make sure you're registered on
+https://test.pypi.org/account/register/. You will also need to verify your email
+to be able to upload any packages.
+You should install twine to be able to upload packages::
+
+    pip install --upgrade twine
+
+Now, to upload these archives, run::
+
+    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+To install your newly uploaded package ``example_pkg``,  you can use pip::
+
+    pip install --index-url https://test.pypi.org/simple/ example_pkg
+
+If you have issues at any point, please refer to `Packaging project tutorials`_
+for clarification.
+
+
+Setting the ``zip_safe`` flag
+-----------------------------
+
+For some use cases (such as bundling as part of a larger application), Python
+packages may be run directly from a zip file.
+Not all packages, however, are capable of running in compressed form, because
+they may expect to be able to access either source code or data files as
+normal operating system files.  So, ``setuptools`` can install your project
+as a zipfile or a directory, and its default choice is determined by the
+project's ``zip_safe`` flag.
+
+You can pass a True or False value for the ``zip_safe`` argument to the
+``setup()`` function, or you can omit it.  If you omit it, the ``bdist_egg``
+command will analyze your project's contents to see if it can detect any
+conditions that would prevent it from working in a zipfile.  It will output
+notices to the console about any such conditions that it finds.
+
+Currently, this analysis is extremely conservative: it will consider the
+project unsafe if it contains any C extensions or datafiles whatsoever.  This
+does *not* mean that the project can't or won't work as a zipfile!  It just
+means that the ``bdist_egg`` authors aren't yet comfortable asserting that
+the project *will* work.  If the project contains no C or data files, and does
+no ``__file__`` or ``__path__`` introspection or source code manipulation, then
+there is an extremely solid chance the project will work when installed as a
+zipfile.  (And if the project uses ``pkg_resources`` for all its data file
+access, then C extensions and other data files shouldn't be a problem at all.
+See the `Accessing Data Files at Runtime`_ section above for more information.)
+
+However, if ``bdist_egg`` can't be *sure* that your package will work, but
+you've checked over all the warnings it issued, and you are either satisfied it
+*will* work (or if you want to try it for yourself), then you should set
+``zip_safe`` to ``True`` in your ``setup()`` call.  If it turns out that it
+doesn't work, you can always change it to ``False``, which will force
+``setuptools`` to install your project as a directory rather than as a zipfile.
+
+In the future, as we gain more experience with different packages and become
+more satisfied with the robustness of the ``pkg_resources`` runtime, the
+"zip safety" analysis may become less conservative.  However, we strongly
+recommend that you determine for yourself whether your project functions
+correctly when installed as a zipfile, correct any problems if you can, and
+then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
+flag, so that it will not be necessary for ``bdist_egg`` to try to guess
+whether your project can work as a zipfile.
+
+.. _Namespace Packages:
+
+Namespace Packages
+------------------
+
+Sometimes, a large package is more useful if distributed as a collection of
+smaller eggs.  However, Python does not normally allow the contents of a
+package to be retrieved from more than one location.  "Namespace packages"
+are a solution for this problem.  When you declare a package to be a namespace
+package, it means that the package has no meaningful contents in its
+``__init__.py``, and that it is merely a container for modules and subpackages.
+
+The ``pkg_resources`` runtime will then automatically ensure that the contents
+of namespace packages that are spread over multiple eggs or directories are
+combined into a single "virtual" package.
+
+The ``namespace_packages`` argument to ``setup()`` lets you declare your
+project's namespace packages, so that they will be included in your project's
+metadata.  The argument should list the namespace packages that the egg
+participates in.  For example, the ZopeInterface project might do this::
+
+    setup(
+        # ...
+        namespace_packages=["zope"]
+    )
+
+because it contains a ``zope.interface`` package that lives in the ``zope``
+namespace package.  Similarly, a project for a standalone ``zope.publisher``
+would also declare the ``zope`` namespace package.  When these projects are
+installed and used, Python will see them both as part of a "virtual" ``zope``
+package, even though they will be installed in different locations.
+
+Namespace packages don't have to be top-level packages.  For example, Zope 3's
+``zope.app`` package is a namespace package, and in the future PEAK's
+``peak.util`` package will be too.
+
+Note, by the way, that your project's source tree must include the namespace
+packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
+packages), in a normal Python package layout.  These ``__init__.py`` files
+*must* contain the line::
+
+    __import__("pkg_resources").declare_namespace(__name__)
+
+This code ensures that the namespace package machinery is operating and that
+the current package is registered as a namespace package.
+
+You must NOT include any other code and data in a namespace package's
+``__init__.py``.  Even though it may appear to work during development, or when
+projects are installed as ``.egg`` files, it will not work when the projects
+are installed using "system" packaging tools -- in such cases the
+``__init__.py`` files will not be installed, let alone executed.
+
+You must include the ``declare_namespace()``  line in the ``__init__.py`` of
+*every* project that has contents for the namespace package in question, in
+order to ensure that the namespace will be declared regardless of which
+project's copy of ``__init__.py`` is loaded first.  If the first loaded
+``__init__.py`` doesn't declare it, it will never *be* declared, because no
+other copies will ever be loaded!
+
+Tagging and "Daily Build" or "Snapshot" Releases
+------------------------------------------------
+
+When a set of related projects are under development, it may be important to
+track finer-grained version increments than you would normally use for e.g.
+"stable" releases.  While stable releases might be measured in dotted numbers
+with alpha/beta/etc. status codes, development versions of a project often
+need to be tracked by revision or build number or even build date.  This is
+especially true when projects in development need to refer to one another, and
+therefore may literally need an up-to-the-minute version of something!
+
+To support these scenarios, ``setuptools`` allows you to "tag" your source and
+egg distributions by adding one or more of the following to the project's
+"official" version identifier:
+
+* A manually-specified pre-release tag, such as "build" or "dev", or a
+  manually-specified post-release tag, such as a build or revision number
+  (``--tag-build=STRING, -bSTRING``)
+
+* An 8-character representation of the build date (``--tag-date, -d``), as
+  a postrelease tag
+
+You can add these tags by adding ``egg_info`` and the desired options to
+the command line ahead of the ``sdist`` or ``bdist`` commands that you want
+to generate a daily build or snapshot for.  See the section below on the
+`egg_info`_ command for more details.
+
+(Also, before you release your project, be sure to see the section above on
+`Specifying Your Project's Version`_ for more information about how pre- and
+post-release tags affect how version numbers are interpreted.  This is
+important in order to make sure that dependency processing tools will know
+which versions of your project are newer than others.)
+
+Finally, if you are creating builds frequently, and either building them in a
+downloadable location or are copying them to a distribution server, you should
+probably also check out the `rotate`_ command, which lets you automatically
+delete all but the N most-recently-modified distributions matching a glob
+pattern.  So, you can use a command line like::
+
+    setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
+
+to build an egg whose version info includes "DEV-rNNNN" (where NNNN is the
+most recent Subversion revision that affected the source tree), and then
+delete any egg files from the distribution directory except for the three
+that were built most recently.
+
+If you have to manage automated builds for multiple packages, each with
+different tagging and rotation policies, you may also want to check out the
+`alias`_ command, which would let each package define an alias like ``daily``
+that would perform the necessary tag, build, and rotate commands.  Then, a
+simpler script or cron job could just run ``setup.py daily`` in each project
+directory.  (And, you could also define sitewide or per-user default versions
+of the ``daily`` alias, so that projects that didn't define their own would
+use the appropriate defaults.)
+
+Generating Source Distributions
+-------------------------------
+
+``setuptools`` enhances the distutils' default algorithm for source file
+selection with pluggable endpoints for looking up files to include. If you are
+using a revision control system, and your source distributions only need to
+include files that you're tracking in revision control, use a corresponding
+plugin instead of writing a ``MANIFEST.in`` file. See the section below on
+`Adding Support for Revision Control Systems`_ for information on plugins.
+
+If you need to include automatically generated files, or files that are kept in
+an unsupported revision control system, you'll need to create a ``MANIFEST.in``
+file to specify any files that the default file location algorithm doesn't
+catch.  See the distutils documentation for more information on the format of
+the ``MANIFEST.in`` file.
+
+But, be sure to ignore any part of the distutils documentation that deals with
+``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
+from these issues and doesn't work the same way in any case.  Unlike the
+distutils, setuptools regenerates the source distribution manifest file
+every time you build a source distribution, and it builds it inside the
+project's ``.egg-info`` directory, out of the way of your main project
+directory.  You therefore need not worry about whether it is up-to-date or not.
+
+Indeed, because setuptools' approach to determining the contents of a source
+distribution is so much simpler, its ``sdist`` command omits nearly all of
+the options that the distutils' more complex ``sdist`` process requires.  For
+all practical purposes, you'll probably use only the ``--formats`` option, if
+you use any option at all.
+
+
+Making "Official" (Non-Snapshot) Releases
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you make an official release, creating source or binary distributions,
+you will need to override the tag settings from ``setup.cfg``, so that you
+don't end up registering versions like ``foobar-0.7a1.dev-r34832``.  This is
+easy to do if you are developing on the trunk and using tags or branches for
+your releases - just make the change to ``setup.cfg`` after branching or
+tagging the release, so the trunk will still produce development snapshots.
+
+Alternately, if you are not branching for releases, you can override the
+default version options on the command line, using something like::
+
+    setup.py egg_info -Db "" sdist bdist_egg
+
+The first part of this command (``egg_info -Db ""``) will override the
+configured tag information, before creating source and binary eggs. Thus, these
+commands will use the plain version from your ``setup.py``, without adding the
+build designation string.
+
+Of course, if you will be doing this a lot, you may wish to create a personal
+alias for this operation, e.g.::
+
+    setup.py alias -u release egg_info -Db ""
+
+You can then use it like this::
+
+    setup.py release sdist bdist_egg
+
+Or of course you can create more elaborate aliases that do all of the above.
+See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
+
+Distributing Extensions compiled with Cython
+--------------------------------------------
+
+``setuptools`` will detect at build time whether Cython is installed or not.
+If Cython is not found ``setuptools`` will ignore pyx files.
+
+To ensure Cython is available, include Cython in the build-requires section
+of your pyproject.toml::
+
+    [build-system]
+    requires=[..., "cython"]
+
+Built with pip 10 or later, that declaration is sufficient to include Cython
+in the build. For broader compatibility, declare the dependency in your
+setup-requires of setup.cfg::
+
+    [options]
+    setup_requires =
+        ...
+        cython
+
+As long as Cython is present in the build environment, ``setuptools`` includes
+transparent support for building Cython extensions, as
+long as extensions are defined using ``setuptools.Extension``.
+
+If you follow these rules, you can safely list ``.pyx`` files as the source
+of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
+will use it.
+
+Of course, for this to work, your source distributions must include the C
+code generated by Cython, as well as your original ``.pyx`` files.  This means
+that you will probably want to include current ``.c`` files in your revision
+control system, rebuilding them whenever you check changes in for the ``.pyx``
+source files.  This will ensure that people tracking your project in a revision
+control system will be able to build it even if they don't have Cython
+installed, and that your source releases will be similarly usable with or
+without Cython.
+
+--------------------------------
+Extending and Reusing Setuptools
+--------------------------------
+
+Creating ``distutils`` Extensions
+=================================
+
+It can be hard to add new commands or setup arguments to the distutils.  But
+the ``setuptools`` package makes it a bit easier, by allowing you to distribute
+a distutils extension as a separate project, and then have projects that need
+the extension just refer to it in their ``setup_requires`` argument.
+
+With ``setuptools``, your distutils extension projects can hook in new
+commands and ``setup()`` arguments just by defining "entry points".  These
+are mappings from command or argument names to a specification of where to
+import a handler from.  (See the section on `Dynamic Discovery of Services and
+Plugins`_ above for some more background on entry points.)
+
+
+Adding Commands
+---------------
+
+You can add new ``setup`` commands by defining entry points in the
+``distutils.commands`` group.  For example, if you wanted to add a ``foo``
+command, you might add something like this to your distutils extension
+project's setup script::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.commands": [
+                "foo = mypackage.some_module:foo",
+            ],
+        },
+    )
+
+(Assuming, of course, that the ``foo`` class in ``mypackage.some_module`` is
+a ``setuptools.Command`` subclass.)
+
+Once a project containing such entry points has been activated on ``sys.path``,
+(e.g. by running "install" or "develop" with a site-packages installation
+directory) the command(s) will be available to any ``setuptools``-based setup
+scripts.  It is not necessary to use the ``--command-packages`` option or
+to monkeypatch the ``distutils.command`` package to install your commands;
+``setuptools`` automatically adds a wrapper to the distutils to search for
+entry points in the active distributions on ``sys.path``.  In fact, this is
+how setuptools' own commands are installed: the setuptools project's setup
+script defines entry points for them!
+
+Adding ``setup()`` Arguments
+----------------------------
+
+.. warning:: Adding arguments to setup is discouraged as such arguments
+   are only supported through imperative execution and not supported through
+   declarative config.
+
+Sometimes, your commands may need additional arguments to the ``setup()``
+call.  You can enable this by defining entry points in the
+``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
+argument called ``bar_baz``, you might add something like this to your
+distutils extension project's setup script::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.commands": [
+                "foo = mypackage.some_module:foo",
+            ],
+            "distutils.setup_keywords": [
+                "bar_baz = mypackage.some_module:validate_bar_baz",
+            ],
+        },
+    )
+
+The idea here is that the entry point defines a function that will be called
+to validate the ``setup()`` argument, if it's supplied.  The ``Distribution``
+object will have the initial value of the attribute set to ``None``, and the
+validation function will only be called if the ``setup()`` call sets it to
+a non-None value.  Here's an example validation function::
+
+    def assert_bool(dist, attr, value):
+        """Verify that value is True, False, 0, or 1"""
+        if bool(value) != value:
+            raise DistutilsSetupError(
+                "%r must be a boolean value (got %r)" % (attr,value)
+            )
+
+Your function should accept three arguments: the ``Distribution`` object,
+the attribute name, and the attribute value.  It should raise a
+``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
+is invalid.  Remember, your function will only be called with non-None values,
+and the default value of arguments defined this way is always None.  So, your
+commands should always be prepared for the possibility that the attribute will
+be ``None`` when they access it later.
+
+If more than one active distribution defines an entry point for the same
+``setup()`` argument, *all* of them will be called.  This allows multiple
+distutils extensions to define a common argument, as long as they agree on
+what values of that argument are valid.
+
+Also note that as with commands, it is not necessary to subclass or monkeypatch
+the distutils ``Distribution`` class in order to add your arguments; it is
+sufficient to define the entry points in your extension, as long as any setup
+script using your extension lists your project in its ``setup_requires``
+argument.
+
+
+Customizing Distribution Options
+--------------------------------
+
+Plugins may wish to extend or alter the options on a Distribution object to
+suit the purposes of that project. For example, a tool that infers the
+``Distribution.version`` from SCM-metadata may need to hook into the
+option finalization. To enable this feature, Setuptools offers an entry
+point "setuptools.finalize_distribution_options". That entry point must
+be a callable taking one argument (the Distribution instance).
+
+If the callable has an ``.order`` property, that value will be used to
+determine the order in which the hook is called. Lower numbers are called
+first and the default is zero (0).
+
+Plugins may read, alter, and set properties on the distribution, but each
+plugin is encouraged to load the configuration/settings for their behavior
+independently.
+
+
+Adding new EGG-INFO Files
+-------------------------
+
+Some extensible applications or frameworks may want to allow third parties to
+develop plugins with application or framework-specific metadata included in
+the plugins' EGG-INFO directory, for easy access via the ``pkg_resources``
+metadata API.  The easiest way to allow this is to create a distutils extension
+to be used from the plugin projects' setup scripts (via ``setup_requires``)
+that defines a new setup keyword, and then uses that data to write an EGG-INFO
+file when the ``egg_info`` command is run.
+
+The ``egg_info`` command looks for extension points in an ``egg_info.writers``
+group, and calls them to write the files.  Here's a simple example of a
+distutils extension defining a setup argument ``foo_bar``, which is a list of
+lines that will be written to ``foo_bar.txt`` in the EGG-INFO directory of any
+project that uses the argument::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.setup_keywords": [
+                "foo_bar = setuptools.dist:assert_string_list",
+            ],
+            "egg_info.writers": [
+                "foo_bar.txt = setuptools.command.egg_info:write_arg",
+            ],
+        },
+    )
+
+This simple example makes use of two utility functions defined by setuptools
+for its own use: a routine to validate that a setup keyword is a sequence of
+strings, and another one that looks up a setup argument and writes it to
+a file.  Here's what the writer utility looks like::
+
+    def write_arg(cmd, basename, filename):
+        argname = os.path.splitext(basename)[0]
+        value = getattr(cmd.distribution, argname, None)
+        if value is not None:
+            value = "\n".join(value) + "\n"
+        cmd.write_or_delete_file(argname, filename, value)
+
+As you can see, ``egg_info.writers`` entry points must be a function taking
+three arguments: a ``egg_info`` command instance, the basename of the file to
+write (e.g. ``foo_bar.txt``), and the actual full filename that should be
+written to.
+
+In general, writer functions should honor the command object's ``dry_run``
+setting when writing files, and use the ``distutils.log`` object to do any
+console output.  The easiest way to conform to this requirement is to use
+the ``cmd`` object's ``write_file()``, ``delete_file()``, and
+``write_or_delete_file()`` methods exclusively for your file operations.  See
+those methods' docstrings for more details.
+
+Adding Support for Revision Control Systems
+-------------------------------------------------
+
+If the files you want to include in the source distribution are tracked using
+Git, Mercurial or SVN, you can use the following packages to achieve that:
+
+- Git and Mercurial: `setuptools_scm <https://pypi.org/project/setuptools_scm/>`_
+- SVN: `setuptools_svn <https://pypi.org/project/setuptools_svn/>`_
+
+If you would like to create a plugin for ``setuptools`` to find files tracked
+by another revision control system, you can do so by adding an entry point to
+the ``setuptools.file_finders`` group.  The entry point should be a function
+accepting a single directory name, and should yield all the filenames within
+that directory (and any subdirectories thereof) that are under revision
+control.
+
+For example, if you were going to create a plugin for a revision control system
+called "foobar", you would write a function something like this:
+
+.. code-block:: python
+
+    def find_files_for_foobar(dirname):
+        # loop to yield paths that start with `dirname`
+
+And you would register it in a setup script using something like this::
+
+    entry_points={
+        "setuptools.file_finders": [
+            "foobar = my_foobar_module:find_files_for_foobar",
+        ]
+    }
+
+Then, anyone who wants to use your plugin can simply install it, and their
+local setuptools installation will be able to find the necessary files.
+
+It is not necessary to distribute source control plugins with projects that
+simply use the other source control system, or to specify the plugins in
+``setup_requires``.  When you create a source distribution with the ``sdist``
+command, setuptools automatically records what files were found in the
+``SOURCES.txt`` file.  That way, recipients of source distributions don't need
+to have revision control at all.  However, if someone is working on a package
+by checking out with that system, they will need the same plugin(s) that the
+original author is using.
+
+A few important points for writing revision control file finders:
+
+* Your finder function MUST return relative paths, created by appending to the
+  passed-in directory name.  Absolute paths are NOT allowed, nor are relative
+  paths that reference a parent directory of the passed-in directory.
+
+* Your finder function MUST accept an empty string as the directory name,
+  meaning the current directory.  You MUST NOT convert this to a dot; just
+  yield relative paths.  So, yielding a subdirectory named ``some/dir`` under
+  the current directory should NOT be rendered as ``./some/dir`` or
+  ``/somewhere/some/dir``, but *always* as simply ``some/dir``
+
+* Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
+  with the absence of needed programs (i.e., ones belonging to the revision
+  control system itself.  It *may*, however, use ``distutils.log.warn()`` to
+  inform the user of the missing program(s).
\ No newline at end of file

From 39206c05f07bc8ef754b789f2bcad3404f32df98 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:48:05 -0400
Subject: [PATCH 7830/8469] docs: add functionality entry in userguide index

---
 docs/userguide/index.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index 901aad42c7..7e6b7f8a6b 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -14,5 +14,6 @@ ordinary Python packages based on the ``distutils``.
     :maxdepth: 1
 
     Quickstart <quickstart>
+    Functionalities <functionalities>
     keyword reference <keywords>
-    Command reference <commands>
\ No newline at end of file
+    Command reference <commands>

From 086c2a3fc52f508bc69b2ee4846aea39c646d887 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:50:26 -0400
Subject: [PATCH 7831/8469] docs: migrate declarative config to separate file

cut and paste from setuptools.txt
---
 docs/setuptools.txt                   | 239 -------------------------
 docs/userguide/declarative_config.txt | 240 ++++++++++++++++++++++++++
 2 files changed, 240 insertions(+), 239 deletions(-)
 create mode 100644 docs/userguide/declarative_config.txt

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7daeb3fc3f..3500efbe8f 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -122,246 +122,7 @@ Our apologies for the inconvenience, and thank you for your patience.
 
 
 
------------------------------------------
-Configuring setup() using setup.cfg files
------------------------------------------
 
-.. note:: New in 30.3.0 (8 Dec 2016).
-
-.. important::
-    If compatibility with legacy builds (i.e. those not using the :pep:`517`
-    build API) is desired, a ``setup.py`` file containing a ``setup()`` function
-    call is still required even if your configuration resides in ``setup.cfg``.
-
-``Setuptools`` allows using configuration files (usually :file:`setup.cfg`)
-to define a package’s metadata and other options that are normally supplied
-to the ``setup()`` function (declarative config).
-
-This approach not only allows automation scenarios but also reduces
-boilerplate code in some cases.
-
-.. note::
-
-    This implementation has limited compatibility with the distutils2-like
-    ``setup.cfg`` sections used by the ``pbr`` and ``d2to1`` packages.
-
-    Namely: only metadata-related keys from ``metadata`` section are supported
-    (except for ``description-file``); keys from ``files``, ``entry_points``
-    and ``backwards_compat`` are not supported.
-
-
-.. code-block:: ini
-
-    [metadata]
-    name = my_package
-    version = attr: src.VERSION
-    description = My package description
-    long_description = file: README.rst, CHANGELOG.rst, LICENSE.rst
-    keywords = one, two
-    license = BSD 3-Clause License
-    classifiers =
-        Framework :: Django
-        License :: OSI Approved :: BSD License
-        Programming Language :: Python :: 3
-        Programming Language :: Python :: 3.5
-
-    [options]
-    zip_safe = False
-    include_package_data = True
-    packages = find:
-    scripts =
-      bin/first.py
-      bin/second.py
-    install_requires =
-      requests
-      importlib; python_version == "2.6"
-
-    [options.package_data]
-    * = *.txt, *.rst
-    hello = *.msg
-
-    [options.extras_require]
-    pdf = ReportLab>=1.2; RXP
-    rest = docutils>=0.3; pack ==1.1, ==1.3
-
-    [options.packages.find]
-    exclude =
-        src.subpackage1
-        src.subpackage2
-
-    [options.data_files]
-    /etc/my_package =
-        site.d/00_default.conf
-        host.d/00_default.conf
-    data = data/img/logo.png, data/svg/icon.svg
-
-Metadata and options are set in the config sections of the same name.
-
-* Keys are the same as the keyword arguments one provides to the ``setup()``
-  function.
-
-* Complex values can be written comma-separated or placed one per line
-  in *dangling* config values. The following are equivalent:
-
-  .. code-block:: ini
-
-      [metadata]
-      keywords = one, two
-
-      [metadata]
-      keywords =
-        one
-        two
-
-* In some cases, complex values can be provided in dedicated subsections for
-  clarity.
-
-* Some keys allow ``file:``, ``attr:``, and ``find:`` and ``find_namespace:`` directives in
-  order to cover common usecases.
-
-* Unknown keys are ignored.
-
-
-Using a ``src/`` layout
-=======================
-
-One commonly used package configuration has all the module source code in a
-subdirectory (often called the ``src/`` layout), like this::
-
-    ├── src
-    │   └── mypackage
-    │       ├── __init__.py
-    │       └── mod1.py
-    ├── setup.py
-    └── setup.cfg
-
-You can set up your ``setup.cfg`` to automatically find all your packages in
-the subdirectory like this:
-
-.. code-block:: ini
-
-    # This example contains just the necessary options for a src-layout, set up
-    # the rest of the file as described above.
-
-    [options]
-    package_dir=
-        =src
-    packages=find:
-
-    [options.packages.find]
-    where=src
-
-Specifying values
-=================
-
-Some values are treated as simple strings, some allow more logic.
-
-Type names used below:
-
-* ``str`` - simple string
-* ``list-comma`` - dangling list or string of comma-separated values
-* ``list-semi`` - dangling list or string of semicolon-separated values
-* ``bool`` - ``True`` is 1, yes, true
-* ``dict`` - list-comma where keys are separated from values by ``=``
-* ``section`` - values are read from a dedicated (sub)section
-
-
-Special directives:
-
-* ``attr:`` - Value is read from a module attribute.  ``attr:`` supports
-  callables and iterables; unsupported types are cast using ``str()``.
-* ``file:`` - Value is read from a list of files and then concatenated
-
-
-.. note::
-    The ``file:`` directive is sandboxed and won't reach anything outside
-    the directory containing ``setup.py``.
-
-
-Metadata
---------
-
-.. note::
-    The aliases given below are supported for compatibility reasons,
-    but their use is not advised.
-
-==============================  =================  =================  =============== =====
-Key                             Aliases            Type               Minimum Version Notes
-==============================  =================  =================  =============== =====
-name                                               str
-version                                            attr:, file:, str  39.2.0          (1)
-url                             home-page          str
-download_url                    download-url       str
-project_urls                                       dict               38.3.0
-author                                             str
-author_email                    author-email       str
-maintainer                                         str
-maintainer_email                maintainer-email   str
-classifiers                     classifier         file:, list-comma
-license                                            str
-license_file                                       str
-license_files                                      list-comma
-description                     summary            file:, str
-long_description                long-description   file:, str
-long_description_content_type                      str                38.6.0
-keywords                                           list-comma
-platforms                       platform           list-comma
-provides                                           list-comma
-requires                                           list-comma
-obsoletes                                          list-comma
-==============================  =================  =================  =============== =====
-
-.. note::
-    A version loaded using the ``file:`` directive must comply with PEP 440.
-    It is easy to accidentally put something other than a valid version
-    string in such a file, so validation is stricter in this case.
-
-Notes:
-1. The `version` file attribute has only been supported since 39.2.0.
-
-Options
--------
-
-=======================  ===================================  =============== =====
-Key                      Type                                 Minimum Version Notes
-=======================  ===================================  =============== =====
-zip_safe                 bool
-setup_requires           list-semi
-install_requires         list-semi
-extras_require           section
-python_requires          str
-entry_points             file:, section
-use_2to3                 bool
-use_2to3_fixers          list-comma
-use_2to3_exclude_fixers  list-comma
-convert_2to3_doctests    list-comma
-scripts                  list-comma
-eager_resources          list-comma
-dependency_links         list-comma
-tests_require            list-semi
-include_package_data     bool
-packages                 find:, find_namespace:, list-comma
-package_dir              dict
-package_data             section                                              (1)
-exclude_package_data     section
-namespace_packages       list-comma
-py_modules               list-comma
-data_files               dict                                 40.6.0
-=======================  ===================================  =============== =====
-
-.. note::
-
-    **packages** - The ``find:`` and ``find_namespace:`` directive can be further configured
-    in a dedicated subsection ``options.packages.find``. This subsection
-    accepts the same keys as the `setuptools.find_packages` and the
-    `setuptools.find_namespace_packages` function:
-    ``where``, ``include``, and ``exclude``.
-
-    **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
-
-Notes:
-1. In the `package_data` section, a key named with a single asterisk (`*`)
-refers to all packages, in lieu of the empty string used in `setup.py`.
 
 
 Configuration API
diff --git a/docs/userguide/declarative_config.txt b/docs/userguide/declarative_config.txt
new file mode 100644
index 0000000000..b40d3a4a36
--- /dev/null
+++ b/docs/userguide/declarative_config.txt
@@ -0,0 +1,240 @@
+-----------------------------------------
+Configuring setup() using setup.cfg files
+-----------------------------------------
+
+.. note:: New in 30.3.0 (8 Dec 2016).
+
+.. important::
+    If compatibility with legacy builds (i.e. those not using the :pep:`517`
+    build API) is desired, a ``setup.py`` file containing a ``setup()`` function
+    call is still required even if your configuration resides in ``setup.cfg``.
+
+``Setuptools`` allows using configuration files (usually :file:`setup.cfg`)
+to define a package’s metadata and other options that are normally supplied
+to the ``setup()`` function (declarative config).
+
+This approach not only allows automation scenarios but also reduces
+boilerplate code in some cases.
+
+.. note::
+
+    This implementation has limited compatibility with the distutils2-like
+    ``setup.cfg`` sections used by the ``pbr`` and ``d2to1`` packages.
+
+    Namely: only metadata-related keys from ``metadata`` section are supported
+    (except for ``description-file``); keys from ``files``, ``entry_points``
+    and ``backwards_compat`` are not supported.
+
+
+.. code-block:: ini
+
+    [metadata]
+    name = my_package
+    version = attr: src.VERSION
+    description = My package description
+    long_description = file: README.rst, CHANGELOG.rst, LICENSE.rst
+    keywords = one, two
+    license = BSD 3-Clause License
+    classifiers =
+        Framework :: Django
+        License :: OSI Approved :: BSD License
+        Programming Language :: Python :: 3
+        Programming Language :: Python :: 3.5
+
+    [options]
+    zip_safe = False
+    include_package_data = True
+    packages = find:
+    scripts =
+      bin/first.py
+      bin/second.py
+    install_requires =
+      requests
+      importlib; python_version == "2.6"
+
+    [options.package_data]
+    * = *.txt, *.rst
+    hello = *.msg
+
+    [options.extras_require]
+    pdf = ReportLab>=1.2; RXP
+    rest = docutils>=0.3; pack ==1.1, ==1.3
+
+    [options.packages.find]
+    exclude =
+        src.subpackage1
+        src.subpackage2
+
+    [options.data_files]
+    /etc/my_package =
+        site.d/00_default.conf
+        host.d/00_default.conf
+    data = data/img/logo.png, data/svg/icon.svg
+
+Metadata and options are set in the config sections of the same name.
+
+* Keys are the same as the keyword arguments one provides to the ``setup()``
+  function.
+
+* Complex values can be written comma-separated or placed one per line
+  in *dangling* config values. The following are equivalent:
+
+  .. code-block:: ini
+
+      [metadata]
+      keywords = one, two
+
+      [metadata]
+      keywords =
+        one
+        two
+
+* In some cases, complex values can be provided in dedicated subsections for
+  clarity.
+
+* Some keys allow ``file:``, ``attr:``, and ``find:`` and ``find_namespace:`` directives in
+  order to cover common usecases.
+
+* Unknown keys are ignored.
+
+
+Using a ``src/`` layout
+=======================
+
+One commonly used package configuration has all the module source code in a
+subdirectory (often called the ``src/`` layout), like this::
+
+    ├── src
+    │   └── mypackage
+    │       ├── __init__.py
+    │       └── mod1.py
+    ├── setup.py
+    └── setup.cfg
+
+You can set up your ``setup.cfg`` to automatically find all your packages in
+the subdirectory like this:
+
+.. code-block:: ini
+
+    # This example contains just the necessary options for a src-layout, set up
+    # the rest of the file as described above.
+
+    [options]
+    package_dir=
+        =src
+    packages=find:
+
+    [options.packages.find]
+    where=src
+
+Specifying values
+=================
+
+Some values are treated as simple strings, some allow more logic.
+
+Type names used below:
+
+* ``str`` - simple string
+* ``list-comma`` - dangling list or string of comma-separated values
+* ``list-semi`` - dangling list or string of semicolon-separated values
+* ``bool`` - ``True`` is 1, yes, true
+* ``dict`` - list-comma where keys are separated from values by ``=``
+* ``section`` - values are read from a dedicated (sub)section
+
+
+Special directives:
+
+* ``attr:`` - Value is read from a module attribute.  ``attr:`` supports
+  callables and iterables; unsupported types are cast using ``str()``.
+* ``file:`` - Value is read from a list of files and then concatenated
+
+
+.. note::
+    The ``file:`` directive is sandboxed and won't reach anything outside
+    the directory containing ``setup.py``.
+
+
+Metadata
+--------
+
+.. note::
+    The aliases given below are supported for compatibility reasons,
+    but their use is not advised.
+
+==============================  =================  =================  =============== =====
+Key                             Aliases            Type               Minimum Version Notes
+==============================  =================  =================  =============== =====
+name                                               str
+version                                            attr:, file:, str  39.2.0          (1)
+url                             home-page          str
+download_url                    download-url       str
+project_urls                                       dict               38.3.0
+author                                             str
+author_email                    author-email       str
+maintainer                                         str
+maintainer_email                maintainer-email   str
+classifiers                     classifier         file:, list-comma
+license                                            str
+license_file                                       str
+license_files                                      list-comma
+description                     summary            file:, str
+long_description                long-description   file:, str
+long_description_content_type                      str                38.6.0
+keywords                                           list-comma
+platforms                       platform           list-comma
+provides                                           list-comma
+requires                                           list-comma
+obsoletes                                          list-comma
+==============================  =================  =================  =============== =====
+
+.. note::
+    A version loaded using the ``file:`` directive must comply with PEP 440.
+    It is easy to accidentally put something other than a valid version
+    string in such a file, so validation is stricter in this case.
+
+Notes:
+1. The `version` file attribute has only been supported since 39.2.0.
+
+Options
+-------
+
+=======================  ===================================  =============== =====
+Key                      Type                                 Minimum Version Notes
+=======================  ===================================  =============== =====
+zip_safe                 bool
+setup_requires           list-semi
+install_requires         list-semi
+extras_require           section
+python_requires          str
+entry_points             file:, section
+use_2to3                 bool
+use_2to3_fixers          list-comma
+use_2to3_exclude_fixers  list-comma
+convert_2to3_doctests    list-comma
+scripts                  list-comma
+eager_resources          list-comma
+dependency_links         list-comma
+tests_require            list-semi
+include_package_data     bool
+packages                 find:, find_namespace:, list-comma
+package_dir              dict
+package_data             section                                              (1)
+exclude_package_data     section
+namespace_packages       list-comma
+py_modules               list-comma
+data_files               dict                                 40.6.0
+=======================  ===================================  =============== =====
+
+.. note::
+
+    **packages** - The ``find:`` and ``find_namespace:`` directive can be further configured
+    in a dedicated subsection ``options.packages.find``. This subsection
+    accepts the same keys as the `setuptools.find_packages` and the
+    `setuptools.find_namespace_packages` function:
+    ``where``, ``include``, and ``exclude``.
+
+    **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
+
+Notes:
+1. In the `package_data` section, a key named with a single asterisk (`*`)
+refers to all packages, in lieu of the empty string used in `setup.py`.
\ No newline at end of file

From 0a0d6f19e799c53d37a8ce5fffc8cc5cee660712 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:51:09 -0400
Subject: [PATCH 7832/8469] docs: add entry to userguide index

---
 docs/userguide/index.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index 7e6b7f8a6b..4d7bb2a7c1 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -15,5 +15,6 @@ ordinary Python packages based on the ``distutils``.
 
     Quickstart <quickstart>
     Functionalities <functionalities>
+    Declarative config <declarative_config>
     keyword reference <keywords>
     Command reference <commands>

From 6b4ffa0893a078f687f7a20d0d0d14d0fef79121 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 14:54:07 -0400
Subject: [PATCH 7833/8469] docs: modify entry in top level index

from pointing at setuptools.txt to userguide/index.txt
---
 docs/index.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.txt b/docs/index.txt
index 38fbbcc50c..fda2e94810 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -16,6 +16,6 @@ Documentation content:
 .. toctree::
    :maxdepth: 1
 
-   User guide <setuptools>
+   User guide <userguide/index>
    Development guide <development>
    Backward compatibility & deprecated practice <deprecated/index>

From 911000d2c9a86a86b4dca133cb473458ec3ecfc7 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 11 May 2020 15:06:36 -0400
Subject: [PATCH 7834/8469] docs: add new fragment

---
 changelog.d/2102.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2102.doc.rst

diff --git a/changelog.d/2102.doc.rst b/changelog.d/2102.doc.rst
new file mode 100644
index 0000000000..bdb1a50219
--- /dev/null
+++ b/changelog.d/2102.doc.rst
@@ -0,0 +1 @@
+doc overhaul step 2: break main doc into multiple sections
\ No newline at end of file

From bb5af519860192d3bca638d903cb0ea123c7abd8 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 11 May 2020 23:49:53 +0300
Subject: [PATCH 7835/8469] Fix typo

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 03c89be6c5..a935be562b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,7 @@ v46.2.0
 * #2075: Stop recognizing files ending with ``.dist-info`` as distribution metadata.
 * #2086: Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
 * #1698: Added documentation for ``build_meta`` (a bare minimum, not completed).
-* #2082: Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in testes,
+* #2082: Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in tests,
   because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
 
 

From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 12 May 2020 13:33:04 +0200
Subject: [PATCH 7836/8469] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode

Fixes https://github.com/pypa/setuptools/issues/2100
---
 changelog.d/2105.misc.rst        | 1 +
 setuptools/tests/__init__.py     | 4 +++-
 setuptools/tests/test_develop.py | 2 ++
 setuptools/tests/test_test.py    | 4 +---
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/2105.misc.rst

diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
new file mode 100644
index 0000000000..75eaf2cb39
--- /dev/null
+++ b/changelog.d/2105.misc.rst
@@ -0,0 +1 @@
+Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 9c77b51f8d..6377d7857d 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -6,7 +6,7 @@
 
 
 __all__ = [
-    'fail_on_ascii', 'py2_only', 'py3_only'
+    'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
 ]
 
 
@@ -16,3 +16,5 @@
 
 py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
 py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
+
+ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 792975fd14..bb89a865b9 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -17,6 +17,7 @@
 
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
+from setuptools.tests import ack_2to3
 from . import contexts
 from . import namespaces
 
@@ -65,6 +66,7 @@ class TestDevelop:
     @pytest.mark.skipif(
         in_virtualenv or in_venv,
         reason="Cannot run when invoked in a virtualenv or venv")
+    @ack_2to3
     def test_2to3_user_mode(self, test_env):
         settings = dict(
             name='foo',
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 0f77d8ff3d..892fd120d9 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -10,6 +10,7 @@
 
 from setuptools.command.test import test
 from setuptools.dist import Distribution
+from setuptools.tests import ack_2to3
 
 from .textwrap import DALS
 
@@ -73,9 +74,6 @@ def quiet_log():
     log.set_verbosity(0)
 
 
-ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
-
-
 @pytest.mark.usefixtures('sample_test', 'quiet_log')
 @ack_2to3
 def test_test(capfd):

From 322734cfa00d3d5bffb9af02c780ee8e33142e5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 12 May 2020 20:34:20 -0400
Subject: [PATCH 7837/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #2107
---
 pkg_resources/tests/test_working_set.py | 4 ++--
 setuptools/tests/test_easy_install.py   | 2 +-
 setuptools/tests/test_packageindex.py   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
index b3ca4ea8e4..7a759bbb3f 100644
--- a/pkg_resources/tests/test_working_set.py
+++ b/pkg_resources/tests/test_working_set.py
@@ -14,8 +14,8 @@
 
 def strip_comments(s):
     return '\n'.join(
-        l for l in s.split('\n')
-        if l.strip() and not l.strip().startswith('#')
+        line for line in s.split('\n')
+        if line.strip() and not line.strip().startswith('#')
     )
 
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 534392b99d..3044cbd098 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -738,7 +738,7 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
                 dep_2_0_url=dep_2_0_url,
                 dep_2_0_sdist=dep_2_0_sdist,
                 dep_2_0_python_requires=dep_2_0_python_requires,
-            ), 'utf-8')
+        ), 'utf-8')
         index_url = path_to_url(str(index))
         with contexts.save_pkg_resources_state():
             test_pkg = create_setup_requires_package(
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 60d968fdfa..fc8f2a7047 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -221,11 +221,11 @@ def test_egg_fragment(self):
             ('+ubuntu_0', '+ubuntu.0'),
         ]
         versions = [
-            [''.join([e, r, p, l]) for l in ll]
+            [''.join([e, r, p, loc]) for loc in locs]
             for e in epoch
             for r in releases
             for p in sum([pre, post, dev], [''])
-            for ll in local]
+            for locs in local]
         for v, vc in versions:
             dists = list(setuptools.package_index.distros_for_url(
                 'http://example.com/example.zip#egg=example-' + v))

From d1dccc76ef90497788b5c839918d775585044f5a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 12 May 2020 19:58:54 -0400
Subject: [PATCH 7838/8469] Just remove fragment remover. PyPI no longer
 supplies these md5 values anyway. Fixes #2089.

---
 pkg_resources/__init__.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 0512731d9f..edd3d2e8c6 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -55,7 +55,7 @@
     FileExistsError = OSError
 
 from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib, map, filter
+from pkg_resources.extern.six.moves import map, filter
 
 # capture these to bypass sandboxing
 from os import utime
@@ -2546,15 +2546,6 @@ def parse_map(cls, data, dist=None):
         return maps
 
 
-def _remove_md5_fragment(location):
-    if not location:
-        return ''
-    parsed = urllib.parse.urlparse(location)
-    if parsed[-1].startswith('md5='):
-        return urllib.parse.urlunparse(parsed[:-1] + ('',))
-    return location
-
-
 def _version_from_file(lines):
     """
     Given an iterable of lines from a Metadata file, return
@@ -2611,7 +2602,7 @@ def hashcmp(self):
             self.parsed_version,
             self.precedence,
             self.key,
-            _remove_md5_fragment(self.location),
+            self.location,
             self.py_version or '',
             self.platform or '',
         )

From 932d88b5e5972f6da11ebff4e516b787dca8e393 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 12 May 2020 20:22:53 -0400
Subject: [PATCH 7839/8469] Remove the test, no longer relevant now that
 external links are no longer supported and PyPI no longer allows replacing
 packages.

---
 setuptools/tests/test_packageindex.py | 39 ---------------------------
 1 file changed, 39 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index fc8f2a7047..452968973c 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -9,9 +9,7 @@
 import mock
 import pytest
 
-import pkg_resources
 import setuptools.package_index
-from setuptools.tests.server import IndexServer
 from .textwrap import DALS
 
 
@@ -114,43 +112,6 @@ def test_url_ok(self):
         url = 'file:///tmp/test_package_index'
         assert index.url_ok(url, True)
 
-    def test_links_priority(self):
-        """
-        Download links from the pypi simple index should be used before
-        external download links.
-        https://bitbucket.org/tarek/distribute/issue/163
-
-        Usecase :
-        - someone uploads a package on pypi, a md5 is generated
-        - someone manually copies this link (with the md5 in the url) onto an
-          external page accessible from the package page.
-        - someone reuploads the package (with a different md5)
-        - while easy_installing, an MD5 error occurs because the external link
-          is used
-        -> Setuptools should use the link from pypi, not the external one.
-        """
-        if sys.platform.startswith('java'):
-            # Skip this test on jython because binding to :0 fails
-            return
-
-        # start an index server
-        server = IndexServer()
-        server.start()
-        index_url = server.base_url() + 'test_links_priority/simple/'
-
-        # scan a test index
-        pi = setuptools.package_index.PackageIndex(index_url)
-        requirement = pkg_resources.Requirement.parse('foobar')
-        pi.find_packages(requirement)
-        server.stop()
-
-        # the distribution has been found
-        assert 'foobar' in pi
-        # we have only one link, because links are compared without md5
-        assert len(pi['foobar']) == 1
-        # the link should be from the index
-        assert 'correct_md5' in pi['foobar'][0].location
-
     def test_parse_bdist_wininst(self):
         parse = setuptools.package_index.parse_bdist_wininst
 

From 6a73d1f0bc1e25833974eb0ec943b65d2381a7a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 12 May 2020 20:49:54 -0400
Subject: [PATCH 7840/8469] Update changelog

---
 changelog.d/2089.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2089.change.rst

diff --git a/changelog.d/2089.change.rst b/changelog.d/2089.change.rst
new file mode 100644
index 0000000000..0977cfca16
--- /dev/null
+++ b/changelog.d/2089.change.rst
@@ -0,0 +1 @@
+Package index functionality no longer attempts to remove an md5 fragment from the index URL. This functionality, added for distribute #163 is no longer relevant.

From c12db0915b4e3f0fae91d2a99dab467602c06dd6 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Wed, 13 May 2020 10:55:55 -0400
Subject: [PATCH 7841/8469] docs: migrated section for versioning

from quickstart.txt to functionalities.txt
---
 docs/userguide/functionalities.txt | 87 +++++++++++++++++++++++++++++-
 docs/userguide/quickstart.txt      | 84 -----------------------------
 2 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/docs/userguide/functionalities.txt b/docs/userguide/functionalities.txt
index a310da9713..7bd3ae8ae6 100644
--- a/docs/userguide/functionalities.txt
+++ b/docs/userguide/functionalities.txt
@@ -1335,4 +1335,89 @@ A few important points for writing revision control file finders:
 * Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
   with the absence of needed programs (i.e., ones belonging to the revision
   control system itself.  It *may*, however, use ``distutils.log.warn()`` to
-  inform the user of the missing program(s).
\ No newline at end of file
+  inform the user of the missing program(s).
+
+Specifying Your Project's Version
+---------------------------------
+
+Setuptools can work well with most versioning schemes; there are, however, a
+few special things to watch out for, in order to ensure that setuptools and
+other tools can always tell what version of your package is newer than another
+version.  Knowing these things will also help you correctly specify what
+versions of other projects your project depends on.
+
+A version consists of an alternating series of release numbers and pre-release
+or post-release tags.  A release number is a series of digits punctuated by
+dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
+numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
+same release number, denoting the first subrelease of release 2.  But  ``2.10``
+is the *tenth* subrelease of release 2, and so is a different and newer release
+from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
+ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
+
+Following a release number, you can have either a pre-release or post-release
+tag.  Pre-release tags make a version be considered *older* than the version
+they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
+which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
+a version be considered *newer* than the version they are appended to.  So,
+revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
+than ``2.4.1`` (which has a higher release number).
+
+A pre-release tag is a series of letters that are alphabetically before
+"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
+``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
+before the prerelease tag if it's immediately after a number, but it's okay to
+do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
+represent release candidate 1 of version ``2.4``, and are treated as identical
+by setuptools.
+
+In addition, there are three special prerelease tags that are treated as if
+they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
+``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
+``2.4c1``, and are treated as identical by setuptools.
+
+A post-release tag is either a series of letters that are alphabetically
+greater than or equal to "final", or a dash (``-``).  Post-release tags are
+generally used to separate patch numbers, port numbers, build numbers, revision
+numbers, or date stamps from the release number.  For example, the version
+``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
+version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
+post-release.
+
+Notice that after each pre or post-release tag, you are free to place another
+release number, followed again by more pre- or post-release tags.  For example,
+``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
+development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
+a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
+which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
+a post-release tag, so this version is *newer* than ``0.6a9.dev``.
+
+For the most part, setuptools' interpretation of version numbers is intuitive,
+but here are a few tips that will keep you out of trouble in the corner cases:
+
+* Don't stick adjoining pre-release tags together without a dot or number
+  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
+  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
+  ``1.9a.dev``, or separate the prerelease tags with a number, as in
+  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
+  identical versions from setuptools' point of view, so you can use whatever
+  scheme you prefer.
+
+* If you want to be certain that your chosen numbering scheme works the way
+  you think it will, you can use the ``pkg_resources.parse_version()`` function
+  to compare different version numbers::
+
+    >>> from pkg_resources import parse_version
+    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
+    True
+    >>> parse_version("2.1-rc2") < parse_version("2.1")
+    True
+    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
+    True
+
+Once you've decided on a version numbering scheme for your project, you can
+have setuptools automatically tag your in-development releases with various
+pre- or post-release tags.  See the following sections for more details:
+
+* `Tagging and "Daily Build" or "Snapshot" Releases`_
+* The `egg_info`_ command
\ No newline at end of file
diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 4df50bc56e..f2e1a951f5 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -79,87 +79,3 @@ arguments do (except for the metadata ones), and the various ways you might use
 them in your own project(s).
 
 
-Specifying Your Project's Version
----------------------------------
-
-Setuptools can work well with most versioning schemes; there are, however, a
-few special things to watch out for, in order to ensure that setuptools and
-other tools can always tell what version of your package is newer than another
-version.  Knowing these things will also help you correctly specify what
-versions of other projects your project depends on.
-
-A version consists of an alternating series of release numbers and pre-release
-or post-release tags.  A release number is a series of digits punctuated by
-dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
-numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
-same release number, denoting the first subrelease of release 2.  But  ``2.10``
-is the *tenth* subrelease of release 2, and so is a different and newer release
-from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
-ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
-
-Following a release number, you can have either a pre-release or post-release
-tag.  Pre-release tags make a version be considered *older* than the version
-they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
-which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
-a version be considered *newer* than the version they are appended to.  So,
-revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
-than ``2.4.1`` (which has a higher release number).
-
-A pre-release tag is a series of letters that are alphabetically before
-"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
-``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
-before the prerelease tag if it's immediately after a number, but it's okay to
-do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
-represent release candidate 1 of version ``2.4``, and are treated as identical
-by setuptools.
-
-In addition, there are three special prerelease tags that are treated as if
-they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
-``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
-``2.4c1``, and are treated as identical by setuptools.
-
-A post-release tag is either a series of letters that are alphabetically
-greater than or equal to "final", or a dash (``-``).  Post-release tags are
-generally used to separate patch numbers, port numbers, build numbers, revision
-numbers, or date stamps from the release number.  For example, the version
-``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
-version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
-post-release.
-
-Notice that after each pre or post-release tag, you are free to place another
-release number, followed again by more pre- or post-release tags.  For example,
-``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
-development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
-a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
-which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
-a post-release tag, so this version is *newer* than ``0.6a9.dev``.
-
-For the most part, setuptools' interpretation of version numbers is intuitive,
-but here are a few tips that will keep you out of trouble in the corner cases:
-
-* Don't stick adjoining pre-release tags together without a dot or number
-  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
-  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
-  ``1.9a.dev``, or separate the prerelease tags with a number, as in
-  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
-  identical versions from setuptools' point of view, so you can use whatever
-  scheme you prefer.
-
-* If you want to be certain that your chosen numbering scheme works the way
-  you think it will, you can use the ``pkg_resources.parse_version()`` function
-  to compare different version numbers::
-
-    >>> from pkg_resources import parse_version
-    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
-    True
-    >>> parse_version("2.1-rc2") < parse_version("2.1")
-    True
-    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
-    True
-
-Once you've decided on a version numbering scheme for your project, you can
-have setuptools automatically tag your in-development releases with various
-pre- or post-release tags.  See the following sections for more details:
-
-* `Tagging and "Daily Build" or "Snapshot" Releases`_
-* The `egg_info`_ command
\ No newline at end of file

From e50590a6961a91765ef00aaea447d3be8948666f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Wed, 13 May 2020 10:57:42 -0400
Subject: [PATCH 7842/8469] docs: removed unnecessary transition paragraph

so that the quickstart is cleaner for now. Might add more text later
---
 docs/userguide/quickstart.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index f2e1a951f5..535227a0e3 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -74,8 +74,6 @@ dependencies, and perhaps some data files and scripts::
         # could also include long_description, download_url, etc.
     )
 
-In the sections that follow, we'll explain what most of these ``setup()``
-arguments do (except for the metadata ones), and the various ways you might use
-them in your own project(s).
+
 
 

From 7d3317dee0a6ef6f1474e8f6d07b3a4cfe40a084 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Wed, 13 May 2020 11:28:36 -0400
Subject: [PATCH 7843/8469] docs: migrated section

egg-secutable section moved from userguide/functionalities to deprecated/functionalities
---
 docs/deprecated/functionalities.txt | 33 +++++++++++++++++++++++++++++
 docs/userguide/functionalities.txt  | 32 ----------------------------
 2 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 docs/deprecated/functionalities.txt

diff --git a/docs/deprecated/functionalities.txt b/docs/deprecated/functionalities.txt
new file mode 100644
index 0000000000..c6ea83b387
--- /dev/null
+++ b/docs/deprecated/functionalities.txt
@@ -0,0 +1,33 @@
+"Eggsecutable" Scripts
+----------------------
+
+.. deprecated:: 45.3.0
+
+Occasionally, there are situations where it's desirable to make an ``.egg``
+file directly executable.  You can do this by including an entry point such
+as the following::
+
+    setup(
+        # other arguments here...
+        entry_points={
+            "setuptools.installation": [
+                "eggsecutable = my_package.some_module:main_func",
+            ]
+        }
+    )
+
+Any eggs built from the above setup script will include a short executable
+prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
+The prelude can be run on Unix-like platforms (including Mac and Linux) by
+invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
+``.egg`` file.  For the executable prelude to run, the appropriate version of
+Python must be available via the ``PATH`` environment variable, under its
+"long" name.  That is, if the egg is built for Python 2.3, there must be a
+``python2.3`` executable present in a directory on ``PATH``.
+
+IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
+invoked via symlinks.  They *must* be invoked using their original filename, in
+order to ensure that, once running, ``pkg_resources`` will know what project
+and version is in use.  The header script will check this and exit with an
+error if the ``.egg`` file has been renamed or is invoked via a symlink that
+changes its base name.
\ No newline at end of file
diff --git a/docs/userguide/functionalities.txt b/docs/userguide/functionalities.txt
index 7bd3ae8ae6..5946662af3 100644
--- a/docs/userguide/functionalities.txt
+++ b/docs/userguide/functionalities.txt
@@ -155,39 +155,7 @@ will be added to ``sys.path`` when the script is run.  For more information on
 on "entry points" in general, see the section below on `Dynamic Discovery of
 Services and Plugins`_.
 
-"Eggsecutable" Scripts
-----------------------
-
-.. deprecated:: 45.3.0
-
-Occasionally, there are situations where it's desirable to make an ``.egg``
-file directly executable.  You can do this by including an entry point such
-as the following::
-
-    setup(
-        # other arguments here...
-        entry_points={
-            "setuptools.installation": [
-                "eggsecutable = my_package.some_module:main_func",
-            ]
-        }
-    )
 
-Any eggs built from the above setup script will include a short executable
-prelude that imports and calls ``main_func()`` from ``my_package.some_module``.
-The prelude can be run on Unix-like platforms (including Mac and Linux) by
-invoking the egg with ``/bin/sh``, or by enabling execute permissions on the
-``.egg`` file.  For the executable prelude to run, the appropriate version of
-Python must be available via the ``PATH`` environment variable, under its
-"long" name.  That is, if the egg is built for Python 2.3, there must be a
-``python2.3`` executable present in a directory on ``PATH``.
-
-IMPORTANT NOTE: Eggs with an "eggsecutable" header cannot be renamed, or
-invoked via symlinks.  They *must* be invoked using their original filename, in
-order to ensure that, once running, ``pkg_resources`` will know what project
-and version is in use.  The header script will check this and exit with an
-error if the ``.egg`` file has been renamed or is invoked via a symlink that
-changes its base name.
 
 Declaring Dependencies
 ======================

From fb09f9c44e0f6a93798d52080cb00741e6c766f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 May 2020 11:56:48 -0400
Subject: [PATCH 7844/8469] bugfix isn't a thing

---
 changelog.d/{2041.bugfix.rst => 2041.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2041.bugfix.rst => 2041.misc.rst} (100%)

diff --git a/changelog.d/2041.bugfix.rst b/changelog.d/2041.misc.rst
similarity index 100%
rename from changelog.d/2041.bugfix.rst
rename to changelog.d/2041.misc.rst

From fc0249f24ad39746ae955a2eae0d87ba201454df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 May 2020 11:56:56 -0400
Subject: [PATCH 7845/8469] =?UTF-8?q?Bump=20version:=2046.2.0=20=E2=86=92?=
 =?UTF-8?q?=2046.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 8 ++++++++
 changelog.d/2041.misc.rst   | 1 -
 changelog.d/2089.change.rst | 1 -
 changelog.d/2105.misc.rst   | 1 -
 setup.cfg                   | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/2041.misc.rst
 delete mode 100644 changelog.d/2089.change.rst
 delete mode 100644 changelog.d/2105.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c1b062e4d9..09a3be97e0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.2.0
+current_version = 46.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index a935be562b..97934531c7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v46.3.0
+-------
+
+* #2089: Package index functionality no longer attempts to remove an md5 fragment from the index URL. This functionality, added for distribute #163 is no longer relevant.
+* #2041: Preserve file modes during pkg files copying, but clear read only flag for target afterwards.
+* #2105: Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
+
+
 v46.2.0
 -------
 
diff --git a/changelog.d/2041.misc.rst b/changelog.d/2041.misc.rst
deleted file mode 100644
index 8db757d89d..0000000000
--- a/changelog.d/2041.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Preserve file modes during pkg files copying, but clear read only flag for target afterwards.
diff --git a/changelog.d/2089.change.rst b/changelog.d/2089.change.rst
deleted file mode 100644
index 0977cfca16..0000000000
--- a/changelog.d/2089.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Package index functionality no longer attempts to remove an md5 fragment from the index URL. This functionality, added for distribute #163 is no longer relevant.
diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
deleted file mode 100644
index 75eaf2cb39..0000000000
--- a/changelog.d/2105.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
diff --git a/setup.cfg b/setup.cfg
index 2f5525f3c5..5495343269 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.2.0
+version = 46.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From c79400a2839527d0749798637d182b1cb3d84a01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 13 May 2020 14:24:42 -0400
Subject: [PATCH 7846/8469] Ensure that the changelog.d doesn't contain files
 that won't match.

---
 tools/finalize.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/finalize.py b/tools/finalize.py
index 5f284568d2..98b06c070c 100644
--- a/tools/finalize.py
+++ b/tools/finalize.py
@@ -60,8 +60,22 @@ def ensure_config():
     subprocess.check_output(['git', 'config', 'user.email'])
 
 
+def check_changes():
+    """
+    Verify that all of the files in changelog.d have the appropriate
+    names.
+    """
+    allowed = 'deprecation', 'breaking', 'change', 'doc', 'misc'
+    assert all(
+        any(key in file.name for key in allowed)
+        for file in pathlib.Path('changelog.d').iterdir()
+        if file.name != '.gitignore'
+    )
+
+
 if __name__ == '__main__':
     print("Cutting release at", get_version())
     ensure_config()
+    check_changes()
     update_changelog()
     bump_version()

From 5fe67153b8799fe51407c91b18c7a3acf1d40b0e Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 10:54:50 -0400
Subject: [PATCH 7847/8469] docs: WIP rewrite functionalities

such that each section is comprised of a quick intro and example
that illustrate the use of that functionality and provide a link
to a more detailed explanation.
---
 docs/userguide/functionalities_rewrite.txt | 143 +++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 docs/userguide/functionalities_rewrite.txt

diff --git a/docs/userguide/functionalities_rewrite.txt b/docs/userguide/functionalities_rewrite.txt
new file mode 100644
index 0000000000..657a732de4
--- /dev/null
+++ b/docs/userguide/functionalities_rewrite.txt
@@ -0,0 +1,143 @@
+========================================================
+Using setuptools to package and distribute your project
+========================================================
+
+``setuptools`` offers a variety of functionalities that make it easy to
+build and distribute your python package. Here we provide an overview on
+the commonly used ones.
+
+Automatic package discovery
+===========================
+
+For simple projects, it's usually easy enough to manually add packages to
+the ``packages`` argument of ``setup()``.  However, for very large projects
+, it can be a big burden to keep the package list updated. setuptools therefore
+provides two tools to ease the burden.
+
+``find_packages()`` takes a source directory and two lists of package name
+patterns to exclude and include. It then walks the target directory, filtering
+by inclusion patterns, and finds Python packages (any directory). Packages are only
+recognized if they include an ``__init__.py`` file. Finally, exclusion
+patterns are applied to remove matching packages.
+
+Inclusion and exclusion patterns are package names, optionally including
+wildcards.  For example, ``find_packages(exclude=["*.tests"])`` will exclude
+all packages whose last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
+"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
+but it still won't exclude a top-level ``tests`` package or the children
+thereof.
+
+Regardless of the parameters, the ``find_packages()``
+function returns a list of package names suitable for use as the ``packages``
+argument to ``setup()``, and so is usually the easiest way to set that
+argument in your setup script.  Especially since it frees you from having to
+remember to modify your setup script whenever your project grows additional
+top-level packages or subpackages.
+
+
+
+Entry points and automatic script creation
+===========================================
+
+Setuptools support automatic creation of scripts upon installation, that runs
+code within your package if you specify them with the ``entry_point`` keyword.
+This is what allows you to run commands like ``pip install`` instead of having
+to type ``python -m pip install``. To accomplish this, consider the following
+example::
+
+    setup(
+        #....
+        entry_points={
+            "console_scripts": [
+                "foo = my_package.some_module:main_func",
+                "bar = other_module:some_func",
+            ],
+            "gui_scripts": [
+                "baz = my_package_gui:start_func",
+            ]
+        }
+    )
+
+When this project is installed on non-Windows platforms (using "setup.py
+install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
+and ``baz`` scripts will be installed that import ``main_func`` and
+``some_func`` from the specified modules. On Windows, a set of ``foo.exe``,
+``bar.exe``, and ``baz.exe`` launchers are
+created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
+``.exe`` wrappers find and execute the right version of Python to run the
+``.py`` or ``.pyw`` file.
+
+For detailed usage, including managing the additional or optional dependencies,
+go to :ref:`entry_point`.
+
+Dependency management
+=====================
+
+``setuptools`` supports automatically installing dependencies when a package is
+installed. The simplest way to include requirement specifiers is to use the
+``install_requires`` argument to ``setup()``.  It takes a string or list of
+strings containing requirement specifiers::
+
+    setup(
+        #...
+        install_requires = "docutils >= 0.3"
+    )
+
+When your project is installed, either by using pip, ``setup.py install``,
+or ``setup.py develop``, all of the dependencies not already installed will
+be located (via PyPI), downloaded, built (if necessary), and installed.
+
+For more advanced use, see :ref:`dependencies`
+
+Including Data Files
+====================
+
+Development mode
+================
+
+Setuptools allows you to deploy your projects for use in a common directory or
+staging area, but without copying any files.  Thus, you can edit each project's
+code in its checkout directory, and only need to run build commands when you
+change a project's C extensions or similarly compiled files.
+
+To do this, use the ``setup.py develop`` command.  It works very similarly to
+``setup.py install``, except that it doesn't actually install anything.
+Instead, it creates a special ``.egg-link`` file in the deployment directory,
+that links to your project's source code.  And, if your deployment directory is
+Python's ``site-packages`` directory, it will also update the
+``easy-install.pth`` file to include your project's source code, thereby making
+it available on ``sys.path`` for all programs using that Python installation.
+
+for more information, go to :ref:`development_mode`
+
+Distributing a ``setuptools``-based project
+===========================================
+Before you begin, make sure you have the latest versions of setuptools and wheel::
+
+    pip install --upgrade setuptools wheel
+
+To build a setuptools project, run this command from the same directory where
+setup.py is located::
+
+    setup.py sdist bdist_wheel
+
+This will generate distribution archives in the `dist` directory.
+
+Before you upload the generated archives make sure you're registered on
+https://test.pypi.org/account/register/. You will also need to verify your email
+to be able to upload any packages.
+You should install twine to be able to upload packages::
+
+    pip install --upgrade twine
+
+Now, to upload these archives, run::
+
+    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+To install your newly uploaded package ``example_pkg``,  you can use pip::
+
+    pip install --index-url https://test.pypi.org/simple/ example_pkg
+
+The next following sections will walk you through all of the available functions
+``setuptools`` offers in excrutiating details (including those already mentioned)
+for more advanced use.

From a6acf0b59d5401766ae63b1d1f7030724606646e Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 11:15:42 -0400
Subject: [PATCH 7848/8469] docs: update functionalities.txt

outline is completed, now to fill the donut holes
---
 docs/userguide/functionalities_rewrite.txt | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/docs/userguide/functionalities_rewrite.txt b/docs/userguide/functionalities_rewrite.txt
index 657a732de4..1cd3dee994 100644
--- a/docs/userguide/functionalities_rewrite.txt
+++ b/docs/userguide/functionalities_rewrite.txt
@@ -12,29 +12,23 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` argument of ``setup()``.  However, for very large projects
 , it can be a big burden to keep the package list updated. setuptools therefore
-provides two tools to ease the burden.
+provides tools to ease the burden.
 
 ``find_packages()`` takes a source directory and two lists of package name
 patterns to exclude and include. It then walks the target directory, filtering
-by inclusion patterns, and finds Python packages (any directory). Packages are only
-recognized if they include an ``__init__.py`` file. Finally, exclusion
-patterns are applied to remove matching packages.
+by inclusion patterns, and return a list of Python packages (any directory).
+Finally, exclusion patterns are applied to remove matching packages.
 
-Inclusion and exclusion patterns are package names, optionally including
-wildcards.  For example, ``find_packages(exclude=["*.tests"])`` will exclude
-all packages whose last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
-"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
-but it still won't exclude a top-level ``tests`` package or the children
-thereof.
-
-Regardless of the parameters, the ``find_packages()``
-function returns a list of package names suitable for use as the ``packages``
-argument to ``setup()``, and so is usually the easiest way to set that
-argument in your setup script.  Especially since it frees you from having to
-remember to modify your setup script whenever your project grows additional
-top-level packages or subpackages.
+For example::
+    #...
+    from setuptools import find_packages()
 
+    setup(
+        #...,
+        packages = find_packages()
+    )
 
+For more details and advanced use, go to :ref:`package_discovery`
 
 Entry points and automatic script creation
 ===========================================
@@ -50,25 +44,13 @@ example::
         entry_points={
             "console_scripts": [
                 "foo = my_package.some_module:main_func",
-                "bar = other_module:some_func",
             ],
-            "gui_scripts": [
-                "baz = my_package_gui:start_func",
-            ]
         }
     )
 
-When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
-and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules. On Windows, a set of ``foo.exe``,
-``bar.exe``, and ``baz.exe`` launchers are
-created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
-``.exe`` wrappers find and execute the right version of Python to run the
-``.py`` or ``.pyw`` file.
-
-For detailed usage, including managing the additional or optional dependencies,
-go to :ref:`entry_point`.
+When this project is installed, a ``foo`` script will be installed and will
+invoke the ``main_func`` when called by the user. For detailed usage, including
+managing the additional or optional dependencies, go to :ref:`entry_point`.
 
 Dependency management
 =====================
@@ -92,6 +74,21 @@ For more advanced use, see :ref:`dependencies`
 Including Data Files
 ====================
 
+The distutils have traditionally allowed installation of "data files", which
+are placed in a platform-specific location. Setuptools offers three ways to
+specify data files to be included in your packages. For the simpliest use, you
+can simply use the ``include_package_data`` keyword e.g.::
+
+    setup(
+            ...
+            include_package_data=True
+        )
+
+This tells setuptools to install any data files it finds in your packages.
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+
+For more details, see :ref:`datafiles`
+
 Development mode
 ================
 

From 54314cbde4db3d559f158dd4c9f02c249f0f6db5 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 7849/8469] docs: put the remaining functionalities into misce

those that don't need to put into a dedicated file
are now inside the miscellaneous.txt
---
 docs/userguide/{functionalities.txt => miscellaneous.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/userguide/{functionalities.txt => miscellaneous.txt} (100%)

diff --git a/docs/userguide/functionalities.txt b/docs/userguide/miscellaneous.txt
similarity index 100%
rename from docs/userguide/functionalities.txt
rename to docs/userguide/miscellaneous.txt

From 88f248944a6033d1781a49a57997cd4932e28746 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 11:20:15 -0400
Subject: [PATCH 7850/8469] docs: merge function walkthrough into quickstart

---
 docs/userguide/functionalities_rewrite.txt | 131 ---------------------
 docs/userguide/quickstart.txt              | 131 +++++++++++++++++++++
 2 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/docs/userguide/functionalities_rewrite.txt b/docs/userguide/functionalities_rewrite.txt
index 1cd3dee994..d0997ca67d 100644
--- a/docs/userguide/functionalities_rewrite.txt
+++ b/docs/userguide/functionalities_rewrite.txt
@@ -6,135 +6,4 @@ Using setuptools to package and distribute your project
 build and distribute your python package. Here we provide an overview on
 the commonly used ones.
 
-Automatic package discovery
-===========================
 
-For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-, it can be a big burden to keep the package list updated. setuptools therefore
-provides tools to ease the burden.
-
-``find_packages()`` takes a source directory and two lists of package name
-patterns to exclude and include. It then walks the target directory, filtering
-by inclusion patterns, and return a list of Python packages (any directory).
-Finally, exclusion patterns are applied to remove matching packages.
-
-For example::
-    #...
-    from setuptools import find_packages()
-
-    setup(
-        #...,
-        packages = find_packages()
-    )
-
-For more details and advanced use, go to :ref:`package_discovery`
-
-Entry points and automatic script creation
-===========================================
-
-Setuptools support automatic creation of scripts upon installation, that runs
-code within your package if you specify them with the ``entry_point`` keyword.
-This is what allows you to run commands like ``pip install`` instead of having
-to type ``python -m pip install``. To accomplish this, consider the following
-example::
-
-    setup(
-        #....
-        entry_points={
-            "console_scripts": [
-                "foo = my_package.some_module:main_func",
-            ],
-        }
-    )
-
-When this project is installed, a ``foo`` script will be installed and will
-invoke the ``main_func`` when called by the user. For detailed usage, including
-managing the additional or optional dependencies, go to :ref:`entry_point`.
-
-Dependency management
-=====================
-
-``setuptools`` supports automatically installing dependencies when a package is
-installed. The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers::
-
-    setup(
-        #...
-        install_requires = "docutils >= 0.3"
-    )
-
-When your project is installed, either by using pip, ``setup.py install``,
-or ``setup.py develop``, all of the dependencies not already installed will
-be located (via PyPI), downloaded, built (if necessary), and installed.
-
-For more advanced use, see :ref:`dependencies`
-
-Including Data Files
-====================
-
-The distutils have traditionally allowed installation of "data files", which
-are placed in a platform-specific location. Setuptools offers three ways to
-specify data files to be included in your packages. For the simpliest use, you
-can simply use the ``include_package_data`` keyword e.g.::
-
-    setup(
-            ...
-            include_package_data=True
-        )
-
-This tells setuptools to install any data files it finds in your packages.
-The data files must be specified via the distutils' ``MANIFEST.in`` file.
-
-For more details, see :ref:`datafiles`
-
-Development mode
-================
-
-Setuptools allows you to deploy your projects for use in a common directory or
-staging area, but without copying any files.  Thus, you can edit each project's
-code in its checkout directory, and only need to run build commands when you
-change a project's C extensions or similarly compiled files.
-
-To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install``, except that it doesn't actually install anything.
-Instead, it creates a special ``.egg-link`` file in the deployment directory,
-that links to your project's source code.  And, if your deployment directory is
-Python's ``site-packages`` directory, it will also update the
-``easy-install.pth`` file to include your project's source code, thereby making
-it available on ``sys.path`` for all programs using that Python installation.
-
-for more information, go to :ref:`development_mode`
-
-Distributing a ``setuptools``-based project
-===========================================
-Before you begin, make sure you have the latest versions of setuptools and wheel::
-
-    pip install --upgrade setuptools wheel
-
-To build a setuptools project, run this command from the same directory where
-setup.py is located::
-
-    setup.py sdist bdist_wheel
-
-This will generate distribution archives in the `dist` directory.
-
-Before you upload the generated archives make sure you're registered on
-https://test.pypi.org/account/register/. You will also need to verify your email
-to be able to upload any packages.
-You should install twine to be able to upload packages::
-
-    pip install --upgrade twine
-
-Now, to upload these archives, run::
-
-    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-
-To install your newly uploaded package ``example_pkg``,  you can use pip::
-
-    pip install --index-url https://test.pypi.org/simple/ example_pkg
-
-The next following sections will walk you through all of the available functions
-``setuptools`` offers in excrutiating details (including those already mentioned)
-for more advanced use.
diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 535227a0e3..4a851ee3ee 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -74,6 +74,137 @@ dependencies, and perhaps some data files and scripts::
         # could also include long_description, download_url, etc.
     )
 
+Automatic package discovery
+===========================
 
+For simple projects, it's usually easy enough to manually add packages to
+the ``packages`` argument of ``setup()``.  However, for very large projects
+, it can be a big burden to keep the package list updated. setuptools therefore
+provides tools to ease the burden.
+
+``find_packages()`` takes a source directory and two lists of package name
+patterns to exclude and include. It then walks the target directory, filtering
+by inclusion patterns, and return a list of Python packages (any directory).
+Finally, exclusion patterns are applied to remove matching packages.
+
+For example::
+    #...
+    from setuptools import find_packages()
+
+    setup(
+        #...,
+        packages = find_packages()
+    )
+
+For more details and advanced use, go to :ref:`package_discovery`
+
+Entry points and automatic script creation
+===========================================
+
+Setuptools support automatic creation of scripts upon installation, that runs
+code within your package if you specify them with the ``entry_point`` keyword.
+This is what allows you to run commands like ``pip install`` instead of having
+to type ``python -m pip install``. To accomplish this, consider the following
+example::
+
+    setup(
+        #....
+        entry_points={
+            "console_scripts": [
+                "foo = my_package.some_module:main_func",
+            ],
+        }
+    )
+
+When this project is installed, a ``foo`` script will be installed and will
+invoke the ``main_func`` when called by the user. For detailed usage, including
+managing the additional or optional dependencies, go to :ref:`entry_point`.
+
+Dependency management
+=====================
+
+``setuptools`` supports automatically installing dependencies when a package is
+installed. The simplest way to include requirement specifiers is to use the
+``install_requires`` argument to ``setup()``.  It takes a string or list of
+strings containing requirement specifiers::
+
+    setup(
+        #...
+        install_requires = "docutils >= 0.3"
+    )
+
+When your project is installed, either by using pip, ``setup.py install``,
+or ``setup.py develop``, all of the dependencies not already installed will
+be located (via PyPI), downloaded, built (if necessary), and installed.
+
+For more advanced use, see :ref:`dependencies`
+
+Including Data Files
+====================
+
+The distutils have traditionally allowed installation of "data files", which
+are placed in a platform-specific location. Setuptools offers three ways to
+specify data files to be included in your packages. For the simpliest use, you
+can simply use the ``include_package_data`` keyword e.g.::
+
+    setup(
+            ...
+            include_package_data=True
+        )
+
+This tells setuptools to install any data files it finds in your packages.
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+
+For more details, see :ref:`datafiles`
+
+Development mode
+================
+
+Setuptools allows you to deploy your projects for use in a common directory or
+staging area, but without copying any files.  Thus, you can edit each project's
+code in its checkout directory, and only need to run build commands when you
+change a project's C extensions or similarly compiled files.
+
+To do this, use the ``setup.py develop`` command.  It works very similarly to
+``setup.py install``, except that it doesn't actually install anything.
+Instead, it creates a special ``.egg-link`` file in the deployment directory,
+that links to your project's source code.  And, if your deployment directory is
+Python's ``site-packages`` directory, it will also update the
+``easy-install.pth`` file to include your project's source code, thereby making
+it available on ``sys.path`` for all programs using that Python installation.
+
+for more information, go to :ref:`development_mode`
+
+Distributing a ``setuptools``-based project
+===========================================
+Before you begin, make sure you have the latest versions of setuptools and wheel::
+
+    pip install --upgrade setuptools wheel
+
+To build a setuptools project, run this command from the same directory where
+setup.py is located::
+
+    setup.py sdist bdist_wheel
+
+This will generate distribution archives in the `dist` directory.
+
+Before you upload the generated archives make sure you're registered on
+https://test.pypi.org/account/register/. You will also need to verify your email
+to be able to upload any packages.
+You should install twine to be able to upload packages::
+
+    pip install --upgrade twine
+
+Now, to upload these archives, run::
+
+    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+
+To install your newly uploaded package ``example_pkg``,  you can use pip::
+
+    pip install --index-url https://test.pypi.org/simple/ example_pkg
+
+The next following sections will walk you through all of the available functions
+``setuptools`` offers in excrutiating details (including those already mentioned)
+for more advanced use.
 
 

From 5d0859f38e2524cc4e5dd4f8492cd37622dc58a1 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 11:27:02 -0400
Subject: [PATCH 7851/8469] docs: update userguide index

---
 docs/userguide/index.txt | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index 4d7bb2a7c1..0fa32fd2ff 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -13,8 +13,14 @@ ordinary Python packages based on the ``distutils``.
 .. toctree::
     :maxdepth: 1
 
-    Quickstart <quickstart>
-    Functionalities <functionalities>
-    Declarative config <declarative_config>
-    keyword reference <keywords>
-    Command reference <commands>
+    quickstart
+    package_discovery
+    entry_point
+    dependencies_management
+    datafiles
+    development_mode
+    distribution
+    extension
+    declarative_config
+    keywords
+    commands

From c0794ed0d6dbeec85e366984db1496747aaaefc1 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:36:20 -0400
Subject: [PATCH 7852/8469] docs: udpate title of quickstart

---
 docs/userguide/quickstart.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 4a851ee3ee..fb40b12a9e 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -1,5 +1,9 @@
-Installing ``setuptools``
-=========================
+==========================
+``setuptools`` Quickstart
+==========================
+
+Installation
+============
 
 .. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
 
@@ -12,8 +16,8 @@ Refer to `Installing Packages`_ guide for more information.
 Basic Use
 =========
 
-For basic use of setuptools, just import things from setuptools instead of
-the distutils.  Here's a minimal setup script using setuptools::
+For basic use of setuptools, just import things from setuptools.  Here's a
+minimal setup script using setuptools::
 
     from setuptools import setup, find_packages
     setup(

From 6c6568dbf406597ffd6bd1e77ec3081b70992f7c Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:36:37 -0400
Subject: [PATCH 7853/8469] docs: dedicate file for package discovery

---
 docs/userguide/package_discovery.txt | 169 +++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 docs/userguide/package_discovery.txt

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
new file mode 100644
index 0000000000..722f6fcd12
--- /dev/null
+++ b/docs/userguide/package_discovery.txt
@@ -0,0 +1,169 @@
+===================
+Package Discovery
+===================
+
+
+
+Using ``find_packages()``
+-------------------------
+
+For simple projects, it's usually easy enough to manually add packages to
+the ``packages`` argument of ``setup()``.  However, for very large projects
+(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
+package list updated.  That's what ``setuptools.find_packages()`` is for.
+
+``find_packages()`` takes a source directory and two lists of package name
+patterns to exclude and include.  If omitted, the source directory defaults to
+the same
+directory as the setup script.  Some projects use a ``src`` or ``lib``
+directory as the root of their source tree, and those projects would of course
+use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
+such projects also need something like ``package_dir={"": "src"}`` in their
+``setup()`` arguments, but that's just a normal distutils thing.)
+
+Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
+patterns, and finds Python packages (any directory). Packages are only
+recognized if they include an ``__init__.py`` file. Finally, exclusion
+patterns are applied to remove matching packages.
+
+Inclusion and exclusion patterns are package names, optionally including
+wildcards.  For
+example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
+last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
+"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
+but it still won't exclude a top-level ``tests`` package or the children
+thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
+something like this::
+
+    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
+
+in order to cover all the bases.  Really, the exclusion patterns are intended
+to cover simpler use cases than this, like excluding a single, specified
+package and its subpackages.
+
+Regardless of the parameters, the ``find_packages()``
+function returns a list of package names suitable for use as the ``packages``
+argument to ``setup()``, and so is usually the easiest way to set that
+argument in your setup script.  Especially since it frees you from having to
+remember to modify your setup script whenever your project grows additional
+top-level packages or subpackages.
+
+``find_namespace_packages()``
+-----------------------------
+In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
+of ``find_packages``, which has the same function signature as
+``find_packages``, but works with `PEP 420`_ compliant implicit namespace
+packages. Here is a minimal setup script using ``find_namespace_packages``::
+
+    from setuptools import setup, find_namespace_packages
+    setup(
+        name="HelloWorld",
+        version="0.1",
+        packages=find_namespace_packages(),
+    )
+
+
+Keep in mind that according to PEP 420, you may have to either re-organize your
+codebase a bit or define a few exclusions, as the definition of an implicit
+namespace package is quite lenient, so for a project organized like so::
+
+
+    ├── namespace
+    │   └── mypackage
+    │       ├── __init__.py
+    │       └── mod1.py
+    ├── setup.py
+    └── tests
+        └── test_mod1.py
+
+A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
+top-level package called ``tests``! One way to avoid this problem is to use the
+``include`` keyword to whitelist the packages to include, like so::
+
+    from setuptools import setup, find_namespace_packages
+
+    setup(
+        name="namespace.mypackage",
+        version="0.1",
+        packages=find_namespace_packages(include=["namespace.*"])
+    )
+
+Another option is to use the "src" layout, where all package code is placed in
+the ``src`` directory, like so::
+
+
+    ├── setup.py
+    ├── src
+    │   └── namespace
+    │       └── mypackage
+    │           ├── __init__.py
+    │           └── mod1.py
+    └── tests
+        └── test_mod1.py
+
+With this layout, the package directory is specified as ``src``, as such::
+
+    setup(name="namespace.mypackage",
+          version="0.1",
+          package_dir={"": "src"},
+          packages=find_namespace_packages(where="src"))
+
+.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
+
+
+Namespace Packages
+------------------
+
+Sometimes, a large package is more useful if distributed as a collection of
+smaller eggs.  However, Python does not normally allow the contents of a
+package to be retrieved from more than one location.  "Namespace packages"
+are a solution for this problem.  When you declare a package to be a namespace
+package, it means that the package has no meaningful contents in its
+``__init__.py``, and that it is merely a container for modules and subpackages.
+
+The ``pkg_resources`` runtime will then automatically ensure that the contents
+of namespace packages that are spread over multiple eggs or directories are
+combined into a single "virtual" package.
+
+The ``namespace_packages`` argument to ``setup()`` lets you declare your
+project's namespace packages, so that they will be included in your project's
+metadata.  The argument should list the namespace packages that the egg
+participates in.  For example, the ZopeInterface project might do this::
+
+    setup(
+        # ...
+        namespace_packages=["zope"]
+    )
+
+because it contains a ``zope.interface`` package that lives in the ``zope``
+namespace package.  Similarly, a project for a standalone ``zope.publisher``
+would also declare the ``zope`` namespace package.  When these projects are
+installed and used, Python will see them both as part of a "virtual" ``zope``
+package, even though they will be installed in different locations.
+
+Namespace packages don't have to be top-level packages.  For example, Zope 3's
+``zope.app`` package is a namespace package, and in the future PEAK's
+``peak.util`` package will be too.
+
+Note, by the way, that your project's source tree must include the namespace
+packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
+packages), in a normal Python package layout.  These ``__init__.py`` files
+*must* contain the line::
+
+    __import__("pkg_resources").declare_namespace(__name__)
+
+This code ensures that the namespace package machinery is operating and that
+the current package is registered as a namespace package.
+
+You must NOT include any other code and data in a namespace package's
+``__init__.py``.  Even though it may appear to work during development, or when
+projects are installed as ``.egg`` files, it will not work when the projects
+are installed using "system" packaging tools -- in such cases the
+``__init__.py`` files will not be installed, let alone executed.
+
+You must include the ``declare_namespace()``  line in the ``__init__.py`` of
+*every* project that has contents for the namespace package in question, in
+order to ensure that the namespace will be declared regardless of which
+project's copy of ``__init__.py`` is loaded first.  If the first loaded
+``__init__.py`` doesn't declare it, it will never *be* declared, because no
+other copies will ever be loaded!
\ No newline at end of file

From 127cfdfb9a01cfe12a7e6d8bf81aa04c56c2d5f1 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:37:17 -0400
Subject: [PATCH 7854/8469] docs: udpate package_discovery.txt

---
 docs/userguide/package_discovery.txt | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
index 722f6fcd12..8ba12cdf3c 100644
--- a/docs/userguide/package_discovery.txt
+++ b/docs/userguide/package_discovery.txt
@@ -2,15 +2,27 @@
 Package Discovery
 ===================
 
+``Setuptools`` provide powerful tools to handle package discovery, including
+support for namespace package. The following explain how you include package
+in your ``setup`` script::
+
+    setup(
+        packages = ['mypkg1', 'mypkg2']
+    )
+
+To speed things up, we introduce two functions provided by setuptools::
+
+    from setuptools import find_packages
+
+or::
+
+    from setuptools import find_namespace_packages
 
 
 Using ``find_packages()``
 -------------------------
 
-For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
-package list updated.  That's what ``setuptools.find_packages()`` is for.
+Let's start with the first tool.
 
 ``find_packages()`` takes a source directory and two lists of package name
 patterns to exclude and include.  If omitted, the source directory defaults to
@@ -166,4 +178,4 @@ You must include the ``declare_namespace()``  line in the ``__init__.py`` of
 order to ensure that the namespace will be declared regardless of which
 project's copy of ``__init__.py`` is loaded first.  If the first loaded
 ``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!
\ No newline at end of file
+other copies will ever be loaded!

From 092aec60cb0a947a4030c9fd7c231e6c82ff88e5 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:38:09 -0400
Subject: [PATCH 7855/8469] docs: dedicate a file for entry points

---
 docs/userguide/entry_point.txt | 115 +++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 docs/userguide/entry_point.txt

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
new file mode 100644
index 0000000000..18211a72c9
--- /dev/null
+++ b/docs/userguide/entry_point.txt
@@ -0,0 +1,115 @@
+==========================================
+Entry Points and Automatic Script Creation
+==========================================
+
+Packaging and installing scripts can be a bit awkward with the distutils.  For
+one thing, there's no easy way to have a script's filename match local
+conventions on both Windows and POSIX platforms.  For another, you often have
+to create a separate file just for the "main" script, when your actual "main"
+is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
+option only works for actual ``.py`` files that aren't installed in a package.
+
+``setuptools`` fixes all of these problems by automatically generating scripts
+for you with the correct extension, and on Windows it will even create an
+``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
+The way to use this feature is to define "entry points" in your setup script
+that indicate what function the generated script should import and run.  For
+example, to create two console scripts called ``foo`` and ``bar``, and a GUI
+script called ``baz``, you might do something like this::
+
+    setup(
+        # other arguments here...
+        entry_points={
+            "console_scripts": [
+                "foo = my_package.some_module:main_func",
+                "bar = other_module:some_func",
+            ],
+            "gui_scripts": [
+                "baz = my_package_gui:start_func",
+            ]
+        }
+    )
+
+When this project is installed on non-Windows platforms (using "setup.py
+install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
+and ``baz`` scripts will be installed that import ``main_func`` and
+``some_func`` from the specified modules.  The functions you specify are
+called with no arguments, and their return value is passed to
+``sys.exit()``, so you can return an errorlevel or message to print to
+stderr.
+
+On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
+created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
+``.exe`` wrappers find and execute the right version of Python to run the
+``.py`` or ``.pyw`` file.
+
+You may define as many "console script" and "gui script" entry points as you
+like, and each one can optionally specify "extras" that it depends on, that
+will be added to ``sys.path`` when the script is run.  For more information on
+"extras", see the section below on `Declaring Extras`_.  For more information
+on "entry points" in general, see the section below on `Dynamic Discovery of
+Services and Plugins`_.
+
+
+Dynamic Discovery of Services and Plugins
+-----------------------------------------
+
+``setuptools`` supports creating libraries that "plug in" to extensible
+applications and frameworks, by letting you register "entry points" in your
+project that can be imported by the application or framework.
+
+For example, suppose that a blogging tool wants to support plugins
+that provide translation for various file types to the blog's output format.
+The framework might define an "entry point group" called ``blogtool.parsers``,
+and then allow plugins to register entry points for the file extensions they
+support.
+
+This would allow people to create distributions that contain one or more
+parsers for different file types, and then the blogging tool would be able to
+find the parsers at runtime by looking up an entry point for the file
+extension (or mime type, or however it wants to).
+
+Note that if the blogging tool includes parsers for certain file formats, it
+can register these as entry points in its own setup script, which means it
+doesn't have to special-case its built-in formats.  They can just be treated
+the same as any other plugin's entry points would be.
+
+If you're creating a project that plugs in to an existing application or
+framework, you'll need to know what entry points or entry point groups are
+defined by that application or framework.  Then, you can register entry points
+in your setup script.  Here are a few examples of ways you might register an
+``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
+for our hypothetical blogging tool::
+
+    setup(
+        # ...
+        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
+    )
+
+    setup(
+        # ...
+        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
+    )
+
+    setup(
+        # ...
+        entry_points="""
+            [blogtool.parsers]
+            .rst = some.nested.module:SomeClass.some_classmethod [reST]
+        """,
+        extras_require=dict(reST="Docutils>=0.3.5")
+    )
+
+The ``entry_points`` argument to ``setup()`` accepts either a string with
+``.ini``-style sections, or a dictionary mapping entry point group names to
+either strings or lists of strings containing entry point specifiers.  An
+entry point specifier consists of a name and value, separated by an ``=``
+sign.  The value consists of a dotted module name, optionally followed by a
+``:`` and a dotted identifier naming an object within the module.  It can
+also include a bracketed list of "extras" that are required for the entry
+point to be used.  When the invoking application or framework requests loading
+of an entry point, any requirements implied by the associated extras will be
+passed to ``pkg_resources.require()``, so that an appropriate error message
+can be displayed if the needed package(s) are missing.  (Of course, the
+invoking app or framework can ignore such errors if it wants to make an entry
+point optional if a requirement isn't installed.)
\ No newline at end of file

From 385b40d5640ea8262245411eb0c43f67af4eb2a4 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:39:30 -0400
Subject: [PATCH 7856/8469] docs: update userguide index to match filename

---
 docs/userguide/index.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index 0fa32fd2ff..ae9c9d77ae 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -16,8 +16,8 @@ ordinary Python packages based on the ``distutils``.
     quickstart
     package_discovery
     entry_point
-    dependencies_management
-    datafiles
+    dependency_management
+    data_files
     development_mode
     distribution
     extension

From 34f1fa1b86a63f3021ccb7f842220d8b011c9e1d Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:39:48 -0400
Subject: [PATCH 7857/8469] docs: dedicate a file for dependency management

---
 docs/userguide/dependency_management.txt | 255 +++++++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 docs/userguide/dependency_management.txt

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
new file mode 100644
index 0000000000..18ba952f4f
--- /dev/null
+++ b/docs/userguide/dependency_management.txt
@@ -0,0 +1,255 @@
+=====================================
+Dependencies Management in Setuptools
+=====================================
+
+Declaring Dependencies
+======================
+
+``setuptools`` supports automatically installing dependencies when a package is
+installed, and including information about dependencies in Python Eggs (so that
+package management tools like pip can use the information).
+
+``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
+project's required dependencies.  This syntax consists of a project's PyPI
+name, optionally followed by a comma-separated list of "extras" in square
+brackets, optionally followed by a comma-separated list of version
+specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
+``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
+separated by whitespace, but any whitespace or nonstandard characters within a
+project name or version identifier must be replaced with ``-``.
+
+Version specifiers for a given project are internally sorted into ascending
+version order, and used to establish what ranges of versions are acceptable.
+Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
+``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
+the ranges they fall within.  A project's version is then checked for
+membership in the resulting ranges. (Note that providing conflicting conditions
+for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
+therefore produce bizarre results.)
+
+Here are some example requirement specifiers::
+
+    docutils >= 0.3
+
+    # comment lines and \ continuations are allowed in requirement strings
+    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
+        ==1.6, ==1.7  # and so are line-end comments
+
+    PEAK[FastCGI, reST]>=0.5a4
+
+    setuptools==0.5a7
+
+The simplest way to include requirement specifiers is to use the
+``install_requires`` argument to ``setup()``.  It takes a string or list of
+strings containing requirement specifiers.  If you include more than one
+requirement in a string, each requirement must begin on a new line.
+
+This has three effects:
+
+1. When your project is installed, either by using pip, ``setup.py install``,
+   or ``setup.py develop``, all of the dependencies not already installed will
+   be located (via PyPI), downloaded, built (if necessary), and installed.
+
+2. Any scripts in your project will be installed with wrappers that verify
+   the availability of the specified dependencies at runtime, and ensure that
+   the correct versions are added to ``sys.path`` (e.g. if multiple versions
+   have been installed).
+
+3. Python Egg distributions will include a metadata file listing the
+   dependencies.
+
+Note, by the way, that if you declare your dependencies in ``setup.py``, you do
+*not* need to use the ``require()`` function in your scripts or modules, as
+long as you either install the project or use ``setup.py develop`` to do
+development work on it.  (See `"Development Mode"`_ below for more details on
+using ``setup.py develop``.)
+
+Dependencies that aren't in PyPI
+--------------------------------
+
+.. warning::
+    Dependency links support has been dropped by pip starting with version
+    19.0 (released 2019-01-22).
+
+If your project depends on packages that don't exist on PyPI, you may still be
+able to depend on them, as long as they are available for download as:
+
+- an egg, in the standard distutils ``sdist`` format,
+- a single ``.py`` file, or
+- a VCS repository (Subversion, Mercurial, or Git).
+
+You just need to add some URLs to the ``dependency_links`` argument to
+``setup()``.
+
+The URLs must be either:
+
+1. direct download URLs,
+2. the URLs of web pages that contain direct download links, or
+3. the repository's URL
+
+In general, it's better to link to web pages, because it is usually less
+complex to update a web page than to release a new version of your project.
+You can also use a SourceForge ``showfiles.php`` link in the case where a
+package you depend on is distributed via SourceForge.
+
+If you depend on a package that's distributed as a single ``.py`` file, you
+must include an ``"#egg=project-version"`` suffix to the URL, to give a project
+name and version number.  (Be sure to escape any dashes in the name or version
+by replacing them with underscores.)  EasyInstall will recognize this suffix
+and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
+as an egg.
+
+In the case of a VCS checkout, you should also append ``#egg=project-version``
+in order to identify for what package that checkout should be used. You can
+append ``@REV`` to the URL's path (before the fragment) to specify a revision.
+Additionally, you can also force the VCS being used by prepending the URL with
+a certain prefix. Currently available are:
+
+-  ``svn+URL`` for Subversion,
+-  ``git+URL`` for Git, and
+-  ``hg+URL`` for Mercurial
+
+A more complete example would be:
+
+    ``vcs+proto://host/path@revision#egg=project-version``
+
+Be careful with the version. It should match the one inside the project files.
+If you want to disregard the version, you have to omit it both in the
+``requires`` and in the URL's fragment.
+
+This will do a checkout (or a clone, in Git and Mercurial parlance) to a
+temporary folder and run ``setup.py bdist_egg``.
+
+The ``dependency_links`` option takes the form of a list of URL strings.  For
+example, this will cause a search of the specified page for eggs or source
+distributions, if the package's dependencies aren't already installed::
+
+    setup(
+        ...
+        dependency_links=[
+            "http://peak.telecommunity.com/snapshots/"
+        ],
+    )
+
+
+.. _Declaring Extras:
+
+
+Declaring "Extras" (optional features with their own dependencies)
+------------------------------------------------------------------
+
+Sometimes a project has "recommended" dependencies, that are not required for
+all uses of the project.  For example, a project might offer optional PDF
+output if ReportLab is installed, and reStructuredText support if docutils is
+installed.  These optional features are called "extras", and setuptools allows
+you to define their requirements as well.  In this way, other projects that
+require these optional features can force the additional requirements to be
+installed, by naming the desired extras in their ``install_requires``.
+
+For example, let's say that Project A offers optional PDF and reST support::
+
+    setup(
+        name="Project-A",
+        ...
+        extras_require={
+            "PDF":  ["ReportLab>=1.2", "RXP"],
+            "reST": ["docutils>=0.3"],
+        }
+    )
+
+As you can see, the ``extras_require`` argument takes a dictionary mapping
+names of "extra" features, to strings or lists of strings describing those
+features' requirements.  These requirements will *not* be automatically
+installed unless another package depends on them (directly or indirectly) by
+including the desired "extras" in square brackets after the associated project
+name.  (Or if the extras were listed in a requirement spec on the "pip install"
+command line.)
+
+Extras can be used by a project's `entry points`_ to specify dynamic
+dependencies.  For example, if Project A includes a "rst2pdf" script, it might
+declare it like this, so that the "PDF" requirements are only resolved if the
+"rst2pdf" script is run::
+
+    setup(
+        name="Project-A",
+        ...
+        entry_points={
+            "console_scripts": [
+                "rst2pdf = project_a.tools.pdfgen [PDF]",
+                "rst2html = project_a.tools.htmlgen",
+                # more script entry points ...
+            ],
+        }
+    )
+
+Projects can also use another project's extras when specifying dependencies.
+For example, if project B needs "project A" with PDF support installed, it
+might declare the dependency like this::
+
+    setup(
+        name="Project-B",
+        install_requires=["Project-A[PDF]"],
+        ...
+    )
+
+This will cause ReportLab to be installed along with project A, if project B is
+installed -- even if project A was already installed.  In this way, a project
+can encapsulate groups of optional "downstream dependencies" under a feature
+name, so that packages that depend on it don't have to know what the downstream
+dependencies are.  If a later version of Project A builds in PDF support and
+no longer needs ReportLab, or if it ends up needing other dependencies besides
+ReportLab in order to provide PDF support, Project B's setup information does
+not need to change, but the right packages will still be installed if needed.
+
+Note, by the way, that if a project ends up not needing any other packages to
+support a feature, it should keep an empty requirements list for that feature
+in its ``extras_require`` argument, so that packages depending on that feature
+don't break (due to an invalid feature name).  For example, if Project A above
+builds in PDF support and no longer needs ReportLab, it could change its
+setup to this::
+
+    setup(
+        name="Project-A",
+        ...
+        extras_require={
+            "PDF":  [],
+            "reST": ["docutils>=0.3"],
+        }
+    )
+
+so that Package B doesn't have to remove the ``[PDF]`` from its requirement
+specifier.
+
+.. _Platform Specific Dependencies:
+
+
+Declaring platform specific dependencies
+----------------------------------------
+
+Sometimes a project might require a dependency to run on a specific platform.
+This could to a package that back ports a module so that it can be used in
+older python versions.  Or it could be a package that is required to run on a
+specific operating system.  This will allow a project to work on multiple
+different platforms without installing dependencies that are not required for
+a platform that is installing the project.
+
+For example, here is a project that uses the ``enum`` module and ``pywin32``::
+
+    setup(
+        name="Project",
+        ...
+        install_requires=[
+            "enum34;python_version<'3.4'",
+            "pywin32 >= 1.0;platform_system=='Windows'"
+        ]
+    )
+
+Since the ``enum`` module was added in Python 3.4, it should only be installed
+if the python version is earlier.  Since ``pywin32`` will only be used on
+windows, it should only be installed when the operating system is Windows.
+Specifying version requirements for the dependencies is supported as normal.
+
+The environmental markers that may be used for testing platform types are
+detailed in `PEP 508`_.
+
+.. _PEP 508: https://www.python.org/dev/peps/pep-0508/

From bf6e567a736943ae5d54f21b59005b900c909a28 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:40:46 -0400
Subject: [PATCH 7858/8469] docs: udpate quickstart to match ref file

---
 docs/userguide/quickstart.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index fb40b12a9e..e75d74e181 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -141,7 +141,7 @@ When your project is installed, either by using pip, ``setup.py install``,
 or ``setup.py develop``, all of the dependencies not already installed will
 be located (via PyPI), downloaded, built (if necessary), and installed.
 
-For more advanced use, see :ref:`dependencies`
+For more advanced use, see :ref:`dependency_management`
 
 Including Data Files
 ====================
@@ -210,5 +210,3 @@ To install your newly uploaded package ``example_pkg``,  you can use pip::
 The next following sections will walk you through all of the available functions
 ``setuptools`` offers in excrutiating details (including those already mentioned)
 for more advanced use.
-
-

From 503d22a209159b9ad990da7ecc5445496f8b2cd7 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:41:14 -0400
Subject: [PATCH 7859/8469] docs: dedicate a file for development mode

---
 docs/userguide/development_mode.txt | 60 +++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 docs/userguide/development_mode.txt

diff --git a/docs/userguide/development_mode.txt b/docs/userguide/development_mode.txt
new file mode 100644
index 0000000000..9d4e758155
--- /dev/null
+++ b/docs/userguide/development_mode.txt
@@ -0,0 +1,60 @@
+"Development Mode"
+==================
+
+Under normal circumstances, the ``distutils`` assume that you are going to
+build a distribution of your project, not use it in its "raw" or "unbuilt"
+form.  If you were to use the ``distutils`` that way, you would have to rebuild
+and reinstall your project every time you made a change to it during
+development.
+
+Another problem that sometimes comes up with the ``distutils`` is that you may
+need to do development on two related projects at the same time.  You may need
+to put both projects' packages in the same directory to run them, but need to
+keep them separate for revision control purposes.  How can you do this?
+
+Setuptools allows you to deploy your projects for use in a common directory or
+staging area, but without copying any files.  Thus, you can edit each project's
+code in its checkout directory, and only need to run build commands when you
+change a project's C extensions or similarly compiled files.  You can even
+deploy a project into another project's checkout directory, if that's your
+preferred way of working (as opposed to using a common independent staging area
+or the site-packages directory).
+
+To do this, use the ``setup.py develop`` command.  It works very similarly to
+``setup.py install``, except that it doesn't actually install anything.
+Instead, it creates a special ``.egg-link`` file in the deployment directory,
+that links to your project's source code.  And, if your deployment directory is
+Python's ``site-packages`` directory, it will also update the
+``easy-install.pth`` file to include your project's source code, thereby making
+it available on ``sys.path`` for all programs using that Python installation.
+
+If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
+will not link directly to your source code when run under Python 3, since
+that source code would be made for Python 2 and not work under Python 3.
+Instead the ``setup.py develop`` will build Python 3 code under the ``build``
+directory, and link there. This means that after doing code changes you will
+have to run ``setup.py build`` before these changes are picked up by your
+Python 3 installation.
+
+In addition, the ``develop`` command creates wrapper scripts in the target
+script directory that will run your in-development scripts after ensuring that
+all your ``install_requires`` packages are available on ``sys.path``.
+
+You can deploy the same project to multiple staging areas, e.g. if you have
+multiple projects on the same machine that are sharing the same project you're
+doing development work.
+
+When you're done with a given development task, you can remove the project
+source from a staging area using ``setup.py develop --uninstall``, specifying
+the desired staging area if it's not the default.
+
+There are several options to control the precise behavior of the ``develop``
+command; see the section on the `develop`_ command below for more details.
+
+Note that you can also apply setuptools commands to non-setuptools projects,
+using commands like this::
+
+   python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
+
+That is, you can simply list the normal setup commands and options following
+the quoted part.
\ No newline at end of file

From 6f43f47eb62ec6ac0a63b6fd1487192b10b1438b Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:41:56 -0400
Subject: [PATCH 7860/8469] docs: update index to match filename

---
 docs/userguide/index.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/index.txt b/docs/userguide/index.txt
index ae9c9d77ae..abee331a2f 100644
--- a/docs/userguide/index.txt
+++ b/docs/userguide/index.txt
@@ -17,7 +17,7 @@ ordinary Python packages based on the ``distutils``.
     package_discovery
     entry_point
     dependency_management
-    data_files
+    datafiles
     development_mode
     distribution
     extension

From 7b4f1b0f23c445583d96e826a9040769dd8f5e49 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:42:13 -0400
Subject: [PATCH 7861/8469] docs: dedicate a file for datafiles support

---
 docs/userguide/datafiles.txt | 174 +++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 docs/userguide/datafiles.txt

diff --git a/docs/userguide/datafiles.txt b/docs/userguide/datafiles.txt
new file mode 100644
index 0000000000..315ec7245d
--- /dev/null
+++ b/docs/userguide/datafiles.txt
@@ -0,0 +1,174 @@
+====================
+Data Files Support
+====================
+
+The distutils have traditionally allowed installation of "data files", which
+are placed in a platform-specific location.  However, the most common use case
+for data files distributed with a package is for use *by* the package, usually
+by including the data files in the package directory.
+
+Setuptools offers three ways to specify data files to be included in your
+packages.  First, you can simply use the ``include_package_data`` keyword,
+e.g.::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        include_package_data=True
+    )
+
+This tells setuptools to install any data files it finds in your packages.
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+(They can also be tracked by a revision control system, using an appropriate
+plugin.  See the section below on `Adding Support for Revision Control
+Systems`_ for information on how to write such plugins.)
+
+If you want finer-grained control over what files are included (for example,
+if you have documentation files in your package directories and want to exclude
+them from installation), then you can also use the ``package_data`` keyword,
+e.g.::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        package_data={
+            # If any package contains *.txt or *.rst files, include them:
+            "": ["*.txt", "*.rst"],
+            # And include any *.msg files found in the "hello" package, too:
+            "hello": ["*.msg"],
+        }
+    )
+
+The ``package_data`` argument is a dictionary that maps from package names to
+lists of glob patterns.  The globs may include subdirectory names, if the data
+files are contained in a subdirectory of the package.  For example, if the
+package tree looks like this::
+
+    setup.py
+    src/
+        mypkg/
+            __init__.py
+            mypkg.txt
+            data/
+                somefile.dat
+                otherdata.dat
+
+The setuptools setup file might look like this::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
+
+        package_data={
+            # If any package contains *.txt files, include them:
+            "": ["*.txt"],
+            # And include any *.dat files found in the "data" subdirectory
+            # of the "mypkg" package, also:
+            "mypkg": ["data/*.dat"],
+        }
+    )
+
+Notice that if you list patterns in ``package_data`` under the empty string,
+these patterns are used to find files in every package, even ones that also
+have their own patterns listed.  Thus, in the above example, the ``mypkg.txt``
+file gets included even though it's not listed in the patterns for ``mypkg``.
+
+Also notice that if you use paths, you *must* use a forward slash (``/``) as
+the path separator, even if you are on Windows.  Setuptools automatically
+converts slashes to appropriate platform-specific separators at build time.
+
+If datafiles are contained in a subdirectory of a package that isn't a package
+itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
+in the ``package_data`` argument (as shown above with ``"data/*.dat"``).
+
+When building an ``sdist``, the datafiles are also drawn from the
+``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
+the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
+
+(Note: although the ``package_data`` argument was previously only available in
+``setuptools``, it was also added to the Python ``distutils`` package as of
+Python 2.4; there is `some documentation for the feature`__ available on the
+python.org website.  If using the setuptools-specific ``include_package_data``
+argument, files specified by ``package_data`` will *not* be automatically
+added to the manifest unless they are listed in the MANIFEST.in file.)
+
+__ https://docs.python.org/3/distutils/setupscript.html#installing-package-data
+
+Sometimes, the ``include_package_data`` or ``package_data`` options alone
+aren't sufficient to precisely define what files you want included.  For
+example, you may want to include package README files in your revision control
+system and source distributions, but exclude them from being installed.  So,
+setuptools offers an ``exclude_package_data`` option as well, that allows you
+to do things like this::
+
+    from setuptools import setup, find_packages
+    setup(
+        ...
+        packages=find_packages("src"),  # include all packages under src
+        package_dir={"": "src"},   # tell distutils packages are under src
+
+        include_package_data=True,    # include everything in source control
+
+        # ...but exclude README.txt from all packages
+        exclude_package_data={"": ["README.txt"]},
+    )
+
+The ``exclude_package_data`` option is a dictionary mapping package names to
+lists of wildcard patterns, just like the ``package_data`` option.  And, just
+as with that option, a key of ``""`` will apply the given pattern(s) to all
+packages.  However, any files that match these patterns will be *excluded*
+from installation, even if they were listed in ``package_data`` or were
+included as a result of using ``include_package_data``.
+
+In summary, the three options allow you to:
+
+``include_package_data``
+    Accept all data files and directories matched by ``MANIFEST.in``.
+
+``package_data``
+    Specify additional patterns to match files that may or may
+    not be matched by ``MANIFEST.in`` or found in source control.
+
+``exclude_package_data``
+    Specify patterns for data files and directories that should *not* be
+    included when a package is installed, even if they would otherwise have
+    been included due to the use of the preceding options.
+
+NOTE: Due to the way the distutils build process works, a data file that you
+include in your project and then stop including may be "orphaned" in your
+project's build directories, requiring you to run ``setup.py clean --all`` to
+fully remove them.  This may also be important for your users and contributors
+if they track intermediate revisions of your project using Subversion; be sure
+to let them know when you make changes that remove files from inclusion so they
+can run ``setup.py clean --all``.
+
+Accessing Data Files at Runtime
+-------------------------------
+
+Typically, existing programs manipulate a package's ``__file__`` attribute in
+order to find the location of data files.  However, this manipulation isn't
+compatible with PEP 302-based import hooks, including importing from zip files
+and Python Eggs.  It is strongly recommended that, if you are using data files,
+you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
+them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
+you're using setuptools to distribute your package, there is no reason not to
+use its resource management API.  See also `Importlib Resources`_ for
+a quick example of converting code that uses ``__file__`` to use
+``pkg_resources`` instead.
+
+.. _Importlib Resources: https://docs.python.org/3/library/importlib.html#module-importlib.resources
+
+
+Non-Package Data Files
+----------------------
+
+Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
+files from the distribution into the egg (see `the old docs
+<https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
+fall back to the platform-specific location for installing data files, there is
+no supported facility to reliably retrieve these resources.
+
+Instead, the PyPA recommends that any data files you wish to be accessible at
+run time be included in the package.
\ No newline at end of file

From 5be9afe13040473ec2e5765920af18c85a749157 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:43:22 -0400
Subject: [PATCH 7862/8469] docs: dedicate a file for distribution guide

---
 docs/userguide/distribution.txt | 240 ++++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 docs/userguide/distribution.txt

diff --git a/docs/userguide/distribution.txt b/docs/userguide/distribution.txt
new file mode 100644
index 0000000000..77ea2660e2
--- /dev/null
+++ b/docs/userguide/distribution.txt
@@ -0,0 +1,240 @@
+Tagging and "Daily Build" or "Snapshot" Releases
+------------------------------------------------
+
+When a set of related projects are under development, it may be important to
+track finer-grained version increments than you would normally use for e.g.
+"stable" releases.  While stable releases might be measured in dotted numbers
+with alpha/beta/etc. status codes, development versions of a project often
+need to be tracked by revision or build number or even build date.  This is
+especially true when projects in development need to refer to one another, and
+therefore may literally need an up-to-the-minute version of something!
+
+To support these scenarios, ``setuptools`` allows you to "tag" your source and
+egg distributions by adding one or more of the following to the project's
+"official" version identifier:
+
+* A manually-specified pre-release tag, such as "build" or "dev", or a
+  manually-specified post-release tag, such as a build or revision number
+  (``--tag-build=STRING, -bSTRING``)
+
+* An 8-character representation of the build date (``--tag-date, -d``), as
+  a postrelease tag
+
+You can add these tags by adding ``egg_info`` and the desired options to
+the command line ahead of the ``sdist`` or ``bdist`` commands that you want
+to generate a daily build or snapshot for.  See the section below on the
+`egg_info`_ command for more details.
+
+(Also, before you release your project, be sure to see the section above on
+`Specifying Your Project's Version`_ for more information about how pre- and
+post-release tags affect how version numbers are interpreted.  This is
+important in order to make sure that dependency processing tools will know
+which versions of your project are newer than others.)
+
+Finally, if you are creating builds frequently, and either building them in a
+downloadable location or are copying them to a distribution server, you should
+probably also check out the `rotate`_ command, which lets you automatically
+delete all but the N most-recently-modified distributions matching a glob
+pattern.  So, you can use a command line like::
+
+    setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
+
+to build an egg whose version info includes "DEV-rNNNN" (where NNNN is the
+most recent Subversion revision that affected the source tree), and then
+delete any egg files from the distribution directory except for the three
+that were built most recently.
+
+If you have to manage automated builds for multiple packages, each with
+different tagging and rotation policies, you may also want to check out the
+`alias`_ command, which would let each package define an alias like ``daily``
+that would perform the necessary tag, build, and rotate commands.  Then, a
+simpler script or cron job could just run ``setup.py daily`` in each project
+directory.  (And, you could also define sitewide or per-user default versions
+of the ``daily`` alias, so that projects that didn't define their own would
+use the appropriate defaults.)
+
+Generating Source Distributions
+-------------------------------
+
+``setuptools`` enhances the distutils' default algorithm for source file
+selection with pluggable endpoints for looking up files to include. If you are
+using a revision control system, and your source distributions only need to
+include files that you're tracking in revision control, use a corresponding
+plugin instead of writing a ``MANIFEST.in`` file. See the section below on
+`Adding Support for Revision Control Systems`_ for information on plugins.
+
+If you need to include automatically generated files, or files that are kept in
+an unsupported revision control system, you'll need to create a ``MANIFEST.in``
+file to specify any files that the default file location algorithm doesn't
+catch.  See the distutils documentation for more information on the format of
+the ``MANIFEST.in`` file.
+
+But, be sure to ignore any part of the distutils documentation that deals with
+``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
+from these issues and doesn't work the same way in any case.  Unlike the
+distutils, setuptools regenerates the source distribution manifest file
+every time you build a source distribution, and it builds it inside the
+project's ``.egg-info`` directory, out of the way of your main project
+directory.  You therefore need not worry about whether it is up-to-date or not.
+
+Indeed, because setuptools' approach to determining the contents of a source
+distribution is so much simpler, its ``sdist`` command omits nearly all of
+the options that the distutils' more complex ``sdist`` process requires.  For
+all practical purposes, you'll probably use only the ``--formats`` option, if
+you use any option at all.
+
+
+Making "Official" (Non-Snapshot) Releases
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you make an official release, creating source or binary distributions,
+you will need to override the tag settings from ``setup.cfg``, so that you
+don't end up registering versions like ``foobar-0.7a1.dev-r34832``.  This is
+easy to do if you are developing on the trunk and using tags or branches for
+your releases - just make the change to ``setup.cfg`` after branching or
+tagging the release, so the trunk will still produce development snapshots.
+
+Alternately, if you are not branching for releases, you can override the
+default version options on the command line, using something like::
+
+    setup.py egg_info -Db "" sdist bdist_egg
+
+The first part of this command (``egg_info -Db ""``) will override the
+configured tag information, before creating source and binary eggs. Thus, these
+commands will use the plain version from your ``setup.py``, without adding the
+build designation string.
+
+Of course, if you will be doing this a lot, you may wish to create a personal
+alias for this operation, e.g.::
+
+    setup.py alias -u release egg_info -Db ""
+
+You can then use it like this::
+
+    setup.py release sdist bdist_egg
+
+Or of course you can create more elaborate aliases that do all of the above.
+See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
+
+Distributing Extensions compiled with Cython
+--------------------------------------------
+
+``setuptools`` will detect at build time whether Cython is installed or not.
+If Cython is not found ``setuptools`` will ignore pyx files.
+
+To ensure Cython is available, include Cython in the build-requires section
+of your pyproject.toml::
+
+    [build-system]
+    requires=[..., "cython"]
+
+Built with pip 10 or later, that declaration is sufficient to include Cython
+in the build. For broader compatibility, declare the dependency in your
+setup-requires of setup.cfg::
+
+    [options]
+    setup_requires =
+        ...
+        cython
+
+As long as Cython is present in the build environment, ``setuptools`` includes
+transparent support for building Cython extensions, as
+long as extensions are defined using ``setuptools.Extension``.
+
+If you follow these rules, you can safely list ``.pyx`` files as the source
+of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
+will use it.
+
+Of course, for this to work, your source distributions must include the C
+code generated by Cython, as well as your original ``.pyx`` files.  This means
+that you will probably want to include current ``.c`` files in your revision
+control system, rebuilding them whenever you check changes in for the ``.pyx``
+source files.  This will ensure that people tracking your project in a revision
+control system will be able to build it even if they don't have Cython
+installed, and that your source releases will be similarly usable with or
+without Cython.
+
+Specifying Your Project's Version
+---------------------------------
+
+Setuptools can work well with most versioning schemes; there are, however, a
+few special things to watch out for, in order to ensure that setuptools and
+other tools can always tell what version of your package is newer than another
+version.  Knowing these things will also help you correctly specify what
+versions of other projects your project depends on.
+
+A version consists of an alternating series of release numbers and pre-release
+or post-release tags.  A release number is a series of digits punctuated by
+dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
+numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
+same release number, denoting the first subrelease of release 2.  But  ``2.10``
+is the *tenth* subrelease of release 2, and so is a different and newer release
+from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
+ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
+
+Following a release number, you can have either a pre-release or post-release
+tag.  Pre-release tags make a version be considered *older* than the version
+they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
+which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
+a version be considered *newer* than the version they are appended to.  So,
+revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
+than ``2.4.1`` (which has a higher release number).
+
+A pre-release tag is a series of letters that are alphabetically before
+"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
+``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
+before the prerelease tag if it's immediately after a number, but it's okay to
+do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
+represent release candidate 1 of version ``2.4``, and are treated as identical
+by setuptools.
+
+In addition, there are three special prerelease tags that are treated as if
+they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
+``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
+``2.4c1``, and are treated as identical by setuptools.
+
+A post-release tag is either a series of letters that are alphabetically
+greater than or equal to "final", or a dash (``-``).  Post-release tags are
+generally used to separate patch numbers, port numbers, build numbers, revision
+numbers, or date stamps from the release number.  For example, the version
+``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
+version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
+post-release.
+
+Notice that after each pre or post-release tag, you are free to place another
+release number, followed again by more pre- or post-release tags.  For example,
+``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
+development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
+a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
+which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
+a post-release tag, so this version is *newer* than ``0.6a9.dev``.
+
+For the most part, setuptools' interpretation of version numbers is intuitive,
+but here are a few tips that will keep you out of trouble in the corner cases:
+
+* Don't stick adjoining pre-release tags together without a dot or number
+  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
+  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
+  ``1.9a.dev``, or separate the prerelease tags with a number, as in
+  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
+  identical versions from setuptools' point of view, so you can use whatever
+  scheme you prefer.
+
+* If you want to be certain that your chosen numbering scheme works the way
+  you think it will, you can use the ``pkg_resources.parse_version()`` function
+  to compare different version numbers::
+
+    >>> from pkg_resources import parse_version
+    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
+    True
+    >>> parse_version("2.1-rc2") < parse_version("2.1")
+    True
+    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
+    True
+
+Once you've decided on a version numbering scheme for your project, you can
+have setuptools automatically tag your in-development releases with various
+pre- or post-release tags.  See the following sections for more details:
+
+* `Tagging and "Daily Build" or "Snapshot" Releases`_
+* The `egg_info`_ command
\ No newline at end of file

From a99713c017c77c215c278ad759796cdf928c89b7 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:44:13 -0400
Subject: [PATCH 7863/8469] docs: dedicate a file for extending setuptools

---
 docs/userguide/extension.txt | 235 +++++++++++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)
 create mode 100644 docs/userguide/extension.txt

diff --git a/docs/userguide/extension.txt b/docs/userguide/extension.txt
new file mode 100644
index 0000000000..1e4846fc92
--- /dev/null
+++ b/docs/userguide/extension.txt
@@ -0,0 +1,235 @@
+Creating ``distutils`` Extensions
+=================================
+
+It can be hard to add new commands or setup arguments to the distutils.  But
+the ``setuptools`` package makes it a bit easier, by allowing you to distribute
+a distutils extension as a separate project, and then have projects that need
+the extension just refer to it in their ``setup_requires`` argument.
+
+With ``setuptools``, your distutils extension projects can hook in new
+commands and ``setup()`` arguments just by defining "entry points".  These
+are mappings from command or argument names to a specification of where to
+import a handler from.  (See the section on `Dynamic Discovery of Services and
+Plugins`_ above for some more background on entry points.)
+
+
+Adding Commands
+---------------
+
+You can add new ``setup`` commands by defining entry points in the
+``distutils.commands`` group.  For example, if you wanted to add a ``foo``
+command, you might add something like this to your distutils extension
+project's setup script::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.commands": [
+                "foo = mypackage.some_module:foo",
+            ],
+        },
+    )
+
+(Assuming, of course, that the ``foo`` class in ``mypackage.some_module`` is
+a ``setuptools.Command`` subclass.)
+
+Once a project containing such entry points has been activated on ``sys.path``,
+(e.g. by running "install" or "develop" with a site-packages installation
+directory) the command(s) will be available to any ``setuptools``-based setup
+scripts.  It is not necessary to use the ``--command-packages`` option or
+to monkeypatch the ``distutils.command`` package to install your commands;
+``setuptools`` automatically adds a wrapper to the distutils to search for
+entry points in the active distributions on ``sys.path``.  In fact, this is
+how setuptools' own commands are installed: the setuptools project's setup
+script defines entry points for them!
+
+Adding ``setup()`` Arguments
+----------------------------
+
+.. warning:: Adding arguments to setup is discouraged as such arguments
+   are only supported through imperative execution and not supported through
+   declarative config.
+
+Sometimes, your commands may need additional arguments to the ``setup()``
+call.  You can enable this by defining entry points in the
+``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
+argument called ``bar_baz``, you might add something like this to your
+distutils extension project's setup script::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.commands": [
+                "foo = mypackage.some_module:foo",
+            ],
+            "distutils.setup_keywords": [
+                "bar_baz = mypackage.some_module:validate_bar_baz",
+            ],
+        },
+    )
+
+The idea here is that the entry point defines a function that will be called
+to validate the ``setup()`` argument, if it's supplied.  The ``Distribution``
+object will have the initial value of the attribute set to ``None``, and the
+validation function will only be called if the ``setup()`` call sets it to
+a non-None value.  Here's an example validation function::
+
+    def assert_bool(dist, attr, value):
+        """Verify that value is True, False, 0, or 1"""
+        if bool(value) != value:
+            raise DistutilsSetupError(
+                "%r must be a boolean value (got %r)" % (attr,value)
+            )
+
+Your function should accept three arguments: the ``Distribution`` object,
+the attribute name, and the attribute value.  It should raise a
+``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
+is invalid.  Remember, your function will only be called with non-None values,
+and the default value of arguments defined this way is always None.  So, your
+commands should always be prepared for the possibility that the attribute will
+be ``None`` when they access it later.
+
+If more than one active distribution defines an entry point for the same
+``setup()`` argument, *all* of them will be called.  This allows multiple
+distutils extensions to define a common argument, as long as they agree on
+what values of that argument are valid.
+
+Also note that as with commands, it is not necessary to subclass or monkeypatch
+the distutils ``Distribution`` class in order to add your arguments; it is
+sufficient to define the entry points in your extension, as long as any setup
+script using your extension lists your project in its ``setup_requires``
+argument.
+
+
+Customizing Distribution Options
+--------------------------------
+
+Plugins may wish to extend or alter the options on a Distribution object to
+suit the purposes of that project. For example, a tool that infers the
+``Distribution.version`` from SCM-metadata may need to hook into the
+option finalization. To enable this feature, Setuptools offers an entry
+point "setuptools.finalize_distribution_options". That entry point must
+be a callable taking one argument (the Distribution instance).
+
+If the callable has an ``.order`` property, that value will be used to
+determine the order in which the hook is called. Lower numbers are called
+first and the default is zero (0).
+
+Plugins may read, alter, and set properties on the distribution, but each
+plugin is encouraged to load the configuration/settings for their behavior
+independently.
+
+
+Adding new EGG-INFO Files
+-------------------------
+
+Some extensible applications or frameworks may want to allow third parties to
+develop plugins with application or framework-specific metadata included in
+the plugins' EGG-INFO directory, for easy access via the ``pkg_resources``
+metadata API.  The easiest way to allow this is to create a distutils extension
+to be used from the plugin projects' setup scripts (via ``setup_requires``)
+that defines a new setup keyword, and then uses that data to write an EGG-INFO
+file when the ``egg_info`` command is run.
+
+The ``egg_info`` command looks for extension points in an ``egg_info.writers``
+group, and calls them to write the files.  Here's a simple example of a
+distutils extension defining a setup argument ``foo_bar``, which is a list of
+lines that will be written to ``foo_bar.txt`` in the EGG-INFO directory of any
+project that uses the argument::
+
+    setup(
+        # ...
+        entry_points={
+            "distutils.setup_keywords": [
+                "foo_bar = setuptools.dist:assert_string_list",
+            ],
+            "egg_info.writers": [
+                "foo_bar.txt = setuptools.command.egg_info:write_arg",
+            ],
+        },
+    )
+
+This simple example makes use of two utility functions defined by setuptools
+for its own use: a routine to validate that a setup keyword is a sequence of
+strings, and another one that looks up a setup argument and writes it to
+a file.  Here's what the writer utility looks like::
+
+    def write_arg(cmd, basename, filename):
+        argname = os.path.splitext(basename)[0]
+        value = getattr(cmd.distribution, argname, None)
+        if value is not None:
+            value = "\n".join(value) + "\n"
+        cmd.write_or_delete_file(argname, filename, value)
+
+As you can see, ``egg_info.writers`` entry points must be a function taking
+three arguments: a ``egg_info`` command instance, the basename of the file to
+write (e.g. ``foo_bar.txt``), and the actual full filename that should be
+written to.
+
+In general, writer functions should honor the command object's ``dry_run``
+setting when writing files, and use the ``distutils.log`` object to do any
+console output.  The easiest way to conform to this requirement is to use
+the ``cmd`` object's ``write_file()``, ``delete_file()``, and
+``write_or_delete_file()`` methods exclusively for your file operations.  See
+those methods' docstrings for more details.
+
+Adding Support for Revision Control Systems
+-------------------------------------------------
+
+If the files you want to include in the source distribution are tracked using
+Git, Mercurial or SVN, you can use the following packages to achieve that:
+
+- Git and Mercurial: `setuptools_scm <https://pypi.org/project/setuptools_scm/>`_
+- SVN: `setuptools_svn <https://pypi.org/project/setuptools_svn/>`_
+
+If you would like to create a plugin for ``setuptools`` to find files tracked
+by another revision control system, you can do so by adding an entry point to
+the ``setuptools.file_finders`` group.  The entry point should be a function
+accepting a single directory name, and should yield all the filenames within
+that directory (and any subdirectories thereof) that are under revision
+control.
+
+For example, if you were going to create a plugin for a revision control system
+called "foobar", you would write a function something like this:
+
+.. code-block:: python
+
+    def find_files_for_foobar(dirname):
+        # loop to yield paths that start with `dirname`
+
+And you would register it in a setup script using something like this::
+
+    entry_points={
+        "setuptools.file_finders": [
+            "foobar = my_foobar_module:find_files_for_foobar",
+        ]
+    }
+
+Then, anyone who wants to use your plugin can simply install it, and their
+local setuptools installation will be able to find the necessary files.
+
+It is not necessary to distribute source control plugins with projects that
+simply use the other source control system, or to specify the plugins in
+``setup_requires``.  When you create a source distribution with the ``sdist``
+command, setuptools automatically records what files were found in the
+``SOURCES.txt`` file.  That way, recipients of source distributions don't need
+to have revision control at all.  However, if someone is working on a package
+by checking out with that system, they will need the same plugin(s) that the
+original author is using.
+
+A few important points for writing revision control file finders:
+
+* Your finder function MUST return relative paths, created by appending to the
+  passed-in directory name.  Absolute paths are NOT allowed, nor are relative
+  paths that reference a parent directory of the passed-in directory.
+
+* Your finder function MUST accept an empty string as the directory name,
+  meaning the current directory.  You MUST NOT convert this to a dot; just
+  yield relative paths.  So, yielding a subdirectory named ``some/dir`` under
+  the current directory should NOT be rendered as ``./some/dir`` or
+  ``/somewhere/some/dir``, but *always* as simply ``some/dir``
+
+* Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
+  with the absence of needed programs (i.e., ones belonging to the revision
+  control system itself.  It *may*, however, use ``distutils.log.warn()`` to
+  inform the user of the missing program(s).
\ No newline at end of file

From f5c9ad1e228fb5751cb45171cd074c32890f9787 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 12:45:48 -0400
Subject: [PATCH 7864/8469] docs: dedicate a file for miscel functionalities

these should be properly grouped but for now I'm just
leaving them here
---
 docs/userguide/miscellaneous.txt | 1297 ------------------------------
 1 file changed, 1297 deletions(-)

diff --git a/docs/userguide/miscellaneous.txt b/docs/userguide/miscellaneous.txt
index 5946662af3..65e075cddc 100644
--- a/docs/userguide/miscellaneous.txt
+++ b/docs/userguide/miscellaneous.txt
@@ -1,589 +1,3 @@
-Using ``find_packages()``
--------------------------
-
-For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-(Twisted, PEAK, Zope, Chandler, etc.), it can be a big burden to keep the
-package list updated.  That's what ``setuptools.find_packages()`` is for.
-
-``find_packages()`` takes a source directory and two lists of package name
-patterns to exclude and include.  If omitted, the source directory defaults to
-the same
-directory as the setup script.  Some projects use a ``src`` or ``lib``
-directory as the root of their source tree, and those projects would of course
-use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir={"": "src"}`` in their
-``setup()`` arguments, but that's just a normal distutils thing.)
-
-Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
-patterns, and finds Python packages (any directory). Packages are only
-recognized if they include an ``__init__.py`` file. Finally, exclusion
-patterns are applied to remove matching packages.
-
-Inclusion and exclusion patterns are package names, optionally including
-wildcards.  For
-example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
-last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
-"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
-but it still won't exclude a top-level ``tests`` package or the children
-thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
-something like this::
-
-    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
-
-in order to cover all the bases.  Really, the exclusion patterns are intended
-to cover simpler use cases than this, like excluding a single, specified
-package and its subpackages.
-
-Regardless of the parameters, the ``find_packages()``
-function returns a list of package names suitable for use as the ``packages``
-argument to ``setup()``, and so is usually the easiest way to set that
-argument in your setup script.  Especially since it frees you from having to
-remember to modify your setup script whenever your project grows additional
-top-level packages or subpackages.
-
-``find_namespace_packages()``
------------------------------
-In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
-of ``find_packages``, which has the same function signature as
-``find_packages``, but works with `PEP 420`_ compliant implicit namespace
-packages. Here is a minimal setup script using ``find_namespace_packages``::
-
-    from setuptools import setup, find_namespace_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_namespace_packages(),
-    )
-
-
-Keep in mind that according to PEP 420, you may have to either re-organize your
-codebase a bit or define a few exclusions, as the definition of an implicit
-namespace package is quite lenient, so for a project organized like so::
-
-
-    ├── namespace
-    │   └── mypackage
-    │       ├── __init__.py
-    │       └── mod1.py
-    ├── setup.py
-    └── tests
-        └── test_mod1.py
-
-A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
-top-level package called ``tests``! One way to avoid this problem is to use the
-``include`` keyword to whitelist the packages to include, like so::
-
-    from setuptools import setup, find_namespace_packages
-
-    setup(
-        name="namespace.mypackage",
-        version="0.1",
-        packages=find_namespace_packages(include=["namespace.*"])
-    )
-
-Another option is to use the "src" layout, where all package code is placed in
-the ``src`` directory, like so::
-
-
-    ├── setup.py
-    ├── src
-    │   └── namespace
-    │       └── mypackage
-    │           ├── __init__.py
-    │           └── mod1.py
-    └── tests
-        └── test_mod1.py
-
-With this layout, the package directory is specified as ``src``, as such::
-
-    setup(name="namespace.mypackage",
-          version="0.1",
-          package_dir={"": "src"},
-          packages=find_namespace_packages(where="src"))
-
-.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
-
-Automatic Script Creation
-=========================
-
-Packaging and installing scripts can be a bit awkward with the distutils.  For
-one thing, there's no easy way to have a script's filename match local
-conventions on both Windows and POSIX platforms.  For another, you often have
-to create a separate file just for the "main" script, when your actual "main"
-is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
-option only works for actual ``.py`` files that aren't installed in a package.
-
-``setuptools`` fixes all of these problems by automatically generating scripts
-for you with the correct extension, and on Windows it will even create an
-``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
-The way to use this feature is to define "entry points" in your setup script
-that indicate what function the generated script should import and run.  For
-example, to create two console scripts called ``foo`` and ``bar``, and a GUI
-script called ``baz``, you might do something like this::
-
-    setup(
-        # other arguments here...
-        entry_points={
-            "console_scripts": [
-                "foo = my_package.some_module:main_func",
-                "bar = other_module:some_func",
-            ],
-            "gui_scripts": [
-                "baz = my_package_gui:start_func",
-            ]
-        }
-    )
-
-When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
-and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules.  The functions you specify are
-called with no arguments, and their return value is passed to
-``sys.exit()``, so you can return an errorlevel or message to print to
-stderr.
-
-On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
-created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
-``.exe`` wrappers find and execute the right version of Python to run the
-``.py`` or ``.pyw`` file.
-
-You may define as many "console script" and "gui script" entry points as you
-like, and each one can optionally specify "extras" that it depends on, that
-will be added to ``sys.path`` when the script is run.  For more information on
-"extras", see the section below on `Declaring Extras`_.  For more information
-on "entry points" in general, see the section below on `Dynamic Discovery of
-Services and Plugins`_.
-
-
-
-Declaring Dependencies
-======================
-
-``setuptools`` supports automatically installing dependencies when a package is
-installed, and including information about dependencies in Python Eggs (so that
-package management tools like pip can use the information).
-
-``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
-project's required dependencies.  This syntax consists of a project's PyPI
-name, optionally followed by a comma-separated list of "extras" in square
-brackets, optionally followed by a comma-separated list of version
-specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
-``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
-separated by whitespace, but any whitespace or nonstandard characters within a
-project name or version identifier must be replaced with ``-``.
-
-Version specifiers for a given project are internally sorted into ascending
-version order, and used to establish what ranges of versions are acceptable.
-Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
-``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
-the ranges they fall within.  A project's version is then checked for
-membership in the resulting ranges. (Note that providing conflicting conditions
-for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
-therefore produce bizarre results.)
-
-Here are some example requirement specifiers::
-
-    docutils >= 0.3
-
-    # comment lines and \ continuations are allowed in requirement strings
-    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
-        ==1.6, ==1.7  # and so are line-end comments
-
-    PEAK[FastCGI, reST]>=0.5a4
-
-    setuptools==0.5a7
-
-The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers.  If you include more than one
-requirement in a string, each requirement must begin on a new line.
-
-This has three effects:
-
-1. When your project is installed, either by using pip, ``setup.py install``,
-   or ``setup.py develop``, all of the dependencies not already installed will
-   be located (via PyPI), downloaded, built (if necessary), and installed.
-
-2. Any scripts in your project will be installed with wrappers that verify
-   the availability of the specified dependencies at runtime, and ensure that
-   the correct versions are added to ``sys.path`` (e.g. if multiple versions
-   have been installed).
-
-3. Python Egg distributions will include a metadata file listing the
-   dependencies.
-
-Note, by the way, that if you declare your dependencies in ``setup.py``, you do
-*not* need to use the ``require()`` function in your scripts or modules, as
-long as you either install the project or use ``setup.py develop`` to do
-development work on it.  (See `"Development Mode"`_ below for more details on
-using ``setup.py develop``.)
-
-Dependencies that aren't in PyPI
---------------------------------
-
-.. warning::
-    Dependency links support has been dropped by pip starting with version
-    19.0 (released 2019-01-22).
-
-If your project depends on packages that don't exist on PyPI, you may still be
-able to depend on them, as long as they are available for download as:
-
-- an egg, in the standard distutils ``sdist`` format,
-- a single ``.py`` file, or
-- a VCS repository (Subversion, Mercurial, or Git).
-
-You just need to add some URLs to the ``dependency_links`` argument to
-``setup()``.
-
-The URLs must be either:
-
-1. direct download URLs,
-2. the URLs of web pages that contain direct download links, or
-3. the repository's URL
-
-In general, it's better to link to web pages, because it is usually less
-complex to update a web page than to release a new version of your project.
-You can also use a SourceForge ``showfiles.php`` link in the case where a
-package you depend on is distributed via SourceForge.
-
-If you depend on a package that's distributed as a single ``.py`` file, you
-must include an ``"#egg=project-version"`` suffix to the URL, to give a project
-name and version number.  (Be sure to escape any dashes in the name or version
-by replacing them with underscores.)  EasyInstall will recognize this suffix
-and automatically create a trivial ``setup.py`` to wrap the single ``.py`` file
-as an egg.
-
-In the case of a VCS checkout, you should also append ``#egg=project-version``
-in order to identify for what package that checkout should be used. You can
-append ``@REV`` to the URL's path (before the fragment) to specify a revision.
-Additionally, you can also force the VCS being used by prepending the URL with
-a certain prefix. Currently available are:
-
--  ``svn+URL`` for Subversion,
--  ``git+URL`` for Git, and
--  ``hg+URL`` for Mercurial
-
-A more complete example would be:
-
-    ``vcs+proto://host/path@revision#egg=project-version``
-
-Be careful with the version. It should match the one inside the project files.
-If you want to disregard the version, you have to omit it both in the
-``requires`` and in the URL's fragment.
-
-This will do a checkout (or a clone, in Git and Mercurial parlance) to a
-temporary folder and run ``setup.py bdist_egg``.
-
-The ``dependency_links`` option takes the form of a list of URL strings.  For
-example, this will cause a search of the specified page for eggs or source
-distributions, if the package's dependencies aren't already installed::
-
-    setup(
-        ...
-        dependency_links=[
-            "http://peak.telecommunity.com/snapshots/"
-        ],
-    )
-
-
-.. _Declaring Extras:
-
-
-Declaring "Extras" (optional features with their own dependencies)
-------------------------------------------------------------------
-
-Sometimes a project has "recommended" dependencies, that are not required for
-all uses of the project.  For example, a project might offer optional PDF
-output if ReportLab is installed, and reStructuredText support if docutils is
-installed.  These optional features are called "extras", and setuptools allows
-you to define their requirements as well.  In this way, other projects that
-require these optional features can force the additional requirements to be
-installed, by naming the desired extras in their ``install_requires``.
-
-For example, let's say that Project A offers optional PDF and reST support::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require={
-            "PDF":  ["ReportLab>=1.2", "RXP"],
-            "reST": ["docutils>=0.3"],
-        }
-    )
-
-As you can see, the ``extras_require`` argument takes a dictionary mapping
-names of "extra" features, to strings or lists of strings describing those
-features' requirements.  These requirements will *not* be automatically
-installed unless another package depends on them (directly or indirectly) by
-including the desired "extras" in square brackets after the associated project
-name.  (Or if the extras were listed in a requirement spec on the "pip install"
-command line.)
-
-Extras can be used by a project's `entry points`_ to specify dynamic
-dependencies.  For example, if Project A includes a "rst2pdf" script, it might
-declare it like this, so that the "PDF" requirements are only resolved if the
-"rst2pdf" script is run::
-
-    setup(
-        name="Project-A",
-        ...
-        entry_points={
-            "console_scripts": [
-                "rst2pdf = project_a.tools.pdfgen [PDF]",
-                "rst2html = project_a.tools.htmlgen",
-                # more script entry points ...
-            ],
-        }
-    )
-
-Projects can also use another project's extras when specifying dependencies.
-For example, if project B needs "project A" with PDF support installed, it
-might declare the dependency like this::
-
-    setup(
-        name="Project-B",
-        install_requires=["Project-A[PDF]"],
-        ...
-    )
-
-This will cause ReportLab to be installed along with project A, if project B is
-installed -- even if project A was already installed.  In this way, a project
-can encapsulate groups of optional "downstream dependencies" under a feature
-name, so that packages that depend on it don't have to know what the downstream
-dependencies are.  If a later version of Project A builds in PDF support and
-no longer needs ReportLab, or if it ends up needing other dependencies besides
-ReportLab in order to provide PDF support, Project B's setup information does
-not need to change, but the right packages will still be installed if needed.
-
-Note, by the way, that if a project ends up not needing any other packages to
-support a feature, it should keep an empty requirements list for that feature
-in its ``extras_require`` argument, so that packages depending on that feature
-don't break (due to an invalid feature name).  For example, if Project A above
-builds in PDF support and no longer needs ReportLab, it could change its
-setup to this::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require={
-            "PDF":  [],
-            "reST": ["docutils>=0.3"],
-        }
-    )
-
-so that Package B doesn't have to remove the ``[PDF]`` from its requirement
-specifier.
-
-.. _Platform Specific Dependencies:
-
-
-Declaring platform specific dependencies
-----------------------------------------
-
-Sometimes a project might require a dependency to run on a specific platform.
-This could to a package that back ports a module so that it can be used in
-older python versions.  Or it could be a package that is required to run on a
-specific operating system.  This will allow a project to work on multiple
-different platforms without installing dependencies that are not required for
-a platform that is installing the project.
-
-For example, here is a project that uses the ``enum`` module and ``pywin32``::
-
-    setup(
-        name="Project",
-        ...
-        install_requires=[
-            "enum34;python_version<'3.4'",
-            "pywin32 >= 1.0;platform_system=='Windows'"
-        ]
-    )
-
-Since the ``enum`` module was added in Python 3.4, it should only be installed
-if the python version is earlier.  Since ``pywin32`` will only be used on
-windows, it should only be installed when the operating system is Windows.
-Specifying version requirements for the dependencies is supported as normal.
-
-The environmental markers that may be used for testing platform types are
-detailed in `PEP 508`_.
-
-.. _PEP 508: https://www.python.org/dev/peps/pep-0508/
-
-Including Data Files
-====================
-
-The distutils have traditionally allowed installation of "data files", which
-are placed in a platform-specific location.  However, the most common use case
-for data files distributed with a package is for use *by* the package, usually
-by including the data files in the package directory.
-
-Setuptools offers three ways to specify data files to be included in your
-packages.  First, you can simply use the ``include_package_data`` keyword,
-e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        include_package_data=True
-    )
-
-This tells setuptools to install any data files it finds in your packages.
-The data files must be specified via the distutils' ``MANIFEST.in`` file.
-(They can also be tracked by a revision control system, using an appropriate
-plugin.  See the section below on `Adding Support for Revision Control
-Systems`_ for information on how to write such plugins.)
-
-If you want finer-grained control over what files are included (for example,
-if you have documentation files in your package directories and want to exclude
-them from installation), then you can also use the ``package_data`` keyword,
-e.g.::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        package_data={
-            # If any package contains *.txt or *.rst files, include them:
-            "": ["*.txt", "*.rst"],
-            # And include any *.msg files found in the "hello" package, too:
-            "hello": ["*.msg"],
-        }
-    )
-
-The ``package_data`` argument is a dictionary that maps from package names to
-lists of glob patterns.  The globs may include subdirectory names, if the data
-files are contained in a subdirectory of the package.  For example, if the
-package tree looks like this::
-
-    setup.py
-    src/
-        mypkg/
-            __init__.py
-            mypkg.txt
-            data/
-                somefile.dat
-                otherdata.dat
-
-The setuptools setup file might look like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages=find_packages("src"),  # include all packages under src
-        package_dir={"": "src"},   # tell distutils packages are under src
-
-        package_data={
-            # If any package contains *.txt files, include them:
-            "": ["*.txt"],
-            # And include any *.dat files found in the "data" subdirectory
-            # of the "mypkg" package, also:
-            "mypkg": ["data/*.dat"],
-        }
-    )
-
-Notice that if you list patterns in ``package_data`` under the empty string,
-these patterns are used to find files in every package, even ones that also
-have their own patterns listed.  Thus, in the above example, the ``mypkg.txt``
-file gets included even though it's not listed in the patterns for ``mypkg``.
-
-Also notice that if you use paths, you *must* use a forward slash (``/``) as
-the path separator, even if you are on Windows.  Setuptools automatically
-converts slashes to appropriate platform-specific separators at build time.
-
-If datafiles are contained in a subdirectory of a package that isn't a package
-itself (no ``__init__.py``), then the subdirectory names (or ``*``) are required
-in the ``package_data`` argument (as shown above with ``"data/*.dat"``).
-
-When building an ``sdist``, the datafiles are also drawn from the
-``package_name.egg-info/SOURCES.txt`` file, so make sure that this is removed if
-the ``setup.py`` ``package_data`` list is updated before calling ``setup.py``.
-
-(Note: although the ``package_data`` argument was previously only available in
-``setuptools``, it was also added to the Python ``distutils`` package as of
-Python 2.4; there is `some documentation for the feature`__ available on the
-python.org website.  If using the setuptools-specific ``include_package_data``
-argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are listed in the MANIFEST.in file.)
-
-__ https://docs.python.org/3/distutils/setupscript.html#installing-package-data
-
-Sometimes, the ``include_package_data`` or ``package_data`` options alone
-aren't sufficient to precisely define what files you want included.  For
-example, you may want to include package README files in your revision control
-system and source distributions, but exclude them from being installed.  So,
-setuptools offers an ``exclude_package_data`` option as well, that allows you
-to do things like this::
-
-    from setuptools import setup, find_packages
-    setup(
-        ...
-        packages=find_packages("src"),  # include all packages under src
-        package_dir={"": "src"},   # tell distutils packages are under src
-
-        include_package_data=True,    # include everything in source control
-
-        # ...but exclude README.txt from all packages
-        exclude_package_data={"": ["README.txt"]},
-    )
-
-The ``exclude_package_data`` option is a dictionary mapping package names to
-lists of wildcard patterns, just like the ``package_data`` option.  And, just
-as with that option, a key of ``""`` will apply the given pattern(s) to all
-packages.  However, any files that match these patterns will be *excluded*
-from installation, even if they were listed in ``package_data`` or were
-included as a result of using ``include_package_data``.
-
-In summary, the three options allow you to:
-
-``include_package_data``
-    Accept all data files and directories matched by ``MANIFEST.in``.
-
-``package_data``
-    Specify additional patterns to match files that may or may
-    not be matched by ``MANIFEST.in`` or found in source control.
-
-``exclude_package_data``
-    Specify patterns for data files and directories that should *not* be
-    included when a package is installed, even if they would otherwise have
-    been included due to the use of the preceding options.
-
-NOTE: Due to the way the distutils build process works, a data file that you
-include in your project and then stop including may be "orphaned" in your
-project's build directories, requiring you to run ``setup.py clean --all`` to
-fully remove them.  This may also be important for your users and contributors
-if they track intermediate revisions of your project using Subversion; be sure
-to let them know when you make changes that remove files from inclusion so they
-can run ``setup.py clean --all``.
-
-Accessing Data Files at Runtime
--------------------------------
-
-Typically, existing programs manipulate a package's ``__file__`` attribute in
-order to find the location of data files.  However, this manipulation isn't
-compatible with PEP 302-based import hooks, including importing from zip files
-and Python Eggs.  It is strongly recommended that, if you are using data files,
-you should use the :ref:`ResourceManager API` of ``pkg_resources`` to access
-them.  The ``pkg_resources`` module is distributed as part of setuptools, so if
-you're using setuptools to distribute your package, there is no reason not to
-use its resource management API.  See also `Importlib Resources`_ for
-a quick example of converting code that uses ``__file__`` to use
-``pkg_resources`` instead.
-
-.. _Importlib Resources: https://docs.python.org/3/library/importlib.html#module-importlib.resources
-
-
-Non-Package Data Files
-----------------------
-
-Historically, ``setuptools`` by way of ``easy_install`` would encapsulate data
-files from the distribution into the egg (see `the old docs
-<https://github.com/pypa/setuptools/blob/52aacd5b276fedd6849c3a648a0014f5da563e93/docs/setuptools.txt#L970-L1001>`_). As eggs are deprecated and pip-based installs
-fall back to the platform-specific location for installing data files, there is
-no supported facility to reliably retrieve these resources.
-
-Instead, the PyPA recommends that any data files you wish to be accessible at
-run time be included in the package.
-
-
 Automatic Resource Extraction
 -----------------------------
 
@@ -621,76 +35,6 @@ files, or Python plus C, you really don't need this.  You've got to be using
 either C or an external program that needs "real" files in your project before
 there's any possibility of ``eager_resources`` being relevant to your project.
 
-
-Extensible Applications and Frameworks
-======================================
-
-
-.. _Entry Points:
-
-Dynamic Discovery of Services and Plugins
------------------------------------------
-
-``setuptools`` supports creating libraries that "plug in" to extensible
-applications and frameworks, by letting you register "entry points" in your
-project that can be imported by the application or framework.
-
-For example, suppose that a blogging tool wants to support plugins
-that provide translation for various file types to the blog's output format.
-The framework might define an "entry point group" called ``blogtool.parsers``,
-and then allow plugins to register entry points for the file extensions they
-support.
-
-This would allow people to create distributions that contain one or more
-parsers for different file types, and then the blogging tool would be able to
-find the parsers at runtime by looking up an entry point for the file
-extension (or mime type, or however it wants to).
-
-Note that if the blogging tool includes parsers for certain file formats, it
-can register these as entry points in its own setup script, which means it
-doesn't have to special-case its built-in formats.  They can just be treated
-the same as any other plugin's entry points would be.
-
-If you're creating a project that plugs in to an existing application or
-framework, you'll need to know what entry points or entry point groups are
-defined by that application or framework.  Then, you can register entry points
-in your setup script.  Here are a few examples of ways you might register an
-``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
-for our hypothetical blogging tool::
-
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
-    )
-
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
-    )
-
-    setup(
-        # ...
-        entry_points="""
-            [blogtool.parsers]
-            .rst = some.nested.module:SomeClass.some_classmethod [reST]
-        """,
-        extras_require=dict(reST="Docutils>=0.3.5")
-    )
-
-The ``entry_points`` argument to ``setup()`` accepts either a string with
-``.ini``-style sections, or a dictionary mapping entry point group names to
-either strings or lists of strings containing entry point specifiers.  An
-entry point specifier consists of a name and value, separated by an ``=``
-sign.  The value consists of a dotted module name, optionally followed by a
-``:`` and a dotted identifier naming an object within the module.  It can
-also include a bracketed list of "extras" that are required for the entry
-point to be used.  When the invoking application or framework requests loading
-of an entry point, any requirements implied by the associated extras will be
-passed to ``pkg_resources.require()``, so that an appropriate error message
-can be displayed if the needed package(s) are missing.  (Of course, the
-invoking app or framework can ignore such errors if it wants to make an entry
-point optional if a requirement isn't installed.)
-
 Defining Additional Metadata
 ----------------------------
 
@@ -705,107 +49,6 @@ for many of the ``setup()`` arguments it adds.  See the section below on
 `Creating distutils Extensions`_ for more details, especially the subsection on
 `Adding new EGG-INFO Files`_.
 
-
-"Development Mode"
-==================
-
-Under normal circumstances, the ``distutils`` assume that you are going to
-build a distribution of your project, not use it in its "raw" or "unbuilt"
-form.  If you were to use the ``distutils`` that way, you would have to rebuild
-and reinstall your project every time you made a change to it during
-development.
-
-Another problem that sometimes comes up with the ``distutils`` is that you may
-need to do development on two related projects at the same time.  You may need
-to put both projects' packages in the same directory to run them, but need to
-keep them separate for revision control purposes.  How can you do this?
-
-Setuptools allows you to deploy your projects for use in a common directory or
-staging area, but without copying any files.  Thus, you can edit each project's
-code in its checkout directory, and only need to run build commands when you
-change a project's C extensions or similarly compiled files.  You can even
-deploy a project into another project's checkout directory, if that's your
-preferred way of working (as opposed to using a common independent staging area
-or the site-packages directory).
-
-To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install``, except that it doesn't actually install anything.
-Instead, it creates a special ``.egg-link`` file in the deployment directory,
-that links to your project's source code.  And, if your deployment directory is
-Python's ``site-packages`` directory, it will also update the
-``easy-install.pth`` file to include your project's source code, thereby making
-it available on ``sys.path`` for all programs using that Python installation.
-
-If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
-will not link directly to your source code when run under Python 3, since
-that source code would be made for Python 2 and not work under Python 3.
-Instead the ``setup.py develop`` will build Python 3 code under the ``build``
-directory, and link there. This means that after doing code changes you will
-have to run ``setup.py build`` before these changes are picked up by your
-Python 3 installation.
-
-In addition, the ``develop`` command creates wrapper scripts in the target
-script directory that will run your in-development scripts after ensuring that
-all your ``install_requires`` packages are available on ``sys.path``.
-
-You can deploy the same project to multiple staging areas, e.g. if you have
-multiple projects on the same machine that are sharing the same project you're
-doing development work.
-
-When you're done with a given development task, you can remove the project
-source from a staging area using ``setup.py develop --uninstall``, specifying
-the desired staging area if it's not the default.
-
-There are several options to control the precise behavior of the ``develop``
-command; see the section on the `develop`_ command below for more details.
-
-Note that you can also apply setuptools commands to non-setuptools projects,
-using commands like this::
-
-   python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
-
-That is, you can simply list the normal setup commands and options following
-the quoted part.
-
-
-Distributing a ``setuptools``-based project
-===========================================
-
-Detailed instructions to distribute a setuptools project can be found at
-`Packaging project tutorials`_.
-
-.. _Packaging project tutorials: https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives
-
-Before you begin, make sure you have the latest versions of setuptools and wheel::
-
-    pip install --upgrade setuptools wheel
-
-To build a setuptools project, run this command from the same directory where
-setup.py is located::
-
-    setup.py sdist bdist_wheel
-
-This will generate distribution archives in the `dist` directory.
-
-Before you upload the generated archives make sure you're registered on
-https://test.pypi.org/account/register/. You will also need to verify your email
-to be able to upload any packages.
-You should install twine to be able to upload packages::
-
-    pip install --upgrade twine
-
-Now, to upload these archives, run::
-
-    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-
-To install your newly uploaded package ``example_pkg``,  you can use pip::
-
-    pip install --index-url https://test.pypi.org/simple/ example_pkg
-
-If you have issues at any point, please refer to `Packaging project tutorials`_
-for clarification.
-
-
 Setting the ``zip_safe`` flag
 -----------------------------
 
@@ -849,543 +92,3 @@ correctly when installed as a zipfile, correct any problems if you can, and
 then make an explicit declaration of ``True`` or ``False`` for the ``zip_safe``
 flag, so that it will not be necessary for ``bdist_egg`` to try to guess
 whether your project can work as a zipfile.
-
-.. _Namespace Packages:
-
-Namespace Packages
-------------------
-
-Sometimes, a large package is more useful if distributed as a collection of
-smaller eggs.  However, Python does not normally allow the contents of a
-package to be retrieved from more than one location.  "Namespace packages"
-are a solution for this problem.  When you declare a package to be a namespace
-package, it means that the package has no meaningful contents in its
-``__init__.py``, and that it is merely a container for modules and subpackages.
-
-The ``pkg_resources`` runtime will then automatically ensure that the contents
-of namespace packages that are spread over multiple eggs or directories are
-combined into a single "virtual" package.
-
-The ``namespace_packages`` argument to ``setup()`` lets you declare your
-project's namespace packages, so that they will be included in your project's
-metadata.  The argument should list the namespace packages that the egg
-participates in.  For example, the ZopeInterface project might do this::
-
-    setup(
-        # ...
-        namespace_packages=["zope"]
-    )
-
-because it contains a ``zope.interface`` package that lives in the ``zope``
-namespace package.  Similarly, a project for a standalone ``zope.publisher``
-would also declare the ``zope`` namespace package.  When these projects are
-installed and used, Python will see them both as part of a "virtual" ``zope``
-package, even though they will be installed in different locations.
-
-Namespace packages don't have to be top-level packages.  For example, Zope 3's
-``zope.app`` package is a namespace package, and in the future PEAK's
-``peak.util`` package will be too.
-
-Note, by the way, that your project's source tree must include the namespace
-packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
-packages), in a normal Python package layout.  These ``__init__.py`` files
-*must* contain the line::
-
-    __import__("pkg_resources").declare_namespace(__name__)
-
-This code ensures that the namespace package machinery is operating and that
-the current package is registered as a namespace package.
-
-You must NOT include any other code and data in a namespace package's
-``__init__.py``.  Even though it may appear to work during development, or when
-projects are installed as ``.egg`` files, it will not work when the projects
-are installed using "system" packaging tools -- in such cases the
-``__init__.py`` files will not be installed, let alone executed.
-
-You must include the ``declare_namespace()``  line in the ``__init__.py`` of
-*every* project that has contents for the namespace package in question, in
-order to ensure that the namespace will be declared regardless of which
-project's copy of ``__init__.py`` is loaded first.  If the first loaded
-``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!
-
-Tagging and "Daily Build" or "Snapshot" Releases
-------------------------------------------------
-
-When a set of related projects are under development, it may be important to
-track finer-grained version increments than you would normally use for e.g.
-"stable" releases.  While stable releases might be measured in dotted numbers
-with alpha/beta/etc. status codes, development versions of a project often
-need to be tracked by revision or build number or even build date.  This is
-especially true when projects in development need to refer to one another, and
-therefore may literally need an up-to-the-minute version of something!
-
-To support these scenarios, ``setuptools`` allows you to "tag" your source and
-egg distributions by adding one or more of the following to the project's
-"official" version identifier:
-
-* A manually-specified pre-release tag, such as "build" or "dev", or a
-  manually-specified post-release tag, such as a build or revision number
-  (``--tag-build=STRING, -bSTRING``)
-
-* An 8-character representation of the build date (``--tag-date, -d``), as
-  a postrelease tag
-
-You can add these tags by adding ``egg_info`` and the desired options to
-the command line ahead of the ``sdist`` or ``bdist`` commands that you want
-to generate a daily build or snapshot for.  See the section below on the
-`egg_info`_ command for more details.
-
-(Also, before you release your project, be sure to see the section above on
-`Specifying Your Project's Version`_ for more information about how pre- and
-post-release tags affect how version numbers are interpreted.  This is
-important in order to make sure that dependency processing tools will know
-which versions of your project are newer than others.)
-
-Finally, if you are creating builds frequently, and either building them in a
-downloadable location or are copying them to a distribution server, you should
-probably also check out the `rotate`_ command, which lets you automatically
-delete all but the N most-recently-modified distributions matching a glob
-pattern.  So, you can use a command line like::
-
-    setup.py egg_info -rbDEV bdist_egg rotate -m.egg -k3
-
-to build an egg whose version info includes "DEV-rNNNN" (where NNNN is the
-most recent Subversion revision that affected the source tree), and then
-delete any egg files from the distribution directory except for the three
-that were built most recently.
-
-If you have to manage automated builds for multiple packages, each with
-different tagging and rotation policies, you may also want to check out the
-`alias`_ command, which would let each package define an alias like ``daily``
-that would perform the necessary tag, build, and rotate commands.  Then, a
-simpler script or cron job could just run ``setup.py daily`` in each project
-directory.  (And, you could also define sitewide or per-user default versions
-of the ``daily`` alias, so that projects that didn't define their own would
-use the appropriate defaults.)
-
-Generating Source Distributions
--------------------------------
-
-``setuptools`` enhances the distutils' default algorithm for source file
-selection with pluggable endpoints for looking up files to include. If you are
-using a revision control system, and your source distributions only need to
-include files that you're tracking in revision control, use a corresponding
-plugin instead of writing a ``MANIFEST.in`` file. See the section below on
-`Adding Support for Revision Control Systems`_ for information on plugins.
-
-If you need to include automatically generated files, or files that are kept in
-an unsupported revision control system, you'll need to create a ``MANIFEST.in``
-file to specify any files that the default file location algorithm doesn't
-catch.  See the distutils documentation for more information on the format of
-the ``MANIFEST.in`` file.
-
-But, be sure to ignore any part of the distutils documentation that deals with
-``MANIFEST`` or how it's generated from ``MANIFEST.in``; setuptools shields you
-from these issues and doesn't work the same way in any case.  Unlike the
-distutils, setuptools regenerates the source distribution manifest file
-every time you build a source distribution, and it builds it inside the
-project's ``.egg-info`` directory, out of the way of your main project
-directory.  You therefore need not worry about whether it is up-to-date or not.
-
-Indeed, because setuptools' approach to determining the contents of a source
-distribution is so much simpler, its ``sdist`` command omits nearly all of
-the options that the distutils' more complex ``sdist`` process requires.  For
-all practical purposes, you'll probably use only the ``--formats`` option, if
-you use any option at all.
-
-
-Making "Official" (Non-Snapshot) Releases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When you make an official release, creating source or binary distributions,
-you will need to override the tag settings from ``setup.cfg``, so that you
-don't end up registering versions like ``foobar-0.7a1.dev-r34832``.  This is
-easy to do if you are developing on the trunk and using tags or branches for
-your releases - just make the change to ``setup.cfg`` after branching or
-tagging the release, so the trunk will still produce development snapshots.
-
-Alternately, if you are not branching for releases, you can override the
-default version options on the command line, using something like::
-
-    setup.py egg_info -Db "" sdist bdist_egg
-
-The first part of this command (``egg_info -Db ""``) will override the
-configured tag information, before creating source and binary eggs. Thus, these
-commands will use the plain version from your ``setup.py``, without adding the
-build designation string.
-
-Of course, if you will be doing this a lot, you may wish to create a personal
-alias for this operation, e.g.::
-
-    setup.py alias -u release egg_info -Db ""
-
-You can then use it like this::
-
-    setup.py release sdist bdist_egg
-
-Or of course you can create more elaborate aliases that do all of the above.
-See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
-
-Distributing Extensions compiled with Cython
---------------------------------------------
-
-``setuptools`` will detect at build time whether Cython is installed or not.
-If Cython is not found ``setuptools`` will ignore pyx files.
-
-To ensure Cython is available, include Cython in the build-requires section
-of your pyproject.toml::
-
-    [build-system]
-    requires=[..., "cython"]
-
-Built with pip 10 or later, that declaration is sufficient to include Cython
-in the build. For broader compatibility, declare the dependency in your
-setup-requires of setup.cfg::
-
-    [options]
-    setup_requires =
-        ...
-        cython
-
-As long as Cython is present in the build environment, ``setuptools`` includes
-transparent support for building Cython extensions, as
-long as extensions are defined using ``setuptools.Extension``.
-
-If you follow these rules, you can safely list ``.pyx`` files as the source
-of your ``Extension`` objects in the setup script.  If it is, then ``setuptools``
-will use it.
-
-Of course, for this to work, your source distributions must include the C
-code generated by Cython, as well as your original ``.pyx`` files.  This means
-that you will probably want to include current ``.c`` files in your revision
-control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files.  This will ensure that people tracking your project in a revision
-control system will be able to build it even if they don't have Cython
-installed, and that your source releases will be similarly usable with or
-without Cython.
-
---------------------------------
-Extending and Reusing Setuptools
---------------------------------
-
-Creating ``distutils`` Extensions
-=================================
-
-It can be hard to add new commands or setup arguments to the distutils.  But
-the ``setuptools`` package makes it a bit easier, by allowing you to distribute
-a distutils extension as a separate project, and then have projects that need
-the extension just refer to it in their ``setup_requires`` argument.
-
-With ``setuptools``, your distutils extension projects can hook in new
-commands and ``setup()`` arguments just by defining "entry points".  These
-are mappings from command or argument names to a specification of where to
-import a handler from.  (See the section on `Dynamic Discovery of Services and
-Plugins`_ above for some more background on entry points.)
-
-
-Adding Commands
----------------
-
-You can add new ``setup`` commands by defining entry points in the
-``distutils.commands`` group.  For example, if you wanted to add a ``foo``
-command, you might add something like this to your distutils extension
-project's setup script::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-        },
-    )
-
-(Assuming, of course, that the ``foo`` class in ``mypackage.some_module`` is
-a ``setuptools.Command`` subclass.)
-
-Once a project containing such entry points has been activated on ``sys.path``,
-(e.g. by running "install" or "develop" with a site-packages installation
-directory) the command(s) will be available to any ``setuptools``-based setup
-scripts.  It is not necessary to use the ``--command-packages`` option or
-to monkeypatch the ``distutils.command`` package to install your commands;
-``setuptools`` automatically adds a wrapper to the distutils to search for
-entry points in the active distributions on ``sys.path``.  In fact, this is
-how setuptools' own commands are installed: the setuptools project's setup
-script defines entry points for them!
-
-Adding ``setup()`` Arguments
-----------------------------
-
-.. warning:: Adding arguments to setup is discouraged as such arguments
-   are only supported through imperative execution and not supported through
-   declarative config.
-
-Sometimes, your commands may need additional arguments to the ``setup()``
-call.  You can enable this by defining entry points in the
-``distutils.setup_keywords`` group.  For example, if you wanted a ``setup()``
-argument called ``bar_baz``, you might add something like this to your
-distutils extension project's setup script::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.commands": [
-                "foo = mypackage.some_module:foo",
-            ],
-            "distutils.setup_keywords": [
-                "bar_baz = mypackage.some_module:validate_bar_baz",
-            ],
-        },
-    )
-
-The idea here is that the entry point defines a function that will be called
-to validate the ``setup()`` argument, if it's supplied.  The ``Distribution``
-object will have the initial value of the attribute set to ``None``, and the
-validation function will only be called if the ``setup()`` call sets it to
-a non-None value.  Here's an example validation function::
-
-    def assert_bool(dist, attr, value):
-        """Verify that value is True, False, 0, or 1"""
-        if bool(value) != value:
-            raise DistutilsSetupError(
-                "%r must be a boolean value (got %r)" % (attr,value)
-            )
-
-Your function should accept three arguments: the ``Distribution`` object,
-the attribute name, and the attribute value.  It should raise a
-``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument
-is invalid.  Remember, your function will only be called with non-None values,
-and the default value of arguments defined this way is always None.  So, your
-commands should always be prepared for the possibility that the attribute will
-be ``None`` when they access it later.
-
-If more than one active distribution defines an entry point for the same
-``setup()`` argument, *all* of them will be called.  This allows multiple
-distutils extensions to define a common argument, as long as they agree on
-what values of that argument are valid.
-
-Also note that as with commands, it is not necessary to subclass or monkeypatch
-the distutils ``Distribution`` class in order to add your arguments; it is
-sufficient to define the entry points in your extension, as long as any setup
-script using your extension lists your project in its ``setup_requires``
-argument.
-
-
-Customizing Distribution Options
---------------------------------
-
-Plugins may wish to extend or alter the options on a Distribution object to
-suit the purposes of that project. For example, a tool that infers the
-``Distribution.version`` from SCM-metadata may need to hook into the
-option finalization. To enable this feature, Setuptools offers an entry
-point "setuptools.finalize_distribution_options". That entry point must
-be a callable taking one argument (the Distribution instance).
-
-If the callable has an ``.order`` property, that value will be used to
-determine the order in which the hook is called. Lower numbers are called
-first and the default is zero (0).
-
-Plugins may read, alter, and set properties on the distribution, but each
-plugin is encouraged to load the configuration/settings for their behavior
-independently.
-
-
-Adding new EGG-INFO Files
--------------------------
-
-Some extensible applications or frameworks may want to allow third parties to
-develop plugins with application or framework-specific metadata included in
-the plugins' EGG-INFO directory, for easy access via the ``pkg_resources``
-metadata API.  The easiest way to allow this is to create a distutils extension
-to be used from the plugin projects' setup scripts (via ``setup_requires``)
-that defines a new setup keyword, and then uses that data to write an EGG-INFO
-file when the ``egg_info`` command is run.
-
-The ``egg_info`` command looks for extension points in an ``egg_info.writers``
-group, and calls them to write the files.  Here's a simple example of a
-distutils extension defining a setup argument ``foo_bar``, which is a list of
-lines that will be written to ``foo_bar.txt`` in the EGG-INFO directory of any
-project that uses the argument::
-
-    setup(
-        # ...
-        entry_points={
-            "distutils.setup_keywords": [
-                "foo_bar = setuptools.dist:assert_string_list",
-            ],
-            "egg_info.writers": [
-                "foo_bar.txt = setuptools.command.egg_info:write_arg",
-            ],
-        },
-    )
-
-This simple example makes use of two utility functions defined by setuptools
-for its own use: a routine to validate that a setup keyword is a sequence of
-strings, and another one that looks up a setup argument and writes it to
-a file.  Here's what the writer utility looks like::
-
-    def write_arg(cmd, basename, filename):
-        argname = os.path.splitext(basename)[0]
-        value = getattr(cmd.distribution, argname, None)
-        if value is not None:
-            value = "\n".join(value) + "\n"
-        cmd.write_or_delete_file(argname, filename, value)
-
-As you can see, ``egg_info.writers`` entry points must be a function taking
-three arguments: a ``egg_info`` command instance, the basename of the file to
-write (e.g. ``foo_bar.txt``), and the actual full filename that should be
-written to.
-
-In general, writer functions should honor the command object's ``dry_run``
-setting when writing files, and use the ``distutils.log`` object to do any
-console output.  The easiest way to conform to this requirement is to use
-the ``cmd`` object's ``write_file()``, ``delete_file()``, and
-``write_or_delete_file()`` methods exclusively for your file operations.  See
-those methods' docstrings for more details.
-
-Adding Support for Revision Control Systems
--------------------------------------------------
-
-If the files you want to include in the source distribution are tracked using
-Git, Mercurial or SVN, you can use the following packages to achieve that:
-
-- Git and Mercurial: `setuptools_scm <https://pypi.org/project/setuptools_scm/>`_
-- SVN: `setuptools_svn <https://pypi.org/project/setuptools_svn/>`_
-
-If you would like to create a plugin for ``setuptools`` to find files tracked
-by another revision control system, you can do so by adding an entry point to
-the ``setuptools.file_finders`` group.  The entry point should be a function
-accepting a single directory name, and should yield all the filenames within
-that directory (and any subdirectories thereof) that are under revision
-control.
-
-For example, if you were going to create a plugin for a revision control system
-called "foobar", you would write a function something like this:
-
-.. code-block:: python
-
-    def find_files_for_foobar(dirname):
-        # loop to yield paths that start with `dirname`
-
-And you would register it in a setup script using something like this::
-
-    entry_points={
-        "setuptools.file_finders": [
-            "foobar = my_foobar_module:find_files_for_foobar",
-        ]
-    }
-
-Then, anyone who wants to use your plugin can simply install it, and their
-local setuptools installation will be able to find the necessary files.
-
-It is not necessary to distribute source control plugins with projects that
-simply use the other source control system, or to specify the plugins in
-``setup_requires``.  When you create a source distribution with the ``sdist``
-command, setuptools automatically records what files were found in the
-``SOURCES.txt`` file.  That way, recipients of source distributions don't need
-to have revision control at all.  However, if someone is working on a package
-by checking out with that system, they will need the same plugin(s) that the
-original author is using.
-
-A few important points for writing revision control file finders:
-
-* Your finder function MUST return relative paths, created by appending to the
-  passed-in directory name.  Absolute paths are NOT allowed, nor are relative
-  paths that reference a parent directory of the passed-in directory.
-
-* Your finder function MUST accept an empty string as the directory name,
-  meaning the current directory.  You MUST NOT convert this to a dot; just
-  yield relative paths.  So, yielding a subdirectory named ``some/dir`` under
-  the current directory should NOT be rendered as ``./some/dir`` or
-  ``/somewhere/some/dir``, but *always* as simply ``some/dir``
-
-* Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
-  with the absence of needed programs (i.e., ones belonging to the revision
-  control system itself.  It *may*, however, use ``distutils.log.warn()`` to
-  inform the user of the missing program(s).
-
-Specifying Your Project's Version
----------------------------------
-
-Setuptools can work well with most versioning schemes; there are, however, a
-few special things to watch out for, in order to ensure that setuptools and
-other tools can always tell what version of your package is newer than another
-version.  Knowing these things will also help you correctly specify what
-versions of other projects your project depends on.
-
-A version consists of an alternating series of release numbers and pre-release
-or post-release tags.  A release number is a series of digits punctuated by
-dots, such as ``2.4`` or ``0.5``.  Each series of digits is treated
-numerically, so releases ``2.1`` and ``2.1.0`` are different ways to spell the
-same release number, denoting the first subrelease of release 2.  But  ``2.10``
-is the *tenth* subrelease of release 2, and so is a different and newer release
-from ``2.1`` or ``2.1.0``.  Leading zeros within a series of digits are also
-ignored, so ``2.01`` is the same as ``2.1``, and different from ``2.0.1``.
-
-Following a release number, you can have either a pre-release or post-release
-tag.  Pre-release tags make a version be considered *older* than the version
-they are appended to.  So, revision ``2.4`` is *newer* than revision ``2.4c1``,
-which in turn is newer than ``2.4b1`` or ``2.4a1``.  Postrelease tags make
-a version be considered *newer* than the version they are appended to.  So,
-revisions like ``2.4-1`` and ``2.4pl3`` are newer than ``2.4``, but are *older*
-than ``2.4.1`` (which has a higher release number).
-
-A pre-release tag is a series of letters that are alphabetically before
-"final".  Some examples of prerelease tags would include ``alpha``, ``beta``,
-``a``, ``c``, ``dev``, and so on.  You do not have to place a dot or dash
-before the prerelease tag if it's immediately after a number, but it's okay to
-do so if you prefer.  Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
-represent release candidate 1 of version ``2.4``, and are treated as identical
-by setuptools.
-
-In addition, there are three special prerelease tags that are treated as if
-they were the letter ``c``: ``pre``, ``preview``, and ``rc``.  So, version
-``2.4rc1``, ``2.4pre1`` and ``2.4preview1`` are all the exact same version as
-``2.4c1``, and are treated as identical by setuptools.
-
-A post-release tag is either a series of letters that are alphabetically
-greater than or equal to "final", or a dash (``-``).  Post-release tags are
-generally used to separate patch numbers, port numbers, build numbers, revision
-numbers, or date stamps from the release number.  For example, the version
-``2.4-r1263`` might denote Subversion revision 1263 of a post-release patch of
-version ``2.4``.  Or you might use ``2.4-20051127`` to denote a date-stamped
-post-release.
-
-Notice that after each pre or post-release tag, you are free to place another
-release number, followed again by more pre- or post-release tags.  For example,
-``0.6a9.dev-r41475`` could denote Subversion revision 41475 of the in-
-development version of the ninth alpha of release 0.6.  Notice that ``dev`` is
-a pre-release tag, so this version is a *lower* version number than ``0.6a9``,
-which would be the actual ninth alpha of release 0.6.  But the ``-r41475`` is
-a post-release tag, so this version is *newer* than ``0.6a9.dev``.
-
-For the most part, setuptools' interpretation of version numbers is intuitive,
-but here are a few tips that will keep you out of trouble in the corner cases:
-
-* Don't stick adjoining pre-release tags together without a dot or number
-  between them.  Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
-  *not* a development pre-release of ``1.9a``.  Use ``.dev`` instead, as in
-  ``1.9a.dev``, or separate the prerelease tags with a number, as in
-  ``1.9a0dev``.  ``1.9a.dev``, ``1.9a0dev``, and even ``1.9.a.dev`` are
-  identical versions from setuptools' point of view, so you can use whatever
-  scheme you prefer.
-
-* If you want to be certain that your chosen numbering scheme works the way
-  you think it will, you can use the ``pkg_resources.parse_version()`` function
-  to compare different version numbers::
-
-    >>> from pkg_resources import parse_version
-    >>> parse_version("1.9.a.dev") == parse_version("1.9a0dev")
-    True
-    >>> parse_version("2.1-rc2") < parse_version("2.1")
-    True
-    >>> parse_version("0.6a9dev-r41475") < parse_version("0.6a9")
-    True
-
-Once you've decided on a version numbering scheme for your project, you can
-have setuptools automatically tag your in-development releases with various
-pre- or post-release tags.  See the following sections for more details:
-
-* `Tagging and "Daily Build" or "Snapshot" Releases`_
-* The `egg_info`_ command
\ No newline at end of file

From 30db7409983e3ec81bee1d4b352ecfdc8089a31d Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 14 May 2020 13:25:00 -0400
Subject: [PATCH 7865/8469] added news fragment

---
 changelog.d/2111.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2111.doc.rst

diff --git a/changelog.d/2111.doc.rst b/changelog.d/2111.doc.rst
new file mode 100644
index 0000000000..3f44f7aff4
--- /dev/null
+++ b/changelog.d/2111.doc.rst
@@ -0,0 +1 @@
+doc overhaul step 3: update userguide

From 6463fee5c9ed5864eb554ee99ad292e5507d4b55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 04:33:57 -0400
Subject: [PATCH 7866/8469] Sync azure pipelines config with jaraco/skeleton,
 adding support for building on macOS and Windows.

---
 azure-pipelines.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0253a770c0..ee772682ab 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,10 +11,12 @@ trigger:
     - '*'
 
 pool:
-  vmimage: 'Ubuntu-18.04'
+  vmImage: $(pool_vm_image)
 
 variables:
 - group: Azure secrets
+- name: pool_vm_image
+  value: Ubuntu-18.04
 
 stages:
 - stage: Test
@@ -23,10 +25,17 @@ stages:
   - job: 'Test'
     strategy:
       matrix:
-        Python36:
+        Bionic Python 3.6:
           python.version: '3.6'
-        Python38:
+        Bionic Python 3.8:
           python.version: '3.8'
+        Windows:
+          python.version: '3.8'
+          pool_vm_image: vs2017-win2016
+        MacOS:
+          python.version: '3.8'
+          pool_vm_image: macos-10.15
+
       maxParallel: 4
 
     steps:

From 2f1d7173a196268008938e234e9e796bc6761b27 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 05:00:02 -0400
Subject: [PATCH 7867/8469] Avoid reliance on shell details in test_virtualenv.

---
 setuptools/tests/test_virtualenv.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 6549a6c01a..a62e564c41 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -57,10 +57,7 @@ def test_clean_env_install(bare_virtualenv):
     """
     Check setuptools can be installed in a clean environment.
     """
-    bare_virtualenv.run(' && '.join((
-        'cd {source}',
-        'python setup.py install',
-    )).format(source=SOURCE_DIR))
+    bare_virtualenv.run(['python', 'setup.py', 'install'], cd=SOURCE_DIR)
 
 
 def _get_pip_versions():

From c48365a763ea41d3f9e6298b3becbe73045ff9a1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 05:13:50 -0400
Subject: [PATCH 7868/8469] Avoid reliance on shell details in test_virtualenv.

---
 setuptools/tests/test_virtualenv.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index a62e564c41..555273aeba 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -112,10 +112,9 @@ def test_pip_upgrade_from_source(pip_version, virtualenv):
     dist_dir = virtualenv.workspace
     # Generate source distribution / wheel.
     virtualenv.run(' && '.join((
-        'cd {source}',
         'python setup.py -q sdist -d {dist}',
         'python setup.py -q bdist_wheel -d {dist}',
-    )).format(source=SOURCE_DIR, dist=dist_dir))
+    )).format(dist=dist_dir), cd=SOURCE_DIR)
     sdist = glob.glob(os.path.join(dist_dir, '*.zip'))[0]
     wheel = glob.glob(os.path.join(dist_dir, '*.whl'))[0]
     # Then update from wheel.
@@ -180,10 +179,8 @@ def sdist(distname, version):
             open('success', 'w').close()
             '''))
     # Run test command for test package.
-    virtualenv.run(' && '.join((
-        'cd {tmpdir}',
-        'python setup.py test -s test',
-    )).format(tmpdir=tmpdir))
+    virtualenv.run(
+        ['python', 'setup.py', 'test', '-s', 'test'], cd=str(tmpdir))
     assert tmpdir.join('success').check()
 
 
@@ -204,7 +201,5 @@ def test_no_missing_dependencies(bare_virtualenv):
     Quick and dirty test to ensure all external dependencies are vendored.
     """
     for command in ('upload',):  # sorted(distutils.command.__all__):
-        bare_virtualenv.run(' && '.join((
-            'cd {source}',
-            'python setup.py {command} -h',
-        )).format(command=command, source=SOURCE_DIR))
+        bare_virtualenv.run(
+            ['python', 'setup.py', command, '-h'], cd=SOURCE_DIR)

From f6f25adfc81df76e186bf6c3738a1baa0f92be05 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 05:15:42 -0400
Subject: [PATCH 7869/8469] Just write

---
 setuptools/tests/test_packageindex.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 452968973c..c6016c0963 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -287,13 +287,12 @@ class TestPyPIConfig:
     def test_percent_in_password(self, tmpdir, monkeypatch):
         monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
         pypirc = tmpdir / '.pypirc'
-        with pypirc.open('w') as strm:
-            strm.write(DALS("""
-                [pypi]
-                repository=https://pypi.org
-                username=jaraco
-                password=pity%
-            """))
+        pypirc.write(DALS("""
+            [pypi]
+            repository=https://pypi.org
+            username=jaraco
+            password=pity%
+        """))
         cfg = setuptools.package_index.PyPIConfig()
         cred = cfg.creds_by_repository['https://pypi.org']
         assert cred.username == 'jaraco'

From 2187d0c770de3a93f9a6cdcf53d9a217167dcc83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 05:57:10 -0400
Subject: [PATCH 7870/8469] Extract fixture for a temp home

---
 setuptools/tests/test_packageindex.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index c6016c0963..7b7815ab89 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -283,10 +283,15 @@ def test_report(self):
         assert rep == 'My message about md5'
 
 
+@pytest.fixture
+def temp_home(tmpdir, monkeypatch):
+    monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
+    return tmpdir
+
+
 class TestPyPIConfig:
-    def test_percent_in_password(self, tmpdir, monkeypatch):
-        monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
-        pypirc = tmpdir / '.pypirc'
+    def test_percent_in_password(self, temp_home):
+        pypirc = temp_home / '.pypirc'
         pypirc.write(DALS("""
             [pypi]
             repository=https://pypi.org

From f866311d60f54499c3637309e3429780d8c8f218 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 06:00:35 -0400
Subject: [PATCH 7871/8469] Add platform-specific code to override the home
 directory to honor bpo-36264. Fixes #2112.

---
 setuptools/tests/test_packageindex.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 7b7815ab89..29aace13ef 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -3,6 +3,7 @@
 import sys
 import os
 import distutils.errors
+import platform
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import urllib, http_client
@@ -285,7 +286,13 @@ def test_report(self):
 
 @pytest.fixture
 def temp_home(tmpdir, monkeypatch):
-    monkeypatch.setitem(os.environ, 'HOME', str(tmpdir))
+    key = (
+        'USERPROFILE'
+        if platform.system() == 'Windows' and sys.version_info > (3, 8) else
+        'HOME'
+    )
+
+    monkeypatch.setitem(os.environ, key, str(tmpdir))
     return tmpdir
 
 

From 5ccaa70e0917bba8e411ebd8b8f15384ed352fcd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 06:09:56 -0400
Subject: [PATCH 7872/8469] Update badge for Azure Pipelines

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 6caaa75640..9cbf7b86e1 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@
 
 .. _PyPI link: https://pypi.org/project/setuptools
 
-.. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/jaraco.setuptools?branchName=master
+.. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/pypa.setuptools?branchName=master
    :target: https://dev.azure.com/jaraco/setuptools/_build/latest?definitionId=1&branchName=master
 
 .. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20CI&logo=travis&logoColor=white

From e04c75ab906caadff4609ef34de8973c8e92eff8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 May 2020 06:10:33 -0400
Subject: [PATCH 7873/8469] =?UTF-8?q?Bump=20version:=2046.3.0=20=E2=86=92?=
 =?UTF-8?q?=2046.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 6 ++++++
 setup.cfg        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 09a3be97e0..4ee9218515 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.3.0
+current_version = 46.3.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 97934531c7..fd3c16ba05 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v46.3.1
+-------
+
+No significant changes.
+
+
 v46.3.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 5495343269..467d1fa723 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.3.0
+version = 46.3.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From bccf87f70b41ee288db4b8e91df02a64ec42579a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 15 May 2020 16:58:38 +0200
Subject: [PATCH 7874/8469] Fix an RST link typo in the dev guide

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 0b4ae4d4c3..e6171e4e30 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -139,7 +139,7 @@ Vendored Dependencies
 ---------------------
 
 Setuptools has some dependencies, but due to `bootstrapping issues
-<https://github.com/pypa/setuptools/issues/980>`, those dependencies
+<https://github.com/pypa/setuptools/issues/980>`_, those dependencies
 cannot be declared as they won't be resolved soon enough to build
 setuptools from source. Eventually, this limitation may be lifted as
 PEP 517/518 reach ubiquitous adoption, but for now, Setuptools

From b9d48323ce2571376ba34c05d65450f66e1581e9 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Fri, 15 May 2020 18:06:23 +0200
Subject: [PATCH 7875/8469] bpo-40055: test_distutils leaves warnings filters
 unchanged (GH-20095)

distutils.tests now saves/restores warnings filters to leave them
unchanged. Importing tests imports docutils which imports
pkg_resources which adds a warnings filter.
---
 tests/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/__init__.py b/tests/__init__.py
index 1b939cbd5d..5d2e69e3e6 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,6 +15,7 @@
 import os
 import sys
 import unittest
+import warnings
 from test.support import run_unittest
 
 
@@ -22,6 +23,7 @@
 
 
 def test_suite():
+    old_filters = warnings.filters[:]
     suite = unittest.TestSuite()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
@@ -29,6 +31,10 @@ def test_suite():
             __import__(modname)
             module = sys.modules[modname]
             suite.addTest(module.test_suite())
+    # bpo-40055: Save/restore warnings filters to leave them unchanged.
+    # Importing tests imports docutils which imports pkg_resources which adds a
+    # warnings filter.
+    warnings.filters[:] = old_filters
     return suite
 
 

From 6de971f158553c47ce11e7be9d38d268e0398193 Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Sat, 27 Apr 2019 19:21:50 +0000
Subject: [PATCH 7876/8469] Implement a "literal_attr:" config directive

---
 setuptools/config.py            | 62 +++++++++++++++++++++++++++-----
 setuptools/tests/test_config.py | 64 +++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 9b9a0c45e7..d1456cac18 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import, unicode_literals
+import ast
 import io
 import os
 import sys
@@ -316,15 +317,22 @@ def _parse_attr(cls, value, package_dir=None):
         Examples:
             attr: package.attr
             attr: package.module.attr
+            literal_attr: package.attr
+            literal_attr: package.module.attr
 
         :param str value:
         :rtype: str
         """
         attr_directive = 'attr:'
-        if not value.startswith(attr_directive):
+        literal_attr_directive = 'literal_attr:'
+        if value.startswith(attr_directive):
+            directive = attr_directive
+        elif value.startswith(literal_attr_directive):
+            directive = literal_attr_directive
+        else:
             return value
 
-        attrs_path = value.replace(attr_directive, '').strip().split('.')
+        attrs_path = value.replace(directive, '').strip().split('.')
         attr_name = attrs_path.pop()
 
         module_name = '.'.join(attrs_path)
@@ -344,13 +352,49 @@ def _parse_attr(cls, value, package_dir=None):
             elif '' in package_dir:
                 # A custom parent directory was specified for all root modules
                 parent_path = os.path.join(os.getcwd(), package_dir[''])
-        sys.path.insert(0, parent_path)
-        try:
-            module = import_module(module_name)
-            value = getattr(module, attr_name)
-
-        finally:
-            sys.path = sys.path[1:]
+        if directive == attr_directive:
+            sys.path.insert(0, parent_path)
+            try:
+                module = import_module(module_name)
+                value = getattr(module, attr_name)
+            finally:
+                sys.path = sys.path[1:]
+
+        elif directive == literal_attr_directive:
+            fpath = os.path.join(parent_path, *module_name.split('.'))
+            if os.path.exists(fpath + '.py'):
+                fpath += '.py'
+            elif os.path.isdir(fpath):
+                fpath = os.path.join(fpath, '__init__.py')
+            else:
+                raise DistutilsOptionError(
+                    'Could not find module ' + module_name
+                )
+            with open(fpath, 'rb') as fp:
+                src = fp.read()
+            found = False
+            top_level = ast.parse(src)
+            for statement in top_level.body:
+                if isinstance(statement, ast.Assign):
+                    for target in statement.targets:
+                        if isinstance(target, ast.Name) \
+                                and target.id == attr_name:
+                            value = ast.literal_eval(statement.value)
+                            found = True
+                        elif isinstance(target, ast.Tuple) \
+                            and any(isinstance(t, ast.Name) and t.id==attr_name
+                                    for t in target.elts):
+                                stmnt_value = ast.literal_eval(statement.value)
+                                for t,v in zip(target.elts, stmnt_value):
+                                    if isinstance(t, ast.Name) \
+                                            and t.id == attr_name:
+                                        value = v
+                                        found = True
+            if not found:
+                raise DistutilsOptionError(
+                    'No literal assignment to {!r} found in file'
+                    .format(attr_name)
+                )
 
         return value
 
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 2fa0b374e2..03e6916bd9 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -300,6 +300,37 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
+    def test_literal_version(self, tmpdir):
+
+        _, config = fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'version = literal_attr: fake_package.VERSION\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
+        config.write(
+            '[metadata]\n'
+            'version = literal_attr: fake_package.VERSION_MAJOR\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1'
+
+        subpack = tmpdir.join('fake_package').mkdir('subpackage')
+        subpack.join('__init__.py').write('')
+        subpack.join('submodule.py').write(
+            'import third_party_module\n'
+            'VERSION = (2016, 11, 26)'
+        )
+
+        config.write(
+            '[metadata]\n'
+            'version = attr: fake_package.subpackage.submodule.VERSION\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '2016.11.26'
+
     def test_version_file(self, tmpdir):
 
         _, config = fake_env(
@@ -332,6 +363,17 @@ def test_version_with_package_dir_simple(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
+        config.write(
+            '[metadata]\n'
+            'version = literal_attr: fake_package_simple.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    = src\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
     def test_version_with_package_dir_rename(self, tmpdir):
 
         _, config = fake_env(
@@ -347,6 +389,17 @@ def test_version_with_package_dir_rename(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
+        config.write(
+            '[metadata]\n'
+            'version = literal_attr: fake_package_rename.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    fake_package_rename = fake_dir\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
     def test_version_with_package_dir_complex(self, tmpdir):
 
         _, config = fake_env(
@@ -362,6 +415,17 @@ def test_version_with_package_dir_complex(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
+        config.write(
+            '[metadata]\n'
+            'version = literal_attr: fake_package_complex.VERSION\n'
+            '[options]\n'
+            'package_dir =\n'
+            '    fake_package_complex = src/fake_dir\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.metadata.version == '1.2.3'
+
     def test_unknown_meta_item(self, tmpdir):
 
         fake_env(

From 2bbd4d72225ad4f717be65460940292b50bd781e Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Sat, 27 Apr 2019 19:31:21 +0000
Subject: [PATCH 7877/8469] Update documentation

---
 docs/setuptools.txt | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index ec58b754fc..3e616582ff 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2193,7 +2193,7 @@ Metadata and options are set in the config sections of the same name.
 * In some cases, complex values can be provided in dedicated subsections for
   clarity.
 
-* Some keys allow ``file:``, ``attr:``, and ``find:`` and ``find_namespace:`` directives in
+* Some keys allow ``file:``, ``attr:``, ``literal_attr:``, ``find:``, and ``find_namespace:`` directives in
   order to cover common usecases.
 
 * Unknown keys are ignored.
@@ -2290,6 +2290,15 @@ Special directives:
 
 * ``attr:`` - Value is read from a module attribute.  ``attr:`` supports
   callables and iterables; unsupported types are cast using ``str()``.
+
+* ``literal_attr:`` — Like ``attr:``, except that the value is parsed using
+  ``ast.literal_eval()`` instead of by importing the module.  This allows one
+  to specify an attribute of a module that imports one or more third-party
+  modules without having to install those modules first; as a downside,
+  ``literal_attr:`` only supports variables that are assigned constant
+  expressions, not more complex assignments like ``__version__ =
+  '.'.join(map(str, (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)))``.
+
 * ``file:`` - Value is read from a list of files and then concatenated
 
 
@@ -2305,14 +2314,14 @@ Metadata
     The aliases given below are supported for compatibility reasons,
     but their use is not advised.
 
-==============================  =================  =================  =============== =====
-Key                             Aliases            Type               Minimum Version Notes
-==============================  =================  =================  =============== =====
+==============================  =================  ================================  =============== =====
+Key                             Aliases            Type                              Minimum Version Notes
+==============================  =================  ================================  =============== =====
 name                                               str
-version                                            attr:, file:, str  39.2.0          (1)
+version                                            attr:, literal_attr:, file:, str  39.2.0          (1)
 url                             home-page          str
 download_url                    download-url       str
-project_urls                                       dict               38.3.0
+project_urls                                       dict                              38.3.0
 author                                             str
 author_email                    author-email       str
 maintainer                                         str
@@ -2323,13 +2332,13 @@ license_file                                       str
 license_files                                      list-comma
 description                     summary            file:, str
 long_description                long-description   file:, str
-long_description_content_type                      str                38.6.0
+long_description_content_type                      str                               38.6.0
 keywords                                           list-comma
 platforms                       platform           list-comma
 provides                                           list-comma
 requires                                           list-comma
 obsoletes                                          list-comma
-==============================  =================  =================  =============== =====
+==============================  =================  ================================  =============== =====
 
 .. note::
     A version loaded using the ``file:`` directive must comply with PEP 440.

From 130cbede42d3d351fc21bb35c18c1be7e108df46 Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Sat, 27 Apr 2019 19:54:51 +0000
Subject: [PATCH 7878/8469] Added changelog.d news fragment

---
 changelog.d/1753.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1753.change.rst

diff --git a/changelog.d/1753.change.rst b/changelog.d/1753.change.rst
new file mode 100644
index 0000000000..0f27bb2e46
--- /dev/null
+++ b/changelog.d/1753.change.rst
@@ -0,0 +1 @@
+Added a ``literal_attr:`` config directive to support reading versions from attributes of modules that import third-party modules

From d6bcf5e89ef6a523c2476b249aba810af9808d8b Mon Sep 17 00:00:00 2001
From: "John T. Wodder II" <git@varonathe.org>
Date: Fri, 15 May 2020 21:17:49 +0000
Subject: [PATCH 7879/8469] Merge `literal_attr:` functionality into `attr:`

---
 changelog.d/1753.change.rst     |  5 +-
 docs/setuptools.txt             | 27 +++++-----
 setuptools/config.py            | 87 +++++++++++++++------------------
 setuptools/tests/test_config.py | 54 +-------------------
 4 files changed, 57 insertions(+), 116 deletions(-)

diff --git a/changelog.d/1753.change.rst b/changelog.d/1753.change.rst
index 0f27bb2e46..c8b68026c2 100644
--- a/changelog.d/1753.change.rst
+++ b/changelog.d/1753.change.rst
@@ -1 +1,4 @@
-Added a ``literal_attr:`` config directive to support reading versions from attributes of modules that import third-party modules
+``attr:`` now extracts variables through rudimentary examination of the AST,
+thereby supporting modules with third-party imports.  If examining the AST
+fails to find the variable, ``attr:`` falls back to the old behavior of
+importing the module.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 3e616582ff..c37b7ec5c5 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2193,7 +2193,7 @@ Metadata and options are set in the config sections of the same name.
 * In some cases, complex values can be provided in dedicated subsections for
   clarity.
 
-* Some keys allow ``file:``, ``attr:``, ``literal_attr:``, ``find:``, and ``find_namespace:`` directives in
+* Some keys allow ``file:``, ``attr:``, ``find:``, and ``find_namespace:`` directives in
   order to cover common usecases.
 
 * Unknown keys are ignored.
@@ -2291,13 +2291,10 @@ Special directives:
 * ``attr:`` - Value is read from a module attribute.  ``attr:`` supports
   callables and iterables; unsupported types are cast using ``str()``.
 
-* ``literal_attr:`` — Like ``attr:``, except that the value is parsed using
-  ``ast.literal_eval()`` instead of by importing the module.  This allows one
-  to specify an attribute of a module that imports one or more third-party
-  modules without having to install those modules first; as a downside,
-  ``literal_attr:`` only supports variables that are assigned constant
-  expressions, not more complex assignments like ``__version__ =
-  '.'.join(map(str, (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)))``.
+  In order to support the common case of a literal value assigned to a variable
+  in a module containing (directly or indirectly) third-party imports,
+  ``attr:`` first tries to read the value from the module by examining the
+  module's AST.  If that fails, ``attr:`` falls back to importing the module.
 
 * ``file:`` - Value is read from a list of files and then concatenated
 
@@ -2314,14 +2311,14 @@ Metadata
     The aliases given below are supported for compatibility reasons,
     but their use is not advised.
 
-==============================  =================  ================================  =============== =====
-Key                             Aliases            Type                              Minimum Version Notes
-==============================  =================  ================================  =============== =====
+==============================  =================  =================  =============== =====
+Key                             Aliases            Type               Minimum Version Notes
+==============================  =================  =================  =============== =====
 name                                               str
-version                                            attr:, literal_attr:, file:, str  39.2.0          (1)
+version                                            attr:, file:, str  39.2.0          (1)
 url                             home-page          str
 download_url                    download-url       str
-project_urls                                       dict                              38.3.0
+project_urls                                       dict               38.3.0
 author                                             str
 author_email                    author-email       str
 maintainer                                         str
@@ -2332,13 +2329,13 @@ license_file                                       str
 license_files                                      list-comma
 description                     summary            file:, str
 long_description                long-description   file:, str
-long_description_content_type                      str                               38.6.0
+long_description_content_type                      str                38.6.0
 keywords                                           list-comma
 platforms                       platform           list-comma
 provides                                           list-comma
 requires                                           list-comma
 obsoletes                                          list-comma
-==============================  =================  ================================  =============== =====
+==============================  =================  =================  =============== =====
 
 .. note::
     A version loaded using the ``file:`` directive must comply with PEP 440.
diff --git a/setuptools/config.py b/setuptools/config.py
index d1456cac18..0a2f51e212 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -317,22 +317,15 @@ def _parse_attr(cls, value, package_dir=None):
         Examples:
             attr: package.attr
             attr: package.module.attr
-            literal_attr: package.attr
-            literal_attr: package.module.attr
 
         :param str value:
         :rtype: str
         """
         attr_directive = 'attr:'
-        literal_attr_directive = 'literal_attr:'
-        if value.startswith(attr_directive):
-            directive = attr_directive
-        elif value.startswith(literal_attr_directive):
-            directive = literal_attr_directive
-        else:
+        if not value.startswith(attr_directive):
             return value
 
-        attrs_path = value.replace(directive, '').strip().split('.')
+        attrs_path = value.replace(attr_directive, '').strip().split('.')
         attr_name = attrs_path.pop()
 
         module_name = '.'.join(attrs_path)
@@ -352,50 +345,50 @@ def _parse_attr(cls, value, package_dir=None):
             elif '' in package_dir:
                 # A custom parent directory was specified for all root modules
                 parent_path = os.path.join(os.getcwd(), package_dir[''])
-        if directive == attr_directive:
+
+        fpath = os.path.join(parent_path, *module_name.split('.'))
+        if os.path.exists(fpath + '.py'):
+            fpath += '.py'
+        elif os.path.isdir(fpath):
+            fpath = os.path.join(fpath, '__init__.py')
+        else:
+            raise DistutilsOptionError('Could not find module ' + module_name)
+        with open(fpath, 'rb') as fp:
+            src = fp.read()
+        found = False
+        top_level = ast.parse(src)
+        for statement in top_level.body:
+            if isinstance(statement, ast.Assign):
+                for target in statement.targets:
+                    if isinstance(target, ast.Name) \
+                            and target.id == attr_name:
+                        try:
+                            value = ast.literal_eval(statement.value)
+                        except ValueError:
+                            found = False
+                        else:
+                            found = True
+                    elif isinstance(target, ast.Tuple) \
+                        and any(isinstance(t, ast.Name) and t.id == attr_name
+                                for t in target.elts):
+                        try:
+                            stmnt_value = ast.literal_eval(statement.value)
+                        except ValueError:
+                            found = False
+                        else:
+                            for t, v in zip(target.elts, stmnt_value):
+                                if isinstance(t, ast.Name) \
+                                        and t.id == attr_name:
+                                    value = v
+                                    found = True
+        if not found:
+            # Fall back to extracting attribute via importing
             sys.path.insert(0, parent_path)
             try:
                 module = import_module(module_name)
                 value = getattr(module, attr_name)
             finally:
                 sys.path = sys.path[1:]
-
-        elif directive == literal_attr_directive:
-            fpath = os.path.join(parent_path, *module_name.split('.'))
-            if os.path.exists(fpath + '.py'):
-                fpath += '.py'
-            elif os.path.isdir(fpath):
-                fpath = os.path.join(fpath, '__init__.py')
-            else:
-                raise DistutilsOptionError(
-                    'Could not find module ' + module_name
-                )
-            with open(fpath, 'rb') as fp:
-                src = fp.read()
-            found = False
-            top_level = ast.parse(src)
-            for statement in top_level.body:
-                if isinstance(statement, ast.Assign):
-                    for target in statement.targets:
-                        if isinstance(target, ast.Name) \
-                                and target.id == attr_name:
-                            value = ast.literal_eval(statement.value)
-                            found = True
-                        elif isinstance(target, ast.Tuple) \
-                            and any(isinstance(t, ast.Name) and t.id==attr_name
-                                    for t in target.elts):
-                                stmnt_value = ast.literal_eval(statement.value)
-                                for t,v in zip(target.elts, stmnt_value):
-                                    if isinstance(t, ast.Name) \
-                                            and t.id == attr_name:
-                                        value = v
-                                        found = True
-            if not found:
-                raise DistutilsOptionError(
-                    'No literal assignment to {!r} found in file'
-                    .format(attr_name)
-                )
-
         return value
 
     @classmethod
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 03e6916bd9..d8347c78b9 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -103,7 +103,7 @@ def test_ignore_errors(self, tmpdir):
             'version = attr: none.VERSION\n'
             'keywords = one, two\n'
         )
-        with pytest.raises(ImportError):
+        with pytest.raises(DistutilsOptionError):
             read_configuration('%s' % config)
 
         config_dict = read_configuration(
@@ -300,25 +300,6 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
-    def test_literal_version(self, tmpdir):
-
-        _, config = fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = literal_attr: fake_package.VERSION\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-        config.write(
-            '[metadata]\n'
-            'version = literal_attr: fake_package.VERSION_MAJOR\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1'
-
-        subpack = tmpdir.join('fake_package').mkdir('subpackage')
-        subpack.join('__init__.py').write('')
         subpack.join('submodule.py').write(
             'import third_party_module\n'
             'VERSION = (2016, 11, 26)'
@@ -363,17 +344,6 @@ def test_version_with_package_dir_simple(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
-        config.write(
-            '[metadata]\n'
-            'version = literal_attr: fake_package_simple.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    = src\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
     def test_version_with_package_dir_rename(self, tmpdir):
 
         _, config = fake_env(
@@ -389,17 +359,6 @@ def test_version_with_package_dir_rename(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
-        config.write(
-            '[metadata]\n'
-            'version = literal_attr: fake_package_rename.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    fake_package_rename = fake_dir\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
     def test_version_with_package_dir_complex(self, tmpdir):
 
         _, config = fake_env(
@@ -415,17 +374,6 @@ def test_version_with_package_dir_complex(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
-        config.write(
-            '[metadata]\n'
-            'version = literal_attr: fake_package_complex.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    fake_package_complex = src/fake_dir\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
     def test_unknown_meta_item(self, tmpdir):
 
         fake_env(

From e1824c093bf89e8875ddd329f316b9ed3e7dd533 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 19:54:13 -0400
Subject: [PATCH 7880/8469] Extract StaticModule and patch_path helpers.

---
 setuptools/config.py            | 88 +++++++++++++++++----------------
 setuptools/tests/test_config.py |  2 +-
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index 0a2f51e212..cd1b115e16 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -10,6 +10,7 @@
 from functools import partial
 from functools import wraps
 from importlib import import_module
+import contextlib
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.extern.packaging.version import LegacyVersion, parse
@@ -20,6 +21,44 @@
 __metaclass__ = type
 
 
+class StaticModule:
+    """
+    Attempt to load the module by the name
+    """
+    def __init__(self, name):
+        spec = importlib.util.find_spec(module_name)
+        with open(spec.origin) as strm:
+            src = strm.read()
+        module = ast.parse(src)
+        vars(self).update(locals())
+        del self.self
+
+    def __getattr__(self, attr):
+        try:
+            return next(
+                ast.literal_eval(statement.value)
+                for statement in self.module.body
+                if isinstance(statement, ast.Assign)
+                for target in statement.targets
+                if isinstance(target, ast.Name) and target.id == attr
+            )
+        except Exception:
+            raise AttributeError(
+                "{self.name} has no attribute {attr}".format(**locals()))
+
+
+@contextlib.contextmanager
+def patch_path(path):
+    """
+    Add path to front of sys.path for the duration of the context.
+    """
+    try:
+        sys.path.insert(0, path)
+        yield
+    finally:
+        sys.path.remove(path)
+
+
 def read_configuration(
         filepath, find_others=False, ignore_option_errors=False):
     """Read given configuration file and returns options from it as a dict.
@@ -346,50 +385,15 @@ def _parse_attr(cls, value, package_dir=None):
                 # A custom parent directory was specified for all root modules
                 parent_path = os.path.join(os.getcwd(), package_dir[''])
 
-        fpath = os.path.join(parent_path, *module_name.split('.'))
-        if os.path.exists(fpath + '.py'):
-            fpath += '.py'
-        elif os.path.isdir(fpath):
-            fpath = os.path.join(fpath, '__init__.py')
-        else:
-            raise DistutilsOptionError('Could not find module ' + module_name)
-        with open(fpath, 'rb') as fp:
-            src = fp.read()
-        found = False
-        top_level = ast.parse(src)
-        for statement in top_level.body:
-            if isinstance(statement, ast.Assign):
-                for target in statement.targets:
-                    if isinstance(target, ast.Name) \
-                            and target.id == attr_name:
-                        try:
-                            value = ast.literal_eval(statement.value)
-                        except ValueError:
-                            found = False
-                        else:
-                            found = True
-                    elif isinstance(target, ast.Tuple) \
-                        and any(isinstance(t, ast.Name) and t.id == attr_name
-                                for t in target.elts):
-                        try:
-                            stmnt_value = ast.literal_eval(statement.value)
-                        except ValueError:
-                            found = False
-                        else:
-                            for t, v in zip(target.elts, stmnt_value):
-                                if isinstance(t, ast.Name) \
-                                        and t.id == attr_name:
-                                    value = v
-                                    found = True
-        if not found:
-            # Fall back to extracting attribute via importing
-            sys.path.insert(0, parent_path)
+        with patch_path(parent_path):
             try:
+                # attempt to load value statically
+                return getattr(StaticModule(module_name), attr_name)
+            except Exception:
+                # fallback to simple import
                 module = import_module(module_name)
-                value = getattr(module, attr_name)
-            finally:
-                sys.path = sys.path[1:]
-        return value
+
+        return getattr(module, attr_name)
 
     @classmethod
     def _get_parser_compound(cls, *parse_methods):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index d8347c78b9..961f8d4217 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -103,7 +103,7 @@ def test_ignore_errors(self, tmpdir):
             'version = attr: none.VERSION\n'
             'keywords = one, two\n'
         )
-        with pytest.raises(DistutilsOptionError):
+        with pytest.raises(ImportError):
             read_configuration('%s' % config)
 
         config_dict = read_configuration(

From 43bbaa5827d38eede4ca8c837c9fc4994f9ab665 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 20:13:05 -0400
Subject: [PATCH 7881/8469] Fix imports

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

diff --git a/setuptools/config.py b/setuptools/config.py
index cd1b115e16..b39ac7183d 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -6,10 +6,10 @@
 
 import warnings
 import functools
+import importlib
 from collections import defaultdict
 from functools import partial
 from functools import wraps
-from importlib import import_module
 import contextlib
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
@@ -391,7 +391,7 @@ def _parse_attr(cls, value, package_dir=None):
                 return getattr(StaticModule(module_name), attr_name)
             except Exception:
                 # fallback to simple import
-                module = import_module(module_name)
+                module = importlib.import_module(module_name)
 
         return getattr(module, attr_name)
 

From a11c8eac4bf7e1b97f489395565d96076285617d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 20:18:54 -0400
Subject: [PATCH 7882/8469] Alter test so it actually triggers the intended
 behavior.

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

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 961f8d4217..6840a8e283 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -300,14 +300,14 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
-        subpack.join('submodule.py').write(
+        subpack.join('othersub.py').write(
             'import third_party_module\n'
             'VERSION = (2016, 11, 26)'
         )
 
         config.write(
             '[metadata]\n'
-            'version = attr: fake_package.subpackage.submodule.VERSION\n'
+            'version = attr: fake_package.subpackage.othersub.VERSION\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'

From af199e99549df07f9457567a26a0da8af069f513 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 20:23:25 -0400
Subject: [PATCH 7883/8469] Fix error in StaticModule implementation.

---
 setuptools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/config.py b/setuptools/config.py
index b39ac7183d..45df2e3f2e 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -26,7 +26,7 @@ class StaticModule:
     Attempt to load the module by the name
     """
     def __init__(self, name):
-        spec = importlib.util.find_spec(module_name)
+        spec = importlib.util.find_spec(name)
         with open(spec.origin) as strm:
             src = strm.read()
         module = ast.parse(src)

From 7681ff9f70f33651f40c7b64a8186471a7014515 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 20:57:15 -0400
Subject: [PATCH 7884/8469] Delete packages from sys.modules

---
 setuptools/tests/test_config.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 6840a8e283..942050e0d7 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import sys
 import contextlib
+
 import pytest
 
 from distutils.errors import DistutilsOptionError, DistutilsFileError
@@ -300,6 +302,9 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
+        del sys.modules['fake_package']
+        del sys.modules['fake_package.subpackage']
+
         subpack.join('othersub.py').write(
             'import third_party_module\n'
             'VERSION = (2016, 11, 26)'

From 4c62d634784a935eb0fbeedc174a25b82f05e1d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 21:21:30 -0400
Subject: [PATCH 7885/8469] Update test to create separate subpackages. Hoping
 that avoids issues with caching.

---
 setuptools/tests/test_config.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 942050e0d7..eeac32cecd 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import sys
 import contextlib
 
 import pytest
@@ -291,28 +290,27 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1'
 
-        subpack = tmpdir.join('fake_package').mkdir('subpackage')
-        subpack.join('__init__.py').write('')
-        subpack.join('submodule.py').write('VERSION = (2016, 11, 26)')
+        sub_a = tmpdir.join('fake_package').mkdir('subpkg_a')
+        sub_a.join('__init__.py').write('')
+        sub_a.join('mod.py').write('VERSION = (2016, 11, 26)')
 
         config.write(
             '[metadata]\n'
-            'version = attr: fake_package.subpackage.submodule.VERSION\n'
+            'version = attr: fake_package.subpkg_a.mod.VERSION\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
-        del sys.modules['fake_package']
-        del sys.modules['fake_package.subpackage']
-
-        subpack.join('othersub.py').write(
+        sub_b = tmpdir.join('fake_package').mkdir('subpkg_b')
+        sub_b.join('__init__.py').write('')
+        sub_b.join('mod.py').write(
             'import third_party_module\n'
             'VERSION = (2016, 11, 26)'
         )
 
         config.write(
             '[metadata]\n'
-            'version = attr: fake_package.subpackage.othersub.VERSION\n'
+            'version = attr: fake_package.subpkg_b.mod.VERSION\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'

From 55456fe32ab2b5d7a4d476149ba935dbfd6e5fca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 21:45:40 -0400
Subject: [PATCH 7886/8469] Try constructing the fake package at the beginning
 of the test.

---
 setuptools/tests/test_config.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index eeac32cecd..77b853eba9 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -54,6 +54,7 @@ def fake_env(
         '    return [3, 4, 5, "dev"]\n'
         '\n'
     )
+
     return package_dir, config
 
 
@@ -268,11 +269,23 @@ def test_dict(self, tmpdir):
 
     def test_version(self, tmpdir):
 
-        _, config = fake_env(
+        package_dir, config = fake_env(
             tmpdir,
             '[metadata]\n'
             'version = attr: fake_package.VERSION\n'
         )
+
+        sub_a = package_dir.mkdir('subpkg_a')
+        sub_a.join('__init__.py').write('')
+        sub_a.join('mod.py').write('VERSION = (2016, 11, 26)')
+
+        sub_b = package_dir.mkdir('subpkg_b')
+        sub_b.join('__init__.py').write('')
+        sub_b.join('mod.py').write(
+            'import third_party_module\n'
+            'VERSION = (2016, 11, 26)'
+        )
+
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
@@ -290,10 +303,6 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1'
 
-        sub_a = tmpdir.join('fake_package').mkdir('subpkg_a')
-        sub_a.join('__init__.py').write('')
-        sub_a.join('mod.py').write('VERSION = (2016, 11, 26)')
-
         config.write(
             '[metadata]\n'
             'version = attr: fake_package.subpkg_a.mod.VERSION\n'
@@ -301,13 +310,6 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
-        sub_b = tmpdir.join('fake_package').mkdir('subpkg_b')
-        sub_b.join('__init__.py').write('')
-        sub_b.join('mod.py').write(
-            'import third_party_module\n'
-            'VERSION = (2016, 11, 26)'
-        )
-
         config.write(
             '[metadata]\n'
             'version = attr: fake_package.subpkg_b.mod.VERSION\n'

From 39a37c0758f43b130e5163156facffbbe89cf9fa Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 22:18:25 -0400
Subject: [PATCH 7887/8469] Disable test on Python 2.

---
 changelog.d/1753.change.rst     | 4 ++--
 setuptools/tests/test_config.py | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.d/1753.change.rst b/changelog.d/1753.change.rst
index c8b68026c2..08fa9ea499 100644
--- a/changelog.d/1753.change.rst
+++ b/changelog.d/1753.change.rst
@@ -1,4 +1,4 @@
 ``attr:`` now extracts variables through rudimentary examination of the AST,
-thereby supporting modules with third-party imports.  If examining the AST
+thereby supporting modules with third-party imports. If examining the AST
 fails to find the variable, ``attr:`` falls back to the old behavior of
-importing the module.
+importing the module. Works on Python 3 only.
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 77b853eba9..67992c041f 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -10,6 +10,7 @@
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
 from setuptools.extern.six.moves import configparser
+from setuptools.extern import six
 from . import py2_only, py3_only
 from .textwrap import DALS
 
@@ -310,6 +311,10 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
+        if six.PY2:
+            # static version loading is unsupported on Python 2
+            return
+
         config.write(
             '[metadata]\n'
             'version = attr: fake_package.subpkg_b.mod.VERSION\n'

From b92164bd9ecc08374e1e5e810cf0bc37c8fb9aca Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 May 2020 22:20:49 -0400
Subject: [PATCH 7888/8469] =?UTF-8?q?Bump=20version:=2046.3.1=20=E2=86=92?=
 =?UTF-8?q?=2046.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 9 +++++++++
 changelog.d/1753.change.rst | 4 ----
 setup.cfg                   | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/1753.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4ee9218515..72d02f2b59 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.3.1
+current_version = 46.4.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index fd3c16ba05..ea667028a2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v46.4.0
+-------
+
+* #1753: ``attr:`` now extracts variables through rudimentary examination of the AST,
+  thereby supporting modules with third-party imports. If examining the AST
+  fails to find the variable, ``attr:`` falls back to the old behavior of
+  importing the module. Works on Python 3 only.
+
+
 v46.3.1
 -------
 
diff --git a/changelog.d/1753.change.rst b/changelog.d/1753.change.rst
deleted file mode 100644
index 08fa9ea499..0000000000
--- a/changelog.d/1753.change.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-``attr:`` now extracts variables through rudimentary examination of the AST,
-thereby supporting modules with third-party imports. If examining the AST
-fails to find the variable, ``attr:`` falls back to the old behavior of
-importing the module. Works on Python 3 only.
diff --git a/setup.cfg b/setup.cfg
index 3933714b11..72d4dce92c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.3.1
+version = 46.4.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 04dbe6f9434bd73ba839f2fd386c63133a8381d1 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 18 May 2020 10:55:58 -0400
Subject: [PATCH 7889/8469] docs: WIP update quickstart guide

to make it pep517-compatible and declarative
---
 docs/userguide/quickstart.txt | 109 +++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 56 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index e75d74e181..fd203b1609 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -13,78 +13,75 @@ To install the latest version of setuptools, use::
 
 Refer to `Installing Packages`_ guide for more information.
 
+Python packaging at a glance
+============================
+
+The landscape of Python packaging is shifting and ``Setuptools`` has evolved to
+only provide backend support, no longer being the de-facto packaging tool in
+the market. All python package must provide a ``pyproject.toml`` and specify
+the backend (build system) it wants to use. The distribution can then
+be generated with whatever tools that provides a ``build sdist``-alike
+functionality. While this may appear cumbersome, given the added pieces,
+it in fact tremendously enhances the portability of your package. The
+change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
+build-requirements>``
+
 Basic Use
 =========
 
-For basic use of setuptools, just import things from setuptools.  Here's a
-minimal setup script using setuptools::
+For basic use of setuptools, you will need a ``pyproject.toml`` with the
+exact following info, which declares you want to use ``setuptools`` to
+package your project:
 
-    from setuptools import setup, find_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_packages(),
-    )
+.. code-block:: toml
+
+    [build-system]
+    requires = ["setuptools", "wheel"]
+    build-backend = "setuptools.build_meta"
+
+Then, you will need a ``setup.cfg`` to specify your package information,
+such as metadata, contents, dependencies, etc. Here we demonstrate the minimum
+
+.. code-block:: ini
+
+    [metadata]
+    name = "mypackage"
+    version = 0.0.1
 
-As you can see, it doesn't take much to use setuptools in a project.
-Run that script in your project folder, alongside the Python packages
-you have developed.
+    [options]
+    packages = "mypackage"
+    install_requires =
+      requests
+      importlib; python_version == "2.6"
 
-Invoke that script to produce distributions and automatically include all
-packages in the directory where the setup.py lives.  See the `Command
-Reference`_ section below to see what commands you can give to this setup
-script. For example, to produce a source distribution, simply invoke::
+This is what your project would look like::
 
-    setup.py sdist
+    ~/mypackage/
+        pyproject.toml
+        setup.cfg
+        mypackage/__init__.py
+
+As you can see, it doesn't take much to use setuptools in a project. Invoke
+the installer at the root of your package::
+
+    pep517 build
+
+You now have your distribution ready, which you can upload to PyPI.
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
 project.  And maybe your project will have grown by then to include a few
-dependencies, and perhaps some data files and scripts::
-
-    from setuptools import setup, find_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_packages(),
-        scripts=["say_hello.py"],
-
-        # Project uses reStructuredText, so ensure that the docutils get
-        # installed or upgraded on the target machine
-        install_requires=["docutils>=0.3"],
-
-        package_data={
-            # If any package contains *.txt or *.rst files, include them:
-            "": ["*.txt", "*.rst"],
-            # And include any *.msg files found in the "hello" package, too:
-            "hello": ["*.msg"],
-        },
-
-        # metadata to display on PyPI
-        author="Me",
-        author_email="me@example.com",
-        description="This is an Example Package",
-        keywords="hello world example examples",
-        url="http://example.com/HelloWorld/",   # project home page, if any
-        project_urls={
-            "Bug Tracker": "https://bugs.example.com/HelloWorld/",
-            "Documentation": "https://docs.example.com/HelloWorld/",
-            "Source Code": "https://code.example.com/HelloWorld/",
-        },
-        classifiers=[
-            "License :: OSI Approved :: Python Software Foundation License"
-        ]
-
-        # could also include long_description, download_url, etc.
-    )
+dependencies, and perhaps some data files and scripts. In the next few section,
+we will walk through those additional but essential information you need
+to specify to properly package your project.
 
 Automatic package discovery
 ===========================
 
 For simple projects, it's usually easy enough to manually add packages to
-the ``packages`` argument of ``setup()``.  However, for very large projects
-, it can be a big burden to keep the package list updated. setuptools therefore
-provides tools to ease the burden.
+the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
+, it can be a big burden to keep the package list updated. ``setuptools``
+therefore provides tools to ease the burden.
 
 ``find_packages()`` takes a source directory and two lists of package name
 patterns to exclude and include. It then walks the target directory, filtering

From c849875356f0ca3b12257cd22a2a1c0bd1603884 Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Tue, 19 May 2020 00:52:04 -0500
Subject: [PATCH 7890/8469] use a less confusing example for requirements
 parsing

---
 docs/pkg_resources.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index 71568c1a1a..f2e554f42c 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -594,7 +594,7 @@ Requirements Parsing
 
         FooProject >= 1.2
         Fizzy [foo, bar]
-        PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1
+        PickyThing>1.6,<=1.9,!=1.8.6
         SomethingWhoseVersionIDontCareAbout
         SomethingWithMarker[foo]>1.0;python_version<"2.7"
 

From 5210488f65e41038e5721d31792fae784c39d649 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@python.org>
Date: Wed, 20 May 2020 16:37:25 +0200
Subject: [PATCH 7891/8469] bpo-40698: Improve distutils upload hash digests
 (GH-20260)

- Fix upload test on systems that blocks MD5
- Add SHA2-256 and Blake2b-256 digests based on new Warehous and twine
  specs.

Signed-off-by: Christian Heimes <christian@python.org>
---
 command/upload.py    | 22 +++++++++++++++++++++-
 tests/test_upload.py | 24 ++++++++++++++++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/command/upload.py b/command/upload.py
index d822ba0133..95e9fda186 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -16,6 +16,16 @@
 from distutils.spawn import spawn
 from distutils import log
 
+
+# PyPI Warehouse supports MD5, SHA256, and Blake2 (blake2-256)
+# https://bugs.python.org/issue40698
+_FILE_CONTENT_DIGESTS = {
+    "md5_digest": getattr(hashlib, "md5", None),
+    "sha256_digest": getattr(hashlib, "sha256", None),
+    "blake2_256_digest": getattr(hashlib, "blake2b", None),
+}
+
+
 class upload(PyPIRCCommand):
 
     description = "upload binary package to PyPI"
@@ -87,6 +97,7 @@ def upload_file(self, command, pyversion, filename):
             content = f.read()
         finally:
             f.close()
+
         meta = self.distribution.metadata
         data = {
             # action
@@ -101,7 +112,6 @@ def upload_file(self, command, pyversion, filename):
             'content': (os.path.basename(filename),content),
             'filetype': command,
             'pyversion': pyversion,
-            'md5_digest': hashlib.md5(content).hexdigest(),
 
             # additional meta-data
             'metadata_version': '1.0',
@@ -123,6 +133,16 @@ def upload_file(self, command, pyversion, filename):
 
         data['comment'] = ''
 
+        # file content digests
+        for digest_name, digest_cons in _FILE_CONTENT_DIGESTS.items():
+            if digest_cons is None:
+                continue
+            try:
+                data[digest_name] = digest_cons(content).hexdigest()
+            except ValueError:
+                # hash digest not available or blocked by security policy
+                pass
+
         if self.sign:
             with open(filename + ".asc", "rb") as f:
                 data['gpg_signature'] = (os.path.basename(filename) + ".asc",
diff --git a/tests/test_upload.py b/tests/test_upload.py
index c17d8e7d54..bca5516d2f 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -130,14 +130,30 @@ def test_upload(self):
 
         # what did we send ?
         headers = dict(self.last_open.req.headers)
-        self.assertEqual(headers['Content-length'], '2162')
+        self.assertGreaterEqual(int(headers['Content-length']), 2162)
         content_type = headers['Content-type']
         self.assertTrue(content_type.startswith('multipart/form-data'))
         self.assertEqual(self.last_open.req.get_method(), 'POST')
         expected_url = 'https://upload.pypi.org/legacy/'
         self.assertEqual(self.last_open.req.get_full_url(), expected_url)
-        self.assertTrue(b'xxx' in self.last_open.req.data)
-        self.assertIn(b'protocol_version', self.last_open.req.data)
+        data = self.last_open.req.data
+        self.assertIn(b'xxx',data)
+        self.assertIn(b'protocol_version', data)
+        self.assertIn(b'sha256_digest', data)
+        self.assertIn(
+            b'cd2eb0837c9b4c962c22d2ff8b5441b7b45805887f051d39bf133b583baf'
+            b'6860',
+            data
+        )
+        if b'md5_digest' in data:
+            self.assertIn(b'f561aaf6ef0bf14d4208bb46a4ccb3ad', data)
+        if b'blake2_256_digest' in data:
+            self.assertIn(
+                b'b6f289a27d4fe90da63c503bfe0a9b761a8f76bb86148565065f040be'
+                b'6d1c3044cf7ded78ef800509bccb4b648e507d88dc6383d67642aadcc'
+                b'ce443f1534330a',
+                data
+            )
 
         # The PyPI response body was echoed
         results = self.get_logs(INFO)
@@ -166,7 +182,7 @@ def test_upload_correct_cr(self):
         cmd.run()
 
         headers = dict(self.last_open.req.headers)
-        self.assertEqual(headers['Content-length'], '2172')
+        self.assertGreaterEqual(int(headers['Content-length']), 2172)
         self.assertIn(b'long description\r', self.last_open.req.data)
 
     def test_upload_fails(self):

From cdf8524ec7b419a49f7c2c504798b29b79c3bba8 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Wed, 20 May 2020 15:37:30 -0400
Subject: [PATCH 7892/8469] docs: made quickstart pkg section declarative

WIP
---
 docs/userguide/quickstart.txt | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index fd203b1609..d0fe4a2865 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -81,21 +81,26 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
-therefore provides tools to ease the burden.
+therefore provides two convenient tools to ease the burden: ``find: `` and
+``find_namespace: ``. To use it in your project:
 
-``find_packages()`` takes a source directory and two lists of package name
-patterns to exclude and include. It then walks the target directory, filtering
-by inclusion patterns, and return a list of Python packages (any directory).
-Finally, exclusion patterns are applied to remove matching packages.
+.. code-block:: ini
 
-For example::
-    #...
-    from setuptools import find_packages()
+    [options]
+    packages = find:
 
-    setup(
-        #...,
-        packages = find_packages()
-    )
+    [options.packages.find] #optional
+    where="."
+    include=['pkg1', 'pkg2']
+    exclude=['pkg3', 'pkg4']]
+
+
+When you pass the above information, alongside other necessary ones,
+``setuptools`` walks through the directory specified in ``where`` (default to
+current directory) and filters the packages
+it can find following the ``include``  (default to none), then remove
+those that match the ``exclude`` and return a list of Python packages. Note
+that each entry in the ``[options.packages.find]`` is optional.
 
 For more details and advanced use, go to :ref:`package_discovery`
 

From 46dab46d6debf69331b646bff11052dc731d4ae4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 May 2020 15:50:07 -0400
Subject: [PATCH 7893/8469] Add landing page for Python 2 sunset. Ref #2094.

---
 ...ls-warns-about-python-2-incompatibility.md |  5 +++
 docs/python 2 sunset.txt                      | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 docs/python 2 sunset.txt

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
index 2f5fe53dd0..e2d5ed5360 100644
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -40,6 +40,11 @@ try them first. -->
 - Python installed how:
 - Virtualenv version (if using virtualenv): n/a
 
+Command(s) that triggered the warning/error (and output):
+
+```
+```
+
 Command(s) used to install setuptools (and output):
 
 ```
diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt
new file mode 100644
index 0000000000..543487d81b
--- /dev/null
+++ b/docs/python 2 sunset.txt	
@@ -0,0 +1,35 @@
+:orphan:
+
+Python 2 Sunset
+===============
+
+Since January 2020 and the release of Setuptools 45, Python 2 is no longer supported by the most current release (`discussion <https://github.com/pypa/setuptools/issues/1458>`_). Setuptools as a project continues to support Python 2 with bugfixes and important features on Setuptools 44.x.
+
+By design, most users will be unaffected by this change. That's because Setuptools 45 declares its supported Python versions to exclude Python 2.7, and installers such as pip 9 or later will honor this declaration and prevent installation of Setuptools 45 or later in Python 2 environments.
+
+Users that do import any portion of Setuptools 45 or later on Python 2 are directed to this documentation to provide guidance on how to work around the issues.
+
+Workarounds
+-----------
+
+The best recommendation is to avoid Python 2 and move to Python 3 where possible. This project acknowledges that not all environments can drop Python 2 support, so provides other options.
+
+In less common scenarios, later versions of Setuptools can be installed on unsupported Python versions. In these environments, the installer is advised to first install ``setuptools<45`` to "pin Setuptools" to a compatible version.
+
+- When using older versions of pip (before 9.0), the ``Requires-Python`` directive is not honored and invalid versions can be installed. Users are advised first to upgrade pip and retry or to pin Setuptools. Use ``pip --version`` to determine the version of pip.
+- When using ``easy_install``, ``Requires-Python`` is not honored and later versions can be installed. In this case, users are advised to pin Setuptools. This applies to ``setup.py install`` invocations as well, as they use Setuptools under the hood.
+
+It's still not working
+----------------------
+
+If after trying the above steps, the Python environment still has incompatible versions of Setuptools installed, here are some things to try.
+
+1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for the relevant environment. Repeat until there is no Setuptools installed. Then ``pip install setuptools``.
+
+2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults).
+
+3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. If you do file an issue, be sure to give as much detail as possible to help the maintainers understand how you encountered the issue following their recommended guidance.
+
+4. Reach out to your local support groups. There's a good chance someone near you has the expertise and willingness to help.
+
+5. If all else fails, `file this template <https://github.com/pypa/setuptools/issues/new?assignees=&labels=Python+2&template=setuptools-warns-about-python-2-incompatibility.md&title=Incompatible+install+in+(summarize+your+environment)>`_ with Setuptools. Please complete the whole template, providing as much detail about how you encountered the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue.

From 64b1a6fa12f7d4f6508008541adbebdcd6ee20a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 May 2020 16:06:38 -0400
Subject: [PATCH 7894/8469] Force fail on Python 2. When doing so, emit an
 error that directs users to the latest guidance. Fixes #2094.

---
 ...ls-warns-about-python-2-incompatibility.md |  1 +
 .travis.yml                                   |  5 -----
 pkg_resources/py2_warn.py                     | 19 +++++++------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
index e2d5ed5360..b5fe8abf68 100644
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -28,6 +28,7 @@ Your first course of action should be to reason about how you managed to get an
 <!-- These are the recommended workarounds for the issue. Please
 try them first. -->
 
+- [ ] Read [Python 2 Sunset docs](https://setuptools.readthedocs.io/en/latest/python%202%20sunset.html).
 - [ ] Python 2 is required for this application.
 - [ ] I maintain the software that installs Setuptools (if not, please contact that project).
 - [ ] Setuptools installed with pip 9 or later.
diff --git a/.travis.yml b/.travis.yml
index 3e97f353aa..21716ea61c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@ language: python
 jobs:
   fast_finish: true
   include:
-  - &latest_py2
-    python: 2.7
-    env: TOXENV=py27
-  - <<: *latest_py2
-    env: LANG=C TOXENV=py27
   - python: pypy3
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: 3.5
diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
index bfc3523415..00cc8bc75d 100644
--- a/pkg_resources/py2_warn.py
+++ b/pkg_resources/py2_warn.py
@@ -4,18 +4,13 @@
 
 
 msg = textwrap.dedent("""
-    You are running Setuptools on Python 2, which is no longer
-    supported and
-    >>> SETUPTOOLS WILL STOP WORKING <<<
-    in a subsequent release (no sooner than 2020-04-20).
-    Please ensure you are installing
-    Setuptools using pip 9.x or later or pin to `setuptools<45`
-    in your environment.
-    If you have done those things and are still encountering
-    this message, please follow up at
-    https://bit.ly/setuptools-py2-warning.
+    Encountered a version of Setuptools that no longer supports
+    this version of Python. Please head to
+    https://bit.ly/setuptools-py2-warning for support.
     """)
 
-pre = "Setuptools will stop working on Python 2\n"
+pre = "Setuptools no longer works on Python 2\n"
 
-sys.version_info < (3,) and warnings.warn(pre + "*" * 60 + msg + "*" * 60)
+if sys.version_info < (3,):
+    warnings.warn(pre + "*" * 60 + msg + "*" * 60)
+    raise SystemExit(32)

From e23403355f87272c8b0c027b98bf18309c38fa31 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 May 2020 16:14:54 -0400
Subject: [PATCH 7895/8469] Prefer imperative voice

---
 docs/python 2 sunset.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt
index 543487d81b..6b8016fb04 100644
--- a/docs/python 2 sunset.txt	
+++ b/docs/python 2 sunset.txt	
@@ -28,8 +28,8 @@ If after trying the above steps, the Python environment still has incompatible v
 
 2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults).
 
-3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. If you do file an issue, be sure to give as much detail as possible to help the maintainers understand how you encountered the issue following their recommended guidance.
+3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. When filing an issue, be sure to give as much detail as possible to help the maintainers understand what factors led to the issue after following their recommended guidance.
 
-4. Reach out to your local support groups. There's a good chance someone near you has the expertise and willingness to help.
+4. Reach out to your local support groups. There's a good chance someone nearby has the expertise and willingness to help.
 
-5. If all else fails, `file this template <https://github.com/pypa/setuptools/issues/new?assignees=&labels=Python+2&template=setuptools-warns-about-python-2-incompatibility.md&title=Incompatible+install+in+(summarize+your+environment)>`_ with Setuptools. Please complete the whole template, providing as much detail about how you encountered the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue.
+5. If all else fails, `file this template <https://github.com/pypa/setuptools/issues/new?assignees=&labels=Python+2&template=setuptools-warns-about-python-2-incompatibility.md&title=Incompatible+install+in+(summarize+your+environment)>`_ with Setuptools. Please complete the whole template, providing as much detail about what factors led to the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue.

From eba78d63e3a4b181153a011caec2a3e50eecfee0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 24 May 2020 19:57:55 -0400
Subject: [PATCH 7896/8469] Remove superfluous RequirementParseError. Ref
 #1832.

---
 pkg_resources/__init__.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index edd3d2e8c6..56be3c223b 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3068,11 +3068,6 @@ def issue_warning(*args, **kw):
     warnings.warn(stacklevel=level + 1, *args, **kw)
 
 
-class RequirementParseError(ValueError):
-    def __str__(self):
-        return ' '.join(self.args)
-
-
 def parse_requirements(strs):
     """Yield ``Requirement`` objects for each specification in `strs`
 
@@ -3098,10 +3093,7 @@ def parse_requirements(strs):
 class Requirement(packaging.requirements.Requirement):
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
-        try:
-            super(Requirement, self).__init__(requirement_string)
-        except packaging.requirements.InvalidRequirement as e:
-            raise RequirementParseError(str(e))
+        super(Requirement, self).__init__(requirement_string)
         self.unsafe_name = self.name
         project_name = safe_name(self.name)
         self.project_name, self.key = project_name, project_name.lower()

From 7c571c264e0f49965ee2dabbcb9f360aa9c91e28 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 10:31:53 -0400
Subject: [PATCH 7897/8469] Reword and simplify note about supported versions.

---
 .../setuptools-warns-about-python-2-incompatibility.md          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
index b5fe8abf68..1a4f58f284 100644
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
@@ -13,7 +13,7 @@ Please DO NOT SUBMIT this template without first investigating the issue and ans
 
 If you did not intend to use this template, but only meant to file a blank issue, just hit the back button and click "Open a blank issue".
 
-It's by design that Setuptools 45 and later will stop working on Python 2. To ease the transition, Setuptools 45 was released to continue to have Python 2 compatibility, but emit a strenuous warning that it will stop working.
+Setuptools 45 dropped support for Python 2 with a strenuous warning and Setuptools 47 fails to run on Python 2.
 
 In most cases, using pip 9 or later to install Setuptools from PyPI or any index supporting the Requires-Python metadata will do the right thing and install Setuptools 44.x on Python 2.
 

From e0b3acb4868f8283565fae462b71fb75d1c5a2bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 10:33:46 -0400
Subject: [PATCH 7898/8469] Add changelog entry.

---
 changelog.d/2094.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2094.breaking.rst

diff --git a/changelog.d/2094.breaking.rst b/changelog.d/2094.breaking.rst
new file mode 100644
index 0000000000..c278d0fdb4
--- /dev/null
+++ b/changelog.d/2094.breaking.rst
@@ -0,0 +1 @@
+Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.

From 96f0781f08b3da918ffaafae656623c3c3152682 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 10:39:33 -0400
Subject: [PATCH 7899/8469] Wrap lines and remove newlines between enumerated
 paragraphs.

---
 docs/python 2 sunset.txt | 68 ++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt
index 6b8016fb04..a6d768cb2e 100644
--- a/docs/python 2 sunset.txt	
+++ b/docs/python 2 sunset.txt	
@@ -3,33 +3,67 @@
 Python 2 Sunset
 ===============
 
-Since January 2020 and the release of Setuptools 45, Python 2 is no longer supported by the most current release (`discussion <https://github.com/pypa/setuptools/issues/1458>`_). Setuptools as a project continues to support Python 2 with bugfixes and important features on Setuptools 44.x.
+Since January 2020 and the release of Setuptools 45, Python 2 is no longer
+supported by the most current release (`discussion
+<https://github.com/pypa/setuptools/issues/1458>`_). Setuptools as a project
+continues to support Python 2 with bugfixes and important features on
+Setuptools 44.x.
 
-By design, most users will be unaffected by this change. That's because Setuptools 45 declares its supported Python versions to exclude Python 2.7, and installers such as pip 9 or later will honor this declaration and prevent installation of Setuptools 45 or later in Python 2 environments.
+By design, most users will be unaffected by this change. That's because
+Setuptools 45 declares its supported Python versions to exclude Python 2.7,
+and installers such as pip 9 or later will honor this declaration and prevent
+installation of Setuptools 45 or later in Python 2 environments.
 
-Users that do import any portion of Setuptools 45 or later on Python 2 are directed to this documentation to provide guidance on how to work around the issues.
+Users that do import any portion of Setuptools 45 or later on Python 2 are
+directed to this documentation to provide guidance on how to work around the
+issues.
 
 Workarounds
 -----------
 
-The best recommendation is to avoid Python 2 and move to Python 3 where possible. This project acknowledges that not all environments can drop Python 2 support, so provides other options.
+The best recommendation is to avoid Python 2 and move to Python 3 where
+possible. This project acknowledges that not all environments can drop Python
+2 support, so provides other options.
 
-In less common scenarios, later versions of Setuptools can be installed on unsupported Python versions. In these environments, the installer is advised to first install ``setuptools<45`` to "pin Setuptools" to a compatible version.
+In less common scenarios, later versions of Setuptools can be installed on
+unsupported Python versions. In these environments, the installer is advised
+to first install ``setuptools<45`` to "pin Setuptools" to a compatible
+version.
 
-- When using older versions of pip (before 9.0), the ``Requires-Python`` directive is not honored and invalid versions can be installed. Users are advised first to upgrade pip and retry or to pin Setuptools. Use ``pip --version`` to determine the version of pip.
-- When using ``easy_install``, ``Requires-Python`` is not honored and later versions can be installed. In this case, users are advised to pin Setuptools. This applies to ``setup.py install`` invocations as well, as they use Setuptools under the hood.
+- When using older versions of pip (before 9.0), the ``Requires-Python``
+  directive is not honored and invalid versions can be installed. Users are
+  advised first to upgrade pip and retry or to pin Setuptools. Use ``pip
+  --version`` to determine the version of pip.
+- When using ``easy_install``, ``Requires-Python`` is not honored and later
+  versions can be installed. In this case, users are advised to pin
+  Setuptools. This applies to ``setup.py install`` invocations as well, as
+  they use Setuptools under the hood.
 
 It's still not working
 ----------------------
 
-If after trying the above steps, the Python environment still has incompatible versions of Setuptools installed, here are some things to try.
+If after trying the above steps, the Python environment still has incompatible
+versions of Setuptools installed, here are some things to try.
 
-1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for the relevant environment. Repeat until there is no Setuptools installed. Then ``pip install setuptools``.
-
-2. If possible, attempt to replicate the problem in a second environment (virtual machine, friend's computer, etc). If the issue is isolated to just one unique enviornment, first determine what is different about those environments (or reinstall/reset the failing one to defaults).
-
-3. End users who are not themselves the maintainers for the package they are trying to install should contact the support channels for the relevant application. Please be respectful by searching for existing issues and following the latest guidance before reaching out for support. When filing an issue, be sure to give as much detail as possible to help the maintainers understand what factors led to the issue after following their recommended guidance.
-
-4. Reach out to your local support groups. There's a good chance someone nearby has the expertise and willingness to help.
-
-5. If all else fails, `file this template <https://github.com/pypa/setuptools/issues/new?assignees=&labels=Python+2&template=setuptools-warns-about-python-2-incompatibility.md&title=Incompatible+install+in+(summarize+your+environment)>`_ with Setuptools. Please complete the whole template, providing as much detail about what factors led to the issue. Setuptools maintainers will summarily close tickets filed without any meaningful detail or engagement with the issue.
+1. Uninstall and reinstall Setuptools. Run ``pip uninstall -y setuptools`` for
+   the relevant environment. Repeat until there is no Setuptools installed.
+   Then ``pip install setuptools``.
+2. If possible, attempt to replicate the problem in a second environment
+   (virtual machine, friend's computer, etc). If the issue is isolated to just
+   one unique enviornment, first determine what is different about those
+   environments (or reinstall/reset the failing one to defaults).
+3. End users who are not themselves the maintainers for the package they are
+   trying to install should contact the support channels for the relevant
+   application. Please be respectful by searching for existing issues and
+   following the latest guidance before reaching out for support. When filing
+   an issue, be sure to give as much detail as possible to help the
+   maintainers understand what factors led to the issue after following their
+   recommended guidance.
+4. Reach out to your local support groups. There's a good chance someone
+   nearby has the expertise and willingness to help.
+5. If all else fails, `file this template
+   <https://github.com/pypa/setuptools/issues/new?assignees=&labels=Python+2&template=setuptools-warns-about-python-2-incompatibility.md&title=Incompatible+install+in+(summarize+your+environment)>`_
+   with Setuptools. Please complete the whole template, providing as much
+   detail about what factors led to the issue. Setuptools maintainers will
+   summarily close tickets filed without any meaningful detail or engagement
+   with the issue.

From dbdd19d4212a35ac501c3f56987c035512ab6557 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 10:40:09 -0400
Subject: [PATCH 7900/8469] s/respectful/considerate of those projects/

---
 docs/python 2 sunset.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.txt
index a6d768cb2e..f7b7ee257f 100644
--- a/docs/python 2 sunset.txt	
+++ b/docs/python 2 sunset.txt	
@@ -54,11 +54,11 @@ versions of Setuptools installed, here are some things to try.
    environments (or reinstall/reset the failing one to defaults).
 3. End users who are not themselves the maintainers for the package they are
    trying to install should contact the support channels for the relevant
-   application. Please be respectful by searching for existing issues and
-   following the latest guidance before reaching out for support. When filing
-   an issue, be sure to give as much detail as possible to help the
-   maintainers understand what factors led to the issue after following their
-   recommended guidance.
+   application. Please be considerate of those projects by searching for
+   existing issues and following the latest guidance before reaching out for
+   support. When filing an issue, be sure to give as much detail as possible
+   to help the maintainers understand what factors led to the issue after
+   following their recommended guidance.
 4. Reach out to your local support groups. There's a good chance someone
    nearby has the expertise and willingness to help.
 5. If all else fails, `file this template

From 780b91b3834e49eeb07d35afd1f419fee777f904 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 15:37:30 -0400
Subject: [PATCH 7901/8469] docs: changed some mistaken explanation in quickst

---
 docs/userguide/quickstart.txt | 97 ++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 53 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index d0fe4a2865..3798c40296 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -88,19 +88,22 @@ therefore provides two convenient tools to ease the burden: ``find: `` and
 
     [options]
     packages = find:
+    package_dir=
 
     [options.packages.find] #optional
-    where="."
-    include=['pkg1', 'pkg2']
-    exclude=['pkg3', 'pkg4']]
+    where=
+    include=pkg1, pkg2
+    exclude=pk3, pk4
 
 
 When you pass the above information, alongside other necessary ones,
 ``setuptools`` walks through the directory specified in ``where`` (default to
-current directory) and filters the packages
+current directory when left empty) and filters the packages
 it can find following the ``include``  (default to none), then remove
 those that match the ``exclude`` and return a list of Python packages. Note
-that each entry in the ``[options.packages.find]`` is optional.
+that each entry in the ``[options.packages.find]`` is optional. And when
+``where`` keyword is used, ``package_dir`` also need to be specified (so that
+the packages discovered by ``find:`` can actually be loaded)
 
 For more details and advanced use, go to :ref:`package_discovery`
 
@@ -110,40 +113,45 @@ Entry points and automatic script creation
 Setuptools support automatic creation of scripts upon installation, that runs
 code within your package if you specify them with the ``entry_point`` keyword.
 This is what allows you to run commands like ``pip install`` instead of having
-to type ``python -m pip install``. To accomplish this, consider the following
-example::
-
-    setup(
-        #....
-        entry_points={
-            "console_scripts": [
-                "foo = my_package.some_module:main_func",
-            ],
-        }
-    )
-
-When this project is installed, a ``foo`` script will be installed and will
-invoke the ``main_func`` when called by the user. For detailed usage, including
-managing the additional or optional dependencies, go to :ref:`entry_point`.
+to type ``python -m pip install``. To accomplish this, add the entry_points
+keyword in your ``setup.cfg``:
+
+.. code-block:: ini
+
+    [options]
+    entry_points =
+        [console_script]
+        main = mypkg:some_func
+
+When this project is installed, a ``main`` script will be installed and will
+invoke the ``some_func`` in the ``__init__.py`` file when called by the user.
+For detailed usage, including managing the additional or optional dependencies,
+go to :ref:`entry_point`.
 
 Dependency management
 =====================
 
 ``setuptools`` supports automatically installing dependencies when a package is
 installed. The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers::
-
-    setup(
-        #...
-        install_requires = "docutils >= 0.3"
-    )
+``install_requires`` argument to ``setup.cfg``.  It takes a string or list of
+strings containing requirement specifiers (A version specifier is one of the
+operators <, >, <=, >=, == or !=, followed by a version identifier):
 
-When your project is installed, either by using pip, ``setup.py install``,
-or ``setup.py develop``, all of the dependencies not already installed will
-be located (via PyPI), downloaded, built (if necessary), and installed.
+.. code-block:: ini
 
-For more advanced use, see :ref:`dependency_management`
+    [options]
+    install_requires =
+        docutils >= 0.3
+        requests <= 0.4
+
+When your project is installed, all of the dependencies not already installed
+will be located (via PyPI), downloaded, built (if necessary), and installed.
+This, of course, is a simplified scenarios. ``setuptools`` also provide
+additional keywords such as ``setup_requires`` that allows you to install
+dependencies before running the script, and ``extras_requires`` that take
+care of those needed by automatically generated scripts. It also provides
+mechanisms to handle dependencies that are not in PyPI. For more advanced use,
+see :ref:`dependency_management`
 
 Including Data Files
 ====================
@@ -151,35 +159,18 @@ Including Data Files
 The distutils have traditionally allowed installation of "data files", which
 are placed in a platform-specific location. Setuptools offers three ways to
 specify data files to be included in your packages. For the simpliest use, you
-can simply use the ``include_package_data`` keyword e.g.::
+can simply use the ``include_package_data`` keyword:
+
+.. code-block:: ini
 
-    setup(
-            ...
-            include_package_data=True
-        )
+    [options]
+    include_package_data = True
 
 This tells setuptools to install any data files it finds in your packages.
 The data files must be specified via the distutils' ``MANIFEST.in`` file.
 
 For more details, see :ref:`datafiles`
 
-Development mode
-================
-
-Setuptools allows you to deploy your projects for use in a common directory or
-staging area, but without copying any files.  Thus, you can edit each project's
-code in its checkout directory, and only need to run build commands when you
-change a project's C extensions or similarly compiled files.
-
-To do this, use the ``setup.py develop`` command.  It works very similarly to
-``setup.py install``, except that it doesn't actually install anything.
-Instead, it creates a special ``.egg-link`` file in the deployment directory,
-that links to your project's source code.  And, if your deployment directory is
-Python's ``site-packages`` directory, it will also update the
-``easy-install.pth`` file to include your project's source code, thereby making
-it available on ``sys.path`` for all programs using that Python installation.
-
-for more information, go to :ref:`development_mode`
 
 Distributing a ``setuptools``-based project
 ===========================================

From 8dbae6eea738b17e1a22ea2949993f0bf238a57f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 15:50:00 -0400
Subject: [PATCH 7902/8469] docs: update quickstart

It is now declarative and covers the following aspects of packaging:

- installation
- basic use
- package discovery
- entry points
- dependencies
- data files

Each section comprises a brief demonstration of the functionality
and provide a link to more advanced explanation
---
 docs/userguide/quickstart.txt | 59 +++++++----------------------------
 1 file changed, 12 insertions(+), 47 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 3798c40296..95abec0f6a 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -24,7 +24,8 @@ be generated with whatever tools that provides a ``build sdist``-alike
 functionality. While this may appear cumbersome, given the added pieces,
 it in fact tremendously enhances the portability of your package. The
 change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
-build-requirements>``
+build-requirements>``. To learn more about Python packaging in general,
+navigate to the `bottom <Resources on python packaging>`_ of this page.
 
 Basic Use
 =========
@@ -61,12 +62,14 @@ This is what your project would look like::
         setup.cfg
         mypackage/__init__.py
 
-As you can see, it doesn't take much to use setuptools in a project. Invoke
-the installer at the root of your package::
+Then, you need an installer, such as ``pep517 <https://pypi.org/project/pep517/``
+which you can obtain via ``pip install pep517``. After downloading it, invoke
+the installer::
 
     pep517 build
 
-You now have your distribution ready, which you can upload to PyPI.
+You now have your distribution ready (e.g. a ``tar.gz`` file and a ``.whl``
+file in the ``dist``), which you can upload to PyPI!
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
@@ -88,24 +91,19 @@ therefore provides two convenient tools to ease the burden: ``find: `` and
 
     [options]
     packages = find:
-    package_dir=
 
     [options.packages.find] #optional
-    where=
     include=pkg1, pkg2
     exclude=pk3, pk4
 
-
 When you pass the above information, alongside other necessary ones,
-``setuptools`` walks through the directory specified in ``where`` (default to
-current directory when left empty) and filters the packages
+``setuptools`` walks through the directory specified in ``where`` (omitted
+here as the package reside in current directory) and filters the packages
 it can find following the ``include``  (default to none), then remove
 those that match the ``exclude`` and return a list of Python packages. Note
-that each entry in the ``[options.packages.find]`` is optional. And when
-``where`` keyword is used, ``package_dir`` also need to be specified (so that
-the packages discovered by ``find:`` can actually be loaded)
-
-For more details and advanced use, go to :ref:`package_discovery`
+that each entry in the ``[options.packages.find]`` is optional. The above
+setup also allows you to adopt a ``src/`` layout. For more details and advanced
+use, go to :ref:`package_discovery`
 
 Entry points and automatic script creation
 ===========================================
@@ -170,36 +168,3 @@ This tells setuptools to install any data files it finds in your packages.
 The data files must be specified via the distutils' ``MANIFEST.in`` file.
 
 For more details, see :ref:`datafiles`
-
-
-Distributing a ``setuptools``-based project
-===========================================
-Before you begin, make sure you have the latest versions of setuptools and wheel::
-
-    pip install --upgrade setuptools wheel
-
-To build a setuptools project, run this command from the same directory where
-setup.py is located::
-
-    setup.py sdist bdist_wheel
-
-This will generate distribution archives in the `dist` directory.
-
-Before you upload the generated archives make sure you're registered on
-https://test.pypi.org/account/register/. You will also need to verify your email
-to be able to upload any packages.
-You should install twine to be able to upload packages::
-
-    pip install --upgrade twine
-
-Now, to upload these archives, run::
-
-    twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-
-To install your newly uploaded package ``example_pkg``,  you can use pip::
-
-    pip install --index-url https://test.pypi.org/simple/ example_pkg
-
-The next following sections will walk you through all of the available functions
-``setuptools`` offers in excrutiating details (including those already mentioned)
-for more advanced use.

From cd7d6d56a1cf84cafea44f7cf7e357a926821f03 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Wed, 8 Nov 2017 16:41:32 -0600
Subject: [PATCH 7903/8469] [maint] move all files into subfolder

---
 README => distutils/README                          |   0
 __init__.py => distutils/__init__.py                |   0
 _msvccompiler.py => distutils/_msvccompiler.py      |   0
 archive_util.py => distutils/archive_util.py        |   0
 bcppcompiler.py => distutils/bcppcompiler.py        |   0
 ccompiler.py => distutils/ccompiler.py              |   0
 cmd.py => distutils/cmd.py                          |   0
 {command => distutils/command}/__init__.py          |   0
 {command => distutils/command}/bdist.py             |   0
 {command => distutils/command}/bdist_dumb.py        |   0
 {command => distutils/command}/bdist_msi.py         |   0
 {command => distutils/command}/bdist_rpm.py         |   0
 {command => distutils/command}/bdist_wininst.py     |   0
 {command => distutils/command}/build.py             |   0
 {command => distutils/command}/build_clib.py        |   0
 {command => distutils/command}/build_ext.py         |   0
 {command => distutils/command}/build_py.py          |   0
 {command => distutils/command}/build_scripts.py     |   0
 {command => distutils/command}/check.py             |   0
 {command => distutils/command}/clean.py             |   0
 {command => distutils/command}/command_template     |   0
 {command => distutils/command}/config.py            |   0
 {command => distutils/command}/install.py           |   0
 {command => distutils/command}/install_data.py      |   0
 {command => distutils/command}/install_egg_info.py  |   0
 {command => distutils/command}/install_headers.py   |   0
 {command => distutils/command}/install_lib.py       |   0
 {command => distutils/command}/install_scripts.py   |   0
 {command => distutils/command}/register.py          |   0
 {command => distutils/command}/sdist.py             |   0
 {command => distutils/command}/upload.py            |   0
 .../command}/wininst-10.0-amd64.exe                 | Bin
 {command => distutils/command}/wininst-10.0.exe     | Bin
 .../command}/wininst-14.0-amd64.exe                 | Bin
 {command => distutils/command}/wininst-14.0.exe     | Bin
 {command => distutils/command}/wininst-6.0.exe      | Bin
 {command => distutils/command}/wininst-7.1.exe      | Bin
 {command => distutils/command}/wininst-8.0.exe      | Bin
 .../command}/wininst-9.0-amd64.exe                  | Bin
 {command => distutils/command}/wininst-9.0.exe      | Bin
 config.py => distutils/config.py                    |   0
 core.py => distutils/core.py                        |   0
 cygwinccompiler.py => distutils/cygwinccompiler.py  |   0
 debug.py => distutils/debug.py                      |   0
 dep_util.py => distutils/dep_util.py                |   0
 dir_util.py => distutils/dir_util.py                |   0
 dist.py => distutils/dist.py                        |   0
 errors.py => distutils/errors.py                    |   0
 extension.py => distutils/extension.py              |   0
 fancy_getopt.py => distutils/fancy_getopt.py        |   0
 file_util.py => distutils/file_util.py              |   0
 filelist.py => distutils/filelist.py                |   0
 log.py => distutils/log.py                          |   0
 msvc9compiler.py => distutils/msvc9compiler.py      |   0
 msvccompiler.py => distutils/msvccompiler.py        |   0
 spawn.py => distutils/spawn.py                      |   0
 sysconfig.py => distutils/sysconfig.py              |   0
 {tests => distutils/tests}/Setup.sample             |   0
 {tests => distutils/tests}/__init__.py              |   0
 {tests => distutils/tests}/includetest.rst          |   0
 {tests => distutils/tests}/support.py               |   0
 {tests => distutils/tests}/test_archive_util.py     |   0
 {tests => distutils/tests}/test_bdist.py            |   0
 {tests => distutils/tests}/test_bdist_dumb.py       |   0
 {tests => distutils/tests}/test_bdist_msi.py        |   0
 {tests => distutils/tests}/test_bdist_rpm.py        |   0
 {tests => distutils/tests}/test_bdist_wininst.py    |   0
 {tests => distutils/tests}/test_build.py            |   0
 {tests => distutils/tests}/test_build_clib.py       |   0
 {tests => distutils/tests}/test_build_ext.py        |   0
 {tests => distutils/tests}/test_build_py.py         |   0
 {tests => distutils/tests}/test_build_scripts.py    |   0
 {tests => distutils/tests}/test_check.py            |   0
 {tests => distutils/tests}/test_clean.py            |   0
 {tests => distutils/tests}/test_cmd.py              |   0
 {tests => distutils/tests}/test_config.py           |   0
 {tests => distutils/tests}/test_config_cmd.py       |   0
 {tests => distutils/tests}/test_core.py             |   0
 {tests => distutils/tests}/test_cygwinccompiler.py  |   0
 {tests => distutils/tests}/test_dep_util.py         |   0
 {tests => distutils/tests}/test_dir_util.py         |   0
 {tests => distutils/tests}/test_dist.py             |   0
 {tests => distutils/tests}/test_extension.py        |   0
 {tests => distutils/tests}/test_file_util.py        |   0
 {tests => distutils/tests}/test_filelist.py         |   0
 {tests => distutils/tests}/test_install.py          |   0
 {tests => distutils/tests}/test_install_data.py     |   0
 {tests => distutils/tests}/test_install_headers.py  |   0
 {tests => distutils/tests}/test_install_lib.py      |   0
 {tests => distutils/tests}/test_install_scripts.py  |   0
 {tests => distutils/tests}/test_log.py              |   0
 {tests => distutils/tests}/test_msvc9compiler.py    |   0
 {tests => distutils/tests}/test_msvccompiler.py     |   0
 {tests => distutils/tests}/test_register.py         |   0
 {tests => distutils/tests}/test_sdist.py            |   0
 {tests => distutils/tests}/test_spawn.py            |   0
 {tests => distutils/tests}/test_sysconfig.py        |   0
 {tests => distutils/tests}/test_text_file.py        |   0
 {tests => distutils/tests}/test_unixccompiler.py    |   0
 {tests => distutils/tests}/test_upload.py           |   0
 {tests => distutils/tests}/test_util.py             |   0
 {tests => distutils/tests}/test_version.py          |   0
 {tests => distutils/tests}/test_versionpredicate.py |   0
 text_file.py => distutils/text_file.py              |   0
 unixccompiler.py => distutils/unixccompiler.py      |   0
 util.py => distutils/util.py                        |   0
 version.py => distutils/version.py                  |   0
 .../versionpredicate.py                             |   0
 108 files changed, 0 insertions(+), 0 deletions(-)
 rename README => distutils/README (100%)
 rename __init__.py => distutils/__init__.py (100%)
 rename _msvccompiler.py => distutils/_msvccompiler.py (100%)
 rename archive_util.py => distutils/archive_util.py (100%)
 rename bcppcompiler.py => distutils/bcppcompiler.py (100%)
 rename ccompiler.py => distutils/ccompiler.py (100%)
 rename cmd.py => distutils/cmd.py (100%)
 rename {command => distutils/command}/__init__.py (100%)
 rename {command => distutils/command}/bdist.py (100%)
 rename {command => distutils/command}/bdist_dumb.py (100%)
 rename {command => distutils/command}/bdist_msi.py (100%)
 rename {command => distutils/command}/bdist_rpm.py (100%)
 rename {command => distutils/command}/bdist_wininst.py (100%)
 rename {command => distutils/command}/build.py (100%)
 rename {command => distutils/command}/build_clib.py (100%)
 rename {command => distutils/command}/build_ext.py (100%)
 rename {command => distutils/command}/build_py.py (100%)
 rename {command => distutils/command}/build_scripts.py (100%)
 rename {command => distutils/command}/check.py (100%)
 rename {command => distutils/command}/clean.py (100%)
 rename {command => distutils/command}/command_template (100%)
 rename {command => distutils/command}/config.py (100%)
 rename {command => distutils/command}/install.py (100%)
 rename {command => distutils/command}/install_data.py (100%)
 rename {command => distutils/command}/install_egg_info.py (100%)
 rename {command => distutils/command}/install_headers.py (100%)
 rename {command => distutils/command}/install_lib.py (100%)
 rename {command => distutils/command}/install_scripts.py (100%)
 rename {command => distutils/command}/register.py (100%)
 rename {command => distutils/command}/sdist.py (100%)
 rename {command => distutils/command}/upload.py (100%)
 rename {command => distutils/command}/wininst-10.0-amd64.exe (100%)
 rename {command => distutils/command}/wininst-10.0.exe (100%)
 rename {command => distutils/command}/wininst-14.0-amd64.exe (100%)
 rename {command => distutils/command}/wininst-14.0.exe (100%)
 rename {command => distutils/command}/wininst-6.0.exe (100%)
 rename {command => distutils/command}/wininst-7.1.exe (100%)
 rename {command => distutils/command}/wininst-8.0.exe (100%)
 rename {command => distutils/command}/wininst-9.0-amd64.exe (100%)
 rename {command => distutils/command}/wininst-9.0.exe (100%)
 rename config.py => distutils/config.py (100%)
 rename core.py => distutils/core.py (100%)
 rename cygwinccompiler.py => distutils/cygwinccompiler.py (100%)
 rename debug.py => distutils/debug.py (100%)
 rename dep_util.py => distutils/dep_util.py (100%)
 rename dir_util.py => distutils/dir_util.py (100%)
 rename dist.py => distutils/dist.py (100%)
 rename errors.py => distutils/errors.py (100%)
 rename extension.py => distutils/extension.py (100%)
 rename fancy_getopt.py => distutils/fancy_getopt.py (100%)
 rename file_util.py => distutils/file_util.py (100%)
 rename filelist.py => distutils/filelist.py (100%)
 rename log.py => distutils/log.py (100%)
 rename msvc9compiler.py => distutils/msvc9compiler.py (100%)
 rename msvccompiler.py => distutils/msvccompiler.py (100%)
 rename spawn.py => distutils/spawn.py (100%)
 rename sysconfig.py => distutils/sysconfig.py (100%)
 rename {tests => distutils/tests}/Setup.sample (100%)
 rename {tests => distutils/tests}/__init__.py (100%)
 rename {tests => distutils/tests}/includetest.rst (100%)
 rename {tests => distutils/tests}/support.py (100%)
 rename {tests => distutils/tests}/test_archive_util.py (100%)
 rename {tests => distutils/tests}/test_bdist.py (100%)
 rename {tests => distutils/tests}/test_bdist_dumb.py (100%)
 rename {tests => distutils/tests}/test_bdist_msi.py (100%)
 rename {tests => distutils/tests}/test_bdist_rpm.py (100%)
 rename {tests => distutils/tests}/test_bdist_wininst.py (100%)
 rename {tests => distutils/tests}/test_build.py (100%)
 rename {tests => distutils/tests}/test_build_clib.py (100%)
 rename {tests => distutils/tests}/test_build_ext.py (100%)
 rename {tests => distutils/tests}/test_build_py.py (100%)
 rename {tests => distutils/tests}/test_build_scripts.py (100%)
 rename {tests => distutils/tests}/test_check.py (100%)
 rename {tests => distutils/tests}/test_clean.py (100%)
 rename {tests => distutils/tests}/test_cmd.py (100%)
 rename {tests => distutils/tests}/test_config.py (100%)
 rename {tests => distutils/tests}/test_config_cmd.py (100%)
 rename {tests => distutils/tests}/test_core.py (100%)
 rename {tests => distutils/tests}/test_cygwinccompiler.py (100%)
 rename {tests => distutils/tests}/test_dep_util.py (100%)
 rename {tests => distutils/tests}/test_dir_util.py (100%)
 rename {tests => distutils/tests}/test_dist.py (100%)
 rename {tests => distutils/tests}/test_extension.py (100%)
 rename {tests => distutils/tests}/test_file_util.py (100%)
 rename {tests => distutils/tests}/test_filelist.py (100%)
 rename {tests => distutils/tests}/test_install.py (100%)
 rename {tests => distutils/tests}/test_install_data.py (100%)
 rename {tests => distutils/tests}/test_install_headers.py (100%)
 rename {tests => distutils/tests}/test_install_lib.py (100%)
 rename {tests => distutils/tests}/test_install_scripts.py (100%)
 rename {tests => distutils/tests}/test_log.py (100%)
 rename {tests => distutils/tests}/test_msvc9compiler.py (100%)
 rename {tests => distutils/tests}/test_msvccompiler.py (100%)
 rename {tests => distutils/tests}/test_register.py (100%)
 rename {tests => distutils/tests}/test_sdist.py (100%)
 rename {tests => distutils/tests}/test_spawn.py (100%)
 rename {tests => distutils/tests}/test_sysconfig.py (100%)
 rename {tests => distutils/tests}/test_text_file.py (100%)
 rename {tests => distutils/tests}/test_unixccompiler.py (100%)
 rename {tests => distutils/tests}/test_upload.py (100%)
 rename {tests => distutils/tests}/test_util.py (100%)
 rename {tests => distutils/tests}/test_version.py (100%)
 rename {tests => distutils/tests}/test_versionpredicate.py (100%)
 rename text_file.py => distutils/text_file.py (100%)
 rename unixccompiler.py => distutils/unixccompiler.py (100%)
 rename util.py => distutils/util.py (100%)
 rename version.py => distutils/version.py (100%)
 rename versionpredicate.py => distutils/versionpredicate.py (100%)

diff --git a/README b/distutils/README
similarity index 100%
rename from README
rename to distutils/README
diff --git a/__init__.py b/distutils/__init__.py
similarity index 100%
rename from __init__.py
rename to distutils/__init__.py
diff --git a/_msvccompiler.py b/distutils/_msvccompiler.py
similarity index 100%
rename from _msvccompiler.py
rename to distutils/_msvccompiler.py
diff --git a/archive_util.py b/distutils/archive_util.py
similarity index 100%
rename from archive_util.py
rename to distutils/archive_util.py
diff --git a/bcppcompiler.py b/distutils/bcppcompiler.py
similarity index 100%
rename from bcppcompiler.py
rename to distutils/bcppcompiler.py
diff --git a/ccompiler.py b/distutils/ccompiler.py
similarity index 100%
rename from ccompiler.py
rename to distutils/ccompiler.py
diff --git a/cmd.py b/distutils/cmd.py
similarity index 100%
rename from cmd.py
rename to distutils/cmd.py
diff --git a/command/__init__.py b/distutils/command/__init__.py
similarity index 100%
rename from command/__init__.py
rename to distutils/command/__init__.py
diff --git a/command/bdist.py b/distutils/command/bdist.py
similarity index 100%
rename from command/bdist.py
rename to distutils/command/bdist.py
diff --git a/command/bdist_dumb.py b/distutils/command/bdist_dumb.py
similarity index 100%
rename from command/bdist_dumb.py
rename to distutils/command/bdist_dumb.py
diff --git a/command/bdist_msi.py b/distutils/command/bdist_msi.py
similarity index 100%
rename from command/bdist_msi.py
rename to distutils/command/bdist_msi.py
diff --git a/command/bdist_rpm.py b/distutils/command/bdist_rpm.py
similarity index 100%
rename from command/bdist_rpm.py
rename to distutils/command/bdist_rpm.py
diff --git a/command/bdist_wininst.py b/distutils/command/bdist_wininst.py
similarity index 100%
rename from command/bdist_wininst.py
rename to distutils/command/bdist_wininst.py
diff --git a/command/build.py b/distutils/command/build.py
similarity index 100%
rename from command/build.py
rename to distutils/command/build.py
diff --git a/command/build_clib.py b/distutils/command/build_clib.py
similarity index 100%
rename from command/build_clib.py
rename to distutils/command/build_clib.py
diff --git a/command/build_ext.py b/distutils/command/build_ext.py
similarity index 100%
rename from command/build_ext.py
rename to distutils/command/build_ext.py
diff --git a/command/build_py.py b/distutils/command/build_py.py
similarity index 100%
rename from command/build_py.py
rename to distutils/command/build_py.py
diff --git a/command/build_scripts.py b/distutils/command/build_scripts.py
similarity index 100%
rename from command/build_scripts.py
rename to distutils/command/build_scripts.py
diff --git a/command/check.py b/distutils/command/check.py
similarity index 100%
rename from command/check.py
rename to distutils/command/check.py
diff --git a/command/clean.py b/distutils/command/clean.py
similarity index 100%
rename from command/clean.py
rename to distutils/command/clean.py
diff --git a/command/command_template b/distutils/command/command_template
similarity index 100%
rename from command/command_template
rename to distutils/command/command_template
diff --git a/command/config.py b/distutils/command/config.py
similarity index 100%
rename from command/config.py
rename to distutils/command/config.py
diff --git a/command/install.py b/distutils/command/install.py
similarity index 100%
rename from command/install.py
rename to distutils/command/install.py
diff --git a/command/install_data.py b/distutils/command/install_data.py
similarity index 100%
rename from command/install_data.py
rename to distutils/command/install_data.py
diff --git a/command/install_egg_info.py b/distutils/command/install_egg_info.py
similarity index 100%
rename from command/install_egg_info.py
rename to distutils/command/install_egg_info.py
diff --git a/command/install_headers.py b/distutils/command/install_headers.py
similarity index 100%
rename from command/install_headers.py
rename to distutils/command/install_headers.py
diff --git a/command/install_lib.py b/distutils/command/install_lib.py
similarity index 100%
rename from command/install_lib.py
rename to distutils/command/install_lib.py
diff --git a/command/install_scripts.py b/distutils/command/install_scripts.py
similarity index 100%
rename from command/install_scripts.py
rename to distutils/command/install_scripts.py
diff --git a/command/register.py b/distutils/command/register.py
similarity index 100%
rename from command/register.py
rename to distutils/command/register.py
diff --git a/command/sdist.py b/distutils/command/sdist.py
similarity index 100%
rename from command/sdist.py
rename to distutils/command/sdist.py
diff --git a/command/upload.py b/distutils/command/upload.py
similarity index 100%
rename from command/upload.py
rename to distutils/command/upload.py
diff --git a/command/wininst-10.0-amd64.exe b/distutils/command/wininst-10.0-amd64.exe
similarity index 100%
rename from command/wininst-10.0-amd64.exe
rename to distutils/command/wininst-10.0-amd64.exe
diff --git a/command/wininst-10.0.exe b/distutils/command/wininst-10.0.exe
similarity index 100%
rename from command/wininst-10.0.exe
rename to distutils/command/wininst-10.0.exe
diff --git a/command/wininst-14.0-amd64.exe b/distutils/command/wininst-14.0-amd64.exe
similarity index 100%
rename from command/wininst-14.0-amd64.exe
rename to distutils/command/wininst-14.0-amd64.exe
diff --git a/command/wininst-14.0.exe b/distutils/command/wininst-14.0.exe
similarity index 100%
rename from command/wininst-14.0.exe
rename to distutils/command/wininst-14.0.exe
diff --git a/command/wininst-6.0.exe b/distutils/command/wininst-6.0.exe
similarity index 100%
rename from command/wininst-6.0.exe
rename to distutils/command/wininst-6.0.exe
diff --git a/command/wininst-7.1.exe b/distutils/command/wininst-7.1.exe
similarity index 100%
rename from command/wininst-7.1.exe
rename to distutils/command/wininst-7.1.exe
diff --git a/command/wininst-8.0.exe b/distutils/command/wininst-8.0.exe
similarity index 100%
rename from command/wininst-8.0.exe
rename to distutils/command/wininst-8.0.exe
diff --git a/command/wininst-9.0-amd64.exe b/distutils/command/wininst-9.0-amd64.exe
similarity index 100%
rename from command/wininst-9.0-amd64.exe
rename to distutils/command/wininst-9.0-amd64.exe
diff --git a/command/wininst-9.0.exe b/distutils/command/wininst-9.0.exe
similarity index 100%
rename from command/wininst-9.0.exe
rename to distutils/command/wininst-9.0.exe
diff --git a/config.py b/distutils/config.py
similarity index 100%
rename from config.py
rename to distutils/config.py
diff --git a/core.py b/distutils/core.py
similarity index 100%
rename from core.py
rename to distutils/core.py
diff --git a/cygwinccompiler.py b/distutils/cygwinccompiler.py
similarity index 100%
rename from cygwinccompiler.py
rename to distutils/cygwinccompiler.py
diff --git a/debug.py b/distutils/debug.py
similarity index 100%
rename from debug.py
rename to distutils/debug.py
diff --git a/dep_util.py b/distutils/dep_util.py
similarity index 100%
rename from dep_util.py
rename to distutils/dep_util.py
diff --git a/dir_util.py b/distutils/dir_util.py
similarity index 100%
rename from dir_util.py
rename to distutils/dir_util.py
diff --git a/dist.py b/distutils/dist.py
similarity index 100%
rename from dist.py
rename to distutils/dist.py
diff --git a/errors.py b/distutils/errors.py
similarity index 100%
rename from errors.py
rename to distutils/errors.py
diff --git a/extension.py b/distutils/extension.py
similarity index 100%
rename from extension.py
rename to distutils/extension.py
diff --git a/fancy_getopt.py b/distutils/fancy_getopt.py
similarity index 100%
rename from fancy_getopt.py
rename to distutils/fancy_getopt.py
diff --git a/file_util.py b/distutils/file_util.py
similarity index 100%
rename from file_util.py
rename to distutils/file_util.py
diff --git a/filelist.py b/distutils/filelist.py
similarity index 100%
rename from filelist.py
rename to distutils/filelist.py
diff --git a/log.py b/distutils/log.py
similarity index 100%
rename from log.py
rename to distutils/log.py
diff --git a/msvc9compiler.py b/distutils/msvc9compiler.py
similarity index 100%
rename from msvc9compiler.py
rename to distutils/msvc9compiler.py
diff --git a/msvccompiler.py b/distutils/msvccompiler.py
similarity index 100%
rename from msvccompiler.py
rename to distutils/msvccompiler.py
diff --git a/spawn.py b/distutils/spawn.py
similarity index 100%
rename from spawn.py
rename to distutils/spawn.py
diff --git a/sysconfig.py b/distutils/sysconfig.py
similarity index 100%
rename from sysconfig.py
rename to distutils/sysconfig.py
diff --git a/tests/Setup.sample b/distutils/tests/Setup.sample
similarity index 100%
rename from tests/Setup.sample
rename to distutils/tests/Setup.sample
diff --git a/tests/__init__.py b/distutils/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to distutils/tests/__init__.py
diff --git a/tests/includetest.rst b/distutils/tests/includetest.rst
similarity index 100%
rename from tests/includetest.rst
rename to distutils/tests/includetest.rst
diff --git a/tests/support.py b/distutils/tests/support.py
similarity index 100%
rename from tests/support.py
rename to distutils/tests/support.py
diff --git a/tests/test_archive_util.py b/distutils/tests/test_archive_util.py
similarity index 100%
rename from tests/test_archive_util.py
rename to distutils/tests/test_archive_util.py
diff --git a/tests/test_bdist.py b/distutils/tests/test_bdist.py
similarity index 100%
rename from tests/test_bdist.py
rename to distutils/tests/test_bdist.py
diff --git a/tests/test_bdist_dumb.py b/distutils/tests/test_bdist_dumb.py
similarity index 100%
rename from tests/test_bdist_dumb.py
rename to distutils/tests/test_bdist_dumb.py
diff --git a/tests/test_bdist_msi.py b/distutils/tests/test_bdist_msi.py
similarity index 100%
rename from tests/test_bdist_msi.py
rename to distutils/tests/test_bdist_msi.py
diff --git a/tests/test_bdist_rpm.py b/distutils/tests/test_bdist_rpm.py
similarity index 100%
rename from tests/test_bdist_rpm.py
rename to distutils/tests/test_bdist_rpm.py
diff --git a/tests/test_bdist_wininst.py b/distutils/tests/test_bdist_wininst.py
similarity index 100%
rename from tests/test_bdist_wininst.py
rename to distutils/tests/test_bdist_wininst.py
diff --git a/tests/test_build.py b/distutils/tests/test_build.py
similarity index 100%
rename from tests/test_build.py
rename to distutils/tests/test_build.py
diff --git a/tests/test_build_clib.py b/distutils/tests/test_build_clib.py
similarity index 100%
rename from tests/test_build_clib.py
rename to distutils/tests/test_build_clib.py
diff --git a/tests/test_build_ext.py b/distutils/tests/test_build_ext.py
similarity index 100%
rename from tests/test_build_ext.py
rename to distutils/tests/test_build_ext.py
diff --git a/tests/test_build_py.py b/distutils/tests/test_build_py.py
similarity index 100%
rename from tests/test_build_py.py
rename to distutils/tests/test_build_py.py
diff --git a/tests/test_build_scripts.py b/distutils/tests/test_build_scripts.py
similarity index 100%
rename from tests/test_build_scripts.py
rename to distutils/tests/test_build_scripts.py
diff --git a/tests/test_check.py b/distutils/tests/test_check.py
similarity index 100%
rename from tests/test_check.py
rename to distutils/tests/test_check.py
diff --git a/tests/test_clean.py b/distutils/tests/test_clean.py
similarity index 100%
rename from tests/test_clean.py
rename to distutils/tests/test_clean.py
diff --git a/tests/test_cmd.py b/distutils/tests/test_cmd.py
similarity index 100%
rename from tests/test_cmd.py
rename to distutils/tests/test_cmd.py
diff --git a/tests/test_config.py b/distutils/tests/test_config.py
similarity index 100%
rename from tests/test_config.py
rename to distutils/tests/test_config.py
diff --git a/tests/test_config_cmd.py b/distutils/tests/test_config_cmd.py
similarity index 100%
rename from tests/test_config_cmd.py
rename to distutils/tests/test_config_cmd.py
diff --git a/tests/test_core.py b/distutils/tests/test_core.py
similarity index 100%
rename from tests/test_core.py
rename to distutils/tests/test_core.py
diff --git a/tests/test_cygwinccompiler.py b/distutils/tests/test_cygwinccompiler.py
similarity index 100%
rename from tests/test_cygwinccompiler.py
rename to distutils/tests/test_cygwinccompiler.py
diff --git a/tests/test_dep_util.py b/distutils/tests/test_dep_util.py
similarity index 100%
rename from tests/test_dep_util.py
rename to distutils/tests/test_dep_util.py
diff --git a/tests/test_dir_util.py b/distutils/tests/test_dir_util.py
similarity index 100%
rename from tests/test_dir_util.py
rename to distutils/tests/test_dir_util.py
diff --git a/tests/test_dist.py b/distutils/tests/test_dist.py
similarity index 100%
rename from tests/test_dist.py
rename to distutils/tests/test_dist.py
diff --git a/tests/test_extension.py b/distutils/tests/test_extension.py
similarity index 100%
rename from tests/test_extension.py
rename to distutils/tests/test_extension.py
diff --git a/tests/test_file_util.py b/distutils/tests/test_file_util.py
similarity index 100%
rename from tests/test_file_util.py
rename to distutils/tests/test_file_util.py
diff --git a/tests/test_filelist.py b/distutils/tests/test_filelist.py
similarity index 100%
rename from tests/test_filelist.py
rename to distutils/tests/test_filelist.py
diff --git a/tests/test_install.py b/distutils/tests/test_install.py
similarity index 100%
rename from tests/test_install.py
rename to distutils/tests/test_install.py
diff --git a/tests/test_install_data.py b/distutils/tests/test_install_data.py
similarity index 100%
rename from tests/test_install_data.py
rename to distutils/tests/test_install_data.py
diff --git a/tests/test_install_headers.py b/distutils/tests/test_install_headers.py
similarity index 100%
rename from tests/test_install_headers.py
rename to distutils/tests/test_install_headers.py
diff --git a/tests/test_install_lib.py b/distutils/tests/test_install_lib.py
similarity index 100%
rename from tests/test_install_lib.py
rename to distutils/tests/test_install_lib.py
diff --git a/tests/test_install_scripts.py b/distutils/tests/test_install_scripts.py
similarity index 100%
rename from tests/test_install_scripts.py
rename to distutils/tests/test_install_scripts.py
diff --git a/tests/test_log.py b/distutils/tests/test_log.py
similarity index 100%
rename from tests/test_log.py
rename to distutils/tests/test_log.py
diff --git a/tests/test_msvc9compiler.py b/distutils/tests/test_msvc9compiler.py
similarity index 100%
rename from tests/test_msvc9compiler.py
rename to distutils/tests/test_msvc9compiler.py
diff --git a/tests/test_msvccompiler.py b/distutils/tests/test_msvccompiler.py
similarity index 100%
rename from tests/test_msvccompiler.py
rename to distutils/tests/test_msvccompiler.py
diff --git a/tests/test_register.py b/distutils/tests/test_register.py
similarity index 100%
rename from tests/test_register.py
rename to distutils/tests/test_register.py
diff --git a/tests/test_sdist.py b/distutils/tests/test_sdist.py
similarity index 100%
rename from tests/test_sdist.py
rename to distutils/tests/test_sdist.py
diff --git a/tests/test_spawn.py b/distutils/tests/test_spawn.py
similarity index 100%
rename from tests/test_spawn.py
rename to distutils/tests/test_spawn.py
diff --git a/tests/test_sysconfig.py b/distutils/tests/test_sysconfig.py
similarity index 100%
rename from tests/test_sysconfig.py
rename to distutils/tests/test_sysconfig.py
diff --git a/tests/test_text_file.py b/distutils/tests/test_text_file.py
similarity index 100%
rename from tests/test_text_file.py
rename to distutils/tests/test_text_file.py
diff --git a/tests/test_unixccompiler.py b/distutils/tests/test_unixccompiler.py
similarity index 100%
rename from tests/test_unixccompiler.py
rename to distutils/tests/test_unixccompiler.py
diff --git a/tests/test_upload.py b/distutils/tests/test_upload.py
similarity index 100%
rename from tests/test_upload.py
rename to distutils/tests/test_upload.py
diff --git a/tests/test_util.py b/distutils/tests/test_util.py
similarity index 100%
rename from tests/test_util.py
rename to distutils/tests/test_util.py
diff --git a/tests/test_version.py b/distutils/tests/test_version.py
similarity index 100%
rename from tests/test_version.py
rename to distutils/tests/test_version.py
diff --git a/tests/test_versionpredicate.py b/distutils/tests/test_versionpredicate.py
similarity index 100%
rename from tests/test_versionpredicate.py
rename to distutils/tests/test_versionpredicate.py
diff --git a/text_file.py b/distutils/text_file.py
similarity index 100%
rename from text_file.py
rename to distutils/text_file.py
diff --git a/unixccompiler.py b/distutils/unixccompiler.py
similarity index 100%
rename from unixccompiler.py
rename to distutils/unixccompiler.py
diff --git a/util.py b/distutils/util.py
similarity index 100%
rename from util.py
rename to distutils/util.py
diff --git a/version.py b/distutils/version.py
similarity index 100%
rename from version.py
rename to distutils/version.py
diff --git a/versionpredicate.py b/distutils/versionpredicate.py
similarity index 100%
rename from versionpredicate.py
rename to distutils/versionpredicate.py

From b2af2ea980386f86afe5e104e7fe1bf047ac1df9 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 16:08:57 -0400
Subject: [PATCH 7904/8469] docs: update quickstart

added a few sections (WIP) to make it more complete
---
 docs/userguide/quickstart.txt | 44 +++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 95abec0f6a..1b58dfb363 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -2,20 +2,18 @@
 ``setuptools`` Quickstart
 ==========================
 
+.. contents::
+
 Installation
 ============
 
-.. _Installing Packages: https://packaging.python.org/tutorials/installing-packages/
-
 To install the latest version of setuptools, use::
 
     pip install --upgrade setuptools
 
-Refer to `Installing Packages`_ guide for more information.
 
 Python packaging at a glance
 ============================
-
 The landscape of Python packaging is shifting and ``Setuptools`` has evolved to
 only provide backend support, no longer being the de-facto packaging tool in
 the market. All python package must provide a ``pyproject.toml`` and specify
@@ -27,9 +25,9 @@ change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
 build-requirements>``. To learn more about Python packaging in general,
 navigate to the `bottom <Resources on python packaging>`_ of this page.
 
+
 Basic Use
 =========
-
 For basic use of setuptools, you will need a ``pyproject.toml`` with the
 exact following info, which declares you want to use ``setuptools`` to
 package your project:
@@ -62,14 +60,14 @@ This is what your project would look like::
         setup.cfg
         mypackage/__init__.py
 
-Then, you need an installer, such as ``pep517 <https://pypi.org/project/pep517/``
+Then, you need an installer, such as `pep517 <https://pypi.org/project/pep517/>`_
 which you can obtain via ``pip install pep517``. After downloading it, invoke
 the installer::
 
     pep517 build
 
 You now have your distribution ready (e.g. a ``tar.gz`` file and a ``.whl``
-file in the ``dist``), which you can upload to PyPI!
+file in the ``dist`` directory), which you can upload to PyPI!
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
@@ -78,9 +76,9 @@ dependencies, and perhaps some data files and scripts. In the next few section,
 we will walk through those additional but essential information you need
 to specify to properly package your project.
 
+
 Automatic package discovery
 ===========================
-
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
@@ -105,9 +103,9 @@ that each entry in the ``[options.packages.find]`` is optional. The above
 setup also allows you to adopt a ``src/`` layout. For more details and advanced
 use, go to :ref:`package_discovery`
 
+
 Entry points and automatic script creation
 ===========================================
-
 Setuptools support automatic creation of scripts upon installation, that runs
 code within your package if you specify them with the ``entry_point`` keyword.
 This is what allows you to run commands like ``pip install`` instead of having
@@ -126,9 +124,9 @@ invoke the ``some_func`` in the ``__init__.py`` file when called by the user.
 For detailed usage, including managing the additional or optional dependencies,
 go to :ref:`entry_point`.
 
+
 Dependency management
 =====================
-
 ``setuptools`` supports automatically installing dependencies when a package is
 installed. The simplest way to include requirement specifiers is to use the
 ``install_requires`` argument to ``setup.cfg``.  It takes a string or list of
@@ -151,9 +149,9 @@ care of those needed by automatically generated scripts. It also provides
 mechanisms to handle dependencies that are not in PyPI. For more advanced use,
 see :ref:`dependency_management`
 
+
 Including Data Files
 ====================
-
 The distutils have traditionally allowed installation of "data files", which
 are placed in a platform-specific location. Setuptools offers three ways to
 specify data files to be included in your packages. For the simpliest use, you
@@ -166,5 +164,27 @@ can simply use the ``include_package_data`` keyword:
 
 This tells setuptools to install any data files it finds in your packages.
 The data files must be specified via the distutils' ``MANIFEST.in`` file.
-
 For more details, see :ref:`datafiles`
+
+
+Uploading your package to PyPI
+==============================
+After generating the distribution files, next step would be to upload your
+distribution so others can use it. This functionality is provided by
+``twine <https://pypi.org/project/twine/>`` and we will only demonstrate the
+basic use here.
+
+
+Transitioning from ``setup.py`` to ``setup.cfg``
+==================================================
+To avoid executing arbitary scripts and boilerplate code, we are transitioning
+into a full-fledged ``setup.cfg`` to declare your package information instead
+of running ``setup()``. This inevitably brings challenges due to a different
+syntax. Here we provide a quick guide to understanding how ``setup.cfg`` is
+parsed by ``setuptool`` to ease the pain of transition.
+
+
+Resources on Python packaging
+=============================
+Packaging in Python is hard. Here we provide a list of links for those that
+want to learn more.

From b678ce30a356abb36cd49d523731a9f978fce0bf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 13:13:44 -0400
Subject: [PATCH 7905/8469] Move distutils import to a separate file to avoid
 linter errors.

---
 setuptools/__init__.py        |  3 +++
 setuptools/distutils_patch.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 setuptools/distutils_patch.py

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 811f3fd2e8..9df71a6d23 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -2,6 +2,9 @@
 
 import os
 import functools
+
+import setuptools.distutils_patch  # noqa: F401
+
 import distutils.core
 import distutils.filelist
 import re
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
new file mode 100644
index 0000000000..a2fc1a8cb9
--- /dev/null
+++ b/setuptools/distutils_patch.py
@@ -0,0 +1,15 @@
+"""
+Ensure that the local copy of distutils is preferred over stdlib.
+
+See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
+for more motivation.
+"""
+
+import sys
+import importlib
+from os.path import dirname
+
+
+sys.path.insert(0, dirname(dirname(__file__)))
+importlib.import_module('distutils')
+sys.path.pop(0)

From 151599602b9d626ebcfe5ae6960ea216b767fec2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 13:38:15 -0400
Subject: [PATCH 7906/8469] Update distutils patch to monkeypatch all paths
 from sys.path to ensure that distutils is never imported except from the same
 path as setuptools. Assert that 'distutils' is not already in sys.modules.

---
 setuptools/distutils_patch.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index a2fc1a8cb9..e0abbd77da 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -7,9 +7,23 @@
 
 import sys
 import importlib
+import contextlib
 from os.path import dirname
 
 
-sys.path.insert(0, dirname(dirname(__file__)))
-importlib.import_module('distutils')
-sys.path.pop(0)
+@contextlib.contextmanager
+def patch_sys_path():
+    orig = sys.path[:]
+    sys.path[:] = [dirname(dirname(__file__))]
+    try:
+        yield
+    finally:
+        sys.path[:] = orig
+
+
+if 'distutils' in sys.path:
+    raise RuntimeError("Distutils must not be imported before setuptools")
+
+
+with patch_sys_path():
+    importlib.import_module('distutils')

From 81aab2da23caf1a66298847d93b209ba16eb878e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 16:35:24 -0400
Subject: [PATCH 7907/8469] Ignore distutils when running tests.

---
 conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conftest.py b/conftest.py
index 1746bfb588..3f7e59b44e 100644
--- a/conftest.py
+++ b/conftest.py
@@ -14,6 +14,7 @@ def pytest_addoption(parser):
 collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
+    'distutils',
 ]
 
 

From 781d42dffe2913f1a1f27128effa7198c27f569f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 25 May 2020 16:35:50 -0400
Subject: [PATCH 7908/8469] Fallback to 'lib' when 'sys.platlibdir' does not
 exist.

---
 distutils/command/install.py | 2 +-
 distutils/sysconfig.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distutils/command/install.py b/distutils/command/install.py
index aaa300efa9..21f8c27c8b 100644
--- a/distutils/command/install.py
+++ b/distutils/command/install.py
@@ -298,7 +298,7 @@ def finalize_options(self):
                             'sys_exec_prefix': exec_prefix,
                             'exec_prefix': exec_prefix,
                             'abiflags': abiflags,
-                            'platlibdir': sys.platlibdir,
+                            'platlibdir': getattr(sys, 'platlibdir', 'lib'),
                            }
 
         if HAS_USER_SITE:
diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
index 37feae5df7..2109f746ba 100644
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
@@ -148,7 +148,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
         if plat_specific or standard_lib:
             # Platform-specific modules (any module from a non-pure-Python
             # module distribution) or standard Python library modules.
-            libdir = sys.platlibdir
+            libdir = getattr(sys, "platlibdir", "lib")
         else:
             # Pure Python
             libdir = "lib"

From ffc622639bd2793d3105ac9dcd2d4f55d482b44d Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 17:37:08 -0400
Subject: [PATCH 7909/8469] docs: incoporate PR1765

created directory setuptools/docs/references and place
keywords.txt from PR1765 in it en bloc
---
 docs/references/keywords.txt | 336 +++++++++++++++++++++++++++++++++++
 1 file changed, 336 insertions(+)
 create mode 100644 docs/references/keywords.txt

diff --git a/docs/references/keywords.txt b/docs/references/keywords.txt
new file mode 100644
index 0000000000..563561908c
--- /dev/null
+++ b/docs/references/keywords.txt
@@ -0,0 +1,336 @@
+``name``
+    A string specifying the name of the package.
+
+``version``
+    A string specifying the version number of the package.
+
+``description``
+    A string describing the package in a single line.
+
+``long_description``
+    A string providing a longer description of the package.
+
+``long_description_content_type``
+    A string specifying the content type is used for the ``long_description``
+    (e.g. ``text/markdown``)
+
+``author``
+    A string specifying the author of the package.
+
+``author_email``
+    A string specifying the email address of the package author.
+
+``maintainer``
+    A string specifying the name of the current maintainer, if different from
+    the author. Note that if the maintainer is provided, setuptools will use it
+    as the author in ``PKG-INFO``.
+
+``maintainer_email``
+    A string specifying the email address of the current maintainer, if
+    different from the author.
+
+``url``
+    A string specifying the URL for the package homepage.
+
+``download_url``
+    A string specifying the URL to download the package.
+
+``packages``
+    A list of strings specifying the packages that setuptools will manipulate.
+
+``py_modules``
+    A list of strings specifying the modules that setuptools will manipulate.
+
+``scripts``
+    A list of strings specifying the standalone script files to be built and
+    installed.
+
+``ext_package``
+    A string specifying the base package name for the extensions provided by
+    this package.
+
+``ext_modules``
+    A list of instances of ``setuptools.Extension`` providing the list of
+    Python extensions to be built.
+
+``classifiers``
+    A list of strings describing the categories for the package.
+
+``distclass``
+    A subclass of ``Distribution`` to use.
+
+``script_name``
+    A string specifying the name of the setup.py script -- defaults to
+    ``sys.argv[0]``
+
+``script_args``
+    A list of strings defining the arguments to supply to the setup script.
+
+``options``
+    A dictionary providing the default options for the setup script.
+
+``license``
+    A string specifying the license of the package.
+
+``keywords``
+    A list of strings or a comma-separated string providing descriptive
+    meta-data. See: `PEP 0314`_.
+
+.. _PEP 0314: https://www.python.org/dev/peps/pep-0314/
+
+``platforms``
+    A list of strings or comma-separated string.
+
+``cmdclass``
+    A dictionary providing a mapping of command names to ``Command``
+    subclasses.
+
+``data_files``
+
+    .. warning::
+        ``data_files`` is deprecated. It does not work with wheels, so it
+        should be avoided.
+
+    A list of strings specifying the data files to install.
+
+``package_dir``
+    A dictionary providing a mapping of package to directory names.
+
+``requires``
+
+   .. warning::
+      ``requires`` is superseded by ``install_requires`` and should not be used
+      anymore.
+
+``obsoletes``
+
+   .. warning::
+      ``obsoletes`` is currently ignored by ``pip``.
+
+   List of strings describing packages which this package renders obsolete,
+   meaning that the two projects should not be installed at the same time.
+
+   Version declarations can be supplied. Version numbers must be in the format
+   specified in Version specifiers (e.g. ``foo (<3.0)``).
+
+   This field may be followed by an environment marker after a semicolon (e.g.
+   ``foo; os_name == "posix"``)
+
+   The most common use of this field will be in case a project name changes,
+   e.g. Gorgon 2.3 gets subsumed into Torqued Python 1.0. When you install
+   Torqued Python, the Gorgon distribution should be removed.
+
+``provides``
+
+   .. warning::
+      ``provides`` is currently ignored by ``pip``.
+
+   List of strings describing package- and virtual package names contained
+   within this package.
+
+   A package may provide additional names, e.g. to indicate that multiple
+   projects have been bundled together. For instance, source distributions of
+   the ZODB project have historically included the transaction project, which
+   is now available as a separate distribution. Installing such a source
+   distribution satisfies requirements for both ZODB and transaction.
+
+   A package may also provide a “virtual� project name, which does not
+   correspond to any separately-distributed project: such a name might be used
+   to indicate an abstract capability which could be supplied by one of
+   multiple projects. E.g., multiple projects might supply RDBMS bindings for
+   use by a given ORM: each project might declare that it provides
+   ORM-bindings, allowing other projects to depend only on having at most one
+   of them installed.
+
+   A version declaration may be supplied and must follow the rules described in
+   Version specifiers. The distribution’s version number will be implied if
+   none is specified (e.g. ``foo (<3.0)``).
+
+   Each package may be followed by an environment marker after a semicolon
+   (e.g. ``foo; os_name == "posix"``).
+
+.. Below are setuptools keywords, above are distutils
+
+``include_package_data``
+    If set to ``True``, this tells ``setuptools`` to automatically include any
+    data files it finds inside your package directories that are specified by
+    your ``MANIFEST.in`` file.  For more information, see the section on
+    :ref:`Including Data Files`.
+
+``exclude_package_data``
+    A dictionary mapping package names to lists of glob patterns that should
+    be *excluded* from your package directories.  You can use this to trim back
+    any excess files included by ``include_package_data``.  For a complete
+    description and examples, see the section on :ref:`Including Data Files`.
+
+``package_data``
+    A dictionary mapping package names to lists of glob patterns.  For a
+    complete description and examples, see the section on :ref:`Including Data
+    Files`.  You do not need to use this option if you are using
+    ``include_package_data``, unless you need to add e.g. files that are
+    generated by your setup script and build process.  (And are therefore not
+    in source control or are files that you don't want to include in your
+    source distribution.)
+
+``zip_safe``
+    A boolean (True or False) flag specifying whether the project can be
+    safely installed and run from a zip file.  If this argument is not
+    supplied, the ``bdist_egg`` command will have to analyze all of your
+    project's contents for possible problems each time it builds an egg.
+
+``install_requires``
+    A string or list of strings specifying what other distributions need to
+    be installed when this one is.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
+
+``entry_points``
+    A dictionary mapping entry point group names to strings or lists of strings
+    defining the entry points.  Entry points are used to support dynamic
+    discovery of services or plugins provided by a project.  See :ref:`Dynamic
+    Discovery of Services and Plugins` for details and examples of the format
+    of this argument.  In addition, this keyword is used to support
+    :ref:`Automatic Script Creation`.
+
+``extras_require``
+    A dictionary mapping names of "extras" (optional features of your project)
+    to strings or lists of strings specifying what other distributions must be
+    installed to support those features.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
+
+``python_requires``
+    A string corresponding to a version specifier (as defined in PEP 440) for
+    the Python version, used to specify the Requires-Python defined in PEP 345.
+
+``setup_requires``
+
+    .. warning::
+        Using ``setup_requires`` is discouraged in favor of `PEP-518`_
+
+    A string or list of strings specifying what other distributions need to
+    be present in order for the *setup script* to run.  ``setuptools`` will
+    attempt to obtain these (even going so far as to download them using
+    ``EasyInstall``) before processing the rest of the setup script or commands.
+    This argument is needed if you are using distutils extensions as part of
+    your build process; for example, extensions that process setup() arguments
+    and turn them into EGG-INFO metadata files.
+
+    (Note: projects listed in ``setup_requires`` will NOT be automatically
+    installed on the system where the setup script is being run.  They are
+    simply downloaded to the ./.eggs directory if they're not locally available
+    already.  If you want them to be installed, as well as being available
+    when the setup script is run, you should add them to ``install_requires``
+    **and** ``setup_requires``.)
+
+.. _PEP-518: http://www.python.org/dev/peps/pep-0518/
+
+``dependency_links``
+
+    .. warning::
+        ``dependency_links`` is deprecated. It is not supported anymore by pip.
+
+    A list of strings naming URLs to be searched when satisfying dependencies.
+    These links will be used if needed to install packages specified by
+    ``setup_requires`` or ``tests_require``.  They will also be written into
+    the egg's metadata for use by tools like EasyInstall to use when installing
+    an ``.egg`` file.
+
+``namespace_packages``
+    A list of strings naming the project's "namespace packages".  A namespace
+    package is a package that may be split across multiple project
+    distributions.  For example, Zope 3's ``zope`` package is a namespace
+    package, because subpackages like ``zope.interface`` and ``zope.publisher``
+    may be distributed separately.  The egg runtime system can automatically
+    merge such subpackages into a single parent package at runtime, as long
+    as you declare them in each project that contains any subpackages of the
+    namespace package, and as long as the namespace package's ``__init__.py``
+    does not contain any code other than a namespace declaration.  See the
+    section on :ref:`Namespace Packages` for more information.
+
+``test_suite``
+    A string naming a ``unittest.TestCase`` subclass (or a package or module
+    containing one or more of them, or a method of such a subclass), or naming
+    a function that can be called with no arguments and returns a
+    ``unittest.TestSuite``.  If the named suite is a module, and the module
+    has an ``additional_tests()`` function, it is called and the results are
+    added to the tests to be run.  If the named suite is a package, any
+    submodules and subpackages are recursively added to the overall test suite.
+
+    Specifying this argument enables use of the :ref:`test` command to run the
+    specified test suite, e.g. via ``setup.py test``.  See the section on the
+    :ref:`test` command below for more details.
+
+    New in 41.5.0: Deprecated the test command.
+
+``tests_require``
+    If your project's tests need one or more additional packages besides those
+    needed to install it, you can use this option to specify them.  It should
+    be a string or list of strings specifying what other distributions need to
+    be present for the package's tests to run.  When you run the ``test``
+    command, ``setuptools`` will  attempt to obtain these (even going
+    so far as to download them using ``EasyInstall``).  Note that these
+    required projects will *not* be installed on the system where the tests
+    are run, but only downloaded to the project's setup directory if they're
+    not already installed locally.
+
+    New in 41.5.0: Deprecated the test command.
+
+.. _test_loader:
+
+``test_loader``
+    If you would like to use a different way of finding tests to run than what
+    setuptools normally uses, you can specify a module name and class name in
+    this argument.  The named class must be instantiable with no arguments, and
+    its instances must support the ``loadTestsFromNames()`` method as defined
+    in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
+    pass only one test "name" in the `names` argument: the value supplied for
+    the ``test_suite`` argument.  The loader you specify may interpret this
+    string in any way it likes, as there are no restrictions on what may be
+    contained in a ``test_suite`` string.
+
+    The module name and class name must be separated by a ``:``.  The default
+    value of this argument is ``"setuptools.command.test:ScanningLoader"``.  If
+    you want to use the default ``unittest`` behavior, you can specify
+    ``"unittest:TestLoader"`` as your ``test_loader`` argument instead.  This
+    will prevent automatic scanning of submodules and subpackages.
+
+    The module and class you specify here may be contained in another package,
+    as long as you use the ``tests_require`` option to ensure that the package
+    containing the loader class is available when the ``test`` command is run.
+
+    New in 41.5.0: Deprecated the test command.
+
+``eager_resources``
+    A list of strings naming resources that should be extracted together, if
+    any of them is needed, or if any C extensions included in the project are
+    imported.  This argument is only useful if the project will be installed as
+    a zipfile, and there is a need to have all of the listed resources be
+    extracted to the filesystem *as a unit*.  Resources listed here
+    should be '/'-separated paths, relative to the source root, so to list a
+    resource ``foo.png`` in package ``bar.baz``, you would include the string
+    ``bar/baz/foo.png`` in this argument.
+
+    If you only need to obtain resources one at a time, or you don't have any C
+    extensions that access other files in the project (such as data files or
+    shared libraries), you probably do NOT need this argument and shouldn't
+    mess with it.  For more details on how this argument works, see the section
+    below on :ref:`Automatic Resource Extraction`.
+
+``use_2to3``
+    Convert the source code from Python 2 to Python 3 with 2to3 during the
+    build process. See :doc:`python3` for more details.
+
+``convert_2to3_doctests``
+    List of doctest source files that need to be converted with 2to3.
+    See :doc:`python3` for more details.
+
+``use_2to3_fixers``
+    A list of modules to search for additional fixers to be used during
+    the 2to3 conversion. See :doc:`python3` for more details.
+
+``use_2to3_exclude_fixers``
+    List of fixer names to be skipped.
+
+``project_urls``
+    An arbitrary map of URL names to hyperlinks, allowing more extensible
+    documentation of where various resources can be found than the simple
+    ``url`` and ``download_url`` options provide.

From 992ecc09a2aa08310ae9bba4865e54e157b581cb Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 17:46:28 -0400
Subject: [PATCH 7910/8469] docs: proper invocation of pep517

before: pep517 build (incorrect)
now: python -m pep517.build (correct)
---
 docs/userguide/quickstart.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 1b58dfb363..224be368f6 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -64,7 +64,7 @@ Then, you need an installer, such as `pep517 <https://pypi.org/project/pep517/>`
 which you can obtain via ``pip install pep517``. After downloading it, invoke
 the installer::
 
-    pep517 build
+    python -m pep517.build
 
 You now have your distribution ready (e.g. a ``tar.gz`` file and a ``.whl``
 file in the ``dist`` directory), which you can upload to PyPI!

From b13e4a2a96c2d88890157fdd0b116619436761c4 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Mon, 25 May 2020 21:32:01 -0400
Subject: [PATCH 7911/8469] docs: add dev mode section in quickstart

---
 docs/userguide/quickstart.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.txt
index 224be368f6..5282975102 100644
--- a/docs/userguide/quickstart.txt
+++ b/docs/userguide/quickstart.txt
@@ -167,6 +167,26 @@ The data files must be specified via the distutils' ``MANIFEST.in`` file.
 For more details, see :ref:`datafiles`
 
 
+Development mode
+================
+``setuptools`` allows you to install a package without copying any files
+to your interpretor directory (e.g. the ``site-packages`` directory). This
+allows you to modify your source code and have the changes take effect without
+you having to rebuild and reinstall. This is currently incompatible with
+PEP 517 and therefore it requires a ``setup.py`` script with the following
+content::
+
+    import setuptools
+    setuptools.setup()
+
+Then::
+
+    pip install --editable .
+
+This creates a link file in your interpretor site package directory which
+associate with your source code. For more information, see: (WIP)
+
+
 Uploading your package to PyPI
 ==============================
 After generating the distribution files, next step would be to upload your

From 7b25b1a6a70577fdadbadb75b55a80a328143848 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 26 May 2020 18:12:33 -0400
Subject: [PATCH 7912/8469] Use new link to sunset page. Ref #2134.

---
 pkg_resources/py2_warn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
index 00cc8bc75d..6855aa245e 100644
--- a/pkg_resources/py2_warn.py
+++ b/pkg_resources/py2_warn.py
@@ -6,7 +6,7 @@
 msg = textwrap.dedent("""
     Encountered a version of Setuptools that no longer supports
     this version of Python. Please head to
-    https://bit.ly/setuptools-py2-warning for support.
+    https://bit.ly/setuptools-py2-sunset for support.
     """)
 
 pre = "Setuptools no longer works on Python 2\n"

From d51059ac1cc2fcc54a572eecadfae7e2bb07ad70 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Tue, 26 May 2020 00:43:54 -0400
Subject: [PATCH 7913/8469] docs: WIP detailed guide on pkg discovery

---
 docs/userguide/package_discovery.txt | 101 +++++++++++++++++----------
 1 file changed, 63 insertions(+), 38 deletions(-)

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
index 8ba12cdf3c..45d88b600c 100644
--- a/docs/userguide/package_discovery.txt
+++ b/docs/userguide/package_discovery.txt
@@ -1,65 +1,90 @@
+.. _`package_discovery`:
+
 ===================
 Package Discovery
 ===================
 
 ``Setuptools`` provide powerful tools to handle package discovery, including
-support for namespace package. The following explain how you include package
-in your ``setup`` script::
+support for namespace package. Normally, you would specify the package to be
+included manually in the following manner:
+
+.. code-block:: ini
+
+    [options]
+    packages =
+        mypkg1
+        mypkg2
+
+.. code-block:: python
 
     setup(
         packages = ['mypkg1', 'mypkg2']
     )
 
-To speed things up, we introduce two functions provided by setuptools::
+This can get tiresome reallly quickly. To speed things up, we introduce two
+functions provided by setuptools:
 
-    from setuptools import find_packages
+.. code-block:: ini
 
-or::
+    [options]
+    packages = find:
+    #or
+    packages = find_namespace:
 
+.. code-block:: python
+
+    from setuptools import find_packages
+    #or
     from setuptools import find_namespace_packages
 
 
-Using ``find_packages()``
--------------------------
+Using ``find:`` (``find_packages``)
+===================================
+Let's start with the first tool. ``find:`` (``find_packages``) takes a source
+directory and two lists of package name patterns to exclude and include, and
+then return a list of ``str`` representing the packages it could find. To use
+it, consider the following directory
+
+    mypkg/
+        src/
+            pkg1/__init__.py
+            pkg2/__init__.py
+            tests/__init__.py
+        setup.cfg #or setup.py
 
-Let's start with the first tool.
+To have your setup.cfg or setup.py to automatically include packages found
+in ``src`` that starts with the name ``pkg`` and not ``tests``:
 
-``find_packages()`` takes a source directory and two lists of package name
-patterns to exclude and include.  If omitted, the source directory defaults to
-the same
-directory as the setup script.  Some projects use a ``src`` or ``lib``
-directory as the root of their source tree, and those projects would of course
-use ``"src"`` or ``"lib"`` as the first argument to ``find_packages()``.  (And
-such projects also need something like ``package_dir={"": "src"}`` in their
-``setup()`` arguments, but that's just a normal distutils thing.)
+.. code-block:: ini
 
-Anyway, ``find_packages()`` walks the target directory, filtering by inclusion
-patterns, and finds Python packages (any directory). Packages are only
-recognized if they include an ``__init__.py`` file. Finally, exclusion
-patterns are applied to remove matching packages.
+    [options]
+    packages = find:
+    package_dir =
+        =src
 
-Inclusion and exclusion patterns are package names, optionally including
-wildcards.  For
-example, ``find_packages(exclude=["*.tests"])`` will exclude all packages whose
-last name part is ``tests``.   Or, ``find_packages(exclude=["*.tests",
-"*.tests.*"])`` will also exclude any subpackages of packages named ``tests``,
-but it still won't exclude a top-level ``tests`` package or the children
-thereof.  In fact, if you really want no ``tests`` packages at all, you'll need
-something like this::
+    [options.packages.find]
+    where = src
+    include = pkg*
+    exclude = tests
 
-    find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])
+.. code-block:: python
 
-in order to cover all the bases.  Really, the exclusion patterns are intended
-to cover simpler use cases than this, like excluding a single, specified
-package and its subpackages.
+    setup(
+        #...
+        packages = find_packages(
+            where = 'src',
+            include = ['pkg*',],
+            exclude = ['tests',]
+        ),
+        package_dir = {"":"src"}
+        #...
+    )
 
-Regardless of the parameters, the ``find_packages()``
-function returns a list of package names suitable for use as the ``packages``
-argument to ``setup()``, and so is usually the easiest way to set that
-argument in your setup script.  Especially since it frees you from having to
-remember to modify your setup script whenever your project grows additional
-top-level packages or subpackages.
+Of course the keywords presented here appear arbitary and the example given
+doesn't apply to every other scenarios. For best understanding, we recommend
+going to :ref:`keywords_ref`.
 
+#####WIP below#########
 ``find_namespace_packages()``
 -----------------------------
 In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant

From 9b87e896de30cda6003bb2f18c41c5f6c4db9d12 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Tue, 26 May 2020 13:27:34 -0400
Subject: [PATCH 7914/8469] docs: detail pkg discover guide and namespace pkg

userguide/pkg_discovery.txt now covers find_package,
find_namespace package and legacy use of namespace
package creation in both setup.py and setup.cfg style
---
 docs/userguide/package_discovery.txt | 210 +++++++++++++--------------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
index 45d88b600c..77d61770cf 100644
--- a/docs/userguide/package_discovery.txt
+++ b/docs/userguide/package_discovery.txt
@@ -1,8 +1,19 @@
 .. _`package_discovery`:
 
-===================
-Package Discovery
-===================
+========================================
+Package Discovery and Namespace Package
+========================================
+
+.. note::
+    a full specification for the keyword supplied to ``setup.cfg`` or
+    ``setup.py`` can be found at :ref:`keywords reference <keywords_ref>`
+
+.. note::
+    the examples provided here are only to demonstrate the functionality
+    introduced. More metadata and options arguments need to be supplied
+    if you want to replicate them on your system. If you are completely
+    new to setuptools, the :ref:`quickstart section <quickstart>` is a good
+    place to start.
 
 ``Setuptools`` provide powerful tools to handle package discovery, including
 support for namespace package. Normally, you would specify the package to be
@@ -38,22 +49,25 @@ functions provided by setuptools:
     from setuptools import find_namespace_packages
 
 
-Using ``find:`` (``find_packages``)
-===================================
+Using ``find:`` or ``find_packages``
+====================================
 Let's start with the first tool. ``find:`` (``find_packages``) takes a source
 directory and two lists of package name patterns to exclude and include, and
 then return a list of ``str`` representing the packages it could find. To use
 it, consider the following directory
 
+.. code-block:: bash
+
     mypkg/
         src/
             pkg1/__init__.py
             pkg2/__init__.py
-            tests/__init__.py
+            additional/__init__.py
+
         setup.cfg #or setup.py
 
 To have your setup.cfg or setup.py to automatically include packages found
-in ``src`` that starts with the name ``pkg`` and not ``tests``:
+in ``src`` that starts with the name ``pkg`` and not ``additional``:
 
 .. code-block:: ini
 
@@ -65,7 +79,7 @@ in ``src`` that starts with the name ``pkg`` and not ``tests``:
     [options.packages.find]
     where = src
     include = pkg*
-    exclude = tests
+    exclude = additional
 
 .. code-block:: python
 
@@ -80,127 +94,113 @@ in ``src`` that starts with the name ``pkg`` and not ``tests``:
         #...
     )
 
-Of course the keywords presented here appear arbitary and the example given
-doesn't apply to every other scenarios. For best understanding, we recommend
-going to :ref:`keywords_ref`.
 
-#####WIP below#########
-``find_namespace_packages()``
------------------------------
-In Python 3.3+, ``setuptools`` also provides the ``find_namespace_packages`` variant
-of ``find_packages``, which has the same function signature as
-``find_packages``, but works with `PEP 420`_ compliant implicit namespace
-packages. Here is a minimal setup script using ``find_namespace_packages``::
+Using ``find_namespace:`` or ``find_namespace_packages``
+========================================================
+``setuptools``  provides the ``find_namespace:`` (``find_namespace_packages``)
+which behaves similarly to ``find:`` but works with namespace package. Before
+diving in, it is important to have a good understanding of what namespace
+packages are. Here is a quick recap:
 
-    from setuptools import setup, find_namespace_packages
-    setup(
-        name="HelloWorld",
-        version="0.1",
-        packages=find_namespace_packages(),
-    )
+Suppose you have two packages named as follows:
 
+.. code-block:: bash
 
-Keep in mind that according to PEP 420, you may have to either re-organize your
-codebase a bit or define a few exclusions, as the definition of an implicit
-namespace package is quite lenient, so for a project organized like so::
+    /Users/Desktop/timmins/foo/__init__.py
+    /Library/timmins/bar/__init__.py
 
+If both ``Desktop`` and ``Library`` are on your ``PYTHONPATH``, then a
+namespace package called ``timmins`` will be created automatically for you when
+you invoke the import mechanism, allowing you to accomplish the following
 
-    ├── namespace
-    │   └── mypackage
-    │       ├── __init__.py
-    │       └── mod1.py
-    ├── setup.py
-    └── tests
-        └── test_mod1.py
+.. code-block:: python
 
-A naive ``find_namespace_packages()`` would install both ``namespace.mypackage`` and a
-top-level package called ``tests``! One way to avoid this problem is to use the
-``include`` keyword to whitelist the packages to include, like so::
+    >>> import timmins.foo
+    >>> import timmins.bar
 
-    from setuptools import setup, find_namespace_packages
+as if there is only one ``timmins`` on your system. The two packages can then
+be distributed separately and installed individually without affecting the
+other one. Suppose you are packaging the ``foo`` part:
 
-    setup(
-        name="namespace.mypackage",
-        version="0.1",
-        packages=find_namespace_packages(include=["namespace.*"])
-    )
+.. code-block:: bash
+
+    foo/
+        src/
+            timmins/foo/__init__.py
+        setup.cfg # or setup.py
+
+and you want the ``foo`` to be automatically included, ``find:`` won't work
+because timmins doesn't contain ``__init__.py`` directly, instead, you have
+to use ``find_namespace:``:
+
+.. code-block:: ini
+
+    [options]
+    package_dir =
+        =src
+    packages = find_namespace:
 
-Another option is to use the "src" layout, where all package code is placed in
-the ``src`` directory, like so::
+    [options.packages.find_namespace]
+    where = src
 
+When you install the zipped distribution, ``timmins.foo`` would become
+available to your interpreter.
 
-    ├── setup.py
-    ├── src
-    │   └── namespace
-    │       └── mypackage
-    │           ├── __init__.py
-    │           └── mod1.py
-    └── tests
-        └── test_mod1.py
+You can think of ``find_namespace:`` as identical to ``find:`` except it
+would count a directory as a package even if it doesn't contain ``__init__.py``
+file directly. As a result, this creates an interesting side effect. If you
+organize your package like this:
 
-With this layout, the package directory is specified as ``src``, as such::
+.. code-block:: bash
 
-    setup(name="namespace.mypackage",
-          version="0.1",
-          package_dir={"": "src"},
-          packages=find_namespace_packages(where="src"))
+    foo/
+        timmins/
+            foo/__init__.py
+        setup.cfg # or setup.py
+        tests/
+            test_foo/__init__.py
 
-.. _PEP 420: https://www.python.org/dev/peps/pep-0420/
+a naive ``find_namespace:`` would include tests as part of your package to
+be installed. A simple way to fix it is to adopt the aforementioned
+``src`` layout.
 
 
-Namespace Packages
-------------------
+Legacy Namespace Packages
+==========================
+The fact you can create namespace package so effortlessly above is credited
+to `PEP 420 <https://www.python.org/dev/peps/pep-0420/>`_. In the past, it
+is more cumbersome to accomplish the same result.
 
-Sometimes, a large package is more useful if distributed as a collection of
-smaller eggs.  However, Python does not normally allow the contents of a
-package to be retrieved from more than one location.  "Namespace packages"
-are a solution for this problem.  When you declare a package to be a namespace
-package, it means that the package has no meaningful contents in its
-``__init__.py``, and that it is merely a container for modules and subpackages.
+Starting with the same layout, there are two pieces you need to add to it.
+First, an ``__init__.py`` file directly under your namespace package
+directory that contains the following:
 
-The ``pkg_resources`` runtime will then automatically ensure that the contents
-of namespace packages that are spread over multiple eggs or directories are
-combined into a single "virtual" package.
+.. code-block:: python
 
-The ``namespace_packages`` argument to ``setup()`` lets you declare your
-project's namespace packages, so that they will be included in your project's
-metadata.  The argument should list the namespace packages that the egg
-participates in.  For example, the ZopeInterface project might do this::
+    __import__("pkg_resources").declare_namespace(__name__)
+
+And the ``namespace_packages`` keyword in your ``setup.cfg`` or ``setup.py``:
+
+.. code-block:: ini
+
+    [options]
+    namespace_packages = timmins
+
+.. code-block:: python
 
     setup(
         # ...
-        namespace_packages=["zope"]
+        namespace_packages = ['timmins']
     )
 
-because it contains a ``zope.interface`` package that lives in the ``zope``
-namespace package.  Similarly, a project for a standalone ``zope.publisher``
-would also declare the ``zope`` namespace package.  When these projects are
-installed and used, Python will see them both as part of a "virtual" ``zope``
-package, even though they will be installed in different locations.
-
-Namespace packages don't have to be top-level packages.  For example, Zope 3's
-``zope.app`` package is a namespace package, and in the future PEAK's
-``peak.util`` package will be too.
+And your directory should look like this::
 
-Note, by the way, that your project's source tree must include the namespace
-packages' ``__init__.py`` files (and the ``__init__.py`` of any parent
-packages), in a normal Python package layout.  These ``__init__.py`` files
-*must* contain the line::
-
-    __import__("pkg_resources").declare_namespace(__name__)
+    /foo/
+        src/
+            timmins/
+                __init__.py
+                foo/__init__.py
+        setup.cfg #or setup.py
 
-This code ensures that the namespace package machinery is operating and that
-the current package is registered as a namespace package.
-
-You must NOT include any other code and data in a namespace package's
-``__init__.py``.  Even though it may appear to work during development, or when
-projects are installed as ``.egg`` files, it will not work when the projects
-are installed using "system" packaging tools -- in such cases the
-``__init__.py`` files will not be installed, let alone executed.
-
-You must include the ``declare_namespace()``  line in the ``__init__.py`` of
-*every* project that has contents for the namespace package in question, in
-order to ensure that the namespace will be declared regardless of which
-project's copy of ``__init__.py`` is loaded first.  If the first loaded
-``__init__.py`` doesn't declare it, it will never *be* declared, because no
-other copies will ever be loaded!
+Repeat the same for other packages and you can achieve the same result as
+the previous section.

From e53fe0d2eafa85c3ad85c837953f67f4aba28ed3 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Tue, 26 May 2020 23:47:49 -0400
Subject: [PATCH 7915/8469] docs: cover pkgutil style namespace pkg

---
 docs/userguide/package_discovery.txt | 41 ++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
index 77d61770cf..350a02ad27 100644
--- a/docs/userguide/package_discovery.txt
+++ b/docs/userguide/package_discovery.txt
@@ -22,6 +22,7 @@ included manually in the following manner:
 .. code-block:: ini
 
     [options]
+    #...
     packages =
         mypkg1
         mypkg2
@@ -29,6 +30,7 @@ included manually in the following manner:
 .. code-block:: python
 
     setup(
+        #...
         packages = ['mypkg1', 'mypkg2']
     )
 
@@ -166,14 +168,24 @@ be installed. A simple way to fix it is to adopt the aforementioned
 
 
 Legacy Namespace Packages
-==========================
+=========================
 The fact you can create namespace package so effortlessly above is credited
-to `PEP 420 <https://www.python.org/dev/peps/pep-0420/>`_. In the past, it
-is more cumbersome to accomplish the same result.
-
-Starting with the same layout, there are two pieces you need to add to it.
-First, an ``__init__.py`` file directly under your namespace package
-directory that contains the following:
+to `PEP 420 <https://www.python.org/dev/peps/pep-0420/>`_. It use to be more
+cumbersome to accomplish the same result. Historically, there were two methods
+to create namespace packages. One is the ``pkg_resources`` style supported by
+``setuptools`` and the other one being ``pkgutils`` style offered by
+``pkgutils`` module in Python. Both are now considered deprecated despite the
+fact they still linger in many existing packages. These two differ in many
+subtle yet significant aspects and you can find out more on `Python packaging
+user guide <https://packaging.python.org/guides/packaging-namespace-packages/>`_
+
+
+``pkg_resource`` style namespace package
+----------------------------------------
+This is the method ``setuptools`` directly supports. Starting with the same
+layout, there are two pieces you need to add to it. First, an ``__init__.py``
+file directly under your namespace package directory that contains the
+following:
 
 .. code-block:: python
 
@@ -193,7 +205,9 @@ And the ``namespace_packages`` keyword in your ``setup.cfg`` or ``setup.py``:
         namespace_packages = ['timmins']
     )
 
-And your directory should look like this::
+And your directory should look like this
+
+.. code-block:: bash
 
     /foo/
         src/
@@ -204,3 +218,14 @@ And your directory should look like this::
 
 Repeat the same for other packages and you can achieve the same result as
 the previous section.
+
+``pkgutil`` style namespace package
+-----------------------------------
+This method is almost identical to the ``pkg_resource`` except that the
+``__init__.py`` file contains the following:
+
+.. code-block:: python
+
+    __path__ = __import__('pkgutil').extend_path(__path__, __name__)
+
+The project layout remains the same and ``setup.cfg`` remains the same.

From 70c8c0f39cf737d5eff70e36af5c66973ae1340a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 27 May 2020 08:54:37 -0400
Subject: [PATCH 7916/8469] Mention that `namespace_packages` is omitted.

---
 docs/userguide/package_discovery.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.txt
index 350a02ad27..0e0d27c5b2 100644
--- a/docs/userguide/package_discovery.txt
+++ b/docs/userguide/package_discovery.txt
@@ -222,7 +222,8 @@ the previous section.
 ``pkgutil`` style namespace package
 -----------------------------------
 This method is almost identical to the ``pkg_resource`` except that the
-``__init__.py`` file contains the following:
+``namespace_packages`` declaration is omitted and the ``__init__.py``
+file contains the following:
 
 .. code-block:: python
 

From 96a1acb471eb8b2745a7ef98eceafb1671d7812c Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 May 2020 09:06:45 -0700
Subject: [PATCH 7917/8469] DOC: fix link missing >

The `decalrative config`_ link present higher in the document is also
unresolved, I'm not quite sure what the intended target was.
---
 docs/build_meta.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index ef9fb2ac5d..fcc2b7fee6 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -68,7 +68,7 @@ Use ``setuptools``' `declarative config`_ to specify the package information::
 
 Now generate the distribution. Although the PyPA is still working to
 `provide a recommended tool <https://github.com/pypa/packaging-problems/issues/219>`_
-to build packages, the `pep517 package <https://pypi.org/project/pep517`_
+to build packages, the `pep517 package <https://pypi.org/project/pep517>`_
 provides this functionality. To build the package::
 
     $ pip install -q pep517

From 01a876255e0a1135d03ee10c52b8cccfa4992e5d Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 May 2020 09:06:45 -0700
Subject: [PATCH 7918/8469] DOC: fix link missing >

The `decalrative config`_ link present higher in the document is also
unresolved, I'm not quite sure what the intended target was.
---
 docs/build_meta.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build_meta.txt b/docs/build_meta.txt
index ef9fb2ac5d..fcc2b7fee6 100644
--- a/docs/build_meta.txt
+++ b/docs/build_meta.txt
@@ -68,7 +68,7 @@ Use ``setuptools``' `declarative config`_ to specify the package information::
 
 Now generate the distribution. Although the PyPA is still working to
 `provide a recommended tool <https://github.com/pypa/packaging-problems/issues/219>`_
-to build packages, the `pep517 package <https://pypi.org/project/pep517`_
+to build packages, the `pep517 package <https://pypi.org/project/pep517>`_
 provides this functionality. To build the package::
 
     $ pip install -q pep517

From 11051abd79b04782d759720a4d9dac2d2bbbf49c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 07:10:59 -0400
Subject: [PATCH 7919/8469] Extract _parents function and _set_egg method.
 Reword comment.

---
 pkg_resources/__init__.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index edd3d2e8c6..2e7d505901 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1577,6 +1577,17 @@ def _get(self, path):
 register_loader_type(object, NullProvider)
 
 
+def _parents(path):
+    """
+    yield all parents of path including path
+    """
+    last = None
+    while path != last:
+        yield path
+        last = path
+        path, _ = os.path.split(path)
+
+
 class EggProvider(NullProvider):
     """Provider based on a virtual filesystem"""
 
@@ -1585,18 +1596,16 @@ def __init__(self, module):
         self._setup_prefix()
 
     def _setup_prefix(self):
-        # we assume here that our metadata may be nested inside a "basket"
-        # of multiple eggs; that's why we use module_path instead of .archive
-        path = self.module_path
-        old = None
-        while path != old:
-            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
-                break
-            old = path
-            path, base = os.path.split(path)
+        # Assume that metadata may be nested inside a "basket"
+        # of multiple eggs and use module_path instead of .archive.
+        eggs = filter(_is_egg_path, _parents(self.module_path))
+        egg = next(eggs, None)
+        egg and self._set_egg(egg)
+
+    def _set_egg(self, path):
+        self.egg_name = os.path.basename(path)
+        self.egg_info = os.path.join(path, 'EGG-INFO')
+        self.egg_root = path
 
 
 class DefaultProvider(EggProvider):

From 965ec0df1ffa98ba5d8913a2770daaf5b92b0a0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 07:03:19 -0400
Subject: [PATCH 7920/8469] In pkg_resources, no longer detect any pathname
 ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip
 file. Fixes #2129.

---
 changelog.d/2129.change.rst |  1 +
 pkg_resources/__init__.py   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/2129.change.rst

diff --git a/changelog.d/2129.change.rst b/changelog.d/2129.change.rst
new file mode 100644
index 0000000000..b7d388621e
--- /dev/null
+++ b/changelog.d/2129.change.rst
@@ -0,0 +1 @@
+In pkg_resources, no longer detect any pathname ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip file.
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2e7d505901..3c826eb0b8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2373,7 +2373,15 @@ def _is_egg_path(path):
     """
     Determine if given path appears to be an egg.
     """
-    return path.lower().endswith('.egg')
+    return _is_zip_egg(path) or _is_unpacked_egg(path)
+
+
+def _is_zip_egg(path):
+    return (
+        path.lower().endswith('.egg') and
+        os.path.isfile(path) and
+        zipfile.is_zipfile(path)
+    )
 
 
 def _is_unpacked_egg(path):
@@ -2381,7 +2389,7 @@ def _is_unpacked_egg(path):
     Determine if given path appears to be an unpacked egg.
     """
     return (
-        _is_egg_path(path) and
+        path.lower().endswith('.egg') and
         os.path.isfile(os.path.join(path, 'EGG-INFO', 'PKG-INFO'))
     )
 

From 7339f2c1cea8fa5275b699f494300a309d58c580 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 07:27:00 -0400
Subject: [PATCH 7921/8469] =?UTF-8?q?Bump=20version:=2046.4.0=20=E2=86=92?=
 =?UTF-8?q?=2047.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 7 +++++++
 changelog.d/1700.change.rst   | 1 -
 changelog.d/2094.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1700.change.rst
 delete mode 100644 changelog.d/2094.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 72d02f2b59..2639380ecb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 46.4.0
+current_version = 47.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ea667028a2..db1c67f71d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v47.0.0
+-------
+
+* #2094: Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.
+* #1700: Document all supported keywords by migrating the ones from distutils.
+
+
 v46.4.0
 -------
 
diff --git a/changelog.d/1700.change.rst b/changelog.d/1700.change.rst
deleted file mode 100644
index f66046a2ca..0000000000
--- a/changelog.d/1700.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document all supported keywords by migrating the ones from distutils.
diff --git a/changelog.d/2094.breaking.rst b/changelog.d/2094.breaking.rst
deleted file mode 100644
index c278d0fdb4..0000000000
--- a/changelog.d/2094.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.
diff --git a/setup.cfg b/setup.cfg
index 72d4dce92c..ed31c45037 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 46.4.0
+version = 47.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 3b32ab28d78eb38f681d36ecef505a65d1cbad38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 07:54:35 -0400
Subject: [PATCH 7922/8469] In wheel-to-egg conversion, use simple
 pkg_resources-style namespace declaration for packages that declare
 namespace_packages. Fixes #2070.

---
 setuptools/wheel.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index ec1106a7b2..ca09bd1944 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -27,12 +27,8 @@
     )\.whl$""",
     re.VERBOSE).match
 
-NAMESPACE_PACKAGE_INIT = '''\
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    __path__ = __import__('pkgutil').extend_path(__path__, __name__)
-'''
+NAMESPACE_PACKAGE_INIT = \
+    "__import__('pkg_resources').declare_namespace(__name__)\n"
 
 
 def unpack(src_dir, dst_dir):

From 6bf44e11960fa31aaa5b910879fdd4435b524244 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 07:55:09 -0400
Subject: [PATCH 7923/8469] =?UTF-8?q?Bump=20version:=2047.0.0=20=E2=86=92?=
 =?UTF-8?q?=2047.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 6 ++++++
 setup.cfg        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2639380ecb..1fa442e280 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.0.0
+current_version = 47.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index db1c67f71d..dbade95081 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v47.1.0
+-------
+
+* #2070: In wheel-to-egg conversion, use simple pkg_resources-style namespace declaration for packages that declare namespace_packages.
+
+
 v47.0.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index ed31c45037..c8f72e97cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.0.0
+version = 47.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 1639d010a7469ca6cabf49d038dfcfb4a4472a3d Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Tue, 26 May 2020 17:49:10 -0400
Subject: [PATCH 7924/8469] docs: detail userguide for entry point WIP

---
 docs/userguide/entry_point.txt | 118 ++++++++++++++++++++-------------
 1 file changed, 71 insertions(+), 47 deletions(-)

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
index 18211a72c9..a23d223b50 100644
--- a/docs/userguide/entry_point.txt
+++ b/docs/userguide/entry_point.txt
@@ -2,61 +2,82 @@
 Entry Points and Automatic Script Creation
 ==========================================
 
-Packaging and installing scripts can be a bit awkward with the distutils.  For
-one thing, there's no easy way to have a script's filename match local
-conventions on both Windows and POSIX platforms.  For another, you often have
-to create a separate file just for the "main" script, when your actual "main"
-is a function in a module somewhere.  And even in Python 2.4, using the ``-m``
-option only works for actual ``.py`` files that aren't installed in a package.
-
-``setuptools`` fixes all of these problems by automatically generating scripts
-for you with the correct extension, and on Windows it will even create an
-``.exe`` file so that users don't have to change their ``PATHEXT`` settings.
-The way to use this feature is to define "entry points" in your setup script
-that indicate what function the generated script should import and run.  For
-example, to create two console scripts called ``foo`` and ``bar``, and a GUI
-script called ``baz``, you might do something like this::
+When installing a package, you may realize you can invoke some commands without
+explicitly calling the python interpreter. For example, instead of calling
+``python -m pip install`` you can just do ``pip install``. The magic behind
+this is entry point, a keyword passed to your ``setup.cfg`` or ``setup.py``
+to create script wrapped around function in your libraries.
+
+
+Using entry point in your package
+=================================
+Let's start with an example. Suppose you have written your package like this:
+
+.. code-block:: bash
+
+    timmins/
+        timmins/__init__.py
+        setup.cfg
+        #other necessary files
+
+and in your ``__init__.py`` it defines a function:
+
+.. code-block:: python
+
+    def helloworld():
+        print("Hello world")
+
+After installing the package, you can invoke this function in the following
+manner, without applying any magic:
+
+.. code-block:: bash
+
+    python -m mypkg.helloworld
+
+But entry point simplifies this process and would create a wrapper script around
+your function, making it behave more natively. To do that, add the following
+lines to your ``setup.cfg`` or ``setup.py``:
+
+.. code-block:: ini
+
+    [options]
+    #...
+    entry_points =
+        [console_scripts]
+        helloworld = mypkg:helloworld
+
+.. code-block:: python
 
     setup(
-        # other arguments here...
-        entry_points={
-            "console_scripts": [
-                "foo = my_package.some_module:main_func",
-                "bar = other_module:some_func",
-            ],
-            "gui_scripts": [
-                "baz = my_package_gui:start_func",
-            ]
-        }
+        #...
+        entry_points = """
+            [console_scripts]
+            helloworld = mypkg:helloworld
+            """
     )
 
-When this project is installed on non-Windows platforms (using "setup.py
-install", "setup.py develop", or with pip), a set of ``foo``, ``bar``,
-and ``baz`` scripts will be installed that import ``main_func`` and
-``some_func`` from the specified modules.  The functions you specify are
-called with no arguments, and their return value is passed to
-``sys.exit()``, so you can return an errorlevel or message to print to
-stderr.
+The syntax for your entry points is specified as follows
 
-On Windows, a set of ``foo.exe``, ``bar.exe``, and ``baz.exe`` launchers are
-created, alongside a set of ``foo.py``, ``bar.py``, and ``baz.pyw`` files.  The
-``.exe`` wrappers find and execute the right version of Python to run the
-``.py`` or ``.pyw`` file.
+.. code-block::
 
-You may define as many "console script" and "gui script" entry points as you
-like, and each one can optionally specify "extras" that it depends on, that
-will be added to ``sys.path`` when the script is run.  For more information on
-"extras", see the section below on `Declaring Extras`_.  For more information
-on "entry points" in general, see the section below on `Dynamic Discovery of
-Services and Plugins`_.
+    [<type>]
+    <name> = [<package>.<subpackage>.]<module>:<function>
 
+where ``name`` is the name for the script you want to create and the left hand
+side of ``:`` is the module that contains your function and the right hand
+side is the function you wish to wrap. ``type`` specifies the type of script
+you want to create. ``setuptools`` currently supports either ``[console_script]``
+and ``[gui_script]`` (DOUBLE CHECK ON THIS).
 
-Dynamic Discovery of Services and Plugins
------------------------------------------
+After installation, you will be able to invoke that function simply calling
+``helloworld`` on your command line. It will also do command line options parsing
+for you!
 
-``setuptools`` supports creating libraries that "plug in" to extensible
-applications and frameworks, by letting you register "entry points" in your
-project that can be imported by the application or framework.
+Dynamic discovery of services and plugins
+=========================================
+The ability of entry points isn't limited to "advertising" your functions. In
+fact, its implementation allows us to achieve more powerful features, such as
+supporting libraries that "plus in" to extensible applications and frameworks
 
 For example, suppose that a blogging tool wants to support plugins
 that provide translation for various file types to the blog's output format.
@@ -112,4 +133,7 @@ of an entry point, any requirements implied by the associated extras will be
 passed to ``pkg_resources.require()``, so that an appropriate error message
 can be displayed if the needed package(s) are missing.  (Of course, the
 invoking app or framework can ignore such errors if it wants to make an entry
-point optional if a requirement isn't installed.)
\ No newline at end of file
+point optional if a requirement isn't installed.)
+
+Dependencies management for entry points
+========================================

From 45e784678b46636b7152ad7557d0757c3dfefaec Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Wed, 27 May 2020 11:08:45 -0400
Subject: [PATCH 7925/8469] docs: update entry point userguide

---
 docs/userguide/entry_point.txt | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
index a23d223b50..5772698e37 100644
--- a/docs/userguide/entry_point.txt
+++ b/docs/userguide/entry_point.txt
@@ -34,9 +34,10 @@ manner, without applying any magic:
 
     python -m mypkg.helloworld
 
-But entry point simplifies this process and would create a wrapper script around
-your function, making it behave more natively. To do that, add the following
-lines to your ``setup.cfg`` or ``setup.py``:
+But entry point simplifies the call and would create a wrapper script around
+your function, making it behave more natively (you type in ``helloworld`` and
+the ``helloworld`` function residing inside ``__init__.py`` is executed!). To
+accomplish that, add the following lines to your ``setup.cfg`` or ``setup.py``:
 
 .. code-block:: ini
 
@@ -56,22 +57,27 @@ lines to your ``setup.cfg`` or ``setup.py``:
             """
     )
 
-The syntax for your entry points is specified as follows
+The syntax for entry points is specified as follows:
 
 .. code-block::
 
     [<type>]
-    <name> = [<package>.<subpackage>.]<module>:<function>
+    <name> = [<package>.<subpackage>.]<module>[:<object>.<object>]
 
-where ``name`` is the name for the script you want to create and the left hand
+where ``name`` is the name for the script you want to create, the left hand
 side of ``:`` is the module that contains your function and the right hand
-side is the function you wish to wrap. ``type`` specifies the type of script
-you want to create. ``setuptools`` currently supports either ``[console_script]``
-and ``[gui_script]`` (DOUBLE CHECK ON THIS).
-
-After installation, you will be able to invoke that function simply calling
-``helloworld`` on your command line. It will also do command line options parsing
-for you!
+side is the object you want to invoke (e.g. a function). ``type`` specifies the
+type of script you want to create. ``setuptools`` currently supports either
+``[console_script]`` and ``[gui_script]``.
+
+.. note::
+    the syntax is not limited to ``INI`` string as demonstrated above. You can
+    also pass in the values in the form of a dictionary or list. Check out
+    :ref:`keyword reference <keywords_ref>` for more details
+
+After installation, you will be able to invoke that function by simply calling
+``helloworld`` on your command line. It will even do command line argument
+parsing for you!
 
 Dynamic discovery of services and plugins
 =========================================

From 3eb1cecdd24c53bd07911177c52b3de253159709 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 28 May 2020 13:28:02 -0400
Subject: [PATCH 7926/8469] docs: guide on entry point completed

Coverage
1. console_script
2. plugin support
3. optional dependencies
---
 docs/userguide/entry_point.txt | 181 +++++++++++++++++++++------------
 1 file changed, 118 insertions(+), 63 deletions(-)

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
index 5772698e37..fe31f446d3 100644
--- a/docs/userguide/entry_point.txt
+++ b/docs/userguide/entry_point.txt
@@ -1,12 +1,14 @@
+.. _`entry_points`:
+
 ==========================================
 Entry Points and Automatic Script Creation
 ==========================================
 
-When installing a package, you may realize you can invoke some commands without
-explicitly calling the python interpreter. For example, instead of calling
-``python -m pip install`` you can just do ``pip install``. The magic behind
-this is entry point, a keyword passed to your ``setup.cfg`` or ``setup.py``
-to create script wrapped around function in your libraries.
+After installing some packages, you may realize you can invoke some commands
+without explicitly calling the python interpreter. For example, instead of
+calling ``python -m pip install`` you can just do ``pip install``. The magic
+behind this is entry point, a keyword passed to your ``setup.cfg`` or
+``setup.py`` to create script wrapped around function in your libraries.
 
 
 Using entry point in your package
@@ -17,7 +19,7 @@ Let's start with an example. Suppose you have written your package like this:
 
     timmins/
         timmins/__init__.py
-        setup.cfg
+        setup.cfg # or setup.py
         #other necessary files
 
 and in your ``__init__.py`` it defines a function:
@@ -79,67 +81,120 @@ After installation, you will be able to invoke that function by simply calling
 ``helloworld`` on your command line. It will even do command line argument
 parsing for you!
 
-Dynamic discovery of services and plugins
-=========================================
-The ability of entry points isn't limited to "advertising" your functions. In
-fact, its implementation allows us to achieve more powerful features, such as
-supporting libraries that "plus in" to extensible applications and frameworks
-
-For example, suppose that a blogging tool wants to support plugins
-that provide translation for various file types to the blog's output format.
-The framework might define an "entry point group" called ``blogtool.parsers``,
-and then allow plugins to register entry points for the file extensions they
-support.
-
-This would allow people to create distributions that contain one or more
-parsers for different file types, and then the blogging tool would be able to
-find the parsers at runtime by looking up an entry point for the file
-extension (or mime type, or however it wants to).
-
-Note that if the blogging tool includes parsers for certain file formats, it
-can register these as entry points in its own setup script, which means it
-doesn't have to special-case its built-in formats.  They can just be treated
-the same as any other plugin's entry points would be.
-
-If you're creating a project that plugs in to an existing application or
-framework, you'll need to know what entry points or entry point groups are
-defined by that application or framework.  Then, you can register entry points
-in your setup script.  Here are a few examples of ways you might register an
-``.rst`` file parser entry point in the ``blogtool.parsers`` entry point group,
-for our hypothetical blogging tool::
 
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": ".rst = some_module:SomeClass"}
-    )
+Dynamic discovery of services (aka plugin support)
+==================================================
+The ability of entry points isn't limited to "advertising" your functions. Its
+implementation allows us to accomplish more powerful features, such as creating
+plugins. In fact, the aforementioned script wrapping ability is a form of
+plugin that was built into ``setuptools``. With that being said, you now have
+more options than ``[console_script]`` or ``[gui_script]`` when creating your
+package.
 
-    setup(
-        # ...
-        entry_points={"blogtool.parsers": [".rst = some_module:a_func"]}
-    )
+To understand how you can extend this functionality, let's go through how
+``setuptool`` does its ``[console_script]`` magic. Again, we use the same
+example as above:
 
-    setup(
-        # ...
-        entry_points="""
-            [blogtool.parsers]
-            .rst = some.nested.module:SomeClass.some_classmethod [reST]
-        """,
-        extras_require=dict(reST="Docutils>=0.3.5")
-    )
+.. code-block:: ini
+
+    [options]
+    # ...
+    entry_points =
+        [console_scripts]
+        helloworld = mypkg:helloworld
+
+Package installation contains multiple steps, so at some point, this package
+becomes available to your interpreter, and if you run the following code:
+
+.. code-block:: ini
+
+    >>> import pkg_resources #a module part of setuptools
+    >>> [item for item in
+        pkg_srouces.working_set.iter_entry_points('console_scripts')]
+
+It will return a list of special objects (called "EntryPoints"), and there
+will be one of them that corresponds to the ``helloworld = mypkg:helloworld``
+which we defined above. In fact, this object doesn't just contain the string,
+but also an encompassing representation of the package that created it.
+In the case of ``console_scripts``, setuptools will automatically invoke
+an internal function that utilizes this object and create the wrapper scripts
+and place them in your ``bin`` directory for your interpreter. How
+``pkg_resource`` look up all the entry points is further detailed in our
+:ref:`developer_guide` (WIP). With that being said, if you specify a different
+entry point:
+
+.. code-block:: ini
+
+    [options]
+    # ...
+    entry_points =
+        [iam.just.playing.around]
+        helloworld = mypkg:helloworld
+
+Then, running the same python expression like above:
+
+.. code-block:: python
+
+    >>> import pkg_resources
+    >>> [item for item in
+        pkg_srouces.working_set.iter_entry_points('iam.just.playing.around')
+        ]
+
+will create another ``EntryPoints`` object that contains the
+``helloworld = mypkg:helloworld`` and you can create custom
+functions to exploit its information however you want. For example, one of
+the installed programs on your system may contain a startup script that
+scans the system for all the packages that specify this
+``iam.just.playing.around`` entry points, such that when you install this new
+package, it becomes immediately available without having to reconfigure
+the already installed program. This in fact is the very idea of a plugin!
 
-The ``entry_points`` argument to ``setup()`` accepts either a string with
-``.ini``-style sections, or a dictionary mapping entry point group names to
-either strings or lists of strings containing entry point specifiers.  An
-entry point specifier consists of a name and value, separated by an ``=``
-sign.  The value consists of a dotted module name, optionally followed by a
-``:`` and a dotted identifier naming an object within the module.  It can
-also include a bracketed list of "extras" that are required for the entry
-point to be used.  When the invoking application or framework requests loading
-of an entry point, any requirements implied by the associated extras will be
-passed to ``pkg_resources.require()``, so that an appropriate error message
-can be displayed if the needed package(s) are missing.  (Of course, the
-invoking app or framework can ignore such errors if it wants to make an entry
-point optional if a requirement isn't installed.)
 
 Dependencies management for entry points
 ========================================
+Some entry points may require additional dependencies for them to work and
+others may trigger the installation of additional dependencies only when they
+are run. While this is elaborated in more excrutiating details on
+:ref:`guide on dependencies management <dependency_management>`, we will
+provide a brief overview on the entry point aspect.
+
+Dependencies of this manner are declared using the ``extra_requires`` keywords,
+which takes a mapping of the arbitary name of the functionality and a list of
+its depencencies, optionally suffixed with its :ref:`version specifier
+<version_specifier>`. For example, our package provides "pdf" output capability
+which requires at least 0.3 version of "ReportLab" and whatever version of "RXP"
+
+.. code-block:: ini
+
+    [options.extras_require]
+    PDF = ReportLab>=1.2; RXP
+
+.. code-block:: python
+
+    setup(
+        extras_require = {
+            "PDF":  ["ReportLab>=1.2", "RXP"],
+        }
+    )
+
+
+And we only want them to be installed if the console script entry point
+``rst2pdf`` is run:
+
+.. code-block:: ini
+
+    [options]
+    entry_points =
+        ['console_script']
+        rst2pdf = project_a.tools.pdfgen [PDF]
+        rst2html = project_a.tools.htmlgen
+
+.. code-block:: python
+
+    setup(
+        entry_points = """
+            ['console_script']
+            rst2pdf = project_a.tools.pdfgen [PDF]
+            rst2html = project_a.tools.htmlgen
+            """
+    )

From 1459bb4dcdc0f08463c71906952b35275be531de Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 28 May 2020 14:32:49 -0400
Subject: [PATCH 7927/8469] docs: fixed mistaken explanation

---
 docs/userguide/entry_point.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
index fe31f446d3..8190d8e339 100644
--- a/docs/userguide/entry_point.txt
+++ b/docs/userguide/entry_point.txt
@@ -69,8 +69,8 @@ The syntax for entry points is specified as follows:
 where ``name`` is the name for the script you want to create, the left hand
 side of ``:`` is the module that contains your function and the right hand
 side is the object you want to invoke (e.g. a function). ``type`` specifies the
-type of script you want to create. ``setuptools`` currently supports either
-``[console_script]`` and ``[gui_script]``.
+type of entry point (pertinent to the program that exploits it). ``setuptools``
+natively supports ``[console_script]`` and ``[gui_script]``.
 
 .. note::
     the syntax is not limited to ``INI`` string as demonstrated above. You can

From fdf51a0bee8de4cf0c10ccd2f94541242580fa0c Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 28 May 2020 16:59:48 -0400
Subject: [PATCH 7928/8469] docs: editing user guide on dependency management

---
 docs/userguide/dependency_management.txt | 227 ++++++++++++++---------
 1 file changed, 137 insertions(+), 90 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index 18ba952f4f..d9990ded94 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -2,71 +2,118 @@
 Dependencies Management in Setuptools
 =====================================
 
-Declaring Dependencies
-======================
+``Setuptools``'s dependency management is meticulous, or agonizing, depending
+on your level of familiarity. There are three types of dependency styles.
+1) those required to run the packaging program (build system requirement),
+2) those your package depends on (required dependency) and 3) optional
+dependency.
 
-``setuptools`` supports automatically installing dependencies when a package is
-installed, and including information about dependencies in Python Eggs (so that
-package management tools like pip can use the information).
+.. Note::
+    For all the packages you intend to add to dependency, you can optionally
+    specify the version following :ref:`reference on version specifyer <WIP>`
 
-``setuptools`` and ``pkg_resources`` use a common syntax for specifying a
-project's required dependencies.  This syntax consists of a project's PyPI
-name, optionally followed by a comma-separated list of "extras" in square
-brackets, optionally followed by a comma-separated list of version
-specifiers.  A version specifier is one of the operators ``<``, ``>``, ``<=``,
-``>=``, ``==`` or ``!=``, followed by a version identifier.  Tokens may be
-separated by whitespace, but any whitespace or nonstandard characters within a
-project name or version identifier must be replaced with ``-``.
 
-Version specifiers for a given project are internally sorted into ascending
-version order, and used to establish what ranges of versions are acceptable.
-Adjacent redundant conditions are also consolidated (e.g. ``">1, >2"`` becomes
-``">2"``, and ``"<2,<3"`` becomes ``"<2"``). ``"!="`` versions are excised from
-the ranges they fall within.  A project's version is then checked for
-membership in the resulting ranges. (Note that providing conflicting conditions
-for the same version (e.g. "<2,>=2" or "==2,!=2") is meaningless and may
-therefore produce bizarre results.)
+Build system requirement
+========================
 
-Here are some example requirement specifiers::
+Package requirement
+-------------------
+After organizing all the scripts and files and getting ready for packaging,
+there needs to be a way to tell Python what programs it need to actually
+do the packgaging (in our case, ``setuptools`` of course). Usually,
+you also need the ``wheel`` package as well since it is recommended that you
+upload a ``.whl`` file to PyPI alongside your ``.tar.gz`` file. Unlike the
+other two types of dependency keyword, this one is specified in your
+``pyproject.toml`` file (if you have forgot what this is, go to
+:ref:`quickstart` or (WIP)):
 
-    docutils >= 0.3
+.. code-block:: ini
 
-    # comment lines and \ continuations are allowed in requirement strings
-    BazSpam ==1.1, ==1.2, ==1.3, ==1.4, ==1.5, \
-        ==1.6, ==1.7  # and so are line-end comments
+    [build-system]
+    requires = ["setuptools", "wheel"]
+    #...
 
-    PEAK[FastCGI, reST]>=0.5a4
+.. note::
+    This used to be accomplished with the ``setup_requires`` keyword but is
+    now considered deprecated in favor of the PEP 517 style described above.
+    To peek into how this legacy keyword is used, consult our :ref:`guide on
+    deprecated practice (WIP)`
 
-    setuptools==0.5a7
 
-The simplest way to include requirement specifiers is to use the
-``install_requires`` argument to ``setup()``.  It takes a string or list of
-strings containing requirement specifiers.  If you include more than one
-requirement in a string, each requirement must begin on a new line.
+Python requirement
+------------------
+In some cases, you might need to specify the minimum required python version.
+This is handled with the ``python_requires`` keyword supplied to ``setup.cfg``
+or ``setup.py``.
 
-This has three effects:
+Example WIP
 
-1. When your project is installed, either by using pip, ``setup.py install``,
-   or ``setup.py develop``, all of the dependencies not already installed will
-   be located (via PyPI), downloaded, built (if necessary), and installed.
 
-2. Any scripts in your project will be installed with wrappers that verify
-   the availability of the specified dependencies at runtime, and ensure that
-   the correct versions are added to ``sys.path`` (e.g. if multiple versions
-   have been installed).
+Declaring required dependency
+=============================
+This is where a package declares its core dependencies, without which it won't
+be able to run. ``setuptools`` support automatically download and install
+these dependencies when the package is installed. Although there is more
+finess to it, let's start with a simple example.
 
-3. Python Egg distributions will include a metadata file listing the
-   dependencies.
+.. code-block:: ini
+
+    [options]
+    #...
+    install_requires =
+        docutils
+        BazSpam ==1.1
+
+.. code-block:: python
+
+    setup(
+        #...,
+        install_requires = [
+            'docutils',
+            'BazSpam ==1.1'
+        ]
+    )
+
+
+When your project is installed (e.g. using pip), all of the dependencies not
+already installed will be located (via PyPI), downloaded, built (if necessary),
+and installed and 2) Any scripts in your project will be installed with wrappers
+that verify the availability of the specified dependencies at runtime, and
+ensure that the correct versions are added to ``sys.path`` (e.g. if multiple
+versions have been installed).
+
+
+Platform specific dependencies
+------------------------------
+Sometimes a project might require a dependency to run on a specific platform.
+This could to a package that back ports a module so that it can be used in
+older python versions.  Or it could be a package that is required to run on a
+specific operating system.  This will allow a project to work on multiple
+different platforms without installing dependencies that are not required for
+a platform that is installing the project.
+
+For example, here is a project that uses the ``enum`` module and ``pywin32``::
+
+    setup(
+        name="Project",
+        ...
+        install_requires=[
+            "enum34;python_version<'3.4'",
+            "pywin32 >= 1.0;platform_system=='Windows'"
+        ]
+    )
+
+Since the ``enum`` module was added in Python 3.4, it should only be installed
+if the python version is earlier.  Since ``pywin32`` will only be used on
+windows, it should only be installed when the operating system is Windows.
+Specifying version requirements for the dependencies is supported as normal.
+
+The environmental markers that may be used for testing platform types are
+detailed in `PEP 508 <https://www.python.org/dev/peps/pep-0508/>`_.
 
-Note, by the way, that if you declare your dependencies in ``setup.py``, you do
-*not* need to use the ``require()`` function in your scripts or modules, as
-long as you either install the project or use ``setup.py develop`` to do
-development work on it.  (See `"Development Mode"`_ below for more details on
-using ``setup.py develop``.)
 
 Dependencies that aren't in PyPI
 --------------------------------
-
 .. warning::
     Dependency links support has been dropped by pip starting with version
     19.0 (released 2019-01-22).
@@ -122,22 +169,27 @@ temporary folder and run ``setup.py bdist_egg``.
 
 The ``dependency_links`` option takes the form of a list of URL strings.  For
 example, this will cause a search of the specified page for eggs or source
-distributions, if the package's dependencies aren't already installed::
+distributions, if the package's dependencies aren't already installed:
+
+.. code-block:: ini
+
+    [options]
+    #...
+    dependency_links = http://peak.telecommunity.com/snapshots/
+
+.. code-block:: python
 
     setup(
-        ...
+        #...
         dependency_links=[
             "http://peak.telecommunity.com/snapshots/"
         ],
     )
 
 
-.. _Declaring Extras:
-
-
-Declaring "Extras" (optional features with their own dependencies)
-------------------------------------------------------------------
 
+Optional dependencies
+=====================
 Sometimes a project has "recommended" dependencies, that are not required for
 all uses of the project.  For example, a project might offer optional PDF
 output if ReportLab is installed, and reStructuredText support if docutils is
@@ -170,14 +222,28 @@ dependencies.  For example, if Project A includes a "rst2pdf" script, it might
 declare it like this, so that the "PDF" requirements are only resolved if the
 "rst2pdf" script is run::
 
+.. code-block:: ini
+
+    [metadata]
+    name = Project A
+    #...
+
+    [options]
+    #...
+    entry_points=
+        [console_scripts]
+        rst2pdf = project_a.tools.pdfgen [PDF]
+        rst2html = project_a.tools.htmlgen
+
+.. code-block:: python
+
     setup(
-        name="Project-A",
-        ...
+        name = "Project-A"
+        #...,
         entry_points={
             "console_scripts": [
                 "rst2pdf = project_a.tools.pdfgen [PDF]",
                 "rst2html = project_a.tools.htmlgen",
-                # more script entry points ...
             ],
         }
     )
@@ -186,6 +252,19 @@ Projects can also use another project's extras when specifying dependencies.
 For example, if project B needs "project A" with PDF support installed, it
 might declare the dependency like this::
 
+.. code-block:: ini
+
+    [metadata]
+    name = Project-B
+    #...
+
+    [options]
+    #...
+    install_requires =
+        Project-A[PDF]
+
+.. code-block:: python
+
     setup(
         name="Project-B",
         install_requires=["Project-A[PDF]"],
@@ -221,35 +300,3 @@ so that Package B doesn't have to remove the ``[PDF]`` from its requirement
 specifier.
 
 .. _Platform Specific Dependencies:
-
-
-Declaring platform specific dependencies
-----------------------------------------
-
-Sometimes a project might require a dependency to run on a specific platform.
-This could to a package that back ports a module so that it can be used in
-older python versions.  Or it could be a package that is required to run on a
-specific operating system.  This will allow a project to work on multiple
-different platforms without installing dependencies that are not required for
-a platform that is installing the project.
-
-For example, here is a project that uses the ``enum`` module and ``pywin32``::
-
-    setup(
-        name="Project",
-        ...
-        install_requires=[
-            "enum34;python_version<'3.4'",
-            "pywin32 >= 1.0;platform_system=='Windows'"
-        ]
-    )
-
-Since the ``enum`` module was added in Python 3.4, it should only be installed
-if the python version is earlier.  Since ``pywin32`` will only be used on
-windows, it should only be installed when the operating system is Windows.
-Specifying version requirements for the dependencies is supported as normal.
-
-The environmental markers that may be used for testing platform types are
-detailed in `PEP 508`_.
-
-.. _PEP 508: https://www.python.org/dev/peps/pep-0508/

From 00888dd0d88a3463afd6e68ad85da515c194d63f Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 28 May 2020 17:49:45 -0400
Subject: [PATCH 7929/8469] docs: more finetuning on dependency guide

---
 docs/userguide/dependency_management.txt | 128 ++++++++++++-----------
 1 file changed, 68 insertions(+), 60 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index d9990ded94..abde5503f1 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -12,6 +12,7 @@ dependency.
     For all the packages you intend to add to dependency, you can optionally
     specify the version following :ref:`reference on version specifyer <WIP>`
 
+.. contents::
 
 Build system requirement
 ========================
@@ -85,29 +86,48 @@ versions have been installed).
 
 Platform specific dependencies
 ------------------------------
-Sometimes a project might require a dependency to run on a specific platform.
-This could to a package that back ports a module so that it can be used in
-older python versions.  Or it could be a package that is required to run on a
-specific operating system.  This will allow a project to work on multiple
-different platforms without installing dependencies that are not required for
-a platform that is installing the project.
+Setuptools offer the capability to evaluate certain conditions before blindly
+installing everything listed in ``install_requires``. This is great for platform
+specific dependencies. For example, the ``enum`` package was added in Python
+3.4, therefore, package that depends on it can elect to install it only when
+the Python version is older than 3.4. To accomplish this
 
-For example, here is a project that uses the ``enum`` module and ``pywin32``::
+.. code-block:: ini
+
+    [options]
+    #...
+    install_requires =
+        enum34;python_version<'3.4'
+
+.. code-block:: python
 
     setup(
-        name="Project",
-        ...
+        #...
+        install_requires=[
+            "enum34;python_version<'3.4'",]
+    )
+
+Similarly, if you also wish to declare ``pywin32`` with a minimal version of 1.0
+and only install it if the user is using a Windows operating system:
+
+.. code-block:: ini
+
+    [options]
+    #...
+    install_requires =
+        enum34;python_version<'3.4'
+        pywin32 >= 1.0;platform_system=='Windows'
+
+.. code-block:: python
+
+    setup(
+        #...
         install_requires=[
             "enum34;python_version<'3.4'",
             "pywin32 >= 1.0;platform_system=='Windows'"
-        ]
+            ]
     )
 
-Since the ``enum`` module was added in Python 3.4, it should only be installed
-if the python version is earlier.  Since ``pywin32`` will only be used on
-windows, it should only be installed when the operating system is Windows.
-Specifying version requirements for the dependencies is supported as normal.
-
 The environmental markers that may be used for testing platform types are
 detailed in `PEP 508 <https://www.python.org/dev/peps/pep-0508/>`_.
 
@@ -187,40 +207,40 @@ distributions, if the package's dependencies aren't already installed:
     )
 
 
-
 Optional dependencies
 =====================
-Sometimes a project has "recommended" dependencies, that are not required for
-all uses of the project.  For example, a project might offer optional PDF
-output if ReportLab is installed, and reStructuredText support if docutils is
-installed.  These optional features are called "extras", and setuptools allows
-you to define their requirements as well.  In this way, other projects that
-require these optional features can force the additional requirements to be
-installed, by naming the desired extras in their ``install_requires``.
+Setuptools allows you to declare dependencies that only get installed under
+specific circumstances. For example, let's say that Project-A offers optional
+PDF support and requires some additional package for it to work. Such a
+dependency will be specified with ``extras_require`` keyword and they are only
+installed if another package depends on it (either directly or indirectly).
+
+Let's first see how to specify such package:
+
+.. code-block:: ini
+
+    [metadata]
+    name = Package-A
+
+    [options.extras_require]
+    PDF = ReportLab>=1.2; RXP
+
 
-For example, let's say that Project A offers optional PDF and reST support::
+.. code-block:: python
 
     setup(
         name="Project-A",
-        ...
+        #...
         extras_require={
             "PDF":  ["ReportLab>=1.2", "RXP"],
-            "reST": ["docutils>=0.3"],
         }
     )
 
-As you can see, the ``extras_require`` argument takes a dictionary mapping
-names of "extra" features, to strings or lists of strings describing those
-features' requirements.  These requirements will *not* be automatically
-installed unless another package depends on them (directly or indirectly) by
-including the desired "extras" in square brackets after the associated project
-name.  (Or if the extras were listed in a requirement spec on the "pip install"
-command line.)
+The name ``PDF`` is an arbitary identifier of such a list of dependencies, to
+which other components can refer and have them installed. There are two common
+use cases.
 
-Extras can be used by a project's `entry points`_ to specify dynamic
-dependencies.  For example, if Project A includes a "rst2pdf" script, it might
-declare it like this, so that the "PDF" requirements are only resolved if the
-"rst2pdf" script is run::
+First is the console_scripts entry point:
 
 .. code-block:: ini
 
@@ -248,9 +268,12 @@ declare it like this, so that the "PDF" requirements are only resolved if the
         }
     )
 
-Projects can also use another project's extras when specifying dependencies.
-For example, if project B needs "project A" with PDF support installed, it
-might declare the dependency like this::
+When the script ``rst2pdf`` is run, it will trigger the installation of
+the two dependencies ``PDF`` maps to.
+
+The second use case is that other package can use this "extra" for their
+own dependencies. For example, if "Project-B" needs "project A" with PDF support
+installed, it might declare the dependency like this::
 
 .. code-block:: ini
 
@@ -280,23 +303,8 @@ no longer needs ReportLab, or if it ends up needing other dependencies besides
 ReportLab in order to provide PDF support, Project B's setup information does
 not need to change, but the right packages will still be installed if needed.
 
-Note, by the way, that if a project ends up not needing any other packages to
-support a feature, it should keep an empty requirements list for that feature
-in its ``extras_require`` argument, so that packages depending on that feature
-don't break (due to an invalid feature name).  For example, if Project A above
-builds in PDF support and no longer needs ReportLab, it could change its
-setup to this::
-
-    setup(
-        name="Project-A",
-        ...
-        extras_require={
-            "PDF":  [],
-            "reST": ["docutils>=0.3"],
-        }
-    )
-
-so that Package B doesn't have to remove the ``[PDF]`` from its requirement
-specifier.
-
-.. _Platform Specific Dependencies:
+.. note::
+    Best practice: if a project ends up not needing any other packages to
+    support a feature, it should keep an empty requirements list for that feature
+    in its ``extras_require`` argument, so that packages depending on that feature
+    don't break (due to an invalid feature name).

From ca5e271eed022a492a60db8eed1e55e135d1210e Mon Sep 17 00:00:00 2001
From: Sumana Harihareswara <sh@changeset.nyc>
Date: Thu, 28 May 2020 17:47:07 -0400
Subject: [PATCH 7930/8469] DOC: Update mailing list link

Per https://groups.google.com/d/msg/pypa-dev/rUNsfIbruHM/LCEx-CB5AgAJ
the pypa-dev Google Group is now decommissioned.
Pointing to distutils-sig instead.

Signed-off-by: Sumana Harihareswara <sh@changeset.nyc>
---
 changelog.d/2156.doc.rst |  1 +
 docs/developer-guide.txt | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/2156.doc.rst

diff --git a/changelog.d/2156.doc.rst b/changelog.d/2156.doc.rst
new file mode 100644
index 0000000000..8d604979af
--- /dev/null
+++ b/changelog.d/2156.doc.rst
@@ -0,0 +1 @@
+Update mailing list pointer in developer docs
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index e6171e4e30..4a78e22ea4 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -23,16 +23,16 @@ contribution.
 Project Management
 ------------------
 
-Setuptools is maintained primarily in Github at `this home
+Setuptools is maintained primarily in GitHub at `this home
 <https://github.com/pypa/setuptools>`_. Setuptools is maintained under the
 Python Packaging Authority (PyPA) with several core contributors. All bugs
-for Setuptools are filed and the canonical source is maintained in Github.
+for Setuptools are filed and the canonical source is maintained in GitHub.
 
 User support and discussions are done through the issue tracker (for specific)
-issues, through the distutils-sig mailing list, or on IRC (Freenode) at
+issues, through the `distutils-sig mailing list <https://mail.python.org/mailman3/lists/distutils-sig.python.org/>`_, or on IRC (Freenode) at
 #pypa.
 
-Discussions about development happen on the pypa-dev mailing list or on
+Discussions about development happen on the distutils-sig mailing list or on
 `Gitter <https://gitter.im/pypa/setuptools>`_.
 
 -----------------
@@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a
 ticket already exists for your issue. If not, create one. Try to think from
 the perspective of the reader. Explain what behavior you expected, what you
 got instead, and what factors might have contributed to the unexpected
-behavior. In Github, surround a block of code or traceback with the triple
+behavior. In GitHub, surround a block of code or traceback with the triple
 backtick "\`\`\`" so that it is formatted nicely.
 
 Filing a ticket provides a forum for justification, discussion, and

From 89e852c476c4fad9849ac21562be5be836c5a9f6 Mon Sep 17 00:00:00 2001
From: alvyjudy <alvyjudy@gmail.com>
Date: Thu, 28 May 2020 17:58:16 -0400
Subject: [PATCH 7931/8469] docs: restored notes on "require()" function

---
 docs/userguide/dependency_management.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index abde5503f1..ca2ac75ac4 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -83,6 +83,12 @@ that verify the availability of the specified dependencies at runtime, and
 ensure that the correct versions are added to ``sys.path`` (e.g. if multiple
 versions have been installed).
 
+.. note::
+    if you declare your dependencies in ``setup.py``, you do
+    *not* need to use the ``require()`` function in your scripts or modules, as
+    long as you either install the project or use ``setup.py develop`` to do
+    development work on it.
+    
 
 Platform specific dependencies
 ------------------------------

From 4020c9a5fe3c30e1192412786ce299dd8a909266 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 20:04:58 -0400
Subject: [PATCH 7932/8469] Avoid loading working set during
 `Distribution.finalize_options` prior to invoking `_install_setup_requires`,
 broken since v42.0.0. Fixes #2158.

---
 setuptools/__init__.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a71b2bbdc6..9d8ae1ed5f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -129,10 +129,27 @@ def _looks_like_package(path):
 def _install_setup_requires(attrs):
     # Note: do not use `setuptools.Distribution` directly, as
     # our PEP 517 backend patch `distutils.core.Distribution`.
-    dist = distutils.core.Distribution(dict(
-        (k, v) for k, v in attrs.items()
-        if k in ('dependency_links', 'setup_requires')
-    ))
+    class MinimalDistribution(distutils.core.Distribution):
+        """
+        A minimal version of a distribution for supporting the
+        fetch_build_eggs interface.
+        """
+        def __init__(self, attrs):
+            _incl = 'dependency_links', 'setup_requires'
+            filtered = {
+                k: attrs[k]
+                for k in set(_incl) & set(attrs)
+            }
+            distutils.core.Distribution.__init__(self, filtered)
+
+        def finalize_options(self):
+            """
+            Disable finalize_options to avoid building the working set.
+            Ref #2158.
+            """
+
+    dist = MinimalDistribution(attrs)
+
     # Honor setup.cfg's options.
     dist.parse_config_files(ignore_option_errors=True)
     if dist.setup_requires:

From 2dc4b62da3d32bd765686d62c8ce5ec69b96ff92 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 20:05:26 -0400
Subject: [PATCH 7933/8469] Update changelog.

---
 changelog.d/2158.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2158.misc.rst

diff --git a/changelog.d/2158.misc.rst b/changelog.d/2158.misc.rst
new file mode 100644
index 0000000000..16a5a50410
--- /dev/null
+++ b/changelog.d/2158.misc.rst
@@ -0,0 +1 @@
+Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.

From df51e62984850e58e8f29e8223b714091e0b8a5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@Karui-Tatchi.lan>
Date: Thu, 28 May 2020 21:00:39 -0400
Subject: [PATCH 7934/8469] =?UTF-8?q?Bump=20version:=2044.1.0=20=E2=86=92?=
 =?UTF-8?q?=2044.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2158.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2158.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c8c9f544bf..4bea6cca5a 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 44.1.0
+current_version = 44.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 83cd8c784b..43b65eb33a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v44.1.1
+-------
+
+* #2158: Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.
+
+
 v44.1.0
 -------
 
diff --git a/changelog.d/2158.misc.rst b/changelog.d/2158.misc.rst
deleted file mode 100644
index 16a5a50410..0000000000
--- a/changelog.d/2158.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.
diff --git a/setup.cfg b/setup.cfg
index cb5ae73bc4..323d2cf596 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,7 @@ universal = 1
 
 [metadata]
 name = setuptools
-version = 44.1.0
+version = 44.1.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 6214d4d20a1c329f0b333abcdaaf7d242eed5e3f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 28 May 2020 21:13:12 -0400
Subject: [PATCH 7935/8469] =?UTF-8?q?Bump=20version:=2047.1.0=20=E2=86=92?=
 =?UTF-8?q?=2047.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg         |  2 +-
 CHANGES.rst              | 10 ++++++++++
 changelog.d/2156.doc.rst |  1 -
 setup.cfg                |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2156.doc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1fa442e280..23226c351b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.1.0
+current_version = 47.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 048fef6b13..b018cbea4d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v47.1.1
+-------
+
+* #2156: Update mailing list pointer in developer docs
+
+Incorporate changes from v44.1.1:
+
+* #2158: Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.
+
+
 v44.1.1
 -------
 
diff --git a/changelog.d/2156.doc.rst b/changelog.d/2156.doc.rst
deleted file mode 100644
index 8d604979af..0000000000
--- a/changelog.d/2156.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update mailing list pointer in developer docs
diff --git a/setup.cfg b/setup.cfg
index c8f72e97cf..66fb8921b9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.1.0
+version = 47.1.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 74de4e985eda49e38ece5805e05197dd4d2d9c8a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 29 May 2020 17:50:32 -0400
Subject: [PATCH 7936/8469] The workaround is only needed for Python 2. Ref
 #1998.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index aa99e28367..d3df21bffd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ minversion = 3.2
 requires =
 	tox-pip-version >= 0.0.6
 	# workaround for #1998
-	virtualenv < 20
+	virtualenv < 20; python_version=="2.7"
 
 [helpers]
 # Custom pip behavior

From e4aa9070e7196975edb41f8dcaccf8eccbf83b2e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 29 May 2020 18:21:24 -0400
Subject: [PATCH 7937/8469] Setuptools no longer installs a site.py file during
 easy_install or develop installs. Ref #2165.

---
 setuptools/command/develop.py         |  1 -
 setuptools/command/easy_install.py    | 44 +---------------
 setuptools/site-patch.py              | 76 ---------------------------
 setuptools/tests/test_easy_install.py |  8 ---
 tox.ini                               |  2 -
 5 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 setuptools/site-patch.py

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index b561924609..e7e03cd449 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -139,7 +139,6 @@ def install_for_development(self):
             self.reinitialize_command('build_ext', inplace=1)
             self.run_command('build_ext')
 
-        self.install_site_py()  # ensure that target dir is site-safe
         if setuptools.bootstrap_install_from:
             self.easy_install(setuptools.bootstrap_install_from)
             setuptools.bootstrap_install_from = None
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5a9576ff29..a68490abda 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -205,7 +205,6 @@ def initialize_options(self):
         self.pth_file = self.always_copy_from = None
         self.site_dirs = None
         self.installed_projects = {}
-        self.sitepy_installed = False
         # Always read easy_install options, even if we are subclassed, or have
         # an independent instance created.  This ensures that defaults will
         # always come from the standard configuration file(s)' "easy_install"
@@ -494,12 +493,8 @@ def check_site_dir(self):
         else:
             self.pth_file = None
 
-        if instdir not in map(normalize_path, _pythonpath()):
-            # only PYTHONPATH dirs need a site.py, so pretend it's there
-            self.sitepy_installed = True
-        elif self.multi_version and not os.path.exists(pth_file):
-            self.sitepy_installed = True  # don't need site.py in this case
-            self.pth_file = None  # and don't create a .pth file
+        if self.multi_version and not os.path.exists(pth_file):
+            self.pth_file = None  # don't create a .pth file
         self.install_dir = instdir
 
     __cant_write_msg = textwrap.dedent("""
@@ -656,9 +651,6 @@ def _tmpdir(self):
             os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
 
     def easy_install(self, spec, deps=False):
-        if not self.editable:
-            self.install_site_py()
-
         with self._tmpdir() as tmpdir:
             if not isinstance(spec, Requirement):
                 if URL_SCHEME(spec):
@@ -1317,38 +1309,6 @@ def byte_compile(self, to_compile):
         Please make the appropriate changes for your system and try again.
         """).strip()
 
-    def install_site_py(self):
-        """Make sure there's a site.py in the target dir, if needed"""
-
-        if self.sitepy_installed:
-            return  # already did it, or don't need to
-
-        sitepy = os.path.join(self.install_dir, "site.py")
-        source = resource_string("setuptools", "site-patch.py")
-        source = source.decode('utf-8')
-        current = ""
-
-        if os.path.exists(sitepy):
-            log.debug("Checking existing site.py in %s", self.install_dir)
-            with io.open(sitepy) as strm:
-                current = strm.read()
-
-            if not current.startswith('def __boot():'):
-                raise DistutilsError(
-                    "%s is not a setuptools-generated site.py; please"
-                    " remove it." % sitepy
-                )
-
-        if current != source:
-            log.info("Creating %s", sitepy)
-            if not self.dry_run:
-                ensure_directory(sitepy)
-                with io.open(sitepy, 'w', encoding='utf-8') as strm:
-                    strm.write(source)
-            self.byte_compile([sitepy])
-
-        self.sitepy_installed = True
-
     def create_home_path(self):
         """Create directories under ~."""
         if not self.user:
diff --git a/setuptools/site-patch.py b/setuptools/site-patch.py
deleted file mode 100644
index be0d43d354..0000000000
--- a/setuptools/site-patch.py
+++ /dev/null
@@ -1,76 +0,0 @@
-def __boot():
-    import sys
-    import os
-    PYTHONPATH = os.environ.get('PYTHONPATH')
-    if PYTHONPATH is None or (sys.platform == 'win32' and not PYTHONPATH):
-        PYTHONPATH = []
-    else:
-        PYTHONPATH = PYTHONPATH.split(os.pathsep)
-
-    pic = getattr(sys, 'path_importer_cache', {})
-    stdpath = sys.path[len(PYTHONPATH):]
-    mydir = os.path.dirname(__file__)
-
-    for item in stdpath:
-        if item == mydir or not item:
-            continue  # skip if current dir. on Windows, or my own directory
-        importer = pic.get(item)
-        if importer is not None:
-            loader = importer.find_module('site')
-            if loader is not None:
-                # This should actually reload the current module
-                loader.load_module('site')
-                break
-        else:
-            try:
-                import imp  # Avoid import loop in Python 3
-                stream, path, descr = imp.find_module('site', [item])
-            except ImportError:
-                continue
-            if stream is None:
-                continue
-            try:
-                # This should actually reload the current module
-                imp.load_module('site', stream, path, descr)
-            finally:
-                stream.close()
-            break
-    else:
-        raise ImportError("Couldn't find the real 'site' module")
-
-    # 2.2 comp
-    known_paths = dict([(
-        makepath(item)[1], 1) for item in sys.path])  # noqa
-
-    oldpos = getattr(sys, '__egginsert', 0)  # save old insertion position
-    sys.__egginsert = 0  # and reset the current one
-
-    for item in PYTHONPATH:
-        addsitedir(item)  # noqa
-
-    sys.__egginsert += oldpos  # restore effective old position
-
-    d, nd = makepath(stdpath[0])  # noqa
-    insert_at = None
-    new_path = []
-
-    for item in sys.path:
-        p, np = makepath(item)  # noqa
-
-        if np == nd and insert_at is None:
-            # We've hit the first 'system' path entry, so added entries go here
-            insert_at = len(new_path)
-
-        if np in known_paths or insert_at is None:
-            new_path.append(item)
-        else:
-            # new path after the insert point, back-insert it
-            new_path.insert(insert_at, item)
-            insert_at += 1
-
-    sys.path[:] = new_path
-
-
-if __name__ == 'site':
-    __boot()
-    del __boot
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3044cbd098..e8ebd3205a 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -61,14 +61,6 @@ def as_requirement(self):
 
 
 class TestEasyInstallTest:
-    def test_install_site_py(self, tmpdir):
-        dist = Distribution()
-        cmd = ei.easy_install(dist)
-        cmd.sitepy_installed = False
-        cmd.install_dir = str(tmpdir)
-        cmd.install_site_py()
-        assert (tmpdir / 'site.py').exists()
-
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()
         expected = header + DALS(r"""
diff --git a/tox.ini b/tox.ini
index d3df21bffd..a1cc0b6e39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,8 +7,6 @@ envlist=python
 minversion = 3.2
 requires =
 	tox-pip-version >= 0.0.6
-	# workaround for #1998
-	virtualenv < 20; python_version=="2.7"
 
 [helpers]
 # Custom pip behavior

From d9a3b57cfabcae25539b5118977b2f6ef78d641b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 29 May 2020 18:22:39 -0400
Subject: [PATCH 7938/8469] Update changelog.

---
 changelog.d/2165.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2165.breaking.rst

diff --git a/changelog.d/2165.breaking.rst b/changelog.d/2165.breaking.rst
new file mode 100644
index 0000000000..a9b598b937
--- /dev/null
+++ b/changelog.d/2165.breaking.rst
@@ -0,0 +1 @@
+Setuptools no longer installs a site.py file during easy_install or develop installs. As a result, .eggs on PYTHONPATH will no longer take precedence over other packages on sys.path. If this issue affects your production environment, please reach out to the maintainers at #2165.

From a5dbf96442a539dbdb59af56898f0571dc68c3d6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 30 May 2020 17:11:49 -0400
Subject: [PATCH 7939/8469] Drop support for Python 3.5.

---
 .github/workflows/python-tests.yml |  1 -
 .travis.yml                        |  1 -
 appveyor.yml                       | 12 +++++-------
 setup.cfg                          |  7 +++----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index e3663cf0b8..41441644f3 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -23,7 +23,6 @@ jobs:
         - pypy3
         - 3.7
         - 3.6
-        - 3.5
         os:
         - ubuntu-latest
         - ubuntu-16.04
diff --git a/.travis.yml b/.travis.yml
index f97abc51c4..fa04a42e6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ jobs:
   include:
   - python: pypy3
     env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
-  - python: 3.5
   - python: 3.6
   - python: 3.7
   - &latest_py3
diff --git a/appveyor.yml b/appveyor.yml
index de4e6c66c6..3c0c36b83e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,15 +8,13 @@ environment:
 
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      APPVEYOR_JOB_NAME: "python35-x64-vs2015"
-      PYTHON: "C:\\Python35-x64"
+      APPVEYOR_JOB_NAME: "python36-x64-vs2015"
+      PYTHON: "C:\\Python36-x64"
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      APPVEYOR_JOB_NAME: "python35-x64-vs2017"
-      PYTHON: "C:\\Python35-x64"
+      APPVEYOR_JOB_NAME: "python36-x64-vs2017"
+      PYTHON: "C:\\Python36-x64"
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      APPVEYOR_JOB_NAME: "python35-x64-vs2019"
-      PYTHON: "C:\\Python35-x64"
-    - APPVEYOR_JOB_NAME: "python36-x64"
+      APPVEYOR_JOB_NAME: "python36-x64-vs2019"
       PYTHON: "C:\\Python36-x64"
     - APPVEYOR_JOB_NAME: "python37-x64"
       PYTHON: "C:\\Python37-x64"
diff --git a/setup.cfg b/setup.cfg
index 66fb8921b9..8558057f3b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,7 +34,6 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
@@ -45,7 +44,7 @@ classifiers =
 
 [options]
 zip_safe = True
-python_requires = >=3.5
+python_requires = >=3.6
 py_modules = easy_install
 packages = find:
 
@@ -62,14 +61,14 @@ certs =
 tests =
     mock
     pytest-flake8
-    flake8-2020; python_version>="3.6"
+    flake8-2020
     virtualenv>=13.0.0
     pytest-virtualenv>=1.2.7
     pytest>=3.7
     wheel
     coverage>=4.5.1
     pytest-cov>=2.5.1
-    paver; python_version>="3.6"
+    paver
     futures; python_version=="2.7"
     pip>=19.1 # For proper file:// URLs support.
 

From 4ac101a1805a3773649b42c7682038f41314738e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 08:43:36 -0400
Subject: [PATCH 7940/8469] Restore Python 3.5 syntax compatibility in
 distutils.dist.

---
 distutils/dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distutils/dist.py b/distutils/dist.py
index 6cf0a0d663..37db4d6cd7 100644
--- a/distutils/dist.py
+++ b/distutils/dist.py
@@ -35,7 +35,8 @@ def _ensure_list(value, fieldname):
     elif not isinstance(value, list):
         # passing a tuple or an iterator perhaps, warn and convert
         typename = type(value).__name__
-        msg = f"Warning: '{fieldname}' should be a list, got type '{typename}'"
+        msg = "Warning: '{fieldname}' should be a list, got type '{typename}'"
+        msg = msg.format(**locals())
         log.log(log.WARN, msg)
         value = list(value)
     return value

From 9962c0af814ccd13c370ce8b04742a52f77025c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 08:50:31 -0400
Subject: [PATCH 7941/8469] Extract function for ensure_local_distuils

---
 setuptools/distutils_patch.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index e0abbd77da..43b64c0fc8 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -21,9 +21,11 @@ def patch_sys_path():
         sys.path[:] = orig
 
 
-if 'distutils' in sys.path:
-    raise RuntimeError("Distutils must not be imported before setuptools")
+def ensure_local_distutils():
+    if 'distutils' in sys.path:
+        raise RuntimeError("Distutils must not be imported before setuptools")
+    with patch_sys_path():
+        importlib.import_module('distutils')
 
 
-with patch_sys_path():
-    importlib.import_module('distutils')
+ensure_local_distutils()

From 38a8632835c90bfb0a220f91a8b2e982a69b81ab Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 09:34:34 -0400
Subject: [PATCH 7942/8469] Fallback to '_sysconfigdata' when platform-specific
 sysconfigdata is unavailable.

---
 distutils/sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
index 2109f746ba..79391e8671 100644
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
@@ -444,7 +444,12 @@ def _init_posix():
         platform=sys.platform,
         multiarch=getattr(sys.implementation, '_multiarch', ''),
     ))
-    _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    try:
+        _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    except ImportError:
+        # Python 3.5 and pypy 7.3.1
+        _temp = __import__(
+            '_sysconfigdata', globals(), locals(), ['build_time_vars'], 0)
     build_time_vars = _temp.build_time_vars
     global _config_vars
     _config_vars = {}

From db7ff2e1b0ea51fee56b7f626a548cd2ef590e5e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 12:26:45 -0400
Subject: [PATCH 7943/8469] Add changelog entry.

---
 changelog.d/2143.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2143.breaking.rst

diff --git a/changelog.d/2143.breaking.rst b/changelog.d/2143.breaking.rst
new file mode 100644
index 0000000000..185542addf
--- /dev/null
+++ b/changelog.d/2143.breaking.rst
@@ -0,0 +1 @@
+Setuptools adopts distutils from the standard library as a top-level ``distutils`` package and no longer depends on distutils in the standard library. This new ``distutils`` package will be masked by ``distutils`` in the standard library unless that library has been stripped by a downstream package manager or gets removed in a future version. Although this change is not expected to break any use-cases, it will likely affect tool-chains that are monkey-patching distutils or relying on Setuptools' own monkey patching of distutils.

From 6588760710433951a1df48c298bdc49fa5bb7c6c Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Thu, 11 Jun 2020 22:09:29 +0300
Subject: [PATCH 7944/8469] Fix exception causes in package_index.py

---
 setuptools/package_index.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 0744ea2ad1..1702c7c693 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -53,10 +53,10 @@
 def parse_requirement_arg(spec):
     try:
         return Requirement.parse(spec)
-    except ValueError:
+    except ValueError as e:
         raise DistutilsError(
             "Not a URL, existing file, or requirement spec: %r" % (spec,)
-        )
+        ) from e
 
 
 def parse_bdist_wininst(name):
@@ -772,7 +772,7 @@ def open_url(self, url, warning=None):
             if warning:
                 self.warn(warning, msg)
             else:
-                raise DistutilsError('%s %s' % (url, msg))
+                raise DistutilsError('%s %s' % (url, msg)) from v
         except urllib.error.HTTPError as v:
             return v
         except urllib.error.URLError as v:
@@ -780,7 +780,7 @@ def open_url(self, url, warning=None):
                 self.warn(warning, v.reason)
             else:
                 raise DistutilsError("Download error for %s: %s"
-                                     % (url, v.reason))
+                                     % (url, v.reason)) from v
         except http_client.BadStatusLine as v:
             if warning:
                 self.warn(warning, v.line)
@@ -789,13 +789,13 @@ def open_url(self, url, warning=None):
                     '%s returned a bad status line. The server might be '
                     'down, %s' %
                     (url, v.line)
-                )
+                ) from v
         except (http_client.HTTPException, socket.error) as v:
             if warning:
                 self.warn(warning, v)
             else:
                 raise DistutilsError("Download error for %s: %s"
-                                     % (url, v))
+                                     % (url, v)) from v
 
     def _download_url(self, scheme, url, tmpdir):
         # Determine download filename

From 01121d057bea0128c34a92813c51ba3ec4902fce Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Sun, 14 Jun 2020 12:58:52 -0400
Subject: [PATCH 7945/8469] Decrease start-up time of editable-installed entry
 points on newer versions of Python

---
 changelog.d/2194.change.rst           |  1 +
 setuptools/command/easy_install.py    | 43 ++++++++++++++++++--------
 setuptools/tests/test_easy_install.py | 44 +++++++++++++++++++--------
 3 files changed, 62 insertions(+), 26 deletions(-)
 create mode 100644 changelog.d/2194.change.rst

diff --git a/changelog.d/2194.change.rst b/changelog.d/2194.change.rst
new file mode 100644
index 0000000000..8b5adb3196
--- /dev/null
+++ b/changelog.d/2194.change.rst
@@ -0,0 +1 @@
+Editable-installed entry points now load significantly faster on Python versions 3.8+.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5a9576ff29..a82b165580 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2070,19 +2070,36 @@ class ScriptWriter:
     gui apps.
     """
 
-    template = textwrap.dedent(r"""
-        # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
-        __requires__ = %(spec)r
-        import re
-        import sys
-        from pkg_resources import load_entry_point
-
-        if __name__ == '__main__':
-            sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-            sys.exit(
-                load_entry_point(%(spec)r, %(group)r, %(name)r)()
-            )
-    """).lstrip()
+    try:
+        from importlib.metadata import distribution  # noqa: F401
+
+        template = textwrap.dedent(r"""
+            # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
+            __requires__ = %(spec)r
+            import re
+            import sys
+            from importlib.metadata import distribution
+
+            if __name__ == '__main__':
+                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+                for entry_point in distribution(%(spec)r).entry_points:
+                    if entry_point.group == %(group)r and entry_point.name == %(name)r:
+                        sys.exit(entry_point.load()())
+        """).lstrip()  # noqa: E501
+    except ImportError:
+        template = textwrap.dedent(r"""
+            # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
+            __requires__ = %(spec)r
+            import re
+            import sys
+            from pkg_resources import load_entry_point
+
+            if __name__ == '__main__':
+                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+                sys.exit(
+                    load_entry_point(%(spec)r, %(group)r, %(name)r)()
+                )
+        """).lstrip()  # noqa: E501
 
     command_spec_class = CommandSpec
 
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3044cbd098..58108db6b4 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -71,19 +71,37 @@ def test_install_site_py(self, tmpdir):
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()
-        expected = header + DALS(r"""
-            # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-            __requires__ = 'spec'
-            import re
-            import sys
-            from pkg_resources import load_entry_point
-
-            if __name__ == '__main__':
-                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                sys.exit(
-                    load_entry_point('spec', 'console_scripts', 'name')()
-                )
-            """)  # noqa: E501
+        try:
+            from importlib.metadata import distribution  # noqa: F401
+
+            expected = header + DALS(r"""
+                # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
+                __requires__ = 'spec'
+                import re
+                import sys
+                from importlib.metadata import distribution
+
+                if __name__ == '__main__':
+                    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+                    for entry_point in distribution('spec').entry_points:
+                        if entry_point.group == 'console_scripts' and entry_point.name == 'name':
+                            sys.exit(entry_point.load()())
+                """)  # noqa: E501
+        except ImportError:
+            expected = header + DALS(r"""
+                # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
+                __requires__ = 'spec'
+                import re
+                import sys
+                from pkg_resources import load_entry_point
+
+                if __name__ == '__main__':
+                    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+                    sys.exit(
+                        load_entry_point('spec', 'console_scripts', 'name')()
+                    )
+                """)  # noqa: E501
+
         dist = FakeDist()
 
         args = next(ei.ScriptWriter.get_args(dist))

From d6501f3c75384340f1742a864c1ffa76977437b6 Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Sun, 14 Jun 2020 14:21:26 -0400
Subject: [PATCH 7946/8469] address

---
 setuptools/command/easy_install.py    | 6 ++----
 setuptools/tests/test_easy_install.py | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a82b165580..15e46cfc96 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2070,9 +2070,7 @@ class ScriptWriter:
     gui apps.
     """
 
-    try:
-        from importlib.metadata import distribution  # noqa: F401
-
+    if sys.version_info >= (3, 8):
         template = textwrap.dedent(r"""
             # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
             __requires__ = %(spec)r
@@ -2086,7 +2084,7 @@ class ScriptWriter:
                     if entry_point.group == %(group)r and entry_point.name == %(name)r:
                         sys.exit(entry_point.load()())
         """).lstrip()  # noqa: E501
-    except ImportError:
+    else:
         template = textwrap.dedent(r"""
             # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
             __requires__ = %(spec)r
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 58108db6b4..9aa2bd632c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -71,9 +71,7 @@ def test_install_site_py(self, tmpdir):
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()
-        try:
-            from importlib.metadata import distribution  # noqa: F401
-
+        if sys.version_info >= (3, 8):
             expected = header + DALS(r"""
                 # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
                 __requires__ = 'spec'
@@ -87,7 +85,7 @@ def test_get_script_args(self):
                         if entry_point.group == 'console_scripts' and entry_point.name == 'name':
                             sys.exit(entry_point.load()())
                 """)  # noqa: E501
-        except ImportError:
+        else:
             expected = header + DALS(r"""
                 # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
                 __requires__ = 'spec'

From f8cd1f258f4b3f52521db2a12bfbd0832fb2e9fa Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Sun, 14 Jun 2020 21:04:04 -0400
Subject: [PATCH 7947/8469] address

---
 setuptools/command/easy_install.py    | 1 -
 setuptools/tests/test_easy_install.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 15e46cfc96..ab8258ca83 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2073,7 +2073,6 @@ class ScriptWriter:
     if sys.version_info >= (3, 8):
         template = textwrap.dedent(r"""
             # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
-            __requires__ = %(spec)r
             import re
             import sys
             from importlib.metadata import distribution
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 9aa2bd632c..345823cf42 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -74,7 +74,6 @@ def test_get_script_args(self):
         if sys.version_info >= (3, 8):
             expected = header + DALS(r"""
                 # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-                __requires__ = 'spec'
                 import re
                 import sys
                 from importlib.metadata import distribution

From a4d8518c7b3cadf5e008871cf0d8c2d02a6a4492 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 08:55:00 -0400
Subject: [PATCH 7948/8469] Make a few assertions about the entry point script
 rather than keeping a fully-rendered copy.

---
 setuptools/tests/test_easy_install.py | 38 +++++----------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 345823cf42..8611dc166e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -16,6 +16,7 @@
 import zipfile
 import mock
 import time
+import re
 
 from setuptools.extern import six
 
@@ -71,40 +72,15 @@ def test_install_site_py(self, tmpdir):
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()
-        if sys.version_info >= (3, 8):
-            expected = header + DALS(r"""
-                # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-                import re
-                import sys
-                from importlib.metadata import distribution
-
-                if __name__ == '__main__':
-                    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                    for entry_point in distribution('spec').entry_points:
-                        if entry_point.group == 'console_scripts' and entry_point.name == 'name':
-                            sys.exit(entry_point.load()())
-                """)  # noqa: E501
-        else:
-            expected = header + DALS(r"""
-                # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name'
-                __requires__ = 'spec'
-                import re
-                import sys
-                from pkg_resources import load_entry_point
-
-                if __name__ == '__main__':
-                    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                    sys.exit(
-                        load_entry_point('spec', 'console_scripts', 'name')()
-                    )
-                """)  # noqa: E501
-
         dist = FakeDist()
-
         args = next(ei.ScriptWriter.get_args(dist))
         name, script = itertools.islice(args, 2)
-
-        assert script == expected
+        assert script.startswith(header)
+        assert "'spec'" in script
+        assert "'console_scripts'" in script
+        assert "'name'" in script
+        assert re.search(
+            '^# EASY-INSTALL-ENTRY-SCRIPT', script, flags=re.MULTILINE)
 
     def test_no_find_links(self):
         # new option '--no-find-links', that blocks find-links added at

From c999ba42e3cc99cfdf8c1eea88b9b0136104af12 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 08:56:45 -0400
Subject: [PATCH 7949/8469] =?UTF-8?q?Bump=20version:=2047.1.1=20=E2=86=92?=
 =?UTF-8?q?=2047.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2194.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2194.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 23226c351b..ffb0f2e813 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.1.1
+current_version = 47.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index b018cbea4d..44abab75e7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v47.2.0
+-------
+
+* #2194: Editable-installed entry points now load significantly faster on Python versions 3.8+.
+
+
 v47.1.1
 -------
 
diff --git a/changelog.d/2194.change.rst b/changelog.d/2194.change.rst
deleted file mode 100644
index 8b5adb3196..0000000000
--- a/changelog.d/2194.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Editable-installed entry points now load significantly faster on Python versions 3.8+.
diff --git a/setup.cfg b/setup.cfg
index 66fb8921b9..4beae652ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.1.1
+version = 47.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 2b4b5de16c8dc782bde3ee6ed54ef8868d90eb6e Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Mon, 15 Jun 2020 11:54:04 -0400
Subject: [PATCH 7950/8469] Fix entry point scripts

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ab8258ca83..2563f3132b 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2079,7 +2079,7 @@ class ScriptWriter:
 
             if __name__ == '__main__':
                 sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                for entry_point in distribution(%(spec)r).entry_points:
+                for entry_point in distribution(%(spec)r.split('==')[0]).entry_points:
                     if entry_point.group == %(group)r and entry_point.name == %(name)r:
                         sys.exit(entry_point.load()())
         """).lstrip()  # noqa: E501

From d74a16061950593f388a72871533b303b21e2a4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 16:17:38 -0400
Subject: [PATCH 7951/8469] Update changelog.

---
 changelog.d/2195.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2195.misc.rst

diff --git a/changelog.d/2195.misc.rst b/changelog.d/2195.misc.rst
new file mode 100644
index 0000000000..f73994ddce
--- /dev/null
+++ b/changelog.d/2195.misc.rst
@@ -0,0 +1 @@
+Fix broken entry points generated by easy-install (pip editable installs).

From 9bb11490f57d8d77cd789e9719588a8603dc375b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 16:34:22 -0400
Subject: [PATCH 7952/8469] Unify the entry point template.

---
 setuptools/command/easy_install.py | 54 ++++++++++++++++--------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 2563f3132b..81526b9a4f 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2070,33 +2070,37 @@ class ScriptWriter:
     gui apps.
     """
 
-    if sys.version_info >= (3, 8):
-        template = textwrap.dedent(r"""
-            # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
-            import re
-            import sys
+    template = textwrap.dedent(r"""
+        # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
+        import re
+        import sys
+
+        try:
             from importlib.metadata import distribution
+        except ImportError:
+            try:
+                from importlib_metadata import distribution
+            except ImportError:
+                from pkg_resources import load_entry_point
 
-            if __name__ == '__main__':
-                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                for entry_point in distribution(%(spec)r.split('==')[0]).entry_points:
-                    if entry_point.group == %(group)r and entry_point.name == %(name)r:
-                        sys.exit(entry_point.load()())
-        """).lstrip()  # noqa: E501
-    else:
-        template = textwrap.dedent(r"""
-            # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
-            __requires__ = %(spec)r
-            import re
-            import sys
-            from pkg_resources import load_entry_point
-
-            if __name__ == '__main__':
-                sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
-                sys.exit(
-                    load_entry_point(%(spec)r, %(group)r, %(name)r)()
-                )
-        """).lstrip()  # noqa: E501
+
+        def importlib_load_entry_point(spec, group, name):
+            dist_name, _, _ = spec.partition('==')
+            matches = (
+                entry_point
+                for entry_point in distribution(dist_name).entry_points
+                if entry_point.group == group and entry_point.name == name
+            )
+            return next(matches).load()
+
+
+        globals().setdefault('load_entry_point', importlib_load_entry_point)
+
+
+        if __name__ == '__main__':
+            sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+            sys.exit(load_entry_point(%(spec)r, %(group)r, %(name)r)())
+        """).lstrip()
 
     command_spec_class = CommandSpec
 

From 9db4553f1ce7d9ab4ae42e0e8a37a54bda3fd900 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 16:38:56 -0400
Subject: [PATCH 7953/8469] Update changelog.

---
 changelog.d/2197.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2197.change.rst

diff --git a/changelog.d/2197.change.rst b/changelog.d/2197.change.rst
new file mode 100644
index 0000000000..67b0435ab9
--- /dev/null
+++ b/changelog.d/2197.change.rst
@@ -0,0 +1 @@
+Console script wrapper for editable installs now has a unified template and honors importlib_metadata if present for faster script execution on older Pythons.

From 3955acbb0da75df804d86a52d6fbcc269075a9d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 16:47:28 -0400
Subject: [PATCH 7954/8469] =?UTF-8?q?Bump=20version:=2047.2.0=20=E2=86=92?=
 =?UTF-8?q?=2047.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 7 +++++++
 changelog.d/2195.misc.rst   | 1 -
 changelog.d/2197.change.rst | 1 -
 setup.cfg                   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/2195.misc.rst
 delete mode 100644 changelog.d/2197.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ffb0f2e813..1bdc4be3fb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.2.0
+current_version = 47.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 44abab75e7..16608ddc11 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v47.3.0
+-------
+
+* #2197: Console script wrapper for editable installs now has a unified template and honors importlib_metadata if present for faster script execution on older Pythons.
+* #2195: Fix broken entry points generated by easy-install (pip editable installs).
+
+
 v47.2.0
 -------
 
diff --git a/changelog.d/2195.misc.rst b/changelog.d/2195.misc.rst
deleted file mode 100644
index f73994ddce..0000000000
--- a/changelog.d/2195.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken entry points generated by easy-install (pip editable installs).
diff --git a/changelog.d/2197.change.rst b/changelog.d/2197.change.rst
deleted file mode 100644
index 67b0435ab9..0000000000
--- a/changelog.d/2197.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Console script wrapper for editable installs now has a unified template and honors importlib_metadata if present for faster script execution on older Pythons.
diff --git a/setup.cfg b/setup.cfg
index 4beae652ed..9d3cad52f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.2.0
+version = 47.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 09df3c7adba9a1e687151805b61aec72f6c8b13f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 17:45:10 -0400
Subject: [PATCH 7955/8469] Add a compatibility wrapper, so downstream
 consumers trapping a RequirementParseError will now trap an
 InvalidRequirement, allowing transition to only trapping an
 InvalidRequirement.

---
 pkg_resources/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 56be3c223b..1433409af7 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3090,6 +3090,10 @@ def parse_requirements(strs):
         yield Requirement(line)
 
 
+class RequirementParseError(packaging.requirements.InvalidRequirement):
+    "Compatibility wrapper for InvalidRequirement"
+
+
 class Requirement(packaging.requirements.Requirement):
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""

From dfe2ef5d780f476db778aacfb37a44a017022180 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Jun 2020 18:53:58 -0400
Subject: [PATCH 7956/8469] Correct some of the behaviors indicated in new
 entry points docs. Switch to imperative voice. Limit to declarative config
 (setup.cfg) examples.

---
 docs/userguide/entry_point.txt | 234 +++++++++++++--------------------
 1 file changed, 94 insertions(+), 140 deletions(-)

diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.txt
index 8190d8e339..7f5165a876 100644
--- a/docs/userguide/entry_point.txt
+++ b/docs/userguide/entry_point.txt
@@ -1,200 +1,154 @@
 .. _`entry_points`:
 
-==========================================
-Entry Points and Automatic Script Creation
-==========================================
+============
+Entry Points
+============
 
-After installing some packages, you may realize you can invoke some commands
-without explicitly calling the python interpreter. For example, instead of
-calling ``python -m pip install`` you can just do ``pip install``. The magic
-behind this is entry point, a keyword passed to your ``setup.cfg`` or
-``setup.py`` to create script wrapped around function in your libraries.
+Packages may provide commands to be run at the console (console scripts),
+such as the ``pip`` command. These commands are defined for a package
+as a specific kind of entry point in the ``setup.cfg`` or
+``setup.py``.
 
 
-Using entry point in your package
-=================================
-Let's start with an example. Suppose you have written your package like this:
+Console Scripts
+===============
+
+First consider an example without entry points. Imagine a package
+defined thus::
 
 .. code-block:: bash
 
     timmins/
         timmins/__init__.py
+        timmins/__main__.py
         setup.cfg # or setup.py
         #other necessary files
 
-and in your ``__init__.py`` it defines a function:
+with ``__init__.py`` as:
 
 .. code-block:: python
 
     def helloworld():
         print("Hello world")
 
-After installing the package, you can invoke this function in the following
-manner, without applying any magic:
+and ``__main__.py`` providing a hook:
+
+    from . import hello_world
+    if __name__ == '__main__':
+        hello_world()
+
+After installing the package, the function may be invoked through the
+`runpy <https://docs.python.org/3/library/runpy.html>`_ module::
 
 .. code-block:: bash
 
-    python -m mypkg.helloworld
+    python -m timmins
 
-But entry point simplifies the call and would create a wrapper script around
-your function, making it behave more natively (you type in ``helloworld`` and
-the ``helloworld`` function residing inside ``__init__.py`` is executed!). To
-accomplish that, add the following lines to your ``setup.cfg`` or ``setup.py``:
+Adding a console script entry point allows the package to define a
+user-friendly name for installers of the package to execute. Installers
+like pip will create wrapper scripts to execute a function. In the
+above example, to create a command ``hello-world`` that invokes
+``timmins.hello_world``, add a console script entry point to
+``setup.cfg``::
 
 .. code-block:: ini
 
-    [options]
-    #...
-    entry_points =
-        [console_scripts]
-        helloworld = mypkg:helloworld
-
-.. code-block:: python
+    [options.entry_points]
+    console_scripts =
+        hello-world = timmins:hello_world
 
-    setup(
-        #...
-        entry_points = """
-            [console_scripts]
-            helloworld = mypkg:helloworld
-            """
-    )
+After installing the package, a user may invoke that function by simply calling
+``hello-world`` on the command line.
 
 The syntax for entry points is specified as follows:
 
 .. code-block::
 
-    [<type>]
-    <name> = [<package>.<subpackage>.]<module>[:<object>.<object>]
+    <name> = [<package>.[<subpackage>.]]<module>[:<object>.<object>]
 
 where ``name`` is the name for the script you want to create, the left hand
 side of ``:`` is the module that contains your function and the right hand
-side is the object you want to invoke (e.g. a function). ``type`` specifies the
-type of entry point (pertinent to the program that exploits it). ``setuptools``
-natively supports ``[console_script]`` and ``[gui_script]``.
+side is the object you want to invoke (e.g. a function).
 
-.. note::
-    the syntax is not limited to ``INI`` string as demonstrated above. You can
-    also pass in the values in the form of a dictionary or list. Check out
-    :ref:`keyword reference <keywords_ref>` for more details
+In addition to ``console_scripts``, Setuptools supports ``gui_scripts``, which
+will launch a GUI application without running in a terminal window.
 
-After installation, you will be able to invoke that function by simply calling
-``helloworld`` on your command line. It will even do command line argument
-parsing for you!
 
+Advertising Behavior
+====================
 
-Dynamic discovery of services (aka plugin support)
-==================================================
-The ability of entry points isn't limited to "advertising" your functions. Its
-implementation allows us to accomplish more powerful features, such as creating
-plugins. In fact, the aforementioned script wrapping ability is a form of
-plugin that was built into ``setuptools``. With that being said, you now have
-more options than ``[console_script]`` or ``[gui_script]`` when creating your
-package.
+Console scripts are one use of the more general concept of entry points. Entry
+points more generally allow a packager to advertise behavior for discovery by
+other libraries and applications. This feature enables "plug-in"-like
+functionality, where one library solicits entry points and any number of other
+libraries provide those entry points.
 
-To understand how you can extend this functionality, let's go through how
-``setuptool`` does its ``[console_script]`` magic. Again, we use the same
-example as above:
+A good example of this plug-in behavior can be seen in
+`pytest plugins <https://docs.pytest.org/en/latest/writing_plugins.html>`_,
+where pytest is a test framework that allows other libraries to extend
+or modify its functionality through the ``pytest11`` entry point.
 
-.. code-block:: ini
+The console scripts work similarly, where libraries advertise their commands
+and tools like ``pip`` create wrapper scripts that invoke those commands.
 
-    [options]
-    # ...
-    entry_points =
-        [console_scripts]
-        helloworld = mypkg:helloworld
+For a project wishing to solicit entry points, Setuptools recommends the
+`importlib.metadata <https://docs.python.org/3/library/importlib.metadata.html>`_
+module (part of stdlib since Python 3.8) or its backport,
+`importlib_metadata <https://pypi.org/project/importlib_metadata>`_.
 
-Package installation contains multiple steps, so at some point, this package
-becomes available to your interpreter, and if you run the following code:
+For example, to find the console script entry points from the example above::
 
-.. code-block:: ini
+.. code-block:: python
 
-    >>> import pkg_resources #a module part of setuptools
-    >>> [item for item in
-        pkg_srouces.working_set.iter_entry_points('console_scripts')]
-
-It will return a list of special objects (called "EntryPoints"), and there
-will be one of them that corresponds to the ``helloworld = mypkg:helloworld``
-which we defined above. In fact, this object doesn't just contain the string,
-but also an encompassing representation of the package that created it.
-In the case of ``console_scripts``, setuptools will automatically invoke
-an internal function that utilizes this object and create the wrapper scripts
-and place them in your ``bin`` directory for your interpreter. How
-``pkg_resource`` look up all the entry points is further detailed in our
-:ref:`developer_guide` (WIP). With that being said, if you specify a different
-entry point:
+    >>> from importlib import metadata
+    >>> eps = metadata.entry_points()['console_scripts']
+
+``eps`` is now a list of ``EntryPoint`` objects, one of which corresponds
+to the ``hello-world = timmins:hello_world`` defined above. Each ``EntryPoint``
+contains the ``name``, ``group``, and ``value``. It also supplies a ``.load()``
+method to import and load that entry point (module or object).
 
 .. code-block:: ini
 
-    [options]
-    # ...
-    entry_points =
-        [iam.just.playing.around]
-        helloworld = mypkg:helloworld
+    [options.entry_points]
+    my.plugins =
+        hello-world = timmins:hello_world
 
-Then, running the same python expression like above:
+Then, a different project wishing to load 'my.plugins' plugins could run
+the following routine to load (and invoke) such plugins::
 
 .. code-block:: python
 
-    >>> import pkg_resources
-    >>> [item for item in
-        pkg_srouces.working_set.iter_entry_points('iam.just.playing.around')
-        ]
-
-will create another ``EntryPoints`` object that contains the
-``helloworld = mypkg:helloworld`` and you can create custom
-functions to exploit its information however you want. For example, one of
-the installed programs on your system may contain a startup script that
-scans the system for all the packages that specify this
-``iam.just.playing.around`` entry points, such that when you install this new
-package, it becomes immediately available without having to reconfigure
-the already installed program. This in fact is the very idea of a plugin!
-
-
-Dependencies management for entry points
-========================================
-Some entry points may require additional dependencies for them to work and
-others may trigger the installation of additional dependencies only when they
-are run. While this is elaborated in more excrutiating details on
-:ref:`guide on dependencies management <dependency_management>`, we will
-provide a brief overview on the entry point aspect.
-
-Dependencies of this manner are declared using the ``extra_requires`` keywords,
-which takes a mapping of the arbitary name of the functionality and a list of
-its depencencies, optionally suffixed with its :ref:`version specifier
-<version_specifier>`. For example, our package provides "pdf" output capability
-which requires at least 0.3 version of "ReportLab" and whatever version of "RXP"
-
-.. code-block:: ini
+    >>> from importlib import metadata
+    >>> eps = metadata.entry_points()['my.plugins']
+    >>> for ep in eps:
+    ...     plugin = ep.load()
+    ...     plugin()
 
-    [options.extras_require]
-    PDF = ReportLab>=1.2; RXP
+The project soliciting the entry points needs not to have any dependency
+or prior knowledge about the libraries implementing the entry points, and
+downstream users are able to compose functionality by pulling together
+libraries implementing the entry points.
 
-.. code-block:: python
 
-    setup(
-        extras_require = {
-            "PDF":  ["ReportLab>=1.2", "RXP"],
-        }
-    )
+Dependency Management
+=====================
 
-
-And we only want them to be installed if the console script entry point
-``rst2pdf`` is run:
+Some entry points may require additional dependencies to properly function.
+For such an entry point, declare in square brakets any number of dependency
+``extras`` following the entry point definition. Such entry points will only
+be viable if their extras were declared and installed. See the
+:ref:`guide on dependencies management <dependency_management>` for
+more information on defining extra requirements. Consider from the
+above example::
 
 .. code-block:: ini
 
-    [options]
-    entry_points =
-        ['console_script']
-        rst2pdf = project_a.tools.pdfgen [PDF]
-        rst2html = project_a.tools.htmlgen
-
-.. code-block:: python
+    [options.entry_points]
+    console_scripts =
+        hello-world = timmins:hello_world [pretty-printer]
 
-    setup(
-        entry_points = """
-            ['console_script']
-            rst2pdf = project_a.tools.pdfgen [PDF]
-            rst2html = project_a.tools.htmlgen
-            """
-    )
+In this case, the ``hello-world`` script is only viable if the ``pretty-printer``
+extra is indicated, and so a plugin host might exclude that entry point
+(i.e. not install a console script) if the relevant extra dependencies are not
+installed.

From 94491a19ae999901b812fdf878c798cba11fc590 Mon Sep 17 00:00:00 2001
From: Samuel Watkins <35979561+slwatkins@users.noreply.github.com>
Date: Tue, 16 Jun 2020 12:33:08 -0700
Subject: [PATCH 7957/8469] docs: fix typo in path to vendored.txt

---
 docs/developer-guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 4a78e22ea4..e84cd640b8 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -145,5 +145,5 @@ setuptools from source. Eventually, this limitation may be lifted as
 PEP 517/518 reach ubiquitous adoption, but for now, Setuptools
 cannot declare dependencies other than through
 ``setuptools/_vendor/vendored.txt`` and
-``pkg_reosurces/_vendor/vendored.txt`` and refreshed by way of
+``pkg_resources/_vendor/vendored.txt`` and refreshed by way of
 ``paver update_vendored`` (pavement.py).

From 97a686d4e65fb30f0db4be3e498792b531942128 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 16 Jun 2020 17:21:27 -0400
Subject: [PATCH 7958/8469] Restore __requires__ directive for compatibility.
 Fixes #2198.

---
 changelog.d/2198.misc.rst          | 1 +
 setuptools/command/easy_install.py | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/2198.misc.rst

diff --git a/changelog.d/2198.misc.rst b/changelog.d/2198.misc.rst
new file mode 100644
index 0000000000..d4b4be380a
--- /dev/null
+++ b/changelog.d/2198.misc.rst
@@ -0,0 +1 @@
+Restore ``__requires__`` directive in easy-install wrapper scripts.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 27b4558bd7..89be91ac2e 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2075,6 +2075,9 @@ class ScriptWriter:
         import re
         import sys
 
+        # for compatibility with easy_install; see #2198
+        __requires__ = %(spec)r
+
         try:
             from importlib.metadata import distribution
         except ImportError:

From 08ae4203c9feef98d4c2dffd2bd48308fdc5bee6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 16 Jun 2020 17:29:18 -0400
Subject: [PATCH 7959/8469] Make the change backward-compatible, since v47 was
 the breaking change. Ref #1973.

---
 changelog.d/{1973.breaking.rst => 1973.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{1973.breaking.rst => 1973.misc.rst} (100%)

diff --git a/changelog.d/1973.breaking.rst b/changelog.d/1973.misc.rst
similarity index 100%
rename from changelog.d/1973.breaking.rst
rename to changelog.d/1973.misc.rst

From 145a78cdc1afb4ce0c0208ae86a00708eb79d27b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 16 Jun 2020 17:29:27 -0400
Subject: [PATCH 7960/8469] =?UTF-8?q?Bump=20version:=2047.3.0=20=E2=86=92?=
 =?UTF-8?q?=2047.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 7 +++++++
 changelog.d/1973.misc.rst | 1 -
 changelog.d/2198.misc.rst | 1 -
 setup.cfg                 | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/1973.misc.rst
 delete mode 100644 changelog.d/2198.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1bdc4be3fb..9b106cfa3f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.3.0
+current_version = 47.3.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 16608ddc11..799163edd3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v47.3.1
+-------
+
+* #1973: Removed ``pkg_resources.py31compat.makedirs`` in favor of the stdlib. Use ``os.makedirs()`` instead.
+* #2198: Restore ``__requires__`` directive in easy-install wrapper scripts.
+
+
 v47.3.0
 -------
 
diff --git a/changelog.d/1973.misc.rst b/changelog.d/1973.misc.rst
deleted file mode 100644
index 398fdd710c..0000000000
--- a/changelog.d/1973.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed ``pkg_resources.py31compat.makedirs`` in favor of the stdlib. Use ``os.makedirs()`` instead.
diff --git a/changelog.d/2198.misc.rst b/changelog.d/2198.misc.rst
deleted file mode 100644
index d4b4be380a..0000000000
--- a/changelog.d/2198.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore ``__requires__`` directive in easy-install wrapper scripts.
diff --git a/setup.cfg b/setup.cfg
index 9d3cad52f5..f23714b659 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.3.0
+version = 47.3.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 4b54a8a038d5f9f2ead224b030f87f393d57d40b Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 17 Jun 2020 18:07:13 +0200
Subject: [PATCH 7961/8469] bpo-41003: Fix test_copyreg when numpy is installed
 (GH-20935)

Fix test_copyreg when numpy is installed: test.pickletester now
saves/restores warnings.filters when importing numpy, to ignore
filters installed by numpy.

Add the save_restore_warnings_filters() function to the
test.support.warnings_helper module.
---
 tests/__init__.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 5d2e69e3e6..16d011fd9e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -15,26 +15,25 @@
 import os
 import sys
 import unittest
-import warnings
 from test.support import run_unittest
+from test.support.warnings_helper import save_restore_warnings_filters
 
 
 here = os.path.dirname(__file__) or os.curdir
 
 
 def test_suite():
-    old_filters = warnings.filters[:]
     suite = unittest.TestSuite()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
             modname = "distutils.tests." + fn[:-3]
-            __import__(modname)
+            # bpo-40055: Save/restore warnings filters to leave them unchanged.
+            # Importing tests imports docutils which imports pkg_resources
+            # which adds a warnings filter.
+            with save_restore_warnings_filters():
+                __import__(modname)
             module = sys.modules[modname]
             suite.addTest(module.test_suite())
-    # bpo-40055: Save/restore warnings filters to leave them unchanged.
-    # Importing tests imports docutils which imports pkg_resources which adds a
-    # warnings filter.
-    warnings.filters[:] = old_filters
     return suite
 
 

From fba62111e62d2ef06097cd319a0838c5baf006ca Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 20 Jun 2020 11:10:31 +0300
Subject: [PATCH 7962/8469] bpo-41043: Escape literal part of the path for
 glob(). (GH-20994)

---
 command/build_py.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/command/build_py.py b/command/build_py.py
index cf0ca57c32..edc2171cd1 100644
--- a/command/build_py.py
+++ b/command/build_py.py
@@ -5,7 +5,7 @@
 import os
 import importlib.util
 import sys
-from glob import glob
+import glob
 
 from distutils.core import Command
 from distutils.errors import *
@@ -125,7 +125,7 @@ def find_data_files(self, package, src_dir):
         files = []
         for pattern in globs:
             # Each pattern has to be converted to a platform-specific path
-            filelist = glob(os.path.join(src_dir, convert_path(pattern)))
+            filelist = glob.glob(os.path.join(glob.escape(src_dir), convert_path(pattern)))
             # Files that match more than one pattern are only added once
             files.extend([fn for fn in filelist if fn not in files
                 and os.path.isfile(fn)])
@@ -216,7 +216,7 @@ def check_module(self, module, module_file):
 
     def find_package_modules(self, package, package_dir):
         self.check_package(package, package_dir)
-        module_files = glob(os.path.join(package_dir, "*.py"))
+        module_files = glob.glob(os.path.join(glob.escape(package_dir), "*.py"))
         modules = []
         setup_script = os.path.abspath(self.distribution.script_name)
 

From a8081a19cc48fc285dfd50953bb2c522cb4b8b02 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Jun 2020 12:09:39 -0400
Subject: [PATCH 7963/8469] Update setuptools/distutils_patch.py

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---
 setuptools/distutils_patch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index 43b64c0fc8..1416a7a3c8 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -22,7 +22,7 @@ def patch_sys_path():
 
 
 def ensure_local_distutils():
-    if 'distutils' in sys.path:
+    if 'distutils' in sys.modules:
         raise RuntimeError("Distutils must not be imported before setuptools")
     with patch_sys_path():
         importlib.import_module('distutils')

From 51e062754df592b105547abbd6e20851972435d4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Jun 2020 12:49:50 -0400
Subject: [PATCH 7964/8469] Wordsmith

---
 changelog.d/2143.breaking.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2143.breaking.rst b/changelog.d/2143.breaking.rst
index 185542addf..29030b3210 100644
--- a/changelog.d/2143.breaking.rst
+++ b/changelog.d/2143.breaking.rst
@@ -1 +1 @@
-Setuptools adopts distutils from the standard library as a top-level ``distutils`` package and no longer depends on distutils in the standard library. This new ``distutils`` package will be masked by ``distutils`` in the standard library unless that library has been stripped by a downstream package manager or gets removed in a future version. Although this change is not expected to break any use-cases, it will likely affect tool-chains that are monkey-patching distutils or relying on Setuptools' own monkey patching of distutils.
+Setuptools adopts distutils from the standard library as a top-level ``distutils`` package and no longer depends on distutils in the standard library. This new ``distutils`` package will be masked by ``distutils`` in the standard library unless that library has been stripped by a downstream package manager or gets removed in a future version. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.

From b596e4b0f684f5ac11673598e1de3aaa5bc74162 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Jun 2020 14:47:11 -0400
Subject: [PATCH 7965/8469] Replace distutils rather than requiring it to be
 present in advanec. Instead of crashing, issue a warning when Setuptools is
 replacing distutils.

---
 distutils/__init__.py         |  2 ++
 setuptools/distutils_patch.py | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/distutils/__init__.py b/distutils/__init__.py
index d823d040a1..7dac55b601 100644
--- a/distutils/__init__.py
+++ b/distutils/__init__.py
@@ -11,3 +11,5 @@
 import sys
 
 __version__ = sys.version[:sys.version.index(' ')]
+
+local = True
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index 1416a7a3c8..f9e637988a 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -6,8 +6,10 @@
 """
 
 import sys
+import re
 import importlib
 import contextlib
+import warnings
 from os.path import dirname
 
 
@@ -21,11 +23,20 @@ def patch_sys_path():
         sys.path[:] = orig
 
 
+def clear_distutils():
+    if 'distutils' not in sys.modules:
+        return
+    warnings.warn("Setuptools is replacing distutils")
+    mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
+    for name in mods:
+        del sys.modules[name]
+
+
 def ensure_local_distutils():
-    if 'distutils' in sys.modules:
-        raise RuntimeError("Distutils must not be imported before setuptools")
+    clear_distutils()
     with patch_sys_path():
         importlib.import_module('distutils')
+        assert sys.modules['distutils'].local
 
 
 ensure_local_distutils()

From 4516d87036f971a4c98900301b6354c0aae73dc8 Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sun, 21 Jun 2020 16:39:53 -0600
Subject: [PATCH 7966/8469] Use importlib instead of imp in __bootstrap__
 functions

---
 changelog.d/2071.misc.rst       | 1 +
 setuptools/command/bdist_egg.py | 5 +++--
 setuptools/command/build_ext.py | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/2071.misc.rst

diff --git a/changelog.d/2071.misc.rst b/changelog.d/2071.misc.rst
new file mode 100644
index 0000000000..eb36480caa
--- /dev/null
+++ b/changelog.d/2071.misc.rst
@@ -0,0 +1 @@
+Replaced references to the deprecated imp package with references to importlib
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 1b28d4c938..e94fe25250 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -55,10 +55,11 @@ def write_stub(resource, pyfile):
     _stub_template = textwrap.dedent("""
         def __bootstrap__():
             global __bootstrap__, __loader__, __file__
-            import sys, pkg_resources, imp
+            import sys, pkg_resources
+            from importlib.machinery import ExtensionFileLoader
             __file__ = pkg_resources.resource_filename(__name__, %r)
             __loader__ = None; del __bootstrap__, __loader__
-            imp.load_dynamic(__name__,__file__)
+            ExtensionFileLoader(__name__,__file__).exec_module()
         __bootstrap__()
         """).lstrip()
     with open(pyfile, 'w') as f:
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 03b6f3467f..327fa06335 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -254,7 +254,8 @@ def write_stub(self, output_dir, ext, compile=False):
                 '\n'.join([
                     "def __bootstrap__():",
                     "   global __bootstrap__, __file__, __loader__",
-                    "   import sys, os, pkg_resources, imp" + if_dl(", dl"),
+                    "   import sys, os, pkg_resources" + if_dl(", dl"),
+                    "   from importlib.machinery import ExtensionFileLoader",
                     "   __file__ = pkg_resources.resource_filename"
                     "(__name__,%r)"
                     % os.path.basename(ext._file_name),
@@ -266,7 +267,8 @@ def write_stub(self, output_dir, ext, compile=False):
                     "   try:",
                     "     os.chdir(os.path.dirname(__file__))",
                     if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
-                    "     imp.load_dynamic(__name__,__file__)",
+                    "     ExtensionFileLoader(__name__,",
+                    "                         __file__).exec_module()",
                     "   finally:",
                     if_dl("     sys.setdlopenflags(old_flags)"),
                     "     os.chdir(old_dir)",

From 71d869a55cde5711800918cb0dfc17f987012b66 Mon Sep 17 00:00:00 2001
From: Hai Shi <shihai1992@gmail.com>
Date: Fri, 26 Jun 2020 01:17:57 +0800
Subject: [PATCH 7967/8469] bpo-40275: Use new test.support helper submodules
 in tests (GH-21151)

Use new test.support helper submodules in tests:

* distutils tests
* test_buffer
* test_compile
* test_filecmp
* test_fileinput
* test_readline
* test_smtpnet
* test_structmembers
* test_tools
---
 tests/test_archive_util.py  |  4 +++-
 tests/test_bdist_msi.py     |  3 ++-
 tests/test_bdist_wininst.py |  3 ++-
 tests/test_core.py          | 10 +++++-----
 tests/test_dist.py          |  3 ++-
 tests/test_extension.py     |  3 ++-
 tests/test_file_util.py     |  4 +++-
 tests/test_filelist.py      |  3 ++-
 tests/test_register.py      |  3 ++-
 tests/test_sdist.py         |  3 ++-
 tests/test_sysconfig.py     |  5 ++++-
 tests/test_unixccompiler.py |  3 ++-
 12 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/tests/test_archive_util.py b/tests/test_archive_util.py
index e9aad0e40f..edcec2513e 100644
--- a/tests/test_archive_util.py
+++ b/tests/test_archive_util.py
@@ -13,7 +13,9 @@
                                     ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings, run_unittest, patch, change_cwd
+from test.support import run_unittest, patch
+from test.support.os_helper import change_cwd
+from test.support.warnings_helper import check_warnings
 
 try:
     import grp
diff --git a/tests/test_bdist_msi.py b/tests/test_bdist_msi.py
index 418e60ec72..a61266a14f 100644
--- a/tests/test_bdist_msi.py
+++ b/tests/test_bdist_msi.py
@@ -1,7 +1,8 @@
 """Tests for distutils.command.bdist_msi."""
 import sys
 import unittest
-from test.support import run_unittest, check_warnings
+from test.support import run_unittest
+from test.support.warnings_helper import check_warnings
 from distutils.tests import support
 
 
diff --git a/tests/test_bdist_wininst.py b/tests/test_bdist_wininst.py
index 5c3d025d33..c338069a1d 100644
--- a/tests/test_bdist_wininst.py
+++ b/tests/test_bdist_wininst.py
@@ -2,7 +2,8 @@
 import sys
 import platform
 import unittest
-from test.support import run_unittest, check_warnings
+from test.support import run_unittest
+from test.support.warnings_helper import check_warnings
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
diff --git a/tests/test_core.py b/tests/test_core.py
index 27ce7324af..4e6694a3d1 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -5,8 +5,8 @@
 import os
 import shutil
 import sys
-import test.support
 from test.support import captured_stdout, run_unittest
+from test.support import os_helper
 import unittest
 from distutils.tests import support
 from distutils import log
@@ -62,13 +62,13 @@ def tearDown(self):
         super(CoreTestCase, self).tearDown()
 
     def cleanup_testfn(self):
-        path = test.support.TESTFN
+        path = os_helper.TESTFN
         if os.path.isfile(path):
             os.remove(path)
         elif os.path.isdir(path):
             shutil.rmtree(path)
 
-    def write_setup(self, text, path=test.support.TESTFN):
+    def write_setup(self, text, path=os_helper.TESTFN):
         f = open(path, "w")
         try:
             f.write(text)
@@ -105,8 +105,8 @@ def test_run_setup_uses_current_dir(self):
         cwd = os.getcwd()
 
         # Create a directory and write the setup.py file there:
-        os.mkdir(test.support.TESTFN)
-        setup_py = os.path.join(test.support.TESTFN, "setup.py")
+        os.mkdir(os_helper.TESTFN)
+        setup_py = os.path.join(os_helper.TESTFN, "setup.py")
         distutils.core.run_setup(
             self.write_setup(setup_prints_cwd, path=setup_py))
 
diff --git a/tests/test_dist.py b/tests/test_dist.py
index 60956dadef..f8a9e86b16 100644
--- a/tests/test_dist.py
+++ b/tests/test_dist.py
@@ -12,8 +12,9 @@
 from distutils.cmd import Command
 
 from test.support import (
-     TESTFN, captured_stdout, captured_stderr, run_unittest
+     captured_stdout, captured_stderr, run_unittest
 )
+from test.support.os_helper import TESTFN
 from distutils.tests import support
 from distutils import log
 
diff --git a/tests/test_extension.py b/tests/test_extension.py
index e35f2738b6..81fad02dbe 100644
--- a/tests/test_extension.py
+++ b/tests/test_extension.py
@@ -3,7 +3,8 @@
 import os
 import warnings
 
-from test.support import check_warnings, run_unittest
+from test.support import run_unittest
+from test.support.warnings_helper import check_warnings
 from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
diff --git a/tests/test_file_util.py b/tests/test_file_util.py
index a4e2d025f9..c7783b858d 100644
--- a/tests/test_file_util.py
+++ b/tests/test_file_util.py
@@ -8,7 +8,9 @@
 from distutils import log
 from distutils.tests import support
 from distutils.errors import DistutilsFileError
-from test.support import run_unittest, unlink
+from test.support import run_unittest
+from test.support.os_helper import unlink
+
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index c71342d0dc..2c26c22617 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -9,6 +9,7 @@
 from distutils import filelist
 
 import test.support
+from test.support import os_helper
 from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
@@ -295,7 +296,7 @@ def test_process_template(self):
 
 
 class FindAllTestCase(unittest.TestCase):
-    @test.support.skip_unless_symlink
+    @os_helper.skip_unless_symlink
     def test_missing_symlink(self):
         with test.support.temp_cwd():
             os.symlink('foo', 'bar')
diff --git a/tests/test_register.py b/tests/test_register.py
index e68b0af3ce..bba48633c9 100644
--- a/tests/test_register.py
+++ b/tests/test_register.py
@@ -5,7 +5,8 @@
 import urllib
 import warnings
 
-from test.support import check_warnings, run_unittest
+from test.support import run_unittest
+from test.support.warnings_helper import check_warnings
 
 from distutils.command import register as register_module
 from distutils.command.register import register
diff --git a/tests/test_sdist.py b/tests/test_sdist.py
index 23db126959..752e9db5ba 100644
--- a/tests/test_sdist.py
+++ b/tests/test_sdist.py
@@ -6,7 +6,8 @@
 import zipfile
 from os.path import join
 from textwrap import dedent
-from test.support import captured_stdout, check_warnings, run_unittest
+from test.support import captured_stdout, run_unittest
+from test.support.warnings_helper import check_warnings
 
 try:
     import zlib
diff --git a/tests/test_sysconfig.py b/tests/test_sysconfig.py
index 236755d095..59676b0e0b 100644
--- a/tests/test_sysconfig.py
+++ b/tests/test_sysconfig.py
@@ -10,7 +10,10 @@
 from distutils import sysconfig
 from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
-from test.support import TESTFN, run_unittest, check_warnings, swap_item
+from test.support import run_unittest, swap_item
+from test.support.os_helper import TESTFN
+from test.support.warnings_helper import check_warnings
+
 
 class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     def setUp(self):
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index eef702cf01..eefe4ba402 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -1,7 +1,8 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
-from test.support import EnvironmentVarGuard, run_unittest
+from test.support import run_unittest
+from test.support.os_helper import EnvironmentVarGuard
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler

From a9eb9e73def8ca6c469e59f1b008746e368ad4c1 Mon Sep 17 00:00:00 2001
From: Ram Rachum <ram@rachum.com>
Date: Tue, 16 Jun 2020 13:31:12 +0300
Subject: [PATCH 7968/8469] Fix exception causes all over the codebase

---
 changelog.d/2199.misc.rst          |  1 +
 pkg_resources/__init__.py          | 18 +++++++-------
 setuptools/archive_util.py         |  4 ++--
 setuptools/command/easy_install.py | 14 +++++++----
 setuptools/command/egg_info.py     |  4 ++--
 setuptools/command/rotate.py       |  4 ++--
 setuptools/config.py               |  5 ++--
 setuptools/dist.py                 | 38 +++++++++++++++++-------------
 setuptools/installer.py            |  2 +-
 setuptools/msvc.py                 |  2 +-
 10 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 changelog.d/2199.misc.rst

diff --git a/changelog.d/2199.misc.rst b/changelog.d/2199.misc.rst
new file mode 100644
index 0000000000..f795256bf0
--- /dev/null
+++ b/changelog.d/2199.misc.rst
@@ -0,0 +1 @@
+Fix exception causes all over the codebase by using ``raise new_exception from old_exception``
\ No newline at end of file
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2c589d5553..c40f184a73 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1378,7 +1378,7 @@ def evaluate_marker(text, extra=None):
         marker = packaging.markers.Marker(text)
         return marker.evaluate()
     except packaging.markers.InvalidMarker as e:
-        raise SyntaxError(e)
+        raise SyntaxError(e) from e
 
 
 class NullProvider:
@@ -2287,8 +2287,8 @@ def declare_namespace(packageName):
                 __import__(parent)
             try:
                 path = sys.modules[parent].__path__
-            except AttributeError:
-                raise TypeError("Not a package:", parent)
+            except AttributeError as e:
+                raise TypeError("Not a package:", parent) from e
 
         # Track what packages are namespaces, so when new path items are added,
         # they can be updated
@@ -2468,7 +2468,7 @@ def resolve(self):
         try:
             return functools.reduce(getattr, self.attrs, module)
         except AttributeError as exc:
-            raise ImportError(str(exc))
+            raise ImportError(str(exc)) from exc
 
     def require(self, env=None, installer=None):
         if self.extras and not self.dist:
@@ -2688,14 +2688,14 @@ def _warn_legacy_version(self):
     def version(self):
         try:
             return self._version
-        except AttributeError:
+        except AttributeError as e:
             version = self._get_version()
             if version is None:
                 path = self._get_metadata_path_for_display(self.PKG_INFO)
                 msg = (
                     "Missing 'Version:' header and/or {} file at path: {}"
                 ).format(self.PKG_INFO, path)
-                raise ValueError(msg, self)
+                raise ValueError(msg, self) from e
 
             return version
 
@@ -2748,10 +2748,10 @@ def requires(self, extras=()):
         for ext in extras:
             try:
                 deps.extend(dm[safe_extra(ext)])
-            except KeyError:
+            except KeyError as e:
                 raise UnknownExtra(
                     "%s has no such extra feature %r" % (self, ext)
-                )
+                ) from e
         return deps
 
     def _get_metadata_path_for_display(self, name):
@@ -3109,7 +3109,7 @@ def __init__(self, requirement_string):
         try:
             super(Requirement, self).__init__(requirement_string)
         except packaging.requirements.InvalidRequirement as e:
-            raise RequirementParseError(str(e))
+            raise RequirementParseError(str(e)) from e
         self.unsafe_name = self.name
         project_name = safe_name(self.name)
         self.project_name, self.key = project_name, project_name.lower()
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 64528ca7a5..0ce190b8cf 100644
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -134,10 +134,10 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     """
     try:
         tarobj = tarfile.open(filename)
-    except tarfile.TarError:
+    except tarfile.TarError as e:
         raise UnrecognizedFormat(
             "%s is not a compressed or uncompressed tar file" % (filename,)
-        )
+        ) from e
     with contextlib.closing(tarobj):
         # don't do any chowning!
         tarobj.chown = lambda *args: None
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 27b4558bd7..8890ec88c8 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -356,8 +356,10 @@ def finalize_options(self):
                 self.optimize = int(self.optimize)
                 if not (0 <= self.optimize <= 2):
                     raise ValueError
-            except ValueError:
-                raise DistutilsOptionError("--optimize must be 0, 1, or 2")
+            except ValueError as e:
+                raise DistutilsOptionError(
+                    "--optimize must be 0, 1, or 2"
+                ) from e
 
         if self.editable and not self.build_directory:
             raise DistutilsArgError(
@@ -765,9 +767,9 @@ def process_distribution(self, requirement, dist, deps=True, *info):
                 [requirement], self.local_index, self.easy_install
             )
         except DistributionNotFound as e:
-            raise DistutilsError(str(e))
+            raise DistutilsError(str(e)) from e
         except VersionConflict as e:
-            raise DistutilsError(e.report())
+            raise DistutilsError(e.report()) from e
         if self.always_copy or self.always_copy_from:
             # Force all the relevant distros to be copied or activated
             for dist in distros:
@@ -1156,7 +1158,9 @@ def run_setup(self, setup_script, setup_base, args):
         try:
             run_setup(setup_script, args)
         except SystemExit as v:
-            raise DistutilsError("Setup script exited with %s" % (v.args[0],))
+            raise DistutilsError(
+                "Setup script exited with %s" % (v.args[0],)
+            ) from v
 
     def build_and_install(self, setup_script, setup_base):
         args = ['bdist_egg', '--dist-dir']
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 7fa89541cd..0855207ceb 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -208,11 +208,11 @@ def finalize_options(self):
             list(
                 parse_requirements(spec % (self.egg_name, self.egg_version))
             )
-        except ValueError:
+        except ValueError as e:
             raise distutils.errors.DistutilsOptionError(
                 "Invalid distribution name or version syntax: %s-%s" %
                 (self.egg_name, self.egg_version)
-            )
+            ) from e
 
         if self.egg_base is None:
             dirs = self.distribution.package_dir
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index b89353f529..e398834fa7 100644
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -36,8 +36,8 @@ def finalize_options(self):
             raise DistutilsOptionError("Must specify number of files to keep")
         try:
             self.keep = int(self.keep)
-        except ValueError:
-            raise DistutilsOptionError("--keep must be an integer")
+        except ValueError as e:
+            raise DistutilsOptionError("--keep must be an integer") from e
         if isinstance(self.match, six.string_types):
             self.match = [
                 convert_path(p.strip()) for p in self.match.split(',')
diff --git a/setuptools/config.py b/setuptools/config.py
index 45df2e3f2e..a8f8b6b006 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -42,9 +42,10 @@ def __getattr__(self, attr):
                 for target in statement.targets
                 if isinstance(target, ast.Name) and target.id == attr
             )
-        except Exception:
+        except Exception as e:
             raise AttributeError(
-                "{self.name} has no attribute {attr}".format(**locals()))
+                "{self.name} has no attribute {attr}".format(**locals())
+            ) from e
 
 
 @contextlib.contextmanager
diff --git a/setuptools/dist.py b/setuptools/dist.py
index fe64afa919..e813b11ca7 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -204,11 +204,11 @@ def check_importable(dist, attr, value):
     try:
         ep = pkg_resources.EntryPoint.parse('x=' + value)
         assert not ep.extras
-    except (TypeError, ValueError, AttributeError, AssertionError):
+    except (TypeError, ValueError, AttributeError, AssertionError) as e:
         raise DistutilsSetupError(
             "%r must be importable 'module:attrs' string (got %r)"
             % (attr, value)
-        )
+        ) from e
 
 
 def assert_string_list(dist, attr, value):
@@ -219,10 +219,10 @@ def assert_string_list(dist, attr, value):
         assert isinstance(value, (list, tuple))
         # verify that elements of value are strings
         assert ''.join(value) != value
-    except (TypeError, ValueError, AttributeError, AssertionError):
+    except (TypeError, ValueError, AttributeError, AssertionError) as e:
         raise DistutilsSetupError(
             "%r must be a list of strings (got %r)" % (attr, value)
-        )
+        ) from e
 
 
 def check_nsp(dist, attr, value):
@@ -247,12 +247,12 @@ def check_extras(dist, attr, value):
     """Verify that extras_require mapping is valid"""
     try:
         list(itertools.starmap(_check_extra, value.items()))
-    except (TypeError, ValueError, AttributeError):
+    except (TypeError, ValueError, AttributeError) as e:
         raise DistutilsSetupError(
             "'extras_require' must be a dictionary whose values are "
             "strings or lists of strings containing valid project/version "
             "requirement specifiers."
-        )
+        ) from e
 
 
 def _check_extra(extra, reqs):
@@ -280,7 +280,9 @@ def check_requirements(dist, attr, value):
             "{attr!r} must be a string or list of strings "
             "containing valid project/version requirement specifiers; {error}"
         )
-        raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
+        raise DistutilsSetupError(
+            tmpl.format(attr=attr, error=error)
+        ) from error
 
 
 def check_specifier(dist, attr, value):
@@ -292,7 +294,9 @@ def check_specifier(dist, attr, value):
             "{attr!r} must be a string "
             "containing valid version specifiers; {error}"
         )
-        raise DistutilsSetupError(tmpl.format(attr=attr, error=error))
+        raise DistutilsSetupError(
+            tmpl.format(attr=attr, error=error)
+        ) from error
 
 
 def check_entry_points(dist, attr, value):
@@ -300,7 +304,7 @@ def check_entry_points(dist, attr, value):
     try:
         pkg_resources.EntryPoint.parse_map(value)
     except ValueError as e:
-        raise DistutilsSetupError(e)
+        raise DistutilsSetupError(e) from e
 
 
 def check_test_suite(dist, attr, value):
@@ -609,8 +613,8 @@ def _parse_config_files(self, filenames=None):
                         setattr(self, opt, strtobool(val))
                     else:
                         setattr(self, opt, val)
-                except ValueError as msg:
-                    raise DistutilsOptionError(msg)
+                except ValueError as e:
+                    raise DistutilsOptionError(e) from e
 
     @staticmethod
     def _try_str(val):
@@ -676,8 +680,8 @@ def _set_command_options(self, command_obj, option_dict=None):
                     raise DistutilsOptionError(
                         "error in %s: command '%s' has no such option '%s'"
                         % (source, command_name, option))
-            except ValueError as msg:
-                raise DistutilsOptionError(msg)
+            except ValueError as e:
+                raise DistutilsOptionError(e) from e
 
     def parse_config_files(self, filenames=None, ignore_option_errors=False):
         """Parses configuration files from various levels
@@ -843,10 +847,10 @@ def _exclude_misc(self, name, value):
             )
         try:
             old = getattr(self, name)
-        except AttributeError:
+        except AttributeError as e:
             raise DistutilsSetupError(
                 "%s: No such distribution setting" % name
-            )
+            ) from e
         if old is not None and not isinstance(old, sequence):
             raise DistutilsSetupError(
                 name + ": this setting cannot be changed via include/exclude"
@@ -863,10 +867,10 @@ def _include_misc(self, name, value):
             )
         try:
             old = getattr(self, name)
-        except AttributeError:
+        except AttributeError as e:
             raise DistutilsSetupError(
                 "%s: No such distribution setting" % name
-            )
+            ) from e
         if old is None:
             setattr(self, name, value)
         elif not isinstance(old, sequence):
diff --git a/setuptools/installer.py b/setuptools/installer.py
index 1f183bd9af..e5acec2726 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -127,7 +127,7 @@ def fetch_build_egg(dist, req):
         try:
             subprocess.check_call(cmd)
         except subprocess.CalledProcessError as e:
-            raise DistutilsError(str(e))
+            raise DistutilsError(str(e)) from e
         wheel = Wheel(glob.glob(os.path.join(tmpdir, '*.whl'))[0])
         dist_location = os.path.join(eggs_dir, wheel.egg_name())
         wheel.install_as_egg(dist_location)
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 213e39c9d5..72ba0d0c8d 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -277,7 +277,7 @@ def _msvc14_get_vc_env(plat_spec):
     except subprocess.CalledProcessError as exc:
         raise distutils.errors.DistutilsPlatformError(
             "Error executing {}".format(exc.cmd)
-        )
+        ) from exc
 
     env = {
         key.lower(): value

From 5f8eebf06792a32d955689daeb5679fc6d3d019e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Jun 2020 20:21:35 -0400
Subject: [PATCH 7969/8469] Add conftest so that tests can run under pytest

---
 conftest.py | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 conftest.py

diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000000..f0ec98e74f
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,5 @@
+import sys
+import os
+
+sys.path.insert(0, os.getcwd())
+__import__('distutils')

From b8abfd21934b8b109050696bd99c8fc823f901f4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Jun 2020 21:10:28 -0400
Subject: [PATCH 7970/8469] Use tox for tests

---
 conftest.py | 5 -----
 tox.ini     | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 conftest.py
 create mode 100644 tox.ini

diff --git a/conftest.py b/conftest.py
deleted file mode 100644
index f0ec98e74f..0000000000
--- a/conftest.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import sys
-import os
-
-sys.path.insert(0, os.getcwd())
-__import__('distutils')
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..1590e308c9
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[testenv]
+deps =
+	pytest
+commands =
+	pytest {posargs}
+setenv =
+    PYTHONPATH = {toxinidir}
+skip_install = True

From 73ac895667b5bc6e3f5d685e7bad3d4535f07a80 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Jun 2020 21:16:53 -0400
Subject: [PATCH 7971/8469] Fix test on Python 3.8 and earlier.

---
 distutils/tests/test_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distutils/tests/test_install.py b/distutils/tests/test_install.py
index 51c80e0421..eb684a09e6 100644
--- a/distutils/tests/test_install.py
+++ b/distutils/tests/test_install.py
@@ -58,7 +58,8 @@ def check_path(got, expected):
 
         libdir = os.path.join(destination, "lib", "python")
         check_path(cmd.install_lib, libdir)
-        platlibdir = os.path.join(destination, sys.platlibdir, "python")
+        _platlibdir = getattr(sys, "platlibdir", "lib")
+        platlibdir = os.path.join(destination, _platlibdir, "python")
         check_path(cmd.install_platlib, platlibdir)
         check_path(cmd.install_purelib, libdir)
         check_path(cmd.install_headers,

From c202075affc8a4d03401a4877639a96907438d83 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Jun 2020 22:38:33 -0400
Subject: [PATCH 7972/8469] Mark test_venv to be skipped when running under a
 virtualenv as virtualenv monkey patches distutils.

---
 distutils/tests/test_dist.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/distutils/tests/test_dist.py b/distutils/tests/test_dist.py
index 60956dadef..d431085bbd 100644
--- a/distutils/tests/test_dist.py
+++ b/distutils/tests/test_dist.py
@@ -83,6 +83,10 @@ def test_command_packages_cmdline(self):
         self.assertIsInstance(cmd, test_dist)
         self.assertEqual(cmd.sample_option, "sometext")
 
+    @unittest.skipIf(
+        'distutils' not in Distribution.parse_config_files.__module__,
+        'Cannot test when virtualenv has monkey-patched Distribution.',
+    )
     def test_venv_install_options(self):
         sys.argv.append("install")
         self.addCleanup(os.unlink, TESTFN)

From 00ce1222d90ca28c6096d847c6ffe52e26bd5db2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 08:43:36 -0400
Subject: [PATCH 7973/8469] Restore Python 3.5 syntax compatibility in
 distutils.dist.

---
 distutils/dist.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distutils/dist.py b/distutils/dist.py
index 6cf0a0d663..37db4d6cd7 100644
--- a/distutils/dist.py
+++ b/distutils/dist.py
@@ -35,7 +35,8 @@ def _ensure_list(value, fieldname):
     elif not isinstance(value, list):
         # passing a tuple or an iterator perhaps, warn and convert
         typename = type(value).__name__
-        msg = f"Warning: '{fieldname}' should be a list, got type '{typename}'"
+        msg = "Warning: '{fieldname}' should be a list, got type '{typename}'"
+        msg = msg.format(**locals())
         log.log(log.WARN, msg)
         value = list(value)
     return value

From 3a4c22103551a68630b2e4b38f91deb4c78eae99 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 31 May 2020 09:34:34 -0400
Subject: [PATCH 7974/8469] Fallback to '_sysconfigdata' when platform-specific
 sysconfigdata is unavailable.

---
 distutils/sysconfig.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
index 2109f746ba..79391e8671 100644
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
@@ -444,7 +444,12 @@ def _init_posix():
         platform=sys.platform,
         multiarch=getattr(sys.implementation, '_multiarch', ''),
     ))
-    _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    try:
+        _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
+    except ImportError:
+        # Python 3.5 and pypy 7.3.1
+        _temp = __import__(
+            '_sysconfigdata', globals(), locals(), ['build_time_vars'], 0)
     build_time_vars = _temp.build_time_vars
     global _config_vars
     _config_vars = {}

From 71d738a1f6eced80defe3587f6adbbe4ce1fb7d1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jul 2020 20:19:22 -0400
Subject: [PATCH 7975/8469] Restore Python 3.5 syntax compatibility in
 distutils.tests.test_build_ext

---
 distutils/tests/test_build_ext.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distutils/tests/test_build_ext.py b/distutils/tests/test_build_ext.py
index 5e47e0773a..1aec153783 100644
--- a/distutils/tests/test_build_ext.py
+++ b/distutils/tests/test_build_ext.py
@@ -82,7 +82,7 @@ def test_build_ext(self):
         else:
             ALREADY_TESTED = type(self).__name__
 
-        code = textwrap.dedent(f"""
+        code = textwrap.dedent("""
             tmp_dir = {self.tmp_dir!r}
 
             import sys
@@ -108,7 +108,7 @@ def test_xx(self):
 
 
             unittest.main()
-        """)
+        """.format(**locals()))
         assert_python_ok('-c', code)
 
     def test_solaris_enable_shared(self):

From 253d03cad23ed022d020ae635ce419255240feef Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jul 2020 20:42:12 -0400
Subject: [PATCH 7976/8469] Add compatibility module to fix failing tests on
 Python 3.5 due to missing functionality.

---
 distutils/tests/py35compat.py      | 68 ++++++++++++++++++++++++++++++
 distutils/tests/test_build_clib.py |  4 +-
 distutils/tests/test_config_cmd.py |  4 +-
 distutils/tests/test_spawn.py      |  4 +-
 4 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 distutils/tests/py35compat.py

diff --git a/distutils/tests/py35compat.py b/distutils/tests/py35compat.py
new file mode 100644
index 0000000000..3eb86b5fe2
--- /dev/null
+++ b/distutils/tests/py35compat.py
@@ -0,0 +1,68 @@
+"""
+Backward compatibility support for Python 3.5
+"""
+
+import sys
+import test.support
+import subprocess
+
+
+# copied from Python 3.9 test.support module
+def _missing_compiler_executable(cmd_names=[]):
+    """Check if the compiler components used to build the interpreter exist.
+
+    Check for the existence of the compiler executables whose names are listed
+    in 'cmd_names' or all the compiler executables when 'cmd_names' is empty
+    and return the first missing executable or None when none is found
+    missing.
+
+    """
+    from distutils import ccompiler, sysconfig, spawn
+    compiler = ccompiler.new_compiler()
+    sysconfig.customize_compiler(compiler)
+    for name in compiler.executables:
+        if cmd_names and name not in cmd_names:
+            continue
+        cmd = getattr(compiler, name)
+        if cmd_names:
+            assert cmd is not None, \
+                    "the '%s' executable is not configured" % name
+        elif not cmd:
+            continue
+        if spawn.find_executable(cmd[0]) is None:
+            return cmd[0]
+
+
+missing_compiler_executable = vars(test.support).setdefault(
+    'missing_compiler_executable',
+    _missing_compiler_executable,
+)
+
+
+try:
+    from test.support import unix_shell
+except ImportError:
+    # Adapted from Python 3.9 test.support module
+    is_android = hasattr(sys, 'getandroidapilevel')
+    unix_shell = (
+        None if sys.platform == 'win32' else
+        '/system/bin/sh' if is_android else
+        '/bin/sh'
+    )
+
+
+# copied from Python 3.9 subprocess module
+def _optim_args_from_interpreter_flags():
+    """Return a list of command-line arguments reproducing the current
+    optimization settings in sys.flags."""
+    args = []
+    value = sys.flags.optimize
+    if value > 0:
+        args.append('-' + 'O' * value)
+    return args
+
+
+vars(subprocess).setdefault(
+    '_optim_args_from_interpreter_flags',
+    _optim_args_from_interpreter_flags,
+)
diff --git a/distutils/tests/test_build_clib.py b/distutils/tests/test_build_clib.py
index abd8313770..259c43522d 100644
--- a/distutils/tests/test_build_clib.py
+++ b/distutils/tests/test_build_clib.py
@@ -3,7 +3,9 @@
 import os
 import sys
 
-from test.support import run_unittest, missing_compiler_executable
+from test.support import run_unittest
+
+from .py35compat import missing_compiler_executable
 
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
diff --git a/distutils/tests/test_config_cmd.py b/distutils/tests/test_config_cmd.py
index 9aeab07b46..4cd9a6b9a0 100644
--- a/distutils/tests/test_config_cmd.py
+++ b/distutils/tests/test_config_cmd.py
@@ -2,7 +2,9 @@
 import unittest
 import os
 import sys
-from test.support import run_unittest, missing_compiler_executable
+from test.support import run_unittest
+
+from .py35compat import missing_compiler_executable
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
diff --git a/distutils/tests/test_spawn.py b/distutils/tests/test_spawn.py
index cf1faad5f4..919d0ad98f 100644
--- a/distutils/tests/test_spawn.py
+++ b/distutils/tests/test_spawn.py
@@ -3,9 +3,11 @@
 import stat
 import sys
 import unittest.mock
-from test.support import run_unittest, unix_shell
+from test.support import run_unittest
 from test import support as test_support
 
+from .py35compat import unix_shell
+
 from distutils.spawn import find_executable
 from distutils.spawn import spawn
 from distutils.errors import DistutilsExecError

From a4eb1127303fbe514ab8f77d6c3896614de02c5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jul 2020 20:49:30 -0400
Subject: [PATCH 7977/8469] Fix failing test in test_fileutil by adapting
 expectation based on Python version.

---
 distutils/tests/py35compat.py    | 9 +++++++++
 distutils/tests/test_filelist.py | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/distutils/tests/py35compat.py b/distutils/tests/py35compat.py
index 3eb86b5fe2..0c755261ad 100644
--- a/distutils/tests/py35compat.py
+++ b/distutils/tests/py35compat.py
@@ -66,3 +66,12 @@ def _optim_args_from_interpreter_flags():
     '_optim_args_from_interpreter_flags',
     _optim_args_from_interpreter_flags,
 )
+
+
+def adapt_glob(regex):
+    """
+    Supply legacy expectation on Python 3.5
+    """
+    if sys.version_info > (3, 6):
+        return regex
+    return regex.replace('(?s:', '').replace(r')\Z', r'\Z(?ms)')
diff --git a/distutils/tests/test_filelist.py b/distutils/tests/test_filelist.py
index c71342d0dc..71fde2b718 100644
--- a/distutils/tests/test_filelist.py
+++ b/distutils/tests/test_filelist.py
@@ -12,6 +12,9 @@
 from test.support import captured_stdout, run_unittest
 from distutils.tests import support
 
+from .py35compat import adapt_glob
+
+
 MANIFEST_IN = """\
 include ok
 include xo
@@ -60,7 +63,7 @@ def test_glob_to_re(self):
             ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'),
             (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z')):
             regex = regex % {'sep': sep}
-            self.assertEqual(glob_to_re(glob), regex)
+            self.assertEqual(glob_to_re(glob), adapt_glob(regex))
 
     def test_process_template_line(self):
         # testing  all MANIFEST.in template patterns

From 4f1d15983b650c20dc6de48f6675c9ce84c0c3a9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jul 2020 21:09:47 -0400
Subject: [PATCH 7978/8469] Acknowledge and ignore warning about
 TestDistribution (it's a "test" distribution, not a "test of distributions").

---
 pytest.ini | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000..3e01b43900
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+[pytest]
+filterwarnings=
+    # acknowledge that TestDistribution isn't a test
+    ignore:cannot collect test class 'TestDistribution'

From 2f1fae1bfceb88cf812a45c44cd18ce604b69c69 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 29 Jun 2020 00:25:26 +0300
Subject: [PATCH 7979/8469] add pypy schemas

---
 distutils/command/install.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/distutils/command/install.py b/distutils/command/install.py
index 21f8c27c8b..13feeb890f 100644
--- a/distutils/command/install.py
+++ b/distutils/command/install.py
@@ -43,6 +43,20 @@
         'data'   : '$base',
         },
     'nt': WINDOWS_SCHEME,
+    'pypy': {
+        'purelib': '$base/site-packages',
+        'platlib': '$base/site-packages',
+        'headers': '$base/include/$dist_name',
+        'scripts': '$base/bin',
+        'data'   : '$base',
+        },
+    'pypy_nt': {
+        'purelib': '$base/site-packages',
+        'platlib': '$base/site-packages',
+        'headers': '$base/include/$dist_name',
+        'scripts': '$base/Scripts',
+        'data'   : '$base',
+        },
     }
 
 # user site schemes
@@ -455,6 +469,12 @@ def finalize_other(self):
     def select_scheme(self, name):
         """Sets the install directories by applying the install schemes."""
         # it's the caller's problem if they supply a bad name!
+        if (hasattr(sys, 'pypy_version_info') and
+                not name.endswith(('_user', '_home'))):
+            if os.name == 'nt':
+                name = 'pypy_nt'
+            else:
+                name = 'pypy'
         scheme = INSTALL_SCHEMES[name]
         for key in SCHEME_KEYS:
             attrname = 'install_' + key

From 12f74fb9280897a07199db0df76103487263136b Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 29 Jun 2020 20:00:07 +0300
Subject: [PATCH 7980/8469] do the minimum to fix sysconfig.py for PyPy, more
 will probably be needed

---
 distutils/sysconfig.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
index 79391e8671..255243ade5 100644
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
@@ -16,6 +16,8 @@
 
 from .errors import DistutilsPlatformError
 
+IS_PYPY = '__pypy__' in sys.builtin_module_names
+
 # These are needed in a couple of spots, so just compute them once.
 PREFIX = os.path.normpath(sys.prefix)
 EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
@@ -97,7 +99,9 @@ def get_python_inc(plat_specific=0, prefix=None):
     """
     if prefix is None:
         prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
-    if os.name == "posix":
+    if IS_PYPY:
+        return os.path.join(prefix, 'include')
+    elif os.name == "posix":
         if python_build:
             # Assume the executable is in the build directory.  The
             # pyconfig.h file should be in the same directory.  Since

From 50d17611942813f840a69c4838173b2c4dc27f24 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 29 Jun 2020 20:23:28 +0300
Subject: [PATCH 7981/8469] no Makefile with PyPy and has own layout for python
 stdlib, site-packages

---
 distutils/sysconfig.py | 79 +++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
index 255243ade5..879b6981ed 100644
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
@@ -142,6 +142,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
     If 'prefix' is supplied, use it instead of sys.base_prefix or
     sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
     """
+    if IS_PYPY:
+        # PyPy-specific schema
+        if prefix is None:
+            prefix = PREFIX
+        if standard_lib:
+            return os.path.join(prefix, "lib-python", sys.version[0])
+        return os.path.join(prefix, 'site-packages')
+
     if prefix is None:
         if standard_lib:
             prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
@@ -503,41 +511,42 @@ def get_config_vars(*args):
         _config_vars['prefix'] = PREFIX
         _config_vars['exec_prefix'] = EXEC_PREFIX
 
-        # For backward compatibility, see issue19555
-        SO = _config_vars.get('EXT_SUFFIX')
-        if SO is not None:
-            _config_vars['SO'] = SO
-
-        # Always convert srcdir to an absolute path
-        srcdir = _config_vars.get('srcdir', project_base)
-        if os.name == 'posix':
-            if python_build:
-                # If srcdir is a relative path (typically '.' or '..')
-                # then it should be interpreted relative to the directory
-                # containing Makefile.
-                base = os.path.dirname(get_makefile_filename())
-                srcdir = os.path.join(base, srcdir)
-            else:
-                # srcdir is not meaningful since the installation is
-                # spread about the filesystem.  We choose the
-                # directory containing the Makefile since we know it
-                # exists.
-                srcdir = os.path.dirname(get_makefile_filename())
-        _config_vars['srcdir'] = os.path.abspath(os.path.normpath(srcdir))
-
-        # Convert srcdir into an absolute path if it appears necessary.
-        # Normally it is relative to the build directory.  However, during
-        # testing, for example, we might be running a non-installed python
-        # from a different directory.
-        if python_build and os.name == "posix":
-            base = project_base
-            if (not os.path.isabs(_config_vars['srcdir']) and
-                base != os.getcwd()):
-                # srcdir is relative and we are not in the same directory
-                # as the executable. Assume executable is in the build
-                # directory and make srcdir absolute.
-                srcdir = os.path.join(base, _config_vars['srcdir'])
-                _config_vars['srcdir'] = os.path.normpath(srcdir)
+        if not IS_PYPY:
+            # For backward compatibility, see issue19555
+            SO = _config_vars.get('EXT_SUFFIX')
+            if SO is not None:
+                _config_vars['SO'] = SO
+
+            # Always convert srcdir to an absolute path
+            srcdir = _config_vars.get('srcdir', project_base)
+            if os.name == 'posix':
+                if python_build:
+                    # If srcdir is a relative path (typically '.' or '..')
+                    # then it should be interpreted relative to the directory
+                    # containing Makefile.
+                    base = os.path.dirname(get_makefile_filename())
+                    srcdir = os.path.join(base, srcdir)
+                else:
+                    # srcdir is not meaningful since the installation is
+                    # spread about the filesystem.  We choose the
+                    # directory containing the Makefile since we know it
+                    # exists.
+                    srcdir = os.path.dirname(get_makefile_filename())
+            _config_vars['srcdir'] = os.path.abspath(os.path.normpath(srcdir))
+
+            # Convert srcdir into an absolute path if it appears necessary.
+            # Normally it is relative to the build directory.  However, during
+            # testing, for example, we might be running a non-installed python
+            # from a different directory.
+            if python_build and os.name == "posix":
+                base = project_base
+                if (not os.path.isabs(_config_vars['srcdir']) and
+                    base != os.getcwd()):
+                    # srcdir is relative and we are not in the same directory
+                    # as the executable. Assume executable is in the build
+                    # directory and make srcdir absolute.
+                    srcdir = os.path.join(base, _config_vars['srcdir'])
+                    _config_vars['srcdir'] = os.path.normpath(srcdir)
 
         # OS X platforms require special customization to handle
         # multi-architecture, multi-os-version installers

From 89d64e81e194d5b8b8a500e837b9cea4f2e1063e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 1 Jul 2020 22:09:26 -0400
Subject: [PATCH 7982/8469] Skip test on PyPy where the functionality is
 disabled.

---
 distutils/tests/test_sysconfig.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distutils/tests/test_sysconfig.py b/distutils/tests/test_sysconfig.py
index 236755d095..d5076391fc 100644
--- a/distutils/tests/test_sysconfig.py
+++ b/distutils/tests/test_sysconfig.py
@@ -45,6 +45,7 @@ def test_get_config_vars(self):
         self.assertIsInstance(cvars, dict)
         self.assertTrue(cvars)
 
+    @unittest.skip('sysconfig.IS_PYPY')
     def test_srcdir(self):
         # See Issues #15322, #15364.
         srcdir = sysconfig.get_config_var('srcdir')

From c3a052aefbba0d5fda10790e676223c0dc12f0ed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Jul 2020 05:06:16 -0400
Subject: [PATCH 7983/8469] In test_unixcompiler.test_osx*, also patch
 sysconfig.get_config_vars following the patterns of prior implementations.

---
 distutils/tests/test_unixccompiler.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/distutils/tests/test_unixccompiler.py b/distutils/tests/test_unixccompiler.py
index eef702cf01..f2159662fd 100644
--- a/distutils/tests/test_unixccompiler.py
+++ b/distutils/tests/test_unixccompiler.py
@@ -11,6 +11,7 @@ class UnixCCompilerTestCase(unittest.TestCase):
     def setUp(self):
         self._backup_platform = sys.platform
         self._backup_get_config_var = sysconfig.get_config_var
+        self._backup_get_config_vars = sysconfig.get_config_vars
         class CompilerWrapper(UnixCCompiler):
             def rpath_foo(self):
                 return self.runtime_library_dir_option('/foo')
@@ -19,6 +20,7 @@ def rpath_foo(self):
     def tearDown(self):
         sys.platform = self._backup_platform
         sysconfig.get_config_var = self._backup_get_config_var
+        sysconfig.get_config_vars = self._backup_get_config_vars
 
     @unittest.skipIf(sys.platform == 'win32', "can't test on Windows")
     def test_runtime_libdir_option(self):
@@ -110,7 +112,13 @@ def gcv(v):
             if v == 'LDSHARED':
                 return 'gcc-4.2 -bundle -undefined dynamic_lookup '
             return 'gcc-4.2'
+
+        def gcvs(*args, _orig=sysconfig.get_config_vars):
+            if args:
+                return list(map(sysconfig.get_config_var, args))
+            return _orig()
         sysconfig.get_config_var = gcv
+        sysconfig.get_config_vars = gcvs
         with EnvironmentVarGuard() as env:
             env['CC'] = 'my_cc'
             del env['LDSHARED']
@@ -126,7 +134,13 @@ def gcv(v):
             if v == 'LDSHARED':
                 return 'gcc-4.2 -bundle -undefined dynamic_lookup '
             return 'gcc-4.2'
+
+        def gcvs(*args, _orig=sysconfig.get_config_vars):
+            if args:
+                return list(map(sysconfig.get_config_var, args))
+            return _orig()
         sysconfig.get_config_var = gcv
+        sysconfig.get_config_vars = gcvs
         with EnvironmentVarGuard() as env:
             env['CC'] = 'my_cc'
             env['LDSHARED'] = 'my_ld -bundle -dynamic'

From 4bac4653d026922eefcedc40bdf90b2db2f90e75 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Jul 2020 12:07:44 -0400
Subject: [PATCH 7984/8469] Move coverage configuration to .coveragerc. Saves
 characters and separates concerns.

---
 .coveragerc | 8 ++++++++
 tox.ini     | 9 +--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000000..2f0e871437
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,8 @@
+[run]
+source=
+	pkg_resources
+	setuptools
+omit=
+	*/_vendor/*
+
+[report]
diff --git a/tox.ini b/tox.ini
index d3df21bffd..a177400600 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ setenv =
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
-commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
+commands=pytest {posargs}
 usedevelop=True
 extras =
 	tests
@@ -53,13 +53,6 @@ changedir = docs
 commands =
         python -m sphinx . {toxinidir}/build/html
 
-[coverage:run]
-source=
-	pkg_resources
-	setuptools
-omit=
-	*/_vendor/*
-
 [testenv:finalize]
 skip_install = True
 deps =

From c897b90cbcd2d5a907d3b677f7229c2be7c44528 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 2 Jul 2020 12:26:16 -0400
Subject: [PATCH 7985/8469] More directly disable coverage when running tests
 on pypy.

---
 .github/workflows/python-tests.yml |  2 --
 .travis.yml                        | 25 +++++--------------------
 pytest.ini                         |  2 +-
 tox.ini                            |  6 +++++-
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index e3663cf0b8..5a5980842c 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -98,5 +98,3 @@ jobs:
         python -m
         tox
         --parallel auto
-        --
-        --cov
diff --git a/.travis.yml b/.travis.yml
index f97abc51c4..e8bc75743b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ jobs:
   fast_finish: true
   include:
   - python: pypy3
-    env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: 3.5
   - python: 3.6
   - python: 3.7
@@ -15,12 +14,12 @@ jobs:
     env: LANG=C
   - python: 3.8-dev
   - <<: *latest_py3
-    env: TOXENV=docs DISABLE_COVERAGE=1
+    env: TOXENV=docs
   allow_failures:
   # suppress failures due to pypa/setuptools#2000
   - python: pypy3
   - <<: *latest_py3
-    env: TOXENV=docs DISABLE_COVERAGE=1
+    env: TOXENV=docs
 
 cache: pip
 
@@ -39,22 +38,8 @@ install:
 
 script:
   - export NETWORK_REQUIRED=1
-  - |
-    ( # Run testsuite.
-      if [ -z "$DISABLE_COVERAGE" ]
-      then
-        tox -- --cov
-      else
-        tox
-      fi
-    )
+  - tox
 
 after_success:
-  - |
-    ( # Upload coverage data.
-      if [ -z "$DISABLE_COVERAGE" ]
-      then
-        export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
-        tox -e coverage,codecov
-      fi
-    )
+  - export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
+  - tox -e coverage,codecov
diff --git a/pytest.ini b/pytest.ini
index 479a2965ea..ddcad08bae 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt -r sxX
+addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt --cov -r sxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
diff --git a/tox.ini b/tox.ini
index a177400600..59213e88f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,12 +23,16 @@ setenv =
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
-commands=pytest {posargs}
+commands = pytest {posargs}
 usedevelop=True
 extras =
 	tests
 
 
+[testenv:pypy{,3}]
+commands = pytest --no-cov {posargs}
+
+
 [testenv:coverage]
 description=Combine coverage data and create report
 deps=coverage

From d9998e6281cbf4bb90cfd8c90e7f34b4ea3a350d Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 29 Jun 2020 20:00:24 +0300
Subject: [PATCH 7986/8469] fix test for deprecation warning

---
 setuptools/tests/test_build_ext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 3dc87ca363..2ef8521d51 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -42,7 +42,7 @@ def test_abi3_filename(self):
         res = cmd.get_ext_filename('spam.eggs')
 
         if six.PY2 or not get_abi3_suffix():
-            assert res.endswith(get_config_var('SO'))
+            assert res.endswith(get_config_var('EXT_SUFFIX'))
         elif sys.platform == 'win32':
             assert res.endswith('eggs.pyd')
         else:

From 9013321c25606a5cd63271cd029c2539490b16d3 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Mon, 29 Jun 2020 20:37:43 +0300
Subject: [PATCH 7987/8469] catch some resource leaks

---
 pkg_resources/__init__.py |  3 ++-
 setuptools/launch.py      |  3 ++-
 setuptools/msvc.py        | 36 +++++++++++++++++++++---------------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 2e7d505901..61f2446159 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1459,7 +1459,8 @@ def run_script(self, script_name, namespace):
         script_filename = self._fn(self.egg_info, script)
         namespace['__file__'] = script_filename
         if os.path.exists(script_filename):
-            source = open(script_filename).read()
+            with open(script_filename) as fid:
+                source = fid.read()
             code = compile(source, script_filename, 'exec')
             exec(code, namespace, namespace)
         else:
diff --git a/setuptools/launch.py b/setuptools/launch.py
index 308283ea93..0208fdf33b 100644
--- a/setuptools/launch.py
+++ b/setuptools/launch.py
@@ -25,7 +25,8 @@ def run():
     sys.argv[:] = sys.argv[1:]
 
     open_ = getattr(tokenize, 'open', open)
-    script = open_(script_name).read()
+    with open_(script_name) as fid:
+        script = fid.read()
     norm_script = script.replace('\\r\\n', '\\n')
     code = compile(norm_script, script_name, 'exec')
     exec(code, namespace)
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 213e39c9d5..09f8565ef6 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -643,8 +643,10 @@ def lookup(self, key, name):
         """
         key_read = winreg.KEY_READ
         openkey = winreg.OpenKey
+        closekey = winreg.CloseKey
         ms = self.microsoft
         for hkey in self.HKEYS:
+            bkey = None
             try:
                 bkey = openkey(hkey, ms(key), 0, key_read)
             except (OSError, IOError):
@@ -659,6 +661,9 @@ def lookup(self, key, name):
                 return winreg.QueryValueEx(bkey, name)[0]
             except (OSError, IOError):
                 pass
+            finally:
+                if bkey:
+                    closekey(bkey)
 
 
 class SystemInfo:
@@ -726,21 +731,22 @@ def find_reg_vs_vers(self):
                     bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ)
                 except (OSError, IOError):
                     continue
-                subkeys, values, _ = winreg.QueryInfoKey(bkey)
-                for i in range(values):
-                    try:
-                        ver = float(winreg.EnumValue(bkey, i)[0])
-                        if ver not in vs_vers:
-                            vs_vers.append(ver)
-                    except ValueError:
-                        pass
-                for i in range(subkeys):
-                    try:
-                        ver = float(winreg.EnumKey(bkey, i))
-                        if ver not in vs_vers:
-                            vs_vers.append(ver)
-                    except ValueError:
-                        pass
+                with bkey:
+                    subkeys, values, _ = winreg.QueryInfoKey(bkey)
+                    for i in range(values):
+                        try:
+                            ver = float(winreg.EnumValue(bkey, i)[0])
+                            if ver not in vs_vers:
+                                vs_vers.append(ver)
+                        except ValueError:
+                            pass
+                    for i in range(subkeys):
+                        try:
+                            ver = float(winreg.EnumKey(bkey, i))
+                            if ver not in vs_vers:
+                                vs_vers.append(ver)
+                        except ValueError:
+                            pass
         return sorted(vs_vers)
 
     def find_programdata_vs_vers(self):

From bb9fb1fcfe37c1ef1e29e1e6d1fc4e483c743380 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 03:53:46 -0400
Subject: [PATCH 7988/8469] Move distutils into a submodule of setuptools.

---
 conftest.py                                   |   2 +-
 {distutils => setuptools/_distutils}/README   |   0
 .../_distutils}/__init__.py                   |   0
 .../_distutils}/_msvccompiler.py              |   0
 .../_distutils}/archive_util.py               |   0
 .../_distutils}/bcppcompiler.py               |   0
 .../_distutils}/ccompiler.py                  |   0
 {distutils => setuptools/_distutils}/cmd.py   |   0
 .../_distutils}/command/__init__.py           |   0
 .../_distutils}/command/bdist.py              |   0
 .../_distutils}/command/bdist_dumb.py         |   0
 .../_distutils}/command/bdist_msi.py          |   0
 .../_distutils}/command/bdist_rpm.py          |   0
 .../_distutils}/command/bdist_wininst.py      |   0
 .../_distutils}/command/build.py              |   0
 .../_distutils}/command/build_clib.py         |   0
 .../_distutils}/command/build_ext.py          |   0
 .../_distutils}/command/build_py.py           |   0
 .../_distutils}/command/build_scripts.py      |   0
 .../_distutils}/command/check.py              |   0
 .../_distutils}/command/clean.py              |   0
 .../_distutils}/command/command_template      |   0
 .../_distutils}/command/config.py             |   0
 .../_distutils}/command/install.py            |   0
 .../_distutils}/command/install_data.py       |   0
 .../_distutils}/command/install_egg_info.py   |   0
 .../_distutils}/command/install_headers.py    |   0
 .../_distutils}/command/install_lib.py        |   0
 .../_distutils}/command/install_scripts.py    |   0
 .../_distutils}/command/register.py           |   0
 .../_distutils}/command/sdist.py              |   0
 .../_distutils}/command/upload.py             |   0
 .../command/wininst-10.0-amd64.exe            | Bin
 .../_distutils}/command/wininst-10.0.exe      | Bin
 .../command/wininst-14.0-amd64.exe            | Bin
 .../_distutils}/command/wininst-14.0.exe      | Bin
 .../_distutils}/command/wininst-6.0.exe       | Bin
 .../_distutils}/command/wininst-7.1.exe       | Bin
 .../_distutils}/command/wininst-8.0.exe       | Bin
 .../_distutils}/command/wininst-9.0-amd64.exe | Bin
 .../_distutils}/command/wininst-9.0.exe       | Bin
 .../_distutils}/config.py                     |   0
 {distutils => setuptools/_distutils}/core.py  |   0
 .../_distutils}/cygwinccompiler.py            |   0
 {distutils => setuptools/_distutils}/debug.py |   0
 .../_distutils}/dep_util.py                   |   0
 .../_distutils}/dir_util.py                   |   0
 {distutils => setuptools/_distutils}/dist.py  |   0
 .../_distutils}/errors.py                     |   0
 .../_distutils}/extension.py                  |   0
 .../_distutils}/fancy_getopt.py               |   0
 .../_distutils}/file_util.py                  |   0
 .../_distutils}/filelist.py                   |   0
 {distutils => setuptools/_distutils}/log.py   |   0
 .../_distutils}/msvc9compiler.py              |   0
 .../_distutils}/msvccompiler.py               |   0
 {distutils => setuptools/_distutils}/spawn.py |   0
 .../_distutils}/sysconfig.py                  |   0
 .../_distutils}/tests/Setup.sample            |   0
 .../_distutils}/tests/__init__.py             |   0
 .../_distutils}/tests/includetest.rst         |   0
 .../_distutils}/tests/py35compat.py           |   0
 .../_distutils}/tests/support.py              |   0
 .../_distutils}/tests/test_archive_util.py    |   0
 .../_distutils}/tests/test_bdist.py           |   0
 .../_distutils}/tests/test_bdist_dumb.py      |   0
 .../_distutils}/tests/test_bdist_msi.py       |   0
 .../_distutils}/tests/test_bdist_rpm.py       |   0
 .../_distutils}/tests/test_bdist_wininst.py   |   0
 .../_distutils}/tests/test_build.py           |   0
 .../_distutils}/tests/test_build_clib.py      |   0
 .../_distutils}/tests/test_build_ext.py       |   0
 .../_distutils}/tests/test_build_py.py        |   0
 .../_distutils}/tests/test_build_scripts.py   |   0
 .../_distutils}/tests/test_check.py           |   0
 .../_distutils}/tests/test_clean.py           |   0
 .../_distutils}/tests/test_cmd.py             |   0
 .../_distutils}/tests/test_config.py          |   0
 .../_distutils}/tests/test_config_cmd.py      |   0
 .../_distutils}/tests/test_core.py            |   0
 .../_distutils}/tests/test_cygwinccompiler.py |   0
 .../_distutils}/tests/test_dep_util.py        |   0
 .../_distutils}/tests/test_dir_util.py        |   0
 .../_distutils}/tests/test_dist.py            |   0
 .../_distutils}/tests/test_extension.py       |   0
 .../_distutils}/tests/test_file_util.py       |   0
 .../_distutils}/tests/test_filelist.py        |   0
 .../_distutils}/tests/test_install.py         |   0
 .../_distutils}/tests/test_install_data.py    |   0
 .../_distutils}/tests/test_install_headers.py |   0
 .../_distutils}/tests/test_install_lib.py     |   0
 .../_distutils}/tests/test_install_scripts.py |   0
 .../_distutils}/tests/test_log.py             |   0
 .../_distutils}/tests/test_msvc9compiler.py   |   0
 .../_distutils}/tests/test_msvccompiler.py    |   0
 .../_distutils}/tests/test_register.py        |   0
 .../_distutils}/tests/test_sdist.py           |   0
 .../_distutils}/tests/test_spawn.py           |   0
 .../_distutils}/tests/test_sysconfig.py       |   0
 .../_distutils}/tests/test_text_file.py       |   0
 .../_distutils}/tests/test_unixccompiler.py   |   0
 .../_distutils}/tests/test_upload.py          |   0
 .../_distutils}/tests/test_util.py            |   0
 .../_distutils}/tests/test_version.py         |   0
 .../tests/test_versionpredicate.py            |   0
 .../_distutils}/text_file.py                  |   0
 .../_distutils}/unixccompiler.py              |   0
 {distutils => setuptools/_distutils}/util.py  |   0
 .../_distutils}/version.py                    |   0
 .../_distutils}/versionpredicate.py           |   0
 setuptools/distutils_patch.py                 |  21 +++++-------------
 111 files changed, 7 insertions(+), 16 deletions(-)
 rename {distutils => setuptools/_distutils}/README (100%)
 rename {distutils => setuptools/_distutils}/__init__.py (100%)
 rename {distutils => setuptools/_distutils}/_msvccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/archive_util.py (100%)
 rename {distutils => setuptools/_distutils}/bcppcompiler.py (100%)
 rename {distutils => setuptools/_distutils}/ccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/cmd.py (100%)
 rename {distutils => setuptools/_distutils}/command/__init__.py (100%)
 rename {distutils => setuptools/_distutils}/command/bdist.py (100%)
 rename {distutils => setuptools/_distutils}/command/bdist_dumb.py (100%)
 rename {distutils => setuptools/_distutils}/command/bdist_msi.py (100%)
 rename {distutils => setuptools/_distutils}/command/bdist_rpm.py (100%)
 rename {distutils => setuptools/_distutils}/command/bdist_wininst.py (100%)
 rename {distutils => setuptools/_distutils}/command/build.py (100%)
 rename {distutils => setuptools/_distutils}/command/build_clib.py (100%)
 rename {distutils => setuptools/_distutils}/command/build_ext.py (100%)
 rename {distutils => setuptools/_distutils}/command/build_py.py (100%)
 rename {distutils => setuptools/_distutils}/command/build_scripts.py (100%)
 rename {distutils => setuptools/_distutils}/command/check.py (100%)
 rename {distutils => setuptools/_distutils}/command/clean.py (100%)
 rename {distutils => setuptools/_distutils}/command/command_template (100%)
 rename {distutils => setuptools/_distutils}/command/config.py (100%)
 rename {distutils => setuptools/_distutils}/command/install.py (100%)
 rename {distutils => setuptools/_distutils}/command/install_data.py (100%)
 rename {distutils => setuptools/_distutils}/command/install_egg_info.py (100%)
 rename {distutils => setuptools/_distutils}/command/install_headers.py (100%)
 rename {distutils => setuptools/_distutils}/command/install_lib.py (100%)
 rename {distutils => setuptools/_distutils}/command/install_scripts.py (100%)
 rename {distutils => setuptools/_distutils}/command/register.py (100%)
 rename {distutils => setuptools/_distutils}/command/sdist.py (100%)
 rename {distutils => setuptools/_distutils}/command/upload.py (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-10.0-amd64.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-10.0.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-14.0-amd64.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-14.0.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-6.0.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-7.1.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-8.0.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-9.0-amd64.exe (100%)
 rename {distutils => setuptools/_distutils}/command/wininst-9.0.exe (100%)
 rename {distutils => setuptools/_distutils}/config.py (100%)
 rename {distutils => setuptools/_distutils}/core.py (100%)
 rename {distutils => setuptools/_distutils}/cygwinccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/debug.py (100%)
 rename {distutils => setuptools/_distutils}/dep_util.py (100%)
 rename {distutils => setuptools/_distutils}/dir_util.py (100%)
 rename {distutils => setuptools/_distutils}/dist.py (100%)
 rename {distutils => setuptools/_distutils}/errors.py (100%)
 rename {distutils => setuptools/_distutils}/extension.py (100%)
 rename {distutils => setuptools/_distutils}/fancy_getopt.py (100%)
 rename {distutils => setuptools/_distutils}/file_util.py (100%)
 rename {distutils => setuptools/_distutils}/filelist.py (100%)
 rename {distutils => setuptools/_distutils}/log.py (100%)
 rename {distutils => setuptools/_distutils}/msvc9compiler.py (100%)
 rename {distutils => setuptools/_distutils}/msvccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/spawn.py (100%)
 rename {distutils => setuptools/_distutils}/sysconfig.py (100%)
 rename {distutils => setuptools/_distutils}/tests/Setup.sample (100%)
 rename {distutils => setuptools/_distutils}/tests/__init__.py (100%)
 rename {distutils => setuptools/_distutils}/tests/includetest.rst (100%)
 rename {distutils => setuptools/_distutils}/tests/py35compat.py (100%)
 rename {distutils => setuptools/_distutils}/tests/support.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_archive_util.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_bdist.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_bdist_dumb.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_bdist_msi.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_bdist_rpm.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_bdist_wininst.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_build.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_build_clib.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_build_ext.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_build_py.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_build_scripts.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_check.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_clean.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_cmd.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_config.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_config_cmd.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_core.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_cygwinccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_dep_util.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_dir_util.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_dist.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_extension.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_file_util.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_filelist.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_install.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_install_data.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_install_headers.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_install_lib.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_install_scripts.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_log.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_msvc9compiler.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_msvccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_register.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_sdist.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_spawn.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_sysconfig.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_text_file.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_unixccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_upload.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_util.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_version.py (100%)
 rename {distutils => setuptools/_distutils}/tests/test_versionpredicate.py (100%)
 rename {distutils => setuptools/_distutils}/text_file.py (100%)
 rename {distutils => setuptools/_distutils}/unixccompiler.py (100%)
 rename {distutils => setuptools/_distutils}/util.py (100%)
 rename {distutils => setuptools/_distutils}/version.py (100%)
 rename {distutils => setuptools/_distutils}/versionpredicate.py (100%)

diff --git a/conftest.py b/conftest.py
index 3f7e59b44e..72edcf1439 100644
--- a/conftest.py
+++ b/conftest.py
@@ -14,7 +14,7 @@ def pytest_addoption(parser):
 collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
-    'distutils',
+    'setuptools/_distutils',
 ]
 
 
diff --git a/distutils/README b/setuptools/_distutils/README
similarity index 100%
rename from distutils/README
rename to setuptools/_distutils/README
diff --git a/distutils/__init__.py b/setuptools/_distutils/__init__.py
similarity index 100%
rename from distutils/__init__.py
rename to setuptools/_distutils/__init__.py
diff --git a/distutils/_msvccompiler.py b/setuptools/_distutils/_msvccompiler.py
similarity index 100%
rename from distutils/_msvccompiler.py
rename to setuptools/_distutils/_msvccompiler.py
diff --git a/distutils/archive_util.py b/setuptools/_distutils/archive_util.py
similarity index 100%
rename from distutils/archive_util.py
rename to setuptools/_distutils/archive_util.py
diff --git a/distutils/bcppcompiler.py b/setuptools/_distutils/bcppcompiler.py
similarity index 100%
rename from distutils/bcppcompiler.py
rename to setuptools/_distutils/bcppcompiler.py
diff --git a/distutils/ccompiler.py b/setuptools/_distutils/ccompiler.py
similarity index 100%
rename from distutils/ccompiler.py
rename to setuptools/_distutils/ccompiler.py
diff --git a/distutils/cmd.py b/setuptools/_distutils/cmd.py
similarity index 100%
rename from distutils/cmd.py
rename to setuptools/_distutils/cmd.py
diff --git a/distutils/command/__init__.py b/setuptools/_distutils/command/__init__.py
similarity index 100%
rename from distutils/command/__init__.py
rename to setuptools/_distutils/command/__init__.py
diff --git a/distutils/command/bdist.py b/setuptools/_distutils/command/bdist.py
similarity index 100%
rename from distutils/command/bdist.py
rename to setuptools/_distutils/command/bdist.py
diff --git a/distutils/command/bdist_dumb.py b/setuptools/_distutils/command/bdist_dumb.py
similarity index 100%
rename from distutils/command/bdist_dumb.py
rename to setuptools/_distutils/command/bdist_dumb.py
diff --git a/distutils/command/bdist_msi.py b/setuptools/_distutils/command/bdist_msi.py
similarity index 100%
rename from distutils/command/bdist_msi.py
rename to setuptools/_distutils/command/bdist_msi.py
diff --git a/distutils/command/bdist_rpm.py b/setuptools/_distutils/command/bdist_rpm.py
similarity index 100%
rename from distutils/command/bdist_rpm.py
rename to setuptools/_distutils/command/bdist_rpm.py
diff --git a/distutils/command/bdist_wininst.py b/setuptools/_distutils/command/bdist_wininst.py
similarity index 100%
rename from distutils/command/bdist_wininst.py
rename to setuptools/_distutils/command/bdist_wininst.py
diff --git a/distutils/command/build.py b/setuptools/_distutils/command/build.py
similarity index 100%
rename from distutils/command/build.py
rename to setuptools/_distutils/command/build.py
diff --git a/distutils/command/build_clib.py b/setuptools/_distutils/command/build_clib.py
similarity index 100%
rename from distutils/command/build_clib.py
rename to setuptools/_distutils/command/build_clib.py
diff --git a/distutils/command/build_ext.py b/setuptools/_distutils/command/build_ext.py
similarity index 100%
rename from distutils/command/build_ext.py
rename to setuptools/_distutils/command/build_ext.py
diff --git a/distutils/command/build_py.py b/setuptools/_distutils/command/build_py.py
similarity index 100%
rename from distutils/command/build_py.py
rename to setuptools/_distutils/command/build_py.py
diff --git a/distutils/command/build_scripts.py b/setuptools/_distutils/command/build_scripts.py
similarity index 100%
rename from distutils/command/build_scripts.py
rename to setuptools/_distutils/command/build_scripts.py
diff --git a/distutils/command/check.py b/setuptools/_distutils/command/check.py
similarity index 100%
rename from distutils/command/check.py
rename to setuptools/_distutils/command/check.py
diff --git a/distutils/command/clean.py b/setuptools/_distutils/command/clean.py
similarity index 100%
rename from distutils/command/clean.py
rename to setuptools/_distutils/command/clean.py
diff --git a/distutils/command/command_template b/setuptools/_distutils/command/command_template
similarity index 100%
rename from distutils/command/command_template
rename to setuptools/_distutils/command/command_template
diff --git a/distutils/command/config.py b/setuptools/_distutils/command/config.py
similarity index 100%
rename from distutils/command/config.py
rename to setuptools/_distutils/command/config.py
diff --git a/distutils/command/install.py b/setuptools/_distutils/command/install.py
similarity index 100%
rename from distutils/command/install.py
rename to setuptools/_distutils/command/install.py
diff --git a/distutils/command/install_data.py b/setuptools/_distutils/command/install_data.py
similarity index 100%
rename from distutils/command/install_data.py
rename to setuptools/_distutils/command/install_data.py
diff --git a/distutils/command/install_egg_info.py b/setuptools/_distutils/command/install_egg_info.py
similarity index 100%
rename from distutils/command/install_egg_info.py
rename to setuptools/_distutils/command/install_egg_info.py
diff --git a/distutils/command/install_headers.py b/setuptools/_distutils/command/install_headers.py
similarity index 100%
rename from distutils/command/install_headers.py
rename to setuptools/_distutils/command/install_headers.py
diff --git a/distutils/command/install_lib.py b/setuptools/_distutils/command/install_lib.py
similarity index 100%
rename from distutils/command/install_lib.py
rename to setuptools/_distutils/command/install_lib.py
diff --git a/distutils/command/install_scripts.py b/setuptools/_distutils/command/install_scripts.py
similarity index 100%
rename from distutils/command/install_scripts.py
rename to setuptools/_distutils/command/install_scripts.py
diff --git a/distutils/command/register.py b/setuptools/_distutils/command/register.py
similarity index 100%
rename from distutils/command/register.py
rename to setuptools/_distutils/command/register.py
diff --git a/distutils/command/sdist.py b/setuptools/_distutils/command/sdist.py
similarity index 100%
rename from distutils/command/sdist.py
rename to setuptools/_distutils/command/sdist.py
diff --git a/distutils/command/upload.py b/setuptools/_distutils/command/upload.py
similarity index 100%
rename from distutils/command/upload.py
rename to setuptools/_distutils/command/upload.py
diff --git a/distutils/command/wininst-10.0-amd64.exe b/setuptools/_distutils/command/wininst-10.0-amd64.exe
similarity index 100%
rename from distutils/command/wininst-10.0-amd64.exe
rename to setuptools/_distutils/command/wininst-10.0-amd64.exe
diff --git a/distutils/command/wininst-10.0.exe b/setuptools/_distutils/command/wininst-10.0.exe
similarity index 100%
rename from distutils/command/wininst-10.0.exe
rename to setuptools/_distutils/command/wininst-10.0.exe
diff --git a/distutils/command/wininst-14.0-amd64.exe b/setuptools/_distutils/command/wininst-14.0-amd64.exe
similarity index 100%
rename from distutils/command/wininst-14.0-amd64.exe
rename to setuptools/_distutils/command/wininst-14.0-amd64.exe
diff --git a/distutils/command/wininst-14.0.exe b/setuptools/_distutils/command/wininst-14.0.exe
similarity index 100%
rename from distutils/command/wininst-14.0.exe
rename to setuptools/_distutils/command/wininst-14.0.exe
diff --git a/distutils/command/wininst-6.0.exe b/setuptools/_distutils/command/wininst-6.0.exe
similarity index 100%
rename from distutils/command/wininst-6.0.exe
rename to setuptools/_distutils/command/wininst-6.0.exe
diff --git a/distutils/command/wininst-7.1.exe b/setuptools/_distutils/command/wininst-7.1.exe
similarity index 100%
rename from distutils/command/wininst-7.1.exe
rename to setuptools/_distutils/command/wininst-7.1.exe
diff --git a/distutils/command/wininst-8.0.exe b/setuptools/_distutils/command/wininst-8.0.exe
similarity index 100%
rename from distutils/command/wininst-8.0.exe
rename to setuptools/_distutils/command/wininst-8.0.exe
diff --git a/distutils/command/wininst-9.0-amd64.exe b/setuptools/_distutils/command/wininst-9.0-amd64.exe
similarity index 100%
rename from distutils/command/wininst-9.0-amd64.exe
rename to setuptools/_distutils/command/wininst-9.0-amd64.exe
diff --git a/distutils/command/wininst-9.0.exe b/setuptools/_distutils/command/wininst-9.0.exe
similarity index 100%
rename from distutils/command/wininst-9.0.exe
rename to setuptools/_distutils/command/wininst-9.0.exe
diff --git a/distutils/config.py b/setuptools/_distutils/config.py
similarity index 100%
rename from distutils/config.py
rename to setuptools/_distutils/config.py
diff --git a/distutils/core.py b/setuptools/_distutils/core.py
similarity index 100%
rename from distutils/core.py
rename to setuptools/_distutils/core.py
diff --git a/distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
similarity index 100%
rename from distutils/cygwinccompiler.py
rename to setuptools/_distutils/cygwinccompiler.py
diff --git a/distutils/debug.py b/setuptools/_distutils/debug.py
similarity index 100%
rename from distutils/debug.py
rename to setuptools/_distutils/debug.py
diff --git a/distutils/dep_util.py b/setuptools/_distutils/dep_util.py
similarity index 100%
rename from distutils/dep_util.py
rename to setuptools/_distutils/dep_util.py
diff --git a/distutils/dir_util.py b/setuptools/_distutils/dir_util.py
similarity index 100%
rename from distutils/dir_util.py
rename to setuptools/_distutils/dir_util.py
diff --git a/distutils/dist.py b/setuptools/_distutils/dist.py
similarity index 100%
rename from distutils/dist.py
rename to setuptools/_distutils/dist.py
diff --git a/distutils/errors.py b/setuptools/_distutils/errors.py
similarity index 100%
rename from distutils/errors.py
rename to setuptools/_distutils/errors.py
diff --git a/distutils/extension.py b/setuptools/_distutils/extension.py
similarity index 100%
rename from distutils/extension.py
rename to setuptools/_distutils/extension.py
diff --git a/distutils/fancy_getopt.py b/setuptools/_distutils/fancy_getopt.py
similarity index 100%
rename from distutils/fancy_getopt.py
rename to setuptools/_distutils/fancy_getopt.py
diff --git a/distutils/file_util.py b/setuptools/_distutils/file_util.py
similarity index 100%
rename from distutils/file_util.py
rename to setuptools/_distutils/file_util.py
diff --git a/distutils/filelist.py b/setuptools/_distutils/filelist.py
similarity index 100%
rename from distutils/filelist.py
rename to setuptools/_distutils/filelist.py
diff --git a/distutils/log.py b/setuptools/_distutils/log.py
similarity index 100%
rename from distutils/log.py
rename to setuptools/_distutils/log.py
diff --git a/distutils/msvc9compiler.py b/setuptools/_distutils/msvc9compiler.py
similarity index 100%
rename from distutils/msvc9compiler.py
rename to setuptools/_distutils/msvc9compiler.py
diff --git a/distutils/msvccompiler.py b/setuptools/_distutils/msvccompiler.py
similarity index 100%
rename from distutils/msvccompiler.py
rename to setuptools/_distutils/msvccompiler.py
diff --git a/distutils/spawn.py b/setuptools/_distutils/spawn.py
similarity index 100%
rename from distutils/spawn.py
rename to setuptools/_distutils/spawn.py
diff --git a/distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
similarity index 100%
rename from distutils/sysconfig.py
rename to setuptools/_distutils/sysconfig.py
diff --git a/distutils/tests/Setup.sample b/setuptools/_distutils/tests/Setup.sample
similarity index 100%
rename from distutils/tests/Setup.sample
rename to setuptools/_distutils/tests/Setup.sample
diff --git a/distutils/tests/__init__.py b/setuptools/_distutils/tests/__init__.py
similarity index 100%
rename from distutils/tests/__init__.py
rename to setuptools/_distutils/tests/__init__.py
diff --git a/distutils/tests/includetest.rst b/setuptools/_distutils/tests/includetest.rst
similarity index 100%
rename from distutils/tests/includetest.rst
rename to setuptools/_distutils/tests/includetest.rst
diff --git a/distutils/tests/py35compat.py b/setuptools/_distutils/tests/py35compat.py
similarity index 100%
rename from distutils/tests/py35compat.py
rename to setuptools/_distutils/tests/py35compat.py
diff --git a/distutils/tests/support.py b/setuptools/_distutils/tests/support.py
similarity index 100%
rename from distutils/tests/support.py
rename to setuptools/_distutils/tests/support.py
diff --git a/distutils/tests/test_archive_util.py b/setuptools/_distutils/tests/test_archive_util.py
similarity index 100%
rename from distutils/tests/test_archive_util.py
rename to setuptools/_distutils/tests/test_archive_util.py
diff --git a/distutils/tests/test_bdist.py b/setuptools/_distutils/tests/test_bdist.py
similarity index 100%
rename from distutils/tests/test_bdist.py
rename to setuptools/_distutils/tests/test_bdist.py
diff --git a/distutils/tests/test_bdist_dumb.py b/setuptools/_distutils/tests/test_bdist_dumb.py
similarity index 100%
rename from distutils/tests/test_bdist_dumb.py
rename to setuptools/_distutils/tests/test_bdist_dumb.py
diff --git a/distutils/tests/test_bdist_msi.py b/setuptools/_distutils/tests/test_bdist_msi.py
similarity index 100%
rename from distutils/tests/test_bdist_msi.py
rename to setuptools/_distutils/tests/test_bdist_msi.py
diff --git a/distutils/tests/test_bdist_rpm.py b/setuptools/_distutils/tests/test_bdist_rpm.py
similarity index 100%
rename from distutils/tests/test_bdist_rpm.py
rename to setuptools/_distutils/tests/test_bdist_rpm.py
diff --git a/distutils/tests/test_bdist_wininst.py b/setuptools/_distutils/tests/test_bdist_wininst.py
similarity index 100%
rename from distutils/tests/test_bdist_wininst.py
rename to setuptools/_distutils/tests/test_bdist_wininst.py
diff --git a/distutils/tests/test_build.py b/setuptools/_distutils/tests/test_build.py
similarity index 100%
rename from distutils/tests/test_build.py
rename to setuptools/_distutils/tests/test_build.py
diff --git a/distutils/tests/test_build_clib.py b/setuptools/_distutils/tests/test_build_clib.py
similarity index 100%
rename from distutils/tests/test_build_clib.py
rename to setuptools/_distutils/tests/test_build_clib.py
diff --git a/distutils/tests/test_build_ext.py b/setuptools/_distutils/tests/test_build_ext.py
similarity index 100%
rename from distutils/tests/test_build_ext.py
rename to setuptools/_distutils/tests/test_build_ext.py
diff --git a/distutils/tests/test_build_py.py b/setuptools/_distutils/tests/test_build_py.py
similarity index 100%
rename from distutils/tests/test_build_py.py
rename to setuptools/_distutils/tests/test_build_py.py
diff --git a/distutils/tests/test_build_scripts.py b/setuptools/_distutils/tests/test_build_scripts.py
similarity index 100%
rename from distutils/tests/test_build_scripts.py
rename to setuptools/_distutils/tests/test_build_scripts.py
diff --git a/distutils/tests/test_check.py b/setuptools/_distutils/tests/test_check.py
similarity index 100%
rename from distutils/tests/test_check.py
rename to setuptools/_distutils/tests/test_check.py
diff --git a/distutils/tests/test_clean.py b/setuptools/_distutils/tests/test_clean.py
similarity index 100%
rename from distutils/tests/test_clean.py
rename to setuptools/_distutils/tests/test_clean.py
diff --git a/distutils/tests/test_cmd.py b/setuptools/_distutils/tests/test_cmd.py
similarity index 100%
rename from distutils/tests/test_cmd.py
rename to setuptools/_distutils/tests/test_cmd.py
diff --git a/distutils/tests/test_config.py b/setuptools/_distutils/tests/test_config.py
similarity index 100%
rename from distutils/tests/test_config.py
rename to setuptools/_distutils/tests/test_config.py
diff --git a/distutils/tests/test_config_cmd.py b/setuptools/_distutils/tests/test_config_cmd.py
similarity index 100%
rename from distutils/tests/test_config_cmd.py
rename to setuptools/_distutils/tests/test_config_cmd.py
diff --git a/distutils/tests/test_core.py b/setuptools/_distutils/tests/test_core.py
similarity index 100%
rename from distutils/tests/test_core.py
rename to setuptools/_distutils/tests/test_core.py
diff --git a/distutils/tests/test_cygwinccompiler.py b/setuptools/_distutils/tests/test_cygwinccompiler.py
similarity index 100%
rename from distutils/tests/test_cygwinccompiler.py
rename to setuptools/_distutils/tests/test_cygwinccompiler.py
diff --git a/distutils/tests/test_dep_util.py b/setuptools/_distutils/tests/test_dep_util.py
similarity index 100%
rename from distutils/tests/test_dep_util.py
rename to setuptools/_distutils/tests/test_dep_util.py
diff --git a/distutils/tests/test_dir_util.py b/setuptools/_distutils/tests/test_dir_util.py
similarity index 100%
rename from distutils/tests/test_dir_util.py
rename to setuptools/_distutils/tests/test_dir_util.py
diff --git a/distutils/tests/test_dist.py b/setuptools/_distutils/tests/test_dist.py
similarity index 100%
rename from distutils/tests/test_dist.py
rename to setuptools/_distutils/tests/test_dist.py
diff --git a/distutils/tests/test_extension.py b/setuptools/_distutils/tests/test_extension.py
similarity index 100%
rename from distutils/tests/test_extension.py
rename to setuptools/_distutils/tests/test_extension.py
diff --git a/distutils/tests/test_file_util.py b/setuptools/_distutils/tests/test_file_util.py
similarity index 100%
rename from distutils/tests/test_file_util.py
rename to setuptools/_distutils/tests/test_file_util.py
diff --git a/distutils/tests/test_filelist.py b/setuptools/_distutils/tests/test_filelist.py
similarity index 100%
rename from distutils/tests/test_filelist.py
rename to setuptools/_distutils/tests/test_filelist.py
diff --git a/distutils/tests/test_install.py b/setuptools/_distutils/tests/test_install.py
similarity index 100%
rename from distutils/tests/test_install.py
rename to setuptools/_distutils/tests/test_install.py
diff --git a/distutils/tests/test_install_data.py b/setuptools/_distutils/tests/test_install_data.py
similarity index 100%
rename from distutils/tests/test_install_data.py
rename to setuptools/_distutils/tests/test_install_data.py
diff --git a/distutils/tests/test_install_headers.py b/setuptools/_distutils/tests/test_install_headers.py
similarity index 100%
rename from distutils/tests/test_install_headers.py
rename to setuptools/_distutils/tests/test_install_headers.py
diff --git a/distutils/tests/test_install_lib.py b/setuptools/_distutils/tests/test_install_lib.py
similarity index 100%
rename from distutils/tests/test_install_lib.py
rename to setuptools/_distutils/tests/test_install_lib.py
diff --git a/distutils/tests/test_install_scripts.py b/setuptools/_distutils/tests/test_install_scripts.py
similarity index 100%
rename from distutils/tests/test_install_scripts.py
rename to setuptools/_distutils/tests/test_install_scripts.py
diff --git a/distutils/tests/test_log.py b/setuptools/_distutils/tests/test_log.py
similarity index 100%
rename from distutils/tests/test_log.py
rename to setuptools/_distutils/tests/test_log.py
diff --git a/distutils/tests/test_msvc9compiler.py b/setuptools/_distutils/tests/test_msvc9compiler.py
similarity index 100%
rename from distutils/tests/test_msvc9compiler.py
rename to setuptools/_distutils/tests/test_msvc9compiler.py
diff --git a/distutils/tests/test_msvccompiler.py b/setuptools/_distutils/tests/test_msvccompiler.py
similarity index 100%
rename from distutils/tests/test_msvccompiler.py
rename to setuptools/_distutils/tests/test_msvccompiler.py
diff --git a/distutils/tests/test_register.py b/setuptools/_distutils/tests/test_register.py
similarity index 100%
rename from distutils/tests/test_register.py
rename to setuptools/_distutils/tests/test_register.py
diff --git a/distutils/tests/test_sdist.py b/setuptools/_distutils/tests/test_sdist.py
similarity index 100%
rename from distutils/tests/test_sdist.py
rename to setuptools/_distutils/tests/test_sdist.py
diff --git a/distutils/tests/test_spawn.py b/setuptools/_distutils/tests/test_spawn.py
similarity index 100%
rename from distutils/tests/test_spawn.py
rename to setuptools/_distutils/tests/test_spawn.py
diff --git a/distutils/tests/test_sysconfig.py b/setuptools/_distutils/tests/test_sysconfig.py
similarity index 100%
rename from distutils/tests/test_sysconfig.py
rename to setuptools/_distutils/tests/test_sysconfig.py
diff --git a/distutils/tests/test_text_file.py b/setuptools/_distutils/tests/test_text_file.py
similarity index 100%
rename from distutils/tests/test_text_file.py
rename to setuptools/_distutils/tests/test_text_file.py
diff --git a/distutils/tests/test_unixccompiler.py b/setuptools/_distutils/tests/test_unixccompiler.py
similarity index 100%
rename from distutils/tests/test_unixccompiler.py
rename to setuptools/_distutils/tests/test_unixccompiler.py
diff --git a/distutils/tests/test_upload.py b/setuptools/_distutils/tests/test_upload.py
similarity index 100%
rename from distutils/tests/test_upload.py
rename to setuptools/_distutils/tests/test_upload.py
diff --git a/distutils/tests/test_util.py b/setuptools/_distutils/tests/test_util.py
similarity index 100%
rename from distutils/tests/test_util.py
rename to setuptools/_distutils/tests/test_util.py
diff --git a/distutils/tests/test_version.py b/setuptools/_distutils/tests/test_version.py
similarity index 100%
rename from distutils/tests/test_version.py
rename to setuptools/_distutils/tests/test_version.py
diff --git a/distutils/tests/test_versionpredicate.py b/setuptools/_distutils/tests/test_versionpredicate.py
similarity index 100%
rename from distutils/tests/test_versionpredicate.py
rename to setuptools/_distutils/tests/test_versionpredicate.py
diff --git a/distutils/text_file.py b/setuptools/_distutils/text_file.py
similarity index 100%
rename from distutils/text_file.py
rename to setuptools/_distutils/text_file.py
diff --git a/distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
similarity index 100%
rename from distutils/unixccompiler.py
rename to setuptools/_distutils/unixccompiler.py
diff --git a/distutils/util.py b/setuptools/_distutils/util.py
similarity index 100%
rename from distutils/util.py
rename to setuptools/_distutils/util.py
diff --git a/distutils/version.py b/setuptools/_distutils/version.py
similarity index 100%
rename from distutils/version.py
rename to setuptools/_distutils/version.py
diff --git a/distutils/versionpredicate.py b/setuptools/_distutils/versionpredicate.py
similarity index 100%
rename from distutils/versionpredicate.py
rename to setuptools/_distutils/versionpredicate.py
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index f9e637988a..06eed82f0e 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -8,19 +8,7 @@
 import sys
 import re
 import importlib
-import contextlib
 import warnings
-from os.path import dirname
-
-
-@contextlib.contextmanager
-def patch_sys_path():
-    orig = sys.path[:]
-    sys.path[:] = [dirname(dirname(__file__))]
-    try:
-        yield
-    finally:
-        sys.path[:] = orig
 
 
 def clear_distutils():
@@ -34,9 +22,12 @@ def clear_distutils():
 
 def ensure_local_distutils():
     clear_distutils()
-    with patch_sys_path():
-        importlib.import_module('distutils')
-        assert sys.modules['distutils'].local
+    distutils = importlib.import_module('setuptools._distutils')
+    sys.modules['distutils'] = distutils
+
+    # sanity check that submodules load as expected
+    core = importlib.import_module('distutils.core')
+    assert '_distutils' in core.__file__, core.__file__
 
 
 ensure_local_distutils()

From 97192962e89a24a02effd1f7a541108335517253 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 04:54:40 -0400
Subject: [PATCH 7989/8469] Ensure the module is named 'distutils'. Avoids
 errors when distutils.log and setuptools._distutils.log are two separate
 modules with separate state.

---
 setuptools/distutils_patch.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index 06eed82f0e..b2095fbac7 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -23,6 +23,7 @@ def clear_distutils():
 def ensure_local_distutils():
     clear_distutils()
     distutils = importlib.import_module('setuptools._distutils')
+    distutils.__name__ = 'distutils'
     sys.modules['distutils'] = distutils
 
     # sanity check that submodules load as expected

From 78928efa890109410b315b03a225c9fc5f041ff8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 05:03:35 -0400
Subject: [PATCH 7990/8469] =?UTF-8?q?Bump=20version:=2047.3.1=20=E2=86=92?=
 =?UTF-8?q?=2047.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2071.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2071.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9b106cfa3f..8870172755 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.3.1
+current_version = 47.3.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 799163edd3..a8ddb65752 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v47.3.2
+-------
+
+* #2071: Replaced references to the deprecated imp package with references to importlib
+
+
 v47.3.1
 -------
 
diff --git a/changelog.d/2071.misc.rst b/changelog.d/2071.misc.rst
deleted file mode 100644
index eb36480caa..0000000000
--- a/changelog.d/2071.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replaced references to the deprecated imp package with references to importlib
diff --git a/setup.cfg b/setup.cfg
index f23714b659..cd62393c52 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.3.1
+version = 47.3.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From ca0065fb62c1728cb42b86ae79375533856d2248 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 05:13:12 -0400
Subject: [PATCH 7991/8469] Update changelog.

---
 changelog.d/2143.breaking.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2143.breaking.rst b/changelog.d/2143.breaking.rst
index 29030b3210..244a698942 100644
--- a/changelog.d/2143.breaking.rst
+++ b/changelog.d/2143.breaking.rst
@@ -1 +1 @@
-Setuptools adopts distutils from the standard library as a top-level ``distutils`` package and no longer depends on distutils in the standard library. This new ``distutils`` package will be masked by ``distutils`` in the standard library unless that library has been stripped by a downstream package manager or gets removed in a future version. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.
+Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.

From 776fa9ffa471863f8d9502ca95872099394c506c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 11:07:49 -0400
Subject: [PATCH 7992/8469] =?UTF-8?q?Bump=20version:=2047.3.2=20=E2=86=92?=
 =?UTF-8?q?=2048.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 6 ++++++
 changelog.d/2143.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2143.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8870172755..bee22c9e0e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.3.2
+current_version = 48.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index a8ddb65752..d653d88920 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v48.0.0
+-------
+
+* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.
+
+
 v47.3.2
 -------
 
diff --git a/changelog.d/2143.breaking.rst b/changelog.d/2143.breaking.rst
deleted file mode 100644
index 244a698942..0000000000
--- a/changelog.d/2143.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.
diff --git a/setup.cfg b/setup.cfg
index cd62393c52..05638dbc17 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.3.2
+version = 48.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 08e858804d6ef515b3bcea85e1b6e25a40487986 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 12:12:23 -0400
Subject: [PATCH 7993/8469] Update changelog.

---
 changelog.d/2137.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2137.change.rst

diff --git a/changelog.d/2137.change.rst b/changelog.d/2137.change.rst
new file mode 100644
index 0000000000..fb5f507544
--- /dev/null
+++ b/changelog.d/2137.change.rst
@@ -0,0 +1 @@
+Removed (private) pkg_resources.RequirementParseError, now replaced by packaging.requirements.InvalidRequirement. Kept the name for compatibility, but users should catch InvalidRequirement instead.

From 9372bf7d7f63136758196dd86688f00602b7a494 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 12:55:46 -0400
Subject: [PATCH 7994/8469] Keep the full path for each entry when enumerating
 entries for a candidate path.

---
 pkg_resources/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3c826eb0b8..5df23e5b30 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2057,7 +2057,10 @@ def find_on_path(importer, path_item, only=False):
         )
         return
 
-    entries = safe_listdir(path_item)
+    entries = (
+        os.path.join(path_item, child)
+        for child in safe_listdir(path_item)
+    )
 
     # for performance, before sorting by version,
     # screen entries for only those that will yield

From c30aca86261cac34b60e679a1ee430dbc968582c Mon Sep 17 00:00:00 2001
From: Omer Ozarslan <omerfaruko@gmail.com>
Date: Thu, 4 Jun 2020 11:49:32 -0500
Subject: [PATCH 7995/8469] Update vendor packaging in pkg_resources to v19.2

---
 pkg_resources/_vendor/packaging/__about__.py  |  14 +-
 pkg_resources/_vendor/packaging/__init__.py   |  20 +-
 pkg_resources/_vendor/packaging/_compat.py    |   7 +-
 .../_vendor/packaging/_structures.py          |   4 +-
 pkg_resources/_vendor/packaging/markers.py    |  91 ++--
 .../_vendor/packaging/requirements.py         |  41 +-
 pkg_resources/_vendor/packaging/specifiers.py |  71 +--
 pkg_resources/_vendor/packaging/tags.py       | 404 ++++++++++++++++++
 pkg_resources/_vendor/packaging/utils.py      |  43 ++
 pkg_resources/_vendor/packaging/version.py    | 149 ++++---
 pkg_resources/_vendor/vendored.txt            |   2 +-
 11 files changed, 660 insertions(+), 186 deletions(-)
 create mode 100644 pkg_resources/_vendor/packaging/tags.py

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index 95d330ef82..dc95138d04 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -4,18 +4,24 @@
 from __future__ import absolute_import, division, print_function
 
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
 ]
 
 __title__ = "packaging"
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "16.8"
+__version__ = "19.2"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
 __license__ = "BSD or Apache License, Version 2.0"
-__copyright__ = "Copyright 2014-2016 %s" % __author__
+__copyright__ = "Copyright 2014-2019 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py
index 5ee6220203..a0cf67df52 100644
--- a/pkg_resources/_vendor/packaging/__init__.py
+++ b/pkg_resources/_vendor/packaging/__init__.py
@@ -4,11 +4,23 @@
 from __future__ import absolute_import, division, print_function
 
 from .__about__ import (
-    __author__, __copyright__, __email__, __license__, __summary__, __title__,
-    __uri__, __version__
+    __author__,
+    __copyright__,
+    __email__,
+    __license__,
+    __summary__,
+    __title__,
+    __uri__,
+    __version__,
 )
 
 __all__ = [
-    "__title__", "__summary__", "__uri__", "__version__", "__author__",
-    "__email__", "__license__", "__copyright__",
+    "__title__",
+    "__summary__",
+    "__uri__",
+    "__version__",
+    "__author__",
+    "__email__",
+    "__license__",
+    "__copyright__",
 ]
diff --git a/pkg_resources/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
index 210bb80b7e..25da473c19 100644
--- a/pkg_resources/_vendor/packaging/_compat.py
+++ b/pkg_resources/_vendor/packaging/_compat.py
@@ -12,9 +12,9 @@
 # flake8: noqa
 
 if PY3:
-    string_types = str,
+    string_types = (str,)
 else:
-    string_types = basestring,
+    string_types = (basestring,)
 
 
 def with_metaclass(meta, *bases):
@@ -27,4 +27,5 @@ def with_metaclass(meta, *bases):
     class metaclass(meta):
         def __new__(cls, name, this_bases, d):
             return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
+
+    return type.__new__(metaclass, "temporary_class", (), {})
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
index ccc27861c3..68dcca634d 100644
--- a/pkg_resources/_vendor/packaging/_structures.py
+++ b/pkg_resources/_vendor/packaging/_structures.py
@@ -5,7 +5,6 @@
 
 
 class Infinity(object):
-
     def __repr__(self):
         return "Infinity"
 
@@ -33,11 +32,11 @@ def __ge__(self, other):
     def __neg__(self):
         return NegativeInfinity
 
+
 Infinity = Infinity()
 
 
 class NegativeInfinity(object):
-
     def __repr__(self):
         return "-Infinity"
 
@@ -65,4 +64,5 @@ def __ge__(self, other):
     def __neg__(self):
         return Infinity
 
+
 NegativeInfinity = NegativeInfinity()
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index 892e578edd..733123fb32 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -17,8 +17,11 @@
 
 
 __all__ = [
-    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
-    "Marker", "default_environment",
+    "InvalidMarker",
+    "UndefinedComparison",
+    "UndefinedEnvironmentName",
+    "Marker",
+    "default_environment",
 ]
 
 
@@ -42,7 +45,6 @@ class UndefinedEnvironmentName(ValueError):
 
 
 class Node(object):
-
     def __init__(self, value):
         self.value = value
 
@@ -57,62 +59,52 @@ def serialize(self):
 
 
 class Variable(Node):
-
     def serialize(self):
         return str(self)
 
 
 class Value(Node):
-
     def serialize(self):
         return '"{0}"'.format(self)
 
 
 class Op(Node):
-
     def serialize(self):
         return str(self)
 
 
 VARIABLE = (
-    L("implementation_version") |
-    L("platform_python_implementation") |
-    L("implementation_name") |
-    L("python_full_version") |
-    L("platform_release") |
-    L("platform_version") |
-    L("platform_machine") |
-    L("platform_system") |
-    L("python_version") |
-    L("sys_platform") |
-    L("os_name") |
-    L("os.name") |  # PEP-345
-    L("sys.platform") |  # PEP-345
-    L("platform.version") |  # PEP-345
-    L("platform.machine") |  # PEP-345
-    L("platform.python_implementation") |  # PEP-345
-    L("python_implementation") |  # undocumented setuptools legacy
-    L("extra")
+    L("implementation_version")
+    | L("platform_python_implementation")
+    | L("implementation_name")
+    | L("python_full_version")
+    | L("platform_release")
+    | L("platform_version")
+    | L("platform_machine")
+    | L("platform_system")
+    | L("python_version")
+    | L("sys_platform")
+    | L("os_name")
+    | L("os.name")
+    | L("sys.platform")  # PEP-345
+    | L("platform.version")  # PEP-345
+    | L("platform.machine")  # PEP-345
+    | L("platform.python_implementation")  # PEP-345
+    | L("python_implementation")  # PEP-345
+    | L("extra")  # undocumented setuptools legacy
 )
 ALIASES = {
-    'os.name': 'os_name',
-    'sys.platform': 'sys_platform',
-    'platform.version': 'platform_version',
-    'platform.machine': 'platform_machine',
-    'platform.python_implementation': 'platform_python_implementation',
-    'python_implementation': 'platform_python_implementation'
+    "os.name": "os_name",
+    "sys.platform": "sys_platform",
+    "platform.version": "platform_version",
+    "platform.machine": "platform_machine",
+    "platform.python_implementation": "platform_python_implementation",
+    "python_implementation": "platform_python_implementation",
 }
 VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
 
 VERSION_CMP = (
-    L("===") |
-    L("==") |
-    L(">=") |
-    L("<=") |
-    L("!=") |
-    L("~=") |
-    L(">") |
-    L("<")
+    L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<")
 )
 
 MARKER_OP = VERSION_CMP | L("not in") | L("in")
@@ -152,8 +144,11 @@ def _format_marker(marker, first=True):
     # where the single item is itself it's own list. In that case we want skip
     # the rest of this function so that we don't get extraneous () on the
     # outside.
-    if (isinstance(marker, list) and len(marker) == 1 and
-            isinstance(marker[0], (list, tuple))):
+    if (
+        isinstance(marker, list)
+        and len(marker) == 1
+        and isinstance(marker[0], (list, tuple))
+    ):
         return _format_marker(marker[0])
 
     if isinstance(marker, list):
@@ -239,20 +234,20 @@ def _evaluate_markers(markers, environment):
 
 
 def format_full_version(info):
-    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    version = "{0.major}.{0.minor}.{0.micro}".format(info)
     kind = info.releaselevel
-    if kind != 'final':
+    if kind != "final":
         version += kind[0] + str(info.serial)
     return version
 
 
 def default_environment():
-    if hasattr(sys, 'implementation'):
+    if hasattr(sys, "implementation"):
         iver = format_full_version(sys.implementation.version)
         implementation_name = sys.implementation.name
     else:
-        iver = '0'
-        implementation_name = ''
+        iver = "0"
+        implementation_name = ""
 
     return {
         "implementation_name": implementation_name,
@@ -264,19 +259,19 @@ def default_environment():
         "platform_version": platform.version(),
         "python_full_version": platform.python_version(),
         "platform_python_implementation": platform.python_implementation(),
-        "python_version": platform.python_version()[:3],
+        "python_version": ".".join(platform.python_version_tuple()[:2]),
         "sys_platform": sys.platform,
     }
 
 
 class Marker(object):
-
     def __init__(self, marker):
         try:
             self._markers = _coerce_parse_result(MARKER.parseString(marker))
         except ParseException as e:
             err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
-                marker, marker[e.loc:e.loc + 8])
+                marker, marker[e.loc : e.loc + 8]
+            )
             raise InvalidMarker(err_str)
 
     def __str__(self):
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 0c8c4a3852..c3424dcb64 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -38,8 +38,8 @@ class InvalidRequirement(ValueError):
 NAME = IDENTIFIER("name")
 EXTRA = IDENTIFIER
 
-URI = Regex(r'[^ ]+')("url")
-URL = (AT + URI)
+URI = Regex(r"[^ ]+")("url")
+URL = AT + URI
 
 EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
 EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
@@ -48,28 +48,31 @@ class InvalidRequirement(ValueError):
 VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
 
 VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
-VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
-                       joinString=",", adjacent=False)("_raw_spec")
+VERSION_MANY = Combine(
+    VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",", adjacent=False
+)("_raw_spec")
 _VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
-_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or "")
 
 VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
 VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
 
 MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
 MARKER_EXPR.setParseAction(
-    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+    lambda s, l, t: Marker(s[t._original_start : t._original_end])
 )
-MARKER_SEPERATOR = SEMICOLON
-MARKER = MARKER_SEPERATOR + MARKER_EXPR
+MARKER_SEPARATOR = SEMICOLON
+MARKER = MARKER_SEPARATOR + MARKER_EXPR
 
 VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
 URL_AND_MARKER = URL + Optional(MARKER)
 
-NAMED_REQUIREMENT = \
-    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
 
 REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+# pkg_resources.extern.pyparsing isn't thread safe during initialization, so we do it eagerly, see
+# issue #104
+REQUIREMENT.parseString("x[]")
 
 
 class Requirement(object):
@@ -90,15 +93,21 @@ def __init__(self, requirement_string):
             req = REQUIREMENT.parseString(requirement_string)
         except ParseException as e:
             raise InvalidRequirement(
-                "Invalid requirement, parse error at \"{0!r}\"".format(
-                    requirement_string[e.loc:e.loc + 8]))
+                'Parse error at "{0!r}": {1}'.format(
+                    requirement_string[e.loc : e.loc + 8], e.msg
+                )
+            )
 
         self.name = req.name
         if req.url:
             parsed_url = urlparse.urlparse(req.url)
-            if not (parsed_url.scheme and parsed_url.netloc) or (
-                    not parsed_url.scheme and not parsed_url.netloc):
-                raise InvalidRequirement("Invalid URL given")
+            if parsed_url.scheme == "file":
+                if urlparse.urlunparse(parsed_url) != req.url:
+                    raise InvalidRequirement("Invalid URL given")
+            elif not (parsed_url.scheme and parsed_url.netloc) or (
+                not parsed_url.scheme and not parsed_url.netloc
+            ):
+                raise InvalidRequirement("Invalid URL: {0}".format(req.url))
             self.url = req.url
         else:
             self.url = None
@@ -117,6 +126,8 @@ def __str__(self):
 
         if self.url:
             parts.append("@ {0}".format(self.url))
+            if self.marker:
+                parts.append(" ")
 
         if self.marker:
             parts.append("; {0}".format(self.marker))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 7f5a76cfd6..743576a080 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -19,7 +19,6 @@ class InvalidSpecifier(ValueError):
 
 
 class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
-
     @abc.abstractmethod
     def __str__(self):
         """
@@ -84,10 +83,7 @@ def __init__(self, spec="", prereleases=None):
         if not match:
             raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
 
-        self._spec = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
+        self._spec = (match.group("operator").strip(), match.group("version").strip())
 
         # Store whether or not this Specifier should accept prereleases
         self._prereleases = prereleases
@@ -99,11 +95,7 @@ def __repr__(self):
             else ""
         )
 
-        return "<{0}({1!r}{2})>".format(
-            self.__class__.__name__,
-            str(self),
-            pre,
-        )
+        return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre)
 
     def __str__(self):
         return "{0}{1}".format(*self._spec)
@@ -194,11 +186,12 @@ def filter(self, iterable, prereleases=None):
                 # If our version is a prerelease, and we were not set to allow
                 # prereleases, then we'll store it for later incase nothing
                 # else matches this specifier.
-                if (parsed_version.is_prerelease and not
-                        (prereleases or self.prereleases)):
+                if parsed_version.is_prerelease and not (
+                    prereleases or self.prereleases
+                ):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the begining.
+                # accepting prereleases from the beginning.
                 else:
                     yielded = True
                     yield version
@@ -213,8 +206,7 @@ def filter(self, iterable, prereleases=None):
 
 class LegacySpecifier(_IndividualSpecifier):
 
-    _regex_str = (
-        r"""
+    _regex_str = r"""
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
@@ -225,10 +217,8 @@ class LegacySpecifier(_IndividualSpecifier):
                       # them, and a comma since it's a version separator.
         )
         """
-    )
 
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "==": "equal",
@@ -269,13 +259,13 @@ def wrapped(self, prospective, spec):
         if not isinstance(prospective, Version):
             return False
         return fn(self, prospective, spec)
+
     return wrapped
 
 
 class Specifier(_IndividualSpecifier):
 
-    _regex_str = (
-        r"""
+    _regex_str = r"""
         (?P<operator>(~=|==|!=|<=|>=|<|>|===))
         (?P<version>
             (?:
@@ -367,10 +357,8 @@ class Specifier(_IndividualSpecifier):
             )
         )
         """
-    )
 
-    _regex = re.compile(
-        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     _operators = {
         "~=": "compatible",
@@ -397,8 +385,7 @@ def _compare_compatible(self, prospective, spec):
         prefix = ".".join(
             list(
                 itertools.takewhile(
-                    lambda x: (not x.startswith("post") and not
-                               x.startswith("dev")),
+                    lambda x: (not x.startswith("post") and not x.startswith("dev")),
                     _version_split(spec),
                 )
             )[:-1]
@@ -407,8 +394,9 @@ def _compare_compatible(self, prospective, spec):
         # Add the prefix notation to the end of our string
         prefix += ".*"
 
-        return (self._get_operator(">=")(prospective, spec) and
-                self._get_operator("==")(prospective, prefix))
+        return self._get_operator(">=")(prospective, spec) and self._get_operator("==")(
+            prospective, prefix
+        )
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
@@ -428,7 +416,7 @@ def _compare_equal(self, prospective, spec):
             # Shorten the prospective version to be the same length as the spec
             # so that we can determine if the specifier is a prefix of the
             # prospective version or not.
-            prospective = prospective[:len(spec)]
+            prospective = prospective[: len(spec)]
 
             # Pad out our two sides with zeros so that they both equal the same
             # length.
@@ -503,7 +491,7 @@ def _compare_greater_than(self, prospective, spec):
                 return False
 
         # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is techincally greater than, to match.
+        # in the specifier, which is technically greater than, to match.
         if prospective.local is not None:
             if Version(prospective.base_version) == Version(spec.base_version):
                 return False
@@ -567,27 +555,17 @@ def _pad_version(left, right):
     right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
 
     # Get the rest of our versions
-    left_split.append(left[len(left_split[0]):])
-    right_split.append(right[len(right_split[0]):])
+    left_split.append(left[len(left_split[0]) :])
+    right_split.append(right[len(right_split[0]) :])
 
     # Insert our padding
-    left_split.insert(
-        1,
-        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
-    )
-    right_split.insert(
-        1,
-        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
-    )
+    left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
+    right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
 
-    return (
-        list(itertools.chain(*left_split)),
-        list(itertools.chain(*right_split)),
-    )
+    return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split)))
 
 
 class SpecifierSet(BaseSpecifier):
-
     def __init__(self, specifiers="", prereleases=None):
         # Split on , to break each indidivual specifier into it's own item, and
         # strip each item to remove leading/trailing whitespace.
@@ -721,10 +699,7 @@ def contains(self, item, prereleases=None):
         # given version is contained within all of them.
         # Note: This use of all() here means that an empty set of specifiers
         #       will always return True, this is an explicit design decision.
-        return all(
-            s.contains(item, prereleases=prereleases)
-            for s in self._specs
-        )
+        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
     def filter(self, iterable, prereleases=None):
         # Determine if we're forcing a prerelease or not, if we're not forcing
diff --git a/pkg_resources/_vendor/packaging/tags.py b/pkg_resources/_vendor/packaging/tags.py
new file mode 100644
index 0000000000..ec9942f0f6
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/tags.py
@@ -0,0 +1,404 @@
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+
+from __future__ import absolute_import
+
+import distutils.util
+
+try:
+    from importlib.machinery import EXTENSION_SUFFIXES
+except ImportError:  # pragma: no cover
+    import imp
+
+    EXTENSION_SUFFIXES = [x[0] for x in imp.get_suffixes()]
+    del imp
+import platform
+import re
+import sys
+import sysconfig
+import warnings
+
+
+INTERPRETER_SHORT_NAMES = {
+    "python": "py",  # Generic.
+    "cpython": "cp",
+    "pypy": "pp",
+    "ironpython": "ip",
+    "jython": "jy",
+}
+
+
+_32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
+
+
+class Tag(object):
+
+    __slots__ = ["_interpreter", "_abi", "_platform"]
+
+    def __init__(self, interpreter, abi, platform):
+        self._interpreter = interpreter.lower()
+        self._abi = abi.lower()
+        self._platform = platform.lower()
+
+    @property
+    def interpreter(self):
+        return self._interpreter
+
+    @property
+    def abi(self):
+        return self._abi
+
+    @property
+    def platform(self):
+        return self._platform
+
+    def __eq__(self, other):
+        return (
+            (self.platform == other.platform)
+            and (self.abi == other.abi)
+            and (self.interpreter == other.interpreter)
+        )
+
+    def __hash__(self):
+        return hash((self._interpreter, self._abi, self._platform))
+
+    def __str__(self):
+        return "{}-{}-{}".format(self._interpreter, self._abi, self._platform)
+
+    def __repr__(self):
+        return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
+
+
+def parse_tag(tag):
+    tags = set()
+    interpreters, abis, platforms = tag.split("-")
+    for interpreter in interpreters.split("."):
+        for abi in abis.split("."):
+            for platform_ in platforms.split("."):
+                tags.add(Tag(interpreter, abi, platform_))
+    return frozenset(tags)
+
+
+def _normalize_string(string):
+    return string.replace(".", "_").replace("-", "_")
+
+
+def _cpython_interpreter(py_version):
+    # TODO: Is using py_version_nodot for interpreter version critical?
+    return "cp{major}{minor}".format(major=py_version[0], minor=py_version[1])
+
+
+def _cpython_abis(py_version):
+    abis = []
+    version = "{}{}".format(*py_version[:2])
+    debug = pymalloc = ucs4 = ""
+    with_debug = sysconfig.get_config_var("Py_DEBUG")
+    has_refcount = hasattr(sys, "gettotalrefcount")
+    # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
+    # extension modules is the best option.
+    # https://github.com/pypa/pip/issues/3383#issuecomment-173267692
+    has_ext = "_d.pyd" in EXTENSION_SUFFIXES
+    if with_debug or (with_debug is None and (has_refcount or has_ext)):
+        debug = "d"
+    if py_version < (3, 8):
+        with_pymalloc = sysconfig.get_config_var("WITH_PYMALLOC")
+        if with_pymalloc or with_pymalloc is None:
+            pymalloc = "m"
+        if py_version < (3, 3):
+            unicode_size = sysconfig.get_config_var("Py_UNICODE_SIZE")
+            if unicode_size == 4 or (
+                unicode_size is None and sys.maxunicode == 0x10FFFF
+            ):
+                ucs4 = "u"
+    elif debug:
+        # Debug builds can also load "normal" extension modules.
+        # We can also assume no UCS-4 or pymalloc requirement.
+        abis.append("cp{version}".format(version=version))
+    abis.insert(
+        0,
+        "cp{version}{debug}{pymalloc}{ucs4}".format(
+            version=version, debug=debug, pymalloc=pymalloc, ucs4=ucs4
+        ),
+    )
+    return abis
+
+
+def _cpython_tags(py_version, interpreter, abis, platforms):
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
+    for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
+        yield tag
+    for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
+        yield tag
+    # PEP 384 was first implemented in Python 3.2.
+    for minor_version in range(py_version[1] - 1, 1, -1):
+        for platform_ in platforms:
+            interpreter = "cp{major}{minor}".format(
+                major=py_version[0], minor=minor_version
+            )
+            yield Tag(interpreter, "abi3", platform_)
+
+
+def _pypy_interpreter():
+    return "pp{py_major}{pypy_major}{pypy_minor}".format(
+        py_major=sys.version_info[0],
+        pypy_major=sys.pypy_version_info.major,
+        pypy_minor=sys.pypy_version_info.minor,
+    )
+
+
+def _generic_abi():
+    abi = sysconfig.get_config_var("SOABI")
+    if abi:
+        return _normalize_string(abi)
+    else:
+        return "none"
+
+
+def _pypy_tags(py_version, interpreter, abi, platforms):
+    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
+        yield tag
+    for tag in (Tag(interpreter, "none", platform) for platform in platforms):
+        yield tag
+
+
+def _generic_tags(interpreter, py_version, abi, platforms):
+    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
+        yield tag
+    if abi != "none":
+        tags = (Tag(interpreter, "none", platform_) for platform_ in platforms)
+        for tag in tags:
+            yield tag
+
+
+def _py_interpreter_range(py_version):
+    """
+    Yield Python versions in descending order.
+
+    After the latest version, the major-only version will be yielded, and then
+    all following versions up to 'end'.
+    """
+    yield "py{major}{minor}".format(major=py_version[0], minor=py_version[1])
+    yield "py{major}".format(major=py_version[0])
+    for minor in range(py_version[1] - 1, -1, -1):
+        yield "py{major}{minor}".format(major=py_version[0], minor=minor)
+
+
+def _independent_tags(interpreter, py_version, platforms):
+    """
+    Return the sequence of tags that are consistent across implementations.
+
+    The tags consist of:
+    - py*-none-<platform>
+    - <interpreter>-none-any
+    - py*-none-any
+    """
+    for version in _py_interpreter_range(py_version):
+        for platform_ in platforms:
+            yield Tag(version, "none", platform_)
+    yield Tag(interpreter, "none", "any")
+    for version in _py_interpreter_range(py_version):
+        yield Tag(version, "none", "any")
+
+
+def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
+    if not is_32bit:
+        return arch
+
+    if arch.startswith("ppc"):
+        return "ppc"
+
+    return "i386"
+
+
+def _mac_binary_formats(version, cpu_arch):
+    formats = [cpu_arch]
+    if cpu_arch == "x86_64":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat64", "fat32"])
+
+    elif cpu_arch == "i386":
+        if version < (10, 4):
+            return []
+        formats.extend(["intel", "fat32", "fat"])
+
+    elif cpu_arch == "ppc64":
+        # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
+        if version > (10, 5) or version < (10, 4):
+            return []
+        formats.append("fat64")
+
+    elif cpu_arch == "ppc":
+        if version > (10, 6):
+            return []
+        formats.extend(["fat32", "fat"])
+
+    formats.append("universal")
+    return formats
+
+
+def _mac_platforms(version=None, arch=None):
+    version_str, _, cpu_arch = platform.mac_ver()
+    if version is None:
+        version = tuple(map(int, version_str.split(".")[:2]))
+    if arch is None:
+        arch = _mac_arch(cpu_arch)
+    platforms = []
+    for minor_version in range(version[1], -1, -1):
+        compat_version = version[0], minor_version
+        binary_formats = _mac_binary_formats(compat_version, arch)
+        for binary_format in binary_formats:
+            platforms.append(
+                "macosx_{major}_{minor}_{binary_format}".format(
+                    major=compat_version[0],
+                    minor=compat_version[1],
+                    binary_format=binary_format,
+                )
+            )
+    return platforms
+
+
+# From PEP 513.
+def _is_manylinux_compatible(name, glibc_version):
+    # Check for presence of _manylinux module.
+    try:
+        import _manylinux
+
+        return bool(getattr(_manylinux, name + "_compatible"))
+    except (ImportError, AttributeError):
+        # Fall through to heuristic check below.
+        pass
+
+    return _have_compatible_glibc(*glibc_version)
+
+
+def _glibc_version_string():
+    # Returns glibc version string, or None if not using glibc.
+    import ctypes
+
+    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
+    # manpage says, "If filename is NULL, then the returned handle is for the
+    # main program". This way we can let the linker do the work to figure out
+    # which libc our process is actually using.
+    process_namespace = ctypes.CDLL(None)
+    try:
+        gnu_get_libc_version = process_namespace.gnu_get_libc_version
+    except AttributeError:
+        # Symbol doesn't exist -> therefore, we are not linked to
+        # glibc.
+        return None
+
+    # Call gnu_get_libc_version, which returns a string like "2.5"
+    gnu_get_libc_version.restype = ctypes.c_char_p
+    version_str = gnu_get_libc_version()
+    # py2 / py3 compatibility:
+    if not isinstance(version_str, str):
+        version_str = version_str.decode("ascii")
+
+    return version_str
+
+
+# Separated out from have_compatible_glibc for easier unit testing.
+def _check_glibc_version(version_str, required_major, minimum_minor):
+    # Parse string and check against requested version.
+    #
+    # We use a regexp instead of str.split because we want to discard any
+    # random junk that might come after the minor version -- this might happen
+    # in patched/forked versions of glibc (e.g. Linaro's version of glibc
+    # uses version strings like "2.20-2014.11"). See gh-3588.
+    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
+    if not m:
+        warnings.warn(
+            "Expected glibc version with 2 components major.minor,"
+            " got: %s" % version_str,
+            RuntimeWarning,
+        )
+        return False
+    return (
+        int(m.group("major")) == required_major
+        and int(m.group("minor")) >= minimum_minor
+    )
+
+
+def _have_compatible_glibc(required_major, minimum_minor):
+    version_str = _glibc_version_string()
+    if version_str is None:
+        return False
+    return _check_glibc_version(version_str, required_major, minimum_minor)
+
+
+def _linux_platforms(is_32bit=_32_BIT_INTERPRETER):
+    linux = _normalize_string(distutils.util.get_platform())
+    if linux == "linux_x86_64" and is_32bit:
+        linux = "linux_i686"
+    manylinux_support = (
+        ("manylinux2014", (2, 17)),  # CentOS 7 w/ glibc 2.17 (PEP 599)
+        ("manylinux2010", (2, 12)),  # CentOS 6 w/ glibc 2.12 (PEP 571)
+        ("manylinux1", (2, 5)),  # CentOS 5 w/ glibc 2.5 (PEP 513)
+    )
+    manylinux_support_iter = iter(manylinux_support)
+    for name, glibc_version in manylinux_support_iter:
+        if _is_manylinux_compatible(name, glibc_version):
+            platforms = [linux.replace("linux", name)]
+            break
+    else:
+        platforms = []
+    # Support for a later manylinux implies support for an earlier version.
+    platforms += [linux.replace("linux", name) for name, _ in manylinux_support_iter]
+    platforms.append(linux)
+    return platforms
+
+
+def _generic_platforms():
+    platform = _normalize_string(distutils.util.get_platform())
+    return [platform]
+
+
+def _interpreter_name():
+    name = platform.python_implementation().lower()
+    return INTERPRETER_SHORT_NAMES.get(name) or name
+
+
+def _generic_interpreter(name, py_version):
+    version = sysconfig.get_config_var("py_version_nodot")
+    if not version:
+        version = "".join(map(str, py_version[:2]))
+    return "{name}{version}".format(name=name, version=version)
+
+
+def sys_tags():
+    """
+    Returns the sequence of tag triples for the running interpreter.
+
+    The order of the sequence corresponds to priority order for the
+    interpreter, from most to least important.
+    """
+    py_version = sys.version_info[:2]
+    interpreter_name = _interpreter_name()
+    if platform.system() == "Darwin":
+        platforms = _mac_platforms()
+    elif platform.system() == "Linux":
+        platforms = _linux_platforms()
+    else:
+        platforms = _generic_platforms()
+
+    if interpreter_name == "cp":
+        interpreter = _cpython_interpreter(py_version)
+        abis = _cpython_abis(py_version)
+        for tag in _cpython_tags(py_version, interpreter, abis, platforms):
+            yield tag
+    elif interpreter_name == "pp":
+        interpreter = _pypy_interpreter()
+        abi = _generic_abi()
+        for tag in _pypy_tags(py_version, interpreter, abi, platforms):
+            yield tag
+    else:
+        interpreter = _generic_interpreter(interpreter_name, py_version)
+        abi = _generic_abi()
+        for tag in _generic_tags(interpreter, py_version, abi, platforms):
+            yield tag
+    for tag in _independent_tags(interpreter, py_version, platforms):
+        yield tag
diff --git a/pkg_resources/_vendor/packaging/utils.py b/pkg_resources/_vendor/packaging/utils.py
index 942387cef5..8841878693 100644
--- a/pkg_resources/_vendor/packaging/utils.py
+++ b/pkg_resources/_vendor/packaging/utils.py
@@ -5,6 +5,8 @@
 
 import re
 
+from .version import InvalidVersion, Version
+
 
 _canonicalize_regex = re.compile(r"[-_.]+")
 
@@ -12,3 +14,44 @@
 def canonicalize_name(name):
     # This is taken from PEP 503.
     return _canonicalize_regex.sub("-", name).lower()
+
+
+def canonicalize_version(version):
+    """
+    This is very similar to Version.__str__, but has one subtle differences
+    with the way it handles the release segment.
+    """
+
+    try:
+        version = Version(version)
+    except InvalidVersion:
+        # Legacy versions cannot be normalized
+        return version
+
+    parts = []
+
+    # Epoch
+    if version.epoch != 0:
+        parts.append("{0}!".format(version.epoch))
+
+    # Release segment
+    # NB: This strips trailing '.0's to normalize
+    parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in version.release)))
+
+    # Pre-release
+    if version.pre is not None:
+        parts.append("".join(str(x) for x in version.pre))
+
+    # Post-release
+    if version.post is not None:
+        parts.append(".post{0}".format(version.post))
+
+    # Development release
+    if version.dev is not None:
+        parts.append(".dev{0}".format(version.dev))
+
+    # Local version segment
+    if version.local is not None:
+        parts.append("+{0}".format(version.local))
+
+    return "".join(parts)
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
index 83b5ee8c5e..95157a1f78 100644
--- a/pkg_resources/_vendor/packaging/version.py
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -10,14 +10,11 @@
 from ._structures import Infinity
 
 
-__all__ = [
-    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
-]
+__all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
 
 
 _Version = collections.namedtuple(
-    "_Version",
-    ["epoch", "release", "dev", "pre", "post", "local"],
+    "_Version", ["epoch", "release", "dev", "pre", "post", "local"]
 )
 
 
@@ -40,7 +37,6 @@ class InvalidVersion(ValueError):
 
 
 class _BaseVersion(object):
-
     def __hash__(self):
         return hash(self._key)
 
@@ -70,7 +66,6 @@ def _compare(self, other, method):
 
 
 class LegacyVersion(_BaseVersion):
-
     def __init__(self, version):
         self._version = str(version)
         self._key = _legacy_cmpkey(self._version)
@@ -89,6 +84,26 @@ def public(self):
     def base_version(self):
         return self._version
 
+    @property
+    def epoch(self):
+        return -1
+
+    @property
+    def release(self):
+        return None
+
+    @property
+    def pre(self):
+        return None
+
+    @property
+    def post(self):
+        return None
+
+    @property
+    def dev(self):
+        return None
+
     @property
     def local(self):
         return None
@@ -101,13 +116,19 @@ def is_prerelease(self):
     def is_postrelease(self):
         return False
 
+    @property
+    def is_devrelease(self):
+        return False
 
-_legacy_version_component_re = re.compile(
-    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
-)
+
+_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
 
 _legacy_version_replacement_map = {
-    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+    "pre": "c",
+    "preview": "c",
+    "-": "final-",
+    "rc": "c",
+    "dev": "@",
 }
 
 
@@ -154,6 +175,7 @@ def _legacy_cmpkey(version):
 
     return epoch, parts
 
+
 # Deliberately not anchored to the start and end of the string, to make it
 # easier for 3rd party code to reuse
 VERSION_PATTERN = r"""
@@ -190,10 +212,7 @@ def _legacy_cmpkey(version):
 
 class Version(_BaseVersion):
 
-    _regex = re.compile(
-        r"^\s*" + VERSION_PATTERN + r"\s*$",
-        re.VERBOSE | re.IGNORECASE,
-    )
+    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     def __init__(self, version):
         # Validate the version and parse it into pieces
@@ -205,18 +224,11 @@ def __init__(self, version):
         self._version = _Version(
             epoch=int(match.group("epoch")) if match.group("epoch") else 0,
             release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(
-                match.group("pre_l"),
-                match.group("pre_n"),
-            ),
+            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
             post=_parse_letter_version(
-                match.group("post_l"),
-                match.group("post_n1") or match.group("post_n2"),
-            ),
-            dev=_parse_letter_version(
-                match.group("dev_l"),
-                match.group("dev_n"),
+                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
             ),
+            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
             local=_parse_local_version(match.group("local")),
         )
 
@@ -237,32 +249,57 @@ def __str__(self):
         parts = []
 
         # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
+        parts.append(".".join(str(x) for x in self.release))
 
         # Pre-release
-        if self._version.pre is not None:
-            parts.append("".join(str(x) for x in self._version.pre))
+        if self.pre is not None:
+            parts.append("".join(str(x) for x in self.pre))
 
         # Post-release
-        if self._version.post is not None:
-            parts.append(".post{0}".format(self._version.post[1]))
+        if self.post is not None:
+            parts.append(".post{0}".format(self.post))
 
         # Development release
-        if self._version.dev is not None:
-            parts.append(".dev{0}".format(self._version.dev[1]))
+        if self.dev is not None:
+            parts.append(".dev{0}".format(self.dev))
 
         # Local version segment
-        if self._version.local is not None:
-            parts.append(
-                "+{0}".format(".".join(str(x) for x in self._version.local))
-            )
+        if self.local is not None:
+            parts.append("+{0}".format(self.local))
 
         return "".join(parts)
 
+    @property
+    def epoch(self):
+        return self._version.epoch
+
+    @property
+    def release(self):
+        return self._version.release
+
+    @property
+    def pre(self):
+        return self._version.pre
+
+    @property
+    def post(self):
+        return self._version.post[1] if self._version.post else None
+
+    @property
+    def dev(self):
+        return self._version.dev[1] if self._version.dev else None
+
+    @property
+    def local(self):
+        if self._version.local:
+            return ".".join(str(x) for x in self._version.local)
+        else:
+            return None
+
     @property
     def public(self):
         return str(self).split("+", 1)[0]
@@ -272,27 +309,25 @@ def base_version(self):
         parts = []
 
         # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
+        if self.epoch != 0:
+            parts.append("{0}!".format(self.epoch))
 
         # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
+        parts.append(".".join(str(x) for x in self.release))
 
         return "".join(parts)
 
-    @property
-    def local(self):
-        version_string = str(self)
-        if "+" in version_string:
-            return version_string.split("+", 1)[1]
-
     @property
     def is_prerelease(self):
-        return bool(self._version.dev or self._version.pre)
+        return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self):
-        return bool(self._version.post)
+        return self.post is not None
+
+    @property
+    def is_devrelease(self):
+        return self.dev is not None
 
 
 def _parse_letter_version(letter, number):
@@ -326,7 +361,7 @@ def _parse_letter_version(letter, number):
         return letter, int(number)
 
 
-_local_version_seperators = re.compile(r"[\._-]")
+_local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local):
@@ -336,7 +371,7 @@ def _parse_local_version(local):
     if local is not None:
         return tuple(
             part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_seperators.split(local)
+            for part in _local_version_separators.split(local)
         )
 
 
@@ -347,12 +382,7 @@ def _cmpkey(epoch, release, pre, post, dev, local):
     # re-reverse it back into the correct order and make it a tuple and use
     # that for our sorting key.
     release = tuple(
-        reversed(list(
-            itertools.dropwhile(
-                lambda x: x == 0,
-                reversed(release),
-            )
-        ))
+        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
     )
 
     # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
@@ -385,9 +415,6 @@ def _cmpkey(epoch, release, pre, post, dev, local):
         # - Numeric segments sort numerically
         # - Shorter versions sort before longer versions when the prefixes
         #   match exactly
-        local = tuple(
-            (i, "") if isinstance(i, int) else (-Infinity, i)
-            for i in local
-        )
+        local = tuple((i, "") if isinstance(i, int) else (-Infinity, i) for i in local)
 
     return epoch, release, pre, post, dev, local
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 7f4f40879b..f581a62349 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==16.8
+packaging==19.2
 pyparsing==2.2.1
 six==1.10.0
 appdirs==1.4.3

From d24eb7fd34594be65ab6bf1b08ac6ffffa4a16f2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 14:35:52 -0400
Subject: [PATCH 7996/8469] Update changelog.

---
 changelog.d/2180.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2180.change.rst

diff --git a/changelog.d/2180.change.rst b/changelog.d/2180.change.rst
new file mode 100644
index 0000000000..0e660cd931
--- /dev/null
+++ b/changelog.d/2180.change.rst
@@ -0,0 +1 @@
+Update vendored packaging in pkg_resources to 19.2.

From e7e5817e442b01cb199bfc75c7098fb198fdc3ba Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 15:35:32 -0400
Subject: [PATCH 7997/8469] =?UTF-8?q?Bump=20version:=2048.0.0=20=E2=86=92?=
 =?UTF-8?q?=2049.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 9 +++++++++
 changelog.d/2137.change.rst   | 1 -
 changelog.d/2165.breaking.rst | 1 -
 changelog.d/2180.change.rst   | 1 -
 changelog.d/2199.misc.rst     | 1 -
 setup.cfg                     | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/2137.change.rst
 delete mode 100644 changelog.d/2165.breaking.rst
 delete mode 100644 changelog.d/2180.change.rst
 delete mode 100644 changelog.d/2199.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index bee22c9e0e..05ff5f1881 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 48.0.0
+current_version = 49.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index d653d88920..bd67931d71 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v49.0.0
+-------
+
+* #2165: Setuptools no longer installs a site.py file during easy_install or develop installs. As a result, .eggs on PYTHONPATH will no longer take precedence over other packages on sys.path. If this issue affects your production environment, please reach out to the maintainers at #2165.
+* #2137: Removed (private) pkg_resources.RequirementParseError, now replaced by packaging.requirements.InvalidRequirement. Kept the name for compatibility, but users should catch InvalidRequirement instead.
+* #2180: Update vendored packaging in pkg_resources to 19.2.
+* #2199: Fix exception causes all over the codebase by using ``raise new_exception from old_exception``
+
+
 v48.0.0
 -------
 
diff --git a/changelog.d/2137.change.rst b/changelog.d/2137.change.rst
deleted file mode 100644
index fb5f507544..0000000000
--- a/changelog.d/2137.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed (private) pkg_resources.RequirementParseError, now replaced by packaging.requirements.InvalidRequirement. Kept the name for compatibility, but users should catch InvalidRequirement instead.
diff --git a/changelog.d/2165.breaking.rst b/changelog.d/2165.breaking.rst
deleted file mode 100644
index a9b598b937..0000000000
--- a/changelog.d/2165.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools no longer installs a site.py file during easy_install or develop installs. As a result, .eggs on PYTHONPATH will no longer take precedence over other packages on sys.path. If this issue affects your production environment, please reach out to the maintainers at #2165.
diff --git a/changelog.d/2180.change.rst b/changelog.d/2180.change.rst
deleted file mode 100644
index 0e660cd931..0000000000
--- a/changelog.d/2180.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update vendored packaging in pkg_resources to 19.2.
diff --git a/changelog.d/2199.misc.rst b/changelog.d/2199.misc.rst
deleted file mode 100644
index f795256bf0..0000000000
--- a/changelog.d/2199.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix exception causes all over the codebase by using ``raise new_exception from old_exception``
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 05638dbc17..d73241861e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 48.0.0
+version = 49.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 58cc03759ab225bfa9767cd04caf69ca014cd353 Mon Sep 17 00:00:00 2001
From: cajhne <cajhne@gmail.com>
Date: Fri, 3 Jul 2020 21:30:43 +0100
Subject: [PATCH 7998/8469] Add logo resources

---
 docs/logo/README.md                           |  10 +
 docs/logo/josefinsans/.uuid                   |   1 +
 docs/logo/josefinsans/DESCRIPTION.en_us.html  |   9 +
 docs/logo/josefinsans/JosefinSans-Bold.ttf    | Bin 0 -> 86300 bytes
 .../josefinsans/JosefinSans-BoldItalic.ttf    | Bin 0 -> 83100 bytes
 docs/logo/josefinsans/JosefinSans-Italic.ttf  | Bin 0 -> 84916 bytes
 docs/logo/josefinsans/JosefinSans-Light.ttf   | Bin 0 -> 87320 bytes
 .../josefinsans/JosefinSans-LightItalic.ttf   | Bin 0 -> 85684 bytes
 docs/logo/josefinsans/JosefinSans-Regular.ttf | Bin 0 -> 87260 bytes
 .../logo/josefinsans/JosefinSans-SemiBold.ttf | Bin 0 -> 87880 bytes
 .../JosefinSans-SemiBoldItalic.ttf            | Bin 0 -> 84824 bytes
 docs/logo/josefinsans/JosefinSans-Thin.ttf    | Bin 0 -> 88088 bytes
 .../josefinsans/JosefinSans-ThinItalic.ttf    | Bin 0 -> 85420 bytes
 docs/logo/josefinsans/METADATA.pb             |  99 ++++++++
 docs/logo/josefinsans/OFL.txt                 |  93 +++++++
 docs/logo/setup_tools_logo_colour.svg         | 227 ++++++++++++++++++
 docs/logo/setup_tools_logo_colour_1000px.png  | Bin 0 -> 31520 bytes
 .../setup_tools_logo_colour_banner_1line.svg  | 223 +++++++++++++++++
 ..._tools_logo_colour_banner_1line_1000px.png | Bin 0 -> 24183 bytes
 .../setup_tools_logo_colour_banner_2lines.svg | 224 +++++++++++++++++
 ...tools_logo_colour_banner_2lines_1000px.png | Bin 0 -> 38105 bytes
 docs/logo/setup_tools_logo_symbol_colour.svg  | 203 ++++++++++++++++
 .../setup_tools_logo_symbol_colour_1000px.png | Bin 0 -> 44239 bytes
 docs/logo/setup_tools_logotype_1line.svg      | 169 +++++++++++++
 24 files changed, 1258 insertions(+)
 create mode 100644 docs/logo/README.md
 create mode 100644 docs/logo/josefinsans/.uuid
 create mode 100644 docs/logo/josefinsans/DESCRIPTION.en_us.html
 create mode 100644 docs/logo/josefinsans/JosefinSans-Bold.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-BoldItalic.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-Italic.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-Light.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-LightItalic.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-Regular.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-SemiBold.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-Thin.ttf
 create mode 100644 docs/logo/josefinsans/JosefinSans-ThinItalic.ttf
 create mode 100644 docs/logo/josefinsans/METADATA.pb
 create mode 100644 docs/logo/josefinsans/OFL.txt
 create mode 100644 docs/logo/setup_tools_logo_colour.svg
 create mode 100644 docs/logo/setup_tools_logo_colour_1000px.png
 create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg
 create mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
 create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg
 create mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
 create mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg
 create mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png
 create mode 100644 docs/logo/setup_tools_logotype_1line.svg

diff --git a/docs/logo/README.md b/docs/logo/README.md
new file mode 100644
index 0000000000..88e6647c7c
--- /dev/null
+++ b/docs/logo/README.md
@@ -0,0 +1,10 @@
+![](setup_tools_logo_colour.svg)
+### Design:
+
+SetupTools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the SetupTools project using the Free Open Source graphics editor [Inkscape](inkscape.org).
+
+### Copyright:
+Logo is (c) the SetupTools developers.
+
+### Font:
+The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL).
diff --git a/docs/logo/josefinsans/.uuid b/docs/logo/josefinsans/.uuid
new file mode 100644
index 0000000000..d7e92c770e
--- /dev/null
+++ b/docs/logo/josefinsans/.uuid
@@ -0,0 +1 @@
+922c129c-9f4c-4831-b632-c7f43be6feb0
\ No newline at end of file
diff --git a/docs/logo/josefinsans/DESCRIPTION.en_us.html b/docs/logo/josefinsans/DESCRIPTION.en_us.html
new file mode 100644
index 0000000000..9364b24940
--- /dev/null
+++ b/docs/logo/josefinsans/DESCRIPTION.en_us.html
@@ -0,0 +1,9 @@
+<p>
+The idea of this typeface is to be geometric, elegant, with a vintage feeling, for use at larger sizes.
+It is inspired by geometric sans serif designs from the 1920s.
+The x-height is half way from baseline to cap height, an unusual proportion.
+</p>
+<p>
+There is a sister family, <a href="https://fonts.google.com/specimen/Josefin+Slab">Josefin Slab</a>
+</p>
+
diff --git a/docs/logo/josefinsans/JosefinSans-Bold.ttf b/docs/logo/josefinsans/JosefinSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..12a7ad087e0f26e2d74bc9e43ffc3edc5adba81d
GIT binary patch
literal 86300
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%0AB$*0AB;X0sK4Q
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
HQ2hM|R!sTd

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4a0fc91d04d0c715b16cb2e3da6fbfd50967aaf9
GIT binary patch
literal 83100
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
V_X&>U=0U!T?~ylIOJulV{09+UVPXIP

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-Italic.ttf b/docs/logo/josefinsans/JosefinSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..1cbe036e38b54c11e1ccae7995995b5360d785c4
GIT binary patch
literal 84916
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

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-Light.ttf b/docs/logo/josefinsans/JosefinSans-Light.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7fe3f7beb77e04bf5f4dc09e7a3a9ea4fedf5ffb
GIT binary patch
literal 87320
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
a&pu;`Kj1j7K2Emqfl)kmP47bS-+usM2>(z3

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-LightItalic.ttf b/docs/logo/josefinsans/JosefinSans-LightItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8dc35383c6e833daf63fa0aca9aed9b7b873d676
GIT binary patch
literal 85684
zcmeFacYKva_CG!|&u!_sX*WGLxyeoMA)y4gbV%p~Lg)wrDgq+bb<wq;>sk@pt_2%w
zK^Gf#4HhixVvnw(AeL35=&HEnV(#;OpYuHT$qk_E=lA{V^ZI?m>r77OIWy19nRCvZ
zIWzMhq!1zriA{J%&zLX{e@P)HZ^dudxY1+A4n29;oye-d-`|g$I%P)1fmc2dLV1N4
znLcjD%#ka9y3{Vj=z*ZwFl9z{-HH*LcMCD56ZDIgoVa*R+x98Dgcu8Y*JVpiUFS_}
zux}AEP=n_ymaSQS;?V5N&cff<2@!YV^2H~wL4G3sF2Qft@|9;S+kVS6=Ls=+n-DMU
zUUBT=r7^oFel4Wu5<G8QfegnD(NppF^Z2`P#fj@qf8*fH+wu1oLPXuZa`lqM7oYP~
znUMLQx4nJh;?vh?cgD90>0bnT@2bTo9(&cCFX!X$bA)gnShM=%b@x9#WV?`6rwie}
zZ_V0c*OX@UqW;M)(BB5m2oVbqVyjRh6Fi%RyxHOeq$i3?kX|WnKzg%y2I&rgmWuu2
zJEY%Br;svAmLe^eO-KjJxk%^B<B*;p|A6#7c`?#U<aJ1ImA4|@EB7J&RDO!|bNM;a
zFXUH9_sjiAf0RE8sd7{f(mXXuXllM%iu72u0&i3z2Dz0&sVY^4+-g+^x&}1>X_Fd>
z{84HY@<*#Nz{jewz{jZ;Je`QTB-f?TQ|fcHC=hKzjvhO)O}Nl&{OG#S_^A@w3CFHo
zB~ngYy!Hf<ec}lxo*?{q5-zI&)3}UH*o8wlQA3nS5!s?l)QQ1jq-YV-#T-z%@UF@H
z+a^WwV9&GZ!?>JGZ!vynooW2eSt=Z8mK>NX9C(c!__lDMF>>%L#@~a%@#b|*>%u5`
z@usEXc(F#DDj;j}PW|6P$u0UJ`B(j*h{xY|$-DJ`%X<NPk^8a!jr>G^OMa%mEx*(c
z$Zq`oHS)jFd*u)McPd3cs8aPkT+=&959oLwYU$?m1CfBb52Efv$ood#1^jN*axZ@0
zr+<ex9N;(X!|zY@AIvu#K+Qj()&oKg*~KkCQG6=>vO$iNQ{@7=Ql2R<lGn)F<pZ))
z?vlIZSMs28s1#M8YSb`{*&MY(ovMD;(zJovSglPvMmyi8Z0WW#$2rdF&Uwxa&P~o+
zo!gvGJ70Ca@BG5~lgs8xa(P`<u4Y$@Yqo2dYn|&{*A=dtTw7g_yIyj2xjuD$A0?tT
z#5@_(6}veuGp;6XaQve9Rq@xw-xvQ-{J!`f6EYKO5?T`0B&>Ja+|lk7cdonHz07@)
z`)>F1?pNHeySv=G-TU1K-Jv8~Qgl*cQd&}WQbAG)G~BCyDn{sEiq-gi1;*oM{qN#-
zy+=H*ZxuWA`vh!;_!2`JqyH?I;y3Jqyg>g<ZqU2s)p({cH7MnV|MwU8_J7NXd|^W^
zc7Oxm1h@cEfM`GrAQlh@hzBG95&>>N5+E6n0!Rg<0X%?oKn5TakOjyFSfh&3+yHI5
z5O5LTkAREyURZ}5{g6c!9(NjHSRF{p<B*h2{X_Kj-xd`~h9Lt)5q=7b^NWAEtg_)Z
zTwv58|AgNpU3n<I1KijFZtMUzc7Pi@z>OW?#tv{}2e`2V+}Htb>;N}*fEzo&jUC{|
z4sc@!xUmD=*a2?r05^7k8#};_9pJ_eaAOC!u|ssAg}d}8O*#KmE``Nd11{OozfY_-
zhWlr;a?DnXtD!|dh<rc+zy~M<6ahv6Mgm3wMgztG#sXFY)&NcdtOcA5SO+)-a4O(5
z!0CW90A~Vz2RIAxd%$|Y*?@BZe*l~dI1g|>-~zw~z=eQ|0Dl5p0=N`#1z?vR6t7`q
zUkAJacoXmz;BCM=fG)thfcF6Z1iTOU0I(bIA>bpx9ssPf_!zJc@Co2kz-NHZ0k9V0
zEBx*Tz*>uM0Q&*o0=@%$5BLFa0PqvwKY)XP9zYOq2=FtY7Z3vI7!3iC00qzhHh>-A
z05}0IKolSr5C@0{BmfctZa_0&C}0?1I3NHR0T>Aw1sDw&0~iY!2N(~S0B8ZU0ww|`
z0VV^c0Hy+_0j2|H0NMaE0kZ)efH{EqfD82f(61k%Uq3>>euRGg2>tp|UV{8f0ha+T
z2V4QT60i|)6=0LTUo=3ff{>~pq$&uh3PP%akg6c0DhR0xLaKt0svx8)2&oD}s)CTJ
zAfze?sR}}>f{>~pq$&uh3PP%akg6c0DhR0xLaKt0svx8)2&oD}s)CTJAfze?sR}}>
zf{>~pq$&uh3PP%akg6c0DhR0xLaKt0svzc!+r$%?ho1yI1$Y|p3}A=8&e9cV4?GIk
z9hyPl$B<RHS>J8ii7t!oFiSul%P-oG|M%>-SlR!tT%wt%6SlV#wzm_uw-dIv6SlV#
zwzm_uw-dIv6SlV#wzm_uw-dIv6SlV#wzm_uw-dIv6SlV#wzm_uw-dIv6SlV#wzm_u
zw-dIv6Ef0$#MnQn-y@#_?9lHKmqH7Apanh9f*xo=544~MTF?V6=z$jWKnr@H1wGJ$
z9%w-iw4euC&;u>#ffn>Y3wodhJ<x(4Xh9FOpa)ve11;!*7W6<1dY}b8(1IRlK@YT`
z2U^erE$D$3^gs)Gpanh9f*xo=544~MTF?V6=z$jWKnr@H1wD}FL+H(Z?#*k^iq`>e
z0Nw<=1$Z0q4xkJ0F5o@DKLPIpJ^<_nd<ggmum`Xg@G)Q?;1j^7fX@J*0}LA*gpCct
z#s*<ygRrqd*w`R!Y!Eg!2pb!OjSa%a24Q1^u(3hd*dT0d5H>al8ykd;4Z_9-VPk`^
zu|e3_AZ%<9HZ}+w8-$Gw!o~(+V}r1<LD<-!jDZfv;&&V%9*_V?1h@gsfT4h4fZ>1u
z0M-h2HV8W#gq;n-&IVy;gRrwf*x4ZLY!G%f2s;~uoejdy24QD|u(Ltf*&ys}5Oy{Q
zI~#<Z4Z_X_<t(&eHhy;i<^bjc!j^-^$YIG8wU%aX*f3b)AXYjyc(`6zo_s(7zy~M<
z6ahv6Mgm3wMgztG#sXFY)&NcdtOcA5SO+)-a4O(5!0CW90A~Vz2RIAxd%$|Y*?@BZ
ze*l~dI1g|>-~zw~z=eQ|0Dl5p0=N`#1z?wc8G9v$$9<Q4QvVAy<1f&RzldD)<Ph}p
z5cKm9^z#t(^APm&5cKm9^z#t(^APm&5cKm9^z#t(^APm&5cKm9^z#t(^APm&5cKm9
z^z#t(^APm&5cKm9^z#t(v%e2$dS~#9Y_u{!8)#*)Mt?}+iD}&ln}FwA(Xy>**;ce{
zD_XV{E!&EgZAHtrqGemrvaM*@R<vv@TDBD}+lrQLMa#CLWn0m*t!UX+v}`L{wiPYg
zik59f%eJCrTQP=R7{e}%VHd`*3uD-YG3>$^c3}*=Fos<i!!C?r7sjv)W7vf;?7|p!
zVGO%4hFuuLE{tIp#;^-x*o86d!Wed847)IfT^PeIjA0kXunS|@g)!{H7<OR{yD)}b
z7{e}%VHd`*3uD-YG3>$^c3}*=Fos<i!!B{H{w;WQGxKVxey_nV{dvr6VK3a65yO9x
z#D-=0Fn?I?0C(+HxiBU1T(V7w>G!NYvL>u>;TcMJgydOsO-FjNQT@tWt<e92vIkN2
zV7LWXG4iSqHL-S~1${afE{D|s)Az5HbT>>9?jQB5j~{p{7K3NK@Kw8EN4sH1yJ1JW
zVMn`RN4sH1yJ1JWVMn`RN4sH1yJ1JWVMn`RN4sH1yJ1JWVMn`RN4sH1yJ1JWVMn`R
zN4sH1yJ1JWnP*?&cQ@c`z&C*XfNufc0lo+P05|~n3Gg4lK|l{62si}z8PE#|0d%a2
z1waB6Km*tSc7Oxm1h@cEfLK5rARdqaNCdb6&48hRVSwR)0AK`QBw!R^G++#1EMOd9
zJYWK#1<(qZ2$%$z4449#3YZ3%4wwOG1Iz@>26O=C0OkXZHYSo+VeGewuP`dgkYZp?
zj1T+zN0!syfPWV$%|{#YunhLC0mIU4$`h?6`R$;<$|Wpqk*y5Z0m*~SCyL0YBvTSk
zf=5aFBtI;@=p$wb%wI>L{-s)se6B0<%|ex}p~z81bj9r=4RJ4_f2=>D|Db=OKca8Z
z59#|5r}~XQI$~OgMez?x(mLr^ez01#e)K2x_vsHEQDglvy-U9n>4#XeANHf~JuKrl
z{D~P9Kl<7FJ@C+e^AEjSe@}lC{yhKa|I)kBqmTP40QdjvkN!D$@?s>JjyQPVkG@xb
z4DUIhZ`WVL?|1v2{2HeJ^lML#_AHW<`ephJL__0>k$#?A&}Ed;Z`Ci-A30hLeR+`Y
zU;NSE>3gLAMSp_+(mw)xu0N|^3YiFV^C^C^pVPM}HGXu8=;234BwoKy-=*IGo||P%
z68_b%Ki3;i^uM9Z?fQc{G_C&+<cWLSKR5i>Z;@}E?C$^N&#!C4(JTKoULU;#c<?LZ
zW0Zj;fAdSFe|!F~y{F&!P@Lqy|0w@pvO}fWrRxyscc35tjx5(-+w}kRRS4}lp#Kc|
z?=T0OKanLVOaGZD`hMtnAGJ_L-}Ad$N+-jj+VSi!kk%U@NwVmpqW#E;#f(DxFW7~W
zTLBLM9tAuNcpmTy;B`P3U^jqvV7>tGjthPVg-tDji9Z!^7T{dKMc6xO!|%%go3NXL
zcXM6lJ7|wWIgl6e4i$^MB;*<IpgQ>-D*dqf|BS*^{~Y|@4A_Knxqw1I8K4Hx2xtb3
z1dPZ2!$tBkHJ<*-P4dqs)|a<gZZY$=$_GsBQTeoqJuhD|vDamniS3sAOzaD}-^6}Y
z4jEKJ#p3TIBTuEPLSVUoGVDrl3sj>T39K3IlKL4KH>vwM-AMaAdM@E18f~e2IlYQ=
zXzr2v3GzauJLN{CuQGm{d=hv%<LzdOeK~!!yaQ<s=h!)2L1}0Z?V4d9hw2gXC8Q52
z>~CUs=Srlva{h2m2gvoH|Bt){>04a(9WzDEp-&nAkkjYnL&$lF)92(9sHaFkLiBm?
zPNd$-{rbIn3gdY<BvZ=2tLGq#&rpxVkBBkDRU=$ZQ0R-?Lp0zcXk--UFXa5+GyaNt
z5&6}OU#NBhhddztl4-sr9J_YNxA|lMX#>fX?L;{oX^Z+h(p%NNc;lV=gD5qe=*2Pc
zlcac)_5<aET*GAb2=JTv=^v>VGEF-PH1s12-YeJ-or)Eoi$?65c>#Vv1)vTv5HJid
z8qflm3YZ0$2RH_>0<a3OPH5o25HtsnPe;DUPk2)benX>)1zb<K{xk9SIe^IeH{kC}
z07m^(pHctD{&h>*t);p%QE$9i_jRDX32-~$ZooFccEFQ>XVKRm1!55rTKYeh(#UcD
z-y*RrpW+KxPl;8uhBU+6cg_^j`%u2JETu}U5h@WQpV$l-2^bH+K5b$f0Q<IyivY_2
zD*<Z(rvugl&KI^scnk?Y0)n)y4*-7?3-KGf=!r=}OMDM>R9E;N7X!Zn5c!U4@b?V>
z;~i9|@s3*$t3TbWzYM=&S5Uu7yc2LA;32@{fKI?pz^i~a<++KD#Ms27j5jmhWGvmn
zaxJWou`<y0<<(eE8!fEa!bV!yc*dw~U*2TvX`6-3v9LuJwu~_<+t<F8*3-2XcDjYF
zx3Inv=UaIfTi6whU4uT~U}3j1b|>=gW9%Vdk6T!$h3#bQRZ6YAKI}ct`v_&fO8gY*
zcYvQ5>&qkT=l*$amGP$AMS1Rc>>_7UEsS|B%x_^87FK6r0~s5JvVD1@t*0#(Hr2vr
zS=c-aJBBf;rLP4mtf#9iY@LOjX<>aO&f&Zb=)on7Z3K3mh23Ofw_DiVjBV>jx1IBz
zMBYp8XOZp#yzhP+Ddp|uywBZVyT50;gTO+JAuq{hVbK<rXklp<mTh4Lge8?&^-(QV
z*3$+H8*E_#3mZ#V(nP>?3!BZ@0^}`a?05@X1MIA%Q<Kh3x(L{1j8Wbu#{O(Q-E3if
zCAJ`Mt5w3N<pJb9%I|m@*z=6N0_=4wugk)AGq%s7`vTa0&ifHqFie*$2upS(CncvR
z$0p}8R%l^m7FJ_njf^#;L|@)W>*;t4n`~ii7B<Ji7FpOb#;Cr&7Ob?MuC*|Fdb-uV
z)04v`j65n~U{u1u)?3*5z>L0KY++YenDO3g(1IH{kFZ;<r&Nnk_D;s`1HT?(t`YXQ
zg>^Evv)@y;9mzxoE+c&p@R5amYGGe7_8p~G-cOAE94?WfGTuyyPjMmbkEL*4CQ&oy
zwdnjQ6)AQ2YhVgt!z^sHg|%4NR12GBVe=R}re7_v5oUd>ER5c<&U(kXlyC_nk4hLA
zl`ya~E$kd%M*CnzOboWf#Hi+tTr;eSnMY*@rrd<|cJA}tz_wY~b_;vb!k)FTmk4vm
zqr@%?gPk$+-nX#5j1kBB=svfeer;jjTi8LuXrxm@VJy{VVbK<rNLXrGYIbUYg_T%X
zm4&e#N*xTkzPy0-v@dV0l?SV2);ygtD%+Pg+j_dd!j@Xt@fNm*F)G{FzEiEIXIa>}
z7Iu+^^_95H%G+dNe`ahm+PKBSwlekr@*ZXEX<*O)D)x%?^mWF%P-0)|?$j?*kB05X
z(;xY19~Mj#X$~&iAB#OoUXqoUPFPwl%J$_IT2IR?tj59`Ev(tXMiR!g^tE8T^>ng@
zwOQC43tL23+Oo8jX=@of9e=H7?0jGsTi6vAc8!JIz}T(*=<eja`;hl|+CxbDW1XD0
zGwszhycJL11NM=HeQIG}S=e_L_LGJEY++oBM@81>afP3H;w>zNFi&RMs~)eF=O>Kw
zE3CXa{(B&3hgsNY3u|F)DxS_d44a3%6`o@}t2~6QV+<C>%sa=z`sg+w?-Hil2<#@$
zb)MTjcLUqTHE##@<Zr;9wdh^~w#zE<wt;!}dOr8O@A=xZ9oY94cF@8?VJzK7Sb8+*
z`tlO3r)d_JZD9o#R$^gQ7S=!**JrgLeX#X35XPu|>0`s~OCK99VdPN>6GI6Tn`mLv
z!?mQ(wy*_+ffsv;1Nconw_4E0gLKql@FjgIVd=-GuSq|ZN~E6!IG3@DfL+GeCSYu7
z(h1va<!xaM_9o)#1J+ZvKIyPN>CbZ>VXs)&>x^|#YUS-_Y@b!)3t&H{?@te=_ro#-
z<z=w8GX^VT&}AfLq-W%!mO{qLEUd=D8ZE5Z!bUPSzF*nN*3&i%qnhVfHP6WimoW0E
zgn>~B16yQa%YYfJT4`ZxEv&E2RH85gb|_;#;LW53NMVai>|zVM!osexup0==xD{~c
zZ@}*BNB59b;&BV>v@oN-o%s7z&ihsD|0fX;BW7pB=_VpHA=L>K7n66W50D<zHXwac
z>qPp#jn3#d>*pYS!?p_P>$b}{|01NF8lC%o)#gFEN&6D%2evq*UA93;H)x0t%15<R
zkp6-3$F#eEzo;SRBp=r1B7H);6mO5W4FvwQMmGT-;P%`|aXs}NMdD-}<;bBN^^1rq
zs$7lQ^OHvLyDN2yCx5QJg><jB6zOa#C2o`pfL}pnZFGA<+Ww+Fj+`g7Z9-~iQjT^H
zMK)z4;fP8TAI?@34S!Qxjr1CB^W7T7$^WdqjdTkF{8IXvC#$qKfj_KK#BH0c0O=y_
zcBC6MdhaIfSfq0~=PC`6TzQLj57NuE(MYe;jz{`SanFx6iqIcmzI~>>3w(y|L%K&>
zfpj6YR{l{gM*1MfN$=vEw>YPlb9PZFaT4VVj%<pTxL+LWRH+<M&7wYvJ=90>3H46g
zMXePdQ2WJ))PAv;dMa+`{N2<G@fGz#yhptdA5$+-KfOigIy1E{v??-gYv-0%aSOZU
z5>P%z@mX~Ok239*No@p|P18<AzE`E71{;-9o9U_gOqEbixrSbrgbNvemvC(d;kG8O
ztxQ`EdPU=lJ$B;QADHqDro4u5?E|juJM9=ey_=uDOmd=}91Z-ExTJQe8AzLnKe)sJ
z{wN#qM<w#;|CvYsJsN$LN29MYdGuf5vHqF3r((5_kj87D;Vmz4elKxP{S9$pY9aWh
z$|zsOuvGN0R9wpK`IP(8MDnkaw69PDB6~>Z^9XKZ$-IbVQg9!Kas6lWxadr2MA&a2
zZpd}S4V=D61-?{!75F<`%E^?~tRoAUtAAw5{X~fq9mKs!O!Jh827U)~=0Y_O_(5*N
zldK)Db4xl|J2r4j9%cC-%3S&b=RC%JUm;1OpQgS;ThVt|1Ja0xsqgATMfTwdk^wo2
z-+L~%igqof8pS-hhIz7pWK7M{79q{kwt)UpmY=<BG45mu+)Pj9as2caZ4>YtwXsOI
zXe*Ik#`GUE{bOtsZX;gtxoL?rG#Y5U@(QFUt07366xp$vS}tfl(tihhqDK6gsSQOs
z1ad0nI0fFy1a%YAS&FROG_@b8RBMpd)1H<1nehe%36Ue!X-I2SBGN|M!IFPe-yj`C
zyIQy%C6Hdv*6C~Bu}I~daTKkN+*83D{{qS=Re^loPm<5be<LT4C{+tRMaxi|!o35~
z(0Ou5g>WN{kyjxtP^TmHtJ{#)sn<aB8ud{G750SW2=xNe;o1b`e63Cfo{QU6;E!rR
z&c8S(PmwLERA(a1QprdQ6=nfQ(T_;iVb756fL#K7HTNQ#_FZra==aF4;rRPFMfh9=
z8riDuL^_9gK8EZ0no5byss-tNihA*~b}iB+oNw&w+)R3n+ge0<G57RC;+wcdtwef<
zBKi{)jq;5uAL$IXY|A+3CN&c|TNTYI!?}g$b8UZyRe<$l{5I;fSitq)#yOYqTkhhT
z*^Y^yIcE;jtQEUKf1f&lI#bnGNTs$JX(jCliW=6h0Ke-3u5CV-I)zK!&!y726!uwB
z>NXyCoGAdF$@tS$10)GKirWJj8-|*D#H*mG!#y=fBkj7$<?=+N$FN-aSpv&gW*TXx
zz<I87kcQOtpc%uvcLDV!a=wFKK(bMUv`*cDv_Wk}emCd)R0ndFVdqQA5><<ID(Ba#
zwZQXK4AOz>ex#GRg~zhIt!MsVPXzg8jMI)7^@zswc*4b_EDtei6!1?-9z=k8Dy}Cf
z74NIFk^Y4#yO^?+D4}IUc`n<of0O*++#!|1sV1a<=6i|H<36C2#S$YTzSS^aixZiC
z9#j6po{(J0_1Ca`HgL^B)|U#FuJ>3|4scGTT88@16V*uTXe=PZq*+6#&9W3b+)_Nx
z?fHpYzL0v2ooGm@Jd>nIt|iF?{c@z!aK=hX-qXc-v@=llW6sYYS%pM7k#il__A+x1
zD7Nu#a=`vz&vF<*h>3vd0P=@OQkDXU%i;VrX8x(1AB!7_Q*pC%9(GDsFuqEx6K4Yd
zpYIJGM^dGy=qDjvp_e1I6R$&`=>g!$bS?q;<B)249`Zlb2MTHb*+D#t6}O5awCGL1
zdw`Dsp8`l$jNQ}l&Z(dsPu}UoZYuA3dhwg~*@@09FDsB&hrc7rV|P_x*R`*FCh*aK
z7Qj@%EWkX#F@P0-Re*IO2krO@b^ioSSJEZpWeQ~1i~EWdvQ7?!vw-Jv7-}+}x8M#V
zJ+DB0|9f`z*OL_LAE<hycaqHMKXKZ@=~|Lh{ajAxs*8b-B^#~tte~Gxav7SW9zxE;
zOkbe>27Hg|M*0Bf{F~F`6lP_8JeSQN>tn02)$r(NV*V94$rlDq#PdI?^QuK(Am4-^
z_d0y~K3TaF)b{}%0z3}r1ndO73ivN_#B^qPj3CQIWcjdsS#k*3ij=jmd|5JO$dL=}
z=tSMG;{ETT?5F7M|CU{Hmj+$crG`E6(APZ185(AL-A1Q1LJyF46AG!%k^ZP<U=&<(
zi~Os+N8T&%llRLVu&_!L;_O5=xSuDyB18D`FH4l*Msl{Oz`r~Z5F_wp9R3xEx%lT3
z^YO1xEW^Jd_z4%G#Gk|^pt}tJM&gF~m12~*7XL=$p83sUjJO^D#)8X_qYm6`5#z-x
z_}7B7u)9Pn`28vD+`sT|63(iAg&WpC;onsFJh5V$Op-}rhV)2}Xp<$fM9h@+vR=%R
z&9Ygv%URIZ*|>eYKy=8ZIBPlwH`PxNbL9m%A&c`JBF^etp4qod?pqf3Di<vokG^%_
zUq1J(fcxe{uP#9kFT-8=k>Vz?MNAWSikFQ$;4)gqK(0z~Qy%9_WP`BDM%<To${}b=
zl$;G~RKzVRLn}53SX9gcJJ1%zci;uzTgS|UQ&4;5$8sNT&wq|v^Izh=^nUpxZp$C5
z;OnRrD50Um03mQ2ev<HTIn0Zw?N&TXK+j<N_-_9UL3jI?^WFXn`ELJJe7FB0zT3Z-
z@AiMfcl&$jZa*v??)GDT#oc~6f$sK$kGR_}Po%s3@)Xo=<J<UxZ{yqe*1dyo-AD5?
zy0uTO8YvPK-OkVAw&ma%wfL}SXt9PH{-e}bJU4FbqcBDz5C0^~o1MqRjxh<~$q4*Q
z;E{>vkxAr{(RgHREN^zKWd8_1<zoCxV%f7}tS%Q0aRvS*gAdo>jL@|hJr_prCfwz}
z8Q(^Tf)sAS3h7Sq7*dkP81V%BjabMe?qh*tFGF4wB%kyl4s%EjD7=tyi56i^!flE&
z+eC6N@$O5J(px3JL-9K_euu{Iu<<+W{EldThl8a*7P9|2T1m5%Q+zLeKzaai2B(ab
zZltL)Rk&r5EW)=hNXp__%HknqLx4BSnV^|1=OCSn?=)m!Eaw9!O-N%+NM%h(muqkj
zAs&)=0d)UQ@G_Gz#+!g&4Gr<gJLR1sMLsE?f;8@clqR76@sRLnoL3?Vhkt|_*#Vtv
zfV7jGD{g^83ub|4w(LMU$85(u;M4*e-gmLE^ZQ)<K0E4-;~pa}fga;~6X>zz9!q|o
z;(jBFg`OcUgc|AF6Z4T$+cmiXHQKmFJJ(2GZ6G<aG2bQgS~0IR=CTd7(|t-me5u2~
z3xQLYcnWDnY5U^EE7u9{vbBqs2>;6CmM<0+tJf}FCF)K-WzER~-UruX&{JyT9Gdr_
ziIBK>%zwFfOATo0jS@bQ@tfp`{w@I(wR9ppJ0l0)CqE%icq7^<A+HL*y+~0b&h2UP
zMOf;G`8WB<Ho4uzHT(t7UEpLVQo8j*Ig2<qoFmB-gzQsovGPWYSt_3_D@RTnq~vC~
znc;78o4g-+(^0>fhrbX(kbmXc6=RfhyS&%PK@WDJZY5U3{*o=i`T>$ldbtZ@cL&Wc
z$gzcUP|Bw2F!O@v>S8q;r)gX1w<w34)Ik=AfD-(8>Gnj#&&<~L$>I+}98zk(4jyWI
zWP(><C5#_QXAP+cjf4p*1#hOGZ03o;-wt^Ye@BV`FbzE;+W-Ee$*1M>vQvJl;#HD-
zLB1wmmygJU(3H2JCoh5@+*9ZezRZF7bSq}mC*)2{#XrlCd{(*9DVk6Hm_Y-u9^)|E
zb-<3z7sq1OTn%e=1+3JyklouMxlh14>=3WWf5=DWE|n`^QtjX}&4ut_X&%HZm<n4^
z0_$A|U2KNV&xfWhg^sU*er$kVTmp^$yULKSDq?3cZddq3rC24-5O<5$#2(QlK7_sb
zRD2`;BW*ZIC^4tz;!Ir@^m(Xkk;CO!Xx&NjG<mW-MP;dU%uPS26#2MHmdC3!L?S(E
zs+uW#VHN*~?|LW&7fc>daTwPa6)kU5ELV8<zc8CTC!bMv6)XRxG!-S^kzMjBxd%2j
zn=B^m#hdaC`M&%BUkUk89#V<&a`C);5cA->@;!N@yh&xt$K*%ypDF>?xdyV+BnCr&
zCS%nz17As5i?{q<+yN`QRi>#nHBWV@X=;|5t7fR#_|6FA*>NUlt`X-z1IRy(!&+~>
zTrV$|8&Ur)ko#9LlK+z3=wp_uRP~t6I@DVAq<T@ktUlCiTCA3!C23h&p;n?*X|>t_
zZIgy*d+r6fH|6$tQ@okpTyKHb@2&9;_Kx<h^WNgU-TPPXUEX`W4|pH;KJI-gKP|r?
z-(TP;NGM1uNG-@L$So)@7+<ic;Mk&94k@hq=_d{{QX@8-?b<B=2B~`seE3TKfV0bV
zMmgNBooLs4n$R3*mmBT!Y5sogItT6A>`nHjd$YY>Zr32QUAK9+pk4QP??<~H^FA5T
zE;rhhVYO>1+J%c+@E+-GGk)|0F*Ed<frsAa97DfE=-bf!p%?XypxIzN*R%C3tQKSS
z7~P@UbQy~4{k-=RfeU8z{Nv|2z4qfhAK&!x>W_zgJOX*+KW^pRa!#Fl5A5BySKD()
zh&}rNU+mev=ZQTx3bA`Eo*VDoD7Hyj5#vWw7$XOMr)U^od{bsNVwvWThV`H}Pg{na
zhok;zOYwZAEf<z27xCbTA6q8<fp5~lAGT!^Mfk^tw-6XVwnY2|fKC2iY$xO%L?EH%
z@)PKBCce}&Q>9`act_dg+tBz9oR-HaWO+aIJ`PskF*O77xf#0ruzW~vm(M|;>9#^P
zTbmr%o58R+HPF==rmmL2{`{Wx^-tmq+)MbQ*veXaw|G`uE{}&*dJT5zb6BQN;r)LD
zyYwHnOu4X4uuS6LuuUznPQziD#>zvmE2qIi!9K}L<viGobg>Wm{W^TfPvF0I!(-nM
zZ|z&GQ@$3Z@G#2YV+@r}Q6&xvTJsN+F4zIwikAsuBzCOE!qXZf6U79a@g6Uev63jn
z%A!C_lId7m_^|p&6Rk2ItBPVVPnOCuu@E!aVp$~?$x3mItQJdUtylry=y-TW$H6}u
zAWp#Q@<Q1rPD0e;0y&+mo!E$-piOeIxJoV(*U4kWU*rn$XSrNlFPDj15wW-halg%S
zrFcx9FScVRWQ$yj=-PSWA$hiVM4l_2k{5~RaChT*@ppNR_y=NAugYu1+0cdi<QbwE
zYm5W%Etbd{tN~7xgT*MUgfD_0l_frdZ}J7AtnKiVcMFgBSTsVFnx#Wb!OD21^orBv
z7_mXl5LY9Dat(HU?vm@o!}1()10vhE$<^XaIZj*xFYkA9ym(1o1#3Iqw6$|!cW0}7
zeBY^1m8eqX$Bs}QY*w-IAr|=z{Iw?$?|NGP5&ri_u)=#`?cRll`A;0QejncZ2k@QV
z!;Jq1=I6KI{k#ot`yF^KZ;C-u6GNn342M5lD-MZz#LF8*NDRQeggWsvR)TqAy37%0
z$qBIPt>R=E5U0qI;#BNMoQ9arIypj|BPWS-<rHxqqD1G*Y2puvZ{CCW_Pz3S@i%#<
zxF2_89+1Bm56bnhD!&suao^$v>?FL1yBsg$R!Vq=`X}axZ234=Xx;KNw#?sQt@geA
zT7Dz{tzu-4{0TQqAY5uW&0Mev^xZXqFI|0xzD0||Kz@`>Y2$6^6M`Y)ScR!KRZeud
zT+y!RWOt(7=_xPDclu;~vM)wqx&G4cYUPEtH<~6de6YJ)eb$==U6>WR8<v^t)iyxB
zF~>`%nu@q_o`||%!EeahR$orm+n{;HqL~H`G@3Mxku<h54H{9bra@BMxV{qX2_$iS
zZJ@nhlaH!oAXKk@wmMZa>lHp#E#KlcgzE>X>|g(h5%r(P^|#An+%h_>eur5<@yvEv
zzcP(zQ<-+2eBUfX^;4VV`;ld?wEDV8?SSTiAL>y_?eF79w?)$iX=WN!6G?NKt<ZXR
zn^<G=V>wnv{o5;_GT+VoFzb!rN4S1!W@P=RYClKRf3Yk^-`d3;ScMt&7l-?Hbzk4s
zW1pVK8e`OkF`_bM+7Hmi!^(8@l{wXRyw%sGY9BP*;D;9^ef)UBs<&P2Gsk8;_;OfZ
zsRNcwoo3ZL6WVeFpNSukd857fnjguBRn~kT^;sq!mH($=k1{ORW!g$uG#BJ>+W~5J
zUp-qbnhJFXEVd#0B%*yZb1j+<_=o+*nsieis;)*mGvUV$3N$80VUEj`no=#<@ya&d
zj!6ic$S~4MrM3!96APizd17K#R#r|{PMJHcz~M|Uw>uoZ0{?)9#-?IJbyIx~M`}u1
zeOgnDQdcL`W){}hlne{&vZ}AoO)bp1a^Zs)r{~xD^GBq7Oq!i7GwQQ5b7U3#cW8J-
zKQFcVFc%j22wt<U3^ZsU8%zV<PQ@DG4H`pJ{_nRz2;Ybt!)vX2ZQ?V`5C;EdGLseE
zThwTWHUYCmb6^lUjtLX2z_-nm%XVy(bUGdLg~O533hrq0?NZZHH8^BRZWKvy8$Z#`
zta7R4JM#&eh&%aCJ8gOSWPu~J$0yqzq0`et-(S_FJn~FO=-ki;2h=s8&#OcGs-J&e
z?W`#Xov!OfTeOqV-W<c$VSN#8wl|vFt6@bYus+*~c_bb4|A0VUytMHhFJZGQ+p!ou
z4j`noI;7o>wU>a$GBG0~BR|7iROHVubUHK2MOtc#!{<w`uOq}+TwmANIH1Ar^CcO-
zw0hY&ZvAmDw%@SmnBikz-!ODcX6yKso98STc45JlvSad)Wyh<X<0g+;my|MiQo+!H
zy;sj4J8VSgBQ#pf)_+ugRWD&4E)SGs#>Hxy%A#l(ZlNi-1h`seNm#C!=r8hnZICS+
zB#T6=5l!+q{eE8oi&k2FU6V(}ES!JC+)4Lb(0oF9X3^pStFIb6>HO&}vyx(`UAuJN
zL#G$!mS-0%xuL!7ya}b)O@aP#8?;s6qu1c08~~3f>VBO0kxo-@44OwQn(6R5$Zik~
z+YRnZHut4bTolNyuZz-zGg=~iC+(^zBVDuEZ7sz(1%x9L6I!>$Or0Glg0k6d%Dx<v
z6@2w2E|Q*whV-B%)cq_uG3&R`<;sa20dlt+#enj{qQc~4e-xw)bwTBrFAk@((UZnQ
zS>P{jqD&q>C~I+3m5Su1ToUHllzFuovDFPD>wN<fl4D9T3oHHp#G;tkkuxuu*2iLX
zeVCu6S{)|((!z?06t^edoty2+b=b0+U2Rt`2(un-w0QoO#m_c)8qFp@oBQ#6kwxQ$
z*IjGU)EfH8^1U7M9R&~DAMlYiA|Xy`wSmnn+HfRd@ZHMj<e20luicqePIBywS3X};
zSdO)Aw>@*aLp$N&)i1of<feI7UVcHV+WEv4r`^+0J@v-bXI<WlJMCyQbjf}OPFNHm
zW+8-6yrQrQgH4&P&4VW##nZ0OY?l{$N9~G(WH$vG?6^BDK?+M@vuX2PFbfcDr!%Z^
zLZoA4l9SvCC=u&+7e&G45k@nUeNFYr^)~36R__E*t5uTO-jc<R#ih5&3bfe=wBRbV
z-)y@aTO+4Fb9rcQP3TK>!{9sFgKan)!+oH(!$ZtK+sQx5F!@ex--fm;#O2I>+qU3u
zv)}S+>Nj+BI_3z{VXAW(p2vvlKn4C*npDT)iG4m96;@!|eDpijMk~`85yMuHEQ>Tu
zAeq5rwagJZ%O~eMLbnyjjgC-ryV_Y5`m`$aaW(2T+o6_etI-bVE!lGMC5*43gD$h}
z+!pOYi)Nab&;B3jY1scWXdbm_rej5tZ`PCFub#Ipnl`aa4mD|pM$oKa{{!t2<bTjg
zjOLgTatr1ddMD8`bGHB?8G;Y6Of&0cpXe#>OSpa-hsgSu;nWrPm+M~&&wzZQv*D2&
z^(ThwUvJh=W1;;NQDz~RDbxM|@BgqeBO}V#W>|e)s-DEE0(`|B83mF)-rsK3+m4kB
z^|f6VfG>yjl{#SP3)({ZYmC=Stl*f3sJDL~7h5!5M78QnKG%icO*~`yBR-Sg1fE&-
zn{8sge09_@TBdEZ>MzsAVx{H6*lhcVs_(1kYKx`<XB>VuXnyWbGuoo*z>2V+Jdhs1
zZ=!bQijjfg?nI^8X$u~{5*!3J?UrL;pD*lo_ML1Cp%{6r7`Y<XomyB7<si$QZ2AY5
z)8w)Isr=-8=k7jDF+Hbb_Ne^%p$psPc89voP#x2IN++KxXE4r6R-r`}@6NIMW5a56
zn928H+-XCvhoV1GqBP)-&}$pq8k>#vntdA(M3G99*B91kU$PqN2;EUA8yulmi|e4v
z)uG+hp(jxtu>>cU4yb!E@8^q-?eTF4gvu6UPRv2T#HQKdnjGN(WWmJ@{K|7U2pxea
zcQU+$e1|i$ypSAFf738^n3v#5Yiw$QQPouYs`^#8&am0%Y&`?sf~RO%-AUJuA9eQ3
z@&yGMw>aMNC1lRIVd28RttrSY&&oUQ#wnB5PqM3ogx9KY_Cpu#)CX-lc!*dX<PSTb
zvcTkFfhoHN4f*y4&2&UB3Qd~Ael+h|G;LUU2TYoPMKhfF6|SciU$j1G(C7y(8fwo{
zs~#_$^Z{l)1BixX6!zgM3_^^^58x|s$g#;~<fW#xDug}Y{IPLPB>v_5lJhmVeOi8U
zy;@dR7MfLB*IrjD?=Gp6ld*HYGxP|e3korMp^ZhI$%vjb2I`}n${uaQr_1e#<HulU
zB}PH~$tBi|b-l-!>i9)&cVetFr(F8*B6=ByrKuiHalI2MW`~h&!;BXXYq3p8t4ou2
zA(?q`XjTF?6@CguQ$yrWxewqc_Y706pTc?J0_-Qyn6x2^)Q^`255zvSR}&e5G>SDq
zl)39j5k7Wn&Qz$MFL_@($!+gomRYJ>UyWT_ng>a(;aem2W$Kdb;CTu8c;{46ceHs4
zCpc+dGH9mhTaK8QMxpd9o*N9BHvMn?Z4BBl7&KWpZ)&um7;}N$u)~<ce#H*UsT$c~
zqu!bNmqxw)?XU=HWQPqJucR+S7;|gb4iD4MX1*Ekh8;%C(Ck0XT$^oTJ6wN6yCHWn
zlkKokf0?@c2s=CtH1jpG!v;--eCcR*Shi|phYgwz{k8t@LTtWQAHwZqj}Y!ChM11_
zk^CtYUaVpS5ywd@w80}xYw9zu5O;E!J!fYd2DPDVW?lQz+|*kt*@hO3NmY;b4sK}7
z$iXpj9Wgf{&(X+^8tt)R-}o>)itkpfmg$h2Xpt7cc~X?XVNZo%^2B6!k_Jbw(cy45
zH8wWk-7kzieyF4MxY(AOmfVw?RgG=sLN&Yh4&pP{b16;)7myZ{Z0n!P;pP|(kI?UP
z@UA$K8_05EsfS}=8eU22%|SJHa#9j4p^}@hO9r)bvW7oslNS$%Iwue7T~t)tURxrU
zM9Dd!4@2|i`O`zYpz57q80)}rMfKA;7ivSTys^I>GW3g2<=aJGAe(s3`W1G@QIB2N
z-ELw$Pjbn7r^yYDPz&kWah9*Auh!=9d&r%KuBnk>SyQRnsdzu~S=TBNsW#*^!L);9
z<E*mOM)fF8fijKyGEAcn=Qf7xsg?M)l|f_KQ>tfTxDC<?&*X0+$M6esnBB~eK?sZx
zKd7BPoIFN5@lLN6jXfgvt92tlBN3Yw{LVO05-5s}vS}EeNXeucV1SXviMUi|P!Sws
zXA=oVlhdiGRItf6&M~&Srs5mN*WT)CnV(+fk!OXjo?JFL6f$_P%~f64bMORGVxk<F
zN)fj=EPJY3f#(tfj&Y}9$0^>qb85zg?pEK8tC>UFotLYw-ZC{VbgaC(_Zig{%Ey)@
ze#p1^7R`MJQ$5=5(rClG1uGh=dfZ_q6y87znNYll-c>J?HCu-Ym9|uODEV#+M!8h2
z>b*_9(|d(lY{=AV+f>wDfcb*QS{rD}8s4cbH}Yw$;a3ZDtc5j>L__Ntlm*Rn>;lkw
zhJ5evdZt4k&TS9V)XD?>#~S^cp^sL*XhQ<|I`L61oEVTTvFM=f$POZqlWBAiOJ}HU
zli5wx+nzWrGv9Bwg{DuaMQ7ip&JH-QAt!xGUAY?Edkgw}nOcH|;u~nA)vI`)oAfju
z=VlV4HEc_dqoGP+8E^{>R|>f3lv;wKH<293WcBK7EmS(vrpbgU*~4R_rYYG)@2QJY
zC-m;l^VrWCk~3&gi@LIRlY&H<GJ4SBFJzSXOEPN1x9%cklxc~dr(68AK`1CTPW<H9
zHRk)-dXHAE{sCU)iHZQuco{}Dvz7b^xzGkfgRn&+q7jLCiMi=%AdL4rAQ3hzXhUHL
zhi@374iUi{IrWBlbGMx~pVJlBPnon~`ts|hOuS%*bH;Uu+?+Dw`la(8Jf(WsjZ-IY
zn6m7~X_GIQ!u{j+@cfHKF3ZUbo_}dA6<!w_G&KJjG}Ew)arnM~K|^aZgQiWq&T~uT
znv7|9%?BDmYrcofHQzmw)_h@F4hEQOzS;WOS~bt>R0jJ3IAc!j4A)O_@bG%bXalYJ
z!u9Vm*L+{{nvd$|H6Il+*L+49TJwd=ylkxbY)!o8>sQ8H^BMi1H6O~LElV{&ulXo0
z8ea1m_0qg<)Y~ro=9=#k@a3?+nrl9z4EY*Hy)$ugiPlL}Z~s1iWYx<wXhVn8<hxX_
zNz1X>ccJKzOQYUCzIc@n=RBy4U4CS?h5QueJFV=v4EPQ?HQEn<h4^mOW%dhov?IFD
zZ9HNeXx(V^qYO5N){Tg_8|y|>50;>Q5B3)kS;Z_x|Ah^Ld9*gN+tos7MrNxMu5UP$
zm!6(pobE49O7a)EUGT7l!)a(jL^u<RlX}4cR=*Y2)MhtT47OBb;)T`aRZ&Hu2O?BN
zoi$LKxf<$WsLG%QS=P{dLVr~W_k9WL%Gtl7D`#ueuL1!YT5m`2Z3+8%M%iED+Y<Kk
z44NbOX7Yat`%DIn4g1FAGm)I~+Vd!5G+XGuAV=gc8e>#}S)SJI7$a-lZpaP!iv~@H
z_^$t0^Eft|a#APeY<J?nBjVL)86vcK7)NcP(6r1}3@eXl7A+QdK=UXzi(?R&KCml%
zB%z|^sK3lVpwLIlDI2+!2vA$=cn2*{&A2OzfwPdKvJ{pz#$Mi?n^KfxIHHAl&IH3W
zA{~3-ywLfujLX9!P%|tuSHea0))eOqPLr0woO07?DgU_u*3z_@G`})W)SEaHP>8+$
z;eqCKIQtdlIoTO$v6%T(Of=5@X)PYie&I!UCgQ2)Mh{luMMXu`MOEeHMYJ)?y93mf
zV#JZH{&<=^PLbx3W=9NxE|%z@rYa%Hfwff=(#BWT0v&Z))vUCcz4w>-<#WZy4uZ*-
zf4Y8(-xnI{U)-pgP8kEKF7{7MYppnAJZ6FN(hkq;(0#|1$hQiMF$;t~LgyNfEe=(A
zeHaT%c4%J&w>hETQ{`md7a^0$`yv(%`R#^W{IU#wWzdLXtfnESY;&UIC#KCId1agP
z2@uHAO8ubrzS@Poe4lu^bz44UsEH(mV?fc$>9j9|q-3_b2sd|%qTnKH^TG1eRzf)>
zlxv%q)w-<`#o;yndU1@ASz1IzS%qPb%yPozGG7{f*zOd+GNMpNM*w$E3cQ)=Xn&g9
zpHEBln8?kl2$A(*&&rTeV}n7h^2y<j(6c_d&JkKsQZ#qtjI~c4@AJva@n?4a+}oCn
z|NZ2={BU5()xK%Y@sF)?RY}L9&GROo)9OHb6~`ws;7`Y*1vP<62lg6qn*v7yu`z_O
z6R#zB9TSIBb#ZBNsVPaIjdA;(aBT%|Z(ys6+|DF(lM1_27t9^hbaLCu!n*cb(`NhI
z#;+<qQSB_AI%LQRqeER-+g#N=!#`wF=sENKPKE!M0{dkRfm(;e0a&|cTjrE@G{laE
z^fe(N0UyOnPw=FrfIQCa_Pbae42$k_q7BZ-R-8<&m~mnfVkk*#taeoRxgA%k&P}0B
zeeJ;i8llaH4Nis}O)=!i(>JFW%1FK<)(csI{KKB`LV`6mJn@hr@}>Fnjkr#J#4s|;
zoK1&Y9<4p}T0yyGZ&oaLskdVy{IRgT>2t}JJT<`eYCj7T9>+Y4W0J@bLj!};VwKJA
zMzBe>IISVY6gi*S>Cmu*z&=e%G7hF@Cg-H&pj=YEyMP#)ubBf{M@@BNshlk98k@|m
zNBQ|CkN3o)n)X{8<_=P>2_yfki^U6Ea_X4V{j$nN!|R_k*p)Kkxb)BqvSZOmN8FIf
zp=S-h7!A$ix$sJiEyZnKJi>3JHDI1bdj$r~bex2uy#ku6ti1xPC8@7rnp$}suP;E;
zZ!MX}b0_M7Eonzw%7~u}%tuG}rHpse{ARqn0_^HHzhUCZ(|d68>_tS_u`a79PfJDM
zjib&yYrzje^uydotSqX^r<K3(7n|Fqo?OL#xV0ZhOf5F|0@JXwD&Lq_K6qSiX><L6
zvDLLJCQmq}G%J72kb%?7rc4+xrn+h2;D+U;>FW2nvV2IUx2`Zfy<&Vr&61IIh``p=
zOe`HV#+zO?yu5K*h4f|=l5OVp@|q4&L+1H|N37`#8d}pCG}Fa^{%bn!cOLh9oM;P7
z8$GJ3(q?y-;bXz2(k4r?voy_SYe~dHgl_s`sbpJ@c@GC|`)#pe!+RkH0}~q3abj#`
z8Eu^AM(mrK4EnX5Q-63b^>E(dflLhZu4dW9`t-P?Y^07Ewxr-FEG?W@u5O6r>Ecni
zvU=ps>TpN3_h_t6$pu&Y`2DKI%QjIX`^AKLOolTr!~Cw5Cmyjr?!f<-*sK0228j~`
z@s)W9*jFVZgn_MX#O=vbDiDa_V}lkS4K-#kcuX{-VI9p}MsPkW;I)WsLSg3{qtc(G
zBM?_tQ(o#XD)1I!$=GMo3(OsBL-C7?$<d&Y8O=Zx!aCw8fJbeq^*0^Uyn1p*!R$)!
zSZu*o*5r(yB3+B7kD7Yc%_)_&m8lP2H}mrR)Y!_r!Vx9D+Dh4w-&9=NK43seT6XTh
zVp~)}d2W(#%D`C1sD%#SZCgUu$(46KKcb>AHmzt_QGQ)P7MQGXr}t;ogE`*=E_Vc?
zb5oLIW9*1^n>!jFus~r|Op5_pAu~JJZXfjt#IYmbPEW^{a6x)LDorcy&j|=tQI(>8
zBluuUFva#<RWHB0apjC{e`xyMs#Nv6lqDzE3_7hWt@ixkBd?jD^*)+DcS*V0HTK%I
zQyxCM?DUl{j9XAv=_@Iz>78@ZO(U|>9-Y(y?@8h$s^D)CI|cR!Xh%SsPm>J{30r9N
z*D0Lv3dr-5*o~%$y&C6ueOleL*Bm&R(tEtRhHgHF>q($JVZ>0t4t9aCH(>8OAd{*{
z_4*FRkm^a^<>s9L)Sd5?C;8?%=9ScyEOjjPz2=Z_IB*mOd)klF{<gQK#*lM<AIE`i
zX1g*Sd$IlEK-4BZkNZ|A#so&fmyo$hZk)<c2xKYV$cQ|P;XvP=*r<0pBl=z_3e#XC
zQj9G+?!V_(PE}aUNr@eJRPAq77S{$HMY~6Xm(b5Om|w>6{9^R2R-ST%ey)RlUI&^~
zkrha%eHOGDLrF`}Ts1KjEg{q2NawFGc~X#@d;sVW(7!I2H20L4L3M)?Hm+TKni^a;
z=)I`Pb5_omU7_N2e^|9RBToJ^RA%s*-@|j}?S}ov`O3rh;0+pzwHP#X{*huWk$dn4
z4b7_t&2(|4JbVw{prLq-K||*T`|Y`cHwF!@<w3*q>OON`9nbS>zdd*}Mq!j$WYtS&
z^|;=M7{xm5ITJsPda(wUINg8v`!IjeS-qpTiDCyvyXmZ6zddKjBHEy3qyAh`87M<Q
zTp&)n!ijJ#yO$J3gTmoZ4?0Er!pTLcK6pc!<p?JDiX#V)kJRyyIuSY0vSWugq?B0$
zsm!5`sYZBk=eR~0x~*?S)6G$yuSy%uzG>M!wzz#vbMsNh_H1r<0pC#W#}|~PaWKmM
z0$)Hwd@*Q_;ETau(41q@&>6gb`zc2mgW2MVql_Q)f%lS(F~C{KBleOEIiT2pK|^OD
z`;8@!(@>U!5-~6^AQi_R<6`NWYKz0J*eaSqf!xTT0LH9DloX{F6_)ZL7YrBNR#Lq*
zYxUpMr+(H5s_O>D%pO@*L+2oq6Y8>xY8s={jyaVS(i}&uRf^kA$xIA*)AMCjdWN^&
z-&7%2Ey`pK4UcD^oYFpt(KkB(c%+OIkBHX>%@Mpt|5xgtsFxt84v`t~z-CgkUxh=|
z4&g}VK)A%Qq-3dH3Z0?e8g!2gARL{eKIy$$oj`NSN_~&kjW6!R(0*$aIEQtVRZUVd
zs_>NCV^n=|axrSDSL;@P@btjz9ve}+S=Kdp<vpP`90a{mt~=CwjXECV&-L-S$0tlV
zy_eVbr0e1Jy+K2JWd=<fzR}Tdugt3F7>j16Tx!t34)A`OMYF}CX~(Vbe)XV#SOzLA
zDA7OccSSic!y|rV?0cC@w4|gYZ0F!~L^5r>V1`RZB!6k=u)F`=EYlutzV(x4d3@*^
zIV$v&TrJx}yRh|&dhx9WwH5WcL_r`AdwH-3EwB&$_N!gOMf-W!*1>Gl#G|k^^mJZb
z-s^)O!Nsqgp{Cwm`EqC#j_kAj;yRgkI}G08t{a^hjpUs{L%cI++Qhp4eFk3)8seQn
zGZXhLm@g5$TLBwN?Pr>Zb2~;^;;B)#T^#&{`ZrlLWm=oqYwW%4rAQ0OxKYnoi>3oN
zNcxS9MRTr2W5eB$!_Nc6fX~+=b{Hq%vH9T3X5loZ4F^Ku$<nzso=U^pmstUP(!r*k
zchrX+j}&0piu(!~<?vkcWqv^uPBJ*^^H<299K8>!%Fy|voVIGr$?}!zYISXWUaZF$
z7j6TO%PZ!%96VxN3>rFrXwXc@%@aCzNMpz64$)tOW{E}Pl`qK#lcs?gr$in8x2kV(
zM>I*~i#^-jnzGx-SB*u_^APY*xQk(19}ahVD3py$J<^CZv~EiUSvJTtJTa}`5j6ha
zRu!!qd`EjD-bJqsuUrw~=%Z46a(Ow}){mwGKXd>#FUONg(F4EF?Ia&n^EI)n6ArX`
zn);m=Zfug@R#!)7EgD=my{2aIxM6cr5;N_yhYy)tSTe41=z>^zVd#u0g|%1})GZr5
zsAm2hgQpCdR#ZN&bYe5fAoCL6)hfVkRAW7RvHmvrO>6(RiQg8@*(QxcO$&9K6x}=`
z7L8VI&<MYphVLX`2F9KImqa2(v}scYfyQkw;WyWLru<f!b;9qdhEIt9)0pe#Xo7yo
zDDbFmyd>NXt)TB6A$mu<xD__C-#eZNzXNijjf$Y}27Q?d;X49u?jco8jk+Aa4LN3h
z;EY|EABz-D^-@e;aSvE;4W4Z_X&kD}$rMH(jdrRitTnj~@S?5T;Ke@NYVFs~wc&OW
zFU<NPctQ0V?KF8|Ho@XIzUgGW!@e8bYxlO8C3c%VYoVT*yz5cV_R)*o#0waS_`^!X
zAI6J3v!B>wQ}gjZa`9f6{!T=_->NlMz3uajF?kML>(^Hr|L_>%`)CG#9ct!?2=4N8
z@B+FW=0D4YDQ(1sa9^x<vIP9e7$ai@BF1QeRZp4vmwvZd&)xm%p)*5<>{lqS{*p;U
zV%qnvM610W#SvqTwR4@`$n7n}4Ys|3xRT6RjT{8T+9|L=CaDxN2b?YY`f!lb(@Lkw
z4BLR+HJdGbqz3_WGERO371$yvTK)VQHQAs4LG^(`t0_3Q?@;#T9Lux`M3uq~!ZCc<
zq12)xA&TmY>MF`aq3|X9OA4bf{o5?}4}1BCS*3c-=V4FKk7tpa;!l|SKQ+butyF2X
zD`iD)>f8mf4$EHswTcfZ<p)wGMVPG68IHQ9%$ye|HV+CLuZS@oX^qX?!oy_=`j7AU
zg>?kaAuUtIX0d@})6i&a(r()jDVr0m`fQ7$jomnQ$}~}eZ!diYN2D6xffz0R5y%)&
zUgXWoa40QRx>R#RMG6kcI~^_!BTpMAg^&-IL%Ej6IN@yD7SgFxPit&cG#qMUMxvmS
zF=baBl{OmVVp6uo%BZNmQh^H8M)l%rn9IXue~}zRnloq+#To{U9yDs$(3*iYP3T5d
zp${QLUmVtDg&11i12fmvjdbR;sbRQ6SkPC1NDcjM1gY%U1XEZMq!wYA1&y}T&m*s9
z)};&|+dMbjk=<50es=4GvdLMR)NnwvWq4}K{6S-)y>sd&%!?1*5;u8Z<>DwQs}e@l
zgmw%|bJdS)Y93aXUsPDuSXGsqIdnk7_`J;YD0@<lGp=n={)m#IqS9I8kEt6jTV{`n
zN}5^T82VdE+R$cct1B!nh27w>QFR!*e;M-_{{PXxLzl5<rvIIE89c)Onhni7DBL1X
zT=__Ld=!r9lH)*Qg)iG^>O43E+CsxOz=nzGHqf!%)@|ex<R4B%K_#egUm!LskjFHr
zgZEwV!LGw7Fcc|CNw`pzmz0~~L0b~BI5sw3!m(`HdC|h5F+T;$oM5@U?zoyI;|I_2
z#8l6(Zp@k2kTa=Z#`wYWaN2sp6uEIl`=BMm239Um2Selhm7yyJOf4PLKDu#K9nQJI
z7q7$rV|xSc7iWnTf!N4<O2(<>R9G6eNH9Eo`=sc0F1me`ha3&1vw(D0f})_|7->hx
zb{t>+ua}(UU^Hytz$HT~TQhS~hZIy!sfN2!UzrwFHEZy|r9*Qv^HMXar`D8>Db4X3
zb{Or)n+o`QB1%oA$T!ay|G~F3uC?-~JCToe4b@Zd4TvjnQ+-Jw&K-}F86rOgo*`Lf
zW4w(kOCYvm#O-!;oWh*o1L93tfh^>q9y=X};JZx`PdftfDAptz{bg7q^9?hPqm~BB
zSPJ8A5|qh_ZAFiDU#St9#)Tz>e#t=czPVggpI1DjZf5=T;X`U2(T-sgWL%OxF|oNS
zugaNaQ@LrmB?wj~C^f1ra6+@Z0+HU@>9xb#e9lB?RaAUpj22hmt{qn3jgiUeWqHY-
zxcIc>*yv?rnpX_9_;UlkFv)y_htT!`PI$uO-ewEiJmPDK`5b4eWEH-3$UeE=W9kiL
zM|q()NuZklNType^@gS&@}w136G!)?1DWRIu+tmXDTI&N+x6y}-fl{Sw;SHUfyGJI
z5H0p2{y^NM$e;2qtd7oK(9qCUJ^0vRO>@(mM%t%0S5K?A%ToBei(=KmUe~13N}H;0
zs~dXkkOAfLh2Ad)O;eh`r8W_6@8o8Tof7p}L%grPf+eWN4otEey^t+=xjEUH8Faim
zT8=li1&$*7WDocpY(LrOuy<5NSz&>{h}N^#u>#9+M^EU40X72Ya6yvMF+^3UUyTFg
z#_<D=n@}@*VC}+@RkJgrN7Qu0PtPwatSoAenKX64n9PAwN-D+_HBa^_-%E4Ho<6>G
z_Q)ZN2UnH1UO%eFTT$lEDXy;amW3`KlOt8l<ca|ke9hAfOc^+&9>@3<;9D~Y)Zu$9
z`<VwcuG5g8DaypHSoztsC|5Y>k1rY_(7g(gZ(M^S3zvrfQ_#hma?q5hD7lbMO=8az
zHiG1!81#<wegk=+h$*q1<%-f=%lnmxs1{~2z65I^H?BjZxD%tzGxqR0BBjGPZC`(c
zkW3slslSvIJz#qvz9xS7ZHEcV(%u{T3rlU$>eZq4!{mkS%pq-i1P`xPI5}<RAGGp)
zxLbyNxLMN`9h)Hkut&ZCpCJWd(Dp!d7OvG`&q*UT(~N?Ulo>1a@Qpt<qby+f=pUXb
zsewi20Yw%ucWNqDj=8Bhs504KNPA2)chlr;Nt!W3!x(vJik3|^DLJDH2G6M*xODjV
zMTwz15~ehGCs#^YkubU%b8bp%?QF8eQzx&i8YEk)r&Pr`=9i=W+&{FR?e0(1A2s!K
z{Ic@Tg-juz)@@(zH$CV5Y&H65$Tk~gr|XerZ?np_eIIN1S+QZ8)Pt|&?KaC{{nQo9
ze%n99DaM+D=xEt?N|^pkw9%|j&{}dCuO+G8{_7_y7}<u0`rh%~9$G)eOfpOCF<&u>
zN|^oq6klI9`a)~EJ!n&z)`1z^ct^N|yWcxLg34HBzNdcJa1$?w%WO0I@u<w{SLOwE
zvQ?&iJe6rj#5uNq-y?YSf}(Y|F%B~;n3sy{w#KQ(d`|X#3}#0@V<!2fOauNwMvXe0
z2LH^_>|1k@9GLAQPMvz>n7yEAEk*61RrZ_uy=EQvM)2?jwbY`iP%-SIQLKS|G^@SI
zCXGXNBt^W3^=SmRwFq|m)If4YPPQk_uGw)<8M=a17x~`os*%m&>6|?pbG3!zIDM-v
za@9bE)fqW3N1^BlB>VkB_^bU@qDT}L`BMvB)+&fMaGi%KT^%&h2$g#jIRl3N&EjZy
zVQqD6KOGz}xF#hryQCyHrELn7u{v=~^<OFx6IV6<hDsTslJGGSvl?^Lb8!i`YD#s2
zYkuXRuuQ(7rdYhPwZ<7E8%GRR!lxg=H+(K*+jAP*o|x#P?(2H`_I1hj7+zoB=5EAe
z_WM#{k?@@pC6`;<!N`Zj?q{2d4%_uDCR;=+32V<6GoLIATO~OcR%r-Zs%+S%(A%(0
z^0IzhNJ$M{)@PigpqmOOtDmuFh&|dUG>D}DH}5gWDYBcep!hr-&OBi(9Jm;k?DM%3
zopd>oCJtK7c$|iRO&61W7mTuxN{?wBk(ZSblU7+9m2sZ^ys~OJxBP{9GZPA;hqdl3
z58Z*<EA)}_N9YUozQp^1*c_a0x4W?PW9O2V{3TddYdCeqYyR+@>2R<(W?3f+=!+A^
ziob}W0FYDj2qv&!ASTKF?Ue`oeeKY&;MXANN2{1t{B9x2OMUsYS?4b*@{ycNW1G%A
zxNyXR|L`#6kM&U}EE+tg(pxgQYT~4**z9=&8fVv59W!C*g5;zud&lr$Q+*VYJcdG&
z$F?r?*X31uCk&fcQdQS6uwu!$#>&}ShD;ee-B&TTbP~%q^BG^5FOadu925V8X;FT#
z?4?0-iA6I#yWfofo~sO+J1v?vkK51_Hr1Ljo~i>U1N=CtBLnUtk8(N^;dSFX4%pEY
z@C9jDt6cQe!}Fq~-R7{_9qYkNKCX!IayogKF}UVBiq6&=gIjKuqBX{UEkZ;5KYdZ4
z!g`0<G8;~2+Z@Y}+AbRIESF1&`r7hRm*3_0<!5E2B*n$h(THfevVjl|JPMEJe<lE4
zRaD~1&Q^E+c0qWtVmdw=FuH8`e-{YM4aPVQFvpSRvg5I@$8#BdVF(ku6eEy40)H$;
zOnw;W_4p7AJ6gu32mUh?GYms#L--I&DnCIq1*L6rxtWiHJg5&YmOI6lOc#UkF#|fL
z!)MQ&;T5|4U9;U+ov)P?m$lT{GqEsl%9`IOH;!lseIio|t7Y++@;9&|A5ns@@(Vhk
zLT$?y%O1{%Xd8|{+U)0HZo*9&mrcW`L#1nBlytc~;XADqR_ITI$25;ev=<tTnzP_B
zyQ$65&g>)FY`V)%pA)w4@V1Xx;#iVYowUfYDDNnJsH?f=nwlPT1LIJNemsc(^PxZ@
zj)A$pO}`q<H1=`A_nI&c;z?Bqnlz^Iis$*R4)%Ji`(#A38Q%}n#27=t@R2RB<ve85
z$QbHFc@m0aj#fVs2y!$YMBaJbTvLtzfIV~us%72BJMh0?ATGr1aHy$2QdEdqVMK+f
zKY5@jSJ-Pd+d2(j!{298?K6EB3I?Q8oPlWI-?!mw`Y21^un`}Uf6Vy>s{KXslG`h(
z-h7lvQa<yUQZw(d+VtzZLD?GIRkiphiWTz@Q(QI2Ka3vmy*$v;(Uv=`HsI|C`rfl!
z&9wSerl#q)nEkrN>=#a~;(v&kZP8T7i}hzrnrBR!5&9r`OL#29ZK1n@_|_bazgOOc
zvE^?l@Yr(DjT(oxVFfDVl+)rt2abY*L;Baa<NB;B!hWAuToAxV(S%G%#(rfuYMu>C
zi=cs8Z-+=gFA;}<Ii{Nod0JRBGWwqJ^cg{bYYo3r9&$rFZMfQ%l!z8Y<D)>S<w<Gq
z+<d%<g7bFxT?a(uwk1Ij6XKFG66V$BrWVot+Ki(5y3%Uwgchd6B_zw_*o0Ks`&>f~
zF4vmZZAYfa--piR@zBXL9;rr|ymlztE98kI7DJvmWa%?~kmzJS!|NozikA-88K$BC
zCo4*nKNRJ{aR%0$2l0Y+hQd4y)C29|td5QclO_6wlQn!~%2}LH>uRX3i3&8OUD47Y
zuMeHkvdoifyjy0oeB<3L->2ZWWP5rIY*viGJ-?XfC=G1I`CObKIgbVgdg@Nbg>z4N
zlgC$V*u^H#cULr>)skF2zh?B;-tWJEckqn}%Itn3gLGm<=v_(m7041)?~qUaZj&i(
zn@HNMcixUZ#)ygAqcHvQZ5En<<KWjRd=SNWv1uSU)6*KxJd6nO$RxCo4lh_ObT-w$
zy=CC#b?)k#>h!(MZ@>L$`K9v0ojc9`id|@5_-?&rj)*G}ck6d8sGd)uCXiZoX1Inu
zJc&+V?52uzImqal92C|gJXy|tH)v|{zft8FG#ak}!5^1CoZla=rxr4B_`Ti{sK?+T
z*CQVjJt%3|1U>vN=<KcGcd@SS<92!F-Tm)OVvMWMg#)0C5!rzZED^9q!n}zGVN;x%
zq!4CErU}rz%=_K!qH5nD$G`zK4YTFwEDUO<yUZ;g3eBY>rH0(7o$!(U;;-9%IehfP
zu<`i*g+n@U&Xx}OITpfihNsbrz-*+^&x9-N;m<7`je_R$|56Q(K$x$g7vNP`2P_Z2
z#N25|+lqXcDpP!^d}NwV=l7f9BPM&AFpUimb;)2^P*b24`Aa9%Ix>Oz{iQ9nnEY!>
z9l3J{R1dW0&Z(Ch2UbPf;RGZXR;%JsC0&e^j46FnUO1(!rn;;Ydod=T@KxlExGi$s
z_GIWYJ1ivYbV>uO2%JYg(q}PdMh}c3CdQ*ZCJy~t1%dQ%?ML`Mu#M#Tq={5_a$&0B
z`5268!Y9*cFM{rckpFP%Pzm2hR+bD~;H2K$vS-8fX{w5$e!F7}N@tCDLtfZYT*Z2i
z&OXR<R6S}(9Er>eq?UaN)hP<p<hzkC>1mk$b+$(a{d62s;(UEL^Q(X;p=Y&nR)75<
z+0#ceO_sPm5St!Hb4v?sr8I11AOo8guyA5MYSeJ9+2o=T%cKq1G_;RBjw7BDUw@@|
zz!R<-wW4`+nUaH~Bym{7VD}}{om?Hhb>^glb+{Itd=$<WI%`U^hQ}5BAL`x&KCY_#
zA3o>Knq-npW+t;`n=P|vnQW7-$s}o$HcgwgO;g&YX`Ai~ZPP+a*~=obZ_17chzQCK
zA|i_-AOa#N0zVfNR76BXM5HtS?{n^*WYPx3-~0aG&*x2hXYSm4?pdDuoaa2}Su?=v
z9E&U9{dN0zQAy=CZc77sI70bh-p06Z11=S_FDG(j2GdlKULr)lY12*!H9fG*Nv8~Z
zj=Sk$f5zit*y0`yn{1^wVXP$LSB4F?wA5>shn+daU|K}ukEbze+dPf88r*awxG<)%
za9!R|Q35{f)ghf@0%I3kwJ{Lm{sqzNo2I%-8Yi^;oY9JUT31p{lDu{jzEB(ke9;;z
z$!jRdn9}?b(a)Ep5zuPFA*{nIP4YTyBH~Fh+mHFnfFt>b_bGB(poEak%CZpINgU>_
zMTtVR1ALN%EM)rnSi&@i|G0HpL<?F2X5%RT@h6XKs9wLQ0W@TNZ}XCJ=)U4h{GslU
zzG}3oezK!_G+sB^6|5VKR&@LE8SM_BZH!&?S8Bj`pxeNB1`fP{)qqC)g1n|qmq9#O
zrOe=;-&V@JeN-9fij*=VACayIwmZ|hqL2B<66~4jK7$POHMLmje!_OhvPmjOa@igD
z7Hyu2DAP)P%nP|9`6@yOCF(`FjCx;2KC|h1Km0jLjpi><B&*~?P1P=-o+@Mc1G1w{
zm;cMp(T^~k2-Eg5=_iCI_%w`ORXLTh>0ry!mwJ&PAU%|NF{9p>Ve*--ceIbjH_Gk-
zFDYzU(&L-e?|@P#Y+0%WyrkLVx@EdP+(&(5pn2C*eR4UnKe#>(FW}uY9KiGQMbIA5
z6A^Zc0t?c~5iD+*?lWKvT$TGw_RN6s^!rxELeM;T?7Ms!HH+s6deYBQw<s7P>XzpL
zq90!gb~3>FA0Y00MsFb`rt;PdONcB~m4$<}hr`mP!i1Q)jzvZB9WV3;#G*2X=Xe9e
z4$@Jc<B|&g!<Y~CVs6Anifl#N@?T_34!*WV>#xMbkS9qHfvJN$`NdhYM1}`)7|<Mn
zNjl&$_Z&G@j8~Mw3XuUzJWH^YpPd7ixKFU8`*Xl@y8WK%I@J9dd2VTD-u*AqxQG6&
zD4z?LR^fS?<2orS<)>g{C1&}P)3`wRlcSV@?A)61&c*wz5x7G62u^+gjFHS)lZt=Z
zPaNysTqfb*wP_J3CZft_oW(OrlhPb42gDR4W>ku$tAZyvd2ogxL5Ic)uH-^dZdLSF
zP=(I~@FdEp^D9cxX+LsTtL#W#<M7p%7S*k&mkDKe=R2T}jcIhqN`&oYuq&rvajxb<
zUcJ0grkmY6ZHK!9(>Q@{)}%fXu&^-~X4l$;v(N&`UC0mhuPIvxC-N*{v8oqxHE<0y
zbXpx13khNw()JET3Cc(!G{KpdvD~}e?ua`a4*A5oC);)i1+eTfZv(PJMrRWqVA?_}
z;e7z>A!On&1K)e&5py_(QT8^JW?QmLlaIOo6mG<N@Zyqk&*;{0sF}O^fc24z!brnn
zj51uBW6mjkCG=MhhIti^rtsMIs8^;17^}ej<#;b?+$YPJqt^$*Pk9ZQ3qM~bdqaix
z<G!FwRqS?|HWD5aVG_o51mAy14+vhw4{NDAWLI#D8M@D!sNZ3SofI4%$+fW;5S(>c
zCtn_uwGd8Ok3$<j+hVO=B9cN|Jy}md{^jr%A~g<$p*`w8Z4%(GHHrcZ=I6Sj?gJ&w
zjMdjhLatH<7RBTD2rD;5of^ncsoDhhPij@z<q9(oTe+HWR5s*L-k}r}>WlfcO`WoF
z%lx{A?zF=7%=uN-Lg#wqw~&HY`E8D}5`PqSFG2z9@yT{C9>1)FHOFN|$Dsuwn`3?;
zw6xR)YZ%PoFnGKpitY0?50>O-E4COmKmz7T#J3)8!-UBQ_YRH_^CUPSWxWpw3%Ry1
zlAdkvlvy_6Nf(>8W}=rNW4=-$U}!M|ie|T&yzWhm^!1r;<Z#W!o=R*OWYR9S5L&>F
z9~!D^+n%UhR#;Ni6V`bqYShbXM%p?y<Z5|wM;*Vca<I02TYFU?`H|G!AFNJZSi3CN
zK0K6&6nE0*NruHo*teQ6hqpeEpRL$|lX=fEmRiU3{1{8EV@jll<}$++?X!nA%Ti0w
zHGaZSMf;Za`XRF?G!<?v9&c2QR1dbrme&rq^NTBo>$*2JRQZ$tP~Deo4b>(ui3~N(
z8xdwb7#7AA!#jRYykif0`a$coy$x*(ePmE`lz}_-Tv1=*dB?Qql#I@2S-H<uP~gMo
zsx;x5DW=%-98)22{4zp#%+M+TYGlYx2thHXW?L!5C9wVteq}-tM!eTkRaQD4uO6zN
zw|QRUa*N^8jrl-^&bpfAHU6#;Kj+AIxyD;jHB{HSwY@$(oV;qNEnL=BRlB?<*hz9L
zF6347L3a%7bXnejovzrD(6&e6;4w|$xT%PbApVzk(MR7TM~csW80$g0UNnn+JIN<e
zD**67fu%qWQ3r-b2Wla<%ojN}Ht3@Lb!yrw^RoJRyfUyL^g^bbdXdxx`npD@(VjQ3
zx|5umEV(f>@DQ|bnUqM^C6^hxnRHz<5_KwL$NrecFPFjo7&(QHmLEZ0%;!rd%4L`z
z^5O!l3Zuut7LlZpq!lBsUp8b=+Fc@TnXWU6UJ>t1EeqZm0Cr)|)Pa00LDrwhvfF^8
zGt5QC(usk{d(Toxapk2G&?A0f`m(%J4zfUbRK#borXAENstk<hlz=nP+!E##rj6{h
z-ZK{49F`VOpxRkh9;zs5EVuU**^PC@o)Gs3Yib;=HTn{FNs*({X)iVA8>@Upb#6<U
z%WetUOAxuXvclGY4Hd>qW7#C$#RmCZB#wO-ROU?aF61&pPaO3w1Wd{VOuE>~iQ?v_
zavzpF4}ARH@bPz9%)-ZC4=EU;sS^+8!y}ol{!reDVCo?0X{w8<4XUhVI*nEb(ZcNF
zGlj+yIpxt1Ir<jrp$78FyG>|)X6zBC%@K(n%T{Sv&L{@J+%RS-0-(BP&S>i0iL%dz
z{0{|SYoQ)LI;?skx8gHjNBTW%K$d3@mtj2eUDDes7%JXVyMV8JpJYK<vvC~|>Pr0!
znar+&waC4R{5-H9L0ARA35_@p8SKb_2-O<LVkk)h-mr92t3`xkK%Nj2oHE?}h1!7_
zj==N-i1Z77mqMzfADmS@5&1VIMc@FqXpfVNc9D)4WauQwC>us^=3pUMks<_~gZ5pR
z2O_S8H!he&!g>;-$R-T(8-;zaU@*C{-EQ@_RP<FWX;*8)4fc3rqBpmtx~4<dq0imA
zysxLcy`iIdqFH0Ml$6$tR3}E&5mkAuxnkbtRmo+1Q?Pk*o1|XSRM}N%S=FAHq(FPf
zU(I*|8HjUOfYu*Gza&FH2vtG$Hp*lVJ<p7bZbtN5*|)wn{)Y9S=3uxgJfayXlxpt|
zByZuz1@5MLOO$%eBKjD3-!tKdkewxIU?I41x&;ES>}PL=Ha7j21A{=(3cLmh5^2@u
z<3_mITdFMM+HoVbSdG^CafhqF_O<H6fxGVx5MI%EcB?$Vt8F+#%*E7Q$XO>a>x(k6
z<t!&vCdM3O-H9&R(iY|CVZuuAi=?0&N@rmTKz%)WCJNzKkRo9VZ+l_ASnK^yp7s<t
z7-0L7!O%G8EL*G-Fr*P3l;(7|C%|HeG{!ot1N6?)V~nv6kC_`wU>`*Jo2=~O`(dXq
z)GU<N!3JhpSi@r+WDd^PV(p|v4)TgR=WUXODPn1QT9%*AJS{|JpY<Ry4YJJH>Miuj
zVYpR_+nem+uSMW7ET(b(NOf56n5eI5h3MI%j)eUX6e3}L^1$+NyrCjn!(GXDA#o3O
zM_vR<0uEw~f|egI-t_=GGc}8vPnS6du%a@sW&8)(nb7JsV`n1QL$pXPGXlH6Oj;!0
zr!^J#X-!>T0L(&^d9v_N)2#HWI^Aa7bbZU3MSYT3b;bRI;@!yYkxkyN)W4KorET(N
zwJBOVoY||4@o!YxA=$*QQ}-zK+#`^k6O5!d@Sv1^`+f>om9_zP>vb9xWYlmH(?SQU
zg~KX&GmwB_Ehc4=;Gu{q{SO7npkBreSGpomv&?tRR45GZU2>zUGt)(9wTU8xEk?kY
z!U{lj<1H|Ws2ea0o*QRsDXxGN&z;}wnge&L3<yQY5BJtf$$uV;Lu(O*a2k)0r;+%x
z1OEn(4hlG?%Y4Q=Lp_8iay_GL&Uc0~^v>im$GkHce^7>G*i;5G?6C|Pwt`>37469Q
zx}xf6{KDK9JRRL9d6Hu`PdAODcC;baG3Ls^dC<H*_`ZDyc;kmJRE_}z1ZzB8?6IyA
z6)A?5Ai30}>4%)5huk(~!#6^lqso*XT}Jroq8=hAN<GJvp$*KxuP5P<yCPgVG;IBJ
zRl?a#_U3>t5Xcl1-W<oexy`0R6k%J7?aH~Oh;jgdR4k+~+z_8lld7u6cxmC+D57D^
z@9VOTRka^QpOOdanw&5_Q7JU42`i`#y4VlzFM<<UdJaZ&^pX~_o3*-Akm?vPX5{V#
z*C{Q`FEJA_dk~XvEjYv?O`1S|{%1<XGX!Pm;f}7IT83(NRwML4;=ih&rmM?tH$eSm
zue4W&gXO-m5~sspGbqLvJ_8IC7_s%xu!4*6%FbkRav$5=bDEocF;@`|O{vXjF0~p@
zn{!>by}Za(MaSL}v(a8+F0frW=SrdA`cK4sl5u_3d;+f5rv8eoz~_J{HQpz}NQkxY
zeqj8x<;8>I2iaaImoaiOPnwQ0p`s`gX8!nxnk(Yl9>l7(m0y{Bf)hJ}`rnl<NBz01
zGm(WTme>er72}QvurfoNsMvQTU=cw-sh#v4G?ase5Ov#Z6|of1l4vZBfD~rw^53hE
zyG(t!YVyR=$i{of`jQtW-{n^)pZVoj^7|0zVf><fVJCIALf@Vdw%N1_rfsw3GGqgV
zGFSjcy74vrtXH|Ng2mBk8P_*WUmqpEe~gtZ!oGyD=CCCXro&Chti}J*z(a{nAq+gc
z7_%*2`{BXH$+PQkJ=nbdjD{cl;HI0t|KyD~Qrij0R-Q-OIyU$K!uDZt0l6YlluP7G
zws@G4poojI^%-3}s*nP9SWQxN3<_Z(B3PLD^U3el?KoV&^V=k`c#@x%e1P`?PNHq0
z13w>dP{Bsz0s$xaI>D8$1FrZaxXRZFuJZL|JsH<A25}v<yNbU$+h=R~S%SU%>?qKB
zrcSa6!*x6xmYzGtCQNQuH~s9GA@f;U1L;|;Il&D3CBPQN_!;~T=uI!aKZk4=6wulg
zTda*Bykbi=9g9Nd3ZOQi>(DPzw2GrkknsJpYY>(UU=|>5fVJ30bTnN#2+xDa$)QBE
zKsF8z7a4@JAktks{-GxMC;}k5OI1=i&n-9-4D#`!GP5C987qzD3*uc}fjVKYuug^n
zUH`tYOOUS*VJZ?_#n=VEEni=bWtpyb;ziGgjk<@^4D}+@_k8hfmCi*?&`+!Sggp*P
z<J0=-&Qy~+^jXg^=mo_y6bF5aT!%U)?C;Wb+^tb6Q`%pCOkFD2JEDEM554(Y8TYNC
ze`rI}qfXMJm&<KPe->?|_2?AaTJErl#)vH7WQXsDpTxq%0@)T{rz+xlol4l_V+Rdm
zWZ0|f;0>J()KDz*v*6$i(|nJ|Q|>AEc`Y8rNS|`5%x$F48f-{^CR^%Zbub@ew10}`
z6d3I<aKKVew%3EXP4!Vm{F1SdD;9eP6<bl@4~^qrVjK?28#&`q0OOHkd<rNmHhONg
zS{+u0N$EBj-Ok-@5`TV1S8s$V+0p$|EXyP|3@_G;kY}g>GVW6zv>VgDmn7syZf0yu
ziJ>7q8>pEi`KH6}I?^{u2<#I~J2|&ffrJZAeb~9e6a*g{zW$gZpln8P*u{tp3-=~i
zN$K<%p-9paxVS8WgD1Egm5pEI@$1d=L-7R_i$dXMLr#G@9;)im@pz=7M<+d=e5<oG
z)ZJ9GBoy?{p9<8q*J-k&P0baUU&vE@9X|v9Rg`ZIR%p1wCFmIyMVn96SMDqKsP*;;
z!s5z&f)>-co^&vBoLth%EDJA;v=2rWMcexQtrcZ)cWZ?!?vjQUg$G)rJ)tG7p*Eze
ztZ4Hz0s?Xl->ap!z=3J0P3-a)f{HQZ%mi2wgBCj@i&4t5M%->*tK)9z>LaJ|D>Qk@
z$2d}ZZas1@O88PXWe<%w)QHomB1?QZycPx7f#oXpQxGk2=`d&%SC8Udk*r?L`#}c~
zrPymS0lZnrC8w}D0T@^zx6{#E-l~$aXxw_trq})v|L(n+dtUU(kFJj+H*yY(B!ZAv
zFn(BOeV5@2NixX}PQ#X<{b`vEwJ%F-gk*`2YbtyZ-$}lxuU^ZSM3TSc9y%g;Mq&-A
zBhnh_5@u!rR-34H+ra0OO{i=kW6emTKrwMGFryDx{H2sb+!Q2BTVVzxr?mpZN2v_k
zBoPl+r~(8!S!>_g+bU&soxWzt?s=-L#ix!WHqXzJ8dkToZSKmF>Q}d@de0onbuRt#
z=0&FuIGii4SXsH~jNwv4-;Owa=k{$U|4WXDD-8LYF2HyZ+Y0YhTCKu%0wO*kqrvBN
zE*F}i-Z;-0jP*`vr3;SimDW_@KI$Ni=<lQ}Ag@BUi2OV#d&xRdb{4nFfyG6{ViAY6
zgq4K-BD^GWp9ljV$m`$<rb`R1g``f$f2U2Zx%oQ(;JmSUPFL79)(`WZ@Tn(PRbBkx
zx|;6pt?^cOQM|okO*i5zH*LFSKl%}Z%=uA_#YNP~3R_%EkzPy@v20>Ul9b`fF4P&&
zl41ldR$O4g{F%;$s?}*T1dAk33_yV9)?sGZ`09zshQYdVPf_i0^F~4|7TGHD)K7hc
z4awu0YzSDcSkqs(wNEYiDqM+%(b{%c)~P?K{0LZvKS}U*9|Bg{n92Tx7l|SlB0?qb
zgRJ2u0X3imI8_4*WJ5ltg=VN6{s?Hjp4VcFSIa-ttSXEZChy}9@`mi>oBwz@aOa(z
z|32ByJCl!!_t6WhnAZS@GKR>^Fjo_@IkbT|m>NwQ7z*VOe1)tWqlWQJ89?Fp5G>3z
zU|DhsM?P87s)VlB1(2ierzK^vx|I!q4I|#;yk!+5E0#mBTGC`w$9NFVTtCgPIj$wL
zp_iA1ye(^csuzXeM$X&FnpT4R?VtR&(y7eCe2A%<V-n&u;12nf*MN4zQV`|@a8Uzy
zIqgM9O6>%^>lA~6%<C{H6OO;WLT^bCYBl?5CZz+0%WjBdPJtnTLMo#m!i;_D=xBZO
z=8opo^*6p!wC&13(_m4*C)^wDSn3Kbtl(Evk2W@LY_DJ4yy1<5fx4615j>)Kz#Hif
zwGEWQVIIQ)?tyFJ?|!~{#J$`d=kF%JoZv&rd*rD!UI{8&4Ve5IxZwbWYG5^qsytw<
zjKTt2fx<IBn=+Xsu_OG^$|C_X8!;hXu3z}=(IiR>y=m~KjCDXKO|J@qpcGb*cYFP6
z?XvFq!}S&Q3tBdJHm|NbudO;*V{NRcOz2jVLVh?FUKouHR`IOeCR4&cZ=}DaYJu6Z
zrnP=kN8QSL?wseVu~jxU$C8&X3|9|Tg?l0>E#5VFd+-e>1NZ%GWy0t$1uhyOAeYGM
zls0js-7y0I_`iPoy<5p*29gQoWsBRR%7Uk2{X#6^^FW6RQ``zo`elRjfyrb;eA*2j
z#1s=4GnzaWAnD?p;ecd#`WwX?uL#8#$3|*eHh0_*=&h<;Qmx_368+;j(#f&0raaxL
zPfY~sj<0j6q}t_mK!C6IMIwvB+U&Mbm8O3=@rG$S@8LJ&?IV8_;w06`R!cQ$Ir)C9
znXgHgD)beIa(J4^`o)Bk>8qY{Wf6USEl}yLQA?L%OH>B+2;0tA^0m^#z=@s*3yerP
zETquH^TW3Y_xS_>Cj35p1TRv^f)xW}j%L_0DzchNEg5^j7lhUo3<5mgAVmk3$RXA}
z1g=^UdYz9AFS%CpJJs^_8ty5rD$6ZsE~~2JQqjuxptWm#g*Mw&>MyYt^NOfJhgw(j
zF}^^05Vj$k61h&uwk&v`B#pwphWIZLBZS=fNfn3x#I6YP19pXi+9PlXtf3}p?VTw#
zN*#w3j4Q7gwSzkQyyZH*$W%?NEd`5~m2qj>3<HW<o)hP~#SP6Kb7>$P_m`S&CTYh3
z%|lz&Iw@WoG}LuPipv{Ar7o>jbDHl=BFGZ!<_mcjY%qx)pLoAP*_8<?zv%QXM5_{6
z*5H<o?)!z7OSX3se8Vw!VJarV2d3|W#aTvmsM#72c{N)K-Z3vHCnq;2w*YLhk%q;I
zz<Vi_V68W<<L$xRaPHTnmz<8^P{En}?k!vLUw`gg>_=e3{2@NBkp6*+%wR#$2zV%L
zEa1E=To6=VUi<oYqI`b@Ny84K9O3E780Zr?_waA&XpeO-dl<Fo;8(LQc`Iby*s~-l
zl@XQQkFtN1KBBUyn99B)%HG3oO+HLzrH7IaD`k68_H|M3-G7$LzM+);a`GXi>_dtS
zeLcU2pCr8q?zK5#Dgt>j7vvit%2p#^wh*Wj(a)g)9Y(vzkX4k(LS^hspu^PIePs?Y
zJTit3RL3E|&?2E;91-kwHXT`odE>kD3WL#=rd4@R3^tg2dQDs9s=`$ot=g5x-zm$s
z+M0`+rWQtvvrVQfx1*`FIZ*AOJwMvmkoq%UD*X=oFaP4Z9O-^2fTeyYU`9X8!qdZK
zhBJ>8sC{~2TXh=(;!CFFs|dpxd`YfvjQx{c$LE22v||rK_&iGOfU9M^-{+>0m}q4s
zVIFw&F?)WF$)0C0alg%!n{O@1MZs^gm-rrj9_pxAd>0un0XB+#23b{O_c6QLvHOm#
z_}gt^Z)IE9Q^l9IR(r!ORbJ|!gvdOMUBi1&w~dv+C=qoj1{#8pK$Gk9`9vy#%x-Ek
zx;$#nHz5DF!R(Sxu$8P9eK#3CoEd{E)x|cYeg?SaCk(J!Bk|0X@VBxxGz4r`sA=I2
z8-+pY?eKBs@O4E25HM1zejh6;_0P*d)QBMm{GgW>{1JMG{?US$-s=z;KkK|P4c?oN
zIjK<knt#+cVAKkV{XOYb^v28<FTSf7Z@@ut!fJF1aV3Zus?c3hd?&25PSISHfUz?-
z#3F_0EPB+V0@Ew!9Yt2OIDkoUbaX__zSk4!S)tP*D;@r2>$0U+k9=3^I?|Mrt<Toz
za<a0s;9ZHDD^fk|F3Ab`k(oR~2`k9B62wz@|51b#mC8Zg0rx};feJ=F@@?e~Y)6bn
zquFS-ScTc8N$CN2Z_y(ax$$N6<N$gm<thEh(PwFn)SzSEMePl!w?R4^@{9^LCHEze
zmo2F&IV_yNCvyQK>*D+zSO&1w26}&TpgxEMknf%@&^@dG8;^a8qV1vFSi)Hm4M866
z^|)On#YIk2fyso7nkEp<k_gk)f?$fZ4D%l+$iW06Dn8=1pc6vlt->uj=cPp#6x*YY
zqJvo{6{vF$YBVPqJ<-|=>0?{=wp?|=)~s!H(SCLA1vtMzD&M_#d}4RF+f;8X>OTJ^
z{EyU|y2CFeA2rqEgz%ITp0Yy%Pl*;2hGJ5Jf0t)sCO%H%U>f64T4JkMK7U>MHFE=o
z=RA;~3!solkSI{;^b1s~71<VK-)y8=hq{m!*y8C@X)M43EBv>qOu~KaZP-2%4<!nz
z)cshCav@u)@I?K^{t(%ngE<CaB?g(6RzL9u@)iJCfs97bI%jAieqwi*h7E&@TboC1
z#d_zC-kO2vycVak)T+*o8VU>Sxdsq6?hQCiMOp15t$i)^S?ZSIs=?}(RY7CEEmXF2
z;vWSdc_xDqgpy!lO|@WsL&hJ#1i6Nb9FTfq6DNx==X7>uEE*9(Vd1C><7s006~YRQ
z2{bgoj<f&<VaJH#(g@<%U(<rio0MMW{@bxghIBWR@BX{dh%p@Gukpq315ttU)h!kg
zhsnu`lHU^Lpta3RVh2c4=mJ}fn~<fzFb@0xd18`?%!cEuq0)*C;j#+;+9#iULh#{i
zFMkbmiR#9>Kqh!3HWeaWQ7^Fsvjj9__aUMZIVYmJ>%yg#sEYcS`djK8WHxLEoC|0l
z3TqW;O(Y0nq%%;#tQE^-Id(CSbY7&f+ijy|07soC=vffsAuFw4rrhM6iSF~{{^nzC
zy$frr=0C5k@Wnz$8Q5S1&#wJA`kjZP*w$+KA%2ov*CcxODZIH=EO57W!~8@s*_~jt
z_)5#8P>?7s1uef@%jQGG5a*w2k~=lwa9Hp{>9tt`w@&=dtlt1$b7~u3A-#uuJJ>sG
zp`j(@1BZ%WC5VDU6H4K&GnRBT8fB4i5M-*X&}>2k6$^3Mv=tG2wTypYx&`XNrW3O(
zKnys^cyJlUGx~z8sLNWUDo|T&b()ylRj4*eB|dGmLRYAB2Yl6<I_b&EwhI?_n)7NZ
zEzS#z9c7NN))#b^U1`k=H}aS?SpSXY+HBf0)ME@o7(<xkAR<T>Ijbtm1bA-9nlU2S
zaE;<iLm@geYLd2vS;$}Da97dZA3G(`0h%guf4#sTIYASR#ztc!!4$5ZU!=DfdTi8p
zGx}cba@$lUbwV2pWtns?e>u9ot+M^*@j!lcb)n<J5=W^$qILUC_Aiw>)+2ZCs<tbe
zYqP@WVNYr+--v$e7;+t9#lpK4G7(4uNaQFXnG}~uEC-DerV9BDkWdZ~G$Y6P;SGm1
zckhzki+uW0L<J_2bcS069H#3d6o-t3aE5SP7Gch=4?@OT%oRSg^KR|o^=E3N_dY!o
zQB^{)$Jxfzaj-9a4-tX2_vWa0wIG%@EpjY@5e29=c5G@X9^Kzq;fr<h1uuLxUOJlm
z^qL*tX)S8|;a)tSom$1Sq`%BOk7y@ivkFJrI5350b!==Y8QG^+H&yv+5?uQ6P4Uv<
zk1yZ*Ov2gr%szCKvjgl~(h2M}pd#dT{}%rV_oWjwNuB1k2+1WmJIKDpzxlbJ<=@mK
ze=_}SAE-q(vRr(gb^*R@&9^nbq$x*pEd8v+e~JqdyNq>VrMnJ$E*sO|Z$+F@39tmZ
zA&#dF{5-8dpxW|}I~F#CwP%(T)@ZN%0iD|F<KhR`bjHeSPVyAD#qKPmQ%h}~_<<(S
zMi=YC{^mO9ov00SuAZTdxY$4V0|7_^Y&P*jobJ@3%6Pp^o3)}UW~Coziqo!`x2UbI
z)>5PEk4El{q56}=DPV~)Agd^iL3=L*jkEfn(dEouqF-F}ORYSoWq3~R(@ZxqT2>kp
z<1wb5XFmqUf|tg4@(u9UsE!aD9S0i?S|YxUc8BCqx!ubh^zCt#6t;SFp~Xdog)LrP
zsF&D<UD7<n-1rgtU5I*&2I%V1cM`rrI);gDojJYU;MKcy&eaAVeMt-S{)Qr(uFx7O
z$;k>dSc}9d!Fm(w^ocrQV{^YLKU+(667LX*+aQNZcW+;o#^F$TAX|_-=yppTIU4F?
zp0CScp-u)DEB^6Q(mY@~^;3H<v^cZ+c(c-@?yNw)E!_>mZ#?sy@=Ugto|);xxzlZD
zwn@0c8NqggfUWjkof^-j;hKhL8jcw2iqsj>*HjV6NdpX-vI50Lq$$!MRW>8BM=n-m
zHv|A8y8v_=X#%U{7*LYFkcLUlG4Pp1WUHGp*l;;bULlR;Dl7bHY_wqj8zv`lBMt^`
z_aHt2P-CJ){Dmcj*52i&k#V~{FPgt_cVhmR_Zgyw)@>1|Z%u9enp0bMuad4ha)Bxo
zjjHyYT(IJ-;nCYq%AQ>BD~%Mpxhi|(WdoZo$EJ|{d>=tf+@~RXa<dB)1y-zr#SXg$
zHoY`lvJWOXNf}Iq)!6iq24^Nf7vM^Rm8~La_w;Xz3G>I2jEdkVhlL7KEV&xo2dkQ8
zFR+=+U`vr$H=vS%L6Q@}&|$rTC7VsBw%W`91s`h&st_-?xr^)E`UT^S6RkS8uDh}%
z`P<HT04gxPMwfiJ#8uwXmb0M`!5w*XtFE%_p`je!rK(;EAvNVueL?!3^n2`aDp?&{
zl<4+C9j;T?)dUModI*KGn9i7s$q!J_da5~-m?%I&rxRhX<g^mXEB9GU0gK6tNXEqx
z4jRWZUnbsOdKB0eig6%EFkU8XeYAxfiRP>}=?arGFZqW+nRvMsm9~nKkgKYqHP*P~
z8)xO(jTPpQ&sBNkN1<|VFzmjvhyTPEO1@JTlrA+yvXA^ghu57`-D0#(9E_f_WYv8q
zO71|GsWVx&$uGJ1`s+q{gIRavS$jU-`zh>Y{$2htWHlkyl}I=(CMX_?>;<{RIvBFG
zkY!1#UWXaN`Wy`exR^p@b3<XanKTL(lH_+1>o5051H{fU>@qQASS|&iNFh=Kx&WD@
zEe<{ca1io%k+YEB9&tI`!RnYRR2V7@f>#K~VjgJ6-f9d%UD*&SYxMAI{Ee06*79Ph
z*k=dQ#w)yqo-*!s+dOAAxf;qsP2APsqW4#pdPK@q>BReMU|SO=4=}hURtdX*1TTXf
zHO*Ku?sCbPM?Ar<G!Bam{xlA!(HBFV#`0MufSu)LM`3|e!A?bOBHk-4?l$vuTvqu7
z>jET}7D8!%Km|n@zo*mPI}%yltp}d&4ivd}HV5=_5=OmR@76EtwBMpdvc?68^IGf6
ztLA&93$v4d^$c}aj(2I==1DbPzq^X_geskpv15K-&{vBjgOS$KYdf6DpJ;1(V632G
z^YC`o0xrey?5tvcd(e`Tj%-Whs}dI5h-`~;A^<JR0+*4Uh3FvQo8(Zp7<hJe&T5vE
zQ<#&sT&<WDwf1v7MEh58$r|mMaFQZpb`1$wk7_fsokWe?1Xw6!(LH6Zr<erm_)QrP
zk#U`=suE&^fC!ZvM0`Uso#0;ZdFj2NtZB8$0s|cd%T?YCp=O-Bb#7@@O-EIZW4N|q
zMUAANx2mCG)L42*eR57!PR)7Rf%b}}mBH?4%V<t=4}VFWtd!0_^8Sj-SoQJ-y{TnI
zbz9AQ-W4m7ceD<`WiPxSxTG!li5Hl(G=(Uxuw95!j>}L`Vo-yrRdDu%?}ZMrED;)B
zQcW6oPEPhX24z8B1Yjr<NRTiEdUBEV7Z!)0lGuOveIB=2gm8q(Z!Sqlgm8owb#TbY
zA1E&#SSrBcVh-X{Z0>3G@bbeqINw#jujYT${3>_gK#w3YBNwgB?NYa>>(x!g58Oa2
zNcq}&>8dYm4LRI-y5RgxjUXzWhem=XcX8;Xuh9bH0l`jPpBm$5OMeIFwL+E*l@J{#
z5u-dRP?1SYGeIOBB&fhs$KI#?iBbyN6X*yLrilK*TdtTiU1AFYvO+;Z;&@SJ5S92>
z&sw8dv^m>&ruGa^-s$VKi#BC@x-|3ir4vtr8QA90Go%VB`To=aUbT4zFW{B@RJ;cW
z_M~~pV^qN6i8`e#li2%V>qIYrBF*W*dFg=nFep_MykYf`{u4GWDqsnzRWRRa1L4-a
z;p27M<a4GCs>y;H(~x?wlV6~fzLb2U>Wb1!E-964LU%5)k<^LOohmn0*bw_#!ccCr
zV(Ih2oHcDG9L(S*(6A29P1C?bhi39pKqf@f_w$t(3vOVB3Hj`r<)t^rY_b$M3%o|L
zeo=P8fXsy`ViduHcvYlei+j^c@H0R4`u5e88l%Q#C$*_GL)Y!fiRK(XYAc_pUXmMG
z<8gc?`P2!U`zFs$@V4Yzg-*^-Icyw1fB3lD_UKoRsaqpX*O803l%M}X!<VemX8pD+
z$t(eWt@t<%@5{pMY~p?!geN36BRl63Pz8-;adr;ka3Su`YGjungE<nuKu3b8^>jhL
z3(J#@a%tr*95Z2XQixiS{*nHmoe{JGIla7!LlMNI5KX|?#qHI_`QSg>KF%90k5#SF
zt@6ga9lWzW`PiSd$(v13&O-gd5A`C|*P$w2lzfYhDhE^=z_&c~-wZu(4I4`ImlR7{
zL=^{JmLOg@1qNT)AOKp;BrF7BGme#M5`o2a<G?@b;#?@#gs=xv#_Gy&C>ZcVJPP|G
zgfw*fjCq*#<+ZdgcVo9s0tO(XIA&%#cuB%jI<UtQ6z=t?MpM|-ki0@0wK?*%s!nZ3
zcBi(}l(luZqt6s5sBJo&XFNxHPWCyPb2O5{`rDdH)nzeP&{<`zkK3bz6_+gNi&fam
zJv+~;7>ovO3(Zz=@v!~DIGgdFN?AA&D78W~Qeeo*((4!nDI^OKv4RTKHr|fI;iEWd
zoKiqTt^iJf4nQ1Sf{qT1r=cDdnqRmk=2&aomwQJ3m4TS=2gcWOe{cNMcJ7_|5^pWZ
zzwnG_Ys%(r?kZc#6Uo;%mhIkrpzQDie9MVBBrIQ%`b0XUYRB3)F5(tEkdJ(S5b_k!
z3C9Wi>Pfw45i9`|ca#MXT%CeIFth}-t6ati3e&hH^Xo!aS!gRvTapmk2x$+#L8kC2
zOC2TCR;jtVNg7%(7#{3DKD(*9S>LmxBR`TaJ-*{OXKpgce`d{IIHo(YS^BbW`?6%1
zzq)YyJoSku()#UA{YBLxy#g(O6|}1}(O$^aS_k?l^%}T#A$r@BO{z6DcvIjMX)d)|
z0c-e)SuA#&#cHv_A`e(&Hs%mR3Jj-%goGq}BQ$phbQ-Ts)i@B5k{`bpjD@CD`ywiy
z{ijeY+@D-?ZwY_zxx4t%<X8B3@*cj_%Qqyi<;#-ac<(*$pD;%;Q>7Jn_hwiHfvUo7
z27Iy}iQYwEPD#%vfzZN<aHeCH5=*h)LP_a8a0#Ps5hlpplBG|DwOZMl4N@OzbfNK-
zZAkjwGGFSk-Bf#A)BL|H$=~_!`nM&2#((E~6iMI>-%4j)N0$Wc*o=M^!xjOSnAxzv
z1pUx6(0f?=!7M?7>cRlRXu!P7$;m>@oGkQE(EXB<5`Rg#&r@9Fu%VOaW`RY_IqoG@
z4yIH_e`)4HVrHvV&-8f15H}2}SC#CcT=jLUHLDCb@^9+cZd#rEB%QcEsLd<)`x?72
zfLnayzJqP8f14hFga|%NvZ4R*I-xgj$VMby3_!;wu}da54h#TY*00XNs)ddV$4m!S
zIETmKc9r5ex$DSgp9>JD4P<13FzqU6&dh6nCgrss*`7D0-d9jlFs@mfH?Ce=anp2$
z`=<cpmTmL*M9)7zI)!YN$;+nu%PF(D)QkSQSVy8Q2Ma34UP(*YcvaXb5%9GDJ~%t{
zUJIm9LpiYw;6|__?2wlffR}N5ELLMy7IAIUVAg>s6O|zP1(U@FurM%@lICCA$%i$|
za=V+aZo0x&wo<!d+3Nh{-_;x>aY5AvE!dJTg@<#sq4;Pa(#2P*tNNNkaE+(Mm<!nE
zfi8zxA~6p!IMAVKx{OHCu+<XO80G`xU`(uw!G=y#<DkF5MA7m<g((-qu~hgN3Y@0C
zKaXhCh0R2LD{S^WU4DnQ!;-aasB^K&Z>nuN%V0iBdzNXM>XwBB)jhfT)-=t%y7~fz
z;u39`k6fI8k-je|Loqupk!OU_0q-q#fF5Wl!kcj07waO{$t>UtI7)J315Zhc<w9{T
zZZN)1E~lnkBt=d;Fb8X5L16)i2HpnnT?H=+aMB<bW@OgJ2dD>xv0k%k-6quuKi?_6
zw&P^g?uCu>St_q1wve;)>W;kgyT$xhZ}sy#eaTV&_2hDXyN}zFe=Po2@{jobLGn3X
zm;8x%ADe+YlwZ<Ha%>CU52tuDI^kEF!JlO#@l$$=ibY1uO{h}Ry_{jpXf321nzek_
z7u6T!U9G+*rzYoooL!^7=BLfy;ih@KEI1WfxiT~r<X=l(!1oef)UrRbTloZZC5Z8f
z3u)~LiC=}8DrufnSqL<Py=?;~J?WnYOZ^UOso(x*m(A&Q+3eVPK^B_&JM<w}LLVaW
zAHGd>?`F09*N_Ja-(ev{nRe{mNWvqVVDG2xP$8M;8N=Zt<{LCOSfUpC<k#I0{>oRv
zHwf5mV|PPS^g1x&-^z*6>2lJMyrxNBsd-%pY&iw~<B#$HEMm0x8c2>-9<R0uLyG|I
z-1*{VrH9sq)*UK4G!b0)`eNVC<9)k!dUx$A--V{p;u_WtACe0(rhLc{R?7BWFb1Nv
zhy?IzIE8E06C5EYkkQUfomOFokWmUd1hNLE$)?s|17I{595!=-A>WV>jT9w+WNBbS
z{cpoCtQo(#PM9X-8%#gcCa=_<F>R=DA`C2yg$21gB9V&}eHGS)ee4|RB0h!Q>sWQ7
zg4Fq73y7-1Y+SXBObto@ppuqA`oYvXwN48O6;w^6afFB|t|4*zMcO20*<0dsDja^2
z0Ls};@EjLO1z<s25{=MuX%>Qk;5~S~@SG=LOrj+;2yGyWLmP-+q~<7u-~_l#*~qhy
zHyt|+HwnjSWdY5LgC~Oi^6ATYmo|CLxz_Tf+cg(mo_t@!>n0isPrn|->#Fbt*1$mc
zs_<l^?QC=fec6!utJK2(jGVKObxQPZ%i|gwZK03@{0SY`UAq5I`*nZ$LDN@{Yd<y7
zES@<Y&-CCKlEr3|e6+kAycq4j5TfXW<Ui?&RSzD=+jM<jO`O`^6kAvG{bs<lhYd>A
z($9fMLdTe!4KpYX_Jl^6skF<>%PYt$D5Dt!K^OIfGys7B%(;M?r|xf|2G;Jko%a0$
zI$lPYD)sdGsHM90+yw_0HyybJ8V-rIqrFnJhfE-((==p#MtixrxyD>$DYeJ^fpQE5
zwAgCPm(be5=QeWV;ZEHT8+TrIyRL>B<IYnPmo4-*Z7*qExvgoOlqnLHtSSCCsZHQ`
zYobZdAp|BND0a9yF!4HUzO@swc9#SvpsnQLN4T4pi-&Rqjmkc1I-6;{n=Ln}Zzzn=
zr{&9Hux&R)ZoDyaLvn(e1`YWKJBJVQyW#1gPW>qPEC&*$ev#UR2-6IfT+hPdN;qfl
z5~f#p=TS)WPLw*a_BRW?X;mQ*jJ!9b480)mn?!da%!s5Sbs$&;gvcN*8>vzuONZ#d
zuNCHk;A^aqj*vmEH|ez+tp$bUP!cryN+5!8m@D#J+FCFFuCu7n!g-`p-PGZP&DRQ5
zOFQA<R(2LN<a&sBVeD%Jvu(#!h~7wi$|cMKd0CbC60&5$1BZ{jBYX4#=moNC88+U4
z-D}2JcJhZhu0L}`?5|bOJ-x+mg%2=U5>=55*J;s<kWdI=1_=vnuhpBfb;xuF;nt`)
zk+a%qSijF_N5_0sJ~(CCy><^Q^li)v)1#a$kRHXzAOHw}`UtWQwE_53gzSO*2!cKE
zCbAg?o%7TDHBo2OV2nBaq56oUlFq&o<El_`vD@MJk;~~Qj)ffjK(MH^)?zeTLPe!D
zX4vYS;53<?r6!}J)Kp+EwiKXC015Q>+xQyjA`2OGrJ$?Wx{wPIO|1+IN)*M0*6;Rf
zsLNWNN><sDv_w%oYm4-~dRHJ&t*tF9(l5!-H6OWQev2Vo*)HvCs)Je?Ro?`}|GhNA
z${FHZ;O)UnLL#vskuE}VVc!7K<u9<q)>NB?tcgMd1^v&oMTwAj;$_v!LVKZ8mVUos
z<Z|s#H2piXRa;hVIWJ!|+^%^;^Oe?~Mdz;_*jDq~i$mdX>EQ{xb^Z49_Z6B3wik!P
z?yW=1t{PvkXFkCLdM$3|cS`?5ePX_Z8x~`8Q5qH8gH#%$pfqkICRg!0lTZA-ZP9gj
z`q|_#A54A=<9sspBx0g`fRzB_gmeH1Nbuz<j1rH)pjIX5v!aFuXgO_Ca7fw>k?}8#
zM>a?weEJiW=F@*6<1gv8zbh4>zAT13EWkU|*o&F~u({RSSu6{T7QHeMK(oqi!-rJh
zNdBSua&FH{UUN%A`XHRVIC)W+U&F7a@pIT?l_TZ_=?6mzKV(;|hvp32%LTEeS2Ro8
zZBoN+2P49ZuyLs=`QZ9d&9)I<BCS61G>?}2gTIXjLn#E5fFGrmy^zSB@!e6}*J%?h
zTzDu51_T~!(MS<l#W|+q9u&`22C>%CWrX{>*i1v72~?e~C!-8)#{YdiGq;8IWmY{I
z9_-V;L_~BkaGJP~VZqpBmM>8jxvCczh5R1MTM?NKps~KHz4$fWz@5pz2CLHnG&F2?
z>Qm_<$pcn^c%3lb!$4vQEpga9s5ilJO0UxDH|KC<U{YmiRGV@|mQn*^OJZiiqP)1+
zXjH2s4Uzg-RdKi&DQ1jCMyJ)H&R6G^7hrd3i`W9ZR``F%1!oC42$2<`JCLsv*F)q;
z>y>ZG)aQSy`Sr16=aPj9-;xFMLRB@+NJXrOdlr|qMGEVJu6g0AikKr(6@%PO@+6<H
zU)sHqH}oyoB>9%rHv9QdeTzT&$A-lfgE0%z1oqeXU<U6W##J)Fz_?Yv65}>vFCD_T
zJK0jUF|mGn?6Bf9aHMk0-ki@hNHCd$(VKHks+=4)UXW$ffsFzLy1L@=aJZxdWL({~
zv}?(to_J@xV_r+RAzWWwSrRG<dff%Z1x2<(wNah#FEB!tGy{=_&jN{jU8}1h(wzR`
z&j6e+<6MSRM_<{zaG-BNYp7Cys+fEF79@gwWi8<&i{+EhzoM}s0mY$;8b_ou=17As
z+8^Wb#S1p7%135kSKrsYNowqiEUn=Ui>FV^m)ACx^WnM{KVM$g>=S1+hb4A0E9c(<
z4I>^@e?K;2q?-rDF{?nT_;;S2diJ(e*RA5GCvWDf_^Ra1$&Yw8&yk<4Ohr|<OY2~_
zx|pAk$StyGtJGPsYDp{9(xj)YfrJtJy{uCp835tdL%W)lC6UjgZE-dSSGyKi%P@n%
zfRVJZOqY(A@cEv^oSpR~P423hwuB4w91R}*7+JOc?;0claMiJcguq;@TR+!WMLgb$
zW1oPOMJ;8~<fSKPU?Y-vkxB`+iVM3t+5zkqA7nL1Gw3&D2vfih2(G{%uakHE<gQp~
zA&D$zZd$vfuurl%VnZ!bsVQnFDi@b-y=_&?WNT$@*}B^LWtF^TV_W;E(Hsfz=J1lr
zp(`hDdS&9yt9I|U#1D7wym{rWckiCBS=LrH6dUgFFRs^1>&C7gUv$RO`szp%0xHhi
z+TI$QNWP~vbad^UH~fYEi=G<3`qu7Je`xr|-5X!MJb7-s7eNBshRVBWn*dyFOnoe!
zC%q3DZZ$h4Q9#lV6~cq510F=Y(U9(+1POj@UgT6y5TZg?LJ>C<QcnKALVYS!4M9jw
zl!RYMv!y+R7Uc3otuu>`CGyM5%d5+)EH+;SMMiW+%3*9T!xM8E`vSo^kZ4V(Fj_YF
zgCfr|m{XVygD>Sr7B^SAH_z+b)YQJQsWGo${qpGIqT+e+j-LGNUz|{te0HVts*05@
zylS}S;K5#hw05+iX-%_sWnqnN@fs+gt9u#>g89j>{3Us5#Pbi12^{SX5?rvC!^cNh
z%kzov(r{P-fcL_NnZ&FT_Hn`h7(eq_K3IIP%P^@`SRG^l7fiw{o#lws`NHbRiUTVm
zb^Pmru25_wb|g=F`bZ=HIv`V!T94pCKZDId7fGUGp<o#VV)=O>2vAwiK$5F8{E%4S
zg=>wN%T85aqP;0z0d-(`7`qyoQPs)IgK*+g_)=LNP1<-FM@b6^(+a_#S^WX1<H5FC
zZ9*}<YG?tnC$}!%S6<@ZQomq*-=cVT^{UQs_(@gl^gCUnk+wk%?_GM*@FGj^%J70j
zd0!pBtE;_jWxju)dZ4nw4b^l<b2MhNc$*`gqx$G@U}4nb@L5aa0d-b1<~Yz|<vnpv
zrOV38TA{*X=fXzp1?eovj{~fOjf;KDNF5SmB<dmY>_9Fk6=ZV^vCyFKMUXK>{38c?
zHS9AsVQT}{W)xp4j_`5#)lXiw?eiKNYO2G*3~$?P#ZJ^muSnJd15%_wnZx6@K`|Ys
z<yOW$0ufDPzVy@{DSPznz9pyhNLeF?`#bjZ>ZP`AU5VX`^-|-uMQycJ3xhQyvEpX4
z-CgBr4|Ktl!PM1rsLx<udT2rSNqvsor6+ZVTDNu@Y#m!$=WXlCwRdc4UJ~hz)Gdz{
z7=1<l&Oq(_LJwpQte>CAua%wvj+MYlx}N<?K*vxYbE)*Ya!3`@mPoN|><ytjI-WK<
z*!3KbxHt^KfB`Zr0ct%Wvw;g07U3j{fma=rh$bSy;z3ELKjrg3nW#PbAr&^l|Din)
z)8f)n#_DQHD@vmgq0w^M%>@`+o<B!<J82<xnp9ddDP_H%-WXOMTNR9w<2J%woy{8O
z(S<<-N{#m5v+B^ohCoL^e5^0ylG#+^c9!T%ZLM}wu0s!B2<eI7f=KNk)cE+U*wEwe
z3fJQ!w9E;MB6E>u5%1>nA5=vPxRl_$448*`x{W^up8I+5^#v@JsLX=i9u5s8q?8sy
z6c2bFhQx^Cy<lIxnj}dOXhY{>DWJU(@t`_lKy45f3&pY2<Z;`!EU}k)HYK0BN!3x}
zDM?7rCqH=jq>~@vdDmT9`qo>b-AVoiw@Bn0WMeV$?!l6wB}@f*pE4@;DX=^O<{JzY
zN+{rSPjBQ2e-#UPtKfoUesQuX=!rH3ywPp`Qmdo9q)-}atndUHE8NvSr?rF*(3;Ma
zjr~S?3}bU7C{7JK42F+egexP7!^rZQJQ;tpH@a7P?9)-z*JW6>rmXCB@tlya;YkR)
zR50i#%OMHtfpi9BZdB16@-?aua%S`E(MY5u5{XEUC2!<wk32x1=)wf6<aJUX;DNml
zNPwDlJ^V2022Kmno$$R=v86)lVk8rtw7Lt%R<*oxpdu0-)D9Fx3kLa@l3(ImBIlh)
z{pPF;bq}I$GiyxLD+Va28=7N1R9YJKMo<}Qg@}zX<VUzF=sA@?Sr?#K1qi{N2w{jO
z`%ZU89H(hc&mGhZqS*n>K;G%e7hjC*M9UE@GBnS}Qh(9pL(i85Enf&TeN|!%;Sw~M
zRIm=fEGAJJe5zo_#E?l7q9>pmC0~@l+L5+GtHy$?g>Y*bac0;XYIRGT&g|?8Of+Z6
z8T7ca9ohD<#h6W7O)O8ejjiQ^7>Y$fUNzuDK}*3j`$D!3(koSCQZm$wPyTbhHzP5J
zSES^SL(ad!Pt+vOm7Y2hl6D^Xs`Sc{i+`G#s)O%A7<OdokmJrLJIDt74*n*;4)J63
z%qcJ%@r{vRk~q^TlZE^PNEXEd7z*Y(l#bO2lf`q<I**jStiRB4|NSH%llZSvf0Mjm
z?3N|ZCs0COau0tu^-rl9IN}%e!fcba;kcES<`d5JTioe3q>MN!OJ{<mNJZ0;QG_gR
zJAX6vd(cxz&r;-9N9|w7-(+>-+CVB-zLtC(<=zz6RwQ9uNad0*;o4gmE3)M!+mvhX
z<5{)1Hk9mAuKj}l8RafVxxpkB0P*Yx{Fc-gr6ycEE=e{kRNrp?C?pLqc$C!11sIMV
z^1yWNG{*m!`jezX`LU!B(=&eLh-6QGQMwO7s1<(-Qvre%2z$O+QY4=*4HR%$Lb?SZ
zpiD$`f#jfFC7G=G_I$H1T;lbI3{tzj!0LcVw-O4|r~{r+fJryT6~OqtfKvgwOYk~@
z`ptOq3;cuB6^KD=WL4tb%#yie(lV4bvV4=*lBQ+wWG{p#ip;uT_gnkp#xVD&N~5N5
zQ?}Qzq*1!c+1Y50wb+p`W+mal4N^PWehI9CO|(URi3?G$?3YN$1x39rfDE5$-$dzq
zGtP-Tb&_;DGpPcYleOacAovS%(Z_OdrYxnTaQX;c0D~r>8-g$gnd242MMUpfVr2vI
zfx4`6LwlVOcBDTH#d{j$HHD|TQ>UgbK<0|iji=fSJbicuPlqzl6rD?6mfD><EA@a_
zGoqsB?gA(wFa_uXa{ynkwFTpZSwQ9iWVlJ-P?K{w*4F@bH30DRdGfNt{9H4f{BjNE
zZ_b>qv2aTsQvD%%kaA{*xeHGvQa!1gQ?Jc}`;0#*H3Yea@CkiP@d>?k2JFD?ucpe7
z@e#|bG@K-@1mXKDspiz#koK#jmB~x#8gOYM)tK6m`W5h`QjF3|!y_+Z@PZ^574mH^
z<lD1RNevbdFGtWh@sg5H9)(L!&q5`%e?#hu)Oo3U(f(w5P9<++FQ#q;C_lfCk_wb;
zt@Z<G@vE!lam_&&j-_dsQ$*7~ma4FJy2Kp&|1B-TSkm)Kl0Y5*9lZeD)AT};qN40E
z&teXppLzmtff4}aFH7x79R}`8p#M}i;o?oeMG4X0>Hg=!EtE^+mL!4V;`bcypPkB|
zVm}gmj!WQQA+T?jyOHdUCkPFMuU{vZyr(`9@1315-N8?gNS`x?Shi2f^jjpa;p}3p
zi$p)ccZquQP_OX)pPF6aJ)ZS-{LQmyF0cprpZSwmH~#Cnz>b~^+;P-g;D4Sq892KW
z{d*kimX;~whA|E6!R{EO6`e`Pc%*T|XNy7*^2cxFdn=agkiK;P{imKv{oR6?(hD%h
zi&&=^W8BImRbiH%2x_kbLGuwS2iz7hjB{x^ida#GzDlj|xMX}it%=b=eT^vZyr8bL
z)?1%%&Ivkw6@I_5Jjc-QYqaOK9vy;xp%#Ipsc)BKd|$)(H0kjXgHNVb^7x>LG7;-5
z#z&TsHhyr)_KF*(_?xGl2Cf8u65G#z$v1;9A-?^;qQP*(pQgK+G<g3E-OV7uQkwD}
zMT6NP{yuvWxcj-+7E{LBa%g64k;*a`7x)`uZNKY3;%1=sF3%W>5^ll=4Dh@U&#1AI
zmW#LTq_qcAg=8pcmsqklNiReUP_4Dn2iFgKwpMH&_H2tvi8W^h)=-srN0;zF@<YVq
zr1=?=MbB0>qg;BIqM%}&A5#4R$!};EiaNSd&Fn+0DFv)T^vaW$tA)o4SOnBHN=3%0
zR<X1ra&<WU(yc<!OfFQ`TC32D?yrqUt2UPw`bv-p*ZEY;?_B`j&A78fBw!*KJj!q3
zqu}8PAHt$F+E}WvafB-c*b36eDvSiQjv^ofbviRB10*!EmJyPsM=L$95FMp<b76_y
zWGUrRZq#4ui<Xz=J9)9y?BGRK_~VVhy5mOhiCQH>rNSi&nzj|Z=E*8Q__RU9Z^NcS
z8b~f@-;-l`Q^I4=Ju0(b<;W;AnxrgnBHlLz&7Ll^BBM;0-OFy4%iK(wX(>65dai{n
zrX9N*Xia9c(hxc*(n7pH%s+qw+ZiEW)WB+x%))g@01oqmeqq`cas>V5aLy@Fbk?+=
zk^D3IY8${rRDj+~KzlTCd!x*fXGN%NNW2?;j<N!y-4r#HY3sauk0N@~V|Irb3hhu-
z-Pk5^hrQ4;qH1nMpq30C6Ju`$U;h+hop_~@Bey9qyn$_z$G%0t=g7w>(~rH~OqtOm
zPeQsVV7OC;A=UF0>Fta%VQz)huqY!U3`wG`^HqHqcqyw(#1KqHRm>rZ?1gNSsj(ph
z=Ob}iH)hFsOlFWu4~Zejl$#X$_^&11{xqy~l(5)41vnJV1)xi(DnQ^=35=f~3zj?X
zKkYOzpQ@4jyoh+D&pjtKnBu$$b8?B8lE7EWUCGip${AvAvfrTYfHc5<k@^v^c;Jse
zg6#uE-lRypNV1hqUXEuwfj|#V$M00h@kMccEVWCzRkfRW7>N<RYz&YUb@Ef8RH6LD
z6+Bz6m1irpiWATXn!D^zD-K>Vp5OX+rc?a^SJ+SAwhz$vD;wV*IP!7w=b8iROHfWn
zWyK$%@_Q*Q><rc)c`$XQ<^Y}(j_t~QCT-#1XXuZ<>41#S`G5OR-3m<}4rwVHlfKPX
z%z3=Y#$d2DCcVjAIK;R5I((n{|MJm^`rcu~I7W{-{>sKw7qc%(_{O^$lh(=KbdIA7
zN3(KHzuPj-2gSK5bp+payf5`C9nwXpgATN*x={Y6b8)P|wMv|~v3k`7IB#TQm`mcD
z&czX8!zz~gnHury#P12VLiPW}(TjHINVoMC+b;RhR~)KuKpb}f=W`v1>?h4}sA}*W
zEMBD!cKk8NkJ*&;d5-r`ZmuKq+2=CqdVp<L{o>d|TFdfbf4liV9;dS$Df5W28u0S}
zR}Yn*1?d3))WPp#HON1fKIVzvxQ2W14`a2`E_@fT8r9P{{(^FUz;T!I{i5<s*Z$k%
zjp=8+d_L=x>REKogRu^f9WRa$Xk|ynQHFC3`%UUoe7lwF)%Xr8=Vtz6QQpIzNxh45
zAF+2+Z>10ZB*uOVj_;$)oASXu;#<%Ef$PuX{AE_DvWWIOz;AX)D_BT;%YEwLe@(qD
zy(`}buU7N_=rG~=xsIdi<$na+a7?%L3!GQ7uoT2m#bS^QbYvWMoQK8l-OR=3IHYFK
zn+2dT3s{NrorCW>euORgPlwdVmdte=^;{o+N2%+Fz^AK^JrHBu${%M5{(H>b75IJ;
z2mQ`C#P!RWfq!S_P;FtIu(0n`ZN*Ul9J1rcXPq!48s;anW#BiQ=!=gxF~2m$8hAI`
zBbBpO*nfs_-6|PbFP^F6Z?O4N9;?QAuPCR&{^laYE4&<W0k<QrUNrTgD!@+0LA+uw
zIOg>*o!Y=20=@nX;+x&Y;_MlyOWs8srKh1vf0|W*-Zp?oY~)X{Rs5?MUn62xT+Q~f
zXH$RUh?XQB$0q4{QAZ`{eLwadYgrFJ9ahvU*hU=L*n1xU-XG+ZtPkVwlUA|IaC9M-
z+GRMpxC8s)PuMQRXxqeYVN*B`BASCythW!d6*QL-Z*c|xh@B#}f@Y4fdBE4Dyef4)
z)&__478{Y)0dH2YJZT^ENzZ{6w=p;5ii@Q<uKVEpx`<r@9LZAs9xwtuV~?YMtC2;<
z!**l++Q$FIPQiRx1K-bmICe_A*#_wx(BBBQ%wg7!_c6)ePW^-b3iI2>w(^HrA0J5l
zP1V6}LcexN6WGTwl(pmi9AP0<4%@A+V!Qbd0Pml%O6hUd2z~TU(1rq4H9HqMiu<w8
z*v5-cFES{wSMffhYywA_#)<dwD!T*RKdMCT8<yIR<2uHYkK;f{yX5;geu3iy9J_H3
z9LkX+`0mE<FW~zI9N=Wc@5}I=!1b@<cm>A<4%~-aOw{$?v@u;Lwej!ke+F`wOW67B
zZ;+Gx5ps_oKpycF+rpp0zI_TY4PQW<u4jNNF98QG!9H;(@ZbXWs5Hz*(66l-$2iUr
z&-lp4@;CVFOIS70MCn}26Yw0wpDBM)WXc+VHS1}>(fim_fa(Wa&yfL^FXfy0L4G#>
zGQS-bbkD;oxf)(DtE8Kx`(QKIty-bl3hvyb_NiB@k5@mUeqQ}E_1hY!CaP)E3~1JA
z4rwmc+@X0&^Qz_pty*i<dbD-gZtV)~R_$Zjmtc0dPB*1HTlZz%?Yc*FZ|kG_HvLNd
zM*WHU^Yqv1AJ9Loe@*|k{$s?AE6%FS+K{zB>*}mKvfjvgFWZ=1oL!ln$R5hxkbN-w
zj_g-+v^l06Urs~L!kp7`9>{qv=a&Y*q0!K5SY_C6INxxq;W5KYhIb9gTzhU!Zd>j^
z?z-GZa-YwAE%)8rWS%k4lUJA5o%d*dWqu-mD1W=rVC*wqY<$0<vtXoPW5J09mloVy
z@Tn=!<TBl7ddl>wd87F`^ZS;drP*?&<u=P3miJ)dZYuN@wiON(t}5JFcv|7Jg>Mx8
zq3{!{!CGpqwsu-atan+Tu)b{l$X05rwsqP@Y#VKt+8(hzZ~L|F16$H=w0rDz_HO&R
z_N(o8*dKLlaO`)S>$uVJu;V4iyN;wY&*^t2oGYAroQIv)I`42k>U`1prt`xhb<q<=
zFBQF0^hxp4#jlmDD0!&l`z0@yj+AaF-Cz3avgKv#%070fT^84r>onJ;uIpXjbUo$z
zwd-TI$sKjicaOL?x=(bU>%Q83hx-vvr)S9XgeU2}$NPQn&%AH@9`-#~?kqp0{NnPP
z%3m&jyZmFn+Hdlg`m6oj{vrPc|9=1F{u=|%KseAE*c_M&TpRdi;N74;=nO`KZNY)y
z#^A*vU+BxBn?rYn9tk}k?hQX3{$=>RNOxpKWNYML<kHBkkw+u1M&5}^QByP=ogW>D
zu8r=Az8ZZe`cZ|p!d?-qXsqb1SXuGw%H@@tD^IMvxT>}4iR#Mg=VHNFbF446CbmCz
zZtT4pR%5EUr{;;8muvUe-c<X`+V|@Q>eki0T=#a}$MyPpSABJTXZ=Y1#`=#NvKxvU
zDjO0F0}X2%_B5Ok_s9Pb|F|*OxViCQ<JpauHeTQOMw7G2-&E7o)-=$xs%dA_!KU+?
z-f#M}S>J4Fu52D@-q3t@^E)kdEw{D2*{W_`+ImXs%dH>HYo2%hyhq!NZ6~%}-L7rl
z(|)-9=JpQ~BZ)f_PbJ<+e9)oqSl)3;$BiA&cS@b5oohR9?|i>&PuHdMi|3y*|Bm@D
zE>JHBFX&q^vS8JMN4uTfo!wiz&+ERU``PY4^k{qXdJ;Xy_nhBzThDVnA1!n(Y+ks0
z;dcCcbJ4m*zwGVoeSYz!i<5oJ`z~Knx#Ys7($c=A-|T1oef@U~s0UUKJTmAR+&Fmt
z;N^pl4gPX4IkaNv?4jp|-X4~Qn}?4d{^sygBY7k9NA4PVXIbO2HOtOk_Rz97mrpH!
zfAs3nhgST0Z2Q>tD_twUdEB1kzIoictMscHR&7{y)9T{YZL1fqo?3m%>T_3Ly87DH
zx30cx^~0;5Uj5P<{Tl0<zBSv|T)XD!as7C3yk@+0e9!oy@$1KL8^34#;qmW}KR^EJ
z_?zSJj(@b4t<76&U+Y?1xwc_#+uH86OV=)6yLRo?wR_ecT6^`{+txm@_TvfX#O8_f
zCZ3)6Xq|Cg^SV{*E?xKhx;NInx1Oyxtv_Y`#p`ccf8Pf62LFcn8wNJ)WVAQk!uqjW
z9fGJ<VnNo-z6dIJV(t$7#$8qlnn~aEcL@&poN}66qMS=OzfL(<F%SE?a;}E<`bWyS
z2EHJ_Q_i)Jdi_;7M}#gICCYW`kp-h#InP3b#75;j2mAnq8lgV}&MB@j{pEt@Q*<r*
z%fo&d@;#&vfS)AyNF~ZSXFkZ8<m>3CYQ1s}e>v4I<y;M3o#YhstcE#Nl=pznwcuw{
z%DIjWs9`WDuIrgmeX??%#Y)u|DCapWs{V#@Zov7^mGfNg(xm&A$Lh3R<+_pCwTQ_m
z>MX$duC86jAK0^H)8;8xO?9l=HL`iq)w^r&<i;&KUBeSQ_qqo5?AkiHe#+IcZ))?d
zJ$qfj%~Mmy?`^KC+O%bA^S*VJ>v!#_8ri&S$Hd;=UF)}P*;%DLO%HeP+BsE$J5!T;
zLQ&TVc)&F@xp#8U{>cq4y60Ltv18KZ$!yP4nfa?vbZpVo#P%)gYbvX&t6P>W9$ng!
z(L{wPBA3W~(v|t>^2t4Wx9r;K5><Sjhqvr?O}M7^Ol+9kF|lWxYu85C$bsW=zG1R5
zeS+~#ZJF4#%hkVU*TMC>2r2-|2`8LTIh8KD<HWhIj%-H#V*JCqHcp)|v1ihS3mD?$
z&b@%lzMUH;_qe9;B8C_Bx%!Wv+$k6ClM6&$>EXmGW0iPeGtW{r6Z<E&Y@b-SeNu+^
zgsZz_&^0mD>{9x&cm19%$4~98+`DCa<*q%Os`|V8KKl+#0(Y_F*#RVO*a8N2GZ<JG
zM1s{UhQkGRW;0l17lc~7z&209^Lq<~iY_(`BblAJ;sV362luw(-g@zD2iu45&A7Hl
z+z*O6r_jb;5P>TE+k`r(#6GqTfsodt<PKb=mgsB(<*2pwY@2AS>ZrEUEq9~LPSjJO
zJTrwJ?7{Xliawp7wBQ2ynM8ebXFonS;9mMU7h8(9cHpWD#O1Tb=RprY>z)hFKxvpQ
zLQf{xcKlus=v4xC^sfaG(-%X^zZ7S)Ye|oy;xp=)T{;uqGi|z9W~<A^DEFcV1Q&XT
z>0ZpP>wn+!7V$nOQ1=wzIRR)+3fS+#n{uJmjrbe^CLOO_r~8%1T#?(KLO&;f3A^x2
zKWf{BO%q`P;UD3Oj43DJO`d={rjDs~2Rre<DofZU_kZU74~srep@j+bfbc*rA-}~*
zf!{LD?87;YW)I2`=2F>VK)+A)p2kZMpQ)MN(Ry)}aE~zZ=(iKYsOXSq*j(+Vdouyd
zoj`rt@wpD4)b<R1)7$8VkYo_w6X;trzGuU5FM2|A`*_^lixvq(w&R=T=O)a%emvjz
zzj|giUd`a>XJIJTQ`!;!6UY5P&pH0UGf><fvUK#ZXJFB%Mhpcl4AJ!Lhj1{2a{@OY
zzIz^9$MdlxGa}-SiJKt@u&{4p)h>i5nV%iOhH?Y9avKY9JNqMda3}VuLF`nEc?o-(
zm+~_1;%@A#yzE)-<K^r}+|L6%$U__vOCh=Xm`8Y&S765<;Z@)rqCCc)<2CHZ@SAy_
zeZuS53%s5;@HlUTRHK47!=|r=RbihtkGFB;0p=vl0tw}vyo=B03t;To!xv(L)UX%%
zBK8yB%NO%Lz6ATaezu7Z!25ED{ge+Q0^~BjoR9Jq$b_(x9|yOL)!1FGL7dHT$T!Gu
zypALke1fmz>-h%k)+fRL{EKhoo3KON!s2`@-^RD|9gu;%%y;r#>=k}I+YFi0&k+56
zFQ4N3_<nu@?0pYlKY0>D;hqd*^Cn0>PUWZZ)A<=7RITh!Fa-DxKg`d<j`JLTE}O@{
zz}|+eV?K7kU*zZW3;2cnB7QOU|CjJf`DOfaegz}~+xeFuS@<%)ieJsIVLSP?APzUe
z6MX>?EXf%>>aOQEupagfzY!YQukf3o1U;UAmEX+vKyP^~{~EuIf1TgX_VRBar`>LT
zC;uk@7Qc(%&F{ff>t+As_wxJr{rmxVq&&zU0@D5*KC|D3l;~l00`j6h!uG*0^-=yk
z{unYxJ^^XhlaMPe<v+mAy`TS(Kh2-v&+;F!-(txc<j?UR!>9ZO{v!VgcJU`-p*VnO
zq9^f}`78WqFhP8k{{s5$*ZAv@OC99@15Nv{;8*_}XqkV@f5+eAZ$nP@706pphJ4^|
z5QFzX=$7$!_@DT@u#$L>E$4q>Z?RAL`~0u$3v85s!2iZS<bP)?AgTF?od#*m>4=DT
zD*q?{g#U|w%8&3QhcH8eX#$+WVR8w{z)E-x!rofSV#gu2_y6ha+Jf7-&hz3BSdbt{
zQPjnbV7m*is3^n&#)Vg#mWf>~Xo`wNQDg+jb%Z4VQjj1*21(0yZ)s8|3TNuhWYW%b
zdU<GWljP+<N@_RbWHg;7lb61?({|cEwGW+XUwV1zxZi)y0kG7ion|<L|3Byd&wu{g
z`FHp1h5y1L+K<>Ui?R_m%8uZc_L%lhcn@$K-~KtyPG}FYEA&U&AG4F#;rRnRUwT|S
zfj8}*(VoTm@+mw6@f>@WeTtpJn*h&gALE|%zia=2bKTeQT*z1O-1iaf`?z=h4V;}G
z#o_QzaK;+J9l&wyQ9RFH&_1tKus5-YJIhhrb-k~RVdww5+V`}d;7;yOu~+d!?N7B2
zwZC8ni{p;Li`tL1Ff*}p^=<7x*#tYoKF!Xu&)|O_Ch&FsBui=UvzN5r!yZNkXW0L$
z{Tue*4DENcIG&FEUG3}GJ^K!d**CSXX@AJFEQj5Y-`Bpyrtl2s&#=#D;tu~k?aR2H
zIKU3gm$d8JKWksq{v3N#d3-^Bmd)WA>X+FoYysckI>%mPi!9G<=CA^DS&=Q_Dc5D}
zovg46?6d45yTn%6WwyqyuywY<KF6-&D>G$wjlF^0l{fKUx304a^VlY<vKp(iE&K<`
zztR2?->v;C?E~#^aq{%{`2OubXn&{uHQQ!4ScBbUw^)<iW;?9K?y$F5J9u&9!Ua9Q
z*{;7`5AW|ZGH%|L(4J8+tzcHcDGBpk=%}{h&(EoLo?tqgR^#(sDCD3&8_wVMs_oWJ
zIN#cC?bL5Y^6kdXwpZQXtB3QhfWuC;(XQ^_-fGt0i8!^^o>#?5>Yk9Cai;V_)q?<l
zcFXJbPV25PM|TBLYGW&_9HphBv~iSGj<5z=O-0;8(_~y*8Dw`2nhCo~aaSs?rf~En
zG2`%3U+L%)u1{`zQtil6PjvA0O|L!tdY_RkpVyarVSplPR!7X5aUIb{e?GjdW?z=G
z>&ttMX01MazAr4g;+s`DYgWG?T&iCXN=7gESb`UznBtT3WSqQyQSx7u{1<)v1MbeY
zWS=jnVYYs$r+vmPDEAhW6$Rzyf^akFA`GxbBu_e<Rld!2!=jSPaYL7I)we^FV3hKO
z+m)uc3M#m6dgRiLeWXx(|8~>cmlkEyZupY&7$qb!eE8CC)7!lvGfgCE*3s9bwQJJa
zHJ`P@!fZyUmd<9f`W3-Ce8uPRE06GJ+<Bo?Ix|-ct|Qj^x)3bAHKW!*Ca-Vwyq3-s
za%w8&CASM_LK}TAxXPzR<tw-A73B@r9ocx?3z?blhVsIO%$v{#EjN8bWRHGT+H|#V
z)6msgqu#FXHg@%^+imad`f#~VlmRJD>19DuO%>IgicfJ)zb3>+uJsaM_j(2+5=A-C
zo>efTpl}41-n4AzyHI2s#wq^%yrSC#kxpuSz6+H@)48yxjQ3Qn@%pvKt4rIfee)vK
zzQQ$M;EGaU#+lLU!VbOOqe5L}j-%9blp2mQ#}Q^g&FM(JCtq2tEU~+m%!YBfFREkx
zP?3@AEjvB0Z;P3SxBFU0w|!X{+3rmdyg|k0MxRk{^nw6w=7$=oW~<s<Ut5vNI6?{3
z9HA6AY}U9LZYX^ks_ZmG;z-BmW`}R~#Yb=X^oZWtZrAHOO>d{xsOnAOYP~6Rk2ZaL
z!6x(-(lXAxz9U1j<K1cP?zLNYZq)T1IcCQ<W}vR>P<B?XsEp(2t)6YD7%Bn<<zBhM
z(617zAR+||m0PpQ{kd-BRKhvMP^-TJ3(7yPifch}6;%A)%t-6;6__rDu}dXFD(jFv
z+<L4I74)|BP+MBt_E{@koe`>`4(0S+>7-qs=XZVl!9A)wdqR+O?2K9u8C&1)c?qJF
zH{33q4ej@>b(Qam$|r8udS$g+9NB-|+6+9~wN}-eeNk`rWxcs8b-&x!edunl-rSY-
z=G{J#^v}4(Y5iS)y;0G_f0dBrdHp>hHu7FC_d{FPx2`vI@q1G=nn85j6b{MFiwc|0
z+0M{=^>!;oKZ26BW$veKnOJFC%#lscPQ~uj+l^L@&O=ZhYhvj*`Sn!Q+pV8`GEIui
z%Op$7Ga;<1>5*!y+1j~{lb=1W{cf<<+Sv}e`%(qa#nd?B7lO@3+an?96xAM3RC^F-
z^gGzn-0PA>kU$o50SYs~CSf+yg(B2An2C~|&8B7PhE8Id3=S8Rq&ayS0ysM)9FO$c
z91=bzO!3G?lfxOE93xc2n68Zckchc&#MH=*R_m6x*?PO~>lMo<ol_Z}%P4snJBn~_
z)|;)neder+oHQVfryb?wS$Y1F%gV!VPOjv1E;l_al*`Vfyyjk187G3K8ndD?+A~u&
zd$#&nZGR){Z#e$OjK7f=jnSSb{In_27(e6_KfUN{WHSDS)a0n&KR$9+3YG@Ka!OIv
zkk+ckoS)+Q8aX+caBWtmTsrH_OIN065aWywPy28`Pfqn`ef)%X`3djx6P_EBm7^DO
zFWk5(0>QSn!pr9ciVYe(n2cu|k33<k=5QBncAmwvOh3aG&j+~5*FGt*zr_1-z(4t~
zPi(OnD(Lu#PM`kYJ^Hh_O2r@7EQ4zsCAVxCD<5g2mshxc<ywhP#rWBBWy?6&C~-F7
z{TXiQXw|B@8H>lcR_2;x7Vbk=r(!30z~V+_E6JH<)C~S`l?TsUyMHz??6_5z>uxE|
z2PVpEZ<OL@Ja$kr`06UU7Rxb%&k;6PE*l-m?bY~Mbg7oX(?m}b=fl;K0c{REgGW|N
z74#THix4(L*i0o>!G|4U(3VG>D%aLZTw5V#a5;D>8vmg*&R<yZJ{r@i#PLx`+boxB
zUYQ3H<+91O)l$7&PVxcEa19=u@L)^GSuOF9X>;AQVL4bUNglLJSYp&Vp-tN$3fUNw
zI@2#7sJK-=Fc}BYF%FCaOwdV(Cg7IKrOIl|TPv5$a=dKt#VaMyV&n`pf0BnR9(EG<
zu_GsZtD|Y!CSqjT9%q|dJWz!eJT#f)Vap&@qp&5YZGr{LE>_CKQYi>k2d(?zsOGr#
zWV{!xA?tATB2r2q0TmqBT`}AP)1ycV4{I@s0ykn%va2QHX?g`Y#qd*x^V1lG!9COb
zgQAplrhR`nGJy1mnep;uJjq8a{BKH^*StcKk6JLmF!+dbp6mi*+GRdUtu?ep(Ms|o
z5HluRV!#7csLhW!72}{{@FQ?ql8;#{>!nVxRw$q5BX#qgBtL4cTrRC#k)5$P`j3hJ
zajT<^IUA+U*qFlup3RRWD9e#ec4vfsM)AV~ClQH(iPchvQXkH;4-j8WJ31LRF|3Ot
z8;DLruy}}Ch9yhTe+j*ZL-mvZb~Npn2^TwDJ9i(ucOn~(S=jkv?s|!jnYQ8bD3Wj3
zM8erd1=Ig<d^~{CVcQ3l&bXf7Uroebgqx1TwquDTKVfwO1W&@x1fQ`w0|cM7IzfV;
zvN|Dxr|@PA!I;$v6MW9<3=(|a>I@P5j0G=9zjM6;51U4c2i~LwlH`*<;>jNIElEuH
zh-Z4lwj{n_X?!H{3)uHdu<r%vWxzgyao9)jMc7Bsgna~0!#;u&u#eyw*hlcwu#ezb
z*hkQ^j0LfLk`~-LUNIcRwnDk!0dk9SHD&Q+f+w*GU%~=dLZ&`(8JgalNj3C;<v<!H
zdAb|gPISnnOye(2c0z#@ZVB~|qL}fy=V?4y%a|6L=O9hWaUU-Zs5wv6mio1mKM=>6
z!Z~xUlMS38Tc_X;81Td~6)X~OF3G2@)H4f7KJ$OEBB85bpGAnYlM_bDSfWAz*DfC%
zESXCvJS7}sP-sydX7DAJ<M8ktD%MGU6l_5h(FwuUiD)(-auW4}lxY|X2aq{`n9WE@
zc|2&^U2cO{sFo~VE<IqzfDwDZ&J3I?+f-i%QK~UNG%$-;*@*VxWr~^-NXP>ab1F3~
zI>)P_#4*Q<0k4!%7akqsK{Zr;v*^vmOw3S(od9AM$a}&hP=pF`5XA$*2qEEc+;~J2
zNc1pxLMVY>9M`CV_UA&fyxjGL0S!WDlrPK$xapN1i4UTP7)H@tqDd)=3tgHpMtYiS
z>!p;jfMYjl&txZr_Cmq+3AC0$>YXOYAU>XX6;nkE`X>3S-PwfqRk$j2F7c?z-4LHc
z{Ya4)i~OilT8-gIYAlpfomAjB*6nMDsB5v+L)67X)b3cnyhlgmEk2j<Gjs=aC$ud-
zpEyAJQH~v8r9VwK1T@7{P|*=4QyQO<p7(gfw592k&L&n`3M)?<R6t?EF@~~VWd8pz
zrI((RV82KflfS8sEtqq$xG!JgWu>Q!0z8-KdZmcgd?HRUBfltXdM;Rk3r@&ok8={N
z@M9@Hg;oCgQ~H-7E^z!9p9ar)i_ZeAkQZIJ+bH7T+x6B3ixQfzz|Ehv@DOYP$VDIl
zLM~bN1EOaYi0HXYJT6FU#6!px;vr<6cnI0B@B*Ed2lhE&0fAk$9^lp*^_76hzB2Iz
zsP7u_3G5Bx6WA{kpTORvIUTTlp5`RvI?YK)h2|v0Bc39VP2wS>N<4(rh=-86(8~t4
zCG;X}Tj)jD4WSod4WSodH-%n=-4c2c))aaXb{jr^xfj44(c<SoXi4-npm)gW#KsrV
zdJD%|pv2RbDDmtH9wHFW9tOYCle#ZjV#M1Lr4e@}O6>1I&MQ*nyAmaa_asUTzXINc
zp1fZbEg|pMBuebRE>U9t4UAln^1dKZV)#vo62lk4`)W_#mqbg*`z?tQ`}-0l_Ag`P
zt5V)qBuWhTBuWflwI1NBbKNsqJHZF*eBkuzJKe*0l8&sn$olyj&L0CG;2<Y2tL}8P
zu>Auq`TPLhAqDzjmc2MQJ~%KaTT|Mkeo7aui2ZT&;o!sIL)@+(0(HdxSX&f-qK#+a
zI;R8oF5@!bUa2!sD|F6K>qmoMz@ur4_o_G-1`Do|${$W?r}g9dKy>n>z$fqX;BVt_
STzC+w;oZ~%X^9NiwEqG4b1ZZK

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-Regular.ttf b/docs/logo/josefinsans/JosefinSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ed11900846890faa98285ecf2b6ded1b18828fd9
GIT binary patch
literal 87260
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

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-SemiBold.ttf b/docs/logo/josefinsans/JosefinSans-SemiBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b67504a6e3a047b50df77282b55e0f7ff21b12ad
GIT binary patch
literal 87880
zcmeFa34ByVwm)7~x6|F((@8p=oz9++03m@SgsoYUKmrIMEMZ^5qOycV1O^c|L`7vB
z7sm17h8r>t;>KXcK_8-`;xg!<gNhq&5qkg~ROtKvo^x;CbU?>>^Lzj8eO{V#`gGk>
zb!$22)TvW-FG30-;(=_!J9O;uI{cDCPVnK|SvRz%wxX@_V<eT}_rbc+=Z(Ga)2@Am
zQ21H<X5H9vgTtG@oi4<%gF-}XJa24|vh(-d*HehGGr%xo_QIL1jW3QKgx`Bm+{W1}
zmV1*c><<VzY%i|QpW8ZbVgK|S)(ANq<wq}^H*;Al(&KQw4d2dr3s%kbKfN7gPZ=S^
zUi<txGg~5W9C?+H-X>hHn2!Xz$G!!>H{y5h{DsR`#;(Z!62Er{5q{T##j|I=F!z=_
zgzP#R4SaLq%$2R$&X^%W_Q(alchSs+a|W#m+>75sg>d|(b@8(0-LHD+d?727g>c>7
zx^zx!QQDc&LXN)!{NMwQ0tj(Cy1;`zy8vkm#nr&q2;4{9DV_x0CH%n0r9(&=E{lMR
zWfSmtIT?7W#2w^?ax?I~5~a!y<;TFE%1?nmlb->9A-@7XCXWMuE58#`#i$tIOqB`j
zRU?I_rm7a;Icgs6r9?PVy9=dys2)fyRpsF8ttx=4R1MN=RV~u%R6SBgAiw1N3VAVf
z;zhMhsG+qZnncWknadZ6OtcMux-K-no+x?==b%Y7Uf~-usL3lv3~2<O*f404SG0^g
zZ-iI0Hl8=qE7mm8)eTLJ4PJ4xnO}-X;WlZ7{!21xO+=#)jeFQcj6k3B{lY}7NHJ+U
zq#@O$9l|BjOxh{pMY>6civ*D&GB2F7bdh+H@iUC~F+RZfZN~32KFatQ<L?*;7S3FH
zp|mrOW1Px3mvMK-Rg4ES9>I7#;~5JtTzH|pfbj~(movVB@$HQ7XS|c~GmQ5$ej9yD
zszhV(-}SAbB#lS!|31nl!h~HogcJ4te~u0pi5T;)qD)ka!J=L?ib-gz6TLTzzim<^
zboX4FZ0FX?<apyd?IYtmGeX$W(X!8*!j8_C)wc^fgj@DIZT#+^E#!d1%<F{Ad2y!}
z=y$7FAz-28L;8<G$p>`5d{F;F#NhWM@?rf)`3T@cq<*BoBtOyLlSlOv@=N_g*^b{|
zBmJ0uN}kl;P;UJTm88GRCA|*(o&E;X&oTa1#G>pkP_`c>za+PTei)@Zg6}`*Z{Q9e
z@*O_L_b2*0<{dsn$?u@l4^i_9uK7aoiOiS1<X|~kPLm7dYPmt)D!0m=a*sS956ds*
zDP>oQDjODJ0PMgdHD9ezr?n)lN~_hHv{~AfHf2k;b+xZ?jB-qLT<+N9*y7mk*zI`H
z@wVd=$8o1{#yHcRU7c0VT4$4Umb2Bl*16GnyYoTklg_=)H=ReE$DF6bFOPgY@<7z)
z==kWu=(3oJF>_-!#oQmWJ?7n*_SpE?!q~yF^J7=Uor(*%oUV9RscVvJjcbc*m+KkV
zUe|ut>#mPn?XKglQ?5X~Ej}VXE<Pzf9hShWza<9gpNPfy-lQKAck27ZR=r*9)^8Wj
z>UWC+kjF1Dq>=hb*@AD(Ch{u%kX)~SE^om#jk&=o*Z=P?^xOYwPh<%jN(lql0S<r@
z5Dtg{L;|7!(SR60EFccx0>lFn0EqxMAPL|BBm+_asem*<I=~uLjOKc1)75|tfNKEP
z>Zf3dGIYPi6&!aOVJGVM7Np~l*rUIP)*iCBNHPo=AdcWw*v+5)<+Sn!?{Jk-hP)2n
zBwbyQyA8e3hTdpHZ?vH|+Rz(q=#4h?MjLvg4ZYEZ-e^N_w4pcJ&>L;&jW+Z~8+xM+
zz0ro=XhUzbp*Pyl8*S)~HuOdtdZSG=qlO3c*G)M;C0k%ITG2~kXx~w*j=}cXtQ51>
zn3cWgi!4AkAP0~O$O8-l3<eAV3<cBxY5|J@t$-zfrGRCC<$#L-D*zV*RsvQ5Rs((o
zSOd5OuoiGBU>)Exz~z7|09OL80;~sI4cGv<4zLk$Jzx{y07msS{iJvu@CM*bz+V6d
z0dE1`2K*Ip2=ETzUBKS}hXL;a-UoaDI0E<(@Dbo+z$buD0Y?F_7UD~Me+6g<d<{4T
z_y*ty90!~Ld<*yv@DIQ#!1sV306zjw1I_>f03DV`03<*GG=L2d2CxGh04E?E5Cw<^
z!~kLeaR3*fAD};A0AL`%2N(nx3>X3!3aA0p0_p(60K)<GfCj(_z(~L-z<Gc%fJVSr
zKoejbU?QLyFbOafa24j5_4*O$))DB|5$M(t=++Ur5$V?hZUEc}*aY}B;3mLt05@Y6
z>jjDOL!$hUC_g014~g<aqWq93KP1WziSk3D{E#R=B+3to@<XEhkSISS$`6V1L!$hU
zC_g014~g<aqWq93KP1WziSk3D{E#R=B+3to@<XEhkSISS$`6V1L!$hUC_g014~g<a
zqWq93KP1WziSk3D{FpCxh^O_3L>u5wfM)=I287NX&>VOZusJk)z%wR`a3|&*!$$o1
zY<-fZ6(FDMXKly-Ui()p?7!PfGz;y5-Q5Mdy9;)A7wqmX*xg;QySrd_cfs!Ng5BK(
zySoc^cNgsLF4)~&u)DipcXz?=?t<Oj1-rWoc6S%-?k?EfU9h{mV0U-H?(Tw&e16W@
z|4F|~J_C48ze{X{7PLbP+MxyQ(1LboK|8dd9a_*1Eog@pv_lKpp#|;Gf_7*@JG7u3
zTF?$HXonWGLkrrW1?|v+c4$F6w4fbY&<-tVhZeL$3)-Ot?a+dDXhA!)pdDJ!4lQVh
z7PLbP+MxyQ(1LboK|8dd9a_*1Eog@pv_lKpA<ZYznm4#LuR$wb2fP7z6Yv+nLBLyp
zw*h|z90I%pco*<Dz+u39fcF6(0FD6Q0mHufVPE~QuYTB9KkTdDw6A{HS3m5lANJJ`
z`|5{%^~1jUVPE~QuYTB9KkTa?_SFyj>W6*x!@l}qU;VJJe%Mz(?5iL4)ermXhkf<K
zzWQNb{jjfo*jGR7s~`5&5Buteef7&o=x`LiqX991SU?=W1?UIp4;TO#2=D=5tzcvQ
zu(5vFSU+s6A2!wx8|#OS^~1*cVPpNUv3}TCKWwZYHr5Xt>xYf?!^ZkyWBstPe%M&Q
z9FO}?#CJ1b5@0GI=sVE(*e!XYn$nC7`voiP#|p;=&(;g8lLg2I<N$I3c>wZ&2Lpxx
zh5~8;wSdKdR=^U#Qou66a==A^6@ZHYD*>wjs{y|PtN~mCSPQrmunuq;;BvqffGYu4
z0oDVq25bOa2iOR>9<T{;K;O*X$W{6uQTs>apY%UNEB*|v_%p>3&>oBqbkh&r^g}oO
z&`m#d(+}PBLpS}<O+R$g58d=bH~r8}KXlU%-Sk5@{m@N6bkh&r^g}oO&`m#d(+}PB
zLpMA7enER2hC5?LpkK>%Yt^@rr8X@)QNwZlcGL{3K!5|_1cU=30Fi(wKr|o*5DSO{
zxB&5h1VAFd4M+lb0Lg$9Kq?>&kPh&o53&H+fE++BAP+DIFc>fdFceS&s0Azrv;vj@
zmI9UmmIE#VtN>gLSP57KSPl3UU=83Bz*@kifOUY&0G9)<09*;U3a}n<HDCkaI>1K2
z^?*%)+w_mnS6jKSTJ#6uQ9cT3+>2Q)=zSZrVel78Y*3cX9uNA#@;UTwn3XTcNqsKa
z9z=G!RvucCehd<HOkM|oN6jUj>%oS1%5T*|{|0$aAn%D_4IrDm8bnE~U8q5a&IR*f
z6~O$ROC{Y6as=B)?ds?cTop6WXQ$w!o`4NK0ULS(HuMB+=n2@+6R@EtU_(#9hMs^8
zJpmhf0ygvnZ0HHt&=atsCtyQQz=ocH4Lt!HdIC1|1Z?OD*w7QOp(kKNPjH`oiSMrf
z?SQWV#{k~|{D9+t6M%04-vRysI0g6~@B`pSz-ho4KmeelhXg<Z6hH&m0AT<-zyWXq
z!U0i$Xg~}g77zz;0r~;@0|o#F0(^i$fWd$vfT4gIKrNsSFbpspP!DJTi~x)Ti~^ho
z7z1boj0H3S#sMY*ngNplQvp9U9+FpH?5~M0F(S&4U{DT>4g2@!=F{JXUl%ILKQ-Dx
z`RiEs1tr;(C0al7-NB(Bvm`CFmccS0b$TFJv!E=p)Ja^SSn=7oL+XQ)i#B3*z`XSn
z+~?*GP2sXadqJp@PbgZ{eSQyxXe`BA59-hA$Mi?_|Ipzb=pVs5_?Q0l5B0ARed0ge
zuYZBs{p_FqkB&?F>-uN(OaCnZat%1Df2)7n!NFI*>-_tde;N1JTT$B4U*<MA=&t%3
z`iszH{?kwC&!HvQbqN0bvsM{A`cCx3CqaJt4sDD6o&FV4KGYBBf5-Q~R5SfdXlcJp
zce>wZo%SoxD!{X_;@rnZ8Txj8=RYqEviviDh&ot*`nCFY`l0_0uv32oqko&#gFBG+
zBVT>d${_Tu@M$Q=Zou8>i!by$f;mFCLS#V44g&r0J#K>!E-<5p{6TKGogqmf<S)yx
z{+|9rNQQrd{AI~FyHNd|vr~TQ_b=suw7&F9W&G0hpT7s<FxDT&_@wpY=Ll8!F4>mi
z?IjT+9P=&YJ+zlXtpKil(@~6m93PYqi(+ab=%2VBmDa&w<k#^BN)>MAdmk;v9w2-W
zq5m0Dc?YCM7G7C+Gg6|&QGq=%NpbiifTMtR0PVA#0tB!xW&=b3;s8m2bO81SR3V@{
z_RyeDaw}jP0Fo}B#O@koQ?>z~6E=nDzUl?22KWHAfDwR3z(l|_KnnnShpH8@0)QO`
zbver3k20V$TsCGXc@SkkgKwj3sWyP`2Efe#v`XCtxF4_`uu~+;(@Lp!{y4E?$W%yL
zqDnQddR4wjm8de4s=|(dk$0%7H>uHTiW<-KEbJ5*R~M<}|Abnt)|pq=tBodgliH#-
ztF8F8O|_{f)pKfxdQlxz2h8h7)VoX_HGgA7^cyjrQcq`mE8{YZvDAk!jXh`3o6M^i
zDII<!aEW{X_<H#`@QqC8O7u<O0Mk9>BS<fhj{!$w?4&+h-VN;GtHULFQ=h5AfJbpk
ziF^h06-<|^!Jw~KUf^3vCiHG90VV$+{|vgf+ymTGVowM7Y2Zm*hZyxJ=#jK{tB+BU
zz(X*WQqQBkUOh)G0CuRkz}>k%v4jKb`HuYw2OeU4oLT|<3%S&nFuqtF0^L)s2OcFS
zKz4saJs_`BB>SHeEp+(@q+~-|fYo8(*O=!8;*q_W?nULuOPT&H(@jkO%1DQXN^w-7
zALOO#ZQuv^>TP_rn(1n$Pcwa59RbfYrWbNLybH)?AF8uVl}`bGMlG^s%dU)}akd{&
z7o;fcW7(ckv@iB4<q~@+mv~Qm5h-z8!rP=Z;wc?F=->cP?&rAy=zNs;Nc6`3TsEK(
zfSquZsbn?42dD*%05k$70;U0402csS0V|+;RNfK5Q9wI@Y(f&g$r=T~vj%WEU<2R=
zz|8=h1Ax>hc|Tw~U?*S~;2FSPz<!hq8z^lk1LevH0HjrtTnEd29ei&C4g)>{d=5AU
zI0^UxycMz^_Vb2eoc}$Y2$h=u+4>Qp6SA}1J%N5?xyxRYebAZ*RNP9T;?@GL1Y8T)
z1h^G&2jCvSgMdc>j{|lC_5k()UJ*9e6dYBl0Q3V424IBZ7T|jnph;-1@!)$Ca0u`|
z;1j@?06*Y6z-gge3g86901^SI058g(g)$}qsO%X4Sctf#_%_N`u6*#70LlPWfB}G^
zfO^1ac}?66aW}`^p884ZCrsUCQTJQacBXcMuOn@jb@dsG+G|n!E$VfqC~rsF+t$^?
z7WI)ueQr_5n4-KL^*d=@{UJ!XghkndR7Vb1R4~mIZ&AraxiSH{7S)xhQlwQd)eqEQ
ziyCH8qnK(UY^6=Is2NPnMc$>Z1;8r-YnkduBkD>{yB1W1YZLITfIB$t9@m4eN4ONC
z9=E977PZHs_F2>`OudO59chQGtM6NsQD-XoODoN9QQt8|rF7Kbbnt4tvM8rT#aL9L
zMWqrI?*-&DRRXHaqN*%vfJF^us=gE7XigiCv{~^}fae32$1eh=wAGxpE`ELdM&`Q-
z)MlnAZHq;1wWw_twZo#Gw5T?wp0moMQeL#K9<Zo`7WJ-088x6BM>y>$>ep^j$C)~X
zv;a{FwjdRcw1l{Xh=insbWqtuaay588CQ|R;0wvo9cjJJ;;TlQkMB_nY6Me_pe9;r
z(=4imsS7MV%F$|FUBT3vgbfKdBwU_wa{^JfThv_^b-zVzXKE+-I?{GoSD&${y%x3K
zqF%SCw=L>0Q&e6@4L-82er{28^_W$^V+p|=M%qd1D&;WJeh5;D0u;9`(QZ*uL?y;2
zY)DMDsLbHi1j=jV$mOeDQ$I;8rM^n60Q6%DHY1U(MdBz>Y$sgzfSN>CnVMlyb2-O?
zPFI&&S6A}YwYYkvMO|xAo0z(lu$6WPQ*<{Y$Ah3APkaQpGqs!3_AobH-DmN=lK5ug
zA^dtjktmdGQeRq>-=e;=sMA5p4I7d8zS|jEiaW--3L9aThkLkFgZFT!26Gr`l*6Qu
z!=$_xl^-m{U1CwNFGk7kDvLr6)MY?W-`qn{LOr#asnHfS-lC>h)GVgvgLe^A%R#NS
zsC5>#-l8@#byFw4&DPZ|7PZx)wlTE>Ii9qrHj8@BqF!X`fcv1EZH}9$BUai`i)v@;
zIIec2owBY5f>e^tq9QCRjw$3#>PSnnuBKa5wnY_MRClK6zE=H`dRbSiEy`z6wL~S2
zNNP-)Xr)cFs1}R5fcaXJRwS*lsLPq!fc!Twbu*~jE$S|dx}T}-gsrrl7PX5hE+y%i
zq`gT$MeRq)uUl8&X6kU#M@gS^UZRd!)Jco_AxL?IMcIk+L?wL`k``}WO}3~^i^{dA
zt`=2F6qV9Z15br@wVy=|wy0qiHHs)tlV_4=22*qKYXMVBL9Mi?wH9@yMO|xA9ekTO
z?N;Qy$8!g8XX-&td&Kj&XE*ch0kzMfUa_b*E$Wa(y>C&dF-oSqMk!xf6s7sCtKV7F
zX`)<nJ&z}=U|O=%qGBv6k*MTUfY+k(Evkg6GF+`<YCw?kJOZjdd1&%zrp8+orzKD6
zbhU$T7V#y|$JOP@i;`C-uLHH7N~T^*-e^%b5k-=iyxB_ILR9kBPJA6XI;d?{jvbui
z$>isfUrcUGK9Ee*L5q6VqK;V9QKs6#*O7MIx_Zi@0zoRpW>FCq6=zXNOi_7O4N}sr
ztJy({uBH?Q>j%orVWd$GlR^%Y>TXfJf~BNXTa?eDYAtGnMKxN~M50orrL?46Kz(KC
zerGDBHT9E}6_m!*8jE7<lY%h{xq5?j6}AXhZU@|DQTJQacBXa`w$gSn^-M5F{83Q*
zQ}(93-a)0j9ZX9(%-pz|@{yJHdCIXASf7+1Qb45&i?Ul(ltsl`R5DSinVs_HT32Cn
zjPj`D)Y4$dsinajW*Tys6mpnUg+=uXmXZpKWY%w3kP4|YY?FBvc~Pq-lrRav-csre
zi<)au3oL4>MXe+%buHjZrmh8ME0s#rtybC{7IhC(4+3}aLBsK(9FJQRTOUr_!)g0~
zU$Lk+E$Wa(y-(EtMq$tc|2#^`(MUZs7Q^vCwTL5l)6_o@i@94vtWQqU{sMfL?N3DO
z&A|D#+kj`=5TTV*ZHSbD=LqoQHYaejb{hCzTTkGbw%-AlY7YWW(-04r1sdY6vPJtV
zr|e~XD`Sd$-ferH=?@T%?1Jc<RJW+lfe&eKA|3G?!W^*-iKEH`+Cijm;yT=-r-8nX
z>%39B9Q2ixOKg#d;>s$@YooZHv}I`rkkX&=4b1Z(@o2O|Ewy9nCR`m$G@{8A7adDA
zk+*V9#%fgaiQ4;=u2C%XA?<sjxqp=QHR#PY>_^D)wvE7f+HdKqb`@}wwhlO5+Ya2!
zQPZ&+MZU&rR|5~?){WI(2mN!g-`{G8oXag-^WSREf*zw&Z{M!90&k=`%Z=RLja=IM
zobo=Wyw52cDHooD0;d_jy^~wV5nYu|wD^cxDz;Ed#huhfv4mOy8m$m_Q7dpt4e}u7
zQ(MG+)D~PtTY%9PV6;L!$andG%lv@*YADy|Las>?*L*0|P5cM(;8`h*k(Nn3+BnX2
zgleK;rwG`tR-<(XxrBpULP)GzJ4xxbV#+1o)t&>sgL`Qe-9<ahd2iG9Af5I_f$6@g
zhR1iiI)aolS`F|w+J3sKk!)|*UILHO{!TQH?_}*$(0{k30{_8wCGcA9*K}38gfQew
z%HP{Oz!zy-fp^j!@kGaEpl{UZS+eaK`br+r?qvG+j4uWLJ=f~@+%7-Yf4glS(gU0x
z;PlXVegdZ_aQfp+KhAV7?tzP0R{OA&=5asUSq^)#yoK&K%+dDYE(Oe=t7FGRW^2!5
zL{94TTwE@foXhf)%jFkwujZ4k;WP{SRxTqR?46LNETg-tE3|0PPjZ>dSYK9hO_s3?
z)NoCfu|_Q8UhT&kv5I;Ids4%x9M*ydH0(rxCLLMEI<icA74(H%tJ4Oiu~P$i)K1fQ
z$<sU*&vXAzW}eAh^BGLHs-xg}jLUD;UIX2#T>(6UYtl#C26_eeNh{Z|mD@X)^UmdR
z9^%otkkjX}-WAhT)x<qe&3h>8)k>68tu_O%*06gbi}gvsaauWWKaJ>-+F0OfMQz-q
z(01{KBB{Gnk-YWSCIcrclB;Sp3pkSL0!5Njt$xF}3b;GpeFEQo0PWr2D%sWb+63Sl
zwF>w@nCB$({0H-Vq2?pK2e+#SrF7bpYM`A@q0=6wbOcT_jr$^n?CM);E!x{aximz)
zfg71_WXl=FWxmSya?4%dpUHJ_E3$-cMOxri4+3APXuP7RXT)Abv&<xQ95`8<f|L_<
z7jVvId>vAba*9%SaSF{TZtPr1>1FMv-D)X@p{?{(C$)(7-GPagWn8N=9-T5Cmojw^
zrE~w6scS)JF#jgHqqsr~XN>xYt2i(3aEYtwUU=e+O1_%!@)zn!q;Fu1`BBVK3z=>N
zzKUBnkyDnd8#$fi?J6$kYTC6HSJ57`__aD8nD>yxCce6f%ip9>rljpJU`{!u52joK
zbDy|cO9ei~>HBRq(5vaHyq!z9p6hu%bKXdtQV^%Sk4w9c=?vb5JfB8f_Fy`L$320{
zQBP4hvQRAnrrkEexG#3VNZ*sVKOg3DX0gmCao;9!uPz{|mPy<L&$Db#X4y_5*%l{R
zo|9O%lhnt=sYN0EGfvl7&KHSINRLt%0*^EKN%E5vNqz+1cRWjS7Ry+c`T^-U^Maax
z%{BZT@rd=@54)M)&f~S4WEJN#sV6t{=<HS)7n~G41^gEGLl$enThtrko4`p*r&@`9
zdNuIlf@adkxy%`i$4MP2FR;FB;Zf+k%k>oM#=Bf{F85U`_f;zOl{m$%OXc23;U4>n
zQykn6+qfU{xQ)#wC-p-r_d_b_yU@9fI@e?@<2$)$#<Kj3rSlCkms^Sx8sPUc51sLW
zjvKj{-@*J2=D$NH89v0hPLlLW2T81qXIaH*DO~-Q^A6%({g!+6Tb4as6w*=es0UA!
z7yuAr1fUTx5kOvN3*Z7kD}d5h07$ot^e8b}j2BbHEHPg!63fMEu?{1-5%j;i*LoxM
zte(#JIvOE;OyEc0A$o7%>9lXHZ=#t1JhOo3>w|!M(`*NxzCzk>wUfsaCGHV<sOOu2
zLjdx#J^_#iNxl0W0P_=Rt#krn0EvK9fESPtC;`AK$tu7Az)(OvU^HMnU<v^HjB-9;
z5nwrBHDDb8@=V^Iya})wum!LcuuWuO7vGC#OiN^$tdaxdP+5;>O~=bAa+aJg7s=&#
z=5(E04=?d1xmj+(v!~nS4*8^P!`Ybs>E|;_NTzW{<Z9p<B-45;<7mb`)E1-^FpgC4
z>h#%a9dH)Ox;|WG0gr-JK`$|X3C&^p73xXgQuP7w4LD~6DPp=+Vb;{U(~PC}Ru2JJ
zs26}sNxSq(G#BbI<O$*Q$?t(DD7;ZXcXP>kI4dM=jW*IfdLEx_e;k0Qczk5&>P@ef
zutQqFRuUqY<as{=AkT0&U=Ls);1$6CJ2LBpUVJA`V+M1|7?}u7_@6Fqi?wbzA9P5=
zxIhj_o?;0H4wIAw+UZPK;252$34E)K#@IRK1M)$vOCFJb!1LhG;jI!%<l^j1I>xMv
z@ZubBK0axp5Kq3RixPag2%i{)D|Pr}i^=%ph^hGGin;jYiN#_Aa$E<C=@U2LGg$l@
zpCRHle1>8Tc&DflTk)xdjO<1kdoZI76Z`S0$NB36q5(GT6WHv}@EM8o(O=?8{_pS^
zEhA-=7$f6lycjDz(j%H=A<p%TljX8pjK_JHeqsV_&Ui5qPq|MM&9Vijc_!hV8W)Pm
z@+zFlo`SYTTW#xNwk?(0md35hL`{aFZO!;(aoe)FZ8>PwMzrt-aR=J7McgmOhzH^6
zO+ty`@CfJ>cp={Dp<w@d2^&u5R0@aeE6>B#F{n|doCwRB%k?TkU2aBiO3Y}_A;01`
zcL;v-Mt7tp;>{l)$&c~okI(SNk1yp{c;m-6(l7rmkJDQ}aDp!rYu34V!w25!fV>q#
z;B6iwg@;SP=%d_waV-)prCE;NL^6-xL~=R${z-8wzlr1#eiO-O{3en!^d=ISNpB*N
z!{|*UaumIZ1n(tLIJrn~4H5j-5SyYmh1mH`Ara=?yYt;^L@eJu1F6&=D;2e&w~yeY
z6{aP6HwoC$?_KbbELmaP`(fyPAFd3-Czi(`hQ}a|$3WvTu(4!?p(WSgogdfY6VFl>
zhEcgu*x{>e!aF~HjrKVpX?Nf`?=AQwqRsc>%;{E)Sp>%HkH92%k>Y9bXV|$t__!f~
zFF`VtC}!!1#+ySjz~O~7OVp?qnB*dy>lDlNkhu5tNT<6Z@_>6NzK6#5(D)uUzDF3}
zBZBW?XE~38lpjSczl3#i;6&L8;BRF(BqmC_fZft9TryAQ;T=3APcbY{F_5Rep!-3p
z9FVGUz!T*p;K>-NWQ^NX&?NaWEctGhe2;9!S+*F++*Q!^>+n2I0%qZxLEi$6NRki9
zhaho(!r8PqX#aDt_zG{Gh`^aNjU^gu6<G%Ea@0d{JrvhNaXmDaZVmNl2LB|~#*W%d
z0ZsL=;jY(;FutpU?;3{EW4QH_TaWkQp!MX<g+prTu8R8rt5viTaVE49aW9lhZ^)Sn
zOzqI%NnDH4sWo9-u7+|+vTQsOl6zlq?`z!eHe8i}2st2ZbEkLO6e17)aEcTj6J)~;
z$t)6mVWZBo-flC3-)_^wZ?{>)Z@0Ob-)^&=-)^&)-)?i5-)?h~OF~;9J&Bk(>3t#n
zAV2V~aEEZzFbZ$C$%34fi~g{EW6X4V>rFDOX$kH*0Fu^drqdg6Qea=Z;T+>YJe`L4
zAeTdL!%2lb>MkmvH}#^)Os6;Fq(N$Xh)T$9gBWL~(_3=Vp>L(43ifLR{9B_OdSgz8
zC=fkGA6V#-VuG1YZ_mkuX3|?#hQj_%6wNbdE?BOT8G9KQGA?CY#n{Jq7~|25Co-Nf
zd*-q^YChvdjF&TB&3GN-^^7+%zKQW>##?63Uf8O(wk$Y*o_d7w<BWGR-otnw<5w8J
z$@mcC_ZfdOcj?U8>PyCc#@{hMO;}Tmos44`Co)cD?8R+oYWa*y7?&}wVmyHHP{#F)
zM>8JJcnaP$wLqK2cs}DrjF&TB&3GN-^^7+zUfQxqyNU7bjPGH*jqy&#yBR;nct7Je
z8Na*iqSj^FM~pvbe2no)#y=3Y3C4EDQH<jmC$FBfbg?ayaW3Poj7u3;Fz&~AFymp2
zM=^%nvF4F(kp}*Ed`rkGmGtjmvIBTxob$*3AK)0y`|n|nkwSl{4gXaf#ks;5!>2$A
zWR)c52f}v7;fy1IVX4_e|L^*iutId7e-9^e-v2uGuvPN0m6-vLWhqwNmt%In3GY+8
zM{E;2MVr`*HN-)27=B?p>W4ZaCaTdl;`Y=lHmo`JiFa|8eknv5XfD8Y%qX0K)o6>6
z6RTP-0V`YMd$sw!()^~V808FJUuyntHA`G%mUt7^zQ#S^Q*(}8=5KzE4kaMQLFp>r
z{N7-GKWWq*&u~b!m($#43QmjTSqQAdkdM+NdF=p{Vx?f^r|u6)p*!3RcszvX9{j%C
z;-RNP6y~-P)Gq=OlO)pBEZiwu%>>SYSEf`E;*Uy^{}bex#vD_bV+M0fXAY`W6998E
zeOvV!f#2|y6uyy$Rihe!((VxV!k=7>U!@_xB>W8rdI)c30N%-XJLCHaD~@_9oP9=Z
zyufyNFi&9Ke-Wz{^d7#kwuJ}qlu4sb(hvB-Y;zLzoqV5DjlN3)jTk)i3Hk88JPjTO
zyl;6(c;tTg&wW(2>Z|&x{&?PHpz^6fYOorjhN>F8Bd<;kQ^WD}OM~%_Jh_|8F>3WY
zloTnm5dT#&3-`ck9`~SUis-#$*`iS1&Kz!e2Y(mK--0s|d<uTvoxsJ&MZ2I1I9J|<
zXHTfl@J;=ORoM>tC{|{V{g-RGfO`-A9O9+vz%R@Fz|-I<CdrroOD$H25`}S%s8;*Y
zLd3vPx>R1(4Lwdie-G6YM7gR&&l_t1TtR9DJQ)1O*ptjYC|+exnchD*lE+G^JXOFY
zq90H$^{s@zk5MB1m-EmoxRbmeBTgfUrz#}Q-y`Kd`G}DMPVB5AZ827WlzT2{4efmy
zHJ}<wu173g!%B_tec*^fKGNUC_(<G~bmSg<=xOc)kS$tIhT;D6;L|QbEgZPxL-2&D
z+-NR0hRaPyZW_zo$ZuocUC7<|W%Lg9Oa*j~o;;%!%mI|U8xnXPp8A5FSJ&cOhz8>u
zqf;jM8Ba3!^yj5#mP7u=HB1;K_6YH#Qpa>yHru;$s8{e)K8UfyDpD4*j3z*bNE-!Y
z5gLK}C89N_@H<@mgL&v0@&59kCjTs-m(R*iRjf*o`{e8L4Y^BxkF~==tQ=lM@7&L^
zgohB@dl(Ug-y^2bCSSl%osqiyPepIuqliL2?2r%MX&wC5W~}d~ia8ju#aP8{!s_id
zc<@`{zdwyuJ}dU){d9knuc<EbB{cz~LeT(3bSM&lIDlK`VU1FZ6-qgJbuv~6)3EZn
z5G$UmutK;FD}!6)D=JmKil?^(=HgWLq!)=*m{ndAABeZbdsv5kBEA;?kT&syl!z*1
z$`qM~6;6LdFbB$7tUZ><i{&zT5q7Clur5ET-12FaC@)YRm86o@Xf+PIr5WNH<xm=)
zv%@?56#NDir6T24<z#&p;xnwR_sTuklZ}?2E1QatZ_B^RXXFuB`E*)IV(s)7`KJ6E
z-p2Qyd>>Eex#W#vuY4RafJ5>fL`?5g8IY<E<h!tqQJ68q;Ne%plOKh(#aKkLm!gH2
zi2I;n+p$m4geUZx)fhabH(8BU6V)WuC~WqX;JH<-gEdV86^&KGTDex<h?wkuK(BYm
zS5Sw~5N|l4(o{FnWt6cL^U(|HCH0<W)1tIkEnZ90a<xLOyVg_dt=+7(X?rrS%G{Fq
zy*JUD>do|Kd-J`e-fHhq?{e?m-mTsTybpPQ@7?Kr!n@o1r>vx`?5zB3dv<Jge6~9~
zH9IrAID1(3jO;mi`+rne+0b7!WTaHwW!CF1Sirrg*HJ`5PRJirSHvTN_1cGe9nyqm
zN4;FASB{q7sb1?)ue-bn-ehmO*UR<lW7g|l@BOIP!`??xuRnU*Lh9v0y;7`twV+-S
z^^(CSsr6VfK0wdQ;V*EIux{v=2z(QGH1L9c6H?YwI=(Xy&rj5&^(ft;hv_O1bLO)%
zp9s9tfv$e|JmbwD9{KRj4_iMR_~Brr4gYWir<O2w9{KLb$46`*Ag2Gp$AB+Bc<+O@
z4-j=fT!-t%eQy#w@C+OOX$oTmo1i6X7+<`-aiTWOxPo7Z>uXcAx!R&&O6PB_1=knY
zGGS3NZP}sMY^n4MZ+}EY(3Vad!9N@BLSX#a5Gy8t<^BJ$osdW59@2983G_Hkxz#w8
z1RZ``*|GoZfj*=tjpk$MeGII?ZZ#Hqb2oJPN%@3)O74X|)7+oV)+Ph?rW$MaQt0Yf
zQ&$VIk8}y^>vdw4{83yZwzJl56VHho@#NtLuuN~mD!m80^qKe?cIh8%nKEIUV41|<
zVVmk<od&`()ymVbD;L8;!9L0BvD<PZq6i;Bzh6hx;A6xYzCw)P7~%onz!PalT;n+6
z5hp}{=|JS*l&FH2JU}{O2fi0WWvm!1qeU$uP&G1649CvVFqwc@YA#}{*<z$jMszg?
z@z*5LAhQrxEf7;=k?bm_%MvkDb{8{bH!%x)`z^Akm@j*Y3lIZ69}%P8;zC)4UF#;X
z1UpVw;b}`)J8_eoE^d}H#c$*cv02U$zmxOD?U-wSE9YX?UnK693t<Bmh(F3J#gp<f
zalc$DcF8NS^LeRwN?tDhBsYlvls8~y@UpyByo&v(SLAKtQs}}Xaup&P#o}A+_05*0
zh<z@^6Q4t{8@2(_q%`p<A{(EJYw>h!JXRDQ@u8@ID)p0gaUS*u#!0VODQm=foW;5Y
zJ7KrV+2SFr1)h-W#2t7?^S$t8SIauF5fQIn;rYuK<!@kZ8%<j~33hiP{OTNdHAS#h
z1u6@kLa{1TxmX4K8Bwb?d9`>(UIXv&eOTcmuy%jND()S42=8LW`!{$?hcM&6f%*9_
z@Cgqhj`SA%$u~tGsfoTaObkS%tf%-9@uM?{6$KC%(&00lMl8IGXp|XZjT{cE-XNAq
zpSTDo*jC6P;$rx3%jF=kPL33p%k#t)*zLPgjuDs1QQ~1d<@$TMQv3nCe2?O3)}8Va
z@t9l-tMV(cPySjwFE@!7u;cfVyxE$e-o;#)A)iKcx*c|zW{khHb^e;(O|7Ej5Aq)>
zn&(2yTkwjKF(2NmzC*hrM6NF@+@`c)Hna!JH=J6)wCk25oK9ziGa|ti7v}I3=Vdu^
zFsJ8e1rGUc;2*Wi<Y0#!y#9j8(;j|UeRn28#vVNitIXwUcR;q`$6=4SFMQBXh4WD*
zcYL~|9Oq*!o>wiNG0?JpA{;!sWItjG^4L}yJfc7`50_VpU9NbG_fZX*o<%0gqc^L2
zaW07OEpk+yJiv7bmQSpm%U^p=`PK3Ttboocf0tQ4^_lI-bMh3Ue_uR1&x@gXww;q_
zkU9^Vd)9q&Lh@*D8F|p=CTK>b**}$F3HHyUHm_A~6STG#yra>^$INnT!OQ*gm{~6O
zk6CU={{+jY{s}GrURz#B`Pa)Dls^Ifcd&nIg5`JWpFSaZHgTPbRU4$=XscDH2D47w
zr@sx!bDbQ7`xIfVS7qiIWZp+rh2+6`Qe&J8P^V?Ez^EHM(7tA#zQMW?5tJwGH%1=t
zR$)Kn36e{-;|XvWa!LIIoiNJ9JJ?Bnti1PFd8;wnhYguNY~`hPXzyA)#VQ)so#np0
zGtXldPmSt>eKSMu<B7?-*8+=YuyVn}=5oH^a!7aeY_%WtOu?Ks!<QJ2t<)3=N4Gu>
z)bO+zWgFJ8quc0-zLYS`Rd`PZY`IeI2BB$UI=q1{VnmuRspA^7UK6v4MU80oMW?2w
zrl+PCxstN&j^yGnyFDj6zjv>S$^ydzl-up@#H8}FN>~E5Ke5(ZSznYh$g&8sU%%AE
z!pyHHPurYXIH;GmZ~OynA5u!vl9Nj1!lOq+`m{sFeW>LS>I=0?4hiiG+d88!M1f)+
zj2&!>e2K={<bBiz!F>sttp4k;ErZl(#QM4aNc7NpieCtA9oA*Bm~HBOLtQe=hVvG9
zQ@S(EJ|_Z`uXH%kWj32O6<wCt5H1}KF;!tka*Gjh@TcPNqHE-ibs2w=j<n)DcUJEl
zSja4Qmb=`Y<1TP%+Pc8Z&(B{EN95OmkH7tP`5#(aw{KU6TKBf@-7GT$A8|i$U9{`b
zMw~gLwrTU>YjAzvHtMSh_<@Lj9Kt;05nj>TR~92}3N=>37N%@-P)FW|No=sourRFM
zxSq+$$=>8HdAa#nxeiB4u}E?!+H-PT<z+-T3d+kWdiToD$%!|<+~x9znj6pm_=Tlw
zdv^O|PFZ>XiV0im$Ml<dzMMU=`ht1t(9}tN#-`*~mz0(UY~?+Bb>D~Ez~8OZPpNh4
z2qdw)uQ(d=2l3NXx<sW=K?RQjXOk?+OA{mVQ6n4VDwo8H<f;Ny@;LHyvRSSmSQV8X
zHDk$;B@a!WeD8eU!mi!NH2D?}?!TnI_qdFn*<EKp(6Vs*%<R;KeQGYQYq)rbH)TG?
zo$I09h<@~%^UgHP+RjI%+;NEe(c;-*@ib!QPl3!K<|R{@iQ41g_LR#oUxruOwC-6d
z%+|xL>|u#gITD--7~u+geZ!6js8~0rbl8=2v?AVMSBpq!rlaj>a#)ysy0F{R8qfn`
z20Dw>u3<+EGIi%nb_dRc{EN9f$kn5BE;t6ia5G=YIXNK167qCzM*E27=4KzQ70N}q
zJ3qH;Zf<Tk<l4q^lU-1mL?c5YlkF&|?5=)h;OusXLmnQ|)W5bUCo(HBB|qJpR1{w^
z?YjD(7|ZlI{WFTX7nk)e>J}A~l;BE^>fIw|?(Zg@J-qHhEt_nkF~%=i<JSbQv#U9N
zU1|I*p35zsK8OVDH{@Wyp-+nS=~?I#?JVZ|axh%1G>Hv1obhH=g7Xs<nHV4Gj&kRF
z!yHM)2@q2138+wISq1e2bjQ{5+BJ_g&c1)v@%KhuJY@Kieyi1?1>0s^aQB4P>Lurm
zUse%7oCtM-{)UazwxCY==-(W%A18%K*BiBw@cP4figs}26zxtZs#^@~K|f!gFq|2u
zqjsh_a>@>SgrZ=MVq=Af&4^7;OHE1kxREW|<;stMzb1n9b>;Lfca_HnE6vuaT(%h%
zA2a5)DMr<&O`9LAz3e?-_C2%NXu~V>pEui}o(;Bv>W*~;)t!7ct~=TZ3#ML1-IXYe
zF!R`8@Ph4@x2W&Uc6Y`5qPX4qNmK90#*G7Sr0C%*fsA5Fr{<uEVN=PdC6WcPO@-XL
zZM3qE6p?It$+AgUT=U~nb%C2?ZD6-t6NrVSeXez1E6NPke;nIctmDbf!uKaT3;ST$
zS!0~kIPDqK*WeigkGz{HU)@ak;(BV2SUip3@t8cGPCWZ8o+hk;3QeBE5T5&OE`vuD
zz{lGlD^ah}h|z7u+(tHud@=6etstm=@K45RX1VOY{U^62SU!zKuzZSljYA}W+rs5v
zj&&b=B>e|OOpWp@g5^JCmXACwwyq(0uHrfst4HCVpH(Mvq=S8CyEY`xI>i3Sf2&kQ
zW}Y(hKB_1r4^F%V>ox&v(-Nv1mK`N#o)R;UBqDep?MfpLc&k(nqSqKdwc~zpgp4uy
z3&!~Mk^97p#u$?~ZtzeavP^;pXLaf%`p_z${6iyewfqy};w&GpT6w8YwU;fPVx<rh
zV4n9n^K7+vYE*ZusEj#ABPQ!!Q!Sps%8r#Lm-8-{LpB;d-Wt?1Q!MdCX5v_`taqb(
zh8vDu0ajOGc3T+D{ff4Opdfa;VY(UwycNsM%e6RRiyZLs&dng<^hFl1KDo1<j`R?h
zFUw`=mfQ0C)EajBa=n2&<;OvNGu=M+`7*2UGzu%9;q-O1xkI-GsTxFJxXrxefFQG7
z&P1ETMUjv8=YlrCHWj|AjctHi8-Za97vWT0a!*a|cjdTLX5eX=7Wnic-22tV0eUb9
zWzd}Q0Q?iL=<BN@|0G6+sWhqCyl_!$<n`IKF!)eE<*K+6^78Vt?2goPoE7p`-~_X?
z(wpq7y5^Pv%O06F=i#{nmlWq`&d$4J(~wo8a(qeG1PXdgxqI%fc1+4hUJ##p?V9=}
z1EQl=wFcfoJ0J^OKei`>SeM5jzMf&qONJ>g1`o|222Ue+$o7(r2-;qQht{SBPZOd9
z$tF*-RZbT7MUbaV(tAL;9Nlm6pue<MtDHV63TM-JoM@GYN*m)u&lp9DEFaz*jTEdf
z!gy*jon#iKIO@5q99I?wryRIkJ$_N(_KPl(b1#w=f&J=G;8j@;m7;OiCZfCq__r0l
z@^FU=i?HFaTo`sCBH<xLsyR++w<k7eMqI*!nK&Vy?*SAS<;W<OIk*Yk2!qkP9KLwD
zyW9cU)h0I5JsTV8u8l7QZkKcA@c<5Q1@_D1<2T`NJodayoqSxQ{;T70XhLMGQ~w$5
z7Vn^*nn>{_QH%s4$&)ZJLf$UT;Vw=<9o~Tmo+$()m8+kRSQO2H^~}{Q`v>nQYk59G
zI_z0r#L~{5k0h@2<N3(o8Kb{;_I!l@;Ryc;8_x*_Pm})g*>jElB6zad-clW~Ue+Hs
z>@6aQKVxt47F;1K*xnlDRw2fAw!I}I^MOY8*5IMl?Ai8qD$dZq*U^61TR1Fu2_)?b
zzr*WsBX2cgXlL8oQK*Atdu#9%BQ|!Hy`{IW$|^kJ6|6&zTz!tc?E;=;tmT3{gAwmM
z+ula%+3?>FA^z9rsif#|4Z{l$pBB;BC!~Rft)GE9^V*q?C9>S&3asZ71)gjTE?37=
z84i~#C%8_QcG%0R;iZN0qOgjJw8Vl;Sjp=0oPqJ`tuuw5k_@bixlgFihlPyyAjJC4
zwvjgdeCa_wBSexf0Wyhyv~o{WBNANkREb=;;JxAOp$5`ZyJpPraToQvyjELcYi?G<
z&OAXfNo8zcnQ2CTiZ4ZWmKj6V)$O<sc7A*r(N2dA|7n-3*Kotc1~WY9N{ElAm0Ut4
z;({_qbFiNOHBQFg8u*K>y7~L^6)WT&9+?+-E-+V)E(?4FmH&cuB8$tWlgf1eGW_pZ
zo$Qc#e;@82Cc602;S16X2j*!Q3^?Z?!$g?NWh2*|<|x-Ya$W$>C7#(#4xgcS+Vvpm
ztT1V3vsw|<JLO}&LptkS>p6NyJ|5lM%!|Fh3yi#aR!90z)tl~%y!FAnn6`JzU9e(o
zKj*Oh<hu3J>ViBXN9I%AP~LcT8{YcOKDB;=nd!`;QI}{@;wy@Zj0m@f*)%LdvHT~o
zq@LmDXRs7NJEKLkn>z*J2p86A5Q0jN!>xRQ+(F6B7d`HIxwTcMxTmDcDS`ccCJ&-r
zGq&g25Ik=eC6ayasK{_TZCMS&s+ATPZkIwQON=dsm_`^XIb^vm)%Q#A+@4&bj-QE<
z_XTd1&4C4=1E>#|sUKCJ;Tf-RQRvHaYIHcD9xE9tweBp_iP=1nOegLk6X*t-`b;}>
zLR(>1kqSc^BhLgf)ZfpXkzb-{V{C1+QFgYNiv)}<IR%`Kduo>$=`^<L0-QkNzTel;
z_rybUDe{7+5xWIv&!sIGXR3RUr%ciRa}Y95qR+<Yz3^VtzhlAG)mH%hptCLYk!YX|
zZ9Th%F(M|#XkntGprUv0U^5Rc7}P&7LtPZ6qBJx#|5{&7>Es4^OCTN1{ZY2#K8e<S
zpa+pS^Gx@`o<kiCPa+RGN>`3Vbe}^excLU$hX-wEPO1y*`kRFprpiEIP{DNrYs#9{
z*Jn=S|E)Cotd|X)YxX5%k@}KkQCrwq7OnoJwU5zvgVZ&m!06us!#7am&uCuwTd}Z|
zs4?74_C*m7F+Hp_IU+wlKbs5()}+?5nqonj3Lyq#ZB4<T%9e-cv^+d_&i0l$54Wrw
zdQol7(jh~a*VHZ>B42xW?%eIO=WJ`4y=`vYidqDM>Q>g)uEf+$ZQ?p;SD~JZxh;Lw
zr8uX+F|`9hIWTx=zBhQri1%ckp?flqn5=T1v3Q!qA?Y=FyrDd{aDzwCI_^U}JBf81
z*6nv-EkkRv9^mCg{v9B=+-A+ob{_Ypb)3RJF7gD+r#O7)@?%2E|C{U%-U)c#;%>A2
z?!of!4wjEGz>YDujqCJ2*Qr>GkiE{XQ?JlG6gQzdQ9Is|U2&fxwF%EV8SS7L3$;UK
zh2+6g@4-A1#IrJ&>V}gOxn`bRGmj*~>eDqw9`IJFHDU{mjoPsV93kU(+$xuOz&lt?
zhZo`s@^aXBF=evK{o2aYM|BZ<IL{1NZ{(3X_5`bPft3g209iHakF_9;gH_gbRvoKV
zl6c;bpXWQ*@joq|Vl|m|1?fI-F%SF$L&mzpt1S=<8+K%mp7?}E+F&Qr=o=B-W=<q6
zk=hjqZpi6m8dHrp?hK3r;-zUmuW^~DK;nU=>CDpXi$S!vAUVG%J}W=ZiuQ&CSUtTF
zRV_!rF+{y+`J$e<&`>X^nzyi^i(_nb(FH**gT|?Kf0%1%85GeWb9zqBKJ%2NZP2`s
z{vv(5^q=S($$WQ%ht}Pl`kLYgM&4?iN!)An<KA=o+Tb~-udOj7eKvRosV&$;=kXx*
z3#sP~;4x%;wD?M9K}JU7TuT>IUP-iBSG$0)%BB5G!%o!TnZX~8a)0bx?l_AFa*Ewy
zzW1BV!?KXgvX+Y-;w8SARH?$^u)=l0jBBQ&nZ;pQJJwOD4GsjoP>NCrAEQrc%)3a)
z0v+{$BR2adS!wqsF)vSuyk2?b-HLI}ASXY!o6`ygI_!?1PwKIDbvmRZ7$OV?;#KU!
zb4U6T%X)TAO)ThAlt4~wLAE;+))?Y4EL2R6z#7lHp&~9Xr)x$^QfW2$w^`NkHkfA!
z&Y5d!F0QRz!T&C<K?^WvSL(;mA74W^vT*)kuy0^eA|{B!g0xgmq+L@HP8=81DC99L
z93De(@<>I9)|^qG8rj*|U9*ddy5`aTG;eUAF$HjYg8K>{I6orEBWbyAcMB5!0tu;a
z?**w}I;DSozmgtk%7s$~4C{O5cuKMyRy~BKm!V6CR0N*tH(ZrnRtxd(UpJ(-?2;O^
zr0=jHHG#wDWy!T!m~8@QpbArJ1DEBaNh~X96Z;?6n0l~|{SQs<u>6m+=bfLGQ(J#a
zPMOEFf4dD^W=$!(S-_O=VcvZbwk!$p<yRYa6ky>Jk%5gZ?8G=!eOmB`6F*>eGI2Qz
zF0|c&9j|Z%SJZU!BvTu(VSwNf`4({fuv<ap^zO`vu}H<1n6*2`S;)zDb8ePZO!8^I
z@_(L>!c;~!;dBObVGkn4o0-FF`~0l92rTWhvN}Yx%mZKF_~cUbrP5^#t@dP~E<YDT
z)v|3)PQKh8cnqtKzsbpG6pUDMVnW8y<wKmfh9Pt=cyZASPp+u7$sfZYlW?!uXRn4o
zPXGILsjr(Io2Gc`7H&Jm$`FC4wFfUdqN4EMio2r{6I|epaKY3j1?4Ws4bRokpqw1+
zraiK;Z1IHiFFN4so6@&-!TIXYnneQ_)||l#=$4|sY28QR|0p)^dk}uNTlDhvgyv&I
zPqWQ|@}mM2{ph%LbTqtscQoBPih|#{hFbHc9^KlFoAZVq?)}V~rE3?hT)D7v@Ss60
zv(@<3t#da1N*!DqxMf6n`EdIGK8(3(Fytix@^W#*j#P}Z2U}KbbAnpdAqJ+r1TV8!
z$5$I*h&trO*QKKf;xUKUoU|Ym7~b&woFt4a$A&^jmbWV$<vgq*vy?VC@MK}0VRA5f
z<=wA1voO>ZbQ&fG_NVUB^2aW&u`G?*zpF5=^gouD`%0rJPF0V1l`*(ztPwedxiJ@&
z$w{tQaK|9*>3~VeD!@>pZ;dU}1Zix5VdF<0-x_uPMX#>@O`rac24>8!9hh9*W5F2=
z?wUnImURhyCKrw@P481gHi6cIt9ZTnYttq;c)bZfq0_#@DvkjfJdI)w?<tV)XzeLr
zO+szS#(7-w70d9yx6zseJXY)u-Hm%uTpc_DaUPr)<G8x`h~qp|9>>+m!3>G3uj2TL
zQErWj<@gEla=aSTO;^NFUFtBr80_)pW5Oy(z$z~uFCoDmFN`^Dcyfd!sKv#3C0=sy
zg%Kw8WGdb|%g*oEMl9eh#7f%wl~)e07<gV?#mKViMGb@3mG#P-Q`~#>kbVOi`>vWj
zY+;WQbx~>8qRO;{o=v{$X;nqJlhgCcdv~q!c)E@0-@MS4m5DG0^)=U1yA18W&FE|S
zZRfo|i{~DTrxAX1q_MV>k!(w;y|LWh{$jN+qg2|%dS)n_Jv{~c?aAmIPZZt+g{7Vf
z?g3}vlqFVu^e~F1Y}!1C9s<oRh{%Uche9OUVGOg02iMpBJX5nTBDc5*`>qKNY`o@T
zCzS;cQ(EWE*ZiOEMzVy6NmFMl*Nmp3%CmQ2`}SQ_d`{m^3-<jbi{pB9-is{{E9`P^
zSNF8WBBalETm9K2M&Zc@BQ~8*{mFfv!u=T>moofswVxY2`sZe!w_yHCLU^e{tTm>m
zxUOj`Och5e85RMLN5dS}DG4rfa3)I^VG8~fPRQ8=HtW?qSZjd^&GMhmzN~3D3`0DS
z8~710N}k+=Zh84+l!E)Fp~9M9z#c^<cQIlh)}e(S%Gd|+sO|l__i7pHTUAz`H>0TQ
zkc@(&y2-tI78FlE|Dw8UW{$o)w~N~?<FZS-6m*pfx{j#oJ-H$`XL4#*X^-UmR8QX2
zn!e)_qc&^|w91<o-Zyzb;rKWNyL;rMcTJ-=$0*TF52z!s*YqrGA72G2UwWD=G9nD~
zHid%JbQ@3L6o%(^Vg63SLExk=Ntwu$NR6Y(%Gkt4<MObBjRQUfScCJlRS<>=Rerp+
zdDa87);*k|(z+}i+<S?)x@7afAr}r*f#%d%wd%;Ut#dB;eapSS{$u~zp83;C2A)}8
z_pAD-<lE}#4HbxD;yf;$mBhXP?F493$z2Q1o@j?dI54%7yCz{+DO#^QZOfm+j?J0P
zYJO`-8L_kvjF=;O0opVNehbc1Ood9Zp}|2Vl-6+qhfXR;+S%qZ%dsVs<(88tPFy~5
z;#2Z7HUH)LftRtXjp!H2BiEB-KzFj8Xv7KAPB9>=2hM>|Te8I;eF;+9!mwu~Qe&a{
zF{qKvJpIu%sQIM#YE7qFVy~Km9y2gH<hwWQphFy3iI{faU&!JsJd4}3EN9=xMiVQY
z-N2gP<w}4FN#Y)Hl{?%yKVwCx^Qn`<!es6_rlLBTyY0-Kc6rtTjWP^VEA=7fBcp$e
zJ}krkJbiYItQqqL#bDhc&6iAjHyAsJ2rp~Yh{W7PjsjKiHW~-4>3jtRf)KWRwPZxM
z9wSSZHC#Sw)MfR{4-YHuI;>c}87LmLYUt2aqvTtG?reYf9z4HpHEh1BJtv-P@K7Ab
z;29&fp1qHP|E(Q$<vG~kX#~&N`}zhC?Y|p5P2$eZadY&G!9#N}cz6!pVD4>a@f=Kh
zc4zNx8+mAN+bFk64LN78r5XFyMm(F!rG4v<L)uUK)<)iH`QADEC`S3TZ*A}ttL)DE
zD3EvXXel^Tm?4UNg(>v(6zz=)ElkWK!-A2+DKlDz!i!79(B)$H6~@x;aD@z-u_H=D
z>8?P$L5msM-yA=4G}DspW7R!_w7`8G!-#R^q3vzUg>sO7a$R^#ANeO^+RXLM=C|8)
z>JKf2_mzyiKhq!Jq5d#<&gl=U4kR-M&mf#e>9iMPjrFZYzhbOM<D_;Gd^38>QUT%#
zG}d(FfrEe)A+_?*ew8s6HEI<5Tf`eYA7G3Z?N=E*gH`@H`&G?2A3*X@C?@%0T(C$u
zl!ix}I-&__#)d5Xb3@@e#}Sgz(-cQIi-{r#;TYZgT(}>p#WwS#=h@K$=x4`JLjWA|
z<6=7WNil-T`t;=R#IfsYmz!f=)7M#<g)J@w1qSs>>m4tLtY-BMj(Z?)<h<^|afc3e
z=$8*qcl9Da0p~m^Olisncsg|XoN+<3^7QxBqv)G3k?Qk6dMO@{T?r#vj(sESlevq-
zRe3^!dNi;*u=~0_yAXZ1s~-Z{63?ene(eoK=lrqHiwzgJARR@-CnWG*AJhQ_6aWxK
z+x~3ey$#z|)h>Jbj!V39XJCZ-E|4lKb_5FXFe|r>%jB5!)22+n#xZG}KeA%d1`oB(
z;GuWvP`sIBBNz`hcqo2q@KmW+IDU$AFjoB3;Gy`X!Bef~a{LnaGUAtLBLYe4HuO;>
zoq&sQ*s$J3VA9x`A!imwo2FPCw2F_9rwKbt({d6tYOa=`<YRYj`sUM{AHMzi&-^kW
z@HHNInHl&VFNoY6*o0gt--GfWLitXS<MX0;-XFmkWpffRN_Pq;Z6RWN3GP5|>QD7h
z;G5-v6F0VDL;{KJ?Xo@aTR9JU!{uqzrf1Fm8-gb>cyH$*yO0*oUW=y*Plx22{g-db
zk5SI$7EhJ(LCa8%+CitRc&t3IwN!V$7u(v`jdW@g$GeR>RO5dqeA%eO%T`|IdC4lj
z7;)&o89aaM%rn{I8LV>7Ijd^av(4feq-No{5^isAE(d)~e#~v^3{EjO1_Q|oAqzZA
zFU^z7bZ*92g;O9o4JT^o)rLQH73aP&Zg{6yP6C<sWIE7Xkx)^Ym7U)khbeI2J4>qD
z&ipp=sm;}a<5`spA`|6<fqAX1ankeE`26&-F)sU=%_sun!1dxd*nV@Y`kb>5XYg!6
z`wX5&aa(5}%qoY@q8L1V<U41bMNwF*eG9XPs2Kd>JAJWnII-(aRM;cM!@U$(b;IY%
zp_r-}rJ#TX8$=JsSUX}D#%4doV9m>%$%tT3G?pj7Op0rDffq&xujl;?2Yj)_c)aN%
zzDs;&iU&1Akjh2j8f<X(Ha#3(L3k=vMP+aH!}&0ga<+O#_3A&Ps(NPiymIHbfzeSl
z-FnyO_REnE1e*J&bt`YFt2w{Vh(3XBJ&LCklr~i756DG7aUZCa=%)kR-=pz-StMiy
zF$QBvYw>J0dF*P;0*Apt2Z(~#wO+<`kx$oYCc~3!FNioQiTDs0-|<3_e~xl0vpno!
zm14IGr=rbr!PlwW^0UgFfcG@*>s&5HNUeI1ZlEnzJ&NTqyfdp)Jr;)YH+1k{NcApK
zC3q^i6aSYX{OSRNAN6fo5N`BCc*phYvCazKziF|ZXY`xJGNU{@_^2P21^KBT%<@9|
z!6+AeM!EEVCWG(Oj&jcr!`&x*xY8&!%q(>!zFCK8OdD`s)~d$>sz)(;JhF2=XoRhP
zYwqBmN5_VXR3@G&<bIIm9ZrStE7~hJ`gy|8IPgz^Ul?cb$C>=}9V}nXGWb#RaV>Gw
zZ)%5i9sK}3G|JNqd9d=C_u)Hiz#UjNDW}y|r@G558?BV@;Qu~0Vp}_j$ts8ZTtmjY
zsTln$ljo~WJXID?v$zuT2H%UrXfT&pM`x?ST+dQ*sn6|^VOoA34)>=<glp2CjqN#F
z+tIn7LRkJVrG>2x#x%)d;E*Lb!I>QQoB;{t^FTO4Zn7#I%T!_WD9C6NEgk%H#xgc1
zC#N*0M?ro<egV!|riPps>TRrh%(y~jxhuF&li%4u3}y$bTmIn5{ian`Pp|4*pW>Wf
z-YeBzkooFhwid&)tF!qKX7&JApAm+^D9#@cXg1Cn{h`Bf7`EE59pu9r{W@9v273rR
zvPqrBN1I^qhyukt7)!D<tYvBk@nS!A2WeTzm@cu(EmFCi#~ph>xVM&uu_(dJHbk5;
zx;-O1Lut0MbgZ-s-B6h!6-Cl!cRCSq3=cyPh^{++_B!@9iZFKFFw#!Da?Xo%U`Dh}
zr+LuR5P{({3_iv$JlrICpMwUx7+l0}hVVH5&t~zJMoNcfb4)-cjJ^@|`=?njEu?ho
zCd8nDefxCl-K`gzU7VYnmzSFx1zE_gG@R^$;Km#sjqvdE78InRAI6h16sA$|%RSiT
z%5fktWrY3cu^F|vv^;xMZvUxWGG|nd9ow_9d**=DzFqPLB=tFOY0vXgykonMUz!lu
z?W)QiFhsr|T~_#>Oex9CD=ElL8{it3HP)R%VWHuD3;TJaBeS~~=BC$;%S=!2GH1%7
z)N~nL-#5~JUYEkxwYZqH^t8;(L_;sNG&LXN{FyQL;Qt}`5qgObvu<pVDlrnatd|xA
z@4_pdGN$C%SWMIz>6oYy+`~kj<_k@MQc`S>=WgtQSYt+yt<a<!I(KJU<JYl&>fyi(
zy_(K#&hij;V)S)EcHU$`kk)+EqZ0?s-3fRGBf*={B{dl}MmQzEV+WPgw1Bn*TpTvz
z$3PH7b5rQ-&S{nX=JYKamDbvt)?5+SkkdD}M_qL6&{Da(V$RUo`Bk}Hs<f!UqKurt
z?W3ym2IQ0$PAlqxP9r_Q8x?lqdA^ap*eHaKlcOPpScGE-)YzKAn_Y}Ysn9YrzQ@g>
z6M%F|dR|Cs^OLzh@rV_ku(Bkj(j#viQ&f9l^?-SOTLx7nlxLLJHB^^nSH-2FrbFgb
zR1A-GH&j(Mq#OJDTt7vA*q5e%@fft1eNkhJz>ov^6y8N|@Yq#j-_wTYt)FI-V6-!t
z+gU2R)3a4!wvsGZ-fkY{uqR<y+!4_Ea75RFarF`e3^}f@DTlTQX4p0z?isqkZg)(_
z_93(w-7*8iY{b`Gtog{}pg8-#n2CaN-RVYFCY(t5#aq#S84O+LTxQt++{_M0UeVdy
z#tHtA%>tuM4tfv^2l5khb7?OCjw24_|4a<e+UM>xxUe8HG3A_?UZ1+gv&TDqOi^S;
z=b(R2_u|o=B*2pvwCC~<>P~BXn|k7%N?4ihAiu&K|3BdURzVpVFE+6qz}nTa12osf
z!49}!2Mk{w`$GR8@zuTYT})p+yTe!KV5B)IyDVSbIQg&QT5D(YonFyrj<0)T%GjYX
zQFT3X`sKn|*P>3J>@&1#eof8X-Z`1_H)n>G7EdZD%jusFcb$9?>IVgR%Me9~-Xz39
z<7IsY9^t|hTsYVsA<f5k>3v=7Zg@J5J+Ru-3xrtht<w-l#tJSoGqWhOFgH6NCnBt!
zY3nIVPd=ZGz-|(qi%`5>%-a{`^69$j))52e^{bj*eO_hCu;#p)Zn=$RJ;vwNme<r&
z^s24xrLv!&I`mf~s^$#^+n@_3RMr=FO&^|B)_ZvInZqNht4E$!)n}yXr@etO&Zf7Y
z<NWLUs*K}iSV5T2c^K_)0Z$5|SKs(zUD8QYLAVn~qr!u0w(d}J<2aNXji=|pXc3mw
zfU^R;-$=80c(}>I(RETu+A;VERw~Pw4JZ?@?=lrd<Z0UPih^mQf%e<2!ha@*uP}re
zCNNxc;#E{XRXFKzJf5U3OfAUAmPbN<wks~ud{CjYw@1&9(Blds=<1pB)zTCyU^8bf
zZVG%EB4w)X%pW_X?7;k~Q_tKNDrd%6*ht@aEU=Su3pTt>Upgc`$4G}i*Qjnd>$yB0
zE4+DSH-cvwkk#l^7gpGqoFIS7^pialL$t({X6xW&>&77l9Oji8hmeEm%|4ggjrdZA
zI~}Da<Rj9UWVt`q1Hql#965{~o8cGs@huv3mJ7pfOZD8r1LpVd?50@$E#42c3VraM
zId{DzqKq{`REVz%9*Wr$57w}C2u#tM*V$p)PAWPBW?XL^6J}heRhw!1PAYmIfpNX5
zF2cATVO>}A@qTZ<F7j1VJ+G~CmT|eU)(Wnzmk0Uhpgv}Kyr#T_>t&RSHKkFm{yO}I
zlj>+kxkK%=rfgf)d4;$Nr3S}c<*Oe$`0J=1#cCOPq|;iNdM4N|ZBhsSU_9uoisbj=
zdxKwrkJiH9hw$T>=3qM~ba8=y0%A5UgWqNH(|53ZHQV5)HRV7T^_$w!={m*yjIkS!
zT@jnnvo@4qwh4X3>pAdX&M%edE30g?F4QZtxop|F?7OY9i{<0`W9E92UYF5P#?2N_
zH#{%ZZt}Eu;^||xp?P|;QA2*{ir1U+AE;k0-2IDv30>2Y+%{#yNp1w{phfKAkrhHv
z3HyRdTZ_|2#u-mf11VO=Lnk>w4u~k79<|NGbu<|(5Q9w<qhWLS{9j2PpZ?1$#<TyP
zVw<_PpqDrVU4|qNX;>MqIE=NXxu(dGD>8}_hIZ*+pW>N359&5yNkZUhS7mmO((?G+
z(h_gtQY;<P8g3}*o1QnQBDE|bYSpBm?q!XQj7!STPU#~3^?jr4=M4+h!KGF|7D*iv
z!5T&*4JIYB^sn*Gnw>#AgL9E8H7+s&aXhj!#_=Si@h-R7GaYt@V*F%is7H+5Z=Mf3
z*_of-05|u)aW2q7K73u!!pK@IlF(!<r}`O7CAl-i$k0+L@EdbIg!;pW2il;~2{P<k
zN1!q|AfjPs9>*AQOa=xJrVy|B!yJR|wvTYR;&XFcadgllf$V=TUg0_5qPvZ4?4`qo
zO=?Q1cK2|l*I#*MtE`!Qe{)N0%$WF=duIm_);Ii!Zps7M>LR*{jXqB%=CPb?c+_wx
z?Bqu~vBMK)TInJO7F;-7#^DTe2BnAUjLFbC4Z-0Iyx}Lvt0A7Dh0XhE&Ssz6>lMP=
z&0A8Chgx*W$7(hlv14g&3YrI3Dmz6z;eA-Hlo9sy3|vxIGo{C1@8GTj>SfY|>grk5
z{pa-QJs~N4T3t-cu+lywbNlBZ20Eed^vdF*k(pWjd)4K2>pO3t@BF@bnWcekrA1Q;
zjc}-;x9As&O-h{CgYJ)MIXl)#*MDbSZ(I~&RoHgWb;R_{{7o$(F+z@8(DhfbzmzA+
zWs=W>L+|#YLgjQMNt+Yrr))78bLx3|LqvHvP7vXorDH7#3b`TJOm#T;Xb^cZPA4yG
zu$X~KpuO=fmTPiuRyaVvoV5&h?b&hHFyU~9IpziLp7e9~^!4b-Lv9oatC{zwYe_zi
zCqLhA&o9p}>sD;fv*$qq@?7ze2xv&VBd4-F;lCsaa!of!%fv~S{Y&zou3nY!X5ig_
zMJTK>#W`~xQ#{`y{*%|RnB|Q%EOZ!8g35OIO9^7s6LC26K~DfuG|7W83&xOWp&fh`
zOq$P4(H}Zi$P4gby0Mp%AmUvKIsX@JZvx*|aqW-KjATjP7uk|6dC@NKo4nhxWjkIH
zuSvW+PGZMfc9S@P1PDvg5GVx-rBEJ)LfIcJl(JJOP#&c;P)aGKw55~+rG?T5EfjcI
z`hU;dD_c&&^4{nF3tUUOcV_OaXU_6HXN+V^0R|bs6yUbNZilo7{OTS)C!Ef*=DD4z
z{nh+|wyMCB8~}bkvhqjJ6RgWAL3PMaQr5}JrteARI5I`8lO212o@)$R%@k^9*cgd<
z1j(4<zo<UAQrQtogU6_+0rd<^0Zt5)!pbZXZi~7`LDoF3t}1hih&Ir8gw=W7x}BRh
zpHOd+KYQ9~v(He~;p6#?tovWk=dgx=6X*-xfk<eIJ#&@1f6^B5lsJGiCZy4cfmHH<
zBdJmGfWu817sQsk8RMn;-G)qBxF7C!`|upuNstiZO=DR`dMUNs-dfU1ElHzPzqgUb
zgVWkVY1TaOZ#B)om2C-WeuFd>IH@O;rtg7|)ilKPpaMv9BYlV+N*d-6gMd;BF_=rw
zNMqs<Yt?5$^#4HS!Fd8-&~CJ$Jvg=0H_StQgFU5~xS{2Jg!jM?m_58$2fSVNFDGdF
zZ^b2Q{Ykg(30|+}zFrxF;Jc_}4h(}z8}*`qj|P9IrjbTVS(h^YWN4g}x{&80BKpzD
z4&ZFJe=3LvIc`$@rwkzSMk9?Dr-g<3aQK%*kD)stzL$yMLeRnfE%qUuolV|nPfbD0
z%#imj`NlxX)q;3NU`J(`!LZP6Qpu#>ev-#RXb06qS^<_QfiYXA*_0567eqnYNXbhg
zF++j%Vu6xUk60sU^`L_#Q)g-A&g|^8RIfL6PAc5<+;gI=guEbl(2<trbf%>_7Pb(c
z!CsfduM3QDb6zGO4j6|w(bi%yu8y|`-13~{N3Fp!_Dk7+7!jK1_7mqhr9m`p*v#Yo
zG1$Dxoo(L8QDL(RkJ4LL%=xO%D;?(F4GeaSlQ#(7`D(C?H^@1vl->9EadT8zL;NqG
zZP5%~d65P^qN;#y5OQ#lV5BGx#FfB|p(~&wFgxEZnVWlI<yE(z`>5wC&?NEQy3-cq
zJE7Apk>xpnfFi!Tl<&Z&LPOs|8<h8GK`ntK0t+PA7+yuF0#HS`sKUT(c6#NjQYw8s
z_u+HT^~}xPaNghlezW^re)Ao7gw{Rk{Ke~@R4z!UuKPmGkJ0~FoS2!l@I^BybD5Jk
z7fN$3lB;Qe`S`Q+6~c^M^c5<^iKY*S(op*luQQbQK<GaC_p-N`SDDRTNf4+G7?0nD
z($Fg5QL-)rIQ#Q>|6ZbuiAal+ZTuP0QF^%d%7EzV(4bGzWhqI5KoW4UF4vb!r(T}e
zIoI4g*U1Zwfj0t)<B9xxfjQC!gYJp{L9Lu@=w6!z$d%ASvJe1Iw-L}mole~-v=|jC
z9_T!}jRfFOl^r7VNP!hPnZucw?8FX1u)?q%g2qp7Ys$W+nkcYSh&xw_UBZ%C=7)!{
zHOo<!F*g;Ny0+Zc5^d?t;}5o02mT9iShpCfe}pI4JtDu|`v|{zbwP1KZVsKeMD+U|
z{y=Cimh|BN$zDu#4%^qJ4CcY`&3L%wNBriF{F2bvze9R(j<6M&TfK-0dYm3S_%l2S
zh%V;EjJZJU<bwM!#F0N>aGTs2HvirsUAZg=y7J-UbmejmmB{wXG;)0%Rn`~g7WGRi
zTjh_2ltfPX5G30aP6c`u1&)sq#$BoNBFKUf^@N1PmaHByNZ#vAG-lIE)RKj%Jd8h4
z$1#z=Q(n<nr!Xl~k*5CI+8*At)z(rn!sEcG$iC?*C<Ev6G>T_NwQg26=#K`of|Z|?
z2=tXww=_~&LP$FZnxlanM`j#ldRxI^sm~-(2sE9zRm{v`KR9^eP%@lG#mOs-kpe1(
zDqaa{wR{jY)xO3$t~qfiFU@bBwzm`wDI=<^XZTltB<V87RQlq3<=760_T_6;r7iD>
zEsNuyBe0JtYhRKUEImcHi}e?eTGuHGMjRTU2&KxPNc*ueC`33J`3op&UZ6{0ym6o0
zIhv&Pkjgf9#rBq#Z8bI9T32pgaY}1hg;dgV^K5PHjNd;~S2@#C)1@e7Y2HeGGvPxJ
z#YvgBPlMh_`8zs9vy?O>Gf^7IOzpHstGJKFGDs#;p7*tf$wcb&Ergq(=im?e;KYg*
zg5B@4aT7wySd^adBj?HYD&;QWCVok}a>7l7%59OjiHAQAH{m7RL@0f`f}5B}i=~b$
zgx{c+huWnXUP|9AaTENL&%sRy!cC~<584#m!~?Ky%kl};KsvESTm;o0xCu&+e(eW4
zB6VELp8t8VJUmCg4MXjNbH76P3bL#}9$sJCyQts1kYm6Xt2y3QYC!S~)!=P>$~m4J
zoWcwPHbdqi9U1yM)b>zYP`5z^({Wtgfy<C}C*JX%<+u!WzNbLqFhRRBcyAKqUT_u4
zya(J2CxBz}tIA<A!iSW=RzJuAJ%tJkYaWW5rDqVI%x1I0Y<DMnyi$CEZbo$=QuV`F
z@0GrA3x?1)XWEqYfVEMPpXJc6ds;PJ@GBjeYl@U*(J)(^q|MI>^oC3pp?*k_>jRKS
znzg{2owz=x;8(-Z7f6F;8{UU0vJWZm$@?%xP#-E~pV)^I2Z6FDK`}~MJ-hVY!VD3q
z5A|XRq&5vKBnL^X18<;(cS|&IDG>f<0b-CwLvu$AkBXAvCNs&|2#(L6od=!{QToW4
z@EpVbbRWo{uim$!y0WySAkXbYWvsA1x}32Hv1jxu`YED8UW&dX?cma&YzBPuiw0*u
zFUd(xH^rw!Wodn)z;3adW0Rs1uzQVs&ZxZ^U*tC$<Kh~5g1(^2m>eDLv~+*oNS-*S
zL5F%LXg&3EoK~}Zea3~YC%G5X`Xt%sZzshS2}C0ft>NKK;iw`SzdvJr9m5*PM1;r9
z{tQ!!5gVP$nU)GDZFH0YLaJtUvg*sMERO%JZ7(J(E6bDR&dxc}*%`76gc-8wX#ol$
zIEaZHo%PUXzMhFS(NURSkyDCg(NyZKb_ZUFy)MmK)_P}4(oN}h-rrM*m0>F_Evg;H
z;;`fw<^I_6Ky**lk<OajtVa@+^?~+DS$aTSACD}@cr4Nq;C)nDkptH9WH>KD_6L=A
z$uyF7ZKG)GwA+NJ=WiwL0@s3lNrRaF=vgl-=ZOj^Bsm#D+=}yERtrZEJU!T0EkQ_@
z-PWtORUC;`9|;d4#m(8=p)&}gHzbjeK~+&OyCbF3Jqat=sgYm$M4u!vdBbKRF?^B+
zk(%kXLO*jtk)+kPgF?!uRJ5vfJuaa?ivjcyp@)_=lz4dx2?sD|Wnq1m<mF^}vplGC
zhSTG8MS*uyaYJ4y#V%1t!V4`kp=n8~#dBqXh*_!H9$Jy!;ZblPLk(HodB>U70$V$3
zytZ^}c8;%2n%VM_%?dyyFV(u-*!E<H(dVx!F?Up<5nVXvxC~=Pc%Pq0V2=oc`Y1z~
zA%V7Vy`|13)2^~JkRm!wnsW)4f$pQBI3D%`0t{_wD528NCr_jDz*J%w^e6mvODRa3
z`K7Qw#B3^oG{}KYVt=mLR8hO7DYrXqZam69=+iZLIx0(=<D;4j`GWugtemcJWCX>5
z21j<_8_qgUZC7z#e@+?ki?XjE|0OXy+oOP>GBXxoQ3|a<HxO?7<V{q%0keqGETWsj
zn<!I++GaP};8A!|ToY8364$g8Bt!)^ZKTHK_n78RvGtee8$7N$M@e&B<Wl1h3i4CU
zZvtCvZZvO&8!(6Byn!6-D8vt!iv-LC!hHNn#eR_q*_I@MAB6M*_KRTKVRzIun;t$#
zptzKL1V)|#IS}%vvnhBmnNpc8C#ItrVmnz1$}4q=RGvQ*)s?vJrB{U~p!oq+Qf9g-
z8Lc5qH`&%GFxIlQSDqsGMa76upuB`#mXV4ofWxNiHq^weELK1wC2djsj)fx}D;Y~_
z<(BHkiaYX(UG*OK3TGLxLLjtK2Hu3ei)FR<#=_zUc}kfOs0LGniA4zyw*)&BCiD&8
zlW39w;o#lr(?dxwHP7as*EgCX3fr^i5K?ibB4bXQ)0TZNzj=b_JjvWMlFo0yH=XF+
zd4kRq_BqCP3)o~4ijC5&{g5L0l3w*+3du$}MbHgVy=5AyJNa+gn}cwL;dI)%avyrq
zCs1iII7aWb%V&qwa%msFXt@p&{gEB~H$RQv&v3r9Ki<RzH$!~F0><`=j-gN$VY@22
zNRcwF8jP((%rFAVh22)9%WUR#=etO{G?8Pq>g4ZTGL)*|DxJxU|0MJCAA{*d<&~M<
z>=J!tg|p39+?JJ><V&$QxGOs`qO@vwU8K|2P-Zr#roxlFF(1$$Q)+W!a;nj6j*Sor
z)rIxz&}M4Sxl*4niPjU}dH(VG1exY*l0Ts|=<meibOo|s5@f$Lupjy}@?ixmz==2!
zsfbyQtyAbuh*|CcE*boZZVqol@1avT%0{Sy5OOVoRu}cBQ>N7DVATKYq<+{IQJzc%
zP#bKFu!e*cJV;8$P4tFdETMReKm%)V=Vt@mMkwf$M;Mn*?q6ao5N_OZyrX-Kw<Yy+
z$EUJ9r+7K+tu(@J{oDa7SshnI^VE$oJ4`q@`1jLz^ug~g90!*j%#mZEJf}DfwZV_n
z6++N^>W19lhoTJj#{%|&;uIVQgR#~K*-441fX*itBkZnD5SgSK1|=EY7zUY)k)#c}
zadi9)L;_%)4HD~2>jGF=>92|MXg9T?=RZ3gxwa_pb)7UF2#C}vEvhfPp=3;J&_LsE
z!0Uwp+Kl5;65Wge0?L(??8<dS0s}=9NeQQ}56Kdtb*FcF7quL!FZZ_UO*IXpMJ~sl
zZ6nz$;_}j5g(bD6I&Smk=TsD((%2}XHkP{m*?BEVMORL4Gsib4w^jRBi3wM_GpD;N
zFv{1Af_Xx}7vN8y7>8`<^}7i21r-&1%PGJ(kWupZ3#1E=Ep80+DSvb4&bd{q#Q1|l
zfgkXmp$Cx^WkLln%QP~a%K$TZ6xd9ri<nv}o;b;+(v8e0t!?y&@L=){aDF2@TgcY-
z=KA$>Lqn@p&F$npW3v}rFgrH%;DbYW9p)dk;ZnjP@oo4<^XqBxurj~I!|MDh2&T$9
zIoXH)<YmZO&1xsCDF`A>hUt8AE~l^+1Yh5Yx`PeXqUxxyR)$(X4qi(q7vS|_?(1J7
zlM1g5%LF(1FL>37PV!3`RE%w?isbo@kU<VR^(Q&LCsN2D-)G=u$>&{S?Vz@P#d!ik
zwkn4Dd}sD@(ojN!O@prVKlV17L$d#AZ{tQe54wWy;(W53!C4jfbK!gjg*75kkl6!|
zv2vgV*#tU>RfgYivvVNQCFwT6KPbGr7tEK*jLBclU!T&O1}ba1_?)Jxq>*fzoq4{t
zDqa(Kw-wgmhiD$i_eq__oSX-}@ZTVv1#B3LIz1%~>GUWKbb6hn(^Ktki)D~bPkG+g
zNjg0|SAC(Xs7+G0f#=L423?A->tRTC36xGsYpT??SRU!Rl=Avlk^~6PN>$g@6`YcN
zB%ezi$_27dm3op+P02SnEAuVtp_J#OL!sxShk8Kjp@{2{{y|uWNQ3jfI5@)+e<5vZ
zfG-gKCPG9U0zBv><B;UU7{ENQc(I=_3gl4X6YW*`%Lb#wn`>Cdf7}*}SW3&rBo9b_
zbzD#n(zWjYoN<|wb(LwB_XF-zKTuxil1}UgJg0t8%08hVlrcaWlEalWIYKMtaCNj6
z>!=AE*WPJGM-nA<Bw^#K>PVFSCwqm`{{{SAsUxBOmrBOPu_qmgGKRyGq$5FDW+F;7
zJ`Ul*`f!nLz#4@Sa=|tg!jM`qL?q&bR*3{M5WY*|ky6#Ch({2?HZLY3pQ=c&(P7Mn
z7#8kLb^L+~v+D|vH0b7gbYUxOPE%Aw#@&$L)XHTe3+t{apRBu~zQdY;zm(d}(LLlX
zg*i?hP>cOQ{jc=Z3H^`0hzD--ALt7m#oI+EsLti{Xs?dx;9ibcxEiO%XRhS`cq`(c
zUzy(u8qm$}djEZ-koo^2u8=m?OurQ-L*nIF8~(z`Lxo@mGbT&7>S!v&i%VSb*wHh7
zvU8#>V|;QHrTOUqBL3)~u5WnjE!nR4Aj*`y{}E;0a{Y4rKH8?FAuNQFrjLCkxXjYL
zn1=8UNP|7KA8<@s7fN2@{pr3&46^I+iN3&}mt|W#{^fq?Z0zKI=w9H8s7XG(nXlWn
z`IM`#`|8ZV+@&{Oc;O4bI(qcj?@+AlqjK5Ddgg%Sk8KWWX)=`2ImS|c#9u_CNs`f$
zId@i)Ydil(;2%3TKXLHjL4NbXMSnmb-nV!v63Y6cJlQ`ND*eMAI!XUf8tNZP1KzND
zS?`3EL;Zs^)IWgAES8UcQ1a?=qH64NzHzY*)Q3vm!Tzwk662xNEsx)HJjMh4Pjw><
zhEliTHOuz`<vHzZR5sxj-oq!+Q-*V{pTjt{D6(fN1zEyj$<tVekU{ZyQ3g$gE}!C<
zs?V1m4d3T9+UXd<w7g0L=Qk4ILUk&C_O-y4Hx4?A`r?f|ZvA@RS>P>>ON6}~?UnDA
zeSSI0BKhdn6Z%|9L-Hu4fqYbQqCBdkA&iky&Hy_iZF@w&6p)I<Z;A(j-}JJ2f2|`K
zSUzV8d<ezrD6Ws@20-X$B6aZY#4016k+u{BA@aCvnN|ysobsP?5`h|pNabFa0XxHC
zo+25r&d2A%V4jaJ0zUaIz<BZ&x|U#{A^fK@=D8T8HK?zHe+xI9IA8dD*+&E7y5)9D
zkj&g*nRZCF%?Ht|8G#+<{5xDGw9#!Av1sG!RYE`?p*KbgLo8Yvmn>pa;zbOLjhRtf
z+@F+yxZs$vV~NDppzUR4*?@kutZZ&-^p`c1)z?&I`?5<5^U;MKhb<#L)GJ9QaAZt{
zwNkH0ChRl%MUk&19>-@Qb*75ai9kGkj;JHjQY|vkb;rWH?pUbneh$n|8n8QWsQ8`0
zlL&aufSGArA?}zY=<H{7YdK+h2-|aN2;j4xpkxwdgNWI3K2o2b4PBkm=Ng_TexlqD
zmTA)ESVSvh!J#K-u+8zE7z>K;j&*|hJ0P~>w~VE%prmkaoiYKT=SJ6>QAP^0167Js
z=@bkx{NE&o7;dREpjU{sX@IQ^Fb&o(!O>hd2GAxUiX9Gz+u?ROU5EfBvBh*O#>uh8
zEYz#$XR@b<V~ywM=eS$JKBZ;vJsx)~1|{~%k#>c|*<qnmy<^ZP!051MzaOWoZ~$N<
zi1R|2@<Axj^jI(&F{O=^#22t8GVFr{r;;HlDIrE;UXWh{)?EgHN1*wWA)-ahT;Rp9
z<${_ju%AHn(jr;JMrZO{_&Ncr0{m8fuIe4(b1IUJiw<Y1&uQ2lRqtqm_7och@fs8j
z0=tJ0E^SCBl8L8aL~vLUrUOo=(r8?ZK_!$_guj)kP>fOp2t5)lrYCJ<I&xxG;IvgL
zZ&^x3s7X#tWGpcwF+J5p{I(l0Bn)9OBtljnUC3>SfNOl+KwPn{y4_jh@Y^GboI1TL
zEz_HmA)XDq>P<}VX)kQ`6uJJCWi3z3Ds;JM@4*;m;*|Ii@f+|BW|r=UVHS!qR9r<Z
zxHO%RtL$0>1#DNBBPLEb9wBqMwRLc?t#xQHCnGB-Co3~soHH=c)HJxR)n1Tqw-*-L
z={?v=aXR>i7;7E92lJsFI}F1Kz{<7^E-^VlM4AxtmHYG>yZG5c4<C%c=~EjJPbY91
zl7f#+mNJBqHTdfwXK5+skywo&J#z1Xg%p5XI#y2{#zw>?5|H%9THb@ULi%<jCP8x>
ziF3nL$;&I@Zp%b3WBhcu=%sx{Tow|&s164Fxe#X}M^mgULQV0*1gB#W{iI3&-vV(X
zg0!i`iOHQoz7OwF|10Mg)@)uqS<R;>0-tg%T@&aZXK+DuL$;4&7MANL{fdAdO*%Dj
z0A^&6QhDB+B|a_1h-9&DLNl7As?v-&YGfowKtH%8L*YyF;jahVFF&XEU|ai{z1`j2
zJ-E6xJy&kI?MBXfuGq5uiY~tE^x3IXIp04$eE{#{h)&Je+u|Fje}*5BF-!&Y<rHqp
zMT^^ur*04(e|v9}_{PF^;UZ=iwolA+)IW=ApAavh05qAfXTkwORkbVSz*!*AD+2){
z&P-)JjuVuI%Vcs>R%W)+8W`~cWv<PqbTpNe*Ld4p1vR@m8a7vyt!kQ^b8SBJtm=xI
zI(L0eWAaRH<wR}mM0NGtCUiW-@B4`V0_{jAy-Yf!3ln4xfmqU91A?jokrdB;0#Hlq
z6GA~ICc`72_>@pM>9AOvWbN@*B5IzV?;G}S^OsCz)*2ffB`qt;ERGb-q5Ju!ukouk
zZD^UP%C>JZJDRI}D|9-|%X9Ce6Jk)QPtZ3}(B{)g9tNDZ4BI6j|5PO)?d9l3V*`nf
zjgCdKC`=qOFt`D|#yb%m3H`0-pRC&(c$r_t_a1nE_*>rs7ZMn__FA+Tai#e$(cUaJ
z<B!ikG)yxhX9^{9X2+d2qDWYGGQ2PbDFUj&hzPK6ODzXQ3MHV)4CEl`g%>*pN)}9l
zES5<<<WXYG%lQUgPIdE8gB3V&9t+UoKJMRGS~FE&F`Ko**la6qXsEK)IyrCrgEgJs
zTerEcVYV(iYrQFBMQK$_QZk>Oo7c%T@DU`zYhh<_(8vK$0>(W)PT*h-R0ad5tcTEe
zNl!vYiXApB@+G9@uoUBxW)itR=_$meI>V&L37;FSYTB`)Wtab^bG!R?TYc*cD_544
zB6yjd-(ERh*F0U>bVlF&FV^;ZcGi{z?ry3mtFO&T&MdQ`4>)t;&r4rojX<n0V&Gm1
z1kZgr@UPH9K>%5d)kl~MR<KGHK+PmzK%{Mlw7wa51;iC>_i8j|X#ka`FBw%E?%3*c
z5E-qYSR;zR7=>5%N5TUKs&$fwlfs<6Xr#h%8cC)lFqx2)T<srSig{IOrmbjgY3aIR
zo6Wb%zpJ@<XZ`nct=8;pYkE$lt;%Mvakl$x)efFImX=zclh^9?Hs|D5q*=$BYbICJ
zP2ngfug98^ot+VQw8r76v6ro~*Er<ZzK5~B9Hc~!Elx8*tARXaZ8Wwdzmf@@K{f;d
zh4e2NXts@FC?SApe#Fw)0`*r>sl&`uXoZliQ3EOQb-NnZpTD`g=YX@IrF5jKX?y*A
zi_h1>TS|Q`;_~|KD>q*|@9%ey6lPV9*S2r33B2CiP?%iOva*_F4kzNQc1z!&8!^g+
z?|ltASBZp^M?li}yLkdT1|0zWfBX)*aTwDQy5xR*NYJIgq3)!sAX;gl6N-pd9-D0t
z-wYh!c2HA}bK~uNR@{SGJLr$2V8Y<{@E<l^n6hwEgx^R|NUX?lEJ8tUK^`(<ThJ*X
zdWxt0A+oArU5Yg;8KGWXi4nvp;1o2Bs-#*{;ZAda&jwz(w#HN#ZBOjYZC+F7<7aK~
zkN37(5?5PXZS}<iq^l``nzB}W4;<aO{`fS|P9u0X=}ktJBh|5r<)nbE_@7t>sWHak
zF{-Tr^$dYMPe|dnEk0Z%z(^#`L>P6>dWMJZlgiu(gGz`MA`_akk_!9aq*mG2?5Q!@
z9L{v7D<eHAqJ7Idy&}1$aK)PR<i>2f&0&j-I%Un*X(riuI&6=(O8Sc!?=dhqgNfFH
zPlZo`hL1~h)fm_at=7vrqoaumC*q8`1U>4&i3B^nMtErx4c=5Reup^LT5wS_KXZIM
zgU7!!I!g79#ET-uT_`bIv7|&}?BKB_H&3e{zZgHH{2IPHF@Z4MK1emYx9}^rAe)pW
zyokfO5<firPAmd1{{jDf;5V3EcOL{Z2o&+1(&rYEYv4Ch+fQ>AoPx%IJPtf%%*pR&
zUqyBFklP;*ybjv{&dCnEPN|W$6lq;D?Ohl<N_&%<_KCn7YT7qs$(*J0yLhE|4s;6h
z+?tx4lo%HiZO{Xuj!^1L0CgOJmX$`0F?uU;N;pVvxldndHtThIvmX1o7aE)L24{gb
zwLQwTx`lU`qCGK|)$z#@aghbQk^gQ*swOti=*b%#%=H*k3~{*@hsF?LUAqqcPoKgs
z^r(0Tyqrft=}@1_II>_Qtp3PQpUw~8og{lS!YMR9e)N=czqQ-QH}LC_zyf^#rBG8u
zlfDhD<!lh0O(d1^9+#b}9?scX+^HtF+m!0&)h<_>#p$pj;S{@`AL5Te4`TGwiEwfQ
zGUF^GhmxH*<IsNSDWCE*dc93vPqWwC=;1?6^dq~`<7tG%EKnbY`dp0qm>IY%stZ;%
z!GI-12xnYMh8xy_@M<N8G2e?-T&(IgwW^<ns*Ju{2p(Z~uptm4YWH!Rwo&$$*@+?Z
z4USmgcz2+6KiM)6<`@-PU<YLV00i`>N^bzZkyHV6`Wk8nfq?dy5M9Cg#F=wT!a?}=
z#k$@bs_eaPv+Q8kfLhtK<34G<;$**DffduB$H7g~27%oI!$6%xZocRxK)9GTUK<x>
zKr#)?Da!GS;od!$Pnx~i85tgTrubyxNl~+)u|r?uvRLi%9eH?1Hrg4_U=t&;Ejjce
zIU02Qdm6z9(!y?oW$UL};Gxif>VhwdkBcP_jwqlA;9Nx0fI0-q3q6>&!){MTMz%Mz
zd~#A`hu;2^g(uO~r~}DFiQ;Q4pOvtA#pv#hMPvD)xG15eqcG{1*Z63Jv0`HgJWs$6
z^2UY4Z}q#ClysX?fSOK+=Tg%R`z<BKMTPl!xjEThkK17f$|(t6IL4#|s0iSv>7zM-
z)#}qjV8kgw_^WqTR951XoH*qa!CxQjAxP`wdTs20)(}07&rOlz2F)geW?U1kpVCI@
z`-Lt_Gh-Uk>cmj=Q1oExl-n>6)i3%zW44;{D$m$>gQX?I+1G&olk$7B?{(ywhQ}WY
zJly~l3#Og2Hssu+b*8LRIp^duJ?Xp(%_7;K@xcXtk9Z55Y98^Aak1zdkSZ`#*mOWc
zm9um#WRO!_I&q-1&1TE9<+`n&9J0t&0!~>eg($go)(f91io^*(Xu_3J-%hn<d0f@5
z{F;RIQ59qU;W>-jo|cg`XZ3nBGd!M*j|=NP>9#U&c12}=o_%#W-!xj(oSS8Kl)3GX
zg{A`Pgz8y?KK>Y@^+BejGf*vQ@M1%~6<z8<Qb!Q@SI){!%B*B8FE=X#XMTsg+N8*$
zPCPRtK|N*(IkSNv#|fvxE0L&G?&EN6lNGG~tQLsOQ1w3joHn4|e*Q<ED}IOW)ibj{
znYK|r2AP;6+AbuR1oAH-EtDD8wHr4d+PInj@zYN~rGWq+^+$HT%&U&IbdE+oNt!6v
zS2j%|Ir=B~E@;^g`DtiuB7;Vs@=Iqx=w>wi=nyioYebjP2u;OtgwrS|aGl$1cDc-{
zuGrCnq=e194^+V7a99GJ`%0n2qWUCaulYLm8r>J~HAZ<VVv@#Lfq=LlojX;$;cHX8
zBXIrMSh;6WS=0FQDVR46^Zr1Gg8|Y(I&rHXAJPN?O$OdcWJ?2@@dF)O2|>7=e;U|2
zK0c0p+QMtGN8E!@4-bNZ8))YrlG`#pQ};8%^wYZ>!CBq{y^5P{ya(Dg=_^HccPmYL
zP^lT2if<;FPx_i$0PykKnHD!fXdNXP>K3*&Dl(s&xjcy`dx4bsFr}m@fxi$Npz0<b
z9HNz%jvSSOJMQs_lt{0&DKf>B+v@Xqa=qSM52UMHaanwB!OohMi6y;f739WGL{>Fi
zSKP)o@wSrh)|N$Wrnc0eEn~7Ro6r_)IN&&ywxA_Y@*wCcj%<$5BC)!Zi4AZdCv6WT
zKZH_gwWNMjS{$M6Ik7P&rOH6Xq5(M7rCe^|XqY)gX{L_u9WX^^Tbd$GvMpY3PL9`8
zj<!_9=N0TLYfdQbK~v&3N0!xISK5W9beCRTTNXJXdmLx~!Y}hftPGriDcO0<SxEX2
z5=iAmQ<lS3Od6uFRzk-jkO6@=Oi%w#e7I$yc?N;d(Yj)k6&)%ItyI-A*cJLwfIMh{
zX_l7-HjGs5iNz@DidpgS?5BH>6gfwO!+gE?0GbHh51|z)CQ(uGe3j~#(ec)ihOVxL
zk+x0z-Vat6u6p6np<k^k>iFOy<n<$OV|ZRT)G8_`(gLLL#!%+g@hd-AU9{>~GVkgS
zE=Jxdc8i$cQJ9tRLH*qIK(dRN2xxfJ1a&3yPP1G16<<0pzasF9rMwmFcJ>~R`x5Up
zg3o{NAs&afVx5KZ3H}1=AfVqW;-Bz)L4#o1zQ+_71vij9>=l(MP}E@7c-{0>S1G^e
z&+XLb)|cfQ-sT&&MQ3&J@>226$LmM*)9$JwZ{*Yy69duH)@EK*D5jpEHVUlsB9V{s
zDKeJfo|ISvL;02E*ojSEZ#lsaak4M5*vgNg*z7Xik(JXm2Mu*;c1(S4^tO3kG!^SC
z;?34+XZ?EJ6H}tl8B^t+jvg4t3PC?o8xmz3F!maZeR%zs>KtBCnGbd2&9ZK~A0m{1
zQm>_|guj3JE76Y`!FzZn=BXE+wrt@LB$HRzSqq0?34vGS!Xc0~00opUQU=NtP2443
zgLLu-_7&<G{s#?>M+VR~nc{iKIVcBrUje11Hd#dzyB6uAF`uJ#s2hB`5g=19^*`4d
zQ^k-b*Cw7a)}$Na^zm`oEeJJ0`A{D6Js*}26rl|Bm`Gek67q>W#0g8P&d?|5<MiI%
zWMq@=xszSXdSyG<!a+z))Q*FaJkvN<1`ms~HI<;#cINRrGczn{@CZpth>eIwt%(_d
zKsS!Epm0R&1?ALcxYCx(Gm)Ur_oZN{JzfNvtTek2I|9uSlbdU&N6%|pecsUYcvoRV
zV_s`&NuYSc+OEwmuXgW&gqd#*O?+oMcKvW<$&UP}g-;_gQ)XX0YT_T5&mYDcbAvxZ
z?8UdiZ)OoSO1GveRno!c1PvQ{W0@X4Et$j`H<$=iOJyCFs#WPRnGw?^h5x77Z*Ljd
zT0UIS(q2}T<#t<tTj+5Yd5vk>+S=%S>sM^5*45S-@>Zo80s*bLt|{)L*p>OT?^OmL
z6F<?|P#X_;-_!kx`8f`IR=OoV2CE9@B%=F9(lkUsQrBpAD&%4pc6#t`vgcGyLn<ZE
z9y-Z$KO&Qb9`VCrIe{39OinT<CqjLW$g7h0d7a>NJ%lY#TI&P1t4F9BA9tCJ;QUNx
zMD5k^ciYoSZ2MYblcy}1R>xF%b^YjfXEo-jbVsUlIuH!JTX1FNNZCb>yX>hy*pZbo
zo0`ijTO(seFY#TncE|1G4IPH44GXJoZRX#OUbVg9{V4u=d_(})eYS!9jDHJQ9f}Fq
z?DwZzOvwm>kdYKeL7`%!asD>=o7GmhptZ+DKx2jh!{&IR!p!9<kUqT(Cjp!F#a>7v
zUOEvGo*%{DN;70MGaQ9<#1^U=QGP|5wK&6BnD5FcPESj<7F!G4x!Km@wBP!iE}zfk
z^zqB{3q0w?8D<kwcnb5}NRx(4mc2eD3C0uiOC)Nn%)zqZOOJEHiVEG($yn0N$#Jnb
zwOT_$^9j=oD@}m?p)<?nJfl6ttjxE?Rggj_S}{4_q!!nU<E=_JHMUf5%PX_3%kCcA
zG19WJKYw+-zzJf3dwSft-zhE1yKJOJx1v76n>Cv1)V`fH)YG>u%HJ4SHtaP#&*>yF
zo|S!<zQ7S!Q<~!}O+H3*vIUEGttJucHXC#DYCj+e1`WJ1A`Rfb7b6oE1K!DX;5n7>
zf3chln^BQu;(*R?EQU@hf`TF{DjFJx=#*%%Cncf8U@Za2=2OVT1fZgynFk(uR%m)j
zX0v8ny$%~H1yW&z*Fj>OJnV>6is6n2=r?TkSfk5>E9r4uqF7rom$|06dbF%+ygsKV
zZDL~A!~WRl=6qkfz1sc~PSq(CFLeiEtFl}awQ{P$nR%eQx;kJi&K=1vkx}Nq-Hizc
z8-w_fcoltfuRqR&s75%&R+rBa%S=@ZQjjTl9s*8^LnWcn1jho~k$Mao)-B8%Q1B7i
z!{VjrzIi80h7zDoL{Sv#H7pC^%)eyuSm8;z*&dj~VGDO8CMPC2$Q%xO28Pv(exmh&
z4=GQA)RLqJwu^QRd`N|OrTCHUl;$H3IlAgNU(sp5@1TE2ZsD4~)_ocO`8XGk-I_7q
zRo<UbZO%P^*JxytF>-X@*Bq7|)xFK5`nVX=Xu~R78gwwv21ocT?Biwzts~mbLHq&K
z#v~v<6#<rrO;v&S;8GDAgZ`6IU%{10Mie!o4M}p?G{oZ<?eA<meE6Iroo(&y;_z2A
zyR<#4hPS=^m9w?Gw7si-vu!=b%8j|4i8Cw`S*4$Bdh}i(odJs^f`Z{O81!R6`eLTy
zpeij4^5oPK`bU9)jPjgKdbva=!>aRJZVkNA(z3Uqfj=l_pV_soXZP+NVTSFG==ouB
zGxoeRX2ZMN{VgDxi119|UES#j@JqHGy_U`tl4p*F_CWG!QYf<?=Z-3KBQX^NW=Tw<
z$hYbaw0vXqcvE~@Wm}AZrKwWfoPJ*Y^yrcH?j!xv+Xg+>QO}<OhK+0c#`vM_E#78J
zfp-4%gz-y<w_QIGzhOvQygk7p7ADR#^S8|BY@WGPqw)hz^x19bvlNEIQ!%UIasxIS
zbDJE9EZ9u6$sKx9!6;^bQp8Ao7&K&rb0AHFhD|H!)JGEfj^+T9kwDOQ?nDp|$(8#O
z^*)aOQV>>y+oKBhty!}VijL@S2Hv~tvj6!8U!4zt-s(Bv^!}<Ru-;tYUg9nM__JO-
z&3uTN{%wDh1(C<B<cWw{5<a^uj>n?bv2!pdL~{`f-~|R*dIp>1p{)^P25I?=Avtsd
zI$Wwz%VjnZ%Mbo<@<FkL0({I@T&Sp)5X=)THQJr=wAe@uW`|G(ri!L5U1}^{eWAdL
zlaQbkb#~K!gd}2pQ(It1fyorvf`3(${<djLpD-7Dt9)O_zsTqZveI9DtgX6nF2?QM
zQo3cZs58H^w1#J-6qn}Xw<fMGI@#ofVi0Qp?3$RtcxE!h<U<4?3a*=&5E~O6MFDUU
z(N7fr1}gv~r*;JZK*Ww=_axyD8z)^j&I)^`yc7me%-ny)e0jmdWd0@dyYsKPuHf03
z?VA1EVm@-_OPOtzHI;2}IDWFBZLoHvZO_fZ-)>6ELVYG-Te?!yKx@R0W0GScp|C?0
zNV5k)P!5F&f;H(c$cTxF0>K)8!D-QVaDyQ4{9jvY=l#B^vc^4iTbriDb8U020i29h
zwl03*Dlrq^R~9Jbziv6DEouq}*aG+WrlwZB2jqhZ?``roq=06_rh|DM!*%U=Z(9_p
z^tCwt0NMgN^>*ouz2xLnbFwMfgfXRYMF87$%wQm~FlUuX%zYYPqR;M4iEx@VwSAhv
zd6)8i{lG!=JS6t^E&Q>GU%hQR9|&B+=K{C!fgau&xSRU|&-nd4+b~7~wPIqAq*GR+
zRETN@BbWizkP*vZbfWniF$M}L#|gMIoJV9$vUrjR^6$V2!Bi#Cb&x5l5()8UpO(f6
zB7KTa?5T^{KeuIXclWcWoF7vg2rB3C@+bOtFYqUN{%dyZrp5DkfkhSDQ5V=d*lIrj
zad2s2+`zD1gCo_(fLupMM~=bkJ{hq&$<#*<Hqt%|3Ywmt?gr=$dNUj&OaC0`u{gQr
z!HZ#<hgEX1qPnGuZZ8#O9oC%#TlV(j-?JOewlsaBR(2siHnpdE<pMv@Q`U3gs^&kc
zRYw0&o$2giI!F67MStvxi2}hz&Gl>wj0=IMImkd{q+tw5Mg#g$YR|3yJj4Ldv#5Ud
zB~s(?f>h|LQ|-_gX5ei~6B85Nu^0dqEP?J0?H07!PjVje*qG9|<)<S1X9fmlnrHYa
zi)SNqwjK-k-)L7l;e4=CNp8XtI*jc@@lt`CQ>4ObK&FE26^odVs4%^zTVb~Y%*Spw
zMnwX8sM8yrILVhN5$*X>)dPqErU_J4->EA3!Fe}C5A>C-h<WDcvDL-H{HmR)k=@<=
zy#BPnUl!)_o#Xc0xw*^&64<z;zoVePx$I1T6iyG(;zU@W-4yDZjquW_OynGG2SA$;
z^;K1FCb?OJ$PB{4%cKCLAmHogrv)p6H|MfkgzJH6H`(qazoBsIx{S1<c_Gq@Sw~b=
zj5ew?wW+CcvaxN-(w9(LSn0d)LgW3J8IqXBy0h1va=AiF&FRIZTTfYEVFew<i$O!=
zd15#ZjVMSutMymm<a)%FN>77S!rRD3fyEgOxs9wOV+Ng811klr)re;fDu%&Ggt=i6
z9IFAeU4wA|;MxZuw-Ntwr`Zkqv9ovQe|$IT{%dDfO&wi-gR^zdmMaF&TzGg(DgWx2
zk00v^Z06q%jPq-IxFPV-(4B#g@OkUS7oS7pBG1dhd@<4KsL8O!0$ISB9y5dS=_S60
z;(ucSNS22LV7XB7M~Tf%(|6evrX$IG{98xQKmYvs0|!n&5cn5PCcBvXM$1Rr+wq6r
z7<h@prbjsGci7YX+t4KdlaCuAMJlEPjEv|;($Z@pQ}QaLVMsaIx2vqo?e_WH@07XR
z`064?4f=(U9$N6HaDziHRL1`cmdt4KEh7D=h=Ae$c=xpksY+Z#oB_imPee^oe9L&_
z;ltC14)N=bOnl`l6GvpZ>u`SMqp05(=;Kgn(#P>f1DA0=F@db86X~~q29RJXbS~y-
z=v-JODX4%lf#DY>Uzm`jH5g}2^k>9d(&KB=lN|2hj5Jq9X8J&8X2$x#G2WCBn~@n;
zlbPsp4`!NOnHlMQndw=h!vxVsty)+yEYO5Yq-aVb9e1XK!?9w$P$Xn5E%-cYBQ{fC
z6X!@X&Tps6kzpV#6;>d{1Ehef+6d@@6Jlc0%*Mo+_?Y-)mpte@+{|i5Q%w+)Lsq<>
zgp8H{2wZkB^qv1uwOGzhOx(U`ai#rinr#s?{1Vh&PaMCr8)8QTA(oa3vRtaB3TeI6
zYZ37ci52T5b#nx%K4%t!f-eO5B@+|>MLkZu!@J;RoZxA&{$L=9XxHly_6xHC02=Cu
zDZB+e0SpR~gP*`JQU?PMBKPjZq{v8|k*gzl5F>;2hszGO1{}p5RT(@s@SQC+^>vr@
zzrm{yR;``ng-!N}(|zp|n<p+S+em|sc^G_O7~vNH9{z{mjf?Z#-tq`u&R4v_9}2X*
ze`G)A?g6AL3BHdQW#Q?}DQ@t#hSviv{Gs=djw77_3b-5x{Lnd#k<9CN;m|gUR|lSi
znh<U&(dl%Nx=1rEAI{4wz2($V!VqZr=Rf&>1SWA@6gzOvSNAXcnEFb9MwRp5{4dKj
zx>NM#6g|pK=MVk)&-%a~l)C@u;R8)dnL{|&`oF|VITyjFfQe>8A0fb|=&`}*#>wOb
z<R@y5c^Ct<A5E{gSfp1Fpi#%IM@U!Y>YDsp;4-oDyzwJP#?K3Em+K4tn9SDl%lISA
zD<Xm)2X5dXvcXS+Gm6eMKt~ml&NMiqC>@~#<==<?Xb^2LllG<@Z2MS40wxhuO*4o+
zpKk)Zg==^(1~Z*m6J4$(ga=QP#wX_S%8kPe>xKf&Cm~pk^~2)}vXW9`O=i);8!N0i
z))Y%zwzfso<@4`bED7;Nh<_a0&~HgICJplFl)4Vgffa0)|0l1&*y1n?l1#unpoeyy
zh?Jt}Z^&>G3>8j6K~)zar*uXnPKo@_y&v<6XU9&#BP<*zdy(JAF9ZE|KrhkZZ%+ou
z8<Zb=vH>d&{3M;!hk!?#2oyCazaZ8KsuIC^oKE6tocYc?uRGO|YR^nZIVP9O6&(o~
zK&1d)sWeb~1quUQNO6|zE0ypnGP3e>Dk@6TeM!c$bjUlU)^cM~x%D<EZ_MVx|1PlR
z<fZY;YMriH?1RQym$MdY(s(F2J|V@3VQ{4+Bv9<eMA*K{VB;~9h88pqV@0rkS`A^~
zC^Q?D^xC}<sALk!26O^17BmT3@@R5wVIP<x9fid$IS{05MI|jc;<C8hf`!|viVYJm
zT#2qaU!=64u`97)o&qhku`+*20uT*|&<or&f^yAZwqPUI^wXylQPAB)Qf$oTPBeQY
zh#Kfr=p`y4r#Mg(GM%9!G=+$Qq678fso$5?@Sc&zuB?^iZ|>dEzQ1$mjE3p)@$u9>
ztNIS`rm@1+yDj76t>4{rR$cp9>#im3F4nN01^AWXb$p9pF25ZJl#>w#jRrBzBNB)(
zxa~NNRnM;s+;aQ6b?XBB%|PG3|4n6ab}V=Y0G6MCB7@4nN{GoueajX29C3{rNh{UU
z$<eJ8)r0;M5tDOM;*(GB5r17UYiM3~25;f-psYxeDKW!P+Un0U?M1Rka6mLvTu<kx
zn(amne<vd_IvU6bY?_}JpG*WE2;4u;Z{@dAU6X?ULS46_t~q`W_!ju}fv1IQB+Y^_
zpgbBz)lJd@E{~P~oneM&L*OqL^zzd;ydbtNT)+!zpXaYqnO(t36*CXtChQMkn0bsV
zN`il~3L?$ykfTjolt>e#6_Sv7qY+r-&xFhyO#PLHgt<k?{Oa6N@qn0Hg3MzK%Ytu<
zx5Vj~Lh<00+^m?LsUU9hh};8GMnG05A0p`_H64pI=ptv8nn6*uF`Dc3nRJR$_UEKF
zAeBK+(;7MrC{QgHt+p^f$7^w0;HG6xNlGBFkefJBbDr7DeJqR>^Uz|Jtn;$FAcE@c
zcX#rK<`!P;>S}NA?r!(_e5qDzD&N!9wTgb1SuAt|s10#?;6EmMdnYD(*NpdUE-fzd
z1)LLW=y&ht!{w8u#l?W&>8U@obz%Kc!s?*Zzf9?q;;>f6L6L(#0hTA0M@Q+Rm0qFf
zZTgJ~k?|U}V+uYm3sTFZQA@p(?eS3mv^4wSxP>KK;wjG0J)x%(zjRO8!ury+)N2%W
z>PvMXk5+p!aGKhcyzfi(>2ZBq6zXE4A;Eu18bZ97;T}C4l3-5-17_5~DVAS(`|Y<+
zPtVNo?SZ2R*>PIn=xeXNhRH*=GKc0bh`CbFI(f8WhDuI_0iekWL>3_RT3@NqF)c+L
z3%?zu-i8+uS+0E8eIs$8*+Ft2j1UG)aP{mVgzE#gOUpK4<}>T!ab{VV;EJws#ph(j
zN)2VCNuUHVTV9C2>cspwJy9znX=&+om<1;-1gi#OenSHSv~)Ifw5~)4AefWK1+|_>
z5%XzF)R78Z{teN2SjjXX{&E8%B!#jSVC1D`4at>+Fig;yh00T(c=3lD8uzZs_s7^a
zl~fLv)X%lmwInBQb#r%SwX5x`6E{4$cHP(4SD#W^SbbIdDfeyPx9~`FvoTiZFZ4Eh
z8hzrjjo+PGdr@D3*X1i3s%zWVLdRTwpo__`*jU|h`l<^a=$yHr$z^NIFC4t{tUa%N
zbKwzr_GNC1*S8YGjBzeQY|*>KNAO86V6Q3$2_P5*N5~A}^*C+Oh}kBI6Gr+Z4}e0U
zQwj+WO$bravVhrIJe*Lc1p}r;mm^b01}P{2Ipq?27K(WmmWa+cAuZujIbdG2CmdiH
zmO=~t)A1=N9EMSz0aM`4N6TDhcfQjAjiP;N%qk_5S3#OGy`nC_#*IPLn_ZPiMf{A&
ztFg_jT)ES~wI{hUZ(ViW6d?T77Eiv7-@0Pk=JNwDXJ1gZs;8zaySRF?zH{DeU9%#$
zyST*DWpfldGRpa%zVqq5V~r0)tS&7_Z*vA!0)G+vW<2pWP?2L#)AEBf3@~g$c9Dv7
z{ETPu5XU_P#7k1=ja}W0ukFmok@7rhvT=%kub{J_u(JS%wqLn0%fF|LXKAoU#EL%v
zNm<8Q{7rTYqa#&BXi5NbfwBlrVC0pEqfN920j2|sa|SAg|0gkOf*|%5O=nGYna}Oa
z%5cFpjAN-5CwwJMXHYV*$>46to+?=!l69eOLI1%>2_uci3?__H!8rbGcJ;L1e_BD!
zP-jtnbM4w~mHFL;8{4a=a(s<#zVfD~imnP@(MPA{wX7;A^`Ga@uNtfLxHmNyc%9z3
zl%BTo_Joq*qP}vst>34~M#R6wIM>SZq8`(#Oi|<pAWP)g(QplG4gOhU0=7LK*7O>-
zQS$$N1+dRm7eWzOgM%V8P@X|+0ChOFVlu#xGpSai*UmtPM&bcJ5T+GI3k~l{0PeD~
zyrd{E$7xT<N<ioXlpN<F?@Yp}Y1Lr~;hm-PR%lt9d=<LI1uy3pX`@sWBJaF$eEi0V
zi5tf^-MD$x{+5>gt5)rAUAe#G?5@J{L0`#mjiWuez*^ufEy*$GC6;B3UB7wqyJKVD
zo!or=*htH19UYVhe^+jGm5-EFk3u^$V5!N@t}-Tdf@@9ZN&Ii(McEGpu#a3%J#mi%
zA~K-~=yXUQ$paXFm`AYCprWIGfH44s5j0wBh?s)e2VFXd4;iyr!+NYzD^0mHu#SA`
zY{ULc>d0~!NAe`@*5wTA%ow#ZmpdzwpAt=<@ZLleelMBeNFxD#9&M&h-n6y8errR6
z{9D+Om)B9K{2enIJ+0~S^<z0Xrx?@YVw1&-G9t7R7rHjEKd+;xh|<&F2V7Bo9UXu2
zxH7CUa5crg$6pX}z|lm)6j+MWV9;V|p#Tm^!2OCaw1+{SLilG=X=u8zT8+txx=5V(
z0{y$5yeZ9YRf#6zT36JsJQTR*zRFdV;<dp0Tl@RB^0>>6Ha`A1-j~In!MP7NKt?vR
z5;<!<G)<x2fn8iqOMJ-a!I+gXF)`*Clh<V@m>kW+aHWlDQ6@9_vKk8W8yfNp8_uz&
z8;ur=QB2p@7Zfx!6ckyFMk`%d^CQ7z_Ne$NnuIe&@K&iZ;U@A-#ytg<Nq#$zPK%#@
z+NJp+^-q1!$Zn8%BzKPXqq1UL=7yq&a${d*+T}_eDuu2arl(O>;M;uj!kvMu`6RNT
z9@gL|JV9(nA2h4STtTFOfsqtNis#p2cm;$Ck@5y%2*Iwa_km@RO3VbpvXF5`v4W)d
zctYEBd;4@7KQ(ZOpE+^aW%7Noc%K9BGqUx{`|PAe2W>>D6gf;eXAy4>ooYy0wJhk|
z@eoS@`i@ZQuoS>nhN)610+U;{8be@L11_OLj=`zn;Z>`q+S><@J^%c~D%5F$q|M3T
zn-OuaQAJA0ActM6?8Qm&<&A)MJ6zylhat64o7KPUrjR#PuWcvEH5w?NC6fb97wSr3
zMX5ib@>MOh-V;)xTasZKRlV)7JIj>A{#1)4DvDOF!WBoQMWyB@!`=i*&Ic11EMUL}
z9Y+g=O6zEqYM^Nod*(F@|J3Z$;W)6Z+gB`xZLh$IniRDCVg9uMtX~Upd?An_-dk8G
zLFjgb;Z?%8^DT6!CPk_aOiW;|?B;*r)8ZPC@HDwv;vmblgCencgxSY#MXSOH1e4kM
zc3I2*(_2M;%YF9+gMo|rOTnLtwO|VS0|PYe5R0)}Bm|!o=i%N!FjKh~c#r=jc$e6L
zdxL>LsOhx0_e*)NH}I00u9d$Lybt%BqBlUkB8bcpcqAB5qL2jxib@LaJqvMyUO{~|
zqAx(J1n&);gYy1}7%3XDHb9~p-P^_g5WG!%9rxA*R;c&>$sY?oEY8Ng(ZG-B9*$Mm
z$A1xg6zlE(sN)i}d1E^=J8AbO?k7ygb-z13J_TWOL>;dxGCNZfQ)8UkT2bcVzc86&
zV{<Zf(Uq%Bri6qJo@^-d%X&Y<pASAM?5N{#fL0gk7-Yg1{GoUkA-+`HcM`B1T8Y<M
zrp0l&LL;VzF((u)(ReTs-s@5l<1L9f3FYwJ&-GZuWEvDinHIaf*kLa<*{RRAqaUA?
zV=x#P!kcN#-c#xTHT}OZwzptCt)qFOL<xkuJ!UrBbs}X2e1V>Ylp=#+L|5@CL{zXu
zyM!mx3=`--rvnZmzAkG=VpCImXWC(L%iUYH+)eFoz?eS;-&W9cIY(pQ<=KvU&8N^g
zHk4mO9HydYtgK2(5fdWME%qkX*rJknoFR7r+CY?3E-nxLNmGjLxj>fVAOd`dbRk?&
z&}GR>3u#$_9waG=!X3%l!IcHVN%;+k(-kw+E?&wj8f<N*j^V+f;8gIZ!DFbKO_uo?
zzF<_0P8|#IGUc~8P00>>ipjY)Gt*?s$S_g=UmP4kSubGjV@)lbOBhgb|H8Q{1{D1e
zED1gp{Nu8IXj|3~dfMt04Xge!wI6O--VJ!qkAvpmkKwhb5$gg6s2RBT%b)|TpnD^M
ztJHhDf|<eFg3qHqSVIeqDkiltRG+{zsPB`(Td}u&S$_mV<kfsU*h9uE9=M;|g1_fS
z{}=f+&~Uo~$TK_3MBrjE2^#bY^#_BW2zGZ^ZHP2mq(7N-+6a$J5?Ty20D+4`o@0-O
zzKDmM<eKNSSkzA%-!9P@d`8@lcN8dcbTrL)vJIJN7XvqjpM%sK#r1FaZpHaegbnr&
zL$Oc9<!Y!C>R=vtPxwI_pA7K}SS^@|kQBrD1r1oWOINm@E}lGcgzBRgCBYZOeaHjf
zMLN6&>TG00Eo6PdeHUTT!2~8X-Va;XoFPh%&^S+l&c3M9*=l4ZI{Sw&NoUUneRxHs
zvlG+=ly@2E?6WGJmGl_n@)7@4@Nsde92do}MsYru>r53{vCN>PK4FL?OpbOsaQK0b
zs`K+|YVz`{>&!_;lgXH57Gve*xw#ePc`2!>#uPIgm8c(gh!2AIY0d);M-+rFZ=?8J
z+WpvP(Qfg<$!Rz0@r)<~{XB%R`66Egja&!f5EcUV%@BPTB2V_|=h5Lq{O`d>#C4#<
z9sfVl;3fJywnTrg3(;RMe-Z0!C&U@I|8r<2j;%3DnhB+h58h$rcV+3<8FCtmg~eG?
z-;_!+d$2n=4E*AAm>ZwzHychT?+PuQb)l7mId^ez9CY$`DxExErIY7}c!WhdDS*YN
zIr`=4oeT8tC6(T_sr0TbRBnjg;W_r^g`?{8qoL<O2K<;kAifR^|HCXwR4dO#_2P54
z$cC@MsfZ{x{Puw2e>I>y<Sd{6g?&ssQHT%2s+Nx3^U5-&4FpbSzTH^L{4XE{cwWl?
zz;|HnMY1(Zd$QbjIok>DTO&<8noYDlYkFZ5lUp*>{>MEz*^Zp#^_dXe-=}jf?a2HO
z%8a0QXM%4$1GGRF+V@T#bC9YHBL&6Q<7a%2-#OjcDz3Qm&Q6dx&RT+I-hw^H%=XH?
zGaiwpwTqFZLjYhKG&_(Fw96w)hXsI!g<d8BwsLt$>991)@tN2rD4r`Rf~aCAj}mQ$
z2!DL^=avDSAeL8Jo>LGLXEK71E3eZO%Q490@A5Ojk1qBD(I1Eq(9_K$0b(yAV7kJj
zaPkE3nc=<PI`cg^;lJD2dFP$Pf>iUDaH82-NiW^9CveD`+*fEb<2W(`zZS_Q)jV8I
z4d2zOLwniMrdD+PrUt(+k-+W*pZ+Cymhcx9ht{H)3@t|BAu(@%E$3~PtU0_jLlYOx
z4@tdp_F^adI_+dTXeYzE#GHSFe;aunq8H7iSbR4ew-dp4k3Y|S#1DUI9)nD}-1o7t
zgSZmD+`&sR$C6m7te-cY>bE*h7oi~@a&hyP)h4zC#~9>=Moc>9s%~uZTx*^4oYlqI
zXV%qOlCv{&lUr@CG?qCV5~I@c;rmitlbMYI;H$$Q14ntb9M4?&)-37^=sMs_NWA8W
zd*Jbd8om!!p12KmoVX35t+_zY+#+`WUuBukx7TNWroH}WC$-nByuovt0?2f0NLHf}
z4*Z5aO0iA(osWX@A<Z=ShwC)?G7X?gNHZAdXFpcb{8&kIDbhTn>62+TA&pMty*90+
zn3nVt<?KP4$2BWunnqbp4o2e7N~%B0au$BeUl0Bku_wHuZ{eZfhq6AevduCE#{Iz$
zk%%g`Sr&=;x$qJHbMUX?*OWf69r0CBw}sc)teXA<HT~>j`j1imgW|8U{NJH`)KmXI
z3c4ax`u)NGL2}f01=3!v>6T?@$-3kOUu1tjt}cHMl?{Ey7Wg(@$Q+E+u1+@0NvidV
zTJaC|Yt*ck?_kH2^KO1k6~kFw$CS*{z%D9b|0SChqEY%?lAs&{afx7ufcDWw9D?#^
z-e5398=?ummO!z^XtzNq2VVr#Ki6W{xd2z-$Q*zD$dMyIQ9|`$4ZGoskV!ItsNf_s
zqU&*i`kiyfFX}hO*L}eBnz!iouii|>DrfB1)Bk<p!f%7|5nbAQ@l#J}<v-*T?*?^1
zRGf?F-;3yyC8-bTL(KAg<tO*!HMqn>EcO5OrNLfKm)OT9!FN}l^!k`hMx2Z1A2TDa
zNi6jY?W_2G>E~W?U-10I{A*C&zfgyhT$)t8_eZ$!iMcTenMHo$JA6%of5r6_t^j^-
z#5IQRpWw3_p9}cRf~GNAK0h6H3|!&|D1$DvTl1dsi5SrGw>TB|j^g_%ELw9jzIU=o
z?N60Y`YtawTcfFB$=VI-??F}x$k6}$YXtA0EA*~Um|tv0U2$m+pzp51_vP1^{N2iO
z#Yrwr8}gZ1foQ|NdHnST8^$?;Uwj3S=497r<$aO4HSoPZ{u1}HOz|i)f8liubq&7;
z(6%pq!Gif^(vG4}!qRE#ST0>+jCJu}VlO($g=e{tadIK^Qo3C2O67ttUhZdK!RJ2v
z*>U+&Q75G=JHHgqCXc)DK6$U2b&2ZWC%B&BQP6irq0aIOzRjb8zrl4QuD_|z@Eq$W
z3h|SofS8Pz>7zMC1&Ip2$&-MSlUMLnSn#{#l^7}ypXbW&g^1nVCDQRdlO<`|>HX@}
z8T{GecjcZ@)2Ke9zB=gz{pm^Xe^&a>xnBZ0YQ%H8)G{^Y_>OTD!?-X`h_BtHUdi|@
z;zuAQ9btCFmd-xza?@|DwOqcJ72wKLKk0h`<gu>fuBzjHAOHO1zblr?;Q<yeZaVSe
ze`E3V><h2Iur%<ni<kHb=J92im)GI*8C+B7ixK7GUqyRP#TtAS`wrT|uRt{CQ<xJf
z!!n$q?h&zAcUde(M1szEasMCSN8+(wGw@02k`bTea>Qvn8}ZOCWOh-{A~okQFZ_4B
znjy$@J+L=^Gx#ZD3t0G@Fv;A-EI^tqh!lK2&Ft*w$g>jo=-cr88MN&o%)JfF&u#_!
z=@?E{xR@o1ao~lKUzV|#Irv%Np?6^~*ahVC<!qFH6ZG(>Yzmg!X<ouA#1O8HsQX4X
z#CKwj&)~C`W$-ezwTxx32bq;Uf=^s>&%Gb~E!H;nmrDLI+aN0OeU7z=f8zHjbV04m
zE%&E~(dMt>UDvQ=u^{(=cySIhVLyo%>v6$aB#tsa(Kw=K>~)L*)jyjJ!SiCBh(i57
zMY+FV)3_#uANSi>iO6T2xYE%lLpUEX8PUe97{3+#cj(^>St8cXm54Ou2faNe%8|B)
zCDB-6Uo6vZV`cn#=GP{o&cDN$RfB_SV5OS%tQG4vU9@1{W@0bQVk7KjRu6u|%8OWR
zL?!y~4{SGMfr}xzbmJ3x@t_u;t+>v@bq=mwxc-T2AFgNc9L!2!J1*$)gAKUKae+sY
zW#D(<$GCopi}E3T;C@_GJ^+!jd_6v=aGizgY+NWO@DZ*ZxWdanggn4P$a+!!6U#mZ
z-NX>)o(nS9wU}quU~G@D7JSd-x3Ox(BP`~?fx|Z-AADpDpT<}=;Q9qa7#sQCX?$La
zYY(C={1zALvG6f|ufRStiMifI<)gu&fB69V^s=q&Y<3m98|R3;%3zb^xqKz!r=7+x
z;NRr8@CW%Z{)+I6weXNSD4q~6YFwIG%>m7Y+7az`?LqCm+G7!^5xEhi5$zGDMO+YZ
zb;S209*uZ8;=grKI+w0qH>BIDJ41I=ca`pT-6Oi^^i}%R`g#2m`WN+Y=|3^V7%~m5
zhNFh740jtIH9T*4-SA;#LZl<IEYcsjHgYm@U*yrqrz3wK8Hh@Vs*mc8nu|Ik>Y}Kt
zqHd3RB<h7|U378uhUl%)XGC8V{hjC+Vze=qnEaTXF=xkI8goO;BQY<;yc=tXb;Q=i
zcE`@fo*R2n>~~`Ciu1%(#jT7Rh?|W&5ciF^o8s<|_s8EB|D*V4<KId+lJGdZVRt9q
zo%m$pONoC=(k7XbwkDmCbdk|ztT474UrNqR?o2+Id`XHer8H$SWnaqCl&ey1PkA!s
zrIgoGJ~SCj-KI^Z?WTjKOH9|Beq?&q^s0HadA)h3`6BcE=BLfSH@}<8Qj1fEQn#j_
zk$O?;RjIe9K9c%e>T79*Y5ugeX_IMhrhQ~FSZtOuOQ&Vha)#wX%MF(MEzeor!nv%e
za0xH7wpxd*TdilLYtv2X#pz8Mu8fL|Co@f%*_kz2sae@sHCd0?@@@6D_iX`tvVGou
z#QshDP4;{3&)Q$Jf8t1T<T{!hYaNr0Img+KOC2{j?sir<+nu*KUvuqr9dupfy2gE)
z`vUh1o>I?B&wyvnbFSwbo|`;(dmi;X?|IAfFR#v<>aFm$dT;mM?|s_)ruU<4TXuf-
z+U)Jw2eU89zB>E+*-vD@lhd1XRnF}>kK{a;^ZVS~+{3w7<=&qAVV)r`H7`5QpVybS
zJ@0Vd)p>X4J(2hOybtq5ep0?G|49Co`8VX>o&RLP_JYF&-z>PP;HE-TVRm6nVP8>U
z(G$gG#m|>Sm86#xmeiEAmyDD=Uh+c8o26Hm-d_5M?||<H-|v0zmR((TOWCVs@0W}6
zr1ISIn)252f%4h%+shv*f4cnT@^{Ju6{d>pimHmMD{ilNq~euIL#3rMzp|=wW#wGu
zm6f+u{;2Y)%9ktOto*3TP?cP@wra9!U)9m7SF1j(zN-4B>ZfX4HFLGP+M3$+wb#@>
zT^CcATQ^sCf8ARvI#*n?;*t8A`U~r?seiN~uHm$X+Zv8FyxH)nKgr+c-{-&5|A_zn
z#<<4b#&a8=XzFa*-t<(ntGTIpsQH5CJDZ<tex>=%m7Oc^TKUq-KudZ{P0LWrzLrZ{
zu4;L@<<r*G){55d){)lf)^l60Y5hL_`>4&|_EdXz`vt2ktL|R)->b7%U$FZ39lJXo
z?D$vb%FYWqU+?Pey1LucJ==Xt_p{wE_J|%^&)S~bdtU0b^cMCu_3rGwviG^(x7HM|
znOyVqTJ752wfojyz4qAJ57$+#d$ezN-$niB4pa?n9e8ta>rm8C)6m&NR}DQe^yzTx
z@XNy=j<Auak>rugk<yX6k=Bvkk&%(>M{XZ^b>!XA{L$Xg1Eb#=y>s-1(N{*_8vST}
z>iVknTi0K?{;u`UuYYs>f3N>!OgmOLcJ|oSV>gW5HTKSiqzz>oR&MCrFtB0MhPe%A
zZ@6T`H5=~V@ZrYPjR!Vfz43*OpKMCql)Gv5ro)>a9XE_y#`DMP$9u<T$Il-B=J@x=
zkBxsap#eD~xpbCwK~impyet?|wy)y;Ik7wNo21=L?3?sS|Gth(`OXn@=j-Zsoch4N
zt$v4ffZeEm*8*1jg!(-Kv6FtQe%HZQ<4yHDB0aHB)bCKSbBFpp68nFy`aK%fsA~0l
z48D`*i~hy3OW^FPd`ARu{sD9VfUTj54)7()cj%2Y6ikBd3l^stRljRky=II0U5hj~
ztKTD-Me|GbyN+dR-d4ZsS+CZpemAfLMAK5rjAWVGJ?i&pmam0PUcM^^-yc@L$8wwY
zuj=<WR;G(ozbCL%9e}GceIiTH^*8UD+rN9u%<R0aw78_$);Bw4TfJ+~)by5}wsqq>
z_t<)O@7g-GdEVBzcYb!)?mf2bS%mc8Q&Utlvt@pE??mC|T|0{UW_Rrv-?Mtx=51Sc
z7OA-@bL+01^96V^Kean2-*zf8*w#+%ncBT?YSKo}Y~ABKrfiPz_c;o~f32I^v88F(
z_Q}%1;^N}k{*J-!+OXmaLXX3<*g`i4rgrbyvTLVJ=KaE4TlUz-ZS%XwC#QCd@7`wH
zHErwLKZoy=Q-z@~Xwm$Z@tIw=p540+Y~DrvfNnVT)Kd%RLrHg>cJjM@vnXG-c-^k)
z`BTStPuXx|`<Bg9JNKY3_U@dV+HIRh*RNaEY3rGr+NmV&R1)OdLTv#tEyNHl<)vcA
z_l<AaK0dL1O6lQoTWjMQ+xUEqO|8qG&AYeE&F?APvt@hXuH7?5J*}Oe{e(5MU2Kl+
z2Wz$kUP-gix!YJN905vj*;pU$kQ>Tsq}qdTaHNA_#KzXKaeVH<w_fDj1vX_0YCy`{
z$oArM7Wa0`=h?E%dAwr}V30-lZw6&hioI-t6(ZLzwgY$RP4sOX>F8~n**5vEqT}8j
zdUGq%>_j;QYMy!2U^l|_<f9I!s&BBdwYW?5-p%&m?<Agu^4VB7-n9dFZBiw8^7c7U
z!_RK}I^^DgcQv6d+fh2bZ3gYyj*@qy7Yosc^j|IOXC1I{cjMdg(n75%K#wjjYk9ix
z9zQ<i0CG}aZ;?GhqZfMb@-qG}@7jWLZD@@RJ-r*Bld_i7x^1|(3-f{I$bO72)n0jC
zc)}g!&GV??IQnN7^7NpDU2r#~(Wf~_^Fx^(r(*O@MGNLnD0K%r?SGY)W|UI@r7>S8
z>pYJ)P#b9Ml@#0Yxf#D{PAl_dFTPW2cOwnWR!X~$tpXI0YESK@b+A-&=du!L79Kw?
zC1@30%BniqdqcGu$7~%(c{GnE@R#1bG^c4aTCvX7;By>xtHI~;KHP)0(0ZQ3(>-`2
z&5iB&q%}E%wbq0Do&Tpi%V*TmtUP{BhIG=wdoUeO@(=s~1-~KistYl;G>C_Q@J+D$
z8rV;HB#%P)q8P-pj$;!%o_!B;Pa;snMz$I9|M#&Yr$AEjumuQ+lR#~lnHL9w{S`-)
zTeuZ_{S=~#XRxObFFlLfxScz=6JFph?q)yd9`5DYJO}%J4kWXWcplH^1-y{u@giOf
z*{y^fgSG1!xFJ0Yd8>^50-m%LypmUeJ1F2atPqlY5wGJbcs+06e%?ruA9N8-ycv>N
z3vcCZydBG;ls(5+v0w7lyn}c0F5b<1*bMLGYxr9BE545R@qRwQ2l)^m<|BNRuLpAU
z>(E5p0Tj%gh~DydRtA6BO?;eB@XdgwR)7n6o&67=<}-YjZ-HdFm2czQA!}B#7x+%T
z3pR{7cz2!x&&%C>51;3I`96LsB*p#w06(3d!OsM+zZ#P1S^R8%4s>d@z~jFS1NlSz
zF#ifa!p{SaXazr?y~!_NE7=zQRh*{sHGUDl7=F{+_}BTR@O=FSzZ}|+?a<n6<yZ1=
z;lzvoU_1HMSo+_AmwgMSRe&?Li(dn|xQ+dde+Ous>-hEH`{wv}`3=BI-iT9eZieJ~
zE2QQ<@I}3yox;BdFWEczoiOO$g$1^neT*3CcO%N`y{rRXr1xX0{)Wx-2iQJDRy~zJ
z#DB#0@`w2&{KxQ<e~dp4$@wSz3GxKyPqH5VQ~ngJcu(`6!*<on)<8mjhCj=H!Jp&5
zgy!Nj5b6E=SL}5D0{=CCk^csk<KMC~_{;ov{P*kt@BptMcJ8bEPy99hXZYv6!QX^#
z<U0NqJCpyF{QxB3U68ka{x|+Mys7`r-(>^PQN8j1b#|@KZCuy=;u2W!0ZKF_)2`q+
z3$Lgs<O0Tn&zP2pT`XvdibPRl1;}=UB>+*7C_(~B%XZtuc{q_dO*+%pOsAcG=yRt1
zav?Rfl5wYM({%bLw9{Amsr}HIX4)ier%B!4x%UEG>d{VPjd{+!=iGbG`JHpmE*6Vj
z_QTM3@!RV6*~QSmhW;(|J)9?&*k?mOVDE<hoqay^AMA6X|HM-&|10#v(2qj@9r_5V
zkGth?pEBMR!OH9sH+U4ky6$7IvDeu@^M3YCKEPvq5O;nb#&c+f*gxWV)WiG;KZ=)p
zjo=%=Kf&4Xuk&a4v+P%K*YHuC1&`ng(6hK#_ZY4=J%^tO9^-NT9Il&v$iBzE&whY2
z*;m-N*jI2J>M;9#+~50~_-Y+b?Pb4#bMSurBxaa7csA9?@i2@E&d=xZJy(p~!}YTv
zZsO|L@8RmzAG2@cO2pUMAF>bFpYa5L0k>OO?2lNKALpa&cW~GE3H}Lwl7EupIw-e!
zlBf8K>^+`lzsxf{%MP)BVc%u<QLcWDC2$V^OY9ffFR<T55&JFn^X%7nj!)oP$FH#8
z##N_Y_UG&y%)*@+ci5NlX<?83Ec+t6%>Idef&D3;VtITYH^XP~l$DqG9DkXg;;-O3
zNS-^~<pu8XB45CL$cy|mU*c!@r}6fPb9@=^;9TJs_$pt+TfZ*y5-;;h{53qe=?(rF
zewkOe&)0dC*La;@VP9o`&HjP?9s5i6HTE|+P5OIW&-xDgTlQCcgJ0zhevMzpRhJul
zi#PdAek*)-?aUb?zuv09S&!~+H8Nh_Q`DK#G_7e?(+NfM9qQ_~*3ZxAcAjV&zfsif
z4wdtuKO4>8@T;xnRy5z-Xl~W7_vc%Utqs4ryHk(mJxK@LYNJ)%y>Vr;{#L(RYwq|}
zoQ&?snKSN$QK<Tu0HoFQJH3;JC*3hTDO9UF+ACLE>1u0S?UgINfmIXz-hpK@o}(Rd
zIu1=mJ#DzB4A)Dz#)4dNU}4|r*aALz-0+pz{R`cx!>_LUt$|nf75U<6W3d|s7@}8o
z<*FIam2LFrql<d=MYX!IxYO9I)dx=RPZnDWtg6A9HqJ;$jWg27*qMMz_zVowdTO1F
zn>WrX{j*B{Y(T%q+uBg-vjsiOG0t_Z$NNt-yanw=LBm{-FhefG0B>aSq_bI#ZLSj*
zom8$DIfu`4TeJv9X)L_XY+9?JgX^US&t2U`3bl4`Z2G&(qiouXp3{g?LL$Ql&TVh{
z+gDYl$t2CX#)|TGMR~gt@K$=5%}CSI*-X~BAXNu01OUJAkbcISl}4pAGsW;KVr{I-
zi4|H?dJkms##$G(bf%EgOKFt64xNgu?W5pnOp6*TuY-z4!}A8$9z`KD6<yOPtf{<-
ztkHHe)@1e=7nM&J_kHTSSZmZ<_3g&CadD&NzgZtB?+aBxiW5dzigZ&)HK*fKoG~uR
zY5OmA6W{Q=4kHppHPD&XG^42m0$XoVweuY+vkl|4etuTV9im7lJwD%|8qjnu>TBnH
zU2FXPTI1K1@6~<x`m6f}*8+hnstGghlu?&{81=3c=4y9bZJw*maJ4(GbOUBi_Sd`f
zYmc=jPREn!C_dK9>R3NeWYm7kPR<$|a^-=IeXC;|fh_Fb=q?eyO2y{tzM|3S1_9R0
z_BB$Q&Fbdr%91k1l}4cENTZ<P@W!=hL)+8PWv3w%M**Lk9=NtYee8O`j@b2$R=vKp
z>2K8<Rbx{^ZEQ;0W19iJ@Fwh)vt`^_V@ri(%fH#&-f1;&UacEjYRpz(Oix|cq3pEU
zQ5n}YnqA*eF?0k98eX--(61A!AR`42HLO_;f36cbop5e3(%j#H1&xoV<66*K1s#7c
zGuV7|2d0ZrTz`@wRdvW2Xg*Sh3PwvI)KcEI0^Ta9GtxBFp`5X;K-vx<za7vI?@-;@
zkrOFk@e&caPcn|N+eHaeX*9eJosR78d+TZJiW(EI<GuFUD-P~H>TL$dcD&W~W>?mm
zT~%*xE8B1H+unD(TW@Zwdh_<aknGNQ#YyAsV7<}N%jq~2XN`B{wEgdNbHC@x<tq{V
zf4O1Ezt?1AGmMUF5{%retg`8x<MzE%Z#7f&M@rI;%Kx;Zk}K`Vb+YN{iTKTWtI@2{
zxd=*RO>Q4IznZH0+x3yh%hZ&4m1ya_EZ*2zlY`afW^?NXPJnj&*4yD)b892)?J5%>
zmrLWQUkGnDT0TvJPFe9mWyObZ%D9OOmOCA>3>3t2El}wO)D+ETI#h-m2Q*o>v)QyN
z->^w8lffZ_vL&ZZML?(fB=|_N^*)I+aau=hoE*;T)EH?R#&qV$_sO^iMobJ|Z8op_
z>&-XofnK?V(m9>wxs0AK<HQis_4;P>_P%mfM@~7A#+{mK@vJ(B$z|0cIHz`VI+vS_
zX@_K>bYogJ4s~5q&8~kzRVUcU1{-d$F%@j&W#drS`=D$>Hii%25R?}KjZ7xkP?kIu
z#3Ufjs)?0@*`PUD<*k;?1jl%RMoujz;moQuOK08L0R`U_;+hHY=>Q+p$?5)VK%e-I
zKJguW;&ai((-QY+<C>&Hs)BUG?$b3H+{TOh4-Y@)^31`mTkIA-mA;N=cQO90(6{mZ
z_$2=ho;nTwqwjx|gjCBzLjn1Zx^jG}O8*42O~KYmUfDF4?z2PZmxOWQQb|n2#mREz
zin+H|5`5JE2EL+U)vC1~Pb35@3+7sdyRg-*I7tz*g;}|h6x=pzrg*R{!Y3}>JsBEs
zy{ab+uapoyqve&?N(nsibFXBI<z;lum*b|GA#SEzHrq<uuZffB(k)Y@NuDOn2g@ZB
z*6jHvJw>8|9=xbCA^M4%B5tY@ui%Leaab$*-Kt<KCBft)C!poxX(4!HWI{Z@<li4+
zRnoX0Ve92`%`c14c)4r|wp_w*Zj++NHa$~>M}7DbahFRXVmZRF9C!}ZN>YSv3!a#@
zc4XZ#NkTrxmCf{5^i;g6=ow2u=$d=x9u{b)Bcp)je5tY=_gBg#tDGpCV*Wx2vN(aE
z*H4OwEu!xDU0j8e*cxbBj)fRmjxYH76%ne!3K1Dgil}XpsWJExX6sOavGbKOsZ<Km
z)L#2;G{#)d8B27d)n^}!UcZ_pG!7G7_+2r*J<F#^N`zUQq9DvTjO<v6cv^lzEiv$f
z;o>+(VQ|;A;Gh^Ko#ouclQ5AUaVt?COC-ghjrZ?)qUINp;*bpoOj8WHr^zocmQxmo
zsI`LDA+(a>Fs2!jkeEQA3bVyww_@&9OmP^XCB=}vv|4J1YlZT0F<7_WN{XlKrSqkw
z3#v1oK>rchKWw+zkh@lD4-L5@<U8W<IAuAq$!QPLpF{W~LL-Po&**ZgO{ovCoIS)B
z%N`m_SQysfkqsoLA=o@5EyI%q*uQ|@gQ0pt0NZ$;lm&=g!A{-96+4*?M{Hc};@)aW
z3|Wrpi5QY^z(T?~W(CWCeRw#8(&0FJmG-bPF5VxHzW|ty!nY&iN%6GZ4iOyz&P1QF
z+dV{|wcBB$KVi2cM332RgJ|4tM~OaXw|j|x%x?D){iF>P6z;;P0Ab5aiO?IgL6TxD
zAROrmZz<t;KzO1nY$@UMHWP#6KZbuFhkwt*E))I{O~5~*FTg*d7W^Z69R3j<g?~g(
zz(1m&fPX|!!at(6ZO+N<le7WraK&^H+Y04^4=QZR)s!ug<06S&_#!sI0y6cn+tBi7
zEUKaZs|M0ADbk(Lwqt!BWtw<#tQ`qG?UhjfD2kZ?JWtZe+UBIRJcrrTJl><l0X65b
z)>1zk!EclCU*VKB)6RyTCSNCj2ON0pm<l$DKa&)bcIuhAq?r1@RFTkCs81tAY-H3-
znF~}10PW)5-h#D&!c)RA289;YVG55II0}SkP_ahDQ&0<|h>l9Nc0Y4OpF3XPOIfBl
zw}&}r52~3dHJ=DuPDk4m6{;ok=S%mv*<;4<@e@7A$_~}nUX*IA4-2d!b~d7YaGRp0
zgvQkYh`W^<Hl6F&P~y1j$H7<1s0$B|@nIUOzE$*R;ucmY!cP#n3g&yvA~1vsaTvt|
z!H6K?aNKyv63pmh@TfEbe{o!+3c9}*lI2q!EKFDsIiazz<^a=6U6JTT5i!l8wLptf
z6z4iJ>5M{Ju+>t^oWrr3tmmo|lXgQPj8U`}A?ltcs31O?c@;}X3-%_(%bnFE`Z`<{
zI+u9Z<xYrCp?;(Y#iDr1EiK1!BsJ&Csdg%K6#Mp-1JafF@&W1m0cmG!aK48}<ZUrC
z9#rTI>MZEkVs?BF=|?%Xhn@Z;+Yr!{NWnx`x=d+&LLu*qe#=p=Q#xDNX({YH<xl~I
z3C9@9ewq3Izm#5hT!Q^LSxk6S9h<Xe;)y`MB+A-O4+VH;yn{*+t=aJe#f)&#-gF^Y
z00d8~ZI5#j?C>KgF@atF>J$1GF<t2B5itp!)3%rfSt1lYz-<<B@a>>=#-@Z8OMv;)
z_Fa@PFlWJph&gBDCBDQggONSwNykIa3h5AYfpmyjB^_ec?0cw%d2l}oE+n~&_C0)^
zMtvo4s;^9XA?mwCdXjsM^d$E>=}GPlTGNHvXJ}1gF4LOCRA^0Ne9|d`StlK0s-#0q
zjdX~qOS>F!SEOCUZAiO_yDIG>t|9Fr?wYiVxa-m`;x?sS#N7bKpXvs1OSZ%*2%3t0
z1?)`%oz%oUTDNel1xq?D#gfjp)FA=s>|pRq-C1{KOOAL`u{7egVoCii%=40(@@>VE
z!aIs3g`a}%Tz9^omMuBo&nTAEKdV?${~SinsrlYjEGc|mv83<?=)T;Y?~Ae}=lhak
zN&P*=lKPi1@?|yOR}@PMcN9ws@7wqA<iO4uturoq>!RoQ@>`w5coMn9@FD9jR&f3p
z`Wg;$>SNW-Hj6rcz>*)syP=5vAj@Cq9q#SvRjmm&W*jqQtKa!B_MrDc_yNA6?}K#E
z`H;=af3n@f3hm>eJLmB+;7+OCQ!BJjQ0tq$@8VXo`8!pd3qu8;lFA=Uu;a#2qbD|Y
aKlIUiBK%bxjtlo9HT(#-Kvp8d8T%i~EetvU

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..24a27d1596e3de2baff32b01f23a9c40406d8941
GIT binary patch
literal 84824
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
X$pRn4a-6*tEaS(<SuQ0aoRI$okj&Uy

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-Thin.ttf b/docs/logo/josefinsans/JosefinSans-Thin.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c54ca7f1c67c8c7fac3e0fee40d484ecbacf58bc
GIT binary patch
literal 88088
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
UT#lRj*&e=#svh-%3^$Db0O1VtSpWb4

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf b/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6840b7c23370b3a63e350c4019f537ca79921be1
GIT binary patch
literal 85420
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
OrYglES&0l+l>Y(&D3s*@

literal 0
HcmV?d00001

diff --git a/docs/logo/josefinsans/METADATA.pb b/docs/logo/josefinsans/METADATA.pb
new file mode 100644
index 0000000000..8b67716c32
--- /dev/null
+++ b/docs/logo/josefinsans/METADATA.pb
@@ -0,0 +1,99 @@
+name: "Josefin Sans"
+designer: "Santiago Orozco"
+license: "OFL"
+category: "SANS_SERIF"
+date_added: "2010-11-17"
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 100
+  filename: "JosefinSans-Thin.ttf"
+  post_script_name: "JosefinSans-Thin"
+  full_name: "Josefin Sans Thin"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 100
+  filename: "JosefinSans-ThinItalic.ttf"
+  post_script_name: "JosefinSans-ThinItalic"
+  full_name: "Josefin Sans Thin Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 300
+  filename: "JosefinSans-Light.ttf"
+  post_script_name: "JosefinSans-Light"
+  full_name: "Josefin Sans Light"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 300
+  filename: "JosefinSans-LightItalic.ttf"
+  post_script_name: "JosefinSans-LightItalic"
+  full_name: "Josefin Sans Light Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 400
+  filename: "JosefinSans-Regular.ttf"
+  post_script_name: "JosefinSans-Regular"
+  full_name: "Josefin Sans Regular"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 400
+  filename: "JosefinSans-Italic.ttf"
+  post_script_name: "JosefinSans-Italic"
+  full_name: "Josefin Sans Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 600
+  filename: "JosefinSans-SemiBold.ttf"
+  post_script_name: "JosefinSans-SemiBold"
+  full_name: "Josefin Sans SemiBold"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 600
+  filename: "JosefinSans-SemiBoldItalic.ttf"
+  post_script_name: "JosefinSans-SemiBoldItalic"
+  full_name: "Josefin Sans SemiBold Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 700
+  filename: "JosefinSans-Bold.ttf"
+  post_script_name: "JosefinSans-Bold"
+  full_name: "Josefin Sans Bold"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 700
+  filename: "JosefinSans-BoldItalic.ttf"
+  post_script_name: "JosefinSans-BoldItalic"
+  full_name: "Josefin Sans Bold Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+subsets: "latin"
+subsets: "latin-ext"
+subsets: "menu"
+subsets: "vietnamese"
diff --git a/docs/logo/josefinsans/OFL.txt b/docs/logo/josefinsans/OFL.txt
new file mode 100644
index 0000000000..6586a7e304
--- /dev/null
+++ b/docs/logo/josefinsans/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2010, Santiago Orozco (hi@typemade.mx)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg
new file mode 100644
index 0000000000..7eae8fc364
--- /dev/null
+++ b/docs/logo/setup_tools_logo_colour.svg
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="278.6048"
+   inkscape:export-xdpi="278.6048"
+   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_1000px.png"
+   width="91.168571mm"
+   height="55.301708mm"
+   viewBox="0 0 91.168573 55.301709"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (1.0+r73+1)"
+   sodipodi:docname="setup_tools_logo_colour.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1362">
+      <stop
+         style="stop-color:#336790;stop-opacity:1"
+         offset="0"
+         id="stop1358" />
+      <stop
+         style="stop-color:#396f9e;stop-opacity:1"
+         offset="1"
+         id="stop1360" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1356"
+       inkscape:collect="always">
+      <stop
+         id="stop1352"
+         offset="0"
+         style="stop-color:#ffd040;stop-opacity:1;" />
+      <stop
+         id="stop1354"
+         offset="1"
+         style="stop-color:#c59500;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1346">
+      <stop
+         style="stop-color:#ffd040;stop-opacity:1;"
+         offset="0"
+         id="stop1342" />
+      <stop
+         style="stop-color:#c59500;stop-opacity:1"
+         offset="1"
+         id="stop1344" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1348"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.5091231)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1350"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1348-1"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1389"
+       gradientUnits="userSpaceOnUse"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952"
+       gradientTransform="translate(-0.09428005)" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1086"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1232.7244,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1109"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="101.13023"
+       x2="360.05417"
+       y1="111.95531"
+       x1="372.85818"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1233.0816,-330.32482)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1203"
+       xlink:href="#linearGradient1362"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1193.5762,-318.17671)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1214"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1224"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.2663142"
+     inkscape:cx="86.449428"
+     inkscape:cy="95.330447"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1222"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-324.69544,-86.596643)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1399"
+       transform="translate(0.04622687,-0.80180859)">
+      <g
+         id="g1222">
+        <path
+           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)"
+           d="M 157.22461 115.5332 L 157.22461 119.45312 C 157.22461 124.88302 161.57577 129.23438 167.00586 129.23438 L 167.23438 129.23438 C 172.66435 129.23438 176.98917 124.88056 177.01562 119.44727 L 177.01562 115.5332 L 157.22461 115.5332 z "
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path857" />
+        <path
+           id="path1185"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="M 157.89453 28.101562 C 156.13747 28.101562 154.16932 28.416144 152.21875 29.011719 C 151.73113 29.160579 151.24343 29.326299 150.76172 29.509766 C 150.28055 29.69309 149.80402 29.894526 149.33594 30.111328 C 148.39868 30.545437 147.49398 31.045372 146.65234 31.607422 C 145.81071 32.169472 145.03387 32.786407 144.3418 33.455078 C 143.64973 34.123749 143.04296 34.844857 142.54102 35.615234 C 142.03907 36.385612 141.64235 37.205095 141.37109 38.072266 C 141.30329 38.289055 141.24322 38.507821 141.19141 38.730469 C 141.0357 39.398984 140.95312 40.092553 140.95312 40.8125 C 140.95312 44.573508 140.70339 47.198354 140.70312 54.431641 C 140.70412 54.646352 140.70503 57.556916 140.70703 59.765625 C 143.16297 56.31562 147.23056 54.064453 151.7832 54.064453 L 162.61914 54.064453 L 162.61914 50.675781 L 177.92969 50.617188 L 187.91016 50.574219 L 187.91016 40.357422 C 187.91016 39.922086 187.86886 39.492428 187.79102 39.072266 L 187.79102 39.070312 C 187.75212 38.860555 187.70352 38.652989 187.64648 38.447266 L 187.64648 38.445312 C 187.36007 37.413698 186.85082 36.434828 186.16992 35.517578 C 185.89756 35.150678 185.59731 34.793472 185.27344 34.447266 C 184.30183 33.408647 183.1147 32.466413 181.79883 31.638672 C 181.36068 31.363057 180.90864 31.101451 180.44922 30.855469 L 180.44727 30.855469 C 179.52793 30.363325 178.57598 29.931176 177.63086 29.564453 L 177.62891 29.564453 C 177.15666 29.38134 176.68652 29.2127 176.22266 29.0625 L 176.2207 29.0625 C 174.82819 28.611709 173.49616 28.312696 172.35742 28.179688 L 172.35547 28.179688 C 171.97576 28.135388 171.61877 28.110206 171.28711 28.103516 L 157.89648 28.103516 L 157.89453 28.101562 z M 175.67383 36.841797 C 177.92159 36.841801 179.74414 38.664334 179.74414 40.912109 C 179.74414 43.159889 177.92166 44.982418 175.67383 44.982422 C 173.42607 44.982452 171.60352 43.159908 171.60352 40.912109 C 171.60352 38.664315 173.42607 36.841767 175.67383 36.841797 z M 149.16211 73.677734 C 145.93293 73.677517 143.22672 75.813325 142.36133 78.753906 C 142.40903 78.835146 142.44873 78.926859 142.49805 79.005859 C 142.71636 79.35532 142.95085 79.682808 143.19922 79.990234 C 143.44759 80.297665 143.71049 80.58492 143.98438 80.853516 C 144.25791 81.121714 144.54341 81.372808 144.83789 81.605469 C 145.42762 82.071399 146.05946 82.465911 146.7168 82.796875 L 146.71875 82.796875 C 147.70428 83.292896 148.74444 83.645741 149.77148 83.873047 C 150.41954 84.016422 151.06 84.106381 151.68164 84.15625 C 151.71704 84.15905 151.75384 84.165449 151.78906 84.167969 C 152.11693 84.191789 152.43721 84.203125 152.75 84.203125 L 156.25391 84.210938 L 156.25 81.201172 L 156.25 81.164062 C 156.258 81.047957 156.26307 80.91479 156.26367 80.773438 C 156.26386 76.841633 153.10165 73.677508 149.16992 73.677734 L 149.16211 73.677734 z M 181.73242 75.435547 C 179.27966 75.478107 177.15407 77.502068 177.1543 79.910156 L 177.1543 81.238281 L 177.1543 91.292969 L 177.08594 91.292969 L 177.08203 91.652344 L 153.93164 91.703125 C 153.01566 91.764475 152.12767 91.758334 151.26953 91.683594 C 150.4114 91.608854 149.58384 91.46679 148.78906 91.255859 C 147.99429 91.044929 147.23175 90.765193 146.50586 90.417969 C 145.77997 90.070745 145.09094 89.655494 144.43945 89.171875 C 142.78187 87.941336 141.81042 85.621603 140.66016 83.583984 L 140.66016 98.029297 C 140.66016 98.304276 140.66815 98.576661 140.68555 98.845703 C 140.70275 99.114757 140.72792 99.379584 140.76172 99.642578 L 140.76172 99.644531 C 140.82922 100.16985 140.93031 100.68325 141.06055 101.18359 L 141.06055 101.18555 C 141.32132 102.18678 141.70348 103.13645 142.1875 104.03125 C 142.42992 104.47937 142.69686 104.91221 142.98828 105.33203 L 142.98828 105.33398 C 143.86139 106.59149 144.94485 107.7205 146.17383 108.70508 C 146.58362 109.03338 147.01008 109.34362 147.44922 109.63672 C 148.32749 110.22291 149.25802 110.7373 150.21875 111.17383 C 151.17948 111.61035 152.16936 111.96907 153.16602 112.24414 C 154.16262 112.51903 155.16631 112.71076 156.15234 112.8125 C 156.64537 112.8634 157.13358 112.89108 157.61523 112.89648 L 157.63086 112.89648 L 157.63867 112.89648 C 158.02925 112.90778 161.26203 112.92413 164.39258 112.92773 C 167.00824 112.93173 168.95466 112.93655 170.01758 112.93555 C 170.22681 112.9354 171.04865 112.93585 171.125 112.93555 C 175.48934 112.91855 179.28887 112.58375 182.59766 111.95117 C 184.37517 111.61131 186.01669 111.18957 187.51367 110.67578 C 188.96429 110.17793 190.27679 109.59391 191.44727 108.93555 C 194.95912 106.96039 197.18421 104.31778 197.96484 101.33789 C 198.33297 98.62287 198.23191 92.225037 198.2168 87.755859 L 198.2168 87.748047 C 198.2319 83.695335 198.24229 83.190014 198.24609 82.773438 L 198.15039 82.773438 L 198.14258 82.214844 L 186.30078 82.271484 L 186.28711 79.910156 C 186.28703 77.426931 184.29565 75.43566 181.8125 75.435547 L 181.80469 75.435547 C 181.78089 75.435358 181.75132 75.435396 181.73242 75.435547 z "
+           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
+        <path
+           id="path1105"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="m 170.2832,56.234375 v 0.05273 h -18.5 c -6.27431,0 -11.40881,5.016 -11.28711,11.263672 v 0.01563 4.761719 6.878906 c 0.83532,-4.282242 4.14597,-7.746787 8.66602,-7.75 h 0.008 c 5.12969,0.0037 9.31667,4.18382 9.31641,9.314453 0,0.169437 -0.008,0.35223 -0.0234,0.546875 l 0.008,-0.08008 0.0156,7.832031 h 16.44726 v -7.826171 -1.335938 c -3.4e-4,-3.68931 3.13227,-6.637864 6.77539,-6.695312 h 0.008 c 0.034,-3.03e-4 0.0695,-2.65e-4 0.10351,0 3.67854,0.0042 6.68372,3.008885 6.6875,6.6875 v 0.134765 l 9.51563,-0.04492 v -0.472656 h 0.0449 V 56.234375 h -10.0332 c -0.64683,3.025776 -3.02284,5.45436 -6.22266,5.455078 -3.19963,-7.18e-4 -5.56805,-2.429528 -6.21484,-5.455078 z"
+           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
+        <path
+           id="path1059"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.93318"
+           d="m 37.679688,152.23047 c -2.364045,0.0747 -4.292067,0.77094 -5.785157,2.08984 -1.468195,1.29401 -2.201172,3.00004 -2.201172,5.11524 0,1.4433 0.360394,2.65058 1.082032,3.62109 0.721663,0.94561 1.578817,1.6908 2.574218,2.23828 1.020271,0.54745 2.290635,1.10732 3.808594,1.67969 1.642406,0.64698 2.910792,1.34524 3.806641,2.0918 0.920718,0.72166 1.380859,1.70304 1.380859,2.94726 0,1.4682 -0.547649,2.57571 -1.642578,3.32227 -1.070035,0.74653 -2.326205,1.12109 -3.769531,1.12109 -1.119799,0 -2.327085,-0.23814 -3.621094,-0.71094 -1.294009,-0.49771 -2.401522,-1.09424 -3.322266,-1.79101 l -1.603515,2.875 c 1.169587,0.82121 2.525506,1.50528 4.068359,2.05273 1.542854,0.52259 3.147178,0.78321 4.814453,0.78321 1.791698,0 3.347112,-0.33592 4.666016,-1.00782 1.343773,-0.67187 2.375993,-1.59213 3.097656,-2.76172 0.721638,-1.16958 1.083985,-2.47662 1.083985,-3.91992 0,-1.59264 -0.323699,-2.8977 -0.970704,-3.91797 -0.62211,-1.04514 -1.418164,-1.85536 -2.388672,-2.42773 -0.945612,-0.59722 -2.116203,-1.14489 -3.509765,-1.64258 -1.866331,-0.69679 -3.309782,-1.39307 -4.330078,-2.08984 -0.995377,-0.72167 -1.492188,-1.64192 -1.492188,-2.76172 0,-1.14469 0.421493,-2.0405 1.267578,-2.6875 0.870955,-0.6719 2.041571,-1.00781 3.509766,-1.00781 0.970507,0 2.002727,0.16087 3.097656,0.48437 1.094929,0.3235 2.127149,0.74695 3.097657,1.26953 l 1.382812,-2.79883 c -2.488491,-1.44332 -5.190066,-2.16601 -8.101562,-2.16601 z m 19.404296,0.15039 v 26.98633 h 18.066407 v -3.50781 H 60.703125 v -8.32422 h 12.431641 v -3.47071 H 60.703125 v -8.21289 h 13.923828 v -3.4707 z m 27.316407,0 v 3.4707 h 7.054687 v 23.51563 h 3.619141 v -23.51563 h 7.242191 v -3.4707 z m 28.285159,0 v 17.54297 c 0,1.91612 0.43568,3.62019 1.30664,5.11328 0.89585,1.46819 2.11535,2.61436 3.6582,3.43555 1.54285,0.79632 3.24693,1.19336 5.11328,1.19336 1.89125,0 3.60949,-0.39704 5.15235,-1.19336 1.54285,-0.82119 2.76235,-1.96736 3.6582,-3.43555 0.89585,-1.49309 1.34375,-3.19716 1.34375,-5.11328 v -17.54297 h -3.54688 v 17.43164 c 0,1.19448 -0.28507,2.27561 -0.85742,3.24609 -0.57234,0.97051 -1.36837,1.72987 -2.38867,2.27735 -0.99538,0.54745 -2.11708,0.82226 -3.36133,0.82226 -1.19445,0 -2.2878,-0.27481 -3.2832,-0.82226 -0.97051,-0.57235 -1.74211,-1.33171 -2.31445,-2.27735 -0.57235,-0.97048 -0.85938,-2.05161 -0.85938,-3.24609 v -17.43164 z m 32.58007,0 v 26.98633 h 3.6211 v -9.92774 h 3.99414 c 2.06544,0 3.76951,-0.41123 5.11328,-1.23242 1.36867,-0.82119 2.35198,-1.89203 2.94922,-3.21094 0.62211,-1.31887 0.93359,-2.73592 0.93359,-4.2539 0,-2.63779 -0.83467,-4.69196 -2.50195,-6.16016 -1.64238,-1.46819 -3.93077,-2.20117 -6.86719,-2.20117 z m 3.6211,3.4707 h 4.17969 c 1.79169,0 3.11094,0.51098 3.95703,1.53125 0.84606,0.9954 1.26953,2.13961 1.26953,3.4336 0,0.74655 -0.17507,1.51815 -0.52344,2.31445 -0.3484,0.77143 -0.93271,1.43104 -1.75391,1.97852 -0.79632,0.54745 -1.84075,0.82031 -3.13476,0.82031 h -3.99414 z"
+           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
+        <path
+           id="path1070"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+           d="m 210.64844,152.64062 c -2.48847,0 -4.7891,0.63519 -6.9043,1.9043 -2.09033,1.24425 -3.75771,2.92386 -5.00195,5.03906 -1.24422,2.1152 -1.86719,4.40555 -1.86719,6.86914 0,2.53823 0.60877,4.86527 1.82812,6.98047 1.24425,2.09033 2.92582,3.74354 5.04102,4.96289 2.1152,1.21936 4.41583,1.83008 6.9043,1.83008 2.46359,0 4.75394,-0.61072 6.86914,-1.83008 2.14009,-1.24424 3.83195,-2.92386 5.07617,-5.03906 1.24425,-2.1152 1.86523,-4.41583 1.86523,-6.9043 0,-2.46359 -0.63322,-4.75394 -1.90234,-6.86914 -1.24425,-2.1152 -2.92386,-3.79481 -5.03906,-5.03906 -2.1152,-1.26911 -4.40555,-1.9043 -6.86914,-1.9043 z m 36.91015,0 c -2.48846,0 -4.79105,0.63519 -6.90625,1.9043 -2.09033,1.24425 -3.7577,2.92386 -5.00195,5.03906 -1.24422,2.1152 -1.86523,4.40555 -1.86523,6.86914 0,2.53823 0.60877,4.86527 1.82812,6.98047 1.24422,2.09033 2.92384,3.74354 5.03906,4.96289 2.1152,1.21936 4.41779,1.83008 6.90625,1.83008 2.4636,0 4.75199,-0.61072 6.86719,-1.83008 2.14007,-1.24424 3.83193,-2.92386 5.07617,-5.03906 1.24425,-2.1152 1.86719,-4.41583 1.86719,-6.9043 0,-2.46359 -0.63518,-4.75394 -1.9043,-6.86914 -1.24424,-2.1152 -2.92386,-3.79481 -5.03906,-5.03906 -2.1152,-1.26911 -4.40359,-1.9043 -6.86719,-1.9043 z m 60.19336,0.1504 c -2.36404,0.0746 -4.29206,0.77096 -5.78515,2.08984 -1.4682,1.29401 -2.20313,2.99808 -2.20313,5.11328 0,1.44333 0.36037,2.65059 1.08203,3.62109 0.72164,0.94562 1.58077,1.69276 2.57618,2.24024 1.02027,0.54745 2.29063,1.10734 3.80859,1.67969 1.64241,0.647 2.91079,1.34328 3.80664,2.08984 0.92074,0.72164 1.38086,1.70497 1.38086,2.94922 0,1.46819 -0.54765,2.57571 -1.64258,3.32226 -1.07006,0.74654 -2.32623,1.11915 -3.76953,1.11914 -1.11982,10e-6 -2.32708,-0.23616 -3.62109,-0.70898 -1.29401,-0.49769 -2.40155,-1.09425 -3.32227,-1.79102 l -1.60547,2.87305 c 1.16959,0.82119 2.52551,1.50721 4.06836,2.05469 1.54285,0.52258 3.14913,0.7832 4.81641,0.7832 1.79169,0 3.34711,-0.33591 4.66601,-1.00781 1.34378,-0.67187 2.376,-1.59213 3.09766,-2.76172 0.72166,-1.16959 1.08203,-2.47659 1.08203,-3.91992 0,-1.59262 -0.3237,-2.89965 -0.9707,-3.91992 -0.62214,-1.04517 -1.41817,-1.85344 -2.38868,-2.42578 -0.94561,-0.59722 -2.11427,-1.14487 -3.50781,-1.64258 -1.86635,-0.69677 -3.3098,-1.39308 -4.33008,-2.08985 -0.9954,-0.72166 -1.49414,-1.64192 -1.49414,-2.76171 0,-1.14472 0.42345,-2.0405 1.26953,-2.6875 0.87096,-0.67188 2.04155,-1.00782 3.50977,-1.00782 0.97051,0 2.00275,0.16088 3.09766,0.48438 1.09493,0.3235 2.12715,0.74695 3.09765,1.26953 l 1.38086,-2.80078 c -2.48846,-1.44333 -5.18809,-2.16406 -8.09961,-2.16406 z m -136.66211,0.14843 v 3.47266 h 7.05469 v 23.51562 h 3.62109 v -23.51562 h 7.24024 v -3.47266 z m 101.28321,0 v 26.98828 h 17.35742 v -3.50976 h -13.73633 v -23.47852 z m -61.72461,3.17383 c 1.84146,0 3.53332,0.46014 5.07617,1.38086 1.54285,0.92074 2.76235,2.17691 3.6582,3.76953 0.89588,1.59264 1.34375,3.3231 1.34375,5.18945 0,1.86636 -0.44787,3.59489 -1.34375,5.1875 -0.87095,1.56773 -2.07824,2.81364 -3.62109,3.73438 -1.51796,0.89585 -3.19758,1.34375 -5.03906,1.34375 -1.84147,0 -3.54554,-0.46012 -5.11328,-1.38086 -1.54286,-0.92072 -2.76236,-2.16663 -3.65821,-3.73437 -0.89585,-1.56773 -1.34375,-3.2718 -1.34375,-5.11329 0,-1.86635 0.43566,-3.59488 1.30664,-5.1875 0.89585,-1.59261 2.11535,-2.85074 3.65821,-3.77148 1.54285,-0.94561 3.23471,-1.41797 5.07617,-1.41797 z m 36.91015,0 c 1.84147,0 3.53332,0.46014 5.07618,1.38086 1.54285,0.92074 2.76235,2.17691 3.6582,3.76953 0.89585,1.59264 1.34375,3.3231 1.34375,5.18945 0,1.86636 -0.4479,3.59489 -1.34375,5.1875 -0.87096,1.56773 -2.07824,2.81364 -3.62109,3.73438 -1.51796,0.89585 -3.19758,1.34375 -5.03907,1.34375 -1.84146,0 -3.54553,-0.46012 -5.11328,-1.38086 -1.54285,-0.92072 -2.76235,-2.16663 -3.6582,-3.73437 -0.89585,-1.56773 -1.34375,-3.2718 -1.34375,-5.11329 0,-1.86635 0.43566,-3.59488 1.30664,-5.1875 0.89585,-1.59261 2.11535,-2.85074 3.6582,-3.77148 1.54286,-0.94561 3.23471,-1.41797 5.07617,-1.41797 z"
+           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png
new file mode 100644
index 0000000000000000000000000000000000000000..c25a23b9f4c55c574f14a78e76ed3515359f72af
GIT binary patch
literal 31520
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
MuO?S6^C9Ga0NJR5iU0rr

literal 0
HcmV?d00001

diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg
new file mode 100644
index 0000000000..d6dc9aaca2
--- /dev/null
+++ b/docs/logo/setup_tools_logo_colour_banner_1line.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="199.66046"
+   inkscape:export-xdpi="199.66046"
+   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_banner_1line_1000px.png"
+   sodipodi:docname="setup_tools_logo_colour_banner_1line.svg"
+   inkscape:version="1.0 (1.0+r73+1)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 127.21598 34.281804"
+   height="34.281803mm"
+   width="127.21597mm">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient1362"
+       inkscape:collect="always">
+      <stop
+         id="stop1358"
+         offset="0"
+         style="stop-color:#336790;stop-opacity:1" />
+      <stop
+         id="stop1360"
+         offset="1"
+         style="stop-color:#396f9e;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1356">
+      <stop
+         style="stop-color:#ffd040;stop-opacity:1;"
+         offset="0"
+         id="stop1352" />
+      <stop
+         style="stop-color:#c59500;stop-opacity:1"
+         offset="1"
+         id="stop1354" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1346"
+       inkscape:collect="always">
+      <stop
+         id="stop1342"
+         offset="0"
+         style="stop-color:#ffd040;stop-opacity:1;" />
+      <stop
+         id="stop1344"
+         offset="1"
+         style="stop-color:#c59500;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-1.5091231)"
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1348"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)"
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1350"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1348-1"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="translate(-0.09428005)"
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1389"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1086"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50.518893,20.912766)"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1362"
+       id="linearGradient1203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50.613405,20.912779)"
+       x1="372.85818"
+       y1="111.95531"
+       x2="360.05417"
+       y2="101.13023" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1309.7068,-327.43974)"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1224"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2136807,0,0,1.2136807,-68.746066,-31.825309)"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:current-layer="g1222"
+     inkscape:document-units="mm"
+     inkscape:cy="-45.136828"
+     inkscape:cx="193.79166"
+     inkscape:zoom="1.027839"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(-306.41189,-109.96025)">
+    <g
+       transform="translate(0.04622687,-0.80180859)"
+       id="g1399">
+      <g
+         id="g1222">
+        <path
+           transform="matrix(0.26458333,0,0,0.26458333,306.36566,110.76206)"
+           d="M 41.09375 106.27539 L 41.09375 110.1875 C 41.09375 115.6174 45.444915 119.96875 50.875 119.96875 L 51.103516 119.96875 C 56.533449 119.96875 60.858309 115.6208 60.884766 110.1875 L 60.884766 106.27539 L 41.09375 106.27539 z "
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path857" />
+        <path
+           d="m 317.41596,115.74629 c -0.46489,0 -0.98563,0.0832 -1.50172,0.24081 -0.12901,0.0394 -0.25805,0.0832 -0.3855,0.13178 -0.12731,0.0485 -0.25339,0.10179 -0.37724,0.15916 -0.24798,0.11485 -0.48734,0.24713 -0.71003,0.39584 -0.22268,0.14871 -0.42823,0.31194 -0.61134,0.48886 -0.18311,0.17692 -0.34365,0.36771 -0.47645,0.57154 -0.13281,0.20383 -0.23778,0.42065 -0.30955,0.65009 -0.0179,0.0574 -0.0338,0.11524 -0.0475,0.17415 -0.0412,0.17688 -0.063,0.36038 -0.063,0.55087 0,0.9951 -0.0661,1.68959 -0.0661,3.6034 2.6e-4,0.0568 5.6e-4,0.82689 0.001,1.41128 0.6498,-0.91281 1.72602,-1.50843 2.93057,-1.50843 h 2.86701 v -0.89659 l 4.05092,-0.0155 2.64066,-0.0114 v -2.70319 c 0,-0.11518 -0.0109,-0.22887 -0.0315,-0.34004 v -5.2e-4 c -0.0103,-0.0555 -0.023,-0.11041 -0.0382,-0.16485 v -5.3e-4 c -0.0758,-0.27295 -0.21051,-0.53194 -0.39067,-0.77463 -0.0721,-0.0971 -0.15151,-0.19159 -0.2372,-0.28319 -0.25707,-0.2748 -0.57116,-0.52409 -0.91932,-0.7431 -0.11592,-0.0729 -0.23554,-0.14215 -0.35709,-0.20723 h -5.3e-4 c -0.24324,-0.13021 -0.49511,-0.24455 -0.74517,-0.34158 h -5.3e-4 c -0.12492,-0.0485 -0.24931,-0.0931 -0.37204,-0.13278 h -5.3e-4 c -0.36843,-0.11927 -0.72086,-0.19839 -1.02215,-0.23358 h -5.3e-4 c -0.10046,-0.0117 -0.19492,-0.0183 -0.28267,-0.0202 h -3.54292 z m 4.70411,2.31304 c 0.59472,0 1.07642,0.48221 1.07642,1.07693 0,0.59473 -0.48168,1.07642 -1.07642,1.07642 -0.59472,0 -1.07694,-0.48169 -1.07694,-1.07642 0,-0.59473 0.48222,-1.07694 1.07694,-1.07693 z m -7.0125,9.74514 -0.002,5.3e-4 c -0.85439,-6e-5 -1.5704,0.56504 -1.79937,1.34307 0.0126,0.0215 0.0231,0.0458 0.0362,0.0667 0.0578,0.0925 0.1198,0.17911 0.18552,0.26045 0.0657,0.0814 0.13527,0.15735 0.20774,0.22841 0.0724,0.071 0.14791,0.13739 0.22582,0.19895 0.15603,0.12328 0.32321,0.22767 0.49713,0.31523 h 5.3e-4 c 0.26075,0.13124 0.53596,0.2246 0.8077,0.28474 0.17147,0.0379 0.34092,0.0617 0.5054,0.0749 0.009,7.4e-4 0.0191,0.002 0.0284,0.003 0.0867,0.006 0.17149,0.009 0.25425,0.009 l 0.92707,0.002 -0.001,-0.79633 v -0.01 c 0.002,-0.0307 0.003,-0.066 0.004,-0.10336 5e-5,-1.04029 -0.83662,-1.87746 -1.87689,-1.8774 z m 8.6155,0.4656 c -0.64896,0.0113 -1.21136,0.54677 -1.2113,1.18391 v 0.3514 2.6603 h -0.0181 l -0.001,0.0951 -6.12521,0.0134 c -0.24235,0.0162 -0.4773,0.0149 -0.70435,-0.005 -0.22705,-0.0198 -0.446,-0.0574 -0.65629,-0.11317 -0.21028,-0.0558 -0.41204,-0.12982 -0.6041,-0.22169 -0.19205,-0.0919 -0.37437,-0.20174 -0.54674,-0.3297 -0.43857,-0.32558 -0.6956,-0.93934 -0.99994,-1.47846 v 3.82199 c 0,0.0727 0.002,0.14482 0.007,0.21601 0.005,0.0712 0.0112,0.14125 0.0202,0.21084 v 5.2e-4 c 0.0179,0.139 0.0446,0.27483 0.0791,0.40722 v 5.2e-4 c 0.069,0.26491 0.1701,0.51618 0.29817,0.75293 0.0641,0.11856 0.13478,0.2331 0.21188,0.34417 v 5.2e-4 c 0.23101,0.33272 0.51767,0.63144 0.84284,0.89194 0.10842,0.0869 0.22126,0.16895 0.33745,0.2465 0.23238,0.15509 0.47858,0.29119 0.73277,0.40669 0.2542,0.1155 0.5161,0.21041 0.7798,0.28319 0.26369,0.0727 0.52925,0.12346 0.79013,0.15037 0.13045,0.0135 0.25961,0.0208 0.38705,0.0222 h 0.004 0.002 c 0.10334,0.003 0.95868,0.007 1.78697,0.008 0.69206,10e-4 1.20706,0.002 1.48829,0.002 0.0553,-4e-5 0.2728,8e-5 0.293,0 1.15473,-0.005 2.16001,-0.0931 3.03547,-0.26045 0.4703,-0.0899 0.90462,-0.20151 1.3007,-0.33745 0.38381,-0.13172 0.73108,-0.28624 1.04076,-0.46043 0.92918,-0.5226 1.5179,-1.22179 1.72445,-2.01022 0.0974,-0.71835 0.0707,-2.41111 0.0667,-3.59358 v -0.002 c 0.004,-1.07228 0.007,-1.20598 0.008,-1.3162 h -0.0253 l -0.002,-0.14779 -3.13314,0.015 -0.004,-0.62476 c -2e-5,-0.65702 -0.5269,-1.18388 -1.1839,-1.18391 h -0.002 c -0.006,-5e-5 -0.0141,-4e-5 -0.0191,0 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path1185" />
+        <path
+           d="m 320.69357,123.18993 v 0.014 h -4.8948 c -1.66007,0 -3.01858,1.32715 -2.98638,2.98018 v 0.004 1.25987 1.82004 c 0.22102,-1.13301 1.09696,-2.04967 2.29289,-2.05052 h 0.002 c 1.35724,9.8e-4 2.46504,1.10697 2.46497,2.46445 0,0.0448 -0.002,0.0932 -0.006,0.14469 l 0.002,-0.0212 0.004,2.07222 h 4.35168 v -2.07067 -0.35347 c -9e-5,-0.97613 0.82874,-1.75627 1.79265,-1.77147 h 0.002 c 0.009,-8e-5 0.0184,-7e-5 0.0274,0 0.97328,10e-4 1.7684,0.7961 1.76941,1.7694 v 0.0357 l 2.51767,-0.0119 v -0.12505 h 0.0119 v -6.16035 h -2.65462 c -0.17114,0.80057 -0.79979,1.44313 -1.64641,1.44332 -0.84657,-1.9e-4 -1.47321,-0.64281 -1.64434,-1.44332 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path1105" />
+        <path
+           d="m 337.48857,123.28851 c -0.75916,0.0241 -1.37827,0.24756 -1.85773,0.6711 -0.47147,0.41552 -0.70685,0.96335 -0.70685,1.6426 0,0.46347 0.11567,0.85115 0.34746,1.16281 0.23175,0.30365 0.50698,0.54294 0.82663,0.71874 0.32763,0.17581 0.73557,0.35559 1.22302,0.53939 0.52741,0.20776 0.93471,0.43198 1.22238,0.67171 0.29567,0.23174 0.44343,0.54688 0.44343,0.94643 0,0.47146 -0.17586,0.82712 -0.52747,1.06685 -0.34361,0.23972 -0.74699,0.36 -1.21047,0.36 -0.35959,0 -0.74727,-0.0764 -1.16281,-0.2283 -0.41553,-0.15982 -0.77117,-0.35137 -1.06684,-0.57513 l -0.51492,0.92322 c 0.37559,0.26371 0.811,0.48337 1.30643,0.65917 0.49545,0.16782 1.01062,0.2515 1.54603,0.2515 0.57534,0 1.07482,-0.10788 1.49834,-0.32361 0.43152,-0.21577 0.76297,-0.51128 0.99471,-0.88685 0.23174,-0.37559 0.3481,-0.7953 0.3481,-1.25876 0,-0.51143 -0.10389,-0.93051 -0.31172,-1.25815 -0.19976,-0.33561 -0.4554,-0.59579 -0.76705,-0.77959 -0.30365,-0.19178 -0.67955,-0.36765 -1.12704,-0.52747 -0.59932,-0.22375 -1.06284,-0.44733 -1.39049,-0.67107 -0.31964,-0.23175 -0.47917,-0.52727 -0.47917,-0.88686 0,-0.36757 0.13534,-0.65523 0.40704,-0.863 0.27968,-0.21576 0.65559,-0.32364 1.12706,-0.32364 0.31165,0 0.64313,0.0517 0.99473,0.15554 0.3516,0.1039 0.68307,0.23987 0.99472,0.40769 l 0.44405,-0.89877 c -0.79912,-0.46347 -1.66664,-0.69555 -2.60157,-0.69555 z m 6.23109,0.0483 v 8.66585 h 5.80147 v -1.12643 h -4.6393 v -2.67308 h 3.99205 v -1.11451 h -3.99205 v -2.63733 h 4.47123 v -1.1145 z m 8.77184,0 v 1.1145 h 2.2654 v 7.55135 h 1.16217 v -7.55135 h 2.32561 v -1.1145 z m 9.08292,0 v 5.63339 c 0,0.61531 0.1399,1.16251 0.41958,1.64198 0.28768,0.47147 0.67928,0.83952 1.17472,1.10322 0.49543,0.25571 1.04267,0.3832 1.64199,0.3832 0.60731,0 1.15907,-0.12749 1.65451,-0.3832 0.49544,-0.2637 0.88705,-0.63175 1.17473,-1.10322 0.28766,-0.47947 0.4315,-1.02667 0.4315,-1.64198 v -5.63339 h -1.13899 v 5.59764 c 0,0.38357 -0.0915,0.73074 -0.27533,1.04239 -0.18379,0.31165 -0.4394,0.5555 -0.76705,0.73131 -0.31962,0.17578 -0.67982,0.26403 -1.07937,0.26403 -0.38357,0 -0.73466,-0.0882 -1.05431,-0.26403 -0.31165,-0.18381 -0.55943,-0.42764 -0.74322,-0.73131 -0.18379,-0.31165 -0.27597,-0.65882 -0.27597,-1.04239 v -5.59764 z m 10.4621,0 v 8.66585 h 1.1628 v -3.188 h 1.28261 c 0.66325,0 1.21046,-0.13206 1.64197,-0.39576 0.4395,-0.2637 0.75527,-0.60756 0.94705,-1.0311 0.19977,-0.42351 0.29979,-0.87855 0.29979,-1.36601 0,-0.84703 -0.26803,-1.50666 -0.80342,-1.97813 -0.5274,-0.47147 -1.26226,-0.70685 -2.20519,-0.70685 z m 1.1628,1.1145 h 1.34218 c 0.57534,0 0.99899,0.1641 1.27068,0.49173 0.2717,0.31964 0.40768,0.68706 0.40768,1.10259 0,0.23972 -0.0562,0.48751 -0.16809,0.74321 -0.1119,0.24773 -0.29951,0.45953 -0.56322,0.63535 -0.25571,0.17579 -0.5911,0.26342 -1.00662,0.26342 h -1.28261 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.299663"
+           id="path1059" />
+        <path
+           d="m 393.03224,123.26436 c -0.7991,0 -1.53788,0.20397 -2.21712,0.6115 -0.67124,0.39957 -1.20667,0.93891 -1.60623,1.61815 -0.39954,0.67924 -0.59958,1.4147 -0.59958,2.20581 0,0.81508 0.19547,1.56233 0.58703,2.24157 0.39956,0.67124 0.93955,1.20212 1.61878,1.59368 0.67924,0.39157 1.41802,0.58768 2.21712,0.58768 0.79109,0 1.52658,-0.19611 2.2058,-0.58768 0.68723,-0.39954 1.23053,-0.9389 1.63007,-1.61814 0.39954,-0.67923 0.59895,-1.418 0.59895,-2.21711 0,-0.79111 -0.20334,-1.52657 -0.61087,-2.20581 -0.39955,-0.67924 -0.93892,-1.21858 -1.61815,-1.61815 -0.67922,-0.40753 -1.41471,-0.6115 -2.2058,-0.6115 z m 11.85257,0 c -0.7991,0 -1.53851,0.20397 -2.21773,0.6115 -0.67126,0.39957 -1.20668,0.93891 -1.60624,1.61815 -0.39953,0.67924 -0.59895,1.4147 -0.59895,2.20581 0,0.81508 0.19549,1.56233 0.58704,2.24157 0.39955,0.67124 0.93891,1.20212 1.61815,1.59368 0.67922,0.39157 1.41863,0.58768 2.21773,0.58768 0.7911,0 1.52594,-0.19611 2.20519,-0.58768 0.68722,-0.39954 1.2305,-0.9389 1.63006,-1.61814 0.39955,-0.67923 0.59959,-1.418 0.59959,-2.21711 0,-0.79111 -0.20397,-1.52657 -0.61151,-2.20581 -0.39955,-0.67924 -0.93891,-1.21858 -1.61814,-1.61815 -0.67925,-0.40753 -1.41409,-0.6115 -2.20519,-0.6115 z m 19.32927,0.0483 c -0.75914,0.024 -1.37826,0.24756 -1.85773,0.67109 -0.47147,0.41553 -0.70747,0.96273 -0.70747,1.64196 0,0.46349 0.11567,0.85116 0.34747,1.16281 0.23173,0.30366 0.5076,0.54359 0.82726,0.71939 0.32763,0.1758 0.73556,0.35558 1.223,0.53938 0.52742,0.20776 0.93473,0.43135 1.2224,0.6711 0.29568,0.23172 0.44343,0.54748 0.44343,0.94704 0,0.47146 -0.17587,0.82712 -0.52747,1.06685 -0.34362,0.23973 -0.747,0.35937 -1.21047,0.35937 -0.35959,0 -0.74727,-0.0758 -1.16281,-0.22767 -0.41553,-0.15981 -0.77119,-0.35137 -1.06684,-0.57513 l -0.51556,0.92259 c 0.37559,0.26371 0.81099,0.484 1.30644,0.65981 0.49544,0.16782 1.01124,0.25149 1.54664,0.25149 0.57534,0 1.07482,-0.10789 1.49836,-0.32362 0.43151,-0.21575 0.76298,-0.51127 0.99471,-0.88684 0.23173,-0.37559 0.34745,-0.79529 0.34745,-1.25876 0,-0.51143 -0.10388,-0.93114 -0.3117,-1.25877 -0.19979,-0.33563 -0.4554,-0.59517 -0.76704,-0.77896 -0.30368,-0.19179 -0.67894,-0.36764 -1.12644,-0.52746 -0.59933,-0.22376 -1.06284,-0.44735 -1.39047,-0.6711 -0.31965,-0.23174 -0.4798,-0.52726 -0.4798,-0.88684 0,-0.3676 0.13597,-0.65525 0.40766,-0.86301 0.27969,-0.21575 0.65559,-0.32363 1.12707,-0.32363 0.31164,0 0.64312,0.0517 0.99471,0.15555 0.35161,0.10388 0.68307,0.23985 0.99471,0.40767 l 0.44343,-0.89939 c -0.7991,-0.46348 -1.66599,-0.69492 -2.60094,-0.69492 z m -43.8849,0.0477 v 1.11515 h 2.2654 v 7.55132 h 1.1628 v -7.55132 h 2.325 v -1.11515 z m 32.52403,0 v 8.66647 h 5.57382 v -1.12706 h -4.41101 v -7.53941 z m -19.82097,1.01917 c 0.59132,0 1.1346,0.14777 1.63006,0.44342 0.49543,0.29568 0.88704,0.69906 1.17471,1.21048 0.28768,0.51142 0.4315,1.0671 0.4315,1.66643 0,0.59933 -0.14382,1.15439 -0.4315,1.66581 -0.27968,0.50343 -0.66736,0.90352 -1.1628,1.19918 -0.48745,0.28768 -1.02682,0.43151 -1.61815,0.43151 -0.59133,0 -1.13854,-0.14776 -1.64198,-0.44343 -0.49544,-0.29566 -0.88705,-0.69574 -1.17472,-1.19917 -0.28767,-0.50344 -0.4315,-1.05064 -0.4315,-1.64198 0,-0.59933 0.1399,-1.15439 0.41958,-1.66581 0.28769,-0.51143 0.67928,-0.91544 1.17474,-1.2111 0.49544,-0.30365 1.03873,-0.45534 1.63006,-0.45534 z m 11.85257,0 c 0.59133,0 1.13461,0.14777 1.63006,0.44342 0.49543,0.29568 0.88705,0.69906 1.17472,1.21048 0.28767,0.51142 0.43151,1.0671 0.43151,1.66643 0,0.59933 -0.14384,1.15439 -0.43151,1.66581 -0.27968,0.50343 -0.66737,0.90352 -1.1628,1.19918 -0.48745,0.28768 -1.02681,0.43151 -1.61816,0.43151 -0.59133,0 -1.13853,-0.14776 -1.64198,-0.44343 -0.49543,-0.29566 -0.88704,-0.69574 -1.1747,-1.19917 -0.28768,-0.50344 -0.43151,-1.05064 -0.43151,-1.64198 0,-0.59933 0.1399,-1.15439 0.4196,-1.66581 0.28766,-0.51143 0.67926,-0.91544 1.17471,-1.2111 0.49544,-0.30365 1.03873,-0.45534 1.63006,-0.45534 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:0.71374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+           id="path1070" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1604289c8d768aee6f250d1e1127cc85840cc5e
GIT binary patch
literal 24183
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
O&w%?zI+%M;U;hueu&zn~

literal 0
HcmV?d00001

diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg
new file mode 100644
index 0000000000..991577fba0
--- /dev/null
+++ b/docs/logo/setup_tools_logo_colour_banner_2lines.svg
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="318.51953"
+   inkscape:export-xdpi="318.51953"
+   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_banner_2lines_1000px.png"
+   width="79.743927mm"
+   height="34.816189mm"
+   viewBox="0 0 79.743929 34.81619"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (1.0+r73+1)"
+   sodipodi:docname="setup_tools_logo_colour_banner_2lines.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1362">
+      <stop
+         style="stop-color:#336790;stop-opacity:1"
+         offset="0"
+         id="stop1358" />
+      <stop
+         style="stop-color:#396f9e;stop-opacity:1"
+         offset="1"
+         id="stop1360" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1356"
+       inkscape:collect="always">
+      <stop
+         id="stop1352"
+         offset="0"
+         style="stop-color:#ffd040;stop-opacity:1;" />
+      <stop
+         id="stop1354"
+         offset="1"
+         style="stop-color:#c59500;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1346">
+      <stop
+         style="stop-color:#ffd040;stop-opacity:1;"
+         offset="0"
+         id="stop1342" />
+      <stop
+         style="stop-color:#c59500;stop-opacity:1"
+         offset="1"
+         id="stop1344" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1348"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.5091231)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1350"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1348-1"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1389"
+       gradientUnits="userSpaceOnUse"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952"
+       gradientTransform="translate(-0.09428005)" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1086"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="translate(-50.077801,19.854432)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1109"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="101.13023"
+       x2="360.05417"
+       y1="111.95531"
+       x1="372.85818"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1348.8391,-341.44002)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1203"
+       xlink:href="#linearGradient1362"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1309.3337,-329.29191)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1214"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(1.2047454,0,0,1.2047454,-111.70824,-25.690314)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1224"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.199673"
+     inkscape:cx="16.58134"
+     inkscape:cy="40.833582"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1222"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-306.75427,-109.39197)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1399"
+       transform="translate(0.04622687,-0.80180859)">
+      <g
+         id="g1222">
+        <path
+           transform="matrix(0.26458333,0,0,0.26458333,306.70804,110.19378)"
+           d="M 41.466797 104.42188 L 41.46875 108.33594 C 41.46875 113.76587 45.817962 118.11523 51.248047 118.11523 L 51.476562 118.11523 C 56.906534 118.11523 61.231356 113.76924 61.257812 108.33594 L 61.257812 104.42188 L 41.466797 104.42188 z "
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path875" />
+        <path
+           id="path1185"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="M 42.136719 16.986328 C 40.379654 16.986328 38.411514 17.300793 36.460938 17.896484 C 35.973341 18.045398 35.485607 18.21096 35.003906 18.394531 C 34.522735 18.577838 34.046219 18.779262 33.578125 18.996094 C 32.640878 19.430172 31.736194 19.930134 30.894531 20.492188 C 30.052906 21.054241 29.276054 21.67117 28.583984 22.339844 C 27.891915 23.008518 27.285124 23.729619 26.783203 24.5 C 26.281244 25.270381 25.884538 26.089856 25.613281 26.957031 C 25.545628 27.173976 25.485373 27.392582 25.433594 27.615234 C 25.277877 28.283757 25.195312 28.977303 25.195312 29.697266 C 25.195312 33.458273 24.945312 36.083109 24.945312 43.316406 C 24.946295 43.531083 24.947442 46.441673 24.949219 48.650391 C 27.405156 45.2004 31.472761 42.949219 36.025391 42.949219 L 46.861328 42.949219 L 46.861328 39.560547 L 62.171875 39.501953 L 72.152344 39.458984 L 72.152344 29.242188 C 72.152344 28.806862 72.111061 28.377201 72.033203 27.957031 L 72.033203 27.955078 C 71.994274 27.745314 71.946121 27.537789 71.888672 27.332031 L 71.888672 27.330078 C 71.602184 26.298456 71.093029 25.319597 70.412109 24.402344 C 70.139605 24.035352 69.839493 23.678236 69.515625 23.332031 C 68.544022 22.293417 67.356896 21.351192 66.041016 20.523438 C 65.602893 20.24791 65.150808 19.986206 64.691406 19.740234 L 64.689453 19.740234 C 63.770121 19.248102 62.818156 18.815946 61.873047 18.449219 L 61.871094 18.449219 C 61.398842 18.265912 60.928705 18.097275 60.464844 17.947266 L 60.462891 17.947266 C 59.070361 17.496481 57.738343 17.197455 56.599609 17.064453 L 56.597656 17.064453 C 56.217965 17.020233 55.86095 16.995084 55.529297 16.988281 L 42.138672 16.988281 L 42.136719 16.986328 z M 59.916016 25.726562 C 62.163776 25.726562 63.986328 27.549114 63.986328 29.796875 C 63.986328 32.044673 62.163852 33.867188 59.916016 33.867188 C 57.668255 33.867188 55.845703 32.044673 55.845703 29.796875 C 55.845703 27.549077 57.668255 25.726525 59.916016 25.726562 z M 33.414062 62.560547 L 33.404297 62.5625 C 30.175106 62.562273 27.468914 64.698086 26.603516 67.638672 C 26.651138 67.719932 26.690723 67.811633 26.740234 67.890625 C 26.958691 68.240231 27.193016 68.567573 27.441406 68.875 C 27.689721 69.182654 27.95266 69.469708 28.226562 69.738281 C 28.5002 70.006628 28.785615 70.257567 29.080078 70.490234 C 29.669798 70.956175 30.301649 71.350705 30.958984 71.681641 L 30.960938 71.681641 C 31.946449 72.177666 32.986623 72.530512 34.013672 72.757812 C 34.661747 72.901057 35.302171 72.991126 35.923828 73.041016 C 35.957844 73.043812 35.9961 73.048955 36.03125 73.052734 C 36.358935 73.075412 36.679394 73.085938 36.992188 73.085938 L 40.496094 73.09375 L 40.492188 70.083984 L 40.492188 70.046875 C 40.499747 69.930844 40.504033 69.797453 40.507812 69.65625 C 40.508001 65.724445 37.345792 62.56032 33.414062 62.560547 z M 65.974609 64.320312 C 63.521847 64.363021 61.396258 66.386834 61.396484 68.794922 L 61.396484 70.123047 L 61.396484 80.177734 L 61.328125 80.177734 L 61.324219 80.537109 L 38.173828 80.587891 C 37.25786 80.649119 36.36986 80.642438 35.511719 80.568359 C 34.653577 80.493525 33.826047 80.351409 33.03125 80.140625 C 32.236491 79.929727 31.473943 79.64996 30.748047 79.302734 C 30.022189 78.955396 29.333118 78.540269 28.681641 78.056641 C 27.024053 76.826102 26.052605 74.506369 24.902344 72.46875 L 24.902344 86.914062 C 24.902344 87.188834 24.91079 87.461404 24.929688 87.730469 C 24.948585 87.999571 24.971844 88.264326 25.005859 88.527344 L 25.005859 88.529297 C 25.073513 89.054613 25.174294 89.567988 25.304688 90.068359 L 25.304688 90.070312 C 25.565475 91.071547 25.947597 92.021212 26.431641 92.916016 C 26.673908 93.364116 26.94102 93.797005 27.232422 94.216797 L 27.232422 94.21875 C 28.105531 95.476274 29.18898 96.605277 30.417969 97.589844 C 30.827745 97.918285 31.254216 98.228382 31.693359 98.521484 C 32.571646 99.107651 33.502173 99.622058 34.462891 100.05859 C 35.423647 100.49513 36.413495 100.85383 37.410156 101.12891 C 38.40678 101.40368 39.410481 101.59556 40.396484 101.69727 C 40.889524 101.74829 41.377712 101.77596 41.859375 101.78125 L 41.875 101.78125 L 41.882812 101.78125 C 42.273389 101.79259 45.506174 101.80872 48.636719 101.8125 C 51.252379 101.81628 53.198802 101.82031 54.261719 101.82031 C 54.470727 101.82016 55.292794 101.82061 55.369141 101.82031 C 59.733474 101.80141 63.532972 101.46844 66.841797 100.83594 C 68.619309 100.49616 70.260817 100.07434 71.757812 99.560547 C 73.208433 99.062708 74.520962 98.478668 75.691406 97.820312 C 79.203268 95.845131 81.428323 93.202549 82.208984 90.222656 C 82.57711 87.507633 82.476056 81.109803 82.460938 76.640625 L 82.460938 76.632812 C 82.476056 72.580101 82.486455 72.074783 82.490234 71.658203 L 82.394531 71.658203 L 82.386719 71.099609 L 70.544922 71.15625 L 70.53125 68.794922 C 70.531174 66.311697 68.53979 64.320426 66.056641 64.320312 L 66.048828 64.320312 C 66.026151 64.320124 65.99546 64.320161 65.976562 64.320312 L 65.974609 64.320312 z "
+           transform="matrix(0.26458333,0,0,0.26458333,306.70804,110.19378)" />
+        <path
+           id="path1105"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="m 321.13467,122.13159 v 0.014 h -4.8948 c -1.66007,0 -3.01858,1.32715 -2.98638,2.98018 v 0.004 1.25987 1.82004 c 0.22102,-1.13301 1.09696,-2.04967 2.29289,-2.05052 h 0.002 c 1.35724,9.8e-4 2.46504,1.10697 2.46497,2.46445 0,0.0448 -0.002,0.0932 -0.006,0.14469 l 0.002,-0.0212 0.004,2.07222 h 4.35168 v -2.07067 -0.35347 c -9e-5,-0.97613 0.82874,-1.75627 1.79265,-1.77147 h 0.002 c 0.009,-8e-5 0.0184,-7e-5 0.0274,0 0.97328,10e-4 1.7684,0.7961 1.76941,1.7694 v 0.0357 l 2.51767,-0.0119 v -0.12505 h 0.0119 v -6.16035 h -2.65462 c -0.17114,0.80057 -0.79979,1.44313 -1.64641,1.44332 -0.84657,-1.9e-4 -1.47321,-0.64281 -1.64434,-1.44332 z" />
+        <path
+           id="path1059"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.297456"
+           d="m 336.64763,117.62189 c -0.75355,0.0239 -1.36812,0.24574 -1.84405,0.66615 -0.468,0.41247 -0.70163,0.95628 -0.70163,1.63052 0,0.46005 0.11481,0.84488 0.3449,1.15424 0.23004,0.30141 0.50325,0.53894 0.82054,0.71346 0.32522,0.17451 0.73015,0.35297 1.21401,0.53541 0.52353,0.20623 0.92784,0.42881 1.21339,0.66677 0.29348,0.23003 0.44016,0.54286 0.44016,0.93946 0,0.468 -0.17457,0.82102 -0.52358,1.059 -0.34109,0.23795 -0.7415,0.35735 -1.20157,0.35735 -0.35694,0 -0.74176,-0.0759 -1.15424,-0.22663 -0.41247,-0.15864 -0.76549,-0.34878 -1.05898,-0.57089 l -0.51114,0.91643 c 0.37282,0.26176 0.80502,0.47981 1.29681,0.65432 0.49181,0.16658 1.00318,0.24964 1.53464,0.24964 0.57111,0 1.06692,-0.1071 1.48732,-0.32124 0.42834,-0.21417 0.75735,-0.5075 0.98739,-0.88031 0.23003,-0.37282 0.34553,-0.78944 0.34553,-1.2495 0,-0.50767 -0.10312,-0.92365 -0.30941,-1.24888 -0.1983,-0.33314 -0.45206,-0.5914 -0.76141,-0.77385 -0.30142,-0.19036 -0.67455,-0.36494 -1.11876,-0.52358 -0.5949,-0.22211 -1.055,-0.44405 -1.38024,-0.66614 -0.31728,-0.23004 -0.47564,-0.52338 -0.47564,-0.88032 0,-0.36487 0.13435,-0.65042 0.40405,-0.85666 0.27762,-0.21417 0.65076,-0.32125 1.11876,-0.32125 0.30935,0 0.63838,0.0513 0.9874,0.1544 0.34901,0.10313 0.67804,0.2381 0.98739,0.40468 l 0.44078,-0.89215 c -0.79322,-0.46006 -1.65436,-0.69043 -2.58242,-0.69043 z m 6.18523,0.048 v 8.60205 h 5.75876 v -1.11814 h -4.60515 v -2.65339 h 3.96266 v -1.1063 h -3.96266 v -2.61792 h 4.43831 v -1.1063 z m 8.70726,0 v 1.1063 h 2.24872 v 7.49575 h 1.15361 v -7.49575 h 2.3085 v -1.1063 z m 9.01605,0 v 5.59192 c 0,0.61077 0.13887,1.15395 0.41649,1.62989 0.28556,0.46799 0.67428,0.83335 1.16607,1.0951 0.49179,0.25383 1.03499,0.38039 1.62989,0.38039 0.60284,0 1.15054,-0.12656 1.64235,-0.38039 0.49178,-0.26175 0.88051,-0.62711 1.16607,-1.0951 0.28555,-0.47594 0.42832,-1.01912 0.42832,-1.62989 v -5.59192 h -1.13059 v 5.55644 c 0,0.38074 -0.0908,0.72535 -0.27331,1.03471 -0.18243,0.30935 -0.43617,0.5514 -0.7614,0.72592 -0.31728,0.17449 -0.67483,0.26209 -1.07144,0.26209 -0.38074,0 -0.72924,-0.0876 -1.04654,-0.26209 -0.30935,-0.18245 -0.5553,-0.42449 -0.73774,-0.72592 -0.18244,-0.30936 -0.27393,-0.65397 -0.27393,-1.03471 v -5.55644 z m 10.38507,0 v 8.60205 h 1.15424 v -3.16453 h 1.27317 c 0.65837,0 1.20155,-0.13108 1.62988,-0.39284 0.43627,-0.26176 0.74971,-0.60309 0.94008,-1.02351 0.1983,-0.42039 0.29758,-0.87209 0.29758,-1.35595 0,-0.8408 -0.26605,-1.49558 -0.7975,-1.96358 -0.52352,-0.46799 -1.25296,-0.70164 -2.18896,-0.70164 z m 1.15424,1.1063 h 1.33231 c 0.57111,0 0.99162,0.16289 1.26132,0.48811 0.26969,0.31728 0.40467,0.682 0.40467,1.09447 0,0.23796 -0.0558,0.48392 -0.16684,0.73774 -0.11108,0.2459 -0.29731,0.45615 -0.55908,0.63067 -0.25383,0.1745 -0.58675,0.26148 -0.99921,0.26148 h -1.27317 z" />
+        <path
+           id="path1070"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:0.708485;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+           d="m 346.67032,128.25756 c -0.79322,0 -1.52656,0.20247 -2.2008,0.60701 -0.66629,0.39661 -1.19778,0.93199 -1.59439,1.60623 -0.3966,0.67423 -0.59518,1.40428 -0.59518,2.18957 0,0.80907 0.19405,1.55084 0.58272,2.22507 0.39662,0.6663 0.93263,1.19327 1.60685,1.58194 0.67424,0.38869 1.40758,0.58335 2.2008,0.58335 0.78527,0 1.51534,-0.19466 2.18957,-0.58335 0.68217,-0.3966 1.22146,-0.93199 1.61806,-1.60623 0.3966,-0.67422 0.59454,-1.40756 0.59454,-2.20078 0,-0.78529 -0.20184,-1.51534 -0.60637,-2.18957 -0.39661,-0.67424 -0.932,-1.20962 -1.60623,-1.60623 -0.67423,-0.40454 -1.4043,-0.60701 -2.18957,-0.60701 z m 11.76531,0 c -0.79321,0 -1.52718,0.20247 -2.2014,0.60701 -0.66631,0.39661 -1.1978,0.93199 -1.59441,1.60623 -0.39659,0.67423 -0.59455,1.40428 -0.59455,2.18957 0,0.80907 0.19405,1.55084 0.58273,2.22507 0.3966,0.6663 0.93199,1.19327 1.60623,1.58194 0.67422,0.38869 1.40819,0.58335 2.2014,0.58335 0.78528,0 1.51472,-0.19466 2.18895,-0.58335 0.68217,-0.3966 1.22145,-0.93199 1.61806,-1.60623 0.39661,-0.67422 0.59518,-1.40756 0.59518,-2.20078 0,-0.78529 -0.20247,-1.51534 -0.60701,-2.18957 -0.3966,-0.67424 -0.93199,-1.20962 -1.60623,-1.60623 -0.67423,-0.40454 -1.40367,-0.60701 -2.18895,-0.60701 z m 19.18697,0.048 c -0.75356,0.0237 -1.36812,0.24574 -1.84406,0.66614 -0.46799,0.41248 -0.70225,0.95565 -0.70225,1.62989 0,0.46006 0.11481,0.84488 0.3449,1.15424 0.23002,0.30143 0.50388,0.53958 0.82117,0.71409 0.32522,0.1745 0.73015,0.35296 1.21401,0.53541 0.52353,0.20623 0.92783,0.42818 1.21338,0.66615 0.2935,0.23002 0.44017,0.54346 0.44017,0.94008 0,0.46799 -0.17457,0.82102 -0.52358,1.05899 -0.34109,0.23796 -0.7415,0.35673 -1.20157,0.35673 -0.35694,0 -0.74176,-0.0753 -1.15424,-0.22599 -0.41247,-0.15864 -0.76551,-0.3488 -1.05898,-0.5709 l -0.51177,0.91579 c 0.37282,0.26177 0.80502,0.48045 1.29683,0.65495 0.49178,0.16658 1.00379,0.24965 1.53525,0.24965 0.57111,0 1.06691,-0.1071 1.48732,-0.32125 0.42833,-0.21415 0.75736,-0.50749 0.98738,-0.8803 0.23004,-0.37282 0.34491,-0.78944 0.34491,-1.2495 0,-0.50766 -0.10313,-0.92429 -0.30941,-1.24949 -0.19832,-0.33316 -0.45205,-0.5908 -0.7614,-0.77323 -0.30143,-0.19038 -0.67394,-0.36495 -1.11814,-0.52359 -0.59491,-0.2221 -1.05502,-0.44405 -1.38024,-0.66615 -0.31729,-0.23003 -0.47626,-0.52338 -0.47626,-0.88032 0,-0.36488 0.13497,-0.65042 0.40466,-0.85664 0.27762,-0.21417 0.65076,-0.32126 1.11876,-0.32126 0.30936,0 0.63839,0.0513 0.9874,0.1544 0.34902,0.10313 0.67804,0.23809 0.98739,0.40467 l 0.44016,-0.89276 c -0.79321,-0.46007 -1.65373,-0.6898 -2.58179,-0.6898 z m -43.56181,0.0473 v 1.10694 h 2.24872 v 7.49573 h 1.15424 v -7.49573 h 2.30787 v -1.10694 z m 32.28459,0 v 8.60267 h 5.53276 v -1.11876 h -4.37852 v -7.48391 z m -19.67506,1.01168 c 0.58697,0 1.12625,0.14667 1.61806,0.44015 0.49178,0.2935 0.88051,0.69391 1.16606,1.20157 0.28557,0.50765 0.42833,1.05924 0.42833,1.65416 0,0.59491 -0.14276,1.14589 -0.42833,1.65355 -0.27761,0.49971 -0.66245,0.89686 -1.15425,1.19035 -0.48385,0.28556 -1.01924,0.42832 -1.60622,0.42832 -0.58698,0 -1.13016,-0.14667 -1.62989,-0.44015 -0.49179,-0.29349 -0.88051,-0.69062 -1.16607,-1.19035 -0.28555,-0.49973 -0.42833,-1.0429 -0.42833,-1.62989 0,-0.59492 0.13887,-1.14589 0.4165,-1.65355 0.28556,-0.50766 0.67428,-0.90869 1.16608,-1.20218 0.49179,-0.30141 1.03108,-0.45198 1.61806,-0.45198 z m 11.76531,0 c 0.58698,0 1.12626,0.14667 1.61806,0.44015 0.49179,0.2935 0.88051,0.69391 1.16607,1.20157 0.28555,0.50765 0.42833,1.05924 0.42833,1.65416 0,0.59491 -0.14278,1.14589 -0.42833,1.65355 -0.27762,0.49971 -0.66245,0.89686 -1.15424,1.19035 -0.48386,0.28556 -1.01925,0.42832 -1.60624,0.42832 -0.58697,0 -1.13015,-0.14667 -1.62989,-0.44015 -0.49179,-0.29349 -0.88051,-0.69062 -1.16606,-1.19035 -0.28556,-0.49973 -0.42833,-1.0429 -0.42833,-1.62989 0,-0.59492 0.13887,-1.14589 0.4165,-1.65355 0.28555,-0.50766 0.67427,-0.90869 1.16607,-1.20218 0.49179,-0.30141 1.03109,-0.45198 1.61806,-0.45198 z" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
new file mode 100644
index 0000000000000000000000000000000000000000..89370a9d012633f184ba67890c7d481c2308a35a
GIT binary patch
literal 38105
zcmeFYg;!MH7e0K4?(PohQV|&%rIbcMlvF|*hHe-{Nd-v-h7go)r5i*Lq&tSjA%}Ko
z-ix2_@3-E6;a%&UwOFh*YtFsr?6dcCp8f27qI9*@NQsz;001C;{7Cr;0AQ~J0Hm4#
z5B$bKczzZ9M+kfL+yek^U)=mbn(lE{gI_Xwsyy@5cYWpQ^U~c0@bU2xwRds!uzCrz
z5p{L9O-IWz0RRW^Sowj0FJc?%7ih3HEx)%VZ<|2jZJ_H`J~i>gjqn%FT!llaadD}b
z=Qlx$$Xg^G<)YQqUJjCu)mVfY9B>npnBCc@jwa5IUA=S<lN<^gz3}6Mh#&t!oMY5F
z5>_?u_KADE;+@1Cw(v*|`k_(Uiaipj-yQ(h|Nr^_mIZQ-s9Kq`f4lz`i8<SlmwV79
zt@l|iCMJ|f1pc-~_lWutM?LMFck3-9fpD&rdk-sVxl9ZyY0D04Mm5Y`>uLi%4p=ED
zZ$7D=@OdROrZlq({c}WK3gYV!7w!NK>@K{MEc0u)k)f51#3|P-P!d+`h+FlP#kQ;H
zRA2s4i}*it<@~svjiKo5)HpnMot9Jo(fo{)9s(s+G(Y;3Ucb~-{VqOfVLxmV2ztsH
zLT&F~ROT=<uu9MQZ)`Lvwm+HBnRh?sDdo9?Vc=s96!yBuy6;S9{pS$@A{46x_DQ}X
zyN@Yq_^dveIng31^5(-Yjd#Q%{^~3tRBJPsu<aS}Q86CnWj;wcX{|W83Y*_Zv@=zF
z3ORd`?XxH;gwCuJI_3R0FmlF9agfqBf-a@#nZDtk0zd>P_h*uzGP8a-h`|>glt_6Q
zCO+j`_|GhQLU>2Q-u8Ch?cT+hk3cHf3(tIN*#q0Nj#JKKcRqyAkt{szkvN;nGu@U+
z<p=*(v{}zE^i6koHEkaEZKwdz9M+3S)MGabxxszdym7$_{;Nor@R*{!rq|P3uVNQm
zYM}o%;FyMF{kgTTul*Igw6WZ%ofS^@-rth!?cu~-`)L}{=?=K%N8?ZF>~0|~f#zNJ
zJBj~|(u)OGLnN5%Vk!&yAOj)UxoiDO9V%%c?bzWLAY<BIA|HDgW8)#@!)*Sa-P~!g
z{lkgpPud8G2V_}%<LZCG<}d96?@A$j&VE=g*>N-DP?gD8Dv5NwoLpR1zWF4DF${?t
z{98{mc5OkgGjL!McNfw9{MHN~FLC$Xs;6dKKhNqDjhLKX|1+^W3AR5TlZ5lW-Ln%3
z8a@`;8LhU}*d5jw<?|oFuD_m<Ju3`Sx>1T2Y1+y7H==1OSW+?K38Tc$4`$923DD`J
z=KH^YBI}Z6Y9%2?u?ptpnoBOR05~6(=_*_9d|!>ZzN)y2x@K~D_iua^OL?|!q@Fk%
zRMiZ{2@$nZpbCNR`adNnK-tgJh=#-F?Uh5H2jH`NZ=LPc{aHQ#&uvZH;F*w_`>)Tb
z;Z`znui9gG<aXQ~D&KiFHetQS^YS#kY>KW;u>0>F?r+w7u;t7)j#NGx!=7@Obk<io
z$O$8Aub$jWDItA2&??;i^WS9nBW`D(7kHlKY^ki>0fJ=W(&j6XUo;mgk+(+0{5;bn
z9(|7csF}g8UcmBi57$WMm(htM8yZ(x1@l{Sz1@Xf|1<6Vk+lQl5pSJqKP5ZzhixA9
z&F_yj=em&i;EsEi0v=1JSdT9t;>|KO=|bt#OR_(Ctjy)}=2c0Nvl#uXrlyn1+K(bu
zkN9rZyZMq~Xw+%!h{p)x%aFNn{=?fz63SWQpGq|#W1y+lOcU+_z=5py+Z%_4`l4c2
z*h<nj@6#LXz+~qS7uaJg2*ww%2!6;(>EC~=vA~RM{CFCtui@ksUw+?3+JP`TkeKM-
z0P+r@b$hBNx21Tl10w*tX>c)i$Bk~|B$U%_BF3xxuP>o0i+<Bng@WtRZ&9=yH*?Ez
z>J(bvpdd4$E3tq;d(UyuQ*5^JG>=bXclIgg^q$<g-ugxR4={3^+TodaxwY&VY(>!{
zwzZo_NBxcZ)lvDL!GFPz9w#S8L&)(pZ}iPnDD_^g1eoeOjlG+ps+&+}n4u8`O=UZk
z2NOV6BD1uXEOU1wX&Lp5B%Je?I{x$a2fny+Ukw&}#oA$+f$?Otqk3XW9Z~=yTYK?i
zIPt$N&<lU5sPlP*`Qtn6)$KaIKSL{H?|u!l&Nh1YSiX*GkCw{PL2dr`G;@-5fxCas
zc$#tQ`U36|gC;jfk*VP;@(`g-mEvWIy`~KM?}xM}ox#!fNIhNQy-^uzRU8QB;uNzb
zQ@D>=yMv(<MZ6Y~2*tXtq0|E!6xKSej$C4MwUpQHA5I(K53}ii9(or?GD;(~((2>P
zE;;g0I-9SWed+(2Cm{Qi&<C}rg90J)Gw<%udYs)ip5Q5Z0$KDh8xu!bbbt2oC!fCO
z^c>1^r-}cc?M~l8<Z#t(h3g-h1~pv{YtGY@sfBwO4y(jEUuM62bsFv~NMrQ-`gP<5
z)sX%u%K!x6Iyi2S(r3HVbo+k~*nOY_=^J;gQAqf;H0Lz^n+%1&O+D;dT9|fMU>-&W
z9DBI>R@JJi13|x?Oe&EtKNr!yn&kQC5Snd5>*2IoWg8h5pD=ge^QCIb<S4Vj-Z`zM
zcXHYy)w?naj?X8$ieKrNr+U`IrUa+&S(7QdJZg9v=o$iZHj1^72<gTDRj%>Rys58^
zhDiH%lSA0Z-W<BD>Ov)XtCvh^-J9dVSu9n|2K3~8zzWeQ)19*@UW*Losh5bliDmxL
z+u6*#FfsWPMjxlRZ;!gkN$gAcKBPJp^|4Dl_XCY306Q)Q?(;t7tdtSvaDQpJ^>5{R
zd6tTjnkoYh=LIo|%hCv})D{86V|*f4Bz;e-IIWOymQf`sm%=^sx)=pMB39=>xtld}
z9nfZlxy;)KB8=x$a)K;NDjtTkxcoWU!HcOKJ&$}}9iSk8Fbjlt$qN-K@P&m*ipo~G
zOniy6w1{)>{}e41gn7Kg_j2p@+f3o;&w>mDT^x$U#)ApGl-q{M1j>?8mSM!xfR{X#
z&~9l*=lrP{`>c=d{=2TMy~YU5RkXcd`O61>F$+Pyj1nuMR$MTm3p6+NbISbsGKZ1#
zV9anv&W41VNrDl>uB?#>6ZQ1AghwIG;4}9p7?fAauj}_eHxU9J_!7sP5<PL%hbEp`
zP_6ee=SR-L`<afIlVR-PV3Kvb44LLX>yevF`vWVnJDFLZzW7DTB8rw3w@T6Ng@?hp
z(YxJKPv(?Z$z`;y834Q^wl7}}LOWloh|;f1!Bg%(l*g{~Zrr&=cJV-}4!;1+Zg;6b
zKtn;Si~rsv)|o7vuBE80FJ)1sJ068~dbwqUlq|cGVPTS2!G(4NoLbL&pg{-PczY=e
z&c1HkB5}_Z;}?Rgc~9x#;uq)~8Nb-e4;}B%OHJ-?=R-`BUZ(`=-Sd0!nYMC4)7r%x
z5)OG}=aOefxT;gjg(kmvCc_0_o$@<5sNObc#Q%T+kOb}LSV6dgVjVRW#&RAPv%yDd
za>UpT4=5#fZ#@cZ7iwOT#rAPh_+m-4HC|po7G&oeI=~V{lJbLMsDJL|OM&noWArxF
zFV>f?hJq#)_Y@TS{Gb$U@8#Zbvws-HfojpN2ouA&WlUawp23S0{<e7GHvW>mOclDF
zX8Zwk*05v9(I_B~JnQhDZLN(Bdr{ymgfj@78F}s3N{lC7Z8_#AB{B@XcRyFV{49mO
zNUdL*`$XeP<kOQs$YkE8k8Bbc{Ae(+fSYY`^lkatIJX}b+Tuo^TS7@9az(PJjr})>
zI^plamMrj9SH$aOP`-6vC41j@6`g{Wi!#h2dDg1PzOwR|5-VQUINVeO3rDG1tY|s7
z@^~_EmNT_OYnkLpC7v(2vXp{95A}{`neFzSwbWLt0GZeK<it#A6zPpNR~9Opiy3oV
z%AYmlY(J3>`W5w6-*FdzjvkW4jcp!D`Qo-gcZ|(trCVR+F0K;su1gRkG%~V4jhXYc
zMMpB`^{B(Ok3qp-%~s}|?QWrUUcxgkb%WIJR*mrv&nv+<<)r;2wO&<HRG`J&TiC7O
zXay1G7ctFLZGG&a8Kw0>xRDyfU3_t#1z~)yLpk^DY!7q&!(=fkvH-s?Y}tYSME!BW
zUqa?OD?`I+;$TUY=_n9a60jS2YeA$nzX{qZm`oXu{oLN;+!7mi+mP@>Q+?T>cE(Vw
z01-Gl(OqdoEgw`Tv^y+4?$YPim<n}7#K%A9NGeLo_&8;_kZHC&gYmtsZ4)}L{Tekc
zSCVz!`k5V8!W(}2NqElhN7pbO{no$`znQNUba!7}DW=6<s*0+Opf%v}r$qzG(w#;d
zln{@;V{0hv({&96rJl|!Y-y2^f~~M*VzIxCjJ={4oV^^hTZ@=c4C`!va{mQ*Y&}<5
zo$@S^^xl5LoPpKw3#MJK^3~ILXOQ;nHiw(SwWLzUt=AUGPEy{^_I7RqvS&BQ_@KKz
zp%o`z^nxt=CtK^o`u7mzEfw?GayOlO$jHK~pB;YEl5e+s4Ja_*45|0gi_W>gQS69{
zW}qKs#E2M6&1-%7L8C5_;MxQtECivOUl%+wlAwa~;9G+34!2dAMF(kcp$WMBD7=eS
zn|gc&ZIMlT=^WqQIUNS`CTjYD<Ot!J<6o)n5xA#{Jaxx)#*x~88xv_}tR!mZwtT2T
z)K7iLvBGp-AHpDEWnVTYp(fA)clp3CD@mXc0F`_y(#MuR(G_X)e1%kUXrO?xRhTBe
zTxEBWqGjRbgJ8jor{`t`c}Ih}*Vb3Pr~3C#k+?T(Vpzk}7G*`UF-D8$nfT?9*R4fX
zTSVW*S?6$Ntbs}Ig(^sslbq@3?FE}C6*0SBm`gI^1O1IL6^kdyGM8xX>hHr|B>@*`
zkSOzW3y6Ai$)HgIBLYnF_(%@DsfeEf=qdE+KQi;3?5Of^E(=mO|3Vyq>q-8W`AJz{
z?Zt_n(w-k66=9phseSt7prgR)^`<ewM0AgTfs>(I&2!3W%8F9fbF6iGJNsWoGOqAq
zX#-O^Hm)q-=pJB;#b8&Fns!#dBFR*u1~PknoV#WBzOSE-8=llJH0%C(sVLb)E5tFw
zROEjYyCXo1x+BWyrC26Z_Ng^57)|P-RVw4~Q;ay{)dky7=v-w+!w5+RPuq(yp6lFb
zd?)%=6A7PXW+dX=%_uBaNrF$NVvxT5ZP5t}JeO+Q-a@g|;uchLwi&WM8!Q<wSXOiI
z45@UFsDyI8=ANjppmOZv7na;`+Mnke?vJ-hzn7`4lG6``+_Lyt1+W4tu92CaHu*~U
z_YxBdiMJ*VbnXtxtWn{4hAC5a4!lck6fpe*I!QR_&Wsf8zefr^7A(xn_I<06B*guq
zu(U%q99<`Qgm?ogAz`S)19I6AWlYrcqA<|a>-Y^H<jw)Ujg8@HIxvq@!JsRU+EDi>
z+ah#P2#}|BWQ8~w8R%RLDeFwDa%xN%Bwvp0%KPU?7~0Ton2JHY^hiIn@x}=<Zx;2P
zcw%!Mrfn7RGG4oG%?&NLYcWY_aPUyn<FxUAY9=0_i%-)NPl<izwNUpih%#v;4vd-y
zV*EZ%yL+J<9d}rE+)rhVN)?hcGkj2Kn*vM9jRI+=9&bv~*I3Z3IQ?Aovkx)}*Jk6Y
zZ|AE1>|sz`EZ(6}c+!Vl4S7tCkP_TI<njjbz=udpig;H5D(m2*NS)ne7#A7o-r-?L
zEswWnFnfJnVCUaI>{ll7!0;gud++=2+xa#q3^3<Xz_tdsP}zP^B(9P`*lxw{L}ip=
zb+Pg!A6^-lK9`ft9I@&atqw~*<efT2#|$xaNU`TntRx$VGJS1(`#8mKc0>`TW%%67
z5vr4QmYO(OT9|on=k~Uo>gNTZg15IY2DD3a*1$XnA0uCH2;}%TzRNGLk3n2;8DLvn
z&j?2{uB=3^U0I};wCT0W2j)=`G_Uo+%9v)%Ax|8-^Yn9;DQ|@s;nUyO?~BeK?f&e@
z|A<tWKNOo?j+W{sED>6WFO>us*hVM&x(g|R%J0I3Skbjy5ELRj)rOg*I_X2JftDlI
z9y8F&DB;|0XH=RFF(p(4?#ZNhe9XE8ncG*T*}-U^*fisBW65p1kW0@5o<lQYNeBU>
zU7R}rp5#UAJelO0U_OIK)D5Nbkuy;#5ABf%INzQ%dm`nN@o*mBnj1ck#Y)s3rAva(
zvEvBq_TDtU$(?~Kz9_0jL!<`ttCVx50U2Y7fCF{FLNv2wk)*G(1Gs<xw_wO5s^-Qx
zuME9Tg;Ww9)pxMA?t~(;G)3NOlg!ucb$fl|4YDp$=moP1yeMC@2dLPcJf6LlLo^;{
zi?~N>WdFifY}}*U+rbJon}t85Fno%28sg=_+xn`4CwJ3U+Z=zf=q5k#3YJs?!~Yd2
zajy>|s4qu|>;0Jzz!PPZ@X+lJVOyNmvFdcp?gPokUzHRG=P((VH>|T(ESi9iQ~p%s
z+dGdnEkfpg2FGX}C#c8COAqWf;)Co}p`<Qgxh!(W6qlp05lM5B_Bn;W?@o657@Ei*
zOvG<adY>>t&~`L3hKP@Q*2B{zEjKV-4!Q!K-X$K~`o24>yu0y^t=6&fbPNQ^FJgB-
z?ui^r(o&t+o^qkOdHc<IO}+RXCtpVE>5IbQ@SCH^=Bbg6F<$$HwZl|&`KQf@DthdO
z=gooSCCI0J1Kov;Q<ZX$_ai(ysrma>!TjUHi9EYlNxD>U<FDYG;nfGmX|DJcBKt)C
zWtFe^9q(i_e?1M~@(cdtTg~E+Fs3?w2XfWb_R6_L>P+E-g!ZR5qexQ*i>L6~#i+_T
z+V3pgmfS}#F$`%vVIWygWg7?zMi}Qc?IM;CIh5x;Z%{=owiVQ%iPWk4R7v5@gxb54
z-`A#;7ueLKUV{jrLG*6&_bH5RCE<=()~_XmKaI-nkNjSj#8Oa&((^BAD0dRVY1Qy-
z$%T$vD<lOm43R#O@QMk*Lr(=i>hc`x>xX6j#QaFy{V~!)I7qv;;|$vMxjH8yzGvS^
zqUPU+(-9CPhg3yOz}-5l0L!Jhd-B@v6SzP8V6V=R?s*{u{yIr@pruFQ!wL5!!%zSe
z&olSdFQN6hO1b^ffRWf8lJjXr!^Ek#X7W~L|JIQoj=Ls<bE3oLLF?YM5zOBR=1F&N
z_yat{_pRmv&A=`6RHi5P?{!8Ul?314MC$c1Lf}&9sGAT&vML>}@wsztaF-sFuo@n>
zfPlOR5A@XhI7O$FU!|#JDm?h4MWj3K&iIYS_4Q*>OUB}uJnwn-b|>8BQS1EaFIS3>
zhyT+$5<BbdHP@z97hN=8wRB{-6w%+9S?q1{kO?vg(%fyODEY;2p#=w9+Q(@SG*eC^
z*{9KOs_m4_^SaprQB)t3wauVE4HRxnAfNKWg6j}x(PYjaw15(#Nf8Sohu!J-bbAVY
zO-xCG8q2U*f+^E%CGc|!R%P3{_XAd1;1u<Y3$}Ruc>-&PRr$9-Ls&Laq43-oPlA_A
zra|TB#K#G<=H`%kgnDCX`%C=sQz*{|*Xss5cdg9$e-0>OVEy8?z7M1Gn<_Hw22RRh
zXv;@12OOi6*Dm#t3qLI3DU**6q%@`DulQ)rl$P;BHR)!$+9?h>gW?PJ-zj^g1LMLt
z(`<=ZBvZuY6f}L2PX36r#XAKTjDV?Ix=N{BM&2W%W5j?ELBg~^qu1lf8Sb)KmcvuF
zZk89dipEsN3*Pq@D&_7|Z5*VBzW26v<=WCaD=EvYs{+}98E!&Q-iDz`HRfCHD_Pia
z(RtZ<+ar&gDclvjD_fb`0iW*#gT_*-a&9?uV@bB!C|{*I*z1^-m_+np(vq^F14?Os
zbX9|MUDf!?jLG-}IUW(B8wP`>7~z0vHh;gmAUl-BPD-kB8XeN_tu!58TgOaAA^CUL
zW+1|YYi6)Y58I=*nAD(WZt;(m5uJ_&Ec|mC_<rjTQzG=(kscvMHT4x&R&}hscS+X6
zp-8+VlDW#u578S1-F-o0)TRI8$A?iwkia;$`aVOE*}u#})e#hP^r}R4eDiq3n76~K
zC_v+De@y>jv-rv)^#Cf7!<G%p4`K&K%OhujGNW!k2?k>WvwO{d>^hHc=B?d6)Oq>&
z#QpWCAu<q5RbwH@4~iP*NxM8gPJEjiDM*E2cI9&13NhTZLr5tJ^e;2d=b8F;dkyW!
z?M&eGX|NxR8bNNIka+r4mu)h+P)**LaXBa^AkUS^_6Z_RpL_G=<|`csiukP$4cE8)
ziEra>Ha(Gc9%k22iV;&EmIfcP`V!QPTOPVTZhC$GrQU_#<Yp&wS47Yt42>Sjx`lh>
zggqV1tfS#l(B8kBQWUJWbS1)2R4PU)lID3+Hu&nR1?q2X<+~|nv_LqI^a7P%?+clv
zuOP^{<u>EXp*sEEX;4uD*)D(I$j}sMjk<HwHgJp-u!HFxv3i~;Q)-?UXbu0Q;m>J_
z5K=xpOZM%n!L%C~2Gxwnua?Ez*Y9L%#1Ygg+zol^d>_N<cJyC3q|xo*zetGG79<>R
z0bW$Hwv`(pjcO#cwotO6boluqh;1MCU%ig@ex9dI(ayn`2g*rWKTTV|OqxUEh;DO4
z-PI{=a5c@X%=-t}%MV3D;h?fN@liV|RoTdhlLlejNc?(sq~R`%7cR*6Izas)F?-nN
zvV>aTiR7EkKq^c3ve&(aAP+6!6{^4ju%#*W-bM3Hu1frMXQS&%{WYfd;&Wjpf8&ig
zXH)82W(RA-sT>eSgOY@vi4W!Jy1buJ>5T{JY7GmyxwY(?LWmC@I{0(;YI}{_ERbrO
zJi|}M|1ejKcB9S)KDbdZ8da@LNtWvFbOhCyeRBatosI1<(1%P&$;J8yXPZ_iwJs_h
z&YOKYeqQO6-5H^^kpUrSF4CBHVR%6Wx`3Yz`7lm&?^)UT=6pwokwp_~M()p3z8ufO
zbh(Yn7k2x0ZDvF->e%H7U{zQ?w9o+`^@r6GxE1K2GKY@t;G>6Nw34d!`z|v0^bIT&
z^-TYopnB1s8yD-Ld89H8(ol+OR?6xp2Q41B^E5r|i_3)_a-k^Dh2?1npYU>JjTvg4
z4DRiXd^>ZV_KSJgO8n@vPALh^;>4@EWYDXnv|BuMI-A$hgErrStKtSx)w7V=-cJ$U
z{>x}owVUvZ<KeSjEHIx-B}L70_zpeUnk+8r_3b9si#1_qn<QE6&J}cEcXPgAX*1m0
zeasw$TPHE(WRw){5K^_ZcZI1w2J@9Mt7L5pUqRC?7sJaO&k+9-hfP%Mf?XL4XsjcW
z5xRlN;@%+bZ|CXY=@f8@j*1*{9G|O_1We6L>tED4n=BZ189}Dxt4DQ08_!&(r7CY3
z$XIC^PG<#ff_u?J52l?Xjux#wHi8GFUND|)-osJvMxF!luw#CF5ZAe4OF#S&`z&<C
zqlhk%xd>ZuleFO~$`bdJgS*BS6*PBNyD`IEAw7qM8TvTBT+q_LOT2w#ZroB_T)h(9
zF8&od=3gp9f^o1-al$)0Hgx5hDF;sBB#*kRqLo+ig-|-v)-88!#KC<Z^H!ca*;S=|
z5hg^y-uiNp%Z2QLGHbP&UKX^W>aTWpLOO(%JiAt`pTA51hPcx;>QG*uW%l>Gm>ftL
zs*NZ}#$B|kR737b%)&{H0L9V$xkXg$?2s#ZGf51DR}iOg%CZ}QB4Wg!U6FK?`bJTe
zpyPWDo+U`nky$=ZrbrKy=0Abc!wPk;Vm{YAS#BLfOgVlSbuE~Draw2noK?B-p|rf2
zd!>#3;}fSfM3oPqDQ9(-FiXre;05$@LdPSX##Ynl;3-wFc^TTo1U<`&j9k~ndhuaF
z>xaF`5BIXAE~$eKI67{Urmn2a;mH%Rw2i|o8Ayr;9Y+?{Y9c(C>UAfugPj}<oN;dk
z7|}AVg{}?9V(&3*o%y2ZIjWHnOoRL0R`cD=`(zaH16DQN^k0YBZEdTeA^5OL)Qj--
zxRwP^VY#|3RH$ox&9#=osxRNB)JogFQXc!=iK~-8SNUYP=JOP;*GZphX8UX*pJ)*^
z6$E7xjLX47{W7iifG~(m!S0}U_>9zvf(J#7BjvLdrdP?$TRz-LsbDEZGn<?iDni@$
z=P5eYr>v~m4#0{R0!~@7tpLoI33}2{CG7onD?On#Ybd6PUci`OmkXgpOC+_svSy26
z4jhO!o9D9ux@;l>=l*J-cHg7+v8~v+-QIW{7$LVGlLCMf{<Htn3(%{!aC`UM#eCk^
zP&0gydc)WPZldup#=ERA?PS!m^f4IST{LZ^#l^fA$X!)_k2~4<I^xQLM*W#IlOAMV
z&U$PIXTgwYM|jUi;7DDR?GD0+9Te<Oac6uf;R^v->tbfovLRbnLKh?`IrCXOaRoK#
zMa)Qlw^`0mAw?j>-d8hSF@y#2^!zDuyGrdzGu;iF(>E-9rY{%oN}elvdi)NF;7*w}
zbeZ19qA$%fqw|1HRvR5nc%dRF)-losZ1~nJaPwbYsd=#2SWeNc4nLuIp=O<<g__P%
zV#v{<93tSlowM~#Cwg-;Dx|Pjw2{R!glQ-h@c!a!7;5?W_V<c=U0a}g+Z4YlFmKHB
zUk+?#{`?yh`N9hvA17%o&sU3V9TwYa1xn;ems=Rak>@UNwi^gPwByNWT0o6<SDw=j
zKnV7#<*tPrN(cQ&88KH5v>Eee(73<NFQL1Po3G+RSlez&BP|PdsE^naB5<<D!|u(1
zpWP2F^345Zxk>cnVJ1fHOsaM9V4ry5+K<7jKIF>E^(yzDe{d@<;*;I-;Y(r#&rQlc
z!*T81%V4cgVx!+_C&9uJp2$=B7lZQ-k%2#*d`M9H;fFOVxJ0ColQN8Qh|}e{ty)3N
z{QSHjG>)!=aUdY2=28^R>NXm77$8w?0Qi3c@GLH5UOd~)`_l-#d7>+`BCt2uP*jz5
zj>HEoLUpS4Bi3~E_BYuT(Z9NXmPOEohh=NMC@|mlVjei|^1$0@I1C}~Q2@dZ|5~-Y
z1?zl5ch_#*@Gx_m-00{jkU+SExFZ+P<U3d$Fkzr|q2ijqK}~T=xg31*0z*^4LTen@
zve5w2jpwiEmGdW9ujac*P&8tAM`I^Fgj4k2<!b9Rz?yg$Y^U0J_m1SdCD~Ni{QdhC
zAJLbUKA}gm2bfV+!qwv85Fv(vLdTnsDNC2z$4?0xrSTns`ME6(Fv)n^Cw0q!Lg?B(
z`ZlF9E7J0GIeRj&480r9e||eVy>`&ORBUoVa;X%pJ?4cPg!iZ`J~?=HD{)Cyz2Wdv
zqW)6Tj#X-d$LVvFKfQVu`Sr6g<{WbV7d{uk=xg{A!m`@IWt!Qss8<x%Qy5-~r;&Aq
zj+be1sbB+LIWGn{DRpdA0nuu5VlZPbbAeRvFIdA-W(f!>st;a6L=`tk8`0)mH!Qj+
z21n8CU}t9v$nL|+%)4d!qeR}=>O)<bD;77gnX{ONyBlBl(;T^6MPcPzKZV*F40?kt
z1y_=mQnpy@2fL-dkv*k~C@m>4i*%1(7Kyxg<aC|{Zf5!TAfjntH--P)EfESH0XWf{
z<Ku}Tvul1^-G8i*f6h76s)RHdSqH|?>o#C)640OQ1DNZD$8Vc=aEt0xZ(SC8_9=v0
zlopNN6-5XEKPyTmZx>%6?=0>4y$981MjS~V6P?gOx`jHJ^`-C_vmGc4@$28iE{NFF
zFDuoV7)<+4r^mLUoWu{FKwR-nwXqdGUZ-KD4pSYinSKNb(U|mIi_Y`i$V|F{+_!r;
zou^kit(9B#;tLS-M_XlRlk58zEJkY&6v^lJmy<_lSs&>`^AVN8EU`eH6x4ZXOE)#*
z)@}vWWCPO+MLw>al5a-vexg9(qTQlJ($M3E=<`79taHoG*9R$K`PzTWHF}?eY<_Hz
zwY73KaYD{yM+b^&$(fh_6NFeYl@l*`=sH`!O>!g?g2art@dV9|=4YT3vw-iI&!wy*
zI^B59v3bG>@my49!*n7YPQJ+RFm<oHUO073Z9XK`Dj;)y9GZ9W=y3SgguSOz?aK$J
zWYlt$JYf(yEl(t_0^q6MyD5&~9$&g>b8B~=z4rULzgsGd@SIyWd~g0$YwF_2eo|)W
z6i&x7)6q`OI3OSaQuQ=yL`?xf(Mlq}cuAdm``(#U;v}=<yU2BlG^+rC>LalvMg4CJ
z&ep7u|3ho7)wM6XQVPLWegx300>$h`&;^Bwjh;{ohJjr61qC&@>t9!wl7+v&8Et)&
zb$(8?(vnV{9oe$ucs>qXniH~Pm+ggV@AJRgPRHXYw5^S{p=Wf6h;;vir48n?Ba@zD
z!M!o}{_6NvIjWJ=JXDsqRMfc>bhZ2$E|2p_y=4*<M#}q_@7_XipY3ZBq3~m)$>=q<
zYUMoqkIQJe!+k|)$<0iXYS%WF62~0;$8lR|Mex+fQS(M)GJlc&9Q!bIJ#-Cm(_$jD
z*J<rQFn2@!Bi%n@X+`yqhUNwA>$8=-X=UTfJ_mIO<twmo&S^+ck`e(S(bl@;U*ZS*
zDE!$6f53u!+5w#8csjp;^Kbcsv-^Xi8ciuXy?^p`6khd>W;NSy#pX!@&$HX&%@=AX
zEH21VOl#0JHkqO82LR#1{elmpBsEIPQtBLpxSoo5pLTv&xM(ax<VM!-W>c>bwBXAn
zPrR?EdrkaAub~*mcHH22G&catd<IoG^8H*ipB>FyBPYJ>Tp+t*j27(ca?Ckv`5M3D
z@*r~y?Q#CRMq-Lqs>@JLAAShQXP7y&Otp<5eCtu((hk#hdk%`ZKS%6|L-GZwsZ+(;
zV54%BdT71%zdtgk3M1m`HrnOI<~?@UIz>)9s4%`-+tXh~NR=eF?;^=5PeFH6@!V0t
z=7`Vw`lY54hNjgVWgj4Ko|*O2e)`746MCvl%PJ<gVn`#1MenCb49q$N<z_VCUlY1W
zjvGKRGs2=0OR{{yf;j~=2R;C}_%G{dPOjcN(Q#CLUn>G6YTf}Ay-rG3FqHw#?OAvn
zC0XOEMozBQJvxj5AyfhD!x1;TbZ-}o4FoZJDCX))nRw|r+khXX97c*u?AD#;Ns#pi
zTJ=-txlnmt7tGk{J7a_sOHUrd#i<c#W8s;~NzWOE^c5`{_8uwry_?jshq@Y-UDog9
zd&$qckahayPq#!IYO_|e-liSEc$a8ODKm4sLLQy;YL=VLQY|EZiuA`Z*;8Hq_I1pZ
z?~0L{3?F!>X;-!E^$kf8p9Ma;-K&)}d&v6NScC`CqHMHMDevaV+C-gxv)KzvO{1ro
zo%Up?2*e`N@<?bi!zfM?ameIf=J-r^{`IZ-UoRw|U;cBA9=GH1H+(`Z_ioxTNNQGM
zeu{Jlk+r>y`fb=F6h6zz#SZ3rd19I31VxezrC?u_4S|j=boVHz=M9LqZ`5Q4z&K0z
zschR&(`7OjRiNP*d$Pz1M7g+6gjiT$4tdY_!y;uwm+ISEwQgJ;JU;q=ol65&M(-{N
zQ5kvFGMEo^vT@=FAC^NgL_pTUhSDvTfz;suf}O;5O=h%rVg`jC8Bv6p;wE)QS<b@k
zY3+vhX_en~4O<ZF7mBe?32MrvpvL&^h)MtJ1u+W0lfKihyK<Wd#ncC;`I`@Cd0m^S
zGg<?N;BT^WwUy-}ig>B-Ugv*tZ|8e2k@(8R+DMA3shPD+MyQA{*shA5>i`r=ADoS#
zw8J}kUh$BiUO;W3`6NTG=dp>QIP7qo?dM=><^=w**YGUv7VoU(^IB#{p7+KJ3gwb~
zdduZM(>Qb9fjZt3<#N?!g&sBv3544FDiRb43O~-rn8yK%aiZRT<MHQcE}tx%@6M%_
z)q4s(ZI3i03fR`n`5_rCM1SiLlPtz`t|AB_(ei8oLhenGQQ82Y{^+SWLfb%u(tGH;
z*-?)XV5A?&EgOK%cWv%mQQTr1U>x?ycqsqz$C1}hCe9qhL`8O!%4Z#3y^b2;t*e}0
z5`I6^)GH@u57q{5sc$>jyJy~?prEwD0Z%s1jc3fShaZpk)WPQE->VR(g6=8$&^L}8
zHH;R10nLB*rZWZCG;`e(!lVfzN`3!pS%h^|d?=QTkc$^P=$=2S*c7P(0s-Ie;F)2r
z4+i_I7mAW=qv?adZI0m$64Y(Bf!vIRdaLlmH=R=A{@Oy*?%Q99Sh8RcuxiK^{ahpQ
z@D@BSLHH0kGPE3{d6cLgP|I>|#Zey=L*w6?>JrJH2=blfb^9po{#X!SX=K&JZ-M=J
zY2b<Q#>2Ooyxf(c(=YI~zN3)3Qnk?uQq9r;r%ogaOIzc?t)*^Wuw`o$v<EI1ae^?l
zZe1%gZIRsQBYgo~CS#};+$6C$XRy35?Ff+?``??mpi=Sn)6@gavEm4nDik9P0%OVI
zd*Zk^i=wz}<lzqV?+QPSPVQzdQzB~CnE+dG?>E8&`Xtjqr1vLqLjhACt&@XA_fU)9
zdGbHm{ra*v_I8qgwdD(O)J2D)jB-*a=(c)MGTF?esJ&iI5|myGk*DnRE{tvGJoNyE
zKBfK1Hjp~nxY$b$IdVLAdXj6lX9=6>5V~{{czUCkh2{vRG7+677Y0WbpbF9@Hn<h(
z82P=DioWH1aUbT#t|rkHAQU+hRc2GHQV0<;mk(CDR_i}fQBDPOT^bFYcPP&lkR}r7
zXhAV9+*X}_-^(S!I{dy<WFCNXc<uXp2|<a}n9U95^@avg8C+42i1@pYjiu?F4;u+b
z=S{MZdR;}{`a1?xNS0HyN{&-g9t)RQT{5(xt+xnnKNH4mBotO#k$z9E0IPd+DcUAS
z6^bEP*a`u}t1>qQk~>38lr|iAp87{^$yI2b{xjITl-*qfN*!txCnge3qqFlY<(L?N
z?CLfDpgr#b8#nZB8gm{wS|J%&i=?C$rv`x&gM_ba&)qOT%y|8|ax(LS(I@Y9n`bp8
z1ZdhvZbpDrCTnwF%|{jPOI_O5D2<|%@YLvoxbbmnc1iu1$h(x-4N}dPQUYd6vJRgt
z!BCf^7|6Yvr<(C5Z~2}+dH`sGT{6Y(x;qK+lA`MODfmjQXL7`3Dkiy3Ve`T@m)syd
z(i^NkkAx`DFD~F|XcN#(iB-GI6<Su5<u6Bfbtk`}lPA%*5`5&8#YG<Aq|D1)q@v6y
z*h|Z%u2>6^%UF^vYn!nb&V-?nY#@2GsFFei(Ah0;dicxS6c!h{1_G8pQ30^#olP%r
z8Vkxc18(fc=lasFW-K=?Nr*>>Vk%yU)aWYM@$Y@t^g<P7x$&ER&ShqL%?eXTTw{x|
zdrQz8m!-QTeiAUb&wQrfaJD<U+>6^OqTvFWE627has}X#b2aYXr|G<oRC+fhZ`H%l
zb+Mj5E}-YLg+Sx(hAz!b!sbuY2VwKoK5;XCtng9lPlAAac}`XcrXa%=U#XhBvF1GF
zSe&n1d~O-iMXM28g*`wbIl@Bq==0~Q0B-M9zHkQ{T1YrvzKHNaW1NA|yL+t-PA)bh
zyQI9)Dwid{j@ySiW`QWw+reiDvM$$oIR_LH{OVeN(Z`YO`UP&sOUZc4E^)e$4(}sD
z!)Bs3sr60#jvtpVkGBcOGioI{b4<Z%$UEiBz9|eWcD-Ai2cbs1BtVYJkhcQYQLG<9
zg35Sz!#(UA?z=f+q5zj#maV^Fb47Z};<drr#zWhMUhA+Mr)g@sXj3VxTcCkj84j-z
z$GA~9-&AMuJaE57J$?9fWLNY_slW%H`|xB?g_Tn?Gn^I+`>cY(deo(VI~Loz0T>N4
ziJg5@SnUY8(8#`~iodRTR;6TI!YXn)H5stb5?Fn3)(BzcDD!$}EX@)<3Xx)^#Ec4D
z+Uo5;%^a15P+V<kjA7r-&VQ!*#^YGtMINCR|7)o!X1BfF!ru-Wm(o4UiW($3Kc1O%
zr^ZpznxI*<Hk`v+7kTgf;1)ws5Zh2PMU$|o`L~zNH97vv5#}B-ypu;YSbh<+_vOFB
zwDDI>0hEwu_LtRVGPd$`v-|X)lA>ooF)@lx+M~?=`(YODYROn>t`bKbNt+E(C{~3T
zt`j~k+2U$7va}3~)*0g(5ba#OXnNClU1J~ymMlXda&P_3p%^=P{LXqK`g-<%*tzTT
zcT7czJ4Z6#Hx+<WDXM3~i6}z37>aP=&VaYlFxCTCTs%Tupw78fLtvi#@p0IrP?>lm
zpGbb%l>XAWo615=Xk;_X>v#TVD$zS$W`XrC+NVOnk`I+PI?d+v-z>36G2f(KY|H}~
zPp1M@R9gl?c3hkY2^P$Bmb^@@I{fhabg9F8=bO%crpa45Y<V|jcCaK1EVc$?64++=
zE6Pf;^#AI#%5df!ftdg#+@pMcM)D^tvwx|{YS6&v2fhO3`g_2C>d*5T{vxB2RB^ZD
z1(27Z9X}afmF+BJDY{=qA7~q`Mvog(U!i@tm6O1>zHlC@f!tfuHU9J6;tGfWR$Hi!
z4|Ml?WITxN=_B9Xf}&2*<8NIxI@qfMt+S64U%h>2W+rE!x&ZQl!Af`SX&JxxykVlC
ziCyz2t4hQS`U;KP_N~mETp^(Bnq&vXkmP~Mq}tJnoIIkoI5T6()Jkgp^CQhAgluW1
z)YVQyQIv&ld^zCTzZ?8SB{a_Pcm(Xu2svn^=i2nUDb&`W_8?jG*)zN5Bqo2Py@!j6
zs^~9V-b7x2LG)-M{KoC>BLd3cqOJI;6a$TfOLEc(@q8cq{_UvNxO-ArZ*!<VXa!@e
zrUXMXtMmLv6mAClmmM#;^%ocSKBNd_EoHWO^(|5`_=)eyIsGJ<v<~mSitMof+kcY-
zmgWvGusw3Xgn<(52O~hu{gP_{C2A3{RN#UAmLV_N1Y&)D*ltGfYDd25`cp&E<K1&4
z2_+>k)-M`x%TlHjB8&DBi=tRuC|ip)*EjP%uYy6BeH4^e74VLde)ZpwcX32O>}>?~
z(>Xb}$+XR?Mj!V1Yvs45_+5R$m?U`hX0Mdjx4yh`@;FDZ3ydpAN#eKgg07LF_t&-t
zhBp7!^Qd8ONQ*c@fEuU+nC|+BD<?^vupA}5fDR^sn@HFx)mcwI^Li(YAc9>K892w|
zu%XOf27K7{aWy-kc)dH;pLudS%S~H3)x~T4O)ELMm|XEf3M)0OJ29O468)=F8}|=w
zTLY%Ph>-neZ8mIpo-6Lc2zG}1lmjw<Cr-0LNkhb%i4Y|6Lsp$q+$I+tFMTBT=z$Q%
zpw1>v?cn)p-FNtVjIAcKI-!yx>&;XQu<N4ppAuL$!L?v5EwP4P2?cfs6!r@dywhK&
z0c_8a^l(X<s_f|+y0V*U{{oo9`~gY1pv01C=zFXttl>$OeF$6?x2D)Gvu=bw2OA<s
z)mEr`nuHZLGd^u05f7VJA&65zsI}&xhn>5Zw7X{q_c;+h)SyIHD08FN<1DfPn0G}5
ztbdH_Sm;C}mIJ?B_nv9<Uy+P=IpT%v-2-8~e~X%u@gE;+D+ex$Kve+NS5vMxUWtW3
z{Jei3`=q%@zACR_n{hr$S-BEql0WUBu5XqJ4KHJaCcZUCe{7}I;d}4J!w30`0s_g}
z=y9N+yw(e<-&f&>1CF;5m|MkvQko$z=-|(-1pgc%9qAF|$?+*~<BN<*79VwL6k%;C
z?|&)wtr}d!7`caWDRK-7C7pj$UW(rS+lb#9wboKBNV>1{17E-{!ctek_P`&gh17}o
zu5?hs+$tZ6Qf1S$DS8Omb8`%0`x<`^QFyrmPrhL__N?jFE~zYE1(}uaU0v4z==Tq$
zR4!aNjG%*AwS;Ypf7Mn<QNEA6n#IbyP89@7XYF&uf-Xm1{}eH4CFrTfYG#2WKg;>%
zl_o`aDAzm8d34tQbeHYysDBt5Ng}tu=~ERHaq!N_wDJU6$(2?4L*D#zH#QW~76m7J
zqs|_AgnN&?ExU%D3Zqy_{o0IZ+A1nIJKD%_zv|hU!^<zHU~mZq1WtimNz=xlD<_ea
z*!JNn4JAp~GEN&SNe?C94_S|xAT}0-v)Yk{rPDSrww+`7>2s79uC*9I*Tb&&-fDBH
z(}6|d3~YbXrNE4W;6b+fWihV8#{2cIUVAjSE!c}Dx~q2(yVq}*WS3xMx3m9U4`A$=
zJ$b_Q2iBtXSs%-lRqn2C)AC>;2?`i0{*FHG7-@*IY|MJvLw%DdWwQRH7?8W(28C@<
zhJ13u=DA`?hU&vA^D0fcIBfo2J&|YRc4-2XO?{L0{aP>pf&IRsTOmR@hy98;RGQp?
zWgm*|5hdQFN9CE+ONf00C@V(x$buP^B?+oXf%Ki}eh}qJgNA$7NJF>x<>Bw-(54G~
zgX599PCt51*%lc3SgUUn)<Rt*1YFD-HVM<!)NQ&%L`P?r^SCo)cbaw;0t2|W?>Tl#
zCH}h)5`Twe{pSyw0TTn=Oa=F@gf}S!5v6*}ak33O<VwKmG^H0;O>=j0o`{%%);Tmj
z;c_5g$;!~Q#m8_T19{`N-hu;W>%$LUrMx+eqdj@gA1rh0x<JCcz3P)>)ahQKPOz~l
zD}KDI!0i$w7YPcKoRyX3@Fb(ef7nBP68(3UW5bqAm0RifjrSX$Ic72%%R&e3TMTgM
z`E^08jl6PNbq37CE$bg<PQQ{=I8+_~p6A;VE+?d>4Sc~<Y-<JizVFZQ!%4$6l!^B<
za#HqM`NHnNf`{^f4pSeM*8<>lwrWtLw#vH4|8D2RL%`EbnQ36BDMp6OT3-!bj;|^j
z@_qK<Qib8ce!LOZ6TC$#!29(_!P*DMwK<=RB+Hk(p7HHGf9_6ez;0N8LDG_-&aZ7F
zh?`e>nsQM;JgQ~siaxy8$qXzly1;5%)FeX@DKZR!74*o+cVP5?2~u>WAAl_8HO2Ss
z?v$y*Hk*n+A6Vha2kqI7U?_{RLcW_`2A4bt!W`smaa7^3UI*R=9Wcu#Wyjp($J_Ft
zA-^gq<||pJ3L#&LXfbOCDE|MRt_f1z)fbAc>;tq1idQ|TvRw!Cw0?1TO`V?yM_tk7
zqmiX1vlt44ovrHgb5OB5%tUL?H|MNBRYXfqsUwz}M09!S2gpx_^*id9%i3kk>&<?)
zZ^%x|l6KDMx*uc|otQU1CA;kD{=b2c+JVYu9^dFab@cOln`{PFD?efS>H5!gP%xLK
zTEM{e$YEPw!NFnN9+`o(_3T6zot;mBfdX$3G`_Q%VC14<1jPpkJ6Zjw(`%I|uw?)G
z$8jRmq$+nhS3BybC&8w7@Z*2q{DI`H5!e7P5Jvu3m(mM4e99xVmD?{+h6rf{d^!#>
z?bZhy29D)L!KJ}2YwV3_)jO%;cz@QW2ZdlyPziE^h~kGru@@J`hcY_b51~%Dk|fg8
zl_mO1n~DTjIaBCoXW9?MPzuH9^N{!ZN#~0?d<!LQNU(@w$2n&JrT=L3-}Y&O+xKrC
z<KB&RgT2i4fen-O|1ulKDrd6nwfS*Pi<F}h`q0fE5*|YA+YW!qP^z(^>k32YeaGN8
zhj!iiAtsFk9bsa@YY`cI{$O0iGso6ZESr-qssn0X4msoI1s8_GK~45Pha>dtn^(^G
zz}^*g)+gfjBuzpT{Gn+&<llw59$<diC9;NGH66>FgJox~Ho_@m%>#-L2RLHF^igKW
z@$Fz#nHk=qBz~Vt@yGNfmbR?eXZyWz(mLBEzP;NqsxGolB0nyL;O@%gAZ{_|7!_K&
znP*+p#^n8O@j97;eOFs&9kP2ap6%NbWO&^nbpu~Fmq;_Qh%O8UOly#iC10xYG~xWa
z8agJRqHSGVOpcrXTV%5+`unp5yo$y~vuTgp2-n!v`biB27t}BOjQcj|?D(~BS-M>d
z0D{qmQ^%QGP4T$QJc6`H=3CX-o3aV%wJOOp(;hFt_%0_xJm(+Sg70)excqkXrt^LO
z4k5kkq=-^ZwQY!d7C}UN;tZxYkYVlJfCrbVp#z6yX^NmE#hnS8_bZ&Rco*(b&{G>>
zzBlu#oChORR>EeU9WOy)iVjk(UAo|CXH21fE`AVR^sUkO@I<WT)b;IeOX$CwbiE=Z
z>#71ksz9!h*UW_@SRVXaX~2fH=*H~9)LBp8{)-CM5Ud>#bE$zV9cV@veyHuSOp3|~
zd-WZpQq7S(2&GBV`t`L4X&w23x+?!V)wwkw+%Jn#4XSXPL&*S{KOmeH<ZtBIXm=_A
z&-fn*)`vlm47l(=aGscE)c^_frF@gOl8zR;8>tWg;Y~6aV5fC9ULf9-#PY2}mIxDo
z80$L;-kB_sQOOAr53>=E^JK*k65y%I@TIMTMGdte;qh+Ox!bOfzU%9pEH}<(OV?g{
zvUmKyU>;9k4_|7lK2C;>-K(?73eb#^?z6^^B9Cc6i#24r%E7XA$s#;LTO_U5`r^D~
zcRmm<<CLi3Kr3TBmZ6(>IG~(5>5YLU>A4MnxrL!|rxf*nCx`&pzA8|%;LGZRHBk$p
z@$Y|>&aY7|BMc2#9rLrwNnZCs&m_ZJQl*xfJc!Q~9$oZG0hMg)4pwzJ0^`@%FEqdJ
zf9X7Z05;FwbM*Y)PThJm5CRdl{om%0f{0yU=_>#Cs(NMr=BC?2uh-oqqpUyVR{f^N
znRAmVLm#gBq=I@EmR-UU3%r2&c=NPkXd5f^N_NI~uC*MA0K4#Y8U^;=7?pay^-%Q$
zTMD_jJiwbX!}&JWo%6A3m}h?t0qN}znV-S&1foJ<kG3-XS|-}_hcze|KlksHf{Un?
z1RkHp=I=^YFj|DF&T4R+?J8Net`O--mDerLujFLDe15%N2b3fJxv>o&s17M#ZTLMq
z&iSi$R}xW6=Fq|#Y0BvAtK;fN_H0vM`v3F-D2|4z=XKVrDg^I+w5#>>p$LKEo0`q8
zc?{xO9I`#)K=@oTyS-4EtSpc8p2*|Iza&=dYk$5$jC!~6?=*dN(`2T~B_xM0Y=+}W
zd6GaCqP*$<Gjy0ZH{;ItW6{v#RQds#K%1yH9)<*a>fN3AZ#wDV#5u76kM1INeeA!B
ztHnCm>2;ZuehVZ(Y5w=npEx(fj|OLJeowk3uV}eGAv!I9!#`&F-l&#H+!8~l6b-bs
zPhZ6%H0GQ1q^2k$AUNSCc=xVsU4}K{uh7|EMdFLk7AVTy-ICAX*I645;lQrok^Vf-
z6V`#$p{R>0FXv(Se82Qm<pCZ5FOneugzFj&uqeCVZ&Qj)&FpR`r(f(O-OZ2}=dI{M
zdVjIm;1HtVuNd1|lYUaLENwX}Gwx+tSLN*UU`eg}z4`dMPb*lue+Rb0lx3#wD8m9c
zbh`O<6H;C+4`^oal7Q_jLD-Z1h)U$4Cw;kBW^&+7X?_J1iCuj#Y%)i6+uP8lEFSco
znT<SZumoL{+rVTn&Pq{!W>1I;(1y(~kzcbNft7b2S-*&O)w_Dv8U5~OF##7Y+|28(
zsz=kcjoCfbtKzzsB|yF)3=96*PW3Z3;IgG<jDO8k0eHRa#QK68@RUvxdkTksS8=bZ
z;Hn$<igh@z8hbFvK3&0r@$}{SH*W3MQ?^kJ`GO^bSZ9wF<K{zm)bNBU6@f|T=AFSO
z1URsa2?djs9E(14r;xu#J4AtY5LdwpbJG%^aew>8KQFIS+~TCKg5TCZ?yT@O^__vE
z2e+Nt@O<LlnJhRp@b!`~g;#$*8Cxllwf)q_gttyHnH<U`tqTu^qsJ#|^X@|?*xHb{
zK4_IKE7c9CofC1pW_Y&Go?l!^7s%lq-LnIWFi-AP|B*I9`U63U<x?uXF?VT#!ZDG^
z1dIUSWp2gg+kLF=yFq~3DN-Z8DJ#ke*>|rnN!%;2!Ayq)H{x22?`-JltjmGj#plCn
z-F{b#+^=hCOKa=djr&$WnS{cye4#;UGKDOHW(xPgY8#_V;~}#R%L#UBL<%pG#O}hC
z`w4&>)s&LBiX<6!v3uO^KQb0T2*l-^e7N#^)}9#}CRza}HiQk#%kjVFC_h{<bo&*t
z{EQ$L7gkgA^ES?xHe|Eqsz0UdmSBp+eMxzV)z`<3?}P5FHkS6q#DZ4=*D8)o`3JCJ
zBnF=;ST06y>Ah0B9KEj#4<!o3ixx5fDCuRwn`*3PzvYY3FG_ip@Zkrc--e`K`TG~e
z4YFSmHa@r5Ma!0FeXC*Pw7{*n$Marq#@YXsuZ6Qqea~BjGo(EZ9#1#-uz=;{m(CaD
z+kB;0LhuQpXf8mQ`K?yUxBXu_Eu@P!p;u~#=8*-B7gK%nz6$Rx=)Az|?YyMpYvniB
zNqA^N@N_@;@_@c7?N-X2`@a5z8Gdmdc<-OFBasv}pU=votI?p)A8>0Qj6Yw;q5H&p
zWF6fh8yV@4xj7`!(e-rWE>vLiJY=yPvyF5+npaVd{lmEf)s1F(`orbTEeq<tL1pZz
z#6T<Q$1S|4ymy##r=Gk|3*@Zi)Edg2l(Byu9g*EJj8o?Bj5)lzbn`Kto<^ol4{i^j
zTe9MmU2NsW59g=tcTWTVh*$o(z|+=D^eC2rm#sx{AhJF_Pu6qG<!aa<xg7@AE@diL
zzT<HSAq^u1=<lvP#6mlN9Ik1wR6+|{1~>C2UL&0YUslzwJyN&XQX{o$-R<L;YYT0w
zqpPp8q2nbG9Z6-F1nR;`j<-gO)k3fqy>M3+kcTy{Rm`Ck14m~Xx8COpsa8uCc+))#
z`hRHp%7D0<VA+KwxD$fAlVHK!-4Y-W+}+)s1osf!-QAW2HaNlET^5(%{`R}~-GBUA
z=FI8ouCA({BR}`ZhQv5C<*=rw?jDN;F#?1Vxv?P2(Ew#rv0mPf9>dY(PTOuA`9B1k
zeht7d4y8SSCDC&JbCs;SQ8IKex-8lCp~|>qJe^6hWi<(d`kqz5z@3{5`L$(lkd;lL
z9X<5xXzkaVLz?^wKB><aVlLz}eXGR|oOsIp`;mo=*!KfO70<+C`pxIN`(x%kFHz|L
z!;vssPMd?_C=7nI6!E|#H|IZyYxyXhUOWBvBQ}+e#@mig0CjPt@w<6sbsY+Sk)Uvl
zvT)T}@=l~aw)>;chDUA>^T~0Nc;cT<m#C?-zjOOpQ9`bexm!QVKqss9?MxI`{)%B^
zAlz&2scOk;qOU2SIueU)bo=T*i1*EtQVUE+`^MON`;2!(ya10YvMX8C&)=yXNPH9u
z1)P&y8%x%=Y-f926SBgytD85PXZW-IexpY9&DeFcwx+J+_Sm&ozc%rRbL|r2e#>+%
z(Qp{mS5i1dnDPf?-DzP*$-6kXMq49IlKt#?ggv7mGf!N1EWvovPQqZ;s!+Z9VFm}*
zuet08gg!Q0ClnxNvMZWy#MRW2kq>o(rtAIn(G=V78Y0d<4=?HnTIlfMMbsZ)Ts7fi
z7U~5#{Fx=>>l;v<P&4_eWcwzN*hsH0%n(t-Xd`h?5-my#z4NJ$q*p>~Ke9|Ngd9ni
zVALB`sdfA0sgI^UP$q_+9|>TAx};bsUSYpur}mK_Yiw+n6kzjlMG?cN!P;X#+Pm6Y
zDCvsvoPjp<uQGwYVLM0b7ba7(AX|NHx#*kKYbww;)xtmbzUFU0-;e)2Sg7yFdk)PO
z8;QFl?!v%SO?6j72p-@DuHYe?MTtoNY`qL4sP?0#FYNu@m<$WjAn9f*aV`9F%GgGl
zr){t__86#d4S)NDVNC&a;|=1n?`B;QM3H4omyCfv+qc~h{i8yQW24Bz*LN!5<{usy
zo`1LT$j}ISFBVo};4>cK!LaER`vs^JnVy9tJ<ASR8RiGfeoK)L$x*Un7^0$&b7}wJ
zFelwAl)MLDzR=U@a@Ci`N#c6-Czv<rQA-2VQ#3DR<>dA=<nr!s><-#r-k1)J4Z9!T
zz+9EeOBoy+Ti46f@ctxY0y*w1{P9kNb%9G0VlOnm4J~u)@2-!~C_b*Gt&RQrq^36_
ztebRY=DdAsyyNS3OAzwF09dwqakn>sE;Fvd<?+MaiwHE>4HXoA{HfGLl#VQpd(F4p
zVze#;;YES)$Z{grBmG#fuR3=@R6ht~KbYc)r-hE8rZGVCZD*B#laq}>N8=6^Zs*LV
z>@r&e|IVgntz=LVw>YBG#y7CwfwUab?zI@3Q-X!G2rQDaI@-DhabrATu@~5A)4Lda
z_DP~i6XY?<ZGI|vV!qi50C8b@z6$E5so9bRTOXnak!v=0#j946bIa;jhA}kn4<8<^
zNOtEF9>c{Ta53zUXEd#t2OWH{uoG!88A>Wt{AqY#$5W6<io9cYJmYz8yKuEgiyiPY
z&j3WT+R!4x_Y78IMD3PE%BBUw4w6!jBu4zJhNXahU;2_^Mz_Cixwxv^*tj1@EqA=E
z%b8XCaG{O*S#=jc1W+!xx!>N>@8j^e`S@r7h^j@at1mT?9PiD_Wyl@}6`9Nptru6y
zzTw5Re%ZKO)~=b$&}A%WSE(U^LsOWKG4Ny#oR!mURKZEgVxTZU-l)g#&7m(LNZ@PU
z--70`C&xnKXhs@e4Zvmzs}OfNl``@=pI1N8pa;Bt;f@f9Dm%Nlql<%K8?oChw?#)}
zR#xV#b@UZ6+S7CM(K-K}&{PhS(#TKjh$U+zjo&3SlfCaIgfD*fniu^nYiaGP;a=cd
z2>Vj+ZQ@9AW%&L|X`$OYLdSK1Tl5up`p2v4bLV!Y`SD<2^~|r3coQ6n3Px>C9}mDa
zdQcwyW(^&*UU^g(e@`9(?CEoJVCcp#a-GWMn|OFEt**{YCZ9|Jg%)R*3ID?lVgqIb
zuBFjKO9+S&(;PzC?D2vu3p4zqk`UG;TSQ)}l>vraTkDn%a67z!aWv*#Mt;woyd1t^
z@3Mb?Oo@=cj|58AOx0BiRBUX?03s&qs94i7GjyUfg%Z+qbCX|pSABIWJ1TgUz-mmd
z9q@O~{>ILV<725ko0o`RzPE@#|EQ>=zP*qBlBDe{uF~OwA1sP}5j($=R5mZ9G3Cbo
z1}=iiYGvu9zcf2&oji=roBX)o8=p`VH1Kt!3d#(kE#v0Ror0!By%FC~tNr3~z9ZeP
zRvpvd9VzPqgz*ESsFk;5T*mv1bHuTl+K8`xT*&>%NT~T++bXsbvV4g{9pgOFb9RGw
zvsfnNdvBL)jPs#Z!WB|~&<kC9!(@SdBa5fI;Qk|9SQHVPrx`qRV}%FbB7nbii9p}t
zY6$1nPZN^9Ej@niUDiTGjW9{el3ipuJ#FT>yPT9RRm*UMmd_Q|G>ULifzQ96CJq9+
z<d2sob%*)IuDc~IK4|;trdTQCy2USF-}ipg&CPf^na>#vCki7W^uj~$?rfKGO{B<Y
zYNmyLkd-1$zlcz)QFqYYPS4WK6jOI0e=IEKh>W_r640<8^~dNF1uU+)+C=DFrO`s^
z6;T>jmrhqo9TPBjPd;jMJ}O`mX2Qi-36F1`-VUh`G|mhCYv=%Yy=c51$fi;G*Yi<f
zp?LkB!tXt^@oH@+r*g=V$)NrFPG&hUx^iXqmA|6Dh|hYvMt+?va7^!|Rj{&o!t2$q
znaB$dlG*N>dj|aM0AHDj{0oUvn3bRhqqB`c!-d@EkOh%XAfC=}+&Hxg4)0Q7w0eT+
zcVv6Xp10E6W0va#VTvQ1Q}^KV=B^L~!huZ|yp1QNF>drOFHX$<JzuZUH6R}g_yTBh
zZ_&Hj80)F!U!EA4Z-{N@b<b$BFDx`KO`C2mJbyQ{W94qYuT$+kLY)G@gmXjRR4?0z
zt9akW0$|U_<G7)7Vng%+S`0V**16i8LI-XdW*Z3m(6Uv7ql+}hLA!z{^i4aC@q|59
zuLmmC{Mm3`ND-*W_X#P?#$U>}3a0_;%{UjO$;NKT>;lA6Q1~OEcf?W<Lcj;d5}7h?
z$C$8-Oz|14qlrkh2-<@T4Ue*R<86O7yTyNlj^r-3L@OUg1yMJN028}o{vb&@_IFa=
z0GB_67<s<_@^|q=D5+Vl_gf`9RS|q&|K*aU7b6OXNhD-zDqwyLAFuHz9}nuc=pSoU
zWQDWpKHbZ(Ti)M*>}nESmbRoqIp#7MFi{u{-d(iUu$BefyaSw=lr<wxeZXhGZDA9=
z$)A(@L8Q_7P!J4<iO$f!lg3U2F#}}xvMp#<x2GEv&Hjyw-ElZ$KkUT6rB`MtwjFqW
zAM;Qh-tj9dmwv#<!T{~F$0HEjI%qD4rJL>gKd02ZnPyRTsV{8^q5)W{n`WMw7Y@zi
zXw7k0Xn{`Q7do7|&ebSXUY1ntc0bE8j^>#<RuXJpTa*u@!@cLYh*B+I@NE&c<W)Ab
zZ!EU&oJh6wyn@}g@<)c8gB6$nge=$uv%I3j#?7Z>d#}rr7DUn>fEXP{cHfACI!x-@
z=Fs-P0lu$a1Og!a8$Ko7pJ%@yBC@k%EBTABqJ*Kd3jpL=>mv%O2HCl}xD*F=^(=Mk
zX88nhzuNeH&0JPm<fHmMQn~DMsR{4WoBDaB^k8i?nkR5LyDUll;pZg{P@x)ObN_0e
z+sI(R4ouGO7cHo|?DqFCCISN44+UTrY-RmHvwZmbbee0HaE>VEkCJyau9C;V?>HNW
z->KbY{9H}OK=8b>^eKsev&`-EU<3Z%W0KF(6`gw<5Bt@gapxv(ro}OGf2t^82W<kt
zXm|e>4fxXKVW%ouc?|Ib1`z>1SA|;?BJcc-L9gP=7TsU2neqI!7%e0{M6{F~S4;TF
zja?!wT==+ig~|TXboV=cz2G7C$)%6AQi7P>bb<-s$oou@+vRS&aDBa;-si^&;RG}_
zg7t9%c#UrJnFs$M1CsKNJ$%o=r2*ZihrV}xrdydg*{*~^dmWoo@&mi8C3Scu<3vf2
ze_^^3a@qFN%6plt#KvV}B0=O1qq#xxV$WF{>;@-X&MWe~zu^EFwY54(Mr53?9WJhC
z#b2H=*aK1M7ZATX2oo8-YCV9mYCW=a+89CFbg2#8umO)A$+2+jD(+g~1v6yAv&&2?
z;3byW(+zC)gaQbJyGZ@lZ0h@%@+bhg0}$Gf>nJ7yZKsYbKVy46?M_#XbWD6=b|rRI
zOX>wPTuR)>g#^5JXFwfIL3mZE9itH4_?33dd$GJ$3I|5t+}rMdStdF>b<}`lBj`n4
zu$af;ng6w&<4Qo#XQTLY$4G1tnbJh4tlvzl?&46Ij3GZhp;jWAc7gfe?N+|*Hsu`!
z{3u>S3tfqPNVR9c2NNI15gezs+T#a(`<6M7RSG}QO5{cm)I!`!PJzt!t%^iz-T26N
zgoZ#hpxAcsm2lL77CHxb`;l_F0(*<3ZbFLT#7Q?BoI8=z&tG{tww}ryKimE_a0&2`
zV{Nv78i10p<?tI#)0bBRcfXt)4+>zsea69xwICk_t8(aXydC*d97c^q1uWp_!d;*S
zX+@=?6C?jyQ<n1VJ)!5`;_!Z!!aD5N?<N`8cpBaHLc+mgrG@S*J1LhY?5@(RR;A!f
zCFRPbMvdY5e$@O3cfBBBIsionHLvxrxGXEP-g|;Kq9$**$&gl5z0XBxjL_Bl-T+Ml
z$$zBYm~;h2xW^NXf5G|+tWi<N=h27~dEaQfgSYw(!gcfI8t+TF@l2YKBbURPH@D%H
z6h$RN#I59c^DGz!-EFQd*Bg59F4te$_1nRzm+))du_gjsv5HQ!odw>=aww1M9(#@j
zt3Hi=dd%+zAL${k0WZ2N3RNGM%|1owI?2o6x)BhL#={w})8uR}5^N^Od;Nmp5Zcu>
zi_@em+3=!dK2?Re)32iI$=TuxFG!o8VjHW0SB0m`Wm{zQ_Wu30yr5;}m0R!9;q$c;
zbeQDN>hHSmVOF-F0*&Wa-4Mc4JY1gAg1eX8u_SBW?^`T<&wBXT9;yX0XjxOwX2%Wg
z&;z*|r*c}d0%la<W~IiNsx7kpPOU{Ad@+pa=@m)hvkG<&hZ?q^aBY24eWQT;GOR8l
zjEP9!o}i`hibws<^9PYVX@a0b4}i4N^^?KOokpKviy0LP=%ba%8Q9XYUl4VH>l!DW
zYnVS1gO^HGC(}gJ<@WA<xysb3lJ&~Fvhy3g)aod2y{F-Kq6LqbtwNPoMIqH>pE<~-
zL?vE0$G&b3j5S*7WLyqhKA&I;m?+VjAIo69o9UjMlx+C93yy<a3Eo`CAM^M_9}j5U
zu*N=B9QquN=OUqVe}Md+q_eNV@9}5YXurt(`YzS#6UDwZtN!-brnb|+jNd<xHGyuH
z6GRlGQ=};$xJZJ#IPW?a85-XrGI*NHeG5n5CFOO5LAu95=fgagalQB=s4Ah!!u;`!
z?s(LP{cDQ5rIXbzl4p9eqVd&0yer3L^D-t_ssz_s=hPHl{&0u=EmT3MUf#vvl}X$X
z`8yL@)?%F=IEQN#!k3e~7L4DCnHOC`e~L7;S)N^b`bcDcUOtCc{N$tL`xaV5Hd7jM
zz>Dnu#|Q~1<#n`MfyOqEo425?CvE3}L1z*dB&3VSp4;g_XQW+AMB&{vftk^@%yurk
zpor_XFqwCj<!lHpbdvOc2cm^m!z-Grg`S}>b(7g>)q8I<Vw2Bsb$n**YFXP2IiI@k
zVYDsSDZHBPVR3g4t_Nu9<VNZ4{bCtdQ|k&?74|8(>O!a4!2-w}SWRP2e%9owxti5C
zwkhb09w3-^A6a=2#&!UF*=pNUouMT%+e}ga=qg}~HXZ$GK10#w3<HcU0#L6~g;a|k
z3A{xh(4c^#(;kpueZ`#cy7R&Bf%m^|=waQ?ZWuj-cv1>w61F3_jfLq3HAo4gQ84d4
zeRHl_oklNsyW;qojE?L`U>pH^>zhDH^S(G8<lg@w!<pt<`aqe^R%U|!;%z1|i}S(^
zYARWy`13Bvb7ZACjgS2u1lmH+H36Ln{hAD}^=hcQl(RWwkp*EAq2?tQ_x#DmC%DV0
zKi6O5i0q?80d;`jy9@^fkr!xnT^ydO=u5=`M&;rJ@?}ZS-G~X*#+trcTFHVcOD(d!
zV4>iW+FQ>oH9n-#_>5HK4WV*xhkh|Z^U05T3CT5rDz#;LqAe6+6E?7|!+y&<Zpy~u
z0uPEXxplftsNB!J2T1>>M{cE#>~dia++Aow_-#bXeMc_&K<)Wyxk}y_EzGlX-n%S<
zOny>-&~tCx_o%^3Hve0rZc|bg+7RbKq+$TSx+PCsu2_t3VJ_aeT9!!X3*C>LlT8L4
zveK?Q8uoxy7ppe<)BR8sp%SoyaFw7)ZQ0co1;DLY)Vz`te`||1_2e-nrwm-Yg6}JW
zHe0L=#D3*g)3iw>icj5xB6Jt>Tg!L0dzN3I_@rq)H<-jaPGCpElGh#1A1{x8Z%?j+
zUPuMHNA%EwcP&@A-djZfD$}>0!CZ*K;bjx?8ht;{|HdWrk}u$<$+~Ch+{3Oi7<Ea$
z#YVnPPI7OD9>=k*|DBKR`VgjjqPpZ_kF&*~&$jf?R#GQa4oz8!-qO;7=Og9%JgS_#
zNj+N_XB${5EQXadySfrl9)E}|v$zY+asJ{dMC~jWa#qnOXsD^ba%8zp6sh8OOLV=f
zFkYRzyX&?{DlIaCT$^b4si<O<^A1Rew`Ujkz{g(LE3F%M7%_Y-pu+sj3aR~WJxz`Z
zJVi&ynJ3c~^6$FbZizZ%@>Nf-W-*w2NXqV>#7|9i?=YFL1dIW`_;}={!0@+tYxWRD
zdMOJ#Y*|7$U!L;B?e-#&Ax7S%UZ}|kYuweIA|UtePPDT)MMhTSlrTjX*0Atq5Nkqp
zdvTJxI_UEiR$-QM_MfzD{&uJC-+8zIoHj{)Xa^x9th?Fg;VE=mYa;?}N43T^f5Qsq
zn0$O+Vtc$cUa<lMnJ6Hvm7M!fNEsrD^DB+Ru@l8Gcm;emfGTu)_fXE|_gf0y5dHnr
zF(W-K*8@x?2;<Xd|DcrCxH&+GR7imo;<EM_2+qtxV(H_Ok96Bq$`J9EVn%KDjcT0s
zYZgVEWXbSO*bZM&S#Qx)mqQ6HsjX4rz5l?j0zYpvrVN$5$6(9an<3FZNvS1U!3%q9
z(G-|n-k$I?^ZNli6~{3wIBx$PKzs=|iSKOJJRTkg2g#{s4Bx_?lQI|>6_uBDl}!>t
z13pSMz~D<qonRhTSgI@ZQ`(10E4@_8VSZgAOgYRmK<F-OZEE^##>hK^x(XINL>w;%
z4Nhb5l7m9<82#9A;py&aZitnN#tOks&%Xd^Pb*X=hv%vQ1W1oyyJQVZ|7NY{e^4ye
znC_Ru><bjYlNpPaoz_Y!nfJz@5SSCEMK_RLv>zFsuJDQ1+A*tS>kW~8wYn|ruDD+?
zXcyNQsfuDP4jr5=X!%EfB`5t!4LxL<b(6CKT{D*}U@ecwiX{o|Gm+)A4U3*jjRZQD
z_TAcN6fLTsNGV1^DE~&|<;c}+9n#gF$pH4G%6i=<@gIu<)lKD4%6Ddaq+zs2C&JIG
z48;-(r-1bhyypEjzuqzfI8p7z4?QP|qw(%zE7>kA92td&l`pV%X7vLyLJN@Z>62ra
z&ec4kn<m*ALIT$dAhJ)quk=(Si<j;1D1j}O94)&1q-k-#K{z@!n9q1Uq`oWWh{E3I
zd8?wWe@|>e(USn4ko24{Og3RQ&o^mrS8w|EKbRWgTv`}OqDg@xy6CLta<}N9?Xw(O
zc4>$q;Ti7A*Zrx}j3-FT?I-@nfbMe<_*M*k>TMCN+4PZs0?rbtIq&7Tc-2n9BTK;B
zfQ8ArM#zQ!_=GRjSI7H^zJ4V-&53&YVpb*tp(fex<6HlH{!fX3qR0*&=4-|)|KzmG
zx^4kiPZ)}4b!K9ulB%emE7DJL1+Y&~pS{DT&qv*|bBUX?XJfrjT`$AcDvi`tg}?8*
z;%7&`Mn>ZP^RH{?VTr6qlo`i6mu3>k^<vaKP=~9tpmM0nUdQVdv$wO5H^cW}p3Q+`
zjN;nI>m9}~TdFQFHbt5!hYc(BEPV!^9_+^Ki(a13;CJ!L>5XCnVc3!3{9CLA$-k?0
zT;<2%g3w&1;Z{u@skzQAC7H^eBF%pAEI1$e23quZ_^Na3*2kcIoR1lwAxmBP%=l7?
zyfkIBJGe>seHykg#mhiNBd)GG%u%dnQk%wJmi;I0pR{4ze;4r_ntt3;V3F%{w57Iq
zN%bTktSKiZUD1n}2<b^KiW-lHoa;YNo}Vu4BI7WOPWP?h>2Pl+>bTmD&py_`O|JYy
zSp5eCzAYH5Z8@wt(+N;BGCtPdFe#m}KEya$VK9G)cr&~ZL*wns0O{1%kE_YvjjRV|
z26KO1)ys0SnH&0=(fdz?e|2zfSYbmJkZmozI-t24yXDJ_ql*`L0He%Jw>;&}{`Pg>
zE;Kz@J%dZhN86wH(S#wWIEIMw7@*X!z?%fU>UTRGRrr!uI#&Z&aQ*k`AC2jP$5Y?4
z!kMb?ChaSWra8MF4xE%3_!1~GEX0o^9u)kRWI1tFmNqySurD3cL@MvCbMGBQpt^Lp
zmy*Q1b50fZRb_#YWMDPEG_qTe>55$A_<xO*f)!|8rCSK{u=f=fFyhdeW-QRFXSFnU
zto<&Yz$R81Iq_G~{A$jB!3>{<Q%{*0_yw{Jqvb@V$-jT5dgi$viXfvmBYuqu^Y&OI
zVDDOYiTI&&Wg(4DXgr^C;PFu7j(oY?Tt__534EKokW+L?_N^zEw4~5>er#mln%c&f
zq=?c}qeYXST-)5d{f>M})He8Kpk}pQ^?V}x>6*f2Uqtv_0<j`h*f*Er52(eZ`k``;
zoE)%5%;4>_=%I?)aN$nkA4m9mTCbR9OuY9_jkkF%W#@eV=LOI!bSQgUfR)I7AgaKg
zee2{h<({xZrQ68O>Wi8DDOdI%uQ<{(VTS5Bg3BcWM8STk(QeU(PsioI+J<Rq#TUjO
zU7<LGO)erqPZ&n}XRGgWq2vCKhC5K<o6Rt9RsAf_K|{{dpG+q-y+bgz(4eo+h4hlP
zTqZJ%a3P%3dcCOgf%v6v=U0zktBK+VF5j<!O{gwr^KC}(&p$H?^ZEx5m>MJVvE-<e
zPMONfnTR;Uz95zZ8DWEW*!7lnfRf`ScBjJi2q7uVyPVk_kbgMQ_Y*(N)f0*g&y(ne
zYS~ou^fDTrE&YGwZrQ7fur3K}bENOu9P!K2nG$TdrJ_jp079gQdrHo1fI1zzMljGk
z77v$%OgyV3?Q<k4SaYZzKscMe<E$>1kCC@5El6Uaawd3A9XXVuLkp7?y%AHiGUCx+
zCw*dZ@6EN~6(y`+AtSF%O@{E*4*Nfrlrm!#7*x6uA&O^GrLtl~3t!t7s^Pb~9Jv=t
zUSwV6<Rf9VD|fW}BG)K@-7Mc}1^)_Tw2iHN9h4xnLF>&CfYgKG!SMMdnFA4#hg@4^
zxBaLBM1c-EG>Xij{E-TSAq|9Nyfbhj6p#l>uFjjNHmaZ!*zoDsFu50p#<(Hf(U6Q6
zt>YM)cq%C`X0dSx>hz&oJ85^BJp{mMsLXe{ak#pzJNXcYuN{XSm?_m19mFw;6PQiE
zvv~b9Q+sw$1oBG4$;bj)^;S=#depL~XgS{nECELGu7|?AUAu-TxZf|PkowDpy>!LW
z?3E9B9edt%-N^pN&_&-qu2TNP^2%Wx#KFMH`SN?aSi8H*`Z&;I@;Y>mSOTA%N?Bds
ztWcfLUvWA~>sV!6|FK4M@Vh`T%HS@yEjjf{<F~(?Oe}~}4%6$aPxhtu!ke0Q!x2P|
zvv0w5)nlVFI93(9&W8~6(4gUbw6I(Qj`dkmHMQf!y8x;nNpYG_BKk&7keQWaa~J#M
zFMhj$gkt8qNjS+@`#!i+JLz+WPf@9uFZ58Te7|iHEDO@rD~{ic&#w%(_e<*-fU_WB
za@tDDC_Zg*o1@sjJKlerHtGFtQaTS#sruW@?|&mxG;!!oBMX0k%SA20i;YqE%?Gjj
z6t={&eDBAkM&Kup)~WAdM3LEfvd>+1|577b4LENJf)6_K6}g^_?O&bH(E*oNvK3f?
zUS`(wSun1pAfQUUFO~LyHNxKI%+8W0H(9a1T}V`Zd?#9aotY9>&7VPVKBK9%sBSto
zC`mhY_{S662``D|o)xJWq%oVCh@Bn*Bj%zwBX)hx`CrXWhNJ?VUN@GGP)e(uHcHOg
zZ|W#7eVXC+)SJ$uLQ7;XDler*Tkoe~Z`aUtE4b<9KuxgS5L+A@e{FoBnDnZA2)X*Y
z@_6%Bo~YZzV$T<X4{Q>j<ucl$`_$^WTd@e&?6|BQRpyEwTH5e+U3Nay;xxLlR19@E
zPEkq|WW5+w&x5UX62LlRa497`I@R2~^4g7<ySb@ej@|WNZCO*r*5^84ehee<3Rj<V
zwRf952zZ~kAt(ABEOdMxo{EX~f*f~2D?iEYdJ*R4rZ~-|+o`;=qlZUP-<AamlQY*_
z_>|u;UDR3JxyH7v_Mtt^Di+x?`D=%)vB|An$avV}>99|=ccb;3#S0EycTTFG69S}k
z>u;F6w*To=K-<UQ_G0=~xpHn*T3Dg1;hEh35Y!5+Dx4R};xPin%2l%&{BADwvYrpk
zWt%v&aI~f-hb25l4<wmR#p$=zb`>5+Z#froSJKODKu@DuQ$;@|cfl*$Nb~;Kh05Ax
z5i0!#D`bgYHpmjsEl8FRR?q=(xpu0U9CaW2E+Uvda<H<KC4MQA_bnjyIz5|de$5yG
zEIP#Qop@RR+5lmL{(7!$u>Y<Y{yRI6Xd+c;vT`>(5+yrandfEZVbzTR%IdE*VwyFk
zDiyp-bRG7qrvu0_?*2OqC?yxSz}YWJCgKKK;$RoE{giRhqb<UIgT+s7+{*DSF};1_
zN1YmQ3aJ{&IZc&?-aM;PH1B&7{b{7bW^-=#_!mFAAa2dSf=}7XB_?L@ZF5GZbBQRS
zcNE&cZ)UdXLJ^m9nw?T;4{DNk^?GBfW9#qzeq%GKdW3hWu-T-1rp<RLo4M{`17x}I
zd26kEIqPO$9(-AHbyNk2G&(1?vWajRO_wmQaTKGft(q7%r8Io@y{!f$%2#_g9EdcQ
zRjE#>Xt7_IwYlgp7b|(93B(g!iFdv9D~5x8U<ZXuHX3(XKIDu!6*JpFeq48q;{z@K
z9p%s2JO<Qcyrw8c%FANHIJR-3V3X|nB4T=%y4NG#)oGBz#EqPuWl_3=qUN{&0_i-d
ziUL(=8~~HVCpj?)1;k~oD)V0$Y|K%JiiPRI{c0tzW#Pw~K)O&yuVOXGxG}g)qI#nn
z+t^Xm?6L)~FlDvu3JqlU$h)vgy{}qTQpN8RCQ}`;9^{fqa*0^lf3#gzh#Y!2-^Yd5
z=`*wJHc7Bk{E7@1%;LS?H&_NnCH@leV5k@26bX<fV$O^(L~7!(Zngb{*R3Z+b^Ovh
z^3(4d?hQ;sIYT|Chc5T=@h^PSi}>~a=0RX7VMpsz{lwjmaXB^2OZnp;x(?-0W!d{y
z1p{ybD<|s~mZ5+ZZGwVku7BKBqO!7F6T+;<KS(>0b>Av)1J^BOrj(=ZWgrfL3_fQ)
zyqRVQX@>klRJPE3bEu(3pb9l{Ql2gJv}7mpQGk1f1BZaEv>}bMCe{;~IxK>BM%{zL
zIV;ceZ&~#`k=);}X2vh+hT6nZIf@lSgZ2QVVegmO1{Udjp3T~*ZNmL_d#0pc!aAjS
zubffq2OWDmXoT0_f;?q&s2@8n^8b0m%ixk!VzLlD=fX63j0RE5tuWeyoc$Y>EjO1*
zrmWrvl(iU;mn@}{6gWL+`YB=ufh;$R;x@LAS_ocNPC?Qx6+OX_|7}gLC$D85c4?BY
zagjS!k35uTs;WCoaZ=hQ|KZC^?fPA97iW|V=hY2mqgI2p^|V9v1bRUx5biCfS8?Jk
zhs)P9x5}tm@2Gz@dAMD1WA2F1`)pP4yUnC9gGse_)H%%*DYhkx!et7yWD@3XKp2W9
zQ)7-^k#yqVQS+C5FCis?a3<Pl<=jm~VTf>n4mds<v~rwwC^pj#3ee9I^y<$q)`l(`
zX4EO*y45N^?yhcAv#=S|c$&l)Bd&cclJDR~fbypB=&#C{(lUiB=e}XNnlIVa{rL$s
zke8uEV__ccCgB)qdH*g@r};|9=_j;>j*9xw(|sx`Kr7G>g~Jl~OdEs>(8+AlWtMNt
zf~-UlSjIMXn;HLr?PgJ}I^TJ>%9vjOOpV8che2p0`Q+O=Qp2oNL}sCdQGvuSldikQ
zxL2Bm?|(rv!dxj=U3U{%gFEk({Hf(-A+KGF*U3c#h0HFCstW#=A5Kp_Z(fm>*&p#t
zS%W>6($_7jz01D(FK+rBij9*c<@v^4FP?qkCvcWbAa;vSq(8-}>y37`fD9d!@Mpa5
zT_bt@0V6W@(QmzL=4X%}NZWt-$4!27<SOr<I9#(=o;+d5XLOjRL+3wX=se?${`)xo
z$*1IeG+y>&4=sQV9@%?_y+X(J>T9;#R1%G1V~IAV&Ub1QQ0am4I9~Ihhh_hs(tA-@
z-=YWu=I|k%3%VRf$*usIpvN}suYZm5TC;VoG==V>1nGOtbQ{1M!!7UeTe@C#L?0#j
z^7#oJ6D0%x@<WdblwT}9tdX-XUo%{I0{o`^z$H4aoc8Z`=C=Ex7_DGroJ82(=HFRm
zXb86`x|~@n$m4mkCD5O?kT&ZjO}ruj#6+&=C{&oY0`@~`l-}i4%m+#Z3QeI9x({ZE
zELl~n8EUi?GZKy_E*O^OhHbUm%cISllSD{TQX3$SF1l8nkG{m;tm$xt1s}szndu_Y
zKNSMbO3*iwBx^BS7b>K~Xi-4)eee6{*fU=b{TvL=-j7?jkoP}JjmlwwO68JoBM1kn
z2_z(8vaY*z9r2Nb6jQ$6>0(ZheB&ANLKsHj$fI6!<#Y<9V6qyC0%-K|NMObMmvBh2
zv8a%5(ChpCl<}Z;w|pvN)|^uWt@Ks?<HRSORY!}dlwD5NyvO}>s<Zj;4%6g5-jIjc
z5{KYkC+Ux{%uyiMTUnAM0y7E7jYOy7#q-MHd7dZu_Y`c`nPzfZI|}oOC0O`j)}uD*
zdE&4>x9x3&>!C0!{OT<IU}UR&9@<@d?)KE;(mP0n_+y=bh71)Y_c)e*oR*)!_`1Vp
zBmBR&QUh;;fcF~wArdsB<Eq|>#WI{>FDfyW0aK3&l`sWKr|wqUuNPUjgJEFBH#7=%
zt4U~3yhNPcTv2Dg5ulIjZ%UpTfP@QlC>hpJErMrS`x?PTbrSuZe)jHL!s&4Prn_Y`
z9L^T-bgD1(@GeDDqh~efSmfb8t1{ZbRFeSky^5dTF)b`t1Z3jGW{DFe1AFeC*mLS8
z!EcR$1-e}=IeR*9`H?W^SXAUhpCBUD338aiq;f_Rjn~kRQdAd#4s6YTG$6vDIr>wU
zaJ<_#++<8til1Z@`%lDD$y~C@xGG@bDvBUiUG%2sUo4!hmka?Rtj+s9`K~n&W`=L+
z(hER0;WVr!!o!PKl}34=d*Hpa8xATADjCyfPH-M7jyFd-yVO*+Mer7Kt>YjY%MOAt
zpWwKfpOI&Z)^?rD%w~-WZ2!=4{)o=jT*O{%M8T($3USzy(BhyK_k^%d>(uZnE?}&F
zPruZjV4_HYt@lLEg_Y|7mgMRys>Tox0^t}-GZW-#;yN(dNZxnFBjfyr?S9>7JK6&u
ztb+eahb5GNAI=+t^Y1oUC^ii9&jkR^ff0*EYccROZZtJ!njni&Y(VJffObV4$1Kkp
z$6>Ev2$FVM#cS@=;8o+EyRFC9UJ<MMmiSD4CY;SJdnR}i<>li1jye;_iR8Bz%MZfv
znw)@WvN9gz#@L5n1?Msp`bS9!`pG@ea}kv9@*0cRs-;Os?lxaXRr^#kOynn}d#DCv
z8tG3pS#2Vnt96~}SbDfELaRyVi1?<>kIq!7Q)A*m*UKzc>xW4{pvRf`R1~FSZgh3D
z{pco}#F@?e%90VhZMbPGcC$7^b4hiTZ`??l^AFFak#)-o4;L$hp+U7D*v=MIWbMl3
zaNX=9aB6m_0PCvb?&Q;Cw9tR6-V)nfFm69GoQNd!r*^L2_lFW^8n=PulQd`3N%rU&
z+};_KZ<4NuYno?gX|eR%nR>_{t+V}j1qosT5*2^8DWKlZAICA>N;ulNG}C4YI1ZG`
zs%V)R^g~1?QX>7*1O;34AwystL$`8iT({0Dca!An|7&L)z*UGugF9rQ5fV{n20sfv
z5FC1F0hvJhrhM|JvoJdeO4{=MlEaMdXRp}TGA`4owCf)a<6308+zqYcPDv#GENYRP
zK39!1zi;Kvah~NQBv7)`N)NX5tbW0$6Z<#&r*lAE-A&t2r1uD}RGYM^6%%X?*%7Tj
z$;)9C$U8gZBH?IlVpN#yoH7i^6u`aUu-q~Mcj62pPP^nb;2SCBuPQRT2O3KD-uz5<
zuRe<D_o11N*JeTE$HZZ?o0*wD=yn_Y71Kt^K(<*M#)R`q962}rQ-l%s*K7vb-IQP1
zvPbX=+=&gTMg2VZX44iG)n(d!;5Rc2v`3)h&zd#lbnWV85_+OSVZ{k$Qw|Ko#vBUJ
zioei&uYOm15Ga;GFAI6_wl>>zfLvO%79N|gh|UoulQ44%?uKGt{~aFMXzxPc*#C=>
zJJiLeFN_wGW3fYBw0~oc?AV5_83Q{YCYJy8wpFwC=m?~A&>MkU5f7iXd59Ve)DU9`
zEkpeQhE1duca!O5!YzUySxd=kX*RFC1}W{5){Z{)f2BJBT(xrlNNQ3j-=()ecU$IQ
zq~XA=fJ^527JR9)V`<C6sq<@y`S9k?%_EH>tCZJ}U0c6x;WAf^b`5XAz5J!j7iz@u
z_A`iz#bd|A_mOM|y)xd4Sr~^U6a8Tf6JX_WapzO&Bp@GuS{{)u!E^kc+|-4&nxbeM
zCziqOlSm+5Q192#?Sg+d{4?(T$#!Ytlze`3m_PstWJJK!1%HYfVq@Z<7IpYEO1WlC
z7mZihPzog6a4Adix$;5ybmq~|Q2a;}E!-}F%OQCbxf%SS1@e;`A!e53iw%r(=iUBk
zxd+b4Qj9;P_JQjOge8VL$R~n?M}o-{X*kpw-D>IXUqyfQhCv()z#*7oB-!X_<PWtL
z6qzSU@wKtJ|AzRtHx<>lYm{Y}f+=1(OyXYpDt=!5%IEK9w^bY?tJ+f;i-|piJNE>!
zuG2c=2Ii~HD?(gDf#pTTkurVsyhBX;X$C0l>l)sdE=Tf|f*wM5Vm*37rBw;T?Eru|
zrPP&h<$XaE#tv<{%?~0(jsOQ&X08n*{I3#p8vZrQ-{kwEB~t6Yw5nV)DwZmU$8`&u
z&~wo926#B3e>{8WNBVdz1M7qpzxAO3KeE8sef_XW*d1C){}rbH$Z+N$L*QoiE_jaA
zlmph)tHaT$%*<%KZ;<aeu^e;H(731CycS;3dlMZvZ>KEHo`>M-9fImTfrRG%QS&Qw
zxmD$A#!32)CVQOi<whTyi330dXX3F`bV3Gc*~WF3-+LJ>2ibeBxJckS6HyY0Bfg3E
zN#uKus0f(K<HI=TkPlu*#NU1F2p&^{D-9w%v8fSYP#9}!=a$~;d#dupB1TnJk80Ck
zO5Wdpu0BBzUu}zFzA1Vi(8RY6<{O#)E{D{!MX@l8T0Qr=38vTK@{}d$Q8aUX_DNLu
zAHp+sZloYi_n&XponKKBB_euTf1`JpCea>X!bqwRd$fIf+x5&!^=Z?Ni%&fvJx~hy
zsBw>^xY>-A`K^n*1-O$|%?#b=8LnU5`k;VSX&s>Am#F7Jgh>{c;e?gFbS^?wYjmcP
zUj>7tymB?UMZkv`QN;~JNWG^FCgN836lpK=y?XcIQ&)tZ8nW>KAe)EG_>g^&%zZE!
z6;{(wIA3`y4)M77dC6#oy&KAZZZqtVg;~)_C3`G&Qx`5p!voT<HCBkjJ1FI82BKxP
zVr*)8L49fs7T0#z{&X(Gb<jjn_x}}k`Zaiu9+`uHEev)`ttWeQ=W#w_h8mIKS69=1
zRR$(b;fxmQx=?i<-62{c>qWK#sa-)luF1z@>5}p9YA{63%H(yno<b=VV9^@}R#Em^
zbwte#Jdgv2VsFVOd-w{>y5HjkO^gn<*iDn0d;*|bZ}6P*6Z9w|!&GMs_=EI|Vrqv}
zb8EBb_<=f;I2eD3cVPLO0l8iQW<NFr3)&QP4dIT+zePTvOD!<}uomAqq#&Qg`x=s{
z9yA%oKiLqE@4J%H)Z!)v^MoY!u$`*xoRY7=>eDonUc*xEl*)_1x_HDStSjN<@^|OP
zd*kwo@lL+gG|d#jb70X;y|S<VLl?9ilI0O}$=t(Z9}m_~>T$$tzXg9y#p^YIzX<3H
z+0v3PfqR{ZY^Hg%LH%g#S8vl7tMnXturE>UZteczNkZ<k3o178JK|g#Pmh^Fus0YP
z<|H7n_rG0Vh^U*j@pk;bV|ptmH;OgeT`uO8$YmX`GT0mX24|!?lTfF;+`HEBywT9i
z&ufD*-kWCJB#3uU62xJwAf1K+7}%=NQHk0g`j1hT%EwbeBLHDYKavDD@y0<dWoJeO
z^GO2*ebGY=5DI(|bCJ6hhAk&_h1MCNKpbI;DWlR%Ts(zqnPg&E=n%bw$AT}5(@-%e
zrN@Ot|CkVMqFon9cAYK~_WAGUmG0n2KV&wAZv!tyM;79;ON8aHn6-HyQP?fg<D1hW
z=iginsc%=w6<T4_(Z(Lh>pc$3M+Uw%@v#eD#vVUgHieE3qKrd_Hj4oTN8h7R&OJpV
zi`te<wWIZw$KOd%6wkg>DKQ0nk?YJfBmR%@Wr3NUIdEj>jI+!+V5nc)g%x-9X|u(3
zn=B05;h3-4h#L~vVrWZFn;iKewU)>?@;5}N!fY(<jjH5nba45vl;L?s>lL@Mu{Ywo
zXID6lEHWcren(=ThvBp9T;Kzg&OThRRMR5&`07CuKB7gw`(HgM(*kA}!O@b4kUW-8
zRA8J?Is9-Jh1}sL``_t`5B9JWcqYzEILB6+C11(LPsNjkXJ!Dlz848pbz;krpv?z7
zy^%ns=6lIVI|X|3%wg^>{bH(5s>X;ZHDphOK@>k3af}gJqJBLB+q86@$fs`_utex4
z<6#UV76&3_Pjhx#@3xtrIt1p-sRCT;0745haDb!VCtv<y@g7Egf|E=3*eZDWIB||{
zR5ACjx>XFG;3$@n8zv_KE8jdUxm`DH0U>Am3h}2sJMidTg`4R}qEVid5`7A(<sGVc
zP7K7DI#YVLpC{vx9aCyacvW?SoCg#emw#20UGZ83ESi0);<0v=l5+LcYq_dx0SK3j
zWatOd8hvZ~oR4>v$B|lES{eJ_rd2Y4?giUj`lR1)-T)9~xC<Y@-2``oPVczF_WY-d
z^!vnM-_}Hou2n!=M<og<CheSJo`VssH18(XyHkQcFkm=(qB01#ps|PUcipW@)(!|_
zQ<+rv&ffjz+(J>7t>Hq<VK(Hw#R4<b=hD=C=Wg(nf5JRxchbH1{&d<J`EU+1_jpOG
zx~)rH<v+hRt-z(-syJRzeFhNri!A&7%T7!#h-d9msRC_kO8>&j^VHz1Fx2N}7Bf8c
z)HnXudYhzk73S=9xcL;<$$kCoHMrF`2-^ni`(U}f(N+n>AUt60({<i0L@fw5r=)Q)
z3Kk8zAl|(B|CELbd1M6gM!<PHQck=lsYIXRU=4RXc3!zRd1&y{h^j>u+fo9aKIb|g
zleX|aYM{@u3Oqehy!&i`uOSA!{8CeAbB>k+8{)lPB|0TcltO+CsoRhClzk0?GORc2
zU2bQ2Fld^012*ZtS7md~+0lKzSX<}3J(<PHEnO<(wgkZOn&KFfY3HP1OrF2|T>c8C
zJtnz~8>~^%#G>jkW!R7O?ltA#48)Vi-IVGfo5dq>mT_NMAp+~4`*p4|Wu2tLu2Bfo
zxHt(dp99ulSAV(9(dqtU2!H?G&DF+(ly;XGZrz~EVpV9rj}M7LpQFMbHc1p8T1P6*
zoqe0x#LLL>-f+YAF$Z;~UcPLl_?(T(NW`d8-j~lBLCD8O=k^HiJdXH-dk}|<%U(qE
z^ok}vfK<O{+OL)Rxq1QL_l?lpYTcqyzC+Ky-%xC;6)+8OGwVTvF`u6v{2n%|yavtt
zEgf@m74-tasB}`*587}%Ng(%MnYi2Al<9W&Bl>%!7chu1Q)WR63n5PgK!*CoiDdkL
zF$B&#h8Y)nAj)+Ypi!f0+?qy;b{ag<Z(R;2%TXAnJzznhSB0y=v7u2e56%n9kQyRV
zPkD06AGK~EH?6-n_EYAMXNK$tZy|$H&Y#UQZ0eSs|E-|~>Vf%6v#*HSk7xg02?o|P
zKcPrB!9gO*EaqL@?fLX|pQ_9DQ`xCE`VwW%*PXnE6Fwrhfvk~3^DT%`&nXO&ZYuxN
z(YFcoy<|5?`GzjGL;=fbu~;)jFQ4Esb9_%3NLC}*@c$d6g5_PezEUrGxKgq)F&KzB
zE2HdRz!$lLG+ts#A+sHFc|Xz9`vF@pZAfoTLx-8ge!!B<bD`N-nfN%(Y^~X8nKPa3
zV3nC93(yERbBA?UTnfvr%MBW3WvV14waJ-&dX7-nZf(Ui{IE34`RDnH=hWslTaWu6
zD{N#Un)yqth(X5OexD!>Ir<k1oCVQ|qvvH#uMTE4Ge7I0(SnSF0wn}B+Z;wODnH8S
znx%yO!j+(VoWO54UE6d}(Tj&3*X03$E~lssV!j^7d(BV|h@BtID#a51&#>6L!!;>y
zaQHX$Y@-q#L<*7D#T%gdU#Q|@{Q7=$2GzjJN*gSR!$I3oZk}BVzWWSEwSKpjQM?Ow
z{slL=5aIWvun^~aIJ@jzm?cZpIb%Cu;Nmlu)(Vk<BTPj~by_VV1Bk^?c;>Y19F~PB
zIRWYIEB+Om(nACbRmMYakhWAyXCvdgy)1YAFa79NhKsecRlu%)JV9n=e()uOaMuww
zKdZahb`myfYYzM$p1z8NB$4hqosspEHJ$;yG!}E{3H@OzM6G}3OTT0GTONTyu9w&4
zCfmpR767}yqErz~^;Vf{;dsqsYnYY1#H5^4Zi5a_{mn}O_{e-Z(J6J}Nxq7RPMwho
z@fPl_JzKtphO71qVsGi~4XjoJTv+fOx}tHrmjl%Pq{0Xzl$2_cC*hy~dy#of6Y_Bx
zljq_Z<$;1T0(+)Lf_#7T2Yz9AnN3ajGXQqUaOYJYDd7FoIY@csQorMpuF|wp=2nHX
z4l(EjI#?~L|3x7zkYm=+R}bVFeY(fzbaZ+$3<vZC2$6^}uyA5LcDaR!&G_hDz9Q-D
zpF0nxT3T{Ei1LsSSgRWiq&|(`Tjiq}qu{|v3&H!!iaU-;UbB4c7Z>dNS~v<8LUz-@
zMBU5u2fxe7SE*M9xK%rzbs3X&_Ka@cO;Bj}6pn5MY+eXB5O|D5BR+r%c#-&!w5xZZ
z^=`5khA{ZQt4!)rC?Y52t!Tg|esI{|a9PIlmy@pcZ2-HR7e9>={s}5iU5)Z^#;B9X
z#IwKG7mqoHQ<C<VmB}xuW1qPw#NP?**gt*l;_|jTjP{hdV?YICY{Dzzeb@7~`$v$@
zA#V!+yyuaZ64wZt0D$FV=*p^>7X2*}e`ks^q*}Na@DL^A&orZVVX`|CA4fdgvGDk{
zH9Qsj-dX9!4gOG=thU1(b<0gG`3=I>ye7RqnOaT1ZSD^(p@?x|^&x`^C!9fnxD8^v
z6v}X3nP~<!<yYO@2PL6&#J#p#L(^3`%z5M%Jud*Ir`o#gETF8PUh>>IXnQwsEkBx8
z{4OH$PS`tcL)8(7eYr_Y!VQ&SK|eACg~T7u{jP<8TqPYX%gmBVoVR0&0R=>}cRa8*
z27w2Nq$as?GC&rUelGX2-{O`7qo(7stV3yD29Ua+9{L`Q$yV}|MenCRigAUd{p{UD
z`{RZa#5(_h$lYZeAUsXy7(QDP_NB$f>rQ~i9|eNf`=RMYJuI724DvLpH)Q4q7zqEn
zIT7hp1<ep1v=-5b=4Z*;dn%ZD>Re>^NyY-^S@9(jkLO(?m;o=Wz5VTWFQVa@oy>D9
zMFjFZjn^%H=h^D6*g2|9v89qtFk0dMuzsm|@Um~hIsEsqo&SQ7`$iKKl36LJ>)ebE
z?hRWYygqB^jJ}m6p_vGGwp#U8AGTb@9MHnq<__m+45gQ9MQ__rev`s0gvr?I4N#G_
ze3q+^W!=CvsU+8YRTQx+w5Oa`n*9l_#OP=#93FA3Dfn=>1lof*n3c{K4bK4K%f@iL
zZ>0BqI~RsX=%db^ht>R3&6T<ALQ!_G4q)R5h8Jt&B;|1aC&m}Q!!(W=c%Nj~kA!0K
zy>=iO=86|o2>2=!UWK#fnA?Bi>ss^`XdeYM@19LL>^-zit~d$%O3fo0#1k>rsckzX
z_e6{%sCg8euI)cGbbr6f`6N=jlyB%6=q7!B>&|UINFuU<V9^y3B#(Yw->i3RxcLCL
zK;AZJV~hjqrO7#M=Os4&<O~M<jiCTs(8;(slm|tyAzs7_R6L#4Sa$mgt^YxOk)S`I
zANG!xoum_wR~TN-au!jm<;e7`0QP<2UuZiy$ZX<t$|5p6g4wx!WT}cMVHA{S#UN5Q
z{N#03fSdAiA@YDtecEgW5b|;Ebfk;JXgZ&{6HN&{76sI$bJh4(&nxeSHmh#Co)wOJ
zEvfi3hDz;+)jC{jO`p*7q7Hxo@C)xteh@P}C}ax%hIhfP(`U-tMa9=&FZ-kN%FV^7
zEuU1UbhHH$;F;EQJo%ilBo*a=qH=fD+gX0RGbU0q_+rR+Lg)+O`FE)pX}NLfYmlDW
zy}`rJukFb9AK==GZoKTdRUT#d4RiXbl{AJ#HpbRU-UsaS#k`klBzOmSzAN`+Tm7?1
z07+!4;$FyDNmH(}8QWsmrnqf;4*eA<C6UqOn<*Yl@tJWRrfHc04mS9HH?c1K8&zR4
zA0>C{q=kZpZ0Ch+Rygl!gZ~mrLUetgq&}9e)g{t>iXu3wf#*v|H3_>y{p>oz#4uMu
zrhv-2J9uZRN>SVk;ij30B@lkFXEtMyhCd#xXR$fVnu4E9$M0FQQruy9$ppfNlsN6_
z%xBmxcCbv)TMR#xqGzxUx67a;W!Wwlm{yd?_$LQL;rc%Fx9ayTo3#W4t7&qXZr(^w
zmnO=<<ejTDmwh2`0*)7Au{%bnd7#qb3+EJOE|WMMm{6&k+3)pF8dy!%t9Ob1jK_AY
zII_c__}GO$WKI--9_gS0Lu-T0^Q3%IQRfG+i3?BCa4Mb6kgV(E;yF=<Nl&<YofyuC
zkDwpgEFUuIPtkp*w6t7vYjXDS)-Ly!w3+*C=Regi6$u;Lj0w;7bxtJ~ht_JwSmJE!
zZ(D4qq-Cnwm|DcRgn*8+jzuthIlnG4a3AEz>fMh511s{Is1Sru#C!)0V0s*oneO5W
zb>PR331PQFS|}6a!OvFMo=HN>f9MJno5vwu6<U=kw=yV={oqY@?GG!}u&`*Mh5Ep3
z^dR!o(}ynV3}hL&NuT2g_vG8}v{1JojL{SK{+ty${)Mp9IavlJm$R?_mS={)*I79;
z3A+JppVc0`<}+l|vj||S6}kK*Uf-GJe$M*s$qQD(A9bQd>p)DNT-L;0Asj|PW%~Vi
zj7M-6Y`oTO;ueNZNY3-5z%cdDt580(LO^xpk|xv|9cNEB_w!aplOscaGDu~`+wd;B
zMeg%nQcmg_>xqX=pEUX^RvztEW>Y3x>j$Oo^2%}2rQ?Rq5jR%WVmkL^kMo=@ALR}8
zsq^I*QIz|caQJ&X?9~yU-Sd+r`cr^u^TsBr{P-G;@+#ic^MlNI{h1-vJ_V4F+#5c7
zxV;#@=UWrW<_~6;Q;L<`uDcm8SsHLYY*Ioq$Q91lw~Wi#)9`SaV*&dh6+H%3pE=)V
z42!XV!n4zCP&D$o^$0gVg>~X=Uln@JdGP<Lxzczj*EaqP%66=YA=#RQB24yetj7{V
z9g;0+7aC)y$<Wxc6jQbt2GLLn5s{rNH8XUM<zVbG6UP?W<9(d?@P2>4yz^nc%ys|o
z>wi7h?|JTduK#tp;ex}<PLAC9^9`^K&tWmJc^5<&y80n5ED|<NOB+^xCex+ntKoM&
z#34{BM?$*$5|Doqg%3Q`y+Hehn&-Q->DjO>X97#fIaPYOTzHdrRddz;@GdkVce=n!
zKL|{25qZElj;VHo%?)#}sl{}O*E|^cHG0VzGBr4C4Bn=AZbEO&w*3@od<=B>sLN7J
zlFUpW!7^po<CsBNp*?kofiUrNqarm#7Zo%>E&_G+I@roe*`(i#Ll)6TAti@8)<YIP
zkB%0E*>$!#L}n{=YCTcr41K;Q+E7i15xp;hn0si|`nHcgO@R{9zeV_!>|Q67bKt<T
z?Wu@=efBp{jYs&2rVoNThGn)uq1Mx}WszE?Zx=Tf?h7nnaaH!`V9Y==o=vYZ-SEcU
zb{FgDrQ<i%hHGtcA(~fe%D<RI<@YRT=MFU#^tC!Cy*@q!FMi`A0S<>?3RISAcv8ER
znfExxmOw332lZzBnNv)#d1+t;xt4lY)jskhGm*DWyH-bab{?2i0#3}twAEOAxbZQ6
z(R_E7x7Gv}hj?usnSH&jE5rjTKWQVoBa8L9d1I>DuZt5{kImpVYzrlEdHucGY#f%=
zK)sMJ1130fuWN%Pe_jfF2e1iQyimMx2fJ&bywj%zKIhYe>3e^0{XbJ`AqhjG_m4XL
z*pyh9B1TYK*TbAb+Zt+YM(y%~q&v@gL}pup+8zV6hb)tN+)X=J6+U{%T^+zX1+>1h
z*dn{{U_#A$Nn0)fXFP5N8J)H0#`hGK>{epTwh{<U{_xlmBjY2W3`lQW6EOsgP+E@-
z_4WA-Ev79zYuAxW{u^e9bg4z9mQ<|Of9CMl<LHl6Q7%kat{##{i#H113@x{^|EQXI
z`H#uqG8vzL3xov)!yHkwh8?WWt*44A$kUHRoq3uG9P4hgzP<B&KWO^zaMs;;Z7q$A
zyp0@~dG|3){USJkJzXVB=nVwL(~Xjd^~SGyvW&>Kkv0RM@6S7(|M(cjl$T=6GX|6G
z0@NP*uqd+@kCMUEb=GHHH)ff$&*5`t(>I5!uKHj$NAOF$=V7ErJk<*T^lrH2gI6t6
zkwX>iFmauCfpj_2gf7DMyvao&RMO9CM@veBRJYk-b^cfHvc3m;KeHK4`MlR>m9Lxy
zy$DS=X$-EIaj`*q+CUI<SD~|<wRTO8y<6Yc9^XkX15o}SOAXnCDxn>>cCTerX6eXU
z4_fDWyC%O`AKdAmA7$QNl~@~ae)#*Q<JYnXmz!e9A6Z7up<Ag`r)3%7GiL>TY-W3}
z?ax=JwA)f}<!Q^g)og<#sSEhH1bJIs(Z(_U8`s1xM=r5yw&9SRn&%T*9&KD?Ij#<6
zhqI_jS{A?OH;Q?*P1k=wG9aYKz)_Hh!^-dZW(XhGSe}faxqNooeX&Up&EHTejgo@P
z5+CdNz`XHQ4jeTKhMc9)G>3bkZD#J8>1J|^w%9G!o@0nBfU6PG+8&UEjB}_Ysopj?
zqOXjtqqprEf)&?JEhI-8G5DHeyXQ+$c1a%Ts0ggelUR0DloFN(3_@;SOCesu`X0uq
z0wlpj0ai(c<{16&7!-|?XRNZL(9B}deW;DT6r8r=FP0Y@jSYsvdDJ+5Lg}18bTDbr
z;fll6R^oqfp(Ygv{{lV%PtWa;M9FcsEM}YnmhL&QoOPVcju*4jFG<PioDQ=t)rdoY
zkL)n*udaHxOX9f>a==yL-FP!6Sa+}+><8Neyo#^%{>ZE+%Veu?O25`x91L+y@Hc%)
z8#B~6{&Yt|@F|ShTt@srvMTv;NLw>QohovhAiSs(9`lMv0sGSF3c(ZT;8<7SA~lee
zgg+lO;*iGi|4+Wm-9hEAz?XLJt(E+h1ix8>f#9h3(N&54rts&5sgku*2{S90mW9nc
z-OOsPUz?i9-C5#A1e4AxV$>b=4k-hyh@V%i!-+q8yfih0O>N^|@KM_`_%s@UW5v;a
zvl*2Vf9dv&jW=1Ti~5|S=H(*1ox>%tYQ<>^`y8~P$?+VJ^i$)x(Nz>;mMmksMNyU^
z98I_%mD)n(KHz#9W+)=eM%y_$I;AUQL5unofH<U}|JBRec)#*NaJ&a2<puXIFX^(J
zHKpM39(ZuD{w}z_uK<l!vS;pxF3loRNyfv65=zayPqsuWiPrqWY<5k_;f^<gF~sw5
zFvh;|)p+n4rGiHY#c8?D>R*O3rsk1KXW*T_&OeJzX=#M_R}(rzX3Jh2*$)-&6}V?=
z1;zJ-M$kR6G*BhKF7{&#xsRAjf-z-edbf>V$})cI2<zJqhYwhzH@VK=%V5f95#c%c
zGOoWEjDv>}Qxi&|%?4Pv6Rn3gec7jqlSs*lkBzktnH<eVg7YtaD>wKD#sK);?S;2_
z4)TO=Z!uRPAPCdqBj94hB(${HvHmAH4=C&HVK|DmXJXJQS{hb`&QJSNh*d<o6Pku_
zwfFvNaS%o;kdlDC{g%OW+xem1DY{!?XuP3%%CfRWFmt@|)Z~I8_?rD+hRrAUFwI5-
zUki>ISK|GSaAp!&DU$o_rCmUQPATqaVAVQ(eG~<rRA9Q&DSp^*n1h|-_kzcN)q8SO
zK8?sK#q~P+7p~EJP&{xo&SQ$TD1*paSajRD8nO>M4nEJKP8$1GJc+=|rxRIo0`NDV
zbN$zkVD*n*_=Ovqmw);6J|4$jBAkIc*7a<c)28VEAoakj_?7VZw`U;y%VLW#wP2fl
zj9gHD-2AqwN_>=U%oq`lmLS4sEoq8<h2Z=LE$I5%dYDbx;lu-6>K+4u2*VYEkR@%v
zcBabk#6fJpepYVhPd3LfoMT7`%mM8q=!lyVcYlEC$$IwTq1izKaf1kz2@UK4Qkx{4
z6>T68Eny4Ux!i5Oe*-{)^9!0QbHkE;MnzaBlJLq}>>S)}!}itiLhM1bOu%RzqsD+$
z3K2x38+yd+NgCd74Em~q#P++=zCZKHY_6KBQ>U-glA(`TN|TA@7WMPhQ^bwks-WFB
zzWrB$c2d_`DAx<A%AN^FTjy{DVX!IJY$l&K(n?WKM&OG9!XH%_I6E=HbhL67XA@v+
zGCadoa8cgdq^et9txT4jXg$BBY2JjEhJC{<C@qF2c42t4`RL!LA3Xa$vc6L6tQP|S
zfEcWM;4NzdCF>JqVb@^DmUvIOIfkE+Y^Q%b{O-5eY-7-d=Lpm5@&;_iC9X)$_k@T4
zq;6jZqi#8VI6PI~X{!^openSuVdoaA&Iak#Ib9Mt;n6SG7UJXept#P-T6dW?Vbo;^
z09eQ(ulCwp+$49uRgqhKLc=`fdRS{nT)Lu8&DnTA0B}!d)5iFYC03JOrnJjUOo!vW
zk1*h;?bo6n;;ZhhjBtS_DA1&Qw{`ogL#N0Ibf8Xa$kX+ZcF%y7j-I)JclX!;Kv|O|
zt3LF5>-PC)LD}&sqr9@Tu%N%kf@lVkTjk3skKeHZ!1LzEtzTj(a&SgqIP|2A>C{8&
z#|^P?a-|J1Ep~$vyw>f{cxCOv4gfj6ELmo*TOM7Lb^!+Qf+b$s&0EJ9q6Ng_4;wq<
zRXQ3P7y*!4G^hXJiOqrGl3Sg4fe_}rm%FbUBdEY0b06io^ryobh;%y>am!uxImIP-
zs`vHe!-VwM+O5sIFxn;63Bv0S<aY9IJw1&Z4CXoW9JtUWnr>~0{io}xnr<@LiA*bE
z5Pago(XZQCfo_`Lr~h1_dhr23cQ{K{?uSqxuX~;BNjF@PCQr#S9^oeX!eu_heo+<Y
zw>xU(E>uB-GgX5I`Ucgdn%!R^0I+G215bHF9MBOi+rC}&GV6=$u&7;PZ*u&c!*E>9
sa7f`+JH7s!qr_@9=*<7mM|o!F(A>7mU+n=7FZR5)FtssxW8@zBA8(4v8~^|S

literal 0
HcmV?d00001

diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg
new file mode 100644
index 0000000000..2936cbb56a
--- /dev/null
+++ b/docs/logo/setup_tools_logo_symbol_colour.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="35.414169mm"
+   height="35.414169mm"
+   viewBox="0 0 35.41417 35.414171"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (1.0+r73+1)"
+   sodipodi:docname="setup_tools_logo_symbol_colour.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1362">
+      <stop
+         style="stop-color:#336790;stop-opacity:1"
+         offset="0"
+         id="stop1358" />
+      <stop
+         style="stop-color:#396f9e;stop-opacity:1"
+         offset="1"
+         id="stop1360" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1356"
+       inkscape:collect="always">
+      <stop
+         id="stop1352"
+         offset="0"
+         style="stop-color:#ffd040;stop-opacity:1;" />
+      <stop
+         id="stop1354"
+         offset="1"
+         style="stop-color:#c59500;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1346">
+      <stop
+         style="stop-color:#ffd040;stop-opacity:1;"
+         offset="0"
+         id="stop1342" />
+      <stop
+         style="stop-color:#c59500;stop-opacity:1"
+         offset="1"
+         id="stop1344" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1348"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.5091231)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1350"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1348-1"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1389"
+       gradientUnits="userSpaceOnUse"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952"
+       gradientTransform="translate(-0.09428005)" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1086"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="matrix(1.1629019,0,0,1.1629019,-107.42277,2.2004727)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1109"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="101.13023"
+       x2="360.05417"
+       y1="111.95531"
+       x1="372.85818"
+       gradientTransform="matrix(4.3952198,0,0,4.3952198,-1561.6542,-408.39072)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1203"
+       xlink:href="#linearGradient1362"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       gradientTransform="matrix(4.2668833,0,0,4.2668833,-1515.7133,-394.26365)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1214"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.199673"
+     inkscape:cx="40.150021"
+     inkscape:cy="40.606501"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1222"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-305.70123,-109.45205)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1399"
+       transform="translate(0.04622687,-0.80180859)">
+      <g
+         id="g1222">
+        <path
+           transform="matrix(0.26458333,0,0,0.26458333,305.655,110.25386)"
+           d="M 55.140625 110.10156 L 55.140625 114.65625 C 55.140625 120.97071 60.201017 126.03125 66.515625 126.03125 L 66.773438 126.03125 C 73.087932 126.03125 78.118201 120.97468 78.148438 114.65625 L 78.148438 110.10156 L 55.140625 110.10156 z "
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40013;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           id="path854" />
+        <path
+           id="path1185"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.58474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="M 55.914062 8.4238281 C 53.870774 8.4238281 51.582774 8.7898612 49.314453 9.4824219 C 48.747448 9.6555242 48.179304 9.8491835 47.619141 10.0625 C 47.059582 10.275665 46.507256 10.509549 45.962891 10.761719 C 44.87295 11.266475 43.820581 11.848322 42.841797 12.501953 C 41.863088 13.155547 40.959109 13.872791 40.154297 14.650391 C 39.349484 15.428028 38.644219 16.266248 38.060547 17.162109 C 37.476837 18.057971 37.014658 19.011078 36.699219 20.019531 C 36.620605 20.271626 36.550329 20.526221 36.490234 20.785156 C 36.309195 21.562567 36.214844 22.367837 36.214844 23.205078 C 36.214844 27.578747 35.923828 30.631366 35.923828 39.042969 C 35.924962 39.292796 35.92626 42.677565 35.927734 45.246094 C 38.783734 41.234087 43.514307 38.617188 48.808594 38.617188 L 61.408203 38.617188 L 61.408203 34.675781 L 79.212891 34.607422 L 90.820312 34.556641 L 90.820312 22.675781 C 90.820312 22.169514 90.771971 21.670258 90.681641 21.181641 L 90.681641 21.179688 C 90.636286 20.935908 90.580192 20.694322 90.513672 20.455078 L 90.513672 20.453125 C 90.180318 19.253465 89.588686 18.115524 88.796875 17.048828 C 88.480151 16.622044 88.130536 16.20533 87.753906 15.802734 C 86.624016 14.594911 85.243108 13.499679 83.712891 12.537109 C 83.203373 12.216605 82.678767 11.912988 82.144531 11.626953 L 82.140625 11.626953 C 81.071548 11.054657 79.964321 10.551444 78.865234 10.125 L 78.863281 10.125 C 78.314078 9.9118346 77.767968 9.7154786 77.228516 9.5410156 L 77.226562 9.5410156 C 75.607186 9.0167952 74.058608 8.6703211 72.734375 8.515625 L 72.730469 8.515625 C 72.288944 8.4642234 71.873982 8.4337183 71.488281 8.4257812 L 55.916016 8.4257812 L 55.914062 8.4238281 z M 76.589844 18.589844 C 79.203765 18.589844 81.324219 20.708344 81.324219 23.322266 C 81.324219 25.936225 79.203878 28.054688 76.589844 28.054688 C 73.975922 28.054688 71.857422 25.936225 71.857422 23.322266 C 71.857422 20.708269 73.975922 18.589806 76.589844 18.589844 z M 45.773438 61.419922 L 45.759766 61.423828 C 42.00454 61.423564 38.857937 63.908522 37.851562 67.328125 C 37.907122 67.422613 37.952317 67.529251 38.009766 67.621094 C 38.26375 68.027658 38.53734 68.408119 38.826172 68.765625 C 39.114928 69.123546 39.419743 69.457191 39.738281 69.769531 C 40.056517 70.08172 40.388044 70.373955 40.730469 70.644531 C 41.416264 71.186364 42.151568 71.644428 42.916016 72.029297 L 42.917969 72.029297 C 44.064035 72.606128 45.274381 73.016948 46.46875 73.28125 C 47.222388 73.447927 47.966505 73.553501 48.689453 73.611328 C 48.729138 73.614579 48.773634 73.617314 48.814453 73.621094 C 49.195543 73.64755 49.567899 73.662109 49.931641 73.662109 L 54.007812 73.669922 L 54.003906 70.167969 L 54.003906 70.125 C 54.011465 69.990071 54.013925 69.833953 54.021484 69.669922 C 54.021711 65.097638 50.345683 61.419657 45.773438 61.419922 z M 83.636719 63.466797 L 83.636719 63.46875 C 80.784385 63.518262 78.312235 65.87151 78.3125 68.671875 L 78.3125 70.216797 L 78.3125 81.910156 L 78.232422 81.910156 L 78.228516 82.328125 L 51.306641 82.386719 C 50.241456 82.457774 49.208884 82.45021 48.210938 82.363281 C 47.213029 82.276352 46.250455 82.112101 45.326172 81.867188 C 44.401964 81.621896 43.516032 81.296383 42.671875 80.892578 C 41.827793 80.48866 41.025184 80.005753 40.267578 79.443359 C 38.339943 78.012355 37.210659 75.31485 35.873047 72.945312 L 35.873047 89.744141 C 35.873047 90.063511 35.88162 90.380452 35.904297 90.693359 C 35.926974 91.006304 35.952502 91.313263 35.992188 91.619141 L 35.992188 91.621094 C 36.070802 92.231979 36.188285 92.830213 36.339844 93.412109 L 36.339844 93.414062 C 36.642962 94.578422 37.087468 95.682077 37.650391 96.722656 C 37.931965 97.24374 38.243159 97.748164 38.582031 98.236328 L 38.582031 98.238281 C 39.597364 99.700656 40.857919 101.01323 42.287109 102.1582 C 42.763632 102.54012 43.258841 102.90135 43.769531 103.24219 C 44.790911 103.92383 45.873006 104.52167 46.990234 105.0293 C 48.107501 105.53696 49.258939 105.95358 50.417969 106.27344 C 51.576961 106.59319 52.743992 106.81729 53.890625 106.93555 C 54.463979 106.99489 55.031671 107.02716 55.591797 107.0332 L 55.611328 107.0332 L 55.617188 107.0332 C 56.071373 107.04454 59.83214 107.06263 63.472656 107.06641 C 66.514382 107.07019 68.777615 107.07422 70.013672 107.07422 C 70.256695 107.07407 71.212 107.0746 71.300781 107.07422 C 76.376082 107.05154 80.794717 106.66522 84.642578 105.92969 C 86.70964 105.53454 88.618525 105.04278 90.359375 104.44531 C 92.046329 103.86636 93.57251 103.18749 94.933594 102.42188 C 99.017562 100.12494 101.60583 97.053226 102.51367 93.587891 C 102.94178 90.430587 102.82403 82.990197 102.80664 77.792969 L 102.80664 77.785156 C 102.82554 73.072274 102.83802 72.48446 102.8418 72 L 102.73047 72 L 102.72266 71.349609 L 88.951172 71.416016 L 88.931641 68.669922 C 88.931527 65.782174 86.616188 63.46691 83.728516 63.466797 L 83.720703 63.466797 C 83.694246 63.46657 83.65864 63.466608 83.636719 63.466797 z "
+           transform="matrix(0.26458333,0,0,0.26458333,305.655,110.25386)" />
+        <path
+           id="path1105"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.683878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+           d="m 324.26094,121.13878 v 0.0163 h -5.69217 c -1.9305,0 -3.51031,1.54334 -3.47287,3.46566 v 0.005 1.4651 2.11653 c 0.25703,-1.31758 1.27566,-2.38356 2.66641,-2.38455 h 0.002 c 1.57834,0.001 2.8666,1.28729 2.86652,2.86591 0,0.0521 -0.002,0.10838 -0.007,0.16826 l 0.002,-0.0246 0.005,2.40979 h 5.06058 v -2.40799 -0.41105 c -1.1e-4,-1.13514 0.96374,-2.04237 2.08468,-2.06005 h 0.002 c 0.0105,-9e-5 0.0214,-8e-5 0.0319,0 1.13183,0.001 2.05648,0.92579 2.05766,2.05764 v 0.0415 l 2.9278,-0.0138 v -0.14542 h 0.0138 v -7.16389 h -3.08707 c -0.19901,0.93099 -0.93007,1.67822 -1.91461,1.67844 -0.98448,-2.2e-4 -1.7132,-0.74752 -1.91221,-1.67844 z" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0c36fc131ac399ba0a8db8ff16b13d4beb8ad72
GIT binary patch
literal 44239
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

literal 0
HcmV?d00001

diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg
new file mode 100644
index 0000000000..dbb9c1decf
--- /dev/null
+++ b/docs/logo/setup_tools_logotype_1line.svg
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="153.08401mm"
+   height="22.351141mm"
+   viewBox="0 0 153.08402 22.351142"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (1.0+r73+1)"
+   sodipodi:docname="setup_tools_logotype_1line.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient1356"
+       inkscape:collect="always">
+      <stop
+         id="stop1352"
+         offset="0"
+         style="stop-color:#ffd040;stop-opacity:1;" />
+      <stop
+         id="stop1354"
+         offset="1"
+         style="stop-color:#c59500;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1346">
+      <stop
+         style="stop-color:#ffd040;stop-opacity:1;"
+         offset="0"
+         id="stop1342" />
+      <stop
+         style="stop-color:#c59500;stop-opacity:1"
+         offset="1"
+         id="stop1344" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1348"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.5091231)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1356"
+       id="linearGradient1350"
+       x1="364.9838"
+       y1="103.99801"
+       x2="380.39404"
+       y2="119.1796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="119.1796"
+       x2="380.39404"
+       y1="103.99801"
+       x1="364.9838"
+       id="linearGradient1348-1"
+       xlink:href="#linearGradient1356"
+       inkscape:collect="always"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1346"
+       id="linearGradient1389"
+       gradientUnits="userSpaceOnUse"
+       x1="383.75778"
+       y1="110.35148"
+       x2="425.11826"
+       y2="166.39952"
+       gradientTransform="translate(-0.09428005)" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1086"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="166.39952"
+       x2="425.11826"
+       y1="110.35148"
+       x1="383.75778"
+       gradientTransform="matrix(1.8992984,0,0,1.8992984,-333.12947,-121.42763)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1224"
+       xlink:href="#linearGradient1346"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.822847"
+     inkscape:cx="195.14044"
+     inkscape:cy="-7.273579"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1222"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-293.37152,-116.6327)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1399"
+       transform="translate(0.04622687,-0.80180859)">
+      <g
+         id="g1222">
+        <g
+           transform="translate(-0.36620442,0.40535408)"
+           id="g873">
+          <path
+             d="m 302.59023,121.31122 c -1.18799,0.0376 -2.15686,0.38742 -2.90718,1.0502 -0.7378,0.65026 -1.10613,1.50759 -1.10613,2.57053 0,0.72529 0.181,1.33198 0.54375,1.81968 0.36265,0.47519 0.79337,0.84965 1.29359,1.12478 0.51272,0.27512 1.15109,0.55646 1.9139,0.84409 0.82534,0.32512 1.46275,0.67602 1.91292,1.05117 0.46269,0.36265 0.69393,0.85582 0.69393,1.48107 0,0.7378 -0.27521,1.29435 -0.82544,1.66952 -0.53773,0.37513 -1.16898,0.56337 -1.89428,0.56337 -0.56273,0 -1.1694,-0.11965 -1.81968,-0.35728 -0.65026,-0.2501 -1.20682,-0.54986 -1.6695,-0.90002 l -0.80582,1.44476 c 0.58776,0.41268 1.26913,0.75644 2.04444,1.03155 0.77534,0.26261 1.58153,0.39357 2.41939,0.39357 0.90036,0 1.682,-0.16885 2.34478,-0.50645 0.67527,-0.33763 1.19397,-0.80008 1.55662,-1.38781 0.36266,-0.58776 0.54474,-1.24458 0.54474,-1.96986 0,-0.80035 -0.16258,-1.45616 -0.4878,-1.96887 -0.31262,-0.52521 -0.71267,-0.93237 -1.20037,-1.22 -0.47519,-0.3001 -1.06344,-0.57533 -1.76373,-0.82543 -0.93787,-0.35016 -1.66323,-0.70004 -2.17597,-1.05018 -0.5002,-0.36265 -0.74986,-0.82511 -0.74986,-1.38784 0,-0.57522 0.21181,-1.02539 0.63699,-1.35053 0.43767,-0.33764 1.02594,-0.50645 1.76374,-0.50645 0.48771,0 1.00642,0.0809 1.55665,0.24342 0.55023,0.16258 1.06894,0.37535 1.55665,0.63797 l 0.69489,-1.40649 c -1.25053,-0.72528 -2.60813,-1.08847 -4.07122,-1.08847 z m 9.75109,0.0756 v 13.56125 h 9.07878 v -1.76276 h -7.26009 v -4.18311 h 6.2472 v -1.7441 h -6.2472 v -4.12718 h 6.99706 v -1.7441 z m 13.72712,0 v 1.7441 h 3.54514 v 11.81715 h 1.81869 v -11.81715 h 3.63938 v -1.7441 z m 14.21394,0 v 8.81574 c 0,0.96289 0.21893,1.81923 0.6566,2.56954 0.45019,0.7378 1.06302,1.31379 1.83833,1.72645 0.77532,0.40016 1.63167,0.59968 2.56955,0.59968 0.95039,0 1.81384,-0.19952 2.58918,-0.59968 0.77531,-0.41266 1.38814,-0.98865 1.83833,-1.72645 0.45017,-0.75031 0.67525,-1.60665 0.67525,-2.56954 v -8.81574 h -1.78239 v 8.75981 c 0,0.60023 -0.14321,1.14353 -0.43088,1.63123 -0.28761,0.4877 -0.68762,0.86929 -1.20035,1.14442 -0.5002,0.27509 -1.06388,0.41319 -1.68914,0.41319 -0.60024,0 -1.14967,-0.13808 -1.64989,-0.41319 -0.4877,-0.28763 -0.87544,-0.66922 -1.16305,-1.14442 -0.28763,-0.4877 -0.43186,-1.031 -0.43186,-1.63123 v -8.75981 z m 16.37221,0 v 13.56125 h 1.81968 v -4.98892 h 2.00716 c 1.03793,0 1.89427,-0.20665 2.56955,-0.61933 0.68777,-0.41266 1.18191,-0.95077 1.48204,-1.61356 0.31262,-0.66276 0.46914,-1.37487 0.46914,-2.13768 0,-1.32554 -0.41944,-2.35781 -1.25728,-3.09561 -0.82534,-0.7378 -1.9753,-1.10615 -3.45093,-1.10615 z m 1.81968,1.7441 h 2.1004 c 0.90036,0 1.56331,0.25679 1.98849,0.7695 0.42518,0.5002 0.63797,1.0752 0.63797,1.72546 0,0.37515 -0.0879,0.76291 -0.26303,1.16305 -0.17511,0.38767 -0.46871,0.71913 -0.88139,0.99427 -0.40016,0.27509 -0.92501,0.41222 -1.57528,0.41222 h -2.00716 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.468944"
+             id="path1059" />
+          <path
+             d="m 389.51096,121.27344 c -1.25052,0 -2.40664,0.31919 -3.46958,0.95696 -1.05043,0.62526 -1.88833,1.46929 -2.51359,2.53224 -0.62525,1.06294 -0.93831,2.21388 -0.93831,3.4519 0,1.27551 0.30592,2.44491 0.91867,3.50785 0.62527,1.05042 1.4703,1.8812 2.53323,2.49395 1.06294,0.61277 2.21906,0.91966 3.46958,0.91966 1.238,0 2.38895,-0.30689 3.4519,-0.91966 1.07544,-0.62525 1.92564,-1.4693 2.55089,-2.53224 0.62525,-1.06293 0.9373,-2.21905 0.9373,-3.46956 0,-1.23802 -0.31821,-2.38896 -0.95595,-3.4519 -0.62527,-1.06295 -1.46932,-1.90698 -2.53224,-2.53224 -1.06295,-0.63777 -2.2139,-0.95696 -3.4519,-0.95696 z m 18.54818,0 c -1.25051,0 -2.40762,0.31919 -3.47055,0.95696 -1.05044,0.62526 -1.88834,1.46929 -2.5136,2.53224 -0.62523,1.06294 -0.93731,2.21388 -0.93731,3.4519 0,1.27551 0.30592,2.44491 0.91867,3.50785 0.62525,1.05042 1.4693,1.8812 2.53224,2.49395 1.06293,0.61277 2.22004,0.91966 3.47055,0.91966 1.238,0 2.38797,-0.30689 3.45092,-0.91966 1.07544,-0.62525 1.92562,-1.4693 2.55089,-2.53224 0.62526,-1.06293 0.93831,-2.21905 0.93831,-3.46956 0,-1.23802 -0.3192,-2.38896 -0.95697,-3.4519 -0.62524,-1.06295 -1.46929,-1.90698 -2.53223,-2.53224 -1.06295,-0.63777 -2.21292,-0.95696 -3.45092,-0.95696 z m 30.24853,0.0756 c -1.18799,0.0374 -2.15686,0.38742 -2.90718,1.05018 -0.7378,0.65028 -1.10712,1.5066 -1.10712,2.56954 0,0.7253 0.18101,1.33198 0.54375,1.81968 0.36264,0.4752 0.79437,0.85066 1.29459,1.12577 0.51271,0.27511 1.15108,0.55646 1.9139,0.84409 0.82536,0.32512 1.46274,0.67503 1.91292,1.05019 0.4627,0.36264 0.69392,0.85678 0.69392,1.48205 0,0.7378 -0.27521,1.29435 -0.82543,1.66952 -0.53773,0.37515 -1.16898,0.56238 -1.89429,0.56238 -0.56272,0 -1.16939,-0.11871 -1.81968,-0.35627 -0.65026,-0.2501 -1.20683,-0.54989 -1.6695,-0.90004 l -0.8068,1.44377 c 0.58776,0.41268 1.26913,0.75742 2.04446,1.03253 0.77531,0.26262 1.5825,0.39358 2.42035,0.39358 0.90037,0 1.682,-0.16885 2.34478,-0.50645 0.67528,-0.33762 1.194,-0.80008 1.55663,-1.38782 0.36265,-0.58776 0.54375,-1.24455 0.54375,-1.96986 0,-0.80032 -0.16258,-1.45714 -0.4878,-1.96983 -0.31264,-0.52524 -0.71265,-0.9314 -1.20035,-1.21901 -0.47521,-0.30013 -1.06247,-0.57534 -1.76276,-0.82544 -0.9379,-0.35015 -1.66326,-0.70006 -2.17597,-1.0502 -0.50022,-0.36265 -0.75083,-0.82511 -0.75083,-1.38783 0,-0.57524 0.21278,-1.02539 0.63795,-1.35052 0.43768,-0.33764 1.02593,-0.50646 1.76375,-0.50646 0.4877,0 1.00642,0.0809 1.55664,0.24341 0.55023,0.16258 1.06895,0.37536 1.55663,0.63797 l 0.69393,-1.40745 c -1.25052,-0.72531 -2.60713,-1.08748 -4.07024,-1.08748 z m -68.67582,0.0746 v 1.74509 h 3.54514 v 11.81714 h 1.81968 v -11.81714 h 3.63839 v -1.74509 z m 50.89712,0 v 13.56223 h 8.72249 v -1.76375 h -6.90281 v -11.79848 z m -31.01801,1.59492 c 0.92537,0 1.77556,0.23124 2.55089,0.69391 0.77531,0.4627 1.38814,1.09395 1.83831,1.89428 0.45021,0.80033 0.67528,1.66992 0.67528,2.60781 0,0.93789 -0.22507,1.80652 -0.67528,2.60685 -0.43766,0.78781 -1.04435,1.41391 -1.81968,1.8766 -0.7628,0.45019 -1.60685,0.67526 -2.53224,0.67526 -0.92538,0 -1.78171,-0.23122 -2.56954,-0.69391 -0.77531,-0.46269 -1.38814,-1.08878 -1.83833,-1.8766 -0.45017,-0.78783 -0.67526,-1.64415 -0.67526,-2.56955 0,-0.93789 0.21893,-1.80651 0.65661,-2.60684 0.45019,-0.80033 1.06301,-1.43257 1.83835,-1.89525 0.77531,-0.47519 1.62551,-0.71256 2.55089,-0.71256 z m 18.54818,0 c 0.92538,0 1.77556,0.23124 2.55089,0.69391 0.77532,0.4627 1.38814,1.09395 1.83834,1.89428 0.45017,0.80033 0.67525,1.66992 0.67525,2.60781 0,0.93789 -0.22508,1.80652 -0.67525,2.60685 -0.43768,0.78781 -1.04437,1.41391 -1.81968,1.8766 -0.76282,0.45019 -1.60687,0.67526 -2.53226,0.67526 -0.92538,0 -1.7817,-0.23122 -2.56954,-0.69391 -0.77532,-0.46269 -1.38814,-1.08878 -1.83832,-1.8766 -0.45019,-0.78783 -0.67527,-1.64415 -0.67527,-2.56955 0,-0.93789 0.21893,-1.80651 0.65662,-2.60684 0.45017,-0.80033 1.063,-1.43257 1.83833,-1.89525 0.77532,-0.47519 1.62552,-0.71256 2.55089,-0.71256 z"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:1.11694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+             id="path1070" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

From 812fc057934b119c9680d8e79c9860bbc36c8b5b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:07:21 -0400
Subject: [PATCH 7999/8469] Disable adopted distutils while troubleshooting
 #2228 and #2230.

---
 setuptools/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 7a1f9f4fe1..a6cbe1322a 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -3,7 +3,8 @@
 import os
 import functools
 
-import setuptools.distutils_patch  # noqa: F401
+# Disabled for now due to: #2228, #2230
+# import setuptools.distutils_patch  # noqa: F401
 
 import distutils.core
 import distutils.filelist

From 8c85de4eeffc88b00f367fecd7caba81a0351f45 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:08:20 -0400
Subject: [PATCH 8000/8469] Update changelog. Ref #2228 and #2230.

---
 changelog.d/2228.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2228.change.rst

diff --git a/changelog.d/2228.change.rst b/changelog.d/2228.change.rst
new file mode 100644
index 0000000000..82cf8a05b1
--- /dev/null
+++ b/changelog.d/2228.change.rst
@@ -0,0 +1 @@
+Disabled distutils adoption for now while emergent issues are addressed.

From d0c71ab32deea2be265a8fcdec020089a8d1d987 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:12:39 -0400
Subject: [PATCH 8001/8469] Omit distutils_patch from test collection.

---
 conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conftest.py b/conftest.py
index 72edcf1439..50cc650957 100644
--- a/conftest.py
+++ b/conftest.py
@@ -15,6 +15,7 @@ def pytest_addoption(parser):
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
+    'setuptools/distutils_patch.py',
 ]
 
 

From 4beda61c99b9063cc2b4b8a9f099a842d99a3b6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 18:17:36 -0400
Subject: [PATCH 8002/8469] =?UTF-8?q?Bump=20version:=2049.0.0=20=E2=86=92?=
 =?UTF-8?q?=2049.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2228.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2228.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 05ff5f1881..f2f2b27125 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.0.0
+current_version = 49.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index bd67931d71..26586fbde5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.1.0
+-------
+
+* #2228: Disabled distutils adoption for now while emergent issues are addressed.
+
+
 v49.0.0
 -------
 
diff --git a/changelog.d/2228.change.rst b/changelog.d/2228.change.rst
deleted file mode 100644
index 82cf8a05b1..0000000000
--- a/changelog.d/2228.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Disabled distutils adoption for now while emergent issues are addressed.
diff --git a/setup.cfg b/setup.cfg
index d73241861e..1f347c3fce 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.0.0
+version = 49.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From bd1102648109c85c782286787e4d5290ae280abe Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 20:48:15 -0400
Subject: [PATCH 8003/8469] Amend changelog for 48.0 to include more detail
 about usage expectations. Ref #2230.

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 26586fbde5..95dd2d246b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -16,7 +16,8 @@ v49.0.0
 v48.0.0
 -------
 
-* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.
+* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects.
+  To avoid getting any legacy behavior from the standard library, projects are advised to always "import setuptools" prior to importing anything from distutils. This behavior happens by default when using ``pip install`` or ``pep517.build``. Workflows that rely on ``setup.py (anything)`` will need to first ensure setuptools is imported. One way to achieve this behavior without modifying code is to invoke Python thus: ``python -c "import setuptools; exec(open('setup.py').read())" (anything)``.
 
 
 v47.3.2

From 223b405e1433751dfb695dcb99b124e46c716a2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jul 2020 11:25:28 -0400
Subject: [PATCH 8004/8469] Use lowercase 't' for consistency in branding.

---
 docs/logo/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/logo/README.md b/docs/logo/README.md
index 88e6647c7c..74fadbf021 100644
--- a/docs/logo/README.md
+++ b/docs/logo/README.md
@@ -1,10 +1,10 @@
 ![](setup_tools_logo_colour.svg)
 ### Design:
 
-SetupTools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the SetupTools project using the Free Open Source graphics editor [Inkscape](inkscape.org).
+Setuptools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the Setuptools project using the Free Open Source graphics editor [Inkscape](inkscape.org).
 
 ### Copyright:
-Logo is (c) the SetupTools developers.
+Logo is (c) the Setuptools developers.
 
 ### Font:
 The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL).

From fd94cd038d644ff27866301f6f365a3ef0901898 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jul 2020 11:43:46 -0400
Subject: [PATCH 8005/8469] Rename logo assets to remove project name and
 'logo', which are implied by the context.

---
 ...ner_1line_1000px.png => banner 1 line color.png} | Bin
 ...our_banner_1line.svg => banner 1 line color.svg} |   0
 ...r_2lines_1000px.png => banner 2 lines color.png} | Bin
 ...r_banner_2lines.svg => banner 2 lines color.svg} |   0
 ...logo_colour_1000px.png => full color 1000px.png} | Bin
 .../{setup_tools_logo_colour.svg => full color.svg} |   0
 ...ol_colour_1000px.png => symbol color 1000px.png} | Bin
 ...ools_logo_symbol_colour.svg => symbol color.svg} |   0
 .../{setup_tools_logotype_1line.svg => type.svg}    |   0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/logo/{setup_tools_logo_colour_banner_1line_1000px.png => banner 1 line color.png} (100%)
 rename docs/logo/{setup_tools_logo_colour_banner_1line.svg => banner 1 line color.svg} (100%)
 rename docs/logo/{setup_tools_logo_colour_banner_2lines_1000px.png => banner 2 lines color.png} (100%)
 rename docs/logo/{setup_tools_logo_colour_banner_2lines.svg => banner 2 lines color.svg} (100%)
 rename docs/logo/{setup_tools_logo_colour_1000px.png => full color 1000px.png} (100%)
 rename docs/logo/{setup_tools_logo_colour.svg => full color.svg} (100%)
 rename docs/logo/{setup_tools_logo_symbol_colour_1000px.png => symbol color 1000px.png} (100%)
 rename docs/logo/{setup_tools_logo_symbol_colour.svg => symbol color.svg} (100%)
 rename docs/logo/{setup_tools_logotype_1line.svg => type.svg} (100%)

diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/banner 1 line color.png
similarity index 100%
rename from docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
rename to docs/logo/banner 1 line color.png
diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/banner 1 line color.svg
similarity index 100%
rename from docs/logo/setup_tools_logo_colour_banner_1line.svg
rename to docs/logo/banner 1 line color.svg
diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/banner 2 lines color.png
similarity index 100%
rename from docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
rename to docs/logo/banner 2 lines color.png
diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/banner 2 lines color.svg
similarity index 100%
rename from docs/logo/setup_tools_logo_colour_banner_2lines.svg
rename to docs/logo/banner 2 lines color.svg
diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/full color 1000px.png
similarity index 100%
rename from docs/logo/setup_tools_logo_colour_1000px.png
rename to docs/logo/full color 1000px.png
diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/full color.svg
similarity index 100%
rename from docs/logo/setup_tools_logo_colour.svg
rename to docs/logo/full color.svg
diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/symbol color 1000px.png
similarity index 100%
rename from docs/logo/setup_tools_logo_symbol_colour_1000px.png
rename to docs/logo/symbol color 1000px.png
diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/symbol color.svg
similarity index 100%
rename from docs/logo/setup_tools_logo_symbol_colour.svg
rename to docs/logo/symbol color.svg
diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/type.svg
similarity index 100%
rename from docs/logo/setup_tools_logotype_1line.svg
rename to docs/logo/type.svg

From 4056435460b770c3ab7a8ea1637f05de690e7e01 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jul 2020 11:49:37 -0400
Subject: [PATCH 8006/8469] Render logo in the readme.

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index 9cbf7b86e1..dc2bf98bde 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,6 @@
+.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
+
+
 .. image:: https://img.shields.io/pypi/v/setuptools.svg
    :target: `PyPI link`_
 
@@ -24,6 +27,7 @@
 .. image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
 
+
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From 0f491dc2b4141a17475eec12b02d8f237d7f7918 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jul 2020 11:57:44 -0400
Subject: [PATCH 8007/8469] Add banner to main docs page

---
 docs/index.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 13a46e74ef..f3f65cb4d0 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,5 +1,8 @@
-Welcome to Setuptools' documentation!
-=====================================
+.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
+
+
+Documentation
+=============
 
 Setuptools is a fully-featured, actively-maintained, and stable library
 designed to facilitate packaging Python projects, where packaging includes:

From 5e179ffca0a6ed5f3369139baaea61094df38524 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 4 Jul 2020 11:59:16 -0400
Subject: [PATCH 8008/8469] Remove stale description of packaging.

---
 docs/index.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index f3f65cb4d0..228f97c8b5 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -5,14 +5,7 @@ Documentation
 =============
 
 Setuptools is a fully-featured, actively-maintained, and stable library
-designed to facilitate packaging Python projects, where packaging includes:
-
- - Python package and module definitions
- - Distribution package metadata
- - Test hooks
- - Project installation
- - Platform-specific details
- - Python 3 support
+designed to facilitate packaging Python projects.
 
 Documentation content:
 

From f3b4a9972163e6063b9d37db6352a54735955d81 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Jul 2020 16:31:24 -0400
Subject: [PATCH 8009/8469] Add test for spawn when exe is missing. Ref
 pypa/distutils#3.

---
 distutils/tests/test_spawn.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/distutils/tests/test_spawn.py b/distutils/tests/test_spawn.py
index 919d0ad98f..704019a198 100644
--- a/distutils/tests/test_spawn.py
+++ b/distutils/tests/test_spawn.py
@@ -126,6 +126,11 @@ def test_find_executable(self):
                     rv = find_executable(program)
                     self.assertEqual(rv, filename)
 
+    def test_spawn_missing_exe(self):
+        with self.assertRaises(DistutilsExecError) as ctx:
+            spawn(['does-not-exist'])
+            assert 'command does-no-exist failed' in str(ctx)
+
 
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)

From 7aa5abeafc1e0b1b351c4c8ac7eb14c310366a46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Jul 2020 16:33:16 -0400
Subject: [PATCH 8010/8469] Replace OSError with DistutilsExecError. Fixes
 pypa/distutils#3 and pypa/setuptools#2228 and bpo-41207.

---
 distutils/spawn.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/distutils/spawn.py b/distutils/spawn.py
index aad277b0ca..0d1bd0391e 100644
--- a/distutils/spawn.py
+++ b/distutils/spawn.py
@@ -71,9 +71,15 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
             env = dict(os.environ,
                        MACOSX_DEPLOYMENT_TARGET=cur_target)
 
-    proc = subprocess.Popen(cmd, env=env)
-    proc.wait()
-    exitcode = proc.returncode
+    try:
+        proc = subprocess.Popen(cmd, env=env)
+        proc.wait()
+        exitcode = proc.returncode
+    except OSError as exc:
+        if not DEBUG:
+            cmd = cmd[0]
+        raise DistutilsExecError(
+            "command %r failed: %s" % (cmd, exc.args[-1])) from exc
 
     if exitcode:
         if not DEBUG:

From ea966a23de98c04df90ba13e9fb03d1b0afe4962 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Jul 2020 16:40:01 -0400
Subject: [PATCH 8011/8469] Update changelog. Ref #2228.

---
 changelog.d/2228.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2228.misc.rst

diff --git a/changelog.d/2228.misc.rst b/changelog.d/2228.misc.rst
new file mode 100644
index 0000000000..be6b199d59
--- /dev/null
+++ b/changelog.d/2228.misc.rst
@@ -0,0 +1 @@
+Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file.

From 44cec449385cac29b0f6c9719b506eb6b8c1826d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 5 Jul 2020 16:40:17 -0400
Subject: [PATCH 8012/8469] =?UTF-8?q?Bump=20version:=2049.0.0=20=E2=86=92?=
 =?UTF-8?q?=2049.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2228.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2228.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 05ff5f1881..87d756b8bb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.0.0
+current_version = 49.0.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index bd67931d71..a38b610b46 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.0.1
+-------
+
+* #2228: Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file.
+
+
 v49.0.0
 -------
 
diff --git a/changelog.d/2228.misc.rst b/changelog.d/2228.misc.rst
deleted file mode 100644
index be6b199d59..0000000000
--- a/changelog.d/2228.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file.
diff --git a/setup.cfg b/setup.cfg
index d73241861e..c9d108ca98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.0.0
+version = 49.0.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From c6fff69d9597c203cb6a7f3b34dbb6244f148ae6 Mon Sep 17 00:00:00 2001
From: Hai Shi <shihai1992@gmail.com>
Date: Mon, 6 Jul 2020 20:29:49 +0800
Subject: [PATCH 8013/8469] bpo-40275: Use new test.support helper submodules
 in tests (GH-21317)

---
 tests/support.py        |  4 ++--
 tests/test_build_ext.py |  3 ++-
 tests/test_filelist.py  | 13 ++++++-------
 tests/test_spawn.py     | 18 +++++++++---------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/support.py b/tests/support.py
index 259af882ec..23b907b607 100644
--- a/tests/support.py
+++ b/tests/support.py
@@ -6,7 +6,7 @@
 import unittest
 import sysconfig
 from copy import deepcopy
-import test.support
+from test.support import os_helper
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
@@ -64,7 +64,7 @@ def tearDown(self):
         super().tearDown()
         while self.tempdirs:
             tmpdir = self.tempdirs.pop()
-            test.support.rmtree(tmpdir)
+            os_helper.rmtree(tmpdir)
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index 5e47e0773a..f9e0d766d8 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -15,6 +15,7 @@
 
 import unittest
 from test import support
+from test.support import os_helper
 from test.support.script_helper import assert_python_ok
 
 # http://bugs.python.org/issue4373
@@ -38,7 +39,7 @@ def setUp(self):
         # bpo-30132: On Windows, a .pdb file may be created in the current
         # working directory. Create a temporary working directory to cleanup
         # everything at the end of the test.
-        change_cwd = support.change_cwd(self.tmp_dir)
+        change_cwd = os_helper.change_cwd(self.tmp_dir)
         change_cwd.__enter__()
         self.addCleanup(change_cwd.__exit__, None, None, None)
 
diff --git a/tests/test_filelist.py b/tests/test_filelist.py
index 2c26c22617..cee97d439e 100644
--- a/tests/test_filelist.py
+++ b/tests/test_filelist.py
@@ -8,7 +8,6 @@
 from distutils.filelist import glob_to_re, translate_pattern, FileList
 from distutils import filelist
 
-import test.support
 from test.support import os_helper
 from test.support import captured_stdout, run_unittest
 from distutils.tests import support
@@ -298,7 +297,7 @@ def test_process_template(self):
 class FindAllTestCase(unittest.TestCase):
     @os_helper.skip_unless_symlink
     def test_missing_symlink(self):
-        with test.support.temp_cwd():
+        with os_helper.temp_cwd():
             os.symlink('foo', 'bar')
             self.assertEqual(filelist.findall(), [])
 
@@ -308,13 +307,13 @@ def test_basic_discovery(self):
         '.' as the parameter, the dot should be omitted from
         the results.
         """
-        with test.support.temp_cwd():
+        with os_helper.temp_cwd():
             os.mkdir('foo')
             file1 = os.path.join('foo', 'file1.txt')
-            test.support.create_empty_file(file1)
+            os_helper.create_empty_file(file1)
             os.mkdir('bar')
             file2 = os.path.join('bar', 'file2.txt')
-            test.support.create_empty_file(file2)
+            os_helper.create_empty_file(file2)
             expected = [file2, file1]
             self.assertEqual(sorted(filelist.findall()), expected)
 
@@ -323,9 +322,9 @@ def test_non_local_discovery(self):
         When findall is called with another path, the full
         path name should be returned.
         """
-        with test.support.temp_dir() as temp_dir:
+        with os_helper.temp_dir() as temp_dir:
             file1 = os.path.join(temp_dir, 'file1.txt')
-            test.support.create_empty_file(file1)
+            os_helper.create_empty_file(file1)
             expected = [file1]
             self.assertEqual(filelist.findall(temp_dir), expected)
 
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index cf1faad5f4..3647bab7b1 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -4,7 +4,7 @@
 import sys
 import unittest.mock
 from test.support import run_unittest, unix_shell
-from test import support as test_support
+from test.support import os_helper
 
 from distutils.spawn import find_executable
 from distutils.spawn import spawn
@@ -44,9 +44,9 @@ def test_spawn(self):
         spawn([exe])  # should work without any error
 
     def test_find_executable(self):
-        with test_support.temp_dir() as tmp_dir:
+        with os_helper.temp_dir() as tmp_dir:
             # use TESTFN to get a pseudo-unique filename
-            program_noeext = test_support.TESTFN
+            program_noeext = os_helper.TESTFN
             # Give the temporary program an ".exe" suffix for all.
             # It's needed on Windows and not harmful on other platforms.
             program = program_noeext + ".exe"
@@ -66,7 +66,7 @@ def test_find_executable(self):
                 self.assertEqual(rv, filename)
 
             # test find in the current directory
-            with test_support.change_cwd(tmp_dir):
+            with os_helper.change_cwd(tmp_dir):
                 rv = find_executable(program)
                 self.assertEqual(rv, program)
 
@@ -76,7 +76,7 @@ def test_find_executable(self):
             self.assertIsNone(rv)
 
             # PATH='': no match, except in the current directory
-            with test_support.EnvironmentVarGuard() as env:
+            with os_helper.EnvironmentVarGuard() as env:
                 env['PATH'] = ''
                 with unittest.mock.patch('distutils.spawn.os.confstr',
                                          return_value=tmp_dir, create=True), \
@@ -86,12 +86,12 @@ def test_find_executable(self):
                     self.assertIsNone(rv)
 
                     # look in current directory
-                    with test_support.change_cwd(tmp_dir):
+                    with os_helper.change_cwd(tmp_dir):
                         rv = find_executable(program)
                         self.assertEqual(rv, program)
 
             # PATH=':': explicitly looks in the current directory
-            with test_support.EnvironmentVarGuard() as env:
+            with os_helper.EnvironmentVarGuard() as env:
                 env['PATH'] = os.pathsep
                 with unittest.mock.patch('distutils.spawn.os.confstr',
                                          return_value='', create=True), \
@@ -100,12 +100,12 @@ def test_find_executable(self):
                     self.assertIsNone(rv)
 
                     # look in current directory
-                    with test_support.change_cwd(tmp_dir):
+                    with os_helper.change_cwd(tmp_dir):
                         rv = find_executable(program)
                         self.assertEqual(rv, program)
 
             # missing PATH: test os.confstr("CS_PATH") and os.defpath
-            with test_support.EnvironmentVarGuard() as env:
+            with os_helper.EnvironmentVarGuard() as env:
                 env.pop('PATH', None)
 
                 # without confstr

From a21ea47bf0a8bbd79afdbd93b80681f1133aedf0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jul 2020 06:39:32 -0400
Subject: [PATCH 8014/8469] Move assert outside the context so it actually has
 its effect.

---
 distutils/tests/test_spawn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distutils/tests/test_spawn.py b/distutils/tests/test_spawn.py
index 704019a198..adaa48ef2d 100644
--- a/distutils/tests/test_spawn.py
+++ b/distutils/tests/test_spawn.py
@@ -129,7 +129,7 @@ def test_find_executable(self):
     def test_spawn_missing_exe(self):
         with self.assertRaises(DistutilsExecError) as ctx:
             spawn(['does-not-exist'])
-            assert 'command does-no-exist failed' in str(ctx)
+        self.assertIn("command 'does-not-exist' failed", str(ctx.exception))
 
 
 def test_suite():

From 58f0b3d1ef9d17d511cf027e87f7b87dc3be6bd9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jul 2020 07:11:12 -0400
Subject: [PATCH 8015/8469] Remove py2_warn, no longer needed as a SyntaxError
 is encountered before the warning can be issueed.

---
 pkg_resources/__init__.py |  1 -
 pkg_resources/py2_warn.py | 16 ----------------
 2 files changed, 17 deletions(-)
 delete mode 100644 pkg_resources/py2_warn.py

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b9534903be..5927ef0dfe 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -82,7 +82,6 @@
 __import__('pkg_resources.extern.packaging.specifiers')
 __import__('pkg_resources.extern.packaging.requirements')
 __import__('pkg_resources.extern.packaging.markers')
-__import__('pkg_resources.py2_warn')
 
 
 __metaclass__ = type
diff --git a/pkg_resources/py2_warn.py b/pkg_resources/py2_warn.py
deleted file mode 100644
index 6855aa245e..0000000000
--- a/pkg_resources/py2_warn.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import sys
-import warnings
-import textwrap
-
-
-msg = textwrap.dedent("""
-    Encountered a version of Setuptools that no longer supports
-    this version of Python. Please head to
-    https://bit.ly/setuptools-py2-sunset for support.
-    """)
-
-pre = "Setuptools no longer works on Python 2\n"
-
-if sys.version_info < (3,):
-    warnings.warn(pre + "*" * 60 + msg + "*" * 60)
-    raise SystemExit(32)

From e34d6d8b739a8e0edbdfa324bf3607430aa3ff70 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jul 2020 07:11:28 -0400
Subject: [PATCH 8016/8469] bpo-41207 In distutils.spawn, rewrite FileNotFound
 (GH-21359)

Automerge-Triggered-By: @jaraco
---
 spawn.py            | 12 +++++++++---
 tests/test_spawn.py |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/spawn.py b/spawn.py
index aad277b0ca..0d1bd0391e 100644
--- a/spawn.py
+++ b/spawn.py
@@ -71,9 +71,15 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
             env = dict(os.environ,
                        MACOSX_DEPLOYMENT_TARGET=cur_target)
 
-    proc = subprocess.Popen(cmd, env=env)
-    proc.wait()
-    exitcode = proc.returncode
+    try:
+        proc = subprocess.Popen(cmd, env=env)
+        proc.wait()
+        exitcode = proc.returncode
+    except OSError as exc:
+        if not DEBUG:
+            cmd = cmd[0]
+        raise DistutilsExecError(
+            "command %r failed: %s" % (cmd, exc.args[-1])) from exc
 
     if exitcode:
         if not DEBUG:
diff --git a/tests/test_spawn.py b/tests/test_spawn.py
index 3647bab7b1..4ec767b120 100644
--- a/tests/test_spawn.py
+++ b/tests/test_spawn.py
@@ -124,6 +124,11 @@ def test_find_executable(self):
                     rv = find_executable(program)
                     self.assertEqual(rv, filename)
 
+    def test_spawn_missing_exe(self):
+        with self.assertRaises(DistutilsExecError) as ctx:
+            spawn(['does-not-exist'])
+        self.assertIn("command 'does-not-exist' failed", str(ctx.exception))
+
 
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)

From 317337daee72994b3d452ffcce5f4ecd47d9dc5d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jul 2020 17:08:52 -0400
Subject: [PATCH 8017/8469] Update changelog.

---
 changelog.d/2094.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2094.misc.rst

diff --git a/changelog.d/2094.misc.rst b/changelog.d/2094.misc.rst
new file mode 100644
index 0000000000..675cd3528a
--- /dev/null
+++ b/changelog.d/2094.misc.rst
@@ -0,0 +1 @@
+Removed pkg_resources.py2_warn module, which is no longer reachable.

From cd8ac41d2f40de096251b78a55a74b2705a7af8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 10 Jul 2020 14:08:59 -0400
Subject: [PATCH 8018/8469] =?UTF-8?q?Bump=20version:=2049.1.0=20=E2=86=92?=
 =?UTF-8?q?=2049.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2094.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2094.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index f2f2b27125..55f806f90b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.1.0
+current_version = 49.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index f00482e3fc..d5a2a70345 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.1.1
+-------
+
+* #2094: Removed pkg_resources.py2_warn module, which is no longer reachable.
+
+
 v49.0.1
 -------
 
diff --git a/changelog.d/2094.misc.rst b/changelog.d/2094.misc.rst
deleted file mode 100644
index 675cd3528a..0000000000
--- a/changelog.d/2094.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed pkg_resources.py2_warn module, which is no longer reachable.
diff --git a/setup.cfg b/setup.cfg
index 1f347c3fce..3151fa499e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.1.0
+version = 49.1.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 069eb7de91856a92f0c630b048f14367af80c3ad Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sat, 11 Jul 2020 02:58:16 +0300
Subject: [PATCH 8019/8469] Test Python 3.9-dev

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e8bc75743b..0e636eecc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ jobs:
   - <<: *latest_py3
     env: LANG=C
   - python: 3.8-dev
+  - python: 3.9-dev
   - <<: *latest_py3
     env: TOXENV=docs
   allow_failures:

From 67f0cc59f0d803f13c1da1cb60e87469f656617e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 10 Jul 2020 20:14:49 -0400
Subject: [PATCH 8020/8469] Provide escape hatch for distutils adoption.

---
 setuptools/distutils_patch.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index b2095fbac7..bd1b499702 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -7,6 +7,7 @@
 
 import sys
 import re
+import os
 import importlib
 import warnings
 
@@ -20,6 +21,13 @@ def clear_distutils():
         del sys.modules[name]
 
 
+def enabled():
+    """
+    Provide an escape hatch for environments wishing to opt out.
+    """
+    return 'SETUPTOOLS_DISTUTILS_ADOPTION_OPT_OUT' not in os.environ
+
+
 def ensure_local_distutils():
     clear_distutils()
     distutils = importlib.import_module('setuptools._distutils')
@@ -31,4 +39,5 @@ def ensure_local_distutils():
     assert '_distutils' in core.__file__, core.__file__
 
 
-ensure_local_distutils()
+if enabled():
+    ensure_local_distutils()

From bedaf1309d2633831a7fb7dea561642e7da704df Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 10 Jul 2020 20:46:30 -0400
Subject: [PATCH 8021/8469] Allow opt-in and opt-out of distutils adoption at
 run time with SETUPTOOLS_USE_DISTUTILS environment variable.

---
 changelog.d/2232.misc.patch   | 1 +
 setuptools/__init__.py        | 2 +-
 setuptools/distutils_patch.py | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/2232.misc.patch

diff --git a/changelog.d/2232.misc.patch b/changelog.d/2232.misc.patch
new file mode 100644
index 0000000000..4a956e1e3a
--- /dev/null
+++ b/changelog.d/2232.misc.patch
@@ -0,0 +1 @@
+In preparation for re-enabling a local copy of distutils, Setuptools now honors an environment variable, SETUPTOOLS_USE_DISTUTILS. If set to 'stdlib' (current default), distutils will be used from the standard library. If set to 'local' (default in a imminent backward-incompatible release), the local copy of distutils will be used.
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a6cbe1322a..8388251115 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -4,7 +4,7 @@
 import functools
 
 # Disabled for now due to: #2228, #2230
-# import setuptools.distutils_patch  # noqa: F401
+import setuptools.distutils_patch  # noqa: F401
 
 import distutils.core
 import distutils.filelist
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index bd1b499702..c5f273dd4d 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -23,9 +23,10 @@ def clear_distutils():
 
 def enabled():
     """
-    Provide an escape hatch for environments wishing to opt out.
+    Allow selection of distutils by environment variable.
     """
-    return 'SETUPTOOLS_DISTUTILS_ADOPTION_OPT_OUT' not in os.environ
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
+    return which == 'local'
 
 
 def ensure_local_distutils():

From 599f6393c1be4d5852f5b9884b9fb282a16ca64a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Jul 2020 02:17:03 -0400
Subject: [PATCH 8022/8469] =?UTF-8?q?Bump=20version:=2049.1.1=20=E2=86=92?=
 =?UTF-8?q?=2049.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2232.misc.patch | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2232.misc.patch

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 55f806f90b..30e83be1e0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.1.1
+current_version = 49.1.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index d5a2a70345..24837a9772 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.1.2
+-------
+
+* #2232: In preparation for re-enabling a local copy of distutils, Setuptools now honors an environment variable, SETUPTOOLS_USE_DISTUTILS. If set to 'stdlib' (current default), distutils will be used from the standard library. If set to 'local' (default in a imminent backward-incompatible release), the local copy of distutils will be used.
+
+
 v49.1.1
 -------
 
diff --git a/changelog.d/2232.misc.patch b/changelog.d/2232.misc.patch
deleted file mode 100644
index 4a956e1e3a..0000000000
--- a/changelog.d/2232.misc.patch
+++ /dev/null
@@ -1 +0,0 @@
-In preparation for re-enabling a local copy of distutils, Setuptools now honors an environment variable, SETUPTOOLS_USE_DISTUTILS. If set to 'stdlib' (current default), distutils will be used from the standard library. If set to 'local' (default in a imminent backward-incompatible release), the local copy of distutils will be used.
diff --git a/setup.cfg b/setup.cfg
index 3151fa499e..dc29f7b1ab 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.1.1
+version = 49.1.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 8b4ce333c093f459698c0545550269a393387c5f Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sat, 11 Jul 2020 12:51:48 -0600
Subject: [PATCH 8023/8469] Change exec_module to load_module

Fixes #2246
---
 setuptools/command/bdist_egg.py | 2 +-
 setuptools/command/build_ext.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index e94fe25250..7af3165cd5 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -59,7 +59,7 @@ def __bootstrap__():
             from importlib.machinery import ExtensionFileLoader
             __file__ = pkg_resources.resource_filename(__name__, %r)
             __loader__ = None; del __bootstrap__, __loader__
-            ExtensionFileLoader(__name__,__file__).exec_module()
+            ExtensionFileLoader(__name__,__file__).load_module()
         __bootstrap__()
         """).lstrip()
     with open(pyfile, 'w') as f:
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 327fa06335..0eb29adc8b 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -268,7 +268,7 @@ def write_stub(self, output_dir, ext, compile=False):
                     "     os.chdir(os.path.dirname(__file__))",
                     if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
                     "     ExtensionFileLoader(__name__,",
-                    "                         __file__).exec_module()",
+                    "                         __file__).load_module()",
                     "   finally:",
                     if_dl("     sys.setdlopenflags(old_flags)"),
                     "     os.chdir(old_dir)",

From 6d3250fa1ea1a309e8e45737d0a1dccbbd3f95e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 03:39:35 -0400
Subject: [PATCH 8024/8469] Add a simple blank issue so it gets a green button.

---
 .github/ISSUE_TEMPLATE/blank.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/blank.md

diff --git a/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md
new file mode 100644
index 0000000000..e41fc749c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/blank.md
@@ -0,0 +1,4 @@
+---
+name: Bug Report or Feature Request
+about: Report a bug or request a feature
+---

From b69029f753e061359adc554b2f5c600a2d143bf9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 03:49:59 -0400
Subject: [PATCH 8025/8469] Update changelog.

---
 changelog.d/2249.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2249.misc.rst

diff --git a/changelog.d/2249.misc.rst b/changelog.d/2249.misc.rst
new file mode 100644
index 0000000000..14742dc354
--- /dev/null
+++ b/changelog.d/2249.misc.rst
@@ -0,0 +1 @@
+Fix extension loading technique in stubs.

From c4e3afb3f559f6cbe0f29ad908de8b05b993fb5f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 04:14:22 -0400
Subject: [PATCH 8026/8469] Add README, including docs describing how to
 synchronize with CPython.

---
 README.rst | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 README.rst

diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000..e619264d29
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,40 @@
+Python Module Distribution Utilities extracted from the Python Standard Library
+
+Synchronizing
+=============
+
+This project is kept in sync with the code still in stdlib.
+
+From CPython
+------------
+
+The original history and attribution of all changes contributed to CPython can be found in the `cpython branch <https://github.com/pypa/distutils/tree/cpython>`_. If new commits are added to CPython, they should be synchronized back to this project.
+
+First, create a clone of CPython that only includes the distutils changes. Due to the large size of the CPython repository, this operation is fairly expensive.
+
+    git clone https://github.com/python/cpython python-distutils
+    cd python-distutils
+    git filter-branch --prune-empty --subdirectory-filter Lib/distutils master
+
+Then, pull those changes into the repository at the cpython branch.
+
+    cd $distutils
+    git checkout cpython
+    git fetch $python_distutils
+    git merge FETCH_HEAD
+
+Finally, merge the changes from cpython into master (possibly as a pull request).
+
+To CPython
+----------
+
+Merging changes from this repository is easier.
+
+From the CPython repo, cherry-pick the changes from this project.
+
+    git -C $distutils format-patch HEAD~2 --stdout | git am --directory Lib
+
+To Setuptools
+-------------
+
+This project also maintains a `clean branch <https://github.com/pypa/distutils/tree/clean>`_ to capture only the code changes to distutils, excluding the ancillary details like packaging and this document.

From 0039de02e84a2256d6d4763fb76836dd4748f3e4 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Sun, 12 Jul 2020 11:42:24 +0300
Subject: [PATCH 8027/8469] Test Python 3.9-dev

---
 .github/workflows/python-tests.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 5a5980842c..f2188d38da 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -30,6 +30,9 @@ jobs:
         - macOS-latest
         # - windows-2019
         # - windows-2016
+        include:
+        # Dev versions
+        - { python-version: 3.9-dev, os: ubuntu-20.04 }
 
     env:
       NETWORK_REQUIRED: 1
@@ -38,8 +41,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@master
+    - name: Set up Python ${{ matrix.python-version }} (deadsnakes)
+      uses: deadsnakes/action@v1.0.0
+      if: endsWith(matrix.python-version, '-dev')
+      with:
+        python-version: ${{ matrix.python-version }}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1.1.1
+      if: "!endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}
     - name: Log Python version

From 360aadc4c2a9941a68a3f3f63375ce5380fef6a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 11 Jul 2020 15:31:18 -0400
Subject: [PATCH 8028/8469] Allow spawn to accept environment. Avoid
 monkey-patching global state. Closes pypa/setuptools#2212 and closes
 pypa/distutils#5.

---
 distutils/_msvccompiler.py | 8 ++------
 distutils/spawn.py         | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/distutils/_msvccompiler.py b/distutils/_msvccompiler.py
index af8099a407..0e98692e31 100644
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
@@ -501,12 +501,8 @@ def link(self,
             log.debug("skipping %s (up-to-date)", output_filename)
 
     def spawn(self, cmd):
-        old_path = os.getenv('path')
-        try:
-            os.environ['path'] = self._paths
-            return super().spawn(cmd)
-        finally:
-            os.environ['path'] = old_path
+        env = dict(os.environ, path=self._paths)
+        return super().spawn(cmd, env=env)
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in
diff --git a/distutils/spawn.py b/distutils/spawn.py
index 0d1bd0391e..fc592d4a91 100644
--- a/distutils/spawn.py
+++ b/distutils/spawn.py
@@ -20,7 +20,7 @@
     _cfg_target_split = None
 
 
-def spawn(cmd, search_path=1, verbose=0, dry_run=0):
+def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):
     """Run another program, specified as a command list 'cmd', in a new process.
 
     'cmd' is just the argument list for the new process, ie.
@@ -49,7 +49,8 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
         if executable is not None:
             cmd[0] = executable
 
-    env = None
+    env = env if env is not None else dict(os.environ)
+
     if sys.platform == 'darwin':
         global _cfg_target, _cfg_target_split
         if _cfg_target is None:
@@ -68,8 +69,7 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
                           'now "%s" but "%s" during configure'
                                 % (cur_target, _cfg_target))
                 raise DistutilsPlatformError(my_msg)
-            env = dict(os.environ,
-                       MACOSX_DEPLOYMENT_TARGET=cur_target)
+            env.update(MACOSX_DEPLOYMENT_TARGET=cur_target)
 
     try:
         proc = subprocess.Popen(cmd, env=env)

From 8a4bc38e7b582b2006e17118162b1d2a0a23b8ad Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 05:02:18 -0400
Subject: [PATCH 8029/8469] Update changelog.

---
 changelog.d/2212.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2212.misc.rst

diff --git a/changelog.d/2212.misc.rst b/changelog.d/2212.misc.rst
new file mode 100644
index 0000000000..d6fc7bf8af
--- /dev/null
+++ b/changelog.d/2212.misc.rst
@@ -0,0 +1 @@
+(Distutils) Allow spawn to accept environment. Avoid monkey-patching global state.

From 9e16d5399bb6b01aa0d7a73159765f064f88db22 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 05:07:29 -0400
Subject: [PATCH 8030/8469] =?UTF-8?q?Bump=20version:=2049.1.2=20=E2=86=92?=
 =?UTF-8?q?=2049.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 7 +++++++
 changelog.d/2212.misc.rst | 1 -
 changelog.d/2249.misc.rst | 1 -
 setup.cfg                 | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/2212.misc.rst
 delete mode 100644 changelog.d/2249.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 30e83be1e0..5e4d74b050 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.1.2
+current_version = 49.1.3
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 24837a9772..b23bc3948f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v49.1.3
+-------
+
+* #2212: (Distutils) Allow spawn to accept environment. Avoid monkey-patching global state.
+* #2249: Fix extension loading technique in stubs.
+
+
 v49.1.2
 -------
 
diff --git a/changelog.d/2212.misc.rst b/changelog.d/2212.misc.rst
deleted file mode 100644
index d6fc7bf8af..0000000000
--- a/changelog.d/2212.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-(Distutils) Allow spawn to accept environment. Avoid monkey-patching global state.
diff --git a/changelog.d/2249.misc.rst b/changelog.d/2249.misc.rst
deleted file mode 100644
index 14742dc354..0000000000
--- a/changelog.d/2249.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix extension loading technique in stubs.
diff --git a/setup.cfg b/setup.cfg
index dc29f7b1ab..bad15f93e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.1.2
+version = 49.1.3
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 9e58d95017656ee33d2cf642cf1be6c77298f16d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 10:56:14 -0400
Subject: [PATCH 8031/8469] Re-enable distutils patch by default.

---
 changelog.d/2232.breaking.rst | 1 +
 setuptools/distutils_patch.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2232.breaking.rst

diff --git a/changelog.d/2232.breaking.rst b/changelog.d/2232.breaking.rst
new file mode 100644
index 0000000000..b2fd926fe8
--- /dev/null
+++ b/changelog.d/2232.breaking.rst
@@ -0,0 +1 @@
+Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index c5f273dd4d..e6b2aad540 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -25,7 +25,7 @@ def enabled():
     """
     Allow selection of distutils by environment variable.
     """
-    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local')
     return which == 'local'
 
 

From 36df1d74933ef18a4099f4e82dbe55c00e45709e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 11:39:51 -0400
Subject: [PATCH 8032/8469] Warn the user when distutils is present to
 discourage this usage and direct users to the recommended usage. Closes
 #2230.

---
 changelog.d/2230.change.rst   |  1 +
 setuptools/distutils_patch.py | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2230.change.rst

diff --git a/changelog.d/2230.change.rst b/changelog.d/2230.change.rst
new file mode 100644
index 0000000000..1719f497c0
--- /dev/null
+++ b/changelog.d/2230.change.rst
@@ -0,0 +1 @@
+Now warn the user when setuptools is imported after distutils modules have been loaded (exempting PyPy for 3.6), directing the users of packages to import setuptools first.
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index c5f273dd4d..33f1e7f961 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -12,10 +12,26 @@
 import warnings
 
 
+is_pypy = '__pypy__' in sys.builtin_module_names
+
+
+def warn_distutils_present():
+    if 'distutils' not in sys.modules:
+        return
+    if is_pypy and sys.version_info < (3, 7):
+        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
+        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
+        return
+    warnings.warn(
+        "Distutils was imported before Setuptools. This usage is discouraged "
+        "and may exhibit undesirable behaviors or errors. Please use "
+        "Setuptools' objects directly or at least import Setuptools first.")
+
+
 def clear_distutils():
     if 'distutils' not in sys.modules:
         return
-    warnings.warn("Setuptools is replacing distutils")
+    warnings.warn("Setuptools is replacing distutils.")
     mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
     for name in mods:
         del sys.modules[name]
@@ -40,5 +56,6 @@ def ensure_local_distutils():
     assert '_distutils' in core.__file__, core.__file__
 
 
+warn_distutils_present()
 if enabled():
     ensure_local_distutils()

From 9f47efe757762351ec12b4303e747ac0774db991 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 3 Jul 2020 02:54:32 -0400
Subject: [PATCH 8033/8469] Programmatically disable coverage when running on
 PyPy.

---
 conftest.py | 18 ++++++++++++++++++
 tox.ini     |  4 ----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/conftest.py b/conftest.py
index 1746bfb588..0bc8d320bf 100644
--- a/conftest.py
+++ b/conftest.py
@@ -17,6 +17,24 @@ def pytest_addoption(parser):
 ]
 
 
+def pytest_configure(config):
+    disable_coverage_on_pypy(config)
+
+
+def disable_coverage_on_pypy(config):
+    """
+    Coverage makes tests on PyPy unbearably slow, so disable it.
+    """
+    if '__pypy__' not in sys.builtin_module_names:
+        return
+
+    # Recommended at pytest-dev/pytest-cov#418
+    cov = config.pluginmanager.get_plugin('_cov')
+    cov.options.no_cov = True
+    if cov.cov_controller:
+        cov.cov_controller.pause()
+
+
 if sys.version_info < (3,):
     collect_ignore.append('setuptools/lib2to3_ex.py')
     collect_ignore.append('setuptools/_imp.py')
diff --git a/tox.ini b/tox.ini
index 59213e88f9..9ce5cb5c37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,10 +29,6 @@ extras =
 	tests
 
 
-[testenv:pypy{,3}]
-commands = pytest --no-cov {posargs}
-
-
 [testenv:coverage]
 description=Combine coverage data and create report
 deps=coverage

From 37d81f4ce8f08c4baf44b6ff0f3f1bd3f6b2a127 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 12 Jul 2020 12:09:11 -0400
Subject: [PATCH 8034/8469] =?UTF-8?q?Bump=20version:=2049.1.3=20=E2=86=92?=
 =?UTF-8?q?=2049.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2230.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2230.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5e4d74b050..9b3e408589 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.1.3
+current_version = 49.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index b23bc3948f..82e6ef66d3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.2.0
+-------
+
+* #2230: Now warn the user when setuptools is imported after distutils modules have been loaded (exempting PyPy for 3.6), directing the users of packages to import setuptools first.
+
+
 v49.1.3
 -------
 
diff --git a/changelog.d/2230.change.rst b/changelog.d/2230.change.rst
deleted file mode 100644
index 1719f497c0..0000000000
--- a/changelog.d/2230.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Now warn the user when setuptools is imported after distutils modules have been loaded (exempting PyPy for 3.6), directing the users of packages to import setuptools first.
diff --git a/setup.cfg b/setup.cfg
index bad15f93e6..fa0e565646 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.1.3
+version = 49.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From eb2ab6bc6e32ef48d4a286c0453c10d10d0f129b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 09:41:01 -0400
Subject: [PATCH 8035/8469] Remove issue templates

The "setuptools warns about incompatibility" template has generated no
useful reports and should be removed.
---
 .github/ISSUE_TEMPLATE/blank.md               |  4 --
 ...ls-warns-about-python-2-incompatibility.md | 59 -------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/blank.md
 delete mode 100644 .github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md

diff --git a/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md
deleted file mode 100644
index e41fc749c7..0000000000
--- a/.github/ISSUE_TEMPLATE/blank.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-name: Bug Report or Feature Request
-about: Report a bug or request a feature
----
diff --git a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md b/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
deleted file mode 100644
index 1a4f58f284..0000000000
--- a/.github/ISSUE_TEMPLATE/setuptools-warns-about-python-2-incompatibility.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-name: Setuptools warns about Python 2 incompatibility
-about: Report the issue where setuptools 45 or later stops working on Python 2
-title: Incompatible install in (summarize your environment)
-labels: Python 2
-assignees: ''
-
----
-
-<!--
-
-Please DO NOT SUBMIT this template without first investigating the issue and answering the questions below. This template is intended mainly for developers of systems and not for end users. If you are an end user experiencing the warning, please work with your system maintainers (starting with the project you're trying to use) to report the issue.
-
-If you did not intend to use this template, but only meant to file a blank issue, just hit the back button and click "Open a blank issue".
-
-Setuptools 45 dropped support for Python 2 with a strenuous warning and Setuptools 47 fails to run on Python 2.
-
-In most cases, using pip 9 or later to install Setuptools from PyPI or any index supporting the Requires-Python metadata will do the right thing and install Setuptools 44.x on Python 2.
-
-If you've come to file an issue, it's probably because some process managed to bypass these protections.
-
-Your first course of action should be to reason about how you managed to get an unsupported version of Setuptools on Python 2. Please complete the sections below and provide any other detail about your environment that will help us help you.
-
--->
-
-## Prerequisites
-
-<!-- These are the recommended workarounds for the issue. Please
-try them first. -->
-
-- [ ] Read [Python 2 Sunset docs](https://setuptools.readthedocs.io/en/latest/python%202%20sunset.html).
-- [ ] Python 2 is required for this application.
-- [ ] I maintain the software that installs Setuptools (if not, please contact that project).
-- [ ] Setuptools installed with pip 9 or later.
-- [ ] Pinning Setuptools to `setuptools<45` in the environment was unsuccessful.
-
-## Environment Details
-
-- Operating System and version:
-- Python version:
-- Python installed how:
-- Virtualenv version (if using virtualenv): n/a
-
-Command(s) that triggered the warning/error (and output):
-
-```
-```
-
-Command(s) used to install setuptools (and output):
-
-```
-```
-
-Output of `pip --version` when installing setuptools:
-
-```
-```
-
-## Other notes

From 28e1b5ab2f4d573a91705cdbb025e57023d264b1 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 11:15:26 -0400
Subject: [PATCH 8036/8469] Use .pth file to import distutils from setuptools

---
 MANIFEST.in                                   |  1 +
 _distutils_importer/__init__.py               |  6 ++++
 .../distutils/__init__.py                     |  3 ++
 distutils_precedence.pth                      |  1 +
 setup.py                                      | 32 +++++++++++++++++++
 5 files changed, 43 insertions(+)
 create mode 100644 _distutils_importer/__init__.py
 create mode 100644 _distutils_importer/distutils-shim-package/distutils/__init__.py
 create mode 100644 distutils_precedence.pth

diff --git a/MANIFEST.in b/MANIFEST.in
index 128ae280ec..be83a7f336 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -13,4 +13,5 @@ include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini
 include tox.ini
+include distutils_precedence.pth
 exclude pyproject.toml  # Temporary workaround for #1644.
diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
new file mode 100644
index 0000000000..54a825fed6
--- /dev/null
+++ b/_distutils_importer/__init__.py
@@ -0,0 +1,6 @@
+import sys
+
+here = os.path.dirname(__file__)
+NEW_DISTUTILS_LOCATION = os.path.join(here, 'distutils-shim-package')
+
+sys.path.insert(0, NEW_DISTUTILS_LOCATION)
diff --git a/_distutils_importer/distutils-shim-package/distutils/__init__.py b/_distutils_importer/distutils-shim-package/distutils/__init__.py
new file mode 100644
index 0000000000..de098c72f7
--- /dev/null
+++ b/_distutils_importer/distutils-shim-package/distutils/__init__.py
@@ -0,0 +1,3 @@
+import setuptools.distutils_patch
+
+from distutils import *
diff --git a/distutils_precedence.pth b/distutils_precedence.pth
new file mode 100644
index 0000000000..2d9b996abc
--- /dev/null
+++ b/distutils_precedence.pth
@@ -0,0 +1 @@
+import os; (os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib') == 'local' and __import__('_distutils_importer'))
diff --git a/setup.py b/setup.py
index 1fe18bd13c..daab3e8796 100755
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,7 @@
 import sys
 
 import setuptools
+from setuptools.command.install import install
 
 here = os.path.dirname(__file__)
 
@@ -49,6 +50,7 @@ def _gen_console_scripts():
 
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
+    _distutils_importer=['distutils-shim-package/distutils/__init__.py'],
 )
 
 force_windows_specific_files = (
@@ -81,8 +83,38 @@ def pypi_link(pkg_filename):
     return '/'.join(parts)
 
 
+class install_with_pth(install):
+    """
+    Custom install command to install a .pth file for distutils patching.
+
+    This is necessary because there's no standard way to install a `.pth` file
+    alongside your package (and there probably shouldn't be one), but we need
+    to do this in order to give precedence higher precedence to our version of
+    `distutils` than the standard library.
+    """
+
+    def initialize_options(self):
+        install.initialize_options(self)
+
+        name = 'distutils_precedence'
+        with open(os.path.join(here, name + '.pth'), 'rt') as f:
+            contents = f.read()
+
+        self.extra_path = (name, contents)
+
+    def finalize_options(self):
+        install.finalize_options(self)
+
+        install_suffix = os.path.relpath(self.install_lib,
+                                         self.install_libbase)
+
+        if install_suffix == self.extra_path[1]:
+            self.install_lib = self.install_libbase
+
+
 setup_params = dict(
     src_root=None,
+    cmdclass={'install': install_with_pth},
     package_data=package_data,
     entry_points={
         "distutils.commands": [

From 03b36b5dc594bbe239d0ad66dc43ea7d1832072c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 12:02:41 -0400
Subject: [PATCH 8037/8469] Remove warnings

With the new `.pth` file, these warnings are no longer necessary.
---
 setuptools/distutils_patch.py | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index 33f1e7f961..d01a1a1b10 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -12,26 +12,10 @@
 import warnings
 
 
-is_pypy = '__pypy__' in sys.builtin_module_names
-
-
-def warn_distutils_present():
-    if 'distutils' not in sys.modules:
-        return
-    if is_pypy and sys.version_info < (3, 7):
-        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
-        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
-        return
-    warnings.warn(
-        "Distutils was imported before Setuptools. This usage is discouraged "
-        "and may exhibit undesirable behaviors or errors. Please use "
-        "Setuptools' objects directly or at least import Setuptools first.")
-
-
 def clear_distutils():
     if 'distutils' not in sys.modules:
         return
-    warnings.warn("Setuptools is replacing distutils.")
+
     mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
     for name in mods:
         del sys.modules[name]
@@ -56,6 +40,5 @@ def ensure_local_distutils():
     assert '_distutils' in core.__file__, core.__file__
 
 
-warn_distutils_present()
 if enabled():
     ensure_local_distutils()

From 89e9d3c8910c3f419eb9f1c2758a748c6938655b Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 14:43:23 -0400
Subject: [PATCH 8038/8469] Adjust distutils shim when removing
 _distutils_importer

---
 _distutils_importer/__init__.py | 17 ++++++++++++++---
 setuptools/sandbox.py           | 19 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
index 54a825fed6..498c4ac176 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_importer/__init__.py
@@ -1,6 +1,17 @@
 import sys
 
-here = os.path.dirname(__file__)
-NEW_DISTUTILS_LOCATION = os.path.join(here, 'distutils-shim-package')
+_HERE = os.path.dirname(__file__)
+NEW_DISTUTILS_LOCATION = os.path.join(_HERE, 'distutils-shim-package')
 
-sys.path.insert(0, NEW_DISTUTILS_LOCATION)
+def add_shim():
+    if NEW_DISTUTILS_LOCATION not in sys.path:
+        sys.path.insert(0, NEW_DISTUTILS_LOCATION)
+
+def remove_shim():
+    try:
+        sys.path.remove(NEW_DISTUTILS_LOCATION)
+    except ValueError:
+        pass
+
+
+add_shim()
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 93ae8eb4d9..342a713f5c 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -185,8 +185,8 @@ def setup_context(setup_dir):
     temp_dir = os.path.join(setup_dir, 'temp')
     with save_pkg_resources_state():
         with save_modules():
-            hide_setuptools()
             with save_path():
+                hide_setuptools()
                 with save_argv():
                     with override_temp(temp_dir):
                         with pushd(setup_dir):
@@ -195,6 +195,15 @@ def setup_context(setup_dir):
                             yield
 
 
+_MODULES_TO_HIDE = {
+    'setuptools',
+    'distutils',
+    'pkg_resources',
+    'Cython',
+    '_distutils_importer',
+}
+
+
 def _needs_hiding(mod_name):
     """
     >>> _needs_hiding('setuptools')
@@ -212,8 +221,8 @@ def _needs_hiding(mod_name):
     >>> _needs_hiding('Cython')
     True
     """
-    pattern = re.compile(r'(setuptools|pkg_resources|distutils|Cython)(\.|$)')
-    return bool(pattern.match(mod_name))
+    base_module = mod_name.split('.', 1)[0]
+    return base_module in _MODULES_TO_HIDE
 
 
 def hide_setuptools():
@@ -223,6 +232,10 @@ def hide_setuptools():
     necessary to avoid issues such as #315 where setuptools upgrading itself
     would fail to find a function declared in the metadata.
     """
+    _distutils_importer = sys.modules.get('_distutils_importer', None)
+    if _distutils_importer is not None:
+        _distutils_importer.remove_shim()
+
     modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)
 

From 642604f82c01175f2ad285800d969ff521495af0 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 14:44:12 -0400
Subject: [PATCH 8039/8469] Clean up setuptools/__init__.py imports

This puts non-distutils imports first and removes one unused import.
---
 setuptools/__init__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 8388251115..d9740403d9 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -1,17 +1,16 @@
 """Extensions to the 'distutils' for large or complex distributions"""
 
-import os
+from fnmatch import fnmatchcase
 import functools
+import os
+import re
 
 # Disabled for now due to: #2228, #2230
 import setuptools.distutils_patch  # noqa: F401
 
 import distutils.core
-import distutils.filelist
-import re
 from distutils.errors import DistutilsOptionError
 from distutils.util import convert_path
-from fnmatch import fnmatchcase
 
 from ._deprecation_warning import SetuptoolsDeprecationWarning
 

From 370839b417f6bafe783fa040646d80bdf673fac4 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 15:25:32 -0400
Subject: [PATCH 8040/8469] Use import hook instead of sys.path manipulation

---
 _distutils_importer/__init__.py               | 32 ++++++++++++++++---
 .../distutils/__init__.py                     |  3 --
 setup.py                                      |  1 -
 3 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 _distutils_importer/distutils-shim-package/distutils/__init__.py

diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
index 498c4ac176..323ae2037c 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_importer/__init__.py
@@ -1,15 +1,37 @@
 import sys
 
-_HERE = os.path.dirname(__file__)
-NEW_DISTUTILS_LOCATION = os.path.join(_HERE, 'distutils-shim-package')
+
+class DistutilsMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        if path is not None or fullname != "distutils":
+            return None
+
+        return self.get_distutils_spec()
+
+    def get_distutils_spec(self):
+        import importlib
+
+        class DistutilsLoader(importlib.util.abc.Loader):
+
+            def create_module(self, spec):
+                return importlib.import_module('._distutils', 'setuptools')
+
+            def exec_module(self, module):
+                pass
+
+        return importlib.util.spec_from_loader('distutils', DistutilsLoader())
+
+
+DISTUTILS_FINDER = DistutilsMetaFinder()
+
 
 def add_shim():
-    if NEW_DISTUTILS_LOCATION not in sys.path:
-        sys.path.insert(0, NEW_DISTUTILS_LOCATION)
+    sys.meta_path.insert(0, DISTUTILS_FINDER)
+
 
 def remove_shim():
     try:
-        sys.path.remove(NEW_DISTUTILS_LOCATION)
+        sys.path.remove(DISTUTILS_FINDER)
     except ValueError:
         pass
 
diff --git a/_distutils_importer/distutils-shim-package/distutils/__init__.py b/_distutils_importer/distutils-shim-package/distutils/__init__.py
deleted file mode 100644
index de098c72f7..0000000000
--- a/_distutils_importer/distutils-shim-package/distutils/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import setuptools.distutils_patch
-
-from distutils import *
diff --git a/setup.py b/setup.py
index daab3e8796..cba37d3e59 100755
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@ def _gen_console_scripts():
 
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
-    _distutils_importer=['distutils-shim-package/distutils/__init__.py'],
 )
 
 force_windows_specific_files = (

From 85a0a9026d1b40448d1757ca6cd75e5cc2c50fc6 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 13 Jul 2020 15:36:39 -0400
Subject: [PATCH 8041/8469] Revert "Remove warnings"

This reverts commit 30b883f0b8071a3b1472c884574f38ce0128e457.
---
 setuptools/distutils_patch.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index d01a1a1b10..33f1e7f961 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -12,10 +12,26 @@
 import warnings
 
 
-def clear_distutils():
+is_pypy = '__pypy__' in sys.builtin_module_names
+
+
+def warn_distutils_present():
     if 'distutils' not in sys.modules:
         return
+    if is_pypy and sys.version_info < (3, 7):
+        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
+        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
+        return
+    warnings.warn(
+        "Distutils was imported before Setuptools. This usage is discouraged "
+        "and may exhibit undesirable behaviors or errors. Please use "
+        "Setuptools' objects directly or at least import Setuptools first.")
 
+
+def clear_distutils():
+    if 'distutils' not in sys.modules:
+        return
+    warnings.warn("Setuptools is replacing distutils.")
     mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
     for name in mods:
         del sys.modules[name]
@@ -40,5 +56,6 @@ def ensure_local_distutils():
     assert '_distutils' in core.__file__, core.__file__
 
 
+warn_distutils_present()
 if enabled():
     ensure_local_distutils()

From 48cc75e005b18549b424e4a794785c363cb1810a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 18 Jul 2020 11:54:57 +0200
Subject: [PATCH 8042/8469] Set up GHA to test on Python 3.9-beta and 3.8-dev

---
 .github/workflows/python-tests.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index f2188d38da..5e16ab3011 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -25,14 +25,20 @@ jobs:
         - 3.6
         - 3.5
         os:
-        - ubuntu-latest
+        - ubuntu-18.04
         - ubuntu-16.04
         - macOS-latest
         # - windows-2019
         # - windows-2016
         include:
-        # Dev versions
-        - { python-version: 3.9-dev, os: ubuntu-20.04 }
+        # Pre-release versions (GH-shipped)
+        - os: ubuntu-20.04
+          python-version: 3.9.0-beta.4 - 3.9.0
+        # Dev versions (deadsnakes)
+        - os: ubuntu-20.04
+          python-version: 3.9-dev
+        - os: ubuntu-20.04
+          python-version: 3.8-dev
 
     env:
       NETWORK_REQUIRED: 1
@@ -47,7 +53,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1.1.1
+      uses: actions/setup-python@v2
       if: "!endsWith(matrix.python-version, '-dev')"
       with:
         python-version: ${{ matrix.python-version }}

From bec11f03ab81da8af69909697925166793893e07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 18 Jul 2020 13:46:01 -0400
Subject: [PATCH 8043/8469] Add docs on porting from distutils.

---
 docs/distutils-legacy.txt | 25 +++++++++++++++++++++++++
 docs/index.txt            |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 docs/distutils-legacy.txt

diff --git a/docs/distutils-legacy.txt b/docs/distutils-legacy.txt
new file mode 100644
index 0000000000..a5d9626097
--- /dev/null
+++ b/docs/distutils-legacy.txt
@@ -0,0 +1,25 @@
+Porting from Distutils
+======================
+
+Setuptools and the PyPA have a `stated goal <https://github.com/pypa/packaging-problems/issues/127>`_ to make Setuptools the reference API for distutils.
+
+Since the 49.1.2 release, Setuptools includes a local, vendored copy of distutils (from late copies of CPython) that is disabled by default. To enable the use of this copy of distutils when invoking setuptools, set the enviroment variable:
+
+	SETUPTOOLS_USE_DISTUTILS=local
+
+This behavior is planned to become the default.
+
+Prefer Setuptools
+-----------------
+
+As Distutils is deprecated, any usage of functions or objects from distutils is similarly discouraged, and Setuptools aims to replace or deprecate all such uses. This section describes the recommended replacements.
+
+``distutils.core.setup`` → ``setuptools.setup``
+
+``distutils.cmd.Command`` → ``setuptools.Command``
+
+``distutils.log`` → (no replacement yet)
+
+``distutils.version.*`` → ``packaging.version.*``
+
+If a project relies on uses of ``distutils`` that do not have a suitable replacement above, please search the `Setuptools issue tracker <https://github.com/pypa/setuptools/issues/>`_ and file a request, describing the use-case so that Setuptools' maintainers can investigate. Please provide enough detail to help the maintainers understand how distutils is used, what value it provides, and why that behavior should be supported.
diff --git a/docs/index.txt b/docs/index.txt
index 228f97c8b5..0dd5fd94c1 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -18,4 +18,5 @@ Documentation content:
    development
    roadmap
    Deprecated: Easy Install <easy_install>
+   distutils-legacy
    history

From 47e5198e09060c8ff59f659ae56c6e64dcb3607e Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 19 Jul 2020 11:37:34 +0200
Subject: [PATCH 8044/8469] Make tox show tests output in parallel mode @ GHA

---
 .github/workflows/python-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 5e16ab3011..28ef36f73e 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -106,6 +106,7 @@ jobs:
         python -m
         tox
         --parallel auto
+        --parallel-live
         --notest
         --skip-missing-interpreters false
     - name: Test with tox
@@ -113,3 +114,4 @@ jobs:
         python -m
         tox
         --parallel auto
+        --parallel-live

From f976af5fbcca95cef61b8e228ca3653a094f8a7a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 19 Jul 2020 12:41:52 +0200
Subject: [PATCH 8045/8469] debug! make pytest extremely verbose

---
 .github/workflows/python-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 28ef36f73e..a9bc859aab 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -115,3 +115,5 @@ jobs:
         tox
         --parallel auto
         --parallel-live
+        --
+        -vvvvv

From 2b8b730db204d9d9a279802296de670b8a523fc0 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 19 Jul 2020 15:24:33 +0200
Subject: [PATCH 8046/8469] Add Python 3.9 beta from deadsnakes

---
 .github/workflows/python-tests.yml | 32 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index a9bc859aab..ed82aebb5a 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -34,6 +34,9 @@ jobs:
         # Pre-release versions (GH-shipped)
         - os: ubuntu-20.04
           python-version: 3.9.0-beta.4 - 3.9.0
+        # Pre-release versions (deadsnakes)
+        - os: ubuntu-20.04
+          python-version: 3.9-beta
         # Dev versions (deadsnakes)
         - os: ubuntu-20.04
           python-version: 3.9-dev
@@ -42,21 +45,34 @@ jobs:
 
     env:
       NETWORK_REQUIRED: 1
+      PYTHON_VERSION: ${{ matrix.python-version }}
       TOX_PARALLEL_NO_SPINNER: 1
       TOXENV: python
+      USE_DEADSNAKES: false
 
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python ${{ matrix.python-version }} (deadsnakes)
+    - name: Set flag to use deadsnakes
+      if: >-
+        endsWith(env.PYTHON_VERSION, '-beta') || 
+        endsWith(env.PYTHON_VERSION, '-dev')
+      run: |
+        from __future__ import print_function
+        python_version = '${{ env.PYTHON_VERSION }}'.replace('-beta', '')
+        print('::set-env name=PYTHON_VERSION::{ver}'.format(ver=python_version))
+        print('::set-env name=USE_DEADSNAKES::true')
+      shell: python
+    - name: Set up Python ${{ env.PYTHON_VERSION }} (deadsnakes)
       uses: deadsnakes/action@v1.0.0
-      if: endsWith(matrix.python-version, '-dev')
+      if: fromJSON(env.USE_DEADSNAKES) && true || false
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Set up Python ${{ matrix.python-version }}
+        python-version: ${{ env.PYTHON_VERSION }}
+    - name: Set up Python ${{ env.PYTHON_VERSION }}
       uses: actions/setup-python@v2
-      if: "!endsWith(matrix.python-version, '-dev')"
+      if: >-
+        !fromJSON(env.USE_DEADSNAKES) && true || false
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ env.PYTHON_VERSION }}
     - name: Log Python version
       run: >-
         python --version
@@ -88,9 +104,9 @@ jobs:
       run: >-
         python -m pip freeze --all
     - name: Adjust TOXENV for PyPy
-      if: startsWith(matrix.python-version, 'pypy')
+      if: startsWith(env.PYTHON_VERSION, 'pypy')
       run: >-
-        echo "::set-env name=TOXENV::${{ matrix.python-version }}"
+        echo "::set-env name=TOXENV::${{ env.PYTHON_VERSION }}"
     - name: Log env vars
       run: >-
         env

From e371422476f51a83d27d70dc45bbfba1544aad55 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jul 2020 21:36:33 -0400
Subject: [PATCH 8047/8469] Consolidate distutils importing hacks into
 _distutils_importer package. Generate distutils-precedence.pth inline.

---
 MANIFEST.in                                   |  1 -
 _distutils_importer/__init__.py               | 19 ++++++++++++++++---
 _distutils_importer/install.py                |  5 +++++
 .../override.py                               | 18 ++----------------
 conftest.py                                   |  2 +-
 distutils_precedence.pth                      |  1 -
 setup.py                                      |  8 ++------
 setuptools/__init__.py                        |  3 +--
 8 files changed, 27 insertions(+), 30 deletions(-)
 create mode 100644 _distutils_importer/install.py
 rename setuptools/distutils_patch.py => _distutils_importer/override.py (79%)
 delete mode 100644 distutils_precedence.pth

diff --git a/MANIFEST.in b/MANIFEST.in
index be83a7f336..128ae280ec 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -13,5 +13,4 @@ include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini
 include tox.ini
-include distutils_precedence.pth
 exclude pyproject.toml  # Temporary workaround for #1644.
diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
index 323ae2037c..ffa4caead5 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_importer/__init__.py
@@ -1,4 +1,20 @@
+"""
+Ensure that the local copy of distutils is preferred over stdlib.
+
+See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
+for more motivation.
+"""
+
 import sys
+import os
+
+
+def enabled():
+    """
+    Allow selection of distutils by environment variable.
+    """
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
+    return which == 'local'
 
 
 class DistutilsMetaFinder:
@@ -34,6 +50,3 @@ def remove_shim():
         sys.path.remove(DISTUTILS_FINDER)
     except ValueError:
         pass
-
-
-add_shim()
diff --git a/_distutils_importer/install.py b/_distutils_importer/install.py
new file mode 100644
index 0000000000..73f13b2993
--- /dev/null
+++ b/_distutils_importer/install.py
@@ -0,0 +1,5 @@
+from . import enabled, add_shim
+
+
+if enabled():
+    add_shim()
diff --git a/setuptools/distutils_patch.py b/_distutils_importer/override.py
similarity index 79%
rename from setuptools/distutils_patch.py
rename to _distutils_importer/override.py
index 33f1e7f961..917384852d 100644
--- a/setuptools/distutils_patch.py
+++ b/_distutils_importer/override.py
@@ -1,16 +1,10 @@
-"""
-Ensure that the local copy of distutils is preferred over stdlib.
-
-See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
-for more motivation.
-"""
-
 import sys
 import re
-import os
 import importlib
 import warnings
 
+from . import enabled
+
 
 is_pypy = '__pypy__' in sys.builtin_module_names
 
@@ -37,14 +31,6 @@ def clear_distutils():
         del sys.modules[name]
 
 
-def enabled():
-    """
-    Allow selection of distutils by environment variable.
-    """
-    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
-    return which == 'local'
-
-
 def ensure_local_distutils():
     clear_distutils()
     distutils = importlib.import_module('setuptools._distutils')
diff --git a/conftest.py b/conftest.py
index 6013e1870f..868bf5bed2 100644
--- a/conftest.py
+++ b/conftest.py
@@ -15,7 +15,7 @@ def pytest_addoption(parser):
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
-    'setuptools/distutils_patch.py',
+    '_distutils_importer',
 ]
 
 
diff --git a/distutils_precedence.pth b/distutils_precedence.pth
deleted file mode 100644
index 2d9b996abc..0000000000
--- a/distutils_precedence.pth
+++ /dev/null
@@ -1 +0,0 @@
-import os; (os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib') == 'local' and __import__('_distutils_importer'))
diff --git a/setup.py b/setup.py
index cba37d3e59..a6e1abc455 100755
--- a/setup.py
+++ b/setup.py
@@ -94,12 +94,8 @@ class install_with_pth(install):
 
     def initialize_options(self):
         install.initialize_options(self)
-
-        name = 'distutils_precedence'
-        with open(os.path.join(here, name + '.pth'), 'rt') as f:
-            contents = f.read()
-
-        self.extra_path = (name, contents)
+        self.extra_path = (
+            'distutils-precedence', 'import _distutils_importer.install')
 
     def finalize_options(self):
         install.finalize_options(self)
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index d9740403d9..80b287b4b4 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -5,8 +5,7 @@
 import os
 import re
 
-# Disabled for now due to: #2228, #2230
-import setuptools.distutils_patch  # noqa: F401
+import _distutils_importer.override  # noqa: F401
 
 import distutils.core
 from distutils.errors import DistutilsOptionError

From 2986be4e55d6c8113344d5e184d40c6c3945a2bb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jul 2020 21:49:24 -0400
Subject: [PATCH 8048/8469] Fix AttributeError when `importlib.util` was not
 otherwise imported.

---
 _distutils_importer/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
index ffa4caead5..06674eb889 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_importer/__init__.py
@@ -25,7 +25,7 @@ def find_spec(self, fullname, path, target=None):
         return self.get_distutils_spec()
 
     def get_distutils_spec(self):
-        import importlib
+        import importlib.util
 
         class DistutilsLoader(importlib.util.abc.Loader):
 

From 1e53a2c14e7e0f788c9df2a542ac10f6b2f511d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 19 Jul 2020 21:53:39 -0400
Subject: [PATCH 8049/8469] Move docstring closer to relevant context

---
 _distutils_importer/__init__.py | 7 -------
 _distutils_importer/override.py | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/_distutils_importer/__init__.py b/_distutils_importer/__init__.py
index 06674eb889..3ad701002d 100644
--- a/_distutils_importer/__init__.py
+++ b/_distutils_importer/__init__.py
@@ -1,10 +1,3 @@
-"""
-Ensure that the local copy of distutils is preferred over stdlib.
-
-See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
-for more motivation.
-"""
-
 import sys
 import os
 
diff --git a/_distutils_importer/override.py b/_distutils_importer/override.py
index 917384852d..523139bb6e 100644
--- a/_distutils_importer/override.py
+++ b/_distutils_importer/override.py
@@ -1,3 +1,10 @@
+"""
+Ensure that the local copy of distutils is preferred over stdlib.
+
+See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
+for more motivation.
+"""
+
 import sys
 import re
 import importlib

From dec637b12e1eee6f884405c56a4d01c505c00dfe Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Tue, 21 Jul 2020 15:05:28 +0200
Subject: [PATCH 8050/8469] Try out actions/setup-python@v2.1.1

---
 .github/workflows/python-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index ed82aebb5a..93ec79d4ab 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -68,7 +68,7 @@ jobs:
       with:
         python-version: ${{ env.PYTHON_VERSION }}
     - name: Set up Python ${{ env.PYTHON_VERSION }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.1.1
       if: >-
         !fromJSON(env.USE_DEADSNAKES) && true || false
       with:

From a1686b39e311c38e1c32e0fdfe06597611300861 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jul 2020 21:08:34 -0400
Subject: [PATCH 8051/8469] Revert "Render logo in the readme."

This reverts commit 4056435460b770c3ab7a8ea1637f05de690e7e01.
---
 README.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.rst b/README.rst
index dc2bf98bde..9cbf7b86e1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,3 @@
-.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
-
-
 .. image:: https://img.shields.io/pypi/v/setuptools.svg
    :target: `PyPI link`_
 
@@ -27,7 +24,6 @@
 .. image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
 
-
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

From 2bf12c542af74c6e8b76ffd864c95c2efd94d372 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jul 2020 21:08:56 -0400
Subject: [PATCH 8052/8469] Revert "Rename logo assets to remove project name
 and 'logo', which are implied by the context."

This reverts commit fd94cd038d644ff27866301f6f365a3ef0901898.
---
 .../{full color.svg => setup_tools_logo_colour.svg} |   0
 ...000px.png => setup_tools_logo_colour_1000px.png} | Bin
 ...svg => setup_tools_logo_colour_banner_1line.svg} |   0
 ...setup_tools_logo_colour_banner_1line_1000px.png} | Bin
 ...vg => setup_tools_logo_colour_banner_2lines.svg} |   0
 ...etup_tools_logo_colour_banner_2lines_1000px.png} | Bin
 ...color.svg => setup_tools_logo_symbol_colour.svg} |   0
 ...ng => setup_tools_logo_symbol_colour_1000px.png} | Bin
 .../{type.svg => setup_tools_logotype_1line.svg}    |   0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/logo/{full color.svg => setup_tools_logo_colour.svg} (100%)
 rename docs/logo/{full color 1000px.png => setup_tools_logo_colour_1000px.png} (100%)
 rename docs/logo/{banner 1 line color.svg => setup_tools_logo_colour_banner_1line.svg} (100%)
 rename docs/logo/{banner 1 line color.png => setup_tools_logo_colour_banner_1line_1000px.png} (100%)
 rename docs/logo/{banner 2 lines color.svg => setup_tools_logo_colour_banner_2lines.svg} (100%)
 rename docs/logo/{banner 2 lines color.png => setup_tools_logo_colour_banner_2lines_1000px.png} (100%)
 rename docs/logo/{symbol color.svg => setup_tools_logo_symbol_colour.svg} (100%)
 rename docs/logo/{symbol color 1000px.png => setup_tools_logo_symbol_colour_1000px.png} (100%)
 rename docs/logo/{type.svg => setup_tools_logotype_1line.svg} (100%)

diff --git a/docs/logo/full color.svg b/docs/logo/setup_tools_logo_colour.svg
similarity index 100%
rename from docs/logo/full color.svg
rename to docs/logo/setup_tools_logo_colour.svg
diff --git a/docs/logo/full color 1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png
similarity index 100%
rename from docs/logo/full color 1000px.png
rename to docs/logo/setup_tools_logo_colour_1000px.png
diff --git a/docs/logo/banner 1 line color.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg
similarity index 100%
rename from docs/logo/banner 1 line color.svg
rename to docs/logo/setup_tools_logo_colour_banner_1line.svg
diff --git a/docs/logo/banner 1 line color.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
similarity index 100%
rename from docs/logo/banner 1 line color.png
rename to docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
diff --git a/docs/logo/banner 2 lines color.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg
similarity index 100%
rename from docs/logo/banner 2 lines color.svg
rename to docs/logo/setup_tools_logo_colour_banner_2lines.svg
diff --git a/docs/logo/banner 2 lines color.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
similarity index 100%
rename from docs/logo/banner 2 lines color.png
rename to docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
diff --git a/docs/logo/symbol color.svg b/docs/logo/setup_tools_logo_symbol_colour.svg
similarity index 100%
rename from docs/logo/symbol color.svg
rename to docs/logo/setup_tools_logo_symbol_colour.svg
diff --git a/docs/logo/symbol color 1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png
similarity index 100%
rename from docs/logo/symbol color 1000px.png
rename to docs/logo/setup_tools_logo_symbol_colour_1000px.png
diff --git a/docs/logo/type.svg b/docs/logo/setup_tools_logotype_1line.svg
similarity index 100%
rename from docs/logo/type.svg
rename to docs/logo/setup_tools_logotype_1line.svg

From 9dd762c61bdea4491f62c2b812b5cd5672821154 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jul 2020 21:11:16 -0400
Subject: [PATCH 8053/8469] Revert "Merge pull request #2229 from
 cajhne/logo001"

This reverts commit 402880a7aed5dea1cf3a84af2b8291e451fb3d9f, reversing
changes made to bd1102648109c85c782286787e4d5290ae280abe.
---
 docs/logo/README.md                           |  10 -
 docs/logo/josefinsans/.uuid                   |   1 -
 docs/logo/josefinsans/DESCRIPTION.en_us.html  |   9 -
 docs/logo/josefinsans/JosefinSans-Bold.ttf    | Bin 86300 -> 0 bytes
 .../josefinsans/JosefinSans-BoldItalic.ttf    | Bin 83100 -> 0 bytes
 docs/logo/josefinsans/JosefinSans-Italic.ttf  | Bin 84916 -> 0 bytes
 docs/logo/josefinsans/JosefinSans-Light.ttf   | Bin 87320 -> 0 bytes
 .../josefinsans/JosefinSans-LightItalic.ttf   | Bin 85684 -> 0 bytes
 docs/logo/josefinsans/JosefinSans-Regular.ttf | Bin 87260 -> 0 bytes
 .../logo/josefinsans/JosefinSans-SemiBold.ttf | Bin 87880 -> 0 bytes
 .../JosefinSans-SemiBoldItalic.ttf            | Bin 84824 -> 0 bytes
 docs/logo/josefinsans/JosefinSans-Thin.ttf    | Bin 88088 -> 0 bytes
 .../josefinsans/JosefinSans-ThinItalic.ttf    | Bin 85420 -> 0 bytes
 docs/logo/josefinsans/METADATA.pb             |  99 --------
 docs/logo/josefinsans/OFL.txt                 |  93 -------
 docs/logo/setup_tools_logo_colour.svg         | 227 ------------------
 docs/logo/setup_tools_logo_colour_1000px.png  | Bin 31520 -> 0 bytes
 .../setup_tools_logo_colour_banner_1line.svg  | 223 -----------------
 ..._tools_logo_colour_banner_1line_1000px.png | Bin 24183 -> 0 bytes
 .../setup_tools_logo_colour_banner_2lines.svg | 224 -----------------
 ...tools_logo_colour_banner_2lines_1000px.png | Bin 38105 -> 0 bytes
 docs/logo/setup_tools_logo_symbol_colour.svg  | 203 ----------------
 .../setup_tools_logo_symbol_colour_1000px.png | Bin 44239 -> 0 bytes
 docs/logo/setup_tools_logotype_1line.svg      | 169 -------------
 24 files changed, 1258 deletions(-)
 delete mode 100644 docs/logo/README.md
 delete mode 100644 docs/logo/josefinsans/.uuid
 delete mode 100644 docs/logo/josefinsans/DESCRIPTION.en_us.html
 delete mode 100644 docs/logo/josefinsans/JosefinSans-Bold.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-BoldItalic.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-Italic.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-Light.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-LightItalic.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-Regular.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-SemiBold.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-Thin.ttf
 delete mode 100644 docs/logo/josefinsans/JosefinSans-ThinItalic.ttf
 delete mode 100644 docs/logo/josefinsans/METADATA.pb
 delete mode 100644 docs/logo/josefinsans/OFL.txt
 delete mode 100644 docs/logo/setup_tools_logo_colour.svg
 delete mode 100644 docs/logo/setup_tools_logo_colour_1000px.png
 delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line.svg
 delete mode 100644 docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
 delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines.svg
 delete mode 100644 docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
 delete mode 100644 docs/logo/setup_tools_logo_symbol_colour.svg
 delete mode 100644 docs/logo/setup_tools_logo_symbol_colour_1000px.png
 delete mode 100644 docs/logo/setup_tools_logotype_1line.svg

diff --git a/docs/logo/README.md b/docs/logo/README.md
deleted file mode 100644
index 74fadbf021..0000000000
--- a/docs/logo/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-![](setup_tools_logo_colour.svg)
-### Design:
-
-Setuptools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the Setuptools project using the Free Open Source graphics editor [Inkscape](inkscape.org).
-
-### Copyright:
-Logo is (c) the Setuptools developers.
-
-### Font:
-The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL).
diff --git a/docs/logo/josefinsans/.uuid b/docs/logo/josefinsans/.uuid
deleted file mode 100644
index d7e92c770e..0000000000
--- a/docs/logo/josefinsans/.uuid
+++ /dev/null
@@ -1 +0,0 @@
-922c129c-9f4c-4831-b632-c7f43be6feb0
\ No newline at end of file
diff --git a/docs/logo/josefinsans/DESCRIPTION.en_us.html b/docs/logo/josefinsans/DESCRIPTION.en_us.html
deleted file mode 100644
index 9364b24940..0000000000
--- a/docs/logo/josefinsans/DESCRIPTION.en_us.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-The idea of this typeface is to be geometric, elegant, with a vintage feeling, for use at larger sizes.
-It is inspired by geometric sans serif designs from the 1920s.
-The x-height is half way from baseline to cap height, an unusual proportion.
-</p>
-<p>
-There is a sister family, <a href="https://fonts.google.com/specimen/Josefin+Slab">Josefin Slab</a>
-</p>
-
diff --git a/docs/logo/josefinsans/JosefinSans-Bold.ttf b/docs/logo/josefinsans/JosefinSans-Bold.ttf
deleted file mode 100644
index 12a7ad087e0f26e2d74bc9e43ffc3edc5adba81d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86300
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%0AB$*0AB;X0sK4Q
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
HQ2hM|R!sTd

diff --git a/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-BoldItalic.ttf
deleted file mode 100644
index 4a0fc91d04d0c715b16cb2e3da6fbfd50967aaf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 83100
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
V_X&>U=0U!T?~ylIOJulV{09+UVPXIP

diff --git a/docs/logo/josefinsans/JosefinSans-Italic.ttf b/docs/logo/josefinsans/JosefinSans-Italic.ttf
deleted file mode 100644
index 1cbe036e38b54c11e1ccae7995995b5360d785c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84916
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

diff --git a/docs/logo/josefinsans/JosefinSans-Light.ttf b/docs/logo/josefinsans/JosefinSans-Light.ttf
deleted file mode 100644
index 7fe3f7beb77e04bf5f4dc09e7a3a9ea4fedf5ffb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87320
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
a&pu;`Kj1j7K2Emqfl)kmP47bS-+usM2>(z3

diff --git a/docs/logo/josefinsans/JosefinSans-LightItalic.ttf b/docs/logo/josefinsans/JosefinSans-LightItalic.ttf
deleted file mode 100644
index 8dc35383c6e833daf63fa0aca9aed9b7b873d676..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85684
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
STzC+w;oZ~%X^9NiwEqG4b1ZZK

diff --git a/docs/logo/josefinsans/JosefinSans-Regular.ttf b/docs/logo/josefinsans/JosefinSans-Regular.ttf
deleted file mode 100644
index ed11900846890faa98285ecf2b6ded1b18828fd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87260
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

diff --git a/docs/logo/josefinsans/JosefinSans-SemiBold.ttf b/docs/logo/josefinsans/JosefinSans-SemiBold.ttf
deleted file mode 100644
index b67504a6e3a047b50df77282b55e0f7ff21b12ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87880
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
aKlIUiBK%bxjtlo9HT(#-Kvp8d8T%i~EetvU

diff --git a/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf b/docs/logo/josefinsans/JosefinSans-SemiBoldItalic.ttf
deleted file mode 100644
index 24a27d1596e3de2baff32b01f23a9c40406d8941..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84824
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
X$pRn4a-6*tEaS(<SuQ0aoRI$okj&Uy

diff --git a/docs/logo/josefinsans/JosefinSans-Thin.ttf b/docs/logo/josefinsans/JosefinSans-Thin.ttf
deleted file mode 100644
index c54ca7f1c67c8c7fac3e0fee40d484ecbacf58bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88088
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
UT#lRj*&e=#svh-%3^$Db0O1VtSpWb4

diff --git a/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf b/docs/logo/josefinsans/JosefinSans-ThinItalic.ttf
deleted file mode 100644
index 6840b7c23370b3a63e350c4019f537ca79921be1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85420
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
OrYglES&0l+l>Y(&D3s*@

diff --git a/docs/logo/josefinsans/METADATA.pb b/docs/logo/josefinsans/METADATA.pb
deleted file mode 100644
index 8b67716c32..0000000000
--- a/docs/logo/josefinsans/METADATA.pb
+++ /dev/null
@@ -1,99 +0,0 @@
-name: "Josefin Sans"
-designer: "Santiago Orozco"
-license: "OFL"
-category: "SANS_SERIF"
-date_added: "2010-11-17"
-fonts {
-  name: "Josefin Sans"
-  style: "normal"
-  weight: 100
-  filename: "JosefinSans-Thin.ttf"
-  post_script_name: "JosefinSans-Thin"
-  full_name: "Josefin Sans Thin"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "italic"
-  weight: 100
-  filename: "JosefinSans-ThinItalic.ttf"
-  post_script_name: "JosefinSans-ThinItalic"
-  full_name: "Josefin Sans Thin Italic"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "normal"
-  weight: 300
-  filename: "JosefinSans-Light.ttf"
-  post_script_name: "JosefinSans-Light"
-  full_name: "Josefin Sans Light"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "italic"
-  weight: 300
-  filename: "JosefinSans-LightItalic.ttf"
-  post_script_name: "JosefinSans-LightItalic"
-  full_name: "Josefin Sans Light Italic"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "normal"
-  weight: 400
-  filename: "JosefinSans-Regular.ttf"
-  post_script_name: "JosefinSans-Regular"
-  full_name: "Josefin Sans Regular"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "italic"
-  weight: 400
-  filename: "JosefinSans-Italic.ttf"
-  post_script_name: "JosefinSans-Italic"
-  full_name: "Josefin Sans Italic"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "normal"
-  weight: 600
-  filename: "JosefinSans-SemiBold.ttf"
-  post_script_name: "JosefinSans-SemiBold"
-  full_name: "Josefin Sans SemiBold"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "italic"
-  weight: 600
-  filename: "JosefinSans-SemiBoldItalic.ttf"
-  post_script_name: "JosefinSans-SemiBoldItalic"
-  full_name: "Josefin Sans SemiBold Italic"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "normal"
-  weight: 700
-  filename: "JosefinSans-Bold.ttf"
-  post_script_name: "JosefinSans-Bold"
-  full_name: "Josefin Sans Bold"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-fonts {
-  name: "Josefin Sans"
-  style: "italic"
-  weight: 700
-  filename: "JosefinSans-BoldItalic.ttf"
-  post_script_name: "JosefinSans-BoldItalic"
-  full_name: "Josefin Sans Bold Italic"
-  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
-}
-subsets: "latin"
-subsets: "latin-ext"
-subsets: "menu"
-subsets: "vietnamese"
diff --git a/docs/logo/josefinsans/OFL.txt b/docs/logo/josefinsans/OFL.txt
deleted file mode 100644
index 6586a7e304..0000000000
--- a/docs/logo/josefinsans/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2010, Santiago Orozco (hi@typemade.mx)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/docs/logo/setup_tools_logo_colour.svg b/docs/logo/setup_tools_logo_colour.svg
deleted file mode 100644
index 7eae8fc364..0000000000
--- a/docs/logo/setup_tools_logo_colour.svg
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="278.6048"
-   inkscape:export-xdpi="278.6048"
-   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_1000px.png"
-   width="91.168571mm"
-   height="55.301708mm"
-   viewBox="0 0 91.168573 55.301709"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (1.0+r73+1)"
-   sodipodi:docname="setup_tools_logo_colour.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1362">
-      <stop
-         style="stop-color:#336790;stop-opacity:1"
-         offset="0"
-         id="stop1358" />
-      <stop
-         style="stop-color:#396f9e;stop-opacity:1"
-         offset="1"
-         id="stop1360" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1356"
-       inkscape:collect="always">
-      <stop
-         id="stop1352"
-         offset="0"
-         style="stop-color:#ffd040;stop-opacity:1;" />
-      <stop
-         id="stop1354"
-         offset="1"
-         style="stop-color:#c59500;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1346">
-      <stop
-         style="stop-color:#ffd040;stop-opacity:1;"
-         offset="0"
-         id="stop1342" />
-      <stop
-         style="stop-color:#c59500;stop-opacity:1"
-         offset="1"
-         id="stop1344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1348"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.5091231)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1350"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1348-1"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1389"
-       gradientUnits="userSpaceOnUse"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952"
-       gradientTransform="translate(-0.09428005)" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1086"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1232.7244,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1109"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="101.13023"
-       x2="360.05417"
-       y1="111.95531"
-       x1="372.85818"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1233.0816,-330.32482)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1203"
-       xlink:href="#linearGradient1362"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1193.5762,-318.17671)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1214"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1224"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.2663142"
-     inkscape:cx="86.449428"
-     inkscape:cy="95.330447"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g1222"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-324.69544,-86.596643)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1399"
-       transform="translate(0.04622687,-0.80180859)">
-      <g
-         id="g1222">
-        <path
-           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)"
-           d="M 157.22461 115.5332 L 157.22461 119.45312 C 157.22461 124.88302 161.57577 129.23438 167.00586 129.23438 L 167.23438 129.23438 C 172.66435 129.23438 176.98917 124.88056 177.01562 119.44727 L 177.01562 115.5332 L 157.22461 115.5332 z "
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path857" />
-        <path
-           id="path1185"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="M 157.89453 28.101562 C 156.13747 28.101562 154.16932 28.416144 152.21875 29.011719 C 151.73113 29.160579 151.24343 29.326299 150.76172 29.509766 C 150.28055 29.69309 149.80402 29.894526 149.33594 30.111328 C 148.39868 30.545437 147.49398 31.045372 146.65234 31.607422 C 145.81071 32.169472 145.03387 32.786407 144.3418 33.455078 C 143.64973 34.123749 143.04296 34.844857 142.54102 35.615234 C 142.03907 36.385612 141.64235 37.205095 141.37109 38.072266 C 141.30329 38.289055 141.24322 38.507821 141.19141 38.730469 C 141.0357 39.398984 140.95312 40.092553 140.95312 40.8125 C 140.95312 44.573508 140.70339 47.198354 140.70312 54.431641 C 140.70412 54.646352 140.70503 57.556916 140.70703 59.765625 C 143.16297 56.31562 147.23056 54.064453 151.7832 54.064453 L 162.61914 54.064453 L 162.61914 50.675781 L 177.92969 50.617188 L 187.91016 50.574219 L 187.91016 40.357422 C 187.91016 39.922086 187.86886 39.492428 187.79102 39.072266 L 187.79102 39.070312 C 187.75212 38.860555 187.70352 38.652989 187.64648 38.447266 L 187.64648 38.445312 C 187.36007 37.413698 186.85082 36.434828 186.16992 35.517578 C 185.89756 35.150678 185.59731 34.793472 185.27344 34.447266 C 184.30183 33.408647 183.1147 32.466413 181.79883 31.638672 C 181.36068 31.363057 180.90864 31.101451 180.44922 30.855469 L 180.44727 30.855469 C 179.52793 30.363325 178.57598 29.931176 177.63086 29.564453 L 177.62891 29.564453 C 177.15666 29.38134 176.68652 29.2127 176.22266 29.0625 L 176.2207 29.0625 C 174.82819 28.611709 173.49616 28.312696 172.35742 28.179688 L 172.35547 28.179688 C 171.97576 28.135388 171.61877 28.110206 171.28711 28.103516 L 157.89648 28.103516 L 157.89453 28.101562 z M 175.67383 36.841797 C 177.92159 36.841801 179.74414 38.664334 179.74414 40.912109 C 179.74414 43.159889 177.92166 44.982418 175.67383 44.982422 C 173.42607 44.982452 171.60352 43.159908 171.60352 40.912109 C 171.60352 38.664315 173.42607 36.841767 175.67383 36.841797 z M 149.16211 73.677734 C 145.93293 73.677517 143.22672 75.813325 142.36133 78.753906 C 142.40903 78.835146 142.44873 78.926859 142.49805 79.005859 C 142.71636 79.35532 142.95085 79.682808 143.19922 79.990234 C 143.44759 80.297665 143.71049 80.58492 143.98438 80.853516 C 144.25791 81.121714 144.54341 81.372808 144.83789 81.605469 C 145.42762 82.071399 146.05946 82.465911 146.7168 82.796875 L 146.71875 82.796875 C 147.70428 83.292896 148.74444 83.645741 149.77148 83.873047 C 150.41954 84.016422 151.06 84.106381 151.68164 84.15625 C 151.71704 84.15905 151.75384 84.165449 151.78906 84.167969 C 152.11693 84.191789 152.43721 84.203125 152.75 84.203125 L 156.25391 84.210938 L 156.25 81.201172 L 156.25 81.164062 C 156.258 81.047957 156.26307 80.91479 156.26367 80.773438 C 156.26386 76.841633 153.10165 73.677508 149.16992 73.677734 L 149.16211 73.677734 z M 181.73242 75.435547 C 179.27966 75.478107 177.15407 77.502068 177.1543 79.910156 L 177.1543 81.238281 L 177.1543 91.292969 L 177.08594 91.292969 L 177.08203 91.652344 L 153.93164 91.703125 C 153.01566 91.764475 152.12767 91.758334 151.26953 91.683594 C 150.4114 91.608854 149.58384 91.46679 148.78906 91.255859 C 147.99429 91.044929 147.23175 90.765193 146.50586 90.417969 C 145.77997 90.070745 145.09094 89.655494 144.43945 89.171875 C 142.78187 87.941336 141.81042 85.621603 140.66016 83.583984 L 140.66016 98.029297 C 140.66016 98.304276 140.66815 98.576661 140.68555 98.845703 C 140.70275 99.114757 140.72792 99.379584 140.76172 99.642578 L 140.76172 99.644531 C 140.82922 100.16985 140.93031 100.68325 141.06055 101.18359 L 141.06055 101.18555 C 141.32132 102.18678 141.70348 103.13645 142.1875 104.03125 C 142.42992 104.47937 142.69686 104.91221 142.98828 105.33203 L 142.98828 105.33398 C 143.86139 106.59149 144.94485 107.7205 146.17383 108.70508 C 146.58362 109.03338 147.01008 109.34362 147.44922 109.63672 C 148.32749 110.22291 149.25802 110.7373 150.21875 111.17383 C 151.17948 111.61035 152.16936 111.96907 153.16602 112.24414 C 154.16262 112.51903 155.16631 112.71076 156.15234 112.8125 C 156.64537 112.8634 157.13358 112.89108 157.61523 112.89648 L 157.63086 112.89648 L 157.63867 112.89648 C 158.02925 112.90778 161.26203 112.92413 164.39258 112.92773 C 167.00824 112.93173 168.95466 112.93655 170.01758 112.93555 C 170.22681 112.9354 171.04865 112.93585 171.125 112.93555 C 175.48934 112.91855 179.28887 112.58375 182.59766 111.95117 C 184.37517 111.61131 186.01669 111.18957 187.51367 110.67578 C 188.96429 110.17793 190.27679 109.59391 191.44727 108.93555 C 194.95912 106.96039 197.18421 104.31778 197.96484 101.33789 C 198.33297 98.62287 198.23191 92.225037 198.2168 87.755859 L 198.2168 87.748047 C 198.2319 83.695335 198.24229 83.190014 198.24609 82.773438 L 198.15039 82.773438 L 198.14258 82.214844 L 186.30078 82.271484 L 186.28711 79.910156 C 186.28703 77.426931 184.29565 75.43566 181.8125 75.435547 L 181.80469 75.435547 C 181.78089 75.435358 181.75132 75.435396 181.73242 75.435547 z "
-           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
-        <path
-           id="path1105"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="m 170.2832,56.234375 v 0.05273 h -18.5 c -6.27431,0 -11.40881,5.016 -11.28711,11.263672 v 0.01563 4.761719 6.878906 c 0.83532,-4.282242 4.14597,-7.746787 8.66602,-7.75 h 0.008 c 5.12969,0.0037 9.31667,4.18382 9.31641,9.314453 0,0.169437 -0.008,0.35223 -0.0234,0.546875 l 0.008,-0.08008 0.0156,7.832031 h 16.44726 v -7.826171 -1.335938 c -3.4e-4,-3.68931 3.13227,-6.637864 6.77539,-6.695312 h 0.008 c 0.034,-3.03e-4 0.0695,-2.65e-4 0.10351,0 3.67854,0.0042 6.68372,3.008885 6.6875,6.6875 v 0.134765 l 9.51563,-0.04492 v -0.472656 h 0.0449 V 56.234375 h -10.0332 c -0.64683,3.025776 -3.02284,5.45436 -6.22266,5.455078 -3.19963,-7.18e-4 -5.56805,-2.429528 -6.21484,-5.455078 z"
-           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
-        <path
-           id="path1059"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.93318"
-           d="m 37.679688,152.23047 c -2.364045,0.0747 -4.292067,0.77094 -5.785157,2.08984 -1.468195,1.29401 -2.201172,3.00004 -2.201172,5.11524 0,1.4433 0.360394,2.65058 1.082032,3.62109 0.721663,0.94561 1.578817,1.6908 2.574218,2.23828 1.020271,0.54745 2.290635,1.10732 3.808594,1.67969 1.642406,0.64698 2.910792,1.34524 3.806641,2.0918 0.920718,0.72166 1.380859,1.70304 1.380859,2.94726 0,1.4682 -0.547649,2.57571 -1.642578,3.32227 -1.070035,0.74653 -2.326205,1.12109 -3.769531,1.12109 -1.119799,0 -2.327085,-0.23814 -3.621094,-0.71094 -1.294009,-0.49771 -2.401522,-1.09424 -3.322266,-1.79101 l -1.603515,2.875 c 1.169587,0.82121 2.525506,1.50528 4.068359,2.05273 1.542854,0.52259 3.147178,0.78321 4.814453,0.78321 1.791698,0 3.347112,-0.33592 4.666016,-1.00782 1.343773,-0.67187 2.375993,-1.59213 3.097656,-2.76172 0.721638,-1.16958 1.083985,-2.47662 1.083985,-3.91992 0,-1.59264 -0.323699,-2.8977 -0.970704,-3.91797 -0.62211,-1.04514 -1.418164,-1.85536 -2.388672,-2.42773 -0.945612,-0.59722 -2.116203,-1.14489 -3.509765,-1.64258 -1.866331,-0.69679 -3.309782,-1.39307 -4.330078,-2.08984 -0.995377,-0.72167 -1.492188,-1.64192 -1.492188,-2.76172 0,-1.14469 0.421493,-2.0405 1.267578,-2.6875 0.870955,-0.6719 2.041571,-1.00781 3.509766,-1.00781 0.970507,0 2.002727,0.16087 3.097656,0.48437 1.094929,0.3235 2.127149,0.74695 3.097657,1.26953 l 1.382812,-2.79883 c -2.488491,-1.44332 -5.190066,-2.16601 -8.101562,-2.16601 z m 19.404296,0.15039 v 26.98633 h 18.066407 v -3.50781 H 60.703125 v -8.32422 h 12.431641 v -3.47071 H 60.703125 v -8.21289 h 13.923828 v -3.4707 z m 27.316407,0 v 3.4707 h 7.054687 v 23.51563 h 3.619141 v -23.51563 h 7.242191 v -3.4707 z m 28.285159,0 v 17.54297 c 0,1.91612 0.43568,3.62019 1.30664,5.11328 0.89585,1.46819 2.11535,2.61436 3.6582,3.43555 1.54285,0.79632 3.24693,1.19336 5.11328,1.19336 1.89125,0 3.60949,-0.39704 5.15235,-1.19336 1.54285,-0.82119 2.76235,-1.96736 3.6582,-3.43555 0.89585,-1.49309 1.34375,-3.19716 1.34375,-5.11328 v -17.54297 h -3.54688 v 17.43164 c 0,1.19448 -0.28507,2.27561 -0.85742,3.24609 -0.57234,0.97051 -1.36837,1.72987 -2.38867,2.27735 -0.99538,0.54745 -2.11708,0.82226 -3.36133,0.82226 -1.19445,0 -2.2878,-0.27481 -3.2832,-0.82226 -0.97051,-0.57235 -1.74211,-1.33171 -2.31445,-2.27735 -0.57235,-0.97048 -0.85938,-2.05161 -0.85938,-3.24609 v -17.43164 z m 32.58007,0 v 26.98633 h 3.6211 v -9.92774 h 3.99414 c 2.06544,0 3.76951,-0.41123 5.11328,-1.23242 1.36867,-0.82119 2.35198,-1.89203 2.94922,-3.21094 0.62211,-1.31887 0.93359,-2.73592 0.93359,-4.2539 0,-2.63779 -0.83467,-4.69196 -2.50195,-6.16016 -1.64238,-1.46819 -3.93077,-2.20117 -6.86719,-2.20117 z m 3.6211,3.4707 h 4.17969 c 1.79169,0 3.11094,0.51098 3.95703,1.53125 0.84606,0.9954 1.26953,2.13961 1.26953,3.4336 0,0.74655 -0.17507,1.51815 -0.52344,2.31445 -0.3484,0.77143 -0.93271,1.43104 -1.75391,1.97852 -0.79632,0.54745 -1.84075,0.82031 -3.13476,0.82031 h -3.99414 z"
-           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
-        <path
-           id="path1070"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-           d="m 210.64844,152.64062 c -2.48847,0 -4.7891,0.63519 -6.9043,1.9043 -2.09033,1.24425 -3.75771,2.92386 -5.00195,5.03906 -1.24422,2.1152 -1.86719,4.40555 -1.86719,6.86914 0,2.53823 0.60877,4.86527 1.82812,6.98047 1.24425,2.09033 2.92582,3.74354 5.04102,4.96289 2.1152,1.21936 4.41583,1.83008 6.9043,1.83008 2.46359,0 4.75394,-0.61072 6.86914,-1.83008 2.14009,-1.24424 3.83195,-2.92386 5.07617,-5.03906 1.24425,-2.1152 1.86523,-4.41583 1.86523,-6.9043 0,-2.46359 -0.63322,-4.75394 -1.90234,-6.86914 -1.24425,-2.1152 -2.92386,-3.79481 -5.03906,-5.03906 -2.1152,-1.26911 -4.40555,-1.9043 -6.86914,-1.9043 z m 36.91015,0 c -2.48846,0 -4.79105,0.63519 -6.90625,1.9043 -2.09033,1.24425 -3.7577,2.92386 -5.00195,5.03906 -1.24422,2.1152 -1.86523,4.40555 -1.86523,6.86914 0,2.53823 0.60877,4.86527 1.82812,6.98047 1.24422,2.09033 2.92384,3.74354 5.03906,4.96289 2.1152,1.21936 4.41779,1.83008 6.90625,1.83008 2.4636,0 4.75199,-0.61072 6.86719,-1.83008 2.14007,-1.24424 3.83193,-2.92386 5.07617,-5.03906 1.24425,-2.1152 1.86719,-4.41583 1.86719,-6.9043 0,-2.46359 -0.63518,-4.75394 -1.9043,-6.86914 -1.24424,-2.1152 -2.92386,-3.79481 -5.03906,-5.03906 -2.1152,-1.26911 -4.40359,-1.9043 -6.86719,-1.9043 z m 60.19336,0.1504 c -2.36404,0.0746 -4.29206,0.77096 -5.78515,2.08984 -1.4682,1.29401 -2.20313,2.99808 -2.20313,5.11328 0,1.44333 0.36037,2.65059 1.08203,3.62109 0.72164,0.94562 1.58077,1.69276 2.57618,2.24024 1.02027,0.54745 2.29063,1.10734 3.80859,1.67969 1.64241,0.647 2.91079,1.34328 3.80664,2.08984 0.92074,0.72164 1.38086,1.70497 1.38086,2.94922 0,1.46819 -0.54765,2.57571 -1.64258,3.32226 -1.07006,0.74654 -2.32623,1.11915 -3.76953,1.11914 -1.11982,10e-6 -2.32708,-0.23616 -3.62109,-0.70898 -1.29401,-0.49769 -2.40155,-1.09425 -3.32227,-1.79102 l -1.60547,2.87305 c 1.16959,0.82119 2.52551,1.50721 4.06836,2.05469 1.54285,0.52258 3.14913,0.7832 4.81641,0.7832 1.79169,0 3.34711,-0.33591 4.66601,-1.00781 1.34378,-0.67187 2.376,-1.59213 3.09766,-2.76172 0.72166,-1.16959 1.08203,-2.47659 1.08203,-3.91992 0,-1.59262 -0.3237,-2.89965 -0.9707,-3.91992 -0.62214,-1.04517 -1.41817,-1.85344 -2.38868,-2.42578 -0.94561,-0.59722 -2.11427,-1.14487 -3.50781,-1.64258 -1.86635,-0.69677 -3.3098,-1.39308 -4.33008,-2.08985 -0.9954,-0.72166 -1.49414,-1.64192 -1.49414,-2.76171 0,-1.14472 0.42345,-2.0405 1.26953,-2.6875 0.87096,-0.67188 2.04155,-1.00782 3.50977,-1.00782 0.97051,0 2.00275,0.16088 3.09766,0.48438 1.09493,0.3235 2.12715,0.74695 3.09765,1.26953 l 1.38086,-2.80078 c -2.48846,-1.44333 -5.18809,-2.16406 -8.09961,-2.16406 z m -136.66211,0.14843 v 3.47266 h 7.05469 v 23.51562 h 3.62109 v -23.51562 h 7.24024 v -3.47266 z m 101.28321,0 v 26.98828 h 17.35742 v -3.50976 h -13.73633 v -23.47852 z m -61.72461,3.17383 c 1.84146,0 3.53332,0.46014 5.07617,1.38086 1.54285,0.92074 2.76235,2.17691 3.6582,3.76953 0.89588,1.59264 1.34375,3.3231 1.34375,5.18945 0,1.86636 -0.44787,3.59489 -1.34375,5.1875 -0.87095,1.56773 -2.07824,2.81364 -3.62109,3.73438 -1.51796,0.89585 -3.19758,1.34375 -5.03906,1.34375 -1.84147,0 -3.54554,-0.46012 -5.11328,-1.38086 -1.54286,-0.92072 -2.76236,-2.16663 -3.65821,-3.73437 -0.89585,-1.56773 -1.34375,-3.2718 -1.34375,-5.11329 0,-1.86635 0.43566,-3.59488 1.30664,-5.1875 0.89585,-1.59261 2.11535,-2.85074 3.65821,-3.77148 1.54285,-0.94561 3.23471,-1.41797 5.07617,-1.41797 z m 36.91015,0 c 1.84147,0 3.53332,0.46014 5.07618,1.38086 1.54285,0.92074 2.76235,2.17691 3.6582,3.76953 0.89585,1.59264 1.34375,3.3231 1.34375,5.18945 0,1.86636 -0.4479,3.59489 -1.34375,5.1875 -0.87096,1.56773 -2.07824,2.81364 -3.62109,3.73438 -1.51796,0.89585 -3.19758,1.34375 -5.03907,1.34375 -1.84146,0 -3.54553,-0.46012 -5.11328,-1.38086 -1.54285,-0.92072 -2.76235,-2.16663 -3.6582,-3.73437 -0.89585,-1.56773 -1.34375,-3.2718 -1.34375,-5.11329 0,-1.86635 0.43566,-3.59488 1.30664,-5.1875 0.89585,-1.59261 2.11535,-2.85074 3.6582,-3.77148 1.54286,-0.94561 3.23471,-1.41797 5.07617,-1.41797 z"
-           transform="matrix(0.26458333,0,0,0.26458333,324.64921,87.398452)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/docs/logo/setup_tools_logo_colour_1000px.png b/docs/logo/setup_tools_logo_colour_1000px.png
deleted file mode 100644
index c25a23b9f4c55c574f14a78e76ed3515359f72af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31520
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
MuO?S6^C9Ga0NJR5iU0rr

diff --git a/docs/logo/setup_tools_logo_colour_banner_1line.svg b/docs/logo/setup_tools_logo_colour_banner_1line.svg
deleted file mode 100644
index d6dc9aaca2..0000000000
--- a/docs/logo/setup_tools_logo_colour_banner_1line.svg
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="199.66046"
-   inkscape:export-xdpi="199.66046"
-   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_banner_1line_1000px.png"
-   sodipodi:docname="setup_tools_logo_colour_banner_1line.svg"
-   inkscape:version="1.0 (1.0+r73+1)"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 127.21598 34.281804"
-   height="34.281803mm"
-   width="127.21597mm">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient1362"
-       inkscape:collect="always">
-      <stop
-         id="stop1358"
-         offset="0"
-         style="stop-color:#336790;stop-opacity:1" />
-      <stop
-         id="stop1360"
-         offset="1"
-         style="stop-color:#396f9e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1356">
-      <stop
-         style="stop-color:#ffd040;stop-opacity:1;"
-         offset="0"
-         id="stop1352" />
-      <stop
-         style="stop-color:#c59500;stop-opacity:1"
-         offset="1"
-         id="stop1354" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1346"
-       inkscape:collect="always">
-      <stop
-         id="stop1342"
-         offset="0"
-         style="stop-color:#ffd040;stop-opacity:1;" />
-      <stop
-         id="stop1344"
-         offset="1"
-         style="stop-color:#c59500;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-1.5091231)"
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1348"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)"
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1350"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1348-1"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(-0.09428005)"
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1389"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1086"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-50.518893,20.912766)"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1362"
-       id="linearGradient1203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-50.613405,20.912779)"
-       x1="372.85818"
-       y1="111.95531"
-       x2="360.05417"
-       y2="101.13023" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1309.7068,-327.43974)"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1224"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2136807,0,0,1.2136807,-68.746066,-31.825309)"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:snap-global="false"
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="27"
-     inkscape:window-x="0"
-     inkscape:window-height="1016"
-     inkscape:window-width="1920"
-     showgrid="false"
-     inkscape:current-layer="g1222"
-     inkscape:document-units="mm"
-     inkscape:cy="-45.136828"
-     inkscape:cx="193.79166"
-     inkscape:zoom="1.027839"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     transform="translate(-306.41189,-109.96025)">
-    <g
-       transform="translate(0.04622687,-0.80180859)"
-       id="g1399">
-      <g
-         id="g1222">
-        <path
-           transform="matrix(0.26458333,0,0,0.26458333,306.36566,110.76206)"
-           d="M 41.09375 106.27539 L 41.09375 110.1875 C 41.09375 115.6174 45.444915 119.96875 50.875 119.96875 L 51.103516 119.96875 C 56.533449 119.96875 60.858309 115.6208 60.884766 110.1875 L 60.884766 106.27539 L 41.09375 106.27539 z "
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path857" />
-        <path
-           d="m 317.41596,115.74629 c -0.46489,0 -0.98563,0.0832 -1.50172,0.24081 -0.12901,0.0394 -0.25805,0.0832 -0.3855,0.13178 -0.12731,0.0485 -0.25339,0.10179 -0.37724,0.15916 -0.24798,0.11485 -0.48734,0.24713 -0.71003,0.39584 -0.22268,0.14871 -0.42823,0.31194 -0.61134,0.48886 -0.18311,0.17692 -0.34365,0.36771 -0.47645,0.57154 -0.13281,0.20383 -0.23778,0.42065 -0.30955,0.65009 -0.0179,0.0574 -0.0338,0.11524 -0.0475,0.17415 -0.0412,0.17688 -0.063,0.36038 -0.063,0.55087 0,0.9951 -0.0661,1.68959 -0.0661,3.6034 2.6e-4,0.0568 5.6e-4,0.82689 0.001,1.41128 0.6498,-0.91281 1.72602,-1.50843 2.93057,-1.50843 h 2.86701 v -0.89659 l 4.05092,-0.0155 2.64066,-0.0114 v -2.70319 c 0,-0.11518 -0.0109,-0.22887 -0.0315,-0.34004 v -5.2e-4 c -0.0103,-0.0555 -0.023,-0.11041 -0.0382,-0.16485 v -5.3e-4 c -0.0758,-0.27295 -0.21051,-0.53194 -0.39067,-0.77463 -0.0721,-0.0971 -0.15151,-0.19159 -0.2372,-0.28319 -0.25707,-0.2748 -0.57116,-0.52409 -0.91932,-0.7431 -0.11592,-0.0729 -0.23554,-0.14215 -0.35709,-0.20723 h -5.3e-4 c -0.24324,-0.13021 -0.49511,-0.24455 -0.74517,-0.34158 h -5.3e-4 c -0.12492,-0.0485 -0.24931,-0.0931 -0.37204,-0.13278 h -5.3e-4 c -0.36843,-0.11927 -0.72086,-0.19839 -1.02215,-0.23358 h -5.3e-4 c -0.10046,-0.0117 -0.19492,-0.0183 -0.28267,-0.0202 h -3.54292 z m 4.70411,2.31304 c 0.59472,0 1.07642,0.48221 1.07642,1.07693 0,0.59473 -0.48168,1.07642 -1.07642,1.07642 -0.59472,0 -1.07694,-0.48169 -1.07694,-1.07642 0,-0.59473 0.48222,-1.07694 1.07694,-1.07693 z m -7.0125,9.74514 -0.002,5.3e-4 c -0.85439,-6e-5 -1.5704,0.56504 -1.79937,1.34307 0.0126,0.0215 0.0231,0.0458 0.0362,0.0667 0.0578,0.0925 0.1198,0.17911 0.18552,0.26045 0.0657,0.0814 0.13527,0.15735 0.20774,0.22841 0.0724,0.071 0.14791,0.13739 0.22582,0.19895 0.15603,0.12328 0.32321,0.22767 0.49713,0.31523 h 5.3e-4 c 0.26075,0.13124 0.53596,0.2246 0.8077,0.28474 0.17147,0.0379 0.34092,0.0617 0.5054,0.0749 0.009,7.4e-4 0.0191,0.002 0.0284,0.003 0.0867,0.006 0.17149,0.009 0.25425,0.009 l 0.92707,0.002 -0.001,-0.79633 v -0.01 c 0.002,-0.0307 0.003,-0.066 0.004,-0.10336 5e-5,-1.04029 -0.83662,-1.87746 -1.87689,-1.8774 z m 8.6155,0.4656 c -0.64896,0.0113 -1.21136,0.54677 -1.2113,1.18391 v 0.3514 2.6603 h -0.0181 l -0.001,0.0951 -6.12521,0.0134 c -0.24235,0.0162 -0.4773,0.0149 -0.70435,-0.005 -0.22705,-0.0198 -0.446,-0.0574 -0.65629,-0.11317 -0.21028,-0.0558 -0.41204,-0.12982 -0.6041,-0.22169 -0.19205,-0.0919 -0.37437,-0.20174 -0.54674,-0.3297 -0.43857,-0.32558 -0.6956,-0.93934 -0.99994,-1.47846 v 3.82199 c 0,0.0727 0.002,0.14482 0.007,0.21601 0.005,0.0712 0.0112,0.14125 0.0202,0.21084 v 5.2e-4 c 0.0179,0.139 0.0446,0.27483 0.0791,0.40722 v 5.2e-4 c 0.069,0.26491 0.1701,0.51618 0.29817,0.75293 0.0641,0.11856 0.13478,0.2331 0.21188,0.34417 v 5.2e-4 c 0.23101,0.33272 0.51767,0.63144 0.84284,0.89194 0.10842,0.0869 0.22126,0.16895 0.33745,0.2465 0.23238,0.15509 0.47858,0.29119 0.73277,0.40669 0.2542,0.1155 0.5161,0.21041 0.7798,0.28319 0.26369,0.0727 0.52925,0.12346 0.79013,0.15037 0.13045,0.0135 0.25961,0.0208 0.38705,0.0222 h 0.004 0.002 c 0.10334,0.003 0.95868,0.007 1.78697,0.008 0.69206,10e-4 1.20706,0.002 1.48829,0.002 0.0553,-4e-5 0.2728,8e-5 0.293,0 1.15473,-0.005 2.16001,-0.0931 3.03547,-0.26045 0.4703,-0.0899 0.90462,-0.20151 1.3007,-0.33745 0.38381,-0.13172 0.73108,-0.28624 1.04076,-0.46043 0.92918,-0.5226 1.5179,-1.22179 1.72445,-2.01022 0.0974,-0.71835 0.0707,-2.41111 0.0667,-3.59358 v -0.002 c 0.004,-1.07228 0.007,-1.20598 0.008,-1.3162 h -0.0253 l -0.002,-0.14779 -3.13314,0.015 -0.004,-0.62476 c -2e-5,-0.65702 -0.5269,-1.18388 -1.1839,-1.18391 h -0.002 c -0.006,-5e-5 -0.0141,-4e-5 -0.0191,0 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path1185" />
-        <path
-           d="m 320.69357,123.18993 v 0.014 h -4.8948 c -1.66007,0 -3.01858,1.32715 -2.98638,2.98018 v 0.004 1.25987 1.82004 c 0.22102,-1.13301 1.09696,-2.04967 2.29289,-2.05052 h 0.002 c 1.35724,9.8e-4 2.46504,1.10697 2.46497,2.46445 0,0.0448 -0.002,0.0932 -0.006,0.14469 l 0.002,-0.0212 0.004,2.07222 h 4.35168 v -2.07067 -0.35347 c -9e-5,-0.97613 0.82874,-1.75627 1.79265,-1.77147 h 0.002 c 0.009,-8e-5 0.0184,-7e-5 0.0274,0 0.97328,10e-4 1.7684,0.7961 1.76941,1.7694 v 0.0357 l 2.51767,-0.0119 v -0.12505 h 0.0119 v -6.16035 h -2.65462 c -0.17114,0.80057 -0.79979,1.44313 -1.64641,1.44332 -0.84657,-1.9e-4 -1.47321,-0.64281 -1.64434,-1.44332 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path1105" />
-        <path
-           d="m 337.48857,123.28851 c -0.75916,0.0241 -1.37827,0.24756 -1.85773,0.6711 -0.47147,0.41552 -0.70685,0.96335 -0.70685,1.6426 0,0.46347 0.11567,0.85115 0.34746,1.16281 0.23175,0.30365 0.50698,0.54294 0.82663,0.71874 0.32763,0.17581 0.73557,0.35559 1.22302,0.53939 0.52741,0.20776 0.93471,0.43198 1.22238,0.67171 0.29567,0.23174 0.44343,0.54688 0.44343,0.94643 0,0.47146 -0.17586,0.82712 -0.52747,1.06685 -0.34361,0.23972 -0.74699,0.36 -1.21047,0.36 -0.35959,0 -0.74727,-0.0764 -1.16281,-0.2283 -0.41553,-0.15982 -0.77117,-0.35137 -1.06684,-0.57513 l -0.51492,0.92322 c 0.37559,0.26371 0.811,0.48337 1.30643,0.65917 0.49545,0.16782 1.01062,0.2515 1.54603,0.2515 0.57534,0 1.07482,-0.10788 1.49834,-0.32361 0.43152,-0.21577 0.76297,-0.51128 0.99471,-0.88685 0.23174,-0.37559 0.3481,-0.7953 0.3481,-1.25876 0,-0.51143 -0.10389,-0.93051 -0.31172,-1.25815 -0.19976,-0.33561 -0.4554,-0.59579 -0.76705,-0.77959 -0.30365,-0.19178 -0.67955,-0.36765 -1.12704,-0.52747 -0.59932,-0.22375 -1.06284,-0.44733 -1.39049,-0.67107 -0.31964,-0.23175 -0.47917,-0.52727 -0.47917,-0.88686 0,-0.36757 0.13534,-0.65523 0.40704,-0.863 0.27968,-0.21576 0.65559,-0.32364 1.12706,-0.32364 0.31165,0 0.64313,0.0517 0.99473,0.15554 0.3516,0.1039 0.68307,0.23987 0.99472,0.40769 l 0.44405,-0.89877 c -0.79912,-0.46347 -1.66664,-0.69555 -2.60157,-0.69555 z m 6.23109,0.0483 v 8.66585 h 5.80147 v -1.12643 h -4.6393 v -2.67308 h 3.99205 v -1.11451 h -3.99205 v -2.63733 h 4.47123 v -1.1145 z m 8.77184,0 v 1.1145 h 2.2654 v 7.55135 h 1.16217 v -7.55135 h 2.32561 v -1.1145 z m 9.08292,0 v 5.63339 c 0,0.61531 0.1399,1.16251 0.41958,1.64198 0.28768,0.47147 0.67928,0.83952 1.17472,1.10322 0.49543,0.25571 1.04267,0.3832 1.64199,0.3832 0.60731,0 1.15907,-0.12749 1.65451,-0.3832 0.49544,-0.2637 0.88705,-0.63175 1.17473,-1.10322 0.28766,-0.47947 0.4315,-1.02667 0.4315,-1.64198 v -5.63339 h -1.13899 v 5.59764 c 0,0.38357 -0.0915,0.73074 -0.27533,1.04239 -0.18379,0.31165 -0.4394,0.5555 -0.76705,0.73131 -0.31962,0.17578 -0.67982,0.26403 -1.07937,0.26403 -0.38357,0 -0.73466,-0.0882 -1.05431,-0.26403 -0.31165,-0.18381 -0.55943,-0.42764 -0.74322,-0.73131 -0.18379,-0.31165 -0.27597,-0.65882 -0.27597,-1.04239 v -5.59764 z m 10.4621,0 v 8.66585 h 1.1628 v -3.188 h 1.28261 c 0.66325,0 1.21046,-0.13206 1.64197,-0.39576 0.4395,-0.2637 0.75527,-0.60756 0.94705,-1.0311 0.19977,-0.42351 0.29979,-0.87855 0.29979,-1.36601 0,-0.84703 -0.26803,-1.50666 -0.80342,-1.97813 -0.5274,-0.47147 -1.26226,-0.70685 -2.20519,-0.70685 z m 1.1628,1.1145 h 1.34218 c 0.57534,0 0.99899,0.1641 1.27068,0.49173 0.2717,0.31964 0.40768,0.68706 0.40768,1.10259 0,0.23972 -0.0562,0.48751 -0.16809,0.74321 -0.1119,0.24773 -0.29951,0.45953 -0.56322,0.63535 -0.25571,0.17579 -0.5911,0.26342 -1.00662,0.26342 h -1.28261 z"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.299663"
-           id="path1059" />
-        <path
-           d="m 393.03224,123.26436 c -0.7991,0 -1.53788,0.20397 -2.21712,0.6115 -0.67124,0.39957 -1.20667,0.93891 -1.60623,1.61815 -0.39954,0.67924 -0.59958,1.4147 -0.59958,2.20581 0,0.81508 0.19547,1.56233 0.58703,2.24157 0.39956,0.67124 0.93955,1.20212 1.61878,1.59368 0.67924,0.39157 1.41802,0.58768 2.21712,0.58768 0.79109,0 1.52658,-0.19611 2.2058,-0.58768 0.68723,-0.39954 1.23053,-0.9389 1.63007,-1.61814 0.39954,-0.67923 0.59895,-1.418 0.59895,-2.21711 0,-0.79111 -0.20334,-1.52657 -0.61087,-2.20581 -0.39955,-0.67924 -0.93892,-1.21858 -1.61815,-1.61815 -0.67922,-0.40753 -1.41471,-0.6115 -2.2058,-0.6115 z m 11.85257,0 c -0.7991,0 -1.53851,0.20397 -2.21773,0.6115 -0.67126,0.39957 -1.20668,0.93891 -1.60624,1.61815 -0.39953,0.67924 -0.59895,1.4147 -0.59895,2.20581 0,0.81508 0.19549,1.56233 0.58704,2.24157 0.39955,0.67124 0.93891,1.20212 1.61815,1.59368 0.67922,0.39157 1.41863,0.58768 2.21773,0.58768 0.7911,0 1.52594,-0.19611 2.20519,-0.58768 0.68722,-0.39954 1.2305,-0.9389 1.63006,-1.61814 0.39955,-0.67923 0.59959,-1.418 0.59959,-2.21711 0,-0.79111 -0.20397,-1.52657 -0.61151,-2.20581 -0.39955,-0.67924 -0.93891,-1.21858 -1.61814,-1.61815 -0.67925,-0.40753 -1.41409,-0.6115 -2.20519,-0.6115 z m 19.32927,0.0483 c -0.75914,0.024 -1.37826,0.24756 -1.85773,0.67109 -0.47147,0.41553 -0.70747,0.96273 -0.70747,1.64196 0,0.46349 0.11567,0.85116 0.34747,1.16281 0.23173,0.30366 0.5076,0.54359 0.82726,0.71939 0.32763,0.1758 0.73556,0.35558 1.223,0.53938 0.52742,0.20776 0.93473,0.43135 1.2224,0.6711 0.29568,0.23172 0.44343,0.54748 0.44343,0.94704 0,0.47146 -0.17587,0.82712 -0.52747,1.06685 -0.34362,0.23973 -0.747,0.35937 -1.21047,0.35937 -0.35959,0 -0.74727,-0.0758 -1.16281,-0.22767 -0.41553,-0.15981 -0.77119,-0.35137 -1.06684,-0.57513 l -0.51556,0.92259 c 0.37559,0.26371 0.81099,0.484 1.30644,0.65981 0.49544,0.16782 1.01124,0.25149 1.54664,0.25149 0.57534,0 1.07482,-0.10789 1.49836,-0.32362 0.43151,-0.21575 0.76298,-0.51127 0.99471,-0.88684 0.23173,-0.37559 0.34745,-0.79529 0.34745,-1.25876 0,-0.51143 -0.10388,-0.93114 -0.3117,-1.25877 -0.19979,-0.33563 -0.4554,-0.59517 -0.76704,-0.77896 -0.30368,-0.19179 -0.67894,-0.36764 -1.12644,-0.52746 -0.59933,-0.22376 -1.06284,-0.44735 -1.39047,-0.6711 -0.31965,-0.23174 -0.4798,-0.52726 -0.4798,-0.88684 0,-0.3676 0.13597,-0.65525 0.40766,-0.86301 0.27969,-0.21575 0.65559,-0.32363 1.12707,-0.32363 0.31164,0 0.64312,0.0517 0.99471,0.15555 0.35161,0.10388 0.68307,0.23985 0.99471,0.40767 l 0.44343,-0.89939 c -0.7991,-0.46348 -1.66599,-0.69492 -2.60094,-0.69492 z m -43.8849,0.0477 v 1.11515 h 2.2654 v 7.55132 h 1.1628 v -7.55132 h 2.325 v -1.11515 z m 32.52403,0 v 8.66647 h 5.57382 v -1.12706 h -4.41101 v -7.53941 z m -19.82097,1.01917 c 0.59132,0 1.1346,0.14777 1.63006,0.44342 0.49543,0.29568 0.88704,0.69906 1.17471,1.21048 0.28768,0.51142 0.4315,1.0671 0.4315,1.66643 0,0.59933 -0.14382,1.15439 -0.4315,1.66581 -0.27968,0.50343 -0.66736,0.90352 -1.1628,1.19918 -0.48745,0.28768 -1.02682,0.43151 -1.61815,0.43151 -0.59133,0 -1.13854,-0.14776 -1.64198,-0.44343 -0.49544,-0.29566 -0.88705,-0.69574 -1.17472,-1.19917 -0.28767,-0.50344 -0.4315,-1.05064 -0.4315,-1.64198 0,-0.59933 0.1399,-1.15439 0.41958,-1.66581 0.28769,-0.51143 0.67928,-0.91544 1.17474,-1.2111 0.49544,-0.30365 1.03873,-0.45534 1.63006,-0.45534 z m 11.85257,0 c 0.59133,0 1.13461,0.14777 1.63006,0.44342 0.49543,0.29568 0.88705,0.69906 1.17472,1.21048 0.28767,0.51142 0.43151,1.0671 0.43151,1.66643 0,0.59933 -0.14384,1.15439 -0.43151,1.66581 -0.27968,0.50343 -0.66737,0.90352 -1.1628,1.19918 -0.48745,0.28768 -1.02681,0.43151 -1.61816,0.43151 -0.59133,0 -1.13853,-0.14776 -1.64198,-0.44343 -0.49543,-0.29566 -0.88704,-0.69574 -1.1747,-1.19917 -0.28768,-0.50344 -0.43151,-1.05064 -0.43151,-1.64198 0,-0.59933 0.1399,-1.15439 0.4196,-1.66581 0.28766,-0.51143 0.67926,-0.91544 1.17471,-1.2111 0.49544,-0.30365 1.03873,-0.45534 1.63006,-0.45534 z"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:0.71374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-           id="path1070" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png b/docs/logo/setup_tools_logo_colour_banner_1line_1000px.png
deleted file mode 100644
index d1604289c8d768aee6f250d1e1127cc85840cc5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24183
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
O&w%?zI+%M;U;hueu&zn~

diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines.svg b/docs/logo/setup_tools_logo_colour_banner_2lines.svg
deleted file mode 100644
index 991577fba0..0000000000
--- a/docs/logo/setup_tools_logo_colour_banner_2lines.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="318.51953"
-   inkscape:export-xdpi="318.51953"
-   inkscape:export-filename="/home/crogers/Dropbox/current_projects/floss_for_science_podcast/setuptools_logo/setup_tools_logo_colour_banner_2lines_1000px.png"
-   width="79.743927mm"
-   height="34.816189mm"
-   viewBox="0 0 79.743929 34.81619"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (1.0+r73+1)"
-   sodipodi:docname="setup_tools_logo_colour_banner_2lines.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1362">
-      <stop
-         style="stop-color:#336790;stop-opacity:1"
-         offset="0"
-         id="stop1358" />
-      <stop
-         style="stop-color:#396f9e;stop-opacity:1"
-         offset="1"
-         id="stop1360" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1356"
-       inkscape:collect="always">
-      <stop
-         id="stop1352"
-         offset="0"
-         style="stop-color:#ffd040;stop-opacity:1;" />
-      <stop
-         id="stop1354"
-         offset="1"
-         style="stop-color:#c59500;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1346">
-      <stop
-         style="stop-color:#ffd040;stop-opacity:1;"
-         offset="0"
-         id="stop1342" />
-      <stop
-         style="stop-color:#c59500;stop-opacity:1"
-         offset="1"
-         id="stop1344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1348"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.5091231)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1350"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1348-1"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1389"
-       gradientUnits="userSpaceOnUse"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952"
-       gradientTransform="translate(-0.09428005)" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1086"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="translate(-50.077801,19.854432)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1109"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="101.13023"
-       x2="360.05417"
-       y1="111.95531"
-       x1="372.85818"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1348.8391,-341.44002)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1203"
-       xlink:href="#linearGradient1362"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="matrix(3.6691687,0,0,3.6691687,-1309.3337,-329.29191)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1214"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(1.2047454,0,0,1.2047454,-111.70824,-25.690314)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1224"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.199673"
-     inkscape:cx="16.58134"
-     inkscape:cy="40.833582"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g1222"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-306.75427,-109.39197)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1399"
-       transform="translate(0.04622687,-0.80180859)">
-      <g
-         id="g1222">
-        <path
-           transform="matrix(0.26458333,0,0,0.26458333,306.70804,110.19378)"
-           d="M 41.466797 104.42188 L 41.46875 108.33594 C 41.46875 113.76587 45.817962 118.11523 51.248047 118.11523 L 51.476562 118.11523 C 56.906534 118.11523 61.231356 113.76924 61.257812 108.33594 L 61.257812 104.42188 L 41.466797 104.42188 z "
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.204;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path875" />
-        <path
-           id="path1185"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.22266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="M 42.136719 16.986328 C 40.379654 16.986328 38.411514 17.300793 36.460938 17.896484 C 35.973341 18.045398 35.485607 18.21096 35.003906 18.394531 C 34.522735 18.577838 34.046219 18.779262 33.578125 18.996094 C 32.640878 19.430172 31.736194 19.930134 30.894531 20.492188 C 30.052906 21.054241 29.276054 21.67117 28.583984 22.339844 C 27.891915 23.008518 27.285124 23.729619 26.783203 24.5 C 26.281244 25.270381 25.884538 26.089856 25.613281 26.957031 C 25.545628 27.173976 25.485373 27.392582 25.433594 27.615234 C 25.277877 28.283757 25.195312 28.977303 25.195312 29.697266 C 25.195312 33.458273 24.945312 36.083109 24.945312 43.316406 C 24.946295 43.531083 24.947442 46.441673 24.949219 48.650391 C 27.405156 45.2004 31.472761 42.949219 36.025391 42.949219 L 46.861328 42.949219 L 46.861328 39.560547 L 62.171875 39.501953 L 72.152344 39.458984 L 72.152344 29.242188 C 72.152344 28.806862 72.111061 28.377201 72.033203 27.957031 L 72.033203 27.955078 C 71.994274 27.745314 71.946121 27.537789 71.888672 27.332031 L 71.888672 27.330078 C 71.602184 26.298456 71.093029 25.319597 70.412109 24.402344 C 70.139605 24.035352 69.839493 23.678236 69.515625 23.332031 C 68.544022 22.293417 67.356896 21.351192 66.041016 20.523438 C 65.602893 20.24791 65.150808 19.986206 64.691406 19.740234 L 64.689453 19.740234 C 63.770121 19.248102 62.818156 18.815946 61.873047 18.449219 L 61.871094 18.449219 C 61.398842 18.265912 60.928705 18.097275 60.464844 17.947266 L 60.462891 17.947266 C 59.070361 17.496481 57.738343 17.197455 56.599609 17.064453 L 56.597656 17.064453 C 56.217965 17.020233 55.86095 16.995084 55.529297 16.988281 L 42.138672 16.988281 L 42.136719 16.986328 z M 59.916016 25.726562 C 62.163776 25.726562 63.986328 27.549114 63.986328 29.796875 C 63.986328 32.044673 62.163852 33.867188 59.916016 33.867188 C 57.668255 33.867188 55.845703 32.044673 55.845703 29.796875 C 55.845703 27.549077 57.668255 25.726525 59.916016 25.726562 z M 33.414062 62.560547 L 33.404297 62.5625 C 30.175106 62.562273 27.468914 64.698086 26.603516 67.638672 C 26.651138 67.719932 26.690723 67.811633 26.740234 67.890625 C 26.958691 68.240231 27.193016 68.567573 27.441406 68.875 C 27.689721 69.182654 27.95266 69.469708 28.226562 69.738281 C 28.5002 70.006628 28.785615 70.257567 29.080078 70.490234 C 29.669798 70.956175 30.301649 71.350705 30.958984 71.681641 L 30.960938 71.681641 C 31.946449 72.177666 32.986623 72.530512 34.013672 72.757812 C 34.661747 72.901057 35.302171 72.991126 35.923828 73.041016 C 35.957844 73.043812 35.9961 73.048955 36.03125 73.052734 C 36.358935 73.075412 36.679394 73.085938 36.992188 73.085938 L 40.496094 73.09375 L 40.492188 70.083984 L 40.492188 70.046875 C 40.499747 69.930844 40.504033 69.797453 40.507812 69.65625 C 40.508001 65.724445 37.345792 62.56032 33.414062 62.560547 z M 65.974609 64.320312 C 63.521847 64.363021 61.396258 66.386834 61.396484 68.794922 L 61.396484 70.123047 L 61.396484 80.177734 L 61.328125 80.177734 L 61.324219 80.537109 L 38.173828 80.587891 C 37.25786 80.649119 36.36986 80.642438 35.511719 80.568359 C 34.653577 80.493525 33.826047 80.351409 33.03125 80.140625 C 32.236491 79.929727 31.473943 79.64996 30.748047 79.302734 C 30.022189 78.955396 29.333118 78.540269 28.681641 78.056641 C 27.024053 76.826102 26.052605 74.506369 24.902344 72.46875 L 24.902344 86.914062 C 24.902344 87.188834 24.91079 87.461404 24.929688 87.730469 C 24.948585 87.999571 24.971844 88.264326 25.005859 88.527344 L 25.005859 88.529297 C 25.073513 89.054613 25.174294 89.567988 25.304688 90.068359 L 25.304688 90.070312 C 25.565475 91.071547 25.947597 92.021212 26.431641 92.916016 C 26.673908 93.364116 26.94102 93.797005 27.232422 94.216797 L 27.232422 94.21875 C 28.105531 95.476274 29.18898 96.605277 30.417969 97.589844 C 30.827745 97.918285 31.254216 98.228382 31.693359 98.521484 C 32.571646 99.107651 33.502173 99.622058 34.462891 100.05859 C 35.423647 100.49513 36.413495 100.85383 37.410156 101.12891 C 38.40678 101.40368 39.410481 101.59556 40.396484 101.69727 C 40.889524 101.74829 41.377712 101.77596 41.859375 101.78125 L 41.875 101.78125 L 41.882812 101.78125 C 42.273389 101.79259 45.506174 101.80872 48.636719 101.8125 C 51.252379 101.81628 53.198802 101.82031 54.261719 101.82031 C 54.470727 101.82016 55.292794 101.82061 55.369141 101.82031 C 59.733474 101.80141 63.532972 101.46844 66.841797 100.83594 C 68.619309 100.49616 70.260817 100.07434 71.757812 99.560547 C 73.208433 99.062708 74.520962 98.478668 75.691406 97.820312 C 79.203268 95.845131 81.428323 93.202549 82.208984 90.222656 C 82.57711 87.507633 82.476056 81.109803 82.460938 76.640625 L 82.460938 76.632812 C 82.476056 72.580101 82.486455 72.074783 82.490234 71.658203 L 82.394531 71.658203 L 82.386719 71.099609 L 70.544922 71.15625 L 70.53125 68.794922 C 70.531174 66.311697 68.53979 64.320426 66.056641 64.320312 L 66.048828 64.320312 C 66.026151 64.320124 65.99546 64.320161 65.976562 64.320312 L 65.974609 64.320312 z "
-           transform="matrix(0.26458333,0,0,0.26458333,306.70804,110.19378)" />
-        <path
-           id="path1105"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.588079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="m 321.13467,122.13159 v 0.014 h -4.8948 c -1.66007,0 -3.01858,1.32715 -2.98638,2.98018 v 0.004 1.25987 1.82004 c 0.22102,-1.13301 1.09696,-2.04967 2.29289,-2.05052 h 0.002 c 1.35724,9.8e-4 2.46504,1.10697 2.46497,2.46445 0,0.0448 -0.002,0.0932 -0.006,0.14469 l 0.002,-0.0212 0.004,2.07222 h 4.35168 v -2.07067 -0.35347 c -9e-5,-0.97613 0.82874,-1.75627 1.79265,-1.77147 h 0.002 c 0.009,-8e-5 0.0184,-7e-5 0.0274,0 0.97328,10e-4 1.7684,0.7961 1.76941,1.7694 v 0.0357 l 2.51767,-0.0119 v -0.12505 h 0.0119 v -6.16035 h -2.65462 c -0.17114,0.80057 -0.79979,1.44313 -1.64641,1.44332 -0.84657,-1.9e-4 -1.47321,-0.64281 -1.64434,-1.44332 z" />
-        <path
-           id="path1059"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.297456"
-           d="m 336.64763,117.62189 c -0.75355,0.0239 -1.36812,0.24574 -1.84405,0.66615 -0.468,0.41247 -0.70163,0.95628 -0.70163,1.63052 0,0.46005 0.11481,0.84488 0.3449,1.15424 0.23004,0.30141 0.50325,0.53894 0.82054,0.71346 0.32522,0.17451 0.73015,0.35297 1.21401,0.53541 0.52353,0.20623 0.92784,0.42881 1.21339,0.66677 0.29348,0.23003 0.44016,0.54286 0.44016,0.93946 0,0.468 -0.17457,0.82102 -0.52358,1.059 -0.34109,0.23795 -0.7415,0.35735 -1.20157,0.35735 -0.35694,0 -0.74176,-0.0759 -1.15424,-0.22663 -0.41247,-0.15864 -0.76549,-0.34878 -1.05898,-0.57089 l -0.51114,0.91643 c 0.37282,0.26176 0.80502,0.47981 1.29681,0.65432 0.49181,0.16658 1.00318,0.24964 1.53464,0.24964 0.57111,0 1.06692,-0.1071 1.48732,-0.32124 0.42834,-0.21417 0.75735,-0.5075 0.98739,-0.88031 0.23003,-0.37282 0.34553,-0.78944 0.34553,-1.2495 0,-0.50767 -0.10312,-0.92365 -0.30941,-1.24888 -0.1983,-0.33314 -0.45206,-0.5914 -0.76141,-0.77385 -0.30142,-0.19036 -0.67455,-0.36494 -1.11876,-0.52358 -0.5949,-0.22211 -1.055,-0.44405 -1.38024,-0.66614 -0.31728,-0.23004 -0.47564,-0.52338 -0.47564,-0.88032 0,-0.36487 0.13435,-0.65042 0.40405,-0.85666 0.27762,-0.21417 0.65076,-0.32125 1.11876,-0.32125 0.30935,0 0.63838,0.0513 0.9874,0.1544 0.34901,0.10313 0.67804,0.2381 0.98739,0.40468 l 0.44078,-0.89215 c -0.79322,-0.46006 -1.65436,-0.69043 -2.58242,-0.69043 z m 6.18523,0.048 v 8.60205 h 5.75876 v -1.11814 h -4.60515 v -2.65339 h 3.96266 v -1.1063 h -3.96266 v -2.61792 h 4.43831 v -1.1063 z m 8.70726,0 v 1.1063 h 2.24872 v 7.49575 h 1.15361 v -7.49575 h 2.3085 v -1.1063 z m 9.01605,0 v 5.59192 c 0,0.61077 0.13887,1.15395 0.41649,1.62989 0.28556,0.46799 0.67428,0.83335 1.16607,1.0951 0.49179,0.25383 1.03499,0.38039 1.62989,0.38039 0.60284,0 1.15054,-0.12656 1.64235,-0.38039 0.49178,-0.26175 0.88051,-0.62711 1.16607,-1.0951 0.28555,-0.47594 0.42832,-1.01912 0.42832,-1.62989 v -5.59192 h -1.13059 v 5.55644 c 0,0.38074 -0.0908,0.72535 -0.27331,1.03471 -0.18243,0.30935 -0.43617,0.5514 -0.7614,0.72592 -0.31728,0.17449 -0.67483,0.26209 -1.07144,0.26209 -0.38074,0 -0.72924,-0.0876 -1.04654,-0.26209 -0.30935,-0.18245 -0.5553,-0.42449 -0.73774,-0.72592 -0.18244,-0.30936 -0.27393,-0.65397 -0.27393,-1.03471 v -5.55644 z m 10.38507,0 v 8.60205 h 1.15424 v -3.16453 h 1.27317 c 0.65837,0 1.20155,-0.13108 1.62988,-0.39284 0.43627,-0.26176 0.74971,-0.60309 0.94008,-1.02351 0.1983,-0.42039 0.29758,-0.87209 0.29758,-1.35595 0,-0.8408 -0.26605,-1.49558 -0.7975,-1.96358 -0.52352,-0.46799 -1.25296,-0.70164 -2.18896,-0.70164 z m 1.15424,1.1063 h 1.33231 c 0.57111,0 0.99162,0.16289 1.26132,0.48811 0.26969,0.31728 0.40467,0.682 0.40467,1.09447 0,0.23796 -0.0558,0.48392 -0.16684,0.73774 -0.11108,0.2459 -0.29731,0.45615 -0.55908,0.63067 -0.25383,0.1745 -0.58675,0.26148 -0.99921,0.26148 h -1.27317 z" />
-        <path
-           id="path1070"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:0.708485;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-           d="m 346.67032,128.25756 c -0.79322,0 -1.52656,0.20247 -2.2008,0.60701 -0.66629,0.39661 -1.19778,0.93199 -1.59439,1.60623 -0.3966,0.67423 -0.59518,1.40428 -0.59518,2.18957 0,0.80907 0.19405,1.55084 0.58272,2.22507 0.39662,0.6663 0.93263,1.19327 1.60685,1.58194 0.67424,0.38869 1.40758,0.58335 2.2008,0.58335 0.78527,0 1.51534,-0.19466 2.18957,-0.58335 0.68217,-0.3966 1.22146,-0.93199 1.61806,-1.60623 0.3966,-0.67422 0.59454,-1.40756 0.59454,-2.20078 0,-0.78529 -0.20184,-1.51534 -0.60637,-2.18957 -0.39661,-0.67424 -0.932,-1.20962 -1.60623,-1.60623 -0.67423,-0.40454 -1.4043,-0.60701 -2.18957,-0.60701 z m 11.76531,0 c -0.79321,0 -1.52718,0.20247 -2.2014,0.60701 -0.66631,0.39661 -1.1978,0.93199 -1.59441,1.60623 -0.39659,0.67423 -0.59455,1.40428 -0.59455,2.18957 0,0.80907 0.19405,1.55084 0.58273,2.22507 0.3966,0.6663 0.93199,1.19327 1.60623,1.58194 0.67422,0.38869 1.40819,0.58335 2.2014,0.58335 0.78528,0 1.51472,-0.19466 2.18895,-0.58335 0.68217,-0.3966 1.22145,-0.93199 1.61806,-1.60623 0.39661,-0.67422 0.59518,-1.40756 0.59518,-2.20078 0,-0.78529 -0.20247,-1.51534 -0.60701,-2.18957 -0.3966,-0.67424 -0.93199,-1.20962 -1.60623,-1.60623 -0.67423,-0.40454 -1.40367,-0.60701 -2.18895,-0.60701 z m 19.18697,0.048 c -0.75356,0.0237 -1.36812,0.24574 -1.84406,0.66614 -0.46799,0.41248 -0.70225,0.95565 -0.70225,1.62989 0,0.46006 0.11481,0.84488 0.3449,1.15424 0.23002,0.30143 0.50388,0.53958 0.82117,0.71409 0.32522,0.1745 0.73015,0.35296 1.21401,0.53541 0.52353,0.20623 0.92783,0.42818 1.21338,0.66615 0.2935,0.23002 0.44017,0.54346 0.44017,0.94008 0,0.46799 -0.17457,0.82102 -0.52358,1.05899 -0.34109,0.23796 -0.7415,0.35673 -1.20157,0.35673 -0.35694,0 -0.74176,-0.0753 -1.15424,-0.22599 -0.41247,-0.15864 -0.76551,-0.3488 -1.05898,-0.5709 l -0.51177,0.91579 c 0.37282,0.26177 0.80502,0.48045 1.29683,0.65495 0.49178,0.16658 1.00379,0.24965 1.53525,0.24965 0.57111,0 1.06691,-0.1071 1.48732,-0.32125 0.42833,-0.21415 0.75736,-0.50749 0.98738,-0.8803 0.23004,-0.37282 0.34491,-0.78944 0.34491,-1.2495 0,-0.50766 -0.10313,-0.92429 -0.30941,-1.24949 -0.19832,-0.33316 -0.45205,-0.5908 -0.7614,-0.77323 -0.30143,-0.19038 -0.67394,-0.36495 -1.11814,-0.52359 -0.59491,-0.2221 -1.05502,-0.44405 -1.38024,-0.66615 -0.31729,-0.23003 -0.47626,-0.52338 -0.47626,-0.88032 0,-0.36488 0.13497,-0.65042 0.40466,-0.85664 0.27762,-0.21417 0.65076,-0.32126 1.11876,-0.32126 0.30936,0 0.63839,0.0513 0.9874,0.1544 0.34902,0.10313 0.67804,0.23809 0.98739,0.40467 l 0.44016,-0.89276 c -0.79321,-0.46007 -1.65373,-0.6898 -2.58179,-0.6898 z m -43.56181,0.0473 v 1.10694 h 2.24872 v 7.49573 h 1.15424 v -7.49573 h 2.30787 v -1.10694 z m 32.28459,0 v 8.60267 h 5.53276 v -1.11876 h -4.37852 v -7.48391 z m -19.67506,1.01168 c 0.58697,0 1.12625,0.14667 1.61806,0.44015 0.49178,0.2935 0.88051,0.69391 1.16606,1.20157 0.28557,0.50765 0.42833,1.05924 0.42833,1.65416 0,0.59491 -0.14276,1.14589 -0.42833,1.65355 -0.27761,0.49971 -0.66245,0.89686 -1.15425,1.19035 -0.48385,0.28556 -1.01924,0.42832 -1.60622,0.42832 -0.58698,0 -1.13016,-0.14667 -1.62989,-0.44015 -0.49179,-0.29349 -0.88051,-0.69062 -1.16607,-1.19035 -0.28555,-0.49973 -0.42833,-1.0429 -0.42833,-1.62989 0,-0.59492 0.13887,-1.14589 0.4165,-1.65355 0.28556,-0.50766 0.67428,-0.90869 1.16608,-1.20218 0.49179,-0.30141 1.03108,-0.45198 1.61806,-0.45198 z m 11.76531,0 c 0.58698,0 1.12626,0.14667 1.61806,0.44015 0.49179,0.2935 0.88051,0.69391 1.16607,1.20157 0.28555,0.50765 0.42833,1.05924 0.42833,1.65416 0,0.59491 -0.14278,1.14589 -0.42833,1.65355 -0.27762,0.49971 -0.66245,0.89686 -1.15424,1.19035 -0.48386,0.28556 -1.01925,0.42832 -1.60624,0.42832 -0.58697,0 -1.13015,-0.14667 -1.62989,-0.44015 -0.49179,-0.29349 -0.88051,-0.69062 -1.16606,-1.19035 -0.28556,-0.49973 -0.42833,-1.0429 -0.42833,-1.62989 0,-0.59492 0.13887,-1.14589 0.4165,-1.65355 0.28555,-0.50766 0.67427,-0.90869 1.16607,-1.20218 0.49179,-0.30141 1.03109,-0.45198 1.61806,-0.45198 z" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png b/docs/logo/setup_tools_logo_colour_banner_2lines_1000px.png
deleted file mode 100644
index 89370a9d012633f184ba67890c7d481c2308a35a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38105
zcmeFYg;!MH7e0K4?(PohQV|&%rIbcMlvF|*hHe-{Nd-v-h7go)r5i*Lq&tSjA%}Ko
z-ix2_@3-E6;a%&UwOFh*YtFsr?6dcCp8f27qI9*@NQsz;001C;{7Cr;0AQ~J0Hm4#
z5B$bKczzZ9M+kfL+yek^U)=mbn(lE{gI_Xwsyy@5cYWpQ^U~c0@bU2xwRds!uzCrz
z5p{L9O-IWz0RRW^Sowj0FJc?%7ih3HEx)%VZ<|2jZJ_H`J~i>gjqn%FT!llaadD}b
z=Qlx$$Xg^G<)YQqUJjCu)mVfY9B>npnBCc@jwa5IUA=S<lN<^gz3}6Mh#&t!oMY5F
z5>_?u_KADE;+@1Cw(v*|`k_(Uiaipj-yQ(h|Nr^_mIZQ-s9Kq`f4lz`i8<SlmwV79
zt@l|iCMJ|f1pc-~_lWutM?LMFck3-9fpD&rdk-sVxl9ZyY0D04Mm5Y`>uLi%4p=ED
zZ$7D=@OdROrZlq({c}WK3gYV!7w!NK>@K{MEc0u)k)f51#3|P-P!d+`h+FlP#kQ;H
zRA2s4i}*it<@~svjiKo5)HpnMot9Jo(fo{)9s(s+G(Y;3Ucb~-{VqOfVLxmV2ztsH
zLT&F~ROT=<uu9MQZ)`Lvwm+HBnRh?sDdo9?Vc=s96!yBuy6;S9{pS$@A{46x_DQ}X
zyN@Yq_^dveIng31^5(-Yjd#Q%{^~3tRBJPsu<aS}Q86CnWj;wcX{|W83Y*_Zv@=zF
z3ORd`?XxH;gwCuJI_3R0FmlF9agfqBf-a@#nZDtk0zd>P_h*uzGP8a-h`|>glt_6Q
zCO+j`_|GhQLU>2Q-u8Ch?cT+hk3cHf3(tIN*#q0Nj#JKKcRqyAkt{szkvN;nGu@U+
z<p=*(v{}zE^i6koHEkaEZKwdz9M+3S)MGabxxszdym7$_{;Nor@R*{!rq|P3uVNQm
zYM}o%;FyMF{kgTTul*Igw6WZ%ofS^@-rth!?cu~-`)L}{=?=K%N8?ZF>~0|~f#zNJ
zJBj~|(u)OGLnN5%Vk!&yAOj)UxoiDO9V%%c?bzWLAY<BIA|HDgW8)#@!)*Sa-P~!g
z{lkgpPud8G2V_}%<LZCG<}d96?@A$j&VE=g*>N-DP?gD8Dv5NwoLpR1zWF4DF${?t
z{98{mc5OkgGjL!McNfw9{MHN~FLC$Xs;6dKKhNqDjhLKX|1+^W3AR5TlZ5lW-Ln%3
z8a@`;8LhU}*d5jw<?|oFuD_m<Ju3`Sx>1T2Y1+y7H==1OSW+?K38Tc$4`$923DD`J
z=KH^YBI}Z6Y9%2?u?ptpnoBOR05~6(=_*_9d|!>ZzN)y2x@K~D_iua^OL?|!q@Fk%
zRMiZ{2@$nZpbCNR`adNnK-tgJh=#-F?Uh5H2jH`NZ=LPc{aHQ#&uvZH;F*w_`>)Tb
z;Z`znui9gG<aXQ~D&KiFHetQS^YS#kY>KW;u>0>F?r+w7u;t7)j#NGx!=7@Obk<io
z$O$8Aub$jWDItA2&??;i^WS9nBW`D(7kHlKY^ki>0fJ=W(&j6XUo;mgk+(+0{5;bn
z9(|7csF}g8UcmBi57$WMm(htM8yZ(x1@l{Sz1@Xf|1<6Vk+lQl5pSJqKP5ZzhixA9
z&F_yj=em&i;EsEi0v=1JSdT9t;>|KO=|bt#OR_(Ctjy)}=2c0Nvl#uXrlyn1+K(bu
zkN9rZyZMq~Xw+%!h{p)x%aFNn{=?fz63SWQpGq|#W1y+lOcU+_z=5py+Z%_4`l4c2
z*h<nj@6#LXz+~qS7uaJg2*ww%2!6;(>EC~=vA~RM{CFCtui@ksUw+?3+JP`TkeKM-
z0P+r@b$hBNx21Tl10w*tX>c)i$Bk~|B$U%_BF3xxuP>o0i+<Bng@WtRZ&9=yH*?Ez
z>J(bvpdd4$E3tq;d(UyuQ*5^JG>=bXclIgg^q$<g-ugxR4={3^+TodaxwY&VY(>!{
zwzZo_NBxcZ)lvDL!GFPz9w#S8L&)(pZ}iPnDD_^g1eoeOjlG+ps+&+}n4u8`O=UZk
z2NOV6BD1uXEOU1wX&Lp5B%Je?I{x$a2fny+Ukw&}#oA$+f$?Otqk3XW9Z~=yTYK?i
zIPt$N&<lU5sPlP*`Qtn6)$KaIKSL{H?|u!l&Nh1YSiX*GkCw{PL2dr`G;@-5fxCas
zc$#tQ`U36|gC;jfk*VP;@(`g-mEvWIy`~KM?}xM}ox#!fNIhNQy-^uzRU8QB;uNzb
zQ@D>=yMv(<MZ6Y~2*tXtq0|E!6xKSej$C4MwUpQHA5I(K53}ii9(or?GD;(~((2>P
zE;;g0I-9SWed+(2Cm{Qi&<C}rg90J)Gw<%udYs)ip5Q5Z0$KDh8xu!bbbt2oC!fCO
z^c>1^r-}cc?M~l8<Z#t(h3g-h1~pv{YtGY@sfBwO4y(jEUuM62bsFv~NMrQ-`gP<5
z)sX%u%K!x6Iyi2S(r3HVbo+k~*nOY_=^J;gQAqf;H0Lz^n+%1&O+D;dT9|fMU>-&W
z9DBI>R@JJi13|x?Oe&EtKNr!yn&kQC5Snd5>*2IoWg8h5pD=ge^QCIb<S4Vj-Z`zM
zcXHYy)w?naj?X8$ieKrNr+U`IrUa+&S(7QdJZg9v=o$iZHj1^72<gTDRj%>Rys58^
zhDiH%lSA0Z-W<BD>Ov)XtCvh^-J9dVSu9n|2K3~8zzWeQ)19*@UW*Losh5bliDmxL
z+u6*#FfsWPMjxlRZ;!gkN$gAcKBPJp^|4Dl_XCY306Q)Q?(;t7tdtSvaDQpJ^>5{R
zd6tTjnkoYh=LIo|%hCv})D{86V|*f4Bz;e-IIWOymQf`sm%=^sx)=pMB39=>xtld}
z9nfZlxy;)KB8=x$a)K;NDjtTkxcoWU!HcOKJ&$}}9iSk8Fbjlt$qN-K@P&m*ipo~G
zOniy6w1{)>{}e41gn7Kg_j2p@+f3o;&w>mDT^x$U#)ApGl-q{M1j>?8mSM!xfR{X#
z&~9l*=lrP{`>c=d{=2TMy~YU5RkXcd`O61>F$+Pyj1nuMR$MTm3p6+NbISbsGKZ1#
zV9anv&W41VNrDl>uB?#>6ZQ1AghwIG;4}9p7?fAauj}_eHxU9J_!7sP5<PL%hbEp`
zP_6ee=SR-L`<afIlVR-PV3Kvb44LLX>yevF`vWVnJDFLZzW7DTB8rw3w@T6Ng@?hp
z(YxJKPv(?Z$z`;y834Q^wl7}}LOWloh|;f1!Bg%(l*g{~Zrr&=cJV-}4!;1+Zg;6b
zKtn;Si~rsv)|o7vuBE80FJ)1sJ068~dbwqUlq|cGVPTS2!G(4NoLbL&pg{-PczY=e
z&c1HkB5}_Z;}?Rgc~9x#;uq)~8Nb-e4;}B%OHJ-?=R-`BUZ(`=-Sd0!nYMC4)7r%x
z5)OG}=aOefxT;gjg(kmvCc_0_o$@<5sNObc#Q%T+kOb}LSV6dgVjVRW#&RAPv%yDd
za>UpT4=5#fZ#@cZ7iwOT#rAPh_+m-4HC|po7G&oeI=~V{lJbLMsDJL|OM&noWArxF
zFV>f?hJq#)_Y@TS{Gb$U@8#Zbvws-HfojpN2ouA&WlUawp23S0{<e7GHvW>mOclDF
zX8Zwk*05v9(I_B~JnQhDZLN(Bdr{ymgfj@78F}s3N{lC7Z8_#AB{B@XcRyFV{49mO
zNUdL*`$XeP<kOQs$YkE8k8Bbc{Ae(+fSYY`^lkatIJX}b+Tuo^TS7@9az(PJjr})>
zI^plamMrj9SH$aOP`-6vC41j@6`g{Wi!#h2dDg1PzOwR|5-VQUINVeO3rDG1tY|s7
z@^~_EmNT_OYnkLpC7v(2vXp{95A}{`neFzSwbWLt0GZeK<it#A6zPpNR~9Opiy3oV
z%AYmlY(J3>`W5w6-*FdzjvkW4jcp!D`Qo-gcZ|(trCVR+F0K;su1gRkG%~V4jhXYc
zMMpB`^{B(Ok3qp-%~s}|?QWrUUcxgkb%WIJR*mrv&nv+<<)r;2wO&<HRG`J&TiC7O
zXay1G7ctFLZGG&a8Kw0>xRDyfU3_t#1z~)yLpk^DY!7q&!(=fkvH-s?Y}tYSME!BW
zUqa?OD?`I+;$TUY=_n9a60jS2YeA$nzX{qZm`oXu{oLN;+!7mi+mP@>Q+?T>cE(Vw
z01-Gl(OqdoEgw`Tv^y+4?$YPim<n}7#K%A9NGeLo_&8;_kZHC&gYmtsZ4)}L{Tekc
zSCVz!`k5V8!W(}2NqElhN7pbO{no$`znQNUba!7}DW=6<s*0+Opf%v}r$qzG(w#;d
zln{@;V{0hv({&96rJl|!Y-y2^f~~M*VzIxCjJ={4oV^^hTZ@=c4C`!va{mQ*Y&}<5
zo$@S^^xl5LoPpKw3#MJK^3~ILXOQ;nHiw(SwWLzUt=AUGPEy{^_I7RqvS&BQ_@KKz
zp%o`z^nxt=CtK^o`u7mzEfw?GayOlO$jHK~pB;YEl5e+s4Ja_*45|0gi_W>gQS69{
zW}qKs#E2M6&1-%7L8C5_;MxQtECivOUl%+wlAwa~;9G+34!2dAMF(kcp$WMBD7=eS
zn|gc&ZIMlT=^WqQIUNS`CTjYD<Ot!J<6o)n5xA#{Jaxx)#*x~88xv_}tR!mZwtT2T
z)K7iLvBGp-AHpDEWnVTYp(fA)clp3CD@mXc0F`_y(#MuR(G_X)e1%kUXrO?xRhTBe
zTxEBWqGjRbgJ8jor{`t`c}Ih}*Vb3Pr~3C#k+?T(Vpzk}7G*`UF-D8$nfT?9*R4fX
zTSVW*S?6$Ntbs}Ig(^sslbq@3?FE}C6*0SBm`gI^1O1IL6^kdyGM8xX>hHr|B>@*`
zkSOzW3y6Ai$)HgIBLYnF_(%@DsfeEf=qdE+KQi;3?5Of^E(=mO|3Vyq>q-8W`AJz{
z?Zt_n(w-k66=9phseSt7prgR)^`<ewM0AgTfs>(I&2!3W%8F9fbF6iGJNsWoGOqAq
zX#-O^Hm)q-=pJB;#b8&Fns!#dBFR*u1~PknoV#WBzOSE-8=llJH0%C(sVLb)E5tFw
zROEjYyCXo1x+BWyrC26Z_Ng^57)|P-RVw4~Q;ay{)dky7=v-w+!w5+RPuq(yp6lFb
zd?)%=6A7PXW+dX=%_uBaNrF$NVvxT5ZP5t}JeO+Q-a@g|;uchLwi&WM8!Q<wSXOiI
z45@UFsDyI8=ANjppmOZv7na;`+Mnke?vJ-hzn7`4lG6``+_Lyt1+W4tu92CaHu*~U
z_YxBdiMJ*VbnXtxtWn{4hAC5a4!lck6fpe*I!QR_&Wsf8zefr^7A(xn_I<06B*guq
zu(U%q99<`Qgm?ogAz`S)19I6AWlYrcqA<|a>-Y^H<jw)Ujg8@HIxvq@!JsRU+EDi>
z+ah#P2#}|BWQ8~w8R%RLDeFwDa%xN%Bwvp0%KPU?7~0Ton2JHY^hiIn@x}=<Zx;2P
zcw%!Mrfn7RGG4oG%?&NLYcWY_aPUyn<FxUAY9=0_i%-)NPl<izwNUpih%#v;4vd-y
zV*EZ%yL+J<9d}rE+)rhVN)?hcGkj2Kn*vM9jRI+=9&bv~*I3Z3IQ?Aovkx)}*Jk6Y
zZ|AE1>|sz`EZ(6}c+!Vl4S7tCkP_TI<njjbz=udpig;H5D(m2*NS)ne7#A7o-r-?L
zEswWnFnfJnVCUaI>{ll7!0;gud++=2+xa#q3^3<Xz_tdsP}zP^B(9P`*lxw{L}ip=
zb+Pg!A6^-lK9`ft9I@&atqw~*<efT2#|$xaNU`TntRx$VGJS1(`#8mKc0>`TW%%67
z5vr4QmYO(OT9|on=k~Uo>gNTZg15IY2DD3a*1$XnA0uCH2;}%TzRNGLk3n2;8DLvn
z&j?2{uB=3^U0I};wCT0W2j)=`G_Uo+%9v)%Ax|8-^Yn9;DQ|@s;nUyO?~BeK?f&e@
z|A<tWKNOo?j+W{sED>6WFO>us*hVM&x(g|R%J0I3Skbjy5ELRj)rOg*I_X2JftDlI
z9y8F&DB;|0XH=RFF(p(4?#ZNhe9XE8ncG*T*}-U^*fisBW65p1kW0@5o<lQYNeBU>
zU7R}rp5#UAJelO0U_OIK)D5Nbkuy;#5ABf%INzQ%dm`nN@o*mBnj1ck#Y)s3rAva(
zvEvBq_TDtU$(?~Kz9_0jL!<`ttCVx50U2Y7fCF{FLNv2wk)*G(1Gs<xw_wO5s^-Qx
zuME9Tg;Ww9)pxMA?t~(;G)3NOlg!ucb$fl|4YDp$=moP1yeMC@2dLPcJf6LlLo^;{
zi?~N>WdFifY}}*U+rbJon}t85Fno%28sg=_+xn`4CwJ3U+Z=zf=q5k#3YJs?!~Yd2
zajy>|s4qu|>;0Jzz!PPZ@X+lJVOyNmvFdcp?gPokUzHRG=P((VH>|T(ESi9iQ~p%s
z+dGdnEkfpg2FGX}C#c8COAqWf;)Co}p`<Qgxh!(W6qlp05lM5B_Bn;W?@o657@Ei*
zOvG<adY>>t&~`L3hKP@Q*2B{zEjKV-4!Q!K-X$K~`o24>yu0y^t=6&fbPNQ^FJgB-
z?ui^r(o&t+o^qkOdHc<IO}+RXCtpVE>5IbQ@SCH^=Bbg6F<$$HwZl|&`KQf@DthdO
z=gooSCCI0J1Kov;Q<ZX$_ai(ysrma>!TjUHi9EYlNxD>U<FDYG;nfGmX|DJcBKt)C
zWtFe^9q(i_e?1M~@(cdtTg~E+Fs3?w2XfWb_R6_L>P+E-g!ZR5qexQ*i>L6~#i+_T
z+V3pgmfS}#F$`%vVIWygWg7?zMi}Qc?IM;CIh5x;Z%{=owiVQ%iPWk4R7v5@gxb54
z-`A#;7ueLKUV{jrLG*6&_bH5RCE<=()~_XmKaI-nkNjSj#8Oa&((^BAD0dRVY1Qy-
z$%T$vD<lOm43R#O@QMk*Lr(=i>hc`x>xX6j#QaFy{V~!)I7qv;;|$vMxjH8yzGvS^
zqUPU+(-9CPhg3yOz}-5l0L!Jhd-B@v6SzP8V6V=R?s*{u{yIr@pruFQ!wL5!!%zSe
z&olSdFQN6hO1b^ffRWf8lJjXr!^Ek#X7W~L|JIQoj=Ls<bE3oLLF?YM5zOBR=1F&N
z_yat{_pRmv&A=`6RHi5P?{!8Ul?314MC$c1Lf}&9sGAT&vML>}@wsztaF-sFuo@n>
zfPlOR5A@XhI7O$FU!|#JDm?h4MWj3K&iIYS_4Q*>OUB}uJnwn-b|>8BQS1EaFIS3>
zhyT+$5<BbdHP@z97hN=8wRB{-6w%+9S?q1{kO?vg(%fyODEY;2p#=w9+Q(@SG*eC^
z*{9KOs_m4_^SaprQB)t3wauVE4HRxnAfNKWg6j}x(PYjaw15(#Nf8Sohu!J-bbAVY
zO-xCG8q2U*f+^E%CGc|!R%P3{_XAd1;1u<Y3$}Ruc>-&PRr$9-Ls&Laq43-oPlA_A
zra|TB#K#G<=H`%kgnDCX`%C=sQz*{|*Xss5cdg9$e-0>OVEy8?z7M1Gn<_Hw22RRh
zXv;@12OOi6*Dm#t3qLI3DU**6q%@`DulQ)rl$P;BHR)!$+9?h>gW?PJ-zj^g1LMLt
z(`<=ZBvZuY6f}L2PX36r#XAKTjDV?Ix=N{BM&2W%W5j?ELBg~^qu1lf8Sb)KmcvuF
zZk89dipEsN3*Pq@D&_7|Z5*VBzW26v<=WCaD=EvYs{+}98E!&Q-iDz`HRfCHD_Pia
z(RtZ<+ar&gDclvjD_fb`0iW*#gT_*-a&9?uV@bB!C|{*I*z1^-m_+np(vq^F14?Os
zbX9|MUDf!?jLG-}IUW(B8wP`>7~z0vHh;gmAUl-BPD-kB8XeN_tu!58TgOaAA^CUL
zW+1|YYi6)Y58I=*nAD(WZt;(m5uJ_&Ec|mC_<rjTQzG=(kscvMHT4x&R&}hscS+X6
zp-8+VlDW#u578S1-F-o0)TRI8$A?iwkia;$`aVOE*}u#})e#hP^r}R4eDiq3n76~K
zC_v+De@y>jv-rv)^#Cf7!<G%p4`K&K%OhujGNW!k2?k>WvwO{d>^hHc=B?d6)Oq>&
z#QpWCAu<q5RbwH@4~iP*NxM8gPJEjiDM*E2cI9&13NhTZLr5tJ^e;2d=b8F;dkyW!
z?M&eGX|NxR8bNNIka+r4mu)h+P)**LaXBa^AkUS^_6Z_RpL_G=<|`csiukP$4cE8)
ziEra>Ha(Gc9%k22iV;&EmIfcP`V!QPTOPVTZhC$GrQU_#<Yp&wS47Yt42>Sjx`lh>
zggqV1tfS#l(B8kBQWUJWbS1)2R4PU)lID3+Hu&nR1?q2X<+~|nv_LqI^a7P%?+clv
zuOP^{<u>EXp*sEEX;4uD*)D(I$j}sMjk<HwHgJp-u!HFxv3i~;Q)-?UXbu0Q;m>J_
z5K=xpOZM%n!L%C~2Gxwnua?Ez*Y9L%#1Ygg+zol^d>_N<cJyC3q|xo*zetGG79<>R
z0bW$Hwv`(pjcO#cwotO6boluqh;1MCU%ig@ex9dI(ayn`2g*rWKTTV|OqxUEh;DO4
z-PI{=a5c@X%=-t}%MV3D;h?fN@liV|RoTdhlLlejNc?(sq~R`%7cR*6Izas)F?-nN
zvV>aTiR7EkKq^c3ve&(aAP+6!6{^4ju%#*W-bM3Hu1frMXQS&%{WYfd;&Wjpf8&ig
zXH)82W(RA-sT>eSgOY@vi4W!Jy1buJ>5T{JY7GmyxwY(?LWmC@I{0(;YI}{_ERbrO
zJi|}M|1ejKcB9S)KDbdZ8da@LNtWvFbOhCyeRBatosI1<(1%P&$;J8yXPZ_iwJs_h
z&YOKYeqQO6-5H^^kpUrSF4CBHVR%6Wx`3Yz`7lm&?^)UT=6pwokwp_~M()p3z8ufO
zbh(Yn7k2x0ZDvF->e%H7U{zQ?w9o+`^@r6GxE1K2GKY@t;G>6Nw34d!`z|v0^bIT&
z^-TYopnB1s8yD-Ld89H8(ol+OR?6xp2Q41B^E5r|i_3)_a-k^Dh2?1npYU>JjTvg4
z4DRiXd^>ZV_KSJgO8n@vPALh^;>4@EWYDXnv|BuMI-A$hgErrStKtSx)w7V=-cJ$U
z{>x}owVUvZ<KeSjEHIx-B}L70_zpeUnk+8r_3b9si#1_qn<QE6&J}cEcXPgAX*1m0
zeasw$TPHE(WRw){5K^_ZcZI1w2J@9Mt7L5pUqRC?7sJaO&k+9-hfP%Mf?XL4XsjcW
z5xRlN;@%+bZ|CXY=@f8@j*1*{9G|O_1We6L>tED4n=BZ189}Dxt4DQ08_!&(r7CY3
z$XIC^PG<#ff_u?J52l?Xjux#wHi8GFUND|)-osJvMxF!luw#CF5ZAe4OF#S&`z&<C
zqlhk%xd>ZuleFO~$`bdJgS*BS6*PBNyD`IEAw7qM8TvTBT+q_LOT2w#ZroB_T)h(9
zF8&od=3gp9f^o1-al$)0Hgx5hDF;sBB#*kRqLo+ig-|-v)-88!#KC<Z^H!ca*;S=|
z5hg^y-uiNp%Z2QLGHbP&UKX^W>aTWpLOO(%JiAt`pTA51hPcx;>QG*uW%l>Gm>ftL
zs*NZ}#$B|kR737b%)&{H0L9V$xkXg$?2s#ZGf51DR}iOg%CZ}QB4Wg!U6FK?`bJTe
zpyPWDo+U`nky$=ZrbrKy=0Abc!wPk;Vm{YAS#BLfOgVlSbuE~Draw2noK?B-p|rf2
zd!>#3;}fSfM3oPqDQ9(-FiXre;05$@LdPSX##Ynl;3-wFc^TTo1U<`&j9k~ndhuaF
z>xaF`5BIXAE~$eKI67{Urmn2a;mH%Rw2i|o8Ayr;9Y+?{Y9c(C>UAfugPj}<oN;dk
z7|}AVg{}?9V(&3*o%y2ZIjWHnOoRL0R`cD=`(zaH16DQN^k0YBZEdTeA^5OL)Qj--
zxRwP^VY#|3RH$ox&9#=osxRNB)JogFQXc!=iK~-8SNUYP=JOP;*GZphX8UX*pJ)*^
z6$E7xjLX47{W7iifG~(m!S0}U_>9zvf(J#7BjvLdrdP?$TRz-LsbDEZGn<?iDni@$
z=P5eYr>v~m4#0{R0!~@7tpLoI33}2{CG7onD?On#Ybd6PUci`OmkXgpOC+_svSy26
z4jhO!o9D9ux@;l>=l*J-cHg7+v8~v+-QIW{7$LVGlLCMf{<Htn3(%{!aC`UM#eCk^
zP&0gydc)WPZldup#=ERA?PS!m^f4IST{LZ^#l^fA$X!)_k2~4<I^xQLM*W#IlOAMV
z&U$PIXTgwYM|jUi;7DDR?GD0+9Te<Oac6uf;R^v->tbfovLRbnLKh?`IrCXOaRoK#
zMa)Qlw^`0mAw?j>-d8hSF@y#2^!zDuyGrdzGu;iF(>E-9rY{%oN}elvdi)NF;7*w}
zbeZ19qA$%fqw|1HRvR5nc%dRF)-losZ1~nJaPwbYsd=#2SWeNc4nLuIp=O<<g__P%
zV#v{<93tSlowM~#Cwg-;Dx|Pjw2{R!glQ-h@c!a!7;5?W_V<c=U0a}g+Z4YlFmKHB
zUk+?#{`?yh`N9hvA17%o&sU3V9TwYa1xn;ems=Rak>@UNwi^gPwByNWT0o6<SDw=j
zKnV7#<*tPrN(cQ&88KH5v>Eee(73<NFQL1Po3G+RSlez&BP|PdsE^naB5<<D!|u(1
zpWP2F^345Zxk>cnVJ1fHOsaM9V4ry5+K<7jKIF>E^(yzDe{d@<;*;I-;Y(r#&rQlc
z!*T81%V4cgVx!+_C&9uJp2$=B7lZQ-k%2#*d`M9H;fFOVxJ0ColQN8Qh|}e{ty)3N
z{QSHjG>)!=aUdY2=28^R>NXm77$8w?0Qi3c@GLH5UOd~)`_l-#d7>+`BCt2uP*jz5
zj>HEoLUpS4Bi3~E_BYuT(Z9NXmPOEohh=NMC@|mlVjei|^1$0@I1C}~Q2@dZ|5~-Y
z1?zl5ch_#*@Gx_m-00{jkU+SExFZ+P<U3d$Fkzr|q2ijqK}~T=xg31*0z*^4LTen@
zve5w2jpwiEmGdW9ujac*P&8tAM`I^Fgj4k2<!b9Rz?yg$Y^U0J_m1SdCD~Ni{QdhC
zAJLbUKA}gm2bfV+!qwv85Fv(vLdTnsDNC2z$4?0xrSTns`ME6(Fv)n^Cw0q!Lg?B(
z`ZlF9E7J0GIeRj&480r9e||eVy>`&ORBUoVa;X%pJ?4cPg!iZ`J~?=HD{)Cyz2Wdv
zqW)6Tj#X-d$LVvFKfQVu`Sr6g<{WbV7d{uk=xg{A!m`@IWt!Qss8<x%Qy5-~r;&Aq
zj+be1sbB+LIWGn{DRpdA0nuu5VlZPbbAeRvFIdA-W(f!>st;a6L=`tk8`0)mH!Qj+
z21n8CU}t9v$nL|+%)4d!qeR}=>O)<bD;77gnX{ONyBlBl(;T^6MPcPzKZV*F40?kt
z1y_=mQnpy@2fL-dkv*k~C@m>4i*%1(7Kyxg<aC|{Zf5!TAfjntH--P)EfESH0XWf{
z<Ku}Tvul1^-G8i*f6h76s)RHdSqH|?>o#C)640OQ1DNZD$8Vc=aEt0xZ(SC8_9=v0
zlopNN6-5XEKPyTmZx>%6?=0>4y$981MjS~V6P?gOx`jHJ^`-C_vmGc4@$28iE{NFF
zFDuoV7)<+4r^mLUoWu{FKwR-nwXqdGUZ-KD4pSYinSKNb(U|mIi_Y`i$V|F{+_!r;
zou^kit(9B#;tLS-M_XlRlk58zEJkY&6v^lJmy<_lSs&>`^AVN8EU`eH6x4ZXOE)#*
z)@}vWWCPO+MLw>al5a-vexg9(qTQlJ($M3E=<`79taHoG*9R$K`PzTWHF}?eY<_Hz
zwY73KaYD{yM+b^&$(fh_6NFeYl@l*`=sH`!O>!g?g2art@dV9|=4YT3vw-iI&!wy*
zI^B59v3bG>@my49!*n7YPQJ+RFm<oHUO073Z9XK`Dj;)y9GZ9W=y3SgguSOz?aK$J
zWYlt$JYf(yEl(t_0^q6MyD5&~9$&g>b8B~=z4rULzgsGd@SIyWd~g0$YwF_2eo|)W
z6i&x7)6q`OI3OSaQuQ=yL`?xf(Mlq}cuAdm``(#U;v}=<yU2BlG^+rC>LalvMg4CJ
z&ep7u|3ho7)wM6XQVPLWegx300>$h`&;^Bwjh;{ohJjr61qC&@>t9!wl7+v&8Et)&
zb$(8?(vnV{9oe$ucs>qXniH~Pm+ggV@AJRgPRHXYw5^S{p=Wf6h;;vir48n?Ba@zD
z!M!o}{_6NvIjWJ=JXDsqRMfc>bhZ2$E|2p_y=4*<M#}q_@7_XipY3ZBq3~m)$>=q<
zYUMoqkIQJe!+k|)$<0iXYS%WF62~0;$8lR|Mex+fQS(M)GJlc&9Q!bIJ#-Cm(_$jD
z*J<rQFn2@!Bi%n@X+`yqhUNwA>$8=-X=UTfJ_mIO<twmo&S^+ck`e(S(bl@;U*ZS*
zDE!$6f53u!+5w#8csjp;^Kbcsv-^Xi8ciuXy?^p`6khd>W;NSy#pX!@&$HX&%@=AX
zEH21VOl#0JHkqO82LR#1{elmpBsEIPQtBLpxSoo5pLTv&xM(ax<VM!-W>c>bwBXAn
zPrR?EdrkaAub~*mcHH22G&catd<IoG^8H*ipB>FyBPYJ>Tp+t*j27(ca?Ckv`5M3D
z@*r~y?Q#CRMq-Lqs>@JLAAShQXP7y&Otp<5eCtu((hk#hdk%`ZKS%6|L-GZwsZ+(;
zV54%BdT71%zdtgk3M1m`HrnOI<~?@UIz>)9s4%`-+tXh~NR=eF?;^=5PeFH6@!V0t
z=7`Vw`lY54hNjgVWgj4Ko|*O2e)`746MCvl%PJ<gVn`#1MenCb49q$N<z_VCUlY1W
zjvGKRGs2=0OR{{yf;j~=2R;C}_%G{dPOjcN(Q#CLUn>G6YTf}Ay-rG3FqHw#?OAvn
zC0XOEMozBQJvxj5AyfhD!x1;TbZ-}o4FoZJDCX))nRw|r+khXX97c*u?AD#;Ns#pi
zTJ=-txlnmt7tGk{J7a_sOHUrd#i<c#W8s;~NzWOE^c5`{_8uwry_?jshq@Y-UDog9
zd&$qckahayPq#!IYO_|e-liSEc$a8ODKm4sLLQy;YL=VLQY|EZiuA`Z*;8Hq_I1pZ
z?~0L{3?F!>X;-!E^$kf8p9Ma;-K&)}d&v6NScC`CqHMHMDevaV+C-gxv)KzvO{1ro
zo%Up?2*e`N@<?bi!zfM?ameIf=J-r^{`IZ-UoRw|U;cBA9=GH1H+(`Z_ioxTNNQGM
zeu{Jlk+r>y`fb=F6h6zz#SZ3rd19I31VxezrC?u_4S|j=boVHz=M9LqZ`5Q4z&K0z
zschR&(`7OjRiNP*d$Pz1M7g+6gjiT$4tdY_!y;uwm+ISEwQgJ;JU;q=ol65&M(-{N
zQ5kvFGMEo^vT@=FAC^NgL_pTUhSDvTfz;suf}O;5O=h%rVg`jC8Bv6p;wE)QS<b@k
zY3+vhX_en~4O<ZF7mBe?32MrvpvL&^h)MtJ1u+W0lfKihyK<Wd#ncC;`I`@Cd0m^S
zGg<?N;BT^WwUy-}ig>B-Ugv*tZ|8e2k@(8R+DMA3shPD+MyQA{*shA5>i`r=ADoS#
zw8J}kUh$BiUO;W3`6NTG=dp>QIP7qo?dM=><^=w**YGUv7VoU(^IB#{p7+KJ3gwb~
zdduZM(>Qb9fjZt3<#N?!g&sBv3544FDiRb43O~-rn8yK%aiZRT<MHQcE}tx%@6M%_
z)q4s(ZI3i03fR`n`5_rCM1SiLlPtz`t|AB_(ei8oLhenGQQ82Y{^+SWLfb%u(tGH;
z*-?)XV5A?&EgOK%cWv%mQQTr1U>x?ycqsqz$C1}hCe9qhL`8O!%4Z#3y^b2;t*e}0
z5`I6^)GH@u57q{5sc$>jyJy~?prEwD0Z%s1jc3fShaZpk)WPQE->VR(g6=8$&^L}8
zHH;R10nLB*rZWZCG;`e(!lVfzN`3!pS%h^|d?=QTkc$^P=$=2S*c7P(0s-Ie;F)2r
z4+i_I7mAW=qv?adZI0m$64Y(Bf!vIRdaLlmH=R=A{@Oy*?%Q99Sh8RcuxiK^{ahpQ
z@D@BSLHH0kGPE3{d6cLgP|I>|#Zey=L*w6?>JrJH2=blfb^9po{#X!SX=K&JZ-M=J
zY2b<Q#>2Ooyxf(c(=YI~zN3)3Qnk?uQq9r;r%ogaOIzc?t)*^Wuw`o$v<EI1ae^?l
zZe1%gZIRsQBYgo~CS#};+$6C$XRy35?Ff+?``??mpi=Sn)6@gavEm4nDik9P0%OVI
zd*Zk^i=wz}<lzqV?+QPSPVQzdQzB~CnE+dG?>E8&`Xtjqr1vLqLjhACt&@XA_fU)9
zdGbHm{ra*v_I8qgwdD(O)J2D)jB-*a=(c)MGTF?esJ&iI5|myGk*DnRE{tvGJoNyE
zKBfK1Hjp~nxY$b$IdVLAdXj6lX9=6>5V~{{czUCkh2{vRG7+677Y0WbpbF9@Hn<h(
z82P=DioWH1aUbT#t|rkHAQU+hRc2GHQV0<;mk(CDR_i}fQBDPOT^bFYcPP&lkR}r7
zXhAV9+*X}_-^(S!I{dy<WFCNXc<uXp2|<a}n9U95^@avg8C+42i1@pYjiu?F4;u+b
z=S{MZdR;}{`a1?xNS0HyN{&-g9t)RQT{5(xt+xnnKNH4mBotO#k$z9E0IPd+DcUAS
z6^bEP*a`u}t1>qQk~>38lr|iAp87{^$yI2b{xjITl-*qfN*!txCnge3qqFlY<(L?N
z?CLfDpgr#b8#nZB8gm{wS|J%&i=?C$rv`x&gM_ba&)qOT%y|8|ax(LS(I@Y9n`bp8
z1ZdhvZbpDrCTnwF%|{jPOI_O5D2<|%@YLvoxbbmnc1iu1$h(x-4N}dPQUYd6vJRgt
z!BCf^7|6Yvr<(C5Z~2}+dH`sGT{6Y(x;qK+lA`MODfmjQXL7`3Dkiy3Ve`T@m)syd
z(i^NkkAx`DFD~F|XcN#(iB-GI6<Su5<u6Bfbtk`}lPA%*5`5&8#YG<Aq|D1)q@v6y
z*h|Z%u2>6^%UF^vYn!nb&V-?nY#@2GsFFei(Ah0;dicxS6c!h{1_G8pQ30^#olP%r
z8Vkxc18(fc=lasFW-K=?Nr*>>Vk%yU)aWYM@$Y@t^g<P7x$&ER&ShqL%?eXTTw{x|
zdrQz8m!-QTeiAUb&wQrfaJD<U+>6^OqTvFWE627has}X#b2aYXr|G<oRC+fhZ`H%l
zb+Mj5E}-YLg+Sx(hAz!b!sbuY2VwKoK5;XCtng9lPlAAac}`XcrXa%=U#XhBvF1GF
zSe&n1d~O-iMXM28g*`wbIl@Bq==0~Q0B-M9zHkQ{T1YrvzKHNaW1NA|yL+t-PA)bh
zyQI9)Dwid{j@ySiW`QWw+reiDvM$$oIR_LH{OVeN(Z`YO`UP&sOUZc4E^)e$4(}sD
z!)Bs3sr60#jvtpVkGBcOGioI{b4<Z%$UEiBz9|eWcD-Ai2cbs1BtVYJkhcQYQLG<9
zg35Sz!#(UA?z=f+q5zj#maV^Fb47Z};<drr#zWhMUhA+Mr)g@sXj3VxTcCkj84j-z
z$GA~9-&AMuJaE57J$?9fWLNY_slW%H`|xB?g_Tn?Gn^I+`>cY(deo(VI~Loz0T>N4
ziJg5@SnUY8(8#`~iodRTR;6TI!YXn)H5stb5?Fn3)(BzcDD!$}EX@)<3Xx)^#Ec4D
z+Uo5;%^a15P+V<kjA7r-&VQ!*#^YGtMINCR|7)o!X1BfF!ru-Wm(o4UiW($3Kc1O%
zr^ZpznxI*<Hk`v+7kTgf;1)ws5Zh2PMU$|o`L~zNH97vv5#}B-ypu;YSbh<+_vOFB
zwDDI>0hEwu_LtRVGPd$`v-|X)lA>ooF)@lx+M~?=`(YODYROn>t`bKbNt+E(C{~3T
zt`j~k+2U$7va}3~)*0g(5ba#OXnNClU1J~ymMlXda&P_3p%^=P{LXqK`g-<%*tzTT
zcT7czJ4Z6#Hx+<WDXM3~i6}z37>aP=&VaYlFxCTCTs%Tupw78fLtvi#@p0IrP?>lm
zpGbb%l>XAWo615=Xk;_X>v#TVD$zS$W`XrC+NVOnk`I+PI?d+v-z>36G2f(KY|H}~
zPp1M@R9gl?c3hkY2^P$Bmb^@@I{fhabg9F8=bO%crpa45Y<V|jcCaK1EVc$?64++=
zE6Pf;^#AI#%5df!ftdg#+@pMcM)D^tvwx|{YS6&v2fhO3`g_2C>d*5T{vxB2RB^ZD
z1(27Z9X}afmF+BJDY{=qA7~q`Mvog(U!i@tm6O1>zHlC@f!tfuHU9J6;tGfWR$Hi!
z4|Ml?WITxN=_B9Xf}&2*<8NIxI@qfMt+S64U%h>2W+rE!x&ZQl!Af`SX&JxxykVlC
ziCyz2t4hQS`U;KP_N~mETp^(Bnq&vXkmP~Mq}tJnoIIkoI5T6()Jkgp^CQhAgluW1
z)YVQyQIv&ld^zCTzZ?8SB{a_Pcm(Xu2svn^=i2nUDb&`W_8?jG*)zN5Bqo2Py@!j6
zs^~9V-b7x2LG)-M{KoC>BLd3cqOJI;6a$TfOLEc(@q8cq{_UvNxO-ArZ*!<VXa!@e
zrUXMXtMmLv6mAClmmM#;^%ocSKBNd_EoHWO^(|5`_=)eyIsGJ<v<~mSitMof+kcY-
zmgWvGusw3Xgn<(52O~hu{gP_{C2A3{RN#UAmLV_N1Y&)D*ltGfYDd25`cp&E<K1&4
z2_+>k)-M`x%TlHjB8&DBi=tRuC|ip)*EjP%uYy6BeH4^e74VLde)ZpwcX32O>}>?~
z(>Xb}$+XR?Mj!V1Yvs45_+5R$m?U`hX0Mdjx4yh`@;FDZ3ydpAN#eKgg07LF_t&-t
zhBp7!^Qd8ONQ*c@fEuU+nC|+BD<?^vupA}5fDR^sn@HFx)mcwI^Li(YAc9>K892w|
zu%XOf27K7{aWy-kc)dH;pLudS%S~H3)x~T4O)ELMm|XEf3M)0OJ29O468)=F8}|=w
zTLY%Ph>-neZ8mIpo-6Lc2zG}1lmjw<Cr-0LNkhb%i4Y|6Lsp$q+$I+tFMTBT=z$Q%
zpw1>v?cn)p-FNtVjIAcKI-!yx>&;XQu<N4ppAuL$!L?v5EwP4P2?cfs6!r@dywhK&
z0c_8a^l(X<s_f|+y0V*U{{oo9`~gY1pv01C=zFXttl>$OeF$6?x2D)Gvu=bw2OA<s
z)mEr`nuHZLGd^u05f7VJA&65zsI}&xhn>5Zw7X{q_c;+h)SyIHD08FN<1DfPn0G}5
ztbdH_Sm;C}mIJ?B_nv9<Uy+P=IpT%v-2-8~e~X%u@gE;+D+ex$Kve+NS5vMxUWtW3
z{Jei3`=q%@zACR_n{hr$S-BEql0WUBu5XqJ4KHJaCcZUCe{7}I;d}4J!w30`0s_g}
z=y9N+yw(e<-&f&>1CF;5m|MkvQko$z=-|(-1pgc%9qAF|$?+*~<BN<*79VwL6k%;C
z?|&)wtr}d!7`caWDRK-7C7pj$UW(rS+lb#9wboKBNV>1{17E-{!ctek_P`&gh17}o
zu5?hs+$tZ6Qf1S$DS8Omb8`%0`x<`^QFyrmPrhL__N?jFE~zYE1(}uaU0v4z==Tq$
zR4!aNjG%*AwS;Ypf7Mn<QNEA6n#IbyP89@7XYF&uf-Xm1{}eH4CFrTfYG#2WKg;>%
zl_o`aDAzm8d34tQbeHYysDBt5Ng}tu=~ERHaq!N_wDJU6$(2?4L*D#zH#QW~76m7J
zqs|_AgnN&?ExU%D3Zqy_{o0IZ+A1nIJKD%_zv|hU!^<zHU~mZq1WtimNz=xlD<_ea
z*!JNn4JAp~GEN&SNe?C94_S|xAT}0-v)Yk{rPDSrww+`7>2s79uC*9I*Tb&&-fDBH
z(}6|d3~YbXrNE4W;6b+fWihV8#{2cIUVAjSE!c}Dx~q2(yVq}*WS3xMx3m9U4`A$=
zJ$b_Q2iBtXSs%-lRqn2C)AC>;2?`i0{*FHG7-@*IY|MJvLw%DdWwQRH7?8W(28C@<
zhJ13u=DA`?hU&vA^D0fcIBfo2J&|YRc4-2XO?{L0{aP>pf&IRsTOmR@hy98;RGQp?
zWgm*|5hdQFN9CE+ONf00C@V(x$buP^B?+oXf%Ki}eh}qJgNA$7NJF>x<>Bw-(54G~
zgX599PCt51*%lc3SgUUn)<Rt*1YFD-HVM<!)NQ&%L`P?r^SCo)cbaw;0t2|W?>Tl#
zCH}h)5`Twe{pSyw0TTn=Oa=F@gf}S!5v6*}ak33O<VwKmG^H0;O>=j0o`{%%);Tmj
z;c_5g$;!~Q#m8_T19{`N-hu;W>%$LUrMx+eqdj@gA1rh0x<JCcz3P)>)ahQKPOz~l
zD}KDI!0i$w7YPcKoRyX3@Fb(ef7nBP68(3UW5bqAm0RifjrSX$Ic72%%R&e3TMTgM
z`E^08jl6PNbq37CE$bg<PQQ{=I8+_~p6A;VE+?d>4Sc~<Y-<JizVFZQ!%4$6l!^B<
za#HqM`NHnNf`{^f4pSeM*8<>lwrWtLw#vH4|8D2RL%`EbnQ36BDMp6OT3-!bj;|^j
z@_qK<Qib8ce!LOZ6TC$#!29(_!P*DMwK<=RB+Hk(p7HHGf9_6ez;0N8LDG_-&aZ7F
zh?`e>nsQM;JgQ~siaxy8$qXzly1;5%)FeX@DKZR!74*o+cVP5?2~u>WAAl_8HO2Ss
z?v$y*Hk*n+A6Vha2kqI7U?_{RLcW_`2A4bt!W`smaa7^3UI*R=9Wcu#Wyjp($J_Ft
zA-^gq<||pJ3L#&LXfbOCDE|MRt_f1z)fbAc>;tq1idQ|TvRw!Cw0?1TO`V?yM_tk7
zqmiX1vlt44ovrHgb5OB5%tUL?H|MNBRYXfqsUwz}M09!S2gpx_^*id9%i3kk>&<?)
zZ^%x|l6KDMx*uc|otQU1CA;kD{=b2c+JVYu9^dFab@cOln`{PFD?efS>H5!gP%xLK
zTEM{e$YEPw!NFnN9+`o(_3T6zot;mBfdX$3G`_Q%VC14<1jPpkJ6Zjw(`%I|uw?)G
z$8jRmq$+nhS3BybC&8w7@Z*2q{DI`H5!e7P5Jvu3m(mM4e99xVmD?{+h6rf{d^!#>
z?bZhy29D)L!KJ}2YwV3_)jO%;cz@QW2ZdlyPziE^h~kGru@@J`hcY_b51~%Dk|fg8
zl_mO1n~DTjIaBCoXW9?MPzuH9^N{!ZN#~0?d<!LQNU(@w$2n&JrT=L3-}Y&O+xKrC
z<KB&RgT2i4fen-O|1ulKDrd6nwfS*Pi<F}h`q0fE5*|YA+YW!qP^z(^>k32YeaGN8
zhj!iiAtsFk9bsa@YY`cI{$O0iGso6ZESr-qssn0X4msoI1s8_GK~45Pha>dtn^(^G
zz}^*g)+gfjBuzpT{Gn+&<llw59$<diC9;NGH66>FgJox~Ho_@m%>#-L2RLHF^igKW
z@$Fz#nHk=qBz~Vt@yGNfmbR?eXZyWz(mLBEzP;NqsxGolB0nyL;O@%gAZ{_|7!_K&
znP*+p#^n8O@j97;eOFs&9kP2ap6%NbWO&^nbpu~Fmq;_Qh%O8UOly#iC10xYG~xWa
z8agJRqHSGVOpcrXTV%5+`unp5yo$y~vuTgp2-n!v`biB27t}BOjQcj|?D(~BS-M>d
z0D{qmQ^%QGP4T$QJc6`H=3CX-o3aV%wJOOp(;hFt_%0_xJm(+Sg70)excqkXrt^LO
z4k5kkq=-^ZwQY!d7C}UN;tZxYkYVlJfCrbVp#z6yX^NmE#hnS8_bZ&Rco*(b&{G>>
zzBlu#oChORR>EeU9WOy)iVjk(UAo|CXH21fE`AVR^sUkO@I<WT)b;IeOX$CwbiE=Z
z>#71ksz9!h*UW_@SRVXaX~2fH=*H~9)LBp8{)-CM5Ud>#bE$zV9cV@veyHuSOp3|~
zd-WZpQq7S(2&GBV`t`L4X&w23x+?!V)wwkw+%Jn#4XSXPL&*S{KOmeH<ZtBIXm=_A
z&-fn*)`vlm47l(=aGscE)c^_frF@gOl8zR;8>tWg;Y~6aV5fC9ULf9-#PY2}mIxDo
z80$L;-kB_sQOOAr53>=E^JK*k65y%I@TIMTMGdte;qh+Ox!bOfzU%9pEH}<(OV?g{
zvUmKyU>;9k4_|7lK2C;>-K(?73eb#^?z6^^B9Cc6i#24r%E7XA$s#;LTO_U5`r^D~
zcRmm<<CLi3Kr3TBmZ6(>IG~(5>5YLU>A4MnxrL!|rxf*nCx`&pzA8|%;LGZRHBk$p
z@$Y|>&aY7|BMc2#9rLrwNnZCs&m_ZJQl*xfJc!Q~9$oZG0hMg)4pwzJ0^`@%FEqdJ
zf9X7Z05;FwbM*Y)PThJm5CRdl{om%0f{0yU=_>#Cs(NMr=BC?2uh-oqqpUyVR{f^N
znRAmVLm#gBq=I@EmR-UU3%r2&c=NPkXd5f^N_NI~uC*MA0K4#Y8U^;=7?pay^-%Q$
zTMD_jJiwbX!}&JWo%6A3m}h?t0qN}znV-S&1foJ<kG3-XS|-}_hcze|KlksHf{Un?
z1RkHp=I=^YFj|DF&T4R+?J8Net`O--mDerLujFLDe15%N2b3fJxv>o&s17M#ZTLMq
z&iSi$R}xW6=Fq|#Y0BvAtK;fN_H0vM`v3F-D2|4z=XKVrDg^I+w5#>>p$LKEo0`q8
zc?{xO9I`#)K=@oTyS-4EtSpc8p2*|Iza&=dYk$5$jC!~6?=*dN(`2T~B_xM0Y=+}W
zd6GaCqP*$<Gjy0ZH{;ItW6{v#RQds#K%1yH9)<*a>fN3AZ#wDV#5u76kM1INeeA!B
ztHnCm>2;ZuehVZ(Y5w=npEx(fj|OLJeowk3uV}eGAv!I9!#`&F-l&#H+!8~l6b-bs
zPhZ6%H0GQ1q^2k$AUNSCc=xVsU4}K{uh7|EMdFLk7AVTy-ICAX*I645;lQrok^Vf-
z6V`#$p{R>0FXv(Se82Qm<pCZ5FOneugzFj&uqeCVZ&Qj)&FpR`r(f(O-OZ2}=dI{M
zdVjIm;1HtVuNd1|lYUaLENwX}Gwx+tSLN*UU`eg}z4`dMPb*lue+Rb0lx3#wD8m9c
zbh`O<6H;C+4`^oal7Q_jLD-Z1h)U$4Cw;kBW^&+7X?_J1iCuj#Y%)i6+uP8lEFSco
znT<SZumoL{+rVTn&Pq{!W>1I;(1y(~kzcbNft7b2S-*&O)w_Dv8U5~OF##7Y+|28(
zsz=kcjoCfbtKzzsB|yF)3=96*PW3Z3;IgG<jDO8k0eHRa#QK68@RUvxdkTksS8=bZ
z;Hn$<igh@z8hbFvK3&0r@$}{SH*W3MQ?^kJ`GO^bSZ9wF<K{zm)bNBU6@f|T=AFSO
z1URsa2?djs9E(14r;xu#J4AtY5LdwpbJG%^aew>8KQFIS+~TCKg5TCZ?yT@O^__vE
z2e+Nt@O<LlnJhRp@b!`~g;#$*8Cxllwf)q_gttyHnH<U`tqTu^qsJ#|^X@|?*xHb{
zK4_IKE7c9CofC1pW_Y&Go?l!^7s%lq-LnIWFi-AP|B*I9`U63U<x?uXF?VT#!ZDG^
z1dIUSWp2gg+kLF=yFq~3DN-Z8DJ#ke*>|rnN!%;2!Ayq)H{x22?`-JltjmGj#plCn
z-F{b#+^=hCOKa=djr&$WnS{cye4#;UGKDOHW(xPgY8#_V;~}#R%L#UBL<%pG#O}hC
z`w4&>)s&LBiX<6!v3uO^KQb0T2*l-^e7N#^)}9#}CRza}HiQk#%kjVFC_h{<bo&*t
z{EQ$L7gkgA^ES?xHe|Eqsz0UdmSBp+eMxzV)z`<3?}P5FHkS6q#DZ4=*D8)o`3JCJ
zBnF=;ST06y>Ah0B9KEj#4<!o3ixx5fDCuRwn`*3PzvYY3FG_ip@Zkrc--e`K`TG~e
z4YFSmHa@r5Ma!0FeXC*Pw7{*n$Marq#@YXsuZ6Qqea~BjGo(EZ9#1#-uz=;{m(CaD
z+kB;0LhuQpXf8mQ`K?yUxBXu_Eu@P!p;u~#=8*-B7gK%nz6$Rx=)Az|?YyMpYvniB
zNqA^N@N_@;@_@c7?N-X2`@a5z8Gdmdc<-OFBasv}pU=votI?p)A8>0Qj6Yw;q5H&p
zWF6fh8yV@4xj7`!(e-rWE>vLiJY=yPvyF5+npaVd{lmEf)s1F(`orbTEeq<tL1pZz
z#6T<Q$1S|4ymy##r=Gk|3*@Zi)Edg2l(Byu9g*EJj8o?Bj5)lzbn`Kto<^ol4{i^j
zTe9MmU2NsW59g=tcTWTVh*$o(z|+=D^eC2rm#sx{AhJF_Pu6qG<!aa<xg7@AE@diL
zzT<HSAq^u1=<lvP#6mlN9Ik1wR6+|{1~>C2UL&0YUslzwJyN&XQX{o$-R<L;YYT0w
zqpPp8q2nbG9Z6-F1nR;`j<-gO)k3fqy>M3+kcTy{Rm`Ck14m~Xx8COpsa8uCc+))#
z`hRHp%7D0<VA+KwxD$fAlVHK!-4Y-W+}+)s1osf!-QAW2HaNlET^5(%{`R}~-GBUA
z=FI8ouCA({BR}`ZhQv5C<*=rw?jDN;F#?1Vxv?P2(Ew#rv0mPf9>dY(PTOuA`9B1k
zeht7d4y8SSCDC&JbCs;SQ8IKex-8lCp~|>qJe^6hWi<(d`kqz5z@3{5`L$(lkd;lL
z9X<5xXzkaVLz?^wKB><aVlLz}eXGR|oOsIp`;mo=*!KfO70<+C`pxIN`(x%kFHz|L
z!;vssPMd?_C=7nI6!E|#H|IZyYxyXhUOWBvBQ}+e#@mig0CjPt@w<6sbsY+Sk)Uvl
zvT)T}@=l~aw)>;chDUA>^T~0Nc;cT<m#C?-zjOOpQ9`bexm!QVKqss9?MxI`{)%B^
zAlz&2scOk;qOU2SIueU)bo=T*i1*EtQVUE+`^MON`;2!(ya10YvMX8C&)=yXNPH9u
z1)P&y8%x%=Y-f926SBgytD85PXZW-IexpY9&DeFcwx+J+_Sm&ozc%rRbL|r2e#>+%
z(Qp{mS5i1dnDPf?-DzP*$-6kXMq49IlKt#?ggv7mGf!N1EWvovPQqZ;s!+Z9VFm}*
zuet08gg!Q0ClnxNvMZWy#MRW2kq>o(rtAIn(G=V78Y0d<4=?HnTIlfMMbsZ)Ts7fi
z7U~5#{Fx=>>l;v<P&4_eWcwzN*hsH0%n(t-Xd`h?5-my#z4NJ$q*p>~Ke9|Ngd9ni
zVALB`sdfA0sgI^UP$q_+9|>TAx};bsUSYpur}mK_Yiw+n6kzjlMG?cN!P;X#+Pm6Y
zDCvsvoPjp<uQGwYVLM0b7ba7(AX|NHx#*kKYbww;)xtmbzUFU0-;e)2Sg7yFdk)PO
z8;QFl?!v%SO?6j72p-@DuHYe?MTtoNY`qL4sP?0#FYNu@m<$WjAn9f*aV`9F%GgGl
zr){t__86#d4S)NDVNC&a;|=1n?`B;QM3H4omyCfv+qc~h{i8yQW24Bz*LN!5<{usy
zo`1LT$j}ISFBVo};4>cK!LaER`vs^JnVy9tJ<ASR8RiGfeoK)L$x*Un7^0$&b7}wJ
zFelwAl)MLDzR=U@a@Ci`N#c6-Czv<rQA-2VQ#3DR<>dA=<nr!s><-#r-k1)J4Z9!T
zz+9EeOBoy+Ti46f@ctxY0y*w1{P9kNb%9G0VlOnm4J~u)@2-!~C_b*Gt&RQrq^36_
ztebRY=DdAsyyNS3OAzwF09dwqakn>sE;Fvd<?+MaiwHE>4HXoA{HfGLl#VQpd(F4p
zVze#;;YES)$Z{grBmG#fuR3=@R6ht~KbYc)r-hE8rZGVCZD*B#laq}>N8=6^Zs*LV
z>@r&e|IVgntz=LVw>YBG#y7CwfwUab?zI@3Q-X!G2rQDaI@-DhabrATu@~5A)4Lda
z_DP~i6XY?<ZGI|vV!qi50C8b@z6$E5so9bRTOXnak!v=0#j946bIa;jhA}kn4<8<^
zNOtEF9>c{Ta53zUXEd#t2OWH{uoG!88A>Wt{AqY#$5W6<io9cYJmYz8yKuEgiyiPY
z&j3WT+R!4x_Y78IMD3PE%BBUw4w6!jBu4zJhNXahU;2_^Mz_Cixwxv^*tj1@EqA=E
z%b8XCaG{O*S#=jc1W+!xx!>N>@8j^e`S@r7h^j@at1mT?9PiD_Wyl@}6`9Nptru6y
zzTw5Re%ZKO)~=b$&}A%WSE(U^LsOWKG4Ny#oR!mURKZEgVxTZU-l)g#&7m(LNZ@PU
z--70`C&xnKXhs@e4Zvmzs}OfNl``@=pI1N8pa;Bt;f@f9Dm%Nlql<%K8?oChw?#)}
zR#xV#b@UZ6+S7CM(K-K}&{PhS(#TKjh$U+zjo&3SlfCaIgfD*fniu^nYiaGP;a=cd
z2>Vj+ZQ@9AW%&L|X`$OYLdSK1Tl5up`p2v4bLV!Y`SD<2^~|r3coQ6n3Px>C9}mDa
zdQcwyW(^&*UU^g(e@`9(?CEoJVCcp#a-GWMn|OFEt**{YCZ9|Jg%)R*3ID?lVgqIb
zuBFjKO9+S&(;PzC?D2vu3p4zqk`UG;TSQ)}l>vraTkDn%a67z!aWv*#Mt;woyd1t^
z@3Mb?Oo@=cj|58AOx0BiRBUX?03s&qs94i7GjyUfg%Z+qbCX|pSABIWJ1TgUz-mmd
z9q@O~{>ILV<725ko0o`RzPE@#|EQ>=zP*qBlBDe{uF~OwA1sP}5j($=R5mZ9G3Cbo
z1}=iiYGvu9zcf2&oji=roBX)o8=p`VH1Kt!3d#(kE#v0Ror0!By%FC~tNr3~z9ZeP
zRvpvd9VzPqgz*ESsFk;5T*mv1bHuTl+K8`xT*&>%NT~T++bXsbvV4g{9pgOFb9RGw
zvsfnNdvBL)jPs#Z!WB|~&<kC9!(@SdBa5fI;Qk|9SQHVPrx`qRV}%FbB7nbii9p}t
zY6$1nPZN^9Ej@niUDiTGjW9{el3ipuJ#FT>yPT9RRm*UMmd_Q|G>ULifzQ96CJq9+
z<d2sob%*)IuDc~IK4|;trdTQCy2USF-}ipg&CPf^na>#vCki7W^uj~$?rfKGO{B<Y
zYNmyLkd-1$zlcz)QFqYYPS4WK6jOI0e=IEKh>W_r640<8^~dNF1uU+)+C=DFrO`s^
z6;T>jmrhqo9TPBjPd;jMJ}O`mX2Qi-36F1`-VUh`G|mhCYv=%Yy=c51$fi;G*Yi<f
zp?LkB!tXt^@oH@+r*g=V$)NrFPG&hUx^iXqmA|6Dh|hYvMt+?va7^!|Rj{&o!t2$q
znaB$dlG*N>dj|aM0AHDj{0oUvn3bRhqqB`c!-d@EkOh%XAfC=}+&Hxg4)0Q7w0eT+
zcVv6Xp10E6W0va#VTvQ1Q}^KV=B^L~!huZ|yp1QNF>drOFHX$<JzuZUH6R}g_yTBh
zZ_&Hj80)F!U!EA4Z-{N@b<b$BFDx`KO`C2mJbyQ{W94qYuT$+kLY)G@gmXjRR4?0z
zt9akW0$|U_<G7)7Vng%+S`0V**16i8LI-XdW*Z3m(6Uv7ql+}hLA!z{^i4aC@q|59
zuLmmC{Mm3`ND-*W_X#P?#$U>}3a0_;%{UjO$;NKT>;lA6Q1~OEcf?W<Lcj;d5}7h?
z$C$8-Oz|14qlrkh2-<@T4Ue*R<86O7yTyNlj^r-3L@OUg1yMJN028}o{vb&@_IFa=
z0GB_67<s<_@^|q=D5+Vl_gf`9RS|q&|K*aU7b6OXNhD-zDqwyLAFuHz9}nuc=pSoU
zWQDWpKHbZ(Ti)M*>}nESmbRoqIp#7MFi{u{-d(iUu$BefyaSw=lr<wxeZXhGZDA9=
z$)A(@L8Q_7P!J4<iO$f!lg3U2F#}}xvMp#<x2GEv&Hjyw-ElZ$KkUT6rB`MtwjFqW
zAM;Qh-tj9dmwv#<!T{~F$0HEjI%qD4rJL>gKd02ZnPyRTsV{8^q5)W{n`WMw7Y@zi
zXw7k0Xn{`Q7do7|&ebSXUY1ntc0bE8j^>#<RuXJpTa*u@!@cLYh*B+I@NE&c<W)Ab
zZ!EU&oJh6wyn@}g@<)c8gB6$nge=$uv%I3j#?7Z>d#}rr7DUn>fEXP{cHfACI!x-@
z=Fs-P0lu$a1Og!a8$Ko7pJ%@yBC@k%EBTABqJ*Kd3jpL=>mv%O2HCl}xD*F=^(=Mk
zX88nhzuNeH&0JPm<fHmMQn~DMsR{4WoBDaB^k8i?nkR5LyDUll;pZg{P@x)ObN_0e
z+sI(R4ouGO7cHo|?DqFCCISN44+UTrY-RmHvwZmbbee0HaE>VEkCJyau9C;V?>HNW
z->KbY{9H}OK=8b>^eKsev&`-EU<3Z%W0KF(6`gw<5Bt@gapxv(ro}OGf2t^82W<kt
zXm|e>4fxXKVW%ouc?|Ib1`z>1SA|;?BJcc-L9gP=7TsU2neqI!7%e0{M6{F~S4;TF
zja?!wT==+ig~|TXboV=cz2G7C$)%6AQi7P>bb<-s$oou@+vRS&aDBa;-si^&;RG}_
zg7t9%c#UrJnFs$M1CsKNJ$%o=r2*ZihrV}xrdydg*{*~^dmWoo@&mi8C3Scu<3vf2
ze_^^3a@qFN%6plt#KvV}B0=O1qq#xxV$WF{>;@-X&MWe~zu^EFwY54(Mr53?9WJhC
z#b2H=*aK1M7ZATX2oo8-YCV9mYCW=a+89CFbg2#8umO)A$+2+jD(+g~1v6yAv&&2?
z;3byW(+zC)gaQbJyGZ@lZ0h@%@+bhg0}$Gf>nJ7yZKsYbKVy46?M_#XbWD6=b|rRI
zOX>wPTuR)>g#^5JXFwfIL3mZE9itH4_?33dd$GJ$3I|5t+}rMdStdF>b<}`lBj`n4
zu$af;ng6w&<4Qo#XQTLY$4G1tnbJh4tlvzl?&46Ij3GZhp;jWAc7gfe?N+|*Hsu`!
z{3u>S3tfqPNVR9c2NNI15gezs+T#a(`<6M7RSG}QO5{cm)I!`!PJzt!t%^iz-T26N
zgoZ#hpxAcsm2lL77CHxb`;l_F0(*<3ZbFLT#7Q?BoI8=z&tG{tww}ryKimE_a0&2`
zV{Nv78i10p<?tI#)0bBRcfXt)4+>zsea69xwICk_t8(aXydC*d97c^q1uWp_!d;*S
zX+@=?6C?jyQ<n1VJ)!5`;_!Z!!aD5N?<N`8cpBaHLc+mgrG@S*J1LhY?5@(RR;A!f
zCFRPbMvdY5e$@O3cfBBBIsionHLvxrxGXEP-g|;Kq9$**$&gl5z0XBxjL_Bl-T+Ml
z$$zBYm~;h2xW^NXf5G|+tWi<N=h27~dEaQfgSYw(!gcfI8t+TF@l2YKBbURPH@D%H
z6h$RN#I59c^DGz!-EFQd*Bg59F4te$_1nRzm+))du_gjsv5HQ!odw>=aww1M9(#@j
zt3Hi=dd%+zAL${k0WZ2N3RNGM%|1owI?2o6x)BhL#={w})8uR}5^N^Od;Nmp5Zcu>
zi_@em+3=!dK2?Re)32iI$=TuxFG!o8VjHW0SB0m`Wm{zQ_Wu30yr5;}m0R!9;q$c;
zbeQDN>hHSmVOF-F0*&Wa-4Mc4JY1gAg1eX8u_SBW?^`T<&wBXT9;yX0XjxOwX2%Wg
z&;z*|r*c}d0%la<W~IiNsx7kpPOU{Ad@+pa=@m)hvkG<&hZ?q^aBY24eWQT;GOR8l
zjEP9!o}i`hibws<^9PYVX@a0b4}i4N^^?KOokpKviy0LP=%ba%8Q9XYUl4VH>l!DW
zYnVS1gO^HGC(}gJ<@WA<xysb3lJ&~Fvhy3g)aod2y{F-Kq6LqbtwNPoMIqH>pE<~-
zL?vE0$G&b3j5S*7WLyqhKA&I;m?+VjAIo69o9UjMlx+C93yy<a3Eo`CAM^M_9}j5U
zu*N=B9QquN=OUqVe}Md+q_eNV@9}5YXurt(`YzS#6UDwZtN!-brnb|+jNd<xHGyuH
z6GRlGQ=};$xJZJ#IPW?a85-XrGI*NHeG5n5CFOO5LAu95=fgagalQB=s4Ah!!u;`!
z?s(LP{cDQ5rIXbzl4p9eqVd&0yer3L^D-t_ssz_s=hPHl{&0u=EmT3MUf#vvl}X$X
z`8yL@)?%F=IEQN#!k3e~7L4DCnHOC`e~L7;S)N^b`bcDcUOtCc{N$tL`xaV5Hd7jM
zz>Dnu#|Q~1<#n`MfyOqEo425?CvE3}L1z*dB&3VSp4;g_XQW+AMB&{vftk^@%yurk
zpor_XFqwCj<!lHpbdvOc2cm^m!z-Grg`S}>b(7g>)q8I<Vw2Bsb$n**YFXP2IiI@k
zVYDsSDZHBPVR3g4t_Nu9<VNZ4{bCtdQ|k&?74|8(>O!a4!2-w}SWRP2e%9owxti5C
zwkhb09w3-^A6a=2#&!UF*=pNUouMT%+e}ga=qg}~HXZ$GK10#w3<HcU0#L6~g;a|k
z3A{xh(4c^#(;kpueZ`#cy7R&Bf%m^|=waQ?ZWuj-cv1>w61F3_jfLq3HAo4gQ84d4
zeRHl_oklNsyW;qojE?L`U>pH^>zhDH^S(G8<lg@w!<pt<`aqe^R%U|!;%z1|i}S(^
zYARWy`13Bvb7ZACjgS2u1lmH+H36Ln{hAD}^=hcQl(RWwkp*EAq2?tQ_x#DmC%DV0
zKi6O5i0q?80d;`jy9@^fkr!xnT^ydO=u5=`M&;rJ@?}ZS-G~X*#+trcTFHVcOD(d!
zV4>iW+FQ>oH9n-#_>5HK4WV*xhkh|Z^U05T3CT5rDz#;LqAe6+6E?7|!+y&<Zpy~u
z0uPEXxplftsNB!J2T1>>M{cE#>~dia++Aow_-#bXeMc_&K<)Wyxk}y_EzGlX-n%S<
zOny>-&~tCx_o%^3Hve0rZc|bg+7RbKq+$TSx+PCsu2_t3VJ_aeT9!!X3*C>LlT8L4
zveK?Q8uoxy7ppe<)BR8sp%SoyaFw7)ZQ0co1;DLY)Vz`te`||1_2e-nrwm-Yg6}JW
zHe0L=#D3*g)3iw>icj5xB6Jt>Tg!L0dzN3I_@rq)H<-jaPGCpElGh#1A1{x8Z%?j+
zUPuMHNA%EwcP&@A-djZfD$}>0!CZ*K;bjx?8ht;{|HdWrk}u$<$+~Ch+{3Oi7<Ea$
z#YVnPPI7OD9>=k*|DBKR`VgjjqPpZ_kF&*~&$jf?R#GQa4oz8!-qO;7=Og9%JgS_#
zNj+N_XB${5EQXadySfrl9)E}|v$zY+asJ{dMC~jWa#qnOXsD^ba%8zp6sh8OOLV=f
zFkYRzyX&?{DlIaCT$^b4si<O<^A1Rew`Ujkz{g(LE3F%M7%_Y-pu+sj3aR~WJxz`Z
zJVi&ynJ3c~^6$FbZizZ%@>Nf-W-*w2NXqV>#7|9i?=YFL1dIW`_;}={!0@+tYxWRD
zdMOJ#Y*|7$U!L;B?e-#&Ax7S%UZ}|kYuweIA|UtePPDT)MMhTSlrTjX*0Atq5Nkqp
zdvTJxI_UEiR$-QM_MfzD{&uJC-+8zIoHj{)Xa^x9th?Fg;VE=mYa;?}N43T^f5Qsq
zn0$O+Vtc$cUa<lMnJ6Hvm7M!fNEsrD^DB+Ru@l8Gcm;emfGTu)_fXE|_gf0y5dHnr
zF(W-K*8@x?2;<Xd|DcrCxH&+GR7imo;<EM_2+qtxV(H_Ok96Bq$`J9EVn%KDjcT0s
zYZgVEWXbSO*bZM&S#Qx)mqQ6HsjX4rz5l?j0zYpvrVN$5$6(9an<3FZNvS1U!3%q9
z(G-|n-k$I?^ZNli6~{3wIBx$PKzs=|iSKOJJRTkg2g#{s4Bx_?lQI|>6_uBDl}!>t
z13pSMz~D<qonRhTSgI@ZQ`(10E4@_8VSZgAOgYRmK<F-OZEE^##>hK^x(XINL>w;%
z4Nhb5l7m9<82#9A;py&aZitnN#tOks&%Xd^Pb*X=hv%vQ1W1oyyJQVZ|7NY{e^4ye
znC_Ru><bjYlNpPaoz_Y!nfJz@5SSCEMK_RLv>zFsuJDQ1+A*tS>kW~8wYn|ruDD+?
zXcyNQsfuDP4jr5=X!%EfB`5t!4LxL<b(6CKT{D*}U@ecwiX{o|Gm+)A4U3*jjRZQD
z_TAcN6fLTsNGV1^DE~&|<;c}+9n#gF$pH4G%6i=<@gIu<)lKD4%6Ddaq+zs2C&JIG
z48;-(r-1bhyypEjzuqzfI8p7z4?QP|qw(%zE7>kA92td&l`pV%X7vLyLJN@Z>62ra
z&ec4kn<m*ALIT$dAhJ)quk=(Si<j;1D1j}O94)&1q-k-#K{z@!n9q1Uq`oWWh{E3I
zd8?wWe@|>e(USn4ko24{Og3RQ&o^mrS8w|EKbRWgTv`}OqDg@xy6CLta<}N9?Xw(O
zc4>$q;Ti7A*Zrx}j3-FT?I-@nfbMe<_*M*k>TMCN+4PZs0?rbtIq&7Tc-2n9BTK;B
zfQ8ArM#zQ!_=GRjSI7H^zJ4V-&53&YVpb*tp(fex<6HlH{!fX3qR0*&=4-|)|KzmG
zx^4kiPZ)}4b!K9ulB%emE7DJL1+Y&~pS{DT&qv*|bBUX?XJfrjT`$AcDvi`tg}?8*
z;%7&`Mn>ZP^RH{?VTr6qlo`i6mu3>k^<vaKP=~9tpmM0nUdQVdv$wO5H^cW}p3Q+`
zjN;nI>m9}~TdFQFHbt5!hYc(BEPV!^9_+^Ki(a13;CJ!L>5XCnVc3!3{9CLA$-k?0
zT;<2%g3w&1;Z{u@skzQAC7H^eBF%pAEI1$e23quZ_^Na3*2kcIoR1lwAxmBP%=l7?
zyfkIBJGe>seHykg#mhiNBd)GG%u%dnQk%wJmi;I0pR{4ze;4r_ntt3;V3F%{w57Iq
zN%bTktSKiZUD1n}2<b^KiW-lHoa;YNo}Vu4BI7WOPWP?h>2Pl+>bTmD&py_`O|JYy
zSp5eCzAYH5Z8@wt(+N;BGCtPdFe#m}KEya$VK9G)cr&~ZL*wns0O{1%kE_YvjjRV|
z26KO1)ys0SnH&0=(fdz?e|2zfSYbmJkZmozI-t24yXDJ_ql*`L0He%Jw>;&}{`Pg>
zE;Kz@J%dZhN86wH(S#wWIEIMw7@*X!z?%fU>UTRGRrr!uI#&Z&aQ*k`AC2jP$5Y?4
z!kMb?ChaSWra8MF4xE%3_!1~GEX0o^9u)kRWI1tFmNqySurD3cL@MvCbMGBQpt^Lp
zmy*Q1b50fZRb_#YWMDPEG_qTe>55$A_<xO*f)!|8rCSK{u=f=fFyhdeW-QRFXSFnU
zto<&Yz$R81Iq_G~{A$jB!3>{<Q%{*0_yw{Jqvb@V$-jT5dgi$viXfvmBYuqu^Y&OI
zVDDOYiTI&&Wg(4DXgr^C;PFu7j(oY?Tt__534EKokW+L?_N^zEw4~5>er#mln%c&f
zq=?c}qeYXST-)5d{f>M})He8Kpk}pQ^?V}x>6*f2Uqtv_0<j`h*f*Er52(eZ`k``;
zoE)%5%;4>_=%I?)aN$nkA4m9mTCbR9OuY9_jkkF%W#@eV=LOI!bSQgUfR)I7AgaKg
zee2{h<({xZrQ68O>Wi8DDOdI%uQ<{(VTS5Bg3BcWM8STk(QeU(PsioI+J<Rq#TUjO
zU7<LGO)erqPZ&n}XRGgWq2vCKhC5K<o6Rt9RsAf_K|{{dpG+q-y+bgz(4eo+h4hlP
zTqZJ%a3P%3dcCOgf%v6v=U0zktBK+VF5j<!O{gwr^KC}(&p$H?^ZEx5m>MJVvE-<e
zPMONfnTR;Uz95zZ8DWEW*!7lnfRf`ScBjJi2q7uVyPVk_kbgMQ_Y*(N)f0*g&y(ne
zYS~ou^fDTrE&YGwZrQ7fur3K}bENOu9P!K2nG$TdrJ_jp079gQdrHo1fI1zzMljGk
z77v$%OgyV3?Q<k4SaYZzKscMe<E$>1kCC@5El6Uaawd3A9XXVuLkp7?y%AHiGUCx+
zCw*dZ@6EN~6(y`+AtSF%O@{E*4*Nfrlrm!#7*x6uA&O^GrLtl~3t!t7s^Pb~9Jv=t
zUSwV6<Rf9VD|fW}BG)K@-7Mc}1^)_Tw2iHN9h4xnLF>&CfYgKG!SMMdnFA4#hg@4^
zxBaLBM1c-EG>Xij{E-TSAq|9Nyfbhj6p#l>uFjjNHmaZ!*zoDsFu50p#<(Hf(U6Q6
zt>YM)cq%C`X0dSx>hz&oJ85^BJp{mMsLXe{ak#pzJNXcYuN{XSm?_m19mFw;6PQiE
zvv~b9Q+sw$1oBG4$;bj)^;S=#depL~XgS{nECELGu7|?AUAu-TxZf|PkowDpy>!LW
z?3E9B9edt%-N^pN&_&-qu2TNP^2%Wx#KFMH`SN?aSi8H*`Z&;I@;Y>mSOTA%N?Bds
ztWcfLUvWA~>sV!6|FK4M@Vh`T%HS@yEjjf{<F~(?Oe}~}4%6$aPxhtu!ke0Q!x2P|
zvv0w5)nlVFI93(9&W8~6(4gUbw6I(Qj`dkmHMQf!y8x;nNpYG_BKk&7keQWaa~J#M
zFMhj$gkt8qNjS+@`#!i+JLz+WPf@9uFZ58Te7|iHEDO@rD~{ic&#w%(_e<*-fU_WB
za@tDDC_Zg*o1@sjJKlerHtGFtQaTS#sruW@?|&mxG;!!oBMX0k%SA20i;YqE%?Gjj
z6t={&eDBAkM&Kup)~WAdM3LEfvd>+1|577b4LENJf)6_K6}g^_?O&bH(E*oNvK3f?
zUS`(wSun1pAfQUUFO~LyHNxKI%+8W0H(9a1T}V`Zd?#9aotY9>&7VPVKBK9%sBSto
zC`mhY_{S662``D|o)xJWq%oVCh@Bn*Bj%zwBX)hx`CrXWhNJ?VUN@GGP)e(uHcHOg
zZ|W#7eVXC+)SJ$uLQ7;XDler*Tkoe~Z`aUtE4b<9KuxgS5L+A@e{FoBnDnZA2)X*Y
z@_6%Bo~YZzV$T<X4{Q>j<ucl$`_$^WTd@e&?6|BQRpyEwTH5e+U3Nay;xxLlR19@E
zPEkq|WW5+w&x5UX62LlRa497`I@R2~^4g7<ySb@ej@|WNZCO*r*5^84ehee<3Rj<V
zwRf952zZ~kAt(ABEOdMxo{EX~f*f~2D?iEYdJ*R4rZ~-|+o`;=qlZUP-<AamlQY*_
z_>|u;UDR3JxyH7v_Mtt^Di+x?`D=%)vB|An$avV}>99|=ccb;3#S0EycTTFG69S}k
z>u;F6w*To=K-<UQ_G0=~xpHn*T3Dg1;hEh35Y!5+Dx4R};xPin%2l%&{BADwvYrpk
zWt%v&aI~f-hb25l4<wmR#p$=zb`>5+Z#froSJKODKu@DuQ$;@|cfl*$Nb~;Kh05Ax
z5i0!#D`bgYHpmjsEl8FRR?q=(xpu0U9CaW2E+Uvda<H<KC4MQA_bnjyIz5|de$5yG
zEIP#Qop@RR+5lmL{(7!$u>Y<Y{yRI6Xd+c;vT`>(5+yrandfEZVbzTR%IdE*VwyFk
zDiyp-bRG7qrvu0_?*2OqC?yxSz}YWJCgKKK;$RoE{giRhqb<UIgT+s7+{*DSF};1_
zN1YmQ3aJ{&IZc&?-aM;PH1B&7{b{7bW^-=#_!mFAAa2dSf=}7XB_?L@ZF5GZbBQRS
zcNE&cZ)UdXLJ^m9nw?T;4{DNk^?GBfW9#qzeq%GKdW3hWu-T-1rp<RLo4M{`17x}I
zd26kEIqPO$9(-AHbyNk2G&(1?vWajRO_wmQaTKGft(q7%r8Io@y{!f$%2#_g9EdcQ
zRjE#>Xt7_IwYlgp7b|(93B(g!iFdv9D~5x8U<ZXuHX3(XKIDu!6*JpFeq48q;{z@K
z9p%s2JO<Qcyrw8c%FANHIJR-3V3X|nB4T=%y4NG#)oGBz#EqPuWl_3=qUN{&0_i-d
ziUL(=8~~HVCpj?)1;k~oD)V0$Y|K%JiiPRI{c0tzW#Pw~K)O&yuVOXGxG}g)qI#nn
z+t^Xm?6L)~FlDvu3JqlU$h)vgy{}qTQpN8RCQ}`;9^{fqa*0^lf3#gzh#Y!2-^Yd5
z=`*wJHc7Bk{E7@1%;LS?H&_NnCH@leV5k@26bX<fV$O^(L~7!(Zngb{*R3Z+b^Ovh
z^3(4d?hQ;sIYT|Chc5T=@h^PSi}>~a=0RX7VMpsz{lwjmaXB^2OZnp;x(?-0W!d{y
z1p{ybD<|s~mZ5+ZZGwVku7BKBqO!7F6T+;<KS(>0b>Av)1J^BOrj(=ZWgrfL3_fQ)
zyqRVQX@>klRJPE3bEu(3pb9l{Ql2gJv}7mpQGk1f1BZaEv>}bMCe{;~IxK>BM%{zL
zIV;ceZ&~#`k=);}X2vh+hT6nZIf@lSgZ2QVVegmO1{Udjp3T~*ZNmL_d#0pc!aAjS
zubffq2OWDmXoT0_f;?q&s2@8n^8b0m%ixk!VzLlD=fX63j0RE5tuWeyoc$Y>EjO1*
zrmWrvl(iU;mn@}{6gWL+`YB=ufh;$R;x@LAS_ocNPC?Qx6+OX_|7}gLC$D85c4?BY
zagjS!k35uTs;WCoaZ=hQ|KZC^?fPA97iW|V=hY2mqgI2p^|V9v1bRUx5biCfS8?Jk
zhs)P9x5}tm@2Gz@dAMD1WA2F1`)pP4yUnC9gGse_)H%%*DYhkx!et7yWD@3XKp2W9
zQ)7-^k#yqVQS+C5FCis?a3<Pl<=jm~VTf>n4mds<v~rwwC^pj#3ee9I^y<$q)`l(`
zX4EO*y45N^?yhcAv#=S|c$&l)Bd&cclJDR~fbypB=&#C{(lUiB=e}XNnlIVa{rL$s
zke8uEV__ccCgB)qdH*g@r};|9=_j;>j*9xw(|sx`Kr7G>g~Jl~OdEs>(8+AlWtMNt
zf~-UlSjIMXn;HLr?PgJ}I^TJ>%9vjOOpV8che2p0`Q+O=Qp2oNL}sCdQGvuSldikQ
zxL2Bm?|(rv!dxj=U3U{%gFEk({Hf(-A+KGF*U3c#h0HFCstW#=A5Kp_Z(fm>*&p#t
zS%W>6($_7jz01D(FK+rBij9*c<@v^4FP?qkCvcWbAa;vSq(8-}>y37`fD9d!@Mpa5
zT_bt@0V6W@(QmzL=4X%}NZWt-$4!27<SOr<I9#(=o;+d5XLOjRL+3wX=se?${`)xo
z$*1IeG+y>&4=sQV9@%?_y+X(J>T9;#R1%G1V~IAV&Ub1QQ0am4I9~Ihhh_hs(tA-@
z-=YWu=I|k%3%VRf$*usIpvN}suYZm5TC;VoG==V>1nGOtbQ{1M!!7UeTe@C#L?0#j
z^7#oJ6D0%x@<WdblwT}9tdX-XUo%{I0{o`^z$H4aoc8Z`=C=Ex7_DGroJ82(=HFRm
zXb86`x|~@n$m4mkCD5O?kT&ZjO}ruj#6+&=C{&oY0`@~`l-}i4%m+#Z3QeI9x({ZE
zELl~n8EUi?GZKy_E*O^OhHbUm%cISllSD{TQX3$SF1l8nkG{m;tm$xt1s}szndu_Y
zKNSMbO3*iwBx^BS7b>K~Xi-4)eee6{*fU=b{TvL=-j7?jkoP}JjmlwwO68JoBM1kn
z2_z(8vaY*z9r2Nb6jQ$6>0(ZheB&ANLKsHj$fI6!<#Y<9V6qyC0%-K|NMObMmvBh2
zv8a%5(ChpCl<}Z;w|pvN)|^uWt@Ks?<HRSORY!}dlwD5NyvO}>s<Zj;4%6g5-jIjc
z5{KYkC+Ux{%uyiMTUnAM0y7E7jYOy7#q-MHd7dZu_Y`c`nPzfZI|}oOC0O`j)}uD*
zdE&4>x9x3&>!C0!{OT<IU}UR&9@<@d?)KE;(mP0n_+y=bh71)Y_c)e*oR*)!_`1Vp
zBmBR&QUh;;fcF~wArdsB<Eq|>#WI{>FDfyW0aK3&l`sWKr|wqUuNPUjgJEFBH#7=%
zt4U~3yhNPcTv2Dg5ulIjZ%UpTfP@QlC>hpJErMrS`x?PTbrSuZe)jHL!s&4Prn_Y`
z9L^T-bgD1(@GeDDqh~efSmfb8t1{ZbRFeSky^5dTF)b`t1Z3jGW{DFe1AFeC*mLS8
z!EcR$1-e}=IeR*9`H?W^SXAUhpCBUD338aiq;f_Rjn~kRQdAd#4s6YTG$6vDIr>wU
zaJ<_#++<8til1Z@`%lDD$y~C@xGG@bDvBUiUG%2sUo4!hmka?Rtj+s9`K~n&W`=L+
z(hER0;WVr!!o!PKl}34=d*Hpa8xATADjCyfPH-M7jyFd-yVO*+Mer7Kt>YjY%MOAt
zpWwKfpOI&Z)^?rD%w~-WZ2!=4{)o=jT*O{%M8T($3USzy(BhyK_k^%d>(uZnE?}&F
zPruZjV4_HYt@lLEg_Y|7mgMRys>Tox0^t}-GZW-#;yN(dNZxnFBjfyr?S9>7JK6&u
ztb+eahb5GNAI=+t^Y1oUC^ii9&jkR^ff0*EYccROZZtJ!njni&Y(VJffObV4$1Kkp
z$6>Ev2$FVM#cS@=;8o+EyRFC9UJ<MMmiSD4CY;SJdnR}i<>li1jye;_iR8Bz%MZfv
znw)@WvN9gz#@L5n1?Msp`bS9!`pG@ea}kv9@*0cRs-;Os?lxaXRr^#kOynn}d#DCv
z8tG3pS#2Vnt96~}SbDfELaRyVi1?<>kIq!7Q)A*m*UKzc>xW4{pvRf`R1~FSZgh3D
z{pco}#F@?e%90VhZMbPGcC$7^b4hiTZ`??l^AFFak#)-o4;L$hp+U7D*v=MIWbMl3
zaNX=9aB6m_0PCvb?&Q;Cw9tR6-V)nfFm69GoQNd!r*^L2_lFW^8n=PulQd`3N%rU&
z+};_KZ<4NuYno?gX|eR%nR>_{t+V}j1qosT5*2^8DWKlZAICA>N;ulNG}C4YI1ZG`
zs%V)R^g~1?QX>7*1O;34AwystL$`8iT({0Dca!An|7&L)z*UGugF9rQ5fV{n20sfv
z5FC1F0hvJhrhM|JvoJdeO4{=MlEaMdXRp}TGA`4owCf)a<6308+zqYcPDv#GENYRP
zK39!1zi;Kvah~NQBv7)`N)NX5tbW0$6Z<#&r*lAE-A&t2r1uD}RGYM^6%%X?*%7Tj
z$;)9C$U8gZBH?IlVpN#yoH7i^6u`aUu-q~Mcj62pPP^nb;2SCBuPQRT2O3KD-uz5<
zuRe<D_o11N*JeTE$HZZ?o0*wD=yn_Y71Kt^K(<*M#)R`q962}rQ-l%s*K7vb-IQP1
zvPbX=+=&gTMg2VZX44iG)n(d!;5Rc2v`3)h&zd#lbnWV85_+OSVZ{k$Qw|Ko#vBUJ
zioei&uYOm15Ga;GFAI6_wl>>zfLvO%79N|gh|UoulQ44%?uKGt{~aFMXzxPc*#C=>
zJJiLeFN_wGW3fYBw0~oc?AV5_83Q{YCYJy8wpFwC=m?~A&>MkU5f7iXd59Ve)DU9`
zEkpeQhE1duca!O5!YzUySxd=kX*RFC1}W{5){Z{)f2BJBT(xrlNNQ3j-=()ecU$IQ
zq~XA=fJ^527JR9)V`<C6sq<@y`S9k?%_EH>tCZJ}U0c6x;WAf^b`5XAz5J!j7iz@u
z_A`iz#bd|A_mOM|y)xd4Sr~^U6a8Tf6JX_WapzO&Bp@GuS{{)u!E^kc+|-4&nxbeM
zCziqOlSm+5Q192#?Sg+d{4?(T$#!Ytlze`3m_PstWJJK!1%HYfVq@Z<7IpYEO1WlC
z7mZihPzog6a4Adix$;5ybmq~|Q2a;}E!-}F%OQCbxf%SS1@e;`A!e53iw%r(=iUBk
zxd+b4Qj9;P_JQjOge8VL$R~n?M}o-{X*kpw-D>IXUqyfQhCv()z#*7oB-!X_<PWtL
z6qzSU@wKtJ|AzRtHx<>lYm{Y}f+=1(OyXYpDt=!5%IEK9w^bY?tJ+f;i-|piJNE>!
zuG2c=2Ii~HD?(gDf#pTTkurVsyhBX;X$C0l>l)sdE=Tf|f*wM5Vm*37rBw;T?Eru|
zrPP&h<$XaE#tv<{%?~0(jsOQ&X08n*{I3#p8vZrQ-{kwEB~t6Yw5nV)DwZmU$8`&u
z&~wo926#B3e>{8WNBVdz1M7qpzxAO3KeE8sef_XW*d1C){}rbH$Z+N$L*QoiE_jaA
zlmph)tHaT$%*<%KZ;<aeu^e;H(731CycS;3dlMZvZ>KEHo`>M-9fImTfrRG%QS&Qw
zxmD$A#!32)CVQOi<whTyi330dXX3F`bV3Gc*~WF3-+LJ>2ibeBxJckS6HyY0Bfg3E
zN#uKus0f(K<HI=TkPlu*#NU1F2p&^{D-9w%v8fSYP#9}!=a$~;d#dupB1TnJk80Ck
zO5Wdpu0BBzUu}zFzA1Vi(8RY6<{O#)E{D{!MX@l8T0Qr=38vTK@{}d$Q8aUX_DNLu
zAHp+sZloYi_n&XponKKBB_euTf1`JpCea>X!bqwRd$fIf+x5&!^=Z?Ni%&fvJx~hy
zsBw>^xY>-A`K^n*1-O$|%?#b=8LnU5`k;VSX&s>Am#F7Jgh>{c;e?gFbS^?wYjmcP
zUj>7tymB?UMZkv`QN;~JNWG^FCgN836lpK=y?XcIQ&)tZ8nW>KAe)EG_>g^&%zZE!
z6;{(wIA3`y4)M77dC6#oy&KAZZZqtVg;~)_C3`G&Qx`5p!voT<HCBkjJ1FI82BKxP
zVr*)8L49fs7T0#z{&X(Gb<jjn_x}}k`Zaiu9+`uHEev)`ttWeQ=W#w_h8mIKS69=1
zRR$(b;fxmQx=?i<-62{c>qWK#sa-)luF1z@>5}p9YA{63%H(yno<b=VV9^@}R#Em^
zbwte#Jdgv2VsFVOd-w{>y5HjkO^gn<*iDn0d;*|bZ}6P*6Z9w|!&GMs_=EI|Vrqv}
zb8EBb_<=f;I2eD3cVPLO0l8iQW<NFr3)&QP4dIT+zePTvOD!<}uomAqq#&Qg`x=s{
z9yA%oKiLqE@4J%H)Z!)v^MoY!u$`*xoRY7=>eDonUc*xEl*)_1x_HDStSjN<@^|OP
zd*kwo@lL+gG|d#jb70X;y|S<VLl?9ilI0O}$=t(Z9}m_~>T$$tzXg9y#p^YIzX<3H
z+0v3PfqR{ZY^Hg%LH%g#S8vl7tMnXturE>UZteczNkZ<k3o178JK|g#Pmh^Fus0YP
z<|H7n_rG0Vh^U*j@pk;bV|ptmH;OgeT`uO8$YmX`GT0mX24|!?lTfF;+`HEBywT9i
z&ufD*-kWCJB#3uU62xJwAf1K+7}%=NQHk0g`j1hT%EwbeBLHDYKavDD@y0<dWoJeO
z^GO2*ebGY=5DI(|bCJ6hhAk&_h1MCNKpbI;DWlR%Ts(zqnPg&E=n%bw$AT}5(@-%e
zrN@Ot|CkVMqFon9cAYK~_WAGUmG0n2KV&wAZv!tyM;79;ON8aHn6-HyQP?fg<D1hW
z=iginsc%=w6<T4_(Z(Lh>pc$3M+Uw%@v#eD#vVUgHieE3qKrd_Hj4oTN8h7R&OJpV
zi`te<wWIZw$KOd%6wkg>DKQ0nk?YJfBmR%@Wr3NUIdEj>jI+!+V5nc)g%x-9X|u(3
zn=B05;h3-4h#L~vVrWZFn;iKewU)>?@;5}N!fY(<jjH5nba45vl;L?s>lL@Mu{Ywo
zXID6lEHWcren(=ThvBp9T;Kzg&OThRRMR5&`07CuKB7gw`(HgM(*kA}!O@b4kUW-8
zRA8J?Is9-Jh1}sL``_t`5B9JWcqYzEILB6+C11(LPsNjkXJ!Dlz848pbz;krpv?z7
zy^%ns=6lIVI|X|3%wg^>{bH(5s>X;ZHDphOK@>k3af}gJqJBLB+q86@$fs`_utex4
z<6#UV76&3_Pjhx#@3xtrIt1p-sRCT;0745haDb!VCtv<y@g7Egf|E=3*eZDWIB||{
zR5ACjx>XFG;3$@n8zv_KE8jdUxm`DH0U>Am3h}2sJMidTg`4R}qEVid5`7A(<sGVc
zP7K7DI#YVLpC{vx9aCyacvW?SoCg#emw#20UGZ83ESi0);<0v=l5+LcYq_dx0SK3j
zWatOd8hvZ~oR4>v$B|lES{eJ_rd2Y4?giUj`lR1)-T)9~xC<Y@-2``oPVczF_WY-d
z^!vnM-_}Hou2n!=M<og<CheSJo`VssH18(XyHkQcFkm=(qB01#ps|PUcipW@)(!|_
zQ<+rv&ffjz+(J>7t>Hq<VK(Hw#R4<b=hD=C=Wg(nf5JRxchbH1{&d<J`EU+1_jpOG
zx~)rH<v+hRt-z(-syJRzeFhNri!A&7%T7!#h-d9msRC_kO8>&j^VHz1Fx2N}7Bf8c
z)HnXudYhzk73S=9xcL;<$$kCoHMrF`2-^ni`(U}f(N+n>AUt60({<i0L@fw5r=)Q)
z3Kk8zAl|(B|CELbd1M6gM!<PHQck=lsYIXRU=4RXc3!zRd1&y{h^j>u+fo9aKIb|g
zleX|aYM{@u3Oqehy!&i`uOSA!{8CeAbB>k+8{)lPB|0TcltO+CsoRhClzk0?GORc2
zU2bQ2Fld^012*ZtS7md~+0lKzSX<}3J(<PHEnO<(wgkZOn&KFfY3HP1OrF2|T>c8C
zJtnz~8>~^%#G>jkW!R7O?ltA#48)Vi-IVGfo5dq>mT_NMAp+~4`*p4|Wu2tLu2Bfo
zxHt(dp99ulSAV(9(dqtU2!H?G&DF+(ly;XGZrz~EVpV9rj}M7LpQFMbHc1p8T1P6*
zoqe0x#LLL>-f+YAF$Z;~UcPLl_?(T(NW`d8-j~lBLCD8O=k^HiJdXH-dk}|<%U(qE
z^ok}vfK<O{+OL)Rxq1QL_l?lpYTcqyzC+Ky-%xC;6)+8OGwVTvF`u6v{2n%|yavtt
zEgf@m74-tasB}`*587}%Ng(%MnYi2Al<9W&Bl>%!7chu1Q)WR63n5PgK!*CoiDdkL
zF$B&#h8Y)nAj)+Ypi!f0+?qy;b{ag<Z(R;2%TXAnJzznhSB0y=v7u2e56%n9kQyRV
zPkD06AGK~EH?6-n_EYAMXNK$tZy|$H&Y#UQZ0eSs|E-|~>Vf%6v#*HSk7xg02?o|P
zKcPrB!9gO*EaqL@?fLX|pQ_9DQ`xCE`VwW%*PXnE6Fwrhfvk~3^DT%`&nXO&ZYuxN
z(YFcoy<|5?`GzjGL;=fbu~;)jFQ4Esb9_%3NLC}*@c$d6g5_PezEUrGxKgq)F&KzB
zE2HdRz!$lLG+ts#A+sHFc|Xz9`vF@pZAfoTLx-8ge!!B<bD`N-nfN%(Y^~X8nKPa3
zV3nC93(yERbBA?UTnfvr%MBW3WvV14waJ-&dX7-nZf(Ui{IE34`RDnH=hWslTaWu6
zD{N#Un)yqth(X5OexD!>Ir<k1oCVQ|qvvH#uMTE4Ge7I0(SnSF0wn}B+Z;wODnH8S
znx%yO!j+(VoWO54UE6d}(Tj&3*X03$E~lssV!j^7d(BV|h@BtID#a51&#>6L!!;>y
zaQHX$Y@-q#L<*7D#T%gdU#Q|@{Q7=$2GzjJN*gSR!$I3oZk}BVzWWSEwSKpjQM?Ow
z{slL=5aIWvun^~aIJ@jzm?cZpIb%Cu;Nmlu)(Vk<BTPj~by_VV1Bk^?c;>Y19F~PB
zIRWYIEB+Om(nACbRmMYakhWAyXCvdgy)1YAFa79NhKsecRlu%)JV9n=e()uOaMuww
zKdZahb`myfYYzM$p1z8NB$4hqosspEHJ$;yG!}E{3H@OzM6G}3OTT0GTONTyu9w&4
zCfmpR767}yqErz~^;Vf{;dsqsYnYY1#H5^4Zi5a_{mn}O_{e-Z(J6J}Nxq7RPMwho
z@fPl_JzKtphO71qVsGi~4XjoJTv+fOx}tHrmjl%Pq{0Xzl$2_cC*hy~dy#of6Y_Bx
zljq_Z<$;1T0(+)Lf_#7T2Yz9AnN3ajGXQqUaOYJYDd7FoIY@csQorMpuF|wp=2nHX
z4l(EjI#?~L|3x7zkYm=+R}bVFeY(fzbaZ+$3<vZC2$6^}uyA5LcDaR!&G_hDz9Q-D
zpF0nxT3T{Ei1LsSSgRWiq&|(`Tjiq}qu{|v3&H!!iaU-;UbB4c7Z>dNS~v<8LUz-@
zMBU5u2fxe7SE*M9xK%rzbs3X&_Ka@cO;Bj}6pn5MY+eXB5O|D5BR+r%c#-&!w5xZZ
z^=`5khA{ZQt4!)rC?Y52t!Tg|esI{|a9PIlmy@pcZ2-HR7e9>={s}5iU5)Z^#;B9X
z#IwKG7mqoHQ<C<VmB}xuW1qPw#NP?**gt*l;_|jTjP{hdV?YICY{Dzzeb@7~`$v$@
zA#V!+yyuaZ64wZt0D$FV=*p^>7X2*}e`ks^q*}Na@DL^A&orZVVX`|CA4fdgvGDk{
zH9Qsj-dX9!4gOG=thU1(b<0gG`3=I>ye7RqnOaT1ZSD^(p@?x|^&x`^C!9fnxD8^v
z6v}X3nP~<!<yYO@2PL6&#J#p#L(^3`%z5M%Jud*Ir`o#gETF8PUh>>IXnQwsEkBx8
z{4OH$PS`tcL)8(7eYr_Y!VQ&SK|eACg~T7u{jP<8TqPYX%gmBVoVR0&0R=>}cRa8*
z27w2Nq$as?GC&rUelGX2-{O`7qo(7stV3yD29Ua+9{L`Q$yV}|MenCRigAUd{p{UD
z`{RZa#5(_h$lYZeAUsXy7(QDP_NB$f>rQ~i9|eNf`=RMYJuI724DvLpH)Q4q7zqEn
zIT7hp1<ep1v=-5b=4Z*;dn%ZD>Re>^NyY-^S@9(jkLO(?m;o=Wz5VTWFQVa@oy>D9
zMFjFZjn^%H=h^D6*g2|9v89qtFk0dMuzsm|@Um~hIsEsqo&SQ7`$iKKl36LJ>)ebE
z?hRWYygqB^jJ}m6p_vGGwp#U8AGTb@9MHnq<__m+45gQ9MQ__rev`s0gvr?I4N#G_
ze3q+^W!=CvsU+8YRTQx+w5Oa`n*9l_#OP=#93FA3Dfn=>1lof*n3c{K4bK4K%f@iL
zZ>0BqI~RsX=%db^ht>R3&6T<ALQ!_G4q)R5h8Jt&B;|1aC&m}Q!!(W=c%Nj~kA!0K
zy>=iO=86|o2>2=!UWK#fnA?Bi>ss^`XdeYM@19LL>^-zit~d$%O3fo0#1k>rsckzX
z_e6{%sCg8euI)cGbbr6f`6N=jlyB%6=q7!B>&|UINFuU<V9^y3B#(Yw->i3RxcLCL
zK;AZJV~hjqrO7#M=Os4&<O~M<jiCTs(8;(slm|tyAzs7_R6L#4Sa$mgt^YxOk)S`I
zANG!xoum_wR~TN-au!jm<;e7`0QP<2UuZiy$ZX<t$|5p6g4wx!WT}cMVHA{S#UN5Q
z{N#03fSdAiA@YDtecEgW5b|;Ebfk;JXgZ&{6HN&{76sI$bJh4(&nxeSHmh#Co)wOJ
zEvfi3hDz;+)jC{jO`p*7q7Hxo@C)xteh@P}C}ax%hIhfP(`U-tMa9=&FZ-kN%FV^7
zEuU1UbhHH$;F;EQJo%ilBo*a=qH=fD+gX0RGbU0q_+rR+Lg)+O`FE)pX}NLfYmlDW
zy}`rJukFb9AK==GZoKTdRUT#d4RiXbl{AJ#HpbRU-UsaS#k`klBzOmSzAN`+Tm7?1
z07+!4;$FyDNmH(}8QWsmrnqf;4*eA<C6UqOn<*Yl@tJWRrfHc04mS9HH?c1K8&zR4
zA0>C{q=kZpZ0Ch+Rygl!gZ~mrLUetgq&}9e)g{t>iXu3wf#*v|H3_>y{p>oz#4uMu
zrhv-2J9uZRN>SVk;ij30B@lkFXEtMyhCd#xXR$fVnu4E9$M0FQQruy9$ppfNlsN6_
z%xBmxcCbv)TMR#xqGzxUx67a;W!Wwlm{yd?_$LQL;rc%Fx9ayTo3#W4t7&qXZr(^w
zmnO=<<ejTDmwh2`0*)7Au{%bnd7#qb3+EJOE|WMMm{6&k+3)pF8dy!%t9Ob1jK_AY
zII_c__}GO$WKI--9_gS0Lu-T0^Q3%IQRfG+i3?BCa4Mb6kgV(E;yF=<Nl&<YofyuC
zkDwpgEFUuIPtkp*w6t7vYjXDS)-Ly!w3+*C=Regi6$u;Lj0w;7bxtJ~ht_JwSmJE!
zZ(D4qq-Cnwm|DcRgn*8+jzuthIlnG4a3AEz>fMh511s{Is1Sru#C!)0V0s*oneO5W
zb>PR331PQFS|}6a!OvFMo=HN>f9MJno5vwu6<U=kw=yV={oqY@?GG!}u&`*Mh5Ep3
z^dR!o(}ynV3}hL&NuT2g_vG8}v{1JojL{SK{+ty${)Mp9IavlJm$R?_mS={)*I79;
z3A+JppVc0`<}+l|vj||S6}kK*Uf-GJe$M*s$qQD(A9bQd>p)DNT-L;0Asj|PW%~Vi
zj7M-6Y`oTO;ueNZNY3-5z%cdDt580(LO^xpk|xv|9cNEB_w!aplOscaGDu~`+wd;B
zMeg%nQcmg_>xqX=pEUX^RvztEW>Y3x>j$Oo^2%}2rQ?Rq5jR%WVmkL^kMo=@ALR}8
zsq^I*QIz|caQJ&X?9~yU-Sd+r`cr^u^TsBr{P-G;@+#ic^MlNI{h1-vJ_V4F+#5c7
zxV;#@=UWrW<_~6;Q;L<`uDcm8SsHLYY*Ioq$Q91lw~Wi#)9`SaV*&dh6+H%3pE=)V
z42!XV!n4zCP&D$o^$0gVg>~X=Uln@JdGP<Lxzczj*EaqP%66=YA=#RQB24yetj7{V
z9g;0+7aC)y$<Wxc6jQbt2GLLn5s{rNH8XUM<zVbG6UP?W<9(d?@P2>4yz^nc%ys|o
z>wi7h?|JTduK#tp;ex}<PLAC9^9`^K&tWmJc^5<&y80n5ED|<NOB+^xCex+ntKoM&
z#34{BM?$*$5|Doqg%3Q`y+Hehn&-Q->DjO>X97#fIaPYOTzHdrRddz;@GdkVce=n!
zKL|{25qZElj;VHo%?)#}sl{}O*E|^cHG0VzGBr4C4Bn=AZbEO&w*3@od<=B>sLN7J
zlFUpW!7^po<CsBNp*?kofiUrNqarm#7Zo%>E&_G+I@roe*`(i#Ll)6TAti@8)<YIP
zkB%0E*>$!#L}n{=YCTcr41K;Q+E7i15xp;hn0si|`nHcgO@R{9zeV_!>|Q67bKt<T
z?Wu@=efBp{jYs&2rVoNThGn)uq1Mx}WszE?Zx=Tf?h7nnaaH!`V9Y==o=vYZ-SEcU
zb{FgDrQ<i%hHGtcA(~fe%D<RI<@YRT=MFU#^tC!Cy*@q!FMi`A0S<>?3RISAcv8ER
znfExxmOw332lZzBnNv)#d1+t;xt4lY)jskhGm*DWyH-bab{?2i0#3}twAEOAxbZQ6
z(R_E7x7Gv}hj?usnSH&jE5rjTKWQVoBa8L9d1I>DuZt5{kImpVYzrlEdHucGY#f%=
zK)sMJ1130fuWN%Pe_jfF2e1iQyimMx2fJ&bywj%zKIhYe>3e^0{XbJ`AqhjG_m4XL
z*pyh9B1TYK*TbAb+Zt+YM(y%~q&v@gL}pup+8zV6hb)tN+)X=J6+U{%T^+zX1+>1h
z*dn{{U_#A$Nn0)fXFP5N8J)H0#`hGK>{epTwh{<U{_xlmBjY2W3`lQW6EOsgP+E@-
z_4WA-Ev79zYuAxW{u^e9bg4z9mQ<|Of9CMl<LHl6Q7%kat{##{i#H113@x{^|EQXI
z`H#uqG8vzL3xov)!yHkwh8?WWt*44A$kUHRoq3uG9P4hgzP<B&KWO^zaMs;;Z7q$A
zyp0@~dG|3){USJkJzXVB=nVwL(~Xjd^~SGyvW&>Kkv0RM@6S7(|M(cjl$T=6GX|6G
z0@NP*uqd+@kCMUEb=GHHH)ff$&*5`t(>I5!uKHj$NAOF$=V7ErJk<*T^lrH2gI6t6
zkwX>iFmauCfpj_2gf7DMyvao&RMO9CM@veBRJYk-b^cfHvc3m;KeHK4`MlR>m9Lxy
zy$DS=X$-EIaj`*q+CUI<SD~|<wRTO8y<6Yc9^XkX15o}SOAXnCDxn>>cCTerX6eXU
z4_fDWyC%O`AKdAmA7$QNl~@~ae)#*Q<JYnXmz!e9A6Z7up<Ag`r)3%7GiL>TY-W3}
z?ax=JwA)f}<!Q^g)og<#sSEhH1bJIs(Z(_U8`s1xM=r5yw&9SRn&%T*9&KD?Ij#<6
zhqI_jS{A?OH;Q?*P1k=wG9aYKz)_Hh!^-dZW(XhGSe}faxqNooeX&Up&EHTejgo@P
z5+CdNz`XHQ4jeTKhMc9)G>3bkZD#J8>1J|^w%9G!o@0nBfU6PG+8&UEjB}_Ysopj?
zqOXjtqqprEf)&?JEhI-8G5DHeyXQ+$c1a%Ts0ggelUR0DloFN(3_@;SOCesu`X0uq
z0wlpj0ai(c<{16&7!-|?XRNZL(9B}deW;DT6r8r=FP0Y@jSYsvdDJ+5Lg}18bTDbr
z;fll6R^oqfp(Ygv{{lV%PtWa;M9FcsEM}YnmhL&QoOPVcju*4jFG<PioDQ=t)rdoY
zkL)n*udaHxOX9f>a==yL-FP!6Sa+}+><8Neyo#^%{>ZE+%Veu?O25`x91L+y@Hc%)
z8#B~6{&Yt|@F|ShTt@srvMTv;NLw>QohovhAiSs(9`lMv0sGSF3c(ZT;8<7SA~lee
zgg+lO;*iGi|4+Wm-9hEAz?XLJt(E+h1ix8>f#9h3(N&54rts&5sgku*2{S90mW9nc
z-OOsPUz?i9-C5#A1e4AxV$>b=4k-hyh@V%i!-+q8yfih0O>N^|@KM_`_%s@UW5v;a
zvl*2Vf9dv&jW=1Ti~5|S=H(*1ox>%tYQ<>^`y8~P$?+VJ^i$)x(Nz>;mMmksMNyU^
z98I_%mD)n(KHz#9W+)=eM%y_$I;AUQL5unofH<U}|JBRec)#*NaJ&a2<puXIFX^(J
zHKpM39(ZuD{w}z_uK<l!vS;pxF3loRNyfv65=zayPqsuWiPrqWY<5k_;f^<gF~sw5
zFvh;|)p+n4rGiHY#c8?D>R*O3rsk1KXW*T_&OeJzX=#M_R}(rzX3Jh2*$)-&6}V?=
z1;zJ-M$kR6G*BhKF7{&#xsRAjf-z-edbf>V$})cI2<zJqhYwhzH@VK=%V5f95#c%c
zGOoWEjDv>}Qxi&|%?4Pv6Rn3gec7jqlSs*lkBzktnH<eVg7YtaD>wKD#sK);?S;2_
z4)TO=Z!uRPAPCdqBj94hB(${HvHmAH4=C&HVK|DmXJXJQS{hb`&QJSNh*d<o6Pku_
zwfFvNaS%o;kdlDC{g%OW+xem1DY{!?XuP3%%CfRWFmt@|)Z~I8_?rD+hRrAUFwI5-
zUki>ISK|GSaAp!&DU$o_rCmUQPATqaVAVQ(eG~<rRA9Q&DSp^*n1h|-_kzcN)q8SO
zK8?sK#q~P+7p~EJP&{xo&SQ$TD1*paSajRD8nO>M4nEJKP8$1GJc+=|rxRIo0`NDV
zbN$zkVD*n*_=Ovqmw);6J|4$jBAkIc*7a<c)28VEAoakj_?7VZw`U;y%VLW#wP2fl
zj9gHD-2AqwN_>=U%oq`lmLS4sEoq8<h2Z=LE$I5%dYDbx;lu-6>K+4u2*VYEkR@%v
zcBabk#6fJpepYVhPd3LfoMT7`%mM8q=!lyVcYlEC$$IwTq1izKaf1kz2@UK4Qkx{4
z6>T68Eny4Ux!i5Oe*-{)^9!0QbHkE;MnzaBlJLq}>>S)}!}itiLhM1bOu%RzqsD+$
z3K2x38+yd+NgCd74Em~q#P++=zCZKHY_6KBQ>U-glA(`TN|TA@7WMPhQ^bwks-WFB
zzWrB$c2d_`DAx<A%AN^FTjy{DVX!IJY$l&K(n?WKM&OG9!XH%_I6E=HbhL67XA@v+
zGCadoa8cgdq^et9txT4jXg$BBY2JjEhJC{<C@qF2c42t4`RL!LA3Xa$vc6L6tQP|S
zfEcWM;4NzdCF>JqVb@^DmUvIOIfkE+Y^Q%b{O-5eY-7-d=Lpm5@&;_iC9X)$_k@T4
zq;6jZqi#8VI6PI~X{!^openSuVdoaA&Iak#Ib9Mt;n6SG7UJXept#P-T6dW?Vbo;^
z09eQ(ulCwp+$49uRgqhKLc=`fdRS{nT)Lu8&DnTA0B}!d)5iFYC03JOrnJjUOo!vW
zk1*h;?bo6n;;ZhhjBtS_DA1&Qw{`ogL#N0Ibf8Xa$kX+ZcF%y7j-I)JclX!;Kv|O|
zt3LF5>-PC)LD}&sqr9@Tu%N%kf@lVkTjk3skKeHZ!1LzEtzTj(a&SgqIP|2A>C{8&
z#|^P?a-|J1Ep~$vyw>f{cxCOv4gfj6ELmo*TOM7Lb^!+Qf+b$s&0EJ9q6Ng_4;wq<
zRXQ3P7y*!4G^hXJiOqrGl3Sg4fe_}rm%FbUBdEY0b06io^ryobh;%y>am!uxImIP-
zs`vHe!-VwM+O5sIFxn;63Bv0S<aY9IJw1&Z4CXoW9JtUWnr>~0{io}xnr<@LiA*bE
z5Pago(XZQCfo_`Lr~h1_dhr23cQ{K{?uSqxuX~;BNjF@PCQr#S9^oeX!eu_heo+<Y
zw>xU(E>uB-GgX5I`Ucgdn%!R^0I+G215bHF9MBOi+rC}&GV6=$u&7;PZ*u&c!*E>9
sa7f`+JH7s!qr_@9=*<7mM|o!F(A>7mU+n=7FZR5)FtssxW8@zBA8(4v8~^|S

diff --git a/docs/logo/setup_tools_logo_symbol_colour.svg b/docs/logo/setup_tools_logo_symbol_colour.svg
deleted file mode 100644
index 2936cbb56a..0000000000
--- a/docs/logo/setup_tools_logo_symbol_colour.svg
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="35.414169mm"
-   height="35.414169mm"
-   viewBox="0 0 35.41417 35.414171"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (1.0+r73+1)"
-   sodipodi:docname="setup_tools_logo_symbol_colour.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1362">
-      <stop
-         style="stop-color:#336790;stop-opacity:1"
-         offset="0"
-         id="stop1358" />
-      <stop
-         style="stop-color:#396f9e;stop-opacity:1"
-         offset="1"
-         id="stop1360" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1356"
-       inkscape:collect="always">
-      <stop
-         id="stop1352"
-         offset="0"
-         style="stop-color:#ffd040;stop-opacity:1;" />
-      <stop
-         id="stop1354"
-         offset="1"
-         style="stop-color:#c59500;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1346">
-      <stop
-         style="stop-color:#ffd040;stop-opacity:1;"
-         offset="0"
-         id="stop1342" />
-      <stop
-         style="stop-color:#c59500;stop-opacity:1"
-         offset="1"
-         id="stop1344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1348"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.5091231)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1350"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1348-1"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1389"
-       gradientUnits="userSpaceOnUse"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952"
-       gradientTransform="translate(-0.09428005)" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1086"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="matrix(1.1629019,0,0,1.1629019,-107.42277,2.2004727)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1109"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="101.13023"
-       x2="360.05417"
-       y1="111.95531"
-       x1="372.85818"
-       gradientTransform="matrix(4.3952198,0,0,4.3952198,-1561.6542,-408.39072)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1203"
-       xlink:href="#linearGradient1362"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       gradientTransform="matrix(4.2668833,0,0,4.2668833,-1515.7133,-394.26365)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1214"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.199673"
-     inkscape:cx="40.150021"
-     inkscape:cy="40.606501"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g1222"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:snap-global="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-305.70123,-109.45205)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1399"
-       transform="translate(0.04622687,-0.80180859)">
-      <g
-         id="g1222">
-        <path
-           transform="matrix(0.26458333,0,0,0.26458333,305.655,110.25386)"
-           d="M 55.140625 110.10156 L 55.140625 114.65625 C 55.140625 120.97071 60.201017 126.03125 66.515625 126.03125 L 66.773438 126.03125 C 73.087932 126.03125 78.118201 120.97468 78.148438 114.65625 L 78.148438 110.10156 L 55.140625 110.10156 z "
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1214);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40013;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           id="path854" />
-        <path
-           id="path1185"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.58474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="M 55.914062 8.4238281 C 53.870774 8.4238281 51.582774 8.7898612 49.314453 9.4824219 C 48.747448 9.6555242 48.179304 9.8491835 47.619141 10.0625 C 47.059582 10.275665 46.507256 10.509549 45.962891 10.761719 C 44.87295 11.266475 43.820581 11.848322 42.841797 12.501953 C 41.863088 13.155547 40.959109 13.872791 40.154297 14.650391 C 39.349484 15.428028 38.644219 16.266248 38.060547 17.162109 C 37.476837 18.057971 37.014658 19.011078 36.699219 20.019531 C 36.620605 20.271626 36.550329 20.526221 36.490234 20.785156 C 36.309195 21.562567 36.214844 22.367837 36.214844 23.205078 C 36.214844 27.578747 35.923828 30.631366 35.923828 39.042969 C 35.924962 39.292796 35.92626 42.677565 35.927734 45.246094 C 38.783734 41.234087 43.514307 38.617188 48.808594 38.617188 L 61.408203 38.617188 L 61.408203 34.675781 L 79.212891 34.607422 L 90.820312 34.556641 L 90.820312 22.675781 C 90.820312 22.169514 90.771971 21.670258 90.681641 21.181641 L 90.681641 21.179688 C 90.636286 20.935908 90.580192 20.694322 90.513672 20.455078 L 90.513672 20.453125 C 90.180318 19.253465 89.588686 18.115524 88.796875 17.048828 C 88.480151 16.622044 88.130536 16.20533 87.753906 15.802734 C 86.624016 14.594911 85.243108 13.499679 83.712891 12.537109 C 83.203373 12.216605 82.678767 11.912988 82.144531 11.626953 L 82.140625 11.626953 C 81.071548 11.054657 79.964321 10.551444 78.865234 10.125 L 78.863281 10.125 C 78.314078 9.9118346 77.767968 9.7154786 77.228516 9.5410156 L 77.226562 9.5410156 C 75.607186 9.0167952 74.058608 8.6703211 72.734375 8.515625 L 72.730469 8.515625 C 72.288944 8.4642234 71.873982 8.4337183 71.488281 8.4257812 L 55.916016 8.4257812 L 55.914062 8.4238281 z M 76.589844 18.589844 C 79.203765 18.589844 81.324219 20.708344 81.324219 23.322266 C 81.324219 25.936225 79.203878 28.054688 76.589844 28.054688 C 73.975922 28.054688 71.857422 25.936225 71.857422 23.322266 C 71.857422 20.708269 73.975922 18.589806 76.589844 18.589844 z M 45.773438 61.419922 L 45.759766 61.423828 C 42.00454 61.423564 38.857937 63.908522 37.851562 67.328125 C 37.907122 67.422613 37.952317 67.529251 38.009766 67.621094 C 38.26375 68.027658 38.53734 68.408119 38.826172 68.765625 C 39.114928 69.123546 39.419743 69.457191 39.738281 69.769531 C 40.056517 70.08172 40.388044 70.373955 40.730469 70.644531 C 41.416264 71.186364 42.151568 71.644428 42.916016 72.029297 L 42.917969 72.029297 C 44.064035 72.606128 45.274381 73.016948 46.46875 73.28125 C 47.222388 73.447927 47.966505 73.553501 48.689453 73.611328 C 48.729138 73.614579 48.773634 73.617314 48.814453 73.621094 C 49.195543 73.64755 49.567899 73.662109 49.931641 73.662109 L 54.007812 73.669922 L 54.003906 70.167969 L 54.003906 70.125 C 54.011465 69.990071 54.013925 69.833953 54.021484 69.669922 C 54.021711 65.097638 50.345683 61.419657 45.773438 61.419922 z M 83.636719 63.466797 L 83.636719 63.46875 C 80.784385 63.518262 78.312235 65.87151 78.3125 68.671875 L 78.3125 70.216797 L 78.3125 81.910156 L 78.232422 81.910156 L 78.228516 82.328125 L 51.306641 82.386719 C 50.241456 82.457774 49.208884 82.45021 48.210938 82.363281 C 47.213029 82.276352 46.250455 82.112101 45.326172 81.867188 C 44.401964 81.621896 43.516032 81.296383 42.671875 80.892578 C 41.827793 80.48866 41.025184 80.005753 40.267578 79.443359 C 38.339943 78.012355 37.210659 75.31485 35.873047 72.945312 L 35.873047 89.744141 C 35.873047 90.063511 35.88162 90.380452 35.904297 90.693359 C 35.926974 91.006304 35.952502 91.313263 35.992188 91.619141 L 35.992188 91.621094 C 36.070802 92.231979 36.188285 92.830213 36.339844 93.412109 L 36.339844 93.414062 C 36.642962 94.578422 37.087468 95.682077 37.650391 96.722656 C 37.931965 97.24374 38.243159 97.748164 38.582031 98.236328 L 38.582031 98.238281 C 39.597364 99.700656 40.857919 101.01323 42.287109 102.1582 C 42.763632 102.54012 43.258841 102.90135 43.769531 103.24219 C 44.790911 103.92383 45.873006 104.52167 46.990234 105.0293 C 48.107501 105.53696 49.258939 105.95358 50.417969 106.27344 C 51.576961 106.59319 52.743992 106.81729 53.890625 106.93555 C 54.463979 106.99489 55.031671 107.02716 55.591797 107.0332 L 55.611328 107.0332 L 55.617188 107.0332 C 56.071373 107.04454 59.83214 107.06263 63.472656 107.06641 C 66.514382 107.07019 68.777615 107.07422 70.013672 107.07422 C 70.256695 107.07407 71.212 107.0746 71.300781 107.07422 C 76.376082 107.05154 80.794717 106.66522 84.642578 105.92969 C 86.70964 105.53454 88.618525 105.04278 90.359375 104.44531 C 92.046329 103.86636 93.57251 103.18749 94.933594 102.42188 C 99.017562 100.12494 101.60583 97.053226 102.51367 93.587891 C 102.94178 90.430587 102.82403 82.990197 102.80664 77.792969 L 102.80664 77.785156 C 102.82554 73.072274 102.83802 72.48446 102.8418 72 L 102.73047 72 L 102.72266 71.349609 L 88.951172 71.416016 L 88.931641 68.669922 C 88.931527 65.782174 86.616188 63.46691 83.728516 63.466797 L 83.720703 63.466797 C 83.694246 63.46657 83.65864 63.466608 83.636719 63.466797 z "
-           transform="matrix(0.26458333,0,0,0.26458333,305.655,110.25386)" />
-        <path
-           id="path1105"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.683878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
-           d="m 324.26094,121.13878 v 0.0163 h -5.69217 c -1.9305,0 -3.51031,1.54334 -3.47287,3.46566 v 0.005 1.4651 2.11653 c 0.25703,-1.31758 1.27566,-2.38356 2.66641,-2.38455 h 0.002 c 1.57834,0.001 2.8666,1.28729 2.86652,2.86591 0,0.0521 -0.002,0.10838 -0.007,0.16826 l 0.002,-0.0246 0.005,2.40979 h 5.06058 v -2.40799 -0.41105 c -1.1e-4,-1.13514 0.96374,-2.04237 2.08468,-2.06005 h 0.002 c 0.0105,-9e-5 0.0214,-8e-5 0.0319,0 1.13183,0.001 2.05648,0.92579 2.05766,2.05764 v 0.0415 l 2.9278,-0.0138 v -0.14542 h 0.0138 v -7.16389 h -3.08707 c -0.19901,0.93099 -0.93007,1.67822 -1.91461,1.67844 -0.98448,-2.2e-4 -1.7132,-0.74752 -1.91221,-1.67844 z" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/docs/logo/setup_tools_logo_symbol_colour_1000px.png b/docs/logo/setup_tools_logo_symbol_colour_1000px.png
deleted file mode 100644
index e0c36fc131ac399ba0a8db8ff16b13d4beb8ad72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44239
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

diff --git a/docs/logo/setup_tools_logotype_1line.svg b/docs/logo/setup_tools_logotype_1line.svg
deleted file mode 100644
index dbb9c1decf..0000000000
--- a/docs/logo/setup_tools_logotype_1line.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="153.08401mm"
-   height="22.351141mm"
-   viewBox="0 0 153.08402 22.351142"
-   version="1.1"
-   id="svg8"
-   inkscape:version="1.0 (1.0+r73+1)"
-   sodipodi:docname="setup_tools_logotype_1line.svg">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient1356"
-       inkscape:collect="always">
-      <stop
-         id="stop1352"
-         offset="0"
-         style="stop-color:#ffd040;stop-opacity:1;" />
-      <stop
-         id="stop1354"
-         offset="1"
-         style="stop-color:#c59500;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1346">
-      <stop
-         style="stop-color:#ffd040;stop-opacity:1;"
-         offset="0"
-         id="stop1342" />
-      <stop
-         style="stop-color:#c59500;stop-opacity:1"
-         offset="1"
-         id="stop1344" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1348"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1.5091231)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1356"
-       id="linearGradient1350"
-       x1="364.9838"
-       y1="103.99801"
-       x2="380.39404"
-       y2="119.1796"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0856143,0,0,3.0856143,-977.53344,-249.20723)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="119.1796"
-       x2="380.39404"
-       y1="103.99801"
-       x1="364.9838"
-       id="linearGradient1348-1"
-       xlink:href="#linearGradient1356"
-       inkscape:collect="always"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1370.9942,-384.33468)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1346"
-       id="linearGradient1389"
-       gradientUnits="userSpaceOnUse"
-       x1="383.75778"
-       y1="110.35148"
-       x2="425.11826"
-       y2="166.39952"
-       gradientTransform="translate(-0.09428005)" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(3.7795276,0,0,3.7795276,-1227.377,-330.32486)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1086"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="166.39952"
-       x2="425.11826"
-       y1="110.35148"
-       x1="383.75778"
-       gradientTransform="matrix(1.8992984,0,0,1.8992984,-333.12947,-121.42763)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1224"
-       xlink:href="#linearGradient1346"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:guide-bbox="true"
-     showguides="true"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.822847"
-     inkscape:cx="195.14044"
-     inkscape:cy="-7.273579"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g1222"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-293.37152,-116.6327)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1399"
-       transform="translate(0.04622687,-0.80180859)">
-      <g
-         id="g1222">
-        <g
-           transform="translate(-0.36620442,0.40535408)"
-           id="g873">
-          <path
-             d="m 302.59023,121.31122 c -1.18799,0.0376 -2.15686,0.38742 -2.90718,1.0502 -0.7378,0.65026 -1.10613,1.50759 -1.10613,2.57053 0,0.72529 0.181,1.33198 0.54375,1.81968 0.36265,0.47519 0.79337,0.84965 1.29359,1.12478 0.51272,0.27512 1.15109,0.55646 1.9139,0.84409 0.82534,0.32512 1.46275,0.67602 1.91292,1.05117 0.46269,0.36265 0.69393,0.85582 0.69393,1.48107 0,0.7378 -0.27521,1.29435 -0.82544,1.66952 -0.53773,0.37513 -1.16898,0.56337 -1.89428,0.56337 -0.56273,0 -1.1694,-0.11965 -1.81968,-0.35728 -0.65026,-0.2501 -1.20682,-0.54986 -1.6695,-0.90002 l -0.80582,1.44476 c 0.58776,0.41268 1.26913,0.75644 2.04444,1.03155 0.77534,0.26261 1.58153,0.39357 2.41939,0.39357 0.90036,0 1.682,-0.16885 2.34478,-0.50645 0.67527,-0.33763 1.19397,-0.80008 1.55662,-1.38781 0.36266,-0.58776 0.54474,-1.24458 0.54474,-1.96986 0,-0.80035 -0.16258,-1.45616 -0.4878,-1.96887 -0.31262,-0.52521 -0.71267,-0.93237 -1.20037,-1.22 -0.47519,-0.3001 -1.06344,-0.57533 -1.76373,-0.82543 -0.93787,-0.35016 -1.66323,-0.70004 -2.17597,-1.05018 -0.5002,-0.36265 -0.74986,-0.82511 -0.74986,-1.38784 0,-0.57522 0.21181,-1.02539 0.63699,-1.35053 0.43767,-0.33764 1.02594,-0.50645 1.76374,-0.50645 0.48771,0 1.00642,0.0809 1.55665,0.24342 0.55023,0.16258 1.06894,0.37535 1.55665,0.63797 l 0.69489,-1.40649 c -1.25053,-0.72528 -2.60813,-1.08847 -4.07122,-1.08847 z m 9.75109,0.0756 v 13.56125 h 9.07878 v -1.76276 h -7.26009 v -4.18311 h 6.2472 v -1.7441 h -6.2472 v -4.12718 h 6.99706 v -1.7441 z m 13.72712,0 v 1.7441 h 3.54514 v 11.81715 h 1.81869 v -11.81715 h 3.63938 v -1.7441 z m 14.21394,0 v 8.81574 c 0,0.96289 0.21893,1.81923 0.6566,2.56954 0.45019,0.7378 1.06302,1.31379 1.83833,1.72645 0.77532,0.40016 1.63167,0.59968 2.56955,0.59968 0.95039,0 1.81384,-0.19952 2.58918,-0.59968 0.77531,-0.41266 1.38814,-0.98865 1.83833,-1.72645 0.45017,-0.75031 0.67525,-1.60665 0.67525,-2.56954 v -8.81574 h -1.78239 v 8.75981 c 0,0.60023 -0.14321,1.14353 -0.43088,1.63123 -0.28761,0.4877 -0.68762,0.86929 -1.20035,1.14442 -0.5002,0.27509 -1.06388,0.41319 -1.68914,0.41319 -0.60024,0 -1.14967,-0.13808 -1.64989,-0.41319 -0.4877,-0.28763 -0.87544,-0.66922 -1.16305,-1.14442 -0.28763,-0.4877 -0.43186,-1.031 -0.43186,-1.63123 v -8.75981 z m 16.37221,0 v 13.56125 h 1.81968 v -4.98892 h 2.00716 c 1.03793,0 1.89427,-0.20665 2.56955,-0.61933 0.68777,-0.41266 1.18191,-0.95077 1.48204,-1.61356 0.31262,-0.66276 0.46914,-1.37487 0.46914,-2.13768 0,-1.32554 -0.41944,-2.35781 -1.25728,-3.09561 -0.82534,-0.7378 -1.9753,-1.10615 -3.45093,-1.10615 z m 1.81968,1.7441 h 2.1004 c 0.90036,0 1.56331,0.25679 1.98849,0.7695 0.42518,0.5002 0.63797,1.0752 0.63797,1.72546 0,0.37515 -0.0879,0.76291 -0.26303,1.16305 -0.17511,0.38767 -0.46871,0.71913 -0.88139,0.99427 -0.40016,0.27509 -0.92501,0.41222 -1.57528,0.41222 h -2.00716 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Bold';letter-spacing:1.30175px;fill:#376d9c;fill-opacity:1;stroke:none;stroke-width:0.468944"
-             id="path1059" />
-          <path
-             d="m 389.51096,121.27344 c -1.25052,0 -2.40664,0.31919 -3.46958,0.95696 -1.05043,0.62526 -1.88833,1.46929 -2.51359,2.53224 -0.62525,1.06294 -0.93831,2.21388 -0.93831,3.4519 0,1.27551 0.30592,2.44491 0.91867,3.50785 0.62527,1.05042 1.4703,1.8812 2.53323,2.49395 1.06294,0.61277 2.21906,0.91966 3.46958,0.91966 1.238,0 2.38895,-0.30689 3.4519,-0.91966 1.07544,-0.62525 1.92564,-1.4693 2.55089,-2.53224 0.62525,-1.06293 0.9373,-2.21905 0.9373,-3.46956 0,-1.23802 -0.31821,-2.38896 -0.95595,-3.4519 -0.62527,-1.06295 -1.46932,-1.90698 -2.53224,-2.53224 -1.06295,-0.63777 -2.2139,-0.95696 -3.4519,-0.95696 z m 18.54818,0 c -1.25051,0 -2.40762,0.31919 -3.47055,0.95696 -1.05044,0.62526 -1.88834,1.46929 -2.5136,2.53224 -0.62523,1.06294 -0.93731,2.21388 -0.93731,3.4519 0,1.27551 0.30592,2.44491 0.91867,3.50785 0.62525,1.05042 1.4693,1.8812 2.53224,2.49395 1.06293,0.61277 2.22004,0.91966 3.47055,0.91966 1.238,0 2.38797,-0.30689 3.45092,-0.91966 1.07544,-0.62525 1.92562,-1.4693 2.55089,-2.53224 0.62526,-1.06293 0.93831,-2.21905 0.93831,-3.46956 0,-1.23802 -0.3192,-2.38896 -0.95697,-3.4519 -0.62524,-1.06295 -1.46929,-1.90698 -2.53223,-2.53224 -1.06295,-0.63777 -2.21292,-0.95696 -3.45092,-0.95696 z m 30.24853,0.0756 c -1.18799,0.0374 -2.15686,0.38742 -2.90718,1.05018 -0.7378,0.65028 -1.10712,1.5066 -1.10712,2.56954 0,0.7253 0.18101,1.33198 0.54375,1.81968 0.36264,0.4752 0.79437,0.85066 1.29459,1.12577 0.51271,0.27511 1.15108,0.55646 1.9139,0.84409 0.82536,0.32512 1.46274,0.67503 1.91292,1.05019 0.4627,0.36264 0.69392,0.85678 0.69392,1.48205 0,0.7378 -0.27521,1.29435 -0.82543,1.66952 -0.53773,0.37515 -1.16898,0.56238 -1.89429,0.56238 -0.56272,0 -1.16939,-0.11871 -1.81968,-0.35627 -0.65026,-0.2501 -1.20683,-0.54989 -1.6695,-0.90004 l -0.8068,1.44377 c 0.58776,0.41268 1.26913,0.75742 2.04446,1.03253 0.77531,0.26262 1.5825,0.39358 2.42035,0.39358 0.90037,0 1.682,-0.16885 2.34478,-0.50645 0.67528,-0.33762 1.194,-0.80008 1.55663,-1.38782 0.36265,-0.58776 0.54375,-1.24455 0.54375,-1.96986 0,-0.80032 -0.16258,-1.45714 -0.4878,-1.96983 -0.31264,-0.52524 -0.71265,-0.9314 -1.20035,-1.21901 -0.47521,-0.30013 -1.06247,-0.57534 -1.76276,-0.82544 -0.9379,-0.35015 -1.66326,-0.70006 -2.17597,-1.0502 -0.50022,-0.36265 -0.75083,-0.82511 -0.75083,-1.38783 0,-0.57524 0.21278,-1.02539 0.63795,-1.35052 0.43768,-0.33764 1.02593,-0.50646 1.76375,-0.50646 0.4877,0 1.00642,0.0809 1.55664,0.24341 0.55023,0.16258 1.06895,0.37536 1.55663,0.63797 l 0.69393,-1.40745 c -1.25052,-0.72531 -2.60713,-1.08748 -4.07024,-1.08748 z m -68.67582,0.0746 v 1.74509 h 3.54514 v 11.81714 h 1.81968 v -11.81714 h 3.63839 v -1.74509 z m 50.89712,0 v 13.56223 h 8.72249 v -1.76375 h -6.90281 v -11.79848 z m -31.01801,1.59492 c 0.92537,0 1.77556,0.23124 2.55089,0.69391 0.77531,0.4627 1.38814,1.09395 1.83831,1.89428 0.45021,0.80033 0.67528,1.66992 0.67528,2.60781 0,0.93789 -0.22507,1.80652 -0.67528,2.60685 -0.43766,0.78781 -1.04435,1.41391 -1.81968,1.8766 -0.7628,0.45019 -1.60685,0.67526 -2.53224,0.67526 -0.92538,0 -1.78171,-0.23122 -2.56954,-0.69391 -0.77531,-0.46269 -1.38814,-1.08878 -1.83833,-1.8766 -0.45017,-0.78783 -0.67526,-1.64415 -0.67526,-2.56955 0,-0.93789 0.21893,-1.80651 0.65661,-2.60684 0.45019,-0.80033 1.06301,-1.43257 1.83835,-1.89525 0.77531,-0.47519 1.62551,-0.71256 2.55089,-0.71256 z m 18.54818,0 c 0.92538,0 1.77556,0.23124 2.55089,0.69391 0.77532,0.4627 1.38814,1.09395 1.83834,1.89428 0.45017,0.80033 0.67525,1.66992 0.67525,2.60781 0,0.93789 -0.22508,1.80652 -0.67525,2.60685 -0.43768,0.78781 -1.04437,1.41391 -1.81968,1.8766 -0.76282,0.45019 -1.60687,0.67526 -2.53226,0.67526 -0.92538,0 -1.7817,-0.23122 -2.56954,-0.69391 -0.77532,-0.46269 -1.38814,-1.08878 -1.83832,-1.8766 -0.45019,-0.78783 -0.67527,-1.64415 -0.67527,-2.56955 0,-0.93789 0.21893,-1.80651 0.65662,-2.60684 0.45017,-0.80033 1.063,-1.43257 1.83833,-1.89525 0.77532,-0.47519 1.62552,-0.71256 2.55089,-0.71256 z"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87613px;line-height:1.25;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';font-variation-settings:normal;letter-spacing:1.30175px;vector-effect:none;fill:url(#linearGradient1224);fill-opacity:1;stroke:none;stroke-width:1.11694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-             id="path1070" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>

From 1b22ebc1cea9da7f377a260821e6cb1781df527c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 24 Jul 2020 21:24:06 -0400
Subject: [PATCH 8054/8469] Revert "Add banner to main docs page"

This reverts commit 0f491dc2b4141a17475eec12b02d8f237d7f7918.
---
 docs/index.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/index.txt b/docs/index.txt
index 228f97c8b5..fc111a9998 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,6 +1,3 @@
-.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
-
-
 Documentation
 =============
 

From dcc71f773576c19a3658735879893515b056ece5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:35:02 -0400
Subject: [PATCH 8055/8469] Rename _distutils_importer to _distutils_hack, as
 it supplies more than just an importer.

---
 {_distutils_importer => _distutils_hack}/__init__.py | 0
 {_distutils_importer => _distutils_hack}/install.py  | 0
 {_distutils_importer => _distutils_hack}/override.py | 0
 conftest.py                                          | 2 +-
 setup.py                                             | 2 +-
 setuptools/__init__.py                               | 2 +-
 setuptools/sandbox.py                                | 8 ++++----
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename {_distutils_importer => _distutils_hack}/__init__.py (100%)
 rename {_distutils_importer => _distutils_hack}/install.py (100%)
 rename {_distutils_importer => _distutils_hack}/override.py (100%)

diff --git a/_distutils_importer/__init__.py b/_distutils_hack/__init__.py
similarity index 100%
rename from _distutils_importer/__init__.py
rename to _distutils_hack/__init__.py
diff --git a/_distutils_importer/install.py b/_distutils_hack/install.py
similarity index 100%
rename from _distutils_importer/install.py
rename to _distutils_hack/install.py
diff --git a/_distutils_importer/override.py b/_distutils_hack/override.py
similarity index 100%
rename from _distutils_importer/override.py
rename to _distutils_hack/override.py
diff --git a/conftest.py b/conftest.py
index 868bf5bed2..25537f56e5 100644
--- a/conftest.py
+++ b/conftest.py
@@ -15,7 +15,7 @@ def pytest_addoption(parser):
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
-    '_distutils_importer',
+    '_distutils_hack',
 ]
 
 
diff --git a/setup.py b/setup.py
index a6e1abc455..2d8bdf85d8 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ class install_with_pth(install):
     def initialize_options(self):
         install.initialize_options(self)
         self.extra_path = (
-            'distutils-precedence', 'import _distutils_importer.install')
+            'distutils-precedence', 'import _distutils_hack.install')
 
     def finalize_options(self):
         install.finalize_options(self)
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 80b287b4b4..99094230d3 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -5,7 +5,7 @@
 import os
 import re
 
-import _distutils_importer.override  # noqa: F401
+import _distutils_hack.override  # noqa: F401
 
 import distutils.core
 from distutils.errors import DistutilsOptionError
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 342a713f5c..24a360808a 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -200,7 +200,7 @@ def setup_context(setup_dir):
     'distutils',
     'pkg_resources',
     'Cython',
-    '_distutils_importer',
+    '_distutils_hack',
 }
 
 
@@ -232,9 +232,9 @@ def hide_setuptools():
     necessary to avoid issues such as #315 where setuptools upgrading itself
     would fail to find a function declared in the metadata.
     """
-    _distutils_importer = sys.modules.get('_distutils_importer', None)
-    if _distutils_importer is not None:
-        _distutils_importer.remove_shim()
+    _distutils_hack = sys.modules.get('_distutils_hack', None)
+    if _distutils_hack is not None:
+        _distutils_hack.remove_shim()
 
     modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)

From 384a51657c94271d29c437415080f25f7df4103b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:38:13 -0400
Subject: [PATCH 8056/8469] Extract pth name and contents into class variables.

---
 setup.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 2d8bdf85d8..edb2bbcff6 100755
--- a/setup.py
+++ b/setup.py
@@ -92,18 +92,21 @@ class install_with_pth(install):
     `distutils` than the standard library.
     """
 
+    _pth_name = 'distutils-precedence'
+    _pth_contents = 'import _distutils_hack.install'
+
     def initialize_options(self):
         install.initialize_options(self)
-        self.extra_path = (
-            'distutils-precedence', 'import _distutils_hack.install')
+        self.extra_path = self._pth_name, self._pth_contents
 
     def finalize_options(self):
         install.finalize_options(self)
 
+        # undo secondary effect of `extra_path` adding to `install_lib`
         install_suffix = os.path.relpath(self.install_lib,
                                          self.install_libbase)
 
-        if install_suffix == self.extra_path[1]:
+        if install_suffix == self._pth_contents:
             self.install_lib = self.install_libbase
 
 

From f3b177e9c2b77104ddebaec7b581e2aee73a1184 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:42:15 -0400
Subject: [PATCH 8057/8469] Update docstring to use imperative voice, provide a
 bit more context, and advise against copying of the behavior.

---
 setup.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index edb2bbcff6..45ddb149a5 100755
--- a/setup.py
+++ b/setup.py
@@ -86,10 +86,13 @@ class install_with_pth(install):
     """
     Custom install command to install a .pth file for distutils patching.
 
-    This is necessary because there's no standard way to install a `.pth` file
-    alongside your package (and there probably shouldn't be one), but we need
-    to do this in order to give precedence higher precedence to our version of
-    `distutils` than the standard library.
+    This hack is necessary because there's no standard way to install behavior
+    on startup (and it's debatable if there should be one). This hack (ab)uses
+    the `extra_path` behavior in Setuptools to install a `.pth` file with
+    implicit behavior on startup to give higher precedence to the local version
+    of `distutils` over the version from the standard library.
+
+    Please do not replicate this behavior.
     """
 
     _pth_name = 'distutils-precedence'

From 268ef5f553f29977f708c256ee398c9e29cb4da7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:43:08 -0400
Subject: [PATCH 8058/8469] Remove hanging indent

---
 setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 45ddb149a5..6290a74698 100755
--- a/setup.py
+++ b/setup.py
@@ -106,8 +106,10 @@ def finalize_options(self):
         install.finalize_options(self)
 
         # undo secondary effect of `extra_path` adding to `install_lib`
-        install_suffix = os.path.relpath(self.install_lib,
-                                         self.install_libbase)
+        install_suffix = os.path.relpath(
+            self.install_lib,
+            self.install_libbase,
+        )
 
         if install_suffix == self._pth_contents:
             self.install_lib = self.install_libbase

From 5642e413fb6c75434f109be943bdb09ea9e7ade2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:44:51 -0400
Subject: [PATCH 8059/8469] Extract function for restoring install lib to
 encapsulate behavior.

---
 setup.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 6290a74698..6f6601fedf 100755
--- a/setup.py
+++ b/setup.py
@@ -104,14 +104,15 @@ def initialize_options(self):
 
     def finalize_options(self):
         install.finalize_options(self)
+        self._restore_install_lib()
 
-        # undo secondary effect of `extra_path` adding to `install_lib`
-        install_suffix = os.path.relpath(
-            self.install_lib,
-            self.install_libbase,
-        )
+    def _restore_install_lib(self):
+        """
+        Undo secondary effect of `extra_path` adding to `install_lib`
+        """
+        suffix = os.path.relpath(self.install_lib, self.install_libbase)
 
-        if install_suffix == self._pth_contents:
+        if suffix == self._pth_contents:
             self.install_lib = self.install_libbase
 
 

From 83a85a71cd779b1b1b3a44e21cc198264650da46 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:51:40 -0400
Subject: [PATCH 8060/8469] Restore early opt-in/opt-out for pth behavior.

---
 setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6f6601fedf..2e44225e41 100755
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 
 import os
 import sys
+import textwrap
 
 import setuptools
 from setuptools.command.install import install
@@ -96,7 +97,11 @@ class install_with_pth(install):
     """
 
     _pth_name = 'distutils-precedence'
-    _pth_contents = 'import _distutils_hack.install'
+    _pth_contents = textwrap.dedent("""
+        import os
+        enabled = os.environ.get('SETUPTOOLS_USE_DISTUTILS') == 'local'
+        enabled and __import__('_distutils_hack.install')
+        """).lstrip().replace('\n', '; ')
 
     def initialize_options(self):
         install.initialize_options(self)

From 1251a231ad75fa649da700645690eb3c0a348f08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:53:31 -0400
Subject: [PATCH 8061/8469] Replace install behavior on import with direct
 invocation (now that 'enabled' logic is duplicated in pth file).

---
 _distutils_hack/install.py | 5 -----
 setup.py                   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 _distutils_hack/install.py

diff --git a/_distutils_hack/install.py b/_distutils_hack/install.py
deleted file mode 100644
index 73f13b2993..0000000000
--- a/_distutils_hack/install.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from . import enabled, add_shim
-
-
-if enabled():
-    add_shim()
diff --git a/setup.py b/setup.py
index 2e44225e41..37953051b0 100755
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,7 @@ class install_with_pth(install):
     _pth_contents = textwrap.dedent("""
         import os
         enabled = os.environ.get('SETUPTOOLS_USE_DISTUTILS') == 'local'
-        enabled and __import__('_distutils_hack.install')
+        enabled and __import__('_distutils_hack').add_shim()
         """).lstrip().replace('\n', '; ')
 
     def initialize_options(self):

From 6c6d69e0213c4012caa36f0087f1fe54bac62c89 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 10:59:11 -0400
Subject: [PATCH 8062/8469] Move all but a small shim in override into
 _distutils_hack

---
 _distutils_hack/__init__.py | 51 ++++++++++++++++++++++++++++++++++
 _distutils_hack/override.py | 55 +------------------------------------
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 3ad701002d..a8638344f0 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -1,5 +1,11 @@
 import sys
 import os
+import re
+import importlib
+import warnings
+
+
+is_pypy = '__pypy__' in sys.builtin_module_names
 
 
 def enabled():
@@ -10,6 +16,51 @@ def enabled():
     return which == 'local'
 
 
+def warn_distutils_present():
+    if 'distutils' not in sys.modules:
+        return
+    if is_pypy and sys.version_info < (3, 7):
+        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
+        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
+        return
+    warnings.warn(
+        "Distutils was imported before Setuptools. This usage is discouraged "
+        "and may exhibit undesirable behaviors or errors. Please use "
+        "Setuptools' objects directly or at least import Setuptools first.")
+
+
+def clear_distutils():
+    if 'distutils' not in sys.modules:
+        return
+    warnings.warn("Setuptools is replacing distutils.")
+    mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
+    for name in mods:
+        del sys.modules[name]
+
+
+def ensure_local_distutils():
+    clear_distutils()
+    distutils = importlib.import_module('setuptools._distutils')
+    distutils.__name__ = 'distutils'
+    sys.modules['distutils'] = distutils
+
+    # sanity check that submodules load as expected
+    core = importlib.import_module('distutils.core')
+    assert '_distutils' in core.__file__, core.__file__
+
+
+def do_override():
+    """
+    Ensure that the local copy of distutils is preferred over stdlib.
+
+    See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
+    for more motivation.
+    """
+    warn_distutils_present()
+    if enabled():
+        ensure_local_distutils()
+
+
 class DistutilsMetaFinder:
     def find_spec(self, fullname, path, target=None):
         if path is not None or fullname != "distutils":
diff --git a/_distutils_hack/override.py b/_distutils_hack/override.py
index 523139bb6e..2cc433a4a5 100644
--- a/_distutils_hack/override.py
+++ b/_distutils_hack/override.py
@@ -1,54 +1 @@
-"""
-Ensure that the local copy of distutils is preferred over stdlib.
-
-See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
-for more motivation.
-"""
-
-import sys
-import re
-import importlib
-import warnings
-
-from . import enabled
-
-
-is_pypy = '__pypy__' in sys.builtin_module_names
-
-
-def warn_distutils_present():
-    if 'distutils' not in sys.modules:
-        return
-    if is_pypy and sys.version_info < (3, 7):
-        # PyPy for 3.6 unconditionally imports distutils, so bypass the warning
-        # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
-        return
-    warnings.warn(
-        "Distutils was imported before Setuptools. This usage is discouraged "
-        "and may exhibit undesirable behaviors or errors. Please use "
-        "Setuptools' objects directly or at least import Setuptools first.")
-
-
-def clear_distutils():
-    if 'distutils' not in sys.modules:
-        return
-    warnings.warn("Setuptools is replacing distutils.")
-    mods = [name for name in sys.modules if re.match(r'distutils\b', name)]
-    for name in mods:
-        del sys.modules[name]
-
-
-def ensure_local_distutils():
-    clear_distutils()
-    distutils = importlib.import_module('setuptools._distutils')
-    distutils.__name__ = 'distutils'
-    sys.modules['distutils'] = distutils
-
-    # sanity check that submodules load as expected
-    core = importlib.import_module('distutils.core')
-    assert '_distutils' in core.__file__, core.__file__
-
-
-warn_distutils_present()
-if enabled():
-    ensure_local_distutils()
+__import__('_distutils_hack').do_override()

From 95b359c84ae05cb2fd37da194b67ee83c4eb9595 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:08:30 +0300
Subject: [PATCH 8063/8469] The PyPA has adopted the PSF code of conduct

For details, see:

* https://discuss.python.org/t/implementing-pep-609-pypa-governance/4745
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 9cbf7b86e1..824a033fb8 100644
--- a/README.rst
+++ b/README.rst
@@ -54,4 +54,4 @@ Code of Conduct
 
 Everyone interacting in the setuptools project's codebases, issue trackers,
 chat rooms, and mailing lists is expected to follow the
-`PyPA Code of Conduct <https://www.pypa.io/en/latest/code-of-conduct/>`_.
+`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.

From dbc968a808791a0cd494c4d993592e832d2e5fed Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 21:41:20 -0400
Subject: [PATCH 8064/8469] docs: remove editorial message and lengthy
 description of dependency type

---
 docs/userguide/dependency_management.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index ca2ac75ac4..1c9cf6380d 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -2,10 +2,8 @@
 Dependencies Management in Setuptools
 =====================================
 
-``Setuptools``'s dependency management is meticulous, or agonizing, depending
-on your level of familiarity. There are three types of dependency styles.
-1) those required to run the packaging program (build system requirement),
-2) those your package depends on (required dependency) and 3) optional
+There are three types of dependency styles offered by setuptools:
+1) build system requirement, required dependency and 3) optional
 dependency.
 
 .. Note::

From 3268c199118dd5400e40b1afc401ea75a37dabb1 Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 21:49:08 -0400
Subject: [PATCH 8065/8469] docs: reference PEP440 for versions specifiers

---
 docs/userguide/dependency_management.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index 1c9cf6380d..8bca4fd7be 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -7,8 +7,9 @@ There are three types of dependency styles offered by setuptools:
 dependency.
 
 .. Note::
-    For all the packages you intend to add to dependency, you can optionally
-    specify the version following :ref:`reference on version specifyer <WIP>`
+    Packages that are added to dependency can be optionally specified with the
+    version by following `PEP 440 <https://www.python.org/dev/peps/pep-0440/>`_
+
 
 .. contents::
 

From bd3d57dfe66bade541faf5573c14669f311a6e5c Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 21:51:21 -0400
Subject: [PATCH 8066/8469] docs: give python requirement a dedicated section

---
 docs/userguide/dependency_management.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index 8bca4fd7be..97d3b662e4 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -40,14 +40,6 @@ other two types of dependency keyword, this one is specified in your
     deprecated practice (WIP)`
 
 
-Python requirement
-------------------
-In some cases, you might need to specify the minimum required python version.
-This is handled with the ``python_requires`` keyword supplied to ``setup.cfg``
-or ``setup.py``.
-
-Example WIP
-
 
 Declaring required dependency
 =============================
@@ -313,3 +305,12 @@ not need to change, but the right packages will still be installed if needed.
     support a feature, it should keep an empty requirements list for that feature
     in its ``extras_require`` argument, so that packages depending on that feature
     don't break (due to an invalid feature name).
+
+
+Python requirement
+==================
+In some cases, you might need to specify the minimum required python version.
+This is handled with the ``python_requires`` keyword supplied to ``setup.cfg``
+or ``setup.py``.
+
+Example WIP
\ No newline at end of file

From e716c1821969d07c8b629b15e1b0782a247b6b57 Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 21:54:31 -0400
Subject: [PATCH 8067/8469] docs: remove mentioning of multiversion install

---
 docs/userguide/dependency_management.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index 97d3b662e4..b2be4177aa 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -70,9 +70,7 @@ finess to it, let's start with a simple example.
 When your project is installed (e.g. using pip), all of the dependencies not
 already installed will be located (via PyPI), downloaded, built (if necessary),
 and installed and 2) Any scripts in your project will be installed with wrappers
-that verify the availability of the specified dependencies at runtime, and
-ensure that the correct versions are added to ``sys.path`` (e.g. if multiple
-versions have been installed).
+that verify the availability of the specified dependencies at runtime.
 
 .. note::
     if you declare your dependencies in ``setup.py``, you do

From 5df7ee405dc7455b842daa82989d199689d8650e Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 21:56:08 -0400
Subject: [PATCH 8068/8469] docs: remove note on "require" functionality

---
 docs/userguide/dependency_management.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index b2be4177aa..50f061c9ab 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -71,12 +71,6 @@ When your project is installed (e.g. using pip), all of the dependencies not
 already installed will be located (via PyPI), downloaded, built (if necessary),
 and installed and 2) Any scripts in your project will be installed with wrappers
 that verify the availability of the specified dependencies at runtime.
-
-.. note::
-    if you declare your dependencies in ``setup.py``, you do
-    *not* need to use the ``require()`` function in your scripts or modules, as
-    long as you either install the project or use ``setup.py develop`` to do
-    development work on it.
     
 
 Platform specific dependencies

From dee83be182df63d05f4a1d52639c61f34b64234f Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 29 Jul 2020 22:08:52 -0400
Subject: [PATCH 8069/8469] docs: rephrased the introduction for optional
 dependencies

note the use case for tests and docs functions and that "test_require" is deprecated, shorten description of the example
---
 docs/userguide/dependency_management.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.txt
index 50f061c9ab..a26ab6c3b0 100644
--- a/docs/userguide/dependency_management.txt
+++ b/docs/userguide/dependency_management.txt
@@ -199,12 +199,16 @@ distributions, if the package's dependencies aren't already installed:
 Optional dependencies
 =====================
 Setuptools allows you to declare dependencies that only get installed under
-specific circumstances. For example, let's say that Project-A offers optional
-PDF support and requires some additional package for it to work. Such a
-dependency will be specified with ``extras_require`` keyword and they are only
-installed if another package depends on it (either directly or indirectly).
+specific circumstances. These dependencies are specified with ``extras_require``
+keyword and are only installed if another package depends on it (either
+directly or indirectly) This makes it convenient to declare dependencies for 
+ancillary functions such as "tests" and "docs".
 
-Let's first see how to specify such package:
+.. note::
+    ``tests_require`` is now deprecated
+
+For example, Package-A offers optional PDF support and requires two other
+dependencies for it to work:
 
 .. code-block:: ini
 

From 6af765910c71ead64b0093ac51db7592d1ad238c Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Sat, 1 Aug 2020 12:20:35 +1000
Subject: [PATCH 8070/8469] Fixed typo

---
 setuptools/monkey.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 3c77f8cf27..e5f1377b54 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -138,7 +138,7 @@ def patch_for_msvc_specialized_compiler():
     msvc = import_module('setuptools.msvc')
 
     if platform.system() != 'Windows':
-        # Compilers only availables on Microsoft Windows
+        # Compilers only available on Microsoft Windows
         return
 
     def patch_params(mod_name, func_name):

From 1215561b96389403cbbd55889e54b67db873ddcb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:32:13 -0400
Subject: [PATCH 8071/8469] Suppress ImportError for winreg as the module is
 only available on some platforms. Allows unit testing of module on
 non-Windows platforms.

---
 distutils/_msvccompiler.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/distutils/_msvccompiler.py b/distutils/_msvccompiler.py
index 0e98692e31..ef0f0b5696 100644
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
@@ -15,7 +15,9 @@
 
 import os
 import subprocess
-import winreg
+import contextlib
+with contextlib.suppress(ImportError):
+    import winreg
 
 from distutils.errors import DistutilsExecError, DistutilsPlatformError, \
                              CompileError, LibError, LinkError

From 7f233974b0e3dc3692c820a2c8c3439c4d15fc70 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:32:51 -0400
Subject: [PATCH 8072/8469] Add a unit test for testing spawn. Ref
 pypa/distutils#5.

---
 distutils/tests/test_msvccompiler.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/distutils/tests/test_msvccompiler.py b/distutils/tests/test_msvccompiler.py
index b518d6a78b..f4bb5162fb 100644
--- a/distutils/tests/test_msvccompiler.py
+++ b/distutils/tests/test_msvccompiler.py
@@ -2,6 +2,7 @@
 import sys
 import unittest
 import os
+import threading
 
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
@@ -74,6 +75,28 @@ def test_get_vc2015(self):
         else:
             raise unittest.SkipTest("VS 2015 is not installed")
 
+
+class TestSpawn(unittest.TestCase):
+    def test_concurrent_safe(self):
+        """
+        Concurrent calls to spawn should have consistent results.
+        """
+        import distutils._msvccompiler as _msvccompiler
+        compiler = _msvccompiler.MSVCCompiler()
+        compiler._paths = "expected"
+        inner_cmd = 'import os; assert os.environ["PATH"] == "expected"'
+        command = ['python', '-c', inner_cmd]
+
+        threads = [
+            threading.Thread(target=compiler.spawn, args=[command])
+            for n in range(100)
+        ]
+        for thread in threads:
+            thread.start()
+        for thread in threads:
+            thread.join()
+
+
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)
 

From 39b30e15365756ae685e02b5af38799a677858af Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:35:12 -0400
Subject: [PATCH 8073/8469] In TestSpawn.test_concurrent_safe, use CheckThread
 to ensure that the spawn call does not simply fail to execute. Ref
 pypa/setuptools#2257.

---
 distutils/tests/test_msvccompiler.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/distutils/tests/test_msvccompiler.py b/distutils/tests/test_msvccompiler.py
index f4bb5162fb..88d912b17b 100644
--- a/distutils/tests/test_msvccompiler.py
+++ b/distutils/tests/test_msvccompiler.py
@@ -76,6 +76,19 @@ def test_get_vc2015(self):
             raise unittest.SkipTest("VS 2015 is not installed")
 
 
+class CheckThread(threading.Thread):
+    exc_info = None
+
+    def run(self):
+        try:
+            super().run()
+        except Exception:
+            self.exc_info = sys.exc_info()
+
+    def __bool__(self):
+        return not self.exc_info
+
+
 class TestSpawn(unittest.TestCase):
     def test_concurrent_safe(self):
         """
@@ -88,13 +101,14 @@ def test_concurrent_safe(self):
         command = ['python', '-c', inner_cmd]
 
         threads = [
-            threading.Thread(target=compiler.spawn, args=[command])
+            CheckThread(target=compiler.spawn, args=[command])
             for n in range(100)
         ]
         for thread in threads:
             thread.start()
         for thread in threads:
             thread.join()
+        assert all(threads)
 
 
 def test_suite():

From 0bb6c6bc47823764649430fca34fc6475c0a42d7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:39:57 -0400
Subject: [PATCH 8074/8469] In CCompiler, allow keyword arguments to be passed
 to spawn calls. Ref pypa/setuptools#2257 and pypa/distutils#5.

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

diff --git a/distutils/ccompiler.py b/distutils/ccompiler.py
index b5ef143e72..57bb94e8bb 100644
--- a/distutils/ccompiler.py
+++ b/distutils/ccompiler.py
@@ -906,8 +906,8 @@ def warn(self, msg):
     def execute(self, func, args, msg=None, level=1):
         execute(func, args, msg, self.dry_run)
 
-    def spawn(self, cmd):
-        spawn(cmd, dry_run=self.dry_run)
+    def spawn(self, cmd, **kwargs):
+        spawn(cmd, dry_run=self.dry_run, **kwargs)
 
     def move_file(self, src, dst):
         return move_file(src, dst, dry_run=self.dry_run)

From 616e129944d87e578fe02146f07f72603a4c0124 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:41:08 -0400
Subject: [PATCH 8075/8469] In _msvccompiler.MSVCCompiler.spawn, use correct
 capitalization for PATH environment variable. Fixes failing test and fixes
 pypa/setuptools#2257.

---
 distutils/_msvccompiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distutils/_msvccompiler.py b/distutils/_msvccompiler.py
index ef0f0b5696..2d56ee0aad 100644
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
@@ -503,7 +503,7 @@ def link(self,
             log.debug("skipping %s (up-to-date)", output_filename)
 
     def spawn(self, cmd):
-        env = dict(os.environ, path=self._paths)
+        env = dict(os.environ, PATH=self._paths)
         return super().spawn(cmd, env=env)
 
     # -- Miscellaneous methods -----------------------------------------

From a83d96eca1ea6d85a366351457dd25beb1663ad4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:55:24 -0400
Subject: [PATCH 8076/8469] Add changelog. Ref #2257.

---
 changelog.d/2257.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2257.misc.rst

diff --git a/changelog.d/2257.misc.rst b/changelog.d/2257.misc.rst
new file mode 100644
index 0000000000..509b372e0d
--- /dev/null
+++ b/changelog.d/2257.misc.rst
@@ -0,0 +1 @@
+Fixed two flaws in distutils._msvccompiler.MSVCCompiler.spawn.

From d3e754feba46b69bf948009d895303a74d2a41bd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 2 Aug 2020 09:57:20 -0400
Subject: [PATCH 8077/8469] =?UTF-8?q?Bump=20version:=2049.2.0=20=E2=86=92?=
 =?UTF-8?q?=2049.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2257.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2257.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9b3e408589..b534af1bc1 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.2.0
+current_version = 49.2.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 82e6ef66d3..519330ebe9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.2.1
+-------
+
+* #2257: Fixed two flaws in distutils._msvccompiler.MSVCCompiler.spawn.
+
+
 v49.2.0
 -------
 
diff --git a/changelog.d/2257.misc.rst b/changelog.d/2257.misc.rst
deleted file mode 100644
index 509b372e0d..0000000000
--- a/changelog.d/2257.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed two flaws in distutils._msvccompiler.MSVCCompiler.spawn.
diff --git a/setup.cfg b/setup.cfg
index fa0e565646..485714a3b6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.2.0
+version = 49.2.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 44ca8aa51c39bea0c68444389d6ec215bcf98d02 Mon Sep 17 00:00:00 2001
From: Athos Ribeiro <athoscr@fedoraproject.org>
Date: Tue, 4 Aug 2020 10:31:11 +0200
Subject: [PATCH 8078/8469] Improve safe_version documentation

---
 changelog.d/2300.doc.rst |  1 +
 docs/pkg_resources.txt   | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/2300.doc.rst

diff --git a/changelog.d/2300.doc.rst b/changelog.d/2300.doc.rst
new file mode 100644
index 0000000000..3b06cc5f11
--- /dev/null
+++ b/changelog.d/2300.doc.rst
@@ -0,0 +1 @@
+Improve the ``safe_version`` function documentation
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt
index f2e554f42c..7d0d8da92a 100644
--- a/docs/pkg_resources.txt
+++ b/docs/pkg_resources.txt
@@ -1596,12 +1596,12 @@ Parsing Utilities
     See ``to_filename()``.
 
 ``safe_version(version)``
-    This will return the normalized form of any PEP 440 version, if the version
-    string is not PEP 440 compatible than it is similar to ``safe_name()``
-    except that spaces in the input become dots, and dots are allowed to exist
-    in the output.  As with ``safe_name()``, if you are generating a filename
-    from this you should replace any "-" characters in the output with
-    underscores.
+    This will return the normalized form of any PEP 440 version. If the version
+    string is not PEP 440 compatible, this function behaves similar to
+    ``safe_name()`` except that spaces in the input become dots, and dots are
+    allowed to exist in the output.  As with ``safe_name()``, if you are
+    generating a filename from this you should replace any "-" characters in
+    the output with underscores.
 
 ``safe_extra(extra)``
     Return a "safe" form of an extra's name, suitable for use in a requirement

From 8db806d30d7591828528ac937e8f3b334e957ed3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 26 Jul 2020 20:19:45 -0400
Subject: [PATCH 8079/8469] remove shim should by symmetric to add_shim

---
 _distutils_hack/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index a8638344f0..a10af2cc94 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -91,6 +91,6 @@ def add_shim():
 
 def remove_shim():
     try:
-        sys.path.remove(DISTUTILS_FINDER)
+        sys.meta_path.remove(DISTUTILS_FINDER)
     except ValueError:
         pass

From ebfe95fcbb12c22f58b045c6f10bd899a21a53d8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 5 Aug 2020 21:49:08 -0400
Subject: [PATCH 8080/8469] Update changelog.

---
 changelog.d/2259.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2259.change.rst

diff --git a/changelog.d/2259.change.rst b/changelog.d/2259.change.rst
new file mode 100644
index 0000000000..43701ec23b
--- /dev/null
+++ b/changelog.d/2259.change.rst
@@ -0,0 +1 @@
+Setuptools now provides a .pth file (except for editable installs of setuptools) to the target environment to ensure that when enabled, the setuptools-provided distutils is preferred before setuptools has been imported (and even if setuptools is never imported). Honors the SETUPTOOLS_USE_DISTUTILS environment variable.

From fe79e6ca8ef48edb3ee2ea42b3021aa7de963a49 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 6 Aug 2020 08:51:10 +0100
Subject: [PATCH 8081/8469] Don't install setup_requires when run as a PEP-517
 backend.

Under PEP-517, installing build dependencies is up to the frontend.

Closes gh-2303
---
 setuptools/build_meta.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 46266814ad..49b4cc2835 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -75,6 +75,22 @@ def patch(cls):
             distutils.core.Distribution = orig
 
 
+@contextlib.contextmanager
+def no_install_setup_requires():
+    """Temporarily disable installing setup_requires
+
+    Under PEP 517, the backend reports build dependencies to the frontend,
+    and the frontend is responsible for ensuring they're installed.
+    So setuptools (acting as a backend) should not try to install them.
+    """
+    orig = setuptools._install_setup_requires
+    setuptools._install_setup_requires = lambda attrs: None
+    try:
+        yield
+    finally:
+        setuptools._install_setup_requires = orig
+
+
 def _to_str(s):
     """
     Convert a filename to a string (on Python 2, explicitly
@@ -139,7 +155,8 @@ def run_setup(self, setup_script='setup.py'):
         with _open_setup_script(__file__) as f:
             code = f.read().replace(r'\r\n', r'\n')
 
-        exec(compile(code, __file__, 'exec'), locals())
+        with no_install_setup_requires():
+            exec(compile(code, __file__, 'exec'), locals())
 
     def get_requires_for_build_wheel(self, config_settings=None):
         config_settings = self._fix_config(config_settings)

From 21c81324f9e37aee92301f64b95947accfafbaa4 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 6 Aug 2020 10:10:13 +0100
Subject: [PATCH 8082/8469] get_requires_for_build* hooks rely on 'installing'
 setup_requires

---
 setuptools/build_meta.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 49b4cc2835..371321879a 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -155,8 +155,7 @@ def run_setup(self, setup_script='setup.py'):
         with _open_setup_script(__file__) as f:
             code = f.read().replace(r'\r\n', r'\n')
 
-        with no_install_setup_requires():
-            exec(compile(code, __file__, 'exec'), locals())
+        exec(compile(code, __file__, 'exec'), locals())
 
     def get_requires_for_build_wheel(self, config_settings=None):
         config_settings = self._fix_config(config_settings)
@@ -171,7 +170,8 @@ def prepare_metadata_for_build_wheel(self, metadata_directory,
                                          config_settings=None):
         sys.argv = sys.argv[:1] + ['dist_info', '--egg-base',
                                    _to_str(metadata_directory)]
-        self.run_setup()
+        with no_install_setup_requires():
+            self.run_setup()
 
         dist_info_directory = metadata_directory
         while True:
@@ -211,7 +211,8 @@ def _build_with_temp_dir(self, setup_command, result_extension,
             sys.argv = (sys.argv[:1] + setup_command +
                         ['--dist-dir', tmp_dist_dir] +
                         config_settings["--global-option"])
-            self.run_setup()
+            with no_install_setup_requires():
+                self.run_setup()
 
             result_basename = _file_with_extension(
                 tmp_dist_dir, result_extension)

From 8a4b06dbdde7fb3249329b5311f5b5707510fa88 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 6 Aug 2020 10:13:21 +0100
Subject: [PATCH 8083/8469] Add test for PEP 517 backends not installing
 setup_requires

---
 setuptools/tests/test_build_meta.py | 32 ++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 8fcf3055ff..f1860b69e6 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -380,7 +380,7 @@ def test_setup_requires(self, setup_literal, requirements, use_wheel,
                 setup(
                     name="qux",
                     version="0.0.0",
-                    py_modules=["hello.py"],
+                    py_modules=["hello"],
                     setup_requires={setup_literal},
                 )
             """).format(setup_literal=setup_literal),
@@ -407,6 +407,36 @@ def run():
 
         assert expected == sorted(actual)
 
+    def test_dont_install_setup_requires(self, tmpdir_cwd):
+        files = {
+            'setup.py': DALS("""
+                        from setuptools import setup
+
+                        setup(
+                            name="qux",
+                            version="0.0.0",
+                            py_modules=["hello"],
+                            setup_requires=["does-not-exist >99"],
+                        )
+                    """),
+            'hello.py': DALS("""
+                    def run():
+                        print('hello')
+                    """),
+        }
+
+        build_files(files)
+
+        build_backend = self.get_build_backend()
+
+        dist_dir = os.path.abspath('pip-dist-info')
+        os.makedirs(dist_dir)
+
+        # does-not-exist can't be satisfied, so if it attempts to install
+        # setup_requires, it will fail.
+        build_backend.prepare_metadata_for_build_wheel(dist_dir)
+
+
     _sys_argv_0_passthrough = {
         'setup.py': DALS("""
             import os

From a78f42ef07c9b9db778087675ad0d84ab9548425 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 6 Aug 2020 10:16:22 +0100
Subject: [PATCH 8084/8469] Add news fragment

---
 changelog.d/2306.change.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog.d/2306.change.rst

diff --git a/changelog.d/2306.change.rst b/changelog.d/2306.change.rst
new file mode 100644
index 0000000000..1046eae3f8
--- /dev/null
+++ b/changelog.d/2306.change.rst
@@ -0,0 +1,3 @@
+When running as a PEP 517 backend, setuptools does not try to install
+``setup_requires`` itself. They are reported as build requirements for the
+frontend to install.

From d2883ac4f1d94c16a1ab279e7b1065558b67da4b Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Thu, 6 Aug 2020 10:23:51 +0100
Subject: [PATCH 8085/8469] Flake 99

---
 setuptools/tests/test_build_meta.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index f1860b69e6..fdb4b95010 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -436,7 +436,6 @@ def run():
         # setup_requires, it will fail.
         build_backend.prepare_metadata_for_build_wheel(dist_dir)
 
-
     _sys_argv_0_passthrough = {
         'setup.py': DALS("""
             import os

From 485703c854f59d226c2f231e7c5f4f91263a4463 Mon Sep 17 00:00:00 2001
From: raimon <raimon49@hotmail.com>
Date: Sat, 8 Aug 2020 20:33:27 +0900
Subject: [PATCH 8086/8469] Provide consistency in the description of setup.cfg

---
 docs/setuptools.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 7e0914b7dc..d60c87a026 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1988,11 +1988,11 @@ boilerplate code in some cases.
     include_package_data = True
     packages = find:
     scripts =
-      bin/first.py
-      bin/second.py
+        bin/first.py
+        bin/second.py
     install_requires =
-      requests
-      importlib; python_version == "2.6"
+        requests
+        importlib; python_version == "2.6"
 
     [options.package_data]
     * = *.txt, *.rst
@@ -2028,8 +2028,8 @@ Metadata and options are set in the config sections of the same name.
 
       [metadata]
       keywords =
-        one
-        two
+          one
+          two
 
 * In some cases, complex values can be provided in dedicated subsections for
   clarity.

From 7c3a3817923de67956656ea058e80669b77bed1f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 11:44:12 -0400
Subject: [PATCH 8087/8469] Add tests capturing expected distutils behavior.
 Ref #417.

---
 setuptools/tests/test_distutils_adoption.py | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 setuptools/tests/test_distutils_adoption.py

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
new file mode 100644
index 0000000000..f4c7072d5c
--- /dev/null
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -0,0 +1,37 @@
+import os
+import pytest
+
+
+@pytest.fixture
+def env(virtualenv):
+    virtualenv.run(['pip', 'uninstall', '-y', 'setuptools'])
+    virtualenv.run(['pip', 'install', os.getcwd()])
+    return virtualenv
+
+
+def find_distutils(env, imports='distutils'):
+    py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals())
+    cmd = ['python', '-c', py_cmd]
+    return env.run(cmd, capture=True, text=True)
+
+
+def test_distutils_stdlib(env):
+    """
+    Ensure stdlib distutils is used when appropriate.
+    """
+    assert '.env' not in find_distutils(env).split(os.sep)
+
+
+def test_distutils_local_with_setuptools(env):
+    """
+    Ensure local distutils is used when appropriate.
+    """
+    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
+    loc = find_distutils(env, imports='setuptools, distutils')
+    assert '.env' in loc.split(os.sep)
+
+
+@pytest.mark.xfail(reason="#2259")
+def test_distutils_local(env):
+    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
+    assert '.env' in find_distutils(env).split(os.sep)

From 6281bd0917882b930d5923d76cc72ff4ee5a7695 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 12:15:13 -0400
Subject: [PATCH 8088/8469] Support Python 3.5 and 3.6 in the tests.

---
 setuptools/tests/test_distutils_adoption.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index f4c7072d5c..a945a69fb3 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -1,7 +1,18 @@
 import os
+import sys
+import functools
+
 import pytest
 
 
+def popen_text(call):
+    """
+    Augment the Popen call with the parameters to ensure unicode text.
+    """
+    return functools.partial(call, universal_newlines=True) \
+        if sys.version_info < (3, 7) else functools.partial(call, text=True)
+
+
 @pytest.fixture
 def env(virtualenv):
     virtualenv.run(['pip', 'uninstall', '-y', 'setuptools'])
@@ -12,7 +23,7 @@ def env(virtualenv):
 def find_distutils(env, imports='distutils'):
     py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals())
     cmd = ['python', '-c', py_cmd]
-    return env.run(cmd, capture=True, text=True)
+    return popen_text(env.run)(cmd, capture=True)
 
 
 def test_distutils_stdlib(env):

From 41deeb76fc88382f27b3d37cce75eda2c54cbc2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 15:53:41 -0400
Subject: [PATCH 8089/8469] Bypass pytest-virtualenv due to bugs in 'run'
 command. Instead, use jaraco.envs.VirtualEnv and build a bespoke fixture with
 a run command.

---
 setup.cfg                                   |  1 +
 setuptools/tests/requirements.txt           |  1 +
 setuptools/tests/test_distutils_adoption.py | 48 +++++++++++++--------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 485714a3b6..87fa6bf273 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -72,6 +72,7 @@ tests =
     paver; python_version>="3.6"
     futures; python_version=="2.7"
     pip>=19.1 # For proper file:// URLs support.
+    jaraco.envs
 
 docs =
     # Keep these in sync with docs/requirements.txt
diff --git a/setuptools/tests/requirements.txt b/setuptools/tests/requirements.txt
index 19bf5aefd0..d0d07f70c0 100644
--- a/setuptools/tests/requirements.txt
+++ b/setuptools/tests/requirements.txt
@@ -10,3 +10,4 @@ pytest-cov>=2.5.1
 paver; python_version>="3.6"
 futures; python_version=="2.7"
 pip>=19.1 # For proper file:// URLs support.
+jaraco.envs
diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index a945a69fb3..476b0a9e4b 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -1,8 +1,27 @@
 import os
 import sys
 import functools
+import subprocess
 
 import pytest
+import jaraco.envs
+import path
+
+
+class VirtualEnv(jaraco.envs.VirtualEnv):
+    name = '.env'
+
+    def run(self, cmd, *args, **kwargs):
+        cmd = [self.exe(cmd[0])] + cmd[1:]
+        return subprocess.check_output(cmd, *args, cwd=self.root, **kwargs)
+
+
+@pytest.fixture
+def venv(tmpdir):
+    env = VirtualEnv()
+    env.root = path.Path(tmpdir)
+    env.req = os.getcwd()
+    return env.create()
 
 
 def popen_text(call):
@@ -13,36 +32,29 @@ def popen_text(call):
         if sys.version_info < (3, 7) else functools.partial(call, text=True)
 
 
-@pytest.fixture
-def env(virtualenv):
-    virtualenv.run(['pip', 'uninstall', '-y', 'setuptools'])
-    virtualenv.run(['pip', 'install', os.getcwd()])
-    return virtualenv
-
-
-def find_distutils(env, imports='distutils'):
+def find_distutils(venv, imports='distutils', **kwargs):
     py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals())
     cmd = ['python', '-c', py_cmd]
-    return popen_text(env.run)(cmd, capture=True)
+    return popen_text(venv.run)(cmd, **kwargs)
 
 
-def test_distutils_stdlib(env):
+def test_distutils_stdlib(venv):
     """
     Ensure stdlib distutils is used when appropriate.
     """
-    assert '.env' not in find_distutils(env).split(os.sep)
+    assert venv.name not in find_distutils(venv, env=dict()).split(os.sep)
 
 
-def test_distutils_local_with_setuptools(env):
+def test_distutils_local_with_setuptools(venv):
     """
     Ensure local distutils is used when appropriate.
     """
-    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
-    loc = find_distutils(env, imports='setuptools, distutils')
-    assert '.env' in loc.split(os.sep)
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    loc = find_distutils(venv, imports='setuptools, distutils', env=env)
+    assert venv.name in loc.split(os.sep)
 
 
 @pytest.mark.xfail(reason="#2259")
-def test_distutils_local(env):
-    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
-    assert '.env' in find_distutils(env).split(os.sep)
+def test_distutils_local(venv):
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    assert venv.name in find_distutils(venv, env=env).split(os.sep)

From 47ae38fd6f233e6423404bfebfd24d3b98fb897c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 17:01:41 -0400
Subject: [PATCH 8090/8469] On Windows, SYSTEMROOT must be supplied.

---
 setuptools/tests/test_distutils_adoption.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index 476b0a9e4b..7f28a217d6 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -2,6 +2,7 @@
 import sys
 import functools
 import subprocess
+import platform
 
 import pytest
 import jaraco.envs
@@ -32,10 +33,12 @@ def popen_text(call):
         if sys.version_info < (3, 7) else functools.partial(call, text=True)
 
 
-def find_distutils(venv, imports='distutils', **kwargs):
+def find_distutils(venv, imports='distutils', env=None, **kwargs):
     py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals())
     cmd = ['python', '-c', py_cmd]
-    return popen_text(venv.run)(cmd, **kwargs)
+    if platform.system() == 'Windows':
+        env['SYSTEMROOT'] = os.environ['SYSTEMROOT']
+    return popen_text(venv.run)(cmd, env=env, **kwargs)
 
 
 def test_distutils_stdlib(venv):

From 48a17a56ecfc77fb60780e3cfa75390f6bb10b15 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 12:22:05 -0400
Subject: [PATCH 8091/8469] As discovered in bpo-41509, relpath can strip
 spaces, so match that expectation.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 37953051b0..5d98c029c5 100755
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,7 @@ def _restore_install_lib(self):
         """
         suffix = os.path.relpath(self.install_lib, self.install_libbase)
 
-        if suffix == self._pth_contents:
+        if suffix.strip() == self._pth_contents.strip():
             self.install_lib = self.install_libbase
 
 

From 6b70fb201d6a81448de6ca6f71d7091b9a26096c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 13:38:56 -0400
Subject: [PATCH 8092/8469] Restore location of 'enabled'

---
 _distutils_hack/__init__.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index a10af2cc94..71fa7ce1b9 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -8,14 +8,6 @@
 is_pypy = '__pypy__' in sys.builtin_module_names
 
 
-def enabled():
-    """
-    Allow selection of distutils by environment variable.
-    """
-    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
-    return which == 'local'
-
-
 def warn_distutils_present():
     if 'distutils' not in sys.modules:
         return
@@ -38,6 +30,14 @@ def clear_distutils():
         del sys.modules[name]
 
 
+def enabled():
+    """
+    Allow selection of distutils by environment variable.
+    """
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
+    return which == 'local'
+
+
 def ensure_local_distutils():
     clear_distutils()
     distutils = importlib.import_module('setuptools._distutils')

From 521987da809e63ee51a63aa45dbe372d40deb8f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 19:50:24 -0400
Subject: [PATCH 8093/8469] Remove expected fail.

---
 setuptools/tests/test_distutils_adoption.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index 7f28a217d6..bb8e34d558 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -57,7 +57,10 @@ def test_distutils_local_with_setuptools(venv):
     assert venv.name in loc.split(os.sep)
 
 
-@pytest.mark.xfail(reason="#2259")
 def test_distutils_local(venv):
+    """
+    Even without importing, the setuptools-local copy of distutils is
+    preferred.
+    """
     env = dict(SETUPTOOLS_USE_DISTUTILS='local')
     assert venv.name in find_distutils(venv, env=env).split(os.sep)

From 7cf009a7e39270e1e1d13d913e0c352fb00534c0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 20:58:57 -0400
Subject: [PATCH 8094/8469] Expect test to fail on PyPy due to implicit import
 during startup.

---
 setuptools/tests/test_distutils_adoption.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index bb8e34d558..daccc473c2 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -9,6 +9,9 @@
 import path
 
 
+IS_PYPY = '__pypy__' in sys.builtin_module_names
+
+
 class VirtualEnv(jaraco.envs.VirtualEnv):
     name = '.env'
 
@@ -57,6 +60,7 @@ def test_distutils_local_with_setuptools(venv):
     assert venv.name in loc.split(os.sep)
 
 
+@pytest.mark.xfail('IS_PYPY', reason='pypy imports distutils on startup')
 def test_distutils_local(venv):
     """
     Even without importing, the setuptools-local copy of distutils is

From 9d7b246c0f40fabb25741a023849bf14919e408d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 9 Aug 2020 14:50:22 -0400
Subject: [PATCH 8095/8469] =?UTF-8?q?Bump=20version:=2049.2.1=20=E2=86=92?=
 =?UTF-8?q?=2049.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2259.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2259.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b534af1bc1..99e5def842 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.2.1
+current_version = 49.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 519330ebe9..da0eada3f2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.3.0
+-------
+
+* #2259: Setuptools now provides a .pth file (except for editable installs of setuptools) to the target environment to ensure that when enabled, the setuptools-provided distutils is preferred before setuptools has been imported (and even if setuptools is never imported). Honors the SETUPTOOLS_USE_DISTUTILS environment variable.
+
+
 v49.2.1
 -------
 
diff --git a/changelog.d/2259.change.rst b/changelog.d/2259.change.rst
deleted file mode 100644
index 43701ec23b..0000000000
--- a/changelog.d/2259.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools now provides a .pth file (except for editable installs of setuptools) to the target environment to ensure that when enabled, the setuptools-provided distutils is preferred before setuptools has been imported (and even if setuptools is never imported). Honors the SETUPTOOLS_USE_DISTUTILS environment variable.
diff --git a/setup.cfg b/setup.cfg
index 87fa6bf273..fd3b11e6c6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.2.1
+version = 49.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 33c9d86af4dc1df04cf1b38a0102fe7e121173ec Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 10 Aug 2020 21:10:46 +1000
Subject: [PATCH 8096/8469] Change load_module to exec_module

---
 setuptools/command/bdist_egg.py |  7 ++++---
 setuptools/command/build_ext.py | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 7af3165cd5..4be1545789 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -55,11 +55,12 @@ def write_stub(resource, pyfile):
     _stub_template = textwrap.dedent("""
         def __bootstrap__():
             global __bootstrap__, __loader__, __file__
-            import sys, pkg_resources
-            from importlib.machinery import ExtensionFileLoader
+            import sys, pkg_resources, importlib.util
             __file__ = pkg_resources.resource_filename(__name__, %r)
             __loader__ = None; del __bootstrap__, __loader__
-            ExtensionFileLoader(__name__,__file__).load_module()
+            spec = importlib.util.spec_from_file_location(__name__,__file__)
+            mod = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(mod)
         __bootstrap__()
         """).lstrip()
     with open(pyfile, 'w') as f:
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 0eb29adc8b..89a0e328f9 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -254,8 +254,8 @@ def write_stub(self, output_dir, ext, compile=False):
                 '\n'.join([
                     "def __bootstrap__():",
                     "   global __bootstrap__, __file__, __loader__",
-                    "   import sys, os, pkg_resources" + if_dl(", dl"),
-                    "   from importlib.machinery import ExtensionFileLoader",
+                    "   import sys, os, pkg_resources, importlib.util" +
+                    if_dl(", dl"),
                     "   __file__ = pkg_resources.resource_filename"
                     "(__name__,%r)"
                     % os.path.basename(ext._file_name),
@@ -267,8 +267,10 @@ def write_stub(self, output_dir, ext, compile=False):
                     "   try:",
                     "     os.chdir(os.path.dirname(__file__))",
                     if_dl("     sys.setdlopenflags(dl.RTLD_NOW)"),
-                    "     ExtensionFileLoader(__name__,",
-                    "                         __file__).load_module()",
+                    "     spec = importlib.util.spec_from_file_location(",
+                    "                __name__, __file__)",
+                    "     mod = importlib.util.module_from_spec(spec)",
+                    "     spec.loader.exec_module(mod)",
                     "   finally:",
                     if_dl("     sys.setdlopenflags(old_flags)"),
                     "     os.chdir(old_dir)",

From 1410a8e6fda5fb8cd78f915e1ffd68f6c7f35af3 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 10 Aug 2020 09:18:46 -0400
Subject: [PATCH 8097/8469] Fix issue with distutils warning

---
 _distutils_hack/__init__.py | 11 +++++++----
 changelog.d/2316.change.rst |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/2316.change.rst

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 71fa7ce1b9..1e7b294bc2 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -16,9 +16,12 @@ def warn_distutils_present():
         # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250
         return
     warnings.warn(
-        "Distutils was imported before Setuptools. This usage is discouraged "
-        "and may exhibit undesirable behaviors or errors. Please use "
-        "Setuptools' objects directly or at least import Setuptools first.")
+        "Distutils was imported before Setuptools, but importing Setuptools "
+        "also replaces the `distutils` module in `sys.modules`. This may lead "
+        "to undesirable behaviors or errors. To avoid these issues, avoid "
+        "using distutils directly, ensure that setuptools is installed in the "
+        "traditional way (e.g. not an editable install), and/or make sure that "
+        "setuptools is always imported before distutils.")
 
 
 def clear_distutils():
@@ -56,8 +59,8 @@ def do_override():
     See https://github.com/pypa/setuptools/issues/417#issuecomment-392298401
     for more motivation.
     """
-    warn_distutils_present()
     if enabled():
+        warn_distutils_present()
         ensure_local_distutils()
 
 
diff --git a/changelog.d/2316.change.rst b/changelog.d/2316.change.rst
new file mode 100644
index 0000000000..7d506b093f
--- /dev/null
+++ b/changelog.d/2316.change.rst
@@ -0,0 +1 @@
+Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.

From 0b111ad040887a39e4821ebe5198d4246af0253c Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 10 Aug 2020 11:02:31 -0400
Subject: [PATCH 8098/8469] =?UTF-8?q?Bump=20version:=2049.3.0=20=E2=86=92?=
 =?UTF-8?q?=2049.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2316.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2316.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 99e5def842..bb1e621f16 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.3.0
+current_version = 49.3.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index da0eada3f2..df0230e75f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+vv49.3.1
+--------
+
+* #2316: Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.
+
+
 v49.3.0
 -------
 
diff --git a/changelog.d/2316.change.rst b/changelog.d/2316.change.rst
deleted file mode 100644
index 7d506b093f..0000000000
--- a/changelog.d/2316.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.
diff --git a/setup.cfg b/setup.cfg
index fd3b11e6c6..52440198d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.3.0
+version = 49.3.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 5ad59e64b35b9444a42a75f9d454802f0916e209 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Mon, 10 Aug 2020 11:45:22 -0400
Subject: [PATCH 8099/8469] Remove superfluous 'v' in CHANGES.rst

This was an artifact of the fact that I did not use `tox -e finalize`
to do the latest release in order to make a patch release.
---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index df0230e75f..b7c0a018ad 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-vv49.3.1
+v49.3.1
 --------
 
 * #2316: Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.

From 3af54b4b0e31c3f56bbb229cdba58ce8a70fa38b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 12 Aug 2020 16:22:34 -0400
Subject: [PATCH 8100/8469] Update changelog.

---
 changelog.d/2297.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2297.misc.rst

diff --git a/changelog.d/2297.misc.rst b/changelog.d/2297.misc.rst
new file mode 100644
index 0000000000..40340324fb
--- /dev/null
+++ b/changelog.d/2297.misc.rst
@@ -0,0 +1 @@
+Once again, in stubs prefer exec_module to the deprecated load_module.

From ff4ba978e5c32c44311d9d9817ddee9e1c6c972b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 12 Aug 2020 17:01:10 -0400
Subject: [PATCH 8101/8469] =?UTF-8?q?Bump=20version:=2049.3.1=20=E2=86=92?=
 =?UTF-8?q?=2049.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 7 +++++++
 changelog.d/2297.misc.rst | 1 -
 changelog.d/2300.doc.rst  | 1 -
 setup.cfg                 | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/2297.misc.rst
 delete mode 100644 changelog.d/2300.doc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index bb1e621f16..5e0d7fd7a6 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.3.1
+current_version = 49.3.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index b7c0a018ad..2add741a5e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v49.3.2
+-------
+
+* #2300: Improve the ``safe_version`` function documentation
+* #2297: Once again, in stubs prefer exec_module to the deprecated load_module.
+
+
 v49.3.1
 --------
 
diff --git a/changelog.d/2297.misc.rst b/changelog.d/2297.misc.rst
deleted file mode 100644
index 40340324fb..0000000000
--- a/changelog.d/2297.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Once again, in stubs prefer exec_module to the deprecated load_module.
diff --git a/changelog.d/2300.doc.rst b/changelog.d/2300.doc.rst
deleted file mode 100644
index 3b06cc5f11..0000000000
--- a/changelog.d/2300.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve the ``safe_version`` function documentation
diff --git a/setup.cfg b/setup.cfg
index 52440198d2..5d4a084cdf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.3.1
+version = 49.3.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From fac13f0d9950b7c06de650bf4ea226cb2789afc3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 12 Aug 2020 17:01:55 -0400
Subject: [PATCH 8102/8469] Clean up RST.

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2add741a5e..0d2c96c39b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,7 +6,7 @@ v49.3.2
 
 
 v49.3.1
---------
+-------
 
 * #2316: Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.
 

From 1b27726f6b5922658a5968aa0b7a92fb76bc0ade Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 12 Aug 2020 19:57:03 -0400
Subject: [PATCH 8103/8469] Update packaging to 20.4. Closes #2310.

---
 pkg_resources/_vendor/packaging/__about__.py  |   4 +-
 pkg_resources/_vendor/packaging/_compat.py    |   9 +-
 .../_vendor/packaging/_structures.py          |  26 +-
 pkg_resources/_vendor/packaging/_typing.py    |  48 ++
 pkg_resources/_vendor/packaging/markers.py    |  54 +-
 pkg_resources/_vendor/packaging/py.typed      |   0
 .../_vendor/packaging/requirements.py         |   9 +-
 pkg_resources/_vendor/packaging/specifiers.py | 190 ++++--
 pkg_resources/_vendor/packaging/tags.py       | 569 ++++++++++++++----
 pkg_resources/_vendor/packaging/utils.py      |  18 +-
 pkg_resources/_vendor/packaging/version.py    | 151 ++++-
 pkg_resources/_vendor/vendored.txt            |   2 +-
 setuptools/_vendor/packaging/__about__.py     |   4 +-
 setuptools/_vendor/packaging/_compat.py       |   9 +-
 setuptools/_vendor/packaging/_structures.py   |  26 +-
 setuptools/_vendor/packaging/_typing.py       |  48 ++
 setuptools/_vendor/packaging/markers.py       |  54 +-
 setuptools/_vendor/packaging/py.typed         |   0
 setuptools/_vendor/packaging/requirements.py  |   9 +-
 setuptools/_vendor/packaging/specifiers.py    | 190 ++++--
 setuptools/_vendor/packaging/tags.py          | 569 ++++++++++++++----
 setuptools/_vendor/packaging/utils.py         |  18 +-
 setuptools/_vendor/packaging/version.py       | 151 ++++-
 setuptools/_vendor/vendored.txt               |   2 +-
 24 files changed, 1776 insertions(+), 384 deletions(-)
 create mode 100644 pkg_resources/_vendor/packaging/_typing.py
 create mode 100644 pkg_resources/_vendor/packaging/py.typed
 create mode 100644 setuptools/_vendor/packaging/_typing.py
 create mode 100644 setuptools/_vendor/packaging/py.typed

diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index dc95138d04..4d998578d7 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -18,10 +18,10 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "19.2"
+__version__ = "20.4"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
-__license__ = "BSD or Apache License, Version 2.0"
+__license__ = "BSD-2-Clause or Apache-2.0"
 __copyright__ = "Copyright 2014-2019 %s" % __author__
diff --git a/pkg_resources/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py
index 25da473c19..e54bd4ede8 100644
--- a/pkg_resources/_vendor/packaging/_compat.py
+++ b/pkg_resources/_vendor/packaging/_compat.py
@@ -5,6 +5,11 @@
 
 import sys
 
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Dict, Tuple, Type
+
 
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
@@ -18,14 +23,16 @@
 
 
 def with_metaclass(meta, *bases):
+    # type: (Type[Any], Tuple[Type[Any], ...]) -> Any
     """
     Create a base class with a metaclass.
     """
     # This requires a bit of explanation: the basic idea is to make a dummy
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
-    class metaclass(meta):
+    class metaclass(meta):  # type: ignore
         def __new__(cls, name, this_bases, d):
+            # type: (Type[Any], str, Tuple[Any], Dict[Any, Any]) -> Any
             return meta(name, bases, d)
 
     return type.__new__(metaclass, "temporary_class", (), {})
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
index 68dcca634d..800d5c5588 100644
--- a/pkg_resources/_vendor/packaging/_structures.py
+++ b/pkg_resources/_vendor/packaging/_structures.py
@@ -4,65 +4,83 @@
 from __future__ import absolute_import, division, print_function
 
 
-class Infinity(object):
+class InfinityType(object):
     def __repr__(self):
+        # type: () -> str
         return "Infinity"
 
     def __hash__(self):
+        # type: () -> int
         return hash(repr(self))
 
     def __lt__(self, other):
+        # type: (object) -> bool
         return False
 
     def __le__(self, other):
+        # type: (object) -> bool
         return False
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return isinstance(other, self.__class__)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return not isinstance(other, self.__class__)
 
     def __gt__(self, other):
+        # type: (object) -> bool
         return True
 
     def __ge__(self, other):
+        # type: (object) -> bool
         return True
 
     def __neg__(self):
+        # type: (object) -> NegativeInfinityType
         return NegativeInfinity
 
 
-Infinity = Infinity()
+Infinity = InfinityType()
 
 
-class NegativeInfinity(object):
+class NegativeInfinityType(object):
     def __repr__(self):
+        # type: () -> str
         return "-Infinity"
 
     def __hash__(self):
+        # type: () -> int
         return hash(repr(self))
 
     def __lt__(self, other):
+        # type: (object) -> bool
         return True
 
     def __le__(self, other):
+        # type: (object) -> bool
         return True
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return isinstance(other, self.__class__)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return not isinstance(other, self.__class__)
 
     def __gt__(self, other):
+        # type: (object) -> bool
         return False
 
     def __ge__(self, other):
+        # type: (object) -> bool
         return False
 
     def __neg__(self):
+        # type: (object) -> InfinityType
         return Infinity
 
 
-NegativeInfinity = NegativeInfinity()
+NegativeInfinity = NegativeInfinityType()
diff --git a/pkg_resources/_vendor/packaging/_typing.py b/pkg_resources/_vendor/packaging/_typing.py
new file mode 100644
index 0000000000..77a8b9185a
--- /dev/null
+++ b/pkg_resources/_vendor/packaging/_typing.py
@@ -0,0 +1,48 @@
+"""For neatly implementing static typing in packaging.
+
+`mypy` - the static type analysis tool we use - uses the `typing` module, which
+provides core functionality fundamental to mypy's functioning.
+
+Generally, `typing` would be imported at runtime and used in that fashion -
+it acts as a no-op at runtime and does not have any run-time overhead by
+design.
+
+As it turns out, `typing` is not vendorable - it uses separate sources for
+Python 2/Python 3. Thus, this codebase can not expect it to be present.
+To work around this, mypy allows the typing import to be behind a False-y
+optional to prevent it from running at runtime and type-comments can be used
+to remove the need for the types to be accessible directly during runtime.
+
+This module provides the False-y guard in a nicely named fashion so that a
+curious maintainer can reach here to read this.
+
+In packaging, all static-typing related imports should be guarded as follows:
+
+    from packaging._typing import TYPE_CHECKING
+
+    if TYPE_CHECKING:
+        from typing import ...
+
+Ref: https://github.com/python/mypy/issues/3216
+"""
+
+__all__ = ["TYPE_CHECKING", "cast"]
+
+# The TYPE_CHECKING constant defined by the typing module is False at runtime
+# but True while type checking.
+if False:  # pragma: no cover
+    from typing import TYPE_CHECKING
+else:
+    TYPE_CHECKING = False
+
+# typing's cast syntax requires calling typing.cast at runtime, but we don't
+# want to import typing at runtime. Here, we inform the type checkers that
+# we're importing `typing.cast` as `cast` and re-implement typing.cast's
+# runtime behavior in a block that is ignored by type checkers.
+if TYPE_CHECKING:  # pragma: no cover
+    # not executed at runtime
+    from typing import cast
+else:
+    # executed at runtime
+    def cast(type_, value):  # noqa
+        return value
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index 733123fb32..fd1559c10e 100644
--- a/pkg_resources/_vendor/packaging/markers.py
+++ b/pkg_resources/_vendor/packaging/markers.py
@@ -13,8 +13,14 @@
 from pkg_resources.extern.pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
+from ._typing import TYPE_CHECKING
 from .specifiers import Specifier, InvalidSpecifier
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+
+    Operator = Callable[[str, str], bool]
+
 
 __all__ = [
     "InvalidMarker",
@@ -46,30 +52,37 @@ class UndefinedEnvironmentName(ValueError):
 
 class Node(object):
     def __init__(self, value):
+        # type: (Any) -> None
         self.value = value
 
     def __str__(self):
+        # type: () -> str
         return str(self.value)
 
     def __repr__(self):
+        # type: () -> str
         return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
 
     def serialize(self):
+        # type: () -> str
         raise NotImplementedError
 
 
 class Variable(Node):
     def serialize(self):
+        # type: () -> str
         return str(self)
 
 
 class Value(Node):
     def serialize(self):
+        # type: () -> str
         return '"{0}"'.format(self)
 
 
 class Op(Node):
     def serialize(self):
+        # type: () -> str
         return str(self)
 
 
@@ -85,13 +98,13 @@ def serialize(self):
     | L("python_version")
     | L("sys_platform")
     | L("os_name")
-    | L("os.name")
+    | L("os.name")  # PEP-345
     | L("sys.platform")  # PEP-345
     | L("platform.version")  # PEP-345
     | L("platform.machine")  # PEP-345
     | L("platform.python_implementation")  # PEP-345
-    | L("python_implementation")  # PEP-345
-    | L("extra")  # undocumented setuptools legacy
+    | L("python_implementation")  # undocumented setuptools legacy
+    | L("extra")  # PEP-508
 )
 ALIASES = {
     "os.name": "os_name",
@@ -131,6 +144,7 @@ def serialize(self):
 
 
 def _coerce_parse_result(results):
+    # type: (Union[ParseResults, List[Any]]) -> List[Any]
     if isinstance(results, ParseResults):
         return [_coerce_parse_result(i) for i in results]
     else:
@@ -138,6 +152,8 @@ def _coerce_parse_result(results):
 
 
 def _format_marker(marker, first=True):
+    # type: (Union[List[str], Tuple[Node, ...], str], Optional[bool]) -> str
+
     assert isinstance(marker, (list, tuple, string_types))
 
     # Sometimes we have a structure like [[...]] which is a single item list
@@ -172,10 +188,11 @@ def _format_marker(marker, first=True):
     "!=": operator.ne,
     ">=": operator.ge,
     ">": operator.gt,
-}
+}  # type: Dict[str, Operator]
 
 
 def _eval_op(lhs, op, rhs):
+    # type: (str, Op, str) -> bool
     try:
         spec = Specifier("".join([op.serialize(), rhs]))
     except InvalidSpecifier:
@@ -183,7 +200,7 @@ def _eval_op(lhs, op, rhs):
     else:
         return spec.contains(lhs)
 
-    oper = _operators.get(op.serialize())
+    oper = _operators.get(op.serialize())  # type: Optional[Operator]
     if oper is None:
         raise UndefinedComparison(
             "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
@@ -192,13 +209,18 @@ def _eval_op(lhs, op, rhs):
     return oper(lhs, rhs)
 
 
-_undefined = object()
+class Undefined(object):
+    pass
+
+
+_undefined = Undefined()
 
 
 def _get_env(environment, name):
-    value = environment.get(name, _undefined)
+    # type: (Dict[str, str], str) -> str
+    value = environment.get(name, _undefined)  # type: Union[str, Undefined]
 
-    if value is _undefined:
+    if isinstance(value, Undefined):
         raise UndefinedEnvironmentName(
             "{0!r} does not exist in evaluation environment.".format(name)
         )
@@ -207,7 +229,8 @@ def _get_env(environment, name):
 
 
 def _evaluate_markers(markers, environment):
-    groups = [[]]
+    # type: (List[Any], Dict[str, str]) -> bool
+    groups = [[]]  # type: List[List[bool]]
 
     for marker in markers:
         assert isinstance(marker, (list, tuple, string_types))
@@ -234,6 +257,7 @@ def _evaluate_markers(markers, environment):
 
 
 def format_full_version(info):
+    # type: (sys._version_info) -> str
     version = "{0.major}.{0.minor}.{0.micro}".format(info)
     kind = info.releaselevel
     if kind != "final":
@@ -242,9 +266,13 @@ def format_full_version(info):
 
 
 def default_environment():
+    # type: () -> Dict[str, str]
     if hasattr(sys, "implementation"):
-        iver = format_full_version(sys.implementation.version)
-        implementation_name = sys.implementation.name
+        # Ignoring the `sys.implementation` reference for type checking due to
+        # mypy not liking that the attribute doesn't exist in Python 2.7 when
+        # run with the `--py27` flag.
+        iver = format_full_version(sys.implementation.version)  # type: ignore
+        implementation_name = sys.implementation.name  # type: ignore
     else:
         iver = "0"
         implementation_name = ""
@@ -266,6 +294,7 @@ def default_environment():
 
 class Marker(object):
     def __init__(self, marker):
+        # type: (str) -> None
         try:
             self._markers = _coerce_parse_result(MARKER.parseString(marker))
         except ParseException as e:
@@ -275,12 +304,15 @@ def __init__(self, marker):
             raise InvalidMarker(err_str)
 
     def __str__(self):
+        # type: () -> str
         return _format_marker(self._markers)
 
     def __repr__(self):
+        # type: () -> str
         return "<Marker({0!r})>".format(str(self))
 
     def evaluate(self, environment=None):
+        # type: (Optional[Dict[str, str]]) -> bool
         """Evaluate a marker.
 
         Return the boolean from evaluating the given marker against the
diff --git a/pkg_resources/_vendor/packaging/py.typed b/pkg_resources/_vendor/packaging/py.typed
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index c3424dcb64..8282a63259 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -11,9 +11,13 @@
 from pkg_resources.extern.pyparsing import Literal as L  # noqa
 from pkg_resources.extern.six.moves.urllib import parse as urlparse
 
+from ._typing import TYPE_CHECKING
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import List
+
 
 class InvalidRequirement(ValueError):
     """
@@ -89,6 +93,7 @@ class Requirement(object):
     # TODO: Can we normalize the name and extra name?
 
     def __init__(self, requirement_string):
+        # type: (str) -> None
         try:
             req = REQUIREMENT.parseString(requirement_string)
         except ParseException as e:
@@ -116,7 +121,8 @@ def __init__(self, requirement_string):
         self.marker = req.marker if req.marker else None
 
     def __str__(self):
-        parts = [self.name]
+        # type: () -> str
+        parts = [self.name]  # type: List[str]
 
         if self.extras:
             parts.append("[{0}]".format(",".join(sorted(self.extras))))
@@ -135,4 +141,5 @@ def __str__(self):
         return "".join(parts)
 
     def __repr__(self):
+        # type: () -> str
         return "<Requirement({0!r})>".format(str(self))
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index 743576a080..fe09bb1dbb 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -9,8 +9,27 @@
 import re
 
 from ._compat import string_types, with_metaclass
+from ._typing import TYPE_CHECKING
+from .utils import canonicalize_version
 from .version import Version, LegacyVersion, parse
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import (
+        List,
+        Dict,
+        Union,
+        Iterable,
+        Iterator,
+        Optional,
+        Callable,
+        Tuple,
+        FrozenSet,
+    )
+
+    ParsedVersion = Union[Version, LegacyVersion]
+    UnparsedVersion = Union[Version, LegacyVersion, str]
+    CallableOperator = Callable[[ParsedVersion, str], bool]
+
 
 class InvalidSpecifier(ValueError):
     """
@@ -18,9 +37,10 @@ class InvalidSpecifier(ValueError):
     """
 
 
-class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):  # type: ignore
     @abc.abstractmethod
     def __str__(self):
+        # type: () -> str
         """
         Returns the str representation of this Specifier like object. This
         should be representative of the Specifier itself.
@@ -28,12 +48,14 @@ def __str__(self):
 
     @abc.abstractmethod
     def __hash__(self):
+        # type: () -> int
         """
         Returns a hash value for this Specifier like object.
         """
 
     @abc.abstractmethod
     def __eq__(self, other):
+        # type: (object) -> bool
         """
         Returns a boolean representing whether or not the two Specifier like
         objects are equal.
@@ -41,6 +63,7 @@ def __eq__(self, other):
 
     @abc.abstractmethod
     def __ne__(self, other):
+        # type: (object) -> bool
         """
         Returns a boolean representing whether or not the two Specifier like
         objects are not equal.
@@ -48,6 +71,7 @@ def __ne__(self, other):
 
     @abc.abstractproperty
     def prereleases(self):
+        # type: () -> Optional[bool]
         """
         Returns whether or not pre-releases as a whole are allowed by this
         specifier.
@@ -55,6 +79,7 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         """
         Sets whether or not pre-releases as a whole are allowed by this
         specifier.
@@ -62,12 +87,14 @@ def prereleases(self, value):
 
     @abc.abstractmethod
     def contains(self, item, prereleases=None):
+        # type: (str, Optional[bool]) -> bool
         """
         Determines if the given item is contained within this specifier.
         """
 
     @abc.abstractmethod
     def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
         """
         Takes an iterable of items and filters them so that only items which
         are contained within this specifier are allowed in it.
@@ -76,19 +103,24 @@ def filter(self, iterable, prereleases=None):
 
 class _IndividualSpecifier(BaseSpecifier):
 
-    _operators = {}
+    _operators = {}  # type: Dict[str, str]
 
     def __init__(self, spec="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
         match = self._regex.search(spec)
         if not match:
             raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
 
-        self._spec = (match.group("operator").strip(), match.group("version").strip())
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )  # type: Tuple[str, str]
 
         # Store whether or not this Specifier should accept prereleases
         self._prereleases = prereleases
 
     def __repr__(self):
+        # type: () -> str
         pre = (
             ", prereleases={0!r}".format(self.prereleases)
             if self._prereleases is not None
@@ -98,26 +130,35 @@ def __repr__(self):
         return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre)
 
     def __str__(self):
+        # type: () -> str
         return "{0}{1}".format(*self._spec)
 
+    @property
+    def _canonical_spec(self):
+        # type: () -> Tuple[str, Union[Version, str]]
+        return self._spec[0], canonicalize_version(self._spec[1])
+
     def __hash__(self):
-        return hash(self._spec)
+        # type: () -> int
+        return hash(self._canonical_spec)
 
     def __eq__(self, other):
+        # type: (object) -> bool
         if isinstance(other, string_types):
             try:
-                other = self.__class__(other)
+                other = self.__class__(str(other))
             except InvalidSpecifier:
                 return NotImplemented
         elif not isinstance(other, self.__class__):
             return NotImplemented
 
-        return self._spec == other._spec
+        return self._canonical_spec == other._canonical_spec
 
     def __ne__(self, other):
+        # type: (object) -> bool
         if isinstance(other, string_types):
             try:
-                other = self.__class__(other)
+                other = self.__class__(str(other))
             except InvalidSpecifier:
                 return NotImplemented
         elif not isinstance(other, self.__class__):
@@ -126,52 +167,67 @@ def __ne__(self, other):
         return self._spec != other._spec
 
     def _get_operator(self, op):
-        return getattr(self, "_compare_{0}".format(self._operators[op]))
+        # type: (str) -> CallableOperator
+        operator_callable = getattr(
+            self, "_compare_{0}".format(self._operators[op])
+        )  # type: CallableOperator
+        return operator_callable
 
     def _coerce_version(self, version):
+        # type: (UnparsedVersion) -> ParsedVersion
         if not isinstance(version, (LegacyVersion, Version)):
             version = parse(version)
         return version
 
     @property
     def operator(self):
+        # type: () -> str
         return self._spec[0]
 
     @property
     def version(self):
+        # type: () -> str
         return self._spec[1]
 
     @property
     def prereleases(self):
+        # type: () -> Optional[bool]
         return self._prereleases
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
     def __contains__(self, item):
+        # type: (str) -> bool
         return self.contains(item)
 
     def contains(self, item, prereleases=None):
+        # type: (UnparsedVersion, Optional[bool]) -> bool
+
         # Determine if prereleases are to be allowed or not.
         if prereleases is None:
             prereleases = self.prereleases
 
         # Normalize item to a Version or LegacyVersion, this allows us to have
         # a shortcut for ``"2.0" in Specifier(">=2")
-        item = self._coerce_version(item)
+        normalized_item = self._coerce_version(item)
 
         # Determine if we should be supporting prereleases in this specifier
         # or not, if we do not support prereleases than we can short circuit
         # logic if this version is a prereleases.
-        if item.is_prerelease and not prereleases:
+        if normalized_item.is_prerelease and not prereleases:
             return False
 
         # Actually do the comparison to determine if this item is contained
         # within this Specifier or not.
-        return self._get_operator(self.operator)(item, self.version)
+        operator_callable = self._get_operator(self.operator)  # type: CallableOperator
+        return operator_callable(normalized_item, self.version)
 
     def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
+
         yielded = False
         found_prereleases = []
 
@@ -230,32 +286,43 @@ class LegacySpecifier(_IndividualSpecifier):
     }
 
     def _coerce_version(self, version):
+        # type: (Union[ParsedVersion, str]) -> LegacyVersion
         if not isinstance(version, LegacyVersion):
             version = LegacyVersion(str(version))
         return version
 
     def _compare_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective == self._coerce_version(spec)
 
     def _compare_not_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective != self._coerce_version(spec)
 
     def _compare_less_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective <= self._coerce_version(spec)
 
     def _compare_greater_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective >= self._coerce_version(spec)
 
     def _compare_less_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective < self._coerce_version(spec)
 
     def _compare_greater_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective > self._coerce_version(spec)
 
 
-def _require_version_compare(fn):
+def _require_version_compare(
+    fn  # type: (Callable[[Specifier, ParsedVersion, str], bool])
+):
+    # type: (...) -> Callable[[Specifier, ParsedVersion, str], bool]
     @functools.wraps(fn)
     def wrapped(self, prospective, spec):
+        # type: (Specifier, ParsedVersion, str) -> bool
         if not isinstance(prospective, Version):
             return False
         return fn(self, prospective, spec)
@@ -373,6 +440,8 @@ class Specifier(_IndividualSpecifier):
 
     @_require_version_compare
     def _compare_compatible(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
         # Compatible releases have an equivalent combination of >= and ==. That
         # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
         # implement this in terms of the other specifiers instead of
@@ -400,56 +469,75 @@ def _compare_compatible(self, prospective, spec):
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
             # In the case of prefix matching we want to ignore local segment.
             prospective = Version(prospective.public)
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
-            spec = _version_split(spec[:-2])  # Remove the trailing .*
+            split_spec = _version_split(spec[:-2])  # Remove the trailing .*
 
             # Split the prospective version out by dots, and pretend that there
             # is an implicit dot in between a release segment and a pre-release
             # segment.
-            prospective = _version_split(str(prospective))
+            split_prospective = _version_split(str(prospective))
 
             # Shorten the prospective version to be the same length as the spec
             # so that we can determine if the specifier is a prefix of the
             # prospective version or not.
-            prospective = prospective[: len(spec)]
+            shortened_prospective = split_prospective[: len(split_spec)]
 
             # Pad out our two sides with zeros so that they both equal the same
             # length.
-            spec, prospective = _pad_version(spec, prospective)
+            padded_spec, padded_prospective = _pad_version(
+                split_spec, shortened_prospective
+            )
+
+            return padded_prospective == padded_spec
         else:
             # Convert our spec string into a Version
-            spec = Version(spec)
+            spec_version = Version(spec)
 
             # If the specifier does not have a local segment, then we want to
             # act as if the prospective version also does not have a local
             # segment.
-            if not spec.local:
+            if not spec_version.local:
                 prospective = Version(prospective.public)
 
-        return prospective == spec
+            return prospective == spec_version
 
     @_require_version_compare
     def _compare_not_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
         return not self._compare_equal(prospective, spec)
 
     @_require_version_compare
     def _compare_less_than_equal(self, prospective, spec):
-        return prospective <= Version(spec)
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) <= Version(spec)
 
     @_require_version_compare
     def _compare_greater_than_equal(self, prospective, spec):
-        return prospective >= Version(spec)
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) >= Version(spec)
 
     @_require_version_compare
-    def _compare_less_than(self, prospective, spec):
+    def _compare_less_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
-        spec = Version(spec)
+        spec = Version(spec_str)
 
         # Check to see if the prospective version is less than the spec
         # version. If it's not we can short circuit and just return False now
@@ -471,10 +559,12 @@ def _compare_less_than(self, prospective, spec):
         return True
 
     @_require_version_compare
-    def _compare_greater_than(self, prospective, spec):
+    def _compare_greater_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
-        spec = Version(spec)
+        spec = Version(spec_str)
 
         # Check to see if the prospective version is greater than the spec
         # version. If it's not we can short circuit and just return False now
@@ -502,10 +592,13 @@ def _compare_greater_than(self, prospective, spec):
         return True
 
     def _compare_arbitrary(self, prospective, spec):
+        # type: (Version, str) -> bool
         return str(prospective).lower() == str(spec).lower()
 
     @property
     def prereleases(self):
+        # type: () -> bool
+
         # If there is an explicit prereleases set for this, then we'll just
         # blindly use that.
         if self._prereleases is not None:
@@ -530,6 +623,7 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
 
@@ -537,7 +631,8 @@ def prereleases(self, value):
 
 
 def _version_split(version):
-    result = []
+    # type: (str) -> List[str]
+    result = []  # type: List[str]
     for item in version.split("."):
         match = _prefix_regex.search(item)
         if match:
@@ -548,6 +643,7 @@ def _version_split(version):
 
 
 def _pad_version(left, right):
+    # type: (List[str], List[str]) -> Tuple[List[str], List[str]]
     left_split, right_split = [], []
 
     # Get the release segment of our versions
@@ -567,14 +663,16 @@ def _pad_version(left, right):
 
 class SpecifierSet(BaseSpecifier):
     def __init__(self, specifiers="", prereleases=None):
-        # Split on , to break each indidivual specifier into it's own item, and
+        # type: (str, Optional[bool]) -> None
+
+        # Split on , to break each individual specifier into it's own item, and
         # strip each item to remove leading/trailing whitespace.
-        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+        split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
 
         # Parsed each individual specifier, attempting first to make it a
         # Specifier and falling back to a LegacySpecifier.
         parsed = set()
-        for specifier in specifiers:
+        for specifier in split_specifiers:
             try:
                 parsed.add(Specifier(specifier))
             except InvalidSpecifier:
@@ -588,6 +686,7 @@ def __init__(self, specifiers="", prereleases=None):
         self._prereleases = prereleases
 
     def __repr__(self):
+        # type: () -> str
         pre = (
             ", prereleases={0!r}".format(self.prereleases)
             if self._prereleases is not None
@@ -597,12 +696,15 @@ def __repr__(self):
         return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
 
     def __str__(self):
+        # type: () -> str
         return ",".join(sorted(str(s) for s in self._specs))
 
     def __hash__(self):
+        # type: () -> int
         return hash(self._specs)
 
     def __and__(self, other):
+        # type: (Union[SpecifierSet, str]) -> SpecifierSet
         if isinstance(other, string_types):
             other = SpecifierSet(other)
         elif not isinstance(other, SpecifierSet):
@@ -626,9 +728,8 @@ def __and__(self, other):
         return specifier
 
     def __eq__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
             other = SpecifierSet(str(other))
         elif not isinstance(other, SpecifierSet):
             return NotImplemented
@@ -636,9 +737,8 @@ def __eq__(self, other):
         return self._specs == other._specs
 
     def __ne__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
             other = SpecifierSet(str(other))
         elif not isinstance(other, SpecifierSet):
             return NotImplemented
@@ -646,13 +746,17 @@ def __ne__(self, other):
         return self._specs != other._specs
 
     def __len__(self):
+        # type: () -> int
         return len(self._specs)
 
     def __iter__(self):
+        # type: () -> Iterator[FrozenSet[_IndividualSpecifier]]
         return iter(self._specs)
 
     @property
     def prereleases(self):
+        # type: () -> Optional[bool]
+
         # If we have been given an explicit prerelease modifier, then we'll
         # pass that through here.
         if self._prereleases is not None:
@@ -670,12 +774,16 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
     def __contains__(self, item):
+        # type: (Union[ParsedVersion, str]) -> bool
         return self.contains(item)
 
     def contains(self, item, prereleases=None):
+        # type: (Union[ParsedVersion, str], Optional[bool]) -> bool
+
         # Ensure that our item is a Version or LegacyVersion instance.
         if not isinstance(item, (LegacyVersion, Version)):
             item = parse(item)
@@ -701,7 +809,13 @@ def contains(self, item, prereleases=None):
         #       will always return True, this is an explicit design decision.
         return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
-    def filter(self, iterable, prereleases=None):
+    def filter(
+        self,
+        iterable,  # type: Iterable[Union[ParsedVersion, str]]
+        prereleases=None,  # type: Optional[bool]
+    ):
+        # type: (...) -> Iterable[Union[ParsedVersion, str]]
+
         # Determine if we're forcing a prerelease or not, if we're not forcing
         # one for this particular filter call, then we'll use whatever the
         # SpecifierSet thinks for whether or not we should support prereleases.
@@ -719,8 +833,8 @@ def filter(self, iterable, prereleases=None):
         # which will filter out any pre-releases, unless there are no final
         # releases, and which will filter out LegacyVersion in general.
         else:
-            filtered = []
-            found_prereleases = []
+            filtered = []  # type: List[Union[ParsedVersion, str]]
+            found_prereleases = []  # type: List[Union[ParsedVersion, str]]
 
             for item in iterable:
                 # Ensure that we some kind of Version class for this item.
diff --git a/pkg_resources/_vendor/packaging/tags.py b/pkg_resources/_vendor/packaging/tags.py
index ec9942f0f6..9064910b8b 100644
--- a/pkg_resources/_vendor/packaging/tags.py
+++ b/pkg_resources/_vendor/packaging/tags.py
@@ -13,12 +13,37 @@
 
     EXTENSION_SUFFIXES = [x[0] for x in imp.get_suffixes()]
     del imp
+import logging
+import os
 import platform
 import re
+import struct
 import sys
 import sysconfig
 import warnings
 
+from ._typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import (
+        Dict,
+        FrozenSet,
+        IO,
+        Iterable,
+        Iterator,
+        List,
+        Optional,
+        Sequence,
+        Tuple,
+        Union,
+    )
+
+    PythonVersion = Sequence[int]
+    MacVersion = Tuple[int, int]
+    GlibcVersion = Tuple[int, int]
+
+
+logger = logging.getLogger(__name__)
 
 INTERPRETER_SHORT_NAMES = {
     "python": "py",  # Generic.
@@ -26,34 +51,48 @@
     "pypy": "pp",
     "ironpython": "ip",
     "jython": "jy",
-}
+}  # type: Dict[str, str]
 
 
 _32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
 
 
 class Tag(object):
+    """
+    A representation of the tag triple for a wheel.
+
+    Instances are considered immutable and thus are hashable. Equality checking
+    is also supported.
+    """
 
     __slots__ = ["_interpreter", "_abi", "_platform"]
 
     def __init__(self, interpreter, abi, platform):
+        # type: (str, str, str) -> None
         self._interpreter = interpreter.lower()
         self._abi = abi.lower()
         self._platform = platform.lower()
 
     @property
     def interpreter(self):
+        # type: () -> str
         return self._interpreter
 
     @property
     def abi(self):
+        # type: () -> str
         return self._abi
 
     @property
     def platform(self):
+        # type: () -> str
         return self._platform
 
     def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, Tag):
+            return NotImplemented
+
         return (
             (self.platform == other.platform)
             and (self.abi == other.abi)
@@ -61,16 +100,26 @@ def __eq__(self, other):
         )
 
     def __hash__(self):
+        # type: () -> int
         return hash((self._interpreter, self._abi, self._platform))
 
     def __str__(self):
+        # type: () -> str
         return "{}-{}-{}".format(self._interpreter, self._abi, self._platform)
 
     def __repr__(self):
+        # type: () -> str
         return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
 
 
 def parse_tag(tag):
+    # type: (str) -> FrozenSet[Tag]
+    """
+    Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
+
+    Returning a set is required due to the possibility that the tag is a
+    compressed tag set.
+    """
     tags = set()
     interpreters, abis, platforms = tag.split("-")
     for interpreter in interpreters.split("."):
@@ -80,20 +129,54 @@ def parse_tag(tag):
     return frozenset(tags)
 
 
+def _warn_keyword_parameter(func_name, kwargs):
+    # type: (str, Dict[str, bool]) -> bool
+    """
+    Backwards-compatibility with Python 2.7 to allow treating 'warn' as keyword-only.
+    """
+    if not kwargs:
+        return False
+    elif len(kwargs) > 1 or "warn" not in kwargs:
+        kwargs.pop("warn", None)
+        arg = next(iter(kwargs.keys()))
+        raise TypeError(
+            "{}() got an unexpected keyword argument {!r}".format(func_name, arg)
+        )
+    return kwargs["warn"]
+
+
+def _get_config_var(name, warn=False):
+    # type: (str, bool) -> Union[int, str, None]
+    value = sysconfig.get_config_var(name)
+    if value is None and warn:
+        logger.debug(
+            "Config variable '%s' is unset, Python ABI tag may be incorrect", name
+        )
+    return value
+
+
 def _normalize_string(string):
+    # type: (str) -> str
     return string.replace(".", "_").replace("-", "_")
 
 
-def _cpython_interpreter(py_version):
-    # TODO: Is using py_version_nodot for interpreter version critical?
-    return "cp{major}{minor}".format(major=py_version[0], minor=py_version[1])
+def _abi3_applies(python_version):
+    # type: (PythonVersion) -> bool
+    """
+    Determine if the Python version supports abi3.
+
+    PEP 384 was first implemented in Python 3.2.
+    """
+    return len(python_version) > 1 and tuple(python_version) >= (3, 2)
 
 
-def _cpython_abis(py_version):
+def _cpython_abis(py_version, warn=False):
+    # type: (PythonVersion, bool) -> List[str]
+    py_version = tuple(py_version)  # To allow for version comparison.
     abis = []
-    version = "{}{}".format(*py_version[:2])
+    version = _version_nodot(py_version[:2])
     debug = pymalloc = ucs4 = ""
-    with_debug = sysconfig.get_config_var("Py_DEBUG")
+    with_debug = _get_config_var("Py_DEBUG", warn)
     has_refcount = hasattr(sys, "gettotalrefcount")
     # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
     # extension modules is the best option.
@@ -102,11 +185,11 @@ def _cpython_abis(py_version):
     if with_debug or (with_debug is None and (has_refcount or has_ext)):
         debug = "d"
     if py_version < (3, 8):
-        with_pymalloc = sysconfig.get_config_var("WITH_PYMALLOC")
+        with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
         if with_pymalloc or with_pymalloc is None:
             pymalloc = "m"
         if py_version < (3, 3):
-            unicode_size = sysconfig.get_config_var("Py_UNICODE_SIZE")
+            unicode_size = _get_config_var("Py_UNICODE_SIZE", warn)
             if unicode_size == 4 or (
                 unicode_size is None and sys.maxunicode == 0x10FFFF
             ):
@@ -124,86 +207,148 @@ def _cpython_abis(py_version):
     return abis
 
 
-def _cpython_tags(py_version, interpreter, abis, platforms):
+def cpython_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a CPython interpreter.
+
+    The tags consist of:
+    - cp<python_version>-<abi>-<platform>
+    - cp<python_version>-abi3-<platform>
+    - cp<python_version>-none-<platform>
+    - cp<less than python_version>-abi3-<platform>  # Older Python versions down to 3.2.
+
+    If python_version only specifies a major version then user-provided ABIs and
+    the 'none' ABItag will be used.
+
+    If 'abi3' or 'none' are specified in 'abis' then they will be yielded at
+    their normal position and not at the beginning.
+    """
+    warn = _warn_keyword_parameter("cpython_tags", kwargs)
+    if not python_version:
+        python_version = sys.version_info[:2]
+
+    interpreter = "cp{}".format(_version_nodot(python_version[:2]))
+
+    if abis is None:
+        if len(python_version) > 1:
+            abis = _cpython_abis(python_version, warn)
+        else:
+            abis = []
+    abis = list(abis)
+    # 'abi3' and 'none' are explicitly handled later.
+    for explicit_abi in ("abi3", "none"):
+        try:
+            abis.remove(explicit_abi)
+        except ValueError:
+            pass
+
+    platforms = list(platforms or _platform_tags())
     for abi in abis:
         for platform_ in platforms:
             yield Tag(interpreter, abi, platform_)
-    for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
-        yield tag
+    if _abi3_applies(python_version):
+        for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
+            yield tag
     for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
         yield tag
-    # PEP 384 was first implemented in Python 3.2.
-    for minor_version in range(py_version[1] - 1, 1, -1):
-        for platform_ in platforms:
-            interpreter = "cp{major}{minor}".format(
-                major=py_version[0], minor=minor_version
-            )
-            yield Tag(interpreter, "abi3", platform_)
-
 
-def _pypy_interpreter():
-    return "pp{py_major}{pypy_major}{pypy_minor}".format(
-        py_major=sys.version_info[0],
-        pypy_major=sys.pypy_version_info.major,
-        pypy_minor=sys.pypy_version_info.minor,
-    )
+    if _abi3_applies(python_version):
+        for minor_version in range(python_version[1] - 1, 1, -1):
+            for platform_ in platforms:
+                interpreter = "cp{version}".format(
+                    version=_version_nodot((python_version[0], minor_version))
+                )
+                yield Tag(interpreter, "abi3", platform_)
 
 
 def _generic_abi():
+    # type: () -> Iterator[str]
     abi = sysconfig.get_config_var("SOABI")
     if abi:
-        return _normalize_string(abi)
-    else:
-        return "none"
+        yield _normalize_string(abi)
 
 
-def _pypy_tags(py_version, interpreter, abi, platforms):
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    for tag in (Tag(interpreter, "none", platform) for platform in platforms):
-        yield tag
+def generic_tags(
+    interpreter=None,  # type: Optional[str]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a generic interpreter.
 
+    The tags consist of:
+    - <interpreter>-<abi>-<platform>
 
-def _generic_tags(interpreter, py_version, abi, platforms):
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    if abi != "none":
-        tags = (Tag(interpreter, "none", platform_) for platform_ in platforms)
-        for tag in tags:
-            yield tag
+    The "none" ABI will be added if it was not explicitly provided.
+    """
+    warn = _warn_keyword_parameter("generic_tags", kwargs)
+    if not interpreter:
+        interp_name = interpreter_name()
+        interp_version = interpreter_version(warn=warn)
+        interpreter = "".join([interp_name, interp_version])
+    if abis is None:
+        abis = _generic_abi()
+    platforms = list(platforms or _platform_tags())
+    abis = list(abis)
+    if "none" not in abis:
+        abis.append("none")
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
 
 
 def _py_interpreter_range(py_version):
+    # type: (PythonVersion) -> Iterator[str]
     """
-    Yield Python versions in descending order.
+    Yields Python versions in descending order.
 
     After the latest version, the major-only version will be yielded, and then
-    all following versions up to 'end'.
+    all previous versions of that major version.
     """
-    yield "py{major}{minor}".format(major=py_version[0], minor=py_version[1])
+    if len(py_version) > 1:
+        yield "py{version}".format(version=_version_nodot(py_version[:2]))
     yield "py{major}".format(major=py_version[0])
-    for minor in range(py_version[1] - 1, -1, -1):
-        yield "py{major}{minor}".format(major=py_version[0], minor=minor)
+    if len(py_version) > 1:
+        for minor in range(py_version[1] - 1, -1, -1):
+            yield "py{version}".format(version=_version_nodot((py_version[0], minor)))
 
 
-def _independent_tags(interpreter, py_version, platforms):
+def compatible_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    interpreter=None,  # type: Optional[str]
+    platforms=None,  # type: Optional[Iterable[str]]
+):
+    # type: (...) -> Iterator[Tag]
     """
-    Return the sequence of tags that are consistent across implementations.
+    Yields the sequence of tags that are compatible with a specific version of Python.
 
     The tags consist of:
     - py*-none-<platform>
-    - <interpreter>-none-any
+    - <interpreter>-none-any  # ... if `interpreter` is provided.
     - py*-none-any
     """
-    for version in _py_interpreter_range(py_version):
+    if not python_version:
+        python_version = sys.version_info[:2]
+    platforms = list(platforms or _platform_tags())
+    for version in _py_interpreter_range(python_version):
         for platform_ in platforms:
             yield Tag(version, "none", platform_)
-    yield Tag(interpreter, "none", "any")
-    for version in _py_interpreter_range(py_version):
+    if interpreter:
+        yield Tag(interpreter, "none", "any")
+    for version in _py_interpreter_range(python_version):
         yield Tag(version, "none", "any")
 
 
 def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
+    # type: (str, bool) -> str
     if not is_32bit:
         return arch
 
@@ -214,6 +359,7 @@ def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
 
 
 def _mac_binary_formats(version, cpu_arch):
+    # type: (MacVersion, str) -> List[str]
     formats = [cpu_arch]
     if cpu_arch == "x86_64":
         if version < (10, 4):
@@ -240,32 +386,42 @@ def _mac_binary_formats(version, cpu_arch):
     return formats
 
 
-def _mac_platforms(version=None, arch=None):
-    version_str, _, cpu_arch = platform.mac_ver()
+def mac_platforms(version=None, arch=None):
+    # type: (Optional[MacVersion], Optional[str]) -> Iterator[str]
+    """
+    Yields the platform tags for a macOS system.
+
+    The `version` parameter is a two-item tuple specifying the macOS version to
+    generate platform tags for. The `arch` parameter is the CPU architecture to
+    generate platform tags for. Both parameters default to the appropriate value
+    for the current system.
+    """
+    version_str, _, cpu_arch = platform.mac_ver()  # type: ignore
     if version is None:
-        version = tuple(map(int, version_str.split(".")[:2]))
+        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+    else:
+        version = version
     if arch is None:
         arch = _mac_arch(cpu_arch)
-    platforms = []
+    else:
+        arch = arch
     for minor_version in range(version[1], -1, -1):
         compat_version = version[0], minor_version
         binary_formats = _mac_binary_formats(compat_version, arch)
         for binary_format in binary_formats:
-            platforms.append(
-                "macosx_{major}_{minor}_{binary_format}".format(
-                    major=compat_version[0],
-                    minor=compat_version[1],
-                    binary_format=binary_format,
-                )
+            yield "macosx_{major}_{minor}_{binary_format}".format(
+                major=compat_version[0],
+                minor=compat_version[1],
+                binary_format=binary_format,
             )
-    return platforms
 
 
 # From PEP 513.
 def _is_manylinux_compatible(name, glibc_version):
+    # type: (str, GlibcVersion) -> bool
     # Check for presence of _manylinux module.
     try:
-        import _manylinux
+        import _manylinux  # noqa
 
         return bool(getattr(_manylinux, name + "_compatible"))
     except (ImportError, AttributeError):
@@ -276,14 +432,50 @@ def _is_manylinux_compatible(name, glibc_version):
 
 
 def _glibc_version_string():
+    # type: () -> Optional[str]
     # Returns glibc version string, or None if not using glibc.
-    import ctypes
+    return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
+
+
+def _glibc_version_string_confstr():
+    # type: () -> Optional[str]
+    """
+    Primary implementation of glibc_version_string using os.confstr.
+    """
+    # os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
+    # to be broken or missing. This strategy is used in the standard library
+    # platform module.
+    # https://github.com/python/cpython/blob/fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71/Lib/platform.py#L175-L183
+    try:
+        # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17".
+        version_string = os.confstr(  # type: ignore[attr-defined] # noqa: F821
+            "CS_GNU_LIBC_VERSION"
+        )
+        assert version_string is not None
+        _, version = version_string.split()  # type: Tuple[str, str]
+    except (AssertionError, AttributeError, OSError, ValueError):
+        # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
+        return None
+    return version
+
+
+def _glibc_version_string_ctypes():
+    # type: () -> Optional[str]
+    """
+    Fallback implementation of glibc_version_string using ctypes.
+    """
+    try:
+        import ctypes
+    except ImportError:
+        return None
 
     # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
     # manpage says, "If filename is NULL, then the returned handle is for the
     # main program". This way we can let the linker do the work to figure out
     # which libc our process is actually using.
-    process_namespace = ctypes.CDLL(None)
+    #
+    # Note: typeshed is wrong here so we are ignoring this line.
+    process_namespace = ctypes.CDLL(None)  # type: ignore
     try:
         gnu_get_libc_version = process_namespace.gnu_get_libc_version
     except AttributeError:
@@ -293,7 +485,7 @@ def _glibc_version_string():
 
     # Call gnu_get_libc_version, which returns a string like "2.5"
     gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str = gnu_get_libc_version()
+    version_str = gnu_get_libc_version()  # type: str
     # py2 / py3 compatibility:
     if not isinstance(version_str, str):
         version_str = version_str.decode("ascii")
@@ -303,6 +495,7 @@ def _glibc_version_string():
 
 # Separated out from have_compatible_glibc for easier unit testing.
 def _check_glibc_version(version_str, required_major, minimum_minor):
+    # type: (str, int, int) -> bool
     # Parse string and check against requested version.
     #
     # We use a regexp instead of str.split because we want to discard any
@@ -324,81 +517,235 @@ def _check_glibc_version(version_str, required_major, minimum_minor):
 
 
 def _have_compatible_glibc(required_major, minimum_minor):
+    # type: (int, int) -> bool
     version_str = _glibc_version_string()
     if version_str is None:
         return False
     return _check_glibc_version(version_str, required_major, minimum_minor)
 
 
+# Python does not provide platform information at sufficient granularity to
+# identify the architecture of the running executable in some cases, so we
+# determine it dynamically by reading the information from the running
+# process. This only applies on Linux, which uses the ELF format.
+class _ELFFileHeader(object):
+    # https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    class _InvalidELFFileHeader(ValueError):
+        """
+        An invalid ELF file header was found.
+        """
+
+    ELF_MAGIC_NUMBER = 0x7F454C46
+    ELFCLASS32 = 1
+    ELFCLASS64 = 2
+    ELFDATA2LSB = 1
+    ELFDATA2MSB = 2
+    EM_386 = 3
+    EM_S390 = 22
+    EM_ARM = 40
+    EM_X86_64 = 62
+    EF_ARM_ABIMASK = 0xFF000000
+    EF_ARM_ABI_VER5 = 0x05000000
+    EF_ARM_ABI_FLOAT_HARD = 0x00000400
+
+    def __init__(self, file):
+        # type: (IO[bytes]) -> None
+        def unpack(fmt):
+            # type: (str) -> int
+            try:
+                (result,) = struct.unpack(
+                    fmt, file.read(struct.calcsize(fmt))
+                )  # type: (int, )
+            except struct.error:
+                raise _ELFFileHeader._InvalidELFFileHeader()
+            return result
+
+        self.e_ident_magic = unpack(">I")
+        if self.e_ident_magic != self.ELF_MAGIC_NUMBER:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_class = unpack("B")
+        if self.e_ident_class not in {self.ELFCLASS32, self.ELFCLASS64}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_data = unpack("B")
+        if self.e_ident_data not in {self.ELFDATA2LSB, self.ELFDATA2MSB}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_version = unpack("B")
+        self.e_ident_osabi = unpack("B")
+        self.e_ident_abiversion = unpack("B")
+        self.e_ident_pad = file.read(7)
+        format_h = "<H" if self.e_ident_data == self.ELFDATA2LSB else ">H"
+        format_i = "<I" if self.e_ident_data == self.ELFDATA2LSB else ">I"
+        format_q = "<Q" if self.e_ident_data == self.ELFDATA2LSB else ">Q"
+        format_p = format_i if self.e_ident_class == self.ELFCLASS32 else format_q
+        self.e_type = unpack(format_h)
+        self.e_machine = unpack(format_h)
+        self.e_version = unpack(format_i)
+        self.e_entry = unpack(format_p)
+        self.e_phoff = unpack(format_p)
+        self.e_shoff = unpack(format_p)
+        self.e_flags = unpack(format_i)
+        self.e_ehsize = unpack(format_h)
+        self.e_phentsize = unpack(format_h)
+        self.e_phnum = unpack(format_h)
+        self.e_shentsize = unpack(format_h)
+        self.e_shnum = unpack(format_h)
+        self.e_shstrndx = unpack(format_h)
+
+
+def _get_elf_header():
+    # type: () -> Optional[_ELFFileHeader]
+    try:
+        with open(sys.executable, "rb") as f:
+            elf_header = _ELFFileHeader(f)
+    except (IOError, OSError, TypeError, _ELFFileHeader._InvalidELFFileHeader):
+        return None
+    return elf_header
+
+
+def _is_linux_armhf():
+    # type: () -> bool
+    # hard-float ABI can be detected from the ELF header of the running
+    # process
+    # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_ARM
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABIMASK
+    ) == elf_header.EF_ARM_ABI_VER5
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABI_FLOAT_HARD
+    ) == elf_header.EF_ARM_ABI_FLOAT_HARD
+    return result
+
+
+def _is_linux_i686():
+    # type: () -> bool
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_386
+    return result
+
+
+def _have_compatible_manylinux_abi(arch):
+    # type: (str) -> bool
+    if arch == "armv7l":
+        return _is_linux_armhf()
+    if arch == "i686":
+        return _is_linux_i686()
+    return True
+
+
 def _linux_platforms(is_32bit=_32_BIT_INTERPRETER):
+    # type: (bool) -> Iterator[str]
     linux = _normalize_string(distutils.util.get_platform())
-    if linux == "linux_x86_64" and is_32bit:
-        linux = "linux_i686"
-    manylinux_support = (
-        ("manylinux2014", (2, 17)),  # CentOS 7 w/ glibc 2.17 (PEP 599)
-        ("manylinux2010", (2, 12)),  # CentOS 6 w/ glibc 2.12 (PEP 571)
-        ("manylinux1", (2, 5)),  # CentOS 5 w/ glibc 2.5 (PEP 513)
-    )
+    if is_32bit:
+        if linux == "linux_x86_64":
+            linux = "linux_i686"
+        elif linux == "linux_aarch64":
+            linux = "linux_armv7l"
+    manylinux_support = []
+    _, arch = linux.split("_", 1)
+    if _have_compatible_manylinux_abi(arch):
+        if arch in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:
+            manylinux_support.append(
+                ("manylinux2014", (2, 17))
+            )  # CentOS 7 w/ glibc 2.17 (PEP 599)
+        if arch in {"x86_64", "i686"}:
+            manylinux_support.append(
+                ("manylinux2010", (2, 12))
+            )  # CentOS 6 w/ glibc 2.12 (PEP 571)
+            manylinux_support.append(
+                ("manylinux1", (2, 5))
+            )  # CentOS 5 w/ glibc 2.5 (PEP 513)
     manylinux_support_iter = iter(manylinux_support)
     for name, glibc_version in manylinux_support_iter:
         if _is_manylinux_compatible(name, glibc_version):
-            platforms = [linux.replace("linux", name)]
+            yield linux.replace("linux", name)
             break
-    else:
-        platforms = []
     # Support for a later manylinux implies support for an earlier version.
-    platforms += [linux.replace("linux", name) for name, _ in manylinux_support_iter]
-    platforms.append(linux)
-    return platforms
+    for name, _ in manylinux_support_iter:
+        yield linux.replace("linux", name)
+    yield linux
 
 
 def _generic_platforms():
-    platform = _normalize_string(distutils.util.get_platform())
-    return [platform]
+    # type: () -> Iterator[str]
+    yield _normalize_string(distutils.util.get_platform())
 
 
-def _interpreter_name():
-    name = platform.python_implementation().lower()
+def _platform_tags():
+    # type: () -> Iterator[str]
+    """
+    Provides the platform tags for this installation.
+    """
+    if platform.system() == "Darwin":
+        return mac_platforms()
+    elif platform.system() == "Linux":
+        return _linux_platforms()
+    else:
+        return _generic_platforms()
+
+
+def interpreter_name():
+    # type: () -> str
+    """
+    Returns the name of the running interpreter.
+    """
+    try:
+        name = sys.implementation.name  # type: ignore
+    except AttributeError:  # pragma: no cover
+        # Python 2.7 compatibility.
+        name = platform.python_implementation().lower()
     return INTERPRETER_SHORT_NAMES.get(name) or name
 
 
-def _generic_interpreter(name, py_version):
-    version = sysconfig.get_config_var("py_version_nodot")
-    if not version:
-        version = "".join(map(str, py_version[:2]))
-    return "{name}{version}".format(name=name, version=version)
+def interpreter_version(**kwargs):
+    # type: (bool) -> str
+    """
+    Returns the version of the running interpreter.
+    """
+    warn = _warn_keyword_parameter("interpreter_version", kwargs)
+    version = _get_config_var("py_version_nodot", warn=warn)
+    if version:
+        version = str(version)
+    else:
+        version = _version_nodot(sys.version_info[:2])
+    return version
+
+
+def _version_nodot(version):
+    # type: (PythonVersion) -> str
+    if any(v >= 10 for v in version):
+        sep = "_"
+    else:
+        sep = ""
+    return sep.join(map(str, version))
 
 
-def sys_tags():
+def sys_tags(**kwargs):
+    # type: (bool) -> Iterator[Tag]
     """
     Returns the sequence of tag triples for the running interpreter.
 
     The order of the sequence corresponds to priority order for the
     interpreter, from most to least important.
     """
-    py_version = sys.version_info[:2]
-    interpreter_name = _interpreter_name()
-    if platform.system() == "Darwin":
-        platforms = _mac_platforms()
-    elif platform.system() == "Linux":
-        platforms = _linux_platforms()
-    else:
-        platforms = _generic_platforms()
+    warn = _warn_keyword_parameter("sys_tags", kwargs)
 
-    if interpreter_name == "cp":
-        interpreter = _cpython_interpreter(py_version)
-        abis = _cpython_abis(py_version)
-        for tag in _cpython_tags(py_version, interpreter, abis, platforms):
-            yield tag
-    elif interpreter_name == "pp":
-        interpreter = _pypy_interpreter()
-        abi = _generic_abi()
-        for tag in _pypy_tags(py_version, interpreter, abi, platforms):
+    interp_name = interpreter_name()
+    if interp_name == "cp":
+        for tag in cpython_tags(warn=warn):
             yield tag
     else:
-        interpreter = _generic_interpreter(interpreter_name, py_version)
-        abi = _generic_abi()
-        for tag in _generic_tags(interpreter, py_version, abi, platforms):
+        for tag in generic_tags():
             yield tag
-    for tag in _independent_tags(interpreter, py_version, platforms):
+
+    for tag in compatible_tags():
         yield tag
diff --git a/pkg_resources/_vendor/packaging/utils.py b/pkg_resources/_vendor/packaging/utils.py
index 8841878693..19579c1a0f 100644
--- a/pkg_resources/_vendor/packaging/utils.py
+++ b/pkg_resources/_vendor/packaging/utils.py
@@ -5,28 +5,36 @@
 
 import re
 
+from ._typing import TYPE_CHECKING, cast
 from .version import InvalidVersion, Version
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import NewType, Union
+
+    NormalizedName = NewType("NormalizedName", str)
 
 _canonicalize_regex = re.compile(r"[-_.]+")
 
 
 def canonicalize_name(name):
+    # type: (str) -> NormalizedName
     # This is taken from PEP 503.
-    return _canonicalize_regex.sub("-", name).lower()
+    value = _canonicalize_regex.sub("-", name).lower()
+    return cast("NormalizedName", value)
 
 
-def canonicalize_version(version):
+def canonicalize_version(_version):
+    # type: (str) -> Union[Version, str]
     """
-    This is very similar to Version.__str__, but has one subtle differences
+    This is very similar to Version.__str__, but has one subtle difference
     with the way it handles the release segment.
     """
 
     try:
-        version = Version(version)
+        version = Version(_version)
     except InvalidVersion:
         # Legacy versions cannot be normalized
-        return version
+        return _version
 
     parts = []
 
diff --git a/pkg_resources/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py
index 95157a1f78..00371e86a8 100644
--- a/pkg_resources/_vendor/packaging/version.py
+++ b/pkg_resources/_vendor/packaging/version.py
@@ -7,8 +7,35 @@
 import itertools
 import re
 
-from ._structures import Infinity
-
+from ._structures import Infinity, NegativeInfinity
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Callable, Iterator, List, Optional, SupportsInt, Tuple, Union
+
+    from ._structures import InfinityType, NegativeInfinityType
+
+    InfiniteTypes = Union[InfinityType, NegativeInfinityType]
+    PrePostDevType = Union[InfiniteTypes, Tuple[str, int]]
+    SubLocalType = Union[InfiniteTypes, int, str]
+    LocalType = Union[
+        NegativeInfinityType,
+        Tuple[
+            Union[
+                SubLocalType,
+                Tuple[SubLocalType, str],
+                Tuple[NegativeInfinityType, SubLocalType],
+            ],
+            ...,
+        ],
+    ]
+    CmpKey = Tuple[
+        int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
+    ]
+    LegacyCmpKey = Tuple[int, Tuple[str, ...]]
+    VersionComparisonMethod = Callable[
+        [Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool
+    ]
 
 __all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
 
@@ -19,6 +46,7 @@
 
 
 def parse(version):
+    # type: (str) -> Union[LegacyVersion, Version]
     """
     Parse the given version string and return either a :class:`Version` object
     or a :class:`LegacyVersion` object depending on if the given version is
@@ -37,28 +65,38 @@ class InvalidVersion(ValueError):
 
 
 class _BaseVersion(object):
+    _key = None  # type: Union[CmpKey, LegacyCmpKey]
+
     def __hash__(self):
+        # type: () -> int
         return hash(self._key)
 
     def __lt__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s < o)
 
     def __le__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s <= o)
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return self._compare(other, lambda s, o: s == o)
 
     def __ge__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s >= o)
 
     def __gt__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s > o)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return self._compare(other, lambda s, o: s != o)
 
     def _compare(self, other, method):
+        # type: (object, VersionComparisonMethod) -> Union[bool, NotImplemented]
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
@@ -67,57 +105,71 @@ def _compare(self, other, method):
 
 class LegacyVersion(_BaseVersion):
     def __init__(self, version):
+        # type: (str) -> None
         self._version = str(version)
         self._key = _legacy_cmpkey(self._version)
 
     def __str__(self):
+        # type: () -> str
         return self._version
 
     def __repr__(self):
+        # type: () -> str
         return "<LegacyVersion({0})>".format(repr(str(self)))
 
     @property
     def public(self):
+        # type: () -> str
         return self._version
 
     @property
     def base_version(self):
+        # type: () -> str
         return self._version
 
     @property
     def epoch(self):
+        # type: () -> int
         return -1
 
     @property
     def release(self):
+        # type: () -> None
         return None
 
     @property
     def pre(self):
+        # type: () -> None
         return None
 
     @property
     def post(self):
+        # type: () -> None
         return None
 
     @property
     def dev(self):
+        # type: () -> None
         return None
 
     @property
     def local(self):
+        # type: () -> None
         return None
 
     @property
     def is_prerelease(self):
+        # type: () -> bool
         return False
 
     @property
     def is_postrelease(self):
+        # type: () -> bool
         return False
 
     @property
     def is_devrelease(self):
+        # type: () -> bool
         return False
 
 
@@ -133,6 +185,7 @@ def is_devrelease(self):
 
 
 def _parse_version_parts(s):
+    # type: (str) -> Iterator[str]
     for part in _legacy_version_component_re.split(s):
         part = _legacy_version_replacement_map.get(part, part)
 
@@ -150,6 +203,8 @@ def _parse_version_parts(s):
 
 
 def _legacy_cmpkey(version):
+    # type: (str) -> LegacyCmpKey
+
     # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
     # greater than or equal to 0. This will effectively put the LegacyVersion,
     # which uses the defacto standard originally implemented by setuptools,
@@ -158,7 +213,7 @@ def _legacy_cmpkey(version):
 
     # This scheme is taken from pkg_resources.parse_version setuptools prior to
     # it's adoption of the packaging library.
-    parts = []
+    parts = []  # type: List[str]
     for part in _parse_version_parts(version.lower()):
         if part.startswith("*"):
             # remove "-" before a prerelease tag
@@ -171,9 +226,8 @@ def _legacy_cmpkey(version):
                 parts.pop()
 
         parts.append(part)
-    parts = tuple(parts)
 
-    return epoch, parts
+    return epoch, tuple(parts)
 
 
 # Deliberately not anchored to the start and end of the string, to make it
@@ -215,6 +269,8 @@ class Version(_BaseVersion):
     _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     def __init__(self, version):
+        # type: (str) -> None
+
         # Validate the version and parse it into pieces
         match = self._regex.search(version)
         if not match:
@@ -243,9 +299,11 @@ def __init__(self, version):
         )
 
     def __repr__(self):
+        # type: () -> str
         return "<Version({0})>".format(repr(str(self)))
 
     def __str__(self):
+        # type: () -> str
         parts = []
 
         # Epoch
@@ -275,26 +333,35 @@ def __str__(self):
 
     @property
     def epoch(self):
-        return self._version.epoch
+        # type: () -> int
+        _epoch = self._version.epoch  # type: int
+        return _epoch
 
     @property
     def release(self):
-        return self._version.release
+        # type: () -> Tuple[int, ...]
+        _release = self._version.release  # type: Tuple[int, ...]
+        return _release
 
     @property
     def pre(self):
-        return self._version.pre
+        # type: () -> Optional[Tuple[str, int]]
+        _pre = self._version.pre  # type: Optional[Tuple[str, int]]
+        return _pre
 
     @property
     def post(self):
+        # type: () -> Optional[Tuple[str, int]]
         return self._version.post[1] if self._version.post else None
 
     @property
     def dev(self):
+        # type: () -> Optional[Tuple[str, int]]
         return self._version.dev[1] if self._version.dev else None
 
     @property
     def local(self):
+        # type: () -> Optional[str]
         if self._version.local:
             return ".".join(str(x) for x in self._version.local)
         else:
@@ -302,10 +369,12 @@ def local(self):
 
     @property
     def public(self):
+        # type: () -> str
         return str(self).split("+", 1)[0]
 
     @property
     def base_version(self):
+        # type: () -> str
         parts = []
 
         # Epoch
@@ -319,18 +388,41 @@ def base_version(self):
 
     @property
     def is_prerelease(self):
+        # type: () -> bool
         return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self):
+        # type: () -> bool
         return self.post is not None
 
     @property
     def is_devrelease(self):
+        # type: () -> bool
         return self.dev is not None
 
+    @property
+    def major(self):
+        # type: () -> int
+        return self.release[0] if len(self.release) >= 1 else 0
+
+    @property
+    def minor(self):
+        # type: () -> int
+        return self.release[1] if len(self.release) >= 2 else 0
+
+    @property
+    def micro(self):
+        # type: () -> int
+        return self.release[2] if len(self.release) >= 3 else 0
+
+
+def _parse_letter_version(
+    letter,  # type: str
+    number,  # type: Union[str, bytes, SupportsInt]
+):
+    # type: (...) -> Optional[Tuple[str, int]]
 
-def _parse_letter_version(letter, number):
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
         # not a numeral associated with it.
@@ -360,11 +452,14 @@ def _parse_letter_version(letter, number):
 
         return letter, int(number)
 
+    return None
+
 
 _local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local):
+    # type: (str) -> Optional[LocalType]
     """
     Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
     """
@@ -373,15 +468,25 @@ def _parse_local_version(local):
             part.lower() if not part.isdigit() else int(part)
             for part in _local_version_separators.split(local)
         )
+    return None
+
 
+def _cmpkey(
+    epoch,  # type: int
+    release,  # type: Tuple[int, ...]
+    pre,  # type: Optional[Tuple[str, int]]
+    post,  # type: Optional[Tuple[str, int]]
+    dev,  # type: Optional[Tuple[str, int]]
+    local,  # type: Optional[Tuple[SubLocalType]]
+):
+    # type: (...) -> CmpKey
 
-def _cmpkey(epoch, release, pre, post, dev, local):
     # When we compare a release version, we want to compare it with all of the
     # trailing zeros removed. So we'll use a reverse the list, drop all the now
     # leading zeros until we come to something non zero, then take the rest
     # re-reverse it back into the correct order and make it a tuple and use
     # that for our sorting key.
-    release = tuple(
+    _release = tuple(
         reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
     )
 
@@ -390,23 +495,31 @@ def _cmpkey(epoch, release, pre, post, dev, local):
     # if there is not a pre or a post segment. If we have one of those then
     # the normal sorting rules will handle this case correctly.
     if pre is None and post is None and dev is not None:
-        pre = -Infinity
+        _pre = NegativeInfinity  # type: PrePostDevType
     # Versions without a pre-release (except as noted above) should sort after
     # those with one.
     elif pre is None:
-        pre = Infinity
+        _pre = Infinity
+    else:
+        _pre = pre
 
     # Versions without a post segment should sort before those with one.
     if post is None:
-        post = -Infinity
+        _post = NegativeInfinity  # type: PrePostDevType
+
+    else:
+        _post = post
 
     # Versions without a development segment should sort after those with one.
     if dev is None:
-        dev = Infinity
+        _dev = Infinity  # type: PrePostDevType
+
+    else:
+        _dev = dev
 
     if local is None:
         # Versions without a local segment should sort before those with one.
-        local = -Infinity
+        _local = NegativeInfinity  # type: LocalType
     else:
         # Versions with a local segment need that segment parsed to implement
         # the sorting rules in PEP440.
@@ -415,6 +528,8 @@ def _cmpkey(epoch, release, pre, post, dev, local):
         # - Numeric segments sort numerically
         # - Shorter versions sort before longer versions when the prefixes
         #   match exactly
-        local = tuple((i, "") if isinstance(i, int) else (-Infinity, i) for i in local)
+        _local = tuple(
+            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
+        )
 
-    return epoch, release, pre, post, dev, local
+    return epoch, _release, _pre, _post, _dev, _local
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index f581a62349..7862a3cead 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==19.2
+packaging==20.4
 pyparsing==2.2.1
 six==1.10.0
 appdirs==1.4.3
diff --git a/setuptools/_vendor/packaging/__about__.py b/setuptools/_vendor/packaging/__about__.py
index dc95138d04..4d998578d7 100644
--- a/setuptools/_vendor/packaging/__about__.py
+++ b/setuptools/_vendor/packaging/__about__.py
@@ -18,10 +18,10 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "19.2"
+__version__ = "20.4"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
-__license__ = "BSD or Apache License, Version 2.0"
+__license__ = "BSD-2-Clause or Apache-2.0"
 __copyright__ = "Copyright 2014-2019 %s" % __author__
diff --git a/setuptools/_vendor/packaging/_compat.py b/setuptools/_vendor/packaging/_compat.py
index 25da473c19..e54bd4ede8 100644
--- a/setuptools/_vendor/packaging/_compat.py
+++ b/setuptools/_vendor/packaging/_compat.py
@@ -5,6 +5,11 @@
 
 import sys
 
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Dict, Tuple, Type
+
 
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
@@ -18,14 +23,16 @@
 
 
 def with_metaclass(meta, *bases):
+    # type: (Type[Any], Tuple[Type[Any], ...]) -> Any
     """
     Create a base class with a metaclass.
     """
     # This requires a bit of explanation: the basic idea is to make a dummy
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
-    class metaclass(meta):
+    class metaclass(meta):  # type: ignore
         def __new__(cls, name, this_bases, d):
+            # type: (Type[Any], str, Tuple[Any], Dict[Any, Any]) -> Any
             return meta(name, bases, d)
 
     return type.__new__(metaclass, "temporary_class", (), {})
diff --git a/setuptools/_vendor/packaging/_structures.py b/setuptools/_vendor/packaging/_structures.py
index 68dcca634d..800d5c5588 100644
--- a/setuptools/_vendor/packaging/_structures.py
+++ b/setuptools/_vendor/packaging/_structures.py
@@ -4,65 +4,83 @@
 from __future__ import absolute_import, division, print_function
 
 
-class Infinity(object):
+class InfinityType(object):
     def __repr__(self):
+        # type: () -> str
         return "Infinity"
 
     def __hash__(self):
+        # type: () -> int
         return hash(repr(self))
 
     def __lt__(self, other):
+        # type: (object) -> bool
         return False
 
     def __le__(self, other):
+        # type: (object) -> bool
         return False
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return isinstance(other, self.__class__)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return not isinstance(other, self.__class__)
 
     def __gt__(self, other):
+        # type: (object) -> bool
         return True
 
     def __ge__(self, other):
+        # type: (object) -> bool
         return True
 
     def __neg__(self):
+        # type: (object) -> NegativeInfinityType
         return NegativeInfinity
 
 
-Infinity = Infinity()
+Infinity = InfinityType()
 
 
-class NegativeInfinity(object):
+class NegativeInfinityType(object):
     def __repr__(self):
+        # type: () -> str
         return "-Infinity"
 
     def __hash__(self):
+        # type: () -> int
         return hash(repr(self))
 
     def __lt__(self, other):
+        # type: (object) -> bool
         return True
 
     def __le__(self, other):
+        # type: (object) -> bool
         return True
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return isinstance(other, self.__class__)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return not isinstance(other, self.__class__)
 
     def __gt__(self, other):
+        # type: (object) -> bool
         return False
 
     def __ge__(self, other):
+        # type: (object) -> bool
         return False
 
     def __neg__(self):
+        # type: (object) -> InfinityType
         return Infinity
 
 
-NegativeInfinity = NegativeInfinity()
+NegativeInfinity = NegativeInfinityType()
diff --git a/setuptools/_vendor/packaging/_typing.py b/setuptools/_vendor/packaging/_typing.py
new file mode 100644
index 0000000000..77a8b9185a
--- /dev/null
+++ b/setuptools/_vendor/packaging/_typing.py
@@ -0,0 +1,48 @@
+"""For neatly implementing static typing in packaging.
+
+`mypy` - the static type analysis tool we use - uses the `typing` module, which
+provides core functionality fundamental to mypy's functioning.
+
+Generally, `typing` would be imported at runtime and used in that fashion -
+it acts as a no-op at runtime and does not have any run-time overhead by
+design.
+
+As it turns out, `typing` is not vendorable - it uses separate sources for
+Python 2/Python 3. Thus, this codebase can not expect it to be present.
+To work around this, mypy allows the typing import to be behind a False-y
+optional to prevent it from running at runtime and type-comments can be used
+to remove the need for the types to be accessible directly during runtime.
+
+This module provides the False-y guard in a nicely named fashion so that a
+curious maintainer can reach here to read this.
+
+In packaging, all static-typing related imports should be guarded as follows:
+
+    from packaging._typing import TYPE_CHECKING
+
+    if TYPE_CHECKING:
+        from typing import ...
+
+Ref: https://github.com/python/mypy/issues/3216
+"""
+
+__all__ = ["TYPE_CHECKING", "cast"]
+
+# The TYPE_CHECKING constant defined by the typing module is False at runtime
+# but True while type checking.
+if False:  # pragma: no cover
+    from typing import TYPE_CHECKING
+else:
+    TYPE_CHECKING = False
+
+# typing's cast syntax requires calling typing.cast at runtime, but we don't
+# want to import typing at runtime. Here, we inform the type checkers that
+# we're importing `typing.cast` as `cast` and re-implement typing.cast's
+# runtime behavior in a block that is ignored by type checkers.
+if TYPE_CHECKING:  # pragma: no cover
+    # not executed at runtime
+    from typing import cast
+else:
+    # executed at runtime
+    def cast(type_, value):  # noqa
+        return value
diff --git a/setuptools/_vendor/packaging/markers.py b/setuptools/_vendor/packaging/markers.py
index 4bdfdb24f2..03fbdfcc94 100644
--- a/setuptools/_vendor/packaging/markers.py
+++ b/setuptools/_vendor/packaging/markers.py
@@ -13,8 +13,14 @@
 from setuptools.extern.pyparsing import Literal as L  # noqa
 
 from ._compat import string_types
+from ._typing import TYPE_CHECKING
 from .specifiers import Specifier, InvalidSpecifier
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+
+    Operator = Callable[[str, str], bool]
+
 
 __all__ = [
     "InvalidMarker",
@@ -46,30 +52,37 @@ class UndefinedEnvironmentName(ValueError):
 
 class Node(object):
     def __init__(self, value):
+        # type: (Any) -> None
         self.value = value
 
     def __str__(self):
+        # type: () -> str
         return str(self.value)
 
     def __repr__(self):
+        # type: () -> str
         return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
 
     def serialize(self):
+        # type: () -> str
         raise NotImplementedError
 
 
 class Variable(Node):
     def serialize(self):
+        # type: () -> str
         return str(self)
 
 
 class Value(Node):
     def serialize(self):
+        # type: () -> str
         return '"{0}"'.format(self)
 
 
 class Op(Node):
     def serialize(self):
+        # type: () -> str
         return str(self)
 
 
@@ -85,13 +98,13 @@ def serialize(self):
     | L("python_version")
     | L("sys_platform")
     | L("os_name")
-    | L("os.name")
+    | L("os.name")  # PEP-345
     | L("sys.platform")  # PEP-345
     | L("platform.version")  # PEP-345
     | L("platform.machine")  # PEP-345
     | L("platform.python_implementation")  # PEP-345
-    | L("python_implementation")  # PEP-345
-    | L("extra")  # undocumented setuptools legacy
+    | L("python_implementation")  # undocumented setuptools legacy
+    | L("extra")  # PEP-508
 )
 ALIASES = {
     "os.name": "os_name",
@@ -131,6 +144,7 @@ def serialize(self):
 
 
 def _coerce_parse_result(results):
+    # type: (Union[ParseResults, List[Any]]) -> List[Any]
     if isinstance(results, ParseResults):
         return [_coerce_parse_result(i) for i in results]
     else:
@@ -138,6 +152,8 @@ def _coerce_parse_result(results):
 
 
 def _format_marker(marker, first=True):
+    # type: (Union[List[str], Tuple[Node, ...], str], Optional[bool]) -> str
+
     assert isinstance(marker, (list, tuple, string_types))
 
     # Sometimes we have a structure like [[...]] which is a single item list
@@ -172,10 +188,11 @@ def _format_marker(marker, first=True):
     "!=": operator.ne,
     ">=": operator.ge,
     ">": operator.gt,
-}
+}  # type: Dict[str, Operator]
 
 
 def _eval_op(lhs, op, rhs):
+    # type: (str, Op, str) -> bool
     try:
         spec = Specifier("".join([op.serialize(), rhs]))
     except InvalidSpecifier:
@@ -183,7 +200,7 @@ def _eval_op(lhs, op, rhs):
     else:
         return spec.contains(lhs)
 
-    oper = _operators.get(op.serialize())
+    oper = _operators.get(op.serialize())  # type: Optional[Operator]
     if oper is None:
         raise UndefinedComparison(
             "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
@@ -192,13 +209,18 @@ def _eval_op(lhs, op, rhs):
     return oper(lhs, rhs)
 
 
-_undefined = object()
+class Undefined(object):
+    pass
+
+
+_undefined = Undefined()
 
 
 def _get_env(environment, name):
-    value = environment.get(name, _undefined)
+    # type: (Dict[str, str], str) -> str
+    value = environment.get(name, _undefined)  # type: Union[str, Undefined]
 
-    if value is _undefined:
+    if isinstance(value, Undefined):
         raise UndefinedEnvironmentName(
             "{0!r} does not exist in evaluation environment.".format(name)
         )
@@ -207,7 +229,8 @@ def _get_env(environment, name):
 
 
 def _evaluate_markers(markers, environment):
-    groups = [[]]
+    # type: (List[Any], Dict[str, str]) -> bool
+    groups = [[]]  # type: List[List[bool]]
 
     for marker in markers:
         assert isinstance(marker, (list, tuple, string_types))
@@ -234,6 +257,7 @@ def _evaluate_markers(markers, environment):
 
 
 def format_full_version(info):
+    # type: (sys._version_info) -> str
     version = "{0.major}.{0.minor}.{0.micro}".format(info)
     kind = info.releaselevel
     if kind != "final":
@@ -242,9 +266,13 @@ def format_full_version(info):
 
 
 def default_environment():
+    # type: () -> Dict[str, str]
     if hasattr(sys, "implementation"):
-        iver = format_full_version(sys.implementation.version)
-        implementation_name = sys.implementation.name
+        # Ignoring the `sys.implementation` reference for type checking due to
+        # mypy not liking that the attribute doesn't exist in Python 2.7 when
+        # run with the `--py27` flag.
+        iver = format_full_version(sys.implementation.version)  # type: ignore
+        implementation_name = sys.implementation.name  # type: ignore
     else:
         iver = "0"
         implementation_name = ""
@@ -266,6 +294,7 @@ def default_environment():
 
 class Marker(object):
     def __init__(self, marker):
+        # type: (str) -> None
         try:
             self._markers = _coerce_parse_result(MARKER.parseString(marker))
         except ParseException as e:
@@ -275,12 +304,15 @@ def __init__(self, marker):
             raise InvalidMarker(err_str)
 
     def __str__(self):
+        # type: () -> str
         return _format_marker(self._markers)
 
     def __repr__(self):
+        # type: () -> str
         return "<Marker({0!r})>".format(str(self))
 
     def evaluate(self, environment=None):
+        # type: (Optional[Dict[str, str]]) -> bool
         """Evaluate a marker.
 
         Return the boolean from evaluating the given marker against the
diff --git a/setuptools/_vendor/packaging/py.typed b/setuptools/_vendor/packaging/py.typed
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/setuptools/_vendor/packaging/requirements.py b/setuptools/_vendor/packaging/requirements.py
index 8a0c2cb9be..06b1748851 100644
--- a/setuptools/_vendor/packaging/requirements.py
+++ b/setuptools/_vendor/packaging/requirements.py
@@ -11,9 +11,13 @@
 from setuptools.extern.pyparsing import Literal as L  # noqa
 from setuptools.extern.six.moves.urllib import parse as urlparse
 
+from ._typing import TYPE_CHECKING
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import List
+
 
 class InvalidRequirement(ValueError):
     """
@@ -89,6 +93,7 @@ class Requirement(object):
     # TODO: Can we normalize the name and extra name?
 
     def __init__(self, requirement_string):
+        # type: (str) -> None
         try:
             req = REQUIREMENT.parseString(requirement_string)
         except ParseException as e:
@@ -116,7 +121,8 @@ def __init__(self, requirement_string):
         self.marker = req.marker if req.marker else None
 
     def __str__(self):
-        parts = [self.name]
+        # type: () -> str
+        parts = [self.name]  # type: List[str]
 
         if self.extras:
             parts.append("[{0}]".format(",".join(sorted(self.extras))))
@@ -135,4 +141,5 @@ def __str__(self):
         return "".join(parts)
 
     def __repr__(self):
+        # type: () -> str
         return "<Requirement({0!r})>".format(str(self))
diff --git a/setuptools/_vendor/packaging/specifiers.py b/setuptools/_vendor/packaging/specifiers.py
index 743576a080..fe09bb1dbb 100644
--- a/setuptools/_vendor/packaging/specifiers.py
+++ b/setuptools/_vendor/packaging/specifiers.py
@@ -9,8 +9,27 @@
 import re
 
 from ._compat import string_types, with_metaclass
+from ._typing import TYPE_CHECKING
+from .utils import canonicalize_version
 from .version import Version, LegacyVersion, parse
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import (
+        List,
+        Dict,
+        Union,
+        Iterable,
+        Iterator,
+        Optional,
+        Callable,
+        Tuple,
+        FrozenSet,
+    )
+
+    ParsedVersion = Union[Version, LegacyVersion]
+    UnparsedVersion = Union[Version, LegacyVersion, str]
+    CallableOperator = Callable[[ParsedVersion, str], bool]
+
 
 class InvalidSpecifier(ValueError):
     """
@@ -18,9 +37,10 @@ class InvalidSpecifier(ValueError):
     """
 
 
-class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):  # type: ignore
     @abc.abstractmethod
     def __str__(self):
+        # type: () -> str
         """
         Returns the str representation of this Specifier like object. This
         should be representative of the Specifier itself.
@@ -28,12 +48,14 @@ def __str__(self):
 
     @abc.abstractmethod
     def __hash__(self):
+        # type: () -> int
         """
         Returns a hash value for this Specifier like object.
         """
 
     @abc.abstractmethod
     def __eq__(self, other):
+        # type: (object) -> bool
         """
         Returns a boolean representing whether or not the two Specifier like
         objects are equal.
@@ -41,6 +63,7 @@ def __eq__(self, other):
 
     @abc.abstractmethod
     def __ne__(self, other):
+        # type: (object) -> bool
         """
         Returns a boolean representing whether or not the two Specifier like
         objects are not equal.
@@ -48,6 +71,7 @@ def __ne__(self, other):
 
     @abc.abstractproperty
     def prereleases(self):
+        # type: () -> Optional[bool]
         """
         Returns whether or not pre-releases as a whole are allowed by this
         specifier.
@@ -55,6 +79,7 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         """
         Sets whether or not pre-releases as a whole are allowed by this
         specifier.
@@ -62,12 +87,14 @@ def prereleases(self, value):
 
     @abc.abstractmethod
     def contains(self, item, prereleases=None):
+        # type: (str, Optional[bool]) -> bool
         """
         Determines if the given item is contained within this specifier.
         """
 
     @abc.abstractmethod
     def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
         """
         Takes an iterable of items and filters them so that only items which
         are contained within this specifier are allowed in it.
@@ -76,19 +103,24 @@ def filter(self, iterable, prereleases=None):
 
 class _IndividualSpecifier(BaseSpecifier):
 
-    _operators = {}
+    _operators = {}  # type: Dict[str, str]
 
     def __init__(self, spec="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
         match = self._regex.search(spec)
         if not match:
             raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
 
-        self._spec = (match.group("operator").strip(), match.group("version").strip())
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )  # type: Tuple[str, str]
 
         # Store whether or not this Specifier should accept prereleases
         self._prereleases = prereleases
 
     def __repr__(self):
+        # type: () -> str
         pre = (
             ", prereleases={0!r}".format(self.prereleases)
             if self._prereleases is not None
@@ -98,26 +130,35 @@ def __repr__(self):
         return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre)
 
     def __str__(self):
+        # type: () -> str
         return "{0}{1}".format(*self._spec)
 
+    @property
+    def _canonical_spec(self):
+        # type: () -> Tuple[str, Union[Version, str]]
+        return self._spec[0], canonicalize_version(self._spec[1])
+
     def __hash__(self):
-        return hash(self._spec)
+        # type: () -> int
+        return hash(self._canonical_spec)
 
     def __eq__(self, other):
+        # type: (object) -> bool
         if isinstance(other, string_types):
             try:
-                other = self.__class__(other)
+                other = self.__class__(str(other))
             except InvalidSpecifier:
                 return NotImplemented
         elif not isinstance(other, self.__class__):
             return NotImplemented
 
-        return self._spec == other._spec
+        return self._canonical_spec == other._canonical_spec
 
     def __ne__(self, other):
+        # type: (object) -> bool
         if isinstance(other, string_types):
             try:
-                other = self.__class__(other)
+                other = self.__class__(str(other))
             except InvalidSpecifier:
                 return NotImplemented
         elif not isinstance(other, self.__class__):
@@ -126,52 +167,67 @@ def __ne__(self, other):
         return self._spec != other._spec
 
     def _get_operator(self, op):
-        return getattr(self, "_compare_{0}".format(self._operators[op]))
+        # type: (str) -> CallableOperator
+        operator_callable = getattr(
+            self, "_compare_{0}".format(self._operators[op])
+        )  # type: CallableOperator
+        return operator_callable
 
     def _coerce_version(self, version):
+        # type: (UnparsedVersion) -> ParsedVersion
         if not isinstance(version, (LegacyVersion, Version)):
             version = parse(version)
         return version
 
     @property
     def operator(self):
+        # type: () -> str
         return self._spec[0]
 
     @property
     def version(self):
+        # type: () -> str
         return self._spec[1]
 
     @property
     def prereleases(self):
+        # type: () -> Optional[bool]
         return self._prereleases
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
     def __contains__(self, item):
+        # type: (str) -> bool
         return self.contains(item)
 
     def contains(self, item, prereleases=None):
+        # type: (UnparsedVersion, Optional[bool]) -> bool
+
         # Determine if prereleases are to be allowed or not.
         if prereleases is None:
             prereleases = self.prereleases
 
         # Normalize item to a Version or LegacyVersion, this allows us to have
         # a shortcut for ``"2.0" in Specifier(">=2")
-        item = self._coerce_version(item)
+        normalized_item = self._coerce_version(item)
 
         # Determine if we should be supporting prereleases in this specifier
         # or not, if we do not support prereleases than we can short circuit
         # logic if this version is a prereleases.
-        if item.is_prerelease and not prereleases:
+        if normalized_item.is_prerelease and not prereleases:
             return False
 
         # Actually do the comparison to determine if this item is contained
         # within this Specifier or not.
-        return self._get_operator(self.operator)(item, self.version)
+        operator_callable = self._get_operator(self.operator)  # type: CallableOperator
+        return operator_callable(normalized_item, self.version)
 
     def filter(self, iterable, prereleases=None):
+        # type: (Iterable[UnparsedVersion], Optional[bool]) -> Iterable[UnparsedVersion]
+
         yielded = False
         found_prereleases = []
 
@@ -230,32 +286,43 @@ class LegacySpecifier(_IndividualSpecifier):
     }
 
     def _coerce_version(self, version):
+        # type: (Union[ParsedVersion, str]) -> LegacyVersion
         if not isinstance(version, LegacyVersion):
             version = LegacyVersion(str(version))
         return version
 
     def _compare_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective == self._coerce_version(spec)
 
     def _compare_not_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective != self._coerce_version(spec)
 
     def _compare_less_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective <= self._coerce_version(spec)
 
     def _compare_greater_than_equal(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective >= self._coerce_version(spec)
 
     def _compare_less_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective < self._coerce_version(spec)
 
     def _compare_greater_than(self, prospective, spec):
+        # type: (LegacyVersion, str) -> bool
         return prospective > self._coerce_version(spec)
 
 
-def _require_version_compare(fn):
+def _require_version_compare(
+    fn  # type: (Callable[[Specifier, ParsedVersion, str], bool])
+):
+    # type: (...) -> Callable[[Specifier, ParsedVersion, str], bool]
     @functools.wraps(fn)
     def wrapped(self, prospective, spec):
+        # type: (Specifier, ParsedVersion, str) -> bool
         if not isinstance(prospective, Version):
             return False
         return fn(self, prospective, spec)
@@ -373,6 +440,8 @@ class Specifier(_IndividualSpecifier):
 
     @_require_version_compare
     def _compare_compatible(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
         # Compatible releases have an equivalent combination of >= and ==. That
         # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
         # implement this in terms of the other specifiers instead of
@@ -400,56 +469,75 @@ def _compare_compatible(self, prospective, spec):
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
+
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
             # In the case of prefix matching we want to ignore local segment.
             prospective = Version(prospective.public)
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
-            spec = _version_split(spec[:-2])  # Remove the trailing .*
+            split_spec = _version_split(spec[:-2])  # Remove the trailing .*
 
             # Split the prospective version out by dots, and pretend that there
             # is an implicit dot in between a release segment and a pre-release
             # segment.
-            prospective = _version_split(str(prospective))
+            split_prospective = _version_split(str(prospective))
 
             # Shorten the prospective version to be the same length as the spec
             # so that we can determine if the specifier is a prefix of the
             # prospective version or not.
-            prospective = prospective[: len(spec)]
+            shortened_prospective = split_prospective[: len(split_spec)]
 
             # Pad out our two sides with zeros so that they both equal the same
             # length.
-            spec, prospective = _pad_version(spec, prospective)
+            padded_spec, padded_prospective = _pad_version(
+                split_spec, shortened_prospective
+            )
+
+            return padded_prospective == padded_spec
         else:
             # Convert our spec string into a Version
-            spec = Version(spec)
+            spec_version = Version(spec)
 
             # If the specifier does not have a local segment, then we want to
             # act as if the prospective version also does not have a local
             # segment.
-            if not spec.local:
+            if not spec_version.local:
                 prospective = Version(prospective.public)
 
-        return prospective == spec
+            return prospective == spec_version
 
     @_require_version_compare
     def _compare_not_equal(self, prospective, spec):
+        # type: (ParsedVersion, str) -> bool
         return not self._compare_equal(prospective, spec)
 
     @_require_version_compare
     def _compare_less_than_equal(self, prospective, spec):
-        return prospective <= Version(spec)
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) <= Version(spec)
 
     @_require_version_compare
     def _compare_greater_than_equal(self, prospective, spec):
-        return prospective >= Version(spec)
+        # type: (ParsedVersion, str) -> bool
+
+        # NB: Local version identifiers are NOT permitted in the version
+        # specifier, so local version labels can be universally removed from
+        # the prospective version.
+        return Version(prospective.public) >= Version(spec)
 
     @_require_version_compare
-    def _compare_less_than(self, prospective, spec):
+    def _compare_less_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
-        spec = Version(spec)
+        spec = Version(spec_str)
 
         # Check to see if the prospective version is less than the spec
         # version. If it's not we can short circuit and just return False now
@@ -471,10 +559,12 @@ def _compare_less_than(self, prospective, spec):
         return True
 
     @_require_version_compare
-    def _compare_greater_than(self, prospective, spec):
+    def _compare_greater_than(self, prospective, spec_str):
+        # type: (ParsedVersion, str) -> bool
+
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
-        spec = Version(spec)
+        spec = Version(spec_str)
 
         # Check to see if the prospective version is greater than the spec
         # version. If it's not we can short circuit and just return False now
@@ -502,10 +592,13 @@ def _compare_greater_than(self, prospective, spec):
         return True
 
     def _compare_arbitrary(self, prospective, spec):
+        # type: (Version, str) -> bool
         return str(prospective).lower() == str(spec).lower()
 
     @property
     def prereleases(self):
+        # type: () -> bool
+
         # If there is an explicit prereleases set for this, then we'll just
         # blindly use that.
         if self._prereleases is not None:
@@ -530,6 +623,7 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
 
@@ -537,7 +631,8 @@ def prereleases(self, value):
 
 
 def _version_split(version):
-    result = []
+    # type: (str) -> List[str]
+    result = []  # type: List[str]
     for item in version.split("."):
         match = _prefix_regex.search(item)
         if match:
@@ -548,6 +643,7 @@ def _version_split(version):
 
 
 def _pad_version(left, right):
+    # type: (List[str], List[str]) -> Tuple[List[str], List[str]]
     left_split, right_split = [], []
 
     # Get the release segment of our versions
@@ -567,14 +663,16 @@ def _pad_version(left, right):
 
 class SpecifierSet(BaseSpecifier):
     def __init__(self, specifiers="", prereleases=None):
-        # Split on , to break each indidivual specifier into it's own item, and
+        # type: (str, Optional[bool]) -> None
+
+        # Split on , to break each individual specifier into it's own item, and
         # strip each item to remove leading/trailing whitespace.
-        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+        split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
 
         # Parsed each individual specifier, attempting first to make it a
         # Specifier and falling back to a LegacySpecifier.
         parsed = set()
-        for specifier in specifiers:
+        for specifier in split_specifiers:
             try:
                 parsed.add(Specifier(specifier))
             except InvalidSpecifier:
@@ -588,6 +686,7 @@ def __init__(self, specifiers="", prereleases=None):
         self._prereleases = prereleases
 
     def __repr__(self):
+        # type: () -> str
         pre = (
             ", prereleases={0!r}".format(self.prereleases)
             if self._prereleases is not None
@@ -597,12 +696,15 @@ def __repr__(self):
         return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
 
     def __str__(self):
+        # type: () -> str
         return ",".join(sorted(str(s) for s in self._specs))
 
     def __hash__(self):
+        # type: () -> int
         return hash(self._specs)
 
     def __and__(self, other):
+        # type: (Union[SpecifierSet, str]) -> SpecifierSet
         if isinstance(other, string_types):
             other = SpecifierSet(other)
         elif not isinstance(other, SpecifierSet):
@@ -626,9 +728,8 @@ def __and__(self, other):
         return specifier
 
     def __eq__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
             other = SpecifierSet(str(other))
         elif not isinstance(other, SpecifierSet):
             return NotImplemented
@@ -636,9 +737,8 @@ def __eq__(self, other):
         return self._specs == other._specs
 
     def __ne__(self, other):
-        if isinstance(other, string_types):
-            other = SpecifierSet(other)
-        elif isinstance(other, _IndividualSpecifier):
+        # type: (object) -> bool
+        if isinstance(other, (string_types, _IndividualSpecifier)):
             other = SpecifierSet(str(other))
         elif not isinstance(other, SpecifierSet):
             return NotImplemented
@@ -646,13 +746,17 @@ def __ne__(self, other):
         return self._specs != other._specs
 
     def __len__(self):
+        # type: () -> int
         return len(self._specs)
 
     def __iter__(self):
+        # type: () -> Iterator[FrozenSet[_IndividualSpecifier]]
         return iter(self._specs)
 
     @property
     def prereleases(self):
+        # type: () -> Optional[bool]
+
         # If we have been given an explicit prerelease modifier, then we'll
         # pass that through here.
         if self._prereleases is not None:
@@ -670,12 +774,16 @@ def prereleases(self):
 
     @prereleases.setter
     def prereleases(self, value):
+        # type: (bool) -> None
         self._prereleases = value
 
     def __contains__(self, item):
+        # type: (Union[ParsedVersion, str]) -> bool
         return self.contains(item)
 
     def contains(self, item, prereleases=None):
+        # type: (Union[ParsedVersion, str], Optional[bool]) -> bool
+
         # Ensure that our item is a Version or LegacyVersion instance.
         if not isinstance(item, (LegacyVersion, Version)):
             item = parse(item)
@@ -701,7 +809,13 @@ def contains(self, item, prereleases=None):
         #       will always return True, this is an explicit design decision.
         return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
-    def filter(self, iterable, prereleases=None):
+    def filter(
+        self,
+        iterable,  # type: Iterable[Union[ParsedVersion, str]]
+        prereleases=None,  # type: Optional[bool]
+    ):
+        # type: (...) -> Iterable[Union[ParsedVersion, str]]
+
         # Determine if we're forcing a prerelease or not, if we're not forcing
         # one for this particular filter call, then we'll use whatever the
         # SpecifierSet thinks for whether or not we should support prereleases.
@@ -719,8 +833,8 @@ def filter(self, iterable, prereleases=None):
         # which will filter out any pre-releases, unless there are no final
         # releases, and which will filter out LegacyVersion in general.
         else:
-            filtered = []
-            found_prereleases = []
+            filtered = []  # type: List[Union[ParsedVersion, str]]
+            found_prereleases = []  # type: List[Union[ParsedVersion, str]]
 
             for item in iterable:
                 # Ensure that we some kind of Version class for this item.
diff --git a/setuptools/_vendor/packaging/tags.py b/setuptools/_vendor/packaging/tags.py
index ec9942f0f6..9064910b8b 100644
--- a/setuptools/_vendor/packaging/tags.py
+++ b/setuptools/_vendor/packaging/tags.py
@@ -13,12 +13,37 @@
 
     EXTENSION_SUFFIXES = [x[0] for x in imp.get_suffixes()]
     del imp
+import logging
+import os
 import platform
 import re
+import struct
 import sys
 import sysconfig
 import warnings
 
+from ._typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import (
+        Dict,
+        FrozenSet,
+        IO,
+        Iterable,
+        Iterator,
+        List,
+        Optional,
+        Sequence,
+        Tuple,
+        Union,
+    )
+
+    PythonVersion = Sequence[int]
+    MacVersion = Tuple[int, int]
+    GlibcVersion = Tuple[int, int]
+
+
+logger = logging.getLogger(__name__)
 
 INTERPRETER_SHORT_NAMES = {
     "python": "py",  # Generic.
@@ -26,34 +51,48 @@
     "pypy": "pp",
     "ironpython": "ip",
     "jython": "jy",
-}
+}  # type: Dict[str, str]
 
 
 _32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
 
 
 class Tag(object):
+    """
+    A representation of the tag triple for a wheel.
+
+    Instances are considered immutable and thus are hashable. Equality checking
+    is also supported.
+    """
 
     __slots__ = ["_interpreter", "_abi", "_platform"]
 
     def __init__(self, interpreter, abi, platform):
+        # type: (str, str, str) -> None
         self._interpreter = interpreter.lower()
         self._abi = abi.lower()
         self._platform = platform.lower()
 
     @property
     def interpreter(self):
+        # type: () -> str
         return self._interpreter
 
     @property
     def abi(self):
+        # type: () -> str
         return self._abi
 
     @property
     def platform(self):
+        # type: () -> str
         return self._platform
 
     def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, Tag):
+            return NotImplemented
+
         return (
             (self.platform == other.platform)
             and (self.abi == other.abi)
@@ -61,16 +100,26 @@ def __eq__(self, other):
         )
 
     def __hash__(self):
+        # type: () -> int
         return hash((self._interpreter, self._abi, self._platform))
 
     def __str__(self):
+        # type: () -> str
         return "{}-{}-{}".format(self._interpreter, self._abi, self._platform)
 
     def __repr__(self):
+        # type: () -> str
         return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
 
 
 def parse_tag(tag):
+    # type: (str) -> FrozenSet[Tag]
+    """
+    Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
+
+    Returning a set is required due to the possibility that the tag is a
+    compressed tag set.
+    """
     tags = set()
     interpreters, abis, platforms = tag.split("-")
     for interpreter in interpreters.split("."):
@@ -80,20 +129,54 @@ def parse_tag(tag):
     return frozenset(tags)
 
 
+def _warn_keyword_parameter(func_name, kwargs):
+    # type: (str, Dict[str, bool]) -> bool
+    """
+    Backwards-compatibility with Python 2.7 to allow treating 'warn' as keyword-only.
+    """
+    if not kwargs:
+        return False
+    elif len(kwargs) > 1 or "warn" not in kwargs:
+        kwargs.pop("warn", None)
+        arg = next(iter(kwargs.keys()))
+        raise TypeError(
+            "{}() got an unexpected keyword argument {!r}".format(func_name, arg)
+        )
+    return kwargs["warn"]
+
+
+def _get_config_var(name, warn=False):
+    # type: (str, bool) -> Union[int, str, None]
+    value = sysconfig.get_config_var(name)
+    if value is None and warn:
+        logger.debug(
+            "Config variable '%s' is unset, Python ABI tag may be incorrect", name
+        )
+    return value
+
+
 def _normalize_string(string):
+    # type: (str) -> str
     return string.replace(".", "_").replace("-", "_")
 
 
-def _cpython_interpreter(py_version):
-    # TODO: Is using py_version_nodot for interpreter version critical?
-    return "cp{major}{minor}".format(major=py_version[0], minor=py_version[1])
+def _abi3_applies(python_version):
+    # type: (PythonVersion) -> bool
+    """
+    Determine if the Python version supports abi3.
+
+    PEP 384 was first implemented in Python 3.2.
+    """
+    return len(python_version) > 1 and tuple(python_version) >= (3, 2)
 
 
-def _cpython_abis(py_version):
+def _cpython_abis(py_version, warn=False):
+    # type: (PythonVersion, bool) -> List[str]
+    py_version = tuple(py_version)  # To allow for version comparison.
     abis = []
-    version = "{}{}".format(*py_version[:2])
+    version = _version_nodot(py_version[:2])
     debug = pymalloc = ucs4 = ""
-    with_debug = sysconfig.get_config_var("Py_DEBUG")
+    with_debug = _get_config_var("Py_DEBUG", warn)
     has_refcount = hasattr(sys, "gettotalrefcount")
     # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
     # extension modules is the best option.
@@ -102,11 +185,11 @@ def _cpython_abis(py_version):
     if with_debug or (with_debug is None and (has_refcount or has_ext)):
         debug = "d"
     if py_version < (3, 8):
-        with_pymalloc = sysconfig.get_config_var("WITH_PYMALLOC")
+        with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
         if with_pymalloc or with_pymalloc is None:
             pymalloc = "m"
         if py_version < (3, 3):
-            unicode_size = sysconfig.get_config_var("Py_UNICODE_SIZE")
+            unicode_size = _get_config_var("Py_UNICODE_SIZE", warn)
             if unicode_size == 4 or (
                 unicode_size is None and sys.maxunicode == 0x10FFFF
             ):
@@ -124,86 +207,148 @@ def _cpython_abis(py_version):
     return abis
 
 
-def _cpython_tags(py_version, interpreter, abis, platforms):
+def cpython_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a CPython interpreter.
+
+    The tags consist of:
+    - cp<python_version>-<abi>-<platform>
+    - cp<python_version>-abi3-<platform>
+    - cp<python_version>-none-<platform>
+    - cp<less than python_version>-abi3-<platform>  # Older Python versions down to 3.2.
+
+    If python_version only specifies a major version then user-provided ABIs and
+    the 'none' ABItag will be used.
+
+    If 'abi3' or 'none' are specified in 'abis' then they will be yielded at
+    their normal position and not at the beginning.
+    """
+    warn = _warn_keyword_parameter("cpython_tags", kwargs)
+    if not python_version:
+        python_version = sys.version_info[:2]
+
+    interpreter = "cp{}".format(_version_nodot(python_version[:2]))
+
+    if abis is None:
+        if len(python_version) > 1:
+            abis = _cpython_abis(python_version, warn)
+        else:
+            abis = []
+    abis = list(abis)
+    # 'abi3' and 'none' are explicitly handled later.
+    for explicit_abi in ("abi3", "none"):
+        try:
+            abis.remove(explicit_abi)
+        except ValueError:
+            pass
+
+    platforms = list(platforms or _platform_tags())
     for abi in abis:
         for platform_ in platforms:
             yield Tag(interpreter, abi, platform_)
-    for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
-        yield tag
+    if _abi3_applies(python_version):
+        for tag in (Tag(interpreter, "abi3", platform_) for platform_ in platforms):
+            yield tag
     for tag in (Tag(interpreter, "none", platform_) for platform_ in platforms):
         yield tag
-    # PEP 384 was first implemented in Python 3.2.
-    for minor_version in range(py_version[1] - 1, 1, -1):
-        for platform_ in platforms:
-            interpreter = "cp{major}{minor}".format(
-                major=py_version[0], minor=minor_version
-            )
-            yield Tag(interpreter, "abi3", platform_)
-
 
-def _pypy_interpreter():
-    return "pp{py_major}{pypy_major}{pypy_minor}".format(
-        py_major=sys.version_info[0],
-        pypy_major=sys.pypy_version_info.major,
-        pypy_minor=sys.pypy_version_info.minor,
-    )
+    if _abi3_applies(python_version):
+        for minor_version in range(python_version[1] - 1, 1, -1):
+            for platform_ in platforms:
+                interpreter = "cp{version}".format(
+                    version=_version_nodot((python_version[0], minor_version))
+                )
+                yield Tag(interpreter, "abi3", platform_)
 
 
 def _generic_abi():
+    # type: () -> Iterator[str]
     abi = sysconfig.get_config_var("SOABI")
     if abi:
-        return _normalize_string(abi)
-    else:
-        return "none"
+        yield _normalize_string(abi)
 
 
-def _pypy_tags(py_version, interpreter, abi, platforms):
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    for tag in (Tag(interpreter, "none", platform) for platform in platforms):
-        yield tag
+def generic_tags(
+    interpreter=None,  # type: Optional[str]
+    abis=None,  # type: Optional[Iterable[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
+    **kwargs  # type: bool
+):
+    # type: (...) -> Iterator[Tag]
+    """
+    Yields the tags for a generic interpreter.
 
+    The tags consist of:
+    - <interpreter>-<abi>-<platform>
 
-def _generic_tags(interpreter, py_version, abi, platforms):
-    for tag in (Tag(interpreter, abi, platform) for platform in platforms):
-        yield tag
-    if abi != "none":
-        tags = (Tag(interpreter, "none", platform_) for platform_ in platforms)
-        for tag in tags:
-            yield tag
+    The "none" ABI will be added if it was not explicitly provided.
+    """
+    warn = _warn_keyword_parameter("generic_tags", kwargs)
+    if not interpreter:
+        interp_name = interpreter_name()
+        interp_version = interpreter_version(warn=warn)
+        interpreter = "".join([interp_name, interp_version])
+    if abis is None:
+        abis = _generic_abi()
+    platforms = list(platforms or _platform_tags())
+    abis = list(abis)
+    if "none" not in abis:
+        abis.append("none")
+    for abi in abis:
+        for platform_ in platforms:
+            yield Tag(interpreter, abi, platform_)
 
 
 def _py_interpreter_range(py_version):
+    # type: (PythonVersion) -> Iterator[str]
     """
-    Yield Python versions in descending order.
+    Yields Python versions in descending order.
 
     After the latest version, the major-only version will be yielded, and then
-    all following versions up to 'end'.
+    all previous versions of that major version.
     """
-    yield "py{major}{minor}".format(major=py_version[0], minor=py_version[1])
+    if len(py_version) > 1:
+        yield "py{version}".format(version=_version_nodot(py_version[:2]))
     yield "py{major}".format(major=py_version[0])
-    for minor in range(py_version[1] - 1, -1, -1):
-        yield "py{major}{minor}".format(major=py_version[0], minor=minor)
+    if len(py_version) > 1:
+        for minor in range(py_version[1] - 1, -1, -1):
+            yield "py{version}".format(version=_version_nodot((py_version[0], minor)))
 
 
-def _independent_tags(interpreter, py_version, platforms):
+def compatible_tags(
+    python_version=None,  # type: Optional[PythonVersion]
+    interpreter=None,  # type: Optional[str]
+    platforms=None,  # type: Optional[Iterable[str]]
+):
+    # type: (...) -> Iterator[Tag]
     """
-    Return the sequence of tags that are consistent across implementations.
+    Yields the sequence of tags that are compatible with a specific version of Python.
 
     The tags consist of:
     - py*-none-<platform>
-    - <interpreter>-none-any
+    - <interpreter>-none-any  # ... if `interpreter` is provided.
     - py*-none-any
     """
-    for version in _py_interpreter_range(py_version):
+    if not python_version:
+        python_version = sys.version_info[:2]
+    platforms = list(platforms or _platform_tags())
+    for version in _py_interpreter_range(python_version):
         for platform_ in platforms:
             yield Tag(version, "none", platform_)
-    yield Tag(interpreter, "none", "any")
-    for version in _py_interpreter_range(py_version):
+    if interpreter:
+        yield Tag(interpreter, "none", "any")
+    for version in _py_interpreter_range(python_version):
         yield Tag(version, "none", "any")
 
 
 def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
+    # type: (str, bool) -> str
     if not is_32bit:
         return arch
 
@@ -214,6 +359,7 @@ def _mac_arch(arch, is_32bit=_32_BIT_INTERPRETER):
 
 
 def _mac_binary_formats(version, cpu_arch):
+    # type: (MacVersion, str) -> List[str]
     formats = [cpu_arch]
     if cpu_arch == "x86_64":
         if version < (10, 4):
@@ -240,32 +386,42 @@ def _mac_binary_formats(version, cpu_arch):
     return formats
 
 
-def _mac_platforms(version=None, arch=None):
-    version_str, _, cpu_arch = platform.mac_ver()
+def mac_platforms(version=None, arch=None):
+    # type: (Optional[MacVersion], Optional[str]) -> Iterator[str]
+    """
+    Yields the platform tags for a macOS system.
+
+    The `version` parameter is a two-item tuple specifying the macOS version to
+    generate platform tags for. The `arch` parameter is the CPU architecture to
+    generate platform tags for. Both parameters default to the appropriate value
+    for the current system.
+    """
+    version_str, _, cpu_arch = platform.mac_ver()  # type: ignore
     if version is None:
-        version = tuple(map(int, version_str.split(".")[:2]))
+        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+    else:
+        version = version
     if arch is None:
         arch = _mac_arch(cpu_arch)
-    platforms = []
+    else:
+        arch = arch
     for minor_version in range(version[1], -1, -1):
         compat_version = version[0], minor_version
         binary_formats = _mac_binary_formats(compat_version, arch)
         for binary_format in binary_formats:
-            platforms.append(
-                "macosx_{major}_{minor}_{binary_format}".format(
-                    major=compat_version[0],
-                    minor=compat_version[1],
-                    binary_format=binary_format,
-                )
+            yield "macosx_{major}_{minor}_{binary_format}".format(
+                major=compat_version[0],
+                minor=compat_version[1],
+                binary_format=binary_format,
             )
-    return platforms
 
 
 # From PEP 513.
 def _is_manylinux_compatible(name, glibc_version):
+    # type: (str, GlibcVersion) -> bool
     # Check for presence of _manylinux module.
     try:
-        import _manylinux
+        import _manylinux  # noqa
 
         return bool(getattr(_manylinux, name + "_compatible"))
     except (ImportError, AttributeError):
@@ -276,14 +432,50 @@ def _is_manylinux_compatible(name, glibc_version):
 
 
 def _glibc_version_string():
+    # type: () -> Optional[str]
     # Returns glibc version string, or None if not using glibc.
-    import ctypes
+    return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
+
+
+def _glibc_version_string_confstr():
+    # type: () -> Optional[str]
+    """
+    Primary implementation of glibc_version_string using os.confstr.
+    """
+    # os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
+    # to be broken or missing. This strategy is used in the standard library
+    # platform module.
+    # https://github.com/python/cpython/blob/fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71/Lib/platform.py#L175-L183
+    try:
+        # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17".
+        version_string = os.confstr(  # type: ignore[attr-defined] # noqa: F821
+            "CS_GNU_LIBC_VERSION"
+        )
+        assert version_string is not None
+        _, version = version_string.split()  # type: Tuple[str, str]
+    except (AssertionError, AttributeError, OSError, ValueError):
+        # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
+        return None
+    return version
+
+
+def _glibc_version_string_ctypes():
+    # type: () -> Optional[str]
+    """
+    Fallback implementation of glibc_version_string using ctypes.
+    """
+    try:
+        import ctypes
+    except ImportError:
+        return None
 
     # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
     # manpage says, "If filename is NULL, then the returned handle is for the
     # main program". This way we can let the linker do the work to figure out
     # which libc our process is actually using.
-    process_namespace = ctypes.CDLL(None)
+    #
+    # Note: typeshed is wrong here so we are ignoring this line.
+    process_namespace = ctypes.CDLL(None)  # type: ignore
     try:
         gnu_get_libc_version = process_namespace.gnu_get_libc_version
     except AttributeError:
@@ -293,7 +485,7 @@ def _glibc_version_string():
 
     # Call gnu_get_libc_version, which returns a string like "2.5"
     gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str = gnu_get_libc_version()
+    version_str = gnu_get_libc_version()  # type: str
     # py2 / py3 compatibility:
     if not isinstance(version_str, str):
         version_str = version_str.decode("ascii")
@@ -303,6 +495,7 @@ def _glibc_version_string():
 
 # Separated out from have_compatible_glibc for easier unit testing.
 def _check_glibc_version(version_str, required_major, minimum_minor):
+    # type: (str, int, int) -> bool
     # Parse string and check against requested version.
     #
     # We use a regexp instead of str.split because we want to discard any
@@ -324,81 +517,235 @@ def _check_glibc_version(version_str, required_major, minimum_minor):
 
 
 def _have_compatible_glibc(required_major, minimum_minor):
+    # type: (int, int) -> bool
     version_str = _glibc_version_string()
     if version_str is None:
         return False
     return _check_glibc_version(version_str, required_major, minimum_minor)
 
 
+# Python does not provide platform information at sufficient granularity to
+# identify the architecture of the running executable in some cases, so we
+# determine it dynamically by reading the information from the running
+# process. This only applies on Linux, which uses the ELF format.
+class _ELFFileHeader(object):
+    # https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    class _InvalidELFFileHeader(ValueError):
+        """
+        An invalid ELF file header was found.
+        """
+
+    ELF_MAGIC_NUMBER = 0x7F454C46
+    ELFCLASS32 = 1
+    ELFCLASS64 = 2
+    ELFDATA2LSB = 1
+    ELFDATA2MSB = 2
+    EM_386 = 3
+    EM_S390 = 22
+    EM_ARM = 40
+    EM_X86_64 = 62
+    EF_ARM_ABIMASK = 0xFF000000
+    EF_ARM_ABI_VER5 = 0x05000000
+    EF_ARM_ABI_FLOAT_HARD = 0x00000400
+
+    def __init__(self, file):
+        # type: (IO[bytes]) -> None
+        def unpack(fmt):
+            # type: (str) -> int
+            try:
+                (result,) = struct.unpack(
+                    fmt, file.read(struct.calcsize(fmt))
+                )  # type: (int, )
+            except struct.error:
+                raise _ELFFileHeader._InvalidELFFileHeader()
+            return result
+
+        self.e_ident_magic = unpack(">I")
+        if self.e_ident_magic != self.ELF_MAGIC_NUMBER:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_class = unpack("B")
+        if self.e_ident_class not in {self.ELFCLASS32, self.ELFCLASS64}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_data = unpack("B")
+        if self.e_ident_data not in {self.ELFDATA2LSB, self.ELFDATA2MSB}:
+            raise _ELFFileHeader._InvalidELFFileHeader()
+        self.e_ident_version = unpack("B")
+        self.e_ident_osabi = unpack("B")
+        self.e_ident_abiversion = unpack("B")
+        self.e_ident_pad = file.read(7)
+        format_h = "<H" if self.e_ident_data == self.ELFDATA2LSB else ">H"
+        format_i = "<I" if self.e_ident_data == self.ELFDATA2LSB else ">I"
+        format_q = "<Q" if self.e_ident_data == self.ELFDATA2LSB else ">Q"
+        format_p = format_i if self.e_ident_class == self.ELFCLASS32 else format_q
+        self.e_type = unpack(format_h)
+        self.e_machine = unpack(format_h)
+        self.e_version = unpack(format_i)
+        self.e_entry = unpack(format_p)
+        self.e_phoff = unpack(format_p)
+        self.e_shoff = unpack(format_p)
+        self.e_flags = unpack(format_i)
+        self.e_ehsize = unpack(format_h)
+        self.e_phentsize = unpack(format_h)
+        self.e_phnum = unpack(format_h)
+        self.e_shentsize = unpack(format_h)
+        self.e_shnum = unpack(format_h)
+        self.e_shstrndx = unpack(format_h)
+
+
+def _get_elf_header():
+    # type: () -> Optional[_ELFFileHeader]
+    try:
+        with open(sys.executable, "rb") as f:
+            elf_header = _ELFFileHeader(f)
+    except (IOError, OSError, TypeError, _ELFFileHeader._InvalidELFFileHeader):
+        return None
+    return elf_header
+
+
+def _is_linux_armhf():
+    # type: () -> bool
+    # hard-float ABI can be detected from the ELF header of the running
+    # process
+    # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_ARM
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABIMASK
+    ) == elf_header.EF_ARM_ABI_VER5
+    result &= (
+        elf_header.e_flags & elf_header.EF_ARM_ABI_FLOAT_HARD
+    ) == elf_header.EF_ARM_ABI_FLOAT_HARD
+    return result
+
+
+def _is_linux_i686():
+    # type: () -> bool
+    elf_header = _get_elf_header()
+    if elf_header is None:
+        return False
+    result = elf_header.e_ident_class == elf_header.ELFCLASS32
+    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
+    result &= elf_header.e_machine == elf_header.EM_386
+    return result
+
+
+def _have_compatible_manylinux_abi(arch):
+    # type: (str) -> bool
+    if arch == "armv7l":
+        return _is_linux_armhf()
+    if arch == "i686":
+        return _is_linux_i686()
+    return True
+
+
 def _linux_platforms(is_32bit=_32_BIT_INTERPRETER):
+    # type: (bool) -> Iterator[str]
     linux = _normalize_string(distutils.util.get_platform())
-    if linux == "linux_x86_64" and is_32bit:
-        linux = "linux_i686"
-    manylinux_support = (
-        ("manylinux2014", (2, 17)),  # CentOS 7 w/ glibc 2.17 (PEP 599)
-        ("manylinux2010", (2, 12)),  # CentOS 6 w/ glibc 2.12 (PEP 571)
-        ("manylinux1", (2, 5)),  # CentOS 5 w/ glibc 2.5 (PEP 513)
-    )
+    if is_32bit:
+        if linux == "linux_x86_64":
+            linux = "linux_i686"
+        elif linux == "linux_aarch64":
+            linux = "linux_armv7l"
+    manylinux_support = []
+    _, arch = linux.split("_", 1)
+    if _have_compatible_manylinux_abi(arch):
+        if arch in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:
+            manylinux_support.append(
+                ("manylinux2014", (2, 17))
+            )  # CentOS 7 w/ glibc 2.17 (PEP 599)
+        if arch in {"x86_64", "i686"}:
+            manylinux_support.append(
+                ("manylinux2010", (2, 12))
+            )  # CentOS 6 w/ glibc 2.12 (PEP 571)
+            manylinux_support.append(
+                ("manylinux1", (2, 5))
+            )  # CentOS 5 w/ glibc 2.5 (PEP 513)
     manylinux_support_iter = iter(manylinux_support)
     for name, glibc_version in manylinux_support_iter:
         if _is_manylinux_compatible(name, glibc_version):
-            platforms = [linux.replace("linux", name)]
+            yield linux.replace("linux", name)
             break
-    else:
-        platforms = []
     # Support for a later manylinux implies support for an earlier version.
-    platforms += [linux.replace("linux", name) for name, _ in manylinux_support_iter]
-    platforms.append(linux)
-    return platforms
+    for name, _ in manylinux_support_iter:
+        yield linux.replace("linux", name)
+    yield linux
 
 
 def _generic_platforms():
-    platform = _normalize_string(distutils.util.get_platform())
-    return [platform]
+    # type: () -> Iterator[str]
+    yield _normalize_string(distutils.util.get_platform())
 
 
-def _interpreter_name():
-    name = platform.python_implementation().lower()
+def _platform_tags():
+    # type: () -> Iterator[str]
+    """
+    Provides the platform tags for this installation.
+    """
+    if platform.system() == "Darwin":
+        return mac_platforms()
+    elif platform.system() == "Linux":
+        return _linux_platforms()
+    else:
+        return _generic_platforms()
+
+
+def interpreter_name():
+    # type: () -> str
+    """
+    Returns the name of the running interpreter.
+    """
+    try:
+        name = sys.implementation.name  # type: ignore
+    except AttributeError:  # pragma: no cover
+        # Python 2.7 compatibility.
+        name = platform.python_implementation().lower()
     return INTERPRETER_SHORT_NAMES.get(name) or name
 
 
-def _generic_interpreter(name, py_version):
-    version = sysconfig.get_config_var("py_version_nodot")
-    if not version:
-        version = "".join(map(str, py_version[:2]))
-    return "{name}{version}".format(name=name, version=version)
+def interpreter_version(**kwargs):
+    # type: (bool) -> str
+    """
+    Returns the version of the running interpreter.
+    """
+    warn = _warn_keyword_parameter("interpreter_version", kwargs)
+    version = _get_config_var("py_version_nodot", warn=warn)
+    if version:
+        version = str(version)
+    else:
+        version = _version_nodot(sys.version_info[:2])
+    return version
+
+
+def _version_nodot(version):
+    # type: (PythonVersion) -> str
+    if any(v >= 10 for v in version):
+        sep = "_"
+    else:
+        sep = ""
+    return sep.join(map(str, version))
 
 
-def sys_tags():
+def sys_tags(**kwargs):
+    # type: (bool) -> Iterator[Tag]
     """
     Returns the sequence of tag triples for the running interpreter.
 
     The order of the sequence corresponds to priority order for the
     interpreter, from most to least important.
     """
-    py_version = sys.version_info[:2]
-    interpreter_name = _interpreter_name()
-    if platform.system() == "Darwin":
-        platforms = _mac_platforms()
-    elif platform.system() == "Linux":
-        platforms = _linux_platforms()
-    else:
-        platforms = _generic_platforms()
+    warn = _warn_keyword_parameter("sys_tags", kwargs)
 
-    if interpreter_name == "cp":
-        interpreter = _cpython_interpreter(py_version)
-        abis = _cpython_abis(py_version)
-        for tag in _cpython_tags(py_version, interpreter, abis, platforms):
-            yield tag
-    elif interpreter_name == "pp":
-        interpreter = _pypy_interpreter()
-        abi = _generic_abi()
-        for tag in _pypy_tags(py_version, interpreter, abi, platforms):
+    interp_name = interpreter_name()
+    if interp_name == "cp":
+        for tag in cpython_tags(warn=warn):
             yield tag
     else:
-        interpreter = _generic_interpreter(interpreter_name, py_version)
-        abi = _generic_abi()
-        for tag in _generic_tags(interpreter, py_version, abi, platforms):
+        for tag in generic_tags():
             yield tag
-    for tag in _independent_tags(interpreter, py_version, platforms):
+
+    for tag in compatible_tags():
         yield tag
diff --git a/setuptools/_vendor/packaging/utils.py b/setuptools/_vendor/packaging/utils.py
index 8841878693..19579c1a0f 100644
--- a/setuptools/_vendor/packaging/utils.py
+++ b/setuptools/_vendor/packaging/utils.py
@@ -5,28 +5,36 @@
 
 import re
 
+from ._typing import TYPE_CHECKING, cast
 from .version import InvalidVersion, Version
 
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import NewType, Union
+
+    NormalizedName = NewType("NormalizedName", str)
 
 _canonicalize_regex = re.compile(r"[-_.]+")
 
 
 def canonicalize_name(name):
+    # type: (str) -> NormalizedName
     # This is taken from PEP 503.
-    return _canonicalize_regex.sub("-", name).lower()
+    value = _canonicalize_regex.sub("-", name).lower()
+    return cast("NormalizedName", value)
 
 
-def canonicalize_version(version):
+def canonicalize_version(_version):
+    # type: (str) -> Union[Version, str]
     """
-    This is very similar to Version.__str__, but has one subtle differences
+    This is very similar to Version.__str__, but has one subtle difference
     with the way it handles the release segment.
     """
 
     try:
-        version = Version(version)
+        version = Version(_version)
     except InvalidVersion:
         # Legacy versions cannot be normalized
-        return version
+        return _version
 
     parts = []
 
diff --git a/setuptools/_vendor/packaging/version.py b/setuptools/_vendor/packaging/version.py
index 95157a1f78..00371e86a8 100644
--- a/setuptools/_vendor/packaging/version.py
+++ b/setuptools/_vendor/packaging/version.py
@@ -7,8 +7,35 @@
 import itertools
 import re
 
-from ._structures import Infinity
-
+from ._structures import Infinity, NegativeInfinity
+from ._typing import TYPE_CHECKING
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Callable, Iterator, List, Optional, SupportsInt, Tuple, Union
+
+    from ._structures import InfinityType, NegativeInfinityType
+
+    InfiniteTypes = Union[InfinityType, NegativeInfinityType]
+    PrePostDevType = Union[InfiniteTypes, Tuple[str, int]]
+    SubLocalType = Union[InfiniteTypes, int, str]
+    LocalType = Union[
+        NegativeInfinityType,
+        Tuple[
+            Union[
+                SubLocalType,
+                Tuple[SubLocalType, str],
+                Tuple[NegativeInfinityType, SubLocalType],
+            ],
+            ...,
+        ],
+    ]
+    CmpKey = Tuple[
+        int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
+    ]
+    LegacyCmpKey = Tuple[int, Tuple[str, ...]]
+    VersionComparisonMethod = Callable[
+        [Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool
+    ]
 
 __all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
 
@@ -19,6 +46,7 @@
 
 
 def parse(version):
+    # type: (str) -> Union[LegacyVersion, Version]
     """
     Parse the given version string and return either a :class:`Version` object
     or a :class:`LegacyVersion` object depending on if the given version is
@@ -37,28 +65,38 @@ class InvalidVersion(ValueError):
 
 
 class _BaseVersion(object):
+    _key = None  # type: Union[CmpKey, LegacyCmpKey]
+
     def __hash__(self):
+        # type: () -> int
         return hash(self._key)
 
     def __lt__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s < o)
 
     def __le__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s <= o)
 
     def __eq__(self, other):
+        # type: (object) -> bool
         return self._compare(other, lambda s, o: s == o)
 
     def __ge__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s >= o)
 
     def __gt__(self, other):
+        # type: (_BaseVersion) -> bool
         return self._compare(other, lambda s, o: s > o)
 
     def __ne__(self, other):
+        # type: (object) -> bool
         return self._compare(other, lambda s, o: s != o)
 
     def _compare(self, other, method):
+        # type: (object, VersionComparisonMethod) -> Union[bool, NotImplemented]
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
@@ -67,57 +105,71 @@ def _compare(self, other, method):
 
 class LegacyVersion(_BaseVersion):
     def __init__(self, version):
+        # type: (str) -> None
         self._version = str(version)
         self._key = _legacy_cmpkey(self._version)
 
     def __str__(self):
+        # type: () -> str
         return self._version
 
     def __repr__(self):
+        # type: () -> str
         return "<LegacyVersion({0})>".format(repr(str(self)))
 
     @property
     def public(self):
+        # type: () -> str
         return self._version
 
     @property
     def base_version(self):
+        # type: () -> str
         return self._version
 
     @property
     def epoch(self):
+        # type: () -> int
         return -1
 
     @property
     def release(self):
+        # type: () -> None
         return None
 
     @property
     def pre(self):
+        # type: () -> None
         return None
 
     @property
     def post(self):
+        # type: () -> None
         return None
 
     @property
     def dev(self):
+        # type: () -> None
         return None
 
     @property
     def local(self):
+        # type: () -> None
         return None
 
     @property
     def is_prerelease(self):
+        # type: () -> bool
         return False
 
     @property
     def is_postrelease(self):
+        # type: () -> bool
         return False
 
     @property
     def is_devrelease(self):
+        # type: () -> bool
         return False
 
 
@@ -133,6 +185,7 @@ def is_devrelease(self):
 
 
 def _parse_version_parts(s):
+    # type: (str) -> Iterator[str]
     for part in _legacy_version_component_re.split(s):
         part = _legacy_version_replacement_map.get(part, part)
 
@@ -150,6 +203,8 @@ def _parse_version_parts(s):
 
 
 def _legacy_cmpkey(version):
+    # type: (str) -> LegacyCmpKey
+
     # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
     # greater than or equal to 0. This will effectively put the LegacyVersion,
     # which uses the defacto standard originally implemented by setuptools,
@@ -158,7 +213,7 @@ def _legacy_cmpkey(version):
 
     # This scheme is taken from pkg_resources.parse_version setuptools prior to
     # it's adoption of the packaging library.
-    parts = []
+    parts = []  # type: List[str]
     for part in _parse_version_parts(version.lower()):
         if part.startswith("*"):
             # remove "-" before a prerelease tag
@@ -171,9 +226,8 @@ def _legacy_cmpkey(version):
                 parts.pop()
 
         parts.append(part)
-    parts = tuple(parts)
 
-    return epoch, parts
+    return epoch, tuple(parts)
 
 
 # Deliberately not anchored to the start and end of the string, to make it
@@ -215,6 +269,8 @@ class Version(_BaseVersion):
     _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
 
     def __init__(self, version):
+        # type: (str) -> None
+
         # Validate the version and parse it into pieces
         match = self._regex.search(version)
         if not match:
@@ -243,9 +299,11 @@ def __init__(self, version):
         )
 
     def __repr__(self):
+        # type: () -> str
         return "<Version({0})>".format(repr(str(self)))
 
     def __str__(self):
+        # type: () -> str
         parts = []
 
         # Epoch
@@ -275,26 +333,35 @@ def __str__(self):
 
     @property
     def epoch(self):
-        return self._version.epoch
+        # type: () -> int
+        _epoch = self._version.epoch  # type: int
+        return _epoch
 
     @property
     def release(self):
-        return self._version.release
+        # type: () -> Tuple[int, ...]
+        _release = self._version.release  # type: Tuple[int, ...]
+        return _release
 
     @property
     def pre(self):
-        return self._version.pre
+        # type: () -> Optional[Tuple[str, int]]
+        _pre = self._version.pre  # type: Optional[Tuple[str, int]]
+        return _pre
 
     @property
     def post(self):
+        # type: () -> Optional[Tuple[str, int]]
         return self._version.post[1] if self._version.post else None
 
     @property
     def dev(self):
+        # type: () -> Optional[Tuple[str, int]]
         return self._version.dev[1] if self._version.dev else None
 
     @property
     def local(self):
+        # type: () -> Optional[str]
         if self._version.local:
             return ".".join(str(x) for x in self._version.local)
         else:
@@ -302,10 +369,12 @@ def local(self):
 
     @property
     def public(self):
+        # type: () -> str
         return str(self).split("+", 1)[0]
 
     @property
     def base_version(self):
+        # type: () -> str
         parts = []
 
         # Epoch
@@ -319,18 +388,41 @@ def base_version(self):
 
     @property
     def is_prerelease(self):
+        # type: () -> bool
         return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self):
+        # type: () -> bool
         return self.post is not None
 
     @property
     def is_devrelease(self):
+        # type: () -> bool
         return self.dev is not None
 
+    @property
+    def major(self):
+        # type: () -> int
+        return self.release[0] if len(self.release) >= 1 else 0
+
+    @property
+    def minor(self):
+        # type: () -> int
+        return self.release[1] if len(self.release) >= 2 else 0
+
+    @property
+    def micro(self):
+        # type: () -> int
+        return self.release[2] if len(self.release) >= 3 else 0
+
+
+def _parse_letter_version(
+    letter,  # type: str
+    number,  # type: Union[str, bytes, SupportsInt]
+):
+    # type: (...) -> Optional[Tuple[str, int]]
 
-def _parse_letter_version(letter, number):
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
         # not a numeral associated with it.
@@ -360,11 +452,14 @@ def _parse_letter_version(letter, number):
 
         return letter, int(number)
 
+    return None
+
 
 _local_version_separators = re.compile(r"[\._-]")
 
 
 def _parse_local_version(local):
+    # type: (str) -> Optional[LocalType]
     """
     Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
     """
@@ -373,15 +468,25 @@ def _parse_local_version(local):
             part.lower() if not part.isdigit() else int(part)
             for part in _local_version_separators.split(local)
         )
+    return None
+
 
+def _cmpkey(
+    epoch,  # type: int
+    release,  # type: Tuple[int, ...]
+    pre,  # type: Optional[Tuple[str, int]]
+    post,  # type: Optional[Tuple[str, int]]
+    dev,  # type: Optional[Tuple[str, int]]
+    local,  # type: Optional[Tuple[SubLocalType]]
+):
+    # type: (...) -> CmpKey
 
-def _cmpkey(epoch, release, pre, post, dev, local):
     # When we compare a release version, we want to compare it with all of the
     # trailing zeros removed. So we'll use a reverse the list, drop all the now
     # leading zeros until we come to something non zero, then take the rest
     # re-reverse it back into the correct order and make it a tuple and use
     # that for our sorting key.
-    release = tuple(
+    _release = tuple(
         reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
     )
 
@@ -390,23 +495,31 @@ def _cmpkey(epoch, release, pre, post, dev, local):
     # if there is not a pre or a post segment. If we have one of those then
     # the normal sorting rules will handle this case correctly.
     if pre is None and post is None and dev is not None:
-        pre = -Infinity
+        _pre = NegativeInfinity  # type: PrePostDevType
     # Versions without a pre-release (except as noted above) should sort after
     # those with one.
     elif pre is None:
-        pre = Infinity
+        _pre = Infinity
+    else:
+        _pre = pre
 
     # Versions without a post segment should sort before those with one.
     if post is None:
-        post = -Infinity
+        _post = NegativeInfinity  # type: PrePostDevType
+
+    else:
+        _post = post
 
     # Versions without a development segment should sort after those with one.
     if dev is None:
-        dev = Infinity
+        _dev = Infinity  # type: PrePostDevType
+
+    else:
+        _dev = dev
 
     if local is None:
         # Versions without a local segment should sort before those with one.
-        local = -Infinity
+        _local = NegativeInfinity  # type: LocalType
     else:
         # Versions with a local segment need that segment parsed to implement
         # the sorting rules in PEP440.
@@ -415,6 +528,8 @@ def _cmpkey(epoch, release, pre, post, dev, local):
         # - Numeric segments sort numerically
         # - Shorter versions sort before longer versions when the prefixes
         #   match exactly
-        local = tuple((i, "") if isinstance(i, int) else (-Infinity, i) for i in local)
+        _local = tuple(
+            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
+        )
 
-    return epoch, release, pre, post, dev, local
+    return epoch, _release, _pre, _post, _dev, _local
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 65183d9a2a..288d077096 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==19.2
+packaging==20.4
 pyparsing==2.2.1
 six==1.10.0
 ordered-set==3.1.1

From 325609811b8db4d4ed161a961cae0ee4840317cc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 12 Aug 2020 19:58:27 -0400
Subject: [PATCH 8104/8469] Update changelog.

---
 changelog.d/2310.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2310.change.rst

diff --git a/changelog.d/2310.change.rst b/changelog.d/2310.change.rst
new file mode 100644
index 0000000000..a7f1cc5326
--- /dev/null
+++ b/changelog.d/2310.change.rst
@@ -0,0 +1 @@
+Updated vendored packaging version to 20.4.

From a42d30089c42605d0f3191e4ccc19e1cfd1e0ccd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Aug 2020 09:40:52 -0400
Subject: [PATCH 8105/8469] =?UTF-8?q?Bump=20version:=2049.3.2=20=E2=86=92?=
 =?UTF-8?q?=2049.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2310.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2310.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5e0d7fd7a6..547dc886cd 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.3.2
+current_version = 49.4.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 0d2c96c39b..ac07145956 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.4.0
+-------
+
+* #2310: Updated vendored packaging version to 20.4.
+
+
 v49.3.2
 -------
 
diff --git a/changelog.d/2310.change.rst b/changelog.d/2310.change.rst
deleted file mode 100644
index a7f1cc5326..0000000000
--- a/changelog.d/2310.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated vendored packaging version to 20.4.
diff --git a/setup.cfg b/setup.cfg
index 5d4a084cdf..76d99d44d7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.3.2
+version = 49.4.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From a7f6ad46b07d51fce91e74b3777d70cbd4168f0f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Aug 2020 18:59:34 -0400
Subject: [PATCH 8106/8469] =?UTF-8?q?Bump=20version:=2049.4.0=20=E2=86=92?=
 =?UTF-8?q?=2049.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 8 ++++++++
 changelog.d/2306.change.rst | 3 ---
 setup.cfg                   | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/2306.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 547dc886cd..7ecebcd92e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.4.0
+current_version = 49.5.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ac07145956..534e15a8f2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v49.5.0
+-------
+
+* #2306: When running as a PEP 517 backend, setuptools does not try to install
+  ``setup_requires`` itself. They are reported as build requirements for the
+  frontend to install.
+
+
 v49.4.0
 -------
 
diff --git a/changelog.d/2306.change.rst b/changelog.d/2306.change.rst
deleted file mode 100644
index 1046eae3f8..0000000000
--- a/changelog.d/2306.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-When running as a PEP 517 backend, setuptools does not try to install
-``setup_requires`` itself. They are reported as build requirements for the
-frontend to install.
diff --git a/setup.cfg b/setup.cfg
index 76d99d44d7..7618ab116d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.4.0
+version = 49.5.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 4837f218ea05a304880f8448e27fe0affad3a1a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Aug 2020 21:49:25 -0400
Subject: [PATCH 8107/8469] Update tests to reflect new expectation.

---
 setuptools/tests/test_distutils_adoption.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index daccc473c2..8edd3f9b44 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -48,15 +48,15 @@ def test_distutils_stdlib(venv):
     """
     Ensure stdlib distutils is used when appropriate.
     """
-    assert venv.name not in find_distutils(venv, env=dict()).split(os.sep)
+    env = dict(SETUPTOOLS_USE_DISTUTILS='stdlib')
+    assert venv.name not in find_distutils(venv, env=env).split(os.sep)
 
 
 def test_distutils_local_with_setuptools(venv):
     """
     Ensure local distutils is used when appropriate.
     """
-    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
-    loc = find_distutils(venv, imports='setuptools, distutils', env=env)
+    loc = find_distutils(venv, imports='setuptools, distutils', env=dict())
     assert venv.name in loc.split(os.sep)
 
 
@@ -66,5 +66,4 @@ def test_distutils_local(venv):
     Even without importing, the setuptools-local copy of distutils is
     preferred.
     """
-    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
-    assert venv.name in find_distutils(venv, env=env).split(os.sep)
+    assert venv.name in find_distutils(venv, env=dict()).split(os.sep)

From 6f205904ca63a91946b862068278a51dddb36cf4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 13 Aug 2020 21:56:40 -0400
Subject: [PATCH 8108/8469] =?UTF-8?q?Bump=20version:=2049.5.0=20=E2=86=92?=
 =?UTF-8?q?=2049.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2129.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2129.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7ecebcd92e..4bbe60c466 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.5.0
+current_version = 49.6.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 534e15a8f2..2d49707b23 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v49.6.0
+-------
+
+* #2129: In pkg_resources, no longer detect any pathname ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip file.
+
+
 v49.5.0
 -------
 
diff --git a/changelog.d/2129.change.rst b/changelog.d/2129.change.rst
deleted file mode 100644
index b7d388621e..0000000000
--- a/changelog.d/2129.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In pkg_resources, no longer detect any pathname ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip file.
diff --git a/setup.cfg b/setup.cfg
index 7618ab116d..3c8f867167 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.5.0
+version = 49.6.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From be7a0a31a116f6df9bef616ef1adef72b9d0d48d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 14 Aug 2020 19:32:18 -0400
Subject: [PATCH 8109/8469] Bypass .pth loader when distutils is loaded from
 pip. Workaround for pypa/pip#8761.

---
 _distutils_hack/__init__.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 814ee97e40..2d358c371d 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -3,6 +3,7 @@
 import re
 import importlib
 import warnings
+import inspect
 
 
 is_pypy = '__pypy__' in sys.builtin_module_names
@@ -66,7 +67,7 @@ def do_override():
 
 class DistutilsMetaFinder:
     def find_spec(self, fullname, path, target=None):
-        if path is not None or fullname != "distutils":
+        if path is not None or fullname != "distutils" or self._bypass():
             return None
 
         return self.get_distutils_spec()
@@ -84,6 +85,16 @@ def exec_module(self, module):
 
         return importlib.util.spec_from_loader('distutils', DistutilsLoader())
 
+    def _bypass(self):
+        """
+        Suppress the import of distutils from setuptools when running under pip.
+        See pypa/pip#8761 for rationale.
+        """
+        return any(
+            level.frame.f_globals['__name__'].startswith('pip.')
+            for level in inspect.stack(context=False)
+        )
+
 
 DISTUTILS_FINDER = DistutilsMetaFinder()
 

From 77eeb77f48484a6e227275a9a8cc7d4c322596f7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Aug 2020 14:39:25 -0400
Subject: [PATCH 8110/8469] When pip is imported, unload any existing distutils
 and disable the DistutilsMetaFinder.

---
 _distutils_hack/__init__.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 2d358c371d..bdb365d5ae 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -3,7 +3,6 @@
 import re
 import importlib
 import warnings
-import inspect
 
 
 is_pypy = '__pypy__' in sys.builtin_module_names
@@ -67,7 +66,9 @@ def do_override():
 
 class DistutilsMetaFinder:
     def find_spec(self, fullname, path, target=None):
-        if path is not None or fullname != "distutils" or self._bypass():
+        self._disable_for_pip(fullname, path)
+
+        if path is not None or fullname != "distutils":
             return None
 
         return self.get_distutils_spec()
@@ -85,15 +86,17 @@ def exec_module(self, module):
 
         return importlib.util.spec_from_loader('distutils', DistutilsLoader())
 
-    def _bypass(self):
+    def _disable_for_pip(self, fullname, path):
         """
-        Suppress the import of distutils from setuptools when running under pip.
+        Ensure stdlib distutils when running under pip.
         See pypa/pip#8761 for rationale.
         """
-        return any(
-            level.frame.f_globals['__name__'].startswith('pip.')
-            for level in inspect.stack(context=False)
-        )
+        if path is not None or fullname != "pip":
+            return
+
+        # pip is being imported the first time.
+        clear_distutils()
+        self.get_distutils_spec = lambda: None
 
 
 DISTUTILS_FINDER = DistutilsMetaFinder()

From 4eb5b32f8d8bb1e20907028a516346e2b1901391 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Aug 2020 14:42:03 -0400
Subject: [PATCH 8111/8469] Replace hard-coded tox working dir with the
 environment variable, honoring non-standard working directories.

---
 tools/tox_pip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 9fe4f905c7..9e1a1e4a7c 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -12,7 +12,7 @@ def remove_setuptools():
     cmd = [sys.executable, '-m', 'pip', 'uninstall', '-y', 'setuptools']
     # set cwd to something other than '.' to avoid detecting
     # '.' as the installed package.
-    subprocess.check_call(cmd, cwd='.tox')
+    subprocess.check_call(cmd, cwd=os.environ['TOX_WORK_DIR'])
 
 
 def bootstrap():

From 3d404fd3268b0fb7d84916779ca2e282f4586396 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Aug 2020 14:59:37 -0400
Subject: [PATCH 8112/8469] Refactor to use lookups and consolidate behaviors.

---
 _distutils_hack/__init__.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index bdb365d5ae..074bd5e9c8 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -66,14 +66,14 @@ def do_override():
 
 class DistutilsMetaFinder:
     def find_spec(self, fullname, path, target=None):
-        self._disable_for_pip(fullname, path)
-
-        if path is not None or fullname != "distutils":
-            return None
+        if path is not None:
+            return
 
-        return self.get_distutils_spec()
+        method_name = 'spec_for_{fullname}'.format(**locals())
+        method = getattr(self, method_name, lambda: None)
+        return method()
 
-    def get_distutils_spec(self):
+    def spec_for_distutils(self):
         import importlib.util
 
         class DistutilsLoader(importlib.util.abc.Loader):
@@ -86,17 +86,13 @@ def exec_module(self, module):
 
         return importlib.util.spec_from_loader('distutils', DistutilsLoader())
 
-    def _disable_for_pip(self, fullname, path):
+    def spec_for_pip(self):
         """
         Ensure stdlib distutils when running under pip.
         See pypa/pip#8761 for rationale.
         """
-        if path is not None or fullname != "pip":
-            return
-
-        # pip is being imported the first time.
         clear_distutils()
-        self.get_distutils_spec = lambda: None
+        self.spec_for_distutils = lambda: None
 
 
 DISTUTILS_FINDER = DistutilsMetaFinder()

From fb7ab81a3d080422687bad71f9ae9d36eeefbee2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Aug 2020 00:29:24 -0400
Subject: [PATCH 8113/8469] Remove Python 2 compatibility

---
 bootstrap.py                              |  2 -
 pkg_resources/__init__.py                 | 39 ++----------
 pkg_resources/tests/test_pkg_resources.py | 38 +++--------
 pkg_resources/tests/test_resources.py     |  4 --
 pkg_resources/tests/test_working_set.py   |  2 -
 setup.cfg                                 |  1 -
 setuptools/__init__.py                    | 20 ++----
 setuptools/build_meta.py                  | 21 ++-----
 setuptools/command/alias.py               |  2 -
 setuptools/command/bdist_egg.py           | 20 ++----
 setuptools/command/build_ext.py           | 16 +----
 setuptools/command/build_py.py            |  8 +--
 setuptools/command/develop.py             |  6 +-
 setuptools/command/easy_install.py        | 55 +++++-----------
 setuptools/command/egg_info.py            | 12 ++--
 setuptools/command/py36compat.py          |  2 -
 setuptools/command/rotate.py              |  4 +-
 setuptools/command/sdist.py               | 46 +++-----------
 setuptools/command/setopt.py              |  3 +-
 setuptools/command/test.py                | 10 +--
 setuptools/command/upload_docs.py         | 16 ++---
 setuptools/config.py                      | 12 +---
 setuptools/depends.py                     | 13 ++--
 setuptools/dist.py                        | 48 ++++----------
 setuptools/extension.py                   |  2 -
 setuptools/installer.py                   |  8 +--
 setuptools/lib2to3_ex.py                  |  3 -
 setuptools/monkey.py                      |  4 +-
 setuptools/msvc.py                        |  6 +-
 setuptools/namespaces.py                  |  4 --
 setuptools/package_index.py               | 33 +++++-----
 setuptools/py27compat.py                  | 60 ------------------
 setuptools/py31compat.py                  | 32 ----------
 setuptools/py33compat.py                  | 59 -----------------
 setuptools/sandbox.py                     | 15 +----
 setuptools/ssl_support.py                 |  5 +-
 setuptools/tests/__init__.py              |  9 +--
 setuptools/tests/contexts.py              |  6 +-
 setuptools/tests/namespaces.py            |  2 -
 setuptools/tests/server.py                | 21 +++----
 setuptools/tests/test_archive_util.py     |  6 +-
 setuptools/tests/test_build_ext.py        |  4 +-
 setuptools/tests/test_build_meta.py       | 20 +-----
 setuptools/tests/test_config.py           | 24 +------
 setuptools/tests/test_develop.py          |  7 +--
 setuptools/tests/test_dist.py             | 20 ++----
 setuptools/tests/test_dist_info.py        |  4 --
 setuptools/tests/test_easy_install.py     |  8 ---
 setuptools/tests/test_egg_info.py         | 52 +--------------
 setuptools/tests/test_extern.py           |  2 -
 setuptools/tests/test_find_packages.py    | 11 +---
 setuptools/tests/test_integration.py      |  2 +-
 setuptools/tests/test_manifest.py         |  6 +-
 setuptools/tests/test_msvc14.py           |  2 -
 setuptools/tests/test_namespaces.py       |  2 -
 setuptools/tests/test_packageindex.py     | 11 ++--
 setuptools/tests/test_sdist.py            | 77 ++++++++---------------
 setuptools/tests/test_setopt.py           | 10 +--
 setuptools/tests/test_setuptools.py       |  3 +-
 setuptools/tests/test_test.py             |  5 --
 setuptools/tests/test_virtualenv.py       | 11 ----
 setuptools/tests/test_wheel.py            |  2 -
 setuptools/tests/test_windows_wrappers.py |  2 -
 setuptools/tests/text.py                  |  5 --
 setuptools/tests/textwrap.py              |  2 -
 setuptools/unicode_utils.py               |  6 +-
 setuptools/wheel.py                       |  6 +-
 tools/tox_pip.py                          | 12 ----
 68 files changed, 185 insertions(+), 806 deletions(-)
 delete mode 100644 setuptools/py27compat.py
 delete mode 100644 setuptools/py31compat.py
 delete mode 100644 setuptools/py33compat.py

diff --git a/bootstrap.py b/bootstrap.py
index 8fa9e4b554..118671f62c 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -5,8 +5,6 @@
 egg-info command to flesh out the egg-info directory.
 """
 
-from __future__ import unicode_literals
-
 import os
 import sys
 import textwrap
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index b585e8507a..737f4d5fad 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 """
 Package resource API
 --------------------
@@ -15,8 +14,6 @@
 method.
 """
 
-from __future__ import absolute_import
-
 import sys
 import os
 import io
@@ -54,9 +51,6 @@
 except NameError:
     FileExistsError = OSError
 
-from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import map, filter
-
 # capture these to bypass sandboxing
 from os import utime
 try:
@@ -83,18 +77,9 @@
 __import__('pkg_resources.extern.packaging.requirements')
 __import__('pkg_resources.extern.packaging.markers')
 
-
-__metaclass__ = type
-
-
-if (3, 0) < sys.version_info < (3, 5):
+if sys.version_info < (3, 5):
     raise RuntimeError("Python 3.5 or later is required")
 
-if six.PY2:
-    # Those builtin exceptions are only defined in Python 3
-    PermissionError = None
-    NotADirectoryError = None
-
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None
@@ -474,7 +459,7 @@ def run_script(dist_spec, script_name):
 
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
-    if isinstance(dist, six.string_types):
+    if isinstance(dist, str):
         dist = Requirement.parse(dist)
     if isinstance(dist, Requirement):
         dist = get_provider(dist)
@@ -1418,8 +1403,6 @@ def get_metadata(self, name):
             return ""
         path = self._get_metadata_path(name)
         value = self._get(path)
-        if six.PY2:
-            return value
         try:
             return value.decode('utf-8')
         except UnicodeDecodeError as exc:
@@ -1910,8 +1893,7 @@ def get_metadata(self, name):
         return metadata
 
     def _warn_on_replacement(self, metadata):
-        # Python 2.7 compat for: replacement_char = '�'
-        replacement_char = b'\xef\xbf\xbd'.decode('utf-8')
+        replacement_char = '�'
         if replacement_char in metadata:
             tmpl = "{self.path} could not be properly decoded in UTF-8"
             msg = tmpl.format(**locals())
@@ -2109,8 +2091,6 @@ class NoDists:
     """
     def __bool__(self):
         return False
-    if six.PY2:
-        __nonzero__ = __bool__
 
     def __call__(self, fullpath):
         return iter(())
@@ -2127,12 +2107,7 @@ def safe_listdir(path):
     except OSError as e:
         # Ignore the directory if does not exist, not a directory or
         # permission denied
-        ignorable = (
-            e.errno in (errno.ENOTDIR, errno.EACCES, errno.ENOENT)
-            # Python 2 on Windows needs to be handled this way :(
-            or getattr(e, "winerror", None) == 267
-        )
-        if not ignorable:
+        if e.errno not in (errno.ENOTDIR, errno.EACCES, errno.ENOENT):
             raise
     return ()
 
@@ -2406,7 +2381,7 @@ def _set_parent_ns(packageName):
 
 def yield_lines(strs):
     """Yield non-empty/non-comment lines of a string or sequence"""
-    if isinstance(strs, six.string_types):
+    if isinstance(strs, str):
         for s in strs.splitlines():
             s = s.strip()
             # skip blank lines/comments
@@ -2844,10 +2819,6 @@ def __dir__(self):
             )
         )
 
-    if not hasattr(object, '__dir__'):
-        # python 2.7 not supported
-        del __dir__
-
     @classmethod
     def from_filename(cls, filename, metadata=None, **kw):
         return cls.from_location(
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 189a8668be..6518820e6f 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 import sys
 import tempfile
 import os
@@ -20,16 +17,11 @@
 from pkg_resources import (
     DistInfoDistribution, Distribution, EggInfoDistribution,
 )
-from setuptools.extern import six
-from pkg_resources.extern.six.moves import map
-from pkg_resources.extern.six import text_type, string_types
 
 import pytest
 
 import pkg_resources
 
-__metaclass__ = type
-
 
 def timestamp(dt):
     """
@@ -42,7 +34,7 @@ def timestamp(dt):
         return time.mktime(dt.timetuple())
 
 
-class EggRemover(text_type):
+class EggRemover(str):
     def __call__(self):
         if self in sys.path:
             sys.path.remove(self)
@@ -143,7 +135,7 @@ def test_get_cache_path(self):
         path = mgr.get_cache_path('foo')
         type_ = str(type(path))
         message = "Unexpected type from get_cache_path: " + type_
-        assert isinstance(path, string_types), message
+        assert isinstance(path, str), message
 
     def test_get_cache_path_race(self, tmpdir):
         # Patch to os.path.isdir to create a race condition
@@ -225,13 +217,6 @@ def test_get_metadata__bad_utf8(tmpdir):
     metadata = 'née'.encode('iso-8859-1')
     dist = make_test_distribution(metadata_path, metadata=metadata)
 
-    if six.PY2:
-        # In Python 2, get_metadata() doesn't do any decoding.
-        actual = dist.get_metadata(filename)
-        assert actual == metadata
-        return
-
-    # Otherwise, we are in the Python 3 case.
     with pytest.raises(UnicodeDecodeError) as excinfo:
         dist.get_metadata(filename)
 
@@ -247,25 +232,18 @@ def test_get_metadata__bad_utf8(tmpdir):
     assert actual.endswith(metadata_path), 'actual: {}'.format(actual)
 
 
-# TODO: remove this in favor of Path.touch() when Python 2 is dropped.
-def touch_file(path):
-    """
-    Create an empty file.
-    """
-    with open(path, 'w'):
-        pass
-
-
 def make_distribution_no_version(tmpdir, basename):
     """
     Create a distribution directory with no file containing the version.
     """
-    # Convert the LocalPath object to a string before joining.
-    dist_dir = os.path.join(str(tmpdir), basename)
-    os.mkdir(dist_dir)
+    dist_dir = tmpdir / basename
+    dist_dir.ensure_dir()
     # Make the directory non-empty so distributions_from_metadata()
     # will detect it and yield it.
-    touch_file(os.path.join(dist_dir, 'temp.txt'))
+    dist_dir.join('temp.txt').ensure()
+
+    if sys.version_info < (3, 6):
+        dist_dir = str(dist_dir)
 
     dists = list(pkg_resources.distributions_from_metadata(dist_dir))
     assert len(dists) == 1
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index ed7cdfcc3f..b08bb293ef 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -1,13 +1,9 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 import string
 import platform
 import itertools
 
-from pkg_resources.extern.six.moves import map
-
 import pytest
 from pkg_resources.extern import packaging
 
diff --git a/pkg_resources/tests/test_working_set.py b/pkg_resources/tests/test_working_set.py
index 7a759bbb3f..db13c7149b 100644
--- a/pkg_resources/tests/test_working_set.py
+++ b/pkg_resources/tests/test_working_set.py
@@ -9,8 +9,6 @@
 
 from .test_resources import Metadata
 
-__metaclass__ = type
-
 
 def strip_comments(s):
     return '\n'.join(
diff --git a/setup.cfg b/setup.cfg
index 3c8f867167..b058fa8671 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,7 +70,6 @@ tests =
     coverage>=4.5.1
     pytest-cov>=2.5.1
     paver; python_version>="3.6"
-    futures; python_version=="2.7"
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 99094230d3..4d9b835729 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -13,27 +13,19 @@
 
 from ._deprecation_warning import SetuptoolsDeprecationWarning
 
-from setuptools.extern.six import PY3, string_types
-from setuptools.extern.six.moves import filter, map
-
 import setuptools.version
 from setuptools.extension import Extension
 from setuptools.dist import Distribution
 from setuptools.depends import Require
 from . import monkey
 
-__metaclass__ = type
-
 
 __all__ = [
     'setup', 'Distribution', 'Command', 'Extension', 'Require',
     'SetuptoolsDeprecationWarning',
-    'find_packages'
+    'find_packages', 'find_namespace_packages',
 ]
 
-if PY3:
-    __all__.append('find_namespace_packages')
-
 __version__ = setuptools.version.__version__
 
 bootstrap_install_from = None
@@ -122,9 +114,7 @@ def _looks_like_package(path):
 
 
 find_packages = PackageFinder.find
-
-if PY3:
-    find_namespace_packages = PEP420PackageFinder.find
+find_namespace_packages = PEP420PackageFinder.find
 
 
 def _install_setup_requires(attrs):
@@ -187,7 +177,7 @@ def _ensure_stringlike(self, option, what, default=None):
         if val is None:
             setattr(self, option, default)
             return default
-        elif not isinstance(val, string_types):
+        elif not isinstance(val, str):
             raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
                                        % (option, what, val))
         return val
@@ -201,11 +191,11 @@ def ensure_string_list(self, option):
         val = getattr(self, option)
         if val is None:
             return
-        elif isinstance(val, string_types):
+        elif isinstance(val, str):
             setattr(self, option, re.split(r',\s*|\s+', val))
         else:
             if isinstance(val, list):
-                ok = all(isinstance(v, string_types) for v in val)
+                ok = all(isinstance(v, str) for v in val)
             else:
                 ok = False
             if not ok:
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 371321879a..b9e8a2b3fa 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -32,10 +32,10 @@
 import tokenize
 import shutil
 import contextlib
+import tempfile
 
 import setuptools
 import distutils
-from setuptools.py31compat import TemporaryDirectory
 
 from pkg_resources import parse_requirements
 
@@ -91,19 +91,6 @@ def no_install_setup_requires():
         setuptools._install_setup_requires = orig
 
 
-def _to_str(s):
-    """
-    Convert a filename to a string (on Python 2, explicitly
-    a byte string, not Unicode) as distutils checks for the
-    exact type str.
-    """
-    if sys.version_info[0] == 2 and not isinstance(s, str):
-        # Assume it's Unicode, as that's what the PEP says
-        # should be provided.
-        return s.encode(sys.getfilesystemencoding())
-    return s
-
-
 def _get_immediate_subdirectories(a_dir):
     return [name for name in os.listdir(a_dir)
             if os.path.isdir(os.path.join(a_dir, name))]
@@ -168,8 +155,8 @@ def get_requires_for_build_sdist(self, config_settings=None):
 
     def prepare_metadata_for_build_wheel(self, metadata_directory,
                                          config_settings=None):
-        sys.argv = sys.argv[:1] + ['dist_info', '--egg-base',
-                                   _to_str(metadata_directory)]
+        sys.argv = sys.argv[:1] + [
+            'dist_info', '--egg-base', metadata_directory]
         with no_install_setup_requires():
             self.run_setup()
 
@@ -207,7 +194,7 @@ def _build_with_temp_dir(self, setup_command, result_extension,
 
         # Build in a temporary directory, then copy to the target.
         os.makedirs(result_directory, exist_ok=True)
-        with TemporaryDirectory(dir=result_directory) as tmp_dist_dir:
+        with tempfile.TemporaryDirectory(dir=result_directory) as tmp_dist_dir:
             sys.argv = (sys.argv[:1] + setup_command +
                         ['--dist-dir', tmp_dist_dir] +
                         config_settings["--global-option"])
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 4532b1cc0d..452a9244ea 100644
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,7 +1,5 @@
 from distutils.errors import DistutilsOptionError
 
-from setuptools.extern.six.moves import map
-
 from setuptools.command.setopt import edit_config, option_base, config_file
 
 
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 4be1545789..a88efb45b8 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -13,24 +13,16 @@
 import marshal
 import warnings
 
-from setuptools.extern import six
-
 from pkg_resources import get_build_platform, Distribution, ensure_directory
 from pkg_resources import EntryPoint
 from setuptools.extension import Library
 from setuptools import Command, SetuptoolsDeprecationWarning
 
-try:
-    # Python 2.7 or >=3.2
-    from sysconfig import get_path, get_python_version
+from sysconfig import get_path, get_python_version
 
-    def _get_purelib():
-        return get_path("purelib")
-except ImportError:
-    from distutils.sysconfig import get_python_lib, get_python_version
 
-    def _get_purelib():
-        return get_python_lib(False)
+def _get_purelib():
+    return get_path("purelib")
 
 
 def strip_module(filename):
@@ -420,9 +412,7 @@ def scan_module(egg_dir, base, name, stubs):
         return True  # Extension module
     pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
-    if six.PY2:
-        skip = 8  # skip magic & date
-    elif sys.version_info < (3, 7):
+    if sys.version_info < (3, 7):
         skip = 12  # skip magic & date & file size
     else:
         skip = 16  # skip magic & reserved? & date & file size
@@ -453,7 +443,7 @@ def iter_symbols(code):
     for name in code.co_names:
         yield name
     for const in code.co_consts:
-        if isinstance(const, six.string_types):
+        if isinstance(const, str):
             yield const
         elif isinstance(const, CodeType):
             for name in iter_symbols(const):
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 89a0e328f9..03a72b4fce 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import itertools
+from importlib.machinery import EXTENSION_SUFFIXES
 from distutils.command.build_ext import build_ext as _du_build_ext
 from distutils.file_util import copy_file
 from distutils.ccompiler import new_compiler
@@ -9,15 +10,6 @@
 from distutils import log
 
 from setuptools.extension import Library
-from setuptools.extern import six
-
-if six.PY2:
-    import imp
-
-    EXTENSION_SUFFIXES = [
-        s for s, _, tp in imp.get_suffixes() if tp == imp.C_EXTENSION]
-else:
-    from importlib.machinery import EXTENSION_SUFFIXES
 
 try:
     # Attempt to use Cython for building extensions, if available
@@ -115,11 +107,7 @@ def get_ext_filename(self, fullname):
         filename = _build_ext.get_ext_filename(self, fullname)
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            use_abi3 = (
-                not six.PY2
-                and getattr(ext, 'py_limited_api')
-                and get_abi3_suffix()
-            )
+            use_abi3 = getattr(ext, 'py_limited_api') and get_abi3_suffix()
             if use_abi3:
                 so_ext = get_config_var('EXT_SUFFIX')
                 filename = filename[:-len(so_ext)]
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 9d0288a50d..4709679b9f 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -9,9 +9,6 @@
 import itertools
 import stat
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter, filterfalse
-
 try:
     from setuptools.lib2to3_ex import Mixin2to3
 except ImportError:
@@ -73,9 +70,6 @@ def __getattr__(self, attr):
         return orig.build_py.__getattr__(self, attr)
 
     def build_module(self, module, module_file, package):
-        if six.PY2 and isinstance(package, six.string_types):
-            # avoid errors on Python 2 when unicode is passed (#190)
-            package = package.split('.')
         outfile, copied = orig.build_py.build_module(self, module, module_file,
                                                      package)
         if copied:
@@ -249,7 +243,7 @@ def _unique_everseen(iterable, key=None):
     seen = set()
     seen_add = seen.add
     if key is None:
-        for element in filterfalse(seen.__contains__, iterable):
+        for element in itertools.filterfalse(seen.__contains__, iterable):
             seen_add(element)
             yield element
     else:
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index e7e03cd449..faf8c988e2 100644
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -5,15 +5,11 @@
 import glob
 import io
 
-from setuptools.extern import six
-
 import pkg_resources
 from setuptools.command.easy_install import easy_install
 from setuptools import namespaces
 import setuptools
 
-__metaclass__ = type
-
 
 class develop(namespaces.DevelopInstaller, easy_install):
     """Set up package for development"""
@@ -108,7 +104,7 @@ def _resolve_setup_path(egg_base, install_dir, egg_path):
         return path_to_setup
 
     def install_for_development(self):
-        if not six.PY2 and getattr(self.distribution, 'use_2to3', False):
+        if getattr(self.distribution, 'use_2to3', False):
             # If we run 2to3 we can not do this inplace:
 
             # Ensure metadata is up-to-date
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index bcbd4f58f5..9ec83b7d8b 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -38,18 +38,15 @@
 import subprocess
 import shlex
 import io
+import configparser
 
 
 from sysconfig import get_config_vars, get_path
 
 from setuptools import SetuptoolsDeprecationWarning
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import configparser, map
-
 from setuptools import Command
 from setuptools.sandbox import run_setup
-from setuptools.py27compat import rmtree_safe
 from setuptools.command import setopt
 from setuptools.archive_util import unpack_archive
 from setuptools.package_index import (
@@ -65,8 +62,6 @@
 )
 import pkg_resources
 
-__metaclass__ = type
-
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
@@ -96,28 +91,16 @@ def samefile(p1, p2):
     return norm_p1 == norm_p2
 
 
-if six.PY2:
-
-    def _to_bytes(s):
-        return s
-
-    def isascii(s):
-        try:
-            six.text_type(s, 'ascii')
-            return True
-        except UnicodeError:
-            return False
-else:
+def _to_bytes(s):
+    return s.encode('utf8')
 
-    def _to_bytes(s):
-        return s.encode('utf8')
 
-    def isascii(s):
-        try:
-            s.encode('ascii')
-            return True
-        except UnicodeError:
-            return False
+def isascii(s):
+    try:
+        s.encode('ascii')
+        return True
+    except UnicodeError:
+        return False
 
 
 def _one_liner(text):
@@ -341,7 +324,7 @@ def finalize_options(self):
         self.local_index = Environment(self.shadow_path + sys.path)
 
         if self.find_links is not None:
-            if isinstance(self.find_links, six.string_types):
+            if isinstance(self.find_links, str):
                 self.find_links = self.find_links.split()
         else:
             self.find_links = []
@@ -650,7 +633,7 @@ def _tmpdir(self):
             # cast to str as workaround for #709 and #710 and #712
             yield str(tmpdir)
         finally:
-            os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
+            os.path.exists(tmpdir) and rmtree(tmpdir)
 
     def easy_install(self, spec, deps=False):
         with self._tmpdir() as tmpdir:
@@ -1318,7 +1301,7 @@ def create_home_path(self):
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
-        for name, path in six.iteritems(self.config_vars):
+        for name, path in self.config_vars.items():
             if path.startswith(home) and not os.path.isdir(path):
                 self.debug_print("os.makedirs('%s', 0o700)" % path)
                 os.makedirs(path, 0o700)
@@ -1499,7 +1482,7 @@ def extract_wininst_cfg(dist_filename):
             # Now the config is in bytes, but for RawConfigParser, it should
             #  be text, so decode it.
             config = config.decode(sys.getfilesystemencoding())
-            cfg.readfp(six.StringIO(config))
+            cfg.readfp(io.StringIO(config))
         except configparser.Error:
             return None
         if not cfg.has_section('metadata') or not cfg.has_section('Setup'):
@@ -1534,9 +1517,7 @@ def get_exe_prefixes(exe_filename):
             if name.endswith('-nspkg.pth'):
                 continue
             if parts[0].upper() in ('PURELIB', 'PLATLIB'):
-                contents = z.read(name)
-                if not six.PY2:
-                    contents = contents.decode()
+                contents = z.read(name).decode()
                 for pth in yield_lines(contents):
                     pth = pth.strip().replace('\\', '/')
                     if not pth.startswith('import'):
@@ -1700,7 +1681,8 @@ def auto_chmod(func, arg, exc):
         chmod(arg, stat.S_IWRITE)
         return func(arg)
     et, ev, _ = sys.exc_info()
-    six.reraise(et, (ev[0], ev[1] + (" %s %s" % (func, arg))))
+    # TODO: This code doesn't make sense. What is it trying to do?
+    raise (ev[0], ev[1] + (" %s %s" % (func, arg)))
 
 
 def update_dist_caches(dist_path, fix_zipimporter_caches):
@@ -2263,10 +2245,7 @@ def get_win_launcher(type):
 
 def load_launcher_manifest(name):
     manifest = pkg_resources.resource_string(__name__, 'launcher manifest.xml')
-    if six.PY2:
-        return manifest % vars()
-    else:
-        return manifest.decode('utf-8') % vars()
+    return manifest.decode('utf-8') % vars()
 
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 0855207ceb..c957154a1f 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -16,9 +16,6 @@
 import time
 import collections
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
-
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.command.sdist import walk_revctrl
@@ -267,8 +264,7 @@ def write_file(self, what, filename, data):
         to the file.
         """
         log.info("writing %s to %s", what, filename)
-        if not six.PY2:
-            data = data.encode("utf-8")
+        data = data.encode("utf-8")
         if not self.dry_run:
             f = open(filename, 'wb')
             f.write(data)
@@ -647,7 +643,7 @@ def append_cr(line):
 
 def write_requirements(cmd, basename, filename):
     dist = cmd.distribution
-    data = six.StringIO()
+    data = io.StringIO()
     _write_requirements(data, dist.install_requires)
     extras_require = dist.extras_require or {}
     for extra in sorted(extras_require):
@@ -687,12 +683,12 @@ def write_arg(cmd, basename, filename, force=False):
 def write_entries(cmd, basename, filename):
     ep = cmd.distribution.entry_points
 
-    if isinstance(ep, six.string_types) or ep is None:
+    if isinstance(ep, str) or ep is None:
         data = ep
     elif ep is not None:
         data = []
         for section, contents in sorted(ep.items()):
-            if not isinstance(contents, six.string_types):
+            if not isinstance(contents, str):
                 contents = EntryPoint.parse_group(section, contents)
                 contents = '\n'.join(sorted(map(str, contents.values())))
             data.append('[%s]\n%s\n\n' % (section, contents))
diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py
index 2886055862..343547a4d3 100644
--- a/setuptools/command/py36compat.py
+++ b/setuptools/command/py36compat.py
@@ -3,8 +3,6 @@
 from distutils.util import convert_path
 from distutils.command import sdist
 
-from setuptools.extern.six.moves import filter
-
 
 class sdist_add_defaults:
     """
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index e398834fa7..74795ba922 100644
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -4,8 +4,6 @@
 import os
 import shutil
 
-from setuptools.extern import six
-
 from setuptools import Command
 
 
@@ -38,7 +36,7 @@ def finalize_options(self):
             self.keep = int(self.keep)
         except ValueError as e:
             raise DistutilsOptionError("--keep must be an integer") from e
-        if isinstance(self.match, six.string_types):
+        if isinstance(self.match, str):
             self.match = [
                 convert_path(p.strip()) for p in self.match.split(',')
             ]
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 8c3438eaa6..887b7efa05 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@
 import io
 import contextlib
 
-from setuptools.extern import six, ordered_set
+from setuptools.extern import ordered_set
 
 from .py36compat import sdist_add_defaults
 
@@ -98,34 +98,8 @@ class NoValue:
             if orig_val is not NoValue:
                 setattr(os, 'link', orig_val)
 
-    def __read_template_hack(self):
-        # This grody hack closes the template file (MANIFEST.in) if an
-        #  exception occurs during read_template.
-        # Doing so prevents an error when easy_install attempts to delete the
-        #  file.
-        try:
-            orig.sdist.read_template(self)
-        except Exception:
-            _, _, tb = sys.exc_info()
-            tb.tb_next.tb_frame.f_locals['template'].close()
-            raise
-
-    # Beginning with Python 2.7.2, 3.1.4, and 3.2.1, this leaky file handle
-    #  has been fixed, so only override the method if we're using an earlier
-    #  Python.
-    has_leaky_handle = (
-        sys.version_info < (2, 7, 2)
-        or (3, 0) <= sys.version_info < (3, 1, 4)
-        or (3, 2) <= sys.version_info < (3, 2, 1)
-    )
-    if has_leaky_handle:
-        read_template = __read_template_hack
-
     def _add_defaults_optional(self):
-        if six.PY2:
-            sdist_add_defaults._add_defaults_optional(self)
-        else:
-            super()._add_defaults_optional()
+        super()._add_defaults_optional()
         if os.path.isfile('pyproject.toml'):
             self.filelist.append('pyproject.toml')
 
@@ -158,10 +132,7 @@ def _add_data_files(self, data_files):
 
     def _add_defaults_data_files(self):
         try:
-            if six.PY2:
-                sdist_add_defaults._add_defaults_data_files(self)
-            else:
-                super()._add_defaults_data_files()
+            super()._add_defaults_data_files()
         except TypeError:
             log.warn("data_files contains unexpected objects")
 
@@ -207,12 +178,11 @@ def read_manifest(self):
         manifest = open(self.manifest, 'rb')
         for line in manifest:
             # The manifest must contain UTF-8. See #303.
-            if not six.PY2:
-                try:
-                    line = line.decode('UTF-8')
-                except UnicodeDecodeError:
-                    log.warn("%r not UTF-8 decodable -- skipping" % line)
-                    continue
+            try:
+                line = line.decode('UTF-8')
+            except UnicodeDecodeError:
+                log.warn("%r not UTF-8 decodable -- skipping" % line)
+                continue
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line:
diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py
index 7e57cc0262..e18057c81e 100644
--- a/setuptools/command/setopt.py
+++ b/setuptools/command/setopt.py
@@ -3,8 +3,7 @@
 from distutils.errors import DistutilsOptionError
 import distutils
 import os
-
-from setuptools.extern.six.moves import configparser
+import configparser
 
 from setuptools import Command
 
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 2d83967dd9..cf71ad015d 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -8,17 +8,12 @@
 from distutils import log
 from unittest import TestLoader
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map, filter
-
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages, evaluate_marker,
                            add_activation_listener, require, EntryPoint)
 from setuptools import Command
 from .build_py import _unique_everseen
 
-__metaclass__ = type
-
 
 class ScanningLoader(TestLoader):
 
@@ -129,8 +124,7 @@ def with_project_on_sys_path(self, func):
 
     @contextlib.contextmanager
     def project_on_sys_path(self, include_dists=[]):
-        with_2to3 = not six.PY2 and getattr(
-            self.distribution, 'use_2to3', False)
+        with_2to3 = getattr(self.distribution, 'use_2to3', False)
 
         if with_2to3:
             # If we run 2to3 we can not do this inplace:
@@ -241,7 +235,7 @@ def run_tests(self):
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
-        if not six.PY2 and getattr(self.distribution, 'use_2to3', False):
+        if getattr(self.distribution, 'use_2to3', False):
             module = self.test_suite.split('.')[0]
             if module in _namespace_packages:
                 del_modules = []
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 0351da7773..2559458a1d 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -15,17 +15,15 @@
 import shutil
 import itertools
 import functools
-
-from setuptools.extern import six
-from setuptools.extern.six.moves import http_client, urllib
+import http.client
+import urllib.parse
 
 from pkg_resources import iter_entry_points
 from .upload import upload
 
 
 def _encode(s):
-    errors = 'strict' if six.PY2 else 'surrogateescape'
-    return s.encode('utf-8', errors)
+    return s.encode('utf-8', 'surrogateescape')
 
 
 class upload_docs(upload):
@@ -152,9 +150,7 @@ def upload_file(self, filename):
         }
         # set up the authentication
         credentials = _encode(self.username + ':' + self.password)
-        credentials = standard_b64encode(credentials)
-        if not six.PY2:
-            credentials = credentials.decode('ascii')
+        credentials = standard_b64encode(credentials).decode('ascii')
         auth = "Basic " + credentials
 
         body, ct = self._build_multipart(data)
@@ -169,9 +165,9 @@ def upload_file(self, filename):
             urllib.parse.urlparse(self.repository)
         assert not params and not query and not fragments
         if schema == 'http':
-            conn = http_client.HTTPConnection(netloc)
+            conn = http.client.HTTPConnection(netloc)
         elif schema == 'https':
-            conn = http_client.HTTPSConnection(netloc)
+            conn = http.client.HTTPSConnection(netloc)
         else:
             raise AssertionError("unsupported schema " + schema)
 
diff --git a/setuptools/config.py b/setuptools/config.py
index a8f8b6b006..af3a3bcbd5 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, unicode_literals
 import ast
 import io
 import os
@@ -15,10 +14,6 @@
 from distutils.errors import DistutilsOptionError, DistutilsFileError
 from setuptools.extern.packaging.version import LegacyVersion, parse
 from setuptools.extern.packaging.specifiers import SpecifierSet
-from setuptools.extern.six import string_types, PY3
-
-
-__metaclass__ = type
 
 
 class StaticModule:
@@ -324,7 +319,7 @@ def _parse_file(cls, value):
         """
         include_directive = 'file:'
 
-        if not isinstance(value, string_types):
+        if not isinstance(value, str):
             return value
 
         if not value.startswith(include_directive):
@@ -559,7 +554,7 @@ def _parse_version(self, value):
         if callable(version):
             version = version()
 
-        if not isinstance(version, string_types):
+        if not isinstance(version, str):
             if hasattr(version, '__iter__'):
                 version = '.'.join(map(str, version))
             else:
@@ -614,9 +609,6 @@ def _parse_packages(self, value):
             return self._parse_list(value)
 
         findns = trimmed_value == find_directives[1]
-        if findns and not PY3:
-            raise DistutilsOptionError(
-                'find_namespace: directive is unsupported on Python < 3.3')
 
         # Read function arguments from a dedicated section.
         find_kwargs = self.parse_section_packages__find(
diff --git a/setuptools/depends.py b/setuptools/depends.py
index a37675cbd9..8be6928a31 100644
--- a/setuptools/depends.py
+++ b/setuptools/depends.py
@@ -1,12 +1,11 @@
 import sys
 import marshal
 import contextlib
+import dis
 from distutils.version import StrictVersion
 
-from .py33compat import Bytecode
-
-from .py27compat import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
-from . import py27compat
+from ._imp import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
+from . import _imp
 
 
 __all__ = [
@@ -111,12 +110,12 @@ def get_module_constant(module, symbol, default=-1, paths=None):
             f.read(8)  # skip magic & date
             code = marshal.load(f)
         elif kind == PY_FROZEN:
-            code = py27compat.get_frozen_object(module, paths)
+            code = _imp.get_frozen_object(module, paths)
         elif kind == PY_SOURCE:
             code = compile(f.read(), path, 'exec')
         else:
             # Not something we can parse; we'll have to import it.  :(
-            imported = py27compat.get_module(module, paths, info)
+            imported = _imp.get_module(module, paths, info)
             return getattr(imported, symbol, None)
 
     return extract_constant(code, symbol, default)
@@ -146,7 +145,7 @@ def extract_constant(code, symbol, default=-1):
 
     const = default
 
-    for byte_code in Bytecode(code):
+    for byte_code in dis.Bytecode(code):
         op = byte_code.opcode
         arg = byte_code.arg
 
diff --git a/setuptools/dist.py b/setuptools/dist.py
index e813b11ca7..2c088ef8cb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -23,10 +23,8 @@
 from distutils.util import rfc822_escape
 from distutils.version import StrictVersion
 
-from setuptools.extern import six
 from setuptools.extern import packaging
 from setuptools.extern import ordered_set
-from setuptools.extern.six.moves import map, filter, filterfalse
 
 from . import SetuptoolsDeprecationWarning
 
@@ -126,12 +124,8 @@ def write_pkg_file(self, file):
     """
     version = self.get_metadata_version()
 
-    if six.PY2:
-        def write_field(key, value):
-            file.write("%s: %s\n" % (key, self._encode_field(value)))
-    else:
-        def write_field(key, value):
-            file.write("%s: %s\n" % (key, value))
+    def write_field(key, value):
+        file.write("%s: %s\n" % (key, value))
 
     write_field('Metadata-Version', str(version))
     write_field('Name', self.get_name())
@@ -308,7 +302,7 @@ def check_entry_points(dist, attr, value):
 
 
 def check_test_suite(dist, attr, value):
-    if not isinstance(value, six.string_types):
+    if not isinstance(value, str):
         raise DistutilsSetupError("test_suite must be a string")
 
 
@@ -319,7 +313,7 @@ def check_package_data(dist, attr, value):
             "{!r} must be a dictionary mapping package names to lists of "
             "string wildcard patterns".format(attr))
     for k, v in value.items():
-        if not isinstance(k, six.string_types):
+        if not isinstance(k, str):
             raise DistutilsSetupError(
                 "keys of {!r} dict must be strings (got {!r})"
                 .format(attr, k)
@@ -537,7 +531,7 @@ def is_simple_req(req):
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         inst_reqs = list(pkg_resources.parse_requirements(spec_inst_reqs))
         simple_reqs = filter(is_simple_req, inst_reqs)
-        complex_reqs = filterfalse(is_simple_req, inst_reqs)
+        complex_reqs = itertools.filterfalse(is_simple_req, inst_reqs)
         self.install_requires = list(map(str, simple_reqs))
 
         for r in complex_reqs:
@@ -560,10 +554,10 @@ def _parse_config_files(self, filenames=None):
         this method provides the same functionality in subtly-improved
         ways.
         """
-        from setuptools.extern.six.moves.configparser import ConfigParser
+        from configparser import ConfigParser
 
         # Ignore install directory options if we have a venv
-        if not six.PY2 and sys.prefix != sys.base_prefix:
+        if sys.prefix != sys.base_prefix:
             ignore_options = [
                 'install-base', 'install-platbase', 'install-lib',
                 'install-platlib', 'install-purelib', 'install-headers',
@@ -585,14 +579,14 @@ def _parse_config_files(self, filenames=None):
             with io.open(filename, encoding='utf-8') as reader:
                 if DEBUG:
                     self.announce("  reading {filename}".format(**locals()))
-                (parser.readfp if six.PY2 else parser.read_file)(reader)
+                parser.read_file(reader)
             for section in parser.sections():
                 options = parser.options(section)
                 opt_dict = self.get_option_dict(section)
 
                 for opt in options:
                     if opt != '__name__' and opt not in ignore_options:
-                        val = self._try_str(parser.get(section, opt))
+                        val = parser.get(section, opt)
                         opt = opt.replace('-', '_')
                         opt_dict[opt] = (filename, val)
 
@@ -616,26 +610,6 @@ def _parse_config_files(self, filenames=None):
                 except ValueError as e:
                     raise DistutilsOptionError(e) from e
 
-    @staticmethod
-    def _try_str(val):
-        """
-        On Python 2, much of distutils relies on string values being of
-        type 'str' (bytes) and not unicode text. If the value can be safely
-        encoded to bytes using the default encoding, prefer that.
-
-        Why the default encoding? Because that value can be implicitly
-        decoded back to text if needed.
-
-        Ref #1653
-        """
-        if not six.PY2:
-            return val
-        try:
-            return val.encode()
-        except UnicodeEncodeError:
-            pass
-        return val
-
     def _set_command_options(self, command_obj, option_dict=None):
         """
         Set the options for 'command_obj' from 'option_dict'.  Basically
@@ -669,7 +643,7 @@ def _set_command_options(self, command_obj, option_dict=None):
                 neg_opt = {}
 
             try:
-                is_string = isinstance(value, six.string_types)
+                is_string = isinstance(value, str)
                 if option in neg_opt and is_string:
                     setattr(command_obj, neg_opt[option], not strtobool(value))
                 elif option in bool_opts and is_string:
@@ -1003,7 +977,7 @@ def handle_display_options(self, option_order):
         """
         import sys
 
-        if six.PY2 or self.help_commands:
+        if self.help_commands:
             return _Distribution.handle_display_options(self, option_order)
 
         # Stdout may be StringIO (e.g. in tests)
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 29468894f8..1820722a49 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -4,8 +4,6 @@
 import distutils.errors
 import distutils.extension
 
-from setuptools.extern.six.moves import map
-
 from .monkey import get_unpatched
 
 
diff --git a/setuptools/installer.py b/setuptools/installer.py
index e5acec2726..e630b87479 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -2,20 +2,18 @@
 import os
 import subprocess
 import sys
+import tempfile
 from distutils import log
 from distutils.errors import DistutilsError
 
 import pkg_resources
 from setuptools.command.easy_install import easy_install
-from setuptools.extern import six
 from setuptools.wheel import Wheel
 
-from .py31compat import TemporaryDirectory
-
 
 def _fixup_find_links(find_links):
     """Ensure find-links option end-up being a list of strings."""
-    if isinstance(find_links, six.string_types):
+    if isinstance(find_links, str):
         return find_links.split()
     assert isinstance(find_links, (tuple, list))
     return find_links
@@ -103,7 +101,7 @@ def fetch_build_egg(dist, req):
     for egg_dist in pkg_resources.find_distributions(eggs_dir):
         if egg_dist in req and environment.can_add(egg_dist):
             return egg_dist
-    with TemporaryDirectory() as tmpdir:
+    with tempfile.TemporaryDirectory() as tmpdir:
         cmd = [
             sys.executable, '-m', 'pip',
             '--disable-pip-version-check',
diff --git a/setuptools/lib2to3_ex.py b/setuptools/lib2to3_ex.py
index 017f7285b7..c176abf633 100644
--- a/setuptools/lib2to3_ex.py
+++ b/setuptools/lib2to3_ex.py
@@ -2,9 +2,6 @@
 Customized Mixin2to3 support:
 
  - adds support for converting doctests
-
-
-This module raises an ImportError on Python 2.
 """
 
 import warnings
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index e5f1377b54..fb36dc1a97 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -10,8 +10,6 @@
 from importlib import import_module
 import inspect
 
-from setuptools.extern import six
-
 import setuptools
 
 __all__ = []
@@ -37,7 +35,7 @@ def _get_mro(cls):
 
 def get_unpatched(item):
     lookup = (
-        get_unpatched_class if isinstance(item, six.class_types) else
+        get_unpatched_class if isinstance(item, type) else
         get_unpatched_function if isinstance(item, types.FunctionType) else
         lambda item: None
     )
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 72383eb849..24ea0863a6 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -30,12 +30,10 @@
 import distutils.errors
 from setuptools.extern.packaging.version import LegacyVersion
 
-from setuptools.extern.six.moves import filterfalse
-
 from .monkey import get_unpatched
 
 if platform.system() == 'Windows':
-    from setuptools.extern.six.moves import winreg
+    import winreg
     from os import environ
 else:
     # Mock winreg and environ so the module can be imported on this platform.
@@ -1820,7 +1818,7 @@ def _unique_everseen(iterable, key=None):
         seen = set()
         seen_add = seen.add
         if key is None:
-            for element in filterfalse(seen.__contains__, iterable):
+            for element in itertools.filterfalse(seen.__contains__, iterable):
                 seen_add(element)
                 yield element
         else:
diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py
index 5f403c96d7..44939e1c6d 100644
--- a/setuptools/namespaces.py
+++ b/setuptools/namespaces.py
@@ -2,8 +2,6 @@
 from distutils import log
 import itertools
 
-from setuptools.extern.six.moves import map
-
 
 flatten = itertools.chain.from_iterable
 
@@ -72,8 +70,6 @@ def _get_root(self):
         return "sys._getframe(1).f_locals['sitedir']"
 
     def _gen_nspkg_line(self, pkg):
-        # ensure pkg is not a unicode string under Python 2.7
-        pkg = str(pkg)
         pth = tuple(pkg.split('.'))
         root = self._get_root()
         tmpl_lines = self._nspkg_tmpl
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1702c7c693..3979b131b5 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -2,17 +2,21 @@
 import sys
 import os
 import re
+import io
 import shutil
 import socket
 import base64
 import hashlib
 import itertools
 import warnings
+import configparser
+import html
+import http.client
+import urllib.parse
+import urllib.request
+import urllib.error
 from functools import wraps
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client, configparser, map
-
 import setuptools
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
@@ -23,12 +27,8 @@
 from distutils import log
 from distutils.errors import DistutilsError
 from fnmatch import translate
-from setuptools.py27compat import get_all_headers
-from setuptools.py33compat import unescape
 from setuptools.wheel import Wheel
 
-__metaclass__ = type
-
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile(r"""href\s*=\s*['"]?([^'"> ]+)""", re.I)
 PYPI_MD5 = re.compile(
@@ -191,7 +191,7 @@ def unique_everseen(iterable, key=None):
     seen = set()
     seen_add = seen.add
     if key is None:
-        for element in six.moves.filterfalse(seen.__contains__, iterable):
+        for element in itertools.filterfalse(seen.__contains__, iterable):
             seen_add(element)
             yield element
     else:
@@ -740,7 +740,7 @@ def _download_to(self, url, filename):
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                sizes = get_all_headers(headers, 'Content-Length')
+                sizes = headers.get_all('Content-Length')
                 size = max(map(int, sizes))
                 self.reporthook(url, filename, blocknum, bs, size)
             with open(filename, 'wb') as tfp:
@@ -767,7 +767,7 @@ def open_url(self, url, warning=None):
             return local_open(url)
         try:
             return open_with_auth(url, self.opener)
-        except (ValueError, http_client.InvalidURL) as v:
+        except (ValueError, http.client.InvalidURL) as v:
             msg = ' '.join([str(arg) for arg in v.args])
             if warning:
                 self.warn(warning, msg)
@@ -781,7 +781,7 @@ def open_url(self, url, warning=None):
             else:
                 raise DistutilsError("Download error for %s: %s"
                                      % (url, v.reason)) from v
-        except http_client.BadStatusLine as v:
+        except http.client.BadStatusLine as v:
             if warning:
                 self.warn(warning, v.line)
             else:
@@ -790,7 +790,7 @@ def open_url(self, url, warning=None):
                     'down, %s' %
                     (url, v.line)
                 ) from v
-        except (http_client.HTTPException, socket.error) as v:
+        except (http.client.HTTPException, socket.error) as v:
             if warning:
                 self.warn(warning, v)
             else:
@@ -940,7 +940,7 @@ def warn(self, msg, *args):
 
 def decode_entity(match):
     what = match.group(0)
-    return unescape(what)
+    return html.unescape(what)
 
 
 def htmldecode(text):
@@ -972,8 +972,7 @@ def _socket_timeout(*args, **kwargs):
 
 def _encode_auth(auth):
     """
-    A function compatible with Python 2.3-3.3 that will encode
-    auth from a URL suitable for an HTTP header.
+    Encode auth from a URL suitable for an HTTP header.
     >>> str(_encode_auth('username%3Apassword'))
     'dXNlcm5hbWU6cGFzc3dvcmQ='
 
@@ -1056,7 +1055,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     # Double scheme does not raise on macOS as revealed by a
     # failing test. We would expect "nonnumeric port". Refs #20.
     if netloc.endswith(':'):
-        raise http_client.InvalidURL("nonnumeric port: ''")
+        raise http.client.InvalidURL("nonnumeric port: ''")
 
     if scheme in ('http', 'https'):
         auth, address = _splituser(netloc)
@@ -1136,5 +1135,5 @@ def local_open(url):
         status, message, body = 404, "Path not found", "Not found"
 
     headers = {'content-type': 'text/html'}
-    body_stream = six.StringIO(body)
+    body_stream = io.StringIO(body)
     return urllib.error.HTTPError(url, status, message, headers, body_stream)
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
deleted file mode 100644
index ba39af52b6..0000000000
--- a/setuptools/py27compat.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-Compatibility Support for Python 2.7 and earlier
-"""
-
-import sys
-import platform
-
-from setuptools.extern import six
-
-
-def get_all_headers(message, key):
-    """
-    Given an HTTPMessage, return all headers matching a given key.
-    """
-    return message.get_all(key)
-
-
-if six.PY2:
-    def get_all_headers(message, key):  # noqa
-        return message.getheaders(key)
-
-
-linux_py2_ascii = (
-    platform.system() == 'Linux' and
-    six.PY2
-)
-
-rmtree_safe = str if linux_py2_ascii else lambda x: x
-"""Workaround for http://bugs.python.org/issue24672"""
-
-
-try:
-    from ._imp import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
-    from ._imp import get_frozen_object, get_module
-except ImportError:
-    import imp
-    from imp import PY_COMPILED, PY_FROZEN, PY_SOURCE  # noqa
-
-    def find_module(module, paths=None):
-        """Just like 'imp.find_module()', but with package support"""
-        parts = module.split('.')
-        while parts:
-            part = parts.pop(0)
-            f, path, (suffix, mode, kind) = info = imp.find_module(part, paths)
-
-            if kind == imp.PKG_DIRECTORY:
-                parts = parts or ['__init__']
-                paths = [path]
-
-            elif parts:
-                raise ImportError("Can't find %r in %s" % (parts, module))
-
-        return info
-
-    def get_frozen_object(module, paths):
-        return imp.get_frozen_object(module)
-
-    def get_module(module, paths, info):
-        imp.load_module(module, *info)
-        return sys.modules[module]
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py
deleted file mode 100644
index e1da7ee2a2..0000000000
--- a/setuptools/py31compat.py
+++ /dev/null
@@ -1,32 +0,0 @@
-__all__ = []
-
-__metaclass__ = type
-
-
-try:
-    # Python >=3.2
-    from tempfile import TemporaryDirectory
-except ImportError:
-    import shutil
-    import tempfile
-
-    class TemporaryDirectory:
-        """
-        Very simple temporary directory context manager.
-        Will try to delete afterward, but will also ignore OS and similar
-        errors on deletion.
-        """
-
-        def __init__(self, **kwargs):
-            self.name = None  # Handle mkdtemp raising an exception
-            self.name = tempfile.mkdtemp(**kwargs)
-
-        def __enter__(self):
-            return self.name
-
-        def __exit__(self, exctype, excvalue, exctrace):
-            try:
-                shutil.rmtree(self.name, True)
-            except OSError:  # removal errors are not the only possible
-                pass
-            self.name = None
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
deleted file mode 100644
index cb69443638..0000000000
--- a/setuptools/py33compat.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import dis
-import array
-import collections
-
-try:
-    import html
-except ImportError:
-    html = None
-
-from setuptools.extern import six
-from setuptools.extern.six.moves import html_parser
-
-__metaclass__ = type
-
-OpArg = collections.namedtuple('OpArg', 'opcode arg')
-
-
-class Bytecode_compat:
-    def __init__(self, code):
-        self.code = code
-
-    def __iter__(self):
-        """Yield '(op,arg)' pair for each operation in code object 'code'"""
-
-        bytes = array.array('b', self.code.co_code)
-        eof = len(self.code.co_code)
-
-        ptr = 0
-        extended_arg = 0
-
-        while ptr < eof:
-
-            op = bytes[ptr]
-
-            if op >= dis.HAVE_ARGUMENT:
-
-                arg = bytes[ptr + 1] + bytes[ptr + 2] * 256 + extended_arg
-                ptr += 3
-
-                if op == dis.EXTENDED_ARG:
-                    long_type = six.integer_types[-1]
-                    extended_arg = arg * long_type(65536)
-                    continue
-
-            else:
-                arg = None
-                ptr += 1
-
-            yield OpArg(op, arg)
-
-
-Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)
-
-
-unescape = getattr(html, 'unescape', None)
-if unescape is None:
-    # HTMLParser.unescape is deprecated since Python 3.4, and will be removed
-    # from 3.9.
-    unescape = html_parser.HTMLParser().unescape
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 24a360808a..91b960d899 100644
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -8,9 +8,7 @@
 import contextlib
 import pickle
 import textwrap
-
-from setuptools.extern import six
-from setuptools.extern.six.moves import builtins, map
+import builtins
 
 import pkg_resources
 from distutils.errors import DistutilsError
@@ -138,7 +136,7 @@ def resume(self):
             return
 
         type, exc = map(pickle.loads, self._saved)
-        six.reraise(type, exc, self._tb)
+        raise exc.with_traceback(self._tb)
 
 
 @contextlib.contextmanager
@@ -251,15 +249,8 @@ def run_setup(setup_script, args):
             working_set.__init__()
             working_set.callbacks.append(lambda dist: dist.activate())
 
-            # __file__ should be a byte string on Python 2 (#712)
-            dunder_file = (
-                setup_script
-                if isinstance(setup_script, str) else
-                setup_script.encode(sys.getfilesystemencoding())
-            )
-
             with DirectorySandbox(setup_dir):
-                ns = dict(__file__=dunder_file, __name__='__main__')
+                ns = dict(__file__=setup_script, __name__='__main__')
                 _execfile(setup_script, ns)
         except SystemExit as v:
             if v.args and v.args[0]:
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 17c14c4694..eac5e65608 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,8 +3,9 @@
 import atexit
 import re
 import functools
+import urllib.request
+import http.client
 
-from setuptools.extern.six.moves import urllib, http_client, map, filter
 
 from pkg_resources import ResolutionError, ExtractionError
 
@@ -31,7 +32,7 @@
 
 try:
     HTTPSHandler = urllib.request.HTTPSHandler
-    HTTPSConnection = http_client.HTTPSConnection
+    HTTPSConnection = http.client.HTTPSConnection
 except AttributeError:
     HTTPSHandler = HTTPSConnection = object
 
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 6377d7857d..a7a2112f73 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -2,19 +2,12 @@
 
 import pytest
 
-from setuptools.extern.six import PY2, PY3
 
-
-__all__ = [
-    'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
-]
+__all__ = ['fail_on_ascii', 'ack_2to3']
 
 
 is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
 
 
-py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
-py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
-
 ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 535ae10766..51ce8984e0 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -4,8 +4,8 @@
 import sys
 import contextlib
 import site
+import io
 
-from setuptools.extern import six
 import pkg_resources
 
 
@@ -58,8 +58,8 @@ def quiet():
 
     old_stdout = sys.stdout
     old_stderr = sys.stderr
-    new_stdout = sys.stdout = six.StringIO()
-    new_stderr = sys.stderr = six.StringIO()
+    new_stdout = sys.stdout = io.StringIO()
+    new_stderr = sys.stderr = io.StringIO()
     try:
         yield new_stdout, new_stderr
     finally:
diff --git a/setuptools/tests/namespaces.py b/setuptools/tests/namespaces.py
index ef5ecdadac..245cf8ea38 100644
--- a/setuptools/tests/namespaces.py
+++ b/setuptools/tests/namespaces.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import textwrap
 
 
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index 8b17b0816e..7e2132301b 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -4,13 +4,12 @@
 import os
 import time
 import threading
+import http.server
+import urllib.parse
+import urllib.request
 
-from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer
-from setuptools.extern.six.moves.urllib_parse import urljoin
-from setuptools.extern.six.moves.urllib.request import pathname2url
 
-
-class IndexServer(BaseHTTPServer.HTTPServer):
+class IndexServer(http.server.HTTPServer):
     """Basic single-threaded http server simulating a package index
 
     You can use this server in unittest like this::
@@ -24,8 +23,8 @@ class IndexServer(BaseHTTPServer.HTTPServer):
 
     def __init__(
             self, server_address=('', 0),
-            RequestHandlerClass=SimpleHTTPServer.SimpleHTTPRequestHandler):
-        BaseHTTPServer.HTTPServer.__init__(
+            RequestHandlerClass=http.server.SimpleHTTPRequestHandler):
+        http.server.HTTPServer.__init__(
             self, server_address, RequestHandlerClass)
         self._run = True
 
@@ -48,14 +47,14 @@ def base_url(self):
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
 
-class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+class RequestRecorder(http.server.BaseHTTPRequestHandler):
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)
         self.send_response(200, 'OK')
 
 
-class MockServer(BaseHTTPServer.HTTPServer, threading.Thread):
+class MockServer(http.server.HTTPServer, threading.Thread):
     """
     A simple HTTP Server that records the requests made to it.
     """
@@ -63,7 +62,7 @@ class MockServer(BaseHTTPServer.HTTPServer, threading.Thread):
     def __init__(
             self, server_address=('', 0),
             RequestHandlerClass=RequestRecorder):
-        BaseHTTPServer.HTTPServer.__init__(
+        http.server.HTTPServer.__init__(
             self, server_address, RequestHandlerClass)
         threading.Thread.__init__(self)
         self.setDaemon(True)
@@ -87,5 +86,5 @@ def path_to_url(path, authority=None):
     base = 'file:'
     if authority is not None:
         base += '//' + authority
-    url = urljoin(base, pathname2url(path))
+    url = urllib.parse.urljoin(base, urllib.request.pathname2url(path))
     return url
diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py
index b789e9acef..7f9962440c 100644
--- a/setuptools/tests/test_archive_util.py
+++ b/setuptools/tests/test_archive_util.py
@@ -3,8 +3,6 @@
 import tarfile
 import io
 
-from setuptools.extern import six
-
 import pytest
 
 from setuptools import archive_util
@@ -22,8 +20,6 @@ def tarfile_with_unicode(tmpdir):
         data = b""
 
         filename = "testimäge.png"
-        if six.PY2:
-            filename = filename.decode('utf-8')
 
         t = tarfile.TarInfo(filename)
         t.size = len(data)
@@ -39,4 +35,4 @@ def tarfile_with_unicode(tmpdir):
 @pytest.mark.xfail(reason="#710 and #712")
 def test_unicode_files(tarfile_with_unicode, tmpdir):
     target = tmpdir / 'out'
-    archive_util.unpack_archive(tarfile_with_unicode, six.text_type(target))
+    archive_util.unpack_archive(tarfile_with_unicode, str(target))
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 2ef8521d51..838fdb4299 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,8 +2,6 @@
 import distutils.command.build_ext as orig
 from distutils.sysconfig import get_config_var
 
-from setuptools.extern import six
-
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
@@ -41,7 +39,7 @@ def test_abi3_filename(self):
         assert 'spam.eggs' in cmd.ext_map
         res = cmd.get_ext_filename('spam.eggs')
 
-        if six.PY2 or not get_abi3_suffix():
+        if not get_abi3_suffix():
             assert res.endswith(get_config_var('EXT_SUFFIX'))
         elif sys.platform == 'win32':
             assert res.endswith('eggs.pyd')
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index fdb4b95010..5462b26a8a 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -1,20 +1,13 @@
-from __future__ import unicode_literals
-
 import os
 import shutil
 import tarfile
+import importlib
+from concurrent import futures
 
 import pytest
 
 from .files import build_files
 from .textwrap import DALS
-from . import py2_only
-
-__metaclass__ = type
-
-# Backports on Python 2.7
-import importlib
-from concurrent import futures
 
 
 class BuildBackendBase:
@@ -220,15 +213,6 @@ def test_prepare_metadata_for_build_wheel(self, build_backend):
 
         assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
 
-    @py2_only
-    def test_prepare_metadata_for_build_wheel_with_str(self, build_backend):
-        dist_dir = os.path.abspath(str('pip-dist-info'))
-        os.makedirs(dist_dir)
-
-        dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir)
-
-        assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA'))
-
     def test_build_sdist_explicit_dist(self, build_backend):
         # explicitly specifying the dist folder should work
         # the folder sdist_directory and the ``--dist-dir`` can be the same
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 67992c041f..1dee12718f 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import contextlib
+import configparser
 
 import pytest
 
@@ -9,9 +7,6 @@
 from mock import patch
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
-from setuptools.extern.six.moves import configparser
-from setuptools.extern import six
-from . import py2_only, py3_only
 from .textwrap import DALS
 
 
@@ -311,10 +306,6 @@ def test_version(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
-        if six.PY2:
-            # static version loading is unsupported on Python 2
-            return
-
         config.write(
             '[metadata]\n'
             'version = attr: fake_package.subpkg_b.mod.VERSION\n'
@@ -719,19 +710,6 @@ def test_find_directive(self, tmpdir):
             assert set(dist.packages) == set(
                 ['fake_package', 'fake_package.sub_two'])
 
-    @py2_only
-    def test_find_namespace_directive_fails_on_py2(self, tmpdir):
-        dir_package, config = fake_env(
-            tmpdir,
-            '[options]\n'
-            'packages = find_namespace:\n'
-        )
-
-        with pytest.raises(DistutilsOptionError):
-            with get_dist(tmpdir) as dist:
-                dist.parse_config_files()
-
-    @py3_only
     def test_find_namespace_directive(self, tmpdir):
         dir_package, config = fake_env(
             tmpdir,
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index bb89a865b9..9854420e6b 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -1,8 +1,6 @@
 """develop tests
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import site
 import sys
@@ -10,7 +8,6 @@
 import subprocess
 import platform
 
-from setuptools.extern import six
 from setuptools.command import test
 
 import pytest
@@ -97,7 +94,7 @@ def test_2to3_user_mode(self, test_env):
         with io.open(fn) as init_file:
             init = init_file.read().strip()
 
-        expected = 'print "foo"' if six.PY2 else 'print("foo")'
+        expected = 'print("foo")'
         assert init == expected
 
     def test_console_scripts(self, tmpdir):
@@ -163,7 +160,7 @@ def install_develop(src_dir, target):
         reason="https://github.com/pypa/setuptools/issues/851",
     )
     @pytest.mark.skipif(
-        platform.python_implementation() == 'PyPy' and not six.PY2,
+        platform.python_implementation() == 'PyPy',
         reason="https://github.com/pypa/setuptools/issues/1202",
     )
     def test_namespace_package_importable(self, tmpdir):
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 531ea1b417..cb47fb5848 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import io
 import collections
 import re
 import functools
+import urllib.request
+import urllib.parse
 from distutils.errors import DistutilsSetupError
 from setuptools.dist import (
     _get_unpatched,
@@ -14,9 +12,6 @@
 )
 from setuptools import sic
 from setuptools import Distribution
-from setuptools.extern.six.moves.urllib.request import pathname2url
-from setuptools.extern.six.moves.urllib_parse import urljoin
-from setuptools.extern import six
 
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
@@ -29,7 +24,8 @@ def test_dist_fetch_build_egg(tmpdir):
     Check multiple calls to `Distribution.fetch_build_egg` work as expected.
     """
     index = tmpdir.mkdir('index')
-    index_url = urljoin('file://', pathname2url(str(index)))
+    index_url = urllib.parse.urljoin(
+        'file://', urllib.request.pathname2url(str(index)))
 
     def sdist_with_index(distname, version):
         dist_dir = index.mkdir(distname)
@@ -63,8 +59,7 @@ def sdist_with_index(distname, version):
             dist.fetch_build_egg(r)
             for r in reqs
         ]
-    # noqa below because on Python 2 it causes flakes
-    assert [dist.key for dist in resolved_dists if dist] == reqs  # noqa
+    assert [dist.key for dist in resolved_dists if dist] == reqs
 
 
 def test_dist__get_unpatched_deprecated():
@@ -150,10 +145,7 @@ def test_read_metadata(name, attrs):
     dist_class = metadata_out.__class__
 
     # Write to PKG_INFO and then load into a new metadata object
-    if six.PY2:
-        PKG_INFO = io.BytesIO()
-    else:
-        PKG_INFO = io.StringIO()
+    PKG_INFO = io.StringIO()
 
     metadata_out.write_pkg_file(PKG_INFO)
 
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index f7e7d2bf0a..29fbd09dbe 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -1,10 +1,6 @@
 """Test .dist-info style distributions.
 """
 
-from __future__ import unicode_literals
-
-from setuptools.extern.six.moves import map
-
 import pytest
 
 import pkg_resources
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index c07b5bea81..26a5e9a6ba 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 """Easy install Tests
 """
-from __future__ import absolute_import, unicode_literals
 
 import sys
 import os
@@ -18,8 +16,6 @@
 import time
 import re
 
-from setuptools.extern import six
-
 import pytest
 
 from setuptools import sandbox
@@ -41,8 +37,6 @@
 from .files import build_files
 from .textwrap import DALS
 
-__metaclass__ = type
-
 
 class FakeDist:
     def get_entry_map(self, group):
@@ -984,8 +978,6 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
 )
 class TestScriptHeader:
     non_ascii_exe = '/Users/José/bin/python'
-    if six.PY2:
-        non_ascii_exe = non_ascii_exe.encode('utf-8')
     exe_with_spaces = r'C:\Program Files\Python36\python.exe'
 
     def test_get_script_header(self):
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 109f913587..dc472af4c8 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -10,7 +10,6 @@
     egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision,
 )
 from setuptools.dist import Distribution
-from setuptools.extern.six.moves import map
 
 import pytest
 
@@ -19,8 +18,6 @@
 from .textwrap import DALS
 from . import contexts
 
-__metaclass__ = type
-
 
 class Environment(str):
     pass
@@ -73,8 +70,7 @@ def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
         """
         When the egg_info section is empty or not present, running
         save_version_info should add the settings to the setup.cfg
-        in a deterministic order, consistent with the ordering found
-        on Python 2.7 with PYTHONHASHSEED=0.
+        in a deterministic order.
         """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
         dist = Distribution()
@@ -906,49 +902,3 @@ def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
 
     def test_get_pkg_info_revision_deprecated(self):
         pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)
-
-    EGG_INFO_TESTS = (
-        # Check for issue #1136: invalid string type when
-        # reading declarative `setup.cfg` under Python 2.
-        {
-            'setup.py': DALS(
-                """
-                from setuptools import setup
-                setup(
-                    name="foo",
-                )
-                """),
-            'setup.cfg': DALS(
-                """
-                [options]
-                package_dir =
-                    = src
-                """),
-            'src': {},
-        },
-        # Check Unicode can be used in `setup.py` under Python 2.
-        {
-            'setup.py': DALS(
-                """
-                # -*- coding: utf-8 -*-
-                from __future__ import unicode_literals
-                from setuptools import setup, find_packages
-                setup(
-                    name="foo",
-                    package_dir={'': 'src'},
-                )
-                """),
-            'src': {},
-        }
-    )
-
-    @pytest.mark.parametrize('package_files', EGG_INFO_TESTS)
-    def test_egg_info(self, tmpdir_cwd, env, package_files):
-        """
-        """
-        build_files(package_files)
-        code, data = environment.run_setup_py(
-            cmd=['egg_info'],
-            data_stream=1,
-        )
-        assert not code, data
diff --git a/setuptools/tests/test_extern.py b/setuptools/tests/test_extern.py
index 3519a68073..0d6b164f53 100644
--- a/setuptools/tests/test_extern.py
+++ b/setuptools/tests/test_extern.py
@@ -3,7 +3,6 @@
 
 from setuptools import Distribution
 from setuptools.extern import ordered_set
-from setuptools.tests import py3_only
 
 
 def test_reimport_extern():
@@ -17,6 +16,5 @@ def test_orderedset_pickle_roundtrip():
     assert o1 == o2
 
 
-@py3_only
 def test_distribution_picklable():
     pickle.loads(pickle.dumps(Distribution()))
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index ab26b4f128..906713f61d 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -7,12 +7,8 @@
 
 import pytest
 
-from . import py3_only
-
-from setuptools.extern.six import PY3
 from setuptools import find_packages
-if PY3:
-    from setuptools import find_namespace_packages
+from setuptools import find_namespace_packages
 
 
 # modeled after CPython's test.support.can_symlink
@@ -154,34 +150,29 @@ def test_symlinked_packages_are_included(self):
     def _assert_packages(self, actual, expected):
         assert set(actual) == set(expected)
 
-    @py3_only
     def test_pep420_ns_package(self):
         packages = find_namespace_packages(
             self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @py3_only
     def test_pep420_ns_package_no_includes(self):
         packages = find_namespace_packages(
             self.dist_dir, exclude=['pkg.subpkg.assets'])
         self._assert_packages(
             packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @py3_only
     def test_pep420_ns_package_no_includes_or_excludes(self):
         packages = find_namespace_packages(self.dist_dir)
         expected = [
             'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
         self._assert_packages(packages, expected)
 
-    @py3_only
     def test_regular_package_with_nested_pep420_ns_packages(self):
         self._touch('__init__.py', self.pkg_dir)
         packages = find_namespace_packages(
             self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'])
         self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
 
-    @py3_only
     def test_pep420_ns_package_no_non_package_dirs(self):
         shutil.rmtree(self.docs_dir)
         shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index f1a27f8be8..24cef480ea 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -11,8 +11,8 @@
 import functools
 import tarfile
 import zipfile
+import urllib.request
 
-from setuptools.extern.six.moves import urllib
 import pytest
 
 from setuptools.command.easy_install import easy_install
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 042a8b1742..82bdb9c643 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -7,18 +7,16 @@
 import sys
 import tempfile
 import itertools
+import io
 from distutils import log
 from distutils.errors import DistutilsTemplateError
 
 from setuptools.command.egg_info import FileList, egg_info, translate_pattern
 from setuptools.dist import Distribution
-from setuptools.extern import six
 from setuptools.tests.textwrap import DALS
 
 import pytest
 
-__metaclass__ = type
-
 
 def make_local_path(s):
     """Converts '/' in a string to os.sep"""
@@ -41,7 +39,7 @@ def make_local_path(s):
 @contextlib.contextmanager
 def quiet():
     old_stdout, old_stderr = sys.stdout, sys.stderr
-    sys.stdout, sys.stderr = six.StringIO(), six.StringIO()
+    sys.stdout, sys.stderr = io.StringIO(), io.StringIO()
     try:
         yield
     finally:
diff --git a/setuptools/tests/test_msvc14.py b/setuptools/tests/test_msvc14.py
index 7833aab47b..1aca12dd37 100644
--- a/setuptools/tests/test_msvc14.py
+++ b/setuptools/tests/test_msvc14.py
@@ -31,8 +31,6 @@ def _find_vcvarsall(plat_spec):
         finally:
             _msvccompiler._msvc14_find_vcvarsall = old_find_vcvarsall
 
-    @pytest.mark.skipif(sys.version_info[0] < 3,
-                        reason="Unicode requires encode/decode on Python 2")
     def test_get_vc_env_unicode(self):
         import setuptools.msvc as _msvccompiler
 
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index f937d98189..6c8c522dc0 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import sys
 import subprocess
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 29aace13ef..8e9435efef 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,12 +1,11 @@
-from __future__ import absolute_import
-
 import sys
 import os
 import distutils.errors
 import platform
+import urllib.request
+import urllib.error
+import http.client
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client
 import mock
 import pytest
 
@@ -60,7 +59,7 @@ def test_bad_url_bad_status_line(self):
         )
 
         def _urlopen(*args):
-            raise http_client.BadStatusLine('line')
+            raise http.client.BadStatusLine('line')
 
         index.opener = _urlopen
         url = 'http://example.com'
@@ -84,7 +83,7 @@ def test_bad_url_double_scheme(self):
         try:
             index.open_url(url)
         except distutils.errors.DistutilsError as error:
-            msg = six.text_type(error)
+            msg = str(error)
             assert (
                 'nonnumeric port' in msg
                 or 'getaddrinfo failed' in msg
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 0bea53dfd7..049fdcc05a 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
 """sdist tests"""
 
-from __future__ import print_function, unicode_literals
-
 import os
 import sys
 import tempfile
@@ -10,9 +7,6 @@
 import contextlib
 import io
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import map
-
 import pytest
 
 import pkg_resources
@@ -21,7 +15,6 @@
 from setuptools.dist import Distribution
 from setuptools.tests import fail_on_ascii
 from .text import Filenames
-from . import py3_only
 
 
 SETUP_ATTRS = {
@@ -42,7 +35,7 @@
 @contextlib.contextmanager
 def quiet():
     old_stdout, old_stderr = sys.stdout, sys.stderr
-    sys.stdout, sys.stderr = six.StringIO(), six.StringIO()
+    sys.stdout, sys.stderr = io.StringIO(), io.StringIO()
     try:
         yield
     finally:
@@ -51,7 +44,7 @@ def quiet():
 
 # Convert to POSIX path
 def posix(path):
-    if not six.PY2 and not isinstance(path, str):
+    if not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b'/')
     else:
         return path.replace(os.sep, '/')
@@ -59,7 +52,7 @@ def posix(path):
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):
-    if isinstance(path, six.text_type):
+    if isinstance(path, str):
         return unicodedata.normalize('NFD', path)
     try:
         path = path.decode('utf-8')
@@ -231,7 +224,6 @@ def test_manifest_is_written_with_utf8_encoding(self):
         # The manifest should contain the UTF-8 filename
         assert posix(filename) in u_contents
 
-    @py3_only
     @fail_on_ascii
     def test_write_manifest_allows_utf8_filenames(self):
         # Test for #303.
@@ -265,7 +257,6 @@ def test_write_manifest_allows_utf8_filenames(self):
         # The filelist should have been updated as well
         assert u_filename in mm.filelist.files
 
-    @py3_only
     def test_write_manifest_skips_non_utf8_filenames(self):
         """
         Files that cannot be encoded to UTF-8 (specifically, those that
@@ -329,11 +320,9 @@ def test_manifest_is_read_with_utf8_encoding(self):
             cmd.read_manifest()
 
         # The filelist should contain the UTF-8 filename
-        if not six.PY2:
-            filename = filename.decode('utf-8')
+        filename = filename.decode('utf-8')
         assert filename in cmd.filelist.files
 
-    @py3_only
     @fail_on_latin1_encoded_filenames
     def test_read_manifest_skips_non_utf8_filenames(self):
         # Test for #303.
@@ -383,21 +372,18 @@ def test_sdist_with_utf8_encoded_filename(self):
         if sys.platform == 'darwin':
             filename = decompose(filename)
 
-        if not six.PY2:
-            fs_enc = sys.getfilesystemencoding()
+        fs_enc = sys.getfilesystemencoding()
 
-            if sys.platform == 'win32':
-                if fs_enc == 'cp1252':
-                    # Python 3 mangles the UTF-8 filename
-                    filename = filename.decode('cp1252')
-                    assert filename in cmd.filelist.files
-                else:
-                    filename = filename.decode('mbcs')
-                    assert filename in cmd.filelist.files
+        if sys.platform == 'win32':
+            if fs_enc == 'cp1252':
+                # Python mangles the UTF-8 filename
+                filename = filename.decode('cp1252')
+                assert filename in cmd.filelist.files
             else:
-                filename = filename.decode('utf-8')
+                filename = filename.decode('mbcs')
                 assert filename in cmd.filelist.files
         else:
+            filename = filename.decode('utf-8')
             assert filename in cmd.filelist.files
 
     @classmethod
@@ -425,33 +411,20 @@ def test_sdist_with_latin1_encoded_filename(self):
         with quiet():
             cmd.run()
 
-        if six.PY2:
-            # Under Python 2 there seems to be no decoded string in the
-            # filelist.  However, due to decode and encoding of the
-            # file name to get utf-8 Manifest the latin1 maybe excluded
-            try:
-                # fs_enc should match how one is expect the decoding to
-                # be proformed for the manifest output.
-                fs_enc = sys.getfilesystemencoding()
-                filename.decode(fs_enc)
-                assert filename in cmd.filelist.files
-            except UnicodeDecodeError:
-                filename not in cmd.filelist.files
-        else:
-            # not all windows systems have a default FS encoding of cp1252
-            if sys.platform == 'win32':
-                # Latin-1 is similar to Windows-1252 however
-                # on mbcs filesys it is not in latin-1 encoding
-                fs_enc = sys.getfilesystemencoding()
-                if fs_enc != 'mbcs':
-                    fs_enc = 'latin-1'
-                filename = filename.decode(fs_enc)
+        # not all windows systems have a default FS encoding of cp1252
+        if sys.platform == 'win32':
+            # Latin-1 is similar to Windows-1252 however
+            # on mbcs filesys it is not in latin-1 encoding
+            fs_enc = sys.getfilesystemencoding()
+            if fs_enc != 'mbcs':
+                fs_enc = 'latin-1'
+            filename = filename.decode(fs_enc)
 
-                assert filename in cmd.filelist.files
-            else:
-                # The Latin-1 filename should have been skipped
-                filename = filename.decode('latin-1')
-                filename not in cmd.filelist.files
+            assert filename in cmd.filelist.files
+        else:
+            # The Latin-1 filename should have been skipped
+            filename = filename.decode('latin-1')
+            filename not in cmd.filelist.files
 
     def test_pyproject_toml_in_sdist(self, tmpdir):
         """
diff --git a/setuptools/tests/test_setopt.py b/setuptools/tests/test_setopt.py
index 1b0389545a..0163f9af64 100644
--- a/setuptools/tests/test_setopt.py
+++ b/setuptools/tests/test_setopt.py
@@ -1,13 +1,7 @@
-# coding: utf-8
-
-from __future__ import unicode_literals
-
 import io
-
-import six
+import configparser
 
 from setuptools.command import setopt
-from setuptools.extern.six.moves import configparser
 
 
 class TestEdit:
@@ -15,7 +9,7 @@ class TestEdit:
     def parse_config(filename):
         parser = configparser.ConfigParser()
         with io.open(filename, encoding='utf-8') as reader:
-            (parser.readfp if six.PY2 else parser.read_file)(reader)
+            parser.read_file(reader)
         return parser
 
     @staticmethod
diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py
index 08d263ae87..42f8e18bef 100644
--- a/setuptools/tests/test_setuptools.py
+++ b/setuptools/tests/test_setuptools.py
@@ -15,7 +15,6 @@
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools.depends import Require
-from setuptools.extern import six
 
 
 def makeSetup(**args):
@@ -49,7 +48,7 @@ def f1():
             x = "test"
             y = z
 
-        fc = six.get_function_code(f1)
+        fc = f1.__code__
 
         # unrecognized name
         assert dep.extract_constant(fc, 'q', -1) is None
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 892fd120d9..180562e263 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import mock
 from distutils import log
 import os
@@ -110,7 +106,6 @@ def test_tests_are_run_once(capfd):
     with open('dummy/test_dummy.py', 'wt') as f:
         f.write(DALS(
             """
-            from __future__ import print_function
             import unittest
             class TestTest(unittest.TestCase):
                 def test_test(self):
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 555273aeba..b555ce4f62 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -12,17 +12,6 @@
 from .test_easy_install import make_nspkg_sdist
 
 
-@pytest.fixture(autouse=True)
-def disable_requires_python(monkeypatch):
-    """
-    Disable Requires-Python on Python 2.7
-    """
-    if sys.version_info > (3,):
-        return
-
-    monkeypatch.setenv('PIP_IGNORE_REQUIRES_PYTHON', 'true')
-
-
 @pytest.fixture(autouse=True)
 def pytest_virtualenv_works(virtualenv):
     """
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index f72ccbbf32..e56eac14d1 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -25,8 +25,6 @@
 from .files import build_files
 from .textwrap import DALS
 
-__metaclass__ = type
-
 
 WHEEL_INFO_TESTS = (
     ('invalid.whl', ValueError),
diff --git a/setuptools/tests/test_windows_wrappers.py b/setuptools/tests/test_windows_wrappers.py
index 2553394a26..fa647de84f 100644
--- a/setuptools/tests/test_windows_wrappers.py
+++ b/setuptools/tests/test_windows_wrappers.py
@@ -12,8 +12,6 @@
 are to wrap.
 """
 
-from __future__ import absolute_import
-
 import sys
 import textwrap
 import subprocess
diff --git a/setuptools/tests/text.py b/setuptools/tests/text.py
index ad2c6249b5..e05cc633ed 100644
--- a/setuptools/tests/text.py
+++ b/setuptools/tests/text.py
@@ -1,8 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-
 class Filenames:
     unicode = 'smörbröd.py'
     latin_1 = unicode.encode('latin-1')
diff --git a/setuptools/tests/textwrap.py b/setuptools/tests/textwrap.py
index 5cd9e5bca8..5e39618dca 100644
--- a/setuptools/tests/textwrap.py
+++ b/setuptools/tests/textwrap.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import textwrap
 
 
diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py
index 7c63efd20b..e84e65e3e1 100644
--- a/setuptools/unicode_utils.py
+++ b/setuptools/unicode_utils.py
@@ -1,12 +1,10 @@
 import unicodedata
 import sys
 
-from setuptools.extern import six
-
 
 # HFS Plus uses decomposed UTF-8
 def decompose(path):
-    if isinstance(path, six.text_type):
+    if isinstance(path, str):
         return unicodedata.normalize('NFD', path)
     try:
         path = path.decode('utf-8')
@@ -23,7 +21,7 @@ def filesys_decode(path):
     NONE when no expected encoding works
     """
 
-    if isinstance(path, six.text_type):
+    if isinstance(path, str):
         return path
 
     fs_enc = sys.getfilesystemencoding() or 'utf-8'
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index ca09bd1944..0be811af2c 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -14,13 +14,9 @@
 from pkg_resources import parse_version
 from setuptools.extern.packaging.tags import sys_tags
 from setuptools.extern.packaging.utils import canonicalize_name
-from setuptools.extern.six import PY3
 from setuptools.command.egg_info import write_requirements
 
 
-__metaclass__ = type
-
-
 WHEEL_NAME = re.compile(
     r"""^(?P<project_name>.+?)-(?P<version>\d.*?)
     ((-(?P<build>\d.*?))?-(?P<py_version>.+?)-(?P<abi>.+?)-(?P<platform>.+?)
@@ -112,7 +108,7 @@ def _install_as_egg(self, destination_eggdir, zf):
     def _convert_metadata(zf, destination_eggdir, dist_info, egg_info):
         def get_metadata(name):
             with zf.open(posixpath.join(dist_info, name)) as fp:
-                value = fp.read().decode('utf-8') if PY3 else fp.read()
+                value = fp.read().decode('utf-8')
                 return email.parser.Parser().parsestr(value)
 
         wheel_metadata = get_metadata('WHEEL')
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 9e1a1e4a7c..be2ff1d01d 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -56,24 +56,12 @@ def clean(dep):
     return filter(None, map(clean, raw))
 
 
-def disable_python_requires():
-    """
-    On Python 2, install the dependencies that are selective
-    on Python version while honoring REQUIRES_PYTHON, then
-    disable REQUIRES_PYTHON so that pip can install this
-    checkout of setuptools.
-    """
-    pip('install', *test_dependencies())
-    os.environ['PIP_IGNORE_REQUIRES_PYTHON'] = 'true'
-
-
 def run(args):
     os.environ['PIP_USE_PEP517'] = 'true'
 
     if is_install_self(args):
         remove_setuptools()
         bootstrap()
-        sys.version_info > (3,) or disable_python_requires()
 
     pip(*args)
 

From 5003bae4ca8aab95091e75f366f466e89926e6e8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Aug 2020 07:03:07 -0400
Subject: [PATCH 8114/8469] Remove dependency on six from packaging.

---
 pavement.py                                     | 6 +++++-
 pkg_resources/_vendor/packaging/requirements.py | 2 +-
 setuptools/_vendor/packaging/requirements.py    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pavement.py b/pavement.py
index b5220d102b..34603ed1b0 100644
--- a/pavement.py
+++ b/pavement.py
@@ -22,7 +22,11 @@ def rewrite_packaging(pkg_files, new_root):
     """
     for file in pkg_files.glob('*.py'):
         text = file.text()
-        text = re.sub(r' (pyparsing|six)', rf' {new_root}.\1', text)
+        text = re.sub(r' (pyparsing)', rf' {new_root}.\1', text)
+        text = text.replace(
+            'from six.moves.urllib import parse',
+            'from urllib import parse',
+        )
         file.write_text(text)
 
 
diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py
index 8282a63259..9495a1df1e 100644
--- a/pkg_resources/_vendor/packaging/requirements.py
+++ b/pkg_resources/_vendor/packaging/requirements.py
@@ -9,7 +9,7 @@
 from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
 from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
 from pkg_resources.extern.pyparsing import Literal as L  # noqa
-from pkg_resources.extern.six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ._typing import TYPE_CHECKING
 from .markers import MARKER_EXPR, Marker
diff --git a/setuptools/_vendor/packaging/requirements.py b/setuptools/_vendor/packaging/requirements.py
index 06b1748851..5d50c7d7e2 100644
--- a/setuptools/_vendor/packaging/requirements.py
+++ b/setuptools/_vendor/packaging/requirements.py
@@ -9,7 +9,7 @@
 from setuptools.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
 from setuptools.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
 from setuptools.extern.pyparsing import Literal as L  # noqa
-from setuptools.extern.six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 from ._typing import TYPE_CHECKING
 from .markers import MARKER_EXPR, Marker

From 45e0ea0ff10a64f315a5c65b6805327222e5b565 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Aug 2020 07:09:10 -0400
Subject: [PATCH 8115/8469] Remove six as a vendored dependency.

---
 pavement.py                        |   1 +
 pkg_resources/_vendor/six.py       | 868 -----------------------------
 pkg_resources/_vendor/vendored.txt |   1 -
 setuptools/_vendor/six.py          | 868 -----------------------------
 setuptools/_vendor/vendored.txt    |   1 -
 5 files changed, 1 insertion(+), 1738 deletions(-)
 delete mode 100644 pkg_resources/_vendor/six.py
 delete mode 100644 setuptools/_vendor/six.py

diff --git a/pavement.py b/pavement.py
index 34603ed1b0..81ff6f1201 100644
--- a/pavement.py
+++ b/pavement.py
@@ -54,6 +54,7 @@ def install(vendor):
     subprocess.check_call(install_args)
     remove_all(vendor.glob('*.dist-info'))
     remove_all(vendor.glob('*.egg-info'))
+    remove_all(vendor.glob('six.py'))
     (vendor / '__init__.py').write_text('')
 
 
diff --git a/pkg_resources/_vendor/six.py b/pkg_resources/_vendor/six.py
deleted file mode 100644
index 190c0239cd..0000000000
--- a/pkg_resources/_vendor/six.py
+++ /dev/null
@@ -1,868 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2015 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from __future__ import absolute_import
-
-import functools
-import itertools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.10.0"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
-
-if PY3:
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-
-            def __len__(self):
-                return 1 << 31
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
-        return result
-
-
-class MovedModule(_LazyDescr):
-
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-
-    """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser",
-                "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog",
-                "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
-                "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
-
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ['parse', 'error', 'request', 'response', 'robotparser']
-
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    def create_unbound_method(func, cls):
-        return func
-
-    Iterator = object
-else:
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
-    class Iterator(object):
-
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(get_unbound_function,
-         """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
-
-
-if PY3:
-    def b(s):
-        return s.encode("latin-1")
-
-    def u(s):
-        return s
-    unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-else:
-    def b(s):
-        return s
-    # Workaround for standalone backslash
-
-    def u(s):
-        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
-    unichr = unichr
-    int2byte = chr
-
-    def byte2int(bs):
-        return ord(bs[0])
-
-    def indexbytes(buf, i):
-        return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        if value is None:
-            value = tp()
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
-""")
-
-
-if sys.version_info[:2] == (3, 2):
-    exec_("""def raise_from(value, from_value):
-    if from_value is None:
-        raise value
-    raise value from from_value
-""")
-elif sys.version_info[:2] > (3, 2):
-    exec_("""def raise_from(value, from_value):
-    raise value from from_value
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-              updated=functools.WRAPPER_UPDATES):
-        def wrapper(f):
-            f = functools.wraps(wrapped, assigned, updated)(f)
-            f.__wrapped__ = wrapped
-            return f
-        return wrapper
-else:
-    wraps = functools.wraps
-
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get('__slots__')
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 7862a3cead..da7a19813e 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,3 @@
 packaging==20.4
 pyparsing==2.2.1
-six==1.10.0
 appdirs==1.4.3
diff --git a/setuptools/_vendor/six.py b/setuptools/_vendor/six.py
deleted file mode 100644
index 190c0239cd..0000000000
--- a/setuptools/_vendor/six.py
+++ /dev/null
@@ -1,868 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2015 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from __future__ import absolute_import
-
-import functools
-import itertools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.10.0"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
-
-if PY3:
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-
-            def __len__(self):
-                return 1 << 31
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
-        return result
-
-
-class MovedModule(_LazyDescr):
-
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-
-    """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser",
-                "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog",
-                "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
-                "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
-
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ['parse', 'error', 'request', 'response', 'robotparser']
-
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    def create_unbound_method(func, cls):
-        return func
-
-    Iterator = object
-else:
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
-    class Iterator(object):
-
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(get_unbound_function,
-         """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
-
-
-if PY3:
-    def b(s):
-        return s.encode("latin-1")
-
-    def u(s):
-        return s
-    unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-else:
-    def b(s):
-        return s
-    # Workaround for standalone backslash
-
-    def u(s):
-        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
-    unichr = unichr
-    int2byte = chr
-
-    def byte2int(bs):
-        return ord(bs[0])
-
-    def indexbytes(buf, i):
-        return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        if value is None:
-            value = tp()
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
-""")
-
-
-if sys.version_info[:2] == (3, 2):
-    exec_("""def raise_from(value, from_value):
-    if from_value is None:
-        raise value
-    raise value from from_value
-""")
-elif sys.version_info[:2] > (3, 2):
-    exec_("""def raise_from(value, from_value):
-    raise value from from_value
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-              updated=functools.WRAPPER_UPDATES):
-        def wrapper(f):
-            f = functools.wraps(wrapped, assigned, updated)(f)
-            f.__wrapped__ = wrapped
-            return f
-        return wrapper
-else:
-    wraps = functools.wraps
-
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get('__slots__')
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt
index 288d077096..b1190436bc 100644
--- a/setuptools/_vendor/vendored.txt
+++ b/setuptools/_vendor/vendored.txt
@@ -1,4 +1,3 @@
 packaging==20.4
 pyparsing==2.2.1
-six==1.10.0
 ordered-set==3.1.1

From 675d32ff667e90d239c95359007a58cb3aa88a97 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 16 Aug 2020 11:25:02 -0400
Subject: [PATCH 8116/8469] Remove six from 'extern' as vendored.

---
 pkg_resources/extern/__init__.py | 2 +-
 setuptools/extern/__init__.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index bf98d8f296..4dc3beb2fa 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -62,5 +62,5 @@ def install(self):
             sys.meta_path.append(self)
 
 
-names = 'packaging', 'pyparsing', 'six', 'appdirs'
+names = 'packaging', 'pyparsing', 'appdirs'
 VendorImporter(__name__, names).install()
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 4e79aa17ec..b7f30dc2e3 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -62,5 +62,5 @@ def install(self):
             sys.meta_path.append(self)
 
 
-names = 'six', 'packaging', 'pyparsing', 'ordered_set',
+names = 'packaging', 'pyparsing', 'ordered_set',
 VendorImporter(__name__, names, 'setuptools._vendor').install()

From 8bebc79282083d7b914069693bd0098a1394198a Mon Sep 17 00:00:00 2001
From: Aren Cambre <aren@arencambre.com>
Date: Sun, 16 Aug 2020 12:29:14 -0500
Subject: [PATCH 8117/8469] pypa/setuptools#2302

---
 setuptools/msvc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 24ea0863a6..006a5c11dd 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -338,7 +338,7 @@ def _augment_exception(exc, version, arch=''):
 
     if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
-        tmpl = 'Microsoft Visual C++ {version:0.1f} is required.'
+        tmpl = 'Microsoft Visual C++ {version:0.1f} or greater is required.'
         message = tmpl.format(**locals())
         msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
         if version == 9.0:
@@ -358,8 +358,8 @@ def _augment_exception(exc, version, arch=''):
             message += msdownload % 8279
         elif version >= 14.0:
             # For VC++ 14.X Redirect user to latest Visual C++ Build Tools
-            message += (' Get it with "Build Tools for Visual Studio": '
-                        r'https://visualstudio.microsoft.com/downloads/')
+            message += (' Get it with "Microsoft C++ Build Tools": '
+                        r'https://visualstudio.microsoft.com/visual-cpp-build-tools/')
 
     exc.args = (message, )
 

From 023cf32a1adfb3b100800f613f5e0cf01dd76c2d Mon Sep 17 00:00:00 2001
From: Aren Cambre <aren@arencambre.com>
Date: Sun, 16 Aug 2020 12:29:14 -0500
Subject: [PATCH 8118/8469] pypa/setuptools#2302

---
 setuptools/msvc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 24ea0863a6..1ead72b421 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -338,7 +338,7 @@ def _augment_exception(exc, version, arch=''):
 
     if "vcvarsall" in message.lower() or "visual c" in message.lower():
         # Special error message if MSVC++ not installed
-        tmpl = 'Microsoft Visual C++ {version:0.1f} is required.'
+        tmpl = 'Microsoft Visual C++ {version:0.1f} or greater is required.'
         message = tmpl.format(**locals())
         msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
         if version == 9.0:
@@ -358,8 +358,9 @@ def _augment_exception(exc, version, arch=''):
             message += msdownload % 8279
         elif version >= 14.0:
             # For VC++ 14.X Redirect user to latest Visual C++ Build Tools
-            message += (' Get it with "Build Tools for Visual Studio": '
-                        r'https://visualstudio.microsoft.com/downloads/')
+            message += (' Get it with "Microsoft C++ Build Tools": '
+                        r'https://visualstudio.microsoft.com'
+                        r'/visual-cpp-build-tools/')
 
     exc.args = (message, )
 

From 48f728282213311d66f8863a77ee7bafb84cf26c Mon Sep 17 00:00:00 2001
From: Aren Cambre <aren@arencambre.com>
Date: Sun, 16 Aug 2020 14:11:10 -0500
Subject: [PATCH 8119/8469] Add changelog text for pypa/setuptools#2302

---
 changelog.d/2334.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2334.change.rst

diff --git a/changelog.d/2334.change.rst b/changelog.d/2334.change.rst
new file mode 100644
index 0000000000..0da381b4ab
--- /dev/null
+++ b/changelog.d/2334.change.rst
@@ -0,0 +1 @@
+Update text in error message.
\ No newline at end of file

From 84f1ba0d3c9a4125f1546d98fd44cd5d884e8af8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 18 Aug 2020 21:26:03 -0400
Subject: [PATCH 8120/8469] Update changelog.

---
 changelog.d/2334.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2334.change.rst b/changelog.d/2334.change.rst
index 0da381b4ab..9d3c74403f 100644
--- a/changelog.d/2334.change.rst
+++ b/changelog.d/2334.change.rst
@@ -1 +1 @@
-Update text in error message.
\ No newline at end of file
+In MSVC module, refine text in error message.

From 04e3df22df840c6bb244e9b27bc56750c44b7c85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 20 Aug 2020 21:41:17 -0400
Subject: [PATCH 8121/8469] =?UTF-8?q?Bump=20version:=2049.6.0=20=E2=86=92?=
 =?UTF-8?q?=2050.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 7 +++++++
 changelog.d/2232.breaking.rst | 1 -
 changelog.d/2334.change.rst   | 1 -
 setup.cfg                     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/2232.breaking.rst
 delete mode 100644 changelog.d/2334.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4bbe60c466..a50c3badbf 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 49.6.0
+current_version = 50.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 2d49707b23..9dd77e12fb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v50.0.0
+-------
+
+* #2232: Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
+* #2334: In MSVC module, refine text in error message.
+
+
 v49.6.0
 -------
 
diff --git a/changelog.d/2232.breaking.rst b/changelog.d/2232.breaking.rst
deleted file mode 100644
index b2fd926fe8..0000000000
--- a/changelog.d/2232.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
diff --git a/changelog.d/2334.change.rst b/changelog.d/2334.change.rst
deleted file mode 100644
index 9d3c74403f..0000000000
--- a/changelog.d/2334.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In MSVC module, refine text in error message.
diff --git a/setup.cfg b/setup.cfg
index b058fa8671..577e23c135 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.6.0
+version = 50.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 17cb9d6bf249cefe653d3bdb712582409035a7db Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 30 Aug 2020 14:54:21 -0400
Subject: [PATCH 8122/8469] Create Github releases when releasing. Fixes #2328.

---
 tox.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tox.ini b/tox.ini
index 557c8d5acd..535b67d3b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,9 +66,11 @@ deps =
 	wheel
 	twine[keyring]>=1.13
 	path
+	jaraco.develop>=7.1
 	jaraco.tidelift
 passenv =
 	TWINE_PASSWORD
+	GITHUB_TOKEN
 	TIDELIFT_TOKEN
 setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
@@ -77,4 +79,5 @@ commands =
 	python -c "import path; path.Path('dist').rmtree_p()"
 	python setup.py release
 	python -m twine upload dist/*
+	python -m jaraco.develop.create-github-release
 	python -m jaraco.tidelift.publish-release-notes

From db20067e06d0463c0e071113b981cf5a08082f79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Aug 2020 19:13:43 -0400
Subject: [PATCH 8123/8469] Supply ModuleNotFoundError for Python 3.5.

---
 distutils/tests/py38compat.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/distutils/tests/py38compat.py b/distutils/tests/py38compat.py
index 46ff575892..32269c7b93 100644
--- a/distutils/tests/py38compat.py
+++ b/distutils/tests/py38compat.py
@@ -1,6 +1,9 @@
 # flake8: noqa
 
 import contextlib
+import builtins
+
+ModuleNotFoundError = getattr(builtins, 'ModuleNotFoundError', ImportError)
 
 try:
     from test.support.warnings_helper import check_warnings

From 467915b93d3965a7bad42a4e3ec6ce49843f874b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Aug 2020 20:51:18 -0400
Subject: [PATCH 8124/8469] Restore compatibility with aix_support on Python
 3.8 and earlier. Fixes pypa/setuptools#2358.

---
 distutils/py38compat.py | 7 +++++++
 distutils/util.py       | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 distutils/py38compat.py

diff --git a/distutils/py38compat.py b/distutils/py38compat.py
new file mode 100644
index 0000000000..fa9ba73f42
--- /dev/null
+++ b/distutils/py38compat.py
@@ -0,0 +1,7 @@
+def aix_platform(osname, version, release):
+	try:
+        import _aix_support
+		return _aix_support.aix_platform()
+	except ImportError:
+		pass
+    return "%s-%s.%s" % (osname, version, release)
diff --git a/distutils/util.py b/distutils/util.py
index 4b002ecef1..9d6c5cbdec 100644
--- a/distutils/util.py
+++ b/distutils/util.py
@@ -79,8 +79,8 @@ def get_host_platform():
             machine += ".%s" % bitness[sys.maxsize]
         # fall through to standard osname-release-machine representation
     elif osname[:3] == "aix":
-        from _aix_support import aix_platform
-        return aix_platform()
+        from .py38compat import aix_platform
+        return aix_platform(osname, version, release)
     elif osname[:6] == "cygwin":
         osname = "cygwin"
         rel_re = re.compile (r'[\d.]+', re.ASCII)

From ae27e13a663cc53d15632e884f7b4d601a8605dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 31 Aug 2020 21:09:14 -0400
Subject: [PATCH 8125/8469] Supply a copy of _optim_args_from_interpreter_flags
 for Python 3.5 compatibility. Ref pypa/setuptools#2357.

---
 distutils/py35compat.py | 19 +++++++++++++++++++
 distutils/util.py       |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 distutils/py35compat.py

diff --git a/distutils/py35compat.py b/distutils/py35compat.py
new file mode 100644
index 0000000000..79b2e7f38c
--- /dev/null
+++ b/distutils/py35compat.py
@@ -0,0 +1,19 @@
+import sys
+import subprocess
+
+
+def __optim_args_from_interpreter_flags():
+    """Return a list of command-line arguments reproducing the current
+    optimization settings in sys.flags."""
+    args = []
+    value = sys.flags.optimize
+    if value > 0:
+        args.append("-" + "O" * value)
+    return args
+
+
+_optim_args_from_interpreter_flags = getattr(
+    subprocess,
+    "_optim_args_from_interpreter_flags",
+    __optim_args_from_interpreter_flags,
+)
diff --git a/distutils/util.py b/distutils/util.py
index 9d6c5cbdec..f5aca79421 100644
--- a/distutils/util.py
+++ b/distutils/util.py
@@ -14,6 +14,8 @@
 from distutils.spawn import spawn
 from distutils import log
 from distutils.errors import DistutilsByteCompileError
+from .py35compat import _optim_args_from_interpreter_flags
+
 
 def get_host_platform():
     """Return a string that identifies the current platform.  This is used mainly to
@@ -420,7 +422,7 @@ def byte_compile (py_files,
 """ % (optimize, force, prefix, base_dir, verbose))
 
         cmd = [sys.executable]
-        cmd.extend(subprocess._optim_args_from_interpreter_flags())
+        cmd.extend(_optim_args_from_interpreter_flags())
         cmd.append(script_name)
         spawn(cmd, dry_run=dry_run)
         execute(os.remove, (script_name,), "removing %s" % script_name,

From c3a4de7868e89f4a745b911dae888dfff245abd2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 08:59:35 -0400
Subject: [PATCH 8126/8469] Doctest modules for valid syntax, capturing
 TabError.

---
 conftest.py | 11 +++++++++++
 pytest.ini  |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 conftest.py

diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000000..c0b1040000
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,11 @@
+import platform
+
+
+collect_ignore = []
+
+
+if platform.system() != 'Windows':
+    collect_ignore.extend([
+        'distutils/command/bdist_msi.py',
+        'distutils/msvc9compiler.py',
+    ])
diff --git a/pytest.ini b/pytest.ini
index 3e01b43900..b305356b33 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
 [pytest]
+addopts=--doctest-modules
 filterwarnings=
     # acknowledge that TestDistribution isn't a test
     ignore:cannot collect test class 'TestDistribution'

From 208fa0103be6d459272de91f17c709973a68ac68 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 09:07:21 -0400
Subject: [PATCH 8127/8469] Fix TabError

---
 distutils/py38compat.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/distutils/py38compat.py b/distutils/py38compat.py
index fa9ba73f42..7dbe8cef54 100644
--- a/distutils/py38compat.py
+++ b/distutils/py38compat.py
@@ -1,7 +1,7 @@
 def aix_platform(osname, version, release):
-	try:
+    try:
         import _aix_support
-		return _aix_support.aix_platform()
-	except ImportError:
-		pass
+        return _aix_support.aix_platform()
+    except ImportError:
+        pass
     return "%s-%s.%s" % (osname, version, release)

From df8c341bacb103e085d6714bf9778f008a56cb04 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Mon, 31 Aug 2020 18:16:41 +0200
Subject: [PATCH 8128/8469] Add Python 3.10 support to _distutils_hack

Get the 'Loader' abstract class from importlib.abc rather than
importlib.util.abc (alias removed in Python 3.10).
---
 _distutils_hack/__init__.py | 3 ++-
 changelog.d/2361.change.rst | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2361.change.rst

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 074bd5e9c8..b8410e1fc8 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -74,9 +74,10 @@ def find_spec(self, fullname, path, target=None):
         return method()
 
     def spec_for_distutils(self):
+        import importlib.abc
         import importlib.util
 
-        class DistutilsLoader(importlib.util.abc.Loader):
+        class DistutilsLoader(importlib.abc.Loader):
 
             def create_module(self, spec):
                 return importlib.import_module('._distutils', 'setuptools')
diff --git a/changelog.d/2361.change.rst b/changelog.d/2361.change.rst
new file mode 100644
index 0000000000..6db769c452
--- /dev/null
+++ b/changelog.d/2361.change.rst
@@ -0,0 +1,3 @@
+Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
+from importlib.abc rather than importlib.util.abc (alias removed in Python
+3.10).

From d7bc92579bdbfabe4c452b7f29eb45470678deb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 11:30:59 -0400
Subject: [PATCH 8129/8469] Update changelog. Ref #2358.

---
 changelog.d/2358.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2358.misc.rst

diff --git a/changelog.d/2358.misc.rst b/changelog.d/2358.misc.rst
new file mode 100644
index 0000000000..89cec8bf7d
--- /dev/null
+++ b/changelog.d/2358.misc.rst
@@ -0,0 +1 @@
+Restored AIX support on Python 3.8 and earlier.

From 6783f66441f03b61d5d1035fb0f0374db2c89cfd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 11:31:33 -0400
Subject: [PATCH 8130/8469] Bugfix is 'misc'. Ref #2361.

---
 changelog.d/{2361.change.rst => 2361.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2361.change.rst => 2361.misc.rst} (100%)

diff --git a/changelog.d/2361.change.rst b/changelog.d/2361.misc.rst
similarity index 100%
rename from changelog.d/2361.change.rst
rename to changelog.d/2361.misc.rst

From 4ea9dd875488dd0c9f2773ad21aeda4f73d93b23 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 12:13:14 -0400
Subject: [PATCH 8131/8469] Update changelog. Closes #2357.

---
 changelog.d/2357.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2357.misc.rst

diff --git a/changelog.d/2357.misc.rst b/changelog.d/2357.misc.rst
new file mode 100644
index 0000000000..a7b3cc3c65
--- /dev/null
+++ b/changelog.d/2357.misc.rst
@@ -0,0 +1 @@
+Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`.

From db378e28cc70ec4ed3c21dfbd255c9ea54a861c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 13:32:50 -0400
Subject: [PATCH 8132/8469] =?UTF-8?q?Bump=20version:=2050.0.0=20=E2=86=92?=
 =?UTF-8?q?=2050.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          |  2 +-
 CHANGES.rst               | 10 ++++++++++
 changelog.d/2357.misc.rst |  1 -
 changelog.d/2358.misc.rst |  1 -
 changelog.d/2361.misc.rst |  3 ---
 setup.cfg                 |  2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/2357.misc.rst
 delete mode 100644 changelog.d/2358.misc.rst
 delete mode 100644 changelog.d/2361.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a50c3badbf..ebb58d3b1c 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.0.0
+current_version = 50.0.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 9dd77e12fb..0082b7f30b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v50.0.1
+-------
+
+* #2357: Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`.
+* #2358: Restored AIX support on Python 3.8 and earlier.
+* #2361: Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
+  from importlib.abc rather than importlib.util.abc (alias removed in Python
+  3.10).
+
+
 v50.0.0
 -------
 
diff --git a/changelog.d/2357.misc.rst b/changelog.d/2357.misc.rst
deleted file mode 100644
index a7b3cc3c65..0000000000
--- a/changelog.d/2357.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`.
diff --git a/changelog.d/2358.misc.rst b/changelog.d/2358.misc.rst
deleted file mode 100644
index 89cec8bf7d..0000000000
--- a/changelog.d/2358.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restored AIX support on Python 3.8 and earlier.
diff --git a/changelog.d/2361.misc.rst b/changelog.d/2361.misc.rst
deleted file mode 100644
index 6db769c452..0000000000
--- a/changelog.d/2361.misc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
-from importlib.abc rather than importlib.util.abc (alias removed in Python
-3.10).
diff --git a/setup.cfg b/setup.cfg
index 577e23c135..71839ef1d7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.0.0
+version = 50.0.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From a3319a388913facb5b9236c938ba9adabd5b9fdd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 16:58:40 -0400
Subject: [PATCH 8133/8469] In distutils hack, use absolute import rather than
 relative to avoid bpo-30876. Fixes #2352.

---
 _distutils_hack/__init__.py | 2 +-
 changelog.d/2352.misc.rst   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2352.misc.rst

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index b8410e1fc8..2bc6df7ac7 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -80,7 +80,7 @@ def spec_for_distutils(self):
         class DistutilsLoader(importlib.abc.Loader):
 
             def create_module(self, spec):
-                return importlib.import_module('._distutils', 'setuptools')
+                return importlib.import_module('setuptools._distutils')
 
             def exec_module(self, module):
                 pass
diff --git a/changelog.d/2352.misc.rst b/changelog.d/2352.misc.rst
new file mode 100644
index 0000000000..79dda996fe
--- /dev/null
+++ b/changelog.d/2352.misc.rst
@@ -0,0 +1 @@
+In distutils hack, use absolute import rather than relative to avoid bpo-30876.

From edcf84faaf17e87e6e38796dd24f66d9236bf87c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 18:18:26 -0400
Subject: [PATCH 8134/8469] =?UTF-8?q?Bump=20version:=2050.0.1=20=E2=86=92?=
 =?UTF-8?q?=2050.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2352.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2352.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ebb58d3b1c..e2973162e8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.0.1
+current_version = 50.0.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 0082b7f30b..435a7b4699 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v50.0.2
+-------
+
+* #2352: In distutils hack, use absolute import rather than relative to avoid bpo-30876.
+
+
 v50.0.1
 -------
 
diff --git a/changelog.d/2352.misc.rst b/changelog.d/2352.misc.rst
deleted file mode 100644
index 79dda996fe..0000000000
--- a/changelog.d/2352.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-In distutils hack, use absolute import rather than relative to avoid bpo-30876.
diff --git a/setup.cfg b/setup.cfg
index 71839ef1d7..0101bb8683 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.0.1
+version = 50.0.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 608988196d608f913398fc8853cfb797d2a1b63d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 19:14:22 -0400
Subject: [PATCH 8135/8469] Support 'bpo-' prefix on Python bugs

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index b92b50cccf..20800e7174 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -101,7 +101,7 @@
                 url='http://bugs.jython.org/issue{jython}',
             ),
             dict(
-                pattern=r'Python #(?P<python>\d+)',
+                pattern=r'(Python #|bpo-)(?P<python>\d+)',
                 url='http://bugs.python.org/issue{python}',
             ),
             dict(

From 97a8f11a8a039fc0de04a31d281715f1ce6ea4bc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 21:18:01 -0400
Subject: [PATCH 8136/8469] Restore pythonlib support on older Pythons. Fixes
 pypa/distutils#9.

---
 distutils/command/build_ext.py  |  3 ++-
 distutils/command/py37compat.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 distutils/command/py37compat.py

diff --git a/distutils/command/build_ext.py b/distutils/command/build_ext.py
index 1a9bd1200f..bbb348331b 100644
--- a/distutils/command/build_ext.py
+++ b/distutils/command/build_ext.py
@@ -16,6 +16,7 @@
 from distutils.extension import Extension
 from distutils.util import get_platform
 from distutils import log
+from . import py37compat
 
 from site import USER_BASE
 
@@ -751,4 +752,4 @@ def get_libraries(self, ext):
                 ldversion = get_config_var('LDVERSION')
                 return ext.libraries + ['python' + ldversion]
 
-        return ext.libraries
+        return ext.libraries + py37compat.pythonlib()
diff --git a/distutils/command/py37compat.py b/distutils/command/py37compat.py
new file mode 100644
index 0000000000..754715a508
--- /dev/null
+++ b/distutils/command/py37compat.py
@@ -0,0 +1,30 @@
+import sys
+
+
+def _pythonlib_compat():
+    """
+    On Python 3.7 and earlier, distutils would include the Python
+    library. See pypa/distutils#9.
+    """
+    from distutils import sysconfig
+    if not sysconfig.get_config_var('Py_ENABLED_SHARED'):
+        return
+
+    yield 'python{}.{}{}'.format(
+        sys.hexversion >> 24,
+        (sys.hexversion >> 16) & 0xff,
+        sysconfig.get_config_var('ABIFLAGS'),
+    )
+
+
+def compose(f1, f2):
+    return lambda *args, **kwargs: f1(f2(*args, **kwargs))
+
+
+pythonlib = (
+    compose(list, _pythonlib_compat)
+    if sys.version_info < (3, 8)
+    and sys.platform != 'darwin'
+    and sys.platform[:3] != 'aix'
+    else list
+)

From 837fa5cd58e927953183e750d0c429a5e871865f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 21:35:43 -0400
Subject: [PATCH 8137/8469] No longer try to track package changes separately.

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index e619264d29..4d9dea513c 100644
--- a/README.rst
+++ b/README.rst
@@ -37,4 +37,4 @@ From the CPython repo, cherry-pick the changes from this project.
 To Setuptools
 -------------
 
-This project also maintains a `clean branch <https://github.com/pypa/distutils/tree/clean>`_ to capture only the code changes to distutils, excluding the ancillary details like packaging and this document.
+Simply merge the changes directly into setuptools' repo.

From d2e529896bcde20559da3fa2c01e825d218fdb18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 21:46:51 -0400
Subject: [PATCH 8138/8469] Add links for distutils

---
 docs/conf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 20800e7174..12520586cd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -128,6 +128,10 @@
                 pattern=r'setuptools_svn #(?P<setuptools_svn>\d+)',
                 url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}',
             ),
+            dict(
+                pattern=r'pypa/distutils#(?P<distutils>\d+)',
+                url='{GH}/pypa/distutils/issues/{distutils}',
+            ),
             dict(
                 pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
                 with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',

From 400b71c9b932893ab97dd6368ae7bfb822064a87 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 21:47:04 -0400
Subject: [PATCH 8139/8469] =?UTF-8?q?Bump=20version:=2050.0.2=20=E2=86=92?=
 =?UTF-8?q?=2050.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 6 ++++++
 changelog.d/2363.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2363.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e2973162e8..e85c79bbc6 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.0.2
+current_version = 50.0.3
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 435a7b4699..8f192618c7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v50.0.3
+-------
+
+* #2363: Restore link_libpython support on Python 3.7 and earlier (see pypa/distutils#9).
+
+
 v50.0.2
 -------
 
diff --git a/changelog.d/2363.misc.rst b/changelog.d/2363.misc.rst
deleted file mode 100644
index 3ac5d9cea8..0000000000
--- a/changelog.d/2363.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore link_libpython support on Python 3.7 and earlier (see pypa/distutils#9).
diff --git a/setup.cfg b/setup.cfg
index 0101bb8683..7236ae40f7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.0.2
+version = 50.0.3
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 8eb9efac24a5bd7f964f6f09d142576f1b4a9e07 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 1 Sep 2020 21:59:49 -0400
Subject: [PATCH 8140/8469] Ensure GITHUB_TOKEN is set. Closes #2328.

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ee772682ab..4567b9b043 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -76,6 +76,7 @@ stages:
       env:
         TWINE_PASSWORD: $(PyPI-token)
         TIDELIFT_TOKEN: $(Tidelift-token)
+        GITHUB_TOKEN: $(Github-token)
       displayName: 'publish to PyPI'
 
   condition: contains(variables['Build.SourceBranch'], 'tags')

From c0085e87c69629ec3cf24dfce887c0fb93fa80dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Sep 2020 17:41:38 -0400
Subject: [PATCH 8141/8469] Make stdlib distutils the default again. Stop the
 burning. Ref #2350 and others.

---
 _distutils_hack/__init__.py | 2 +-
 changelog.d/2350.change.rst | 1 +
 setup.py                    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/2350.change.rst

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 2bc6df7ac7..3325817bca 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -37,7 +37,7 @@ def enabled():
     """
     Allow selection of distutils by environment variable.
     """
-    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local')
+    which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib')
     return which == 'local'
 
 
diff --git a/changelog.d/2350.change.rst b/changelog.d/2350.change.rst
new file mode 100644
index 0000000000..c06930e61f
--- /dev/null
+++ b/changelog.d/2350.change.rst
@@ -0,0 +1 @@
+Setuptools reverts using the included distutils by default. Platform maintainers and system integrators and others are *strongly* encouraged to set ``SETUPTOOLS_USE_DISTUTILS=local`` to help identify and work through the reported issues with distutils adoption, mainly to file issues and pull requests with pypa/distutils such that distutils performs as needed across every supported environment.
diff --git a/setup.py b/setup.py
index 34654e19fc..2bd48daa67 100755
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,7 @@ class install_with_pth(install):
     _pth_contents = textwrap.dedent("""
         import os
         var = 'SETUPTOOLS_USE_DISTUTILS'
-        enabled = os.environ.get(var, 'local') == 'local'
+        enabled = os.environ.get(var, 'stdlib') == 'local'
         enabled and __import__('_distutils_hack').add_shim()
         """).lstrip().replace('\n', '; ')
 

From 9e7261b46e42591218ef3e5b6630ab5e2ea13adc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Sep 2020 19:27:44 -0400
Subject: [PATCH 8142/8469] Update tests to specify local or stdlib for
 stability under default value.

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

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index 8edd3f9b44..a53773df8c 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -56,7 +56,8 @@ def test_distutils_local_with_setuptools(venv):
     """
     Ensure local distutils is used when appropriate.
     """
-    loc = find_distutils(venv, imports='setuptools, distutils', env=dict())
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    loc = find_distutils(venv, imports='setuptools, distutils', env=env)
     assert venv.name in loc.split(os.sep)
 
 
@@ -66,4 +67,5 @@ def test_distutils_local(venv):
     Even without importing, the setuptools-local copy of distutils is
     preferred.
     """
-    assert venv.name in find_distutils(venv, env=dict()).split(os.sep)
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    assert venv.name in find_distutils(venv, env=env).split(os.sep)

From 4c29a5122247f0461a9e44ff8484159c563935c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 2 Sep 2020 20:49:25 -0400
Subject: [PATCH 8143/8469] =?UTF-8?q?Bump=20version:=2050.0.3=20=E2=86=92?=
 =?UTF-8?q?=2050.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2350.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2350.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e85c79bbc6..34b34fde91 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.0.3
+current_version = 50.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 8f192618c7..a00d827191 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v50.1.0
+-------
+
+* #2350: Setuptools reverts using the included distutils by default. Platform maintainers and system integrators and others are *strongly* encouraged to set ``SETUPTOOLS_USE_DISTUTILS=local`` to help identify and work through the reported issues with distutils adoption, mainly to file issues and pull requests with pypa/distutils such that distutils performs as needed across every supported environment.
+
+
 v50.0.3
 -------
 
diff --git a/changelog.d/2350.change.rst b/changelog.d/2350.change.rst
deleted file mode 100644
index c06930e61f..0000000000
--- a/changelog.d/2350.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools reverts using the included distutils by default. Platform maintainers and system integrators and others are *strongly* encouraged to set ``SETUPTOOLS_USE_DISTUTILS=local`` to help identify and work through the reported issues with distutils adoption, mainly to file issues and pull requests with pypa/distutils such that distutils performs as needed across every supported environment.
diff --git a/setup.cfg b/setup.cfg
index 7236ae40f7..692eb1fe88 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.0.3
+version = 50.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 74febd272d911a1105501fa7b9518fd9143ae3ed Mon Sep 17 00:00:00 2001
From: Eshant Gupta <guptaeshant@gmail.com>
Date: Thu, 3 Sep 2020 23:32:00 +0530
Subject: [PATCH 8144/8469] Adding changes to support PPC64LE

---
 .travis.yml | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0e636eecc4..2557c96f8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,20 +16,51 @@ jobs:
   - python: 3.9-dev
   - <<: *latest_py3
     env: TOXENV=docs
+    #PPC64LE
+  - arch: ppc64le
+    python: pypy3
+  - arch: ppc64le
+    python: 3.5
+  - arch: ppc64le
+    python: 3.6
+  - arch: ppc64le
+    python: 3.7
+  - &latest_py3_ppc
+    arch: ppc64le
+    python: 3.8
+  - <<: *latest_py3_ppc
+    env: LANG=C
+  - arch: ppc64le
+    python: 3.8-dev
+  - arch: ppc64le
+    python: 3.9-dev
+  - <<: *latest_py3_ppc
+    env: TOXENV=docs
   allow_failures:
   # suppress failures due to pypa/setuptools#2000
   - python: pypy3
+  - arch: ppc64le
+    python: pypy3
   - <<: *latest_py3
     env: TOXENV=docs
+  - <<: *latest_py3_ppc
+    env: TOXENV=docs
+
 
 cache: pip
 
+before_install:
+  - |
+    if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]]; then
+      sudo chown -Rfv $USER:$GROUP ~/.cache/pip/wheels
+    fi
+
 install:
 
 # ensure we have recent pip/setuptools/wheel
 - pip install --disable-pip-version-check --upgrade pip setuptools wheel
-# need tox to get started
 - pip install --upgrade tox tox-venv
+# need tox to get started
 
 # Output the env, to verify behavior
 - pip freeze --all

From c9ec9537049a63c83bd9b8470cfcabd605ab4d58 Mon Sep 17 00:00:00 2001
From: Eshant Gupta <guptaeshant@gmail.com>
Date: Fri, 4 Sep 2020 12:17:12 +0530
Subject: [PATCH 8145/8469] Adding comments

Restoring mis-placed comment, added comment for PPC64LE specific permission fix and reduced number of jobs for the same platform.
---
 .travis.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2557c96f8d..d6e0e5563a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,17 +21,11 @@ jobs:
     python: pypy3
   - arch: ppc64le
     python: 3.5
-  - arch: ppc64le
-    python: 3.6
-  - arch: ppc64le
-    python: 3.7
   - &latest_py3_ppc
     arch: ppc64le
     python: 3.8
   - <<: *latest_py3_ppc
     env: LANG=C
-  - arch: ppc64le
-    python: 3.8-dev
   - arch: ppc64le
     python: 3.9-dev
   - <<: *latest_py3_ppc
@@ -50,6 +44,8 @@ jobs:
 cache: pip
 
 before_install:
+# Fix for PPC64LE, where permissions are fixed to allow tox/pip to install packages. 
+# As travis base images for PPC64LE except for bionic, do not have this fix.
   - |
     if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]]; then
       sudo chown -Rfv $USER:$GROUP ~/.cache/pip/wheels
@@ -59,8 +55,8 @@ install:
 
 # ensure we have recent pip/setuptools/wheel
 - pip install --disable-pip-version-check --upgrade pip setuptools wheel
-- pip install --upgrade tox tox-venv
 # need tox to get started
+- pip install --upgrade tox tox-venv
 
 # Output the env, to verify behavior
 - pip freeze --all

From 9a7710b1ef1bef6c3d8ad6427e87ee886860b40e Mon Sep 17 00:00:00 2001
From: Thomas Hisch <thomas.hisch@ims.co.at>
Date: Sun, 30 Aug 2020 12:34:59 +0200
Subject: [PATCH 8146/8469] Reduce size of setuptools'
 bdist_rpm._make_spec_file

There are some setuptools specific changes in the bdist_rpm module that
are no longer needed, because the upstream/shipped version of distutils
already contains them. The code that is removed in this commit from
bdist_rpm is already part of the python-3.5 version of distutils.

Related: #2377
---
 changelog.d/2380.change.rst     |  4 ++++
 setuptools/command/bdist_rpm.py | 14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 changelog.d/2380.change.rst

diff --git a/changelog.d/2380.change.rst b/changelog.d/2380.change.rst
new file mode 100644
index 0000000000..e68d108077
--- /dev/null
+++ b/changelog.d/2380.change.rst
@@ -0,0 +1,4 @@
+There are some setuptools specific changes in the
+`setuptools.command.bdist_rpm` module that are no longer needed, because
+they are part of the `bdist_rpm` module in distutils in Python
+3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
\ No newline at end of file
diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 70730927ec..0eb1b9c254 100644
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -8,8 +8,6 @@ class bdist_rpm(orig.bdist_rpm):
     1. Run egg_info to ensure the name and version are properly calculated.
     2. Always run 'install' using --single-version-externally-managed to
        disable eggs in RPM distributions.
-    3. Replace dash with underscore in the version numbers for better RPM
-       compatibility.
     """
 
     def run(self):
@@ -19,25 +17,15 @@ def run(self):
         orig.bdist_rpm.run(self)
 
     def _make_spec_file(self):
-        version = self.distribution.get_version()
-        rpmversion = version.replace('-', '_')
         spec = orig.bdist_rpm._make_spec_file(self)
-        line23 = '%define version ' + version
-        line24 = '%define version ' + rpmversion
         spec = [
             line.replace(
-                "Source0: %{name}-%{version}.tar",
-                "Source0: %{name}-%{unmangled_version}.tar"
-            ).replace(
                 "setup.py install ",
                 "setup.py install --single-version-externally-managed "
             ).replace(
                 "%setup",
                 "%setup -n %{name}-%{unmangled_version}"
-            ).replace(line23, line24)
+            )
             for line in spec
         ]
-        insert_loc = spec.index(line24) + 1
-        unmangled_version = "%define unmangled_version " + version
-        spec.insert(insert_loc, unmangled_version)
         return spec

From a60ba76395353974f5bb51ad1c117d7239ed5032 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Sep 2020 08:59:40 -0400
Subject: [PATCH 8147/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 3325817bca..504c4ac0d8 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -20,8 +20,8 @@ def warn_distutils_present():
         "also replaces the `distutils` module in `sys.modules`. This may lead "
         "to undesirable behaviors or errors. To avoid these issues, avoid "
         "using distutils directly, ensure that setuptools is installed in the "
-        "traditional way (e.g. not an editable install), and/or make sure that "
-        "setuptools is always imported before distutils.")
+        "traditional way (e.g. not an editable install), and/or make sure "
+        "that setuptools is always imported before distutils.")
 
 
 def clear_distutils():

From 7c07fec3f02093bf048a1192473ab0736211e47e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Sep 2020 09:29:21 -0400
Subject: [PATCH 8148/8469] When pip is imported as part of a build, leave
 distutils patched. Fixes #2355.

---
 _distutils_hack/__init__.py | 13 +++++++++++++
 changelog.d/2355.change.rst |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 changelog.d/2355.change.rst

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index 504c4ac0d8..c31edfed17 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -92,9 +92,22 @@ def spec_for_pip(self):
         Ensure stdlib distutils when running under pip.
         See pypa/pip#8761 for rationale.
         """
+        if self.pip_imported_during_build():
+            return
         clear_distutils()
         self.spec_for_distutils = lambda: None
 
+    @staticmethod
+    def pip_imported_during_build():
+        """
+        Detect if pip is being imported in a build script. Ref #2355.
+        """
+        import traceback
+        return any(
+            frame.f_globals['__file__'].endswith('setup.py')
+            for frame, line in traceback.walk_stack(None)
+        )
+
 
 DISTUTILS_FINDER = DistutilsMetaFinder()
 
diff --git a/changelog.d/2355.change.rst b/changelog.d/2355.change.rst
new file mode 100644
index 0000000000..d17435f55f
--- /dev/null
+++ b/changelog.d/2355.change.rst
@@ -0,0 +1 @@
+When pip is imported as part of a build, leave distutils patched.

From 03d36b9edb53e266a0b4b836e1e3178f989a0781 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Sep 2020 10:02:11 -0400
Subject: [PATCH 8149/8469] =?UTF-8?q?Bump=20version:=2050.1.0=20=E2=86=92?=
 =?UTF-8?q?=2050.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 10 ++++++++++
 changelog.d/2355.change.rst |  1 -
 changelog.d/2380.change.rst |  4 ----
 setup.cfg                   |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/2355.change.rst
 delete mode 100644 changelog.d/2380.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 34b34fde91..0bb91b48fa 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.1.0
+current_version = 50.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index a00d827191..9962f63d08 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v50.2.0
+-------
+
+* #2355: When pip is imported as part of a build, leave distutils patched.
+* #2380: There are some setuptools specific changes in the
+  `setuptools.command.bdist_rpm` module that are no longer needed, because
+  they are part of the `bdist_rpm` module in distutils in Python
+  3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
+
+
 v50.1.0
 -------
 
diff --git a/changelog.d/2355.change.rst b/changelog.d/2355.change.rst
deleted file mode 100644
index d17435f55f..0000000000
--- a/changelog.d/2355.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-When pip is imported as part of a build, leave distutils patched.
diff --git a/changelog.d/2380.change.rst b/changelog.d/2380.change.rst
deleted file mode 100644
index e68d108077..0000000000
--- a/changelog.d/2380.change.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-There are some setuptools specific changes in the
-`setuptools.command.bdist_rpm` module that are no longer needed, because
-they are part of the `bdist_rpm` module in distutils in Python
-3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 692eb1fe88..d35e5fa2fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.1.0
+version = 50.2.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 37fa0e7531fbd240131d498f43436aafd4393149 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2020 10:45:35 -0400
Subject: [PATCH 8150/8469] Add test capturing failed expectation. Ref
 pypa/distutils#15.

---
 distutils/tests/test_msvccompiler.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/distutils/tests/test_msvccompiler.py b/distutils/tests/test_msvccompiler.py
index 88d912b17b..46a51cd0a7 100644
--- a/distutils/tests/test_msvccompiler.py
+++ b/distutils/tests/test_msvccompiler.py
@@ -110,6 +110,26 @@ def test_concurrent_safe(self):
             thread.join()
         assert all(threads)
 
+    def test_concurrent_safe_fallback(self):
+        """
+        If CCompiler.spawn has been monkey-patched without support
+        for an env, it should still execute.
+        """
+        import distutils._msvccompiler as _msvccompiler
+        from distutils import ccompiler
+        compiler = _msvccompiler.MSVCCompiler()
+        compiler._paths = "expected"
+
+        def CCompiler_spawn(self, cmd):
+            "A spawn without an env argument."
+            assert os.environ["PATH"] == "expected"
+
+        with unittest.mock.patch.object(
+                ccompiler.CCompiler, 'spawn', CCompiler_spawn):
+            compiler.spawn(["n/a"])
+
+        assert os.environ.get("PATH") != "expected"
+
 
 def test_suite():
     return unittest.makeSuite(msvccompilerTestCase)

From 6e92cdabaff71ab2bab3300763101fb8f84c367f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2020 10:58:55 -0400
Subject: [PATCH 8151/8469] Add fallback for the situation where
 distutils.ccompiler.CCompiler.spawn has been patched. Fixes
 pypa/distutils#15.

---
 distutils/_msvccompiler.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/distutils/_msvccompiler.py b/distutils/_msvccompiler.py
index 2d56ee0aad..f7efd4ebe4 100644
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
@@ -16,6 +16,7 @@
 import os
 import subprocess
 import contextlib
+import unittest.mock
 with contextlib.suppress(ImportError):
     import winreg
 
@@ -504,7 +505,27 @@ def link(self,
 
     def spawn(self, cmd):
         env = dict(os.environ, PATH=self._paths)
-        return super().spawn(cmd, env=env)
+        with self._fallback_spawn(cmd, env) as fallback:
+            return super().spawn(cmd, env=env)
+        return fallback.value
+
+    @contextlib.contextmanager
+    def _fallback_spawn(self, cmd, env):
+        """
+        Discovered in pypa/distutils#15, some tools monkeypatch the compiler,
+        so the 'env' kwarg causes a TypeError. Detect this condition and
+        restore the legacy, unsafe behavior.
+        """
+        bag = type('Bag', (), {})()
+        try:
+            yield bag
+        except TypeError as exc:
+            if "unexpected keyword argument 'env'" not in str(exc):
+                raise
+        else:
+            return
+        with unittest.mock.patch('os.environ', env):
+            bag.value = super().spawn(cmd)
 
     # -- Miscellaneous methods -----------------------------------------
     # These are all used by the 'gen_lib_options() function, in

From 2888d3c08e1c34254f726bc331dc33d419e636dc Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2020 11:03:35 -0400
Subject: [PATCH 8152/8469] Emit a warning when the fallback spawn was
 triggered. Ref pypa/distutils#15.

---
 distutils/_msvccompiler.py | 3 +++
 pytest.ini                 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/distutils/_msvccompiler.py b/distutils/_msvccompiler.py
index f7efd4ebe4..e9af4cf52b 100644
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
@@ -16,6 +16,7 @@
 import os
 import subprocess
 import contextlib
+import warnings
 import unittest.mock
 with contextlib.suppress(ImportError):
     import winreg
@@ -524,6 +525,8 @@ def _fallback_spawn(self, cmd, env):
                 raise
         else:
             return
+        warnings.warn(
+            "Fallback spawn triggered. Please update distutils monkeypatch.")
         with unittest.mock.patch('os.environ', env):
             bag.value = super().spawn(cmd)
 
diff --git a/pytest.ini b/pytest.ini
index b305356b33..dba42e75a4 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,3 +3,4 @@ addopts=--doctest-modules
 filterwarnings=
     # acknowledge that TestDistribution isn't a test
     ignore:cannot collect test class 'TestDistribution'
+    ignore:Fallback spawn triggered

From 6c69bf97aefd67d421c58b49813c71ebfdc35316 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2020 11:08:41 -0400
Subject: [PATCH 8153/8469] Add changelog. Ref pypa/distutils#15.

---
 changelog.d/2368.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2368.change.rst

diff --git a/changelog.d/2368.change.rst b/changelog.d/2368.change.rst
new file mode 100644
index 0000000000..b9b6b03372
--- /dev/null
+++ b/changelog.d/2368.change.rst
@@ -0,0 +1 @@
+In distutils, restore support for monkeypatched CCompiler.spawn per pypa/distutils#15.

From f84c145482d273cd6b90e20012443edcfd59ff0d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 5 Sep 2020 11:08:53 -0400
Subject: [PATCH 8154/8469] =?UTF-8?q?Bump=20version:=2050.2.0=20=E2=86=92?=
 =?UTF-8?q?=2050.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 6 ++++++
 changelog.d/2368.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2368.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 0bb91b48fa..7a0aef412a 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.2.0
+current_version = 50.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 9962f63d08..83b56b65cc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v50.3.0
+-------
+
+* #2368: In distutils, restore support for monkeypatched CCompiler.spawn per pypa/distutils#15.
+
+
 v50.2.0
 -------
 
diff --git a/changelog.d/2368.change.rst b/changelog.d/2368.change.rst
deleted file mode 100644
index b9b6b03372..0000000000
--- a/changelog.d/2368.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-In distutils, restore support for monkeypatched CCompiler.spawn per pypa/distutils#15.
diff --git a/setup.cfg b/setup.cfg
index d35e5fa2fd..7851845790 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.2.0
+version = 50.3.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From f01d2719802d3345332b761fb1c62fa4afd212c9 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Sep 2020 19:05:13 -0400
Subject: [PATCH 8155/8469] Enable flake8 and cov plugins only when installed.
 Avoid installing in PyPy.

---
 conftest.py    | 18 ------------------
 pyproject.toml |  6 ++++++
 pytest.ini     |  2 +-
 setup.cfg      |  4 +++-
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/conftest.py b/conftest.py
index 25537f56e5..9009025396 100644
--- a/conftest.py
+++ b/conftest.py
@@ -19,24 +19,6 @@ def pytest_addoption(parser):
 ]
 
 
-def pytest_configure(config):
-    disable_coverage_on_pypy(config)
-
-
-def disable_coverage_on_pypy(config):
-    """
-    Coverage makes tests on PyPy unbearably slow, so disable it.
-    """
-    if '__pypy__' not in sys.builtin_module_names:
-        return
-
-    # Recommended at pytest-dev/pytest-cov#418
-    cov = config.pluginmanager.get_plugin('_cov')
-    cov.options.no_cov = True
-    if cov.cov_controller:
-        cov.cov_controller.pause()
-
-
 if sys.version_info < (3,):
     collect_ignore.append('setuptools/lib2to3_ex.py')
     collect_ignore.append('setuptools/_imp.py')
diff --git a/pyproject.toml b/pyproject.toml
index cfdc2574b7..cd66e2773e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,3 +41,9 @@ backend-path = ["."]
         directory = "misc"
         name = "Misc"
         showcontent = true
+
+[tool.jaraco.pytest.plugins.flake8]
+addopts = "--flake8"
+
+[tool.jaraco.pytest.plugins.cov]
+addopts = "--cov"
diff --git a/pytest.ini b/pytest.ini
index ddcad08bae..40efb05465 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt --cov -r sxX
+addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
diff --git a/setup.cfg b/setup.cfg
index 7851845790..c326d1008f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -68,10 +68,12 @@ tests =
     pytest>=3.7
     wheel
     coverage>=4.5.1
-    pytest-cov>=2.5.1
+    # Coverage is unbearably slow on PyPy
+    pytest-cov>=2.5.1; python_implementation != "PyPy"
     paver; python_version>="3.6"
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
+    jaraco.test >= 3.1.1
 
 docs =
     # Keep these in sync with docs/requirements.txt

From 2995140fe8fc3d0de9f9fa6fe0d574dc2d9a0ca3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Sep 2020 19:30:08 -0400
Subject: [PATCH 8156/8469] Remove legacy warning suppressions and Python 2
 ignored collections.

---
 conftest.py | 5 -----
 pytest.ini  | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/conftest.py b/conftest.py
index 25537f56e5..baffac1adb 100644
--- a/conftest.py
+++ b/conftest.py
@@ -37,10 +37,5 @@ def disable_coverage_on_pypy(config):
         cov.cov_controller.pause()
 
 
-if sys.version_info < (3,):
-    collect_ignore.append('setuptools/lib2to3_ex.py')
-    collect_ignore.append('setuptools/_imp.py')
-
-
 if sys.version_info < (3, 6):
     collect_ignore.append('pavement.py')
diff --git a/pytest.ini b/pytest.ini
index ddcad08bae..70e7d0a24f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -9,17 +9,10 @@ filterwarnings =
     ignore:bdist_wininst command is deprecated
     # Suppress this error; unimportant for CI tests
     ignore:Extraction path is writable by group/others:UserWarning
-    # Suppress Python 2 deprecation warning
-    ignore:Setuptools will stop working on Python 2:UserWarning
     # Suppress weird RuntimeWarning.
     ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
     # Suppress use of bytes for filenames on Windows until fixed #2016
     ignore:The Windows bytes API has been deprecated:DeprecationWarning
-    # Suppress other Python 2 UnicodeWarnings
-    ignore:Unicode equal comparison failed to convert:UnicodeWarning
-    ignore:Unicode unequal comparison failed to convert:UnicodeWarning
-    # https://github.com/pypa/setuptools/issues/2025
-    ignore:direct construction of .*Item has been deprecated:DeprecationWarning
     # https://github.com/pypa/setuptools/issues/2081
     ignore:lib2to3 package is deprecated:PendingDeprecationWarning
     ignore:lib2to3 package is deprecated:DeprecationWarning

From 8fa0599ae2f2309ee5fb48b4c87dc8f2d7ea2f2c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Sep 2020 19:55:44 -0400
Subject: [PATCH 8157/8469] Restrict jaraco.test to Python 3.6 or later to
 avoid installation failures.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index c326d1008f..80541c31c0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -73,7 +73,7 @@ tests =
     paver; python_version>="3.6"
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
-    jaraco.test >= 3.1.1
+    jaraco.test >= 3.1.1; python_version >= "3.6"
 
 docs =
     # Keep these in sync with docs/requirements.txt

From b19ec937b199ef6c16558a0b5dd88be96b197333 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 14 Sep 2020 20:51:54 -0400
Subject: [PATCH 8158/8469] Remove '--cov' in appveyor too.

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index de4e6c66c6..9329aaa26a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ test_script:
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
   - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
-  - tox -- --cov
+  - tox
 
 after_test:
     - tox -e coverage,codecov

From f4c193655d0af1e1ed891ffe2832e4b8c76951e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Sep 2020 11:50:57 -0400
Subject: [PATCH 8159/8469] Move VS tests to Python 3.8

---
 appveyor.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9329aaa26a..94813a622f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,18 +8,18 @@ environment:
 
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      APPVEYOR_JOB_NAME: "python35-x64-vs2015"
-      PYTHON: "C:\\Python35-x64"
+      APPVEYOR_JOB_NAME: "Python38-x64-vs2015"
+      PYTHON: "C:\\Python38-x64"
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      APPVEYOR_JOB_NAME: "python35-x64-vs2017"
-      PYTHON: "C:\\Python35-x64"
+      APPVEYOR_JOB_NAME: "Python38-x64-vs2017"
+      PYTHON: "C:\\Python38-x64"
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      APPVEYOR_JOB_NAME: "python35-x64-vs2019"
-      PYTHON: "C:\\Python35-x64"
-    - APPVEYOR_JOB_NAME: "python36-x64"
-      PYTHON: "C:\\Python36-x64"
+      APPVEYOR_JOB_NAME: "Python38-x64-vs2019"
+      PYTHON: "C:\\Python38-x64"
     - APPVEYOR_JOB_NAME: "python37-x64"
       PYTHON: "C:\\Python37-x64"
+    - APPVEYOR_JOB_NAME: "python36-x64"
+      PYTHON: "C:\\Python36-x64"
 
 install:
   # symlink python from a directory with a space

From 897f409cdf68d99c46e112531e7c256cb2933afd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 15 Sep 2020 17:41:27 -0400
Subject: [PATCH 8160/8469] Bring Python 3.5 tests back to improve coverage.

---
 appveyor.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 94813a622f..c067bad7a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,6 +20,10 @@ environment:
       PYTHON: "C:\\Python37-x64"
     - APPVEYOR_JOB_NAME: "python36-x64"
       PYTHON: "C:\\Python36-x64"
+    - APPVEYOR_JOB_NAME: "python35-x64"
+      PYTHON: "C:\\Python35-x64"
+      PYTEST_ADDOPTS: "--cov"
+      TOX_TESTENV_PASSENV: "PYTEST_ADDOPTS"
 
 install:
   # symlink python from a directory with a space

From 73e379cc55ac1e9ec63c4ac30b75ecc82418f513 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 23 Sep 2020 20:29:14 -0400
Subject: [PATCH 8161/8469] Use canonical extension for docs.

---
 docs/{build_meta.txt => build_meta.rst}                    | 0
 docs/conf.py                                               | 7 -------
 .../{distutils-legacy.txt => distutils-legacy.rst}         | 0
 docs/deprecated/{easy_install.txt => easy_install.rst}     | 0
 .../{functionalities.txt => functionalities.rst}           | 0
 docs/deprecated/{index.txt => index.rst}                   | 0
 docs/deprecated/{python3.txt => python3.rst}               | 0
 docs/deprecated/{python_eggs.txt => python_eggs.rst}       | 0
 docs/{developer-guide.txt => developer-guide.rst}          | 0
 docs/{development.txt => development.rst}                  | 0
 docs/{history.txt => history.rst}                          | 0
 docs/{index.txt => index.rst}                              | 0
 docs/{pkg_resources.txt => pkg_resources.rst}              | 0
 docs/{python 2 sunset.txt => python 2 sunset.rst}          | 0
 docs/references/{keywords.txt => keywords.rst}             | 0
 docs/{releases.txt => releases.rst}                        | 0
 docs/{roadmap.txt => roadmap.rst}                          | 0
 docs/{setuptools.txt => setuptools.rst}                    | 0
 docs/userguide/{commands.txt => commands.rst}              | 0
 docs/userguide/{datafiles.txt => datafiles.rst}            | 0
 .../{declarative_config.txt => declarative_config.rst}     | 0
 ...dependency_management.txt => dependency_management.rst} | 0
 .../{development_mode.txt => development_mode.rst}         | 0
 docs/userguide/{distribution.txt => distribution.rst}      | 0
 docs/userguide/{entry_point.txt => entry_point.rst}        | 0
 docs/userguide/{extension.txt => extension.rst}            | 0
 ...tionalities_rewrite.txt => functionalities_rewrite.rst} | 0
 docs/userguide/{index.txt => index.rst}                    | 0
 docs/userguide/{keywords.txt => keywords.rst}              | 0
 docs/userguide/{miscellaneous.txt => miscellaneous.rst}    | 0
 .../{package_discovery.txt => package_discovery.rst}       | 0
 docs/userguide/{quickstart.txt => quickstart.rst}          | 0
 32 files changed, 7 deletions(-)
 rename docs/{build_meta.txt => build_meta.rst} (100%)
 rename docs/deprecated/{distutils-legacy.txt => distutils-legacy.rst} (100%)
 rename docs/deprecated/{easy_install.txt => easy_install.rst} (100%)
 rename docs/deprecated/{functionalities.txt => functionalities.rst} (100%)
 rename docs/deprecated/{index.txt => index.rst} (100%)
 rename docs/deprecated/{python3.txt => python3.rst} (100%)
 rename docs/deprecated/{python_eggs.txt => python_eggs.rst} (100%)
 rename docs/{developer-guide.txt => developer-guide.rst} (100%)
 rename docs/{development.txt => development.rst} (100%)
 rename docs/{history.txt => history.rst} (100%)
 rename docs/{index.txt => index.rst} (100%)
 rename docs/{pkg_resources.txt => pkg_resources.rst} (100%)
 rename docs/{python 2 sunset.txt => python 2 sunset.rst} (100%)
 rename docs/references/{keywords.txt => keywords.rst} (100%)
 rename docs/{releases.txt => releases.rst} (100%)
 rename docs/{roadmap.txt => roadmap.rst} (100%)
 rename docs/{setuptools.txt => setuptools.rst} (100%)
 rename docs/userguide/{commands.txt => commands.rst} (100%)
 rename docs/userguide/{datafiles.txt => datafiles.rst} (100%)
 rename docs/userguide/{declarative_config.txt => declarative_config.rst} (100%)
 rename docs/userguide/{dependency_management.txt => dependency_management.rst} (100%)
 rename docs/userguide/{development_mode.txt => development_mode.rst} (100%)
 rename docs/userguide/{distribution.txt => distribution.rst} (100%)
 rename docs/userguide/{entry_point.txt => entry_point.rst} (100%)
 rename docs/userguide/{extension.txt => extension.rst} (100%)
 rename docs/userguide/{functionalities_rewrite.txt => functionalities_rewrite.rst} (100%)
 rename docs/userguide/{index.txt => index.rst} (100%)
 rename docs/userguide/{keywords.txt => keywords.rst} (100%)
 rename docs/userguide/{miscellaneous.txt => miscellaneous.rst} (100%)
 rename docs/userguide/{package_discovery.txt => package_discovery.rst} (100%)
 rename docs/userguide/{quickstart.txt => quickstart.rst} (100%)

diff --git a/docs/build_meta.txt b/docs/build_meta.rst
similarity index 100%
rename from docs/build_meta.txt
rename to docs/build_meta.rst
diff --git a/docs/conf.py b/docs/conf.py
index 12520586cd..673b6ba5cc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -17,16 +17,9 @@
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-# The suffix of source filenames.
-source_suffix = '.txt'
-
 # The master toctree document.
 master_doc = 'index'
 
-# A list of glob-style patterns that should be excluded
-# when looking for source files.
-exclude_patterns = ['requirements.txt']
-
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = []
diff --git a/docs/deprecated/distutils-legacy.txt b/docs/deprecated/distutils-legacy.rst
similarity index 100%
rename from docs/deprecated/distutils-legacy.txt
rename to docs/deprecated/distutils-legacy.rst
diff --git a/docs/deprecated/easy_install.txt b/docs/deprecated/easy_install.rst
similarity index 100%
rename from docs/deprecated/easy_install.txt
rename to docs/deprecated/easy_install.rst
diff --git a/docs/deprecated/functionalities.txt b/docs/deprecated/functionalities.rst
similarity index 100%
rename from docs/deprecated/functionalities.txt
rename to docs/deprecated/functionalities.rst
diff --git a/docs/deprecated/index.txt b/docs/deprecated/index.rst
similarity index 100%
rename from docs/deprecated/index.txt
rename to docs/deprecated/index.rst
diff --git a/docs/deprecated/python3.txt b/docs/deprecated/python3.rst
similarity index 100%
rename from docs/deprecated/python3.txt
rename to docs/deprecated/python3.rst
diff --git a/docs/deprecated/python_eggs.txt b/docs/deprecated/python_eggs.rst
similarity index 100%
rename from docs/deprecated/python_eggs.txt
rename to docs/deprecated/python_eggs.rst
diff --git a/docs/developer-guide.txt b/docs/developer-guide.rst
similarity index 100%
rename from docs/developer-guide.txt
rename to docs/developer-guide.rst
diff --git a/docs/development.txt b/docs/development.rst
similarity index 100%
rename from docs/development.txt
rename to docs/development.rst
diff --git a/docs/history.txt b/docs/history.rst
similarity index 100%
rename from docs/history.txt
rename to docs/history.rst
diff --git a/docs/index.txt b/docs/index.rst
similarity index 100%
rename from docs/index.txt
rename to docs/index.rst
diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.rst
similarity index 100%
rename from docs/pkg_resources.txt
rename to docs/pkg_resources.rst
diff --git a/docs/python 2 sunset.txt b/docs/python 2 sunset.rst
similarity index 100%
rename from docs/python 2 sunset.txt
rename to docs/python 2 sunset.rst
diff --git a/docs/references/keywords.txt b/docs/references/keywords.rst
similarity index 100%
rename from docs/references/keywords.txt
rename to docs/references/keywords.rst
diff --git a/docs/releases.txt b/docs/releases.rst
similarity index 100%
rename from docs/releases.txt
rename to docs/releases.rst
diff --git a/docs/roadmap.txt b/docs/roadmap.rst
similarity index 100%
rename from docs/roadmap.txt
rename to docs/roadmap.rst
diff --git a/docs/setuptools.txt b/docs/setuptools.rst
similarity index 100%
rename from docs/setuptools.txt
rename to docs/setuptools.rst
diff --git a/docs/userguide/commands.txt b/docs/userguide/commands.rst
similarity index 100%
rename from docs/userguide/commands.txt
rename to docs/userguide/commands.rst
diff --git a/docs/userguide/datafiles.txt b/docs/userguide/datafiles.rst
similarity index 100%
rename from docs/userguide/datafiles.txt
rename to docs/userguide/datafiles.rst
diff --git a/docs/userguide/declarative_config.txt b/docs/userguide/declarative_config.rst
similarity index 100%
rename from docs/userguide/declarative_config.txt
rename to docs/userguide/declarative_config.rst
diff --git a/docs/userguide/dependency_management.txt b/docs/userguide/dependency_management.rst
similarity index 100%
rename from docs/userguide/dependency_management.txt
rename to docs/userguide/dependency_management.rst
diff --git a/docs/userguide/development_mode.txt b/docs/userguide/development_mode.rst
similarity index 100%
rename from docs/userguide/development_mode.txt
rename to docs/userguide/development_mode.rst
diff --git a/docs/userguide/distribution.txt b/docs/userguide/distribution.rst
similarity index 100%
rename from docs/userguide/distribution.txt
rename to docs/userguide/distribution.rst
diff --git a/docs/userguide/entry_point.txt b/docs/userguide/entry_point.rst
similarity index 100%
rename from docs/userguide/entry_point.txt
rename to docs/userguide/entry_point.rst
diff --git a/docs/userguide/extension.txt b/docs/userguide/extension.rst
similarity index 100%
rename from docs/userguide/extension.txt
rename to docs/userguide/extension.rst
diff --git a/docs/userguide/functionalities_rewrite.txt b/docs/userguide/functionalities_rewrite.rst
similarity index 100%
rename from docs/userguide/functionalities_rewrite.txt
rename to docs/userguide/functionalities_rewrite.rst
diff --git a/docs/userguide/index.txt b/docs/userguide/index.rst
similarity index 100%
rename from docs/userguide/index.txt
rename to docs/userguide/index.rst
diff --git a/docs/userguide/keywords.txt b/docs/userguide/keywords.rst
similarity index 100%
rename from docs/userguide/keywords.txt
rename to docs/userguide/keywords.rst
diff --git a/docs/userguide/miscellaneous.txt b/docs/userguide/miscellaneous.rst
similarity index 100%
rename from docs/userguide/miscellaneous.txt
rename to docs/userguide/miscellaneous.rst
diff --git a/docs/userguide/package_discovery.txt b/docs/userguide/package_discovery.rst
similarity index 100%
rename from docs/userguide/package_discovery.txt
rename to docs/userguide/package_discovery.rst
diff --git a/docs/userguide/quickstart.txt b/docs/userguide/quickstart.rst
similarity index 100%
rename from docs/userguide/quickstart.txt
rename to docs/userguide/quickstart.rst

From 67be04f17c3af238138972488a23f0a7118a9458 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 09:26:58 -0400
Subject: [PATCH 8162/8469] Add changelog for #2093.

---
 changelog.d/2093.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2093.doc.rst

diff --git a/changelog.d/2093.doc.rst b/changelog.d/2093.doc.rst
new file mode 100644
index 0000000000..87dbfe82ee
--- /dev/null
+++ b/changelog.d/2093.doc.rst
@@ -0,0 +1 @@
+Finalized doc revamp.

From 31e5674df1e3733d3041f1e9b3a7cb071b83998b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 09:29:53 -0400
Subject: [PATCH 8163/8469] Update changelog.

---
 changelog.d/2379.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2379.misc.rst

diff --git a/changelog.d/2379.misc.rst b/changelog.d/2379.misc.rst
new file mode 100644
index 0000000000..09bd762578
--- /dev/null
+++ b/changelog.d/2379.misc.rst
@@ -0,0 +1 @@
+Travis CI test suite now tests against PPC64.

From 81040f8da609061a954972cd34d1646de9445ea2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 09:33:44 -0400
Subject: [PATCH 8164/8469] Address review comments.

---
 .travis.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6e0e5563a..a44252f13e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ jobs:
   - python: 3.9-dev
   - <<: *latest_py3
     env: TOXENV=docs
-    #PPC64LE
   - arch: ppc64le
     python: pypy3
   - arch: ppc64le
@@ -28,8 +27,6 @@ jobs:
     env: LANG=C
   - arch: ppc64le
     python: 3.9-dev
-  - <<: *latest_py3_ppc
-    env: TOXENV=docs
   allow_failures:
   # suppress failures due to pypa/setuptools#2000
   - python: pypy3
@@ -37,14 +34,12 @@ jobs:
     python: pypy3
   - <<: *latest_py3
     env: TOXENV=docs
-  - <<: *latest_py3_ppc
-    env: TOXENV=docs
 
 
 cache: pip
 
 before_install:
-# Fix for PPC64LE, where permissions are fixed to allow tox/pip to install packages. 
+# Fix for PPC64LE, where permissions are fixed to allow tox/pip to install packages.
 # As travis base images for PPC64LE except for bionic, do not have this fix.
   - |
     if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]]; then

From d78027a257e2a1053fa3dd145c6d9054c13f3390 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 09:38:26 -0400
Subject: [PATCH 8165/8469] Update comment to indicate the problem.

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a44252f13e..d12a9ecee9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,12 @@ jobs:
 cache: pip
 
 before_install:
-# Fix for PPC64LE, where permissions are fixed to allow tox/pip to install packages.
-# As travis base images for PPC64LE except for bionic, do not have this fix.
   - |
+    # Except on bionic, Travis Linux base image for PPC64LE
+    # platform lacks the proper
+    # permissions to the directory ~/.cache/pip/wheels that allow
+    # the user running travis build to install pip packages.
+    # TODO: is someone tracking this issue? Maybe just move to bionic?
     if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]]; then
       sudo chown -Rfv $USER:$GROUP ~/.cache/pip/wheels
     fi

From 896ef66ff3b167a13a5efb128013d5bd53633a79 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 10:29:40 -0400
Subject: [PATCH 8166/8469] Move setuptools-specific excluded folders to
 collect_ignore to match with jaraco/skeleton.

---
 conftest.py | 5 +++++
 pytest.ini  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index 41ab30b923..f896561ecf 100644
--- a/conftest.py
+++ b/conftest.py
@@ -16,6 +16,11 @@ def pytest_addoption(parser):
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
     '_distutils_hack',
+    'setuptools/extern',
+    'pkg_resources/extern',
+    'pkg_resources/tests/data',
+    'setuptools/_vendor',
+    'pkg_resources/_vendor',
 ]
 
 
diff --git a/pytest.ini b/pytest.ini
index a875e1e931..162ad8737b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
-norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
+norecursedirs=dist build .tox .eggs
 doctest_optionflags=ELLIPSIS ALLOW_UNICODE
 filterwarnings =
     # Fail on warnings

From d8b54614aa93b42695666bc6bdbc6263da9cbbc0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 09:47:47 -0400
Subject: [PATCH 8167/8469] Extract PPC64LE into script and port to Python.

---
 .travis.yml            | 10 +---------
 tools/ppc64le-patch.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 tools/ppc64le-patch.py

diff --git a/.travis.yml b/.travis.yml
index d12a9ecee9..62da9b2078 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,15 +39,7 @@ jobs:
 cache: pip
 
 before_install:
-  - |
-    # Except on bionic, Travis Linux base image for PPC64LE
-    # platform lacks the proper
-    # permissions to the directory ~/.cache/pip/wheels that allow
-    # the user running travis build to install pip packages.
-    # TODO: is someone tracking this issue? Maybe just move to bionic?
-    if [[ "$TRAVIS_CPU_ARCH" == "ppc64le" ]]; then
-      sudo chown -Rfv $USER:$GROUP ~/.cache/pip/wheels
-    fi
+- python tools/ppc64le-patch.py
 
 install:
 
diff --git a/tools/ppc64le-patch.py b/tools/ppc64le-patch.py
new file mode 100644
index 0000000000..2a8ff8e0a0
--- /dev/null
+++ b/tools/ppc64le-patch.py
@@ -0,0 +1,28 @@
+"""
+Except on bionic, Travis Linux base image for PPC64LE
+platform lacks the proper
+permissions to the directory ~/.cache/pip/wheels that allow
+the user running travis build to install pip packages.
+TODO: is someone tracking this issue? Maybe just move to bionic?
+"""
+
+import subprocess
+import collections
+import os
+
+
+def patch():
+    env = collections.defaultdict(str, os.environ)
+    if env['TRAVIS_CPU_ARCH'] != 'ppc64le':
+        return
+    cmd = [
+        'sudo',
+        'chown',
+        '-Rfv',
+        '{USER}:{GROUP}'.format_map(env),
+        os.path.expanduser('~/.cache/pip/wheels'),
+    ]
+    subprocess.Popen(cmd)
+
+
+__name__ == '__main__' and patch()

From 72e14eaeb6da77ea3160ae0ff8b2e0655942923e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 24 Sep 2020 10:46:49 -0400
Subject: [PATCH 8168/8469] Remove pypy3 from ppc64le (doesn't work).

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62da9b2078..7d8c102629 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,6 @@ jobs:
   allow_failures:
   # suppress failures due to pypa/setuptools#2000
   - python: pypy3
-  - arch: ppc64le
-    python: pypy3
   - <<: *latest_py3
     env: TOXENV=docs
 

From 455b3d3c3145254228ce31d73d8964d13550527c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 20 Sep 2020 19:38:33 +0200
Subject: [PATCH 8169/8469] Add a :user: role in Sphinx

This change adds a role that links to the GitHub user Sponsors
page. If that page is not set up, it'll redirect to the GitHub user
profile page instead:

Links to https://github.com/sponsors/{{ username }} open as GitHub
Sponsors page if the target `username` has it enabled and redirect
to https://github.com/{{ username }} if it's disabled.
---
 changelog.d/2395.doc.1.rst |  1 +
 docs/conf.py               | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2395.doc.1.rst

diff --git a/changelog.d/2395.doc.1.rst b/changelog.d/2395.doc.1.rst
new file mode 100644
index 0000000000..14a95cf101
--- /dev/null
+++ b/changelog.d/2395.doc.1.rst
@@ -0,0 +1 @@
+Added a ``:user:`` role to Sphinx config -- by :user:`webknjaz`
diff --git a/docs/conf.py b/docs/conf.py
index 673b6ba5cc..d5111391d7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,9 +10,18 @@
     cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
 )
 
+# -- Project information -----------------------------------------------------
+
+github_url = 'https://github.com'
+github_sponsors_url = f'{github_url}/sponsors'
+
 # -- General configuration --
 
-extensions = ['jaraco.packaging.sphinx', 'rst.linker']
+extensions = [
+    'sphinx.ext.extlinks',  # allows to create custom roles easily
+    'jaraco.packaging.sphinx',
+    'rst.linker',
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -27,6 +36,11 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# -- Options for extlinks extension ---------------------------------------
+extlinks = {
+    'user': (f'{github_sponsors_url}/%s', '@'),  # noqa: WPS323
+}
+
 # -- Options for HTML output --
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with

From bb3072883f761f8537d1fc2b8a33b8cc82c1aa27 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 20 Sep 2020 21:27:42 +0200
Subject: [PATCH 8170/8469] =?UTF-8?q?=F0=9F=9A=91=20Exclude=20sphinx=20con?=
 =?UTF-8?q?f=20from=20pytest=20auto-discovery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

But only under Python 3.5!
---
 conftest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conftest.py b/conftest.py
index f896561ecf..d5e851fe50 100644
--- a/conftest.py
+++ b/conftest.py
@@ -25,4 +25,5 @@ def pytest_addoption(parser):
 
 
 if sys.version_info < (3, 6):
+    collect_ignore.append('docs/conf.py')  # uses f-strings
     collect_ignore.append('pavement.py')

From 2754213b760fa4ba845bddda3ac4c0ec34c39e4b Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 20 Sep 2020 19:39:57 +0200
Subject: [PATCH 8171/8469] Fix command block in dev guide to `shell-session`

This type is more appropriate for snippets containing shell commands
with leading prompts followed by their output. `bash` syntax used
earlier treats everything as a raw shell script contents highlighting
words like `for`.
---
 docs/developer-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index e84cd640b8..efbf1b7c02 100644
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -84,7 +84,7 @@ case two fragments should be added. It is not necessary to make a separate
 documentation fragment for documentation changes accompanying the relevant
 code changes. See the following for an example news fragment:
 
-.. code-block:: bash
+.. code-block:: shell-session
 
     $ cat changelog.d/1288.change.rst
     Add support for maintainer in PKG-INFO

From 0d6920524ed2395e1cab7e7141c58423d94a424f Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 20 Sep 2020 21:14:59 +0200
Subject: [PATCH 8172/8469] =?UTF-8?q?=F0=9F=93=9D=20Add=20an=20illustrativ?=
 =?UTF-8?q?e=20explanation=20of=20change=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change places a `README.rst` document under `changelog.d/` dir in
order for GitHub to render it when users navigate to this location via
the web UI.

It also includes that into the dev guide in Sphinx docs.
---
 changelog.d/2395.doc.2.rst |  1 +
 changelog.d/README.rst     | 94 ++++++++++++++++++++++++++++++++++++++
 docs/developer-guide.rst   | 35 ++++----------
 3 files changed, 103 insertions(+), 27 deletions(-)
 create mode 100644 changelog.d/2395.doc.2.rst
 create mode 100644 changelog.d/README.rst

diff --git a/changelog.d/2395.doc.2.rst b/changelog.d/2395.doc.2.rst
new file mode 100644
index 0000000000..bc861ec330
--- /dev/null
+++ b/changelog.d/2395.doc.2.rst
@@ -0,0 +1 @@
+Added an illustrative explanation about the change notes to fragments dir -- by :user:`webknjaz`
diff --git a/changelog.d/README.rst b/changelog.d/README.rst
new file mode 100644
index 0000000000..30831edc96
--- /dev/null
+++ b/changelog.d/README.rst
@@ -0,0 +1,94 @@
+.. _Adding change notes with your PRs:
+
+Adding change notes with your PRs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It is very important to maintain a log for news of how
+updating to the new version of the software will affect
+end-users. This is why we enforce collection of the change
+fragment files in pull requests as per `Towncrier philosophy`_.
+
+The idea is that when somebody makes a change, they must record
+the bits that would affect end-users only including information
+that would be useful to them. Then, when the maintainers publish
+a new release, they'll automatically use these records to compose
+a change log for the respective version. It is important to
+understand that including unnecessary low-level implementation
+related details generates noise that is not particularly useful
+to the end-users most of the time. And so such details should be
+recorded in the Git history rather than a changelog.
+
+Alright! So how to add a news fragment?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``setuptools`` uses `towncrier <https://pypi.org/project/towncrier/>`_
+for changelog management.
+To submit a change note about your PR, add a text file into the
+``changelog.d/`` folder. It should contain an
+explanation of what applying this PR will change in the way
+end-users interact with the project. One sentence is usually
+enough but feel free to add as many details as you feel necessary
+for the users to understand what it means.
+
+**Use the past tense** for the text in your fragment because,
+combined with others, it will be a part of the "news digest"
+telling the readers **what changed** in a specific version of
+the library *since the previous version*. You should also use
+reStructuredText syntax for highlighting code (inline or block),
+linking parts of the docs or external sites.
+If you wish to sign your change, feel free to add ``-- by
+:user:`github-username``` at the end (replace ``github-username``
+with your own!).
+
+Finally, name your file following the convention that Towncrier
+understands: it should start with the number of an issue or a
+PR followed by a dot, then add a patch type, like ``change``,
+``doc``, ``misc`` etc., and add ``.rst`` as a suffix. If you
+need to add more than one fragment, you may add an optional
+sequence number (delimited with another period) between the type
+and the suffix.
+
+In general the name will follow ``<pr_number>.<category>.rst`` pattern,
+where the categories are:
+
+- ``change``: Any backwards compatible code change
+- ``breaking``: Any backwards-compatibility breaking change
+- ``doc``: A change to the documentation
+- ``misc``: Changes internal to the repo like CI, test and build changes
+- ``deprecation``: For deprecations of an existing feature or behavior
+
+A pull request may have more than one of these components, for example
+a code change may introduce a new feature that deprecates an old
+feature, in which case two fragments should be added. It is not
+necessary to make a separate documentation fragment for documentation
+changes accompanying the relevant code changes.
+
+Examples for adding changelog entries to your Pull Requests
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+File :file:`changelog.d/2395.doc.1.rst`:
+
+.. code-block:: rst
+
+    Added a ``:user:`` role to Sphinx config -- by :user:`webknjaz`
+
+File :file:`changelog.d/1354.misc.rst`:
+
+.. code-block:: rst
+
+    Added ``towncrier`` for changelog managment -- by :user:`pganssle`
+
+File :file:`changelog.d/2355.change.rst`:
+
+.. code-block:: rst
+
+    When pip is imported as part of a build, leave :py:mod:`distutils`
+    patched -- by :user:`jaraco`
+
+.. tip::
+
+   See :file:`pyproject.toml` for all available categories
+   (``tool.towncrier.type``).
+
+.. _Towncrier philosophy:
+   https://towncrier.readthedocs.io/en/actual-freaking-docs/#philosophy
diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index efbf1b7c02..d23669317b 100644
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -61,33 +61,14 @@ jump to the in-depth discussion about any subject referenced.
 Making a pull request
 ---------------------
 
-When making a pull request, please include a short summary of the changes
-and a reference to any issue tickets that the PR is intended to solve.
-All PRs with code changes should include tests. All changes should include a
-changelog entry.
-
-``setuptools`` uses `towncrier <https://pypi.org/project/towncrier/>`_
-for changelog management, so when making a PR, please add a news fragment in the
-``changelog.d/`` folder. Changelog files are written in reStructuredText and
-should be a 1 or 2 sentence description of the substantive changes in the PR.
-They should be named ``<pr_number>.<category>.rst``, where the categories are:
-
-- ``change``: Any backwards compatible code change
-- ``breaking``: Any backwards-compatibility breaking change
-- ``doc``: A change to the documentation
-- ``misc``: Changes internal to the repo like CI, test and build changes
-- ``deprecation``: For deprecations of an existing feature or behavior
-
-A pull request may have more than one of these components, for example a code
-change may introduce a new feature that deprecates an old feature, in which
-case two fragments should be added. It is not necessary to make a separate
-documentation fragment for documentation changes accompanying the relevant
-code changes. See the following for an example news fragment:
-
-.. code-block:: shell-session
-
-    $ cat changelog.d/1288.change.rst
-    Add support for maintainer in PKG-INFO
+When making a pull request, please 
+:ref:`include a short summary of the changes <Adding change notes
+with your PRs>` and a reference to any issue tickets that the PR is
+intended to solve.
+All PRs with code changes should include tests. All changes should
+include a changelog entry.
+
+.. include:: ../changelog.d/README.rst
 
 -------------------
 Auto-Merge Requests

From 26736e834db76aded9a34a5c0679fedd15fd0881 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 24 Sep 2020 23:09:57 +0200
Subject: [PATCH 8173/8469] =?UTF-8?q?=F0=9F=93=9D=20Enable=20showing=20new?=
 =?UTF-8?q?s=20categories=20in=20towncrier=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #2394
---
 pyproject.toml         | 2 +-
 towncrier_template.rst | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index cd66e2773e..2d36286555 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ backend-path = ["."]
     title_format = "v{version}"
     issue_format = "#{issue}"
     template = "towncrier_template.rst"
-    underlines = ["-"]
+    underlines = ["-", "^"]
 
     [[tool.towncrier.type]]
         directory = "deprecation"
diff --git a/towncrier_template.rst b/towncrier_template.rst
index fbc5ef03b0..31098b7cf6 100644
--- a/towncrier_template.rst
+++ b/towncrier_template.rst
@@ -1,10 +1,14 @@
 {% for section, _ in sections.items() %}
 {% set underline = underlines[0] %}{% if section %}{{section}}
 {{ underline * section|length }}
+{% set underline = underlines[1] %}
 {% endif %}
 
 {% if sections[section] %}
 {% for category, val in definitions.items() if category in sections[section]%}
+
+{{ definitions[category]['name'] }}
+{{ underline * definitions[category]['name']|length }}
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category].items() %}
 * {{ values|join(', ') }}: {{ text }}

From a278b0f0485ffc6f2ae9a033b124ba64dd02e3db Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 24 Sep 2020 23:24:24 +0200
Subject: [PATCH 8174/8469] =?UTF-8?q?=F0=9F=93=9D=20Add=20a=20change=20not?=
 =?UTF-8?q?e=20about=20issue=20#2394=20resolution?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Thomas Hisch <thomas.hisch@ims.co.at>
---
 changelog.d/2394.doc.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog.d/2394.doc.rst

diff --git a/changelog.d/2394.doc.rst b/changelog.d/2394.doc.rst
new file mode 100644
index 0000000000..338e8895d5
--- /dev/null
+++ b/changelog.d/2394.doc.rst
@@ -0,0 +1,3 @@
+Extended towncrier news template to include change note categories.
+This allows to see what types of changes a given version introduces
+-- by :user:`webknjaz`

From c7bf7961624c2c524edfe04513379d063621bece Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Sep 2020 11:12:09 +0200
Subject: [PATCH 8175/8469] Report test results in the AppVeyor UI

---
 appveyor.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c067bad7a9..4d1ae55f4f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,9 +41,14 @@ test_script:
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
   - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
-  - tox
+  - tox -- --junit-xml=test-results.xml
 
 after_test:
     - tox -e coverage,codecov
 
+on_finish:
+  - ps: |
+      $wc = New-Object 'System.Net.WebClient'
+      $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test-results.xml))
+
 version: '{build}'

From 5706841b1120b852193a5576c3bfcfa0cf666ab4 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Sep 2020 11:23:41 +0200
Subject: [PATCH 8176/8469] =?UTF-8?q?=F0=9F=93=9D=20Add=20a=20change=20not?=
 =?UTF-8?q?e=20about=20PR=20#2401?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.d/2401.misc.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/2401.misc.rst

diff --git a/changelog.d/2401.misc.rst b/changelog.d/2401.misc.rst
new file mode 100644
index 0000000000..924880a37f
--- /dev/null
+++ b/changelog.d/2401.misc.rst
@@ -0,0 +1,2 @@
+Enabled test results reporting in AppVeyor CI
+-- by :user:`webknjaz`

From a6673f11935c8ff7e88b66b95de59721a00c3201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Fri, 2 Oct 2020 19:04:57 +0800
Subject: [PATCH 8177/8469] editorial fix

---
 docs/userguide/package_discovery.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst
index 0e0d27c5b2..02eab172cf 100644
--- a/docs/userguide/package_discovery.rst
+++ b/docs/userguide/package_discovery.rst
@@ -90,7 +90,7 @@ in ``src`` that starts with the name ``pkg`` and not ``additional``:
         packages = find_packages(
             where = 'src',
             include = ['pkg*',],
-            exclude = ['tests',]
+            exclude = ['additional',]
         ),
         package_dir = {"":"src"}
         #...

From c218cc5443dbcec77c81a03391c6ae2a566a7a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Fri, 2 Oct 2020 20:07:58 +0800
Subject: [PATCH 8178/8469] docs: code-block style fix

---
 docs/userguide/entry_point.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index 7f5165a876..f4c43c6e18 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -14,7 +14,7 @@ Console Scripts
 ===============
 
 First consider an example without entry points. Imagine a package
-defined thus::
+defined thus:
 
 .. code-block:: bash
 
@@ -38,7 +38,7 @@ and ``__main__.py`` providing a hook:
         hello_world()
 
 After installing the package, the function may be invoked through the
-`runpy <https://docs.python.org/3/library/runpy.html>`_ module::
+`runpy <https://docs.python.org/3/library/runpy.html>`_ module:
 
 .. code-block:: bash
 
@@ -49,7 +49,7 @@ user-friendly name for installers of the package to execute. Installers
 like pip will create wrapper scripts to execute a function. In the
 above example, to create a command ``hello-world`` that invokes
 ``timmins.hello_world``, add a console script entry point to
-``setup.cfg``::
+``setup.cfg``:
 
 .. code-block:: ini
 
@@ -96,7 +96,7 @@ For a project wishing to solicit entry points, Setuptools recommends the
 module (part of stdlib since Python 3.8) or its backport,
 `importlib_metadata <https://pypi.org/project/importlib_metadata>`_.
 
-For example, to find the console script entry points from the example above::
+For example, to find the console script entry points from the example above:
 
 .. code-block:: python
 
@@ -115,7 +115,7 @@ method to import and load that entry point (module or object).
         hello-world = timmins:hello_world
 
 Then, a different project wishing to load 'my.plugins' plugins could run
-the following routine to load (and invoke) such plugins::
+the following routine to load (and invoke) such plugins:
 
 .. code-block:: python
 
@@ -140,7 +140,7 @@ For such an entry point, declare in square brakets any number of dependency
 be viable if their extras were declared and installed. See the
 :ref:`guide on dependencies management <dependency_management>` for
 more information on defining extra requirements. Consider from the
-above example::
+above example:
 
 .. code-block:: ini
 

From 1ba4f4e0240d4e09585463dc7ebb9b7a47b1eb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Sat, 3 Oct 2020 10:12:36 +0800
Subject: [PATCH 8179/8469] fix inline-code style

---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 5282975102..fdc7ff142c 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -82,8 +82,8 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
-therefore provides two convenient tools to ease the burden: ``find: `` and
-``find_namespace: ``. To use it in your project:
+therefore provides two convenient tools to ease the burden: ``find:`` and
+``find_namespace:``. To use it in your project:
 
 .. code-block:: ini
 

From 754f710a10c15b7456c086c2839f01ad2556b3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Sat, 3 Oct 2020 10:30:49 +0800
Subject: [PATCH 8180/8469] Update dependency_management.rst

---
 docs/userguide/dependency_management.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index a26ab6c3b0..ae2192d879 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -266,7 +266,7 @@ the two dependencies ``PDF`` maps to.
 
 The second use case is that other package can use this "extra" for their
 own dependencies. For example, if "Project-B" needs "project A" with PDF support
-installed, it might declare the dependency like this::
+installed, it might declare the dependency like this:
 
 .. code-block:: ini
 
@@ -309,4 +309,4 @@ In some cases, you might need to specify the minimum required python version.
 This is handled with the ``python_requires`` keyword supplied to ``setup.cfg``
 or ``setup.py``.
 
-Example WIP
\ No newline at end of file
+Example WIP

From 81cf64f294d8152707cf7d8f242f50b9c64c62d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Sat, 3 Oct 2020 10:32:19 +0800
Subject: [PATCH 8181/8469] Update entry_point.rst

---
 docs/userguide/entry_point.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index f4c43c6e18..a91fd5dc7f 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -33,6 +33,8 @@ with ``__init__.py`` as:
 
 and ``__main__.py`` providing a hook:
 
+.. code-block:: python
+
     from . import hello_world
     if __name__ == '__main__':
         hello_world()

From 997eae8020dc28ea1ef87572275f5dc41e1bc74a Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Sun, 4 Oct 2020 16:11:27 +0100
Subject: [PATCH 8182/8469] ignore any exception when loading 2to3

---
 setuptools/command/build_py.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 4709679b9f..b30aa1290a 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -11,7 +11,7 @@
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
-except ImportError:
+except Exception:
 
     class Mixin2to3:
         def run_2to3(self, files, doctests=True):

From 6722c069db857991b95fb95a5ddf90ec4913094a Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 5 Oct 2020 09:52:31 +0300
Subject: [PATCH 8183/8469] Fix ReST syntax error in the PEP 517 link

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 5282975102..37d33b260e 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -22,7 +22,7 @@ be generated with whatever tools that provides a ``build sdist``-alike
 functionality. While this may appear cumbersome, given the added pieces,
 it in fact tremendously enhances the portability of your package. The
 change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
-build-requirements>``. To learn more about Python packaging in general,
+build-requirements>`_. To learn more about Python packaging in general,
 navigate to the `bottom <Resources on python packaging>`_ of this page.
 
 

From f516f011b0361a329304c3ed6dc611fc97053e2b Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 5 Oct 2020 17:56:12 +0300
Subject: [PATCH 8184/8469] And another malformed link

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 37d33b260e..3af6d5663d 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -191,7 +191,7 @@ Uploading your package to PyPI
 ==============================
 After generating the distribution files, next step would be to upload your
 distribution so others can use it. This functionality is provided by
-``twine <https://pypi.org/project/twine/>`` and we will only demonstrate the
+`twine <https://pypi.org/project/twine/>`_ and we will only demonstrate the
 basic use here.
 
 

From f67c1b099d24a37a0c65bf08f88cb46e261d2a61 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 6 Oct 2020 20:03:04 -0400
Subject: [PATCH 8185/8469] Extract method for maybe_tag.

---
 setuptools/command/egg_info.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index c957154a1f..0b7ad677f2 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -123,12 +123,17 @@ def name(self):
         return safe_name(self.distribution.get_name())
 
     def tagged_version(self):
-        version = self.distribution.get_version()
-        # egg_info may be called more than once for a distribution,
-        # in which case the version string already contains all tags.
-        if self.vtags and version.endswith(self.vtags):
-            return safe_version(version)
-        return safe_version(version + self.vtags)
+        return safe_version(self._maybe_tag(self.distribution.get_version()))
+
+    def _maybe_tag(self, version):
+        """
+        egg_info may be called more than once for a distribution,
+        in which case the version string already contains all tags.
+        """
+        return (
+            version if self.vtags and version.endswith(self.vtags)
+            else version + self.vtags
+        )
 
     def tags(self):
         version = ''

From a3aafcd7f572ee56c8b43e2d1d60cd252483a02f Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Wed, 7 Oct 2020 17:43:14 -0400
Subject: [PATCH 8186/8469] add a paragraph in index to linkt build_meta doc

---
 docs/userguide/index.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index abee331a2f..8470e268d8 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -10,6 +10,15 @@ packages.
 Packages built and distributed using ``setuptools`` look to the user like
 ordinary Python packages based on the ``distutils``.
 
+Transition to PEP517
+====================
+
+Since setuptools no longer serves as the default build tool, one must explicitly
+opt in (by providing a ``pyproject.toml`` file) to use this library. The user
+facing part is provided by `PEP517 <https://pypi.org/project/pep517/>`_ and
+backend interface is described :ref:`in this document <../build_meta>`. The
+quickstart provides an overview of the new workflow.
+
 .. toctree::
     :maxdepth: 1
 

From bcb6d47f1618fc37bbab24b54f79e268435f849c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Mon, 12 Oct 2020 08:46:07 +0800
Subject: [PATCH 8187/8469] Update docs/userguide/quickstart.rst

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index fdc7ff142c..f2f5e41dc8 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -82,8 +82,8 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
-therefore provides two convenient tools to ease the burden: ``find:`` and
-``find_namespace:``. To use it in your project:
+therefore provides two convenient tools to ease the burden: ``find:\ `` and
+``find_namespace:\ ``. To use it in your project:
 
 .. code-block:: ini
 

From 22e15d9d6a6b91904f100799eb8004a7ffa5d6ed Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 12 Oct 2020 09:22:01 +0300
Subject: [PATCH 8188/8469] GHA: Replace 3.9 beta with 3.9 final

---
 .github/workflows/python-tests.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 93ec79d4ab..2ee7c0fbf5 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -19,6 +19,7 @@ jobs:
       # max-parallel: 5
       matrix:
         python-version:
+        - 3.9
         - 3.8
         - pypy3
         - 3.7
@@ -31,12 +32,6 @@ jobs:
         # - windows-2019
         # - windows-2016
         include:
-        # Pre-release versions (GH-shipped)
-        - os: ubuntu-20.04
-          python-version: 3.9.0-beta.4 - 3.9.0
-        # Pre-release versions (deadsnakes)
-        - os: ubuntu-20.04
-          python-version: 3.9-beta
         # Dev versions (deadsnakes)
         - os: ubuntu-20.04
           python-version: 3.9-dev

From 5ec1fb258cba95cdd04ea07b3754a47e4ac19cad Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 12 Oct 2020 09:28:06 +0300
Subject: [PATCH 8189/8469] Don't let one failure cancel all the other jobs

---
 .github/workflows/python-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 2ee7c0fbf5..96e1430879 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -16,6 +16,7 @@ jobs:
       ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       # max-parallel: 5
       matrix:
         python-version:

From b66e45a90e82c9170cc48f21e4dac9d206193953 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 12 Oct 2020 16:42:51 +0300
Subject: [PATCH 8190/8469] Use the :pep: role instead of a manual link

Co-Authored-By: Sviatoslav Sydorenko <webknjaz@redhat.com>
---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 3af6d5663d..a07afae773 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -21,8 +21,8 @@ the backend (build system) it wants to use. The distribution can then
 be generated with whatever tools that provides a ``build sdist``-alike
 functionality. While this may appear cumbersome, given the added pieces,
 it in fact tremendously enhances the portability of your package. The
-change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
-build-requirements>`_. To learn more about Python packaging in general,
+change is driven under :pep:`PEP 517 <517#build-requirements>`_.
+To learn more about Python packaging in general,
 navigate to the `bottom <Resources on python packaging>`_ of this page.
 
 

From ec508081a5ccbb304a4ae68c70c56787b9818f04 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 12 Oct 2020 15:53:38 +0200
Subject: [PATCH 8191/8469] Add Python 3.9 trove classifier to the metadata

---
 changelog.d/2421.misc.rst | 2 ++
 setup.cfg                 | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/2421.misc.rst

diff --git a/changelog.d/2421.misc.rst b/changelog.d/2421.misc.rst
new file mode 100644
index 0000000000..5dcdeceeb4
--- /dev/null
+++ b/changelog.d/2421.misc.rst
@@ -0,0 +1,2 @@
+Python 3.9 trove classifier got added to the dist metadata
+-- by :user:`webknjaz`
diff --git a/setup.cfg b/setup.cfg
index 80541c31c0..95c59a4a80 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: System :: Archiving :: Packaging
     Topic :: System :: Systems Administration

From 475fdd9593c0c1a6f57864de7d11ab0645c3226b Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 12 Oct 2020 17:08:33 +0300
Subject: [PATCH 8192/8469] Add changelog

---
 changelog.d/2420.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2420.misc.rst

diff --git a/changelog.d/2420.misc.rst b/changelog.d/2420.misc.rst
new file mode 100644
index 0000000000..94984797ca
--- /dev/null
+++ b/changelog.d/2420.misc.rst
@@ -0,0 +1 @@
+Replace Python 3.9.0 beta with 3.9.0 final on GitHub Actions.

From 8220a920232fc186978872588e067a3c33e4eee7 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <sviat@redhat.com>
Date: Mon, 12 Oct 2020 16:15:01 +0200
Subject: [PATCH 8193/8469] Fix a spelling mistake in the change note

s/trove/Trove/

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 changelog.d/2421.misc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2421.misc.rst b/changelog.d/2421.misc.rst
index 5dcdeceeb4..295f5de8d3 100644
--- a/changelog.d/2421.misc.rst
+++ b/changelog.d/2421.misc.rst
@@ -1,2 +1,2 @@
-Python 3.9 trove classifier got added to the dist metadata
+Python 3.9 Trove classifier got added to the dist metadata
 -- by :user:`webknjaz`

From f04cd3b21f1bd8ef5c8dedc42fb8708dfdf0fccd Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Mon, 12 Oct 2020 19:23:00 -0400
Subject: [PATCH 8194/8469] make suggested edits

---
 docs/userguide/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 8470e268d8..7abc7903fc 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -14,8 +14,8 @@ Transition to PEP517
 ====================
 
 Since setuptools no longer serves as the default build tool, one must explicitly
-opt in (by providing a ``pyproject.toml`` file) to use this library. The user
-facing part is provided by `PEP517 <https://pypi.org/project/pep517/>`_ and
+opt in (by providing a :file:`pyproject.toml` file) to use this library. The user
+facing part is provided by tools such as pip and
 backend interface is described :ref:`in this document <../build_meta>`. The
 quickstart provides an overview of the new workflow.
 

From cf9ad4f73a17e669d318187ce9a6cc2e72c3249e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Oct 2020 19:57:20 -0400
Subject: [PATCH 8195/8469] Update changelog

---
 changelog.d/2413.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2413.misc.rst

diff --git a/changelog.d/2413.misc.rst b/changelog.d/2413.misc.rst
new file mode 100644
index 0000000000..eaef9c8eca
--- /dev/null
+++ b/changelog.d/2413.misc.rst
@@ -0,0 +1 @@
+Suppress EOF errors (and other exceptions) when importing lib2to3.

From f0878e963c3a1086570712d072e967e5c8b57e6a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Oct 2020 20:09:11 -0400
Subject: [PATCH 8196/8469] Exempt README as well. Ref #2395.

---
 tools/finalize.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/finalize.py b/tools/finalize.py
index 98b06c070c..352942815a 100644
--- a/tools/finalize.py
+++ b/tools/finalize.py
@@ -66,10 +66,11 @@ def check_changes():
     names.
     """
     allowed = 'deprecation', 'breaking', 'change', 'doc', 'misc'
+    except_ = 'README.rst', '.gitignore'
     assert all(
         any(key in file.name for key in allowed)
         for file in pathlib.Path('changelog.d').iterdir()
-        if file.name != '.gitignore'
+        if file.name not in except_
     )
 
 

From 0855f30c6f04beaef0354756cd3e30fae244a21a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 14 Oct 2020 20:13:07 -0400
Subject: [PATCH 8197/8469] =?UTF-8?q?Bump=20version:=2050.3.0=20=E2=86=92?=
 =?UTF-8?q?=2050.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg           |  2 +-
 CHANGES.rst                | 13 +++++++++++++
 changelog.d/2093.doc.rst   |  1 -
 changelog.d/2097.doc.rst   |  1 -
 changelog.d/2102.doc.rst   |  1 -
 changelog.d/2111.doc.rst   |  1 -
 changelog.d/2379.misc.rst  |  1 -
 changelog.d/2395.doc.1.rst |  1 -
 changelog.d/2395.doc.2.rst |  1 -
 changelog.d/2413.misc.rst  |  1 -
 setup.cfg                  |  2 +-
 11 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 changelog.d/2093.doc.rst
 delete mode 100644 changelog.d/2097.doc.rst
 delete mode 100644 changelog.d/2102.doc.rst
 delete mode 100644 changelog.d/2111.doc.rst
 delete mode 100644 changelog.d/2379.misc.rst
 delete mode 100644 changelog.d/2395.doc.1.rst
 delete mode 100644 changelog.d/2395.doc.2.rst
 delete mode 100644 changelog.d/2413.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7a0aef412a..57cc3f1831 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.3.0
+current_version = 50.3.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 83b56b65cc..c35c4a8792 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v50.3.1
+-------
+
+* #2093: Finalized doc revamp.
+* #2097: doc: simplify index and group deprecated files
+* #2102: doc overhaul step 2: break main doc into multiple sections
+* #2111: doc overhaul step 3: update userguide
+* #2395: Added a ``:user:`` role to Sphinx config -- by :user:`webknjaz`
+* #2395: Added an illustrative explanation about the change notes to fragments dir -- by :user:`webknjaz`
+* #2379: Travis CI test suite now tests against PPC64.
+* #2413: Suppress EOF errors (and other exceptions) when importing lib2to3.
+
+
 v50.3.0
 -------
 
diff --git a/changelog.d/2093.doc.rst b/changelog.d/2093.doc.rst
deleted file mode 100644
index 87dbfe82ee..0000000000
--- a/changelog.d/2093.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Finalized doc revamp.
diff --git a/changelog.d/2097.doc.rst b/changelog.d/2097.doc.rst
deleted file mode 100644
index 03cdec8ad9..0000000000
--- a/changelog.d/2097.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-doc: simplify index and group deprecated files
diff --git a/changelog.d/2102.doc.rst b/changelog.d/2102.doc.rst
deleted file mode 100644
index bdb1a50219..0000000000
--- a/changelog.d/2102.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-doc overhaul step 2: break main doc into multiple sections
\ No newline at end of file
diff --git a/changelog.d/2111.doc.rst b/changelog.d/2111.doc.rst
deleted file mode 100644
index 3f44f7aff4..0000000000
--- a/changelog.d/2111.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-doc overhaul step 3: update userguide
diff --git a/changelog.d/2379.misc.rst b/changelog.d/2379.misc.rst
deleted file mode 100644
index 09bd762578..0000000000
--- a/changelog.d/2379.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Travis CI test suite now tests against PPC64.
diff --git a/changelog.d/2395.doc.1.rst b/changelog.d/2395.doc.1.rst
deleted file mode 100644
index 14a95cf101..0000000000
--- a/changelog.d/2395.doc.1.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added a ``:user:`` role to Sphinx config -- by :user:`webknjaz`
diff --git a/changelog.d/2395.doc.2.rst b/changelog.d/2395.doc.2.rst
deleted file mode 100644
index bc861ec330..0000000000
--- a/changelog.d/2395.doc.2.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added an illustrative explanation about the change notes to fragments dir -- by :user:`webknjaz`
diff --git a/changelog.d/2413.misc.rst b/changelog.d/2413.misc.rst
deleted file mode 100644
index eaef9c8eca..0000000000
--- a/changelog.d/2413.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Suppress EOF errors (and other exceptions) when importing lib2to3.
diff --git a/setup.cfg b/setup.cfg
index 80541c31c0..ad3fe4d493 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.3.0
+version = 50.3.1
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 526241ce94c3d38555914430b9888a8ee0f0ea55 Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Thu, 15 Oct 2020 15:17:38 -0400
Subject: [PATCH 8198/8469] group development related files together

---
 docs/{ => development}/developer-guide.rst      | 0
 docs/{ => development}/history.rst              | 0
 docs/{development.rst => development/index.rst} | 1 +
 docs/{ => development}/releases.rst             | 0
 docs/index.rst                                  | 2 +-
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename docs/{ => development}/developer-guide.rst (100%)
 rename docs/{ => development}/history.rst (100%)
 rename docs/{development.rst => development/index.rst} (99%)
 rename docs/{ => development}/releases.rst (100%)

diff --git a/docs/developer-guide.rst b/docs/development/developer-guide.rst
similarity index 100%
rename from docs/developer-guide.rst
rename to docs/development/developer-guide.rst
diff --git a/docs/history.rst b/docs/development/history.rst
similarity index 100%
rename from docs/history.rst
rename to docs/development/history.rst
diff --git a/docs/development.rst b/docs/development/index.rst
similarity index 99%
rename from docs/development.rst
rename to docs/development/index.rst
index 28e653fea9..d71d4dfc35 100644
--- a/docs/development.rst
+++ b/docs/development/index.rst
@@ -33,3 +33,4 @@ setuptools changes.  You have been warned.
    developer-guide
    formats
    releases
+   history
diff --git a/docs/releases.rst b/docs/development/releases.rst
similarity index 100%
rename from docs/releases.rst
rename to docs/development/releases.rst
diff --git a/docs/index.rst b/docs/index.rst
index 5a46052632..33389a2f9b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,5 +10,5 @@ Documentation content:
    :maxdepth: 1
 
    User guide <userguide/index>
-   Development guide <development>
+   Development guide <development/index>
    Backward compatibility & deprecated practice <deprecated/index>

From d507a9e4e5c13bb0d213ae5de4218e671e50882e Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Thu, 15 Oct 2020 17:03:54 -0400
Subject: [PATCH 8199/8469] revert the change of location of changelog file

---
 docs/development/index.rst         | 1 -
 docs/{development => }/history.rst | 0
 2 files changed, 1 deletion(-)
 rename docs/{development => }/history.rst (100%)

diff --git a/docs/development/index.rst b/docs/development/index.rst
index d71d4dfc35..28e653fea9 100644
--- a/docs/development/index.rst
+++ b/docs/development/index.rst
@@ -33,4 +33,3 @@ setuptools changes.  You have been warned.
    developer-guide
    formats
    releases
-   history
diff --git a/docs/development/history.rst b/docs/history.rst
similarity index 100%
rename from docs/development/history.rst
rename to docs/history.rst

From ab7fa51fef9b284d2a8723cc926e8c39db07208c Mon Sep 17 00:00:00 2001
From: alvy <alvyjudy@gmail.com>
Date: Thu, 15 Oct 2020 17:08:57 -0400
Subject: [PATCH 8200/8469] fix dev-guide inclusion of fragment guide

---
 docs/development/developer-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/developer-guide.rst b/docs/development/developer-guide.rst
index d23669317b..13b07e7ea4 100644
--- a/docs/development/developer-guide.rst
+++ b/docs/development/developer-guide.rst
@@ -68,7 +68,7 @@ intended to solve.
 All PRs with code changes should include tests. All changes should
 include a changelog entry.
 
-.. include:: ../changelog.d/README.rst
+.. include:: ../../changelog.d/README.rst
 
 -------------------
 Auto-Merge Requests

From ff5d8c4440df27a6f38384d650a0990459a569c3 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 15 Oct 2020 15:44:13 +0200
Subject: [PATCH 8201/8469] Recover the changelog docs page link

It's been lost as a part of https://github.com/pypa/setuptools/pull/2097
---
 docs/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.rst b/docs/index.rst
index 5a46052632..42b36ef5cc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,3 +12,4 @@ Documentation content:
    User guide <userguide/index>
    Development guide <development>
    Backward compatibility & deprecated practice <deprecated/index>
+   Changelog <history>

From b170eac3e00f65c3d56d48d5aa8ee18f00a7baf9 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 01:09:14 +0200
Subject: [PATCH 8202/8469] =?UTF-8?q?=F0=9F=9A=91=20Make=20Sphinx=20nitpic?=
 =?UTF-8?q?ky=20about=20broken=20references?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #2424
---
 docs/conf.py |  4 ++++
 tox.ini      | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index d5111391d7..1928af58f6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -146,3 +146,7 @@
         ],
     ),
 }
+
+
+# Be strict about any broken references:
+nitpicky = True
diff --git a/tox.ini b/tox.ini
index 535b67d3b9..828d2c02e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,16 @@ extras =
         testing
 changedir = docs
 commands =
-        python -m sphinx . {toxinidir}/build/html
+        {envpython} -m sphinx \
+          -j auto \
+          -b html \
+          --color \
+          -a \
+          -n \
+          -W \
+          -d "{temp_dir}/.doctrees" \
+          . \
+          "{toxinidir}/build/html"
 
 [testenv:finalize]
 skip_install = True

From edfa441febf6c5d8af8973ce952b3a0c19b7b575 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 01:14:51 +0200
Subject: [PATCH 8203/8469] =?UTF-8?q?=F0=9F=93=9D=20Recover=20interdoc=20l?=
 =?UTF-8?q?inks=20&=20correct=20broken=20syntax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/build_meta.rst                      |  3 +-
 docs/deprecated/index.rst                |  1 +
 docs/development.rst                     |  1 -
 docs/index.rst                           |  5 +++
 docs/references/keywords.rst             | 12 ++++---
 docs/userguide/commands.rst              |  4 +--
 docs/userguide/datafiles.rst             |  9 +++--
 docs/userguide/declarative_config.rst    |  2 ++
 docs/userguide/dependency_management.rst | 11 ++++---
 docs/userguide/development_mode.rst      |  4 +--
 docs/userguide/distribution.rst          | 18 ++++++----
 docs/userguide/entry_point.rst           | 10 ++++--
 docs/userguide/extension.rst             | 13 ++++++--
 docs/userguide/index.rst                 |  2 ++
 docs/userguide/keywords.rst              | 42 ++++++++++++------------
 docs/userguide/miscellaneous.rst         |  8 +++--
 docs/userguide/package_discovery.rst     |  6 ++--
 docs/userguide/quickstart.rst            | 12 ++++---
 18 files changed, 101 insertions(+), 62 deletions(-)

diff --git a/docs/build_meta.rst b/docs/build_meta.rst
index fcc2b7fee6..c36e2bab38 100644
--- a/docs/build_meta.rst
+++ b/docs/build_meta.rst
@@ -56,7 +56,8 @@ setuptools, the content would be::
     requires = ["setuptools", "wheel"]
     build-backend = "setuptools.build_meta" 
 
-Use ``setuptools``' `declarative config`_ to specify the package information::
+Use ``setuptools``' :ref:`declarative config <declarative config>` to
+specify the package information::
 
     [metadata]
     name = meowpkg
diff --git a/docs/deprecated/index.rst b/docs/deprecated/index.rst
index a655b21930..ca80767a77 100644
--- a/docs/deprecated/index.rst
+++ b/docs/deprecated/index.rst
@@ -17,3 +17,4 @@ objectives.
     python_eggs
     easy_install
     distutils-legacy
+    functionalities
diff --git a/docs/development.rst b/docs/development.rst
index 28e653fea9..7ee52361ec 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -31,5 +31,4 @@ setuptools changes.  You have been warned.
    :maxdepth: 1
 
    developer-guide
-   formats
    releases
diff --git a/docs/index.rst b/docs/index.rst
index 42b36ef5cc..961ec394c3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,6 +10,11 @@ Documentation content:
    :maxdepth: 1
 
    User guide <userguide/index>
+   build_meta
+   pkg_resources
+   references/keywords
+   roadmap
+   setuptools
    Development guide <development>
    Backward compatibility & deprecated practice <deprecated/index>
    Changelog <history>
diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst
index 563561908c..809491541d 100644
--- a/docs/references/keywords.rst
+++ b/docs/references/keywords.rst
@@ -1,3 +1,7 @@
+========
+Keywords
+========
+
 ``name``
     A string specifying the name of the package.
 
@@ -189,7 +193,7 @@
     discovery of services or plugins provided by a project.  See :ref:`Dynamic
     Discovery of Services and Plugins` for details and examples of the format
     of this argument.  In addition, this keyword is used to support
-    :ref:`Automatic Script Creation`.
+    :ref:`Automatic Script Creation <entry_points>`.
 
 ``extras_require``
     A dictionary mapping names of "extras" (optional features of your project)
@@ -317,15 +321,15 @@
 
 ``use_2to3``
     Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`python3` for more details.
+    build process. See :doc:`../deprecated/python3` for more details.
 
 ``convert_2to3_doctests``
     List of doctest source files that need to be converted with 2to3.
-    See :doc:`python3` for more details.
+    See :doc:`../deprecated/python3` for more details.
 
 ``use_2to3_fixers``
     A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`python3` for more details.
+    the 2to3 conversion. See :doc:`../deprecated/python3` for more details.
 
 ``use_2to3_exclude_fixers``
     List of fixer names to be skipped.
diff --git a/docs/userguide/commands.rst b/docs/userguide/commands.rst
index c64f62bfdd..e632e550b3 100644
--- a/docs/userguide/commands.rst
+++ b/docs/userguide/commands.rst
@@ -275,7 +275,7 @@ is used when you are building source distributions.)
 In addition to writing the core egg metadata defined by ``setuptools`` and
 required by ``pkg_resources``, this command can be extended to write other
 metadata files as well, by defining entry points in the ``egg_info.writers``
-group.  See the section on `Adding new EGG-INFO Files`_ below for more details.
+group.  See the section on :ref:`Adding new EGG-INFO Files` below for more details.
 Note that using additional metadata writers may require you to include a
 ``setup_requires`` argument to ``setup()`` in order to ensure that the desired
 writers are available on ``sys.path``.
@@ -315,7 +315,7 @@ added in the following order:
 (Note: Because these options modify the version number used for source and
 binary distributions of your project, you should first make sure that you know
 how the resulting version numbers will be interpreted by automated tools
-like pip.  See the section above on `Specifying Your Project's Version`_ for an
+like pip.  See the section above on :ref:`Specifying Your Project's Version` for an
 explanation of pre- and post-release tags, as well as tips on how to choose and
 verify a versioning scheme for your project.)
 
diff --git a/docs/userguide/datafiles.rst b/docs/userguide/datafiles.rst
index 315ec7245d..69cf36e699 100644
--- a/docs/userguide/datafiles.rst
+++ b/docs/userguide/datafiles.rst
@@ -20,8 +20,8 @@ e.g.::
 This tells setuptools to install any data files it finds in your packages.
 The data files must be specified via the distutils' ``MANIFEST.in`` file.
 (They can also be tracked by a revision control system, using an appropriate
-plugin.  See the section below on `Adding Support for Revision Control
-Systems`_ for information on how to write such plugins.)
+plugin.  See the section below on :ref:`Adding Support for Revision
+Control Systems` for information on how to write such plugins.)
 
 If you want finer-grained control over what files are included (for example,
 if you have documentation files in your package directories and want to exclude
@@ -144,6 +144,9 @@ if they track intermediate revisions of your project using Subversion; be sure
 to let them know when you make changes that remove files from inclusion so they
 can run ``setup.py clean --all``.
 
+
+.. _Accessing Data Files at Runtime:
+
 Accessing Data Files at Runtime
 -------------------------------
 
@@ -171,4 +174,4 @@ fall back to the platform-specific location for installing data files, there is
 no supported facility to reliably retrieve these resources.
 
 Instead, the PyPA recommends that any data files you wish to be accessible at
-run time be included in the package.
\ No newline at end of file
+run time be included in the package.
diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index 51c897c409..2228bd158c 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -1,3 +1,5 @@
+.. _declarative config:
+
 -----------------------------------------
 Configuring setup() using setup.cfg files
 -----------------------------------------
diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index a26ab6c3b0..354a9f8c36 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -25,7 +25,7 @@ you also need the ``wheel`` package as well since it is recommended that you
 upload a ``.whl`` file to PyPI alongside your ``.tar.gz`` file. Unlike the
 other two types of dependency keyword, this one is specified in your
 ``pyproject.toml`` file (if you have forgot what this is, go to
-:ref:`quickstart` or (WIP)):
+:doc:`quickstart` or (WIP)):
 
 .. code-block:: ini
 
@@ -36,10 +36,11 @@ other two types of dependency keyword, this one is specified in your
 .. note::
     This used to be accomplished with the ``setup_requires`` keyword but is
     now considered deprecated in favor of the PEP 517 style described above.
-    To peek into how this legacy keyword is used, consult our :ref:`guide on
-    deprecated practice (WIP)`
+    To peek into how this legacy keyword is used, consult our :doc:`guide on
+    deprecated practice (WIP) <../deprecated/index>`
 
 
+.. _Declaring Dependencies:
 
 Declaring required dependency
 =============================
@@ -266,7 +267,7 @@ the two dependencies ``PDF`` maps to.
 
 The second use case is that other package can use this "extra" for their
 own dependencies. For example, if "Project-B" needs "project A" with PDF support
-installed, it might declare the dependency like this::
+installed, it might declare the dependency like this:
 
 .. code-block:: ini
 
@@ -309,4 +310,4 @@ In some cases, you might need to specify the minimum required python version.
 This is handled with the ``python_requires`` keyword supplied to ``setup.cfg``
 or ``setup.py``.
 
-Example WIP
\ No newline at end of file
+Example WIP
diff --git a/docs/userguide/development_mode.rst b/docs/userguide/development_mode.rst
index 9d4e758155..bce724a79f 100644
--- a/docs/userguide/development_mode.rst
+++ b/docs/userguide/development_mode.rst
@@ -49,7 +49,7 @@ source from a staging area using ``setup.py develop --uninstall``, specifying
 the desired staging area if it's not the default.
 
 There are several options to control the precise behavior of the ``develop``
-command; see the section on the `develop`_ command below for more details.
+command; see the section on the :ref:`develop <develop>` command below for more details.
 
 Note that you can also apply setuptools commands to non-setuptools projects,
 using commands like this::
@@ -57,4 +57,4 @@ using commands like this::
    python -c "import setuptools; with open('setup.py') as f: exec(compile(f.read(), 'setup.py', 'exec'))" develop
 
 That is, you can simply list the normal setup commands and options following
-the quoted part.
\ No newline at end of file
+the quoted part.
diff --git a/docs/userguide/distribution.rst b/docs/userguide/distribution.rst
index 77ea2660e2..377f7bb4f1 100644
--- a/docs/userguide/distribution.rst
+++ b/docs/userguide/distribution.rst
@@ -23,17 +23,17 @@ egg distributions by adding one or more of the following to the project's
 You can add these tags by adding ``egg_info`` and the desired options to
 the command line ahead of the ``sdist`` or ``bdist`` commands that you want
 to generate a daily build or snapshot for.  See the section below on the
-`egg_info`_ command for more details.
+:ref:`egg_info <egg_info>` command for more details.
 
 (Also, before you release your project, be sure to see the section above on
-`Specifying Your Project's Version`_ for more information about how pre- and
+:ref:`Specifying Your Project's Version` for more information about how pre- and
 post-release tags affect how version numbers are interpreted.  This is
 important in order to make sure that dependency processing tools will know
 which versions of your project are newer than others.)
 
 Finally, if you are creating builds frequently, and either building them in a
 downloadable location or are copying them to a distribution server, you should
-probably also check out the `rotate`_ command, which lets you automatically
+probably also check out the :ref:`rotate <rotate>` command, which lets you automatically
 delete all but the N most-recently-modified distributions matching a glob
 pattern.  So, you can use a command line like::
 
@@ -46,7 +46,7 @@ that were built most recently.
 
 If you have to manage automated builds for multiple packages, each with
 different tagging and rotation policies, you may also want to check out the
-`alias`_ command, which would let each package define an alias like ``daily``
+:ref:`alias <alias>` command, which would let each package define an alias like ``daily``
 that would perform the necessary tag, build, and rotate commands.  Then, a
 simpler script or cron job could just run ``setup.py daily`` in each project
 directory.  (And, you could also define sitewide or per-user default versions
@@ -61,7 +61,7 @@ selection with pluggable endpoints for looking up files to include. If you are
 using a revision control system, and your source distributions only need to
 include files that you're tracking in revision control, use a corresponding
 plugin instead of writing a ``MANIFEST.in`` file. See the section below on
-`Adding Support for Revision Control Systems`_ for information on plugins.
+:ref:`Adding Support for Revision Control Systems` for information on plugins.
 
 If you need to include automatically generated files, or files that are kept in
 an unsupported revision control system, you'll need to create a ``MANIFEST.in``
@@ -114,7 +114,8 @@ You can then use it like this::
     setup.py release sdist bdist_egg
 
 Or of course you can create more elaborate aliases that do all of the above.
-See the sections below on the `egg_info`_ and `alias`_ commands for more ideas.
+See the sections below on the :ref:`egg_info <egg_info>` and
+:ref:`alias <alias>` commands for more ideas.
 
 Distributing Extensions compiled with Cython
 --------------------------------------------
@@ -154,6 +155,9 @@ control system will be able to build it even if they don't have Cython
 installed, and that your source releases will be similarly usable with or
 without Cython.
 
+
+.. _Specifying Your Project's Version:
+
 Specifying Your Project's Version
 ---------------------------------
 
@@ -237,4 +241,4 @@ have setuptools automatically tag your in-development releases with various
 pre- or post-release tags.  See the following sections for more details:
 
 * `Tagging and "Daily Build" or "Snapshot" Releases`_
-* The `egg_info`_ command
\ No newline at end of file
+* The :ref:`egg_info <egg_info>` command
diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index 7f5165a876..d1127ae4fa 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -33,6 +33,8 @@ with ``__init__.py`` as:
 
 and ``__main__.py`` providing a hook:
 
+.. code-block:: python
+
     from . import hello_world
     if __name__ == '__main__':
         hello_world()
@@ -49,7 +51,7 @@ user-friendly name for installers of the package to execute. Installers
 like pip will create wrapper scripts to execute a function. In the
 above example, to create a command ``hello-world`` that invokes
 ``timmins.hello_world``, add a console script entry point to
-``setup.cfg``::
+``setup.cfg``:
 
 .. code-block:: ini
 
@@ -74,6 +76,8 @@ In addition to ``console_scripts``, Setuptools supports ``gui_scripts``, which
 will launch a GUI application without running in a terminal window.
 
 
+.. _dynamic discovery of services and plugins:
+
 Advertising Behavior
 ====================
 
@@ -138,9 +142,9 @@ Some entry points may require additional dependencies to properly function.
 For such an entry point, declare in square brakets any number of dependency
 ``extras`` following the entry point definition. Such entry points will only
 be viable if their extras were declared and installed. See the
-:ref:`guide on dependencies management <dependency_management>` for
+:doc:`guide on dependencies management <dependency_management>` for
 more information on defining extra requirements. Consider from the
-above example::
+above example:
 
 .. code-block:: ini
 
diff --git a/docs/userguide/extension.rst b/docs/userguide/extension.rst
index 1e4846fc92..4de24ec9d3 100644
--- a/docs/userguide/extension.rst
+++ b/docs/userguide/extension.rst
@@ -1,3 +1,5 @@
+.. _Creating ``distutils`` Extensions:
+
 Creating ``distutils`` Extensions
 =================================
 
@@ -9,8 +11,8 @@ the extension just refer to it in their ``setup_requires`` argument.
 With ``setuptools``, your distutils extension projects can hook in new
 commands and ``setup()`` arguments just by defining "entry points".  These
 are mappings from command or argument names to a specification of where to
-import a handler from.  (See the section on `Dynamic Discovery of Services and
-Plugins`_ above for some more background on entry points.)
+import a handler from.  (See the section on :ref:`Dynamic Discovery of
+Services and Plugins` above for some more background on entry points.)
 
 
 Adding Commands
@@ -120,6 +122,8 @@ plugin is encouraged to load the configuration/settings for their behavior
 independently.
 
 
+.. _Adding new EGG-INFO Files:
+
 Adding new EGG-INFO Files
 -------------------------
 
@@ -173,6 +177,9 @@ the ``cmd`` object's ``write_file()``, ``delete_file()``, and
 ``write_or_delete_file()`` methods exclusively for your file operations.  See
 those methods' docstrings for more details.
 
+
+.. _Adding Support for Revision Control Systems:
+
 Adding Support for Revision Control Systems
 -------------------------------------------------
 
@@ -232,4 +239,4 @@ A few important points for writing revision control file finders:
 * Your finder function SHOULD NOT raise any errors, and SHOULD deal gracefully
   with the absence of needed programs (i.e., ones belonging to the revision
   control system itself.  It *may*, however, use ``distutils.log.warn()`` to
-  inform the user of the missing program(s).
\ No newline at end of file
+  inform the user of the missing program(s).
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index abee331a2f..57b059e50b 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -24,3 +24,5 @@ ordinary Python packages based on the ``distutils``.
     declarative_config
     keywords
     commands
+    functionalities_rewrite
+    miscellaneous
diff --git a/docs/userguide/keywords.rst b/docs/userguide/keywords.rst
index e2852b3410..58fe74bc4a 100644
--- a/docs/userguide/keywords.rst
+++ b/docs/userguide/keywords.rst
@@ -8,19 +8,19 @@ unless you need the associated ``setuptools`` feature.
 ``include_package_data``
     If set to ``True``, this tells ``setuptools`` to automatically include any
     data files it finds inside your package directories that are specified by
-    your ``MANIFEST.in`` file.  For more information, see the section below on
-    `Including Data Files`_.
+    your ``MANIFEST.in`` file.  For more information, see the section on
+    :ref:`Including Data Files`.
 
 ``exclude_package_data``
     A dictionary mapping package names to lists of glob patterns that should
     be *excluded* from your package directories.  You can use this to trim back
     any excess files included by ``include_package_data``.  For a complete
-    description and examples, see the section below on `Including Data Files`_.
+    description and examples, see the section on :ref:`Including Data Files`.
 
 ``package_data``
     A dictionary mapping package names to lists of glob patterns.  For a
-    complete description and examples, see the section below on `Including
-    Data Files`_.  You do not need to use this option if you are using
+    complete description and examples, see the section on :ref:`Including
+    Data Files`.  You do not need to use this option if you are using
     ``include_package_data``, unless you need to add e.g. files that are
     generated by your setup script and build process.  (And are therefore not
     in source control or are files that you don't want to include in your
@@ -34,22 +34,22 @@ unless you need the associated ``setuptools`` feature.
 
 ``install_requires``
     A string or list of strings specifying what other distributions need to
-    be installed when this one is.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
+    be installed when this one is.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
 
 ``entry_points``
     A dictionary mapping entry point group names to strings or lists of strings
     defining the entry points.  Entry points are used to support dynamic
-    discovery of services or plugins provided by a project.  See `Dynamic
-    Discovery of Services and Plugins`_ for details and examples of the format
-    of this argument.  In addition, this keyword is used to support `Automatic
-    Script Creation`_.
+    discovery of services or plugins provided by a project.  See :ref:`Dynamic
+    Discovery of Services and Plugins` for details and examples of the format
+    of this argument.  In addition, this keyword is used to support
+    :ref:`Automatic Script Creation <entry_points>`.
 
 ``extras_require``
     A dictionary mapping names of "extras" (optional features of your project)
     to strings or lists of strings specifying what other distributions must be
-    installed to support those features.  See the section below on `Declaring
-    Dependencies`_ for details and examples of the format of this argument.
+    installed to support those features.  See the section on :ref:`Declaring
+    Dependencies` for details and examples of the format of this argument.
 
 ``python_requires``
     A string corresponding to a version specifier (as defined in PEP 440) for
@@ -87,7 +87,7 @@ unless you need the associated ``setuptools`` feature.
     as you declare them in each project that contains any subpackages of the
     namespace package, and as long as the namespace package's ``__init__.py``
     does not contain any code other than a namespace declaration.  See the
-    section below on `Namespace Packages`_ for more information.
+    section below on :ref:`Namespace Packages` for more information.
 
 ``test_suite``
     A string naming a ``unittest.TestCase`` subclass (or a package or module
@@ -98,9 +98,9 @@ unless you need the associated ``setuptools`` feature.
     added to the tests to be run.  If the named suite is a package, any
     submodules and subpackages are recursively added to the overall test suite.
 
-    Specifying this argument enables use of the `test`_ command to run the
+    Specifying this argument enables use of the :ref:`test <test>` command to run the
     specified test suite, e.g. via ``setup.py test``.  See the section on the
-    `test`_ command below for more details.
+    :ref:`test <test>` command below for more details.
 
     New in 41.5.0: Deprecated the test command.
 
@@ -155,21 +155,21 @@ unless you need the associated ``setuptools`` feature.
     extensions that access other files in the project (such as data files or
     shared libraries), you probably do NOT need this argument and shouldn't
     mess with it.  For more details on how this argument works, see the section
-    below on `Automatic Resource Extraction`_.
+    below on :ref:`Automatic Resource Extraction`.
 
 ``use_2to3``
     Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`python3` for more details.
+    build process. See :doc:`../deprecated/python3` for more details.
 
 ``convert_2to3_doctests``
     List of doctest source files that need to be converted with 2to3.
-    See :doc:`python3` for more details.
+    See :doc:`../deprecated/python3` for more details.
 
 ``use_2to3_fixers``
     A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`python3` for more details.
+    the 2to3 conversion. See :doc:`../deprecated/python3` for more details.
 
 ``project_urls``
     An arbitrary map of URL names to hyperlinks, allowing more extensible
     documentation of where various resources can be found than the simple
-    ``url`` and ``download_url`` options provide.
\ No newline at end of file
+    ``url`` and ``download_url`` options provide.
diff --git a/docs/userguide/miscellaneous.rst b/docs/userguide/miscellaneous.rst
index 65e075cddc..3df327d795 100644
--- a/docs/userguide/miscellaneous.rst
+++ b/docs/userguide/miscellaneous.rst
@@ -1,3 +1,5 @@
+.. _Automatic Resource Extraction:
+
 Automatic Resource Extraction
 -----------------------------
 
@@ -46,8 +48,8 @@ directory.  However, since it can be tedious to create such files by hand, you
 may want to create a distutils extension that will create the necessary files
 from arguments to ``setup()``, in much the same way that ``setuptools`` does
 for many of the ``setup()`` arguments it adds.  See the section below on
-`Creating distutils Extensions`_ for more details, especially the subsection on
-`Adding new EGG-INFO Files`_.
+:ref:`Creating ``distutils\`\` Extensions` for more details, especially the
+subsection on :ref:`Adding new EGG-INFO Files`.
 
 Setting the ``zip_safe`` flag
 -----------------------------
@@ -75,7 +77,7 @@ no ``__file__`` or ``__path__`` introspection or source code manipulation, then
 there is an extremely solid chance the project will work when installed as a
 zipfile.  (And if the project uses ``pkg_resources`` for all its data file
 access, then C extensions and other data files shouldn't be a problem at all.
-See the `Accessing Data Files at Runtime`_ section above for more information.)
+See the :ref:`Accessing Data Files at Runtime` section above for more information.)
 
 However, if ``bdist_egg`` can't be *sure* that your package will work, but
 you've checked over all the warnings it issued, and you are either satisfied it
diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst
index 0e0d27c5b2..3915408d67 100644
--- a/docs/userguide/package_discovery.rst
+++ b/docs/userguide/package_discovery.rst
@@ -6,13 +6,13 @@ Package Discovery and Namespace Package
 
 .. note::
     a full specification for the keyword supplied to ``setup.cfg`` or
-    ``setup.py`` can be found at :ref:`keywords reference <keywords_ref>`
+    ``setup.py`` can be found at :doc:`keywords reference <keywords>`
 
 .. note::
     the examples provided here are only to demonstrate the functionality
     introduced. More metadata and options arguments need to be supplied
     if you want to replicate them on your system. If you are completely
-    new to setuptools, the :ref:`quickstart section <quickstart>` is a good
+    new to setuptools, the :doc:`quickstart section <quickstart>` is a good
     place to start.
 
 ``Setuptools`` provide powerful tools to handle package discovery, including
@@ -97,6 +97,8 @@ in ``src`` that starts with the name ``pkg`` and not ``additional``:
     )
 
 
+.. _Namespace Packages:
+
 Using ``find_namespace:`` or ``find_namespace_packages``
 ========================================================
 ``setuptools``  provides the ``find_namespace:`` (``find_namespace_packages``)
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 5282975102..3ee4fc8c19 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -82,8 +82,8 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
-therefore provides two convenient tools to ease the burden: ``find: `` and
-``find_namespace: ``. To use it in your project:
+therefore provides two convenient tools to ease the burden: :literal:`find:\ ` and
+:literal:`find_namespace:\ `. To use it in your project:
 
 .. code-block:: ini
 
@@ -122,7 +122,7 @@ keyword in your ``setup.cfg``:
 When this project is installed, a ``main`` script will be installed and will
 invoke the ``some_func`` in the ``__init__.py`` file when called by the user.
 For detailed usage, including managing the additional or optional dependencies,
-go to :ref:`entry_point`.
+go to :doc:`entry_point`.
 
 
 Dependency management
@@ -147,9 +147,11 @@ additional keywords such as ``setup_requires`` that allows you to install
 dependencies before running the script, and ``extras_requires`` that take
 care of those needed by automatically generated scripts. It also provides
 mechanisms to handle dependencies that are not in PyPI. For more advanced use,
-see :ref:`dependency_management`
+see :doc:`dependency_management`
 
 
+.. _Including Data Files:
+
 Including Data Files
 ====================
 The distutils have traditionally allowed installation of "data files", which
@@ -164,7 +166,7 @@ can simply use the ``include_package_data`` keyword:
 
 This tells setuptools to install any data files it finds in your packages.
 The data files must be specified via the distutils' ``MANIFEST.in`` file.
-For more details, see :ref:`datafiles`
+For more details, see :doc:`datafiles`
 
 
 Development mode

From 883f33613572e3c92021b58522b54958b00cdc87 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 01:13:03 +0200
Subject: [PATCH 8204/8469] =?UTF-8?q?=E2=9C=A8Make=20the=20default=20impli?=
 =?UTF-8?q?cit=20role=20autofind=20targets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.rst                           |  68 +++---
 docs/conf.py                          |   5 +
 docs/pkg_resources.rst                | 306 +++++++++++++-------------
 docs/references/keywords.rst          |   2 +-
 docs/userguide/declarative_config.rst |  10 +-
 docs/userguide/keywords.rst           |   2 +-
 docs/userguide/quickstart.rst         |   3 +-
 7 files changed, 200 insertions(+), 196 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c35c4a8792..c96fb0bc9d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -22,9 +22,9 @@ v50.2.0
 
 * #2355: When pip is imported as part of a build, leave distutils patched.
 * #2380: There are some setuptools specific changes in the
-  `setuptools.command.bdist_rpm` module that are no longer needed, because
-  they are part of the `bdist_rpm` module in distutils in Python
-  3.5.0. Therefore, code was removed from `setuptools.command.bdist_rpm`.
+  ``setuptools.command.bdist_rpm`` module that are no longer needed, because
+  they are part of the ``bdist_rpm`` module in distutils in Python
+  3.5.0. Therefore, code was removed from ``setuptools.command.bdist_rpm``.
 
 
 v50.1.0
@@ -48,7 +48,7 @@ v50.0.2
 v50.0.1
 -------
 
-* #2357: Restored Python 3.5 support in distutils.util for missing `subprocess._optim_args_from_interpreter_flags`.
+* #2357: Restored Python 3.5 support in distutils.util for missing ``subprocess._optim_args_from_interpreter_flags``.
 * #2358: Restored AIX support on Python 3.8 and earlier.
 * #2361: Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
   from importlib.abc rather than importlib.util.abc (alias removed in Python
@@ -495,7 +495,7 @@ v40.7.1
 v40.7.0
 -------
 
-* #1551: File inputs for the `license` field in `setup.cfg` files now explicitly raise an error.
+* #1551: File inputs for the ``license`` field in ``setup.cfg`` files now explicitly raise an error.
 * #1180: Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
 * #1499: ``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
 * #1544: Added tests for PackageIndex.download (for git URLs).
@@ -545,7 +545,7 @@ v40.5.0
 
 * #1335: In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.
 * #1502: Deprecated support for downloads from Subversion in package_index/easy_install.
-* #1517: Dropped use of six.u in favor of `u""` literals.
+* #1517: Dropped use of six.u in favor of ``u""`` literals.
 * #1520: Added support for ``data_files`` in ``setup.cfg``.
 * #1525: Fixed rendering of the deprecation warning in easy_install doc.
 
@@ -594,7 +594,7 @@ v40.2.0
 v40.1.1
 --------
 
-* #1465: Fix regression with `egg_info` command when tagging is used.
+* #1465: Fix regression with ``egg_info`` command when tagging is used.
 
 
 v40.1.0
@@ -631,8 +631,8 @@ v39.2.0
   a text file.
 * #1360: Fixed issue with a mismatch between the name of the package and the
   name of the .dist-info file in wheel files
-* #1364: Add `__dir__()` implementation to `pkg_resources.Distribution()` that
-  includes the attributes in the `_provider` instance variable.
+* #1364: Add ``__dir__()`` implementation to ``pkg_resources.Distribution()`` that
+  includes the attributes in the ``_provider`` instance variable.
 * #1365: Take the package_dir option into account when loading the version from
   a module attribute.
 * #1353: Added coverage badge to README.
@@ -742,7 +742,7 @@ v38.2.5
 v38.2.4
 -------
 
-* #1220: Fix `data_files` handling when installing from wheel.
+* #1220: Fix ``data_files`` handling when installing from wheel.
 
 v38.2.3
 -------
@@ -1506,7 +1506,7 @@ v25.4.0
 v25.3.0
 -------
 
-* #739 Fix unquoted libpaths by fixing compatibility between `numpy.distutils` and `distutils._msvccompiler` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
+* #739 Fix unquoted libpaths by fixing compatibility between ``numpy.distutils`` and ``distutils._msvccompiler`` for numpy < 1.11.2 (Fix issue #728, error also fixed in Numpy).
 
 * #731: Bump certifi.
 
@@ -1523,13 +1523,13 @@ v25.2.0
 v25.1.6
 -------
 
-* #725: revert `library_dir_option` patch (Error is related to `numpy.distutils` and make errors on non Numpy users).
+* #725: revert ``library_dir_option`` patch (Error is related to ``numpy.distutils`` and make errors on non Numpy users).
 
 v25.1.5
 -------
 
 * #720
-* #723: Improve patch for `library_dir_option`.
+* #723: Improve patch for ``library_dir_option``.
 
 v25.1.4
 -------
@@ -1537,7 +1537,7 @@ v25.1.4
 * #717
 * #713
 * #707: Fix Python 2 compatibility for MSVC by catching errors properly.
-* #715: Fix unquoted libpaths by patching `library_dir_option`.
+* #715: Fix unquoted libpaths by patching ``library_dir_option``.
 
 v25.1.3
 -------
@@ -3065,10 +3065,10 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 
 * Issue #50: Normalized API of environment marker support. Specifically,
   removed line number and filename from SyntaxErrors when returned from
-  `pkg_resources.invalid_marker`. Any clients depending on the specific
+  ``pkg_resources.invalid_marker``. Any clients depending on the specific
   string representation of exceptions returned by that function may need to
   be updated to account for this change.
-* Issue #50: SyntaxErrors generated by `pkg_resources.invalid_marker` are
+* Issue #50: SyntaxErrors generated by ``pkg_resources.invalid_marker`` are
   normalized for cross-implementation consistency.
 * Removed ``--ignore-conflicts-at-my-risk`` and ``--delete-conflicting``
   options to easy_install. These options have been deprecated since 0.6a11.
@@ -3076,13 +3076,13 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 0.9.8
 -----
 
-* Issue #53: Fix NameErrors in `_vcs_split_rev_from_url`.
+* Issue #53: Fix NameErrors in ``_vcs_split_rev_from_url``.
 
 0.9.7
 -----
 
 * Issue #49: Correct AttributeError on PyPy where a hashlib.HASH object does
-  not have a `.name` attribute.
+  not have a ``.name`` attribute.
 * Issue #34: Documentation now refers to bootstrap script in code repository
   referenced by bookmark.
 * Add underscore-separated keys to environment markers (markerlib).
@@ -3090,7 +3090,7 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 0.9.6
 -----
 
-* Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a `.name`
+* Issue #44: Test failure on Python 2.4 when MD5 hash doesn't have a ``.name``
   attribute.
 
 0.9.5
@@ -3124,7 +3124,7 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 0.9
 ---
 
-* `package_index` now validates hashes other than MD5 in download links.
+* ``package_index`` now validates hashes other than MD5 in download links.
 
 0.8
 ---
@@ -3171,7 +3171,7 @@ not all users will find 1.0 a drop-in replacement for 0.9.
 0.7.2
 -----
 
-* Issue #14: Use markerlib when the `parser` module is not available.
+* Issue #14: Use markerlib when the ``parser`` module is not available.
 * Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.
 
 0.7.1
@@ -3255,7 +3255,7 @@ Added several features that were slated for setuptools 0.6c12:
 ------
 
 * Distribute #27: Use public api for loading resources from zip files rather than
-  the private method `_zip_directory_cache`.
+  the private method ``_zip_directory_cache``.
 * Added a new function ``easy_install.get_win_launcher`` which may be used by
   third-party libraries such as buildout to get a suitable script launcher.
 
@@ -3321,7 +3321,7 @@ how it parses version numbers.
 * Fix 2 errors with Jython 2.5.
 * Fix 1 failure with Jython 2.5 and 2.7.
 * Disable workaround for Jython scripts on Linux systems.
-* Distribute #336: `setup.py` no longer masks failure exit code when tests fail.
+* Distribute #336: ``setup.py`` no longer masks failure exit code when tests fail.
 * Fix issue in pkg_resources where try/except around a platform-dependent
   import would trigger hook load failures on Mercurial. See pull request 32
   for details.
@@ -3332,7 +3332,7 @@ how it parses version numbers.
 
 * Fix test suite with Python 2.6.
 * Fix some DeprecationWarnings and ResourceWarnings.
-* Distribute #335: Backed out `setup_requires` superceding installed requirements
+* Distribute #335: Backed out ``setup_requires`` superceding installed requirements
   until regression can be addressed.
 
 0.6.31
@@ -3342,7 +3342,7 @@ how it parses version numbers.
 * Distribute #329: Properly close files created by tests for compatibility with
   Jython.
 * Work around Jython #1980 and Jython #1981.
-* Distribute #334: Provide workaround for packages that reference `sys.__stdout__`
+* Distribute #334: Provide workaround for packages that reference ``sys.__stdout__``
   such as numpy does. This change should address
   `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
   as the system encoding is UTF-8 or the IO encoding is specified in the
@@ -3351,7 +3351,7 @@ how it parses version numbers.
      PYTHONIOENCODING=utf8 pip install numpy
 
 * Fix for encoding issue when installing from Windows executable on Python 3.
-* Distribute #323: Allow `setup_requires` requirements to supercede installed
+* Distribute #323: Allow ``setup_requires`` requirements to supercede installed
   requirements. Added some new keyword arguments to existing pkg_resources
   methods. Also had to updated how __path__ is handled for namespace packages
   to ensure that when a new egg distribution containing a namespace package is
@@ -3371,16 +3371,16 @@ how it parses version numbers.
 * BB Pull Request #14: Honor file permissions in zip files.
 * Distribute #327: Merged pull request #24 to fix a dependency problem with pip.
 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
-* If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
+* If Sphinx is installed, the ``upload_docs`` command now runs ``build_sphinx``
   to produce uploadable documentation.
-* Distribute #326: `upload_docs` provided mangled auth credentials under Python 3.
+* Distribute #326: ``upload_docs`` provided mangled auth credentials under Python 3.
 * Distribute #320: Fix check for "createable" in distribute_setup.py.
 * Distribute #305: Remove a warning that was triggered during normal operations.
 * Distribute #311: Print metadata in UTF-8 independent of platform.
 * Distribute #303: Read manifest file with UTF-8 encoding under Python 3.
 * Distribute #301: Allow to run tests of namespace packages when using 2to3.
 * Distribute #304: Prevent import loop in site.py under Python 3.3.
-* Distribute #283: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
+* Distribute #283: Reenable scanning of ``*.pyc`` / ``*.pyo`` files on Python 3.3.
 * Distribute #299: The develop command didn't work on Python 3, when using 2to3,
   as the egg link would go to the Python 2 source. Linking to the 2to3'd code
   in build/lib makes it work, although you will have to rebuild the module
@@ -3390,10 +3390,10 @@ how it parses version numbers.
 * Distribute #313: Support for sdist subcommands (Python 2.7)
 * Distribute #314: test_local_index() would fail an OS X.
 * Distribute #310: Non-ascii characters in a namespace __init__.py causes errors.
-* Distribute #218: Improved documentation on behavior of `package_data` and
-  `include_package_data`. Files indicated by `package_data` are now included
+* Distribute #218: Improved documentation on behavior of ``package_data`` and
+  ``include_package_data``. Files indicated by ``package_data`` are now included
   in the manifest.
-* `distribute_setup.py` now allows a `--download-base` argument for retrieving
+* ``distribute_setup.py`` now allows a ``--download-base`` argument for retrieving
   distribute from a specified location.
 
 0.6.28
@@ -3402,7 +3402,7 @@ how it parses version numbers.
 * Distribute #294: setup.py can now be invoked from any directory.
 * Scripts are now installed honoring the umask.
 * Added support for .dist-info directories.
-* Distribute #283: Fix and disable scanning of `*.pyc` / `*.pyo` files on
+* Distribute #283: Fix and disable scanning of ``*.pyc`` / ``*.pyo`` files on
   Python 3.3.
 
 0.6.27
@@ -3636,7 +3636,7 @@ how it parses version numbers.
 0.6.4
 -----
 
-* Added the generation of `distribute_setup_3k.py` during the release.
+* Added the generation of ``distribute_setup_3k.py`` during the release.
   This closes Distribute #52.
 
 * Added an upload_docs command to easily upload project documentation to
diff --git a/docs/conf.py b/docs/conf.py
index 1928af58f6..982f5e6212 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -150,3 +150,8 @@
 
 # Be strict about any broken references:
 nitpicky = True
+
+
+# Ref: https://github.com/python-attrs/attrs/pull/571/files\
+#      #diff-85987f48f1258d9ee486e3191495582dR82
+default_role = 'any'
diff --git a/docs/pkg_resources.rst b/docs/pkg_resources.rst
index 7d0d8da92a..364e218328 100644
--- a/docs/pkg_resources.rst
+++ b/docs/pkg_resources.rst
@@ -149,7 +149,7 @@ more information on this.)  Also, you must add a ``declare_namespace()`` call
 in the package's ``__init__.py`` file(s):
 
 ``declare_namespace(name)``
-    Declare that the dotted package name `name` is a "namespace package" whose
+    Declare that the dotted package name ``name`` is a "namespace package" whose
     contained packages and modules may be spread across multiple distributions.
     The named package's ``__path__`` will be extended to include the
     corresponding package in all distributions on ``sys.path`` that contain a
@@ -163,7 +163,7 @@ Applications that manipulate namespace packages or directly alter ``sys.path``
 at runtime may also need to use this API function:
 
 ``fixup_namespace_packages(path_item)``
-    Declare that `path_item` is a newly added item on ``sys.path`` that may
+    Declare that ``path_item`` is a newly added item on ``sys.path`` that may
     need to be used to update existing namespace packages.  Ordinarily, this is
     called for you when an egg is automatically added to ``sys.path``, but if
     your application modifies ``sys.path`` to include locations that may
@@ -197,7 +197,7 @@ not provide any way to detect arbitrary changes to a list object like
 ``working_set`` based on changes to ``sys.path``.
 
 ``WorkingSet(entries=None)``
-    Create a ``WorkingSet`` from an iterable of path entries.  If `entries`
+    Create a ``WorkingSet`` from an iterable of path entries.  If ``entries``
     is not supplied, it defaults to the value of ``sys.path`` at the time
     the constructor is called.
 
@@ -229,9 +229,9 @@ abbreviation for ``pkg_resources.working_set.require()``:
 
 
 ``require(*requirements)``
-    Ensure that distributions matching `requirements` are activated
+    Ensure that distributions matching ``requirements`` are activated
 
-    `requirements` must be a string or a (possibly-nested) sequence
+    ``requirements`` must be a string or a (possibly-nested) sequence
     thereof, specifying the distributions and versions required.  The
     return value is a sequence of the distributions that needed to be
     activated to fulfill the requirements; all relevant distributions are
@@ -259,8 +259,8 @@ abbreviation for ``pkg_resources.working_set.require()``:
     ``obtain()`` method of ``Environment`` objects.
 
 ``run_script(requires, script_name)``
-    Locate distribution specified by `requires` and run its `script_name`
-    script.  `requires` must be a string containing a requirement specifier.
+    Locate distribution specified by ``requires`` and run its ``script_name``
+    script.  ``requires`` must be a string containing a requirement specifier.
     (See `Requirements Parsing`_ below for the syntax.)
 
     The script, if found, will be executed in *the caller's globals*.  That's
@@ -274,11 +274,11 @@ abbreviation for ``pkg_resources.working_set.require()``:
     object's `Metadata API`_ instead.
 
 ``iter_entry_points(group, name=None)``
-    Yield entry point objects from `group` matching `name`
+    Yield entry point objects from ``group`` matching ``name``
 
-    If `name` is None, yields all entry points in `group` from all
+    If ``name`` is None, yields all entry points in ``group`` from all
     distributions in the working set, otherwise only ones matching both
-    `group` and `name` are yielded.  Entry points are yielded from the active
+    ``group`` and ``name`` are yielded.  Entry points are yielded from the active
     distributions in the order that the distributions appear in the working
     set.  (For the global ``working_set``, this should be the same as the order
     that they are listed in ``sys.path``.)  Note that within the entry points
@@ -301,14 +301,14 @@ instance:
     called by the ``WorkingSet()`` constructor during initialization.
 
     This method uses ``find_distributions(entry,True)`` to find distributions
-    corresponding to the path entry, and then ``add()`` them.  `entry` is
+    corresponding to the path entry, and then ``add()`` them.  ``entry`` is
     always appended to the ``entries`` attribute, even if it is already
     present, however. (This is because ``sys.path`` can contain the same value
     more than once, and the ``entries`` attribute should be able to reflect
     this.)
 
 ``__contains__(dist)``
-    True if `dist` is active in this ``WorkingSet``.  Note that only one
+    True if ``dist`` is active in this ``WorkingSet``.  Note that only one
     distribution for a given project can be active in a given ``WorkingSet``.
 
 ``__iter__()``
@@ -317,34 +317,34 @@ instance:
     added to the working set.
 
 ``find(req)``
-    Find a distribution matching `req` (a ``Requirement`` instance).
+    Find a distribution matching ``req`` (a ``Requirement`` instance).
     If there is an active distribution for the requested project, this
     returns it, as long as it meets the version requirement specified by
-    `req`.  But, if there is an active distribution for the project and it
-    does *not* meet the `req` requirement, ``VersionConflict`` is raised.
+    ``req``.  But, if there is an active distribution for the project and it
+    does *not* meet the ``req`` requirement, ``VersionConflict`` is raised.
     If there is no active distribution for the requested project, ``None``
     is returned.
 
 ``resolve(requirements, env=None, installer=None)``
-    List all distributions needed to (recursively) meet `requirements`
+    List all distributions needed to (recursively) meet ``requirements``
 
-    `requirements` must be a sequence of ``Requirement`` objects.  `env`,
+    ``requirements`` must be a sequence of ``Requirement`` objects.  ``env``,
     if supplied, should be an ``Environment`` instance.  If
     not supplied, an ``Environment`` is created from the working set's
-    ``entries``.  `installer`, if supplied, will be invoked with each
+    ``entries``.  ``installer``, if supplied, will be invoked with each
     requirement that cannot be met by an already-installed distribution; it
     should return a ``Distribution`` or ``None``.  (See the ``obtain()`` method
-    of `Environment Objects`_, below, for more information on the `installer`
+    of `Environment Objects`_, below, for more information on the ``installer``
     argument.)
 
 ``add(dist, entry=None)``
-    Add `dist` to working set, associated with `entry`
+    Add ``dist`` to working set, associated with ``entry``
 
-    If `entry` is unspecified, it defaults to ``dist.location``.  On exit from
-    this routine, `entry` is added to the end of the working set's ``.entries``
+    If ``entry`` is unspecified, it defaults to ``dist.location``.  On exit from
+    this routine, ``entry`` is added to the end of the working set's ``.entries``
     (if it wasn't already present).
 
-    `dist` is only added to the working set if it's for a project that
+    ``dist`` is only added to the working set if it's for a project that
     doesn't already have a distribution active in the set.  If it's
     successfully added, any  callbacks registered with the ``subscribe()``
     method will be called.  (See `Receiving Change Notifications`_, below.)
@@ -401,7 +401,7 @@ environment for the newest version of each project that can be safely loaded
 without conflicts or missing requirements.
 
 ``find_plugins(plugin_env, full_env=None, fallback=True)``
-   Scan `plugin_env` and identify which distributions could be added to this
+   Scan ``plugin_env`` and identify which distributions could be added to this
    working set without version conflicts or missing requirements.
 
    Example usage::
@@ -412,19 +412,19 @@ without conflicts or missing requirements.
        map(working_set.add, distributions)  # add plugins+libs to sys.path
        print "Couldn't load", errors        # display errors
 
-   The `plugin_env` should be an ``Environment`` instance that contains only
+   The ``plugin_env`` should be an ``Environment`` instance that contains only
    distributions that are in the project's "plugin directory" or directories.
-   The `full_env`, if supplied, should be an ``Environment`` instance that
+   The ``full_env``, if supplied, should be an ``Environment`` instance that
    contains all currently-available distributions.
 
-   If `full_env` is not supplied, one is created automatically from the
+   If ``full_env`` is not supplied, one is created automatically from the
    ``WorkingSet`` this method is called on, which will typically mean that
    every directory on ``sys.path`` will be scanned for distributions.
 
-   This method returns a 2-tuple: (`distributions`, `error_info`), where
-   `distributions` is a list of the distributions found in `plugin_env` that
+   This method returns a 2-tuple: (``distributions``, ``error_info``), where
+   ``distributions`` is a list of the distributions found in ``plugin_env`` that
    were loadable, along with any other distributions that are needed to resolve
-   their dependencies.  `error_info` is a dictionary mapping unloadable plugin
+   their dependencies.  ``error_info`` is a dictionary mapping unloadable plugin
    distributions to an exception instance describing the error that occurred.
    Usually this will be a ``DistributionNotFound`` or ``VersionConflict``
    instance.
@@ -436,7 +436,7 @@ without conflicts or missing requirements.
    metadata tracking and hooks to be activated.
 
    The resolution algorithm used by ``find_plugins()`` is as follows.  First,
-   the project names of the distributions present in `plugin_env` are sorted.
+   the project names of the distributions present in ``plugin_env`` are sorted.
    Then, each project's eggs are tried in descending version order (i.e.,
    newest version first).
 
@@ -446,7 +446,7 @@ without conflicts or missing requirements.
    the next project name, and no older eggs for that project are tried.
 
    If the resolution attempt fails, however, the error is added to the error
-   dictionary.  If the `fallback` flag is true, the next older version of the
+   dictionary.  If the ``fallback`` flag is true, the next older version of the
    plugin is tried, until a working version is found.  If false, the resolution
    process continues with the next plugin project name.
 
@@ -455,7 +455,7 @@ without conflicts or missing requirements.
    may not be able to safely downgrade a version of a package. Others may want
    to ensure that a new plugin configuration is either 100% good or else
    revert to a known-good configuration.  (That is, they may wish to revert to
-   a known configuration if the `error_info` return value is non-empty.)
+   a known configuration if the ``error_info`` return value is non-empty.)
 
    Note that this algorithm gives precedence to satisfying the dependencies of
    alphabetically prior project names in case of version conflicts. If two
@@ -473,22 +473,22 @@ that are present and potentially importable on the current platform.
 distributions during dependency resolution.
 
 ``Environment(search_path=None, platform=get_supported_platform(), python=PY_MAJOR)``
-    Create an environment snapshot by scanning `search_path` for distributions
-    compatible with `platform` and `python`.  `search_path` should be a
+    Create an environment snapshot by scanning ``search_path`` for distributions
+    compatible with ``platform`` and ``python``.  ``search_path`` should be a
     sequence of strings such as might be used on ``sys.path``.  If a
-    `search_path` isn't supplied, ``sys.path`` is used.
+    ``search_path`` isn't supplied, ``sys.path`` is used.
 
-    `platform` is an optional string specifying the name of the platform
+    ``platform`` is an optional string specifying the name of the platform
     that platform-specific distributions must be compatible with.  If
-    unspecified, it defaults to the current platform.  `python` is an
+    unspecified, it defaults to the current platform.  ``python`` is an
     optional string naming the desired version of Python (e.g. ``'2.4'``);
     it defaults to the currently-running version.
 
-    You may explicitly set `platform` (and/or `python`) to ``None`` if you
+    You may explicitly set ``platform`` (and/or ``python``) to ``None`` if you
     wish to include *all* distributions, not just those compatible with the
     running platform or Python version.
 
-    Note that `search_path` is scanned immediately for distributions, and the
+    Note that ``search_path`` is scanned immediately for distributions, and the
     resulting ``Environment`` is a snapshot of the found distributions.  It
     is not automatically updated if the system's state changes due to e.g.
     installation or removal of distributions.
@@ -504,15 +504,15 @@ distributions during dependency resolution.
     The yielded names are always in lower case.
 
 ``add(dist)``
-    Add `dist` to the environment if it matches the platform and python version
+    Add ``dist`` to the environment if it matches the platform and python version
     specified at creation time, and only if the distribution hasn't already
     been added. (i.e., adding the same distribution more than once is a no-op.)
 
 ``remove(dist)``
-    Remove `dist` from the environment.
+    Remove ``dist`` from the environment.
 
 ``can_add(dist)``
-    Is distribution `dist` acceptable for this environment?  If it's not
+    Is distribution ``dist`` acceptable for this environment?  If it's not
     compatible with the ``platform`` and ``python`` version values specified
     when the environment was created, a false value is returned.
 
@@ -534,34 +534,34 @@ distributions during dependency resolution.
     are silently ignored.
 
 ``best_match(req, working_set, installer=None)``
-    Find distribution best matching `req` and usable on `working_set`
+    Find distribution best matching ``req`` and usable on ``working_set``
 
-    This calls the ``find(req)`` method of the `working_set` to see if a
+    This calls the ``find(req)`` method of the ``working_set`` to see if a
     suitable distribution is already active.  (This may raise
     ``VersionConflict`` if an unsuitable version of the project is already
-    active in the specified `working_set`.)  If a suitable distribution isn't
+    active in the specified ``working_set``.)  If a suitable distribution isn't
     active, this method returns the newest distribution in the environment
-    that meets the ``Requirement`` in `req`.  If no suitable distribution is
-    found, and `installer` is supplied, then the result of calling
+    that meets the ``Requirement`` in ``req``.  If no suitable distribution is
+    found, and ``installer`` is supplied, then the result of calling
     the environment's ``obtain(req, installer)`` method will be returned.
 
 ``obtain(requirement, installer=None)``
     Obtain a distro that matches requirement (e.g. via download).  In the
     base ``Environment`` class, this routine just returns
-    ``installer(requirement)``, unless `installer` is None, in which case
+    ``installer(requirement)``, unless ``installer`` is None, in which case
     None is returned instead.  This method is a hook that allows subclasses
     to attempt other ways of obtaining a distribution before falling back
-    to the `installer` argument.
+    to the ``installer`` argument.
 
 ``scan(search_path=None)``
-    Scan `search_path` for distributions usable on `platform`
+    Scan ``search_path`` for distributions usable on ``platform``
 
-    Any distributions found are added to the environment.  `search_path` should
+    Any distributions found are added to the environment.  ``search_path`` should
     be a sequence of strings such as might be used on ``sys.path``.  If not
     supplied, ``sys.path`` is used.  Only distributions conforming to
     the platform/python version defined at initialization are added.  This
     method is a shortcut for using the ``find_distributions()`` function to
-    find the distributions from each item in `search_path`, and then calling
+    find the distributions from each item in ``search_path``, and then calling
     ``add()`` to add each one to the environment.
 
 
@@ -627,10 +627,10 @@ Requirements Parsing
 --------------------------------------
 
 ``__contains__(dist_or_version)``
-    Return true if `dist_or_version` fits the criteria for this requirement.
-    If `dist_or_version` is a ``Distribution`` object, its project name must
+    Return true if ``dist_or_version`` fits the criteria for this requirement.
+    If ``dist_or_version`` is a ``Distribution`` object, its project name must
     match the requirement's project name, and its version must meet the
-    requirement's version criteria.  If `dist_or_version` is a string, it is
+    requirement's version criteria.  If ``dist_or_version`` is a string, it is
     parsed using the ``parse_version()`` utility function.  Otherwise, it is
     assumed to be an already-parsed version.
 
@@ -668,8 +668,8 @@ Requirements Parsing
 
 ``specs``
     A list of ``(op,version)`` tuples, sorted in ascending parsed-version
-    order.  The `op` in each tuple is a comparison operator, represented as
-    a string.  The `version` is the (unparsed) version number.
+    order.  The ``op`` in each tuple is a comparison operator, represented as
+    a string.  The ``version`` is the (unparsed) version number.
 
 ``marker``
     An instance of ``packaging.markers.Marker`` that allows evaluation
@@ -721,14 +721,14 @@ in sys.path order, etc.
 Convenience API
 ---------------
 
-In the following functions, the `dist` argument can be a ``Distribution``
+In the following functions, the ``dist`` argument can be a ``Distribution``
 instance, a ``Requirement`` instance, or a string specifying a requirement
 (i.e. project name, version, etc.).  If the argument is a string or
 ``Requirement``, the specified distribution is located (and added to sys.path
 if not already present).  An error will be raised if a matching distribution is
 not available.
 
-The `group` argument should be a string containing a dotted identifier,
+The ``group`` argument should be a string containing a dotted identifier,
 identifying an entry point group.  If you are defining an entry point group,
 you should include some portion of your package's name in the group name so as
 to avoid collision with other packages' entry point groups.
@@ -738,25 +738,25 @@ to avoid collision with other packages' entry point groups.
     ``ImportError``.
 
 ``get_entry_info(dist, group, name)``
-    Return an ``EntryPoint`` object for the given `group` and `name` from
+    Return an ``EntryPoint`` object for the given ``group`` and ``name`` from
     the specified distribution.  Returns ``None`` if the distribution has not
     advertised a matching entry point.
 
 ``get_entry_map(dist, group=None)``
-    Return the distribution's entry point map for `group`, or the full entry
+    Return the distribution's entry point map for ``group``, or the full entry
     map for the distribution.  This function always returns a dictionary,
-    even if the distribution advertises no entry points.  If `group` is given,
+    even if the distribution advertises no entry points.  If ``group`` is given,
     the dictionary maps entry point names to the corresponding ``EntryPoint``
-    object.  If `group` is None, the dictionary maps group names to
+    object.  If ``group`` is None, the dictionary maps group names to
     dictionaries that then map entry point names to the corresponding
     ``EntryPoint`` instance in that group.
 
 ``iter_entry_points(group, name=None)``
-    Yield entry point objects from `group` matching `name`.
+    Yield entry point objects from ``group`` matching ``name``.
 
-    If `name` is None, yields all entry points in `group` from all
+    If ``name`` is None, yields all entry points in ``group`` from all
     distributions in the working set on sys.path, otherwise only ones matching
-    both `group` and `name` are yielded.  Entry points are yielded from
+    both ``group`` and ``name`` are yielded.  Entry points are yielded from
     the active distributions in the order that the distributions appear on
     sys.path.  (Within entry points for a particular distribution, however,
     there is no particular ordering.)
@@ -769,26 +769,26 @@ Creating and Parsing
 --------------------
 
 ``EntryPoint(name, module_name, attrs=(), extras=(), dist=None)``
-    Create an ``EntryPoint`` instance.  `name` is the entry point name.  The
-    `module_name` is the (dotted) name of the module containing the advertised
-    object.  `attrs` is an optional tuple of names to look up from the
-    module to obtain the advertised object.  For example, an `attrs` of
-    ``("foo","bar")`` and a `module_name` of ``"baz"`` would mean that the
+    Create an ``EntryPoint`` instance.  ``name`` is the entry point name.  The
+    ``module_name`` is the (dotted) name of the module containing the advertised
+    object.  ``attrs`` is an optional tuple of names to look up from the
+    module to obtain the advertised object.  For example, an ``attrs`` of
+    ``("foo","bar")`` and a ``module_name`` of ``"baz"`` would mean that the
     advertised object could be obtained by the following code::
 
         import baz
         advertised_object = baz.foo.bar
 
-    The `extras` are an optional tuple of "extra feature" names that the
+    The ``extras`` are an optional tuple of "extra feature" names that the
     distribution needs in order to provide this entry point.  When the
-    entry point is loaded, these extra features are looked up in the `dist`
+    entry point is loaded, these extra features are looked up in the ``dist``
     argument to find out what other distributions may need to be activated
-    on sys.path; see the ``load()`` method for more details.  The `extras`
-    argument is only meaningful if `dist` is specified.  `dist` must be
+    on sys.path; see the ``load()`` method for more details.  The ``extras``
+    argument is only meaningful if ``dist`` is specified.  ``dist`` must be
     a ``Distribution`` instance.
 
 ``EntryPoint.parse(src, dist=None)`` (classmethod)
-    Parse a single entry point from string `src`
+    Parse a single entry point from string ``src``
 
     Entry point syntax follows the form::
 
@@ -796,27 +796,27 @@ Creating and Parsing
 
     The entry name and module name are required, but the ``:attrs`` and
     ``[extras]`` parts are optional, as is the whitespace shown between
-    some of the items.  The `dist` argument is passed through to the
+    some of the items.  The ``dist`` argument is passed through to the
     ``EntryPoint()`` constructor, along with the other values parsed from
-    `src`.
+    ``src``.
 
 ``EntryPoint.parse_group(group, lines, dist=None)`` (classmethod)
-    Parse `lines` (a string or sequence of lines) to create a dictionary
+    Parse ``lines`` (a string or sequence of lines) to create a dictionary
     mapping entry point names to ``EntryPoint`` objects.  ``ValueError`` is
-    raised if entry point names are duplicated, if `group` is not a valid
+    raised if entry point names are duplicated, if ``group`` is not a valid
     entry point group name, or if there are any syntax errors.  (Note: the
-    `group` parameter is used only for validation and to create more
-    informative error messages.)  If `dist` is provided, it will be used to
+    ``group`` parameter is used only for validation and to create more
+    informative error messages.)  If ``dist`` is provided, it will be used to
     set the ``dist`` attribute of the created ``EntryPoint`` objects.
 
 ``EntryPoint.parse_map(data, dist=None)`` (classmethod)
-    Parse `data` into a dictionary mapping group names to dictionaries mapping
-    entry point names to ``EntryPoint`` objects.  If `data` is a dictionary,
+    Parse ``data`` into a dictionary mapping group names to dictionaries mapping
+    entry point names to ``EntryPoint`` objects.  If ``data`` is a dictionary,
     then the keys are used as group names and the values are passed to
-    ``parse_group()`` as the `lines` argument.  If `data` is a string or
+    ``parse_group()`` as the ``lines`` argument.  If ``data`` is a string or
     sequence of lines, it is first split into .ini-style sections (using
     the ``split_sections()`` utility function) and the section names are used
-    as group names.  In either case, the `dist` argument is passed through to
+    as group names.  In either case, the ``dist`` argument is passed through to
     ``parse_group()`` so that the entry points will be linked to the specified
     distribution.
 
@@ -837,9 +837,9 @@ addition, the following methods are provided:
     Ensure that any "extras" needed by the entry point are available on
     sys.path.  ``UnknownExtra`` is raised if the ``EntryPoint`` has ``extras``,
     but no ``dist``, or if the named extras are not defined by the
-    distribution.  If `env` is supplied, it must be an ``Environment``, and it
+    distribution.  If ``env`` is supplied, it must be an ``Environment``, and it
     will be used to search for needed distributions if they are not already
-    present on sys.path.  If `installer` is supplied, it must be a callable
+    present on sys.path.  If ``installer`` is supplied, it must be a callable
     taking a ``Requirement`` instance and returning a matching importable
     ``Distribution`` instance or None.
 
@@ -872,16 +872,16 @@ available distributions, respectively.)  You can also obtain ``Distribution``
 objects from one of these high-level APIs:
 
 ``find_distributions(path_item, only=False)``
-    Yield distributions accessible via `path_item`.  If `only` is true, yield
-    only distributions whose ``location`` is equal to `path_item`.  In other
-    words, if `only` is true, this yields any distributions that would be
-    importable if `path_item` were on ``sys.path``.  If `only` is false, this
-    also yields distributions that are "in" or "under" `path_item`, but would
+    Yield distributions accessible via ``path_item``.  If ``only`` is true, yield
+    only distributions whose ``location`` is equal to ``path_item``.  In other
+    words, if ``only`` is true, this yields any distributions that would be
+    importable if ``path_item`` were on ``sys.path``.  If ``only`` is false, this
+    also yields distributions that are "in" or "under" ``path_item``, but would
     not be importable unless their locations were also added to ``sys.path``.
 
 ``get_distribution(dist_spec)``
     Return a ``Distribution`` object for a given ``Requirement`` or string.
-    If `dist_spec` is already a ``Distribution`` instance, it is returned.
+    If ``dist_spec`` is already a ``Distribution`` instance, it is returned.
     If it is a ``Requirement`` object or a string that can be parsed into one,
     it is used to locate and activate a matching distribution, which is then
     returned.
@@ -890,18 +890,18 @@ However, if you're creating specialized tools for working with distributions,
 or creating a new distribution format, you may also need to create
 ``Distribution`` objects directly, using one of the three constructors below.
 
-These constructors all take an optional `metadata` argument, which is used to
-access any resources or metadata associated with the distribution.  `metadata`
+These constructors all take an optional ``metadata`` argument, which is used to
+access any resources or metadata associated with the distribution.  ``metadata``
 must be an object that implements the ``IResourceProvider`` interface, or None.
 If it is None, an ``EmptyProvider`` is used instead.  ``Distribution`` objects
 implement both the `IResourceProvider`_ and `IMetadataProvider Methods`_ by
-delegating them to the `metadata` object.
+delegating them to the ``metadata`` object.
 
 ``Distribution.from_location(location, basename, metadata=None, **kw)`` (classmethod)
-    Create a distribution for `location`, which must be a string such as a
+    Create a distribution for ``location``, which must be a string such as a
     URL, filename, or other string that might be used on ``sys.path``.
-    `basename` is a string naming the distribution, like ``Foo-1.2-py2.4.egg``.
-    If `basename` ends with ``.egg``, then the project's name, version, python
+    ``basename`` is a string naming the distribution, like ``Foo-1.2-py2.4.egg``.
+    If ``basename`` ends with ``.egg``, then the project's name, version, python
     version and platform are extracted from the filename and used to set those
     properties of the created distribution.  Any additional keyword arguments
     are forwarded to the ``Distribution()`` constructor.
@@ -917,8 +917,8 @@ delegating them to the `metadata` object.
 
 ``Distribution(location,metadata,project_name,version,py_version,platform,precedence)``
     Create a distribution by setting its properties.  All arguments are
-    optional and default to None, except for `py_version` (which defaults to
-    the current Python version) and `precedence` (which defaults to
+    optional and default to None, except for ``py_version`` (which defaults to
+    the current Python version) and ``precedence`` (which defaults to
     ``EGG_DIST``; for more details see ``precedence`` under `Distribution
     Attributes`_ below).  Note that it's usually easier to use the
     ``from_filename()`` or ``from_location()`` constructors than to specify
@@ -938,7 +938,7 @@ project_name
     A string, naming the project that this distribution is for.  Project names
     are defined by a project's setup script, and they are used to identify
     projects on PyPI.  When a ``Distribution`` is constructed, the
-    `project_name` argument is passed through the ``safe_name()`` utility
+    ``project_name`` argument is passed through the ``safe_name()`` utility
     function to filter out any unacceptable characters.
 
 key
@@ -952,9 +952,9 @@ extras
 
 version
     A string denoting what release of the project this distribution contains.
-    When a ``Distribution`` is constructed, the `version` argument is passed
+    When a ``Distribution`` is constructed, the ``version`` argument is passed
     through the ``safe_version()`` utility function to filter out any
-    unacceptable characters.  If no `version` is specified at construction
+    unacceptable characters.  If no ``version`` is specified at construction
     time, then attempting to access this attribute later will cause the
     ``Distribution`` to try to discover its version by reading its ``PKG-INFO``
     metadata file.  If ``PKG-INFO`` is unavailable or can't be parsed,
@@ -967,7 +967,7 @@ parsed_version
     distributions by version.  (See the `Parsing Utilities`_ section below for
     more information on the ``parse_version()`` function.)  Note that accessing
     ``parsed_version`` may result in a ``ValueError`` if the ``Distribution``
-    was constructed without a `version` and without `metadata` capable of
+    was constructed without a ``version`` and without ``metadata`` capable of
     supplying the missing version info.
 
 py_version
@@ -998,9 +998,9 @@ precedence
 ------------------------
 
 ``activate(path=None)``
-    Ensure distribution is importable on `path`.  If `path` is None,
+    Ensure distribution is importable on ``path``.  If ``path`` is None,
     ``sys.path`` is used instead.  This ensures that the distribution's
-    ``location`` is in the `path` list, and it also performs any necessary
+    ``location`` is in the ``path`` list, and it also performs any necessary
     namespace package fixups or declarations.  (That is, if the distribution
     contains namespace packages, this method ensures that they are declared,
     and that the distribution's contents for those namespace packages are
@@ -1020,7 +1020,7 @@ precedence
 
 ``requires(extras=())``
     List the ``Requirement`` objects that specify this distribution's
-    dependencies.  If `extras` is specified, it should be a sequence of names
+    dependencies.  If ``extras`` is specified, it should be a sequence of names
     of "extras" defined by the distribution, and the list returned will then
     include any dependencies needed to support the named "extras".
 
@@ -1047,11 +1047,11 @@ by the distribution.  See the section above on `Entry Points`_ for more
 detailed information about these operations:
 
 ``get_entry_info(group, name)``
-    Return the ``EntryPoint`` object for `group` and `name`, or None if no
+    Return the ``EntryPoint`` object for ``group`` and ``name``, or None if no
     such point is advertised by this distribution.
 
 ``get_entry_map(group=None)``
-    Return the entry point map for `group`.  If `group` is None, return
+    Return the entry point map for ``group``.  If ``group`` is None, return
     a dictionary mapping group names to entry point maps for all groups.
     (An entry point map is a dictionary of entry point names to ``EntryPoint``
     objects.)
@@ -1079,8 +1079,8 @@ documented in later sections):
 * ``resource_isdir(resource_name)``
 * ``resource_listdir(resource_name)``
 
-If the distribution was created with a `metadata` argument, these resource and
-metadata access methods are all delegated to that `metadata` provider.
+If the distribution was created with a ``metadata`` argument, these resource and
+metadata access methods are all delegated to that ``metadata`` provider.
 Otherwise, they are delegated to an ``EmptyProvider``, so that the distribution
 will appear to have no resources or metadata.  This delegation approach is used
 so that supporting custom importers or new distribution formats can be done
@@ -1112,11 +1112,11 @@ Thus, you can use the APIs below without needing an explicit
 Basic Resource Access
 ---------------------
 
-In the following methods, the `package_or_requirement` argument may be either
+In the following methods, the ``package_or_requirement`` argument may be either
 a Python package/module name (e.g. ``foo.bar``) or a ``Requirement`` instance.
 If it is a package or module name, the named module or package must be
 importable (i.e., be in a distribution or directory on ``sys.path``), and the
-`resource_name` argument is interpreted relative to the named package.  (Note
+``resource_name`` argument is interpreted relative to the named package.  (Note
 that if a module name is used, then the resource name is relative to the
 package immediately containing the named module.  Also, you should not use use
 a namespace package name, because a namespace package can be spread across
@@ -1127,7 +1127,7 @@ If it is a ``Requirement``, then the requirement is automatically resolved
 (searching the current ``Environment`` if necessary) and a matching
 distribution is added to the ``WorkingSet`` and ``sys.path`` if one was not
 already present.  (Unless the ``Requirement`` can't be satisfied, in which
-case an exception is raised.)  The `resource_name` argument is then interpreted
+case an exception is raised.)  The ``resource_name`` argument is then interpreted
 relative to the root of the identified distribution; i.e. its first path
 segment will be treated as a peer of the top-level modules or packages in the
 distribution.
@@ -1229,12 +1229,12 @@ no need to use these methods.  Unlike the other methods listed above, they are
 you must therefore have an explicit ``ResourceManager`` instance to use them.
 
 ``get_cache_path(archive_name, names=())``
-    Return absolute location in cache for `archive_name` and `names`
+    Return absolute location in cache for ``archive_name`` and ``names``
 
     The parent directory of the resulting path will be created if it does
-    not already exist.  `archive_name` should be the base filename of the
+    not already exist.  ``archive_name`` should be the base filename of the
     enclosing egg (which may not be the name of the enclosing zipfile!),
-    including its ".egg" extension.  `names`, if provided, should be a
+    including its ".egg" extension.  ``names``, if provided, should be a
     sequence of path name parts "under" the egg's extraction location.
 
     This method should only be called by resource providers that need to
@@ -1250,12 +1250,12 @@ you must therefore have an explicit ``ResourceManager`` instance to use them.
     wrap or handle extraction errors themselves.
 
 ``postprocess(tempname, filename)``
-    Perform any platform-specific postprocessing of `tempname`.
+    Perform any platform-specific postprocessing of ``tempname``.
     Resource providers should call this method ONLY after successfully
     extracting a compressed resource.  They must NOT call it on resources
     that are already in the filesystem.
 
-    `tempname` is the current (temporary) name of the file, and `filename`
+    ``tempname`` is the current (temporary) name of the file, and ``filename``
     is the name it will be renamed to by the caller after this routine
     returns.
 
@@ -1323,7 +1323,7 @@ implement the ``IMetadataProvider`` or ``IResourceProvider`` interfaces are:
 ``run_script(script_name, namespace)``
     Execute the named script in the supplied namespace dictionary.  Raises
     ``ResolutionError`` if there is no script by that name in the ``scripts``
-    metadata directory.  `namespace` should be a Python dictionary, usually
+    metadata directory.  ``namespace`` should be a Python dictionary, usually
     a module dictionary if the script is being run as a module.
 
 
@@ -1380,11 +1380,11 @@ with other (PEP 302-compatible) importers or module loaders, you may need to
 register various handlers and support functions using these APIs:
 
 ``register_finder(importer_type, distribution_finder)``
-    Register `distribution_finder` to find distributions in ``sys.path`` items.
-    `importer_type` is the type or class of a PEP 302 "Importer" (``sys.path``
-    item handler), and `distribution_finder` is a callable that, when passed a
-    path item, the importer instance, and an `only` flag, yields
-    ``Distribution`` instances found under that path item.  (The `only` flag,
+    Register ``distribution_finder`` to find distributions in ``sys.path`` items.
+    ``importer_type`` is the type or class of a PEP 302 "Importer" (``sys.path``
+    item handler), and ``distribution_finder`` is a callable that, when passed a
+    path item, the importer instance, and an ``only`` flag, yields
+    ``Distribution`` instances found under that path item.  (The ``only`` flag,
     if true, means the finder should yield only ``Distribution`` objects whose
     ``location`` is equal to the path item provided.)
 
@@ -1392,16 +1392,16 @@ register various handlers and support functions using these APIs:
     example finder function.
 
 ``register_loader_type(loader_type, provider_factory)``
-    Register `provider_factory` to make ``IResourceProvider`` objects for
-    `loader_type`.  `loader_type` is the type or class of a PEP 302
-    ``module.__loader__``, and `provider_factory` is a function that, when
+    Register ``provider_factory`` to make ``IResourceProvider`` objects for
+    ``loader_type``.  ``loader_type`` is the type or class of a PEP 302
+    ``module.__loader__``, and ``provider_factory`` is a function that, when
     passed a module object, returns an `IResourceProvider`_ for that module,
     allowing it to be used with the `ResourceManager API`_.
 
 ``register_namespace_handler(importer_type, namespace_handler)``
-    Register `namespace_handler` to declare namespace packages for the given
-    `importer_type`.  `importer_type` is the type or class of a PEP 302
-    "importer" (sys.path item handler), and `namespace_handler` is a callable
+    Register ``namespace_handler`` to declare namespace packages for the given
+    ``importer_type``.  ``importer_type`` is the type or class of a PEP 302
+    "importer" (sys.path item handler), and ``namespace_handler`` is a callable
     with a signature like this::
 
         def namespace_handler(importer, path_entry, moduleName, module):
@@ -1421,23 +1421,23 @@ IResourceProvider
 -----------------
 
 ``IResourceProvider`` is an abstract class that documents what methods are
-required of objects returned by a `provider_factory` registered with
+required of objects returned by a ``provider_factory`` registered with
 ``register_loader_type()``.  ``IResourceProvider`` is a subclass of
 ``IMetadataProvider``, so objects that implement this interface must also
 implement all of the `IMetadataProvider Methods`_ as well as the methods
-shown here.  The `manager` argument to the methods below must be an object
+shown here.  The ``manager`` argument to the methods below must be an object
 that supports the full `ResourceManager API`_ documented above.
 
 ``get_resource_filename(manager, resource_name)``
-    Return a true filesystem path for `resource_name`, coordinating the
-    extraction with `manager`, if the resource must be unpacked to the
+    Return a true filesystem path for ``resource_name``, coordinating the
+    extraction with ``manager``, if the resource must be unpacked to the
     filesystem.
 
 ``get_resource_stream(manager, resource_name)``
-    Return a readable file-like object for `resource_name`.
+    Return a readable file-like object for ``resource_name``.
 
 ``get_resource_string(manager, resource_name)``
-    Return a string containing the contents of `resource_name`.
+    Return a string containing the contents of ``resource_name``.
 
 ``has_resource(resource_name)``
     Does the package contain the named resource?
@@ -1501,15 +1501,15 @@ where appropriate.  Their inheritance tree looks like this::
 
 ``PathMetadata(path, egg_info)``
     Create an ``IResourceProvider`` for a filesystem-based distribution, where
-    `path` is the filesystem location of the importable modules, and `egg_info`
+    ``path`` is the filesystem location of the importable modules, and ``egg_info``
     is the filesystem location of the distribution's metadata directory.
-    `egg_info` should usually be the ``EGG-INFO`` subdirectory of `path` for an
-    "unpacked egg", and a ``ProjectName.egg-info`` subdirectory of `path` for
+    ``egg_info`` should usually be the ``EGG-INFO`` subdirectory of ``path`` for an
+    "unpacked egg", and a ``ProjectName.egg-info`` subdirectory of ``path`` for
     a "development egg".  However, other uses are possible for custom purposes.
 
 ``EggMetadata(zipimporter)``
     Create an ``IResourceProvider`` for a zipfile-based distribution.  The
-    `zipimporter` should be a ``zipimport.zipimporter`` instance, and may
+    ``zipimporter`` should be a ``zipimport.zipimporter`` instance, and may
     represent a "basket" (a zipfile containing multiple ".egg" subdirectories)
     a specific egg *within* a basket, or a zipfile egg (where the zipfile
     itself is a ".egg").  It can also be a combination, such as a zipfile egg
@@ -1547,12 +1547,12 @@ Parsing Utilities
 
 ``yield_lines(strs)``
     Yield non-empty/non-comment lines from a string/unicode or a possibly-
-    nested sequence thereof.  If `strs` is an instance of ``basestring``, it
+    nested sequence thereof.  If ``strs`` is an instance of ``basestring``, it
     is split into lines, and each non-blank, non-comment line is yielded after
     stripping leading and trailing whitespace.  (Lines whose first non-blank
     character is ``#`` are considered comment lines.)
 
-    If `strs` is not an instance of ``basestring``, it is iterated over, and
+    If ``strs`` is not an instance of ``basestring``, it is iterated over, and
     each item is passed recursively to ``yield_lines()``, so that an arbitrarily
     nested sequence of strings, or sequences of sequences of strings can be
     flattened out to the lines contained therein.  So for example, passing
@@ -1636,15 +1636,15 @@ Platform Utilities
     ``compatible_platforms()`` function.
 
 ``compatible_platforms(provided, required)``
-    Return true if a distribution built on the `provided` platform may be used
-    on the `required` platform.  If either platform value is ``None``, it is
+    Return true if a distribution built on the ``provided`` platform may be used
+    on the ``required`` platform.  If either platform value is ``None``, it is
     considered a wildcard, and the platforms are therefore compatible.
     Likewise, if the platform strings are equal, they're also considered
     compatible, and ``True`` is returned.  Currently, the only non-equal
     platform strings that are considered compatible are macOS platform
     strings with the same hardware type (e.g. ``ppc``) and major version
-    (e.g. ``10``) with the `provided` platform's minor version being less than
-    or equal to the `required` platform's minor version.
+    (e.g. ``10``) with the ``provided`` platform's minor version being less than
+    or equal to the ``required`` platform's minor version.
 
 ``get_default_cache()``
     Determine the default cache location for extracting resources from zipped
@@ -1666,14 +1666,14 @@ File/Path Utilities
 -------------------
 
 ``ensure_directory(path)``
-    Ensure that the parent directory (``os.path.dirname``) of `path` actually
+    Ensure that the parent directory (``os.path.dirname``) of ``path`` actually
     exists, using ``os.makedirs()`` if necessary.
 
 ``normalize_path(path)``
-    Return a "normalized" version of `path`, such that two paths represent
+    Return a "normalized" version of ``path``, such that two paths represent
     the same filesystem location if they have equal ``normalized_path()``
     values.  Specifically, this is a shortcut for calling ``os.path.realpath``
-    and ``os.path.normcase`` on `path`.  Unfortunately, on certain platforms
+    and ``os.path.normcase`` on ``path``.  Unfortunately, on certain platforms
     (notably Cygwin and macOS) the ``normcase`` function does not accurately
     reflect the platform's case-sensitivity, so there is always the possibility
     of two apparently-different paths being equal on such platforms.
diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst
index 809491541d..03ce9fa23a 100644
--- a/docs/references/keywords.rst
+++ b/docs/references/keywords.rst
@@ -286,7 +286,7 @@ Keywords
     this argument.  The named class must be instantiable with no arguments, and
     its instances must support the ``loadTestsFromNames()`` method as defined
     in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
-    pass only one test "name" in the `names` argument: the value supplied for
+    pass only one test "name" in the ``names`` argument: the value supplied for
     the ``test_suite`` argument.  The loader you specify may interpret this
     string in any way it likes, as there are no restrictions on what may be
     contained in a ``test_suite`` string.
diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index 2228bd158c..bc66869b6e 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -201,7 +201,7 @@ obsoletes                                          list-comma
     string in such a file, so validation is stricter in this case.
 
 Notes:
-1. The `version` file attribute has only been supported since 39.2.0.
+1. The ``version`` file attribute has only been supported since 39.2.0.
 
 Options
 -------
@@ -237,12 +237,12 @@ data_files               dict                                 40.6.0
 
     **packages** - The ``find:`` and ``find_namespace:`` directive can be further configured
     in a dedicated subsection ``options.packages.find``. This subsection
-    accepts the same keys as the `setuptools.find_packages` and the
-    `setuptools.find_namespace_packages` function:
+    accepts the same keys as the ``setuptools.find_packages`` and the
+    ``setuptools.find_namespace_packages`` function:
     ``where``, ``include``, and ``exclude``.
 
     **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
 
 Notes:
-1. In the `package_data` section, a key named with a single asterisk (`*`)
-refers to all packages, in lieu of the empty string used in `setup.py`.
+1. In the ``package_data`` section, a key named with a single asterisk (``*``)
+refers to all packages, in lieu of the empty string used in ``setup.py``.
diff --git a/docs/userguide/keywords.rst b/docs/userguide/keywords.rst
index 58fe74bc4a..268e4f4238 100644
--- a/docs/userguide/keywords.rst
+++ b/docs/userguide/keywords.rst
@@ -124,7 +124,7 @@ unless you need the associated ``setuptools`` feature.
     this argument.  The named class must be instantiable with no arguments, and
     its instances must support the ``loadTestsFromNames()`` method as defined
     in the Python ``unittest`` module's ``TestLoader`` class.  Setuptools will
-    pass only one test "name" in the `names` argument: the value supplied for
+    pass only one test "name" in the ``names`` argument: the value supplied for
     the ``test_suite`` argument.  The loader you specify may interpret this
     string in any way it likes, as there are no restrictions on what may be
     contained in a ``test_suite`` string.
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 3ee4fc8c19..24ea3e4b52 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -21,8 +21,7 @@ the backend (build system) it wants to use. The distribution can then
 be generated with whatever tools that provides a ``build sdist``-alike
 functionality. While this may appear cumbersome, given the added pieces,
 it in fact tremendously enhances the portability of your package. The
-change is driven under `PEP 517 <https://www.python.org/dev/peps/pep-0517/#
-build-requirements>``. To learn more about Python packaging in general,
+change is driven under :pep:`517 <517#build-requirements>`. To learn more about Python packaging in general,
 navigate to the `bottom <Resources on python packaging>`_ of this page.
 
 

From 3d9fc0b61f77c2604e6c04efa14c53ee33836b34 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 01:17:45 +0200
Subject: [PATCH 8205/8469] Add a change note

---
 changelog.d/2427.doc.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/2427.doc.rst

diff --git a/changelog.d/2427.doc.rst b/changelog.d/2427.doc.rst
new file mode 100644
index 0000000000..bec964ffc4
--- /dev/null
+++ b/changelog.d/2427.doc.rst
@@ -0,0 +1,2 @@
+Started enforcing strict syntax and reference validation
+in the Sphinx docs -- by :user:`webknjaz`

From b413a986d7cf3c71384329371d14c4b462ee0c99 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 02:22:24 +0200
Subject: [PATCH 8206/8469] =?UTF-8?q?=F0=9F=94=A5=20Get=20rid=20of=20the?=
 =?UTF-8?q?=20unused=20sphinx=20`Makefile`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Makefile | 75 ---------------------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 docs/Makefile

diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 30bf10a930..0000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html      to make standalone HTML files"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
-	@echo "  htmlhelp  to make HTML files and a HTML help project"
-	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  changes   to make an overview over all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
-
-clean:
-	-rm -rf build/*
-
-html:
-	mkdir -p build/html build/doctrees
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
-	@echo
-	@echo "Build finished. The HTML pages are in build/html."
-
-pickle:
-	mkdir -p build/pickle build/doctrees
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-web: pickle
-
-json:
-	mkdir -p build/json build/doctrees
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	mkdir -p build/htmlhelp build/doctrees
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in build/htmlhelp."
-
-latex:
-	mkdir -p build/latex build/doctrees
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in build/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
-
-changes:
-	mkdir -p build/changes build/doctrees
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
-	@echo
-	@echo "The overview file is in build/changes."
-
-linkcheck:
-	mkdir -p build/linkcheck build/doctrees
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in build/linkcheck/output.txt."

From 438af387ddd07211fb87f047adad49cf5ab48270 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 16 Oct 2020 02:27:00 +0200
Subject: [PATCH 8207/8469] Add a change note

---
 changelog.d/2428.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2428.doc.rst

diff --git a/changelog.d/2428.doc.rst b/changelog.d/2428.doc.rst
new file mode 100644
index 0000000000..43586b0e14
--- /dev/null
+++ b/changelog.d/2428.doc.rst
@@ -0,0 +1 @@
+Removed redundant Sphinx ``Makefile`` support -- by :user:`webknjaz`

From a7e930914e1d5baed8a646ae5a0be65a9c97d07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com>
Date: Sat, 17 Oct 2020 16:54:56 +0800
Subject: [PATCH 8208/8469] Restore quickstart.rst

---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 64be2cb9f2..24ea3e4b52 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -81,8 +81,8 @@ Automatic package discovery
 For simple projects, it's usually easy enough to manually add packages to
 the ``packages`` keyword in ``setup.cfg``.  However, for very large projects
 , it can be a big burden to keep the package list updated. ``setuptools``
-therefore provides two convenient tools to ease the burden: ``find:\ `` and
-``find_namespace:\ ``. To use it in your project:
+therefore provides two convenient tools to ease the burden: :literal:`find:\ ` and
+:literal:`find_namespace:\ `. To use it in your project:
 
 .. code-block:: ini
 

From 23f874ca386f8f33beae3e287b866af79f97415f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 11:56:01 -0400
Subject: [PATCH 8209/8469] Prefer doc role to ref role.

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
---
 docs/userguide/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 7abc7903fc..18679c5486 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -16,7 +16,7 @@ Transition to PEP517
 Since setuptools no longer serves as the default build tool, one must explicitly
 opt in (by providing a :file:`pyproject.toml` file) to use this library. The user
 facing part is provided by tools such as pip and
-backend interface is described :ref:`in this document <../build_meta>`. The
+backend interface is described :doc:`in this document <../build_meta>`. The
 quickstart provides an overview of the new workflow.
 
 .. toctree::

From de66347b5ededaf3296c2d8a5207534f8e803996 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 12:00:02 -0400
Subject: [PATCH 8210/8469] Defer to default behavior for fail fast for now.

---
 .github/workflows/python-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 96e1430879..2ee7c0fbf5 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -16,7 +16,6 @@ jobs:
       ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       # max-parallel: 5
       matrix:
         python-version:

From 7ff173926c4773d39f3320ff0c9d65afb290e7b1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 12:04:28 -0400
Subject: [PATCH 8211/8469] =?UTF-8?q?Bump=20version:=2050.3.1=20=E2=86=92?=
 =?UTF-8?q?=2050.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          |  2 +-
 CHANGES.rst               | 22 ++++++++++++++++++++++
 changelog.d/2394.doc.rst  |  3 ---
 changelog.d/2401.misc.rst |  2 --
 changelog.d/2420.misc.rst |  1 -
 changelog.d/2421.misc.rst |  2 --
 changelog.d/2427.doc.rst  |  2 --
 changelog.d/2428.doc.rst  |  1 -
 setup.cfg                 |  2 +-
 9 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 changelog.d/2394.doc.rst
 delete mode 100644 changelog.d/2401.misc.rst
 delete mode 100644 changelog.d/2420.misc.rst
 delete mode 100644 changelog.d/2421.misc.rst
 delete mode 100644 changelog.d/2427.doc.rst
 delete mode 100644 changelog.d/2428.doc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 57cc3f1831..97840e4275 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.3.1
+current_version = 50.3.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index c96fb0bc9d..ab03c20abf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,25 @@
+v50.3.2
+-------
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2394: Extended towncrier news template to include change note categories.
+  This allows to see what types of changes a given version introduces
+  -- by :user:`webknjaz`
+* #2427: Started enforcing strict syntax and reference validation
+  in the Sphinx docs -- by :user:`webknjaz`
+* #2428: Removed redundant Sphinx ``Makefile`` support -- by :user:`webknjaz`
+
+Misc
+^^^^
+* #2401: Enabled test results reporting in AppVeyor CI
+  -- by :user:`webknjaz`
+* #2420: Replace Python 3.9.0 beta with 3.9.0 final on GitHub Actions.
+* #2421: Python 3.9 Trove classifier got added to the dist metadata
+  -- by :user:`webknjaz`
+
+
 v50.3.1
 -------
 
diff --git a/changelog.d/2394.doc.rst b/changelog.d/2394.doc.rst
deleted file mode 100644
index 338e8895d5..0000000000
--- a/changelog.d/2394.doc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Extended towncrier news template to include change note categories.
-This allows to see what types of changes a given version introduces
--- by :user:`webknjaz`
diff --git a/changelog.d/2401.misc.rst b/changelog.d/2401.misc.rst
deleted file mode 100644
index 924880a37f..0000000000
--- a/changelog.d/2401.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Enabled test results reporting in AppVeyor CI
--- by :user:`webknjaz`
diff --git a/changelog.d/2420.misc.rst b/changelog.d/2420.misc.rst
deleted file mode 100644
index 94984797ca..0000000000
--- a/changelog.d/2420.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replace Python 3.9.0 beta with 3.9.0 final on GitHub Actions.
diff --git a/changelog.d/2421.misc.rst b/changelog.d/2421.misc.rst
deleted file mode 100644
index 295f5de8d3..0000000000
--- a/changelog.d/2421.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Python 3.9 Trove classifier got added to the dist metadata
--- by :user:`webknjaz`
diff --git a/changelog.d/2427.doc.rst b/changelog.d/2427.doc.rst
deleted file mode 100644
index bec964ffc4..0000000000
--- a/changelog.d/2427.doc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Started enforcing strict syntax and reference validation
-in the Sphinx docs -- by :user:`webknjaz`
diff --git a/changelog.d/2428.doc.rst b/changelog.d/2428.doc.rst
deleted file mode 100644
index 43586b0e14..0000000000
--- a/changelog.d/2428.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed redundant Sphinx ``Makefile`` support -- by :user:`webknjaz`
diff --git a/setup.cfg b/setup.cfg
index 99846e9f3d..5ee3a8e98a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.3.1
+version = 50.3.2
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From 2ff24f67d5f69ac6c392a94ab1e6e2bbd885ec70 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 17 Oct 2020 19:07:22 +0200
Subject: [PATCH 8212/8469] =?UTF-8?q?=F0=9F=90=9B=F0=9F=93=9D=20Fix=20the?=
 =?UTF-8?q?=20TOC=20link=20to=20the=20relocated=20dev=20guide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change corrects the typo introduced by #2426.
---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index f8c4725815..b9a7964766 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -15,6 +15,6 @@ Documentation content:
    references/keywords
    roadmap
    setuptools
-   Development guide <developmen/index>
+   Development guide <development/index>
    Backward compatibility & deprecated practice <deprecated/index>
    Changelog <history>

From 9ab7bc54cf1eb1a0cb088e8157dc8c88c553b9c7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 13:14:24 -0400
Subject: [PATCH 8213/8469] Clean up syntax on entry_points.console_scripts.
 Fixes #2429.

---
 docs/userguide/quickstart.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index aebcf60fba..697087edb4 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -106,16 +106,15 @@ use, go to :ref:`package_discovery`
 Entry points and automatic script creation
 ===========================================
 Setuptools support automatic creation of scripts upon installation, that runs
-code within your package if you specify them with the ``entry_point`` keyword.
+code within your package if you specify them with the ``entry_points`` keyword.
 This is what allows you to run commands like ``pip install`` instead of having
 to type ``python -m pip install``. To accomplish this, add the entry_points
 keyword in your ``setup.cfg``:
 
 .. code-block:: ini
 
-    [options]
-    entry_points =
-        [console_script]
+    [options.entry_points]
+    console_scripts =
         main = mypkg:some_func
 
 When this project is installed, a ``main`` script will be installed and will

From e711cb076ddd0813351745050b89d77f6387cf35 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 17 Oct 2020 19:21:30 +0200
Subject: [PATCH 8214/8469] =?UTF-8?q?=F0=9F=90=9B=F0=9F=93=9D=20Fix=20"Tit?=
 =?UTF-8?q?le=20level=20inconsistent"=20in=20changelog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was caused by #2399 CI invocation happening before
merging PR #2427 that made Sphinx nitpicky.
---
 CHANGES.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index ab03c20abf..30750c0aa0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3080,7 +3080,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
   connection.
 
 Backward-Incompatible Changes
-=============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This release includes a couple of backward-incompatible changes, but most if
 not all users will find 1.0 a drop-in replacement for 0.9.
@@ -3670,12 +3670,12 @@ how it parses version numbers.
 -----
 
 setuptools
-==========
+^^^^^^^^^^
 
 * Fixed a bunch of calls to file() that caused crashes on Python 3.
 
 bootstrapping
-=============
+^^^^^^^^^^^^^
 
 * Fixed a bug in sorting that caused bootstrap to fail on Python 3.
 
@@ -3683,7 +3683,7 @@ bootstrapping
 -----
 
 setuptools
-==========
+^^^^^^^^^^
 
 * Added Python 3 support; see docs/python3.txt.
   This closes Old Setuptools #39.
@@ -3701,7 +3701,7 @@ setuptools
   This closes Old Setuptools #41.
 
 bootstrapping
-=============
+^^^^^^^^^^^^^
 
 * Fixed bootstrap not working on Windows. This closes issue Distribute #49.
 
@@ -3714,7 +3714,7 @@ bootstrapping
 -----
 
 setuptools
-==========
+^^^^^^^^^^
 
 * package_index.urlopen now catches BadStatusLine and malformed url errors.
   This closes Distribute #16 and Distribute #18.
@@ -3731,7 +3731,7 @@ setuptools
 
 
 bootstrapping
-=============
+^^^^^^^^^^^^^
 
 * The boostrap process leave setuptools alone if detected in the system
   and --root or --prefix is provided, but is not in the same location.
@@ -3741,7 +3741,7 @@ bootstrapping
 ---
 
 setuptools
-==========
+^^^^^^^^^^
 
 * Packages required at build time where not fully present at install time.
   This closes Distribute #12.
@@ -3758,7 +3758,7 @@ setuptools
 * Added compatibility with Subversion 1.6. This references Distribute #1.
 
 pkg_resources
-=============
+^^^^^^^^^^^^^
 
 * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API
   instead. Based on a patch from ronaldoussoren. This closes issue #5.
@@ -3775,7 +3775,7 @@ pkg_resources
 * Immediately close all file handles. This closes Distribute #3.
 
 easy_install
-============
+^^^^^^^^^^^^
 
 * Immediately close all file handles. This closes Distribute #3.
 

From a94c2c3d128582adb2457dd978bf98ce40ab11b9 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 17 Oct 2020 19:32:21 +0200
Subject: [PATCH 8215/8469] =?UTF-8?q?=F0=9F=93=9D=20Add=20change=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.d/2430.doc.1.rst | 2 ++
 changelog.d/2430.doc.2.rst | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/2430.doc.1.rst
 create mode 100644 changelog.d/2430.doc.2.rst

diff --git a/changelog.d/2430.doc.1.rst b/changelog.d/2430.doc.1.rst
new file mode 100644
index 0000000000..d09e0b9e7b
--- /dev/null
+++ b/changelog.d/2430.doc.1.rst
@@ -0,0 +1,2 @@
+Fixed a typo in Sphinx docs that made docs dev section disappear
+as a result of PR #2426 -- by :user:`webknjaz`
diff --git a/changelog.d/2430.doc.2.rst b/changelog.d/2430.doc.2.rst
new file mode 100644
index 0000000000..0ac8782323
--- /dev/null
+++ b/changelog.d/2430.doc.2.rst
@@ -0,0 +1,2 @@
+Fixed inconsistent RST title nesting levels caused by #2399
+-- by :user:`webknjaz`

From 6d33d5dda0400c31d7f7c3a8054b7802273b0fb0 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 17 Oct 2020 19:47:33 +0200
Subject: [PATCH 8216/8469] =?UTF-8?q?=F0=9F=93=9D=20Update=20devguide=20li?=
 =?UTF-8?q?nks=20in=20the=20PR=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is necessary because the document has been moved in PR #2426.
---
 .github/pull_request_template.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index aa5508076e..ef5a98e727 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-<!-- First time contributors: Take a moment to review https://setuptools.readthedocs.io/en/latest/developer-guide.html! -->
+<!-- First time contributors: Take a moment to review https://setuptools.readthedocs.io/en/latest/development/developer-guide.html! -->
 <!-- Remove sections if not applicable -->
 
 ## Summary of changes
@@ -9,4 +9,10 @@ Closes <!-- issue number here -->
 
 ### Pull Request Checklist
 - [ ] Changes have tests
-- [ ] News fragment added in changelog.d. See [documentation](http://setuptools.readthedocs.io/en/latest/developer-guide.html#making-a-pull-request) for details
+- [ ] News fragment added in [`changelog.d/`].
+  _(See [documentation][PR docs] for details)_
+
+
+[`changelog.d/`]: https://github.com/pypa/setuptools/tree/master/changelog.d
+[PR docs]:
+https://setuptools.readthedocs.io/en/latest/development/developer-guide.html#making-a-pull-request

From 38de858e37f9c7a90498ea78c78ed76aca835ad2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 16:32:23 -0400
Subject: [PATCH 8217/8469] Update changelog

---
 changelog.d/2435.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2435.breaking.rst

diff --git a/changelog.d/2435.breaking.rst b/changelog.d/2435.breaking.rst
new file mode 100644
index 0000000000..d29c60eb39
--- /dev/null
+++ b/changelog.d/2435.breaking.rst
@@ -0,0 +1 @@
+Require Python 3.6 or later.

From 66ca4205ee7e017d6c10346f0bd71fcfc556211f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 21:36:34 -0400
Subject: [PATCH 8218/8469] Use 'virtualenv.python'. Fixes #2434.

---
 setuptools/tests/test_virtualenv.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index b555ce4f62..c8ed9e57ea 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -168,8 +168,9 @@ def sdist(distname, version):
             open('success', 'w').close()
             '''))
     # Run test command for test package.
-    virtualenv.run(
-        ['python', 'setup.py', 'test', '-s', 'test'], cd=str(tmpdir))
+    # use 'virtualenv.python' as workaround for man-group/pytest-plugins#166
+    cmd = [virtualenv.python, 'setup.py', 'test', '-s', 'test']
+    virtualenv.run(cmd, cd=str(tmpdir))
     assert tmpdir.join('success').check()
 
 

From 3dd7313d5e61dabd7bf7c647af1eeb6d72a75a6c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 17 Oct 2020 22:06:26 -0400
Subject: [PATCH 8219/8469] Bump PPC runs

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 918b9745be..8b945bd336 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ jobs:
   - arch: ppc64le
     python: pypy3
   - arch: ppc64le
-    python: 3.5
+    python: 3.6
   - &latest_py3_ppc
     arch: ppc64le
     python: 3.8

From 97ee66249afed0f38f4266c1280e28af1882fabd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Oct 2020 13:12:15 -0400
Subject: [PATCH 8220/8469] Remove Python 3.5 from Appveyor tests

---
 appveyor.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4d1ae55f4f..8c24ec3f51 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,10 +20,6 @@ environment:
       PYTHON: "C:\\Python37-x64"
     - APPVEYOR_JOB_NAME: "python36-x64"
       PYTHON: "C:\\Python36-x64"
-    - APPVEYOR_JOB_NAME: "python35-x64"
-      PYTHON: "C:\\Python35-x64"
-      PYTEST_ADDOPTS: "--cov"
-      TOX_TESTENV_PASSENV: "PYTEST_ADDOPTS"
 
 install:
   # symlink python from a directory with a space

From 7cf674e13dbaa2a3c5ef54b22d3af4c380e6b006 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 18 Oct 2020 19:35:09 +0200
Subject: [PATCH 8221/8469] Reconstruct changelog with categories from history

---
 CHANGES.rst | 417 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 416 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 30750c0aa0..567b2bac76 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,7 @@ v50.3.2
 -------
 
 
+
 Documentation changes
 ^^^^^^^^^^^^^^^^^^^^^
 * #2394: Extended towncrier news template to include change note categories.
@@ -23,12 +24,19 @@ Misc
 v50.3.1
 -------
 
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #2093: Finalized doc revamp.
 * #2097: doc: simplify index and group deprecated files
 * #2102: doc overhaul step 2: break main doc into multiple sections
 * #2111: doc overhaul step 3: update userguide
 * #2395: Added a ``:user:`` role to Sphinx config -- by :user:`webknjaz`
 * #2395: Added an illustrative explanation about the change notes to fragments dir -- by :user:`webknjaz`
+
+Misc
+^^^^
 * #2379: Travis CI test suite now tests against PPC64.
 * #2413: Suppress EOF errors (and other exceptions) when importing lib2to3.
 
@@ -36,12 +44,20 @@ v50.3.1
 v50.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2368: In distutils, restore support for monkeypatched CCompiler.spawn per pypa/distutils#15.
 
 
 v50.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2355: When pip is imported as part of a build, leave distutils patched.
 * #2380: There are some setuptools specific changes in the
   ``setuptools.command.bdist_rpm`` module that are no longer needed, because
@@ -52,24 +68,40 @@ v50.2.0
 v50.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2350: Setuptools reverts using the included distutils by default. Platform maintainers and system integrators and others are *strongly* encouraged to set ``SETUPTOOLS_USE_DISTUTILS=local`` to help identify and work through the reported issues with distutils adoption, mainly to file issues and pull requests with pypa/distutils such that distutils performs as needed across every supported environment.
 
 
 v50.0.3
 -------
 
+
+
+Misc
+^^^^
 * #2363: Restore link_libpython support on Python 3.7 and earlier (see pypa/distutils#9).
 
 
 v50.0.2
 -------
 
+
+
+Misc
+^^^^
 * #2352: In distutils hack, use absolute import rather than relative to avoid bpo-30876.
 
 
 v50.0.1
 -------
 
+
+
+Misc
+^^^^
 * #2357: Restored Python 3.5 support in distutils.util for missing ``subprocess._optim_args_from_interpreter_flags``.
 * #2358: Restored AIX support on Python 3.8 and earlier.
 * #2361: Add Python 3.10 support to _distutils_hack. Get the 'Loader' abstract class
@@ -80,19 +112,34 @@ v50.0.1
 v50.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #2232: Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed.
+
+Changes
+^^^^^^^
 * #2334: In MSVC module, refine text in error message.
 
 
 v49.6.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2129: In pkg_resources, no longer detect any pathname ending in .egg as a Python egg. Now the path must be an unpacked egg or a zip file.
 
 
 v49.5.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2306: When running as a PEP 517 backend, setuptools does not try to install
   ``setup_requires`` itself. They are reported as build requirements for the
   frontend to install.
@@ -101,43 +148,74 @@ v49.5.0
 v49.4.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2310: Updated vendored packaging version to 20.4.
 
 
 v49.3.2
 -------
 
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #2300: Improve the ``safe_version`` function documentation
+
+Misc
+^^^^
 * #2297: Once again, in stubs prefer exec_module to the deprecated load_module.
 
 
 v49.3.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #2316: Removed warning when ``distutils`` is imported before ``setuptools`` when ``distutils`` replacement is not enabled.
 
 
 v49.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2259: Setuptools now provides a .pth file (except for editable installs of setuptools) to the target environment to ensure that when enabled, the setuptools-provided distutils is preferred before setuptools has been imported (and even if setuptools is never imported). Honors the SETUPTOOLS_USE_DISTUTILS environment variable.
 
 
 v49.2.1
 -------
 
+
+
+Misc
+^^^^
 * #2257: Fixed two flaws in distutils._msvccompiler.MSVCCompiler.spawn.
 
 
 v49.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2230: Now warn the user when setuptools is imported after distutils modules have been loaded (exempting PyPy for 3.6), directing the users of packages to import setuptools first.
 
 
 v49.1.3
 -------
 
+
+
+Misc
+^^^^
 * #2212: (Distutils) Allow spawn to accept environment. Avoid monkey-patching global state.
 * #2249: Fix extension loading technique in stubs.
 
@@ -145,39 +223,69 @@ v49.1.3
 v49.1.2
 -------
 
+
+
+Changes
+^^^^^^^
 * #2232: In preparation for re-enabling a local copy of distutils, Setuptools now honors an environment variable, SETUPTOOLS_USE_DISTUTILS. If set to 'stdlib' (current default), distutils will be used from the standard library. If set to 'local' (default in a imminent backward-incompatible release), the local copy of distutils will be used.
 
 
 v49.1.1
 -------
 
+
+
+Misc
+^^^^
 * #2094: Removed pkg_resources.py2_warn module, which is no longer reachable.
 
 
 v49.0.1
 -------
 
+
+
+Misc
+^^^^
 * #2228: Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file.
 
 
 v49.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2228: Disabled distutils adoption for now while emergent issues are addressed.
 
 
 v49.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #2165: Setuptools no longer installs a site.py file during easy_install or develop installs. As a result, .eggs on PYTHONPATH will no longer take precedence over other packages on sys.path. If this issue affects your production environment, please reach out to the maintainers at #2165.
+
+Changes
+^^^^^^^
 * #2137: Removed (private) pkg_resources.RequirementParseError, now replaced by packaging.requirements.InvalidRequirement. Kept the name for compatibility, but users should catch InvalidRequirement instead.
 * #2180: Update vendored packaging in pkg_resources to 19.2.
+
+Misc
+^^^^
 * #2199: Fix exception causes all over the codebase by using ``raise new_exception from old_exception``
 
 
 v48.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects.
   To avoid getting any legacy behavior from the standard library, projects are advised to always "import setuptools" prior to importing anything from distutils. This behavior happens by default when using ``pip install`` or ``pep517.build``. Workflows that rely on ``setup.py (anything)`` will need to first ensure setuptools is imported. One way to achieve this behavior without modifying code is to invoke Python thus: ``python -c "import setuptools; exec(open('setup.py').read())" (anything)``.
 
@@ -185,12 +293,20 @@ v48.0.0
 v47.3.2
 -------
 
+
+
+Misc
+^^^^
 * #2071: Replaced references to the deprecated imp package with references to importlib
 
 
 v47.3.1
 -------
 
+
+
+Misc
+^^^^
 * #1973: Removed ``pkg_resources.py31compat.makedirs`` in favor of the stdlib. Use ``os.makedirs()`` instead.
 * #2198: Restore ``__requires__`` directive in easy-install wrapper scripts.
 
@@ -198,22 +314,38 @@ v47.3.1
 v47.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2197: Console script wrapper for editable installs now has a unified template and honors importlib_metadata if present for faster script execution on older Pythons.
+
+Misc
+^^^^
 * #2195: Fix broken entry points generated by easy-install (pip editable installs).
 
 
 v47.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2194: Editable-installed entry points now load significantly faster on Python versions 3.8+.
 
 
 v47.1.1
 -------
 
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #2156: Update mailing list pointer in developer docs
 
 Incorporate changes from v44.1.1:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * #2158: Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.
 
@@ -221,25 +353,44 @@ Incorporate changes from v44.1.1:
 v44.1.1
 -------
 
+
+
+Misc
+^^^^
 * #2158: Avoid loading working set during ``Distribution.finalize_options`` prior to invoking ``_install_setup_requires``, broken since v42.0.0.
 
 
 v47.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2070: In wheel-to-egg conversion, use simple pkg_resources-style namespace declaration for packages that declare namespace_packages.
 
 
 v47.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #2094: Setuptools now actively crashes under Python 2. Python 3.5 or later is required. Users of Python 2 should use ``setuptools<45``.
+
+Changes
+^^^^^^^
 * #1700: Document all supported keywords by migrating the ones from distutils.
 
 
 v46.4.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1753: ``attr:`` now extracts variables through rudimentary examination of the AST,
   thereby supporting modules with third-party imports. If examining the AST
   fails to find the variable, ``attr:`` falls back to the old behavior of
@@ -255,7 +406,14 @@ No significant changes.
 v46.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2089: Package index functionality no longer attempts to remove an md5 fragment from the index URL. This functionality, added for distribute #163 is no longer relevant.
+
+Misc
+^^^^
 * #2041: Preserve file modes during pkg files copying, but clear read only flag for target afterwards.
 * #2105: Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
 
@@ -263,11 +421,21 @@ v46.3.0
 v46.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #2040: Deprecated the ``bdist_wininst`` command. Binary packages should be built as wheels instead.
 * #2062: Change 'Mac OS X' to 'macOS' in code.
 * #2075: Stop recognizing files ending with ``.dist-info`` as distribution metadata.
 * #2086: Deprecate 'use_2to3' functionality. Packagers are encouraged to use single-source solutions or build tool chains to manage conversions outside of setuptools.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1698: Added documentation for ``build_meta`` (a bare minimum, not completed).
+
+Misc
+^^^^
 * #2082: Filter ``lib2to3`` ``PendingDeprecationWarning`` and ``DeprecationWarning`` in tests,
   because ``lib2to3`` is `deprecated in Python 3.9 <https://bugs.python.org/issue40360>`_.
 
@@ -281,6 +449,10 @@ No significant changes.
 v46.1.2
 -------
 
+
+
+Misc
+^^^^
 * #1458: Added template for reporting Python 2 incompatibilities.
 
 
@@ -293,12 +465,17 @@ No significant changes.
 v46.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #308: Allow version number normalization to be bypassed by wrapping in a 'setuptools.sic()' call.
 * #1424: Prevent keeping files mode for package_data build. It may break a build if user's package data has read only flag.
 * #1431: In ``easy_install.check_site_dir``, ensure the installation directory exists.
 * #1563: In ``pkg_resources`` prefer ``find_spec`` (PEP 451) to ``find_module``.
 
 Incorporate changes from v44.1.0:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
 * #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
@@ -308,6 +485,10 @@ Incorporate changes from v44.1.0:
 v44.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
 * #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
 * #1994: Fixed a bug in the "setuptools.finalize_distribution_options" hook that lead to ignoring the order attribute of entry points managed by this hook.
@@ -316,16 +497,33 @@ v44.1.0
 v46.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #65: Once again as in 3.0, removed the Features feature.
+
+Changes
+^^^^^^^
 * #1890: Fix vendored dependencies so importing ``setuptools.extern.some_module`` gives the same object as ``setuptools._vendor.some_module``. This makes Metadata picklable again.
 * #1899: Test suite now fails on warnings.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #2011: Fix broken link to distutils docs on package_data
+
+Misc
+^^^^
 * #1991: Include pkg_resources test data in sdist, so tests can be executed from it.
 
 
 v45.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1557: Deprecated eggsecutable scripts and updated docs.
 * #1904: Update msvc.py to use CPython 3.8.0 mechanism to find msvc 14+
 
@@ -333,6 +531,10 @@ v45.3.0
 v45.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1905: Fixed defect in _imp, introduced in 41.6.0 when the 'tests' directory is not present.
 * #1941: Improve editable installs with PEP 518 build isolation:
 
@@ -340,12 +542,19 @@ v45.2.0
   * The error shown when the install directory is not in ``PYTHONPATH`` has been turned into a warning.
 * #1981: Setuptools now declares its ``tests`` and ``docs`` dependencies in metadata (extras).
 * #1985: Add support for installing scripts in environments where bdist_wininst is missing (i.e. Python 3.9).
+
+Misc
+^^^^
 * #1968: Add flake8-2020 to check for misuse of sys.version or sys.version_info.
 
 
 v45.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1458: Add minimum sunset date and preamble to Python 2 warning.
 * #1704: Set sys.argv[0] in setup script run by build_meta.__legacy__
 * #1974: Add Python 3 Only Trove Classifier and remove universal wheel declaration for more complete transition from Python 2.
@@ -354,26 +563,47 @@ v45.1.0
 v45.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1458: Drop support for Python 2. Setuptools now requires Python 3.5 or later. Install setuptools using pip >=9 or pin to Setuptools <45 to maintain 2.7 support.
+
+Changes
+^^^^^^^
 * #1959: Fix for Python 4: replace unsafe six.PY3 with six.PY2
 
 
 v44.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1908: Drop support for Python 3.4.
 
 
 v43.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1634: Include ``pyproject.toml`` in source distribution by default. Projects relying on the previous behavior where ``pyproject.toml`` was excluded by default should stop relying on that behavior or add ``exclude pyproject.toml`` to their MANIFEST.in file.
+
+Changes
+^^^^^^^
 * #1927: Setuptools once again declares 'setuptools' in the ``build-system.requires`` and adds PEP 517 build support by declaring itself as the ``build-backend``. It additionally specifies ``build-system.backend-path`` to rely on itself for those builders that support it.
 
 
 v42.0.2
 -------
 
+Changes
+^^^^^^^
+
 * #1921: Fix support for easy_install's ``find-links`` option in ``setup.cfg``.
 * #1922: Build dependencies (setup_requires and tests_require) now install transitive dependencies indicated by extras.
 
@@ -381,12 +611,20 @@ v42.0.2
 v42.0.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1918: Fix regression in handling wheels compatibility tags.
 
 
 v42.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1830, #1909: Mark the easy_install script and setuptools command as deprecated, and use `pip <https://pip.pypa.io/en/stable/>`_ when available to fetch/build wheels for missing ``setup_requires``/``tests_require`` requirements, with the following differences in behavior:
    * support for ``python_requires``
    * better support for wheels (proper handling of priority with respect to PEP 425 tags)
@@ -395,6 +633,9 @@ v42.0.0
    * no support for the ``allow_hosts`` easy_install option (``index_url``/``find_links`` are still honored)
    * pip environment variables are honored (and take precedence over easy_install options)
 * #1898: Removed the "upload" and "register" commands in favor of `twine <https://pypi.org/p/twine>`_.
+
+Changes
+^^^^^^^
 * #1767: Add support for the ``license_files`` option in ``setup.cfg`` to automatically
   include multiple license files in a source distribution.
 * #1829: Update handling of wheels compatibility tags:
@@ -407,46 +648,82 @@ v42.0.0
 v41.6.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #479: Replace usage of deprecated ``imp`` module with local re-implementation in ``setuptools._imp``.
 
 
 v41.5.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1891: Fix code for detecting Visual Studio's version on Windows under Python 2.
 
 
 v41.5.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1811: Improve Visual C++ 14.X support, mainly for Visual Studio 2017 and 2019.
 * #1814: Fix ``pkg_resources.Requirement`` hash/equality implementation: take PEP 508 direct URL into account.
 * #1824: Fix tests when running under ``python3.10``.
 * #1878: Formally deprecated the ``test`` command, with the recommendation that users migrate to ``tox``.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1860: Update documentation to mention the egg format is not supported by pip and dependency links support was dropped starting with pip 19.0.
 * #1862: Drop ez_setup documentation: deprecated for some time (last updated in 2016), and still relying on easy_install (deprecated too).
 * #1868: Drop most documentation references to (deprecated) EasyInstall.
 * #1884: Added a trove classifier to document support for Python 3.8.
+
+Misc
+^^^^
 * #1886: Added Python 3.8 release to the Travis test matrix.
 
 
 v41.4.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1847: In declarative config, now traps errors when invalid ``python_requires`` values are supplied.
 
 
 v41.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1690: When storing extras, rely on OrderedSet to retain order of extras as indicated by the packager, which will also be deterministic on Python 2.7 (with PYTHONHASHSEED unset) and Python 3.6+.
+
+Misc
+^^^^
 * #1858: Fixed failing integration test triggered by 'long_description_content_type' in packaging.
 
 
 v41.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #479: Remove some usage of the deprecated ``imp`` module.
+
+Misc
+^^^^
 * #1565: Changed html_sidebars from string to list of string as per
   https://www.sphinx-doc.org/en/master/changes.html#id58
 
@@ -454,6 +731,10 @@ v41.2.0
 v41.1.0
 -------
 
+
+
+Misc
+^^^^
 * #1697: Moved most of the constants from setup.py to setup.cfg
 * #1749: Fixed issue with the PEP 517 backend where building a source distribution would fail if any tarball existed in the destination directory.
 * #1750: Fixed an issue with PEP 517 backend where wheel builds would fail if the destination directory did not already exist.
@@ -461,12 +742,19 @@ v41.1.0
 * #1769: Improve ``package_data`` check: ensure the dictionary values are lists/tuples of strings.
 * #1788: Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
 * #1790: Added the file path to the error message when a ``UnicodeDecodeError`` occurs while reading a metadata file.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1776: Use license classifiers rather than the license field.
 
 
 v41.0.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1671: Fixed issue with the PEP 517 backend that prevented building a wheel when the ``dist/`` directory contained existing ``.whl`` files.
 * #1709: In test.paths_on_python_path, avoid adding unnecessary duplicates to the PYTHONPATH.
 * #1741: In package_index, now honor "current directory" during a checkout of git and hg repositories under Windows
@@ -475,22 +763,37 @@ v41.0.1
 v41.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1735: When parsing setup.cfg files, setuptools now requires the files to be encoded as UTF-8. Any other encoding will lead to a UnicodeDecodeError. This change removes support for specifying an encoding using a 'coding: ' directive in the header of the file, a feature that was introduces in 40.7. Given the recent release of the aforementioned feature, it is assumed that few if any projects are utilizing the feature to specify an encoding other than UTF-8.
 
 
 v40.9.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1675: Added support for ``setup.cfg``-only projects when using the ``setuptools.build_meta`` backend. Projects that have enabled PEP 517 no longer need to have a ``setup.py`` and can use the purely declarative ``setup.cfg`` configuration file instead.
 * #1720: Added support for ``pkg_resources.parse_requirements``-style requirements in ``setup_requires`` when ``setup.py`` is invoked from the ``setuptools.build_meta`` build backend.
 * #1664: Added the path to the ``PKG-INFO`` or ``METADATA`` file in the exception
   text when the ``Version:`` header can't be found.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1705: Removed some placeholder documentation sections referring to deprecated features.
 
 
 v40.8.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1652: Added the ``build_meta:__legacy__`` backend, a "compatibility mode" PEP 517 backend that can be used as the default when ``build-backend`` is left unspecified in ``pyproject.toml``.
 * #1635: Resource paths are passed to ``pkg_resources.resource_string`` and similar no longer accept paths that traverse parents, that begin with a leading ``/``. Violations of this expectation raise DeprecationWarnings and will become errors. Additionally, any paths that are absolute on Windows are strictly disallowed and will raise ValueErrors.
 * #1536: ``setuptools`` will now automatically include licenses if ``setup.cfg`` contains a ``license_file`` attribute, unless this file is manually excluded inside ``MANIFEST.in``.
@@ -499,25 +802,44 @@ v40.8.0
 v40.7.3
 -------
 
+
+
+Changes
+^^^^^^^
 * #1670: In package_index, revert to using a copy of splituser from Python 3.8. Attempts to use ``urllib.parse.urlparse`` led to problems as reported in #1663 and #1668. This change serves as an alternative to #1499 and fixes #1668.
 
 
 v40.7.2
 -------
 
+
+
+Changes
+^^^^^^^
 * #1666: Restore port in URL handling in package_index.
 
 
 v40.7.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1660: On Python 2, when reading config files, downcast options from text to bytes to satisfy distutils expectations.
 
 
 v40.7.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1551: File inputs for the ``license`` field in ``setup.cfg`` files now explicitly raise an error.
+
+Changes
+^^^^^^^
 * #1180: Add support for non-ASCII in setup.cfg (#1062). Add support for native strings on some parameters (#1136).
 * #1499: ``setuptools.package_index`` no longer relies on the deprecated ``urllib.parse.splituser`` per Python #27485.
 * #1544: Added tests for PackageIndex.download (for git URLs).
@@ -527,30 +849,51 @@ v40.7.0
 v40.6.3
 -------
 
+
+
+Changes
+^^^^^^^
 * #1594: PEP 517 backend no longer declares setuptools as a dependency as it can be assumed.
 
 
 v40.6.2
 -------
 
+
+
+Changes
+^^^^^^^
 * #1592: Fix invalid dependency on external six module (instead of vendored version).
 
 
 v40.6.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1590: Fixed regression where packages without ``author`` or ``author_email`` fields generated malformed package metadata.
 
 
 v40.6.0
 -------
 
+
+
+Deprecations
+^^^^^^^^^^^^
 * #1541: Officially deprecated the ``requires`` parameter in ``setup()``.
+
+Changes
+^^^^^^^
 * #1519: In ``pkg_resources.normalize_path``, additional path normalization is now performed to ensure path values to a directory is always the same, preventing false positives when checking scripts have a consistent prefix to set up on Windows.
 * #1545: Changed the warning class of all deprecation warnings; deprecation warning classes are no longer derived from ``DeprecationWarning`` and are thus visible by default.
 * #1554: ``build_meta.build_sdist`` now includes ``setup.py`` in source distributions by default.
 * #1576: Started monkey-patching ``get_metadata_version`` and ``read_pkg_file`` onto ``distutils.DistributionMetadata`` to retain the correct version on the ``PKG-INFO`` file in the (deprecated) ``upload`` command.
-* #1533: Restricted the ``recursive-include setuptools/_vendor`` to contain only .py and .txt files.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1395: Changed Pyrex references to Cython in the documentation.
 * #1456: Documented that the ``rpmbuild`` packages is required for the ``bdist_rpm`` command.
 * #1537: Documented how to use ``setup.cfg`` for ``src/ layouts``
@@ -559,69 +902,115 @@ v40.6.0
 * #1553: Updated installation instructions to point to ``pip install`` instead of ``ez_setup.py``.
 * #1560: Updated ``setuptools`` distribution documentation to remove some outdated information.
 * #1564: Documented ``setup.cfg`` minimum version for version and project_urls.
+
+Misc
+^^^^
+* #1533: Restricted the ``recursive-include setuptools/_vendor`` to contain only .py and .txt files.
 * #1572: Added the ``concurrent.futures`` backport ``futures`` to the Python 2.7 test suite requirements.
 
 
 v40.5.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1335: In ``pkg_resources.normalize_path``, fix issue on Cygwin when cwd contains symlinks.
 * #1502: Deprecated support for downloads from Subversion in package_index/easy_install.
 * #1517: Dropped use of six.u in favor of ``u""`` literals.
 * #1520: Added support for ``data_files`` in ``setup.cfg``.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1525: Fixed rendering of the deprecation warning in easy_install doc.
 
 
 v40.4.3
 -------
 
+
+
+Changes
+^^^^^^^
 * #1480: Bump vendored pyparsing in pkg_resources to 2.2.1.
 
 
 v40.4.2
 -------
 
+
+
+Misc
+^^^^
 * #1497: Updated gitignore in repo.
 
 
 v40.4.1
 -------
 
+
+
+Changes
+^^^^^^^
 * #1480: Bump vendored pyparsing to 2.2.1.
 
 
 v40.4.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1481: Join the sdist ``--dist-dir`` and the ``build_meta`` sdist directory argument to point to the same target (meaning the build frontend no longer needs to clean manually the dist dir to avoid multiple sdist presence, and setuptools no longer needs to handle conflicts between the two).
 
 
 v40.3.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1402: Fixed a bug with namespace packages under Python 3.6 when one package in
   current directory hides another which is installed.
 * #1427: Set timestamp of ``.egg-info`` directory whenever ``egg_info`` command is run.
 * #1474: ``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore.
 * #1486: Suppress warnings in pkg_resources.handle_ns.
+
+Misc
+^^^^
 * #1479: Remove internal use of six.binary_type.
 
 
 v40.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1466: Fix handling of Unicode arguments in PEP 517 backend
 
 
 v40.1.1
 --------
 
+
+
+Changes
+^^^^^^^
 * #1465: Fix regression with ``egg_info`` command when tagging is used.
 
 
 v40.1.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1410: Deprecated ``upload`` and ``register`` commands.
 * #1312: Introduced find_namespace_packages() to find PEP 420 namespace packages.
 * #1420: Added find_namespace: directive to config parser.
@@ -631,24 +1020,44 @@ v40.1.0
 * #1388: Fixed "Microsoft Visual C++ Build Tools" link in exception when Visual C++ not found.
 * #1389: Added support for scripts which have unicode content.
 * #1416: Moved several Python version checks over to using ``six.PY2`` and ``six.PY3``.
+
+Misc
+^^^^
 * #1441: Removed spurious executable permissions from files that don't need them.
 
 
 v40.0.0
 -------
 
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
 * #1342: Drop support for Python 3.3.
+
+Changes
+^^^^^^^
 * #1366: In package_index, fixed handling of encoded entities in URLs.
 * #1383: In pkg_resources VendorImporter, avoid removing packages imported from the root.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1379: Minor doc fixes after actually using the new release process.
 * #1385: Removed section on non-package data files.
 * #1403: Fix developer's guide.
+
+Misc
+^^^^
 * #1404: Fix PEP 518 configuration: set build requirements in ``pyproject.toml`` to ``["wheel"]``.
 
 
 v39.2.0
 -------
 
+
+
+Changes
+^^^^^^^
 * #1359: Support using "file:" to load a PEP 440-compliant package version from
   a text file.
 * #1360: Fixed issue with a mismatch between the name of the package and the
@@ -657,11 +1066,17 @@ v39.2.0
   includes the attributes in the ``_provider`` instance variable.
 * #1365: Take the package_dir option into account when loading the version from
   a module attribute.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
 * #1353: Added coverage badge to README.
 * #1356: Made small fixes to the developer guide documentation.
 * #1357: Fixed warnings in documentation builds and started enforcing that the
   docs build without warnings in tox.
 * #1376: Updated release process docs.
+
+Misc
+^^^^
 * #1343: The ``setuptools`` specific ``long_description_content_type``,
   ``project_urls`` and ``provides_extras`` fields are now set consistently
   after any ``distutils`` ``setup_keywords`` calls, allowing them to override

From 6597dcb657705154bb1ae75104dd1b7fab0b8b10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 18 Oct 2020 13:54:16 -0400
Subject: [PATCH 8222/8469] Switch to RTD v2 config

---
 .readthedocs.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index cb10a7f991..6a40653472 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,6 +1,8 @@
+# Read the Docs configuration file
+# https://docs.readthedocs.io/en/stable/config-file/v2.html
+
+version: 2
+
 python:
-  version: 3
-  extra_requirements:
-  - docs
-  pip_install: false
-  requirements: docs/requirements.txt
+  install:
+  - requirements: docs/requirements.txt

From 0e1fc1c6318864ab70dc0868762e02fa8faaaf8e Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Mon, 19 Oct 2020 10:06:57 +0300
Subject: [PATCH 8223/8469] s/517/PEP 517/

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 697087edb4..874ac086a2 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -21,7 +21,7 @@ the backend (build system) it wants to use. The distribution can then
 be generated with whatever tools that provides a ``build sdist``-alike
 functionality. While this may appear cumbersome, given the added pieces,
 it in fact tremendously enhances the portability of your package. The
-change is driven under :pep:`517 <517#build-requirements>`. To learn more about Python packaging in general,
+change is driven under :pep:`PEP 517 <517#build-requirements>`. To learn more about Python packaging in general,
 navigate to the `bottom <Resources on python packaging>`_ of this page.
 
 

From d7170a28dc3ad02eacc69d1c425bb6f1d5afe619 Mon Sep 17 00:00:00 2001
From: Greg Solon <greg.solon@gmail.com>
Date: Tue, 20 Oct 2020 21:55:56 +0800
Subject: [PATCH 8224/8469] Update quickstart.rst

Removed quotes in setup.cfg which caused build to fail.
---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 697087edb4..a9cb76a4ee 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -43,11 +43,11 @@ such as metadata, contents, dependencies, etc. Here we demonstrate the minimum
 .. code-block:: ini
 
     [metadata]
-    name = "mypackage"
+    name = mypackage
     version = 0.0.1
 
     [options]
-    packages = "mypackage"
+    packages = mypackage
     install_requires =
       requests
       importlib; python_version == "2.6"

From fb8d9c43500c06f6f2286ea7c7ae452d41cce412 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Nov 2020 20:32:18 -0500
Subject: [PATCH 8225/8469] Move Tidelift release note publishing to Github
 Actions.

---
 .github/workflows/main.yml | 6 ++++++
 azure-pipelines.yml        | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/main.yml
 delete mode 100644 azure-pipelines.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..01999cabbf
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,6 @@
+jobs:
+  release:
+    steps:
+      - name: Release
+        env:
+          TIDELIFT_TOKEN: ${{ secrets.TIDELIFT_TOKEN }}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 01bfa5f56f..0000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-      env:
-        TIDELIFT_TOKEN: $(Tidelift-token)

From ec944a40aa06f0499201b06a308fe713d77ddbf4 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 18 Nov 2020 16:16:42 +0100
Subject: [PATCH 8226/8469] Upgrade GHA actions using deprecated env mechanism

---
 .github/workflows/python-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 2d5abe2767..e1147ca0cb 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -62,7 +62,7 @@ jobs:
       with:
         python-version: ${{ env.PYTHON_VERSION }}
     - name: Set up Python ${{ env.PYTHON_VERSION }}
-      uses: actions/setup-python@v2.1.1
+      uses: actions/setup-python@v2
       if: >-
         !fromJSON(env.USE_DEADSNAKES) && true || false
       with:
@@ -77,7 +77,7 @@ jobs:
       run: >-
         python -m sysconfig
     - name: Pip cache
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}

From de48cfdb81f285a46d0484e780019b7ee75e95ce Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 18 Nov 2020 16:25:43 +0100
Subject: [PATCH 8227/8469] Temporarily allow `set-env` GHA commands

Refs:
* github.com/deadsnakes/issues/issues/135
* github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
---
 .github/workflows/python-tests.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index e1147ca0cb..b664018174 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -50,6 +50,11 @@ jobs:
       if: >-
         endsWith(env.PYTHON_VERSION, '-beta') || 
         endsWith(env.PYTHON_VERSION, '-dev')
+      # FIXME: replace `set-env` with a newer alternative
+      # Refs:
+      # * github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: |
         from __future__ import print_function
         python_version = '${{ env.PYTHON_VERSION }}'.replace('-beta', '')
@@ -59,6 +64,12 @@ jobs:
     - name: Set up Python ${{ env.PYTHON_VERSION }} (deadsnakes)
       uses: deadsnakes/action@v1.0.0
       if: fromJSON(env.USE_DEADSNAKES) && true || false
+      # FIXME: drop once deadsnakes/action gets fixed
+      # Refs:
+      # * github.com/deadsnakes/issues/issues/135
+      # * github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       with:
         python-version: ${{ env.PYTHON_VERSION }}
     - name: Set up Python ${{ env.PYTHON_VERSION }}
@@ -99,6 +110,11 @@ jobs:
         python -m pip freeze --all
     - name: Adjust TOXENV for PyPy
       if: startsWith(env.PYTHON_VERSION, 'pypy')
+      # FIXME: replace `set-env` with a newer alternative
+      # Refs:
+      # * github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: >-
         echo "::set-env name=TOXENV::${{ env.PYTHON_VERSION }}"
     - name: Log env vars

From b20d12e1fb7132fada3e6b58ec1c1c0bd409c5f7 Mon Sep 17 00:00:00 2001
From: Harald Korneliussen <vintermann@gmail.com>
Date: Wed, 18 Nov 2020 19:32:18 +0100
Subject: [PATCH 8228/8469] Fixes syntax issues in quickstart (#2448)

Quotes in the name and packages field causes an "Invalid distribution name or version syntax" if you follow this quickstart guide directly. pep517.build also requires you to specify the directory.
---
 docs/userguide/quickstart.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 697087edb4..50a984ec9b 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -43,11 +43,11 @@ such as metadata, contents, dependencies, etc. Here we demonstrate the minimum
 .. code-block:: ini
 
     [metadata]
-    name = "mypackage"
+    name = mypackage
     version = 0.0.1
 
     [options]
-    packages = "mypackage"
+    packages = mypackage
     install_requires =
       requests
       importlib; python_version == "2.6"
@@ -63,7 +63,7 @@ Then, you need an installer, such as `pep517 <https://pypi.org/project/pep517/>`
 which you can obtain via ``pip install pep517``. After downloading it, invoke
 the installer::
 
-    python -m pep517.build
+    python -m pep517.build .
 
 You now have your distribution ready (e.g. a ``tar.gz`` file and a ``.whl``
 file in the ``dist`` directory), which you can upload to PyPI!

From 4a4d50af47c067eff372fd007123b62c25e5c6dd Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 20 Nov 2020 00:02:20 +0100
Subject: [PATCH 8229/8469] Fix all deprecated set-env and add-path uses @ GHA

---
 .github/workflows/python-tests.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index b664018174..9dc4b9d7a8 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -57,19 +57,15 @@ jobs:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: |
         from __future__ import print_function
+        import os
         python_version = '${{ env.PYTHON_VERSION }}'.replace('-beta', '')
-        print('::set-env name=PYTHON_VERSION::{ver}'.format(ver=python_version))
-        print('::set-env name=USE_DEADSNAKES::true')
+        with open(os.environ['GITHUB_ENV'], 'a') as env_file:
+            env_file.write('PYTHON_VERSION={ver}\n'.format(ver=python_version))
+            env_file.write('USE_DEADSNAKES=true\n')
       shell: python
     - name: Set up Python ${{ env.PYTHON_VERSION }} (deadsnakes)
-      uses: deadsnakes/action@v1.0.0
+      uses: deadsnakes/action@v2.0.1
       if: fromJSON(env.USE_DEADSNAKES) && true || false
-      # FIXME: drop once deadsnakes/action gets fixed
-      # Refs:
-      # * github.com/deadsnakes/issues/issues/135
-      # * github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
-      env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       with:
         python-version: ${{ env.PYTHON_VERSION }}
     - name: Set up Python ${{ env.PYTHON_VERSION }}
@@ -110,13 +106,10 @@ jobs:
         python -m pip freeze --all
     - name: Adjust TOXENV for PyPy
       if: startsWith(env.PYTHON_VERSION, 'pypy')
-      # FIXME: replace `set-env` with a newer alternative
-      # Refs:
-      # * github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
-      env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: >-
-        echo "::set-env name=TOXENV::${{ env.PYTHON_VERSION }}"
+        echo "TOXENV=${{ env.PYTHON_VERSION }}"
+        >>
+        "${GITHUB_ENV}"
     - name: Log env vars
       run: >-
         env

From b4de397a00c6c9ef0551082d532a60badbea7ee9 Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Fri, 4 Dec 2020 13:57:21 -0600
Subject: [PATCH 8230/8469] fix broken link to entry-points details

---
 docs/pkg_resources.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pkg_resources.rst b/docs/pkg_resources.rst
index 364e218328..c99f0cd13a 100644
--- a/docs/pkg_resources.rst
+++ b/docs/pkg_resources.rst
@@ -703,7 +703,7 @@ entry point group and look for entry points named "pre_process" and
 To advertise an entry point, a project needs to use ``setuptools`` and provide
 an ``entry_points`` argument to ``setup()`` in its setup script, so that the
 entry points will be included in the distribution's metadata.  For more
-details, see the [``setuptools`` documentation](https://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins).
+details, see `Advertising Behavior <https://setuptools.readthedocs.io/en/latest/userguide/entry_point.html#dynamic-discovery-of-services-and-plugins`>_.
 
 Each project distribution can advertise at most one entry point of a given
 name within the same entry point group.  For example, a distutils extension

From 475fb309a8559556b12a5b37acd03e5d0cf49aa0 Mon Sep 17 00:00:00 2001
From: wim glenn <hey@wimglenn.com>
Date: Sat, 5 Dec 2020 12:07:28 -0600
Subject: [PATCH 8231/8469] Update docs/pkg_resources.rst

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
---
 docs/pkg_resources.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/pkg_resources.rst b/docs/pkg_resources.rst
index c99f0cd13a..19d43244d1 100644
--- a/docs/pkg_resources.rst
+++ b/docs/pkg_resources.rst
@@ -703,7 +703,7 @@ entry point group and look for entry points named "pre_process" and
 To advertise an entry point, a project needs to use ``setuptools`` and provide
 an ``entry_points`` argument to ``setup()`` in its setup script, so that the
 entry points will be included in the distribution's metadata.  For more
-details, see `Advertising Behavior <https://setuptools.readthedocs.io/en/latest/userguide/entry_point.html#dynamic-discovery-of-services-and-plugins`>_.
+details, see :ref:`Advertising Behavior<dynamic discovery of services and plugins>`.
 
 Each project distribution can advertise at most one entry point of a given
 name within the same entry point group.  For example, a distutils extension
@@ -1939,4 +1939,3 @@ History
 
 0.3a1
  * Initial release.
-

From 65441834e019b064bae862d3cfd9971ecbd1c7f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Dec 2020 12:39:41 -0500
Subject: [PATCH 8232/8469] Remove conditional skip, no longer relevant.

---
 setuptools/tests/test_integration.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 24cef480ea..2360491050 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -123,8 +123,6 @@ def test_pyuri(install_context):
 
 
 @pytest.mark.parametrize("build_dep", build_deps)
-@pytest.mark.skipif(
-    sys.version_info < (3, 6), reason='run only on late versions')
 def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
     """
     All setuptools build dependencies must build without

From 99bc2c11d74075ebf0b1dae4cab881225765f404 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Dec 2020 12:54:20 -0500
Subject: [PATCH 8233/8469] Remove tests guaranteeing that (vendored)
 dependencies can be installed without setuptools.

In a PEP 517 world without distutils, packagers will need to find another way to build and supply the dependencies
---
 setuptools/tests/test_integration.py | 56 ----------------------------
 1 file changed, 56 deletions(-)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 2360491050..04ba62f7ba 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -6,11 +6,6 @@
 import glob
 import os
 import sys
-import re
-import subprocess
-import functools
-import tarfile
-import zipfile
 import urllib.request
 
 import pytest
@@ -117,54 +112,3 @@ def test_pyuri(install_context):
 
     # The package data should be installed.
     assert os.path.exists(os.path.join(pyuri.location, 'pyuri', 'uri.regex'))
-
-
-build_deps = ['appdirs', 'packaging', 'pyparsing', 'six']
-
-
-@pytest.mark.parametrize("build_dep", build_deps)
-def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
-    """
-    All setuptools build dependencies must build without
-    setuptools.
-    """
-    if 'pyparsing' in build_dep:
-        pytest.xfail(reason="Project imports setuptools unconditionally")
-    build_target = tmpdir_factory.mktemp('source')
-    build_dir = download_and_extract(request, build_dep, build_target)
-    install_target = tmpdir_factory.mktemp('target')
-    output = install(build_dir, install_target)
-    for line in output.splitlines():
-        match = re.search('Unknown distribution option: (.*)', line)
-        allowed_unknowns = [
-            'test_suite',
-            'tests_require',
-            'python_requires',
-            'install_requires',
-            'long_description_content_type',
-        ]
-        assert not match or match.group(1).strip('"\'') in allowed_unknowns
-
-
-def install(pkg_dir, install_dir):
-    with open(os.path.join(pkg_dir, 'setuptools.py'), 'w') as breaker:
-        breaker.write('raise ImportError()')
-    cmd = [sys.executable, 'setup.py', 'install', '--prefix', str(install_dir)]
-    env = dict(os.environ, PYTHONPATH=str(pkg_dir))
-    output = subprocess.check_output(
-        cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
-    return output.decode('utf-8')
-
-
-def download_and_extract(request, req, target):
-    cmd = [
-        sys.executable, '-m', 'pip', 'download', '--no-deps',
-        '--no-binary', ':all:', req,
-    ]
-    output = subprocess.check_output(cmd, encoding='utf-8')
-    filename = re.search('Saved (.*)', output).group(1)
-    request.addfinalizer(functools.partial(os.remove, filename))
-    opener = zipfile.ZipFile if filename.endswith('.zip') else tarfile.open
-    with opener(filename) as archive:
-        archive.extractall(target)
-    return os.path.join(target, os.listdir(target)[0])

From 2a0463cb489a1b8a222248c65422d908dc4aee18 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Dec 2020 12:55:57 -0500
Subject: [PATCH 8234/8469] Update changelog.

---
 changelog.d/2471.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2471.misc.rst

diff --git a/changelog.d/2471.misc.rst b/changelog.d/2471.misc.rst
new file mode 100644
index 0000000000..5bd42a6d98
--- /dev/null
+++ b/changelog.d/2471.misc.rst
@@ -0,0 +1 @@
+Removed the tests that guarantee that the vendored dependencies can be built by distutils.

From b6bbe236ed0689f50b5148f1172510b975687e62 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Dec 2020 19:32:25 -0500
Subject: [PATCH 8235/8469] =?UTF-8?q?Bump=20version:=2050.3.2=20=E2=86=92?=
 =?UTF-8?q?=2051.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              |  2 +-
 CHANGES.rst                   | 20 ++++++++++++++++++++
 changelog.d/2430.doc.1.rst    |  2 --
 changelog.d/2430.doc.2.rst    |  2 --
 changelog.d/2435.breaking.rst |  1 -
 changelog.d/2471.misc.rst     |  1 -
 setup.cfg                     |  2 +-
 7 files changed, 22 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/2430.doc.1.rst
 delete mode 100644 changelog.d/2430.doc.2.rst
 delete mode 100644 changelog.d/2435.breaking.rst
 delete mode 100644 changelog.d/2471.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 97840e4275..c56d45dc8e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 50.3.2
+current_version = 51.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 567b2bac76..55133876e9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+v51.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2435: Require Python 3.6 or later.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2430: Fixed inconsistent RST title nesting levels caused by #2399
+  -- by :user:`webknjaz`
+* #2430: Fixed a typo in Sphinx docs that made docs dev section disappear
+  as a result of PR #2426 -- by :user:`webknjaz`
+
+Misc
+^^^^
+* #2471: Removed the tests that guarantee that the vendored dependencies can be built by distutils.
+
+
 v50.3.2
 -------
 
diff --git a/changelog.d/2430.doc.1.rst b/changelog.d/2430.doc.1.rst
deleted file mode 100644
index d09e0b9e7b..0000000000
--- a/changelog.d/2430.doc.1.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a typo in Sphinx docs that made docs dev section disappear
-as a result of PR #2426 -- by :user:`webknjaz`
diff --git a/changelog.d/2430.doc.2.rst b/changelog.d/2430.doc.2.rst
deleted file mode 100644
index 0ac8782323..0000000000
--- a/changelog.d/2430.doc.2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed inconsistent RST title nesting levels caused by #2399
--- by :user:`webknjaz`
diff --git a/changelog.d/2435.breaking.rst b/changelog.d/2435.breaking.rst
deleted file mode 100644
index d29c60eb39..0000000000
--- a/changelog.d/2435.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Require Python 3.6 or later.
diff --git a/changelog.d/2471.misc.rst b/changelog.d/2471.misc.rst
deleted file mode 100644
index 5bd42a6d98..0000000000
--- a/changelog.d/2471.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed the tests that guarantee that the vendored dependencies can be built by distutils.
diff --git a/setup.cfg b/setup.cfg
index 0d3fdcf682..570bd2889b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 50.3.2
+version = 51.0.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

From c681f6748acaea1bf0b706528c36327cc94a6eed Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 8 Dec 2020 16:29:09 -0500
Subject: [PATCH 8236/8469] Collapse skeleton history from archive/2020-12

---
 .coveragerc                |   5 ++
 .flake8                    |   9 +++
 .github/workflows/main.yml |  42 +++++++++++
 .pre-commit-config.yaml    |  10 +++
 .readthedocs.yml           |   6 ++
 CHANGES.rst                |   0
 LICENSE                    |  19 +++++
 README.rst                 |  18 +++++
 docs/conf.py               |  26 +++++++
 docs/history.rst           |   8 +++
 docs/index.rst             |  22 ++++++
 mypy.ini                   |   2 +
 pyproject.toml             |  22 ++++++
 pytest.ini                 |   9 +++
 setup.cfg                  |  45 ++++++++++++
 setup.py                   |   6 ++
 skeleton.md                | 144 +++++++++++++++++++++++++++++++++++++
 tox.ini                    |  40 +++++++++++
 18 files changed, 433 insertions(+)
 create mode 100644 .coveragerc
 create mode 100644 .flake8
 create mode 100644 .github/workflows/main.yml
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 .readthedocs.yml
 create mode 100644 CHANGES.rst
 create mode 100644 LICENSE
 create mode 100644 README.rst
 create mode 100644 docs/conf.py
 create mode 100644 docs/history.rst
 create mode 100644 docs/index.rst
 create mode 100644 mypy.ini
 create mode 100644 pyproject.toml
 create mode 100644 pytest.ini
 create mode 100644 setup.cfg
 create mode 100644 setup.py
 create mode 100644 skeleton.md
 create mode 100644 tox.ini

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000000..45823064a3
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,5 @@
+[run]
+omit = .tox/*
+
+[report]
+show_missing = True
diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000000..790c109fdb
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,9 @@
+[flake8]
+max-line-length = 88
+ignore =
+	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+	W503
+	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
+	W504
+	# Black creates whitespace before colon
+	E203
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..8c5c232c36
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,42 @@
+name: Automated Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        python: [3.6, 3.8, 3.9]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Run tests
+        run: tox
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install tox
+        run: |
+          python -m pip install tox
+      - name: Release
+        run: tox -e release
+        env:
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000..6639c78c6c
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+repos:
+- repo: https://github.com/psf/black
+  rev: stable
+  hooks:
+  - id: black
+
+- repo: https://github.com/asottile/blacken-docs
+  rev: v1.8.0
+  hooks:
+  - id: blacken-docs
diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 0000000000..cc698548db
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,6 @@
+version: 2
+python:
+  install:
+  - path: .
+    extra_requirements:
+      - docs
diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..353924be0e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright Jason R. Coombs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000..69554ef811
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,18 @@
+.. image:: https://img.shields.io/pypi/v/skeleton.svg
+   :target: `PyPI link`_
+
+.. image:: https://img.shields.io/pypi/pyversions/skeleton.svg
+   :target: `PyPI link`_
+
+.. _PyPI link: https://pypi.org/project/skeleton
+
+.. image:: https://github.com/jaraco/skeleton/workflows/Automated%20Tests/badge.svg
+   :target: https://github.com/jaraco/skeleton/actions?query=workflow%3A%22Automated+Tests%22
+   :alt: Automated Tests
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :target: https://github.com/psf/black
+   :alt: Code style: Black
+
+.. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest
+..    :target: https://skeleton.readthedocs.io/en/latest/?badge=latest
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 0000000000..433d185d4a
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
+
+master_doc = "index"
+
+link_files = {
+    '../CHANGES.rst': dict(
+        using=dict(GH='https://github.com'),
+        replace=[
+            dict(
+                pattern=r'(Issue #|\B#)(?P<issue>\d+)',
+                url='{package_url}/issues/{issue}',
+            ),
+            dict(
+                pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)',
+                with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
+            ),
+            dict(
+                pattern=r'PEP[- ](?P<pep_number>\d+)',
+                url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+            ),
+        ],
+    )
+}
diff --git a/docs/history.rst b/docs/history.rst
new file mode 100644
index 0000000000..8e217503ba
--- /dev/null
+++ b/docs/history.rst
@@ -0,0 +1,8 @@
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES (links).rst
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 0000000000..d14131b0ef
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,22 @@
+Welcome to skeleton documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 1
+
+   history
+
+
+.. automodule:: skeleton
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 0000000000..976ba02946
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..79f088a956
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,22 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+skip-string-normalization = true
+
+[tool.setuptools_scm]
+
+# jaraco/skeleton#22
+[tool.jaraco.pytest.plugins.black]
+addopts = "--black"
+
+# jaraco/skeleton#22
+[tool.jaraco.pytest.plugins.mypy]
+addopts = "--mypy"
+
+[tool.jaraco.pytest.plugins.flake8]
+addopts = "--flake8"
+
+[tool.jaraco.pytest.plugins.cov]
+addopts = "--cov"
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000..d7f0b11559
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,9 @@
+[pytest]
+norecursedirs=dist build .tox .eggs
+addopts=--doctest-modules
+doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+# workaround for warning pytest-dev/pytest#6178
+junit_family=xunit2
+filterwarnings=
+    # https://github.com/pytest-dev/pytest/issues/6928
+    ignore:direct construction of .*Item has been deprecated:DeprecationWarning
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000..6321ca774c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,45 @@
+[metadata]
+license_file = LICENSE
+name = skeleton
+author = Jason R. Coombs
+author_email = jaraco@jaraco.com
+description = skeleton
+long_description = file:README.rst
+url = https://github.com/jaraco/skeleton
+classifiers =
+	Development Status :: 5 - Production/Stable
+	Intended Audience :: Developers
+	License :: OSI Approved :: MIT License
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3 :: Only
+
+[options]
+packages = find:
+include_package_data = true
+python_requires = >=3.6
+install_requires =
+setup_requires = setuptools_scm[toml] >= 3.4.1
+
+[options.extras_require]
+testing =
+	# upstream
+	pytest >= 3.5, !=3.7.3
+	pytest-checkdocs >= 1.2.3
+	pytest-flake8
+	pytest-black >= 0.3.7; python_implementation != "PyPy"
+	pytest-cov
+	pytest-mypy; python_implementation != "PyPy"
+	# jaraco/skeleton#22
+	jaraco.test >= 3.2.0
+
+	# local
+
+docs =
+	# upstream
+	sphinx
+	jaraco.packaging >= 3.2
+	rst.linker >= 1.9
+
+	# local
+
+[options.entry_points]
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000000..bac24a43d9
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup()
diff --git a/skeleton.md b/skeleton.md
new file mode 100644
index 0000000000..ec421c2598
--- /dev/null
+++ b/skeleton.md
@@ -0,0 +1,144 @@
+# Overview
+
+This project is merged with [skeleton](https://github.com/jaraco/skeleton). What is skeleton? It's the scaffolding of a Python project jaraco [introduced in his blog](https://blog.jaraco.com/a-project-skeleton-for-python-projects/). It seeks to provide a means to re-use techniques and inherit advances when managing projects for distribution.
+
+## An SCM-Managed Approach
+
+While maintaining dozens of projects in PyPI, jaraco derives best practices for project distribution and publishes them in the [skeleton repo](https://github.com/jaraco/skeleton), a Git repo capturing the evolution and culmination of these best practices.
+
+It's intended to be used by a new or existing project to adopt these practices and honed and proven techniques. Adopters are encouraged to use the project directly and maintain a small deviation from the technique, make their own fork for more substantial changes unique to their environment or preferences, or simply adopt the skeleton once and abandon it thereafter.
+
+The primary advantage to using an SCM for maintaining these techniques is that those tools help facilitate the merge between the template and its adopting projects.
+
+Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5) would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton.
+
+# Usage
+
+## new projects
+
+To use skeleton for a new project, simply pull the skeleton into a new project:
+
+```
+$ git init my-new-project
+$ cd my-new-project
+$ git pull gh://jaraco/skeleton
+```
+
+Now customize the project to suit your individual project needs.
+
+## existing projects
+
+If you have an existing project, you can still incorporate the skeleton by merging it into the codebase.
+
+```
+$ git merge skeleton --allow-unrelated-histories
+```
+
+The `--allow-unrelated-histories` is necessary because the history from the skeleton was previously unrelated to the existing codebase. Resolve any merge conflicts and commit to the master, and now the project is based on the shared skeleton.
+
+## Updating
+
+Whenever a change is needed or desired for the general technique for packaging, it can be made in the skeleton project and then merged into each of the derived projects as needed, recommended before each release. As a result, features and best practices for packaging are centrally maintained and readily trickle into a whole suite of packages. This technique lowers the amount of tedious work necessary to create or maintain a project, and coupled with other techniques like continuous integration and deployment, lowers the cost of creating and maintaining refined Python projects to just a few, familiar Git operations.
+
+For example, here's a session of the [path project](https://pypi.org/project/path) pulling non-conflicting changes from the skeleton:
+
+<img src="https://raw.githubusercontent.com/jaraco/skeleton/gh-pages/docs/refresh.svg">
+
+Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
+
+# Features
+
+The features/techniques employed by the skeleton include:
+
+- PEP 517/518-based build relying on Setuptools as the build tool
+- Setuptools declarative configuration using setup.cfg
+- tox for running tests
+- A README.rst as reStructuredText with some popular badges, but with Read the Docs and AppVeyor badges commented out
+- A CHANGES.rst file intended for publishing release notes about the project
+- Use of [Black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier)
+- Integrated type checking through [mypy](https://github.com/python/mypy/).
+
+## Packaging Conventions
+
+A pyproject.toml is included to enable PEP 517 and PEP 518 compatibility and declares the requirements necessary to build the project on Setuptools (a minimum version compatible with setup.cfg declarative config).
+
+The setup.cfg file implements the following features:
+
+- Assumes universal wheel for release
+- Advertises the project's LICENSE file (MIT by default)
+- Reads the README.rst file into the long description
+- Some common Trove classifiers
+- Includes all packages discovered in the repo
+- Data files in the package are also included (not just Python files)
+- Declares the required Python versions
+- Declares install requirements (empty by default)
+- Declares setup requirements for legacy environments
+- Supplies two 'extras':
+  - testing: requirements for running tests
+  - docs: requirements for building docs
+  - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project); these markers help avoid merge conflicts
+- Placeholder for defining entry points
+
+Additionally, the setup.py file declares `use_scm_version` which relies on [setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things:
+
+- derive the project version from SCM tags
+- ensure that all files committed to the repo are automatically included in releases
+
+## Running Tests
+
+The skeleton assumes the developer has [tox](https://pypi.org/project/tox) installed. The developer is expected to run `tox` to run tests on the current Python version using [pytest](https://pypi.org/project/pytest).
+
+Other environments (invoked with `tox -e {name}`) supplied include:
+
+  - a `docs` environment to build the documentation
+  - a `release` environment to publish the package to PyPI
+
+A pytest.ini is included to define common options around running tests. In particular:
+
+- rely on default test discovery in the current directory
+- avoid recursing into common directories not containing tests
+- run doctests on modules and invoke Flake8 tests
+- in doctests, allow Unicode literals and regular literals to match, allowing for doctests to run on Python 2 and 3. Also enable ELLIPSES, a default that would be undone by supplying the prior option.
+- filters out known warnings caused by libraries/functionality included by the skeleton
+
+Relies on a .flake8 file to correct some default behaviors:
+
+- disable mutually incompatible rules W503 and W504
+- support for Black format
+
+## Continuous Integration
+
+The project is pre-configured to run Continuous Integration tests.
+
+### Github Actions
+
+[Github Actions](https://docs.github.com/en/free-pro-team@latest/actions) are the preferred provider as they provide free, fast, multi-platform services with straightforward configuration. Configured in `.github/workflows`.
+
+Features include:
+- test against multiple Python versions
+- run on late (and updated) platform versions
+- automated releases of tagged commits
+
+### Continuous Deployments
+
+In addition to running tests, an additional publish stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with each Github project (or org) `PYPI_TOKEN` [secret](https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets). Example:
+
+```
+pip-run -q jaraco.develop -- -m jaraco.develop.add-github-secrets
+```
+
+## Building Documentation
+
+Documentation is automatically built by [Read the Docs](https://readthedocs.org) when the project is registered with it, by way of the .readthedocs.yml file. To test the docs build manually, a tox env may be invoked as `tox -e docs`. Both techniques rely on the dependencies declared in `setup.cfg/options.extras_require.docs`.
+
+In addition to building the Sphinx docs scaffolded in `docs/`, the docs build a `history.html` file that first injects release dates and hyperlinks into the CHANGES.rst before incorporating it as history in the docs.
+
+## Cutting releases
+
+By default, tagged commits are released through the continuous integration deploy stage.
+
+Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD:
+
+```
+TWINE_PASSWORD={token} tox -e release
+```
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000000..7233b94232
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,40 @@
+[tox]
+envlist = python
+minversion = 3.2
+# https://github.com/jaraco/skeleton/issues/6
+tox_pip_extensions_ext_venv_update = true
+toxworkdir={env:TOX_WORK_DIR:.tox}
+
+
+[testenv]
+deps =
+commands =
+	pytest {posargs}
+usedevelop = True
+extras = testing
+
+[testenv:docs]
+extras =
+	docs
+	testing
+changedir = docs
+commands =
+	python -m sphinx . {toxinidir}/build/html
+
+[testenv:release]
+skip_install = True
+deps =
+	pep517>=0.5
+	twine[keyring]>=1.13
+	path
+	jaraco.develop>=7.1
+passenv =
+	TWINE_PASSWORD
+	GITHUB_TOKEN
+setenv =
+	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
+commands =
+	python -c "import path; path.Path('dist').rmtree_p()"
+	python -m pep517.build .
+	python -m twine upload dist/*
+	python -m jaraco.develop.create-github-release

From d00fac7b86abd71664af6a28acd924eff7c79017 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Dec 2020 12:22:45 -0500
Subject: [PATCH 8237/8469] Include rst files in docs in sdist. Fixes #2477.

---
 MANIFEST.in               | 2 +-
 changelog.d/2477.misc.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2477.misc.rst

diff --git a/MANIFEST.in b/MANIFEST.in
index 128ae280ec..92bd4f6938 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 recursive-include setuptools *.py *.exe *.xml
 recursive-include tests *.py
 recursive-include setuptools/tests *.html
-recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
+recursive-include docs *.py *.txt *.rst *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include setuptools/_vendor *.py *.txt
 recursive-include pkg_resources *.py *.txt
 recursive-include pkg_resources/tests/data *
diff --git a/changelog.d/2477.misc.rst b/changelog.d/2477.misc.rst
new file mode 100644
index 0000000000..48900e9da2
--- /dev/null
+++ b/changelog.d/2477.misc.rst
@@ -0,0 +1 @@
+Restore inclusion of rst files in sdist.

From d97cb2b35ec9afe2839a48587a456d81b0055a60 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Dec 2020 12:34:36 -0500
Subject: [PATCH 8238/8469] Update changelog. Ref #2484.

---
 changelog.d/2484.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2484.misc.rst

diff --git a/changelog.d/2484.misc.rst b/changelog.d/2484.misc.rst
new file mode 100644
index 0000000000..8f93b3d0ed
--- /dev/null
+++ b/changelog.d/2484.misc.rst
@@ -0,0 +1 @@
+Setuptools has replaced the master branch with the main branch.

From 1603dcbaae3bbee4fa90e34828146e348c661401 Mon Sep 17 00:00:00 2001
From: Chih-Hsuan Yen <yan12125@gmail.com>
Date: Fri, 11 Dec 2020 04:34:59 +0800
Subject: [PATCH 8239/8469] Fix test_test_command_install_requirements with pip
 20.3+

setuptools appends --find-links to pip if dependency_links is found, and
both takes URLs [1][2].

[1] https://github.com/pypa/setuptools/blob/v51.0.0/docs/userguide/dependency_management.rst#dependencies-that-arent-in-pypi
[2] https://pip.pypa.io/en/stable/reference/pip_install/#cmdoption-f
---
 changelog.d/2478.misc.2.rst         | 2 ++
 setuptools/tests/test_virtualenv.py | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2478.misc.2.rst

diff --git a/changelog.d/2478.misc.2.rst b/changelog.d/2478.misc.2.rst
new file mode 100644
index 0000000000..27c07b1152
--- /dev/null
+++ b/changelog.d/2478.misc.2.rst
@@ -0,0 +1,2 @@
+Fix tests with pip 20.3+
+-- by :user:`yan12125`
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index c8ed9e57ea..e7b100fba4 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -2,6 +2,8 @@
 import os
 import sys
 
+import pathlib
+
 import pytest
 from pytest import yield_fixture
 from pytest_fixture_config import yield_requires_config
@@ -124,7 +126,7 @@ def sdist(distname, version):
         make_nspkg_sdist(str(dist_path), distname, version)
         return dist_path
     dependency_links = [
-        str(dist_path)
+        pathlib.Path(str(dist_path)).as_uri()
         for dist_path in (
             sdist('foobar', '2.4'),
             sdist('bits', '4.2'),

From d368be2b5be8676ba8a3d55045b45b55090f6982 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Dec 2020 13:36:37 -0500
Subject: [PATCH 8240/8469] Move changelog to new issue. Fixes #2485.

---
 changelog.d/2478.misc.2.rst | 2 --
 changelog.d/2485.misc.rst   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/2478.misc.2.rst
 create mode 100644 changelog.d/2485.misc.rst

diff --git a/changelog.d/2478.misc.2.rst b/changelog.d/2478.misc.2.rst
deleted file mode 100644
index 27c07b1152..0000000000
--- a/changelog.d/2478.misc.2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix tests with pip 20.3+
--- by :user:`yan12125`
diff --git a/changelog.d/2485.misc.rst b/changelog.d/2485.misc.rst
new file mode 100644
index 0000000000..0a28fd931e
--- /dev/null
+++ b/changelog.d/2485.misc.rst
@@ -0,0 +1,2 @@
+Fixed failing test when pip 20.3+ is present.
+-- by :user:`yan12125`

From 3f7a90f597ff52d05abae1b07ba65fd6b5c80c85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Dec 2020 14:10:51 -0500
Subject: [PATCH 8241/8469] Update changelog.

---
 changelog.d/2486.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2486.change.rst

diff --git a/changelog.d/2486.change.rst b/changelog.d/2486.change.rst
new file mode 100644
index 0000000000..f4f783e200
--- /dev/null
+++ b/changelog.d/2486.change.rst
@@ -0,0 +1 @@
+Project adopts jaraco/skeleton for shared package maintenance.

From 2667241f44fed464948cbd140bed1b17cfe4e826 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 12 Dec 2020 23:29:03 -0500
Subject: [PATCH 8242/8469] Update skeleton description to describe the
 periodic collapse. Fixes #27.

---
 skeleton.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/skeleton.md b/skeleton.md
index ec421c2598..dd8ec014cd 100644
--- a/skeleton.md
+++ b/skeleton.md
@@ -46,6 +46,26 @@ For example, here's a session of the [path project](https://pypi.org/project/pat
 
 Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
 
+## Periodic Collapse
+
+In late 2020, this project [introduced](https://github.com/jaraco/skeleton/issues/27) the idea of a periodic but infrequent (O(years)) collapse of commits to limit the number of commits a new consumer will need to accept to adopt the skeleton.
+
+The full history of commits is collapsed into a single commit and that commit becomes the new mainline head.
+
+When one of these collapse operations happens, any project that previously pulled from the skeleton will no longer have a related history with that new main branch. For those projects, the skeleton provides a "handoff" branch that reconciles the two branches. Any project that has previously merged with the skeleton but now gets an error "fatal: refusing to merge unrelated histories" should instead use the handoff branch once to incorporate the new main branch.
+
+```
+$ git pull https://github.com/jaraco/skeleton 2020-handoff
+```
+
+This handoff needs to be pulled just once and thereafter the project can pull from the main head.
+
+The archive and handoff branches from prior collapses are indicate here:
+
+| refresh | archive         | handoff      |
+|---------|-----------------|--------------|
+| 2020-12 | archive/2020-12 | 2020-handoff |
+
 # Features
 
 The features/techniques employed by the skeleton include:

From 701eee9e53dcbfe200bef46420da420052699e68 Mon Sep 17 00:00:00 2001
From: Chih-Hsuan Yen <yan12125@gmail.com>
Date: Sun, 13 Dec 2020 18:01:50 +0800
Subject: [PATCH 8243/8469] Fix tests with pytest 6.2

The latest pytest deprecates pytest.yield_fixture in favor of
pytest.fixture [1]. The changelog [2] says that both are the same.

[1] https://github.com/pytest-dev/pytest/pull/7988
[2] https://docs.pytest.org/en/stable/changelog.html#pytest-6-2-0-2020-12-12
---
 changelog.d/2487.misc.rst             | 2 ++
 pkg_resources/tests/test_resources.py | 4 ++--
 setuptools/tests/fixtures.py          | 4 ++--
 setuptools/tests/test_develop.py      | 4 ++--
 setuptools/tests/test_easy_install.py | 6 +++---
 setuptools/tests/test_egg_info.py     | 2 +-
 setuptools/tests/test_msvc.py         | 6 +++---
 setuptools/tests/test_virtualenv.py   | 3 +--
 8 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 changelog.d/2487.misc.rst

diff --git a/changelog.d/2487.misc.rst b/changelog.d/2487.misc.rst
new file mode 100644
index 0000000000..003f6efbdf
--- /dev/null
+++ b/changelog.d/2487.misc.rst
@@ -0,0 +1,2 @@
+ Fix tests with pytest 6.2
+-- by :user:`yan12125`
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index b08bb293ef..965a7c0089 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -773,7 +773,7 @@ class TestNamespaces:
 
     ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def symlinked_tmpdir(self, tmpdir):
         """
         Where available, return the tempdir as a symlink,
@@ -791,7 +791,7 @@ def symlinked_tmpdir(self, tmpdir):
         finally:
             os.unlink(link_name)
 
-    @pytest.yield_fixture(autouse=True)
+    @pytest.fixture(autouse=True)
     def patched_path(self, tmpdir):
         """
         Patch sys.path to include the 'site-pkgs' dir. Also
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 5204c8d126..e8cb7f5237 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -3,7 +3,7 @@
 from . import contexts
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def user_override(monkeypatch):
     """
     Override site.USER_BASE and site.USER_SITE with temporary directories in
@@ -17,7 +17,7 @@ def user_override(monkeypatch):
                 yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def tmpdir_cwd(tmpdir):
     with tmpdir.as_cwd() as orig:
         yield orig
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 9854420e6b..2766da2f79 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -31,7 +31,7 @@
 """
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def temp_user(monkeypatch):
     with contexts.tempdir() as user_base:
         with contexts.tempdir() as user_site:
@@ -40,7 +40,7 @@ def temp_user(monkeypatch):
             yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def test_env(tmpdir, temp_user):
     target = tmpdir
     foo = target.mkdir('foo')
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 26a5e9a6ba..dc00e697de 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -305,7 +305,7 @@ def test_add_from_site_is_ignored(self):
         assert not pth.dirty
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def setup_context(tmpdir):
     with (tmpdir / 'setup.py').open('w') as f:
         f.write(SETUP_PY)
@@ -361,7 +361,7 @@ def foo_package(self, tmpdir):
             f.write('Name: foo\n')
         return str(tmpdir)
 
-    @pytest.yield_fixture()
+    @pytest.fixture()
     def install_target(self, tmpdir):
         target = str(tmpdir)
         with mock.patch('sys.path', sys.path + [target]):
@@ -406,7 +406,7 @@ def patched_setup_context(self):
         )
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def distutils_package():
     distutils_setup_py = SETUP_PY.replace(
         'from setuptools import setup',
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index dc472af4c8..1047468b18 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -45,7 +45,7 @@ def run():
                 """)
         })
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def env(self):
         with contexts.tempdir(prefix='setuptools-test.') as env_dir:
             env = Environment(env_dir)
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index 24e38ea880..d1527bfa46 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -88,7 +88,7 @@ def test_no_registry_entries_means_nothing_found(self):
                     assert isinstance(exc, expected)
                     assert 'aka.ms/vcpython27' in str(exc)
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def user_preferred_setting(self):
         """
         Set up environment with different install dirs for user vs. system
@@ -116,7 +116,7 @@ def test_prefer_current_user(self, user_preferred_setting):
         expected = os.path.join(user_preferred_setting, 'vcvarsall.bat')
         assert expected == result
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def local_machine_setting(self):
         """
         Set up environment with only the system environment configured.
@@ -138,7 +138,7 @@ def test_local_machine_recognized(self, local_machine_setting):
         expected = os.path.join(local_machine_setting, 'vcvarsall.bat')
         assert expected == result
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def x64_preferred_setting(self):
         """
         Set up environment with 64-bit and 32-bit system settings configured
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index e7b100fba4..21dea5bb87 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -5,7 +5,6 @@
 import pathlib
 
 import pytest
-from pytest import yield_fixture
 from pytest_fixture_config import yield_requires_config
 
 import pytest_virtualenv
@@ -29,7 +28,7 @@ def pytest_virtualenv_works(virtualenv):
 
 
 @yield_requires_config(pytest_virtualenv.CONFIG, ['virtualenv_executable'])
-@yield_fixture(scope='function')
+@pytest.fixture(scope='function')
 def bare_virtualenv():
     """ Bare virtualenv (no pip/setuptools/wheel).
     """

From 150321caba0dc73489b61d6b5bbfbed52b795ae7 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Dec 2020 14:03:23 -0500
Subject: [PATCH 8244/8469] Enable automerge

---
 .github/workflows/automerge.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 0000000000..4f70acfbcb
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,27 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

From 9008e48a54bde1cbbabaf4423906630a4edab877 Mon Sep 17 00:00:00 2001
From: Matt Deitke <mdeitke23@gmail.com>
Date: Sun, 13 Dec 2020 20:42:20 -0800
Subject: [PATCH 8245/8469] typo

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 30989826fb..1d557d47bd 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -71,7 +71,7 @@ file in the ``dist`` directory), which you can upload to PyPI!
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
 project.  And maybe your project will have grown by then to include a few
-dependencies, and perhaps some data files and scripts. In the next few section,
+dependencies, and perhaps some data files and scripts. In the next few sections,
 we will walk through those additional but essential information you need
 to specify to properly package your project.
 

From a283c8776ef8ee56c5088a93a55c77509bc399c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 13:09:01 -0500
Subject: [PATCH 8246/8469] Restore fail on warning in docs builds.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 8b628f6545..54ea6850b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ extras =
 	testing
 changedir = docs
 commands =
-	python -m sphinx . {toxinidir}/build/html
+	python -m sphinx -W . {toxinidir}/build/html
 
 [testenv:finalize]
 skip_install = True

From c769f4d850a0697833216fa7daef7bf0f0519b8f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 13:52:52 -0500
Subject: [PATCH 8247/8469] Remove redundant dependencies

---
 setup.cfg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index edcbb03f45..f3f53f6c98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,18 +45,13 @@ testing =
 
 	# local
     mock
-    pytest-flake8
     flake8-2020
     virtualenv>=13.0.0
     pytest-virtualenv>=1.2.7
-    pytest>=3.7
     wheel
-    coverage>=4.5.1
-    pytest-cov>=2.5.1
     paver
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
-    jaraco.test >= 3.1.1; python_version >= "3.6"
 
 docs =
     # Keep these in sync with docs/requirements.txt

From 176622446978b4d8f69cffd81c734753fc094616 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 13:53:59 -0500
Subject: [PATCH 8248/8469] Add PyPy3 to list of Pythons tested

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c5c232c36..0e2a8fa8e7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python: [3.6, 3.8, 3.9]
+        python: [3.6, 3.8, 3.9, pypy3]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

From e52ace421bdf5bf9b236c05af924501e061a7f3c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 14:18:05 -0500
Subject: [PATCH 8249/8469] Ensure windir is passed in environment.

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 54ea6850b8..d58164cc68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,8 @@ install_command = {[helpers]pip} install {opts} {packages}
 list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
+passenv =
+	windir  # required for test_pkg_resources
 
 [testenv:coverage]
 description=Combine coverage data and create report

From cabb200e590955eee70b67787eaa5597d4d0ff19 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 14:54:14 -0500
Subject: [PATCH 8250/8469] =?UTF-8?q?Bump=20version:=2051.0.0=20=E2=86=92?=
 =?UTF-8?q?=2051.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 18 ++++++++++++++++++
 changelog.d/2477.misc.rst   |  1 -
 changelog.d/2484.misc.rst   |  1 -
 changelog.d/2485.misc.rst   |  2 --
 changelog.d/2486.change.rst |  1 -
 changelog.d/2487.misc.rst   |  2 --
 setup.cfg                   |  2 +-
 8 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 changelog.d/2477.misc.rst
 delete mode 100644 changelog.d/2484.misc.rst
 delete mode 100644 changelog.d/2485.misc.rst
 delete mode 100644 changelog.d/2486.change.rst
 delete mode 100644 changelog.d/2487.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c56d45dc8e..d156dedb0f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.0.0
+current_version = 51.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 55133876e9..fb5725cc3f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+v51.1.0
+-------
+
+
+Changes
+^^^^^^^
+* #2486: Project adopts jaraco/skeleton for shared package maintenance.
+
+Misc
+^^^^
+* #2477: Restore inclusion of rst files in sdist.
+* #2484: Setuptools has replaced the master branch with the main branch.
+* #2485: Fixed failing test when pip 20.3+ is present.
+  -- by :user:`yan12125`
+* #2487: Fix tests with pytest 6.2
+  -- by :user:`yan12125`
+
+
 v51.0.0
 -------
 
diff --git a/changelog.d/2477.misc.rst b/changelog.d/2477.misc.rst
deleted file mode 100644
index 48900e9da2..0000000000
--- a/changelog.d/2477.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Restore inclusion of rst files in sdist.
diff --git a/changelog.d/2484.misc.rst b/changelog.d/2484.misc.rst
deleted file mode 100644
index 8f93b3d0ed..0000000000
--- a/changelog.d/2484.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Setuptools has replaced the master branch with the main branch.
diff --git a/changelog.d/2485.misc.rst b/changelog.d/2485.misc.rst
deleted file mode 100644
index 0a28fd931e..0000000000
--- a/changelog.d/2485.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed failing test when pip 20.3+ is present.
--- by :user:`yan12125`
diff --git a/changelog.d/2486.change.rst b/changelog.d/2486.change.rst
deleted file mode 100644
index f4f783e200..0000000000
--- a/changelog.d/2486.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Project adopts jaraco/skeleton for shared package maintenance.
diff --git a/changelog.d/2487.misc.rst b/changelog.d/2487.misc.rst
deleted file mode 100644
index 003f6efbdf..0000000000
--- a/changelog.d/2487.misc.rst
+++ /dev/null
@@ -1,2 +0,0 @@
- Fix tests with pytest 6.2
--- by :user:`yan12125`
diff --git a/setup.cfg b/setup.cfg
index f3f53f6c98..6ef70e2660 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = setuptools
-version = 51.0.0
+version = 51.1.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 8a99cc4660582b651d91421d4f47cb988a355741 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 20:42:36 -0500
Subject: [PATCH 8251/8469] Disable integration tests on PyPy on Windows. Ref
 #2496.

---
 setuptools/tests/test_integration.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index 04ba62f7ba..b557831216 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -15,6 +15,13 @@
 from setuptools.dist import Distribution
 
 
+pytestmark = pytest.mark.skipif(
+    'platform.python_implementation() == "PyPy" and '
+    'platform.system() == "Windows"',
+    reason="pypa/setuptools#2496",
+)
+
+
 def setup_module(module):
     packages = 'stevedore', 'virtualenvwrapper', 'pbr', 'novaclient'
     for pkg in packages:

From 9e3806e5a557d3041dacb34801aed3e4a1dc654e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 23:26:07 -0500
Subject: [PATCH 8252/8469] Fix syntax in test_build_meta, version should not
 have quotes. Bug was masked by LegacyVersion parsing.

---
 setuptools/tests/test_build_meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 5462b26a8a..6d3a997ee0 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -108,7 +108,7 @@ def run():
         'setup.cfg': DALS("""
         [metadata]
         name = foo
-        version='0.0.0'
+        version = 0.0.0
 
         [options]
         py_modules=hello

From d503f75e0535edb644a53fd77b4bc85a97fb4add Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 20 Dec 2020 23:37:47 -0500
Subject: [PATCH 8253/8469] Fix badge for GHA

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 2273dcd897..526d1222da 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,8 @@
 
 .. _PyPI link: https://pypi.org/project/setuptools
 
-.. image:: https://github.com/jaraco/setuptools/workflows/Automated%20Tests/badge.svg
-   :target: https://github.com/jaraco/setuptools/actions?query=workflow%3A%22Automated+Tests%22
+.. image:: https://github.com/pypa/setuptools/workflows/Automated%20Tests/badge.svg
+   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22Automated+Tests%22
    :alt: Automated Tests
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg

From dfd155218751787fecd2bb3a11fef6e510ed8ec3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 21 Dec 2020 11:25:18 -0500
Subject: [PATCH 8254/8469] Unset tag_build and tag_date prior to cutting a
 release. Fixes #2500.

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 517dd4d906..9680ec0100 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,6 +68,8 @@ setenv =
 commands =
 	python -m bootstrap
 	python -c "import path; path.Path('dist').rmtree_p()"
+	# unset tag_build and tag_date pypa/setuptools#2500
+	python setup.py egg_info -Db "" saveopts
 	python -m pep517.build .
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release

From ac2311014ab27409f1ca109101131fd7383cdc32 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 21 Dec 2020 12:20:02 -0500
Subject: [PATCH 8255/8469] Include tmpl files in manifest template. Workaround
 for #2498.

Tests once again pass on an extract of the sdist.
---
 MANIFEST.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 92bd4f6938..eba40c5de6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,12 @@
-recursive-include setuptools *.py *.exe *.xml
+recursive-include setuptools *.py *.exe *.xml *.tmpl
 recursive-include tests *.py
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.rst *.conf *.css *.css_t Makefile indexsidebar.html
 recursive-include setuptools/_vendor *.py *.txt
 recursive-include pkg_resources *.py *.txt
 recursive-include pkg_resources/tests/data *
+recursive-include tools *
+recursive-include changelog.d *
 include *.py
 include *.rst
 include MANIFEST.in

From 44d45ae20a663f1cb75812657cee1244e3dddb58 Mon Sep 17 00:00:00 2001
From: Tim Hatch <thatch@fb.com>
Date: Mon, 14 Dec 2020 09:37:47 -0800
Subject: [PATCH 8256/8469] Failing test for #2489

---
 .../data/my-test-package-zip/my-test-package.zip | Bin 0 -> 1809 bytes
 pkg_resources/tests/test_find_distributions.py   |   9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 pkg_resources/tests/data/my-test-package-zip/my-test-package.zip

diff --git a/pkg_resources/tests/data/my-test-package-zip/my-test-package.zip b/pkg_resources/tests/data/my-test-package-zip/my-test-package.zip
new file mode 100644
index 0000000000000000000000000000000000000000..81f9a0170f7aca13a0d1d8e5201c2c186554ce7e
GIT binary patch
literal 1809
zcmWIWW@h1H0D)azeSu&Gl#pbQVaTnFFG(#fi7!Y@&Q45E)k{rJ*UijJ%hwML;bdUe
zpMO0bgi9;985mh!GBYrMi2%5fTY*MSX1i|02s9Fe)$kcvl3x&?lUkOVqgPT<0ybX_
zXf_C=na_pW0$qF-q@)(4=B1?OC0EAhWaecTQ(%uGK6|P%3v`PU(^3igK?E2i91Ng9
z>Qt-#nFi!t0Adw<W(WI+206P16LNa(DMzkm0|C|xd&@nmI+9$uv_!8f9+@xT^Y}o|
z(vM%7s_*VSnta0T*3W>Cnp#)4OE7jTz7~^SAlTG(bAA8AyDPR;f4!dkX8HNea$EmA
zwK}WtMDnKS<fOPCb*H`59=4a<|K`!P_BbOb9uR(DjypD?0_gtTK#Vth0=(UIJ^kGL
z@rBQ4UtLchPaV%IyxzK6=gyqp9At3C_`xUdGrn7cPOQD6>#3`EQP;!goS%>XQ>Q?o
zm|3%DM}%Z96?pah?Q{8e$DdA|KbtFL*1Rr(A|2h6C-j}3zh3rCE$x|tORdr5;LlwX
zx9nUZrY@c;Hl^Wh6DQjfm1#?!ia%9yVL&9U4{oU0ffE=l#i=Ew1$xP8>0qa`%*2{J
z5upMy;`CJ|oe*G%WB@S-+=zloxC!NRF%tOcGrA}AwE{K#bTxG~PM$xn`OL}S>j58L
zJywMipb!W>g&G2(ml#h^T`DG;{_OcpEy-7s4y~(<xF2;3Uk=K3?(zyQ-C?p5=rKkn
zIc8irT>|Jj5D;Ma>j<Lp<a<^~zDLWG$i`#ldWi9$5@1VXFh1ka$^f8USn@wUyL1_l
z?b?FRF6_kt=~gPDSSbVaCC<=8lnnT+L1Zb^VgcD_75J<{DI|!q2{rQ~+hoIp$3uv$
zjL#ZKs>94s5Nm*O1WXqEz}f>TdjX9DWiPC$3=%$=nG4y~L2%<hSq+zItZX35Ie<_Y
LsQv{IGcW)EGhqQh

literal 0
HcmV?d00001

diff --git a/pkg_resources/tests/test_find_distributions.py b/pkg_resources/tests/test_find_distributions.py
index f9594422f2..b01b4827a7 100644
--- a/pkg_resources/tests/test_find_distributions.py
+++ b/pkg_resources/tests/test_find_distributions.py
@@ -32,3 +32,12 @@ def test_zipped_egg(self, target_dir):
         assert [dist.project_name for dist in dists] == ['my-test-package']
         dists = pkg_resources.find_distributions(str(target_dir), only=True)
         assert not list(dists)
+
+    def test_zipped_sdist_one_level_removed(self, target_dir):
+        (TESTS_DATA_DIR / 'my-test-package-zip').copy(target_dir)
+        dists = pkg_resources.find_distributions(
+            str(target_dir / "my-test-package.zip"))
+        assert [dist.project_name for dist in dists] == ['my-test-package']
+        dists = pkg_resources.find_distributions(
+            str(target_dir / "my-test-package.zip"), only=True)
+        assert not list(dists)

From c3019cf01e7f3d61f8fa41143e40546247292045 Mon Sep 17 00:00:00 2001
From: Tim Hatch <thatch@fb.com>
Date: Mon, 14 Dec 2020 09:14:45 -0800
Subject: [PATCH 8257/8469] Find .egg-info in zipimport too

Fixes #2489
---
 changelog.d/2489.change.rst | 2 ++
 pkg_resources/__init__.py   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2489.change.rst

diff --git a/changelog.d/2489.change.rst b/changelog.d/2489.change.rst
new file mode 100644
index 0000000000..40eddbe734
--- /dev/null
+++ b/changelog.d/2489.change.rst
@@ -0,0 +1,2 @@
+``pkg_resources`` behavior for zipimport now matches the regular behavior, and finds
+``.egg-info`` (previoulsy would only find ``.dist-info``) -- by :user:`thatch`
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 737f4d5fad..ba90c8c4ab 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1978,12 +1978,13 @@ def find_eggs_in_zip(importer, path_item, only=False):
         # don't yield nested distros
         return
     for subitem in metadata.resource_listdir(''):
+        lower = subitem.lower()
         if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
             dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
             for dist in dists:
                 yield dist
-        elif subitem.lower().endswith('.dist-info'):
+        elif any(map(lower.endswith, ('.dist-info', '.egg-info'))):
             subpath = os.path.join(path_item, subitem)
             submeta = EggMetadata(zipimport.zipimporter(subpath))
             submeta.egg_info = subpath

From 66ca25303126c88b2eb82b21e77a6146ccfd3de9 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Tue, 22 Dec 2020 14:24:22 -0500
Subject: [PATCH 8258/8469] docs: recommend pypa build

---
 docs/build_meta.rst | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/build_meta.rst b/docs/build_meta.rst
index c36e2bab38..9744488e99 100644
--- a/docs/build_meta.rst
+++ b/docs/build_meta.rst
@@ -67,14 +67,11 @@ specify the package information::
     [options]
     packages = find:
 
-Now generate the distribution. Although the PyPA is still working to
-`provide a recommended tool <https://github.com/pypa/packaging-problems/issues/219>`_
-to build packages, the `pep517 package <https://pypi.org/project/pep517>`_
-provides this functionality. To build the package::
-
-    $ pip install -q pep517
-    $ mkdir dist
-    $ python -m pep517.build .
+Now generate the distribution. To build the package, use
+`PyPA build <https://pypa-build.readthedocs.io/en/latest/>`_::
+
+    $ pip install -q build
+    $ python -m build
 
 And now it's done! The ``.whl`` file  and ``.tar.gz`` can then be distributed 
 and installed::

From 13d7bcb994097895ed7f6c6af419e3a037fe90a7 Mon Sep 17 00:00:00 2001
From: Daniel Moore <xdhmoore@users.noreply.github.com>
Date: Wed, 23 Dec 2020 14:39:27 -0800
Subject: [PATCH 8259/8469] Clarify Development Mode first paragraph

---
 docs/userguide/development_mode.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/userguide/development_mode.rst b/docs/userguide/development_mode.rst
index bce724a79f..3c477ec114 100644
--- a/docs/userguide/development_mode.rst
+++ b/docs/userguide/development_mode.rst
@@ -3,9 +3,9 @@
 
 Under normal circumstances, the ``distutils`` assume that you are going to
 build a distribution of your project, not use it in its "raw" or "unbuilt"
-form.  If you were to use the ``distutils`` that way, you would have to rebuild
-and reinstall your project every time you made a change to it during
-development.
+form.  However, if you were to use the ``distutils`` to build a distribution,
+you would have to rebuild and reinstall your project every time you made a
+change to it during development.
 
 Another problem that sometimes comes up with the ``distutils`` is that you may
 need to do development on two related projects at the same time.  You may need

From e83dc66104e2a5ad8e5a8db3079d24628b1fa6d7 Mon Sep 17 00:00:00 2001
From: Drew <drewrisinger@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:52:54 -0500
Subject: [PATCH 8260/8469] docs (build_meta): fix spelling mistake

---
 docs/build_meta.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build_meta.rst b/docs/build_meta.rst
index 9744488e99..2ad5ae267e 100644
--- a/docs/build_meta.rst
+++ b/docs/build_meta.rst
@@ -7,7 +7,7 @@ What is it?
 
 Python packaging has come `a long way <https://www.bernat.tech/pep-517-518/>`_.
 
-The traditional ``setuptools`` way of packgaging Python modules
+The traditional ``setuptools`` way of packaging Python modules
 uses a ``setup()`` function within the ``setup.py`` script. Commands such as
 ``python setup.py bdist`` or ``python setup.py bdist_wheel`` generate a 
 distribution bundle and ``python setup.py install`` installs the distribution. 

From c0c9cfde2eb7ad0573bf68ddb34944833aeb1d3c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 21 Dec 2020 20:32:49 +0100
Subject: [PATCH 8261/8469] Migrate to `extend-exclude` in flake8 config

This makes sure that flake8's defaults are in use. Specifically, it
excludes `.tox/` dir that is known to contain a lot of files in nested
folders that are not supposed to be linted.

Refs:
* https://github.com/pypa/setuptools/issues/2501#issuecomment-749144396
* https://github.com/pypa/setuptools/pull/2486/files#r546877674
* https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-extend-exclude
* https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-exclude
---
 .flake8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.flake8 b/.flake8
index 8bc2d27060..13381d6a5d 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 88
-exclude =
+extend-exclude =
 	setuptools/_vendor
 	pkg_resources/_vendor
 ignore =

From 45721e8f5e9cbbdb5f2406cc125cd4855e83fa0a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Mon, 21 Dec 2020 20:35:35 +0100
Subject: [PATCH 8262/8469] Exclude `build/lib/` artifacts in flake8 config

---
 .flake8 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.flake8 b/.flake8
index 13381d6a5d..5e1c7cae92 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,7 @@
 [flake8]
 max-line-length = 88
 extend-exclude =
+	build/lib
 	setuptools/_vendor
 	pkg_resources/_vendor
 ignore =

From cfb8ae513add75757e9e19d912bb8b8300f05b94 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Dec 2020 22:01:46 +0100
Subject: [PATCH 8263/8469] Fix misplaced/mistyped per-file-ignores in flake8

Ref: https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-per-file-ignores
---
 .flake8 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.flake8 b/.flake8
index 8bc2d27060..bd097eec11 100644
--- a/.flake8
+++ b/.flake8
@@ -10,5 +10,8 @@ ignore =
 	W504
 	# Black creates whitespace before colon
 	E203
-	setuptools/site-patch.py F821
-	setuptools/py*compat.py F811
+
+# Allow certain violations in certain files:
+per-file-ignores =
+	setuptools/site-patch.py: F821
+	setuptools/py*compat.py: F811

From ae51676d767f8ea514a62f050e670ada435ad91d Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Dec 2020 22:04:27 +0100
Subject: [PATCH 8264/8469] Drop non-existing site-patch.py from flake8

---
 .flake8 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.flake8 b/.flake8
index bd097eec11..42d9c477d3 100644
--- a/.flake8
+++ b/.flake8
@@ -13,5 +13,4 @@ ignore =
 
 # Allow certain violations in certain files:
 per-file-ignores =
-	setuptools/site-patch.py: F821
 	setuptools/py*compat.py: F811

From 5f4153bfb8c131467a47d05407325bb6b10dd992 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Dec 2020 22:05:03 +0100
Subject: [PATCH 8265/8469] Drop unmached py*compat.py ignore rule from flake8

---
 .flake8 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.flake8 b/.flake8
index 42d9c477d3..2fb438d5ba 100644
--- a/.flake8
+++ b/.flake8
@@ -10,7 +10,3 @@ ignore =
 	W504
 	# Black creates whitespace before colon
 	E203
-
-# Allow certain violations in certain files:
-per-file-ignores =
-	setuptools/py*compat.py: F811

From 33d09d12cb20412fbe1c490e7c3865202f3b7cf2 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Dec 2020 22:17:52 +0100
Subject: [PATCH 8266/8469] Use `extend-ignore` in flake8 config

This option allows adding extra ignored rules to the default list
instead of replacing it.

The default exclusions are: E121, E123, E126, E226, E24, E704,
W503 and W504.

Refs:
* https://github.com/pypa/setuptools/pull/2486/files#r541943356
* https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-extend-ignore
* https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-ignore
* #2501
* https://github.com//skeleton/issues/28
---
 .flake8 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.flake8 b/.flake8
index 8bc2d27060..bfa744bef2 100644
--- a/.flake8
+++ b/.flake8
@@ -3,11 +3,7 @@ max-line-length = 88
 exclude =
 	setuptools/_vendor
 	pkg_resources/_vendor
-ignore =
-	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
-	W503
-	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
-	W504
+extend-ignore =
 	# Black creates whitespace before colon
 	E203
 	setuptools/site-patch.py F821

From 4665f91bda1541205d9a6675bc81ed6599a608e3 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 26 Dec 2020 23:09:10 +0100
Subject: [PATCH 8267/8469] Use license_files instead of license_file in meta

Singular `license_file` is deprecated since wheel v0.32.0.

Refs:
* https://wheel.readthedocs.io/en/stable/news.html
* https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
---
 setup.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 6ef70e2660..32d1f674cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,6 @@
 [metadata]
-license_file = LICENSE
+license_files =
+    LICENSE
 name = setuptools
 version = 51.1.0
 author = Python Packaging Authority

From c657e826e0d4f24a3702763ab25610d48ceea222 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 15:05:45 -0500
Subject: [PATCH 8268/8469] Replace incorrect statement about triggering
 installation of dependencies to indicate that the handling is mostly
 implementation specific. Ref pypa/setuptools#1471.

---
 docs/userguide/dependency_management.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index 354a9f8c36..0eb2186494 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -72,7 +72,7 @@ When your project is installed (e.g. using pip), all of the dependencies not
 already installed will be located (via PyPI), downloaded, built (if necessary),
 and installed and 2) Any scripts in your project will be installed with wrappers
 that verify the availability of the specified dependencies at runtime.
-    
+
 
 Platform specific dependencies
 ------------------------------
@@ -202,7 +202,7 @@ Optional dependencies
 Setuptools allows you to declare dependencies that only get installed under
 specific circumstances. These dependencies are specified with ``extras_require``
 keyword and are only installed if another package depends on it (either
-directly or indirectly) This makes it convenient to declare dependencies for 
+directly or indirectly) This makes it convenient to declare dependencies for
 ancillary functions such as "tests" and "docs".
 
 .. note::
@@ -262,8 +262,12 @@ First is the console_scripts entry point:
         }
     )
 
-When the script ``rst2pdf`` is run, it will trigger the installation of
-the two dependencies ``PDF`` maps to.
+This syntax indicates that the entry point (in this case a console script)
+is only valid when the PDF extra is installed. It is up to the installer
+to determine how to handle the situation where PDF was not indicated
+(e.g. omit the console script, provide a warning when attempting to load
+the entry point, assume the extras are present and let the implementation
+fail later).
 
 The second use case is that other package can use this "extra" for their
 own dependencies. For example, if "Project-B" needs "project A" with PDF support

From 36233fe32c300e8e6b7c4d3ce53b37f23af24933 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 15:58:41 -0500
Subject: [PATCH 8269/8469] Update changelog. Ref #1471.

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index fb5725cc3f..a9945d3cfb 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -371,6 +371,7 @@ v47.2.0
 Changes
 ^^^^^^^
 * #2194: Editable-installed entry points now load significantly faster on Python versions 3.8+.
+* #1471: Incidentally fixed by #2194 on Python 3.8 or when importlib_metadata is present.
 
 
 v47.1.1

From 0f699dcd4d3a74aeae19e7c61c150c037bf06213 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 18:01:34 -0500
Subject: [PATCH 8270/8469] In test_test_command_install_requirements,
 uninstall setuptools to avoid getting some other version in the environment.

---
 setuptools/tests/test_virtualenv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 21dea5bb87..950c74c5d5 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -179,6 +179,8 @@ def test_test_command_install_requirements(virtualenv, tmpdir):
     # Ensure pip/wheel packages are installed.
     virtualenv.run(
         "python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
+    # uninstall setuptools so that 'setup.py develop' works
+    virtualenv.run("python -m pip uninstall -y setuptools")
     _check_test_command_install_requirements(virtualenv, tmpdir)
 
 

From bc65372f3e3c73e7e16a3d3faf29dc0984752718 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 21:20:42 -0500
Subject: [PATCH 8271/8469] Disable index URL in pip-based fetch_build_eggs to
 avoid hitting PyPI.

---
 setuptools/tests/test_virtualenv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 950c74c5d5..5a942d84c5 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -181,6 +181,8 @@ def test_test_command_install_requirements(virtualenv, tmpdir):
         "python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
     # uninstall setuptools so that 'setup.py develop' works
     virtualenv.run("python -m pip uninstall -y setuptools")
+    # disable index URL so bits and bobs aren't requested from PyPI
+    virtualenv.env['PIP_NO_INDEX'] = '1'
     _check_test_command_install_requirements(virtualenv, tmpdir)
 
 

From 3d4b6b0b15c6a78397a704194bcd5037d8382c1d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 21:37:48 -0500
Subject: [PATCH 8272/8469] Update changelog.

---
 changelog.d/2525.patch.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2525.patch.rst

diff --git a/changelog.d/2525.patch.rst b/changelog.d/2525.patch.rst
new file mode 100644
index 0000000000..8b590dce27
--- /dev/null
+++ b/changelog.d/2525.patch.rst
@@ -0,0 +1 @@
+Avoid hitting network during test_virtualenv.test_test_command.

From 4bc5bb337b52ff8619e2c0009ab6eb71678fa429 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 21:45:45 -0500
Subject: [PATCH 8273/8469] Rename changelog

---
 changelog.d/{2525.patch.rst => 2525.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2525.patch.rst => 2525.misc.rst} (100%)

diff --git a/changelog.d/2525.patch.rst b/changelog.d/2525.misc.rst
similarity index 100%
rename from changelog.d/2525.patch.rst
rename to changelog.d/2525.misc.rst

From 60c341b82f3ddb188823405225ec5cd5b217784c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 28 Dec 2020 21:45:52 -0500
Subject: [PATCH 8274/8469] =?UTF-8?q?Bump=20version:=2051.1.0=20=E2=86=92?=
 =?UTF-8?q?=2051.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 9 +++++++++
 changelog.d/2525.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2525.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d156dedb0f..60e7352f59 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.1.0
+current_version = 51.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index a9945d3cfb..ca76648bd2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.1.1
+-------
+
+
+Misc
+^^^^
+* #2525: Avoid hitting network during test_virtualenv.test_test_command.
+
+
 v51.1.0
 -------
 
diff --git a/changelog.d/2525.misc.rst b/changelog.d/2525.misc.rst
deleted file mode 100644
index 8b590dce27..0000000000
--- a/changelog.d/2525.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid hitting network during test_virtualenv.test_test_command.
diff --git a/setup.cfg b/setup.cfg
index 6ef70e2660..9d41be119c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = setuptools
-version = 51.1.0
+version = 51.1.1
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 4b1334629e1cb254a1b6853f045f2615b79ec9e1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Dec 2020 09:56:52 -0500
Subject: [PATCH 8275/8469] Automatically inject project name in docs heading.

---
 docs/index.rst | 4 ++--
 setup.cfg      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index d14131b0ef..325842bb7f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,5 +1,5 @@
-Welcome to skeleton documentation!
-========================================
+Welcome to |project| documentation!
+===================================
 
 .. toctree::
    :maxdepth: 1
diff --git a/setup.cfg b/setup.cfg
index 6321ca774c..4fc095b31d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ testing =
 docs =
 	# upstream
 	sphinx
-	jaraco.packaging >= 3.2
+	jaraco.packaging >= 8.2
 	rst.linker >= 1.9
 
 	# local

From ad71fbc76951144facc0dbd4fe39715c95915511 Mon Sep 17 00:00:00 2001
From: Jonathan E <jelsnerbusiness@outlook.com>
Date: Tue, 29 Dec 2020 17:19:49 -0800
Subject: [PATCH 8276/8469] Fix code typo in entry_point.rst

In __init__.py the function helloworld() was defined, but everywhere else, hello_world() is called. Rename this function so that it is consistent with the naming in the rest of the file.
---
 docs/userguide/entry_point.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index edab446502..738207282c 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -28,7 +28,7 @@ with ``__init__.py`` as:
 
 .. code-block:: python
 
-    def helloworld():
+    def hello_world():
         print("Hello world")
 
 and ``__main__.py`` providing a hook:

From cfe99a5a7941f9f8785dd3ec12d1df94e9134411 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 29 Dec 2020 21:27:53 -0500
Subject: [PATCH 8277/8469] pre-commit autoupdate

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6639c78c6c..c15ab0c9e6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: stable
+  rev: 20.8b1
   hooks:
   - id: black
 
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.8.0
+  rev: v1.9.1
   hooks:
   - id: blacken-docs

From 060d491a9aaacfe457ad365cfd60b611fc9f5bcf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Dec 2020 10:57:25 -0500
Subject: [PATCH 8278/8469] Rename 'Automated Tests' to simply 'tests'

---
 .github/workflows/main.yml | 2 +-
 README.rst                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c5c232c36..6a8ff006f4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Automated Tests
+name: tests
 
 on: [push, pull_request]
 
diff --git a/README.rst b/README.rst
index 69554ef811..128e61e41e 100644
--- a/README.rst
+++ b/README.rst
@@ -6,9 +6,9 @@
 
 .. _PyPI link: https://pypi.org/project/skeleton
 
-.. image:: https://github.com/jaraco/skeleton/workflows/Automated%20Tests/badge.svg
-   :target: https://github.com/jaraco/skeleton/actions?query=workflow%3A%22Automated+Tests%22
-   :alt: Automated Tests
+.. image:: https://github.com/jaraco/skeleton/workflows/tests/badge.svg
+   :target: https://github.com/jaraco/skeleton/actions?query=workflow%3A%22tests%22
+   :alt: tests
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/psf/black

From 2b839bad1c2189f4eeb0f74c4a2455ba6687741b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Dec 2020 12:06:13 -0500
Subject: [PATCH 8279/8469] Add note about automatic merging of PRs and the
 requirements and limitations.

---
 skeleton.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/skeleton.md b/skeleton.md
index dd8ec014cd..0938f8920d 100644
--- a/skeleton.md
+++ b/skeleton.md
@@ -138,6 +138,8 @@ Features include:
 - test against multiple Python versions
 - run on late (and updated) platform versions
 - automated releases of tagged commits
+- [automatic merging of PRs](https://github.com/marketplace/actions/merge-pull-requests) (requires [protecting branches with required status checks](https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/enabling-required-status-checks), [not possible through API](https://github.community/t/set-all-status-checks-to-be-required-as-branch-protection-using-the-github-api/119493))
+
 
 ### Continuous Deployments
 

From a36768aa363c8f7b54aae00e11f895ff06337532 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 30 Dec 2020 22:20:46 -0500
Subject: [PATCH 8280/8469] Prefer pytest-enabler to jaraco.test

---
 pyproject.toml | 10 ++++------
 setup.cfg      |  3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 79f088a956..b6ebc0bef6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,16 +7,14 @@ skip-string-normalization = true
 
 [tool.setuptools_scm]
 
-# jaraco/skeleton#22
-[tool.jaraco.pytest.plugins.black]
+[pytest.enabler.black]
 addopts = "--black"
 
-# jaraco/skeleton#22
-[tool.jaraco.pytest.plugins.mypy]
+[pytest.enabler.mypy]
 addopts = "--mypy"
 
-[tool.jaraco.pytest.plugins.flake8]
+[pytest.enabler.flake8]
 addopts = "--flake8"
 
-[tool.jaraco.pytest.plugins.cov]
+[pytest.enabler.cov]
 addopts = "--cov"
diff --git a/setup.cfg b/setup.cfg
index 4fc095b31d..d5010f7046 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,8 +29,7 @@ testing =
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov
 	pytest-mypy; python_implementation != "PyPy"
-	# jaraco/skeleton#22
-	jaraco.test >= 3.2.0
+	pytest-enabler
 
 	# local
 

From 02038f6272bd2fc04066480f7ba7d564ddb58769 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 13:09:59 +0100
Subject: [PATCH 8281/8469] Simplify `setuptools.archive_util.unpack_tarfile`

---
 setuptools/archive_util.py | 94 +++++++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 0ce190b8cf..0f70284822 100644
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -125,6 +125,56 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
                 os.chmod(target, unix_attributes)
 
 
+def _resolve_tar_file_or_dir(tar_obj, tar_member_obj):
+    """Resolve any links and extract link targets as normal files."""
+    while tar_member_obj is not None and (
+            tar_member_obj.islnk() or tar_member_obj.issym()):
+        linkpath = tar_member_obj.linkname
+        if tar_member_obj.issym():
+            base = posixpath.dirname(tar_member_obj.name)
+            linkpath = posixpath.join(base, linkpath)
+            linkpath = posixpath.normpath(linkpath)
+        tar_member_obj = tar_obj._getmember(linkpath)
+
+    is_file_or_dir = (
+        tar_member_obj is not None and
+        (tar_member_obj.isfile() or tar_member_obj.isdir())
+    )
+    if is_file_or_dir:
+        return tar_member_obj
+
+    raise LookupError('Got unknown file type')
+
+
+def _iter_open_tar(tar_obj, extract_dir, progress_filter):
+    """Emit member-destination pairs from a tar archive."""
+    # don't do any chowning!
+    tar_obj.chown = lambda *args: None
+
+    with contextlib.closing(tar_obj):
+        for member in tar_obj:
+            name = member.name
+            # don't extract absolute paths or ones with .. in them
+            if name.startswith('/') or '..' in name.split('/'):
+                continue
+
+            prelim_dst = os.path.join(extract_dir, *name.split('/'))
+
+            try:
+                member = _resolve_tar_file_or_dir(tar_obj, member)
+            except LookupError:
+                continue
+
+            final_dst = progress_filter(name, prelim_dst)
+            if not final_dst:
+                continue
+
+            if final_dst.endswith(os.sep):
+                final_dst = final_dst[:-1]
+
+            yield member, final_dst
+
+
 def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     """Unpack tar/tar.gz/tar.bz2 `filename` to `extract_dir`
 
@@ -138,38 +188,18 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
         raise UnrecognizedFormat(
             "%s is not a compressed or uncompressed tar file" % (filename,)
         ) from e
-    with contextlib.closing(tarobj):
-        # don't do any chowning!
-        tarobj.chown = lambda *args: None
-        for member in tarobj:
-            name = member.name
-            # don't extract absolute paths or ones with .. in them
-            if not name.startswith('/') and '..' not in name.split('/'):
-                prelim_dst = os.path.join(extract_dir, *name.split('/'))
-
-                # resolve any links and to extract the link targets as normal
-                # files
-                while member is not None and (
-                        member.islnk() or member.issym()):
-                    linkpath = member.linkname
-                    if member.issym():
-                        base = posixpath.dirname(member.name)
-                        linkpath = posixpath.join(base, linkpath)
-                        linkpath = posixpath.normpath(linkpath)
-                    member = tarobj._getmember(linkpath)
-
-                if member is not None and (member.isfile() or member.isdir()):
-                    final_dst = progress_filter(name, prelim_dst)
-                    if final_dst:
-                        if final_dst.endswith(os.sep):
-                            final_dst = final_dst[:-1]
-                        try:
-                            # XXX Ugh
-                            tarobj._extract_member(member, final_dst)
-                        except tarfile.ExtractError:
-                            # chown/chmod/mkfifo/mknode/makedev failed
-                            pass
-        return True
+
+    for member, final_dst in _iter_open_tar(
+            tarobj, extract_dir, progress_filter,
+    ):
+        try:
+            # XXX Ugh
+            tarobj._extract_member(member, final_dst)
+        except tarfile.ExtractError:
+            # chown/chmod/mkfifo/mknode/makedev failed
+            pass
+
+    return True
 
 
 extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile

From 0d3b9600b2a94449796d06e3cea06c7a3972887b Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:50:15 +0100
Subject: [PATCH 8282/8469] Simplify `easy_install.install_eggs`

---
 setuptools/command/easy_install.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 9ec83b7d8b..ff449435fd 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -837,12 +837,19 @@ def write_script(self, script_name, contents, mode="t", blockers=()):
 
     def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them
-        if dist_filename.lower().endswith('.egg'):
-            return [self.install_egg(dist_filename, tmpdir)]
-        elif dist_filename.lower().endswith('.exe'):
-            return [self.install_exe(dist_filename, tmpdir)]
-        elif dist_filename.lower().endswith('.whl'):
-            return [self.install_wheel(dist_filename, tmpdir)]
+        installer_map = {
+            '.egg': self.install_egg,
+            '.exe': self.install_exe,
+            '.whl': self.install_wheel,
+        }
+        try:
+            install_dist = installer_map[
+                dist_filename.lower()[-4:]
+            ]
+        except KeyError:
+            pass
+        else:
+            return [install_dist(dist_filename, tmpdir)]
 
         # Anything else, try to extract and build
         setup_base = tmpdir

From b5fdca1ecb05a8c4c2da434e55d6ef5efec91e3e Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:51:58 +0100
Subject: [PATCH 8283/8469] Simplify `easy_install.update_pth`

---
 setuptools/command/easy_install.py | 36 +++++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index ff449435fd..6d990af4e5 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1196,11 +1196,13 @@ def update_pth(self, dist):
             return
 
         for d in self.pth_file[dist.key]:  # drop old entries
-            if self.multi_version or d.location != dist.location:
-                log.info("Removing %s from easy-install.pth file", d)
-                self.pth_file.remove(d)
-                if d.location in self.shadow_path:
-                    self.shadow_path.remove(d.location)
+            if not self.multi_version and d.location == dist.location:
+                continue
+
+            log.info("Removing %s from easy-install.pth file", d)
+            self.pth_file.remove(d)
+            if d.location in self.shadow_path:
+                self.shadow_path.remove(d.location)
 
         if not self.multi_version:
             if dist.location in self.pth_file.paths:
@@ -1214,19 +1216,21 @@ def update_pth(self, dist):
                 if dist.location not in self.shadow_path:
                     self.shadow_path.append(dist.location)
 
-        if not self.dry_run:
+        if self.dry_run:
+            return
 
-            self.pth_file.save()
+        self.pth_file.save()
 
-            if dist.key == 'setuptools':
-                # Ensure that setuptools itself never becomes unavailable!
-                # XXX should this check for latest version?
-                filename = os.path.join(self.install_dir, 'setuptools.pth')
-                if os.path.islink(filename):
-                    os.unlink(filename)
-                f = open(filename, 'wt')
-                f.write(self.pth_file.make_relative(dist.location) + '\n')
-                f.close()
+        if dist.key != 'setuptools':
+            return
+
+        # Ensure that setuptools itself never becomes unavailable!
+        # XXX should this check for latest version?
+        filename = os.path.join(self.install_dir, 'setuptools.pth')
+        if os.path.islink(filename):
+            os.unlink(filename)
+        with open(filename, 'wt') as f:
+            f.write(self.pth_file.make_relative(dist.location) + '\n')
 
     def unpack_progress(self, src, dst):
         # Progress filter for unpacking

From 554ded3e40f5a2f6f426569534d402aad239a199 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:54:06 +0100
Subject: [PATCH 8284/8469] Simplify `command.easy_install.get_site_dirs`

---
 setuptools/command/easy_install.py | 81 ++++++++++++++++--------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6d990af4e5..df7b1d0728 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1371,51 +1371,56 @@ def get_site_dirs():
     if sys.exec_prefix != sys.prefix:
         prefixes.append(sys.exec_prefix)
     for prefix in prefixes:
-        if prefix:
-            if sys.platform in ('os2emx', 'riscos'):
-                sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
-            elif os.sep == '/':
-                sitedirs.extend([
-                    os.path.join(
-                        prefix,
-                        "lib",
-                        "python{}.{}".format(*sys.version_info),
-                        "site-packages",
-                    ),
-                    os.path.join(prefix, "lib", "site-python"),
-                ])
-            else:
-                sitedirs.extend([
+        if not prefix:
+            continue
+
+        if sys.platform in ('os2emx', 'riscos'):
+            sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
+        elif os.sep == '/':
+            sitedirs.extend([
+                os.path.join(
                     prefix,
-                    os.path.join(prefix, "lib", "site-packages"),
-                ])
-            if sys.platform == 'darwin':
-                # for framework builds *only* we add the standard Apple
-                # locations. Currently only per-user, but /Library and
-                # /Network/Library could be added too
-                if 'Python.framework' in prefix:
-                    home = os.environ.get('HOME')
-                    if home:
-                        home_sp = os.path.join(
-                            home,
-                            'Library',
-                            'Python',
-                            '{}.{}'.format(*sys.version_info),
-                            'site-packages',
-                        )
-                        sitedirs.append(home_sp)
+                    "lib",
+                    "python{}.{}".format(*sys.version_info),
+                    "site-packages",
+                ),
+                os.path.join(prefix, "lib", "site-python"),
+            ])
+        else:
+            sitedirs.extend([
+                prefix,
+                os.path.join(prefix, "lib", "site-packages"),
+            ])
+        if sys.platform != 'darwin':
+            continue
+
+        # for framework builds *only* we add the standard Apple
+        # locations. Currently only per-user, but /Library and
+        # /Network/Library could be added too
+        if 'Python.framework' not in prefix:
+            continue
+
+        home = os.environ.get('HOME')
+        if not home:
+            continue
+
+        home_sp = os.path.join(
+            home,
+            'Library',
+            'Python',
+            '{}.{}'.format(*sys.version_info),
+            'site-packages',
+        )
+        sitedirs.append(home_sp)
     lib_paths = get_path('purelib'), get_path('platlib')
-    for site_lib in lib_paths:
-        if site_lib not in sitedirs:
-            sitedirs.append(site_lib)
+
+    sitedirs.extend(s for s in lib_paths if s not in sitedirs)
 
     if site.ENABLE_USER_SITE:
         sitedirs.append(site.USER_SITE)
 
-    try:
+    with contextlib.suppress(AttributeError):
         sitedirs.extend(site.getsitepackages())
-    except AttributeError:
-        pass
 
     sitedirs = list(map(normalize_path, sitedirs))
 

From 7b5f8e131cdce8626c138f8815f9001214dc2541 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:54:56 +0100
Subject: [PATCH 8285/8469] Simplify `command.easy_install.expand_paths`

---
 setuptools/command/easy_install.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index df7b1d0728..6882efe00e 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1459,13 +1459,18 @@ def expand_paths(inputs):
 
             # Yield existing non-dupe, non-import directory lines from it
             for line in lines:
-                if not line.startswith("import"):
-                    line = normalize_path(line.rstrip())
-                    if line not in seen:
-                        seen[line] = 1
-                        if not os.path.isdir(line):
-                            continue
-                        yield line, os.listdir(line)
+                if line.startswith("import"):
+                    continue
+
+                line = normalize_path(line.rstrip())
+                if line in seen:
+                    continue
+
+                seen[line] = 1
+                if not os.path.isdir(line):
+                    continue
+
+                yield line, os.listdir(line)
 
 
 def extract_wininst_cfg(dist_filename):

From 28b54b140cee8b33748833372ca6dbd7e305d94d Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:56:00 +0100
Subject: [PATCH 8286/8469] Simplify `egg_info.FileList.process_template_line`

---
 setuptools/command/egg_info.py | 127 +++++++++++++++++----------------
 1 file changed, 66 insertions(+), 61 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 0b7ad677f2..8e34e4a2c8 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -8,6 +8,7 @@
 from distutils import log
 import distutils.errors
 import distutils.filelist
+import functools
 import os
 import re
 import sys
@@ -332,70 +333,74 @@ def process_template_line(self, line):
         # patterns, (dir and patterns), or (dir_pattern).
         (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
 
+        action_map = {
+            'include': self.include,
+            'exclude': self.exclude,
+            'global-include': self.global_include,
+            'global-exclude': self.global_exclude,
+            'recursive-include': functools.partial(
+                self.recursive_include, dir,
+            ),
+            'recursive-exclude': functools.partial(
+                self.recursive_exclude, dir,
+            ),
+            'graft': self.graft,
+            'prune': self.prune,
+        }
+        log_map = {
+            'include': "warning: no files found matching '%s'",
+            'exclude': (
+                "warning: no previously-included files found "
+                "matching '%s'"
+            ),
+            'global-include': (
+                "warning: no files found matching '%s' "
+                "anywhere in distribution"
+            ),
+            'global-exclude': (
+                "warning: no previously-included files matching "
+                "'%s' found anywhere in distribution"
+            ),
+            'recursive-include': (
+                "warning: no files found matching '%s' "
+                "under directory '%s'"
+            ),
+            'recursive-exclude': (
+                "warning: no previously-included files matching "
+                "'%s' found under directory '%s'"
+            ),
+            'graft': "warning: no directories found matching '%s'",
+            'prune': "no previously-included directories found matching '%s'",
+        }
+
+        try:
+            process_action = action_map[action]
+        except KeyError:
+            raise DistutilsInternalError(
+                "this cannot happen: invalid action '{action!s}'".
+                format(action=action),
+            )
+
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
         # can proceed with minimal error-checking.
-        if action == 'include':
-            self.debug_print("include " + ' '.join(patterns))
-            for pattern in patterns:
-                if not self.include(pattern):
-                    log.warn("warning: no files found matching '%s'", pattern)
-
-        elif action == 'exclude':
-            self.debug_print("exclude " + ' '.join(patterns))
-            for pattern in patterns:
-                if not self.exclude(pattern):
-                    log.warn(("warning: no previously-included files "
-                              "found matching '%s'"), pattern)
-
-        elif action == 'global-include':
-            self.debug_print("global-include " + ' '.join(patterns))
-            for pattern in patterns:
-                if not self.global_include(pattern):
-                    log.warn(("warning: no files found matching '%s' "
-                              "anywhere in distribution"), pattern)
-
-        elif action == 'global-exclude':
-            self.debug_print("global-exclude " + ' '.join(patterns))
-            for pattern in patterns:
-                if not self.global_exclude(pattern):
-                    log.warn(("warning: no previously-included files matching "
-                              "'%s' found anywhere in distribution"),
-                             pattern)
-
-        elif action == 'recursive-include':
-            self.debug_print("recursive-include %s %s" %
-                             (dir, ' '.join(patterns)))
-            for pattern in patterns:
-                if not self.recursive_include(dir, pattern):
-                    log.warn(("warning: no files found matching '%s' "
-                              "under directory '%s'"),
-                             pattern, dir)
-
-        elif action == 'recursive-exclude':
-            self.debug_print("recursive-exclude %s %s" %
-                             (dir, ' '.join(patterns)))
-            for pattern in patterns:
-                if not self.recursive_exclude(dir, pattern):
-                    log.warn(("warning: no previously-included files matching "
-                              "'%s' found under directory '%s'"),
-                             pattern, dir)
-
-        elif action == 'graft':
-            self.debug_print("graft " + dir_pattern)
-            if not self.graft(dir_pattern):
-                log.warn("warning: no directories found matching '%s'",
-                         dir_pattern)
-
-        elif action == 'prune':
-            self.debug_print("prune " + dir_pattern)
-            if not self.prune(dir_pattern):
-                log.warn(("no previously-included directories found "
-                          "matching '%s'"), dir_pattern)
-
-        else:
-            raise DistutilsInternalError(
-                "this cannot happen: invalid action '%s'" % action)
+
+        action_is_recursive = action.startswith('recursive-')
+        if action in {'graft', 'prune'}:
+            patterns = [dir_pattern]
+        extra_log_args = (dir, ) if action_is_recursive else ()
+        log_tmpl = log_map[action]
+
+        self.debug_print(
+            ' '.join(
+                [action] +
+                ([dir] if action_is_recursive else []) +
+                patterns,
+            )
+        )
+        for pattern in patterns:
+            if not process_action(pattern):
+                log.warn(log_tmpl, pattern, *extra_log_args)
 
     def _remove_files(self, predicate):
         """

From 08984781ec38f9ba8b35c70c6a5fff38e00b55aa Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 17:58:45 +0100
Subject: [PATCH 8287/8469] Simplify `dist.Distribution._parse_config_files`

---
 setuptools/dist.py | 50 ++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2c088ef8cb..186a407cb8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -557,14 +557,12 @@ def _parse_config_files(self, filenames=None):
         from configparser import ConfigParser
 
         # Ignore install directory options if we have a venv
-        if sys.prefix != sys.base_prefix:
-            ignore_options = [
-                'install-base', 'install-platbase', 'install-lib',
-                'install-platlib', 'install-purelib', 'install-headers',
-                'install-scripts', 'install-data', 'prefix', 'exec-prefix',
-                'home', 'user', 'root']
-        else:
-            ignore_options = []
+        ignore_options = [] if sys.prefix == sys.base_prefix else [
+            'install-base', 'install-platbase', 'install-lib',
+            'install-platlib', 'install-purelib', 'install-headers',
+            'install-scripts', 'install-data', 'prefix', 'exec-prefix',
+            'home', 'user', 'root',
+        ]
 
         ignore_options = frozenset(ignore_options)
 
@@ -585,30 +583,34 @@ def _parse_config_files(self, filenames=None):
                 opt_dict = self.get_option_dict(section)
 
                 for opt in options:
-                    if opt != '__name__' and opt not in ignore_options:
-                        val = parser.get(section, opt)
-                        opt = opt.replace('-', '_')
-                        opt_dict[opt] = (filename, val)
+                    if opt == '__name__' or opt in ignore_options:
+                        continue
+
+                    val = parser.get(section, opt)
+                    opt = opt.replace('-', '_')
+                    opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
             # the original filenames that options come from)
             parser.__init__()
 
+        if 'global' not in self.command_options:
+            return
+
         # If there was a "global" section in the config file, use it
         # to set Distribution options.
 
-        if 'global' in self.command_options:
-            for (opt, (src, val)) in self.command_options['global'].items():
-                alias = self.negative_opt.get(opt)
-                try:
-                    if alias:
-                        setattr(self, alias, not strtobool(val))
-                    elif opt in ('verbose', 'dry_run'):  # ugh!
-                        setattr(self, opt, strtobool(val))
-                    else:
-                        setattr(self, opt, val)
-                except ValueError as e:
-                    raise DistutilsOptionError(e) from e
+        for (opt, (src, val)) in self.command_options['global'].items():
+            alias = self.negative_opt.get(opt)
+            if alias:
+                val = not strtobool(val)
+            elif opt in ('verbose', 'dry_run'):  # ugh!
+                val = strtobool(val)
+
+            try:
+                setattr(self, alias or opt, val)
+            except ValueError as e:
+                raise DistutilsOptionError(e) from e
 
     def _set_command_options(self, command_obj, option_dict=None):
         """

From 818680c71d2a407f76ae9dc9edaee6c8b338ab2c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 18:00:05 +0100
Subject: [PATCH 8288/8469] Simplify `setuptools.glob._iglob`

---
 setuptools/glob.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/setuptools/glob.py b/setuptools/glob.py
index 9d7cbc5da6..87062b8187 100644
--- a/setuptools/glob.py
+++ b/setuptools/glob.py
@@ -47,6 +47,8 @@ def iglob(pathname, recursive=False):
 
 def _iglob(pathname, recursive):
     dirname, basename = os.path.split(pathname)
+    glob_in_dir = glob2 if recursive and _isrecursive(basename) else glob1
+
     if not has_magic(pathname):
         if basename:
             if os.path.lexists(pathname):
@@ -56,13 +58,9 @@ def _iglob(pathname, recursive):
             if os.path.isdir(dirname):
                 yield pathname
         return
+
     if not dirname:
-        if recursive and _isrecursive(basename):
-            for x in glob2(dirname, basename):
-                yield x
-        else:
-            for x in glob1(dirname, basename):
-                yield x
+        yield from glob_in_dir(dirname, basename)
         return
     # `os.path.split()` returns the argument itself as a dirname if it is a
     # drive or UNC path.  Prevent an infinite recursion if a drive or UNC path
@@ -71,12 +69,7 @@ def _iglob(pathname, recursive):
         dirs = _iglob(dirname, recursive)
     else:
         dirs = [dirname]
-    if has_magic(basename):
-        if recursive and _isrecursive(basename):
-            glob_in_dir = glob2
-        else:
-            glob_in_dir = glob1
-    else:
+    if not has_magic(basename):
         glob_in_dir = glob0
     for dirname in dirs:
         for name in glob_in_dir(dirname, basename):

From 9c88e35e0e54712f8ac361faffe5bc9cd370ad8d Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 18:02:31 +0100
Subject: [PATCH 8289/8469] Simplify `setuptools.installer.fetch_build_egg`

---
 setuptools/installer.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/setuptools/installer.py b/setuptools/installer.py
index e630b87479..ac2aba1802 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -80,20 +80,17 @@ def fetch_build_egg(dist, req):
     if 'allow_hosts' in opts:
         raise DistutilsError('the `allow-hosts` option is not supported '
                              'when using pip to install requirements.')
-    if 'PIP_QUIET' in os.environ or 'PIP_VERBOSE' in os.environ:
-        quiet = False
-    else:
-        quiet = True
+    quiet = 'PIP_QUIET' not in os.environ and 'PIP_VERBOSE' not in os.environ
     if 'PIP_INDEX_URL' in os.environ:
         index_url = None
     elif 'index_url' in opts:
         index_url = opts['index_url'][1]
     else:
         index_url = None
-    if 'find_links' in opts:
-        find_links = _fixup_find_links(opts['find_links'][1])[:]
-    else:
-        find_links = []
+    find_links = (
+        _fixup_find_links(opts['find_links'][1])[:] if 'find_links' in opts
+        else []
+    )
     if dist.dependency_links:
         find_links.extend(dist.dependency_links)
     eggs_dir = os.path.realpath(dist.get_egg_cache_dir())
@@ -112,16 +109,12 @@ def fetch_build_egg(dist, req):
             cmd.append('--quiet')
         if index_url is not None:
             cmd.extend(('--index-url', index_url))
-        if find_links is not None:
-            for link in find_links:
-                cmd.extend(('--find-links', link))
+        for link in find_links or []:
+            cmd.extend(('--find-links', link))
         # If requirement is a PEP 508 direct URL, directly pass
         # the URL to pip, as `req @ url` does not work on the
         # command line.
-        if req.url:
-            cmd.append(req.url)
-        else:
-            cmd.append(str(req))
+        cmd.append(req.url or str(req))
         try:
             subprocess.check_call(cmd)
         except subprocess.CalledProcessError as e:

From 699afd09f252025ff412c3be101d78576ce0fe60 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 18:03:15 +0100
Subject: [PATCH 8290/8469] Simplify `msvc.SystemInfo.find_reg_vs_vers`

---
 setuptools/msvc.py | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 1ead72b421..53d45e592c 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -24,6 +24,7 @@
 from os import listdir, pathsep
 from os.path import join, isfile, isdir, dirname
 import sys
+import contextlib
 import platform
 import itertools
 import subprocess
@@ -724,28 +725,23 @@ def find_reg_vs_vers(self):
         ms = self.ri.microsoft
         vckeys = (self.ri.vc, self.ri.vc_for_python, self.ri.vs)
         vs_vers = []
-        for hkey in self.ri.HKEYS:
-            for key in vckeys:
-                try:
-                    bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ)
-                except (OSError, IOError):
-                    continue
-                with bkey:
-                    subkeys, values, _ = winreg.QueryInfoKey(bkey)
-                    for i in range(values):
-                        try:
-                            ver = float(winreg.EnumValue(bkey, i)[0])
-                            if ver not in vs_vers:
-                                vs_vers.append(ver)
-                        except ValueError:
-                            pass
-                    for i in range(subkeys):
-                        try:
-                            ver = float(winreg.EnumKey(bkey, i))
-                            if ver not in vs_vers:
-                                vs_vers.append(ver)
-                        except ValueError:
-                            pass
+        for hkey, key in itertools.product(self.ri.HKEYS, vckeys):
+            try:
+                bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ)
+            except (OSError, IOError):
+                continue
+            with bkey:
+                subkeys, values, _ = winreg.QueryInfoKey(bkey)
+                for i in range(values):
+                    with contextlib.suppress(ValueError):
+                        ver = float(winreg.EnumValue(bkey, i)[0])
+                        if ver not in vs_vers:
+                            vs_vers.append(ver)
+                for i in range(subkeys):
+                    with contextlib.suppress(ValueError):
+                        ver = float(winreg.EnumKey(bkey, i))
+                        if ver not in vs_vers:
+                            vs_vers.append(ver)
         return sorted(vs_vers)
 
     def find_programdata_vs_vers(self):

From c225c4c0f64bf044f2f82693df097ad07f9c12bd Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 18:04:46 +0100
Subject: [PATCH 8291/8469] Simplify `PackageIndex.process_index`

---
 setuptools/package_index.py | 68 ++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 3979b131b5..713391af62 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -428,49 +428,53 @@ def scan_egg_link(self, path, entry):
             dist.precedence = SOURCE_DIST
             self.add(dist)
 
+    def _scan(self, link):
+        # Process a URL to see if it's for a package page
+        NO_MATCH_SENTINEL = None, None
+        if not link.startswith(self.index_url):
+            return NO_MATCH_SENTINEL
+
+        parts = list(map(
+            urllib.parse.unquote, link[len(self.index_url):].split('/')
+        ))
+        if len(parts) != 2 or '#' in parts[1]:
+            return NO_MATCH_SENTINEL
+
+        # it's a package page, sanitize and index it
+        pkg = safe_name(parts[0])
+        ver = safe_version(parts[1])
+        self.package_pages.setdefault(pkg.lower(), {})[link] = True
+        return to_filename(pkg), to_filename(ver)
+
     def process_index(self, url, page):
         """Process the contents of a PyPI page"""
 
-        def scan(link):
-            # Process a URL to see if it's for a package page
-            if link.startswith(self.index_url):
-                parts = list(map(
-                    urllib.parse.unquote, link[len(self.index_url):].split('/')
-                ))
-                if len(parts) == 2 and '#' not in parts[1]:
-                    # it's a package page, sanitize and index it
-                    pkg = safe_name(parts[0])
-                    ver = safe_version(parts[1])
-                    self.package_pages.setdefault(pkg.lower(), {})[link] = True
-                    return to_filename(pkg), to_filename(ver)
-            return None, None
-
         # process an index page into the package-page index
         for match in HREF.finditer(page):
             try:
-                scan(urllib.parse.urljoin(url, htmldecode(match.group(1))))
+                self._scan(urllib.parse.urljoin(url, htmldecode(match.group(1))))
             except ValueError:
                 pass
 
-        pkg, ver = scan(url)  # ensure this page is in the page index
-        if pkg:
-            # process individual package page
-            for new_url in find_external_links(url, page):
-                # Process the found URL
-                base, frag = egg_info_for_url(new_url)
-                if base.endswith('.py') and not frag:
-                    if ver:
-                        new_url += '#egg=%s-%s' % (pkg, ver)
-                    else:
-                        self.need_version_info(url)
-                self.scan_url(new_url)
-
-            return PYPI_MD5.sub(
-                lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1, 3, 2), page
-            )
-        else:
+        pkg, ver = self._scan(url)  # ensure this page is in the page index
+        if not pkg:
             return ""  # no sense double-scanning non-package pages
 
+        # process individual package page
+        for new_url in find_external_links(url, page):
+            # Process the found URL
+            base, frag = egg_info_for_url(new_url)
+            if base.endswith('.py') and not frag:
+                if ver:
+                    new_url += '#egg=%s-%s' % (pkg, ver)
+                else:
+                    self.need_version_info(url)
+            self.scan_url(new_url)
+
+        return PYPI_MD5.sub(
+            lambda m: '<a href="%s#md5=%s">%s</a>' % m.group(1, 3, 2), page
+        )
+
     def need_version_info(self, url):
         self.scan_all(
             "Page at %s links to .py file(s) without version info; an index "

From fc891f5cf6d93ad533e2afb5e15a2952408ab358 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 13:08:18 +0100
Subject: [PATCH 8292/8469] Apply noqa C901 comments to overly complex code

---
 pkg_resources/__init__.py          |  9 ++++++---
 setuptools/command/bdist_egg.py    |  2 +-
 setuptools/command/easy_install.py | 19 ++++++++++++-------
 setuptools/command/egg_info.py     |  2 +-
 setuptools/dist.py                 |  8 +++++---
 setuptools/installer.py            |  2 +-
 setuptools/msvc.py                 |  4 ++--
 setuptools/package_index.py        |  8 +++++---
 setuptools/ssl_support.py          |  2 +-
 9 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 737f4d5fad..f42257776e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -696,7 +696,8 @@ def add(self, dist, entry=None, insert=True, replace=False):
             keys2.append(dist.key)
         self._added_new(dist)
 
-    def resolve(self, requirements, env=None, installer=None,
+    # FIXME: 'WorkingSet.resolve' is too complex (11)
+    def resolve(self, requirements, env=None, installer=None,  # noqa: C901
                 replace_conflicting=False, extras=None):
         """List all distributions needed to (recursively) meet `requirements`
 
@@ -1745,7 +1746,8 @@ def _get_date_and_size(zip_stat):
         timestamp = time.mktime(date_time)
         return timestamp, size
 
-    def _extract_resource(self, manager, zip_path):
+    # FIXME: 'ZipProvider._extract_resource' is too complex (12)
+    def _extract_resource(self, manager, zip_path):  # noqa: C901
 
         if zip_path in self._index():
             for name in self._index()[zip_path]:
@@ -2858,7 +2860,8 @@ def get_entry_info(self, group, name):
         """Return the EntryPoint object for `group`+`name`, or ``None``"""
         return self.get_entry_map(group).get(name)
 
-    def insert_on(self, path, loc=None, replace=False):
+    # FIXME: 'Distribution.insert_on' is too complex (13)
+    def insert_on(self, path, loc=None, replace=False):  # noqa: C901
         """Ensure self.location is on path
 
         If replace=False (default):
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index a88efb45b8..206f2419ba 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -153,7 +153,7 @@ def call_command(self, cmdname, **kw):
         self.run_command(cmdname)
         return cmd
 
-    def run(self):
+    def run(self):  # noqa: C901  # is too complex (14)  # FIXME
         # Generate metadata first
         self.run_command("egg_info")
         # We run install_lib before install_data, because some data hacks
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6882efe00e..f1e487d4d2 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -226,7 +226,7 @@ def _render_version():
         print(tmpl.format(**locals()))
         raise SystemExit()
 
-    def finalize_options(self):
+    def finalize_options(self):  # noqa: C901  # is too complex (25)  # FIXME
         self.version and self._render_version()
 
         py_version = sys.version.split()[0]
@@ -437,7 +437,7 @@ def pseudo_tempname(self):
     def warn_deprecated_options(self):
         pass
 
-    def check_site_dir(self):
+    def check_site_dir(self):  # noqa: C901  # is too complex (12)  # FIXME
         """Verify that self.install_dir is .pth-capable dir, if needed"""
 
         instdir = normalize_path(self.install_dir)
@@ -713,7 +713,10 @@ def select_scheme(self, name):
             if getattr(self, attrname) is None:
                 setattr(self, attrname, scheme[key])
 
-    def process_distribution(self, requirement, dist, deps=True, *info):
+    # FIXME: 'easy_install.process_distribution' is too complex (12)
+    def process_distribution(  # noqa: C901
+            self, requirement, dist, deps=True, *info,
+    ):
         self.update_pth(dist)
         self.package_index.add(dist)
         if dist in self.local_index[dist.key]:
@@ -894,7 +897,8 @@ def egg_distribution(self, egg_path):
             metadata = EggMetadata(zipimport.zipimporter(egg_path))
         return Distribution.from_filename(egg_path, metadata=metadata)
 
-    def install_egg(self, egg_path, tmpdir):
+    # FIXME: 'easy_install.install_egg' is too complex (11)
+    def install_egg(self, egg_path, tmpdir):  # noqa: C901
         destination = os.path.join(
             self.install_dir,
             os.path.basename(egg_path),
@@ -993,7 +997,8 @@ def install_exe(self, dist_filename, tmpdir):
         # install the .egg
         return self.install_egg(egg_path, tmpdir)
 
-    def exe_to_egg(self, dist_filename, egg_tmp):
+    # FIXME: 'easy_install.exe_to_egg' is too complex (12)
+    def exe_to_egg(self, dist_filename, egg_tmp):  # noqa: C901
         """Extract a bdist_wininst to the directories an egg would use"""
         # Check for .pth file and set up prefix translations
         prefixes = get_exe_prefixes(dist_filename)
@@ -1191,7 +1196,7 @@ def _set_fetcher_options(self, base):
         cfg_filename = os.path.join(base, 'setup.cfg')
         setopt.edit_config(cfg_filename, settings)
 
-    def update_pth(self, dist):
+    def update_pth(self, dist):  # noqa: C901  # is too complex (11)  # FIXME
         if self.pth_file is None:
             return
 
@@ -1427,7 +1432,7 @@ def get_site_dirs():
     return sitedirs
 
 
-def expand_paths(inputs):
+def expand_paths(inputs):  # noqa: C901  # is too complex (11)  # FIXME
     """Yield sys.path directories that might contain "old-style" packages"""
 
     seen = {}
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 8e34e4a2c8..1f120b67d1 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -32,7 +32,7 @@
 from setuptools import SetuptoolsDeprecationWarning
 
 
-def translate_pattern(glob):
+def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
     """
     Translate a file path glob like '*.txt' in to a regular expression.
     This differs from fnmatch.translate which allows wildcards to match
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 186a407cb8..662fbe67c5 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -119,7 +119,7 @@ def _read_list(name):
 
 
 # Based on Python 3.5 version
-def write_pkg_file(self, file):
+def write_pkg_file(self, file):  # noqa: C901  # is too complex (14)  # FIXME
     """Write the PKG-INFO format data to a file object.
     """
     version = self.get_metadata_version()
@@ -548,7 +548,8 @@ def _clean_req(self, req):
         req.marker = None
         return req
 
-    def _parse_config_files(self, filenames=None):
+    # FIXME: 'Distribution._parse_config_files' is too complex (14)
+    def _parse_config_files(self, filenames=None):  # noqa: C901
         """
         Adapted from distutils.dist.Distribution.parse_config_files,
         this method provides the same functionality in subtly-improved
@@ -612,7 +613,8 @@ def _parse_config_files(self, filenames=None):
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
 
-    def _set_command_options(self, command_obj, option_dict=None):
+    # FIXME: 'Distribution._set_command_options' is too complex (14)
+    def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901
         """
         Set the options for 'command_obj' from 'option_dict'.  Basically
         this means copying elements of a dictionary ('option_dict') to
diff --git a/setuptools/installer.py b/setuptools/installer.py
index ac2aba1802..c5822a31f4 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -51,7 +51,7 @@ def _legacy_fetch_build_egg(dist, req):
     return cmd.easy_install(req)
 
 
-def fetch_build_egg(dist, req):
+def fetch_build_egg(dist, req):  # noqa: C901  # is too complex (16)  # FIXME
     """Fetch an egg needed for building.
 
     Use pip/wheel to fetch/build a wheel."""
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 53d45e592c..d5e0a95232 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -921,8 +921,8 @@ def WindowsSdkLastVersion(self):
         """
         return self._use_last_dir_name(join(self.WindowsSdkDir, 'lib'))
 
-    @property
-    def WindowsSdkDir(self):
+    @property  # noqa: C901
+    def WindowsSdkDir(self):  # noqa: C901  # is too complex (12)  # FIXME
         """
         Microsoft Windows SDK directory.
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 713391af62..123e9582b5 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -320,7 +320,8 @@ def __init__(
         else:
             self.opener = urllib.request.urlopen
 
-    def process_url(self, url, retrieve=False):
+    # FIXME: 'PackageIndex.process_url' is too complex (14)
+    def process_url(self, url, retrieve=False):  # noqa: C901
         """Evaluate a URL as a possible download, and maybe retrieve it"""
         if url in self.scanned_urls and not retrieve:
             return
@@ -595,7 +596,7 @@ def download(self, spec, tmpdir):
                 spec = parse_requirement_arg(spec)
         return getattr(self.fetch_distribution(spec, tmpdir), 'location', None)
 
-    def fetch_distribution(
+    def fetch_distribution(  # noqa: C901  # is too complex (14)  # FIXME
             self, requirement, tmpdir, force_scan=False, source=False,
             develop_ok=False, local_index=None):
         """Obtain a distribution suitable for fulfilling `requirement`
@@ -766,7 +767,8 @@ def _download_to(self, url, filename):
     def reporthook(self, url, filename, blocknum, blksize, size):
         pass  # no-op
 
-    def open_url(self, url, warning=None):
+    # FIXME:
+    def open_url(self, url, warning=None):  # noqa: C901  # is too complex (12)
         if url.startswith('file:'):
             return local_open(url)
         try:
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index eac5e65608..b58cca37c9 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -56,7 +56,7 @@ class CertificateError(ValueError):
         pass
 
 
-if not match_hostname:
+if not match_hostname:  # noqa: C901  # 'If 59' is too complex (21)  # FIXME
 
     def _dnsname_match(dn, hostname, max_wildcards=1):
         """Matching according to RFC 6125, section 6.4.3

From 6f74941c2649b6154dee860417b8b4a576d19974 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 31 Dec 2020 18:05:28 +0100
Subject: [PATCH 8293/8469] Enable McCabe complexity check in flake8

---
 .flake8 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.flake8 b/.flake8
index 8bc2d27060..f6a5cc8636 100644
--- a/.flake8
+++ b/.flake8
@@ -12,3 +12,6 @@ ignore =
 	E203
 	setuptools/site-patch.py F821
 	setuptools/py*compat.py F811
+
+# Let's not overcomplicate the code:
+max-complexity = 10

From 51b78f9d90fcdb0a924ed12e7baa24660f53008c Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Fri, 1 Jan 2021 20:16:51 -0500
Subject: [PATCH 8294/8469] fix: suggest PyPA build instead of pep517.build

---
 docs/setuptools.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.rst b/docs/setuptools.rst
index 1000a0cebf..05516a4e31 100644
--- a/docs/setuptools.rst
+++ b/docs/setuptools.rst
@@ -157,7 +157,7 @@ To use this feature:
       ]
       build-backend = "setuptools.build_meta"
 
-* Use a :pep:`517` compatible build frontend, such as ``pip >= 19`` or ``pep517``.
+* Use a :pep:`517` compatible build frontend, such as ``pip >= 19`` or ``build``.
 
   .. warning::
 

From de4b9885060814c121f692db3e94b70994e15b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 30 Dec 2020 12:05:02 +0100
Subject: [PATCH 8295/8469] Define create_module()/exec_module() in
 VendorImporter

Fixes https://github.com/pypa/setuptools/issues/2481
---
 changelog.d/2481.change.rst      | 2 ++
 pkg_resources/extern/__init__.py | 6 ++++++
 setuptools/extern/__init__.py    | 6 ++++++
 3 files changed, 14 insertions(+)
 create mode 100644 changelog.d/2481.change.rst

diff --git a/changelog.d/2481.change.rst b/changelog.d/2481.change.rst
new file mode 100644
index 0000000000..dc824c9c2e
--- /dev/null
+++ b/changelog.d/2481.change.rst
@@ -0,0 +1,2 @@
+Define ``create_module()`` and ``exec_module()`` methods in ``VendorImporter``
+to get rid of ``ImportWarning`` -- by :user:`hroncok`
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 4dc3beb2fa..1fbb4fcc89 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -54,6 +54,12 @@ def load_module(self, fullname):
                 "distribution.".format(**locals())
             )
 
+    def create_module(self, spec):
+        return self.load_module(spec.name)
+
+    def exec_module(self, module):
+        pass
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index b7f30dc2e3..399701a044 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -54,6 +54,12 @@ def load_module(self, fullname):
                 "distribution.".format(**locals())
             )
 
+    def create_module(self, spec):
+        return self.load_module(spec.name)
+
+    def exec_module(self, module):
+        pass
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.

From f146b387548711d8095002e3d1214ca98a8b0392 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Wed, 6 Jan 2021 17:40:30 +0100
Subject: [PATCH 8296/8469] Avoid deprecated load_module() in pkg_resources
 namespace delaration

Fixes: https://github.com/pypa/setuptools/issues/2493
---
 changelog.d/2493.change.rst | 2 ++
 pkg_resources/__init__.py   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2493.change.rst

diff --git a/changelog.d/2493.change.rst b/changelog.d/2493.change.rst
new file mode 100644
index 0000000000..f2c4693240
--- /dev/null
+++ b/changelog.d/2493.change.rst
@@ -0,0 +1,2 @@
+Use importlib.import_module() rather than the deprectated loader.load_module()
+in pkg_resources namespace delaration -- by :user:`encukou`
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 737f4d5fad..99b7f68075 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -38,6 +38,7 @@
 import inspect
 import ntpath
 import posixpath
+import importlib
 from pkgutil import get_importer
 
 try:
@@ -2209,7 +2210,7 @@ def _handle_ns(packageName, path_item):
     if subpath is not None:
         path = module.__path__
         path.append(subpath)
-        loader.load_module(packageName)
+        importlib.import_module(packageName)
         _rebuild_mod_path(path, packageName, module)
     return subpath
 

From c1b2b1a60f7d099e841d6bbcac3531c5cb2efc1b Mon Sep 17 00:00:00 2001
From: YuanPei Li <conbas2019@gmail.com>
Date: Fri, 8 Jan 2021 17:35:33 +0800
Subject: [PATCH 8297/8469] fix typo

Fix a difference between the name of function definition and calling.
---
 docs/userguide/entry_point.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index edab446502..738207282c 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -28,7 +28,7 @@ with ``__init__.py`` as:
 
 .. code-block:: python
 
-    def helloworld():
+    def hello_world():
         print("Hello world")
 
 and ``__main__.py`` providing a hook:

From 0ace684768f5d9b42338fa4c0c10e3b4345a411f Mon Sep 17 00:00:00 2001
From: YuanPei Li <conbas2019@gmail.com>
Date: Fri, 8 Jan 2021 17:41:47 +0800
Subject: [PATCH 8298/8469] Create 2525.doc.rst

---
 changelog.d/2525.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2525.doc.rst

diff --git a/changelog.d/2525.doc.rst b/changelog.d/2525.doc.rst
new file mode 100644
index 0000000000..86baac98c1
--- /dev/null
+++ b/changelog.d/2525.doc.rst
@@ -0,0 +1 @@
+Fix typo in the entry point page. -- by :user:`jtr109`

From 6a0c93bb62f45d1696ae8487c30090b279bb5f0f Mon Sep 17 00:00:00 2001
From: YuanPei Li <conbas2019@gmail.com>
Date: Fri, 8 Jan 2021 17:46:42 +0800
Subject: [PATCH 8299/8469] Update 2525.doc.rst

---
 changelog.d/2525.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2525.doc.rst b/changelog.d/2525.doc.rst
index 86baac98c1..5d7ad5d335 100644
--- a/changelog.d/2525.doc.rst
+++ b/changelog.d/2525.doc.rst
@@ -1 +1 @@
-Fix typo in the entry point page. -- by :user:`jtr109`
+Fix typo in the document page about entry point. -- by :user:`jtr109`

From fbc9bd6fdbce132b9b5136345b0f6b3a1f6debaf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 8 Jan 2021 14:14:14 -0500
Subject: [PATCH 8300/8469] Disable inclusion of package data as it causes
 'tests' to be included as data. Fixes #2505.

---
 changelog.d/2505.misc.rst | 1 +
 setup.cfg                 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2505.misc.rst

diff --git a/changelog.d/2505.misc.rst b/changelog.d/2505.misc.rst
new file mode 100644
index 0000000000..11c642e778
--- /dev/null
+++ b/changelog.d/2505.misc.rst
@@ -0,0 +1 @@
+Disable inclusion of package data as it causes 'tests' to be included as data.
diff --git a/setup.cfg b/setup.cfg
index 4eb5018390..02d99530b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,8 @@ project_urls =
 [options]
 packages = find:
 py_modules = easy_install
-include_package_data = true
+# disabled as it causes tests to be included #2505
+# include_package_data = true
 python_requires = >=3.6
 install_requires =
 

From fe0541078d9a7720d9fa679f66209598bb6f4572 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 8 Jan 2021 14:14:52 -0500
Subject: [PATCH 8301/8469] =?UTF-8?q?Bump=20version:=2051.1.1=20=E2=86=92?=
 =?UTF-8?q?=2051.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 9 +++++++++
 changelog.d/2505.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2505.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 60e7352f59..432c813062 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.1.1
+current_version = 51.1.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index ca76648bd2..5f69c6abbc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.1.2
+-------
+
+
+Misc
+^^^^
+* #2505: Disable inclusion of package data as it causes 'tests' to be included as data.
+
+
 v51.1.1
 -------
 
diff --git a/changelog.d/2505.misc.rst b/changelog.d/2505.misc.rst
deleted file mode 100644
index 11c642e778..0000000000
--- a/changelog.d/2505.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Disable inclusion of package data as it causes 'tests' to be included as data.
diff --git a/setup.cfg b/setup.cfg
index 02d99530b7..dff72caf38 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = setuptools
-version = 51.1.1
+version = 51.1.2
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 3e876d7906fa6387ab6ac9a9bff8659762363017 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 8 Jan 2021 23:14:07 -0500
Subject: [PATCH 8302/8469] Enable complexity limit. Fixes jaraco/skeleton#34.

---
 .flake8 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.flake8 b/.flake8
index 790c109fdb..59a51f8691 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,9 @@
 [flake8]
 max-line-length = 88
+
+# jaraco/skeleton#34
+max-complexity = 10
+
 ignore =
 	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
 	W503

From 1731fbebe9f6655a203e6e08ab309f9916ea6f65 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Sat, 9 Jan 2021 05:21:12 +0100
Subject: [PATCH 8303/8469] Replace pep517.build with build (#37)

* Replace pep517.build with build

Resolves #30

* Prefer simple usage

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7233b94232..249f97c24f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ commands =
 [testenv:release]
 skip_install = True
 deps =
-	pep517>=0.5
+	build
 	twine[keyring]>=1.13
 	path
 	jaraco.develop>=7.1
@@ -35,6 +35,6 @@ setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
 commands =
 	python -c "import path; path.Path('dist').rmtree_p()"
-	python -m pep517.build .
+	python -m build
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release

From a9b3f681dea9728235c2a9c68165f7b5cbf350ab Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Sat, 9 Jan 2021 05:27:24 +0100
Subject: [PATCH 8304/8469] Use license_files instead of license_file in meta
 (#35)

Singular `license_file` is deprecated since wheel v0.32.0.

Refs:
* https://wheel.readthedocs.io/en/stable/news.html
* https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
---
 setup.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index d5010f7046..88bc263a47 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,6 @@
 [metadata]
-license_file = LICENSE
+license_files =
+	LICENSE
 name = skeleton
 author = Jason R. Coombs
 author_email = jaraco@jaraco.com

From 77fbe1df4af6d8f75f44440e89ee1bc249c9f2e0 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Date: Sat, 9 Jan 2021 05:37:11 +0100
Subject: [PATCH 8305/8469] Use `extend-ignore` in flake8 config (#33)

* Use `extend-ignore` in flake8 config

This option allows to add extra ignored rules to the default list
instead of replacing it.

The default exclusions are: E121, E123, E126, E226, E24, E704,
W503 and W504.

Fixes #28.

Refs:
* https://github.com/pypa/setuptools/pull/2486/files#r541943356
* https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-extend-ignore
*
https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-ignore

* Enable complexity limit. Fixes jaraco/skeleton#34.

* Replace pep517.build with build (#37)

* Replace pep517.build with build

Resolves #30

* Prefer simple usage

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

* Use license_files instead of license_file in meta (#35)

Singular `license_file` is deprecated since wheel v0.32.0.

Refs:
* https://wheel.readthedocs.io/en/stable/news.html
* https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
---
 .flake8 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.flake8 b/.flake8
index 59a51f8691..48b2e246f1 100644
--- a/.flake8
+++ b/.flake8
@@ -4,10 +4,6 @@ max-line-length = 88
 # jaraco/skeleton#34
 max-complexity = 10
 
-ignore =
-	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
-	W503
-	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
-	W504
+extend-ignore =
 	# Black creates whitespace before colon
 	E203

From e39cb0d21041578f3435e29bc45b3e7894e48548 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Fri, 15 Jan 2021 13:53:33 -0600
Subject: [PATCH 8306/8469] Move helper method out of class

---
 setuptools/tests/test_egg_info.py | 57 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1047468b18..0297f13108 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -19,6 +19,26 @@
 from . import contexts
 
 
+def _run_egg_info_command(tmpdir_cwd, env, cmd=None, output=None):
+    environ = os.environ.copy().update(
+        HOME=env.paths['home'],
+    )
+    if cmd is None:
+        cmd = [
+            'egg_info',
+        ]
+    code, data = environment.run_setup_py(
+        cmd=cmd,
+        pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+        data_stream=1,
+        env=environ,
+    )
+    assert not code, data
+
+    if output:
+        assert output in data
+
+
 class Environment(str):
     pass
 
@@ -132,7 +152,7 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
     def test_expected_files_produced(self, tmpdir_cwd, env):
         self._create_project()
 
-        self._run_egg_info_command(tmpdir_cwd, env)
+        _run_egg_info_command(tmpdir_cwd, env)
         actual = os.listdir('foo.egg-info')
 
         expected = [
@@ -166,7 +186,7 @@ def test_license_is_a_string(self, tmpdir_cwd, env):
         # currently configured to use a subprocess, the actual traceback
         # object is lost and we need to parse it from stderr
         with pytest.raises(AssertionError) as exc:
-            self._run_egg_info_command(tmpdir_cwd, env)
+            _run_egg_info_command(tmpdir_cwd, env)
 
         # Hopefully this is not too fragile: the only argument to the
         # assertion error should be a traceback, ending with:
@@ -180,13 +200,13 @@ def test_rebuilt(self, tmpdir_cwd, env):
         """Ensure timestamps are updated when the command is re-run."""
         self._create_project()
 
-        self._run_egg_info_command(tmpdir_cwd, env)
+        _run_egg_info_command(tmpdir_cwd, env)
         timestamp_a = os.path.getmtime('foo.egg-info')
 
         # arbitrary sleep just to handle *really* fast systems
         time.sleep(.001)
 
-        self._run_egg_info_command(tmpdir_cwd, env)
+        _run_egg_info_command(tmpdir_cwd, env)
         timestamp_b = os.path.getmtime('foo.egg-info')
 
         assert timestamp_a != timestamp_b
@@ -201,7 +221,7 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
                 'usage.rst': "Run 'hi'",
             }
         })
-        self._run_egg_info_command(tmpdir_cwd, env)
+        _run_egg_info_command(tmpdir_cwd, env)
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         with open(sources_txt) as f:
@@ -441,7 +461,7 @@ def test_requires(
             self, tmpdir_cwd, env, requires, use_setup_cfg,
             expected_requires, install_cmd_kwargs):
         self._setup_script_with_requires(requires, use_setup_cfg)
-        self._run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs)
+        _run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs)
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         if os.path.exists(requires_txt):
@@ -461,14 +481,14 @@ def test_install_requires_unordered_disallowed(self, tmpdir_cwd, env):
         req = 'install_requires={"fake-factory==0.5.2", "pytz"}'
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_egg_info_command(tmpdir_cwd, env)
+            _run_egg_info_command(tmpdir_cwd, env)
 
     def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_egg_info_command(tmpdir_cwd, env)
+            _run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
@@ -476,7 +496,7 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            self._run_egg_info_command(tmpdir_cwd, env)
+            _run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_provides_extra(self, tmpdir_cwd, env):
@@ -865,25 +885,6 @@ def test_egg_info_includes_setup_py(self, tmpdir_cwd):
             sources = f.read().split('\n')
             assert 'setup.py' in sources
 
-    def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
-        environ = os.environ.copy().update(
-            HOME=env.paths['home'],
-        )
-        if cmd is None:
-            cmd = [
-                'egg_info',
-            ]
-        code, data = environment.run_setup_py(
-            cmd=cmd,
-            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-            data_stream=1,
-            env=environ,
-        )
-        assert not code, data
-
-        if output:
-            assert output in data
-
     def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
         self._create_project()
         build_files({

From 2788dbf93ee8e3d86f7bc86ec6ffc79c7a4643c8 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Fri, 15 Jan 2021 13:54:54 -0600
Subject: [PATCH 8307/8469] Add failing test

---
 setuptools/tests/test_egg_info.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 0297f13108..1d0f07e306 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,6 +6,7 @@
 import stat
 import time
 
+from setuptools.build_meta import prepare_metadata_for_build_wheel
 from setuptools.command.egg_info import (
     egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision,
 )
@@ -885,7 +886,22 @@ def test_egg_info_includes_setup_py(self, tmpdir_cwd):
             sources = f.read().split('\n')
             assert 'setup.py' in sources
 
-    def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
+    @pytest.mark.parametrize(
+        ('make_metadata_path', 'run_command'),
+        [
+            (
+                lambda env: os.path.join('.', 'foo.egg-info', 'PKG-INFO'),
+                lambda tmpdir_cwd, env: _run_egg_info_command(tmpdir_cwd, env)
+            ),
+            (
+                lambda env: os.path.join(env, 'foo.dist-info', 'METADATA'),
+                lambda tmpdir_cwd, env: prepare_metadata_for_build_wheel(env)
+            )
+        ]
+    )
+    def test_egg_info_tag_only_once(
+            self, tmpdir_cwd, env, make_metadata_path, run_command
+    ):
         self._create_project()
         build_files({
             'setup.cfg': DALS("""
@@ -895,11 +911,10 @@ def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
                               tag_svn_revision = 0
                               """),
         })
-        self._run_egg_info_command(tmpdir_cwd, env)
-        egg_info_dir = os.path.join('.', 'foo.egg-info')
-        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
-            pkg_info_lines = pkginfo_file.read().split('\n')
-        assert 'Version: 0.0.0.dev0' in pkg_info_lines
+        run_command(tmpdir_cwd, env)
+        with open(make_metadata_path(env)) as metadata_file:
+            metadata_lines = metadata_file.read().split('\n')
+        assert 'Version: 0.0.0.dev0' in metadata_lines
 
     def test_get_pkg_info_revision_deprecated(self):
         pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)

From ed07f8b124f75b43e27e5d636484898476a0be4f Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Fri, 15 Jan 2021 14:19:14 -0600
Subject: [PATCH 8308/8469] Correctly handle normalized tags

---
 changelog.d/2529.change.rst    |  1 +
 setuptools/command/egg_info.py | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/2529.change.rst

diff --git a/changelog.d/2529.change.rst b/changelog.d/2529.change.rst
new file mode 100644
index 0000000000..10c41518d4
--- /dev/null
+++ b/changelog.d/2529.change.rst
@@ -0,0 +1 @@
+Fixed an issue where version tags may be added multiple times
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 0b7ad677f2..066c248886 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -130,10 +130,12 @@ def _maybe_tag(self, version):
         egg_info may be called more than once for a distribution,
         in which case the version string already contains all tags.
         """
-        return (
-            version if self.vtags and version.endswith(self.vtags)
-            else version + self.vtags
-        )
+        # Remove the tags if they exist. The tags maybe have been normalized
+        # (e.g. turning .dev into .dev0) so we can't just compare strings
+        base_version = parse_version(version).base_version
+
+        # Add the tags
+        return base_version + self.vtags
 
     def tags(self):
         version = ''

From 0df40810ec54590c888ae0e4073d73f731c91f4a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 15 Jan 2021 19:16:28 -0500
Subject: [PATCH 8309/8469] Add support for namespace packages. Closes
 jaraco/skeleton#40.

---
 setup.cfg | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 88bc263a47..106763e3d9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,12 +15,18 @@ classifiers =
 	Programming Language :: Python :: 3 :: Only
 
 [options]
-packages = find:
+packages = find_namespace:
 include_package_data = true
 python_requires = >=3.6
 install_requires =
 setup_requires = setuptools_scm[toml] >= 3.4.1
 
+[options.packages.find]
+exclude =
+        build*
+        docs*
+        tests*
+
 [options.extras_require]
 testing =
 	# upstream

From a499dee61ecdabf867853f24a2bc78a8197c97f1 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 16:36:47 -0500
Subject: [PATCH 8310/8469] Avoid hitting network during test_easy_install

---
 changelog.d/2525.misc.rst             |  1 +
 setuptools/tests/test_easy_install.py | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 changelog.d/2525.misc.rst

diff --git a/changelog.d/2525.misc.rst b/changelog.d/2525.misc.rst
new file mode 100644
index 0000000000..50d1bfa1b1
--- /dev/null
+++ b/changelog.d/2525.misc.rst
@@ -0,0 +1 @@
+Avoid hitting network during test_easy_install.
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index dc00e697de..93ac23e49e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -38,6 +38,16 @@
 from .textwrap import DALS
 
 
+@pytest.fixture(autouse=True)
+def pip_disable_index(monkeypatch):
+    """
+    Important: Disable the default index for pip to avoid
+    querying packages in the index and potentially resolving
+    and installing packages there.
+    """
+    monkeypatch.setenv('PIP_NO_INDEX', 'true')
+
+
 class FakeDist:
     def get_entry_map(self, group):
         if group != 'console_scripts':

From b316312fa192f1299b3baea108f956d44a8b43f8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 16:40:50 -0500
Subject: [PATCH 8311/8469] Point changelog at 2534 for more info

---
 changelog.d/{2525.misc.rst => 2534.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2525.misc.rst => 2534.misc.rst} (100%)

diff --git a/changelog.d/2525.misc.rst b/changelog.d/2534.misc.rst
similarity index 100%
rename from changelog.d/2525.misc.rst
rename to changelog.d/2534.misc.rst

From 0d6368684f349c1615600eabff877f7a5a29d6c6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 16:42:48 -0500
Subject: [PATCH 8312/8469] =?UTF-8?q?Bump=20version:=2051.1.2=20=E2=86=92?=
 =?UTF-8?q?=2051.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 18 ++++++++++++++++++
 changelog.d/2493.change.rst |  2 --
 changelog.d/2525.doc.rst    |  1 -
 changelog.d/2534.misc.rst   |  1 -
 setup.cfg                   |  2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/2493.change.rst
 delete mode 100644 changelog.d/2525.doc.rst
 delete mode 100644 changelog.d/2534.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 432c813062..facadd5f3b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.1.2
+current_version = 51.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 5f69c6abbc..a95d7c72f6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+v51.2.0
+-------
+
+
+Changes
+^^^^^^^
+* #2493: Use importlib.import_module() rather than the deprectated loader.load_module()
+  in pkg_resources namespace delaration -- by :user:`encukou`
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2525: Fix typo in the document page about entry point. -- by :user:`jtr109`
+
+Misc
+^^^^
+* #2534: Avoid hitting network during test_easy_install.
+
+
 v51.1.2
 -------
 
diff --git a/changelog.d/2493.change.rst b/changelog.d/2493.change.rst
deleted file mode 100644
index f2c4693240..0000000000
--- a/changelog.d/2493.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Use importlib.import_module() rather than the deprectated loader.load_module()
-in pkg_resources namespace delaration -- by :user:`encukou`
diff --git a/changelog.d/2525.doc.rst b/changelog.d/2525.doc.rst
deleted file mode 100644
index 5d7ad5d335..0000000000
--- a/changelog.d/2525.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in the document page about entry point. -- by :user:`jtr109`
diff --git a/changelog.d/2534.misc.rst b/changelog.d/2534.misc.rst
deleted file mode 100644
index 50d1bfa1b1..0000000000
--- a/changelog.d/2534.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid hitting network during test_easy_install.
diff --git a/setup.cfg b/setup.cfg
index dff72caf38..451abe835a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 license_file = LICENSE
 name = setuptools
-version = 51.1.2
+version = 51.2.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From d2b1f7ebd6ebd57b4a50bc6660e93b31129bacb4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 16:43:27 -0500
Subject: [PATCH 8313/8469] Point changelog at 2534 for more info

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a95d7c72f6..e51b5e646c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -31,7 +31,7 @@ v51.1.1
 
 Misc
 ^^^^
-* #2525: Avoid hitting network during test_virtualenv.test_test_command.
+* #2534: Avoid hitting network during test_virtualenv.test_test_command.
 
 
 v51.1.0

From aaf8eb94dad0e5f4dce7bb1b51e586c08e3a4319 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 16:58:28 -0500
Subject: [PATCH 8314/8469] Disable PIP_NO_INDEX for tests that override the
 index. Ref #2534.

---
 setuptools/tests/test_easy_install.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 93ac23e49e..6aa17e9414 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -455,6 +455,7 @@ def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
         """
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        monkeypatch.setenv('PIP_NO_INDEX', 'false')
         with contexts.quiet():
             # create an sdist that has a build-time dependency.
             with TestSetupRequires.create_sdist() as dist_file:
@@ -628,6 +629,7 @@ def make_dependency_sdist(dist_path, distname, version):
     def test_setup_requires_honors_pip_env(self, mock_index, monkeypatch):
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
+        monkeypatch.setenv('PIP_NO_INDEX', 'false')
         monkeypatch.setenv(str('PIP_INDEX_URL'), mock_index.url)
         with contexts.save_pkg_resources_state():
             with contexts.tempdir() as temp_dir:

From b091db995ff295d3d4ccc4717e401a1c134183a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 18:30:18 -0500
Subject: [PATCH 8315/8469] Exclude _distutils from flake8 also.

---
 .flake8 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.flake8 b/.flake8
index 5e1c7cae92..a8bbdd53a5 100644
--- a/.flake8
+++ b/.flake8
@@ -1,8 +1,9 @@
 [flake8]
 max-line-length = 88
 extend-exclude =
-	build/lib
+	build
 	setuptools/_vendor
+	setuptools/_distutils
 	pkg_resources/_vendor
 ignore =
 	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513

From b31105bdc855d75fc4f9fc7cfe005a81e7cc2f38 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 18:47:18 -0500
Subject: [PATCH 8316/8469] Rely on tuple argument to endswith

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
---
 pkg_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index ba90c8c4ab..a304647fd0 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1984,7 +1984,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
             dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
             for dist in dists:
                 yield dist
-        elif any(map(lower.endswith, ('.dist-info', '.egg-info'))):
+        elif subitem.lower().endswith(('.dist-info', '.egg-info')):
             subpath = os.path.join(path_item, subitem)
             submeta = EggMetadata(zipimport.zipimporter(subpath))
             submeta.egg_info = subpath

From b994bc637e5817798f356bfd373011ab1d894216 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 18:59:29 -0500
Subject: [PATCH 8317/8469] Remove unused variable

---
 pkg_resources/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 73f8545967..c84f1dd9e8 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1981,7 +1981,6 @@ def find_eggs_in_zip(importer, path_item, only=False):
         # don't yield nested distros
         return
     for subitem in metadata.resource_listdir(''):
-        lower = subitem.lower()
         if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
             dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)

From d01d3ee286d4aab0ca0d78bd7a47b2556f81f499 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 6 Dec 2020 11:21:30 -0500
Subject: [PATCH 8318/8469] Quick fix for #1390. Now description cannot contain
 a newline.

---
 changelog.d/1390.change.rst | 1 +
 setuptools/dist.py          | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1390.change.rst

diff --git a/changelog.d/1390.change.rst b/changelog.d/1390.change.rst
new file mode 100644
index 0000000000..fcb57f54c5
--- /dev/null
+++ b/changelog.d/1390.change.rst
@@ -0,0 +1 @@
+Newlines in metadata description/Summary now trigger a ValueError.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 662fbe67c5..2d0aac333d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -118,6 +118,13 @@ def _read_list(name):
         self.obsoletes = None
 
 
+def single_line(val):
+    # quick and dirty validation for description pypa/setuptools#1390
+    if '\n' in val:
+        raise ValueError("newlines not allowed")
+    return val
+
+
 # Based on Python 3.5 version
 def write_pkg_file(self, file):  # noqa: C901  # is too complex (14)  # FIXME
     """Write the PKG-INFO format data to a file object.
@@ -130,7 +137,7 @@ def write_field(key, value):
     write_field('Metadata-Version', str(version))
     write_field('Name', self.get_name())
     write_field('Version', self.get_version())
-    write_field('Summary', self.get_description())
+    write_field('Summary', single_line(self.get_description()))
     write_field('Home-page', self.get_url())
 
     if version < StrictVersion('1.2'):

From dc051ceb9071b7bc93fb8a3eaa8afc3ad57d5490 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 19:14:43 -0500
Subject: [PATCH 8319/8469] =?UTF-8?q?Bump=20version:=2051.2.0=20=E2=86=92?=
 =?UTF-8?q?=2051.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 14 ++++++++++++++
 changelog.d/1390.change.rst |  1 -
 changelog.d/2481.change.rst |  2 --
 changelog.d/2489.change.rst |  2 --
 changelog.d/2529.change.rst |  1 -
 setup.cfg                   |  2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 changelog.d/1390.change.rst
 delete mode 100644 changelog.d/2481.change.rst
 delete mode 100644 changelog.d/2489.change.rst
 delete mode 100644 changelog.d/2529.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index facadd5f3b..0789cb9847 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.2.0
+current_version = 51.3.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index e51b5e646c..48669d992c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,17 @@
+v51.3.0
+-------
+
+
+Changes
+^^^^^^^
+* #1390: Newlines in metadata description/Summary now trigger a ValueError.
+* #2481: Define ``create_module()`` and ``exec_module()`` methods in ``VendorImporter``
+  to get rid of ``ImportWarning`` -- by :user:`hroncok`
+* #2489: ``pkg_resources`` behavior for zipimport now matches the regular behavior, and finds
+  ``.egg-info`` (previoulsy would only find ``.dist-info``) -- by :user:`thatch`
+* #2529: Fixed an issue where version tags may be added multiple times
+
+
 v51.2.0
 -------
 
diff --git a/changelog.d/1390.change.rst b/changelog.d/1390.change.rst
deleted file mode 100644
index fcb57f54c5..0000000000
--- a/changelog.d/1390.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Newlines in metadata description/Summary now trigger a ValueError.
diff --git a/changelog.d/2481.change.rst b/changelog.d/2481.change.rst
deleted file mode 100644
index dc824c9c2e..0000000000
--- a/changelog.d/2481.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Define ``create_module()`` and ``exec_module()`` methods in ``VendorImporter``
-to get rid of ``ImportWarning`` -- by :user:`hroncok`
diff --git a/changelog.d/2489.change.rst b/changelog.d/2489.change.rst
deleted file mode 100644
index 40eddbe734..0000000000
--- a/changelog.d/2489.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``pkg_resources`` behavior for zipimport now matches the regular behavior, and finds
-``.egg-info`` (previoulsy would only find ``.dist-info``) -- by :user:`thatch`
diff --git a/changelog.d/2529.change.rst b/changelog.d/2529.change.rst
deleted file mode 100644
index 10c41518d4..0000000000
--- a/changelog.d/2529.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an issue where version tags may be added multiple times
diff --git a/setup.cfg b/setup.cfg
index 4e7312a107..43c4f23b6f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.2.0
+version = 51.3.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 5156278555fa20234db59f81097bee8cd7b5aaf4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 22:05:43 -0500
Subject: [PATCH 8320/8469] Revert "Merge pull request #2533 from
 pypa/fix/2529"

This reverts commit ef457b2e4eb215ab9d730afbd61a10ed3b118d3c, reversing
changes made to d2b1f7ebd6ebd57b4a50bc6660e93b31129bacb4.
---
 setuptools/command/egg_info.py    | 10 ++--
 setuptools/tests/test_egg_info.py | 84 +++++++++++++------------------
 2 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index bb47203602..1f120b67d1 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -131,12 +131,10 @@ def _maybe_tag(self, version):
         egg_info may be called more than once for a distribution,
         in which case the version string already contains all tags.
         """
-        # Remove the tags if they exist. The tags maybe have been normalized
-        # (e.g. turning .dev into .dev0) so we can't just compare strings
-        base_version = parse_version(version).base_version
-
-        # Add the tags
-        return base_version + self.vtags
+        return (
+            version if self.vtags and version.endswith(self.vtags)
+            else version + self.vtags
+        )
 
     def tags(self):
         version = ''
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1d0f07e306..1047468b18 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,7 +6,6 @@
 import stat
 import time
 
-from setuptools.build_meta import prepare_metadata_for_build_wheel
 from setuptools.command.egg_info import (
     egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision,
 )
@@ -20,26 +19,6 @@
 from . import contexts
 
 
-def _run_egg_info_command(tmpdir_cwd, env, cmd=None, output=None):
-    environ = os.environ.copy().update(
-        HOME=env.paths['home'],
-    )
-    if cmd is None:
-        cmd = [
-            'egg_info',
-        ]
-    code, data = environment.run_setup_py(
-        cmd=cmd,
-        pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
-        data_stream=1,
-        env=environ,
-    )
-    assert not code, data
-
-    if output:
-        assert output in data
-
-
 class Environment(str):
     pass
 
@@ -153,7 +132,7 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
     def test_expected_files_produced(self, tmpdir_cwd, env):
         self._create_project()
 
-        _run_egg_info_command(tmpdir_cwd, env)
+        self._run_egg_info_command(tmpdir_cwd, env)
         actual = os.listdir('foo.egg-info')
 
         expected = [
@@ -187,7 +166,7 @@ def test_license_is_a_string(self, tmpdir_cwd, env):
         # currently configured to use a subprocess, the actual traceback
         # object is lost and we need to parse it from stderr
         with pytest.raises(AssertionError) as exc:
-            _run_egg_info_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
 
         # Hopefully this is not too fragile: the only argument to the
         # assertion error should be a traceback, ending with:
@@ -201,13 +180,13 @@ def test_rebuilt(self, tmpdir_cwd, env):
         """Ensure timestamps are updated when the command is re-run."""
         self._create_project()
 
-        _run_egg_info_command(tmpdir_cwd, env)
+        self._run_egg_info_command(tmpdir_cwd, env)
         timestamp_a = os.path.getmtime('foo.egg-info')
 
         # arbitrary sleep just to handle *really* fast systems
         time.sleep(.001)
 
-        _run_egg_info_command(tmpdir_cwd, env)
+        self._run_egg_info_command(tmpdir_cwd, env)
         timestamp_b = os.path.getmtime('foo.egg-info')
 
         assert timestamp_a != timestamp_b
@@ -222,7 +201,7 @@ def test_manifest_template_is_read(self, tmpdir_cwd, env):
                 'usage.rst': "Run 'hi'",
             }
         })
-        _run_egg_info_command(tmpdir_cwd, env)
+        self._run_egg_info_command(tmpdir_cwd, env)
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         with open(sources_txt) as f:
@@ -462,7 +441,7 @@ def test_requires(
             self, tmpdir_cwd, env, requires, use_setup_cfg,
             expected_requires, install_cmd_kwargs):
         self._setup_script_with_requires(requires, use_setup_cfg)
-        _run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs)
+        self._run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs)
         egg_info_dir = os.path.join('.', 'foo.egg-info')
         requires_txt = os.path.join(egg_info_dir, 'requires.txt')
         if os.path.exists(requires_txt):
@@ -482,14 +461,14 @@ def test_install_requires_unordered_disallowed(self, tmpdir_cwd, env):
         req = 'install_requires={"fake-factory==0.5.2", "pytz"}'
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            _run_egg_info_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
 
     def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env):
         tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},'
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            _run_egg_info_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
@@ -497,7 +476,7 @@ def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env):
         req = tmpl.format(marker=self.invalid_marker)
         self._setup_script_with_requires(req)
         with pytest.raises(AssertionError):
-            _run_egg_info_command(tmpdir_cwd, env)
+            self._run_egg_info_command(tmpdir_cwd, env)
         assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
 
     def test_provides_extra(self, tmpdir_cwd, env):
@@ -886,22 +865,26 @@ def test_egg_info_includes_setup_py(self, tmpdir_cwd):
             sources = f.read().split('\n')
             assert 'setup.py' in sources
 
-    @pytest.mark.parametrize(
-        ('make_metadata_path', 'run_command'),
-        [
-            (
-                lambda env: os.path.join('.', 'foo.egg-info', 'PKG-INFO'),
-                lambda tmpdir_cwd, env: _run_egg_info_command(tmpdir_cwd, env)
-            ),
-            (
-                lambda env: os.path.join(env, 'foo.dist-info', 'METADATA'),
-                lambda tmpdir_cwd, env: prepare_metadata_for_build_wheel(env)
-            )
-        ]
-    )
-    def test_egg_info_tag_only_once(
-            self, tmpdir_cwd, env, make_metadata_path, run_command
-    ):
+    def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
+        environ = os.environ.copy().update(
+            HOME=env.paths['home'],
+        )
+        if cmd is None:
+            cmd = [
+                'egg_info',
+            ]
+        code, data = environment.run_setup_py(
+            cmd=cmd,
+            pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
+            data_stream=1,
+            env=environ,
+        )
+        assert not code, data
+
+        if output:
+            assert output in data
+
+    def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
         self._create_project()
         build_files({
             'setup.cfg': DALS("""
@@ -911,10 +894,11 @@ def test_egg_info_tag_only_once(
                               tag_svn_revision = 0
                               """),
         })
-        run_command(tmpdir_cwd, env)
-        with open(make_metadata_path(env)) as metadata_file:
-            metadata_lines = metadata_file.read().split('\n')
-        assert 'Version: 0.0.0.dev0' in metadata_lines
+        self._run_egg_info_command(tmpdir_cwd, env)
+        egg_info_dir = os.path.join('.', 'foo.egg-info')
+        with open(os.path.join(egg_info_dir, 'PKG-INFO')) as pkginfo_file:
+            pkg_info_lines = pkginfo_file.read().split('\n')
+        assert 'Version: 0.0.0.dev0' in pkg_info_lines
 
     def test_get_pkg_info_revision_deprecated(self):
         pytest.warns(EggInfoDeprecationWarning, get_pkg_info_revision)

From 6b44f948ca40ee490c59d216a0e859d17431742a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 16 Jan 2021 22:09:51 -0500
Subject: [PATCH 8321/8469] =?UTF-8?q?Bump=20version:=2051.3.0=20=E2=86=92?=
 =?UTF-8?q?=2051.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 9 +++++++++
 setup.cfg        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 0789cb9847..2cb50290ea 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.3.0
+current_version = 51.3.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 48669d992c..2be5fa2fac 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.3.1
+-------
+
+
+Misc
+^^^^
+* #2536: Reverted tag deduplication handling.
+
+
 v51.3.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 43c4f23b6f..aead43461b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.3.0
+version = 51.3.1
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From fbb705406dca3e8a41ac6be4a28e1611102cac5c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 01:36:19 -0500
Subject: [PATCH 8322/8469] Remove support for easy_install-based downloads for
 fetch_build_eggs (setup_requires).

---
 setuptools/installer.py               | 46 +--------------------------
 setuptools/tests/test_easy_install.py | 10 +++---
 setuptools/tests/test_virtualenv.py   |  5 ---
 3 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/setuptools/installer.py b/setuptools/installer.py
index c5822a31f4..57e2b587aa 100644
--- a/setuptools/installer.py
+++ b/setuptools/installer.py
@@ -7,7 +7,6 @@
 from distutils.errors import DistutilsError
 
 import pkg_resources
-from setuptools.command.easy_install import easy_install
 from setuptools.wheel import Wheel
 
 
@@ -19,54 +18,11 @@ def _fixup_find_links(find_links):
     return find_links
 
 
-def _legacy_fetch_build_egg(dist, req):
-    """Fetch an egg needed for building.
-
-    Legacy path using EasyInstall.
-    """
-    tmp_dist = dist.__class__({'script_args': ['easy_install']})
-    opts = tmp_dist.get_option_dict('easy_install')
-    opts.clear()
-    opts.update(
-        (k, v)
-        for k, v in dist.get_option_dict('easy_install').items()
-        if k in (
-            # don't use any other settings
-            'find_links', 'site_dirs', 'index_url',
-            'optimize', 'site_dirs', 'allow_hosts',
-        ))
-    if dist.dependency_links:
-        links = dist.dependency_links[:]
-        if 'find_links' in opts:
-            links = _fixup_find_links(opts['find_links'][1]) + links
-        opts['find_links'] = ('setup', links)
-    install_dir = dist.get_egg_cache_dir()
-    cmd = easy_install(
-        tmp_dist, args=["x"], install_dir=install_dir,
-        exclude_scripts=True,
-        always_copy=False, build_directory=None, editable=False,
-        upgrade=False, multi_version=True, no_report=True, user=False
-    )
-    cmd.ensure_finalized()
-    return cmd.easy_install(req)
-
-
 def fetch_build_egg(dist, req):  # noqa: C901  # is too complex (16)  # FIXME
     """Fetch an egg needed for building.
 
     Use pip/wheel to fetch/build a wheel."""
-    # Check pip is available.
-    try:
-        pkg_resources.get_distribution('pip')
-    except pkg_resources.DistributionNotFound:
-        dist.announce(
-            'WARNING: The pip package is not available, falling back '
-            'to EasyInstall for handling setup_requires/test_requires; '
-            'this is deprecated and will be removed in a future version.',
-            log.WARN
-        )
-        return _legacy_fetch_build_egg(dist, req)
-    # Warn if wheel is not.
+    # Warn if wheel is not available
     try:
         pkg_resources.get_distribution('wheel')
     except pkg_resources.DistributionNotFound:
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 6aa17e9414..3340a59c24 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -742,10 +742,10 @@ def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir):
         assert eggs == ['dep 1.0']
 
     @pytest.mark.parametrize(
-        'use_legacy_installer,with_dependency_links_in_setup_py',
-        itertools.product((False, True), (False, True)))
+        'with_dependency_links_in_setup_py',
+        (False, True))
     def test_setup_requires_with_find_links_in_setup_cfg(
-            self, monkeypatch, use_legacy_installer,
+            self, monkeypatch,
             with_dependency_links_in_setup_py):
         monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
         monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
@@ -767,11 +767,9 @@ def test_setup_requires_with_find_links_in_setup_cfg(
                     fp.write(DALS(
                         '''
                         from setuptools import installer, setup
-                        if {use_legacy_installer}:
-                            installer.fetch_build_egg = installer._legacy_fetch_build_egg
                         setup(setup_requires='python-xlib==42',
                         dependency_links={dependency_links!r})
-                        ''').format(use_legacy_installer=use_legacy_installer,  # noqa
+                        ''').format(
                                     dependency_links=dependency_links))
                 with open(test_setup_cfg, 'w') as fp:
                     fp.write(DALS(
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 5a942d84c5..8681ed2741 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -186,11 +186,6 @@ def test_test_command_install_requirements(virtualenv, tmpdir):
     _check_test_command_install_requirements(virtualenv, tmpdir)
 
 
-def test_test_command_install_requirements_when_using_easy_install(
-        bare_virtualenv, tmpdir):
-    _check_test_command_install_requirements(bare_virtualenv, tmpdir)
-
-
 def test_no_missing_dependencies(bare_virtualenv):
     """
     Quick and dirty test to ensure all external dependencies are vendored.

From 2f891b433c42eb1554644199058c9190790ebf85 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 12:14:25 -0500
Subject: [PATCH 8323/8469] Repair Descriptions with newlines and emit a
 warning that the value will be disallowed in the future.

---
 changelog.d/1390.misc.rst | 1 +
 setuptools/dist.py        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/1390.misc.rst

diff --git a/changelog.d/1390.misc.rst b/changelog.d/1390.misc.rst
new file mode 100644
index 0000000000..5e4fb11488
--- /dev/null
+++ b/changelog.d/1390.misc.rst
@@ -0,0 +1 @@
+Validation of Description field now is more lenient, emitting a warning and mangling the value to be valid (replacing newlines with spaces).
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2d0aac333d..172d66b1f4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -121,7 +121,9 @@ def _read_list(name):
 def single_line(val):
     # quick and dirty validation for description pypa/setuptools#1390
     if '\n' in val:
-        raise ValueError("newlines not allowed")
+        # TODO after 2021-07-31: Replace with `raise ValueError("newlines not allowed")`
+        warnings.UserWarning("newlines not allowed and will break in the future")
+        val = val.replace('\n', ' ')
     return val
 
 

From c5e0397b231f36d6349357a33c48618f82facb58 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 13:35:16 -0500
Subject: [PATCH 8324/8469] =?UTF-8?q?Bump=20version:=2051.3.1=20=E2=86=92?=
 =?UTF-8?q?=2051.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 9 +++++++++
 changelog.d/1390.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1390.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2cb50290ea..4d60721741 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.3.1
+current_version = 51.3.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 2be5fa2fac..2de874ca96 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.3.2
+-------
+
+
+Misc
+^^^^
+* #1390: Validation of Description field now is more lenient, emitting a warning and mangling the value to be valid (replacing newlines with spaces).
+
+
 v51.3.1
 -------
 
diff --git a/changelog.d/1390.misc.rst b/changelog.d/1390.misc.rst
deleted file mode 100644
index 5e4fb11488..0000000000
--- a/changelog.d/1390.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Validation of Description field now is more lenient, emitting a warning and mangling the value to be valid (replacing newlines with spaces).
diff --git a/setup.cfg b/setup.cfg
index aead43461b..2476ede8b0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.3.1
+version = 51.3.2
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 9d61fdd3078805cad8ccd84c769a8a27e033a1a8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 13:37:03 -0500
Subject: [PATCH 8325/8469] Add changelog.

---
 changelog.d/2537.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2537.breaking.rst

diff --git a/changelog.d/2537.breaking.rst b/changelog.d/2537.breaking.rst
new file mode 100644
index 0000000000..184d8e8758
--- /dev/null
+++ b/changelog.d/2537.breaking.rst
@@ -0,0 +1 @@
+Remove fallback support for fetch_build_eggs using easy_install. Now pip is required for setup_requires to succeed.

From 49364a9eb82a986da1a1e6ad24022f7aac6e10d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 17:13:37 -0500
Subject: [PATCH 8326/8469] Fix AttributeError in Description validation. Fixes
 #2539.

---
 changelog.d/2539.misc.rst | 1 +
 setuptools/dist.py        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2539.misc.rst

diff --git a/changelog.d/2539.misc.rst b/changelog.d/2539.misc.rst
new file mode 100644
index 0000000000..20114be805
--- /dev/null
+++ b/changelog.d/2539.misc.rst
@@ -0,0 +1 @@
+Fix AttributeError in Description validation.
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 172d66b1f4..050388de16 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -122,7 +122,7 @@ def single_line(val):
     # quick and dirty validation for description pypa/setuptools#1390
     if '\n' in val:
         # TODO after 2021-07-31: Replace with `raise ValueError("newlines not allowed")`
-        warnings.UserWarning("newlines not allowed and will break in the future")
+        warnings.warn("newlines not allowed and will break in the future")
         val = val.replace('\n', ' ')
     return val
 

From 925b6be6796c185e5d832a89ce33fbe38c0df5f6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 17:14:28 -0500
Subject: [PATCH 8327/8469] =?UTF-8?q?Bump=20version:=2051.3.2=20=E2=86=92?=
 =?UTF-8?q?=2051.3.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 9 +++++++++
 changelog.d/2539.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2539.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4d60721741..debcfeeb64 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.3.2
+current_version = 51.3.3
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 2de874ca96..c094960f9a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v51.3.3
+-------
+
+
+Misc
+^^^^
+* #2539: Fix AttributeError in Description validation.
+
+
 v51.3.2
 -------
 
diff --git a/changelog.d/2539.misc.rst b/changelog.d/2539.misc.rst
deleted file mode 100644
index 20114be805..0000000000
--- a/changelog.d/2539.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix AttributeError in Description validation.
diff --git a/setup.cfg b/setup.cfg
index 2476ede8b0..536ec70fab 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.3.2
+version = 51.3.3
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From d3885f25e37b28fe5a50274a5db9819d5e2ce042 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 18 Nov 2020 18:38:02 +0100
Subject: [PATCH 8328/8469] Parallelize the test runs via pytest-xdist

Resolves #2458
---
 pytest.ini | 3 +++
 setup.cfg  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 03fc773cf4..df30b82273 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,6 +4,9 @@ addopts=
 	--doctest-modules
 	--doctest-glob=pkg_resources/api_tests.txt
 	-r sxX
+
+	# `pytest-xdist`:
+	-n auto
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 # workaround for warning pytest-dev/pytest#6178
 junit_family=xunit2
diff --git a/setup.cfg b/setup.cfg
index 536ec70fab..bda5ab6f1b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,6 +58,7 @@ testing =
     paver
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
+    pytest-xdist
 
 docs =
     # Keep these in sync with docs/requirements.txt

From c9188cbf991dbaac6d94b0dd57d3132760fc9e89 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 02:24:08 +0100
Subject: [PATCH 8329/8469] Sanitize CWD out of sys.path in xdist mode

---
 setuptools/tests/test_build_meta.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 6d3a997ee0..b0455a62cc 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -1,8 +1,10 @@
 import os
 import shutil
+import sys
 import tarfile
 import importlib
 from concurrent import futures
+from contextlib import suppress
 
 import pytest
 
@@ -44,6 +46,15 @@ def __init__(self, *args, **kwargs):
 
     def __call__(self, name, *args, **kw):
         """Handles aribrary function invocations on the build backend."""
+        with suppress(ValueError):
+            # NOTE: pytest-xdist tends to inject '' into `sys.path` which
+            # NOTE: may break certain isolation expectations. To address
+            # NOTE: this, we remove this entry from there so the import
+            # NOTE: machinery behaves the same as in the default
+            # NOTE: sequential mode.
+            # Ref: https://github.com/pytest-dev/pytest-xdist/issues/376
+            sys.path.remove('')
+
         os.chdir(self.cwd)
         os.environ.update(self.env)
         mod = importlib.import_module(self.backend_name)

From be6abaec7183e43c164be21112d0b57307748e1d Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 02:26:30 +0100
Subject: [PATCH 8330/8469] Clarify `test_build_sdist_relative_path_import`

---
 setuptools/tests/test_build_meta.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index b0455a62cc..63c7c275b3 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -349,6 +349,7 @@ def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         build_files(self._relative_path_import_files)
         build_backend = self.get_build_backend()
         with pytest.raises(ImportError):
+        with pytest.raises(ImportError, match="^No module named 'hello'$"):
             build_backend.build_sdist("temp")
 
     @pytest.mark.parametrize('setup_literal, requirements', [

From 8a7a014b8abebcbec942a12d5c63759ada956802 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 02:27:43 +0100
Subject: [PATCH 8331/8469] Make `get_build_backend` cwd path customizable

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

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 63c7c275b3..a117a9beba 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -136,8 +136,10 @@ def run():
 class TestBuildMetaBackend:
     backend_name = 'setuptools.build_meta'
 
-    def get_build_backend(self):
-        return BuildBackend(cwd='.', backend_name=self.backend_name)
+    def get_build_backend(self, cwd_path=None):
+        if cwd_path is None:
+            cwd_path = '.'
+        return BuildBackend(cwd=cwd_path, backend_name=self.backend_name)
 
     @pytest.fixture(params=defns)
     def build_backend(self, tmpdir, request):

From 08ded165701faff86313674b8ee92730902e7a3c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 02:28:22 +0100
Subject: [PATCH 8332/8469] Replace `tmpdir_cwd` fixture with `tmp_path`

---
 setuptools/tests/test_build_meta.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a117a9beba..3f1ba0465f 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -347,12 +347,11 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
             """)
     }
 
-    def test_build_sdist_relative_path_import(self, tmpdir_cwd):
-        build_files(self._relative_path_import_files)
-        build_backend = self.get_build_backend()
-        with pytest.raises(ImportError):
+    def test_build_sdist_relative_path_import(self, tmp_path):
+        build_files(self._relative_path_import_files, prefix=str(tmp_path))
+        build_backend = self.get_build_backend(cwd_path=tmp_path)
         with pytest.raises(ImportError, match="^No module named 'hello'$"):
-            build_backend.build_sdist("temp")
+            build_backend.build_sdist(tmp_path / "temp")
 
     @pytest.mark.parametrize('setup_literal, requirements', [
         ("'foo'", ['foo']),

From 2e077b73e8a391f460b365382408d70439494d43 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 23:10:35 +0100
Subject: [PATCH 8333/8469] Make `test_pip_upgrade_from_source` xdist-friendly

---
 setuptools/tests/fixtures.py        | 28 ++++++++++++++++++++++++++++
 setuptools/tests/test_virtualenv.py |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index e8cb7f5237..0480033c5b 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,8 +1,14 @@
+import pathlib
+import shutil
+
 import pytest
 
 from . import contexts
 
 
+SRC_DIR = pathlib.Path(__file__).parents[2]
+
+
 @pytest.fixture
 def user_override(monkeypatch):
     """
@@ -21,3 +27,25 @@ def user_override(monkeypatch):
 def tmpdir_cwd(tmpdir):
     with tmpdir.as_cwd() as orig:
         yield orig
+
+
+@pytest.fixture
+def src_dir():
+    """The project source directory available via fixture."""
+    return SRC_DIR
+
+
+@pytest.fixture
+def tmp_src(src_dir, tmp_path):
+    """Make a copy of the source dir under `$tmp/src`.
+
+    This fixture is useful whenever it's necessary to run `setup.py`
+    or `pip install` against the source directory when there's no
+    control over the number of simultaneous invocations. Such
+    concurrent runs create and delete directories with the same names
+    under the target directory and so they influence each other's runs
+    when they are not being executed sequentially.
+    """
+    tmp_src_path = tmp_path / 'src'
+    shutil.copytree(src_dir, tmp_src_path)
+    return tmp_src_path
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 5a942d84c5..79468b1baa 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -85,7 +85,7 @@ def _get_pip_versions():
 
 
 @pytest.mark.parametrize('pip_version', _get_pip_versions())
-def test_pip_upgrade_from_source(pip_version, virtualenv):
+def test_pip_upgrade_from_source(pip_version, tmp_src, virtualenv):
     """
     Check pip can upgrade setuptools from source.
     """
@@ -104,7 +104,7 @@ def test_pip_upgrade_from_source(pip_version, virtualenv):
     virtualenv.run(' && '.join((
         'python setup.py -q sdist -d {dist}',
         'python setup.py -q bdist_wheel -d {dist}',
-    )).format(dist=dist_dir), cd=SOURCE_DIR)
+    )).format(dist=dist_dir), cd=tmp_src)
     sdist = glob.glob(os.path.join(dist_dir, '*.zip'))[0]
     wheel = glob.glob(os.path.join(dist_dir, '*.whl'))[0]
     # Then update from wheel.

From fecbc2d2b439385bfee6ac52fa004a61ccde35f6 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 1 Jan 2021 23:54:14 +0100
Subject: [PATCH 8334/8469] Isolate src for `test_distutils_adoption`

---
 setuptools/tests/test_distutils_adoption.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index a53773df8c..0e89921c90 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -21,10 +21,10 @@ def run(self, cmd, *args, **kwargs):
 
 
 @pytest.fixture
-def venv(tmpdir):
+def venv(tmp_path, tmp_src):
     env = VirtualEnv()
-    env.root = path.Path(tmpdir)
-    env.req = os.getcwd()
+    env.root = path.Path(tmp_path / 'venv')
+    env.req = str(tmp_src)
     return env.create()
 
 

From 5f3d12316dc4e3c3f638786668cee38ff5a73bd3 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sat, 2 Jan 2021 00:15:33 +0100
Subject: [PATCH 8335/8469] Use tmp src copy in `test_clean_env_install`

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

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 79468b1baa..d72dcbd0e5 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -43,11 +43,11 @@ def bare_virtualenv():
 SOURCE_DIR = os.path.join(os.path.dirname(__file__), '../..')
 
 
-def test_clean_env_install(bare_virtualenv):
+def test_clean_env_install(bare_virtualenv, tmp_src):
     """
     Check setuptools can be installed in a clean environment.
     """
-    bare_virtualenv.run(['python', 'setup.py', 'install'], cd=SOURCE_DIR)
+    bare_virtualenv.run(['python', 'setup.py', 'install'], cd=tmp_src)
 
 
 def _get_pip_versions():

From 7fe4a4054a92782a434d25d4ff85231537892c7f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 21:42:33 -0500
Subject: [PATCH 8336/8469] Rely on pytest-enabler to enable pytest-xdist when
 present and enabled.

---
 pyproject.toml | 3 +++
 pytest.ini     | 3 ---
 setup.cfg      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0bc2a46f4f..4e80bdc1a7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,6 +24,9 @@ addopts = "--flake8"
 [pytest.enabler.cov]
 addopts = "--cov"
 
+[pytest.enabler.xdist]
+addopts = "-n auto"
+
 [tool.towncrier]
     package = "setuptools"
     package_dir = "setuptools"
diff --git a/pytest.ini b/pytest.ini
index df30b82273..03fc773cf4 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,9 +4,6 @@ addopts=
 	--doctest-modules
 	--doctest-glob=pkg_resources/api_tests.txt
 	-r sxX
-
-	# `pytest-xdist`:
-	-n auto
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 # workaround for warning pytest-dev/pytest#6178
 junit_family=xunit2
diff --git a/setup.cfg b/setup.cfg
index bda5ab6f1b..36c7daeebc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ testing =
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov
 	pytest-mypy; python_implementation != "PyPy"
-	pytest-enabler
+	pytest-enabler >= 1.0.1
 
 	# local
     mock

From 3c8e758caa11abe63040058ba136a68d2b620ea3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 17 Jan 2021 21:49:57 -0500
Subject: [PATCH 8337/8469] Avoid indirection in src_dir

---
 setuptools/tests/fixtures.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 0480033c5b..4a990eb950 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -6,9 +6,6 @@
 from . import contexts
 
 
-SRC_DIR = pathlib.Path(__file__).parents[2]
-
-
 @pytest.fixture
 def user_override(monkeypatch):
     """
@@ -32,7 +29,7 @@ def tmpdir_cwd(tmpdir):
 @pytest.fixture
 def src_dir():
     """The project source directory available via fixture."""
-    return SRC_DIR
+    return pathlib.Path(__file__).parents[2]
 
 
 @pytest.fixture

From 31b0896bba77f21984dfad5a0b82fcd57bda9658 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 10:30:11 -0500
Subject: [PATCH 8338/8469] Rely on rootdir to determine the source. Avoids
 coupling with position in the test suite.

---
 setuptools/tests/fixtures.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 4a990eb950..d975c0fc5b 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,4 +1,3 @@
-import pathlib
 import shutil
 
 import pytest
@@ -27,13 +26,7 @@ def tmpdir_cwd(tmpdir):
 
 
 @pytest.fixture
-def src_dir():
-    """The project source directory available via fixture."""
-    return pathlib.Path(__file__).parents[2]
-
-
-@pytest.fixture
-def tmp_src(src_dir, tmp_path):
+def tmp_src(request, tmp_path):
     """Make a copy of the source dir under `$tmp/src`.
 
     This fixture is useful whenever it's necessary to run `setup.py`
@@ -44,5 +37,5 @@ def tmp_src(src_dir, tmp_path):
     when they are not being executed sequentially.
     """
     tmp_src_path = tmp_path / 'src'
-    shutil.copytree(src_dir, tmp_src_path)
+    shutil.copytree(request.config.rootdir, tmp_src_path)
     return tmp_src_path

From f767b4f59b14aa94d7c085173cb9360ba2d187eb Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 10:48:38 -0500
Subject: [PATCH 8339/8469] Extract workaround for pytest-dev/pytest-xdist#376
 as a fixture. Invoke the repair at the session level and only when xdist is
 present.

---
 setuptools/tests/fixtures.py        | 19 +++++++++++++++++++
 setuptools/tests/test_build_meta.py | 11 -----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index d975c0fc5b..d74b5f031a 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,3 +1,5 @@
+import contextlib
+import sys
 import shutil
 
 import pytest
@@ -39,3 +41,20 @@ def tmp_src(request, tmp_path):
     tmp_src_path = tmp_path / 'src'
     shutil.copytree(request.config.rootdir, tmp_src_path)
     return tmp_src_path
+
+
+@pytest.fixture(autouse=True, scope="session")
+def workaround_xdist_376(request):
+    """
+    Workaround pytest-dev/pytest-xdist#376
+
+    ``pytest-xdist`` tends to inject '' into ``sys.path``,
+    which may break certain isolation expectations.
+    Remove the entry so the import
+    machinery behaves the same irrespective of xdist.
+    """
+    if not request.config.pluginmanager.has_plugin('xdist'):
+        return
+
+    with contextlib.suppress(ValueError):
+        sys.path.remove('')
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 3f1ba0465f..5dee857707 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -1,10 +1,8 @@
 import os
 import shutil
-import sys
 import tarfile
 import importlib
 from concurrent import futures
-from contextlib import suppress
 
 import pytest
 
@@ -46,15 +44,6 @@ def __init__(self, *args, **kwargs):
 
     def __call__(self, name, *args, **kw):
         """Handles aribrary function invocations on the build backend."""
-        with suppress(ValueError):
-            # NOTE: pytest-xdist tends to inject '' into `sys.path` which
-            # NOTE: may break certain isolation expectations. To address
-            # NOTE: this, we remove this entry from there so the import
-            # NOTE: machinery behaves the same as in the default
-            # NOTE: sequential mode.
-            # Ref: https://github.com/pytest-dev/pytest-xdist/issues/376
-            sys.path.remove('')
-
         os.chdir(self.cwd)
         os.environ.update(self.env)
         mod = importlib.import_module(self.backend_name)

From daf01571d508234fcff707b1a1156c7496c0c131 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 11:02:06 -0500
Subject: [PATCH 8340/8469] Simplify get_build_backend to simply allow override
 of cwd.

---
 setuptools/tests/test_build_meta.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 5dee857707..5331e2f8af 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -11,7 +11,7 @@
 
 
 class BuildBackendBase:
-    def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
+    def __init__(self, cwd='.', env={}, backend_name='setuptools.build_meta'):
         self.cwd = cwd
         self.env = env
         self.backend_name = backend_name
@@ -125,10 +125,8 @@ def run():
 class TestBuildMetaBackend:
     backend_name = 'setuptools.build_meta'
 
-    def get_build_backend(self, cwd_path=None):
-        if cwd_path is None:
-            cwd_path = '.'
-        return BuildBackend(cwd=cwd_path, backend_name=self.backend_name)
+    def get_build_backend(self, **kwargs):
+        return BuildBackend(backend_name=self.backend_name, **kwargs)
 
     @pytest.fixture(params=defns)
     def build_backend(self, tmpdir, request):
@@ -338,7 +336,7 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
 
     def test_build_sdist_relative_path_import(self, tmp_path):
         build_files(self._relative_path_import_files, prefix=str(tmp_path))
-        build_backend = self.get_build_backend(cwd_path=tmp_path)
+        build_backend = self.get_build_backend(cwd=tmp_path)
         with pytest.raises(ImportError, match="^No module named 'hello'$"):
             build_backend.build_sdist(tmp_path / "temp")
 

From 77aefc128699182e5b1271162f0b7c557d81b1d5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 11:22:05 -0500
Subject: [PATCH 8341/8469] Restore test_build_sdist_relative_path_import to
 its former simple implementation.

---
 setuptools/tests/test_build_meta.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 5331e2f8af..e117d8e629 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -125,8 +125,8 @@ def run():
 class TestBuildMetaBackend:
     backend_name = 'setuptools.build_meta'
 
-    def get_build_backend(self, **kwargs):
-        return BuildBackend(backend_name=self.backend_name, **kwargs)
+    def get_build_backend(self):
+        return BuildBackend(backend_name=self.backend_name)
 
     @pytest.fixture(params=defns)
     def build_backend(self, tmpdir, request):
@@ -334,11 +334,11 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
             """)
     }
 
-    def test_build_sdist_relative_path_import(self, tmp_path):
-        build_files(self._relative_path_import_files, prefix=str(tmp_path))
-        build_backend = self.get_build_backend(cwd=tmp_path)
+    def test_build_sdist_relative_path_import(self, tmpdir_cwd):
+        build_files(self._relative_path_import_files)
+        build_backend = self.get_build_backend()
         with pytest.raises(ImportError, match="^No module named 'hello'$"):
-            build_backend.build_sdist(tmp_path / "temp")
+            build_backend.build_sdist("temp")
 
     @pytest.mark.parametrize('setup_literal, requirements', [
         ("'foo'", ['foo']),

From 347f7497d9668049b50a26c381dc661c2b641a7b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 11:29:28 -0500
Subject: [PATCH 8342/8469] Simplify and enhance tests in test_build_meta. Ref
 #2459.

---
 setuptools/tests/test_build_meta.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 6d3a997ee0..e117d8e629 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -11,7 +11,7 @@
 
 
 class BuildBackendBase:
-    def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
+    def __init__(self, cwd='.', env={}, backend_name='setuptools.build_meta'):
         self.cwd = cwd
         self.env = env
         self.backend_name = backend_name
@@ -126,7 +126,7 @@ class TestBuildMetaBackend:
     backend_name = 'setuptools.build_meta'
 
     def get_build_backend(self):
-        return BuildBackend(cwd='.', backend_name=self.backend_name)
+        return BuildBackend(backend_name=self.backend_name)
 
     @pytest.fixture(params=defns)
     def build_backend(self, tmpdir, request):
@@ -337,7 +337,7 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
     def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         build_files(self._relative_path_import_files)
         build_backend = self.get_build_backend()
-        with pytest.raises(ImportError):
+        with pytest.raises(ImportError, match="^No module named 'hello'$"):
             build_backend.build_sdist("temp")
 
     @pytest.mark.parametrize('setup_literal, requirements', [

From 3b571b08feda091838f55d6d0ec3a72325264051 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 12:08:11 -0500
Subject: [PATCH 8343/8469] Add changelog.

---
 changelog.d/2459.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2459.change.rst

diff --git a/changelog.d/2459.change.rst b/changelog.d/2459.change.rst
new file mode 100644
index 0000000000..3b8d11a9ed
--- /dev/null
+++ b/changelog.d/2459.change.rst
@@ -0,0 +1 @@
+Tests now run in parallel via pytest-xdist, completing in about half the time. Special thanks to :user:`webknjaz` for hard work implementing test isolation. To run without parallelization, disable the plugin with ``tox -- -p no:xdist``.

From 8222d6f7b992d3b184434acb31cd66b0f2e41401 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 18 Jan 2021 12:18:26 -0500
Subject: [PATCH 8344/8469] Prefer 'rootdir' for resolving the project root.

---
 setuptools/tests/test_virtualenv.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index d72dcbd0e5..7aa88b83ff 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -40,9 +40,6 @@ def bare_virtualenv():
         yield venv
 
 
-SOURCE_DIR = os.path.join(os.path.dirname(__file__), '../..')
-
-
 def test_clean_env_install(bare_virtualenv, tmp_src):
     """
     Check setuptools can be installed in a clean environment.
@@ -113,12 +110,12 @@ def test_pip_upgrade_from_source(pip_version, tmp_src, virtualenv):
     virtualenv.run('pip install --no-cache-dir --upgrade ' + sdist)
 
 
-def _check_test_command_install_requirements(virtualenv, tmpdir):
+def _check_test_command_install_requirements(virtualenv, tmpdir, cwd):
     """
     Check the test command will install all required dependencies.
     """
     # Install setuptools.
-    virtualenv.run('python setup.py develop', cd=SOURCE_DIR)
+    virtualenv.run('python setup.py develop', cd=cwd)
 
     def sdist(distname, version):
         dist_path = tmpdir.join('%s-%s.tar.gz' % (distname, version))
@@ -175,7 +172,7 @@ def sdist(distname, version):
     assert tmpdir.join('success').check()
 
 
-def test_test_command_install_requirements(virtualenv, tmpdir):
+def test_test_command_install_requirements(virtualenv, tmpdir, request):
     # Ensure pip/wheel packages are installed.
     virtualenv.run(
         "python -c \"__import__('pkg_resources').require(['pip', 'wheel'])\"")
@@ -183,18 +180,19 @@ def test_test_command_install_requirements(virtualenv, tmpdir):
     virtualenv.run("python -m pip uninstall -y setuptools")
     # disable index URL so bits and bobs aren't requested from PyPI
     virtualenv.env['PIP_NO_INDEX'] = '1'
-    _check_test_command_install_requirements(virtualenv, tmpdir)
+    _check_test_command_install_requirements(virtualenv, tmpdir, request.config.rootdir)
 
 
 def test_test_command_install_requirements_when_using_easy_install(
-        bare_virtualenv, tmpdir):
-    _check_test_command_install_requirements(bare_virtualenv, tmpdir)
+        bare_virtualenv, tmpdir, request):
+    _check_test_command_install_requirements(
+        bare_virtualenv, tmpdir, request.config.rootdir)
 
 
-def test_no_missing_dependencies(bare_virtualenv):
+def test_no_missing_dependencies(bare_virtualenv, request):
     """
     Quick and dirty test to ensure all external dependencies are vendored.
     """
     for command in ('upload',):  # sorted(distutils.command.__all__):
-        bare_virtualenv.run(
-            ['python', 'setup.py', command, '-h'], cd=SOURCE_DIR)
+        cmd = ['python', 'setup.py', command, '-h']
+        bare_virtualenv.run(cmd, cd=request.config.rootdir)

From 183a306ef87fd15df27dc4327182a944033ea3a0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Jan 2021 20:37:26 -0500
Subject: [PATCH 8345/8469] Remove bootstrap and tox-pip and instead rely on
 pep517.

---
 bootstrap.py     | 57 ---------------------------------------
 pyproject.toml   |  1 -
 setup.py         | 12 ---------
 tools/tox_pip.py | 70 ------------------------------------------------
 tox.ini          |  6 -----
 5 files changed, 146 deletions(-)
 delete mode 100644 bootstrap.py
 delete mode 100644 tools/tox_pip.py

diff --git a/bootstrap.py b/bootstrap.py
deleted file mode 100644
index 118671f62c..0000000000
--- a/bootstrap.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-If setuptools is not already installed in the environment, it's not possible
-to invoke setuptools' own commands. This routine will bootstrap this local
-environment by creating a minimal egg-info directory and then invoking the
-egg-info command to flesh out the egg-info directory.
-"""
-
-import os
-import sys
-import textwrap
-import subprocess
-import io
-
-
-minimal_egg_info = textwrap.dedent("""
-    [distutils.commands]
-    egg_info = setuptools.command.egg_info:egg_info
-
-    [distutils.setup_keywords]
-    include_package_data = setuptools.dist:assert_bool
-    install_requires = setuptools.dist:check_requirements
-    extras_require = setuptools.dist:check_extras
-    entry_points = setuptools.dist:check_entry_points
-
-    [egg_info.writers]
-    PKG-INFO = setuptools.command.egg_info:write_pkg_info
-    dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-    entry_points.txt = setuptools.command.egg_info:write_entries
-    requires.txt = setuptools.command.egg_info:write_requirements
-    """)
-
-
-def ensure_egg_info():
-    if os.path.exists('setuptools.egg-info'):
-        return
-    print("adding minimal entry_points")
-    add_minimal_info()
-    run_egg_info()
-
-
-def add_minimal_info():
-    """
-    Build a minimal egg-info, enough to invoke egg_info
-    """
-
-    os.mkdir('setuptools.egg-info')
-    with io.open('setuptools.egg-info/entry_points.txt', 'w') as ep:
-        ep.write(minimal_egg_info)
-
-
-def run_egg_info():
-    cmd = [sys.executable, 'setup.py', 'egg_info']
-    print("Regenerating egg_info")
-    subprocess.check_call(cmd)
-
-
-__name__ == '__main__' and ensure_egg_info()
diff --git a/pyproject.toml b/pyproject.toml
index 4e80bdc1a7..414ffed581 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,5 @@
 [build-system]
 requires = [
-    # avoid self install on Python 2; ref #1996
     "setuptools >= 40.8; python_version > '3'",
     "wheel",
 ]
diff --git a/setup.py b/setup.py
index 28d3dada34..378fda1487 100755
--- a/setup.py
+++ b/setup.py
@@ -10,17 +10,6 @@
 here = os.path.dirname(__file__)
 
 
-def require_metadata():
-    "Prevent improper installs without necessary metadata. See #659"
-    egg_info_dir = os.path.join(here, 'setuptools.egg-info')
-    if not os.path.exists(egg_info_dir):
-        msg = (
-            "Cannot build setuptools without metadata. "
-            "Run `bootstrap.py`."
-        )
-        raise RuntimeError(msg)
-
-
 def read_commands():
     command_ns = {}
     cmd_module_path = 'setuptools/command/__init__.py'
@@ -189,5 +178,4 @@ def _restore_install_lib(self):
 if __name__ == '__main__':
     # allow setup.py to run from another directory
     here and os.chdir(here)
-    require_metadata()
     dist = setuptools.setup(**setup_params)
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
deleted file mode 100644
index be2ff1d01d..0000000000
--- a/tools/tox_pip.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import os
-import subprocess
-import sys
-import re
-
-
-def remove_setuptools():
-    """
-    Remove setuptools from the current environment.
-    """
-    print("Removing setuptools")
-    cmd = [sys.executable, '-m', 'pip', 'uninstall', '-y', 'setuptools']
-    # set cwd to something other than '.' to avoid detecting
-    # '.' as the installed package.
-    subprocess.check_call(cmd, cwd=os.environ['TOX_WORK_DIR'])
-
-
-def bootstrap():
-    print("Running bootstrap")
-    cmd = [sys.executable, '-m', 'bootstrap']
-    subprocess.check_call(cmd)
-
-
-def is_install_self(args):
-    """
-    Do the args represent an install of .?
-    """
-    def strip_extras(arg):
-        match = re.match(r'(.*)?\[.*\]$', arg)
-        return match.group(1) if match else arg
-
-    return (
-        'install' in args
-        and any(
-            arg in ['.', os.getcwd()]
-            for arg in map(strip_extras, args)
-        )
-    )
-
-
-def pip(*args):
-    cmd = [sys.executable, '-m', 'pip'] + list(args)
-    return subprocess.check_call(cmd)
-
-
-def test_dependencies():
-    from ConfigParser import ConfigParser
-
-    def clean(dep):
-        spec, _, _ = dep.partition('#')
-        return spec.strip()
-
-    parser = ConfigParser()
-    parser.read('setup.cfg')
-    raw = parser.get('options.extras_require', 'tests').split('\n')
-    return filter(None, map(clean, raw))
-
-
-def run(args):
-    os.environ['PIP_USE_PEP517'] = 'true'
-
-    if is_install_self(args):
-        remove_setuptools()
-        bootstrap()
-
-    pip(*args)
-
-
-if __name__ == '__main__':
-    run(sys.argv[1:])
diff --git a/tox.ini b/tox.ini
index 8083d8c27b..8ab2b8cf02 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,6 @@ commands =
 	pytest {posargs}
 usedevelop = True
 extras = testing
-install_command = {[helpers]pip} install {opts} {packages}
-list_dependencies_command = {[helpers]pip} freeze --all
 setenv =
 	COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 passenv =
@@ -74,7 +72,3 @@ commands =
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release
 	python -m jaraco.tidelift.publish-release-notes
-
-[helpers]
-# Custom pip behavior
-pip = python {toxinidir}/tools/tox_pip.py

From 6b628e370caa6cf42faea1253e005881adebf041 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Jan 2021 21:05:31 -0500
Subject: [PATCH 8346/8469] Update changelog. Fixes #1527.

---
 changelog.d/1527.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1527.breaking.rst

diff --git a/changelog.d/1527.breaking.rst b/changelog.d/1527.breaking.rst
new file mode 100644
index 0000000000..7eb8a63f73
--- /dev/null
+++ b/changelog.d/1527.breaking.rst
@@ -0,0 +1 @@
+Removed bootstrap script. Now Setuptools requires pip or another pep517-compliant builder such as 'build' to build. Now Setuptools can be installed from Github main branch.

From 71815558fb8cd44028d838b693f2083a3e969c74 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 19 Jan 2021 21:09:54 -0500
Subject: [PATCH 8347/8469] Remove bootstrap from docs build

---
 docs/conf.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 8cb959dfa3..18cd7bdc49 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,11 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-
 extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
 
 master_doc = "index"
@@ -82,14 +74,6 @@
 }
 
 
-# hack to run the bootstrap script so that jaraco.packaging.sphinx
-# can invoke setup.py
-'READTHEDOCS' in os.environ and subprocess.check_call(
-    [sys.executable, '-m', 'bootstrap'],
-    cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
-)
-
-
 # Add support for linking usernames
 github_url = 'https://github.com'
 github_sponsors_url = f'{github_url}/sponsors'

From fa81391fe65fa727f79f1be73f058e83ffe97193 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jan 2021 21:13:41 -0500
Subject: [PATCH 8348/8469] Remove eggsecutable

---
 setup.py                           |  2 --
 setuptools/command/bdist_egg.py    | 49 ++----------------------------
 setuptools/command/easy_install.py | 10 ------
 setuptools/tests/test_bdist_egg.py | 15 ---------
 4 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/setup.py b/setup.py
index 28d3dada34..3d84c65ac4 100755
--- a/setup.py
+++ b/setup.py
@@ -171,8 +171,6 @@ def _restore_install_lib(self):
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
         "console_scripts": list(_gen_console_scripts()),
-        "setuptools.installation":
-            ['eggsecutable = setuptools.command.easy_install:bootstrap'],
     },
     dependency_links=[
         pypi_link(
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 206f2419ba..e6b1609f7b 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -2,7 +2,6 @@
 
 Build .egg distributions"""
 
-from distutils.errors import DistutilsSetupError
 from distutils.dir_util import remove_tree, mkpath
 from distutils import log
 from types import CodeType
@@ -11,12 +10,10 @@
 import re
 import textwrap
 import marshal
-import warnings
 
 from pkg_resources import get_build_platform, Distribution, ensure_directory
-from pkg_resources import EntryPoint
 from setuptools.extension import Library
-from setuptools import Command, SetuptoolsDeprecationWarning
+from setuptools import Command
 
 from sysconfig import get_path, get_python_version
 
@@ -268,49 +265,7 @@ def zip_safe(self):
         return analyze_egg(self.bdist_dir, self.stubs)
 
     def gen_header(self):
-        epm = EntryPoint.parse_map(self.distribution.entry_points or '')
-        ep = epm.get('setuptools.installation', {}).get('eggsecutable')
-        if ep is None:
-            return 'w'  # not an eggsecutable, do it the usual way.
-
-        warnings.warn(
-            "Eggsecutables are deprecated and will be removed in a future "
-            "version.",
-            SetuptoolsDeprecationWarning
-        )
-
-        if not ep.attrs or ep.extras:
-            raise DistutilsSetupError(
-                "eggsecutable entry point (%r) cannot have 'extras' "
-                "or refer to a module" % (ep,)
-            )
-
-        pyver = '{}.{}'.format(*sys.version_info)
-        pkg = ep.module_name
-        full = '.'.join(ep.attrs)
-        base = ep.attrs[0]
-        basename = os.path.basename(self.egg_output)
-
-        header = (
-            "#!/bin/sh\n"
-            'if [ `basename $0` = "%(basename)s" ]\n'
-            'then exec python%(pyver)s -c "'
-            "import sys, os; sys.path.insert(0, os.path.abspath('$0')); "
-            "from %(pkg)s import %(base)s; sys.exit(%(full)s())"
-            '" "$@"\n'
-            'else\n'
-            '  echo $0 is not the correct name for this egg file.\n'
-            '  echo Please rename it back to %(basename)s and try again.\n'
-            '  exec false\n'
-            'fi\n'
-        ) % locals()
-
-        if not self.dry_run:
-            mkpath(os.path.dirname(self.egg_output), dry_run=self.dry_run)
-            f = open(self.egg_output, 'w')
-            f.write(header)
-            f.close()
-        return 'a'
+        return 'w'
 
     def copy_metadata_to(self, target_dir):
         "Copy metadata (egg info) to the target_dir"
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f1e487d4d2..544e8fd444 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2284,16 +2284,6 @@ def current_umask():
     return tmp
 
 
-def bootstrap():
-    # This function is called when setuptools*.egg is run using /bin/sh
-    import setuptools
-
-    argv0 = os.path.dirname(setuptools.__path__[0])
-    sys.argv[0] = argv0
-    sys.argv.append(argv0)
-    main()
-
-
 def main(argv=None, **kw):
     from setuptools import setup
     from setuptools.dist import Distribution
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 8760ea304c..fb5b90b1a3 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -7,7 +7,6 @@
 import pytest
 
 from setuptools.dist import Distribution
-from setuptools import SetuptoolsDeprecationWarning
 
 from . import contexts
 
@@ -65,17 +64,3 @@ def test_exclude_source_files(self, setup_context, user_override):
         names = list(zi.filename for zi in zip.filelist)
         assert 'hi.pyc' in names
         assert 'hi.py' not in names
-
-    def test_eggsecutable_warning(self, setup_context, user_override):
-        dist = Distribution(dict(
-            script_name='setup.py',
-            script_args=['bdist_egg'],
-            name='foo',
-            py_modules=['hi'],
-            entry_points={
-                'setuptools.installation':
-                    ['eggsecutable = my_package.some_module:main_func']},
-        ))
-        dist.parse_command_line()
-        with pytest.warns(SetuptoolsDeprecationWarning):
-            dist.run_commands()

From e3e7ff854038788d56d6d7f6624357b81341e876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2021 14:20:57 -0500
Subject: [PATCH 8349/8469] For compatibility, add a bootstrap script with a
 warning.

---
 bootstrap.py | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 bootstrap.py

diff --git a/bootstrap.py b/bootstrap.py
new file mode 100644
index 0000000000..229b996503
--- /dev/null
+++ b/bootstrap.py
@@ -0,0 +1,7 @@
+import warnings
+
+
+msg = "bootstrap.py is no longer needed. Use a PEP-517-compatible builder instead."
+
+
+__name__ == '__main__' and warnings.warn(msg)

From c0660de32f80ad71b3940abcb26b237ca2103876 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2021 19:07:21 -0500
Subject: [PATCH 8350/8469] Update changelog.

---
 changelog.d/2545.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2545.breaking.rst

diff --git a/changelog.d/2545.breaking.rst b/changelog.d/2545.breaking.rst
new file mode 100644
index 0000000000..0c69fdf34d
--- /dev/null
+++ b/changelog.d/2545.breaking.rst
@@ -0,0 +1 @@
+Removed support for eggsecutables.

From 4b0408a18dcda286af6668b7ef6934e53d1f247c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 20 Jan 2021 21:02:24 -0500
Subject: [PATCH 8351/8469] Remove easy_install script and module.

---
 easy_install.py                     |  5 -----
 setup.cfg                           |  1 -
 setup.py                            | 17 -----------------
 setuptools/tests/test_namespaces.py |  5 +++--
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 easy_install.py

diff --git a/easy_install.py b/easy_install.py
deleted file mode 100644
index d87e984034..0000000000
--- a/easy_install.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Run the EasyInstall command"""
-
-if __name__ == '__main__':
-    from setuptools.command.easy_install import main
-    main()
diff --git a/setup.cfg b/setup.cfg
index 36c7daeebc..006851daac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,6 @@ project_urls =
 
 [options]
 packages = find_namespace:
-py_modules = easy_install
 # disabled as it causes tests to be included #2505
 # include_package_data = true
 python_requires = >=3.6
diff --git a/setup.py b/setup.py
index 3d84c65ac4..31eda0fbb0 100755
--- a/setup.py
+++ b/setup.py
@@ -30,22 +30,6 @@ def read_commands():
     return command_ns['__all__']
 
 
-def _gen_console_scripts():
-    yield "easy_install = setuptools.command.easy_install:main"
-
-    # Gentoo distributions manage the python-version-specific scripts
-    # themselves, so those platforms define an environment variable to
-    # suppress the creation of the version-specific scripts.
-    var_names = (
-        'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
-        'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
-    )
-    if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
-        return
-    tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
-    yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
-
-
 package_data = dict(
     setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
 )
@@ -170,7 +154,6 @@ def _restore_install_lib(self):
             "depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
-        "console_scripts": list(_gen_console_scripts()),
     },
     dependency_links=[
         pypi_link(
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 6c8c522dc0..270f90c98b 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -62,8 +62,9 @@ def test_pkg_resources_import(self, tmpdir):
         target.mkdir()
         install_cmd = [
             sys.executable,
-            '-m', 'easy_install',
-            '-d', str(target),
+            '-m', 'pip',
+            'install',
+            '-t', str(target),
             str(pkg),
         ]
         with test.test.paths_on_pythonpath([str(target)]):

From 2885ca26494e6f555fae85f8f9983c2361c93829 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2021 19:35:27 -0500
Subject: [PATCH 8352/8469] Remove 'main' function from 'easy_install'.

---
 setuptools/command/easy_install.py    | 46 +--------------------------
 setuptools/tests/test_easy_install.py | 13 ++++----
 2 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 544e8fd444..eeb21b5083 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -67,7 +67,7 @@
 
 __all__ = [
     'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
-    'main', 'get_exe_prefixes',
+    'get_exe_prefixes',
 ]
 
 
@@ -2284,50 +2284,6 @@ def current_umask():
     return tmp
 
 
-def main(argv=None, **kw):
-    from setuptools import setup
-    from setuptools.dist import Distribution
-
-    class DistributionWithoutHelpCommands(Distribution):
-        common_usage = ""
-
-        def _show_help(self, *args, **kw):
-            with _patch_usage():
-                Distribution._show_help(self, *args, **kw)
-
-    if argv is None:
-        argv = sys.argv[1:]
-
-    with _patch_usage():
-        setup(
-            script_args=['-q', 'easy_install', '-v'] + argv,
-            script_name=sys.argv[0] or 'easy_install',
-            distclass=DistributionWithoutHelpCommands,
-            **kw
-        )
-
-
-@contextlib.contextmanager
-def _patch_usage():
-    import distutils.core
-    USAGE = textwrap.dedent("""
-        usage: %(script)s [options] requirement_or_url ...
-           or: %(script)s --help
-        """).lstrip()
-
-    def gen_usage(script_name):
-        return USAGE % dict(
-            script=os.path.basename(script_name),
-        )
-
-    saved = distutils.core.gen_usage
-    distutils.core.gen_usage = gen_usage
-    try:
-        yield
-    finally:
-        distutils.core.gen_usage = saved
-
-
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
     """
     Warning for EasyInstall deprecations, bypassing suppression.
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3340a59c24..66598066d7 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -15,6 +15,7 @@
 import mock
 import time
 import re
+import subprocess
 
 import pytest
 
@@ -25,7 +26,6 @@
     EasyInstallDeprecationWarning, ScriptWriter, PthDistributions,
     WindowsScriptWriter,
 )
-from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
 from pkg_resources import normalize_path, working_set
 from pkg_resources import Distribution as PRDistribution
@@ -461,17 +461,16 @@ def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
             with TestSetupRequires.create_sdist() as dist_file:
                 with contexts.tempdir() as temp_install_dir:
                     with contexts.environment(PYTHONPATH=temp_install_dir):
-                        ei_params = [
+                        cmd = [
+                            sys.executable,
+                            '-m', 'setup',
+                            'easy_install',
                             '--index-url', mock_index.url,
                             '--exclude-scripts',
                             '--install-dir', temp_install_dir,
                             dist_file,
                         ]
-                        with sandbox.save_argv(['easy_install']):
-                            # attempt to install the dist. It should
-                            # fail because it doesn't exist.
-                            with pytest.raises(SystemExit):
-                                easy_install_pkg.main(ei_params)
+                        subprocess.Popen(cmd).wait()
         # there should have been one requests to the server
         assert [r.path for r in mock_index.requests] == ['/does-not-exist/']
 

From 4fb7735edd1cb7e746b7fb25fdba2aca145bde10 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2021 19:48:03 -0500
Subject: [PATCH 8353/8469] Update changelog

---
 changelog.d/2544.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2544.breaking.rst

diff --git a/changelog.d/2544.breaking.rst b/changelog.d/2544.breaking.rst
new file mode 100644
index 0000000000..169c41b95e
--- /dev/null
+++ b/changelog.d/2544.breaking.rst
@@ -0,0 +1 @@
+Removed 'easy_install' top-level model (runpy entry point) and 'easy_install' console script.

From e1ffc2abbae4f2aa78dd09ee9827d754b7702b7b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 23 Jan 2021 19:49:42 -0500
Subject: [PATCH 8354/8469] =?UTF-8?q?Bump=20version:=2051.3.3=20=E2=86=92?=
 =?UTF-8?q?=2052.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              |  2 +-
 CHANGES.rst                   | 15 +++++++++++++++
 changelog.d/2459.change.rst   |  1 -
 changelog.d/2537.breaking.rst |  1 -
 changelog.d/2544.breaking.rst |  1 -
 changelog.d/2545.breaking.rst |  1 -
 setup.cfg                     |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/2459.change.rst
 delete mode 100644 changelog.d/2537.breaking.rst
 delete mode 100644 changelog.d/2544.breaking.rst
 delete mode 100644 changelog.d/2545.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index debcfeeb64..c3bdafab95 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 51.3.3
+current_version = 52.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index c094960f9a..79941d8efe 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v52.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2537: Remove fallback support for fetch_build_eggs using easy_install. Now pip is required for setup_requires to succeed.
+* #2544: Removed 'easy_install' top-level model (runpy entry point) and 'easy_install' console script.
+* #2545: Removed support for eggsecutables.
+
+Changes
+^^^^^^^
+* #2459: Tests now run in parallel via pytest-xdist, completing in about half the time. Special thanks to :user:`webknjaz` for hard work implementing test isolation. To run without parallelization, disable the plugin with ``tox -- -p no:xdist``.
+
+
 v51.3.3
 -------
 
diff --git a/changelog.d/2459.change.rst b/changelog.d/2459.change.rst
deleted file mode 100644
index 3b8d11a9ed..0000000000
--- a/changelog.d/2459.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Tests now run in parallel via pytest-xdist, completing in about half the time. Special thanks to :user:`webknjaz` for hard work implementing test isolation. To run without parallelization, disable the plugin with ``tox -- -p no:xdist``.
diff --git a/changelog.d/2537.breaking.rst b/changelog.d/2537.breaking.rst
deleted file mode 100644
index 184d8e8758..0000000000
--- a/changelog.d/2537.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove fallback support for fetch_build_eggs using easy_install. Now pip is required for setup_requires to succeed.
diff --git a/changelog.d/2544.breaking.rst b/changelog.d/2544.breaking.rst
deleted file mode 100644
index 169c41b95e..0000000000
--- a/changelog.d/2544.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed 'easy_install' top-level model (runpy entry point) and 'easy_install' console script.
diff --git a/changelog.d/2545.breaking.rst b/changelog.d/2545.breaking.rst
deleted file mode 100644
index 0c69fdf34d..0000000000
--- a/changelog.d/2545.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed support for eggsecutables.
diff --git a/setup.cfg b/setup.cfg
index 006851daac..e0c4edc2e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 51.3.3
+version = 52.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From c121d289da5d19cf6df2bf6b64ac28916a060161 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 1 Feb 2021 10:11:49 -0500
Subject: [PATCH 8355/8469] =?UTF-8?q?Bump=20version:=2052.0.0=20=E2=86=92?=
 =?UTF-8?q?=2053.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 9 +++++++++
 changelog.d/1527.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1527.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c3bdafab95..d11952599e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 52.0.0
+current_version = 53.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 79941d8efe..93eae6870c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v53.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #1527: Removed bootstrap script. Now Setuptools requires pip or another pep517-compliant builder such as 'build' to build. Now Setuptools can be installed from Github main branch.
+
+
 v52.0.0
 -------
 
diff --git a/changelog.d/1527.breaking.rst b/changelog.d/1527.breaking.rst
deleted file mode 100644
index 7eb8a63f73..0000000000
--- a/changelog.d/1527.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed bootstrap script. Now Setuptools requires pip or another pep517-compliant builder such as 'build' to build. Now Setuptools can be installed from Github main branch.
diff --git a/setup.cfg b/setup.cfg
index e0c4edc2e6..14ff445daa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 52.0.0
+version = 53.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 14f91af8370eaa1c7c7c19510aa9d4d5a65c069d Mon Sep 17 00:00:00 2001
From: Pablo Woolvett <pablowoolvett@gmail.com>
Date: Thu, 4 Feb 2021 13:59:15 -0300
Subject: [PATCH 8356/8469] docs(userguide): Marker example for extras_require

Signed-off-by: Pablo Woolvett <pablowoolvett@gmail.com>
---
 docs/userguide/declarative_config.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index bc66869b6e..f2e8b81f75 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -243,6 +243,19 @@ data_files               dict                                 40.6.0
 
     **find_namespace directive** - The ``find_namespace:`` directive is supported since Python >=3.3.
 
+
 Notes:
 1. In the ``package_data`` section, a key named with a single asterisk (``*``)
 refers to all packages, in lieu of the empty string used in ``setup.py``.
+
+2. In the ``extras_require`` section, values are parsed as ``list-semi``. This implies that in
+order to include markers, they **must** be *dangling*:
+
+.. code-block:: ini
+
+    [options.extras_require]
+    rest = docutils>=0.3; pack ==1.1, ==1.3
+    pdf =
+      ReportLab>=1.2
+      RXP
+      importlib-metadata; python_version < "3.8"

From f957da57a1312d29deea8cc902562b9ac55bcbda Mon Sep 17 00:00:00 2001
From: Pablo Woolvett <pablowoolvett@gmail.com>
Date: Thu, 4 Feb 2021 14:04:22 -0300
Subject: [PATCH 8357/8469] newsfragment

Signed-off-by: Pablo Woolvett <pablowoolvett@gmail.com>
---
 changelog.d/2553.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2553.doc.rst

diff --git a/changelog.d/2553.doc.rst b/changelog.d/2553.doc.rst
new file mode 100644
index 0000000000..51c609616e
--- /dev/null
+++ b/changelog.d/2553.doc.rst
@@ -0,0 +1 @@
+Added userguide example for markers in extras_require -- by :user:`webknjaz`

From 65db33b158a377a2d3f74ea28478a66a3097f273 Mon Sep 17 00:00:00 2001
From: pwoolvett <pablowoolvett@gmail.com>
Date: Thu, 4 Feb 2021 16:44:53 -0300
Subject: [PATCH 8358/8469] Update 2553.doc.rst

---
 changelog.d/2553.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2553.doc.rst b/changelog.d/2553.doc.rst
index 51c609616e..fa03329ad9 100644
--- a/changelog.d/2553.doc.rst
+++ b/changelog.d/2553.doc.rst
@@ -1 +1 @@
-Added userguide example for markers in extras_require -- by :user:`webknjaz`
+Added userguide example for markers in extras_require -- by :user:`pwoolvett`

From e70c2afc1868a7d9bb2e2887ebf19f6c84dcf283 Mon Sep 17 00:00:00 2001
From: Andrey Bienkowski <hexagonrecursion@gmail.com>
Date: Tue, 9 Feb 2021 09:20:47 +0300
Subject: [PATCH 8359/8469] quickstart: recommend PyPA build instead of
 pep517.build

see https://github.com/pypa/pep517/issues/91
---
 docs/conf.py                  | 5 ++++-
 docs/userguide/quickstart.rst | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 18cd7bdc49..0a5136b0af 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,6 +73,9 @@
     ),
 }
 
+intersphinx_mapping = {
+    'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None)
+}
 
 # Add support for linking usernames
 github_url = 'https://github.com'
@@ -80,7 +83,7 @@
 extlinks = {
     'user': (f'{github_sponsors_url}/%s', '@'),  # noqa: WPS323
 }
-extensions += ['sphinx.ext.extlinks']
+extensions += ['sphinx.ext.extlinks', 'sphinx.ext.intersphinx']
 
 # Be strict about any broken references:
 nitpicky = True
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 1d557d47bd..e7594ba33e 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -59,11 +59,11 @@ This is what your project would look like::
         setup.cfg
         mypackage/__init__.py
 
-Then, you need an installer, such as `pep517 <https://pypi.org/project/pep517/>`_
-which you can obtain via ``pip install pep517``. After downloading it, invoke
+Then, you need an installer, such as :std:doc:`PyPA build <pypa-build:index>`
+which you can obtain via ``pip install build``. After downloading it, invoke
 the installer::
 
-    python -m pep517.build .
+    python -m build
 
 You now have your distribution ready (e.g. a ``tar.gz`` file and a ``.whl``
 file in the ``dist`` directory), which you can upload to PyPI!

From 51298a2cc4faa7253e9fe41d7a9574cf9aac997c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 9 Feb 2021 23:08:58 -0500
Subject: [PATCH 8360/8469] Normalize indentation

---
 setup.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 106763e3d9..8df8d273a3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,9 +23,9 @@ setup_requires = setuptools_scm[toml] >= 3.4.1
 
 [options.packages.find]
 exclude =
-        build*
-        docs*
-        tests*
+	build*
+	docs*
+	tests*
 
 [options.extras_require]
 testing =

From cb00954729e1deaef431697bae8b8a6a7198c2ce Mon Sep 17 00:00:00 2001
From: Simone Pierazzini <s.pierazzini@nextworks.it>
Date: Thu, 18 Feb 2021 06:40:17 +0100
Subject: [PATCH 8361/8469] Correctly parse cmdclass in setup.cfg. Fixes #2570

---
 changelog.d/2570.change.rst     |  1 +
 setuptools/config.py            | 17 +++++++++++++++++
 setuptools/tests/test_config.py | 24 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 changelog.d/2570.change.rst

diff --git a/changelog.d/2570.change.rst b/changelog.d/2570.change.rst
new file mode 100644
index 0000000000..165089ed31
--- /dev/null
+++ b/changelog.d/2570.change.rst
@@ -0,0 +1 @@
+Correctly parse cmdclass in setup.cfg.
diff --git a/setuptools/config.py b/setuptools/config.py
index af3a3bcbd5..4a6cd4694b 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -574,6 +574,7 @@ def parsers(self):
         parse_list_semicolon = partial(self._parse_list, separator=';')
         parse_bool = self._parse_bool
         parse_dict = self._parse_dict
+        parse_cmdclass = self._parse_cmdclass
 
         return {
             'zip_safe': parse_bool,
@@ -594,6 +595,22 @@ def parsers(self):
             'entry_points': self._parse_file,
             'py_modules': parse_list,
             'python_requires': SpecifierSet,
+            'cmdclass': parse_cmdclass,
+        }
+
+    def _parse_cmdclass(self, value):
+        def resolve_class(qualified_class_name):
+            idx = qualified_class_name.rfind('.')
+            class_name = qualified_class_name[idx+1:]
+            pkg_name = qualified_class_name[:idx]
+
+            module = __import__(pkg_name)
+
+            return getattr(module, class_name)
+
+        return {
+            k: resolve_class(v)
+            for k, v in self._parse_dict(value).items()
         }
 
     def _parse_packages(self, value):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 1dee12718f..16892cb134 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -1,3 +1,6 @@
+import types
+import sys
+
 import contextlib
 import configparser
 
@@ -7,6 +10,7 @@
 from mock import patch
 from setuptools.dist import Distribution, _Distribution
 from setuptools.config import ConfigHandler, read_configuration
+from distutils.core import Command
 from .textwrap import DALS
 
 
@@ -853,6 +857,26 @@ def test_python_requires_invalid(self, tmpdir):
             with get_dist(tmpdir) as dist:
                 dist.parse_config_files()
 
+    def test_cmdclass(self, tmpdir):
+        class CustomCmd(Command):
+            pass
+
+        m = types.ModuleType('custom_build', 'test package')
+
+        m.__dict__['CustomCmd'] = CustomCmd
+
+        sys.modules['custom_build'] = m
+
+        fake_env(
+            tmpdir,
+            '[options]\n'
+            'cmdclass =\n'
+            '    customcmd = custom_build.CustomCmd\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.cmdclass == {'customcmd': CustomCmd}
+
 
 saved_dist_init = _Distribution.__init__
 

From 37a6284c9fcd71a3d4b2fe5dbc802fcf5cbe0786 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Thu, 18 Feb 2021 23:02:29 -0500
Subject: [PATCH 8362/8469] Fix sphinx upload_docs

---
 setup.cfg                                   |  1 +
 setuptools/command/upload_docs.py           |  7 +++-
 setuptools/tests/requirements.txt           |  1 +
 setuptools/tests/test_sphinx_upload_docs.py | 42 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 setuptools/tests/test_sphinx_upload_docs.py

diff --git a/setup.cfg b/setup.cfg
index e0c4edc2e6..3368d88dfa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,6 +58,7 @@ testing =
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
     pytest-xdist
+    sphinx
 
 docs =
     # Keep these in sync with docs/requirements.txt
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 2559458a1d..95383319ef 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -2,7 +2,7 @@
 """upload_docs
 
 Implements a Distutils 'upload_docs' subcommand (upload documentation to
-PyPI's pythonhosted.org).
+sites other than PyPi such as devpi).
 """
 
 from base64 import standard_b64encode
@@ -59,7 +59,10 @@ def finalize_options(self):
         if self.upload_dir is None:
             if self.has_sphinx():
                 build_sphinx = self.get_finalized_command('build_sphinx')
-                self.target_dir = build_sphinx.builder_target_dir
+                for (builder, builder_dir) in build_sphinx.builder_target_dirs:
+                    if builder == "html":
+                        self.target_dir = builder_dir
+                        break
             else:
                 build = self.get_finalized_command('build')
                 self.target_dir = os.path.join(build.build_base, 'docs')
diff --git a/setuptools/tests/requirements.txt b/setuptools/tests/requirements.txt
index d0d07f70c0..b2d84a941e 100644
--- a/setuptools/tests/requirements.txt
+++ b/setuptools/tests/requirements.txt
@@ -11,3 +11,4 @@ paver; python_version>="3.6"
 futures; python_version=="2.7"
 pip>=19.1 # For proper file:// URLs support.
 jaraco.envs
+sphinx
diff --git a/setuptools/tests/test_sphinx_upload_docs.py b/setuptools/tests/test_sphinx_upload_docs.py
new file mode 100644
index 0000000000..4287b00e4e
--- /dev/null
+++ b/setuptools/tests/test_sphinx_upload_docs.py
@@ -0,0 +1,42 @@
+import pytest
+import os
+
+from setuptools.command.upload_docs import upload_docs
+from setuptools.dist import Distribution
+
+
+@pytest.fixture
+def sphinx_doc_sample_project(tmpdir_cwd):
+    # setup.py
+    with open('setup.py', 'wt') as f:
+        f.write('from setuptools import setup; setup()\n')
+
+    os.makedirs('build/docs')
+
+    # A test conf.py for Sphinx
+    with open('build/docs/conf.py', 'w') as f:
+        f.write("project = 'test'")
+
+    # A test index.rst for Sphinx
+    with open('build/docs/index.rst', 'w') as f:
+        f.write(".. toctree::\
+                    :maxdepth: 2\
+                    :caption: Contents:")
+
+
+@pytest.mark.usefixtures('sphinx_doc_sample_project')
+@pytest.mark.usefixtures('user_override')
+class TestSphinxUploadDocs:
+    def test_sphinx_doc(self):
+        params = dict(
+            name='foo',
+            packages=['test'],
+        )
+        dist = Distribution(params)
+
+        cmd = upload_docs(dist)
+
+        cmd.initialize_options()
+        assert cmd.upload_dir is None
+        assert cmd.has_sphinx() is True
+        cmd.finalize_options()

From df9ff438af59bc90c2f37a4180d1560d2ebca541 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Fri, 19 Feb 2021 19:26:28 -0500
Subject: [PATCH 8363/8469] Add changelog

---
 changelog.d/2573.change.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/2573.change.rst

diff --git a/changelog.d/2573.change.rst b/changelog.d/2573.change.rst
new file mode 100644
index 0000000000..b06bd8c954
--- /dev/null
+++ b/changelog.d/2573.change.rst
@@ -0,0 +1,2 @@
+Fixed error in uploading a Sphinx doc with the :code:`upload_docs` command. An html builder will be used. 
+Note: :code:`upload_docs` is deprecated for PyPi, but is supported for other sites -- by :user:`melissa-kun-li`
\ No newline at end of file

From 4d72bbd3906ea609cce5e5ed8b89b379ae8d65e7 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Fri, 19 Feb 2021 20:59:24 -0500
Subject: [PATCH 8364/8469] Update fix and documentation

---
 setuptools/command/upload_docs.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index 95383319ef..845bff4421 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -31,7 +31,7 @@ class upload_docs(upload):
     # supported by Warehouse (and won't be).
     DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi/'
 
-    description = 'Upload documentation to PyPI'
+    description = 'Upload documentation to sites other than PyPi such as devpi'
 
     user_options = [
         ('repository=', 'r',
@@ -59,10 +59,7 @@ def finalize_options(self):
         if self.upload_dir is None:
             if self.has_sphinx():
                 build_sphinx = self.get_finalized_command('build_sphinx')
-                for (builder, builder_dir) in build_sphinx.builder_target_dirs:
-                    if builder == "html":
-                        self.target_dir = builder_dir
-                        break
+                self.target_dir = dict(build_sphinx.builder_target_dirs)['html']
             else:
                 build = self.get_finalized_command('build')
                 self.target_dir = os.path.join(build.build_base, 'docs')
@@ -70,7 +67,7 @@ def finalize_options(self):
             self.ensure_dirname('upload_dir')
             self.target_dir = self.upload_dir
         if 'pypi.python.org' in self.repository:
-            log.warn("Upload_docs command is deprecated. Use RTD instead.")
+            log.warn("Upload_docs command is deprecated for PyPi. Use RTD instead.")
         self.announce('Using upload directory %s' % self.target_dir)
 
     def create_zipfile(self, filename):

From ba68d13940659709fff8035e17bef7ae7c574618 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Fri, 19 Feb 2021 20:59:58 -0500
Subject: [PATCH 8365/8469] Update sphinx upload_docs test

---
 setuptools/tests/test_sphinx_upload_docs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setuptools/tests/test_sphinx_upload_docs.py b/setuptools/tests/test_sphinx_upload_docs.py
index 4287b00e4e..a48ba7f8b3 100644
--- a/setuptools/tests/test_sphinx_upload_docs.py
+++ b/setuptools/tests/test_sphinx_upload_docs.py
@@ -25,7 +25,6 @@ def sphinx_doc_sample_project(tmpdir_cwd):
 
 
 @pytest.mark.usefixtures('sphinx_doc_sample_project')
-@pytest.mark.usefixtures('user_override')
 class TestSphinxUploadDocs:
     def test_sphinx_doc(self):
         params = dict(

From 5c57b5cc1e1d247fec64858d8cc4e93b5ffb11a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Feb 2021 12:31:39 -0500
Subject: [PATCH 8366/8469] Switch to jaraco.path for building files

---
 setup.cfg                             |  1 +
 setuptools/tests/files.py             | 38 ---------------------------
 setuptools/tests/test_build_ext.py    |  5 ++--
 setuptools/tests/test_build_meta.py   | 26 +++++++++---------
 setuptools/tests/test_easy_install.py |  4 +--
 setuptools/tests/test_egg_info.py     | 26 +++++++++---------
 setuptools/tests/test_glob.py         |  5 ++--
 setuptools/tests/test_wheel.py        |  4 +--
 8 files changed, 36 insertions(+), 73 deletions(-)
 delete mode 100644 setuptools/tests/files.py

diff --git a/setup.cfg b/setup.cfg
index e0c4edc2e6..2158905b18 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,6 +58,7 @@ testing =
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
     pytest-xdist
+    jaraco.path
 
 docs =
     # Keep these in sync with docs/requirements.txt
diff --git a/setuptools/tests/files.py b/setuptools/tests/files.py
deleted file mode 100644
index 71194b9de0..0000000000
--- a/setuptools/tests/files.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import os
-
-
-def build_files(file_defs, prefix=""):
-    """
-    Build a set of files/directories, as described by the
-    file_defs dictionary.
-
-    Each key/value pair in the dictionary is interpreted as
-    a filename/contents
-    pair. If the contents value is a dictionary, a directory
-    is created, and the
-    dictionary interpreted as the files within it, recursively.
-
-    For example:
-
-    {"README.txt": "A README file",
-     "foo": {
-        "__init__.py": "",
-        "bar": {
-            "__init__.py": "",
-        },
-        "baz.py": "# Some code",
-     }
-    }
-    """
-    for name, contents in file_defs.items():
-        full_name = os.path.join(prefix, name)
-        if isinstance(contents, dict):
-            os.makedirs(full_name, exist_ok=True)
-            build_files(contents, prefix=full_name)
-        else:
-            if isinstance(contents, bytes):
-                with open(full_name, 'wb') as f:
-                    f.write(contents)
-            else:
-                with open(full_name, 'w') as f:
-                    f.write(contents)
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index 838fdb4299..be03893a1b 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -2,12 +2,13 @@
 import distutils.command.build_ext as orig
 from distutils.sysconfig import get_config_var
 
+from jaraco import path
+
 from setuptools.command.build_ext import build_ext, get_abi3_suffix
 from setuptools.dist import Distribution
 from setuptools.extension import Extension
 
 from . import environment
-from .files import build_files
 from .textwrap import DALS
 
 
@@ -106,7 +107,7 @@ def test_build_ext_config_handling(tmpdir_cwd):
             build-base = foo_build
             """),
     }
-    build_files(files)
+    path.build(files)
     code, output = environment.run_setup_py(
         cmd=['build'], data_stream=(0, 2),
     )
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index e117d8e629..f33a69688d 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -5,8 +5,8 @@
 from concurrent import futures
 
 import pytest
+from jaraco import path
 
-from .files import build_files
 from .textwrap import DALS
 
 
@@ -130,7 +130,7 @@ def get_build_backend(self):
 
     @pytest.fixture(params=defns)
     def build_backend(self, tmpdir, request):
-        build_files(request.param, prefix=str(tmpdir))
+        path.build(request.param, prefix=str(tmpdir))
         with tmpdir.as_cwd():
             yield self.get_build_backend()
 
@@ -170,7 +170,7 @@ def test_build_with_existing_file_present(self, build_type, tmpdir_cwd):
             """),
         }
 
-        build_files(files)
+        path.build(files)
 
         dist_dir = os.path.abspath('preexisting-' + build_type)
 
@@ -262,7 +262,7 @@ def test_build_sdist_pyproject_toml_exists(self, tmpdir_cwd):
                 build-backend = "setuptools.build_meta
                 """),
         }
-        build_files(files)
+        path.build(files)
         build_backend = self.get_build_backend()
         targz_path = build_backend.build_sdist("temp")
         with tarfile.open(os.path.join("temp", targz_path)) as tar:
@@ -271,7 +271,7 @@ def test_build_sdist_pyproject_toml_exists(self, tmpdir_cwd):
     def test_build_sdist_setup_py_exists(self, tmpdir_cwd):
         # If build_sdist is called from a script other than setup.py,
         # ensure setup.py is included
-        build_files(defns[0])
+        path.build(defns[0])
 
         build_backend = self.get_build_backend()
         targz_path = build_backend.build_sdist("temp")
@@ -293,7 +293,7 @@ def test_build_sdist_setup_py_manifest_excluded(self, tmpdir_cwd):
         """)
         }
 
-        build_files(files)
+        path.build(files)
 
         build_backend = self.get_build_backend()
         targz_path = build_backend.build_sdist("temp")
@@ -315,7 +315,7 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
                 """)
         }
 
-        build_files(files)
+        path.build(files)
 
         build_backend = self.get_build_backend()
         build_backend.build_sdist("temp")
@@ -335,7 +335,7 @@ def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd):
     }
 
     def test_build_sdist_relative_path_import(self, tmpdir_cwd):
-        build_files(self._relative_path_import_files)
+        path.build(self._relative_path_import_files)
         build_backend = self.get_build_backend()
         with pytest.raises(ImportError, match="^No module named 'hello'$"):
             build_backend.build_sdist("temp")
@@ -374,7 +374,7 @@ def run():
             """),
         }
 
-        build_files(files)
+        path.build(files)
 
         build_backend = self.get_build_backend()
 
@@ -409,7 +409,7 @@ def run():
                     """),
         }
 
-        build_files(files)
+        path.build(files)
 
         build_backend = self.get_build_backend()
 
@@ -437,7 +437,7 @@ def run():
     }
 
     def test_sys_argv_passthrough(self, tmpdir_cwd):
-        build_files(self._sys_argv_0_passthrough)
+        path.build(self._sys_argv_0_passthrough)
         build_backend = self.get_build_backend()
         with pytest.raises(AssertionError):
             build_backend.build_sdist("temp")
@@ -449,13 +449,13 @@ class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
     # build_meta_legacy-specific tests
     def test_build_sdist_relative_path_import(self, tmpdir_cwd):
         # This must fail in build_meta, but must pass in build_meta_legacy
-        build_files(self._relative_path_import_files)
+        path.build(self._relative_path_import_files)
 
         build_backend = self.get_build_backend()
         build_backend.build_sdist("temp")
 
     def test_sys_argv_passthrough(self, tmpdir_cwd):
-        build_files(self._sys_argv_0_passthrough)
+        path.build(self._sys_argv_0_passthrough)
 
         build_backend = self.get_build_backend()
         build_backend.build_sdist("temp")
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 66598066d7..a3b2d6e66c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -18,6 +18,7 @@
 import subprocess
 
 import pytest
+from jaraco import path
 
 from setuptools import sandbox
 from setuptools.sandbox import run_setup
@@ -34,7 +35,6 @@
 import pkg_resources
 
 from . import contexts
-from .files import build_files
 from .textwrap import DALS
 
 
@@ -794,7 +794,7 @@ def test_setup_requires_with_transitive_extra_dependency(
                 # Create source tree for `dep`.
                 dep_pkg = os.path.join(temp_dir, 'dep')
                 os.mkdir(dep_pkg)
-                build_files({
+                path.build({
                     'setup.py':
                     DALS("""
                           import setuptools
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 1047468b18..5dfad7e269 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -6,15 +6,15 @@
 import stat
 import time
 
+import pytest
+from jaraco import path
+
 from setuptools.command.egg_info import (
     egg_info, manifest_maker, EggInfoDeprecationWarning, get_pkg_info_revision,
 )
 from setuptools.dist import Distribution
 
-import pytest
-
 from . import environment
-from .files import build_files
 from .textwrap import DALS
 from . import contexts
 
@@ -37,7 +37,7 @@ class TestEggInfo:
         """)
 
     def _create_project(self):
-        build_files({
+        path.build({
             'setup.py': self.setup_script,
             'hello.py': DALS("""
                 def run():
@@ -56,7 +56,7 @@ def env(self):
                 for dirname in subs
             )
             list(map(os.mkdir, env.paths.values()))
-            build_files({
+            path.build({
                 env.paths['home']: {
                     '.pydistutils.cfg': DALS("""
                     [egg_info]
@@ -106,7 +106,7 @@ def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
         the file should remain unchanged.
         """
         setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
-        build_files({
+        path.build({
             setup_cfg: DALS("""
             [egg_info]
             tag_build =
@@ -159,7 +159,7 @@ def test_license_is_a_string(self, tmpdir_cwd, env):
             setup()
             """)
 
-        build_files({'setup.py': setup_script,
+        path.build({'setup.py': setup_script,
                      'setup.cfg': setup_config})
 
         # This command should fail with a ValueError, but because it's
@@ -193,7 +193,7 @@ def test_rebuilt(self, tmpdir_cwd, env):
 
     def test_manifest_template_is_read(self, tmpdir_cwd, env):
         self._create_project()
-        build_files({
+        path.build({
             'MANIFEST.in': DALS("""
                 recursive-include docs *.rst
             """),
@@ -216,7 +216,7 @@ def _setup_script_with_requires(self, requires, use_setup_cfg=False):
             '''
         ) % ('' if use_setup_cfg else requires)
         setup_config = requires if use_setup_cfg else ''
-        build_files({'setup.py': setup_script,
+        path.build({'setup.py': setup_script,
                      'setup.cfg': setup_config})
 
     mismatch_marker = "python_version<'{this_ver}'".format(
@@ -546,7 +546,7 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
     def test_setup_cfg_license_file(
             self, tmpdir_cwd, env, files, license_in_sources):
         self._create_project()
-        build_files(files)
+        path.build(files)
 
         environment.run_setup_py(
             cmd=['egg_info'],
@@ -645,7 +645,7 @@ def test_setup_cfg_license_file(
     def test_setup_cfg_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
         self._create_project()
-        build_files(files)
+        path.build(files)
 
         environment.run_setup_py(
             cmd=['egg_info'],
@@ -750,7 +750,7 @@ def test_setup_cfg_license_files(
     def test_setup_cfg_license_file_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
         self._create_project()
-        build_files(files)
+        path.build(files)
 
         environment.run_setup_py(
             cmd=['egg_info'],
@@ -886,7 +886,7 @@ def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None):
 
     def test_egg_info_tag_only_once(self, tmpdir_cwd, env):
         self._create_project()
-        build_files({
+        path.build({
             'setup.cfg': DALS("""
                               [egg_info]
                               tag_build = dev
diff --git a/setuptools/tests/test_glob.py b/setuptools/tests/test_glob.py
index a0728c5d12..e99587f568 100644
--- a/setuptools/tests/test_glob.py
+++ b/setuptools/tests/test_glob.py
@@ -1,9 +1,8 @@
 import pytest
+from jaraco import path
 
 from setuptools.glob import glob
 
-from .files import build_files
-
 
 @pytest.mark.parametrize('tree, pattern, matches', (
     ('', b'', []),
@@ -31,5 +30,5 @@
 ))
 def test_glob(monkeypatch, tmpdir, tree, pattern, matches):
     monkeypatch.chdir(tmpdir)
-    build_files({name: '' for name in tree.split()})
+    path.build({name: '' for name in tree.split()})
     assert list(sorted(glob(pattern))) == list(sorted(matches))
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index e56eac14d1..7345b135fd 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -15,6 +15,7 @@
 import zipfile
 
 import pytest
+from jaraco import path
 
 from pkg_resources import Distribution, PathMetadata, PY_MAJOR
 from setuptools.extern.packaging.utils import canonicalize_name
@@ -22,7 +23,6 @@
 from setuptools.wheel import Wheel
 
 from .contexts import tempdir
-from .files import build_files
 from .textwrap import DALS
 
 
@@ -91,7 +91,7 @@ def build_wheel(extra_file_defs=None, **kwargs):
     if extra_file_defs:
         file_defs.update(extra_file_defs)
     with tempdir() as source_dir:
-        build_files(file_defs, source_dir)
+        path.build(file_defs, source_dir)
         subprocess.check_call((sys.executable, 'setup.py',
                                '-q', 'bdist_wheel'), cwd=source_dir)
         yield glob.glob(os.path.join(source_dir, 'dist', '*.whl'))[0]

From 346d98c700e2048bc7667970f23694d17d2c5642 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Feb 2021 12:32:25 -0500
Subject: [PATCH 8367/8469] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblin?=
 =?UTF-8?q?s=20(delint).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setuptools/tests/test_egg_info.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 5dfad7e269..bf95b03ce6 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -159,8 +159,10 @@ def test_license_is_a_string(self, tmpdir_cwd, env):
             setup()
             """)
 
-        path.build({'setup.py': setup_script,
-                     'setup.cfg': setup_config})
+        path.build({
+            'setup.py': setup_script,
+            'setup.cfg': setup_config,
+        })
 
         # This command should fail with a ValueError, but because it's
         # currently configured to use a subprocess, the actual traceback
@@ -216,8 +218,10 @@ def _setup_script_with_requires(self, requires, use_setup_cfg=False):
             '''
         ) % ('' if use_setup_cfg else requires)
         setup_config = requires if use_setup_cfg else ''
-        path.build({'setup.py': setup_script,
-                     'setup.cfg': setup_config})
+        path.build({
+            'setup.py': setup_script,
+            'setup.cfg': setup_config,
+        })
 
     mismatch_marker = "python_version<'{this_ver}'".format(
         this_ver=sys.version_info[0],

From 23cae26198fdda29e75cd0c1076ad601b0532d6b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Feb 2021 12:40:33 -0500
Subject: [PATCH 8368/8469] Pin minimum jaraco.path version

Co-authored-by: Benoit Pierre <benoit.pierre@gmail.com>
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 2158905b18..a3b9ca1b73 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,7 +58,7 @@ testing =
     pip>=19.1 # For proper file:// URLs support.
     jaraco.envs
     pytest-xdist
-    jaraco.path
+    jaraco.path>=3.2.0
 
 docs =
     # Keep these in sync with docs/requirements.txt

From 9be50723119ba4a636364b4dc17912f94d4632ec Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Feb 2021 12:53:32 -0500
Subject: [PATCH 8369/8469] Use path builder in upload_docs tests.

---
 setuptools/tests/test_sphinx_upload_docs.py | 27 ++++++++----------
 setuptools/tests/test_upload_docs.py        | 31 ++++++++-------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/setuptools/tests/test_sphinx_upload_docs.py b/setuptools/tests/test_sphinx_upload_docs.py
index a48ba7f8b3..cc5b8293bf 100644
--- a/setuptools/tests/test_sphinx_upload_docs.py
+++ b/setuptools/tests/test_sphinx_upload_docs.py
@@ -1,5 +1,6 @@
 import pytest
-import os
+
+from jaraco import path
 
 from setuptools.command.upload_docs import upload_docs
 from setuptools.dist import Distribution
@@ -7,21 +8,17 @@
 
 @pytest.fixture
 def sphinx_doc_sample_project(tmpdir_cwd):
-    # setup.py
-    with open('setup.py', 'wt') as f:
-        f.write('from setuptools import setup; setup()\n')
-
-    os.makedirs('build/docs')
-
-    # A test conf.py for Sphinx
-    with open('build/docs/conf.py', 'w') as f:
-        f.write("project = 'test'")
-
-    # A test index.rst for Sphinx
-    with open('build/docs/index.rst', 'w') as f:
-        f.write(".. toctree::\
+    path.build({
+        'setup.py': 'from setuptools import setup; setup()',
+        'build': {
+            'docs': {
+                'conf.py': 'project="test"',
+                'index.rst': ".. toctree::\
                     :maxdepth: 2\
-                    :caption: Contents:")
+                    :caption: Contents:",
+            },
+        },
+    })
 
 
 @pytest.mark.usefixtures('sphinx_doc_sample_project')
diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py
index a26e32a61d..55978aadc7 100644
--- a/setuptools/tests/test_upload_docs.py
+++ b/setuptools/tests/test_upload_docs.py
@@ -3,6 +3,7 @@
 import contextlib
 
 import pytest
+from jaraco import path
 
 from setuptools.command.upload_docs import upload_docs
 from setuptools.dist import Distribution
@@ -10,28 +11,20 @@
 from .textwrap import DALS
 from . import contexts
 
-SETUP_PY = DALS(
-    """
-    from setuptools import setup
-
-    setup(name='foo')
-    """)
-
 
 @pytest.fixture
 def sample_project(tmpdir_cwd):
-    # setup.py
-    with open('setup.py', 'wt') as f:
-        f.write(SETUP_PY)
-
-    os.mkdir('build')
-
-    # A test document.
-    with open('build/index.html', 'w') as f:
-        f.write("Hello world.")
-
-    # An empty folder.
-    os.mkdir('build/empty')
+    path.build({
+        'setup.py': DALS("""
+            from setuptools import setup
+
+            setup(name='foo')
+            """),
+        'build': {
+            'index.html': 'Hello world.',
+            'empty': {},
+        }
+    })
 
 
 @pytest.mark.usefixtures('sample_project')

From ea9c5778539b73db8d366a7544d2d314cb85f1ed Mon Sep 17 00:00:00 2001
From: Thea <tkjeldsmark@gmail.com>
Date: Sat, 20 Feb 2021 21:23:48 +0100
Subject: [PATCH 8370/8469] Include link to new developer guide in the old one

---
 docs/setuptools.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.rst b/docs/setuptools.rst
index 05516a4e31..e6fa7a69e7 100644
--- a/docs/setuptools.rst
+++ b/docs/setuptools.rst
@@ -54,7 +54,7 @@ Feature Highlights:
 Developer's Guide
 -----------------
 
-
+The developer's guide has been updated. See the `most recent version. <https://setuptools.readthedocs.io/en/latest/userguide/index.html>`_
 
 
 

From 65f727e9a695947d8013c952b4defde6789e2ff7 Mon Sep 17 00:00:00 2001
From: Thea <tkjeldsmark@gmail.com>
Date: Sat, 20 Feb 2021 22:11:06 +0100
Subject: [PATCH 8371/8469] Use :doc: instead of direct link

---
 docs/setuptools.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.rst b/docs/setuptools.rst
index e6fa7a69e7..761fc722d2 100644
--- a/docs/setuptools.rst
+++ b/docs/setuptools.rst
@@ -54,7 +54,7 @@ Feature Highlights:
 Developer's Guide
 -----------------
 
-The developer's guide has been updated. See the `most recent version. <https://setuptools.readthedocs.io/en/latest/userguide/index.html>`_
+The developer's guide has been updated. See the :doc:`most recent version <index>`.
 
 
 

From 869e223f903678775e6903bf8f6ca9b6cc805977 Mon Sep 17 00:00:00 2001
From: Thea <tkjeldsmark@gmail.com>
Date: Sat, 20 Feb 2021 22:32:29 +0100
Subject: [PATCH 8372/8469] Reference index in the userguide directory

---
 docs/setuptools.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setuptools.rst b/docs/setuptools.rst
index e6fa7a69e7..541bec515a 100644
--- a/docs/setuptools.rst
+++ b/docs/setuptools.rst
@@ -54,7 +54,7 @@ Feature Highlights:
 Developer's Guide
 -----------------
 
-The developer's guide has been updated. See the `most recent version. <https://setuptools.readthedocs.io/en/latest/userguide/index.html>`_
+The developer's guide has been updated. See the :doc:`most recent version <userguide/index>`.
 
 
 

From 743af7249d56e55a7c2c5f3111958ceee008d8ea Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Feb 2021 13:04:46 -0500
Subject: [PATCH 8373/8469] Exclude dist from discovered packages. Fixes
 jaraco/skeleton#46.

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 8df8d273a3..af246415cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ setup_requires = setuptools_scm[toml] >= 3.4.1
 [options.packages.find]
 exclude =
 	build*
+	dist*
 	docs*
 	tests*
 

From 38fff62edb5e282f144dc77cc1bf5555367336d9 Mon Sep 17 00:00:00 2001
From: KOLANICH <kolan_n@mail.ru>
Date: Sat, 6 Feb 2021 23:03:13 +0300
Subject: [PATCH 8374/8469] Added an .editorconfig. Pull request
 jaraco/skeleton#43.

---
 .editorconfig | 15 +++++++++++++++
 pytest.ini    |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..6385b57343
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
+end_of_line = lf
+
+[*.py]
+indent_style = space
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/pytest.ini b/pytest.ini
index d7f0b11559..016063b546 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,5 +5,5 @@ doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 # workaround for warning pytest-dev/pytest#6178
 junit_family=xunit2
 filterwarnings=
-    # https://github.com/pytest-dev/pytest/issues/6928
-    ignore:direct construction of .*Item has been deprecated:DeprecationWarning
+	# https://github.com/pytest-dev/pytest/issues/6928
+	ignore:direct construction of .*Item has been deprecated:DeprecationWarning

From 5e416793c008c5ef285c37828072fbea5ced6d08 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Feb 2021 21:34:35 -0500
Subject: [PATCH 8375/8469] It's no longer necessary to filter this warning and
 it's not a warning anymore.

---
 pytest.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 016063b546..6bf69af142 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,5 +5,3 @@ doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 # workaround for warning pytest-dev/pytest#6178
 junit_family=xunit2
 filterwarnings=
-	# https://github.com/pytest-dev/pytest/issues/6928
-	ignore:direct construction of .*Item has been deprecated:DeprecationWarning

From d9a13c77ce2a3efea70c97d219ca4335c0f03c40 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Feb 2021 21:36:53 -0500
Subject: [PATCH 8376/8469] Bump minimum pytest

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index af246415cf..81f70eeab7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 3.5, !=3.7.3
+	pytest >= 4.6
 	pytest-checkdocs >= 1.2.3
 	pytest-flake8
 	pytest-black >= 0.3.7; python_implementation != "PyPy"

From 21b122e06969a9d85c65ce8276519d34da7dc747 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 23 Feb 2021 21:23:35 -0500
Subject: [PATCH 8377/8469] Preserve case-sensitive keys in setup.cfg

---
 setuptools/dist.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 050388de16..c31020f0c4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -583,6 +583,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
             self.announce("Distribution.parse_config_files():")
 
         parser = ConfigParser()
+        parser.optionxform = str
         for filename in filenames:
             with io.open(filename, encoding='utf-8') as reader:
                 if DEBUG:

From 90d8740c353ddf20c1c76d8c06cd923c19b8cc84 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 23 Feb 2021 21:06:55 -0500
Subject: [PATCH 8378/8469] Add case-sensitive entry point name test

---
 setuptools/tests/test_config.py | 34 +++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 1dee12718f..6cc1d0a46b 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -802,6 +802,40 @@ def test_entry_points(self, tmpdir):
         with get_dist(tmpdir) as dist:
             assert dist.entry_points == expected
 
+    def test_case_sensitive_entry_points(self, tmpdir):
+        _, config = fake_env(
+            tmpdir,
+            '[options.entry_points]\n'
+            'GROUP1 = point1 = pack.module:func, '
+            '.point2 = pack.module2:func_rest [rest]\n'
+            'group2 = point3 = pack.module:func2\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.entry_points == {
+                'GROUP1': [
+                    'point1 = pack.module:func',
+                    '.point2 = pack.module2:func_rest [rest]',
+                ],
+                'group2': ['point3 = pack.module:func2']
+            }
+
+        expected = (
+            '[blogtool.parsers]\n'
+            '.rst = some.nested.module:SomeClass.some_classmethod[reST]\n'
+        )
+
+        tmpdir.join('entry_points').write(expected)
+
+        # From file.
+        config.write(
+            '[options]\n'
+            'entry_points = file: entry_points\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.entry_points == expected
+
     def test_data_files(self, tmpdir):
         fake_env(
             tmpdir,

From 39659040bda0664ee08588ecd2faa41b4ea406a1 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Wed, 24 Feb 2021 00:31:16 -0500
Subject: [PATCH 8379/8469] Add change note

---
 changelog.d/1937.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1937.breaking.rst

diff --git a/changelog.d/1937.breaking.rst b/changelog.d/1937.breaking.rst
new file mode 100644
index 0000000000..94dc739ab6
--- /dev/null
+++ b/changelog.d/1937.breaking.rst
@@ -0,0 +1 @@
+Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser -- by :user:`melissa-kun-li`
\ No newline at end of file

From 3dd8e559112d2b2af58caed77a105be7e925f1c4 Mon Sep 17 00:00:00 2001
From: Thea <tkjeldsmark@gmail.com>
Date: Wed, 24 Feb 2021 23:12:59 +0100
Subject: [PATCH 8380/8469] Add ini to display code block in doc

---
 docs/userguide/entry_point.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/entry_point.rst b/docs/userguide/entry_point.rst
index 738207282c..63d30a4893 100644
--- a/docs/userguide/entry_point.rst
+++ b/docs/userguide/entry_point.rst
@@ -64,7 +64,7 @@ After installing the package, a user may invoke that function by simply calling
 
 The syntax for entry points is specified as follows:
 
-.. code-block::
+.. code-block:: ini
 
     <name> = [<package>.[<subpackage>.]]<module>[:<object>.<object>]
 

From 7f3e6d688e5ff080ee6bd7ccc6bd81a87c05cfd7 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Wed, 24 Feb 2021 23:57:59 -0500
Subject: [PATCH 8381/8469] Update test for case-sensitive entry point names

---
 setuptools/tests/test_config.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 6cc1d0a46b..649075609a 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -820,22 +820,6 @@ def test_case_sensitive_entry_points(self, tmpdir):
                 'group2': ['point3 = pack.module:func2']
             }
 
-        expected = (
-            '[blogtool.parsers]\n'
-            '.rst = some.nested.module:SomeClass.some_classmethod[reST]\n'
-        )
-
-        tmpdir.join('entry_points').write(expected)
-
-        # From file.
-        config.write(
-            '[options]\n'
-            'entry_points = file: entry_points\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.entry_points == expected
-
     def test_data_files(self, tmpdir):
         fake_env(
             tmpdir,

From 11529db0de4081404b37fab17711660faa85abb8 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Thu, 25 Feb 2021 00:00:23 -0500
Subject: [PATCH 8382/8469] Update change log

---
 changelog.d/1937.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1937.change.rst

diff --git a/changelog.d/1937.change.rst b/changelog.d/1937.change.rst
new file mode 100644
index 0000000000..acd4305968
--- /dev/null
+++ b/changelog.d/1937.change.rst
@@ -0,0 +1 @@
+Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser. NOTE: Any projects relying on case-insensitivity will need to adapt to accept the original case as published. -- by :user:`melissa-kun-li`
\ No newline at end of file

From 898a0b59427f143efe0bcc0cabf69007fb3ee439 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Feb 2021 08:57:04 -0500
Subject: [PATCH 8383/8469] Remove 'breaking' changelog, superseded by
 'change'.

---
 changelog.d/1937.breaking.rst | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 changelog.d/1937.breaking.rst

diff --git a/changelog.d/1937.breaking.rst b/changelog.d/1937.breaking.rst
deleted file mode 100644
index 94dc739ab6..0000000000
--- a/changelog.d/1937.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser -- by :user:`melissa-kun-li`
\ No newline at end of file

From fa14483daaf6f0479d109d1b3cab3f1e1bef6894 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 25 Feb 2021 08:58:43 -0500
Subject: [PATCH 8384/8469] =?UTF-8?q?Bump=20version:=2053.0.0=20=E2=86=92?=
 =?UTF-8?q?=2053.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 11 +++++++++++
 changelog.d/1937.change.rst |  1 -
 changelog.d/2573.change.rst |  2 --
 setup.cfg                   |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/1937.change.rst
 delete mode 100644 changelog.d/2573.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d11952599e..a408627e47 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 53.0.0
+current_version = 53.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 93eae6870c..7e8c28bf0b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v53.1.0
+-------
+
+
+Changes
+^^^^^^^
+* #1937: Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser. NOTE: Any projects relying on case-insensitivity will need to adapt to accept the original case as published. -- by :user:`melissa-kun-li`
+* #2573: Fixed error in uploading a Sphinx doc with the :code:`upload_docs` command. An html builder will be used. 
+  Note: :code:`upload_docs` is deprecated for PyPi, but is supported for other sites -- by :user:`melissa-kun-li`
+
+
 v53.0.0
 -------
 
diff --git a/changelog.d/1937.change.rst b/changelog.d/1937.change.rst
deleted file mode 100644
index acd4305968..0000000000
--- a/changelog.d/1937.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser. NOTE: Any projects relying on case-insensitivity will need to adapt to accept the original case as published. -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/changelog.d/2573.change.rst b/changelog.d/2573.change.rst
deleted file mode 100644
index b06bd8c954..0000000000
--- a/changelog.d/2573.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed error in uploading a Sphinx doc with the :code:`upload_docs` command. An html builder will be used. 
-Note: :code:`upload_docs` is deprecated for PyPi, but is supported for other sites -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 3c85d99882..12ce13861d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 53.0.0
+version = 53.1.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 693e4a0cd296d5e107c39ba1986174e29ed409c8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 11:37:33 -0500
Subject: [PATCH 8385/8469] Only Python 3 is relevant now

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 414ffed581..58659eab07 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools >= 40.8; python_version > '3'",
+    "setuptools >= 40.8",
     "wheel",
 ]
 build-backend = "setuptools.build_meta"

From 1a549254c1828161417ff1053b8cdea34b9ad1dd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2021 13:51:32 -0500
Subject: [PATCH 8386/8469] Trim excess whitespace

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7e8c28bf0b..864ee10566 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ v53.1.0
 Changes
 ^^^^^^^
 * #1937: Preserved case-sensitivity of keys in setup.cfg so that entry point names are case-sensitive. Changed sensitivity of configparser. NOTE: Any projects relying on case-insensitivity will need to adapt to accept the original case as published. -- by :user:`melissa-kun-li`
-* #2573: Fixed error in uploading a Sphinx doc with the :code:`upload_docs` command. An html builder will be used. 
+* #2573: Fixed error in uploading a Sphinx doc with the :code:`upload_docs` command. An html builder will be used.
   Note: :code:`upload_docs` is deprecated for PyPi, but is supported for other sites -- by :user:`melissa-kun-li`
 
 

From accbc3aa9f6692e43a079bb3d1847ab4eb5c3ce5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 11:49:01 -0500
Subject: [PATCH 8387/8469] Try omitting setuptools as build requirement. After
 all, Setuptools is right here.

---
 pyproject.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 58659eab07..70e3473d44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,5 @@
 [build-system]
 requires = [
-    "setuptools >= 40.8",
     "wheel",
 ]
 build-backend = "setuptools.build_meta"

From 0a1f89c272be2720e9c737108153fcf88a1d8640 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 12:01:24 -0500
Subject: [PATCH 8388/8469] Restore pyproject.toml in sdist

---
 MANIFEST.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index eba40c5de6..3e8f09de37 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,4 +15,3 @@ include launcher.c
 include msvc-build-launcher.cmd
 include pytest.ini
 include tox.ini
-exclude pyproject.toml  # Temporary workaround for #1644.

From 30bd8a5702d38d7b98bd325e94fb50886b2b3d4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 14:14:46 -0500
Subject: [PATCH 8389/8469] Add minimal entry points for bootstrapping

---
 bootstrap.egg-info/entry_points.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bootstrap.egg-info/entry_points.txt

diff --git a/bootstrap.egg-info/entry_points.txt b/bootstrap.egg-info/entry_points.txt
new file mode 100644
index 0000000000..834d674e57
--- /dev/null
+++ b/bootstrap.egg-info/entry_points.txt
@@ -0,0 +1,14 @@
+[distutils.commands]
+egg_info = setuptools.command.egg_info:egg_info
+
+[distutils.setup_keywords]
+include_package_data = setuptools.dist:assert_bool
+install_requires = setuptools.dist:check_requirements
+extras_require = setuptools.dist:check_extras
+entry_points = setuptools.dist:check_entry_points
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
+requires.txt = setuptools.command.egg_info:write_requirements

From 7f838213da6d49c59e11aef6b8ebe0fcbc113801 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 19:43:15 -0500
Subject: [PATCH 8390/8469] Add metadata

---
 bootstrap.egg-info/PKG-INFO | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 bootstrap.egg-info/PKG-INFO

diff --git a/bootstrap.egg-info/PKG-INFO b/bootstrap.egg-info/PKG-INFO
new file mode 100644
index 0000000000..6e11ceeb9b
--- /dev/null
+++ b/bootstrap.egg-info/PKG-INFO
@@ -0,0 +1,2 @@
+Name: setuptools-bootstrap
+Version: 1.0

From 3d3c69e3800e66de8e6e3b5fc5672886f2b1068e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 20:05:37 -0500
Subject: [PATCH 8391/8469] Remove pip 19 from the upgrade from source tests.

---
 setuptools/tests/test_virtualenv.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index fcd5da5d45..ea74ebe2d2 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -69,7 +69,9 @@ def _get_pip_versions():
         'pip==9.0.3',
         'pip==10.0.1',
         'pip==18.1',
-        'pip==19.0.1',
+        # fails due to pypa/pip#6599
+        # 'pip==19.3.1',
+        'pip==20.0.2',
         'https://github.com/pypa/pip/archive/master.zip',
     ]
 

From ac3154576db19ae91a3cb1c26b7eba279fd12191 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 20:55:35 -0500
Subject: [PATCH 8392/8469] Rely on pytest-checkdocs 2.4 to avoid picking up
 'bootstrap' as the local project.

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index f4bf489a9c..7adf85691b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ exclude =
 testing =
 	# upstream
 	pytest >= 3.5, !=3.7.3
-	pytest-checkdocs >= 1.2.3
+	pytest-checkdocs >= 2.4
 	pytest-flake8
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov

From 1da02dc4d8dd591a67e83a663379ab5c926de47f Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 26 Feb 2021 21:28:00 -0500
Subject: [PATCH 8393/8469] Update changelog.

---
 changelog.d/2582.breaking.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2582.breaking.rst

diff --git a/changelog.d/2582.breaking.rst b/changelog.d/2582.breaking.rst
new file mode 100644
index 0000000000..15dfbdb11e
--- /dev/null
+++ b/changelog.d/2582.breaking.rst
@@ -0,0 +1 @@
+Simplified build-from source story. Build requirements no longer include setuptools itself. Project can no longer be installed from source on pip 19.x, but install from source is still supported on pip < 19 and pip >= 20 and install from wheel is still supported with pip >= 9.

From 4451606b2572870050bbabe7f6672a96d0c4d745 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2021 13:57:27 -0500
Subject: [PATCH 8394/8469] Prefer xfail to skip on known failure mode.

---
 setuptools/tests/test_virtualenv.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index ea74ebe2d2..5a16f52917 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,6 +1,8 @@
 import glob
 import os
 import sys
+import itertools
+from collections import UserString
 
 import pathlib
 
@@ -65,22 +67,33 @@ def _get_pip_versions():
             # No network, disable most of these tests
             network = False
 
+    def mark_param(orig, *marks):
+        result = UserString(orig) if not isinstance(orig, UserString) else orig
+        result.marks = getattr(result, 'marks', ()) + marks
+        return result
+
+    def make_param(marked_param):
+        marks = getattr(marked_param, 'marks', ())
+        return pytest.param(marked_param, marks=marks)
+
+    def skip_network(param):
+        return mark_param(param, pytest.mark.skip) if not network else param
+
     network_versions = [
         'pip==9.0.3',
         'pip==10.0.1',
         'pip==18.1',
-        # fails due to pypa/pip#6599
-        # 'pip==19.3.1',
+        mark_param('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
         'pip==20.0.2',
         'https://github.com/pypa/pip/archive/master.zip',
     ]
 
-    versions = [None] + [
-        pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
-        for v in network_versions
-    ]
+    versions = itertools.chain(
+        [None],
+        map(skip_network, network_versions)
+    )
 
-    return versions
+    return list(map(make_param, versions))
 
 
 @pytest.mark.parametrize('pip_version', _get_pip_versions())

From 61b3376a257be3e74ac6fa0633cb72dc8a600453 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2021 13:59:56 -0500
Subject: [PATCH 8395/8469] Expand on the change in the changelog.

---
 changelog.d/2582.breaking.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2582.breaking.rst b/changelog.d/2582.breaking.rst
index 15dfbdb11e..908ababe78 100644
--- a/changelog.d/2582.breaking.rst
+++ b/changelog.d/2582.breaking.rst
@@ -1 +1 @@
-Simplified build-from source story. Build requirements no longer include setuptools itself. Project can no longer be installed from source on pip 19.x, but install from source is still supported on pip < 19 and pip >= 20 and install from wheel is still supported with pip >= 9.
+Simplified build-from-source story by providing bootstrapping metadata in a separate egg-info directory. Build requirements no longer include setuptools itself. Sdist once again includes the pyproject.toml. Project can no longer be installed from source on pip 19.x, but install from source is still supported on pip < 19 and pip >= 20 and install from wheel is still supported with pip >= 9.

From ce7632f3a75ab8771ec3bc71cf21136a22de55ff Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Feb 2021 14:50:01 -0500
Subject: [PATCH 8396/8469] Rely more on pytest param to append markers.

---
 setuptools/tests/test_virtualenv.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 5a16f52917..f13f7997e3 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -2,7 +2,6 @@
 import os
 import sys
 import itertools
-from collections import UserString
 
 import pathlib
 
@@ -67,23 +66,19 @@ def _get_pip_versions():
             # No network, disable most of these tests
             network = False
 
-    def mark_param(orig, *marks):
-        result = UserString(orig) if not isinstance(orig, UserString) else orig
-        result.marks = getattr(result, 'marks', ()) + marks
-        return result
-
-    def make_param(marked_param):
-        marks = getattr(marked_param, 'marks', ())
-        return pytest.param(marked_param, marks=marks)
+    def mark(param, *marks):
+        if not isinstance(param, type(pytest.param(''))):
+            param = pytest.param(param)
+        return param._replace(marks=param.marks + marks)
 
     def skip_network(param):
-        return mark_param(param, pytest.mark.skip) if not network else param
+        return param if network else mark(param, pytest.mark.skip(reason="no network"))
 
     network_versions = [
         'pip==9.0.3',
         'pip==10.0.1',
         'pip==18.1',
-        mark_param('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
+        mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
         'pip==20.0.2',
         'https://github.com/pypa/pip/archive/master.zip',
     ]
@@ -93,7 +88,7 @@ def skip_network(param):
         map(skip_network, network_versions)
     )
 
-    return list(map(make_param, versions))
+    return list(versions)
 
 
 @pytest.mark.parametrize('pip_version', _get_pip_versions())

From 85f824f49d69177f68245b9788acaf5ace97afb7 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Sat, 27 Feb 2021 21:31:09 -0500
Subject: [PATCH 8397/8469] handle AttributeError by raising DisutilsSetupError
 in check_specifier

---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c31020f0c4..6ae3886b1f 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -292,7 +292,7 @@ def check_specifier(dist, attr, value):
     """Verify that value is a valid version specifier"""
     try:
         packaging.specifiers.SpecifierSet(value)
-    except packaging.specifiers.InvalidSpecifier as error:
+    except (packaging.specifiers.InvalidSpecifier, AttributeError) as error:
         tmpl = (
             "{attr!r} must be a string "
             "containing valid version specifiers; {error}"

From 20ced7533c2b737e9d99deacd97633f84b26567d Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Sun, 28 Feb 2021 00:59:58 -0500
Subject: [PATCH 8398/8469] test check_specifier

---
 setuptools/tests/test_dist.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index cb47fb5848..e4bba47bce 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -9,6 +9,7 @@
     _get_unpatched,
     check_package_data,
     DistDeprecationWarning,
+    check_specifier,
 )
 from setuptools import sic
 from setuptools import Distribution
@@ -323,3 +324,15 @@ def test_check_package_data(package_data, expected_message):
         with pytest.raises(
                 DistutilsSetupError, match=re.escape(expected_message)):
             check_package_data(None, str('package_data'), package_data)
+
+
+def test_check_specifier():
+    # valid specifier value
+    attrs = {'name': 'foo', 'python_requires': '>=3.0, !=3.1'}
+    dist = Distribution(attrs)
+    check_specifier(dist, attrs, attrs['python_requires'])
+
+    # invalid specifier value
+    attrs = {'name': 'foo', 'python_requires': ['>=3.0', '!=3.1']}
+    with pytest.raises(DistutilsSetupError):
+        dist = Distribution(attrs)

From adf32a23250c56b8c3856c768b5776bb78f695a3 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Sun, 28 Feb 2021 02:11:42 -0500
Subject: [PATCH 8399/8469] Add changelog

---
 changelog.d/1932.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1932.change.rst

diff --git a/changelog.d/1932.change.rst b/changelog.d/1932.change.rst
new file mode 100644
index 0000000000..a7af5b72ac
--- /dev/null
+++ b/changelog.d/1932.change.rst
@@ -0,0 +1 @@
+Handled :code:`AttributeError` by raising :code:`DistutilsSetupError` in :code:`dist.check_specifier()` when specifier is not a string -- by :user:`melissa-kun-li`
\ No newline at end of file

From f07e7ea59a484f4e7c2d5c8c6def50c836af334a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Feb 2021 16:47:11 -0500
Subject: [PATCH 8400/8469] =?UTF-8?q?Bump=20version:=2053.1.0=20=E2=86=92?=
 =?UTF-8?q?=2054.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              |  2 +-
 CHANGES.rst                   | 18 ++++++++++++++++++
 changelog.d/1932.change.rst   |  1 -
 changelog.d/2553.doc.rst      |  1 -
 changelog.d/2570.change.rst   |  1 -
 changelog.d/2582.breaking.rst |  1 -
 setup.cfg                     |  2 +-
 7 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/1932.change.rst
 delete mode 100644 changelog.d/2553.doc.rst
 delete mode 100644 changelog.d/2570.change.rst
 delete mode 100644 changelog.d/2582.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a408627e47..25490e49c9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 53.1.0
+current_version = 54.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 864ee10566..62f911aa89 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+v54.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2582: Simplified build-from-source story by providing bootstrapping metadata in a separate egg-info directory. Build requirements no longer include setuptools itself. Sdist once again includes the pyproject.toml. Project can no longer be installed from source on pip 19.x, but install from source is still supported on pip < 19 and pip >= 20 and install from wheel is still supported with pip >= 9.
+
+Changes
+^^^^^^^
+* #1932: Handled :code:`AttributeError` by raising :code:`DistutilsSetupError` in :code:`dist.check_specifier()` when specifier is not a string -- by :user:`melissa-kun-li`
+* #2570: Correctly parse cmdclass in setup.cfg.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2553: Added userguide example for markers in extras_require -- by :user:`pwoolvett`
+
+
 v53.1.0
 -------
 
diff --git a/changelog.d/1932.change.rst b/changelog.d/1932.change.rst
deleted file mode 100644
index a7af5b72ac..0000000000
--- a/changelog.d/1932.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Handled :code:`AttributeError` by raising :code:`DistutilsSetupError` in :code:`dist.check_specifier()` when specifier is not a string -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/changelog.d/2553.doc.rst b/changelog.d/2553.doc.rst
deleted file mode 100644
index fa03329ad9..0000000000
--- a/changelog.d/2553.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added userguide example for markers in extras_require -- by :user:`pwoolvett`
diff --git a/changelog.d/2570.change.rst b/changelog.d/2570.change.rst
deleted file mode 100644
index 165089ed31..0000000000
--- a/changelog.d/2570.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Correctly parse cmdclass in setup.cfg.
diff --git a/changelog.d/2582.breaking.rst b/changelog.d/2582.breaking.rst
deleted file mode 100644
index 908ababe78..0000000000
--- a/changelog.d/2582.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Simplified build-from-source story by providing bootstrapping metadata in a separate egg-info directory. Build requirements no longer include setuptools itself. Sdist once again includes the pyproject.toml. Project can no longer be installed from source on pip 19.x, but install from source is still supported on pip < 19 and pip >= 20 and install from wheel is still supported with pip >= 9.
diff --git a/setup.cfg b/setup.cfg
index 7adf85691b..d60a9b2633 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 53.1.0
+version = 54.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 8307bd497dba77f5ef40f504842e023334eba04b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 28 Feb 2021 16:50:09 -0500
Subject: [PATCH 8401/8469] Term is builder.

---
 docs/userguide/quickstart.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index e7594ba33e..75dc302f41 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -59,9 +59,9 @@ This is what your project would look like::
         setup.cfg
         mypackage/__init__.py
 
-Then, you need an installer, such as :std:doc:`PyPA build <pypa-build:index>`
+Then, you need an builder, such as :std:doc:`PyPA build <pypa-build:index>`
 which you can obtain via ``pip install build``. After downloading it, invoke
-the installer::
+the builder::
 
     python -m build
 

From 666f44463ce9749f1040694f9954cd93a4b80bdc Mon Sep 17 00:00:00 2001
From: Amy <leiamy12@gmail.com>
Date: Sun, 28 Feb 2021 22:29:48 -0500
Subject: [PATCH 8402/8469] Add sphinx-inline-tabs extension

---
 docs/conf.py          | 2 +-
 docs/requirements.txt | 1 +
 setup.cfg             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 18cd7bdc49..9082fb1d41 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,4 @@
-extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
+extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker', 'sphinx_inline_tabs']
 
 master_doc = "index"
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 104d68faef..0292759301 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,5 +3,6 @@ sphinx
 jaraco.packaging>=6.1
 rst.linker>=1.9
 pygments-github-lexers==0.0.5
+sphinx-inline-tabs
 
 setuptools>=34
diff --git a/setup.cfg b/setup.cfg
index 14ff445daa..9de9f87f88 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -65,6 +65,7 @@ docs =
 	sphinx
 	jaraco.packaging >= 8.2
 	rst.linker >= 1.9
+    sphinx-inline-tabs
 
 	# local
     pygments-github-lexers==0.0.5

From 474f833a1181ca07b17fe4c52a9680c70335181e Mon Sep 17 00:00:00 2001
From: Amy <leiamy12@gmail.com>
Date: Sun, 28 Feb 2021 23:07:47 -0500
Subject: [PATCH 8403/8469] Replace adjacent code blocks with tabbed containers

---
 docs/userguide/dependency_management.rst | 228 +++++++++++++----------
 docs/userguide/package_discovery.rst     | 112 ++++++-----
 docs/userguide/quickstart.rst            |  43 +++--
 3 files changed, 223 insertions(+), 160 deletions(-)

diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index 0eb2186494..6108d9b2e9 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -49,23 +49,27 @@ be able to run. ``setuptools`` support automatically download and install
 these dependencies when the package is installed. Although there is more
 finess to it, let's start with a simple example.
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [options]
-    #...
-    install_requires =
-        docutils
-        BazSpam ==1.1
+    .. code-block:: ini
+
+        [options]
+        #...
+        install_requires =
+            docutils
+            BazSpam ==1.1
+
+.. tab:: setup.py
 
-.. code-block:: python
+    .. code-block:: python
 
-    setup(
-        #...,
-        install_requires = [
-            'docutils',
-            'BazSpam ==1.1'
-        ]
-    )
+        setup(
+            #...,
+            install_requires = [
+                'docutils',
+                'BazSpam ==1.1'
+            ]
+        )
 
 
 When your project is installed (e.g. using pip), all of the dependencies not
@@ -82,41 +86,49 @@ specific dependencies. For example, the ``enum`` package was added in Python
 3.4, therefore, package that depends on it can elect to install it only when
 the Python version is older than 3.4. To accomplish this
 
-.. code-block:: ini
-
-    [options]
-    #...
-    install_requires =
-        enum34;python_version<'3.4'
+.. tab:: setup.cfg
 
-.. code-block:: python
+    .. code-block:: ini
 
-    setup(
+        [options]
         #...
-        install_requires=[
-            "enum34;python_version<'3.4'",]
-    )
+        install_requires =
+            enum34;python_version<'3.4'
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            #...
+            install_requires=[
+                "enum34;python_version<'3.4'",]
+        )
 
 Similarly, if you also wish to declare ``pywin32`` with a minimal version of 1.0
 and only install it if the user is using a Windows operating system:
 
-.. code-block:: ini
-
-    [options]
-    #...
-    install_requires =
-        enum34;python_version<'3.4'
-        pywin32 >= 1.0;platform_system=='Windows'
+.. tab:: setup.cfg
 
-.. code-block:: python
+    .. code-block:: ini
 
-    setup(
+        [options]
         #...
-        install_requires=[
-            "enum34;python_version<'3.4'",
-            "pywin32 >= 1.0;platform_system=='Windows'"
-            ]
-    )
+        install_requires =
+            enum34;python_version<'3.4'
+            pywin32 >= 1.0;platform_system=='Windows'
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            #...
+            install_requires=[
+                "enum34;python_version<'3.4'",
+                "pywin32 >= 1.0;platform_system=='Windows'"
+                ]
+        )
 
 The environmental markers that may be used for testing platform types are
 detailed in `PEP 508 <https://www.python.org/dev/peps/pep-0508/>`_.
@@ -181,20 +193,24 @@ The ``dependency_links`` option takes the form of a list of URL strings.  For
 example, this will cause a search of the specified page for eggs or source
 distributions, if the package's dependencies aren't already installed:
 
-.. code-block:: ini
-
-    [options]
-    #...
-    dependency_links = http://peak.telecommunity.com/snapshots/
+.. tab:: setup.cfg
 
-.. code-block:: python
+    .. code-block:: ini
 
-    setup(
+        [options]
         #...
-        dependency_links=[
-            "http://peak.telecommunity.com/snapshots/"
-        ],
-    )
+        dependency_links = http://peak.telecommunity.com/snapshots/
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            #...
+            dependency_links=[
+                "http://peak.telecommunity.com/snapshots/"
+            ],
+        )
 
 
 Optional dependencies
@@ -211,24 +227,28 @@ ancillary functions such as "tests" and "docs".
 For example, Package-A offers optional PDF support and requires two other
 dependencies for it to work:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [metadata]
-    name = Package-A
+    .. code-block:: ini
 
-    [options.extras_require]
-    PDF = ReportLab>=1.2; RXP
+        [metadata]
+        name = Package-A
 
+        [options.extras_require]
+        PDF = ReportLab>=1.2; RXP
 
-.. code-block:: python
 
-    setup(
-        name="Project-A",
-        #...
-        extras_require={
-            "PDF":  ["ReportLab>=1.2", "RXP"],
-        }
-    )
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            name="Project-A",
+            #...
+            extras_require={
+                "PDF":  ["ReportLab>=1.2", "RXP"],
+            }
+        )
 
 The name ``PDF`` is an arbitary identifier of such a list of dependencies, to
 which other components can refer and have them installed. There are two common
@@ -236,31 +256,35 @@ use cases.
 
 First is the console_scripts entry point:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [metadata]
-    name = Project A
-    #...
+    .. code-block:: ini
 
-    [options]
-    #...
-    entry_points=
-        [console_scripts]
-        rst2pdf = project_a.tools.pdfgen [PDF]
-        rst2html = project_a.tools.htmlgen
-
-.. code-block:: python
-
-    setup(
-        name = "Project-A"
-        #...,
-        entry_points={
-            "console_scripts": [
-                "rst2pdf = project_a.tools.pdfgen [PDF]",
-                "rst2html = project_a.tools.htmlgen",
-            ],
-        }
-    )
+        [metadata]
+        name = Project A
+        #...
+
+        [options]
+        #...
+        entry_points=
+            [console_scripts]
+            rst2pdf = project_a.tools.pdfgen [PDF]
+            rst2html = project_a.tools.htmlgen
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            name = "Project-A"
+            #...,
+            entry_points={
+                "console_scripts": [
+                    "rst2pdf = project_a.tools.pdfgen [PDF]",
+                    "rst2html = project_a.tools.htmlgen",
+                ],
+            }
+        )
 
 This syntax indicates that the entry point (in this case a console script)
 is only valid when the PDF extra is installed. It is up to the installer
@@ -273,24 +297,28 @@ The second use case is that other package can use this "extra" for their
 own dependencies. For example, if "Project-B" needs "project A" with PDF support
 installed, it might declare the dependency like this:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [metadata]
-    name = Project-B
-    #...
+    .. code-block:: ini
 
-    [options]
-    #...
-    install_requires =
-        Project-A[PDF]
+        [metadata]
+        name = Project-B
+        #...
+
+        [options]
+        #...
+        install_requires =
+            Project-A[PDF]
+
+.. tab:: setup.py
 
-.. code-block:: python
+    .. code-block:: python
 
-    setup(
-        name="Project-B",
-        install_requires=["Project-A[PDF]"],
-        ...
-    )
+        setup(
+            name="Project-B",
+            install_requires=["Project-A[PDF]"],
+            ...
+        )
 
 This will cause ReportLab to be installed along with project A, if project B is
 installed -- even if project A was already installed.  In this way, a project
diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst
index de4ef6682f..842ade828d 100644
--- a/docs/userguide/package_discovery.rst
+++ b/docs/userguide/package_discovery.rst
@@ -19,36 +19,44 @@ Package Discovery and Namespace Package
 support for namespace package. Normally, you would specify the package to be
 included manually in the following manner:
 
-.. code-block:: ini
-
-    [options]
-    #...
-    packages =
-        mypkg1
-        mypkg2
+.. tab:: setup.cfg
 
-.. code-block:: python
+    .. code-block:: ini
 
-    setup(
+        [options]
         #...
-        packages = ['mypkg1', 'mypkg2']
-    )
+        packages =
+            mypkg1
+            mypkg2
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            #...
+            packages = ['mypkg1', 'mypkg2']
+        )
 
 This can get tiresome reallly quickly. To speed things up, we introduce two
 functions provided by setuptools:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [options]
-    packages = find:
-    #or
-    packages = find_namespace:
+    .. code-block:: ini
 
-.. code-block:: python
+        [options]
+        packages = find:
+        #or
+        packages = find_namespace:
 
-    from setuptools import find_packages
-    #or
-    from setuptools import find_namespace_packages
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        from setuptools import find_packages
+        #or
+        from setuptools import find_namespace_packages
 
 
 Using ``find:`` or ``find_packages``
@@ -71,30 +79,34 @@ it, consider the following directory
 To have your setup.cfg or setup.py to automatically include packages found
 in ``src`` that starts with the name ``pkg`` and not ``additional``:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [options]
-    packages = find:
-    package_dir =
-        =src
+    .. code-block:: ini
 
-    [options.packages.find]
-    where = src
-    include = pkg*
-    exclude = additional
+        [options]
+        packages = find:
+        package_dir =
+            =src
 
-.. code-block:: python
+        [options.packages.find]
+        where = src
+        include = pkg*
+        exclude = additional
 
-    setup(
-        #...
-        packages = find_packages(
-            where = 'src',
-            include = ['pkg*',],
-            exclude = ['additional',]
-        ),
-        package_dir = {"":"src"}
-        #...
-    )
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        setup(
+            #...
+            packages = find_packages(
+                where = 'src',
+                include = ['pkg*',],
+                exclude = ['additional',]
+            ),
+            package_dir = {"":"src"}
+            #...
+        )
 
 
 .. _Namespace Packages:
@@ -195,17 +207,21 @@ following:
 
 And the ``namespace_packages`` keyword in your ``setup.cfg`` or ``setup.py``:
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [options]
-    namespace_packages = timmins
+    .. code-block:: ini
 
-.. code-block:: python
+        [options]
+        namespace_packages = timmins
+
+.. tab:: setup.py
+
+    .. code-block:: python
 
-    setup(
-        # ...
-        namespace_packages = ['timmins']
-    )
+        setup(
+            # ...
+            namespace_packages = ['timmins']
+        )
 
 And your directory should look like this
 
diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 1d557d47bd..16cd4f7192 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -37,26 +37,45 @@ package your project:
     requires = ["setuptools", "wheel"]
     build-backend = "setuptools.build_meta"
 
-Then, you will need a ``setup.cfg`` to specify your package information,
-such as metadata, contents, dependencies, etc. Here we demonstrate the minimum
+Then, you will need a ``setup.cfg`` or ``setup.py`` to specify your package
+information, such as metadata, contents, dependencies, etc. Here we demonstrate
+the minimum
 
-.. code-block:: ini
+.. tab:: setup.cfg
 
-    [metadata]
-    name = mypackage
-    version = 0.0.1
+    .. code-block:: ini
 
-    [options]
-    packages = mypackage
-    install_requires =
-      requests
-      importlib; python_version == "2.6"
+        [metadata]
+        name = mypackage
+        version = 0.0.1
+
+        [options]
+        packages = mypackage
+        install_requires =
+        requests
+        importlib; python_version == "2.6"
+
+.. tab:: setup.py
+
+    .. code-block:: python
+
+        from setuptools import setup
+
+        setup(
+            name='mypackage"'
+            version='0.0.1',
+            packages=['mypackage'],
+            install_requires=[
+                'requests',
+                'importlib; python_version == "2.6"',
+            ],
+        )
 
 This is what your project would look like::
 
     ~/mypackage/
         pyproject.toml
-        setup.cfg
+        setup.cfg # or setup.py
         mypackage/__init__.py
 
 Then, you need an installer, such as `pep517 <https://pypi.org/project/pep517/>`_

From c88c4e8a443e34f739547aeb76f4d9e752c0c31c Mon Sep 17 00:00:00 2001
From: Amy <leiamy12@gmail.com>
Date: Sun, 28 Feb 2021 23:33:22 -0500
Subject: [PATCH 8404/8469] Add changelog

---
 changelog.d/2584.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2584.doc.rst

diff --git a/changelog.d/2584.doc.rst b/changelog.d/2584.doc.rst
new file mode 100644
index 0000000000..3474049963
--- /dev/null
+++ b/changelog.d/2584.doc.rst
@@ -0,0 +1 @@
+Added ``sphinx-inline-tabs`` extension to allow for comparison of ``setup.py`` and its equivalent ``setup.cfg`` -- by :user:`amy-lei`
\ No newline at end of file

From a2e9ae4cb75f9b00ddf37713ec307e5f00869737 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 2 Mar 2021 19:36:41 -0500
Subject: [PATCH 8405/8469] Add compatibility method to warn for future
 underscore change

---
 setuptools/dist.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 6ae3886b1f..fe5bd6f8f0 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -598,7 +598,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
                         continue
 
                     val = parser.get(section, opt)
-                    opt = opt.replace('-', '_')
+                    opt = self.dash_to_underscore_warning(opt)
                     opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -623,6 +623,21 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
 
+    def dash_to_underscore_warning(self, opt):
+        if opt in (
+            'home-page', 'download-url', 'author-email',
+            'maintainer-email', 'long-description', 'build-base',
+            'project-urls', 'license-file', 'license-files',
+            'long-description-content-type',
+        ):
+            underscore_opt = opt.replace('-', '_')
+            warnings.warn(
+                "Usage of dash-separated '%s' will not be supported in future "
+                "versions. Please use the underscore name '%s' instead"
+                % (opt, underscore_opt))
+            return underscore_opt
+        return opt
+
     # FIXME: 'Distribution._set_command_options' is too complex (14)
     def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901
         """

From d027d6d2140daf87079dd3bd186585a5b063269e Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 2 Mar 2021 20:13:06 -0500
Subject: [PATCH 8406/8469] Modify existing tests to be compatible with future
 underscore change

---
 setuptools/command/easy_install.py | 2 +-
 setuptools/tests/test_build_ext.py | 2 +-
 setuptools/tests/test_config.py    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index eeb21b5083..0917804f41 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1190,7 +1190,7 @@ def _set_fetcher_options(self, base):
         for key, val in ei_opts.items():
             if key not in fetch_directives:
                 continue
-            fetch_options[key.replace('_', '-')] = val[1]
+            fetch_options[key] = val[1]
         # create a settings dictionary suitable for `edit_config`
         settings = dict(easy_install=fetch_options)
         cfg_filename = os.path.join(base, 'setup.cfg')
diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py
index be03893a1b..b6deebe4e2 100644
--- a/setuptools/tests/test_build_ext.py
+++ b/setuptools/tests/test_build_ext.py
@@ -104,7 +104,7 @@ def test_build_ext_config_handling(tmpdir_cwd):
         'setup.cfg': DALS(
             """
             [build]
-            build-base = foo_build
+            build_base = foo_build
             """),
     }
     path.build(files)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 6db86c7c58..0983f8362d 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -210,8 +210,8 @@ def test_aliases(self, tmpdir):
         fake_env(
             tmpdir,
             '[metadata]\n'
-            'author-email = test@test.com\n'
-            'home-page = http://test.test.com/test/\n'
+            'author_email = test@test.com\n'
+            'home_page = http://test.test.com/test/\n'
             'summary = Short summary\n'
             'platform = a, b\n'
             'classifier =\n'

From 08d6a2f2b0fb4b57f749d0adaaca3efc158419cd Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 2 Mar 2021 22:54:53 -0500
Subject: [PATCH 8407/8469] Add test for conversion warning

---
 setuptools/tests/test_config.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 0983f8362d..4a39917922 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -507,6 +507,25 @@ def test_not_utf8(self, tmpdir):
             with get_dist(tmpdir):
                 pass
 
+    def test_dash_to_underscore_warning(self, tmpdir):
+        # dash_to_underscore_warning() is a method in setuptools.dist
+        # remove this test and method when dash convert to underscore in setup.cfg
+        # is no longer supported
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'author-email = test@test.com\n'
+            'maintainer_email = foo@foo.com\n'
+            )
+        msg = ("Usage of dash-separated 'author-email' will not be supported "
+               "in future versions. "
+               "Please use the underscore name 'author_email' instead")
+        with pytest.warns(UserWarning, match=msg):
+            with get_dist(tmpdir) as dist:
+                metadata = dist.metadata
+                assert metadata.author_email == 'test@test.com'
+                assert metadata.maintainer_email == 'foo@foo.com'
+
 
 class TestOptions:
 

From 67a5991997659326fd1439a58e2140731144f08c Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 2 Mar 2021 23:25:39 -0500
Subject: [PATCH 8408/8469] Add test for dash preserved extras_require in
 setup.cfg

---
 setuptools/tests/test_config.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 4a39917922..eac26749d4 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -791,6 +791,20 @@ def test_extras_require(self, tmpdir):
             }
             assert dist.metadata.provides_extras == set(['pdf', 'rest'])
 
+    def test_dash_preserved_extras_require(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options.extras_require]\n'
+            'foo-a = foo\n'
+            'foo_b = test\n'
+        )
+
+        with get_dist(tmpdir) as dist:
+            assert dist.extras_require == {
+                'foo-a': ['foo'],
+                'foo_b': ['test']
+            }
+
     def test_entry_points(self, tmpdir):
         _, config = fake_env(
             tmpdir,

From 4cd5f1a23bced5679f219387afacc59dd360bce5 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Tue, 2 Mar 2021 23:53:19 -0500
Subject: [PATCH 8409/8469] Add changelog

---
 changelog.d/1608.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1608.change.rst

diff --git a/changelog.d/1608.change.rst b/changelog.d/1608.change.rst
new file mode 100644
index 0000000000..77fcfd57b7
--- /dev/null
+++ b/changelog.d/1608.change.rst
@@ -0,0 +1 @@
+Removed the general conversion of dashes to underscores in the keys of :code:`setup.cfg` to support the usage of dashes. Added a compatibility method to warn users when they use a specific dash-separated key which in the future will only allow an underscore. Note: the method performs the dash to underscore conversion to preserve compatibility, but future versions will no longer support it -- by :user:`melissa-kun-li`
\ No newline at end of file

From 9c2b717818046a0d8679b4a97c63db2dc1e32d54 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Wed, 3 Mar 2021 16:42:16 -0500
Subject: [PATCH 8410/8469] Update warning for dash to underscore conversion

---
 changelog.d/1608.change.rst |  2 +-
 setuptools/dist.py          | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/changelog.d/1608.change.rst b/changelog.d/1608.change.rst
index 77fcfd57b7..c0f493b16c 100644
--- a/changelog.d/1608.change.rst
+++ b/changelog.d/1608.change.rst
@@ -1 +1 @@
-Removed the general conversion of dashes to underscores in the keys of :code:`setup.cfg` to support the usage of dashes. Added a compatibility method to warn users when they use a specific dash-separated key which in the future will only allow an underscore. Note: the method performs the dash to underscore conversion to preserve compatibility, but future versions will no longer support it -- by :user:`melissa-kun-li`
\ No newline at end of file
+Removed the conversion of dashes to underscores in the :code:`extras_require` and :code:`data_files` of :code:`setup.cfg` to support the usage of dashes. Method will warn users when they use a dash-separated key which in the future will only allow an underscore. Note: the method performs the dash to underscore conversion to preserve compatibility, but future versions will no longer support it -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/setuptools/dist.py b/setuptools/dist.py
index fe5bd6f8f0..40440a406a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -598,7 +598,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
                         continue
 
                     val = parser.get(section, opt)
-                    opt = self.dash_to_underscore_warning(opt)
+                    opt = self.dash_to_underscore_warning(opt, section)
                     opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -622,21 +622,19 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
                 setattr(self, alias or opt, val)
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
-
-    def dash_to_underscore_warning(self, opt):
-        if opt in (
-            'home-page', 'download-url', 'author-email',
-            'maintainer-email', 'long-description', 'build-base',
-            'project-urls', 'license-file', 'license-files',
-            'long-description-content-type',
+    
+    def dash_to_underscore_warning(self, opt, section):
+        if section in (
+            'options.extras_require', 'options.data_files',
         ):
-            underscore_opt = opt.replace('-', '_')
+            return opt
+        underscore_opt = opt.replace('-', '_')
+        if '-' in opt:
             warnings.warn(
                 "Usage of dash-separated '%s' will not be supported in future "
                 "versions. Please use the underscore name '%s' instead"
                 % (opt, underscore_opt))
-            return underscore_opt
-        return opt
+        return underscore_opt
 
     # FIXME: 'Distribution._set_command_options' is too complex (14)
     def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901

From 1af7000887487cfe1aa4d127a15e7802656f1e8a Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Wed, 3 Mar 2021 17:02:45 -0500
Subject: [PATCH 8411/8469] Dash to underscore compatibility

---
 setuptools/dist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 40440a406a..c074468ba9 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -622,7 +622,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
                 setattr(self, alias or opt, val)
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
-    
+
     def dash_to_underscore_warning(self, opt, section):
         if section in (
             'options.extras_require', 'options.data_files',

From b40d7f4174083c92ad532eccf9b13c2d8570accf Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Mar 2021 11:07:23 -0500
Subject: [PATCH 8412/8469] =?UTF-8?q?Bump=20version:=2054.0.0=20=E2=86=92?=
 =?UTF-8?q?=2054.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            | 2 +-
 CHANGES.rst                 | 9 +++++++++
 changelog.d/1608.change.rst | 1 -
 setup.cfg                   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/1608.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 25490e49c9..9a23064374 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.0.0
+current_version = 54.1.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 62f911aa89..3920b27e93 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v54.1.0
+-------
+
+
+Changes
+^^^^^^^
+* #1608: Removed the conversion of dashes to underscores in the :code:`extras_require` and :code:`data_files` of :code:`setup.cfg` to support the usage of dashes. Method will warn users when they use a dash-separated key which in the future will only allow an underscore. Note: the method performs the dash to underscore conversion to preserve compatibility, but future versions will no longer support it -- by :user:`melissa-kun-li`
+
+
 v54.0.0
 -------
 
diff --git a/changelog.d/1608.change.rst b/changelog.d/1608.change.rst
deleted file mode 100644
index c0f493b16c..0000000000
--- a/changelog.d/1608.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed the conversion of dashes to underscores in the :code:`extras_require` and :code:`data_files` of :code:`setup.cfg` to support the usage of dashes. Method will warn users when they use a dash-separated key which in the future will only allow an underscore. Note: the method performs the dash to underscore conversion to preserve compatibility, but future versions will no longer support it -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index d60a9b2633..18950611bc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 54.0.0
+version = 54.1.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 265fb0eda039711e749bec09b512b91e9ce56627 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 5 Mar 2021 11:12:28 -0500
Subject: [PATCH 8413/8469] Extend extensions later in the file. Fixes flake8
 failure and isolates the (sole) change from other concerns.

---
 docs/conf.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 9082fb1d41..581d8d5e75 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,4 @@
-extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker', 'sphinx_inline_tabs']
+extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
 
 master_doc = "index"
 
@@ -93,3 +93,6 @@
 html_theme = 'alabaster'
 templates_path = ['_templates']
 html_sidebars = {'index': ['tidelift-sidebar.html']}
+
+# Add support for inline tabs
+extensions += ['sphinx_inline_tabs']

From 132a6cde2a47f34680527258a3753a692e23b266 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Fri, 5 Mar 2021 23:03:15 -0500
Subject: [PATCH 8414/8469] Warn for uppercase usage in setup.cfg metadata

---
 setuptools/dist.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index c074468ba9..43a51ad808 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -599,6 +599,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
 
                     val = parser.get(section, opt)
                     opt = self.dash_to_underscore_warning(opt, section)
+                    opt = self.uppercase_warning(opt, section)
                     opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -636,6 +637,17 @@ def dash_to_underscore_warning(self, opt, section):
                 % (opt, underscore_opt))
         return underscore_opt
 
+    def uppercase_warning(self, opt, section):
+        if section in ('metadata',) and (any(c.isupper() for c in opt)):
+            lowercase_opt = opt.lower()
+            warnings.warn(
+                "Usage of uppercase key '%s' in '%s' will be deprecated in future "
+                "versions. Please use lowercase '%s' instead"
+                % (opt, section, lowercase_opt)
+            )
+            return lowercase_opt
+        return opt
+
     # FIXME: 'Distribution._set_command_options' is too complex (14)
     def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901
         """

From fa48ac3626c21efc5261b4f112270ca40d2e004d Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Fri, 5 Mar 2021 23:20:59 -0500
Subject: [PATCH 8415/8469] Test for uppercase metadata warning

---
 setuptools/tests/test_config.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index eac26749d4..454ffb245e 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -526,6 +526,24 @@ def test_dash_to_underscore_warning(self, tmpdir):
                 assert metadata.author_email == 'test@test.com'
                 assert metadata.maintainer_email == 'foo@foo.com'
 
+    def test_uppercase_warning(self, tmpdir):
+        # remove this test and the method uppercase_warning() in setuptools.dist
+        # when no longer needed
+        fake_env(
+            tmpdir,
+            '[metadata]\n'
+            'Name = foo\n'
+            'description = Some description\n'
+        )
+        msg = ("Usage of uppercase key 'Name' in 'metadata' will be deprecated in "
+               "future versions. "
+               "Please use lowercase 'name' instead")
+        with pytest.warns(UserWarning, match=msg):
+            with get_dist(tmpdir) as dist:
+                metadata = dist.metadata
+                assert metadata.name == 'foo'
+                assert metadata.description == 'Some description'
+
 
 class TestOptions:
 

From 28c7abc9516821cb701be5576ccd274a3b0c0389 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Sat, 6 Mar 2021 00:00:37 -0500
Subject: [PATCH 8416/8469] Add changelog

---
 changelog.d/2592.change.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2592.change.rst

diff --git a/changelog.d/2592.change.rst b/changelog.d/2592.change.rst
new file mode 100644
index 0000000000..3dbe816fd8
--- /dev/null
+++ b/changelog.d/2592.change.rst
@@ -0,0 +1 @@
+Warned for usage of uppercase keys in :code:`metadata` in :code:`setup.cfg`, restored some compatiblity by transforming to lowercase if not. Followed the change of keys in :code:`setup.cfg` now being case-sensitive -- by :user:`melissa-kun-li`
\ No newline at end of file

From bf9fae2c0df316dc837d56ae68880620733d5ff6 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 6 Mar 2021 09:57:43 -0500
Subject: [PATCH 8417/8469] Require twine 3 with keyring unconditionally
 required.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 249f97c24f..a9a50b01a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands =
 skip_install = True
 deps =
 	build
-	twine[keyring]>=1.13
+	twine>=3
 	path
 	jaraco.develop>=7.1
 passenv =

From 9acf04c1461fd013fc0a1bd95158e74c7cf437d4 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 7 Mar 2021 01:38:02 +0100
Subject: [PATCH 8418/8469] Introduce issue forms in the repo

---
 .github/ISSUE_TEMPLATE/bug-report.yml         | 130 ++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml             |  15 ++
 .../ISSUE_TEMPLATE/documentation-report.yml   |  93 +++++++++++++
 .github/ISSUE_TEMPLATE/feature-request.yml    | 105 ++++++++++++++
 4 files changed, 343 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/documentation-report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000000..5f551a4be7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,130 @@
+---
+name: � Bug report
+description: >-
+  Create a report to help us improve when
+  something is not working correctly
+title: '[BUG] '
+labels:
+- bug
+- Needs Triage
+issue_body: false  # default: true, adds a classic WSYWIG textarea, if on
+
+body:
+- type: markdown
+  attributes:
+    value: >
+      **Thank you for wanting to report a bug in setuptools!**
+
+
+      âš 
+      Verify first that your issue is not
+      [already reported on GitHub][issue search] and keep in mind and
+      keep in mind that we may have to keep the current behavior because
+      [every change breaks someone's workflow][XKCD 1172].
+      We try to be mindful about this.
+
+      Also test if the latest release and main branch are affected too.
+
+
+      If you are seeking community support, please consider
+      [starting a discussion][Discussions].
+
+
+      Thank you for your collaboration!
+
+
+      [Discussions]: https://github.com/pypa/setuptools/discussions
+
+      [issue search]: https://github.com/pypa/setuptools/search?q=is%3Aissue&type=issues
+
+      [XKCD 1172]: https://xkcd.com/1172/
+
+- type: markdown
+  attributes:
+    value: >-
+      **Environment**
+- type: input
+  attributes:
+    label: setuptools version
+    placeholder: For example, setuptools===60.4.2
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Python version
+    placeholder: For example, Python 3.10
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: OS
+    placeholder: For example, Gentoo Linux, RHEL 8, Arch Linux, macOS etc.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional environment information
+    description: >-
+      Feel free to add more information about your environment here.
+    placeholder: >-
+      This is only happening when I run setuptools on my fridge's patched firmware 🤯
+
+- type: textarea
+  attributes:
+    label: Description
+    description: >-
+      A clear and concise description of what the bug is.
+    placeholder: >-
+      I tried doing X and I expected it to result in Y because the docs
+      mentioned Z but what happened next what totally unexpected!
+      And here's why...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: >-
+      A clear and concise description of what you expected to happen.
+    placeholder: >-
+      I tried doing X and I expected it to result in Y. I'm confused...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: How to Reproduce
+    description: >-
+      Describe the steps to reproduce this bug.
+    placeholder: |
+      1. Integrate setuptools via '...'
+      2. Then run '...'
+      3. An error occurs.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Output
+    description: >-
+      Paste the output of the steps above, including the commands
+      themselves and setuptools' output/traceback etc.
+    value: |
+      ```console
+
+      ```
+  validations:
+    required: true
+
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [PSF Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+    options:
+    - label: I agree to follow the PSF Code of Conduct
+      required: true
+...
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..dde102ca11
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,15 @@
+# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: false  # default: true
+contact_links:
+- name: 🤔 Have questions or need support?
+  url: https://github.com/pypa/setuptools/discussions
+  about: This is a place for the community to exchange ideas and recipes
+- name: 💬 Discourse
+  url: https://discuss.python.org/c/packaging
+  about: |
+    Please ask typical Q&A here: general ideas for Python packaging,
+    questions about structuring projects and so on
+- name: >-
+    💬 IRC: #pypa @ Freenode
+  url: https://webchat.freenode.net/#pypa
+  about: Chat with devs
diff --git a/.github/ISSUE_TEMPLATE/documentation-report.yml b/.github/ISSUE_TEMPLATE/documentation-report.yml
new file mode 100644
index 0000000000..a947dad83e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation-report.yml
@@ -0,0 +1,93 @@
+---
+name: � Documentation Report
+title: '[Docs] '
+description: Ask us about docs
+labels:
+- documentation
+- Needs Triage
+# NOTE: issue body is enabled to allow screenshots
+issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
+
+body:
+- type: markdown
+  attributes:
+    value: >
+      **Thank you for wanting to report a problem with setuptools
+      documentation!**
+
+
+      Please fill out your suggestions below. If the problem seems
+      straightforward, feel free to go ahead and
+      submit a pull request instead!
+
+
+      âš 
+      Verify first that your issue is not [already reported on
+      GitHub][issue search].
+
+
+      If you are seeking community support, please consider
+      [starting a discussion][Discussions].
+
+
+      Thank you for your collaboration!
+
+
+      [issue search]: https://github.com/pypa/setuptools/search?q=is%3Aissue&type=issues
+
+      [Discussions]: https://github.com/pypa/setuptools/discussions
+
+- type: textarea
+  attributes:
+    label: Summary
+    description: >
+      Explain the problem briefly below, add suggestions to wording
+      or structure.
+
+
+      **HINT:** Did you know the documentation has a `View on GitHub`
+      link on every page? Feel free to use it to start a pull request
+      right from the GitHub UI!
+    placeholder: >-
+      I was reading the setuptools documentation of version X and I'm
+      having problems understanding Y. It would be very helpful if that
+      got rephrased as Z.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: OS / Environment
+    description: >-
+      Provide all relevant information below, e.g. OS version,
+      browser, etc.
+    placeholder: Fedora 33, Firefox etc.
+
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [PSF Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+    options:
+    - label: I agree to follow the PSF Code of Conduct
+      required: true
+
+
+- type: markdown
+  attributes:
+    value: >
+ 
+
+      ### Additional Information
+
+
+      Describe how this improves the documentation, e.g. before/after
+      situation or screenshots.
+
+
+      **HINT:** You can paste https://gist.github.com links for
+      larger files.
+...
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000000..7dec35a8dc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,105 @@
+---
+name: ✨ Feature request
+description: Suggest an idea for setuptools
+title: '[FR] '
+labels:
+- enhancement
+- Needs Triage
+issue_body: false  # default: true, adds a classic WSYWIG textarea, if on
+
+body:
+- type: markdown
+  attributes:
+    value: >
+      **Thank you for wanting to suggest a feature for setuptools!**
+
+
+      💡
+      Before you go ahead with your request, please first consider if it
+      would be useful for majority of the setuptools users. As a general
+      rule of thumb, any feature that is only of interest to a small sub
+      group should be implemented in a third-party plugin or maybe even
+      just your project alone. Be mindful of the fact that the core
+      setuptools features have a broad impact.
+
+
+      <details>
+        <summary>
+          � Every change breaks someone's workflow.
+        </summary>
+
+
+        [![� Every change breaks someone's workflow.](https://imgs.xkcd.com/comics/workflow.png)
+        ](https://xkcd.com/1172/)
+      </details>
+
+
+      âš 
+      Verify first that your idea is not [already requested on GitHub][issue search].
+
+
+
+      [issue search]: https://github.com/pypa/setuptools/search?q=is%3Aissue&type=issues
+
+- type: textarea
+  attributes:
+    label: What's the problem this feature will solve?
+    description: >-
+      What are you trying to do, that you are unable to achieve
+      with setuptools as it currently stands?
+    placeholder: >-
+      I'm trying to do X and I'm missing feature Y for this to be
+      easily achievable.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: >
+      Clear and concise description of what you want to happen.
+
+
+      Provide examples of real world use cases that this would enable
+      and how it solves the problem described above.
+    placeholder: >-
+      When I do X, I want to achieve Y in a situation when Z.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Alternative Solutions
+    description: >-
+      Have you tried to workaround the problem using other tools? Or a
+      different approach to solving this issue? Please elaborate here.
+    placeholder: >-
+      I tried doing X, Y and Z. But they are subobpimal because of P.
+
+- type: textarea
+  attributes:
+    label: Additional context
+    description: >
+      Add any other context, links, etc. about the feature here.
+      Describe how the feature would be used, why it is needed and what
+      it would solve.
+
+
+      **HINT:** You can paste https://gist.github.com links for
+      larger files.
+    placeholder: >-
+      I asked on https://stackoverflow.com/.... and the community
+      advised me to do X, Y and Z.
+
+
+- type: checkboxes
+  attributes:
+    label: Code of Conduct
+    description: |
+      Read the [PSF Code of Conduct][CoC] first.
+
+      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
+    options:
+    - label: I agree to follow the PSF Code of Conduct
+      required: true
+...

From 0bffc7c1c673f9735bdac71a2949fae809ec07a3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 6 Mar 2021 21:47:15 -0500
Subject: [PATCH 8419/8469] Apply suggestions in code review.

Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
---
 changelog.d/2592.change.rst     |  4 +++-
 setuptools/dist.py              | 23 ++++++++++++-----------
 setuptools/tests/test_config.py |  5 +++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/changelog.d/2592.change.rst b/changelog.d/2592.change.rst
index 3dbe816fd8..a38ae0c4c4 100644
--- a/changelog.d/2592.change.rst
+++ b/changelog.d/2592.change.rst
@@ -1 +1,3 @@
-Warned for usage of uppercase keys in :code:`metadata` in :code:`setup.cfg`, restored some compatiblity by transforming to lowercase if not. Followed the change of keys in :code:`setup.cfg` now being case-sensitive -- by :user:`melissa-kun-li`
\ No newline at end of file
+Made option keys in the ``[metadata]`` section of ``setup.cfg`` case-sensitive. Users having
+uppercase option spellings will get a warning suggesting to make them to lowercase
+-- by :user:`melissa-kun-li`
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 43a51ad808..70c0e6becb 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -599,7 +599,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
 
                     val = parser.get(section, opt)
                     opt = self.dash_to_underscore_warning(opt, section)
-                    opt = self.uppercase_warning(opt, section)
+                    opt = self.make_option_lowercase(opt, section)
                     opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -637,16 +637,17 @@ def dash_to_underscore_warning(self, opt, section):
                 % (opt, underscore_opt))
         return underscore_opt
 
-    def uppercase_warning(self, opt, section):
-        if section in ('metadata',) and (any(c.isupper() for c in opt)):
-            lowercase_opt = opt.lower()
-            warnings.warn(
-                "Usage of uppercase key '%s' in '%s' will be deprecated in future "
-                "versions. Please use lowercase '%s' instead"
-                % (opt, section, lowercase_opt)
-            )
-            return lowercase_opt
-        return opt
+    def make_option_lowercase(self, opt, section):
+        if section != 'metadata' or opt.islower():
+            return opt
+
+        lowercase_opt = opt.lower()
+        warnings.warn(
+            "Usage of uppercase key '%s' in '%s' will be deprecated in future "
+            "versions. Please use lowercase '%s' instead"
+            % (opt, section, lowercase_opt)
+        )
+        return lowercase_opt
 
     # FIXME: 'Distribution._set_command_options' is too complex (14)
     def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 454ffb245e..1ff5ee4185 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -541,8 +541,9 @@ def test_uppercase_warning(self, tmpdir):
         with pytest.warns(UserWarning, match=msg):
             with get_dist(tmpdir) as dist:
                 metadata = dist.metadata
-                assert metadata.name == 'foo'
-                assert metadata.description == 'Some description'
+
+        assert metadata.name == 'foo'
+        assert metadata.description == 'Some description'
 
 
 class TestOptions:

From 66323adeae5cb2d143d00db13fd96686c0887233 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 6 Mar 2021 21:49:29 -0500
Subject: [PATCH 8420/8469] Make change a bugfix

---
 changelog.d/{2592.change.rst => 2592.bugfix.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2592.change.rst => 2592.bugfix.rst} (100%)

diff --git a/changelog.d/2592.change.rst b/changelog.d/2592.bugfix.rst
similarity index 100%
rename from changelog.d/2592.change.rst
rename to changelog.d/2592.bugfix.rst

From c71b7bdbd0148bda4924d4c9fc84c574e5e4c227 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 6 Mar 2021 22:02:58 -0500
Subject: [PATCH 8421/8469] The term is misc :/

---
 changelog.d/{2592.bugfix.rst => 2592.misc.rst} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{2592.bugfix.rst => 2592.misc.rst} (100%)

diff --git a/changelog.d/2592.bugfix.rst b/changelog.d/2592.misc.rst
similarity index 100%
rename from changelog.d/2592.bugfix.rst
rename to changelog.d/2592.misc.rst

From d2ae3cd2cfc66c300bc6661ca33f0ba1f651fd56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 6 Mar 2021 22:04:03 -0500
Subject: [PATCH 8422/8469] =?UTF-8?q?Bump=20version:=2054.1.0=20=E2=86=92?=
 =?UTF-8?q?=2054.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          |  2 +-
 CHANGES.rst               | 15 +++++++++++++++
 changelog.d/2584.doc.rst  |  1 -
 changelog.d/2592.misc.rst |  3 ---
 setup.cfg                 |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/2584.doc.rst
 delete mode 100644 changelog.d/2592.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 9a23064374..1d2c227839 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.1.0
+current_version = 54.1.1
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 3920b27e93..bedd1faa01 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+v54.1.1
+-------
+
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2584: Added ``sphinx-inline-tabs`` extension to allow for comparison of ``setup.py`` and its equivalent ``setup.cfg`` -- by :user:`amy-lei`
+
+Misc
+^^^^
+* #2592: Made option keys in the ``[metadata]`` section of ``setup.cfg`` case-sensitive. Users having
+  uppercase option spellings will get a warning suggesting to make them to lowercase
+  -- by :user:`melissa-kun-li`
+
+
 v54.1.0
 -------
 
diff --git a/changelog.d/2584.doc.rst b/changelog.d/2584.doc.rst
deleted file mode 100644
index 3474049963..0000000000
--- a/changelog.d/2584.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``sphinx-inline-tabs`` extension to allow for comparison of ``setup.py`` and its equivalent ``setup.cfg`` -- by :user:`amy-lei`
\ No newline at end of file
diff --git a/changelog.d/2592.misc.rst b/changelog.d/2592.misc.rst
deleted file mode 100644
index a38ae0c4c4..0000000000
--- a/changelog.d/2592.misc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Made option keys in the ``[metadata]`` section of ``setup.cfg`` case-sensitive. Users having
-uppercase option spellings will get a warning suggesting to make them to lowercase
--- by :user:`melissa-kun-li`
diff --git a/setup.cfg b/setup.cfg
index bc31dc2e6b..7b05eed32f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
     LICENSE
 name = setuptools
-version = 54.1.0
+version = 54.1.1
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 7bdab57872da46ef6a5a7f5ea9099a197bdc3131 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Mar 2021 12:23:48 -0500
Subject: [PATCH 8423/8469] Add comments indicating why the exclusions are
 present

---
 setup.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 81f70eeab7..dd215c65bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,8 +34,10 @@ testing =
 	pytest >= 4.6
 	pytest-checkdocs >= 1.2.3
 	pytest-flake8
+	# python_implementation: workaround for jaraco/skeleton#22
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov
+	# python_implementation: workaround for jaraco/skeleton#22
 	pytest-mypy; python_implementation != "PyPy"
 	pytest-enabler
 

From 14312a5bd75d3313ffd3e14fc7fbbc2a9b05cee5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Mar 2021 12:24:21 -0500
Subject: [PATCH 8424/8469] Exclude mypy on Python 3.10 as workaround for
 python/typed_ast#156.

---
 setup.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index dd215c65bb..55497f8efc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,8 @@ testing =
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
 	pytest-cov
 	# python_implementation: workaround for jaraco/skeleton#22
-	pytest-mypy; python_implementation != "PyPy"
+	# python_version: workaround for python/typed_ast#156
+	pytest-mypy; python_implementation != "PyPy" and python_version < "3.10"
 	pytest-enabler
 
 	# local

From af5445115af0cb68e671a678538a0207389586be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Mar 2021 12:30:25 -0500
Subject: [PATCH 8425/8469] Bump minimums on pytest-checkdocs and
 pytest-enabler as found on Setuptools.

---
 setup.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 55497f8efc..3f6610be8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ exclude =
 testing =
 	# upstream
 	pytest >= 4.6
-	pytest-checkdocs >= 1.2.3
+	pytest-checkdocs >= 2.4
 	pytest-flake8
 	# python_implementation: workaround for jaraco/skeleton#22
 	pytest-black >= 0.3.7; python_implementation != "PyPy"
@@ -40,7 +40,7 @@ testing =
 	# python_implementation: workaround for jaraco/skeleton#22
 	# python_version: workaround for python/typed_ast#156
 	pytest-mypy; python_implementation != "PyPy" and python_version < "3.10"
-	pytest-enabler
+	pytest-enabler >= 1.0.1
 
 	# local
 

From 86efb884f805a9e1f64661ec758f3bd084fed515 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Mar 2021 12:53:54 -0500
Subject: [PATCH 8426/8469] Also deny black on Python 3.10 as workaround for
 python/typed_ast#156.

---
 setup.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 3f6610be8b..52876d55f6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,7 +35,8 @@ testing =
 	pytest-checkdocs >= 2.4
 	pytest-flake8
 	# python_implementation: workaround for jaraco/skeleton#22
-	pytest-black >= 0.3.7; python_implementation != "PyPy"
+	# python_version: workaround for python/typed_ast#156
+	pytest-black >= 0.3.7; python_implementation != "PyPy" and python_version < "3.10"
 	pytest-cov
 	# python_implementation: workaround for jaraco/skeleton#22
 	# python_version: workaround for python/typed_ast#156

From b2f7b8f92725c63b164d5776f85e67cc560def4e Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Mar 2021 13:37:29 -0500
Subject: [PATCH 8427/8469] Don't bother testing old versions of pip on Python
 3.10 and later. Fixes #2599.

---
 setuptools/tests/test_virtualenv.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index f13f7997e3..9cf6d30f7d 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -74,10 +74,15 @@ def mark(param, *marks):
     def skip_network(param):
         return param if network else mark(param, pytest.mark.skip(reason="no network"))
 
+    issue2599 = pytest.mark.skipif(
+        sys.version_info > (3, 10),
+        reason="pypa/setuptools#2599",
+    )
+
     network_versions = [
-        'pip==9.0.3',
-        'pip==10.0.1',
-        'pip==18.1',
+        mark('pip==9.0.3', issue2599),
+        mark('pip==10.0.1', issue2599),
+        mark('pip==18.1', issue2599),
         mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
         'pip==20.0.2',
         'https://github.com/pypa/pip/archive/master.zip',

From 938a33922c8cba3bbff6dfd1c2f723e5f929d6ce Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Mon, 8 Mar 2021 02:59:16 -0500
Subject: [PATCH 8428/8469] Reduce scope of dash deprecation warning to
 Setuptools and distutils

---
 setuptools/dist.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 70c0e6becb..d1587e3415 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -11,6 +11,7 @@
 import distutils.core
 import distutils.cmd
 import distutils.dist
+import distutils.command
 from distutils.util import strtobool
 from distutils.debug import DEBUG
 from distutils.fancy_getopt import translate_longopt
@@ -29,6 +30,7 @@
 from . import SetuptoolsDeprecationWarning
 
 import setuptools
+import setuptools.command
 from setuptools import windows_support
 from setuptools.monkey import get_unpatched
 from setuptools.config import parse_configuration
@@ -629,7 +631,13 @@ def dash_to_underscore_warning(self, opt, section):
             'options.extras_require', 'options.data_files',
         ):
             return opt
+
         underscore_opt = opt.replace('-', '_')
+        commands = distutils.command.__all__ + setuptools.command.__all__
+        if (not section.startswith('options') and section != 'metadata'
+                and section not in commands):
+            return underscore_opt
+
         if '-' in opt:
             warnings.warn(
                 "Usage of dash-separated '%s' will not be supported in future "

From 7129ad1107f7015fe16f275eec17bf36a8badd84 Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Mon, 8 Mar 2021 03:25:14 -0500
Subject: [PATCH 8429/8469] Fix formatting of tests and change dash deprecation
 method name

---
 setuptools/dist.py              |  4 ++--
 setuptools/tests/test_config.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d1587e3415..7cebcb37f4 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -600,7 +600,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
                         continue
 
                     val = parser.get(section, opt)
-                    opt = self.dash_to_underscore_warning(opt, section)
+                    opt = self.warn_dash_deprecation(opt, section)
                     opt = self.make_option_lowercase(opt, section)
                     opt_dict[opt] = (filename, val)
 
@@ -626,7 +626,7 @@ def _parse_config_files(self, filenames=None):  # noqa: C901
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
 
-    def dash_to_underscore_warning(self, opt, section):
+    def warn_dash_deprecation(self, opt, section):
         if section in (
             'options.extras_require', 'options.data_files',
         ):
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 1ff5ee4185..21f1becd49 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -507,10 +507,9 @@ def test_not_utf8(self, tmpdir):
             with get_dist(tmpdir):
                 pass
 
-    def test_dash_to_underscore_warning(self, tmpdir):
-        # dash_to_underscore_warning() is a method in setuptools.dist
-        # remove this test and method when dash convert to underscore in setup.cfg
-        # is no longer supported
+    def test_warn_dash_deprecation(self, tmpdir):
+        # warn_dash_deprecation() is a method in setuptools.dist
+        # remove this test and the method when no longer needed
         fake_env(
             tmpdir,
             '[metadata]\n'
@@ -523,11 +522,12 @@ def test_dash_to_underscore_warning(self, tmpdir):
         with pytest.warns(UserWarning, match=msg):
             with get_dist(tmpdir) as dist:
                 metadata = dist.metadata
-                assert metadata.author_email == 'test@test.com'
-                assert metadata.maintainer_email == 'foo@foo.com'
 
-    def test_uppercase_warning(self, tmpdir):
-        # remove this test and the method uppercase_warning() in setuptools.dist
+        assert metadata.author_email == 'test@test.com'
+        assert metadata.maintainer_email == 'foo@foo.com'
+
+    def test_make_option_lowercase(self, tmpdir):
+        # remove this test and the method make_option_lowercase() in setuptools.dist
         # when no longer needed
         fake_env(
             tmpdir,

From 214ba3de5cf8bf6cdff824059732eebd26f3d40c Mon Sep 17 00:00:00 2001
From: Melissa Li <li.melissa.kun@gmail.com>
Date: Mon, 8 Mar 2021 03:41:04 -0500
Subject: [PATCH 8430/8469] Add changelog

---
 changelog.d/2595.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/2595.misc.rst

diff --git a/changelog.d/2595.misc.rst b/changelog.d/2595.misc.rst
new file mode 100644
index 0000000000..976117dc9a
--- /dev/null
+++ b/changelog.d/2595.misc.rst
@@ -0,0 +1 @@
+Reduced scope of dash deprecation warning to Setuptools/distutils only -- by :user:`melissa-kun-li`
\ No newline at end of file

From e6fdc967a538c7c08768a4898317572a76de2f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 12 Feb 2021 09:55:57 +0100
Subject: [PATCH 8431/8469] Remove bdist_wininst

Fixes https://github.com/pypa/setuptools/issues/2558
---
 changelog.d/2566.breaking.rst               |  1 +
 setuptools/command/__init__.py              |  2 +-
 setuptools/command/bdist_wininst.py         | 30 ---------------------
 setuptools/command/install_scripts.py       |  3 ++-
 setuptools/tests/test_bdist_deprecations.py | 23 ----------------
 5 files changed, 4 insertions(+), 55 deletions(-)
 create mode 100644 changelog.d/2566.breaking.rst
 delete mode 100644 setuptools/command/bdist_wininst.py
 delete mode 100644 setuptools/tests/test_bdist_deprecations.py

diff --git a/changelog.d/2566.breaking.rst b/changelog.d/2566.breaking.rst
new file mode 100644
index 0000000000..e56945750b
--- /dev/null
+++ b/changelog.d/2566.breaking.rst
@@ -0,0 +1 @@
+Remove the deprecated ``bdist_wininst`` command. Binary packages should be built as wheels instead. -- by :user:`hroncok`
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
index 743f5588fa..570e69576e 100644
--- a/setuptools/command/__init__.py
+++ b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'bdist_wininst', 'upload_docs', 'build_clib', 'dist_info',
+    'upload_docs', 'build_clib', 'dist_info',
 ]
 
 from distutils.command.bdist import bdist
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
deleted file mode 100644
index ff4b634592..0000000000
--- a/setuptools/command/bdist_wininst.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import distutils.command.bdist_wininst as orig
-import warnings
-
-from setuptools import SetuptoolsDeprecationWarning
-
-
-class bdist_wininst(orig.bdist_wininst):
-    def reinitialize_command(self, command, reinit_subcommands=0):
-        """
-        Supplement reinitialize_command to work around
-        http://bugs.python.org/issue20819
-        """
-        cmd = self.distribution.reinitialize_command(
-            command, reinit_subcommands)
-        if command in ('install', 'install_lib'):
-            cmd.install_lib = None
-        return cmd
-
-    def run(self):
-        warnings.warn(
-            "bdist_wininst is deprecated and will be removed in a future "
-            "version. Use bdist_wheel (wheel packages) instead.",
-            SetuptoolsDeprecationWarning
-        )
-
-        self._is_running = True
-        try:
-            orig.bdist_wininst.run(self)
-        finally:
-            self._is_running = False
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index 8c9a15e2bb..9cd8eb0627 100644
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,5 +1,6 @@
 from distutils import log
 import distutils.command.install_scripts as orig
+from distutils.errors import DistutilsModuleError
 import os
 import sys
 
@@ -35,7 +36,7 @@ def run(self):
         try:
             bw_cmd = self.get_finalized_command("bdist_wininst")
             is_wininst = getattr(bw_cmd, '_is_running', False)
-        except ImportError:
+        except (ImportError, DistutilsModuleError):
             is_wininst = False
         writer = ei.ScriptWriter
         if is_wininst:
diff --git a/setuptools/tests/test_bdist_deprecations.py b/setuptools/tests/test_bdist_deprecations.py
deleted file mode 100644
index 704164aacb..0000000000
--- a/setuptools/tests/test_bdist_deprecations.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""develop tests
-"""
-import mock
-
-import pytest
-
-from setuptools.dist import Distribution
-from setuptools import SetuptoolsDeprecationWarning
-
-
-@mock.patch("distutils.command.bdist_wininst.bdist_wininst")
-def test_bdist_wininst_warning(distutils_cmd):
-    dist = Distribution(dict(
-        script_name='setup.py',
-        script_args=['bdist_wininst'],
-        name='foo',
-        py_modules=['hi'],
-    ))
-    dist.parse_command_line()
-    with pytest.warns(SetuptoolsDeprecationWarning):
-        dist.run_commands()
-
-    distutils_cmd.run.assert_called_once()

From 5d60ccefb48329b7cedfe6d78fc1cb95683104b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 12 Feb 2021 09:56:14 +0100
Subject: [PATCH 8432/8469] Filter out distutils deprecation warning until the
 situation is resolved

The distutils platform problems are likely to be resolved before the removal.
Once this happens, setuptools will no longer use distutils from the Python
standard library.
---
 _distutils_hack/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index c31edfed17..47ce24944b 100644
--- a/_distutils_hack/__init__.py
+++ b/_distutils_hack/__init__.py
@@ -8,6 +8,11 @@
 is_pypy = '__pypy__' in sys.builtin_module_names
 
 
+warnings.filterwarnings('ignore',
+                        '.+ distutils .+ deprecated',
+                        DeprecationWarning)
+
+
 def warn_distutils_present():
     if 'distutils' not in sys.modules:
         return

From 8230bbf82b07d25bcc65e612e0e936dce269e463 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 14 Mar 2021 11:08:14 -0400
Subject: [PATCH 8433/8469] =?UTF-8?q?Bump=20version:=2054.1.1=20=E2=86=92?=
 =?UTF-8?q?=2054.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg          | 2 +-
 CHANGES.rst               | 9 +++++++++
 changelog.d/2595.misc.rst | 1 -
 setup.cfg                 | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2595.misc.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1d2c227839..2c0c640ec0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.1.1
+current_version = 54.1.2
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index bedd1faa01..c8db71ee59 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v54.1.2
+-------
+
+
+Misc
+^^^^
+* #2595: Reduced scope of dash deprecation warning to Setuptools/distutils only -- by :user:`melissa-kun-li`
+
+
 v54.1.1
 -------
 
diff --git a/changelog.d/2595.misc.rst b/changelog.d/2595.misc.rst
deleted file mode 100644
index 976117dc9a..0000000000
--- a/changelog.d/2595.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Reduced scope of dash deprecation warning to Setuptools/distutils only -- by :user:`melissa-kun-li`
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 7da11a03ee..2c4cb02fbb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
 	LICENSE
 name = setuptools
-version = 54.1.1
+version = 54.1.2
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 7fe4ab8294a843622d20face7f9f6ccddb2d0a14 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 15 Mar 2021 18:31:04 -0400
Subject: [PATCH 8434/8469] Add leading */ to coverage.run.omit. Workaround for
 pytest-dev/pytest-cov#456.

---
 .coveragerc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.coveragerc b/.coveragerc
index 45823064a3..6a34e662d3 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,7 @@
 [run]
-omit = .tox/*
+omit =
+	# leading `*/` for pytest-dev/pytest-cov#456
+	*/.tox/*
 
 [report]
 show_missing = True

From 024b1e13b644cc9829d2a15cd5867920e11c9a9e Mon Sep 17 00:00:00 2001
From: layday <layday@protonmail.com>
Date: Tue, 16 Mar 2021 18:58:11 +0200
Subject: [PATCH 8435/8469] build_meta: produce informative error when a dist
 is not found

Previously, when `build_sdist` or `build_wheel` were unable
to build a distribution (and were therefore unable to find the
distribution file), they would throw a

    ValueError: not enough values to unpack (expected 1, got 0)

which did not offer any clues as to where the issue might lie.
---
 changelog.d/2608.change.rst         |  2 ++
 setuptools/build_meta.py            |  8 ++++++--
 setuptools/tests/test_build_meta.py | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/2608.change.rst

diff --git a/changelog.d/2608.change.rst b/changelog.d/2608.change.rst
new file mode 100644
index 0000000000..d469f15e2e
--- /dev/null
+++ b/changelog.d/2608.change.rst
@@ -0,0 +1,2 @@
+Added informative error message to PEP 517 build failures owing to
+an empty ``setup.py`` -- by :user:layday
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index b9e8a2b3fa..3c45db72fb 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -101,8 +101,12 @@ def _file_with_extension(directory, extension):
         f for f in os.listdir(directory)
         if f.endswith(extension)
     )
-    file, = matching
-    return file
+    try:
+        return next(matching)
+    except StopIteration:
+        raise ValueError('No distribution was found. The distribution was '
+                         'possibly not built. Ensure that your `setup.py` '
+                         'is not empty and that it calls `setup()`.')
 
 
 def _open_setup_script(setup_script):
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index f33a69688d..f776b09d71 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -3,6 +3,7 @@
 import tarfile
 import importlib
 from concurrent import futures
+import re
 
 import pytest
 from jaraco import path
@@ -442,6 +443,19 @@ def test_sys_argv_passthrough(self, tmpdir_cwd):
         with pytest.raises(AssertionError):
             build_backend.build_sdist("temp")
 
+    @pytest.mark.parametrize('build_hook', ('build_sdist', 'build_wheel'))
+    def test_build_with_empty_setuppy(self, build_backend, build_hook):
+        files = {'setup.py': ''}
+        path.build(files)
+
+        with pytest.raises(
+                ValueError,
+                match=re.escape(
+                    'No distribution was found. The distribution was '
+                    'possibly not built. Ensure that your `setup.py` '
+                    'is not empty and that it calls `setup()`.')):
+            getattr(build_backend, build_hook)("temp")
+
 
 class TestBuildMetaLegacyBackend(TestBuildMetaBackend):
     backend_name = 'setuptools.build_meta:__legacy__'

From 8f2cc7a1f6cfbfdd8fd07b92dc086b24f2d00e41 Mon Sep 17 00:00:00 2001
From: layday <layday@protonmail.com>
Date: Tue, 16 Mar 2021 19:10:19 +0200
Subject: [PATCH 8436/8469] fixup! build_meta: produce informative error when a
 dist is not found

---
 changelog.d/2608.change.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/2608.change.rst b/changelog.d/2608.change.rst
index d469f15e2e..f966649ae7 100644
--- a/changelog.d/2608.change.rst
+++ b/changelog.d/2608.change.rst
@@ -1,2 +1,2 @@
 Added informative error message to PEP 517 build failures owing to
-an empty ``setup.py`` -- by :user:layday
+an empty ``setup.py`` -- by :user:`layday`

From b4d8e4755eafc786a9848333ca73bff381747745 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 20 Mar 2021 21:19:49 -0400
Subject: [PATCH 8437/8469] Add test capturing missed expectation. Ref #2612.

---
 setuptools/tests/fixtures.py     | 14 ++++++++++++++
 setuptools/tests/test_develop.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index d74b5f031a..a5a172e0f9 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,6 +1,7 @@
 import contextlib
 import sys
 import shutil
+import subprocess
 
 import pytest
 
@@ -58,3 +59,16 @@ def workaround_xdist_376(request):
 
     with contextlib.suppress(ValueError):
         sys.path.remove('')
+
+
+@pytest.fixture
+def sample_project(tmp_path):
+    """
+    Clone the 'sampleproject' and return a path to it.
+    """
+    cmd = ['git', 'clone', 'https://github.com/pypa/sampleproject']
+    try:
+        subprocess.check_call(cmd, cwd=str(tmp_path))
+    except Exception:
+        pytest.skip("Unable to clone sampleproject")
+    return tmp_path / 'sampleproject'
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 2766da2f79..e793c36d9f 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -7,6 +7,7 @@
 import io
 import subprocess
 import platform
+import pathlib
 
 from setuptools.command import test
 
@@ -199,3 +200,32 @@ def test_namespace_package_importable(self, tmpdir):
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp)
+
+    @pytest.mark.xfail(reason="#2612")
+    def test_editable_prefix(self, tmp_path, sample_project):
+        """
+        Editable install to a prefix should be discoverable.
+        """
+        prefix = tmp_path / 'prefix'
+        prefix.mkdir()
+
+        cmd = [
+            sys.executable,
+            '-m', 'pip',
+            'install',
+            '-e', str(sample_project),
+            '--prefix', str(prefix),
+        ]
+        subprocess.check_call(cmd)
+
+        # now run 'sample' with the prefix on the PYTHONPATH
+        site_packages = prefix / next(
+            pathlib.Path(path).relative_to(sys.prefix)
+            for path in sys.path
+            if 'site-packages' in path
+            and path.startswith(sys.prefix)
+        )
+        env = dict(PYTHONPATH=site_packages)
+        bin = 'Scripts' if platform.system() == 'Windows' else 'bin'
+        sample = prefix / bin / 'sample'
+        subprocess.check_call([sample], env=env)

From cb962021c53b7130bf0a1792f75678efcc0724be Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Mar 2021 03:38:43 -0400
Subject: [PATCH 8438/8469] Illustrate how one might leverage sitecustomize.py
 to make a project available on PYTHONPATH. Fixes #2612.

---
 setuptools/tests/test_develop.py | 42 +++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index e793c36d9f..0dea40bd79 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -8,6 +8,7 @@
 import subprocess
 import platform
 import pathlib
+import textwrap
 
 from setuptools.command import test
 
@@ -201,7 +202,17 @@ def test_namespace_package_importable(self, tmpdir):
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp)
 
-    @pytest.mark.xfail(reason="#2612")
+    @staticmethod
+    def install_workaround(site_packages):
+        site_packages.mkdir(parents=True)
+        sc = site_packages / 'sitecustomize.py'
+        sc.write_text(textwrap.dedent("""
+            import site
+            import pathlib
+            here = pathlib.Path(__file__).parent
+            site.addsitedir(str(here))
+            """).lstrip())
+
     def test_editable_prefix(self, tmp_path, sample_project):
         """
         Editable install to a prefix should be discoverable.
@@ -209,23 +220,30 @@ def test_editable_prefix(self, tmp_path, sample_project):
         prefix = tmp_path / 'prefix'
         prefix.mkdir()
 
+        # figure out where pip will likely install the package
+        site_packages = prefix / next(
+            pathlib.Path(path).relative_to(sys.prefix)
+            for path in sys.path
+            if 'site-packages' in path
+            and path.startswith(sys.prefix)
+        )
+
+        # install the workaround
+        self.install_workaround(site_packages)
+
+        env = dict(PYTHONPATH=site_packages)
         cmd = [
             sys.executable,
             '-m', 'pip',
             'install',
-            '-e', str(sample_project),
+            '--editable',
+            str(sample_project),
             '--prefix', str(prefix),
+            '--no-build-isolation',
         ]
-        subprocess.check_call(cmd)
+        subprocess.check_call(cmd, env=env)
 
         # now run 'sample' with the prefix on the PYTHONPATH
-        site_packages = prefix / next(
-            pathlib.Path(path).relative_to(sys.prefix)
-            for path in sys.path
-            if 'site-packages' in path
-            and path.startswith(sys.prefix)
-        )
-        env = dict(PYTHONPATH=site_packages)
         bin = 'Scripts' if platform.system() == 'Windows' else 'bin'
-        sample = prefix / bin / 'sample'
-        subprocess.check_call([sample], env=env)
+        exe = prefix / bin / 'sample'
+        subprocess.check_call([exe], env=env)

From 0c485af05591ba869b8adb96802d1cf4b49fe28d Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Mar 2021 04:03:10 -0400
Subject: [PATCH 8439/8469] Cast values to str and retain other environ vars
 for Windows' sake

---
 setuptools/tests/test_develop.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 0dea40bd79..a0e84b9a28 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -231,7 +231,7 @@ def test_editable_prefix(self, tmp_path, sample_project):
         # install the workaround
         self.install_workaround(site_packages)
 
-        env = dict(PYTHONPATH=site_packages)
+        env = dict(os.environ, PYTHONPATH=str(site_packages))
         cmd = [
             sys.executable,
             '-m', 'pip',
@@ -246,4 +246,6 @@ def test_editable_prefix(self, tmp_path, sample_project):
         # now run 'sample' with the prefix on the PYTHONPATH
         bin = 'Scripts' if platform.system() == 'Windows' else 'bin'
         exe = prefix / bin / 'sample'
+        if sys.version_info < (3, 7) and platform.system() == 'Windows':
+            exe = str(exe)
         subprocess.check_call([exe], env=env)

From 202c7a808e61a415d6a8c724a5d8fe664301863b Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 21 Mar 2021 09:51:21 -0400
Subject: [PATCH 8440/8469] Expect failure on PyPy.

---
 setuptools/tests/test_develop.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index a0e84b9a28..df8db4e281 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -213,6 +213,10 @@ def install_workaround(site_packages):
             site.addsitedir(str(here))
             """).lstrip())
 
+    @pytest.mark.xfail(
+        platform.python_implementation() == 'PyPy',
+        reason="Workaround fails on PyPy (why?)",
+    )
     def test_editable_prefix(self, tmp_path, sample_project):
         """
         Editable install to a prefix should be discoverable.

From f3ba2139eacd5d27d052f0659b5d7dc1413977b0 Mon Sep 17 00:00:00 2001
From: layday <layday@protonmail.com>
Date: Sun, 21 Mar 2021 19:36:14 +0200
Subject: [PATCH 8441/8469] fixup! fixup! build_meta: produce informative error
 when a dist is not found

---
 setuptools/build_meta.py            | 6 +++---
 setuptools/tests/test_build_meta.py | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 3c45db72fb..36fbc9e8a1 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -104,9 +104,9 @@ def _file_with_extension(directory, extension):
     try:
         return next(matching)
     except StopIteration:
-        raise ValueError('No distribution was found. The distribution was '
-                         'possibly not built. Ensure that your `setup.py` '
-                         'is not empty and that it calls `setup()`.')
+        raise ValueError(
+            'No distribution was found. Ensure that `setup.py` '
+            'is not empty and that it calls `setup()`.')
 
 
 def _open_setup_script(setup_script):
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index f776b09d71..ab75a1896c 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -450,10 +450,7 @@ def test_build_with_empty_setuppy(self, build_backend, build_hook):
 
         with pytest.raises(
                 ValueError,
-                match=re.escape(
-                    'No distribution was found. The distribution was '
-                    'possibly not built. Ensure that your `setup.py` '
-                    'is not empty and that it calls `setup()`.')):
+                match=re.escape('No distribution was found.')):
             getattr(build_backend, build_hook)("temp")
 
 

From 2cec54e4f451d6318ad9fc18213d0f8f7d4aa669 Mon Sep 17 00:00:00 2001
From: layday <layday@protonmail.com>
Date: Sun, 21 Mar 2021 22:00:29 +0200
Subject: [PATCH 8442/8469] fixup! build_meta: produce informative error when a
 dist is not found

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

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index 36fbc9e8a1..de85685445 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -102,11 +102,13 @@ def _file_with_extension(directory, extension):
         if f.endswith(extension)
     )
     try:
-        return next(matching)
-    except StopIteration:
+        file, = matching
+    except ValueError:
         raise ValueError(
             'No distribution was found. Ensure that `setup.py` '
             'is not empty and that it calls `setup()`.')
+    else:
+        return file
 
 
 def _open_setup_script(setup_script):

From 99a9891ec20550421453ae60ebef5c8422f70e4c Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Mar 2021 08:43:19 -0400
Subject: [PATCH 8443/8469] =?UTF-8?q?Bump=20version:=2054.1.2=20=E2=86=92?=
 =?UTF-8?q?=2054.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg | 2 +-
 CHANGES.rst      | 6 ++++++
 setup.cfg        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2c0c640ec0..89f47f621d 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.1.2
+current_version = 54.1.3
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index c8db71ee59..8612991a41 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v54.1.3
+-------
+
+No significant changes.
+
+
 v54.1.2
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 2c4cb02fbb..b3e5bb8adf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
 	LICENSE
 name = setuptools
-version = 54.1.2
+version = 54.1.3
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From e0655f6459c8ba7ee8a0befbaf55c0e89d25512a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Mar 2021 08:44:55 -0400
Subject: [PATCH 8444/8469] Remove superfluous else.

---
 setuptools/build_meta.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index de85685445..9dfb2f24b5 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -107,8 +107,7 @@ def _file_with_extension(directory, extension):
         raise ValueError(
             'No distribution was found. Ensure that `setup.py` '
             'is not empty and that it calls `setup()`.')
-    else:
-        return file
+    return file
 
 
 def _open_setup_script(setup_script):

From e0dc5bd639dcade02605aa901f5e43e4f027c484 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Mar 2021 08:46:01 -0400
Subject: [PATCH 8445/8469] =?UTF-8?q?Bump=20version:=2054.1.3=20=E2=86=92?=
 =?UTF-8?q?=2054.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg            |  2 +-
 CHANGES.rst                 | 10 ++++++++++
 changelog.d/2608.change.rst |  2 --
 setup.cfg                   |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/2608.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 89f47f621d..fdde71809e 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.1.3
+current_version = 54.2.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 8612991a41..dca490b75b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v54.2.0
+-------
+
+
+Changes
+^^^^^^^
+* #2608: Added informative error message to PEP 517 build failures owing to
+  an empty ``setup.py`` -- by :user:`layday`
+
+
 v54.1.3
 -------
 
diff --git a/changelog.d/2608.change.rst b/changelog.d/2608.change.rst
deleted file mode 100644
index f966649ae7..0000000000
--- a/changelog.d/2608.change.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added informative error message to PEP 517 build failures owing to
-an empty ``setup.py`` -- by :user:`layday`
diff --git a/setup.cfg b/setup.cfg
index b3e5bb8adf..1b0e618807 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
 	LICENSE
 name = setuptools
-version = 54.1.3
+version = 54.2.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 4b1568c71b5299b39a5579bb778c8930991448b8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Mon, 22 Mar 2021 19:58:47 -0400
Subject: [PATCH 8446/8469] Tidelift no longer requires or expects publishing
 release notes.

---
 tox.ini | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 tox.ini

diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 35053514de..0000000000
--- a/tox.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[testenv:release]
-deps =
-	jaraco.tidelift
-passenv =
-	TIDELIFT_TOKEN
-commands =
-	python -m jaraco.tidelift.publish-release-notes

From 842eb1423ba76dadbf568f9b0abf04a233711529 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 23 Mar 2021 18:52:10 -0400
Subject: [PATCH 8447/8469] Remove Tidelift from main.yml, no longer needed

---
 .github/workflows/main.yml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 01999cabbf..0000000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-jobs:
-  release:
-    steps:
-      - name: Release
-        env:
-          TIDELIFT_TOKEN: ${{ secrets.TIDELIFT_TOKEN }}

From adae68e251a4418f348ff501261487c06666ebc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= <juergen.gmach@googlemail.com>
Date: Wed, 24 Mar 2021 16:42:20 +0100
Subject: [PATCH 8448/8469] remove duplicate word

---
 setuptools/command/easy_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 0917804f41..45adb6a1ea 100644
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2193,7 +2193,7 @@ def _get_script_args(cls, type_, name, header, script_text):
     @classmethod
     def _adjust_header(cls, type_, orig_header):
         """
-        Make sure 'pythonw' is used for gui and and 'python' is used for
+        Make sure 'pythonw' is used for gui and 'python' is used for
         console (regardless of what sys.executable is).
         """
         pattern = 'pythonw.exe'

From 0ffe795dbf920da44db9744759e38b92dad7f9e4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Mar 2021 15:22:04 -0400
Subject: [PATCH 8449/8469] Pin to upstream main branch for sphinx-inline-tabs.
 Workaround for #2614.

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 0292759301..bf408839e8 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -3,6 +3,6 @@ sphinx
 jaraco.packaging>=6.1
 rst.linker>=1.9
 pygments-github-lexers==0.0.5
-sphinx-inline-tabs
+sphinx-inline-tabs@git+https://github.com/pradyunsg/sphinx-inline-tabs@main
 
 setuptools>=34

From 3d660e49a4d1a1b7fb8fca725b17958a9e16c5c4 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Mar 2021 16:50:43 -0400
Subject: [PATCH 8450/8469] Reset RTD config to match skeleton and rely on
 package metadata for docs build requirements.

---
 .readthedocs.yml      | 4 +++-
 docs/requirements.txt | 8 --------
 setup.cfg             | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 850d79c4a1..cc698548db 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,4 +1,6 @@
 version: 2
 python:
   install:
-  - requirements: docs/requirements.txt
+  - path: .
+    extra_requirements:
+      - docs
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index bf408839e8..0000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# keep these in sync with setup.cfg
-sphinx
-jaraco.packaging>=6.1
-rst.linker>=1.9
-pygments-github-lexers==0.0.5
-sphinx-inline-tabs@git+https://github.com/pradyunsg/sphinx-inline-tabs@main
-
-setuptools>=34
diff --git a/setup.cfg b/setup.cfg
index 1b0e618807..05ddf01dae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -72,10 +72,10 @@ docs =
 	sphinx
 	jaraco.packaging >= 8.2
 	rst.linker >= 1.9
-	sphinx-inline-tabs
 
 	# local
 	pygments-github-lexers==0.0.5
+	sphinx-inline-tabs@git+https://github.com/pradyunsg/sphinx-inline-tabs@main
 
 ssl =
 	wincertstore==0.2; sys_platform=='win32'

From b5eadccc4d51363fac26d6fd7093db1fd83b8ccd Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 27 Mar 2021 17:04:18 -0400
Subject: [PATCH 8451/8469] Remove latent comment. Meant for previous commit.

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 05ddf01dae..b8805d93fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,7 +67,6 @@ testing =
 	jaraco.path>=3.2.0
 
 docs =
-	# Keep these in sync with docs/requirements.txt
 	# upstream
 	sphinx
 	jaraco.packaging >= 8.2

From 63789e80d9d3c680f8b5ba63f21fae4644c4ea16 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 28 Mar 2021 15:40:24 +0200
Subject: [PATCH 8452/8469] Tests - Fix url for pip download

---
 setuptools/tests/test_virtualenv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 9cf6d30f7d..399dbaf0bb 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -85,7 +85,7 @@ def skip_network(param):
         mark('pip==18.1', issue2599),
         mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
         'pip==20.0.2',
-        'https://github.com/pypa/pip/archive/master.zip',
+        'https://github.com/pypa/pip/archive/main.zip',
     ]
 
     versions = itertools.chain(

From a80e8868d336f04648c82dde85714949b8cab17f Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Sun, 28 Mar 2021 16:09:06 +0200
Subject: [PATCH 8453/8469] Use sphinx-inline-tabs from PyPI

Fixes #2614
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index b8805d93fb..7673fceb57 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -74,7 +74,7 @@ docs =
 
 	# local
 	pygments-github-lexers==0.0.5
-	sphinx-inline-tabs@git+https://github.com/pradyunsg/sphinx-inline-tabs@main
+	sphinx-inline-tabs
 
 ssl =
 	wincertstore==0.2; sys_platform=='win32'

From c0b90dba0326d637ec44d2b67cb0fadcead1c640 Mon Sep 17 00:00:00 2001
From: Zack Didcott <66186954+Zedeldi@users.noreply.github.com>
Date: Mon, 29 Mar 2021 00:26:32 +0000
Subject: [PATCH 8454/8469] Update dependency_management.rst

Fix spelling and grammar
---
 docs/userguide/dependency_management.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/userguide/dependency_management.rst b/docs/userguide/dependency_management.rst
index 6108d9b2e9..188083e0fb 100644
--- a/docs/userguide/dependency_management.rst
+++ b/docs/userguide/dependency_management.rst
@@ -3,7 +3,7 @@ Dependencies Management in Setuptools
 =====================================
 
 There are three types of dependency styles offered by setuptools:
-1) build system requirement, required dependency and 3) optional
+1) build system requirement, 2) required dependency and 3) optional
 dependency.
 
 .. Note::
@@ -19,8 +19,8 @@ Build system requirement
 Package requirement
 -------------------
 After organizing all the scripts and files and getting ready for packaging,
-there needs to be a way to tell Python what programs it need to actually
-do the packgaging (in our case, ``setuptools`` of course). Usually,
+there needs to be a way to tell Python what programs it needs to actually
+do the packaging (in our case, ``setuptools`` of course). Usually,
 you also need the ``wheel`` package as well since it is recommended that you
 upload a ``.whl`` file to PyPI alongside your ``.tar.gz`` file. Unlike the
 other two types of dependency keyword, this one is specified in your
@@ -47,7 +47,7 @@ Declaring required dependency
 This is where a package declares its core dependencies, without which it won't
 be able to run. ``setuptools`` support automatically download and install
 these dependencies when the package is installed. Although there is more
-finess to it, let's start with a simple example.
+finesse to it, let's start with a simple example.
 
 .. tab:: setup.cfg
 

From 07d5e663650f594288dda1c92f2cda010a2a899b Mon Sep 17 00:00:00 2001
From: "T. Wouters" <thomas@python.org>
Date: Mon, 29 Mar 2021 15:02:41 +0200
Subject: [PATCH 8455/8469] Fix typo in setup.py example in quickstart guide.

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 7f111dd575..4ee5909851 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -62,7 +62,7 @@ the minimum
         from setuptools import setup
 
         setup(
-            name='mypackage"'
+            name='mypackage'
             version='0.0.1',
             packages=['mypackage'],
             install_requires=[

From c91153a1bf73ceb65efd611603edf638a996f720 Mon Sep 17 00:00:00 2001
From: "T. Wouters" <thomas@python.org>
Date: Mon, 29 Mar 2021 15:10:26 +0200
Subject: [PATCH 8456/8469] Update quickstart.rst

---
 docs/userguide/quickstart.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/quickstart.rst b/docs/userguide/quickstart.rst
index 4ee5909851..2807f59bee 100644
--- a/docs/userguide/quickstart.rst
+++ b/docs/userguide/quickstart.rst
@@ -62,7 +62,7 @@ the minimum
         from setuptools import setup
 
         setup(
-            name='mypackage'
+            name='mypackage',
             version='0.0.1',
             packages=['mypackage'],
             install_requires=[

From 6dffcbe97d556809788afb8bed66ac4860c0d939 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Mar 2021 22:00:07 -0400
Subject: [PATCH 8457/8469] Section for 'find' and 'find_namespace' options is
 'options.packages.find'. Fixes #2406.

---
 docs/userguide/package_discovery.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst
index 842ade828d..0a8070ae43 100644
--- a/docs/userguide/package_discovery.rst
+++ b/docs/userguide/package_discovery.rst
@@ -156,7 +156,7 @@ to use ``find_namespace:``:
         =src
     packages = find_namespace:
 
-    [options.packages.find_namespace]
+    [options.packages.find]
     where = src
 
 When you install the zipped distribution, ``timmins.foo`` would become

From 30cf7823c7acd8ba5503ed3fdc7dc9cb28800880 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 30 Mar 2021 22:02:15 -0400
Subject: [PATCH 8458/8469] =?UTF-8?q?Bump=20version:=2054.2.0=20=E2=86=92?=
 =?UTF-8?q?=2055.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg              | 2 +-
 CHANGES.rst                   | 9 +++++++++
 changelog.d/2566.breaking.rst | 1 -
 setup.cfg                     | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/2566.breaking.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index fdde71809e..7fe611a698 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 54.2.0
+current_version = 55.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index dca490b75b..d073fa8ef3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v55.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2566: Remove the deprecated ``bdist_wininst`` command. Binary packages should be built as wheels instead. -- by :user:`hroncok`
+
+
 v54.2.0
 -------
 
diff --git a/changelog.d/2566.breaking.rst b/changelog.d/2566.breaking.rst
deleted file mode 100644
index e56945750b..0000000000
--- a/changelog.d/2566.breaking.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove the deprecated ``bdist_wininst`` command. Binary packages should be built as wheels instead. -- by :user:`hroncok`
diff --git a/setup.cfg b/setup.cfg
index 7673fceb57..6bb6508f8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
 	LICENSE
 name = setuptools
-version = 54.2.0
+version = 55.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

From 8fe85c22cee7fde5e6af571b30f864bad156a010 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 3 Apr 2021 13:13:28 -0400
Subject: [PATCH 8459/8469] Officially declare pkg_resources as deprecated.
 Closes #2531.

---
 docs/pkg_resources.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/pkg_resources.rst b/docs/pkg_resources.rst
index 19d43244d1..994bea6f2b 100644
--- a/docs/pkg_resources.rst
+++ b/docs/pkg_resources.rst
@@ -10,6 +10,13 @@ eggs, support for merging packages that have separately-distributed modules or
 subpackages, and APIs for managing Python's current "working set" of active
 packages.
 
+Use of ``pkg_resources`` is discouraged in favor of
+`importlib.resources <https://docs.python.org/3/library/importlib.html#module-importlib.resources>`_,
+`importlib.metadata <https://docs.python.org/3/library/importlib.metadata.html>`_,
+and their backports (`resources <https://pypi.org/project/importlib_resources>`_,
+`metadata <https://pypi.org/project/importlib_metadata>`_).
+Please consider using those libraries instead of pkg_resources.
+
 
 .. contents:: **Table of Contents**
 

From 749b97499ea36d9a7660ed73db622837ae64c57d Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 28 Mar 2021 13:37:48 +0200
Subject: [PATCH 8460/8469] license_files - Add support for glob patterns + add
 default patterns

---
 setuptools/command/sdist.py       | 53 +++++++++++++++++++------------
 setuptools/tests/test_egg_info.py |  4 +--
 setuptools/tests/test_manifest.py |  1 +
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 887b7efa05..cd308ab9dd 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,6 +4,8 @@
 import sys
 import io
 import contextlib
+import warnings
+from glob import iglob
 
 from setuptools.extern import ordered_set
 
@@ -194,29 +196,38 @@ def check_license(self):
         """Checks if license_file' or 'license_files' is configured and adds any
         valid paths to 'self.filelist'.
         """
-
-        files = ordered_set.OrderedSet()
-
         opts = self.distribution.get_option_dict('metadata')
 
-        # ignore the source of the value
-        _, license_file = opts.get('license_file', (None, None))
-
-        if license_file is None:
-            log.debug("'license_file' option was not specified")
-        else:
-            files.add(license_file)
-
+        files = ordered_set.OrderedSet()
         try:
-            files.update(self.distribution.metadata.license_files)
+            license_files = self.distribution.metadata.license_files
         except TypeError:
             log.warn("warning: 'license_files' option is malformed")
-
-        for f in files:
-            if not os.path.exists(f):
-                log.warn(
-                    "warning: Failed to find the configured license file '%s'",
-                    f)
-                files.remove(f)
-
-        self.filelist.extend(files)
+            license_files = ordered_set.OrderedSet()
+        patterns = license_files if isinstance(license_files, ordered_set.OrderedSet) \
+            else ordered_set.OrderedSet(license_files)
+
+        if 'license_file' in opts:
+            warnings.warn(
+                "The 'license_file' option is deprecated. Use 'license_files' instead.",
+                DeprecationWarning)
+            patterns.append(opts['license_file'][1])
+
+        if 'license_file' not in opts and 'license_files' not in opts:
+            patterns = ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*')
+
+        for pattern in patterns:
+            for path in iglob(pattern):
+                if path.endswith('~'):
+                    log.debug(
+                        "ignoring license file '%s' as it looks like a backup",
+                        path)
+                    continue
+
+                if path not in files and os.path.isfile(path):
+                    log.info(
+                        "adding license file '%s' (matched pattern '%s')",
+                        path, pattern)
+                    files.add(path)
+
+        self.filelist.extend(sorted(files))
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index bf95b03ce6..4915c0cb40 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -537,7 +537,7 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
             'setup.cfg': DALS("""
                               """),
             'LICENSE': "Test license"
-        }, False),  # no license_file attribute
+        }, True),  # no license_file attribute, LICENSE auto-included
         ({
             'setup.cfg': DALS("""
                               [metadata]
@@ -625,7 +625,7 @@ def test_setup_cfg_license_file(
             'setup.cfg': DALS("""
                               """),
             'LICENSE': "Test license"
-        }, [], ['LICENSE']),  # no license_files attribute
+        }, ['LICENSE'], []),  # no license_files attribute, LICENSE auto-included
         ({
             'setup.cfg': DALS("""
                               [metadata]
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 82bdb9c643..589cefb2c0 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -55,6 +55,7 @@ def touch(filename):
 default_files = frozenset(map(make_local_path, [
     'README.rst',
     'MANIFEST.in',
+    'LICENSE',
     'setup.py',
     'app.egg-info/PKG-INFO',
     'app.egg-info/SOURCES.txt',

From 91e7956d961ef84080c30eb5253c220fa3b001dc Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 28 Mar 2021 13:39:35 +0200
Subject: [PATCH 8461/8469] Add documentation + changelog entries

---
 changelog.d/2620.breaking.rst         |  5 +++++
 changelog.d/2620.change.rst           |  1 +
 changelog.d/2620.deprecation.rst      |  2 ++
 changelog.d/2620.doc.rst              |  1 +
 docs/references/keywords.rst          | 12 ++++++++++++
 docs/userguide/declarative_config.rst |  2 +-
 6 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2620.breaking.rst
 create mode 100644 changelog.d/2620.change.rst
 create mode 100644 changelog.d/2620.deprecation.rst
 create mode 100644 changelog.d/2620.doc.rst

diff --git a/changelog.d/2620.breaking.rst b/changelog.d/2620.breaking.rst
new file mode 100644
index 0000000000..de91facc57
--- /dev/null
+++ b/changelog.d/2620.breaking.rst
@@ -0,0 +1,5 @@
+If neither ``license_file`` nor ``license_files`` is specified, the ``sdist``
+option will now auto-include files that match the following patterns:
+``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS*``.
+This matches the behavior of ``bdist_wheel``.
+Any ``exclude`` in ``MANIFEST.in`` will overwrite it. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.change.rst b/changelog.d/2620.change.rst
new file mode 100644
index 0000000000..5470592d17
--- /dev/null
+++ b/changelog.d/2620.change.rst
@@ -0,0 +1 @@
+The ``license_file`` and ``license_files`` options now support glob patterns. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.deprecation.rst b/changelog.d/2620.deprecation.rst
new file mode 100644
index 0000000000..1af5f2461a
--- /dev/null
+++ b/changelog.d/2620.deprecation.rst
@@ -0,0 +1,2 @@
+The ``license_file`` option is now marked as deprecated.
+Use ``license_files`` instead. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.doc.rst b/changelog.d/2620.doc.rst
new file mode 100644
index 0000000000..7564adaca4
--- /dev/null
+++ b/changelog.d/2620.doc.rst
@@ -0,0 +1 @@
+Added documentation for the ``license_files`` option. -- by :user:`cdce8p`
diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst
index 03ce9fa23a..6485437b84 100644
--- a/docs/references/keywords.rst
+++ b/docs/references/keywords.rst
@@ -76,6 +76,18 @@ Keywords
 ``license``
     A string specifying the license of the package.
 
+``license_file``
+
+    .. warning::
+        ``license_file`` is deprecated. Use ``license_files`` instead.
+
+``license_files``
+
+    A list of glob patterns for license related files that should be included.
+    If neither ``license_file`` nor ``license_files`` is specified, this option
+    defaults to ``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, and ``AUTHORS*``.
+    Any ``exclude`` specified in ``MANIFEST.in`` will overwrite it.
+
 ``keywords``
     A list of strings or a comma-separated string providing descriptive
     meta-data. See: `PEP 0314`_.
diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index f2e8b81f75..7c97ca1cfa 100644
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -184,7 +184,7 @@ maintainer_email                maintainer-email   str
 classifiers                     classifier         file:, list-comma
 license                                            str
 license_file                                       str
-license_files                                      list-comma
+license_files                                      list-comma         42.0.0
 description                     summary            file:, str
 long_description                long-description   file:, str
 long_description_content_type                      str                38.6.0

From 1da769c049093b6492b63422272f56b6e95df39d Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 28 Mar 2021 14:32:52 +0200
Subject: [PATCH 8462/8469] Additional test cases

---
 setuptools/tests/test_egg_info.py | 65 +++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4915c0cb40..4751d1b553 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -545,7 +545,15 @@ def test_doesnt_provides_extra(self, tmpdir_cwd, env):
                               """),
             'MANIFEST.in': "exclude LICENSE",
             'LICENSE': "Test license"
-        }, False)  # license file is manually excluded
+        }, False),  # license file is manually excluded
+        pytest.param({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICEN[CS]E*
+                              """),
+            'LICENSE': "Test license",
+            }, True,
+            id="glob_pattern"),
     ])
     def test_setup_cfg_license_file(
             self, tmpdir_cwd, env, files, license_in_sources):
@@ -644,7 +652,37 @@ def test_setup_cfg_license_file(
             'MANIFEST.in': "exclude LICENSE-XYZ",
             'LICENSE-ABC': "ABC license",
             'LICENSE-XYZ': "XYZ license"
-        }, ['LICENSE-ABC'], ['LICENSE-XYZ'])  # subset is manually excluded
+        }, ['LICENSE-ABC'], ['LICENSE-XYZ']),  # subset is manually excluded
+        pytest.param({
+            'setup.cfg': DALS("""
+                              """),
+            'LICENSE-ABC': "ABC license",
+            'COPYING-ABC': "ABC copying",
+            'NOTICE-ABC': "ABC notice",
+            'AUTHORS-ABC': "ABC authors",
+            'LICENCE-XYZ': "XYZ license",
+            'LICENSE': "License",
+            'INVALID-LICENSE': "Invalid license",
+            }, [
+            'LICENSE-ABC',
+            'COPYING-ABC',
+            'NOTICE-ABC',
+            'AUTHORS-ABC',
+            'LICENCE-XYZ',
+            'LICENSE',
+            ], ['INVALID-LICENSE'],
+            # ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*')
+            id="default_glob_patterns"),
+        pytest.param({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_files =
+                                  LICENSE*
+                              """),
+            'LICENSE-ABC': "ABC license",
+            'NOTICE-XYZ': "XYZ notice",
+            }, ['LICENSE-ABC'], ['NOTICE-XYZ'],
+            id="no_default_glob_patterns"),
     ])
     def test_setup_cfg_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):
@@ -749,7 +787,28 @@ def test_setup_cfg_license_files(
             'LICENSE-PQR': "PQR license",
             'LICENSE-XYZ': "XYZ license"
             # manually excluded
-        }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR'])
+        }, ['LICENSE-XYZ'], ['LICENSE-ABC', 'LICENSE-PQR']),
+        pytest.param({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE*
+                              """),
+            'LICENSE-ABC': "ABC license",
+            'NOTICE-XYZ': "XYZ notice",
+            }, ['LICENSE-ABC'], ['NOTICE-XYZ'],
+            id="no_default_glob_patterns"),
+        pytest.param({
+            'setup.cfg': DALS("""
+                              [metadata]
+                              license_file = LICENSE*
+                              license_files =
+                                NOTICE*
+                              """),
+            'LICENSE-ABC': "ABC license",
+            'NOTICE-ABC': "ABC notice",
+            'AUTHORS-ABC': "ABC authors",
+            }, ['LICENSE-ABC', 'NOTICE-ABC'], ['AUTHORS-ABC'],
+            id="combined_glob_patterrns"),
     ])
     def test_setup_cfg_license_file_license_files(
             self, tmpdir_cwd, env, files, incl_licenses, excl_licenses):

From 0f34639e5aa630b8cbe32af9cfe8dfec7be890e7 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sun, 28 Mar 2021 17:34:01 +0200
Subject: [PATCH 8463/8469] Change deprecation warning

---
 setuptools/command/sdist.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index cd308ab9dd..278b8ce0b6 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,7 +4,6 @@
 import sys
 import io
 import contextlib
-import warnings
 from glob import iglob
 
 from setuptools.extern import ordered_set
@@ -208,9 +207,9 @@ def check_license(self):
             else ordered_set.OrderedSet(license_files)
 
         if 'license_file' in opts:
-            warnings.warn(
-                "The 'license_file' option is deprecated. Use 'license_files' instead.",
-                DeprecationWarning)
+            log.warn(
+                "warning: the 'license_file' option is deprecated, "
+                "use 'license_files' instead")
             patterns.append(opts['license_file'][1])
 
         if 'license_file' not in opts and 'license_files' not in opts:

From 608c376e86326c879dd52b56660b2247a3ca854e Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:34:00 +0200
Subject: [PATCH 8464/8469] Small changes

---
 changelog.d/2620.breaking.rst     | 3 +--
 docs/references/keywords.rst      | 1 -
 setuptools/command/sdist.py       | 3 +++
 setuptools/tests/test_egg_info.py | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog.d/2620.breaking.rst b/changelog.d/2620.breaking.rst
index de91facc57..431e7105d9 100644
--- a/changelog.d/2620.breaking.rst
+++ b/changelog.d/2620.breaking.rst
@@ -1,5 +1,4 @@
 If neither ``license_file`` nor ``license_files`` is specified, the ``sdist``
 option will now auto-include files that match the following patterns:
 ``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS*``.
-This matches the behavior of ``bdist_wheel``.
-Any ``exclude`` in ``MANIFEST.in`` will overwrite it. -- by :user:`cdce8p`
+This matches the behavior of ``bdist_wheel``. -- by :user:`cdce8p`
diff --git a/docs/references/keywords.rst b/docs/references/keywords.rst
index 6485437b84..619b2d1493 100644
--- a/docs/references/keywords.rst
+++ b/docs/references/keywords.rst
@@ -86,7 +86,6 @@ Keywords
     A list of glob patterns for license related files that should be included.
     If neither ``license_file`` nor ``license_files`` is specified, this option
     defaults to ``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, and ``AUTHORS*``.
-    Any ``exclude`` specified in ``MANIFEST.in`` will overwrite it.
 
 ``keywords``
     A list of strings or a comma-separated string providing descriptive
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 278b8ce0b6..a6ea814a30 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -213,6 +213,9 @@ def check_license(self):
             patterns.append(opts['license_file'][1])
 
         if 'license_file' not in opts and 'license_files' not in opts:
+            # Default patterns match the ones wheel uses
+            # See https://wheel.readthedocs.io/en/stable/user_guide.html
+            # -> 'Including license files in the generated wheel file'
             patterns = ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*')
 
         for pattern in patterns:
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4751d1b553..80d3577424 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -654,8 +654,7 @@ def test_setup_cfg_license_file(
             'LICENSE-XYZ': "XYZ license"
         }, ['LICENSE-ABC'], ['LICENSE-XYZ']),  # subset is manually excluded
         pytest.param({
-            'setup.cfg': DALS("""
-                              """),
+            'setup.cfg': "",
             'LICENSE-ABC': "ABC license",
             'COPYING-ABC': "ABC copying",
             'NOTICE-ABC': "ABC notice",

From c5185cd00cc3a96bad4cf5bca3968af710916d3a Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 8 Apr 2021 20:34:05 +0200
Subject: [PATCH 8465/8469] Add a change note for PR #2633

---
 changelog.d/2632.change.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog.d/2632.change.rst

diff --git a/changelog.d/2632.change.rst b/changelog.d/2632.change.rst
new file mode 100644
index 0000000000..a13bfdfa70
--- /dev/null
+++ b/changelog.d/2632.change.rst
@@ -0,0 +1,3 @@
+Implemented ``VendorImporter.find_spec()`` method to get rid
+of ``ImportWarning`` that Python 3.10 emits when only the old-style
+importer hooks are present -- by :user:`webknjaz`

From c826dffc2fd99de0431ee2a8b483868ab54e9cdc Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 8 Apr 2021 19:58:24 +0200
Subject: [PATCH 8466/8469] Implement `find_spec` in vendored module importers

This change makes the import warning emitted by Python 3.10 disappear
but implementing the hook that is supposed to replace the old import
mechanism.

Refs:
* https://bugs.python.org/issue42134
* https://bugs.python.org/issue43540
* https://github.com/pypa/setuptools/issues/2632#issuecomment-815701078

Fixes #2632

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
---
 pkg_resources/extern/__init__.py | 21 +++++++++++++++------
 setuptools/extern/__init__.py    | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 1fbb4fcc89..c45f58e2ac 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -1,3 +1,4 @@
+import importlib.machinery
 import sys
 
 
@@ -20,17 +21,18 @@ def search_path(self):
         yield self.vendor_pkg + '.'
         yield ''
 
+    def _module_matches_namespace(self, fullname):
+        """Figure out if the target module is vendored."""
+        root, base, target = fullname.partition(self.root_name + '.')
+        return not root and any(map(target.startswith, self.vendored_names))
+
     def find_module(self, fullname, path=None):
         """
         Return self when fullname starts with root_name and the
         target module is one vendored through this importer.
         """
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
+        spec = self.find_spec(fullname, path)
+        return spec.loader if spec is not None else None
 
     def load_module(self, fullname):
         """
@@ -60,6 +62,13 @@ def create_module(self, spec):
     def exec_module(self, module):
         pass
 
+    def find_spec(self, fullname, path=None, target=None):
+        """Return a module spec for vendored names."""
+        return (
+            importlib.machinery.ModuleSpec(fullname, self)
+            if self._module_matches_namespace(fullname) else None
+        )
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 399701a044..bd8636c7b7 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,3 +1,4 @@
+import importlib.machinery
 import sys
 
 
@@ -20,17 +21,18 @@ def search_path(self):
         yield self.vendor_pkg + '.'
         yield ''
 
+    def _module_matches_namespace(self, fullname):
+        """Figure out if the target module is vendored."""
+        root, base, target = fullname.partition(self.root_name + '.')
+        return not root and any(map(target.startswith, self.vendored_names))
+
     def find_module(self, fullname, path=None):
         """
         Return self when fullname starts with root_name and the
         target module is one vendored through this importer.
         """
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
+        spec = self.find_spec(fullname, path)
+        return spec.loader if spec is not None else None
 
     def load_module(self, fullname):
         """
@@ -60,6 +62,13 @@ def create_module(self, spec):
     def exec_module(self, module):
         pass
 
+    def find_spec(self, fullname, path=None, target=None):
+        """Return a module spec for vendored names."""
+        return (
+            importlib.machinery.ModuleSpec(fullname, self)
+            if self._module_matches_namespace(fullname) else None
+        )
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.

From dd1453b3c2ebcc4460b088979576876e89372302 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Thu, 8 Apr 2021 23:45:40 +0200
Subject: [PATCH 8467/8469] Drop deprecated `find_module` from vendor importer

---
 pkg_resources/extern/__init__.py | 8 --------
 setuptools/extern/__init__.py    | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index c45f58e2ac..33e4e6f134 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -26,14 +26,6 @@ def _module_matches_namespace(self, fullname):
         root, base, target = fullname.partition(self.root_name + '.')
         return not root and any(map(target.startswith, self.vendored_names))
 
-    def find_module(self, fullname, path=None):
-        """
-        Return self when fullname starts with root_name and the
-        target module is one vendored through this importer.
-        """
-        spec = self.find_spec(fullname, path)
-        return spec.loader if spec is not None else None
-
     def load_module(self, fullname):
         """
         Iterate over the search path to locate and load fullname.
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index bd8636c7b7..0d4acb3eff 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -26,14 +26,6 @@ def _module_matches_namespace(self, fullname):
         root, base, target = fullname.partition(self.root_name + '.')
         return not root and any(map(target.startswith, self.vendored_names))
 
-    def find_module(self, fullname, path=None):
-        """
-        Return self when fullname starts with root_name and the
-        target module is one vendored through this importer.
-        """
-        spec = self.find_spec(fullname, path)
-        return spec.loader if spec is not None else None
-
     def load_module(self, fullname):
         """
         Iterate over the search path to locate and load fullname.

From b5f3ae57debb9ef018aedc92dd0a3704a1d06fa7 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Fri, 9 Apr 2021 00:13:11 +0200
Subject: [PATCH 8468/8469] Use importlib.util.spec_from_loader in find_spec

---
 pkg_resources/extern/__init__.py | 4 ++--
 setuptools/extern/__init__.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
index 33e4e6f134..fed5929540 100644
--- a/pkg_resources/extern/__init__.py
+++ b/pkg_resources/extern/__init__.py
@@ -1,4 +1,4 @@
-import importlib.machinery
+import importlib.util
 import sys
 
 
@@ -57,7 +57,7 @@ def exec_module(self, module):
     def find_spec(self, fullname, path=None, target=None):
         """Return a module spec for vendored names."""
         return (
-            importlib.machinery.ModuleSpec(fullname, self)
+            importlib.util.spec_from_loader(fullname, self)
             if self._module_matches_namespace(fullname) else None
         )
 
diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index 0d4acb3eff..7df32fdea2 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -1,4 +1,4 @@
-import importlib.machinery
+import importlib.util
 import sys
 
 
@@ -57,7 +57,7 @@ def exec_module(self, module):
     def find_spec(self, fullname, path=None, target=None):
         """Return a module spec for vendored names."""
         return (
-            importlib.machinery.ModuleSpec(fullname, self)
+            importlib.util.spec_from_loader(fullname, self)
             if self._module_matches_namespace(fullname) else None
         )
 

From 1d330f9daded60f0d7721b51d8027494c5bf11d3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Thu, 8 Apr 2021 19:34:42 -0400
Subject: [PATCH 8469/8469] =?UTF-8?q?Bump=20version:=2055.0.0=20=E2=86=92?=
 =?UTF-8?q?=2056.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg                 |  2 +-
 CHANGES.rst                      | 28 ++++++++++++++++++++++++++++
 changelog.d/2620.breaking.rst    |  4 ----
 changelog.d/2620.change.rst      |  1 -
 changelog.d/2620.deprecation.rst |  2 --
 changelog.d/2620.doc.rst         |  1 -
 changelog.d/2632.change.rst      |  3 ---
 setup.cfg                        |  2 +-
 8 files changed, 30 insertions(+), 13 deletions(-)
 delete mode 100644 changelog.d/2620.breaking.rst
 delete mode 100644 changelog.d/2620.change.rst
 delete mode 100644 changelog.d/2620.deprecation.rst
 delete mode 100644 changelog.d/2620.doc.rst
 delete mode 100644 changelog.d/2632.change.rst

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7fe611a698..dd76f43d91 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 55.0.0
+current_version = 56.0.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index d073fa8ef3..ef1d926b15 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,31 @@
+v56.0.0
+-------
+
+
+Deprecations
+^^^^^^^^^^^^
+* #2620: The ``license_file`` option is now marked as deprecated.
+  Use ``license_files`` instead. -- by :user:`cdce8p`
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2620: If neither ``license_file`` nor ``license_files`` is specified, the ``sdist``
+  option will now auto-include files that match the following patterns:
+  ``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS*``.
+  This matches the behavior of ``bdist_wheel``. -- by :user:`cdce8p`
+
+Changes
+^^^^^^^
+* #2620: The ``license_file`` and ``license_files`` options now support glob patterns. -- by :user:`cdce8p`
+* #2632: Implemented ``VendorImporter.find_spec()`` method to get rid
+  of ``ImportWarning`` that Python 3.10 emits when only the old-style
+  importer hooks are present -- by :user:`webknjaz`
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2620: Added documentation for the ``license_files`` option. -- by :user:`cdce8p`
+
+
 v55.0.0
 -------
 
diff --git a/changelog.d/2620.breaking.rst b/changelog.d/2620.breaking.rst
deleted file mode 100644
index 431e7105d9..0000000000
--- a/changelog.d/2620.breaking.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-If neither ``license_file`` nor ``license_files`` is specified, the ``sdist``
-option will now auto-include files that match the following patterns:
-``LICEN[CS]E*``, ``COPYING*``, ``NOTICE*``, ``AUTHORS*``.
-This matches the behavior of ``bdist_wheel``. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.change.rst b/changelog.d/2620.change.rst
deleted file mode 100644
index 5470592d17..0000000000
--- a/changelog.d/2620.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-The ``license_file`` and ``license_files`` options now support glob patterns. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.deprecation.rst b/changelog.d/2620.deprecation.rst
deleted file mode 100644
index 1af5f2461a..0000000000
--- a/changelog.d/2620.deprecation.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The ``license_file`` option is now marked as deprecated.
-Use ``license_files`` instead. -- by :user:`cdce8p`
diff --git a/changelog.d/2620.doc.rst b/changelog.d/2620.doc.rst
deleted file mode 100644
index 7564adaca4..0000000000
--- a/changelog.d/2620.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added documentation for the ``license_files`` option. -- by :user:`cdce8p`
diff --git a/changelog.d/2632.change.rst b/changelog.d/2632.change.rst
deleted file mode 100644
index a13bfdfa70..0000000000
--- a/changelog.d/2632.change.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Implemented ``VendorImporter.find_spec()`` method to get rid
-of ``ImportWarning`` that Python 3.10 emits when only the old-style
-importer hooks are present -- by :user:`webknjaz`
diff --git a/setup.cfg b/setup.cfg
index 6bb6508f8b..ebdc2c638c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 license_files =
 	LICENSE
 name = setuptools
-version = 55.0.0
+version = 56.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages